From 9314751e5c7470a654d26ff6dc4724a8c85f56d0 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 26 Feb 2020 10:36:35 +0200
Subject: [PATCH 0001/1830] FIX: Claim reviewable button did not show up for
 all topics

Follow-up to 514c22e64b8b3aa95dde0456116fad5b954df384.
---
 .../discourse/components/reviewable-item.js.es6        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/reviewable-item.js.es6 b/app/assets/javascripts/discourse/components/reviewable-item.js.es6
index 786f7d5440..607bd75612 100644
--- a/app/assets/javascripts/discourse/components/reviewable-item.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-item.js.es6
@@ -22,9 +22,13 @@ export default Component.extend({
     return type.dasherize();
   },
 
-  @discourseComputed("reviewable.topic_id", "reviewable.removed_topic_id")
-  topicId(topicId, removedTopicId) {
-    return topicId || removedTopicId;
+  @discourseComputed(
+    "reviewable.topic",
+    "reviewable.topic_id",
+    "reviewable.removed_topic_id"
+  )
+  topicId(topic, topicId, removedTopicId) {
+    return topic.id || topicId || removedTopicId;
   },
 
   @discourseComputed("siteSettings.reviewable_claiming", "topicId")

From 3568f296a3477d3f17ee2a63a247a3dc8e49c900 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 26 Feb 2020 10:46:10 +0200
Subject: [PATCH 0002/1830] FIX: Another attempt at fixing reviewable claiming

Follow-up to 9314751e5c7470a654d26ff6dc4724a8c85f56d0.
---
 .../javascripts/discourse/components/reviewable-item.js.es6     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/reviewable-item.js.es6 b/app/assets/javascripts/discourse/components/reviewable-item.js.es6
index 607bd75612..c301f1aa93 100644
--- a/app/assets/javascripts/discourse/components/reviewable-item.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-item.js.es6
@@ -28,7 +28,7 @@ export default Component.extend({
     "reviewable.removed_topic_id"
   )
   topicId(topic, topicId, removedTopicId) {
-    return topic.id || topicId || removedTopicId;
+    return (topic && topic.id) || topicId || removedTopicId;
   },
 
   @discourseComputed("siteSettings.reviewable_claiming", "topicId")

From 87b2871074d0ef575f8ab47ccfa6545ce2ddd335 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 26 Feb 2020 22:08:39 +0300
Subject: [PATCH 0003/1830] Build(deps): Bump logster from 2.6.3 to 2.7.0
 (#9050)

This includes a new feature that allows you to control the length of log messages via `Logster.config.maximum_message_length`. More details at: https://github.com/discourse/logster/commit/e5c4fc0b6ee6fe662094a6d8dc7281c7bcd343c3

Bumps [logster](https://github.com/discourse/logster) from 2.6.3 to 2.7.0.
- [Release notes](https://github.com/discourse/logster/releases)
- [Changelog](https://github.com/discourse/logster/blob/master/CHANGELOG.md)
- [Commits](https://github.com/discourse/logster/compare/v2.6.3...v2.7.0)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 013a17c384..56b4d03c26 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -171,7 +171,7 @@ GEM
     logstash-event (1.2.02)
     logstash-logger (0.26.1)
       logstash-event (~> 1.2)
-    logster (2.6.3)
+    logster (2.7.0)
     loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)

From 9f528f0ec2f929046606de709b473fc5241270cb Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 26 Feb 2020 16:56:11 -0500
Subject: [PATCH 0004/1830] Version bump to v2.5.0.beta1

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

diff --git a/lib/version.rb b/lib/version.rb
index 48151a9be9..85a9a0503c 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -7,9 +7,9 @@ module Discourse
   unless defined? ::Discourse::VERSION
     module VERSION #:nodoc:
       MAJOR = 2
-      MINOR = 4
+      MINOR = 5
       TINY  = 0
-      PRE   = 'beta11'
+      PRE   = 'beta1'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end

From 5774107a2d8f5522d9f6bf612fa1baafa57ac7ed Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 27 Feb 2020 10:22:55 +0530
Subject: [PATCH 0005/1830] FIX: downloaded image URLs incorrectly replaced in
 post raw. (#9014)

Previously, while replacing the downloaded image URL `http://wiki.mozilla.org/images/2/2e/Longcat1.png` similar non-image URL `http://wiki.mozilla.org/images/2` was replaced wrongly.
---
 app/jobs/regular/pull_hotlinked_images.rb |  2 +-
 spec/jobs/pull_hotlinked_images_spec.rb   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index 252c379052..2570365946 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -95,7 +95,7 @@ module Jobs
               escaped_src = Regexp.escape(original_src)
 
               replace_raw = ->(match, match_src, replacement, _index) {
-                if src.include?(match_src)
+                if remove_scheme(src) == remove_scheme(match_src)
 
                   replacement =
                     if replacement.include?(InlineUploads::PLACEHOLDER)
diff --git a/spec/jobs/pull_hotlinked_images_spec.rb b/spec/jobs/pull_hotlinked_images_spec.rb
index 4040674450..6e3a21ca9a 100644
--- a/spec/jobs/pull_hotlinked_images_spec.rb
+++ b/spec/jobs/pull_hotlinked_images_spec.rb
@@ -83,6 +83,17 @@ describe Jobs::PullHotlinkedImages do
       RAW
     end
 
+    it 'replaces correct image URL' do
+      url = image_url.sub("/2e/Longcat1.png", '')
+      post = Fabricate(:post, raw: "[Images](#{url})\n![](#{image_url})")
+
+      expect do
+        Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
+      end.to change { Upload.count }.by(1)
+
+      expect(post.reload.raw).to eq("[Images](#{url})\n![](#{Upload.last.short_url})")
+    end
+
     it 'replaces images without protocol' do
       url = image_url.sub(/^https?\:/, '')
       post = Fabricate(:post, raw: "<img alt='test' src='#{url}'>")

From acf337d58300a7cca189fa49059902a7aa37ef55 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 27 Feb 2020 11:09:37 +0530
Subject: [PATCH 0006/1830] FEATURE: auto archive group message if topic is
 closed. (#9046)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Régis Hanol <regis@hanol.fr>
---
 app/models/topic.rb       | 11 +++++++++++
 spec/models/topic_spec.rb |  8 ++++++++
 2 files changed, 19 insertions(+)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index 44d02260ae..ff4b785708 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -502,6 +502,17 @@ class Topic < ActiveRecord::Base
   def update_status(status, enabled, user, opts = {})
     TopicStatusUpdater.new(self, user).update!(status, enabled, opts)
     DiscourseEvent.trigger(:topic_status_updated, self, status, enabled)
+
+    if enabled && private_message? && status.to_s["closed"]
+      group_ids = user.groups.pluck(:id)
+      if group_ids.present?
+        allowed_group_ids = self.allowed_groups
+          .where('topic_allowed_groups.group_id IN (?)', group_ids).pluck(:id)
+        allowed_group_ids.each do |id|
+          GroupArchivedMessage.archive!(id, self)
+        end
+      end
+    end
   end
 
   # Atomically creates the next post number
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 73bfdc330b..ec2956d660 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -1114,6 +1114,14 @@ describe Topic do
     context 'closed' do
       let(:status) { 'closed' }
       it_should_behave_like 'a status that closes a topic'
+
+      it 'should archive group message' do
+        group = Fabricate(:group)
+        group.add(@user)
+        topic = Fabricate(:private_message_topic, allowed_groups: [group])
+
+        expect { topic.update_status(status, true, @user) }.to change(topic.group_archived_messages, :count).by(1)
+      end
     end
 
     context 'autoclosed' do

From a4fc6ccc121ffb618a5054a63bcb6239812fd553 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 27 Feb 2020 11:09:54 +0100
Subject: [PATCH 0007/1830] UX: prevents jumpyness when displaying poll voters
 (#9054)

---
 plugins/poll/assets/stylesheets/common/poll.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/poll/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss
index 4ab9e427ab..8306f7bfcf 100644
--- a/plugins/poll/assets/stylesheets/common/poll.scss
+++ b/plugins/poll/assets/stylesheets/common/poll.scss
@@ -67,7 +67,9 @@ div.poll {
   }
 
   .poll-voters:not(:empty) {
+    min-height: 30px;
     margin-bottom: 0.25em;
+
     li {
       display: inline;
     }
@@ -76,6 +78,10 @@ div.poll {
   .poll-voters-toggle-expand {
     width: 100%;
     text-align: center;
+
+    .spinner {
+      margin-top: 0.25em;
+    }
   }
 
   .results {

From dfe11321d83cf919bddf57ee23a67da2ff8729fb Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 27 Feb 2020 12:13:07 +0000
Subject: [PATCH 0008/1830] FIX: Polyfill Promise for IE11 (#9057)

Co-authored-by: Joffrey JAFFEUX <j.jaffeux@gmail.com>
---
 plugins/discourse-internet-explorer/public/js/ie.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/discourse-internet-explorer/public/js/ie.js b/plugins/discourse-internet-explorer/public/js/ie.js
index 4c0fbf5fd8..6c998e402a 100644
--- a/plugins/discourse-internet-explorer/public/js/ie.js
+++ b/plugins/discourse-internet-explorer/public/js/ie.js
@@ -970,3 +970,12 @@ if (!String.prototype.startsWith) {
   return ES6;
 });
 /* eslint-enable */
+
+// Polyfill Promise - used by popper.js
+window.addEventListener(
+  "load",
+  function() {
+    window.Promise = require("rsvp").Promise;
+  },
+  false
+);

From 60908a94ece0e62e4ffb3fb619deb3e242079f67 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Thu, 27 Feb 2020 14:45:20 +0200
Subject: [PATCH 0009/1830] FIX: Skip 'invited' small action if user is in an
 invited group (#9056)

Inviting a user that is already invited through a group used to generate
a small action and a notification. This commit skips that small action.
---
 app/models/topic.rb       | 4 +++-
 spec/models/topic_spec.rb | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index ff4b785708..7947900b13 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -1441,7 +1441,9 @@ class Topic < ActiveRecord::Base
     Topic.transaction do
       rate_limit_topic_invitation(invited_by)
       topic_allowed_users.create!(user_id: target_user.id) unless topic_allowed_users.exists?(user_id: target_user.id)
-      add_small_action(invited_by, "invited_user", target_user.username)
+
+      user_in_allowed_group = (user.group_ids & topic_allowed_groups.map(&:group_id)).present?
+      add_small_action(invited_by, "invited_user", target_user.username) if !user_in_allowed_group
 
       create_invite_notification!(
         target_user,
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index ec2956d660..e882c3fd05 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -618,6 +618,15 @@ describe Topic do
           expect(Post.last.action_code).to eq("removed_user")
         end
 
+        it 'should not create a small action if user is already invited through a group' do
+          group = Fabricate(:group, users: [user, another_user])
+          expect(topic.invite_group(user, group)).to eq(true)
+
+          expect { topic.invite(user, another_user.username) }
+            .to change { Notification.count }.by(1)
+            .and change { Post.where(post_type: Post.types[:small_action]).count }.by(0)
+        end
+
         context "from a muted user" do
           before { MutedUser.create!(user: another_user, muted_user: user) }
 

From 56345faf9a981403b06787526172c5f89362b751 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 27 Feb 2020 14:04:23 +0100
Subject: [PATCH 0010/1830] FIX: prevents row click event to be caught by
 filter input event (#9059)

This was causing some dropdowns to not work under IE11
---
 .../select-kit/components/select-kit/select-kit-filter.js.es6    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6
index 174f32fd6d..0c833d0a0c 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6
@@ -43,6 +43,7 @@ export default Component.extend(UtilsMixin, {
   actions: {
     onInput(event) {
       this.selectKit.onInput(event);
+      return true;
     },
 
     onKeydown(event) {

From 0af2f5db6451187edcf4268655608385090a088f Mon Sep 17 00:00:00 2001
From: adam j hartz <hz@mit.edu>
Date: Thu, 27 Feb 2020 08:25:32 -0500
Subject: [PATCH 0011/1830] UX: Differentiate Between PMs and Topics in Search
 Results (#8933)

PMs will now display an envelope icon next to the topic title in search results. This is especially useful when searching using `in:all`.

Co-authored-by: adam j hartz <hz@mit.edu>
---
 .../discourse/components/topic-status.js.es6          | 11 +++++++++++
 .../discourse/templates/components/topic-status.hbs   |  5 ++++-
 .../discourse/templates/full-page-search.hbs          |  3 ++-
 app/assets/stylesheets/common/base/discourse.scss     |  2 +-
 app/serializers/listable_topic_serializer.rb          |  1 +
 config/locales/client.en.yml                          |  1 +
 6 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/topic-status.js.es6 b/app/assets/javascripts/discourse/components/topic-status.js.es6
index ecd6f448de..569292eb5e 100644
--- a/app/assets/javascripts/discourse/components/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-status.js.es6
@@ -44,6 +44,17 @@ export default Component.extend({
       : this._reset("warning");
   },
 
+  @discourseComputed(
+    "showPrivateMessageIcon",
+    "topic.isPrivateMessage",
+    "topic.is_warning"
+  )
+  topicPrivateMessage(showPrivateMessageIcon, privateMessage, warning) {
+    return showPrivateMessageIcon && privateMessage && !warning
+      ? this._set("privateMessage", "envelope", "personal_message")
+      : this._reset("privateMessage");
+  },
+
   @discourseComputed("topic.pinned")
   topicPinned(pinned) {
     return pinned
diff --git a/app/assets/javascripts/discourse/templates/components/topic-status.hbs b/app/assets/javascripts/discourse/templates/components/topic-status.hbs
index f21fbf151d..bf655d9219 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-status.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-status.hbs
@@ -7,8 +7,11 @@
 {{~#if archivedIcon~}}
   <span class='topic-status' title={{archivedTitle}}>{{archivedIcon}}</span>
 {{~/if~}}
+{{~#if topicPrivateMessage~}}
+  <span class='topic-status' title={{privateMessageTitle}}>{{privateMessageIcon}}</span>
+{{~/if~}}
 {{~#if topicWarning~}}
-  <span class='topic-status' title={{warningTitle}}>{{warningIcon}}</span>
+  <span class='topic-status topic-status-warning' title={{warningTitle}}>{{warningIcon}}</span>
 {{~/if~}}
 {{~#if topicPinned~}}
   {{~#if canAct~}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 1317bbc753..7a2cbbd999 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -85,7 +85,8 @@
                   {{/if}}
 
                   <a class='search-link' href='{{unbound result.url}}' {{action "logClick" result.topic_id}}>
-                    {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
+                    {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
+                    <span class='topic-title'>{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
                   </a>
 
                   <div class='search-category'>
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index f8ea7b11cc..023154c7da 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -714,7 +714,7 @@ table {
     }
   }
 
-  .d-icon-envelope {
+  .topic-status-warning .d-icon-envelope {
     color: $danger;
   }
 }
diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb
index 4e5829df02..8a169eb194 100644
--- a/app/serializers/listable_topic_serializer.rb
+++ b/app/serializers/listable_topic_serializer.rb
@@ -9,6 +9,7 @@ class ListableTopicSerializer < BasicTopicSerializer
              :last_posted_at,
              :bumped,
              :bumped_at,
+             :archetype,
              :unseen,
              :last_read_post_number,
              :unread,
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 1211978b66..2253b4fe8e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2861,6 +2861,7 @@ en:
         help: "This topic is unlisted; it will not be displayed in topic lists, and can only be accessed via a direct link"
       personal_message:
         title: "This topic is a personal message"
+        help: "This topic is a personal message"
     posts: "Posts"
     posts_long: "there are {{number}} posts in this topic"
 

From d4617726613346fa1db18594d501841dbc379211 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Thu, 27 Feb 2020 16:01:59 +0200
Subject: [PATCH 0012/1830] FIX: Skip poll tutorial if user cannot create polls
 (#9058)

---
 .../advanced_user_narrative.rb                |  2 +-
 .../advanced_user_narrative_spec.rb           | 23 ++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
index 8da5cdc059..185d472ea6 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
@@ -82,7 +82,7 @@ module DiscourseNarrativeBot
       },
 
       tutorial_poll: {
-        prerequisite: Proc.new { SiteSetting.poll_enabled },
+        prerequisite: Proc.new { SiteSetting.poll_enabled && @user.has_trust_level?(SiteSetting.poll_minimum_trust_level_to_create) },
         next_state: :tutorial_details,
         next_instructions: Proc.new { I18n.t("#{I18N_KEY}.details.instructions", i18n_post_args) },
         reply: {
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
index d9ea4c9e2e..a44c9e250c 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
@@ -556,12 +556,29 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         end
       end
 
-      describe 'when poll is disabled' do
-        before do
+      describe 'when user cannot create polls' do
+        it 'should create the right reply (polls disabled)' do
           SiteSetting.poll_enabled = false
+
+          TopicUser.change(
+            user.id,
+            topic.id,
+            notification_level: TopicUser.notification_levels[:tracking]
+          )
+
+          expected_raw = <<~RAW
+            #{I18n.t('discourse_narrative_bot.advanced_user_narrative.change_topic_notification_level.reply', base_uri: '')}
+
+            #{I18n.t('discourse_narrative_bot.advanced_user_narrative.details.instructions', base_uri: '')}
+          RAW
+
+          expect(Post.last.raw).to eq(expected_raw.chomp)
+          expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_details)
         end
 
-        it 'should create the right reply' do
+        it 'should create the right reply (insufficient trust level)' do
+          user.update(trust_level: 0)
+
           TopicUser.change(
             user.id,
             topic.id,

From 4673f31c75b3231815025cfb930cfb5cbfd16fc8 Mon Sep 17 00:00:00 2001
From: romanrizzi <rizziromanalejandro@gmail.com>
Date: Thu, 27 Feb 2020 11:07:46 -0300
Subject: [PATCH 0013/1830] FIX: Bulk badge awards should work even if the CSV
 has nil values

---
 app/controllers/admin/badges_controller.rb     |  8 ++++++--
 .../fixtures/csv/usernames_with_nil_values.csv |  4 ++++
 spec/requests/admin/badges_controller_spec.rb  | 18 ++++++++++++++----
 3 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 spec/fixtures/csv/usernames_with_nil_values.csv

diff --git a/app/controllers/admin/badges_controller.rb b/app/controllers/admin/badges_controller.rb
index 2c1846d3da..e3aca683d6 100644
--- a/app/controllers/admin/badges_controller.rb
+++ b/app/controllers/admin/badges_controller.rb
@@ -55,8 +55,12 @@ class Admin::BadgesController < Admin::AdminController
       csv.rewind
 
       csv.each_line do |email_line|
-        batch.concat CSV.parse_line(email_line)
-        line_number += 1
+        line = CSV.parse_line(email_line).first
+
+        if line.present?
+          batch << line
+          line_number += 1
+        end
 
         # Split the emails in batches of 200 elements.
         full_batch = csv.lineno % (BadgeGranter::MAX_ITEMS_FOR_DELTA * batch_number) == 0
diff --git a/spec/fixtures/csv/usernames_with_nil_values.csv b/spec/fixtures/csv/usernames_with_nil_values.csv
new file mode 100644
index 0000000000..b35b163ca5
--- /dev/null
+++ b/spec/fixtures/csv/usernames_with_nil_values.csv
@@ -0,0 +1,4 @@
+username1,
+username2,
+username3,
+,,
diff --git a/spec/requests/admin/badges_controller_spec.rb b/spec/requests/admin/badges_controller_spec.rb
index 06d294bcc0..f54875a21a 100644
--- a/spec/requests/admin/badges_controller_spec.rb
+++ b/spec/requests/admin/badges_controller_spec.rb
@@ -179,6 +179,8 @@ describe Admin::BadgesController do
     end
 
     describe '#mass_award' do
+      before { @user = Fabricate(:user, email: 'user1@test.com', username: 'username1') }
+
       it 'does nothing when there is no file' do
         post "/admin/badges/award/#{badge.id}.json", params: { file: '' }
 
@@ -202,23 +204,31 @@ describe Admin::BadgesController do
       it 'awards the badge using a list of user emails' do
         Jobs.run_immediately!
 
-        user = Fabricate(:user, email: 'user1@test.com')
         file = file_from_fixtures('user_emails.csv', 'csv')
 
         post "/admin/badges/award/#{badge.id}.json", params: { file: fixture_file_upload(file) }
 
-        expect(UserBadge.exists?(user: user, badge: badge)).to eq(true)
+        expect(UserBadge.exists?(user: @user, badge: badge)).to eq(true)
       end
 
       it 'awards the badge using a list of usernames' do
         Jobs.run_immediately!
 
-        user = Fabricate(:user, username: 'username1')
         file = file_from_fixtures('usernames.csv', 'csv')
 
         post "/admin/badges/award/#{badge.id}.json", params: { file: fixture_file_upload(file) }
 
-        expect(UserBadge.exists?(user: user, badge: badge)).to eq(true)
+        expect(UserBadge.exists?(user: @user, badge: badge)).to eq(true)
+      end
+
+      it 'works with a CSV containing nil values' do
+        Jobs.run_immediately!
+
+        file = file_from_fixtures('usernames_with_nil_values.csv', 'csv')
+
+        post "/admin/badges/award/#{badge.id}.json", params: { file: fixture_file_upload(file) }
+
+        expect(UserBadge.exists?(user: @user, badge: badge)).to eq(true)
       end
     end
   end

From 501936f0da943d0d0d2fb24cdd634d64fbd459ba Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 27 Feb 2020 15:20:04 +0100
Subject: [PATCH 0014/1830] FIX: prevents loading to show during debouncing
 (#9060)

This will also fix a bug in IE11 where click event would not be triggered on row
---
 app/assets/javascripts/select-kit/components/select-kit.js.es6 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index 3159d596a9..ed78c9ed78 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -382,13 +382,12 @@ export default Component.extend(
       );
 
       if (input) {
-        this.selectKit.set("isLoading", true);
         debounce(this, this._debouncedInput, event.target.value, 200);
       }
     },
 
     _debouncedInput(filter) {
-      this.selectKit.set("filter", filter);
+      this.selectKit.setProperties({ filter, isLoading: true });
       this._searchPromise = this._searchWrapper(filter);
     },
 

From 87f15f9ed65f0363344d56f701f2e511ee0e96a5 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Thu, 27 Feb 2020 14:10:14 -0300
Subject: [PATCH 0016/1830] FIX: When appending tags to restricted category
 posts, we need to pass the category id, or it won't work. (#9020)

---
 .../components/search-advanced-options.js.es6         | 11 ++++++++---
 .../discourse/routes/full-page-search.js.es6          |  1 +
 .../discourse/templates/full-page-search.hbs          |  3 ++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
index 855fed4e28..eb61067167 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
@@ -219,6 +219,11 @@ export default Component.extend({
     }
   },
 
+  setCategory(category) {
+    this.set("searchedTerms.category", category);
+    this.set("category", category);
+  },
+
   setSearchedTermValueForCategory() {
     const match = this.filterBlocks(REGEXP_CATEGORY_PREFIX);
     if (match.length !== 0) {
@@ -235,21 +240,21 @@ export default Component.extend({
           (!existingInput && userInput) ||
           (existingInput && userInput && existingInput.id !== userInput.id)
         )
-          this.set("searchedTerms.category", userInput);
+          this.setCategory(userInput);
       } else if (isNaN(subcategories)) {
         const userInput = Category.findSingleBySlug(subcategories[0]);
         if (
           (!existingInput && userInput) ||
           (existingInput && userInput && existingInput.id !== userInput.id)
         )
-          this.set("searchedTerms.category", userInput);
+          this.setCategory(userInput);
       } else {
         const userInput = Category.findById(subcategories[0]);
         if (
           (!existingInput && userInput) ||
           (existingInput && userInput && existingInput.id !== userInput.id)
         )
-          this.set("searchedTerms.category", userInput);
+          this.setCategory(userInput);
       }
     } else this.set("searchedTerms.category", "");
   },
diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
index ca7906e109..6fe75cd83b 100644
--- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
@@ -17,6 +17,7 @@ export default DiscourseRoute.extend({
     context: {},
     skip_context: {}
   },
+  category: null,
 
   titleToken() {
     return I18n.t("search.results_page", {
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 7a2cbbd999..e903c5cd02 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -36,7 +36,7 @@
 
         {{#if canBulkSelect}}
           {{d-button icon="list" class="btn-default bulk-select" title="topics.bulk.toggle" action=(action "toggleBulkSelect")}}
-          {{bulk-select-button selected=selected action=(action "search")}}
+          {{bulk-select-button selected=selected category=category action=(action "search")}}
         {{/if}}
 
         {{#if bulkSelectEnabled}}
@@ -211,6 +211,7 @@
         {{search-advanced-options
           searchTerm=searchTerm
           isExpanded=true
+          category=category
         }}
 
         {{d-button

From 337b823ec6492e4a4614598bef38d8351153b0e2 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Thu, 27 Feb 2020 11:47:15 -0600
Subject: [PATCH 0017/1830] Merge pull request from GHSA-vw39-6w7q-gfx5

Co-authored-by: Robin Ward <robin.ward@gmail.com>
---
 .../discourse/components/iframed-html.js.es6  | 19 +++++++++++++++
 .../discourse/templates/modal/raw-email.hbs   |  4 +---
 app/assets/stylesheets/common/base/modal.scss |  6 +++++
 .../common/components/iframed-html.scss       |  4 ++++
 .../components/iframed-html-test.js.es6       | 23 +++++++++++++++++++
 5 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/components/iframed-html.js.es6
 create mode 100644 app/assets/stylesheets/common/components/iframed-html.scss
 create mode 100644 test/javascripts/components/iframed-html-test.js.es6

diff --git a/app/assets/javascripts/discourse/components/iframed-html.js.es6 b/app/assets/javascripts/discourse/components/iframed-html.js.es6
new file mode 100644
index 0000000000..a8c39e583e
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/iframed-html.js.es6
@@ -0,0 +1,19 @@
+import Component from "@ember/component";
+
+export default Component.extend({
+  tagName: "iframe",
+  html: null,
+  className: "",
+  classNameBindings: ["html:iframed-html", "className"],
+  sandbox: "allow-same-origin",
+  attributeBindings: ['sandbox:sandbox'],
+
+  didRender() {
+    this._super(...arguments);
+    const iframeDoc = this.element.contentWindow.document;
+    iframeDoc.open("text/html", "replace");
+    iframeDoc.write(this.html);
+    iframeDoc.close();
+  }
+});
+
diff --git a/app/assets/javascripts/discourse/templates/modal/raw-email.hbs b/app/assets/javascripts/discourse/templates/modal/raw-email.hbs
index 489064f166..0a3a0eda22 100644
--- a/app/assets/javascripts/discourse/templates/modal/raw-email.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/raw-email.hbs
@@ -37,9 +37,7 @@
     {{/if}}
 
     {{#if showHtmlPart}}
-      <div class="incoming-email-html-part">
-        {{{htmlPart}}}
-      </div>
+      {{iframed-html html=htmlPart className="incoming-email-html-part"}}
     {{/if}}
   </div>
 {{/d-modal-body}}
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index f67a36cae6..e24acf027f 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -494,8 +494,14 @@
       box-shadow: none;
     }
     .incoming-email-html-part {
+      width: calc(100% - 36px);
       padding: 10px 4px 4px 4px;
     }
+    @media screen and (max-width: 760px) {
+      .incoming-email-html-part {
+        width: calc(100% - 10px);
+      }
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/common/components/iframed-html.scss b/app/assets/stylesheets/common/components/iframed-html.scss
new file mode 100644
index 0000000000..0b613852a1
--- /dev/null
+++ b/app/assets/stylesheets/common/components/iframed-html.scss
@@ -0,0 +1,4 @@
+.iframed-html {
+  background: white;
+  border: none;
+}
diff --git a/test/javascripts/components/iframed-html-test.js.es6 b/test/javascripts/components/iframed-html-test.js.es6
new file mode 100644
index 0000000000..ad7d4113f4
--- /dev/null
+++ b/test/javascripts/components/iframed-html-test.js.es6
@@ -0,0 +1,23 @@
+import componentTest from "helpers/component-test";
+
+moduleForComponent("iframed-html", { integration: true });
+
+componentTest("appends the html into the iframe", {
+  template: `{{iframed-html html="<h1 id='find-me'>hello</h1>" className='this-is-an-iframe'}}`,
+
+  async test(assert) {
+    const iframe = find("iframe.this-is-an-iframe");
+    assert.equal(iframe.length, 1, "inserts an iframe");
+
+    assert.ok(
+      iframe[0].classList.contains("this-is-an-iframe"),
+      "Adds className to the iframes classList"
+    );
+
+    assert.equal(
+      iframe[0].contentWindow.document.body.querySelectorAll("#find-me").length,
+      1,
+      "inserts the passed in html into the iframe"
+    );
+  }
+});

From f3581143617ca998936e7ee1ffac26c9fde26439 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Thu, 27 Feb 2020 11:56:13 -0600
Subject: [PATCH 0018/1830] FIX: Prettier on iframed-html component (#9062)

---
 .../javascripts/discourse/components/iframed-html.js.es6       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/iframed-html.js.es6 b/app/assets/javascripts/discourse/components/iframed-html.js.es6
index a8c39e583e..f05b5d278b 100644
--- a/app/assets/javascripts/discourse/components/iframed-html.js.es6
+++ b/app/assets/javascripts/discourse/components/iframed-html.js.es6
@@ -6,7 +6,7 @@ export default Component.extend({
   className: "",
   classNameBindings: ["html:iframed-html", "className"],
   sandbox: "allow-same-origin",
-  attributeBindings: ['sandbox:sandbox'],
+  attributeBindings: ["sandbox:sandbox"],
 
   didRender() {
     this._super(...arguments);
@@ -16,4 +16,3 @@ export default Component.extend({
     iframeDoc.close();
   }
 });
-

From 8e5edae0936b17e32139137b748763977f45c101 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 28 Feb 2020 09:20:36 +1100
Subject: [PATCH 0019/1830] FEATURE: unconditionally skip indexing on search
 controller

There are absolutely no actions in search that need indexing

Also no point adding this header on non get requests
---
 app/controllers/application_controller.rb | 2 +-
 app/controllers/search_controller.rb      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c6cfcf3165..23872ed560 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -807,7 +807,7 @@ class ApplicationController < ActionController::Base
   end
 
   def add_noindex_header
-    response.headers['X-Robots-Tag'] = 'noindex'
+    response.headers['X-Robots-Tag'] = 'noindex' if request.get?
   end
 
   protected
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 3f0914e2dc..a2dd66ea5f 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -2,9 +2,9 @@
 
 class SearchController < ApplicationController
 
-  skip_before_action :check_xhr, only: :show
-
   before_action :cancel_overloaded_search, only: [:query]
+  skip_before_action :check_xhr, only: :show
+  after_action :add_noindex_header
 
   def self.valid_context_types
     %w{user topic category private_messages tag}

From 14adddd18d8ad7ff6372cd1859d1b2ac01de51ba Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 28 Feb 2020 12:11:30 +1000
Subject: [PATCH 0020/1830] FIX: Ignore secure-media-uploads for miniprofiler
 (#9070)

---
 config/initializers/006-mini_profiler.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/initializers/006-mini_profiler.rb b/config/initializers/006-mini_profiler.rb
index a717c48ae3..ce3443e051 100644
--- a/config/initializers/006-mini_profiler.rb
+++ b/config/initializers/006-mini_profiler.rb
@@ -41,6 +41,7 @@ if defined?(Rack::MiniProfiler) && defined?(Rack::MiniProfiler::Config)
     /^\/logs/,
     /^\/site_customizations/,
     /^\/uploads/,
+    /^\/secure-media-uploads/,
     /^\/javascripts\//,
     /^\/images\//,
     /^\/stylesheets\//,

From 60184a290c45926583393cf53895e063b4798ff5 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Fri, 28 Feb 2020 11:10:03 +0200
Subject: [PATCH 0021/1830] FIX: Sync preload key format for category topic
 lists

The server and client used two different formats for preload keys. The
server was using 'topic_list_c/SLUG/l/latest', but the client was using
'topic_list_c/SLUG/ID/l/latest'.

This commit is an addition to 374534f00ee487d859fc2b826ea519befe0da350.
---
 app/models/topic_list.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb
index 52b0ee0070..d51c0f153f 100644
--- a/app/models/topic_list.rb
+++ b/app/models/topic_list.rb
@@ -67,7 +67,7 @@ class TopicList
 
   def preload_key
     if @category
-      "topic_list_#{@category.url.sub(/^\//, '')}/l/#{@filter}"
+      "topic_list_#{@category.url.sub(/^\//, '')}/#{@category.id}/l/#{@filter}"
     else
       "topic_list_#{@filter}"
     end

From 8cbb6e35cbfc36d46223fadcf880dccc0f415cf8 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Fri, 28 Feb 2020 11:31:04 +0200
Subject: [PATCH 0022/1830] DEV: Fix build

Follow up to 60184a290c45926583393cf53895e063b4798ff5.
---
 spec/components/topic_query_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb
index b4c5cd9345..3793da7579 100644
--- a/spec/components/topic_query_spec.rb
+++ b/spec/components/topic_query_spec.rb
@@ -145,7 +145,7 @@ describe TopicQuery do
 
       list = TopicQuery.new(moderator, category: diff_category.slug).list_latest
       expect(list.topics.size).to eq(1)
-      expect(list.preload_key).to eq("topic_list_c/different-category/l/latest")
+      expect(list.preload_key).to eq("topic_list_c/different-category/#{diff_category.id}/l/latest")
 
       # Defaults to no category filter when slug does not exist
       expect(TopicQuery.new(moderator, category: 'made up slug').list_latest.topics.size).to eq(2)

From 0903aa44bb3c6060979be3ea0ceef5710f5a90e4 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 28 Feb 2020 10:53:11 +0000
Subject: [PATCH 0023/1830] FEATURE: Always disable customizations on the
 `/safe-mode` route (#9052)

This makes it easier to enter safe mode when a customization has made the UI unusable
---
 app/controllers/safe_mode_controller.rb    |  6 ++++++
 spec/requests/safe_mode_controller_spec.rb | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/app/controllers/safe_mode_controller.rb b/app/controllers/safe_mode_controller.rb
index 76a93ebf59..d0742eba10 100644
--- a/app/controllers/safe_mode_controller.rb
+++ b/app/controllers/safe_mode_controller.rb
@@ -3,6 +3,7 @@
 class SafeModeController < ApplicationController
   layout 'no_ember'
   before_action :ensure_safe_mode_enabled
+  before_action :force_safe_mode_for_route
 
   skip_before_action :preload_json, :check_xhr
 
@@ -29,4 +30,9 @@ class SafeModeController < ApplicationController
     raise Discourse::NotFound unless guardian.can_enable_safe_mode?
   end
 
+  def force_safe_mode_for_route
+    request.env[ApplicationController::NO_CUSTOM] = true
+    request.env[ApplicationController::NO_PLUGINS] = true
+  end
+
 end
diff --git a/spec/requests/safe_mode_controller_spec.rb b/spec/requests/safe_mode_controller_spec.rb
index 542e3ed7d8..6bba0dad93 100644
--- a/spec/requests/safe_mode_controller_spec.rb
+++ b/spec/requests/safe_mode_controller_spec.rb
@@ -3,6 +3,18 @@
 require 'rails_helper'
 
 RSpec.describe SafeModeController do
+  describe 'index' do
+    it 'never includes customizations' do
+      theme = Fabricate(:theme)
+      theme.set_field(target: :common, name: "header", value: "My Custom Header")
+      theme.save!
+      theme.set_default!
+
+      get '/safe-mode'
+      expect(response.body).not_to include("My Custom Header")
+    end
+  end
+
   describe 'enter' do
     context 'when no params are given' do
       it 'should redirect back to safe mode page' do

From ff5ff8d0d27bd8482171399ece41182a8072fc33 Mon Sep 17 00:00:00 2001
From: Brad Morrical <bmorrical@iccsafe.org>
Date: Fri, 28 Feb 2020 09:26:18 -0600
Subject: [PATCH 0024/1830] fix invalid byte sequence in UTF-8 (ArgumentError)
 (#9077)

---
 script/import_scripts/simplepress.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/script/import_scripts/simplepress.rb b/script/import_scripts/simplepress.rb
index 6932338009..3375258790 100644
--- a/script/import_scripts/simplepress.rb
+++ b/script/import_scripts/simplepress.rb
@@ -195,6 +195,11 @@ class ImportScripts::SimplePress < ImportScripts::Base
   def process_simplepress_post(raw, import_id)
     s = raw.dup
 
+    # fix invalid byte sequence in UTF-8 (ArgumentError)
+    unless s.valid_encoding?
+      s.force_encoding("UTF-8")
+    end
+
     # convert the quote line
     s.gsub!(/\[quote='([^']+)'.*?pid='(\d+).*?\]/) {
       "[quote=\"#{convert_username($1, import_id)}, " + post_id_to_post_num_and_topic($2, import_id) + '"]'

From 2db8ada22233419fd57a1f7a1cab076fa9762227 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 28 Feb 2020 17:58:22 +0100
Subject: [PATCH 0025/1830] FIX: ensures category url of category drop is built
 using slug and id (#9069)

---
 .../components/category-drop.js.es6           | 12 +++++------
 .../select-kit/category-drop-test.js.es6      | 20 +++++++++++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/category-drop.js.es6 b/app/assets/javascripts/select-kit/components/category-drop.js.es6
index b5dcb7162a..5ee9a6d12b 100644
--- a/app/assets/javascripts/select-kit/components/category-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-drop.js.es6
@@ -155,18 +155,16 @@ export default ComboBoxComponent.extend({
   },
 
   actions: {
-    onChange(value) {
+    onChange(categoryId) {
       let categoryURL;
 
-      if (value === ALL_CATEGORIES_ID) {
+      if (categoryId === ALL_CATEGORIES_ID) {
         categoryURL = this.allCategoriesUrl;
-      } else if (value === NO_CATEGORIES_ID) {
+      } else if (categoryId === NO_CATEGORIES_ID) {
         categoryURL = this.noCategoriesUrl;
       } else {
-        const categoryId = parseInt(value, 10);
-        const category = Category.findById(categoryId);
-        const slug = Discourse.Category.slugFor(category);
-        categoryURL = `/c/${slug}`;
+        const category = Category.findById(parseInt(categoryId, 10));
+        categoryURL = category.url;
       }
 
       DiscourseURL.routeToUrl(categoryURL);
diff --git a/test/javascripts/components/select-kit/category-drop-test.js.es6 b/test/javascripts/components/select-kit/category-drop-test.js.es6
index e44b8d24a7..2a3b7b6e56 100644
--- a/test/javascripts/components/select-kit/category-drop-test.js.es6
+++ b/test/javascripts/components/select-kit/category-drop-test.js.es6
@@ -1,3 +1,4 @@
+import DiscourseURL from "discourse/lib/url";
 import Category from "discourse/models/category";
 import componentTest from "helpers/component-test";
 import { testSelectKitModule } from "./select-kit-test-helper";
@@ -335,3 +336,22 @@ componentTest(
     }
   }
 );
+
+componentTest("category url", {
+  template: template(),
+
+  beforeEach() {
+    initCategoriesWithParentCategory(this);
+    sandbox.stub(DiscourseURL, "routeTo");
+  },
+
+  async test(assert) {
+    await this.subject.expand();
+    await this.subject.selectRowByValue(26);
+
+    assert.ok(
+      DiscourseURL.routeTo.calledWith("/c/feature/spec/26"),
+      "it builds a correct URL"
+    );
+  }
+});

From 18ed2cc7d8224a32395ec92643856253dffd57ce Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 28 Feb 2020 14:25:52 -0500
Subject: [PATCH 0026/1830] Build(deps): Bump puma from 4.3.1 to 4.3.2 (#9063)

Bumps [puma](https://github.com/puma/puma) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.3.1...v4.3.2)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 56b4d03c26..8c8df3e761 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -264,7 +264,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.3)
-    puma (4.3.1)
+    puma (4.3.2)
       nio4r (~> 2.0)
     r2 (0.2.7)
     rack (2.0.8)

From 18209e1dafe97e3c8f757e56de6ab2bbc03b0af3 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Sat, 29 Feb 2020 15:05:09 +1100
Subject: [PATCH 0027/1830] DEV: remove dead code

This code is not called anywhere, remove it
---
 lib/topic_query.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 86c126f2fe..bfb787ce9f 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -19,12 +19,6 @@ class TopicQuery
         int.call(x) && x.to_i.between?(0, PG_MAX_INT)
       end
 
-      array_int_or_int = lambda do |x|
-        int.call(x) || (
-          Array === x && x.length > 0 && x.all?(&int)
-        )
-      end
-
       {
         max_posts: zero_up_to_max_int,
         min_posts: zero_up_to_max_int,

From b4999acadd3783e0953f04729cafc2fe0598db87 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Sat, 29 Feb 2020 15:40:54 +1100
Subject: [PATCH 0028/1830] PERF: improve performance of category topic list

In some cases CTE caused pathologically bad query plans.
This optimises it so query runs by itself and caches for lifetime
of the topic query object.

This lightweight caching is done cause topic query will often
execute two queries (one for pinned and one for non pinned)
---
 lib/topic_query.rb | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index bfb787ce9f..f77d37e746 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -669,20 +669,11 @@ class TopicQuery
       if options[:no_subcategories]
         result = result.where('categories.id = ?', category_id)
       else
-        sql = <<~SQL
-            categories.id IN (
-              WITH RECURSIVE subcategories AS (
-                SELECT :category_id id, 1 depth
-                UNION
-                SELECT categories.id, (subcategories.depth + 1) depth
-                FROM categories
-                JOIN subcategories ON subcategories.id = categories.parent_category_id
-                WHERE subcategories.depth < :max_category_nesting
-            )
-              SELECT subcategories.id FROM subcategories
-            ) AND (categories.id = :category_id OR topics.id != categories.topic_id)
+        result = result.where(<<~SQL, subcategory_ids: subcategory_ids(category_id), category_id: category_id)
+          categories.id in (:subcategory_ids) AND (
+            categories.topic_id <> topics.id OR categories.id = :category_id
+          )
           SQL
-        result = result.where(sql, category_id: category_id, max_category_nesting: SiteSetting.max_category_nesting)
       end
       result = result.references(:categories)
 
@@ -1061,6 +1052,29 @@ class TopicQuery
 
   private
 
+  def subcategory_ids(category_id)
+    @subcategory_ids ||= {}
+    @subcategory_ids[category_id] ||=
+      begin
+        sql = <<~SQL
+            WITH RECURSIVE subcategories AS (
+                SELECT :category_id id, 1 depth
+                UNION
+                SELECT categories.id, (subcategories.depth + 1) depth
+                FROM categories
+                JOIN subcategories ON subcategories.id = categories.parent_category_id
+                WHERE subcategories.depth < :max_category_nesting
+            )
+            SELECT id FROM subcategories
+          SQL
+        DB.query_single(
+          sql,
+          category_id: category_id,
+          max_category_nesting: SiteSetting.max_category_nesting
+        )
+      end
+  end
+
   def sanitize_sql_array(input)
     ActiveRecord::Base.public_send(:sanitize_sql_array, input.join(','))
   end

From e23e247dffdc9e4b8dc840aa26369d82282435ef Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Sat, 29 Feb 2020 18:30:08 +1100
Subject: [PATCH 0029/1830] DEV: spec suite fails on leap years

Something about year math fails here on leap years, just
set up the clock so it is consistent to avoid it.
---
 spec/components/post_creator_spec.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index 779c829ed4..d5bbb9fef5 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -485,7 +485,8 @@ describe PostCreator do
 
     it 'whispers do not mess up the public view' do
 
-      freeze_time
+      # turns out this can fail on leap years if we don't do this
+      freeze_time DateTime.parse('2010-01-01 12:00')
 
       first = PostCreator.new(
         user,
@@ -1414,7 +1415,7 @@ describe PostCreator do
     end
 
     it "links post uploads" do
-      public_post = PostCreator.create(
+      _public_post = PostCreator.create(
         user,
         topic_id: public_topic.id,
         raw: "A public post with an image.\n![](#{image_upload.short_path})"

From 4635be10c88cb53779a12eb83daa38bf8101b799 Mon Sep 17 00:00:00 2001
From: Kane York <rikingcoding@gmail.com>
Date: Sat, 29 Feb 2020 17:01:45 -0800
Subject: [PATCH 0030/1830] DEV: Add docker cleanup script to d/ folder

---
 bin/docker/cleanup | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100755 bin/docker/cleanup

diff --git a/bin/docker/cleanup b/bin/docker/cleanup
new file mode 100755
index 0000000000..299b569ed4
--- /dev/null
+++ b/bin/docker/cleanup
@@ -0,0 +1,3 @@
+#!/bin/bash
+docker container prune --filter until=1h
+docker image prune --all --filter until=1h

From 8123538c9495e80a5e208d89df3ec668a21e75b8 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Mon, 2 Mar 2020 15:40:29 +1000
Subject: [PATCH 0031/1830] DEV: Minor review fixes and fix bookmark spec
 logging (#9045)

As per:

https://review.discourse.org/t/fix-never-allow-custom-emoji-to-be-marked-secure-8965/9072
https://review.discourse.org/t/feature-improving-bookmarks-part-2-topic-bookmarking-8954/9038
---
 app/models/post.rb           |  4 ++--
 spec/tasks/bookmarks_spec.rb | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/models/post.rb b/app/models/post.rb
index c0d69eac99..7e56dfa66b 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -918,8 +918,8 @@ class Post < ActiveRecord::Base
       if SiteSetting.secure_media?
         Upload.where(
           id: upload_ids, access_control_post_id: nil
-        ).where.not(
-          id: CustomEmoji.pluck(:upload_id)
+        ).where(
+          'id NOT IN (SELECT upload_id FROM custom_emojis)'
         ).update_all(
           access_control_post_id: self.id
         )
diff --git a/spec/tasks/bookmarks_spec.rb b/spec/tasks/bookmarks_spec.rb
index 16fea02f98..68f8588e0b 100644
--- a/spec/tasks/bookmarks_spec.rb
+++ b/spec/tasks/bookmarks_spec.rb
@@ -17,8 +17,14 @@ RSpec.describe "bookmarks tasks" do
     create_post_actions_and_existing_bookmarks
   end
 
+  def invoke_task(args = nil)
+    capture_stdout do
+      Rake::Task['bookmarks:sync_to_table'].invoke(args)
+    end
+  end
+
   it "migrates all PostActions" do
-    Rake::Task['bookmarks:sync_to_table'].invoke
+    invoke_task
 
     expect(Bookmark.all.count).to eq(3)
   end
@@ -26,14 +32,14 @@ RSpec.describe "bookmarks tasks" do
   it "does not create bookmarks that already exist in the bookmarks table for a user" do
     Fabricate(:bookmark, user: user1, post: post1)
 
-    Rake::Task['bookmarks:sync_to_table'].invoke
+    invoke_task
 
     expect(Bookmark.all.count).to eq(3)
     expect(Bookmark.where(post: post1, user: user1).count).to eq(1)
   end
 
   it "respects the sync_limit if provided and stops creating bookmarks at the limit (so this can be run progrssively" do
-    Rake::Task['bookmarks:sync_to_table'].invoke(1)
+    invoke_task(1)
     expect(Bookmark.all.count).to eq(1)
   end
 

From 34fddaa824565a85cea78f923ad2f0c8471053b2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2020 10:34:17 +0000
Subject: [PATCH 0032/1830] Build(deps): Bump rails_multisite from 2.0.7 to
 2.1.0 (#9083)

Bumps [rails_multisite]() from 2.0.7 to 2.1.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8c8df3e761..892b8cdf93 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -279,9 +279,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails_multisite (2.0.7)
-      activerecord (> 4.2, < 7)
-      railties (> 4.2, < 7)
+    rails_multisite (2.1.0)
+      activerecord (> 5.0, < 7)
+      railties (> 5.0, < 7)
     railties (6.0.1)
       actionpack (= 6.0.1)
       activesupport (= 6.0.1)

From 68c7699c46214fe8dcefa72fad12376865f796c4 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 2 Mar 2020 13:34:00 +0000
Subject: [PATCH 0033/1830] Revert "Build(deps-dev): Bump annotate from 3.0.3
 to 3.1.0 (#9013)"

v3.1.0 has a bug which rewrites default annotations with erroneous quotes. https://github.com/ctran/annotate_models/issues/762

This reverts commit dd4a04e72c5bb9c37cdc44b588a76818628b524e.
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 892b8cdf93..95428727ea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,7 +40,7 @@ GEM
       zeitwerk (~> 2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    annotate (3.1.0)
+    annotate (3.0.3)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.0)

From 58f16f2e2b5eb3903f6fe85dc2c8b454872fd39e Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Mon, 2 Mar 2020 12:56:37 -0300
Subject: [PATCH 0034/1830] FIX: Make FooterNav work with PWAs on iPadOS

---
 app/assets/javascripts/discourse/lib/utilities.js.es6 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6
index ce91d7c8dc..3f24485fea 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js.es6
+++ b/app/assets/javascripts/discourse/lib/utilities.js.es6
@@ -367,9 +367,10 @@ export function areCookiesEnabled() {
 }
 
 export function isiOSPWA() {
+  const caps = Discourse.__container__.lookup("capabilities:main");
   return (
     window.matchMedia("(display-mode: standalone)").matches &&
-    navigator.userAgent.match(/(iPad|iPhone|iPod)/g)
+    caps.isIOS
   );
 }
 

From fd38ed3631341379f40f9efd465b62088e4f56d6 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Mon, 2 Mar 2020 13:04:52 -0300
Subject: [PATCH 0035/1830] DEV: Fix lint error introduced in 58f16f2

---
 app/assets/javascripts/discourse/lib/utilities.js.es6 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6
index 3f24485fea..8b210b4737 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js.es6
+++ b/app/assets/javascripts/discourse/lib/utilities.js.es6
@@ -368,10 +368,7 @@ export function areCookiesEnabled() {
 
 export function isiOSPWA() {
   const caps = Discourse.__container__.lookup("capabilities:main");
-  return (
-    window.matchMedia("(display-mode: standalone)").matches &&
-    caps.isIOS
-  );
+  return window.matchMedia("(display-mode: standalone)").matches && caps.isIOS;
 }
 
 export function isAppWebview() {

From d7ccb58559767a089d3aa3847bd74560762dc261 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Mon, 2 Mar 2020 17:24:48 +0100
Subject: [PATCH 0036/1830] FIX: Google Groups scraper failed to login

---
 script/import_scripts/google_groups.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/script/import_scripts/google_groups.rb b/script/import_scripts/google_groups.rb
index 6e3f2f0969..d8f58cf323 100755
--- a/script/import_scripts/google_groups.rb
+++ b/script/import_scripts/google_groups.rb
@@ -158,12 +158,11 @@ def login
   get("https://google.com/404")
 
   add_cookies(
-    "accounts.google.com",
     "myaccount.google.com",
     "google.com"
   )
 
-  get("https://accounts.google.com/servicelogin")
+  get("https://myaccount.google.com/?utm_source=sign_in_no_continue")
 
   begin
     wait_for_url { |url| url.start_with?("https://myaccount.google.com") }

From 5889309d3b7b53bd358937641739956412530487 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Mon, 2 Mar 2020 17:44:01 +0100
Subject: [PATCH 0037/1830] FIX: Restoring with `disable_emails: false` didn't
 work anymore

---
 lib/backup_restore.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/backup_restore.rb b/lib/backup_restore.rb
index 6259044dcb..4775fdd612 100644
--- a/lib/backup_restore.rb
+++ b/lib/backup_restore.rb
@@ -23,7 +23,8 @@ module BackupRestore
       factory: BackupRestore::Factory.new(
         user_id: user_id,
         client_id: opts[:client_id]
-      )
+      ),
+      disable_emails: opts.fetch(:disable_emails, true)
     )
 
     start! restorer

From d05142d3f7e43b3328d2b0fb75178c6dbd548c9d Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Mon, 2 Mar 2020 13:27:38 -0300
Subject: [PATCH 0038/1830] FEATURE: Enable service worker on iOS PWA

---
 .../discourse/initializers/register-service-worker.js.es6  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6 b/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
index c0099d7f30..fbfc4484de 100644
--- a/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
+++ b/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
@@ -10,9 +10,12 @@ export default {
 
     if (isSupported) {
       const caps = Discourse.__container__.lookup("capabilities:main");
-      const isApple = caps.isSafari || caps.isIOS || caps.isIpadOS;
+      const isAppleBrowser =
+        caps.isSafari ||
+        (caps.isIOS &&
+          !window.matchMedia("(display-mode: standalone)").matches);
 
-      if (Discourse.ServiceWorkerURL && !isApple) {
+      if (Discourse.ServiceWorkerURL && !isAppleBrowser) {
         navigator.serviceWorker.getRegistrations().then(registrations => {
           for (let registration of registrations) {
             if (

From ed85cfe1419f785c6ca7514385e58f157808deb8 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 2 Mar 2020 20:06:02 +0100
Subject: [PATCH 0039/1830] FIX: prevents click on sk header to bubble (#9084)

---
 .../select-kit/select-kit-header.js.es6       |  1 +
 .../select-kit/single-select-test.js.es6      | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
index faf8f27b7e..6ec3984a98 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
@@ -13,6 +13,7 @@ export default Component.extend(UtilsMixin, {
       return;
     if (this.eventType !== "click" || event.button !== 0) return;
     this.selectKit.toggle(event);
+    return false;
   },
 
   classNames: ["select-kit-header"],
diff --git a/test/javascripts/components/select-kit/single-select-test.js.es6 b/test/javascripts/components/select-kit/single-select-test.js.es6
index 42f058a586..88dbbacf9e 100644
--- a/test/javascripts/components/select-kit/single-select-test.js.es6
+++ b/test/javascripts/components/select-kit/single-select-test.js.es6
@@ -238,3 +238,22 @@ componentTest("selected value can be 0", {
     assert.equal(this.subject.header().value(), 0);
   }
 });
+
+componentTest("prevents propagating click event on header", {
+  template:
+    "{{#d-button icon='times' action=onClick}}{{single-select value=value content=content}}{{/d-button}}",
+
+  beforeEach() {
+    this.setProperties({
+      onClick: () => this.set("value", "foo"),
+      content: DEFAULT_CONTENT,
+      value: DEFAULT_VALUE
+    });
+  },
+
+  async test(assert) {
+    assert.equal(this.value, DEFAULT_VALUE);
+    await this.subject.expand();
+    assert.equal(this.value, DEFAULT_VALUE);
+  }
+});

From d85726a866de8b40d5ddc57928addf1be1e2c4ea Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2020 14:09:05 -0500
Subject: [PATCH 0040/1830] Build(deps-dev): Bump simplecov from 0.18.3 to
 0.18.5 (#9044)

Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.18.3 to 0.18.5.
- [Release notes](https://github.com/colszowka/simplecov/releases)
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md)
- [Commits](https://github.com/colszowka/simplecov/compare/v0.18.3...v0.18.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 95428727ea..e344103355 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -379,10 +379,10 @@ GEM
       rack (~> 2.0)
       rack-protection (>= 2.0.0)
       redis (>= 4.1.0)
-    simplecov (0.18.3)
+    simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.1)
+    simplecov-html (0.12.2)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)

From 98d4b7bbc1d3300819248c63c9bbe35edfce0b94 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2020 14:09:33 -0500
Subject: [PATCH 0041/1830] Build(deps-dev): Bump better_errors from 2.5.1 to
 2.6.0 (#9043)

Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index e344103355..e406cbd262 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -66,7 +66,7 @@ GEM
     barber (0.12.2)
       ember-source (>= 1.0, < 3.1)
       execjs (>= 1.2, < 3)
-    better_errors (2.5.1)
+    better_errors (2.6.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)

From 93b8d7ec89cc86996dedd5438381f99712f58445 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2020 14:09:56 -0500
Subject: [PATCH 0042/1830] Build(deps): Bump puma from 4.3.2 to 4.3.3 (#9079)

Bumps [puma](https://github.com/puma/puma) from 4.3.2 to 4.3.3.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.3.2...v4.3.3)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index e406cbd262..cd20b13fd1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -264,7 +264,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.3)
-    puma (4.3.2)
+    puma (4.3.3)
       nio4r (~> 2.0)
     r2 (0.2.7)
     rack (2.0.8)

From 8e7868b4051376f7849dae5aa043d7636803cf9a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2020 14:10:19 -0500
Subject: [PATCH 0043/1830] Build(deps-dev): Bump rubocop from 0.80.0 to 0.80.1
 (#9081)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.80.0 to 0.80.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.80.0...v0.80.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index cd20b13fd1..18d6188199 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -252,7 +252,7 @@ GEM
     parallel (1.19.1)
     parallel_tests (2.31.0)
       parallel
-    parser (2.7.0.2)
+    parser (2.7.0.4)
       ast (~> 2.4.0)
     pg (1.2.2)
     progress (3.5.2)
@@ -339,7 +339,7 @@ GEM
       rspec-support (~> 3.8)
     rspec-support (3.9.2)
     rtlit (0.0.5)
-    rubocop (0.80.0)
+    rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)

From 5c39e21c1826d1d7e71ca188a9517cc99e1c0164 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Mon, 2 Mar 2020 20:20:37 +0100
Subject: [PATCH 0044/1830] UX: Allow correct pluralization for "too few topics
 and posts" notices (#8947)

---
 .../components/create-topics-notice.js.es6    | 10 +++++-----
 config/locales/client.en.yml                  | 19 ++++++++++++++++---
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/create-topics-notice.js.es6 b/app/assets/javascripts/discourse/components/create-topics-notice.js.es6
index 5622cfab94..7789ccd2bc 100644
--- a/app/assets/javascripts/discourse/components/create-topics-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/create-topics-notice.js.es6
@@ -68,21 +68,21 @@ export default Component.extend({
     "topicTrackingState.incomingCount"
   )
   message() {
-    var msg = null;
+    let msg = null;
 
     if (
       this.publicTopicCount < this.requiredTopics &&
       this.publicPostCount < this.requiredPosts
     ) {
-      msg = "too_few_topics_and_posts_notice";
+      msg = "too_few_topics_and_posts_notice_MF";
     } else if (this.publicTopicCount < this.requiredTopics) {
-      msg = "too_few_topics_notice";
+      msg = "too_few_topics_notice_MF";
     } else {
-      msg = "too_few_posts_notice";
+      msg = "too_few_posts_notice_MF";
     }
 
     return new Handlebars.SafeString(
-      I18n.t(msg, {
+      I18n.messageFormat(msg, {
         requiredTopics: this.requiredTopics,
         requiredPosts: this.requiredPosts,
         currentTopics: this.publicTopicCount,
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 2253b4fe8e..127c964d04 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1372,9 +1372,22 @@ en:
       enabled: "This site is in read only mode. Please continue to browse, but replying, likes, and other actions are disabled for now."
       login_disabled: "Login is disabled while the site is in read only mode."
       logout_disabled: "Logout is disabled while the site is in read only mode."
-    too_few_topics_and_posts_notice: "Let's <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>start the discussion!</a> There are <strong>%{currentTopics}</strong> topics and <strong>%{currentPosts}</strong> posts. Visitors need more to read and reply to – we recommend at least <strong>%{requiredTopics}</strong> topics and <strong>%{requiredPosts}</strong> posts. Only staff can see this message."
-    too_few_topics_notice: "Let's <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>start the discussion!</a> There are <strong>%{currentTopics}</strong> topics. Visitors need more to read and reply to – we recommend at least <strong>%{requiredTopics}</strong> topics. Only staff can see this message."
-    too_few_posts_notice: "Let's <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>start the discussion!</a> There are <strong>%{currentPosts}</strong> posts. Visitors need more to read and reply to – we recommend at least <strong>%{requiredPosts}</strong> posts. Only staff can see this message."
+    too_few_topics_and_posts_notice_MF: >-
+      Let's <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">start the discussion!</a>
+      There {currentTopics, plural, one {is <strong>#</strong> topic} other {are <strong>#</strong> topics}} and
+      {currentPosts, plural, one {<strong>#</strong> post} other {<strong>#</strong> posts}}. Visitors need more to
+      read and reply to – we recommend at least {requiredTopics, plural, one {<strong>#</strong> topic} other {<strong>#</strong> topics}}
+      and {requiredPosts, plural, one {<strong>#</strong> post} other {<strong>#</strong> posts}}. Only staff can see this message.
+    too_few_topics_notice_MF: >-
+      Let's <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">start the discussion!</a>
+      There {currentTopics, plural, one {is <strong>#</strong> topic} other {are <strong>#</strong> topics}}. Visitors need more to
+      read and reply to – we recommend at least {requiredTopics, plural, one {<strong>#</strong> topic} other {<strong>#</strong> topics}}.
+      Only staff can see this message.
+    too_few_posts_notice_MF: >-
+      Let's <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">start the discussion!</a>
+      There {currentPosts, plural, one {is <strong>#</strong> post} other {are <strong>#</strong> posts}}. Visitors need more to
+      read and reply to – we recommend at least {requiredPosts, plural, one {<strong>#</strong> post} other {<strong>#</strong> posts}}.
+      Only staff can see this message.
     logs_error_rate_notice:
       # keys ending with _MF use message format, see https://meta.discourse.org/t/message-format-support-for-localization/7035 for details
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} other {# errors/hour}}</a> reached site setting limit of {limit, plural, one {# error/hour} other {# errors/hour}}."

From a09e5d12c23f2372c292e9b8cede4a63ddc8b0f0 Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Mon, 2 Mar 2020 11:21:35 -0800
Subject: [PATCH 0045/1830] FIX: Topics should honor auto-close when published
 to category (#8963)

* FIX: Topics should honor auto-close when published to category

* Add test
---
 app/jobs/regular/publish_topic_to_category.rb |  2 ++
 spec/jobs/publish_topic_to_category_spec.rb   | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/app/jobs/regular/publish_topic_to_category.rb b/app/jobs/regular/publish_topic_to_category.rb
index 1b86fc9034..79df028007 100644
--- a/app/jobs/regular/publish_topic_to_category.rb
+++ b/app/jobs/regular/publish_topic_to_category.rb
@@ -12,6 +12,8 @@ module Jobs
       TopicTimer.transaction do
         TopicPublisher.new(topic, Discourse.system_user, topic_timer.category_id).publish!
       end
+
+      Topic.find(topic.id).inherit_auto_close_from_category
     end
   end
 end
diff --git a/spec/jobs/publish_topic_to_category_spec.rb b/spec/jobs/publish_topic_to_category_spec.rb
index 4b9a526b12..3602eaa5b3 100644
--- a/spec/jobs/publish_topic_to_category_spec.rb
+++ b/spec/jobs/publish_topic_to_category_spec.rb
@@ -84,4 +84,22 @@ RSpec.describe Jobs::PublishTopicToCategory do
       expect(message.data[:refresh_stream]).to be_present
     end
   end
+
+  describe 'when new category has a default auto-close' do
+    before do
+      another_category.update!(auto_close_hours: 5)
+    end
+
+    it 'should apply the auto-close timer upon publishing' do
+      topic
+
+      described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
+
+      topic.reload
+      topic_timer = topic.public_topic_timer
+      expect(topic.category).to eq(another_category)
+      expect(topic_timer.status_type).to eq(TopicTimer.types[:close])
+      expect(topic_timer.execute_at).to be_within(1.second).of(5.hours.from_now)
+    end
+  end
 end

From f9cc3dc4b7717d6dc40369742ef7cec1f918949a Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 2 Mar 2020 19:22:49 +0000
Subject: [PATCH 0046/1830] PERF: Allow passing an existing list of user field
 ids when loading (#8970)

* PERF: Allow passing an existing list of user field ids when loading

This avoids the need for running `UserField.pluck(:id)` for each user that is serialized

* Memoize user_fields to avoid rebuilding hash ever time
---
 app/models/user.rb                      | 22 +++++++++++++---------
 app/serializers/user_card_serializer.rb |  4 ++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index c4aa017b8d..e8cc35f891 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -475,7 +475,7 @@ class User < ActiveRecord::Base
     @unread_notifications = nil
     @unread_total_notifications = nil
     @unread_pms = nil
-    @user_fields = nil
+    @user_fields_cache = nil
     @ignored_user_ids = nil
     @muted_user_ids = nil
     super
@@ -1093,16 +1093,20 @@ class User < ActiveRecord::Base
 
   USER_FIELD_PREFIX ||= "user_field_"
 
-  def user_fields
-    return @user_fields if @user_fields
-    user_field_ids = UserField.pluck(:id)
-    if user_field_ids.present?
-      @user_fields = {}
-      user_field_ids.each do |fid|
-        @user_fields[fid.to_s] = custom_fields["#{USER_FIELD_PREFIX}#{fid}"]
+  def user_fields(field_ids = nil)
+    if field_ids.nil?
+      field_ids = (@all_user_field_ids ||= UserField.pluck(:id))
+    end
+
+    @user_fields_cache ||= {}
+
+    # Memoize based on requested fields
+    @user_fields_cache[field_ids.join(':')] ||= {}.tap do |hash|
+      field_ids.each do |fid|
+        # The hash keys are strings for backwards compatibility
+        hash[fid.to_s] = custom_fields["#{USER_FIELD_PREFIX}#{fid}"]
       end
     end
-    @user_fields
   end
 
   def number_of_deleted_posts
diff --git a/app/serializers/user_card_serializer.rb b/app/serializers/user_card_serializer.rb
index a689fc5957..5d53a6258c 100644
--- a/app/serializers/user_card_serializer.rb
+++ b/app/serializers/user_card_serializer.rb
@@ -140,8 +140,8 @@ class UserCardSerializer < BasicUserSerializer
   end
 
   def user_fields
-    allowed_keys = scope.allowed_user_field_ids(object).map(&:to_s)
-    object.user_fields&.select { |k, v| allowed_keys.include?(k) }
+    allowed_keys = scope.allowed_user_field_ids(object)
+    object.user_fields(allowed_keys)
   end
 
   def include_user_fields?

From 76a06dfa038cb1f6bd7797d9514c824b4359b611 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 2 Mar 2020 20:23:46 +0100
Subject: [PATCH 0047/1830] DEV: Remove the last (defunct) use of Ember.View
 (#8976)

This codepath has been deprecated 3 years ago in c5687100b04662b3d754ed0a8ae053d6298fca26.

Ember.View has been removed in Ember 2.0.
---
 .../discourse/widgets/connector.js.es6        | 33 ++-----------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/connector.js.es6 b/app/assets/javascripts/discourse/widgets/connector.js.es6
index 9701f4c80a..99b8053881 100644
--- a/app/assets/javascripts/discourse/widgets/connector.js.es6
+++ b/app/assets/javascripts/discourse/widgets/connector.js.es6
@@ -1,5 +1,4 @@
 import { next } from "@ember/runloop";
-import deprecated from "discourse-common/lib/deprecated";
 import { setOwner, getOwner } from "@ember/application";
 
 export default class Connector {
@@ -16,44 +15,18 @@ export default class Connector {
     next(() => {
       const mounted = widget._findView();
 
-      if (opts.templateName) {
-        deprecated(
-          `Using a 'templateName' for a connector is deprecated. Use 'component' instead [${opts.templateName}]`
-        );
-      }
-
-      const container = getOwner ? getOwner(mounted) : mounted.container;
-
-      let view;
-
       if (opts.component) {
         const connector = widget.register.lookupFactory(
           "component:connector-container"
         );
-        view = connector.create({
+
+        const view = connector.create({
           layoutName: `components/${opts.component}`,
           model: widget.findAncestorModel()
         });
-      }
 
-      if (opts.templateName) {
-        let context;
-        if (opts.context === "model") {
-          const model = widget.findAncestorModel();
-          context = model;
-        }
+        setOwner(view, getOwner(mounted));
 
-        view = Ember.View.create({
-          container: container || widget.register,
-          templateName: opts.templateName,
-          context
-        });
-      }
-
-      if (view) {
-        if (setOwner) {
-          setOwner(view, getOwner(mounted));
-        }
         mounted._connected.push(view);
         view.renderer.appendTo(view, $elem[0]);
       }

From fedd8e3e3a1b45eb15e83908e5deb65251cbcb8e Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 2 Mar 2020 20:24:05 +0100
Subject: [PATCH 0048/1830] DEV: Remove uses of deprecated `Ember.copy` and
 `Copyable` (#8978)

---
 .../admin/controllers/admin-customize-colors-show.js.es6        | 2 +-
 .../javascripts/admin/controllers/admin-customize-colors.js.es6 | 2 +-
 app/assets/javascripts/admin/models/color-scheme.js.es6         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
index 9cdca3f098..a27022390f 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
@@ -53,7 +53,7 @@ export default Controller.extend({
     },
 
     copy() {
-      var newColorScheme = Ember.copy(this.model, true);
+      const newColorScheme = this.model.copy();
       newColorScheme.set(
         "name",
         I18n.t("admin.customize.colors.copy_name_prefix") +
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
index 869918bebb..e2ff119aa4 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
@@ -26,7 +26,7 @@ export default Controller.extend({
   actions: {
     newColorSchemeWithBase(baseKey) {
       const base = this.baseColorSchemes.findBy("base_scheme_id", baseKey);
-      const newColorScheme = Ember.copy(base, true);
+      const newColorScheme = base.copy();
       newColorScheme.setProperties({
         name: I18n.t("admin.customize.colors.new_name"),
         base_scheme_id: base.get("base_scheme_id")
diff --git a/app/assets/javascripts/admin/models/color-scheme.js.es6 b/app/assets/javascripts/admin/models/color-scheme.js.es6
index 8486002386..afabb1ed6e 100644
--- a/app/assets/javascripts/admin/models/color-scheme.js.es6
+++ b/app/assets/javascripts/admin/models/color-scheme.js.es6
@@ -4,7 +4,7 @@ import { ajax } from "discourse/lib/ajax";
 import ColorSchemeColor from "admin/models/color-scheme-color";
 import EmberObject from "@ember/object";
 
-const ColorScheme = EmberObject.extend(Ember.Copyable, {
+const ColorScheme = EmberObject.extend({
   init() {
     this._super(...arguments);
 

From 176aa0ac7db32eefb6a4656f97cef9a23c44323c Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 2 Mar 2020 13:24:31 -0600
Subject: [PATCH 0049/1830] DEV: Import pretender instead of global server var
 (#8996)

* DEV: Remove server global test variable

* Delete yarn-error.log

* prettier and some eslint fixes

* add global server variable back for plugins

* rename imported server to pretender

* prettier

* support plugin server. usage

* Export pretender as named

* Prettier

* change default pretender export

* fix bad import

* Use pretender() and original default export

* export new Pretender as default

* fix accidental change

* WIP testing

* add pretend handlers in correct location

* move more stuff into the correct pretender

* Consolidated more pretenders

* comment out another bad test

* fix user acceptance tests

* commented out bad test

* fixed another composer server stub

* fix more tests

* fixed tag test pretender

* Fix admin email test

* removed another draft handler

* add back test

* fix and uncomment another test

* remove test that is not useful

* remove commented out lines

* reapply handlers between every test

* no need to re-stub requests now :)

* cleanup from review

* more cleanup
---
 .../acceptance/admin-emails-test.js.es6       |    6 +-
 .../acceptance/admin-user-emails-test.js.es6  |   62 +-
 .../acceptance/admin-user-index-test.js.es6   |    8 +-
 .../acceptance/click-track-test.js.es6        |    4 +-
 .../acceptance/composer-actions-test.js.es6   |   23 +-
 .../composer-edit-conflict-test.js.es6        |   44 +-
 .../acceptance/composer-test.js.es6           |   50 +-
 .../composer-uncategorized-test.js.es6        |    8 -
 test/javascripts/acceptance/group-test.js.es6 |  175 +-
 .../acceptance/keyboard-shortcuts-test.js.es6 |   10 +-
 ...l-and-hide-email-address-taken-test.js.es6 |    4 +-
 test/javascripts/acceptance/tags-test.js.es6  |   55 +-
 test/javascripts/acceptance/user-test.js.es6  |   20 +-
 .../components/admin-report-test.js.es6       |   20 +-
 .../components/badge-title-test.js.es6        |    4 +-
 .../select-kit/tag-drop-test.js.es6           |   14 +-
 .../select-kit/user-chooser-test.js.es6       |    6 +-
 .../javascripts/controllers/topic-test.js.es6 |    4 +-
 test/javascripts/fixtures/draft.js.es6        |   15 +
 .../helpers/create-pretender.js.es6           | 1444 +++++++++--------
 .../lib/click-track-edit-history-test.js.es6  |   10 +-
 .../lib/click-track-profile-page-test.js.es6  |   10 +-
 test/javascripts/lib/click-track-test.js.es6  |   13 +-
 .../javascripts/lib/link-mentions-test.js.es6 |    4 +-
 test/javascripts/lib/oneboxer-test.js.es6     |   12 +-
 test/javascripts/lib/screen-track-test.js.es6 |    4 +-
 .../lib/upload-short-url-test.js.es6          |    4 +-
 test/javascripts/lib/user-search-test.js.es6  |   14 +-
 .../models/post-stream-test.js.es6            |    4 +-
 test/javascripts/test_helper.js               |   34 +-
 30 files changed, 1050 insertions(+), 1035 deletions(-)

diff --git a/test/javascripts/acceptance/admin-emails-test.js.es6 b/test/javascripts/acceptance/admin-emails-test.js.es6
index f44cf638e9..652dbcf757 100644
--- a/test/javascripts/acceptance/admin-emails-test.js.es6
+++ b/test/javascripts/acceptance/admin-emails-test.js.es6
@@ -1,4 +1,5 @@
 import { acceptance } from "helpers/qunit-helpers";
+import pretender from "helpers/create-pretender";
 
 acceptance("Admin - Emails", { loggedIn: true });
 
@@ -16,15 +17,14 @@ Hello, this is a test!
 This part should be elided.`.trim();
 
 QUnit.test("shows selected and elided text", async assert => {
-  // prettier-ignore
-  server.post("/admin/email/advanced-test", () => { // eslint-disable-line no-undef
+  pretender.post("/admin/email/advanced-test", () => {
     return [
       200,
       { "Content-Type": "application/json" },
       {
         format: 1,
         text: "Hello, this is a test!",
-        elided: "---\n\nThis part should be elided.",
+        elided: "---\n\nThis part should be elided."
       }
     ];
   });
diff --git a/test/javascripts/acceptance/admin-user-emails-test.js.es6 b/test/javascripts/acceptance/admin-user-emails-test.js.es6
index 6fa2965bfb..a9c0c2dcb3 100644
--- a/test/javascripts/acceptance/admin-user-emails-test.js.es6
+++ b/test/javascripts/acceptance/admin-user-emails-test.js.es6
@@ -2,19 +2,6 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Admin - User Emails", { loggedIn: true });
 
-const responseWithSecondary = secondaryEmails => {
-  return [
-    200,
-    { "Content-Type": "application/json" },
-    {
-      id: 1,
-      username: "eviltrout",
-      email: "eviltrout@example.com",
-      secondary_emails: secondaryEmails
-    }
-  ];
-};
-
 const assertNoSecondary = assert => {
   assert.equal(
     find(".display-row.email .value a").text(),
@@ -31,49 +18,40 @@ const assertNoSecondary = assert => {
   );
 };
 
-const assertMultipleSecondary = assert => {
+const assertMultipleSecondary = (assert, firstEmail, secondEmail) => {
   assert.equal(
     find(".display-row.secondary-emails .value li:first-of-type a").text(),
-    "eviltrout1@example.com",
+    firstEmail,
     "it should display the first secondary email"
   );
 
   assert.equal(
     find(".display-row.secondary-emails .value li:last-of-type a").text(),
-    "eviltrout2@example.com",
+    secondEmail,
     "it should display the second secondary email"
   );
 };
 
 QUnit.test("viewing self without secondary emails", async assert => {
-  // prettier-ignore
-  server.get("/admin/users/1.json", () => { // eslint-disable-line no-undef
-    return responseWithSecondary([]);
-  });
-
   await visit("/admin/users/1/eviltrout");
 
   assertNoSecondary(assert);
 });
 
 QUnit.test("viewing self with multiple secondary emails", async assert => {
-  // prettier-ignore
-  server.get("/admin/users/1.json", () => { // eslint-disable-line no-undef
-    return responseWithSecondary([
-      "eviltrout1@example.com",
-      "eviltrout2@example.com",
-    ]);
-  });
-
-  await visit("/admin/users/1/eviltrout");
+  await visit("/admin/users/3/markvanlan");
 
   assert.equal(
     find(".display-row.email .value a").text(),
-    "eviltrout@example.com",
+    "markvanlan@example.com",
     "it should display the user's primary email"
   );
 
-  assertMultipleSecondary(assert);
+  assertMultipleSecondary(
+    assert,
+    "markvanlan1@example.com",
+    "markvanlan2@example.com"
+  );
 });
 
 QUnit.test("viewing another user with no secondary email", async assert => {
@@ -84,20 +62,12 @@ QUnit.test("viewing another user with no secondary email", async assert => {
 });
 
 QUnit.test("viewing another account with secondary emails", async assert => {
-  // prettier-ignore
-  server.get("/u/regular/emails.json", () => { // eslint-disable-line no-undef
-    return [
-      200,
-      { "Content-Type": "application/json" },
-      {
-        email: "eviltrout@example.com",
-        secondary_emails: ["eviltrout1@example.com", "eviltrout2@example.com"]
-      }
-    ];
-  });
-
-  await visit("/admin/users/1234/regular");
+  await visit("/admin/users/1235/regular1");
   await click(`.display-row.secondary-emails button`);
 
-  assertMultipleSecondary(assert);
+  assertMultipleSecondary(
+    assert,
+    "regular2alt1@example.com",
+    "regular2alt2@example.com"
+  );
 });
diff --git a/test/javascripts/acceptance/admin-user-index-test.js.es6 b/test/javascripts/acceptance/admin-user-index-test.js.es6
index 6322a0da55..6ea2fd87f0 100644
--- a/test/javascripts/acceptance/admin-user-index-test.js.es6
+++ b/test/javascripts/acceptance/admin-user-index-test.js.es6
@@ -1,10 +1,11 @@
 import selectKit from "helpers/select-kit-helper";
 import { acceptance } from "helpers/qunit-helpers";
+import pretender from "helpers/create-pretender";
 
 acceptance("Admin - User Index", {
   loggedIn: true,
-  pretend(server, helper) {
-    server.get("/groups/search.json", () => {
+  pretend(pretenderServer, helper) {
+    pretenderServer.get("/groups/search.json", () => {
       return helper.response([
         {
           id: 42,
@@ -35,8 +36,7 @@ acceptance("Admin - User Index", {
 });
 
 QUnit.test("can edit username", async assert => {
-  /* global server */
-  server.put("/users/sam/preferences/username", () => [
+  pretender.put("/users/sam/preferences/username", () => [
     200,
     { "Content-Type": "application/json" },
     { id: 2, username: "new-sam" }
diff --git a/test/javascripts/acceptance/click-track-test.js.es6 b/test/javascripts/acceptance/click-track-test.js.es6
index fe7251fec1..d26e96d5a5 100644
--- a/test/javascripts/acceptance/click-track-test.js.es6
+++ b/test/javascripts/acceptance/click-track-test.js.es6
@@ -1,10 +1,10 @@
+import pretender from "helpers/create-pretender";
 import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Click Track", {});
 
 QUnit.test("Do not track mentions", async assert => {
-  /* global server */
-  server.post("/clicks/track", () => assert.ok(false));
+  pretender.post("/clicks/track", () => assert.ok(false));
 
   await visit("/t/internationalization-localization/280");
   assert.ok(invisible(".user-card"), "card should not appear");
diff --git a/test/javascripts/acceptance/composer-actions-test.js.es6 b/test/javascripts/acceptance/composer-actions-test.js.es6
index c95497eb08..bd7458ccb0 100644
--- a/test/javascripts/acceptance/composer-actions-test.js.es6
+++ b/test/javascripts/acceptance/composer-actions-test.js.es6
@@ -349,19 +349,21 @@ acceptance("Composer Actions With New Topic Draft", {
   },
   beforeEach() {
     _clearSnapshots();
-  },
-  pretend(server, helper) {
-    server.get("draft.json", () => {
-      return helper.response({
-        draft:
-          '{"reply":"dum de dum da ba.","action":"createTopic","title":"dum da ba dum dum","categoryId":null,"archetypeId":"regular","metaData":null,"composerTime":540879,"typingTime":3400}',
-        draft_sequence: 0
-      });
-    });
   }
 });
 
+const stubDraftResponse = () => {
+  sandbox.stub(Draft, "get").returns(
+    Promise.resolve({
+      draft:
+        '{"reply":"dum de dum da ba.","action":"createTopic","title":"dum da ba dum dum","categoryId":null,"archetypeId":"regular","metaData":null,"composerTime":540879,"typingTime":3400}',
+      draft_sequence: 0
+    })
+  );
+};
+
 QUnit.test("shared draft", async assert => {
+  stubDraftResponse();
   try {
     toggleCheckDraftPopup(true);
 
@@ -399,6 +401,7 @@ QUnit.test("shared draft", async assert => {
   } finally {
     toggleCheckDraftPopup(false);
   }
+  sandbox.restore();
 });
 
 QUnit.test("reply_as_new_topic with new_topic draft", async assert => {
@@ -406,10 +409,12 @@ QUnit.test("reply_as_new_topic with new_topic draft", async assert => {
   await click(".create.reply");
   const composerActions = selectKit(".composer-actions");
   await composerActions.expand();
+  stubDraftResponse();
   await composerActions.selectRowByValue("reply_as_new_topic");
   assert.equal(
     find(".bootbox .modal-body").text(),
     I18n.t("composer.composer_actions.reply_as_new_topic.confirm")
   );
   await click(".modal-footer .btn.btn-default");
+  sandbox.restore();
 });
diff --git a/test/javascripts/acceptance/composer-edit-conflict-test.js.es6 b/test/javascripts/acceptance/composer-edit-conflict-test.js.es6
index ee4d22e4c4..890a7dff5c 100644
--- a/test/javascripts/acceptance/composer-edit-conflict-test.js.es6
+++ b/test/javascripts/acceptance/composer-edit-conflict-test.js.es6
@@ -1,18 +1,15 @@
 import { acceptance } from "helpers/qunit-helpers";
+import pretender from "helpers/create-pretender";
 
 acceptance("Composer - Edit conflict", {
   loggedIn: true
 });
 
 QUnit.test("Edit a post that causes an edit conflict", async assert => {
-  // prettier-ignore
-  server.put("/posts/398", () => [ // eslint-disable-line no-undef
-    409, { "Content-Type": "application/json" }, { errors: ["edit conflict"] }
-  ]);
-
   await visit("/t/internationalization-localization/280");
   await click(".topic-post:eq(0) button.show-more-actions");
   await click(".topic-post:eq(0) button.edit");
+  await fillIn(".d-editor-input", "this will 409");
   await click("#reply-control button.create");
   assert.equal(
     find("#reply-control button.create")
@@ -28,14 +25,33 @@ QUnit.test("Edit a post that causes an edit conflict", async assert => {
   await click(".modal .btn-primary");
 });
 
+function handleDraftPretender(assert) {
+  pretender.post("/draft.json", request => {
+    if (
+      request.requestBody.indexOf("%22reply%22%3A%22%22") === -1 &&
+      request.requestBody.indexOf("Any+plans+to+support+localization") !== -1
+    ) {
+      assert.notEqual(request.requestBody.indexOf("originalText"), -1);
+    }
+    if (
+      request.requestBody.indexOf(
+        "draft_key=topic_280&sequence=4&data=%7B%22reply%22%3A%22hello+world+hello+world+hello+world+hello+world+hello+world%22%2C%22action%22%3A%22reply%22%2C%22categoryId%22%3A2%2C%22archetypeId%22%3A%22regular%22%2C%22metaData"
+      ) !== -1
+    ) {
+      assert.equal(
+        request.requestBody.indexOf("originalText"),
+        -1,
+        request.requestBody
+      );
+    }
+    return [200, { "Content-Type": "application/json" }, { success: true }];
+  });
+}
+
 QUnit.test(
   "Should not send originalText when posting a new reply",
   async assert => {
-    // prettier-ignore
-    server.post("/draft.json", request => { // eslint-disable-line no-undef
-      assert.equal(request.requestBody.indexOf("originalText"), -1, request.requestBody);
-      return [ 200, { "Content-Type": "application/json" }, { success: true } ];
-    });
+    handleDraftPretender(assert);
 
     await visit("/t/internationalization-localization/280");
     await click(".topic-post:eq(0) button.reply");
@@ -47,13 +63,7 @@ QUnit.test(
 );
 
 QUnit.test("Should send originalText when editing a reply", async assert => {
-  // prettier-ignore
-  server.post("/draft.json", request => { // eslint-disable-line no-undef
-    if (request.requestBody.indexOf("%22reply%22%3A%22%22") === -1) {
-      assert.notEqual(request.requestBody.indexOf("originalText"), -1);
-    }
-    return [ 200, { "Content-Type": "application/json" }, { success: true } ];
-  });
+  handleDraftPretender(assert);
 
   await visit("/t/internationalization-localization/280");
   await click(".topic-post:eq(0) button.show-more-actions");
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6
index 47f2fc99a3..b9da96ee5e 100644
--- a/test/javascripts/acceptance/composer-test.js.es6
+++ b/test/javascripts/acceptance/composer-test.js.es6
@@ -2,17 +2,13 @@ import { run } from "@ember/runloop";
 import selectKit from "helpers/select-kit-helper";
 import { acceptance } from "helpers/qunit-helpers";
 import { toggleCheckDraftPopup } from "discourse/controllers/composer";
+import Draft from "discourse/models/draft";
+import { Promise } from "rsvp";
 
 acceptance("Composer", {
   loggedIn: true,
-  pretend(server, helper) {
-    server.get("/draft.json", () => {
-      return helper.response({
-        draft: null,
-        draft_sequence: 42
-      });
-    });
-    server.post("/uploads/lookup-urls", () => {
+  pretend(pretenderServer, helper) {
+    pretenderServer.post("/uploads/lookup-urls", () => {
       return helper.response([]);
     });
   },
@@ -617,14 +613,6 @@ QUnit.test("Checks for existing draft", async assert => {
   try {
     toggleCheckDraftPopup(true);
 
-    // prettier-ignore
-    server.get("/draft.json", () => { // eslint-disable-line no-undef
-      return [ 200, { "Content-Type": "application/json" }, {
-        draft: "{\"reply\":\"This is a draft of the first post\",\"action\":\"reply\",\"categoryId\":1,\"archetypeId\":\"regular\",\"metaData\":null,\"composerTime\":2863,\"typingTime\":200}",
-        draft_sequence: 42
-      } ];
-    });
-
     await visit("/t/internationalization-localization/280");
 
     await click(".topic-post:eq(0) button.show-more-actions");
@@ -646,18 +634,17 @@ QUnit.test("Can switch states without abandon popup", async assert => {
 
     const longText = "a".repeat(256);
 
+    sandbox.stub(Draft, "get").returns(
+      Promise.resolve({
+        draft: null,
+        draft_sequence: 0
+      })
+    );
+
     await click(".btn-primary.create.btn");
 
     await fillIn(".d-editor-input", longText);
 
-    // prettier-ignore
-    server.get("/draft.json", () => { // eslint-disable-line no-undef
-      return [ 200, { "Content-Type": "application/json" }, {
-        draft: "{\"reply\":\"This is a draft of the first post\",\"action\":\"reply\",\"categoryId\":1,\"archetypeId\":\"regular\",\"metaData\":null,\"composerTime\":2863,\"typingTime\":200}",
-        draft_sequence: 42
-      } ];
-    });
-
     await click("article#post_3 button.reply");
 
     const composerActions = selectKit(".composer-actions");
@@ -686,19 +673,20 @@ QUnit.test("Can switch states without abandon popup", async assert => {
   } finally {
     toggleCheckDraftPopup(false);
   }
+  sandbox.restore();
 });
 
 QUnit.test("Loading draft also replaces the recipients", async assert => {
   try {
     toggleCheckDraftPopup(true);
 
-    // prettier-ignore
-    server.get("/draft.json", () => { // eslint-disable-line no-undef
-      return [ 200, { "Content-Type": "application/json" }, {
-         "draft":"{\"reply\":\"hello\",\"action\":\"privateMessage\",\"title\":\"hello\",\"categoryId\":null,\"archetypeId\":\"private_message\",\"metaData\":null,\"usernames\":\"codinghorror\",\"composerTime\":9159,\"typingTime\":2500}",
-         "draft_sequence":0
-      } ];
-    });
+    sandbox.stub(Draft, "get").returns(
+      Promise.resolve({
+        draft:
+          '{"reply":"hello","action":"privateMessage","title":"hello","categoryId":null,"archetypeId":"private_message","metaData":null,"usernames":"codinghorror","composerTime":9159,"typingTime":2500}',
+        draft_sequence: 0
+      })
+    );
 
     await visit("/u/charlie");
     await click("button.compose-pm");
diff --git a/test/javascripts/acceptance/composer-uncategorized-test.js.es6 b/test/javascripts/acceptance/composer-uncategorized-test.js.es6
index 7ca84df311..46dac33167 100644
--- a/test/javascripts/acceptance/composer-uncategorized-test.js.es6
+++ b/test/javascripts/acceptance/composer-uncategorized-test.js.es6
@@ -3,14 +3,6 @@ import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
 
 acceptance("Composer and uncategorized is not allowed", {
   loggedIn: true,
-  pretend(server, helper) {
-    server.get("/draft.json", () => {
-      return helper.response({
-        draft: null,
-        draft_sequence: 42
-      });
-    });
-  },
   settings: {
     enable_whispers: true,
     allow_uncategorized_topics: false
diff --git a/test/javascripts/acceptance/group-test.js.es6 b/test/javascripts/acceptance/group-test.js.es6
index af5bc39935..9ba5a9f2f0 100644
--- a/test/javascripts/acceptance/group-test.js.es6
+++ b/test/javascripts/acceptance/group-test.js.es6
@@ -1,12 +1,13 @@
 import selectKit from "helpers/select-kit-helper";
 import { acceptance } from "helpers/qunit-helpers";
+import pretender from "helpers/create-pretender";
 
 let groupArgs = {
   settings: {
     enable_group_directory: true
   },
-  pretend(server, helper) {
-    server.post("/groups/Macdonald/request_membership", () => {
+  pretend(pretenderServer, helper) {
+    pretenderServer.post("/groups/Macdonald/request_membership", () => {
       return helper.response({
         relative_url: "/t/internationalization-localization/280"
       });
@@ -127,10 +128,12 @@ QUnit.test("User Viewing Group", async assert => {
 QUnit.test(
   "Admin viewing group messages when there are no messages",
   async assert => {
-    // prettier-ignore
-    server.get("/topics/private-messages-group/eviltrout/discourse.json", () => { // eslint-disable-line no-undef
-      return response({ topic_list: { topics: [] } });
-    });
+    pretender.get(
+      "/topics/private-messages-group/eviltrout/discourse.json",
+      () => {
+        return response({ topic_list: { topics: [] } });
+      }
+    );
 
     await visit("/g/discourse");
     await click(".nav-pills li a[title='Messages']");
@@ -146,87 +149,89 @@ QUnit.test(
 );
 
 QUnit.test("Admin viewing group messages", async assert => {
-  // prettier-ignore
-  server.get("/topics/private-messages-group/eviltrout/discourse.json", () => { // eslint-disable-line no-undef
-    return response({
-      users: [
-        {
-          id: 2,
-          username: "bruce1",
-          avatar_template:
-            "/user_avatar/meta.discourse.org/bruce1/{size}/5245.png"
-        },
-        {
-          id: 3,
-          username: "CodingHorror",
-          avatar_template:
-            "/user_avatar/meta.discourse.org/codinghorror/{size}/5245.png"
-        }
-      ],
-      primary_groups: [],
-      topic_list: {
-        can_create_topic: true,
-        draft: null,
-        draft_key: "new_topic",
-        draft_sequence: 0,
-        per_page: 30,
-        topics: [
+  pretender.get(
+    "/topics/private-messages-group/eviltrout/discourse.json",
+    () => {
+      return response({
+        users: [
           {
-            id: 12199,
-            title: "This is a private message 1",
-            fancy_title: "This is a private message 1",
-            slug: "this-is-a-private-message-1",
-            posts_count: 0,
-            reply_count: 0,
-            highest_post_number: 0,
-            image_url: null,
-            created_at: "2018-03-16T03:38:45.583Z",
-            last_posted_at: null,
-            bumped: true,
-            bumped_at: "2018-03-16T03:38:45.583Z",
-            unseen: false,
-            pinned: false,
-            unpinned: null,
-            visible: true,
-            closed: false,
-            archived: false,
-            bookmarked: null,
-            liked: null,
-            views: 0,
-            like_count: 0,
-            has_summary: false,
-            archetype: "private_message",
-            last_poster_username: "bruce1",
-            category_id: null,
-            pinned_globally: false,
-            featured_link: null,
-            posters: [
-              {
-                extras: "latest single",
-                description: "Original Poster, Most Recent Poster",
-                user_id: 2,
-                primary_group_id: null
-              }
-            ],
-            participants: [
-              {
-                extras: "latest",
-                description: null,
-                user_id: 2,
-                primary_group_id: null
-              },
-              {
-                extras: null,
-                description: null,
-                user_id: 3,
-                primary_group_id: null
-              }
-            ]
+            id: 2,
+            username: "bruce1",
+            avatar_template:
+              "/user_avatar/meta.discourse.org/bruce1/{size}/5245.png"
+          },
+          {
+            id: 3,
+            username: "CodingHorror",
+            avatar_template:
+              "/user_avatar/meta.discourse.org/codinghorror/{size}/5245.png"
           }
-        ]
-      }
-    });
-  });
+        ],
+        primary_groups: [],
+        topic_list: {
+          can_create_topic: true,
+          draft: null,
+          draft_key: "new_topic",
+          draft_sequence: 0,
+          per_page: 30,
+          topics: [
+            {
+              id: 12199,
+              title: "This is a private message 1",
+              fancy_title: "This is a private message 1",
+              slug: "this-is-a-private-message-1",
+              posts_count: 0,
+              reply_count: 0,
+              highest_post_number: 0,
+              image_url: null,
+              created_at: "2018-03-16T03:38:45.583Z",
+              last_posted_at: null,
+              bumped: true,
+              bumped_at: "2018-03-16T03:38:45.583Z",
+              unseen: false,
+              pinned: false,
+              unpinned: null,
+              visible: true,
+              closed: false,
+              archived: false,
+              bookmarked: null,
+              liked: null,
+              views: 0,
+              like_count: 0,
+              has_summary: false,
+              archetype: "private_message",
+              last_poster_username: "bruce1",
+              category_id: null,
+              pinned_globally: false,
+              featured_link: null,
+              posters: [
+                {
+                  extras: "latest single",
+                  description: "Original Poster, Most Recent Poster",
+                  user_id: 2,
+                  primary_group_id: null
+                }
+              ],
+              participants: [
+                {
+                  extras: "latest",
+                  description: null,
+                  user_id: 2,
+                  primary_group_id: null
+                },
+                {
+                  extras: null,
+                  description: null,
+                  user_id: 3,
+                  primary_group_id: null
+                }
+              ]
+            }
+          ]
+        }
+      });
+    }
+  );
 
   await visit("/g/discourse");
   await click(".nav-pills li a[title='Messages']");
diff --git a/test/javascripts/acceptance/keyboard-shortcuts-test.js.es6 b/test/javascripts/acceptance/keyboard-shortcuts-test.js.es6
index 89f8fd5a4c..b238e36118 100644
--- a/test/javascripts/acceptance/keyboard-shortcuts-test.js.es6
+++ b/test/javascripts/acceptance/keyboard-shortcuts-test.js.es6
@@ -1,16 +1,16 @@
 import { acceptance } from "helpers/qunit-helpers";
+import pretender from "helpers/create-pretender";
 
 acceptance("Keyboard Shortcuts", { loggedIn: true });
 
 test("go to first suggested topic", async assert => {
-  /* global server */
-  server.get("/t/27331/4.json", () => [
+  pretender.get("/t/27331/4.json", () => [
     200,
     { "Content-Type": "application/json" },
     {}
   ]);
 
-  server.get("/t/27331.json", () => [
+  pretender.get("/t/27331.json", () => [
     200,
     { "Content-Type": "application/json" },
     {}
@@ -20,7 +20,7 @@ test("go to first suggested topic", async assert => {
    * No suggested topics exist.
    */
 
-  server.get("/t/9/last.json", () => [
+  pretender.get("/t/9/last.json", () => [
     200,
     { "Content-Type": "application/json" },
     {}
@@ -44,7 +44,7 @@ test("go to first suggested topic", async assert => {
    * Suggested topic is returned by server.
    */
 
-  server.get("/t/28830/last.json", () => [
+  pretender.get("/t/28830/last.json", () => [
     200,
     { "Content-Type": "application/json" },
     {
diff --git a/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6 b/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6
index a205a12d05..1c12c1f055 100644
--- a/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6
+++ b/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6
@@ -1,4 +1,5 @@
 import { acceptance } from "helpers/qunit-helpers";
+import pretender from "helpers/create-pretender";
 
 acceptance("Login with email - hide email address taken", {
   settings: {
@@ -10,8 +11,7 @@ acceptance("Login with email - hide email address taken", {
       return [200, { "Content-Type": "application/json" }, object];
     };
 
-    // prettier-ignore
-    server.post("/u/email-login", () => { // eslint-disable-line no-undef
+    pretender.post("/u/email-login", () => {
       return response({ success: "OK" });
     });
   }
diff --git a/test/javascripts/acceptance/tags-test.js.es6 b/test/javascripts/acceptance/tags-test.js.es6
index 276c814a91..e3a6449aa4 100644
--- a/test/javascripts/acceptance/tags-test.js.es6
+++ b/test/javascripts/acceptance/tags-test.js.es6
@@ -1,4 +1,6 @@
 import { updateCurrentUser, acceptance } from "helpers/qunit-helpers";
+import pretender from "helpers/create-pretender";
+
 acceptance("Tags", { loggedIn: true });
 
 QUnit.test("list the tags", async assert => {
@@ -19,48 +21,6 @@ acceptance("Tags listed by group", {
 });
 
 QUnit.test("list the tags in groups", async assert => {
-  // prettier-ignore
-  server.get("/tags", () => { // eslint-disable-line no-undef
-    return [
-      200,
-      { "Content-Type": "application/json" },
-      {
-        tags: [
-          { id: "planned", text: "planned", count: 7, pm_count: 0 },
-          { id: "private", text: "private", count: 0, pm_count: 7 }
-        ],
-        extras: {
-          tag_groups: [
-            {
-              id: 2,
-              name: "Ford Cars",
-              tags: [
-                { id: "Escort", text: "Escort", count: 1, pm_count: 0 },
-                { id: "focus", text: "focus", count: 3, pm_count: 0 }
-              ]
-            },
-            {
-              id: 1,
-              name: "Honda Cars",
-              tags: [
-                { id: "civic", text: "civic", count: 4, pm_count: 0 },
-                { id: "accord", text: "accord", count: 2, pm_count: 0 }
-              ]
-            },
-            {
-              id: 1,
-              name: "Makes",
-              tags: [
-                { id: "ford", text: "ford", count: 5, pm_count: 0 },
-                { id: "honda", text: "honda", count: 6, pm_count: 0 }
-              ]
-            }
-          ]
-        }
-      }
-    ];
-  });
-
   await visit("/tags");
   assert.equal(
     $(".tag-list").length,
@@ -102,14 +62,13 @@ QUnit.test("list the tags in groups", async assert => {
 });
 
 test("new topic button is not available for staff-only tags", async assert => {
-  /* global server */
-  server.get("/tag/regular-tag/notifications", () => [
+  pretender.get("/tag/regular-tag/notifications", () => [
     200,
     { "Content-Type": "application/json" },
     { tag_notification: { id: "regular-tag", notification_level: 1 } }
   ]);
 
-  server.get("/tag/regular-tag/l/latest.json", () => [
+  pretender.get("/tag/regular-tag/l/latest.json", () => [
     200,
     { "Content-Type": "application/json" },
     {
@@ -133,13 +92,13 @@ test("new topic button is not available for staff-only tags", async assert => {
     }
   ]);
 
-  server.get("/tag/staff-only-tag/notifications", () => [
+  pretender.get("/tag/staff-only-tag/notifications", () => [
     200,
     { "Content-Type": "application/json" },
     { tag_notification: { id: "staff-only-tag", notification_level: 1 } }
   ]);
 
-  server.get("/tag/staff-only-tag/l/latest.json", () => [
+  pretender.get("/tag/staff-only-tag/l/latest.json", () => [
     200,
     { "Content-Type": "application/json" },
     {
@@ -286,7 +245,7 @@ test("tag info can show synonyms", async assert => {
 });
 
 test("admin can manage tags", async assert => {
-  server.delete("/tag/planters/synonyms/containers", () => [
+  pretender.delete("/tag/planters/synonyms/containers", () => [
     200,
     { "Content-Type": "application/json" },
     { success: true }
diff --git a/test/javascripts/acceptance/user-test.js.es6 b/test/javascripts/acceptance/user-test.js.es6
index 2f2fc61d08..24f630b942 100644
--- a/test/javascripts/acceptance/user-test.js.es6
+++ b/test/javascripts/acceptance/user-test.js.es6
@@ -1,10 +1,12 @@
 import { acceptance } from "helpers/qunit-helpers";
+import pretender from "helpers/create-pretender";
+import Draft from "discourse/models/draft";
+import { Promise } from "rsvp";
 
 acceptance("User", { loggedIn: true });
 
 QUnit.test("Invalid usernames", async assert => {
-  // prettier-ignore
-  server.get("/u/eviltrout%2F..%2F..%2F.json", () => { // eslint-disable-line no-undef
+  pretender.get("/u/eviltrout%2F..%2F..%2F.json", () => {
     return [400, { "Content-Type": "application/json" }, {}];
   });
 
@@ -67,13 +69,12 @@ QUnit.test("Viewing Summary", async assert => {
 });
 
 QUnit.test("Viewing Drafts", async assert => {
-  // prettier-ignore
-  server.get("/draft.json", () => { // eslint-disable-line no-undef
-    return [ 200, { "Content-Type": "application/json" }, {
-      draft: "{\"reply\":\"This is a draft of the first post\",\"action\":\"reply\",\"categoryId\":1,\"archetypeId\":\"regular\",\"metaData\":null,\"composerTime\":2863,\"typingTime\":200}",
-      draft_sequence: 42
-    } ];
-  });
+  sandbox.stub(Draft, "get").returns(
+    Promise.resolve({
+      draft: null,
+      draft_sequence: 0
+    })
+  );
 
   await visit("/u/eviltrout/activity/drafts");
   assert.ok(exists(".user-stream"), "has drafts stream");
@@ -87,4 +88,5 @@ QUnit.test("Viewing Drafts", async assert => {
     exists(".d-editor-input"),
     "composer is visible after resuming a draft"
   );
+  sandbox.restore();
 });
diff --git a/test/javascripts/components/admin-report-test.js.es6 b/test/javascripts/components/admin-report-test.js.es6
index e713ff693d..dfbab4c64f 100644
--- a/test/javascripts/components/admin-report-test.js.es6
+++ b/test/javascripts/components/admin-report-test.js.es6
@@ -1,4 +1,5 @@
 import componentTest from "helpers/component-test";
+import pretender from "helpers/create-pretender";
 
 moduleForComponent("admin-report", {
   integration: true
@@ -133,13 +134,18 @@ componentTest("exception", {
 
 componentTest("rate limited", {
   beforeEach() {
-    const response = object => {
-      return [429, { "Content-Type": "application/json" }, object];
-    };
-
-    // prettier-ignore
-    server.get("/admin/reports/bulk", () => { //eslint-disable-line
-      return response({"errors":["You’ve performed this action too many times. Please wait 10 seconds before trying again."],"error_type":"rate_limit","extras":{"wait_seconds":10}});
+    pretender.get("/admin/reports/bulk", () => {
+      return [
+        429,
+        { "Content-Type": "application/json" },
+        {
+          errors: [
+            "You’ve performed this action too many times. Please wait 10 seconds before trying again."
+          ],
+          error_type: "rate_limit",
+          extras: { wait_seconds: 10 }
+        }
+      ];
     });
   },
 
diff --git a/test/javascripts/components/badge-title-test.js.es6 b/test/javascripts/components/badge-title-test.js.es6
index 8f1630f844..7be2678269 100644
--- a/test/javascripts/components/badge-title-test.js.es6
+++ b/test/javascripts/components/badge-title-test.js.es6
@@ -1,6 +1,7 @@
 import selectKit from "helpers/select-kit-helper";
 import componentTest from "helpers/component-test";
 import EmberObject from "@ember/object";
+import pretender from "helpers/create-pretender";
 
 moduleForComponent("badge-title", { integration: true });
 
@@ -23,8 +24,7 @@ componentTest("badge title", {
   },
 
   async test(assert) {
-    /* global server */
-    server.put("/u/eviltrout/preferences/badge_title", () => [
+    pretender.put("/u/eviltrout/preferences/badge_title", () => [
       200,
       { "Content-Type": "application/json" },
       {}
diff --git a/test/javascripts/components/select-kit/tag-drop-test.js.es6 b/test/javascripts/components/select-kit/tag-drop-test.js.es6
index 5d758fa90b..2c6d156052 100644
--- a/test/javascripts/components/select-kit/tag-drop-test.js.es6
+++ b/test/javascripts/components/select-kit/tag-drop-test.js.es6
@@ -2,6 +2,7 @@ import componentTest from "helpers/component-test";
 import { testSelectKitModule } from "./select-kit-test-helper";
 import Site from "discourse/models/site";
 import { set } from "@ember/object";
+import pretender from "helpers/create-pretender";
 
 testSelectKitModule("tag-drop", {
   beforeEach() {
@@ -12,19 +13,14 @@ testSelectKitModule("tag-drop", {
       return [200, { "Content-Type": "application/json" }, object];
     };
 
-    // prettier-ignore
-    server.get("/tags/filter/search", (params) => { //eslint-disable-line
+    pretender.get("/tags/filter/search", params => {
       if (params.queryParams.q === "rég") {
         return response({
-          "results": [
-            { "id": "régis", "text": "régis", "count": 2, "pm_count": 0 }
-          ]
+          results: [{ id: "régis", text: "régis", count: 2, pm_count: 0 }]
         });
-      }else if (params.queryParams.q === "dav") {
+      } else if (params.queryParams.q === "dav") {
         return response({
-          "results": [
-            { "id": "David", "text": "David", "count": 2, "pm_count": 0 }
-          ]
+          results: [{ id: "David", text: "David", count: 2, pm_count: 0 }]
         });
       }
     });
diff --git a/test/javascripts/components/select-kit/user-chooser-test.js.es6 b/test/javascripts/components/select-kit/user-chooser-test.js.es6
index 068d8c6a1f..c59d7cb571 100644
--- a/test/javascripts/components/select-kit/user-chooser-test.js.es6
+++ b/test/javascripts/components/select-kit/user-chooser-test.js.es6
@@ -1,5 +1,6 @@
 import componentTest from "helpers/component-test";
 import { testSelectKitModule } from "./select-kit-test-helper";
+import pretender from "helpers/create-pretender";
 
 testSelectKitModule("user-chooser");
 
@@ -42,9 +43,8 @@ componentTest("can add a username", {
       return [200, { "Content-Type": "application/json" }, object];
     };
 
-    // prettier-ignore
-    server.get("/u/search/users", () => { //eslint-disable-line
-      return response({users:[{username: "maja", name: "Maja"}]});
+    pretender.get("/u/search/users", () => {
+      return response({ users: [{ username: "maja", name: "Maja" }] });
     });
   },
 
diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js.es6
index da92e3df31..4277564fad 100644
--- a/test/javascripts/controllers/topic-test.js.es6
+++ b/test/javascripts/controllers/topic-test.js.es6
@@ -5,6 +5,7 @@ import PostStream from "discourse/models/post-stream";
 import { Placeholder } from "discourse/lib/posts-with-placeholders";
 import User from "discourse/models/user";
 import { Promise } from "rsvp";
+import pretender from "helpers/create-pretender";
 
 moduleFor("controller:topic", "controller:topic", {
   needs: [
@@ -522,8 +523,7 @@ QUnit.test("topVisibleChanged", function(assert) {
 QUnit.test(
   "deletePost - no modal is shown if post does not have replies",
   function(assert) {
-    /* global server */
-    server.get("/posts/2/reply-ids.json", () => {
+    pretender.get("/posts/2/reply-ids.json", () => {
       return [200, { "Content-Type": "application/json" }, []];
     });
 
diff --git a/test/javascripts/fixtures/draft.js.es6 b/test/javascripts/fixtures/draft.js.es6
index bdbdfed17c..a1d5ce6b9c 100644
--- a/test/javascripts/fixtures/draft.js.es6
+++ b/test/javascripts/fixtures/draft.js.es6
@@ -2,5 +2,20 @@ export default {
   "/draft.json": {
     draft: null,
     draft_sequence: 0
+  },
+  "/draft.json?draft_key=topic_280": {
+    draft:
+      '{"reply":"This is a draft of the first post","action":"reply","categoryId":1,"archetypeId":"regular","metaData":null,"composerTime":2863,"typingTime":200}',
+    draft_sequence: 42
+  },
+  "/draft.json?draft_key=topic_281": {
+    draft:
+      '{"reply":"dum de dum da ba.","action":"createTopic","title":"dum da ba dum dum","categoryId":null,"archetypeId":"regular","metaData":null,"composerTime":540879,"typingTime":3400}',
+    draft_sequence: 0
+  },
+  "/draft.json?draft_key=topic_9": {
+    draft:
+      '{"reply":"This is a draft of the first post","action":"reply","categoryId":1,"archetypeId":"regular","metaData":null,"composerTime":2863,"typingTime":200}',
+    draft_sequence: 42
   }
 };
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index 5efd61e9a8..76cca6fa51 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -33,724 +33,794 @@ export function success() {
 
 const loggedIn = () => !!User.current();
 const helpers = { response, success, parsePostData };
+
 export let fixturesByUrl;
 
-export default function() {
-  const server = new Pretender(function() {
-    // Autoload any `*-pretender` files
-    Object.keys(requirejs.entries).forEach(e => {
-      let m = e.match(/^.*helpers\/([a-z-]+)\-pretender$/);
-      if (m && m[1] !== "create") {
-        let result = requirejs(e).default.call(this, helpers);
-        if (m[1] === "fixture") {
-          fixturesByUrl = result;
-        }
+export default new Pretender();
+
+export function applyDefaultHandlers(pretender) {
+  // Autoload any `*-pretender` files
+  Object.keys(requirejs.entries).forEach(e => {
+    let m = e.match(/^.*helpers\/([a-z-]+)\-pretender$/);
+    if (m && m[1] !== "create") {
+      let result = requirejs(e).default.call(pretender, helpers);
+      if (m[1] === "fixture") {
+        fixturesByUrl = result;
       }
-    });
+    }
+  });
 
-    this.get("/admin/plugins", () => response({ plugins: [] }));
+  pretender.get("/admin/plugins", () => response({ plugins: [] }));
 
-    this.get("/composer_messages", () => response({ composer_messages: [] }));
+  pretender.get("/composer_messages", () =>
+    response({ composer_messages: [] })
+  );
 
-    this.get("/latest.json", () => {
-      const json = fixturesByUrl["/latest.json"];
+  pretender.get("/latest.json", () => {
+    const json = fixturesByUrl["/latest.json"];
 
-      if (loggedIn()) {
-        // Stuff to let us post
-        json.topic_list.can_create_topic = true;
-        json.topic_list.draft_key = "new_topic";
-        json.topic_list.draft_sequence = 1;
-      }
-      return response(json);
-    });
+    if (loggedIn()) {
+      // Stuff to let us post
+      json.topic_list.can_create_topic = true;
+      json.topic_list.draft_key = "new_topic";
+      json.topic_list.draft_sequence = 1;
+    }
+    return response(json);
+  });
 
-    this.get("/c/bug/1/l/latest.json", () => {
-      const json = fixturesByUrl["/c/bug/1/l/latest.json"];
+  pretender.get("/c/bug/1/l/latest.json", () => {
+    const json = fixturesByUrl["/c/bug/1/l/latest.json"];
 
-      if (loggedIn()) {
-        // Stuff to let us post
-        json.topic_list.can_create_topic = true;
-        json.topic_list.draft_key = "new_topic";
-        json.topic_list.draft_sequence = 1;
-      }
-      return response(json);
-    });
+    if (loggedIn()) {
+      // Stuff to let us post
+      json.topic_list.can_create_topic = true;
+      json.topic_list.draft_key = "new_topic";
+      json.topic_list.draft_sequence = 1;
+    }
+    return response(json);
+  });
 
-    this.get("/tags", () => {
-      return response({
+  pretender.get("/tags", () => {
+    return [
+      200,
+      { "Content-Type": "application/json" },
+      {
         tags: [
-          {
-            id: "eviltrout",
-            count: 1
-          }
-        ]
-      });
-    });
-
-    this.get("/tags/filter/search", () => {
-      return response({ results: [{ text: "monkey", count: 1 }] });
-    });
-
-    this.get(`/u/:username/emails.json`, () => {
-      return response({ email: "eviltrout@example.com" });
-    });
-
-    this.get("/u/eviltrout.json", () => {
-      const json = fixturesByUrl["/u/eviltrout.json"];
-      json.user.can_edit = loggedIn();
-      return response(json);
-    });
-
-    this.get("/u/eviltrout/summary.json", () => {
-      return response({
-        user_summary: {
-          topic_ids: [1234],
-          replies: [{ topic_id: 1234 }],
-          links: [{ topic_id: 1234, url: "https://eviltrout.com" }],
-          most_replied_to_users: [{ id: 333 }],
-          most_liked_by_users: [{ id: 333 }],
-          most_liked_users: [{ id: 333 }],
-          badges: [{ badge_id: 444 }],
-          top_categories: [
+          { id: "eviltrout", count: 1 },
+          { id: "planned", text: "planned", count: 7, pm_count: 0 },
+          { id: "private", text: "private", count: 0, pm_count: 7 }
+        ],
+        extras: {
+          tag_groups: [
+            {
+              id: 2,
+              name: "Ford Cars",
+              tags: [
+                { id: "Escort", text: "Escort", count: 1, pm_count: 0 },
+                { id: "focus", text: "focus", count: 3, pm_count: 0 }
+              ]
+            },
             {
               id: 1,
-              name: "bug",
-              color: "e9dd00",
-              text_color: "000000",
-              slug: "bug",
-              read_restricted: false,
-              parent_category_id: null,
-              topic_count: 1,
-              post_count: 1
+              name: "Honda Cars",
+              tags: [
+                { id: "civic", text: "civic", count: 4, pm_count: 0 },
+                { id: "accord", text: "accord", count: 2, pm_count: 0 }
+              ]
+            },
+            {
+              id: 1,
+              name: "Makes",
+              tags: [
+                { id: "ford", text: "ford", count: 5, pm_count: 0 },
+                { id: "honda", text: "honda", count: 6, pm_count: 0 }
+              ]
             }
           ]
-        },
-        badges: [{ id: 444, count: 1 }],
-        topics: [{ id: 1234, title: "cool title", url: "/t/1234/cool-title" }]
-      });
-    });
-
-    this.get("/u/eviltrout/invited_count.json", () => {
-      return response({
-        counts: { pending: 1, redeemed: 0, total: 0 }
-      });
-    });
-
-    this.get("/u/eviltrout/invited.json", () => {
-      return response({ invites: [{ id: 1 }] });
-    });
-
-    this.get("/topics/private-messages/eviltrout.json", () => {
-      return response(fixturesByUrl["/topics/private-messages/eviltrout.json"]);
-    });
-
-    this.get("/topics/feature_stats.json", () => {
-      return response({
-        pinned_in_category_count: 0,
-        pinned_globally_count: 0,
-        banner_count: 0
-      });
-    });
-
-    this.put("/t/34/convert-topic/public", () => {
-      return response({});
-    });
-
-    this.put("/t/280/make-banner", () => {
-      return response({});
-    });
-
-    this.put("/t/internationalization-localization/280/status", () => {
-      return response({
-        success: "OK",
-        topic_status_update: null
-      });
-    });
-
-    this.post("/clicks/track", success);
-
-    this.get("/search", request => {
-      if (request.queryParams.q === "posts") {
-        return response({
-          posts: [
-            {
-              id: 1234
-            }
-          ]
-        });
-      } else if (request.queryParams.q === "evil") {
-        return response({
-          posts: [
-            {
-              id: 1234
-            }
-          ],
-          tags: [
-            {
-              id: 6,
-              name: "eviltrout"
-            }
-          ]
-        });
+        }
       }
+    ];
+  });
 
-      return response({});
-    });
+  pretender.get("/tags/filter/search", () => {
+    return response({ results: [{ text: "monkey", count: 1 }] });
+  });
 
-    this.put("/u/eviltrout.json", () => response({ user: {} }));
-
-    this.get("/t/280.json", () => response(fixturesByUrl["/t/280/1.json"]));
-    this.get("/t/34.json", () => response(fixturesByUrl["/t/34/1.json"]));
-    this.get("/t/280/:post_number.json", () =>
-      response(fixturesByUrl["/t/280/1.json"])
-    );
-    this.get("/t/28830.json", () => response(fixturesByUrl["/t/28830/1.json"]));
-    this.get("/t/9.json", () => response(fixturesByUrl["/t/9/1.json"]));
-    this.get("/t/12.json", () => response(fixturesByUrl["/t/12/1.json"]));
-    this.put("/t/1234/re-pin", success);
-
-    this.get("/t/id_for/:slug", () => {
+  pretender.get(`/u/:username/emails.json`, request => {
+    if (request.params.username === "regular2") {
       return response({
-        id: 280,
-        slug: "internationalization-localization",
-        url: "/t/internationalization-localization/280"
+        email: "regular2@example.com",
+        secondary_emails: [
+          "regular2alt1@example.com",
+          "regular2alt2@example.com"
+        ]
       });
-    });
+    }
+    return response({ email: "eviltrout@example.com" });
+  });
 
-    this.delete("/t/:id", success);
-    this.put("/t/:id/recover", success);
-    this.put("/t/:id/publish", success);
+  pretender.get("/u/eviltrout.json", () => {
+    const json = fixturesByUrl["/u/eviltrout.json"];
+    json.user.can_edit = loggedIn();
+    return response(json);
+  });
 
-    this.get("/404-body", () => {
-      return [
-        200,
-        { "Content-Type": "text/html" },
-        "<div class='page-not-found'>not found</div>"
-      ];
-    });
-
-    this.delete("/draft.json", success);
-    this.post("/draft.json", success);
-
-    this.get("/u/:username/staff-info.json", () => response({}));
-
-    this.get("/post_action_users", () => {
-      return response({
-        post_action_users: [
+  pretender.get("/u/eviltrout/summary.json", () => {
+    return response({
+      user_summary: {
+        topic_ids: [1234],
+        replies: [{ topic_id: 1234 }],
+        links: [{ topic_id: 1234, url: "https://eviltrout.com" }],
+        most_replied_to_users: [{ id: 333 }],
+        most_liked_by_users: [{ id: 333 }],
+        most_liked_users: [{ id: 333 }],
+        badges: [{ badge_id: 444 }],
+        top_categories: [
           {
             id: 1,
-            username: "eviltrout",
-            avatar_template: "/user_avatar/default/eviltrout/{size}/1.png",
-            username_lower: "eviltrout"
+            name: "bug",
+            color: "e9dd00",
+            text_color: "000000",
+            slug: "bug",
+            read_restricted: false,
+            parent_category_id: null,
+            topic_count: 1,
+            post_count: 1
           }
         ]
-      });
-    });
-
-    this.get("/post_replies", () => {
-      return response({ post_replies: [{ id: 1234, cooked: "wat" }] });
-    });
-
-    this.get("/post_reply_histories", () => {
-      return response({ post_reply_histories: [{ id: 1234, cooked: "wat" }] });
-    });
-
-    this.get("/category_hashtags/check", () => {
-      return response({ valid: [{ slug: "bug", url: "/c/bugs" }] });
-    });
-
-    this.get("/categories_and_latest", () =>
-      response(fixturesByUrl["/categories_and_latest.json"])
-    );
-
-    this.put("/categories/:category_id", request => {
-      const category = parsePostData(request.requestBody);
-      category.id = parseInt(request.params.category_id, 10);
-
-      if (category.email_in === "duplicate@example.com") {
-        return response(422, { errors: ["duplicate email"] });
-      }
-
-      return response({ category });
-    });
-
-    this.get("/draft.json", request => {
-      if (request.queryParams.draft_key === "new_topic") {
-        return response(fixturesByUrl["/draft.json"]);
-      }
-
-      return response({});
-    });
-
-    this.get("/drafts.json", () => response(fixturesByUrl["/drafts.json"]));
-
-    this.put("/queued_posts/:queued_post_id", function(request) {
-      return response({ queued_post: { id: request.params.queued_post_id } });
-    });
-
-    this.get("/queued_posts", function() {
-      return response({
-        queued_posts: [
-          { id: 1, raw: "queued post text", can_delete_user: true }
-        ]
-      });
-    });
-
-    this.post("/session", function(request) {
-      const data = parsePostData(request.requestBody);
-
-      if (data.password === "correct") {
-        return response({ username: "eviltrout" });
-      }
-
-      if (data.password === "not-activated") {
-        return response({
-          error: "not active",
-          reason: "not_activated",
-          sent_to_email: "<small>eviltrout@example.com</small>",
-          current_email: "<small>current@example.com</small>"
-        });
-      }
-
-      if (data.password === "not-activated-edit") {
-        return response({
-          error: "not active",
-          reason: "not_activated",
-          sent_to_email: "eviltrout@example.com",
-          current_email: "current@example.com"
-        });
-      }
-
-      if (data.password === "need-second-factor") {
-        if (data.second_factor_token && data.second_factor_token === "123456") {
-          return response({ username: "eviltrout" });
-        }
-
-        return response({
-          failed: "FAILED",
-          ok: false,
-          error:
-            "Invalid authentication code. Each code can only be used once.",
-          reason: "invalid_second_factor",
-          backup_enabled: true,
-          security_key_enabled: false,
-          totp_enabled: true,
-          multiple_second_factor_methods: false
-        });
-      }
-
-      if (data.password === "need-security-key") {
-        if (data.securityKeyCredential) {
-          return response({ username: "eviltrout" });
-        }
-
-        return response({
-          failed: "FAILED",
-          ok: false,
-          error:
-            "The selected second factor method is not enabled for your account.",
-          reason: "not_enabled_second_factor_method",
-          backup_enabled: false,
-          security_key_enabled: true,
-          totp_enabled: false,
-          multiple_second_factor_methods: false,
-          allowed_credential_ids: ["allowed_credential_ids"],
-          challenge: "challenge"
-        });
-      }
-
-      return response(400, { error: "invalid login" });
-    });
-
-    this.post("/u/action/send_activation_email", success);
-    this.put("/u/update-activation-email", success);
-
-    this.get("/u/hp.json", function() {
-      return response({
-        value: "32faff1b1ef1ac3",
-        challenge: "61a3de0ccf086fb9604b76e884d75801"
-      });
-    });
-
-    this.get("/session/csrf", function() {
-      return response({ csrf: "mgk906YLagHo2gOgM1ddYjAN4hQolBdJCqlY6jYzAYs=" });
-    });
-
-    this.get("/groups/check-name", () => {
-      return response({ available: true });
-    });
-
-    this.get("/u/check_username", function(request) {
-      if (request.queryParams.username === "taken") {
-        return response({ available: false, suggestion: "nottaken" });
-      }
-      return response({ available: true });
-    });
-
-    this.post("/u", () => response({ success: true }));
-
-    this.get("/login.html", () => [200, {}, "LOGIN PAGE"]);
-
-    this.delete("/posts/:post_id", success);
-    this.put("/posts/:post_id/recover", success);
-    this.get("/posts/:post_id/expand-embed", success);
-
-    this.put("/posts/:post_id", request => {
-      const data = parsePostData(request.requestBody);
-      data.post.id = request.params.post_id;
-      data.post.version = 2;
-      return response(200, data.post);
-    });
-
-    this.get("/t/403.json", () => response(403, {}));
-    this.get("/t/404.json", () => response(404, "not found"));
-    this.get("/t/500.json", () => response(502, {}));
-
-    this.put("/t/:slug/:id", request => {
-      const isJSON = request.requestHeaders["Content-Type"].includes(
-        "application/json"
-      );
-
-      const data = isJSON
-        ? JSON.parse(request.requestBody)
-        : parsePostData(request.requestBody);
-
-      return response(200, {
-        basic_topic: {
-          id: request.params.id,
-          title: data.title,
-          fancy_title: data.title,
-          slug: request.params.slug
-        }
-      });
-    });
-
-    this.get("groups", () => {
-      return response(200, fixturesByUrl["/groups.json"]);
-    });
-
-    this.get("/groups.json", () => {
-      return response(200, fixturesByUrl["/groups.json?username=eviltrout"]);
-    });
-
-    this.get("groups/search.json", () => {
-      return response(200, []);
-    });
-
-    this.get("/topics/groups/discourse.json", () => {
-      return response(200, fixturesByUrl["/topics/groups/discourse.json"]);
-    });
-
-    this.get("/groups/discourse/mentions.json", () => {
-      return response(200, fixturesByUrl["/groups/discourse/posts.json"]);
-    });
-
-    this.get("/groups/discourse/messages.json", () => {
-      return response(200, fixturesByUrl["/groups/discourse/posts.json"]);
-    });
-
-    this.get("/groups/moderators/members.json", () => {
-      return response(200, fixturesByUrl["/groups/discourse/members.json"]);
-    });
-
-    this.get("/t/:topic_id/posts.json", request => {
-      const postIds = request.queryParams.post_ids;
-      const postNumber = parseInt(request.queryParams.post_number, 10);
-      let posts;
-
-      if (postIds) {
-        posts = postIds.map(p => ({
-          id: parseInt(p, 10),
-          post_number: parseInt(p, 10)
-        }));
-      } else if (postNumber && request.queryParams.asc === "true") {
-        posts = _.range(postNumber + 1, postNumber + 6).map(p => ({
-          id: parseInt(p, 10),
-          post_number: parseInt(p, 10)
-        }));
-      } else if (postNumber && request.queryParams.asc === "false") {
-        posts = _.range(postNumber - 5, postNumber)
-          .reverse()
-          .map(p => ({
-            id: parseInt(p, 10),
-            post_number: parseInt(p, 10)
-          }));
-      }
-
-      return response(200, { post_stream: { posts } });
-    });
-
-    this.get("/posts/:post_id/reply-history.json", () => {
-      return response(200, [{ id: 2222, post_number: 2222 }]);
-    });
-
-    this.get("/posts/:post_id/reply-ids.json", () => {
-      return response(200, {
-        direct_reply_ids: [45],
-        all_reply_ids: [45, 100]
-      });
-    });
-
-    this.post("/user_badges", () =>
-      response(200, fixturesByUrl["/user_badges"])
-    );
-    this.delete("/user_badges/:badge_id", success);
-
-    this.post("/posts", function(request) {
-      const data = parsePostData(request.requestBody);
-
-      if (data.title === "this title triggers an error") {
-        return response(422, { errors: ["That title has already been taken"] });
-      }
-
-      if (data.raw === "enqueue this content please") {
-        return response(200, {
-          success: true,
-          action: "enqueued",
-          pending_post: {
-            id: 1234,
-            raw: data.raw
-          }
-        });
-      }
-
-      if (data.raw === "custom message") {
-        return response(200, {
-          success: true,
-          action: "custom",
-          message: "This is a custom response",
-          route_to: "/faq"
-        });
-      }
-
-      return response(200, {
-        success: true,
-        action: "create_post",
-        post: {
-          id: 12345,
-          topic_id: 280,
-          topic_slug: "internationalization-localization"
-        }
-      });
-    });
-
-    this.post("/topics/timings", () => response(200, {}));
-
-    const siteText = { id: "site.test", value: "Test McTest" };
-    const overridden = {
-      id: "site.overridden",
-      value: "Overridden",
-      overridden: true
-    };
-
-    this.get("/admin/users/list/active.json", request => {
-      let store = [
-        {
-          id: 1,
-          username: "eviltrout",
-          email: "<small>eviltrout@example.com</small>"
-        },
-        {
-          id: 3,
-          username: "discobot",
-          email: "<small>discobot_email</small>"
-        }
-      ];
-
-      const showEmails = request.queryParams.show_emails;
-
-      if (showEmails === "false") {
-        store = store.map(item => {
-          delete item.email;
-          return item;
-        });
-      }
-
-      const ascending = request.queryParams.ascending;
-      const order = request.queryParams.order;
-
-      if (order) {
-        store = store.sort(function(a, b) {
-          return a[order] - b[order];
-        });
-      }
-
-      if (ascending) {
-        store = store.reverse();
-      }
-
-      return response(200, store);
-    });
-
-    this.get("/admin/users/list/suspect.json", () => {
-      return response(200, [
-        {
-          id: 2,
-          username: "sam",
-          email: "<small>sam@example.com</small>"
-        }
-      ]);
-    });
-
-    this.get("/admin/customize/site_texts", request => {
-      if (request.queryParams.overridden) {
-        return response(200, { site_texts: [overridden] });
-      } else {
-        return response(200, { site_texts: [siteText, overridden] });
-      }
-    });
-
-    this.get("/admin/customize/site_texts/:key", () =>
-      response(200, { site_text: siteText })
-    );
-    this.delete("/admin/customize/site_texts/:key", () =>
-      response(200, { site_text: siteText })
-    );
-
-    this.put("/admin/customize/site_texts/:key", request => {
-      const result = parsePostData(request.requestBody);
-      result.id = request.params.key;
-      result.can_revert = true;
-      return response(200, { site_text: result });
-    });
-
-    this.get("/tag_groups", () => response(200, { tag_groups: [] }));
-
-    this.get("/admin/users/1234.json", () => {
-      return response(200, {
-        id: 1234,
-        username: "regular"
-      });
-    });
-
-    this.get("/admin/users/1.json", () => {
-      return response(200, {
-        id: 1,
-        username: "eviltrout",
-        admin: true
-      });
-    });
-
-    this.get("/admin/users/2.json", () => {
-      return response(200, {
-        id: 2,
-        username: "sam",
-        admin: true
-      });
-    });
-
-    this.delete("/admin/users/:user_id.json", () =>
-      response(200, { deleted: true })
-    );
-    this.post("/admin/badges", success);
-    this.delete("/admin/badges/:id", success);
-
-    this.get("/admin/logs/staff_action_logs.json", () => {
-      return response(200, {
-        staff_action_logs: [],
-        extras: { user_history_actions: [] }
-      });
-    });
-
-    this.get("/admin/logs/watched_words", () => {
-      return response(200, fixturesByUrl["/admin/logs/watched_words.json"]);
-    });
-    this.delete("/admin/logs/watched_words/:id.json", success);
-
-    this.post("/admin/logs/watched_words.json", request => {
-      const result = parsePostData(request.requestBody);
-      result.id = new Date().getTime();
-      return response(200, result);
-    });
-
-    this.get("/admin/logs/search_logs.json", () => {
-      return response(200, [
-        { term: "foobar", searches: 35, click_through: 6, unique: 16 }
-      ]);
-    });
-
-    this.get("/admin/logs/search_logs/term.json", () => {
-      return response(200, {
-        term: {
-          type: "search_log_term",
-          title: "Search Count",
-          term: "ruby",
-          data: [{ x: "2017-07-20", y: 2 }]
-        }
-      });
-    });
-
-    this.post("/uploads/lookup-metadata", () => {
-      return response(200, {
-        imageFilename: "somefile.png",
-        imageFilesize: "10 KB",
-        imageWidth: "1",
-        imageHeight: "1"
-      });
-    });
-
-    this.get("/inline-onebox", request => {
-      if (
-        request.queryParams.urls.includes(
-          "http://www.example.com/has-title.html"
-        )
-      ) {
-        return [
-          200,
-          { "Content-Type": "application/html" },
-          '{"inline-oneboxes":[{"url":"http://www.example.com/has-title.html","title":"This is a great title"}]}'
-        ];
-      }
-    });
-
-    this.get("/onebox", request => {
-      if (
-        request.queryParams.url === "http://www.example.com/has-title.html" ||
-        request.queryParams.url ===
-          "http://www.example.com/has-title-and-a-url-that-is-more-than-80-characters-because-thats-good-for-seo-i-guess.html"
-      ) {
-        return [
-          200,
-          { "Content-Type": "application/html" },
-          '<aside class="onebox"><article class="onebox-body"><h3><a href="http://www.example.com/article.html">An interesting article</a></h3></article></aside>'
-        ];
-      }
-
-      if (request.queryParams.url === "http://www.example.com/no-title.html") {
-        return [
-          200,
-          { "Content-Type": "application/html" },
-          '<aside class="onebox"><article class="onebox-body"><p>No title</p></article></aside>'
-        ];
-      }
-
-      if (request.queryParams.url.indexOf("/internal-page.html") > -1) {
-        return [
-          200,
-          { "Content-Type": "application/html" },
-          '<aside class="onebox"><article class="onebox-body"><h3><a href="/internal-page.html">Internal Page 4 U</a></h3></article></aside>'
-        ];
-      }
-
-      return [404, { "Content-Type": "application/html" }, ""];
+      },
+      badges: [{ id: 444, count: 1 }],
+      topics: [{ id: 1234, title: "cool title", url: "/t/1234/cool-title" }]
     });
   });
 
-  server.prepareBody = function(body) {
-    if (body && typeof body === "object") {
-      return JSON.stringify(body);
+  pretender.get("/u/eviltrout/invited_count.json", () => {
+    return response({
+      counts: { pending: 1, redeemed: 0, total: 0 }
+    });
+  });
+
+  pretender.get("/u/eviltrout/invited.json", () => {
+    return response({ invites: [{ id: 1 }] });
+  });
+
+  pretender.get("/topics/private-messages/eviltrout.json", () => {
+    return response(fixturesByUrl["/topics/private-messages/eviltrout.json"]);
+  });
+
+  pretender.get("/topics/feature_stats.json", () => {
+    return response({
+      pinned_in_category_count: 0,
+      pinned_globally_count: 0,
+      banner_count: 0
+    });
+  });
+
+  pretender.put("/t/34/convert-topic/public", () => {
+    return response({});
+  });
+
+  pretender.put("/t/280/make-banner", () => {
+    return response({});
+  });
+
+  pretender.put("/t/internationalization-localization/280/status", () => {
+    return response({
+      success: "OK",
+      topic_status_update: null
+    });
+  });
+
+  pretender.post("/clicks/track", success);
+
+  pretender.get("/search", request => {
+    if (request.queryParams.q === "posts") {
+      return response({
+        posts: [
+          {
+            id: 1234
+          }
+        ]
+      });
+    } else if (request.queryParams.q === "evil") {
+      return response({
+        posts: [
+          {
+            id: 1234
+          }
+        ],
+        tags: [
+          {
+            id: 6,
+            name: "eviltrout"
+          }
+        ]
+      });
     }
-    return body;
+
+    return response({});
+  });
+
+  pretender.put("/u/eviltrout.json", () => response({ user: {} }));
+
+  pretender.get("/t/280.json", () => response(fixturesByUrl["/t/280/1.json"]));
+  pretender.get("/t/34.json", () => response(fixturesByUrl["/t/34/1.json"]));
+  pretender.get("/t/280/:post_number.json", () =>
+    response(fixturesByUrl["/t/280/1.json"])
+  );
+  pretender.get("/t/28830.json", () =>
+    response(fixturesByUrl["/t/28830/1.json"])
+  );
+  pretender.get("/t/9.json", () => response(fixturesByUrl["/t/9/1.json"]));
+  pretender.get("/t/12.json", () => response(fixturesByUrl["/t/12/1.json"]));
+  pretender.put("/t/1234/re-pin", success);
+
+  pretender.get("/t/id_for/:slug", () => {
+    return response({
+      id: 280,
+      slug: "internationalization-localization",
+      url: "/t/internationalization-localization/280"
+    });
+  });
+
+  pretender.delete("/t/:id", success);
+  pretender.put("/t/:id/recover", success);
+  pretender.put("/t/:id/publish", success);
+
+  pretender.get("/404-body", () => {
+    return [
+      200,
+      { "Content-Type": "text/html" },
+      "<div class='page-not-found'>not found</div>"
+    ];
+  });
+
+  pretender.delete("/draft.json", success);
+  pretender.post("/draft.json", success);
+
+  pretender.get("/u/:username/staff-info.json", () => response({}));
+
+  pretender.get("/post_action_users", () => {
+    return response({
+      post_action_users: [
+        {
+          id: 1,
+          username: "eviltrout",
+          avatar_template: "/user_avatar/default/eviltrout/{size}/1.png",
+          username_lower: "eviltrout"
+        }
+      ]
+    });
+  });
+
+  pretender.get("/post_replies", () => {
+    return response({ post_replies: [{ id: 1234, cooked: "wat" }] });
+  });
+
+  pretender.get("/post_reply_histories", () => {
+    return response({ post_reply_histories: [{ id: 1234, cooked: "wat" }] });
+  });
+
+  pretender.get("/category_hashtags/check", () => {
+    return response({ valid: [{ slug: "bug", url: "/c/bugs" }] });
+  });
+
+  pretender.get("/categories_and_latest", () =>
+    response(fixturesByUrl["/categories_and_latest.json"])
+  );
+
+  pretender.put("/categories/:category_id", request => {
+    const category = parsePostData(request.requestBody);
+    category.id = parseInt(request.params.category_id, 10);
+
+    if (category.email_in === "duplicate@example.com") {
+      return response(422, { errors: ["duplicate email"] });
+    }
+
+    return response({ category });
+  });
+
+  pretender.get("/draft.json", request => {
+    if (request.queryParams.draft_key === "new_topic") {
+      return response(fixturesByUrl["/draft.json"]);
+    } else if (request.queryParams.draft_key.startsWith("topic_"))
+      return response(
+        fixturesByUrl[request.url] || {
+          draft: null,
+          draft_sequence: 0
+        }
+      );
+    return response({});
+  });
+
+  pretender.get("/drafts.json", () => response(fixturesByUrl["/drafts.json"]));
+
+  pretender.put("/queued_posts/:queued_post_id", function(request) {
+    return response({ queued_post: { id: request.params.queued_post_id } });
+  });
+
+  pretender.get("/queued_posts", function() {
+    return response({
+      queued_posts: [{ id: 1, raw: "queued post text", can_delete_user: true }]
+    });
+  });
+
+  pretender.post("/session", function(request) {
+    const data = parsePostData(request.requestBody);
+
+    if (data.password === "correct") {
+      return response({ username: "eviltrout" });
+    }
+
+    if (data.password === "not-activated") {
+      return response({
+        error: "not active",
+        reason: "not_activated",
+        sent_to_email: "<small>eviltrout@example.com</small>",
+        current_email: "<small>current@example.com</small>"
+      });
+    }
+
+    if (data.password === "not-activated-edit") {
+      return response({
+        error: "not active",
+        reason: "not_activated",
+        sent_to_email: "eviltrout@example.com",
+        current_email: "current@example.com"
+      });
+    }
+
+    if (data.password === "need-second-factor") {
+      if (data.second_factor_token && data.second_factor_token === "123456") {
+        return response({ username: "eviltrout" });
+      }
+
+      return response({
+        failed: "FAILED",
+        ok: false,
+        error: "Invalid authentication code. Each code can only be used once.",
+        reason: "invalid_second_factor",
+        backup_enabled: true,
+        security_key_enabled: false,
+        totp_enabled: true,
+        multiple_second_factor_methods: false
+      });
+    }
+
+    if (data.password === "need-security-key") {
+      if (data.securityKeyCredential) {
+        return response({ username: "eviltrout" });
+      }
+
+      return response({
+        failed: "FAILED",
+        ok: false,
+        error:
+          "The selected second factor method is not enabled for your account.",
+        reason: "not_enabled_second_factor_method",
+        backup_enabled: false,
+        security_key_enabled: true,
+        totp_enabled: false,
+        multiple_second_factor_methods: false,
+        allowed_credential_ids: ["allowed_credential_ids"],
+        challenge: "challenge"
+      });
+    }
+
+    return response(400, { error: "invalid login" });
+  });
+
+  pretender.post("/u/action/send_activation_email", success);
+  pretender.put("/u/update-activation-email", success);
+
+  pretender.get("/u/hp.json", function() {
+    return response({
+      value: "32faff1b1ef1ac3",
+      challenge: "61a3de0ccf086fb9604b76e884d75801"
+    });
+  });
+
+  pretender.get("/session/csrf", function() {
+    return response({ csrf: "mgk906YLagHo2gOgM1ddYjAN4hQolBdJCqlY6jYzAYs=" });
+  });
+
+  pretender.get("/groups/check-name", () => {
+    return response({ available: true });
+  });
+
+  pretender.get("/u/check_username", function(request) {
+    if (request.queryParams.username === "taken") {
+      return response({ available: false, suggestion: "nottaken" });
+    }
+    return response({ available: true });
+  });
+
+  pretender.post("/u", () => response({ success: true }));
+
+  pretender.get("/login.html", () => [200, {}, "LOGIN PAGE"]);
+
+  pretender.delete("/posts/:post_id", success);
+  pretender.put("/posts/:post_id/recover", success);
+  pretender.get("/posts/:post_id/expand-embed", success);
+
+  pretender.put("/posts/:post_id", request => {
+    const data = parsePostData(request.requestBody);
+    if (data.post.raw === "this will 409") {
+      return [
+        409,
+        { "Content-Type": "application/json" },
+        { errors: ["edit conflict"] }
+      ];
+    }
+    data.post.id = request.params.post_id;
+    data.post.version = 2;
+    return response(200, data.post);
+  });
+
+  pretender.get("/t/403.json", () => response(403, {}));
+  pretender.get("/t/404.json", () => response(404, "not found"));
+  pretender.get("/t/500.json", () => response(502, {}));
+
+  pretender.put("/t/:slug/:id", request => {
+    const isJSON = request.requestHeaders["Content-Type"].includes(
+      "application/json"
+    );
+
+    const data = isJSON
+      ? JSON.parse(request.requestBody)
+      : parsePostData(request.requestBody);
+
+    return response(200, {
+      basic_topic: {
+        id: request.params.id,
+        title: data.title,
+        fancy_title: data.title,
+        slug: request.params.slug
+      }
+    });
+  });
+
+  pretender.get("groups", () => {
+    return response(200, fixturesByUrl["/groups.json"]);
+  });
+
+  pretender.get("/groups.json", () => {
+    return response(200, fixturesByUrl["/groups.json?username=eviltrout"]);
+  });
+
+  pretender.get("groups/search.json", () => {
+    return response(200, []);
+  });
+
+  pretender.get("/topics/groups/discourse.json", () => {
+    return response(200, fixturesByUrl["/topics/groups/discourse.json"]);
+  });
+
+  pretender.get("/groups/discourse/mentions.json", () => {
+    return response(200, fixturesByUrl["/groups/discourse/posts.json"]);
+  });
+
+  pretender.get("/groups/discourse/messages.json", () => {
+    return response(200, fixturesByUrl["/groups/discourse/posts.json"]);
+  });
+
+  pretender.get("/groups/moderators/members.json", () => {
+    return response(200, fixturesByUrl["/groups/discourse/members.json"]);
+  });
+
+  pretender.get("/t/:topic_id/posts.json", request => {
+    const postIds = request.queryParams.post_ids;
+    const postNumber = parseInt(request.queryParams.post_number, 10);
+    let posts;
+
+    if (postIds) {
+      posts = postIds.map(p => ({
+        id: parseInt(p, 10),
+        post_number: parseInt(p, 10)
+      }));
+    } else if (postNumber && request.queryParams.asc === "true") {
+      posts = _.range(postNumber + 1, postNumber + 6).map(p => ({
+        id: parseInt(p, 10),
+        post_number: parseInt(p, 10)
+      }));
+    } else if (postNumber && request.queryParams.asc === "false") {
+      posts = _.range(postNumber - 5, postNumber)
+        .reverse()
+        .map(p => ({
+          id: parseInt(p, 10),
+          post_number: parseInt(p, 10)
+        }));
+    }
+
+    return response(200, { post_stream: { posts } });
+  });
+
+  pretender.get("/posts/:post_id/reply-history.json", () => {
+    return response(200, [{ id: 2222, post_number: 2222 }]);
+  });
+
+  pretender.get("/posts/:post_id/reply-ids.json", () => {
+    return response(200, {
+      direct_reply_ids: [45],
+      all_reply_ids: [45, 100]
+    });
+  });
+
+  pretender.post("/user_badges", () =>
+    response(200, fixturesByUrl["/user_badges"])
+  );
+  pretender.delete("/user_badges/:badge_id", success);
+
+  pretender.post("/posts", function(request) {
+    const data = parsePostData(request.requestBody);
+
+    if (data.title === "this title triggers an error") {
+      return response(422, { errors: ["That title has already been taken"] });
+    }
+
+    if (data.raw === "enqueue this content please") {
+      return response(200, {
+        success: true,
+        action: "enqueued",
+        pending_post: {
+          id: 1234,
+          raw: data.raw
+        }
+      });
+    }
+
+    if (data.raw === "custom message") {
+      return response(200, {
+        success: true,
+        action: "custom",
+        message: "This is a custom response",
+        route_to: "/faq"
+      });
+    }
+
+    return response(200, {
+      success: true,
+      action: "create_post",
+      post: {
+        id: 12345,
+        topic_id: 280,
+        topic_slug: "internationalization-localization"
+      }
+    });
+  });
+
+  pretender.post("/topics/timings", () => response(200, {}));
+
+  const siteText = { id: "site.test", value: "Test McTest" };
+  const overridden = {
+    id: "site.overridden",
+    value: "Overridden",
+    overridden: true
   };
 
-  server.unhandledRequest = function(verb, path) {
-    const error =
-      "Unhandled request in test environment: " + path + " (" + verb + ")";
-    window.console.error(error);
-    throw error;
-  };
+  pretender.get("/admin/users/list/active.json", request => {
+    let store = [
+      {
+        id: 1,
+        username: "eviltrout",
+        email: "<small>eviltrout@example.com</small>"
+      },
+      {
+        id: 3,
+        username: "discobot",
+        email: "<small>discobot_email</small>"
+      }
+    ];
 
-  server.checkPassthrough = request =>
-    request.requestHeaders["Discourse-Script"];
-  return server;
+    const showEmails = request.queryParams.show_emails;
+
+    if (showEmails === "false") {
+      store = store.map(item => {
+        delete item.email;
+        return item;
+      });
+    }
+
+    const ascending = request.queryParams.ascending;
+    const order = request.queryParams.order;
+
+    if (order) {
+      store = store.sort(function(a, b) {
+        return a[order] - b[order];
+      });
+    }
+
+    if (ascending) {
+      store = store.reverse();
+    }
+
+    return response(200, store);
+  });
+
+  pretender.get("/admin/users/list/suspect.json", () => {
+    return response(200, [
+      {
+        id: 2,
+        username: "sam",
+        email: "<small>sam@example.com</small>"
+      }
+    ]);
+  });
+
+  pretender.get("/admin/customize/site_texts", request => {
+    if (request.queryParams.overridden) {
+      return response(200, { site_texts: [overridden] });
+    } else {
+      return response(200, { site_texts: [siteText, overridden] });
+    }
+  });
+
+  pretender.get("/admin/customize/site_texts/:key", () =>
+    response(200, { site_text: siteText })
+  );
+  pretender.delete("/admin/customize/site_texts/:key", () =>
+    response(200, { site_text: siteText })
+  );
+
+  pretender.put("/admin/customize/site_texts/:key", request => {
+    const result = parsePostData(request.requestBody);
+    result.id = request.params.key;
+    result.can_revert = true;
+    return response(200, { site_text: result });
+  });
+
+  pretender.get("/tag_groups", () => response(200, { tag_groups: [] }));
+
+  pretender.get("/admin/users/1.json", () => {
+    return response(200, {
+      id: 1,
+      username: "eviltrout",
+      email: "eviltrout@example.com",
+      admin: true
+    });
+  });
+
+  pretender.get("/admin/users/2.json", () => {
+    return response(200, {
+      id: 2,
+      username: "sam",
+      admin: true
+    });
+  });
+
+  pretender.get("/admin/users/3.json", () => {
+    return response(200, {
+      id: 3,
+      username: "markvanlan",
+      email: "markvanlan@example.com",
+      secondary_emails: ["markvanlan1@example.com", "markvanlan2@example.com"]
+    });
+  });
+
+  pretender.get("/admin/users/1234.json", () => {
+    return response(200, {
+      id: 1234,
+      username: "regular"
+    });
+  });
+
+  pretender.get("/admin/users/1235.json", () => {
+    return response(200, {
+      id: 1235,
+      username: "regular2"
+    });
+  });
+
+  pretender.delete("/admin/users/:user_id.json", () =>
+    response(200, { deleted: true })
+  );
+  pretender.post("/admin/badges", success);
+  pretender.delete("/admin/badges/:id", success);
+
+  pretender.get("/admin/logs/staff_action_logs.json", () => {
+    return response(200, {
+      staff_action_logs: [],
+      extras: { user_history_actions: [] }
+    });
+  });
+
+  pretender.get("/admin/logs/watched_words", () => {
+    return response(200, fixturesByUrl["/admin/logs/watched_words.json"]);
+  });
+  pretender.delete("/admin/logs/watched_words/:id.json", success);
+
+  pretender.post("/admin/logs/watched_words.json", request => {
+    const result = parsePostData(request.requestBody);
+    result.id = new Date().getTime();
+    return response(200, result);
+  });
+
+  pretender.get("/admin/logs/search_logs.json", () => {
+    return response(200, [
+      { term: "foobar", searches: 35, click_through: 6, unique: 16 }
+    ]);
+  });
+
+  pretender.get("/admin/logs/search_logs/term.json", () => {
+    return response(200, {
+      term: {
+        type: "search_log_term",
+        title: "Search Count",
+        term: "ruby",
+        data: [{ x: "2017-07-20", y: 2 }]
+      }
+    });
+  });
+
+  pretender.post("/uploads/lookup-metadata", () => {
+    return response(200, {
+      imageFilename: "somefile.png",
+      imageFilesize: "10 KB",
+      imageWidth: "1",
+      imageHeight: "1"
+    });
+  });
+
+  pretender.get("/inline-onebox", request => {
+    if (
+      request.queryParams.urls.includes("http://www.example.com/has-title.html")
+    ) {
+      return [
+        200,
+        { "Content-Type": "application/html" },
+        '{"inline-oneboxes":[{"url":"http://www.example.com/has-title.html","title":"This is a great title"}]}'
+      ];
+    }
+  });
+
+  pretender.get("/onebox", request => {
+    if (
+      request.queryParams.url === "http://www.example.com/has-title.html" ||
+      request.queryParams.url ===
+        "http://www.example.com/has-title-and-a-url-that-is-more-than-80-characters-because-thats-good-for-seo-i-guess.html"
+    ) {
+      return [
+        200,
+        { "Content-Type": "application/html" },
+        '<aside class="onebox"><article class="onebox-body"><h3><a href="http://www.example.com/article.html">An interesting article</a></h3></article></aside>'
+      ];
+    }
+
+    if (request.queryParams.url === "http://www.example.com/no-title.html") {
+      return [
+        200,
+        { "Content-Type": "application/html" },
+        '<aside class="onebox"><article class="onebox-body"><p>No title</p></article></aside>'
+      ];
+    }
+
+    if (request.queryParams.url.indexOf("/internal-page.html") > -1) {
+      return [
+        200,
+        { "Content-Type": "application/html" },
+        '<aside class="onebox"><article class="onebox-body"><h3><a href="/internal-page.html">Internal Page 4 U</a></h3></article></aside>'
+      ];
+    }
+    if (request.queryParams.url === "http://somegoodurl.com/") {
+      return [
+        200,
+        { "Content-Type": "application/html" },
+        `
+    <aside class="onebox whitelistedgeneric">
+      <header class="source">
+          <a href="http://test.com/somepage" target="_blank">test.com</a>
+      </header>
+      <article class="onebox-body">
+      <div class="aspect-image" style="--aspect-ratio:690/362;"><img src="https://test.com/image.png" class="thumbnail"></div>
+      <h3><a href="http://test.com/somepage" target="_blank">Test Page</a></h3>
+      <p>Yet another collaboration tool</p>
+      </article>
+      <div class="onebox-metadata"></div>
+      <div style="clear: both"></div>
+    </aside>
+  `
+      ];
+    }
+    return [404, { "Content-Type": "application/html" }, ""];
+  });
 }
diff --git a/test/javascripts/lib/click-track-edit-history-test.js.es6 b/test/javascripts/lib/click-track-edit-history-test.js.es6
index 745d7d195c..ae8f6d18c2 100644
--- a/test/javascripts/lib/click-track-edit-history-test.js.es6
+++ b/test/javascripts/lib/click-track-edit-history-test.js.es6
@@ -2,6 +2,7 @@ import DiscourseURL from "discourse/lib/url";
 import ClickTrack from "discourse/lib/click-track";
 import { fixture, logIn } from "helpers/qunit-helpers";
 import User from "discourse/models/user";
+import pretender from "helpers/create-pretender";
 
 QUnit.module("lib:click-track-edit-history", {
   beforeEach() {
@@ -62,8 +63,7 @@ QUnit.skip("tracks internal URLs", async assert => {
   sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com");
 
   const done = assert.async();
-  /* global server */
-  server.post("/clicks/track", request => {
+  pretender.post("/clicks/track", request => {
     assert.equal(
       request.requestBody,
       "url=http%3A%2F%2Fdiscuss.domain.com&post_id=42&topic_id=1337"
@@ -78,8 +78,7 @@ QUnit.skip("tracks external URLs", async assert => {
   assert.expect(2);
 
   const done = assert.async();
-  /* global server */
-  server.post("/clicks/track", request => {
+  pretender.post("/clicks/track", request => {
     assert.equal(
       request.requestBody,
       "url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337"
@@ -97,8 +96,7 @@ QUnit.skip(
     User.currentProp("external_links_in_new_tab", true);
 
     const done = assert.async();
-    /* global server */
-    server.post("/clicks/track", request => {
+    pretender.post("/clicks/track", request => {
       assert.equal(
         request.requestBody,
         "url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337"
diff --git a/test/javascripts/lib/click-track-profile-page-test.js.es6 b/test/javascripts/lib/click-track-profile-page-test.js.es6
index a1cc164013..d46027a9d2 100644
--- a/test/javascripts/lib/click-track-profile-page-test.js.es6
+++ b/test/javascripts/lib/click-track-profile-page-test.js.es6
@@ -1,6 +1,7 @@
 import DiscourseURL from "discourse/lib/url";
 import ClickTrack from "discourse/lib/click-track";
 import { fixture, logIn } from "helpers/qunit-helpers";
+import pretender from "helpers/create-pretender";
 
 QUnit.module("lib:click-track-profile-page", {
   beforeEach() {
@@ -55,8 +56,7 @@ QUnit.skip("tracks internal URLs", async assert => {
   sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com");
 
   const done = assert.async();
-  /* global server */
-  server.post("/clicks/track", request => {
+  pretender.post("/clicks/track", request => {
     assert.equal(request.requestBody, "url=http%3A%2F%2Fdiscuss.domain.com");
     done();
   });
@@ -68,8 +68,7 @@ QUnit.skip("tracks external URLs", async assert => {
   assert.expect(2);
 
   const done = assert.async();
-  /* global server */
-  server.post("/clicks/track", request => {
+  pretender.post("/clicks/track", request => {
     assert.equal(
       request.requestBody,
       "url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337"
@@ -84,8 +83,7 @@ QUnit.skip("tracks external URLs in other posts", async assert => {
   assert.expect(2);
 
   const done = assert.async();
-  /* global server */
-  server.post("/clicks/track", request => {
+  pretender.post("/clicks/track", request => {
     assert.equal(
       request.requestBody,
       "url=http%3A%2F%2Fwww.google.com&post_id=24&topic_id=7331"
diff --git a/test/javascripts/lib/click-track-test.js.es6 b/test/javascripts/lib/click-track-test.js.es6
index 7dd0747e72..7d5167ce2f 100644
--- a/test/javascripts/lib/click-track-test.js.es6
+++ b/test/javascripts/lib/click-track-test.js.es6
@@ -3,6 +3,7 @@ import DiscourseURL from "discourse/lib/url";
 import ClickTrack from "discourse/lib/click-track";
 import { fixture, logIn } from "helpers/qunit-helpers";
 import User from "discourse/models/user";
+import pretender from "helpers/create-pretender";
 
 QUnit.module("lib:click-track", {
   beforeEach() {
@@ -55,8 +56,7 @@ QUnit.skip("tracks internal URLs", async assert => {
   sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com");
 
   const done = assert.async();
-  /* global server */
-  server.post("/clicks/track", request => {
+  pretender.post("/clicks/track", request => {
     assert.ok(
       request.requestBody,
       "url=http%3A%2F%2Fdiscuss.domain.com&post_id=42&topic_id=1337"
@@ -74,8 +74,7 @@ QUnit.skip("does not track elements with no href", async assert => {
 QUnit.skip("does not track attachments", async assert => {
   sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com");
 
-  /* global server */
-  server.post("/clicks/track", () => assert.ok(false));
+  pretender.post("/clicks/track", () => assert.ok(false));
 
   assert.notOk(track(generateClickEventOn(".attachment")));
   assert.ok(
@@ -89,8 +88,7 @@ QUnit.skip("tracks external URLs", async assert => {
   assert.expect(2);
 
   const done = assert.async();
-  /* global server */
-  server.post("/clicks/track", request => {
+  pretender.post("/clicks/track", request => {
     assert.ok(
       request.requestBody,
       "url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337"
@@ -108,8 +106,7 @@ QUnit.skip(
     User.currentProp("external_links_in_new_tab", true);
 
     const done = assert.async();
-    /* global server */
-    server.post("/clicks/track", request => {
+    pretender.post("/clicks/track", request => {
       assert.ok(
         request.requestBody,
         "url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337"
diff --git a/test/javascripts/lib/link-mentions-test.js.es6 b/test/javascripts/lib/link-mentions-test.js.es6
index 46bdefa423..a7c309cbbb 100644
--- a/test/javascripts/lib/link-mentions-test.js.es6
+++ b/test/javascripts/lib/link-mentions-test.js.es6
@@ -3,12 +3,12 @@ import {
   linkSeenMentions
 } from "discourse/lib/link-mentions";
 import { Promise } from "rsvp";
+import pretender from "helpers/create-pretender";
 
 QUnit.module("lib:link-mentions");
 
 QUnit.test("linkSeenMentions replaces users and groups", async assert => {
-  /* global server */
-  server.get("/u/is_local_username", () => [
+  pretender.get("/u/is_local_username", () => [
     200,
     { "Content-Type": "application/json" },
     {
diff --git a/test/javascripts/lib/oneboxer-test.js.es6 b/test/javascripts/lib/oneboxer-test.js.es6
index 77ca103827..22e86e97df 100644
--- a/test/javascripts/lib/oneboxer-test.js.es6
+++ b/test/javascripts/lib/oneboxer-test.js.es6
@@ -20,11 +20,6 @@ QUnit.test("load - failed onebox", async assert => {
   let element = document.createElement("A");
   element.setAttribute("href", "http://somebadurl.com");
 
-  // prettier-ignore
-  server.get("/onebox", () => { //eslint-disable-line
-    return [404, {}, {}];
-  });
-
   await loadOnebox(element);
 
   assert.equal(
@@ -55,11 +50,6 @@ QUnit.test("load - successful onebox", async assert => {
     </aside>
   `;
 
-  // prettier-ignore
-  server.get("/onebox", () => { //eslint-disable-line
-    return [200, {}, html];
-  });
-
   let element = document.createElement("A");
   element.setAttribute("href", "http://somegoodurl.com");
 
@@ -72,7 +62,7 @@ QUnit.test("load - successful onebox", async assert => {
   );
   assert.equal(
     loadOnebox(element),
-    stringToHTML(html).outerHTML,
+    html.trim(),
     "it returns the html from the cache"
   );
 });
diff --git a/test/javascripts/lib/screen-track-test.js.es6 b/test/javascripts/lib/screen-track-test.js.es6
index 2fb7df9497..9574e972a7 100644
--- a/test/javascripts/lib/screen-track-test.js.es6
+++ b/test/javascripts/lib/screen-track-test.js.es6
@@ -1,6 +1,7 @@
 import TopicTrackingState from "discourse/models/topic-tracking-state";
 import Session from "discourse/models/session";
 import ScreenTrack from "discourse/lib/screen-track";
+import pretender from "helpers/create-pretender";
 
 let clock;
 
@@ -18,8 +19,7 @@ QUnit.module("lib:screen-track", {
 QUnit.skip("Correctly flushes posts as needed", assert => {
   const timings = [];
 
-  // prettier-ignore
-  server.post("/topics/timings", t => { //eslint-disable-line
+  pretender.post("/topics/timings", t => {
     timings.push(t);
     return [200, {}, ""];
   });
diff --git a/test/javascripts/lib/upload-short-url-test.js.es6 b/test/javascripts/lib/upload-short-url-test.js.es6
index f969e64878..39a5e7b000 100644
--- a/test/javascripts/lib/upload-short-url-test.js.es6
+++ b/test/javascripts/lib/upload-short-url-test.js.es6
@@ -5,6 +5,7 @@ import {
 } from "pretty-text/upload-short-url";
 import { ajax } from "discourse/lib/ajax";
 import { fixture } from "helpers/qunit-helpers";
+import pretender from "helpers/create-pretender";
 
 QUnit.module("lib:pretty-text/upload-short-url", {
   beforeEach() {
@@ -46,8 +47,7 @@ QUnit.module("lib:pretty-text/upload-short-url", {
       }
     ];
 
-    // prettier-ignore
-    server.post("/uploads/lookup-urls", () => { //eslint-disable-line
+    pretender.post("/uploads/lookup-urls", () => {
       return response(imageSrcs.concat(attachmentSrcs.concat(otherMediaSrcs)));
     });
 
diff --git a/test/javascripts/lib/user-search-test.js.es6 b/test/javascripts/lib/user-search-test.js.es6
index c93a87564d..79e11587f0 100644
--- a/test/javascripts/lib/user-search-test.js.es6
+++ b/test/javascripts/lib/user-search-test.js.es6
@@ -1,5 +1,6 @@
 import userSearch from "discourse/lib/user-search";
 import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
+import pretender from "helpers/create-pretender";
 
 QUnit.module("lib:user-search", {
   beforeEach() {
@@ -7,13 +8,11 @@ QUnit.module("lib:user-search", {
       return [200, { "Content-Type": "application/json" }, object];
     };
 
-    // prettier-ignore
-    server.get("/u/search/users", request => { //eslint-disable-line
-
+    pretender.get("/u/search/users", request => {
       // special responder for per category search
       const categoryMatch = request.url.match(/category_id=([0-9]+)/);
       if (categoryMatch) {
-        if(categoryMatch[1] === "3"){
+        if (categoryMatch[1] === "3") {
           return response({});
         }
         return response({
@@ -24,11 +23,12 @@ QUnit.module("lib:user-search", {
               avatar_template:
                 "https://avatars.discourse.org/v3/letter/t/41988e/{size}.png"
             }
-          ]});
+          ]
+        });
       }
 
-      if(request.url.match(/no-results/)){
-        return response({users: []});
+      if (request.url.match(/no-results/)) {
+        return response({ users: [] });
       }
 
       return response({
diff --git a/test/javascripts/models/post-stream-test.js.es6 b/test/javascripts/models/post-stream-test.js.es6
index 2276014241..9ba4632041 100644
--- a/test/javascripts/models/post-stream-test.js.es6
+++ b/test/javascripts/models/post-stream-test.js.es6
@@ -2,6 +2,7 @@ import Post from "discourse/models/post";
 import createStore from "helpers/create-store";
 import User from "discourse/models/user";
 import { Promise } from "rsvp";
+import pretender from "helpers/create-pretender";
 
 QUnit.module("model:post-stream");
 
@@ -753,8 +754,7 @@ QUnit.test("triggerRecoveredPost", async assert => {
     return [200, { "Content-Type": "application/json" }, object];
   };
 
-  // prettier-ignore
-  server.get("/posts/4", () => { // eslint-disable-line no-undef
+  pretender.get("/posts/4", () => {
     return response({ id: 4, post_number: 4 });
   });
 
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index f005b678ab..c2c3520a3b 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -1,5 +1,4 @@
 /*global document, sinon, QUnit, Logster */
-
 //= require env
 //= require jquery.debug
 //= require jquery.ui.widget
@@ -77,7 +76,7 @@ if (window.Logster) {
   window.Logster = { enabled: false };
 }
 
-var pretender = require("helpers/create-pretender", null, null, false),
+var createPretender = require("helpers/create-pretender", null, null, false),
   fixtures = require("fixtures/site-fixtures", null, null, false).default,
   flushMap = require("discourse/models/store", null, null, false).flushMap,
   ScrollingDOMMethods = require("discourse/mixins/scrolling", null, null, false)
@@ -102,13 +101,32 @@ function resetSite(siteSettings, extras) {
 }
 
 QUnit.testStart(function(ctx) {
-  server = pretender.default();
+  server = createPretender.default;
+  createPretender.applyDefaultHandlers(server);
+  server.handlers = []
+
+  server.prepareBody = function(body) {
+    if (body && typeof body === "object") {
+      return JSON.stringify(body);
+    }
+    return body;
+  };
+
+  server.unhandledRequest = function(verb, path) {
+    const error =
+      "Unhandled request in test environment: " + path + " (" + verb + ")";
+    window.console.error(error);
+    throw error;
+  };
+
+  server.checkPassthrough = request =>
+    request.requestHeaders["Discourse-Script"];
 
   if (ctx.module.startsWith(acceptanceModulePrefix)) {
     var helper = {
-      parsePostData: pretender.parsePostData,
-      response: pretender.response,
-      success: pretender.success
+      parsePostData: createPretender.parsePostData,
+      response: createPretender.response,
+      success: createPretender.success
     };
 
     applyPretender(
@@ -153,10 +171,6 @@ QUnit.testDone(function() {
   $(".modal-backdrop").remove();
   flushMap();
 
-  server.shutdown();
-
-  window.server = null;
-
   // ensures any event not removed is not leaking between tests
   // most likely in intialisers, other places (controller, component...)
   // should be fixed in code

From f17459c6204717555aa7f021ad9b6d74b0c4a428 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 2 Mar 2020 20:27:50 +0100
Subject: [PATCH 0050/1830] UX: attempts to increate popup menu hitzone on
 mobile (#9038)

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

diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 30b2f6d976..1d37052b88 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -476,10 +476,20 @@ span.highlighted {
   }
 }
 
-.popup-menu {
+.popup-menu,
+#topic-footer-buttons .popup-menu {
   h3 {
     margin-bottom: 0;
   }
+
+  ul div li {
+    border-bottom: 0.25em solid transparent;
+    border-top: 0.25em solid transparent;
+
+    button.btn {
+      margin-bottom: 0;
+    }
+  }
 }
 
 .post-notice {

From a653737a6656c82c821d7506b6e38bd9e9679b45 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 2 Mar 2020 14:28:54 -0500
Subject: [PATCH 0051/1830] FIX: Add aria-labels to topic list items (#9048)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* FIX: Add aria-labels to topic list items

Before this fix you could navigate the topic list using a screen reader
and a keyboard but some of the items were not as descriptive as they
could be. The newly added labels make it easier to understand what you
are tabbing over.

context:
https://meta.discourse.org/t/accessibility-aria-attributes-are-not-defined-for-links-under-replies-category/142539

* Update app/assets/javascripts/discourse/lib/utilities.js.es6

Co-Authored-By: Régis Hanol <regis@hanol.fr>

* Multiline fix

* Fix more tests

Co-authored-by: Régis Hanol <regis@hanol.fr>
---
 .../javascripts/discourse/helpers/application.js.es6     | 5 +++++
 app/assets/javascripts/discourse/lib/utilities.js.es6    | 9 ++++++---
 .../discourse/templates/list/posts-count-column.hbr      | 2 +-
 test/javascripts/lib/utilities-test.js.es6               | 2 +-
 test/javascripts/models/report-test.js.es6               | 4 ++--
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js.es6
index e6a88ded97..71baa92c91 100644
--- a/app/assets/javascripts/discourse/helpers/application.js.es6
+++ b/app/assets/javascripts/discourse/helpers/application.js.es6
@@ -41,6 +41,11 @@ registerUnbound("number", (orig, params) => {
   if (n.toString() !== title.toString() && addTitle) {
     result += " title='" + Handlebars.Utils.escapeExpression(title) + "'";
   }
+  if (params.ariaLabel) {
+    const ariaLabel = Handlebars.Utils.escapeExpression(params.ariaLabel);
+    result += ` aria-label='${ariaLabel}'`;
+  }
+
   result += ">" + n + "</span>";
 
   return new safe(result);
diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6
index 8b210b4737..e44a60d53a 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js.es6
+++ b/app/assets/javascripts/discourse/lib/utilities.js.es6
@@ -66,9 +66,12 @@ export function avatarImg(options, getURL) {
 
   const classes =
     "avatar" + (options.extraClasses ? " " + options.extraClasses : "");
-  const title = options.title
-    ? " title='" + escapeExpression(options.title || "") + "'"
-    : "";
+
+  let title = "";
+  if (options.title) {
+    const escaped = escapeExpression(options.title || "");
+    title = ` title='${escaped}' aria-label='${escaped}'`;
+  }
 
   return (
     "<img alt='' width='" +
diff --git a/app/assets/javascripts/discourse/templates/list/posts-count-column.hbr b/app/assets/javascripts/discourse/templates/list/posts-count-column.hbr
index b37ddd9c1b..fb6642f0f0 100644
--- a/app/assets/javascripts/discourse/templates/list/posts-count-column.hbr
+++ b/app/assets/javascripts/discourse/templates/list/posts-count-column.hbr
@@ -1,6 +1,6 @@
 <{{view.tagName}} class='num posts-map posts {{view.likesHeat}}' title='{{view.title}}'>
   <a href class='posts-map badge-posts {{view.likesHeat}}'>
     {{raw-plugin-outlet name="topic-list-before-reply-count"}}
-    {{number topic.replyCount noTitle="true"}}
+    {{number topic.replyCount noTitle="true" ariaLabel=view.title}}
   </a>
 </{{view.tagName}}>
diff --git a/test/javascripts/lib/utilities-test.js.es6 b/test/javascripts/lib/utilities-test.js.es6
index dd34d8a204..46609895a2 100644
--- a/test/javascripts/lib/utilities-test.js.es6
+++ b/test/javascripts/lib/utilities-test.js.es6
@@ -89,7 +89,7 @@ QUnit.test("avatarImg", assert => {
       size: "tiny",
       title: "evilest trout"
     }),
-    "<img alt='' width='20' height='20' src='/path/to/avatar/40.png' class='avatar' title='evilest trout'>",
+    "<img alt='' width='20' height='20' src='/path/to/avatar/40.png' class='avatar' title='evilest trout' aria-label='evilest trout'>",
     "it adds a title if supplied"
   );
 
diff --git a/test/javascripts/models/report-test.js.es6 b/test/javascripts/models/report-test.js.es6
index 1fa622a1d3..821a88eee8 100644
--- a/test/javascripts/models/report-test.js.es6
+++ b/test/javascripts/models/report-test.js.es6
@@ -459,7 +459,7 @@ QUnit.test("computed labels", assert => {
   const computedUsernameLabel = usernameLabel.compute(row);
   assert.equal(
     computedUsernameLabel.formatedValue,
-    "<a href='/admin/users/1/joffrey'><img alt='' width='20' height='20' src='/' class='avatar' title='joffrey'><span class='username'>joffrey</span></a>"
+    "<a href='/admin/users/1/joffrey'><img alt='' width='20' height='20' src='/' class='avatar' title='joffrey' aria-label='joffrey'><span class='username'>joffrey</span></a>"
   );
   assert.equal(computedUsernameLabel.value, "joffrey");
 
@@ -542,6 +542,6 @@ QUnit.test("computed labels", assert => {
   const userLink = computedLabels[0].compute(row).formatedValue;
   assert.equal(
     userLink,
-    "<a href='/forum/admin/users/1/joffrey'><img alt='' width='20' height='20' src='/forum/' class='avatar' title='joffrey'><span class='username'>joffrey</span></a>"
+    "<a href='/forum/admin/users/1/joffrey'><img alt='' width='20' height='20' src='/forum/' class='avatar' title='joffrey' aria-label='joffrey'><span class='username'>joffrey</span></a>"
   );
 });

From c62d5b139ba08f5b995ba4979d419e8cfb28e132 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Mon, 2 Mar 2020 21:29:40 +0200
Subject: [PATCH 0052/1830] FIX: Allow users to create polls in PMs with non
 human users (#9055)

---
 .../advanced_user_narrative_spec.rb             | 13 +++++++++++++
 plugins/poll/lib/post_validator.rb              |  2 +-
 .../spec/controllers/posts_controller_spec.rb   | 17 +++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
index a44c9e250c..28fec30417 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
@@ -606,6 +606,19 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         )
       end
 
+      it 'allows new users to create polls' do
+        user.update(trust_level: 0)
+
+        post = PostCreator.create(user, topic_id: topic.id, raw: <<~RAW)
+          [poll type=regular]
+          * foo
+          * bar
+          [/poll]
+        RAW
+
+        expect(post.errors[:base].size).to eq(0)
+      end
+
       describe 'when post is not in the right topic' do
         it 'should not do anything' do
           other_post
diff --git a/plugins/poll/lib/post_validator.rb b/plugins/poll/lib/post_validator.rb
index 19f6648e4f..788fe1e24b 100644
--- a/plugins/poll/lib/post_validator.rb
+++ b/plugins/poll/lib/post_validator.rb
@@ -9,7 +9,7 @@ module DiscoursePoll
     def validate_post
       min_trust_level = SiteSetting.poll_minimum_trust_level_to_create
 
-      if @post&.user&.staff? || @post&.user&.trust_level >= TrustLevel[min_trust_level]
+      if @post&.user&.staff? || @post&.user&.trust_level >= TrustLevel[min_trust_level] || @post&.topic&.pm_with_non_human_user?
         true
       else
         @post.errors.add(:base, I18n.t("poll.insufficient_rights_to_create"))
diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb
index 411247c8f7..8f9dae14a2 100644
--- a/plugins/poll/spec/controllers/posts_controller_spec.rb
+++ b/plugins/poll/spec/controllers/posts_controller_spec.rb
@@ -348,6 +348,23 @@ describe PostsController do
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.insufficient_rights_to_create"))
     end
+
+    it "skips the check in PMs with bots" do
+      user = Fabricate(:user, trust_level: 1)
+      topic = Fabricate(:private_message_topic, topic_allowed_users: [
+        Fabricate.build(:topic_allowed_user, user: user),
+        Fabricate.build(:topic_allowed_user, user: Discourse.system_user)
+      ])
+      Fabricate(:post, topic_id: topic.id, user_id: Discourse::SYSTEM_USER_ID)
+
+      log_in_user(user)
+
+      post :create, params: {
+        topic_id: topic.id, raw: "[poll]\n- A\n- B\n[/poll]"
+      }, format: :json
+
+      expect(::JSON.parse(response.body)["errors"]).to eq(nil)
+    end
   end
 
   describe "regular user with equal trust level" do

From c11e5eb042303c4933ac1faefdd46064b4d2ff25 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 2 Mar 2020 13:30:23 -0600
Subject: [PATCH 0053/1830] DEV: Run prettier on staged files before commit
 using lefthook (#9064)

* DEV: Run prettier on staged files before commit using lefthook

* excluded some js files
---
 lefthook.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lefthook.yml b/lefthook.yml
index f3305fb786..8dae834398 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -4,6 +4,10 @@ pre-commit:
     rubocop:
       glob: "*.rb"
       run: bundle exec rubocop {staged_files}
+    prettier:
+      glob: "*.{js,es6}"
+      exclude: "vendor/*|fixtures|public/javascripts|shims.js|ember-addons|template-lintrc|locale/*|test_helper|run-qunit"
+      run: yarn prettier --list-different {staged_files}
     eslint:
       glob: "*.{js,es6}"
       exclude: "vendor/*|fixtures|public/javascripts|shims.js|ember-addons|template-lintrc|locale/*|test_helper|run-qunit"

From 11425f8adcfbce14d8f774a7768816ef1246c685 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 2 Mar 2020 20:30:51 +0100
Subject: [PATCH 0054/1830] FEATURE: alows to add a description link to a
 report (#9065)

This commit adds a description link to users_per_trust_level report linking to our blog  article on the subject https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
---
 app/assets/javascripts/admin/models/report.js.es6    |  2 ++
 .../admin/templates/components/admin-report.hbs      | 12 +++++++++---
 app/controllers/admin/reports_controller.rb          |  2 ++
 app/models/report.rb                                 |  3 +++
 config/locales/server.en.yml                         |  1 +
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js.es6
index bd7074ced2..d0152c1a9e 100644
--- a/app/assets/javascripts/admin/models/report.js.es6
+++ b/app/assets/javascripts/admin/models/report.js.es6
@@ -21,6 +21,8 @@ const Report = EmberObject.extend({
   average: false,
   percent: false,
   higher_is_better: true,
+  description_link: null,
+  description: null,
 
   @discourseComputed("type", "start_date", "end_date")
   reportUrl(type, start_date, end_date) {
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index f8a36fa7d3..cb0f333bb0 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -23,9 +23,15 @@
             </a>
 
             {{#if model.description}}
-              <span class="info" data-tooltip="{{model.description}}">
-                {{d-icon "question-circle"}}
-              </span>
+              {{#if model.description_link}}
+                <a target="_blank" rel="noopener" href="{{model.description_link}}" class="info" data-tooltip="{{model.description}}">
+                  {{d-icon "question-circle"}}
+                </a>
+              {{else}}
+                <span class="info" data-tooltip="{{model.description}}">
+                  {{d-icon "question-circle"}}
+                </span>
+              {{/if}}
             {{/if}}
           </li>
           {{/unless}}
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index 864512c451..5fc2544b48 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -11,11 +11,13 @@ class Admin::ReportsController < Admin::AdminController
     reports = reports_methods.map do |name|
       type = name.to_s.gsub('report_', '')
       description = I18n.t("reports.#{type}.description", default: '')
+      description_link = I18n.t("reports.#{type}.description_link", default: '')
 
       {
         type: type,
         title: I18n.t("reports.#{type}.title"),
         description: description.presence ? description : nil,
+        description_link: description_link.presence ? description_link : nil
       }
     end
 
diff --git a/app/models/report.rb b/app/models/report.rb
index de17d8346f..13f7d02830 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -99,12 +99,15 @@ class Report
 
   def as_json(options = nil)
     description = I18n.t("reports.#{type}.description", default: "")
+    description_link = I18n.t("reports.#{type}.description_link", default: "")
+
     {
       type: type,
       title: I18n.t("reports.#{type}.title", default: nil),
       xaxis: I18n.t("reports.#{type}.xaxis", default: nil),
       yaxis: I18n.t("reports.#{type}.yaxis", default: nil),
       description: description.presence ? description : nil,
+      description_link: description_link.presence ? description_link : nil,
       data: data,
       start_date: start_date&.iso8601,
       end_date: end_date&.iso8601,
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 00e24df01c..c4db42fb1c 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1175,6 +1175,7 @@ en:
       labels:
         level: Level
       description: "Number of users grouped by trust level."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Users per Type"
       xaxis: "Type"

From b78df9c4c961c8c3a52f0797e567a168df4e34e6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2020 14:31:06 -0500
Subject: [PATCH 0055/1830] Build(deps): Bump aws-sigv4 from 1.1.0 to 1.1.1
 (#9067)

Bumps [aws-sigv4](https://github.com/aws/aws-sdk-ruby) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sigv4/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.1.0...1.1.1)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 18d6188199..abe2f0a885 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -61,7 +61,7 @@ GEM
     aws-sdk-sns (1.21.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.0)
+    aws-sigv4 (1.1.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
     barber (0.12.2)
       ember-source (>= 1.0, < 3.1)

From f44ad91a529ddf6101698c82fc3bacaadefe0e73 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2020 14:31:19 -0500
Subject: [PATCH 0056/1830] Build(deps): Bump hashdiff from 1.0.0 to 1.0.1
 (#9068)

Bumps [hashdiff](https://github.com/liufengyun/hashdiff) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/liufengyun/hashdiff/releases)
- [Changelog](https://github.com/liufengyun/hashdiff/blob/master/changelog.md)
- [Commits](https://github.com/liufengyun/hashdiff/commits)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index abe2f0a885..8eaa96fb40 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -141,7 +141,7 @@ GEM
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     guess_html_encoding (0.0.11)
-    hashdiff (1.0.0)
+    hashdiff (1.0.1)
     hashie (3.6.0)
     highline (1.7.10)
     hkdf (0.3.0)

From 537f87562e71acb464e02fc81f2596b01816072c Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Mon, 2 Mar 2020 16:33:52 -0300
Subject: [PATCH 0057/1830] FIX: We need to skip users with associated
 reviewables when auto-approving (#9080)

* FIX: We need to skip users with associated reviewables when auto-approving them

* Update spec/initializers/track_setting_changes_spec.rb

* Update spec/initializers/track_setting_changes_spec.rb

Co-authored-by: Robin Ward <robin.ward@gmail.com>
---
 .../initializers/014-track-setting-changes.rb |  5 +++-
 .../track_setting_changes_spec.rb             | 25 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 spec/initializers/track_setting_changes_spec.rb

diff --git a/config/initializers/014-track-setting-changes.rb b/config/initializers/014-track-setting-changes.rb
index f8276d9dcc..200f2c2da6 100644
--- a/config/initializers/014-track-setting-changes.rb
+++ b/config/initializers/014-track-setting-changes.rb
@@ -4,7 +4,10 @@ DiscourseEvent.on(:site_setting_changed) do |name, old_value, new_value|
   # Enabling `must_approve_users` on an existing site is odd, so we assume that the
   # existing users are approved.
   if name == :must_approve_users && new_value == true
-    User.where(approved: false).update_all(approved: true)
+
+    User.where(approved: false)
+      .joins("LEFT JOIN reviewables r ON r.target_id = users.id")
+      .where(r: { id: nil }).update_all(approved: true)
   end
 
   if name == :emoji_set
diff --git a/spec/initializers/track_setting_changes_spec.rb b/spec/initializers/track_setting_changes_spec.rb
new file mode 100644
index 0000000000..82b7963ec4
--- /dev/null
+++ b/spec/initializers/track_setting_changes_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Setting changes' do
+  describe '#must_approve_users' do
+    before { SiteSetting.must_approve_users = false }
+
+    it 'does not approve a user with associated reviewables' do
+      user_pending_approval = Fabricate(:reviewable_user).target
+
+      SiteSetting.must_approve_users = true
+
+      expect(user_pending_approval.reload.approved?).to eq(false)
+    end
+
+    it 'approves a user with no associated reviewables' do
+      non_approved_user = Fabricate(:user, approved: false)
+
+      SiteSetting.must_approve_users = true
+
+      expect(non_approved_user.reload.approved?).to eq(true)
+    end
+  end
+end

From 4da357e3787c3627b26de0b56b7ab6e42c89496b Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 2 Mar 2020 21:20:19 +0100
Subject: [PATCH 0058/1830] DEV: Use async functions in tests (#9087)

This change both improves readability and fixes potential race-condition issues where promises were nested instead of being chained.

Also includes:
* Use arrow functions and Promise shorthands
* Remove the obsolete `asyncTestDiscourse` helper
---
 .../controllers/history-test.js.es6           |  10 +-
 test/javascripts/helpers/qunit-helpers.js.es6 |  11 --
 test/javascripts/lib/load-script-test.js.es6  |  11 +-
 .../javascripts/lib/preload-store-test.js.es6 |  77 +++------
 .../models/post-stream-test.js.es6            | 102 +++++------
 test/javascripts/models/post-test.js.es6      |  30 ++--
 .../javascripts/models/rest-model-test.js.es6 |  64 ++++---
 .../javascripts/models/result-set-test.js.es6 |  68 ++++----
 test/javascripts/models/store-test.js.es6     | 161 ++++++++----------
 .../javascripts/models/user-badge-test.js.es6 |  25 ++-
 10 files changed, 241 insertions(+), 318 deletions(-)

diff --git a/test/javascripts/controllers/history-test.js.es6 b/test/javascripts/controllers/history-test.js.es6
index 0aeccda048..6d8ccae7cf 100644
--- a/test/javascripts/controllers/history-test.js.es6
+++ b/test/javascripts/controllers/history-test.js.es6
@@ -1,6 +1,6 @@
 moduleFor("controller:history");
 
-QUnit.test("displayEdit", function(assert) {
+QUnit.test("displayEdit", async function(assert) {
   const HistoryController = this.subject();
 
   HistoryController.setProperties({
@@ -82,8 +82,8 @@ QUnit.test("displayEdit", function(assert) {
     }
   });
 
-  HistoryController.bodyDiffChanged().then(() => {
-    const output = HistoryController.get("bodyDiff");
-    assert.equal(output, expectedOutput, "it keeps safe HTML");
-  });
+  await HistoryController.bodyDiffChanged();
+
+  const output = HistoryController.get("bodyDiff");
+  assert.equal(output, expectedOutput, "it keeps safe HTML");
 });
diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6
index 34d92149b7..4b6ed9330f 100644
--- a/test/javascripts/helpers/qunit-helpers.js.es6
+++ b/test/javascripts/helpers/qunit-helpers.js.es6
@@ -1,5 +1,4 @@
 import { isEmpty } from "@ember/utils";
-import { run } from "@ember/runloop";
 import { later } from "@ember/runloop";
 /* global QUnit, resetSite */
 
@@ -156,16 +155,6 @@ export function controllerFor(controller, model) {
   return controller;
 }
 
-export function asyncTestDiscourse(text, func) {
-  QUnit.test(text, function(assert) {
-    const done = assert.async();
-    run(() => {
-      func.call(this, assert);
-      done();
-    });
-  });
-}
-
 export function fixture(selector) {
   if (selector) {
     return $("#qunit-fixture").find(selector);
diff --git a/test/javascripts/lib/load-script-test.js.es6 b/test/javascripts/lib/load-script-test.js.es6
index 1d3094bdf7..e73a1bafa9 100644
--- a/test/javascripts/lib/load-script-test.js.es6
+++ b/test/javascripts/lib/load-script-test.js.es6
@@ -12,11 +12,10 @@ QUnit.skip(
 
     const src = "/javascripts/ace/ace.js";
 
-    await loadScript(src).then(() => {
-      assert.ok(
-        typeof window.ace !== "undefined",
-        "callbacks should only be executed after the script has fully loaded"
-      );
-    });
+    await loadScript(src);
+    assert.ok(
+      typeof window.ace !== "undefined",
+      "callbacks should only be executed after the script has fully loaded"
+    );
   }
 );
diff --git a/test/javascripts/lib/preload-store-test.js.es6 b/test/javascripts/lib/preload-store-test.js.es6
index b0560b169c..e25e89ee82 100644
--- a/test/javascripts/lib/preload-store-test.js.es6
+++ b/test/javascripts/lib/preload-store-test.js.es6
@@ -1,5 +1,4 @@
 import PreloadStore from "preload-store";
-import { asyncTestDiscourse } from "helpers/qunit-helpers";
 import { Promise } from "rsvp";
 
 QUnit.module("preload-store", {
@@ -22,81 +21,45 @@ QUnit.test("remove", assert => {
   assert.blank(PreloadStore.get("bane"), "removes the value if the key exists");
 });
 
-asyncTestDiscourse(
+QUnit.test(
   "getAndRemove returns a promise that resolves to null",
-  function(assert) {
-    assert.expect(1);
-
-    const done = assert.async();
-    PreloadStore.getAndRemove("joker").then(function(result) {
-      assert.blank(result);
-      done();
-    });
+  async assert => {
+    assert.blank(await PreloadStore.getAndRemove("joker"));
   }
 );
 
-asyncTestDiscourse(
+QUnit.test(
   "getAndRemove returns a promise that resolves to the result of the finder",
-  function(assert) {
-    assert.expect(1);
+  async assert => {
+    const finder = () => "batdance";
+    const result = await PreloadStore.getAndRemove("joker", finder);
 
-    const done = assert.async();
-    const finder = function() {
-      return "batdance";
-    };
-    PreloadStore.getAndRemove("joker", finder).then(function(result) {
-      assert.equal(result, "batdance");
-      done();
-    });
+    assert.equal(result, "batdance");
   }
 );
 
-asyncTestDiscourse(
+QUnit.test(
   "getAndRemove returns a promise that resolves to the result of the finder's promise",
-  function(assert) {
-    assert.expect(1);
+  async assert => {
+    const finder = () => Promise.resolve("hahahah");
+    const result = await PreloadStore.getAndRemove("joker", finder);
 
-    const finder = function() {
-      return new Promise(function(resolve) {
-        resolve("hahahah");
-      });
-    };
-
-    const done = assert.async();
-    PreloadStore.getAndRemove("joker", finder).then(function(result) {
-      assert.equal(result, "hahahah");
-      done();
-    });
+    assert.equal(result, "hahahah");
   }
 );
 
-asyncTestDiscourse(
+QUnit.test(
   "returns a promise that rejects with the result of the finder's rejected promise",
-  function(assert) {
-    assert.expect(1);
+  async assert => {
+    const finder = () => Promise.reject("error");
 
-    const finder = function() {
-      return new Promise(function(resolve, reject) {
-        reject("error");
-      });
-    };
-
-    const done = assert.async();
-    PreloadStore.getAndRemove("joker", finder).then(null, function(result) {
+    await PreloadStore.getAndRemove("joker", finder).catch(result => {
       assert.equal(result, "error");
-      done();
     });
   }
 );
 
-asyncTestDiscourse("returns a promise that resolves to 'evil'", function(
-  assert
-) {
-  assert.expect(1);
-
-  const done = assert.async();
-  PreloadStore.getAndRemove("bane").then(function(result) {
-    assert.equal(result, "evil");
-    done();
-  });
+QUnit.test("returns a promise that resolves to 'evil'", async assert => {
+  const result = await PreloadStore.getAndRemove("bane");
+  assert.equal(result, "evil");
 });
diff --git a/test/javascripts/models/post-stream-test.js.es6 b/test/javascripts/models/post-stream-test.js.es6
index 9ba4632041..f7a587333f 100644
--- a/test/javascripts/models/post-stream-test.js.es6
+++ b/test/javascripts/models/post-stream-test.js.es6
@@ -446,7 +446,7 @@ QUnit.test("storePost", assert => {
   assert.equal(stored, postWithoutId, "it returns the same post back");
 });
 
-QUnit.test("identity map", assert => {
+QUnit.test("identity map", async assert => {
   const postStream = buildStream(1234);
   const store = postStream.store;
 
@@ -465,34 +465,29 @@ QUnit.test("identity map", assert => {
   assert.blank(postStream.findLoadedPost(4), "it can't find uncached posts");
 
   // Find posts by ids uses the identity map
-  return postStream.findPostsByIds([1, 2, 3]).then(result => {
-    assert.equal(result.length, 3);
-    assert.equal(result.objectAt(0), p1);
-    assert.equal(result.objectAt(1).get("post_number"), 2);
-    assert.equal(result.objectAt(2), p3);
-  });
+  const result = await postStream.findPostsByIds([1, 2, 3]);
+  assert.equal(result.length, 3);
+  assert.equal(result.objectAt(0), p1);
+  assert.equal(result.objectAt(1).get("post_number"), 2);
+  assert.equal(result.objectAt(2), p3);
 });
 
-QUnit.test("loadIntoIdentityMap with no data", assert => {
-  return buildStream(1234)
-    .loadIntoIdentityMap([])
-    .then(result => {
-      assert.equal(result.length, 0, "requesting no posts produces no posts");
-    });
+QUnit.test("loadIntoIdentityMap with no data", async assert => {
+  const result = await buildStream(1234).loadIntoIdentityMap([]);
+  assert.equal(result.length, 0, "requesting no posts produces no posts");
 });
 
-QUnit.test("loadIntoIdentityMap with post ids", assert => {
+QUnit.test("loadIntoIdentityMap with post ids", async assert => {
   const postStream = buildStream(1234);
+  await postStream.loadIntoIdentityMap([10]);
 
-  return postStream.loadIntoIdentityMap([10]).then(function() {
-    assert.present(
-      postStream.findLoadedPost(10),
-      "it adds the returned post to the store"
-    );
-  });
+  assert.present(
+    postStream.findLoadedPost(10),
+    "it adds the returned post to the store"
+  );
 });
 
-QUnit.test("appendMore for megatopic", assert => {
+QUnit.test("appendMore for megatopic", async assert => {
   const postStream = buildStream(1234);
   const store = createStore();
   const post = store.createRecord("post", { id: 1, post_number: 1 });
@@ -502,21 +497,20 @@ QUnit.test("appendMore for megatopic", assert => {
     posts: [post]
   });
 
-  return postStream.appendMore().then(() => {
-    assert.present(
-      postStream.findLoadedPost(2),
-      "it adds the returned post to the store"
-    );
+  await postStream.appendMore();
+  assert.present(
+    postStream.findLoadedPost(2),
+    "it adds the returned post to the store"
+  );
 
-    assert.equal(
-      postStream.get("posts").length,
-      6,
-      "it adds the right posts into the stream"
-    );
-  });
+  assert.equal(
+    postStream.get("posts").length,
+    6,
+    "it adds the right posts into the stream"
+  );
 });
 
-QUnit.test("prependMore for megatopic", assert => {
+QUnit.test("prependMore for megatopic", async assert => {
   const postStream = buildStream(1234);
   const store = createStore();
   const post = store.createRecord("post", { id: 6, post_number: 6 });
@@ -526,18 +520,17 @@ QUnit.test("prependMore for megatopic", assert => {
     posts: [post]
   });
 
-  return postStream.prependMore().then(() => {
-    assert.present(
-      postStream.findLoadedPost(5),
-      "it adds the returned post to the store"
-    );
+  await postStream.prependMore();
+  assert.present(
+    postStream.findLoadedPost(5),
+    "it adds the returned post to the store"
+  );
 
-    assert.equal(
-      postStream.get("posts").length,
-      6,
-      "it adds the right posts into the stream"
-    );
-  });
+  assert.equal(
+    postStream.get("posts").length,
+    6,
+    "it adds the right posts into the stream"
+  );
 });
 
 QUnit.test("staging and undoing a new post", assert => {
@@ -865,7 +858,7 @@ QUnit.test("triggerNewPostInStream for ignored posts", async assert => {
   );
 });
 
-QUnit.test("postsWithPlaceholders", assert => {
+QUnit.test("postsWithPlaceholders", async assert => {
   const postStream = buildStream(4964, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
   const postsWithPlaceholders = postStream.get("postsWithPlaceholders");
   const store = postStream.store;
@@ -903,16 +896,15 @@ QUnit.test("postsWithPlaceholders", assert => {
   assert.ok(postsWithPlaceholders.objectAt(3) !== p4);
   assert.ok(testProxy.objectAt(3) !== p4);
 
-  return promise.then(() => {
-    assert.equal(postsWithPlaceholders.objectAt(3), p4);
-    assert.equal(
-      postsWithPlaceholders.get("length"),
-      8,
-      "have a larger placeholder window when loaded"
-    );
-    assert.equal(testProxy.get("length"), 8);
-    assert.equal(testProxy.objectAt(3), p4);
-  });
+  await promise;
+  assert.equal(postsWithPlaceholders.objectAt(3), p4);
+  assert.equal(
+    postsWithPlaceholders.get("length"),
+    8,
+    "have a larger placeholder window when loaded"
+  );
+  assert.equal(testProxy.get("length"), 8);
+  assert.equal(testProxy.objectAt(3), p4);
 });
 
 QUnit.test("filteredPostsCount", assert => {
diff --git a/test/javascripts/models/post-test.js.es6 b/test/javascripts/models/post-test.js.es6
index a96c32bb91..ad7fc393ec 100644
--- a/test/javascripts/models/post-test.js.es6
+++ b/test/javascripts/models/post-test.js.es6
@@ -80,20 +80,20 @@ QUnit.test("destroy by staff", assert => {
   );
 });
 
-QUnit.test("destroy by non-staff", assert => {
-  var originalCooked = "this is the original cooked value",
-    user = User.create({ username: "evil trout" }),
-    post = buildPost({ user: user, cooked: originalCooked });
+QUnit.test("destroy by non-staff", async assert => {
+  const originalCooked = "this is the original cooked value";
+  const user = User.create({ username: "evil trout" });
+  const post = buildPost({ user: user, cooked: originalCooked });
 
-  return post.destroy(user).then(() => {
-    assert.ok(
-      !post.get("can_delete"),
-      "the post can't be deleted again in this session"
-    );
-    assert.ok(
-      post.get("cooked") !== originalCooked,
-      "the cooked content changed"
-    );
-    assert.equal(post.get("version"), 2, "the version number increased");
-  });
+  await post.destroy(user);
+
+  assert.ok(
+    !post.get("can_delete"),
+    "the post can't be deleted again in this session"
+  );
+  assert.ok(
+    post.get("cooked") !== originalCooked,
+    "the cooked content changed"
+  );
+  assert.equal(post.get("version"), 2, "the version number increased");
 });
diff --git a/test/javascripts/models/rest-model-test.js.es6 b/test/javascripts/models/rest-model-test.js.es6
index c5e66c4867..c7c44bba26 100644
--- a/test/javascripts/models/rest-model-test.js.es6
+++ b/test/javascripts/models/rest-model-test.js.es6
@@ -18,43 +18,42 @@ QUnit.test("munging", assert => {
   assert.equal(g.get("inverse"), 0.6, "it runs `munge` on `create`");
 });
 
-QUnit.test("update", assert => {
+QUnit.test("update", async assert => {
   const store = createStore();
-  return store.find("widget", 123).then(function(widget) {
-    assert.equal(widget.get("name"), "Trout Lure");
-    assert.ok(!widget.get("isSaving"), "it is not saving");
+  const widget = await store.find("widget", 123);
+  assert.equal(widget.get("name"), "Trout Lure");
+  assert.ok(!widget.get("isSaving"), "it is not saving");
 
-    const promise = widget.update({ name: "new name" });
-    assert.ok(widget.get("isSaving"), "it is saving");
+  const promise = widget.update({ name: "new name" });
+  assert.ok(widget.get("isSaving"), "it is saving");
 
-    promise.then(function(result) {
-      assert.ok(!widget.get("isSaving"), "it is no longer saving");
-      assert.equal(widget.get("name"), "new name");
+  const result = await promise;
+  assert.ok(!widget.get("isSaving"), "it is no longer saving");
+  assert.equal(widget.get("name"), "new name");
 
-      assert.ok(result.target, "it has a reference to the record");
-      assert.equal(result.target.name, widget.get("name"));
-    });
-  });
+  assert.ok(result.target, "it has a reference to the record");
+  assert.equal(result.target.name, widget.get("name"));
 });
 
-QUnit.test("updating simultaneously", assert => {
+QUnit.test("updating simultaneously", async assert => {
   assert.expect(2);
 
   const store = createStore();
-  return store.find("widget", 123).then(function(widget) {
-    const firstPromise = widget.update({ name: "new name" });
-    const secondPromise = widget.update({ name: "new name" });
-    firstPromise.then(function() {
-      assert.ok(true, "the first promise succeeeds");
-    });
+  const widget = await store.find("widget", 123);
 
-    secondPromise.catch(function() {
-      assert.ok(true, "the second promise fails");
-    });
+  const firstPromise = widget.update({ name: "new name" });
+  const secondPromise = widget.update({ name: "new name" });
+
+  firstPromise.then(function() {
+    assert.ok(true, "the first promise succeeeds");
+  });
+
+  secondPromise.catch(function() {
+    assert.ok(true, "the second promise fails");
   });
 });
 
-QUnit.test("save new", assert => {
+QUnit.test("save new", async assert => {
   const store = createStore();
   const widget = store.createRecord("widget");
 
@@ -65,16 +64,15 @@ QUnit.test("save new", assert => {
   const promise = widget.save({ name: "Evil Widget" });
   assert.ok(widget.get("isSaving"), "it is not saving");
 
-  return promise.then(function(result) {
-    assert.ok(!widget.get("isSaving"), "it is no longer saving");
-    assert.ok(widget.get("id"), "it has an id");
-    assert.ok(widget.get("name"), "Evil Widget");
-    assert.ok(widget.get("isCreated"), "it is created");
-    assert.ok(!widget.get("isNew"), "it is no longer new");
+  const result = await promise;
+  assert.ok(!widget.get("isSaving"), "it is no longer saving");
+  assert.ok(widget.get("id"), "it has an id");
+  assert.ok(widget.get("name"), "Evil Widget");
+  assert.ok(widget.get("isCreated"), "it is created");
+  assert.ok(!widget.get("isNew"), "it is no longer new");
 
-    assert.ok(result.target, "it has a reference to the record");
-    assert.equal(result.target.name, widget.get("name"));
-  });
+  assert.ok(result.target, "it has a reference to the record");
+  assert.equal(result.target.name, widget.get("name"));
 });
 
 QUnit.test("creating simultaneously", assert => {
diff --git a/test/javascripts/models/result-set-test.js.es6 b/test/javascripts/models/result-set-test.js.es6
index 1f819b317e..f80ae1901c 100644
--- a/test/javascripts/models/result-set-test.js.es6
+++ b/test/javascripts/models/result-set-test.js.es6
@@ -4,50 +4,46 @@ import ResultSet from "discourse/models/result-set";
 import createStore from "helpers/create-store";
 
 QUnit.test("defaults", assert => {
-  const rs = ResultSet.create({ content: [] });
-  assert.equal(rs.get("length"), 0);
-  assert.equal(rs.get("totalRows"), 0);
-  assert.ok(!rs.get("loadMoreUrl"));
-  assert.ok(!rs.get("loading"));
-  assert.ok(!rs.get("loadingMore"));
-  assert.ok(!rs.get("refreshing"));
+  const resultSet = ResultSet.create({ content: [] });
+  assert.equal(resultSet.get("length"), 0);
+  assert.equal(resultSet.get("totalRows"), 0);
+  assert.ok(!resultSet.get("loadMoreUrl"));
+  assert.ok(!resultSet.get("loading"));
+  assert.ok(!resultSet.get("loadingMore"));
+  assert.ok(!resultSet.get("refreshing"));
 });
 
-QUnit.test("pagination support", assert => {
+QUnit.test("pagination support", async assert => {
   const store = createStore();
-  return store.findAll("widget").then(function(rs) {
-    assert.equal(rs.get("length"), 2);
-    assert.equal(rs.get("totalRows"), 4);
-    assert.ok(rs.get("loadMoreUrl"), "has a url to load more");
-    assert.ok(!rs.get("loadingMore"), "it is not loading more");
-    assert.ok(rs.get("canLoadMore"));
+  const resultSet = await store.findAll("widget");
+  assert.equal(resultSet.get("length"), 2);
+  assert.equal(resultSet.get("totalRows"), 4);
+  assert.ok(resultSet.get("loadMoreUrl"), "has a url to load more");
+  assert.ok(!resultSet.get("loadingMore"), "it is not loading more");
+  assert.ok(resultSet.get("canLoadMore"));
 
-    const promise = rs.loadMore();
+  const promise = resultSet.loadMore();
+  assert.ok(resultSet.get("loadingMore"), "it is loading more");
 
-    assert.ok(rs.get("loadingMore"), "it is loading more");
-    promise.then(function() {
-      assert.ok(!rs.get("loadingMore"), "it finished loading more");
-      assert.equal(rs.get("length"), 4);
-      assert.ok(!rs.get("loadMoreUrl"));
-      assert.ok(!rs.get("canLoadMore"));
-    });
-  });
+  await promise;
+  assert.ok(!resultSet.get("loadingMore"), "it finished loading more");
+  assert.equal(resultSet.get("length"), 4);
+  assert.ok(!resultSet.get("loadMoreUrl"));
+  assert.ok(!resultSet.get("canLoadMore"));
 });
 
-QUnit.test("refresh support", assert => {
+QUnit.test("refresh support", async assert => {
   const store = createStore();
-  return store.findAll("widget").then(function(rs) {
-    assert.equal(
-      rs.get("refreshUrl"),
-      "/widgets?refresh=true",
-      "it has the refresh url"
-    );
+  const resultSet = await store.findAll("widget");
+  assert.equal(
+    resultSet.get("refreshUrl"),
+    "/widgets?refresh=true",
+    "it has the refresh url"
+  );
 
-    const promise = rs.refresh();
+  const promise = resultSet.refresh();
+  assert.ok(resultSet.get("refreshing"), "it is refreshing");
 
-    assert.ok(rs.get("refreshing"), "it is refreshing");
-    promise.then(function() {
-      assert.ok(!rs.get("refreshing"), "it is finished refreshing");
-    });
-  });
+  await promise;
+  assert.ok(!resultSet.get("refreshing"), "it is finished refreshing");
 });
diff --git a/test/javascripts/models/store-test.js.es6 b/test/javascripts/models/store-test.js.es6
index f8d9ba1c03..2e220b152c 100644
--- a/test/javascripts/models/store-test.js.es6
+++ b/test/javascripts/models/store-test.js.es6
@@ -50,77 +50,68 @@ QUnit.test(
   }
 );
 
-QUnit.test("find", assert => {
+QUnit.test("find", async assert => {
   const store = createStore();
 
-  return store.find("widget", 123).then(function(w) {
-    assert.equal(w.get("name"), "Trout Lure");
-    assert.equal(w.get("id"), 123);
-    assert.ok(!w.get("isNew"), "found records are not new");
-    assert.equal(w.get("extras.hello"), "world", "extra attributes are set");
+  const widget = await store.find("widget", 123);
+  assert.equal(widget.get("name"), "Trout Lure");
+  assert.equal(widget.get("id"), 123);
+  assert.ok(!widget.get("isNew"), "found records are not new");
+  assert.equal(widget.get("extras.hello"), "world", "extra attributes are set");
 
-    // A second find by id returns the same object
-    store.find("widget", 123).then(function(w2) {
-      assert.equal(w, w2);
-      assert.equal(w.get("extras.hello"), "world", "extra attributes are set");
-    });
-  });
+  // A second find by id returns the same object
+  const widget2 = await store.find("widget", 123);
+  assert.equal(widget, widget2);
+  assert.equal(widget.get("extras.hello"), "world", "extra attributes are set");
 });
 
-QUnit.test("find with object id", assert => {
+QUnit.test("find with object id", async assert => {
   const store = createStore();
-  return store.find("widget", { id: 123 }).then(function(w) {
-    assert.equal(w.get("firstObject.name"), "Trout Lure");
-  });
+  const widget = await store.find("widget", { id: 123 });
+  assert.equal(widget.get("firstObject.name"), "Trout Lure");
 });
 
-QUnit.test("find with query param", assert => {
+QUnit.test("find with query param", async assert => {
   const store = createStore();
-  return store.find("widget", { name: "Trout Lure" }).then(function(w) {
-    assert.equal(w.get("firstObject.id"), 123);
-  });
+  const widget = await store.find("widget", { name: "Trout Lure" });
+  assert.equal(widget.get("firstObject.id"), 123);
 });
 
-QUnit.test("findStale with no stale results", assert => {
+QUnit.test("findStale with no stale results", async assert => {
   const store = createStore();
   const stale = store.findStale("widget", { name: "Trout Lure" });
 
   assert.ok(!stale.hasResults, "there are no stale results");
   assert.ok(!stale.results, "results are present");
-  return stale.refresh().then(function(w) {
-    assert.equal(
-      w.get("firstObject.id"),
-      123,
-      "a `refresh()` method provides results for stale"
-    );
-  });
+  const widget = await stale.refresh();
+  assert.equal(
+    widget.get("firstObject.id"),
+    123,
+    "a `refresh()` method provides results for stale"
+  );
 });
 
-QUnit.test("update", assert => {
+QUnit.test("update", async assert => {
   const store = createStore();
-  return store.update("widget", 123, { name: "hello" }).then(function(result) {
-    assert.ok(result);
-  });
+  const result = await store.update("widget", 123, { name: "hello" });
+  assert.ok(result);
 });
 
-QUnit.test("update with a multi world name", function(assert) {
+QUnit.test("update with a multi world name", async assert => {
   const store = createStore();
-  return store
-    .update("cool-thing", 123, { name: "hello" })
-    .then(function(result) {
-      assert.ok(result);
-      assert.equal(result.payload.name, "hello");
-    });
+  const result = await store.update("cool-thing", 123, { name: "hello" });
+  assert.ok(result);
+  assert.equal(result.payload.name, "hello");
 });
 
-QUnit.test("findAll", assert => {
+QUnit.test("findAll", async assert => {
   const store = createStore();
-  return store.findAll("widget").then(function(result) {
-    assert.equal(result.get("length"), 2);
-    const w = result.findBy("id", 124);
-    assert.ok(!w.get("isNew"), "found records are not new");
-    assert.equal(w.get("name"), "Evil Repellant");
-  });
+  const result = await store.findAll("widget");
+  assert.equal(result.get("length"), 2);
+
+  const widget = result.findBy("id", 124);
+  assert.ok(!widget.get("isNew"), "found records are not new");
+  assert.equal(widget.get("name"), "Evil Repellant");
 });
 
 QUnit.test("destroyRecord", function(assert) {
@@ -140,59 +131,57 @@ QUnit.test("destroyRecord when new", function(assert) {
   });
 });
 
-QUnit.test("find embedded", function(assert) {
+QUnit.test("find embedded", async assert => {
   const store = createStore();
-  return store.find("fruit", 1).then(function(f) {
-    assert.ok(f.get("farmer"), "it has the embedded object");
+  const fruit = await store.find("fruit", 1);
+  assert.ok(fruit.get("farmer"), "it has the embedded object");
 
-    const fruitCols = f.get("colors");
-    assert.equal(fruitCols.length, 2);
-    assert.equal(fruitCols[0].get("id"), 1);
-    assert.equal(fruitCols[1].get("id"), 2);
+  const fruitCols = fruit.get("colors");
+  assert.equal(fruitCols.length, 2);
+  assert.equal(fruitCols[0].get("id"), 1);
+  assert.equal(fruitCols[1].get("id"), 2);
 
-    assert.ok(f.get("category"), "categories are found automatically");
-  });
+  assert.ok(fruit.get("category"), "categories are found automatically");
 });
 
 QUnit.test("embedded records can be cleared", async assert => {
   const store = createStore();
-  let f = await store.find("fruit", 4);
-  f.set("farmer", { dummy: "object" });
-  f = await store.find("fruit", 4);
-  assert.ok(!f.get("farmer"));
+  let fruit = await store.find("fruit", 4);
+  fruit.set("farmer", { dummy: "object" });
+
+  fruit = await store.find("fruit", 4);
+  assert.ok(!fruit.get("farmer"));
 });
 
-QUnit.test("meta types", function(assert) {
+QUnit.test("meta types", async assert => {
   const store = createStore();
-  return store.find("barn", 1).then(function(f) {
-    assert.equal(
-      f.get("owner.name"),
-      "Old MacDonald",
-      "it has the embedded farmer"
-    );
-  });
+  const barn = await store.find("barn", 1);
+  assert.equal(
+    barn.get("owner.name"),
+    "Old MacDonald",
+    "it has the embedded farmer"
+  );
 });
 
-QUnit.test("findAll embedded", function(assert) {
+QUnit.test("findAll embedded", async assert => {
   const store = createStore();
-  return store.findAll("fruit").then(function(fruits) {
-    assert.equal(fruits.objectAt(0).get("farmer.name"), "Old MacDonald");
-    assert.equal(
-      fruits.objectAt(0).get("farmer"),
-      fruits.objectAt(1).get("farmer"),
-      "points at the same object"
-    );
-    assert.equal(
-      fruits.get("extras.hello"),
-      "world",
-      "it can supply extra information"
-    );
+  const fruits = await store.findAll("fruit");
+  assert.equal(fruits.objectAt(0).get("farmer.name"), "Old MacDonald");
+  assert.equal(
+    fruits.objectAt(0).get("farmer"),
+    fruits.objectAt(1).get("farmer"),
+    "points at the same object"
+  );
+  assert.equal(
+    fruits.get("extras.hello"),
+    "world",
+    "it can supply extra information"
+  );
 
-    const fruitCols = fruits.objectAt(0).get("colors");
-    assert.equal(fruitCols.length, 2);
-    assert.equal(fruitCols[0].get("id"), 1);
-    assert.equal(fruitCols[1].get("id"), 2);
+  const fruitCols = fruits.objectAt(0).get("colors");
+  assert.equal(fruitCols.length, 2);
+  assert.equal(fruitCols[0].get("id"), 1);
+  assert.equal(fruitCols[1].get("id"), 2);
 
-    assert.equal(fruits.objectAt(2).get("farmer.name"), "Luke Skywalker");
-  });
+  assert.equal(fruits.objectAt(2).get("farmer.name"), "Luke Skywalker");
 });
diff --git a/test/javascripts/models/user-badge-test.js.es6 b/test/javascripts/models/user-badge-test.js.es6
index 2a0fdd9d6f..80d2432453 100644
--- a/test/javascripts/models/user-badge-test.js.es6
+++ b/test/javascripts/models/user-badge-test.js.es6
@@ -35,26 +35,23 @@ QUnit.test("createFromJson array", assert => {
   );
 });
 
-QUnit.test("findByUsername", assert => {
-  return UserBadge.findByUsername("anne3").then(function(badges) {
-    assert.ok(Array.isArray(badges), "returns an array");
-  });
+QUnit.test("findByUsername", async assert => {
+  const badges = await UserBadge.findByUsername("anne3");
+  assert.ok(Array.isArray(badges), "returns an array");
 });
 
-QUnit.test("findByBadgeId", assert => {
-  return UserBadge.findByBadgeId(880).then(function(badges) {
-    assert.ok(Array.isArray(badges), "returns an array");
-  });
+QUnit.test("findByBadgeId", async assert => {
+  const badges = await UserBadge.findByBadgeId(880);
+  assert.ok(Array.isArray(badges), "returns an array");
 });
 
-QUnit.test("grant", assert => {
-  return UserBadge.grant(1, "username").then(function(userBadge) {
-    assert.ok(!Array.isArray(userBadge), "does not return an array");
-  });
+QUnit.test("grant", async assert => {
+  const userBadge = await UserBadge.grant(1, "username");
+  assert.ok(!Array.isArray(userBadge), "does not return an array");
 });
 
-QUnit.test("revoke", assert => {
+QUnit.test("revoke", async assert => {
   assert.expect(0);
   const userBadge = UserBadge.create({ id: 1 });
-  return userBadge.revoke();
+  await userBadge.revoke();
 });

From ee35bbdbba020de6fb27369e2bbfe4f5ae95c847 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2020 16:34:53 -0500
Subject: [PATCH 0059/1830] Build(deps): Bump oj from 3.10.2 to 3.10.3 (#9092)

Bumps [oj](https://github.com/ohler55/oj) from 3.10.2 to 3.10.3.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.2...v3.10.3)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 8eaa96fb40..f6dafec9a5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -215,7 +215,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.10.2)
+    oj (3.10.3)
     omniauth (1.9.0)
       hashie (>= 3.4.6, < 3.7.0)
       rack (>= 1.6.2, < 3)

From 8a696a4ffc2fcedfcd9a7b4883d7553d6fada4c9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2020 16:35:13 -0500
Subject: [PATCH 0060/1830] Build(deps-dev): Bump annotate from 3.0.3 to 3.1.0
 (#9091)

Bumps [annotate](https://github.com/ctran/annotate_models) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/ctran/annotate_models/releases)
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ctran/annotate_models/compare/v3.0.3...v3.1.0)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index f6dafec9a5..1134290d72 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,7 +40,7 @@ GEM
       zeitwerk (~> 2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    annotate (3.0.3)
+    annotate (3.1.0)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.0)

From 0388653a4d7d422a1525649a155182446da34405 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 3 Mar 2020 10:03:58 +1100
Subject: [PATCH 0061/1830] DEV: Upload and secure media retroactive rake task
 improvements (#9027)

* Add uploads:sync_s3_acls rake task to ensure the ACLs in S3 are the correct (public-read or private) setting based on upload security

* Improved uploads:disable_secure_media to be more efficient and provide better messages to the user.

* Rename uploads:ensure_correct_acl task to uploads:secure_upload_analyse_and_update as it does more than check the ACL

* Many improvements to uploads:secure_upload_analyse_and_update

* Make sure that upload.access_control_post is unscoped so deleted posts are still fetched, because they still affect the security of the upload.

* Add escape hatch for capture_stdout in the form of RAILS_ENABLE_TEST_STDOUT. If provided the capture_stdout code will be ignored, so you can see the output if you need.
---
 app/models/upload.rb                          |   6 +
 lib/tasks/uploads.rake                        | 195 +++++++++++++-----
 lib/upload_security.rb                        |   3 -
 .../update_private_uploads_acl_spec.rb        |  20 +-
 spec/lib/upload_security_spec.rb              |  11 +-
 spec/support/helpers.rb                       |   4 +
 spec/tasks/uploads_spec.rb                    |  94 ++++++++-
 7 files changed, 271 insertions(+), 62 deletions(-)

diff --git a/app/models/upload.rb b/app/models/upload.rb
index d306ef9538..fe6f5c3e0e 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -14,6 +14,12 @@ class Upload < ActiveRecord::Base
   belongs_to :user
   belongs_to :access_control_post, class_name: 'Post'
 
+  # when we access this post we don't care if the post
+  # is deleted
+  def access_control_post
+    Post.unscoped { super }
+  end
+
   has_many :post_uploads, dependent: :destroy
   has_many :posts, through: :post_uploads
 
diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 7480cb73c4..33c69b7d6c 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -615,6 +615,21 @@ task "uploads:recover" => :environment do
   end
 end
 
+task "uploads:sync_s3_acls" => :environment do
+  RailsMultisite::ConnectionManagement.each_connection do |db|
+    unless Discourse.store.external?
+      puts "This task only works for external storage."
+      exit 1
+    end
+
+    puts "CAUTION: This task may take a long time to complete!"
+    puts "-" * 30
+    puts "Uploads marked as secure will get a private ACL, and uploads marked as not secure will get a public ACL."
+    adjust_acls(Upload.find_each(batch_size: 100))
+    puts "", "Upload ACL sync complete!"
+  end
+end
+
 task "uploads:disable_secure_media" => :environment do
   RailsMultisite::ConnectionManagement.each_connection do |db|
     unless Discourse.store.external?
@@ -628,43 +643,56 @@ task "uploads:disable_secure_media" => :environment do
 
     secure_uploads = Upload.includes(:posts).where(secure: true)
     secure_upload_count = secure_uploads.count
+    uploads_to_adjust_acl_for = []
+    posts_to_rebake = {}
 
     i = 0
     secure_uploads.find_each(batch_size: 20).each do |upload|
-      Upload.transaction do
-        upload.secure = false
+      uploads_to_adjust_acl_for << upload
 
-        RakeHelpers.print_status_with_label("Updating ACL for upload #{upload.id}.......", i, secure_upload_count)
-        Discourse.store.update_upload_ACL(upload)
-
-        RakeHelpers.print_status_with_label("Rebaking posts for upload #{upload.id}.......", i, secure_upload_count)
-        upload.posts.each(&:rebake!)
-        upload.save
-
-        i += 1
+      upload.posts.each do |post|
+        # don't want unnecessary double-ups
+        next if posts_to_rebake.key?(post.id)
+        posts_to_rebake[post.id] = post
       end
+
+      i += 1
     end
 
+    puts "", "Marking #{secure_upload_count} uploads as not secure.", ""
+    secure_uploads.update_all(secure: false)
+
+    adjust_acls(uploads_to_adjust_acl_for)
+    post_rebake_errors = rebake_upload_posts(posts_to_rebake)
+    log_rebake_errors(post_rebake_errors)
+
     RakeHelpers.print_status_with_label("Rebaking and updating complete!            ", i, secure_upload_count)
-    puts ""
   end
 
-  puts "Secure media is now disabled!", ""
+  puts "", "Secure media is now disabled!", ""
+end
+
+# Renamed to uploads:secure_upload_analyse_and_update
+task "uploads:ensure_correct_acl" => :environment do
+  puts "This task has been deprecated, run uploads:secure_upload_analyse_and_update task instead."
+  exit 1
 end
 
 ##
 # Run this task whenever the secure_media or login_required
 # settings are changed for a Discourse instance to update
-# the upload secure flag and S3 upload ACLs.
-task "uploads:ensure_correct_acl" => :environment do
+# the upload secure flag and S3 upload ACLs. Any uploads that
+# have their secure status changed will have all associated posts
+# rebaked.
+task "uploads:secure_upload_analyse_and_update" => :environment do
   RailsMultisite::ConnectionManagement.each_connection do |db|
     unless Discourse.store.external?
       puts "This task only works for external storage."
       exit 1
     end
 
-    puts "Ensuring correct ACL for uploads in #{db}...", ""
-
+    puts "Analyzing security for uploads in #{db}...", ""
+    upload_ids_to_mark_as_secure, upload_ids_to_mark_as_not_secure, posts_to_rebake, uploads_to_adjust_acl_for = nil
     Upload.transaction do
       mark_secure_in_loop_because_no_login_required = false
 
@@ -677,19 +705,23 @@ task "uploads:ensure_correct_acl" => :environment do
         update_uploads_access_control_post
       end
 
-      # First of all only get relevant uploads (supported media).
-      #
-      # Also only get uploads that are not for a theme or a site setting, so only
-      # get post related uploads.
-      uploads_with_supported_media = Upload.includes(:posts, :access_control_post, :optimized_images).where(
-        "LOWER(original_filename) SIMILAR TO '%\.(jpg|jpeg|png|gif|svg|ico|mp3|ogg|wav|m4a|mov|mp4|webm|ogv)'"
-      ).joins(:post_uploads)
+      # Get all uploads in the database, including optimized images. Both media (images, videos,
+      # etc) along with attachments (pdfs, txt, etc.) must be loaded because all can be marked as
+      # secure based on site settings.
+      uploads_to_update = Upload.includes(:posts, :optimized_images).joins(:post_uploads)
 
-      puts "There are #{uploads_with_supported_media.count} upload(s) with supported media that could be marked secure.", ""
+      # we do this to avoid a heavier post query, and to make sure we only
+      # get unique posts AND include deleted posts (unscoped)
+      unique_access_control_posts = Post.unscoped.select(:id, :topic_id).includes(topic: :category).where(id: uploads_to_update.pluck(:access_control_post_id).uniq)
+      uploads_to_update.each do |upload|
+        upload.access_control_post = unique_access_control_posts.find { |post| post.id == upload.access_control_post_id }
+      end
+
+      puts "There are #{uploads_to_update.count} upload(s) that could be marked secure.", ""
 
       # Simply mark all these uploads as secure if login_required because no anons will be able to access them
       if SiteSetting.login_required?
-        mark_all_as_secure_login_required(uploads_with_supported_media)
+        mark_secure_in_loop_because_no_login_required = false
       else
 
         # If NOT login_required, then we have to go for the other slower flow, where in the loop
@@ -698,24 +730,50 @@ task "uploads:ensure_correct_acl" => :environment do
         puts "Marking posts as secure in the next step because login_required is false."
       end
 
-      puts "", "Determining which of #{uploads_with_supported_media.count} upload posts need to be marked secure and be rebaked.", ""
+      puts "", "Analysing which of #{uploads_to_update.count} uploads need to be marked secure and be rebaked.", ""
 
-      upload_ids_to_mark_as_secure, posts_to_rebake = determine_upload_security_and_posts_to_rebake(
-        uploads_with_supported_media, mark_secure_in_loop_because_no_login_required
+      upload_ids_to_mark_as_secure,
+        upload_ids_to_mark_as_not_secure,
+        posts_to_rebake,
+        uploads_to_adjust_acl_for = determine_upload_security_and_posts_to_rebake(
+        uploads_to_update, mark_secure_in_loop_because_no_login_required
       )
 
-      mark_specific_uploads_as_secure_no_login_required(upload_ids_to_mark_as_secure)
-
-      post_rebake_errors = rebake_upload_posts(posts_to_rebake)
-      log_rebake_errors(post_rebake_errors)
+      if !SiteSetting.login_required?
+        update_specific_upload_security_no_login_required(upload_ids_to_mark_as_secure, upload_ids_to_mark_as_not_secure)
+      else
+        mark_all_as_secure_login_required(uploads_to_update)
+      end
     end
+
+    # Enqueue rebakes AFTER upload transaction complete, so there is no race condition
+    # between updating the DB and the rebakes occurring.
+    post_rebake_errors = rebake_upload_posts(posts_to_rebake)
+    log_rebake_errors(post_rebake_errors)
+
+    # Also do this AFTER upload transaction complete so we don't end up with any
+    # errors leaving ACLs in a bad state (the ACL sync task can be run to fix any
+    # outliers at any time).
+    adjust_acls(uploads_to_adjust_acl_for)
   end
-  puts "", "Done"
+  puts "", "", "Done!"
 end
 
-def mark_all_as_secure_login_required(uploads_with_supported_media)
-  puts "Marking #{uploads_with_supported_media.count} upload(s) as secure because login_required is true.", ""
-  uploads_with_supported_media.update_all(secure: true)
+def adjust_acls(uploads_to_adjust_acl_for)
+  total_count = uploads_to_adjust_acl_for.respond_to?(:length) ? uploads_to_adjust_acl_for.length : uploads_to_adjust_acl_for.count
+  puts "", "Updating ACL for #{total_count} uploads.", ""
+  i = 0
+  uploads_to_adjust_acl_for.each do |upload|
+    RakeHelpers.print_status_with_label("Updating ACL for upload.......", i, total_count)
+    Discourse.store.update_upload_ACL(upload)
+    i += 1
+  end
+  RakeHelpers.print_status_with_label("Updaing ACLs complete!        ", i, total_count)
+end
+
+def mark_all_as_secure_login_required(uploads_to_update)
+  puts "Marking #{uploads_to_update.count} upload(s) as secure because login_required is true.", ""
+  uploads_to_update.update_all(secure: true)
   puts "Finished marking upload(s) as secure."
 end
 
@@ -727,11 +785,16 @@ def log_rebake_errors(rebake_errors)
   end
 end
 
-def mark_specific_uploads_as_secure_no_login_required(upload_ids_to_mark_as_secure)
-  return if upload_ids_to_mark_as_secure.empty?
-  puts "Marking #{upload_ids_to_mark_as_secure.length} uploads as secure because UploadSecurity determined them to be secure."
-  Upload.where(id: upload_ids_to_mark_as_secure).update_all(secure: true)
-  puts "Finished marking uploads as secure."
+def update_specific_upload_security_no_login_required(upload_ids_to_mark_as_secure, upload_ids_to_mark_as_not_secure)
+  if upload_ids_to_mark_as_secure.any?
+    puts "Marking #{upload_ids_to_mark_as_secure.length} uploads as secure because UploadSecurity determined them to be secure."
+    Upload.where(id: upload_ids_to_mark_as_secure).update_all(secure: true)
+  end
+  if upload_ids_to_mark_as_not_secure.any?
+    puts "Marking #{upload_ids_to_mark_as_not_secure.length} uploads as not secure because UploadSecurity determined them to be not secure."
+    Upload.where(id: upload_ids_to_mark_as_not_secure).update_all(secure: false)
+  end
+  puts "Finished updating upload security."
 end
 
 def update_uploads_access_control_post
@@ -752,12 +815,13 @@ def update_uploads_access_control_post
 end
 
 def rebake_upload_posts(posts_to_rebake)
+  posts_to_rebake = posts_to_rebake.values
   post_rebake_errors = []
   puts "", "Rebaking #{posts_to_rebake.length} posts with affected uploads.", ""
   begin
     i = 0
     posts_to_rebake.each do |post|
-      RakeHelpers.print_status_with_label("Determining which uploads to mark secure and rebake.....", i, posts_to_rebake.length)
+      RakeHelpers.print_status_with_label("Rebaking posts.....", i, posts_to_rebake.length)
       post.rebake!
       i += 1
     end
@@ -770,32 +834,55 @@ def rebake_upload_posts(posts_to_rebake)
   post_rebake_errors
 end
 
-def determine_upload_security_and_posts_to_rebake(uploads_with_supported_media, mark_secure_in_loop_because_no_login_required)
+def determine_upload_security_and_posts_to_rebake(uploads_to_update, mark_secure_in_loop_because_no_login_required)
   upload_ids_to_mark_as_secure = []
-  posts_to_rebake = []
+  upload_ids_to_mark_as_not_secure = []
+  uploads_to_adjust_acl_for = []
+  posts_to_rebake = {}
 
   i = 0
-  uploads_with_supported_media.find_each(batch_size: 50) do |upload_with_supported_media|
-    RakeHelpers.print_status_with_label("Updating ACL for upload.......", i, uploads_with_supported_media.count)
+  uploads_to_update.find_each(batch_size: 50) do |upload_to_update|
 
     # we just need to determine the post security here so the ACL is set to the correct thing,
     # because the update_upload_ACL method uses upload.secure?
-    upload_with_supported_media.secure = UploadSecurity.new(upload_with_supported_media).should_be_secure?
-    Discourse.store.update_upload_ACL(upload_with_supported_media)
+    original_update_secure_status = upload_to_update.secure
+    upload_to_update.secure = UploadSecurity.new(upload_to_update).should_be_secure?
 
-    RakeHelpers.print_status_with_label("Determining which uploads to mark secure and rebake.....", i, uploads_with_supported_media.count)
-    upload_with_supported_media.posts.each { |post| posts_to_rebake << post }
+    # no point changing ACLs or rebaking or doing any such shenanigans
+    # when the secure status hasn't even changed!
+    if original_update_secure_status == upload_to_update.secure
+      i += 1
+      next
+    end
 
-    if mark_secure_in_loop_because_no_login_required && upload_with_supported_media.secure?
-      upload_ids_to_mark_as_secure << upload_with_supported_media.id
+    # we only want to update the acl later once the secure status
+    # has been saved in the DB; otherwise if there is a later failure
+    # we get stuck with an incorrect ACL in S3
+    uploads_to_adjust_acl_for << upload_to_update
+    RakeHelpers.print_status_with_label("Analysing which upload posts to rebake.....", i, uploads_to_update.count)
+    upload_to_update.posts.each do |post|
+      # don't want unnecessary double-ups
+      next if posts_to_rebake.key?(post.id)
+      posts_to_rebake[post.id] = post
+    end
+
+    # some uploads will be marked as not secure here.
+    # we need to address this with upload_ids_to_mark_as_not_secure
+    # e.g. turning off SiteSetting.login_required
+    if mark_secure_in_loop_because_no_login_required
+      if upload_to_update.secure?
+        upload_ids_to_mark_as_secure << upload_to_update.id
+      else
+        upload_ids_to_mark_as_not_secure << upload_to_update.id
+      end
     end
 
     i += 1
   end
-  RakeHelpers.print_status_with_label("Determination complete!            ", i, uploads_with_supported_media.count)
+  RakeHelpers.print_status_with_label("Analysis complete!            ", i, uploads_to_update.count)
   puts ""
 
-  [upload_ids_to_mark_as_secure, posts_to_rebake]
+  [upload_ids_to_mark_as_secure, upload_ids_to_mark_as_not_secure, posts_to_rebake, uploads_to_adjust_acl_for]
 end
 
 def inline_uploads(post)
diff --git a/lib/upload_security.rb b/lib/upload_security.rb
index d2e11d9eef..2c9d2f2386 100644
--- a/lib/upload_security.rb
+++ b/lib/upload_security.rb
@@ -57,9 +57,6 @@ class UploadSecurity
   # if there is no access control post id and the upload is currently secure, we
   # do not want to make it un-secure to avoid unintentionally exposing it
   def access_control_post_has_secure_media?
-    # if the post is deleted the access_control_post will be blank...
-    # TODO: deal with this in a better way
-    return false if @upload.access_control_post.blank?
     @upload.access_control_post.with_secure_media?
   end
 
diff --git a/spec/jobs/regular/update_private_uploads_acl_spec.rb b/spec/jobs/regular/update_private_uploads_acl_spec.rb
index 25d6fe07d0..9c51ef734f 100644
--- a/spec/jobs/regular/update_private_uploads_acl_spec.rb
+++ b/spec/jobs/regular/update_private_uploads_acl_spec.rb
@@ -24,9 +24,9 @@ describe Jobs::UpdatePrivateUploadsAcl do
       before do
         SiteSetting.login_required = true
         SiteSetting.prevent_anons_from_downloading_files = true
-        SiteSetting::Upload.stubs(:enable_s3_uploads).returns(true)
         Discourse.stubs(:store).returns(stub(external?: false))
-        SiteSetting.stubs(:secure_media?).returns(true)
+        enable_s3_uploads([upload])
+        SiteSetting.secure_media = true
       end
 
       it "changes the upload to secure" do
@@ -35,4 +35,20 @@ describe Jobs::UpdatePrivateUploadsAcl do
       end
     end
   end
+
+  def enable_s3_uploads(uploads)
+    SiteSetting.enable_s3_uploads = true
+    SiteSetting.s3_upload_bucket = "s3-upload-bucket"
+    SiteSetting.s3_access_key_id = "some key"
+    SiteSetting.s3_secret_access_key = "some secrets3_region key"
+
+    stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/")
+
+    uploads.each do |upload|
+      stub_request(
+        :put,
+        "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/original/1X/#{upload.sha1}.#{upload.extension}?acl"
+      )
+    end
+  end
 end
diff --git a/spec/lib/upload_security_spec.rb b/spec/lib/upload_security_spec.rb
index 3dc812bbdc..eabf061678 100644
--- a/spec/lib/upload_security_spec.rb
+++ b/spec/lib/upload_security_spec.rb
@@ -97,11 +97,20 @@ RSpec.describe UploadSecurity do
 
     context "when the access control post has_secure_media?" do
       before do
-        upload.update(access_control_post: post_in_secure_context)
+        upload.update(access_control_post_id: post_in_secure_context.id)
       end
       it "returns true" do
         expect(subject.should_be_secure?).to eq(true)
       end
+
+      context "when the post is deleted" do
+        before do
+          post_in_secure_context.trash!
+        end
+        it "still determines whether the post has secure media; returns true" do
+          expect(subject.should_be_secure?).to eq(true)
+        end
+      end
     end
 
     context "when uploading in the composer" do
diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index e2e278bb91..ad5fe6873e 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -130,6 +130,10 @@ module Helpers
 
   def capture_stdout
     old_stdout = $stdout
+    if ENV['RAILS_ENABLE_TEST_STDOUT']
+      yield
+      return
+    end
     io = StringIO.new
     $stdout = io
     yield
diff --git a/spec/tasks/uploads_spec.rb b/spec/tasks/uploads_spec.rb
index 944c78b5a0..21c769a092 100644
--- a/spec/tasks/uploads_spec.rb
+++ b/spec/tasks/uploads_spec.rb
@@ -6,9 +6,10 @@ RSpec.describe "tasks/uploads" do
   before do
     Rake::Task.clear
     Discourse::Application.load_tasks
+    SiteSetting.authorized_extensions += "|pdf"
   end
 
-  describe "uploads:ensure_correct_acl" do
+  describe "uploads:secure_upload_analyse_and_update" do
     let!(:uploads) do
       [
         multi_post_upload1,
@@ -19,6 +20,7 @@ RSpec.describe "tasks/uploads" do
     let(:multi_post_upload1) { Fabricate(:upload_s3) }
     let(:upload1) { Fabricate(:upload_s3) }
     let(:upload2) { Fabricate(:upload_s3) }
+    let(:upload3) { Fabricate(:upload_s3, original_filename: 'test.pdf') }
 
     let!(:post1) { Fabricate(:post) }
     let!(:post2) { Fabricate(:post) }
@@ -29,11 +31,12 @@ RSpec.describe "tasks/uploads" do
       PostUpload.create(post: post2, upload: multi_post_upload1)
       PostUpload.create(post: post2, upload: upload1)
       PostUpload.create(post: post3, upload: upload2)
+      PostUpload.create(post: post3, upload: upload3)
     end
 
     def invoke_task
       capture_stdout do
-        Rake::Task['uploads:ensure_correct_acl'].invoke
+        Rake::Task['uploads:secure_upload_analyse_and_update'].invoke
       end
     end
 
@@ -59,6 +62,7 @@ RSpec.describe "tasks/uploads" do
           expect(multi_post_upload1.reload.access_control_post).to eq(post1)
           expect(upload1.reload.access_control_post).to eq(post2)
           expect(upload2.reload.access_control_post).to eq(post3)
+          expect(upload3.reload.access_control_post).to eq(post3)
         end
 
         it "sets the upload in the read restricted topic category to secure" do
@@ -66,6 +70,7 @@ RSpec.describe "tasks/uploads" do
           invoke_task
           expect(upload2.reload.secure).to eq(true)
           expect(upload1.reload.secure).to eq(false)
+          expect(upload3.reload.secure).to eq(false)
         end
 
         it "sets the upload in the PM topic to secure" do
@@ -86,10 +91,95 @@ RSpec.describe "tasks/uploads" do
           expect(post2.reload.baked_at).not_to eq(post2_baked)
           expect(post3.reload.baked_at).not_to eq(post3_baked)
         end
+
+        context "for an upload that is already secure and does not need to change" do
+          before do
+            post3.topic.update(archetype: 'private_message', category: nil)
+            upload2.update(access_control_post: post3)
+            upload2.update_secure_status
+          end
+
+          it "does not rebake the associated post" do
+            post3_baked = post3.baked_at.to_s
+            invoke_task
+            expect(post3.reload.baked_at.to_s).to eq(post3_baked)
+          end
+
+          it "does not attempt to update the acl" do
+            Discourse.store.expects(:update_upload_ACL).with(upload2).never
+            invoke_task
+          end
+        end
+
+        context "for an upload that is already secure and is changing to not secure" do
+          it "changes the upload to not secure and updates the ACL" do
+            upload_to_mark_not_secure = Fabricate(:upload_s3, secure: true)
+            post_for_upload = Fabricate(:post)
+            PostUpload.create(post: post_for_upload, upload: upload_to_mark_not_secure)
+            enable_s3_uploads(uploads.concat([upload_to_mark_not_secure]))
+            invoke_task
+            expect(upload_to_mark_not_secure.reload.secure).to eq(false)
+          end
+        end
       end
     end
   end
 
+  describe "uploads:disable_secure_media" do
+    def invoke_task
+      capture_stdout do
+        Rake::Task['uploads:disable_secure_media'].invoke
+      end
+    end
+
+    before do
+      enable_s3_uploads(uploads)
+      SiteSetting.secure_media = true
+      PostUpload.create(post: post1, upload: upload1)
+      PostUpload.create(post: post1, upload: upload2)
+      PostUpload.create(post: post2, upload: upload3)
+      PostUpload.create(post: post2, upload: upload4)
+    end
+
+    let!(:uploads) do
+      [
+        upload1, upload2, upload3, upload4, upload5
+      ]
+    end
+    let(:post1) { Fabricate(:post) }
+    let(:post2) { Fabricate(:post) }
+    let(:upload1) { Fabricate(:upload_s3, secure: true, access_control_post: post1) }
+    let(:upload2) { Fabricate(:upload_s3, secure: true, access_control_post: post1) }
+    let(:upload3) { Fabricate(:upload_s3, secure: true, access_control_post: post2) }
+    let(:upload4) { Fabricate(:upload_s3, secure: true, access_control_post: post2) }
+    let(:upload5) { Fabricate(:upload_s3, secure: false) }
+
+    it "disables the secure media setting" do
+      invoke_task
+      expect(SiteSetting.secure_media).to eq(false)
+    end
+
+    it "updates all secure uploads to secure: false" do
+      invoke_task
+      [upload1, upload2, upload3, upload4].each do |upl|
+        expect(upl.reload.secure).to eq(false)
+      end
+    end
+
+    it "rebakes the associated posts" do
+      baked_post1 = post1.baked_at
+      baked_post2 = post2.baked_at
+      invoke_task
+      expect(post1.reload.baked_at).not_to eq(baked_post1)
+      expect(post2.reload.baked_at).not_to eq(baked_post2)
+    end
+
+    it "updates the affected ACLs" do
+      FileStore::S3Store.any_instance.expects(:update_upload_ACL).times(4)
+      invoke_task
+    end
+  end
+
   def enable_s3_uploads(uploads)
     SiteSetting.enable_s3_uploads = true
     SiteSetting.s3_upload_bucket = "s3-upload-bucket"

From 5035a490b2f6f93d50f36f0c7d9e404b3f170ac5 Mon Sep 17 00:00:00 2001
From: OsamaSayegh <asooomaasoooma90@gmail.com>
Date: Tue, 3 Mar 2020 07:02:01 +0300
Subject: [PATCH 0062/1830] DEV: Bump Logster version to 2.7.1

This version includes a fix to stop `env` mutation that occurred in
Logster default store which caused chained loggers to report different
backtraces for the same message when backtrace is provided via `env`.

https://github.com/discourse/logster/compare/v2.7.0...v2.7.1
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1134290d72..c100806191 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -171,7 +171,7 @@ GEM
     logstash-event (1.2.02)
     logstash-logger (0.26.1)
       logstash-event (~> 1.2)
-    logster (2.7.0)
+    logster (2.7.1)
     loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)

From 0df72a51b89a07fa57856d2774c6f6f17609740b Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 3 Mar 2020 15:44:01 +1100
Subject: [PATCH 0063/1830] FIX: Stop infinite lookup-urls issue for
 video/audio on page (#9096)

Meta report: https://meta.discourse.org/t/excessive-requests-to-uploads-lookup-urls-leading-to-429-response/143119

* The data-orig-src attribute was not being removed from cooked
video and audio so the composer was infinitely trying to get the
URLs for them, which would never resolve to anything
* Also the code that retrieved the short URL was unscoped, and was
getting everything on the page. if running from the composer we
now scope to the preview window
* Also fixed a minor issue where the element href for the video
and audio tags was not being set when the short URL was found
---
 .../components/composer-editor.js.es6         |  2 +-
 .../engines/discourse-markdown-it.js.es6      |  6 ++-
 .../pretty-text/upload-short-url.js.es6       | 29 ++++++++---
 test/javascripts/lib/pretty-text-test.js.es6  | 50 +++++++++++++++++++
 .../lib/upload-short-url-test.js.es6          | 28 ++++++++++-
 5 files changed, 103 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 24c71dd8fb..5a47546093 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -1014,7 +1014,7 @@ export default Component.extend({
       );
 
       // Short upload urls need resolution
-      resolveAllShortUrls(ajax);
+      resolveAllShortUrls(ajax, ".d-editor-preview-wrapper");
 
       if (this._enableAdvancedEditorPreviewSync()) {
         this._syncScroll(
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6
index 6e6392d774..213aef39d9 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6
@@ -145,9 +145,10 @@ function videoHTML(token, opts) {
   const src = token.attrGet("src");
   const origSrc = token.attrGet("data-orig-src");
   const preloadType = opts.secureMedia ? "none" : "metadata";
+  const dataOrigSrcAttr = origSrc !== null ? `data-orig-src="${origSrc}"` : "";
   return `<div class="video-container">
     <video width="100%" height="100%" preload="${preloadType}" controls>
-      <source src="${src}" data-orig-src="${origSrc}">
+      <source src="${src}" ${dataOrigSrcAttr}>
       <a href="${src}">${src}</a>
     </video>
   </div>`;
@@ -157,8 +158,9 @@ function audioHTML(token, opts) {
   const src = token.attrGet("src");
   const origSrc = token.attrGet("data-orig-src");
   const preloadType = opts.secureMedia ? "none" : "metadata";
+  const dataOrigSrcAttr = origSrc !== null ? `data-orig-src="${origSrc}"` : "";
   return `<audio preload="${preloadType}" controls>
-    <source src="${src}" data-orig-src="${origSrc}">
+    <source src="${src}" ${dataOrigSrcAttr}>
     <a href="${src}">${src}</a>
   </audio>`;
 }
diff --git a/app/assets/javascripts/pretty-text/upload-short-url.js.es6 b/app/assets/javascripts/pretty-text/upload-short-url.js.es6
index b82e524173..294bae54de 100644
--- a/app/assets/javascripts/pretty-text/upload-short-url.js.es6
+++ b/app/assets/javascripts/pretty-text/upload-short-url.js.es6
@@ -9,6 +9,11 @@ export function lookupCachedUploadUrl(shortUrl) {
 const MISSING = "missing";
 
 export function lookupUncachedUploadUrls(urls, ajax) {
+  urls = _.compact(urls);
+  if (urls.length === 0) {
+    return;
+  }
+
   return ajax("/uploads/lookup-urls", {
     method: "POST",
     data: { short_urls: urls }
@@ -77,7 +82,7 @@ function _loadCachedShortUrls($uploads) {
         });
 
         break;
-      case "SOURCE": // video tag > source tag
+      case "SOURCE": // video/audio tag > source tag
         retrieveCachedUrl($upload, "orig-src", url => {
           $upload.attr("src", url);
 
@@ -85,11 +90,19 @@ function _loadCachedShortUrls($uploads) {
             let hostRegex = new RegExp("//" + window.location.host, "g");
             url = url.replace(hostRegex, "");
           }
-          $upload.attr("src", window.location.origin + url);
+          let fullUrl = window.location.origin + url;
+          $upload.attr("src", fullUrl);
 
           // this is necessary, otherwise because of the src change the
-          // video just doesn't bother loading!
-          $upload.parent()[0].load();
+          // video/audio just doesn't bother loading!
+          let $parent = $upload.parent();
+          $parent[0].load();
+
+          // set the url and text for the <a> tag within the <video/audio> tag
+          $parent
+            .find("a")
+            .attr("href", fullUrl)
+            .text(fullUrl);
         });
 
         break;
@@ -98,7 +111,7 @@ function _loadCachedShortUrls($uploads) {
 }
 
 function _loadShortUrls($uploads, ajax) {
-  const urls = $uploads.toArray().map(upload => {
+  let urls = $uploads.toArray().map(upload => {
     const $upload = $(upload);
     return $upload.data("orig-src") || $upload.data("orig-href");
   });
@@ -108,15 +121,15 @@ function _loadShortUrls($uploads, ajax) {
   );
 }
 
-export function resolveAllShortUrls(ajax) {
+export function resolveAllShortUrls(ajax, scope = null) {
   const attributes =
     "img[data-orig-src], a[data-orig-href], source[data-orig-src]";
-  let $shortUploadUrls = $(attributes);
+  let $shortUploadUrls = $(scope || document).find(attributes);
 
   if ($shortUploadUrls.length > 0) {
     _loadCachedShortUrls($shortUploadUrls);
 
-    $shortUploadUrls = $(attributes);
+    $shortUploadUrls = $(scope || document).find(attributes);
     if ($shortUploadUrls.length > 0) {
       // this is carefully batched so we can do a leading debounce (trigger right away)
       return debounce(
diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js.es6
index bab2d71d3a..23708ddacb 100644
--- a/test/javascripts/lib/pretty-text-test.js.es6
+++ b/test/javascripts/lib/pretty-text-test.js.es6
@@ -1012,6 +1012,32 @@ QUnit.test("video", assert => {
   );
 });
 
+QUnit.test("video - mapped url - secure media enabled", assert => {
+  function lookupUploadUrls() {
+    let cache = {};
+    cache["upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp4"] = {
+      short_url: "upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp4",
+      url: "/secure-media-uploads/original/3X/c/b/test.mp4",
+      short_path: "/uploads/short-url/blah"
+    };
+    return cache;
+  }
+  assert.cookedOptions(
+    "![baby shark|video](upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp4)",
+    {
+      siteSettings: { secure_media: true },
+      lookupUploadUrls: lookupUploadUrls
+    },
+    `<p><div class="video-container">
+    <video width="100%" height="100%" preload="none" controls>
+      <source src="/secure-media-uploads/original/3X/c/b/test.mp4">
+      <a href="/secure-media-uploads/original/3X/c/b/test.mp4">/secure-media-uploads/original/3X/c/b/test.mp4</a>
+    </video>
+  </div></p>`,
+    "It returns the correct video HTML when the URL is mapped with secure media, removing data-orig-src"
+  );
+});
+
 QUnit.test("audio", assert => {
   assert.cooked(
     "![young americans|audio](upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp3)",
@@ -1023,6 +1049,30 @@ QUnit.test("audio", assert => {
   );
 });
 
+QUnit.test("audio - mapped url - secure media enabled", assert => {
+  function lookupUploadUrls() {
+    let cache = {};
+    cache["upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp3"] = {
+      short_url: "upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp3",
+      url: "/secure-media-uploads/original/3X/c/b/test.mp3",
+      short_path: "/uploads/short-url/blah"
+    };
+    return cache;
+  }
+  assert.cookedOptions(
+    "![baby shark|audio](upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp3)",
+    {
+      siteSettings: { secure_media: true },
+      lookupUploadUrls: lookupUploadUrls
+    },
+    `<p><audio preload="none" controls>
+    <source src="/secure-media-uploads/original/3X/c/b/test.mp3">
+    <a href="/secure-media-uploads/original/3X/c/b/test.mp3">/secure-media-uploads/original/3X/c/b/test.mp3</a>
+  </audio></p>`,
+    "It returns the correct audio HTML when the URL is mapped with secure media, removing data-orig-src"
+  );
+});
+
 QUnit.test("censoring", assert => {
   assert.cookedOptions(
     "Pleased to meet you, but pleeeease call me later, xyz123",
diff --git a/test/javascripts/lib/upload-short-url-test.js.es6 b/test/javascripts/lib/upload-short-url-test.js.es6
index 39a5e7b000..f0521a174b 100644
--- a/test/javascripts/lib/upload-short-url-test.js.es6
+++ b/test/javascripts/lib/upload-short-url-test.js.es6
@@ -23,6 +23,11 @@ QUnit.module("lib:pretty-text/upload-short-url", {
         short_url: "upload://b.jpeg",
         url: "/uploads/default/original/3X/c/b/2.jpeg",
         short_path: "/uploads/short-url/b.jpeg"
+      },
+      {
+        short_url: "upload://z.jpeg",
+        url: "/uploads/default/original/3X/c/b/9.jpeg",
+        short_path: "/uploads/short-url/z.jpeg"
       }
     ];
 
@@ -53,7 +58,8 @@ QUnit.module("lib:pretty-text/upload-short-url", {
 
     fixture().html(
       imageSrcs.map(src => `<img data-orig-src="${src.url}">`).join("") +
-        attachmentSrcs.map(src => `<a data-orig-href="${src.url}">`).join("")
+        attachmentSrcs.map(src => `<a data-orig-href="${src.url}">`).join("") +
+        `<div class="scoped-area"><img data-orig-src="${imageSrcs[2].url}"></div>`
     );
   },
 
@@ -105,3 +111,23 @@ QUnit.test("resolveAllShortUrls", async assert => {
     short_path: "/uploads/short-url/e.mp3"
   });
 });
+
+QUnit.test("resolveAllShortUrls - scoped", async assert => {
+  let lookup;
+  await resolveAllShortUrls(ajax, ".scoped-area");
+
+  lookup = lookupCachedUploadUrl("upload://z.jpeg");
+
+  assert.deepEqual(lookup, {
+    url: "/uploads/default/original/3X/c/b/9.jpeg",
+    short_path: "/uploads/short-url/z.jpeg"
+  });
+
+  // do this because the pretender caches ALL the urls, not
+  // just the ones being looked up (like the normal behaviour)
+  resetCache();
+  await resolveAllShortUrls(ajax, ".scoped-area");
+
+  lookup = lookupCachedUploadUrl("upload://a.jpeg");
+  assert.deepEqual(lookup, {});
+});

From d23f7af3cbe8d9bc7c07db01ff7fb72275943174 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 3 Mar 2020 13:56:54 +0000
Subject: [PATCH 0064/1830] PERF: Allow user serializer to make use of
 preloaded custom fields (#9074)

---
 app/models/concerns/has_custom_fields.rb |  4 ++++
 app/serializers/user_card_serializer.rb  | 19 +++++++++++++------
 app/serializers/user_serializer.rb       | 12 ++++++++++++
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/app/models/concerns/has_custom_fields.rb b/app/models/concerns/has_custom_fields.rb
index 923efe846d..64cafe6f7a 100644
--- a/app/models/concerns/has_custom_fields.rb
+++ b/app/models/concerns/has_custom_fields.rb
@@ -142,6 +142,10 @@ module HasCustomFields
     super
   end
 
+  def custom_fields_preloaded?
+    !!@preloaded_custom_fields
+  end
+
   def custom_field_preloaded?(name)
     @preloaded_custom_fields && @preloaded_custom_fields.key?(name)
   end
diff --git a/app/serializers/user_card_serializer.rb b/app/serializers/user_card_serializer.rb
index 5d53a6258c..6b7f59cd40 100644
--- a/app/serializers/user_card_serializer.rb
+++ b/app/serializers/user_card_serializer.rb
@@ -149,14 +149,14 @@ class UserCardSerializer < BasicUserSerializer
   end
 
   def custom_fields
-    fields = User.whitelisted_user_custom_fields(scope)
-
-    if scope.can_edit?(object)
-      fields += DiscoursePluginRegistry.serialized_current_user_fields.to_a
-    end
+    fields = custom_field_keys
 
     if fields.present?
-      User.custom_fields_for_ids([object.id], fields)[object.id] || {}
+      if object.custom_fields_preloaded?
+        {}.tap { |h| fields.each { |f| h[f] = object.custom_fields[f] } }
+      else
+        User.custom_fields_for_ids([object.id], fields)[object.id] || {}
+      end
     else
       {}
     end
@@ -197,4 +197,11 @@ class UserCardSerializer < BasicUserSerializer
   def card_background_upload_url
     object.card_background_upload&.url
   end
+
+  private
+
+  def custom_field_keys
+    # Can be extended by other serializers
+    User.whitelisted_user_custom_fields(scope)
+  end
 end
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index d92f0e4224..866dc39a8d 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -270,4 +270,16 @@ class UserSerializer < UserCardSerializer
     object.profile_background_upload&.url
   end
 
+  private
+
+  def custom_field_keys
+    fields = super
+
+    if scope.can_edit?(object)
+      fields += DiscoursePluginRegistry.serialized_current_user_fields.to_a
+    end
+
+    fields
+  end
+
 end

From 65cc61be7a3be78a682cfe9f72f99f4ed7374264 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 3 Mar 2020 13:57:46 +0000
Subject: [PATCH 0065/1830] PERF: Allow preloading 'recent time read' for a
 user (#9076)

This will be used when serializing multiple user cards
---
 app/models/user.rb       | 18 +++++++++++++++---
 spec/models/user_spec.rb | 28 ++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index e8cc35f891..fd81a979d0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1211,10 +1211,22 @@ class User < ActiveRecord::Base
     self.user_emails.secondary.pluck(:email)
   end
 
+  RECENT_TIME_READ_THRESHOLD ||= 60.days
+
+  def self.preload_recent_time_read(users)
+    times = UserVisit.where(user_id: users.map(&:id))
+      .where('visited_at >= ?', RECENT_TIME_READ_THRESHOLD.ago)
+      .group(:user_id)
+      .sum(:time_read)
+    users.each { |u| u.preload_recent_time_read(times[u.id] || 0) }
+  end
+
+  def preload_recent_time_read(time)
+    @recent_time_read = time
+  end
+
   def recent_time_read
-    self.created_at && self.created_at < 60.days.ago ?
-      self.user_visits.where('visited_at >= ?', 60.days.ago).sum(:time_read) :
-      self.user_stat&.time_read
+    @recent_time_read ||= self.user_visits.where('visited_at >= ?', RECENT_TIME_READ_THRESHOLD.ago).sum(:time_read)
   end
 
   def from_staged?
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index ee1bea598a..d23451fcfa 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2287,4 +2287,32 @@ describe User do
       expect(user.approved).to eq(true)
     end
   end
+
+  describe "#recent_time_read" do
+    fab!(:user) { Fabricate(:user) }
+    fab!(:user2) { Fabricate(:user) }
+
+    before_all do
+      UserVisit.create(user_id: user.id, visited_at: 1.minute.ago, posts_read: 1, mobile: false, time_read: 10)
+      UserVisit.create(user_id: user.id, visited_at: 2.days.ago, posts_read: 1, mobile: false, time_read: 20)
+      UserVisit.create(user_id: user.id, visited_at: 1.week.ago, posts_read: 1, mobile: false, time_read: 30)
+      UserVisit.create(user_id: user.id, visited_at: 1.year.ago, posts_read: 1, mobile: false, time_read: 40) # Old, should be ignored
+      UserVisit.create(user_id: user2.id, visited_at: 1.minute.ago, posts_read: 1, mobile: false, time_read: 50)
+    end
+
+    it "calculates correctly" do
+      expect(user.recent_time_read).to eq(60)
+      expect(user2.recent_time_read).to eq(50)
+    end
+
+    it "preloads correctly" do
+      User.preload_recent_time_read([user, user2])
+
+      expect(user.instance_variable_get(:@recent_time_read)).to eq(60)
+      expect(user2.instance_variable_get(:@recent_time_read)).to eq(50)
+
+      expect(user.recent_time_read).to eq(60)
+      expect(user2.recent_time_read).to eq(50)
+    end
+  end
 end

From f971ecd2316cfb62d164068deaa7b51587fa2cd7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 3 Mar 2020 10:19:34 -0500
Subject: [PATCH 0066/1830] Build(deps): Bump nokogiri from 1.10.8 to 1.10.9
 (#9093)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.8 to 1.10.9.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.10.9/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.8...v1.10.9)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index c100806191..ef5d694e5d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -204,7 +204,7 @@ GEM
     multipart-post (2.1.1)
     mustache (1.1.1)
     nio4r (2.5.2)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)

From 3e54e0191e05deee9e6b20caf224463e3e86f7a5 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 4 Mar 2020 10:11:08 +1100
Subject: [PATCH 0067/1830] FIX: Use full URL for secure attachments when
 secure media enabled (#9037)

When secure media is enabled and an attachment is marked as secure we want to use the full url instead of the short-url so we get the same access control post protections as secure media uploads.
---
 .../components/composer-editor.js.es6         |  2 +-
 .../discourse/components/cook-text.js.es6     |  2 +-
 .../discourse-markdown/upload-protocol.js.es6 | 11 ++-
 .../pretty-text/upload-short-url.js.es6       | 45 ++++++---
 lib/pretty_text/helpers.rb                    |  2 +-
 spec/requests/uploads_controller_spec.rb      |  4 +-
 .../composer-attachment-test.js.es6           | 60 +++++++++---
 test/javascripts/helpers/site-settings.js     |  3 +-
 test/javascripts/lib/pretty-text-test.js.es6  | 52 ++++++++++
 .../lib/upload-short-url-test.js.es6          | 97 +++++++++++++++----
 10 files changed, 223 insertions(+), 55 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 5a47546093..52f44e78f5 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -1014,7 +1014,7 @@ export default Component.extend({
       );
 
       // Short upload urls need resolution
-      resolveAllShortUrls(ajax, ".d-editor-preview-wrapper");
+      resolveAllShortUrls(ajax, this.siteSettings, ".d-editor-preview-wrapper");
 
       if (this._enableAdvancedEditorPreviewSync()) {
         this._syncScroll(
diff --git a/app/assets/javascripts/discourse/components/cook-text.js.es6 b/app/assets/javascripts/discourse/components/cook-text.js.es6
index 256636a3c5..f3ad48f549 100644
--- a/app/assets/javascripts/discourse/components/cook-text.js.es6
+++ b/app/assets/javascripts/discourse/components/cook-text.js.es6
@@ -16,7 +16,7 @@ const CookText = Component.extend({
       next(() =>
         window
           .requireModule("pretty-text/upload-short-url")
-          .resolveAllShortUrls(ajax)
+          .resolveAllShortUrls(ajax, this.siteSettings)
       );
     });
   }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js.es6
index 3e075b13ac..174e603212 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js.es6
@@ -60,7 +60,16 @@ function rule(state) {
           break;
         case "a":
           if (mapped) {
-            token.attrs[srcIndex][1] = mapped.short_path;
+            // when secure media is enabled we want the full /secure-media-uploads/
+            // url to take advantage of access control security
+            if (
+              state.md.options.discourse.limitedSiteSettings.secureMedia &&
+              mapped.url.indexOf("secure-media-uploads") > -1
+            ) {
+              token.attrs[srcIndex][1] = mapped.url;
+            } else {
+              token.attrs[srcIndex][1] = mapped.short_path;
+            }
           } else {
             token.attrs[srcIndex][1] = state.md.options.discourse.getURL(
               "/404"
diff --git a/app/assets/javascripts/pretty-text/upload-short-url.js.es6 b/app/assets/javascripts/pretty-text/upload-short-url.js.es6
index 294bae54de..401d73dff0 100644
--- a/app/assets/javascripts/pretty-text/upload-short-url.js.es6
+++ b/app/assets/javascripts/pretty-text/upload-short-url.js.es6
@@ -44,10 +44,9 @@ export function resetCache() {
   _cache = {};
 }
 
-function retrieveCachedUrl($upload, dataAttribute, callback) {
+function retrieveCachedUrl($upload, siteSettings, dataAttribute, callback) {
   const cachedUpload = lookupCachedUploadUrl($upload.data(dataAttribute));
-  const url =
-    dataAttribute === "orig-href" ? cachedUpload.short_path : cachedUpload.url;
+  const url = getAttributeBasedUrl(dataAttribute, cachedUpload, siteSettings);
 
   if (url) {
     $upload.removeAttr(`data-${dataAttribute}`);
@@ -57,12 +56,34 @@ function retrieveCachedUrl($upload, dataAttribute, callback) {
   }
 }
 
-function _loadCachedShortUrls($uploads) {
+function getAttributeBasedUrl(dataAttribute, cachedUpload, siteSettings) {
+  if (!cachedUpload.url) {
+    return;
+  }
+
+  // non-attachments always use the full URL
+  if (dataAttribute !== "orig-href") {
+    return cachedUpload.url;
+  }
+
+  // attachments should use the full /secure-media-uploads/ URL
+  // in this case for permission checks
+  if (
+    siteSettings.secure_media &&
+    cachedUpload.url.indexOf("secure-media-uploads") > -1
+  ) {
+    return cachedUpload.url;
+  }
+
+  return cachedUpload.short_path;
+}
+
+function _loadCachedShortUrls($uploads, siteSettings) {
   $uploads.each((_idx, upload) => {
     const $upload = $(upload);
     switch (upload.tagName) {
       case "A":
-        retrieveCachedUrl($upload, "orig-href", url => {
+        retrieveCachedUrl($upload, siteSettings, "orig-href", url => {
           $upload.attr("href", url);
 
           // Replace "|attachment" with class='attachment'
@@ -77,13 +98,13 @@ function _loadCachedShortUrls($uploads) {
 
         break;
       case "IMG":
-        retrieveCachedUrl($upload, "orig-src", url => {
+        retrieveCachedUrl($upload, siteSettings, "orig-src", url => {
           $upload.attr("src", url);
         });
 
         break;
       case "SOURCE": // video/audio tag > source tag
-        retrieveCachedUrl($upload, "orig-src", url => {
+        retrieveCachedUrl($upload, siteSettings, "orig-src", url => {
           $upload.attr("src", url);
 
           if (url.startsWith(`//${window.location.host}`)) {
@@ -110,31 +131,31 @@ function _loadCachedShortUrls($uploads) {
   });
 }
 
-function _loadShortUrls($uploads, ajax) {
+function _loadShortUrls($uploads, ajax, siteSettings) {
   let urls = $uploads.toArray().map(upload => {
     const $upload = $(upload);
     return $upload.data("orig-src") || $upload.data("orig-href");
   });
 
   return lookupUncachedUploadUrls(urls, ajax).then(() =>
-    _loadCachedShortUrls($uploads)
+    _loadCachedShortUrls($uploads, siteSettings)
   );
 }
 
-export function resolveAllShortUrls(ajax, scope = null) {
+export function resolveAllShortUrls(ajax, siteSettings, scope = null) {
   const attributes =
     "img[data-orig-src], a[data-orig-href], source[data-orig-src]";
   let $shortUploadUrls = $(scope || document).find(attributes);
 
   if ($shortUploadUrls.length > 0) {
-    _loadCachedShortUrls($shortUploadUrls);
+    _loadCachedShortUrls($shortUploadUrls, siteSettings);
 
     $shortUploadUrls = $(scope || document).find(attributes);
     if ($shortUploadUrls.length > 0) {
       // this is carefully batched so we can do a leading debounce (trigger right away)
       return debounce(
         null,
-        () => _loadShortUrls($shortUploadUrls, ajax),
+        () => _loadShortUrls($shortUploadUrls, ajax, siteSettings),
         450,
         true
       );
diff --git a/lib/pretty_text/helpers.rb b/lib/pretty_text/helpers.rb
index 0de6000fea..d207e01eed 100644
--- a/lib/pretty_text/helpers.rb
+++ b/lib/pretty_text/helpers.rb
@@ -68,7 +68,7 @@ module PrettyText
           sha1, url, extension, original_filename, secure = row
 
           if short_urls = reverse_map[sha1]
-            secure_media = FileHelper.is_supported_media?(original_filename) && SiteSetting.secure_media? && secure
+            secure_media = SiteSetting.secure_media? && secure
 
             short_urls.each do |short_url|
               result[short_url] = {
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index e27a4d4671..2f3333cacd 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -578,7 +578,7 @@ describe UploadsController do
         expect(result[0]["short_path"]).to eq(upload.short_path)
       end
 
-      it 'does not return secure urls for non-media uploads' do
+      it 'returns secure urls for non-media uploads' do
         upload.update!(original_filename: "not-an-image.pdf", extension: "pdf")
         sign_in(user)
 
@@ -586,7 +586,7 @@ describe UploadsController do
         expect(response.status).to eq(200)
 
         result = JSON.parse(response.body)
-        expect(result[0]["url"]).not_to match("/secure-media-uploads")
+        expect(result[0]["url"]).to match("/secure-media-uploads")
         expect(result[0]["short_path"]).to eq(upload.short_path)
       end
     end
diff --git a/test/javascripts/acceptance/composer-attachment-test.js.es6 b/test/javascripts/acceptance/composer-attachment-test.js.es6
index edf6bc4374..0333936f4b 100644
--- a/test/javascripts/acceptance/composer-attachment-test.js.es6
+++ b/test/javascripts/acceptance/composer-attachment-test.js.es6
@@ -1,21 +1,18 @@
 import { acceptance } from "helpers/qunit-helpers";
 
-acceptance("Composer Attachment", {
-  loggedIn: true,
-  pretend(server, helper) {
-    server.post("/uploads/lookup-urls", () => {
-      return helper.response([
-        {
-          short_url: "upload://asdsad.png",
-          url: "/uploads/default/3X/1/asjdiasjdiasida.png",
-          short_path: "/uploads/short-url/asdsad.png"
-        }
-      ]);
-    });
-  }
-});
+function setupPretender(server, helper) {
+  server.post("/uploads/lookup-urls", () => {
+    return helper.response([
+      {
+        short_url: "upload://asdsad.png",
+        url: "/secure-media-uploads/default/3X/1/asjdiasjdiasida.png",
+        short_path: "/uploads/short-url/asdsad.png"
+      }
+    ]);
+  });
+}
 
-QUnit.test("attachments are cooked properly", async assert => {
+async function writeInComposer(assert) {
   await visit("/t/internationalization-localization/280");
   await click("#topic-footer-buttons .btn.create");
 
@@ -29,7 +26,17 @@ QUnit.test("attachments are cooked properly", async assert => {
   );
 
   await fillIn(".d-editor-input", "[test|attachment](upload://asdsad.png)");
+}
 
+acceptance("Composer Attachment", {
+  loggedIn: true,
+  pretend(server, helper) {
+    setupPretender(server, helper);
+  }
+});
+
+QUnit.test("attachments are cooked properly", async assert => {
+  await writeInComposer(assert);
   assert.equal(
     find(".d-editor-preview:visible")
       .html()
@@ -37,3 +44,26 @@ QUnit.test("attachments are cooked properly", async assert => {
     '<p><a class="attachment" href="/uploads/short-url/asdsad.png">test</a></p>'
   );
 });
+
+acceptance("Composer Attachment - Secure Media Enabled", {
+  loggedIn: true,
+  settings: {
+    secure_media: true
+  },
+  pretend(server, helper) {
+    setupPretender(server, helper);
+  }
+});
+
+QUnit.test(
+  "attachments are cooked properly when secure media is enabled",
+  async assert => {
+    await writeInComposer(assert);
+    assert.equal(
+      find(".d-editor-preview:visible")
+        .html()
+        .trim(),
+      '<p><a class="attachment" href="/secure-media-uploads/default/3X/1/asjdiasjdiasida.png">test</a></p>'
+    );
+  }
+);
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index 96807b7a7c..621aa3d6ac 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -99,7 +99,8 @@ Discourse.SiteSettingsOriginal = {
   desktop_category_page_style: "categories_and_latest_topics",
   enable_mentions: true,
   enable_personal_messages: true,
-  unicode_usernames: false
+  unicode_usernames: false,
+  secure_media: false
 };
 Discourse.SiteSettings = jQuery.extend(
   true,
diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js.es6
index 23708ddacb..7c75034529 100644
--- a/test/javascripts/lib/pretty-text-test.js.es6
+++ b/test/javascripts/lib/pretty-text-test.js.es6
@@ -973,6 +973,58 @@ QUnit.test("images", assert => {
   );
 });
 
+QUnit.test("attachment", assert => {
+  assert.cooked(
+    "[test.pdf|attachment](upload://o8iobpLcW3WSFvVH7YQmyGlKmGM.pdf)",
+    `<p><a class="attachment" href="/404" data-orig-href="upload://o8iobpLcW3WSFvVH7YQmyGlKmGM.pdf">test.pdf</a></p>`,
+    "It returns the correct attachment link HTML"
+  );
+});
+
+QUnit.test("attachment - mapped url - secure media disabled", assert => {
+  function lookupUploadUrls() {
+    let cache = {};
+    cache["upload://o8iobpLcW3WSFvVH7YQmyGlKmGM.pdf"] = {
+      short_url: "upload://o8iobpLcW3WSFvVH7YQmyGlKmGM.pdf",
+      url:
+        "/secure-media-uploads/original/3X/c/b/o8iobpLcW3WSFvVH7YQmyGlKmGM.pdf",
+      short_path: "/uploads/short-url/blah"
+    };
+    return cache;
+  }
+  assert.cookedOptions(
+    "[test.pdf|attachment](upload://o8iobpLcW3WSFvVH7YQmyGlKmGM.pdf)",
+    {
+      siteSettings: { secure_media: false },
+      lookupUploadUrls: lookupUploadUrls
+    },
+    `<p><a class="attachment" href="/uploads/short-url/blah">test.pdf</a></p>`,
+    "It returns the correct attachment link HTML when the URL is mapped without secure media"
+  );
+});
+
+QUnit.test("attachment - mapped url - secure media enabled", assert => {
+  function lookupUploadUrls() {
+    let cache = {};
+    cache["upload://o8iobpLcW3WSFvVH7YQmyGlKmGM.pdf"] = {
+      short_url: "upload://o8iobpLcW3WSFvVH7YQmyGlKmGM.pdf",
+      url:
+        "/secure-media-uploads/original/3X/c/b/o8iobpLcW3WSFvVH7YQmyGlKmGM.pdf",
+      short_path: "/uploads/short-url/blah"
+    };
+    return cache;
+  }
+  assert.cookedOptions(
+    "[test.pdf|attachment](upload://o8iobpLcW3WSFvVH7YQmyGlKmGM.pdf)",
+    {
+      siteSettings: { secure_media: true },
+      lookupUploadUrls: lookupUploadUrls
+    },
+    `<p><a class="attachment" href="/secure-media-uploads/original/3X/c/b/o8iobpLcW3WSFvVH7YQmyGlKmGM.pdf">test.pdf</a></p>`,
+    "It returns the correct attachment link HTML when the URL is mapped with secure media"
+  );
+});
+
 QUnit.test("video - secure media enabled", assert => {
   assert.cookedOptions(
     "![baby shark|video](upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp4)",
diff --git a/test/javascripts/lib/upload-short-url-test.js.es6 b/test/javascripts/lib/upload-short-url-test.js.es6
index f0521a174b..849b2d7602 100644
--- a/test/javascripts/lib/upload-short-url-test.js.es6
+++ b/test/javascripts/lib/upload-short-url-test.js.es6
@@ -7,13 +7,12 @@ import { ajax } from "discourse/lib/ajax";
 import { fixture } from "helpers/qunit-helpers";
 import pretender from "helpers/create-pretender";
 
-QUnit.module("lib:pretty-text/upload-short-url", {
-  beforeEach() {
-    const response = object => {
-      return [200, { "Content-Type": "application/json" }, object];
-    };
-
-    const imageSrcs = [
+function stubUrls(imageSrcs, attachmentSrcs, otherMediaSrcs) {
+  const response = object => {
+    return [200, { "Content-Type": "application/json" }, object];
+  };
+  if (!imageSrcs) {
+    imageSrcs = [
       {
         short_url: "upload://a.jpeg",
         url: "/uploads/default/original/3X/c/b/1.jpeg",
@@ -30,16 +29,20 @@ QUnit.module("lib:pretty-text/upload-short-url", {
         short_path: "/uploads/short-url/z.jpeg"
       }
     ];
+  }
 
-    const attachmentSrcs = [
+  if (!attachmentSrcs) {
+    attachmentSrcs = [
       {
         short_url: "upload://c.pdf",
         url: "/uploads/default/original/3X/c/b/3.pdf",
         short_path: "/uploads/short-url/c.pdf"
       }
     ];
+  }
 
-    const otherMediaSrcs = [
+  if (!otherMediaSrcs) {
+    otherMediaSrcs = [
       {
         short_url: "upload://d.mp4",
         url: "/uploads/default/original/3X/c/b/4.mp4",
@@ -51,30 +54,37 @@ QUnit.module("lib:pretty-text/upload-short-url", {
         short_path: "/uploads/short-url/e.mp3"
       }
     ];
+  }
+  // prettier-ignore
+  pretender.post("/uploads/lookup-urls", () => { //eslint-disable-line
+    return response(imageSrcs.concat(attachmentSrcs.concat(otherMediaSrcs)));
+  });
 
-    pretender.post("/uploads/lookup-urls", () => {
-      return response(imageSrcs.concat(attachmentSrcs.concat(otherMediaSrcs)));
-    });
-
-    fixture().html(
-      imageSrcs.map(src => `<img data-orig-src="${src.url}">`).join("") +
-        attachmentSrcs.map(src => `<a data-orig-href="${src.url}">`).join("") +
-        `<div class="scoped-area"><img data-orig-src="${imageSrcs[2].url}"></div>`
-    );
-  },
-
+  fixture().html(
+    imageSrcs.map(src => `<img data-orig-src="${src.short_url}"/>`).join("") +
+      attachmentSrcs
+        .map(
+          src =>
+            `<a data-orig-href="${src.short_url}">big enterprise contract.pdf</a>`
+        )
+        .join("") +
+      `<div class="scoped-area"><img data-orig-src="${imageSrcs[2].url}"></div>`
+  );
+}
+QUnit.module("lib:pretty-text/upload-short-url", {
   afterEach() {
     resetCache();
   }
 });
 
 QUnit.test("resolveAllShortUrls", async assert => {
+  stubUrls();
   let lookup;
 
   lookup = lookupCachedUploadUrl("upload://a.jpeg");
   assert.deepEqual(lookup, {});
 
-  await resolveAllShortUrls(ajax);
+  await resolveAllShortUrls(ajax, { secure_media: false });
 
   lookup = lookupCachedUploadUrl("upload://a.jpeg");
 
@@ -112,7 +122,52 @@ QUnit.test("resolveAllShortUrls", async assert => {
   });
 });
 
+QUnit.test(
+  "resolveAllShortUrls - href + src replaced correctly",
+  async assert => {
+    stubUrls();
+    await resolveAllShortUrls(ajax, { secure_media: false });
+
+    let image1 = fixture()
+      .find("img")
+      .eq(0);
+    let image2 = fixture()
+      .find("img")
+      .eq(1);
+    let link = fixture().find("a");
+
+    assert.equal(image1.attr("src"), "/uploads/default/original/3X/c/b/1.jpeg");
+    assert.equal(image2.attr("src"), "/uploads/default/original/3X/c/b/2.jpeg");
+    assert.equal(link.attr("href"), "/uploads/short-url/c.pdf");
+  }
+);
+
+QUnit.test(
+  "resolveAllShortUrls - when secure media is enabled use the attachment full URL",
+  async assert => {
+    stubUrls(
+      null,
+      [
+        {
+          short_url: "upload://c.pdf",
+          url: "/secure-media-uploads/default/original/3X/c/b/3.pdf",
+          short_path: "/uploads/short-url/c.pdf"
+        }
+      ],
+      null
+    );
+    await resolveAllShortUrls(ajax, { secure_media: true });
+
+    let link = fixture().find("a");
+    assert.equal(
+      link.attr("href"),
+      "/secure-media-uploads/default/original/3X/c/b/3.pdf"
+    );
+  }
+);
+
 QUnit.test("resolveAllShortUrls - scoped", async assert => {
+  stubUrls();
   let lookup;
   await resolveAllShortUrls(ajax, ".scoped-area");
 

From 97545ee4a0ef1bb0b98907494d7d80867f5b854d Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Tue, 3 Mar 2020 14:56:37 -1000
Subject: [PATCH 0068/1830] REFACTOR: separate post_can_act logic in post
 action creator (#9103)

Package logic of the post can act a little bit better so that overriding
methods can easily reuse the logic.
---
 lib/post_action_creator.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/post_action_creator.rb b/lib/post_action_creator.rb
index 342ed5fd98..ab38576c8f 100644
--- a/lib/post_action_creator.rb
+++ b/lib/post_action_creator.rb
@@ -48,10 +48,8 @@ class PostActionCreator
     @meta_post = nil
   end
 
-  def perform
-    result = CreateResult.new
-
-    unless guardian.post_can_act?(
+  def post_can_act?
+    guardian.post_can_act?(
       @post,
       @post_action_name,
       opts: {
@@ -59,6 +57,12 @@ class PostActionCreator
         taken_actions: PostAction.counts_for([@post].compact, @created_by)[@post&.id]
       }
     )
+  end
+
+  def perform
+    result = CreateResult.new
+
+    unless post_can_act?
       result.forbidden = true
       result.add_error(I18n.t("invalid_access"))
       return result

From c457d3bf2851d70c87ce27aa316333b19f5bbed4 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 4 Mar 2020 16:48:06 +1100
Subject: [PATCH 0069/1830] FIX: under concurrent usage booting rails could
 cause plugin corruption

Previously on boot we were always removing and adding the same pre-generated
files and symlinks.

This change attempts to avoid writing any automatically generated content if
it is exactly what it should be on disk.

This corrects issues where running a rails console can temporarily corrupt
internal state in production.
---
 lib/plugin/instance.rb | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index b810a9dd78..837de08957 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -543,9 +543,17 @@ class Plugin::Instance
 
       Discourse::Utils.execute_command('mkdir', '-p', target)
       target << name.gsub(/\s/, "_")
-      # TODO a cleaner way of registering and unregistering
-      Discourse::Utils.execute_command('rm', '-f', target)
-      Discourse::Utils.execute_command('ln', '-s', public_data, target)
+
+      symlink_is_correct = false
+      begin
+        symlink_is_correct = File.exists?(target) && File.readlink(target) == public_data
+      rescue Errno::EINVAL, Errno::ENOENT
+      end
+
+      if !symlink_is_correct
+        Discourse::Utils.execute_command('rm', '-f', target)
+        Discourse::Utils.execute_command('ln', '-s', public_data, target)
+      end
     end
 
     ensure_directory(Plugin::Instance.js_path)
@@ -558,12 +566,22 @@ class Plugin::Instance
       contents << (is_dir ? "depend_on('#{f}')" : "require_asset('#{f}')")
     end
 
-    File.delete(js_file_path) if js_asset_exists?
-
     if contents.present?
       contents.insert(0, "<%")
       contents << "%>"
-      write_asset(js_file_path, contents.join("\n"))
+
+      contents = contents.join("\n")
+
+      if File.exists?(js_file_path)
+        current_contents = File.read(js_file_path)
+        if current_contents != contents
+          File.write(js_file_path, conten)
+        end
+      else
+        write_asset(js_file_path, contents)
+      end
+    else
+      File.delete(js_file_path) if js_asset_exists?
     end
   end
 

From dae5b3d673e46c1d4192cef0a9f7b074825f9827 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 4 Mar 2020 16:55:53 +1100
Subject: [PATCH 0070/1830] DEV: correct typo in param name

Followup to c457d3bf

It did cause a test suite failure as expected
---
 lib/plugin/instance.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 837de08957..4278382de7 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -575,7 +575,7 @@ class Plugin::Instance
       if File.exists?(js_file_path)
         current_contents = File.read(js_file_path)
         if current_contents != contents
-          File.write(js_file_path, conten)
+          File.write(js_file_path, contents)
         end
       else
         write_asset(js_file_path, contents)

From 0054ccc52290fa973d66bdd1fcc74a0cd886ee01 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 4 Mar 2020 17:10:14 +1100
Subject: [PATCH 0071/1830] Revert "DEV: correct typo in param name"

This reverts commit dae5b3d673e46c1d4192cef0a9f7b074825f9827.

Something is not right about my fix reverting
---
 lib/plugin/instance.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 4278382de7..837de08957 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -575,7 +575,7 @@ class Plugin::Instance
       if File.exists?(js_file_path)
         current_contents = File.read(js_file_path)
         if current_contents != contents
-          File.write(js_file_path, contents)
+          File.write(js_file_path, conten)
         end
       else
         write_asset(js_file_path, contents)

From 9cbed7ee465412b27b8a1a62a7001b470a984158 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 4 Mar 2020 17:10:36 +1100
Subject: [PATCH 0072/1830] Revert "FIX: under concurrent usage booting rails
 could cause plugin corruption"

This reverts commit c457d3bf2851d70c87ce27aa316333b19f5bbed4.

Something is not right about this fix, reverting.
---
 lib/plugin/instance.rb | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 837de08957..b810a9dd78 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -543,17 +543,9 @@ class Plugin::Instance
 
       Discourse::Utils.execute_command('mkdir', '-p', target)
       target << name.gsub(/\s/, "_")
-
-      symlink_is_correct = false
-      begin
-        symlink_is_correct = File.exists?(target) && File.readlink(target) == public_data
-      rescue Errno::EINVAL, Errno::ENOENT
-      end
-
-      if !symlink_is_correct
-        Discourse::Utils.execute_command('rm', '-f', target)
-        Discourse::Utils.execute_command('ln', '-s', public_data, target)
-      end
+      # TODO a cleaner way of registering and unregistering
+      Discourse::Utils.execute_command('rm', '-f', target)
+      Discourse::Utils.execute_command('ln', '-s', public_data, target)
     end
 
     ensure_directory(Plugin::Instance.js_path)
@@ -566,22 +558,12 @@ class Plugin::Instance
       contents << (is_dir ? "depend_on('#{f}')" : "require_asset('#{f}')")
     end
 
+    File.delete(js_file_path) if js_asset_exists?
+
     if contents.present?
       contents.insert(0, "<%")
       contents << "%>"
-
-      contents = contents.join("\n")
-
-      if File.exists?(js_file_path)
-        current_contents = File.read(js_file_path)
-        if current_contents != contents
-          File.write(js_file_path, conten)
-        end
-      else
-        write_asset(js_file_path, contents)
-      end
-    else
-      File.delete(js_file_path) if js_asset_exists?
+      write_asset(js_file_path, contents.join("\n"))
     end
   end
 

From 93b8b04b068871ccdf9592e42cc310cfc49ee5f8 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Wed, 4 Mar 2020 12:46:04 +0100
Subject: [PATCH 0073/1830] FIX: Migrating uploads to S3 could miss files

The rake task aborted the migration with "Already migrated" when all upload URLs linked to the correct S3 bucket even though the files didn't exist on S3. By removing the first check we force the rake task to check for the existance of uploads on S3.
---
 lib/file_store/to_s3_migration.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/file_store/to_s3_migration.rb b/lib/file_store/to_s3_migration.rb
index fe2edd5a53..456e428657 100644
--- a/lib/file_store/to_s3_migration.rb
+++ b/lib/file_store/to_s3_migration.rb
@@ -139,9 +139,6 @@ module FileStore
       # we don't want have migrated state, ensure we run all jobs here
       Jobs.run_immediately!
 
-      log "Checking if #{@current_db} already migrated..."
-      return log "Already migrated #{@current_db}!" if migration_successful?
-
       log "*" * 30 + " DRY RUN " + "*" * 30 if @dry_run
       log "Migrating uploads to S3 for '#{@current_db}'..."
 

From 33f77e51b839138f1e866731b034b3b2d980d6f1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 4 Mar 2020 15:32:15 +0100
Subject: [PATCH 0074/1830] FIX: allows to select the action when agreeing with
 penalty (#9099)

Note this commit also fixes an issue where the edit post actions was trying to focus the edit textarea, but was using jquery functions on a DOM node.

scrollTo is not available on IE11 but that shouldn't cause much trouble.
---
 .../components/penalty-post-action.js.es6     | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/admin/components/penalty-post-action.js.es6 b/app/assets/javascripts/admin/components/penalty-post-action.js.es6
index 09f267390c..916546452c 100644
--- a/app/assets/javascripts/admin/components/penalty-post-action.js.es6
+++ b/app/assets/javascripts/admin/components/penalty-post-action.js.es6
@@ -1,7 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { equal } from "@ember/object/computed";
-import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
+import { afterRender } from "discourse-common/utils/decorators";
 
 const ACTIONS = ["delete", "delete_replies", "edit", "none"];
 
@@ -20,16 +20,21 @@ export default Component.extend({
   editing: equal("postAction", "edit"),
 
   actions: {
-    penaltyChanged() {
+    penaltyChanged(postAction) {
+      this.set("postAction", postAction);
+
       // If we switch to edit mode, jump to the edit textarea
-      if (this.postAction === "edit") {
-        scheduleOnce("afterRender", () => {
-          const elem = this.element;
-          const body = elem.closest(".modal-body");
-          body.scrollTop(body.height());
-          elem.querySelector(".post-editor").focus();
-        });
+      if (postAction === "edit") {
+        this._focusEditTextarea();
       }
     }
+  },
+
+  @afterRender
+  _focusEditTextarea() {
+    const elem = this.element;
+    const body = elem.closest(".modal-body");
+    body.scrollTo(0, body.clientHeight);
+    elem.querySelector(".post-editor").focus();
   }
 });

From 5c581b475a6d88a62257b7af1fe39c2cf0dde96e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 4 Mar 2020 10:06:13 -0500
Subject: [PATCH 0075/1830] Build(deps): Bump oj from 3.10.3 to 3.10.5 (#9107)

Bumps [oj](https://github.com/ohler55/oj) from 3.10.3 to 3.10.5.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.3...v3.10.5)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index ef5d694e5d..5d4ea41328 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -215,7 +215,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.10.3)
+    oj (3.10.5)
     omniauth (1.9.0)
       hashie (>= 3.4.6, < 3.7.0)
       rack (>= 1.6.2, < 3)

From 8fa8bab9ff361bfa36592a6e32cfb96a4fc38d06 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Wed, 4 Mar 2020 16:57:16 +0100
Subject: [PATCH 0076/1830] FIX: Don't optimize icons during db:migrate when
 restoring backup

Uploads are extracted after the DB migration, so this could lead to a failure during the restore. Site icons get optimized after extracting uploads.
---
 lib/backup_restore/database_restorer.rb           | 2 +-
 lib/tasks/db.rake                                 | 2 +-
 spec/lib/backup_restore/database_restorer_spec.rb | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/backup_restore/database_restorer.rb b/lib/backup_restore/database_restorer.rb
index b3cb9ab0c8..d0880c97ed 100644
--- a/lib/backup_restore/database_restorer.rb
+++ b/lib/backup_restore/database_restorer.rb
@@ -134,7 +134,7 @@ module BackupRestore
       log "Migrating the database..."
 
       log Discourse::Utils.execute_command(
-        { "SKIP_POST_DEPLOYMENT_MIGRATIONS" => "0" },
+        { "SKIP_POST_DEPLOYMENT_MIGRATIONS" => "0", "SKIP_OPTIMIZE_ICONS" => "1" },
         "rake db:migrate",
         failure_message: "Failed to migrate database.",
         chdir: Rails.root
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 626acd5760..df830da6ac 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -77,7 +77,7 @@ task 'db:migrate' => ['load_config', 'environment', 'set_locale'] do |_, args|
 
   SeedFu.seed(DiscoursePluginRegistry.seed_paths)
 
-  if !Discourse.skip_post_deployment_migrations?
+  if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
     puts
     print "Optimizing site icons... "
     SiteIconManager.ensure_optimized!
diff --git a/spec/lib/backup_restore/database_restorer_spec.rb b/spec/lib/backup_restore/database_restorer_spec.rb
index 6d79dff9ef..02666093b0 100644
--- a/spec/lib/backup_restore/database_restorer_spec.rb
+++ b/spec/lib/backup_restore/database_restorer_spec.rb
@@ -37,6 +37,7 @@ describe BackupRestore::DatabaseRestorer do
   def expect_db_migrate
     Discourse::Utils.expects(:execute_command).with do |env, command, options|
       env["SKIP_POST_DEPLOYMENT_MIGRATIONS"] == "0" &&
+        env["SKIP_OPTIMIZE_ICONS"] == "1" &&
         command == "rake db:migrate" &&
         options[:chdir] == Rails.root
     end.once

From 1c60c731ba917f6af5b60265b3801b556ef2f178 Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Wed, 4 Mar 2020 09:35:04 -0800
Subject: [PATCH 0077/1830] DEV: Mark `discourse-categories-suppressed` as
 official

---
 lib/plugin/metadata.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index 09826338c8..5ceabfde79 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -21,6 +21,7 @@ class Plugin::Metadata
     "discourse-cakeday",
     "discourse-canned-replies",
     "discourse-calendar",
+    "discourse-categories-suppressed",
     "discourse-characters-required",
     "discourse-chat-integration",
     "discourse-checklist",

From 0e3e32f06cf9e4d9df7410c1cddb699e201612ce Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 4 Mar 2020 13:50:48 -0500
Subject: [PATCH 0078/1830] Remove some legacy tiger-striping css

---
 app/assets/stylesheets/mobile/topic-list.scss | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index 5b6de216e5..516c864c04 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -345,15 +345,6 @@ tr.category-topic-link {
     }
   }
 
-  .topic-list > tbody > tr {
-    &:nth-child(odd) {
-      background-color: $secondary;
-    }
-    &:nth-child(even) {
-      background-color: $secondary;
-    }
-  }
-
   th .badge-category {
     margin: 0;
   }

From 6afeb91a4db7aa3a3288f1715aa66fed6026b416 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 4 Mar 2020 14:48:22 -0500
Subject: [PATCH 0079/1830] UX: Input adjustments for category setting modal
 (tags tab)

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

diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index e24acf027f..a294453181 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -457,6 +457,32 @@
   }
 }
 
+.edit-category-tab-tags {
+  .select-kit {
+    &.tag-chooser {
+      width: 100%;
+
+      .select-kit-filter,
+      .filter-input {
+        display: flex;
+        flex: 1 0 250px;
+      }
+
+      .mobile-view & {
+        .no-content,
+        .is-loading,
+        &.select-kit.is-expanded .select-kit-collection {
+          width: 95%;
+        }
+      }
+    }
+  }
+}
+
+#category-min-tags-from-group {
+  min-height: 36px;
+}
+
 .incoming-email-modal {
   .btn {
     transition: none;

From 3610709b6cf859f674a02394f1430bb51f68d117 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 4 Mar 2020 16:53:32 -0500
Subject: [PATCH 0080/1830] Add classes for second-factor preferences

---
 .../discourse/templates/preferences-second-factor.hbs       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index 5b0da4457e..fd8f57c54c 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -27,7 +27,7 @@
     {{/if}}
 
     {{#if loaded}}
-      <div class="control-group">
+      <div class="control-group totp">
         <div class="controls">
           <h2>{{i18n "user.second_factor.totp.title"}}</h2>
           {{d-button action=(action "createTotp")
@@ -54,7 +54,7 @@
         </div>
       </div>
 
-      <div class="control-group">
+      <div class="control-group security-key">
         <div class="controls">
           <h2>{{i18n "user.second_factor.security_key.title"}}</h2>
           {{d-button action=(action "createSecurityKey")
@@ -81,7 +81,7 @@
         </div>
       </div>
 
-      <div class="control-group">
+      <div class="control-group pref-second-factor-backup">
         <div class="controls pref-second-factor-backup">
           <h2>{{i18n "user.second_factor_backup.title"}}</h2>
           {{#if model.second_factor_enabled}}

From a157f4aaaa8315e83d5be79e12aa630f11524c20 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 4 Mar 2020 15:38:27 +0530
Subject: [PATCH 0081/1830] Remove invite_admin route.

---
 app/controllers/admin/users_controller.rb    | 35 ----------------
 config/routes.rb                             |  1 -
 spec/requests/admin/users_controller_spec.rb | 44 --------------------
 3 files changed, 80 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 932de723b6..7ced962b3d 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -458,41 +458,6 @@ class Admin::UsersController < Admin::AdminController
     render json: { total: AdminUserIndexQuery.new(params).count_users }
   end
 
-  def invite_admin
-    raise Discourse::InvalidAccess.new unless is_api?
-
-    email = params[:email]
-    unless user = User.find_by_email(email)
-      name = params[:name] if params[:name].present?
-      username = params[:username] if params[:username].present?
-
-      user = User.new(email: email)
-      user.password = SecureRandom.hex
-      user.username = UserNameSuggester.suggest(username || name || email)
-      user.name = User.suggest_name(name || username || email)
-    end
-
-    user.active = true
-    user.save!
-    user.grant_admin!
-    user.change_trust_level!(4)
-    user.email_tokens.update_all confirmed: true
-
-    email_token = user.email_tokens.create(email: user.email)
-
-    unless params[:send_email] == '0' || params[:send_email] == 'false'
-      Jobs.enqueue(:critical_user_email,
-                    type: :account_created,
-                    user_id: user.id,
-                    email_token: email_token.token)
-    end
-
-    render json: success_json.merge!(
-      password_url: "#{Discourse.base_url}#{password_reset_token_path(token: email_token.token)}"
-    )
-
-  end
-
   def anonymize
     guardian.ensure_can_anonymize_user!(@user)
     if user = UserAnonymizer.new(@user, current_user).make_anonymous
diff --git a/config/routes.rb b/config/routes.rb
index 5d61ccc630..8fd2d19727 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -140,7 +140,6 @@ Discourse::Application.routes.draw do
     get 'users/:id/:username/tl3_requirements' => 'users#show'
 
     post "users/sync_sso" => "users#sync_sso", constraints: AdminConstraint.new
-    post "users/invite_admin" => "users#invite_admin", constraints: AdminConstraint.new
 
     resources :impersonate, constraints: AdminConstraint.new
 
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index 49a730ef64..92b79ce27f 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -757,50 +757,6 @@ RSpec.describe Admin::UsersController do
     end
   end
 
-  describe '#invite_admin' do
-    let(:api_key) { Fabricate(:api_key, user: admin) }
-    let(:api_params) do
-      { api_key: api_key.key, api_username: admin.username }
-    end
-
-    it "doesn't work when not via API" do
-      post "/admin/users/invite_admin.json", params: {
-        name: 'Bill', username: 'bill22', email: 'bill@bill.com'
-      }
-
-      expect(response.status).to eq(403)
-    end
-
-    it 'should invite admin' do
-      expect do
-        post "/admin/users/invite_admin.json", params: api_params.merge(
-          name: 'Bill', username: 'bill22', email: 'bill@bill.com'
-        )
-      end.to change { Jobs::CriticalUserEmail.jobs.size }.by(1)
-
-      expect(response.status).to eq(200)
-
-      u = User.find_by_email('bill@bill.com')
-      expect(u.name).to eq("Bill")
-      expect(u.username).to eq("bill22")
-      expect(u.admin).to eq(true)
-      expect(u.active).to eq(true)
-      expect(u.approved).to eq(true)
-    end
-
-    it "doesn't send the email with send_email falsey" do
-      expect do
-        post "/admin/users/invite_admin.json", params: api_params.merge(
-          name: 'Bill', username: 'bill22', email: 'bill@bill.com', send_email: '0'
-        )
-      end.to change { Jobs::CriticalUserEmail.jobs.size }.by(0)
-
-      expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
-      expect(json["password_url"]).to be_present
-    end
-  end
-
   describe '#sync_sso' do
     let(:sso) { SingleSignOn.new }
     let(:sso_secret) { "sso secret" }

From 83e649d08e0581a8e7c2ea3e69607e71b3912de0 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Wed, 4 Mar 2020 17:28:26 +0000
Subject: [PATCH 0082/1830] FIX: Clobbering plugin files on startup is
 problematic

On startup, (including when starting a rails console) we manipule a
collection of plugin files. Writing these files is done in multiple
observable steps, which presents opportunities for race conditions and
causes temporary corruption.

This commit uses the write, fsync and rename trick to atomically
overwrite these files instead, but reads them first to avoid unnecessary
writes.

c457d3bf was a previous attempt to fix the same problem.
---
 lib/discourse.rb       | 33 +++++++++++++++++++++++++++++++++
 lib/plugin/instance.rb | 16 +++++++++-------
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/lib/discourse.rb b/lib/discourse.rb
index 57e8778e90..7241dc1c35 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -45,6 +45,39 @@ module Discourse
       logs.join("\n".freeze)
     end
 
+    def self.atomic_write_file(destination, contents)
+      begin
+        return if File.read(destination) == contents
+      rescue Errno::ENOENT
+      end
+
+      FileUtils.mkdir_p(File.join(Rails.root, 'tmp'))
+      temp_destination = File.join(Rails.root, 'tmp', SecureRandom.hex)
+
+      File.open(temp_destination, "w") do |fd|
+        fd.write(contents)
+        fd.fsync()
+      end
+
+      File.rename(temp_destination, destination)
+
+      nil
+    end
+
+    def self.atomic_ln_s(source, destination)
+      begin
+        return if File.readlink(destination) == source
+      rescue Errno::ENOENT, Errno::EINVAL
+      end
+
+      FileUtils.mkdir_p(File.join(Rails.root, 'tmp'))
+      temp_destination = File.join(Rails.root, 'tmp', SecureRandom.hex)
+      execute_command('ln', '-s', source, temp_destination)
+      File.rename(temp_destination, destination)
+
+      nil
+    end
+
     private
 
     class CommandRunner
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index b810a9dd78..eb7c2322fc 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -543,12 +543,11 @@ class Plugin::Instance
 
       Discourse::Utils.execute_command('mkdir', '-p', target)
       target << name.gsub(/\s/, "_")
-      # TODO a cleaner way of registering and unregistering
-      Discourse::Utils.execute_command('rm', '-f', target)
-      Discourse::Utils.execute_command('ln', '-s', public_data, target)
+
+      Discourse::Utils.atomic_ln_s(public_data, target)
     end
 
-    ensure_directory(Plugin::Instance.js_path)
+    ensure_directory(js_file_path)
 
     contents = []
     handlebars_includes.each { |hb| contents << "require_asset('#{hb}')" }
@@ -558,12 +557,15 @@ class Plugin::Instance
       contents << (is_dir ? "depend_on('#{f}')" : "require_asset('#{f}')")
     end
 
-    File.delete(js_file_path) if js_asset_exists?
-
     if contents.present?
       contents.insert(0, "<%")
       contents << "%>"
-      write_asset(js_file_path, contents.join("\n"))
+      Discourse::Utils.atomic_write_file(js_file_path, contents.join("\n"))
+    else
+      begin
+        File.delete(js_file_path)
+      rescue Errno::ENOENT
+      end
     end
   end
 

From d953c908d2c6bbb8009f6a7895b74ad3f4a54d02 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 5 Mar 2020 18:28:18 +0530
Subject: [PATCH 0083/1830] FEATURE: add child theme components in theme
 metadata.

Now theme creators can add an array of child theme components in about.json file for a top level theme.
---
 app/models/remote_theme.rb |  2 ++
 app/models/theme.rb        | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb
index e278da0ddb..24336ee4ff 100644
--- a/app/models/remote_theme.rb
+++ b/app/models/remote_theme.rb
@@ -40,6 +40,7 @@ class RemoteTheme < ActiveRecord::Base
     theme ||= Theme.new(user_id: user&.id || -1, name: theme_info["name"])
 
     theme.component = theme_info["component"].to_s == "true"
+    theme.child_components = theme_info["components"].presence || []
 
     remote_theme = new
     remote_theme.theme = theme
@@ -63,6 +64,7 @@ class RemoteTheme < ActiveRecord::Base
     theme_info = RemoteTheme.extract_theme_info(importer)
     component = [true, "true"].include?(theme_info["component"])
     theme = Theme.new(user_id: user&.id || -1, name: theme_info["name"], component: component)
+    theme.child_components = theme_info["components"].presence || []
 
     remote_theme = new
     theme.remote_theme = remote_theme
diff --git a/app/models/theme.rb b/app/models/theme.rb
index 6a3b7a5643..cce0005a60 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -2,6 +2,8 @@
 
 class Theme < ActiveRecord::Base
 
+  attr_accessor :child_components
+
   @cache = DistributedCache.new('theme')
 
   belongs_to :user
@@ -61,6 +63,17 @@ class Theme < ActiveRecord::Base
     notify_theme_change(with_scheme: notify_with_scheme)
   end
 
+  after_create do
+    if !component? && child_components.present?
+      child_components.each do |url|
+        url = ThemeStore::GitImporter.new(url.strip).url
+        theme = RemoteTheme.find_by(remote_url: url)&.theme
+        theme ||= RemoteTheme.import_theme(url, user)
+        child_themes << theme
+      end
+    end
+  end
+
   def update_javascript_cache!
     all_extra_js = theme_fields.where(target_id: Theme.targets[:extra_js]).pluck(:value_baked).join("\n")
     if all_extra_js.present?

From 79ce7085c25ff661d4c29c71de9dae2374c2dfc2 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 4 Mar 2020 11:10:23 -0500
Subject: [PATCH 0084/1830] SECURITY: Ensure the invite JSON API matches the UX

Anonymous users could query the invite json and see counts and
summaries which is not allowed in the UX of Discourse.

This commit has those endpoints return a 403 unless the user is
allowed to invite.
---
 app/controllers/users_controller.rb    |  4 ++
 spec/requests/users_controller_spec.rb | 61 ++++++++++++++++++++------
 2 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4fd276da5b..3da6474c22 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -274,6 +274,8 @@ class UsersController < ApplicationController
   end
 
   def invited
+    guardian.ensure_can_invite_to_forum!
+
     inviter = fetch_user_from_params(include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts))
     offset = params[:offset].to_i || 0
     filter_by = params[:filter]
@@ -290,6 +292,8 @@ class UsersController < ApplicationController
   end
 
   def invited_count
+    guardian.ensure_can_invite_to_forum!
+
     inviter = fetch_user_from_params(include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts))
 
     pending_count = Invite.find_pending_invites_count(inviter)
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index a452f4e897..18727eeca6 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -1429,16 +1429,47 @@ describe UsersController do
     end
   end
 
-  describe '#invited' do
-    it 'returns success' do
+  describe "#invited_count" do
+    it "fails for anonymous users" do
       user = Fabricate(:user)
+      get "/u/#{user.username}/invited_count.json"
+      expect(response.status).to eq(403)
+    end
+
+    it "works for users who can see invites" do
+      inviter = Fabricate(:user, trust_level: 2)
+      sign_in(inviter)
+      invitee = Fabricate(:user)
+      invite = Fabricate(:invite, invited_by: inviter, user: invitee)
+      get "/u/#{user.username}/invited_count.json"
+      expect(response.status).to eq(200)
+
+      json = JSON.parse(response.body)
+      expect(json).to be_present
+      expect(json['counts']).to be_present
+    end
+  end
+
+  describe '#invited' do
+    it 'fails for anonymous users' do
+      user = Fabricate(:user)
+      get "/u/#{user.username}/invited.json", params: { username: user.username }
+
+      expect(response.status).to eq(403)
+    end
+
+    it 'returns success' do
+      user = Fabricate(:user, trust_level: 2)
+      sign_in(user)
       get "/u/#{user.username}/invited.json", params: { username: user.username }
 
       expect(response.status).to eq(200)
     end
 
     it 'filters by email' do
-      inviter = Fabricate(:user)
+      inviter = Fabricate(:user, trust_level: 2)
+      sign_in(inviter)
+
       invitee = Fabricate(:user)
       Fabricate(
         :invite,
@@ -1454,6 +1485,7 @@ describe UsersController do
       )
 
       get "/u/#{inviter.username}/invited.json", params: { search: 'billybob' }
+      expect(response.status).to eq(200)
 
       invites = JSON.parse(response.body)['invites']
       expect(invites.size).to eq(1)
@@ -1461,7 +1493,9 @@ describe UsersController do
     end
 
     it 'filters by username' do
-      inviter = Fabricate(:user)
+      inviter = Fabricate(:user, trust_level: 2)
+      sign_in(inviter)
+
       invitee = Fabricate(:user, username: 'billybob')
       _invite = Fabricate(
         :invite,
@@ -1476,6 +1510,7 @@ describe UsersController do
       )
 
       get "/u/#{inviter.username}/invited.json", params: { search: 'billybob' }
+      expect(response.status).to eq(200)
 
       invites = JSON.parse(response.body)['invites']
       expect(invites.size).to eq(1)
@@ -1489,19 +1524,19 @@ describe UsersController do
           Fabricate(:invite, invited_by: inviter)
 
           get "/u/#{user.username}/invited/pending.json"
-
-          invites = JSON.parse(response.body)['invites']
-          expect(invites).to be_empty
+          expect(response.status).to eq(403)
         end
       end
 
       context 'with redeemed invites' do
         it 'returns invites' do
-          inviter = Fabricate(:user)
+          inviter = Fabricate(:user, trust_level: 2)
+          sign_in(inviter)
           invitee = Fabricate(:user)
           invite = Fabricate(:invite, invited_by: inviter, user: invitee)
 
           get "/u/#{inviter.username}/invited.json"
+          expect(response.status).to eq(200)
 
           invites = JSON.parse(response.body)['invites']
           expect(invites.size).to eq(1)
@@ -1514,11 +1549,12 @@ describe UsersController do
       context 'with pending invites' do
         context 'with permission to see pending invites' do
           it 'returns invites' do
-            inviter = Fabricate(:user)
+            inviter = Fabricate(:user, trust_level: 2)
             invite = Fabricate(:invite, invited_by: inviter)
             sign_in(inviter)
 
             get "/u/#{inviter.username}/invited/pending.json"
+            expect(response.status).to eq(200)
 
             invites = JSON.parse(response.body)['invites']
             expect(invites.size).to eq(1)
@@ -1538,21 +1574,20 @@ describe UsersController do
             end
 
             get "/u/#{inviter.username}/invited/pending.json"
-
-            json = JSON.parse(response.body)['invites']
-            expect(json).to be_empty
+            expect(response.status).to eq(403)
           end
         end
       end
 
       context 'with redeemed invites' do
         it 'returns invites' do
-          _user = sign_in(Fabricate(:user))
+          sign_in(Fabricate(:user, trust_level: 2))
           inviter = Fabricate(:user)
           invitee = Fabricate(:user)
           invite = Fabricate(:invite, invited_by: inviter, user: invitee)
 
           get "/u/#{inviter.username}/invited.json"
+          expect(response.status).to eq(200)
 
           invites = JSON.parse(response.body)['invites']
           expect(invites.size).to eq(1)

From e01d5e2adcc46e0161b297d19d516e0722b7d2ff Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 4 Mar 2020 11:47:09 -0500
Subject: [PATCH 0085/1830] SECURITY: Add more restrictions on invite emails

They could be filtered and returned in some circumstances where they
shouldn't have been.
---
 app/controllers/users_controller.rb    |  9 +++-
 app/serializers/invite_serializer.rb   |  2 +-
 lib/guardian.rb                        |  4 ++
 spec/requests/users_controller_spec.rb | 68 +++++++++++++++-----------
 4 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3da6474c22..e96a79c953 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -286,8 +286,13 @@ class UsersController < ApplicationController
       Invite.find_redeemed_invites_from(inviter, offset)
     end
 
-    invites = invites.filter_by(params[:search])
-    render_json_dump invites: serialize_data(invites.to_a, InviteSerializer),
+    show_emails = guardian.can_see_invite_emails?(inviter)
+    if params[:search].present?
+      filter_sql = '(LOWER(users.username) LIKE :filter)'
+      filter_sql = '(LOWER(invites.email) LIKE :filter) or (LOWER(users.username) LIKE :filter)' if show_emails
+      invites = invites.where(filter_sql, filter: "%#{params[:search].downcase}%")
+    end
+    render_json_dump invites: serialize_data(invites.to_a, InviteSerializer, show_emails: show_emails),
                      can_see_invite_details: guardian.can_see_invite_details?(inviter)
   end
 
diff --git a/app/serializers/invite_serializer.rb b/app/serializers/invite_serializer.rb
index befa52fc21..9c03c813fb 100644
--- a/app/serializers/invite_serializer.rb
+++ b/app/serializers/invite_serializer.rb
@@ -5,7 +5,7 @@ class InviteSerializer < ApplicationSerializer
   attributes :email, :updated_at, :redeemed_at, :expired, :user
 
   def include_email?
-    !object.redeemed?
+    options[:show_emails] && !object.redeemed?
   end
 
   def expired
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 080faf78a9..fae144f2b6 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -331,6 +331,10 @@ class Guardian
     is_me?(user)
   end
 
+  def can_see_invite_emails?(user)
+    is_staff? || is_me?(user)
+  end
+
   def can_invite_to_forum?(groups = nil)
     authenticated? &&
     (SiteSetting.max_invites_per_day.to_i > 0 || is_staff?) &&
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 18727eeca6..ed28cab650 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -1466,23 +1466,13 @@ describe UsersController do
       expect(response.status).to eq(200)
     end
 
-    it 'filters by email' do
+    it 'filters by all if viewing self' do
       inviter = Fabricate(:user, trust_level: 2)
       sign_in(inviter)
 
       invitee = Fabricate(:user)
-      Fabricate(
-        :invite,
-        email: 'billybob@example.com',
-        invited_by: inviter,
-        user: invitee
-      )
-      Fabricate(
-        :invite,
-        email: 'jimtom@example.com',
-        invited_by: inviter,
-        user: invitee
-      )
+      Fabricate(:invite, email: 'billybob@example.com', invited_by: inviter, user: invitee)
+      Fabricate(:invite, email: 'jimtom@example.com', invited_by: inviter, user: invitee)
 
       get "/u/#{inviter.username}/invited.json", params: { search: 'billybob' }
       expect(response.status).to eq(200)
@@ -1490,31 +1480,51 @@ describe UsersController do
       invites = JSON.parse(response.body)['invites']
       expect(invites.size).to eq(1)
       expect(invites.first).to include('email' => 'billybob@example.com')
+
+      get "/u/#{inviter.username}/invited.json", params: { search: invitee.username }
+      expect(response.status).to eq(200)
+
+      invites = JSON.parse(response.body)['invites']
+      expect(invites.size).to eq(2)
+      expect(invites[0]['email']).to be_present
     end
 
-    it 'filters by username' do
+    it "doesn't filter by email if another regular user" do
       inviter = Fabricate(:user, trust_level: 2)
-      sign_in(inviter)
+      sign_in(Fabricate(:user, trust_level: 2))
 
-      invitee = Fabricate(:user, username: 'billybob')
-      _invite = Fabricate(
-        :invite,
-        invited_by: inviter,
-        email: 'billybob@example.com',
-        user: invitee
-      )
-      Fabricate(
-        :invite,
-        invited_by: inviter,
-        user: Fabricate(:user, username: 'jimtom')
-      )
+      invitee = Fabricate(:user)
+      Fabricate(:invite, email: 'billybob@example.com', invited_by: inviter, user: invitee)
+      Fabricate(:invite, email: 'jimtom@example.com', invited_by: inviter, user: invitee)
+
+      get "/u/#{inviter.username}/invited.json", params: { search: 'billybob' }
+      expect(response.status).to eq(200)
+
+      invites = JSON.parse(response.body)['invites']
+      expect(invites.size).to eq(0)
+
+      get "/u/#{inviter.username}/invited.json", params: { search: invitee.username }
+      expect(response.status).to eq(200)
+
+      invites = JSON.parse(response.body)['invites']
+      expect(invites.size).to eq(2)
+      expect(invites[0]['email']).to be_blank
+    end
+
+    it "filters by email if staff" do
+      inviter = Fabricate(:user, trust_level: 2)
+      sign_in(Fabricate(:moderator))
+
+      invitee = Fabricate(:user)
+      Fabricate(:invite, email: 'billybob@example.com', invited_by: inviter, user: invitee)
+      Fabricate(:invite, email: 'jimtom@example.com', invited_by: inviter, user: invitee)
 
       get "/u/#{inviter.username}/invited.json", params: { search: 'billybob' }
       expect(response.status).to eq(200)
 
       invites = JSON.parse(response.body)['invites']
       expect(invites.size).to eq(1)
-      expect(invites.first).to include('email' => 'billybob@example.com')
+      expect(invites[0]['email']).to be_present
     end
 
     context 'with guest' do
@@ -1581,7 +1591,7 @@ describe UsersController do
 
       context 'with redeemed invites' do
         it 'returns invites' do
-          sign_in(Fabricate(:user, trust_level: 2))
+          sign_in(Fabricate(:moderator))
           inviter = Fabricate(:user)
           invitee = Fabricate(:user)
           invite = Fabricate(:invite, invited_by: inviter, user: invitee)

From 4b70719a484b2b4bbc6ed3ce526e293d6e18b59a Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 5 Mar 2020 12:45:42 -0500
Subject: [PATCH 0086/1830] Update translations

---
 config/locales/client.bg.yml                  |  70 +++++++++
 config/locales/client.bs_BA.yml               | 120 ++++++++++++++-
 config/locales/client.ca.yml                  |   4 +-
 config/locales/client.da.yml                  |   1 +
 config/locales/client.de.yml                  |  21 ++-
 config/locales/client.es.yml                  |   8 +-
 config/locales/client.fa_IR.yml               |  47 ++++++
 config/locales/client.fi.yml                  |   4 +-
 config/locales/client.fr.yml                  |   4 +-
 config/locales/client.he.yml                  | 142 +++++++++---------
 config/locales/client.it.yml                  |  52 +++++--
 config/locales/client.nl.yml                  |  10 +-
 config/locales/client.pl_PL.yml               |   3 -
 config/locales/client.pt_BR.yml               |   4 +-
 config/locales/client.ru.yml                  |  24 +--
 config/locales/client.sl.yml                  |   1 +
 config/locales/client.sv.yml                  |  19 ++-
 config/locales/client.tr_TR.yml               |   4 +-
 config/locales/client.uk.yml                  |   4 +-
 config/locales/client.ur.yml                  |   4 +-
 config/locales/client.vi.yml                  |  10 +-
 config/locales/client.zh_CN.yml               |   4 +-
 config/locales/server.ar.yml                  |   1 -
 config/locales/server.be.yml                  |   2 -
 config/locales/server.bg.yml                  |  16 +-
 config/locales/server.bs_BA.yml               |  18 ++-
 config/locales/server.ca.yml                  |   2 -
 config/locales/server.de.yml                  |  14 +-
 config/locales/server.el.yml                  |   2 -
 config/locales/server.es.yml                  |   4 +-
 config/locales/server.fa_IR.yml               |  11 +-
 config/locales/server.fi.yml                  |   2 -
 config/locales/server.fr.yml                  |   2 -
 config/locales/server.he.yml                  |   3 +-
 config/locales/server.hy.yml                  |   2 -
 config/locales/server.it.yml                  |  20 ++-
 config/locales/server.ja.yml                  |   1 -
 config/locales/server.ko.yml                  |   2 -
 config/locales/server.nl.yml                  |   1 +
 config/locales/server.pl_PL.yml               |   2 -
 config/locales/server.pt.yml                  |   1 -
 config/locales/server.pt_BR.yml               |   2 -
 config/locales/server.ro.yml                  |   1 -
 config/locales/server.ru.yml                  |   2 -
 config/locales/server.sk.yml                  |   1 -
 config/locales/server.sq.yml                  |   1 -
 config/locales/server.sr.yml                  |   1 -
 config/locales/server.sv.yml                  |   1 +
 config/locales/server.tr_TR.yml               |   2 -
 config/locales/server.uk.yml                  |   2 -
 config/locales/server.ur.yml                  |   2 -
 config/locales/server.vi.yml                  |   1 -
 config/locales/server.zh_CN.yml               |   8 +-
 config/locales/server.zh_TW.yml               |   2 -
 .../config/locales/client.bs_BA.yml           |  20 +++
 .../config/locales/client.fa_IR.yml           |   1 +
 .../config/locales/server.bs_BA.yml           |  28 ++++
 .../config/locales/server.nl.yml              |  23 +++
 plugins/poll/config/locales/client.bs_BA.yml  |  38 ++++-
 plugins/poll/config/locales/server.bs_BA.yml  |   8 +
 60 files changed, 614 insertions(+), 196 deletions(-)

diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index ddcd6759e6..9dd640fb5b 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -148,6 +148,9 @@ bg:
       visible:
         enabled: "добавена в списъка %{when}"
         disabled: "премахната от списъка %{when}"
+      forwarded: "препрати горния имейл"
+    topic_admin_menu: "действия по темата"
+    wizard_required: "Добре дошли във вашия нов Discourse! Нека започнем с <a href='%{url}' data-auto-route='true'>съветника за настройка</a> ✨"
     emails_are_disabled: "Всички изходящи имейли са изцяло забранени от администратора. Няма да бъдат изпращани никакви имейл известия."
     bootstrap_mode_enabled: "За да помогнем със стартирането на вашия нов сайт по-лесно поставихме сайта в \"стартиращо режим\". Всички нови потребители ще получат ниво на доверие 1 и ще имат активирани дневни известия за активноста във форума. Този режим ще бъде автоматично спрян когато бройката регистрирани потребители стигне %{min_users} ."
     themes:
@@ -256,8 +259,17 @@ bg:
       not_bookmarked: "добавете тази публикация в Отметки"
       remove: "Премахнете отметката"
       save: "Запази"
+      reminders:
+        later_today: "По-късно днес <br/>{{date}}"
+        next_business_day: "Следващият работен ден <br/>{{date}}"
+        tomorrow: "Утре <br/>{{date}}"
+        next_week: "Следващата седмица <br/>{{date}}"
+        next_month: "Следващият месец <br/>{{date}}"
     drafts:
+      resume: "Продължи"
       remove: "Премахване"
+      new_topic: "Проект на нова тема"
+      topic_reply: "Проект на отговор"
       abandon:
         yes_value: "Да, напусни"
         no_value: "Не, запази"
@@ -287,38 +299,89 @@ bg:
       edit: "Редактирай този банер >>"
     choose_topic:
       none_found: "Няма нови теми."
+      title:
+        search: "Търсене на тема"
+    choose_message:
+      none_found: "Не са намерени съобщения."
+      title:
+        search: "Търси съобщения"
     review:
       order_by: "Подреди по"
+      in_reply_to: "в отговор на"
       explain:
+        formula: "Формула"
         total: "Общо"
+      awaiting_approval: "Очаква одобрение"
       delete: "Изтрий"
       settings:
         save_changes: "Запази промените"
         title: "Настройки"
+      view_all: "Виж всички"
+      grouped_by_topic: "Групирани по тема"
+      title: "Преглед"
       topic: "Тема:"
       filtered_user: "Потребител"
+      show_all_topics: "покажи всички теми"
       user:
+        bio: "Биография"
+        website: "Уебсайт"
         username: "Потребителско име"
         email: "Имейл"
         name: "Име"
+        fields: "Полета"
+      user_percentage:
+        agreed:
+          one: "{{count}}% са съгласни"
+          other: "{{count}}% са съгласни"
+        disagreed:
+          one: "{{count}}% не са съгласни"
+          other: "{{count}}% не са съгласни"
+        ignored:
+          one: "{{count}}% игнорира"
+          other: "{{count}}% са без отношение"
       topics:
         topic: "Тема"
+        reviewable_count: "Брой"
+        details: "детайли"
+        unique_users:
+          one: "%{count} потребител"
+          other: "{{count}} потребители"
+      replies:
+        one: "%{count} отговор"
+        other: "{{count}} отговора"
       edit: "Редактирай"
       save: "Запази"
       cancel: "Отмени"
       filters:
+        all_categories: "(всички категории)"
         type:
           title: "Тип"
+          all: "(всички видове)"
         refresh: "Опресни"
+        status: "Статус"
         category: "Категория"
+        orders:
+          priority: "Приоритет"
+          priority_asc: "Приоритет (по обратен ред)"
+          created_at: "Създадено на"
+          created_at_asc: "Създадено на (по обратен ред)"
+        priority:
+          medium: "Среден"
+          high: "Висок"
       scores:
+        score: "Точки"
         date: "Дата"
         type: "Тип"
+        status: "Статус"
       statuses:
         pending:
           title: "Чакащи"
+        approved:
+          title: "Одобрена"
         rejected:
           title: "Отхвърлени"
+        deleted:
+          title: "Изтрита"
       types:
         reviewable_user:
           title: "Потребител"
@@ -434,6 +497,11 @@ bg:
       members:
         title: "Членове"
         filter_placeholder: "Потребителско име"
+        remove_member: "Премахни Потребител"
+        remove_member_description: "Премахни <b>%{username}</b> от тази група"
+        make_owner: "Направи Собственик"
+        remove_owner: "Премахни като Собственик"
+        remove_owner_description: "Премахни <b>%{username}</b> като собственик на тази група"
         owner: "Собественик"
       topics: "Теми"
       posts: "Публикации"
@@ -519,6 +587,7 @@ bg:
       topics_entered: "добавени теми"
       post_count: "# публикации"
       confirm_delete_other_accounts: "Сигурни ли сте, че искате да изтриете тези профили?"
+      copied: "копирано"
     user_fields:
       none: "(изберете опция)"
     user:
@@ -1679,6 +1748,7 @@ bg:
       search_priority:
         options:
           normal: "Нормален"
+          high: "Висок"
       sort_options:
         likes: "Харесвания"
         views: "Преглеждания"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index dec41a729a..99061a6922 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -174,6 +174,8 @@ bs_BA:
       banner:
         enabled: "postavi kao zastavicu %{when}. Pojavljivat će se na vrhu svake stranice sve dok je korisnik ne zatvori."
         disabled: "odkloni zastavicu %{when}.Neće se više prikazivati na vrhu svake stranice."
+      forwarded: "gornji email proslijeđen"
+    topic_admin_menu: "akcije u vezi teme"
     wizard_required: "Dobrodošli na vaš novi Discourse! Odpočnimo sa <a href='%{url}' data-auto-route='true'>čarobnjakom za postavke</a> ✨"
     emails_are_disabled: "Sve odlazeće email poruke su globalno onemogućene od strane administratora. Ni jedna notifikacija bilo koje vrste neće biti poslana."
     bootstrap_mode_enabled: "Kako bi olakšali lansiranje vaše nove web stranice, trenutačno ste u \"bootstrap\" načinu rada. Svim novim korisnicima će se dodjeljivati nivo povjerenja 1 i imati uključen dnevni izvještaj dešavanja na forumu preko email-a. Ovo će se automatski isključiti nakon što %{min_users} korisnika prijavi račun na forumu."
@@ -285,9 +287,19 @@ bs_BA:
     bookmarks:
       created: "zabilježili ste ovu stranicu"
       not_bookmarked: "sačuvaj ovaj post"
+      created_with_reminder: "postavili ste zabilješku na ovu objavu s podsjetnikom %{date}"
       remove: "Ukloni zabilješku"
       confirm_clear: "Dali ste sigurni dali želite izbrisati sve sačuvane stvari iz ove teme?"
       save: "Sačuvaj"
+      no_timezone: 'Još uvijek niste postavili vremensku zonu, tako da nećete biti u mogućnosti koristiti podsjetnike. Postavite vremensku zonu <a href="%{basePath}/my/preferences/profile">na vašem profilu</a>.'
+      reminders:
+        at_desktop: "Sljedeći put sam za svojim desktop kompjuterom"
+        later_today: "Danas, malo kasnije <br/>{{date}}"
+        next_business_day: "Sljedeći radni dan <br/>{{date}}"
+        tomorrow: "Sutradan <br/>{{date}}"
+        next_week: "Sljedeće sedmice <br/>{{date}}"
+        next_month: "Sljedeći mjesec <br/>{{date}}"
+        custom: "Precizno vrijeme i datum"
     drafts:
       resume: "Nastavi"
       remove: "Ukloni"
@@ -332,13 +344,41 @@ bs_BA:
     banner:
       close: "Odkaži ovu zastavicu."
       edit: "Uredite ovu zastavicu >>"
+    pwa:
+      install_banner: "Da li želite <a href>instalirati %{title} na ovaj uređaj?</a>"
     choose_topic:
       none_found: "Nema tema."
+      title:
+        search: "Traži Temu"
+        placeholder: "ovdje ukucajte naslov teme, url ili id"
     choose_message:
       none_found: "nisam našao nijednu poruku"
+      title:
+        search: "Traži poruku"
+        placeholder: "ovdje ukucajte naslov poruke, url ili id"
     review:
       order_by: "Pordeak po"
       in_reply_to: "odgovori na"
+      explain:
+        why: "objasnite zašto je ovaj objekat završio na listi za čekanje"
+        title: "Ocjenjiv Skor"
+        formula: "Formula"
+        subtotal: "Podsuma"
+        total: "Suma"
+        min_score_visibility: "Minimalni skor za Vidljivost"
+        score_to_hide: "Skor za Skrivanje objave"
+        take_action_bonus:
+          name: "preduzeo akciju"
+          title: "Kada član uprave odluči da poduzme akciju, zastavici je dodijeljen bonus."
+        user_accuracy_bonus:
+          name: "korisnička preciznost"
+          title: "Korisnicima čije su zastave prethodno bivale usaglašene dobivaju bonus."
+        trust_level_bonus:
+          name: "nivo povjerenja"
+          title: "Ocjenjivi objekti kreirani od strane korisnika sa višim nivoom povjerenja imaju viši skor."
+        type_bonus:
+          name: "bonus tip"
+          title: "Neki ocjenjivi tipovi mogu zaprimiti bonus od strane osoblja foruma kako bi tim tipovima podigli prioritet"
       claim_help:
         optional: "Možete tražiti ova da sprijećite ostale da ga pregledaju"
         required: "VI morate tvrditi stavari prije ih morate cijeniti"
@@ -373,6 +413,8 @@ bs_BA:
       deleted_post: "(post izbrisan)"
       deleted_user: "(korisnik izbrisan)"
       user:
+        bio: "Biografija"
+        website: "Web stranica"
         username: "Ime"
         email: "Email"
         name: "Ime"
@@ -572,6 +614,8 @@ bs_BA:
       leave: "Napusti"
       request: "Zatraži"
       message: "Poruka"
+      confirm_leave: "Jeste li sigurni da želite napustiti ovu grupu?"
+      allow_membership_requests: "Dopusti korisnicima da smiju slati molbe za učlanjenje u grupu vlasnicima grupa (Potrebno je da je grupa javno vidljiva)"
       membership_request_template: "Prilagođeni memorandum kao priložak koji se prikazuje korisnicima prilikom slanja zahtjeva za učlanjenje"
       membership_request:
         submit: "Poslati zahtjev "
@@ -619,6 +663,7 @@ bs_BA:
         remove_owner: "Ukloni kao vlasnika"
         remove_owner_description: "Ukloni <b>%{username}</b> kao vlasnika ove grupe"
         owner: "Vlasnik"
+        forbidden: "Nije vam dozvoljeno da vidite članove."
       topics: "Teme"
       posts: "Postovi"
       mentions: "Spomenuto"
@@ -753,14 +798,19 @@ bs_BA:
       activity_stream: "Aktivnost"
       preferences: "Postavke"
       feature_topic_on_profile:
+        open_search: "Odaberi Novu temu"
+        title: "Odaberi temu"
+        search_label: "Traži temu po naslovu"
         save: "Sačuvaj"
         clear:
           title: "Clear"
+          warning: "Jeste li sigurni da želite vašu istaknutu temu očistiti?"
       profile_hidden: "Javni profil ovog korisnika je skriven"
       expand_profile: "Proširi"
       collapse_profile: "Spusti"
       bookmarks: "Zabilješke"
       bio: "O Meni"
+      timezone: "Vremenska zona"
       invited_by: "Pozvan od"
       trust_level: "Nivo povjerenja"
       notifications: "Obaviještenja"
@@ -787,6 +837,7 @@ bs_BA:
       enable_quoting: "Uključi \"citiran odgovor\" za označen tekst"
       enable_defer: "Omogući odlaganje za označavanje tema nepročitanih"
       change: "promjeni"
+      featured_topic: "Istaknuta tema"
       moderator: "{{user}} je moderator"
       admin: "{{user}} je admin"
       moderator_tooltip: "Ovaj korisnik je moderator"
@@ -894,6 +945,7 @@ bs_BA:
         copied_to_clipboard: "Kopirano u međuspremnik"
         copy_to_clipboard_error: "Pogreška pri kopiranju podataka u međuspremnik"
         remaining_codes: "Imate <strong>preostale</strong> rezervne kodove <strong>{{count}}</strong> ."
+        use: "Koristi backup kod"
         enable_prerequisites: "Morate omogućiti primarni drugi faktor prije generiranja rezervnih kodova."
         codes:
           title: "Generirani sigurnosni kodovi"
@@ -901,6 +953,7 @@ bs_BA:
       second_factor:
         title: "Two Factor Authentication"
         enable: "Upravljanje autentifikacijom sa dva faktora"
+        forgot_password: "Zaboravili ste password?"
         confirm_password_description: "Molimo vas da potvrdite šifru kako bi nastavili"
         name: "Ime"
         label: "Šifra"
@@ -914,6 +967,7 @@ bs_BA:
         extended_description: |
           Dvofaktorna autentifikacija dodaje dodatnu sigurnost vašem računu tako što zahtijeva dodatnu jednokratnu oznaku pored vaše lozinke. Tokeni se mogu generirati na <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a> i <a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a> uređajima.
         oauth_enabled_warning: "Imajte na umu da će ulogovanje korištenjem socijalnih mreža biti isključeno u momentu kad uključite two factor authentication (dvofaktorsku ovjeru autentičnosti) na vašem korisničkom računu."
+        use: "Koristi Authenticator app?"
         enforced_notice: "Morate omogućiti autentifikaciju s dva faktora prije pristupa ovoj web-lokaciji."
         disable: "onemogući"
         disable_title: "Onemogući Drugi Faktor"
@@ -921,11 +975,20 @@ bs_BA:
         edit: "Izmijeni"
         edit_title: "Uredi drugi faktor"
         edit_description: "Ime drugog faktora"
+        enable_security_key_description: "Kada ste pripremili vaš fizikalni sigurnosni ključ (physical security key), pritisnite ispod dugme Registriraj."
         totp:
           title: "Autentikatori zasnovani na tokenu"
           add: "Novi Authenticator"
           default_name: "Moj Authenticator"
         security_key:
+          register: "Registriraj"
+          title: "Sigurnosni ključevi"
+          add: "Registriraj sigurnosni ključ"
+          default_name: "Glavni sigurnosni ključ"
+          not_allowed_error: "Proces registracije sigurnosnog ključa je ili vremenski istekao ili je odkazan."
+          already_added_error: "Već ste registrovali ovaj sigurnosni ključ. Nemate potrebe da ga ponovo registrujete."
+          edit: "Izmijeni sigurnosni ključ"
+          edit_description: "Ime sigurnosnog ključa"
           delete: "Izbriši"
       change_about:
         title: "Promjeni O meni"
@@ -952,9 +1015,15 @@ bs_BA:
         uploaded_avatar_empty: "Dodajte vašu sliku"
         upload_title: "Učitajte vašu sliku sa uređaja"
         image_is_not_a_square: "Upozorenje: morali smo izrezat vašu sliku; nije bila kvadratnog oblika."
+      change_profile_background:
+        title: "Profil zaglavlja"
+        instructions: "Profili zaglavlja će biti centrirani i imati standardno širinu od 1110 piksela."
       change_card_background:
         title: "Pozadina Korisničke kartice"
         instructions: "Pozadinske slike će biti centrirane i imati standard širinu od 590 pixela."
+      change_featured_topic:
+        title: "Istaknuta tema"
+        instructions: "Link na ovu temu će biti prikazan na vašoj korisničkoj kartici i profilu."
       email:
         title: "Email"
         primary: "Primarni Email"
@@ -979,6 +1048,7 @@ bs_BA:
         confirm_modal_title: "Povezani %{provider} račun"
         confirm_description:
           account_specific: "Vaš %{provider} račun %{account_description} će biti korišten za autentifikaciju."
+          generic: "Vaš %{provider} račun će biti korišten za prijavu."
       name:
         title: "Ime"
         instructions: "vaše puno ime (opciono)"
@@ -1090,6 +1160,7 @@ bs_BA:
         search: "kucaj da potražiš pozivnice..."
         title: "Pozivnice"
         user: "Pozvan korisnik"
+        sent: "Zadnje poslano"
         none: "Nema pozivnica za prikazati"
         truncated:
           one: "Prikaz prve pozivnice."
@@ -1307,6 +1378,8 @@ bs_BA:
       reset: "Resetuj Šifru"
       complete_username: "Ako se vaš nalog podudara sa korisnikom <b>%{username}</b>, uskoro ćete primiti email koji će vam objasniti kako da resetujete vašu šifru."
       complete_email: "Ako se vaš nalog podudara sa <b>%{email}</b>, uskoro ćete primiti email koji će vam objasniti kako da resetujete vašu šifru."
+      complete_username_found: "Pronašli smo račun koji se podudara sa korisničkim imenom <b>%{username}</b>. Trebali bi uskoro dobiti email sa instrukcijama kako da resetujete vaš password."
+      complete_email_found: "Pronašli smo račun koji se podudara sa <b>%{email}</b>. Trebali bi uskoro dobiti email sa instrukcijama kako da resetujete vaš password."
       complete_username_not_found: "Nema naloga sa korisničkim imenom <b>%{username}</b>"
       complete_email_not_found: "Nema naloga sa email-om <b>%{email}</b>"
       help: "Email još ne stiže? Prvo provjerite vaš spam folder u email pregledniku.<p>Niste sigurni koji email ste koristili? Unesite email adresu i mi ćemo vas obavjestiti da li ista postoji kod nas.</p><p>Ukoliko nemate više pristup vašoj email kojom ste registrovali korisnički račun, molimo vas da se obratite <a href='%{basePath}/about'>našim administratorima za pomoć.</a></p>"
@@ -1330,8 +1403,15 @@ bs_BA:
       password: "Šifra"
       second_factor_title: "Two Factor Authentication"
       second_factor_description: "Molimo da unesete kod za ovjeru autentičnosti sa vaše aplikacije:"
+      second_factor_backup: "Loguj se koristeći backup kod"
       second_factor_backup_title: "rezevna zaštita za dva faktora"
       second_factor_backup_description: "Molim ukucajte jedan od vaši rezevni kodova"
+      second_factor: "Loguj se koristeći Authenticator app"
+      security_key_description: "Kada ste pripremili vaš fizikalni sigurnosni ključ (physical security key), pritisnite ispod dugme Prijava pomoću sigurnosnog ključa."
+      security_key_alternative: "Pokušaj na drugi način"
+      security_key_authenticate: "Prijava pomoću sigurnosnog ključa"
+      security_key_not_allowed_error: "Ovaj proces prijave pomoću sigurnosnog ključa je ili vremenski istekao ili je odkazan."
+      security_key_no_matching_credential_error: "Nisu pronađeni korisnički podatci koristeći navedeni sigurnosni ključ."
       email_placeholder: "email ili korisnik"
       caps_lock_warning: "Uključena su vam velika slova"
       error: "Nepoznata greška"
@@ -1426,6 +1506,7 @@ bs_BA:
         one: "Označi bar {{count}} predmet."
         few: "Označi bar {{count}} predmeta."
         other: "Označi bar {{count}} predmeta."
+      invalid_selection_length: "Označeno mora biti najmanje {{count}} karaktera dugo."
     date_time_picker:
       from: Od
       to: Ka
@@ -1486,10 +1567,12 @@ bs_BA:
         title_missing: "Naslov je obavezan"
         title_too_short: "Naslov mora biti najmanje {{min}} karaktera"
         title_too_long: "Naslov ne može biti više od {{max}} karaktera"
+        post_missing: "Objava ne može biti prazna"
         post_length: "Odgovor mora biti najmanje {{min}} karaktera"
         try_like: "Dail ste pokušali{{heart}}dugme?"
         category_missing: "Morate odabrati kategoriju"
         tags_missing: "Morate odabrati najmanje {{count}} oznaka"
+        topic_template_not_modified: "Molimo da dodate detalje i specifikacije za vašu temu tako što ćete izmijeniti template teme."
       save_edit: "Sačuvaj izmjene"
       overwrite_edit: "Overwrite Edit"
       reply_original: "Odgovori na Originalnu temu"
@@ -1514,6 +1597,7 @@ bs_BA:
       view_new_post: "Pogledaj svoj novi post."
       saving: "Spašavam"
       saved: "Sačuvano!"
+      saved_draft: "Sastav je u toku. Tipkajte kako bi nastavili dalje."
       uploading: "Uplodujem..."
       show_preview: "pokaži pregled &raquo;"
       hide_preview: "&laquo; sakri pregled"
@@ -2247,7 +2331,7 @@ bs_BA:
         attachment_download_requires_login: "Sorry, you need to be logged in to download attachments."
       abandon_edit:
         no_value: "Ne, sačuvaj"
-        no_save_draft: "Ne,spasi skicu"
+        no_save_draft: "Ne, spasi sastav"
       abandon:
         confirm: "Da li ste sigurni da želite otkazati vaš post?"
         no_value: "Ne, sačuvaj"
@@ -2574,6 +2658,7 @@ bs_BA:
         help: "Ovu temu sajt ne lista među najnovijim temama. Neće biti prisutna ni među listama tema unutar kategorija. Jedini način da se dođe do ove teme je direktan link"
       personal_message:
         title: "Ova tema je lična poruka"
+        help: "Ova tema je lična poruka"
     posts: "Odgovori"
     posts_long: "postoji {{number}} odgovora u ovoj temi"
     posts_likes_MF: |
@@ -2729,6 +2814,7 @@ bs_BA:
         title: "Aplikacija"
         create: "%{shortcut} Započni novu temu"
         notifications: "%{shortcut} Otvori notifikacije"
+        hamburger_menu: "%{shortcut} Otvori padajući meni"
         user_profile_menu: "%{shortcut} Otvori meni korisnika"
         show_incoming_updated_topics: "%{shortcut} Pročitaj promjenje teme"
         search: "%{shortcut} Traži"
@@ -2761,6 +2847,7 @@ bs_BA:
         mark_watching: "%{shortcut} Motri temu"
         print: "%{shortcut} Odštampaj temu"
         defer: "%{shortcut} Defer temu"
+        topic_admin_actions: "%{shortcut} Otvori opcije administriranja teme"
     badges:
       earned_n_times:
         one: "Zaradio / la sam ovu oznaku %{count} time"
@@ -2805,13 +2892,39 @@ bs_BA:
       changed: "oznake  promijenjene:"
       tags: "Oznake"
       choose_for_topic: "izborne oznake"
+      info: "Informacija"
+      default_info: "Ovaj oznaka nije predodređena ni za jednu kategoriju i nema sinonime."
+      category_restricted: "Ova oznaka je predodređena za kategorije na koje nemate pravo pristupa."
+      synonyms: "Sinonimi"
+      synonyms_description: "U slučaju da se sljedeće oznake koriste, iste će biti zamijenjene sa <b>%{base_tag_name}</b>."
+      tag_groups_info:
+        one: 'Ovaj tag pripada grupi "{{tag_groups}}".'
+        few: "Ovaj tag pripada sljedećim grupama: {{tag_groups}}."
+        other: "Ova oznaka pripada sljedećim grupama: {{tag_groups}}."
+      category_restrictions:
+        one: "Moguće je koristiti samo u sljedećoj kategoriji:"
+        few: "Moguće je koristiti samo u sljedećim kategorijama:"
+        other: "Moguće je koristiti samo u sljedećim kategorijama:"
+      edit_synonyms: "Uredi sinonime"
+      add_synonyms_label: "Dodaj sinonime:"
       add_synonyms: "Dodaj"
+      add_synonyms_explanation:
+        one: "Svaka lokacija koja trenutno koristi ovu oznaku bit će zamjenjena sa <b>%{tag_name}</b>. Jeste li sigurni da želite izvršiti tu promjenu?"
+        few: "Svaka lokacija koja trenutno koristi ove oznake bit će zamjenjena sa <b>%{tag_name}</b>. Jeste li sigurni da želite izvršiti tu promjenu?"
+        other: "Svaka lokacija koja trenutno koristi ove oznake bit će zamjenjena sa <b>%{tag_name}</b>. Jeste li sigurni da želite izvršiti tu promjenu?"
+      add_synonyms_failed: "Sljedeće oznake nije moguće dodati kao sinonime: <b>%{tag_names}</b>. Osigurajte prvo da nemaju već postojeće sinonime i da nisu sinonimi neke druge oznake."
+      remove_synonym: "Odstrani sinonim"
+      delete_synonym_confirm: 'Jeste li sigurni da želite izbrisati sinonim "%{tag_name}"?'
       delete_tag: "Izbriši oznaku"
       delete_confirm:
         one: "Jeste li sigurni da želite izbrisati ovu oznaku i ukloniti je iz teme %{count} kojoj je dodijeljen?"
         few: "Jeste li sigurni da želite izbrisati ovu oznaku i ukloniti je iz tema {{count}} kojima je dodijeljena?"
         other: "Jeste li sigurni da želite izbrisati ovu oznaku i ukloniti je iz tema {{count}} kojima je dodijeljena?"
       delete_confirm_no_topics: "Jeste li sigurni da želite izbrisati ovu oznaku?"
+      delete_confirm_synonyms:
+        one: "Pripadajući sinonim će također biti obrisan."
+        few: "Pripadajućih {{count}} sinonima će također biti obrisano."
+        other: "Pripadajućih {{count}} sinonima će također biti obrisano."
       rename_tag: "Promjeni ime Oznake"
       rename_instructions: "Odaberite novo ime za oznaku:"
       sort_by: "Sortiraj po:"
@@ -2854,6 +2967,7 @@ bs_BA:
           description: "You will be notified only if someone mentions your @name or replies to your post."
         muted:
           title: "Utišan"
+          description: "Nećete bit obavješteni bilo čime o ovoj temi sa ovom oznakom, i neće se pojavljivati na tabularu nepročitanih tema."
       groups:
         title: "Označite grupe"
         about: "Dodajte oznake grupama da biste ih lakše upravljali."
@@ -2865,6 +2979,7 @@ bs_BA:
         parent_tag_description: "Oznake iz ove grupe ne mogu se koristiti ako roditeljska oznaka nije prisutna."
         one_per_topic_label: "Ograničite jednu oznaku po temi iz ove grupe"
         new_name: "Nova Grupa Oznaka"
+        name_placeholder: "Ime grupe oznaka"
         save: "Sačuvaj"
         delete: "Delete"
         confirm_delete: "Jeste li sigurni da želite izbrisati ovu grupu oznaka?"
@@ -4123,11 +4238,14 @@ bs_BA:
           filter: "Pretraga (URL ili vanjski URL)"
       reseed:
         modal:
+          title: "Zamijeni tekst"
           categories: "Kategorije"
           topics: "Teme"
+          replace: "Zamijeni"
   wizard_js:
     wizard:
       done: "Urađeno"
+      finish: "Završi"
       back: "Prethodno"
       next: "Iduće"
       step: "%{current} od %{total}"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 0f69a6d177..74b0aab013 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -1230,9 +1230,6 @@ ca:
       enabled: "El lloc web és en mode només de lectura. Continueu navegant, però de moment estan desactivades les accions de respondre, 'm'agrada' i altres."
       login_disabled: "S'ha desactivat l'inici de sessió mentre aquest lloc web es trobi en mode només de lectura."
       logout_disabled: "S'ha desactivat el tancament de sessió mentre aquest lloc web es trobi en mode només de lectura."
-    too_few_topics_and_posts_notice: "Comencem <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>la discussió!</a> Hi ha <strong>%{currentTopics}</strong> temes i <strong>%{currentPosts}</strong> publicacions. Els visitants en necessiten més per a llegir i respondre. Recomanem almenys <strong>%{requiredTopics}</strong> temes i <strong>%{requiredPosts}</strong> publicacions. Sols l'equip responsable pot veure aquest missatge."
-    too_few_topics_notice: "Comencem <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>la discussió!</a> Hi ha <strong>%{currentTopics} / </strong> temes. Els visitants en necessiten més per a llegir i respondre. Recomanem almenys <strong>%{requiredTopics}</strong> temes. Sols l'equip responsable pot veure aquest missatge."
-    too_few_posts_notice: "Comencem <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>la discussió!</a> Hi ha <strong>%{currentPosts} </strong> publicacions. Els visitants en necessiten més per a llegir i respondre.  Recomanem almenys <strong>%{requiredPosts}</strong> publicacions. Sols l'equip responsable pot veure aquest missatge."
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, one {# error/hora} other {# errors/hora} </a> s'ha arribat al límit de configuració del lloc web de {limit, plural, one {# error/hora} other {# errors/hora}}."
       reached_minute_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, one {# error/minut} other {# errors/minut}}</a> s'ha arribat al límit de configuració del lloc web de {limit, plural, one {# error/minut} other {# errors/minut}}."
@@ -2562,6 +2559,7 @@ ca:
         help: "Aquest tema no és visible; no es mostrarà en la llista de temes i només és accessible amb un enllaç directe."
       personal_message:
         title: "Aquest tema és un missatge personal"
+        help: "Aquest tema és un missatge personal"
     posts: "Publicacions"
     posts_long: "hi ha {{number}} publicacions a aquest tema"
     posts_likes_MF: |
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 8af7ff9135..87ac724689 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -2539,6 +2539,7 @@ da:
         help: "Dette emne er ulistet; det vil ikke blive vist i listen over emner og kan kun tilgås med et direkte link"
       personal_message:
         title: "Dette emne er en privat besked"
+        help: "Dette emne er en privat besked"
     posts: "Indlæg"
     posts_long: "{{number}} indlæg i dette emne"
     posts_likes_MF: |
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 66f021b825..d39417f661 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -153,6 +153,7 @@ de:
       banner:
         enabled: "hat dieses Banner erstellt, %{when}. Es wird oberhalb jeder Seite angezeigt, bis es vom Benutzer weggeklickt wird."
         disabled: "hat dieses Banner entfernt, %{when}. Es wird nicht mehr oberhalb jeder Seite angezeigt."
+      forwarded: "hat die obige E-Mail weitergeleitet"
     topic_admin_menu: "Themen Aktionen"
     wizard_required: "Willkommen bei deinem neuen Discourse! Lass uns mit dem <a href='%{url}' data-auto-route='true'>Setup-Assistenten</a> ✨ starten"
     emails_are_disabled: "Die ausgehende E-Mail-Kommunikation wurde von einem Administrator global deaktiviert. Es werden keinerlei Benachrichtigungen per E-Mail verschickt."
@@ -579,6 +580,7 @@ de:
       request: "Anfrage"
       message: "Nachricht"
       confirm_leave: "Willst du die Gruppe wirklich verlassen?"
+      allow_membership_requests: "Erlaube Benutzern, Mitgliedschaftsanfragen an Gruppenbesitzer zu senden (erfordert, öffentlich sichtbare Gruppen)"
       membership_request_template: "Benutzerdefinierte Vorlage, das Benutzern angezeigt wird, die eine Mitgliedschaftsanfrage senden"
       membership_request:
         submit: "Anfrage abschicken"
@@ -1259,9 +1261,8 @@ de:
       enabled: "Diese Website befindet sich im Nur-Lesen-Modus. Du kannst weiterhin Inhalte lesen, aber das Erstellen von Beiträgen, Vergeben von Likes und Durchführen einiger weiterer Aktionen ist derzeit nicht möglich."
       login_disabled: "Die Anmeldung ist deaktiviert während sich die Website im Nur-Lesen-Modus befindet."
       logout_disabled: "Die Abmeldung ist deaktiviert während sich die Website im Nur-Lesen-Modus befindet."
-    too_few_topics_and_posts_notice: "Lass <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>die Diskussion beginnen!</a> Es gibt <strong>%{currentTopics}</strong> Themen und <strong>%{currentPosts}</strong> Beiträge. Besucher brauchen mehr zum Lesen und Beantworten – wir empfehlen mindestens <strong>%{requiredTopics}</strong> Themen und <strong>%{requiredPosts}</strong> Beiträge. Diese Nachricht ist nur für das Team sichtbar."
-    too_few_topics_notice: "Lass <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>die Diskussion beginnen!</a> Es gibt <strong>%{currentTopics}</strong> Themen. Besucher brauchen mehr zum Lesen und Beantworten – wir empfehlen mindestens <strong>%{requiredTopics}</strong> Themen. Diese Nachricht ist nur für das Team sichtbar."
-    too_few_posts_notice: "Lass <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>die Diskussion beginnen!</a> Es gibt <strong>%{currentPosts}</strong> Beiträge. Besucher brauchen mehr zum Lesen und Beantworten – wir empfehlen mindestens <strong>%{requiredPosts}</strong> Beiträge. Diese Nachricht ist nur für das Team sichtbar."
+    too_few_topics_and_posts_notice_MF: >-
+      Lass' <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">die Diskussion beginnen!</a> Es {currentTopics, plural, one {ist <strong>#</strong> Thema} other {sind <strong>#</strong> Themen}} und {currentPosts, plural, one {<strong>#</strong> Beitrag} other {<strong>#</strong> Beiträge}} vorhanden. Besucher brauchen mehr zum Lesen und Beantworten – wir empfehlen mindestens {requiredTopics, plural, one {<strong>#</strong> Thema} other {<strong>#</strong> Themen}} und {requiredPosts, plural, one {<strong>#</strong> Beitrag} other {<strong>#</strong> Beiträge}}. Dieser Hinweis wird nur Teammitgliedern gezeigt.
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# Fehler/Stunde} other {# errors/hour}}</a> hat die Grenze der Webseiten-Einstellung von {limit, plural, one {# Fehler/Stunde} other {# Fehler/Stunde}} erreicht."
       reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# Fehler/Minute} other {# Fehler/Minute}}</a> hat die Grenze der Webseiten-Einstellung von {limit, plural, one {# Fehler/Minute} other {# Fehler/Minute}} erreicht."
@@ -1332,6 +1333,8 @@ de:
       reset: "Passwort zurücksetzen"
       complete_username: "Wenn ein Benutzerkonto dem Benutzernamen <b>%{username}</b> entspricht, solltest du in Kürze eine E-Mail mit Anweisungen zum Zurücksetzen deines Passwortes erhalten."
       complete_email: "Wenn ein Benutzerkonto der E-Mail <b>%{email}</b> entspricht, solltest du in Kürze eine E-Mail mit Anweisungen zum Zurücksetzen deines Passwortes erhalten."
+      complete_username_found: "Wir haben ein zum Benutzernamen %{username} gehörendes Konto gefunden. Du solltest in Kürze eine E-Mail mit Anweisungen zum Zurücksetzen deines Passwortes erhalten. "
+      complete_email_found: "Wir haben ein zu %{email} gehörendes Benutzerkonto gefunden. Du solltest in Kürze eine E-Mail mit Anweisungen zum Zurücksetzen deines Passwortes erhalten. "
       complete_username_not_found: "Es gibt kein Konto mit dem Benutzernamen <b>%{username}</b>"
       complete_email_not_found: "Es gibt kein Benutzerkonto für <b>%{email}</b>"
       help: "E-Mail nicht angekommen? Bitte prüfe zuerst deinen Spam-Ordner. <p>Nicht sicher, welche E-Mail-Adresse du verwendet hast? Gib eine E-Mail-Adresse ein und wir werden dir sagen, ob sie hier existiert.</p><p>Falls du keinen Zugriff mehr auf die hinterlegte E-Mail-Adresse deines Kontos hast, kontaktiere bitte <a href='%{basePath}/about'>unser hilfsbereites Team. </a></p>"
@@ -1464,6 +1467,7 @@ de:
       min_content_not_reached:
         one: "Wähle mindestens einen Eintrag aus."
         other: "Wähle mindestens {{count}} Einträge aus."
+      invalid_selection_length: "Es müssen wenigstens{{count}} Zeichen markiert sein."
     date_time_picker:
       from: Von
       to: An
@@ -1553,6 +1557,7 @@ de:
       view_new_post: "Sieh deinen neuen Beitrag an."
       saving: "Wird gespeichert"
       saved: "Gespeichert!"
+      saved_draft: "Beitrags-Entwurf vorhanden. Tippen, um fortzusetzen."
       uploading: "Wird hochgeladen…"
       show_preview: "Vorschau anzeigen &raquo;"
       hide_preview: "&laquo; Vorschau ausblenden"
@@ -1602,6 +1607,7 @@ de:
         reply_as_new_topic:
           label: Antworte als verknüpftes Thema
           desc: "Erstelle ein neues Thema, das auf dieses Thema verweist"
+          confirm: "Du hast einen neuen Themen-Entwurf gespeichert. Wenn du ein verlinktes Thema erstellst, wird er überschrieben."
         reply_as_private_message:
           label: Neue Nachricht
           desc: Erstelle eine neue Nachricht
@@ -2414,6 +2420,10 @@ de:
         name: "Name"
         name_placeholder: "Gib dem Lesezeichen einen Namen, um dein Gedächtnis zu unterstützen"
         set_reminder: "Erstelle eine Erinnerung"
+        actions:
+          delete_bookmark:
+            name: "Lesezeichen löschen"
+            description: "Entfernt das Lesezeichen von deinem Profil und beendet alle Erinnerungen für dieses Lesezeichen"
     category:
       can: "kann&hellip; "
       none: "(keine Kategorie)"
@@ -2615,6 +2625,7 @@ de:
         help: "Dieses Thema ist unsichtbar. Es wird in keiner Themenliste angezeigt und kann nur mit einem direkten Link betrachtet werden."
       personal_message:
         title: "Dieses Thema ist eine persönliche Nachricht"
+        help: "Dieses Thema ist eine persönliche Nachricht"
     posts: "Beiträge"
     posts_long: "dieses Thema enthält {{number}} Beiträge"
     posts_likes_MF: |
@@ -2834,6 +2845,7 @@ de:
       choose_for_topic: "optionale Schlagwörter"
       info: "Info"
       default_info: "Dieses Schlagwort ist nicht auf Kategorien beschränkt und hat keine Synonyme."
+      category_restricted: "Dieser Tag ist auf Kategorien begrenzt, für die du keine Zugriffsberechtigung hast."
       synonyms: "Synonyme"
       synonyms_description: "Wenn die folgenden Schlagwörter verwendet werden, werden sie durch <b>%{base_tag_name} </b> ersetzt."
       tag_groups_info:
@@ -4202,7 +4214,8 @@ de:
           description: Das gleiche Abzeichen vielen Benutzern auf einmal verleihen.
           no_badge_selected: "Bitte wähle ein Abzeichen, um anzufangen."
           perform: "Verleihe Abzeichen an Benutzer"
-          success: Deine CSV Datei wurde empfangen und die Benutzer werden ihr Abzeichen in Kürzle bekommen.
+          upload_csv: Lade eine CSV-Datei mit entweder den E-Mail Adressen oder den Benutzernamen hoch
+          success: Deine CSV Datei wurde empfangen und die Benutzer werden ihr Abzeichen in Kürze bekommen.
           replace_owners: Entferne das Abzeichen von vorherigen Eigentümern
       emoji:
         title: "Emoji"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 78d165658c..f103b397ae 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -1261,9 +1261,6 @@ es:
       enabled: "Este sitio está en modo de solo lectura. Puedes continuar navegando pero algunas acciones como responder o dar me gusta no están disponibles por ahora."
       login_disabled: "Iniciar sesión está desactivado mientras el foro se encuentre en modo de solo lectura."
       logout_disabled: "Cerrar sesión está desactivado mientras el sitio se encuentre en modo de solo lectura."
-    too_few_topics_and_posts_notice: "<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>¡Comencemos la discusión!</a> Hay <strong>%{currentTopics}</strong> temas y <strong>%{currentPosts}</strong> publicaciones. Los visitantes necesitan más cosas para leer y responder. Recomendamos al menos <strong>%{requiredTopics}</strong> temas y <strong>%{requiredPosts}</strong> publicaciones. Solo el staff puede ver este mensaje."
-    too_few_topics_notice: "<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>¡Comencemos la discusión!</a> Hay <strong>%{currentTopics}</strong> temas. Los visitantes necesitan más cosas para leer y responder. Recomendamos al menos <strong>%{requiredTopics}</strong> temas. Solo el staff puede ver este mensaje."
-    too_few_posts_notice: "<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>¡Comencemos la discusión!</a> Hay <strong>%{currentPosts}</strong> publicaciones. Los visitantes necesitan más cosas para leer y responder. Recomendamos al menos <strong>%{requiredPosts}</strong> publicaciones. Solo el staff puede ver este mensaje."
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} otros {# errors/hour}}</a> alcanzó el límite de la configuración del sitio de {limit, plural, one {# error/hour} otros {# errors/hour}}."
       reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} otros {# errors/minute}}</a> alcanzó el límite de la configuración del sitio de {limit, plural, one {# error/minute} otros {# errors/minute}}."
@@ -2626,6 +2623,7 @@ es:
         help: "Este tema es invisible. No se mostrará en la lista de temas y solo se le puede acceder mediante un enlace directo"
       personal_message:
         title: "Este tema es un mensaje personal"
+        help: "Este tema es un mensaje personal"
     posts: "Publicaciones"
     posts_long: "Hay {{number}} publicaciones en este tema"
     posts_likes_MF: |
@@ -4218,8 +4216,8 @@ es:
           description: Concede la misma medalla a muchos usuarios a la vez.
           no_badge_selected: "Por favor, selecciona una medalla para empezar."
           perform: "Conceder medalla 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.
+          upload_csv: Sube un archivo CSV con correos electrónicos o nombres de usuario
+          aborted: "Por favor, sube un archivo CSV que contenga correos electrónicos o nombres de usuario"
           success: Se recibió el CSV y los usuarios recibirán la medalla dentro de poco.
           replace_owners: Quitar medalla de los anteriores portadores
       emoji:
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 50bbf323e2..2cae3f58ea 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -27,6 +27,7 @@ fa_IR:
         millions: "{{number}} میلیون"
     dates:
       time: "h:mm a"
+      time_short_day: "h:mm a"
       timeline_date: "MMM YYYY"
       long_no_year: "MMM D h:mm a"
       long_no_year_no_time: "MMM D"
@@ -152,6 +153,8 @@ fa_IR:
       banner:
         enabled: "این در %{when} یک بنر شد، تا زمانی که کاربر آن را ببندد بالای صفحه خواهد ماند."
         disabled: "این بنر در %{when} حذف شده. و دیگر در بالای صفحات نمایش داده نمی‌شود."
+      forwarded: "ایمیل بالا را ارسال کرد"
+    topic_admin_menu: "اقدامات موضوع"
     wizard_required: "به دیسکورس خوش آمدید! برای شروع نصب <a href='%{url}' data-auto-route='true'>کلیک کنید</a> ✨"
     emails_are_disabled: "تمام ایمیل های خروجی بصورت کلی توسط مدیر قطع شده است. هیچگونه ایمیل اگاه سازی ارسال نخواهد شد."
     bootstrap_mode_enabled: "برای راه‌اندازی راحت‌تر سایت جدید، حالت خود‌راه‌انداز فعال شده. به تمام کاربران سطح اعتماد 1 اعطا می‌شود و ایمیل خلاصه روزانه به صورت پیشفرض برای ایشان فعال می‌شود. این امکان بصورت خودکار وقتی تعداد کاربران از %{min_users} بیشتر شود، غیر فعال خواهد شد."
@@ -261,9 +264,19 @@ fa_IR:
     bookmarks:
       created: "شما این نوشته را نشانک زده‌اید"
       not_bookmarked: "این نوشته را نشانک بزنید"
+      created_with_reminder: "شما بر روی این پست نشانک همراه با یادآوری گذاشته اید در %{date}"
       remove: "پاک کردن نشانک"
       confirm_clear: "آیا مطمئنید می‌خواهید همه‌ی نشانک‌های خود را از این موضوع پاک کنید؟"
       save: "ذخیره"
+      no_timezone: 'شما هنوز منطقه زمانی مشخص نکرده اید. شما قادر به تنظیم کردن یادآوری نیستید. یکی را در <a href="%{basePath}/my/preferences/profile"> پروفایل تان </a> تنظیم کنید.'
+      reminders:
+        at_desktop: "بار آینده من پشت میزم هستم"
+        later_today: "امروز کمی بعد <br/>{{date}}"
+        next_business_day: "روز کاری آینده <br/>{{date}}"
+        tomorrow: "فردا <br/>{{date}}"
+        next_week: "هفته ی آینده <br/>{{date}}"
+        next_month: "ماه آینده <br/>{{date}}"
+        custom: "درج تاریخ و ساعت"
     drafts:
       resume: "از سر گیری"
       remove: "پاک کردن"
@@ -309,19 +322,37 @@ fa_IR:
       install_banner: "ایامایل هستید تا <a href>، %{title} را بر‌روی دستگاه شما نصب کند؟</a>"
     choose_topic:
       none_found: "موضوعی یافت نشد."
+      title:
+        search: "جستجوی یک موضوع"
+        placeholder: "جستجوی بر اساس عنوان، لینک و یا آیدی"
     choose_message:
       none_found: "پیامی پیدا نشد"
+      title:
+        search: "جستجو برای یک پیام"
+        placeholder: "عنوان پیام، لینک و یا آیدی آن را اینجا وارد کنید"
     review:
       order_by: "به ترتیب"
       in_reply_to: "در پاسخ به"
       explain:
         why: "توضیح دهید که چرا این مورد در صف پایان یافت"
+        title: "امتیازدهی قابل تجدید نظر"
         formula: "فرمول"
+        subtotal: "جمع جزء"
         total: "مجموع"
+        min_score_visibility: "حداقل امتیاز برای دیده شدن"
+        score_to_hide: "امتیاز برای پنهان کردن پست"
+        take_action_bonus:
+          name: "اقدام كرد"
+          title: "زمانی که یکی از کارمندان انتخاب می کند که اقدام کند، پرچم یک امتیاز می دهد."
         user_accuracy_bonus:
           name: "دقت کاربر"
+          title: "کاربرانی که پرچم آن ها به طور گروهی پذیرفته شده است، یک امتیاز دریافت می کنند."
         trust_level_bonus:
           name: "سطح اعتماد"
+          title: "موارد قابل بررسی که توسط کاربرانی با میزان اعتماد بیشتر ایجاد شده اند، اولویت بالاتری دارند."
+        type_bonus:
+          name: "امتیاز را وارد کنید"
+          title: "موارد قابل بررسی خاص می توانند کارمندان دارای امتیاز شوند تا اولویت آن ها را بیشتر کند."
       claim_help:
         optional: "می‌توانید این مورد را درخواست کنید تا دیگران را از بازنگری آن بازنگه دارید."
         required: "شما قبل از بازنگری موارد باید آن‌ها را درخواست دهید ."
@@ -355,6 +386,8 @@ fa_IR:
       deleted_post: "(نوشته حذف شده)"
       deleted_user: "(کاربر حذف شده)"
       user:
+        bio: "بیوگرافی"
+        website: "وبسایت"
         username: "نام‌کاربری"
         email: "ایمیل"
         name: "نام"
@@ -546,6 +579,8 @@ fa_IR:
       leave: "ترک کردن"
       request: "درخواست"
       message: "پیام"
+      confirm_leave: "آیا از ترک این گروه مطمئن هستید؟"
+      allow_membership_requests: "به کاربرها اجازه ی ارسال درخواست عضویت به صاحبان گروه را بدهید\n(گروه باید برای عموم قابل دیدن باشد)"
       membership_request_template: "الگوی سفارشی برای نمایش به کاربران هنگام ارسال درخواست عضویت"
       membership_request:
         submit: "ارسال درخواست"
@@ -724,14 +759,19 @@ fa_IR:
       activity_stream: "فعالیت"
       preferences: "تنظیمات"
       feature_topic_on_profile:
+        open_search: "انتخاب یک موضوع نو"
+        title: "انتخاب یک موضوع"
+        search_label: "جستجوی یک موضوع بر اساس عنوان"
         save: "ذخیره"
         clear:
           title: "واضح"
+          warning: "آیا از پاکسازی موضوع برجسته ی خود مطمئن هستید؟"
       profile_hidden: "صفحه نمایه این کاربر مخفی است"
       expand_profile: "باز کردن"
       collapse_profile: "جمع کردن"
       bookmarks: "نشانک‌ها"
       bio: "درباره من"
+      timezone: "منطقه ی زمانی"
       invited_by: "دعوت شده توسط"
       trust_level: "سطح اعتماد"
       notifications: "آگاه‌سازی‌ها"
@@ -758,6 +798,7 @@ fa_IR:
       enable_quoting: "فعال کردن نقل قول گرفتن از متن انتخاب شده"
       enable_defer: "تاخیر را برای علامت زدن مباحث به عنوان خوانده نشده فعال کن"
       change: "تغییر"
+      featured_topic: "مبحث برجسته"
       moderator: "{{user}} یک مدیر است"
       admin: "{{user}} یک مدیر ارشد است"
       moderator_tooltip: "این کاربر یک مدیر است"
@@ -865,6 +906,7 @@ fa_IR:
         copied_to_clipboard: "کپی شد"
         copy_to_clipboard_error: "خطا در کپی اطلاعات"
         remaining_codes: "شما <strong>{{count}}</strong>کد پشتیبان باقی مانده دارید."
+        use: "از کد پشتیبان استفاده کنید"
         enable_prerequisites: "شما باید قبل از ساخت کد‌های پشتیبانی یک تایید هویت دوعاملی اصلی را فعال کنید "
         codes:
           title: "کد پشتیبان تولید شد"
@@ -872,6 +914,7 @@ fa_IR:
       second_factor:
         title: "احراز هویت دو مرحله ای"
         enable: "مدیریت تایید هوییت دوعاملی"
+        forgot_password: "فراموشی گذرواژه؟"
         confirm_password_description: "لطفا رمز عبور خود را تایید کنید تا ادامه دهیم."
         name: "نام"
         label: "کد"
@@ -885,6 +928,7 @@ fa_IR:
         extended_description: |
           احراز هویت دو عامله امنیت بیشتری به حساب کاربری شما میدهد، چرا که یک توکن یک بار مصرف علاوه بر رمز عبور خود خواهید داشت. توکن ها در ابزارهای <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>اندروید</a> و <a href="https://www.google.com/search?q=authenticator+apps+for+ios">IOS</a> قابل تولید هستند.
         oauth_enabled_warning: "دقت کنید وقتی احراز هویت دوعامله فعال شود، ورود با حساب شبکه های اجتماعی به حساب کاربری شما از کار میفتد."
+        use: "از اپلیکیشن احراز هویت استفاده کنید"
         enforced_notice: "شما باید احراز هویت دو عامله را قبل از دسترسی به سایت فعال کنید"
         disable: "غیرفعال"
         disable_title: "غیر فعال کردن تایید دوعاملی"
@@ -933,6 +977,8 @@ fa_IR:
       change_card_background:
         title: "پس زمینه کارت کابر"
         instructions: "تصاویر پس زمینه در مرکز قرار خواهند گرفت و عرض پیشفرض آن 590 پیکسل است"
+      change_featured_topic:
+        title: "مبحث برجسته"
       email:
         title: "ایمیل"
         primary: "آدرس ایمیل اصلی"
@@ -2475,6 +2521,7 @@ fa_IR:
         help: "این موضوع از فهرست خارج شد؛ و در فهرست موضوعات نمایش داده نخواهد شد، و فقط از طریق لینک مستقیم در دسترس خواهد بود. "
       personal_message:
         title: "این تاپیک یک پیام‌خصوصی است"
+        help: "این تاپیک یک پیام‌خصوصی است"
     posts: "نوشته‌ها"
     posts_long: "این موضوع {{number}} نوشته دارد"
     posts_likes_MF: |
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 2f9baea226..7b4b32cd72 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -1260,9 +1260,6 @@ fi:
       enabled: "Sivusto on vain luku -tilassa. Voit jatkaa selailua, mutta vastaaminen, tykkääminen ja muita toimintoja on toistaiseksi poissa käytöstä."
       login_disabled: "Et voi kirjautua sisään, kun sivusto on vain luku -tilassa."
       logout_disabled: "Et voi kirjautua ulos, kun sivusto on vain luku -tilassa."
-    too_few_topics_and_posts_notice: "Laitetaanpa <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentTopics}</strong> ketjua ja <strong>%{currentPosts}</strong> viestiä. Uusia kävijöitä varten tarvitaan lisää keskusteluita, joita voivat lukea ja joihin vastata. Suosittelemme vähintään <strong>%{requiredTopics}</strong> ketjua ja <strong>%{requiredPosts}</strong> viestiä. Vain henkilökunta näkee tämän viestin."
-    too_few_topics_notice: "Laitetaanpa <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentTopics}</strong> ketjua. Uusia kävijöitä varten tarvitaan lisää keskusteluita, joita voivat lukea ja joihin vastata. Suosittelemme vähintään <strong>%{requiredTopics}</strong> ketjua. Vain henkilökunta näkee tämän viestin."
-    too_few_posts_notice: "Laitetaanpa <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentPosts}</strong> viestiä. Uusia kävijöitä varten tarvitaan lisää keskusteluita, joita voivat lukea ja joihin vastata. Suosittelemme vähintään <strong>%{requiredPosts}</strong> viestiä. Vain henkilökunta näkee tämän viestin."
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# virhe/tunti} other {# virhettä/tunti}}</a> saavutti sivustoasetuskynnyksen {limit, plural, one {# virhe/tunti} other {# virhettä/tunti}}."
       reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# virhe/minuutti} other {# virhettä/minuutti}}</a> saavutti sivustoasetuskynnyksen {limit, plural, one {# virhe/minuutti} other {# virhettä/minuutti}}."
@@ -2625,6 +2622,7 @@ fi:
         help: "Tämä ketju on poistettu listauksista; sitä ei näytetä ketjulistauksissa vaan siihen pääsee vain suoran linkin kautta"
       personal_message:
         title: "Tämä ketju on yksityiskeskustelu"
+        help: "Tämä ketju on yksityiskeskustelu"
     posts: "Viestejä"
     posts_long: "tässä ketjussa on {{number}} viestiä"
     posts_likes_MF: |
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 253b3c6321..a4f35a7890 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -1262,9 +1262,6 @@ fr:
       enabled: "Le site est en mode lecture seule. Vous pouvez continer à naviguer, mais les réponses, J'aime et autre interactions sont désactivées pour l'instant."
       login_disabled: "La connexion est désactivée quand le site est en lecture seule."
       logout_disabled: "La déconnexion est désactivée quand le site est en lecture seule."
-    too_few_topics_and_posts_notice: "<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>Commençons la discussion!</a> Il y a <strong> / %{currentTopics}</strong> sujets et <strong>%{currentPosts}</strong> messages. Les visiteurs ont besoin de plus à consulter et répondre – <strong>%{requiredTopics}</strong> sujets et <strong>%{requiredPosts}</strong> messages sont recommandés. Seul le personnel peut voir ce message."
-    too_few_topics_notice: "<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>Commençons la discussion!</a> Il y a <strong> / %{currentTopics}</strong> sujets. Les visiteurs ont besoin de plus à consulter et répondre – <strong>%{requiredTopics}</strong> sujets sont recommandés. Seul le personnel peut voir ce message."
-    too_few_posts_notice: "<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>Commençons la discussion!</a> Il y a <strong> / %{currentPosts}</strong> messages. Les visiteurs ont besoin de plus à consulter et répondre – <strong>%{requiredPosts}</strong> messages sont recommandés. Seul le personnel peut voir ce message."
     logs_error_rate_notice:
       reached_hour_MF: "{relativeAge} – {rate, plural, one {# erreur/heure} other {# erreurs/heure}} arrive à la limite paramétrée de {limit, plural, one {# erreur/heure} other {# erreurs/heure}}."
       reached_minute_MF: "{relativeAge} – {rate, plural, one {# erreur/minute} other {# erreurs/minute}} arrive à la limite paramétrée de {limit, plural, one {# erreur/minute} other {# erreurs/minute}}."
@@ -2625,6 +2622,7 @@ fr:
         help: "Ce sujet n'apparait plus dans la liste des sujets et sera seulement accessible via un lien direct"
       personal_message:
         title: "Ce sujet est un message personnel"
+        help: "Ce sujet est un message personnel"
     posts: "Messages"
     posts_long: "il y a {{number}} messages dans ce sujet"
     posts_likes_MF: |2
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 852a7968bf..c6c9b2b68e 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -302,7 +302,7 @@ he:
       user_count: "משתמשים"
       active_user_count: "משתמשים פעילים"
       contact: "יצירת קשר"
-      contact_info: "במקרה של ארוע קריטי או דחוף המשפיע על האתר, נא ליצור אתנו קשר דרך: %{contact_info}."
+      contact_info: "במקרה של בעיה קריטית או דחופה המשפיעה על אתר זה, נא ליצור אתנו קשר דרך: %{contact_info}."
     bookmarked:
       title: "סימנייה"
       clear_bookmarks: "מחיקת סימניות"
@@ -332,24 +332,24 @@ he:
       new_private_message: "טיוטת הודעה פרטית חדשה"
       topic_reply: "טיוטת תשובה"
       abandon:
-        confirm: "כבר קיימת טיוטה בנושא זה, האם את/ה בטוח/ה שאת/ה רוצה לזנוח אותה?"
-        yes_value: "כן, נטוש"
+        confirm: "כבר קיימת טיוטה בנושא זה. לנטוש אותה?"
+        yes_value: "כן, לנטוש"
         no_value: "לא, שמור"
     topic_count_latest:
-      one: "ראה נושא {{count}} חדש או מעודכן"
-      two: "ראה {{count}} נושאים חדשים או מעודכנים"
-      many: "ראה {{count}} נושאים חדשים או מעודכנים"
-      other: "ראה {{count}} נושאים חדשים או מעודכנים"
+      one: "הצגת נושא {{count}} חדש או עדכני"
+      two: "הצגת {{count}} נושאים חדשים או עדכניים"
+      many: "הצגת {{count}} נושאים חדשים או עדכניים"
+      other: "הצגת {{count}} נושאים חדשים או עדכניים"
     topic_count_unread:
-      one: "ראה נושא {{count}} שלא נקרא"
-      two: "ראה {{count}} נושאים שלא נקראו"
-      many: "ראה {{count}} נושאים שלא נקראו"
-      other: "ראה {{count}} נושאים שלא נקראו"
+      one: "הצגת נושא {{count}} שלא נקרא"
+      two: "הצגת {{count}} נושאים שלא נקראו"
+      many: "הצגת {{count}} נושאים שלא נקראו"
+      other: "הצגת {{count}} נושאים שלא נקראו"
     topic_count_new:
-      one: "ראה נושא {{count}} חדש"
-      two: "ראה {{count}} נושאים חדשים"
-      many: "ראה {{count}} נושאים חדשים"
-      other: "ראה {{count}} נושאים חדשים"
+      one: "הצגת נושא {{count}} חדש"
+      two: "הצגת {{count}} נושאים חדשים"
+      many: "הצגת {{count}} נושאים חדשים"
+      other: "הצגת {{count}} נושאים חדשים"
     preview: "תצוגה מקדימה"
     cancel: "ביטול"
     save: "שמירת השינויים"
@@ -380,7 +380,7 @@ he:
         search: "חיפוש אחר נושא"
         placeholder: "נא להקליד כאן את כותרת הנושא, הכתובת או את המזהה"
     choose_message:
-      none_found: "לא נמצאו הודעות"
+      none_found: "לא נמצאו הודעות."
       title:
         search: "חיפוש אחר הודעה"
         placeholder: "נא להקליד כאן את כותרת ההודעה, הכתובת או את המזהה"
@@ -486,7 +486,7 @@ he:
         two: "{{count}} תגובות"
         many: "{{count}} תגובות"
         other: "{{count}} תגובות"
-      edit: "ערוך"
+      edit: "עריכה"
       save: "שמירה"
       cancel: "ביטול"
       new_topic: "אישור הפריט הזה ייצור נושא חדש"
@@ -512,7 +512,7 @@ he:
       conversation:
         view_full: "הצגת הדיון המלא"
       scores:
-        about: "ניקוד זה מחושב בהתאם למידת האמון של המדווח, הדיוק בדיגולים הקודמים ועדיפות הפריט המדווח."
+        about: "ניקוד זה מחושב בהתאם לדרגת האמון של המדווח, הדיוק בסימונים הקודמים ועדיפות הפריט המדווח."
         score: "ניקוד"
         date: "תאריך"
         type: "סוג"
@@ -600,7 +600,7 @@ he:
       member_added: "הוסיף"
       member_requested: "בקשה התקבלה ב־"
       add_members:
-        title: "הוסף חברים"
+        title: "הוספת חברים"
         description: "נהל את החברות של קבוצה זו"
         usernames: "שמות משתמשים"
       requests:
@@ -612,11 +612,11 @@ he:
         denied: "נדחה"
         undone: "הבקשה נמשכה"
       manage:
-        title: "נהל"
+        title: "ניהול"
         name: "שם"
         full_name: "שם מלא"
-        add_members: "הוסף חברים"
-        delete_member_confirm: "להסיר את '%{username}' מהקבוצה '%{group}'?"
+        add_members: "הוספת חברים"
+        delete_member_confirm: "להסיר את ‚%{username}’ מהקבוצה ‚%{group}’?"
         profile:
           title: פרופיל
         interaction:
@@ -655,7 +655,7 @@ he:
       allow_membership_requests: " לאפשר למשתמשים לשלוח בקשות חברות לבעלי הקבוצה (נדרשת קבוצה גלויה לכלל)"
       membership_request_template: "תבנית מותאמת אישית שתוצג למשתמשים בעת שליחת בקשת חברות"
       membership_request:
-        submit: "שלח בקשה"
+        submit: "הגשת בקשה"
         title: "בקש להצטרף ל%{group_name}"
         reason: "תן לבעלי הקבוצה לדעת למה אתה שייך לקבוצה זו"
       membership: "חברות"
@@ -811,13 +811,13 @@ he:
     user:
       said: "{{username}}:"
       profile: "פרופיל"
-      mute: "השתק"
+      mute: "השתקה"
       edit: "עריכת העדפות"
       download_archive:
         button_text: "להוריד הכל"
         confirm: "להוריד את הפוסטים שלך?"
-        success: "הורדה החלה, תקבלו הודעה כאשר התהליך הסתיים."
-        rate_limit_error: "ניתן להוריד פוסטים פעם ביום, אנא נסו שוב מחר."
+        success: "ההורדה החלה, תישלח אליך הודעה עם סיום התהליך."
+        rate_limit_error: "ניתן להוריד פוסטים פעם אחת ביום, נא לנסות שוב מחר."
       new_private_message: "הודעה חדשה"
       private_message: "הודעה"
       private_messages: "הודעות"
@@ -844,7 +844,7 @@ he:
         search_label: "חיפוש אחר נושא לפי כותרת"
         save: "שמירה"
         clear:
-          title: "נקה"
+          title: "ניקוי"
           warning: "למחוק את הנושאים המומלצים שלך?"
       profile_hidden: "הפרופיל הציבורי של משתמש זה מוסתר"
       expand_profile: "הרחב"
@@ -874,7 +874,7 @@ he:
       theme_default_on_all_devices: "הגדרת ערכת עיצוב זו כבררת המחדל לכל המכשירים שלי"
       text_size_default_on_all_devices: "הפוך את גודל הטקסט הזה לברירת המחדל בכל המכשירים שלי"
       allow_private_messages: "אפשר למשתמשים אחרים לשלוח לי הודעות פרטיות"
-      external_links_in_new_tab: "פתח את כל הקישורים החיצוניים בעמוד חדש"
+      external_links_in_new_tab: "פתיחת כל הקישורים החיצוניים בלשונית חדשה"
       enable_quoting: "הפעלת תגובת ציטוט לטקסט מסומן"
       enable_defer: "הפעלת דחייה לאחר כך כדי לסמן נושאים כלא נקראו"
       change: "שנה"
@@ -887,7 +887,7 @@ he:
       suspended_notice: "המשתמש הזה מושעה עד לתאריך: {{date}}."
       suspended_permanently: "משתמש זה מושעה."
       suspended_reason: "הסיבה: "
-      github_profile: "גיטהאב"
+      github_profile: "GitHub"
       email_activity_summary: "סיכום פעילות"
       mailing_list_mode:
         label: "מצב רשימת תפוצה"
@@ -919,12 +919,12 @@ he:
       muted_categories_instructions: "לא תקבל הודעה בנוגע לנושאים חדשים בקטגוריות אלה, והם לא יופיעו בקטגוריות או בדפים האחרונים."
       muted_categories_instructions_dont_hide: "לא תישלחנה אליך התראות על שום דבר בנוגע לנושאים בקטגוריות האלו."
       no_category_access: "בתור פיקוח יש לך גישה מוגבלת לקטגוריות, שמירה מנוטרלת."
-      delete_account: "מחק את החשבון שלי"
+      delete_account: "מחיקת החשבון שלי"
       delete_account_confirm: "להסיר את החשבון? לא ניתן לבטל פעולה זו!"
-      deleted_yourself: "חשבונך נמחק בהצלחה."
-      delete_yourself_not_allowed: "נא לפנות לחבר סגל אם ברצונך למחוק את חשבונך."
+      deleted_yourself: "החשבון שלך נמחק בהצלחה."
+      delete_yourself_not_allowed: "נא לפנות לחבר סגל אם ברצונך למחוק את החשבון שלך."
       unread_message_count: "הודעות"
-      admin_delete: "מחק"
+      admin_delete: "מחיקה"
       users: "משתמשים"
       muted_users: "מושתק"
       muted_users_instructions: "להשבית כל התראה ממשתמשים אלו"
@@ -953,10 +953,10 @@ he:
         archive: "ארכיון"
         groups: "הקבוצות שלי"
         bulk_select: "בחר הודעות"
-        move_to_inbox: "העבר לדואר נכנס"
+        move_to_inbox: "העברה לדואר נכנס"
         move_to_archive: "ארכיון"
         failed_to_move: "בעיה בהעברת ההודעות שנבחרו (אולי יש תקלה בהתחברות?)"
-        select_all: "בחרו הכל"
+        select_all: "לבחור הכול"
         tags: "תגיות"
       preferences_nav:
         account: "חשבון"
@@ -1013,7 +1013,7 @@ he:
         disable: "נטרול"
         disable_title: "נטרול אימות דו־שלבי"
         disable_confirm: "לנטרל את כל האימותים הדו־שלביים?"
-        edit: "ערוך"
+        edit: "עריכה"
         edit_title: "עריכת אימות דו־שלבי"
         edit_description: "שם אימות דו־שלבי"
         enable_security_key_description: "כשמפתח האבטחה הפיזי שלך מוכן יש ללחוץ על כפתור הרישום שלהלן."
@@ -1361,9 +1361,6 @@ he:
       enabled: "אתר זה נמצא במצב קריאה בלבד. אנא המשיכו לשוטט, אך תגובות, לייקים, ופעולות נוספות כרגע אינם מאופשרים."
       login_disabled: "הכניסה מנוטרלת בזמן שהאתר במצב קריאה בלבד."
       logout_disabled: "היציאה מנוטרלת בזמן שהאתר במצב של קריאה בלבד."
-    too_few_topics_and_posts_notice: "הבה נתחיל להתדיין! כרגע ישנם %{currentTopics} נושאים ו־<strong>%{currentPosts}</strong> פוסטים. המבקרים זקוקים ליותר תוכן כדי לקרוא ולהגיב להם - אנו ממליצים על <strong>%{requiredTopics}</strong> נושאים ו־<strong>%{requiredPosts}</strong> פוסטים לפחות. רק הסגל יכול לראות את ההודעה הזאת."
-    too_few_topics_notice: "הבה <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>נתחיל להתדיין!</a> כרגע ישנם <strong>%{currentTopics}</strong> נושאים – המבקרים זקוקים ליותר תוכן כדי להגיב - אנו ממליצים על <strong>%{requiredTopics}</strong> נושאים לפחות. רק הסגל יכול לראות את ההודעה הזאת."
-    too_few_posts_notice: "הבה <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>נתחיל להתדיין!</a> כרגע ישנם <strong>%{currentPosts}</strong> פוסטים. המבקרים זקוקים ליותר תוכן כדי להגיב - אנו ממליצים על <strong>%{requiredPosts}</strong> פוסטים לפחות. רק הסגל יכול לראות את ההודעה הזאת."
     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 {# שגיאות בדקה}}."
@@ -1381,7 +1378,7 @@ he:
     day: "יום"
     first_post: פוסט ראשון
     mute: השתק
-    unmute: בטל השתקה
+    unmute: ביטול השתקה
     last_post: פורסמו
     time_read: נקרא
     time_read_recently: "%{time_read} לאחרונה"
@@ -1414,7 +1411,7 @@ he:
     private_message_info:
       title: "הודעה"
       invite: "הזמינו אחרים..."
-      edit: "הוסף או הסר..."
+      edit: "הוספה או הסרה…"
       leave_message: "האם אתה באמת רוצה לעזוב את ההודעה הזו?"
       remove_allowed_user: "להסיר את {{name}} מהודעה זו?"
       remove_allowed_group: "להסיר את {{name}} מהודעה זו?"
@@ -1620,7 +1617,7 @@ he:
       saved_local_draft_tip: "נשמר מקומית"
       similar_topics: "הנושא שלך דומה ל..."
       drafts_offline: "טיוטות מנותקות"
-      edit_conflict: "ערוך קונפליקט."
+      edit_conflict: "עריכת סתירה"
       group_mentioned_limit: "<b>זהירות!</b> ציינת <a href='{{group_link}}'>{{group}}</a>, אך לקבוצה זו יש יותר חברים משהוגדר למנהל המערכת הגבלה של עד {{max}} משתמשים. אף אחד לא יקבל הודעה"
       group_mentioned:
         one: "על ידי אזכור {{group}}, אתם עומדים ליידע <a href='{{group_link}}'>אדם אחד</a> – אתם בטוחים?"
@@ -1652,7 +1649,7 @@ he:
       create_pm: "הודעה"
       create_whisper: "לחישה"
       create_shared_draft: "צור טיוטה משותפת"
-      edit_shared_draft: "ערוך טויטה משותפת"
+      edit_shared_draft: "עריכת טיוטה משותפת"
       title: "או לחצו Ctrl+Enter"
       users_placeholder: "הוספת משתמש"
       title_placeholder: " במשפט אחד, במה עוסק הדיון הזה?"
@@ -1709,7 +1706,7 @@ he:
       composer_actions:
         reply: השב
         draft: טיוטה
-        edit: ערוך
+        edit: עריכה
         reply_to_post:
           label: "תגובה לפוסט %{postNumber} ע\"י %{postUsername}"
           desc: תגובה לפוסט ספיציפי
@@ -1990,7 +1987,7 @@ he:
         help: "החזרת הודעה לדואר נכנס"
       edit_message:
         help: "ערוך פוסט ראשון של ההודעה"
-        title: "ערוך הודעה"
+        title: "עריכת הודעה"
       defer:
         help: "סימון כלא נקראו"
         title: "אחר כך"
@@ -2055,7 +2052,7 @@ he:
       group_join: "עליך להצטרף לקבוצה `{{name}}` כדי לצפות בנושא הזה"
       group_request_sent: "בקשת החברות שלך נשלחה לקבוצה הזו. ניידע אותך כשהיא תתקבל."
       unread_indicator: "אף אחד מהחברים לא קרא את הפוסט האחרון של הנושא הזה עדיין."
-      read_more_MF: "יש { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 שלא נקרא</a> } other { <a href='{basePath}/unread'># שלא נקראו</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ו} false {} other{}} נושא חדש <a href='{basePath}/new'>אחד</a>} other { {BOTH, select, true{ו} false {} other{}} <a href='{basePath}/new'>#</a> נושאים חדשים} } נותרים, or {CATEGORY, select, true {עיין בנושאים אחרים ב {catLink}} false {{latestLink}} other {}}"
+      read_more_MF: "יש { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 שלא נקרא</a> } other { <a href='{basePath}/unread'># שלא נקראו</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ו} false {} other{}} נושא חדש <a href='{basePath}/new'>אחד</a>} other { {BOTH, select, true{ו} false {} other{}} <a href='{basePath}/new'>#</a> נושאים חדשים} } נותרים, או {CATEGORY, select, true {עיין בנושאים אחרים ב־{catLink}} false {{latestLink}} other {}}"
       browse_all_categories: עיינו בכל הקטגוריות
       view_latest_topics: הצגת נושאים אחרונים
       suggest_create_topic: "למה לא ליצור נושא חדש?"
@@ -2616,7 +2613,7 @@ he:
       none: "(ללא קטגוריה)"
       all: "כל הקטגוריות"
       choose: "קטגוריה&hellip;"
-      edit: "ערוך"
+      edit: "עריכה"
       edit_dialog_title: "עריכה: %{categoryName}"
       view: "הצגת נושאים בקטגוריה"
       general: "כללי"
@@ -2635,7 +2632,7 @@ he:
       min_tags_from_required_group_label: "מס׳ תגיות:"
       required_tag_group_label: "קבוצת תגיות:"
       topic_featured_link_allowed: "אפשרו קישורים מומלצים בקטגוריה זו"
-      delete: "מחק קטגוריה"
+      delete: "מחיקת קטגוריה"
       create: "קטגוריה חדשה"
       create_long: "יצירת קטגוריה חדשה"
       save: "שמירת קטגוריה"
@@ -2657,7 +2654,7 @@ he:
       delete_error: "ארעה שגיאה במחיקת הקטגוריה."
       list: "הצג קטגוריות"
       no_description: "אנא הוסיפו תיאור לקטגוריה זו."
-      change_in_category_topic: "ערוך תיאור"
+      change_in_category_topic: "עריכת תיאור"
       already_used: "הצבע הזה בשימוש על ידי קטגוריה אחרת"
       security: "אבטחה"
       special_warning: "אזהרה: קטגוריה זו הגיעה מראש והגדרות האבטחה שלה אינן ניתנות לשינוי. אם אתם מעוניינים להשתמש בקטגוריה זו, מחקו אותה במקום להשתמש בה מחדש."
@@ -2679,7 +2676,7 @@ he:
       default_view: "תצוגת ברירת מחדל לנושאים:"
       default_top_period: "פרק זמן דיפולטיבי להובלה"
       allow_badges_label: "לאפשר הענקת עיטורים בקטגוריה זו"
-      edit_permissions: "ערוך הרשאות"
+      edit_permissions: "עריכת הרשאות"
       reviewable_by_group: "בנוסף לסגל, פוסטים ודגלים בקטגוריה הזאת יכולים להיות נתונים גם לסקירתם של:"
       review_group_name: "שם הקבוצה"
       require_topic_approval: "לדרוש אישור מפקח לכל הנושאים החדשים"
@@ -2822,6 +2819,7 @@ he:
         help: "נושא זה מוסתר; הוא לא יוצג ברשימות הנושאים, וזמין רק באמצעות קישור ישיר."
       personal_message:
         title: "הנושא הזה הוא הודעה אישית"
+        help: "הנושא הזה הוא הודעה אישית"
     posts: "פוסטים"
     posts_long: "יש {{number}} פוסטים בנושא הזה"
     posts_likes_MF: |
@@ -2885,10 +2883,10 @@ he:
       unread:
         title: "לא-נקראו"
         title_with_count:
-          one: "לא נקרא (%{count})"
+          one: "לא נקראה (%{count})"
           two: "לא-נקראו ({{count}})"
           many: "לא-נקראו ({{count}})"
-          other: "לא-נקראו ({{count}})"
+          other: "לא נקראו ({{count}})"
         help: "נושאים שאתם כרגע צופים או עוקבים אחריהם עם פוסטים שלא נקראו"
         lower_title_with_count:
           one: "לא נקרא (%{count})"
@@ -3097,7 +3095,7 @@ he:
       add_synonyms_failed: "לא ניתן להוסיף את התגיות הבאות בתור מילים נרדפות: <b>%{tag_names}</b>. נא לוודא שאין להן מילים נרדפות ושאינן כבר מילים נרדפות של תגית אחרת."
       remove_synonym: "הסרת מילה נרדפת"
       delete_synonym_confirm: 'למחוק את המילה הנרדפת „%{tag_name}”?'
-      delete_tag: "מחק תגית"
+      delete_tag: "מחיקת תגית"
       delete_confirm:
         one: "למחוק את התגית הזו ולהסיר אותה מהנושא אליו היא מוקצית?"
         two: "למחוק את התגית הזו ולהסיר אותה משני הנושאים אליהן היא מוקצית?"
@@ -3346,14 +3344,14 @@ he:
         primary: "קבוצה ראשית"
         no_primary: "(אין קבוצה ראשית)"
         title: "קבוצות"
-        edit: "ערוך קבוצות"
+        edit: "עריכת קבוצות"
         refresh: "רענן"
-        about: "ערוך את חברות הקבוצה שלך והשמות כאן"
+        about: "עריכת חברות הקבוצה שלך והשמות כאן"
         group_members: "חברי הקבוצה"
-        delete: "מחק"
+        delete: "מחיקה"
         delete_confirm: "להסיר קבוצה זו?"
         delete_failed: "לא ניתן להסיר קבוצה זו. אם זו קבוצה אוטומטית, היא בלתי ניתנת למחיקה."
-        delete_owner_confirm: "הסרת הרשאות מנהל עבור '%{username}'?"
+        delete_owner_confirm: "להסיר את הרשאות הניהול של ‚%{username}’?"
         add: "הוספה"
         custom: "מותאם"
         automatic: "אוטומטי"
@@ -3548,7 +3546,7 @@ he:
             title: "שליחת הודעה בדוא״ל עם קישור להורדה"
             alert: "קישור להורדת גיבוי זה נשלח אליכם."
           destroy:
-            title: "הסר את הגיבוי"
+            title: "הסרת הגיבוי"
             confirm: "להשמיד את הגיבוי הזה?"
           restore:
             is_disabled: "שחזור אינו מאופשר לפי הגדרות האתר."
@@ -3587,11 +3585,11 @@ he:
         new: "חדש"
         new_style: "סגנון חדש"
         install: "התקנה"
-        delete: "מחק"
+        delete: "מחיקה"
         delete_confirm: 'למחוק את „%{theme_name}”?'
         color: "צבע"
         opacity: "שקיפות"
-        copy: "העתק"
+        copy: "העתקה"
         copy_to_clipboard: "העתקה ללוח"
         copied_to_clipboard: "הועתק ללוח"
         copy_to_clipboard_error: "שגיאה בהעתקת מידע ללוח"
@@ -3603,7 +3601,7 @@ he:
           body: "גוף"
           none_selected: "בחרו תבנית דואר אלקטרוני לעריכה."
           revert: "ביטול שינויים"
-          revert_confirm: "האם ברצונכם לבטל את השינויים?"
+          revert_confirm: "לבטל את השינויים שלך?"
         theme:
           theme: "ערכת עיצוב"
           component: "רכיב"
@@ -3891,8 +3889,8 @@ he:
         topic_id: "זהות (ID) נושא"
         post_id: "מזהה פוסט"
         category_id: "מזהה קטגוריה"
-        delete: "מחק"
-        edit: "ערוך"
+        delete: "מחיקה"
+        edit: "עריכה"
         save: "שמור"
         screened_actions:
           block: "חסום"
@@ -3916,7 +3914,7 @@ he:
           no_previous: "אין ערך קודם."
           deleted: "אין ערך חדש. הרשומה נמחקה."
           actions:
-            delete_user: "מחק משתמש"
+            delete_user: "מחיקת משתמש"
             change_trust_level: "שנוי דרגת אמון"
             change_username: "שינוי שם משתמש/ת"
             change_site_setting: "שנוי הגדרות אתר"
@@ -4018,7 +4016,7 @@ he:
           form:
             label: "חדש:"
             ip_address: "כתובת IP"
-            add: "הוסף"
+            add: "הוספה"
             filter: "חיפוש"
           roll_up:
             text: "גלגול (Roll up)"
@@ -4085,7 +4083,7 @@ he:
         invalid: "סליחה, אך אינך מורשה להתחזות למשתמש הזה."
       users:
         title: "משתמשים"
-        create: "הוסף מנהל"
+        create: "הוספת מנהל"
         last_emailed: "נשלח בדואר אלקטרוני לאחרונה"
         not_found: "סליחה, שם המשתמש הזה אינו קיים במערכת שלנו."
         id_not_found: "מצטערים, זהות המשתמש/ת אינה קיימת במערכת שלנו."
@@ -4142,13 +4140,13 @@ he:
         silence_message_placeholder: "(להשאיר ריק כדי לשלוח את הודעת בררת המחדל)"
         suspended_until: "(עד %{until})"
         cant_suspend: "אי אפשר להשעות את המשתמש הזה."
-        delete_all_posts: "מחק את כל הפוסטים"
+        delete_all_posts: "מחיקת כל הפוסטים"
         delete_posts_progress: "פוסטים נמחקים…"
         delete_posts_failed: "אירעה תקלה בעת מחיקת הפוסטים."
         penalty_post_actions: "מה לעשות עם הפוסט המשויך?"
         penalty_post_delete: "למחוק את הפוסט"
         penalty_post_delete_replies: "למחוק את הפוסט על תגובותיו"
-        penalty_post_edit: "לערוך את הפוסט"
+        penalty_post_edit: "עריכת הפוסט"
         penalty_post_none: "לא לעשות דבר"
         penalty_count: "ספירת עונשין"
         clear_penalty_history:
@@ -4202,7 +4200,7 @@ he:
         anonymize_confirm: "<b>באמת<\\b> להפוך חשבון זה לאלמוני? פעולה זו תשנה את שם המשתמש ואת כתובת הדוא״ל ותאפס את כל נתוני הפרופיל."
         anonymize_yes: "כן, נא להפוך חשבון זה לאלמוני"
         anonymize_failed: "אירעה תקלה בהפיכת חשבון זה לאלמוני."
-        delete: "מחק משתמש/ת"
+        delete: "מחיקת משתמש"
         delete_forbidden_because_staff: "לא ניתן למחוק מנהלים ומפקחים."
         delete_posts_forbidden_because_staff: "לא ניתן להסיר את כל הפוסטים של מנהלי מערכת ומפקחים."
         delete_forbidden:
@@ -4335,7 +4333,7 @@ he:
         search: "חפשו טקסט שברצונכם לערוך"
         title: "טקסט"
         edit: "ערוך"
-        revert: "בטל שינויים"
+        revert: "ביטול שינויים"
         revert_confirm: "לבטל את השינויים שלך?"
         go_back: "חזרה לחיפוש"
         recommended: "אנו ממליצים לערוך את הטקסט הבא כדי שיתאים לצרכים שלך:"
@@ -4349,7 +4347,7 @@ he:
         title: "הגדרות"
         no_results: "לא נמצאו תוצאות."
         more_than_30_results: "יש למעלה מ־50 תוצאות. נא למקד את החיפוש שלך."
-        clear_filter: "נקה"
+        clear_filter: "ניקוי"
         add_url: "הוספת כתובת URL"
         add_host: "הוספת שרת"
         add_group: "הוספת קבוצה"
@@ -4413,7 +4411,7 @@ he:
         granted_at: הוענק ב
         reason_help: (קישור לפוסט או לנושא)
         save: שמור
-        delete: מחק
+        delete: מחיקה
         delete_confirm: "למחוק את העיטור הזה?"
         revoke: שלול
         reason: סיבה
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 3cf3589187..a58d8484b1 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -27,6 +27,7 @@ it:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
+      time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year: "D MMM h:mm a"
       long_no_year_no_time: "D MMM"
@@ -56,7 +57,7 @@ it:
           other: "%{count}m"
         about_x_hours:
           one: "%{count}ora"
-          other: "%{count}ore"
+          other: "%{count} ore"
         x_days:
           one: "%{count}giorno"
           other: "%{count}giorni"
@@ -77,7 +78,7 @@ it:
       medium:
         x_minutes:
           one: "%{count} min"
-          other: "%{count}min"
+          other: "%{count} min"
         x_hours:
           one: "%{count} ora"
           other: "%{count} ore"
@@ -88,10 +89,10 @@ it:
       medium_with_ago:
         x_minutes:
           one: "%{count} minuto fa"
-          other: "%{count}minuti fa"
+          other: "%{count} minuti fa"
         x_hours:
           one: "%{count} ora fa"
-          other: "%{count}ore fa"
+          other: "%{count} ore fa"
         x_days:
           one: "%{count} giorno fa"
           other: "%{count}giorni fa"
@@ -107,7 +108,7 @@ it:
           other: "%{count}giorni dopo"
         x_months:
           one: "%{count} mese dopo"
-          other: "%{count}mesi dopo"
+          other: "%{count} mesi dopo"
         x_years:
           one: "%{count} anno dopo"
           other: "%{count}anni dopo"
@@ -152,6 +153,8 @@ it:
       banner:
         enabled: "lo ha reso un annuncio il %{when}. Apparirà in cima ad ogni pagina finché non verrà chiuso dall'utente. "
         disabled: "ha rimosso questo banner il %{when}. Non apparirà più in cima ad ogni pagina."
+      forwarded: "inoltrato l&#39;e-mail qui sopra"
+    topic_admin_menu: "azioni argomento"
     wizard_required: "Benvenuto al tuo nuovo Discourse! Inizia la <a href='%{url}' data-auto-route='true'>procedura guidata di configurazione</a> ✨"
     emails_are_disabled: "Tutte le email in uscita sono state disabilitate a livello globale da un amministratore. Non sarà inviato nessun tipo di notifica via email."
     bootstrap_mode_enabled: "Per aiutarti ad avviare il tuo nuovo sito, adesso sei in modalità bootstrap. Tutti i nuovi utenti saranno automaticamente promossi al livello di esperienza 1 e riceveranno il riepilogo quotidiano degli aggiornamenti via email. Questa modalità sarà disattivata automaticamente quando avrai più di %{min_users}utenti iscritti."
@@ -261,9 +264,19 @@ it:
     bookmarks:
       created: "hai inserito questo messaggio nei segnalibri"
       not_bookmarked: "aggiungi ai segnalibri"
+      created_with_reminder: "hai aggiunto questo messaggio ai segnalibri con un promemoria il%{date}"
       remove: "Rimuovi Segnalibro"
       confirm_clear: "Sei certo di voler rimuovere tutti i segnalibri da questo argomento?"
       save: "Salva"
+      no_timezone: 'Non hai ancora impostato un fuso orario. Non sarai in grado di impostare promemoria. Creane uno <a href="%{basePath}/my/preferences/profile">nel tuo profilo</a> .'
+      reminders:
+        at_desktop: "La prossima volta che sarò al mio desktop"
+        later_today: "Più tardi, oggi <br/> {{date}}"
+        next_business_day: "Il prossimo giorno lavorativo <br/> {{date}}"
+        tomorrow: "Domani <br/> {{date}}"
+        next_week: "La prossima settimana <br/> {{date}}"
+        next_month: "Il prossimo mese <br/> {{date}}"
+        custom: "Data e ora personalizzate"
     drafts:
       resume: "Riprendi"
       remove: "Rimuovi"
@@ -309,8 +322,14 @@ it:
       install_banner: "Vuoi <a href>installare %{title} su questo dispositivo?</a>"
     choose_topic:
       none_found: "Nessun argomento trovato."
+      title:
+        search: "Cerca un argomento"
+        placeholder: "digita qui il titolo dell&#39;argomento, l&#39;URL o l&#39;id"
     choose_message:
       none_found: "Nessun messaggio trovato."
+      title:
+        search: "Cerca un messaggio"
+        placeholder: "digita qui il titolo del messaggio, l&#39;URL o l&#39;id"
     review:
       order_by: "Ordina per"
       in_reply_to: "in risposta a"
@@ -347,7 +366,7 @@ it:
       delete: "Elimina"
       settings:
         saved: "Salvato"
-        save_changes: "Salva Modifiche"
+        save_changes: "Salva le modifiche"
         title: "Impostazioni"
         priorities:
           title: "Priorità Revisionabili"
@@ -368,6 +387,7 @@ it:
       deleted_user: "(utente eliminato)"
       user:
         bio: "Biografia"
+        website: "Sito web"
         username: "Nome utente"
         email: "Email"
         name: "Nome"
@@ -559,6 +579,8 @@ it:
       leave: "Abbandona"
       request: "Richiesta"
       message: "Messaggio"
+      confirm_leave: "Sei sicuro di voler abbandonare questo gruppo?"
+      allow_membership_requests: "Consenti agli utenti di inviare richieste di ammissione ai proprietari dei gruppi (richiede un gruppo visibile pubblicamente)"
       membership_request_template: "Modello personalizzato da mostrare agli utenti quando inviano una richiesta di adesione"
       membership_request:
         submit: "Invia Richiesta"
@@ -737,9 +759,13 @@ it:
       activity_stream: "Attività"
       preferences: "Opzioni"
       feature_topic_on_profile:
+        open_search: "Seleziona un nuovo argomento"
+        title: "Seleziona un argomento"
+        search_label: "Cerca argomento per titolo"
         save: "Salva"
         clear:
           title: "Pulisci"
+          warning: "Sei sicuro di voler cancellare l&#39;argomento in primo piano?"
       profile_hidden: "Il profilo pubblico di questo utente è nascosto."
       expand_profile: "Espandi"
       collapse_profile: "Raggruppa"
@@ -772,6 +798,7 @@ it:
       enable_quoting: "Abilita \"rispondi quotando\" per il testo evidenziato"
       enable_defer: "Abilita il rinvio per contrassegnare gli argomenti come non letti"
       change: "cambia"
+      featured_topic: "Argomento in primo piano"
       moderator: "{{user}} è un moderatore"
       admin: "{{user}} è un amministratore"
       moderator_tooltip: "Questo utente è un moderatore"
@@ -795,7 +822,7 @@ it:
         warning: "Modalità Mailing List attiva. Le impostazioni per la notifica via email verranno ignorate."
       tag_settings: "Etichette"
       watched_tags: "Osservate"
-      watched_tags_instructions: "Osserverai automaticamente tutti gli argomenti con queste etichette. Verrai notificato di tutti i nuovi messaggi e argomenti, e accanto all'argomento apparirà anche un conteggio dei nuovi messaggi."
+      watched_tags_instructions: "Osserverai automaticamente tutti gli argomenti con questi tag. Verrai notificato di tutti i nuovi messaggi e argomenti, e accanto all'argomento apparirà anche un conteggio dei nuovi messaggi."
       tracked_tags: "Seguite"
       tracked_tags_instructions: "Seguirai automaticamente tutti gli argomenti con queste etichette. Accanto all'argomento apparirà il conteggio dei nuovi messaggi."
       muted_tags: "Silenziati"
@@ -809,8 +836,8 @@ it:
       watched_first_post_tags: "Osservando Primo Messaggio"
       watched_first_post_tags_instructions: "Riceverai la notifica per il primo messaggio di ogni nuovo argomento con queste etichette."
       muted_categories: "Silenziate"
-      muted_categories_instructions: "Non riceverai notifiche relative a nuovi Argomenti in queste Categorie, e non appariranno nella pagina delle Categorie o dei Recenti."
-      muted_categories_instructions_dont_hide: "Non riceverai alcuna notifica per i nuovi Argomenti creati in questa categoria."
+      muted_categories_instructions: "Non riceverai notifiche riguardanti i contenuti di queste categorie, e non appariranno nelle pagine delle Categorie o dei Recenti."
+      muted_categories_instructions_dont_hide: "Non riceverai alcuna notifica riguardante nuovi argomenti in queste categorie."
       no_category_access: "Come moderatore hai accesso limitato alla categoria, il salvataggio è disabilitato."
       delete_account: "Cancella il mio account"
       delete_account_confirm: "Sei sicuro di voler cancellare il tuo account in modo permanente? Questa azione non può essere annullata!"
@@ -929,7 +956,7 @@ it:
         error: "Si è verificato un errore durante la modifica del valore."
       change_username:
         title: "Cambia Utente"
-        confirm: "Sei assolutamente certo di voler cambiare il tuo nome utente?"
+        confirm: "Sei sicuro di voler davvero cambiare il tuo nome utente?"
         taken: "Spiacenti, questo nome utente è già riservato."
         invalid: "Nome utente non valido: usa solo lettere e cifre"
       change_email:
@@ -955,6 +982,9 @@ it:
       change_card_background:
         title: "Sfondo Scheda Utente"
         instructions: "Le immagini di sfondo saranno centrate e per difetto avranno un'ampiezza di 590px."
+      change_featured_topic:
+        title: "Argomento in primo piano"
+        instructions: "Un collegamento a questo argomento sarà sulla tua scheda utente e profilo."
       email:
         title: "Email"
         primary: "Email principale"
@@ -1090,6 +1120,7 @@ it:
         search: "digita per cercare inviti..."
         title: "Inviti"
         user: "Utente Invitato"
+        sent: "Ultimo inviato"
         none: "Nessun invito da visualizzare."
         truncated:
           one: "Mostro il primo invito."
@@ -2559,6 +2590,7 @@ it:
         help: "Questo argomento è invisibile; non verrà mostrato nella liste di argomenti ed è possibile accedervi solo tramite collegamento diretto"
       personal_message:
         title: "Questo Argomento è un Messaggio Personale"
+        help: "Questo Argomento è un Messaggio Personale"
     posts: "Messaggi"
     posts_long: "ci sono {{number}} messaggi in questo argomento"
     posts_likes_MF: |
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 3e3da3ffae..9cbacc231d 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -1261,9 +1261,12 @@ nl:
       enabled: "Deze website bevindt zich in alleen-lezenmodus. U kunt doorgaan met browsen, maar berichten beantwoorden, likes geven en andere acties zijn momenteel uitgeschakeld."
       login_disabled: "Aanmelden is uitgeschakeld zolang de website zich in alleen-lezenmodus bevindt."
       logout_disabled: "Afmelden is uitgeschakeld zolang de website zich in alleen-lezenmodus bevindt."
-    too_few_topics_and_posts_notice: "Laten we <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>de discussie starten!</a> Er zijn <strong>%{currentTopics}</strong> topics en <strong>%{currentPosts}</strong> berichten. Bezoekers hebben er meer nodig om te lezen en op te antwoorden – minstens <strong>%{requiredTopics}</strong> topics en <strong>%{requiredPosts}</strong> berichten wordt aanbevolen. Alleen stafleden kunnen dit bericht zien."
-    too_few_topics_notice: "Laten we <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>de discussie starten!</a> Er zijn <strong>%{currentTopics}</strong> topics. Bezoekers hebben er meer nodig om te lezen en op te antwoorden – minstens <strong>%{requiredTopics}</strong> topics wordt aanbevolen. Alleen stafleden kunnen dit bericht zien."
-    too_few_posts_notice: "Laten we <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>de discussie starten!</a> Er zijn <strong>%{currentPosts}</strong> berichten. Bezoekers hebben er meer nodig om te lezen en op te antwoorden – minstens <strong>%{requiredPosts}</strong> berichten wordt aanbevolen. Alleen stafleden kunnen dit bericht zien."
+    too_few_topics_and_posts_notice_MF: >-
+      Laten we <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">de discussie starten!</a> Er {currentTopics, plural, one {is <strong>#</strong> topic} other {zijn <strong>#</strong> topics}} en {currentPosts, plural, one {<strong>#</strong> bericht} other {<strong>#</strong> berichten}}. Bezoekers hebben er meer nodig om te lezen en op te antwoorden – minstens {requiredTopics, plural, one {<strong>#</strong> topic} other {<strong>#</strong> topics}} en {requiredPosts, plural, one {<strong>#</strong> bericht} other {<strong>#</strong> berichten}} wordt aanbevolen. Alleen stafleden kunnen dit bericht zien.
+    too_few_topics_notice_MF: >-
+      Laten we <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">de discussie starten!</a> Er {currentTopics, plural, one {is <strong>#</strong> topic} other {zijn <strong>#</strong> topics}}. Bezoekers hebben er meer nodig om te lezen en op te antwoorden – minstens {requiredTopics, plural, one {<strong>#</strong> topic} other {<strong>#</strong> topics}} wordt aanbevolen. Alleen stafleden kunnen dit bericht zien.
+    too_few_posts_notice_MF: >-
+      Laten we <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">de discussie starten!</a> Er {currentPosts, plural, one {is <strong>#</strong> bericht} other {zijn <strong>#</strong> berichten}}. Bezoekers hebben er meer nodig om te lezen en op te antwoorden – minstens {requiredPosts, plural, one {<strong>#</strong> bericht} other {<strong>#</strong> berichten}} wordt aanbevolen. Alleen stafleden kunnen dit bericht zien.
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# fout/uur} other {# fouten/uur}}</a> heeft de limiet voor de website-instelling van {limit, plural, one {# fout/uur} other {# fouten/uur}} bereikt."
       reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# fout/minuut} other {# fouten/minuut}}</a> heeft de limiet voor de website-instelling van {limit, plural, one {# fout/minuut} other {# fouten/minuut}} bereikt."
@@ -2626,6 +2629,7 @@ nl:
         help: "Dit topic is niet zichtbaar; het verschijnt niet in topiclijsten en kan alleen via een rechtstreekse koppeling worden benaderd"
       personal_message:
         title: "Dit topic is een persoonlijk bericht"
+        help: "Dit topic is een persoonlijk bericht"
     posts: "Berichten"
     posts_long: "er zijn {{number}} berichten in dit topic"
     posts_likes_MF: |
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 7f44991962..a6bfdba8c2 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -1304,9 +1304,6 @@ pl_PL:
       enabled: "Strona jest w trybie tylko-do-odczytu. Możesz nadal przeglądać serwis, ale operacje takie jak postowanie, lajkowanie i inne są wyłączone."
       login_disabled: "Logowanie jest zablokowane, gdy strona jest w trybie tylko do odczytu."
       logout_disabled: "Wylogowanie jest zablokowane gdy strona jest w trybie tylko do odczytu."
-    too_few_topics_and_posts_notice: "Rozpocznijmy <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>dyskusję!</a> Istnieje <strong>%{currentTopics}</strong> tematów i <strong>%{currentPosts}</strong> postów. Goście muszą więcej czytać i odpowiadać - zalecamy przynajmniej <strong>%{requiredTopics}</strong> tematów i <strong>%{requiredPosts}</strong> posty. Tylko pracownicy mogą zobaczyć tę wiadomość."
-    too_few_topics_notice: "Zacznijmy <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>dyskusję!</a> Jest <strong>%{currentTopics}</strong> tematów. Odwiedzający potrzebują więcej do przeczytania i odpowiedzi - zalecamy co najmniej <strong>%{requiredTopics}</strong> tematów. Tylko pracownicy mogą zobaczyć tę wiadomość."
-    too_few_posts_notice: "Zacznijmy <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>dyskusję!</a> Jest <strong>%{currentPosts}</strong> postów. Odwiedzający potrzebują więcej, aby przeczytać i odpowiedzieć - zalecamy co najmniej <strong>%{requiredPosts}</strong> postów. Tylko pracownicy mogą zobaczyć tę wiadomość."
     learn_more: "dowiedz się więcej…"
     all_time: "łącznie"
     all_time_desc: "łącznie utworzonych tematów"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index bdc87c1e8d..a792d11c64 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -1257,9 +1257,6 @@ pt_BR:
       enabled: "Este site está em modo de somente leitura. Por favor, continue a navegar, mas respostas, curtidas e outras ações estão desabilitadas por enquanto."
       login_disabled: "O login é desabilitado enquanto o site está em modo de somente leitura."
       logout_disabled: "O logout é desabilitado enquanto o site está em modo de somente leitura."
-    too_few_topics_and_posts_notice: "Vamos <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>iniciar a discussão!</a> Há <strong>%{currentTopics}</strong> tópicos e <strong>%{currentPosts}</strong> postagens. Os visitantes precisam de mais informações para ler e responder - nós recomendamos pelo menos <strong>%{requiredTopics}</strong> tópicos e <strong>%{requiredPosts}</strong> posts. Somente funcionários podem ver esta mensagem."
-    too_few_topics_notice: "Vamos <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>iniciar a discussão!</a> Há <strong>%{currentTopics}</strong> tópicos. Os visitantes precisam de mais informações para ler e responder - nós recomendamos pelo menos <strong>%{requiredTopics}</strong> tópicos. Somente funcionários podem ver esta mensagem."
-    too_few_posts_notice: "Vamos <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>inicar a discussão!</a> Há <strong>%{currentPosts}</strong> postagens. Os visitantes precisam de mais informações para ler e responder - nós recomendamos pelo menos <strong>%{requiredPosts}</strong> postagens. Somente funcionários podem ver esta mensagem."
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# erro/hora} other {# erros/hora}}</a> alcançou o limite de configuração do site de {limit, plural, one {# erro/hora} other {# erros/hora}}."
       reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# erro/minuto} other {# erros/minuto}}</a> alcançou o limite de configuração do site de {limit, plural, one {# erro/minuto} other {# erros/minuto}}."
@@ -2613,6 +2610,7 @@ pt_BR:
         help: "Este tópico não está listado; ele não será exibido em listas de tópicos e só pode ser acessado por meio de um link direto"
       personal_message:
         title: "Este tópico é uma mensagem pessoal"
+        help: "Este tópico é uma mensagem pessoal"
     posts: "Postagens"
     posts_long: "há {{number}} mensagens neste tópico"
     posts_likes_MF: |
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 987c958f7a..72064bfd92 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -426,7 +426,7 @@ ru:
           title: "Обзорные приоритеты"
       moderation_history: "История модерации"
       view_all: "Посмотреть все"
-      grouped_by_topic: "Сгруппированы по темам"
+      grouped_by_topic: "Сгруппированные по темам"
       none: "Нет элементов для премодерации."
       view_pending: "просмотр в ожидании"
       topic_has_pending:
@@ -1361,9 +1361,12 @@ ru:
       enabled: "Сайт работает в режиме \"только для чтения\". Сейчас вы можете продолжать просматривать сайт, но другие действия будут недоступны. "
       login_disabled: "Вход отключён, пока сайт в режиме «только для чтения»"
       logout_disabled: "Выход отключён, пока сайт в режиме «только для чтения»"
-    too_few_topics_and_posts_notice: "Давайте <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>приступим к обсуждению!</a> Есть <strong>%{currentTopics}</strong> тем и <strong>%{currentPosts}</strong> постов. Пользователи должны больше читать и отвечать – мы рекомендуем, по крайней мере <strong>%{requiredTopics}</strong> тем и <strong>%{requiredPosts}</strong> постов. Только сотрудники могут видеть это сообщение."
-    too_few_topics_notice: "Давайте <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>приступим к обсуждению!</a> Есть <strong>%{currentTopics}</strong> тем. Пользователи должны больше читать и отвечать – мы рекомендуем, по крайней мере <strong>%{requiredTopics}</strong> тем. Только сотрудники могут видеть это сообщение."
-    too_few_posts_notice: "Давайте <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>приступим к обсуждению!</a> Есть <strong>%{currentPosts}</strong> сообщений. Пользователям нужно больше читать и отвечать - мы рекомендуем хотя бы <strong>%{requiredPosts}</strong> сообщений. Только сотрудники могут видеть это сообщение."
+    too_few_topics_and_posts_notice_MF: >-
+      Давайте <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">приступим к обсуждению!</a> Есть {currentTopics, plural, one {<strong>#</strong> тема} few {<strong>#</strong> темы} other {<strong>#</strong> тем}} и {currentPosts, plural, one {<strong>#</strong> сообщение} few {<strong>#</strong> сообщения} other {<strong>#</strong> сообщений}}. Пользователи должны больше читать и отвечать – мы рекомендуем, по крайней мере {requiredTopics, plural, one {<strong>#</strong> тему} few {<strong>#</strong> темы} other {<strong>#</strong> тем}} и {requiredPosts, plural, one {<strong>#</strong> сообщение} few {<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, one {<strong>#</strong> тема} few {<strong>#</strong> темы} other {<strong>#</strong> тем}}. Пользователи должны больше читать и отвечать – мы рекомендуем, по крайней мере {requiredTopics, plural, one {<strong>#</strong> тему} few {<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, one {<strong>#</strong> сообщение} few {<strong>#</strong> сообщения} other {<strong>#</strong> сообщений}}. Пользователи должны больше читать и отвечать – мы рекомендуем, по крайней мере {requiredPosts, plural, one {<strong>#</strong> сообщение} few {<strong>#</strong> сообщения} other {<strong>#</strong> сообщений}}. Только сотрудники могут видеть это сообщение.
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} или {# errors/hour}}</a> достигнут предел настройки сайта {limit, plural, one {# error/hour} или {# errors/hour}}."
       reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} или {# errors/minute}}</a> достигнут предел настройки сайта {limit, plural, one {# error/minute} или {# errors/minute}}."
@@ -2055,7 +2058,7 @@ ru:
       group_join: "Вам нужно присоединиться к группе `{{name}}` чтобы увидеть эту тему."
       group_request_sent: "Ваш запрос на членство в группе был отправлен. Вам сообщат, когда  будет одобрено."
       unread_indicator: "Никто еще не дочитал до конца этой темы."
-      read_more_MF: "У вас осталось { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 непрочитанная</a> } other { <a href='{basePath}/unread'># непрочитанных</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'>1 новая</a> тема} other { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'># новых</a> тем} }, вы также можете {CATEGORY, select, true {посмотреть другие темы в разделе {catLink}} false {{latestLink}} other {}}"
+      read_more_MF: "У вас осталось { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 непрочитанная</a> } few { <a href='{basePath}/unread'>1 непрочитанные</a> } other { <a href='{basePath}/unread'># непрочитанных</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'>1 новая</a> тема} other { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'># новых</a> тем} }, вы также можете {CATEGORY, select, true {посмотреть другие темы в разделе {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Просмотреть все разделы
       view_latest_topics: посмотреть последние темы
       suggest_create_topic: "Почему бы вам не создать новую тему?"
@@ -2615,7 +2618,7 @@ ru:
       can: "может&hellip; "
       none: "(вне раздела)"
       all: "Все разделы"
-      choose: "разделе&hellip;"
+      choose: "Выберите раздел&hellip;"
       edit: "Изменить"
       edit_dialog_title: "Редактировать: %{categoryName}"
       view: "Просмотр тем по разделам"
@@ -2747,7 +2750,7 @@ ru:
       notify_action: "Сообщение"
       official_warning: "Официальное предупреждение"
       delete_spammer: "Удалить спамера"
-      delete_confirm_MF: "Вы собираетесь удалить {POSTS, plural, one {<b>1</b> сообщение} other {<b>#</b> сообщений}} и {TOPICS, plural, one {<b>1</b> тему} other {<b>#</b> темы}} этого пользователя, а так же удалить его учётную запись, добавить его IP-адрес <b>{ip_address}</b> и его почтовый адрес <b>{email}</b> в чёрный список. Вы действительно действительно ваши помыслы чисты и действия не продиктованы гневом?"
+      delete_confirm_MF: "Вы собираетесь удалить {POSTS, plural, one {<b>1</b> сообщение} few {<b>#</b> сообщения} other {<b>#</b> сообщений}} и {TOPICS, plural, one {<b>1</b> тему} few {<b>#</b> темы} other {<b>#</b> тем}} этого пользователя, а так же удалить его учётную запись, добавить его IP-адрес <b>{ip_address}</b> и его почтовый адрес <b>{email}</b> в чёрный список. Вы действительно действительно ваши помыслы чисты и действия не продиктованы гневом?"
       yes_delete_spammer: "Да, удалить спамера"
       ip_address_missing: "(не доступно)"
       hidden_email_address: "(скрыто)"
@@ -2822,10 +2825,11 @@ ru:
         help: "Тема исключена из всех списков тем и доступна только по прямой ссылке"
       personal_message:
         title: "Эта тема является личным сообщением"
+        help: "Эта тема является личным сообщением"
     posts: "Сообщ."
     posts_long: "{{number}} сообщений в теме"
     posts_likes_MF: |
-      В этой теме {count, plural, one {1 сообщение} other {# сообщений}} {ratio, select,
+      В этой теме {count, plural, one {1 сообщение} few {# сообщения} other {# сообщений}} {ratio, select,
       low {с высоким рейтингом симпатий}
       med {с очень высоким рейтингом симпатий}
       high {с чрезвычайно высоким рейтингом симпатий}
@@ -4154,10 +4158,10 @@ ru:
         clear_penalty_history:
           title: "Очистить историю штрафов"
           description: "пользователи со штрафами не могут достичь TL3"
-        delete_all_posts_confirm_MF: "Вы собираетесь удалить {POSTS, plural, one {1 сообщение} other {# сообщений}} и {TOPICS, plural, one {1 тему} other {# тем}}. Вы уверены?"
+        delete_all_posts_confirm_MF: "Вы собираетесь удалить {POSTS, plural, one {1 сообщение} few {# сообщения} other {# сообщений}} и {TOPICS, plural, one {1 тему} few {# темы} other {# тем}}. Вы уверены?"
         silence: "Заблокировать"
         unsilence: "Разблокировать"
-        silenced: "Заброкирован?"
+        silenced: "Заблокирован?"
         moderator: "Модератор?"
         admin: "Администратор?"
         suspended: "Заморожен?"
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 51e69cbe17..3c84ec4ce6 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -2631,6 +2631,7 @@ sl:
         help: "Ta tema je izločena; ne bo se prikazovala na seznamih tem in se jo lahko dostopa samo preko neposredne povezave."
       personal_message:
         title: "Ta tema je zasebno sporočilo"
+        help: "Ta tema je zasebno sporočilo"
     posts: "Prispevki"
     posts_long: "{{number}} prispevkov v tej temi"
     posts_likes_MF: |
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index b58f1d3327..268b3d9cb1 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -796,7 +796,7 @@ sv:
       allow_private_messages: "Tillåt andra användare att skicka mig personliga meddelanden"
       external_links_in_new_tab: "Öppna alla externa länkar i en ny flik"
       enable_quoting: "Aktivera citatsvar för markerad text"
-      enable_defer: "Aktivera uppskjutning för att markera ämnen som lästa"
+      enable_defer: "Aktivera fördröjning för att markera ämnen som lästa"
       change: "ändra"
       featured_topic: "Utvalt Ämne"
       moderator: "{{user}} är en moderator"
@@ -811,10 +811,9 @@ sv:
       email_activity_summary: "Aktivitetssammanfattning"
       mailing_list_mode:
         label: "Utskicksläge"
-        enabled: "Aktivera utskicksläge"
+        enabled: "Aktivera mottagning av e-post för varje nytt inlägg"
         instructions: |
-          Den här inställningen åsidosätter aktivitetssummeringen.<br />
-          Tystade ämnen och kategorier är inte inkluderade i de här e-postmeddelandena.
+          Den här inställningen åsidosätter aktivitetssummeringen.<br />Tystade ämnen och kategorier är inte inkluderade i de här e-postmeddelandena.
         individual: "Skicka ett e-postmeddelande för varje nytt inlägg."
         individual_no_echo: "Jag vill ha ett mail när nya poster publiceras"
         many_per_day: "Skicka ett e-postmeddelande för varje nytt inlägg (ungefär {{dailyEmailEstimate}} per dag)"
@@ -851,7 +850,7 @@ sv:
       ignored_users: "Ignorerade"
       ignored_users_instructions: "Tysta alla inlägg och notifieringar från dessa användare."
       tracked_topics_link: "Visa"
-      automatically_unpin_topics: "Avklistra automatiskt ämnen när jag når botten."
+      automatically_unpin_topics: "Avklistra automatiskt ämnen när jag når botten"
       apps: "Appar"
       revoke_access: "Återkalla åtkomst"
       undo_revoke_access: "Ångra återkallelse av åtkomst"
@@ -1262,9 +1261,12 @@ sv:
       enabled: "Webbplatsen är i skrivskyddat läge. Du kan fortsätta bläddra på sidan, men att skriva inlägg, gilla och andra interaktioner är inaktiverade för tillfället."
       login_disabled: "Det går inte att logga in medan siten är i skrivskyddat läge."
       logout_disabled: "Det går inte att logga ut medan webbplatsen är i skrivskyddat läge. "
-    too_few_topics_and_posts_notice: "Låt oss <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>påbörja diskussionen!</a> Det finns <strong>%{currentTopics}</strong> ämnen och <strong>%{currentPosts}</strong> inlägg. Besökare behöver mer att läsa och svara på  – vi rekommenderar åtminstone <strong>%{requiredTopics}</strong> ämnen och <strong>%{requiredPosts}</strong> inlägg. Enbart personal kan se detta meddelande."
-    too_few_topics_notice: "Låt oss <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>påbörja diskussionen!</a> Det finns <strong>%{currentTopics}</strong> ämnen. Besökare behöver mer att läsa och svara på – vi rekommenderar åtminstone <strong>%{requiredTopics}</strong> ämnen. Enbart personal kan se detta meddelande."
-    too_few_posts_notice: "Låt oss <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>påbörja diskussionen!</a> Det finns <strong>%{currentPosts}</strong> inlägg. Besökare behöver mer att läsa och svara på – vi rekommenderar åtminstone <strong>%{requiredPosts}</strong> inlägg. Enbart personal kan se detta meddelande."
+    too_few_topics_and_posts_notice_MF: >-
+      Låt oss <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">påbörja diskussionen!</a> Det {currentTopics, plural, one {finns <strong>#</strong> ämne} other {finns <strong>#</strong> ämnen}} och {currentPosts, plural, one {<strong>#</strong> inlägg} other {<strong>#</strong> inlägg}}. Besökare behöver mer att läsa och svara på – vi rekommenderar åtminstone {requiredTopics, plural, one {<strong>#</strong> ämne} other {<strong>#</strong> ämnen}} och {requiredPosts, plural, one {<strong>#</strong> inlägg} other {<strong>#</strong> inlägg}}. Enbart personal kan se detta meddelande. 
+    too_few_topics_notice_MF: >-
+      Låt oss <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">påbörja diskussionen!</a> Det {currentTopics, plural, one {finns <strong>#</strong> ämne} other {finns <strong>#</strong> ämnen}}. Besökare behöver mer att läsa och svara på  – vi rekommenderar åtminstone {requiredTopics, plural, one {<strong>#</strong> ämne} other {<strong>#</strong> ämnen}}. Enbart personal kan se detta meddelande. 
+    too_few_posts_notice_MF: >-
+      Låt oss <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">påbörja diskussionen!</a> Det {currentTopics, plural, one {finns <strong>#</strong> inlägg} other {finns <strong>#</strong> inlägg}}. Besökare behöver mer att läsa och svara på – vi rekommenderar åtminstone {requiredTopics, plural, one {<strong>#</strong> inlägg} other {<strong>#</strong> inlägg}}. Enbart personal kan se detta meddelande. 
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} other  {# errors/hour}}</a> har uppnått webbplatsinställningarnas gräns på {limit, plural, one {# error/hour} other {# errors/hour}}."
       reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} other {# errors/minute}}</a> har uppnått weplatsinställningarnas gräns på {limit, plural, one {# error/minute} other {# errors/minute}}."
@@ -2627,6 +2629,7 @@ sv:
         help: "Det här ämnet är olistat; det kommer inte visas i ämneslistorna och kan bara nås via en direktlänk"
       personal_message:
         title: "Detta ämne är ett personligt meddelande"
+        help: "Detta ämne är ett personligt meddelande"
     posts: "Inlägg"
     posts_long: "det finns {{number}} inlägg i detta ämne"
     posts_likes_MF: |
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 7f9f612a6e..90724174ad 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -1258,9 +1258,6 @@ tr_TR:
       enabled: "Bu site salt-okunur modda. Lütfen taramaya devam et, ancak yanıtlama, beğenme ve diğer eylemler şu an için devre dışı durumda. "
       login_disabled: "Site salt-okunur modda iken giriş işlemi devre dışı bırakılır ."
       logout_disabled: "Site salt-okunur modda iken çıkış işlemi yapılamaz."
-    too_few_topics_and_posts_notice: "Haydi <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>tartışma başlasın!</a>Burada <strong>%{currentTopics}</strong> konu ve <strong>%{currentPosts}</strong> gönderi var. Ziyaretçilerin okuması ve yanıtlaması için tavsiye ettiğimiz en az <strong>%{requiredTopics}</strong> konu ve <strong>%{requiredPosts}</strong> gönderi. Bu mesajı yalnızca yetkili görebilir."
-    too_few_topics_notice: "Haydi <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>tartışma başlasın!</a>Burada <strong>%{currentTopics}</strong> konu var. Ziyaretçilerin okuması ve yanıtlaması için tavsiye ettiğimiz en az <strong>%{requiredTopics}</strong> konudur. Bu mesajı yalnızca yetkili görebilir."
-    too_few_posts_notice: "Haydi <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>tartışma başlasın!</a>Burada <strong>%{currentPosts}</strong> gönderi var. Ziyaretçilerin okuması ve yanıtlaması için tavsiye ettiğimiz en az <strong>%{requiredPosts}</strong> gönderidir. Bu iletiyi yalnızca yetkili görebilir."
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b>– <a href='{url}' target='_blank'>{rate, plural, one {# hata/saat} diğeri {# hata/saat}}</a> site limitlerine ulaştı {limit, plural, one {# hata/saat} other {# hata/saat}}."
       reached_minute_MF: "<b>{relativeAge}</b>– <a href='{url}' target='_blank'>{rate, plural, one {# hata/saat}  {# hata/dakika}}</a> site limitlerine ulaştı {limit, plural, one {# hata/dakika} other {# hata/dakika}}."
@@ -2617,6 +2614,7 @@ tr_TR:
         help: "Bu konu listelenmemiş; konu listelerinde görüntülenmeyecek ve sadece doğrudan bir bağlantı üzerinden erişilebilecek"
       personal_message:
         title: "Bu konu kişisel bir mesajdır"
+        help: "Bu konu kişisel bir mesajdır"
     posts: "Gönderiler"
     posts_long: "bu konuda {{number}} gönderi var"
     posts_likes_MF: |
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 98f2e06b18..2ffafbd745 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -1361,9 +1361,6 @@ uk:
       enabled: "Сайт працює в режимі \"тільки для читання\". Зараз ви можете продовжувати переглядати сайт, але інші дії будуть недоступні. "
       login_disabled: "Вхід вимкнено, поки сайт перебуває в режимі лише для читання."
       logout_disabled: "Вихід відключений, поки сайт в режимі «тільки для читання»"
-    too_few_topics_and_posts_notice: "Давайте <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>почнемо обговорення!</a> Есть <strong>%{currentTopics}</strong> тем та <strong>%{currentPosts}</strong> постів. Користувачі повинні більше читати та відповідати - ми рекомендуємо, принаймні <strong>%{requiredTopics}</strong> тем та <strong>%{requiredPosts}</strong> постів. Тільки співробітники можуть бачити це повідомлення."
-    too_few_topics_notice: "Давайте <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>почнемо обговорення!</a> Есть <strong>%{currentTopics}</strong> тем. Користувачі повинні більше читати та відповідати - ми рекомендуємо, принаймні <strong>%{requiredTopics}</strong> тем. Тільки співробітники можуть бачити це повідомлення."
-    too_few_posts_notice: "Давайте <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>почнемо обговорення!</a> Есть <strong>%{currentPosts}</strong> постов. Користувачам потрібно більше читати та відповідати - ми рекомендуємо хоча б <strong>%{requiredPosts}</strong> постів. Тільки співробітники можуть бачити це повідомлення."
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} або {# errors/hour}}</a> досягнуто максимально дозволене значення {limit, plural, one {# error/hour} або {# errors/hour}}."
       reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} або {# errors/minute}}</a> досягнуто максимально дозволене значення {limit, plural, one {# error/minute} або {# errors/minute}}."
@@ -2822,6 +2819,7 @@ uk:
         help: "Тема виключена з усіх списків тем та доступна тільки за прямим посиланням"
       personal_message:
         title: "Ця тема є особистим повідомленням"
+        help: "Ця тема є особистим повідомленням"
     posts: "Дописи"
     posts_long: "тема містить {{number}} дописів"
     posts_likes_MF: |
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 4f19680a0f..8187555885 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -1216,9 +1216,6 @@ ur:
       enabled: "یہ سائٹ صرف پڑھنے کے مَوڈ میں ہے۔ براہِ مہربانی براؤز کرتے رہئیے، لیکن جواب دینا، لائکس دینا، اور دیگر اعمال ابھی کے لئے غیر فعال ہیں۔"
       login_disabled: "جب تک سائٹ صرف پڑھنے کے مَوڈ میں ہے لاگ اِن غیر فعال رہے گا۔"
       logout_disabled: "جب تک سائٹ صرف پڑھنے کے مَوڈ میں ہے لاگ آؤٹ غیر فعال رہے گا۔"
-    too_few_topics_and_posts_notice: "چلیں <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>اِس بحث کو شروع کریں!</a> <strong>%{currentTopics}</strong> ٹاپکس اور <strong>%{currentPosts}</strong> پوسٹس موجود ہیں۔ زائرین کو پڑھنے اور اُن کا جواب دینے کیلئے مذید اور کی ضرورت ہے – ہم کم از کم <strong>%{requiredTopics}</strong> ٹاپکس اور <strong>%{requiredPosts}</strong> پوسٹس کی تجویز دیتے ہیں۔ صرف سٹاف اِس پیغام کو دیکھ سکتے ہیں۔"
-    too_few_topics_notice: "چلیں <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>اِس بحث کو شروع کریں!</a> <strong>%{currentTopics}</strong> ٹاپکس موجود ہیں۔ زائرین کو پڑھنے اور اُن کا جواب دینے کیلئے مذید اور کی ضرورت ہے – ہم کم از کم <strong>%{requiredTopics}</strong> ٹاپکس کی تجویز دیتے ہیں۔ صرف سٹاف اِس پیغام کو دیکھ سکتے ہیں۔"
-    too_few_posts_notice: "چلیں <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>اِس بحث کو شروع کریں!</a> <strong>%{currentPosts}</strong> پوسٹس موجود ہیں۔ زائرین کو پڑھنے اور اُن کا جواب دینے کیلئے مذید اور کی ضرورت ہے – ہم کم از کم <strong>%{requiredPosts}</strong> پوسٹس کی تجویز دیتے ہیں۔ صرف سٹاف اِس پیغام کو دیکھ سکتے ہیں۔"
     learn_more: "اورجانیے..."
     all_time: "کُل"
     all_time_desc: "کُل ٹاپک بنائے گئے"
@@ -2526,6 +2523,7 @@ ur:
         help: "یہ ٹاپک غیر کسی فہرست میں نہیں ہے؛ یہ ٹاپکس کی فہرست میں ظاہر نہیں ہو گا، اور صرف ایک براہ راست لنک کے ذریعے اِس تک رسائی ہو سکے گی"
       personal_message:
         title: "یہ ٹاپک ایک ذاتی پیغام ہے"
+        help: "یہ ٹاپک ایک ذاتی پیغام ہے"
     posts: "پوسٹس"
     posts_long: "اِس ٹاپک میں {{number}} پوسٹس ہیں"
     posts_likes_MF: |
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 173236d6fd..f69a16b7d1 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -1073,6 +1073,7 @@ vi:
         no_links: "Không có liên kết"
         most_liked_by: "Được thích nhiều nhất bởi"
         most_liked_users: "Like nhiều nhất"
+        no_likes: "Chưa có lượt thích."
         topics: "Chủ đề"
         replies: "Trả lời"
       ip_address:
@@ -1381,6 +1382,7 @@ vi:
         posted: '{{username}} gửi bài trong "{{topic}}" - {{site_title}}'
         linked: '{{username}} liên quan đến bài viết của bạn từ "{{topic}}" - {{site_title}}'
       titles:
+        liked: "lượt thích mới"
         watching_first_post: "chủ đề mới"
     upload_selector:
       title: "Thêm một ảnh"
@@ -1402,7 +1404,7 @@ vi:
       latest_post: "Bài viết mới nhất"
       latest_topic: "Chủ đề mới"
       most_viewed: "Xem nhiều nhất"
-      most_liked: "Like nhiều nhất"
+      most_liked: "Thích nhiều nhất"
       select_all: "Chọn tất cả"
       clear_all: "Xóa tất cả"
       too_short: "Từ khoá tìm kiếm của bạn quá ngắn."
@@ -1797,7 +1799,7 @@ vi:
       controls:
         reply: "bắt đầu soản trả lời cho bài viết này"
         like: "like bài viết này"
-        has_liked: "bạn đã like bài viết này"
+        has_liked: "bạn đã thích bài viết này"
         undo_like: "hủy like"
         edit: "sửa bài viết này"
         edit_action: "Sửa"
@@ -1834,6 +1836,10 @@ vi:
           notify_moderators: "đã thông báo với BQT"
           notify_user: "đã gửi tin nhắn"
           bookmark: "đã đánh dấu bài này"
+          like:
+            other: "thích này"
+          like_capped:
+            other: "và {{count}} người khác thích nầy"
         by_you:
           off_topic: "Bạn đã đánh dấu cái nfay là chủ đề đóng"
           spam: "Bạn đã đánh dấu cái này là rác"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index fa59219490..7ad3ead0be 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -1211,9 +1211,6 @@ zh_CN:
       enabled: "站点正处于只读模式。你可以继续浏览，但是回复、赞和其他操作暂时被禁用。"
       login_disabled: "只读模式下不允许登录。"
       logout_disabled: "站点在只读模式下无法登出。"
-    too_few_topics_and_posts_notice: "让我们<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>开始讨论吧！</a>现有<strong>%{currentTopics}</strong>个主题何<strong>%{currentPosts}</strong>个回帖。用户需要更多阅读与回复 —— 我们推荐至少<strong>%{requiredTopics}</strong>个主题和<strong>%{requiredPosts}</strong>个帖子。此消息仅管理人员可见。"
-    too_few_topics_notice: "让我们<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>开始讨论</a>吧！现在有<strong>%{currentTopics}</strong>个主题。 用户需要进行更多阅读与回复 – 我们推荐至少<strong>%{requiredTopics}</strong> 个主题。 此消息仅管理员可见。"
-    too_few_posts_notice: "让我们<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/'>开始讨论</a>吧！现在有<strong>%{currentPosts}</strong>个主题。 用户需要进行更多的阅读或回复 – 我们推荐至少<strong>%{requiredPosts}</strong> 个主题。 此消息仅管理人员可见。"
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} other {# errors/hour}}</a>达到了站点设置中的限制{limit, plural, one {# error/hour} other {# errors/hour}}。"
       reached_minute_MF: "<b>{relativeAge}</b>1 – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} other {# errors/minute}}</a>已经达到站点设置限制 {limit, plural, one {# error/minute} other {# errors/minute}}。"
@@ -2528,6 +2525,7 @@ zh_CN:
         help: "本主题被设置为不显示在主题列表中，只能通过链接来访问"
       personal_message:
         title: "此主题是一条私信"
+        help: "此主题是一条私信"
     posts: "帖子"
     posts_long: "本主题有 {{number}} 个帖子"
     posts_likes_MF: |
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 587b124bc2..7c129f04f2 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -1086,7 +1086,6 @@ ar:
     desktop_category_page_style: "أسلوب العرض لصفحة الأقسام."
     category_colors: "قائمة الألوان المسموحة لتمييز الأقسام بترميز الhexadecimal."
     category_style: "أسلوب العرض لشارة القسم."
-    max_image_size_kb: "الحجم الاقص لتحميل صوره بالكيلو بايت.هذا يجب ضبطه في nginx (client_max_body_size) /اباتشي او البروكسي"
     max_attachment_size_kb: "أقصى حجم لتحميل المرفقات الملفات بالكيلوبايت. وهذا يجب أن يتم تكوينه في nginx (client_max_body_size) / أباتشي أو الوكيل. "
     authorized_extensions: "قائمة بالملفات المسموح رفعها (أستخدم '*' للسماح لجميع الأنواع)"
     max_similar_results: "عدد المواضيع المشابهة لتُعرض فوق المحرّر عند إنشاء موضوع جديد. المقارنة تعتمد عنوان الموضوع ومتنه."
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index 355eb61462..ddc531f97a 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -1161,10 +1161,8 @@ be:
     desktop_category_page_style: "Візуальны стыль для"
     category_colors: "Спіс шаснаццатковых значэнняў колеру дапускаецца для катэгорый."
     category_style: "Візуальны стыль для катэгорыі значкоў."
-    max_image_size_kb: "Максімальны памер загружанага выявы ў кбайт. Гэта павінна быць сканфігуравана ў Nginx (client_max_body_size)"
     theme_authorized_extensions: "Спіс пашырэнняў файлаў, дазволеных для загрузкі тэмы (выкарыстанне «*», каб ўключыць усе тыпы файлаў)"
     max_similar_results: "Як шмат падобных да тых, каб паказаць вышэй рэдактараў пры стварэнні новай тэмы. Параўнанне заснавана на назве і цела."
-    max_image_megapixels: "Максімальную колькасць мегапікселяў, дазволеныя для малюнка."
     title_prettify: "Прадухіліць агульныя назвы памылак друку і памылкі, у тым ліку вялікіх літар, малыя літары першага сімвал, шматразовы! і ?, за дадатковую плату. у канцы, і г.д."
     topic_views_heat_low: "Пасля гэтага шмат праглядаў, поле выгляд злёгку падсвятляецца."
     topic_views_heat_medium: "Пасля гэтага шмат праглядаў, поле праглядаў умерана падсвятляецца."
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index 934881ea2e..c835d6fdc6 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -174,6 +174,13 @@ bg:
   too_late_to_edit: "Това мнение е създадено много отдавна. То вече не може да се променя или да бъде изтрито."
   revert_version_same: "Текущата версия е същата като версията, към която се опитвате да се върнете."
   excerpt_image: "изображение"
+  bookmarks:
+    reminders:
+      later_today: "По-късно днес <br/>{{date}}"
+      next_business_day: "Следващият работен ден <br/>{{date}}"
+      tomorrow: "Утре <br/>{{date}}"
+      next_week: "Следващата седмица <br/>{{date}}"
+      next_month: "Следващият месец <br/>{{date}}"
   groups:
     errors:
       invalid_domain: "'%{domain}' е невалиден домейн."
@@ -459,6 +466,7 @@ bg:
   reports:
     default:
       labels:
+        count: Брой
         day: Ден
     post_edits:
       labels:
@@ -469,6 +477,7 @@ bg:
     user_flagging_ratio:
       labels:
         user: Потребител
+        score: Точки
     moderators_activity:
       labels:
         moderator: Модератор
@@ -802,7 +811,6 @@ bg:
     min_title_similar_length: "Минимална дължина на заглавието на темата, като тя ще бъде проверена за наличие на подобна."
     category_colors: "Списък от шестнадесетични цветови стойности разрешени за категориите."
     category_style: "Визуален стил за категорията със значки."
-    max_image_size_kb: "Максимален размер за качване на избражение в kB. Това също трябва да се конфигурира в nginx конфигурацията (client_max_body_size), apache или прокси сървъра."
     max_attachment_size_kb: "Максимална големина на прикачените файлове в kB. Това също трябва да се конфигурира в nginx (client_max_body_size), apache или прокси сървъра."
     authorized_extensions: "Списък от разширения на файлове разрешени за качване (използвайте '*' за да разрешите всички)"
     max_similar_results: "Брой подобни теми показвани на потребителя при създаването на нова тема. Сравнението е базирано на заглавието и текста на темата."
@@ -1352,6 +1360,12 @@ bg:
       confirm_title: "Включени известявания - %{site_title}"
       confirm_body: "Успех! Известяването е включено."
   reviewables:
+    priorities:
+      medium: "Среден"
+      high: "Висок"
+    sensitivity:
+      medium: "Среден"
+      high: "Висок"
     actions:
       agree_and_suspend:
         title: "Преустанови потребител"
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index c382e4a5c1..1d8c0b4e2b 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -151,6 +151,15 @@ bs_BA:
     latest: "Latest topics"
   too_late_to_edit: "That post was created too long ago. It can no longer be edited or deleted."
   excerpt_image: "slika"
+  bookmarks:
+    reminders:
+      at_desktop: "Sljedeći put sam za svojim desktop kompjuterom"
+      later_today: "Danas, malo kasnije <br/>{{date}}"
+      next_business_day: "Sljedeći radni dan <br/>{{date}}"
+      tomorrow: "Sutradan <br/>{{date}}"
+      next_week: "Sljedeće sedmice <br/>{{date}}"
+      next_month: "Naredni mjesec <br/>{{date}}"
+      custom: "Ciljano vrijeme i datum"
   groups:
     default_names:
       everyone: "everyone"
@@ -499,12 +508,14 @@ bs_BA:
     http_5xx_reqs:
       xaxis: "Day"
     http_total_reqs:
+      title: "Suma"
       xaxis: "Day"
     time_to_first_response:
       xaxis: "Day"
       yaxis: "Prosječno vrijeme (hours)"
     topics_with_no_response:
       xaxis: "Day"
+      yaxis: "Suma"
     mobile_visits:
       xaxis: "Day"
       yaxis: "Number of visits"
@@ -652,7 +663,6 @@ bs_BA:
     body_min_entropy: "The minimum entropy (unique characters, non-english count for more) required for a post body."
     min_title_similar_length: "The minimum length of a title before it will be checked for similar topics."
     category_colors: "A list of hexadecimal color values allowed for categories."
-    max_image_size_kb: "The maximum image upload size in kB. This must be configured in nginx (client_max_body_size) / apache or proxy as well."
     max_attachment_size_kb: "The maximum attachment files upload size in kB. This must be configured in nginx (client_max_body_size) / apache or proxy as well."
     authorized_extensions: "A list of file extensions allowed for upload (use '*' to enable all file types)"
     max_similar_results: "How many similar topics to show above the editor when composing a new topic. Comparison is based on title and body."
@@ -738,6 +748,11 @@ bs_BA:
     autoclosed_disabled: "This topic is now opened. New replies are allowed."
     autoclosed_disabled_lastpost: "Ova tema je sada otvorena. Novi postovi su dozvoljeni."
   login:
+    security_key_description: "Kada ste pripremili vaš fizikalni sigurnosni ključ (physical security key), pritisnite ispod dugme Prijava pomoću sigurnosnog ključa."
+    security_key_alternative: "Pokušaj na drugi način"
+    security_key_authenticate: "Prijava pomoću sigurnosnog ključa"
+    security_key_not_allowed_error: "Ovaj proces prijave pomoću sigurnosnog ključa je ili vremenski istekao ili je odkazan."
+    security_key_no_matching_credential_error: "Nisu pronađeni korisnički podatci koristeći navedeni sigurnosni ključ."
     not_approved: "Your account hasn't been approved yet. You will be notified by email when you are ready to log in."
     incorrect_username_email_or_password: "Netačan nadimak, email ili šifra"
     wait_approval: "Hvala vam što ste se prijavili. We will notify you when your account has been approved."
@@ -941,6 +956,7 @@ bs_BA:
     title: "Oznake"
   finish_installation:
     register:
+      button: "Registriraj"
       help: "Registriraj novi račun kako bi počeo"
     resend_email:
       title: "Pošalji ponovo email aktivacije"
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index e9af238012..2cf54be443 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -1608,13 +1608,11 @@ ca:
     desktop_category_page_style: "Estil visual per a la pàgina /categories."
     category_colors: "Llista de valors de color hexadecimal permesos per a categories."
     category_style: "Estil visual per a insígnies de categoria."
-    max_image_size_kb: "Mida màxima de càrrega d'imatge en kB. Cal configurar-ho en nginx (client_max_body_size) / apache o en el proxy també."
     max_attachment_size_kb: "Mida màxima de càrrega de fitxers adjunts en kB. Cal configurar-ho en nginx (client_max_body_size) / apache o en el proxy també."
     authorized_extensions: "Llista d'extensions de fitxer permeses per a carregar (feu servir '*' per a habilitar tota mena de fitxers)"
     authorized_extensions_for_staff: "Llista d'extensions permeses als usuaris de l'equip responsable en carregar fitxers a més de la llista definida en el paràmetre `authorized_extensions` de la configuració. (Feu servir \"*\" per a habilitar tots els tipus de fitxers.)"
     theme_authorized_extensions: "Llista d'extensions de fitxers permeses per a càrregues d'aparences (utilitzeu '*' per a permetre tots els tipus de fitxers)"
     max_similar_results: "Quants temes semblants es mostren per damunt de l'editor quan es redacta un tema nou. La comparació es basa en el títol i el cos."
-    max_image_megapixels: "Nombre màxim de megapíxels permesos en una imatge."
     title_prettify: "Evita errades tipogràfiques freqüents en el títol, incloent-hi tot en majúscula, primer caràcter en minúscula, exclamacions i interrogants múltiples, punts extres al final, etc."
     title_remove_extraneous_space: "Elimina els espais blancs de davant de la puntuació final."
     automatic_topic_heat_values: 'Actualitza automàticament els paràmetres de "topic views heat" i "topic post like heat" basant-se en l''activitat del lloc web. '
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 23d4e29b32..e463bdcec1 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -1625,13 +1625,11 @@ de:
     desktop_category_page_style: "Visueller Stil für die /categories Seite"
     category_colors: "Liste hexadezimaler Farbwerte, die als Kategoriefarben erlaubt sind."
     category_style: "Visueller Stil für Kategorie-Abzeichen."
-    max_image_size_kb: "Maximale Größe eines hochgeladenen Bilds in kB. Dieser Wert muss auch in Nginx (client_max_body_size), Apache oder anderen Proxies entsprechend konfiguriert werden."
     max_attachment_size_kb: "Maximale Größe hochgeladener Dateianhänge in kB. Dieser Wert muss auch in Nginx (client_max_body_size), Apache oder anderen Proxies entsprechend konfiguriert werden."
     authorized_extensions: "Liste von erlaubten Dateiendungen für hochgeladene Dateien ('*' um alle Dateiendungen zu erlauben)"
     authorized_extensions_for_staff: "Eine Liste von erlaubten Dateiendungen für den Upload von Dateien durch Team-Benutzer, zusätzlich zu der in der Seiteninstellung `authorized_extensions` definierten Liste. (Der Wert „*“ erlaubt alle Dateitypen.)"
     theme_authorized_extensions: "Liste von erlaubten Dateiendungen für hochgeladene Themes (verwende '*', um alle Dateitypen zu erlauben)"
     max_similar_results: "Anzahl ähnlicher Themen, die beim Erstellen eines neuen Themas über dem Editor angezeigt werden. Ähnlichkeit wird an Hand des Titels und Inhalts bestimmt."
-    max_image_megapixels: "Maximale erlaubte Auflösung für Bilder (in Megapixeln)."
     title_prettify: "Verhindert gängige Fehler im Titel, wie reine Grossschreibung, Kleinbuchstaben am Anfang, mehrere ! und ?, überflüssiger . am Ende, etc."
     title_remove_extraneous_space: "Entferne führende Leerzeichen vor dem Ende-Zeichen."
     automatic_topic_heat_values: 'Update die "Themenansicht-Erhitzung" und "Themenbeitrags ''Gefällt mir'' Erhitzung" Einstellungen automatisch basierend auf der Seiten-Aktivität.'
@@ -1856,7 +1854,7 @@ de:
     default_categories_tracking: "Liste der standardmäßig gefolgten Kategorien."
     default_categories_muted: "Liste der standardmäßig stummgeschalteten Kategorien."
     default_categories_watching_first_post: "Liste von Kategorien, in denen der erste Beiträge in jedem neuen Thema automatisch beobachtet wird."
-    mute_all_categories_by_default: "Setze die Standard E-Mail Benachrichtigungs-Stufe für alle Kategorien auf stummgeschaltet. Benötigt die Zustimmung der Benutzer, damit sie in \"neueste\" und Kategorien-Seiten erscheinen. Um den Standard für anonyme Benutzer anzupassen, müssem 'default_categories_' Einstellungen gesetzt werden."
+    mute_all_categories_by_default: "Setze die Standard E-Mail Benachrichtigungs-Stufe für alle Kategorien auf stummgeschaltet. Benötigt die Zustimmung der Benutzer, damit sie in \"neueste\" und Kategorien-Seiten erscheinen. Um den Standard für anonyme Benutzer anzupassen, müssen 'default_categories_' Einstellungen gesetzt werden."
     default_tags_watching: "Liste der Tags, die standardmäßig beobachtet werden."
     default_tags_tracking: "Liste der Tags, die standardmäßig verfolgt werden."
     default_tags_muted: "Liste der Tags, die standardmäßig stummgeschaltet werden."
@@ -3036,9 +3034,19 @@ de:
     confirm_new_email:
       title: "E-Mail-Adresse bestätigen (an neue)"
       subject_template: "[%{email_prefix}] Bestätige deine neue E-Mail-Adresse"
+      text_body_template: |
+        Bestätige bitte deine neue E-Mail Adresse für %{site_name} durch einen Klick auf den folgenden Link:
+
+        %{base_url}/u/confirm-new-email/%{email_token}
     confirm_old_email:
       title: "E-Mail-Adresse bestätigen (an alte)"
       subject_template: "[%{email_prefix}] Bestätige deine aktuelle E-Mail-Adresse"
+      text_body_template: |
+        Bevor wir die E-Mail Adresse ändern können, benötigen wir deine Bestätigung, dass du den aktuellen E-Mail Account kontrollierst. Sobald du das getan hast, schicken wir dir eine Anfrage, die neue E-Mail Adresse zu bestätigen.
+
+        Bestätige deine aktuelle E-Mail Adresse für %{site_name}, indem du auf den folgenden Link klickst:
+
+        %{base_url}/u/confirm-old-email/%{email_token}
     notify_old_email:
       title: "Benachrichtigung an alte E-Mail-Adresse"
       subject_template: "[%{email_prefix}] Deine E-Mail-Adresse wurde geändert"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 41f1446c85..8263d27680 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -1065,12 +1065,10 @@ el:
     desktop_category_page_style: "Οπτικό στυλ για τη σελίδα /Categories."
     category_colors: "Μια λίστα με τιμές δεκαεξαδικού χρώματος, που επιτρέπεται για τις κατηγορίες."
     category_style: "Οπτικό στυλ για τα εμβλημάτα κατηγορίας ."
-    max_image_size_kb: "Το μέγιστο μέγεθος εικόνας για μεταφόρτωση σε kB. Αυτό πρέπει να ρυθμιστεί στο nginx (client_max_body_size) / apache ή και στο proxy."
     max_attachment_size_kb: "Το μέγιστο μέγεθος συννημένων αρχείων για μεταφόρτωση σε kB. Αυτό πρέπει να ρυθμιστεί στο nginx (client_max_body_size) / apache ή και στο proxy."
     authorized_extensions: "Μια λίστα με επεκτάσεις αρχείου οι οποιες επιτρέπονται για ανέβασμα (use '*' to enable all file types)"
     theme_authorized_extensions: "Μια λίστα από επεκτάσεις οι οποίες επιτρέπονται για τις μεταφορτώσεις θεμάτων ('*' για ενεργοποίηση όλων των τύπων αρχείων)"
     max_similar_results: "Πόσα παρόμοια νήματα να εμφανίζονται πάνω από τον εκδότη, όταν δημιουργείς ένα νέο νήμα. Η σύγκριση βασίζεται στον τίτλο και το σώμα."
-    max_image_megapixels: "Ο μέγιστος αριθμός megapixel που επιτρέπεται σε μία εικόνα. "
     title_prettify: "Απέφυγε συνηθισμένα τυπογραφικά λάθη στους τίτλους, όπως όλα τα γράμματα να είναι κεφαλαία, το πρώτο γράμμα της λέξης να είναι μικρό, πολλαπλά ! και ;, επιπλέον . στο τελος, κτλ. "
     topic_views_heat_low: "Μετά από τόσες προβολές, το πεδίο των προβολών είναι ελάχιστα τονισμένο. "
     topic_views_heat_medium: "Μετά από τόσες προβολές, το πεδίο των προβολών είναι μέτρια τονισμένο. "
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index b6df9f32bc..a8d10b3571 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -223,7 +223,7 @@ es:
     request_membership: "Solicitar membresía"
     join_group: "Unirse al grupo"
   deleted_topic: "¡Ups! Este tema se ha eliminado y ya no está disponible."
-  delete_topic_failed: "Se produjo un error al borrar el tema. Por favor, contacta al administrador del sitio."
+  delete_topic_failed: "Se ha producido un error al borrar el tema. Por favor, contacta al administrador del sitio."
   reading_time: "Tiempo de lectura"
   likes: "Me gusta"
   too_many_replies:
@@ -1645,13 +1645,11 @@ es:
     desktop_category_page_style: "Estilo visual de la página de /categorías."
     category_colors: "Una lista de valores en hexadecimal de los colores para las categorías."
     category_style: "Estilo visual de las etiquetas de categoría."
-    max_image_size_kb: "El tamaño máximo, en kB, de las imágenes que se pueden subir. Debe ser configurado también en nginx (client_max_body_size) / apache o proxy."
     max_attachment_size_kb: "El tamaño máximo, en kB, de los archivos que se pueden adjuntar. Debe ser configurado también en nginx (client_max_body_size) / apache o proxy."
     authorized_extensions: "Una lista de las extensiones de archivo que se permite subir (usa «*» para habilitar todos los tipos de archivo)"
     authorized_extensions_for_staff: "Una lista de las extensiones de archivo que se le permite subir a miembros del staff sumada a la lista definida en la configuración `authorized_extensions`. (Usa «*» para habilitar todos los tipos)"
     theme_authorized_extensions: "Una lista de las extensiones de archivo que se permite subir (usa «*» para habilitar todos los tipos)"
     max_similar_results: "Cantidad de temas similares que se muestran encima del editor cuando se está creando un nuevo tema. La comparación se basa en el título y el cuerpo del tema."
-    max_image_megapixels: "Número máximo de megapíxeles permitidos en una imagen."
     title_prettify: "Prevenir errores comunes en el título, incluidos los títulos escritos todo mayúsculas, con la primera letra en minúscula, con múltiples signos ! o ?, . adicional al final, etc."
     title_remove_extraneous_space: "Eliminar los espacios en blanco delante de la puntuación final."
     automatic_topic_heat_values: 'Actualizar automáticamente la configuración de «temperatura de vistas del tema» y «temperatura de me gusta de publicaciones del tema» según la actividad del sitio.'
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index be10625aab..fec91a39a9 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -219,6 +219,15 @@ fa_IR:
   too_late_to_edit: "آن فرسته خیلی وقت پیش ساخته شده. دیگر امکان ویرایش یا حذف آن وجود ندارد."
   revert_version_same: "نسخه فعلی همان نسخه‌ای است که می‌خواهید به آن برگردید."
   excerpt_image: "تصویر"
+  bookmarks:
+    reminders:
+      at_desktop: "بار آینده من پشت میزم هستم"
+      later_today: "امروز کمی بعد <br/>{{date}}"
+      next_business_day: "روز کاری آینده <br/>{{date}}"
+      tomorrow: "فردا <br/>{{date}}"
+      next_week: "هفته ی آینده <br/>{{date}}"
+      next_month: "ماه آینده <br/>{{date}}"
+      custom: "درج تاریخ و ساعت"
   groups:
     errors:
       can_not_modify_automatic: "نمی‌توانید گروه‌های خودکار را تغییر دهید."
@@ -1048,12 +1057,10 @@ fa_IR:
     desktop_category_page_style: "سبک بصری برای صفحه‌ی دسته‌بندی"
     category_colors: "لیست مقادیر رنگ هگزا دسیمال مجاز برای دسته‌بندی‌ها."
     category_style: "سبک بصری برای نشان دسته‌بندی"
-    max_image_size_kb: "حداکثر سایز عکس بارگزاری شده با واحد کیلوبایت. این باید در پیکربندی nginx باشد (client_max_body_size) / همچنین apache یا proxy."
     max_attachment_size_kb: "حداکثر سایز فایل پیوست شده به واحد کیلوبایت. این باید در پیکربندی nginx باشد (client_max_body_size) / همچنین apache یا proxy."
     authorized_extensions: "لیست پسوند‌های مجاز فایل برای بارگذاری ( از '*' برای اجازه به تمام فایل‌ها استفاده کنید)"
     theme_authorized_extensions: "لیست پسوند‌های قابل بارگذاری برای قالب (از '*' برای اجازه به تمامی فایل‌ها استفاده کنید)"
     max_similar_results: "چند موضوع مشابه زیر ویرایشگر وقتی که موضوع جدید ایجاد می شود، نمایش داده شود. مقایسه بر اساس عنوان و متن است. "
-    max_image_megapixels: "حداکثر اندازه تصاویر با واحد مگاپیکسل."
     title_prettify: "از غلط های املایی و اشتباهات رایج جلوگیری کن٬ از جمله همه حروف بزرگ٬‌ حرف کوچک اولین کاراکتر، ! و ؟ چندگانه . اضافه در پایان و غیره."
     topic_views_heat_low: "بعد از این تعداد بازدید، فیلد تعداد بازدید بسیار پر‌رنگ می‌شود."
     topic_views_heat_medium: "بعد از این تعداد بازدید، فیلد تعداد بازدید پر‌رنگ می‌شود."
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 41032c4de6..cc70ad1c0b 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -1635,13 +1635,11 @@ fi:
     desktop_category_page_style: "/Keskustelualueet-sivun visuaalinen tyyli."
     category_colors: "Lista alueiden sallituista väriarvoista, heksadesimaaleina."
     category_style: "Aluemerkin tyyli."
-    max_image_size_kb: "Liitetyn kuvan suurin sallittu koko kilotavuissa. Tämä pitää asettaa myös nginxin (client_max_body_size) / apachen tai proxyn asetuksista."
     max_attachment_size_kb: "Liitetyn tiedoston suurin sallittu koko kilotavuissa. Tämä pitää asettaa myös nginxin (client_max_body_size) / apachen tai proxyn asetuksista."
     authorized_extensions: "Liitetiedostojen sallitut tiedostopäätteet (käytä '*' salliaksesi kaikki tiedostotyypit)"
     authorized_extensions_for_staff: "Luettelo tiedostopäätteistä, jotka ovat sallittuja henkilökunnan jäsenille niiden lisäksi, jotka on määritelty sivustoasetuksella \"authorized_extensions\". (salli asettamalla * kaikki tiedostotyypit)"
     theme_authorized_extensions: "Teemalatausten liitetiedostojen sallitut tiedostopäätteet (käytä '*' salliaksesi kaikki tiedostotyypit)"
     max_similar_results: "Kuinka monta samankaltaista ketjua näytetään viestikentän päällä uutta ketjua aloitettaessa. Vertailu perustuu sekä otsikkoon että leipätekstiin."
-    max_image_megapixels: "Kuvan enimmäiskoko megapikseleinä."
     title_prettify: "Estä yleiset kirjoitusvirheet otsikossa, kuten pelkät isot kirjaimet, pieni ensimmäinen kirjain, useat !- ja ?-merkit ym."
     title_remove_extraneous_space: "Poista lopettavia välimerkkejä edeltävät tyhjät merkit."
     automatic_topic_heat_values: 'Päivitä "topic views heat" ja "topic post like heat" -asetuksia sivuston aktiivisuuden perusteella automaattisesti.'
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index ed0ecfc0ea..ed4897d43e 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -1617,13 +1617,11 @@ fr:
     desktop_category_page_style: "Style visuel de la page /categories."
     category_colors: "Une liste de couleurs en hexadécimale autorisées pour les catégories."
     category_style: "Style visuel pour les badges de catégorie."
-    max_image_size_kb: "La taille maximale des images en Ko. Doit être configuré dans nginx (client_max_body_size) / apache ou proxy aussi."
     max_attachment_size_kb: "La taille maximale des fichiers envoyés en Ko. Doit être configurer dans nginx (client_max_body_size) / apache ou proxy aussi."
     authorized_extensions: "Une liste d'extensions de fichier autorisées pour les envois sur le serveur (mettre '*' pour autoriser tous les types)"
     authorized_extensions_for_staff: "Une liste des extensions de fichiers autorisées pour le téléchargement pour les responsables en plus de la liste définie dans le paramètre `authorized_extensions'. (utilisez '*' pour activer tous les types de fichiers)"
     theme_authorized_extensions: "Une liste d'extensions de fichier autorisées pour les envois de thème (mettre « * » pour autoriser tous les types de fichier)"
     max_similar_results: "Combien de sujets similaires sont afficher lorsqu'un utilisateur est en train de créer un nouveau sujet. La comparaison se base sur le titre et le contenu."
-    max_image_megapixels: "Nombre maximum autorisé de mégapixels pour une image."
     title_prettify: "Corrige les coquilles les plus communes dans les titres (intégralité du titre en majuscule, première lettre en minuscule, de multiples ! et ?, un . inutile à la fin, etc.)"
     title_remove_extraneous_space: "Supprimez les espaces devant les signes de ponctuation de fin."
     automatic_topic_heat_values: 'Mettez à jour automatiquement les paramètres "Sujet affiché" et "Sujet similaire" en fonction de l''activité du site.'
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 3b1fe8298c..7d39b64201 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -1141,6 +1141,7 @@ he:
       labels:
         level: דרגה
       description: "מספר המשתמשים בקיבוץ לפי דרגת אמון."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "משתמשים לפי סוג"
       xaxis: "סוג"
@@ -3715,7 +3716,7 @@ he:
       name: ברוכים הבאים
       description: קיבלו לייק
       long_description: |
-        עיטור זוה מוענק עם קבלת הלייק הראשון שלך על פוסט. מזל טוב, פרסמת משהו שחבריך לקהילה חשבו שהוא מעניין, מגניב, או שימושי!
+        עיטור זה מוענק עם קבלת הלייק הראשון שלך על פוסט. מזל טוב, פרסמת משהו שחבריך לקהילה חשבו שהוא מעניין, מגניב, או שימושי!
     autobiographer:
       name: אוטוביוגרפים
       description: "פרטי ה<a href=\"%{base_uri}/my/preferences/profile\">פרופיל</a> הושלמו"
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index b8e1e33ac1..661caa18a8 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -1428,13 +1428,11 @@ hy:
     desktop_category_page_style: "Արտաքին ոճ /կատեգորիաներ էջի համար:"
     category_colors: "Կատեգորիաների համար թույլատրելի գույների տանսվեցերորդական արժեքների ցանկ:"
     category_style: "Կատեգորիայի կրծքանշանների համար արտաքին ոճը:"
-    max_image_size_kb: "Նկարի վերբեռնման առավելագույն չափը կԲ-ով: Սա պետք է կարգավորվի nginx (client_max_body_size) / apache կամ proxy -ում:"
     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: "Արգելել սովորական վերնագրի վրիպակները և սխալները՝ ներառյալ բոլոր մեծատառերը, առաջին սիմվոլի փոքրատառ լինելը, բազմակի ! և ? , լրացուցիչ . վերջում և այլն:"
     topic_views_heat_low: "Այս քանակի դիտումներից հետո դիտումների դաշտը թեթևակի ընդգծվում է:"
     topic_views_heat_medium: "Այս քանակի դիտումներից հետո դիտումների դաշտը չափավոր ընդգծվում է:"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index e907c54035..bb53cb61cb 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -49,6 +49,7 @@ it:
       about_json_values: "about.json contiene valori non validi: %{errors}"
       git: "Errore nella clonazione del repository git, accesso negato o repository non trovato"
       unpack_failed: "Errore estranedo il contenuto del file"
+      file_too_big: "Il file non compresso è troppo grande."
       unknown_file_type: "Il file che hai caricato non sembra essere un tema di Discourse valido."
     errors:
       component_no_user_selectable: "I componenti del tema non possono essere selezionabili dall'utente"
@@ -208,6 +209,7 @@ it:
   email_template_cant_be_modified: "Questo modello di email non può essere modificato."
   invalid_whisper_access: "I Sussurri potrebbero non essere abilitati, oppure non hai il permesso di creare Messaggi Sussurri."
   not_in_group:
+    title_topic: "Devi essere membro di un gruppo per visualizzare questa argomento."
     join_group: "Partecipa al Gruppo"
   reading_time: "Tempo di lettura"
   likes: "Mi piace"
@@ -236,7 +238,9 @@ it:
     replies:
       one: "%{count} risposta"
       other: "%{count} risposte"
+    last_reply: "Ultima risposta"
     created: "Creazione"
+    new_topic: "Inizia un nuovo argomento"
   no_mentions_allowed: "Spiacenti, non puoi menzionare altri utenti."
   too_many_mentions:
     one: "Spiacenti, puoi menzionare al massimo un utente in un messaggio."
@@ -304,6 +308,17 @@ it:
   edit_conflict: "Il messaggio è stato modificato da un altro utente e i tuoi cambiamenti non possono essere salvati."
   revert_version_same: "La versione attuale è la stessa versione che stai cercando di ripristinare."
   excerpt_image: "immagine"
+  bookmarks:
+    errors:
+      already_bookmarked_post: "Non puoi aggiungere più di un segnalibro allo stesso messaggio."
+    reminders:
+      at_desktop: "La prossima volta che sarò al mio desktop"
+      later_today: "Più tardi, oggi <br/> {{date}}"
+      next_business_day: "Il prossimo giorno lavorativo<br/> {{date}}"
+      tomorrow: "Domani <br/> {{date}}"
+      next_week: "La prossima settimana <br/> {{date}}"
+      next_month: "Il prossimo mese <br/> {{date}}"
+      custom: "Data e ora personalizzate"
   groups:
     success:
       bulk_add:
@@ -694,6 +709,9 @@ it:
     error: "Si è verificato un errore durante la modifica del tuo indirizzo email. Forse l'indirizzo è già in uso?"
     error_staged: "Si è verificato un errore durante il cambio di indirizzo email. L'indirizzo è già stato usato da un utente temporaneo."
     already_done: "Spiacenti, il collegamento di conferma non è più valido. Hai forse già cambiato email?"
+    confirm: "Conferma"
+    authorizing_new:
+      title: "Conferma il tuo nuovo indirizzo email"
   associated_accounts:
     revoke_failed: "Impossibile revocare il tuo account con %{provider_name}."
     connected: "(connesso)"
@@ -1542,13 +1560,11 @@ it:
     desktop_category_page_style: "Stile visuale per la pagina /categorie."
     category_colors: "Un elenco di valori esadecimali di colori permessi per le categorie."
     category_style: "Stile grafico dei distintivi relativi alle categorie."
-    max_image_size_kb: "Dimensione massima in kB per caricare immagini degli utenti. Deve essere configurata anche in nginx (client_max_body_size) / apache o nel proxy."
     max_attachment_size_kb: "Dimensione massima dei file che gli utenti possono caricare, in kB. Configura il limite anche in nginx (client_max_body_size) / apache o nel proxy."
     authorized_extensions: "Una lista di estensioni dei file che è permesso caricare (usa '*' per permettere tutti i tipi di file) "
     authorized_extensions_for_staff: "Un elenco di estensioni di file consentite per il caricamento da parte dello staff in aggiunta all'elenco definito nell'impostazione del sito `authorized_extensions`. (usa '*'; per abilitare tutti i tipi di file)"
     theme_authorized_extensions: "Una lista di estensioni dei file permessi per i caricamenti dei temi (usa '*' per abilitare tutti i tipi di file)"
     max_similar_results: "Quanti argomenti simili mostrare sopra l'editor quando si scrive un nuovo argomento. Il paragone viene fatto sul titolo e sul corpo."
-    max_image_megapixels: "Massimo numero di megapixel consentito per un'immagine."
     title_prettify: "Evita refusi ed errori comuni nei titoli, incluso il testo tutto maiuscolo, il primo carattere minuscolo, troppi caratteri ! e ?, puntini aggiuntivi alla fine della parola ecc."
     title_remove_extraneous_space: "Rimuovi gli spazi bianchi davanti alla punteggiatura."
     automatic_topic_heat_values: 'Aggiorna automaticamente le impostazioni "topic views heat" e "topic post like heat" in base all''attività del sito.'
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 0b29e4d7ad..8224b63b54 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -914,7 +914,6 @@ ja:
     min_title_similar_length: "類似トピックのチェックに必要な最小タイトル長"
     category_colors: "カテゴリに利用可能な色 (16進数指定) のリスト"
     category_style: "カテゴリバッジのスタイル"
-    max_image_size_kb: "アップロード可能な画像の最大サイズ (kB) nginx 側での設定 (client_max_body_size) / apache または proxy における設定も同時に行う必要があります"
     max_attachment_size_kb: "添付可能なファイルの最大サイズ (kB) nginx 側での設定 (client_max_body_size) / apache または proxy における設定も同時に行う必要があります"
     authorized_extensions: "アップロード可能なファイルの拡張子のリスト('*'で全ての拡張子が有効になります)"
     max_similar_results: "新規トピック編集中に類似トピックをいくつ表示するか。比較はタイトルと本文に基づきます"
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index cc17fc67af..e7eeba1664 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -1112,12 +1112,10 @@ ko:
     desktop_category_page_style: "/categories 페이지의 비주얼 스타일"
     category_colors: "허용된 카테고리에 사용될 hexadecimal 색상 값의 리스트"
     category_style: "카테고리 뱃지 시각 스타일"
-    max_image_size_kb: "최대 이미지 업로드 사이즈(kB). 이 설정은 꼭 nginx / apache와 proxy에도 적용해야 합니다."
     max_attachment_size_kb: "최대 첨부파일 업로드 사이즈(kB). 이 설정은 꼭 nginx / apache와 proxy에도 적용해야 합니다."
     authorized_extensions: "파일 업로드에 허용되는 확장자 리스트 ('*'을 사용하면 모든 타입의 파일이 가능합니다.)"
     theme_authorized_extensions: "테마 업로드에 허용되는 확장자 목록('*'를 입력하면 모든 확장자 허용)"
     max_similar_results: "새로운 글타래를 작성할 때, 에디터 위에 보여줄 비슷한 글타래들의 개수. 제목과 본문을 바탕으로 비교합니다."
-    max_image_megapixels: "이미지의 최대 메가픽셀수"
     title_prettify: "일반적인 제목의 오타 및 오류를 수정해준다. 모두 대문자로 쓰거나, 첫자가 소문자이거나(영문), 복수의 !, ? 혹은 마침표(.)가 중복으로 들어간 것 등"
     topic_views_heat_low: "글타래가 연하게 하이라이트 되기 위한 조회수"
     topic_views_heat_medium: "글타래가 적당하게 하이라이트 되기 위한 조회수"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 9c775f66e6..adebe50938 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -1073,6 +1073,7 @@ nl:
       labels:
         level: Niveau
       description: "Aantal gebruikers gegroepeerd op vertrouwensniveau."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Gebruikers per type"
       xaxis: "Type"
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 8a94e48fad..3e43f69002 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -1450,12 +1450,10 @@ pl_PL:
     desktop_category_page_style: "Styl wizualny dla strony kategorii."
     category_colors: "Lista kolorów w formacie hex do użycia w etykietach kategorii."
     category_style: "Styl etykiet kategorii"
-    max_image_size_kb: "Maksymalny rozmiar wgrywanego pliku graficznego w kB. Należy to także skonfigurować dla serwera nginx (client_max_body_size) / Apache lub dla proxy."
     max_attachment_size_kb: "Maksymalny rozmiar załącznika w kB. Należy to także skonfigurować dla serwera nginx (client_max_body_size) / Apache lub dla proxy."
     authorized_extensions: "Lista dozwolonych rozszerzeń plików (gwiazdka \"*\" oznacza wszystkie typy plików)"
     theme_authorized_extensions: "Lista dozwolonych rozszerzeń plików dla przesyłania szablonów (gwiazdka \"*\" oznacza wszystkie typy plików)"
     max_similar_results: "Liczba podobnych wątków, jaka zostanie wyświetlona nad oknem edytora podczas tworzenia nowego wątku. Wątki są porównywane na podstawie tytułów i treści."
-    max_image_megapixels: "Maksymalna rozdzielczość pliku graficznego w megapikselach."
     title_prettify: "Prevent common title typos and errors, including all caps, lowercase first character, multiple ! and ?, extra . at end, etc."
     topic_views_heat_low: "Po tylu wyświetleniach liczba wyświetleń zostanie lekko wyróżniona."
     topic_views_heat_medium: "Po tylu wyświetleniach liczba wyświetleń zostanie wyróżniona."
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index b0c3546265..069248ad52 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -1036,7 +1036,6 @@ pt:
     desktop_category_page_style: "Estilo visual para a página de categorias."
     category_colors: "Lista de valores hexadecimais das cores permitidas nas categorias."
     category_style: "Estilo visível para distintivos de categorias."
-    max_image_size_kb: "Tamanho máximo da imagem carregada em kB. Este deverá ser configurado em nginx (client_max_body_size) / apache ou também proxy."
     max_attachment_size_kb: "Tamanho máximo dos anexos carregados em kB. Este deverá ser configurado em nginx (client_max_body_size) / apache ou também proxy."
     authorized_extensions: "Lista de extensões permitidas para carregamento (utilizar '*' para ativar todos os tipos de ficheiros)"
     max_similar_results: "Quantos tópicos semelhantes a serem exibidos acima do editor ao compor um novo tópico. A comparação é baseada no título e no corpo."
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index c69c1982c9..34f2e9b252 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -1584,13 +1584,11 @@ pt_BR:
     desktop_category_page_style: "Estilo visual para a página / categorias."
     category_colors: "Uma lista de valores hexadecimais de cor permitidos para categorias."
     category_style: "Estilo visual para emblemas de categoria."
-    max_image_size_kb: "O tamanho máximo de upload de imagem em kB. Isso precisa ser configurado no nginx (client_max_body_size) / apache ou também proxy."
     max_attachment_size_kb: "O tamanho máximo de upload de arquivos anexos em kB. Isso precisa ser configurado no nginx (client_max_body_size) / apache ou também proxy."
     authorized_extensions: "Uma lista de extensões de arquivo permitidas para upload (use '*' para permitir todos os tipos de arquivos)"
     authorized_extensions_for_staff: "Uma lista de extensões de arquivo permitidas para upload para usuários 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 uploads de temas (use '*' para ativar todos os tipos de arquivos)"
     max_similar_results: "Quantos tópicos semelhantes exibir acima do editor quando compondo um novo tópico. A comparação é baseada no título e no corpo."
-    max_image_megapixels: "Número máximo de megapixels permitidos em uma imagem."
     title_prettify: "Prevenir erros comuns em títulos, incluindo caps-lock ligado, primeira letra minúscula, excesso de ! e ?, pontos extras no final, etc."
     title_remove_extraneous_space: "Remover os espaços em branco iniciais à frente da pontuação final."
     automatic_topic_heat_values: 'Atualizar automaticamente as configurações "visualizações de tópico populares" e "curtidas de postagens de tópicos populares" com base na atividade do site.'
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 1b8f5186ec..9026cd79c8 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -993,7 +993,6 @@ ro:
     desktop_category_page_style: "Stil vizual pentru pagina /categories ."
     category_colors: "O listă hexazecimală de valori de culori permise pentru categorii."
     category_style: "Stil vizual pentru categoria ecusoane."
-    max_image_size_kb: "Mărimea maximă a unei imagini încărcate în kB. Aceasta trebuie configurată în nginx (client_max_body_size) / apache sau proxy."
     max_attachment_size_kb: "Mărimea maximă a unui atașament de fișiere încărcate în Kb. Aceasta trebuie configurata în nginx (client_max_body_size) / apache sau proxy."
     authorized_extensions: "O listă de extensii de fișiere permise la încărcare (folosiți '*' pentru activarea tuturor tipurilor de fișiere)"
     max_similar_results: "Câte subiecte similare vor fi afișate deasupra editorului atunci când se compune un subiect nou. Comparația se face după titlu și pe conținut."
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 836ad7403f..6699cf541d 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -1524,11 +1524,9 @@ ru:
     desktop_category_page_style: "Визуальный стиль для страницы категории."
     category_colors: "Список шестнадцатеричных кодов цветов, разрешенных для разделов."
     category_style: "Стили для выделения разделов."
-    max_image_size_kb: "Максимальный размер загружаемых картинок в килобайтах. Убедитесь, что вы также настроили ограничение в nginx (client_max_body_size) / apache или прокси."
     max_attachment_size_kb: "Максимальный размер загружаемых файлов в килобайтах. Убедитесь, что вы также настроили ограничение в nginx (client_max_body_size) / apache или прокси."
     authorized_extensions: "Список расширений файлов, разрешенных к загрузке. Используйте '*', чтобы разрешить любые типы файлов."
     max_similar_results: "Количество похожих тем, показываемых пользователю во время создания новой темы. Сравнение выполняется на основании названия и текста темы."
-    max_image_megapixels: "Максимально допустимое количество мегапикселей для изображения."
     title_prettify: "Предотвращать распространенные опечатки и ошибки, включая КАПС, первый строчный символ, множественные ! и ?, лишние . в конце предложения и т.д."
     title_remove_extraneous_space: "Удалите начальные пробелы перед конечной пунктуацией."
     topic_views_heat_low: "После этого количества просмотров, поле просмотров слегка подсвечивается."
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index d7dde1eb51..d530c26d6c 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -943,7 +943,6 @@ sk:
     min_title_similar_length: "Minimálna dĺžka nadpisu na spustenie kontroly na podobné témy."
     category_colors: "Zoznam hexadecimálnych hodnôt farieb povolených pre kategórie."
     category_style: "Vizuálny štýl pre odznaky za kategórie."
-    max_image_size_kb: "Mmaximálna veľkosť vloženého obrázku v kB. Rovnako musí byť nastavená v nginx (client_max_body_size) / apache alebo na proxy."
     max_attachment_size_kb: "Mmaximálna veľkosť vloženej prílohy v kB. Rovnako musí byť nastavená v nginx (client_max_body_size) / apache alebo na proxy."
     authorized_extensions: "Zoznam povolených príloh súborov ktoré je umožnené vkladať (použite '*' na vkladanie súborov všetkých typov)"
     max_similar_results: "Koľko podobných tém sa má zobraziť nad editorom ak vytvára novú tému. Porovnanie je založené na nadpise a tele správy."
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 424e657d82..5487ad6248 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -755,7 +755,6 @@ sq:
     min_title_similar_length: "The minimum length of a title before it will be checked for similar topics."
     category_colors: "A list of hexadecimal color values allowed for categories."
     category_style: "Visual style for category badges."
-    max_image_size_kb: "The maximum image upload size in kB. This must be configured in nginx (client_max_body_size) / apache or proxy as well."
     max_attachment_size_kb: "The maximum attachment files upload size in kB. This must be configured in nginx (client_max_body_size) / apache or proxy as well."
     authorized_extensions: "A list of file extensions allowed for upload (use '*' to enable all file types)"
     max_similar_results: "How many similar topics to show above the editor when composing a new topic. Comparison is based on title and body."
diff --git a/config/locales/server.sr.yml b/config/locales/server.sr.yml
index 839bc4d1b3..ebfd0ef55d 100644
--- a/config/locales/server.sr.yml
+++ b/config/locales/server.sr.yml
@@ -218,7 +218,6 @@ sr:
     max_replies_in_first_day: "Maksimalan broj odgovora koje korisnik može da kreira u prvih 24 sata nakon kreiranja svoje prve poruke."
     pending_users_reminder_delay: "Obavesti moderatore ako novi korisnik čeka na odobrenje duže nego ovoliko časova. Podesiti na -1 da bi se onemogućile notifikacije."
     maximum_session_age: "Korisnik će ostati ulogovan n časova od prethodnog logovanja"
-    max_image_megapixels: "Maksimalan dozvoljeni broj megapiksela za slike."
     topic_views_heat_low: "Nakon ovoliko pregleda, polje pregleda je blago označeno."
     topic_views_heat_medium: "Nakon ovoliko pregleda, polje pregleda je umereno označeno."
     topic_views_heat_high: "Nakon ovoliko pregleda, polje pregleda je jako označeno."
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 2c3d28517b..68dc3866d4 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -1053,6 +1053,7 @@ sv:
       labels:
         level: Nivå
       description: "Antalet användare fördelat på förtroendenivå."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Användare per typ"
       xaxis: "Typ"
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index fd09188ce4..8df329d753 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -1633,13 +1633,11 @@ tr_TR:
     desktop_category_page_style: "/categories sayfasının görsel biçimi."
     category_colors: "Kategoriler için izin verilen onaltılı renk değerlerinin listesi"
     category_style: "Kategori rozetleri için görsel biçim."
-    max_image_size_kb: "Yüklenebilecek resmin KB cinsinden en fazla büyüklüğü. Bu nginx (client_max_body_size) / apache veya proxyde de ayarlanmalı."
     max_attachment_size_kb: "Yüklenebilecek dosyaların KB cinsinden en fazla büyüklüğü. Bu nginx (client_max_body_size) / apache veya proxyde de ayarlanmalı."
     authorized_extensions: "Yüklenebilecek dosya uzantılarının listesi (tüm dosya türlerini etkinleştirmek için '*' kullanın)"
     authorized_extensions_for_staff: "`Yetkili_uzanımlar` site ayarında tanımlanan listeye ek olarak yetkili kullanıcılar için yüklenmeye izin verilen dosya uzantılarının listesi. (tüm dosya türlerini etkinleştirmek için '*' kullanın)"
     theme_authorized_extensions: "Tema yüklemeleri için izin verilen dosya uzantılarının listesi (tüm dosya türlerini etkinleştirmek için '*' kullanın)"
     max_similar_results: "Yeni bir konu oluştururken, düzenleyicinin üzerinde gösterilecek benzer konuların sayısı. Karşılaştırmalar başlık ve içerik üzerinden yapılır."
-    max_image_megapixels: "Bir görüntü için izin verilen maksimum megapiksel sayısı."
     title_prettify: "Tümü büyük harf, ilk karakteri küçük harf, çoklu ! ve ?, sonda ekstra . kullanımı gibi, sık yapılan yazım hatalarını önle."
     title_remove_extraneous_space: "Noktalama işaretlerinin önündeki ön boşlukları kaldırın."
     automatic_topic_heat_values: 'Site etkinliğine dayalı olarak "En çok görüntülenen konular" ve "En popüler konu gönderileri" ayarlarını otomatik olarak güncelleyin.'
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index 693bbd4517..5c240cf6e0 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -1633,13 +1633,11 @@ uk:
     desktop_category_page_style: "Візуальний стиль для сторінки категорії."
     category_colors: "Список шістнадцятирічних кодів кольорів, дозволених для категорій."
     category_style: "Стилі для виділення розділів."
-    max_image_size_kb: "Максимальний розмір завантажуваних картинок в кілобайтах. Переконайтеся, що ви також налаштували обмеження в nginx (client_max_body_size) / apache або проксі."
     max_attachment_size_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" на основі активності сайту.'
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index 368e734edb..38a8762336 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -1564,13 +1564,11 @@ ur:
     desktop_category_page_style: " /categories صفحے کیلئے بصری سٹائل۔"
     category_colors: "زُمرہ جات کیلئے ہیکسا ڈَیسیمل رنگوں کے اقدار کی ایک فہرست۔"
     category_style: "زُمرہ بیَجوں کیلئے بصری سٹائل۔"
-    max_image_size_kb: "kB میں تصویر اَپ لوڈ کا زیادہ سے زیادہ سائز۔ یہ اِنجَن٘ اَیکس (client_max_body_size) / اَپَیچی یا پراکسی میں بھی ترتیب دیا جانا لازمی ہے۔"
     max_attachment_size_kb: "kB میں اٹیچمنٹ فائل اَپ لوڈ کا زیادہ سے زیادہ سائز۔ یہ اِنجَن٘ اَیکس (client_max_body_size) / اَپَیچی یا پراکسی میں بھی ترتیب دیا جانا لازمی ہے۔"
     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: 'سائٹ کی سرگرمیوں پر مبنی "ٹاپک وِیوز گرمی" اور "ٹاپک پوسٹ لائیک گرمی" کی ترتیبات خود بخود اپ ڈیٹ کریں۔'
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index d56aaaf092..454c36a78b 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -852,7 +852,6 @@ vi:
     min_title_similar_length: "Chiều dài tối thiểu của tiêu đề trước khi kiểm tra trùng chủ đề."
     category_colors: "Danh sách mã màu hexa cho phép cho danh mục."
     category_style: "Style trực quan cho phù hiệu danh mục."
-    max_image_size_kb: "Kích cỡ ảnh upload tối đa theo Kb. Thiết lập này phải được cấu hình cả trong nginx (client_max_body_size) / apache hoặc trong proxy."
     max_attachment_size_kb: "Kích thước file tải lên tối đa tính theo kB. đã cấu hình trong nginx (client_max_body_size) / apache hoặc proxy."
     authorized_extensions: "Danh sách định dạng file cho phép tải lên (sử dụng '*' để cho phép tất cả loại tập tin)"
     max_similar_results: "Số lượng chủ đề tương tự hiển thị phía trên bộ soạn thảo khi soạn chủ đề mới, so sánh dựa trên tiêu đề và nội dung."
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index a0f9bcc900..af53b87eb5 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -274,6 +274,7 @@ zh_CN:
   pm_reached_recipients_limit: "抱歉，私信中的收信人不能超过%{recipients_limit}。"
   removed_direct_reply_full_quotes: "自动删除整个上篇帖子的引用。"
   secure_upload_not_allowed_in_public_topic: "抱歉，无法在公开的主题中使用以下安全上传：%{upload_filenames}。"
+  create_pm_on_existing_topic: "抱歉，你无法在现有主题上创建PM。"
   just_posted_that: "太类似于你最近发表的内容"
   invalid_characters: "包含无效字符"
   is_invalid: "似乎不清楚，这是一个完整的句子？ "
@@ -1600,13 +1601,13 @@ zh_CN:
     desktop_category_page_style: "/categories 页面的视觉样式。"
     category_colors: "设置分类颜色的十六进制色彩值列表。"
     category_style: "分类图标的视觉样式。"
-    max_image_size_kb: "允许用户上传的最大文件大小（以kB为单位）。确保也在nginx（client_max_body_size），apache 或代理中进行限制文件大小的配置。"
+    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: "图片允许的最大像素。"
+    max_image_megapixels: "以百万像素为单位单个图像允许的最大值。高于最大值百万像素的图像将被拒绝。"
     title_prettify: "防止常见标题里的错别字和错误，包括全部大写，第一个字符小写，多个'！'和'？'，结尾多余的'.'等等。"
     title_remove_extraneous_space: "删除结尾标点前的空格。"
     automatic_topic_heat_values: '基于站点活动自动更新“主题观点热度”和“主题帖子赞的主题热度”设置。'
@@ -1646,6 +1647,8 @@ zh_CN:
     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"
@@ -1741,6 +1744,7 @@ zh_CN:
     ignored_users_message_gap_days: "当一个用户被很多用户忽视时再次通知版主要等待多久。"
     clean_up_inactive_users_after_days: "非活跃用户（信任等级0且没有任何帖子）被删除前等待的天数。设为0则关闭清理。"
     user_selected_primary_groups: "允许用户设置其主要群组"
+    max_notifications_per_user: "每个用户的最大通知数量，如超出，旧的通知将被删除。每周执行一次。设为0以关闭。"
     user_website_domains_whitelist: "用户网站要属于这些域名中。用 | 分割。"
     allow_profile_backgrounds: "允许用户上传个人资料背景图片。"
     sequential_replies_threshold: "在被提醒回复了太多连续的回复前，用户在主题中可以连续回复的帖子的数量。"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 78dc673ab1..2221178662 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -1480,13 +1480,11 @@ zh_TW:
     desktop_category_page_style: "/categories 頁面的視覺樣式。"
     category_colors: "設定分類顏色的十六進制色彩值列表。"
     category_style: "分類圖標的視覺樣式。"
-    max_image_size_kb: "允許使用者上傳的最大圖片大小（以kB為單位）。確保也在nginx（client_max_body_size），apache 或代理中進行限制文件大小的設定。"
     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: "防止常見標題裡的錯別字和錯誤，包括全部大寫，首字小寫，多個！和？，結尾多餘的. 等等。"
     topic_views_heat_low: "多少次瀏覽後，該視圖將稍稍高亮。"
     topic_views_heat_medium: "多少次瀏覽後，該視圖將明顯高亮。"
diff --git a/plugins/discourse-local-dates/config/locales/client.bs_BA.yml b/plugins/discourse-local-dates/config/locales/client.bs_BA.yml
index de9010fbb9..3fcb6e6c27 100644
--- a/plugins/discourse-local-dates/config/locales/client.bs_BA.yml
+++ b/plugins/discourse-local-dates/config/locales/client.bs_BA.yml
@@ -8,6 +8,13 @@
 bs_BA:
   js:
     discourse_local_dates:
+      relative_dates:
+        today: Danas%{time}
+        tomorrow: Sutra %{time}
+        yesterday: Jučer %{time}
+        countdown:
+          passed: datum je prošao
+      title: Unesi datum / vrijeme
       create:
         form:
           insert: Unesi
@@ -17,7 +24,20 @@ bs_BA:
           timezones_title: Vremenske zone za prikazati
           timezones_description: Vremenske zone će biti korištene kako bi prikazale datume u pregledu i u nazad.
           recurring_title: Vraćanje
+          recurring_description: "Definiši ponavljanje eventa. Možete također menuelno izmijeniti opcije ponavljanja generisanih od strane foruma i koristiti jedan od sljedećih ključeva: godine, kvartali, mjeseci, sedmice, dani, sati, minute, sekunde, milisekunde."
+          recurring_none: Bez ponavljanja
           invalid_date: Neispravan datum, osigurajte da su datum i vrijeme tačni
           date_title: Datum
           time_title: Vrijeme
           format_title: Format datuma
+          timezone: Vremenska zona
+          until: Sve do...
+          recurring:
+            every_day: "Svaki dan"
+            every_week: "Svake sedmice"
+            every_two_weeks: "Svake dvije sedmice"
+            every_month: "Svaki mjesec"
+            every_two_months: "Svaka dva mjeseca"
+            every_three_months: "Svaka tri mjeseca"
+            every_six_months: "Svakih šest mjeseci"
+            every_year: "Svake godine"
diff --git a/plugins/discourse-local-dates/config/locales/client.fa_IR.yml b/plugins/discourse-local-dates/config/locales/client.fa_IR.yml
index b2214bb0f1..b67c306f03 100644
--- a/plugins/discourse-local-dates/config/locales/client.fa_IR.yml
+++ b/plugins/discourse-local-dates/config/locales/client.fa_IR.yml
@@ -22,3 +22,4 @@ fa_IR:
           date_title: تاریخ
           time_title: زمان
           format_title: فرمت تاریخ
+          timezone: منطقه ی زمانی
diff --git a/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml b/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
index d912946b5e..57e1762b4f 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
@@ -26,6 +26,14 @@ bs_BA:
         Ovaj bedž je dodjeljen prilikom uspješnog završetka interaktivnog tutorijala za nove korisnike. Postali ste majstor naprednih alata u diskusiji - sada ste potpuno licencirani!
   discourse_narrative_bot:
     bio: "Pozdrav, ja nisam stvarna osoba. Ja sam automatski robot koji će vas naučiti kako da koristite ovaj web sajt. Kako bi komunicirali sa mnom, pošaljite mi poruku ili me spomenite pisajući **`@%{discobot_username}`** bilo gdje."
+    tl2_promotion_message:
+      subject_template: "Čestitamo na povišenju vašeg nivoa povjerenja!"
+      text_body_template: |
+        Sada kada vam je povišen nivo povjerenja, došlo je vrijeme da naučite neke napredne mogućnosti!
+
+        Odgovori na ovu poruku sa `@%{discobot_username} %{reset_trigger}` kako bi saznali nešto više o tome šta je moguće sve raditi.
+
+        Pozivamo vas da se i dalje ovdje uključite  - uživamo što vas imamo ovdje na forumu.
     timeout:
       message: |-
         Hej @%{username}, samo vas provjeravam jer nisam vas čuo neko vrijeme.
@@ -113,6 +121,20 @@ bs_BA:
       random_mention:
         reply: |-
           Pozdrav! Kako bi saznali šta sve mogu raditi, recite `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          Trenutno znam kako uraditi sljedeće stvari:
+
+          `@%{discobot_username} %{reset_trigger} {ime-tutorijala}`
+          > Starta interaktivni tutorijal. `{ime-tutorijala}` može biti jedan od `%{tracks}`.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          %{quote_sample}
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: Možeš se na to osloniti
       do_not_understand:
         first_response: |-
           Hej, hvala za odgovor!
@@ -190,6 +212,12 @@ bs_BA:
       search:
         instructions: |-
           _psst_… Sakrio sam iznenađenje u ovoj temi. Ako ste spremni za izazov, ** odaberite ikonu za pretraživanje ** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> gore desno ↗ da ga potražite. Pokušajte tražiti pojam "capy&#8203;bara" u ovoj temi
+        hidden_message: |-
+          Kako ste uspjeli propustiti ovu kapibaru? :wink:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
+
+          Dali ste primjetili da ste sada na početku? Nahranite ovog jadnog gladnog kapibaru tako što će te **odgovoriti sa `%{search_answer}` emoji-em** i bit će te automatski vraćeni na kraj.
         reply: |-
           Yay ste ga pronašli: tada: - Za detaljnije pretrage, pređite na [full search page] (%{search_url}). - Da biste skočili bilo gdje u dugoj diskusiji, pokušajte kontrolirati vremensku liniju teme desno (i na dnu, na mobitelu). - Ako imate fizičku tipkovnicu: pritisnite <kbd>?</kbd> da biste videli naše korisne prečice na tastaturi.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.nl.yml b/plugins/discourse-narrative-bot/config/locales/server.nl.yml
index 55c0363946..da479e2934 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nl.yml
@@ -95,6 +95,11 @@ nl:
       random_mention:
         reply: |-
           Hallo! Zeg `@%{discobot_username} %{help_trigger}` om te ontdekken wat ik kan.
+        tracks: |-
+          Momenteel kan ik de volgende dingen doen:
+
+          `@%{discobot_username} %{reset_trigger} {name-of-tutorial}`
+          > Start een interactieve handleiding. `{name-of-tutorial}` kan één zijn van: `%{tracks}`.
       do_not_understand:
         first_response: |-
           Hallo, bedankt voor het antwoord!
@@ -103,8 +108,26 @@ nl:
         track_response: U kunt het opnieuw proberen, of als u deze stap wilt overslaan, `%{skip_trigger}` zeggen. Zeg anders `%{reset_trigger}` om opnieuw te beginnen.
     new_user_narrative:
       reset_trigger: "handleiding"
+      title: "Certificaat voor het invullen van een handleiding voor nieuwe gebruikers"
+      cert_title: "Als erkenning voor de succesvolle afronding van de gebruikershandleiding voor nieuwe gebruikers"
       hello:
         title: "Gegroet!"
+      formatting:
+        reply: |-
+          Uitstekend werk! HTML en BBCode werken ook voor de opmaak – om meer te leren, [probeer deze handleiding](http://commonmark.org/help) :nerd:
+        not_found: |-
+          Oh, ik vond geen opmaak in je antwoord. :pencil2:
+
+          Kan je opnieuw proberen? Gebruik de <kbd><b>B</b></kbd> vet of <kbd><i>I</i></kbd> cursief knoppen in de editor als je vast komt te zitten.
+      search:
+        reply: |-
+          Joepie! Je hebt het gevonden :tada:
+
+          - Voor meer gedetailleerde zoekopdrachten gaat u naar de [geavanceerde zoekpagina](%{search_url}).
+
+          - Om naar eender waar in een lange discussie te springen, probeer de tijdslijnbediening aan de rechterzijde (en onderaan, op mobiele aparaten).
+
+          - Indien je een fysiek toetsenbord hebt :keyboard:, druk <kbd>?</kbd> om onze handige snelkoppelingen te bekijken.
     advanced_user_narrative:
       reset_trigger: "geavanceerde handleiding"
       title: ":arrow_up: Geavanceerde gebruikersfuncties"
diff --git a/plugins/poll/config/locales/client.bs_BA.yml b/plugins/poll/config/locales/client.bs_BA.yml
index c343660c22..379da2075a 100644
--- a/plugins/poll/config/locales/client.bs_BA.yml
+++ b/plugins/poll/config/locales/client.bs_BA.yml
@@ -17,14 +17,25 @@ bs_BA:
         few: "ukupno glasova"
         other: "ukupno glasova"
       average_rating: "Prosječna ocjena: <strong>%{average}</strong>."
+      public:
+        title: "Glasanje je <strong>javno</strong>."
+      results:
+        groups:
+          title: "Morate biti pripadnik %{groups} kako bi ste mogli glasati u ovoj anketi."
+        vote:
+          title: "Rezultati će biti prikazani pritiskom na<strong>glasaj</strong>."
+        closed:
+          title: "Rezultati će biti prikazani onda kada glasanje bude <strong>završeno</strong>."
+        staff:
+          title: "Rezultati su prikazani samo <strong>uredništvu i admin</strong> korisnicima."
       multiple:
         help:
           at_least_min_options:
             one: "Odaberi barem <strong>%{count}</strong> opciju"
-            few: "Odaberi barem <strong>%{name}</strong> opcije"
-            other: "Odaberi barem <strong>%{name}</strong> opcija"
+            few: "Odaberi barem <strong>%{count}</strong> opcije"
+            other: "Odaberi barem <strong>%{count}</strong> opcija"
           up_to_max_options:
-            one: "Odaberi do <strong>%{count}</strong> opcije"
+            one: "Odaberi do <strong>%{count}</strong> opciju"
             few: "Odaberi do <strong>%{count}</strong> opcije"
             other: "Odaberi do <strong>%{count}</strong> opcija"
           x_options:
@@ -40,7 +51,15 @@ bs_BA:
         label: "Prikaži rezultate"
       hide-results:
         title: "Nazad na glasove"
+        label: "Prikaži glasanje"
+      group-results:
+        title: "Grupiraj glasove po polju korisnika"
+        label: "Prikaži raspodjelu"
+      ungroup-results:
+        title: "Kombiniraj sve glasove"
+        label: "Sakrij raspodjelu"
       export-results:
+        title: "Izvezi rezultate ankete (Export)"
         label: "Izvoz"
       open:
         title: "Otvori anketu"
@@ -50,13 +69,18 @@ bs_BA:
         title: "Zatvori anketu"
         label: "Zatvori"
         confirm: "Da li ste sigurni da želite da zatvorite ovu anketu?"
+      automatic_close:
+        closes_in: "Završava za <strong>%{timeLeft}</strong>."
+        age: "Završeno <strong>%{age}</strong>"
       error_while_toggling_status: "Izvinjavamo se, pojavio se problem u prebacivanju statutusa ove ankete"
       error_while_casting_votes: "Izvinjavamo se, pojavila se greška prikazivanja vaših glasova"
       error_while_fetching_voters: "Izvinjavamo se, pojavila se greška pri prikazivanju glasača"
+      error_while_exporting_results: "Izvinjavamo se, došlo je do greške izvoza rezultata vaše ankete."
       ui_builder:
         title: Izgradi anketu
         insert: Umetni anketu
         help:
+          options_count: Unesite barem jednu opciju
           invalid_values: Minimalna vrijednost mora biti manja od maksimalne.
           min_step_value: Minimalna vrijednost razmaka je 1
         poll_type:
@@ -66,6 +90,14 @@ bs_BA:
           number: Rejting broja
         poll_result:
           label: Rezultati
+          always: Uvjek vidljivo
+          vote: Prilikom glasanja
+          closed: Kada se završi
+          staff: Samo za urednike i admine
+        poll_groups:
+          label: Dozvoljene grupe
+        poll_chart_type:
+          label: Tip chart grafikona
         poll_config:
           max: Maksimalno
           min: Minimalno
diff --git a/plugins/poll/config/locales/server.bs_BA.yml b/plugins/poll/config/locales/server.bs_BA.yml
index a347f6a1dc..78bf651b41 100644
--- a/plugins/poll/config/locales/server.bs_BA.yml
+++ b/plugins/poll/config/locales/server.bs_BA.yml
@@ -11,11 +11,15 @@ bs_BA:
     poll_maximum_options: "Maksimalan broj dozvoljenih opcija u anketi."
     poll_edit_window_mins: "Broj minuta nakon kreiranja posta tokom kojih se mogu uređivati ankete."
     poll_minimum_trust_level_to_create: "Definišite minimalni nivo povjerenja potreban za kreiranje anketa."
+    poll_groupable_user_fields: "Set polja korisničkih imena koji može biti iskorišten za grupisanje i filtriranje rezultata ankete."
+    poll_export_data_explorer_query_id: "ID od Data Explorer Query koji se koristi za izvoz (export) rezultata ankete (0 za isključi)."
   poll:
     poll: "anketa"
     invalid_argument: "Nevažeća vrijednost '%{value}' za argument '%{argument}'."
     multiple_polls_without_name: "Postoji više anketa bez imena. Koristite atribut „ <code>name</code> “ da biste jedinstveno identifikovali vaše ankete."
     multiple_polls_with_same_name: "Postoji više anketa sa istim imenom: <strong>%{name}</strong> . Koristite atribut „ <code>name</code> “ da biste jedinstveno identifikovali vaše ankete."
+    default_poll_must_have_at_least_1_option: "Anketa mora imati barem 1 opciju."
+    named_poll_must_have_at_least_1_option: "Anketa imenovana <strong>%{name}</strong> mora imati barem 1 opciju."
     default_poll_must_have_less_options:
       one: "Anketa mora imati manje od %{count} opcije."
       few: "Anketa mora imati manje od %{count} opcija."
@@ -26,6 +30,8 @@ bs_BA:
       other: "Anketa nazvana <strong>%{name}</strong> mora imati manje od %{count} opcija."
     default_poll_must_have_different_options: "Anketa mora imati različite opcije."
     named_poll_must_have_different_options: "Anketa nazvana <strong>%{name}</strong> mora imati različite opcije."
+    default_poll_must_not_have_any_empty_options: "Anketa ne smije imati praznu opciju."
+    named_poll_must_not_have_any_empty_options: "Anketa imenovana sa <strong>%{name}</strong> ne smije imati prazne opcije."
     default_poll_with_multiple_choices_has_invalid_parameters: "Anketa sa više izbora ima nevažeće parametre."
     named_poll_with_multiple_choices_has_invalid_parameters: "Anketa nazvana <strong>%{name}</strong> sa višestrukim izborom ima nevažeće parametre."
     requires_at_least_1_valid_option: "Morate odabrati najmanje 1 važeću opciju."
@@ -42,3 +48,5 @@ bs_BA:
     insufficient_rights_to_create: "Nije vam dozvoljeno da kreirate ankete."
     email:
       link_to_poll: "Kliknite za pregled ankete."
+    user_field:
+      no_data: "Bez podataka"

From 5b3630dba3764ca5aabed6f8cdd1b0bd17ded175 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 5 Mar 2020 17:50:29 +0000
Subject: [PATCH 0087/1830] FIX: Do not raise an error when in:all search is
 performed by anon (#9113)

Also improve in:all specs to catch to catch similar failures
---
 lib/search.rb                  |  2 +-
 spec/components/search_spec.rb | 37 ++++++++++++++++------------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/lib/search.rb b/lib/search.rb
index 1869c0ce45..e7e97d8ede 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -176,7 +176,7 @@ class Search
       @search_context = @guardian.user
     end
 
-    if @search_all_topics
+    if @search_all_topics && @guardian.user
       @opts[:type_filter] = "all_topics"
     end
 
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index 7e5590c989..c4578148d7 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -315,56 +315,53 @@ describe Search do
         TopicAllowedUser.create!(user_id: u2.id, topic_id: private_topic.id)
 
         # private only
-        results = Search.execute('cheese',
-                                type_filter: 'all_topics',
+        results = Search.execute('in:all cheese',
                                 guardian: Guardian.new(u1))
         expect(results.posts.length).to eq(1)
 
         # public only
-        results = Search.execute('eggs',
-                                type_filter: 'all_topics',
+        results = Search.execute('in:all eggs',
                                 guardian: Guardian.new(u1))
         expect(results.posts.length).to eq(1)
 
         # both
-        results = Search.execute('spam',
-                                type_filter: 'all_topics',
+        results = Search.execute('in:all spam',
                                 guardian: Guardian.new(u1))
         expect(results.posts.length).to eq(2)
 
+        # for anon
+        results = Search.execute('in:all spam',
+                                guardian: Guardian.new)
+        expect(results.posts.length).to eq(1)
+
         # nonparticipatory user
-        results = Search.execute('cheese',
-                                type_filter: 'all_topics',
+        results = Search.execute('in:all cheese',
                                 guardian: Guardian.new(u3))
         expect(results.posts.length).to eq(0)
 
-        results = Search.execute('eggs',
-                                type_filter: 'all_topics',
+        results = Search.execute('in:all eggs',
                                 guardian: Guardian.new(u3))
         expect(results.posts.length).to eq(1)
 
-        results = Search.execute('spam',
-                                type_filter: 'all_topics',
+        results = Search.execute('in:all spam',
                                 guardian: Guardian.new(u3))
         expect(results.posts.length).to eq(1)
 
         # Admin doesn't see private topic
-        results = Search.execute('spam',
-                  type_filter: 'all_topics',
+        results = Search.execute('in:all spam',
                   guardian: Guardian.new(u4))
         expect(results.posts.length).to eq(1)
 
         # same keyword for different users
-        results = Search.execute('ham',
-                                type_filter: 'all_topics',
+        results = Search.execute('in:all ham',
                                 guardian: Guardian.new(u1))
         expect(results.posts.length).to eq(2)
-        results = Search.execute('ham',
-                                type_filter: 'all_topics',
+
+        results = Search.execute('in:all ham',
                                 guardian: Guardian.new(u2))
         expect(results.posts.length).to eq(2)
-        results = Search.execute('ham',
-                                type_filter: 'all_topics',
+
+        results = Search.execute('in:all ham',
                                 guardian: Guardian.new(u3))
         expect(results.posts.length).to eq(1)
       end

From a46741cbb96cd7d6463fb345352707af36d8d859 Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Thu, 5 Mar 2020 12:25:10 -0600
Subject: [PATCH 0088/1830] DEV: Clean up selectors on backup modal (#9114)

---
 .../javascripts/admin/templates/modal/admin-start-backup.hbs  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs b/app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs
index dd201e2aed..011de55de9 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs
@@ -1,12 +1,14 @@
 {{#d-modal-body title="admin.backups.operations.backup.confirm"}}
   {{d-button
-    class="btn-primary"
+    class="btn-primary backup-with-uploads"
     action=(action "startBackupWithUploads")
     label="yes_value"}}
   {{d-button
+    class="backup-no-uploads"
     action=(action "startBackupWithoutUploads")
     label="admin.backups.operations.backup.without_uploads"}}
   {{d-button
+    class="btn-default"
     action=(action "cancel")
     label="no_value"}}
 {{/d-modal-body}}

From 10ddb8a9c4bea55ea4f921b893c42635e79c6b70 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 5 Mar 2020 10:51:51 -0800
Subject: [PATCH 0089/1830] FIX: Use destroy_all instead of delete_all for
 shared drafts

Rails has an odd behavior for calling .delete_all on a has_many relation - the
default behavior is to nullify the foreign key fields instead of actually
'DELETE'ing the records.

Additionally, publishing a shared draft topic creates a PostRevision that the
NotifyPostRevision job picks up which is then promptly deleted.

Use destroy_all when cleaning up the revisions and have the NotifyPostRevision
job tolerate deleted PostRevision records.

This takes a small performance hit (several SQL DELETEs instead of just one)
but shouldn't be too much of an issue (high cardinalities range from 30-100).
---
 app/jobs/regular/notify_post_revision.rb | 2 +-
 lib/topic_publisher.rb                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/jobs/regular/notify_post_revision.rb b/app/jobs/regular/notify_post_revision.rb
index 8d2160699c..f4b0262e06 100644
--- a/app/jobs/regular/notify_post_revision.rb
+++ b/app/jobs/regular/notify_post_revision.rb
@@ -6,7 +6,7 @@ module Jobs
       raise Discourse::InvalidParameters.new(:user_ids) unless args[:user_ids]
 
       post_revision = PostRevision.find_by(id: args[:post_revision_id])
-      raise Discourse::InvalidParameters.new(:post_revision_id) unless post_revision
+      return if post_revision.nil?
 
       ActiveRecord::Base.transaction do
         User.where(id: args[:user_ids]).find_each do |user|
diff --git a/lib/topic_publisher.rb b/lib/topic_publisher.rb
index b78b58bd11..63afb8dede 100644
--- a/lib/topic_publisher.rb
+++ b/lib/topic_publisher.rb
@@ -36,7 +36,7 @@ class TopicPublisher
       op = @topic.first_post
 
       if op.present?
-        op.revisions.delete_all
+        op.revisions.destroy_all
 
         op.update_columns(
           version: 1,

From 670b855f947052d990b27599e14cdd176257ed6b Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 5 Mar 2020 11:19:22 -0800
Subject: [PATCH 0090/1830] FEATURE: Treat /go/ as a server-side route

Ninja superuser implementation of routable permalinks with no UI or
permission changes yet.
---
 app/assets/javascripts/discourse/lib/url.js.es6 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 3dc13d0d79..c09baee201 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -25,6 +25,7 @@ const SERVER_SIDE_ONLY = [
   /^\/posts\/\d+\/raw/,
   /^\/raw\/\d+/,
   /^\/wizard/,
+  /^\/go\//,  // EXPERIMENTAL: https://meta.discourse.org/t/-/142605
   /\.rss$/,
   /\.json$/,
   /^\/admin\/upgrade$/,

From 9ab2a15691de4c280e234be8d50b0526b657db83 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 5 Mar 2020 15:37:49 -0500
Subject: [PATCH 0091/1830] Warn if their CDN URL doesn't have a protocol

This can be confusing:
https://meta.discourse.org/t/discourse-cdn-url-breaks-rebuild-restore/136844
---
 config/application.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/application.rb b/config/application.rb
index 52820120be..e2b271c947 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -35,6 +35,9 @@ unless Rails.env.test? && ENV['LOAD_PLUGINS'] != "1"
   require_relative '../lib/custom_setting_providers'
 end
 GlobalSetting.load_defaults
+if GlobalSetting.try(:cdn_url).present? && GlobalSetting.cdn_url !~ /^https?:\/\//
+  STDERR.puts "WARNING: Your CDN URL does not begin with a protocol like `https://` - this is probably not going to work"
+end
 
 if ENV['SKIP_DB_AND_REDIS'] == '1'
   GlobalSetting.skip_db = true

From d1cceff0e7c4c36e4ec3c38bd8fd7899b69566cc Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 5 Mar 2020 12:46:03 -0800
Subject: [PATCH 0092/1830] DEV: fix formatting

---
 app/assets/javascripts/discourse/lib/url.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index c09baee201..93cad9b4c4 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -25,7 +25,7 @@ const SERVER_SIDE_ONLY = [
   /^\/posts\/\d+\/raw/,
   /^\/raw\/\d+/,
   /^\/wizard/,
-  /^\/go\//,  // EXPERIMENTAL: https://meta.discourse.org/t/-/142605
+  /^\/go\//, // EXPERIMENTAL: https://meta.discourse.org/t/-/142605
   /\.rss$/,
   /\.json$/,
   /^\/admin\/upgrade$/,

From 4bb8db024c247f20af9245723ebea4c474eeb16a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 5 Mar 2020 16:04:31 -0500
Subject: [PATCH 0093/1830] FIX: Don't allow people to clear the upload bucket
 while it's enabled

---
 lib/site_settings/validations.rb           | 2 ++
 spec/lib/site_settings/validations_spec.rb | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/lib/site_settings/validations.rb b/lib/site_settings/validations.rb
index 56987b0dfe..0bf13f7606 100644
--- a/lib/site_settings/validations.rb
+++ b/lib/site_settings/validations.rb
@@ -143,6 +143,8 @@ module SiteSettings::Validations
 
   def validate_s3_upload_bucket(new_val)
     validate_bucket_setting("s3_upload_bucket", new_val, SiteSetting.s3_backup_bucket)
+
+    validate_error(:s3_upload_bucket_is_required, setting_name: 's3_upload_bucket') if new_val.blank? && SiteSetting.enable_s3_uploads?
   end
 
   def validate_s3_backup_bucket(new_val)
diff --git a/spec/lib/site_settings/validations_spec.rb b/spec/lib/site_settings/validations_spec.rb
index 7f346d4d5c..69ab73920b 100644
--- a/spec/lib/site_settings/validations_spec.rb
+++ b/spec/lib/site_settings/validations_spec.rb
@@ -103,6 +103,15 @@ describe SiteSettings::Validations do
         SiteSetting.s3_backup_bucket = "my-awesome-bucket/foo"
         expect { validate("my-awesome-bucket/foo/uploads") }.to raise_error(Discourse::InvalidParameters, error_message)
       end
+
+      it "cannot be made blank unless the setting is false" do
+        SiteSetting.s3_backup_bucket = "really-real-cool-bucket"
+        SiteSetting.enable_s3_uploads = true
+
+        expect { validate("") }.to raise_error(Discourse::InvalidParameters)
+        SiteSetting.enable_s3_uploads = false
+        validate("")
+      end
     end
   end
 

From 3e21d40bc4b8c92ac3b3a3de0cfdce8b8bbcce5e Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 5 Mar 2020 16:10:28 -0500
Subject: [PATCH 0094/1830] Version bump to v2.5.0.beta2

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

diff --git a/lib/version.rb b/lib/version.rb
index 85a9a0503c..2d8503a967 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -9,7 +9,7 @@ module Discourse
       MAJOR = 2
       MINOR = 5
       TINY  = 0
-      PRE   = 'beta1'
+      PRE   = 'beta2'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end

From d4fc76b335d012275b06b7ce80d0c1b98f9db33d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 5 Mar 2020 16:29:49 -0500
Subject: [PATCH 0095/1830] Revert "FIX: Don't allow people to clear the upload
 bucket while it's enabled"

This reverts commit 4bb8db024c247f20af9245723ebea4c474eeb16a.
---
 lib/site_settings/validations.rb           | 2 --
 spec/lib/site_settings/validations_spec.rb | 9 ---------
 2 files changed, 11 deletions(-)

diff --git a/lib/site_settings/validations.rb b/lib/site_settings/validations.rb
index 0bf13f7606..56987b0dfe 100644
--- a/lib/site_settings/validations.rb
+++ b/lib/site_settings/validations.rb
@@ -143,8 +143,6 @@ module SiteSettings::Validations
 
   def validate_s3_upload_bucket(new_val)
     validate_bucket_setting("s3_upload_bucket", new_val, SiteSetting.s3_backup_bucket)
-
-    validate_error(:s3_upload_bucket_is_required, setting_name: 's3_upload_bucket') if new_val.blank? && SiteSetting.enable_s3_uploads?
   end
 
   def validate_s3_backup_bucket(new_val)
diff --git a/spec/lib/site_settings/validations_spec.rb b/spec/lib/site_settings/validations_spec.rb
index 69ab73920b..7f346d4d5c 100644
--- a/spec/lib/site_settings/validations_spec.rb
+++ b/spec/lib/site_settings/validations_spec.rb
@@ -103,15 +103,6 @@ describe SiteSettings::Validations do
         SiteSetting.s3_backup_bucket = "my-awesome-bucket/foo"
         expect { validate("my-awesome-bucket/foo/uploads") }.to raise_error(Discourse::InvalidParameters, error_message)
       end
-
-      it "cannot be made blank unless the setting is false" do
-        SiteSetting.s3_backup_bucket = "really-real-cool-bucket"
-        SiteSetting.enable_s3_uploads = true
-
-        expect { validate("") }.to raise_error(Discourse::InvalidParameters)
-        SiteSetting.enable_s3_uploads = false
-        validate("")
-      end
     end
   end
 

From 54f67661acf04e8c501634823a1c7e183f48c95c Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Thu, 5 Mar 2020 19:21:38 -0300
Subject: [PATCH 0096/1830] FEATURE: Option to connect to Redis using SSL

---
 app/models/global_setting.rb   | 2 ++
 config/discourse_defaults.conf | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index eb3592d1e4..57d22d6618 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -172,6 +172,7 @@ class GlobalSetting
         c[:db] = redis_db if redis_db != 0
         c[:db] = 1 if Rails.env == "test"
         c[:id] = nil if redis_skip_client_commands
+        c[:ssl] = true if redis_use_ssl
 
         c.freeze
       end
@@ -195,6 +196,7 @@ class GlobalSetting
         c[:db] = message_bus_redis_db if message_bus_redis_db != 0
         c[:db] = 1 if Rails.env == "test"
         c[:id] = nil if message_bus_redis_skip_client_commands
+        c[:ssl] = true if redis_use_ssl
 
         c.freeze
       end
diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf
index aee0f88ab2..0a4eb66dd7 100644
--- a/config/discourse_defaults.conf
+++ b/config/discourse_defaults.conf
@@ -120,6 +120,9 @@ redis_password =
 # skip configuring client id for cloud providers who support no client commands
 redis_skip_client_commands = false
 
+# uses SSL for all Redis connections if true
+redis_use_ssl = false
+
 # message bus redis server switch
 message_bus_redis_enabled = false
 

From 243284f998e213034f9f0c6b228f97f7c9834fdd Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Thu, 5 Mar 2020 13:55:35 -1000
Subject: [PATCH 0097/1830] FEATURE: prevent accidental canceling when drafting
 penalties (#9105)

Pop up a confirmation box when there is input. This prevents accidental closing
of the dialog boxes due to clicking outside.

This adds a development hook on modals in the form of a `beforeClose`
function. Modal windows can abort the close if the funtion returns false.

Additionally fixing a few issues with loop and state on the modal popups:

Escape key with bootbox is keyup.
Updating modal to close on keyup as well so escape key is working.
Fixes an issue where pressing esc will loop immediately back to the modal by:
keydown -> bootbox -> keyup -> acts as "cancel", restores modal

Needs a next call to reopenModal otherwise, keyup is handled again by the modal.
Fixes an issue where pressing esc will loop immediately back to the confirm:
esc keyup will be handled and bubble immediately back to the modal.

Additionally, only handle key events when the #discourse-modal is visible.
This resolves issues where escape or enter events were being handled by
a hidden modal window.
---
 .../admin/mixins/penalty-controller.js.es6    | 24 +++++++++++++++++-
 .../discourse/components/d-modal.js.es6       | 17 +++++++------
 .../discourse/routes/application.js.es6       | 15 +++++++++--
 config/locales/client.en.yml                  |  1 +
 .../acceptance/admin-suspend-user-test.js.es6 | 25 +++++++++++++++++++
 test/javascripts/acceptance/modal-test.js.es6 | 10 ++++----
 6 files changed, 77 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
index cb07e9d2ca..f923710649 100644
--- a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
+++ b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
@@ -1,6 +1,7 @@
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Mixin from "@ember/object/mixin";
+import { next } from "@ember/runloop";
 import { Promise } from "rsvp";
 
 export default Mixin.create(ModalFunctionality, {
@@ -11,6 +12,7 @@ export default Mixin.create(ModalFunctionality, {
   user: null,
   postId: null,
   successCallback: null,
+  confirmClose: false,
 
   resetModal() {
     this.setProperties({
@@ -21,10 +23,30 @@ export default Mixin.create(ModalFunctionality, {
       postEdit: null,
       postAction: "delete",
       before: null,
-      successCallback: null
+      successCallback: null,
+      confirmClose: false
     });
   },
 
+  beforeClose() {
+    // prompt a confirmation if we have unsaved content
+    if (
+      (this.reason && this.reason.length > 1) ||
+      (this.message && this.message.length > 1 && !this.confirmClose)
+    ) {
+      this.send("hideModal");
+      bootbox.confirm(I18n.t("admin.user.confirm_cancel_penalty"), result => {
+        if (result) {
+          this.set("confirmClose", true);
+          this.send("closeModal");
+        } else {
+          next(() => this.send("reopenModal"));
+        }
+      });
+      return false;
+    }
+  },
+
   penalize(cb) {
     let before = this.before;
     let promise = before ? before() : Promise.resolve();
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index 300a3e585c..eeae7edc3f 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -31,13 +31,16 @@ export default Component.extend({
 
   @on("didInsertElement")
   setUp() {
-    $("html").on("keydown.discourse-modal", e => {
-      if (e.which === 27 && this.dismissable) {
-        next(() => $(".modal-header button.modal-close").click());
-      }
+    $("html").on("keyup.discourse-modal", e => {
+      //only respond to events when the modal is visible
+      if ($("#discourse-modal:visible").length > 0) {
+        if (e.which === 27 && this.dismissable) {
+          next(() => $(".modal-header button.modal-close").click());
+        }
 
-      if (e.which === 13 && this.triggerClickOnEnter(e)) {
-        next(() => $(".modal-footer .btn-primary").click());
+        if (e.which === 13 && this.triggerClickOnEnter(e)) {
+          next(() => $(".modal-footer .btn-primary").click());
+        }
       }
     });
 
@@ -46,7 +49,7 @@ export default Component.extend({
 
   @on("willDestroyElement")
   cleanUp() {
-    $("html").off("keydown.discourse-modal");
+    $("html").off("keyup.discourse-modal");
     this.appEvents.off("modal:body-shown", this, "_modalBodyShown");
   },
 
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index e877d8ceff..8dca333360 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -157,12 +157,23 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
 
     // Close the current modal, and destroy its state.
     closeModal() {
-      this.render("hide-modal", { into: "modal", outlet: "modalBody" });
-
       const route = getOwner(this).lookup("route:application");
       let modalController = route.controllerFor("modal");
       const controllerName = modalController.get("name");
 
+      if (controllerName) {
+        const controller = getOwner(this).lookup(
+          `controller:${controllerName}`
+        );
+        if (controller && controller.beforeClose) {
+          if (false === controller.beforeClose()) {
+            return;
+          }
+        }
+      }
+
+      this.render("hide-modal", { into: "modal", outlet: "modalBody" });
+
       if (controllerName) {
         const controller = getOwner(this).lookup(
           `controller:${controllerName}`
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 127c964d04..c7705ab948 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4291,6 +4291,7 @@ en:
           threshold_reached: "Received too many bounces from that email."
         trust_level_change_failed: "There was a problem changing the user's trust level."
         suspend_modal_title: "Suspend User"
+        confirm_cancel_penalty: "Are you sure you want to discard the penalty?"
         trust_level_2_users: "Trust Level 2 Users"
         trust_level_3_requirements: "Trust Level 3 Requirements"
         trust_level_locked_tip: "trust level is locked, system will not promote or demote user"
diff --git a/test/javascripts/acceptance/admin-suspend-user-test.js.es6 b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
index d9983848ca..936f7080bb 100644
--- a/test/javascripts/acceptance/admin-suspend-user-test.js.es6
+++ b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
@@ -34,6 +34,31 @@ QUnit.test("suspend a user - cancel", async assert => {
   assert.equal(find(".suspend-user-modal:visible").length, 0);
 });
 
+QUnit.test("suspend a user - cancel with input", async assert => {
+  await visit("/admin/users/1234/regular");
+  await click(".suspend-user");
+
+  assert.equal(find(".suspend-user-modal:visible").length, 1);
+
+  await fillIn(".suspend-reason", "for breaking the rules");
+  await fillIn(".suspend-message", "this is an email reason why");
+
+  await click(".d-modal-cancel");
+
+  assert.equal(find(".bootbox.modal:visible").length, 1);
+
+  await click(".modal-footer .btn-default");
+  assert.equal(find(".suspend-user-modal:visible").length, 1);
+  assert.equal(
+    find(".suspend-message")[0].value,
+    "this is an email reason why"
+  );
+
+  await click(".d-modal-cancel");
+  await click(".modal-footer .btn-primary");
+  assert.equal(find(".suspend-user-modal:visible").length, 0);
+});
+
 QUnit.test("suspend, then unsuspend a user", async assert => {
   const suspendUntilCombobox = selectKit(".suspend-until .combobox");
 
diff --git a/test/javascripts/acceptance/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js.es6
index 13725f4d6c..4e43be89bb 100644
--- a/test/javascripts/acceptance/modal-test.js.es6
+++ b/test/javascripts/acceptance/modal-test.js.es6
@@ -28,7 +28,7 @@ QUnit.test("modal", async function(assert) {
   await click(".login-button");
   assert.ok(find(".d-modal:visible").length === 1, "modal should reappear");
 
-  await keyEvent("#main-outlet", "keydown", 27);
+  await keyEvent("#main-outlet", "keyup", 27);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "ESC should close the modal"
@@ -47,7 +47,7 @@ QUnit.test("modal", async function(assert) {
     find(".d-modal:visible").length === 1,
     "modal should not disappear when you click outside"
   );
-  await keyEvent("#main-outlet", "keydown", 27);
+  await keyEvent("#main-outlet", "keyup", 27);
   assert.ok(
     find(".d-modal:visible").length === 1,
     "ESC should not close the modal"
@@ -61,7 +61,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
 
   await click(".toggle-admin-menu");
   await click(".topic-admin-status-update button");
-  await keyEvent(".d-modal", "keydown", 13);
+  await keyEvent(".d-modal", "keyup", 13);
 
   assert.ok(
     find("#modal-alert:visible").length === 1,
@@ -72,7 +72,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
     "hitting Enter does not dismiss modal due to alert error"
   );
 
-  await keyEvent("#main-outlet", "keydown", 27);
+  await keyEvent("#main-outlet", "keyup", 27);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "ESC should close the modal"
@@ -82,7 +82,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
 
   await click(".d-editor-button-bar .btn.link");
 
-  await keyEvent(".d-modal", "keydown", 13);
+  await keyEvent(".d-modal", "keyup", 13);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "modal should disappear on hitting Enter"

From 6fe91bbbbb9a9bd076db6371c1f814f71b0ee711 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Thu, 5 Mar 2020 15:29:51 -1000
Subject: [PATCH 0098/1830] Revert "FEATURE: prevent accidental canceling when
 drafting penalties (#9105)" (#9122)

This reverts commit 243284f998e213034f9f0c6b228f97f7c9834fdd.

There are some issues in how the JS tests interact that I will need to figure out here before this can be merged.
---
 .../admin/mixins/penalty-controller.js.es6    | 24 +-----------------
 .../discourse/components/d-modal.js.es6       | 17 ++++++-------
 .../discourse/routes/application.js.es6       | 15 ++---------
 config/locales/client.en.yml                  |  1 -
 .../acceptance/admin-suspend-user-test.js.es6 | 25 -------------------
 test/javascripts/acceptance/modal-test.js.es6 | 10 ++++----
 6 files changed, 15 insertions(+), 77 deletions(-)

diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
index f923710649..cb07e9d2ca 100644
--- a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
+++ b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
@@ -1,7 +1,6 @@
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Mixin from "@ember/object/mixin";
-import { next } from "@ember/runloop";
 import { Promise } from "rsvp";
 
 export default Mixin.create(ModalFunctionality, {
@@ -12,7 +11,6 @@ export default Mixin.create(ModalFunctionality, {
   user: null,
   postId: null,
   successCallback: null,
-  confirmClose: false,
 
   resetModal() {
     this.setProperties({
@@ -23,30 +21,10 @@ export default Mixin.create(ModalFunctionality, {
       postEdit: null,
       postAction: "delete",
       before: null,
-      successCallback: null,
-      confirmClose: false
+      successCallback: null
     });
   },
 
-  beforeClose() {
-    // prompt a confirmation if we have unsaved content
-    if (
-      (this.reason && this.reason.length > 1) ||
-      (this.message && this.message.length > 1 && !this.confirmClose)
-    ) {
-      this.send("hideModal");
-      bootbox.confirm(I18n.t("admin.user.confirm_cancel_penalty"), result => {
-        if (result) {
-          this.set("confirmClose", true);
-          this.send("closeModal");
-        } else {
-          next(() => this.send("reopenModal"));
-        }
-      });
-      return false;
-    }
-  },
-
   penalize(cb) {
     let before = this.before;
     let promise = before ? before() : Promise.resolve();
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index eeae7edc3f..300a3e585c 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -31,16 +31,13 @@ export default Component.extend({
 
   @on("didInsertElement")
   setUp() {
-    $("html").on("keyup.discourse-modal", e => {
-      //only respond to events when the modal is visible
-      if ($("#discourse-modal:visible").length > 0) {
-        if (e.which === 27 && this.dismissable) {
-          next(() => $(".modal-header button.modal-close").click());
-        }
+    $("html").on("keydown.discourse-modal", e => {
+      if (e.which === 27 && this.dismissable) {
+        next(() => $(".modal-header button.modal-close").click());
+      }
 
-        if (e.which === 13 && this.triggerClickOnEnter(e)) {
-          next(() => $(".modal-footer .btn-primary").click());
-        }
+      if (e.which === 13 && this.triggerClickOnEnter(e)) {
+        next(() => $(".modal-footer .btn-primary").click());
       }
     });
 
@@ -49,7 +46,7 @@ export default Component.extend({
 
   @on("willDestroyElement")
   cleanUp() {
-    $("html").off("keyup.discourse-modal");
+    $("html").off("keydown.discourse-modal");
     this.appEvents.off("modal:body-shown", this, "_modalBodyShown");
   },
 
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 8dca333360..e877d8ceff 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -157,23 +157,12 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
 
     // Close the current modal, and destroy its state.
     closeModal() {
+      this.render("hide-modal", { into: "modal", outlet: "modalBody" });
+
       const route = getOwner(this).lookup("route:application");
       let modalController = route.controllerFor("modal");
       const controllerName = modalController.get("name");
 
-      if (controllerName) {
-        const controller = getOwner(this).lookup(
-          `controller:${controllerName}`
-        );
-        if (controller && controller.beforeClose) {
-          if (false === controller.beforeClose()) {
-            return;
-          }
-        }
-      }
-
-      this.render("hide-modal", { into: "modal", outlet: "modalBody" });
-
       if (controllerName) {
         const controller = getOwner(this).lookup(
           `controller:${controllerName}`
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c7705ab948..127c964d04 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4291,7 +4291,6 @@ en:
           threshold_reached: "Received too many bounces from that email."
         trust_level_change_failed: "There was a problem changing the user's trust level."
         suspend_modal_title: "Suspend User"
-        confirm_cancel_penalty: "Are you sure you want to discard the penalty?"
         trust_level_2_users: "Trust Level 2 Users"
         trust_level_3_requirements: "Trust Level 3 Requirements"
         trust_level_locked_tip: "trust level is locked, system will not promote or demote user"
diff --git a/test/javascripts/acceptance/admin-suspend-user-test.js.es6 b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
index 936f7080bb..d9983848ca 100644
--- a/test/javascripts/acceptance/admin-suspend-user-test.js.es6
+++ b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
@@ -34,31 +34,6 @@ QUnit.test("suspend a user - cancel", async assert => {
   assert.equal(find(".suspend-user-modal:visible").length, 0);
 });
 
-QUnit.test("suspend a user - cancel with input", async assert => {
-  await visit("/admin/users/1234/regular");
-  await click(".suspend-user");
-
-  assert.equal(find(".suspend-user-modal:visible").length, 1);
-
-  await fillIn(".suspend-reason", "for breaking the rules");
-  await fillIn(".suspend-message", "this is an email reason why");
-
-  await click(".d-modal-cancel");
-
-  assert.equal(find(".bootbox.modal:visible").length, 1);
-
-  await click(".modal-footer .btn-default");
-  assert.equal(find(".suspend-user-modal:visible").length, 1);
-  assert.equal(
-    find(".suspend-message")[0].value,
-    "this is an email reason why"
-  );
-
-  await click(".d-modal-cancel");
-  await click(".modal-footer .btn-primary");
-  assert.equal(find(".suspend-user-modal:visible").length, 0);
-});
-
 QUnit.test("suspend, then unsuspend a user", async assert => {
   const suspendUntilCombobox = selectKit(".suspend-until .combobox");
 
diff --git a/test/javascripts/acceptance/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js.es6
index 4e43be89bb..13725f4d6c 100644
--- a/test/javascripts/acceptance/modal-test.js.es6
+++ b/test/javascripts/acceptance/modal-test.js.es6
@@ -28,7 +28,7 @@ QUnit.test("modal", async function(assert) {
   await click(".login-button");
   assert.ok(find(".d-modal:visible").length === 1, "modal should reappear");
 
-  await keyEvent("#main-outlet", "keyup", 27);
+  await keyEvent("#main-outlet", "keydown", 27);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "ESC should close the modal"
@@ -47,7 +47,7 @@ QUnit.test("modal", async function(assert) {
     find(".d-modal:visible").length === 1,
     "modal should not disappear when you click outside"
   );
-  await keyEvent("#main-outlet", "keyup", 27);
+  await keyEvent("#main-outlet", "keydown", 27);
   assert.ok(
     find(".d-modal:visible").length === 1,
     "ESC should not close the modal"
@@ -61,7 +61,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
 
   await click(".toggle-admin-menu");
   await click(".topic-admin-status-update button");
-  await keyEvent(".d-modal", "keyup", 13);
+  await keyEvent(".d-modal", "keydown", 13);
 
   assert.ok(
     find("#modal-alert:visible").length === 1,
@@ -72,7 +72,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
     "hitting Enter does not dismiss modal due to alert error"
   );
 
-  await keyEvent("#main-outlet", "keyup", 27);
+  await keyEvent("#main-outlet", "keydown", 27);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "ESC should close the modal"
@@ -82,7 +82,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
 
   await click(".d-editor-button-bar .btn.link");
 
-  await keyEvent(".d-modal", "keyup", 13);
+  await keyEvent(".d-modal", "keydown", 13);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "modal should disappear on hitting Enter"

From 494379201d8e2927a08f7b3656eb7d1f2949d044 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 6 Mar 2020 12:57:12 +1100
Subject: [PATCH 0099/1830] DEV: attempt to stabilize flaky spec

Spec was checking implementation when it did not need to, temp file was blank
so optimized image should be blank
---
 spec/models/optimized_image_spec.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/models/optimized_image_spec.rb b/spec/models/optimized_image_spec.rb
index a7c8e2e352..e90029bec3 100644
--- a/spec/models/optimized_image_spec.rb
+++ b/spec/models/optimized_image_spec.rb
@@ -312,9 +312,10 @@ describe OptimizedImage do
         end
       end
 
-      context "when an error happened while generatign the thumbnail" do
+      context "when we have a bad file returned" do
         it "returns nil" do
-          OptimizedImage.expects(:resize).returns(false)
+          # tempfile is empty
+          # this can not be resized
           expect(OptimizedImage.create_for(s3_upload, 100, 200)).to eq(nil)
         end
       end

From 29ccdf5d3527d61b655c28c8790c94a1bdd6dcba Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 6 Mar 2020 14:37:40 +1000
Subject: [PATCH 0100/1830] FIX: Show a nicer error if name/code missing for
 TOTP/Security Keys (#9124)

Meta: https://meta.discourse.org/t/improve-error-message-when-not-including-name-setting-up-totp/143339

* when the user creates a TOTP second factor method we want
to show them a nicer error if they forget to add a name
or the code from the app, instead of the param missing error
* also add a client-side check for this and for security key name,
no need to bother the server if we can help it
---
 .../second-factor-add-security-key.js.es6     |  7 +++
 .../controllers/second-factor-add-totp.js.es6 |  8 ++-
 .../modal/second-factor-add-security-key.hbs  |  4 +-
 app/controllers/users_controller.rb           |  8 ++-
 config/locales/client.en.yml                  |  2 +
 config/locales/server.en.yml                  |  2 +
 spec/requests/users_controller_spec.rb        | 60 ++++++++++++++++++-
 .../acceptance/preferences-test.js.es6        | 40 +++++++++++--
 8 files changed, 120 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
index 54f41fc405..2cb03f968f 100644
--- a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
+++ b/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
@@ -53,6 +53,13 @@ export default Controller.extend(ModalFunctionality, {
 
   actions: {
     registerSecurityKey() {
+      if (!this.securityKeyName) {
+        this.set(
+          "errorMessage",
+          I18n.t("user.second_factor.security_key.name_required_error")
+        );
+        return;
+      }
       const publicKeyCredentialCreationOptions = {
         challenge: Uint8Array.from(this.challenge, c => c.charCodeAt(0)),
         rp: {
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-totp.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-add-totp.js.es6
index eab4f2943f..10752e41c7 100644
--- a/app/assets/javascripts/discourse/controllers/second-factor-add-totp.js.es6
+++ b/app/assets/javascripts/discourse/controllers/second-factor-add-totp.js.es6
@@ -45,7 +45,13 @@ export default Controller.extend(ModalFunctionality, {
     },
 
     enableSecondFactor() {
-      if (!this.secondFactorToken) return;
+      if (!this.secondFactorToken || !this.secondFactorName) {
+        this.set(
+          "errorMessage",
+          I18n.t("user.second_factor.totp.name_and_code_required_error")
+        );
+        return;
+      }
       this.set("loading", true);
 
       this.model
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
index d63b5fe8eb..36ede3f634 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
@@ -16,7 +16,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{input value=securityKeyName id='test' placeholder='security key name'}}
+        {{input value=securityKeyName id='security-key-name' placeholder='security key name'}}
       </div>
     </div>
 
@@ -24,7 +24,7 @@
       <div class="controls">
         {{#unless webauthnUnsupported}}
           {{d-button
-            class="btn-primary add-totp"
+            class="btn-primary add-security-key"
             action=(action "registerSecurityKey")
             label="user.second_factor.security_key.register"}}
         {{/unless}}
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e96a79c953..33e7bdce6c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1211,8 +1211,12 @@ class UsersController < ApplicationController
   end
 
   def enable_second_factor_totp
-    params.require(:second_factor_token)
-    params.require(:name)
+    if params[:second_factor_token].blank?
+      return render json: failed_json.merge(error: I18n.t("login.missing_second_factor_code"))
+    end
+    if params[:name].blank?
+      return render json: failed_json.merge(error: I18n.t("login.missing_second_factor_name"))
+    end
     auth_token = params[:second_factor_token]
 
     totp_data = secure_session["staged-totp-#{current_user.id}"]
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 127c964d04..a18720a293 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1023,6 +1023,7 @@ en:
           title: "Token-Based Authenticators"
           add: "New Authenticator"
           default_name: "My Authenticator"
+          name_and_code_required_error: "You must provide a name and the code from your authenticator app."
         security_key:
           register: "Register"
           title: "Security Keys"
@@ -1033,6 +1034,7 @@ en:
           edit: "Edit Security Key"
           edit_description: "Security Key Name"
           delete: "Delete"
+          name_required_error: "You must provide a name for your security key."
 
       change_about:
         title: "Change About Me"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index c4db42fb1c..3705e98f01 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2381,6 +2381,8 @@ en:
     second_factor_backup_title: "Two Factor Backup Code"
     invalid_second_factor_code: "Invalid authentication code. Each code can only be used once."
     invalid_security_key: "Invalid security key."
+    missing_second_factor_name: "Please provide a name."
+    missing_second_factor_code: "Please provide a code."
     second_factor_toggle:
       totp: "Use an authenticator app or security key instead"
       backup_code: "Use a backup code instead"
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index ed28cab650..13aebdfd2f 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -3522,6 +3522,58 @@ describe UsersController do
     end
   end
 
+  describe "#enable_second_factor_totp" do
+    before do
+      sign_in(user)
+    end
+
+    def create_totp
+      stub_secure_session_confirmed
+      post "/users/create_second_factor_totp.json"
+    end
+
+    it "creates a totp for the user successfully" do
+      create_totp
+      staged_totp_key = read_secure_session["staged-totp-#{user.id}"]
+      token = ROTP::TOTP.new(staged_totp_key).now
+
+      post "/users/enable_second_factor_totp.json", params: { name: "test", second_factor_token: token }
+
+      expect(response.status).to eq(200)
+      expect(user.user_second_factors.count).to eq(1)
+    end
+
+    context "when an incorrect token is provided" do
+      before do
+        create_totp
+        post "/users/enable_second_factor_totp.json", params: { name: "test", second_factor_token: "123456" }
+      end
+      it "shows a helpful error message to the user" do
+        expect(JSON.parse(response.body)['error']).to eq(I18n.t("login.invalid_second_factor_code"))
+      end
+    end
+
+    context "when a name is not provided" do
+      before do
+        create_totp
+        post "/users/enable_second_factor_totp.json", params: { second_factor_token: "123456" }
+      end
+      it "shows a helpful error message to the user" do
+        expect(JSON.parse(response.body)['error']).to eq(I18n.t("login.missing_second_factor_name"))
+      end
+    end
+
+    context "when a token is not provided" do
+      before do
+        create_totp
+        post "/users/enable_second_factor_totp.json", params: { name: "test" }
+      end
+      it "shows a helpful error message to the user" do
+        expect(JSON.parse(response.body)['error']).to eq(I18n.t("login.missing_second_factor_code"))
+      end
+    end
+  end
+
   describe '#update_second_factor' do
     let(:user_second_factor) { Fabricate(:user_second_factor_totp, user: user) }
 
@@ -3554,7 +3606,7 @@ describe UsersController do
 
         context 'when token is valid' do
           before do
-            ApplicationController.any_instance.stubs(:secure_session).returns("confirmed-password-#{user.id}" => "true")
+            stub_secure_session_confirmed
           end
           it 'should allow second factor for the user to be renamed' do
             put "/users/second_factor.json", params: {
@@ -4062,7 +4114,11 @@ describe UsersController do
 
   def create_second_factor_security_key
     sign_in(user)
-    UsersController.any_instance.stubs(:secure_session_confirmed?).returns(true)
+    stub_secure_session_confirmed
     post "/u/create_second_factor_security_key.json"
   end
+
+  def stub_secure_session_confirmed
+    UsersController.any_instance.stubs(:secure_session_confirmed?).returns(true)
+  end
 end
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6
index ce5d8f68b1..c651c67802 100644
--- a/test/javascripts/acceptance/preferences-test.js.es6
+++ b/test/javascripts/acceptance/preferences-test.js.es6
@@ -20,6 +20,16 @@ acceptance("User Preferences", {
       });
     });
 
+    server.post("/u/create_second_factor_security_key.json", () => {
+      return helper.response({
+        challenge:
+          "a6d393d12654c130b2273e68ca25ca232d1d7f4c2464c2610fb8710a89d4",
+        rp_id: "localhost",
+        rp_name: "Discourse",
+        supported_algoriths: [-7, -257]
+      });
+    });
+
     server.post("/u/enable_second_factor_totp.json", () => {
       return helper.response({ error: "invalid token" });
     });
@@ -211,7 +221,7 @@ QUnit.test("connected accounts", async assert => {
     .indexOf("Connect") > -1;
 });
 
-QUnit.test("second factor", async assert => {
+QUnit.test("second factor totp", async assert => {
   await visit("/u/eviltrout/preferences/second-factor");
 
   assert.ok(exists("#password"), "it has a password input");
@@ -223,14 +233,36 @@ QUnit.test("second factor", async assert => {
   await click(".new-totp");
   assert.ok(exists("#test-qr"), "shows qr code");
 
-  await fillIn("#second-factor-token", "111111");
   await click(".add-totp");
 
   assert.ok(
     find(".alert-error")
       .html()
-      .indexOf("invalid token") > -1,
-    "shows server validation error message"
+      .indexOf("provide a name and the code") > -1,
+    "shows name/token missing error message"
+  );
+});
+
+QUnit.test("second factor security keys", async assert => {
+  await visit("/u/eviltrout/preferences/second-factor");
+
+  assert.ok(exists("#password"), "it has a password input");
+
+  await fillIn("#password", "secrets");
+  await click(".user-preferences .btn-primary");
+  assert.notOk(exists("#password"), "it hides the password input");
+
+  await click(".new-security-key");
+  assert.ok(exists("#security-key-name"), "shows security key name input");
+
+  fillIn("#security-key-name", "");
+  await click(".add-security-key");
+
+  assert.ok(
+    find(".alert-error")
+      .html()
+      .indexOf("provide a name") > -1,
+    "shows name missing error message"
   );
 });
 

From ff62911a89d721ebec1716990c5e407e572d8960 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 6 Mar 2020 12:23:22 +0000
Subject: [PATCH 0101/1830] FEATURE: New route for loading multiple user cards
 simultaneously (#9078)

Introduces `/user-cards.json`

Also allows the client-side user model to be passed an existing promise when loading, so that multiple models can share the same AJAX request
---
 .../javascripts/discourse/models/user.js.es6  |  6 +++-
 app/controllers/users_controller.rb           | 24 ++++++++++++++++
 config/routes.rb                              |  2 ++
 spec/requests/users_controller_spec.rb        | 28 +++++++++++++++++++
 4 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 6927676805..84c2765f6f 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -536,8 +536,12 @@ const User = RestModel.extend({
     const user = this;
 
     return PreloadStore.getAndRemove(`user_${user.get("username")}`, () => {
-      const useCardRoute = options && options.forCard;
+      if (options && options.existingRequest) {
+        // Existing ajax request has been passed, use it
+        return options.existingRequest;
+      }
 
+      const useCardRoute = options && options.forCard;
       if (options) delete options.forCard;
 
       const path = useCardRoute
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 33e7bdce6c..5b7bbc7022 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -99,6 +99,30 @@ class UsersController < ApplicationController
     show(for_card: true)
   end
 
+  def cards
+    return redirect_to path('/login') if SiteSetting.hide_user_profiles_from_public && !current_user
+
+    user_ids = params.require(:user_ids).split(",").map(&:to_i)
+    raise Discourse::InvalidParameters.new(:user_ids) if user_ids.length > 50
+
+    users = User.where(id: user_ids).includes(:user_option,
+                                              :user_stat,
+                                              :default_featured_user_badges,
+                                              :user_profile,
+                                              :card_background_upload,
+                                              :primary_group,
+                                              :primary_email
+                                            )
+
+    users = users.filter { |u| guardian.can_see_profile?(u) }
+
+    preload_fields = User.whitelisted_user_custom_fields(guardian) + UserField.all.pluck(:id).map { |fid| "#{User::USER_FIELD_PREFIX}#{fid}" }
+    User.preload_custom_fields(users, preload_fields)
+    User.preload_recent_time_read(users)
+
+    render json: users, each_serializer: UserCardSerializer
+  end
+
   def badges
     raise Discourse::NotFound unless SiteSetting.enable_badges?
     show
diff --git a/config/routes.rb b/config/routes.rb
index 8fd2d19727..38047b91eb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -367,6 +367,8 @@ Discourse::Application.routes.draw do
   get "user_preferences" => "users#user_preferences_redirect"
   get ".well-known/change-password", to: redirect(relative_url_root + 'my/preferences/account', status: 302)
 
+  get "user-cards" => "users#cards", format: :json
+
   %w{users u}.each_with_index do |root_path, index|
     get "#{root_path}" => "users#index", constraints: { format: 'html' }
 
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 13aebdfd2f..7a15170e38 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -3052,6 +3052,34 @@ describe UsersController do
     end
   end
 
+  describe "#cards" do
+    fab!(:user) { Discourse.system_user }
+    fab!(:user2) { Fabricate(:user) }
+
+    it "returns success" do
+      get "/user-cards.json?user_ids=#{user.id},#{user2.id}"
+      expect(response.status).to eq(200)
+      parsed = JSON.parse(response.body)["users"]
+
+      expect(parsed.map { |u| u["username"] }).to contain_exactly(user.username, user2.username)
+    end
+
+    it "should redirect to login page for anonymous user when profiles are hidden" do
+      SiteSetting.hide_user_profiles_from_public = true
+      get "/user-cards.json?user_ids=#{user.id},#{user2.id}"
+      expect(response).to redirect_to '/login'
+    end
+
+    it "does not include hidden profiles" do
+      user2.user_option.update(hide_profile_and_presence: true)
+      get "/user-cards.json?user_ids=#{user.id},#{user2.id}"
+      expect(response.status).to eq(200)
+      parsed = JSON.parse(response.body)["users"]
+
+      expect(parsed.map { |u| u["username"] }).to contain_exactly(user.username)
+    end
+  end
+
   describe '#badges' do
     it "renders fine by default" do
       get "/u/#{user.username}/badges"

From 665d8564d80902a3f9febe837466988ceb3fa33b Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Fri, 6 Mar 2020 11:19:34 -0300
Subject: [PATCH 0102/1830] DEV: Use the updated version of our mousetrap fork
 (#9111)

---
 yarn.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 2ff91e0b49..005db309fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1915,8 +1915,8 @@ moment@^2.10.2:
   integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
 
 "mousetrap@https://github.com/discourse/mousetrap#firefox-alt-key":
-  version "1.6.3"
-  resolved "https://github.com/discourse/mousetrap#0d41aa7b173abfb83a6bec3ad39a6a708bc49108"
+  version "1.6.5"
+  resolved "https://github.com/discourse/mousetrap#cc8e2c0b9229e1a01ce68de4f339b6fd35503041"
 
 ms@2.0.0:
   version "2.0.0"

From a5f61729e0593804051047df86f1a8e1d271794a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 6 Mar 2020 08:49:28 -0500
Subject: [PATCH 0103/1830] Revert "Revert "FIX: Don't allow people to clear
 the upload bucket while it's enabled""

This reverts commit d4fc76b335d012275b06b7ce80d0c1b98f9db33d.
---
 lib/site_settings/validations.rb           | 2 ++
 spec/lib/site_settings/validations_spec.rb | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/lib/site_settings/validations.rb b/lib/site_settings/validations.rb
index 56987b0dfe..0bf13f7606 100644
--- a/lib/site_settings/validations.rb
+++ b/lib/site_settings/validations.rb
@@ -143,6 +143,8 @@ module SiteSettings::Validations
 
   def validate_s3_upload_bucket(new_val)
     validate_bucket_setting("s3_upload_bucket", new_val, SiteSetting.s3_backup_bucket)
+
+    validate_error(:s3_upload_bucket_is_required, setting_name: 's3_upload_bucket') if new_val.blank? && SiteSetting.enable_s3_uploads?
   end
 
   def validate_s3_backup_bucket(new_val)
diff --git a/spec/lib/site_settings/validations_spec.rb b/spec/lib/site_settings/validations_spec.rb
index 7f346d4d5c..69ab73920b 100644
--- a/spec/lib/site_settings/validations_spec.rb
+++ b/spec/lib/site_settings/validations_spec.rb
@@ -103,6 +103,15 @@ describe SiteSettings::Validations do
         SiteSetting.s3_backup_bucket = "my-awesome-bucket/foo"
         expect { validate("my-awesome-bucket/foo/uploads") }.to raise_error(Discourse::InvalidParameters, error_message)
       end
+
+      it "cannot be made blank unless the setting is false" do
+        SiteSetting.s3_backup_bucket = "really-real-cool-bucket"
+        SiteSetting.enable_s3_uploads = true
+
+        expect { validate("") }.to raise_error(Discourse::InvalidParameters)
+        SiteSetting.enable_s3_uploads = false
+        validate("")
+      end
     end
   end
 

From 91682408e0fc47e0c2d72a993988797eb2d095ac Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 6 Mar 2020 09:35:38 -0500
Subject: [PATCH 0104/1830] Remove very bad tests

---
 spec/models/admin_dashboard_problem_spec.rb | 104 --------------------
 1 file changed, 104 deletions(-)

diff --git a/spec/models/admin_dashboard_problem_spec.rb b/spec/models/admin_dashboard_problem_spec.rb
index c61b346224..84b596e17b 100644
--- a/spec/models/admin_dashboard_problem_spec.rb
+++ b/spec/models/admin_dashboard_problem_spec.rb
@@ -194,110 +194,6 @@ describe AdminDashboardData do
     end
   end
 
-  describe 's3_config_check' do
-    shared_examples 'problem detection for s3-dependent setting' do
-      subject { described_class.new.s3_config_check }
-      let(:access_keys) { [:s3_access_key_id, :s3_secret_access_key] }
-      let(:all_cred_keys) { access_keys + [:s3_use_iam_profile] }
-      let(:all_setting_keys) { all_cred_keys + [bucket_key] }
-
-      def all_setting_permutations(keys)
-        ['a', ''].repeated_permutation(keys.size) do |*values|
-          hash = Hash[keys.zip(values)]
-          hash.each do |key, value|
-            SiteSetting.set(key, value)
-          end
-          yield hash
-        end
-      end
-
-      context 'when setting is enabled' do
-        before do
-          all_setting_keys.each { |key| SiteSetting.set(key, 'foo') }
-          SiteSetting.set(setting[:key], setting[:enabled_value])
-          SiteSetting.set(bucket_key, bucket_value)
-        end
-
-        context 'when bucket is blank' do
-          let(:bucket_value) { '' }
-
-          it "always returns a string" do
-            all_setting_permutations(all_cred_keys) do
-              expect(subject).to_not be_nil
-            end
-          end
-        end
-
-        context 'when bucket is filled in' do
-          let(:bucket_value) { 'a' }
-          before do
-            SiteSetting.s3_use_iam_profile = use_iam_profile
-          end
-
-          context 'when using iam profile' do
-            let(:use_iam_profile) { true }
-
-            it 'always returns nil' do
-              all_setting_permutations(access_keys) do
-                expect(subject).to be_nil
-              end
-            end
-          end
-
-          context 'when not using iam profile' do
-            let(:use_iam_profile) { false }
-
-            it 'returns nil only if both access key fields are filled in' do
-              all_setting_permutations(access_keys) do |settings|
-                if settings.values.all?
-                  expect(subject).to be_nil
-                else
-                  expect(subject).to_not be_nil
-                end
-              end
-            end
-          end
-        end
-      end
-
-      context 'when setting is not enabled' do
-        before do
-          SiteSetting.set(setting[:key], setting[:disabled_value])
-        end
-
-        it "always returns nil" do
-          all_setting_permutations(all_setting_keys) do
-            expect(subject).to be_nil
-          end
-        end
-      end
-    end
-
-    describe 'uploads' do
-      let(:setting) do
-        {
-          key: :enable_s3_uploads,
-          enabled_value: true,
-          disabled_value: false
-        }
-      end
-      let(:bucket_key) { :s3_upload_bucket }
-      include_examples 'problem detection for s3-dependent setting'
-    end
-
-    describe 'backups' do
-      let(:setting) do
-        {
-          key: :backup_location,
-          enabled_value: BackupLocationSiteSetting::S3,
-          disabled_value: BackupLocationSiteSetting::LOCAL
-        }
-      end
-      let(:bucket_key) { :s3_backup_bucket }
-      include_examples 'problem detection for s3-dependent setting'
-    end
-  end
-
   describe 'force_https_check' do
     subject { described_class.new(check_force_https: true).force_https_check }
 

From a24f51278a954ebd2d0da9580580caf57c36b2ee Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 6 Mar 2020 17:35:18 +0100
Subject: [PATCH 0105/1830] DEV: enforces link-rel-noopener linting rule
 (#8936)

* DEV: enforces link-rel-noopener linting rule

* oops

* better syntax
---
 .template-lintrc.js                                  |  3 ++-
 .../javascripts/admin/templates/badges-index.hbs     |  2 +-
 .../admin/templates/customize-themes-edit.hbs        | 12 +++++++-----
 .../admin/templates/customize-themes-index.hbs       |  2 +-
 .../admin/templates/customize-themes-show.hbs        |  6 +++---
 .../admin/templates/modal/admin-install-theme.hbs    |  4 ++--
 .../admin/templates/modal/admin-theme-item.hbs       |  2 +-
 .../javascripts/admin/templates/plugins-index.hbs    |  2 +-
 .../javascripts/admin/templates/version-checks.hbs   |  2 +-
 .../discourse/templates/components/backup-codes.hbs  |  1 +
 .../discourse/templates/components/ip-lookup.hbs     |  2 +-
 .../templates/components/user-card-contents.hbs      |  3 ++-
 .../discourse/templates/review-topics.hbs            |  2 +-
 .../discourse/templates/user-invited-show.hbs        |  2 +-
 app/assets/javascripts/discourse/templates/user.hbs  |  3 ++-
 .../javascripts/discourse/templates/user/summary.hbs |  3 ++-
 .../wizard/templates/components/popular-themes.hbs   |  2 +-
 17 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 5731778fc0..3a85b721b0 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -6,6 +6,7 @@ module.exports = {
     "self-closing-void-elements": true,
     "table-groups": true,
     "style-concatenation": true,
-    "no-invalid-interactive": true
+    "no-invalid-interactive": true,
+    "link-rel-noopener": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index a3296fc23e..fd08e67279 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -5,7 +5,7 @@
       <h1>{{i18n 'admin.badges.badge_intro.title'}}</h1>
       <div class="external-resources">
         {{#each badgeIntroLinks as |link|}}
-          <a href={{link.href}} class="external-link" target="_blank">
+          <a href={{link.href}} class="external-link" target="_blank" rel="noopener">
             {{d-icon link.icon}}
             <span>{{I18n link.text}}</span>
           </a>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
index d17ab8d2f3..5fdaa76885 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
@@ -2,20 +2,22 @@
   <div class='wrapper'>
     <h2>{{i18n 'admin.customize.theme.edit_css_html'}} {{#link-to showRouteName model.id replace=true}}{{model.name}}{{/link-to}}</h2>
 
-    {{admin-theme-editor 
-      theme=model 
-      editRouteName=editRouteName 
+    {{admin-theme-editor
+      theme=model
+      editRouteName=editRouteName
       currentTargetName=currentTargetName
       fieldName=fieldName
       fieldAdded=(action 'fieldAdded')
       maximized=maximized
       onlyOverriddenChanged=(action 'onlyOverriddenChanged')
     }}
-    
+
     <div class='admin-footer'>
       <div class='status-actions'>
         {{#unless model.changed}}
-          <a class='preview-link' href={{previewUrl}} target='_blank' title="{{i18n 'admin.customize.explain_preview'}}">{{i18n 'admin.customize.preview'}}</a>
+          <a class='preview-link' href={{previewUrl}} rel="noopener" target='_blank' title="{{i18n 'admin.customize.explain_preview'}}">
+            {{i18n 'admin.customize.preview'}}
+          </a>
         {{/unless}}
       </div>
 
diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
index 56438e5ae7..0a6060724b 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-index.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
@@ -7,7 +7,7 @@
     </div>
     <div class="external-resources">
       {{#each externalResources as |resource|}}
-        <a href={{resource.link}} class="external-link" target="_blank">
+        <a href={{resource.link}} class="external-link" rel="noopener" target="_blank">
           {{d-icon resource.icon}}
           {{I18n resource.key}}
         </a>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index de6b46da74..2687c6b692 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -206,7 +206,7 @@
       <ul class='removable-list'>
         {{#each model.uploads as |upload|}}
           <li>
-            <span class='col'>${{upload.name}}: <a href={{upload.url}} target='_blank'>{{upload.filename}}</a></span>
+            <span class='col'>${{upload.name}}: <a href={{upload.url}} rel="noopener" target='_blank'>{{upload.filename}}</a></span>
             <span class='col'>
               {{d-button action=(action "removeUpload") actionParam=upload class="second btn-default btn-default cancel-edit" icon="times"}}
             </span>
@@ -241,8 +241,8 @@
     </div>
   {{/if}}
 
-  <a href='{{previewUrl}}' title="{{i18n 'admin.customize.explain_preview'}}" target='_blank' class='btn btn-default'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
-  <a class="btn btn-default export" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
+  <a href='{{previewUrl}}' title="{{i18n 'admin.customize.explain_preview'}}" rel="noopener" target='_blank' class='btn btn-default'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
+  <a class="btn btn-default export" rel="noopener" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
 
   {{d-button action=(action "switchType") label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}}
 
diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
index 7307abb411..eec9151f90 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
@@ -11,7 +11,7 @@
         {{#each themes as |theme|}}
           <div class="popular-theme-item">
             <div class="popular-theme-name">
-              <a href="{{theme.meta_url}}" target="_blank">
+              <a href="{{theme.meta_url}}" rel="noopener" target="_blank">
                 {{#if theme.component}}
                   {{d-icon 'puzzle-piece' title='admin.customize.theme.component'}}
                 {{/if}}
@@ -33,7 +33,7 @@
                   action=(action "installThemeFromList" theme.value)}}
 
                 {{#if theme.preview}}
-                  <a href="{{theme.preview}}" target="_blank">{{d-icon "desktop"}} {{I18n "admin.customize.theme.preview"}}</a>
+                  <a href="{{theme.preview}}" rel="noopener" target="_blank">{{d-icon "desktop"}} {{I18n "admin.customize.theme.preview"}}</a>
                 {{/if}}
               {{/if}}
             </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
index e1b6bd0fe8..27e5cd5ec5 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
@@ -2,7 +2,7 @@
   <div class="popular-theme-name">
     {{theme.name}}
     {{#if theme.preview}}
-      <a href="{{theme.preview}}" title="Preview" target="_blank">{{d-icon "far-eye"}}</a>
+      <a href="{{theme.preview}}" title="Preview" rel="noopener" target="_blank">{{d-icon "far-eye"}}</a>
     {{/if}}
   </div>
   <div class="popular-theme-buttons">
diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index cf2be40ee4..9370d8457c 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -27,7 +27,7 @@
 
           <td class="plugin-name">
             {{#if plugin.url}}
-              <a href={{plugin.url}} target="_blank">{{plugin.name}}</a>
+              <a href={{plugin.url}} rel="noopener" target="_blank">{{plugin.name}}</a>
             {{else}}
               {{plugin.name}}
             {{/if}}
diff --git a/app/assets/javascripts/admin/templates/version-checks.hbs b/app/assets/javascripts/admin/templates/version-checks.hbs
index ced3da8b79..bd0bc3b981 100644
--- a/app/assets/javascripts/admin/templates/version-checks.hbs
+++ b/app/assets/javascripts/admin/templates/version-checks.hbs
@@ -8,7 +8,7 @@
         <h3>{{dash-if-empty versionCheck.installed_version}}</h3>
         {{#if versionCheck.gitLink}}
           <div class="sha-link">
-            (<a href={{versionCheck.gitLink}} target="_blank">{{versionCheck.shortSha}}</a>)
+            (<a href={{versionCheck.gitLink}} rel="noopener" target="_blank">{{versionCheck.shortSha}}</a>)
           </div>
         {{/if}}
       </div>
diff --git a/app/assets/javascripts/discourse/templates/components/backup-codes.hbs b/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
index bd591ee6c3..046baed16a 100644
--- a/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
@@ -8,6 +8,7 @@
 
   <a download="backup_codes.txt"
      class="btn no-text btn-icon backup-codes-download-btn"
+     rel="noopener"
      target="_blank"
      href="data:application/octet-stream;charset=utf-8;base64,{{base64BackupCode}}">
     {{d-icon "download"}}
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 9c9c2d3950..347823e2ef 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -25,7 +25,7 @@
         <dt>{{i18n "ip_lookup.location"}}</dt>
         <dd>
           {{#if location.location}}
-            <a href="https://maps.google.com/maps?q={{unbound location.latitude}},{{unbound location.longitude}}" target="_blank">
+            <a href="https://maps.google.com/maps?q={{unbound location.latitude}},{{unbound location.longitude}}" rel="noopener" target="_blank">
               {{location.location}}
             </a>
           {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index c96a9cb511..ba00265392 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -160,7 +160,8 @@
               <span class='website-name'>
                 {{d-icon "globe"}}
                 {{#if linkWebsite}}
-                  <a href="{{user.website}}" rel={{unless removeNoFollow 'nofollow ugc noopener'}}
+                  {{!-- template-lint-disable  --}}
+                  <a href="{{user.website}}" rel="noopener {{unless removeNoFollow 'nofollow ugc'}}"
                    target="_blank">{{user.website_name}}</a>
                 {{else}}
                   <span title={{user.website}}>{{user.website_name}}</span>
diff --git a/app/assets/javascripts/discourse/templates/review-topics.hbs b/app/assets/javascripts/discourse/templates/review-topics.hbs
index 029c5c310a..5e548c3215 100644
--- a/app/assets/javascripts/discourse/templates/review-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/review-topics.hbs
@@ -12,7 +12,7 @@
         <td class="topic-title">
           <div class='combined-title'>
             {{topic-status topic=rt}}
-            <a href={{rt.relative_url}} target="_blank">{{replace-emoji rt.fancy_title}}</a>
+            <a href={{rt.relative_url}} rel="noopener" target="_blank">{{replace-emoji rt.fancy_title}}</a>
           </div>
         </td>
         <td class="reviewable-count">
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 958b0a96af..5e95282ab4 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -17,7 +17,7 @@
               {{d-button icon="plus" action=(route-action "showInvite") label="user.invited.create"}}
               {{#if canBulkInvite}}
                 {{csv-uploader uploading=uploading}}
-                <a href="https://meta.discourse.org/t/sending-bulk-user-invites/16468" target="_blank" style="color:black;">{{d-icon "question-circle"}}</a>
+                <a href="https://meta.discourse.org/t/sending-bulk-user-invites/16468" rel="noopener" target="_blank" style="color:black;">{{d-icon "question-circle"}}</a>
               {{/if}}
               {{#if showBulkActionButtons}}
                 {{#if rescindedAll}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index a073738c35..520fb78e88 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -110,7 +110,8 @@
             <div class="user-profile-website">
               {{d-icon "globe"}}
               {{#if linkWebsite}}
-                <a href={{model.website}} rel={{unless removeNoFollow 'nofollow ugc noopener'}} target="_blank">{{model.website_name}}</a>
+                {{!-- template-lint-disable  --}}
+                <a href={{model.website}} rel="noopener {{unless removeNoFollow 'nofollow ugc'}}" target="_blank">{{model.website_name}}</a>
               {{else}}
                 <span title={{model.website}}>{{model.website_name}}</span>
               {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index e751d80e96..e7d92afb82 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -77,10 +77,11 @@
         <ul>
           {{#each model.links as |link|}}
             <li>
+              {{!-- template-lint-disable  --}}
               <a class='domain'
                  href='{{unbound link.url}}'
                  title='{{unbound link.title}}'
-                 rel='{{unless user.removeNoFollow 'nofollow ugc noopener'}}'
+                 rel='noopener {{unless user.removeNoFollow 'nofollow ugc'}}'
                  target='_blank'>
                 {{shorten-url link.url}}
               </a>
diff --git a/app/assets/javascripts/wizard/templates/components/popular-themes.hbs b/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
index 95dda74dbb..42756d3ceb 100644
--- a/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
+++ b/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
@@ -1,5 +1,5 @@
 {{#each popular_components as |theme|}}
-  <a class="popular-theme-item" href="{{theme.meta_url}}" target="_blank">
+  <a class="popular-theme-item" href="{{theme.meta_url}}" rel="noopener" target="_blank">
     {{theme.name}}
   </a>
 {{/each}}

From 475f545557bb06924a790c6fb644d834e86892a0 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 6 Mar 2020 10:35:52 -0600
Subject: [PATCH 0106/1830] DEV: Test theme js compiler append_raw_template
 (#8950)

* DEV: Test for append_raw_template

* remove empty line
---
 lib/theme_javascript_compiler.rb           | 10 ++++++----
 spec/lib/theme_javascript_compiler_spec.rb | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/lib/theme_javascript_compiler.rb b/lib/theme_javascript_compiler.rb
index d7ea11362f..b0906eb356 100644
--- a/lib/theme_javascript_compiler.rb
+++ b/lib/theme_javascript_compiler.rb
@@ -186,15 +186,17 @@ class ThemeJavascriptCompiler
     raise CompileError.new e.instance_variable_get(:@error) # e.message contains the entire template, which could be very long
   end
 
+  def raw_template_name(name)
+    name = name.sub(/\.(raw|hbr)$/, '')
+    name.inspect
+  end
+
   def append_raw_template(name, hbs_template)
-    name = name.sub(/\.raw$/, '')
-    name = name.sub(/\.hbr$/, '.hbs')
-    name = name.inspect
     compiled = RawTemplatePrecompiler.new(@theme_id).compile(hbs_template)
     @content << <<~JS
       (function() {
         if ('Discourse' in window) {
-          Discourse.RAW_TEMPLATES[#{name}] = requirejs('discourse-common/lib/raw-handlebars').template(#{compiled});
+          Discourse.RAW_TEMPLATES[#{raw_template_name(name)}] = requirejs('discourse-common/lib/raw-handlebars').template(#{compiled});
         }
       })();
     JS
diff --git a/spec/lib/theme_javascript_compiler_spec.rb b/spec/lib/theme_javascript_compiler_spec.rb
index 911ce18c09..ca0c9cd046 100644
--- a/spec/lib/theme_javascript_compiler_spec.rb
+++ b/spec/lib/theme_javascript_compiler_spec.rb
@@ -110,4 +110,21 @@ describe ThemeJavascriptCompiler do
     end
   end
 
+  describe "#append_raw_template" do
+    let(:compiler) { ThemeJavascriptCompiler.new(1, 'marks') }
+    it 'adds the correct template to "Discourse.RAW_TEMPLATES"' do
+      template = "<h1>hello</h1>"
+      name = "/path/to/templates1"
+      compiler.append_raw_template("#{name}.raw", template)
+      expect(compiler.content.to_s).to include("Discourse.RAW_TEMPLATES[\"#{name}\"]")
+
+      name = "/path/to/templates2"
+      compiler.append_raw_template("#{name}.hbr", template)
+      expect(compiler.content.to_s).to include("Discourse.RAW_TEMPLATES[\"#{name}\"]")
+
+      name = "/path/to/templates3"
+      compiler.append_raw_template("#{name}.hbs", template)
+      expect(compiler.content.to_s).to include("Discourse.RAW_TEMPLATES[\"#{name}.hbs\"]")
+    end
+  end
 end

From 03d5a80aef312d223d0db24d195a4d21aeb36009 Mon Sep 17 00:00:00 2001
From: Dan Dascalescu <ddascalescu+github@gmail.com>
Date: Sat, 7 Mar 2020 05:38:01 +1300
Subject: [PATCH 0107/1830] Elastic Email can now disable the UNSUB link for
 Discourse installs (#8986)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Elastic Email can now disable the UNSUB link for Discourse installs

* Update docs/INSTALL-email.md

Co-authored-by: Régis Hanol <regis@hanol.fr>
---
 docs/INSTALL-email.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/INSTALL-email.md b/docs/INSTALL-email.md
index e582a9ca85..bc4a8bf570 100644
--- a/docs/INSTALL-email.md
+++ b/docs/INSTALL-email.md
@@ -35,7 +35,7 @@ Go to [My Account page](https://app.mailjet.com/account) and click on the ["SMTP
     SMTP password?       [Elastic Email API Key]
     SMTP port?           2525
     
-NOTE: Elastic Email policy insists on an additional UNSUBSCRIBE link at the bottom of each sent email. If this is a problem for your needs, consider using other providers. [See discussion here](https://meta.discourse.org/t/remove-or-merge-elastic-email-unsubscribe/70236).
+NOTE: By default, Elastic Email will add an additional UNSUBSCRIBE link at the bottom of each sent email. You need to work with them to [disable that link](https://meta.discourse.org/t/remove-or-merge-elastic-email-unsubscribe/70236/39), so that Discourse users can manage their subscription through Discourse.
 
    [ee]: https://elasticemail.com
   [jet]: https://www.mailjet.com/pricing

From ef6b7bd77614152e98057a5f37678e635d1b9ae7 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 6 Mar 2020 17:41:41 +0100
Subject: [PATCH 0108/1830] DEV: Use aliased `inject` imports (#9086)

This is a common Ember idiom for easier differentiation between controller and service imports.
---
 .../admin/controllers/admin-backups-index.js.es6  |  5 ++---
 .../admin/controllers/admin-backups-logs.js.es6   |  6 +++---
 .../admin/controllers/admin-badges-show.js.es6    |  4 ++--
 .../admin-site-settings-category.js.es6           |  5 ++---
 .../admin/controllers/admin-user-badges.js.es6    |  5 ++---
 .../controllers/admin-watched-words-action.js.es6 |  5 ++---
 .../admin/controllers/admin-web-hooks-show.js.es6 |  5 ++---
 .../controllers/modals/admin-add-upload.js.es6    |  5 ++---
 .../modals/admin-color-scheme-select-base.js.es6  |  5 ++---
 .../controllers/modals/admin-install-theme.js.es6 |  7 +++----
 .../controllers/modals/admin-start-backup.js.es6  |  5 ++---
 .../discourse/controllers/activation-edit.js.es6  |  5 ++---
 .../discourse/controllers/badges/show.js.es6      |  5 ++---
 .../controllers/bulk-notification-level.js.es6    |  5 ++---
 .../discourse/controllers/create-account.js.es6   |  5 ++---
 .../discourse/controllers/discovery.js.es6        |  9 ++++-----
 .../controllers/discovery/categories.js.es6       |  4 ++--
 .../discourse/controllers/discovery/topics.js.es6 |  6 +++---
 .../discourse/controllers/full-page-search.js.es6 |  7 +++----
 .../controllers/group-activity-posts.js.es6       |  9 ++++-----
 .../discourse/controllers/group-index.js.es6      |  4 ++--
 .../controllers/group-manage-logs.js.es6          |  7 +++----
 .../discourse/controllers/group-requests.js.es6   |  4 ++--
 .../discourse/controllers/group.js.es6            |  5 ++---
 .../discourse/controllers/groups-index.js.es6     |  5 ++---
 .../discourse/controllers/login.js.es6            |  9 ++++-----
 .../controllers/navigation/default.js.es6         |  7 +++----
 .../discourse/controllers/static.js.es6           |  5 ++---
 .../discourse/controllers/tag-groups-edit.js.es6  |  5 ++---
 .../discourse/controllers/tag-groups-new.js.es6   |  4 ++--
 .../discourse/controllers/tags-show.js.es6        |  5 ++---
 .../discourse/controllers/topic.js.es6            | 15 +++++++--------
 .../discourse/controllers/user-activity.js.es6    |  7 +++----
 .../discourse/controllers/user-badges.js.es6      |  6 +++---
 .../discourse/controllers/user-card.js.es6        |  5 ++---
 .../controllers/user-notifications.js.es6         |  5 ++---
 .../discourse/controllers/user-posts.js.es6       |  5 ++---
 .../controllers/user-private-messages.js.es6      |  7 +++----
 .../discourse/controllers/user-topics-list.js.es6 |  5 ++---
 .../discourse/controllers/users.js.es6            |  5 ++---
 40 files changed, 100 insertions(+), 132 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
index 01103105e8..45f25dd617 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
@@ -1,12 +1,11 @@
 import { alias, equal } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 import { setting, i18n } from "discourse/lib/computed";
 
 export default Controller.extend({
-  adminBackups: inject(),
+  adminBackups: controller(),
   status: alias("adminBackups.model"),
   uploadLabel: i18n("admin.backups.upload.label"),
   backupLocation: setting("backup_location"),
diff --git a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
index a32e216255..69a81f9b67 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
@@ -1,8 +1,8 @@
 import { alias } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
+
 export default Controller.extend({
-  adminBackups: inject(),
+  adminBackups: controller(),
   status: alias("adminBackups.model"),
 
   init() {
diff --git a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
index 0586a33505..a860d2f992 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
@@ -1,13 +1,13 @@
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { reads } from "@ember/object/computed";
-import Controller, { inject } from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { propertyNotEqual } from "discourse/lib/computed";
 import { run } from "@ember/runloop";
 
 export default Controller.extend(bufferedProperty("model"), {
-  adminBadges: inject(),
+  adminBadges: controller(),
   saving: false,
   savingStatus: "",
   badgeTypes: reads("adminBadges.badgeTypes"),
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
index bfd727e6ea..b2c29730ec 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
@@ -1,10 +1,9 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 
 export default Controller.extend({
+  adminSiteSettings: controller(),
   categoryNameKey: null,
-  adminSiteSettings: inject(),
 
   @discourseComputed("adminSiteSettings.visibleSiteSettings", "categoryNameKey")
   category(categories, nameKey) {
diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
index 3bedafb45c..a42bf58ca5 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
@@ -1,13 +1,12 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias, sort } from "@ember/object/computed";
 import { next } from "@ember/runloop";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import GrantBadgeController from "discourse/mixins/grant-badge-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend(GrantBadgeController, {
-  adminUser: inject(),
+  adminUser: controller(),
   user: alias("adminUser.model"),
   userBadges: alias("model"),
   allBadges: alias("badges"),
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
index d6f52c13fd..5de00031a5 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
@@ -1,16 +1,15 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { or } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import WatchedWord from "admin/models/watched-word";
 import { ajax } from "discourse/lib/ajax";
 import { fmt } from "discourse/lib/computed";
 import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend({
+  adminWatchedWords: controller(),
   actionNameKey: null,
-  adminWatchedWords: inject(),
   showWordsList: or(
     "adminWatchedWords.filtered",
     "adminWatchedWords.showWords"
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
index 4ba34034f3..4332f52d9c 100644
--- a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
@@ -1,14 +1,13 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { extractDomainFromUrl } from "discourse/lib/utilities";
 import EmberObject from "@ember/object";
 
 export default Controller.extend({
-  adminWebHooks: inject(),
+  adminWebHooks: controller(),
   eventTypes: alias("adminWebHooks.eventTypes"),
   defaultEventTypes: alias("adminWebHooks.defaultEventTypes"),
   contentTypes: alias("adminWebHooks.contentTypes"),
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
index c7d9447d8d..6fb2859618 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
@@ -1,7 +1,6 @@
 import { isEmpty } from "@ember/utils";
 import { and, not } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
@@ -54,7 +53,7 @@ const SCSS_VARIABLE_NAMES = [
 ];
 
 export default Controller.extend(ModalFunctionality, {
-  adminCustomizeThemesShow: inject(),
+  adminCustomizeThemesShow: controller(),
 
   uploadUrl: "/admin/themes/upload_asset",
 
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6
index e0b7bfe7e6..1ea601202d 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6
@@ -1,9 +1,8 @@
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Controller.extend(ModalFunctionality, {
-  adminCustomizeColors: inject(),
+  adminCustomizeColors: controller(),
 
   selectedBaseThemeId: null,
 
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js.es6
index cfb61ccc8f..7c0036539c 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js.es6
@@ -1,6 +1,5 @@
 import { equal, match, alias } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -12,12 +11,13 @@ import { set } from "@ember/object";
 const MIN_NAME_LENGTH = 4;
 
 export default Controller.extend(ModalFunctionality, {
+  adminCustomizeThemes: controller(),
+  themesController: controller("adminCustomizeThemes"),
   popular: equal("selection", "popular"),
   local: equal("selection", "local"),
   remote: equal("selection", "remote"),
   create: equal("selection", "create"),
   selection: "popular",
-  adminCustomizeThemes: inject(),
   loading: false,
   keyGenUrl: "/admin/themes/generate_key_pair",
   importUrl: "/admin/themes/import",
@@ -27,7 +27,6 @@ export default Controller.extend(ModalFunctionality, {
   uploadUrl: null,
   urlPlaceholder: "https://github.com/discourse/sample_theme",
   advancedVisible: false,
-  themesController: inject("adminCustomizeThemes"),
   selectedType: alias("themesController.currentTab"),
   component: equal("selectedType", COMPONENTS),
 
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
index b4cc2f188d..c2136e6cc6 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
@@ -1,9 +1,8 @@
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Controller.extend(ModalFunctionality, {
-  adminBackupsLogs: inject(),
+  adminBackupsLogs: controller(),
 
   actions: {
     startBackupWithUploads() {
diff --git a/app/assets/javascripts/discourse/controllers/activation-edit.js.es6 b/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
index 010878f720..334f6582c5 100644
--- a/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
+++ b/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
@@ -1,12 +1,11 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { extractError } from "discourse/lib/ajax-error";
 import { changeEmail } from "discourse/lib/user-activation";
 
 export default Controller.extend(ModalFunctionality, {
-  login: inject(),
+  login: controller(),
 
   currentEmail: null,
   newEmail: null,
diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js.es6 b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
index e9d70aa80f..ae89c737ea 100644
--- a/app/assets/javascripts/discourse/controllers/badges/show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
@@ -1,15 +1,14 @@
-import { inject } from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import EmberObject from "@ember/object";
-import Controller from "@ember/controller";
 import Badge from "discourse/models/badge";
 import UserBadge from "discourse/models/user-badge";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
+  application: controller(),
   queryParams: ["username"],
   noMoreBadges: false,
   userBadges: null,
-  application: inject(),
   hiddenSetTitle: true,
 
   @discourseComputed("userBadgesAll")
diff --git a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6 b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
index d9627ee47f..7e0642c9fc 100644
--- a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
@@ -1,12 +1,11 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { empty } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { topicLevels } from "discourse/lib/notification-levels";
 
 // Support for changing the notification level of various topics
 export default Controller.extend({
-  topicBulkActions: inject(),
+  topicBulkActions: controller(),
   notificationLevelId: null,
 
   @discourseComputed
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 9e7c03d121..62085e548e 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -1,7 +1,6 @@
 import { isEmpty } from "@ember/utils";
 import { notEmpty, or, not } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { setting } from "discourse/lib/computed";
@@ -26,7 +25,7 @@ export default Controller.extend(
   NameValidation,
   UserFieldsValidation,
   {
-    login: inject(),
+    login: controller(),
 
     complete: false,
     accountChallenge: 0,
diff --git a/app/assets/javascripts/discourse/controllers/discovery.js.es6 b/app/assets/javascripts/discourse/controllers/discovery.js.es6
index fa374b4372..9d666eb271 100644
--- a/app/assets/javascripts/discourse/controllers/discovery.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery.js.es6
@@ -1,14 +1,13 @@
 import { alias, not } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import DiscourseURL from "discourse/lib/url";
 import Category from "discourse/models/category";
 import { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
-  discoveryTopics: inject("discovery/topics"),
-  navigationCategory: inject("navigation/category"),
-  application: inject(),
+  discoveryTopics: controller("discovery/topics"),
+  navigationCategory: controller("navigation/category"),
+  application: controller(),
 
   loading: false,
 
diff --git a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
index 69e59db2a9..c02dece344 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
@@ -1,6 +1,6 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { reads } from "@ember/object/computed";
-import { inject } from "@ember/controller";
+import { inject as controller } from "@ember/controller";
 import DiscoveryController from "discourse/controllers/discovery";
 import { dasherize } from "@ember/string";
 
@@ -12,7 +12,7 @@ const subcategoryStyleComponentNames = {
 };
 
 export default DiscoveryController.extend({
-  discovery: inject(),
+  discovery: controller(),
 
   // this makes sure the composer isn't scoping to a specific category
   category: null,
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
index 047960ba8a..0ea6c59918 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
@@ -1,6 +1,6 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias, not, gt, empty, notEmpty, equal } from "@ember/object/computed";
-import { inject } from "@ember/controller";
+import { inject as controller } from "@ember/controller";
 import DiscoveryController from "discourse/controllers/discovery";
 import { queryParams } from "discourse/controllers/discovery-sortable";
 import BulkTopicSelection from "discourse/mixins/bulk-topic-selection";
@@ -11,8 +11,8 @@ import TopicList from "discourse/models/topic-list";
 import Topic from "discourse/models/topic";
 
 const controllerOpts = {
-  discovery: inject(),
-  discoveryTopics: inject("discovery/topics"),
+  discovery: controller(),
+  discoveryTopics: controller("discovery/topics"),
 
   period: null,
 
diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
index a143203720..5a92e4a453 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -1,7 +1,6 @@
 import { isEmpty } from "@ember/utils";
 import { or } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import {
   translateResults,
@@ -26,8 +25,8 @@ const SortOrders = [
 const PAGE_LIMIT = 10;
 
 export default Controller.extend({
-  application: inject(),
-  composer: inject(),
+  application: controller(),
+  composer: controller(),
   bulkSelectEnabled: null,
 
   loading: false,
diff --git a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
index d73bf08d2f..8a9604917f 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
@@ -1,12 +1,11 @@
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { observes } from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
 
 export default Controller.extend({
-  group: inject(),
-  groupActivity: inject(),
-  application: inject(),
+  group: controller(),
+  groupActivity: controller(),
+  application: controller(),
   canLoadMore: true,
   loading: false,
   emptyText: fmt("type", "groups.empty.%@"),
diff --git a/app/assets/javascripts/discourse/controllers/group-index.js.es6 b/app/assets/javascripts/discourse/controllers/group-index.js.es6
index 6916164dd6..b4168ba4c0 100644
--- a/app/assets/javascripts/discourse/controllers/group-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-index.js.es6
@@ -1,11 +1,11 @@
-import Controller, { inject } from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { alias } from "@ember/object/computed";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseDebounce from "discourse/lib/debounce";
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
 
   queryParams: ["order", "desc", "filter"],
 
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
index 41a12c2c98..80947cb9a6 100644
--- a/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
@@ -1,13 +1,12 @@
-import { inject } from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import EmberObject from "@ember/object";
-import Controller from "@ember/controller";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
-  group: inject(),
+  group: controller(),
+  application: controller(),
   loading: false,
   offset: 0,
-  application: inject(),
 
   init() {
     this._super(...arguments);
diff --git a/app/assets/javascripts/discourse/controllers/group-requests.js.es6 b/app/assets/javascripts/discourse/controllers/group-requests.js.es6
index c1664f0c32..7212826c71 100644
--- a/app/assets/javascripts/discourse/controllers/group-requests.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-requests.js.es6
@@ -1,11 +1,11 @@
-import Controller, { inject } from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseDebounce from "discourse/lib/debounce";
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
 
   queryParams: ["order", "desc", "filter"],
 
diff --git a/app/assets/javascripts/discourse/controllers/group.js.es6 b/app/assets/javascripts/discourse/controllers/group.js.es6
index 71354f58d3..b66561f39c 100644
--- a/app/assets/javascripts/discourse/controllers/group.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group.js.es6
@@ -1,6 +1,5 @@
 import EmberObject from "@ember/object";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 import { inject as service } from "@ember/service";
 import { readOnly } from "@ember/object/computed";
@@ -15,7 +14,7 @@ const Tab = EmberObject.extend({
 });
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
   counts: null,
   showing: "members",
   destroying: null,
diff --git a/app/assets/javascripts/discourse/controllers/groups-index.js.es6 b/app/assets/javascripts/discourse/controllers/groups-index.js.es6
index 00276d0215..6674322677 100644
--- a/app/assets/javascripts/discourse/controllers/groups-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/groups-index.js.es6
@@ -1,10 +1,9 @@
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
   queryParams: ["order", "asc", "filter", "type"],
   order: null,
   asc: null,
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index fe57a856ec..9d4c56f56e 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -4,8 +4,7 @@ import { alias, or, readOnly } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { next } from "@ember/runloop";
 import { scheduleOnce } from "@ember/runloop";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import showModal from "discourse/lib/show-modal";
@@ -27,9 +26,9 @@ const AuthErrors = [
 ];
 
 export default Controller.extend(ModalFunctionality, {
-  createAccount: inject(),
-  forgotPassword: inject(),
-  application: inject(),
+  createAccount: controller(),
+  forgotPassword: controller(),
+  application: controller(),
 
   loggingIn: false,
   loggedIn: false,
diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
index 02dd26acde..5dd5f167c7 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
@@ -1,11 +1,10 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import FilterModeMixin from "discourse/mixins/filter-mode";
 
 export default Controller.extend(FilterModeMixin, {
-  discovery: inject(),
-  discoveryTopics: inject("discovery/topics"),
+  discovery: controller(),
+  discoveryTopics: controller("discovery/topics"),
 
   @discourseComputed("discoveryTopics.model", "discoveryTopics.model.draft")
   draft: function() {
diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js.es6
index ad4f953105..9f139b6d92 100644
--- a/app/assets/javascripts/discourse/controllers/static.js.es6
+++ b/app/assets/javascripts/discourse/controllers/static.js.es6
@@ -1,12 +1,11 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { equal } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
 
   showLoginButton: equal("model.path", "login"),
 
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6
index 067a2f615b..5c6a7aefb7 100644
--- a/app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6
@@ -1,8 +1,7 @@
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 
 export default Controller.extend({
-  tagGroups: inject(),
+  tagGroups: controller(),
 
   actions: {
     onDestroy() {
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6
index d2d3705866..f4825bdd35 100644
--- a/app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6
@@ -1,7 +1,7 @@
-import Controller, { inject } from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 
 export default Controller.extend({
-  tagGroups: inject(),
+  tagGroups: controller(),
 
   actions: {
     onSave() {
diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
index c4d79e8643..a44cf850c8 100644
--- a/app/assets/javascripts/discourse/controllers/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
@@ -1,6 +1,5 @@
 import { alias } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import BulkTopicSelection from "discourse/mixins/bulk-topic-selection";
 import NavItem from "discourse/models/nav-item";
@@ -8,7 +7,7 @@ import FilterModeMixin from "discourse/mixins/filter-mode";
 import { queryParams } from "discourse/controllers/discovery-sortable";
 
 export default Controller.extend(BulkTopicSelection, FilterModeMixin, {
-  application: inject(),
+  application: controller(),
 
   tag: null,
   additionalTags: null,
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index ec53fe427d..12c4ceaaea 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -3,8 +3,7 @@ import { or, and, not, alias } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { next } from "@ember/runloop";
 import { scheduleOnce } from "@ember/runloop";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import Composer from "discourse/models/composer";
 import DiscourseURL from "discourse/lib/url";
@@ -39,8 +38,8 @@ export function registerCustomPostMessageCallback(type, callback) {
 }
 
 export default Controller.extend(bufferedProperty("model"), {
-  composer: inject(),
-  application: inject(),
+  composer: controller(),
+  application: controller(),
   multiSelect: false,
   selectedPostIds: null,
   editingTopic: false,
@@ -696,10 +695,10 @@ export default Controller.extend(bufferedProperty("model"), {
 
     jumpToPostPrompt() {
       const topic = this.model;
-      const controller = showModal("jump-to-post", {
+      const modal = showModal("jump-to-post", {
         modalClass: "jump-to-post-modal"
       });
-      controller.setProperties({
+      modal.setProperties({
         topic,
         postNumber: null,
         jumpToIndex: index => this.send("jumpToIndex", index),
@@ -840,8 +839,8 @@ export default Controller.extend(bufferedProperty("model"), {
 
     addNotice(post) {
       return new Promise(function(resolve, reject) {
-        const controller = showModal("add-post-notice");
-        controller.setProperties({ post, resolve, reject });
+        const modal = showModal("add-post-notice");
+        modal.setProperties({ post, resolve, reject });
       });
     },
 
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
index 473f24c753..12333fcf07 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -1,14 +1,13 @@
 import { alias } from "@ember/object/computed";
 import { inject as service } from "@ember/service";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { exportUserArchive } from "discourse/lib/export-csv";
 import { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
+  user: controller(),
   router: service(),
-  user: inject(),
   userActionType: null,
 
   canDownloadPosts: alias("user.viewingSelf"),
diff --git a/app/assets/javascripts/discourse/controllers/user-badges.js.es6 b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
index 01df9566af..d5bfab5dc8 100644
--- a/app/assets/javascripts/discourse/controllers/user-badges.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
@@ -1,8 +1,8 @@
 import { alias, sort } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
+
 export default Controller.extend({
-  user: inject(),
+  user: controller(),
   username: alias("user.model.username_lower"),
   sortedBadges: sort("model", "badgeSortOrder"),
 
diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js.es6
index 862fc92e73..a3584e9f10 100644
--- a/app/assets/javascripts/discourse/controllers/user-card.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6
@@ -1,10 +1,9 @@
 import { inject as service } from "@ember/service";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import DiscourseURL, { userPath, groupPath } from "discourse/lib/url";
 
 export default Controller.extend({
-  topic: inject(),
+  topic: controller(),
   router: service(),
 
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
index 23efcfc214..b6cceef185 100644
--- a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
@@ -1,12 +1,11 @@
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { readOnly } from "@ember/object/computed";
 import { inject as service } from "@ember/service";
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
   router: service(),
   currentPath: readOnly("router._router.currentPath"),
 
diff --git a/app/assets/javascripts/discourse/controllers/user-posts.js.es6 b/app/assets/javascripts/discourse/controllers/user-posts.js.es6
index e5de7e9995..0e2852d60d 100644
--- a/app/assets/javascripts/discourse/controllers/user-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-posts.js.es6
@@ -1,9 +1,8 @@
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
 
   @observes("model.canLoadMore")
   _showFooter: function() {
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
index 8a21698516..79cdc7822a 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
@@ -1,14 +1,13 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias, equal, and } from "@ember/object/computed";
 import { inject as service } from "@ember/service";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import Topic from "discourse/models/topic";
 
 export default Controller.extend({
+  userTopicsList: controller("user-topics-list"),
+  user: controller(),
   router: service(),
-  userTopicsList: inject("user-topics-list"),
-  user: inject(),
 
   pmView: false,
   viewingSelf: alias("user.viewingSelf"),
diff --git a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6 b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
index f541ac01ca..91483bafc2 100644
--- a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
@@ -1,10 +1,9 @@
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 
 // Lists of topics on a user's page.
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
 
   hideCategory: false,
   showPosters: false,
diff --git a/app/assets/javascripts/discourse/controllers/users.js.es6 b/app/assets/javascripts/discourse/controllers/users.js.es6
index 820e50b0af..89c20efa69 100644
--- a/app/assets/javascripts/discourse/controllers/users.js.es6
+++ b/app/assets/javascripts/discourse/controllers/users.js.es6
@@ -1,11 +1,10 @@
 import { equal } from "@ember/object/computed";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
-  application: inject(),
+  application: controller(),
   queryParams: ["period", "order", "asc", "name", "group", "exclude_usernames"],
   period: "weekly",
   order: "likes_received",

From 43b54c631d0804ddb29cb72bdae3deba326f194d Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Fri, 6 Mar 2020 10:16:19 -0700
Subject: [PATCH 0109/1830] DEV: Reserve webhook event types to be used in
 plugins (#9110)

* DEV: Reserve webhook event types to be used in plugins

Based on feedback on the following PR's:

https://github.com/discourse/discourse-solved/pull/85

https://github.com/discourse/discourse-assign/pull/61

This commit reserves ID's to be used for webhook event types to ensure
that some other webhook or plugin doesn't end up using the same ID.

* Fix broken test

I don't think this test has to test ALL event types to verify that this
feature is working. Now that we added some event types that plugins are
using this test was failing for missing fabricators that exist in the
respective plugins.

* remove loop and just test first record
---
 app/models/web_hook_event_type.rb       |  2 ++
 db/fixtures/007_web_hook_event_types.rb | 10 ++++++++++
 spec/jobs/emit_web_hook_event_spec.rb   | 19 +++++++++----------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/models/web_hook_event_type.rb b/app/models/web_hook_event_type.rb
index 719ceaa712..c40c7a21a9 100644
--- a/app/models/web_hook_event_type.rb
+++ b/app/models/web_hook_event_type.rb
@@ -11,6 +11,8 @@ class WebHookEventType < ActiveRecord::Base
   QUEUED_POST = 8
   REVIEWABLE = 9
   NOTIFICATION = 10
+  SOLVED = 11
+  ASSIGN = 12
 
   has_and_belongs_to_many :web_hooks
 
diff --git a/db/fixtures/007_web_hook_event_types.rb b/db/fixtures/007_web_hook_event_types.rb
index 0645cfad8e..5cbcd3edc2 100644
--- a/db/fixtures/007_web_hook_event_types.rb
+++ b/db/fixtures/007_web_hook_event_types.rb
@@ -49,3 +49,13 @@ WebHookEventType.seed do |b|
   b.id = WebHookEventType::NOTIFICATION
   b.name = "notification"
 end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::SOLVED
+  b.name = "solved"
+end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::ASSIGN
+  b.name = "assign"
+end
diff --git a/spec/jobs/emit_web_hook_event_spec.rb b/spec/jobs/emit_web_hook_event_spec.rb
index e87d6b7c7c..453db11abb 100644
--- a/spec/jobs/emit_web_hook_event_spec.rb
+++ b/spec/jobs/emit_web_hook_event_spec.rb
@@ -239,17 +239,16 @@ describe Jobs::EmitWebHookEvent do
       stub_request(:post, post_hook.payload_url)
         .to_return(body: 'OK', status: 200)
 
-      WebHookEventType.all.pluck(:name).each do |name|
-        web_hook_id = Fabricate("#{name}_web_hook").id
+      topic_event_type = WebHookEventType.all.first
+      web_hook_id = Fabricate("#{topic_event_type.name}_web_hook").id
 
-        expect do
-          subject.execute(
-            web_hook_id: web_hook_id,
-            event_type: name,
-            payload: { test: "some payload" }.to_json
-          )
-        end.to change(WebHookEvent, :count).by(1)
-      end
+      expect do
+        subject.execute(
+          web_hook_id: web_hook_id,
+          event_type: topic_event_type.name,
+          payload: { test: "some payload" }.to_json
+        )
+      end.to change(WebHookEvent, :count).by(1)
     end
 
     it 'sets up proper request headers' do

From 87687c0819f8627fec36209ad4b3762fd85a3cee Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Fri, 6 Mar 2020 14:29:00 -0300
Subject: [PATCH 0110/1830] Drop unnecessary readonly_during_backup setting
 (#9112)

---
 config/locales/server.en.yml   | 1 -
 config/site_settings.yml       | 2 --
 lib/backup_restore/backuper.rb | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 3705e98f01..9bd64c7dbf 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1647,7 +1647,6 @@ en:
     discord_secret: "Discord Secret Key"
     discord_trusted_guilds: 'Only allow members of these Discord guilds to login via Discord. Use the numeric ID for the guild. For more information, check the instructions <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">here</a>. Leave blank to allow any guild.'
 
-    readonly_mode_during_backup: "Enable read only mode while taking a backup"
     enable_backups: "Allow administrators to create backups of the forum"
     allow_restore: "Allow restore, which can replace ALL site data! Leave false unless you plan to restore a backup"
     maximum_backups: "The maximum amount of backups to keep on disk. Older backups are automatically deleted"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 6ea8733db4..a2320348a1 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1649,8 +1649,6 @@ backups:
   enable_backups:
     default: true
     client: true
-  readonly_mode_during_backup:
-    default: false
   allow_restore:
     default: false
   backup_location:
diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb
index 3068ecb2a4..0ae246dd88 100644
--- a/lib/backup_restore/backuper.rb
+++ b/lib/backup_restore/backuper.rb
@@ -106,7 +106,7 @@ module BackupRestore
         end
 
       @logs = []
-      @readonly_mode_was_enabled = Discourse.readonly_mode? || !SiteSetting.readonly_mode_during_backup
+      @readonly_mode_was_enabled = Discourse.readonly_mode?
     end
 
     def listen_for_shutdown_signal

From 86690155b3d619f0ad3c2d9e1991f9fbdbb3ff87 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Fri, 6 Mar 2020 07:36:56 -1000
Subject: [PATCH 0111/1830] FEATURE: prevent accidental canceling when drafting
 penalties (#9129)

Pop up a confirmation box when there is input. This prevents accidental closing
of the dialog boxes due to clicking outside.

This adds a development hook on modals in the form of a `beforeClose`
function. Modal windows can abort the close if the funtion returns false.

Additionally fixing a few issues with loop and state on the modal popups:

Escape key with bootbox is keyup.
Updating modal to close on keyup as well so escape key is working.
Fixes an issue where pressing esc will loop immediately back to the modal by:
keydown -> bootbox -> keyup -> acts as "cancel", restores modal

Needs a next call to reopenModal otherwise, keyup is handled again by the modal.
Fixes an issue where pressing esc will loop immediately back to the confirm:
esc keyup will be handled and bubble immediately back to the modal.

Additionally, only handle key events when the #discourse-modal is visible.
This resolves issues where escape or enter events were being handled by
a hidden modal window.
---
 .../admin/mixins/penalty-controller.js.es6    | 28 ++++++++++++++++++-
 .../discourse/components/d-modal.js.es6       | 17 ++++++-----
 .../discourse/routes/application.js.es6       | 15 ++++++++--
 config/locales/client.en.yml                  |  1 +
 .../acceptance/admin-suspend-user-test.js.es6 | 27 ++++++++++++++++++
 test/javascripts/acceptance/modal-test.js.es6 | 10 +++----
 6 files changed, 83 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
index cb07e9d2ca..46ba124e18 100644
--- a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
+++ b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
@@ -1,6 +1,7 @@
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Mixin from "@ember/object/mixin";
+import { next } from "@ember/runloop";
 import { Promise } from "rsvp";
 
 export default Mixin.create(ModalFunctionality, {
@@ -11,6 +12,7 @@ export default Mixin.create(ModalFunctionality, {
   user: null,
   postId: null,
   successCallback: null,
+  confirmClose: false,
 
   resetModal() {
     this.setProperties({
@@ -21,10 +23,33 @@ export default Mixin.create(ModalFunctionality, {
       postEdit: null,
       postAction: "delete",
       before: null,
-      successCallback: null
+      successCallback: null,
+      confirmClose: false
     });
   },
 
+  beforeClose() {
+    // prompt a confirmation if we have unsaved content
+    if (
+      !this.confirmClose &&
+      ((this.reason && this.reason.length > 1) ||
+        (this.message && this.message.length > 1))
+    ) {
+      this.send("hideModal");
+      bootbox.confirm(I18n.t("admin.user.confirm_cancel_penalty"), result => {
+        if (result) {
+          next(() => {
+            this.set("confirmClose", true);
+            this.send("closeModal");
+          });
+        } else {
+          next(() => this.send("reopenModal"));
+        }
+      });
+      return false;
+    }
+  },
+
   penalize(cb) {
     let before = this.before;
     let promise = before ? before() : Promise.resolve();
@@ -32,6 +57,7 @@ export default Mixin.create(ModalFunctionality, {
     return promise
       .then(() => cb())
       .then(result => {
+        this.set("confirmClose", true);
         this.send("closeModal");
         let callback = this.successCallback;
         if (callback) {
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index 300a3e585c..eeae7edc3f 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -31,13 +31,16 @@ export default Component.extend({
 
   @on("didInsertElement")
   setUp() {
-    $("html").on("keydown.discourse-modal", e => {
-      if (e.which === 27 && this.dismissable) {
-        next(() => $(".modal-header button.modal-close").click());
-      }
+    $("html").on("keyup.discourse-modal", e => {
+      //only respond to events when the modal is visible
+      if ($("#discourse-modal:visible").length > 0) {
+        if (e.which === 27 && this.dismissable) {
+          next(() => $(".modal-header button.modal-close").click());
+        }
 
-      if (e.which === 13 && this.triggerClickOnEnter(e)) {
-        next(() => $(".modal-footer .btn-primary").click());
+        if (e.which === 13 && this.triggerClickOnEnter(e)) {
+          next(() => $(".modal-footer .btn-primary").click());
+        }
       }
     });
 
@@ -46,7 +49,7 @@ export default Component.extend({
 
   @on("willDestroyElement")
   cleanUp() {
-    $("html").off("keydown.discourse-modal");
+    $("html").off("keyup.discourse-modal");
     this.appEvents.off("modal:body-shown", this, "_modalBodyShown");
   },
 
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index e877d8ceff..8dca333360 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -157,12 +157,23 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
 
     // Close the current modal, and destroy its state.
     closeModal() {
-      this.render("hide-modal", { into: "modal", outlet: "modalBody" });
-
       const route = getOwner(this).lookup("route:application");
       let modalController = route.controllerFor("modal");
       const controllerName = modalController.get("name");
 
+      if (controllerName) {
+        const controller = getOwner(this).lookup(
+          `controller:${controllerName}`
+        );
+        if (controller && controller.beforeClose) {
+          if (false === controller.beforeClose()) {
+            return;
+          }
+        }
+      }
+
+      this.render("hide-modal", { into: "modal", outlet: "modalBody" });
+
       if (controllerName) {
         const controller = getOwner(this).lookup(
           `controller:${controllerName}`
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a18720a293..5b632f3bfd 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4293,6 +4293,7 @@ en:
           threshold_reached: "Received too many bounces from that email."
         trust_level_change_failed: "There was a problem changing the user's trust level."
         suspend_modal_title: "Suspend User"
+        confirm_cancel_penalty: "Are you sure you want to discard the penalty?"
         trust_level_2_users: "Trust Level 2 Users"
         trust_level_3_requirements: "Trust Level 3 Requirements"
         trust_level_locked_tip: "trust level is locked, system will not promote or demote user"
diff --git a/test/javascripts/acceptance/admin-suspend-user-test.js.es6 b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
index d9983848ca..812c1f704c 100644
--- a/test/javascripts/acceptance/admin-suspend-user-test.js.es6
+++ b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
@@ -34,6 +34,33 @@ QUnit.test("suspend a user - cancel", async assert => {
   assert.equal(find(".suspend-user-modal:visible").length, 0);
 });
 
+QUnit.test("suspend a user - cancel with input", async assert => {
+  await visit("/admin/users/1234/regular");
+  await click(".suspend-user");
+
+  assert.equal(find(".suspend-user-modal:visible").length, 1);
+
+  await fillIn(".suspend-reason", "for breaking the rules");
+  await fillIn(".suspend-message", "this is an email reason why");
+
+  await click(".d-modal-cancel");
+
+  assert.equal(find(".bootbox.modal:visible").length, 1);
+
+  await click(".modal-footer .btn-default");
+  assert.equal(find(".suspend-user-modal:visible").length, 1);
+  assert.equal(
+    find(".suspend-message")[0].value,
+    "this is an email reason why"
+  );
+
+  await click(".d-modal-cancel");
+  assert.equal(find(".bootbox.modal:visible").length, 1);
+  assert.equal(find(".suspend-user-modal:visible").length, 0);
+  await click(".modal-footer .btn-primary");
+  assert.equal(find(".bootbox.modal:visible").length, 0);
+});
+
 QUnit.test("suspend, then unsuspend a user", async assert => {
   const suspendUntilCombobox = selectKit(".suspend-until .combobox");
 
diff --git a/test/javascripts/acceptance/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js.es6
index 13725f4d6c..4e43be89bb 100644
--- a/test/javascripts/acceptance/modal-test.js.es6
+++ b/test/javascripts/acceptance/modal-test.js.es6
@@ -28,7 +28,7 @@ QUnit.test("modal", async function(assert) {
   await click(".login-button");
   assert.ok(find(".d-modal:visible").length === 1, "modal should reappear");
 
-  await keyEvent("#main-outlet", "keydown", 27);
+  await keyEvent("#main-outlet", "keyup", 27);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "ESC should close the modal"
@@ -47,7 +47,7 @@ QUnit.test("modal", async function(assert) {
     find(".d-modal:visible").length === 1,
     "modal should not disappear when you click outside"
   );
-  await keyEvent("#main-outlet", "keydown", 27);
+  await keyEvent("#main-outlet", "keyup", 27);
   assert.ok(
     find(".d-modal:visible").length === 1,
     "ESC should not close the modal"
@@ -61,7 +61,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
 
   await click(".toggle-admin-menu");
   await click(".topic-admin-status-update button");
-  await keyEvent(".d-modal", "keydown", 13);
+  await keyEvent(".d-modal", "keyup", 13);
 
   assert.ok(
     find("#modal-alert:visible").length === 1,
@@ -72,7 +72,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
     "hitting Enter does not dismiss modal due to alert error"
   );
 
-  await keyEvent("#main-outlet", "keydown", 27);
+  await keyEvent("#main-outlet", "keyup", 27);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "ESC should close the modal"
@@ -82,7 +82,7 @@ QUnit.test("modal-keyboard-events", async function(assert) {
 
   await click(".d-editor-button-bar .btn.link");
 
-  await keyEvent(".d-modal", "keydown", 13);
+  await keyEvent(".d-modal", "keyup", 13);
   assert.ok(
     find(".d-modal:visible").length === 0,
     "modal should disappear on hitting Enter"

From f2b95c19187278cfb04ea5e998e7c333f4f5d683 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 5 Mar 2020 16:10:12 -0800
Subject: [PATCH 0112/1830] FIX: Allow quoting from a closed topic while
 writing a reply

composer.(controller).visible is true as long as state is not 'closed'.
---
 app/assets/javascripts/discourse/controllers/topic.js.es6 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 12c4ceaaea..80e6124f6d 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -76,10 +76,10 @@ export default Controller.extend(bufferedProperty("model"), {
     }
   },
 
-  @discourseComputed("model.details.can_create_post")
-  embedQuoteButton(canCreatePost) {
+  @discourseComputed("model.details.can_create_post", "composer.visible")
+  embedQuoteButton(canCreatePost, composerOpened) {
     return (
-      canCreatePost &&
+      (canCreatePost || composerOpened) &&
       this.currentUser &&
       this.currentUser.get("enable_quoting")
     );

From 763a065df9bac25fb4d08ab83b975c0317f6dda7 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 6 Mar 2020 12:58:59 -0600
Subject: [PATCH 0113/1830] FIX: Correctly format select options for group poll
 by fields (#9131)

---
 plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
index 21d24f512c..1f71dea021 100644
--- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
+++ b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
@@ -454,7 +454,9 @@ createWidget("discourse-poll-info", {
 
 function transformUserFieldToLabel(fieldName) {
   let transformed = fieldName.split("_").filter(Boolean);
-  transformed[0] = classify(transformed[0]);
+  if (transformed.length > 1) {
+    transformed[0] = classify(transformed[0]);
+  }
   return transformed.join(" ");
 }
 

From 29c9d8a133858836162a97d7516fb300485a2816 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 6 Mar 2020 20:11:21 +0100
Subject: [PATCH 0114/1830] FIX: uses only global allow_uncategorized_topics
 for category drop (#9130)

---
 .../select-kit/components/category-drop.js.es6            | 8 ++------
 .../components/select-kit/category-drop-test.js.es6       | 8 +++++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/category-drop.js.es6 b/app/assets/javascripts/select-kit/components/category-drop.js.es6
index 5ee9a6d12b..c80f46bea9 100644
--- a/app/assets/javascripts/select-kit/components/category-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-drop.js.es6
@@ -28,7 +28,6 @@ export default ComboBoxComponent.extend({
     subCategory: false,
     clearable: false,
     hideParentCategory: "hideParentCategory",
-    allowUncategorized: true,
     countSubcategories: false,
     autoInsertNoneItem: false,
     displayCategoryDescription: "displayCategoryDescription",
@@ -96,7 +95,7 @@ export default ComboBoxComponent.extend({
       content.title = category.title;
       content.label = categoryBadgeHTML(category, {
         link: false,
-        allowUncategorized: this.selectKit.options.allowUncategorized,
+        allowUncategorized: true,
         hideParent: true
       }).htmlSafe();
     }
@@ -174,10 +173,7 @@ export default ComboBoxComponent.extend({
   },
 
   _filterUncategorized(content) {
-    if (
-      !this.siteSettings.allow_uncategorized_topics ||
-      !this.selectKit.options.allowUncategorized
-    ) {
+    if (!this.siteSettings.allow_uncategorized_topics) {
       content = content.filter(
         c => c.id !== this.site.uncategorized_category_id
       );
diff --git a/test/javascripts/components/select-kit/category-drop-test.js.es6 b/test/javascripts/components/select-kit/category-drop-test.js.es6
index 2a3b7b6e56..5c45042cb9 100644
--- a/test/javascripts/components/select-kit/category-drop-test.js.es6
+++ b/test/javascripts/components/select-kit/category-drop-test.js.es6
@@ -187,10 +187,11 @@ componentTest("hideParentCategory (true)", {
   }
 });
 
-componentTest("allowUncategorized (default: true)", {
+componentTest("allow_uncategorized_topics (true)", {
   template: template(),
 
   beforeEach() {
+    this.siteSettings.allow_uncategorized_topics = true;
     initCategories(this);
   },
 
@@ -203,10 +204,11 @@ componentTest("allowUncategorized (default: true)", {
   }
 });
 
-componentTest("allowUncategorized (false)", {
-  template: template(["allowUncategorized=false"]),
+componentTest("allow_uncategorized_topics (false)", {
+  template: template(),
 
   beforeEach() {
+    this.siteSettings.allow_uncategorized_topics = false;
     initCategories(this);
   },
 

From bb5990781eb175c2d908dcc73f4438f0f4584076 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 6 Mar 2020 20:27:33 +0100
Subject: [PATCH 0115/1830] FIX: allows to define placement strategy of
 select-kit body (#9109)

---
 .../components/edit-category-security.hbs     |  6 +++
 .../components/edit-category-settings.hbs     | 44 +++++++++++++++++--
 .../select-kit/components/select-kit.js.es6   |  8 +++-
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index e6c7dd5634..cfde179c32 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -29,6 +29,9 @@
         value=selectedGroup
         valueProperty=null
         nameProperty=null
+        options=(hash
+          placementStrategy="absolute"
+        )
       }}
       {{combo-box
         class="permission-selector"
@@ -36,6 +39,9 @@
         content=category.availablePermissions
         onChange=(action "onSelectPermission")
         value=selectedPermission
+        options=(hash
+          placementStrategy="absolute"
+        )
       }}
       {{d-button
         action=(action "addPermission" selectedGroup selectedPermission)
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
index fab2c089fd..dfb2e1c8d0 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -39,6 +39,9 @@
       content=searchPrioritiesOptions
       value=category.search_priority
       onChange=(action (mut category.search_priority))
+      options=(hash
+        placementStrategy="absolute"
+      )
     }}
     </div>
   </section>
@@ -148,7 +151,15 @@
       {{i18n "category.default_view"}}
     </label>
     <div class="controls">
-      {{combo-box valueProperty="value" id="category-default-view" content=availableViews value=category.default_view}}
+      {{combo-box
+        valueProperty="value"
+        id="category-default-view"
+        content=availableViews
+        value=category.default_view
+        options=(hash
+          placementStrategy="absolute"
+        )
+      }}
     </div>
   </section>
 
@@ -157,7 +168,15 @@
       {{i18n "category.default_top_period"}}
     </label>
     <div class="controls">
-      {{combo-box valueProperty="value" id="category-default-period" content=availableTopPeriods value=category.default_top_period}}
+      {{combo-box
+        valueProperty="value"
+        id="category-default-period"
+        content=availableTopPeriods
+        value=category.default_top_period
+        options=(hash
+          placementStrategy="absolute"
+        )
+      }}
     </div>
   </section>
 
@@ -168,7 +187,16 @@
     <div class="controls">
     {{combo-box valueProperty="value" content=availableSorts value=category.sort_order none="category.sort_options.default"}}
     {{#unless isDefaultSortOrder}}
-      {{combo-box castBoolean=true valueProperty="value" content=sortAscendingOptions value=category.sort_ascending none="category.sort_options.default"}}
+      {{combo-box
+        castBoolean=true
+        valueProperty="value"
+        content=sortAscendingOptions
+        value=category.sort_ascending
+        none="category.sort_options.default"
+        options=(hash
+          placementStrategy="absolute"
+        )
+      }}
     {{/unless}}
       </div>
   </section>
@@ -187,7 +215,15 @@
         <label for="subcategory-list-style">
           {{i18n "category.subcategory_list_style"}}
         </label>
-              {{combo-box valueProperty="value" id="subcategory-list-style" content=availableSubcategoryListStyles value=category.subcategory_list_style}}
+        {{combo-box
+          valueProperty="value"
+          id="subcategory-list-style"
+          content=availableSubcategoryListStyles
+          value=category.subcategory_list_style
+          options=(hash
+            placementStrategy="absolute"
+          )
+        }}
       </section>
     {{/if}}
 
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index ed78c9ed78..30a37cf450 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -267,6 +267,7 @@ export default Component.extend(
       closeOnChange: true,
       limitMatches: null,
       placement: "bottom-start",
+      placementStrategy: null,
       filterComponent: "select-kit/select-kit-filter",
       selectedNameComponent: "selected-name",
       castInteger: false
@@ -814,10 +815,15 @@ export default Component.extend(
           popper.style.width = `${anchor.offsetWidth}px`;
         }
 
+        let placementStrategy = this.selectKit.options.placementStrategy;
+        if (!placementStrategy) {
+          placementStrategy = this.inModal ? "fixed" : "absolute";
+        }
+
         /* global Popper:true */
         this.popper = Popper.createPopper(anchor, popper, {
           eventsEnabled: false,
-          strategy: inModal ? "fixed" : "absolute",
+          strategy: placementStrategy,
           placement: this.selectKit.options.placement,
           modifiers: [
             {

From 4c3bd50c13eef8f23545c7479d3ed8ac119ca319 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 6 Mar 2020 16:42:32 -0500
Subject: [PATCH 0116/1830] FIX: Prevent avatar flair image from repeating on
 user/group cards

---
 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 bf65bdf70b..c5dad5d089 100644
--- a/app/assets/stylesheets/common/components/user-card.scss
+++ b/app/assets/stylesheets/common/components/user-card.scss
@@ -253,6 +253,7 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
     .avatar-flair {
       display: flex;
       background-size: contain;
+      background-repeat: no-repeat;
       width: $avatar_width;
       height: $avatar_width;
       color: $primary;

From f7ea2fdea56427ce9e7fff4298c171744d8531cd Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 6 Mar 2020 22:54:40 +0100
Subject: [PATCH 0117/1830] FIX: Import posts of missing users from phpbb3
 (#9085)

Posts without a user probably shouldn't happen unless there was some direct database tampering, but data like that has been seen in the wild.

The importer will assign those posts to the "system" user.
---
 script/import_scripts/phpbb3/database/database_3_0.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/import_scripts/phpbb3/database/database_3_0.rb b/script/import_scripts/phpbb3/database/database_3_0.rb
index 2b2c557d5f..0799b92ba7 100644
--- a/script/import_scripts/phpbb3/database/database_3_0.rb
+++ b/script/import_scripts/phpbb3/database/database_3_0.rb
@@ -83,7 +83,7 @@ module ImportScripts::PhpBB3
           CASE WHEN u.user_type = #{Constants::USER_TYPE_IGNORE} THEN p.post_username ELSE NULL END post_username
         FROM #{@table_prefix}posts p
           JOIN #{@table_prefix}topics t ON (p.topic_id = t.topic_id)
-          JOIN #{@table_prefix}users u ON (p.poster_id = u.user_id)
+          LEFT OUTER JOIN #{@table_prefix}users u ON (p.poster_id = u.user_id)
         WHERE p.post_id > #{last_post_id}
         ORDER BY p.post_id
         LIMIT #{@batch_size}

From 26da99a2d2d484968f4eecb25e10962cafe8912a Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Fri, 6 Mar 2020 11:05:46 -0800
Subject: [PATCH 0118/1830] FIX: Tolerate quotes with no username and no title

---
 .../discourse/components/quote-button.js.es6        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6
index a703e5e3d7..2d8df37706 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/components/quote-button.js.es6
@@ -3,6 +3,12 @@ import Component from "@ember/component";
 import discourseDebounce from "discourse/lib/debounce";
 import { selectedText, selectedElement } from "discourse/lib/utilities";
 
+function getQuoteTitle(element) {
+  const titleEl = element.querySelector(".title");
+  if (!titleEl) return;
+  return titleEl.textContent.trim().replace(/:$/, "");
+}
+
 export default Component.extend({
   classNames: ["quote-button"],
   classNameBindings: ["visible"],
@@ -55,12 +61,7 @@ export default Component.extend({
       element = element.parentElement
     ) {
       if (element.tagName === "ASIDE" && element.classList.contains("quote")) {
-        opts.username =
-          element.dataset.username ||
-          element
-            .querySelector(".title")
-            .textContent.trim()
-            .replace(/:$/, "");
+        opts.username = element.dataset.username || getQuoteTitle(element);
         opts.post = element.dataset.post;
         opts.topic = element.dataset.topic;
       }

From 48ba65f406f882d14e2d6b33da5baddbeab6cd5a Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 6 Mar 2020 23:49:28 +0100
Subject: [PATCH 0119/1830] DEV: Clean up Ember imports (#8979)

Includes:
* Import `computed` helpers
* Import `@ember/application`
* Import `isBlank` from `@ember/utils`
* Import `A` from `@ember/array`
* Import `EmberArray` from `@ember/array`
* Import `ArrayProxy` from `@ember/array/proxy`
* Import `warn` from `@ember/debug`
* Import `EmberObject` from `@ember/object`
* Import `Application` from `@ember/application`
* Import `EmberRouter` from `@ember/routing/router`
* Import `isPresent` from `@ember/utils`
* Import `computed` from `@ember/object`
* Import `guidFor` from `@ember/object`
* Import `isArray` from `@ember/array`
* Import `TextField` from `@ember/component`
* Import `TextArea` from `@ember/component`
* Import `Promise` from `rsvp`
* Import `Evented` from `@ember/object/evented`
* Replace deprecated `ember-addons/ember-computed-decorators` imports
---
 .../controllers/admin-api-keys-new.js.es6     |  7 ++++---
 .../modals/admin-edit-badge-groupings.js.es6  |  3 ++-
 .../admin/mixins/setting-component.js.es6     |  3 ++-
 .../admin/models/color-scheme.js.es6          |  6 ++++--
 .../javascripts/admin/models/theme.js.es6     |  4 ++--
 app/assets/javascripts/discourse-loader.js    |  7 ++++---
 app/assets/javascripts/discourse.js.es6       |  6 +++---
 .../components/expanding-text-area.js.es6     |  3 ++-
 .../components/honeypot-input.js.es6          |  3 ++-
 .../discourse/components/number-field.js.es6  |  3 ++-
 .../discourse/components/text-field.js.es6    |  3 ++-
 .../controllers/create-account.js.es6         |  3 ++-
 .../helpers/topic-status-icons.js.es6         |  4 +++-
 .../javascripts/discourse/lib/computed.js.es6 | 19 +++++++++---------
 .../lib/posts-with-placeholders.js.es6        |  3 ++-
 .../discourse/mapping-router.js.es6           |  3 ++-
 .../discourse/mixins/upload.js.es6            |  3 ++-
 .../discourse/models/category-list.js.es6     |  3 ++-
 .../javascripts/discourse/models/rest.js.es6  |  3 ++-
 .../discourse/models/result-set.js.es6        |  3 ++-
 .../models/user-drafts-stream.js.es6          |  3 ++-
 .../discourse/models/user-stream.js.es6       |  3 ++-
 .../javascripts/discourse/models/user.js.es6  |  3 ++-
 .../pre-initializers/map-routes.js.es6        |  6 ++++--
 .../discourse/services/app-events.js.es6      |  3 ++-
 .../select-kit/components/multi-select.js.es6 |  2 +-
 .../select-kit/components/select-kit.js.es6   |  4 ++--
 app/assets/javascripts/wizard/router.js.es6   |  3 ++-
 app/assets/javascripts/wizard/wizard.js.es6   |  3 ++-
 .../discourse-local-dates-create-form.js.es6  | 20 ++++++++++---------
 .../composer-presence-display.js.es6          | 12 ++++++-----
 .../components/topic-presence-display.js.es6  |  7 ++++---
 .../initializers/extend-for-poll.js.es6       |  7 ++++---
 ...iscourse-poll-standard-results-test.js.es6 |  8 +++++---
 .../models/post-stream-test.js.es6            |  3 ++-
 35 files changed, 108 insertions(+), 71 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys-new.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys-new.js.es6
index 42391beaf8..9384e79557 100644
--- a/app/assets/javascripts/admin/controllers/admin-api-keys-new.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-api-keys-new.js.es6
@@ -1,5 +1,6 @@
-import discourseComputed from "discourse-common/utils/decorators";
+import { isBlank } from "@ember/utils";
 import Controller from "@ember/controller";
+import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
@@ -15,8 +16,8 @@ export default Controller.extend({
 
   @discourseComputed("model.description", "model.username", "userMode")
   saveDisabled(description, username, userMode) {
-    if (Ember.isBlank(description)) return true;
-    if (userMode === "single" && Ember.isBlank(username)) return true;
+    if (isBlank(description)) return true;
+    if (userMode === "single" && isBlank(username)) return true;
     return false;
   },
 
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
index 1629aab70b..7bc3603887 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
@@ -1,4 +1,5 @@
 import Controller from "@ember/controller";
+import { A } from "@ember/array";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { observes } from "discourse-common/utils/decorators";
@@ -7,7 +8,7 @@ export default Controller.extend(ModalFunctionality, {
   @observes("model")
   modelChanged() {
     const model = this.model;
-    const copy = Ember.A();
+    const copy = A();
     const store = this.store;
 
     if (model) {
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index c182abadd6..70384c1a27 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -1,3 +1,4 @@
+import { warn } from "@ember/debug";
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias, oneWay } from "@ember/object/computed";
 import { categoryLinkHTML } from "discourse/helpers/category-link";
@@ -137,7 +138,7 @@ export default Mixin.create({
   }),
 
   _save() {
-    Ember.warn("You should define a `_save` method", {
+    warn("You should define a `_save` method", {
       id: "discourse.setting-component.missing-save"
     });
     return Promise.resolve();
diff --git a/app/assets/javascripts/admin/models/color-scheme.js.es6 b/app/assets/javascripts/admin/models/color-scheme.js.es6
index afabb1ed6e..ee60097b74 100644
--- a/app/assets/javascripts/admin/models/color-scheme.js.es6
+++ b/app/assets/javascripts/admin/models/color-scheme.js.es6
@@ -1,3 +1,5 @@
+import { A } from "@ember/array";
+import ArrayProxy from "@ember/array/proxy";
 import discourseComputed from "discourse-common/utils/decorators";
 import { not } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
@@ -33,7 +35,7 @@ const ColorScheme = EmberObject.extend({
     const newScheme = ColorScheme.create({
       name: this.name,
       can_edit: true,
-      colors: Ember.A()
+      colors: A()
     });
     this.colors.forEach(c => {
       newScheme.colors.pushObject(
@@ -111,7 +113,7 @@ const ColorScheme = EmberObject.extend({
   }
 });
 
-const ColorSchemes = Ember.ArrayProxy.extend({});
+const ColorSchemes = ArrayProxy.extend({});
 
 ColorScheme.reopenClass({
   findAll() {
diff --git a/app/assets/javascripts/admin/models/theme.js.es6 b/app/assets/javascripts/admin/models/theme.js.es6
index 543858c677..e63e9e1cce 100644
--- a/app/assets/javascripts/admin/models/theme.js.es6
+++ b/app/assets/javascripts/admin/models/theme.js.es6
@@ -1,5 +1,5 @@
 import { get } from "@ember/object";
-import { isEmpty } from "@ember/utils";
+import { isBlank, isEmpty } from "@ember/utils";
 import { or, gt } from "@ember/object/computed";
 import RestModel from "discourse/models/rest";
 import discourseComputed from "discourse-common/utils/decorators";
@@ -153,7 +153,7 @@ const Theme = RestModel.extend({
   @discourseComputed("theme_fields.[]")
   editedFields(fields) {
     return fields.filter(
-      field => !Ember.isBlank(field.value) && field.type_id !== SETTINGS_TYPE_ID
+      field => !isBlank(field.value) && field.type_id !== SETTINGS_TYPE_ID
     );
   },
 
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 9d14e3208c..cde52ac72c 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -12,7 +12,8 @@ var define, requirejs;
       jquery: { default: $ },
       "@ember/array": {
         default: Ember.Array,
-        A: Ember.A
+        A: Ember.A,
+        isArray: Ember.isArray
       },
       "@ember/array/proxy": {
         default: Ember.ArrayProxy
@@ -99,10 +100,10 @@ var define, requirejs;
         inject: Ember.inject.service
       },
       "@ember/utils": {
-        isPresent: Ember.isPresent,
         isBlank: Ember.isBlank,
         isEmpty: Ember.isEmpty,
-        isNone: Ember.isNone
+        isNone: Ember.isNone,
+        isPresent: Ember.isPresent
       },
       rsvp: {
         default: Ember.RSVP,
diff --git a/app/assets/javascripts/discourse.js.es6 b/app/assets/javascripts/discourse.js.es6
index 8143ba27fc..10fb7dd407 100644
--- a/app/assets/javascripts/discourse.js.es6
+++ b/app/assets/javascripts/discourse.js.es6
@@ -1,14 +1,14 @@
 /*global Mousetrap:true*/
+import Application from "@ember/application";
+import EmberObject, { computed } from "@ember/object";
 import { buildResolver } from "discourse-common/resolver";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import { computed } from "@ember/object";
 import FocusEvent from "discourse-common/mixins/focus-event";
-import EmberObject from "@ember/object";
 import deprecated from "discourse-common/lib/deprecated";
 
 const _pluginCallbacks = [];
 
-const Discourse = Ember.Application.extend(FocusEvent, {
+const Discourse = Application.extend(FocusEvent, {
   rootElement: "#main",
   _docTitle: document.title,
   RAW_TEMPLATES: {},
diff --git a/app/assets/javascripts/discourse/components/expanding-text-area.js.es6 b/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
index 4c3432f277..ca215cc3f7 100644
--- a/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
+++ b/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
@@ -1,8 +1,9 @@
+import { TextArea } from "@ember/component";
 import { scheduleOnce } from "@ember/runloop";
 import { on, observes } from "discourse-common/utils/decorators";
 import autosize from "discourse/lib/autosize";
 
-export default Ember.TextArea.extend({
+export default TextArea.extend({
   @on("didInsertElement")
   _startWatching() {
     scheduleOnce("afterRender", () => {
diff --git a/app/assets/javascripts/discourse/components/honeypot-input.js.es6 b/app/assets/javascripts/discourse/components/honeypot-input.js.es6
index 8231303da5..9eb256bc12 100644
--- a/app/assets/javascripts/discourse/components/honeypot-input.js.es6
+++ b/app/assets/javascripts/discourse/components/honeypot-input.js.es6
@@ -1,6 +1,7 @@
+import { TextField } from "@ember/component";
 import { on } from "discourse-common/utils/decorators";
 
-export default Ember.TextField.extend({
+export default TextField.extend({
   @on("init")
   _init() {
     // Chrome autocomplete is buggy per:
diff --git a/app/assets/javascripts/discourse/components/number-field.js.es6 b/app/assets/javascripts/discourse/components/number-field.js.es6
index ca2db4d124..6f78cc3707 100644
--- a/app/assets/javascripts/discourse/components/number-field.js.es6
+++ b/app/assets/javascripts/discourse/components/number-field.js.es6
@@ -1,6 +1,7 @@
+import { TextField } from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 
-export default Ember.TextField.extend({
+export default TextField.extend({
   classNameBindings: ["invalid"],
 
   @discourseComputed("number")
diff --git a/app/assets/javascripts/discourse/components/text-field.js.es6 b/app/assets/javascripts/discourse/components/text-field.js.es6
index 1978cd0ab2..23440b291d 100644
--- a/app/assets/javascripts/discourse/components/text-field.js.es6
+++ b/app/assets/javascripts/discourse/components/text-field.js.es6
@@ -1,7 +1,8 @@
+import { TextField } from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import { siteDir, isRTL, isLTR } from "discourse/lib/text-direction";
 
-export default Ember.TextField.extend({
+export default TextField.extend({
   attributeBindings: [
     "autocorrect",
     "autocapitalize",
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 62085e548e..3d93a61393 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -1,3 +1,4 @@
+import { A } from "@ember/array";
 import { isEmpty } from "@ember/utils";
 import { notEmpty, or, not } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
@@ -31,7 +32,7 @@ export default Controller.extend(
     accountChallenge: 0,
     accountHoneypot: 0,
     formSubmitted: false,
-    rejectedEmails: Ember.A([]),
+    rejectedEmails: A(),
     prefilledUsername: null,
     userFields: null,
     isDeveloper: false,
diff --git a/app/assets/javascripts/discourse/helpers/topic-status-icons.js.es6 b/app/assets/javascripts/discourse/helpers/topic-status-icons.js.es6
index 80076d725d..2f2da65a25 100644
--- a/app/assets/javascripts/discourse/helpers/topic-status-icons.js.es6
+++ b/app/assets/javascripts/discourse/helpers/topic-status-icons.js.es6
@@ -1,4 +1,6 @@
-export default Ember.ArrayProxy.extend({
+import ArrayProxy from "@ember/array/proxy";
+
+export default ArrayProxy.extend({
   render(topic, renderIcon) {
     const renderIconIf = (conditionProp, name, key) => {
       if (!topic.get(conditionProp)) {
diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js.es6
index 992029d293..acd6cde60b 100644
--- a/app/assets/javascripts/discourse/lib/computed.js.es6
+++ b/app/assets/javascripts/discourse/lib/computed.js.es6
@@ -1,3 +1,4 @@
+import { computed } from "@ember/object";
 import addonFmt from "ember-addons/fmt";
 
 /**
@@ -10,7 +11,7 @@ import addonFmt from "ember-addons/fmt";
 **/
 
 export function propertyEqual(p1, p2) {
-  return Ember.computed(p1, p2, function() {
+  return computed(p1, p2, function() {
     return this.get(p1) === this.get(p2);
   });
 }
@@ -24,19 +25,19 @@ export function propertyEqual(p1, p2) {
   @return {Function} discourseComputedProperty function
 **/
 export function propertyNotEqual(p1, p2) {
-  return Ember.computed(p1, p2, function() {
+  return computed(p1, p2, function() {
     return this.get(p1) !== this.get(p2);
   });
 }
 
 export function propertyGreaterThan(p1, p2) {
-  return Ember.computed(p1, p2, function() {
+  return computed(p1, p2, function() {
     return this.get(p1) > this.get(p2);
   });
 }
 
 export function propertyLessThan(p1, p2) {
-  return Ember.computed(p1, p2, function() {
+  return computed(p1, p2, function() {
     return this.get(p1) < this.get(p2);
   });
 }
@@ -51,7 +52,7 @@ export function propertyLessThan(p1, p2) {
 **/
 export function i18n(...args) {
   const format = args.pop();
-  return Ember.computed(...args, function() {
+  return computed(...args, function() {
     return I18n.t(addonFmt(format, ...args.map(a => this.get(a))));
   });
 }
@@ -67,7 +68,7 @@ export function i18n(...args) {
 **/
 export function fmt(...args) {
   const format = args.pop();
-  return Ember.computed(...args, function() {
+  return computed(...args, function() {
     return addonFmt(format, ...args.map(a => this.get(a)));
   });
 }
@@ -83,7 +84,7 @@ export function fmt(...args) {
 **/
 export function url(...args) {
   const format = args.pop();
-  return Ember.computed(...args, function() {
+  return computed(...args, function() {
     return Discourse.getURL(addonFmt(format, ...args.map(a => this.get(a))));
   });
 }
@@ -99,7 +100,7 @@ export function url(...args) {
 export function endWith() {
   const args = Array.prototype.slice.call(arguments, 0);
   const substring = args.pop();
-  return Ember.computed(...args, function() {
+  return computed(...args, function() {
     return args
       .map(a => this.get(a))
       .every(s => {
@@ -118,7 +119,7 @@ export function endWith() {
   @param {String} name of site setting
 **/
 export function setting(name) {
-  return Ember.computed(function() {
+  return computed(function() {
     return Discourse.SiteSettings[name];
   });
 }
diff --git a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6 b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
index 449c70ab79..dca23e1a85 100644
--- a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
+++ b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
@@ -1,3 +1,4 @@
+import EmberArray from "@ember/array";
 import EmberObject from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 
@@ -5,7 +6,7 @@ export function Placeholder(viewName) {
   this.viewName = viewName;
 }
 
-export default EmberObject.extend(Ember.Array, {
+export default EmberObject.extend(EmberArray, {
   posts: null,
   _appendingIds: null,
 
diff --git a/app/assets/javascripts/discourse/mapping-router.js.es6 b/app/assets/javascripts/discourse/mapping-router.js.es6
index c50eb9112c..38b8eec72e 100644
--- a/app/assets/javascripts/discourse/mapping-router.js.es6
+++ b/app/assets/javascripts/discourse/mapping-router.js.es6
@@ -1,3 +1,4 @@
+import EmberRouter from "@ember/routing/router";
 import { defaultHomepage } from "discourse/lib/utilities";
 import { rewritePath } from "discourse/lib/url";
 import ENV from "discourse-common/config/environment";
@@ -5,7 +6,7 @@ import Site from "discourse/models/site";
 
 const rootURL = Discourse.BaseUri;
 
-const BareRouter = Ember.Router.extend({
+const BareRouter = EmberRouter.extend({
   rootURL,
   location: ENV.environment === "test" ? "none" : "discourse-location",
 
diff --git a/app/assets/javascripts/discourse/mixins/upload.js.es6 b/app/assets/javascripts/discourse/mixins/upload.js.es6
index 820e2e912a..f7d568cb96 100644
--- a/app/assets/javascripts/discourse/mixins/upload.js.es6
+++ b/app/assets/javascripts/discourse/mixins/upload.js.es6
@@ -1,3 +1,4 @@
+import { warn } from "@ember/debug";
 import {
   displayErrorForUpload,
   validateUploadedFiles
@@ -11,7 +12,7 @@ export default Mixin.create({
   uploadProgress: 0,
 
   uploadDone() {
-    Ember.warn("You should implement `uploadDone`", {
+    warn("You should implement `uploadDone`", {
       id: "discourse.upload.missing-upload-done"
     });
   },
diff --git a/app/assets/javascripts/discourse/models/category-list.js.es6 b/app/assets/javascripts/discourse/models/category-list.js.es6
index b8437f706d..ce655978b3 100644
--- a/app/assets/javascripts/discourse/models/category-list.js.es6
+++ b/app/assets/javascripts/discourse/models/category-list.js.es6
@@ -1,10 +1,11 @@
+import ArrayProxy from "@ember/array/proxy";
 import PreloadStore from "preload-store";
 import { ajax } from "discourse/lib/ajax";
 import Topic from "discourse/models/topic";
 import Category from "discourse/models/category";
 import Site from "discourse/models/site";
 
-const CategoryList = Ember.ArrayProxy.extend({
+const CategoryList = ArrayProxy.extend({
   init() {
     this.set("content", []);
     this._super(...arguments);
diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6
index a140dad504..40b38e5107 100644
--- a/app/assets/javascripts/discourse/models/rest.js.es6
+++ b/app/assets/javascripts/discourse/models/rest.js.es6
@@ -1,3 +1,4 @@
+import { warn } from "@ember/debug";
 import { equal } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { Promise } from "rsvp";
@@ -24,7 +25,7 @@ const RestModel = EmberObject.extend({
         const payload = this.__munge(res.payload || res.responseJson);
 
         if (payload.success === "OK") {
-          Ember.warn("An update call should return the updated attributes", {
+          warn("An update call should return the updated attributes", {
             id: "discourse.rest-model.update-attributes"
           });
           res = props;
diff --git a/app/assets/javascripts/discourse/models/result-set.js.es6 b/app/assets/javascripts/discourse/models/result-set.js.es6
index 56e2c164b5..5ed3dd90cd 100644
--- a/app/assets/javascripts/discourse/models/result-set.js.es6
+++ b/app/assets/javascripts/discourse/models/result-set.js.es6
@@ -1,7 +1,8 @@
+import ArrayProxy from "@ember/array/proxy";
 import discourseComputed from "discourse-common/utils/decorators";
 import { Promise } from "rsvp";
 
-export default Ember.ArrayProxy.extend({
+export default ArrayProxy.extend({
   loading: false,
   loadingMore: false,
   totalRows: 0,
diff --git a/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6 b/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
index 7472cc8e67..07529f6ee7 100644
--- a/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
@@ -1,3 +1,4 @@
+import { A } from "@ember/array";
 import discourseComputed from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
 import { url } from "discourse/lib/computed";
@@ -70,7 +71,7 @@ export default RestModel.extend({
           this.set("noContentHelp", result.no_results_help);
         }
         if (result && result.drafts) {
-          const copy = Ember.A();
+          const copy = A();
           result.drafts.forEach(draft => {
             let draftData = JSON.parse(draft.data);
             draft.post_number = draftData.postId || null;
diff --git a/app/assets/javascripts/discourse/models/user-stream.js.es6 b/app/assets/javascripts/discourse/models/user-stream.js.es6
index 81af6b30f8..7bca68c8b3 100644
--- a/app/assets/javascripts/discourse/models/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/user-stream.js.es6
@@ -1,3 +1,4 @@
+import { A } from "@ember/array";
 import { ajax } from "discourse/lib/ajax";
 import { url } from "discourse/lib/computed";
 import RestModel from "discourse/models/rest";
@@ -104,7 +105,7 @@ export default RestModel.extend({
           this.set("noContentHelp", result.no_results_help);
         }
         if (result && result.user_actions) {
-          const copy = Ember.A();
+          const copy = A();
           result.user_actions.forEach(action => {
             action.title = emojiUnescape(
               Handlebars.Utils.escapeExpression(action.title)
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 84c2765f6f..b15c868d80 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -1,3 +1,4 @@
+import { A } from "@ember/array";
 import { isEmpty } from "@ember/utils";
 import { gt, equal, or } from "@ember/object/computed";
 import EmberObject, { computed } from "@ember/object";
@@ -884,7 +885,7 @@ User.reopenClass(Singleton, {
       responses.set("count", responses.get("count") + stat.get("count"));
     });
 
-    const result = Ember.A();
+    const result = A();
     result.pushObjects(stats.rejectBy("isResponse"));
 
     let insertAt = 0;
diff --git a/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6 b/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
index 312e56eee3..c48b697087 100644
--- a/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
@@ -1,3 +1,4 @@
+import Application from "@ember/application";
 import { mapRoutes } from "discourse/mapping-router";
 
 export default {
@@ -10,8 +11,9 @@ export default {
 
     // HACK to fix: https://github.com/emberjs/ember.js/issues/10310
     const originalBuildInstance =
-      originalBuildInstance || Ember.Application.prototype.buildInstance;
-    Ember.Application.prototype.buildInstance = function() {
+      originalBuildInstance || Application.prototype.buildInstance;
+
+    Application.prototype.buildInstance = function() {
       this.buildRegistry();
       return originalBuildInstance.apply(this);
     };
diff --git a/app/assets/javascripts/discourse/services/app-events.js.es6 b/app/assets/javascripts/discourse/services/app-events.js.es6
index fa73e9d463..8a3e770c75 100644
--- a/app/assets/javascripts/discourse/services/app-events.js.es6
+++ b/app/assets/javascripts/discourse/services/app-events.js.es6
@@ -1,7 +1,8 @@
 import deprecated from "discourse-common/lib/deprecated";
+import Evented from "@ember/object/evented";
 import Service from "@ember/service";
 
-export default Service.extend(Ember.Evented, {
+export default Service.extend(Evented, {
   _events: {},
 
   on() {
diff --git a/app/assets/javascripts/select-kit/components/multi-select.js.es6 b/app/assets/javascripts/select-kit/components/multi-select.js.es6
index a37eff583f..51ce57dc94 100644
--- a/app/assets/javascripts/select-kit/components/multi-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select.js.es6
@@ -1,8 +1,8 @@
 import deprecated from "discourse-common/lib/deprecated";
 import SelectKitComponent from "select-kit/components/select-kit";
 import { computed } from "@ember/object";
-import { makeArray } from "discourse-common/lib/helpers";
 import { isPresent } from "@ember/utils";
+import { makeArray } from "discourse-common/lib/helpers";
 
 export default SelectKitComponent.extend({
   pluginApiIdentifiers: ["multi-select"],
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index 30a37cf450..9c9d542431 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -1,4 +1,4 @@
-import { computed, default as EmberObject } from "@ember/object";
+import { computed, guidFor, default as EmberObject } from "@ember/object";
 import Component from "@ember/component";
 import deprecated from "discourse-common/lib/deprecated";
 import { makeArray } from "discourse-common/lib/helpers";
@@ -76,7 +76,7 @@ export default Component.extend(
       this.set(
         "selectKit",
         EmberObject.create({
-          uniqueID: Ember.guidFor(this),
+          uniqueID: guidFor(this),
           valueProperty: this.valueProperty,
           nameProperty: this.nameProperty,
           options: EmberObject.create(),
diff --git a/app/assets/javascripts/wizard/router.js.es6 b/app/assets/javascripts/wizard/router.js.es6
index 05921b0a5d..822d3d7aba 100644
--- a/app/assets/javascripts/wizard/router.js.es6
+++ b/app/assets/javascripts/wizard/router.js.es6
@@ -1,7 +1,8 @@
+import EmberRouter from "@ember/routing/router";
 import getUrl from "discourse-common/lib/get-url";
 import ENV from "discourse-common/config/environment";
 
-const Router = Ember.Router.extend({
+const Router = EmberRouter.extend({
   rootURL: getUrl("/wizard/"),
   location: ENV.environment === "test" ? "none" : "history"
 });
diff --git a/app/assets/javascripts/wizard/wizard.js.es6 b/app/assets/javascripts/wizard/wizard.js.es6
index 6934febba2..db33756586 100644
--- a/app/assets/javascripts/wizard/wizard.js.es6
+++ b/app/assets/javascripts/wizard/wizard.js.es6
@@ -1,6 +1,7 @@
+import Application from "@ember/application";
 import { buildResolver } from "discourse-common/resolver";
 
-export default Ember.Application.extend({
+export default Application.extend({
   rootElement: "#wizard-main",
   Resolver: buildResolver("wizard"),
 
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
index 4b562eaecc..374aacad93 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
@@ -1,13 +1,15 @@
+import EmberObject from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
+import { notEmpty } from "@ember/object/computed";
+import { Promise } from "rsvp";
 /* global Pikaday:true */
 import { propertyNotEqual } from "discourse/lib/computed";
 import loadScript from "discourse/lib/load-script";
-import computed from "discourse-common/utils/decorators";
+import computed, { observes } from "discourse-common/utils/decorators";
 import { cookAsync } from "discourse/lib/text";
 import discourseDebounce from "discourse/lib/debounce";
-import { observes } from "discourse-common/utils/decorators";
 
 export default Component.extend({
   timeFormat: "HH:mm:ss",
@@ -24,9 +26,9 @@ export default Component.extend({
   isValid: true,
   timezone: null,
   fromSelected: null,
-  fromFilled: Ember.computed.notEmpty("date"),
+  fromFilled: notEmpty("date"),
   toSelected: null,
-  toFilled: Ember.computed.notEmpty("toDate"),
+  toFilled: notEmpty("toDate"),
 
   init() {
     this._super(...arguments);
@@ -113,7 +115,7 @@ export default Component.extend({
       format = "LL";
     }
 
-    return Ember.Object.create({
+    return EmberObject.create({
       date: dateTime.format(this.dateFormat),
       time,
       dateTime,
@@ -146,7 +148,7 @@ export default Component.extend({
       format = "LL";
     }
 
-    return Ember.Object.create({
+    return EmberObject.create({
       date: dateTime.format(this.dateFormat),
       time,
       dateTime,
@@ -157,7 +159,7 @@ export default Component.extend({
 
   @computed("recurring", "timezones", "timezone", "format")
   options(recurring, timezones, timezone, format) {
-    return Ember.Object.create({
+    return EmberObject.create({
       recurring,
       timezones,
       timezone,
@@ -171,7 +173,7 @@ export default Component.extend({
     "options.{recurring,timezones,timezone,format}"
   )
   computedConfig(fromConfig, toConfig, options) {
-    return Ember.Object.create({
+    return EmberObject.create({
       from: fromConfig,
       to: toConfig,
       options
@@ -372,7 +374,7 @@ export default Component.extend({
   },
 
   _setupPicker() {
-    return new Ember.RSVP.Promise(resolve => {
+    return new Promise(resolve => {
       loadScript("/javascripts/pikaday.js").then(() => {
         const options = {
           field: this.$(`.fake-input`)[0],
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index 220c8dc07a..175f3a9985 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -2,6 +2,8 @@ import { once } from "@ember/runloop";
 import { debounce } from "@ember/runloop";
 import { cancel } from "@ember/runloop";
 import Component from "@ember/component";
+import { equal, gt } from "@ember/object/computed";
+import { Promise } from "rsvp";
 import { ajax } from "discourse/lib/ajax";
 import computed, { observes, on } from "discourse-common/utils/decorators";
 
@@ -22,6 +24,9 @@ export default Component.extend({
   presenceUsers: null,
   channel: null,
 
+  isReply: equal("action", "reply"),
+  shouldDisplay: gt("users.length", 0),
+
   @on("didInsertElement")
   composerOpened() {
     this._lastPublish = new Date();
@@ -113,7 +118,7 @@ export default Component.extend({
 
     // Don't publish presence if disabled
     if (this.currentUser.hide_profile_and_presence) {
-      return Ember.RSVP.Promise.resolve();
+      return Promise.resolve();
     }
 
     return ajax("/presence/publish", { type: "POST", data });
@@ -122,8 +127,5 @@ export default Component.extend({
   @computed("presenceUsers", "currentUser.id")
   users(users, currentUserId) {
     return (users || []).filter(user => user.id !== currentUserId);
-  },
-
-  isReply: Ember.computed.equal("action", "reply"),
-  shouldDisplay: Ember.computed.gt("users.length", 0)
+  }
 });
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
index c022cd50ed..c12573803d 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
@@ -1,6 +1,7 @@
 import { debounce } from "@ember/runloop";
 import { cancel } from "@ember/runloop";
 import Component from "@ember/component";
+import { gt } from "@ember/object/computed";
 import computed, { on } from "discourse-common/utils/decorators";
 import {
   keepAliveDuration,
@@ -13,6 +14,8 @@ export default Component.extend({
   topicId: null,
   presenceUsers: null,
 
+  shouldDisplay: gt("users.length", 0),
+
   clear() {
     if (!this.isDestroyed) this.set("presenceUsers", []);
   },
@@ -53,7 +56,5 @@ export default Component.extend({
       user =>
         user.id !== currentUser.id && !ignoredUsers.includes(user.username)
     );
-  },
-
-  shouldDisplay: Ember.computed.gt("users.length", 0)
+  }
 });
diff --git a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
index 77d8513cee..13b209dd50 100644
--- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
@@ -1,3 +1,4 @@
+import EmberObject from "@ember/object";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import { observes } from "discourse-common/utils/decorators";
 import { getRegister } from "discourse-common/lib/get-owner";
@@ -44,7 +45,7 @@ function initializePolls(api) {
           if (existing) {
             this._polls[p.name].setProperties(p);
           } else {
-            this._polls[p.name] = Ember.Object.create(p);
+            this._polls[p.name] = EmberObject.create(p);
           }
         });
         this.set("pollsObject", this._polls);
@@ -78,8 +79,8 @@ function initializePolls(api) {
       if (quotedId) {
         const quotedPost = post.quoted[quotedId];
         if (quotedPost) {
-          post = Ember.Object.create(quotedPost);
-          poll = Ember.Object.create(
+          post = EmberObject.create(quotedPost);
+          poll = EmberObject.create(
             quotedPost.polls.find(p => p.name === pollName)
           );
           vote = quotedPost.polls_votes || {};
diff --git a/plugins/poll/test/javascripts/widgets/discourse-poll-standard-results-test.js.es6 b/plugins/poll/test/javascripts/widgets/discourse-poll-standard-results-test.js.es6
index 33ee000b0a..47705e2cb5 100644
--- a/plugins/poll/test/javascripts/widgets/discourse-poll-standard-results-test.js.es6
+++ b/plugins/poll/test/javascripts/widgets/discourse-poll-standard-results-test.js.es6
@@ -1,4 +1,6 @@
+import EmberObject from "@ember/object";
 import { moduleForWidget, widgetTest } from "helpers/widget-test";
+
 moduleForWidget("discourse-poll-standard-results");
 
 const template = `{{mount-widget
@@ -11,7 +13,7 @@ widgetTest("options in descending order", {
   beforeEach() {
     this.set(
       "poll",
-      Ember.Object.create({
+      EmberObject.create({
         options: [{ votes: 5 }, { votes: 4 }],
         voters: 9
       })
@@ -30,7 +32,7 @@ widgetTest("options in ascending order", {
   beforeEach() {
     this.set(
       "poll",
-      Ember.Object.create({
+      EmberObject.create({
         options: [{ votes: 4 }, { votes: 5 }],
         voters: 9
       })
@@ -50,7 +52,7 @@ widgetTest("multiple options in descending order", {
     this.set("isMultiple", true);
     this.set(
       "poll",
-      Ember.Object.create({
+      EmberObject.create({
         type: "multiple",
         options: [
           { votes: 5, html: "a" },
diff --git a/test/javascripts/models/post-stream-test.js.es6 b/test/javascripts/models/post-stream-test.js.es6
index f7a587333f..dbcc4b5ca8 100644
--- a/test/javascripts/models/post-stream-test.js.es6
+++ b/test/javascripts/models/post-stream-test.js.es6
@@ -1,3 +1,4 @@
+import ArrayProxy from "@ember/array/proxy";
 import Post from "discourse/models/post";
 import createStore from "helpers/create-store";
 import User from "discourse/models/user";
@@ -863,7 +864,7 @@ QUnit.test("postsWithPlaceholders", async assert => {
   const postsWithPlaceholders = postStream.get("postsWithPlaceholders");
   const store = postStream.store;
 
-  const testProxy = Ember.ArrayProxy.create({ content: postsWithPlaceholders });
+  const testProxy = ArrayProxy.create({ content: postsWithPlaceholders });
 
   const p1 = store.createRecord("post", { id: 1, post_number: 1 });
   const p2 = store.createRecord("post", { id: 2, post_number: 2 });

From e9b6b0194c822bed5d21692798e0a12c6f49113c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 7 Mar 2020 12:58:48 +0100
Subject: [PATCH 0120/1830] DEV: enforce ember-template-lint:
 no-unnecessary-concat (#9133)

---
 .template-lintrc.js                                    |  3 ++-
 .../templates/components/admin-report-counters.hbs     |  2 +-
 .../admin/templates/components/admin-report-counts.hbs |  2 +-
 .../templates/components/admin-report-inline-table.hbs |  2 +-
 .../components/admin-report-storage-stats.hbs          |  2 +-
 .../admin/templates/components/admin-report-table.hbs  |  2 +-
 .../admin/templates/components/admin-report.hbs        | 10 +++++-----
 .../admin/templates/components/admin-theme-editor.hbs  |  2 +-
 .../templates/components/admin-web-hook-event.hbs      |  2 +-
 .../admin/templates/components/flag-user.hbs           |  2 +-
 .../admin/templates/components/install-theme-item.hbs  |  2 +-
 .../admin/templates/customize-themes-edit.hbs          |  2 +-
 .../admin/templates/customize-themes-show.hbs          | 10 +++++-----
 .../javascripts/admin/templates/dashboard_general.hbs  |  2 +-
 .../admin/templates/dashboard_moderation.hbs           |  2 +-
 .../javascripts/admin/templates/email-received.hbs     |  2 +-
 app/assets/javascripts/admin/templates/email-sent.hbs  |  2 +-
 .../javascripts/admin/templates/email-skipped.hbs      |  2 +-
 app/assets/javascripts/admin/templates/emojis.hbs      |  2 +-
 .../admin/templates/logs/staff-action-logs.hbs         |  2 +-
 .../admin/templates/modal/admin-install-theme.hbs      |  4 ++--
 .../admin/templates/modal/admin-theme-item.hbs         |  2 +-
 app/assets/javascripts/admin/templates/permalinks.hbs  |  8 ++++----
 .../javascripts/admin/templates/search-logs-term.hbs   |  4 ++--
 .../javascripts/admin/templates/site-settings.hbs      |  2 +-
 app/assets/javascripts/admin/templates/user-badges.hbs |  2 +-
 app/assets/javascripts/admin/templates/user-index.hbs  |  2 +-
 .../javascripts/admin/templates/users-list-show.hbs    |  2 +-
 .../javascripts/admin/templates/watched-words.hbs      |  2 +-
 .../javascripts/discourse/templates/badges/show.hbs    |  2 +-
 .../templates/components/about-page-users.hbs          |  6 +++---
 .../discourse/templates/components/avatar-uploader.hbs |  2 +-
 .../discourse/templates/components/backup-uploader.hbs |  2 +-
 .../templates/components/categories-boxes-topic.hbs    |  2 +-
 .../templates/components/categories-topic-list.hbs     |  2 +-
 .../discourse/templates/components/category-unread.hbs |  4 ++--
 .../templates/components/discourse-banner.hbs          |  2 +-
 .../templates/components/edit-category-settings.hbs    |  4 ++--
 .../templates/components/edit-category-tab.hbs         |  2 +-
 .../discourse/templates/components/featured-topic.hbs  |  8 ++++----
 .../discourse/templates/components/google-search.hbs   |  4 ++--
 .../templates/components/group-card-contents.hbs       |  8 ++++----
 .../templates/components/group-flair-inputs.hbs        |  2 +-
 .../discourse/templates/components/group-post.hbs      |  4 ++--
 .../discourse/templates/components/images-uploader.hbs |  2 +-
 .../templates/components/latest-topic-list-item.hbs    |  2 +-
 .../templates/components/mobile-category-topic.hbs     |  2 +-
 .../discourse/templates/components/nav-item.hbs        |  2 +-
 .../discourse/templates/components/share-source.hbs    |  2 +-
 .../templates/components/topic-post-badges.hbs         |  6 +++---
 .../discourse/templates/components/topic-progress.hbs  |  4 ++--
 .../templates/components/topic-timer-info.hbs          |  4 ++--
 .../discourse/templates/components/user-badge.hbs      |  2 +-
 .../templates/components/user-card-contents.hbs        |  4 ++--
 .../templates/components/user-fields/confirm.hbs       |  2 +-
 .../templates/components/user-fields/dropdown.hbs      |  2 +-
 .../templates/components/user-fields/text.hbs          |  2 +-
 .../discourse/templates/components/user-info.hbs       |  4 ++--
 .../templates/components/user-stream-item.hbs          |  2 +-
 .../templates/components/user-summary-topic.hbs        |  2 +-
 .../javascripts/discourse/templates/composer.hbs       | 10 +++++-----
 .../discourse/templates/full-page-search.hbs           |  4 ++--
 .../templates/mobile/components/basic-topic-list.hbs   |  6 +++---
 .../templates/mobile/components/categories-only.hbs    |  6 +++---
 .../javascripts/discourse/templates/modal/history.hbs  |  4 ++--
 .../discourse/templates/modal/insert-hyperlink.hbs     |  4 ++--
 .../discourse/templates/modal/reorder-categories.hbs   |  2 +-
 .../javascripts/discourse/templates/password-reset.hbs |  2 +-
 .../discourse/templates/preferences/account.hbs        |  2 +-
 .../discourse/templates/preferences/categories.hbs     |  6 +++---
 app/assets/javascripts/discourse/templates/topic.hbs   | 10 +++++-----
 .../discourse/templates/user-invited-show.hbs          |  4 ++--
 app/assets/javascripts/discourse/templates/user.hbs    |  4 ++--
 .../wizard/templates/components/popular-themes.hbs     |  2 +-
 74 files changed, 125 insertions(+), 124 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 3a85b721b0..f36c6313d2 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -7,6 +7,7 @@ module.exports = {
     "table-groups": true,
     "style-concatenation": true,
     "no-invalid-interactive": true,
-    "link-rel-noopener": true
+    "link-rel-noopener": true,
+    "no-unnecessary-concat": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs b/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs
index 9f3882a3b4..05d456fdeb 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs
@@ -2,7 +2,7 @@
   {{#if model.icon}}
     {{d-icon model.icon}}
   {{/if}}
-  <a href="{{model.reportUrl}}">{{model.title}}</a>
+  <a href={{model.reportUrl}}>{{model.title}}</a>
 </div>
 
 <div class="cell value today-count">{{number model.todayCount}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
index 4b4a406c59..a1e64441f9 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
@@ -2,7 +2,7 @@
   {{#if report.icon}}
     {{d-icon report.icon}}
   {{/if}}
-  <a href="{{report.reportUrl}}">{{report.title}}</a>
+  <a href={{report.reportUrl}}>{{report.title}}</a>
 </td>
 
 <td class="value">{{number report.todayCount}}</td>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
index 70138f829d..76c8eacb0b 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
@@ -1,6 +1,6 @@
 <div class="table-container">
   {{#each model.data as |data|}}
-    <a class="table-cell user-{{data.key}}" href="{{data.url}}">
+    <a class="table-cell user-{{data.key}}" href={{data.url}}>
       <span class="label">
         {{#if data.icon}}
           {{d-icon data.icon}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
index 054b91d707..fbb9f80a64 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
@@ -1,7 +1,7 @@
 {{#if showBackupStats}}
   <div class="backups">
     <h3 class="storage-stats-title">
-      <a href="{{get-url '/admin/backups'}}">{{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}</a>
+      <a href={{get-url '/admin/backups'}}>{{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}</a>
     </h3>
     <p>
       {{#if backupStats.free_bytes}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
index 6c7838e872..f42189eb9a 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
@@ -24,7 +24,7 @@
 
     {{#if showTotalForSample}}
       <tr class="total-row">
-        <td colspan="{{totalsForSample.length}}">
+        <td colspan={{totalsForSample.length}}>
           {{i18n 'admin.dashboard.reports.totals_for_sample'}}
         </td>
       </tr>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index cb0f333bb0..0c7009cc82 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -18,17 +18,17 @@
 
           {{#unless showNotFoundError}}
           <li class="item report">
-            <a href="{{model.reportUrl}}" class="report-url">
+            <a href={{model.reportUrl}} class="report-url">
               {{model.title}}
             </a>
 
             {{#if model.description}}
               {{#if model.description_link}}
-                <a target="_blank" rel="noopener" href="{{model.description_link}}" class="info" data-tooltip="{{model.description}}">
+                <a target="_blank" rel="noopener" href={{model.description_link}} class="info" data-tooltip={{model.description}}>
                   {{d-icon "question-circle"}}
                 </a>
               {{else}}
-                <span class="info" data-tooltip="{{model.description}}">
+                <span class="info" data-tooltip={{model.description}}>
                   {{d-icon "question-circle"}}
                 </span>
               {{/if}}
@@ -40,7 +40,7 @@
 
       {{#if shouldDisplayTrend}}
         <div class="trend {{model.trend}}">
-          <span class="value" title="{{model.trendTitle}}">
+          <span class="value" title={{model.trendTitle}}>
             {{#if model.average}}
               {{number model.currentAverage}}{{#if model.percent}}%{{/if}}
             {{else}}
@@ -77,7 +77,7 @@
             <div class="alert alert-info report-alert no-data">
               {{d-icon "chart-pie"}}
               {{#if model.reportUrl}}
-                <a href="{{model.reportUrl}}" class="report-url">
+                <a href={{model.reportUrl}} class="report-url">
                   <span>
                     {{#if model.title}}
                       {{model.title}} —
diff --git a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
index bf9d2fd3cb..ad669f4d3d 100644
--- a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
@@ -25,7 +25,7 @@
             <a {{action "toggleShowAdvanced"}}
                 class='no-text'
                 href
-                title="{{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}"
+                title={{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}
             >
                 {{d-icon (if showAdvanced "angle-double-left" "angle-double-right")}}
             </a>
diff --git a/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs b/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
index ce952f3ec7..11977f1398 100644
--- a/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
@@ -1,5 +1,5 @@
 <div class="col first status">
-  <span class="{{statusColorClasses}}">{{model.status}}</span>
+  <span class={{statusColorClasses}}>{{model.status}}</span>
 </div>
 <div class="col event-id">{{model.id}}</div>
 <div class="col timestamp">{{createdAt}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/flag-user.hbs b/app/assets/javascripts/admin/templates/components/flag-user.hbs
index 26087789e5..a6a4ce0f95 100644
--- a/app/assets/javascripts/admin/templates/components/flag-user.hbs
+++ b/app/assets/javascripts/admin/templates/components/flag-user.hbs
@@ -7,7 +7,7 @@
       {{#link-to 'adminUser' user.id user.username class="flag-user-username"}}
         {{user.username}}
       {{/link-to}}
-      <div class='flag-user-date' title='{{raw-date date}}'>
+      <div class='flag-user-date' title={{raw-date date}}>
         {{format-age date}}
       </div>
     </div>
diff --git a/app/assets/javascripts/admin/templates/components/install-theme-item.hbs b/app/assets/javascripts/admin/templates/components/install-theme-item.hbs
index ed4ddd242f..2697ffe8b9 100644
--- a/app/assets/javascripts/admin/templates/components/install-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/install-theme-item.hbs
@@ -1,5 +1,5 @@
 {{radio-button name="install-items" id=value value=value selection=selection}}
-<label class="radio" for="{{value}}">
+<label class="radio" for={{value}}>
   {{#if showIcon}}
     {{d-icon 'plus'}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
index 5fdaa76885..5f6d29e953 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
@@ -15,7 +15,7 @@
     <div class='admin-footer'>
       <div class='status-actions'>
         {{#unless model.changed}}
-          <a class='preview-link' href={{previewUrl}} rel="noopener" target='_blank' title="{{i18n 'admin.customize.explain_preview'}}">
+          <a class='preview-link' href={{previewUrl}} rel="noopener" target='_blank' title={{i18n 'admin.customize.explain_preview'}}>
             {{i18n 'admin.customize.preview'}}
           </a>
         {{/unless}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 2687c6b692..9fb7fcb4cf 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -63,16 +63,16 @@
 
     {{#if model.remote_theme.remote_url}}
       {{#if sourceIsHttp}}
-        <a class="remote-url" href="{{model.remote_theme.remote_url}}">{{i18n "admin.customize.theme.source_url"}}{{d-icon "link"}}</a>
+        <a class="remote-url" href={{model.remote_theme.remote_url}}>{{i18n "admin.customize.theme.source_url"}}{{d-icon "link"}}</a>
       {{else}}
         <div class="remote-url"><code>{{model.remote_theme.remote_url}}</code></div>
       {{/if}}
     {{/if}}
     {{#if model.remote_theme.about_url}}
-      <a class="url about-url" href="{{model.remote_theme.about_url}}">{{i18n "admin.customize.theme.about_theme"}}{{d-icon "link"}}</a>
+      <a class="url about-url" href={{model.remote_theme.about_url}}>{{i18n "admin.customize.theme.about_theme"}}{{d-icon "link"}}</a>
     {{/if}}
     {{#if model.remote_theme.license_url}}
-      <a class="url license-url" href="{{model.remote_theme.license_url}}">{{i18n "admin.customize.theme.license"}}{{d-icon "link"}}</a>
+      <a class="url license-url" href={{model.remote_theme.license_url}}>{{i18n "admin.customize.theme.license"}}{{d-icon "link"}}</a>
     {{/if}}
 
     {{#if model.description}}
@@ -109,7 +109,7 @@
             {{#if model.remote_theme.commits_behind}}
               {{i18n 'admin.customize.theme.commits_behind' count=model.remote_theme.commits_behind}}
               {{#if model.remote_theme.github_diff_link}}
-                <a href="{{model.remote_theme.github_diff_link}}">
+                <a href={{model.remote_theme.github_diff_link}}>
                   {{i18n 'admin.customize.theme.compare_commits'}}
                 </a>
               {{/if}}
@@ -241,7 +241,7 @@
     </div>
   {{/if}}
 
-  <a href='{{previewUrl}}' title="{{i18n 'admin.customize.explain_preview'}}" rel="noopener" target='_blank' class='btn btn-default'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
+  <a href={{previewUrl}} title={{i18n 'admin.customize.explain_preview'}} rel="noopener" target='_blank' class='btn btn-default'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
   <a class="btn btn-default export" rel="noopener" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
 
   {{d-button action=(action "switchType") label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}}
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index af0bb36ae9..19f892ab0f 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -5,7 +5,7 @@
     <div class="period-section">
       <div class="section-title">
         <h2>
-          <a href="{{get-url '/admin/dashboard/reports'}}">
+          <a href={{get-url '/admin/dashboard/reports'}}>
             {{i18n "admin.dashboard.community_health"}}
           </a>
         </h2>
diff --git a/app/assets/javascripts/admin/templates/dashboard_moderation.hbs b/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
index c6091447ff..019ffb5990 100644
--- a/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
@@ -4,7 +4,7 @@
   <div class="moderators-activity section">
     <div class="section-title">
       <h2>
-        <a href="{{get-url '/admin/reports/moderators_activity'}}">
+        <a href={{get-url '/admin/reports/moderators_activity'}}>
           {{i18n "admin.dashboard.moderators_activity"}}
         </a>
       </h2>
diff --git a/app/assets/javascripts/admin/templates/email-received.hbs b/app/assets/javascripts/admin/templates/email-received.hbs
index e711d5a0ba..5fc983557e 100644
--- a/app/assets/javascripts/admin/templates/email-received.hbs
+++ b/app/assets/javascripts/admin/templates/email-received.hbs
@@ -42,7 +42,7 @@
           </td>
           <td>
             {{#if email.post_url}}
-              <a href="{{email.post_url}}">{{email.subject}}</a>
+              <a href={{email.post_url}}>{{email.subject}}</a>
             {{else}}
               {{email.subject}}
             {{/if}}
diff --git a/app/assets/javascripts/admin/templates/email-sent.hbs b/app/assets/javascripts/admin/templates/email-sent.hbs
index 5c2bf4c49b..c1ad376b6c 100644
--- a/app/assets/javascripts/admin/templates/email-sent.hbs
+++ b/app/assets/javascripts/admin/templates/email-sent.hbs
@@ -36,7 +36,7 @@
           <td>{{l.email_type}}</td>
           <td class='post-link'>
             {{#if l.post_url}}
-              <a href="{{l.post_url}}">{{l.post_description}}</a>
+              <a href={{l.post_url}}>{{l.post_description}}</a>
               <span class='reply-key'>{{l.reply_key}}</span>
             {{else}}
               <span class='reply-key'>{{l.reply_key}}</span>
diff --git a/app/assets/javascripts/admin/templates/email-skipped.hbs b/app/assets/javascripts/admin/templates/email-skipped.hbs
index f2463f3daf..76ddb1197e 100644
--- a/app/assets/javascripts/admin/templates/email-skipped.hbs
+++ b/app/assets/javascripts/admin/templates/email-skipped.hbs
@@ -33,7 +33,7 @@
           <td>{{l.email_type}}</td>
           <td>
             {{#if l.post_url}}
-              <a href="{{l.post_url}}">{{l.skipped_reason}}</a>
+              <a href={{l.post_url}}>{{l.skipped_reason}}</a>
             {{else}}
               {{l.skipped_reason}}
             {{/if}}
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index 6281b15c05..d08f2ed547 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -18,7 +18,7 @@
         <tbody>
           {{#each sortedEmojis as |e|}}
             <tr>
-              <th><img class="emoji emoji-custom" src="{{unbound e.url}}" title="{{unbound e.name}}"></th>
+              <th><img class="emoji emoji-custom" src={{unbound e.url}} title={{unbound e.name}}></th>
               <th>:{{e.name}}:</th>
               <th>
                 {{d-button
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index 799eda905b..02c4160b6a 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -65,7 +65,7 @@
                     {{#link-to 'adminUser' item.acting_user}}{{avatar item.acting_user imageSize="tiny"}}{{/link-to}}
                     <a href {{action "filterByStaffUser" item.acting_user}}>{{item.acting_user.username}}</a>
                   {{else}}
-                    <span class="deleted-user" title="{{i18n 'admin.user.deleted'}}">
+                    <span class="deleted-user" title={{i18n 'admin.user.deleted'}}>
                       {{d-icon "far-trash-alt"}}
                     </span>
                   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
index eec9151f90..aab0b17d71 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
@@ -11,7 +11,7 @@
         {{#each themes as |theme|}}
           <div class="popular-theme-item">
             <div class="popular-theme-name">
-              <a href="{{theme.meta_url}}" rel="noopener" target="_blank">
+              <a href={{theme.meta_url}} rel="noopener" target="_blank">
                 {{#if theme.component}}
                   {{d-icon 'puzzle-piece' title='admin.customize.theme.component'}}
                 {{/if}}
@@ -33,7 +33,7 @@
                   action=(action "installThemeFromList" theme.value)}}
 
                 {{#if theme.preview}}
-                  <a href="{{theme.preview}}" rel="noopener" target="_blank">{{d-icon "desktop"}} {{I18n "admin.customize.theme.preview"}}</a>
+                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{I18n "admin.customize.theme.preview"}}</a>
                 {{/if}}
               {{/if}}
             </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
index 27e5cd5ec5..7a5ddc1ea7 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
@@ -2,7 +2,7 @@
   <div class="popular-theme-name">
     {{theme.name}}
     {{#if theme.preview}}
-      <a href="{{theme.preview}}" title="Preview" rel="noopener" target="_blank">{{d-icon "far-eye"}}</a>
+      <a href={{theme.preview}} title="Preview" rel="noopener" target="_blank">{{d-icon "far-eye"}}</a>
     {{/if}}
   </div>
   <div class="popular-theme-buttons">
diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs
index b86950bc2a..ac933f09c3 100644
--- a/app/assets/javascripts/admin/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/templates/permalinks.hbs
@@ -27,22 +27,22 @@
             <td class="col first url">{{pl.url}}</td>
             <td class="col topic">
               {{#if pl.topic_id}}
-                <a href='{{unbound pl.topic_url}}'>{{pl.topic_title}}</a>
+                <a href={{unbound pl.topic_url}}>{{pl.topic_title}}</a>
               {{/if}}
             </td>
             <td class="col post">
               {{#if pl.post_id}}
-                <a href='{{unbound pl.post_url}}'>#{{pl.post_number}} {{pl.post_topic_title}}</a>
+                <a href={{unbound pl.post_url}}>#{{pl.post_number}} {{pl.post_topic_title}}</a>
               {{/if}}
             </td>
             <td class="col category">
               {{#if pl.category_id}}
-                <a href='{{unbound pl.category_url}}'>{{pl.category_name}}</a>
+                <a href={{unbound pl.category_url}}>{{pl.category_name}}</a>
               {{/if}}
             </td>
             <td class="col external_url">
               {{#if pl.external_url}}
-                <a href='{{unbound pl.external_url}}'>{{pl.external_url}}</a>
+                <a href={{unbound pl.external_url}}>{{pl.external_url}}</a>
               {{/if}}
             </td>
             <td class="col action">
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 91d5d31361..339cf2d169 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -23,14 +23,14 @@
   {{#each model.search_result.posts as |result|}}
     <div class='fps-result'>
       <div class='author'>
-        <a href={{result.userPath}} data-user-card="{{unbound result.username}}">
+        <a href={{result.userPath}} data-user-card={{unbound result.username}}>
           {{avatar result imageSize="large"}}
         </a>
       </div>
 
       <div class='fps-topic'>
         <div class='topic'>
-          <a class='search-link' href='{{unbound result.url}}'>
+          <a class='search-link' href={{unbound result.url}}>
             {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
           </a>
 
diff --git a/app/assets/javascripts/admin/templates/site-settings.hbs b/app/assets/javascripts/admin/templates/site-settings.hbs
index 56ddbcd551..01264be5b5 100644
--- a/app/assets/javascripts/admin/templates/site-settings.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings.hbs
@@ -16,7 +16,7 @@
 <div class="admin-nav pull-left">
   <ul class="nav nav-stacked">
     {{#each visibleSiteSettings as |category|}}
-      <li class="{{category.nameKey}}">
+      <li class={{category.nameKey}}>
         {{#link-to 'adminSiteSettingsCategory' category.nameKey class=category.nameKey}}
           {{category.name}}
           {{#if category.count}}<span class="count">({{category.count}})</span>{{/if}}
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index f919867c4d..c93e7fb462 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -55,7 +55,7 @@
             </td>
             <td class='reason'>
               {{#if userBadge.postUrl}}
-              <a href="{{unbound userBadge.postUrl}}">{{userBadge.topic_title}}</a>
+              <a href={{unbound userBadge.postUrl}}>{{userBadge.topic_title}}</a>
               {{/if}}
             </td>
             <td>{{age-with-tooltip userBadge.granted_at}}</td>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index d69f3b9706..5707142ff3 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -97,7 +97,7 @@
     </div>
 
     <div class="display-row bounce-score">
-      <div class="field"><a href="{{model.bounceLink}}">{{i18n "admin.user.bounce_score"}}</a></div>
+      <div class="field"><a href={{model.bounceLink}}>{{i18n "admin.user.bounce_score"}}</a></div>
       <div class="value">{{model.bounceScore}}</div>
       <div class="controls">
         {{#if model.canResetBounceScore}}
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index d31a38c1f6..127b7446c0 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -40,7 +40,7 @@
         {{#each model as |user|}}
           <tr class="user {{user.selected}} {{unless user.active 'not-activated'}}">
             <td class="username">
-              <a href="{{unbound user.path}}" data-user-card="{{unbound user.username}}">
+              <a href={{unbound user.path}} data-user-card={{unbound user.username}}>
                 {{avatar user imageSize="small"}}
               </a>
               {{#link-to 'adminUser' user}}{{unbound user.username}}{{/link-to}}
diff --git a/app/assets/javascripts/admin/templates/watched-words.hbs b/app/assets/javascripts/admin/templates/watched-words.hbs
index 5fe3946dfb..6897721197 100644
--- a/app/assets/javascripts/admin/templates/watched-words.hbs
+++ b/app/assets/javascripts/admin/templates/watched-words.hbs
@@ -9,7 +9,7 @@
 <div class="admin-nav pull-left">
   <ul class="nav nav-stacked">
     {{#each model as |action|}}
-      <li class="{{action.nameKey}}">
+      <li class={{action.nameKey}}>
         {{#link-to 'adminWatchedWords.action' action.nameKey}}
           {{action.name}}
           {{#if action.count}}<span class="count">({{action.count}})</span>{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 9eeb3d7fa2..12ba951aac 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -52,7 +52,7 @@
       {{#unless canLoadMore}}
         {{#if canShowOthers}}
         <div class='clearfix'>
-          <a class='btn' href='{{model.url}}'>{{i18n 'badges.others_count' count=othersCount}}</a>
+          <a class='btn' href={{model.url}}>{{i18n 'badges.others_count' count=othersCount}}</a>
         </div>
         {{/if}}
       {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
index 4c946af466..f7bfd9886b 100644
--- a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
+++ b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
@@ -1,8 +1,8 @@
 {{#each usersTemplates as |userTemplate|}}
-  <div data-username="{{userTemplate.username}}" class="user-info small">
+  <div data-username={{userTemplate.username}} class="user-info small">
     <div class="user-image">
       <div class="user-image-inner">
-        <a href="{{userTemplate.userPath}}" data-user-card="{{userTemplate.username}}">
+        <a href={{userTemplate.userPath}} data-user-card={{userTemplate.username}}>
           {{{userTemplate.avatar}}}
         </a>
       </div>
@@ -10,7 +10,7 @@
     <div class="user-detail">
       <div class="name-line">
         <span class="username">
-          <a href="{{userTemplate.userPath}}" data-user-card="{{userTemplate.username}}">
+          <a href={{userTemplate.userPath}} data-user-card={{userTemplate.username}}>
             {{userTemplate.username}}
           </a>
         </span>
diff --git a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
index f19538efea..6545208bb7 100644
--- a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
@@ -1,4 +1,4 @@
-<label class="btn btn-default btn-icon-text" disabled={{uploading}} title="{{i18n 'user.change_avatar.upload_title'}}">
+<label class="btn btn-default btn-icon-text" disabled={{uploading}} title={{i18n 'user.change_avatar.upload_title'}}>
   {{d-icon "far-image"}}
   {{#if uploading}}
   {{i18n 'uploading'}} {{uploadProgress}}%
diff --git a/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs b/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
index 255d2f01d5..77581a3598 100644
--- a/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
@@ -1,4 +1,4 @@
-<label class="btn" disabled={{uploading}} title="{{i18n 'admin.backups.upload.title'}}">
+<label class="btn" disabled={{uploading}} title={{i18n 'admin.backups.upload.title'}}>
   {{d-icon "upload"}}&nbsp;{{uploadButtonText}}
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept=".gz">
 </label>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
index 95ebe51a0d..1e6fd8be89 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
@@ -1,5 +1,5 @@
 {{d-icon topicStatusIcon}}
 
-<a class='title' href="{{unbound topic.lastUnreadUrl}}">
+<a class='title' href={{unbound topic.lastUnreadUrl}}>
   {{text-overflow class="overflow" text=topic.fancyTitle}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
index 4dcd89c71a..8a70f1b6fc 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
@@ -7,7 +7,7 @@
     {{latest-topic-list-item topic=t}}
   {{/each}}
   <div class="more-topics">
-    <a href="{{get-url (concat '/' filter)}}" class="btn btn-default pull-right">{{i18n "more"}}</a>
+    <a href={{get-url (concat '/' filter)}} class="btn btn-default pull-right">{{i18n "more"}}</a>
   </div>
 {{else}}
   <div class='no-topics'>
diff --git a/app/assets/javascripts/discourse/templates/components/category-unread.hbs b/app/assets/javascripts/discourse/templates/components/category-unread.hbs
index a6a2251691..16eef33fc9 100644
--- a/app/assets/javascripts/discourse/templates/components/category-unread.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-unread.hbs
@@ -1,6 +1,6 @@
 {{#if category.unreadTopics}}
-  <a href="{{unbound category.unreadUrl}}" class='badge new-posts badge-notification' title='{{i18n 'topic.unread_topics' count=category.unreadTopics}}'>{{i18n 'filters.unread.lower_title_with_count' count=category.unreadTopics}}</a>
+  <a href={{unbound category.unreadUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.unread_topics' count=category.unreadTopics}}>{{i18n 'filters.unread.lower_title_with_count' count=category.unreadTopics}}</a>
 {{/if}}
 {{#if category.newTopics}}
-  <a href="{{unbound category.newUrl}}" class='badge new-posts badge-notification' title='{{i18n 'topic.new_topics' count=category.newTopics}}'>{{i18n 'filters.new.lower_title_with_count' count=category.newTopics}}</a>
+  <a href={{unbound category.newUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.new_topics' count=category.newTopics}}>{{i18n 'filters.new.lower_title_with_count' count=category.newTopics}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index f4864b3dc8..27025bedee 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -5,7 +5,7 @@
       <div id="banner-content">
         {{{content}}}
         {{#if currentUser.staff}}
-          <p><a href="{{banner.url}}">{{{i18n "banner.edit"}}}</a></p>
+          <p><a href={{banner.url}}>{{{i18n "banner.edit"}}}</a></p>
         {{/if}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
index dfb2e1c8d0..73ca697a71 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -13,7 +13,7 @@
   {{#unless showPositionInput}}
     <section class='field'>
       {{i18n 'category.position_disabled'}}
-      <a href="{{get-url '/admin/site_settings/category/basic'}}">{{i18n 'category.position_disabled_click'}}</a>
+      <a href={{get-url '/admin/site_settings/category/basic'}}>{{i18n 'category.position_disabled_click'}}</a>
     </section>
   {{/unless}}
 
@@ -261,7 +261,7 @@
   {{#unless emailInEnabled}}
     <section class='field'>
       {{i18n 'category.email_in_disabled'}}
-      <a href="{{get-url '/admin/site_settings/category/email'}}">{{i18n 'category.email_in_disabled_click'}}</a>
+      <a href={{get-url '/admin/site_settings/category/email'}}>{{i18n 'category.email_in_disabled_click'}}</a>
     </section>
   {{/unless}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
index 7be1e91060..f56683a3f6 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
@@ -1 +1 @@
-<a href {{action "select"}} class="{{if active 'active'}}">{{title}}</a>
+<a href {{action "select"}} class={{if active 'active'}}>{{title}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
index 7061778b8e..aed5312bfa 100644
--- a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
@@ -1,12 +1,12 @@
 {{raw "topic-status" topic=topic}}
-<a class='title' href="{{unbound topic.lastUnreadUrl}}">{{{unbound topic.fancyTitle}}}</a>
+<a class='title' href={{unbound topic.lastUnreadUrl}}>{{{unbound topic.fancyTitle}}}</a>
 {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
 
 {{#if latestTopicOnly}}
   <div class='last-user-info'>
-    {{i18n 'categories.latest_by'}} <a href="{{{unbound topic.lastPosterUrl}}}">{{unbound topic.last_poster.username}}</a>
-    <a href="{{unbound topic.lastPostUrl}}">{{format-age topic.last_posted_at}}</a>
+    {{i18n 'categories.latest_by'}} <a href={{{unbound topic.lastPosterUrl}}}>{{unbound topic.last_poster.username}}</a>
+    <a href={{unbound topic.lastPostUrl}}>{{format-age topic.last_posted_at}}</a>
   </div>
 {{else}}
-  <a href="{{unbound topic.lastPostUrl}}" class="last-posted-at">{{format-age topic.last_posted_at}}</a>
+  <a href={{unbound topic.lastPostUrl}} class="last-posted-at">{{format-age topic.last_posted_at}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/google-search.hbs b/app/assets/javascripts/discourse/templates/components/google-search.hbs
index 766bf3a908..28893ffff8 100644
--- a/app/assets/javascripts/discourse/templates/components/google-search.hbs
+++ b/app/assets/javascripts/discourse/templates/components/google-search.hbs
@@ -1,7 +1,7 @@
 <div>
   <form action='//google.com/search' id='google-search'>
-    <input type="text" name="q" value="{{searchTerm}}">
-    <input type='hidden' name="as_sitesearch" value="{{siteUrl}}">
+    <input type="text" name="q" value={{searchTerm}}>
+    <input type='hidden' name="as_sitesearch" value={{siteUrl}}>
     <button class="btn btn-primary">{{i18n 'search.search_google_button'}}</button>
   </form>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index eee2b12ed0..22629d003d 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -3,7 +3,7 @@
 
     <div class="card-row first-row">
       <div class="group-card-avatar">
-        <a href="{{groupPath}}" {{action "showGroup" group}} class="card-huge-avatar">
+        <a href={{groupPath}} {{action "showGroup" group}} class="card-huge-avatar">
           {{avatar-flair
           flairURL=group.flair_url
           flairBgColor=group.flair_bg_color
@@ -13,8 +13,8 @@
       </div>
       <div class="names">
         <span>
-          <h1 class="{{group.name}}">
-            <a href="{{groupPath}}" {{action "showGroup" group}} class='group-page-link'>{{group.name}}</a>
+          <h1 class={{group.name}}>
+            <a href={{groupPath}} {{action "showGroup" group}} class='group-page-link'>{{group.name}}</a>
           </h1>
           {{#if group.full_name}}
             <h2 class='full-name'>{{group.full_name}}</h2>
@@ -74,7 +74,7 @@
             <a href {{action 'showUser' user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
           {{/each}}
           {{#if showMoreMembers}}
-            <a href="{{groupPath}}" {{action "showGroup" group}} class="more-members-link"><span
+            <a href={{groupPath}} {{action "showGroup" group}} class="more-members-link"><span
                class="more-members-count">+{{moreMembersCount}}
                 {{i18n "more"}}</span></a>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
index 5436915996..319fa80805 100644
--- a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
@@ -35,7 +35,7 @@
 
   <div class="avatar-flair-preview">
     <div class="avatar-wrapper">
-      <img width="45" height="45" src="{{demoAvatarUrl}}" class="avatar actor">
+      <img width="45" height="45" src={{demoAvatarUrl}} class="avatar actor">
     </div>
 
     {{#if flairPreviewImage}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index 9e56010fad..a39e71f9ae 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -1,5 +1,5 @@
 <div class='clearfix info'>
-    <a href="{{unbound post.user.userUrl}}" data-user-card="{{unbound post.user.username}}" class='avatar-link'>
+    <a href={{unbound post.user.userUrl}} data-user-card={{unbound post.user.username}} class='avatar-link'>
       {{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
     </a>
     <span class='time'>{{format-date post.created_at leaveAgo="true"}}</span>
@@ -19,7 +19,7 @@
         </div>
       {{/if}}
   </div>
-  
+
 </div>
 
 <div class='excerpt'>
diff --git a/app/assets/javascripts/discourse/templates/components/images-uploader.hbs b/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
index 56aca01de4..ea9a23d1e4 100644
--- a/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
@@ -1,4 +1,4 @@
-<label class="btn" disabled={{uploading}} title="{{i18n "admin.site_settings.uploaded_image_list.upload.title"}}">
+<label class="btn" disabled={{uploading}} title={{i18n "admin.site_settings.uploaded_image_list.upload.title"}}>
   {{d-icon "far-image"}}&nbsp;{{uploadButtonText}}
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" multiple>
 </label>
diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
index a3666f6842..a1f459f725 100644
--- a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
@@ -20,6 +20,6 @@
 <div class='topic-stats'>
   {{raw "list/posts-count-column" topic=topic tagName="div"}}
   <div class="topic-last-activity">
-    <a href="{{topic.lastPostUrl}}" title="{{topic.bumpedAtTitle}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a>
+    <a href={{topic.lastPostUrl}} title={{topic.bumpedAtTitle}}>{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
index 6cc45d2f1e..e9d901d880 100644
--- a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
@@ -5,7 +5,7 @@
     {{#if topic.unseen}}
       <span class="badge-notification new-topic"></span>
     {{/if}}
-    <span class="{{cold-age-class topic.last_posted_at}}" title='{{raw-date topic.last_posted_at}}'>{{{format-age topic.last_posted_at}}}</span>
+    <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{{format-age topic.last_posted_at}}}</span>
   </div>
 </td>
 <td class='num posts'>{{raw "list/post-count-or-badges" topic=topic postBadgesEnabled="true"}}</td>
diff --git a/app/assets/javascripts/discourse/templates/components/nav-item.hbs b/app/assets/javascripts/discourse/templates/components/nav-item.hbs
index 1205e1b36a..8817c4df61 100644
--- a/app/assets/javascripts/discourse/templates/components/nav-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/nav-item.hbs
@@ -3,5 +3,5 @@
 {{else if route}}
   {{#link-to route}}{{contents}}{{/link-to}}
 {{else}}
-  <a href="{{get-url path}}" data-auto-route="true">{{contents}}</a>
+  <a href={{get-url path}} data-auto-route="true">{{contents}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-source.hbs b/app/assets/javascripts/discourse/templates/components/share-source.hbs
index 185f80ab9c..7680c6b861 100644
--- a/app/assets/javascripts/discourse/templates/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-source.hbs
@@ -1,4 +1,4 @@
-<a href {{action "share" source}} title="{{unbound source.title}}" aria-label="{{unbound source.title}}" >
+<a href {{action "share" source}} title={{unbound source.title}} aria-label={{unbound source.title}}>
   {{#if source.icon}}
     {{d-icon source.icon}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs b/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs
index 0953efa293..1d992c500e 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs
@@ -1,9 +1,9 @@
 {{#if unread }}
-  &nbsp;<a href='{{url}}' class='badge badge-notification unread' title='{{i18n "topic.unread_posts" count=unread}}'>{{unread}}</a>
+  &nbsp;<a href={{url}} class='badge badge-notification unread' title={{i18n "topic.unread_posts" count=unread}}>{{unread}}</a>
 {{/if}}
 {{#if newPosts}}
-  &nbsp;<a href='{{url}}' class='badge badge-notification new-posts' title='{{i18n "topic.total_unread_posts" count=newPosts}}'>{{newPosts}}</a>
+  &nbsp;<a href={{url}} class='badge badge-notification new-posts' title={{i18n "topic.total_unread_posts" count=newPosts}}>{{newPosts}}</a>
 {{/if}}
 {{#if unseen}}
-  &nbsp;<a href='{{url}}' class='badge badge-notification new-topic' title='{{i18n "topic.new"}}'>{{newDotText}}</a>
+  &nbsp;<a href={{url}} class='badge badge-notification new-topic' title={{i18n "topic.new"}}>{{newDotText}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
index ab4ea02ff4..d9c0ff5802 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
@@ -8,9 +8,9 @@
   </div>
 {{/if}}
 
-<nav id='topic-progress' title="{{i18n 'topic.progress.title'}}" class="{{if hideProgress 'hidden'}}">
+<nav id='topic-progress' title={{i18n 'topic.progress.title'}} class={{if hideProgress 'hidden'}}>
   <div class='nums'>
-    <h4>{{progressPosition}}</h4><span class="{{if hugeNumberOfPosts 'hidden'}}">
+    <h4>{{progressPosition}}</h4><span class={{if hugeNumberOfPosts 'hidden'}}>
     <span>/</span>
     <h4>{{postStream.filteredPostsCount}}</h4></span>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs b/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs
index fe1f089d74..7741113b5d 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs
@@ -1,10 +1,10 @@
 {{#if showTopicTimer}}
   <h3 class="topic-timer-heading">
-    <span title="{{title}}">
+    <span title={{title}}>
       {{clockIcon}} {{notice}}
     </span>
     {{#if showTrashCan}}
-      <button class="btn topic-timer-remove no-text" title="{{trashCanTitle}}">
+      <button class="btn topic-timer-remove no-text" title={{trashCanTitle}}>
         {{trashCanIcon}}
       </button>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-badge.hbs b/app/assets/javascripts/discourse/templates/components/user-badge.hbs
index 24334c6a7e..c1af47a6da 100644
--- a/app/assets/javascripts/discourse/templates/components/user-badge.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-badge.hbs
@@ -1,4 +1,4 @@
-<a href="{{badgeUrl}}">
+<a href={{badgeUrl}}>
   {{#badge-button badge=badge}}
     {{#if showGrantCount}}
       <span class="count">(&times;&nbsp;{{count}})</span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index ba00265392..8319d233e1 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -25,7 +25,7 @@
           {{#if user.profile_hidden}}
             <span class="card-huge-avatar">{{bound-avatar user "huge"}}</span>
           {{else}}
-            <a href="{{user.path}}" {{action "showUser" user}} class="card-huge-avatar">{{bound-avatar user "huge"}}</a>
+            <a href={{user.path}} {{action "showUser" user}} class="card-huge-avatar">{{bound-avatar user "huge"}}</a>
           {{/if}}
           {{#if user.primary_group_name}}
             {{avatar-flair
@@ -43,7 +43,7 @@
                 {{if nameFirst user.name (format-username username)}}
               </span>
             {{else}}
-              <a href="{{user.path}}" {{action "showUser" user}} class='user-profile-link'>
+              <a href={{user.path}} {{action "showUser" user}} class='user-profile-link'>
                 <span class="name-username-wrapper">
                   {{if nameFirst user.name (format-username username)}}
                 </span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index f3bcf803c9..fe91090dde 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,5 +1,5 @@
 {{#if field.name}}
-  <label class="control-label" for="{{concat 'user-' elementId}}">
+  <label class="control-label" for={{concat 'user-' elementId}}>
     {{{field.name}}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
   </label>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index 568deb553d..136585cb03 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,4 +1,4 @@
-<label class="control-label" for="{{concat 'user-' elementId}}">{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{combo-box
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 8ed4b1ead9..4549f721af 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,4 +1,4 @@
-<label class="control-label" for="{{concat 'user-' elementId}}">{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{input id=(concat 'user-' elementId) value=value maxlength=site.user_field_max_length}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-info.hbs b/app/assets/javascripts/discourse/templates/components/user-info.hbs
index 7870de14a8..46691e39ea 100644
--- a/app/assets/javascripts/discourse/templates/components/user-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-info.hbs
@@ -1,6 +1,6 @@
 <div class="user-image">
   <div class="user-image-inner">
-    <a href="{{unbound userPath}}" data-user-card="{{unbound user.username}}">{{avatar user imageSize="large"}}</a>
+    <a href={{unbound userPath}} data-user-card={{unbound user.username}}>{{avatar user imageSize="large"}}</a>
     {{#if user.primary_group_name}}
       {{avatar-flair
         flairURL=user.primary_group_flair_url
@@ -13,7 +13,7 @@
 
 <div class="user-detail">
   <div class='name-line'>
-    <span class="username"><a href="{{unbound userPath}}" data-user-card="{{unbound user.username}}">{{format-username user.username}}</a></span>
+    <span class="username"><a href={{unbound userPath}} data-user-card={{unbound user.username}}>{{format-username user.username}}</a></span>
     <span class="name">{{unbound name}}</span>
   </div>
   <div class="title">{{unbound user.title}}</div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index 823c447903..a87439ad35 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -35,7 +35,7 @@
   <p class='excerpt'>{{actionDescription}}</p>
 {{/if}}
 
-<p class='excerpt' data-topic-id="{{item.topic_id}}" data-post-id="{{item.post_id}}" data-user-id="{{item.user_id}}">
+<p class='excerpt' data-topic-id={{item.topic_id}} data-post-id={{item.post_id}} data-user-id={{item.user_id}}>
   {{~#if item.expandedExcerpt}}
     {{~{item.expandedExcerpt}~}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
index 056b9cf088..7b31dfff86 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -6,4 +6,4 @@
   {{/if}}
 </span>
 <br>
-<a href="{{unbound url}}">{{{topic.fancyTitle}}}</a>
+<a href={{unbound url}}>{{{topic.fancyTitle}}}</a>
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index ffc9fb49a4..987e5e714f 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -138,7 +138,7 @@
                                        disableSubmit=disableSubmit}}
 
               {{#if site.mobileView}}
-                <a href {{action "cancel"}} class='cancel' tabindex="6" title="{{i18n 'cancel'}}">
+                <a href {{action "cancel"}} class='cancel' tabindex="6" title={{i18n 'cancel'}}>
                   {{#if canEdit}}
                     {{d-icon "times"}}
                   {{else}}
@@ -171,11 +171,11 @@
                   {{/if}}
                 </div>
               {{/if}}
-              <div id='draft-status' class="{{if isUploading 'hidden'}}">
+              <div id='draft-status' class={{if isUploading 'hidden'}}>
                 {{#if model.draftSaving}}<div class="spinner small"></div>{{/if}}
                 {{#if model.draftSaved}}{{d-icon 'check' class='save-animation'}}{{/if}}
                 {{#if model.draftStatus}}
-                  <span title="{{model.draftStatus}}">
+                  <span title={{model.draftStatus}}>
                     {{#if model.draftConflictUser}}
                       {{avatar model.draftConflictUser imageSize="small"}} {{d-icon 'user-edit'}}
                     {{else}}
@@ -196,7 +196,7 @@
                   </a>
                 {{/if}}
 
-                <a href class="btn btn-default no-text mobile-preview" title="{{i18n 'composer.show_preview'}}" {{action "togglePreview"}}>
+                <a href class="btn btn-default no-text mobile-preview" title={{i18n 'composer.show_preview'}} {{action "togglePreview"}}>
                   {{d-icon "desktop"}}
                 </a>
 
@@ -213,7 +213,7 @@
       {{else}}
         <div class='saving-text'>
           {{#if model.createdPost}}
-            {{i18n 'composer.saved'}} <a class='permalink' href="{{unbound createdPost.url}}" {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
+            {{i18n 'composer.saved'}} <a class='permalink' href={{unbound createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
           {{else}}
             {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index e903c5cd02..c60aaf0dd1 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -73,7 +73,7 @@
           {{#each model.posts as |result|}}
             <div class='fps-result'>
               <div class='author'>
-                <a href={{result.userPath}} data-user-card="{{unbound result.username}}">
+                <a href={{result.userPath}} data-user-card={{unbound result.username}}>
                   {{avatar result imageSize="large"}}
                 </a>
               </div>
@@ -84,7 +84,7 @@
                     {{track-selected selectedList=selected selectedId=result.topic}}
                   {{/if}}
 
-                  <a class='search-link' href='{{unbound result.url}}' {{action "logClick" result.topic_id}}>
+                  <a class='search-link' href={{unbound result.url}} {{action "logClick" result.topic_id}}>
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
                     <span class='topic-title'>{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
                   </a>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 7c68ac0d05..a7484723f1 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -26,10 +26,10 @@
                 <div class="topic-excerpt">
                   {{{t.excerpt}}}
                   {{#if t.excerptTruncated}}
-                    {{#unless t.canClearPin}}<a href="{{unbound t.url}}">{{i18n 'read_more'}}</a>{{/unless}}
+                    {{#unless t.canClearPin}}<a href={{unbound t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
                   {{/if}}
                   {{#if t.canClearPin}}
-                    <a href {{action "clearPin" t}} title="{{i18n 'topic.clear_pin.help'}}">{{i18n 'topic.clear_pin.title'}}</a>
+                    <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>{{i18n 'topic.clear_pin.title'}}</a>
                   {{/if}}
                 </div>
               {{/if}}
@@ -42,7 +42,7 @@
               {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
               <div class="pull-right">
                 {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
-                <a href="{{t.lastPostUrl}}" title='{{i18n 'last_post'}}: {{{raw-date t.bumped_at}}}'>{{t.last_poster_username}}</a>
+                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{{raw-date t.bumped_at}}}'>{{t.last_poster_username}}</a>
               </div>
               {{#unless hideCategory}}
                 <div class='category'>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index 41b86dda0b..5418fcb86a 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -61,14 +61,14 @@
         </table>
         <footer class="clearfix">
 
-          <figure title="{{i18n 'all_time_desc'}}">{{number c.topics_all_time}} <figcaption>{{i18n 'all_time'}}</figcaption></figure>
+          <figure title={{i18n 'all_time_desc'}}>{{number c.topics_all_time}} <figcaption>{{i18n 'all_time'}}</figcaption></figure>
 
           {{#if c.pickMonth}}
-          <figure title="{{i18n 'month_desc'}}">{{number c.topics_month}} <figcaption>/ {{i18n 'month'}}</figcaption></figure>
+          <figure title={{i18n 'month_desc'}}>{{number c.topics_month}} <figcaption>/ {{i18n 'month'}}</figcaption></figure>
           {{/if}}
 
           {{#if c.pickWeek}}
-            <figure title="{{i18n 'week_desc'}}">{{number c.topics_week}} <figcaption>/ {{i18n 'week'}}</figcaption></figure>
+            <figure title={{i18n 'week_desc'}}>{{number c.topics_week}} <figcaption>/ {{i18n 'week'}}</figcaption></figure>
           {{/if}}
 
         </footer>
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index c96f042df3..6d9dbff78e 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -47,7 +47,7 @@
       {{/unless}}
     </div>
   </div>
-  <div id="revisions" data-post-id="{{model.post_id}}" class={{hiddenClasses}}>
+  <div id="revisions" data-post-id={{model.post_id}} class={{hiddenClasses}}>
     {{#if model.title_changes}}
       <div class="row">
         <h2>{{{titleDiff}}}</h2>
@@ -109,7 +109,7 @@
     <div id="revision-controls">
       {{d-button class="btn-default" action=(action "loadFirstVersion") icon="fast-backward" title="post.revisions.controls.first" disabled=loadFirstDisabled}}
       {{d-button class="btn-default" action=(action "loadPreviousVersion") icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}}
-      <div id="revision-numbers" class="{{unless displayRevisions 'invisible'}}">
+      <div id="revision-numbers" class={{unless displayRevisions 'invisible'}}>
         {{#conditional-loading-spinner condition=loading size="small"}}
           {{{revisionsText}}}
         {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
index b32fdc42fa..1be4aab6d5 100644
--- a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
@@ -14,9 +14,9 @@
           {{#each searchResults as |result|}}
             <a
               class="search-link"
-              href="{{result.url}}"
+              href={{result.url}}
               onclick={{action "linkClick"}}
-              data-title="{{result.title}}">
+              data-title={{result.title}}>
               {{topic-status topic=result disableActions=true}}
               {{replace-emoji result.fancy_title}}
               <div class="search-category">
diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
index 173df534af..9461b5d3c4 100644
--- a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
@@ -7,7 +7,7 @@
     </thead>
     <tbody>
     {{#each categoriesOrdered as |cat|}}
-      <tr data-category-id="{{cat.id}}">
+      <tr data-category-id={{cat.id}}>
         <td>
           <div class={{concat 'reorder-categories-depth-' cat.depth}}>
             {{category-badge cat allowUncategorized="true"}}
diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/templates/password-reset.hbs
index de7a37ce5d..f641f8b0e0 100644
--- a/app/assets/javascripts/discourse/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/templates/password-reset.hbs
@@ -11,7 +11,7 @@
         <p>{{i18n 'login.not_approved'}}</p>
       {{else}}
         {{#unless redirected}}
-          <a class="btn" href="{{redirectHref}}" {{action "done"}}>{{continueButtonText}}</a>
+          <a class="btn" href={{redirectHref}} {{action "done"}}>{{continueButtonText}}</a>
         {{/unless}}
       {{/if}}
     {{else}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 0aef40f2a0..2fe58dbf59 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -117,7 +117,7 @@
                   </td>
               </tr>
             {{else}}
-              <tr class="{{dasherize authProvider.method.name}}">
+              <tr class={{dasherize authProvider.method.name}}>
                 <td>{{authProvider.method.prettyName}}</td>
                   <td colspan=2>
                     {{#if authProvider.method.can_connect}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index e5314b6745..5bb791bcc0 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -4,7 +4,7 @@
   <div class="controls tracking-controls">
     <label>{{d-icon "d-watching"}} {{i18n 'user.watched_categories'}}</label>
     {{#if canSee}}
-      <a class="show-tracking" href="{{unbound model.watchingTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
+      <a class="show-tracking" href={{unbound model.watchingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
     {{/if}}
     {{category-selector
       categories=model.watchedCategories
@@ -18,7 +18,7 @@
   <div class="controls tracking-controls">
     <label>{{d-icon "d-tracking"}} {{i18n 'user.tracked_categories'}}</label>
     {{#if canSee}}
-      <a class="show-tracking" href="{{unbound model.trackingTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
+      <a class="show-tracking" href={{unbound model.trackingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
     {{/if}}
     {{category-selector
       categories=model.trackedCategories
@@ -43,7 +43,7 @@
     <div class="controls tracking-controls">
       <label>{{d-icon "d-muted"}} {{i18n 'user.muted_categories'}}</label>
       {{#if canSee}}
-        <a class="show-tracking" href="{{unbound model.mutedTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
+        <a class="show-tracking" href={{unbound model.mutedTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
       {{/if}}
       {{category-selector
         categories=model.mutedCategories
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 1bd7d80f97..b2cdb56f26 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -48,7 +48,7 @@
               {{d-button action=(action "cancelEditingTopic") class="btn-default cancel-edit" icon="times"}}
 
               {{#if canRemoveTopicFeaturedLink}}
-                <a href {{action "removeFeaturedLink"}} class="remove-featured-link" title="{{i18n "composer.remove_featured_link"}}">
+                <a href {{action "removeFeaturedLink"}} class="remove-featured-link" title={{i18n "composer.remove_featured_link"}}>
                   {{d-icon "times-circle"}}
                   {{featuredLinkDomain}}
                 </a>
@@ -57,7 +57,7 @@
           </div>
 
         {{else}}
-          <h1 data-topic-id="{{unbound model.id}}">
+          <h1 data-topic-id={{unbound model.id}}>
             {{#unless model.is_warning}}
               {{#if siteSettings.enable_personal_messages}}
                 {{private-message-glyph
@@ -73,13 +73,13 @@
 
             {{#if model.details.loaded}}
               {{topic-status topic=model}}
-              <a href="{{unbound model.url}}" {{action "jumpTop"}} class="fancy-title">
+              <a href={{unbound model.url}} {{action "jumpTop"}} class="fancy-title">
                 {{{model.fancyTitle}}}
               </a>
             {{/if}}
 
             {{#if model.details.can_edit}}
-              <a href {{action "editTopic"}} class="edit-topic" title="{{i18n "edit"}}">{{d-icon "pencil-alt"}}</a>
+              <a href {{action "editTopic"}} class="edit-topic" title={{i18n "edit"}}>{{d-icon "pencil-alt"}}</a>
             {{/if}}
           </h1>
 
@@ -170,7 +170,7 @@
       {{/topic-navigation}}
 
       <div class="row">
-        <section class="topic-area" id="topic" data-topic-id="{{unbound model.id}}">
+        <section class="topic-area" id="topic" data-topic-id={{unbound model.id}}>
 
           <div class="posts-wrapper">
             {{conditional-loading-spinner condition=model.postStream.loadingAbove}}
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 5e95282ab4..e15647621b 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -74,9 +74,9 @@
                       <td>{{number invite.user.posts_read_count}}</td>
                       <td>{{{format-duration invite.user.time_read}}}</td>
                       <td>
-                        <span title="{{i18n 'user.invited.days_visited'}}">{{{unbound invite.user.days_visited}}}</span>
+                        <span title={{i18n 'user.invited.days_visited'}}>{{{unbound invite.user.days_visited}}}</span>
                           /
-                        <span title="{{i18n 'user.invited.account_age_days'}}">{{{unbound invite.user.days_since_created}}}</span>
+                        <span title={{i18n 'user.invited.account_age_days'}}>{{{unbound invite.user.days_since_created}}}</span>
                       </td>
                     {{/if}}
                   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 520fb78e88..d1c61ab805 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -86,8 +86,8 @@
 
           <div class="primary-textual">
             <div class="user-profile-names">
-              <h1 class="{{if nameFirst "full-name" "username"}}">{{if nameFirst model.name (format-username model.username)}} {{user-status model currentUser=currentUser}}</h1>
-              <h2 class="{{if nameFirst "username" "full-name"}}">{{#if nameFirst}}{{model.username}}{{else}}{{model.name}}{{/if}}</h2>
+              <h1 class={{if nameFirst "full-name" "username"}}>{{if nameFirst model.name (format-username model.username)}} {{user-status model currentUser=currentUser}}</h1>
+              <h2 class={{if nameFirst "username" "full-name"}}>{{#if nameFirst}}{{model.username}}{{else}}{{model.name}}{{/if}}</h2>
               {{#if model.staged}}
                 <h2 class="staged">{{i18n 'user.staged'}}</h2>
               {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/popular-themes.hbs b/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
index 42756d3ceb..6f6ddf02ed 100644
--- a/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
+++ b/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
@@ -1,5 +1,5 @@
 {{#each popular_components as |theme|}}
-  <a class="popular-theme-item" href="{{theme.meta_url}}" rel="noopener" target="_blank">
+  <a class="popular-theme-item" href={{theme.meta_url}} rel="noopener" target="_blank">
     {{theme.name}}
   </a>
 {{/each}}

From f14dd1f82d4742142734fc2c4cfe63777c320963 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Sat, 7 Mar 2020 14:36:54 +0200
Subject: [PATCH 0121/1830] FIX: Prevent race condition when post processing
 post (#8819)

If a post is being cooked twice (for example after an edit), there is a
chance the 'raw' and 'cooked' column to be inconsistent. This reduces
the chances of that happening.
---
 app/jobs/regular/process_post.rb | 68 ++++++++++++++++----------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/app/jobs/regular/process_post.rb b/app/jobs/regular/process_post.rb
index 20aa499e22..8dd7487f36 100644
--- a/app/jobs/regular/process_post.rb
+++ b/app/jobs/regular/process_post.rb
@@ -7,43 +7,45 @@ module Jobs
   class ProcessPost < ::Jobs::Base
 
     def execute(args)
-      post = Post.find_by(id: args[:post_id])
-      # two levels of deletion
-      return unless post.present? && post.topic.present?
+      DistributedMutex.synchronize("process_post_#{args[:post_id]}") do
+        post = Post.find_by(id: args[:post_id])
+        # two levels of deletion
+        return unless post.present? && post.topic.present?
 
-      orig_cooked = post.cooked
-      recooked = nil
+        orig_cooked = post.cooked
+        recooked = nil
 
-      if args[:cook].present?
-        cooking_options = args[:cooking_options] || {}
-        cooking_options[:topic_id] = post.topic_id
-        recooked = post.cook(post.raw, cooking_options.symbolize_keys)
-        post.update_columns(cooked: recooked, baked_at: Time.zone.now, baked_version: Post::BAKED_VERSION)
-      end
-
-      cp = CookedPostProcessor.new(post, args)
-      cp.post_process(bypass_bump: args[:bypass_bump], new_post: args[:new_post])
-
-      # If we changed the document, save it
-      cooked = cp.html
-
-      if cooked != (recooked || orig_cooked)
-
-        if orig_cooked.present? && cooked.blank?
-          # TODO stop/restart the worker if needed, let's gather a few here first
-          Rails.logger.warn("Cooked post processor in FATAL state, bypassing. You need to urgently restart sidekiq\norig: #{orig_cooked}\nrecooked: #{recooked}\ncooked: #{cooked}\npost id: #{post.id}")
-        else
-          post.update_column(:cooked, cp.html)
-          extract_links(post)
-          post.publish_change_to_clients! :revised
+        if args[:cook].present?
+          cooking_options = args[:cooking_options] || {}
+          cooking_options[:topic_id] = post.topic_id
+          recooked = post.cook(post.raw, cooking_options.symbolize_keys)
+          post.update_columns(cooked: recooked, baked_at: Time.zone.now, baked_version: Post::BAKED_VERSION)
         end
-      end
 
-      if !post.user&.staff? && !post.user&.staged?
-        s = post.cooked
-        s << " #{post.topic.title}" if post.post_number == 1
-        if !args[:bypass_bump] && WordWatcher.new(s).should_flag?
-          PostActionCreator.create(Discourse.system_user, post, :inappropriate)
+        cp = CookedPostProcessor.new(post, args)
+        cp.post_process(bypass_bump: args[:bypass_bump], new_post: args[:new_post])
+
+        # If we changed the document, save it
+        cooked = cp.html
+
+        if cooked != (recooked || orig_cooked)
+
+          if orig_cooked.present? && cooked.blank?
+            # TODO stop/restart the worker if needed, let's gather a few here first
+            Rails.logger.warn("Cooked post processor in FATAL state, bypassing. You need to urgently restart sidekiq\norig: #{orig_cooked}\nrecooked: #{recooked}\ncooked: #{cooked}\npost id: #{post.id}")
+          else
+            post.update_column(:cooked, cp.html)
+            extract_links(post)
+            post.publish_change_to_clients! :revised
+          end
+        end
+
+        if !post.user&.staff? && !post.user&.staged?
+          s = post.cooked
+          s << " #{post.topic.title}" if post.post_number == 1
+          if !args[:bypass_bump] && WordWatcher.new(s).should_flag?
+            PostActionCreator.create(Discourse.system_user, post, :inappropriate)
+          end
         end
       end
     end

From 20cfa7b810c48292fe7fe0b1a84e92a301fb9fa8 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Sat, 7 Mar 2020 15:04:12 +0200
Subject: [PATCH 0122/1830] FIX: Check if auth token exists before revocation
 (#9095)

---
 app/controllers/users_controller.rb    |  2 +-
 spec/requests/users_controller_spec.rb | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5b7bbc7022..6afac2bacb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1347,7 +1347,7 @@ class UsersController < ApplicationController
     if params[:token_id]
       token = UserAuthToken.find_by(id: params[:token_id], user_id: user.id)
       # The user should not be able to revoke the auth token of current session.
-      raise Discourse::InvalidParameters.new(:token_id) if guardian.auth_token == token.auth_token
+      raise Discourse::InvalidParameters.new(:token_id) if !token || guardian.auth_token == token.auth_token
       UserAuthToken.where(id: params[:token_id], user_id: user.id).each(&:destroy!)
 
       MessageBus.publish "/file-change", ["refresh"], user_ids: [user.id]
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 7a15170e38..0507707482 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -3935,6 +3935,20 @@ describe UsersController do
         expect(user.user_auth_tokens.first.id).to eq(ids[1])
       end
 
+      it 'checks if token exists' do
+        ids = user.user_auth_tokens.order(:created_at).pluck(:id)
+
+        post "/u/#{user.username}/preferences/revoke-auth-token.json",
+          params: { token_id: ids[0] }
+
+        expect(response.status).to eq(200)
+
+        post "/u/#{user.username}/preferences/revoke-auth-token.json",
+          params: { token_id: ids[0] }
+
+        expect(response.status).to eq(400)
+      end
+
       it 'does not let user log out of current session' do
         token = UserAuthToken.generate!(user_id: user.id)
         env = Rack::MockRequest.env_for("/", "HTTP_COOKIE" => "_t=#{token.unhashed_auth_token};")

From baea65e4bc7b7def050fb110c281146ea8c3cdcc Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Mon, 9 Mar 2020 09:22:08 +1000
Subject: [PATCH 0123/1830] FIX: Embarassing algoriths typo -> algorithms for
 security keys (#9126)

---
 .../controllers/second-factor-add-security-key.js.es6         | 4 ++--
 app/controllers/users_controller.rb                           | 2 +-
 spec/requests/users_controller_spec.rb                        | 2 +-
 test/javascripts/acceptance/preferences-test.js.es6           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
index 2cb03f968f..14b0524b1c 100644
--- a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
+++ b/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
@@ -38,7 +38,7 @@ export default Controller.extend(ModalFunctionality, {
             id: response.rp_id,
             name: response.rp_name
           },
-          supported_algoriths: response.supported_algoriths,
+          supported_algorithms: response.supported_algorithms,
           user_secure_id: response.user_secure_id,
           existing_active_credential_ids:
             response.existing_active_credential_ids
@@ -71,7 +71,7 @@ export default Controller.extend(ModalFunctionality, {
           displayName: this.model.username_lower,
           name: this.model.username_lower
         },
-        pubKeyCredParams: this.supported_algoriths.map(alg => {
+        pubKeyCredParams: this.supported_algorithms.map(alg => {
           return { type: "public-key", alg: alg };
         }),
         excludeCredentials: this.existing_active_credential_ids.map(
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6afac2bacb..9af8c2aa7e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1197,7 +1197,7 @@ class UsersController < ApplicationController
       challenge: challenge_session.challenge,
       rp_id: challenge_session.rp_id,
       rp_name: challenge_session.rp_name,
-      supported_algoriths: ::Webauthn::SUPPORTED_ALGORITHMS,
+      supported_algorithms: ::Webauthn::SUPPORTED_ALGORITHMS,
       user_secure_id: current_user.create_or_fetch_secure_identifier,
       existing_active_credential_ids: current_user.second_factor_security_key_credential_ids
     )
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 0507707482..707c61d6ba 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -3770,7 +3770,7 @@ describe UsersController do
       expect(response_parsed["user_secure_id"]).to eq(
         user.reload.create_or_fetch_secure_identifier
       )
-      expect(response_parsed["supported_algoriths"]).to eq(
+      expect(response_parsed["supported_algorithms"]).to eq(
         ::Webauthn::SUPPORTED_ALGORITHMS
       )
     end
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6
index c651c67802..46b11864ed 100644
--- a/test/javascripts/acceptance/preferences-test.js.es6
+++ b/test/javascripts/acceptance/preferences-test.js.es6
@@ -26,7 +26,7 @@ acceptance("User Preferences", {
           "a6d393d12654c130b2273e68ca25ca232d1d7f4c2464c2610fb8710a89d4",
         rp_id: "localhost",
         rp_name: "Discourse",
-        supported_algoriths: [-7, -257]
+        supported_algorithms: [-7, -257]
       });
     });
 

From b85095329465458827c36de380d9a25cc0252acf Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Mar 2020 10:01:50 +0100
Subject: [PATCH 0124/1830] FIX: ensure category and tags can be changed from
 reviewable (#9139)

---
 .../components/reviewable-field-category.js.es6        | 10 ++++++++++
 .../discourse/components/reviewable-field-tags.js.es6  |  2 ++
 .../templates/components/reviewable-field-category.hbs |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/discourse/components/reviewable-field-category.js.es6

diff --git a/app/assets/javascripts/discourse/components/reviewable-field-category.js.es6 b/app/assets/javascripts/discourse/components/reviewable-field-category.js.es6
new file mode 100644
index 0000000000..072a3720e2
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/reviewable-field-category.js.es6
@@ -0,0 +1,10 @@
+import Component from "@ember/component";
+
+export default Component.extend({
+  actions: {
+    onChange(category) {
+      this.set("value", category);
+      this.categoryChanged && this.categoryChanged(category);
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/reviewable-field-tags.js.es6 b/app/assets/javascripts/discourse/components/reviewable-field-tags.js.es6
index 9280d8ee4d..609c7c163e 100644
--- a/app/assets/javascripts/discourse/components/reviewable-field-tags.js.es6
+++ b/app/assets/javascripts/discourse/components/reviewable-field-tags.js.es6
@@ -3,6 +3,8 @@ import Component from "@ember/component";
 export default Component.extend({
   actions: {
     onChange(tags) {
+      this.set("value", tags);
+
       this.valueChanged &&
         this.valueChanged({
           target: {
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field-category.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-field-category.hbs
index f77783036c..773ae4587e 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-field-category.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-field-category.hbs
@@ -1,4 +1,4 @@
 {{category-chooser
   value=value
-  onChange=categoryChanged
+  onChange=(action "onChange")
 }}

From 8612bfb1529ef86027f4c321bbf4e2e5293fe502 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Mar 2020 10:03:46 +0100
Subject: [PATCH 0125/1830] DEV: enforces ember-template-lint:
 no-unused-block-params (#9138)

---
 .template-lintrc.js                                         | 3 ++-
 .../admin/templates/components/admin-report-table.hbs       | 2 +-
 app/assets/javascripts/discourse/templates/user/summary.hbs | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index f36c6313d2..32bbe415ed 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -8,6 +8,7 @@ module.exports = {
     "style-concatenation": true,
     "no-invalid-interactive": true,
     "link-rel-noopener": true,
-    "no-unnecessary-concat": true
+    "no-unnecessary-concat": true,
+    "no-unused-block-params": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
index f42189eb9a..8188fb3abd 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
@@ -2,7 +2,7 @@
   <thead>
     <tr>
       {{#if model.computedLabels}}
-        {{#each model.computedLabels as |label index|}}
+        {{#each model.computedLabels as |label|}}
           {{admin-report-table-header
             showSortingUI=showSortingUI
             currentSortDirection=sortDirection
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index e7d92afb82..b17c6b0254 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -75,12 +75,12 @@
     {{#user-summary-section title="top_links" class="links-section pull-left"}}
       {{#if model.links.length}}
         <ul>
+          {{!-- template-lint-disable --}}
           {{#each model.links as |link|}}
             <li>
-              {{!-- template-lint-disable  --}}
               <a class='domain'
-                 href='{{unbound link.url}}'
-                 title='{{unbound link.title}}'
+                 href={{unbound link.url}}
+                 title={{unbound link.title}}
                  rel='noopener {{unless user.removeNoFollow 'nofollow ugc'}}'
                  target='_blank'>
                 {{shorten-url link.url}}

From 60b47d622e4d8ed3644e82891138d60fb244db98 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Mar 2020 10:07:03 +0100
Subject: [PATCH 0126/1830] UX: adds support for a color setting type (#9016)

---
 .../admin/components/color-input.js.es6       | 44 +++++++++++------
 .../components/site-settings/color.js.es6     | 49 +++++++++++++++++++
 .../admin/mixins/setting-component.js.es6     |  3 +-
 .../components/site-settings/color.hbs        |  9 ++++
 .../templates/components/color-input.hbs      |  8 ++-
 .../stylesheets/common/admin/settings.scss    |  9 ++++
 config/site_settings.yml                      |  6 ++-
 lib/site_settings/type_supervisor.rb          |  1 +
 .../site_settings/type_supervisor_spec.rb     |  6 +++
 9 files changed, 117 insertions(+), 18 deletions(-)
 create mode 100644 app/assets/javascripts/admin/components/site-settings/color.js.es6
 create mode 100644 app/assets/javascripts/admin/templates/components/site-settings/color.hbs

diff --git a/app/assets/javascripts/admin/components/color-input.js.es6 b/app/assets/javascripts/admin/components/color-input.js.es6
index 8648506bf9..44fe738b43 100644
--- a/app/assets/javascripts/admin/components/color-input.js.es6
+++ b/app/assets/javascripts/admin/components/color-input.js.es6
@@ -1,5 +1,6 @@
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
+import { computed, action } from "@ember/object";
 import loadScript, { loadCSS } from "discourse/lib/load-script";
 import { observes } from "discourse-common/utils/decorators";
 
@@ -13,28 +14,45 @@ import { observes } from "discourse-common/utils/decorators";
 export default Component.extend({
   classNames: ["color-picker"],
 
+  onlyHex: true,
+
+  styleSelection: true,
+
+  maxlength: computed("onlyHex", function() {
+    return this.onlyHex ? 6 : null;
+  }),
+
+  @action
+  onHexInput(color) {
+    this.attrs.onChangeColor &&
+      this.attrs.onChangeColor((color || "").replace(/^#/, ""));
+  },
+
   @observes("hexValue", "brightnessValue", "valid")
   hexValueChanged: function() {
-    var hex = this.hexValue;
+    const hex = this.hexValue;
     let text = this.element.querySelector("input.hex-input");
 
+    this.attrs.onChangeColor && this.attrs.onChangeColor(hex);
+
     if (this.valid) {
-      text.setAttribute(
-        "style",
-        "color: " +
-          (this.brightnessValue > 125 ? "black" : "white") +
-          "; background-color: #" +
-          hex +
-          ";"
-      );
+      this.styleSelection &&
+        text.setAttribute(
+          "style",
+          "color: " +
+            (this.brightnessValue > 125 ? "black" : "white") +
+            "; background-color: #" +
+            hex +
+            ";"
+        );
 
       if (this.pickerLoaded) {
         $(this.element.querySelector(".picker")).spectrum({
-          color: "#" + this.hexValue
+          color: "#" + hex
         });
       }
     } else {
-      text.setAttribute("style", "");
+      this.styleSelection && text.setAttribute("style", "");
     }
   },
 
@@ -51,8 +69,6 @@ export default Component.extend({
         });
       });
     });
-    schedule("afterRender", () => {
-      this.hexValueChanged();
-    });
+    schedule("afterRender", () => this.hexValueChanged());
   }
 });
diff --git a/app/assets/javascripts/admin/components/site-settings/color.js.es6 b/app/assets/javascripts/admin/components/site-settings/color.js.es6
new file mode 100644
index 0000000000..5b7e40e34c
--- /dev/null
+++ b/app/assets/javascripts/admin/components/site-settings/color.js.es6
@@ -0,0 +1,49 @@
+import Component from "@ember/component";
+import { computed, action } from "@ember/object";
+
+function RGBToHex(rgb) {
+  // Choose correct separator
+  let sep = rgb.indexOf(",") > -1 ? "," : " ";
+  // Turn "rgb(r,g,b)" into [r,g,b]
+  rgb = rgb
+    .substr(4)
+    .split(")")[0]
+    .split(sep);
+
+  let r = (+rgb[0]).toString(16),
+    g = (+rgb[1]).toString(16),
+    b = (+rgb[2]).toString(16);
+
+  if (r.length === 1) r = "0" + r;
+  if (g.length === 1) g = "0" + g;
+  if (b.length === 1) b = "0" + b;
+
+  return "#" + r + g + b;
+}
+
+export default Component.extend({
+  valid: computed("value", function() {
+    let value = this.value.toLowerCase();
+
+    let testColor = new Option().style;
+    testColor.color = value;
+
+    if (!testColor.color && !value.startsWith("#")) {
+      value = `#${value}`;
+      testColor = new Option().style;
+      testColor.color = value;
+    }
+
+    let hexifiedColor = RGBToHex(testColor.color);
+    if (hexifiedColor.includes("NaN")) {
+      hexifiedColor = testColor.color;
+    }
+
+    return testColor.color && hexifiedColor === value;
+  }),
+
+  @action
+  onChangeColor(color) {
+    this.set("value", color);
+  }
+});
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index 70384c1a27..200ec00c1f 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -22,7 +22,8 @@ const CUSTOM_TYPES = [
   "secret_list",
   "upload",
   "group_list",
-  "tag_list"
+  "tag_list",
+  "color"
 ];
 
 const AUTO_REFRESH_ON_SAVE = ["logo", "logo_small", "large_icon"];
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
new file mode 100644
index 0000000000..33c66076a2
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
@@ -0,0 +1,9 @@
+{{color-input
+  hexValue=(readonly value)
+  valid=valid
+  onlyHex=false
+  styleSelection=false
+  onChangeColor=(action "onChangeColor")
+}}
+{{setting-validation-message message=validationMessage}}
+<div class="desc">{{{unbound setting.description}}}</div>
diff --git a/app/assets/javascripts/discourse/templates/components/color-input.hbs b/app/assets/javascripts/discourse/templates/components/color-input.hbs
index 3b8d76fbb8..f8d8503a38 100644
--- a/app/assets/javascripts/discourse/templates/components/color-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/color-input.hbs
@@ -1 +1,7 @@
-{{text-field class="hex-input" value=hexValue maxlength="6"}} <input class="picker" type="input">
+{{text-field
+  class="hex-input"
+  value=hexValue
+  maxlength=maxlength
+  input=(action "onHexInput" value="target.value")
+}}
+<input class="picker" type="input">
diff --git a/app/assets/stylesheets/common/admin/settings.scss b/app/assets/stylesheets/common/admin/settings.scss
index 1c0f902e04..0eb49fecb9 100644
--- a/app/assets/stylesheets/common/admin/settings.scss
+++ b/app/assets/stylesheets/common/admin/settings.scss
@@ -96,6 +96,15 @@
       font-size: $font-0;
       font-weight: normal;
     }
+
+    &.color {
+      .color-picker {
+        display: flex;
+        .picker + .sp-replacer {
+          border-left: none;
+        }
+      }
+    }
   }
   .setting.overridden {
     h3 {
diff --git a/config/site_settings.yml b/config/site_settings.yml
index a2320348a1..a1c1f93aba 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -942,7 +942,9 @@ email:
     default: false
     client: true
   apply_custom_styles_to_digest: true
-  email_accent_bg_color: "#2F70AC"
+  email_accent_bg_color:
+    type: color
+    default: "#2F70AC"
   email_accent_fg_color: "#FFFFFF"
   email_link_color: "#006699"
   show_topic_featured_link_in_digest: false
@@ -1480,7 +1482,7 @@ spam:
   auto_silence_fast_typers_max_trust_level: 0
   auto_silence_first_post_regex: ""
   high_trust_flaggers_auto_hide_posts: true
-  cooldown_hours_until_reflag: 
+  cooldown_hours_until_reflag:
     default: 24
     min: 0
 
diff --git a/lib/site_settings/type_supervisor.rb b/lib/site_settings/type_supervisor.rb
index 420c64f60b..26cc20b84e 100644
--- a/lib/site_settings/type_supervisor.rb
+++ b/lib/site_settings/type_supervisor.rb
@@ -34,6 +34,7 @@ class SiteSettings::TypeSupervisor
       group: 19,
       group_list: 20,
       tag_list: 21,
+      color: 22
     )
   end
 
diff --git a/spec/components/site_settings/type_supervisor_spec.rb b/spec/components/site_settings/type_supervisor_spec.rb
index c46cde843a..caea601178 100644
--- a/spec/components/site_settings/type_supervisor_spec.rb
+++ b/spec/components/site_settings/type_supervisor_spec.rb
@@ -82,6 +82,12 @@ describe SiteSettings::TypeSupervisor do
       it "'group_list' should be at the right position" do
         expect(SiteSettings::TypeSupervisor.types[:group_list]).to eq(20)
       end
+      it "'tag_list' should be at the right position" do
+        expect(SiteSettings::TypeSupervisor.types[:tag_list]).to eq(21)
+      end
+      it "'color' should be at the right position" do
+        expect(SiteSettings::TypeSupervisor.types[:color]).to eq(22)
+      end
     end
   end
 

From edc8d58ac345d0f2ca9a54cc7f4b97ffa3c7e2a0 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sat, 7 Mar 2020 23:34:28 +0100
Subject: [PATCH 0127/1830] FEATURE: Add site setting to disable staged user
 cleanup

... and disabled the cleanup during imports, otherwise a running Sidekiq might delete users before posts are created
---
 app/jobs/scheduled/clean_up_unused_staged_users.rb | 5 ++++-
 config/locales/server.en.yml                       | 1 +
 config/site_settings.yml                           | 4 ++++
 script/import_scripts/base.rb                      | 4 +++-
 spec/jobs/clean_up_unused_staged_users_spec.rb     | 5 +++++
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/jobs/scheduled/clean_up_unused_staged_users.rb b/app/jobs/scheduled/clean_up_unused_staged_users.rb
index 3769dffe6b..be2cd17313 100644
--- a/app/jobs/scheduled/clean_up_unused_staged_users.rb
+++ b/app/jobs/scheduled/clean_up_unused_staged_users.rb
@@ -6,12 +6,15 @@ module Jobs
     every 1.day
 
     def execute(args)
+      clean_up_after_days = SiteSetting.clean_up_unused_staged_users_after_days
+      return if clean_up_after_days <= 0
+
       destroyer = UserDestroyer.new(Discourse.system_user)
 
       User.joins("LEFT JOIN posts ON posts.user_id = users.id")
         .where("posts.user_id IS NULL")
         .where(staged: true, admin: false, moderator: false)
-        .where("users.created_at < ?", 1.year.ago)
+        .where("users.created_at < ?", clean_up_after_days.days.ago)
         .find_each do |user|
 
         begin
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 9bd64c7dbf..d0af9b7136 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1992,6 +1992,7 @@ en:
     ignored_users_message_gap_days: "How long to wait before notifying moderators again about a user who has been ignored by many others."
 
     clean_up_inactive_users_after_days: "Number of days before an inactive user (trust level 0 without any posts) is removed. To disable clean up set to 0."
+    clean_up_unused_staged_users_after_days: "Number of days before an unused staged user (without any posts) is removed. To disable clean up set to 0."
 
     user_selected_primary_groups: "Allow users to set their own primary group"
 
diff --git a/config/site_settings.yml b/config/site_settings.yml
index a1c1f93aba..d42c7f7b0b 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -589,6 +589,10 @@ users:
     default: 730
     min: 0
     max: 3650
+  clean_up_unused_staged_users_after_days:
+    default: 365
+    min: 0
+    max: 3650
   user_selected_primary_groups:
     default: false
     client: true
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index b5483d9a8b..c827bc5e7e 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -81,7 +81,9 @@ class ImportScripts::Base
       disable_emails: 'yes',
       max_attachment_size_kb: 102400,
       max_image_size_kb: 102400,
-      authorized_extensions: '*'
+      authorized_extensions: '*',
+      clean_up_inactive_users_after_days: 0,
+      clean_up_unused_staged_users_after_days: 0
     }
   end
 
diff --git a/spec/jobs/clean_up_unused_staged_users_spec.rb b/spec/jobs/clean_up_unused_staged_users_spec.rb
index ec5cad00b4..11612f75cb 100644
--- a/spec/jobs/clean_up_unused_staged_users_spec.rb
+++ b/spec/jobs/clean_up_unused_staged_users_spec.rb
@@ -32,6 +32,11 @@ RSpec.describe Jobs::CleanUpUnusedStagedUsers do
         before { staged_user.update!(moderator: true) }
         include_examples "does not delete"
       end
+
+      context "when job is disabled" do
+        before { SiteSetting.clean_up_unused_staged_users_after_days = 0 }
+        include_examples "does not delete"
+      end
     end
 
     context 'when staged user is not old enough' do

From 0e752db41106820554f1ce5c8b2a27762e161485 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sun, 8 Mar 2020 01:20:02 +0100
Subject: [PATCH 0128/1830] DEV: Improve mbox import script

* Customizable email subject prefixes to remove "Re" and "Fwd" as well as localized prefixes.
* Configuration option for prefixes like [FOO] or (BAR) which can be replaced with tags during import.
* Bugfix: Import script might have skipped some users due to missing ORDER BY.
---
 script/import_scripts/mbox/importer.rb        | 39 ++++++++++++++++++-
 script/import_scripts/mbox/settings.yml       | 17 ++++++++
 .../import_scripts/mbox/support/database.rb   |  1 +
 script/import_scripts/mbox/support/indexer.rb | 32 +--------------
 .../import_scripts/mbox/support/settings.rb   | 19 +++++++++
 5 files changed, 76 insertions(+), 32 deletions(-)

diff --git a/script/import_scripts/mbox/importer.rb b/script/import_scripts/mbox/importer.rb
index 3d823e197d..d4f8ec4794 100644
--- a/script/import_scripts/mbox/importer.rb
+++ b/script/import_scripts/mbox/importer.rb
@@ -30,6 +30,8 @@ module ImportScripts::Mbox
       if @settings.index_only
         @skip_updates = true
       else
+        SiteSetting.tagging_enabled = true if @settings.tags.present?
+
         import_categories
         import_users
         import_posts
@@ -142,9 +144,13 @@ module ImportScripts::Mbox
     end
 
     def map_first_post(row)
+      subject = row['subject']
+      tags = remove_tags!(subject)
+
       mapped = map_post(row)
       mapped[:category] = category_id_from_imported_category_id(row['category'])
-      mapped[:title] = row['subject'].strip[0...255]
+      mapped[:title] = subject.strip[0...255]
+      mapped[:tags] = tags if tags.present?
       mapped
     end
 
@@ -161,6 +167,37 @@ module ImportScripts::Mbox
       mapped
     end
 
+    def remove_tags!(subject)
+      tag_names = []
+      remove_prefixes!(subject)
+
+      loop do
+        old_length = subject.length
+
+        @settings.tags.each do |tag|
+          if subject.sub!(tag[:regex], "") && tag[:name].present?
+            tag_names << tag[:name]
+          end
+        end
+
+        remove_prefixes!(subject) if subject.length != old_length
+        break if subject.length == old_length
+      end
+
+      tag_names.uniq
+    end
+
+    def remove_prefixes!(subject)
+      # There could be multiple prefixes...
+      loop do
+        if subject.sub!(@settings.subject_prefix_regex, "")
+          subject.strip!
+        else
+          break
+        end
+      end
+    end
+
     def create_incoming_email(post, row)
       IncomingEmail.create(
         message_id: row['msg_id'],
diff --git a/script/import_scripts/mbox/settings.yml b/script/import_scripts/mbox/settings.yml
index cac3996a90..f118800100 100644
--- a/script/import_scripts/mbox/settings.yml
+++ b/script/import_scripts/mbox/settings.yml
@@ -16,3 +16,20 @@ staged: true
 index_only: false
 
 group_messages_by_subject: false
+
+# Remove prefixes like [FOO] or (BAR) from topic titles and replace them with tags.
+# You can map one or more case-insensitive prefixes to the same tag in Discourse.
+# "Tag name in Discourse": "foo"
+# "Tag name in Discourse": ["foo", "bar"]
+# You can use an empty tag name to remove prefixes without creating a tag in Discourse.
+tags:
+#  "off-topic": "ot"
+#  announcement: ["ann", "announce", "announcement"]
+#  "": ["foo", "bar"]
+
+# These prefixes will be removed from the beginning of topic titles. You can use regular expessions.
+# Prefixes are case-insensitive. You can add additional prefixes (e.g. localized prefixes from
+# https://en.wikipedia.org/wiki/List_of_email_subject_abbreviations#Abbreviations_in_other_languages).
+remove_subject_prefixes:
+  - "Re: "
+  - "Fwd?: "
\ No newline at end of file
diff --git a/script/import_scripts/mbox/support/database.rb b/script/import_scripts/mbox/support/database.rb
index ea1a6600d5..052f0d479a 100644
--- a/script/import_scripts/mbox/support/database.rb
+++ b/script/import_scripts/mbox/support/database.rb
@@ -168,6 +168,7 @@ module ImportScripts::Mbox
         SELECT email, name, date_of_first_message
         FROM user
         WHERE email > :last_email
+        ORDER BY email
         LIMIT #{@batch_size}
       SQL
 
diff --git a/script/import_scripts/mbox/support/indexer.rb b/script/import_scripts/mbox/support/indexer.rb
index fa51ef62c4..7017c2a59f 100644
--- a/script/import_scripts/mbox/support/indexer.rb
+++ b/script/import_scripts/mbox/support/indexer.rb
@@ -204,37 +204,7 @@ module ImportScripts::Mbox
 
     def extract_subject(receiver, list_name)
       subject = receiver.subject
-      return nil if subject.blank?
-
-      # TODO: make the list name (or maybe multiple names) configurable
-      # Strip mailing list name from subject
-      subject = subject.gsub(/\[#{Regexp.escape(list_name)}\]/i, '').strip
-
-      clean_subject(subject)
-    end
-
-    # TODO: refactor and move prefixes to settings
-    def clean_subject(subject)
-      original_length = subject.length
-
-      # Strip Reply prefix from title (Standard and localized)
-      subject = subject.gsub(/^Re: */i, '')
-      subject = subject.gsub(/^R: */i, '') #Italian
-      subject = subject.gsub(/^RIF: */i, '') #Italian
-
-      # Strip Forward prefix from title (Standard and localized)
-      subject = subject.gsub(/^Fwd: */i, '')
-      subject = subject.gsub(/^I: */i, '') #Italian
-
-      subject.strip
-
-      # In case of mixed localized prefixes there could be many of them
-      # if the mail client didn't strip the localized ones
-      if original_length > subject.length
-        clean_subject(subject)
-      else
-        subject
-      end
+      subject.blank? ? nil : subject.strip
     end
 
     def ignored_file?(path, checksums)
diff --git a/script/import_scripts/mbox/support/settings.rb b/script/import_scripts/mbox/support/settings.rb
index be8bd68e4c..f30c5d56d1 100644
--- a/script/import_scripts/mbox/support/settings.rb
+++ b/script/import_scripts/mbox/support/settings.rb
@@ -17,6 +17,9 @@ module ImportScripts::Mbox
     attr_reader :staged
     attr_reader :index_only
     attr_reader :group_messages_by_subject
+    attr_reader :subject_prefix_regex
+    attr_reader :automatically_remove_list_name_prefix
+    attr_reader :tags
 
     def initialize(yaml)
       @data_dir = yaml['data_dir']
@@ -27,6 +30,22 @@ module ImportScripts::Mbox
       @staged = yaml['staged']
       @index_only = yaml['index_only']
       @group_messages_by_subject = yaml['group_messages_by_subject']
+
+      unless yaml['remove_subject_prefixes'].empty?
+        prefix_regexes = yaml['remove_subject_prefixes'].map { |p| Regexp.new(p) }
+        @subject_prefix_regex = /^#{Regexp.union(prefix_regexes).source}/i
+      end
+
+      @automatically_remove_list_name_prefix = yaml['automatically_remove_list_name_prefix']
+
+      @tags = []
+      yaml['tags'].each do |tag_name, value|
+        prefixes = Regexp.union(value).source
+        @tags << {
+          regex: /^(?:(?:\[(?:#{prefixes})\])|(?:\((?:#{prefixes})\)))\s*/i,
+          name: tag_name
+        }
+      end
     end
   end
 end

From 4f372332085d1ff2dfbcc265d56e0ce7064d2899 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Mar 2020 13:44:34 +0100
Subject: [PATCH 0129/1830] DEV: enforces ember-template-lint: simple-unless
 (#9146)

---
 .template-lintrc.js                           |  3 +-
 .../templates/components/admin-report.hbs     | 46 +++++++++----------
 .../templates/components/themes-list-item.hbs |  8 ++--
 .../templates/logs/screened-ip-addresses.hbs  | 18 ++++----
 .../components/user-card-contents.hbs         |  8 ++--
 .../discourse/templates/full-page-search.hbs  |  8 ++--
 .../templates/components/multi-select.hbs     | 12 ++---
 .../templates/components/single-select.hbs    | 16 +++----
 8 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 32bbe415ed..f96f46f419 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -9,6 +9,7 @@ module.exports = {
     "no-invalid-interactive": true,
     "link-rel-noopener": true,
     "no-unnecessary-concat": true,
-    "no-unused-block-params": true
+    "no-unused-block-params": true,
+    "simple-unless": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index 0c7009cc82..be9c2ee8d7 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -58,7 +58,28 @@
 
   <div class="body">
     <div class="main">
-      {{#unless showError}}
+      {{#if showError}}
+        {{#if showTimeoutError}}
+          <div class="alert alert-error report-alert timeout">
+            {{d-icon "exclamation-triangle"}}
+            <span>{{i18n "admin.dashboard.timeout_error"}}</span>
+          </div>
+        {{/if}}
+
+        {{#if showExceptionError}}
+          <div class="alert alert-error report-alert exception">
+            {{d-icon "exclamation-triangle"}}
+            <span>{{i18n "admin.dashboard.exception_error"}}</span>
+          </div>
+        {{/if}}
+
+        {{#if showNotFoundError}}
+          <div class="alert alert-error report-alert not-found">
+            {{d-icon "exclamation-triangle"}}
+            <span>{{i18n "admin.dashboard.not_found_error"}}</span>
+          </div>
+        {{/if}}
+      {{else}}
         {{#if hasData}}
           {{#if currentMode}}
             {{component modeComponent model=model options=options}}
@@ -91,28 +112,7 @@
             </div>
           {{/if}}
         {{/if}}
-      {{else}}
-        {{#if showTimeoutError}}
-          <div class="alert alert-error report-alert timeout">
-            {{d-icon "exclamation-triangle"}}
-            <span>{{i18n "admin.dashboard.timeout_error"}}</span>
-          </div>
-        {{/if}}
-
-        {{#if showExceptionError}}
-          <div class="alert alert-error report-alert exception">
-            {{d-icon "exclamation-triangle"}}
-            <span>{{i18n "admin.dashboard.exception_error"}}</span>
-          </div>
-        {{/if}}
-
-        {{#if showNotFoundError}}
-          <div class="alert alert-error report-alert not-found">
-            {{d-icon "exclamation-triangle"}}
-            <span>{{i18n "admin.dashboard.not_found_error"}}</span>
-          </div>
-        {{/if}}
-      {{/unless}}
+      {{/if}}
     </div>
 
     {{#if showFilteringUI}}
diff --git a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
index 363ca394ec..1286937f8a 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
@@ -7,7 +7,9 @@
     </span>
 
     <span class="icons">
-      {{#unless theme.selected}}
+      {{#if theme.selected}}
+        {{d-icon "caret-right"}}
+      {{else}}
         {{#if theme.default}}
           {{d-icon "check" class="default-indicator" title="admin.customize.theme.default_theme_tooltip"}}
         {{/if}}
@@ -20,9 +22,7 @@
         {{#unless theme.enabled}}
           {{d-icon "ban" class="light-grey-icon" title="admin.customize.theme.disabled_component_tooltip"}}
         {{/unless}}
-      {{else}}
-        {{d-icon "caret-right"}}
-      {{/unless}}
+      {{/if}}
     </span>
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
index f9220965a2..96a185fb17 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
@@ -76,7 +76,14 @@
             {{/if}}
           </td>
           <td class="col actions">
-            {{#unless item.editing}}
+            {{#if item.editing}}
+              {{d-button
+                class="btn-default"
+                action=(action "save")
+                actionParam=item
+                label="admin.logs.save"}}
+              <a href {{action "cancel" item}}>{{i18n "cancel"}}</a>
+            {{else}}
               {{d-button
                 class="btn-default btn-danger"
                 action=(action "destroy")
@@ -102,14 +109,7 @@
                   icon="ban"
                   label="admin.logs.screened_ips.actions.block"}}
               {{/if}}
-            {{else}}
-              {{d-button
-                class="btn-default"
-                action=(action "save")
-                actionParam=item
-                label="admin.logs.save"}}
-              <a href {{action "cancel" item}}>{{i18n "cancel"}}</a>
-            {{/unless}}
+            {{/if}}
           </td>
         </tr>
       {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index 8319d233e1..f6956782a9 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -52,13 +52,13 @@
             {{/if}}
           </h1>
           {{plugin-outlet name="user-card-after-username" args=(hash user=user showUser=(action "showUser" user)) tagName=''}}
-          {{#unless nameFirst}}
+          {{#if nameFirst}}
+            <h2 class='username'>{{username}}</h2>
+          {{else}}
             {{#if user.name}}
               <h2 class='full-name'>{{user.name}}</h2>
             {{/if}}
-          {{else}}
-            <h2 class='username'>{{username}}</h2>
-          {{/unless}}
+          {{/if}}
           {{#if user.title}}
             <h2>{{user.title}}</h2>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index c60aaf0dd1..760369fff8 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -67,7 +67,9 @@
 
     {{plugin-outlet name="full-page-search-below-search-info" args=(hash search=searchTerm)}}
 
-    {{#unless searching}}
+    {{#if searching}}
+      {{loading-spinner size="medium"}}
+    {{else}}
       <div class="search-results">
         {{#load-more selector=".fps-result" action=(action "loadMore")}}
           {{#each model.posts as |result|}}
@@ -172,9 +174,7 @@
           {{/conditional-loading-spinner}}
         {{/load-more}}
       </div>
-    {{else}}
-      {{loading-spinner size="medium"}}
-    {{/unless}}
+    {{/if}}
   </div>
 
   <div class="search-advanced-sidebar">
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
index 3d8399f48d..c2b12d8b7c 100644
--- a/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
@@ -7,7 +7,11 @@
   }}
 
   {{#select-kit/select-kit-body selectKit=selectKit}}
-    {{#unless selectKit.isLoading}}
+    {{#if selectKit.isLoading}}
+      <span class="is-loading">
+        {{loading-spinner size="small"}}
+      </span>
+    {{else}}
       {{#if selectKit.filter}}
       {{#if selectKit.hasNoContent}}
         <span class="no-content">
@@ -23,11 +27,7 @@
           value=value
         }}
       {{/each}}
-    {{else}}
-      <span class="is-loading">
-        {{loading-spinner size="small"}}
-      </span>
-    {{/unless}}
+    {{/if}}
   {{/select-kit/select-kit-body}}
 
   <div class="select-kit-wrapper"></div>
diff --git a/app/assets/javascripts/select-kit/templates/components/single-select.hbs b/app/assets/javascripts/select-kit/templates/components/single-select.hbs
index 19f2d48d44..9e210f7317 100644
--- a/app/assets/javascripts/select-kit/templates/components/single-select.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/single-select.hbs
@@ -9,7 +9,13 @@
   {{#select-kit/select-kit-body selectKit=selectKit}}
     {{component selectKit.options.filterComponent selectKit=selectKit}}
 
-    {{#unless selectKit.isLoading}}
+    {{#if selectKit.isLoading}}
+      <span class="is-loading">
+        {{#if site}}
+          {{loading-spinner size="small"}}
+        {{/if}}
+      </span>
+    {{else}}
       {{#if selectKit.filter}}
       {{#if selectKit.hasNoContent}}
         <span class="no-content">
@@ -25,13 +31,7 @@
           value=value
         }}
       {{/each}}
-    {{else}}
-      <span class="is-loading">
-        {{#if site}}
-          {{loading-spinner size="small"}}
-        {{/if}}
-      </span>
-    {{/unless}}
+    {{/if}}
   {{/select-kit/select-kit-body}}
 
   <div class="select-kit-wrapper"></div>

From 345ac6cb67ba5097a13744d58c727550280cfb18 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Mar 2020 15:05:54 +0100
Subject: [PATCH 0130/1830] FIX: removes legacy refreshQueryWithoutTransition
 (#9145)

This was causing the history state from period query params to get messedup when going back.
---
 app/assets/javascripts/discourse/routes/users.js.es6 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/routes/users.js.es6 b/app/assets/javascripts/discourse/routes/users.js.es6
index b500a985b5..4fec3c1604 100644
--- a/app/assets/javascripts/discourse/routes/users.js.es6
+++ b/app/assets/javascripts/discourse/routes/users.js.es6
@@ -10,8 +10,6 @@ export default DiscourseRoute.extend({
     exclude_usernames: { refreshModel: true }
   },
 
-  refreshQueryWithoutTransition: true,
-
   titleToken() {
     return I18n.t("directory.title");
   },

From f1bb1db354ae3c2bef1232626cb54ef8bab78831 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Mar 2020 15:28:31 +0100
Subject: [PATCH 0131/1830] DEV: enforces ember-template-lint: no-unbound
 (#9147)

From ember-template-lint documentation (https://github.com/ember-template-lint/ember-template-lint/blob/master/docs/rule/no-unbound.md):

```
{{unbound}} is a legacy hold over from the days in which Ember's template engine was less performant. Its use today is vestigial, and it no longer offers performance benefits.

It is also a poor practice to use it for rendering only the initial value of a property that may later change.
```

Co-Authored-By: Jarek Radosz <jradosz@gmail.com>
---
 .template-lintrc.js                                       | 1 +
 .../admin/templates/components/site-setting.hbs           | 2 +-
 .../admin/templates/components/site-settings/bool.hbs     | 2 +-
 .../templates/components/site-settings/category-list.hbs  | 2 +-
 .../admin/templates/components/site-settings/category.hbs | 2 +-
 .../admin/templates/components/site-settings/color.hbs    | 2 +-
 .../templates/components/site-settings/compact-list.hbs   | 2 +-
 .../admin/templates/components/site-settings/enum.hbs     | 2 +-
 .../templates/components/site-settings/group-list.hbs     | 2 +-
 .../templates/components/site-settings/host-list.hbs      | 2 +-
 .../admin/templates/components/site-settings/list.hbs     | 2 +-
 .../templates/components/site-settings/secret-list.hbs    | 2 +-
 .../admin/templates/components/site-settings/string.hbs   | 2 +-
 .../admin/templates/components/site-settings/tag-list.hbs | 2 +-
 .../admin/templates/components/site-settings/upload.hbs   | 2 +-
 .../components/site-settings/uploaded-image-list.hbs      | 2 +-
 .../admin/templates/components/site-settings/url-list.hbs | 2 +-
 .../templates/components/site-settings/value-list.hbs     | 2 +-
 app/assets/javascripts/admin/templates/email-bounced.hbs  | 2 +-
 app/assets/javascripts/admin/templates/email-received.hbs | 4 ++--
 app/assets/javascripts/admin/templates/email-rejected.hbs | 6 +++---
 app/assets/javascripts/admin/templates/email-sent.hbs     | 2 +-
 app/assets/javascripts/admin/templates/email-skipped.hbs  | 2 +-
 app/assets/javascripts/admin/templates/emojis.hbs         | 2 +-
 app/assets/javascripts/admin/templates/permalinks.hbs     | 8 ++++----
 .../javascripts/admin/templates/search-logs-term.hbs      | 8 ++++----
 app/assets/javascripts/admin/templates/user-badges.hbs    | 2 +-
 app/assets/javascripts/admin/templates/user-index.hbs     | 4 ++--
 .../javascripts/admin/templates/users-list-show.hbs       | 6 +++---
 .../javascripts/discourse/templates/badges/show.hbs       | 2 +-
 .../templates/components/categories-boxes-topic.hbs       | 2 +-
 .../templates/components/categories-boxes-with-topics.hbs | 2 +-
 .../discourse/templates/components/categories-boxes.hbs   | 2 +-
 .../discourse/templates/components/category-unread.hbs    | 4 ++--
 .../discourse/templates/components/choose-message.hbs     | 2 +-
 .../discourse/templates/components/choose-topic.hbs       | 2 +-
 .../discourse/templates/components/featured-topic.hbs     | 8 ++++----
 .../discourse/templates/components/flag-action-type.hbs   | 4 ++--
 .../discourse/templates/components/group-post.hbs         | 2 +-
 .../discourse/templates/components/ip-lookup.hbs          | 2 +-
 .../discourse/templates/components/share-source.hbs       | 2 +-
 .../discourse/templates/components/user-info.hbs          | 8 ++++----
 .../discourse/templates/components/user-summary-topic.hbs | 2 +-
 app/assets/javascripts/discourse/templates/composer.hbs   | 2 +-
 .../javascripts/discourse/templates/full-page-search.hbs  | 8 ++++----
 .../templates/mobile/components/basic-topic-list.hbs      | 2 +-
 .../discourse/templates/modal/bulk-notification-level.hbs | 4 ++--
 .../javascripts/discourse/templates/outlet-list.hbs       | 2 +-
 .../discourse/templates/preferences/categories.hbs        | 6 +++---
 app/assets/javascripts/discourse/templates/topic.hbs      | 6 +++---
 .../javascripts/discourse/templates/user-invited-show.hbs | 6 +++---
 .../javascripts/discourse/templates/user/summary.hbs      | 6 +++---
 .../components/discourse-local-dates-create-form.hbs      | 4 ++--
 53 files changed, 86 insertions(+), 85 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index f96f46f419..6783c6d94e 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -10,6 +10,7 @@ module.exports = {
     "link-rel-noopener": true,
     "no-unnecessary-concat": true,
     "no-unused-block-params": true,
+    "no-unbound": true,
     "simple-unless": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs
index 649df86a4f..23eee45b6d 100644
--- a/app/assets/javascripts/admin/templates/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-setting.hbs
@@ -1,5 +1,5 @@
 <div class='setting-label'>
-   <h3>{{unbound settingName}}</h3>
+   <h3>{{settingName}}</h3>
    {{#if defaultIsAvailable}}
      <a href onClick={{action 'setDefaultValues'}}>{{setting.setDefaultValuesLabel}}</a>
    {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
index 5892174168..1c6c2101ae 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
@@ -1,5 +1,5 @@
 <label>
   {{input type="checkbox" checked=enabled}}
-  <span>{{{unbound setting.description}}}</span>
+  <span>{{{setting.description}}}</span>
   {{setting-validation-message message=validationMessage}}
 </label>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
index 14d7210604..6d8871b306 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
@@ -3,5 +3,5 @@
   onChange=(action "onChangeSelectedCategories")
 }}
 
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
index d6b6bee565..4f23fcc021 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
@@ -4,4 +4,4 @@
   onChange=(action (mut value))
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
index 33c66076a2..baf81ab389 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
@@ -6,4 +6,4 @@
   onChangeColor=(action "onChangeColor")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class="desc">{{{unbound setting.description}}}</div>
+<div class="desc">{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
index 86fce97f15..621baec0b1 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
@@ -8,4 +8,4 @@
 }}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
index 86faf57d75..dc33e28df5 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
@@ -15,5 +15,5 @@
 {{setting-validation-message message=validationMessage}}
 
 <div class='desc'>
-  {{{unbound setting.description}}}
+  {{{setting.description}}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
index 768311c3f9..8f4263a72e 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
@@ -7,4 +7,4 @@
   onChange=(action "onChangeGroupListSetting")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
index 5107f5b4af..5277c26c69 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_host"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
index 0abde37586..268723c92d 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value inputDelimiter="|" choices=setting.choices}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
index e77ddbb520..a4ff6f1bd4 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
@@ -1,3 +1,3 @@
 {{secret-value-list setting=setting values=value isSecret=isSecret}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
index a2c53a1ee6..d71278f723 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
@@ -7,4 +7,4 @@
 {{/if}}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
index 84c6623cfb..271e4d0326 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
@@ -1,3 +1,3 @@
 {{tag-chooser tags=selectedTags}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
index 51711eee27..86940d8633 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
@@ -1,2 +1,2 @@
 {{site-settings-image-uploader imageUrl=value placeholderUrl=setting.placeholder type="site_setting"}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
index 86750e634d..82dc38d653 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
@@ -1,2 +1,2 @@
 {{d-button label="admin.site_settings.uploaded_image_list.label" action=(action "showUploadModal") actionParam=(hash value=value setting=setting)}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
index 41213777e3..67db58f8ea 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_url"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
index caaf3739d7..3003b375ee 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{unbound setting.description}}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/email-bounced.hbs b/app/assets/javascripts/admin/templates/email-bounced.hbs
index 0387050d8f..9868012f2c 100644
--- a/app/assets/javascripts/admin/templates/email-bounced.hbs
+++ b/app/assets/javascripts/admin/templates/email-bounced.hbs
@@ -27,7 +27,7 @@
               &mdash;
             {{/if}}
           </td>
-          <td><a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a></td>
+          <td><a href='mailto:{{l.to_address}}'>{{l.to_address}}</a></td>
           {{#if l.has_bounce_key}}
             <td><a href {{action "showIncomingEmail" l.id}}>{{l.email_type}}</a></td>
           {{else}}
diff --git a/app/assets/javascripts/admin/templates/email-received.hbs b/app/assets/javascripts/admin/templates/email-received.hbs
index 5fc983557e..aff40a6601 100644
--- a/app/assets/javascripts/admin/templates/email-received.hbs
+++ b/app/assets/javascripts/admin/templates/email-received.hbs
@@ -34,10 +34,10 @@
           </td>
           <td class="addresses">
             {{#each email.to_addresses as |to|}}
-              <p><a href="mailto:{{unbound to}}" title="TO">{{unbound to}}</a></p>
+              <p><a href="mailto:{{to}}" title="TO">{{to}}</a></p>
             {{/each}}
             {{#each email.cc_addresses as |cc|}}
-              <p><a href="mailto:{{unbound cc}}" title="CC">{{unbound cc}}</a></p>
+              <p><a href="mailto:{{cc}}" title="CC">{{cc}}</a></p>
             {{/each}}
           </td>
           <td>
diff --git a/app/assets/javascripts/admin/templates/email-rejected.hbs b/app/assets/javascripts/admin/templates/email-rejected.hbs
index e3595a58bd..9cc9710660 100644
--- a/app/assets/javascripts/admin/templates/email-rejected.hbs
+++ b/app/assets/javascripts/admin/templates/email-rejected.hbs
@@ -31,7 +31,7 @@
                 {{/link-to}}
               {{else}}
                 {{#if email.from_address}}
-                  <a href='mailto:{{unbound email.from_address}}'>{{email.from_address}}</a>
+                  <a href='mailto:{{email.from_address}}'>{{email.from_address}}</a>
                 {{else}}
                   &mdash;
                 {{/if}}
@@ -40,10 +40,10 @@
           </td>
           <td class="addresses">
             {{#each email.to_addresses as |to|}}
-              <p><a href="mailto:{{unbound to}}" title="TO">{{unbound to}}</a></p>
+              <p><a href="mailto:{{to}}" title="TO">{{to}}</a></p>
             {{/each}}
             {{#each email.cc_addresses as |cc|}}
-              <p><a href="mailto:{{unbound cc}}" title="CC">{{unbound cc}}</a></p>
+              <p><a href="mailto:{{cc}}" title="CC">{{cc}}</a></p>
             {{/each}}
           </td>
           <td>{{email.subject}}</td>
diff --git a/app/assets/javascripts/admin/templates/email-sent.hbs b/app/assets/javascripts/admin/templates/email-sent.hbs
index c1ad376b6c..633b81cb3d 100644
--- a/app/assets/javascripts/admin/templates/email-sent.hbs
+++ b/app/assets/javascripts/admin/templates/email-sent.hbs
@@ -31,7 +31,7 @@
           </td>
           <td>
             {{#if l.bounced}}{{d-icon "redo" title="admin.email.bounced"}}{{/if}}
-            <a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a>
+            <a href='mailto:{{l.to_address}}'>{{l.to_address}}</a>
           </td>
           <td>{{l.email_type}}</td>
           <td class='post-link'>
diff --git a/app/assets/javascripts/admin/templates/email-skipped.hbs b/app/assets/javascripts/admin/templates/email-skipped.hbs
index 76ddb1197e..da27e86914 100644
--- a/app/assets/javascripts/admin/templates/email-skipped.hbs
+++ b/app/assets/javascripts/admin/templates/email-skipped.hbs
@@ -29,7 +29,7 @@
               &mdash;
             {{/if}}
           </td>
-          <td><a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a></td>
+          <td><a href='mailto:{{l.to_address}}'>{{l.to_address}}</a></td>
           <td>{{l.email_type}}</td>
           <td>
             {{#if l.post_url}}
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index d08f2ed547..5f9de8104c 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -18,7 +18,7 @@
         <tbody>
           {{#each sortedEmojis as |e|}}
             <tr>
-              <th><img class="emoji emoji-custom" src={{unbound e.url}} title={{unbound e.name}}></th>
+              <th><img class="emoji emoji-custom" src={{e.url}} title={{e.name}}></th>
               <th>:{{e.name}}:</th>
               <th>
                 {{d-button
diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs
index ac933f09c3..7c7ac2df6b 100644
--- a/app/assets/javascripts/admin/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/templates/permalinks.hbs
@@ -27,22 +27,22 @@
             <td class="col first url">{{pl.url}}</td>
             <td class="col topic">
               {{#if pl.topic_id}}
-                <a href={{unbound pl.topic_url}}>{{pl.topic_title}}</a>
+                <a href={{pl.topic_url}}>{{pl.topic_title}}</a>
               {{/if}}
             </td>
             <td class="col post">
               {{#if pl.post_id}}
-                <a href={{unbound pl.post_url}}>#{{pl.post_number}} {{pl.post_topic_title}}</a>
+                <a href={{pl.post_url}}>#{{pl.post_number}} {{pl.post_topic_title}}</a>
               {{/if}}
             </td>
             <td class="col category">
               {{#if pl.category_id}}
-                <a href={{unbound pl.category_url}}>{{pl.category_name}}</a>
+                <a href={{pl.category_url}}>{{pl.category_name}}</a>
               {{/if}}
             </td>
             <td class="col external_url">
               {{#if pl.external_url}}
-                <a href={{unbound pl.external_url}}>{{pl.external_url}}</a>
+                <a href={{pl.external_url}}>{{pl.external_url}}</a>
               {{/if}}
             </td>
             <td class="col action">
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 339cf2d169..78bd54afb9 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -23,15 +23,15 @@
   {{#each model.search_result.posts as |result|}}
     <div class='fps-result'>
       <div class='author'>
-        <a href={{result.userPath}} data-user-card={{unbound result.username}}>
+        <a href={{result.userPath}} data-user-card={{result.username}}>
           {{avatar result imageSize="large"}}
         </a>
       </div>
 
       <div class='fps-topic'>
         <div class='topic'>
-          <a class='search-link' href={{unbound result.url}}>
-            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
+          <a class='search-link' href={{result.url}}>
+            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{{result.topic.fancyTitle}}}{{/highlight-text}}</span>
           </a>
 
           <div class='search-category'>
@@ -55,7 +55,7 @@
 
           {{#if result.blurb}}
             {{#highlight-text highlight=term}}
-              {{{unbound result.blurb}}}
+              {{{result.blurb}}}
             {{/highlight-text}}
           {{/if}}
         </div>
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index c93e7fb462..39d227bcf8 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -55,7 +55,7 @@
             </td>
             <td class='reason'>
               {{#if userBadge.postUrl}}
-              <a href={{unbound userBadge.postUrl}}>{{userBadge.topic_title}}</a>
+              <a href={{userBadge.postUrl}}>{{userBadge.topic_title}}</a>
               {{/if}}
             </td>
             <td>{{age-with-tooltip userBadge.granted_at}}</td>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 5707142ff3..207120eea8 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -59,7 +59,7 @@
           <div class="controls">{{i18n "admin.users.not_verified"}}</div>
         {{/unless}}
         {{#if model.email}}
-          <a href="mailto:{{unbound model.email}}">{{model.email}}</a>
+          <a href="mailto:{{model.email}}">{{model.email}}</a>
         {{else}}
           {{d-button
             class="btn-default"
@@ -79,7 +79,7 @@
           {{#if model.secondary_emails}}
             <ul>
               {{#each model.secondary_emails as |email| }}
-                <li><a href="mailto:{{unbound email}}">{{email}}</a></li>
+                <li><a href="mailto:{{email}}">{{email}}</a></li>
               {{/each}}
             </ul>
           {{else}}
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 127b7446c0..7d096573b0 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -40,16 +40,16 @@
         {{#each model as |user|}}
           <tr class="user {{user.selected}} {{unless user.active 'not-activated'}}">
             <td class="username">
-              <a href={{unbound user.path}} data-user-card={{unbound user.username}}>
+              <a href={{user.path}} data-user-card={{user.username}}>
                 {{avatar user imageSize="small"}}
               </a>
-              {{#link-to 'adminUser' user}}{{unbound user.username}}{{/link-to}}
+              {{#link-to 'adminUser' user}}{{user.username}}{{/link-to}}
               {{#if user.staged}}
                 {{d-icon "far-envelope" title="user.staged" }}
               {{/if}}
             </td>
             <td class='email'>
-              {{~unbound user.email~}}
+              {{~user.email~}}
             </td>
             <td class="last-emailed">
               <div class="label">{{i18n 'admin.users.last_emailed'}}</div>
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 12ba951aac..09ded422b3 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -42,7 +42,7 @@
           {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
             <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
             {{#if ub.post_number}}
-              <a class="post-link" href="{{unbound ub.topic.url}}/{{unbound ub.post_number}}">{{{ub.topic.fancyTitle}}}</a>
+              <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{{ub.topic.fancyTitle}}}</a>
             {{/if}}
           {{/user-info}}
         {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
index 1e6fd8be89..b95a06db7a 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
@@ -1,5 +1,5 @@
 {{d-icon topicStatusIcon}}
 
-<a class='title' href={{unbound topic.lastUnreadUrl}}>
+<a class='title' href={{topic.lastUnreadUrl}}>
   {{text-overflow class="overflow" text=topic.fancyTitle}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
index 6df50c4eef..4ce13a1584 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
@@ -1,5 +1,5 @@
 {{#each categories as |c|}}
-  <div class='category category-box category-box-{{unbound c.slug}}' style={{border-color c.color}}>
+  <div class='category category-box category-box-{{c.slug}}' style={{border-color c.color}}>
     <div class='category-box-inner'>
       <div class='category-box-heading'>
         <a href={{c.url}}>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index 888eefce97..5dc594c691 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -1,5 +1,5 @@
 {{#each categories as |c|}}
-  <div class='category category-box category-box-{{unbound c.slug}}' style={{border-color c.color}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}}
+  <div class='category category-box category-box-{{c.slug}}' style={{border-color c.color}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}}
    data-url={{c.url}}>
     <div class='category-box-inner'>
       <div class="category-logo">
diff --git a/app/assets/javascripts/discourse/templates/components/category-unread.hbs b/app/assets/javascripts/discourse/templates/components/category-unread.hbs
index 16eef33fc9..15604d0f3c 100644
--- a/app/assets/javascripts/discourse/templates/components/category-unread.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-unread.hbs
@@ -1,6 +1,6 @@
 {{#if category.unreadTopics}}
-  <a href={{unbound category.unreadUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.unread_topics' count=category.unreadTopics}}>{{i18n 'filters.unread.lower_title_with_count' count=category.unreadTopics}}</a>
+  <a href={{category.unreadUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.unread_topics' count=category.unreadTopics}}>{{i18n 'filters.unread.lower_title_with_count' count=category.unreadTopics}}</a>
 {{/if}}
 {{#if category.newTopics}}
-  <a href={{unbound category.newUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.new_topics' count=category.newTopics}}>{{i18n 'filters.new.lower_title_with_count' count=category.newTopics}}</a>
+  <a href={{category.newUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.new_topics' count=category.newTopics}}>{{i18n 'filters.new.lower_title_with_count' count=category.newTopics}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/choose-message.hbs b/app/assets/javascripts/discourse/templates/components/choose-message.hbs
index fa4f10d30e..6c21242484 100644
--- a/app/assets/javascripts/discourse/templates/components/choose-message.hbs
+++ b/app/assets/javascripts/discourse/templates/components/choose-message.hbs
@@ -11,7 +11,7 @@
     {{#each messages as |m|}}
       <div class='controls existing-message'>
         <label class='radio'>
-          <input type='radio' id="choose-message-{{unbound m.id}}" name='choose_message_id' {{action "chooseMessage" m}}>
+          <input type='radio' id="choose-message-{{m.id}}" name='choose_message_id' {{action "chooseMessage" m}}>
           <span class="message-title">
             {{m.title}}
           </span>
diff --git a/app/assets/javascripts/discourse/templates/components/choose-topic.hbs b/app/assets/javascripts/discourse/templates/components/choose-topic.hbs
index da9ca0a3de..2e5921d0e7 100644
--- a/app/assets/javascripts/discourse/templates/components/choose-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/choose-topic.hbs
@@ -11,7 +11,7 @@
     {{#each topics as |t|}}
       <div class='controls existing-topic'>
         <label class='radio'>
-          <input type='radio' id="choose-topic-{{unbound t.id}}" name='choose_topic_id' {{action "chooseTopic" t}}>
+          <input type='radio' id="choose-topic-{{t.id}}" name='choose_topic_id' {{action "chooseTopic" t}}>
           {{raw "topic-status" topic=t}}
           <span class="topic-title">
             {{t.title}}
diff --git a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
index aed5312bfa..655ca8c16e 100644
--- a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
@@ -1,12 +1,12 @@
 {{raw "topic-status" topic=topic}}
-<a class='title' href={{unbound topic.lastUnreadUrl}}>{{{unbound topic.fancyTitle}}}</a>
+<a class='title' href={{topic.lastUnreadUrl}}>{{{topic.fancyTitle}}}</a>
 {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
 
 {{#if latestTopicOnly}}
   <div class='last-user-info'>
-    {{i18n 'categories.latest_by'}} <a href={{{unbound topic.lastPosterUrl}}}>{{unbound topic.last_poster.username}}</a>
-    <a href={{unbound topic.lastPostUrl}}>{{format-age topic.last_posted_at}}</a>
+    {{i18n 'categories.latest_by'}} <a href={{{topic.lastPosterUrl}}}>{{topic.last_poster.username}}</a>
+    <a href={{topic.lastPostUrl}}>{{format-age topic.last_posted_at}}</a>
   </div>
 {{else}}
-  <a href={{unbound topic.lastPostUrl}} class="last-posted-at">{{format-age topic.last_posted_at}}</a>
+  <a href={{topic.lastPostUrl}} class="last-posted-at">{{format-age topic.last_posted_at}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
index 4d7cf58049..e6fe7ca516 100644
--- a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
@@ -2,7 +2,7 @@
   <h3>{{formattedName}}</h3>
   <div class='controls'>
     <label class='radio'>
-      <input type='radio' id="radio_{{unbound flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
+      <input type='radio' id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
 
       <div class='flag-action-type-details'>
         <span class='description'>{{{flag.description}}}</span>
@@ -20,7 +20,7 @@
 {{else}}
   <div class="controls {{flag.name_key}}">
     <label class='radio'>
-      <input type='radio' id="radio_{{unbound flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
+      <input type='radio' id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
       <div class='flag-action-type-details'>
         <strong>{{formattedName}}</strong>
         {{#if showDescription}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index a39e71f9ae..d9880b54b6 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -1,5 +1,5 @@
 <div class='clearfix info'>
-    <a href={{unbound post.user.userUrl}} data-user-card={{unbound post.user.username}} class='avatar-link'>
+    <a href={{post.user.userUrl}} data-user-card={{post.user.username}} class='avatar-link'>
       {{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
     </a>
     <span class='time'>{{format-date post.created_at leaveAgo="true"}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 347823e2ef..dce5918f52 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -25,7 +25,7 @@
         <dt>{{i18n "ip_lookup.location"}}</dt>
         <dd>
           {{#if location.location}}
-            <a href="https://maps.google.com/maps?q={{unbound location.latitude}},{{unbound location.longitude}}" rel="noopener" target="_blank">
+            <a href="https://maps.google.com/maps?q={{location.latitude}},{{location.longitude}}" rel="noopener" target="_blank">
               {{location.location}}
             </a>
           {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-source.hbs b/app/assets/javascripts/discourse/templates/components/share-source.hbs
index 7680c6b861..32fa1adb65 100644
--- a/app/assets/javascripts/discourse/templates/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-source.hbs
@@ -1,4 +1,4 @@
-<a href {{action "share" source}} title={{unbound source.title}} aria-label={{unbound source.title}}>
+<a href {{action "share" source}} title={{source.title}} aria-label={{source.title}}>
   {{#if source.icon}}
     {{d-icon source.icon}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-info.hbs b/app/assets/javascripts/discourse/templates/components/user-info.hbs
index 46691e39ea..6c3e7aaceb 100644
--- a/app/assets/javascripts/discourse/templates/components/user-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-info.hbs
@@ -1,6 +1,6 @@
 <div class="user-image">
   <div class="user-image-inner">
-    <a href={{unbound userPath}} data-user-card={{unbound user.username}}>{{avatar user imageSize="large"}}</a>
+    <a href={{userPath}} data-user-card={{user.username}}>{{avatar user imageSize="large"}}</a>
     {{#if user.primary_group_name}}
       {{avatar-flair
         flairURL=user.primary_group_flair_url
@@ -13,10 +13,10 @@
 
 <div class="user-detail">
   <div class='name-line'>
-    <span class="username"><a href={{unbound userPath}} data-user-card={{unbound user.username}}>{{format-username user.username}}</a></span>
-    <span class="name">{{unbound name}}</span>
+    <span class="username"><a href={{userPath}} data-user-card={{user.username}}>{{format-username user.username}}</a></span>
+    <span class="name">{{name}}</span>
   </div>
-  <div class="title">{{unbound user.title}}</div>
+  <div class="title">{{user.title}}</div>
 
   {{#if hasBlock}}
     <div class='details'>
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
index 7b31dfff86..07f7c03cd8 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -6,4 +6,4 @@
   {{/if}}
 </span>
 <br>
-<a href={{unbound url}}>{{{topic.fancyTitle}}}</a>
+<a href={{url}}>{{{topic.fancyTitle}}}</a>
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 987e5e714f..ce1e7af458 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -213,7 +213,7 @@
       {{else}}
         <div class='saving-text'>
           {{#if model.createdPost}}
-            {{i18n 'composer.saved'}} <a class='permalink' href={{unbound createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
+            {{i18n 'composer.saved'}} <a class='permalink' href={{createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
           {{else}}
             {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 760369fff8..355e18f1b8 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -75,7 +75,7 @@
           {{#each model.posts as |result|}}
             <div class='fps-result'>
               <div class='author'>
-                <a href={{result.userPath}} data-user-card={{unbound result.username}}>
+                <a href={{result.userPath}} data-user-card={{result.username}}>
                   {{avatar result imageSize="large"}}
                 </a>
               </div>
@@ -86,9 +86,9 @@
                     {{track-selected selectedList=selected selectedId=result.topic}}
                   {{/if}}
 
-                  <a class='search-link' href={{unbound result.url}} {{action "logClick" result.topic_id}}>
+                  <a class='search-link' href={{result.url}} {{action "logClick" result.topic_id}}>
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
-                    <span class='topic-title'>{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
+                    <span class='topic-title'>{{#highlight-text highlight=q}}{{{result.topic.fancyTitle}}}{{/highlight-text}}</span>
                   </a>
 
                   <div class='search-category'>
@@ -113,7 +113,7 @@
 
                   {{#if result.blurb}}
                     {{#highlight-text highlight=highlightQuery}}
-                      {{{unbound result.blurb}}}
+                      {{{result.blurb}}}
                     {{/highlight-text}}
                   {{/if}}
                 </div>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index a7484723f1..d8a06c33c7 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -26,7 +26,7 @@
                 <div class="topic-excerpt">
                   {{{t.excerpt}}}
                   {{#if t.excerptTruncated}}
-                    {{#unless t.canClearPin}}<a href={{unbound t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
+                    {{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
                   {{/if}}
                   {{#if t.canClearPin}}
                     <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>{{i18n 'topic.clear_pin.title'}}</a>
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
index 8a780d2279..97f8003781 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
@@ -1,8 +1,8 @@
 {{#each notificationLevels as |level|}}
   <div class='controls'>
     <label class='radio'>
-      {{radio-button value=level.id name="notification_level" selection=notificationLevelId}} <strong>{{unbound level.name}}</strong>
-      <div class='description'>{{{unbound level.description}}}</div>
+      {{radio-button value=level.id name="notification_level" selection=notificationLevelId}} <strong>{{level.name}}</strong>
+      <div class='description'>{{{level.description}}}</div>
     </label>
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/outlet-list.hbs b/app/assets/javascripts/discourse/templates/outlet-list.hbs
index a58e2acd7e..46605c7448 100644
--- a/app/assets/javascripts/discourse/templates/outlet-list.hbs
+++ b/app/assets/javascripts/discourse/templates/outlet-list.hbs
@@ -1 +1 @@
-{{connector templateId=(unbound templateId) class=(unbound outletClasses) tagName=(unbound tagName)}}
+{{connector templateId=templateId class=outletClasses tagName=tagName}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index 5bb791bcc0..2eef6ceac7 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -4,7 +4,7 @@
   <div class="controls tracking-controls">
     <label>{{d-icon "d-watching"}} {{i18n 'user.watched_categories'}}</label>
     {{#if canSee}}
-      <a class="show-tracking" href={{unbound model.watchingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
+      <a class="show-tracking" href={{model.watchingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
     {{/if}}
     {{category-selector
       categories=model.watchedCategories
@@ -18,7 +18,7 @@
   <div class="controls tracking-controls">
     <label>{{d-icon "d-tracking"}} {{i18n 'user.tracked_categories'}}</label>
     {{#if canSee}}
-      <a class="show-tracking" href={{unbound model.trackingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
+      <a class="show-tracking" href={{model.trackingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
     {{/if}}
     {{category-selector
       categories=model.trackedCategories
@@ -43,7 +43,7 @@
     <div class="controls tracking-controls">
       <label>{{d-icon "d-muted"}} {{i18n 'user.muted_categories'}}</label>
       {{#if canSee}}
-        <a class="show-tracking" href={{unbound model.mutedTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
+        <a class="show-tracking" href={{model.mutedTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
       {{/if}}
       {{category-selector
         categories=model.mutedCategories
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index b2cdb56f26..bcb1a81b0f 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -57,7 +57,7 @@
           </div>
 
         {{else}}
-          <h1 data-topic-id={{unbound model.id}}>
+          <h1 data-topic-id={{model.id}}>
             {{#unless model.is_warning}}
               {{#if siteSettings.enable_personal_messages}}
                 {{private-message-glyph
@@ -73,7 +73,7 @@
 
             {{#if model.details.loaded}}
               {{topic-status topic=model}}
-              <a href={{unbound model.url}} {{action "jumpTop"}} class="fancy-title">
+              <a href={{model.url}} {{action "jumpTop"}} class="fancy-title">
                 {{{model.fancyTitle}}}
               </a>
             {{/if}}
@@ -170,7 +170,7 @@
       {{/topic-navigation}}
 
       <div class="row">
-        <section class="topic-area" id="topic" data-topic-id={{unbound model.id}}>
+        <section class="topic-area" id="topic" data-topic-id={{model.id}}>
 
           <div class="posts-wrapper">
             {{conditional-loading-spinner condition=model.postStream.loadingAbove}}
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index e15647621b..517e147e90 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -74,13 +74,13 @@
                       <td>{{number invite.user.posts_read_count}}</td>
                       <td>{{{format-duration invite.user.time_read}}}</td>
                       <td>
-                        <span title={{i18n 'user.invited.days_visited'}}>{{{unbound invite.user.days_visited}}}</span>
+                        <span title={{i18n 'user.invited.days_visited'}}>{{{invite.user.days_visited}}}</span>
                           /
-                        <span title={{i18n 'user.invited.account_age_days'}}>{{{unbound invite.user.days_since_created}}}</span>
+                        <span title={{i18n 'user.invited.account_age_days'}}>{{{invite.user.days_since_created}}}</span>
                       </td>
                     {{/if}}
                   {{else}}
-                    <td>{{unbound invite.email}}</td>
+                    <td>{{invite.email}}</td>
                     <td>{{format-date invite.updated_at}}</td>
                     <td>
                       {{#if invite.expired}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index b17c6b0254..71b4737522 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -79,15 +79,15 @@
           {{#each model.links as |link|}}
             <li>
               <a class='domain'
-                 href={{unbound link.url}}
-                 title={{unbound link.title}}
+                 href={{link.url}}
+                 title={{link.title}}
                  rel='noopener {{unless user.removeNoFollow 'nofollow ugc'}}'
                  target='_blank'>
                 {{shorten-url link.url}}
               </a>
               <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=link.clicks}}'>{{number link.clicks}}</span>
               <br>
-              <a href="{{unbound link.post_url}}">{{{link.topic.fancyTitle}}}</a>
+              <a href="{{link.post_url}}">{{{link.topic.fancyTitle}}}</a>
             </li>
           {{/each}}
         </ul>
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index d229cb49cb..d7e73c3d08 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -55,7 +55,7 @@
         {{#if fromSelected}}
           <div class="time-pickers">
             {{d-icon "far-clock"}}
-            {{input maxlength=5 placeholder="hh:mm" input=(action "setTime") type="time" value=(unbound time) class="time-picker"}}
+            {{input maxlength=5 placeholder="hh:mm" input=(action "setTime") type="time" value=time class="time-picker"}}
           </div>
         {{/if}}
 
@@ -63,7 +63,7 @@
         {{#if toDate}}
           <div class="time-pickers">
             {{d-icon "far-clock"}}
-            {{input maxlength=5 placeholder="hh:mm" input=(action "setToTime") type="time" value=(unbound toTime) class="time-picker"}}
+            {{input maxlength=5 placeholder="hh:mm" input=(action "setToTime") type="time" value=toTime class="time-picker"}}
           </div>
         {{/if}}
         {{/if}}

From 174764be250d1b7c671913dafc890da238a915bc Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 9 Mar 2020 09:31:24 -0500
Subject: [PATCH 0132/1830] FEATURE: Add embed_set_canonical_url setting
 (#9134)

---
 config/locales/server.en.yml            |  1 +
 config/site_settings.yml                |  1 +
 lib/topic_view.rb                       |  4 ++++
 spec/requests/topics_controller_spec.rb | 16 ++++++++++++++++
 4 files changed, 22 insertions(+)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index d0af9b7136..2b94222d74 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2057,6 +2057,7 @@ en:
 
     embed_any_origin: "Allow embeddable content regardless of origin. This is required for mobile apps with static HTML."
     embed_topics_list: "Support HTML embedding of topics lists"
+    embed_set_canonical_url: "Set the canonical URL for embeded topics to the embeded content's URL."
     embed_truncate: "Truncate the embedded posts."
     embed_support_markdown: "Support Markdown formatting for embedded posts."
     embed_whitelist_selector: "A comma separated list of CSS elements that are allowed in embeds."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index d42c7f7b0b..42acc80a84 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -880,6 +880,7 @@ posting:
       - code-fences
   embed_any_origin: false
   embed_topics_list: false
+  embed_set_canonical_url: false
   embed_truncate:
     default: true
   embed_support_markdown:
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 31c6729ac0..62f953b6fd 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -113,6 +113,10 @@ class TopicView
   end
 
   def canonical_path
+    if SiteSetting.embed_set_canonical_url
+      topic_embed = topic.topic_embed
+      return topic_embed.embed_url if topic_embed
+    end
     path = relative_url.dup
     path <<
       if @page > 1
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 3394894737..bb570a8674 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -3072,6 +3072,22 @@ RSpec.describe TopicsController do
         expect(body).to include('<link rel="prev" href="' + topic.relative_url + "?page=2")
       end
 
+      context "canonical_url" do
+        fab!(:topic_embed) { Fabricate(:topic_embed, embed_url: "https://markvanlan.com") }
+        let(:user_agent) { "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)" }
+
+        it "set to topic.url when embed_set_canonical_url is false" do
+          get topic_embed.topic.url, env: { "HTTP_USER_AGENT" => user_agent }
+          expect(response.body).to include('<link rel="canonical" href="' + topic_embed.topic.url)
+        end
+
+        it "set to topic_embed.embed_url when embed_set_canonical_url is true" do
+          SiteSetting.embed_set_canonical_url = true
+          get topic_embed.topic.url, env: { "HTTP_USER_AGENT" => user_agent }
+          expect(response.body).to include('<link rel="canonical" href="' + topic_embed.embed_url)
+        end
+      end
+
       context "wayback machine" do
         it "renders crawler layout" do
           get topic.url, env: { "HTTP_USER_AGENT" => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36", "HTTP_VIA" => "HTTP/1.0 web.archive.org (Wayback Save Page)" }

From ae3220fb88bee7791c0c6575eb6990fa2c5ccb4f Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 9 Mar 2020 15:20:00 +0000
Subject: [PATCH 0133/1830] FIX: Use `bio_excerpt` when checking for presence
 (#9148)

When `enable_new_user_card_route` is enabled, only `bio_excerpt` is serialized for user cards. `bio_cooked` is only loaded on the main user route.
---
 .../javascripts/discourse/components/user-card-contents.js.es6  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js.es6 b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
index cf2502c552..ca6ec7dbda 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -40,7 +40,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
   showDelete: and("viewingAdmin", "showName", "user.canBeDeleted"),
   linkWebsite: not("user.isBasic"),
   hasLocationOrWebsite: or("user.location", "user.website_name"),
-  isSuspendedOrHasBio: or("user.suspend_reason", "user.bio_cooked"),
+  isSuspendedOrHasBio: or("user.suspend_reason", "user.bio_excerpt"),
   showCheckEmail: and("user.staged", "canCheckEmails"),
 
   user: null,

From fff0e0980d0ba08481b1fbfb83984d904549e7d4 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 9 Mar 2020 17:37:32 +0100
Subject: [PATCH 0134/1830] FEATURE: Improve keyboard shortcuts help modal
 (#9143)

---
 .../keyboard-shortcuts-help.js.es6            | 24 +++++-----
 .../modal/keyboard-shortcuts-help.hbs         | 32 ++++++++-----
 .../stylesheets/common/base/topic-post.scss   |  8 ++--
 .../common/components/keyboard_shortcuts.scss | 47 ++++++++++++++-----
 4 files changed, 71 insertions(+), 40 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6 b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
index 7b3fbdcb5d..1c2d8f4221 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
@@ -14,23 +14,22 @@ const PLUS = I18n.t(`${KEY}.shortcut_key_delimiter_plus`);
 function buildHTML(keys1, keys2, keysDelimiter, shortcutsDelimiter) {
   const allKeys = [keys1, keys2]
     .reject(keys => keys.length === 0)
-    .map(keys => keys.map(k => `<kbd>${k}</kbd>`).join(keysDelimiter));
+    .map(keys => keys.map(k => `<kbd>${k}</kbd>`).join(keysDelimiter))
+    .map(keys => (shortcutsDelimiter !== "space" ? wrapInSpan(keys) : keys));
+
+  const [shortcut1, shortcut2] = allKeys;
 
   if (allKeys.length === 1) {
-    return wrapInSpan(allKeys[0]);
-  }
-
-  const context = { shortcut1: allKeys[0], shortcut2: allKeys[1] };
-  let result = "";
-  if (shortcutsDelimiter === "or") {
-    result = I18n.t(`${KEY}.shortcut_delimiter_or`, context);
+    return shortcut1;
+  } else if (shortcutsDelimiter === "or") {
+    return I18n.t(`${KEY}.shortcut_delimiter_or`, { shortcut1, shortcut2 });
   } else if (shortcutsDelimiter === "slash") {
-    result = I18n.t(`${KEY}.shortcut_delimiter_slash`, context);
+    return I18n.t(`${KEY}.shortcut_delimiter_slash`, { shortcut1, shortcut2 });
   } else if (shortcutsDelimiter === "space") {
-    result = I18n.t(`${KEY}.shortcut_delimiter_space`, context);
+    return wrapInSpan(
+      I18n.t(`${KEY}.shortcut_delimiter_space`, { shortcut1, shortcut2 })
+    );
   }
-
-  return wrapInSpan(result);
 }
 
 function wrapInSpan(shortcut) {
@@ -51,6 +50,7 @@ export default Controller.extend(ModalFunctionality, {
   onShow() {
     this.set("modal.modalClass", "keyboard-shortcuts-modal");
   },
+
   shortcuts: {
     jump_to: {
       home: buildShortcut("jump_to.home", { keys1: ["g", "h"] }),
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index ffd6c2eb4f..493a9e03a5 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body id="keyboard-shortcuts-help"}}
-  <div class="row">
-    <div>
-      <h4>{{i18n 'keyboard_shortcuts_help.jump_to.title'}}</h4>
+  <div class="column">
+    <section>
+      <h4>{{i18n "keyboard_shortcuts_help.jump_to.title"}}</h4>
       <ul>
         <li>{{{shortcuts.jump_to.home}}}</li>
         <li>{{{shortcuts.jump_to.latest}}}</li>
@@ -16,7 +16,9 @@
         {{/if}}
         <li>{{{shortcuts.jump_to.drafts}}}</li>
       </ul>
-      <h4>{{i18n 'keyboard_shortcuts_help.navigation.title'}}</h4>
+    </section>
+    <section>
+      <h4>{{i18n "keyboard_shortcuts_help.navigation.title"}}</h4>
       <ul>
         <li>{{{shortcuts.navigation.back}}}</li>
         <li>{{{shortcuts.navigation.jump}}}</li>
@@ -25,9 +27,11 @@
         <li>{{{shortcuts.navigation.next_prev}}}</li>
         <li>{{{shortcuts.navigation.go_to_unread_post}}}</li>
       </ul>
-    </div>
-    <div>
-      <h4>{{i18n 'keyboard_shortcuts_help.application.title'}}</h4>
+    </section>
+  </div>
+  <div class="column">
+    <section>
+      <h4>{{i18n "keyboard_shortcuts_help.application.title"}}</h4>
       <ul>
         <li>{{{shortcuts.application.hamburger_menu}}}</li>
         <li>{{{shortcuts.application.user_profile_menu}}}</li>
@@ -38,7 +42,9 @@
         <li>{{{shortcuts.application.dismiss_topics}}}</li>
         <li>{{{shortcuts.application.log_out}}}</li>
       </ul>
-      <h4>{{i18n 'keyboard_shortcuts_help.composing.title'}}</h4>
+    </section>
+    <section>
+      <h4>{{i18n "keyboard_shortcuts_help.composing.title"}}</h4>
       <ul>
         <li>{{{shortcuts.composing.return}}}</li>
         <li>{{{shortcuts.composing.fullscreen}}}</li>
@@ -48,9 +54,11 @@
         <li>{{{shortcuts.actions.reply_post}}}</li>
         <li>{{{shortcuts.actions.quote_post}}}</li>
       </ul>
-    </div>
-    <div>
-      <h4>{{i18n 'keyboard_shortcuts_help.actions.title'}}</h4>
+    </section>
+  </div>
+  <div class="column">
+    <section>
+      <h4>{{i18n "keyboard_shortcuts_help.actions.title"}}</h4>
       <ul>
         <li>{{{shortcuts.actions.bookmark_topic}}}</li>
         <li>{{{shortcuts.actions.pin_unpin_topic}}}</li>
@@ -69,6 +77,6 @@
         <li>{{{shortcuts.actions.print}}}</li>
         <li>{{{shortcuts.actions.topic_admin_actions}}}</li>
       </ul>
-    </div>
+    </section>
   </div>
 {{/d-modal-body}}
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 51df42d966..36ca696ab2 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -597,13 +597,11 @@ pre {
 }
 
 kbd {
-  background-color: $secondary;
-  border: 1px solid $primary-low;
   border-radius: 3px;
   box-shadow: shadow("kbd");
-  background: dark-light-choose(#fafafa, #333);
-  border: 1px solid dark-light-choose(#ccc, #555);
-  border-bottom: medium none dark-light-choose(#fff, #000);
+  background: dark-light-choose(#fafafa, #303030);
+  border: 1px solid dark-light-choose(#d0d0d0, #505050);
+  border-bottom: none;
 
   color: $primary;
   display: inline-block;
diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
index 3d05620c03..c40eaefee9 100644
--- a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
+++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
@@ -26,29 +26,54 @@
   max-height: 560px;
 }
 
+.keyboard-shortcuts-modal .modal-inner-container {
+  max-width: 880px;
+}
+
 #keyboard-shortcuts-help {
-  div.row {
-    width: 100%;
-    div {
-      float: left;
-      width: 32%;
-    }
+  display: flex;
+
+  .column {
+    width: 33.3%;
   }
+
   ul {
     list-style: none;
+    margin-bottom: 2rem;
     margin-left: 0;
 
     li {
-      margin: 5px 0;
+      align-items: center;
+      display: flex;
+      flex-wrap: wrap;
+      margin-bottom: 6px;
+    }
+
+    span {
+      background: #f2f2f2;
+      border-radius: 3px;
+      display: inline-flex;
+      margin: 0 6px;
+      padding: 1px 0 5px;
+    }
+
+    span:first-child {
+      margin-left: 0;
     }
 
     kbd {
-      font-size: $base-font-size;
+      align-items: center;
+      box-sizing: border-box;
+      color: dark-light-choose(#333, #aaa);
+      display: inline-flex;
       font-family: $base-font-family;
-      margin: 0;
-      color: dark-light-choose(#444, #aaa);
       font-weight: bold;
-      padding: 2px 6px;
+      height: 24px;
+      justify-content: center;
+      margin: 0 3px;
+      min-width: 24px;
+      padding: 0 6px;
+      vertical-align: bottom;
       white-space: nowrap;
     }
   }

From 85e03a7f68fc12114d8c24d6dd40b045832c908f Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 9 Mar 2020 17:37:49 +0100
Subject: [PATCH 0135/1830] DEV: Replace `Time.new` with `Time.now` (#9142)

(or `Time.zone.now`)
---
 app/jobs/regular/run_heartbeat.rb | 2 +-
 app/models/post.rb                | 2 +-
 config/unicorn.conf.rb            | 8 ++++----
 lib/distributed_memoizer.rb       | 4 ++--
 spec/jobs/heartbeat_spec.rb       | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/jobs/regular/run_heartbeat.rb b/app/jobs/regular/run_heartbeat.rb
index 4d5c013053..4a0691171a 100644
--- a/app/jobs/regular/run_heartbeat.rb
+++ b/app/jobs/regular/run_heartbeat.rb
@@ -10,7 +10,7 @@ module Jobs
     end
 
     def execute(args)
-      Discourse.redis.set(self.class.heartbeat_key, Time.new.to_i.to_s)
+      Discourse.redis.set(self.class.heartbeat_key, Time.now.to_i.to_s)
     end
 
     def self.last_heartbeat
diff --git a/app/models/post.rb b/app/models/post.rb
index 7e56dfa66b..751d8b721f 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -714,7 +714,7 @@ class Post < ActiveRecord::Base
       self.cooked = cook(raw, topic_id: topic_id)
     end
 
-    self.baked_at = Time.new
+    self.baked_at = Time.zone.now
     self.baked_version = BAKED_VERSION
   end
 
diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index 6c0ac9a7ef..dd698f379f 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -130,9 +130,9 @@ before_fork do |server, worker|
 
         def check_sidekiq_heartbeat
           @sidekiq_heartbeat_interval ||= 30.minutes
-          @sidekiq_next_heartbeat_check ||= Time.new.to_i + @sidekiq_heartbeat_interval
+          @sidekiq_next_heartbeat_check ||= Time.now.to_i + @sidekiq_heartbeat_interval
 
-          if @sidekiq_next_heartbeat_check < Time.new.to_i
+          if @sidekiq_next_heartbeat_check < Time.now.to_i
 
             last_heartbeat = Jobs::RunHeartbeat.last_heartbeat
             restart = false
@@ -142,13 +142,13 @@ before_fork do |server, worker|
               restart = true
             end
 
-            if last_heartbeat < Time.new.to_i - @sidekiq_heartbeat_interval
+            if last_heartbeat < Time.now.to_i - @sidekiq_heartbeat_interval
               STDERR.puts "Sidekiq heartbeat test failed, restarting"
               Rails.logger.warn "Sidekiq heartbeat test failed, restarting"
 
               restart = true
             end
-            @sidekiq_next_heartbeat_check = Time.new.to_i + @sidekiq_heartbeat_interval
+            @sidekiq_next_heartbeat_check = Time.now.to_i + @sidekiq_heartbeat_interval
 
             if restart
               Demon::Sidekiq.restart
diff --git a/lib/distributed_memoizer.rb b/lib/distributed_memoizer.rb
index 44a52806b4..559833f2b6 100644
--- a/lib/distributed_memoizer.rb
+++ b/lib/distributed_memoizer.rb
@@ -15,11 +15,11 @@ class DistributedMemoizer
     unless result = redis.get(redis_key)
       redis_lock_key = self.redis_lock_key(key)
 
-      start = Time.new
+      start = Time.now
       got_lock = false
 
       begin
-        while Time.new < start + MAX_WAIT && !got_lock
+        while Time.now < start + MAX_WAIT && !got_lock
           LOCK.synchronize do
             got_lock = get_lock(redis, redis_lock_key)
           end
diff --git a/spec/jobs/heartbeat_spec.rb b/spec/jobs/heartbeat_spec.rb
index fb39ffd36b..f86c88ef32 100644
--- a/spec/jobs/heartbeat_spec.rb
+++ b/spec/jobs/heartbeat_spec.rb
@@ -14,7 +14,7 @@ describe ::Jobs::Heartbeat do
 
     Sidekiq::Testing.inline! do
       ::Jobs::Heartbeat.new.perform(nil)
-      expect(::Jobs::RunHeartbeat.last_heartbeat).to eq(Time.new.to_i)
+      expect(::Jobs::RunHeartbeat.last_heartbeat).to eq(Time.now.to_i)
     end
   end
 end

From e35bc8bebd1243e40a507cbc9874bad20e54b535 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 9 Mar 2020 17:38:13 +0100
Subject: [PATCH 0136/1830] FIX: Preserve PostCreator's created_at resolution
 (#9140)

PostMover passes to PostCreator a `created_at` that is a `ActiveSupport::WithTimeZone` instance (and also `is_a? Time`). Previously it was always being passed through `Time.zone.parse` so it would lose sub-second information. Now, it takes `Time` input as-is, while still parsing other types.
---
 lib/post_creator.rb                  |  7 +++-
 spec/components/post_creator_spec.rb | 54 ++++++++++++++++++++--------
 2 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 8340c6c7b7..25cd341eea 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -494,7 +494,12 @@ class PostCreator
     end
 
     post.extract_quoted_post_numbers
-    post.created_at = Time.zone.parse(@opts[:created_at].to_s) if @opts[:created_at].present?
+
+    post.created_at = if @opts[:created_at].is_a?(Time)
+      @opts[:created_at]
+    elsif @opts[:created_at].present?
+      Time.zone.parse(@opts[:created_at].to_s)
+    end
 
     if fields = @opts[:custom_fields]
       post.custom_fields = fields
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index d5bbb9fef5..07ec76bb78 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -944,24 +944,48 @@ describe PostCreator do
   end
 
   context 'setting created_at' do
-    created_at = 1.week.ago
-    let(:topic) do
-      PostCreator.create(user,
-                         raw: 'This is very interesting test post content',
-                         title: 'This is a very interesting test post title',
-                         created_at: created_at)
+    it 'supports Time instances' do
+      freeze_time
+
+      post1 = PostCreator.create(user,
+        raw: 'This is very interesting test post content',
+        title: 'This is a very interesting test post title',
+        created_at: 1.week.ago
+      )
+      topic = post1.topic
+
+      post2 = PostCreator.create(user,
+        raw: 'This is very interesting test post content',
+        topic_id: topic,
+        created_at: 1.week.ago
+      )
+
+      expect(post1.created_at).to be_within(1.second).of(1.week.ago)
+      expect(post2.created_at).to be_within(1.second).of(1.week.ago)
+      expect(topic.created_at).to be_within(1.second).of(1.week.ago)
     end
 
-    let(:post) do
-      PostCreator.create(user,
-                         raw: 'This is very interesting test post content',
-                         topic_id: Topic.last,
-                         created_at: created_at)
-    end
+    it 'supports strings' do
+      freeze_time
 
-    it 'acts correctly' do
-      expect(topic.created_at).to be_within(10.seconds).of(created_at)
-      expect(post.created_at).to be_within(10.seconds).of(created_at)
+      time = Time.zone.parse('2019-09-02')
+
+      post1 = PostCreator.create(user,
+        raw: 'This is very interesting test post content',
+        title: 'This is a very interesting test post title',
+        created_at: '2019-09-02'
+      )
+      topic = post1.topic
+
+      post2 = PostCreator.create(user,
+        raw: 'This is very interesting test post content',
+        topic_id: topic,
+        created_at: '2019-09-02 00:00:00 UTC'
+      )
+
+      expect(post1.created_at).to be_within(1.second).of(time)
+      expect(post2.created_at).to be_within(1.second).of(time)
+      expect(topic.created_at).to be_within(1.second).of(time)
     end
   end
 

From 5037b80c9c6e94ad01fb2f7b7971a2d533bd3c94 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 9 Mar 2020 17:38:37 +0100
Subject: [PATCH 0137/1830] Merge imports from the same module (#9144)

---
 .../admin/components/admin-report-chart.js.es6            | 3 +--
 .../admin/components/admin-report-stacked-chart.js.es6    | 3 +--
 .../javascripts/admin/components/resumable-upload.js.es6  | 3 +--
 .../discourse/components/composer-editor.js.es6           | 6 +-----
 .../discourse/components/composer-title.js.es6            | 4 +---
 .../javascripts/discourse/components/d-editor.js.es6      | 6 +-----
 .../discourse/components/discourse-topic.js.es6           | 5 +----
 .../discourse/components/discovery-topics-list.js.es6     | 3 +--
 .../javascripts/discourse/components/global-notice.js.es6 | 3 +--
 .../javascripts/discourse/components/invite-panel.js.es6  | 3 +--
 .../javascripts/discourse/components/mount-widget.js.es6  | 3 +--
 .../discourse/components/scrolling-post-stream.js.es6     | 4 +---
 .../discourse/components/search-advanced-options.js.es6   | 3 +--
 .../javascripts/discourse/components/share-popup.js.es6   | 3 +--
 .../javascripts/discourse/components/site-header.js.es6   | 4 +---
 .../discourse/components/suggested-topics.js.es6          | 3 +--
 .../discourse/components/topic-timer-info.js.es6          | 3 +--
 .../discourse/components/user-card-contents.js.es6        | 3 +--
 .../discourse/controllers/edit-topic-timer.js.es6         | 3 +--
 .../discourse/controllers/insert-hyperlink.js.es6         | 4 +---
 app/assets/javascripts/discourse/controllers/user.js.es6  | 3 +--
 .../initializers/subscribe-user-notifications.js.es6      | 3 +--
 app/assets/javascripts/discourse/lib/autocomplete.js.es6  | 3 +--
 .../javascripts/discourse/lib/keyboard-shortcuts.js.es6   | 3 +--
 app/assets/javascripts/discourse/lib/url.js.es6           | 3 +--
 .../discourse/mixins/card-contents-base.js.es6            | 4 +---
 app/assets/javascripts/discourse/models/composer.js.es6   | 8 ++------
 app/assets/javascripts/discourse/models/post.js.es6       | 3 +--
 app/assets/javascripts/discourse/models/site.js.es6       | 3 +--
 app/assets/javascripts/discourse/models/store.js.es6      | 3 +--
 .../discourse/models/topic-tracking-state.js.es6          | 3 +--
 app/assets/javascripts/discourse/models/topic.js.es6      | 3 +--
 app/assets/javascripts/discourse/models/user.js.es6       | 3 +--
 .../javascripts/discourse/routes/application.js.es6       | 3 +--
 app/assets/javascripts/discourse/routes/topic.js.es6      | 4 +---
 app/assets/javascripts/discourse/services/search.js.es6   | 3 +--
 app/assets/javascripts/discourse/widgets/glue.js.es6      | 3 +--
 app/assets/javascripts/discourse/widgets/post-menu.js.es6 | 3 +--
 .../javascripts/discourse/widgets/search-menu.js.es6      | 3 +--
 .../javascripts/select-kit/components/select-kit.js.es6   | 3 +--
 .../select-kit/components/selected-name.js.es6            | 3 +--
 .../discourse/components/composer-presence-display.js.es6 | 4 +---
 .../discourse/components/topic-presence-display.js.es6    | 3 +--
 43 files changed, 44 insertions(+), 105 deletions(-)

diff --git a/app/assets/javascripts/admin/components/admin-report-chart.js.es6 b/app/assets/javascripts/admin/components/admin-report-chart.js.es6
index 5351a11952..7af8ce0474 100644
--- a/app/assets/javascripts/admin/components/admin-report-chart.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-chart.js.es6
@@ -1,6 +1,5 @@
 import { makeArray } from "discourse-common/lib/helpers";
-import { debounce } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
+import { debounce, schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { number } from "discourse/lib/formatter";
 import loadScript from "discourse/lib/load-script";
diff --git a/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6 b/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6
index 911d858ba9..8980c93077 100644
--- a/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6
@@ -1,6 +1,5 @@
 import { makeArray } from "discourse-common/lib/helpers";
-import { debounce } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
+import { debounce, schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { number } from "discourse/lib/formatter";
 import loadScript from "discourse/lib/load-script";
diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js.es6
index 830e560252..7425f174fe 100644
--- a/app/assets/javascripts/admin/components/resumable-upload.js.es6
+++ b/app/assets/javascripts/admin/components/resumable-upload.js.es6
@@ -1,5 +1,4 @@
-import { schedule } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { later, schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 52f44e78f5..4ff3b961b1 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -1,8 +1,4 @@
-import { throttle } from "@ember/runloop";
-import { next } from "@ember/runloop";
-import { debounce } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { debounce, later, next, scheduleOnce, throttle } from "@ember/runloop";
 import Component from "@ember/component";
 import userSearch from "discourse/lib/user-search";
 import discourseComputed, {
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index bd559a59f1..9ba4f501bf 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -1,7 +1,5 @@
 import { alias, or } from "@ember/object/computed";
-import { next } from "@ember/runloop";
-import { debounce } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
+import { debounce, next, schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { load } from "pretty-text/oneboxer";
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index d9f156b63b..b83b667bca 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -1,8 +1,4 @@
-import { next } from "@ember/runloop";
-import { debounce } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { debounce, later, next, schedule, scheduleOnce } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import Component from "@ember/component";
 /*global Mousetrap:true */
diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
index 83e7bf6fa1..7e222e2e61 100644
--- a/app/assets/javascripts/discourse/components/discourse-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
@@ -1,8 +1,5 @@
 import { alias } from "@ember/object/computed";
-import { throttle } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { later, schedule, scheduleOnce, throttle } from "@ember/runloop";
 import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import AddArchetypeClass from "discourse/mixins/add-archetype-class";
diff --git a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
index f4329ba2f2..30a0118a33 100644
--- a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
@@ -1,5 +1,4 @@
-import { schedule } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { schedule, scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { on, observes } from "discourse-common/utils/decorators";
 import LoadMore from "discourse/mixins/load-more";
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index 8ca725abaa..abaf730672 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -1,8 +1,7 @@
 import { bind, cancel } from "@ember/runloop";
 import Component from "@ember/component";
 import LogsNotice from "discourse/services/logs-notice";
-import EmberObject from "@ember/object";
-import { computed } from "@ember/object";
+import EmberObject, { computed } from "@ember/object";
 
 const _pluginNotices = [];
 
diff --git a/app/assets/javascripts/discourse/components/invite-panel.js.es6 b/app/assets/javascripts/discourse/components/invite-panel.js.es6
index 8622e97ac5..0748809131 100644
--- a/app/assets/javascripts/discourse/components/invite-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/invite-panel.js.es6
@@ -1,8 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
-import { computed } from "@ember/object";
+import EmberObject, { computed } from "@ember/object";
 import { alias, and, equal } from "@ember/object/computed";
-import EmberObject from "@ember/object";
 import Component from "@ember/component";
 import { emailValid } from "discourse/lib/utilities";
 import Group from "discourse/models/group";
diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6
index e62b7acab3..dc98bf9f6d 100644
--- a/app/assets/javascripts/discourse/components/mount-widget.js.es6
+++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6
@@ -1,5 +1,4 @@
-import { cancel } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { cancel, scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { diff, patch } from "virtual-dom";
 import { WidgetClickHook } from "discourse/widgets/hooks";
diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
index 04f0897eb6..cb9b3dac27 100644
--- a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
@@ -1,6 +1,4 @@
-import { next } from "@ember/runloop";
-import { debounce } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { debounce, next, scheduleOnce } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import MountWidget from "discourse/components/mount-widget";
 import { cloak, uncloak } from "discourse/widgets/post-stream";
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
index eb61067167..9b3bac5035 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
@@ -1,5 +1,4 @@
-import { debounce } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { debounce, scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes } from "discourse-common/utils/decorators";
 import { escapeExpression } from "discourse/lib/utilities";
diff --git a/app/assets/javascripts/discourse/components/share-popup.js.es6 b/app/assets/javascripts/discourse/components/share-popup.js.es6
index ba32b26585..ca86058b73 100644
--- a/app/assets/javascripts/discourse/components/share-popup.js.es6
+++ b/app/assets/javascripts/discourse/components/share-popup.js.es6
@@ -1,6 +1,5 @@
 import { isEmpty } from "@ember/utils";
-import { bind } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { bind, scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { longDateNoYear } from "discourse/lib/formatter";
diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6
index 38d42d9ea0..b8b6ed90e3 100644
--- a/app/assets/javascripts/discourse/components/site-header.js.es6
+++ b/app/assets/javascripts/discourse/components/site-header.js.es6
@@ -1,6 +1,4 @@
-import { cancel } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { cancel, later, schedule } from "@ember/runloop";
 import MountWidget from "discourse/components/mount-widget";
 import { observes } from "discourse-common/utils/decorators";
 import Docking from "discourse/mixins/docking";
diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js.es6 b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
index 53986a8303..9d5b83839a 100644
--- a/app/assets/javascripts/discourse/components/suggested-topics.js.es6
+++ b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
@@ -1,9 +1,8 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import { get } from "@ember/object";
+import { computed, get } from "@ember/object";
 import Component from "@ember/component";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import Site from "discourse/models/site";
-import { computed } from "@ember/object";
 
 export default Component.extend({
   elementId: "suggested-topics",
diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
index 4b758ed6a2..66663b062d 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
@@ -1,6 +1,5 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import { cancel } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { cancel, later } from "@ember/runloop";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import Category from "discourse/models/category";
diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js.es6 b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
index ca6ec7dbda..5ad24526dc 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -1,6 +1,6 @@
 import { isEmpty } from "@ember/utils";
 import { alias, gte, and, gt, not, or } from "@ember/object/computed";
-import EmberObject from "@ember/object";
+import EmberObject, { set } from "@ember/object";
 import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import User from "discourse/models/user";
@@ -10,7 +10,6 @@ import CanCheckEmails from "discourse/mixins/can-check-emails";
 import CardContentsBase from "discourse/mixins/card-contents-base";
 import CleansUp from "discourse/mixins/cleans-up";
 import { prioritizeNameInUx } from "discourse/lib/settings";
-import { set } from "@ember/object";
 import { getOwner } from "@ember/application";
 
 export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6 b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
index a410f1fc90..e9117532f0 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
@@ -1,10 +1,9 @@
-import EmberObject from "@ember/object";
+import EmberObject, { setProperties } from "@ember/object";
 import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import TopicTimer from "discourse/models/topic-timer";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { setProperties } from "@ember/object";
 
 export const CLOSE_STATUS_TYPE = "close";
 export const OPEN_STATUS_TYPE = "open";
diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6 b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
index 21ea0603f8..57d751b56e 100644
--- a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
+++ b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
@@ -1,7 +1,5 @@
 import { isEmpty } from "@ember/utils";
-import { debounce } from "@ember/runloop";
-import { cancel } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { cancel, debounce, scheduleOnce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { searchForTerm } from "discourse/lib/search";
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index 90eeb3a837..cc2db042fb 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -1,7 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { alias, or, gt, not, and } from "@ember/object/computed";
-import EmberObject from "@ember/object";
+import EmberObject, { set, computed } from "@ember/object";
 import { inject as service } from "@ember/service";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -9,7 +9,6 @@ import CanCheckEmails from "discourse/mixins/can-check-emails";
 import User from "discourse/models/user";
 import optionalService from "discourse/lib/optional-service";
 import { prioritizeNameInUx } from "discourse/lib/settings";
-import { set, computed } from "@ember/object";
 
 export default Controller.extend(CanCheckEmails, {
   indexStream: false,
diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
index 8efb204c36..14c2bc5f95 100644
--- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
@@ -1,4 +1,4 @@
-import EmberObject from "@ember/object";
+import EmberObject, { set } from "@ember/object";
 // Subscribes to user events on the message bus
 import {
   init as initDesktopNotifications,
@@ -11,7 +11,6 @@ import {
   unsubscribe as unsubscribePushNotifications,
   isPushNotificationsEnabled
 } from "discourse/lib/push-notifications";
-import { set } from "@ember/object";
 import ENV from "discourse-common/config/environment";
 
 export default {
diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
index aeb7b836a2..4979760483 100644
--- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6
+++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
@@ -1,5 +1,4 @@
-import { cancel } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { cancel, later } from "@ember/runloop";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { setCaretPosition, caretPosition } from "discourse/lib/utilities";
 import Site from "discourse/models/site";
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index 409ebc3190..cf22919b07 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -1,5 +1,4 @@
-import { run } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { later, run } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import Composer from "discourse/models/composer";
 import { minimumOffset } from "discourse/lib/offset-calculator";
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 93cad9b4c4..7892abafd9 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -1,7 +1,6 @@
 import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
-import { next } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
+import { next, schedule } from "@ember/runloop";
 import offsetCalculator from "discourse/lib/offset-calculator";
 import LockOn from "discourse/lib/lock-on";
 import { defaultHomepage } from "discourse/lib/utilities";
diff --git a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6 b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
index c5cdcc4a16..2f53c5276f 100644
--- a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
+++ b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
@@ -1,7 +1,5 @@
 import { alias, match } from "@ember/object/computed";
-import { throttle } from "@ember/runloop";
-import { next } from "@ember/runloop";
-import { schedule } from "@ember/runloop";
+import { next, schedule, throttle } from "@ember/runloop";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import afterTransition from "discourse/lib/after-transition";
 import DiscourseURL from "discourse/lib/url";
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 2150396102..1b53ed8927 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -1,9 +1,7 @@
 import { isEmpty } from "@ember/utils";
 import { reads, equal, not, or, and } from "@ember/object/computed";
-import EmberObject from "@ember/object";
-import { next } from "@ember/runloop";
-import { cancel } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import EmberObject, { set } from "@ember/object";
+import { cancel, later, next, throttle } from "@ember/runloop";
 import RestModel from "discourse/models/rest";
 import Topic from "discourse/models/topic";
 import { throwAjaxError } from "discourse/lib/ajax-error";
@@ -19,9 +17,7 @@ import {
   emailValid
 } from "discourse/lib/utilities";
 import { propertyNotEqual } from "discourse/lib/computed";
-import { throttle } from "@ember/runloop";
 import { Promise } from "rsvp";
-import { set } from "@ember/object";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
 import deprecated from "discourse-common/lib/deprecated";
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index a08f960ef0..4ba35b31ac 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -1,8 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import { computed, get } from "@ember/object";
+import EmberObject, { computed, get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { equal, and, or, not } from "@ember/object/computed";
-import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
 import { popupAjaxError } from "discourse/lib/ajax-error";
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6
index 5f9065d3d8..29de94c3a8 100644
--- a/app/assets/javascripts/discourse/models/site.js.es6
+++ b/app/assets/javascripts/discourse/models/site.js.es6
@@ -1,8 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import { get } from "@ember/object";
+import EmberObject, { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { alias, sort } from "@ember/object/computed";
-import EmberObject from "@ember/object";
 import Archetype from "discourse/models/archetype";
 import PostActionType from "discourse/models/post-action-type";
 import Singleton from "discourse/mixins/singleton";
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6
index 2ee28b6620..1bc9fdf355 100644
--- a/app/assets/javascripts/discourse/models/store.js.es6
+++ b/app/assets/javascripts/discourse/models/store.js.es6
@@ -1,10 +1,9 @@
-import EmberObject from "@ember/object";
+import EmberObject, { set } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
 import ResultSet from "discourse/models/result-set";
 import { getRegister } from "discourse-common/lib/get-owner";
 import { underscore } from "@ember/string";
-import { set } from "@ember/object";
 import Category from "discourse/models/category";
 import { Promise } from "rsvp";
 
diff --git a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
index 8f79703ef7..7debe3f4ce 100644
--- a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
@@ -1,10 +1,9 @@
-import { get } from "@ember/object";
+import EmberObject, { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
 import PreloadStore from "preload-store";
 import Category from "discourse/models/category";
-import EmberObject from "@ember/object";
 import User from "discourse/models/user";
 
 function isNew(topic) {
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index fcf1892ec8..fa97e11ea7 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -1,6 +1,5 @@
-import { get } from "@ember/object";
+import EmberObject, { get } from "@ember/object";
 import { not, notEmpty, equal, and, or } from "@ember/object/computed";
-import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { flushMap } from "discourse/models/store";
 import RestModel from "discourse/models/rest";
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index b15c868d80..7af461aa30 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -1,7 +1,7 @@
 import { A } from "@ember/array";
 import { isEmpty } from "@ember/utils";
 import { gt, equal, or } from "@ember/object/computed";
-import EmberObject, { computed } from "@ember/object";
+import EmberObject, { computed, getProperties } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { url } from "discourse/lib/computed";
 import RestModel from "discourse/models/rest";
@@ -22,7 +22,6 @@ import { defaultHomepage } from "discourse/lib/utilities";
 import { userPath } from "discourse/lib/url";
 import Category from "discourse/models/category";
 import { Promise } from "rsvp";
-import { getProperties } from "@ember/object";
 import deprecated from "discourse-common/lib/deprecated";
 import Site from "discourse/models/site";
 
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 8dca333360..0a028cdceb 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -1,5 +1,4 @@
-import { once } from "@ember/runloop";
-import { next } from "@ember/runloop";
+import { next, once } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import { setting } from "discourse/lib/computed";
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index d4c22f9b3e..33e60412c6 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -1,8 +1,6 @@
 import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
-import { cancel } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { cancel, later, scheduleOnce } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import { ID_CONSTRAINT } from "discourse/models/topic";
diff --git a/app/assets/javascripts/discourse/services/search.js.es6 b/app/assets/javascripts/discourse/services/search.js.es6
index d7a8edcd10..67ad9b16d8 100644
--- a/app/assets/javascripts/discourse/services/search.js.es6
+++ b/app/assets/javascripts/discourse/services/search.js.es6
@@ -1,5 +1,4 @@
-import { get } from "@ember/object";
-import EmberObject from "@ember/object";
+import EmberObject, { get } from "@ember/object";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 
 export default EmberObject.extend({
diff --git a/app/assets/javascripts/discourse/widgets/glue.js.es6 b/app/assets/javascripts/discourse/widgets/glue.js.es6
index 7d8a2a4561..2fe75def26 100644
--- a/app/assets/javascripts/discourse/widgets/glue.js.es6
+++ b/app/assets/javascripts/discourse/widgets/glue.js.es6
@@ -1,5 +1,4 @@
-import { cancel } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { cancel, scheduleOnce } from "@ember/runloop";
 import { diff, patch } from "virtual-dom";
 import { queryRegistry } from "discourse/widgets/widget";
 import DirtyKeys from "discourse/lib/dirty-keys";
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index c833d8edf9..b5562aa2f1 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -1,5 +1,4 @@
-import { run } from "@ember/runloop";
-import { next } from "@ember/runloop";
+import { next, run } from "@ember/runloop";
 import { applyDecorators, createWidget } from "discourse/widgets/widget";
 import { avatarAtts } from "discourse/widgets/actions-summary";
 import { h } from "virtual-dom";
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
index 5c3b3e08b1..690dc80bff 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
@@ -1,6 +1,5 @@
 import { get } from "@ember/object";
-import { debounce } from "@ember/runloop";
-import { later } from "@ember/runloop";
+import { debounce, later } from "@ember/runloop";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { searchForTerm, isValidSearchTerm } from "discourse/lib/search";
 import { createWidget } from "discourse/widgets/widget";
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index 9c9d542431..25aa3e68e7 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -1,8 +1,7 @@
-import { computed, guidFor, default as EmberObject } from "@ember/object";
+import EmberObject, { computed, get, guidFor } from "@ember/object";
 import Component from "@ember/component";
 import deprecated from "discourse-common/lib/deprecated";
 import { makeArray } from "discourse-common/lib/helpers";
-import { get } from "@ember/object";
 import UtilsMixin from "select-kit/mixins/utils";
 import PluginApiMixin from "select-kit/mixins/plugin-api";
 import Mixin from "@ember/object/mixin";
diff --git a/app/assets/javascripts/select-kit/components/selected-name.js.es6 b/app/assets/javascripts/select-kit/components/selected-name.js.es6
index 1f69a5e2ee..ac23c16446 100644
--- a/app/assets/javascripts/select-kit/components/selected-name.js.es6
+++ b/app/assets/javascripts/select-kit/components/selected-name.js.es6
@@ -1,8 +1,7 @@
-import { computed } from "@ember/object";
+import { computed, get } from "@ember/object";
 import Component from "@ember/component";
 import { makeArray } from "discourse-common/lib/helpers";
 import UtilsMixin from "select-kit/mixins/utils";
-import { get } from "@ember/object";
 
 export default Component.extend(UtilsMixin, {
   layoutName: "select-kit/templates/components/selected-name",
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index 175f3a9985..1e78297376 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -1,6 +1,4 @@
-import { once } from "@ember/runloop";
-import { debounce } from "@ember/runloop";
-import { cancel } from "@ember/runloop";
+import { cancel, debounce, once } from "@ember/runloop";
 import Component from "@ember/component";
 import { equal, gt } from "@ember/object/computed";
 import { Promise } from "rsvp";
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
index c12573803d..1089246fb6 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
@@ -1,5 +1,4 @@
-import { debounce } from "@ember/runloop";
-import { cancel } from "@ember/runloop";
+import { cancel, debounce } from "@ember/runloop";
 import Component from "@ember/component";
 import { gt } from "@ember/object/computed";
 import computed, { on } from "discourse-common/utils/decorators";

From 3ad5cb0cbcda50ee42f97665d456061a400b03f0 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 9 Mar 2020 11:41:07 -0500
Subject: [PATCH 0138/1830] FIX: Error message for 403 when featuring topic on
 profile (#9149)

---
 app/controllers/users_controller.rb | 5 ++++-
 config/locales/server.en.yml        | 4 ++++
 lib/guardian/user_guardian.rb       | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9af8c2aa7e..4d0adc5116 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1362,7 +1362,10 @@ class UsersController < ApplicationController
     user = fetch_user_from_params
     topic = Topic.find(params[:topic_id].to_i)
 
-    raise Discourse::InvalidAccess.new unless topic && guardian.can_feature_topic?(user, topic)
+    if !guardian.can_feature_topic?(user, topic)
+      return render_json_error(I18n.t('activerecord.errors.models.user_profile.attributes.featured_topic_id.invalid'), 403)
+    end
+
     user.user_profile.update(featured_topic_id: topic.id)
     render json: success_json
   end
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 2b94222d74..f4f234f8ec 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -546,6 +546,10 @@ en:
               same_as_password: "is the same as your password."
             ip_address:
               signup_not_allowed: "Signup is not allowed from this account."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "This topic cannot be featured on your profile."
         user_email:
           attributes:
             user_id:
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index 35dccb8481..26e726437b 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -129,6 +129,7 @@ module UserGuardian
   end
 
   def can_feature_topic?(user, topic)
+    return false if topic.nil?
     return false if !SiteSetting.allow_featured_topic_on_user_profiles?
     return false if !is_me?(user) && !is_staff?
     return false if !topic.visible

From ec21a15fa7234b8274b5b137afdd6dff78cf52a9 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 9 Mar 2020 12:53:32 -0400
Subject: [PATCH 0139/1830] FIX: Incorrect message when logging in via email

If `hide email address taken` was true, it would always display a
success message, rather than the non-comittal "maybe we emailed that
user" response.
---
 .../javascripts/discourse/controllers/login.js.es6       | 6 +++++-
 app/controllers/users_controller.rb                      | 1 +
 spec/requests/users_controller_spec.rb                   | 9 ++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index 9d4c56f56e..de39f7ec8a 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -296,8 +296,12 @@ export default Controller.extend(ModalFunctionality, {
               "error"
             );
           } else {
+            let postfix = data.hide_taken ? "" : "_found";
             this.flash(
-              I18n.t(`${key}_found`, { email: loginName, username: loginName })
+              I18n.t(`${key}${postfix}`, {
+                email: loginName,
+                username: loginName
+              })
             );
           }
         })
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4d0adc5116..9405620286 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -748,6 +748,7 @@ class UsersController < ApplicationController
     end
 
     json = success_json
+    json[:hide_taken] = SiteSetting.hide_email_address_taken
     json[:user_found] = user_presence unless SiteSetting.hide_email_address_taken
     render json: json
   rescue RateLimiter::LimitExceeded
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 707c61d6ba..38dfe21e96 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -3455,7 +3455,6 @@ describe UsersController do
 
       it 'should return the right response' do
         post "/u/email-login.json", params: { login: user.email }
-
         expect(response.status).to eq(404)
       end
     end
@@ -3465,7 +3464,9 @@ describe UsersController do
         post "/u/email-login.json", params: { login: '@random' }
 
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)['user_found']).to eq(false)
+        json = JSON.parse(response.body)
+        expect(json['user_found']).to eq(false)
+        expect(json['hide_taken']).to eq(false)
         expect(Jobs::CriticalUserEmail.jobs).to eq([])
       end
     end
@@ -3476,7 +3477,9 @@ describe UsersController do
         post "/u/email-login.json", params: { login: user.email }
 
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body).has_key?('user_found')).to eq(false)
+        json = JSON.parse(response.body)
+        expect(json.has_key?('user_found')).to eq(false)
+        expect(json['hide_taken']).to eq(true)
       end
     end
 

From 055cb558729616e2b25c6a9ead4bdfe47d4ccbcb Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Fri, 6 Mar 2020 15:15:55 -0800
Subject: [PATCH 0140/1830] DEV: shutdown_ok parameter to /srv/status

This allows probers to distinguish between liveness and readiness conditions
---
 app/controllers/forums_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index 7192c59dd1..d11efb4b43 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -10,7 +10,7 @@ class ForumsController < ActionController::Base
 
   def status
     if $shutdown # rubocop:disable Style/GlobalVars
-      render plain: "shutting down", status: 500
+      render plain: "shutting down", status: (params[:shutdown_ok] ? 200 : 500)
     else
       render plain: "ok"
     end

From 218d3f5f44e9b0d318a60178ea6f6f054220a0be Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Mon, 9 Mar 2020 13:48:30 -0700
Subject: [PATCH 0141/1830] Add tests for /srv/status behavior

---
 spec/requests/forums_controller_spec.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/spec/requests/forums_controller_spec.rb b/spec/requests/forums_controller_spec.rb
index 865e7b9484..9f3ff2784c 100644
--- a/spec/requests/forums_controller_spec.rb
+++ b/spec/requests/forums_controller_spec.rb
@@ -19,4 +19,22 @@ RSpec.describe ForumsController do
     end
   end
 
+  describe "during shutdown" do
+    before(:each) do
+      $shutdown = true
+    end
+    after(:each) do
+      $shutdown = nil
+    end
+
+    it "returns a 500 response" do
+      get "/srv/status"
+      expect(response.status).to eq(500)
+    end
+    it "returns a 200 response when given shutdown_ok" do
+      get "/srv/status?shutdown_ok=1"
+      expect(response.status).to eq(200)
+    end
+  end
+
 end

From e3bbcb27d035dcac3163de9a5e3047ffc7239bbe Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 10 Mar 2020 16:57:14 +1000
Subject: [PATCH 0142/1830] FIX: Set current user timezone when saving profile
 timezone (#9155)

If you are changing your own profile timezone, then on save we set the current user timezone, in case this property needs to be accessed again before the user is reloaded.
---
 .../discourse/controllers/preferences/profile.js.es6        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
index 5d2e65f045..f6005e355d 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
@@ -93,6 +93,12 @@ export default Controller.extend(PreferencesTabController, {
       return model
         .save(this.saveAttrNames)
         .then(() => {
+          // update the timezone in memory so we can use the new
+          // one if we change routes without reloading the user
+          if (this.currentUser.id === this.model.id) {
+            this.currentUser.timezone = this.model.user_option.timezone;
+          }
+
           cookAsync(model.get("bio_raw"))
             .then(() => {
               model.set("bio_cooked");

From 78a6b7631095c07a576d11538cce0cf50400b118 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 10 Mar 2020 09:56:55 +0100
Subject: [PATCH 0143/1830] FIX: ensures pinned-options header is showing
 correct state (#9156)

---
 .../components/pinned-options.js.es6          | 28 +++++++++--------
 .../select-kit/pinned-options-test.js.es6     | 31 ++++++++++++++-----
 2 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/pinned-options.js.es6 b/app/assets/javascripts/select-kit/components/pinned-options.js.es6
index c04142667a..2b9263bc43 100644
--- a/app/assets/javascripts/select-kit/components/pinned-options.js.es6
+++ b/app/assets/javascripts/select-kit/components/pinned-options.js.es6
@@ -1,6 +1,9 @@
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 import { iconHTML } from "discourse-common/lib/icon-library";
-import { computed } from "@ember/object";
+import { computed, action } from "@ember/object";
+
+const UNPINNED = "unpinned";
+const PINNED = "pinned";
 
 export default DropdownSelectBoxComponent.extend({
   pluginApiIdentifiers: ["pinned-options"],
@@ -10,13 +13,13 @@ export default DropdownSelectBoxComponent.extend({
     const pinnedGlobally = this.get("topic.pinned_globally");
     const pinned = this.value;
     const globally = pinnedGlobally ? "_globally" : "";
-    const state = pinned === "pinned" ? `pinned${globally}` : "unpinned";
+    const state = pinned ? `pinned${globally}` : UNPINNED;
     const title = I18n.t(`topic_statuses.${state}.title`);
 
     content.label = `<span>${title}</span>${iconHTML("caret-down")}`.htmlSafe();
     content.title = title;
     content.name = state;
-    content.icon = `thumbtack${state === "unpinned" ? " unpinned" : ""}`;
+    content.icon = `thumbtack${state === UNPINNED ? " unpinned" : ""}`;
     return content;
   },
 
@@ -25,7 +28,7 @@ export default DropdownSelectBoxComponent.extend({
 
     return [
       {
-        id: "pinned",
+        id: PINNED,
         name: I18n.t(`topic_statuses.pinned${globally}.title`),
         description: this.site.mobileView
           ? null
@@ -33,7 +36,7 @@ export default DropdownSelectBoxComponent.extend({
         icon: "thumbtack"
       },
       {
-        id: "unpinned",
+        id: UNPINNED,
         name: I18n.t("topic_statuses.unpinned.title"),
         icon: "thumbtack unpinned",
         description: this.site.mobileView
@@ -43,15 +46,14 @@ export default DropdownSelectBoxComponent.extend({
     ];
   }),
 
-  actions: {
-    onSelect(value) {
-      const topic = this.topic;
+  @action
+  onChange(value) {
+    const topic = this.topic;
 
-      if (value === "unpinned") {
-        topic.clearPin();
-      } else {
-        topic.rePin();
-      }
+    if (value === UNPINNED) {
+      return topic.clearPin();
+    } else {
+      return topic.rePin();
     }
   }
 });
diff --git a/test/javascripts/components/select-kit/pinned-options-test.js.es6 b/test/javascripts/components/select-kit/pinned-options-test.js.es6
index 09bf69eb96..a32652498f 100644
--- a/test/javascripts/components/select-kit/pinned-options-test.js.es6
+++ b/test/javascripts/components/select-kit/pinned-options-test.js.es6
@@ -2,12 +2,12 @@ import selectKit from "helpers/select-kit-helper";
 import componentTest from "helpers/component-test";
 import Topic from "discourse/models/topic";
 
-const buildTopic = function() {
+const buildTopic = function(pinned = true) {
   return Topic.create({
     id: 1234,
     title: "Qunit Test Topic",
     deleted: false,
-    pinned: true
+    pinned
   });
 };
 
@@ -18,21 +18,38 @@ moduleForComponent("select-kit/pinned-options", {
   }
 });
 
-componentTest("updating the content refreshes the list", {
-  template: "{{pinned-options value=pinned topic=topic}}",
+componentTest("unpinning", {
+  template: "{{pinned-options value=topic.pinned topic=topic}}",
 
   beforeEach() {
     this.siteSettings.automatically_unpin_topics = false;
     this.set("topic", buildTopic());
-    this.set("pinned", "pinned");
   },
 
   async test(assert) {
     assert.equal(this.subject.header().name(), "pinned");
 
-    // we do it manually as clearPin is an ajax call
-    await this.set("pinned", false);
+    await this.subject.expand();
+    await this.subject.selectRowByValue("unpinned");
 
     assert.equal(this.subject.header().name(), "unpinned");
   }
 });
+
+componentTest("pinning", {
+  template: "{{pinned-options value=topic.pinned topic=topic}}",
+
+  beforeEach() {
+    this.siteSettings.automatically_unpin_topics = false;
+    this.set("topic", buildTopic(false));
+  },
+
+  async test(assert) {
+    assert.equal(this.subject.header().name(), "unpinned");
+
+    await this.subject.expand();
+    await this.subject.selectRowByValue("pinned");
+
+    assert.equal(this.subject.header().name(), "pinned");
+  }
+});

From 020c1b9cf354b8e84d23bed399baef8c3e4eaece Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 10 Mar 2020 12:22:56 +0100
Subject: [PATCH 0144/1830] FIX: correctly checks if component is in modal
 (#9157)

---
 app/assets/javascripts/select-kit/components/select-kit.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index 25aa3e68e7..39e167a24e 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -816,7 +816,7 @@ export default Component.extend(
 
         let placementStrategy = this.selectKit.options.placementStrategy;
         if (!placementStrategy) {
-          placementStrategy = this.inModal ? "fixed" : "absolute";
+          placementStrategy = inModal ? "fixed" : "absolute";
         }
 
         /* global Popper:true */

From 826b4793c085bff591b5b4d67672207350e9cfac Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Tue, 10 Mar 2020 08:56:42 -0300
Subject: [PATCH 0145/1830] FEATURE: Approve suspect users is now true by
 default. The suspect users list was removed (#9151)

---
 .../admin/templates/users-list.hbs            |  1 -
 app/jobs/scheduled/enqueue_suspect_users.rb   |  9 ++++++--
 config/locales/client.en.yml                  |  2 --
 config/site_settings.yml                      |  2 +-
 lib/admin_user_index_query.rb                 | 11 ----------
 .../components/admin_user_index_query_spec.rb | 21 -------------------
 .../acceptance/admin-users-list-test.js.es6   |  4 ++--
 .../helpers/create-pretender.js.es6           |  2 +-
 8 files changed, 11 insertions(+), 41 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/users-list.hbs b/app/assets/javascripts/admin/templates/users-list.hbs
index b533e10d92..2e1fe0c3ab 100644
--- a/app/assets/javascripts/admin/templates/users-list.hbs
+++ b/app/assets/javascripts/admin/templates/users-list.hbs
@@ -6,7 +6,6 @@
       {{nav-item route='adminUsersList.show' routeParam='staff' label='admin.users.nav.staff'}}
       {{nav-item route='adminUsersList.show' routeParam='suspended' label='admin.users.nav.suspended'}}
       {{nav-item route='adminUsersList.show' routeParam='silenced' label='admin.users.nav.silenced'}}
-      {{nav-item route='adminUsersList.show' routeParam='suspect' label='admin.users.nav.suspect'}}
       {{nav-item route='adminUsersList.show' routeParam='staged' label='admin.users.nav.staged'}}
       {{nav-item route='groups' label='groups.index.title'}}
 
diff --git a/app/jobs/scheduled/enqueue_suspect_users.rb b/app/jobs/scheduled/enqueue_suspect_users.rb
index 529dd058c0..9fc5196d82 100644
--- a/app/jobs/scheduled/enqueue_suspect_users.rb
+++ b/app/jobs/scheduled/enqueue_suspect_users.rb
@@ -7,8 +7,13 @@ module Jobs
     def execute(_args)
       return unless SiteSetting.approve_suspect_users
 
-      users = AdminUserIndexQuery.new
-        .suspect_users
+      users = User
+        .activated
+        .human_users
+        .joins(:user_profile, :user_stat)
+        .where("users.created_at <= ?", 1.day.ago)
+        .where("LENGTH(COALESCE(user_profiles.bio_raw, user_profiles.website, '')) > 0")
+        .where("user_stats.posts_read_count <= 1 AND user_stats.topics_entered <= 1")
         .joins("LEFT OUTER JOIN reviewables r ON r.target_id = users.id AND r.target_type = 'User'")
         .where('r.id IS NULL')
         .limit(10)
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 5b632f3bfd..dfee767514 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4141,7 +4141,6 @@ en:
           staff: "Staff"
           suspended: "Suspended"
           silenced: "Silenced"
-          suspect: "Suspect"
           staged: "Staged"
         approved: "Approved?"
         titles:
@@ -4158,7 +4157,6 @@ en:
           moderators: "Moderators"
           silenced: "Silenced Users"
           suspended: "Suspended Users"
-          suspect: "Suspect Users"
           staged: "Staged Users"
         not_verified: "Not verified"
         check_email:
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 42acc80a84..07d0c5638d 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -862,7 +862,7 @@ posting:
     default: 0
     enum: "TrustLevelSetting"
   approve_suspect_users:
-    default: false
+    default: true
   approve_unless_staged:
     default: false
   notify_about_queued_posts_after:
diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb
index 74b5d403e9..4d04e61fd2 100644
--- a/lib/admin_user_index_query.rb
+++ b/lib/admin_user_index_query.rb
@@ -78,16 +78,6 @@ class AdminUserIndexQuery
     end
   end
 
-  def suspect_users
-    @query
-      .activated
-      .human_users
-      .joins(:user_profile, :user_stat)
-      .where("users.created_at <= ?", 1.day.ago)
-      .where("LENGTH(COALESCE(user_profiles.bio_raw, user_profiles.website, '')) > 0")
-      .where("user_stats.posts_read_count <= 1 AND user_stats.topics_entered <= 1")
-  end
-
   def filter_by_query_classification
     case params[:query]
     when 'staff'      then @query.where("admin or moderator")
@@ -96,7 +86,6 @@ class AdminUserIndexQuery
     when 'silenced'   then @query.silenced
     when 'suspended'  then @query.suspended
     when 'pending'    then @query.not_suspended.where(approved: false, active: true)
-    when 'suspect'    then suspect_users
     when 'staged'     then @query.where(staged: true)
     end
   end
diff --git a/spec/components/admin_user_index_query_spec.rb b/spec/components/admin_user_index_query_spec.rb
index 8060066f88..971468523f 100644
--- a/spec/components/admin_user_index_query_spec.rb
+++ b/spec/components/admin_user_index_query_spec.rb
@@ -91,27 +91,6 @@ describe AdminUserIndexQuery do
 
   end
 
-  describe 'with a suspected user' do
-    fab!(:bot) { Fabricate(:active_user, id: -10, created_at: 1.day.ago) }
-    fab!(:regular_user) { Fabricate(:user, created_at: 1.day.ago) }
-    fab!(:user_with_bio) { Fabricate(:active_user, created_at: 1.day.ago) }
-    fab!(:user_with_website) { Fabricate(:user, created_at: 1.day.ago) }
-
-    before do
-      user_with_website.user_profile.website = 'https://example.com'
-      user_with_website.user_profile.save!
-    end
-
-    it 'finds the suspected user' do
-      bot
-      regular_user
-      user_with_bio
-      user_with_website
-      query = AdminUserIndexQuery.new(query: 'suspect')
-      expect(query.find_users).to contain_exactly(user_with_bio, user_with_website)
-    end
-  end
-
   describe "with a pending user" do
 
     fab!(:user) { Fabricate(:user, active: true, approved: false) }
diff --git a/test/javascripts/acceptance/admin-users-list-test.js.es6 b/test/javascripts/acceptance/admin-users-list-test.js.es6
index feb470bdda..1c41fce169 100644
--- a/test/javascripts/acceptance/admin-users-list-test.js.es6
+++ b/test/javascripts/acceptance/admin-users-list-test.js.es6
@@ -59,7 +59,7 @@ QUnit.test("switching tabs", async assert => {
   const activeUser = "eviltrout";
   const suspectUser = "sam";
   const activeTitle = I18n.t("admin.users.titles.active");
-  const suspectTitle = I18n.t("admin.users.titles.suspect");
+  const suspectTitle = I18n.t("admin.users.titles.new");
 
   await visit("/admin/users/list/active");
 
@@ -70,7 +70,7 @@ QUnit.test("switching tabs", async assert => {
       .includes(activeUser)
   );
 
-  await click('a[href="/admin/users/list/suspect"]');
+  await click('a[href="/admin/users/list/new"]');
 
   assert.equal(find(".admin-title h2").text(), suspectTitle);
   assert.ok(
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index 76cca6fa51..934b6a652b 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -637,7 +637,7 @@ export function applyDefaultHandlers(pretender) {
     return response(200, store);
   });
 
-  pretender.get("/admin/users/list/suspect.json", () => {
+  pretender.get("/admin/users/list/new.json", () => {
     return response(200, [
       {
         id: 2,

From e69b6379ad6989555a4cd5cc335d1b550b18522d Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Tue, 10 Mar 2020 09:01:40 -0400
Subject: [PATCH 0146/1830] FEATURE: Broader support for post uploads in video
 markup (#9152)

Ensures URLs in the following HTML attributes are included in post uploads:
- video poster
- source src
- track src
---
 app/models/post.rb       |  3 ++-
 spec/models/post_spec.rb | 18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/models/post.rb b/app/models/post.rb
index 751d8b721f..85432556e7 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -949,8 +949,9 @@ class Post < ActiveRecord::Base
     ]
 
     fragments ||= Nokogiri::HTML::fragment(self.cooked)
+    selectors = fragments.css("a/@href", "img/@src", "source/@src", "track/@src", "video/@poster")
 
-    links = fragments.css("a/@href", "img/@src").map do |media|
+    links = selectors.map do |media|
       src = media.value
       next if src.blank?
 
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index b7a97d7d2e..325f4febcc 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1528,6 +1528,9 @@ describe Post do
       upload2 = Fabricate(:upload)
       upload3 = Fabricate(:video_upload)
       upload4 = Fabricate(:upload)
+      upload5 = Fabricate(:upload)
+      upload6 = Fabricate(:video_upload)
+      upload7 = Fabricate(:upload, extension: "vtt")
 
       set_cdn_url "https://awesome.com/somepath"
 
@@ -1542,6 +1545,11 @@ describe Post do
       ![](http://example.com/external.png)
 
       #{Discourse.base_url}#{upload3.short_path}
+
+      <video poster="#{Discourse.base_url}#{upload5.url}">
+        <source src="#{Discourse.base_url}#{upload6.url}" type="video/mp4" />
+        <track src="#{Discourse.base_url}#{upload7.url}" label="English" kind="subtitles" srclang="en" default />
+      </video>
       RAW
 
       urls = []
@@ -1556,14 +1564,20 @@ describe Post do
         "#{GlobalSetting.cdn_url}#{upload1.url}",
         "#{GlobalSetting.cdn_url}#{upload4.url}",
         "#{Discourse.base_url}#{upload2.url}",
-        "#{Discourse.base_url}#{upload3.short_path}"
+        "#{Discourse.base_url}#{upload3.short_path}",
+        "#{Discourse.base_url}#{upload5.url}",
+        "#{Discourse.base_url}#{upload6.url}",
+        "#{Discourse.base_url}#{upload7.url}"
       )
 
       expect(paths).to contain_exactly(
         upload1.url,
         upload4.url,
         upload2.url,
-        nil
+        nil,
+        upload5.url,
+        upload6.url,
+        upload7.url
       )
     end
 

From 68328d2d647d7ee5039980003482a04d15511aa7 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Tue, 10 Mar 2020 09:37:54 -0400
Subject: [PATCH 0147/1830] DEV: Replace save-button partial with a component
 (#9066)

---
 .../components/save-controls.js.es6              |  7 ++++++-
 .../controllers/preferences/account.js.es6       |  3 +--
 .../controllers/preferences/categories.js.es6    |  3 +--
 .../controllers/preferences/emails.js.es6        |  3 +--
 .../controllers/preferences/interface.js.es6     |  3 +--
 .../controllers/preferences/notifications.js.es6 |  3 +--
 .../controllers/preferences/profile.js.es6       |  3 +--
 .../controllers/preferences/tags.js.es6          |  3 +--
 .../controllers/preferences/users.js.es6         |  3 +--
 .../mixins/preferences-tab-controller.js.es6     | 11 -----------
 .../templates/components/save-controls.hbs       |  9 ++++-----
 .../discourse/templates/preferences/account.hbs  |  6 +-----
 .../templates/preferences/categories.hbs         |  6 +-----
 .../discourse/templates/preferences/emails.hbs   |  6 +-----
 .../templates/preferences/interface.hbs          |  6 +-----
 .../templates/preferences/notifications.hbs      |  6 +-----
 .../discourse/templates/preferences/profile.hbs  |  6 +-----
 .../discourse/templates/preferences/tags.hbs     |  7 ++-----
 .../discourse/templates/preferences/users.hbs    |  7 ++-----
 .../templates/user/preferences/_save-button.hbs  | 11 -----------
 .../stylesheets/common/admin/admin_base.scss     |  5 +----
 .../acceptance/admin-site-text-test.js.es6       |  7 +++----
 .../acceptance/preferences-test.js.es6           | 16 ++++++++--------
 23 files changed, 40 insertions(+), 100 deletions(-)
 rename app/assets/javascripts/{admin => discourse}/components/save-controls.js.es6 (72%)
 delete mode 100644 app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6
 rename app/assets/javascripts/{admin => discourse}/templates/components/save-controls.hbs (50%)
 delete mode 100644 app/assets/javascripts/discourse/templates/user/preferences/_save-button.hbs

diff --git a/app/assets/javascripts/admin/components/save-controls.js.es6 b/app/assets/javascripts/discourse/components/save-controls.js.es6
similarity index 72%
rename from app/assets/javascripts/admin/components/save-controls.js.es6
rename to app/assets/javascripts/discourse/components/save-controls.js.es6
index 9da4e49fe2..d6d7d01e26 100644
--- a/app/assets/javascripts/admin/components/save-controls.js.es6
+++ b/app/assets/javascripts/discourse/components/save-controls.js.es6
@@ -3,10 +3,15 @@ import { or } from "@ember/object/computed";
 import Component from "@ember/component";
 
 export default Component.extend({
-  classNames: ["controls"],
+  classNames: ["controls", "save-button"],
 
   buttonDisabled: or("model.isSaving", "saveDisabled"),
 
+  didInsertElement() {
+    this._super(...arguments);
+    this.set("saved", false);
+  },
+
   @discourseComputed("model.isSaving")
   savingText(saving) {
     return saving ? "saving" : "save";
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
index 6cac06c1aa..463d5b9283 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
@@ -3,7 +3,6 @@ import Controller from "@ember/controller";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import discourseComputed from "discourse-common/utils/decorators";
-import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { propertyNotEqual, setting } from "discourse/lib/computed";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
@@ -15,7 +14,7 @@ import logout from "discourse/lib/logout";
 // Number of tokens shown by default.
 const DEFAULT_AUTH_TOKENS_COUNT = 2;
 
-export default Controller.extend(CanCheckEmails, PreferencesTabController, {
+export default Controller.extend(CanCheckEmails, {
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
index 4628234524..13baaf6fd2 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
@@ -1,10 +1,9 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { or } from "@ember/object/computed";
 import Controller from "@ember/controller";
-import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Controller.extend(PreferencesTabController, {
+export default Controller.extend({
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
index 2f7d0832c9..880b50f7bd 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
@@ -1,6 +1,5 @@
 import { equal } from "@ember/object/computed";
 import Controller from "@ember/controller";
-import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
@@ -10,7 +9,7 @@ const EMAIL_LEVELS = {
   NEVER: 2
 };
 
-export default Controller.extend(PreferencesTabController, {
+export default Controller.extend({
   emailMessagesLevelAway: equal(
     "model.user_option.email_messages_level",
     EMAIL_LEVELS.ONLY_WHEN_AWAY
diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
index 1fbed8353b..ea68080ccd 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
@@ -1,6 +1,5 @@
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
-import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { setDefaultHomepage } from "discourse/lib/utilities";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import {
@@ -27,7 +26,7 @@ const USER_HOMES = {
 const TEXT_SIZES = ["smaller", "normal", "larger", "largest"];
 const TITLE_COUNT_MODES = ["notifications", "contextual"];
 
-export default Controller.extend(PreferencesTabController, {
+export default Controller.extend({
   @discourseComputed("makeThemeDefault")
   saveAttrNames(makeDefault) {
     let attrs = [
diff --git a/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
index 8030885efb..078d0b3fbb 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
@@ -1,9 +1,8 @@
 import Controller from "@ember/controller";
-import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Controller.extend(PreferencesTabController, {
+export default Controller.extend({
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
index f6005e355d..57d8759ac8 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
@@ -2,13 +2,12 @@ import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
-import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { cookAsync } from "discourse/lib/text";
 import { ajax } from "discourse/lib/ajax";
 import showModal from "discourse/lib/show-modal";
 
-export default Controller.extend(PreferencesTabController, {
+export default Controller.extend({
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
index 1aede6792d..90d41ccfa1 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
@@ -1,9 +1,8 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
-import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Controller.extend(PreferencesTabController, {
+export default Controller.extend({
   init() {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/users.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/users.js.es6
index ba3e866901..b0ac026025 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/users.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/users.js.es6
@@ -2,10 +2,9 @@ import { makeArray } from "discourse-common/lib/helpers";
 import { alias, gte, or } from "@ember/object/computed";
 import { action, computed } from "@ember/object";
 import Controller from "@ember/controller";
-import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Controller.extend(PreferencesTabController, {
+export default Controller.extend({
   ignoredUsernames: alias("model.ignored_usernames"),
   userIsMemberOrAbove: gte("model.trust_level", 2),
   ignoredEnabled: or("userIsMemberOrAbove", "model.staff"),
diff --git a/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6 b/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6
deleted file mode 100644
index 4dabeb3fa0..0000000000
--- a/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6
+++ /dev/null
@@ -1,11 +0,0 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import Mixin from "@ember/object/mixin";
-
-export default Mixin.create({
-  saved: false,
-
-  @discourseComputed("model.isSaving")
-  saveButtonText(isSaving) {
-    return isSaving ? I18n.t("saving") : I18n.t("save");
-  }
-});
diff --git a/app/assets/javascripts/admin/templates/components/save-controls.hbs b/app/assets/javascripts/discourse/templates/components/save-controls.hbs
similarity index 50%
rename from app/assets/javascripts/admin/templates/components/save-controls.hbs
rename to app/assets/javascripts/discourse/templates/components/save-controls.hbs
index d6974ea108..013cb6e0b7 100644
--- a/app/assets/javascripts/admin/templates/components/save-controls.hbs
+++ b/app/assets/javascripts/discourse/templates/components/save-controls.hbs
@@ -1,7 +1,6 @@
 {{d-button action=action disabled=buttonDisabled label=savingText class="btn-primary save-changes"}}
+{{#if saved}}
+  <span class='saved'>{{i18n 'saved'}}</span>
+{{/if}}
+
 {{yield}}
-<div class='save-messages'>
-  {{#if saved}}
-    <div class='saved'>{{i18n 'saved'}}</div>
-  {{/if}}
-</div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 2fe58dbf59..8a505401fa 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -215,11 +215,7 @@
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
 {{#if canSaveUser}}
-  <div class="control-group save-button">
-    <div class="controls">
-      {{partial 'user/preferences/save-button'}}
-    </div>
-  </div>
+  {{save-controls model=model action=(action "save") saved=saved}}
 {{/if}}
 
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index 2eef6ceac7..b0fc96c15b 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -62,11 +62,7 @@
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
 {{#if canSave}}
-<div class="control-group save-button">
-  <div class="controls">
-    {{partial 'user/preferences/save-button'}}
-  </div>
-</div>
+  {{save-controls model=model action=(action "save") saved=saved}}
 {{else}}
   {{i18n 'user.no_category_access'}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index ef99c5be12..d277cea511 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -93,8 +93,4 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-<div class="control-group save-button">
-  <div class="controls">
-    {{partial 'user/preferences/save-button'}}
-  </div>
-</div>
+{{save-controls model=model action=(action "save") saved=saved}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
index d3493d0127..338a7d883e 100644
--- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
@@ -99,8 +99,4 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-<div class="control-group save-button">
-  <div class="controls">
-    {{partial 'user/preferences/save-button'}}
-  </div>
-</div>
+{{save-controls model=model action=(action "save") saved=saved}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
index 9b1b8b9858..03ca349d67 100644
--- a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
@@ -68,8 +68,4 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-<div class="control-group save-button">
-  <div class="controls">
-    {{partial 'user/preferences/save-button'}}
-  </div>
-</div>
+{{save-controls model=model action=(action "save") saved=saved}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index 1a1909983b..b0040894dc 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -95,8 +95,4 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-<div class="control-group save-button">
-  <div class="controls">
-    {{partial 'user/preferences/save-button'}}
-  </div>
-</div>
+{{save-controls model=model action=(action "save") saved=saved}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/tags.hbs b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
index 5aa4ced4b2..906d7761c0 100644
--- a/app/assets/javascripts/discourse/templates/preferences/tags.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
@@ -59,9 +59,6 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-<div class="control-group save-button">
-  <div class="controls">
-    {{partial 'user/preferences/save-button'}}
-  </div>
-</div>
+{{save-controls model=model action=(action "save") saved=saved}}
+
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/users.hbs b/app/assets/javascripts/discourse/templates/preferences/users.hbs
index 5080437149..d4c183c3a0 100644
--- a/app/assets/javascripts/discourse/templates/preferences/users.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/users.hbs
@@ -27,8 +27,5 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-<div class="control-group save-button">
-  <div class="controls">
-    {{partial 'user/preferences/save-button'}}
-  </div>
-</div>
+
+{{#save-controls model=model action=(action "save") saved=saved}}{{/save-controls}}
diff --git a/app/assets/javascripts/discourse/templates/user/preferences/_save-button.hbs b/app/assets/javascripts/discourse/templates/user/preferences/_save-button.hbs
deleted file mode 100644
index c218e4e444..0000000000
--- a/app/assets/javascripts/discourse/templates/user/preferences/_save-button.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-{{#d-button
-  class="btn-primary save-user"
-  action=(action "save")
-  disabled=model.isSaving
-}}
-  {{saveButtonText}}
-{{/d-button}}
-
-{{#if saved}}
-  <span class='saved-user'>{{i18n 'saved'}}</span>
-{{/if}}
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 2af39f5675..61f73bc2b2 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -244,7 +244,7 @@ $mobile-breakpoint: 700px;
       width: 100%;
       max-width: 800px;
     }
-    .save-messages,
+    .save-button,
     .title {
       margin-bottom: 1em;
     }
@@ -423,9 +423,6 @@ $mobile-breakpoint: 700px;
   }
   .controls {
     @include clearfix;
-    .save-messages {
-      margin-top: 1em;
-    }
   }
 }
 
diff --git a/test/javascripts/acceptance/admin-site-text-test.js.es6 b/test/javascripts/acceptance/admin-site-text-test.js.es6
index ea8c8c5d90..0f25de85d0 100644
--- a/test/javascripts/acceptance/admin-site-text-test.js.es6
+++ b/test/javascripts/acceptance/admin-site-text-test.js.es6
@@ -27,15 +27,14 @@ QUnit.test("edit and revert a site text by key", async assert => {
   await visit("/admin/customize/site_texts/site.test");
 
   assert.equal(find(".title h3").text(), "site.test");
-  assert.ok(!exists(".save-messages .saved"));
-  assert.ok(!exists(".save-messages .saved"));
+  assert.ok(!exists(".saved"));
   assert.ok(!exists(".revert-site-text"));
 
   // Change the value
   await fillIn(".site-text-value", "New Test Value");
   await click(".save-changes");
 
-  assert.ok(exists(".save-messages .saved"));
+  assert.ok(exists(".saved"));
   assert.ok(exists(".revert-site-text"));
 
   // Revert the changes
@@ -45,6 +44,6 @@ QUnit.test("edit and revert a site text by key", async assert => {
 
   await click(".bootbox.modal .btn-primary");
 
-  assert.ok(!exists(".save-messages .saved"));
+  assert.ok(!exists(".saved"));
   assert.ok(!exists(".revert-site-text"));
 });
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6
index 46b11864ed..66af8348ab 100644
--- a/test/javascripts/acceptance/preferences-test.js.es6
+++ b/test/javascripts/acceptance/preferences-test.js.es6
@@ -77,10 +77,10 @@ QUnit.test("update some fields", async assert => {
   assert.ok(exists(".user-preferences"), "it shows the preferences");
 
   const savePreferences = async () => {
-    assert.ok(!exists(".saved-user"), "it hasn't been saved yet");
-    await click(".save-user");
-    assert.ok(exists(".saved-user"), "it displays the saved message");
-    find(".saved-user").remove();
+    assert.ok(!exists(".saved"), "it hasn't been saved yet");
+    await click(".save-changes");
+    assert.ok(exists(".saved"), "it displays the saved message");
+    find(".saved").remove();
   };
 
   fillIn(".pref-name input[type=text]", "Jon Snow");
@@ -124,10 +124,10 @@ QUnit.test("font size change", async assert => {
   $.removeCookie("text_size");
 
   const savePreferences = async () => {
-    assert.ok(!exists(".saved-user"), "it hasn't been saved yet");
-    await click(".save-user");
-    assert.ok(exists(".saved-user"), "it displays the saved message");
-    find(".saved-user").remove();
+    assert.ok(!exists(".saved"), "it hasn't been saved yet");
+    await click(".save-changes");
+    assert.ok(exists(".saved"), "it displays the saved message");
+    find(".saved").remove();
   };
 
   await visit("/u/eviltrout/preferences/interface");

From 25b74e252b1fef7c1675c2ae55bb164ffcc424f9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Mar 2020 10:14:52 -0400
Subject: [PATCH 0148/1830] Build(deps): Bump aws-sdk-s3 from 1.60.2 to 1.61.0
 (#9153)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.60.2 to 1.61.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.60.2...v1.61.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5d4ea41328..cc20805a01 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,16 +45,16 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.272.0)
-    aws-sdk-core (3.89.1)
+    aws-partitions (1.281.0)
+    aws-sdk-core (3.91.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.29.0)
+    aws-sdk-kms (1.30.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.60.2)
+    aws-sdk-s3 (1.61.0)
       aws-sdk-core (~> 3, >= 3.83.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)

From 08b992d2572cb035f36a79cd93a105289f401469 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Mar 2020 10:20:34 -0400
Subject: [PATCH 0149/1830] Build(deps): Bump aws-sdk-sns from 1.21.0 to 1.22.0
 (#9154)

Bumps [aws-sdk-sns](https://github.com/aws/aws-sdk-ruby) from 1.21.0 to 1.22.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-sns/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.21.0...1.22.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index cc20805a01..e00fc70b37 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,7 +58,7 @@ GEM
       aws-sdk-core (~> 3, >= 3.83.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.21.0)
+    aws-sdk-sns (1.22.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.1)

From aec26ad2f01d6aa4b590878658f98fad38650e41 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 10 Mar 2020 15:35:40 +0100
Subject: [PATCH 0150/1830] FIX: Preserve TopicCreator's timestamp resolution
 (#9158)

Continuation of #9140 (e35bc8b). It's the last piece required for #9141.
---
 lib/topic_creator.rb                  | 12 +++++++++--
 spec/components/topic_creator_spec.rb | 30 ++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb
index 654fc716f4..41558784f3 100644
--- a/lib/topic_creator.rb
+++ b/lib/topic_creator.rb
@@ -118,9 +118,9 @@ class TopicCreator
 
     topic_params[:category_id] = category.id if category.present?
 
-    topic_params[:created_at] = Time.zone.parse(@opts[:created_at].to_s) if @opts[:created_at].present?
+    topic_params[:created_at] = convert_time(@opts[:created_at]) if @opts[:created_at].present?
 
-    topic_params[:pinned_at] = Time.zone.parse(@opts[:pinned_at].to_s) if @opts[:pinned_at].present?
+    topic_params[:pinned_at] = convert_time(@opts[:pinned_at]) if @opts[:pinned_at].present?
     topic_params[:pinned_globally] = @opts[:pinned_globally] if @opts[:pinned_globally].present?
 
     if SiteSetting.topic_featured_link_enabled && @opts[:featured_link].present? && @guardian.can_edit_featured_link?(topic_params[:category_id])
@@ -130,6 +130,14 @@ class TopicCreator
     topic_params
   end
 
+  def convert_time(timestamp)
+    if timestamp.is_a?(Time)
+      timestamp
+    else
+      Time.zone.parse(timestamp.to_s)
+    end
+  end
+
   def find_category
     @category ||= begin
       # PM can't have a category
diff --git a/spec/components/topic_creator_spec.rb b/spec/components/topic_creator_spec.rb
index 36a8717b9a..d13d48c3f0 100644
--- a/spec/components/topic_creator_spec.rb
+++ b/spec/components/topic_creator_spec.rb
@@ -3,7 +3,6 @@
 require 'rails_helper'
 
 describe TopicCreator do
-
   fab!(:user)      { Fabricate(:user, trust_level: TrustLevel[2]) }
   fab!(:moderator) { Fabricate(:moderator) }
   fab!(:admin)     { Fabricate(:admin) }
@@ -237,5 +236,34 @@ describe TopicCreator do
         end
       end
     end
+
+    context 'setting timestamps' do
+      it 'supports Time instances' do
+        freeze_time
+
+        topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(
+          created_at: 1.week.ago,
+          pinned_at: 3.days.ago
+        ))
+
+        expect(topic.created_at).to be_within(1.second).of(1.week.ago)
+        expect(topic.pinned_at).to be_within(1.second).of(3.days.ago)
+      end
+
+      it 'supports strings' do
+        freeze_time
+
+        time1 = Time.zone.parse('2019-09-02')
+        time2 = Time.zone.parse('2020-03-10 15:17')
+
+        topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(
+          created_at: '2019-09-02',
+          pinned_at: '2020-03-10 15:17'
+        ))
+
+        expect(topic.created_at).to be_within(1.second).of(time1)
+        expect(topic.pinned_at).to be_within(1.second).of(time2)
+      end
+    end
   end
 end

From d436b600fba4cea846a5e96c235c507441965e05 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 10 Mar 2020 16:46:57 +0100
Subject: [PATCH 0151/1830] DEV: enforces ember-template-lint:
 no-triple-curlies (#9150)

This pr replaces `{{{ }}}` usage by a {{html-safe}} helper. While it doesn't solve the underlying issue, it gives us a path forward without risking breaking too much existing behavior.

Also introduces an htmlSafe computed macro:

```
import { htmlSafe } from "discourse/lib/computed";

htmlDescription: htmlSafe("description")
```

Overtime {{html-safe}} usage should be removed and moved to components properties or specialized components/helpers.
---
 .template-lintrc.js                           |  3 +-
 .../admin/templates/badges-award.hbs          |  6 +-
 .../admin/templates/badges-index.hbs          |  2 +-
 .../components/admin-report-storage-stats.hbs |  2 +-
 .../components/admin-report-table-cell.hbs    |  2 +-
 .../templates/components/admin-report.hbs     |  2 +-
 .../components/admin-user-field-item.hbs      |  2 +-
 .../components/penalty-post-action.hbs        |  2 +-
 .../templates/components/silence-details.hbs  |  2 +-
 .../components/site-settings/bool.hbs         |  2 +-
 .../site-settings/category-list.hbs           |  2 +-
 .../components/site-settings/category.hbs     |  2 +-
 .../components/site-settings/color.hbs        |  2 +-
 .../components/site-settings/compact-list.hbs |  2 +-
 .../components/site-settings/enum.hbs         |  2 +-
 .../components/site-settings/group-list.hbs   |  2 +-
 .../components/site-settings/host-list.hbs    |  2 +-
 .../components/site-settings/list.hbs         |  2 +-
 .../components/site-settings/secret-list.hbs  |  2 +-
 .../components/site-settings/string.hbs       |  2 +-
 .../components/site-settings/tag-list.hbs     |  2 +-
 .../components/site-settings/upload.hbs       |  2 +-
 .../site-settings/uploaded-image-list.hbs     |  2 +-
 .../components/site-settings/url-list.hbs     |  2 +-
 .../components/site-settings/value-list.hbs   |  2 +-
 .../components/suspension-details.hbs         |  4 +-
 .../templates/components/themes-list-item.hbs |  6 +-
 .../templates/components/themes-list.hbs      |  6 +-
 .../templates/customize-themes-index.hbs      |  4 +-
 .../admin/templates/customize-themes-show.hbs |  2 +-
 .../admin/templates/dashboard-problems.hbs    |  2 +-
 .../admin/templates/dashboard_general.hbs     |  2 +-
 .../admin/templates/email-advanced-test.hbs   |  4 +-
 .../admin/templates/email-preview-digest.hbs  |  2 +-
 .../javascripts/admin/templates/embedding.hbs |  2 +-
 .../templates/logs/staff-action-logs.hbs      |  2 +-
 .../templates/modal/admin-badge-preview.hbs   |  8 +-
 .../templates/modal/admin-install-theme.hbs   |  8 +-
 .../templates/modal/admin-theme-change.hbs    |  2 +-
 .../templates/modal/admin-theme-item.hbs      |  2 +-
 .../admin/templates/search-logs-term.hbs      |  4 +-
 .../admin/templates/user-index.hbs            |  8 +-
 .../admin/templates/users-list-show.hbs       |  8 +-
 .../discourse-common/helpers/html-safe.js.es6 |  6 ++
 .../discourse-common/helpers/i18n.js.es6      |  3 +-
 .../discourse/components/text-overflow.js.es6 | 11 +++
 .../discourse/helpers/application.js.es6      | 12 +--
 .../discourse/helpers/dir-span.js.es6         |  3 +-
 .../discourse/helpers/format-age.js.es6       |  5 +-
 .../javascripts/discourse/lib/computed.js.es6 | 16 ++++
 .../javascripts/discourse/templates/about.hbs |  2 +-
 .../templates/account-created/index.hbs       |  2 +-
 .../templates/account-created/resent.hbs      |  2 +-
 .../discourse/templates/badges/show.hbs       |  2 +-
 .../templates/components/about-page-users.hbs |  2 +-
 .../templates/components/badge-card.hbs       |  2 +-
 .../templates/components/categories-boxes.hbs |  2 +-
 .../templates/components/categories-only.hbs  |  8 +-
 .../templates/components/d-button.hbs         |  2 +-
 .../templates/components/d-editor.hbs         |  2 +-
 .../templates/components/discourse-banner.hbs |  4 +-
 .../components/discourse-linked-text.hbs      |  2 +-
 .../components/edit-category-general.hbs      |  6 +-
 .../components/edit-category-security.hbs     |  2 +-
 .../templates/components/featured-topic.hbs   |  4 +-
 .../templates/components/flag-action-type.hbs |  4 +-
 .../templates/components/footer-message.hbs   |  2 +-
 .../templates/components/global-notice.hbs    |  4 +-
 .../components/group-card-contents.hbs        |  2 +-
 .../templates/components/group-post.hbs       |  6 +-
 .../templates/components/invite-panel.hbs     |  4 +-
 .../templates/components/ip-lookup.hbs        |  2 +-
 .../components/mobile-category-topic.hbs      |  2 +-
 .../templates/components/related-messages.hbs |  2 +-
 .../reviewable-conversation-post.hbs          |  2 +-
 .../components/reviewable-flagged-post.hbs    |  2 +-
 .../templates/components/reviewable-item.hbs  |  2 +-
 .../templates/components/reviewable-score.hbs |  2 +-
 .../components/second-factor-form.hbs         |  2 +-
 .../templates/components/share-panel.hbs      |  2 +-
 .../templates/components/share-popup.hbs      |  2 +-
 .../templates/components/share-source.hbs     |  2 +-
 .../components/shared-draft-controls.hbs      |  2 +-
 .../templates/components/suggested-topics.hbs |  2 +-
 .../templates/components/tag-info.hbs         |  2 +-
 .../templates/components/text-overflow.hbs    |  2 +-
 .../templates/components/topic-entrance.hbs   |  4 +-
 .../components/user-card-contents.hbs         |  2 +-
 .../components/user-fields/confirm.hbs        |  4 +-
 .../components/user-fields/dropdown.hbs       |  4 +-
 .../templates/components/user-fields/text.hbs |  4 +-
 .../templates/components/user-stat.hbs        |  2 +-
 .../templates/components/user-stream-item.hbs |  8 +-
 .../components/user-summary-topic.hbs         |  2 +-
 .../discourse/templates/composer.hbs          |  4 +-
 .../templates/composer/custom-body.hbs        |  2 +-
 .../templates/composer/education.hbs          |  2 +-
 .../templates/composer/group-mentioned.hbs    |  2 +-
 .../discourse/templates/discovery.hbs         |  2 +-
 .../discourse/templates/full-page-search.hbs  |  6 +-
 .../javascripts/discourse/templates/group.hbs |  2 +-
 .../discourse/templates/groups/index.hbs      |  2 +-
 .../discourse/templates/invites/show.hbs      |  4 +-
 .../templates/list/activity-column.hbr        |  2 +-
 .../templates/list/topic-excerpt.hbr          |  2 +-
 .../mobile/components/basic-topic-list.hbs    |  4 +-
 .../mobile/components/categories-only.hbs     |  2 +-
 .../mobile/components/mobile-nav.hbs          |  2 +-
 .../templates/modal/activation-resent.hbs     |  2 +-
 .../discourse/templates/modal/auth-token.hbs  |  6 +-
 .../templates/modal/avatar-selector.hbs       |  6 +-
 .../discourse/templates/modal/bookmark.hbs    |  2 +-
 .../modal/bulk-notification-level.hbs         |  2 +-
 .../templates/modal/change-owner.hbs          |  2 +-
 .../templates/modal/create-account.hbs        |  2 +-
 .../modal/delete-topic-disallowed.hbs         |  2 +-
 .../templates/modal/edit-category.hbs         |  2 +-
 .../templates/modal/feature-topic.hbs         | 22 ++---
 .../templates/modal/forgot-password.hbs       |  2 +-
 .../discourse/templates/modal/history.hbs     | 10 +-
 .../modal/keyboard-shortcuts-help.hbs         | 94 +++++++++----------
 .../templates/modal/move-to-topic.hbs         | 10 +-
 .../templates/modal/not-activated.hbs         |  2 +-
 .../templates/modal/post-enqueued.hbs         |  2 +-
 .../modal/second-factor-add-security-key.hbs  |  2 +-
 .../modal/second-factor-add-totp.hbs          |  4 +-
 .../modal/second-factor-backup-edit.hbs       |  2 +-
 .../templates/modal/topic-bulk-actions.hbs    |  2 +-
 .../templates/navigation/category.hbs         |  2 +-
 .../templates/preferences-second-factor.hbs   |  2 +-
 .../templates/preferences/account.hbs         |  2 +-
 .../templates/preferences/emails.hbs          |  2 +-
 .../templates/preferences/profile.hbs         |  2 +-
 .../discourse/templates/static.hbs            |  2 +-
 .../javascripts/discourse/templates/topic.hbs |  6 +-
 .../discourse/templates/unknown.hbs           |  2 +-
 .../discourse/templates/user-invited-show.hbs |  8 +-
 .../javascripts/discourse/templates/user.hbs  |  4 +-
 .../discourse/templates/user/stream.hbs       |  2 +-
 .../discourse/templates/user/summary.hbs      |  2 +-
 .../templates/components/category-row.hbs     |  4 +-
 .../dropdown-select-box-row.hbs               |  4 +-
 .../templates/components/pinned-button.hbs    |  2 +-
 .../components/topic-notifications-button.hbs |  2 +-
 .../templates/components/radio-button.hbs     |  2 +-
 .../templates/components/wizard-field.hbs     |  4 +-
 .../templates/components/wizard-step.hbs      |  2 +-
 .../templates/discourse_topic_onebox.hbs      |  6 +-
 .../templates/discourse_user_onebox.hbs       | 10 +-
 .../discourse-local-dates-create-form.hbs     |  2 +-
 .../components/html-safe-helper-test.js.es6   | 14 +++
 test/javascripts/lib/computed-test.js.es6     | 12 ++-
 152 files changed, 345 insertions(+), 284 deletions(-)
 create mode 100644 app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
 create mode 100644 test/javascripts/components/html-safe-helper-test.js.es6

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 6783c6d94e..29bf420298 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -11,6 +11,7 @@ module.exports = {
     "no-unnecessary-concat": true,
     "no-unused-block-params": true,
     "no-unbound": true,
-    "simple-unless": true
+    "simple-unless": true,
+    "no-triple-curlies": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/badges-award.hbs b/app/assets/javascripts/admin/templates/badges-award.hbs
index b13462bf33..d0082dc349 100644
--- a/app/assets/javascripts/admin/templates/badges-award.hbs
+++ b/app/assets/javascripts/admin/templates/badges-award.hbs
@@ -9,11 +9,11 @@
           {{icon-or-image model}}
           <span class="badge-display-name">{{model.name}}</span>
         {{else}}
-          <span class='badge-placeholder'>{{I18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+          <span class='badge-placeholder'>{{i18n 'admin.badges.mass_award.no_badge_selected'}}</span>
         {{/if}}
       </div>
       <div>
-        <h4>{{I18n 'admin.badges.mass_award.upload_csv'}}</h4>
+        <h4>{{i18n 'admin.badges.mass_award.upload_csv'}}</h4>
         <input type='file' id='massAwardCSVUpload' accept='.csv'>
       </div>
       <div>
@@ -34,6 +34,6 @@
       {{/link-to}}
     </form>
   {{else}}
-    <span class='badge-required'>{{I18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+    <span class='badge-required'>{{i18n 'admin.badges.mass_award.no_badge_selected'}}</span>
   {{/if}}
 {{/d-section}}
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index fd08e67279..49c5945ea1 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -7,7 +7,7 @@
         {{#each badgeIntroLinks as |link|}}
           <a href={{link.href}} class="external-link" target="_blank" rel="noopener">
             {{d-icon link.icon}}
-            <span>{{I18n link.text}}</span>
+            <span>{{i18n link.text}}</span>
           </a>
         {{/each}}
       </div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
index fbb9f80a64..d6e42cd414 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
@@ -15,7 +15,7 @@
 
       {{#if backupStats.last_backup_taken_at}}
         <br>
-        {{{i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true")}}}
+        {{i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true")}}
       {{/if}}
     </p>
   </div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
index 973e8412be..fb8f2e4cdc 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
@@ -1 +1 @@
-{{{formatedValue}}}
+{{html-safe formatedValue}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index be9c2ee8d7..48bd58cab9 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -199,6 +199,6 @@
 {{/conditional-loading-section}}
 {{else}}
   <div class="alert alert-info">
-    {{{disabledLabel}}}
+    {{html-safe disabledLabel}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
index 269d6babc2..211cc00b51 100644
--- a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
@@ -46,7 +46,7 @@
     <div class="form-display">
       <strong>{{userField.name}}</strong>
       <br>
-      {{{userField.description}}}
+      {{html-safe userField.description}}
     </div>
     <div class="form-display">{{fieldName}}</div>
     <div class="form-element controls">
diff --git a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
index 1a672329cd..a6c848541f 100644
--- a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
+++ b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
@@ -1,7 +1,7 @@
 <div class='penalty-post-controls'>
   <label>
     <div class='penalty-post-label'>
-      {{{i18n 'admin.user.penalty_post_actions'}}}
+      {{i18n 'admin.user.penalty_post_actions'}}
     </div>
   </label>
   {{combo-box
diff --git a/app/assets/javascripts/admin/templates/components/silence-details.hbs b/app/assets/javascripts/admin/templates/components/silence-details.hbs
index 3f7c19d5ba..af1b4980d5 100644
--- a/app/assets/javascripts/admin/templates/components/silence-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/silence-details.hbs
@@ -1,7 +1,7 @@
 <div class='reason-controls'>
   <label>
     <div class='silence-reason-label'>
-      {{{i18n 'admin.user.silence_reason_label'}}}
+      {{i18n 'admin.user.silence_reason_label'}}
     </div>
     </label>
     {{text-field
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
index 1c6c2101ae..11384580c1 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
@@ -1,5 +1,5 @@
 <label>
   {{input type="checkbox" checked=enabled}}
-  <span>{{{setting.description}}}</span>
+  <span>{{html-safe setting.description}}</span>
   {{setting-validation-message message=validationMessage}}
 </label>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
index 6d8871b306..b9609e2843 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
@@ -3,5 +3,5 @@
   onChange=(action "onChangeSelectedCategories")
 }}
 
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
index 4f23fcc021..4358b408de 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
@@ -4,4 +4,4 @@
   onChange=(action (mut value))
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
index baf81ab389..7b9b5bf2a8 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
@@ -6,4 +6,4 @@
   onChangeColor=(action "onChangeColor")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class="desc">{{{setting.description}}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
index 621baec0b1..1e7e369b93 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
@@ -8,4 +8,4 @@
 }}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
index dc33e28df5..0b4104086e 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
@@ -15,5 +15,5 @@
 {{setting-validation-message message=validationMessage}}
 
 <div class='desc'>
-  {{{setting.description}}}
+  {{html-safe setting.description}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
index 8f4263a72e..091573eb53 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
@@ -7,4 +7,4 @@
   onChange=(action "onChangeGroupListSetting")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
index 5277c26c69..70366aba38 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_host"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
index 268723c92d..090cc2a5f1 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value inputDelimiter="|" choices=setting.choices}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
index a4ff6f1bd4..7451959841 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
@@ -1,3 +1,3 @@
 {{secret-value-list setting=setting values=value isSecret=isSecret}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
index d71278f723..160f041df9 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
@@ -7,4 +7,4 @@
 {{/if}}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
index 271e4d0326..21e7e1ab0a 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
@@ -1,3 +1,3 @@
 {{tag-chooser tags=selectedTags}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
index 86940d8633..2758b7be5a 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
@@ -1,2 +1,2 @@
 {{site-settings-image-uploader imageUrl=value placeholderUrl=setting.placeholder type="site_setting"}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
index 82dc38d653..146c9d3722 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
@@ -1,2 +1,2 @@
 {{d-button label="admin.site_settings.uploaded_image_list.label" action=(action "showUploadModal") actionParam=(hash value=value setting=setting)}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
index 67db58f8ea..7a6cdc517b 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_url"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
index 3003b375ee..234ec83f3c 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/suspension-details.hbs b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
index 0f2aa0fc84..4dcc606b2b 100644
--- a/app/assets/javascripts/admin/templates/components/suspension-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
@@ -2,9 +2,9 @@
   <label>
     <div class='suspend-reason-label'>
       {{#if siteSettings.hide_suspension_reasons}}
-        {{{i18n 'admin.user.suspend_reason_hidden_label'}}}
+        {{i18n 'admin.user.suspend_reason_hidden_label'}}
       {{else}}
-        {{{i18n 'admin.user.suspend_reason_label'}}}
+        {{i18n 'admin.user.suspend_reason_label'}}
       {{/if}}
     </div>
   </label>
diff --git a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
index 1286937f8a..0c253e0214 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
@@ -28,14 +28,14 @@
 
   {{#if displayComponents}}
     <div class="components-list">
-      <span class="components">{{{childrenString}}}</span>
+      <span class="components">{{html-safe childrenString}}</span>
 
       {{#if displayHasMore}}
         <a href {{action "toggleChildrenExpanded"}} class="others-count">
           {{#if childrenExpanded}}
-            {{I18n "admin.customize.theme.collapse"}}
+            {{i18n "admin.customize.theme.collapse"}}
           {{else}}
-            {{I18n "admin.customize.theme.and_x_more" count=moreCount}}
+            {{i18n "admin.customize.theme.and_x_more" count=moreCount}}
           {{/if}}
         </a>
       {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/themes-list.hbs b/app/assets/javascripts/admin/templates/components/themes-list.hbs
index 29935b95b8..4654371a23 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list.hbs
@@ -25,9 +25,9 @@
         <div class="themes-list-item inactive-indicator">
           <span class="empty">
             {{#if themesTabActive}}
-              {{I18n "admin.customize.theme.inactive_themes"}}
+              {{i18n "admin.customize.theme.inactive_themes"}}
             {{else}}
-              {{I18n "admin.customize.theme.inactive_components"}}
+              {{i18n "admin.customize.theme.inactive_components"}}
             {{/if}}
           </span>
         </div>
@@ -41,7 +41,7 @@
     {{/if}}
   {{else}}
     <div class="themes-list-item">
-      <span class="empty">{{I18n "admin.customize.theme.empty"}}</span>
+      <span class="empty">{{i18n "admin.customize.theme.empty"}}</span>
     </div>
   {{/if}}
 
diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
index 0a6060724b..32ad33db10 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-index.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
@@ -1,7 +1,7 @@
 <div class="themes-intro admin-intro">
   <img src={{womanArtistEmojiURL}}>
   <div class="content-wrapper">
-    <h1>{{I18n "admin.customize.theme.themes_intro"}}</h1>
+    <h1>{{i18n "admin.customize.theme.themes_intro"}}</h1>
      <div class="create-actions">
       {{d-button action=(route-action "installModal") icon="upload" label="admin.customize.install" class="btn-primary"}}
     </div>
@@ -9,7 +9,7 @@
       {{#each externalResources as |resource|}}
         <a href={{resource.link}} class="external-link" rel="noopener" target="_blank">
           {{d-icon resource.icon}}
-          {{I18n resource.key}}
+          {{i18n resource.key}}
         </a>
       {{/each}}
     </div>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 9fb7fcb4cf..b4c4e9a8f4 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -89,7 +89,7 @@
 
         {{#if showRemoteError}}
           <div class="error-message">
-            {{d-icon "exclamation-triangle"}} {{I18n "admin.customize.theme.repo_unreachable"}}
+            {{d-icon "exclamation-triangle"}} {{i18n "admin.customize.theme.repo_unreachable"}}
           </div>
           <div class="raw-error">
             <code>{{model.remoteError}}</code>
diff --git a/app/assets/javascripts/admin/templates/dashboard-problems.hbs b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
index 0f0b1f9d29..5f95987e73 100644
--- a/app/assets/javascripts/admin/templates/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
@@ -12,7 +12,7 @@
         <div class="problem-messages">
           <ul>
             {{#each problems as |problem|}}
-              <li>{{{problem}}}</li>
+              <li>{{html-safe problem}}</li>
             {{/each}}
           </ul>
         </div>
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index 19f892ab0f..d190b7664b 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -142,7 +142,7 @@
         filters=trendingSearchFilters
         isEnabled=logSearchQueriesEnabled
         disabledLabel=trendingSearchDisabledLabel}}
-      {{{i18n "admin.dashboard.reports.trending_search.more" basePath=basePath}}}
+      {{i18n "admin.dashboard.reports.trending_search.more" basePath=basePath}}
     </div>
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/email-advanced-test.hbs b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
index 97a479e2c5..f0dcaa5c6a 100644
--- a/app/assets/javascripts/admin/templates/email-advanced-test.hbs
+++ b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
@@ -14,13 +14,13 @@
   <hr>
   <div class="text">
     <h3>{{i18n 'admin.email.advanced_test.text'}}</h3>
-    <pre class="full-reason">{{{text}}}</pre>
+    <pre class="full-reason">{{html-safe text}}</pre>
   </div>
 
   <hr>
   <div class="elided">
     <h3>{{i18n 'admin.email.advanced_test.elided'}}</h3>
-    <pre class="full-reason">{{{elided}}}</pre>
+    <pre class="full-reason">{{html-safe elided}}</pre>
   </div>
 {{/if}}
 
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 078b642dd4..7a695659c5 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -53,7 +53,7 @@
           <iframe srcdoc={{model.html_content}} />
         {{/if}}
       {{else}}
-        <pre>{{{model.text_content}}}</pre>
+        <pre>{{html-safe model.text_content}}</pre>
       {{/if}}
     </div>
   </div>
diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index f4ada49e1b..1777263674 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -23,7 +23,7 @@
 
 {{#if showSecondary}}
   <div class='embedding-secondary'>
-    <p>{{{i18n "admin.embedding.sample"}}}</p>
+    <p>{{i18n "admin.embedding.sample"}}</p>
     {{highlighted-code code=embeddingCode lang="html"}}
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index 02c4160b6a..ab4c70d39e 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -88,7 +88,7 @@
               <td class="col value created-at">{{age-with-tooltip item.created_at}}</td>
               <td class="col value details">
                 <div>
-                  {{{item.formattedDetails}}}
+                  {{html-safe item.formattedDetails}}
                   {{#if item.useCustomModalForDetails}}
                     <a href {{action "showCustomDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n 'admin.logs.staff_actions.show'}}</a>
                   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
index ef36e4aa05..528ed5af24 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
@@ -17,9 +17,9 @@
   {{else}}
     <p class="grant-count">
       {{#if count}}
-        {{{i18n "admin.badges.preview.grant_count" count=count}}}
+        {{i18n "admin.badges.preview.grant_count" count=count}}
       {{else}}
-        {{{i18n "admin.badges.preview.no_grant_count"}}}
+        {{i18n "admin.badges.preview.no_grant_count"}}
       {{/if}}
     </p>
 
@@ -41,14 +41,14 @@
       </p>
       <ul>
         {{#each processedSample as |html|}}
-          <li>{{{html}}}</li>
+          <li>{{html-safe html}}</li>
         {{/each}}
       </ul>
     {{/if}}
 
     {{#if hasQueryPlan}}
       <div class="badge-query-plan">
-        {{{queryPlanHtml}}}
+        {{html-safe queryPlanHtml}}
       </div>
     {{/if}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
index aab0b17d71..5ed497ae57 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
@@ -24,7 +24,7 @@
 
             <div class="popular-theme-buttons">
               {{#if theme.installed}}
-                <span>{{I18n "admin.customize.theme.installed"}}</span>
+                <span>{{i18n "admin.customize.theme.installed"}}</span>
               {{else}}
                 {{d-button class='btn-small'
                   label="admin.customize.theme.install"
@@ -33,7 +33,7 @@
                   action=(action "installThemeFromList" theme.value)}}
 
                 {{#if theme.preview}}
-                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{I18n "admin.customize.theme.preview"}}</a>
+                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{i18n "admin.customize.theme.preview"}}</a>
                 {{/if}}
               {{/if}}
             </div>
@@ -85,10 +85,10 @@
 
     {{#if create}}
       <div class="inputs">
-        <div class="label">{{I18n "admin.customize.theme.create_name"}}</div>
+        <div class="label">{{i18n "admin.customize.theme.create_name"}}</div>
         {{input value=name placeholder=placeholder}}
 
-        <div class="label">{{I18n "admin.customize.theme.create_type"}}</div>
+        <div class="label">{{i18n "admin.customize.theme.create_type"}}</div>
         {{combo-box
           valueProperty="value"
           content=createTypes
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
index ec26f608d8..7b3ffb5ca5 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
@@ -1,6 +1,6 @@
 <div>
   {{#d-modal-body title="admin.logs.staff_actions.modal_title"}}
-    {{{diff}}}
+    {{html-safe diff}}
   {{/d-modal-body}}
   <div class="modal-footer">
     {{d-button
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
index 7a5ddc1ea7..724af5ace4 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
@@ -7,7 +7,7 @@
   </div>
   <div class="popular-theme-buttons">
     {{#if theme.installed}}
-      <span>{{I18n "admin.customize.theme.installed"}}</span>
+      <span>{{i18n "admin.customize.theme.installed"}}</span>
     {{else}}
       {{d-button class='btn-small'
         label="admin.customize.theme.install"
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 78bd54afb9..27f61f2940 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -31,7 +31,7 @@
       <div class='fps-topic'>
         <div class='topic'>
           <a class='search-link' href={{result.url}}>
-            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{{result.topic.fancyTitle}}}{{/highlight-text}}</span>
+            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
           </a>
 
           <div class='search-category'>
@@ -55,7 +55,7 @@
 
           {{#if result.blurb}}
             {{#highlight-text highlight=term}}
-              {{{result.blurb}}}
+              {{html-safe result.blurb}}
             {{/highlight-text}}
           {{/if}}
         </div>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 207120eea8..23a1a6aae3 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -132,7 +132,7 @@
     <div class="field">{{i18n "user.avatar.title"}}</div>
     <div class="value">{{avatar model imageSize="large"}}</div>
     <div class="controls">
-      {{{i18n "admin.user.visit_profile" url=preferencesPath}}}
+      {{i18n "admin.user.visit_profile" url=preferencesPath}}
     </div>
   </div>
 
@@ -509,7 +509,7 @@
     <h1>{{i18n "admin.groups.title"}}</h1>
       <div class="display-row">
         <div class="field">{{i18n "admin.groups.automatic"}}</div>
-        <div class="value">{{{automaticGroups}}}</div>
+        <div class="value">{{html-safe automaticGroups}}</div>
       </div>
       <div class="display-row">
         <div class="field">{{i18n "admin.groups.custom"}}</div>
@@ -616,11 +616,11 @@
   </div>
   <div class="display-row">
     <div class="field">{{i18n "admin.user.time_read"}}</div>
-    <div class="value">{{{format-duration model.time_read}}}</div>
+    <div class="value">{{format-duration model.time_read}}</div>
   </div>
   <div class="display-row">
     <div class="field">{{i18n "user.invited.days_visited"}}</div>
-    <div class="value">{{{model.days_visited}}}</div>
+    <div class="value">{{html-safe model.days_visited}}</div>
   </div>
 </section>
 
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 7d096573b0..6b0253aeda 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -53,11 +53,11 @@
             </td>
             <td class="last-emailed">
               <div class="label">{{i18n 'admin.users.last_emailed'}}</div>
-              <div>{{{format-duration user.last_emailed_age}}}</div>
+              <div>{{format-duration user.last_emailed_age}}</div>
             </td>
             <td class="last-seen">
               <div class="label">{{i18n 'last_seen'}}</div>
-              <div>{{{format-duration user.last_seen_age}}}</div>
+              <div>{{format-duration user.last_seen_age}}</div>
             </td>
             <td class="topics-entered">
               <div class="label">{{i18n 'admin.user.topics_entered'}}</div>
@@ -69,12 +69,12 @@
             </td>
             <td class="time-read">
               <div class="label">{{i18n 'admin.user.time_read'}}</div>
-              <div>{{{format-duration user.time_read}}}</div>
+              <div>{{format-duration user.time_read}}</div>
             </td>
 
             <td class="created">
               <div class="label">{{i18n 'created'}}</div>
-              <div>{{{format-duration user.created_at_age}}}</div>
+              <div>{{format-duration user.created_at_age}}</div>
             </td>
 
             {{#if siteSettings.must_approve_users}}
diff --git a/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6 b/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
new file mode 100644
index 0000000000..dc6d5daf74
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
@@ -0,0 +1,6 @@
+import { registerUnbound } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
+
+registerUnbound("html-safe", function(string) {
+  return htmlSafe(string);
+});
diff --git a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
index 902ed699bf..c3d7f1e448 100644
--- a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
+++ b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
@@ -1,6 +1,7 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
 
-registerUnbound("i18n", (key, params) => I18n.t(key, params));
+registerUnbound("i18n", (key, params) => htmlSafe(I18n.t(key, params)));
 registerUnbound("i18n-yes-no", (value, params) =>
   I18n.t(value ? "yes_value" : "no_value", params)
 );
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js.es6 b/app/assets/javascripts/discourse/components/text-overflow.js.es6
index 90a9cc21a2..201172f1ef 100644
--- a/app/assets/javascripts/discourse/components/text-overflow.js.es6
+++ b/app/assets/javascripts/discourse/components/text-overflow.js.es6
@@ -1,8 +1,19 @@
 import { next } from "@ember/runloop";
+import { htmlSafe } from "@ember/template";
 import Component from "@ember/component";
+
 export default Component.extend({
+  text: null,
+
+  init() {
+    this._super(...arguments);
+
+    this.set("text", htmlSafe(this.text));
+  },
+
   didInsertElement() {
     this._super(...arguments);
+
     next(null, () => {
       const $this = $(this.element);
 
diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js.es6
index 71baa92c91..27727c1d84 100644
--- a/app/assets/javascripts/discourse/helpers/application.js.es6
+++ b/app/assets/javascripts/discourse/helpers/application.js.es6
@@ -4,14 +4,12 @@ import {
   autoUpdatingRelativeAge,
   number
 } from "discourse/lib/formatter";
+import { htmlSafe } from "@ember/template";
 
-const safe = Handlebars.SafeString;
+registerUnbound("raw-date", dt => htmlSafe(longDate(new Date(dt))));
 
-registerUnbound("raw-date", dt => longDate(new Date(dt)));
-
-registerUnbound(
-  "age-with-tooltip",
-  dt => new safe(autoUpdatingRelativeAge(new Date(dt), { title: true }))
+registerUnbound("age-with-tooltip", dt =>
+  htmlSafe(autoUpdatingRelativeAge(new Date(dt), { title: true }))
 );
 
 registerUnbound("number", (orig, params) => {
@@ -48,5 +46,5 @@ registerUnbound("number", (orig, params) => {
 
   result += ">" + n + "</span>";
 
-  return new safe(result);
+  return htmlSafe(result);
 });
diff --git a/app/assets/javascripts/discourse/helpers/dir-span.js.es6 b/app/assets/javascripts/discourse/helpers/dir-span.js.es6
index d41f1a332e..e210c471fd 100644
--- a/app/assets/javascripts/discourse/helpers/dir-span.js.es6
+++ b/app/assets/javascripts/discourse/helpers/dir-span.js.es6
@@ -1,5 +1,6 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { isRTL } from "discourse/lib/text-direction";
+import { htmlSafe } from "@ember/template";
 
 function setDir(text) {
   let content = text ? text : "";
@@ -11,5 +12,5 @@ function setDir(text) {
 }
 
 export default registerUnbound("dir-span", function(str) {
-  return new Handlebars.SafeString(setDir(str));
+  return htmlSafe(setDir(str));
 });
diff --git a/app/assets/javascripts/discourse/helpers/format-age.js.es6 b/app/assets/javascripts/discourse/helpers/format-age.js.es6
index 3141a0da85..b8874820ed 100644
--- a/app/assets/javascripts/discourse/helpers/format-age.js.es6
+++ b/app/assets/javascripts/discourse/helpers/format-age.js.es6
@@ -1,11 +1,12 @@
 import { autoUpdatingRelativeAge, durationTiny } from "discourse/lib/formatter";
 import { registerUnbound } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
 
 registerUnbound("format-age", function(dt) {
   dt = new Date(dt);
-  return new Handlebars.SafeString(autoUpdatingRelativeAge(dt));
+  return htmlSafe(autoUpdatingRelativeAge(dt));
 });
 
 registerUnbound("format-duration", function(seconds) {
-  return new Handlebars.SafeString(durationTiny(seconds));
+  return htmlSafe(durationTiny(seconds));
 });
diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js.es6
index acd6cde60b..e238320a38 100644
--- a/app/assets/javascripts/discourse/lib/computed.js.es6
+++ b/app/assets/javascripts/discourse/lib/computed.js.es6
@@ -1,5 +1,6 @@
 import { computed } from "@ember/object";
 import addonFmt from "ember-addons/fmt";
+import { htmlSafe as htmlSafeTemplateHelper } from "@ember/template";
 
 /**
   Returns whether two properties are equal to each other.
@@ -56,6 +57,21 @@ export function i18n(...args) {
     return I18n.t(addonFmt(format, ...args.map(a => this.get(a))));
   });
 }
+/**
+  Returns htmlSafe version of a string.
+
+  @method htmlSafe
+  @params {String} properties* to htmlify
+  @return {Function} discourseComputedProperty function
+**/
+export function htmlSafe(...args) {
+  return computed(...args, {
+    get() {
+      const path = args.pop();
+      return htmlSafeTemplateHelper(this.get(path));
+    }
+  });
+}
 
 /**
   Uses an Ember String `fmt` call to format a string. See:
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index 6e75a04a6d..ad65dbb57e 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -112,7 +112,7 @@
       {{#if contactInfo}}
         <section class='about contact'>
             <h3>{{d-icon "far-envelope"}} {{i18n 'about.contact'}}</h3>
-            <p>{{{contactInfo}}}</p>
+            <p>{{html-safe contactInfo}}</p>
         </section>
       {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/account-created/index.hbs b/app/assets/javascripts/discourse/templates/account-created/index.hbs
index 8c9babb1f9..8122270cd6 100644
--- a/app/assets/javascripts/discourse/templates/account-created/index.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/index.hbs
@@ -1,5 +1,5 @@
 <div class='ac-message'>
-  {{{accountCreated.message}}}
+  {{html-safe accountCreated.message}}
 </div>
 {{#if accountCreated.show_controls}}
   {{activation-controls sendActivationEmail=(action "sendActivationEmail")
diff --git a/app/assets/javascripts/discourse/templates/account-created/resent.hbs b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
index 8647596a04..5ad9168986 100644
--- a/app/assets/javascripts/discourse/templates/account-created/resent.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
@@ -1,6 +1,6 @@
 <div class='ac-message'>
   {{#if email}}
-    {{{i18n 'login.sent_activation_email_again' currentEmail=email}}}
+    {{i18n 'login.sent_activation_email_again' currentEmail=email}}
   {{else}}
     {{i18n 'login.sent_activation_email_again_generic'}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 09ded422b3..fe7b489159 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -42,7 +42,7 @@
           {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
             <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
             {{#if ub.post_number}}
-              <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{{ub.topic.fancyTitle}}}</a>
+              <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{html-safe ub.topic.fancyTitle}}</a>
             {{/if}}
           {{/user-info}}
         {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
index f7bfd9886b..4b7161ba18 100644
--- a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
+++ b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
@@ -3,7 +3,7 @@
     <div class="user-image">
       <div class="user-image-inner">
         <a href={{userTemplate.userPath}} data-user-card={{userTemplate.username}}>
-          {{{userTemplate.avatar}}}
+          {{html-safe userTemplate.avatar}}
         </a>
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
index 0fdc3bd275..4fb6aa77c0 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-card.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
@@ -11,7 +11,7 @@
   <div class='badge-info'>
     <div class='badge-info-item'>
       <h3><a href={{url}} class='badge-link'>{{badge.name}}</a></h3>
-      <div class='badge-summary'>{{{summary}}}</div>
+      <div class='badge-summary'>{{html-safe summary}}</div>
     </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index 5dc594c691..232edea06b 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -24,7 +24,7 @@
         </div>
 
         <div class='description'>
-          {{{text-overflow class="overflow" text=c.description_excerpt}}}
+          {{text-overflow class="overflow" text=c.description_excerpt}}
         </div>
         {{#if c.isGrandParent}}
           {{#each c.subcategories as |subcategory|}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index 4f153b4e7f..ae71465bf0 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -16,7 +16,7 @@
             {{category-title-link category=c}}
             {{#if c.description_excerpt}}
               <div class="category-description">
-                {{{dir-span c.description_excerpt}}}
+                {{dir-span c.description_excerpt}}
               </div>
             {{/if}}
             {{#if c.isGrandParent}}
@@ -28,7 +28,7 @@
                         {{category-title-link tagName="h4" category=subcategory}}
                         {{#if subcategory.description_excerpt}}
                           <div class="category-description subcategory-description">
-                            {{{dir-span subcategory.description_excerpt}}}
+                            {{dir-span subcategory.description_excerpt}}
                           </div>
                         {{/if}}
                         {{#if subcategory.subcategories}}
@@ -45,7 +45,7 @@
                         {{else}}
                           {{#if subcategory.description_excerpt}}
                             <div class="category-description subcategory-description">
-                              {{{dir-span subcategory.description_excerpt}}}
+                              {{dir-span subcategory.description_excerpt}}
                             </div>
                           {{/if}}
                         {{/if}}
@@ -69,7 +69,7 @@
             {{/if}}
           </td>
           <td class="topics">
-            <div title={{c.statTitle}}>{{{c.stat}}}</div>
+            <div title={{c.statTitle}}>{{html-safe c.stat}}</div>
             {{category-unread category=c tagName="div" class="unread-new"}}
           </td>
           {{#if showTopics}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/templates/components/d-button.hbs
index 755e4ea857..aeb5f6b6f6 100644
--- a/app/assets/javascripts/discourse/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-button.hbs
@@ -3,7 +3,7 @@
 {{/if}}
 
 {{#if translatedLabel}}
-  <span class='d-button-label'>{{{translatedLabel}}}{{#if ellipsis}}&hellip;{{/if}}</span>
+  <span class='d-button-label'>{{html-safe translatedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
 {{/if}}
 
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index f868131b63..97effd78d4 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -46,7 +46,7 @@
   </div>
 
   <div class="d-editor-preview-wrapper {{if forcePreview 'force-preview'}}">
-    <div class="d-editor-preview">{{{preview}}}</div>
+    <div class="d-editor-preview">{{html-safe preview}}</div>
     {{plugin-outlet name="editor-preview" classNames="d-editor-plugin" args=outletArgs}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index 27025bedee..cda2c2069a 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -3,9 +3,9 @@
     <div id="banner" class={{overlay}}>
       {{d-button icon="times" action="dismiss" class="btn btn-flat close" title="banner.close"}}
       <div id="banner-content">
-        {{{content}}}
+        {{html-safe content}}
         {{#if currentUser.staff}}
-          <p><a href={{banner.url}}>{{{i18n "banner.edit"}}}</a></p>
+          <p><a href={{banner.url}}>{{i18n "banner.edit"}}</a></p>
         {{/if}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs b/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
index dd15a6dc6a..78515d0404 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
@@ -1 +1 @@
-{{{translatedText}}}
+{{html-safe translatedText}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index 19d6e724dc..7884f85e1f 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -1,7 +1,7 @@
 {{#if category.isUncategorizedCategory}}
   <p class="warning">
     {{d-icon "exclamation-triangle"}}
-    {{{i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink}}}
+    {{i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink}}
   </p>
 {{/if}}
 
@@ -36,7 +36,7 @@
     <section class='field'>
       <label>{{i18n 'category.description'}}</label>
       {{#if category.description}}
-        {{{category.description}}}
+        {{html-safe category.description}}
       {{else}}
         {{i18n 'category.no_description'}}
       {{/if}}
@@ -51,7 +51,7 @@
     <section class='field'>
       <label>{{i18n 'category.badge_colors'}}</label>
       <div class="category-color-editor">
-        {{{categoryBadgePreview}}}
+        {{html-safe categoryBadgePreview}}
 
         <div class='input-prepend input-append' style="margin-top: 10px;">
           <span class='color-title'>{{i18n 'category.background_color'}}:</span>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index cfde179c32..5b132092c4 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -11,7 +11,7 @@
       {{#each category.permissions as |p|}}
         <li>
           <span class="name"><span class="badge-group">{{p.group_name}}</span></span>
-          {{{i18n "category.can"}}}
+          {{i18n "category.can"}}
           <span class="permission">{{p.permission.description}}</span>
           {{#if editingPermissions}}
             <a class="remove-permission" href {{action "removePermission" p}}>{{d-icon "times-circle"}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
index 655ca8c16e..10d9d5fcba 100644
--- a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
@@ -1,10 +1,10 @@
 {{raw "topic-status" topic=topic}}
-<a class='title' href={{topic.lastUnreadUrl}}>{{{topic.fancyTitle}}}</a>
+<a class='title' href={{topic.lastUnreadUrl}}>{{html-safe topic.fancyTitle}}</a>
 {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
 
 {{#if latestTopicOnly}}
   <div class='last-user-info'>
-    {{i18n 'categories.latest_by'}} <a href={{{topic.lastPosterUrl}}}>{{topic.last_poster.username}}</a>
+    {{i18n 'categories.latest_by'}} <a href={{html-safe topic.lastPosterUrl}}>{{topic.last_poster.username}}</a>
     <a href={{topic.lastPostUrl}}>{{format-age topic.last_posted_at}}</a>
   </div>
 {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
index e6fe7ca516..cc7b592b42 100644
--- a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
@@ -5,7 +5,7 @@
       <input type='radio' id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
 
       <div class='flag-action-type-details'>
-        <span class='description'>{{{flag.description}}}</span>
+        <span class='description'>{{html-safe flag.description}}</span>
         {{#if showMessageInput}}
           {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
           <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
@@ -24,7 +24,7 @@
       <div class='flag-action-type-details'>
         <strong>{{formattedName}}</strong>
         {{#if showDescription}}
-          <div class='description'>{{{description}}}</div>
+          <div class='description'>{{html-safe description}}</div>
         {{/if}}
         {{#if showMessageInput}}
           {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
diff --git a/app/assets/javascripts/discourse/templates/components/footer-message.hbs b/app/assets/javascripts/discourse/templates/components/footer-message.hbs
index 65e3a460df..03e5c7b8ee 100644
--- a/app/assets/javascripts/discourse/templates/components/footer-message.hbs
+++ b/app/assets/javascripts/discourse/templates/components/footer-message.hbs
@@ -1,4 +1,4 @@
-{{#if education}}<div class="education">{{{education}}}</div>{{/if}}
+{{#if education}}<div class="education">{{html-safe education}}</div>{{/if}}
 <h3>
   {{message}}
   {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/global-notice.hbs b/app/assets/javascripts/discourse/templates/components/global-notice.hbs
index c2b3b75e2e..08ff36603f 100644
--- a/app/assets/javascripts/discourse/templates/components/global-notice.hbs
+++ b/app/assets/javascripts/discourse/templates/components/global-notice.hbs
@@ -2,9 +2,9 @@
   <div class="row">
     <div id="global-notice-{{notice.id}}" class="alert alert-{{notice.options.level}} {{notice.id}}">
       {{#if notice.options.html}}
-        {{{notice.options.html}}}
+        {{html-safe notice.options.html}}
       {{/if}}
-      <span class="text">{{{notice.text}}}</span>
+      <span class="text">{{html-safe notice.text}}</span>
 
       {{#if notice.options.dismissable}}
         {{d-button
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index 22629d003d..7f6104b836 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -43,7 +43,7 @@
 
     {{#if group.bio_cooked}}
       <div class="card-row second-row">
-        <div class='bio'>{{{group.bio_cooked}}}</div>
+        <div class='bio'>{{html-safe group.bio_cooked}}</div>
       </div>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index d9880b54b6..d4a9673708 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -8,7 +8,7 @@
   <div class='stream-topic-details'>
       <div class='stream-topic-title'>
         <span class='title'>
-          <a href={{postUrl}}>{{{post.topic.fancyTitle}}}</a>
+          <a href={{postUrl}}>{{html-safe post.topic.fancyTitle}}</a>
         </span>
       </div>
       <div class="group-post-category">{{category-link post.category}}</div>
@@ -24,8 +24,8 @@
 
 <div class='excerpt'>
   {{#if post.expandedExcerpt}}
-    {{{post.expandedExcerpt}}}
+    {{html-safe post.expandedExcerpt}}
   {{else}}
-    {{{post.excerpt}}}
+    {{html-safe post.excerpt}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
index 3c13bea09e..cfdd1431bf 100644
--- a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
@@ -1,6 +1,6 @@
 {{#if inviteModel.error}}
   <div class="alert alert-error">
-    {{{errorMessage}}}
+    {{html-safe errorMessage}}
   </div>
 {{/if}}
 
@@ -10,7 +10,7 @@
       {{generated-invite-link link=inviteModel.inviteLink email=emailOrUsername}}
     {{else}}
       <div class="success-message">
-        {{{successMessage}}}
+        {{html-safe successMessage}}
       </div>
     {{/if}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index dce5918f52..9b7b7bebc4 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -14,7 +14,7 @@
       {{d-button action=(action "copy") class="pull-right no-text" icon="copy"}}
     {{/if}}
     <h4>{{i18n "ip_lookup.title"}}</h4>
-    <p class='powered-by'>{{{i18n "ip_lookup.powered_by"}}}</p>
+    <p class='powered-by'>{{i18n "ip_lookup.powered_by"}}</p>
     <dl>
       {{#if location}}
         {{#if location.hostname}}
diff --git a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
index e9d901d880..3c4fcf9491 100644
--- a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
@@ -5,7 +5,7 @@
     {{#if topic.unseen}}
       <span class="badge-notification new-topic"></span>
     {{/if}}
-    <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{{format-age topic.last_posted_at}}}</span>
+    <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{format-age topic.last_posted_at}}</span>
   </div>
 </td>
 <td class='num posts'>{{raw "list/post-count-or-badges" topic=topic postBadgesEnabled="true"}}</td>
diff --git a/app/assets/javascripts/discourse/templates/components/related-messages.hbs b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
index 84b7d42962..09e1abb1a1 100644
--- a/app/assets/javascripts/discourse/templates/components/related-messages.hbs
+++ b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
@@ -10,5 +10,5 @@
 </div>
 
 {{#if targetUser}}
-  <h3 class="see-all-pms-message">{{{i18n "related_messages.see_all" path=searchLink username=targetUser.username}}}</h3>
+  <h3 class="see-all-pms-message">{{i18n "related_messages.see_all" path=searchLink username=targetUser.username}}</h3>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
index 1bdcd280ff..25aeea0726 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
@@ -3,6 +3,6 @@
     {{#if showUsername}}
       {{#link-to 'user' post.user class="username"}}@{{post.user.username}}{{/link-to}}
     {{/if}}
-    {{{post.excerpt}}}
+    {{html-safe post.excerpt}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
index 09e196766f..2ac3b61ff7 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
@@ -17,7 +17,7 @@
       {{#if reviewable.blank_post}}
         <p>{{i18n "review.deleted_post"}}</p>
       {{else}}
-        {{{reviewable.cooked}}}
+        {{html-safe reviewable.cooked}}
       {{/if}}
     </div>
     {{plugin-outlet name="after-reviewable-flagged-post-body" args=(hash model=reviewable)}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
index 2d432a53b4..7b3a7a2f2a 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
@@ -46,7 +46,7 @@
   <div class='reviewable-actions'>
     {{#if claimEnabled}}
       <div class='claimed-actions'>
-        <span class='help'>{{{claimHelp}}}</span>
+        <span class='help'>{{html-safe claimHelp}}</span>
         {{reviewable-claimed-topic topicId=topicId claimedBy=reviewable.claimed_by}}
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
index aa9a2f0fe2..847cc42154 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
@@ -49,7 +49,7 @@
 {{#if rs.reason}}
   <tr>
     <td colspan='7'>
-      <div class='reviewable-score-reason'>{{{rs.reason}}}</div>
+      <div class='reviewable-score-reason'>{{html-safe rs.reason}}</div>
     </td>
   </tr>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
index 4c5c717be3..dc03f52d54 100644
--- a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
@@ -1,7 +1,7 @@
 <div id="second-factor">
   <h3>{{secondFactorTitle}}</h3>
   {{#if optionalText}}
-    <p>{{{optionalText}}}</p>
+    <p>{{html-safe optionalText}}</p>
   {{/if}}
   <p>{{secondFactorDescription}}</p>
   {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
index b166c42071..1808d6cc1f 100644
--- a/app/assets/javascripts/discourse/templates/components/share-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
@@ -1,5 +1,5 @@
 <div class="header">
-  <h3 class="title">{{{shareTitle}}}</h3>
+  <h3 class="title">{{html-safe shareTitle}}</h3>
 </div>
 
 <div class="body">
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index 6f0428b1aa..54e8029cf6 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -1,5 +1,5 @@
 <div class="title">
-  <h3>{{{shareTitle}}}</h3>
+  <h3>{{html-safe shareTitle}}</h3>
 
   {{#if date}}
     <span class="date">{{displayDate}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/share-source.hbs b/app/assets/javascripts/discourse/templates/components/share-source.hbs
index 32fa1adb65..eaee0823d0 100644
--- a/app/assets/javascripts/discourse/templates/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-source.hbs
@@ -2,6 +2,6 @@
   {{#if source.icon}}
     {{d-icon source.icon}}
   {{else}}
-    {{{source.htmlIcon}}}
+    {{html-safe source.htmlIcon}}
   {{/if}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
index 23b2d45ae2..d42eb1b177 100644
--- a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
+++ b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
@@ -2,7 +2,7 @@
   {{#if publishing}}
     {{i18n "shared_drafts.publishing"}}
   {{else}}
-    {{{i18n "shared_drafts.notice" category=topic.category.name}}}
+    {{i18n "shared_drafts.notice" category=topic.category.name}}
 
     <div class='publish-field'>
       <label>{{i18n "shared_drafts.destination_category"}}</label>
diff --git a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
index ffd142b1be..ae7db1c907 100644
--- a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
@@ -13,4 +13,4 @@
   {{/if}}
 </div>
 
-<h3 class="suggested-topics-message">{{{browseMoreMessage}}}</h3>
+<h3 class="suggested-topics-message">{{html-safe browseMoreMessage}}</h3>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
index 3b616fec81..aa1f4889d1 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
@@ -32,7 +32,7 @@
     {{#if tagInfo.synonyms}}
       <div class="synonyms-list">
         <h3>{{i18n "tagging.synonyms"}}</h3>
-        <div>{{{i18n "tagging.synonyms_description" base_tag_name=tagInfo.name}}}</div>
+        <div>{{i18n "tagging.synonyms_description" base_tag_name=tagInfo.name}}</div>
         <div class="tag-list">
           {{#each tagInfo.synonyms as |tag|}}
             <div class='tag-box'>
diff --git a/app/assets/javascripts/discourse/templates/components/text-overflow.hbs b/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
index 05a4439029..3606bb98a0 100644
--- a/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
+++ b/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
@@ -1 +1 @@
-{{{text}}}
+{{html-safe text}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
index 7b7fb58b8b..227674d60c 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
@@ -1,7 +1,7 @@
 {{#d-button action=(action "enterTop") class="full jump-top"}}
-  {{d-icon 'step-backward'}} {{{topDate}}}
+  {{d-icon 'step-backward'}} {{html-safe topDate}}
 {{/d-button}}
 
 {{#d-button action=(action "enterBottom") class="full jump-bottom"}}
-  {{{bottomDate}}} {{d-icon 'step-forward'}}
+  {{html-safe bottomDate}} {{d-icon 'step-forward'}}
 {{/d-button}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index f6956782a9..3bfdf96268 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -144,7 +144,7 @@
         <div class="card-row">
           <div class="featured-topic">
             <span class="desc">{{i18n 'user.featured_topic'}}</span>
-            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{{user.featured_topic.fancy_title}}}{{/link-to}}
+            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{html-safe user.featured_topic.fancy_title}}{{/link-to}}
           </div>
         </div>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index fe91090dde..c09e659301 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,6 +1,6 @@
 {{#if field.name}}
   <label class="control-label" for={{concat 'user-' elementId}}>
-    {{{field.name}}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
+    {{html-safe field.name}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
   </label>
 {{/if}}
 
@@ -8,7 +8,7 @@
   <label class="control-label checkbox-label">
     {{input id=(concat 'user-' elementId) checked=value type="checkbox"}}
     <span>
-      {{{field.description}}}   {{#unless field.name}}{{#if field.required}}<span class='required'>*</span>{{/if}}{{/unless}}
+      {{html-safe field.description}}   {{#unless field.name}}{{#if field.required}}<span class='required'>*</span>{{/if}}{{/unless}}
     </span>
   </label>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index 136585cb03..fd3cb91917 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,4 +1,4 @@
-<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{combo-box
@@ -10,5 +10,5 @@
     none=noneLabel
     onChange=(action (mut value))
   }}
-  <div class="instructions">{{{field.description}}}</div>
+  <div class="instructions">{{html-safe field.description}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 4549f721af..1c33ea1452 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,6 +1,6 @@
-<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{input id=(concat 'user-' elementId) value=value maxlength=site.user_field_max_length}}
-  <div class="instructions">{{{field.description}}}</div>
+  <div class="instructions">{{html-safe field.description}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index 87b1a220e1..69704bf892 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -9,5 +9,5 @@
 </span>
 <span class='label'>
   {{#if icon}}{{d-icon icon}}{{/if}}
-  {{{i18n label count=value}}}
+  {{i18n label count=value}}
 </span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index a87439ad35..f6da96aa0c 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -2,7 +2,7 @@
   <a href={{item.userUrl}} data-user-card={{item.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
   <span class='time'>{{format-date item.created_at}}</span>
   {{#if item.draftType}}
-    <span class='draft-type'>{{{item.draftType}}}</span>
+    <span class='draft-type'>{{html-safe item.draftType}}</span>
   {{else}}
     {{expand-post item=item}}
   {{/if}}
@@ -11,9 +11,9 @@
       {{topic-status topic=item disableActions=true}}
       <span class="title">
         {{#if item.postUrl}}
-          <a href={{item.postUrl}}>{{{item.title}}}</a>
+          <a href={{item.postUrl}}>{{html-safe item.title}}</a>
         {{else}}
-          {{{item.title}}}
+          {{html-safe item.title}}
         {{/if}}
       </span>
     </div>
@@ -36,11 +36,13 @@
 {{/if}}
 
 <p class='excerpt' data-topic-id={{item.topic_id}} data-post-id={{item.post_id}} data-user-id={{item.user_id}}>
+  {{!-- template-lint-disable no-triple-curlies --}}
   {{~#if item.expandedExcerpt}}
     {{~{item.expandedExcerpt}~}}
   {{else}}
     {{~{item.excerpt}~}}
   {{/if~}}
+  {{!-- template-lint-enable --}}
 </p>
 
 {{#each item.children as |child|}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
index 07f7c03cd8..970592ece4 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -6,4 +6,4 @@
   {{/if}}
 </span>
 <br>
-<a href={{url}}>{{{topic.fancyTitle}}}</a>
+<a href={{url}}>{{html-safe topic.fancyTitle}}</a>
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index ce1e7af458..43af40a527 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -204,7 +204,7 @@
                   {{d-button action=(action "togglePreview") class="hide-preview" label="composer.hide_preview"}}
                 {{/if}}
               {{else}}
-                <a href {{action "togglePreview"}} class='toggle-preview'>{{{toggleText}}}</a>
+                <a href {{action "togglePreview"}} class='toggle-preview'>{{html-safe toggleText}}</a>
               {{/if}}
 
           </div>
@@ -221,7 +221,7 @@
 
         <div class='draft-text'>
           {{#if model.topic}}
-            {{d-icon "share"}} {{{draftTitle}}}
+            {{d-icon "share"}} {{html-safe draftTitle}}
           {{else}}
             {{i18n "composer.saved_draft"}}
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
index e37bdb2aa0..238de27da0 100644
--- a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
@@ -1,3 +1,3 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
 {{#if message.title}}<h3>{{message.title}}</h3>{{/if}}
-<p>{{{message.body}}}</p>
+<p>{{html-safe message.body}}</p>
diff --git a/app/assets/javascripts/discourse/templates/composer/education.hbs b/app/assets/javascripts/discourse/templates/composer/education.hbs
index c2d574cb69..269e44e595 100644
--- a/app/assets/javascripts/discourse/templates/composer/education.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/education.hbs
@@ -1,2 +1,2 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
-{{{message.body}}}
+{{html-safe message.body}}
diff --git a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
index c2d574cb69..269e44e595 100644
--- a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
@@ -1,2 +1,2 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
-{{{message.body}}}
+{{html-safe message.body}}
diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/templates/discovery.hbs
index 6801ab3f55..1c8f879125 100644
--- a/app/assets/javascripts/discourse/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery.hbs
@@ -1,5 +1,5 @@
 {{#if errorHtml}}
-  {{{errorHtml}}}
+  {{html-safe errorHtml}}
 {{else}}
   <div class="container">
     {{discourse-banner user=currentUser banner=site.banner}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 355e18f1b8..9394f35486 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -49,7 +49,7 @@
 
       <div class='search-info'>
         <div class='result-count'>
-          {{{resultCountLabel}}}
+          {{html-safe resultCountLabel}}
         </div>
         <div class='sort-by'>
           <span class='desc'>
@@ -88,7 +88,7 @@
 
                   <a class='search-link' href={{result.url}} {{action "logClick" result.topic_id}}>
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
-                    <span class='topic-title'>{{#highlight-text highlight=q}}{{{result.topic.fancyTitle}}}{{/highlight-text}}</span>
+                    <span class='topic-title'>{{#highlight-text highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
                   </a>
 
                   <div class='search-category'>
@@ -113,7 +113,7 @@
 
                   {{#if result.blurb}}
                     {{#highlight-text highlight=highlightQuery}}
-                      {{{result.blurb}}}
+                      {{html-safe result.blurb}}
                     {{/highlight-text}}
                   {{/if}}
                 </div>
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 8385894c0c..1bc9734c13 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -26,7 +26,7 @@
       <hr>
 
       <div class='group-bio'>
-        <p>{{{model.bio_cooked}}}</p>
+        <p>{{html-safe model.bio_cooked}}</p>
       </div>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/templates/groups/index.hbs
index 21cbe557a9..36d0a644b1 100644
--- a/app/assets/javascripts/discourse/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/index.hbs
@@ -51,7 +51,7 @@
                     </span>
                   </div>
 
-                  <div class="group-description">{{{group.bio_excerpt}}}</div>
+                  <div class="group-description">{{html-safe group.bio_excerpt}}</div>
 
                   <div class="group-membership">
                     {{#group-membership-button tagName='' model=group showLogin=(route-action "showLogin")}}
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index 42216317ee..f2f1e73678 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -10,12 +10,12 @@
     <div class="col-form">
       {{#if successMessage}}
         <br><br>
-        <div class='alert alert-info'><p>{{{successMessage}}}</p></div>
+        <div class='alert alert-info'><p>{{html-safe successMessage}}</p></div>
       {{else}}
         <p>{{i18n 'invites.invited_by'}}</p>
         <p>{{user-info user=invitedBy}}</p>
 
-        <p>{{{yourEmailMessage}}}
+        <p>{{html-safe yourEmailMessage}}
         {{#if externalAuthsEnabled}}
              {{i18n 'invites.social_login_available'}}
         {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/list/activity-column.hbr b/app/assets/javascripts/discourse/templates/list/activity-column.hbr
index 723bb80e84..384909db02 100644
--- a/app/assets/javascripts/discourse/templates/list/activity-column.hbr
+++ b/app/assets/javascripts/discourse/templates/list/activity-column.hbr
@@ -1,4 +1,4 @@
-<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{{topic.bumpedAtTitle}}}">
+<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{html-safe topic.bumpedAtTitle}}">
   <a class="post-activity" href="{{topic.lastPostUrl}}">
     {{~raw-plugin-outlet name="topic-list-before-relative-date"~}}
     {{~format-date topic.bumpedAt format="tiny" noTitle="true"~}}
diff --git a/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr b/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
index 1c7b5eead0..2257a669cb 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
+++ b/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
@@ -1,6 +1,6 @@
 {{#if topic.hasExcerpt}}
   <div class="topic-excerpt">
-    {{{dir-span topic.escapedExcerpt}}}
+    {{dir-span topic.escapedExcerpt}}
     {{#if topic.excerptTruncated}}
       <a href="{{topic.url}}">{{i18n 'read_more'}}</a>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index d8a06c33c7..0949b56ee7 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -24,7 +24,7 @@
               {{/if}}
               {{#if t.hasExcerpt}}
                 <div class="topic-excerpt">
-                  {{{t.excerpt}}}
+                  {{html-safe t.excerpt}}
                   {{#if t.excerptTruncated}}
                     {{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
                   {{/if}}
@@ -42,7 +42,7 @@
               {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
               <div class="pull-right">
                 {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
-                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{{raw-date t.bumped_at}}}'>{{t.last_poster_username}}</a>
+                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
               </div>
               {{#unless hideCategory}}
                 <div class='category'>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index 5418fcb86a..0421edce8a 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -13,7 +13,7 @@
             {{#if c.description_excerpt}}
               <tr class="category-description">
                 <td colspan="3">
-                  {{{c.description_excerpt}}}
+                  {{html-safe c.description_excerpt}}
                 </td>
               </tr>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
index bebe6a385e..ca6140be54 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
@@ -1,7 +1,7 @@
 {{#if selectedHtml}}
   <li>
     <a href class='expander' {{action 'toggleExpanded'}}>
-      <span>{{{selectedHtml}}}</span>
+      <span>{{html-safe selectedHtml}}</span>
       {{d-icon "caret-down"}}
     </a>
   </li>
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
index 5469574977..7439589d5c 100644
--- a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}}
+  {{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}
 {{/d-modal-body}}
 
 {{modal-footer-close closeModal=(route-action "closeModal")}}
diff --git a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
index 1b08a4974b..5390227a2e 100644
--- a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body title="user.auth_tokens.was_this_you"}}
   <div>
     <p>{{i18n 'user.auth_tokens.was_this_you_description'}}</p>
-    <p>{{{i18n 'user.second_factor.extended_description'}}}</p>
+    <p>{{i18n 'user.second_factor.extended_description'}}</p>
   </div>
 
   <div>
@@ -21,9 +21,9 @@
       </h3>
 
       {{#if expanded}}
-        <blockquote>{{{latest_post.cooked}}}</blockquote>
+        <blockquote>{{html-safe latest_post.cooked}}</blockquote>
       {{else}}
-        <blockquote>{{{latest_post.excerpt}}}</blockquote>
+        <blockquote>{{html-safe latest_post.excerpt}}</blockquote>
       {{/if}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
index cdaab1cc1c..10e5c4bf26 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
@@ -10,11 +10,11 @@
   {{else}}
     <div class="avatar-choice">
       {{radio-button id="system-avatar" name="avatar" value="system" selection=selected}}
-      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{{i18n 'user.change_avatar.letter_based'}}}</label>
+      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{i18n 'user.change_avatar.letter_based'}}</label>
     </div>
     <div class="avatar-choice">
       {{radio-button id="gravatar" name="avatar" value="gravatar" selection=selected}}
-      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{{i18n 'user.change_avatar.gravatar'}}} {{user.email}}</span></label>
+      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{i18n 'user.change_avatar.gravatar'}} {{user.email}}</span></label>
 
       {{d-button action=(action "refreshGravatar")
                  title="user.change_avatar.refresh_gravatar_title"
@@ -23,7 +23,7 @@
                  class="btn-default avatar-selector-refresh-gravatar"}}
 
       {{#if gravatarFailed}}
-        <p class="error">{{I18n 'user.change_avatar.gravatar_failed'}}</p>
+        <p class="error">{{i18n 'user.change_avatar.gravatar_failed'}}</p>
       {{/if}}
     </div>
     {{#if allowAvatarUpload}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 254f1bfbee..0098c5b237 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -38,7 +38,7 @@
           <!-- {{tap-tile icon="calendar-alt" text=(I18n "bookmarks.reminders.custom") tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}} -->
         {{/tap-tile-grid}}
       {{else}}
-        <div class="alert alert-info">{{{i18n "bookmarks.no_timezone" basePath=basePath }}}</div>
+        <div class="alert alert-info">{{i18n "bookmarks.no_timezone" basePath=basePath }}</div>
       {{/if}}
     </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
index 97f8003781..0cfc45782d 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
@@ -2,7 +2,7 @@
   <div class='controls'>
     <label class='radio'>
       {{radio-button value=level.id name="notification_level" selection=notificationLevelId}} <strong>{{level.name}}</strong>
-      <div class='description'>{{{level.description}}}</div>
+      <div class='description'>{{html-safe level.description}}</div>
     </label>
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index 0c0890f2b9..1069c0d2fa 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -1,6 +1,6 @@
 {{#d-modal-body class='change-ownership'}}
   <span>
-    {{{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}}
+    {{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}
   </span>
 
   <form>
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 448508de65..5c77b2a0a6 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -126,7 +126,7 @@
           {{/d-button}}
         {{/conditional-loading-spinner}}
 
-      <div class='disclaimer'>{{{disclaimerHtml}}}</div>
+      <div class='disclaimer'>{{html-safe disclaimerHtml}}</div>
       </div>
 
       {{plugin-outlet name="create-account-after-modal-footer" tagName=""}}
diff --git a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
index e35eaecc19..61e693a9af 100644
--- a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  <p>{{{i18n "post.controls.delete_topic_disallowed_modal"}}}</p>
+  <p>{{i18n "post.controls.delete_topic_disallowed_modal"}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(route-action "closeModal") class="btn-primary" label="close"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
index 6abe868295..0c3f9e443d 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
@@ -34,7 +34,7 @@
                    label="category.delete"}}
 
         <div class="cannot_delete_reason {{if hiddenTooltip "hidden" ""}}">
-          {{{model.cannot_delete_reason}}}
+          {{html-safe model.cannot_delete_reason}}
         </div>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index 965a407815..be55ea8460 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -6,9 +6,9 @@
           <p>
             {{#conditional-loading-spinner size="small" condition=loading}}
               {{#if pinnedGloballyCount}}
-                {{{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}}
+                {{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}
               {{else}}
-                {{{i18n "topic.feature_topic.not_pinned_globally"}}}
+                {{i18n "topic.feature_topic.not_pinned_globally"}}
               {{/if}}
             {{/conditional-loading-spinner}}
           </p>
@@ -16,12 +16,12 @@
         {{else}}
           <p>
             {{#conditional-loading-spinner size="small" condition=loading}}
-              {{{alreadyPinnedMessage}}}
+              {{html-safe alreadyPinnedMessage}}
             {{/conditional-loading-spinner}}
           </p>
           <p>{{i18n "topic.feature_topic.pin_note"}}</p>
         {{/if}}
-        <p>{{{unPinMessage}}}</p>
+        <p>{{html-safe unPinMessage}}</p>
         <p>{{d-button action=(action "unpin") icon="thumbtack" label="topic.feature.unpin" class="btn-primary"}}</p>
       </div>
     </div>
@@ -30,7 +30,7 @@
       <div class="desc">
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
-            {{{alreadyPinnedMessage}}}
+            {{html-safe alreadyPinnedMessage}}
           {{/conditional-loading-spinner}}
         </p>
         <p>
@@ -38,7 +38,7 @@
         </p>
         {{#if site.isMobileDevice}}
           <p>
-            {{{pinMessage}}}
+            {{html-safe pinMessage}}
           </p>
           <p class="with-validation">
             {{future-date-input
@@ -52,7 +52,7 @@
           </p>
         {{else}}
           <p class="with-validation">
-            {{{pinMessage}}}
+            {{html-safe pinMessage}}
             {{d-icon "far-clock"}}
             {{future-date-input
               class="pin-until"
@@ -74,9 +74,9 @@
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
             {{#if pinnedGloballyCount}}
-              {{{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}}
+              {{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}
             {{else}}
-              {{{i18n "topic.feature_topic.not_pinned_globally"}}}
+              {{i18n "topic.feature_topic.not_pinned_globally"}}
             {{/if}}
           {{/conditional-loading-spinner}}
         </p>
@@ -123,9 +123,9 @@
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
             {{#if bannerCount}}
-              {{{i18n "topic.feature_topic.banner_exists"}}}
+              {{i18n "topic.feature_topic.banner_exists"}}
             {{else}}
-              {{{i18n "topic.feature_topic.no_banner_exists"}}}
+              {{i18n "topic.feature_topic.no_banner_exists"}}
             {{/if}}
           {{/conditional-loading-spinner}}
         </p>
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index 8d438dd80a..19be52ceb5 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
@@ -1,7 +1,7 @@
 <form>
   {{#d-modal-body class="forgot-password-modal"}}
     {{#if offerHelp}}
-      {{{offerHelp}}}
+      {{html-safe offerHelp}}
     {{else}}
       <label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label>
       {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index 6d9dbff78e..c81dfe2238 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -21,7 +21,7 @@
           &mdash; {{disabled-icon icon="shield-alt" disabled=postTypeDisabled}}
         {{/if}}
         {{#if model.category_id_changes}}
-          &mdash; {{{previousCategory}}} &rarr; {{{currentCategory}}}
+          &mdash; {{html-safe previousCategory}} &rarr; {{html-safe currentCategory}}
         {{/if}}
       {{/unless}}
     </div>
@@ -50,7 +50,7 @@
   <div id="revisions" data-post-id={{model.post_id}} class={{hiddenClasses}}>
     {{#if model.title_changes}}
       <div class="row">
-        <h2>{{{titleDiff}}}</h2>
+        <h2>{{html-safe titleDiff}}</h2>
       </div>
     {{/if}}
     {{#if site.mobileView}}
@@ -72,7 +72,7 @@
       {{/if}}
       {{#if model.category_id_changes}}
         <div class="row">
-          {{{previousCategory}}} &rarr; {{{currentCategory}}}
+          {{html-safe previousCategory}} &rarr; {{html-safe currentCategory}}
         </div>
       {{/if}}
     {{/if}}
@@ -100,7 +100,7 @@
     {{plugin-outlet name="post-revisions" args=(hash model=model)}}
 
     {{#links-redirect class="row"}}
-      {{{bodyDiff}}}
+      {{html-safe bodyDiff}}
     {{/links-redirect}}
   </div>
 {{/d-modal-body}}
@@ -111,7 +111,7 @@
       {{d-button class="btn-default" action=(action "loadPreviousVersion") icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}}
       <div id="revision-numbers" class={{unless displayRevisions 'invisible'}}>
         {{#conditional-loading-spinner condition=loading size="small"}}
-          {{{revisionsText}}}
+          {{html-safe revisionsText}}
         {{/conditional-loading-spinner}}
       </div>
       {{d-button class="btn-default" action=(action "loadNextVersion") icon="forward" title="post.revisions.controls.next" disabled=loadNextDisabled}}
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 493a9e03a5..2203c90174 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -3,29 +3,29 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.jump_to.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.jump_to.home}}}</li>
-        <li>{{{shortcuts.jump_to.latest}}}</li>
-        <li>{{{shortcuts.jump_to.new}}}</li>
-        <li>{{{shortcuts.jump_to.unread}}}</li>
-        <li>{{{shortcuts.jump_to.categories}}}</li>
-        <li>{{{shortcuts.jump_to.top}}}</li>
-        <li>{{{shortcuts.jump_to.bookmarks}}}</li>
-        <li>{{{shortcuts.jump_to.profile}}}</li>
+        <li>{{html-safe shortcuts.jump_to.home}}</li>
+        <li>{{html-safe shortcuts.jump_to.latest}}</li>
+        <li>{{html-safe shortcuts.jump_to.new}}</li>
+        <li>{{html-safe shortcuts.jump_to.unread}}</li>
+        <li>{{html-safe shortcuts.jump_to.categories}}</li>
+        <li>{{html-safe shortcuts.jump_to.top}}</li>
+        <li>{{html-safe shortcuts.jump_to.bookmarks}}</li>
+        <li>{{html-safe shortcuts.jump_to.profile}}</li>
         {{#if siteSettings.enable_personal_messages}}
-          <li>{{{shortcuts.jump_to.messages}}}</li>
+          <li>{{html-safe shortcuts.jump_to.messages}}</li>
         {{/if}}
-        <li>{{{shortcuts.jump_to.drafts}}}</li>
+        <li>{{html-safe shortcuts.jump_to.drafts}}</li>
       </ul>
     </section>
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.navigation.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.navigation.back}}}</li>
-        <li>{{{shortcuts.navigation.jump}}}</li>
-        <li>{{{shortcuts.navigation.up_down}}}</li>
-        <li>{{{shortcuts.navigation.open}}}</li>
-        <li>{{{shortcuts.navigation.next_prev}}}</li>
-        <li>{{{shortcuts.navigation.go_to_unread_post}}}</li>
+        <li>{{html-safe shortcuts.navigation.back}}</li>
+        <li>{{html-safe shortcuts.navigation.jump}}</li>
+        <li>{{html-safe shortcuts.navigation.up_down}}</li>
+        <li>{{html-safe shortcuts.navigation.open}}</li>
+        <li>{{html-safe shortcuts.navigation.next_prev}}</li>
+        <li>{{html-safe shortcuts.navigation.go_to_unread_post}}</li>
       </ul>
     </section>
   </div>
@@ -33,26 +33,26 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.application.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.application.hamburger_menu}}}</li>
-        <li>{{{shortcuts.application.user_profile_menu}}}</li>
-        <li>{{{shortcuts.application.show_incoming_updated_topics}}}</li>
-        <li>{{{shortcuts.application.search}}}</li>
-        <li>{{{shortcuts.application.help}}}</li>
-        <li>{{{shortcuts.application.dismiss_new_posts}}}</li>
-        <li>{{{shortcuts.application.dismiss_topics}}}</li>
-        <li>{{{shortcuts.application.log_out}}}</li>
+        <li>{{html-safe shortcuts.application.hamburger_menu}}</li>
+        <li>{{html-safe shortcuts.application.user_profile_menu}}</li>
+        <li>{{html-safe shortcuts.application.show_incoming_updated_topics}}</li>
+        <li>{{html-safe shortcuts.application.search}}</li>
+        <li>{{html-safe shortcuts.application.help}}</li>
+        <li>{{html-safe shortcuts.application.dismiss_new_posts}}</li>
+        <li>{{html-safe shortcuts.application.dismiss_topics}}</li>
+        <li>{{html-safe shortcuts.application.log_out}}</li>
       </ul>
     </section>
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.composing.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.composing.return}}}</li>
-        <li>{{{shortcuts.composing.fullscreen}}}</li>
-        <li>{{{shortcuts.application.create}}}</li>
-        <li>{{{shortcuts.actions.reply_as_new_topic}}}</li>
-        <li>{{{shortcuts.actions.reply_topic}}}</li>
-        <li>{{{shortcuts.actions.reply_post}}}</li>
-        <li>{{{shortcuts.actions.quote_post}}}</li>
+        <li>{{html-safe shortcuts.composing.return}}</li>
+        <li>{{html-safe shortcuts.composing.fullscreen}}</li>
+        <li>{{html-safe shortcuts.application.create}}</li>
+        <li>{{html-safe shortcuts.actions.reply_as_new_topic}}</li>
+        <li>{{html-safe shortcuts.actions.reply_topic}}</li>
+        <li>{{html-safe shortcuts.actions.reply_post}}</li>
+        <li>{{html-safe shortcuts.actions.quote_post}}</li>
       </ul>
     </section>
   </div>
@@ -60,22 +60,22 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.actions.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.actions.bookmark_topic}}}</li>
-        <li>{{{shortcuts.actions.pin_unpin_topic}}}</li>
-        <li>{{{shortcuts.actions.share_topic}}}</li>
-        <li>{{{shortcuts.actions.share_post}}}</li>
-        <li>{{{shortcuts.actions.like}}}</li>
-        <li>{{{shortcuts.actions.flag}}}</li>
-        <li>{{{shortcuts.actions.bookmark}}}</li>
-        <li>{{{shortcuts.actions.edit}}}</li>
-        <li>{{{shortcuts.actions.delete}}}</li>
-        <li>{{{shortcuts.actions.mark_muted}}}</li>
-        <li>{{{shortcuts.actions.mark_regular}}}</li>
-        <li>{{{shortcuts.actions.mark_tracking}}}</li>
-        <li>{{{shortcuts.actions.mark_watching}}}</li>
-        <li>{{{shortcuts.actions.defer}}}</li>
-        <li>{{{shortcuts.actions.print}}}</li>
-        <li>{{{shortcuts.actions.topic_admin_actions}}}</li>
+        <li>{{html-safe shortcuts.actions.bookmark_topic}}</li>
+        <li>{{html-safe shortcuts.actions.pin_unpin_topic}}</li>
+        <li>{{html-safe shortcuts.actions.share_topic}}</li>
+        <li>{{html-safe shortcuts.actions.share_post}}</li>
+        <li>{{html-safe shortcuts.actions.like}}</li>
+        <li>{{html-safe shortcuts.actions.flag}}</li>
+        <li>{{html-safe shortcuts.actions.bookmark}}</li>
+        <li>{{html-safe shortcuts.actions.edit}}</li>
+        <li>{{html-safe shortcuts.actions.delete}}</li>
+        <li>{{html-safe shortcuts.actions.mark_muted}}</li>
+        <li>{{html-safe shortcuts.actions.mark_regular}}</li>
+        <li>{{html-safe shortcuts.actions.mark_tracking}}</li>
+        <li>{{html-safe shortcuts.actions.mark_watching}}</li>
+        <li>{{html-safe shortcuts.actions.defer}}</li>
+        <li>{{html-safe shortcuts.actions.print}}</li>
+        <li>{{html-safe shortcuts.actions.topic_admin_actions}}</li>
       </ul>
     </section>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
index 893d934246..ae591397a7 100644
--- a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
@@ -17,7 +17,7 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}}</p>
+        <p>{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
@@ -31,7 +31,7 @@
     {{/if}}
 
     {{#if existingMessage}}
-      <p>{{{i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount}}}</p>
+      <p>{{i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount}}</p>
       <form>
         {{choose-message currentTopicId=model.id selectedTopicId=selectedTopicId}}
 
@@ -64,7 +64,7 @@
     </div>
 
     {{#if existingTopic}}
-      <p>{{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}}</p>
+      <p>{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}</p>
       <form>
         {{choose-topic currentTopicId=model.id selectedTopicId=selectedTopicId}}
       </form>
@@ -72,7 +72,7 @@
 
     {{#if canSplitTopic}}
       {{#if newTopic}}
-        <p>{{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}}</p>
+        <p>{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}</p>
         <form>
           <label>{{i18n 'topic.split_topic.topic_name'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
@@ -93,7 +93,7 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}}</p>
+        <p>{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
index aa312d5125..e9d93aa8f6 100644
--- a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{{i18n 'login.not_activated' sentTo=sentTo}}}
+  {{i18n 'login.not_activated' sentTo=sentTo}}
 {{/d-modal-body}}
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
index 46f37bfe80..3687b9fb2b 100644
--- a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body}}
   <p>{{i18n "review.approval.description"}}</p>
 
-  <p>{{{i18n "review.approval.pending_posts" count=model.pending_count}}}</p>
+  <p>{{i18n "review.approval.pending_posts" count=model.pending_count}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(route-action "closeModal") class="btn-primary" label="review.approval.ok"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
index 36ede3f634..c6539a2e52 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{{i18n 'user.second_factor.enable_security_key_description'}}}
+        {{i18n 'user.second_factor.enable_security_key_description'}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
index 2b52edea7b..9caf24fc46 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{{i18n 'user.second_factor.enable_description'}}}
+        {{i18n 'user.second_factor.enable_description'}}
       </div>
     </div>
 
@@ -18,7 +18,7 @@
       <div class="controls">
         <div class="qr-code-container">
           <div class="qr-code">
-            {{{secondFactorImage}}}
+            {{html-safe secondFactorImage}}
           </div>
         </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
index 5981f4a118..713bdbfcc4 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
@@ -14,7 +14,7 @@
     {{/if}}
 
     {{#if backupEnabled}}
-      {{{i18n "user.second_factor_backup.remaining_codes" count=remainingCodes}}}
+      {{i18n "user.second_factor_backup.remaining_codes" count=remainingCodes}}
     {{/if}}
 
     <div class="actions">
diff --git a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
index 9b10ef6c29..fe3ce8be48 100644
--- a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
@@ -1,4 +1,4 @@
 {{#d-modal-body}}
-  <p>{{{i18n 'topics.bulk.selected' count=model.topics.length}}}</p>
+  <p>{{i18n 'topics.bulk.selected' count=model.topics.length}}</p>
   {{outlet "bulkOutlet"}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index f45a2e5014..6d44492afe 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -9,7 +9,7 @@
         width=category.uploaded_logo.width
         height=category.uploaded_logo.height}}
       {{#if category.description}}
-        <p>{{{dir-span category.description}}}</p>
+        <p>{{dir-span category.description}}</p>
       {{/if}}
     {{/if}}
   </section>
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index fd8f57c54c..fc6c00a13b 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -86,7 +86,7 @@
           <h2>{{i18n "user.second_factor_backup.title"}}</h2>
           {{#if model.second_factor_enabled}}
             {{#if model.second_factor_backup_enabled}}
-              {{{i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes}}}
+              {{i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes}}
             {{else}}
               {{i18n 'user.second_factor_backup.enable_long'}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 8a505401fa..62743b5a5a 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -9,7 +9,7 @@
   </div>
   {{#if siteSettings.enable_mentions}}
     <div class='instructions'>
-      {{{i18n 'user.username.short_instructions' username=model.username}}}
+      {{i18n 'user.username.short_instructions' username=model.username}}
     </div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index d277cea511..bd9aa411ac 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -73,7 +73,7 @@
   <div class='control-group pref-mailing-list-mode'>
     <label class="control-label">{{i18n 'user.mailing_list_mode.label'}}</label>
     {{preference-checkbox labelKey="user.mailing_list_mode.enabled" checked=model.user_option.mailing_list_mode}}
-    <div class='instructions'>{{{i18n 'user.mailing_list_mode.instructions'}}}</div>
+    <div class='instructions'>{{i18n 'user.mailing_list_mode.instructions'}}</div>
     {{#if model.user_option.mailing_list_mode}}
       <div class='controls controls-dropdown'>
         {{combo-box
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index b0040894dc..e6fe5381ed 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -66,7 +66,7 @@
     <label class="control-label">{{i18n 'user.featured_topic'}}</label>
     {{#if model.featured_topic}}
       <label class="featured-topic-link">
-      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{{model.featured_topic.fancy_title}}}{{/link-to}}
+      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe model.featured_topic.fancy_title}}{{/link-to}}
       </label>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/templates/static.hbs
index 107f4350f8..aee9390704 100644
--- a/app/assets/javascripts/discourse/templates/static.hbs
+++ b/app/assets/javascripts/discourse/templates/static.hbs
@@ -2,7 +2,7 @@
   {{#watch-read action=(action "markFaqRead") path=model.path}}
     <div class='contents clearfix body-page'>
       {{plugin-outlet name="above-static"}}
-      {{{model.html}}}
+      {{html-safe model.html}}
 
       {{#if showSignupButton}}
         {{d-button action=(route-action "showCreateAccount") class="btn-primary sign-up-button" label="sign_up"}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index bcb1a81b0f..7950ca19ec 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -74,7 +74,7 @@
             {{#if model.details.loaded}}
               {{topic-status topic=model}}
               <a href={{model.url}} {{action "jumpTop"}} class="fancy-title">
-                {{{model.fancyTitle}}}
+                {{html-safe model.fancyTitle}}
               </a>
             {{/if}}
 
@@ -264,7 +264,7 @@
               {{#if model.queued_posts_count}}
                 <div class="has-pending-posts">
                   <div>
-                    {{{i18n "review.topic_has_pending" count=model.queued_posts_count}}}
+                    {{i18n "review.topic_has_pending" count=model.queued_posts_count}}
                   </div>
 
                   {{#link-to 'review' (query-params topic_id=model.id type="ReviewableQueuedPost" status="pending")}}
@@ -351,7 +351,7 @@
     <div class="container">
       {{#conditional-loading-spinner condition=noErrorYet}}
         {{#if model.errorHtml}}
-          <div class="not-found">{{{model.errorHtml}}}</div>
+          <div class="not-found">{{html-safe model.errorHtml}}</div>
         {{else}}
           <div class="topic-error">
             <div>{{model.errorMessage}}</div>
diff --git a/app/assets/javascripts/discourse/templates/unknown.hbs b/app/assets/javascripts/discourse/templates/unknown.hbs
index 0e9e6b9625..5ff548e033 100644
--- a/app/assets/javascripts/discourse/templates/unknown.hbs
+++ b/app/assets/javascripts/discourse/templates/unknown.hbs
@@ -1,3 +1,3 @@
 <div class='container'>
-  {{{model}}}
+  {{html-safe model}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 517e147e90..f8f5effb60 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -72,11 +72,11 @@
                       <td>{{format-date invite.user.last_seen_at}}</td>
                       <td>{{number invite.user.topics_entered}}</td>
                       <td>{{number invite.user.posts_read_count}}</td>
-                      <td>{{{format-duration invite.user.time_read}}}</td>
+                      <td>{{format-duration invite.user.time_read}}</td>
                       <td>
-                        <span title={{i18n 'user.invited.days_visited'}}>{{{invite.user.days_visited}}}</span>
+                        <span title={{i18n 'user.invited.days_visited'}}>{{html-safe invite.user.days_visited}}</span>
                           /
-                        <span title={{i18n 'user.invited.account_age_days'}}>{{{invite.user.days_since_created}}}</span>
+                        <span title={{i18n 'user.invited.account_age_days'}}>{{html-safe invite.user.days_since_created}}</span>
                       </td>
                     {{/if}}
                   {{else}}
@@ -109,7 +109,7 @@
         {{else}}
           <div class="user-invite-none">
             {{#if canBulkInvite}}
-              {{{i18n 'user.invited.bulk_invite.none'}}}
+              {{i18n 'user.invited.bulk_invite.none'}}
             {{else}}
               {{i18n 'user.invited.none'}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index d1c61ab805..377177843e 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -100,7 +100,7 @@
             {{#if showFeaturedTopic}}
               <h3 class="featured-topic">
                 <span>{{i18n 'user.featured_topic'}}</span>
-                {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{{model.featured_topic.fancy_title}}}{{/link-to}}
+                {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe model.featured_topic.fancy_title}}{{/link-to}}
               </h3>
             {{/if}}
 
@@ -137,7 +137,7 @@
                 </div>
               {{/if}}
               {{#if isNotSuspendedOrIsStaff}}
-                {{{model.bio_cooked}}}
+                {{html-safe model.bio_cooked}}
               {{/if}}
             </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs
index 1af06a86d9..de791d9420 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -1,4 +1,4 @@
 {{#if model.noContent}}
-  <div class='alert alert-info'>{{{model.noContentHelp}}}</div>
+  <div class='alert alert-info'>{{html-safe model.noContentHelp}}</div>
 {{/if}}
 {{user-stream stream=model}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index 71b4737522..26ee193bde 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -87,7 +87,7 @@
               </a>
               <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=link.clicks}}'>{{number link.clicks}}</span>
               <br>
-              <a href="{{link.post_url}}">{{{link.topic.fancyTitle}}}</a>
+              <a href="{{link.post_url}}">{{html-safe link.topic.fancyTitle}}</a>
             </li>
           {{/each}}
         </ul>
diff --git a/app/assets/javascripts/select-kit/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
index db51a397f8..cff579c047 100644
--- a/app/assets/javascripts/select-kit/templates/components/category-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
@@ -9,8 +9,8 @@
   </div>
 
   {{#if shouldDisplayDescription}}
-    <div class="category-desc">{{{dir-span description}}}</div>
+    <div class="category-desc">{{dir-span description}}</div>
   {{/if}}
 {{else}}
-  {{{label}}}
+  {{html-safe label}}
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
index 1c070006ad..e654ef8a11 100644
--- a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
@@ -8,6 +8,6 @@
 {{/if}}
 
 <div class="texts">
-  <span class="name">{{{label}}}</span>
-  <span class="desc">{{{description}}}</span>
+  <span class="name">{{html-safe label}}</span>
+  <span class="desc">{{html-safe description}}</span>
 </div>
diff --git a/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs b/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
index 31fc07f1dc..f54bdb6b5f 100644
--- a/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
@@ -1,5 +1,5 @@
 {{pinned-options value=pinned topic=topic}}
 
 <p class="reason">
-  {{{reasonText}}}
+  {{html-safe reasonText}}
 </p>
diff --git a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
index 2bf3a9a122..a57b6b8584 100644
--- a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
@@ -10,6 +10,6 @@
 
 {{#if appendReason}}
   <p class="reason">
-    {{{topic.details.notificationReasonText}}}
+    {{html-safe topic.details.notificationReasonText}}
   </p>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/radio-button.hbs b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
index e93347513a..c3a82790be 100644
--- a/app/assets/javascripts/wizard/templates/components/radio-button.hbs
+++ b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
@@ -8,7 +8,7 @@
   </span>
   {{#if extraLabel}}
     <span class='extra-label'>
-      {{{extraLabel}}}
+      {{html-safe extraLabel}}
     </span>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
index 8f804940fb..7510570b5d 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
@@ -2,7 +2,7 @@
   <span class='label-value'>{{field.label}}</span>
 
   {{#if field.description}}
-    <div class='field-description'>{{{field.description}}}</div>
+    <div class='field-description'>{{html-safe field.description}}</div>
   {{/if}}
 </label>
 
@@ -11,5 +11,5 @@
 </div>
 
 {{#if field.errorDescription}}
-  <div class='field-error-description'>{{{field.errorDescription}}}</div>
+  <div class='field-error-description'>{{html-safe field.errorDescription}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
index beb821930d..4f0686acf7 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -8,7 +8,7 @@
   {{/if}}
 
   {{#if step.description}}
-    <p class='wizard-step-description'>{{{step.description}}}</p>
+    <p class='wizard-step-description'>{{html-safe step.description}}</p>
   {{/if}}
 
   {{#wizard-step-form step=step}}
diff --git a/lib/onebox/templates/discourse_topic_onebox.hbs b/lib/onebox/templates/discourse_topic_onebox.hbs
index 856d3342d4..63a04fcc76 100644
--- a/lib/onebox/templates/discourse_topic_onebox.hbs
+++ b/lib/onebox/templates/discourse_topic_onebox.hbs
@@ -1,10 +1,10 @@
 <aside class='quote' data-post="{{post_number}}" data-topic="{{topic_id}}">
   <div class='title'>
     <div class='quote-controls'></div>
-    {{{avatar}}}
-    <a href="{{original_url}}">{{{title}}}</a> {{{category_html}}}
+    {{html-safe avatar}}
+    <a href="{{original_url}}">{{html-safe title}}</a> {{html-safe category_html}}
   </div>
   <blockquote>
-    {{{quote}}}
+    {{html-safe quote}}
   </blockquote>
 </aside>
diff --git a/lib/onebox/templates/discourse_user_onebox.hbs b/lib/onebox/templates/discourse_user_onebox.hbs
index 60db7491c1..de1336dd92 100644
--- a/lib/onebox/templates/discourse_user_onebox.hbs
+++ b/lib/onebox/templates/discourse_user_onebox.hbs
@@ -1,7 +1,7 @@
 <aside class="onebox">
   <article class="onebox-body user-onebox">
-    {{{avatar}}}
-    <h3><a href="{{original_url}}">{{{username}}}</a></h3>
+    {{html-safe avatar}}
+    <h3><a href="{{original_url}}">{{html-safe username}}</a></h3>
     <div>
       {{#name}}
         <span class="full-name">{{name}}</span>
@@ -11,7 +11,7 @@
           <svg class="fa d-icon d-icon-map-marker-alt svg-icon" xmlns="http://www.w3.org/2000/svg">
             <use xlink:href="#map-marker-alt"></use>
           </svg>
-          {{{location}}}
+          {{html-safe location}}
         </span>
       {{/location}}
       {{#website}}
@@ -19,12 +19,12 @@
           <svg class="fa d-icon d-icon-globe-americas svg-icon" xmlns="http://www.w3.org/2000/svg">
             <use xlink:href="#globe-americas"></use>
           </svg>
-          <a href="{{website}}">{{{website_name}}}</a>
+          <a href="{{website}}">{{html-safe website_name}}</a>
         </span>
       {{/website}}
     </div>
     {{#bio}}
-      <p>{{{bio}}}</p>
+      <p>{{html-safe bio}}</p>
     {{/bio}}
     <span>{{joined}} {{created_at}}</span>
   </article>
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index d7e73c3d08..6fb9ecf7c6 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -85,7 +85,7 @@
             <label class="control-label">
               {{i18n "discourse_local_dates.create.form.recurring_title"}}
             </label>
-            <p>{{{i18n "discourse_local_dates.create.form.recurring_description"}}}</p>
+            <p>{{i18n "discourse_local_dates.create.form.recurring_description"}}</p>
             <div class="controls">
               {{combo-box
                 content=recurringOptions
diff --git a/test/javascripts/components/html-safe-helper-test.js.es6 b/test/javascripts/components/html-safe-helper-test.js.es6
new file mode 100644
index 0000000000..364f99a6e4
--- /dev/null
+++ b/test/javascripts/components/html-safe-helper-test.js.es6
@@ -0,0 +1,14 @@
+import componentTest from "helpers/component-test";
+moduleForComponent("html-safe-helper", { integration: true });
+
+componentTest("default", {
+  template: "{{html-safe string}}",
+
+  beforeEach() {
+    this.set("string", "<p class='cookies'>biscuits</p>");
+  },
+
+  async test(assert) {
+    assert.ok(exists("p.cookies"), "it displays the string as html");
+  }
+});
diff --git a/test/javascripts/lib/computed-test.js.es6 b/test/javascripts/lib/computed-test.js.es6
index 0a94485f44..253673e5b6 100644
--- a/test/javascripts/lib/computed-test.js.es6
+++ b/test/javascripts/lib/computed-test.js.es6
@@ -5,7 +5,8 @@ import {
   propertyNotEqual,
   fmt,
   i18n,
-  url
+  url,
+  htmlSafe
 } from "discourse/lib/computed";
 
 QUnit.module("lib:computed", {
@@ -154,3 +155,12 @@ QUnit.test("url", assert => {
     "it supports urls with a prefix"
   );
 });
+
+QUnit.test("htmlSafe", assert => {
+  const cookies = "<p>cookies and <b>biscuits</b></p>";
+  const t = EmberObject.extend({
+    desc: htmlSafe("cookies")
+  }).create({ cookies });
+
+  assert.equal(t.get("desc").string, cookies);
+});

From 3f2c0b42fecfa42dde620db22148757a1d7d4d7c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 10 Mar 2020 17:17:54 +0100
Subject: [PATCH 0152/1830] FIX: throttles topic tracking shortcut and enforces
 topic id (#9159)

---
 .../discourse/lib/keyboard-shortcuts.js.es6   | 27 +++++++------------
 .../topic-notifications-button.js.es6         | 11 ++++++++
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index cf22919b07..69f42cfee1 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -3,6 +3,7 @@ import DiscourseURL from "discourse/lib/url";
 import Composer from "discourse/models/composer";
 import { minimumOffset } from "discourse/lib/offset-calculator";
 import { ajax } from "discourse/lib/ajax";
+import { throttle } from "@ember/runloop";
 
 const bindings = {
   "!": { postAction: "showFlags" },
@@ -298,34 +299,26 @@ export default {
   },
 
   setTrackingToMuted(event) {
-    this.appEvents.trigger("topic-notifications-button:changed", {
-      type: "notification",
-      id: 0,
-      event
-    });
+    throttle(this, "_setTracking", { id: 0, event }, 250, true);
   },
 
   setTrackingToRegular(event) {
-    this.appEvents.trigger("topic-notifications-button:changed", {
-      type: "notification",
-      id: 1,
-      event
-    });
+    throttle(this, "_setTracking", { id: 1, event }, 250, true);
   },
 
   setTrackingToTracking(event) {
-    this.appEvents.trigger("topic-notifications-button:changed", {
-      type: "notification",
-      id: 2,
-      event
-    });
+    throttle(this, "_setTracking", { id: 2, event }, 250, true);
   },
 
   setTrackingToWatching(event) {
+    throttle(this, "_setTracking", { id: 3, event }, 250, true);
+  },
+
+  _setTracking(params) {
     this.appEvents.trigger("topic-notifications-button:changed", {
       type: "notification",
-      id: 3,
-      event
+      id: params.id,
+      event: params.event
     });
   },
 
diff --git a/app/assets/javascripts/select-kit/components/topic-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/topic-notifications-button.js.es6
index 4ff6b5d151..747685c2ae 100644
--- a/app/assets/javascripts/select-kit/components/topic-notifications-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/topic-notifications-button.js.es6
@@ -28,6 +28,17 @@ export default Component.extend({
   },
 
   _changeTopicNotificationLevel(level) {
+    // this change is coming from a keyboard event
+    if (level.event) {
+      const topicSectionNode = level.event.target.querySelector("#topic");
+      if (topicSectionNode && topicSectionNode.dataset.topicId) {
+        const topicId = parseInt(topicSectionNode.dataset.topicId, 10);
+        if (topicId && topicId !== this.topic.id) {
+          return;
+        }
+      }
+    }
+
     if (level.id !== this.notificationLevel) {
       this.topic.details.updateNotifications(level.id);
     }

From 74acbad505800a9a3317a631a2333be1e34992b5 Mon Sep 17 00:00:00 2001
From: Michael Brown <michael.brown@discourse.org>
Date: Tue, 10 Mar 2020 13:20:11 -0400
Subject: [PATCH 0153/1830] FIX: don't break the private key when writing it
 out during theme import

* when importing a private theme using the themes:install rake task the SSH key is written out to a file for use by the git-clone command
* if the private key is written out without a newline at end-of-file (i.e. after it's been stripped) it's not recognized as a valid key by SSH
* so: don't strip it when writing it out, we should be fine
---
 lib/theme_store/git_importer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/theme_store/git_importer.rb b/lib/theme_store/git_importer.rb
index 0fccf3886c..c73d44f807 100644
--- a/lib/theme_store/git_importer.rb
+++ b/lib/theme_store/git_importer.rb
@@ -107,7 +107,7 @@ class ThemeStore::GitImporter
     ssh_folder = "#{Pathname.new(Dir.tmpdir).realpath}/discourse_theme_ssh_#{SecureRandom.hex}"
     FileUtils.mkdir_p ssh_folder
 
-    File.write("#{ssh_folder}/id_rsa", @private_key.strip)
+    File.write("#{ssh_folder}/id_rsa", @private_key)
     FileUtils.chmod(0600, "#{ssh_folder}/id_rsa")
 
     begin

From f795c1b8e8610bfe7369c348ebadd33940dc9f53 Mon Sep 17 00:00:00 2001
From: romanrizzi <rizziromanalejandro@gmail.com>
Date: Tue, 10 Mar 2020 15:00:12 -0300
Subject: [PATCH 0154/1830] Revert "DEV: enforces ember-template-lint:
 no-triple-curlies (#9150)"

This reverts commit d436b600fba4cea846a5e96c235c507441965e05.

Triple curlies are still necessary for some raw templates.
---
 .template-lintrc.js                           |  3 +-
 .../admin/templates/badges-award.hbs          |  6 +-
 .../admin/templates/badges-index.hbs          |  2 +-
 .../components/admin-report-storage-stats.hbs |  2 +-
 .../components/admin-report-table-cell.hbs    |  2 +-
 .../templates/components/admin-report.hbs     |  2 +-
 .../components/admin-user-field-item.hbs      |  2 +-
 .../components/penalty-post-action.hbs        |  2 +-
 .../templates/components/silence-details.hbs  |  2 +-
 .../components/site-settings/bool.hbs         |  2 +-
 .../site-settings/category-list.hbs           |  2 +-
 .../components/site-settings/category.hbs     |  2 +-
 .../components/site-settings/color.hbs        |  2 +-
 .../components/site-settings/compact-list.hbs |  2 +-
 .../components/site-settings/enum.hbs         |  2 +-
 .../components/site-settings/group-list.hbs   |  2 +-
 .../components/site-settings/host-list.hbs    |  2 +-
 .../components/site-settings/list.hbs         |  2 +-
 .../components/site-settings/secret-list.hbs  |  2 +-
 .../components/site-settings/string.hbs       |  2 +-
 .../components/site-settings/tag-list.hbs     |  2 +-
 .../components/site-settings/upload.hbs       |  2 +-
 .../site-settings/uploaded-image-list.hbs     |  2 +-
 .../components/site-settings/url-list.hbs     |  2 +-
 .../components/site-settings/value-list.hbs   |  2 +-
 .../components/suspension-details.hbs         |  4 +-
 .../templates/components/themes-list-item.hbs |  6 +-
 .../templates/components/themes-list.hbs      |  6 +-
 .../templates/customize-themes-index.hbs      |  4 +-
 .../admin/templates/customize-themes-show.hbs |  2 +-
 .../admin/templates/dashboard-problems.hbs    |  2 +-
 .../admin/templates/dashboard_general.hbs     |  2 +-
 .../admin/templates/email-advanced-test.hbs   |  4 +-
 .../admin/templates/email-preview-digest.hbs  |  2 +-
 .../javascripts/admin/templates/embedding.hbs |  2 +-
 .../templates/logs/staff-action-logs.hbs      |  2 +-
 .../templates/modal/admin-badge-preview.hbs   |  8 +-
 .../templates/modal/admin-install-theme.hbs   |  8 +-
 .../templates/modal/admin-theme-change.hbs    |  2 +-
 .../templates/modal/admin-theme-item.hbs      |  2 +-
 .../admin/templates/search-logs-term.hbs      |  4 +-
 .../admin/templates/user-index.hbs            |  8 +-
 .../admin/templates/users-list-show.hbs       |  8 +-
 .../discourse-common/helpers/html-safe.js.es6 |  6 --
 .../discourse-common/helpers/i18n.js.es6      |  3 +-
 .../discourse/components/text-overflow.js.es6 | 11 ---
 .../discourse/helpers/application.js.es6      | 12 ++-
 .../discourse/helpers/dir-span.js.es6         |  3 +-
 .../discourse/helpers/format-age.js.es6       |  5 +-
 .../javascripts/discourse/lib/computed.js.es6 | 16 ----
 .../javascripts/discourse/templates/about.hbs |  2 +-
 .../templates/account-created/index.hbs       |  2 +-
 .../templates/account-created/resent.hbs      |  2 +-
 .../discourse/templates/badges/show.hbs       |  2 +-
 .../templates/components/about-page-users.hbs |  2 +-
 .../templates/components/badge-card.hbs       |  2 +-
 .../templates/components/categories-boxes.hbs |  2 +-
 .../templates/components/categories-only.hbs  |  8 +-
 .../templates/components/d-button.hbs         |  2 +-
 .../templates/components/d-editor.hbs         |  2 +-
 .../templates/components/discourse-banner.hbs |  4 +-
 .../components/discourse-linked-text.hbs      |  2 +-
 .../components/edit-category-general.hbs      |  6 +-
 .../components/edit-category-security.hbs     |  2 +-
 .../templates/components/featured-topic.hbs   |  4 +-
 .../templates/components/flag-action-type.hbs |  4 +-
 .../templates/components/footer-message.hbs   |  2 +-
 .../templates/components/global-notice.hbs    |  4 +-
 .../components/group-card-contents.hbs        |  2 +-
 .../templates/components/group-post.hbs       |  6 +-
 .../templates/components/invite-panel.hbs     |  4 +-
 .../templates/components/ip-lookup.hbs        |  2 +-
 .../components/mobile-category-topic.hbs      |  2 +-
 .../templates/components/related-messages.hbs |  2 +-
 .../reviewable-conversation-post.hbs          |  2 +-
 .../components/reviewable-flagged-post.hbs    |  2 +-
 .../templates/components/reviewable-item.hbs  |  2 +-
 .../templates/components/reviewable-score.hbs |  2 +-
 .../components/second-factor-form.hbs         |  2 +-
 .../templates/components/share-panel.hbs      |  2 +-
 .../templates/components/share-popup.hbs      |  2 +-
 .../templates/components/share-source.hbs     |  2 +-
 .../components/shared-draft-controls.hbs      |  2 +-
 .../templates/components/suggested-topics.hbs |  2 +-
 .../templates/components/tag-info.hbs         |  2 +-
 .../templates/components/text-overflow.hbs    |  2 +-
 .../templates/components/topic-entrance.hbs   |  4 +-
 .../components/user-card-contents.hbs         |  2 +-
 .../components/user-fields/confirm.hbs        |  4 +-
 .../components/user-fields/dropdown.hbs       |  4 +-
 .../templates/components/user-fields/text.hbs |  4 +-
 .../templates/components/user-stat.hbs        |  2 +-
 .../templates/components/user-stream-item.hbs |  8 +-
 .../components/user-summary-topic.hbs         |  2 +-
 .../discourse/templates/composer.hbs          |  4 +-
 .../templates/composer/custom-body.hbs        |  2 +-
 .../templates/composer/education.hbs          |  2 +-
 .../templates/composer/group-mentioned.hbs    |  2 +-
 .../discourse/templates/discovery.hbs         |  2 +-
 .../discourse/templates/full-page-search.hbs  |  6 +-
 .../javascripts/discourse/templates/group.hbs |  2 +-
 .../discourse/templates/groups/index.hbs      |  2 +-
 .../discourse/templates/invites/show.hbs      |  4 +-
 .../templates/list/activity-column.hbr        |  2 +-
 .../templates/list/topic-excerpt.hbr          |  2 +-
 .../mobile/components/basic-topic-list.hbs    |  4 +-
 .../mobile/components/categories-only.hbs     |  2 +-
 .../mobile/components/mobile-nav.hbs          |  2 +-
 .../templates/modal/activation-resent.hbs     |  2 +-
 .../discourse/templates/modal/auth-token.hbs  |  6 +-
 .../templates/modal/avatar-selector.hbs       |  6 +-
 .../discourse/templates/modal/bookmark.hbs    |  2 +-
 .../modal/bulk-notification-level.hbs         |  2 +-
 .../templates/modal/change-owner.hbs          |  2 +-
 .../templates/modal/create-account.hbs        |  2 +-
 .../modal/delete-topic-disallowed.hbs         |  2 +-
 .../templates/modal/edit-category.hbs         |  2 +-
 .../templates/modal/feature-topic.hbs         | 22 ++---
 .../templates/modal/forgot-password.hbs       |  2 +-
 .../discourse/templates/modal/history.hbs     | 10 +-
 .../modal/keyboard-shortcuts-help.hbs         | 94 +++++++++----------
 .../templates/modal/move-to-topic.hbs         | 10 +-
 .../templates/modal/not-activated.hbs         |  2 +-
 .../templates/modal/post-enqueued.hbs         |  2 +-
 .../modal/second-factor-add-security-key.hbs  |  2 +-
 .../modal/second-factor-add-totp.hbs          |  4 +-
 .../modal/second-factor-backup-edit.hbs       |  2 +-
 .../templates/modal/topic-bulk-actions.hbs    |  2 +-
 .../templates/navigation/category.hbs         |  2 +-
 .../templates/preferences-second-factor.hbs   |  2 +-
 .../templates/preferences/account.hbs         |  2 +-
 .../templates/preferences/emails.hbs          |  2 +-
 .../templates/preferences/profile.hbs         |  2 +-
 .../discourse/templates/static.hbs            |  2 +-
 .../javascripts/discourse/templates/topic.hbs |  6 +-
 .../discourse/templates/unknown.hbs           |  2 +-
 .../discourse/templates/user-invited-show.hbs |  8 +-
 .../javascripts/discourse/templates/user.hbs  |  4 +-
 .../discourse/templates/user/stream.hbs       |  2 +-
 .../discourse/templates/user/summary.hbs      |  2 +-
 .../templates/components/category-row.hbs     |  4 +-
 .../dropdown-select-box-row.hbs               |  4 +-
 .../templates/components/pinned-button.hbs    |  2 +-
 .../components/topic-notifications-button.hbs |  2 +-
 .../templates/components/radio-button.hbs     |  2 +-
 .../templates/components/wizard-field.hbs     |  4 +-
 .../templates/components/wizard-step.hbs      |  2 +-
 .../templates/discourse_topic_onebox.hbs      |  6 +-
 .../templates/discourse_user_onebox.hbs       | 10 +-
 .../discourse-local-dates-create-form.hbs     |  2 +-
 .../components/html-safe-helper-test.js.es6   | 14 ---
 test/javascripts/lib/computed-test.js.es6     | 12 +--
 152 files changed, 284 insertions(+), 345 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
 delete mode 100644 test/javascripts/components/html-safe-helper-test.js.es6

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 29bf420298..6783c6d94e 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -11,7 +11,6 @@ module.exports = {
     "no-unnecessary-concat": true,
     "no-unused-block-params": true,
     "no-unbound": true,
-    "simple-unless": true,
-    "no-triple-curlies": true
+    "simple-unless": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/badges-award.hbs b/app/assets/javascripts/admin/templates/badges-award.hbs
index d0082dc349..b13462bf33 100644
--- a/app/assets/javascripts/admin/templates/badges-award.hbs
+++ b/app/assets/javascripts/admin/templates/badges-award.hbs
@@ -9,11 +9,11 @@
           {{icon-or-image model}}
           <span class="badge-display-name">{{model.name}}</span>
         {{else}}
-          <span class='badge-placeholder'>{{i18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+          <span class='badge-placeholder'>{{I18n 'admin.badges.mass_award.no_badge_selected'}}</span>
         {{/if}}
       </div>
       <div>
-        <h4>{{i18n 'admin.badges.mass_award.upload_csv'}}</h4>
+        <h4>{{I18n 'admin.badges.mass_award.upload_csv'}}</h4>
         <input type='file' id='massAwardCSVUpload' accept='.csv'>
       </div>
       <div>
@@ -34,6 +34,6 @@
       {{/link-to}}
     </form>
   {{else}}
-    <span class='badge-required'>{{i18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+    <span class='badge-required'>{{I18n 'admin.badges.mass_award.no_badge_selected'}}</span>
   {{/if}}
 {{/d-section}}
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index 49c5945ea1..fd08e67279 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -7,7 +7,7 @@
         {{#each badgeIntroLinks as |link|}}
           <a href={{link.href}} class="external-link" target="_blank" rel="noopener">
             {{d-icon link.icon}}
-            <span>{{i18n link.text}}</span>
+            <span>{{I18n link.text}}</span>
           </a>
         {{/each}}
       </div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
index d6e42cd414..fbb9f80a64 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
@@ -15,7 +15,7 @@
 
       {{#if backupStats.last_backup_taken_at}}
         <br>
-        {{i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true")}}
+        {{{i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true")}}}
       {{/if}}
     </p>
   </div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
index fb8f2e4cdc..973e8412be 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
@@ -1 +1 @@
-{{html-safe formatedValue}}
+{{{formatedValue}}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index 48bd58cab9..be9c2ee8d7 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -199,6 +199,6 @@
 {{/conditional-loading-section}}
 {{else}}
   <div class="alert alert-info">
-    {{html-safe disabledLabel}}
+    {{{disabledLabel}}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
index 211cc00b51..269d6babc2 100644
--- a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
@@ -46,7 +46,7 @@
     <div class="form-display">
       <strong>{{userField.name}}</strong>
       <br>
-      {{html-safe userField.description}}
+      {{{userField.description}}}
     </div>
     <div class="form-display">{{fieldName}}</div>
     <div class="form-element controls">
diff --git a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
index a6c848541f..1a672329cd 100644
--- a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
+++ b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
@@ -1,7 +1,7 @@
 <div class='penalty-post-controls'>
   <label>
     <div class='penalty-post-label'>
-      {{i18n 'admin.user.penalty_post_actions'}}
+      {{{i18n 'admin.user.penalty_post_actions'}}}
     </div>
   </label>
   {{combo-box
diff --git a/app/assets/javascripts/admin/templates/components/silence-details.hbs b/app/assets/javascripts/admin/templates/components/silence-details.hbs
index af1b4980d5..3f7c19d5ba 100644
--- a/app/assets/javascripts/admin/templates/components/silence-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/silence-details.hbs
@@ -1,7 +1,7 @@
 <div class='reason-controls'>
   <label>
     <div class='silence-reason-label'>
-      {{i18n 'admin.user.silence_reason_label'}}
+      {{{i18n 'admin.user.silence_reason_label'}}}
     </div>
     </label>
     {{text-field
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
index 11384580c1..1c6c2101ae 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
@@ -1,5 +1,5 @@
 <label>
   {{input type="checkbox" checked=enabled}}
-  <span>{{html-safe setting.description}}</span>
+  <span>{{{setting.description}}}</span>
   {{setting-validation-message message=validationMessage}}
 </label>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
index b9609e2843..6d8871b306 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
@@ -3,5 +3,5 @@
   onChange=(action "onChangeSelectedCategories")
 }}
 
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
index 4358b408de..4f23fcc021 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
@@ -4,4 +4,4 @@
   onChange=(action (mut value))
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
index 7b9b5bf2a8..baf81ab389 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
@@ -6,4 +6,4 @@
   onChangeColor=(action "onChangeColor")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class="desc">{{html-safe setting.description}}</div>
+<div class="desc">{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
index 1e7e369b93..621baec0b1 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
@@ -8,4 +8,4 @@
 }}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
index 0b4104086e..dc33e28df5 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
@@ -15,5 +15,5 @@
 {{setting-validation-message message=validationMessage}}
 
 <div class='desc'>
-  {{html-safe setting.description}}
+  {{{setting.description}}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
index 091573eb53..8f4263a72e 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
@@ -7,4 +7,4 @@
   onChange=(action "onChangeGroupListSetting")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
index 70366aba38..5277c26c69 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_host"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
index 090cc2a5f1..268723c92d 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value inputDelimiter="|" choices=setting.choices}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
index 7451959841..a4ff6f1bd4 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
@@ -1,3 +1,3 @@
 {{secret-value-list setting=setting values=value isSecret=isSecret}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
index 160f041df9..d71278f723 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
@@ -7,4 +7,4 @@
 {{/if}}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
index 21e7e1ab0a..271e4d0326 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
@@ -1,3 +1,3 @@
 {{tag-chooser tags=selectedTags}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
index 2758b7be5a..86940d8633 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
@@ -1,2 +1,2 @@
 {{site-settings-image-uploader imageUrl=value placeholderUrl=setting.placeholder type="site_setting"}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
index 146c9d3722..82dc38d653 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
@@ -1,2 +1,2 @@
 {{d-button label="admin.site_settings.uploaded_image_list.label" action=(action "showUploadModal") actionParam=(hash value=value setting=setting)}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
index 7a6cdc517b..67db58f8ea 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_url"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
index 234ec83f3c..3003b375ee 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class='desc'>{{{setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/suspension-details.hbs b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
index 4dcc606b2b..0f2aa0fc84 100644
--- a/app/assets/javascripts/admin/templates/components/suspension-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
@@ -2,9 +2,9 @@
   <label>
     <div class='suspend-reason-label'>
       {{#if siteSettings.hide_suspension_reasons}}
-        {{i18n 'admin.user.suspend_reason_hidden_label'}}
+        {{{i18n 'admin.user.suspend_reason_hidden_label'}}}
       {{else}}
-        {{i18n 'admin.user.suspend_reason_label'}}
+        {{{i18n 'admin.user.suspend_reason_label'}}}
       {{/if}}
     </div>
   </label>
diff --git a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
index 0c253e0214..1286937f8a 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
@@ -28,14 +28,14 @@
 
   {{#if displayComponents}}
     <div class="components-list">
-      <span class="components">{{html-safe childrenString}}</span>
+      <span class="components">{{{childrenString}}}</span>
 
       {{#if displayHasMore}}
         <a href {{action "toggleChildrenExpanded"}} class="others-count">
           {{#if childrenExpanded}}
-            {{i18n "admin.customize.theme.collapse"}}
+            {{I18n "admin.customize.theme.collapse"}}
           {{else}}
-            {{i18n "admin.customize.theme.and_x_more" count=moreCount}}
+            {{I18n "admin.customize.theme.and_x_more" count=moreCount}}
           {{/if}}
         </a>
       {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/themes-list.hbs b/app/assets/javascripts/admin/templates/components/themes-list.hbs
index 4654371a23..29935b95b8 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list.hbs
@@ -25,9 +25,9 @@
         <div class="themes-list-item inactive-indicator">
           <span class="empty">
             {{#if themesTabActive}}
-              {{i18n "admin.customize.theme.inactive_themes"}}
+              {{I18n "admin.customize.theme.inactive_themes"}}
             {{else}}
-              {{i18n "admin.customize.theme.inactive_components"}}
+              {{I18n "admin.customize.theme.inactive_components"}}
             {{/if}}
           </span>
         </div>
@@ -41,7 +41,7 @@
     {{/if}}
   {{else}}
     <div class="themes-list-item">
-      <span class="empty">{{i18n "admin.customize.theme.empty"}}</span>
+      <span class="empty">{{I18n "admin.customize.theme.empty"}}</span>
     </div>
   {{/if}}
 
diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
index 32ad33db10..0a6060724b 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-index.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
@@ -1,7 +1,7 @@
 <div class="themes-intro admin-intro">
   <img src={{womanArtistEmojiURL}}>
   <div class="content-wrapper">
-    <h1>{{i18n "admin.customize.theme.themes_intro"}}</h1>
+    <h1>{{I18n "admin.customize.theme.themes_intro"}}</h1>
      <div class="create-actions">
       {{d-button action=(route-action "installModal") icon="upload" label="admin.customize.install" class="btn-primary"}}
     </div>
@@ -9,7 +9,7 @@
       {{#each externalResources as |resource|}}
         <a href={{resource.link}} class="external-link" rel="noopener" target="_blank">
           {{d-icon resource.icon}}
-          {{i18n resource.key}}
+          {{I18n resource.key}}
         </a>
       {{/each}}
     </div>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index b4c4e9a8f4..9fb7fcb4cf 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -89,7 +89,7 @@
 
         {{#if showRemoteError}}
           <div class="error-message">
-            {{d-icon "exclamation-triangle"}} {{i18n "admin.customize.theme.repo_unreachable"}}
+            {{d-icon "exclamation-triangle"}} {{I18n "admin.customize.theme.repo_unreachable"}}
           </div>
           <div class="raw-error">
             <code>{{model.remoteError}}</code>
diff --git a/app/assets/javascripts/admin/templates/dashboard-problems.hbs b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
index 5f95987e73..0f0b1f9d29 100644
--- a/app/assets/javascripts/admin/templates/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
@@ -12,7 +12,7 @@
         <div class="problem-messages">
           <ul>
             {{#each problems as |problem|}}
-              <li>{{html-safe problem}}</li>
+              <li>{{{problem}}}</li>
             {{/each}}
           </ul>
         </div>
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index d190b7664b..19f892ab0f 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -142,7 +142,7 @@
         filters=trendingSearchFilters
         isEnabled=logSearchQueriesEnabled
         disabledLabel=trendingSearchDisabledLabel}}
-      {{i18n "admin.dashboard.reports.trending_search.more" basePath=basePath}}
+      {{{i18n "admin.dashboard.reports.trending_search.more" basePath=basePath}}}
     </div>
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/email-advanced-test.hbs b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
index f0dcaa5c6a..97a479e2c5 100644
--- a/app/assets/javascripts/admin/templates/email-advanced-test.hbs
+++ b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
@@ -14,13 +14,13 @@
   <hr>
   <div class="text">
     <h3>{{i18n 'admin.email.advanced_test.text'}}</h3>
-    <pre class="full-reason">{{html-safe text}}</pre>
+    <pre class="full-reason">{{{text}}}</pre>
   </div>
 
   <hr>
   <div class="elided">
     <h3>{{i18n 'admin.email.advanced_test.elided'}}</h3>
-    <pre class="full-reason">{{html-safe elided}}</pre>
+    <pre class="full-reason">{{{elided}}}</pre>
   </div>
 {{/if}}
 
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 7a695659c5..078b642dd4 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -53,7 +53,7 @@
           <iframe srcdoc={{model.html_content}} />
         {{/if}}
       {{else}}
-        <pre>{{html-safe model.text_content}}</pre>
+        <pre>{{{model.text_content}}}</pre>
       {{/if}}
     </div>
   </div>
diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index 1777263674..f4ada49e1b 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -23,7 +23,7 @@
 
 {{#if showSecondary}}
   <div class='embedding-secondary'>
-    <p>{{i18n "admin.embedding.sample"}}</p>
+    <p>{{{i18n "admin.embedding.sample"}}}</p>
     {{highlighted-code code=embeddingCode lang="html"}}
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index ab4c70d39e..02c4160b6a 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -88,7 +88,7 @@
               <td class="col value created-at">{{age-with-tooltip item.created_at}}</td>
               <td class="col value details">
                 <div>
-                  {{html-safe item.formattedDetails}}
+                  {{{item.formattedDetails}}}
                   {{#if item.useCustomModalForDetails}}
                     <a href {{action "showCustomDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n 'admin.logs.staff_actions.show'}}</a>
                   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
index 528ed5af24..ef36e4aa05 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
@@ -17,9 +17,9 @@
   {{else}}
     <p class="grant-count">
       {{#if count}}
-        {{i18n "admin.badges.preview.grant_count" count=count}}
+        {{{i18n "admin.badges.preview.grant_count" count=count}}}
       {{else}}
-        {{i18n "admin.badges.preview.no_grant_count"}}
+        {{{i18n "admin.badges.preview.no_grant_count"}}}
       {{/if}}
     </p>
 
@@ -41,14 +41,14 @@
       </p>
       <ul>
         {{#each processedSample as |html|}}
-          <li>{{html-safe html}}</li>
+          <li>{{{html}}}</li>
         {{/each}}
       </ul>
     {{/if}}
 
     {{#if hasQueryPlan}}
       <div class="badge-query-plan">
-        {{html-safe queryPlanHtml}}
+        {{{queryPlanHtml}}}
       </div>
     {{/if}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
index 5ed497ae57..aab0b17d71 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
@@ -24,7 +24,7 @@
 
             <div class="popular-theme-buttons">
               {{#if theme.installed}}
-                <span>{{i18n "admin.customize.theme.installed"}}</span>
+                <span>{{I18n "admin.customize.theme.installed"}}</span>
               {{else}}
                 {{d-button class='btn-small'
                   label="admin.customize.theme.install"
@@ -33,7 +33,7 @@
                   action=(action "installThemeFromList" theme.value)}}
 
                 {{#if theme.preview}}
-                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{i18n "admin.customize.theme.preview"}}</a>
+                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{I18n "admin.customize.theme.preview"}}</a>
                 {{/if}}
               {{/if}}
             </div>
@@ -85,10 +85,10 @@
 
     {{#if create}}
       <div class="inputs">
-        <div class="label">{{i18n "admin.customize.theme.create_name"}}</div>
+        <div class="label">{{I18n "admin.customize.theme.create_name"}}</div>
         {{input value=name placeholder=placeholder}}
 
-        <div class="label">{{i18n "admin.customize.theme.create_type"}}</div>
+        <div class="label">{{I18n "admin.customize.theme.create_type"}}</div>
         {{combo-box
           valueProperty="value"
           content=createTypes
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
index 7b3ffb5ca5..ec26f608d8 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
@@ -1,6 +1,6 @@
 <div>
   {{#d-modal-body title="admin.logs.staff_actions.modal_title"}}
-    {{html-safe diff}}
+    {{{diff}}}
   {{/d-modal-body}}
   <div class="modal-footer">
     {{d-button
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
index 724af5ace4..7a5ddc1ea7 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
@@ -7,7 +7,7 @@
   </div>
   <div class="popular-theme-buttons">
     {{#if theme.installed}}
-      <span>{{i18n "admin.customize.theme.installed"}}</span>
+      <span>{{I18n "admin.customize.theme.installed"}}</span>
     {{else}}
       {{d-button class='btn-small'
         label="admin.customize.theme.install"
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 27f61f2940..78bd54afb9 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -31,7 +31,7 @@
       <div class='fps-topic'>
         <div class='topic'>
           <a class='search-link' href={{result.url}}>
-            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{{result.topic.fancyTitle}}}{{/highlight-text}}</span>
           </a>
 
           <div class='search-category'>
@@ -55,7 +55,7 @@
 
           {{#if result.blurb}}
             {{#highlight-text highlight=term}}
-              {{html-safe result.blurb}}
+              {{{result.blurb}}}
             {{/highlight-text}}
           {{/if}}
         </div>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 23a1a6aae3..207120eea8 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -132,7 +132,7 @@
     <div class="field">{{i18n "user.avatar.title"}}</div>
     <div class="value">{{avatar model imageSize="large"}}</div>
     <div class="controls">
-      {{i18n "admin.user.visit_profile" url=preferencesPath}}
+      {{{i18n "admin.user.visit_profile" url=preferencesPath}}}
     </div>
   </div>
 
@@ -509,7 +509,7 @@
     <h1>{{i18n "admin.groups.title"}}</h1>
       <div class="display-row">
         <div class="field">{{i18n "admin.groups.automatic"}}</div>
-        <div class="value">{{html-safe automaticGroups}}</div>
+        <div class="value">{{{automaticGroups}}}</div>
       </div>
       <div class="display-row">
         <div class="field">{{i18n "admin.groups.custom"}}</div>
@@ -616,11 +616,11 @@
   </div>
   <div class="display-row">
     <div class="field">{{i18n "admin.user.time_read"}}</div>
-    <div class="value">{{format-duration model.time_read}}</div>
+    <div class="value">{{{format-duration model.time_read}}}</div>
   </div>
   <div class="display-row">
     <div class="field">{{i18n "user.invited.days_visited"}}</div>
-    <div class="value">{{html-safe model.days_visited}}</div>
+    <div class="value">{{{model.days_visited}}}</div>
   </div>
 </section>
 
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 6b0253aeda..7d096573b0 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -53,11 +53,11 @@
             </td>
             <td class="last-emailed">
               <div class="label">{{i18n 'admin.users.last_emailed'}}</div>
-              <div>{{format-duration user.last_emailed_age}}</div>
+              <div>{{{format-duration user.last_emailed_age}}}</div>
             </td>
             <td class="last-seen">
               <div class="label">{{i18n 'last_seen'}}</div>
-              <div>{{format-duration user.last_seen_age}}</div>
+              <div>{{{format-duration user.last_seen_age}}}</div>
             </td>
             <td class="topics-entered">
               <div class="label">{{i18n 'admin.user.topics_entered'}}</div>
@@ -69,12 +69,12 @@
             </td>
             <td class="time-read">
               <div class="label">{{i18n 'admin.user.time_read'}}</div>
-              <div>{{format-duration user.time_read}}</div>
+              <div>{{{format-duration user.time_read}}}</div>
             </td>
 
             <td class="created">
               <div class="label">{{i18n 'created'}}</div>
-              <div>{{format-duration user.created_at_age}}</div>
+              <div>{{{format-duration user.created_at_age}}}</div>
             </td>
 
             {{#if siteSettings.must_approve_users}}
diff --git a/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6 b/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
deleted file mode 100644
index dc6d5daf74..0000000000
--- a/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import { registerUnbound } from "discourse-common/lib/helpers";
-import { htmlSafe } from "@ember/template";
-
-registerUnbound("html-safe", function(string) {
-  return htmlSafe(string);
-});
diff --git a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
index c3d7f1e448..902ed699bf 100644
--- a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
+++ b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
@@ -1,7 +1,6 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
-import { htmlSafe } from "@ember/template";
 
-registerUnbound("i18n", (key, params) => htmlSafe(I18n.t(key, params)));
+registerUnbound("i18n", (key, params) => I18n.t(key, params));
 registerUnbound("i18n-yes-no", (value, params) =>
   I18n.t(value ? "yes_value" : "no_value", params)
 );
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js.es6 b/app/assets/javascripts/discourse/components/text-overflow.js.es6
index 201172f1ef..90a9cc21a2 100644
--- a/app/assets/javascripts/discourse/components/text-overflow.js.es6
+++ b/app/assets/javascripts/discourse/components/text-overflow.js.es6
@@ -1,19 +1,8 @@
 import { next } from "@ember/runloop";
-import { htmlSafe } from "@ember/template";
 import Component from "@ember/component";
-
 export default Component.extend({
-  text: null,
-
-  init() {
-    this._super(...arguments);
-
-    this.set("text", htmlSafe(this.text));
-  },
-
   didInsertElement() {
     this._super(...arguments);
-
     next(null, () => {
       const $this = $(this.element);
 
diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js.es6
index 27727c1d84..71baa92c91 100644
--- a/app/assets/javascripts/discourse/helpers/application.js.es6
+++ b/app/assets/javascripts/discourse/helpers/application.js.es6
@@ -4,12 +4,14 @@ import {
   autoUpdatingRelativeAge,
   number
 } from "discourse/lib/formatter";
-import { htmlSafe } from "@ember/template";
 
-registerUnbound("raw-date", dt => htmlSafe(longDate(new Date(dt))));
+const safe = Handlebars.SafeString;
 
-registerUnbound("age-with-tooltip", dt =>
-  htmlSafe(autoUpdatingRelativeAge(new Date(dt), { title: true }))
+registerUnbound("raw-date", dt => longDate(new Date(dt)));
+
+registerUnbound(
+  "age-with-tooltip",
+  dt => new safe(autoUpdatingRelativeAge(new Date(dt), { title: true }))
 );
 
 registerUnbound("number", (orig, params) => {
@@ -46,5 +48,5 @@ registerUnbound("number", (orig, params) => {
 
   result += ">" + n + "</span>";
 
-  return htmlSafe(result);
+  return new safe(result);
 });
diff --git a/app/assets/javascripts/discourse/helpers/dir-span.js.es6 b/app/assets/javascripts/discourse/helpers/dir-span.js.es6
index e210c471fd..d41f1a332e 100644
--- a/app/assets/javascripts/discourse/helpers/dir-span.js.es6
+++ b/app/assets/javascripts/discourse/helpers/dir-span.js.es6
@@ -1,6 +1,5 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { isRTL } from "discourse/lib/text-direction";
-import { htmlSafe } from "@ember/template";
 
 function setDir(text) {
   let content = text ? text : "";
@@ -12,5 +11,5 @@ function setDir(text) {
 }
 
 export default registerUnbound("dir-span", function(str) {
-  return htmlSafe(setDir(str));
+  return new Handlebars.SafeString(setDir(str));
 });
diff --git a/app/assets/javascripts/discourse/helpers/format-age.js.es6 b/app/assets/javascripts/discourse/helpers/format-age.js.es6
index b8874820ed..3141a0da85 100644
--- a/app/assets/javascripts/discourse/helpers/format-age.js.es6
+++ b/app/assets/javascripts/discourse/helpers/format-age.js.es6
@@ -1,12 +1,11 @@
 import { autoUpdatingRelativeAge, durationTiny } from "discourse/lib/formatter";
 import { registerUnbound } from "discourse-common/lib/helpers";
-import { htmlSafe } from "@ember/template";
 
 registerUnbound("format-age", function(dt) {
   dt = new Date(dt);
-  return htmlSafe(autoUpdatingRelativeAge(dt));
+  return new Handlebars.SafeString(autoUpdatingRelativeAge(dt));
 });
 
 registerUnbound("format-duration", function(seconds) {
-  return htmlSafe(durationTiny(seconds));
+  return new Handlebars.SafeString(durationTiny(seconds));
 });
diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js.es6
index e238320a38..acd6cde60b 100644
--- a/app/assets/javascripts/discourse/lib/computed.js.es6
+++ b/app/assets/javascripts/discourse/lib/computed.js.es6
@@ -1,6 +1,5 @@
 import { computed } from "@ember/object";
 import addonFmt from "ember-addons/fmt";
-import { htmlSafe as htmlSafeTemplateHelper } from "@ember/template";
 
 /**
   Returns whether two properties are equal to each other.
@@ -57,21 +56,6 @@ export function i18n(...args) {
     return I18n.t(addonFmt(format, ...args.map(a => this.get(a))));
   });
 }
-/**
-  Returns htmlSafe version of a string.
-
-  @method htmlSafe
-  @params {String} properties* to htmlify
-  @return {Function} discourseComputedProperty function
-**/
-export function htmlSafe(...args) {
-  return computed(...args, {
-    get() {
-      const path = args.pop();
-      return htmlSafeTemplateHelper(this.get(path));
-    }
-  });
-}
 
 /**
   Uses an Ember String `fmt` call to format a string. See:
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index ad65dbb57e..6e75a04a6d 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -112,7 +112,7 @@
       {{#if contactInfo}}
         <section class='about contact'>
             <h3>{{d-icon "far-envelope"}} {{i18n 'about.contact'}}</h3>
-            <p>{{html-safe contactInfo}}</p>
+            <p>{{{contactInfo}}}</p>
         </section>
       {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/account-created/index.hbs b/app/assets/javascripts/discourse/templates/account-created/index.hbs
index 8122270cd6..8c9babb1f9 100644
--- a/app/assets/javascripts/discourse/templates/account-created/index.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/index.hbs
@@ -1,5 +1,5 @@
 <div class='ac-message'>
-  {{html-safe accountCreated.message}}
+  {{{accountCreated.message}}}
 </div>
 {{#if accountCreated.show_controls}}
   {{activation-controls sendActivationEmail=(action "sendActivationEmail")
diff --git a/app/assets/javascripts/discourse/templates/account-created/resent.hbs b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
index 5ad9168986..8647596a04 100644
--- a/app/assets/javascripts/discourse/templates/account-created/resent.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
@@ -1,6 +1,6 @@
 <div class='ac-message'>
   {{#if email}}
-    {{i18n 'login.sent_activation_email_again' currentEmail=email}}
+    {{{i18n 'login.sent_activation_email_again' currentEmail=email}}}
   {{else}}
     {{i18n 'login.sent_activation_email_again_generic'}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index fe7b489159..09ded422b3 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -42,7 +42,7 @@
           {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
             <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
             {{#if ub.post_number}}
-              <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{html-safe ub.topic.fancyTitle}}</a>
+              <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{{ub.topic.fancyTitle}}}</a>
             {{/if}}
           {{/user-info}}
         {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
index 4b7161ba18..f7bfd9886b 100644
--- a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
+++ b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
@@ -3,7 +3,7 @@
     <div class="user-image">
       <div class="user-image-inner">
         <a href={{userTemplate.userPath}} data-user-card={{userTemplate.username}}>
-          {{html-safe userTemplate.avatar}}
+          {{{userTemplate.avatar}}}
         </a>
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
index 4fb6aa77c0..0fdc3bd275 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-card.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
@@ -11,7 +11,7 @@
   <div class='badge-info'>
     <div class='badge-info-item'>
       <h3><a href={{url}} class='badge-link'>{{badge.name}}</a></h3>
-      <div class='badge-summary'>{{html-safe summary}}</div>
+      <div class='badge-summary'>{{{summary}}}</div>
     </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index 232edea06b..5dc594c691 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -24,7 +24,7 @@
         </div>
 
         <div class='description'>
-          {{text-overflow class="overflow" text=c.description_excerpt}}
+          {{{text-overflow class="overflow" text=c.description_excerpt}}}
         </div>
         {{#if c.isGrandParent}}
           {{#each c.subcategories as |subcategory|}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index ae71465bf0..4f153b4e7f 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -16,7 +16,7 @@
             {{category-title-link category=c}}
             {{#if c.description_excerpt}}
               <div class="category-description">
-                {{dir-span c.description_excerpt}}
+                {{{dir-span c.description_excerpt}}}
               </div>
             {{/if}}
             {{#if c.isGrandParent}}
@@ -28,7 +28,7 @@
                         {{category-title-link tagName="h4" category=subcategory}}
                         {{#if subcategory.description_excerpt}}
                           <div class="category-description subcategory-description">
-                            {{dir-span subcategory.description_excerpt}}
+                            {{{dir-span subcategory.description_excerpt}}}
                           </div>
                         {{/if}}
                         {{#if subcategory.subcategories}}
@@ -45,7 +45,7 @@
                         {{else}}
                           {{#if subcategory.description_excerpt}}
                             <div class="category-description subcategory-description">
-                              {{dir-span subcategory.description_excerpt}}
+                              {{{dir-span subcategory.description_excerpt}}}
                             </div>
                           {{/if}}
                         {{/if}}
@@ -69,7 +69,7 @@
             {{/if}}
           </td>
           <td class="topics">
-            <div title={{c.statTitle}}>{{html-safe c.stat}}</div>
+            <div title={{c.statTitle}}>{{{c.stat}}}</div>
             {{category-unread category=c tagName="div" class="unread-new"}}
           </td>
           {{#if showTopics}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/templates/components/d-button.hbs
index aeb5f6b6f6..755e4ea857 100644
--- a/app/assets/javascripts/discourse/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-button.hbs
@@ -3,7 +3,7 @@
 {{/if}}
 
 {{#if translatedLabel}}
-  <span class='d-button-label'>{{html-safe translatedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
+  <span class='d-button-label'>{{{translatedLabel}}}{{#if ellipsis}}&hellip;{{/if}}</span>
 {{/if}}
 
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index 97effd78d4..f868131b63 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -46,7 +46,7 @@
   </div>
 
   <div class="d-editor-preview-wrapper {{if forcePreview 'force-preview'}}">
-    <div class="d-editor-preview">{{html-safe preview}}</div>
+    <div class="d-editor-preview">{{{preview}}}</div>
     {{plugin-outlet name="editor-preview" classNames="d-editor-plugin" args=outletArgs}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index cda2c2069a..27025bedee 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -3,9 +3,9 @@
     <div id="banner" class={{overlay}}>
       {{d-button icon="times" action="dismiss" class="btn btn-flat close" title="banner.close"}}
       <div id="banner-content">
-        {{html-safe content}}
+        {{{content}}}
         {{#if currentUser.staff}}
-          <p><a href={{banner.url}}>{{i18n "banner.edit"}}</a></p>
+          <p><a href={{banner.url}}>{{{i18n "banner.edit"}}}</a></p>
         {{/if}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs b/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
index 78515d0404..dd15a6dc6a 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
@@ -1 +1 @@
-{{html-safe translatedText}}
+{{{translatedText}}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index 7884f85e1f..19d6e724dc 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -1,7 +1,7 @@
 {{#if category.isUncategorizedCategory}}
   <p class="warning">
     {{d-icon "exclamation-triangle"}}
-    {{i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink}}
+    {{{i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink}}}
   </p>
 {{/if}}
 
@@ -36,7 +36,7 @@
     <section class='field'>
       <label>{{i18n 'category.description'}}</label>
       {{#if category.description}}
-        {{html-safe category.description}}
+        {{{category.description}}}
       {{else}}
         {{i18n 'category.no_description'}}
       {{/if}}
@@ -51,7 +51,7 @@
     <section class='field'>
       <label>{{i18n 'category.badge_colors'}}</label>
       <div class="category-color-editor">
-        {{html-safe categoryBadgePreview}}
+        {{{categoryBadgePreview}}}
 
         <div class='input-prepend input-append' style="margin-top: 10px;">
           <span class='color-title'>{{i18n 'category.background_color'}}:</span>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index 5b132092c4..cfde179c32 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -11,7 +11,7 @@
       {{#each category.permissions as |p|}}
         <li>
           <span class="name"><span class="badge-group">{{p.group_name}}</span></span>
-          {{i18n "category.can"}}
+          {{{i18n "category.can"}}}
           <span class="permission">{{p.permission.description}}</span>
           {{#if editingPermissions}}
             <a class="remove-permission" href {{action "removePermission" p}}>{{d-icon "times-circle"}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
index 10d9d5fcba..655ca8c16e 100644
--- a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
@@ -1,10 +1,10 @@
 {{raw "topic-status" topic=topic}}
-<a class='title' href={{topic.lastUnreadUrl}}>{{html-safe topic.fancyTitle}}</a>
+<a class='title' href={{topic.lastUnreadUrl}}>{{{topic.fancyTitle}}}</a>
 {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
 
 {{#if latestTopicOnly}}
   <div class='last-user-info'>
-    {{i18n 'categories.latest_by'}} <a href={{html-safe topic.lastPosterUrl}}>{{topic.last_poster.username}}</a>
+    {{i18n 'categories.latest_by'}} <a href={{{topic.lastPosterUrl}}}>{{topic.last_poster.username}}</a>
     <a href={{topic.lastPostUrl}}>{{format-age topic.last_posted_at}}</a>
   </div>
 {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
index cc7b592b42..e6fe7ca516 100644
--- a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
@@ -5,7 +5,7 @@
       <input type='radio' id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
 
       <div class='flag-action-type-details'>
-        <span class='description'>{{html-safe flag.description}}</span>
+        <span class='description'>{{{flag.description}}}</span>
         {{#if showMessageInput}}
           {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
           <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
@@ -24,7 +24,7 @@
       <div class='flag-action-type-details'>
         <strong>{{formattedName}}</strong>
         {{#if showDescription}}
-          <div class='description'>{{html-safe description}}</div>
+          <div class='description'>{{{description}}}</div>
         {{/if}}
         {{#if showMessageInput}}
           {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
diff --git a/app/assets/javascripts/discourse/templates/components/footer-message.hbs b/app/assets/javascripts/discourse/templates/components/footer-message.hbs
index 03e5c7b8ee..65e3a460df 100644
--- a/app/assets/javascripts/discourse/templates/components/footer-message.hbs
+++ b/app/assets/javascripts/discourse/templates/components/footer-message.hbs
@@ -1,4 +1,4 @@
-{{#if education}}<div class="education">{{html-safe education}}</div>{{/if}}
+{{#if education}}<div class="education">{{{education}}}</div>{{/if}}
 <h3>
   {{message}}
   {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/global-notice.hbs b/app/assets/javascripts/discourse/templates/components/global-notice.hbs
index 08ff36603f..c2b3b75e2e 100644
--- a/app/assets/javascripts/discourse/templates/components/global-notice.hbs
+++ b/app/assets/javascripts/discourse/templates/components/global-notice.hbs
@@ -2,9 +2,9 @@
   <div class="row">
     <div id="global-notice-{{notice.id}}" class="alert alert-{{notice.options.level}} {{notice.id}}">
       {{#if notice.options.html}}
-        {{html-safe notice.options.html}}
+        {{{notice.options.html}}}
       {{/if}}
-      <span class="text">{{html-safe notice.text}}</span>
+      <span class="text">{{{notice.text}}}</span>
 
       {{#if notice.options.dismissable}}
         {{d-button
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index 7f6104b836..22629d003d 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -43,7 +43,7 @@
 
     {{#if group.bio_cooked}}
       <div class="card-row second-row">
-        <div class='bio'>{{html-safe group.bio_cooked}}</div>
+        <div class='bio'>{{{group.bio_cooked}}}</div>
       </div>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index d4a9673708..d9880b54b6 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -8,7 +8,7 @@
   <div class='stream-topic-details'>
       <div class='stream-topic-title'>
         <span class='title'>
-          <a href={{postUrl}}>{{html-safe post.topic.fancyTitle}}</a>
+          <a href={{postUrl}}>{{{post.topic.fancyTitle}}}</a>
         </span>
       </div>
       <div class="group-post-category">{{category-link post.category}}</div>
@@ -24,8 +24,8 @@
 
 <div class='excerpt'>
   {{#if post.expandedExcerpt}}
-    {{html-safe post.expandedExcerpt}}
+    {{{post.expandedExcerpt}}}
   {{else}}
-    {{html-safe post.excerpt}}
+    {{{post.excerpt}}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
index cfdd1431bf..3c13bea09e 100644
--- a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
@@ -1,6 +1,6 @@
 {{#if inviteModel.error}}
   <div class="alert alert-error">
-    {{html-safe errorMessage}}
+    {{{errorMessage}}}
   </div>
 {{/if}}
 
@@ -10,7 +10,7 @@
       {{generated-invite-link link=inviteModel.inviteLink email=emailOrUsername}}
     {{else}}
       <div class="success-message">
-        {{html-safe successMessage}}
+        {{{successMessage}}}
       </div>
     {{/if}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 9b7b7bebc4..dce5918f52 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -14,7 +14,7 @@
       {{d-button action=(action "copy") class="pull-right no-text" icon="copy"}}
     {{/if}}
     <h4>{{i18n "ip_lookup.title"}}</h4>
-    <p class='powered-by'>{{i18n "ip_lookup.powered_by"}}</p>
+    <p class='powered-by'>{{{i18n "ip_lookup.powered_by"}}}</p>
     <dl>
       {{#if location}}
         {{#if location.hostname}}
diff --git a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
index 3c4fcf9491..e9d901d880 100644
--- a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
@@ -5,7 +5,7 @@
     {{#if topic.unseen}}
       <span class="badge-notification new-topic"></span>
     {{/if}}
-    <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{format-age topic.last_posted_at}}</span>
+    <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{{format-age topic.last_posted_at}}}</span>
   </div>
 </td>
 <td class='num posts'>{{raw "list/post-count-or-badges" topic=topic postBadgesEnabled="true"}}</td>
diff --git a/app/assets/javascripts/discourse/templates/components/related-messages.hbs b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
index 09e1abb1a1..84b7d42962 100644
--- a/app/assets/javascripts/discourse/templates/components/related-messages.hbs
+++ b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
@@ -10,5 +10,5 @@
 </div>
 
 {{#if targetUser}}
-  <h3 class="see-all-pms-message">{{i18n "related_messages.see_all" path=searchLink username=targetUser.username}}</h3>
+  <h3 class="see-all-pms-message">{{{i18n "related_messages.see_all" path=searchLink username=targetUser.username}}}</h3>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
index 25aeea0726..1bdcd280ff 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
@@ -3,6 +3,6 @@
     {{#if showUsername}}
       {{#link-to 'user' post.user class="username"}}@{{post.user.username}}{{/link-to}}
     {{/if}}
-    {{html-safe post.excerpt}}
+    {{{post.excerpt}}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
index 2ac3b61ff7..09e196766f 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
@@ -17,7 +17,7 @@
       {{#if reviewable.blank_post}}
         <p>{{i18n "review.deleted_post"}}</p>
       {{else}}
-        {{html-safe reviewable.cooked}}
+        {{{reviewable.cooked}}}
       {{/if}}
     </div>
     {{plugin-outlet name="after-reviewable-flagged-post-body" args=(hash model=reviewable)}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
index 7b3a7a2f2a..2d432a53b4 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
@@ -46,7 +46,7 @@
   <div class='reviewable-actions'>
     {{#if claimEnabled}}
       <div class='claimed-actions'>
-        <span class='help'>{{html-safe claimHelp}}</span>
+        <span class='help'>{{{claimHelp}}}</span>
         {{reviewable-claimed-topic topicId=topicId claimedBy=reviewable.claimed_by}}
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
index 847cc42154..aa9a2f0fe2 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
@@ -49,7 +49,7 @@
 {{#if rs.reason}}
   <tr>
     <td colspan='7'>
-      <div class='reviewable-score-reason'>{{html-safe rs.reason}}</div>
+      <div class='reviewable-score-reason'>{{{rs.reason}}}</div>
     </td>
   </tr>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
index dc03f52d54..4c5c717be3 100644
--- a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
@@ -1,7 +1,7 @@
 <div id="second-factor">
   <h3>{{secondFactorTitle}}</h3>
   {{#if optionalText}}
-    <p>{{html-safe optionalText}}</p>
+    <p>{{{optionalText}}}</p>
   {{/if}}
   <p>{{secondFactorDescription}}</p>
   {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
index 1808d6cc1f..b166c42071 100644
--- a/app/assets/javascripts/discourse/templates/components/share-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
@@ -1,5 +1,5 @@
 <div class="header">
-  <h3 class="title">{{html-safe shareTitle}}</h3>
+  <h3 class="title">{{{shareTitle}}}</h3>
 </div>
 
 <div class="body">
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index 54e8029cf6..6f0428b1aa 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -1,5 +1,5 @@
 <div class="title">
-  <h3>{{html-safe shareTitle}}</h3>
+  <h3>{{{shareTitle}}}</h3>
 
   {{#if date}}
     <span class="date">{{displayDate}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/share-source.hbs b/app/assets/javascripts/discourse/templates/components/share-source.hbs
index eaee0823d0..32fa1adb65 100644
--- a/app/assets/javascripts/discourse/templates/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-source.hbs
@@ -2,6 +2,6 @@
   {{#if source.icon}}
     {{d-icon source.icon}}
   {{else}}
-    {{html-safe source.htmlIcon}}
+    {{{source.htmlIcon}}}
   {{/if}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
index d42eb1b177..23b2d45ae2 100644
--- a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
+++ b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
@@ -2,7 +2,7 @@
   {{#if publishing}}
     {{i18n "shared_drafts.publishing"}}
   {{else}}
-    {{i18n "shared_drafts.notice" category=topic.category.name}}
+    {{{i18n "shared_drafts.notice" category=topic.category.name}}}
 
     <div class='publish-field'>
       <label>{{i18n "shared_drafts.destination_category"}}</label>
diff --git a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
index ae7db1c907..ffd142b1be 100644
--- a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
@@ -13,4 +13,4 @@
   {{/if}}
 </div>
 
-<h3 class="suggested-topics-message">{{html-safe browseMoreMessage}}</h3>
+<h3 class="suggested-topics-message">{{{browseMoreMessage}}}</h3>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
index aa1f4889d1..3b616fec81 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
@@ -32,7 +32,7 @@
     {{#if tagInfo.synonyms}}
       <div class="synonyms-list">
         <h3>{{i18n "tagging.synonyms"}}</h3>
-        <div>{{i18n "tagging.synonyms_description" base_tag_name=tagInfo.name}}</div>
+        <div>{{{i18n "tagging.synonyms_description" base_tag_name=tagInfo.name}}}</div>
         <div class="tag-list">
           {{#each tagInfo.synonyms as |tag|}}
             <div class='tag-box'>
diff --git a/app/assets/javascripts/discourse/templates/components/text-overflow.hbs b/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
index 3606bb98a0..05a4439029 100644
--- a/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
+++ b/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
@@ -1 +1 @@
-{{html-safe text}}
+{{{text}}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
index 227674d60c..7b7fb58b8b 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
@@ -1,7 +1,7 @@
 {{#d-button action=(action "enterTop") class="full jump-top"}}
-  {{d-icon 'step-backward'}} {{html-safe topDate}}
+  {{d-icon 'step-backward'}} {{{topDate}}}
 {{/d-button}}
 
 {{#d-button action=(action "enterBottom") class="full jump-bottom"}}
-  {{html-safe bottomDate}} {{d-icon 'step-forward'}}
+  {{{bottomDate}}} {{d-icon 'step-forward'}}
 {{/d-button}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index 3bfdf96268..f6956782a9 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -144,7 +144,7 @@
         <div class="card-row">
           <div class="featured-topic">
             <span class="desc">{{i18n 'user.featured_topic'}}</span>
-            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{html-safe user.featured_topic.fancy_title}}{{/link-to}}
+            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{{user.featured_topic.fancy_title}}}{{/link-to}}
           </div>
         </div>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index c09e659301..fe91090dde 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,6 +1,6 @@
 {{#if field.name}}
   <label class="control-label" for={{concat 'user-' elementId}}>
-    {{html-safe field.name}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
+    {{{field.name}}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
   </label>
 {{/if}}
 
@@ -8,7 +8,7 @@
   <label class="control-label checkbox-label">
     {{input id=(concat 'user-' elementId) checked=value type="checkbox"}}
     <span>
-      {{html-safe field.description}}   {{#unless field.name}}{{#if field.required}}<span class='required'>*</span>{{/if}}{{/unless}}
+      {{{field.description}}}   {{#unless field.name}}{{#if field.required}}<span class='required'>*</span>{{/if}}{{/unless}}
     </span>
   </label>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index fd3cb91917..136585cb03 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,4 +1,4 @@
-<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{combo-box
@@ -10,5 +10,5 @@
     none=noneLabel
     onChange=(action (mut value))
   }}
-  <div class="instructions">{{html-safe field.description}}</div>
+  <div class="instructions">{{{field.description}}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 1c33ea1452..4549f721af 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,6 +1,6 @@
-<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{input id=(concat 'user-' elementId) value=value maxlength=site.user_field_max_length}}
-  <div class="instructions">{{html-safe field.description}}</div>
+  <div class="instructions">{{{field.description}}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index 69704bf892..87b1a220e1 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -9,5 +9,5 @@
 </span>
 <span class='label'>
   {{#if icon}}{{d-icon icon}}{{/if}}
-  {{i18n label count=value}}
+  {{{i18n label count=value}}}
 </span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index f6da96aa0c..a87439ad35 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -2,7 +2,7 @@
   <a href={{item.userUrl}} data-user-card={{item.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
   <span class='time'>{{format-date item.created_at}}</span>
   {{#if item.draftType}}
-    <span class='draft-type'>{{html-safe item.draftType}}</span>
+    <span class='draft-type'>{{{item.draftType}}}</span>
   {{else}}
     {{expand-post item=item}}
   {{/if}}
@@ -11,9 +11,9 @@
       {{topic-status topic=item disableActions=true}}
       <span class="title">
         {{#if item.postUrl}}
-          <a href={{item.postUrl}}>{{html-safe item.title}}</a>
+          <a href={{item.postUrl}}>{{{item.title}}}</a>
         {{else}}
-          {{html-safe item.title}}
+          {{{item.title}}}
         {{/if}}
       </span>
     </div>
@@ -36,13 +36,11 @@
 {{/if}}
 
 <p class='excerpt' data-topic-id={{item.topic_id}} data-post-id={{item.post_id}} data-user-id={{item.user_id}}>
-  {{!-- template-lint-disable no-triple-curlies --}}
   {{~#if item.expandedExcerpt}}
     {{~{item.expandedExcerpt}~}}
   {{else}}
     {{~{item.excerpt}~}}
   {{/if~}}
-  {{!-- template-lint-enable --}}
 </p>
 
 {{#each item.children as |child|}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
index 970592ece4..07f7c03cd8 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -6,4 +6,4 @@
   {{/if}}
 </span>
 <br>
-<a href={{url}}>{{html-safe topic.fancyTitle}}</a>
+<a href={{url}}>{{{topic.fancyTitle}}}</a>
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 43af40a527..ce1e7af458 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -204,7 +204,7 @@
                   {{d-button action=(action "togglePreview") class="hide-preview" label="composer.hide_preview"}}
                 {{/if}}
               {{else}}
-                <a href {{action "togglePreview"}} class='toggle-preview'>{{html-safe toggleText}}</a>
+                <a href {{action "togglePreview"}} class='toggle-preview'>{{{toggleText}}}</a>
               {{/if}}
 
           </div>
@@ -221,7 +221,7 @@
 
         <div class='draft-text'>
           {{#if model.topic}}
-            {{d-icon "share"}} {{html-safe draftTitle}}
+            {{d-icon "share"}} {{{draftTitle}}}
           {{else}}
             {{i18n "composer.saved_draft"}}
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
index 238de27da0..e37bdb2aa0 100644
--- a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
@@ -1,3 +1,3 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
 {{#if message.title}}<h3>{{message.title}}</h3>{{/if}}
-<p>{{html-safe message.body}}</p>
+<p>{{{message.body}}}</p>
diff --git a/app/assets/javascripts/discourse/templates/composer/education.hbs b/app/assets/javascripts/discourse/templates/composer/education.hbs
index 269e44e595..c2d574cb69 100644
--- a/app/assets/javascripts/discourse/templates/composer/education.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/education.hbs
@@ -1,2 +1,2 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
-{{html-safe message.body}}
+{{{message.body}}}
diff --git a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
index 269e44e595..c2d574cb69 100644
--- a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
@@ -1,2 +1,2 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
-{{html-safe message.body}}
+{{{message.body}}}
diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/templates/discovery.hbs
index 1c8f879125..6801ab3f55 100644
--- a/app/assets/javascripts/discourse/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery.hbs
@@ -1,5 +1,5 @@
 {{#if errorHtml}}
-  {{html-safe errorHtml}}
+  {{{errorHtml}}}
 {{else}}
   <div class="container">
     {{discourse-banner user=currentUser banner=site.banner}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 9394f35486..355e18f1b8 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -49,7 +49,7 @@
 
       <div class='search-info'>
         <div class='result-count'>
-          {{html-safe resultCountLabel}}
+          {{{resultCountLabel}}}
         </div>
         <div class='sort-by'>
           <span class='desc'>
@@ -88,7 +88,7 @@
 
                   <a class='search-link' href={{result.url}} {{action "logClick" result.topic_id}}>
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
-                    <span class='topic-title'>{{#highlight-text highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+                    <span class='topic-title'>{{#highlight-text highlight=q}}{{{result.topic.fancyTitle}}}{{/highlight-text}}</span>
                   </a>
 
                   <div class='search-category'>
@@ -113,7 +113,7 @@
 
                   {{#if result.blurb}}
                     {{#highlight-text highlight=highlightQuery}}
-                      {{html-safe result.blurb}}
+                      {{{result.blurb}}}
                     {{/highlight-text}}
                   {{/if}}
                 </div>
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 1bc9734c13..8385894c0c 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -26,7 +26,7 @@
       <hr>
 
       <div class='group-bio'>
-        <p>{{html-safe model.bio_cooked}}</p>
+        <p>{{{model.bio_cooked}}}</p>
       </div>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/templates/groups/index.hbs
index 36d0a644b1..21cbe557a9 100644
--- a/app/assets/javascripts/discourse/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/index.hbs
@@ -51,7 +51,7 @@
                     </span>
                   </div>
 
-                  <div class="group-description">{{html-safe group.bio_excerpt}}</div>
+                  <div class="group-description">{{{group.bio_excerpt}}}</div>
 
                   <div class="group-membership">
                     {{#group-membership-button tagName='' model=group showLogin=(route-action "showLogin")}}
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index f2f1e73678..42216317ee 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -10,12 +10,12 @@
     <div class="col-form">
       {{#if successMessage}}
         <br><br>
-        <div class='alert alert-info'><p>{{html-safe successMessage}}</p></div>
+        <div class='alert alert-info'><p>{{{successMessage}}}</p></div>
       {{else}}
         <p>{{i18n 'invites.invited_by'}}</p>
         <p>{{user-info user=invitedBy}}</p>
 
-        <p>{{html-safe yourEmailMessage}}
+        <p>{{{yourEmailMessage}}}
         {{#if externalAuthsEnabled}}
              {{i18n 'invites.social_login_available'}}
         {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/list/activity-column.hbr b/app/assets/javascripts/discourse/templates/list/activity-column.hbr
index 384909db02..723bb80e84 100644
--- a/app/assets/javascripts/discourse/templates/list/activity-column.hbr
+++ b/app/assets/javascripts/discourse/templates/list/activity-column.hbr
@@ -1,4 +1,4 @@
-<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{html-safe topic.bumpedAtTitle}}">
+<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{{topic.bumpedAtTitle}}}">
   <a class="post-activity" href="{{topic.lastPostUrl}}">
     {{~raw-plugin-outlet name="topic-list-before-relative-date"~}}
     {{~format-date topic.bumpedAt format="tiny" noTitle="true"~}}
diff --git a/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr b/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
index 2257a669cb..1c7b5eead0 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
+++ b/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
@@ -1,6 +1,6 @@
 {{#if topic.hasExcerpt}}
   <div class="topic-excerpt">
-    {{dir-span topic.escapedExcerpt}}
+    {{{dir-span topic.escapedExcerpt}}}
     {{#if topic.excerptTruncated}}
       <a href="{{topic.url}}">{{i18n 'read_more'}}</a>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 0949b56ee7..d8a06c33c7 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -24,7 +24,7 @@
               {{/if}}
               {{#if t.hasExcerpt}}
                 <div class="topic-excerpt">
-                  {{html-safe t.excerpt}}
+                  {{{t.excerpt}}}
                   {{#if t.excerptTruncated}}
                     {{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
                   {{/if}}
@@ -42,7 +42,7 @@
               {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
               <div class="pull-right">
                 {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
-                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
+                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{{raw-date t.bumped_at}}}'>{{t.last_poster_username}}</a>
               </div>
               {{#unless hideCategory}}
                 <div class='category'>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index 0421edce8a..5418fcb86a 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -13,7 +13,7 @@
             {{#if c.description_excerpt}}
               <tr class="category-description">
                 <td colspan="3">
-                  {{html-safe c.description_excerpt}}
+                  {{{c.description_excerpt}}}
                 </td>
               </tr>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
index ca6140be54..bebe6a385e 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
@@ -1,7 +1,7 @@
 {{#if selectedHtml}}
   <li>
     <a href class='expander' {{action 'toggleExpanded'}}>
-      <span>{{html-safe selectedHtml}}</span>
+      <span>{{{selectedHtml}}}</span>
       {{d-icon "caret-down"}}
     </a>
   </li>
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
index 7439589d5c..5469574977 100644
--- a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}
+  {{{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}}
 {{/d-modal-body}}
 
 {{modal-footer-close closeModal=(route-action "closeModal")}}
diff --git a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
index 5390227a2e..1b08a4974b 100644
--- a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body title="user.auth_tokens.was_this_you"}}
   <div>
     <p>{{i18n 'user.auth_tokens.was_this_you_description'}}</p>
-    <p>{{i18n 'user.second_factor.extended_description'}}</p>
+    <p>{{{i18n 'user.second_factor.extended_description'}}}</p>
   </div>
 
   <div>
@@ -21,9 +21,9 @@
       </h3>
 
       {{#if expanded}}
-        <blockquote>{{html-safe latest_post.cooked}}</blockquote>
+        <blockquote>{{{latest_post.cooked}}}</blockquote>
       {{else}}
-        <blockquote>{{html-safe latest_post.excerpt}}</blockquote>
+        <blockquote>{{{latest_post.excerpt}}}</blockquote>
       {{/if}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
index 10e5c4bf26..cdaab1cc1c 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
@@ -10,11 +10,11 @@
   {{else}}
     <div class="avatar-choice">
       {{radio-button id="system-avatar" name="avatar" value="system" selection=selected}}
-      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{i18n 'user.change_avatar.letter_based'}}</label>
+      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{{i18n 'user.change_avatar.letter_based'}}}</label>
     </div>
     <div class="avatar-choice">
       {{radio-button id="gravatar" name="avatar" value="gravatar" selection=selected}}
-      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{i18n 'user.change_avatar.gravatar'}} {{user.email}}</span></label>
+      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{{i18n 'user.change_avatar.gravatar'}}} {{user.email}}</span></label>
 
       {{d-button action=(action "refreshGravatar")
                  title="user.change_avatar.refresh_gravatar_title"
@@ -23,7 +23,7 @@
                  class="btn-default avatar-selector-refresh-gravatar"}}
 
       {{#if gravatarFailed}}
-        <p class="error">{{i18n 'user.change_avatar.gravatar_failed'}}</p>
+        <p class="error">{{I18n 'user.change_avatar.gravatar_failed'}}</p>
       {{/if}}
     </div>
     {{#if allowAvatarUpload}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 0098c5b237..254f1bfbee 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -38,7 +38,7 @@
           <!-- {{tap-tile icon="calendar-alt" text=(I18n "bookmarks.reminders.custom") tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}} -->
         {{/tap-tile-grid}}
       {{else}}
-        <div class="alert alert-info">{{i18n "bookmarks.no_timezone" basePath=basePath }}</div>
+        <div class="alert alert-info">{{{i18n "bookmarks.no_timezone" basePath=basePath }}}</div>
       {{/if}}
     </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
index 0cfc45782d..97f8003781 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
@@ -2,7 +2,7 @@
   <div class='controls'>
     <label class='radio'>
       {{radio-button value=level.id name="notification_level" selection=notificationLevelId}} <strong>{{level.name}}</strong>
-      <div class='description'>{{html-safe level.description}}</div>
+      <div class='description'>{{{level.description}}}</div>
     </label>
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index 1069c0d2fa..0c0890f2b9 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -1,6 +1,6 @@
 {{#d-modal-body class='change-ownership'}}
   <span>
-    {{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}
+    {{{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}}
   </span>
 
   <form>
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 5c77b2a0a6..448508de65 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -126,7 +126,7 @@
           {{/d-button}}
         {{/conditional-loading-spinner}}
 
-      <div class='disclaimer'>{{html-safe disclaimerHtml}}</div>
+      <div class='disclaimer'>{{{disclaimerHtml}}}</div>
       </div>
 
       {{plugin-outlet name="create-account-after-modal-footer" tagName=""}}
diff --git a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
index 61e693a9af..e35eaecc19 100644
--- a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  <p>{{i18n "post.controls.delete_topic_disallowed_modal"}}</p>
+  <p>{{{i18n "post.controls.delete_topic_disallowed_modal"}}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(route-action "closeModal") class="btn-primary" label="close"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
index 0c3f9e443d..6abe868295 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
@@ -34,7 +34,7 @@
                    label="category.delete"}}
 
         <div class="cannot_delete_reason {{if hiddenTooltip "hidden" ""}}">
-          {{html-safe model.cannot_delete_reason}}
+          {{{model.cannot_delete_reason}}}
         </div>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index be55ea8460..965a407815 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -6,9 +6,9 @@
           <p>
             {{#conditional-loading-spinner size="small" condition=loading}}
               {{#if pinnedGloballyCount}}
-                {{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}
+                {{{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}}
               {{else}}
-                {{i18n "topic.feature_topic.not_pinned_globally"}}
+                {{{i18n "topic.feature_topic.not_pinned_globally"}}}
               {{/if}}
             {{/conditional-loading-spinner}}
           </p>
@@ -16,12 +16,12 @@
         {{else}}
           <p>
             {{#conditional-loading-spinner size="small" condition=loading}}
-              {{html-safe alreadyPinnedMessage}}
+              {{{alreadyPinnedMessage}}}
             {{/conditional-loading-spinner}}
           </p>
           <p>{{i18n "topic.feature_topic.pin_note"}}</p>
         {{/if}}
-        <p>{{html-safe unPinMessage}}</p>
+        <p>{{{unPinMessage}}}</p>
         <p>{{d-button action=(action "unpin") icon="thumbtack" label="topic.feature.unpin" class="btn-primary"}}</p>
       </div>
     </div>
@@ -30,7 +30,7 @@
       <div class="desc">
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
-            {{html-safe alreadyPinnedMessage}}
+            {{{alreadyPinnedMessage}}}
           {{/conditional-loading-spinner}}
         </p>
         <p>
@@ -38,7 +38,7 @@
         </p>
         {{#if site.isMobileDevice}}
           <p>
-            {{html-safe pinMessage}}
+            {{{pinMessage}}}
           </p>
           <p class="with-validation">
             {{future-date-input
@@ -52,7 +52,7 @@
           </p>
         {{else}}
           <p class="with-validation">
-            {{html-safe pinMessage}}
+            {{{pinMessage}}}
             {{d-icon "far-clock"}}
             {{future-date-input
               class="pin-until"
@@ -74,9 +74,9 @@
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
             {{#if pinnedGloballyCount}}
-              {{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}
+              {{{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}}
             {{else}}
-              {{i18n "topic.feature_topic.not_pinned_globally"}}
+              {{{i18n "topic.feature_topic.not_pinned_globally"}}}
             {{/if}}
           {{/conditional-loading-spinner}}
         </p>
@@ -123,9 +123,9 @@
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
             {{#if bannerCount}}
-              {{i18n "topic.feature_topic.banner_exists"}}
+              {{{i18n "topic.feature_topic.banner_exists"}}}
             {{else}}
-              {{i18n "topic.feature_topic.no_banner_exists"}}
+              {{{i18n "topic.feature_topic.no_banner_exists"}}}
             {{/if}}
           {{/conditional-loading-spinner}}
         </p>
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index 19be52ceb5..8d438dd80a 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
@@ -1,7 +1,7 @@
 <form>
   {{#d-modal-body class="forgot-password-modal"}}
     {{#if offerHelp}}
-      {{html-safe offerHelp}}
+      {{{offerHelp}}}
     {{else}}
       <label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label>
       {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index c81dfe2238..6d9dbff78e 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -21,7 +21,7 @@
           &mdash; {{disabled-icon icon="shield-alt" disabled=postTypeDisabled}}
         {{/if}}
         {{#if model.category_id_changes}}
-          &mdash; {{html-safe previousCategory}} &rarr; {{html-safe currentCategory}}
+          &mdash; {{{previousCategory}}} &rarr; {{{currentCategory}}}
         {{/if}}
       {{/unless}}
     </div>
@@ -50,7 +50,7 @@
   <div id="revisions" data-post-id={{model.post_id}} class={{hiddenClasses}}>
     {{#if model.title_changes}}
       <div class="row">
-        <h2>{{html-safe titleDiff}}</h2>
+        <h2>{{{titleDiff}}}</h2>
       </div>
     {{/if}}
     {{#if site.mobileView}}
@@ -72,7 +72,7 @@
       {{/if}}
       {{#if model.category_id_changes}}
         <div class="row">
-          {{html-safe previousCategory}} &rarr; {{html-safe currentCategory}}
+          {{{previousCategory}}} &rarr; {{{currentCategory}}}
         </div>
       {{/if}}
     {{/if}}
@@ -100,7 +100,7 @@
     {{plugin-outlet name="post-revisions" args=(hash model=model)}}
 
     {{#links-redirect class="row"}}
-      {{html-safe bodyDiff}}
+      {{{bodyDiff}}}
     {{/links-redirect}}
   </div>
 {{/d-modal-body}}
@@ -111,7 +111,7 @@
       {{d-button class="btn-default" action=(action "loadPreviousVersion") icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}}
       <div id="revision-numbers" class={{unless displayRevisions 'invisible'}}>
         {{#conditional-loading-spinner condition=loading size="small"}}
-          {{html-safe revisionsText}}
+          {{{revisionsText}}}
         {{/conditional-loading-spinner}}
       </div>
       {{d-button class="btn-default" action=(action "loadNextVersion") icon="forward" title="post.revisions.controls.next" disabled=loadNextDisabled}}
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 2203c90174..493a9e03a5 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -3,29 +3,29 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.jump_to.title"}}</h4>
       <ul>
-        <li>{{html-safe shortcuts.jump_to.home}}</li>
-        <li>{{html-safe shortcuts.jump_to.latest}}</li>
-        <li>{{html-safe shortcuts.jump_to.new}}</li>
-        <li>{{html-safe shortcuts.jump_to.unread}}</li>
-        <li>{{html-safe shortcuts.jump_to.categories}}</li>
-        <li>{{html-safe shortcuts.jump_to.top}}</li>
-        <li>{{html-safe shortcuts.jump_to.bookmarks}}</li>
-        <li>{{html-safe shortcuts.jump_to.profile}}</li>
+        <li>{{{shortcuts.jump_to.home}}}</li>
+        <li>{{{shortcuts.jump_to.latest}}}</li>
+        <li>{{{shortcuts.jump_to.new}}}</li>
+        <li>{{{shortcuts.jump_to.unread}}}</li>
+        <li>{{{shortcuts.jump_to.categories}}}</li>
+        <li>{{{shortcuts.jump_to.top}}}</li>
+        <li>{{{shortcuts.jump_to.bookmarks}}}</li>
+        <li>{{{shortcuts.jump_to.profile}}}</li>
         {{#if siteSettings.enable_personal_messages}}
-          <li>{{html-safe shortcuts.jump_to.messages}}</li>
+          <li>{{{shortcuts.jump_to.messages}}}</li>
         {{/if}}
-        <li>{{html-safe shortcuts.jump_to.drafts}}</li>
+        <li>{{{shortcuts.jump_to.drafts}}}</li>
       </ul>
     </section>
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.navigation.title"}}</h4>
       <ul>
-        <li>{{html-safe shortcuts.navigation.back}}</li>
-        <li>{{html-safe shortcuts.navigation.jump}}</li>
-        <li>{{html-safe shortcuts.navigation.up_down}}</li>
-        <li>{{html-safe shortcuts.navigation.open}}</li>
-        <li>{{html-safe shortcuts.navigation.next_prev}}</li>
-        <li>{{html-safe shortcuts.navigation.go_to_unread_post}}</li>
+        <li>{{{shortcuts.navigation.back}}}</li>
+        <li>{{{shortcuts.navigation.jump}}}</li>
+        <li>{{{shortcuts.navigation.up_down}}}</li>
+        <li>{{{shortcuts.navigation.open}}}</li>
+        <li>{{{shortcuts.navigation.next_prev}}}</li>
+        <li>{{{shortcuts.navigation.go_to_unread_post}}}</li>
       </ul>
     </section>
   </div>
@@ -33,26 +33,26 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.application.title"}}</h4>
       <ul>
-        <li>{{html-safe shortcuts.application.hamburger_menu}}</li>
-        <li>{{html-safe shortcuts.application.user_profile_menu}}</li>
-        <li>{{html-safe shortcuts.application.show_incoming_updated_topics}}</li>
-        <li>{{html-safe shortcuts.application.search}}</li>
-        <li>{{html-safe shortcuts.application.help}}</li>
-        <li>{{html-safe shortcuts.application.dismiss_new_posts}}</li>
-        <li>{{html-safe shortcuts.application.dismiss_topics}}</li>
-        <li>{{html-safe shortcuts.application.log_out}}</li>
+        <li>{{{shortcuts.application.hamburger_menu}}}</li>
+        <li>{{{shortcuts.application.user_profile_menu}}}</li>
+        <li>{{{shortcuts.application.show_incoming_updated_topics}}}</li>
+        <li>{{{shortcuts.application.search}}}</li>
+        <li>{{{shortcuts.application.help}}}</li>
+        <li>{{{shortcuts.application.dismiss_new_posts}}}</li>
+        <li>{{{shortcuts.application.dismiss_topics}}}</li>
+        <li>{{{shortcuts.application.log_out}}}</li>
       </ul>
     </section>
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.composing.title"}}</h4>
       <ul>
-        <li>{{html-safe shortcuts.composing.return}}</li>
-        <li>{{html-safe shortcuts.composing.fullscreen}}</li>
-        <li>{{html-safe shortcuts.application.create}}</li>
-        <li>{{html-safe shortcuts.actions.reply_as_new_topic}}</li>
-        <li>{{html-safe shortcuts.actions.reply_topic}}</li>
-        <li>{{html-safe shortcuts.actions.reply_post}}</li>
-        <li>{{html-safe shortcuts.actions.quote_post}}</li>
+        <li>{{{shortcuts.composing.return}}}</li>
+        <li>{{{shortcuts.composing.fullscreen}}}</li>
+        <li>{{{shortcuts.application.create}}}</li>
+        <li>{{{shortcuts.actions.reply_as_new_topic}}}</li>
+        <li>{{{shortcuts.actions.reply_topic}}}</li>
+        <li>{{{shortcuts.actions.reply_post}}}</li>
+        <li>{{{shortcuts.actions.quote_post}}}</li>
       </ul>
     </section>
   </div>
@@ -60,22 +60,22 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.actions.title"}}</h4>
       <ul>
-        <li>{{html-safe shortcuts.actions.bookmark_topic}}</li>
-        <li>{{html-safe shortcuts.actions.pin_unpin_topic}}</li>
-        <li>{{html-safe shortcuts.actions.share_topic}}</li>
-        <li>{{html-safe shortcuts.actions.share_post}}</li>
-        <li>{{html-safe shortcuts.actions.like}}</li>
-        <li>{{html-safe shortcuts.actions.flag}}</li>
-        <li>{{html-safe shortcuts.actions.bookmark}}</li>
-        <li>{{html-safe shortcuts.actions.edit}}</li>
-        <li>{{html-safe shortcuts.actions.delete}}</li>
-        <li>{{html-safe shortcuts.actions.mark_muted}}</li>
-        <li>{{html-safe shortcuts.actions.mark_regular}}</li>
-        <li>{{html-safe shortcuts.actions.mark_tracking}}</li>
-        <li>{{html-safe shortcuts.actions.mark_watching}}</li>
-        <li>{{html-safe shortcuts.actions.defer}}</li>
-        <li>{{html-safe shortcuts.actions.print}}</li>
-        <li>{{html-safe shortcuts.actions.topic_admin_actions}}</li>
+        <li>{{{shortcuts.actions.bookmark_topic}}}</li>
+        <li>{{{shortcuts.actions.pin_unpin_topic}}}</li>
+        <li>{{{shortcuts.actions.share_topic}}}</li>
+        <li>{{{shortcuts.actions.share_post}}}</li>
+        <li>{{{shortcuts.actions.like}}}</li>
+        <li>{{{shortcuts.actions.flag}}}</li>
+        <li>{{{shortcuts.actions.bookmark}}}</li>
+        <li>{{{shortcuts.actions.edit}}}</li>
+        <li>{{{shortcuts.actions.delete}}}</li>
+        <li>{{{shortcuts.actions.mark_muted}}}</li>
+        <li>{{{shortcuts.actions.mark_regular}}}</li>
+        <li>{{{shortcuts.actions.mark_tracking}}}</li>
+        <li>{{{shortcuts.actions.mark_watching}}}</li>
+        <li>{{{shortcuts.actions.defer}}}</li>
+        <li>{{{shortcuts.actions.print}}}</li>
+        <li>{{{shortcuts.actions.topic_admin_actions}}}</li>
       </ul>
     </section>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
index ae591397a7..893d934246 100644
--- a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
@@ -17,7 +17,7 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}</p>
+        <p>{{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
@@ -31,7 +31,7 @@
     {{/if}}
 
     {{#if existingMessage}}
-      <p>{{i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount}}</p>
+      <p>{{{i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount}}}</p>
       <form>
         {{choose-message currentTopicId=model.id selectedTopicId=selectedTopicId}}
 
@@ -64,7 +64,7 @@
     </div>
 
     {{#if existingTopic}}
-      <p>{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}</p>
+      <p>{{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}}</p>
       <form>
         {{choose-topic currentTopicId=model.id selectedTopicId=selectedTopicId}}
       </form>
@@ -72,7 +72,7 @@
 
     {{#if canSplitTopic}}
       {{#if newTopic}}
-        <p>{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}</p>
+        <p>{{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}}</p>
         <form>
           <label>{{i18n 'topic.split_topic.topic_name'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
@@ -93,7 +93,7 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}</p>
+        <p>{{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
index e9d93aa8f6..aa312d5125 100644
--- a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{i18n 'login.not_activated' sentTo=sentTo}}
+  {{{i18n 'login.not_activated' sentTo=sentTo}}}
 {{/d-modal-body}}
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
index 3687b9fb2b..46f37bfe80 100644
--- a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body}}
   <p>{{i18n "review.approval.description"}}</p>
 
-  <p>{{i18n "review.approval.pending_posts" count=model.pending_count}}</p>
+  <p>{{{i18n "review.approval.pending_posts" count=model.pending_count}}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(route-action "closeModal") class="btn-primary" label="review.approval.ok"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
index c6539a2e52..36ede3f634 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{i18n 'user.second_factor.enable_security_key_description'}}
+        {{{i18n 'user.second_factor.enable_security_key_description'}}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
index 9caf24fc46..2b52edea7b 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{i18n 'user.second_factor.enable_description'}}
+        {{{i18n 'user.second_factor.enable_description'}}}
       </div>
     </div>
 
@@ -18,7 +18,7 @@
       <div class="controls">
         <div class="qr-code-container">
           <div class="qr-code">
-            {{html-safe secondFactorImage}}
+            {{{secondFactorImage}}}
           </div>
         </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
index 713bdbfcc4..5981f4a118 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
@@ -14,7 +14,7 @@
     {{/if}}
 
     {{#if backupEnabled}}
-      {{i18n "user.second_factor_backup.remaining_codes" count=remainingCodes}}
+      {{{i18n "user.second_factor_backup.remaining_codes" count=remainingCodes}}}
     {{/if}}
 
     <div class="actions">
diff --git a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
index fe3ce8be48..9b10ef6c29 100644
--- a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
@@ -1,4 +1,4 @@
 {{#d-modal-body}}
-  <p>{{i18n 'topics.bulk.selected' count=model.topics.length}}</p>
+  <p>{{{i18n 'topics.bulk.selected' count=model.topics.length}}}</p>
   {{outlet "bulkOutlet"}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index 6d44492afe..f45a2e5014 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -9,7 +9,7 @@
         width=category.uploaded_logo.width
         height=category.uploaded_logo.height}}
       {{#if category.description}}
-        <p>{{dir-span category.description}}</p>
+        <p>{{{dir-span category.description}}}</p>
       {{/if}}
     {{/if}}
   </section>
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index fc6c00a13b..fd8f57c54c 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -86,7 +86,7 @@
           <h2>{{i18n "user.second_factor_backup.title"}}</h2>
           {{#if model.second_factor_enabled}}
             {{#if model.second_factor_backup_enabled}}
-              {{i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes}}
+              {{{i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes}}}
             {{else}}
               {{i18n 'user.second_factor_backup.enable_long'}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 62743b5a5a..8a505401fa 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -9,7 +9,7 @@
   </div>
   {{#if siteSettings.enable_mentions}}
     <div class='instructions'>
-      {{i18n 'user.username.short_instructions' username=model.username}}
+      {{{i18n 'user.username.short_instructions' username=model.username}}}
     </div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index bd9aa411ac..d277cea511 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -73,7 +73,7 @@
   <div class='control-group pref-mailing-list-mode'>
     <label class="control-label">{{i18n 'user.mailing_list_mode.label'}}</label>
     {{preference-checkbox labelKey="user.mailing_list_mode.enabled" checked=model.user_option.mailing_list_mode}}
-    <div class='instructions'>{{i18n 'user.mailing_list_mode.instructions'}}</div>
+    <div class='instructions'>{{{i18n 'user.mailing_list_mode.instructions'}}}</div>
     {{#if model.user_option.mailing_list_mode}}
       <div class='controls controls-dropdown'>
         {{combo-box
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index e6fe5381ed..b0040894dc 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -66,7 +66,7 @@
     <label class="control-label">{{i18n 'user.featured_topic'}}</label>
     {{#if model.featured_topic}}
       <label class="featured-topic-link">
-      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe model.featured_topic.fancy_title}}{{/link-to}}
+      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{{model.featured_topic.fancy_title}}}{{/link-to}}
       </label>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/templates/static.hbs
index aee9390704..107f4350f8 100644
--- a/app/assets/javascripts/discourse/templates/static.hbs
+++ b/app/assets/javascripts/discourse/templates/static.hbs
@@ -2,7 +2,7 @@
   {{#watch-read action=(action "markFaqRead") path=model.path}}
     <div class='contents clearfix body-page'>
       {{plugin-outlet name="above-static"}}
-      {{html-safe model.html}}
+      {{{model.html}}}
 
       {{#if showSignupButton}}
         {{d-button action=(route-action "showCreateAccount") class="btn-primary sign-up-button" label="sign_up"}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 7950ca19ec..bcb1a81b0f 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -74,7 +74,7 @@
             {{#if model.details.loaded}}
               {{topic-status topic=model}}
               <a href={{model.url}} {{action "jumpTop"}} class="fancy-title">
-                {{html-safe model.fancyTitle}}
+                {{{model.fancyTitle}}}
               </a>
             {{/if}}
 
@@ -264,7 +264,7 @@
               {{#if model.queued_posts_count}}
                 <div class="has-pending-posts">
                   <div>
-                    {{i18n "review.topic_has_pending" count=model.queued_posts_count}}
+                    {{{i18n "review.topic_has_pending" count=model.queued_posts_count}}}
                   </div>
 
                   {{#link-to 'review' (query-params topic_id=model.id type="ReviewableQueuedPost" status="pending")}}
@@ -351,7 +351,7 @@
     <div class="container">
       {{#conditional-loading-spinner condition=noErrorYet}}
         {{#if model.errorHtml}}
-          <div class="not-found">{{html-safe model.errorHtml}}</div>
+          <div class="not-found">{{{model.errorHtml}}}</div>
         {{else}}
           <div class="topic-error">
             <div>{{model.errorMessage}}</div>
diff --git a/app/assets/javascripts/discourse/templates/unknown.hbs b/app/assets/javascripts/discourse/templates/unknown.hbs
index 5ff548e033..0e9e6b9625 100644
--- a/app/assets/javascripts/discourse/templates/unknown.hbs
+++ b/app/assets/javascripts/discourse/templates/unknown.hbs
@@ -1,3 +1,3 @@
 <div class='container'>
-  {{html-safe model}}
+  {{{model}}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index f8f5effb60..517e147e90 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -72,11 +72,11 @@
                       <td>{{format-date invite.user.last_seen_at}}</td>
                       <td>{{number invite.user.topics_entered}}</td>
                       <td>{{number invite.user.posts_read_count}}</td>
-                      <td>{{format-duration invite.user.time_read}}</td>
+                      <td>{{{format-duration invite.user.time_read}}}</td>
                       <td>
-                        <span title={{i18n 'user.invited.days_visited'}}>{{html-safe invite.user.days_visited}}</span>
+                        <span title={{i18n 'user.invited.days_visited'}}>{{{invite.user.days_visited}}}</span>
                           /
-                        <span title={{i18n 'user.invited.account_age_days'}}>{{html-safe invite.user.days_since_created}}</span>
+                        <span title={{i18n 'user.invited.account_age_days'}}>{{{invite.user.days_since_created}}}</span>
                       </td>
                     {{/if}}
                   {{else}}
@@ -109,7 +109,7 @@
         {{else}}
           <div class="user-invite-none">
             {{#if canBulkInvite}}
-              {{i18n 'user.invited.bulk_invite.none'}}
+              {{{i18n 'user.invited.bulk_invite.none'}}}
             {{else}}
               {{i18n 'user.invited.none'}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 377177843e..d1c61ab805 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -100,7 +100,7 @@
             {{#if showFeaturedTopic}}
               <h3 class="featured-topic">
                 <span>{{i18n 'user.featured_topic'}}</span>
-                {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe model.featured_topic.fancy_title}}{{/link-to}}
+                {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{{model.featured_topic.fancy_title}}}{{/link-to}}
               </h3>
             {{/if}}
 
@@ -137,7 +137,7 @@
                 </div>
               {{/if}}
               {{#if isNotSuspendedOrIsStaff}}
-                {{html-safe model.bio_cooked}}
+                {{{model.bio_cooked}}}
               {{/if}}
             </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs
index de791d9420..1af06a86d9 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -1,4 +1,4 @@
 {{#if model.noContent}}
-  <div class='alert alert-info'>{{html-safe model.noContentHelp}}</div>
+  <div class='alert alert-info'>{{{model.noContentHelp}}}</div>
 {{/if}}
 {{user-stream stream=model}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index 26ee193bde..71b4737522 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -87,7 +87,7 @@
               </a>
               <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=link.clicks}}'>{{number link.clicks}}</span>
               <br>
-              <a href="{{link.post_url}}">{{html-safe link.topic.fancyTitle}}</a>
+              <a href="{{link.post_url}}">{{{link.topic.fancyTitle}}}</a>
             </li>
           {{/each}}
         </ul>
diff --git a/app/assets/javascripts/select-kit/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
index cff579c047..db51a397f8 100644
--- a/app/assets/javascripts/select-kit/templates/components/category-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
@@ -9,8 +9,8 @@
   </div>
 
   {{#if shouldDisplayDescription}}
-    <div class="category-desc">{{dir-span description}}</div>
+    <div class="category-desc">{{{dir-span description}}}</div>
   {{/if}}
 {{else}}
-  {{html-safe label}}
+  {{{label}}}
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
index e654ef8a11..1c070006ad 100644
--- a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
@@ -8,6 +8,6 @@
 {{/if}}
 
 <div class="texts">
-  <span class="name">{{html-safe label}}</span>
-  <span class="desc">{{html-safe description}}</span>
+  <span class="name">{{{label}}}</span>
+  <span class="desc">{{{description}}}</span>
 </div>
diff --git a/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs b/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
index f54bdb6b5f..31fc07f1dc 100644
--- a/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
@@ -1,5 +1,5 @@
 {{pinned-options value=pinned topic=topic}}
 
 <p class="reason">
-  {{html-safe reasonText}}
+  {{{reasonText}}}
 </p>
diff --git a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
index a57b6b8584..2bf3a9a122 100644
--- a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
@@ -10,6 +10,6 @@
 
 {{#if appendReason}}
   <p class="reason">
-    {{html-safe topic.details.notificationReasonText}}
+    {{{topic.details.notificationReasonText}}}
   </p>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/radio-button.hbs b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
index c3a82790be..e93347513a 100644
--- a/app/assets/javascripts/wizard/templates/components/radio-button.hbs
+++ b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
@@ -8,7 +8,7 @@
   </span>
   {{#if extraLabel}}
     <span class='extra-label'>
-      {{html-safe extraLabel}}
+      {{{extraLabel}}}
     </span>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
index 7510570b5d..8f804940fb 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
@@ -2,7 +2,7 @@
   <span class='label-value'>{{field.label}}</span>
 
   {{#if field.description}}
-    <div class='field-description'>{{html-safe field.description}}</div>
+    <div class='field-description'>{{{field.description}}}</div>
   {{/if}}
 </label>
 
@@ -11,5 +11,5 @@
 </div>
 
 {{#if field.errorDescription}}
-  <div class='field-error-description'>{{html-safe field.errorDescription}}</div>
+  <div class='field-error-description'>{{{field.errorDescription}}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
index 4f0686acf7..beb821930d 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -8,7 +8,7 @@
   {{/if}}
 
   {{#if step.description}}
-    <p class='wizard-step-description'>{{html-safe step.description}}</p>
+    <p class='wizard-step-description'>{{{step.description}}}</p>
   {{/if}}
 
   {{#wizard-step-form step=step}}
diff --git a/lib/onebox/templates/discourse_topic_onebox.hbs b/lib/onebox/templates/discourse_topic_onebox.hbs
index 63a04fcc76..856d3342d4 100644
--- a/lib/onebox/templates/discourse_topic_onebox.hbs
+++ b/lib/onebox/templates/discourse_topic_onebox.hbs
@@ -1,10 +1,10 @@
 <aside class='quote' data-post="{{post_number}}" data-topic="{{topic_id}}">
   <div class='title'>
     <div class='quote-controls'></div>
-    {{html-safe avatar}}
-    <a href="{{original_url}}">{{html-safe title}}</a> {{html-safe category_html}}
+    {{{avatar}}}
+    <a href="{{original_url}}">{{{title}}}</a> {{{category_html}}}
   </div>
   <blockquote>
-    {{html-safe quote}}
+    {{{quote}}}
   </blockquote>
 </aside>
diff --git a/lib/onebox/templates/discourse_user_onebox.hbs b/lib/onebox/templates/discourse_user_onebox.hbs
index de1336dd92..60db7491c1 100644
--- a/lib/onebox/templates/discourse_user_onebox.hbs
+++ b/lib/onebox/templates/discourse_user_onebox.hbs
@@ -1,7 +1,7 @@
 <aside class="onebox">
   <article class="onebox-body user-onebox">
-    {{html-safe avatar}}
-    <h3><a href="{{original_url}}">{{html-safe username}}</a></h3>
+    {{{avatar}}}
+    <h3><a href="{{original_url}}">{{{username}}}</a></h3>
     <div>
       {{#name}}
         <span class="full-name">{{name}}</span>
@@ -11,7 +11,7 @@
           <svg class="fa d-icon d-icon-map-marker-alt svg-icon" xmlns="http://www.w3.org/2000/svg">
             <use xlink:href="#map-marker-alt"></use>
           </svg>
-          {{html-safe location}}
+          {{{location}}}
         </span>
       {{/location}}
       {{#website}}
@@ -19,12 +19,12 @@
           <svg class="fa d-icon d-icon-globe-americas svg-icon" xmlns="http://www.w3.org/2000/svg">
             <use xlink:href="#globe-americas"></use>
           </svg>
-          <a href="{{website}}">{{html-safe website_name}}</a>
+          <a href="{{website}}">{{{website_name}}}</a>
         </span>
       {{/website}}
     </div>
     {{#bio}}
-      <p>{{html-safe bio}}</p>
+      <p>{{{bio}}}</p>
     {{/bio}}
     <span>{{joined}} {{created_at}}</span>
   </article>
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index 6fb9ecf7c6..d7e73c3d08 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -85,7 +85,7 @@
             <label class="control-label">
               {{i18n "discourse_local_dates.create.form.recurring_title"}}
             </label>
-            <p>{{i18n "discourse_local_dates.create.form.recurring_description"}}</p>
+            <p>{{{i18n "discourse_local_dates.create.form.recurring_description"}}}</p>
             <div class="controls">
               {{combo-box
                 content=recurringOptions
diff --git a/test/javascripts/components/html-safe-helper-test.js.es6 b/test/javascripts/components/html-safe-helper-test.js.es6
deleted file mode 100644
index 364f99a6e4..0000000000
--- a/test/javascripts/components/html-safe-helper-test.js.es6
+++ /dev/null
@@ -1,14 +0,0 @@
-import componentTest from "helpers/component-test";
-moduleForComponent("html-safe-helper", { integration: true });
-
-componentTest("default", {
-  template: "{{html-safe string}}",
-
-  beforeEach() {
-    this.set("string", "<p class='cookies'>biscuits</p>");
-  },
-
-  async test(assert) {
-    assert.ok(exists("p.cookies"), "it displays the string as html");
-  }
-});
diff --git a/test/javascripts/lib/computed-test.js.es6 b/test/javascripts/lib/computed-test.js.es6
index 253673e5b6..0a94485f44 100644
--- a/test/javascripts/lib/computed-test.js.es6
+++ b/test/javascripts/lib/computed-test.js.es6
@@ -5,8 +5,7 @@ import {
   propertyNotEqual,
   fmt,
   i18n,
-  url,
-  htmlSafe
+  url
 } from "discourse/lib/computed";
 
 QUnit.module("lib:computed", {
@@ -155,12 +154,3 @@ QUnit.test("url", assert => {
     "it supports urls with a prefix"
   );
 });
-
-QUnit.test("htmlSafe", assert => {
-  const cookies = "<p>cookies and <b>biscuits</b></p>";
-  const t = EmberObject.extend({
-    desc: htmlSafe("cookies")
-  }).create({ cookies });
-
-  assert.equal(t.get("desc").string, cookies);
-});

From 29b35aa64c6e6c954f80004e58d41da9ef37c529 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 10 Mar 2020 22:13:17 +0100
Subject: [PATCH 0155/1830] DEV: Improve flaky time-sensitive specs (#9141)

---
 .../spec/controllers/posts_controller_spec.rb |  5 +-
 .../post_migrate/migrate_polls_data_spec.rb   |  2 +-
 .../default_current_user_provider_spec.rb     |  2 +-
 .../composer_messages_finder_spec.rb          |  8 +-
 .../concern/second_factor_manager_spec.rb     |  2 +-
 spec/components/cooked_post_processor_spec.rb |  4 +-
 spec/components/discourse_updates_spec.rb     | 10 +-
 spec/components/distributed_mutex_spec.rb     |  2 +-
 spec/components/email/receiver_spec.rb        |  5 +-
 spec/components/post_action_creator_spec.rb   |  1 +
 spec/components/post_creator_spec.rb          | 58 ++++++-----
 spec/components/post_revisor_spec.rb          |  5 +-
 spec/components/search_spec.rb                | 29 +++---
 spec/components/topic_creator_spec.rb         |  8 +-
 spec/components/topic_publisher_spec.rb       | 10 +-
 spec/components/topic_query_spec.rb           |  7 +-
 spec/integration/topic_auto_close_spec.rb     | 10 +-
 spec/integration/user_api_keys_spec.rb        |  6 +-
 spec/integrity/coding_style_spec.rb           |  2 +
 spec/jobs/auto_expire_user_api_keys_spec.rb   |  4 +-
 spec/jobs/periodical_updates_spec.rb          |  2 +-
 spec/jobs/publish_topic_to_category_spec.rb   | 25 ++---
 spec/jobs/pull_hotlinked_images_spec.rb       |  2 +-
 spec/jobs/truncate_user_flag_stats_spec.rb    |  9 ++
 spec/jobs/user_email_spec.rb                  | 24 +++--
 spec/models/category_spec.rb                  | 38 +++----
 spec/models/invite_spec.rb                    |  3 +-
 spec/models/post_action_spec.rb               |  4 +-
 spec/models/post_mover_spec.rb                | 46 ++++-----
 spec/models/post_spec.rb                      |  9 +-
 spec/models/quoted_post_spec.rb               |  1 -
 spec/models/remote_theme_spec.rb              |  4 +-
 spec/models/screened_email_spec.rb            |  4 +-
 spec/models/topic_spec.rb                     | 98 +++++++++----------
 spec/models/topic_tracking_state_spec.rb      |  2 +
 spec/models/user_action_spec.rb               | 19 ++--
 spec/models/user_auth_token_spec.rb           | 20 ++--
 spec/models/user_spec.rb                      | 52 +++++-----
 spec/models/user_stat_spec.rb                 |  2 +-
 spec/models/watched_word_spec.rb              |  2 +-
 spec/rails_helper.rb                          |  2 +
 spec/requests/admin/email_controller_spec.rb  |  4 +-
 spec/requests/groups_controller_spec.rb       |  2 +-
 spec/requests/posts_controller_spec.rb        | 16 +--
 spec/requests/topics_controller_spec.rb       | 35 +++----
 spec/services/badge_granter_spec.rb           | 20 ++--
 spec/services/post_owner_changer_spec.rb      |  5 +-
 spec/services/topic_timestamp_changer_spec.rb | 31 +++---
 spec/services/user_activator_spec.rb          |  4 +-
 49 files changed, 334 insertions(+), 331 deletions(-)

diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb
index 8f9dae14a2..3cedf9017f 100644
--- a/plugins/poll/spec/controllers/posts_controller_spec.rb
+++ b/plugins/poll/spec/controllers/posts_controller_spec.rb
@@ -11,7 +11,6 @@ describe PostsController do
   end
 
   describe "polls" do
-
     it "works" do
       post :create, params: {
         title: title, raw: "[poll]\n- A\n- B\n[/poll]"
@@ -39,7 +38,7 @@ describe PostsController do
     it "schedules auto-close job" do
       freeze_time
       name = "auto_close"
-      close_date = 1.month.from_now
+      close_date = 1.month.from_now.round
 
       expect do
         post :create, params: {
@@ -53,7 +52,7 @@ describe PostsController do
       json = ::JSON.parse(response.body)
       post_id = json["id"]
 
-      expect(Poll.find_by(post_id: post_id).close_at).to be_within_one_second_of(1.month.from_now)
+      expect(Poll.find_by(post_id: post_id).close_at).to eq_time(close_date)
 
       job = Jobs::ClosePoll.jobs.first
       job_args = job["args"].first
diff --git a/plugins/poll/spec/db/post_migrate/migrate_polls_data_spec.rb b/plugins/poll/spec/db/post_migrate/migrate_polls_data_spec.rb
index 50bc5d75ca..018f50ded8 100644
--- a/plugins/poll/spec/db/post_migrate/migrate_polls_data_spec.rb
+++ b/plugins/poll/spec/db/post_migrate/migrate_polls_data_spec.rb
@@ -267,7 +267,7 @@ RSpec.describe MigratePollsData do
       poll = Poll.find_by(name: "poll")
 
       expect(poll.post_id).to eq(post.id)
-      expect(poll.close_at).to eq("2018-10-08T00:00:00.000Z")
+      expect(poll.close_at).to eq_time(Time.parse("2018-10-08T00:00:00.000Z"))
 
       expect(poll.regular?).to eq(true)
       expect(poll.open?).to eq(true)
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index 5495d4e46d..2e0650cf30 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -411,7 +411,7 @@ describe Auth::DefaultCurrentUserProvider do
       provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}")
       u = provider2.current_user
       u.reload
-      expect(u.last_seen_at).to eq_time(Time.now)
+      expect(u.last_seen_at).to eq_time(Time.zone.now)
 
       freeze_time 20.minutes.from_now
 
diff --git a/spec/components/composer_messages_finder_spec.rb b/spec/components/composer_messages_finder_spec.rb
index 6b8214ea75..00cb9ac995 100644
--- a/spec/components/composer_messages_finder_spec.rb
+++ b/spec/components/composer_messages_finder_spec.rb
@@ -157,9 +157,11 @@ describe ComposerMessagesFinder do
       SiteSetting.educate_until_posts = 10
       user.stubs(:post_count).returns(11)
 
-      Fabricate(:post, topic: topic, user: user)
-      Fabricate(:post, topic: topic, user: user)
-      Fabricate(:post, topic: topic, user: user, post_type: Post.types[:small_action])
+      freeze_time(5.minutes.ago) do
+        Fabricate(:post, topic: topic, user: user)
+        Fabricate(:post, topic: topic, user: user)
+        Fabricate(:post, topic: topic, user: user, post_type: Post.types[:small_action])
+      end
 
       SiteSetting.sequential_replies_threshold = 2
     end
diff --git a/spec/components/concern/second_factor_manager_spec.rb b/spec/components/concern/second_factor_manager_spec.rb
index 5a049e2c41..e19d75e02f 100644
--- a/spec/components/concern/second_factor_manager_spec.rb
+++ b/spec/components/concern/second_factor_manager_spec.rb
@@ -69,7 +69,7 @@ RSpec.describe SecondFactorManager do
         token = user.user_second_factors.totps.first.totp_object.now
 
         expect(user.authenticate_totp(token)).to eq(true)
-        expect(user.user_second_factors.totps.first.last_used).to eq_time(DateTime.now)
+        expect(user.user_second_factors.totps.first.last_used).to eq_time(Time.zone.now)
         expect(user.authenticate_totp(token)).to eq(false)
       end
     end
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 5406d146df..799e3a3cd3 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -1777,14 +1777,14 @@ describe CookedPostProcessor do
       small_action = Fabricate(:post, topic: topic, post_type: Post.types[:small_action])
       reply = Fabricate(:post, topic: topic, raw: raw)
 
-      freeze_time Time.zone.now do
+      freeze_time do
         topic.bumped_at = 1.day.ago
         CookedPostProcessor.new(reply).remove_full_quote_on_direct_reply
 
         expect(topic.ordered_posts.pluck(:id))
           .to eq([post.id, hidden.id, small_action.id, reply.id])
 
-        expect(topic.bumped_at).to eq(1.day.ago)
+        expect(topic.bumped_at).to eq_time(1.day.ago)
         expect(reply.raw).to eq("and this is the third reply")
         expect(reply.revisions.count).to eq(1)
         expect(reply.revisions.first.modifications["raw"]).to eq([raw, reply.raw])
diff --git a/spec/components/discourse_updates_spec.rb b/spec/components/discourse_updates_spec.rb
index d57493d672..8e9ef2596b 100644
--- a/spec/components/discourse_updates_spec.rb
+++ b/spec/components/discourse_updates_spec.rb
@@ -24,7 +24,8 @@ describe DiscourseUpdates do
 
     context 'a good version check request happened recently' do
       context 'and server is up-to-date' do
-        before { stub_data(Discourse::VERSION::STRING, 0, false, 12.hours.ago) }
+        let(:time) { 12.hours.ago }
+        before { stub_data(Discourse::VERSION::STRING, 0, false, time) }
 
         it 'returns all the version fields' do
           expect(subject.latest_version).to eq(Discourse::VERSION::STRING)
@@ -35,12 +36,13 @@ describe DiscourseUpdates do
         end
 
         it 'returns the timestamp of the last version check' do
-          expect(subject.updated_at).to be_within_one_second_of(12.hours.ago)
+          expect(subject.updated_at).to eq_time(time)
         end
       end
 
       context 'and server is not up-to-date' do
-        before { stub_data('0.9.0', 2, false, 12.hours.ago) }
+        let(:time) { 12.hours.ago }
+        before { stub_data('0.9.0', 2, false, time) }
 
         it 'returns all the version fields' do
           expect(subject.latest_version).to eq('0.9.0')
@@ -50,7 +52,7 @@ describe DiscourseUpdates do
         end
 
         it 'returns the timestamp of the last version check' do
-          expect(subject.updated_at).to be_within_one_second_of(12.hours.ago)
+          expect(subject.updated_at).to eq_time(time)
         end
       end
     end
diff --git a/spec/components/distributed_mutex_spec.rb b/spec/components/distributed_mutex_spec.rb
index 97c3d0096c..23bfd90812 100644
--- a/spec/components/distributed_mutex_spec.rb
+++ b/spec/components/distributed_mutex_spec.rb
@@ -99,7 +99,7 @@ describe DistributedMutex do
       }.to raise_error(Discourse::ReadOnly)
 
       expect(done).to eq(false)
-      expect(Time.now - start).to be < (1.second)
+      expect(Time.now - start).to be <= 1.second
     end
   end
 
diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb
index a7dd5e6b71..7644d6df06 100644
--- a/spec/components/email/receiver_spec.rb
+++ b/spec/components/email/receiver_spec.rb
@@ -656,8 +656,11 @@ describe Email::Receiver do
     end
 
     it "ensures posts aren't dated in the future" do
+      # PostCreator doesn't provide sub-second accuracy for created_at
+      now = freeze_time Time.zone.now.round
+
       expect { process(:from_the_future) }.to change { topic.posts.count }
-      expect(topic.posts.last.created_at).to be_within(1.minute).of(DateTime.now)
+      expect(topic.posts.last.created_at).to eq_time(now)
     end
 
     it "accepts emails with wrong reply key if the system knows about the forwarded email" do
diff --git a/spec/components/post_action_creator_spec.rb b/spec/components/post_action_creator_spec.rb
index acc31fa5b3..ad013f82f5 100644
--- a/spec/components/post_action_creator_spec.rb
+++ b/spec/components/post_action_creator_spec.rb
@@ -145,6 +145,7 @@ describe PostActionCreator do
         before { reviewable.perform(admin, :ignore) }
 
         it "fails because the post was recently reviewed" do
+          freeze_time 10.seconds.from_now
           result = PostActionCreator.create(user, post, :inappropriate)
 
           expect(result.success?).to eq(false)
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index 07ec76bb78..1fae772752 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -145,19 +145,26 @@ describe PostCreator do
           _reply = PostCreator.new(admin, raw: "this is my test reply 123 testing", topic_id: created_post.topic_id).create
         end
 
-        # 2 for topic, one to notify of new topic another for tracking state
-        expect(messages.map { |m| m.channel }.sort).to eq([ "/new",
-                                                     "/u/#{admin.username}",
-                                                     "/u/#{admin.username}",
-                                                     "/unread/#{admin.id}",
-                                                     "/unread/#{admin.id}",
-                                                     "/latest",
-                                                     "/latest",
-                                                     "/topic/#{created_post.topic_id}",
-                                                     "/topic/#{created_post.topic_id}"
-                                                   ].sort)
-        admin_ids = [Group[:admins].id]
+        messages.filter! { |m| m.channel != "/distributed_hash" }
 
+        channels = messages.map { |m| m.channel }.sort
+
+        # 2 for topic, one to notify of new topic another for tracking state
+        expect(channels).to eq(
+          [
+            "/new",
+            "/u/#{admin.username}",
+            "/u/#{admin.username}",
+            "/unread/#{admin.id}",
+            "/unread/#{admin.id}",
+            "/latest",
+            "/latest",
+            "/topic/#{created_post.topic_id}",
+            "/topic/#{created_post.topic_id}"
+          ].sort
+        )
+
+        admin_ids = [Group[:admins].id]
         expect(messages.any? { |m| m.group_ids != admin_ids && m.user_ids != [admin.id] }).to eq(false)
       end
 
@@ -312,7 +319,7 @@ describe PostCreator do
         first_post = creator.create
         topic = first_post.topic.reload
 
-        expect(topic.last_posted_at).to be_within(1.seconds).of(first_post.created_at)
+        expect(topic.last_posted_at).to eq_time(first_post.created_at)
         expect(topic.last_post_user_id).to eq(first_post.user_id)
         expect(topic.word_count).to eq(4)
       end
@@ -351,8 +358,8 @@ describe PostCreator do
           topic.reload
 
           topic_status_update = TopicTimer.last
-          expect(topic_status_update.execute_at).to be_within(1.second).of(Time.zone.now + 12.hours)
-          expect(topic_status_update.created_at).to be_within(1.second).of(Time.zone.now)
+          expect(topic_status_update.execute_at).to eq_time(12.hours.from_now)
+          expect(topic_status_update.created_at).to eq_time(Time.zone.now)
         end
 
         describe "topic's auto close based on last post" do
@@ -484,7 +491,6 @@ describe PostCreator do
     fab!(:topic) { Fabricate(:topic, user: user) }
 
     it 'whispers do not mess up the public view' do
-
       # turns out this can fail on leap years if we don't do this
       freeze_time DateTime.parse('2010-01-01 12:00')
 
@@ -538,7 +544,7 @@ describe PostCreator do
       expect(topic.reply_count).to eq(0)
       expect(topic.posts_count).to eq(1)
       expect(topic.highest_staff_post_number).to eq(3)
-      expect(topic.last_posted_at).to be_within(1.seconds).of(first.created_at)
+      expect(topic.last_posted_at).to eq_time(first.created_at)
       expect(topic.last_post_user_id).to eq(first.user_id)
       expect(topic.word_count).to eq(5)
 
@@ -554,7 +560,7 @@ describe PostCreator do
       topic.reload
       expect(topic.highest_post_number).to eq(1)
       expect(topic.posts_count).to eq(1)
-      expect(topic.last_posted_at).to eq(first.created_at)
+      expect(topic.last_posted_at).to eq_time(first.created_at)
       expect(topic.highest_staff_post_number).to eq(3)
     end
   end
@@ -684,7 +690,7 @@ describe PostCreator do
         post = creator.create
         topic.reload
 
-        expect(topic.last_posted_at).to be_within(1.seconds).of(post.created_at)
+        expect(topic.last_posted_at).to eq_time(post.created_at)
         expect(topic.last_post_user_id).to eq(post.user_id)
         expect(topic.word_count).to eq(6)
       end
@@ -695,7 +701,7 @@ describe PostCreator do
         post = creator.create
         topic.reload
 
-        expect(topic.last_posted_at).to be_within(1.seconds).of(post.created_at)
+        expect(topic.last_posted_at).to eq_time(post.created_at)
         expect(topic.last_post_user_id).to eq(post.user_id)
         expect(topic.word_count).to eq(6)
       end
@@ -960,9 +966,9 @@ describe PostCreator do
         created_at: 1.week.ago
       )
 
-      expect(post1.created_at).to be_within(1.second).of(1.week.ago)
-      expect(post2.created_at).to be_within(1.second).of(1.week.ago)
-      expect(topic.created_at).to be_within(1.second).of(1.week.ago)
+      expect(post1.created_at).to eq_time(1.week.ago)
+      expect(post2.created_at).to eq_time(1.week.ago)
+      expect(topic.created_at).to eq_time(1.week.ago)
     end
 
     it 'supports strings' do
@@ -983,9 +989,9 @@ describe PostCreator do
         created_at: '2019-09-02 00:00:00 UTC'
       )
 
-      expect(post1.created_at).to be_within(1.second).of(time)
-      expect(post2.created_at).to be_within(1.second).of(time)
-      expect(topic.created_at).to be_within(1.second).of(time)
+      expect(post1.created_at).to eq_time(time)
+      expect(post2.created_at).to eq_time(time)
+      expect(topic.created_at).to eq_time(time)
     end
   end
 
diff --git a/spec/components/post_revisor_spec.rb b/spec/components/post_revisor_spec.rb
index 7d4f4fc74a..e5467f44e8 100644
--- a/spec/components/post_revisor_spec.rb
+++ b/spec/components/post_revisor_spec.rb
@@ -138,7 +138,7 @@ describe PostRevisor do
         expect(post.version).to eq(1)
         expect(post.public_version).to eq(1)
         expect(post.revisions.size).to eq(0)
-        expect(post.last_version_at).to eq(first_version_at)
+        expect(post.last_version_at).to eq_time(first_version_at)
         expect(subject.category_changed).to be_blank
       end
 
@@ -209,6 +209,7 @@ describe PostRevisor do
       end
 
       it "resets the edit_reason attribute in post model" do
+        freeze_time
         SiteSetting.editing_grace_period = 5
         post = Fabricate(:post, raw: 'hello world')
         revisor = PostRevisor.new(post)
@@ -216,7 +217,7 @@ describe PostRevisor do
         post.reload
         expect(post.edit_reason).to eq('this is my reason')
 
-        revisor.revise!(post.user, { raw: 'hello world4321' }, revised_at: post.updated_at + 6.second)
+        revisor.revise!(post.user, { raw: 'hello world4321' }, revised_at: post.updated_at + 7.seconds)
         post.reload
         expect(post.edit_reason).not_to be_present
       end
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index c4578148d7..3f89e63cf3 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -374,9 +374,9 @@ describe Search do
 
     context 'search within topic' do
 
-      def new_post(raw, topic = nil)
+      def new_post(raw, topic = nil, created_at: nil)
         topic ||= Fabricate(:topic)
-        Fabricate(:post, topic: topic, topic_id: topic.id, user: topic.user, raw: raw)
+        Fabricate(:post, topic: topic, topic_id: topic.id, user: topic.user, raw: raw, created_at: created_at)
       end
 
       it 'works in Chinese' do
@@ -391,13 +391,13 @@ describe Search do
         topic = Fabricate(:topic)
         topic2 = Fabricate(:topic)
 
-        new_post('this is the other post I am posting', topic2)
-        new_post('this is my fifth post I am posting', topic2)
+        new_post('this is the other post I am posting', topic2, created_at: 6.minutes.ago)
+        new_post('this is my fifth post I am posting', topic2, created_at: 5.minutes.ago)
 
-        post1 = new_post('this is the other post I am posting', topic)
-        post2 = new_post('this is my first post I am posting', topic)
-        post3 = new_post('this is a real long and complicated bla this is my second post I am Posting birds with more stuff bla bla', topic)
-        post4 = new_post('this is my fourth post I am posting', topic)
+        post1 = new_post('this is the other post I am posting', topic, created_at: 4.minutes.ago)
+        post2 = new_post('this is my first post I am posting', topic, created_at: 3.minutes.ago)
+        post3 = new_post('this is a real long and complicated bla this is my second post I am Posting birds with more stuff bla bla', topic, created_at: 2.minutes.ago)
+        post4 = new_post('this is my fourth post I am posting', topic, created_at: 1.minute.ago)
 
         # update posts_count
         topic.reload
@@ -681,8 +681,8 @@ describe Search do
 
       it "should return posts in the right order" do
         raw = "The pure genuine evian"
-        post = Fabricate(:post, topic: category.topic, raw: raw)
-        post2 = Fabricate(:post, topic: category2.topic, raw: raw)
+        post = freeze_time(10.seconds.from_now) { Fabricate(:post, topic: category.topic, raw: raw) }
+        post2 = freeze_time(20.seconds.from_now) { Fabricate(:post, topic: category2.topic, raw: raw) }
 
         search = Search.execute(raw)
 
@@ -1145,9 +1145,8 @@ describe Search do
 
     it 'can find by latest' do
       topic1 = Fabricate(:topic, title: 'I do not like that Sam I am')
-      post1 = Fabricate(:post, topic: topic1)
-
-      post2 = Fabricate(:post, raw: 'that Sam I am, that Sam I am')
+      post1 = Fabricate(:post, topic: topic1, created_at: 10.minutes.ago)
+      post2 = Fabricate(:post, raw: 'that Sam I am, that Sam I am', created_at: 5.minutes.ago)
 
       expect(Search.execute('sam').posts.map(&:id)).to eq([post1.id, post2.id])
       expect(Search.execute('sam order:latest').posts.map(&:id)).to eq([post2.id, post1.id])
@@ -1332,8 +1331,8 @@ describe Search do
         cat1 = Fabricate(:category_with_definition, name: 'food')
         topic6 = Fabricate(:topic, tags: [tag1, tag2], category: cat1)
         topic7 = Fabricate(:topic, tags: [tag1, tag2, tag3], category: cat1)
-        post7 = Fabricate(:post, topic: topic6, raw: "Wakey, wakey, eggs and bakey.", like_count: 5)
-        post8 = Fabricate(:post, topic: topic7, raw: "Bakey, bakey, eggs to makey.", like_count: 2)
+        post7 = Fabricate(:post, topic: topic6, raw: "Wakey, wakey, eggs and bakey.", like_count: 5, created_at: 2.minutes.ago)
+        post8 = Fabricate(:post, topic: topic7, raw: "Bakey, bakey, eggs to makey.", like_count: 2, created_at: 1.minute.ago)
 
         expect(Search.execute('bakey tags:lunch order:latest').posts.map(&:id))
           .to eq([post8.id, post7.id])
diff --git a/spec/components/topic_creator_spec.rb b/spec/components/topic_creator_spec.rb
index d13d48c3f0..9d7230ece1 100644
--- a/spec/components/topic_creator_spec.rb
+++ b/spec/components/topic_creator_spec.rb
@@ -246,8 +246,8 @@ describe TopicCreator do
           pinned_at: 3.days.ago
         ))
 
-        expect(topic.created_at).to be_within(1.second).of(1.week.ago)
-        expect(topic.pinned_at).to be_within(1.second).of(3.days.ago)
+        expect(topic.created_at).to eq_time(1.week.ago)
+        expect(topic.pinned_at).to eq_time(3.days.ago)
       end
 
       it 'supports strings' do
@@ -261,8 +261,8 @@ describe TopicCreator do
           pinned_at: '2020-03-10 15:17'
         ))
 
-        expect(topic.created_at).to be_within(1.second).of(time1)
-        expect(topic.pinned_at).to be_within(1.second).of(time2)
+        expect(topic.created_at).to eq_time(time1)
+        expect(topic.pinned_at).to eq_time(time2)
       end
     end
   end
diff --git a/spec/components/topic_publisher_spec.rb b/spec/components/topic_publisher_spec.rb
index c684d3de77..1b2c14bfa2 100644
--- a/spec/components/topic_publisher_spec.rb
+++ b/spec/components/topic_publisher_spec.rb
@@ -33,8 +33,8 @@ describe TopicPublisher do
           topic.reload
           expect(topic.category).to eq(category)
           expect(topic).to be_visible
-          expect(topic.created_at).to eq(published_at)
-          expect(topic.updated_at).to eq(published_at)
+          expect(topic.created_at).to eq_time(published_at)
+          expect(topic.updated_at).to eq_time(published_at)
           expect(topic.shared_draft).to be_blank
 
           expect(UserHistory.where(
@@ -48,9 +48,9 @@ describe TopicPublisher do
           expect(op.revisions.size).to eq(0)
           expect(op.version).to eq(1)
           expect(op.public_version).to eq(1)
-          expect(op.created_at).to eq(published_at)
-          expect(op.updated_at).to eq(published_at)
-          expect(op.last_version_at).to eq(published_at)
+          expect(op.created_at).to eq_time(published_at)
+          expect(op.updated_at).to eq_time(published_at)
+          expect(op.last_version_at).to eq_time(published_at)
         end
       end
     end
diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb
index 3793da7579..0bafbbb1b3 100644
--- a/spec/components/topic_query_spec.rb
+++ b/spec/components/topic_query_spec.rb
@@ -75,15 +75,13 @@ describe TopicQuery do
   end
 
   context "prioritize_pinned_topics" do
-
     it "does the pagination correctly" do
-
       num_topics = 15
       per_page = 3
 
       topics = []
       (num_topics - 1).downto(0).each do |i|
-        topics[i] = Fabricate(:topic)
+        topics[i] = freeze_time(i.seconds.ago) { Fabricate(:topic) }
       end
 
       topic_query = TopicQuery.new(user)
@@ -99,7 +97,6 @@ describe TopicQuery do
         page: 1)
       ).to eq(topics[per_page...num_topics])
     end
-
   end
 
   context 'bookmarks' do
@@ -926,7 +923,7 @@ describe TopicQuery do
           let!(:user) { group_user }
 
           it 'should return the group topics' do
-            expect(suggested_topics).to eq([private_group_topic.id, private_message.id])
+            expect(suggested_topics).to match_array([private_group_topic.id, private_message.id])
           end
         end
 
diff --git a/spec/integration/topic_auto_close_spec.rb b/spec/integration/topic_auto_close_spec.rb
index bd231687a4..8dcc2721e2 100644
--- a/spec/integration/topic_auto_close_spec.rb
+++ b/spec/integration/topic_auto_close_spec.rb
@@ -41,7 +41,7 @@ describe Topic do
           topic_status_update = TopicTimer.last
 
           expect(topic_status_update.topic).to eq(topic)
-          expect(topic.public_topic_timer.execute_at).to be_within_one_second_of(2.hours.from_now)
+          expect(topic.public_topic_timer.execute_at).to eq_time(2.hours.from_now)
 
           args = job_klass.jobs.last['args'].first
 
@@ -59,7 +59,7 @@ describe Topic do
             topic_status_update = TopicTimer.last
 
             expect(topic_status_update.topic).to eq(staff_topic)
-            expect(topic_status_update.execute_at).to be_within_one_second_of(2.hours.from_now)
+            expect(topic_status_update.execute_at).to eq_time(2.hours.from_now)
             expect(topic_status_update.user).to eq(admin)
 
             args = job_klass.jobs.last['args'].first
@@ -70,14 +70,12 @@ describe Topic do
 
           context 'topic is closed manually' do
             it 'should remove the schedule to auto-close the topic' do
-              freeze_time
-
               topic_timer_id = staff_topic.public_topic_timer.id
 
               staff_topic.update_status('closed', true, admin)
 
               expect(TopicTimer.with_deleted.find(topic_timer_id).deleted_at)
-                .to be_within(1.second).of(Time.zone.now)
+                .to eq_time(Time.zone.now)
             end
           end
         end
@@ -92,7 +90,7 @@ describe Topic do
             topic_status_update = TopicTimer.last
 
             expect(topic_status_update.topic).to eq(regular_user_topic)
-            expect(topic_status_update.execute_at).to be_within_one_second_of(2.hours.from_now)
+            expect(topic_status_update.execute_at).to eq_time(2.hours.from_now)
             expect(topic_status_update.user).to eq(Discourse.system_user)
 
             args = job_klass.jobs.last['args'].first
diff --git a/spec/integration/user_api_keys_spec.rb b/spec/integration/user_api_keys_spec.rb
index e094ed3a84..8cd4edcd7a 100644
--- a/spec/integration/user_api_keys_spec.rb
+++ b/spec/integration/user_api_keys_spec.rb
@@ -3,16 +3,16 @@
 require 'rails_helper'
 
 describe 'user api keys integration' do
-
   fab!(:user_api_key) { Fabricate(:readonly_user_api_key) }
 
   it 'updates last used time on use' do
-    user_api_key.update_columns(last_used_at: 7.days.ago)
-
     freeze_time
+
+    user_api_key.update_columns(last_used_at: 7.days.ago)
     get '/session/current.json', headers: {
       HTTP_USER_API_KEY: user_api_key.key,
     }
+
     expect(user_api_key.reload.last_used_at).to eq_time(Time.zone.now)
   end
 end
diff --git a/spec/integrity/coding_style_spec.rb b/spec/integrity/coding_style_spec.rb
index 864ff1d5a6..49a5737844 100644
--- a/spec/integrity/coding_style_spec.rb
+++ b/spec/integrity/coding_style_spec.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "rails_helper"
+
 def list_files(base_dir, pattern = '*')
   Dir[File.join("#{base_dir}", pattern)]
 end
diff --git a/spec/jobs/auto_expire_user_api_keys_spec.rb b/spec/jobs/auto_expire_user_api_keys_spec.rb
index ef490a113e..13c7df6a06 100644
--- a/spec/jobs/auto_expire_user_api_keys_spec.rb
+++ b/spec/jobs/auto_expire_user_api_keys_spec.rb
@@ -7,7 +7,6 @@ RSpec.describe Jobs::AutoExpireUserApiKeys do
   fab!(:key2) { Fabricate(:readonly_user_api_key) }
 
   context 'when user api key is unused in last 1 days' do
-
     before do
       SiteSetting.expire_user_api_keys_days = 1
     end
@@ -16,10 +15,9 @@ RSpec.describe Jobs::AutoExpireUserApiKeys do
       freeze_time
 
       key1.update!(last_used_at: 2.days.ago)
-
       described_class.new.execute({})
 
-      expect(key1.reload.revoked_at).to be_within(1.second).of(Time.zone.now)
+      expect(key1.reload.revoked_at).to eq_time(Time.zone.now)
       expect(key2.reload.revoked_at).to eq(nil)
     end
   end
diff --git a/spec/jobs/periodical_updates_spec.rb b/spec/jobs/periodical_updates_spec.rb
index 52729471d4..40504960e8 100644
--- a/spec/jobs/periodical_updates_spec.rb
+++ b/spec/jobs/periodical_updates_spec.rb
@@ -33,6 +33,6 @@ describe Jobs::PeriodicalUpdates do
     # does not rebake
     Jobs::PeriodicalUpdates.new.execute
     post.reload
-    expect(post.baked_at).to eq(baked)
+    expect(post.baked_at).to eq_time(baked)
   end
 end
diff --git a/spec/jobs/publish_topic_to_category_spec.rb b/spec/jobs/publish_topic_to_category_spec.rb
index 3602eaa5b3..559065f750 100644
--- a/spec/jobs/publish_topic_to_category_spec.rb
+++ b/spec/jobs/publish_topic_to_category_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe Jobs::PublishTopicToCategory do
 
   describe 'when topic has been deleted' do
     it 'should not publish the topic to the new category' do
-      freeze_time 1.hour.ago
+      created_at = freeze_time 1.hour.ago
       topic
 
       freeze_time 1.hour.from_now
@@ -32,7 +32,7 @@ RSpec.describe Jobs::PublishTopicToCategory do
 
       topic.reload
       expect(topic.category).to eq(category)
-      expect(topic.created_at).to be_within(1.second).of(Time.zone.now - 1.hour)
+      expect(topic.created_at).to eq_time(created_at)
     end
   end
 
@@ -41,6 +41,8 @@ RSpec.describe Jobs::PublishTopicToCategory do
       topic.update!(visible: false)
     end
 
+    now = freeze_time
+
     message = MessageBus.track_publish do
       described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
     end.find do |m|
@@ -54,19 +56,19 @@ RSpec.describe Jobs::PublishTopicToCategory do
     expect(message.channel).to eq("/topic/#{topic.id}")
 
     %w{created_at bumped_at updated_at last_posted_at}.each do |attribute|
-      expect(topic.public_send(attribute)).to be_within(1.second).of(Time.zone.now)
+      expect(topic.public_send(attribute)).to eq_time(now)
     end
   end
 
   describe 'when topic is a private message' do
-    before do
+    it 'should publish the topic to the new category' do
       freeze_time 1.hour.ago do
         expect { topic.convert_to_private_message(Discourse.system_user) }
           .to change { topic.private_message? }.to(true)
       end
-    end
 
-    it 'should publish the topic to the new category' do
+      now = freeze_time
+
       message = MessageBus.track_publish do
         described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
       end.last
@@ -77,7 +79,7 @@ RSpec.describe Jobs::PublishTopicToCategory do
       expect(topic.private_message?).to eq(false)
 
       %w{created_at bumped_at updated_at last_posted_at}.each do |attribute|
-        expect(topic.public_send(attribute)).to be_within(1.second).of(Time.zone.now)
+        expect(topic.public_send(attribute)).to eq_time(now)
       end
 
       expect(message.data[:reload_topic]).to be_present
@@ -86,11 +88,10 @@ RSpec.describe Jobs::PublishTopicToCategory do
   end
 
   describe 'when new category has a default auto-close' do
-    before do
-      another_category.update!(auto_close_hours: 5)
-    end
-
     it 'should apply the auto-close timer upon publishing' do
+      freeze_time
+
+      another_category.update!(auto_close_hours: 5)
       topic
 
       described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
@@ -99,7 +100,7 @@ RSpec.describe Jobs::PublishTopicToCategory do
       topic_timer = topic.public_topic_timer
       expect(topic.category).to eq(another_category)
       expect(topic_timer.status_type).to eq(TopicTimer.types[:close])
-      expect(topic_timer.execute_at).to be_within(1.second).of(5.hours.from_now)
+      expect(topic_timer.execute_at).to eq_time(5.hours.from_now)
     end
   end
 end
diff --git a/spec/jobs/pull_hotlinked_images_spec.rb b/spec/jobs/pull_hotlinked_images_spec.rb
index 6e3a21ca9a..de87e7e153 100644
--- a/spec/jobs/pull_hotlinked_images_spec.rb
+++ b/spec/jobs/pull_hotlinked_images_spec.rb
@@ -44,7 +44,7 @@ describe Jobs::PullHotlinkedImages do
 
       freeze_time 1.week.from_now
       Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
-      expect(orig).to be_within(1.second).of(post.reload.updated_at)
+      expect(orig).to eq_time(post.reload.updated_at)
     end
 
     it 'replaces images' do
diff --git a/spec/jobs/truncate_user_flag_stats_spec.rb b/spec/jobs/truncate_user_flag_stats_spec.rb
index b7e23fbb8b..9dc28c2a8b 100644
--- a/spec/jobs/truncate_user_flag_stats_spec.rb
+++ b/spec/jobs/truncate_user_flag_stats_spec.rb
@@ -37,15 +37,24 @@ describe Jobs::TruncateUserFlagStats do
     p2 = Fabricate(:post, user: user)
     p3 = Fabricate(:post)
 
+    freeze_time 10.minutes.ago
     r0 = PostActionCreator.spam(user, p0).reviewable
+    freeze_time 1.minute.from_now
     r1 = PostActionCreator.spam(user, p1).reviewable
+    freeze_time 1.minute.from_now
     r2 = PostActionCreator.spam(user, p2).reviewable
+    freeze_time 1.minute.from_now
     r3 = PostActionCreator.spam(user, p3).reviewable
 
+    freeze_time 1.minute.from_now
     PostActionCreator.spam(other_user, p3).reviewable
+    freeze_time 1.minute.from_now
     PostActionCreator.spam(other_user, p2).reviewable
+    freeze_time 1.minute.from_now
     PostActionCreator.spam(other_user, p1).reviewable
 
+    unfreeze_time
+
     r0.perform(Discourse.system_user, :agree_and_keep)
     r1.perform(Discourse.system_user, :disagree)
     r2.perform(Discourse.system_user, :ignore)
diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb
index 263adba7e3..e6def350b2 100644
--- a/spec/jobs/user_email_spec.rb
+++ b/spec/jobs/user_email_spec.rb
@@ -192,18 +192,21 @@ describe Jobs::UserEmail do
   end
 
   context "email_log" do
-    fab!(:post) { Fabricate(:post) }
+    fab!(:post) { Fabricate(:post, created_at: 30.seconds.ago) }
 
     before do
       SiteSetting.editing_grace_period = 0
-      post
     end
 
     it "creates an email log when the mail is sent (via Email::Sender)" do
-      last_emailed_at = user.last_emailed_at
+      freeze_time
+
+      last_emailed_at = 7.days.ago
+      user.update!(last_emailed_at: last_emailed_at)
+      Topic.last.update(created_at: 1.minute.ago)
 
       expect do
-        Jobs::UserEmail.new.execute(type: :digest, user_id: user.id,)
+        Jobs::UserEmail.new.execute(type: :digest, user_id: user.id)
       end.to change { EmailLog.count }.by(1)
 
       email_log = EmailLog.last
@@ -211,12 +214,17 @@ describe Jobs::UserEmail do
       expect(email_log.user).to eq(user)
       expect(email_log.post).to eq(nil)
       # last_emailed_at should have changed
-      expect(email_log.user.last_emailed_at).to_not eq(last_emailed_at)
+      expect(email_log.user.last_emailed_at).to_not eq_time(last_emailed_at)
     end
 
     it "creates a skipped email log when the mail is skipped" do
-      last_emailed_at = user.last_emailed_at
-      user.update_columns(suspended_till: 1.year.from_now)
+      freeze_time
+
+      last_emailed_at = 7.days.ago
+      user.update!(
+        last_emailed_at: last_emailed_at,
+        suspended_till: 1.year.from_now
+      )
 
       expect do
         Jobs::UserEmail.new.execute(type: :digest, user_id: user.id)
@@ -231,7 +239,7 @@ describe Jobs::UserEmail do
       )).to eq(true)
 
       # last_emailed_at doesn't change
-      expect(user.last_emailed_at).to eq(last_emailed_at)
+      expect(user.last_emailed_at).to eq_time(last_emailed_at)
     end
 
     it "creates a skipped email log when the user isn't allowed to see the post" do
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 300fc5561e..68f037bf57 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -535,15 +535,15 @@ describe Category do
 
   describe 'latest' do
     it 'should be updated correctly' do
-      category = Fabricate(:category_with_definition)
-      post = create_post(category: category.id)
+      category = freeze_time(1.minute.ago) { Fabricate(:category_with_definition) }
+      post = create_post(category: category.id, created_at: 15.seconds.ago)
 
       category.reload
       expect(category.latest_post_id).to eq(post.id)
       expect(category.latest_topic_id).to eq(post.topic_id)
 
-      post2 = create_post(category: category.id)
-      post3 = create_post(topic_id: post.topic_id, category: category.id)
+      post2 = create_post(category: category.id, created_at: 10.seconds.ago)
+      post3 = create_post(topic_id: post.topic_id, category: category.id, created_at: 5.seconds.ago)
 
       category.reload
       expect(category.latest_post_id).to eq(post3.id)
@@ -858,22 +858,18 @@ describe Category do
     end
 
     it 'should correctly automatically bump topics' do
-      freeze_time 1.second.ago
-      category = Fabricate(:category_with_definition)
+      freeze_time
+      category = Fabricate(:category_with_definition, created_at: 1.minute.ago)
       category.clear_auto_bump_cache!
 
-      freeze_time 1.second.from_now
-      post1 = create_post(category: category)
-      freeze_time 1.second.from_now
-      _post2 = create_post(category: category)
-      freeze_time 1.second.from_now
-      _post3 = create_post(category: category)
+      post1 = create_post(category: category, created_at: 15.seconds.ago)
+      _post2 = create_post(category: category, created_at: 10.seconds.ago)
+      _post3 = create_post(category: category, created_at: 5.seconds.ago)
 
       # no limits on post creation or category creation please
       RateLimiter.enable
 
-      time = 1.month.from_now
-      freeze_time time
+      time = freeze_time 1.month.from_now
 
       expect(category.auto_bump_topic!).to eq(false)
       expect(Topic.where(bumped_at: time).count).to eq(0)
@@ -886,8 +882,7 @@ describe Category do
       # our extra bump message
       expect(post1.topic.reload.posts_count).to eq(2)
 
-      time = time + 13.hours
-      freeze_time time
+      time = freeze_time 13.hours.from_now
 
       expect(category.auto_bump_topic!).to eq(true)
       expect(Topic.where(bumped_at: time).count).to eq(1)
@@ -895,8 +890,7 @@ describe Category do
       expect(category.auto_bump_topic!).to eq(false)
       expect(Topic.where(bumped_at: time).count).to eq(1)
 
-      time = 1.month.from_now
-      freeze_time time
+      time = freeze_time 1.month.from_now
 
       category.auto_bump_limiter.clear!
       expect(Category.auto_bump_topic!).to eq(true)
@@ -909,18 +903,16 @@ describe Category do
     end
 
     it 'should not automatically bump topics with a bump scheduled' do
-      freeze_time 1.second.ago
-      category = Fabricate(:category_with_definition)
+      freeze_time
+      category = Fabricate(:category_with_definition, created_at: 1.second.ago)
       category.clear_auto_bump_cache!
 
-      freeze_time 1.second.from_now
       post1 = create_post(category: category)
 
       # no limits on post creation or category creation please
       RateLimiter.enable
 
-      time = 1.month.from_now
-      freeze_time time
+      time = freeze_time 1.month.from_now
 
       expect(category.auto_bump_topic!).to eq(false)
       expect(Topic.where(bumped_at: time).count).to eq(0)
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index 15a6b9d0c0..fab7da2690 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -125,13 +125,14 @@ describe Invite do
           end
 
           it 'updates timestamp of existing invite' do
+            freeze_time
             invite.update!(created_at: 10.days.ago)
 
             resend_invite = Invite.invite_by_email(
               'iceking@adventuretime.ooo', inviter, topic
             )
 
-            expect(resend_invite.created_at).to be_within(1.minute).of(Time.zone.now)
+            expect(resend_invite.created_at).to eq_time(Time.zone.now)
           end
 
           it 'returns a new invite if the other has expired' do
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index 82b10a871e..8cdc6591a1 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -729,7 +729,7 @@ describe PostAction do
         topic_status_update = TopicTimer.last
 
         expect(topic_status_update.topic).to eq(topic)
-        expect(topic_status_update.execute_at).to be_within(1.second).of(1.hour.from_now)
+        expect(topic_status_update.execute_at).to eq_time(1.hour.from_now)
         expect(topic_status_update.status_type).to eq(TopicTimer.types[:open])
       end
 
@@ -772,7 +772,7 @@ describe PostAction do
         Jobs::ToggleTopicClosed.new.execute(topic_timer_id: timer.id, state: false)
 
         expect(topic.reload.closed).to eq(true)
-        expect(timer.reload.execute_at).to eq(1.hour.from_now)
+        expect(timer.reload.execute_at).to eq_time(1.hour.from_now)
 
         freeze_time timer.execute_at
         SiteSetting.num_flaggers_to_close_topic = 10
diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb
index 7ae87eab6a..d198e2d33c 100644
--- a/spec/models/post_mover_spec.rb
+++ b/spec/models/post_mover_spec.rb
@@ -24,10 +24,12 @@ describe PostMover do
 
   describe 'move_posts' do
     context 'topics' do
+      before { freeze_time }
+
       fab!(:user) { Fabricate(:user, admin: true) }
       fab!(:another_user) { evil_trout }
       fab!(:category) { Fabricate(:category, user: user) }
-      fab!(:topic) { Fabricate(:topic, user: user) }
+      fab!(:topic) { Fabricate(:topic, user: user, created_at: 4.hours.ago) }
       fab!(:p1) { Fabricate(:post, topic: topic, user: user, created_at: 3.hours.ago, reply_count: 2) }
 
       fab!(:p2) do
@@ -37,14 +39,15 @@ describe PostMover do
           user: another_user,
           raw: "Has a link to [evil trout](http://eviltrout.com) which is a cool site.",
           reply_to_post_number: p1.post_number,
-          reply_count: 1
+          reply_count: 1,
+          created_at: 2.hours.ago
         )
       end
 
-      fab!(:p3) { Fabricate(:post, topic: topic, reply_to_post_number: p1.post_number, user: user) }
-      fab!(:p4) { Fabricate(:post, topic: topic, reply_to_post_number: p2.post_number, user: user) }
-      fab!(:p5) { Fabricate(:post) }
-      let(:p6) { Fabricate(:post, topic: topic) }
+      fab!(:p3) { Fabricate(:post, topic: topic, reply_to_post_number: p1.post_number, user: user, created_at: 1.hour.ago) }
+      fab!(:p4) { Fabricate(:post, topic: topic, reply_to_post_number: p2.post_number, user: user, created_at: 45.minutes.ago) }
+      fab!(:p5) { Fabricate(:post, created_at: 30.minutes.ago) }
+      let(:p6) { Fabricate(:post, topic: topic, created_at: 15.minutes.ago) }
 
       before do
         SiteSetting.tagging_enabled = true
@@ -135,8 +138,6 @@ describe PostMover do
         before do
           TopicUser.update_last_read(user, topic.id, p4.post_number, p4.post_number, 0)
           TopicLink.extract_from(p2)
-
-          freeze_time Time.now
         end
 
         def create_post_timing(post, user, msecs)
@@ -216,7 +217,6 @@ describe PostMover do
         end
 
         context "to a new topic" do
-
           it "works correctly" do
             topic.expects(:add_moderator_post).once
             new_topic = topic.move_posts(user, [p2.id, p4.id], title: "new testing topic name", category_id: category.id, tags: ["tag1", "tag2"])
@@ -238,8 +238,8 @@ describe PostMover do
 
             p4.reload
             expect(new_topic.last_post_user_id).to eq(p4.user_id)
-            expect(new_topic.last_posted_at).to eq(p4.created_at)
-            expect(new_topic.bumped_at).to be_within(1.second).of(Time.now)
+            expect(new_topic.last_posted_at).to eq_time(p4.created_at)
+            expect(new_topic.bumped_at).to eq_time(Time.zone.now)
 
             p2.reload
             expect(p2.sort_order).to eq(1)
@@ -511,8 +511,8 @@ describe PostMover do
             expect(moved_to.category_id).to eq(SiteSetting.uncategorized_category_id)
             p4.reload
             expect(moved_to.last_post_user_id).to eq(p4.user_id)
-            expect(moved_to.last_posted_at).to eq(p4.created_at)
-            expect(moved_to.bumped_at).to be_within(1.second).of(Time.now)
+            expect(moved_to.last_posted_at).to eq_time(p4.created_at)
+            expect(moved_to.bumped_at).to eq_time(Time.zone.now)
 
             # Posts should be re-ordered
             p2.reload
@@ -822,8 +822,8 @@ describe PostMover do
 
             p4.reload
             expect(new_topic.last_post_user_id).to eq(p4.user_id)
-            expect(new_topic.last_posted_at).to eq(p4.created_at)
-            expect(new_topic.bumped_at).to be_within(1.second).of(Time.now)
+            expect(new_topic.last_posted_at).to eq_time(p4.created_at)
+            expect(new_topic.bumped_at).to eq_time(Time.zone.now)
 
             p2.reload
             expect(p2.sort_order).to eq(1)
@@ -920,7 +920,6 @@ describe PostMover do
         end
 
         context "moving the first post" do
-
           it "copies the OP, doesn't delete it" do
             topic.expects(:add_moderator_post).once
             new_topic = topic.move_posts(user, [p1.id, p2.id], title: "new testing topic name")
@@ -940,7 +939,7 @@ describe PostMover do
             # New first post
             new_first = new_topic.posts.where(post_number: 1).first
             expect(new_first.reply_count).to eq(1)
-            expect(new_first.created_at).to be_within(1.second).of(p1.created_at)
+            expect(new_first.created_at).to eq_time(p1.created_at)
 
             # Second post is in a new topic
             p2.reload
@@ -1074,13 +1073,12 @@ describe PostMover do
       fab!(:user) { Fabricate(:user) }
       fab!(:another_user) { Fabricate(:user) }
       fab!(:regular_user) { Fabricate(:trust_level_4) }
-      fab!(:topic) { Fabricate(:topic) }
       fab!(:personal_message) { Fabricate(:private_message_topic, user: evil_trout) }
-      fab!(:p1) { Fabricate(:post, topic: personal_message, user: user) }
-      fab!(:p2) { Fabricate(:post, topic: personal_message, reply_to_post_number: p1.post_number, user: another_user) }
-      fab!(:p3) { Fabricate(:post, topic: personal_message, reply_to_post_number: p1.post_number, user: user) }
-      fab!(:p4) { Fabricate(:post, topic: personal_message, reply_to_post_number: p2.post_number, user: user) }
-      fab!(:p5) { Fabricate(:post, topic: personal_message, user: evil_trout) }
+      fab!(:p1) { Fabricate(:post, topic: personal_message, user: user, created_at: 4.hours.ago) }
+      fab!(:p2) { Fabricate(:post, topic: personal_message, reply_to_post_number: p1.post_number, user: another_user, created_at: 3.hours.ago) }
+      fab!(:p3) { Fabricate(:post, topic: personal_message, reply_to_post_number: p1.post_number, user: user, created_at: 2.hours.ago) }
+      fab!(:p4) { Fabricate(:post, topic: personal_message, reply_to_post_number: p2.post_number, user: user, created_at: 1.hour.ago) }
+      fab!(:p5) { Fabricate(:post, topic: personal_message, user: evil_trout, created_at: 30.minutes.ago) }
       let(:another_personal_message) do
         Fabricate(:private_message_topic, user: user, topic_allowed_users: [
           Fabricate.build(:topic_allowed_user, user: admin)
@@ -1181,6 +1179,8 @@ describe PostMover do
         end
 
         it "does not allow moving regular topic posts in personal message" do
+          topic = Fabricate(:topic, created_at: 4.hours.ago)
+
           expect {
             personal_message.move_posts(admin, [p2.id, p5.id], destination_topic_id: topic.id)
           }.to raise_error(Discourse::InvalidParameters)
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 325f4febcc..b09245460b 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1132,7 +1132,7 @@ describe Post do
       SiteSetting.newuser_spam_host_threshold = 1
       SiteSetting.newuser_max_links = 3
       user = Fabricate(:user, staged: true, trust_level: 0)
-      user.created_at = 1.day.ago
+      user.created_at = 2.days.ago
       user.unstage
       post = Fabricate(:post, raw: raw, user: user)
       expect(post.has_host_spam?).to eq(false)
@@ -1224,7 +1224,7 @@ describe Post do
       baked = post.baked_at
       Post.rebake_old(100)
       post.reload
-      expect(post.baked_at).to eq(baked)
+      expect(post.baked_at).to eq_time(baked)
     end
 
     it "will rate limit globally" do
@@ -1475,10 +1475,7 @@ describe Post do
     end
 
     def updates_topic_updated_at
-
-      freeze_time 1.day.from_now
-      time = Time.now
-
+      time = freeze_time 1.day.from_now
       result = yield
 
       topic.reload
diff --git a/spec/models/quoted_post_spec.rb b/spec/models/quoted_post_spec.rb
index a40025400e..35082b5af2 100644
--- a/spec/models/quoted_post_spec.rb
+++ b/spec/models/quoted_post_spec.rb
@@ -84,7 +84,6 @@ describe QuotedPost do
     quote.reload
 
     expect(original_date).to eq_time(quote.created_at)
-
     expect(post2.reply_quoted).to eq(false)
   end
 end
diff --git a/spec/models/remote_theme_spec.rb b/spec/models/remote_theme_spec.rb
index 59d026a18b..6f5bab1df1 100644
--- a/spec/models/remote_theme_spec.rb
+++ b/spec/models/remote_theme_spec.rb
@@ -103,7 +103,7 @@ describe RemoteTheme do
       expect(@theme.settings.length).to eq(1)
       expect(@theme.settings.first.value).to eq(true)
 
-      expect(remote.remote_updated_at).to eq(time)
+      expect(remote.remote_updated_at).to eq_time(time)
 
       scheme = ColorScheme.find_by(theme_id: @theme.id)
       expect(scheme.name).to eq("Amazing")
@@ -150,7 +150,7 @@ describe RemoteTheme do
       expect(@theme.settings.length).to eq(1)
       expect(@theme.settings.first.value).to eq(32)
 
-      expect(remote.remote_updated_at).to eq(time)
+      expect(remote.remote_updated_at).to eq_time(time)
       expect(remote.about_url).to eq("https://newsite.com/about")
 
       # It should be able to remove old colors as well
diff --git a/spec/models/screened_email_spec.rb b/spec/models/screened_email_spec.rb
index bb2bc0c4be..aeefe195d3 100644
--- a/spec/models/screened_email_spec.rb
+++ b/spec/models/screened_email_spec.rb
@@ -80,9 +80,9 @@ describe ScreenedEmail do
 
     shared_examples "when a ScreenedEmail record matches" do
       it "updates statistics" do
-        freeze_time(Time.zone.now) do
+        freeze_time do
           expect { subject }.to change { screened_email.reload.match_count }.by(1)
-          expect(screened_email.last_match_at).to be_within_one_second_of(Time.zone.now)
+          expect(screened_email.last_match_at).to eq_time(Time.zone.now)
         end
       end
     end
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index e882c3fd05..17d49606ff 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -988,7 +988,7 @@ describe Topic do
     fab!(:topic) { Fabricate(:topic, bumped_at: 1.hour.ago) }
 
     before do
-      @original_bumped_at = topic.bumped_at.to_f
+      @original_bumped_at = topic.bumped_at
       @user = topic.user
       @user.admin = true
     end
@@ -1000,7 +1000,7 @@ describe Topic do
           topic.reload
           expect(topic).not_to be_visible
           expect(topic.moderator_posts_count).to eq(1)
-          expect(topic.bumped_at.to_f).to be_within(1e-4).of(@original_bumped_at)
+          expect(topic.bumped_at).to eq_time(@original_bumped_at)
         end
 
         it 'removes itself as featured topic on user profiles' do
@@ -1022,7 +1022,7 @@ describe Topic do
         it 'should be visible with correct counts' do
           expect(topic).to be_visible
           expect(topic.moderator_posts_count).to eq(1)
-          expect(topic.bumped_at.to_f).to be_within(1e-4).of(@original_bumped_at)
+          expect(topic.bumped_at).to eq_time(@original_bumped_at)
         end
       end
     end
@@ -1037,7 +1037,7 @@ describe Topic do
         it "doesn't have a pinned_at but has correct dates" do
           expect(topic.pinned_at).to be_blank
           expect(topic.moderator_posts_count).to eq(1)
-          expect(topic.bumped_at.to_f).to be_within(1e-4).of(@original_bumped_at)
+          expect(topic.bumped_at).to eq_time(@original_bumped_at)
         end
       end
 
@@ -1050,7 +1050,7 @@ describe Topic do
 
         it 'should enable correctly' do
           expect(topic.pinned_at).to be_present
-          expect(topic.bumped_at.to_f).to be_within(1e-4).of(@original_bumped_at)
+          expect(topic.bumped_at).to eq_time(@original_bumped_at)
           expect(topic.moderator_posts_count).to eq(1)
         end
 
@@ -1061,14 +1061,14 @@ describe Topic do
       context 'disable' do
         before do
           @archived_topic = Fabricate(:topic, archived: true, bumped_at: 1.hour.ago)
-          @original_bumped_at = @archived_topic.bumped_at.to_f
+          @original_bumped_at = @archived_topic.bumped_at
           @archived_topic.update_status('archived', false, @user)
           @archived_topic.reload
         end
 
         it 'should archive correctly' do
           expect(@archived_topic).not_to be_archived
-          expect(@archived_topic.bumped_at.to_f).to be_within(1e-4).of(@original_bumped_at)
+          expect(@archived_topic.bumped_at).to eq_time(@original_bumped_at)
           expect(@archived_topic.moderator_posts_count).to eq(1)
         end
       end
@@ -1083,7 +1083,7 @@ describe Topic do
         it 'should be archived' do
           expect(topic).to be_archived
           expect(topic.moderator_posts_count).to eq(1)
-          expect(topic.bumped_at.to_f).to be_within(1e-4).of(@original_bumped_at)
+          expect(topic.bumped_at).to eq_time(@original_bumped_at)
         end
       end
     end
@@ -1092,7 +1092,7 @@ describe Topic do
       context 'disable' do
         before do
           @closed_topic = Fabricate(:topic, closed: true, bumped_at: 1.hour.ago)
-          @original_bumped_at = @closed_topic.bumped_at.to_f
+          @original_bumped_at = @closed_topic.bumped_at
           @closed_topic.update_status(status, false, @user)
           @closed_topic.reload
         end
@@ -1100,7 +1100,7 @@ describe Topic do
         it 'should not be pinned' do
           expect(@closed_topic).not_to be_closed
           expect(@closed_topic.moderator_posts_count).to eq(1)
-          expect(@closed_topic.bumped_at.to_f).not_to be_within(1e-4).of(@original_bumped_at)
+          expect(@closed_topic.bumped_at).not_to eq_time(@original_bumped_at)
         end
       end
 
@@ -1113,7 +1113,7 @@ describe Topic do
 
         it 'should be closed' do
           expect(topic).to be_closed
-          expect(topic.bumped_at.to_f).to be_within(1e-4).of(@original_bumped_at)
+          expect(topic.bumped_at).to eq_time(@original_bumped_at)
           expect(topic.moderator_posts_count).to eq(1)
           expect(topic.topic_timers.first).to eq(nil)
         end
@@ -1473,6 +1473,8 @@ describe Topic do
           end
 
           it 'should set a topic timer' do
+            freeze_time
+
             expect { topic.change_category_to_id(new_category.id) }
               .to change { TopicTimer.count }.by(1)
 
@@ -1481,7 +1483,7 @@ describe Topic do
             topic_timer = TopicTimer.last
 
             expect(topic_timer.topic).to eq(topic)
-            expect(topic_timer.execute_at).to be_within(1.second).of(Time.zone.now + 5.hours)
+            expect(topic_timer.execute_at).to eq_time(5.hours.from_now)
           end
 
           describe 'when topic is already closed' do
@@ -1506,11 +1508,8 @@ describe Topic do
               topic.change_category_to_id(new_category.id)
 
               expect(topic.reload.category).to eq(new_category)
-
               expect(topic.public_topic_timer).to eq(topic_timer)
-
-              expect(topic.public_topic_timer.execute_at)
-                .to be_within(1.second).of(topic_timer.execute_at)
+              expect(topic.public_topic_timer.execute_at).to eq_time(topic_timer.execute_at)
             end
           end
         end
@@ -1628,32 +1627,32 @@ describe Topic do
       freeze_time now
 
       topic.set_or_create_timer(TopicTimer.types[:close], 72, by_user: admin)
-      expect(topic.topic_timers.first.execute_at).to eq(3.days.from_now)
+      expect(topic.topic_timers.first.execute_at).to eq_time(3.days.from_now)
     end
 
     it 'can take a number of hours as a string' do
       freeze_time now
       topic.set_or_create_timer(TopicTimer.types[:close], '18', by_user: admin)
-      expect(topic.topic_timers.first.execute_at).to eq(18.hours.from_now)
+      expect(topic.topic_timers.first.execute_at).to eq_time(18.hours.from_now)
     end
 
     it 'can take a number of hours as a string and can handle based on last post' do
       freeze_time now
       topic.set_or_create_timer(TopicTimer.types[:close], '18', by_user: admin, based_on_last_post: true)
-      expect(topic.topic_timers.first.execute_at).to eq(18.hours.from_now)
+      expect(topic.topic_timers.first.execute_at).to eq_time(18.hours.from_now)
     end
 
     it "can take a timestamp for a future time" do
       freeze_time now
       topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-22 5:00', by_user: admin)
-      expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013, 11, 22, 5, 0))
+      expect(topic.topic_timers.first.execute_at).to eq_time(Time.zone.local(2013, 11, 22, 5, 0))
     end
 
     it "sets a validation error when given a timestamp in the past" do
       freeze_time now
       topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-19 5:00', by_user: admin)
 
-      expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013, 11, 19, 5, 0))
+      expect(topic.topic_timers.first.execute_at).to eq_time(Time.zone.local(2013, 11, 19, 5, 0))
       expect(topic.topic_timers.first.errors[:execute_at]).to be_present
     end
 
@@ -1672,7 +1671,7 @@ describe Topic do
     it "can take a timestamp with timezone" do
       freeze_time now
       topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-25T01:35:00-08:00', by_user: admin)
-      expect(topic.topic_timers.first.execute_at).to eq(Time.utc(2013, 11, 25, 9, 35))
+      expect(topic.topic_timers.first.execute_at).to eq_time(Time.utc(2013, 11, 25, 9, 35))
     end
 
     it 'sets topic status update user to given user if it is a staff or TL4 user' do
@@ -1716,7 +1715,7 @@ describe Topic do
     it 'updates topic status update execute_at if it was already set to close' do
       freeze_time now
       closing_topic.set_or_create_timer(TopicTimer.types[:close], 48)
-      expect(closing_topic.reload.public_topic_timer.execute_at).to eq(2.days.from_now)
+      expect(closing_topic.reload.public_topic_timer.execute_at).to eq_time(2.days.from_now)
     end
 
     it 'should not delete topic_timer of another status_type' do
@@ -1735,7 +1734,7 @@ describe Topic do
         TopicTimer.types[:publish_to_category], 72, by_user: admin
       )
 
-      expect(topic_timer.execute_at).to eq(3.days.from_now)
+      expect(topic_timer.execute_at).to eq_time(3.days.from_now)
     end
 
     it "does not update topic's topic status created_at it was already set to close" do
@@ -1792,7 +1791,7 @@ describe Topic do
           topic.set_or_create_timer(TopicTimer.types[:reminder], 11, by_user: admin)
         }.to_not change { TopicTimer.count }
         reminder.reload
-        expect(reminder.execute_at).to eq(11.hours.from_now)
+        expect(reminder.execute_at).to eq_time(11.hours.from_now)
       end
     end
   end
@@ -1810,19 +1809,19 @@ describe Topic do
       end
 
       it "doesn't return category topics" do
-        Fabricate(:category_with_definition)
+        Fabricate(:category_with_definition, created_at: 1.minute.ago)
         expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
       end
 
       it "returns regular topics" do
-        topic = Fabricate(:topic)
+        topic = Fabricate(:topic, created_at: 1.minute.ago)
         expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to eq([topic])
       end
 
       it "doesn't return topics from muted categories" do
         user = Fabricate(:user)
-        category = Fabricate(:category_with_definition)
-        Fabricate(:topic, category: category)
+        category = Fabricate(:category_with_definition, created_at: 2.minutes.ago)
+        Fabricate(:topic, category: category, created_at: 1.minute.ago)
 
         CategoryUser.set_notification_level_for_category(user, CategoryUser.notification_levels[:muted], category.id)
 
@@ -1830,7 +1829,7 @@ describe Topic do
       end
 
       it "doesn't return topics that a user has muted" do
-        topic = Fabricate(:topic)
+        topic = Fabricate(:topic, created_at: 1.minute.ago)
         user = Fabricate(:user)
 
         Fabricate(:topic_user,
@@ -1844,8 +1843,8 @@ describe Topic do
 
       it "doesn't return topics from suppressed categories" do
         user = Fabricate(:user)
-        category = Fabricate(:category_with_definition)
-        Fabricate(:topic, category: category)
+        category = Fabricate(:category_with_definition, created_at: 2.minutes.ago)
+        Fabricate(:topic, category: category, created_at: 1.minute.ago)
 
         SiteSetting.digest_suppress_categories = "#{category.id}"
 
@@ -1854,20 +1853,20 @@ describe Topic do
 
       it "doesn't return topics from TL0 users" do
         new_user = Fabricate(:user, trust_level: 0)
-        Fabricate(:topic, user: new_user)
+        Fabricate(:topic, user: new_user, created_at: 1.minute.ago)
         expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
       end
 
       it "returns topics from TL0 users if given include_tl0" do
         new_user = Fabricate(:user, trust_level: 0)
-        topic = Fabricate(:topic, user_id: new_user.id)
+        topic = Fabricate(:topic, user_id: new_user.id, created_at: 1.minute.ago)
 
         expect(Topic.for_digest(user, 1.year.ago, top_order: true, include_tl0: true)).to eq([topic])
       end
 
       it "returns topics from TL0 users if enabled in preferences" do
         new_user = Fabricate(:user, trust_level: 0)
-        topic = Fabricate(:topic, user: new_user)
+        topic = Fabricate(:topic, user: new_user, created_at: 1.minute.ago)
 
         u = Fabricate(:user)
         u.user_option.include_tl0_in_digests = true
@@ -1879,7 +1878,7 @@ describe Topic do
         user = Fabricate(:user)
         tag = Fabricate(:tag)
         TagUser.change(user.id, tag.id, TagUser.notification_levels[:muted])
-        Fabricate(:topic, tags: [tag])
+        Fabricate(:topic, tags: [tag], created_at: 1.minute.ago)
 
         expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
       end
@@ -1888,7 +1887,7 @@ describe Topic do
         user = Fabricate(:user)
         muted_tag, other_tag = Fabricate(:tag), Fabricate(:tag)
         TagUser.change(user.id, muted_tag.id, TagUser.notification_levels[:muted])
-        topic = Fabricate(:topic, tags: [muted_tag, other_tag])
+        topic = Fabricate(:topic, tags: [muted_tag, other_tag], created_at: 1.minute.ago)
 
         expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to eq([topic])
       end
@@ -1897,32 +1896,34 @@ describe Topic do
         user = Fabricate(:user)
         muted_tag = Fabricate(:tag)
         TagUser.change(user.id, muted_tag.id, TagUser.notification_levels[:muted])
-        _topic1 = Fabricate(:topic, tags: [muted_tag])
-        topic2 = Fabricate(:topic, tags: [Fabricate(:tag), Fabricate(:tag)])
-        topic3 = Fabricate(:topic)
-
+        _topic1 = Fabricate(:topic, tags: [muted_tag], created_at: 1.minute.ago)
+        topic2 = Fabricate(:topic, tags: [Fabricate(:tag), Fabricate(:tag)], created_at: 1.minute.ago)
+        topic3 = Fabricate(:topic, created_at: 1.minute.ago)
         topics = Topic.for_digest(user, 1.year.ago, top_order: true)
+
         expect(topics.size).to eq(2)
         expect(topics).to contain_exactly(topic2, topic3)
       end
 
       it "sorts by category notification levels" do
-        category1, category2 = Fabricate(:category_with_definition), Fabricate(:category_with_definition)
-        2.times { |i| Fabricate(:topic, category: category1) }
-        topic1 = Fabricate(:topic, category: category2)
-        2.times { |i| Fabricate(:topic, category: category1) }
+        category1, category2 = Fabricate(:category_with_definition), Fabricate(:category_with_definition, created_at: 2.minutes.ago)
+        2.times { |i| Fabricate(:topic, category: category1, created_at: 1.minute.ago) }
+        topic1 = Fabricate(:topic, category: category2, created_at: 1.minute.ago)
+        2.times { |i| Fabricate(:topic, category: category1, created_at: 1.minute.ago) }
         CategoryUser.create(user: user, category: category2, notification_level: CategoryUser.notification_levels[:watching])
         for_digest = Topic.for_digest(user, 1.year.ago, top_order: true)
+
         expect(for_digest.first).to eq(topic1)
       end
 
       it "sorts by topic notification levels" do
         topics = []
-        3.times { |i| topics << Fabricate(:topic) }
+        3.times { |i| topics << Fabricate(:topic, created_at: 1.minute.ago) }
         user = Fabricate(:user)
         TopicUser.create(user_id: user.id, topic_id: topics[0].id, notification_level: TopicUser.notification_levels[:tracking])
         TopicUser.create(user_id: user.id, topic_id: topics[2].id, notification_level: TopicUser.notification_levels[:watching])
         for_digest = Topic.for_digest(user, 1.year.ago, top_order: true).pluck(:id)
+
         expect(for_digest).to eq([topics[2].id, topics[0].id, topics[1].id])
       end
     end
@@ -2090,7 +2091,7 @@ describe Topic do
       topic_embed = TopicEmbed.create!(topic_id: topic.id, embed_url: "https://blog.codinghorror.com/password-rules-are-bullshit", post_id: post.id, deleted_at: 1.day.ago)
       topic.recover!
       topic_embed.reload
-      expect(topic_embed.deleted_at).to eq(nil)
+      expect(topic_embed.deleted_at).to be_nil
     end
   end
 
@@ -2256,7 +2257,6 @@ describe Topic do
   end
 
   it 'allows users to normalize counts' do
-
     topic = Fabricate(:topic, last_posted_at: 1.year.ago)
     post1 = Fabricate(:post, topic: topic, post_number: 1)
     post2 = Fabricate(:post, topic: topic, post_type: Post.types[:whisper], post_number: 2)
@@ -2267,7 +2267,7 @@ describe Topic do
     expect(topic.posts_count).to eq(1)
     expect(topic.highest_post_number).to eq(post1.post_number)
     expect(topic.highest_staff_post_number).to eq(post2.post_number)
-    expect(topic.last_posted_at).to be_within(1.second).of (post1.created_at)
+    expect(topic.last_posted_at).to eq_time(post1.created_at)
   end
 
   context 'featured link' do
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index e19c696eb7..a68239512d 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/spec/models/topic_tracking_state_spec.rb
@@ -458,6 +458,7 @@ describe TopicTrackingState do
   end
 
   it "correctly handles seen categories" do
+    freeze_time 1.minute.ago
     user = Fabricate(:user)
     post
 
@@ -473,6 +474,7 @@ describe TopicTrackingState do
     report = TopicTrackingState.report(user)
     expect(report.length).to eq(0)
 
+    unfreeze_time
     post.topic.touch(:created_at)
 
     report = TopicTrackingState.report(user)
diff --git a/spec/models/user_action_spec.rb b/spec/models/user_action_spec.rb
index de0e3f1cdc..f4485f1c4c 100644
--- a/spec/models/user_action_spec.rb
+++ b/spec/models/user_action_spec.rb
@@ -226,22 +226,19 @@ describe UserAction do
   end
 
   describe 'when a user posts a new topic' do
-    def process_alerts(post)
-      PostAlerter.post_created(post)
-    end
-
     before do
-      @post = create_post(created_at: DateTime.now - 100)
-      process_alerts(@post)
+      freeze_time(100.days.ago) do
+        @post = create_post
+        PostAlerter.post_created(@post)
+      end
     end
 
     describe 'topic action' do
-      before do
-        @action = @post.user.user_actions.find_by(action_type: UserAction::NEW_TOPIC)
-      end
       it 'should exist' do
+        @action = @post.user.user_actions.find_by(action_type: UserAction::NEW_TOPIC)
+
         expect(@action).not_to eq(nil)
-        expect(@action.created_at).to be_within(1).of(@post.topic.created_at)
+        expect(@action.created_at).to eq_time(@post.topic.created_at)
       end
     end
 
@@ -256,7 +253,7 @@ describe UserAction do
 
         @response = PostCreator.new(@other_user, reply_to_post_number: 1, topic_id: @post.topic_id, raw: "perhaps @#{@mentioned.username} knows how this works?").create
 
-        process_alerts(@response)
+        PostAlerter.post_created(@response)
       end
 
       it 'should log user actions correctly' do
diff --git a/spec/models/user_auth_token_spec.rb b/spec/models/user_auth_token_spec.rb
index e9d17c84ec..27448880b4 100644
--- a/spec/models/user_auth_token_spec.rb
+++ b/spec/models/user_auth_token_spec.rb
@@ -83,23 +83,21 @@ describe UserAuthToken do
   end
 
   it "expires correctly" do
-
+    freeze_time Time.zone.now
     user = Fabricate(:user)
-
     user_token = UserAuthToken.generate!(user_id: user.id,
                                          user_agent: "some user agent 2",
                                          client_ip: "1.1.2.3")
 
     UserAuthToken.lookup(user_token.unhashed_auth_token, seen: true)
 
-    freeze_time (SiteSetting.maximum_session_age.hours - 1).from_now
+    freeze_time SiteSetting.maximum_session_age.hours.from_now - 1.second
 
     user_token.reload
-
     user_token.rotate!
     UserAuthToken.lookup(user_token.unhashed_auth_token, seen: true)
 
-    freeze_time (SiteSetting.maximum_session_age.hours - 1).from_now
+    freeze_time SiteSetting.maximum_session_age.hours.from_now - 1.second
 
     still_good = UserAuthToken.lookup(user_token.unhashed_auth_token, seen: true)
     expect(still_good).not_to eq(nil)
@@ -111,7 +109,7 @@ describe UserAuthToken do
   end
 
   it "can properly rotate tokens" do
-
+    freeze_time 3.days.ago
     user = Fabricate(:user)
 
     user_token = UserAuthToken.generate!(user_id: user.id,
@@ -126,12 +124,14 @@ describe UserAuthToken do
 
     user_token.update_columns(auth_token_seen: true)
 
+    rotation_time = freeze_time 1.day.from_now
+
     rotated = user_token.rotate!(user_agent: "a new user agent", client_ip: "1.1.2.4")
     expect(rotated).to eq(true)
 
     user_token.reload
 
-    expect(user_token.rotated_at).to be_within(5.second).of(Time.zone.now)
+    expect(user_token.rotated_at).to eq_time(rotation_time)
     expect(user_token.client_ip).to eq("1.1.2.4")
     expect(user_token.user_agent).to eq("a new user agent")
     expect(user_token.auth_token_seen).to eq(false)
@@ -139,17 +139,17 @@ describe UserAuthToken do
     expect(user_token.prev_auth_token).to eq(prev_auth_token)
 
     # ability to auth using an old token
-    freeze_time
+    seen_at = freeze_time 1.day.from_now
 
     looked_up = UserAuthToken.lookup(user_token.unhashed_auth_token, seen: true)
     expect(looked_up.id).to eq(user_token.id)
     expect(looked_up.auth_token_seen).to eq(true)
-    expect(looked_up.seen_at).to be_within(1.second).of(Time.zone.now)
+    expect(looked_up.seen_at).to eq_time(seen_at)
 
     looked_up = UserAuthToken.lookup(unhashed_prev, seen: true)
     expect(looked_up.id).to eq(user_token.id)
 
-    freeze_time(2.minute.from_now)
+    freeze_time 2.minutes.from_now
 
     looked_up = UserAuthToken.lookup(unhashed_prev)
     expect(looked_up).not_to eq(nil)
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d23451fcfa..ef6b64d511 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -863,7 +863,6 @@ describe User do
   end
 
   describe "previous_visit_at" do
-
     let(:user) { Fabricate(:user) }
     let!(:first_visit_date) { Time.zone.now }
     let!(:second_visit_date) { 2.hours.from_now }
@@ -889,36 +888,36 @@ describe User do
       # second visit
       user.update_last_seen!(second_visit_date)
       user.reload
-      expect(user.previous_visit_at).to be_within_one_second_of(first_visit_date)
+      expect(user.previous_visit_at).to eq_time(first_visit_date)
 
       # third visit
       user.update_last_seen!(third_visit_date)
       user.reload
-      expect(user.previous_visit_at).to be_within_one_second_of(second_visit_date)
+      expect(user.previous_visit_at).to eq_time(second_visit_date)
     end
 
   end
 
   describe "update_last_seen!" do
-    let (:user) { Fabricate(:user) }
+    let(:user) { Fabricate(:user) }
     let!(:first_visit_date) { Time.zone.now }
     let!(:second_visit_date) { 2.hours.from_now }
 
     it "should update the last seen value" do
       expect(user.last_seen_at).to eq nil
       user.update_last_seen!(first_visit_date)
-      expect(user.reload.last_seen_at).to be_within_one_second_of(first_visit_date)
+      expect(user.reload.last_seen_at).to eq_time(first_visit_date)
     end
 
     it "should update the first seen value if it doesn't exist" do
       user.update_last_seen!(first_visit_date)
-      expect(user.reload.first_seen_at).to be_within_one_second_of(first_visit_date)
+      expect(user.reload.first_seen_at).to eq_time(first_visit_date)
     end
 
     it "should not update the first seen value if it doesn't exist" do
       user.update_last_seen!(first_visit_date)
       user.update_last_seen!(second_visit_date)
-      expect(user.reload.first_seen_at).to be_within_one_second_of(first_visit_date)
+      expect(user.reload.first_seen_at).to eq_time(first_visit_date)
     end
   end
 
@@ -976,58 +975,51 @@ describe User do
     end
 
     describe 'with no previous values' do
-      let!(:date) { Time.zone.now }
-
-      before do
-        freeze_time date
-        user.update_last_seen!
-      end
-
       after do
         Discourse.redis.flushall
       end
 
       it "updates last_seen_at" do
-        expect(user.last_seen_at).to be_within_one_second_of(date)
+        date = freeze_time
+        user.update_last_seen!
+
+        expect(user.last_seen_at).to eq_time(date)
       end
 
       it "should have 0 for days_visited" do
+        user.update_last_seen!
         user.reload
+
         expect(user.user_stat.days_visited).to eq(1)
       end
 
       it "should log a user_visit with the date" do
-        expect(user.user_visits.first.visited_at).to eq(date.to_date)
+        date = freeze_time
+        user.update_last_seen!
+
+        expect(user.user_visits.first.visited_at).to eq_time(date.to_date)
       end
 
       context "called twice" do
-
-        before do
-          freeze_time date
+        it "doesn't increase days_visited twice" do
+          freeze_time
           user.update_last_seen!
           user.update_last_seen!
           user.reload
-        end
 
-        it "doesn't increase days_visited twice" do
           expect(user.user_stat.days_visited).to eq(1)
         end
-
       end
 
       describe "after 3 days" do
-        let!(:future_date) { 3.days.from_now }
-
-        before do
-          freeze_time future_date
-          user.update_last_seen!
-        end
-
         it "should log a second visited_at record when we log an update later" do
+          user.update_last_seen!
+          future_date = freeze_time(3.days.from_now)
+          user.update_last_seen!
+
           expect(user.user_visits.count).to eq(2)
         end
       end
-
     end
   end
 
diff --git a/spec/models/user_stat_spec.rb b/spec/models/user_stat_spec.rb
index d5c563770a..946e0fe3a1 100644
--- a/spec/models/user_stat_spec.rb
+++ b/spec/models/user_stat_spec.rb
@@ -86,7 +86,7 @@ describe UserStat do
       UserStat.ensure_consistency!
 
       post.user.user_stat.reload
-      expect(post.user.user_stat.first_unread_at).to eq_time(Time.now)
+      expect(post.user.user_stat.first_unread_at).to eq_time(Time.zone.now)
     end
   end
 
diff --git a/spec/models/watched_word_spec.rb b/spec/models/watched_word_spec.rb
index 31d4f2fae6..e58a9432b6 100644
--- a/spec/models/watched_word_spec.rb
+++ b/spec/models/watched_word_spec.rb
@@ -71,7 +71,7 @@ describe WatchedWord do
       expect {
         w = described_class.create_or_update_word(word: existing.word, action_key: :flag)
         expect(w.id).to eq(existing.id)
-        expect(w.updated_at).to eq(w.updated_at)
+        expect(w.updated_at).to eq_time(w.updated_at)
       }.to_not change { described_class.count }
     end
 
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 447a08d681..4bc237ab27 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -353,6 +353,8 @@ def freeze_time(now = Time.now)
     ensure
       unfreeze_time
     end
+  else
+    time
   end
 end
 
diff --git a/spec/requests/admin/email_controller_spec.rb b/spec/requests/admin/email_controller_spec.rb
index 9b6a77b8ce..eb632bcbe1 100644
--- a/spec/requests/admin/email_controller_spec.rb
+++ b/spec/requests/admin/email_controller_spec.rb
@@ -90,8 +90,8 @@ describe Admin::EmailController do
 
   describe '#skipped' do
     fab!(:user) { Fabricate(:user) }
-    fab!(:log1) { Fabricate(:skipped_email_log, user: user) }
-    fab!(:log2) { Fabricate(:skipped_email_log) }
+    fab!(:log1) { Fabricate(:skipped_email_log, user: user, created_at: 20.minutes.ago) }
+    fab!(:log2) { Fabricate(:skipped_email_log, created_at: 10.minutes.ago) }
 
     it "succeeds" do
       get "/admin/email/skipped.json"
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index fa07869b54..e6326ccc56 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -1367,7 +1367,7 @@ describe GroupsController do
 
           expect(response.status).to eq(200)
 
-          result = JSON.parse(response.body)["logs"].last
+          result = JSON.parse(response.body)["logs"].find { |entry| entry["subject"] == "public_exit" }
 
           expect(result["action"]).to eq(GroupHistory.actions[1].to_s)
           expect(result["subject"]).to eq('public_exit')
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 59042ed8e8..dd3afa7cf0 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -415,12 +415,14 @@ describe PostsController do
       end
 
       it "won't update bump date if post is a whisper" do
+        created_at = freeze_time 1.day.ago
         post = Fabricate(:post, post_type: Post.types[:whisper], user: user)
 
+        unfreeze_time
         put "/posts/#{post.id}.json", params: update_params
-        expect(response.status).to eq(200)
 
-        expect(post.topic.reload.bumped_at).to be < post.created_at
+        expect(response.status).to eq(200)
+        expect(post.topic.reload.bumped_at).to eq_time(created_at)
       end
     end
 
@@ -1314,10 +1316,10 @@ describe PostsController do
 
     context "topic bump" do
       shared_examples "it works" do
-        let(:original_bumped_at) { 1.day.ago }
-        let!(:topic) { Fabricate(:topic, bumped_at: original_bumped_at) }
-
         it "should be able to skip topic bumping" do
+          original_bumped_at = 1.day.ago
+          topic = Fabricate(:topic, bumped_at: original_bumped_at)
+
           post "/posts.json", params: {
             raw: 'this is the test content',
             topic_id: topic.id,
@@ -1325,7 +1327,7 @@ describe PostsController do
           }
 
           expect(response.status).to eq(200)
-          expect(topic.reload.bumped_at).to be_within_one_second_of(original_bumped_at)
+          expect(topic.reload.bumped_at).to eq_time(original_bumped_at)
         end
 
         it "should be able to post with topic bumping" do
@@ -1335,7 +1337,7 @@ describe PostsController do
           }
 
           expect(response.status).to eq(200)
-          expect(topic.reload.bumped_at).to eq(topic.posts.last.created_at)
+          expect(topic.reload.bumped_at).to eq_time(topic.posts.last.created_at)
         end
       end
 
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index bb570a8674..481de344e4 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -577,7 +577,11 @@ RSpec.describe TopicsController do
     end
 
     describe 'changing timestamps' do
-      before { sign_in(moderator) }
+      before do
+        freeze_time
+        sign_in(moderator)
+      end
+
       let(:old_timestamp) { Time.zone.now }
       let(:new_timestamp) { old_timestamp - 1.day }
       let!(:topic) { Fabricate(:topic, created_at: old_timestamp) }
@@ -594,9 +598,9 @@ RSpec.describe TopicsController do
         }
 
         expect(response.status).to eq(200)
-        expect(topic.reload.created_at).to be_within_one_second_of(new_timestamp)
-        expect(p1.reload.created_at).to be_within_one_second_of(new_timestamp)
-        expect(p2.reload.created_at).to be_within_one_second_of(old_timestamp)
+        expect(topic.reload.created_at).to eq_time(new_timestamp)
+        expect(p1.reload.created_at).to eq_time(new_timestamp)
+        expect(p2.reload.created_at).to eq_time(old_timestamp)
       end
 
       it 'should create a staff log entry' do
@@ -713,7 +717,6 @@ RSpec.describe TopicsController do
     end
 
     context 'for last post only' do
-
       it 'should allow you to retain topic timing but remove last post only' do
         freeze_time
 
@@ -777,9 +780,7 @@ RSpec.describe TopicsController do
 
         expect(PostTiming.where(topic: topic, user: user, post_number: 1).exists?).to eq(false)
         expect(TopicUser.where(topic: topic, user: user, last_read_post_number: nil, highest_seen_post_number: nil).exists?).to eq(true)
-
       end
-
     end
 
     context 'when logged in' do
@@ -1694,7 +1695,7 @@ RSpec.describe TopicsController do
       sign_in(user)
       get "/t/#{topic.slug}/#{topic.id}"
       topic_user = TopicUser.where(user: user, topic: topic).first
-      expect(topic_user.last_visited_at).to eq(topic_user.first_visited_at)
+      expect(topic_user.last_visited_at).to eq_time(topic_user.first_visited_at)
     end
 
     context 'consider for a promotion' do
@@ -2072,6 +2073,10 @@ RSpec.describe TopicsController do
     let(:post) { Fabricate(:post) }
     let(:topic) { post.topic }
 
+    after do
+      Discourse.redis.flushall
+    end
+
     it 'returns first post of the topic' do
       # we need one for suggested
       create_post
@@ -2594,6 +2599,7 @@ RSpec.describe TopicsController do
 
     context 'when logged in as an admin' do
       before do
+        freeze_time
         sign_in(admin)
       end
 
@@ -2608,14 +2614,12 @@ RSpec.describe TopicsController do
         topic_status_update = TopicTimer.last
 
         expect(topic_status_update.topic).to eq(topic)
-
-        expect(topic_status_update.execute_at)
-          .to be_within(1.second).of(24.hours.from_now)
+        expect(topic_status_update.execute_at).to eq_time(24.hours.from_now)
 
         json = JSON.parse(response.body)
 
         expect(DateTime.parse(json['execute_at']))
-          .to be_within(1.seconds).of(DateTime.parse(topic_status_update.execute_at.to_s))
+          .to eq_time(DateTime.parse(topic_status_update.execute_at.to_s))
 
         expect(json['duration']).to eq(topic_status_update.duration)
         expect(json['closed']).to eq(topic.reload.closed)
@@ -2652,10 +2656,7 @@ RSpec.describe TopicsController do
           topic_status_update = TopicTimer.last
 
           expect(topic_status_update.topic).to eq(topic)
-
-          expect(topic_status_update.execute_at)
-            .to be_within(1.second).of(24.hours.from_now)
-
+          expect(topic_status_update.execute_at).to eq_time(24.hours.from_now)
           expect(topic_status_update.status_type)
             .to eq(TopicTimer.types[:publish_to_category])
 
@@ -3134,7 +3135,7 @@ RSpec.describe TopicsController do
 
         put "/t/#{topic.id}/reset-bump-date.json"
         expect(response.status).to eq(200)
-        expect(topic.reload.bumped_at).to be_within_one_second_of(timestamp)
+        expect(topic.reload.bumped_at).to eq_time(timestamp)
       end
     end
   end
diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb
index 6bfd968e4c..362e03dff3 100644
--- a/spec/services/badge_granter_spec.rb
+++ b/spec/services/badge_granter_spec.rb
@@ -119,21 +119,19 @@ describe BadgeGranter do
   describe 'grant' do
 
     it 'allows overriding of granted_at does not notify old bronze' do
+      freeze_time
       badge = Badge.create!(name: 'a badge', badge_type_id: BadgeType::Bronze)
+      user_badge = BadgeGranter.grant(badge, user, created_at: 1.year.ago)
 
-      time = 1.year.ago
-
-      user_badge = BadgeGranter.grant(badge, user, created_at: time)
-
-      expect(user_badge.granted_at).to eq(time)
+      expect(user_badge.granted_at).to eq_time(1.year.ago)
       expect(Notification.where(user_id: user.id).count).to eq(0)
     end
 
     it "doesn't grant disabled badges" do
+      freeze_time
       badge = Fabricate(:badge, badge_type_id: BadgeType::Bronze, enabled: false)
-      time = 1.year.ago
 
-      user_badge = BadgeGranter.grant(badge, user, created_at: time)
+      user_badge = BadgeGranter.grant(badge, user, created_at: 1.year.ago)
       expect(user_badge).to eq(nil)
     end
 
@@ -147,11 +145,10 @@ describe BadgeGranter do
     end
 
     it 'sets granted_at' do
-      time = 1.day.ago
-      freeze_time time
-
+      day_ago = freeze_time 1.day.ago
       user_badge = BadgeGranter.grant(badge, user)
-      expect(user_badge.granted_at).to be_within(1.second).of(time)
+
+      expect(user_badge.granted_at).to eq_time(day_ago)
     end
 
     it 'sets granted_by if the option is present' do
@@ -228,7 +225,6 @@ describe BadgeGranter do
   describe 'revoke_all' do
     it 'deletes every user_badge record associated with that badge' do
       described_class.grant(badge, user)
-
       described_class.revoke_all(badge)
 
       expect(UserBadge.exists?(badge: badge, user: user)).to eq(false)
diff --git a/spec/services/post_owner_changer_spec.rb b/spec/services/post_owner_changer_spec.rb
index b32a0ed0b0..1cee8eeae9 100644
--- a/spec/services/post_owner_changer_spec.rb
+++ b/spec/services/post_owner_changer_spec.rb
@@ -23,16 +23,17 @@ describe PostOwnerChanger do
     end
 
     it "changes the user" do
-      bumped_at = topic.bumped_at
+      bumped_at = freeze_time topic.bumped_at
 
       old_user = p1.user
       PostActionCreator.like(user_a, p1)
       p1.reload
       expect(p1.topic.like_count).to eq(1)
+
       PostOwnerChanger.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
       p1.reload
       expect(p1.topic.like_count).to eq(0)
-      expect(p1.topic.bumped_at).to be_within(1.second).of (bumped_at)
+      expect(p1.topic.bumped_at).to eq_time(bumped_at)
       expect(p1.topic.last_post_user_id).to eq(user_a.id)
       expect(old_user).not_to eq(p1.user)
       expect(p1.user).to eq(user_a)
diff --git a/spec/services/topic_timestamp_changer_spec.rb b/spec/services/topic_timestamp_changer_spec.rb
index 887aa71bfe..c94cecfb92 100644
--- a/spec/services/topic_timestamp_changer_spec.rb
+++ b/spec/services/topic_timestamp_changer_spec.rb
@@ -26,39 +26,32 @@ describe TopicTimestampChanger do
         TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
 
         topic.reload
-        [:created_at, :updated_at, :bumped_at].each do |column|
-          expect(topic.public_send(column)).to be_within(1.second).of(new_timestamp)
-        end
+        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)
 
         p1.reload
-        [:created_at, :updated_at].each do |column|
-          expect(p1.public_send(column)).to be_within(1.second).of(new_timestamp)
-        end
+        expect(p1.created_at).to eq_time(new_timestamp)
+        expect(p1.updated_at).to eq_time(new_timestamp)
 
         p2.reload
-        [:created_at, :updated_at].each do |column|
-          expect(p2.public_send(column)).to be_within(1.second).of(new_timestamp + 1.day)
-        end
+        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 be_within(1.second).of(p2.reload.created_at)
+        expect(topic.last_posted_at).to eq_time(p2.reload.created_at)
       end
 
       describe 'when posts have timestamps in the future' do
-        let(:new_timestamp) { Time.zone.now }
-        let(:p3) { Fabricate(:post, topic: topic, created_at: new_timestamp + 3.day) }
-
         it 'should set the new timestamp as the default timestamp' do
-          freeze_time
-
-          p3
+          new_timestamp = freeze_time
 
+          p3 = Fabricate(:post, topic: topic, created_at: new_timestamp + 3.days)
           TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
 
           p3.reload
 
-          [:created_at, :updated_at].each do |column|
-            expect(p3.public_send(column)).to be_within(1.second).of(new_timestamp)
-          end
+          expect(p3.created_at).to eq_time(new_timestamp)
+          expect(p3.updated_at).to eq_time(new_timestamp)
         end
       end
     end
diff --git a/spec/services/user_activator_spec.rb b/spec/services/user_activator_spec.rb
index 9678fb5703..5172843319 100644
--- a/spec/services/user_activator_spec.rb
+++ b/spec/services/user_activator_spec.rb
@@ -16,6 +16,8 @@ describe UserActivator do
     end
 
     it 'creates and send new email token if the existing token expired' do
+      now = freeze_time
+
       SiteSetting.email_token_valid_hours = 24
       user = Fabricate(:user)
       email_token = user.email_tokens.first
@@ -27,7 +29,7 @@ describe UserActivator do
       activator.activate
 
       user.reload
-      expect(user.email_tokens.last.created_at).to be_within_one_second_of(Time.zone.now)
+      expect(user.email_tokens.last.created_at).to eq_time(now)
     end
 
   end

From 6fb4c333b035586c884a789bf225c7ab3d23e61e Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Tue, 10 Mar 2020 15:25:00 -0600
Subject: [PATCH 0156/1830] FIX: Throw error when removing a user from group
 fails (#9162)

This commit ensures that an error is thrown when a user fails to be
removed from a group instead of silently failing.

This means when using the api you will receive a 400 instead of a 200 if
there is a failure. The remove group endpoint allows the removal of
multiple users, this change means that if you try to delete 10 users,
but 1 of them fails you will receive a 400 instead of 200 even though
the other 9 were removed successfully. Rather than adding a bunch more
complexity I think this is more than adequate for most use cases.
---
 app/controllers/groups_controller.rb         |  8 +++++---
 app/models/group.rb                          |  4 +++-
 spec/requests/admin/users_controller_spec.rb |  5 +++--
 spec/requests/groups_controller_spec.rb      | 13 ++++++++-----
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index dc7f226110..126d0910af 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -398,14 +398,16 @@ class GroupsController < ApplicationController
     end
 
     users.each do |user|
-      group.remove(user)
-      GroupActionLogger.new(current_user, group).log_remove_user_from_group(user)
+      if group.remove(user)
+        GroupActionLogger.new(current_user, group).log_remove_user_from_group(user)
+      else
+        raise Discourse::InvalidParameters
+      end
     end
 
     render json: success_json.merge!(
       usernames: users.map(&:username)
     )
-
   end
 
   def request_membership
diff --git a/app/models/group.rb b/app/models/group.rb
index 497333b4fa..0f8f3d82d4 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -644,9 +644,11 @@ class Group < ActiveRecord::Base
   end
 
   def remove(user)
-    self.group_users.where(user: user).each(&:destroy)
+    result = self.group_users.where(user: user).each(&:destroy)
+    return false if result.blank?
     user.update_columns(primary_group_id: nil) if user.primary_group_id == self.id
     DiscourseEvent.trigger(:user_removed_from_group, user, self)
+    true
   end
 
   def add_owner(user)
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index 92b79ce27f..fd82b1d1d9 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -347,8 +347,9 @@ RSpec.describe Admin::UsersController do
 
   describe '#remove_group' do
     it "also clears the user's primary group" do
-      g = Fabricate(:group)
-      u = Fabricate(:user, primary_group: g)
+      u = Fabricate(:user)
+      g = Fabricate(:group, users: [u])
+      u.update!(primary_group_id: g.id)
       delete "/admin/users/#{u.id}/groups/#{g.id}.json"
 
       expect(response.status).to eq(200)
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index e6326ccc56..f26f2483ee 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -1192,6 +1192,11 @@ describe GroupsController do
         expect(response.status).to eq(400)
       end
 
+      it "raises an error when removing a valid user but is not a member of that group" do
+        delete "/groups/#{group.id}/members.json", params: { user_id: -1 }
+        expect(response.status).to eq(400)
+      end
+
       context "is able to remove a member" do
         it "removes by id" do
           expect do
@@ -1314,12 +1319,10 @@ describe GroupsController do
           end
 
           it "only removes users in that group" do
-            expect do
-              delete "/groups/#{group1.id}/members.json",
-                params: { usernames: [user.username, user2.username].join(",") }
-            end.to change { group1.users.count }.by(-1)
+            delete "/groups/#{group1.id}/members.json",
+              params: { usernames: [user.username, user2.username].join(",") }
 
-            expect(response.status).to eq(200)
+            expect(response.status).to eq(400)
           end
         end
       end

From 4e5dd4105c7d7d77e83e16c3d8ef9da1b03c8414 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 10 Mar 2020 23:22:26 +0100
Subject: [PATCH 0157/1830] DEV: Fix flaky `signed_url_for_path` spec

AWS gem uses internally `Time.now` to generate the presigned URLs, so often two consecutive calls with the same params would give different results.
---
 spec/requests/uploads_controller_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index 2f3333cacd..55139f9d05 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -386,6 +386,7 @@ describe UploadsController do
         end
 
         it "redirects to the signed_url_for_path" do
+          freeze_time
           get upload.short_path
 
           expect(response).to redirect_to(Discourse.store.signed_url_for_path(Discourse.store.get_path_for_upload(upload)))

From e848d9878285a206a04725a9e21480194e701a5c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 00:58:46 +0100
Subject: [PATCH 0158/1830] FIX: ensures category exists for hideParent in
 categoryBadgeHTML (#9161)

---
 .../javascripts/select-kit/components/category-chooser.js.es6   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/category-chooser.js.es6 b/app/assets/javascripts/select-kit/components/category-chooser.js.es6
index d929bfac3e..76c47a6a18 100644
--- a/app/assets/javascripts/select-kit/components/category-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-chooser.js.es6
@@ -54,7 +54,7 @@ export default ComboBoxComponent.extend({
         "label",
         categoryBadgeHTML(category, {
           link: false,
-          hideParent: !!category.parent_category_id,
+          hideParent: category ? !!category.parent_category_id : true,
           allowUncategorized: true,
           recursive: true
         }).htmlSafe()

From 23de188f89ea8ce988fb77b299d216124dd13a7c Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 11 Mar 2020 07:13:08 +0530
Subject: [PATCH 0159/1830] Update README to reflect current supported Ruby
 version

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 323a21e73b..8f9d748d06 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ To get your environment setup, follow the community setup guide for your operati
 
 If you're familiar with how Rails works and are comfortable setting up your own environment, you can also try out the [**Discourse Advanced Developer Guide**](docs/DEVELOPER-ADVANCED.md), which is aimed primarily at Ubuntu and macOS environments.
 
-Before you get started, ensure you have the following minimum versions: [Ruby 2.5+](https://www.ruby-lang.org/en/downloads/), [PostgreSQL 10+](https://www.postgresql.org/download/), [Redis 2.6+](https://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first!
+Before you get started, ensure you have the following minimum versions: [Ruby 2.6+](https://www.ruby-lang.org/en/downloads/), [PostgreSQL 10+](https://www.postgresql.org/download/), [Redis 2.6+](https://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first!
 
 ## Setting up Discourse
 

From 1f34f653bfb6ccb39a4f4f8085b07e9d94389e6f Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 11 Mar 2020 17:42:56 +1100
Subject: [PATCH 0160/1830] FIX: last ip address could point at wrong ip

Due to unicorn env object recycling request.ip could point at the wrong
ip address by the time defer block is called. This usually would happen
under load.

This also avoids keeping the entire request object as referenced by the
closure.
---
 lib/auth/default_current_user_provider.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index bdd304ef1b..5fe22b4adc 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -118,9 +118,11 @@ class Auth::DefaultCurrentUserProvider
 
     if current_user && should_update_last_seen?
       u = current_user
+      ip = request.ip
+
       Scheduler::Defer.later "Updating Last Seen" do
         u.update_last_seen!
-        u.update_ip_address!(request.ip)
+        u.update_ip_address!(ip)
       end
     end
 

From 683cb2809996c8268c69887a80646de4cf6e4923 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 09:23:10 +0100
Subject: [PATCH 0161/1830] DEV: enforces ember-template-lint:
 no-triple-curlies (#9165)

This pr replaces `{{{ }}}` usage by a {{html-safe}} helper. While it doesn't solve the underlying issue, it gives us a path forward without risking breaking too much existing behavior.

Also introduces an htmlSafe computed macro:

```
import { htmlSafe } from "discourse/lib/computed";

htmlDescription: htmlSafe("description")
```

Overtime {{html-safe}} usage should be removed and moved to components properties or specialized components/helpers.
---
 .template-lintrc.js                           |  3 +-
 .../admin/templates/badges-award.hbs          |  6 +-
 .../admin/templates/badges-index.hbs          |  2 +-
 .../components/admin-report-storage-stats.hbs |  2 +-
 .../components/admin-report-table-cell.hbs    |  2 +-
 .../templates/components/admin-report.hbs     |  2 +-
 .../components/admin-user-field-item.hbs      |  2 +-
 .../components/penalty-post-action.hbs        |  2 +-
 .../templates/components/silence-details.hbs  |  2 +-
 .../components/site-settings/bool.hbs         |  2 +-
 .../site-settings/category-list.hbs           |  2 +-
 .../components/site-settings/category.hbs     |  2 +-
 .../components/site-settings/color.hbs        |  2 +-
 .../components/site-settings/compact-list.hbs |  2 +-
 .../components/site-settings/enum.hbs         |  2 +-
 .../components/site-settings/group-list.hbs   |  2 +-
 .../components/site-settings/host-list.hbs    |  2 +-
 .../components/site-settings/list.hbs         |  2 +-
 .../components/site-settings/secret-list.hbs  |  2 +-
 .../components/site-settings/string.hbs       |  2 +-
 .../components/site-settings/tag-list.hbs     |  2 +-
 .../components/site-settings/upload.hbs       |  2 +-
 .../site-settings/uploaded-image-list.hbs     |  2 +-
 .../components/site-settings/url-list.hbs     |  2 +-
 .../components/site-settings/value-list.hbs   |  2 +-
 .../components/suspension-details.hbs         |  4 +-
 .../templates/components/themes-list-item.hbs |  6 +-
 .../templates/components/themes-list.hbs      |  6 +-
 .../templates/customize-themes-index.hbs      |  4 +-
 .../admin/templates/customize-themes-show.hbs |  2 +-
 .../admin/templates/dashboard-problems.hbs    |  2 +-
 .../admin/templates/dashboard_general.hbs     |  2 +-
 .../admin/templates/email-advanced-test.hbs   |  4 +-
 .../admin/templates/email-preview-digest.hbs  |  2 +-
 .../javascripts/admin/templates/embedding.hbs |  2 +-
 .../templates/logs/staff-action-logs.hbs      |  2 +-
 .../templates/modal/admin-badge-preview.hbs   |  8 +-
 .../templates/modal/admin-install-theme.hbs   |  8 +-
 .../templates/modal/admin-theme-change.hbs    |  2 +-
 .../templates/modal/admin-theme-item.hbs      |  2 +-
 .../admin/templates/search-logs-term.hbs      |  4 +-
 .../admin/templates/user-index.hbs            |  8 +-
 .../admin/templates/users-list-show.hbs       |  8 +-
 .../discourse-common/helpers/html-safe.js.es6 |  6 ++
 .../discourse-common/helpers/i18n.js.es6      |  3 +-
 .../discourse/components/text-overflow.js.es6 | 11 +++
 .../discourse/helpers/application.js.es6      | 12 +--
 .../discourse/helpers/dir-span.js.es6         |  3 +-
 .../discourse/helpers/format-age.js.es6       |  5 +-
 .../javascripts/discourse/lib/computed.js.es6 | 16 ++++
 .../javascripts/discourse/templates/about.hbs |  2 +-
 .../templates/account-created/index.hbs       |  2 +-
 .../templates/account-created/resent.hbs      |  2 +-
 .../discourse/templates/badges/show.hbs       |  2 +-
 .../templates/components/about-page-users.hbs |  2 +-
 .../templates/components/badge-card.hbs       |  2 +-
 .../templates/components/categories-boxes.hbs |  2 +-
 .../templates/components/categories-only.hbs  |  8 +-
 .../templates/components/d-button.hbs         |  2 +-
 .../templates/components/d-editor.hbs         |  2 +-
 .../templates/components/discourse-banner.hbs |  4 +-
 .../components/discourse-linked-text.hbs      |  2 +-
 .../components/edit-category-general.hbs      |  6 +-
 .../components/edit-category-security.hbs     |  2 +-
 .../templates/components/featured-topic.hbs   |  4 +-
 .../templates/components/flag-action-type.hbs |  4 +-
 .../templates/components/footer-message.hbs   |  2 +-
 .../templates/components/global-notice.hbs    |  4 +-
 .../components/group-card-contents.hbs        |  2 +-
 .../templates/components/group-post.hbs       |  6 +-
 .../templates/components/invite-panel.hbs     |  4 +-
 .../templates/components/ip-lookup.hbs        |  2 +-
 .../components/mobile-category-topic.hbs      |  2 +-
 .../templates/components/related-messages.hbs |  2 +-
 .../reviewable-conversation-post.hbs          |  2 +-
 .../components/reviewable-flagged-post.hbs    |  2 +-
 .../templates/components/reviewable-item.hbs  |  2 +-
 .../templates/components/reviewable-score.hbs |  2 +-
 .../components/second-factor-form.hbs         |  2 +-
 .../templates/components/share-panel.hbs      |  2 +-
 .../templates/components/share-popup.hbs      |  2 +-
 .../templates/components/share-source.hbs     |  2 +-
 .../components/shared-draft-controls.hbs      |  2 +-
 .../templates/components/suggested-topics.hbs |  2 +-
 .../templates/components/tag-info.hbs         |  2 +-
 .../templates/components/text-overflow.hbs    |  2 +-
 .../templates/components/topic-entrance.hbs   |  4 +-
 .../components/user-card-contents.hbs         |  2 +-
 .../components/user-fields/confirm.hbs        |  4 +-
 .../components/user-fields/dropdown.hbs       |  4 +-
 .../templates/components/user-fields/text.hbs |  4 +-
 .../templates/components/user-stat.hbs        |  2 +-
 .../templates/components/user-stream-item.hbs |  8 +-
 .../components/user-summary-topic.hbs         |  2 +-
 .../discourse/templates/composer.hbs          |  4 +-
 .../templates/composer/custom-body.hbs        |  2 +-
 .../templates/composer/education.hbs          |  2 +-
 .../templates/composer/group-mentioned.hbs    |  2 +-
 .../discourse/templates/discovery.hbs         |  2 +-
 .../discourse/templates/full-page-search.hbs  |  6 +-
 .../javascripts/discourse/templates/group.hbs |  2 +-
 .../discourse/templates/groups/index.hbs      |  2 +-
 .../discourse/templates/invites/show.hbs      |  4 +-
 .../templates/list/activity-column.hbr        |  2 +-
 .../templates/list/topic-excerpt.hbr          |  2 +-
 .../mobile/components/basic-topic-list.hbs    |  4 +-
 .../mobile/components/categories-only.hbs     |  2 +-
 .../mobile/components/mobile-nav.hbs          |  2 +-
 .../templates/modal/activation-resent.hbs     |  2 +-
 .../discourse/templates/modal/auth-token.hbs  |  6 +-
 .../templates/modal/avatar-selector.hbs       |  6 +-
 .../discourse/templates/modal/bookmark.hbs    |  2 +-
 .../modal/bulk-notification-level.hbs         |  2 +-
 .../templates/modal/change-owner.hbs          |  2 +-
 .../templates/modal/create-account.hbs        |  2 +-
 .../modal/delete-topic-disallowed.hbs         |  2 +-
 .../templates/modal/edit-category.hbs         |  2 +-
 .../templates/modal/feature-topic.hbs         | 22 ++---
 .../templates/modal/forgot-password.hbs       |  2 +-
 .../discourse/templates/modal/history.hbs     | 10 +-
 .../modal/keyboard-shortcuts-help.hbs         | 94 +++++++++----------
 .../templates/modal/move-to-topic.hbs         | 10 +-
 .../templates/modal/not-activated.hbs         |  2 +-
 .../templates/modal/post-enqueued.hbs         |  2 +-
 .../modal/second-factor-add-security-key.hbs  |  2 +-
 .../modal/second-factor-add-totp.hbs          |  4 +-
 .../modal/second-factor-backup-edit.hbs       |  2 +-
 .../templates/modal/topic-bulk-actions.hbs    |  2 +-
 .../templates/navigation/category.hbs         |  2 +-
 .../templates/preferences-second-factor.hbs   |  2 +-
 .../templates/preferences/account.hbs         |  2 +-
 .../templates/preferences/emails.hbs          |  2 +-
 .../templates/preferences/profile.hbs         |  2 +-
 .../discourse/templates/static.hbs            |  2 +-
 .../javascripts/discourse/templates/topic.hbs |  6 +-
 .../discourse/templates/unknown.hbs           |  2 +-
 .../discourse/templates/user-invited-show.hbs |  8 +-
 .../javascripts/discourse/templates/user.hbs  |  4 +-
 .../discourse/templates/user/stream.hbs       |  2 +-
 .../discourse/templates/user/summary.hbs      |  2 +-
 .../templates/components/category-row.hbs     |  4 +-
 .../dropdown-select-box-row.hbs               |  4 +-
 .../templates/components/pinned-button.hbs    |  2 +-
 .../components/topic-notifications-button.hbs |  2 +-
 .../templates/components/radio-button.hbs     |  2 +-
 .../templates/components/wizard-field.hbs     |  4 +-
 .../templates/components/wizard-step.hbs      |  2 +-
 .../discourse-local-dates-create-form.hbs     |  2 +-
 .../components/html-safe-helper-test.js.es6   | 14 +++
 test/javascripts/lib/computed-test.js.es6     | 12 ++-
 150 files changed, 337 insertions(+), 276 deletions(-)
 create mode 100644 app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
 create mode 100644 test/javascripts/components/html-safe-helper-test.js.es6

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 6783c6d94e..29bf420298 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -11,6 +11,7 @@ module.exports = {
     "no-unnecessary-concat": true,
     "no-unused-block-params": true,
     "no-unbound": true,
-    "simple-unless": true
+    "simple-unless": true,
+    "no-triple-curlies": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/badges-award.hbs b/app/assets/javascripts/admin/templates/badges-award.hbs
index b13462bf33..d0082dc349 100644
--- a/app/assets/javascripts/admin/templates/badges-award.hbs
+++ b/app/assets/javascripts/admin/templates/badges-award.hbs
@@ -9,11 +9,11 @@
           {{icon-or-image model}}
           <span class="badge-display-name">{{model.name}}</span>
         {{else}}
-          <span class='badge-placeholder'>{{I18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+          <span class='badge-placeholder'>{{i18n 'admin.badges.mass_award.no_badge_selected'}}</span>
         {{/if}}
       </div>
       <div>
-        <h4>{{I18n 'admin.badges.mass_award.upload_csv'}}</h4>
+        <h4>{{i18n 'admin.badges.mass_award.upload_csv'}}</h4>
         <input type='file' id='massAwardCSVUpload' accept='.csv'>
       </div>
       <div>
@@ -34,6 +34,6 @@
       {{/link-to}}
     </form>
   {{else}}
-    <span class='badge-required'>{{I18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+    <span class='badge-required'>{{i18n 'admin.badges.mass_award.no_badge_selected'}}</span>
   {{/if}}
 {{/d-section}}
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index fd08e67279..49c5945ea1 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -7,7 +7,7 @@
         {{#each badgeIntroLinks as |link|}}
           <a href={{link.href}} class="external-link" target="_blank" rel="noopener">
             {{d-icon link.icon}}
-            <span>{{I18n link.text}}</span>
+            <span>{{i18n link.text}}</span>
           </a>
         {{/each}}
       </div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
index fbb9f80a64..d6e42cd414 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
@@ -15,7 +15,7 @@
 
       {{#if backupStats.last_backup_taken_at}}
         <br>
-        {{{i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true")}}}
+        {{i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true")}}
       {{/if}}
     </p>
   </div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
index 973e8412be..fb8f2e4cdc 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
@@ -1 +1 @@
-{{{formatedValue}}}
+{{html-safe formatedValue}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index be9c2ee8d7..48bd58cab9 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -199,6 +199,6 @@
 {{/conditional-loading-section}}
 {{else}}
   <div class="alert alert-info">
-    {{{disabledLabel}}}
+    {{html-safe disabledLabel}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
index 269d6babc2..211cc00b51 100644
--- a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
@@ -46,7 +46,7 @@
     <div class="form-display">
       <strong>{{userField.name}}</strong>
       <br>
-      {{{userField.description}}}
+      {{html-safe userField.description}}
     </div>
     <div class="form-display">{{fieldName}}</div>
     <div class="form-element controls">
diff --git a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
index 1a672329cd..a6c848541f 100644
--- a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
+++ b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
@@ -1,7 +1,7 @@
 <div class='penalty-post-controls'>
   <label>
     <div class='penalty-post-label'>
-      {{{i18n 'admin.user.penalty_post_actions'}}}
+      {{i18n 'admin.user.penalty_post_actions'}}
     </div>
   </label>
   {{combo-box
diff --git a/app/assets/javascripts/admin/templates/components/silence-details.hbs b/app/assets/javascripts/admin/templates/components/silence-details.hbs
index 3f7c19d5ba..af1b4980d5 100644
--- a/app/assets/javascripts/admin/templates/components/silence-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/silence-details.hbs
@@ -1,7 +1,7 @@
 <div class='reason-controls'>
   <label>
     <div class='silence-reason-label'>
-      {{{i18n 'admin.user.silence_reason_label'}}}
+      {{i18n 'admin.user.silence_reason_label'}}
     </div>
     </label>
     {{text-field
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
index 1c6c2101ae..11384580c1 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
@@ -1,5 +1,5 @@
 <label>
   {{input type="checkbox" checked=enabled}}
-  <span>{{{setting.description}}}</span>
+  <span>{{html-safe setting.description}}</span>
   {{setting-validation-message message=validationMessage}}
 </label>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
index 6d8871b306..b9609e2843 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
@@ -3,5 +3,5 @@
   onChange=(action "onChangeSelectedCategories")
 }}
 
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
index 4f23fcc021..4358b408de 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
@@ -4,4 +4,4 @@
   onChange=(action (mut value))
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
index baf81ab389..7b9b5bf2a8 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/color.hbs
@@ -6,4 +6,4 @@
   onChangeColor=(action "onChangeColor")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class="desc">{{{setting.description}}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
index 621baec0b1..1e7e369b93 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
@@ -8,4 +8,4 @@
 }}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
index dc33e28df5..0b4104086e 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
@@ -15,5 +15,5 @@
 {{setting-validation-message message=validationMessage}}
 
 <div class='desc'>
-  {{{setting.description}}}
+  {{html-safe setting.description}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
index 8f4263a72e..091573eb53 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
@@ -7,4 +7,4 @@
   onChange=(action "onChangeGroupListSetting")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
index 5277c26c69..70366aba38 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_host"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
index 268723c92d..090cc2a5f1 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value inputDelimiter="|" choices=setting.choices}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
index a4ff6f1bd4..7451959841 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
@@ -1,3 +1,3 @@
 {{secret-value-list setting=setting values=value isSecret=isSecret}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
index d71278f723..160f041df9 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
@@ -7,4 +7,4 @@
 {{/if}}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
index 271e4d0326..21e7e1ab0a 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
@@ -1,3 +1,3 @@
 {{tag-chooser tags=selectedTags}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
index 86940d8633..2758b7be5a 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
@@ -1,2 +1,2 @@
 {{site-settings-image-uploader imageUrl=value placeholderUrl=setting.placeholder type="site_setting"}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
index 82dc38d653..146c9d3722 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
@@ -1,2 +1,2 @@
 {{d-button label="admin.site_settings.uploaded_image_list.label" action=(action "showUploadModal") actionParam=(hash value=value setting=setting)}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
index 67db58f8ea..7a6cdc517b 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_url"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
index 3003b375ee..234ec83f3c 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{{setting.description}}}</div>
+<div class='desc'>{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/suspension-details.hbs b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
index 0f2aa0fc84..4dcc606b2b 100644
--- a/app/assets/javascripts/admin/templates/components/suspension-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
@@ -2,9 +2,9 @@
   <label>
     <div class='suspend-reason-label'>
       {{#if siteSettings.hide_suspension_reasons}}
-        {{{i18n 'admin.user.suspend_reason_hidden_label'}}}
+        {{i18n 'admin.user.suspend_reason_hidden_label'}}
       {{else}}
-        {{{i18n 'admin.user.suspend_reason_label'}}}
+        {{i18n 'admin.user.suspend_reason_label'}}
       {{/if}}
     </div>
   </label>
diff --git a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
index 1286937f8a..0c253e0214 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
@@ -28,14 +28,14 @@
 
   {{#if displayComponents}}
     <div class="components-list">
-      <span class="components">{{{childrenString}}}</span>
+      <span class="components">{{html-safe childrenString}}</span>
 
       {{#if displayHasMore}}
         <a href {{action "toggleChildrenExpanded"}} class="others-count">
           {{#if childrenExpanded}}
-            {{I18n "admin.customize.theme.collapse"}}
+            {{i18n "admin.customize.theme.collapse"}}
           {{else}}
-            {{I18n "admin.customize.theme.and_x_more" count=moreCount}}
+            {{i18n "admin.customize.theme.and_x_more" count=moreCount}}
           {{/if}}
         </a>
       {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/themes-list.hbs b/app/assets/javascripts/admin/templates/components/themes-list.hbs
index 29935b95b8..4654371a23 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list.hbs
@@ -25,9 +25,9 @@
         <div class="themes-list-item inactive-indicator">
           <span class="empty">
             {{#if themesTabActive}}
-              {{I18n "admin.customize.theme.inactive_themes"}}
+              {{i18n "admin.customize.theme.inactive_themes"}}
             {{else}}
-              {{I18n "admin.customize.theme.inactive_components"}}
+              {{i18n "admin.customize.theme.inactive_components"}}
             {{/if}}
           </span>
         </div>
@@ -41,7 +41,7 @@
     {{/if}}
   {{else}}
     <div class="themes-list-item">
-      <span class="empty">{{I18n "admin.customize.theme.empty"}}</span>
+      <span class="empty">{{i18n "admin.customize.theme.empty"}}</span>
     </div>
   {{/if}}
 
diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
index 0a6060724b..32ad33db10 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-index.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
@@ -1,7 +1,7 @@
 <div class="themes-intro admin-intro">
   <img src={{womanArtistEmojiURL}}>
   <div class="content-wrapper">
-    <h1>{{I18n "admin.customize.theme.themes_intro"}}</h1>
+    <h1>{{i18n "admin.customize.theme.themes_intro"}}</h1>
      <div class="create-actions">
       {{d-button action=(route-action "installModal") icon="upload" label="admin.customize.install" class="btn-primary"}}
     </div>
@@ -9,7 +9,7 @@
       {{#each externalResources as |resource|}}
         <a href={{resource.link}} class="external-link" rel="noopener" target="_blank">
           {{d-icon resource.icon}}
-          {{I18n resource.key}}
+          {{i18n resource.key}}
         </a>
       {{/each}}
     </div>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 9fb7fcb4cf..b4c4e9a8f4 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -89,7 +89,7 @@
 
         {{#if showRemoteError}}
           <div class="error-message">
-            {{d-icon "exclamation-triangle"}} {{I18n "admin.customize.theme.repo_unreachable"}}
+            {{d-icon "exclamation-triangle"}} {{i18n "admin.customize.theme.repo_unreachable"}}
           </div>
           <div class="raw-error">
             <code>{{model.remoteError}}</code>
diff --git a/app/assets/javascripts/admin/templates/dashboard-problems.hbs b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
index 0f0b1f9d29..5f95987e73 100644
--- a/app/assets/javascripts/admin/templates/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
@@ -12,7 +12,7 @@
         <div class="problem-messages">
           <ul>
             {{#each problems as |problem|}}
-              <li>{{{problem}}}</li>
+              <li>{{html-safe problem}}</li>
             {{/each}}
           </ul>
         </div>
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index 19f892ab0f..d190b7664b 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -142,7 +142,7 @@
         filters=trendingSearchFilters
         isEnabled=logSearchQueriesEnabled
         disabledLabel=trendingSearchDisabledLabel}}
-      {{{i18n "admin.dashboard.reports.trending_search.more" basePath=basePath}}}
+      {{i18n "admin.dashboard.reports.trending_search.more" basePath=basePath}}
     </div>
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/email-advanced-test.hbs b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
index 97a479e2c5..f0dcaa5c6a 100644
--- a/app/assets/javascripts/admin/templates/email-advanced-test.hbs
+++ b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
@@ -14,13 +14,13 @@
   <hr>
   <div class="text">
     <h3>{{i18n 'admin.email.advanced_test.text'}}</h3>
-    <pre class="full-reason">{{{text}}}</pre>
+    <pre class="full-reason">{{html-safe text}}</pre>
   </div>
 
   <hr>
   <div class="elided">
     <h3>{{i18n 'admin.email.advanced_test.elided'}}</h3>
-    <pre class="full-reason">{{{elided}}}</pre>
+    <pre class="full-reason">{{html-safe elided}}</pre>
   </div>
 {{/if}}
 
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 078b642dd4..7a695659c5 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -53,7 +53,7 @@
           <iframe srcdoc={{model.html_content}} />
         {{/if}}
       {{else}}
-        <pre>{{{model.text_content}}}</pre>
+        <pre>{{html-safe model.text_content}}</pre>
       {{/if}}
     </div>
   </div>
diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index f4ada49e1b..1777263674 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -23,7 +23,7 @@
 
 {{#if showSecondary}}
   <div class='embedding-secondary'>
-    <p>{{{i18n "admin.embedding.sample"}}}</p>
+    <p>{{i18n "admin.embedding.sample"}}</p>
     {{highlighted-code code=embeddingCode lang="html"}}
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index 02c4160b6a..ab4c70d39e 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -88,7 +88,7 @@
               <td class="col value created-at">{{age-with-tooltip item.created_at}}</td>
               <td class="col value details">
                 <div>
-                  {{{item.formattedDetails}}}
+                  {{html-safe item.formattedDetails}}
                   {{#if item.useCustomModalForDetails}}
                     <a href {{action "showCustomDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n 'admin.logs.staff_actions.show'}}</a>
                   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
index ef36e4aa05..528ed5af24 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
@@ -17,9 +17,9 @@
   {{else}}
     <p class="grant-count">
       {{#if count}}
-        {{{i18n "admin.badges.preview.grant_count" count=count}}}
+        {{i18n "admin.badges.preview.grant_count" count=count}}
       {{else}}
-        {{{i18n "admin.badges.preview.no_grant_count"}}}
+        {{i18n "admin.badges.preview.no_grant_count"}}
       {{/if}}
     </p>
 
@@ -41,14 +41,14 @@
       </p>
       <ul>
         {{#each processedSample as |html|}}
-          <li>{{{html}}}</li>
+          <li>{{html-safe html}}</li>
         {{/each}}
       </ul>
     {{/if}}
 
     {{#if hasQueryPlan}}
       <div class="badge-query-plan">
-        {{{queryPlanHtml}}}
+        {{html-safe queryPlanHtml}}
       </div>
     {{/if}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
index aab0b17d71..5ed497ae57 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
@@ -24,7 +24,7 @@
 
             <div class="popular-theme-buttons">
               {{#if theme.installed}}
-                <span>{{I18n "admin.customize.theme.installed"}}</span>
+                <span>{{i18n "admin.customize.theme.installed"}}</span>
               {{else}}
                 {{d-button class='btn-small'
                   label="admin.customize.theme.install"
@@ -33,7 +33,7 @@
                   action=(action "installThemeFromList" theme.value)}}
 
                 {{#if theme.preview}}
-                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{I18n "admin.customize.theme.preview"}}</a>
+                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{i18n "admin.customize.theme.preview"}}</a>
                 {{/if}}
               {{/if}}
             </div>
@@ -85,10 +85,10 @@
 
     {{#if create}}
       <div class="inputs">
-        <div class="label">{{I18n "admin.customize.theme.create_name"}}</div>
+        <div class="label">{{i18n "admin.customize.theme.create_name"}}</div>
         {{input value=name placeholder=placeholder}}
 
-        <div class="label">{{I18n "admin.customize.theme.create_type"}}</div>
+        <div class="label">{{i18n "admin.customize.theme.create_type"}}</div>
         {{combo-box
           valueProperty="value"
           content=createTypes
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
index ec26f608d8..7b3ffb5ca5 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
@@ -1,6 +1,6 @@
 <div>
   {{#d-modal-body title="admin.logs.staff_actions.modal_title"}}
-    {{{diff}}}
+    {{html-safe diff}}
   {{/d-modal-body}}
   <div class="modal-footer">
     {{d-button
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
index 7a5ddc1ea7..724af5ace4 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
@@ -7,7 +7,7 @@
   </div>
   <div class="popular-theme-buttons">
     {{#if theme.installed}}
-      <span>{{I18n "admin.customize.theme.installed"}}</span>
+      <span>{{i18n "admin.customize.theme.installed"}}</span>
     {{else}}
       {{d-button class='btn-small'
         label="admin.customize.theme.install"
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 78bd54afb9..27f61f2940 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -31,7 +31,7 @@
       <div class='fps-topic'>
         <div class='topic'>
           <a class='search-link' href={{result.url}}>
-            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{{result.topic.fancyTitle}}}{{/highlight-text}}</span>
+            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
           </a>
 
           <div class='search-category'>
@@ -55,7 +55,7 @@
 
           {{#if result.blurb}}
             {{#highlight-text highlight=term}}
-              {{{result.blurb}}}
+              {{html-safe result.blurb}}
             {{/highlight-text}}
           {{/if}}
         </div>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 207120eea8..23a1a6aae3 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -132,7 +132,7 @@
     <div class="field">{{i18n "user.avatar.title"}}</div>
     <div class="value">{{avatar model imageSize="large"}}</div>
     <div class="controls">
-      {{{i18n "admin.user.visit_profile" url=preferencesPath}}}
+      {{i18n "admin.user.visit_profile" url=preferencesPath}}
     </div>
   </div>
 
@@ -509,7 +509,7 @@
     <h1>{{i18n "admin.groups.title"}}</h1>
       <div class="display-row">
         <div class="field">{{i18n "admin.groups.automatic"}}</div>
-        <div class="value">{{{automaticGroups}}}</div>
+        <div class="value">{{html-safe automaticGroups}}</div>
       </div>
       <div class="display-row">
         <div class="field">{{i18n "admin.groups.custom"}}</div>
@@ -616,11 +616,11 @@
   </div>
   <div class="display-row">
     <div class="field">{{i18n "admin.user.time_read"}}</div>
-    <div class="value">{{{format-duration model.time_read}}}</div>
+    <div class="value">{{format-duration model.time_read}}</div>
   </div>
   <div class="display-row">
     <div class="field">{{i18n "user.invited.days_visited"}}</div>
-    <div class="value">{{{model.days_visited}}}</div>
+    <div class="value">{{html-safe model.days_visited}}</div>
   </div>
 </section>
 
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 7d096573b0..6b0253aeda 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -53,11 +53,11 @@
             </td>
             <td class="last-emailed">
               <div class="label">{{i18n 'admin.users.last_emailed'}}</div>
-              <div>{{{format-duration user.last_emailed_age}}}</div>
+              <div>{{format-duration user.last_emailed_age}}</div>
             </td>
             <td class="last-seen">
               <div class="label">{{i18n 'last_seen'}}</div>
-              <div>{{{format-duration user.last_seen_age}}}</div>
+              <div>{{format-duration user.last_seen_age}}</div>
             </td>
             <td class="topics-entered">
               <div class="label">{{i18n 'admin.user.topics_entered'}}</div>
@@ -69,12 +69,12 @@
             </td>
             <td class="time-read">
               <div class="label">{{i18n 'admin.user.time_read'}}</div>
-              <div>{{{format-duration user.time_read}}}</div>
+              <div>{{format-duration user.time_read}}</div>
             </td>
 
             <td class="created">
               <div class="label">{{i18n 'created'}}</div>
-              <div>{{{format-duration user.created_at_age}}}</div>
+              <div>{{format-duration user.created_at_age}}</div>
             </td>
 
             {{#if siteSettings.must_approve_users}}
diff --git a/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6 b/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
new file mode 100644
index 0000000000..dc6d5daf74
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
@@ -0,0 +1,6 @@
+import { registerUnbound } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
+
+registerUnbound("html-safe", function(string) {
+  return htmlSafe(string);
+});
diff --git a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
index 902ed699bf..c3d7f1e448 100644
--- a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
+++ b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
@@ -1,6 +1,7 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
 
-registerUnbound("i18n", (key, params) => I18n.t(key, params));
+registerUnbound("i18n", (key, params) => htmlSafe(I18n.t(key, params)));
 registerUnbound("i18n-yes-no", (value, params) =>
   I18n.t(value ? "yes_value" : "no_value", params)
 );
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js.es6 b/app/assets/javascripts/discourse/components/text-overflow.js.es6
index 90a9cc21a2..201172f1ef 100644
--- a/app/assets/javascripts/discourse/components/text-overflow.js.es6
+++ b/app/assets/javascripts/discourse/components/text-overflow.js.es6
@@ -1,8 +1,19 @@
 import { next } from "@ember/runloop";
+import { htmlSafe } from "@ember/template";
 import Component from "@ember/component";
+
 export default Component.extend({
+  text: null,
+
+  init() {
+    this._super(...arguments);
+
+    this.set("text", htmlSafe(this.text));
+  },
+
   didInsertElement() {
     this._super(...arguments);
+
     next(null, () => {
       const $this = $(this.element);
 
diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js.es6
index 71baa92c91..27727c1d84 100644
--- a/app/assets/javascripts/discourse/helpers/application.js.es6
+++ b/app/assets/javascripts/discourse/helpers/application.js.es6
@@ -4,14 +4,12 @@ import {
   autoUpdatingRelativeAge,
   number
 } from "discourse/lib/formatter";
+import { htmlSafe } from "@ember/template";
 
-const safe = Handlebars.SafeString;
+registerUnbound("raw-date", dt => htmlSafe(longDate(new Date(dt))));
 
-registerUnbound("raw-date", dt => longDate(new Date(dt)));
-
-registerUnbound(
-  "age-with-tooltip",
-  dt => new safe(autoUpdatingRelativeAge(new Date(dt), { title: true }))
+registerUnbound("age-with-tooltip", dt =>
+  htmlSafe(autoUpdatingRelativeAge(new Date(dt), { title: true }))
 );
 
 registerUnbound("number", (orig, params) => {
@@ -48,5 +46,5 @@ registerUnbound("number", (orig, params) => {
 
   result += ">" + n + "</span>";
 
-  return new safe(result);
+  return htmlSafe(result);
 });
diff --git a/app/assets/javascripts/discourse/helpers/dir-span.js.es6 b/app/assets/javascripts/discourse/helpers/dir-span.js.es6
index d41f1a332e..e210c471fd 100644
--- a/app/assets/javascripts/discourse/helpers/dir-span.js.es6
+++ b/app/assets/javascripts/discourse/helpers/dir-span.js.es6
@@ -1,5 +1,6 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { isRTL } from "discourse/lib/text-direction";
+import { htmlSafe } from "@ember/template";
 
 function setDir(text) {
   let content = text ? text : "";
@@ -11,5 +12,5 @@ function setDir(text) {
 }
 
 export default registerUnbound("dir-span", function(str) {
-  return new Handlebars.SafeString(setDir(str));
+  return htmlSafe(setDir(str));
 });
diff --git a/app/assets/javascripts/discourse/helpers/format-age.js.es6 b/app/assets/javascripts/discourse/helpers/format-age.js.es6
index 3141a0da85..b8874820ed 100644
--- a/app/assets/javascripts/discourse/helpers/format-age.js.es6
+++ b/app/assets/javascripts/discourse/helpers/format-age.js.es6
@@ -1,11 +1,12 @@
 import { autoUpdatingRelativeAge, durationTiny } from "discourse/lib/formatter";
 import { registerUnbound } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
 
 registerUnbound("format-age", function(dt) {
   dt = new Date(dt);
-  return new Handlebars.SafeString(autoUpdatingRelativeAge(dt));
+  return htmlSafe(autoUpdatingRelativeAge(dt));
 });
 
 registerUnbound("format-duration", function(seconds) {
-  return new Handlebars.SafeString(durationTiny(seconds));
+  return htmlSafe(durationTiny(seconds));
 });
diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js.es6
index acd6cde60b..e238320a38 100644
--- a/app/assets/javascripts/discourse/lib/computed.js.es6
+++ b/app/assets/javascripts/discourse/lib/computed.js.es6
@@ -1,5 +1,6 @@
 import { computed } from "@ember/object";
 import addonFmt from "ember-addons/fmt";
+import { htmlSafe as htmlSafeTemplateHelper } from "@ember/template";
 
 /**
   Returns whether two properties are equal to each other.
@@ -56,6 +57,21 @@ export function i18n(...args) {
     return I18n.t(addonFmt(format, ...args.map(a => this.get(a))));
   });
 }
+/**
+  Returns htmlSafe version of a string.
+
+  @method htmlSafe
+  @params {String} properties* to htmlify
+  @return {Function} discourseComputedProperty function
+**/
+export function htmlSafe(...args) {
+  return computed(...args, {
+    get() {
+      const path = args.pop();
+      return htmlSafeTemplateHelper(this.get(path));
+    }
+  });
+}
 
 /**
   Uses an Ember String `fmt` call to format a string. See:
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index 6e75a04a6d..ad65dbb57e 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -112,7 +112,7 @@
       {{#if contactInfo}}
         <section class='about contact'>
             <h3>{{d-icon "far-envelope"}} {{i18n 'about.contact'}}</h3>
-            <p>{{{contactInfo}}}</p>
+            <p>{{html-safe contactInfo}}</p>
         </section>
       {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/account-created/index.hbs b/app/assets/javascripts/discourse/templates/account-created/index.hbs
index 8c9babb1f9..8122270cd6 100644
--- a/app/assets/javascripts/discourse/templates/account-created/index.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/index.hbs
@@ -1,5 +1,5 @@
 <div class='ac-message'>
-  {{{accountCreated.message}}}
+  {{html-safe accountCreated.message}}
 </div>
 {{#if accountCreated.show_controls}}
   {{activation-controls sendActivationEmail=(action "sendActivationEmail")
diff --git a/app/assets/javascripts/discourse/templates/account-created/resent.hbs b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
index 8647596a04..5ad9168986 100644
--- a/app/assets/javascripts/discourse/templates/account-created/resent.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
@@ -1,6 +1,6 @@
 <div class='ac-message'>
   {{#if email}}
-    {{{i18n 'login.sent_activation_email_again' currentEmail=email}}}
+    {{i18n 'login.sent_activation_email_again' currentEmail=email}}
   {{else}}
     {{i18n 'login.sent_activation_email_again_generic'}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 09ded422b3..fe7b489159 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -42,7 +42,7 @@
           {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
             <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
             {{#if ub.post_number}}
-              <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{{ub.topic.fancyTitle}}}</a>
+              <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{html-safe ub.topic.fancyTitle}}</a>
             {{/if}}
           {{/user-info}}
         {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
index f7bfd9886b..4b7161ba18 100644
--- a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
+++ b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
@@ -3,7 +3,7 @@
     <div class="user-image">
       <div class="user-image-inner">
         <a href={{userTemplate.userPath}} data-user-card={{userTemplate.username}}>
-          {{{userTemplate.avatar}}}
+          {{html-safe userTemplate.avatar}}
         </a>
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
index 0fdc3bd275..4fb6aa77c0 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-card.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
@@ -11,7 +11,7 @@
   <div class='badge-info'>
     <div class='badge-info-item'>
       <h3><a href={{url}} class='badge-link'>{{badge.name}}</a></h3>
-      <div class='badge-summary'>{{{summary}}}</div>
+      <div class='badge-summary'>{{html-safe summary}}</div>
     </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index 5dc594c691..232edea06b 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -24,7 +24,7 @@
         </div>
 
         <div class='description'>
-          {{{text-overflow class="overflow" text=c.description_excerpt}}}
+          {{text-overflow class="overflow" text=c.description_excerpt}}
         </div>
         {{#if c.isGrandParent}}
           {{#each c.subcategories as |subcategory|}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index 4f153b4e7f..ae71465bf0 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -16,7 +16,7 @@
             {{category-title-link category=c}}
             {{#if c.description_excerpt}}
               <div class="category-description">
-                {{{dir-span c.description_excerpt}}}
+                {{dir-span c.description_excerpt}}
               </div>
             {{/if}}
             {{#if c.isGrandParent}}
@@ -28,7 +28,7 @@
                         {{category-title-link tagName="h4" category=subcategory}}
                         {{#if subcategory.description_excerpt}}
                           <div class="category-description subcategory-description">
-                            {{{dir-span subcategory.description_excerpt}}}
+                            {{dir-span subcategory.description_excerpt}}
                           </div>
                         {{/if}}
                         {{#if subcategory.subcategories}}
@@ -45,7 +45,7 @@
                         {{else}}
                           {{#if subcategory.description_excerpt}}
                             <div class="category-description subcategory-description">
-                              {{{dir-span subcategory.description_excerpt}}}
+                              {{dir-span subcategory.description_excerpt}}
                             </div>
                           {{/if}}
                         {{/if}}
@@ -69,7 +69,7 @@
             {{/if}}
           </td>
           <td class="topics">
-            <div title={{c.statTitle}}>{{{c.stat}}}</div>
+            <div title={{c.statTitle}}>{{html-safe c.stat}}</div>
             {{category-unread category=c tagName="div" class="unread-new"}}
           </td>
           {{#if showTopics}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/templates/components/d-button.hbs
index 755e4ea857..aeb5f6b6f6 100644
--- a/app/assets/javascripts/discourse/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-button.hbs
@@ -3,7 +3,7 @@
 {{/if}}
 
 {{#if translatedLabel}}
-  <span class='d-button-label'>{{{translatedLabel}}}{{#if ellipsis}}&hellip;{{/if}}</span>
+  <span class='d-button-label'>{{html-safe translatedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
 {{/if}}
 
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index f868131b63..97effd78d4 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -46,7 +46,7 @@
   </div>
 
   <div class="d-editor-preview-wrapper {{if forcePreview 'force-preview'}}">
-    <div class="d-editor-preview">{{{preview}}}</div>
+    <div class="d-editor-preview">{{html-safe preview}}</div>
     {{plugin-outlet name="editor-preview" classNames="d-editor-plugin" args=outletArgs}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index 27025bedee..cda2c2069a 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -3,9 +3,9 @@
     <div id="banner" class={{overlay}}>
       {{d-button icon="times" action="dismiss" class="btn btn-flat close" title="banner.close"}}
       <div id="banner-content">
-        {{{content}}}
+        {{html-safe content}}
         {{#if currentUser.staff}}
-          <p><a href={{banner.url}}>{{{i18n "banner.edit"}}}</a></p>
+          <p><a href={{banner.url}}>{{i18n "banner.edit"}}</a></p>
         {{/if}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs b/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
index dd15a6dc6a..78515d0404 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
@@ -1 +1 @@
-{{{translatedText}}}
+{{html-safe translatedText}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index 19d6e724dc..7884f85e1f 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -1,7 +1,7 @@
 {{#if category.isUncategorizedCategory}}
   <p class="warning">
     {{d-icon "exclamation-triangle"}}
-    {{{i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink}}}
+    {{i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink}}
   </p>
 {{/if}}
 
@@ -36,7 +36,7 @@
     <section class='field'>
       <label>{{i18n 'category.description'}}</label>
       {{#if category.description}}
-        {{{category.description}}}
+        {{html-safe category.description}}
       {{else}}
         {{i18n 'category.no_description'}}
       {{/if}}
@@ -51,7 +51,7 @@
     <section class='field'>
       <label>{{i18n 'category.badge_colors'}}</label>
       <div class="category-color-editor">
-        {{{categoryBadgePreview}}}
+        {{html-safe categoryBadgePreview}}
 
         <div class='input-prepend input-append' style="margin-top: 10px;">
           <span class='color-title'>{{i18n 'category.background_color'}}:</span>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index cfde179c32..5b132092c4 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -11,7 +11,7 @@
       {{#each category.permissions as |p|}}
         <li>
           <span class="name"><span class="badge-group">{{p.group_name}}</span></span>
-          {{{i18n "category.can"}}}
+          {{i18n "category.can"}}
           <span class="permission">{{p.permission.description}}</span>
           {{#if editingPermissions}}
             <a class="remove-permission" href {{action "removePermission" p}}>{{d-icon "times-circle"}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
index 655ca8c16e..10d9d5fcba 100644
--- a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
@@ -1,10 +1,10 @@
 {{raw "topic-status" topic=topic}}
-<a class='title' href={{topic.lastUnreadUrl}}>{{{topic.fancyTitle}}}</a>
+<a class='title' href={{topic.lastUnreadUrl}}>{{html-safe topic.fancyTitle}}</a>
 {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
 
 {{#if latestTopicOnly}}
   <div class='last-user-info'>
-    {{i18n 'categories.latest_by'}} <a href={{{topic.lastPosterUrl}}}>{{topic.last_poster.username}}</a>
+    {{i18n 'categories.latest_by'}} <a href={{html-safe topic.lastPosterUrl}}>{{topic.last_poster.username}}</a>
     <a href={{topic.lastPostUrl}}>{{format-age topic.last_posted_at}}</a>
   </div>
 {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
index e6fe7ca516..cc7b592b42 100644
--- a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
@@ -5,7 +5,7 @@
       <input type='radio' id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
 
       <div class='flag-action-type-details'>
-        <span class='description'>{{{flag.description}}}</span>
+        <span class='description'>{{html-safe flag.description}}</span>
         {{#if showMessageInput}}
           {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
           <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
@@ -24,7 +24,7 @@
       <div class='flag-action-type-details'>
         <strong>{{formattedName}}</strong>
         {{#if showDescription}}
-          <div class='description'>{{{description}}}</div>
+          <div class='description'>{{html-safe description}}</div>
         {{/if}}
         {{#if showMessageInput}}
           {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
diff --git a/app/assets/javascripts/discourse/templates/components/footer-message.hbs b/app/assets/javascripts/discourse/templates/components/footer-message.hbs
index 65e3a460df..03e5c7b8ee 100644
--- a/app/assets/javascripts/discourse/templates/components/footer-message.hbs
+++ b/app/assets/javascripts/discourse/templates/components/footer-message.hbs
@@ -1,4 +1,4 @@
-{{#if education}}<div class="education">{{{education}}}</div>{{/if}}
+{{#if education}}<div class="education">{{html-safe education}}</div>{{/if}}
 <h3>
   {{message}}
   {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/global-notice.hbs b/app/assets/javascripts/discourse/templates/components/global-notice.hbs
index c2b3b75e2e..08ff36603f 100644
--- a/app/assets/javascripts/discourse/templates/components/global-notice.hbs
+++ b/app/assets/javascripts/discourse/templates/components/global-notice.hbs
@@ -2,9 +2,9 @@
   <div class="row">
     <div id="global-notice-{{notice.id}}" class="alert alert-{{notice.options.level}} {{notice.id}}">
       {{#if notice.options.html}}
-        {{{notice.options.html}}}
+        {{html-safe notice.options.html}}
       {{/if}}
-      <span class="text">{{{notice.text}}}</span>
+      <span class="text">{{html-safe notice.text}}</span>
 
       {{#if notice.options.dismissable}}
         {{d-button
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index 22629d003d..7f6104b836 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -43,7 +43,7 @@
 
     {{#if group.bio_cooked}}
       <div class="card-row second-row">
-        <div class='bio'>{{{group.bio_cooked}}}</div>
+        <div class='bio'>{{html-safe group.bio_cooked}}</div>
       </div>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index d9880b54b6..d4a9673708 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -8,7 +8,7 @@
   <div class='stream-topic-details'>
       <div class='stream-topic-title'>
         <span class='title'>
-          <a href={{postUrl}}>{{{post.topic.fancyTitle}}}</a>
+          <a href={{postUrl}}>{{html-safe post.topic.fancyTitle}}</a>
         </span>
       </div>
       <div class="group-post-category">{{category-link post.category}}</div>
@@ -24,8 +24,8 @@
 
 <div class='excerpt'>
   {{#if post.expandedExcerpt}}
-    {{{post.expandedExcerpt}}}
+    {{html-safe post.expandedExcerpt}}
   {{else}}
-    {{{post.excerpt}}}
+    {{html-safe post.excerpt}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
index 3c13bea09e..cfdd1431bf 100644
--- a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
@@ -1,6 +1,6 @@
 {{#if inviteModel.error}}
   <div class="alert alert-error">
-    {{{errorMessage}}}
+    {{html-safe errorMessage}}
   </div>
 {{/if}}
 
@@ -10,7 +10,7 @@
       {{generated-invite-link link=inviteModel.inviteLink email=emailOrUsername}}
     {{else}}
       <div class="success-message">
-        {{{successMessage}}}
+        {{html-safe successMessage}}
       </div>
     {{/if}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index dce5918f52..9b7b7bebc4 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -14,7 +14,7 @@
       {{d-button action=(action "copy") class="pull-right no-text" icon="copy"}}
     {{/if}}
     <h4>{{i18n "ip_lookup.title"}}</h4>
-    <p class='powered-by'>{{{i18n "ip_lookup.powered_by"}}}</p>
+    <p class='powered-by'>{{i18n "ip_lookup.powered_by"}}</p>
     <dl>
       {{#if location}}
         {{#if location.hostname}}
diff --git a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
index e9d901d880..3c4fcf9491 100644
--- a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
@@ -5,7 +5,7 @@
     {{#if topic.unseen}}
       <span class="badge-notification new-topic"></span>
     {{/if}}
-    <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{{format-age topic.last_posted_at}}}</span>
+    <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{format-age topic.last_posted_at}}</span>
   </div>
 </td>
 <td class='num posts'>{{raw "list/post-count-or-badges" topic=topic postBadgesEnabled="true"}}</td>
diff --git a/app/assets/javascripts/discourse/templates/components/related-messages.hbs b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
index 84b7d42962..09e1abb1a1 100644
--- a/app/assets/javascripts/discourse/templates/components/related-messages.hbs
+++ b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
@@ -10,5 +10,5 @@
 </div>
 
 {{#if targetUser}}
-  <h3 class="see-all-pms-message">{{{i18n "related_messages.see_all" path=searchLink username=targetUser.username}}}</h3>
+  <h3 class="see-all-pms-message">{{i18n "related_messages.see_all" path=searchLink username=targetUser.username}}</h3>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
index 1bdcd280ff..25aeea0726 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
@@ -3,6 +3,6 @@
     {{#if showUsername}}
       {{#link-to 'user' post.user class="username"}}@{{post.user.username}}{{/link-to}}
     {{/if}}
-    {{{post.excerpt}}}
+    {{html-safe post.excerpt}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
index 09e196766f..2ac3b61ff7 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
@@ -17,7 +17,7 @@
       {{#if reviewable.blank_post}}
         <p>{{i18n "review.deleted_post"}}</p>
       {{else}}
-        {{{reviewable.cooked}}}
+        {{html-safe reviewable.cooked}}
       {{/if}}
     </div>
     {{plugin-outlet name="after-reviewable-flagged-post-body" args=(hash model=reviewable)}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
index 2d432a53b4..7b3a7a2f2a 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
@@ -46,7 +46,7 @@
   <div class='reviewable-actions'>
     {{#if claimEnabled}}
       <div class='claimed-actions'>
-        <span class='help'>{{{claimHelp}}}</span>
+        <span class='help'>{{html-safe claimHelp}}</span>
         {{reviewable-claimed-topic topicId=topicId claimedBy=reviewable.claimed_by}}
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
index aa9a2f0fe2..847cc42154 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
@@ -49,7 +49,7 @@
 {{#if rs.reason}}
   <tr>
     <td colspan='7'>
-      <div class='reviewable-score-reason'>{{{rs.reason}}}</div>
+      <div class='reviewable-score-reason'>{{html-safe rs.reason}}</div>
     </td>
   </tr>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
index 4c5c717be3..dc03f52d54 100644
--- a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
@@ -1,7 +1,7 @@
 <div id="second-factor">
   <h3>{{secondFactorTitle}}</h3>
   {{#if optionalText}}
-    <p>{{{optionalText}}}</p>
+    <p>{{html-safe optionalText}}</p>
   {{/if}}
   <p>{{secondFactorDescription}}</p>
   {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
index b166c42071..1808d6cc1f 100644
--- a/app/assets/javascripts/discourse/templates/components/share-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
@@ -1,5 +1,5 @@
 <div class="header">
-  <h3 class="title">{{{shareTitle}}}</h3>
+  <h3 class="title">{{html-safe shareTitle}}</h3>
 </div>
 
 <div class="body">
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index 6f0428b1aa..54e8029cf6 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -1,5 +1,5 @@
 <div class="title">
-  <h3>{{{shareTitle}}}</h3>
+  <h3>{{html-safe shareTitle}}</h3>
 
   {{#if date}}
     <span class="date">{{displayDate}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/share-source.hbs b/app/assets/javascripts/discourse/templates/components/share-source.hbs
index 32fa1adb65..eaee0823d0 100644
--- a/app/assets/javascripts/discourse/templates/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-source.hbs
@@ -2,6 +2,6 @@
   {{#if source.icon}}
     {{d-icon source.icon}}
   {{else}}
-    {{{source.htmlIcon}}}
+    {{html-safe source.htmlIcon}}
   {{/if}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
index 23b2d45ae2..d42eb1b177 100644
--- a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
+++ b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
@@ -2,7 +2,7 @@
   {{#if publishing}}
     {{i18n "shared_drafts.publishing"}}
   {{else}}
-    {{{i18n "shared_drafts.notice" category=topic.category.name}}}
+    {{i18n "shared_drafts.notice" category=topic.category.name}}
 
     <div class='publish-field'>
       <label>{{i18n "shared_drafts.destination_category"}}</label>
diff --git a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
index ffd142b1be..ae7db1c907 100644
--- a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
@@ -13,4 +13,4 @@
   {{/if}}
 </div>
 
-<h3 class="suggested-topics-message">{{{browseMoreMessage}}}</h3>
+<h3 class="suggested-topics-message">{{html-safe browseMoreMessage}}</h3>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
index 3b616fec81..aa1f4889d1 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
@@ -32,7 +32,7 @@
     {{#if tagInfo.synonyms}}
       <div class="synonyms-list">
         <h3>{{i18n "tagging.synonyms"}}</h3>
-        <div>{{{i18n "tagging.synonyms_description" base_tag_name=tagInfo.name}}}</div>
+        <div>{{i18n "tagging.synonyms_description" base_tag_name=tagInfo.name}}</div>
         <div class="tag-list">
           {{#each tagInfo.synonyms as |tag|}}
             <div class='tag-box'>
diff --git a/app/assets/javascripts/discourse/templates/components/text-overflow.hbs b/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
index 05a4439029..3606bb98a0 100644
--- a/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
+++ b/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
@@ -1 +1 @@
-{{{text}}}
+{{html-safe text}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
index 7b7fb58b8b..227674d60c 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
@@ -1,7 +1,7 @@
 {{#d-button action=(action "enterTop") class="full jump-top"}}
-  {{d-icon 'step-backward'}} {{{topDate}}}
+  {{d-icon 'step-backward'}} {{html-safe topDate}}
 {{/d-button}}
 
 {{#d-button action=(action "enterBottom") class="full jump-bottom"}}
-  {{{bottomDate}}} {{d-icon 'step-forward'}}
+  {{html-safe bottomDate}} {{d-icon 'step-forward'}}
 {{/d-button}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index f6956782a9..3bfdf96268 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -144,7 +144,7 @@
         <div class="card-row">
           <div class="featured-topic">
             <span class="desc">{{i18n 'user.featured_topic'}}</span>
-            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{{user.featured_topic.fancy_title}}}{{/link-to}}
+            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{html-safe user.featured_topic.fancy_title}}{{/link-to}}
           </div>
         </div>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index fe91090dde..c09e659301 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,6 +1,6 @@
 {{#if field.name}}
   <label class="control-label" for={{concat 'user-' elementId}}>
-    {{{field.name}}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
+    {{html-safe field.name}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
   </label>
 {{/if}}
 
@@ -8,7 +8,7 @@
   <label class="control-label checkbox-label">
     {{input id=(concat 'user-' elementId) checked=value type="checkbox"}}
     <span>
-      {{{field.description}}}   {{#unless field.name}}{{#if field.required}}<span class='required'>*</span>{{/if}}{{/unless}}
+      {{html-safe field.description}}   {{#unless field.name}}{{#if field.required}}<span class='required'>*</span>{{/if}}{{/unless}}
     </span>
   </label>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index 136585cb03..fd3cb91917 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,4 +1,4 @@
-<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{combo-box
@@ -10,5 +10,5 @@
     none=noneLabel
     onChange=(action (mut value))
   }}
-  <div class="instructions">{{{field.description}}}</div>
+  <div class="instructions">{{html-safe field.description}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 4549f721af..1c33ea1452 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,6 +1,6 @@
-<label class="control-label" for={{concat 'user-' elementId}}>{{{field.name}}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{input id=(concat 'user-' elementId) value=value maxlength=site.user_field_max_length}}
-  <div class="instructions">{{{field.description}}}</div>
+  <div class="instructions">{{html-safe field.description}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index 87b1a220e1..69704bf892 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -9,5 +9,5 @@
 </span>
 <span class='label'>
   {{#if icon}}{{d-icon icon}}{{/if}}
-  {{{i18n label count=value}}}
+  {{i18n label count=value}}
 </span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index a87439ad35..f6da96aa0c 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -2,7 +2,7 @@
   <a href={{item.userUrl}} data-user-card={{item.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
   <span class='time'>{{format-date item.created_at}}</span>
   {{#if item.draftType}}
-    <span class='draft-type'>{{{item.draftType}}}</span>
+    <span class='draft-type'>{{html-safe item.draftType}}</span>
   {{else}}
     {{expand-post item=item}}
   {{/if}}
@@ -11,9 +11,9 @@
       {{topic-status topic=item disableActions=true}}
       <span class="title">
         {{#if item.postUrl}}
-          <a href={{item.postUrl}}>{{{item.title}}}</a>
+          <a href={{item.postUrl}}>{{html-safe item.title}}</a>
         {{else}}
-          {{{item.title}}}
+          {{html-safe item.title}}
         {{/if}}
       </span>
     </div>
@@ -36,11 +36,13 @@
 {{/if}}
 
 <p class='excerpt' data-topic-id={{item.topic_id}} data-post-id={{item.post_id}} data-user-id={{item.user_id}}>
+  {{!-- template-lint-disable no-triple-curlies --}}
   {{~#if item.expandedExcerpt}}
     {{~{item.expandedExcerpt}~}}
   {{else}}
     {{~{item.excerpt}~}}
   {{/if~}}
+  {{!-- template-lint-enable --}}
 </p>
 
 {{#each item.children as |child|}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
index 07f7c03cd8..970592ece4 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -6,4 +6,4 @@
   {{/if}}
 </span>
 <br>
-<a href={{url}}>{{{topic.fancyTitle}}}</a>
+<a href={{url}}>{{html-safe topic.fancyTitle}}</a>
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index ce1e7af458..43af40a527 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -204,7 +204,7 @@
                   {{d-button action=(action "togglePreview") class="hide-preview" label="composer.hide_preview"}}
                 {{/if}}
               {{else}}
-                <a href {{action "togglePreview"}} class='toggle-preview'>{{{toggleText}}}</a>
+                <a href {{action "togglePreview"}} class='toggle-preview'>{{html-safe toggleText}}</a>
               {{/if}}
 
           </div>
@@ -221,7 +221,7 @@
 
         <div class='draft-text'>
           {{#if model.topic}}
-            {{d-icon "share"}} {{{draftTitle}}}
+            {{d-icon "share"}} {{html-safe draftTitle}}
           {{else}}
             {{i18n "composer.saved_draft"}}
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
index e37bdb2aa0..238de27da0 100644
--- a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
@@ -1,3 +1,3 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
 {{#if message.title}}<h3>{{message.title}}</h3>{{/if}}
-<p>{{{message.body}}}</p>
+<p>{{html-safe message.body}}</p>
diff --git a/app/assets/javascripts/discourse/templates/composer/education.hbs b/app/assets/javascripts/discourse/templates/composer/education.hbs
index c2d574cb69..269e44e595 100644
--- a/app/assets/javascripts/discourse/templates/composer/education.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/education.hbs
@@ -1,2 +1,2 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
-{{{message.body}}}
+{{html-safe message.body}}
diff --git a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
index c2d574cb69..269e44e595 100644
--- a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
@@ -1,2 +1,2 @@
 <a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
-{{{message.body}}}
+{{html-safe message.body}}
diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/templates/discovery.hbs
index 6801ab3f55..1c8f879125 100644
--- a/app/assets/javascripts/discourse/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery.hbs
@@ -1,5 +1,5 @@
 {{#if errorHtml}}
-  {{{errorHtml}}}
+  {{html-safe errorHtml}}
 {{else}}
   <div class="container">
     {{discourse-banner user=currentUser banner=site.banner}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 355e18f1b8..9394f35486 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -49,7 +49,7 @@
 
       <div class='search-info'>
         <div class='result-count'>
-          {{{resultCountLabel}}}
+          {{html-safe resultCountLabel}}
         </div>
         <div class='sort-by'>
           <span class='desc'>
@@ -88,7 +88,7 @@
 
                   <a class='search-link' href={{result.url}} {{action "logClick" result.topic_id}}>
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
-                    <span class='topic-title'>{{#highlight-text highlight=q}}{{{result.topic.fancyTitle}}}{{/highlight-text}}</span>
+                    <span class='topic-title'>{{#highlight-text highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
                   </a>
 
                   <div class='search-category'>
@@ -113,7 +113,7 @@
 
                   {{#if result.blurb}}
                     {{#highlight-text highlight=highlightQuery}}
-                      {{{result.blurb}}}
+                      {{html-safe result.blurb}}
                     {{/highlight-text}}
                   {{/if}}
                 </div>
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 8385894c0c..1bc9734c13 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -26,7 +26,7 @@
       <hr>
 
       <div class='group-bio'>
-        <p>{{{model.bio_cooked}}}</p>
+        <p>{{html-safe model.bio_cooked}}</p>
       </div>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/templates/groups/index.hbs
index 21cbe557a9..36d0a644b1 100644
--- a/app/assets/javascripts/discourse/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/index.hbs
@@ -51,7 +51,7 @@
                     </span>
                   </div>
 
-                  <div class="group-description">{{{group.bio_excerpt}}}</div>
+                  <div class="group-description">{{html-safe group.bio_excerpt}}</div>
 
                   <div class="group-membership">
                     {{#group-membership-button tagName='' model=group showLogin=(route-action "showLogin")}}
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index 42216317ee..f2f1e73678 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -10,12 +10,12 @@
     <div class="col-form">
       {{#if successMessage}}
         <br><br>
-        <div class='alert alert-info'><p>{{{successMessage}}}</p></div>
+        <div class='alert alert-info'><p>{{html-safe successMessage}}</p></div>
       {{else}}
         <p>{{i18n 'invites.invited_by'}}</p>
         <p>{{user-info user=invitedBy}}</p>
 
-        <p>{{{yourEmailMessage}}}
+        <p>{{html-safe yourEmailMessage}}
         {{#if externalAuthsEnabled}}
              {{i18n 'invites.social_login_available'}}
         {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/list/activity-column.hbr b/app/assets/javascripts/discourse/templates/list/activity-column.hbr
index 723bb80e84..384909db02 100644
--- a/app/assets/javascripts/discourse/templates/list/activity-column.hbr
+++ b/app/assets/javascripts/discourse/templates/list/activity-column.hbr
@@ -1,4 +1,4 @@
-<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{{topic.bumpedAtTitle}}}">
+<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{html-safe topic.bumpedAtTitle}}">
   <a class="post-activity" href="{{topic.lastPostUrl}}">
     {{~raw-plugin-outlet name="topic-list-before-relative-date"~}}
     {{~format-date topic.bumpedAt format="tiny" noTitle="true"~}}
diff --git a/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr b/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
index 1c7b5eead0..2257a669cb 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
+++ b/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
@@ -1,6 +1,6 @@
 {{#if topic.hasExcerpt}}
   <div class="topic-excerpt">
-    {{{dir-span topic.escapedExcerpt}}}
+    {{dir-span topic.escapedExcerpt}}
     {{#if topic.excerptTruncated}}
       <a href="{{topic.url}}">{{i18n 'read_more'}}</a>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index d8a06c33c7..0949b56ee7 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -24,7 +24,7 @@
               {{/if}}
               {{#if t.hasExcerpt}}
                 <div class="topic-excerpt">
-                  {{{t.excerpt}}}
+                  {{html-safe t.excerpt}}
                   {{#if t.excerptTruncated}}
                     {{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
                   {{/if}}
@@ -42,7 +42,7 @@
               {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
               <div class="pull-right">
                 {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
-                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{{raw-date t.bumped_at}}}'>{{t.last_poster_username}}</a>
+                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
               </div>
               {{#unless hideCategory}}
                 <div class='category'>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index 5418fcb86a..0421edce8a 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -13,7 +13,7 @@
             {{#if c.description_excerpt}}
               <tr class="category-description">
                 <td colspan="3">
-                  {{{c.description_excerpt}}}
+                  {{html-safe c.description_excerpt}}
                 </td>
               </tr>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
index bebe6a385e..ca6140be54 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
@@ -1,7 +1,7 @@
 {{#if selectedHtml}}
   <li>
     <a href class='expander' {{action 'toggleExpanded'}}>
-      <span>{{{selectedHtml}}}</span>
+      <span>{{html-safe selectedHtml}}</span>
       {{d-icon "caret-down"}}
     </a>
   </li>
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
index 5469574977..7439589d5c 100644
--- a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}}
+  {{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}
 {{/d-modal-body}}
 
 {{modal-footer-close closeModal=(route-action "closeModal")}}
diff --git a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
index 1b08a4974b..5390227a2e 100644
--- a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body title="user.auth_tokens.was_this_you"}}
   <div>
     <p>{{i18n 'user.auth_tokens.was_this_you_description'}}</p>
-    <p>{{{i18n 'user.second_factor.extended_description'}}}</p>
+    <p>{{i18n 'user.second_factor.extended_description'}}</p>
   </div>
 
   <div>
@@ -21,9 +21,9 @@
       </h3>
 
       {{#if expanded}}
-        <blockquote>{{{latest_post.cooked}}}</blockquote>
+        <blockquote>{{html-safe latest_post.cooked}}</blockquote>
       {{else}}
-        <blockquote>{{{latest_post.excerpt}}}</blockquote>
+        <blockquote>{{html-safe latest_post.excerpt}}</blockquote>
       {{/if}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
index cdaab1cc1c..10e5c4bf26 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
@@ -10,11 +10,11 @@
   {{else}}
     <div class="avatar-choice">
       {{radio-button id="system-avatar" name="avatar" value="system" selection=selected}}
-      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{{i18n 'user.change_avatar.letter_based'}}}</label>
+      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{i18n 'user.change_avatar.letter_based'}}</label>
     </div>
     <div class="avatar-choice">
       {{radio-button id="gravatar" name="avatar" value="gravatar" selection=selected}}
-      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{{i18n 'user.change_avatar.gravatar'}}} {{user.email}}</span></label>
+      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{i18n 'user.change_avatar.gravatar'}} {{user.email}}</span></label>
 
       {{d-button action=(action "refreshGravatar")
                  title="user.change_avatar.refresh_gravatar_title"
@@ -23,7 +23,7 @@
                  class="btn-default avatar-selector-refresh-gravatar"}}
 
       {{#if gravatarFailed}}
-        <p class="error">{{I18n 'user.change_avatar.gravatar_failed'}}</p>
+        <p class="error">{{i18n 'user.change_avatar.gravatar_failed'}}</p>
       {{/if}}
     </div>
     {{#if allowAvatarUpload}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 254f1bfbee..0098c5b237 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -38,7 +38,7 @@
           <!-- {{tap-tile icon="calendar-alt" text=(I18n "bookmarks.reminders.custom") tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}} -->
         {{/tap-tile-grid}}
       {{else}}
-        <div class="alert alert-info">{{{i18n "bookmarks.no_timezone" basePath=basePath }}}</div>
+        <div class="alert alert-info">{{i18n "bookmarks.no_timezone" basePath=basePath }}</div>
       {{/if}}
     </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
index 97f8003781..0cfc45782d 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
@@ -2,7 +2,7 @@
   <div class='controls'>
     <label class='radio'>
       {{radio-button value=level.id name="notification_level" selection=notificationLevelId}} <strong>{{level.name}}</strong>
-      <div class='description'>{{{level.description}}}</div>
+      <div class='description'>{{html-safe level.description}}</div>
     </label>
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index 0c0890f2b9..1069c0d2fa 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -1,6 +1,6 @@
 {{#d-modal-body class='change-ownership'}}
   <span>
-    {{{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}}
+    {{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}
   </span>
 
   <form>
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 448508de65..5c77b2a0a6 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -126,7 +126,7 @@
           {{/d-button}}
         {{/conditional-loading-spinner}}
 
-      <div class='disclaimer'>{{{disclaimerHtml}}}</div>
+      <div class='disclaimer'>{{html-safe disclaimerHtml}}</div>
       </div>
 
       {{plugin-outlet name="create-account-after-modal-footer" tagName=""}}
diff --git a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
index e35eaecc19..61e693a9af 100644
--- a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  <p>{{{i18n "post.controls.delete_topic_disallowed_modal"}}}</p>
+  <p>{{i18n "post.controls.delete_topic_disallowed_modal"}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(route-action "closeModal") class="btn-primary" label="close"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
index 6abe868295..0c3f9e443d 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
@@ -34,7 +34,7 @@
                    label="category.delete"}}
 
         <div class="cannot_delete_reason {{if hiddenTooltip "hidden" ""}}">
-          {{{model.cannot_delete_reason}}}
+          {{html-safe model.cannot_delete_reason}}
         </div>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index 965a407815..be55ea8460 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -6,9 +6,9 @@
           <p>
             {{#conditional-loading-spinner size="small" condition=loading}}
               {{#if pinnedGloballyCount}}
-                {{{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}}
+                {{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}
               {{else}}
-                {{{i18n "topic.feature_topic.not_pinned_globally"}}}
+                {{i18n "topic.feature_topic.not_pinned_globally"}}
               {{/if}}
             {{/conditional-loading-spinner}}
           </p>
@@ -16,12 +16,12 @@
         {{else}}
           <p>
             {{#conditional-loading-spinner size="small" condition=loading}}
-              {{{alreadyPinnedMessage}}}
+              {{html-safe alreadyPinnedMessage}}
             {{/conditional-loading-spinner}}
           </p>
           <p>{{i18n "topic.feature_topic.pin_note"}}</p>
         {{/if}}
-        <p>{{{unPinMessage}}}</p>
+        <p>{{html-safe unPinMessage}}</p>
         <p>{{d-button action=(action "unpin") icon="thumbtack" label="topic.feature.unpin" class="btn-primary"}}</p>
       </div>
     </div>
@@ -30,7 +30,7 @@
       <div class="desc">
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
-            {{{alreadyPinnedMessage}}}
+            {{html-safe alreadyPinnedMessage}}
           {{/conditional-loading-spinner}}
         </p>
         <p>
@@ -38,7 +38,7 @@
         </p>
         {{#if site.isMobileDevice}}
           <p>
-            {{{pinMessage}}}
+            {{html-safe pinMessage}}
           </p>
           <p class="with-validation">
             {{future-date-input
@@ -52,7 +52,7 @@
           </p>
         {{else}}
           <p class="with-validation">
-            {{{pinMessage}}}
+            {{html-safe pinMessage}}
             {{d-icon "far-clock"}}
             {{future-date-input
               class="pin-until"
@@ -74,9 +74,9 @@
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
             {{#if pinnedGloballyCount}}
-              {{{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}}
+              {{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}
             {{else}}
-              {{{i18n "topic.feature_topic.not_pinned_globally"}}}
+              {{i18n "topic.feature_topic.not_pinned_globally"}}
             {{/if}}
           {{/conditional-loading-spinner}}
         </p>
@@ -123,9 +123,9 @@
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
             {{#if bannerCount}}
-              {{{i18n "topic.feature_topic.banner_exists"}}}
+              {{i18n "topic.feature_topic.banner_exists"}}
             {{else}}
-              {{{i18n "topic.feature_topic.no_banner_exists"}}}
+              {{i18n "topic.feature_topic.no_banner_exists"}}
             {{/if}}
           {{/conditional-loading-spinner}}
         </p>
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index 8d438dd80a..19be52ceb5 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
@@ -1,7 +1,7 @@
 <form>
   {{#d-modal-body class="forgot-password-modal"}}
     {{#if offerHelp}}
-      {{{offerHelp}}}
+      {{html-safe offerHelp}}
     {{else}}
       <label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label>
       {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index 6d9dbff78e..c81dfe2238 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -21,7 +21,7 @@
           &mdash; {{disabled-icon icon="shield-alt" disabled=postTypeDisabled}}
         {{/if}}
         {{#if model.category_id_changes}}
-          &mdash; {{{previousCategory}}} &rarr; {{{currentCategory}}}
+          &mdash; {{html-safe previousCategory}} &rarr; {{html-safe currentCategory}}
         {{/if}}
       {{/unless}}
     </div>
@@ -50,7 +50,7 @@
   <div id="revisions" data-post-id={{model.post_id}} class={{hiddenClasses}}>
     {{#if model.title_changes}}
       <div class="row">
-        <h2>{{{titleDiff}}}</h2>
+        <h2>{{html-safe titleDiff}}</h2>
       </div>
     {{/if}}
     {{#if site.mobileView}}
@@ -72,7 +72,7 @@
       {{/if}}
       {{#if model.category_id_changes}}
         <div class="row">
-          {{{previousCategory}}} &rarr; {{{currentCategory}}}
+          {{html-safe previousCategory}} &rarr; {{html-safe currentCategory}}
         </div>
       {{/if}}
     {{/if}}
@@ -100,7 +100,7 @@
     {{plugin-outlet name="post-revisions" args=(hash model=model)}}
 
     {{#links-redirect class="row"}}
-      {{{bodyDiff}}}
+      {{html-safe bodyDiff}}
     {{/links-redirect}}
   </div>
 {{/d-modal-body}}
@@ -111,7 +111,7 @@
       {{d-button class="btn-default" action=(action "loadPreviousVersion") icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}}
       <div id="revision-numbers" class={{unless displayRevisions 'invisible'}}>
         {{#conditional-loading-spinner condition=loading size="small"}}
-          {{{revisionsText}}}
+          {{html-safe revisionsText}}
         {{/conditional-loading-spinner}}
       </div>
       {{d-button class="btn-default" action=(action "loadNextVersion") icon="forward" title="post.revisions.controls.next" disabled=loadNextDisabled}}
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 493a9e03a5..2203c90174 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -3,29 +3,29 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.jump_to.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.jump_to.home}}}</li>
-        <li>{{{shortcuts.jump_to.latest}}}</li>
-        <li>{{{shortcuts.jump_to.new}}}</li>
-        <li>{{{shortcuts.jump_to.unread}}}</li>
-        <li>{{{shortcuts.jump_to.categories}}}</li>
-        <li>{{{shortcuts.jump_to.top}}}</li>
-        <li>{{{shortcuts.jump_to.bookmarks}}}</li>
-        <li>{{{shortcuts.jump_to.profile}}}</li>
+        <li>{{html-safe shortcuts.jump_to.home}}</li>
+        <li>{{html-safe shortcuts.jump_to.latest}}</li>
+        <li>{{html-safe shortcuts.jump_to.new}}</li>
+        <li>{{html-safe shortcuts.jump_to.unread}}</li>
+        <li>{{html-safe shortcuts.jump_to.categories}}</li>
+        <li>{{html-safe shortcuts.jump_to.top}}</li>
+        <li>{{html-safe shortcuts.jump_to.bookmarks}}</li>
+        <li>{{html-safe shortcuts.jump_to.profile}}</li>
         {{#if siteSettings.enable_personal_messages}}
-          <li>{{{shortcuts.jump_to.messages}}}</li>
+          <li>{{html-safe shortcuts.jump_to.messages}}</li>
         {{/if}}
-        <li>{{{shortcuts.jump_to.drafts}}}</li>
+        <li>{{html-safe shortcuts.jump_to.drafts}}</li>
       </ul>
     </section>
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.navigation.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.navigation.back}}}</li>
-        <li>{{{shortcuts.navigation.jump}}}</li>
-        <li>{{{shortcuts.navigation.up_down}}}</li>
-        <li>{{{shortcuts.navigation.open}}}</li>
-        <li>{{{shortcuts.navigation.next_prev}}}</li>
-        <li>{{{shortcuts.navigation.go_to_unread_post}}}</li>
+        <li>{{html-safe shortcuts.navigation.back}}</li>
+        <li>{{html-safe shortcuts.navigation.jump}}</li>
+        <li>{{html-safe shortcuts.navigation.up_down}}</li>
+        <li>{{html-safe shortcuts.navigation.open}}</li>
+        <li>{{html-safe shortcuts.navigation.next_prev}}</li>
+        <li>{{html-safe shortcuts.navigation.go_to_unread_post}}</li>
       </ul>
     </section>
   </div>
@@ -33,26 +33,26 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.application.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.application.hamburger_menu}}}</li>
-        <li>{{{shortcuts.application.user_profile_menu}}}</li>
-        <li>{{{shortcuts.application.show_incoming_updated_topics}}}</li>
-        <li>{{{shortcuts.application.search}}}</li>
-        <li>{{{shortcuts.application.help}}}</li>
-        <li>{{{shortcuts.application.dismiss_new_posts}}}</li>
-        <li>{{{shortcuts.application.dismiss_topics}}}</li>
-        <li>{{{shortcuts.application.log_out}}}</li>
+        <li>{{html-safe shortcuts.application.hamburger_menu}}</li>
+        <li>{{html-safe shortcuts.application.user_profile_menu}}</li>
+        <li>{{html-safe shortcuts.application.show_incoming_updated_topics}}</li>
+        <li>{{html-safe shortcuts.application.search}}</li>
+        <li>{{html-safe shortcuts.application.help}}</li>
+        <li>{{html-safe shortcuts.application.dismiss_new_posts}}</li>
+        <li>{{html-safe shortcuts.application.dismiss_topics}}</li>
+        <li>{{html-safe shortcuts.application.log_out}}</li>
       </ul>
     </section>
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.composing.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.composing.return}}}</li>
-        <li>{{{shortcuts.composing.fullscreen}}}</li>
-        <li>{{{shortcuts.application.create}}}</li>
-        <li>{{{shortcuts.actions.reply_as_new_topic}}}</li>
-        <li>{{{shortcuts.actions.reply_topic}}}</li>
-        <li>{{{shortcuts.actions.reply_post}}}</li>
-        <li>{{{shortcuts.actions.quote_post}}}</li>
+        <li>{{html-safe shortcuts.composing.return}}</li>
+        <li>{{html-safe shortcuts.composing.fullscreen}}</li>
+        <li>{{html-safe shortcuts.application.create}}</li>
+        <li>{{html-safe shortcuts.actions.reply_as_new_topic}}</li>
+        <li>{{html-safe shortcuts.actions.reply_topic}}</li>
+        <li>{{html-safe shortcuts.actions.reply_post}}</li>
+        <li>{{html-safe shortcuts.actions.quote_post}}</li>
       </ul>
     </section>
   </div>
@@ -60,22 +60,22 @@
     <section>
       <h4>{{i18n "keyboard_shortcuts_help.actions.title"}}</h4>
       <ul>
-        <li>{{{shortcuts.actions.bookmark_topic}}}</li>
-        <li>{{{shortcuts.actions.pin_unpin_topic}}}</li>
-        <li>{{{shortcuts.actions.share_topic}}}</li>
-        <li>{{{shortcuts.actions.share_post}}}</li>
-        <li>{{{shortcuts.actions.like}}}</li>
-        <li>{{{shortcuts.actions.flag}}}</li>
-        <li>{{{shortcuts.actions.bookmark}}}</li>
-        <li>{{{shortcuts.actions.edit}}}</li>
-        <li>{{{shortcuts.actions.delete}}}</li>
-        <li>{{{shortcuts.actions.mark_muted}}}</li>
-        <li>{{{shortcuts.actions.mark_regular}}}</li>
-        <li>{{{shortcuts.actions.mark_tracking}}}</li>
-        <li>{{{shortcuts.actions.mark_watching}}}</li>
-        <li>{{{shortcuts.actions.defer}}}</li>
-        <li>{{{shortcuts.actions.print}}}</li>
-        <li>{{{shortcuts.actions.topic_admin_actions}}}</li>
+        <li>{{html-safe shortcuts.actions.bookmark_topic}}</li>
+        <li>{{html-safe shortcuts.actions.pin_unpin_topic}}</li>
+        <li>{{html-safe shortcuts.actions.share_topic}}</li>
+        <li>{{html-safe shortcuts.actions.share_post}}</li>
+        <li>{{html-safe shortcuts.actions.like}}</li>
+        <li>{{html-safe shortcuts.actions.flag}}</li>
+        <li>{{html-safe shortcuts.actions.bookmark}}</li>
+        <li>{{html-safe shortcuts.actions.edit}}</li>
+        <li>{{html-safe shortcuts.actions.delete}}</li>
+        <li>{{html-safe shortcuts.actions.mark_muted}}</li>
+        <li>{{html-safe shortcuts.actions.mark_regular}}</li>
+        <li>{{html-safe shortcuts.actions.mark_tracking}}</li>
+        <li>{{html-safe shortcuts.actions.mark_watching}}</li>
+        <li>{{html-safe shortcuts.actions.defer}}</li>
+        <li>{{html-safe shortcuts.actions.print}}</li>
+        <li>{{html-safe shortcuts.actions.topic_admin_actions}}</li>
       </ul>
     </section>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
index 893d934246..ae591397a7 100644
--- a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
@@ -17,7 +17,7 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}}</p>
+        <p>{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
@@ -31,7 +31,7 @@
     {{/if}}
 
     {{#if existingMessage}}
-      <p>{{{i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount}}}</p>
+      <p>{{i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount}}</p>
       <form>
         {{choose-message currentTopicId=model.id selectedTopicId=selectedTopicId}}
 
@@ -64,7 +64,7 @@
     </div>
 
     {{#if existingTopic}}
-      <p>{{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}}</p>
+      <p>{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}</p>
       <form>
         {{choose-topic currentTopicId=model.id selectedTopicId=selectedTopicId}}
       </form>
@@ -72,7 +72,7 @@
 
     {{#if canSplitTopic}}
       {{#if newTopic}}
-        <p>{{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}}</p>
+        <p>{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}</p>
         <form>
           <label>{{i18n 'topic.split_topic.topic_name'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
@@ -93,7 +93,7 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}}</p>
+        <p>{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
index aa312d5125..e9d93aa8f6 100644
--- a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{{i18n 'login.not_activated' sentTo=sentTo}}}
+  {{i18n 'login.not_activated' sentTo=sentTo}}
 {{/d-modal-body}}
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
index 46f37bfe80..3687b9fb2b 100644
--- a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body}}
   <p>{{i18n "review.approval.description"}}</p>
 
-  <p>{{{i18n "review.approval.pending_posts" count=model.pending_count}}}</p>
+  <p>{{i18n "review.approval.pending_posts" count=model.pending_count}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(route-action "closeModal") class="btn-primary" label="review.approval.ok"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
index 36ede3f634..c6539a2e52 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{{i18n 'user.second_factor.enable_security_key_description'}}}
+        {{i18n 'user.second_factor.enable_security_key_description'}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
index 2b52edea7b..9caf24fc46 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{{i18n 'user.second_factor.enable_description'}}}
+        {{i18n 'user.second_factor.enable_description'}}
       </div>
     </div>
 
@@ -18,7 +18,7 @@
       <div class="controls">
         <div class="qr-code-container">
           <div class="qr-code">
-            {{{secondFactorImage}}}
+            {{html-safe secondFactorImage}}
           </div>
         </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
index 5981f4a118..713bdbfcc4 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
@@ -14,7 +14,7 @@
     {{/if}}
 
     {{#if backupEnabled}}
-      {{{i18n "user.second_factor_backup.remaining_codes" count=remainingCodes}}}
+      {{i18n "user.second_factor_backup.remaining_codes" count=remainingCodes}}
     {{/if}}
 
     <div class="actions">
diff --git a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
index 9b10ef6c29..fe3ce8be48 100644
--- a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
@@ -1,4 +1,4 @@
 {{#d-modal-body}}
-  <p>{{{i18n 'topics.bulk.selected' count=model.topics.length}}}</p>
+  <p>{{i18n 'topics.bulk.selected' count=model.topics.length}}</p>
   {{outlet "bulkOutlet"}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index f45a2e5014..6d44492afe 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -9,7 +9,7 @@
         width=category.uploaded_logo.width
         height=category.uploaded_logo.height}}
       {{#if category.description}}
-        <p>{{{dir-span category.description}}}</p>
+        <p>{{dir-span category.description}}</p>
       {{/if}}
     {{/if}}
   </section>
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index fd8f57c54c..fc6c00a13b 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -86,7 +86,7 @@
           <h2>{{i18n "user.second_factor_backup.title"}}</h2>
           {{#if model.second_factor_enabled}}
             {{#if model.second_factor_backup_enabled}}
-              {{{i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes}}}
+              {{i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes}}
             {{else}}
               {{i18n 'user.second_factor_backup.enable_long'}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 8a505401fa..62743b5a5a 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -9,7 +9,7 @@
   </div>
   {{#if siteSettings.enable_mentions}}
     <div class='instructions'>
-      {{{i18n 'user.username.short_instructions' username=model.username}}}
+      {{i18n 'user.username.short_instructions' username=model.username}}
     </div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index d277cea511..bd9aa411ac 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -73,7 +73,7 @@
   <div class='control-group pref-mailing-list-mode'>
     <label class="control-label">{{i18n 'user.mailing_list_mode.label'}}</label>
     {{preference-checkbox labelKey="user.mailing_list_mode.enabled" checked=model.user_option.mailing_list_mode}}
-    <div class='instructions'>{{{i18n 'user.mailing_list_mode.instructions'}}}</div>
+    <div class='instructions'>{{i18n 'user.mailing_list_mode.instructions'}}</div>
     {{#if model.user_option.mailing_list_mode}}
       <div class='controls controls-dropdown'>
         {{combo-box
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index b0040894dc..e6fe5381ed 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -66,7 +66,7 @@
     <label class="control-label">{{i18n 'user.featured_topic'}}</label>
     {{#if model.featured_topic}}
       <label class="featured-topic-link">
-      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{{model.featured_topic.fancy_title}}}{{/link-to}}
+      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe model.featured_topic.fancy_title}}{{/link-to}}
       </label>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/templates/static.hbs
index 107f4350f8..aee9390704 100644
--- a/app/assets/javascripts/discourse/templates/static.hbs
+++ b/app/assets/javascripts/discourse/templates/static.hbs
@@ -2,7 +2,7 @@
   {{#watch-read action=(action "markFaqRead") path=model.path}}
     <div class='contents clearfix body-page'>
       {{plugin-outlet name="above-static"}}
-      {{{model.html}}}
+      {{html-safe model.html}}
 
       {{#if showSignupButton}}
         {{d-button action=(route-action "showCreateAccount") class="btn-primary sign-up-button" label="sign_up"}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index bcb1a81b0f..7950ca19ec 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -74,7 +74,7 @@
             {{#if model.details.loaded}}
               {{topic-status topic=model}}
               <a href={{model.url}} {{action "jumpTop"}} class="fancy-title">
-                {{{model.fancyTitle}}}
+                {{html-safe model.fancyTitle}}
               </a>
             {{/if}}
 
@@ -264,7 +264,7 @@
               {{#if model.queued_posts_count}}
                 <div class="has-pending-posts">
                   <div>
-                    {{{i18n "review.topic_has_pending" count=model.queued_posts_count}}}
+                    {{i18n "review.topic_has_pending" count=model.queued_posts_count}}
                   </div>
 
                   {{#link-to 'review' (query-params topic_id=model.id type="ReviewableQueuedPost" status="pending")}}
@@ -351,7 +351,7 @@
     <div class="container">
       {{#conditional-loading-spinner condition=noErrorYet}}
         {{#if model.errorHtml}}
-          <div class="not-found">{{{model.errorHtml}}}</div>
+          <div class="not-found">{{html-safe model.errorHtml}}</div>
         {{else}}
           <div class="topic-error">
             <div>{{model.errorMessage}}</div>
diff --git a/app/assets/javascripts/discourse/templates/unknown.hbs b/app/assets/javascripts/discourse/templates/unknown.hbs
index 0e9e6b9625..5ff548e033 100644
--- a/app/assets/javascripts/discourse/templates/unknown.hbs
+++ b/app/assets/javascripts/discourse/templates/unknown.hbs
@@ -1,3 +1,3 @@
 <div class='container'>
-  {{{model}}}
+  {{html-safe model}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 517e147e90..f8f5effb60 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -72,11 +72,11 @@
                       <td>{{format-date invite.user.last_seen_at}}</td>
                       <td>{{number invite.user.topics_entered}}</td>
                       <td>{{number invite.user.posts_read_count}}</td>
-                      <td>{{{format-duration invite.user.time_read}}}</td>
+                      <td>{{format-duration invite.user.time_read}}</td>
                       <td>
-                        <span title={{i18n 'user.invited.days_visited'}}>{{{invite.user.days_visited}}}</span>
+                        <span title={{i18n 'user.invited.days_visited'}}>{{html-safe invite.user.days_visited}}</span>
                           /
-                        <span title={{i18n 'user.invited.account_age_days'}}>{{{invite.user.days_since_created}}}</span>
+                        <span title={{i18n 'user.invited.account_age_days'}}>{{html-safe invite.user.days_since_created}}</span>
                       </td>
                     {{/if}}
                   {{else}}
@@ -109,7 +109,7 @@
         {{else}}
           <div class="user-invite-none">
             {{#if canBulkInvite}}
-              {{{i18n 'user.invited.bulk_invite.none'}}}
+              {{i18n 'user.invited.bulk_invite.none'}}
             {{else}}
               {{i18n 'user.invited.none'}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index d1c61ab805..377177843e 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -100,7 +100,7 @@
             {{#if showFeaturedTopic}}
               <h3 class="featured-topic">
                 <span>{{i18n 'user.featured_topic'}}</span>
-                {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{{model.featured_topic.fancy_title}}}{{/link-to}}
+                {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe model.featured_topic.fancy_title}}{{/link-to}}
               </h3>
             {{/if}}
 
@@ -137,7 +137,7 @@
                 </div>
               {{/if}}
               {{#if isNotSuspendedOrIsStaff}}
-                {{{model.bio_cooked}}}
+                {{html-safe model.bio_cooked}}
               {{/if}}
             </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs
index 1af06a86d9..de791d9420 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -1,4 +1,4 @@
 {{#if model.noContent}}
-  <div class='alert alert-info'>{{{model.noContentHelp}}}</div>
+  <div class='alert alert-info'>{{html-safe model.noContentHelp}}</div>
 {{/if}}
 {{user-stream stream=model}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index 71b4737522..26ee193bde 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -87,7 +87,7 @@
               </a>
               <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=link.clicks}}'>{{number link.clicks}}</span>
               <br>
-              <a href="{{link.post_url}}">{{{link.topic.fancyTitle}}}</a>
+              <a href="{{link.post_url}}">{{html-safe link.topic.fancyTitle}}</a>
             </li>
           {{/each}}
         </ul>
diff --git a/app/assets/javascripts/select-kit/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
index db51a397f8..cff579c047 100644
--- a/app/assets/javascripts/select-kit/templates/components/category-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
@@ -9,8 +9,8 @@
   </div>
 
   {{#if shouldDisplayDescription}}
-    <div class="category-desc">{{{dir-span description}}}</div>
+    <div class="category-desc">{{dir-span description}}</div>
   {{/if}}
 {{else}}
-  {{{label}}}
+  {{html-safe label}}
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
index 1c070006ad..e654ef8a11 100644
--- a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
@@ -8,6 +8,6 @@
 {{/if}}
 
 <div class="texts">
-  <span class="name">{{{label}}}</span>
-  <span class="desc">{{{description}}}</span>
+  <span class="name">{{html-safe label}}</span>
+  <span class="desc">{{html-safe description}}</span>
 </div>
diff --git a/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs b/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
index 31fc07f1dc..f54bdb6b5f 100644
--- a/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
@@ -1,5 +1,5 @@
 {{pinned-options value=pinned topic=topic}}
 
 <p class="reason">
-  {{{reasonText}}}
+  {{html-safe reasonText}}
 </p>
diff --git a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
index 2bf3a9a122..a57b6b8584 100644
--- a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
@@ -10,6 +10,6 @@
 
 {{#if appendReason}}
   <p class="reason">
-    {{{topic.details.notificationReasonText}}}
+    {{html-safe topic.details.notificationReasonText}}
   </p>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/radio-button.hbs b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
index e93347513a..c3a82790be 100644
--- a/app/assets/javascripts/wizard/templates/components/radio-button.hbs
+++ b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
@@ -8,7 +8,7 @@
   </span>
   {{#if extraLabel}}
     <span class='extra-label'>
-      {{{extraLabel}}}
+      {{html-safe extraLabel}}
     </span>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
index 8f804940fb..7510570b5d 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
@@ -2,7 +2,7 @@
   <span class='label-value'>{{field.label}}</span>
 
   {{#if field.description}}
-    <div class='field-description'>{{{field.description}}}</div>
+    <div class='field-description'>{{html-safe field.description}}</div>
   {{/if}}
 </label>
 
@@ -11,5 +11,5 @@
 </div>
 
 {{#if field.errorDescription}}
-  <div class='field-error-description'>{{{field.errorDescription}}}</div>
+  <div class='field-error-description'>{{html-safe field.errorDescription}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
index beb821930d..4f0686acf7 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -8,7 +8,7 @@
   {{/if}}
 
   {{#if step.description}}
-    <p class='wizard-step-description'>{{{step.description}}}</p>
+    <p class='wizard-step-description'>{{html-safe step.description}}</p>
   {{/if}}
 
   {{#wizard-step-form step=step}}
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index d7e73c3d08..6fb9ecf7c6 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -85,7 +85,7 @@
             <label class="control-label">
               {{i18n "discourse_local_dates.create.form.recurring_title"}}
             </label>
-            <p>{{{i18n "discourse_local_dates.create.form.recurring_description"}}}</p>
+            <p>{{i18n "discourse_local_dates.create.form.recurring_description"}}</p>
             <div class="controls">
               {{combo-box
                 content=recurringOptions
diff --git a/test/javascripts/components/html-safe-helper-test.js.es6 b/test/javascripts/components/html-safe-helper-test.js.es6
new file mode 100644
index 0000000000..364f99a6e4
--- /dev/null
+++ b/test/javascripts/components/html-safe-helper-test.js.es6
@@ -0,0 +1,14 @@
+import componentTest from "helpers/component-test";
+moduleForComponent("html-safe-helper", { integration: true });
+
+componentTest("default", {
+  template: "{{html-safe string}}",
+
+  beforeEach() {
+    this.set("string", "<p class='cookies'>biscuits</p>");
+  },
+
+  async test(assert) {
+    assert.ok(exists("p.cookies"), "it displays the string as html");
+  }
+});
diff --git a/test/javascripts/lib/computed-test.js.es6 b/test/javascripts/lib/computed-test.js.es6
index 0a94485f44..253673e5b6 100644
--- a/test/javascripts/lib/computed-test.js.es6
+++ b/test/javascripts/lib/computed-test.js.es6
@@ -5,7 +5,8 @@ import {
   propertyNotEqual,
   fmt,
   i18n,
-  url
+  url,
+  htmlSafe
 } from "discourse/lib/computed";
 
 QUnit.module("lib:computed", {
@@ -154,3 +155,12 @@ QUnit.test("url", assert => {
     "it supports urls with a prefix"
   );
 });
+
+QUnit.test("htmlSafe", assert => {
+  const cookies = "<p>cookies and <b>biscuits</b></p>";
+  const t = EmberObject.extend({
+    desc: htmlSafe("cookies")
+  }).create({ cookies });
+
+  assert.equal(t.get("desc").string, cookies);
+});

From 6fdb4c33a653304fba14b16f9f9cf44e6dbb00cb Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 10:34:58 +0100
Subject: [PATCH 0162/1830] DEV: popperjs 2.0.6 (#9171)

---
 package.json                        |   2 +-
 vendor/assets/javascripts/popper.js | 126 ++++++++++++++++------------
 yarn.lock                           |   8 +-
 3 files changed, 78 insertions(+), 58 deletions(-)

diff --git a/package.json b/package.json
index 8a03086233..7c327e06eb 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "dependencies": {
     "@fortawesome/fontawesome-free": "5.11.2",
-    "@popperjs/core": "v2.0.5",
+    "@popperjs/core": "v2.0.6",
     "ace-builds": "1.4.2",
     "bootbox": "3.2.0",
     "bootstrap": "v3.4.1",
diff --git a/vendor/assets/javascripts/popper.js b/vendor/assets/javascripts/popper.js
index c4dc478488..69224d9c9d 100644
--- a/vendor/assets/javascripts/popper.js
+++ b/vendor/assets/javascripts/popper.js
@@ -1,5 +1,5 @@
 /**
- * @popperjs/core v2.0.5 - MIT License
+ * @popperjs/core v2.0.6 - MIT License
  */
 
 (function (global, factory) {
@@ -208,7 +208,7 @@
   function getTrueOffsetParent(element) {
     var offsetParent;
 
-    if (!isHTMLElement(element) || !(offsetParent = element.offsetParent) || // https://github.com/popperjs/popper.js/issues/837
+    if (!isHTMLElement(element) || !(offsetParent = element.offsetParent) || // https://github.com/popperjs/popper-core/issues/837
     isFirefox() && getComputedStyle(offsetParent).position === 'fixed') {
       return null;
     }
@@ -427,7 +427,22 @@
     return placement.split('-')[0];
   }
 
-  var INVALID_ELEMENT_ERROR = 'Popper: Invalid reference or popper argument provided to Popper, they must be either a valid DOM element, virtual element, or a jQuery-wrapped DOM element.';
+  function mergeByName(modifiers) {
+    var merged = modifiers.reduce(function (merged, current) {
+      var existing = merged[current.name];
+      merged[current.name] = existing ? Object.assign({}, existing, {}, current, {
+        options: Object.assign({}, existing.options, {}, current.options),
+        data: Object.assign({}, existing.data, {}, current.data)
+      }) : current;
+      return merged;
+    }, {}); // IE11 does not support Object.values
+
+    return Object.keys(merged).map(function (key) {
+      return merged[key];
+    });
+  }
+
+  var INVALID_ELEMENT_ERROR = 'Popper: Invalid reference or popper argument provided. They must be either a DOM element or virtual element.';
   var INFINITE_LOOP_ERROR = 'Popper: An infinite loop in the modifiers cycle has been detected! The cycle has been interrupted to prevent a browser crash.';
   var DEFAULT_OPTIONS = {
     placement: 'bottom',
@@ -485,29 +500,23 @@
           }; // Orders the modifiers based on their dependencies and `phase`
           // properties
 
-          var orderedModifiers = orderModifiers([].concat(state.options.modifiers.filter(function (modifier) {
-            return !defaultModifiers.find(function (_ref) {
-              var name = _ref.name;
-              return name === modifier.name;
-            });
-          }), defaultModifiers.map(function (defaultModifier) {
-            return Object.assign({}, defaultModifier, {}, state.options.modifiers.find(function (_ref2) {
-              var name = _ref2.name;
-              return name === defaultModifier.name;
-            }));
-          }))); // Validate the provided modifiers so that the consumer will get warned
+          var orderedModifiers = orderModifiers(mergeByName([].concat(defaultModifiers, state.options.modifiers))); // Strip out disabled modifiers
+
+          state.orderedModifiers = orderedModifiers.filter(function (m) {
+            return m.enabled;
+          }); // Validate the provided modifiers so that the consumer will get warned
           // if one of the modifiers is invalid for any reason
 
           {
-            var modifiers = uniqueBy([].concat(orderedModifiers, state.options.modifiers), function (_ref3) {
-              var name = _ref3.name;
+            var modifiers = uniqueBy([].concat(orderedModifiers, state.options.modifiers), function (_ref) {
+              var name = _ref.name;
               return name;
             });
             validateModifiers(modifiers);
 
             if (getBasePlacement(state.options.placement) === auto) {
-              var flipModifier = orderedModifiers.find(function (_ref4) {
-                var name = _ref4.name;
+              var flipModifier = state.orderedModifiers.find(function (_ref2) {
+                var name = _ref2.name;
                 return name === 'flip';
               });
 
@@ -529,12 +538,8 @@
             })) {
               console.warn(['Popper: CSS "margin" styles cannot be used to apply padding', 'between the popper and its reference element or boundary.', 'To replicate margin, use the `offset` modifier, as well as', 'the `padding` option in the `preventOverflow` and `flip`', 'modifiers.'].join(' '));
             }
-          } // Strip out disabled modifiers
+          }
 
-
-          state.orderedModifiers = orderedModifiers.filter(function (m) {
-            return m.enabled;
-          });
           runModifierEffects();
           return instance.update();
         },
@@ -647,11 +652,11 @@
       // one.
 
       function runModifierEffects() {
-        state.orderedModifiers.forEach(function (_ref5) {
-          var name = _ref5.name,
-              _ref5$options = _ref5.options,
-              options = _ref5$options === void 0 ? {} : _ref5$options,
-              effect = _ref5.effect;
+        state.orderedModifiers.forEach(function (_ref3) {
+          var name = _ref3.name,
+              _ref3$options = _ref3.options,
+              options = _ref3$options === void 0 ? {} : _ref3$options,
+              effect = _ref3.effect;
 
           if (typeof effect === 'function') {
             var cleanupFn = effect({
@@ -834,7 +839,8 @@
   function roundOffsets(_ref) {
     var x = _ref.x,
         y = _ref.y;
-    var dpr = window.devicePixelRatio || 1;
+    var win = window;
+    var dpr = win.devicePixelRatio || 1;
     return {
       x: Math.round(x * dpr) / dpr || 0,
       y: Math.round(y * dpr) / dpr || 0
@@ -860,6 +866,7 @@
     var hasY = offsets.hasOwnProperty('y');
     var sideX = left;
     var sideY = top;
+    var win = window;
 
     if (adaptive) {
       var offsetParent = getOffsetParent(popper);
@@ -891,7 +898,7 @@
     if (gpuAcceleration) {
       var _Object$assign;
 
-      return Object.assign({}, commonStyles, (_Object$assign = {}, _Object$assign[sideY] = hasY ? '0' : '', _Object$assign[sideX] = hasX ? '0' : '', _Object$assign.transform = (window.devicePixelRatio || 1) < 2 ? "translate(" + x + "px, " + y + "px)" : "translate3d(" + x + "px, " + y + "px, 0)", _Object$assign));
+      return Object.assign({}, commonStyles, (_Object$assign = {}, _Object$assign[sideY] = hasY ? '0' : '', _Object$assign[sideX] = hasX ? '0' : '', _Object$assign.transform = (win.devicePixelRatio || 1) < 2 ? "translate(" + x + "px, " + y + "px)" : "translate3d(" + x + "px, " + y + "px, 0)", _Object$assign));
     }
 
     return Object.assign({}, commonStyles, (_Object$assign2 = {}, _Object$assign2[sideY] = hasY ? y + "px" : '', _Object$assign2[sideX] = hasX ? x + "px" : '', _Object$assign2.transform = '', _Object$assign2));
@@ -906,8 +913,13 @@
         adaptive = _options$adaptive === void 0 ? true : _options$adaptive;
 
     {
-      if (adaptive && parseFloat(getComputedStyle(state.elements.popper).transitionDuration)) {
-        console.warn(['Popper: The "computeStyles" modifier\'s `adaptive` option must be', 'disabled if CSS transitions are applied to the popper element.'].join(' '));
+      var _getComputedStyle = getComputedStyle(state.elements.popper),
+          transitionProperty = _getComputedStyle.transitionProperty;
+
+      if (adaptive && ['transform', 'top', 'right', 'bottom', 'left'].some(function (property) {
+        return transitionProperty.indexOf(property) >= 0;
+      })) {
+        console.warn(['Popper: Detected CSS transitions on at least one of the following', 'CSS properties: "transform", "top", "right", "bottom", "left".', '\n\n', 'Disable the "computeStyles" modifier\'s `adaptive` option to allow', 'for smooth transitions, or remove these properties from the CSS', 'transition declaration on the popper element if only transitioning', 'opacity or background-color for example.', '\n\n', 'We recommend using the popper element as a wrapper around an inner', 'element that can have any CSS property transitioned for animations.'].join(' '));
       }
     }
 
@@ -977,22 +989,32 @@
   function effect$1(_ref2) {
     var state = _ref2.state;
     var initialStyles = {
-      position: 'absolute',
-      left: '0',
-      top: '0',
-      margin: '0'
+      popper: {
+        position: 'absolute',
+        left: '0',
+        top: '0',
+        margin: '0'
+      },
+      arrow: {
+        position: 'absolute'
+      },
+      reference: {}
     };
-    Object.assign(state.elements.popper.style, initialStyles);
+    Object.assign(state.elements.popper.style, initialStyles.popper);
+
+    if (state.elements.arrow) {
+      Object.assign(state.elements.arrow.style, initialStyles.arrow);
+    }
+
     return function () {
       Object.keys(state.elements).forEach(function (name) {
         var element = state.elements[name];
-        var styleProperties = Object.keys(state.styles.hasOwnProperty(name) ? Object.assign({}, state.styles[name]) : initialStyles);
-        var attributes = state.attributes[name] || {}; // Set all values to an empty string to unset them
+        var attributes = state.attributes[name] || {};
+        var styleProperties = Object.keys(state.styles.hasOwnProperty(name) ? state.styles[name] : initialStyles[name]); // Set all values to an empty string to unset them
 
         var style = styleProperties.reduce(function (style, property) {
-          var _Object$assign;
-
-          return Object.assign({}, style, (_Object$assign = {}, _Object$assign[String(property)] = '', _Object$assign));
+          style[property] = '';
+          return style;
         }, {}); // arrow is optional + virtual elements
 
         if (!isHTMLElement(element) || !getNodeName(element)) {
@@ -1004,7 +1026,7 @@
 
         Object.assign(element.style, style);
         Object.keys(attributes).forEach(function (attribute) {
-          return element.removeAttribute(attribute);
+          element.removeAttribute(attribute);
         });
       });
     };
@@ -1362,17 +1384,15 @@
     var basePlacement = getBasePlacement(preferredPlacement);
     var isBasePlacement = basePlacement === preferredPlacement;
     var fallbackPlacements = specifiedFallbackPlacements || (isBasePlacement || !flipVariations ? [getOppositePlacement(preferredPlacement)] : getExpandedFallbackPlacements(preferredPlacement));
-    var placements = uniqueBy([preferredPlacement].concat(fallbackPlacements).reduce(function (acc, placement) {
-      return getBasePlacement(placement) === auto ? acc.concat(computeAutoPlacement(state, {
+    var placements = [preferredPlacement].concat(fallbackPlacements).reduce(function (acc, placement) {
+      return acc.concat(getBasePlacement(placement) === auto ? computeAutoPlacement(state, {
         placement: placement,
         boundary: boundary,
         rootBoundary: rootBoundary,
         padding: padding,
         flipVariations: flipVariations
-      })) : acc.concat(placement);
-    }, []), function (placement) {
-      return placement;
-    });
+      }) : placement);
+    }, []);
     var referenceRect = state.rects.reference;
     var popperRect = state.rects.popper;
     var checksMap = new Map();
@@ -1528,14 +1548,14 @@
       // reference is not overflowing as well (e.g. virtual elements with no
       // width or height)
 
-      var arrowLen = within(0, Math.abs(referenceRect[len] - arrowRect[len]), arrowRect[len]);
+      var arrowLen = within(0, referenceRect[len], arrowRect[len]);
       var minOffset = isBasePlacement ? referenceRect[len] / 2 - additive - arrowLen - arrowPaddingMin - tetherOffsetValue : minLen - arrowLen - arrowPaddingMin - tetherOffsetValue;
       var maxOffset = isBasePlacement ? -referenceRect[len] / 2 + additive + arrowLen + arrowPaddingMax + tetherOffsetValue : maxLen + arrowLen + arrowPaddingMax + tetherOffsetValue;
       var offsetModifierValue = state.modifiersData.offset ? state.modifiersData.offset[state.placement][mainAxis] : 0;
-      var tetherMin = state.modifiersData.popperOffsets[mainAxis] + minOffset - offsetModifierValue;
-      var tetherMax = state.modifiersData.popperOffsets[mainAxis] + maxOffset - offsetModifierValue;
+      var tetherMin = popperOffsets[mainAxis] + minOffset - offsetModifierValue;
+      var tetherMax = popperOffsets[mainAxis] + maxOffset - offsetModifierValue;
       var preventedOffset = within(tether ? Math.min(min, tetherMin) : min, offset, tether ? Math.max(max, tetherMax) : max);
-      state.modifiersData.popperOffsets[mainAxis] = preventedOffset;
+      popperOffsets[mainAxis] = preventedOffset;
       data[mainAxis] = preventedOffset - offset;
     }
 
diff --git a/yarn.lock b/yarn.lock
index 005db309fd..94d8af25c3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -134,10 +134,10 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@popperjs/core@v2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.0.5.tgz#90ff3013c747c499c8b1d9684b63a7334a057f7d"
-  integrity sha512-YOV1TitTNzJDXe/14sDJO/M/aL12Jhind0EkQRnqTX2167fqJsAICJfi0vsDdapPI1WaYsheyYYgy6PO02Nqqg==
+"@popperjs/core@v2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.0.6.tgz#5a39ac118811ca844155b0ad5190b8c24f35e533"
+  integrity sha512-zj7Gw8QC4jmR92eKUvtrZUEpl2ypRbq+qlE4pwf9n2hnUO9BOAcWUs4/Ht+gNIbFt98xtqhLvccdCfD469MzpQ==
 
 "@simple-dom/interface@^1.4.0":
   version "1.4.0"

From 0754c7c40479b95bb62db631008cc6dce6b6f708 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 11 Mar 2020 14:03:20 +0200
Subject: [PATCH 0163/1830] FIX: Various fixes to support posts with no user
 (#8877)

* Do not grant badges for posts with no user
* Ensure instructions are correct in Change Owner modal
* Hide user-dependent actions from posts with no user
* Make PostRevisor work with posts with no user
* Ensure posts with no user can be deleted
* discourse-narrative-bot should ignore posts with no user
* Skip TopicLink creation for posts with no user
---
 .../discourse/templates/modal/change-owner.hbs            | 4 +++-
 .../javascripts/discourse/widgets/post-admin-menu.js.es6  | 2 +-
 app/models/topic_link.rb                                  | 2 +-
 config/locales/client.en.yml                              | 3 +++
 lib/cooked_post_processor.rb                              | 2 +-
 lib/guardian/post_guardian.rb                             | 4 ++--
 lib/post_destroyer.rb                                     | 2 ++
 lib/post_revisor.rb                                       | 4 ++--
 plugins/discourse-narrative-bot/plugin.rb                 | 8 ++++----
 9 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index 1069c0d2fa..a4e0a35c9b 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -1,6 +1,8 @@
 {{#d-modal-body class='change-ownership'}}
   <span>
-    {{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}
+    {{i18n (if selectedPostsUsername 'topic.change_owner.instructions' 'topic.change_owner.instructions_without_old_user')
+           count=selectedPostsCount
+           old_user=selectedPostsUsername}}
   </span>
 
   <form>
diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
index 83e7734757..40dc1d3c85 100644
--- a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
@@ -73,7 +73,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
     });
   }
 
-  if (currentUser.staff) {
+  if (attrs.user_id && currentUser.staff) {
     if (siteSettings.enable_badges) {
       contents.push({
         icon: "certificate",
diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index ed0633ecd7..2fc9fd0b84 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -108,7 +108,7 @@ class TopicLink < ActiveRecord::Base
   end
 
   def self.extract_from(post)
-    return if post.blank? || post.whisper?
+    return if post.blank? || post.whisper? || post.user_id.blank?
 
     current_urls = []
     reflected_ids = []
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index dfee767514..ea18a5b17a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2420,6 +2420,9 @@ en:
         instructions:
           one: "Please choose a new owner for the post by <b>@{{old_user}}</b>"
           other: "Please choose a new owner for the {{count}} posts by <b>@{{old_user}}</b>"
+        instructions_without_old_user:
+          one: "Please choose a new owner for the post"
+          other: "Please choose a new owner for the {{count}} posts"
 
       change_timestamp:
         title: "Change Timestamp..."
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 3d85718fb5..bd56c12ca0 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -56,7 +56,7 @@ class CookedPostProcessor
   end
 
   def grant_badges
-    return unless Guardian.new.can_see?(@post)
+    return if @post.user.blank? || !Guardian.new.can_see?(@post)
 
     BadgeGranter.grant(Badge.find(Badge::FirstEmoji), @post.user, post_id: @post.id) if has_emoji?
     BadgeGranter.grant(Badge.find(Badge::FirstOnebox), @post.user, post_id: @post.id) if @has_oneboxes
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index 60936e7480..2bbc48f88f 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -30,7 +30,7 @@ module PostGuardian
     return false unless (can_see_post.nil? && can_see_post?(post)) || can_see_post
 
     # no warnings except for staff
-    return false if (action_key == :notify_user && !is_staff? && opts[:is_warning].present? && opts[:is_warning] == 'true')
+    return false if action_key == :notify_user && (post.user.blank? || (!is_staff? && opts[:is_warning].present? && opts[:is_warning] == 'true'))
 
     taken = opts[:taken_actions].try(:keys).to_a
     is_flag = PostActionType.notify_flag_types[action_key]
@@ -71,7 +71,7 @@ module PostGuardian
       not(post.trashed?) &&
 
       # don't like your own stuff
-      not(action_key == :like && is_my_own?(post))
+      not(action_key == :like && (post.user.blank? || is_my_own?(post)))
     end
 
     !!result
diff --git a/lib/post_destroyer.rb b/lib/post_destroyer.rb
index 1247346f26..578722543f 100644
--- a/lib/post_destroyer.rb
+++ b/lib/post_destroyer.rb
@@ -276,6 +276,8 @@ class PostDestroyer
   end
 
   def notify_deletion(reviewable)
+    return if @post.user.blank?
+
     allowed_user = @user.human? && @user.staff?
     return unless allowed_user && rs = reviewable.reviewable_scores.order('created_at DESC').first
 
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 981ff45f36..2685292e69 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -180,13 +180,13 @@ class PostRevisor
       @fields.has_key?('raw') &&
       @editor.staff? &&
       @editor != Discourse.system_user &&
-      !@post.user.staff?
+      !@post.user&.staff?
     )
       PostLocker.new(@post, @editor).lock
     end
 
     # We log staff edits to posts
-    if @editor.staff? && @editor.id != @post.user.id && @fields.has_key?('raw') && !@opts[:skip_staff_log]
+    if @editor.staff? && @editor.id != @post.user_id && @fields.has_key?('raw') && !@opts[:skip_staff_log]
       StaffActionLogger.new(@editor).log_post_edit(
         @post,
         old_raw: old_raw
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index 5ea07c9090..ea145c4873 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -178,7 +178,7 @@ after_initialize do
   self.on(:post_created) do |post, options|
     user = post.user
 
-    if user.enqueue_narrative_bot_job? && !options[:skip_bot]
+    if user&.enqueue_narrative_bot_job? && !options[:skip_bot]
       Jobs.enqueue(:bot_input,
         user_id: user.id,
         post_id: post.id,
@@ -188,7 +188,7 @@ after_initialize do
   end
 
   self.on(:post_edited) do |post|
-    if post.user.enqueue_narrative_bot_job?
+    if post.user&.enqueue_narrative_bot_job?
       Jobs.enqueue(:bot_input,
         user_id: post.user.id,
         post_id: post.id,
@@ -198,7 +198,7 @@ after_initialize do
   end
 
   self.on(:post_destroyed) do |post, options, user|
-    if user.enqueue_narrative_bot_job? && !options[:skip_bot]
+    if user&.enqueue_narrative_bot_job? && !options[:skip_bot]
       Jobs.enqueue(:bot_input,
         user_id: user.id,
         post_id: post.id,
@@ -209,7 +209,7 @@ after_initialize do
   end
 
   self.on(:post_recovered) do |post, _, user|
-    if user.enqueue_narrative_bot_job?
+    if user&.enqueue_narrative_bot_job?
       Jobs.enqueue(:bot_input,
         user_id: user.id,
         post_id: post.id,

From d1474e94a1bd46c9ddf21ba10c1270eb60cb3812 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 11 Mar 2020 13:30:45 +0000
Subject: [PATCH 0164/1830] FEATURE: Allow themes to specify modifiers in their
 about.json file (#9097)

There are three modifiers:
- serialize_topic_excerpts (boolean)
- csp_extensions (array of strings)
- svg_icons (array of strings)

When multiple themes are active, the values will be combined. The combination method varies based on the setting. CSP/SVG arrays will be combined. serialize_topic_excerpts will use `Enumerable#any`.
---
 app/models/remote_theme.rb                    |  7 ++
 app/models/theme.rb                           | 27 +++++++-
 app/models/theme_modifier_set.rb              | 69 +++++++++++++++++++
 app/serializers/listable_topic_serializer.rb  |  2 +-
 config/locales/server.en.yml                  |  1 +
 .../20200302120829_add_theme_modifier_set.rb  | 11 +++
 lib/content_security_policy/extension.rb      |  8 ++-
 lib/svg_sprite/svg_sprite.rb                  |  2 +
 lib/theme_modifier_helper.rb                  | 12 ++++
 spec/components/svg_sprite/svg_sprite_spec.rb | 10 +++
 .../theme_store/zip_exporter_spec.rb          |  1 +
 spec/lib/content_security_policy_spec.rb      | 15 ++++
 spec/lib/theme_flag_modifier_spec.rb          | 17 +++++
 spec/models/remote_theme_spec.rb              |  5 ++
 spec/models/theme_modifier_set_spec.rb        | 24 +++++++
 15 files changed, 205 insertions(+), 6 deletions(-)
 create mode 100644 app/models/theme_modifier_set.rb
 create mode 100644 db/migrate/20200302120829_add_theme_modifier_set.rb
 create mode 100644 lib/theme_modifier_helper.rb
 create mode 100644 spec/lib/theme_flag_modifier_spec.rb
 create mode 100644 spec/models/theme_modifier_set_spec.rb

diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb
index 24336ee4ff..6afa44c2a1 100644
--- a/app/models/remote_theme.rb
+++ b/app/models/remote_theme.rb
@@ -145,6 +145,13 @@ class RemoteTheme < ActiveRecord::Base
       raise ImportError, I18n.t("themes.import_error.about_json_values", errors: self.errors.full_messages.join(","))
     end
 
+    ThemeModifierSet::MODIFIERS.keys.each do |modifier_name|
+      theme.theme_modifier_set.public_send(:"#{modifier_name}=", theme_info.dig("modifiers", modifier_name.to_s))
+    end
+    if !theme.theme_modifier_set.valid?
+      raise ImportError, I18n.t("themes.import_error.modifier_values", errors: theme.theme_modifier_set.errors.full_messages.join(","))
+    end
+
     importer.all_files.each do |filename|
       next unless opts = ThemeField.opts_from_file_path(filename)
       value = importer[filename]
diff --git a/app/models/theme.rb b/app/models/theme.rb
index cce0005a60..35fd663092 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -17,6 +17,7 @@ class Theme < ActiveRecord::Base
   has_many :parent_themes, -> { order(:name) }, through: :parent_theme_relation, source: :parent_theme
   has_many :color_schemes
   belongs_to :remote_theme, dependent: :destroy
+  has_one :theme_modifier_set, dependent: :destroy
 
   has_one :settings_field, -> { where(target_id: Theme.targets[:settings], name: "yaml") }, class_name: 'ThemeField'
   has_one :javascript_cache, dependent: :destroy
@@ -34,6 +35,10 @@ class Theme < ActiveRecord::Base
     changed_schemes << scheme if scheme
   end
 
+  def theme_modifier_set
+    super || build_theme_modifier_set
+  end
+
   after_save do
     changed_colors.each(&:save!)
     changed_schemes.each(&:save!)
@@ -44,6 +49,8 @@ class Theme < ActiveRecord::Base
     changed_fields.each(&:save!)
     changed_fields.clear
 
+    theme_modifier_set.save!
+
     if saved_change_to_name?
       theme_fields.select(&:basic_html_field?).each(&:invalidate_baked!)
     end
@@ -112,8 +119,8 @@ class Theme < ActiveRecord::Base
   end
 
   def self.get_set_cache(key, &blk)
-    if val = @cache[key]
-      return val
+    if @cache.hash.key? key.to_s
+      return @cache[key]
     end
     @cache[key] = blk.call
   end
@@ -247,6 +254,15 @@ class Theme < ActiveRecord::Base
     (@cache[cache_key] = val || "").html_safe
   end
 
+  def self.lookup_modifier(theme_ids, modifier_name)
+    theme_ids = [theme_ids] unless Array === theme_ids
+
+    theme_ids = transform_ids(theme_ids)
+    get_set_cache("#{theme_ids.join(",")}:modifier:#{modifier_name}:#{ThemeField::COMPILER_VERSION}") do
+      ThemeModifierSet.resolve_modifier_for_themes(theme_ids, modifier_name)
+    end
+  end
+
   def self.remove_from_cache!
     clear_cache!
   end
@@ -521,6 +537,13 @@ class Theme < ActiveRecord::Base
         end
       end
 
+      meta[:modifiers] = {}.tap do |hash|
+        ThemeModifierSet::MODIFIERS.keys.each do |modifier|
+          value = self.theme_modifier_set.public_send(modifier)
+          hash[modifier] = value if !value.nil?
+        end
+      end
+
       meta[:learn_more] = "https://meta.discourse.org/t/beginners-guide-to-using-discourse-themes/91966"
 
     end
diff --git a/app/models/theme_modifier_set.rb b/app/models/theme_modifier_set.rb
new file mode 100644
index 0000000000..262b0638ae
--- /dev/null
+++ b/app/models/theme_modifier_set.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+class ThemeModifierSet < ActiveRecord::Base
+  class ThemeModifierSetError < StandardError; end
+
+  belongs_to :theme
+
+  MODIFIERS ||= {
+    serialize_topic_excerpts: { combine_mode: :any, type: :boolean },
+    csp_extensions: { combine_mode: :flatten, type: :string_array },
+    svg_icons: { combine_mode: :flatten, type: :string_array },
+  }
+
+  validate :type_validator
+
+  def type_validator
+    MODIFIERS.each do |k, config|
+      value = public_send(k)
+      next if value.nil?
+
+      case config[:type]
+      when :boolean
+        next if [true, false].include?(value)
+      when :string_array
+        next if value.is_a?(Array) && value.all? { |v| v.is_a?(String) }
+      end
+      errors.add(k, :invalid)
+    end
+  end
+
+  after_save do
+    if saved_change_to_svg_icons?
+      SvgSprite.expire_cache
+    end
+    if saved_change_to_csp_extensions?
+      CSP::Extension.clear_theme_extensions_cache!
+    end
+  end
+
+  # Given the ids of multiple active themes / theme components, this function
+  # will combine them into a 'resolved' behavior
+  def self.resolve_modifier_for_themes(theme_ids, modifier_name)
+    return nil if !(config = MODIFIERS[modifier_name])
+
+    all_values = self.where(theme_id: theme_ids).where.not(modifier_name => nil).pluck(modifier_name)
+    case config[:combine_mode]
+    when :any
+      all_values.any?
+    when :flatten
+      all_values.flatten(1)
+    else
+      raise ThemeModifierSetError "Invalid theme modifier combine_mode"
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: theme_modifier_sets
+#
+#  id                       :bigint           not null, primary key
+#  theme_id                 :bigint           not null
+#  serialize_topic_excerpts :boolean
+#  csp_extensions           :string           is an Array
+#  svg_icons                :string           is an Array
+#
+# Indexes
+#
+#  index_theme_modifier_sets_on_theme_id  (theme_id) UNIQUE
+#
diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb
index 8a169eb194..a00cd2f619 100644
--- a/app/serializers/listable_topic_serializer.rb
+++ b/app/serializers/listable_topic_serializer.rb
@@ -111,7 +111,7 @@ class ListableTopicSerializer < BasicTopicSerializer
   alias :include_new_posts? :has_user_data
 
   def include_excerpt?
-    pinned || SiteSetting.always_include_topic_excerpts
+    pinned || SiteSetting.always_include_topic_excerpts || ThemeModifierHelper.new(request: scope.request).serialize_topic_excerpts
   end
 
   def pinned
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index f4f234f8ec..0b1011a46c 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -83,6 +83,7 @@ en:
       generic: An error occured while importing that theme
       about_json: "Import Error: about.json does not exist, or is invalid"
       about_json_values: "about.json contains invalid values: %{errors}"
+      flag_values: "about.json flags contain invalid values: %{errors}"
       git: "Error cloning git repository, access is denied or repository is not found"
       unpack_failed: "Failed to unpack file"
       file_too_big: "The uncompressed file is too big."
diff --git a/db/migrate/20200302120829_add_theme_modifier_set.rb b/db/migrate/20200302120829_add_theme_modifier_set.rb
new file mode 100644
index 0000000000..a01be51985
--- /dev/null
+++ b/db/migrate/20200302120829_add_theme_modifier_set.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+class AddThemeModifierSet < ActiveRecord::Migration[6.0]
+  def change
+    create_table(:theme_modifier_sets) do |t|
+      t.references :theme, index: { unique: true }, null: false
+      t.column :serialize_topic_excerpts, :boolean
+      t.column :csp_extensions, :string, array: true
+      t.column :svg_icons, :string, array: true
+    end
+  end
+end
diff --git a/lib/content_security_policy/extension.rb b/lib/content_security_policy/extension.rb
index f782f91e26..5dd70223d0 100644
--- a/lib/content_security_policy/extension.rb
+++ b/lib/content_security_policy/extension.rb
@@ -44,16 +44,18 @@ class ContentSecurityPolicy
 
       Theme.where(id: Theme.transform_ids(theme_ids)).find_each do |theme|
         theme.cached_settings.each do |setting, value|
-          extensions << build_theme_extension(value) if setting.to_s == THEME_SETTING
+          extensions << build_theme_extension(value.split("|")) if setting.to_s == THEME_SETTING
         end
       end
 
+      extensions << build_theme_extension(ThemeModifierHelper.new(theme_ids: theme_ids).csp_extensions)
+
       extensions
     end
 
-    def build_theme_extension(raw)
+    def build_theme_extension(entries)
       {}.tap do |extension|
-        raw.split('|').each do |entry|
+        entries.each do |entry|
           directive, source = entry.split(':', 2).map(&:strip)
 
           extension[directive] ||= []
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index 264154d3a6..8751f114dc 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -399,6 +399,8 @@ License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL
       end
     end
 
+    theme_icon_settings |= ThemeModifierHelper.new(theme_ids: theme_ids).svg_icons
+
     theme_icon_settings
   end
 
diff --git a/lib/theme_modifier_helper.rb b/lib/theme_modifier_helper.rb
new file mode 100644
index 0000000000..3d72a6d35a
--- /dev/null
+++ b/lib/theme_modifier_helper.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+class ThemeModifierHelper
+  def initialize(request: nil, theme_ids: nil)
+    @theme_ids = theme_ids || request&.env&.[](:resolved_theme_ids)
+  end
+
+  ThemeModifierSet::MODIFIERS.keys.each do |modifier|
+    define_method(modifier) do
+      Theme.lookup_modifier(@theme_ids, modifier)
+    end
+  end
+end
diff --git a/spec/components/svg_sprite/svg_sprite_spec.rb b/spec/components/svg_sprite/svg_sprite_spec.rb
index f8acc0028b..a9614c5548 100644
--- a/spec/components/svg_sprite/svg_sprite_spec.rb
+++ b/spec/components/svg_sprite/svg_sprite_spec.rb
@@ -142,6 +142,16 @@ describe SvgSprite do
     expect(SvgSprite.all_icons([parent_theme.id])).to include("dragon")
   end
 
+  it 'includes icons defined in theme flags' do
+    theme = Fabricate(:theme)
+
+    expect(SvgSprite.all_icons([theme.id])).not_to include("dragon")
+
+    theme.theme_modifier_set.svg_icons = ["dragon"]
+    theme.save!
+    expect(SvgSprite.all_icons([theme.id])).to include("dragon")
+  end
+
   it 'includes custom icons from a sprite in a theme' do
     theme = Fabricate(:theme)
     fname = "custom-theme-icon-sprite.svg"
diff --git a/spec/components/theme_store/zip_exporter_spec.rb b/spec/components/theme_store/zip_exporter_spec.rb
index e8c460709b..30f41806c9 100644
--- a/spec/components/theme_store/zip_exporter_spec.rb
+++ b/spec/components/theme_store/zip_exporter_spec.rb
@@ -100,6 +100,7 @@ describe ThemeStore::ZipExporter do
             "tertiary": "858585"
           }
         },
+        "modifiers": {},
         "learn_more": "https://meta.discourse.org/t/beginners-guide-to-using-discourse-themes/91966"
       )
 
diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index a40865a481..fa81698019 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -165,6 +165,21 @@ describe ContentSecurityPolicy do
       expect(parse(theme_policy)['script-src']).to_not include('https://from-theme.net')
       expect(parse(theme_policy)['worker-src']).to_not include('from-theme.com')
     end
+
+    it 'can be extended by theme flags' do
+      policy # call this first to make sure further actions clear the cache
+
+      theme.theme_modifier_set.csp_extensions = ["script-src: https://from-theme-flag.script", "worker-src: from-theme-flag.worker"]
+      theme.save!
+
+      expect(parse(theme_policy)['script-src']).to include('https://from-theme-flag.script')
+      expect(parse(theme_policy)['worker-src']).to include('from-theme-flag.worker')
+
+      theme.destroy!
+
+      expect(parse(theme_policy)['script-src']).to_not include('https://from-theme-flag.script')
+      expect(parse(theme_policy)['worker-src']).to_not include('from-theme-flag.worker')
+    end
   end
 
   it 'can be extended by site setting' do
diff --git a/spec/lib/theme_flag_modifier_spec.rb b/spec/lib/theme_flag_modifier_spec.rb
new file mode 100644
index 0000000000..574c20db86
--- /dev/null
+++ b/spec/lib/theme_flag_modifier_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+require 'rails_helper'
+
+describe ThemeModifierHelper do
+  fab!(:theme) { Fabricate(:theme).tap { |t| t.theme_modifier_set.update!(serialize_topic_excerpts: true) } }
+
+  it "defines a getter for modifiers" do
+    tmh = ThemeModifierHelper.new(theme_ids: [theme.id])
+    expect(tmh.serialize_topic_excerpts).to eq(true)
+  end
+
+  it "can extract theme ids from a request object" do
+    request = Rack::Request.new({ resolved_theme_ids: [theme.id] })
+    tmh = ThemeModifierHelper.new(request: request)
+    expect(tmh.serialize_topic_excerpts).to eq(true)
+  end
+end
diff --git a/spec/models/remote_theme_spec.rb b/spec/models/remote_theme_spec.rb
index 6f5bab1df1..29cc4b939d 100644
--- a/spec/models/remote_theme_spec.rb
+++ b/spec/models/remote_theme_spec.rb
@@ -37,6 +37,9 @@ describe RemoteTheme do
               "love": "#{love_color}",
               "tertiary-low": "#{tertiary_low_color}"
             }
+          },
+          "modifiers": {
+            "serialize_topic_excerpts": true
           }
         }
       JSON
@@ -85,6 +88,8 @@ describe RemoteTheme do
       expect(remote.theme_version).to eq("1.0")
       expect(remote.minimum_discourse_version).to eq("1.0.0")
 
+      expect(@theme.theme_modifier_set.serialize_topic_excerpts).to eq(true)
+
       expect(@theme.theme_fields.length).to eq(9)
 
       mapped = Hash[*@theme.theme_fields.map { |f| ["#{f.target_id}-#{f.name}", f.value] }.flatten]
diff --git a/spec/models/theme_modifier_set_spec.rb b/spec/models/theme_modifier_set_spec.rb
new file mode 100644
index 0000000000..ca770f339f
--- /dev/null
+++ b/spec/models/theme_modifier_set_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+require 'rails_helper'
+
+describe ThemeModifierSet do
+  describe "#resolve_modifiers_for_themes" do
+    it "returns nil for unknown modifier" do
+      expect(ThemeModifierSet.resolve_modifier_for_themes([1, 2], :unknown_modifier)).to eq(nil)
+    end
+
+    it "resolves serialize_topic_excerpts correctly" do
+      t1 = Fabricate(:theme)
+      t1.theme_modifier_set.update!(serialize_topic_excerpts: true)
+      t2 = Fabricate(:theme)
+      t2.theme_modifier_set.update!(serialize_topic_excerpts: false)
+
+      expect(ThemeModifierSet.resolve_modifier_for_themes([t1.id, t2.id], :serialize_topic_excerpts)).to eq(true)
+
+      t1 = Fabricate(:theme)
+      t1.theme_modifier_set.update!(serialize_topic_excerpts: nil)
+
+      expect(ThemeModifierSet.resolve_modifier_for_themes([t1.id, t2.id], :serialize_topic_excerpts)).to eq(false)
+    end
+  end
+end

From fd4ce6ab8f0d252d06633119541d244163547398 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 14:42:14 +0100
Subject: [PATCH 0165/1830] DEV: hbs extensions are misleading in this case
 (#9170)

This would also prevent any linting tool to attempt to lint this incorrectly.
---
 ...ourse_topic_onebox.hbs => discourse_topic_onebox.mustache} | 0
 ...scourse_user_onebox.hbs => discourse_user_onebox.mustache} | 0
 lib/oneboxer.rb                                               | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/onebox/templates/{discourse_topic_onebox.hbs => discourse_topic_onebox.mustache} (100%)
 rename lib/onebox/templates/{discourse_user_onebox.hbs => discourse_user_onebox.mustache} (100%)

diff --git a/lib/onebox/templates/discourse_topic_onebox.hbs b/lib/onebox/templates/discourse_topic_onebox.mustache
similarity index 100%
rename from lib/onebox/templates/discourse_topic_onebox.hbs
rename to lib/onebox/templates/discourse_topic_onebox.mustache
diff --git a/lib/onebox/templates/discourse_user_onebox.hbs b/lib/onebox/templates/discourse_user_onebox.mustache
similarity index 100%
rename from lib/onebox/templates/discourse_user_onebox.hbs
rename to lib/onebox/templates/discourse_user_onebox.mustache
diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index 3a18a9dda1..4e3ab68cf8 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -261,7 +261,7 @@ module Oneboxer
         quote: PrettyText.unescape_emoji(post.excerpt(SiteSetting.post_onebox_maxlength)),
       }
 
-      template = File.read("#{Rails.root}/lib/onebox/templates/discourse_topic_onebox.hbs")
+      template = File.read("#{Rails.root}/lib/onebox/templates/discourse_topic_onebox.mustache")
       Mustache.render(template, args)
     end
   end
@@ -287,7 +287,7 @@ module Oneboxer
         original_url: url
       }
 
-      template = File.read("#{Rails.root}/lib/onebox/templates/discourse_user_onebox.hbs")
+      template = File.read("#{Rails.root}/lib/onebox/templates/discourse_user_onebox.mustache")
       Mustache.render(template, args)
     else
       nil

From a3f0543f99a9a49b9cc34d1444dd68ce2377051e Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 11 Mar 2020 09:43:55 -0400
Subject: [PATCH 0166/1830] Support for transpiling `.js` files (#9160)

* Remove some `.es6` from comments where it does not matter

* Use a post processor for transpilation

This will allow us to eventually use the directory structure to
transpile rather than the extension.

* FIX: Some errors and clean up in confirm-new-email

It would throw an error if the webauthn element wasn't present.
Also I changed things so that no-module is not explicitly
referenced.

* Remove `no-module`

Instead we allow a magic comment: `// discourse-skip-module` to prevent
the asset pipeline from creating a module.

* DEV: Enable babel transpilation based on directory

If it's in `app/assets/javascripts/dicourse` it will be transpiled
even without the `.es6` extension.

* REFACTOR: Remove Tilt/ES6ModuleTranspiler
---
 .eslintignore                                 |   2 +-
 Gemfile                                       |   3 -
 Gemfile.lock                                  |   1 -
 ....no-module.es6 => activate-account.js.es6} |   1 +
 ....js.no-module.es6 => auto-redirect.js.es6} |   1 +
 .../confirm-new-email/bootstrap.js.es6        |   4 +
 .../confirm-new-email.js.es6                  |  43 +++---
 .../confirm-new-email.no-module.js.es6        |   1 -
 .../second-factor-add-security-key.js.es6     |   2 +-
 .../discourse/lib/{ajax.js.es6 => ajax.js}    |   0
 .../lib/{autosize.js.es6 => autosize.js}      |   0
 .../discourse/lib/plugin-api.js.es6           |   2 +-
 .../discourse/lib/plugin-connectors.js.es6    |   2 +-
 ...no-module.es6 => embed-application.js.es6} |   1 +
 ...o-module.es6 => google-tag-manager.js.es6} |   1 +
 ....es6 => google-universal-analytics.js.es6} |   1 +
 ...o-module.es6 => onpopstate-handler.js.es6} |   1 +
 ...le.es6 => preload-application-data.js.es6} |   2 +
 ...t.js.no-module.es6 => wizard-start.js.es6} |   1 +
 .../show_confirm_new_email.html.erb           |  12 +-
 config/application.rb                         |   8 +-
 config/initializers/010-discourse_iife.rb     |  12 --
 lib/discourse.rb                              |   2 +-
 lib/discourse_iife.rb                         |  45 ------
 ..._template.rb => discourse_js_processor.rb} | 133 +++++++-----------
 lib/discourse_plugin_registry.rb              |   2 +-
 lib/es6_module_transpiler/rails.rb            |  27 ----
 lib/es6_module_transpiler/rails/version.rb    |   7 -
 lib/es6_module_transpiler/sprockets.rb        |   6 -
 lib/es6_module_transpiler/tilt.rb             |   6 -
 lib/freedom_patches/raw_handlebars.rb         |   4 +-
 lib/freedom_patches/zeitwerk.rb               |   1 -
 lib/pretty_text.rb                            |   9 +-
 lib/source_url.rb                             |  24 ----
 lib/theme_javascript_compiler.rb              |   8 +-
 ...odule.es6 => discourse-local-dates.js.es6} |   1 +
 plugins/discourse-local-dates/plugin.rb       |   2 +-
 spec/lib/discourse_js_processor_spec.rb       |  39 +++++
 38 files changed, 152 insertions(+), 265 deletions(-)
 rename app/assets/javascripts/{activate-account.js.no-module.es6 => activate-account.js.es6} (96%)
 rename app/assets/javascripts/{auto-redirect.js.no-module.es6 => auto-redirect.js.es6} (86%)
 create mode 100644 app/assets/javascripts/confirm-new-email/bootstrap.js.es6
 delete mode 100644 app/assets/javascripts/confirm-new-email/confirm-new-email.no-module.js.es6
 rename app/assets/javascripts/discourse/lib/{ajax.js.es6 => ajax.js} (100%)
 rename app/assets/javascripts/discourse/lib/{autosize.js.es6 => autosize.js} (100%)
 rename app/assets/javascripts/{embed-application.js.no-module.es6 => embed-application.js.es6} (98%)
 rename app/assets/javascripts/{google-tag-manager.js.no-module.es6 => google-tag-manager.js.es6} (96%)
 rename app/assets/javascripts/{google-universal-analytics.js.no-module.es6 => google-universal-analytics.js.es6} (97%)
 rename app/assets/javascripts/{onpopstate-handler.js.no-module.es6 => onpopstate-handler.js.es6} (89%)
 rename app/assets/javascripts/{preload-application-data.js.no-module.es6 => preload-application-data.js.es6} (97%)
 rename app/assets/javascripts/{wizard-start.js.no-module.es6 => wizard-start.js.es6} (79%)
 delete mode 100644 config/initializers/010-discourse_iife.rb
 delete mode 100644 lib/discourse_iife.rb
 rename lib/{es6_module_transpiler/tilt/es6_module_transpiler_template.rb => discourse_js_processor.rb} (66%)
 delete mode 100644 lib/es6_module_transpiler/rails.rb
 delete mode 100644 lib/es6_module_transpiler/rails/version.rb
 delete mode 100644 lib/es6_module_transpiler/sprockets.rb
 delete mode 100644 lib/es6_module_transpiler/tilt.rb
 delete mode 100644 lib/source_url.rb
 rename plugins/discourse-local-dates/assets/javascripts/{discourse-local-dates.js.no-module.es6 => discourse-local-dates.js.es6} (99%)
 create mode 100644 spec/lib/discourse_js_processor_spec.rb

diff --git a/.eslintignore b/.eslintignore
index 1806ae7c09..6676467368 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -3,7 +3,7 @@ app/assets/javascripts/main_include_admin.js
 app/assets/javascripts/vendor.js
 app/assets/javascripts/locales/i18n.js
 app/assets/javascripts/ember-addons/
-app/assets/javascripts/discourse/lib/autosize.js.es6
+app/assets/javascripts/discourse/lib/autosize.js
 lib/javascripts/locale/
 lib/javascripts/messageformat.js
 lib/highlight_js/
diff --git a/Gemfile b/Gemfile
index ced7f0376e..278e0fb961 100644
--- a/Gemfile
+++ b/Gemfile
@@ -120,9 +120,6 @@ gem 'sanitize'
 gem 'sidekiq'
 gem 'mini_scheduler'
 
-# for sidekiq web
-gem 'tilt', require: false
-
 gem 'execjs', require: false
 gem 'mini_racer'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index e00fc70b37..ed34096df2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -539,7 +539,6 @@ DEPENDENCIES
   stackprof
   test-prof
   thor
-  tilt
   uglifier
   unf
   unicorn
diff --git a/app/assets/javascripts/activate-account.js.no-module.es6 b/app/assets/javascripts/activate-account.js.es6
similarity index 96%
rename from app/assets/javascripts/activate-account.js.no-module.es6
rename to app/assets/javascripts/activate-account.js.es6
index 8d5691d0d8..b637b27763 100644
--- a/app/assets/javascripts/activate-account.js.no-module.es6
+++ b/app/assets/javascripts/activate-account.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 (function() {
   setTimeout(function() {
     const $activateButton = $("#activate-account-button");
diff --git a/app/assets/javascripts/auto-redirect.js.no-module.es6 b/app/assets/javascripts/auto-redirect.js.es6
similarity index 86%
rename from app/assets/javascripts/auto-redirect.js.no-module.es6
rename to app/assets/javascripts/auto-redirect.js.es6
index 1b54988740..0308edbb2e 100644
--- a/app/assets/javascripts/auto-redirect.js.no-module.es6
+++ b/app/assets/javascripts/auto-redirect.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 (function() {
   const path = document.getElementById("data-auto-redirect").dataset.path;
   setTimeout(function() {
diff --git a/app/assets/javascripts/confirm-new-email/bootstrap.js.es6 b/app/assets/javascripts/confirm-new-email/bootstrap.js.es6
new file mode 100644
index 0000000000..5754bc233c
--- /dev/null
+++ b/app/assets/javascripts/confirm-new-email/bootstrap.js.es6
@@ -0,0 +1,4 @@
+// discourse-skip-module
+(function() {
+  require("confirm-new-email/confirm-new-email");
+})();
diff --git a/app/assets/javascripts/confirm-new-email/confirm-new-email.js.es6 b/app/assets/javascripts/confirm-new-email/confirm-new-email.js.es6
index dbcfdd25c4..8a61d76df8 100644
--- a/app/assets/javascripts/confirm-new-email/confirm-new-email.js.es6
+++ b/app/assets/javascripts/confirm-new-email/confirm-new-email.js.es6
@@ -1,23 +1,26 @@
 import { getWebauthnCredential } from "discourse/lib/webauthn";
 
-document.getElementById("submit-security-key").onclick = function(e) {
-  e.preventDefault();
-  getWebauthnCredential(
-    document.getElementById("security-key-challenge").value,
-    document
-      .getElementById("security-key-allowed-credential-ids")
-      .value.split(","),
-    credentialData => {
-      document.getElementById("security-key-credential").value = JSON.stringify(
-        credentialData
-      );
+const security = document.getElementById("submit-security-key");
+if (security) {
+  security.onclick = function(e) {
+    e.preventDefault();
+    getWebauthnCredential(
+      document.getElementById("security-key-challenge").value,
+      document
+        .getElementById("security-key-allowed-credential-ids")
+        .value.split(","),
+      credentialData => {
+        document.getElementById(
+          "security-key-credential"
+        ).value = JSON.stringify(credentialData);
 
-      $(e.target)
-        .parents("form")
-        .submit();
-    },
-    errorMessage => {
-      document.getElementById("security-key-error").innerText = errorMessage;
-    }
-  );
-};
+        $(e.target)
+          .parents("form")
+          .submit();
+      },
+      errorMessage => {
+        document.getElementById("security-key-error").innerText = errorMessage;
+      }
+    );
+  };
+}
diff --git a/app/assets/javascripts/confirm-new-email/confirm-new-email.no-module.js.es6 b/app/assets/javascripts/confirm-new-email/confirm-new-email.no-module.js.es6
deleted file mode 100644
index 0dd05dd8ca..0000000000
--- a/app/assets/javascripts/confirm-new-email/confirm-new-email.no-module.js.es6
+++ /dev/null
@@ -1 +0,0 @@
-require("confirm-new-email/confirm-new-email").default();
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
index 14b0524b1c..935f71e263 100644
--- a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
+++ b/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
@@ -6,7 +6,7 @@ import {
   isWebauthnSupported
 } from "discourse/lib/webauthn";
 
-// model for this controller is user.js.es6
+// model for this controller is user
 export default Controller.extend(ModalFunctionality, {
   loading: false,
   errorMessage: null,
diff --git a/app/assets/javascripts/discourse/lib/ajax.js.es6 b/app/assets/javascripts/discourse/lib/ajax.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/ajax.js.es6
rename to app/assets/javascripts/discourse/lib/ajax.js
diff --git a/app/assets/javascripts/discourse/lib/autosize.js.es6 b/app/assets/javascripts/discourse/lib/autosize.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/autosize.js.es6
rename to app/assets/javascripts/discourse/lib/autosize.js
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 2fcedd76b9..bd55faf05c 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -848,7 +848,7 @@ class PluginApi {
    *
    * Example:
    *
-   * // read /discourse/lib/sharing.js.es6 for options
+   * // read discourse/lib/sharing for options
    * api.addSharingSource(options)
    *
    */
diff --git a/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6 b/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
index 8c6efa86a2..8bf830be89 100644
--- a/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
@@ -12,7 +12,7 @@ export function resetExtraClasses() {
 }
 
 // Note: In plugins, define a class by path and it will be wired up automatically
-// eg: discourse/connectors/<OUTLET NAME>/<CONNECTOR NAME>.js.es6
+// eg: discourse/connectors/<OUTLET NAME>/<CONNECTOR NAME>
 export function extraConnectorClass(name, obj) {
   _extraConnectorClasses[name] = obj;
 }
diff --git a/app/assets/javascripts/embed-application.js.no-module.es6 b/app/assets/javascripts/embed-application.js.es6
similarity index 98%
rename from app/assets/javascripts/embed-application.js.no-module.es6
rename to app/assets/javascripts/embed-application.js.es6
index 9cdda8267e..0cd8352991 100644
--- a/app/assets/javascripts/embed-application.js.no-module.es6
+++ b/app/assets/javascripts/embed-application.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 (function() {
   const referer = document.getElementById("data-embedded").dataset.referer;
 
diff --git a/app/assets/javascripts/google-tag-manager.js.no-module.es6 b/app/assets/javascripts/google-tag-manager.js.es6
similarity index 96%
rename from app/assets/javascripts/google-tag-manager.js.no-module.es6
rename to app/assets/javascripts/google-tag-manager.js.es6
index ebc19ad1bf..09a939dee1 100644
--- a/app/assets/javascripts/google-tag-manager.js.no-module.es6
+++ b/app/assets/javascripts/google-tag-manager.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 (function() {
   const gtmDataElement = document.getElementById("data-google-tag-manager");
   const dataLayerJson = JSON.parse(gtmDataElement.dataset.dataLayer);
diff --git a/app/assets/javascripts/google-universal-analytics.js.no-module.es6 b/app/assets/javascripts/google-universal-analytics.js.es6
similarity index 97%
rename from app/assets/javascripts/google-universal-analytics.js.no-module.es6
rename to app/assets/javascripts/google-universal-analytics.js.es6
index 76d59a1d41..cc1a8e351d 100644
--- a/app/assets/javascripts/google-universal-analytics.js.no-module.es6
+++ b/app/assets/javascripts/google-universal-analytics.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 /* eslint-disable */
 // prettier-ignore
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
diff --git a/app/assets/javascripts/onpopstate-handler.js.no-module.es6 b/app/assets/javascripts/onpopstate-handler.js.es6
similarity index 89%
rename from app/assets/javascripts/onpopstate-handler.js.no-module.es6
rename to app/assets/javascripts/onpopstate-handler.js.es6
index 014ec61bf2..f722a97615 100644
--- a/app/assets/javascripts/onpopstate-handler.js.no-module.es6
+++ b/app/assets/javascripts/onpopstate-handler.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 window.onpopstate = function(event) {
   // check if Discourse object exists if not take care of back navigation
   if (event.state && !window.hasOwnProperty("Discourse")) {
diff --git a/app/assets/javascripts/preload-application-data.js.no-module.es6 b/app/assets/javascripts/preload-application-data.js.es6
similarity index 97%
rename from app/assets/javascripts/preload-application-data.js.no-module.es6
rename to app/assets/javascripts/preload-application-data.js.es6
index af38129b7d..6c3852f5ca 100644
--- a/app/assets/javascripts/preload-application-data.js.no-module.es6
+++ b/app/assets/javascripts/preload-application-data.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 (function() {
   var ps = require("preload-store").default;
   var preloadedDataElement = document.getElementById("data-preloaded");
@@ -55,6 +56,7 @@
     Discourse.S3BaseUrl = setupData.s3BaseUrl;
   }
 
+  // eslint-disable-next-line
   Ember.RSVP.configure("onerror", function(e) {
     // Ignore TransitionAborted exceptions that bubble up
     if (e && e.message === "TransitionAborted") {
diff --git a/app/assets/javascripts/wizard-start.js.no-module.es6 b/app/assets/javascripts/wizard-start.js.es6
similarity index 79%
rename from app/assets/javascripts/wizard-start.js.no-module.es6
rename to app/assets/javascripts/wizard-start.js.es6
index 403ef66749..79c022f6fc 100644
--- a/app/assets/javascripts/wizard-start.js.no-module.es6
+++ b/app/assets/javascripts/wizard-start.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 (function() {
   var wizard = require("wizard/wizard").default.create();
   wizard.start();
diff --git a/app/views/users_email/show_confirm_new_email.html.erb b/app/views/users_email/show_confirm_new_email.html.erb
index 31108a7ac1..a1e0eda56e 100644
--- a/app/views/users_email/show_confirm_new_email.html.erb
+++ b/app/views/users_email/show_confirm_new_email.html.erb
@@ -73,10 +73,10 @@
     <%end%>
   <% end%>
 
-  <%= preload_script "ember_jquery" %>	
-  <%= preload_script "locales/#{I18n.locale}" %>	
-  <%= preload_script "locales/i18n" %>	
-  <%= preload_script "discourse/lib/webauthn" %>	
-  <%= preload_script "confirm-new-email/confirm-new-email" %>	
-  <%= preload_script "confirm-new-email/confirm-new-email.no-module" %>
+  <%= preload_script "ember_jquery" %>
+  <%= preload_script "locales/#{I18n.locale}" %>
+  <%= preload_script "locales/i18n" %>
+  <%= preload_script "discourse/lib/webauthn" %>
+  <%= preload_script "confirm-new-email/confirm-new-email" %>
+  <%= preload_script "confirm-new-email/bootstrap" %>
 </div>
diff --git a/config/application.rb b/config/application.rb
index e2b271c947..cf820c39dc 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -76,7 +76,6 @@ module Discourse
     # confused here if we load the deps without `lib` it thinks
     # discourse.rb is under the discourse folder incorrectly
     require_dependency 'lib/discourse'
-    require_dependency 'lib/es6_module_transpiler/rails'
     require_dependency 'lib/js_locale_helper'
 
     # tiny file needed by site settings
@@ -155,7 +154,7 @@ module Discourse
       locales/i18n.js
       discourse/lib/webauthn.js
       confirm-new-email/confirm-new-email.js
-      confirm-new-email/confirm-new-email.no-module.js
+      confirm-new-email/bootstrap.js
       onpopstate-handler.js
       embed-application.js
     }
@@ -244,6 +243,11 @@ module Discourse
     Sprockets.register_mime_type 'text/x-handlebars', extensions: ['.hbr']
     Sprockets.register_transformer 'text/x-handlebars', 'application/javascript', Ember::Handlebars::Template
 
+    require 'discourse_js_processor'
+
+    Sprockets.register_mime_type 'application/javascript', extensions: ['.js', '.es6', '.js.es6'], charset: :unicode
+    Sprockets.register_postprocessor 'application/javascript', DiscourseJsProcessor
+
     require 'discourse_redis'
     require 'logster/redis_store'
     # Use redis for our cache
diff --git a/config/initializers/010-discourse_iife.rb b/config/initializers/010-discourse_iife.rb
deleted file mode 100644
index 3405a62c4b..0000000000
--- a/config/initializers/010-discourse_iife.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require 'discourse_iife'
-
-Rails.application.config.assets.configure do |env|
-  env.register_preprocessor('application/javascript', DiscourseIIFE)
-
-  unless Rails.env.production?
-    require 'source_url'
-    env.register_postprocessor('application/javascript', SourceURL)
-  end
-end
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 7241dc1c35..0cbc4d8e4c 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -655,7 +655,7 @@ module Discourse
     # in case v8 was initialized we want to make sure it is nil
     PrettyText.reset_context
 
-    Tilt::ES6ModuleTranspilerTemplate.reset_context if defined? Tilt::ES6ModuleTranspilerTemplate
+    DiscourseJsProcessor::Transpiler.reset_context if defined? DiscourseJsProcessor::Transpiler
     JsLocaleHelper.reset_context if defined? JsLocaleHelper
     nil
   end
diff --git a/lib/discourse_iife.rb b/lib/discourse_iife.rb
deleted file mode 100644
index 4b702d55ff..0000000000
--- a/lib/discourse_iife.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-class DiscourseIIFE
-  def initialize(options = {}, &block)
-  end
-
-  def self.instance
-    @instance ||= new
-  end
-
-  def self.call(input)
-    instance.call(input)
-  end
-
-  # Add a IIFE around our javascript
-  def call(input)
-    path = input[:environment].context_class.new(input).pathname.to_s
-    data = input[:data]
-
-    # Only discourse or admin paths
-    return data unless (path =~ /\/javascripts\/discourse/ || path =~ /\/javascripts\/admin/ || path =~ /\/test\/javascripts/)
-
-    # Ignore the js helpers
-    return data if (path =~ /test\_helper\.js/)
-    return data if (path =~ /javascripts\/helpers\//)
-
-    # Ignore ES6 files
-    return data if (path =~ /\.es6/)
-
-    # Ignore translations
-    return data if (path =~ /\/translations/)
-
-    # We don't add IIFEs to handlebars
-    return data if path =~ /\.handlebars/
-    return data if path =~ /\.shbrs/
-    return data if path =~ /\.hbrs/
-    return data if path =~ /\.hbs/
-    return data if path =~ /\.hbr/
-
-    return data if path =~ /discourse-loader/
-
-    "(function () {\n\nvar $ = window.jQuery;\n// IIFE Wrapped Content Begins:\n\n#{data}\n\n// IIFE Wrapped Content Ends\n\n })(this);"
-  end
-
-end
diff --git a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb b/lib/discourse_js_processor.rb
similarity index 66%
rename from lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb
rename to lib/discourse_js_processor.rb
index f56f99d602..db276e2586 100644
--- a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb
+++ b/lib/discourse_js_processor.rb
@@ -1,28 +1,54 @@
 # frozen_string_literal: true
-
 require 'execjs'
 require 'mini_racer'
 
-module Tilt
+class DiscourseJsProcessor
 
-  class ES6ModuleTranspilerTemplate < Tilt::Template
-    self.default_mime_type = 'application/javascript'
+  def self.call(input)
+    root_path = input[:load_path] || ''
+    logical_path = (input[:filename] || '').sub(root_path, '').gsub(/\.(js|es6).*$/, '').sub(/^\//, '')
+    data = input[:data]
 
+    if should_transpile?(input[:filename])
+      data = transpile(data, root_path, logical_path)
+    end
+
+    # add sourceURL until we can do proper source maps
+    unless Rails.env.production?
+      data = "eval(#{data.inspect} + \"\\n//# sourceURL=#{logical_path}\");\n"
+    end
+
+    { data: data }
+  end
+
+  def self.transpile(data, root_path, logical_path)
+    transpiler = Transpiler.new(skip_module: skip_module?(data))
+    transpiler.perform(data, root_path, logical_path)
+  end
+
+  def self.should_transpile?(filename)
+    filename ||= ''
+
+    # es6 is always transpiled
+    return true if filename.end_with?(".es6") || filename.end_with?(".es6.erb")
+
+    # For .js check the path...
+    return false unless filename.end_with?(".js") || filename.end_with?(".js.erb")
+
+    relative_path = filename.sub(Rails.root.to_s, '').sub(/^\/*/, '')
+    relative_path.start_with?("app/assets/javascripts/discourse/")
+  end
+
+  def self.skip_module?(data)
+    !!(data.present? && data =~ /^\/\/ discourse-skip-module$/)
+  end
+
+  class Transpiler
     @mutex = Mutex.new
     @ctx_init = Mutex.new
 
-    def self.call(input)
-      filename = input[:filename]
-      source = input[:data]
-      context = input[:environment].context_class.new(input)
-
-      result = new(filename) { source }.render(context)
-      context.metadata.merge(data: result)
-    end
-
-    def prepare
-      # intentionally left empty
-      # Tilt requires this method to be defined
+    def self.mutex
+      @mutex
     end
 
     def self.create_new_context
@@ -66,33 +92,13 @@ JS
       @ctx
     end
 
-    class JavaScriptError < StandardError
-      attr_accessor :message, :backtrace
-
-      def initialize(message, backtrace)
-        @message = message
-        @backtrace = backtrace
-      end
-
+    def initialize(skip_module: false)
+      @skip_module = skip_module
     end
 
-    def self.protect
-      @mutex.synchronize do
-        yield
-      end
-    end
-
-    def babel_transpile(source)
+    def perform(source, root_path = nil, logical_path = nil)
       klass = self.class
-      klass.protect do
-        klass.v8.eval("console.prefix = 'BABEL: babel-eval: ';")
-        @output = klass.v8.eval(babel_source(source))
-      end
-    end
-
-    def module_transpile(source, root_path, logical_path)
-      klass = self.class
-      klass.protect do
+      klass.mutex.synchronize do
         klass.v8.eval("console.prefix = 'BABEL: babel-eval: ';")
         transpiled = babel_source(
           source,
@@ -103,31 +109,12 @@ JS
       end
     end
 
-    def evaluate(scope, locals, &block)
-      return @output if @output
-
-      klass = self.class
-      klass.protect do
-        klass.v8.eval("console.prefix = 'BABEL: #{scope.logical_path}: ';")
-
-        source = babel_source(
-          data,
-          module_name: module_name(scope.root_path, scope.logical_path),
-          filename: scope.logical_path
-        )
-
-        @output = klass.v8.eval(source)
-      end
-
-      @output
-    end
-
     def babel_source(source, opts = nil)
       opts ||= {}
 
       js_source = ::JSON.generate(source, quirks_mode: true)
 
-      if opts[:module_name] && transpile_into_module?
+      if opts[:module_name] && !@skip_module
         filename = opts[:filename] || 'unknown'
         "Babel.transform(#{js_source}, { moduleId: '#{opts[:module_name]}', filename: '#{filename}', ast: false, presets: ['es2015'], plugins: [['transform-es2015-modules-amd', {noInterop: true}], 'transform-decorators-legacy', exports.WidgetHbsCompiler] }).code"
       else
@@ -135,12 +122,6 @@ JS
       end
     end
 
-    private
-
-    def transpile_into_module?
-      file.nil? || file.exclude?('.no-module')
-    end
-
     def module_name(root_path, logical_path)
       path = nil
 
@@ -153,26 +134,8 @@ JS
         path = "discourse/plugins/#{plugin.name}/#{logical_path.sub(/javascripts\//, '')}" if plugin
       end
 
-      path ||= logical_path
-      if ES6ModuleTranspiler.transform
-        path = ES6ModuleTranspiler.transform.call(path)
-      end
-
-      path
+      path || logical_path
     end
 
-    def compiler_method
-      type = {
-        amd: 'AMD',
-        cjs: 'CJS',
-        globals: 'Globals'
-      }[ES6ModuleTranspiler.compile_to.to_sym]
-
-      "to#{type}"
-    end
-
-    def compiler_options
-      ::JSON.generate(ES6ModuleTranspiler.compiler_options, quirks_mode: true)
-    end
   end
 end
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index 0a604ef2d1..8e9dde7d82 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -151,7 +151,7 @@ class DiscoursePluginRegistry
     end
   end
 
-  JS_REGEX = /\.js$|\.js\.erb$|\.js\.es6|\.js\.no-module\.es6$/
+  JS_REGEX = /\.js$|\.js\.erb$|\.js\.es6$/
   HANDLEBARS_REGEX = /\.(hb[rs]|js\.handlebars)$/
 
   def self.register_asset(asset, opts = nil, plugin_directory_name = nil)
diff --git a/lib/es6_module_transpiler/rails.rb b/lib/es6_module_transpiler/rails.rb
deleted file mode 100644
index 9f72ac0a74..0000000000
--- a/lib/es6_module_transpiler/rails.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'es6_module_transpiler/rails/version'
-require 'es6_module_transpiler/tilt'
-require 'es6_module_transpiler/sprockets'
-
-module ES6ModuleTranspiler
-  def self.compile_to
-    @compile_to || :amd
-  end
-
-  def self.compile_to=(target)
-    @compile_to = target
-  end
-
-  def self.transform=(transform)
-    @transform = transform
-  end
-
-  def self.transform
-    @transform
-  end
-
-  def self.compiler_options
-    @compiler_options ||= {}
-  end
-end
diff --git a/lib/es6_module_transpiler/rails/version.rb b/lib/es6_module_transpiler/rails/version.rb
deleted file mode 100644
index 0e1e981f8e..0000000000
--- a/lib/es6_module_transpiler/rails/version.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module ES6ModuleTranspiler
-  module Rails
-    VERSION = '0.4.0'
-  end
-end
diff --git a/lib/es6_module_transpiler/sprockets.rb b/lib/es6_module_transpiler/sprockets.rb
deleted file mode 100644
index f55e52b26b..0000000000
--- a/lib/es6_module_transpiler/sprockets.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require 'sprockets'
-
-Sprockets.register_mime_type 'application/ecmascript6', extensions: ['.es6', '.js.es6', '.js.no-module.es6'], charset: :unicode
-Sprockets.register_transformer 'application/ecmascript6', 'application/javascript', Tilt::ES6ModuleTranspilerTemplate
diff --git a/lib/es6_module_transpiler/tilt.rb b/lib/es6_module_transpiler/tilt.rb
deleted file mode 100644
index 5d399256c3..0000000000
--- a/lib/es6_module_transpiler/tilt.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require 'tilt'
-require 'es6_module_transpiler/tilt/es6_module_transpiler_template'
-
-Tilt.register Tilt::ES6ModuleTranspilerTemplate, 'es6'
diff --git a/lib/freedom_patches/raw_handlebars.rb b/lib/freedom_patches/raw_handlebars.rb
index 804d66f410..488061fb56 100644
--- a/lib/freedom_patches/raw_handlebars.rb
+++ b/lib/freedom_patches/raw_handlebars.rb
@@ -12,8 +12,8 @@ class Barber::Precompiler
     if !@precompiler
 
       source = File.read("#{Rails.root}/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6")
-      template = Tilt::ES6ModuleTranspilerTemplate.new {}
-      transpiled = template.babel_transpile(source)
+      transpiler = DiscourseJsProcessor::Transpiler.new(skip_module: true)
+      transpiled = transpiler.perform(source)
 
       # very hacky but lets us use ES6. I'm ashamed of this code -RW
       transpiled = transpiled[0...transpiled.index('export ')]
diff --git a/lib/freedom_patches/zeitwerk.rb b/lib/freedom_patches/zeitwerk.rb
index 9cd102aac0..cf1ddc186d 100644
--- a/lib/freedom_patches/zeitwerk.rb
+++ b/lib/freedom_patches/zeitwerk.rb
@@ -12,7 +12,6 @@ module ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector
     'postgresql_fallback_adapter' => 'PostgreSQLFallbackHandler',
     'regular' => 'Jobs',
     'scheduled' => 'Jobs',
-    'source_url' => 'SourceURL',
     'topic_query_sql' => 'TopicQuerySQL',
     'version' => 'Discourse',
   }
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index a4b6312d55..d76e2ed827 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -29,13 +29,10 @@ module PrettyText
     filename = find_file(root_path, part_name)
     if filename
       source = File.read("#{root_path}#{filename}")
+      source = ERB.new(source).result(binding) if filename =~ /\.erb$/
 
-      if filename =~ /\.erb$/
-        source = ERB.new(source).result(binding)
-      end
-
-      template = Tilt::ES6ModuleTranspilerTemplate.new {}
-      transpiled = template.module_transpile(source, "#{Rails.root}/app/assets/javascripts/", part_name)
+      transpiler = DiscourseJsProcessor::Transpiler.new
+      transpiled = transpiler.perform(source, "#{Rails.root}/app/assets/javascripts/", part_name)
       ctx.eval(transpiled)
     else
       # Look for vendored stuff
diff --git a/lib/source_url.rb b/lib/source_url.rb
deleted file mode 100644
index 38078255f7..0000000000
--- a/lib/source_url.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-class SourceURL < Tilt::Template
-  self.default_mime_type = 'application/javascript'
-
-  def self.call(input)
-    filename = input[:filename]
-    source = input[:data]
-    context = input[:environment].context_class.new(input)
-
-    result = new(filename) { source }.render(context)
-    context.metadata.merge(data: result)
-  end
-
-  def prepare
-  end
-
-  def evaluate(scope, locals, &block)
-    code = +"eval("
-    code << data.inspect
-    code << " + \"\\n//# sourceURL=#{scope.logical_path}\""
-    code << ");\n"
-  end
-end
diff --git a/lib/theme_javascript_compiler.rb b/lib/theme_javascript_compiler.rb
index b0906eb356..988a96ad9e 100644
--- a/lib/theme_javascript_compiler.rb
+++ b/lib/theme_javascript_compiler.rb
@@ -214,8 +214,8 @@ class ThemeJavascriptCompiler
 
   def append_module(script, name, include_variables: true)
     script = "#{theme_variables}#{script}" if include_variables
-    template = Tilt::ES6ModuleTranspilerTemplate.new {}
-    @content << template.module_transpile(script, "", name)
+    transpiler = DiscourseJsProcessor::Transpiler.new
+    @content << transpiler.perform(script, "", name)
   rescue MiniRacer::RuntimeError => ex
     raise CompileError.new ex.message
   end
@@ -237,7 +237,7 @@ class ThemeJavascriptCompiler
   end
 
   def transpile(es6_source, version)
-    template = Tilt::ES6ModuleTranspilerTemplate.new {}
+    transpiler = DiscourseJsProcessor::Transpiler.new(skip_module: true)
     wrapped = <<~PLUGIN_API_JS
       (function() {
         if ('Discourse' in window && typeof Discourse._registerPluginCode === 'function') {
@@ -254,7 +254,7 @@ class ThemeJavascriptCompiler
       })();
     PLUGIN_API_JS
 
-    template.babel_transpile(wrapped)
+    transpiler.perform(wrapped)
   rescue MiniRacer::RuntimeError => ex
     raise CompileError.new ex.message
   end
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.es6
similarity index 99%
rename from plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6
rename to plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.es6
index f2226a6dfd..aba41b68ce 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.es6
@@ -1,3 +1,4 @@
+// discourse-skip-module
 (function($) {
   const DATE_TEMPLATE = `
     <span>
diff --git a/plugins/discourse-local-dates/plugin.rb b/plugins/discourse-local-dates/plugin.rb
index 616d337270..d4ac0160df 100644
--- a/plugins/discourse-local-dates/plugin.rb
+++ b/plugins/discourse-local-dates/plugin.rb
@@ -6,7 +6,7 @@
 # author: Joffrey Jaffeux
 hide_plugin if self.respond_to?(:hide_plugin)
 
-register_asset 'javascripts/discourse-local-dates.js.no-module.es6'
+register_asset 'javascripts/discourse-local-dates.js.es6'
 register_asset 'stylesheets/common/discourse-local-dates.scss'
 register_asset 'moment.js', :vendored_core_pretty_text
 register_asset 'moment-timezone.js', :vendored_core_pretty_text
diff --git a/spec/lib/discourse_js_processor_spec.rb b/spec/lib/discourse_js_processor_spec.rb
new file mode 100644
index 0000000000..47cd59601f
--- /dev/null
+++ b/spec/lib/discourse_js_processor_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'discourse_js_processor'
+
+describe DiscourseJsProcessor do
+
+  describe 'should_transpile?' do
+    it "returns false for empty strings" do
+      expect(DiscourseJsProcessor.should_transpile?(nil)).to eq(false)
+      expect(DiscourseJsProcessor.should_transpile?('')).to eq(false)
+    end
+
+    it "returns false for a regular js file" do
+      expect(DiscourseJsProcessor.should_transpile?("file.js")).to eq(false)
+    end
+
+    it "returns true for deprecated .es6 files" do
+      expect(DiscourseJsProcessor.should_transpile?("file.es6")).to eq(true)
+      expect(DiscourseJsProcessor.should_transpile?("file.js.es6")).to eq(true)
+      expect(DiscourseJsProcessor.should_transpile?("file.js.es6.erb")).to eq(true)
+    end
+  end
+
+  describe "skip_module?" do
+    it "returns false for empty strings" do
+      expect(DiscourseJsProcessor.skip_module?(nil)).to eq(false)
+      expect(DiscourseJsProcessor.skip_module?('')).to eq(false)
+    end
+
+    it "returns true if the header is present" do
+      expect(DiscourseJsProcessor.skip_module?("// cool comment\n// discourse-skip-module")).to eq(true)
+    end
+
+    it "returns false if the header is not present" do
+      expect(DiscourseJsProcessor.skip_module?("// just some JS\nconsole.log()")).to eq(false)
+    end
+  end
+end

From 40d768623413bfdf4cec1078646e62f385f60d23 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 11 Mar 2020 10:09:19 -0400
Subject: [PATCH 0167/1830] Build(deps-dev): Bump webmock from 3.8.2 to 3.8.3
 (#9167)

Bumps [webmock](https://github.com/bblimke/webmock) from 3.8.2 to 3.8.3.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.8.2...v3.8.3)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index ed34096df2..ea4840a1ae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -408,7 +408,7 @@ GEM
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.13.0)
-    webmock (3.8.2)
+    webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

From 4e0b2ae294e0867f1381f691f506e1e5799466e1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 15:28:16 +0100
Subject: [PATCH 0168/1830] DEV: defines a constant for INPUT_DELAY (#9169)

---
 .../admin/controllers/admin-dashboard-reports.js.es6     | 3 ++-
 .../admin/controllers/admin-email-bounced.js.es6         | 3 ++-
 .../admin/controllers/admin-email-received.js.es6        | 3 ++-
 .../admin/controllers/admin-email-rejected.js.es6        | 3 ++-
 .../admin/controllers/admin-email-sent.js.es6            | 3 ++-
 .../admin/controllers/admin-email-skipped.js.es6         | 3 ++-
 .../controllers/admin-logs-screened-ip-addresses.js.es6  | 3 ++-
 .../admin/controllers/admin-permalinks.js.es6            | 3 ++-
 .../admin/controllers/admin-site-settings.js.es6         | 3 ++-
 .../admin/controllers/admin-users-list-show.js.es6       | 3 ++-
 .../admin/controllers/admin-watched-words.js.es6         | 3 ++-
 .../discourse-common/config/environment.js.es6           | 2 ++
 .../javascripts/discourse/components/emoji-picker.js.es6 | 4 ++--
 .../javascripts/discourse/components/quote-button.js.es6 | 3 ++-
 .../discourse/components/search-advanced-options.js.es6  | 3 ++-
 .../discourse/controllers/user-invited-show.js.es6       | 3 ++-
 .../javascripts/discourse/lib/keyboard-shortcuts.js.es6  | 9 +++++----
 app/assets/javascripts/discourse/lib/safari-hacks.js.es6 | 3 ++-
 .../components/discourse-local-dates-create-form.js.es6  | 3 ++-
 19 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
index 9a57b9cf32..d6e15496f7 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
@@ -1,6 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { debounce } from "@ember/runloop";
 import Controller from "@ember/controller";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 const { get } = Ember;
 
@@ -23,7 +24,7 @@ export default Controller.extend({
 
   actions: {
     filterReports(filter) {
-      debounce(this, this._performFiltering, filter, 250);
+      debounce(this, this._performFiltering, filter, INPUT_DELAY);
     }
   },
 
diff --git a/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6
index 508bc559c5..bc034db4f7 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6
@@ -1,10 +1,11 @@
 import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import discourseDebounce from "discourse/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,user,address,type}")
   filterEmailLogs: discourseDebounce(function() {
     this.loadLogs();
-  }, 250)
+  }, INPUT_DELAY)
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-email-received.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-received.js.es6
index 4a3cc363df..0942a3dabf 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-received.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-received.js.es6
@@ -2,12 +2,13 @@ import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import discourseDebounce from "discourse/lib/debounce";
 import IncomingEmail from "admin/models/incoming-email";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,from,to,subject}")
   filterIncomingEmails: discourseDebounce(function() {
     this.loadLogs(IncomingEmail);
-  }, 250),
+  }, INPUT_DELAY),
 
   actions: {
     loadMore() {
diff --git a/app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6
index 8c6f6767f4..01882482e7 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6
@@ -2,12 +2,13 @@ import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import discourseDebounce from "discourse/lib/debounce";
 import IncomingEmail from "admin/models/incoming-email";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,from,to,subject,error}")
   filterIncomingEmails: discourseDebounce(function() {
     this.loadLogs(IncomingEmail);
-  }, 250),
+  }, INPUT_DELAY),
 
   actions: {
     loadMore() {
diff --git a/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6
index f727c9d6f4..b76fcf81dc 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6
@@ -1,10 +1,11 @@
 import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import discourseDebounce from "discourse/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,user,address,type,reply_key}")
   filterEmailLogs: discourseDebounce(function() {
     this.loadLogs();
-  }, 250)
+  }, INPUT_DELAY)
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6
index 508bc559c5..bc034db4f7 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6
@@ -1,10 +1,11 @@
 import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import discourseDebounce from "discourse/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default AdminEmailLogsController.extend({
   @observes("filter.{status,user,address,type}")
   filterEmailLogs: discourseDebounce(function() {
     this.loadLogs();
-  }, 250)
+  }, INPUT_DELAY)
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
index baee177c02..789f070db1 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
@@ -4,6 +4,7 @@ import { outputExportResult } from "discourse/lib/export-result";
 import { exportEntity } from "discourse/lib/export-csv";
 import ScreenedIpAddress from "admin/models/screened-ip-address";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default Controller.extend({
   loading: false,
@@ -16,7 +17,7 @@ export default Controller.extend({
     ScreenedIpAddress.findAll(this.filter).then(result => {
       this.setProperties({ model: result, loading: false });
     });
-  }, 250),
+  }, INPUT_DELAY),
 
   actions: {
     allow(record) {
diff --git a/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6 b/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
index a45f8cc89a..6f0842049c 100644
--- a/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
@@ -2,6 +2,7 @@ import Controller from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
 import Permalink from "admin/models/permalink";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default Controller.extend({
   loading: false,
@@ -13,7 +14,7 @@ export default Controller.extend({
       this.set("model", result);
       this.set("loading", false);
     });
-  }, 250),
+  }, INPUT_DELAY),
 
   actions: {
     recordAdded(arg) {
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
index 28721de995..ac84553a71 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
@@ -3,6 +3,7 @@ import { alias } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default Controller.extend({
   filter: null,
@@ -84,7 +85,7 @@ export default Controller.extend({
     } else {
       this.filterContentNow();
     }
-  }, 250),
+  }, INPUT_DELAY),
 
   actions: {
     clearFilter() {
diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
index 8776fee466..8b7adb194c 100644
--- a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
@@ -4,6 +4,7 @@ import discourseDebounce from "discourse/lib/debounce";
 import { i18n } from "discourse/lib/computed";
 import AdminUser from "admin/models/admin-user";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default Controller.extend(CanCheckEmails, {
   model: null,
@@ -32,7 +33,7 @@ export default Controller.extend(CanCheckEmails, {
   @observes("listFilter")
   _filterUsers: discourseDebounce(function() {
     this.resetFilters();
-  }, 250),
+  }, INPUT_DELAY),
 
   resetFilters() {
     this._page = 1;
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
index dbc2afe1dc..636358c629 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
@@ -4,6 +4,7 @@ import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default Controller.extend({
   filter: null,
@@ -48,7 +49,7 @@ export default Controller.extend({
   filterContent: discourseDebounce(function() {
     this.filterContentNow();
     this.set("filtered", !isEmpty(this.filter));
-  }, 250),
+  }, INPUT_DELAY),
 
   actions: {
     clearFilter() {
diff --git a/app/assets/javascripts/discourse-common/config/environment.js.es6 b/app/assets/javascripts/discourse-common/config/environment.js.es6
index 3bfa2c38c5..18ce3cc976 100644
--- a/app/assets/javascripts/discourse-common/config/environment.js.es6
+++ b/app/assets/javascripts/discourse-common/config/environment.js.es6
@@ -1 +1,3 @@
+export const INPUT_DELAY = 250;
+
 export default { environment: Ember.testing ? "test" : "development" };
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index fccf3c597f..2696ca1358 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -9,7 +9,7 @@ import {
   emojiSearch
 } from "pretty-text/emoji";
 import { safariHacksDisabled } from "discourse/lib/utilities";
-import ENV from "discourse-common/config/environment";
+import ENV, { INPUT_DELAY } from "discourse-common/config/environment";
 
 const { run } = Ember;
 
@@ -94,7 +94,7 @@ export default Component.extend({
   @observes("filter")
   filterChanged() {
     this.$filter.find(".clear-filter").toggle(!_.isEmpty(this.filter));
-    const filterDelay = this.site.isMobileDevice ? 400 : 250;
+    const filterDelay = this.site.isMobileDevice ? 400 : INPUT_DELAY;
     run.debounce(this, this._filterEmojisList, filterDelay);
   },
 
diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6
index 2d8df37706..141d9f32ac 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/components/quote-button.js.es6
@@ -2,6 +2,7 @@ import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import discourseDebounce from "discourse/lib/debounce";
 import { selectedText, selectedElement } from "discourse/lib/utilities";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 function getQuoteTitle(element) {
   const titleEl = element.querySelector(".title");
@@ -146,7 +147,7 @@ export default Component.extend({
 
   didInsertElement() {
     const { isWinphone, isAndroid } = this.capabilities;
-    const wait = isWinphone || isAndroid ? 250 : 25;
+    const wait = isWinphone || isAndroid ? INPUT_DELAY : 25;
     const onSelectionChanged = discourseDebounce(
       () => this._selectionChanged(),
       wait
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
index 9b3bac5035..136c416588 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
@@ -5,6 +5,7 @@ import { escapeExpression } from "discourse/lib/utilities";
 import Group from "discourse/models/group";
 import Badge from "discourse/models/badge";
 import Category from "discourse/models/category";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 const REGEXP_BLOCKS = /(([^" \t\n\x0B\f\r]+)?(("[^"]+")?))/g;
 
@@ -82,7 +83,7 @@ export default Component.extend({
   @observes("searchTerm")
   _updateOptions() {
     this._update();
-    debounce(this, this._update, 250);
+    debounce(this, this._update, INPUT_DELAY);
   },
 
   _init() {
diff --git a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6 b/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
index 9282265e78..0b8c07d0fb 100644
--- a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
@@ -4,6 +4,7 @@ import Invite from "discourse/models/invite";
 import discourseDebounce from "discourse/lib/debounce";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default Controller.extend({
   user: null,
@@ -30,7 +31,7 @@ export default Controller.extend({
       this.filter,
       this.searchTerm
     ).then(invites => this.set("model", invites));
-  }, 250),
+  }, INPUT_DELAY),
 
   inviteRedeemed: equal("filter", "redeemed"),
 
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index 69f42cfee1..59840f2b4d 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -4,6 +4,7 @@ import Composer from "discourse/models/composer";
 import { minimumOffset } from "discourse/lib/offset-calculator";
 import { ajax } from "discourse/lib/ajax";
 import { throttle } from "@ember/runloop";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 const bindings = {
   "!": { postAction: "showFlags" },
@@ -299,19 +300,19 @@ export default {
   },
 
   setTrackingToMuted(event) {
-    throttle(this, "_setTracking", { id: 0, event }, 250, true);
+    throttle(this, "_setTracking", { id: 0, event }, INPUT_DELAY, true);
   },
 
   setTrackingToRegular(event) {
-    throttle(this, "_setTracking", { id: 1, event }, 250, true);
+    throttle(this, "_setTracking", { id: 1, event }, INPUT_DELAY, true);
   },
 
   setTrackingToTracking(event) {
-    throttle(this, "_setTracking", { id: 2, event }, 250, true);
+    throttle(this, "_setTracking", { id: 2, event }, INPUT_DELAY, true);
   },
 
   setTrackingToWatching(event) {
-    throttle(this, "_setTracking", { id: 3, event }, 250, true);
+    throttle(this, "_setTracking", { id: 3, event }, INPUT_DELAY, true);
   },
 
   _setTracking(params) {
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index 799d3c904c..40d8ee4637 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -4,6 +4,7 @@ import {
   safariHacksDisabled,
   iOSWithVisualViewport
 } from "discourse/lib/utilities";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 // TODO: remove calcHeight once iOS 13 adoption > 90%
 // In iOS 13 and up we use visualViewport API to calculate height
@@ -136,7 +137,7 @@ function positioningWorkaround($fixedElement) {
     positioningWorkaround.blur(evt);
   };
 
-  var blurred = discourseDebounce(blurredNow, 250);
+  var blurred = discourseDebounce(blurredNow, INPUT_DELAY);
 
   var positioningHack = function(evt) {
     // we need this, otherwise changing focus means we never clear
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
index 374aacad93..df092d9a89 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
@@ -10,6 +10,7 @@ import loadScript from "discourse/lib/load-script";
 import computed, { observes } from "discourse-common/utils/decorators";
 import { cookAsync } from "discourse/lib/text";
 import discourseDebounce from "discourse/lib/debounce";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default Component.extend({
   timeFormat: "HH:mm:ss",
@@ -66,7 +67,7 @@ export default Component.extend({
         );
       });
     }
-  }, 250),
+  }, INPUT_DELAY),
 
   @computed("date", "toDate", "toTime")
   isRange(date, toDate, toTime) {

From 61a2c3650ddc265060b44c00c6ed79dd890299f1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 15:30:14 +0100
Subject: [PATCH 0169/1830] DEV: enforces ember-template-lint: no-partial
 (#9173)

selected-posts parial is kept and calling the new component to prevent errors with users who would have rewritten topic.hbs

dashboard-problems and version-checks seem less risky and have only been converted to components
---
 .template-lintrc.js                           |   3 +-
 .../{ => components}/dashboard-problems.hbs   |   2 +-
 .../templates/components/version-checks.hbs   | 135 ++++++++++++++++++
 .../javascripts/admin/templates/dashboard.hbs |  10 +-
 .../admin/templates/version-checks.hbs        |  88 ------------
 .../templates/components/selected-posts.hbs   |  61 ++++++++
 .../discourse/templates/selected-posts.hbs    |  41 ++----
 .../javascripts/discourse/templates/topic.hbs |  30 +++-
 8 files changed, 249 insertions(+), 121 deletions(-)
 rename app/assets/javascripts/admin/templates/{ => components}/dashboard-problems.hbs (84%)
 create mode 100644 app/assets/javascripts/admin/templates/components/version-checks.hbs
 delete mode 100644 app/assets/javascripts/admin/templates/version-checks.hbs
 create mode 100644 app/assets/javascripts/discourse/templates/components/selected-posts.hbs

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 29bf420298..801225fd33 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -12,6 +12,7 @@ module.exports = {
     "no-unused-block-params": true,
     "no-unbound": true,
     "simple-unless": true,
-    "no-triple-curlies": true
+    "no-triple-curlies": true,
+    "no-partial": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/dashboard-problems.hbs b/app/assets/javascripts/admin/templates/components/dashboard-problems.hbs
similarity index 84%
rename from app/assets/javascripts/admin/templates/dashboard-problems.hbs
rename to app/assets/javascripts/admin/templates/components/dashboard-problems.hbs
index 5f95987e73..cb8311a4e3 100644
--- a/app/assets/javascripts/admin/templates/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/templates/components/dashboard-problems.hbs
@@ -18,7 +18,7 @@
         </div>
 
         <p class="actions">
-          {{d-button action=(action "refreshProblems") class="btn-default" icon="sync" label="admin.dashboard.refresh_problems"}}
+          {{d-button action=refreshProblems class="btn-default" icon="sync" label="admin.dashboard.refresh_problems"}}
           {{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}
         </p>
       {{/conditional-loading-section}}
diff --git a/app/assets/javascripts/admin/templates/components/version-checks.hbs b/app/assets/javascripts/admin/templates/components/version-checks.hbs
new file mode 100644
index 0000000000..aa2fcc97c0
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/version-checks.hbs
@@ -0,0 +1,135 @@
+<div class="section-title">
+  <h2>
+    {{i18n "admin.dashboard.version"}}
+  </h2>
+</div>
+
+<div
+  class="dashboard-stats version-check
+    {{if versionCheck.critical_updates "critical" "normal"}}"
+>
+  <div class="version-number">
+    <h4>
+      {{i18n "admin.dashboard.installed_version"}}
+    </h4>
+    <h3>
+      {{dash-if-empty versionCheck.installed_version}}
+    </h3>
+    {{#if versionCheck.gitLink}}
+      <div class="sha-link">
+        (
+        <a href={{versionCheck.gitLink}} rel="noopener" target="_blank">
+          {{versionCheck.shortSha}}
+        </a>
+        )
+      </div>
+    {{/if}}
+  </div>
+  {{#if versionCheck.noCheckPerformed}}
+    <div class="version-number">
+      <h4>
+        {{i18n "admin.dashboard.latest_version"}}
+      </h4>
+      <h3>
+        —
+      </h3>
+    </div>
+    <div class="version-status">
+      <div class="face">
+        <span class="icon critical-updates-available">
+          {{d-icon "far-frown"}}
+        </span>
+      </div>
+      <div class="version-notes">
+        <span class="normal-note">
+          {{i18n "admin.dashboard.no_check_performed"}}
+        </span>
+      </div>
+    </div>
+  {{else if versionCheck.stale_data}}
+    <div class="version-number">
+      <h4>
+        {{i18n "admin.dashboard.latest_version"}}
+      </h4>
+      <h3>
+        {{#if versionCheck.version_check_pending}}
+          {{dash-if-empty versionCheck.installed_version}}
+        {{/if}}
+      </h3>
+    </div>
+    <div class="version-status">
+      <div class="face">
+        {{#if versionCheck.version_check_pending}}
+          <span class="icon up-to-date">
+            {{d-icon "far-smile"}}
+          </span>
+        {{else}}
+          <span class="icon critical-updates-available">
+            {{d-icon "far-frown"}}
+          </span>
+        {{/if}}
+      </div>
+      <div class="version-notes">
+        <span class="normal-note">
+          {{#if versionCheck.version_check_pending}}
+            {{i18n "admin.dashboard.version_check_pending"}}
+          {{else}}
+            {{i18n "admin.dashboard.stale_data"}}
+          {{/if}}
+        </span>
+      </div>
+    </div>
+  {{else}}
+    <div class="version-number">
+      <h4>
+        {{i18n "admin.dashboard.latest_version"}}
+      </h4>
+      <h3>
+        {{dash-if-empty versionCheck.latest_version}}
+      </h3>
+    </div>
+    <div class="version-status">
+      <div class="face">
+        {{#if versionCheck.upToDate}}
+          <span class="icon up-to-date">
+            {{d-icon "far-smile"}}
+          </span>
+        {{else}}
+          <span
+            class="icon
+              {{if
+                versionCheck.critical_updates
+                "critical-updates-available"
+                "updates-available"
+              }}"
+          >
+            {{#if versionCheck.behindByOneVersion}}
+              {{d-icon "meh-o"}}
+            {{else}}
+              {{d-icon "far-frown"}}
+            {{/if}}
+          </span>
+        {{/if}}
+      </div>
+      <div class="version-notes">
+        {{#if versionCheck.upToDate}}
+          {{i18n "admin.dashboard.up_to_date"}}
+        {{else}}
+          <span class="critical-note">
+            {{i18n "admin.dashboard.critical_available"}}
+          </span>
+          <span class="normal-note">
+            {{i18n "admin.dashboard.updates_available"}}
+          </span>
+          {{i18n "admin.dashboard.please_upgrade"}}
+        {{/if}}
+      </div>
+    </div>
+  {{/if}}
+  {{custom-html
+    name="upgrade-header"
+    versionCheck=versionCheck
+    tagName="div"
+    classNames="upgrade-header"
+  }}
+</div>
diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs
index 8ca74d79b5..cbbd34b4b2 100644
--- a/app/assets/javascripts/admin/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard.hbs
@@ -3,12 +3,18 @@
 {{#if showVersionChecks}}
   <div class="section-top">
     <div class="version-checks">
-      {{partial "admin/templates/version-checks"}}
+      {{version-checks versionCheck=versionCheck}}
     </div>
   </div>
 {{/if}}
 
-{{partial "admin/templates/dashboard-problems"}}
+{{dashboard-problems
+  loadingProblems=loadingProblems
+  foundProblems=foundProblems
+  problems=problems
+  problemsTimestamp=problemsTimestamp
+  refreshProblems=(action "refreshProblems")
+}}
 
 <ul class="navigation">
   <li class="navigation-item general">
diff --git a/app/assets/javascripts/admin/templates/version-checks.hbs b/app/assets/javascripts/admin/templates/version-checks.hbs
deleted file mode 100644
index bd0bc3b981..0000000000
--- a/app/assets/javascripts/admin/templates/version-checks.hbs
+++ /dev/null
@@ -1,88 +0,0 @@
-      <div class="section-title">
-        <h2>{{i18n 'admin.dashboard.version'}}</h2>
-      </div>
-      <div class="dashboard-stats version-check {{if versionCheck.critical_updates 'critical' 'normal'}}">
-
-      <div class="version-number">
-        <h4>{{i18n 'admin.dashboard.installed_version'}}</h4>
-        <h3>{{dash-if-empty versionCheck.installed_version}}</h3>
-        {{#if versionCheck.gitLink}}
-          <div class="sha-link">
-            (<a href={{versionCheck.gitLink}} rel="noopener" target="_blank">{{versionCheck.shortSha}}</a>)
-          </div>
-        {{/if}}
-      </div>
-
-      {{#if versionCheck.noCheckPerformed}}
-        <div class="version-number">
-          <h4>{{i18n 'admin.dashboard.latest_version'}}</h4>
-          <h3>&mdash;</h3>
-        </div>
-        <div class="version-status">
-          <div class="face">
-            <span class="icon critical-updates-available">{{d-icon "far-frown"}}</span>
-          </div>
-          <div class="version-notes">
-            <span class="normal-note">{{i18n 'admin.dashboard.no_check_performed'}}</span>
-          </div>
-        </div>
-      {{else}}
-        {{#if versionCheck.stale_data}}
-          <div class="version-number">
-            <h4>{{i18n 'admin.dashboard.latest_version'}}</h4>
-            <h3>{{#if versionCheck.version_check_pending}}{{dash-if-empty versionCheck.installed_version}}{{/if}}</h3>
-            </div>
-          <div class="version-status">
-            <div class="face">
-              {{#if versionCheck.version_check_pending}}
-                <span class='icon up-to-date'>{{d-icon "far-smile"}}</span>
-              {{else}}
-                <span class="icon critical-updates-available">{{d-icon "far-frown"}}</span>
-              {{/if}}
-            </div>
-            <div class="version-notes">
-              <span class="normal-note">
-                {{#if versionCheck.version_check_pending}}
-                  {{i18n 'admin.dashboard.version_check_pending'}}
-                {{else}}
-                  {{i18n 'admin.dashboard.stale_data'}}
-                {{/if}}
-              </span>
-            </div>
-          </div>
-        {{else}}
-          <div class="version-number">
-            <h4>{{i18n 'admin.dashboard.latest_version'}}</h4>
-            <h3>{{dash-if-empty versionCheck.latest_version}}</h3>
-          </div>
-          <div class="version-status">
-            <div class="face">
-              {{#if versionCheck.upToDate }}
-              <span class='icon up-to-date'>{{d-icon "far-smile"}}</span>
-              {{else}}
-                <span class="icon {{if versionCheck.critical_updates 'critical-updates-available' 'updates-available'}}">
-                  {{#if versionCheck.behindByOneVersion}}
-                    {{d-icon "meh-o"}}
-                  {{else}}
-                    {{d-icon "far-frown"}}
-                  {{/if}}
-                </span>
-              {{/if}}
-            </div>
-            <div class="version-notes">
-              {{#if versionCheck.upToDate }}
-                {{i18n 'admin.dashboard.up_to_date'}}
-              {{else}}
-                <span class="critical-note">{{i18n 'admin.dashboard.critical_available'}}</span>
-                <span class="normal-note">{{i18n 'admin.dashboard.updates_available'}}</span>
-                {{i18n 'admin.dashboard.please_upgrade'}}
-              {{/if}}
-            </div>
-          </div>
-
-        {{/if}}
-      {{/if}}
-
-      {{custom-html name="upgrade-header" versionCheck=versionCheck tagName="div" classNames="upgrade-header"}}
-
-</div>
diff --git a/app/assets/javascripts/discourse/templates/components/selected-posts.hbs b/app/assets/javascripts/discourse/templates/components/selected-posts.hbs
new file mode 100644
index 0000000000..5221b77e1f
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/selected-posts.hbs
@@ -0,0 +1,61 @@
+<p>
+  {{count-i18n key="topic.multi_select.description" count=selectedPostsCount}}
+</p>
+
+{{#if canSelectAll}}
+  <p>
+    <a class="select-all" href {{action selectAll}}>
+      {{i18n "topic.multi_select.select_all"}}
+    </a>
+  </p>
+{{/if}}
+
+{{#if canDeselectAll}}
+  <p>
+    <a href {{action deselectAll}}>
+      {{i18n "topic.multi_select.deselect_all"}}
+    </a>
+  </p>
+{{/if}}
+
+{{#if canDeleteSelected}}
+  {{d-button
+    action=deleteSelected
+    icon="far-trash-alt"
+    label="topic.multi_select.delete"
+    class="btn-danger"
+  }}
+{{/if}}
+
+{{#if canMergeTopic}}
+  {{d-button
+    action=(route-action "moveToTopic")
+    icon="sign-out-alt"
+    label="topic.move_to.action"
+    class="btn-primary move-to-topic"
+  }}
+{{/if}}
+
+{{#if canChangeOwner}}
+  {{d-button
+    action=(route-action "changeOwner")
+    icon="user"
+    label="topic.change_owner.action"
+    class="btn-primary"
+  }}
+{{/if}}
+
+{{#if canMergePosts}}
+  {{d-button
+    action=mergePosts
+    icon="arrows-v"
+    label="topic.merge_posts.action"
+    class="btn-primary"
+  }}
+{{/if}}
+
+<p class="cancel">
+  <a href {{action toggleMultiSelect}}>
+    {{i18n "topic.multi_select.cancel"}}
+  </a>
+</p>
diff --git a/app/assets/javascripts/discourse/templates/selected-posts.hbs b/app/assets/javascripts/discourse/templates/selected-posts.hbs
index e2de58c845..a3d300f673 100644
--- a/app/assets/javascripts/discourse/templates/selected-posts.hbs
+++ b/app/assets/javascripts/discourse/templates/selected-posts.hbs
@@ -1,27 +1,14 @@
-<p>{{count-i18n key="topic.multi_select.description" count=selectedPostsCount}}</p>
-
-{{#if canSelectAll}}
-  <p><a class="select-all" href {{action "selectAll"}}>{{i18n 'topic.multi_select.select_all'}}</a></p>
-{{/if}}
-
-{{#if canDeselectAll}}
-  <p><a href {{action "deselectAll"}}>{{i18n 'topic.multi_select.deselect_all'}}</a></p>
-{{/if}}
-
-{{#if canDeleteSelected}}
-  {{d-button action=(action "deleteSelected") icon="far-trash-alt" label="topic.multi_select.delete" class="btn-danger"}}
-{{/if}}
-
-{{#if canMergeTopic}}
-  {{d-button action=(route-action "moveToTopic") icon="sign-out-alt" label="topic.move_to.action" class="btn-primary move-to-topic"}}
-{{/if}}
-
-{{#if canChangeOwner}}
-  {{d-button action=(route-action "changeOwner") icon="user" label="topic.change_owner.action"  class="btn-primary"}}
-{{/if}}
-
-{{#if canMergePosts}}
-  {{d-button action=(action "mergePosts") icon="arrows-v" label="topic.merge_posts.action" class="btn-primary"}}
-{{/if}}
-
-<p class='cancel'><a href {{action "toggleMultiSelect"}}>{{i18n 'topic.multi_select.cancel'}}</a></p>
+{{selected-posts
+  selectedPostsCount=selectedPostsCount
+  canSelectAll=canSelectAll
+  canDeselectAll=canDeselectAll
+  canDeleteSelected=canDeleteSelected
+  canMergeTopic=canMergeTopic
+  canChangeOwner=canChangeOwner
+  canMergePosts=canMergePosts
+  toggleMultiSelect=(action "toggleMultiSelect")
+  mergePosts=(action "mergePosts")
+  deleteSelected=(action "deleteSelected")
+  deselectAll=(action "deselectAll")
+  selectAll=(action "selectAll")
+}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 7950ca19ec..e5894c03ca 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -91,7 +91,20 @@
 
     <div class="container posts">
       <div class='selected-posts {{unless multiSelect 'hidden'}}'>
-        {{partial "selected-posts"}}
+        {{selected-posts
+          selectedPostsCount=selectedPostsCount
+          canSelectAll=canSelectAll
+          canDeselectAll=canDeselectAll
+          canDeleteSelected=canDeleteSelected
+          canMergeTopic=canMergeTopic
+          canChangeOwner=canChangeOwner
+          canMergePosts=canMergePosts
+          toggleMultiSelect=(action "toggleMultiSelect")
+          mergePosts=(action "mergePosts")
+          deleteSelected=(action "deleteSelected")
+          deselectAll=(action "deselectAll")
+          selectAll=(action "selectAll")
+        }}
       </div>
 
       {{#topic-navigation topic=model jumpToDate=(action "jumpToDate") jumpToIndex=(action "jumpToIndex") as |info|}}
@@ -327,7 +340,20 @@
 
               {{#if showSelectedPostsAtBottom}}
                 <div class='selected-posts {{unless multiSelect 'hidden'}}'>
-                  {{partial "selected-posts"}}
+                  {{selected-posts
+                    selectedPostsCount=selectedPostsCount
+                    canSelectAll=canSelectAll
+                    canDeselectAll=canDeselectAll
+                    canDeleteSelected=canDeleteSelected
+                    canMergeTopic=canMergeTopic
+                    canChangeOwner=canChangeOwner
+                    canMergePosts=canMergePosts
+                    toggleMultiSelect=(action "toggleMultiSelect")
+                    mergePosts=(action "mergePosts")
+                    deleteSelected=(action "deleteSelected")
+                    deselectAll=(action "deselectAll")
+                    selectAll=(action "selectAll")
+                  }}
                 </div>
               {{/if}}
 

From 4a0f36e46c7d664df1bce86f32f61d3a8e197898 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 15:30:47 +0100
Subject: [PATCH 0170/1830] FIX: featured_topic.fancy_title was rendered
 without emojis (#9176)

---
 .../discourse/templates/components/user-card-contents.hbs       | 2 +-
 .../javascripts/discourse/templates/preferences/profile.hbs     | 2 +-
 app/assets/javascripts/discourse/templates/user.hbs             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index 3bfdf96268..4bc61d7a7c 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -144,7 +144,7 @@
         <div class="card-row">
           <div class="featured-topic">
             <span class="desc">{{i18n 'user.featured_topic'}}</span>
-            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{html-safe user.featured_topic.fancy_title}}{{/link-to}}
+            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{html-safe (replace-emoji user.featured_topic.fancy_title)}}{{/link-to}}
           </div>
         </div>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index e6fe5381ed..f07c8a9a38 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -66,7 +66,7 @@
     <label class="control-label">{{i18n 'user.featured_topic'}}</label>
     {{#if model.featured_topic}}
       <label class="featured-topic-link">
-      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe model.featured_topic.fancy_title}}{{/link-to}}
+      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe (replace-emoji model.featured_topic.fancy_title)}}{{/link-to}}
       </label>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 377177843e..290b791961 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -100,7 +100,7 @@
             {{#if showFeaturedTopic}}
               <h3 class="featured-topic">
                 <span>{{i18n 'user.featured_topic'}}</span>
-                {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe model.featured_topic.fancy_title}}{{/link-to}}
+                {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe (replace-emoji model.featured_topic.fancy_title)}}{{/link-to}}
               </h3>
             {{/if}}
 

From 1fca745beb29ec2392a87c65e6acf098b3d8ea68 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 15:31:08 +0100
Subject: [PATCH 0171/1830] DEV: applies default modal class to a modal when
 shown (#9175)

---
 app/assets/javascripts/discourse/lib/show-modal.js.es6 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js.es6
index 968f1e399d..18e6e8698f 100644
--- a/app/assets/javascripts/discourse/lib/show-modal.js.es6
+++ b/app/assets/javascripts/discourse/lib/show-modal.js.es6
@@ -9,7 +9,10 @@ export default function(name, opts) {
   const route = container.lookup("route:application");
   const modalController = route.controllerFor("modal");
 
-  modalController.set("modalClass", opts.modalClass);
+  modalController.set(
+    "modalClass",
+    opts.modalClass || `${dasherize(name).toLowerCase()}-modal`
+  );
 
   const controllerName = opts.admin ? `modals/${name}` : name;
   modalController.set("name", controllerName);

From d3b53fb551e0ac206b40e1ca044e6638b2cfa000 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 11 Mar 2020 15:31:29 +0100
Subject: [PATCH 0172/1830] REFACTOR: removes legacy bootstrap css class
 (#9174)

---
 app/assets/javascripts/admin/templates/email-index.hbs        | 2 +-
 .../javascripts/admin/templates/email-preview-digest.hbs      | 2 +-
 app/assets/javascripts/discourse/widgets/post.js.es6          | 2 +-
 test/javascripts/lib/click-track-edit-history-test.js.es6     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/email-index.hbs b/app/assets/javascripts/admin/templates/email-index.hbs
index 200e8aad27..d510b2f4fc 100644
--- a/app/assets/javascripts/admin/templates/email-index.hbs
+++ b/app/assets/javascripts/admin/templates/email-index.hbs
@@ -17,7 +17,7 @@
 <form>
   <div class='admin-controls'>
     {{#if sendingEmail}}
-      <div class='span15 controls'>{{i18n 'admin.email.sending_test'}}</div>
+      <div class='controls'>{{i18n 'admin.email.sending_test'}}</div>
     {{else}}
       <div class='controls'>
         {{text-field value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 7a695659c5..58733c1eb3 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -1,7 +1,7 @@
 <p>{{i18n 'admin.email.preview_digest_desc'}}</p>
 
 <div class='admin-controls email-preview'>
-  <div class='span7 controls'>
+  <div class='controls'>
     <label for='last-seen'>{{i18n 'admin.email.last_seen_user'}}</label>
     {{date-picker-past value=lastSeen id="last-seen"}}
     <label>{{i18n 'admin.email.user'}}:</label>
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6
index 5107da42f0..bd84bfb428 100644
--- a/app/assets/javascripts/discourse/widgets/post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post.js.es6
@@ -548,7 +548,7 @@ createWidget("post-article", {
       rows.push(
         h(
           "div.row",
-          h("section.embedded-posts.top.topic-body.offset2", [
+          h("section.embedded-posts.top.topic-body", [
             this.attach("button", {
               title: "post.collapse",
               icon: "chevron-down",
diff --git a/test/javascripts/lib/click-track-edit-history-test.js.es6 b/test/javascripts/lib/click-track-edit-history-test.js.es6
index ae8f6d18c2..f38f4c9fe1 100644
--- a/test/javascripts/lib/click-track-edit-history-test.js.es6
+++ b/test/javascripts/lib/click-track-edit-history-test.js.es6
@@ -22,7 +22,7 @@ QUnit.module("lib:click-track-edit-history", {
        </div>
        <div id="revisions" data-post-id="42" class="">
          <div class="row">
-           <div class="span8">
+           <div>
              <a href="http://www.google.com">google.com</a>
              <a class="lightbox back" href="http://www.google.com">google.com</a>
              <div class="onebox-result">
@@ -34,7 +34,7 @@ QUnit.module("lib:click-track-edit-history", {
              <a class="attachment" href="http://discuss.domain.com/uploads/default/1234/1532357280.txt">log.txt</a>
              <a class="hashtag" href="http://discuss.domain.com">#hashtag</a>
            </div>
-           <div class="span8 offset1">
+           <div>
              <a href="http://www.google.com">google.com</a>
              <a class="lightbox back" href="http://www.google.com">google.com</a>
              <div class="onebox-result">

From 12af95d0dc1a4a40f7989cd6855e5c7729f36896 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Mon, 2 Mar 2020 18:26:28 -0300
Subject: [PATCH 0173/1830] FIX: ContactPicker was not setting invite input on
 topics

---
 .../javascripts/discourse/templates/components/invite-panel.hbs  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
index cfdd1431bf..a7a7875219 100644
--- a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
@@ -30,6 +30,7 @@
             allowEmails=true
             class="invite-user-input"
             autocomplete="discourse"
+            value=emailOrUsername
           }}
         {{else}}
           {{text-field

From 3f9b310beb74b609308a0fd3f5b87cffb2d2d5d4 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Wed, 11 Mar 2020 12:12:28 -0300
Subject: [PATCH 0174/1830] FIX: Typo on draft save

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

diff --git a/app/models/draft.rb b/app/models/draft.rb
index aee066c0e2..4a3ab41f02 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -78,7 +78,7 @@ class Draft < ActiveRecord::Base
         # around 2 controller actions calling for draft creation at the exact same time
         # to avoid complex locking and a distributed mutex, since this is so rare, simply add a single retry
         if retry_not_unique
-          set(user, key, sequence, data, owenr, retry_not_unique: false)
+          set(user, key, sequence, data, owner, retry_not_unique: false)
         else
           raise e
         end

From 6c948f27ea607018265d1097e3f5a63f66d62c0c Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Wed, 11 Mar 2020 10:19:59 -0500
Subject: [PATCH 0175/1830] FIX: Missing constant in SMF2 importer (#9178)

---
 script/import_scripts/smf2.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb
index 3d1f69adbf..74b63189cd 100644
--- a/script/import_scripts/smf2.rb
+++ b/script/import_scripts/smf2.rb
@@ -369,6 +369,11 @@ class ImportScripts::Smf2 < ImportScripts::Base
     end
   end
 
+  IGNORED_BBCODE ||= %w{
+    black blue center color email flash font glow green iurl left list move red
+    right shadown size table time white
+  }
+
   def convert_bbcode(raw)
     return "" if raw.blank?
 

From 40f1201b3966053bab0112cdcfaf8ecde515265a Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 11 Mar 2020 11:13:31 -0500
Subject: [PATCH 0176/1830] DEV: Support adding keybindings via plugins (#9177)

---
 .../discourse/lib/keyboard-shortcuts.js.es6          | 10 ++++++----
 .../javascripts/discourse/lib/plugin-api.js.es6      | 12 +++++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index 59840f2b4d..2a401e4fcd 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -6,7 +6,7 @@ import { ajax } from "discourse/lib/ajax";
 import { throttle } from "@ember/runloop";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 
-const bindings = {
+export let bindings = {
   "!": { postAction: "showFlags" },
   "#": { handler: "goToPost", anonymous: true },
   "/": { handler: "toggleSearch", anonymous: true },
@@ -406,14 +406,16 @@ export default {
   },
 
   _globalBindToFunction(func, binding) {
-    if (typeof this[func] === "function") {
+    let funcToBind = typeof func === "function" ? func : this[func];
+    if (typeof funcToBind === "function") {
       this.keyTrapper.bindGlobal(binding, this[func].bind(this));
     }
   },
 
   _bindToFunction(func, binding) {
-    if (typeof this[func] === "function") {
-      this.keyTrapper.bind(binding, this[func].bind(this));
+    let funcToBind = typeof func === "function" ? func : this[func];
+    if (typeof funcToBind === "function") {
+      this.keyTrapper.bind(binding, funcToBind.bind(this));
     }
   },
 
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index bd55faf05c..cdaaad0263 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -1,3 +1,4 @@
+/*global Mousetrap:true*/
 import deprecated from "discourse-common/lib/deprecated";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { addDecorator } from "discourse/widgets/post-cooked";
@@ -50,9 +51,10 @@ import { addCategorySortCriteria } from "discourse/components/edit-category-sett
 import { queryRegistry } from "discourse/widgets/widget";
 import Composer from "discourse/models/composer";
 import { on } from "@ember/object/evented";
+import KeyboardShortcuts, { bindings } from "discourse/lib/keyboard-shortcuts";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.8.38";
+const PLUGIN_API_VERSION = "0.8.39";
 
 class PluginApi {
   constructor(version, container) {
@@ -227,6 +229,14 @@ class PluginApi {
     }
   }
 
+  addKeyboardShortcut(shortcut, callback, opts = {}) {
+    shortcut = shortcut.trim().replace(/\s/g, ""); // Strip all whitespace
+    let newBinding = {};
+    newBinding[shortcut] = Object.assign({ handler: callback }, opts);
+    Object.assign(bindings, newBinding);
+    KeyboardShortcuts.bindEvents(Mousetrap, this.container);
+  }
+
   /**
    * addPosterIcon(callback)
    *

From c9d1577087bcc26e77edbccd1dd8647750db555f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 11 Mar 2020 12:47:37 -0400
Subject: [PATCH 0177/1830] Let's not log the username/password

This could easily be seen by someone who shouldn't.
---
 lib/tasks/emails.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/emails.rake b/lib/tasks/emails.rake
index 9eb9250199..4180658e64 100644
--- a/lib/tasks/emails.rake
+++ b/lib/tasks/emails.rake
@@ -78,7 +78,7 @@ task 'emails:test', [:email] => [:environment] do |_, args|
       STR
     end
 
-    puts "Testing sending to #{email} using #{smtp[:user_name]}:#{smtp[:password]}@#{smtp[:address]}:#{smtp[:port]}."
+    puts "Testing sending to #{email} using #{smtp[:address]}:#{smtp[:port]}."
 
     # We would like to do this, but Net::SMTP errors out using starttls
     #Net::SMTP.start(smtp[:address], smtp[:port]) do |s|

From a4929661af70875569c5c0cfcca952d5c4b5768c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 11 Mar 2020 20:11:12 +0300
Subject: [PATCH 0178/1830] Build(deps): Bump rack-mini-profiler from 1.1.6 to
 2.0.0 (#9168)

* Build(deps): Bump rack-mini-profiler from 1.1.6 to 2.0.0

Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 1.1.6 to 2.0.0.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.1.6...v2.0.0)

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

* Enable rails patches

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: OsamaSayegh <asooomaasoooma90@gmail.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 278e0fb961..73f97c0533 100644
--- a/Gemfile
+++ b/Gemfile
@@ -205,7 +205,7 @@ gem 'htmlentities', require: false
 #  we are open to it. by deferring require to the initializer we can configure discourse installs without it
 
 gem 'flamegraph', require: false
-gem 'rack-mini-profiler', require: false
+gem 'rack-mini-profiler', require: ['enable_rails_patches']
 
 gem 'unicorn', require: false, platform: :mri
 gem 'puma', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index ea4840a1ae..6bd045d8c6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -268,7 +268,7 @@ GEM
       nio4r (~> 2.0)
     r2 (0.2.7)
     rack (2.0.8)
-    rack-mini-profiler (1.1.6)
+    rack-mini-profiler (2.0.0)
       rack (>= 1.2.0)
     rack-protection (2.0.8.1)
       rack

From c928287e0cb2fe1510c321d8e2695f45095426e1 Mon Sep 17 00:00:00 2001
From: OsamaSayegh <asooomaasoooma90@gmail.com>
Date: Wed, 11 Mar 2020 21:31:57 +0300
Subject: [PATCH 0179/1830] DEV: Mini Profiler shouldn't be loaded in test
 environment

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 73f97c0533..0fad51edf9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -205,7 +205,7 @@ gem 'htmlentities', require: false
 #  we are open to it. by deferring require to the initializer we can configure discourse installs without it
 
 gem 'flamegraph', require: false
-gem 'rack-mini-profiler', require: ['enable_rails_patches']
+gem 'rack-mini-profiler', require: ['enable_rails_patches'], group: [:development, :production]
 
 gem 'unicorn', require: false, platform: :mri
 gem 'puma', require: false

From b23c2437aeb1244688388d2d9dfb4de242cf7528 Mon Sep 17 00:00:00 2001
From: OsamaSayegh <asooomaasoooma90@gmail.com>
Date: Wed, 11 Mar 2020 22:16:15 +0300
Subject: [PATCH 0180/1830] DEV: Revert rack-mini-profiler version bump

New version breaks site deploys. Will investigate and fix.
---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0fad51edf9..278e0fb961 100644
--- a/Gemfile
+++ b/Gemfile
@@ -205,7 +205,7 @@ gem 'htmlentities', require: false
 #  we are open to it. by deferring require to the initializer we can configure discourse installs without it
 
 gem 'flamegraph', require: false
-gem 'rack-mini-profiler', require: ['enable_rails_patches'], group: [:development, :production]
+gem 'rack-mini-profiler', require: false
 
 gem 'unicorn', require: false, platform: :mri
 gem 'puma', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 6bd045d8c6..ea4840a1ae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -268,7 +268,7 @@ GEM
       nio4r (~> 2.0)
     r2 (0.2.7)
     rack (2.0.8)
-    rack-mini-profiler (2.0.0)
+    rack-mini-profiler (1.1.6)
       rack (>= 1.2.0)
     rack-protection (2.0.8.1)
       rack

From b9aaa9718df45fc41aafccc3f7dc47ac7e3126a3 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Wed, 11 Mar 2020 17:05:44 -0300
Subject: [PATCH 0181/1830] FIX: When must_approve_users is enabled, we don't
 want to send suspect users to the review queue. Only non-approved users
 should be sent. Provide a migration to auto-approve every problematic review
 item (#9179)

---
 app/jobs/scheduled/enqueue_suspect_users.rb   |  2 ++
 ...ar_approved_users_from_the_review_queue.rb | 34 +++++++++++++++++++
 spec/jobs/enqueue_suspect_users_spec.rb       | 17 ++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 db/migrate/20200311135425_clear_approved_users_from_the_review_queue.rb

diff --git a/app/jobs/scheduled/enqueue_suspect_users.rb b/app/jobs/scheduled/enqueue_suspect_users.rb
index 9fc5196d82..1b94dcb309 100644
--- a/app/jobs/scheduled/enqueue_suspect_users.rb
+++ b/app/jobs/scheduled/enqueue_suspect_users.rb
@@ -6,10 +6,12 @@ module Jobs
 
     def execute(_args)
       return unless SiteSetting.approve_suspect_users
+      return if SiteSetting.must_approve_users
 
       users = User
         .activated
         .human_users
+        .where(approved: false)
         .joins(:user_profile, :user_stat)
         .where("users.created_at <= ?", 1.day.ago)
         .where("LENGTH(COALESCE(user_profiles.bio_raw, user_profiles.website, '')) > 0")
diff --git a/db/migrate/20200311135425_clear_approved_users_from_the_review_queue.rb b/db/migrate/20200311135425_clear_approved_users_from_the_review_queue.rb
new file mode 100644
index 0000000000..07cb662d74
--- /dev/null
+++ b/db/migrate/20200311135425_clear_approved_users_from_the_review_queue.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+class ClearApprovedUsersFromTheReviewQueue < ActiveRecord::Migration[6.0]
+  def up
+    reviewables = DB.query_single <<~SQL
+      UPDATE reviewables r
+      SET status = #{Reviewable.statuses[:approved]}
+      FROM users u
+      WHERE u.approved = true AND r.type = 'ReviewableUser' AND r.status = #{Reviewable.statuses[:pending]}
+      RETURNING r.id
+    SQL
+
+    system_user_id = Discourse::SYSTEM_USER_ID
+    scores = reviewables.map do |id|
+      "(#{id}, 1, #{Reviewable.statuses[:approved]}, #{system_user_id}, NOW(), NOW())"
+    end
+
+    if scores.present?
+      DB.exec <<~SQL
+        INSERT INTO reviewable_histories (
+          reviewable_id,
+          reviewable_history_type,
+          status,
+          created_by_id,
+          created_at,
+          updated_at
+        )
+        VALUES #{scores.join(',') << ';'}
+      SQL
+    end
+  end
+
+  def down
+  end
+end
diff --git a/spec/jobs/enqueue_suspect_users_spec.rb b/spec/jobs/enqueue_suspect_users_spec.rb
index 30514abed1..b614899823 100644
--- a/spec/jobs/enqueue_suspect_users_spec.rb
+++ b/spec/jobs/enqueue_suspect_users_spec.rb
@@ -39,5 +39,22 @@ describe Jobs::EnqueueSuspectUsers do
 
       expect(score.reason).to eq('suspect_user')
     end
+
+    it 'only enqueues non-approved users' do
+      suspect_user.update!(approved: true)
+
+      subject.execute({})
+
+      expect(ReviewableUser.where(target: suspect_user).exists?).to eq(false)
+    end
+
+    it 'does nothing if must_approve_users is set to true' do
+      SiteSetting.must_approve_users = true
+      suspect_user.update!(approved: false)
+
+      subject.execute({})
+
+      expect(ReviewableUser.where(target: suspect_user).exists?).to eq(false)
+    end
   end
 end

From 793f39139acee67e15bdcce0bc39acef5b351b54 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 12 Mar 2020 10:16:00 +1000
Subject: [PATCH 0182/1830] FEATURE: Send notifications for time-based and At
 Desktop bookmark reminders (#9071)

* This PR implements the scheduling and notification system for bookmark reminders. Every 5 minutes a schedule runs to check any reminders that need to be sent before now, limited to **300** reminders at a time. Any leftover reminders will be sent in the next run. This is to avoid having to deal with fickle sidekiq and reminders in the far-flung future, which would necessitate having a background job anyway to clean up any missing `enqueue_at` reminders.

* If a reminder is sent its `reminder_at` time is cleared and the `reminder_last_sent_at` time is filled in. Notifications are only user-level notifications for now.

* All JavaScript and frontend code related to displaying the bookmark reminder notification is contained here. The reminder functionality is now re-enabled in the bookmark modal as well.

* This PR also implements the "Remind me next time I am at my desktop" bookmark reminder functionality. When the user is on a mobile device they are able to select this option. When they choose this option we set a key in Redis saying they have a pending at desktop reminder. The next time they change devices we check if the new device is desktop, and if it is we send reminders using a DistributedMutex. There is also a job to ensure consistency of these reminders in Redis (in case Redis drops the ball) and the at desktop reminders expire after 20 days.

* Also in this PR is a fix to delete all Bookmarks for a user via `UserDestroyer`
---
 .../discourse-common/lib/icon-library.js.es6  |   1 +
 .../discourse/components/tap-tile.js.es6      |   2 +-
 .../discourse/controllers/bookmark.js.es6     |   4 +-
 .../discourse/lib/transform-post.js.es6       |   1 +
 .../javascripts/discourse/models/post.js.es6  |  10 +-
 .../discourse/templates/modal/bookmark.hbs    |   2 +-
 ...bookmark-reminder-notification-item.js.es6 |  19 ++
 .../discourse/widgets/post-menu.js.es6        |   5 +-
 app/controllers/bookmarks_controller.rb       |  27 +--
 app/controllers/topics_controller.rb          |  10 +-
 .../bookmark_reminder_notifications.rb        | 110 +++++++++
 app/models/bookmark.rb                        |  56 ++++-
 app/models/notification.rb                    |   3 +-
 app/serializers/post_serializer.rb            |  10 +
 app/services/user_destroyer.rb                |   1 +
 config/locales/client.en.yml                  |   2 +
 config/locales/server.en.yml                  |   2 +
 ..._add_reminder_last_sent_at_to_bookmarks.rb |   7 +
 ...060737_add_reminder_set_at_to_bookmarks.rb |   8 +
 lib/auth/default_current_user_provider.rb     |   4 +
 lib/bookmark_manager.rb                       |  73 ++++++
 lib/bookmark_reminder_notification_handler.rb |  74 ++++++
 .../default_current_user_provider_spec.rb     |   8 +
 spec/fabricators/bookmark_fabricator.rb       |  14 +-
 .../bookmark_reminder_notifications_spec.rb   | 139 +++++++++++
 spec/lib/bookmark_manager_spec.rb             | 215 ++++++++++++++++++
 ...mark_reminder_notification_handler_spec.rb |  75 ++++++
 spec/models/user_spec.rb                      |  10 -
 spec/requests/bookmarks_controller_spec.rb    |   6 +-
 spec/requests/topics_controller_spec.rb       |   2 +-
 spec/services/user_destroyer_spec.rb          |  20 ++
 31 files changed, 860 insertions(+), 60 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js.es6
 create mode 100644 app/jobs/scheduled/bookmark_reminder_notifications.rb
 create mode 100644 db/migrate/20200227073837_add_reminder_last_sent_at_to_bookmarks.rb
 create mode 100644 db/migrate/20200306060737_add_reminder_set_at_to_bookmarks.rb
 create mode 100644 lib/bookmark_manager.rb
 create mode 100644 lib/bookmark_reminder_notification_handler.rb
 create mode 100644 spec/jobs/bookmark_reminder_notifications_spec.rb
 create mode 100644 spec/lib/bookmark_manager_spec.rb
 create mode 100644 spec/lib/bookmark_reminder_notification_handler_spec.rb

diff --git a/app/assets/javascripts/discourse-common/lib/icon-library.js.es6 b/app/assets/javascripts/discourse-common/lib/icon-library.js.es6
index b1f1d48829..dab500bbdf 100644
--- a/app/assets/javascripts/discourse-common/lib/icon-library.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/icon-library.js.es6
@@ -21,6 +21,7 @@ const REPLACEMENTS = {
   "notification.replied": "reply",
   "notification.posted": "reply",
   "notification.edited": "pencil-alt",
+  "notification.bookmark_reminder": "discourse-bookmark-clock",
   "notification.liked": "heart",
   "notification.liked_2": "heart",
   "notification.liked_many": "heart",
diff --git a/app/assets/javascripts/discourse/components/tap-tile.js.es6 b/app/assets/javascripts/discourse/components/tap-tile.js.es6
index a7dfbe267c..3a5203573d 100644
--- a/app/assets/javascripts/discourse/components/tap-tile.js.es6
+++ b/app/assets/javascripts/discourse/components/tap-tile.js.es6
@@ -5,7 +5,7 @@ export default Component.extend({
   classNames: ["tap-tile"],
   classNameBindings: ["active"],
   click() {
-    this.onSelect(this.tileId);
+    this.onChange(this.tileId);
   },
 
   active: propertyEqual("activeTile", "tileId")
diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js.es6 b/app/assets/javascripts/discourse/controllers/bookmark.js.es6
index 3be0e107af..27e3e8418b 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js.es6
@@ -48,7 +48,7 @@ export default Controller.extend(ModalFunctionality, {
   },
 
   usingMobileDevice: reads("site.mobileView"),
-  showBookmarkReminderControls: false,
+  showBookmarkReminderControls: true,
 
   @discourseComputed()
   reminderTypes: () => {
@@ -122,7 +122,7 @@ export default Controller.extend(ModalFunctionality, {
 
     return ajax("/bookmarks", { type: "POST", data }).then(() => {
       if (this.afterSave) {
-        this.afterSave(reminderAtISO);
+        this.afterSave(reminderAtISO, this.selectedReminderType);
       }
     });
   },
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js.es6
index f6d19c6b46..09cb6d967c 100644
--- a/app/assets/javascripts/discourse/lib/transform-post.js.es6
+++ b/app/assets/javascripts/discourse/lib/transform-post.js.es6
@@ -37,6 +37,7 @@ export function transformBasicPost(post) {
     bookmarked: post.bookmarked,
     bookmarkedWithReminder: post.bookmarked_with_reminder,
     bookmarkReminderAt: post.bookmark_reminder_at,
+    bookmarkReminderType: post.bookmark_reminder_type,
     yours: post.yours,
     shareUrl: post.get("shareUrl"),
     staff: post.staff,
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index 4ba35b31ac..2629afcb33 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -351,16 +351,20 @@ const Post = RestModel.extend({
           this.toggleProperty("bookmarked_with_reminder");
           this.appEvents.trigger("post-stream:refresh", { id: this.id });
         },
-        afterSave: reminderAtISO => {
+        afterSave: (reminderAtISO, reminderType) => {
           this.setProperties({
             "topic.bookmarked": true,
-            bookmark_reminder_at: reminderAtISO
+            bookmark_reminder_at: reminderAtISO,
+            bookmark_reminder_type: reminderType
           });
           this.appEvents.trigger("post-stream:refresh", { id: this.id });
         }
       });
     } else {
-      this.set("bookmark_reminder_at", null);
+      this.setProperties({
+        bookmark_reminder_at: null,
+        bookmark_reminder_type: null
+      });
       return Post.destroyBookmark(this.id)
         .then(result => {
           this.set("topic.bookmarked", result.topic_bookmarked);
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 0098c5b237..e32f2467eb 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -25,7 +25,7 @@
       {{#if userHasTimezoneSet}}
         {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
           {{#if usingMobileDevice}}
-            <!-- {{tap-tile icon="desktop" text=(i18n "bookmarks.reminders.at_desktop") tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}} -->
+            {{tap-tile icon="desktop" text=(i18n "bookmarks.reminders.at_desktop") tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
           {{/if}}
 
           {{#if showLaterToday}}
diff --git a/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js.es6
new file mode 100644
index 0000000000..f02bc7a223
--- /dev/null
+++ b/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js.es6
@@ -0,0 +1,19 @@
+import { createWidgetFrom } from "discourse/widgets/widget";
+import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
+import { formatUsername } from "discourse/lib/utilities";
+
+createWidgetFrom(
+  DefaultNotificationItem,
+  "bookmark-reminder-notification-item",
+  {
+    text(notificationName, data) {
+      const username = formatUsername(data.display_username);
+      const description = this.description(data);
+
+      return I18n.t("notifications.bookmark_reminder", {
+        description,
+        username
+      });
+    }
+  }
+);
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index b5562aa2f1..6ae6460fac 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -332,7 +332,10 @@ registerButton("bookmarkWithReminder", (attrs, state, siteSettings) => {
     title,
     titleOptions,
     className: classNames.join(" "),
-    icon: attrs.bookmarkReminderAt ? "discourse-bookmark-clock" : "bookmark"
+    icon:
+      attrs.bookmarkReminderAt || attrs.bookmarkReminderType === "at_desktop"
+        ? "discourse-bookmark-clock"
+        : "bookmark"
   };
 });
 
diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
index 4cab4edf04..c47dfdc025 100644
--- a/app/controllers/bookmarks_controller.rb
+++ b/app/controllers/bookmarks_controller.rb
@@ -6,33 +6,24 @@ class BookmarksController < ApplicationController
   def create
     params.require(:post_id)
 
-    existing_bookmark = Bookmark.find_by(post_id: params[:post_id], user_id: current_user.id)
-    if existing_bookmark.present?
-      return render json: failed_json.merge(errors: [I18n.t("bookmarks.errors.already_bookmarked_post")]), status: 422
-    end
-
-    bookmark = Bookmark.create(
-      user_id: current_user.id,
-      topic_id: Post.select(:topic_id).find(params[:post_id]).topic_id,
+    bookmark_manager = BookmarkManager.new(current_user)
+    bookmark = bookmark_manager.create(
       post_id: params[:post_id],
       name: params[:name],
-      reminder_type: Bookmark.reminder_types[params[:reminder_type].to_sym],
+      reminder_type: params[:reminder_type],
       reminder_at: params[:reminder_at]
     )
 
-    return render json: success_json if bookmark.save
-    render json: failed_json.merge(errors: bookmark.errors.full_messages), status: 400
+    if bookmark_manager.errors.empty?
+      return render json: success_json
+    end
+
+    render json: failed_json.merge(errors: bookmark_manager.errors.full_messages), status: 400
   end
 
   def destroy
     params.require(:id)
-
-    bookmark = Bookmark.find_by(id: params[:id])
-    raise Discourse::NotFound if bookmark.blank?
-
-    raise Discourse::InvalidAccess.new if !guardian.can_delete?(bookmark)
-
-    bookmark.destroy
+    BookmarkManager.new(current_user).destroy(params[:id])
     render json: success_json
   end
 end
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index d26538b805..61b6d4bd68 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -487,7 +487,7 @@ class TopicsController < ApplicationController
     topic = Topic.find(params[:topic_id].to_i)
 
     if SiteSetting.enable_bookmarks_with_reminders?
-      Bookmark.where(user_id: current_user.id, topic_id: topic.id).destroy_all
+      BookmarkManager.new(current_user).destroy_for_topic(topic)
     else
       PostAction.joins(:post)
         .where(user_id: current_user.id)
@@ -548,10 +548,12 @@ class TopicsController < ApplicationController
     first_post = topic.ordered_posts.first
 
     if SiteSetting.enable_bookmarks_with_reminders?
-      if Bookmark.exists?(user: current_user, post: first_post)
-        return render_json_error(I18n.t("bookmark.topic_already_bookmarked"), status: 403)
+      bookmark_manager = BookmarkManager.new(current_user)
+      bookmark_manager.create(post_id: first_post.id)
+
+      if bookmark_manager.errors
+        return render_json_error(bookmark_manager, status: 400)
       end
-      Bookmark.create(user: current_user, post: first_post, topic: topic)
     else
       result = PostActionCreator.create(current_user, first_post, :bookmark)
       return render_json_error(result) if result.failed?
diff --git a/app/jobs/scheduled/bookmark_reminder_notifications.rb b/app/jobs/scheduled/bookmark_reminder_notifications.rb
new file mode 100644
index 0000000000..20ce9cb8a8
--- /dev/null
+++ b/app/jobs/scheduled/bookmark_reminder_notifications.rb
@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+module Jobs
+
+  # Runs periodically to send out bookmark reminders, capped at 300 at a time.
+  # Any leftovers will be caught in the next run, because the reminder_at column
+  # is set to NULL once a reminder has been sent.
+  class BookmarkReminderNotifications < ::Jobs::Scheduled
+    JOB_RUN_NUMBER_KEY ||= 'jobs_bookmark_reminder_notifications_job_run_num'.freeze
+    AT_DESKTOP_CONSISTENCY_RUN_NUMBER ||= 6
+
+    every 5.minutes
+
+    def self.max_reminder_notifications_per_run
+      @@max_reminder_notifications_per_run ||= 3
+      @@max_reminder_notifications_per_run
+    end
+
+    def self.max_reminder_notifications_per_run=(max)
+      @@max_reminder_notifications_per_run = max
+    end
+
+    def execute(args = nil)
+      return if !SiteSetting.enable_bookmarks_with_reminders?
+
+      bookmarks = Bookmark.pending_reminders
+        .where.not(reminder_type: Bookmark.reminder_types[:at_desktop])
+        .includes(:user).order('reminder_at ASC')
+
+      bookmarks.limit(BookmarkReminderNotifications.max_reminder_notifications_per_run).each do |bookmark|
+        BookmarkReminderNotificationHandler.send_notification(bookmark)
+      end
+
+      # we only want to ensure the desktop consistency every X runs of this job
+      # (every 30 mins in this case) so we don't bother redis too much, and the
+      # at desktop consistency problem should not really happen unless people
+      # are setting the "at desktop" reminder, going out for milk, and never coming
+      # back
+      current_job_run_number = Discourse.redis.get(JOB_RUN_NUMBER_KEY).to_i
+      if current_job_run_number == AT_DESKTOP_CONSISTENCY_RUN_NUMBER
+        ensure_at_desktop_consistency
+      end
+
+      increment_job_run_number(current_job_run_number)
+    end
+
+    def increment_job_run_number(current_job_run_number)
+      if current_job_run_number.zero? || current_job_run_number == AT_DESKTOP_CONSISTENCY_RUN_NUMBER
+        new_job_run_number = 1
+      else
+        new_job_run_number = current_job_run_number + 1
+      end
+      Discourse.redis.set(JOB_RUN_NUMBER_KEY, new_job_run_number)
+    end
+
+    def ensure_at_desktop_consistency
+      pending_at_desktop_bookmark_reminders = \
+        Bookmark.includes(:user)
+          .references(:user)
+          .pending_at_desktop_reminders
+          .where('users.last_seen_at >= :one_day_ago', one_day_ago: 1.day.ago.utc)
+
+      return if pending_at_desktop_bookmark_reminders.count.zero?
+
+      unique_users = pending_at_desktop_bookmark_reminders.map(&:user).uniq.map { |u| [u.id, u] }.flatten
+      unique_users = Hash[*unique_users]
+      pending_reminders_for_redis_check = unique_users.keys.map do |user_id|
+        "#{BookmarkReminderNotificationHandler::PENDING_AT_DESKTOP_KEY_PREFIX}#{user_id}"
+      end
+
+      Discourse.redis.mget(pending_reminders_for_redis_check).each.with_index do |value, idx|
+        next if value.present?
+        user_id = pending_reminders_for_redis_check[idx][/\d+/].to_i
+        user = unique_users[user_id]
+
+        user_pending_bookmark_reminders = pending_at_desktop_bookmark_reminders.select do |bookmark|
+          bookmark.user == user
+        end
+
+        user_expired_bookmark_reminders = user_pending_bookmark_reminders.select do |bookmark|
+          bookmark.reminder_set_at <= expiry_limit_datetime
+        end
+
+        next if user_pending_bookmark_reminders.length == user_expired_bookmark_reminders.length
+
+        # only tell the cache-gods that this user has pending "at desktop" reminders
+        # if they haven't let them all expire before coming back to their desktop
+        #
+        # the next time they visit the desktop the reminders will be cleared out once
+        # the notifications are sent
+        BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user)
+      end
+
+      clear_expired_at_desktop_reminders
+    end
+
+    def clear_expired_at_desktop_reminders
+      Bookmark
+        .pending_at_desktop_reminders
+        .where('reminder_set_at <= :expiry_limit_datetime', expiry_limit_datetime: expiry_limit_datetime)
+        .update_all(
+          reminder_set_at: nil, reminder_type: nil
+        )
+    end
+
+    def expiry_limit_datetime
+      BookmarkReminderNotificationHandler::PENDING_AT_DESKTOP_EXPIRY_DAYS.days.ago.utc
+    end
+  end
+end
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index 6958064324..d25a30b865 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -10,6 +10,41 @@ class Bookmark < ActiveRecord::Base
     if: -> { reminder_type.present? && reminder_type != Bookmark.reminder_types[:at_desktop] }
   }
 
+  validate :unique_per_post_for_user
+  validate :ensure_sane_reminder_at_time
+
+  def unique_per_post_for_user
+    existing_bookmark = Bookmark.find_by(user_id: user_id, post_id: post_id)
+    return if existing_bookmark.blank? || existing_bookmark.id == id
+    self.errors.add(:base, I18n.t("bookmarks.errors.already_bookmarked_post"))
+  end
+
+  def ensure_sane_reminder_at_time
+    return if reminder_at.blank?
+    if reminder_at < Time.zone.now
+      self.errors.add(:base, I18n.t("bookmarks.errors.cannot_set_past_reminder"))
+    end
+    if reminder_at > 10.years.from_now.utc
+      self.errors.add(:base, I18n.t("bookmarks.errors.cannot_set_reminder_in_distant_future"))
+    end
+  end
+
+  scope :pending_reminders, ->(before_time = Time.now.utc) do
+    where("reminder_at IS NOT NULL AND reminder_at <= :before_time", before_time: before_time)
+  end
+
+  scope :pending_at_desktop_reminders, ->(before_time = Time.now.utc) do
+    where("reminder_at IS NULL AND reminder_type = :at_desktop", at_desktop: reminder_types[:at_desktop])
+  end
+
+  scope :pending_reminders_for_user, ->(user) do
+    pending_reminders.where(user: user)
+  end
+
+  scope :at_desktop_reminders_for_user, ->(user) do
+    where("reminder_type = :at_desktop AND user_id = :user_id", at_desktop: reminder_types[:at_desktop], user_id: user.id)
+  end
+
   def self.reminder_types
     @reminder_type = Enum.new(
       at_desktop: 0,
@@ -27,20 +62,23 @@ end
 #
 # Table name: bookmarks
 #
-#  id            :bigint           not null, primary key
-#  user_id       :bigint           not null
-#  topic_id      :bigint           not null
-#  post_id       :bigint           not null
-#  name          :string
-#  reminder_type :integer
-#  reminder_at   :datetime
-#  created_at    :datetime         not null
-#  updated_at    :datetime         not null
+#  id                    :bigint           not null, primary key
+#  user_id               :bigint           not null
+#  topic_id              :bigint           not null
+#  post_id               :bigint           not null
+#  name                  :string
+#  reminder_type         :integer
+#  reminder_at           :datetime
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  reminder_last_sent_at :datetime
+#  reminder_set_at       :datetime
 #
 # Indexes
 #
 #  index_bookmarks_on_post_id              (post_id)
 #  index_bookmarks_on_reminder_at          (reminder_at)
+#  index_bookmarks_on_reminder_set_at      (reminder_set_at)
 #  index_bookmarks_on_reminder_type        (reminder_type)
 #  index_bookmarks_on_topic_id             (topic_id)
 #  index_bookmarks_on_user_id              (user_id)
diff --git a/app/models/notification.rb b/app/models/notification.rb
index b9443d89fb..a44086f652 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -103,7 +103,8 @@ class Notification < ActiveRecord::Base
                         post_approved: 20,
                         code_review_commit_approved: 21,
                         membership_request_accepted: 22,
-                        membership_request_consolidated: 23
+                        membership_request_consolidated: 23,
+                        bookmark_reminder: 24
                        )
   end
 
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index ade1417dc6..b78c90f4fb 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -51,6 +51,7 @@ class PostSerializer < BasicPostSerializer
              :bookmarked,
              :bookmarked_with_reminder,
              :bookmark_reminder_at,
+             :bookmark_reminder_type,
              :raw,
              :actions_summary,
              :moderator?,
@@ -329,6 +330,10 @@ class PostSerializer < BasicPostSerializer
     include_bookmarked_with_reminder?
   end
 
+  def include_bookmark_reminder_type?
+    include_bookmarked_with_reminder?
+  end
+
   def post_bookmark
     return nil if !SiteSetting.enable_bookmarks_with_reminders? || @topic_view.blank?
     @post_bookmark ||= @topic_view.user_post_bookmarks.find { |bookmark| bookmark.post_id == object.id }
@@ -338,6 +343,11 @@ class PostSerializer < BasicPostSerializer
     post_bookmark&.reminder_at
   end
 
+  def bookmark_reminder_type
+    return if post_bookmark.blank?
+    Bookmark.reminder_types[post_bookmark.reminder_type].to_s
+  end
+
   def include_display_username?
     SiteSetting.enable_names?
   end
diff --git a/app/services/user_destroyer.rb b/app/services/user_destroyer.rb
index 7844496362..e0f7543ac6 100644
--- a/app/services/user_destroyer.rb
+++ b/app/services/user_destroyer.rb
@@ -28,6 +28,7 @@ class UserDestroyer
     optional_transaction(open_transaction: opts[:transaction]) do
 
       UserSecurityKey.where(user_id: user.id).delete_all
+      Bookmark.where(user_id: user.id).delete_all
       Draft.where(user_id: user.id).delete_all
       Reviewable.where(created_by_id: user.id).delete_all
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ea18a5b17a..c699eef32f 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1807,6 +1807,7 @@ en:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -1860,6 +1861,7 @@ en:
         posted: "new post"
         moved_post: "post moved"
         linked: "linked"
+        bookmark_reminder: "bookmark reminder"
         granted_badge: "badge granted"
         invited_to_topic: "invited to topic"
         group_mentioned: "group mentioned"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 0b1011a46c..f260855087 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -385,6 +385,8 @@ en:
   bookmarks:
     errors:
       already_bookmarked_post: "You cannot bookmark the same post twice."
+      cannot_set_past_reminder: "You cannot set a bookmark reminder in the past."
+      cannot_set_reminder_in_distant_future: "You cannot set a bookmark reminder more than 10 years in the future."
       time_must_be_provided: "time must be provided for all reminders except '%{reminder_type}'"
 
     reminders:
diff --git a/db/migrate/20200227073837_add_reminder_last_sent_at_to_bookmarks.rb b/db/migrate/20200227073837_add_reminder_last_sent_at_to_bookmarks.rb
new file mode 100644
index 0000000000..3a1aa86bff
--- /dev/null
+++ b/db/migrate/20200227073837_add_reminder_last_sent_at_to_bookmarks.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddReminderLastSentAtToBookmarks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :bookmarks, :reminder_last_sent_at, :datetime, null: true
+  end
+end
diff --git a/db/migrate/20200306060737_add_reminder_set_at_to_bookmarks.rb b/db/migrate/20200306060737_add_reminder_set_at_to_bookmarks.rb
new file mode 100644
index 0000000000..93ddeff2f1
--- /dev/null
+++ b/db/migrate/20200306060737_add_reminder_set_at_to_bookmarks.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddReminderSetAtToBookmarks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :bookmarks, :reminder_set_at, :datetime, null: true
+    add_index :bookmarks, :reminder_set_at
+  end
+end
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index 5fe22b4adc..caee9ac1cf 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -124,6 +124,10 @@ class Auth::DefaultCurrentUserProvider
         u.update_last_seen!
         u.update_ip_address!(ip)
       end
+
+      BookmarkReminderNotificationHandler.defer_at_desktop_reminder(
+        user: u, request_user_agent: @request.user_agent
+      )
     end
 
     @env[CURRENT_USER_KEY] = current_user
diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
new file mode 100644
index 0000000000..0dcfa2b79f
--- /dev/null
+++ b/lib/bookmark_manager.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+class BookmarkManager
+  include HasErrors
+
+  def initialize(user)
+    @user = user
+  end
+
+  def create(post_id:, name: nil, reminder_type: nil, reminder_at: nil)
+    reminder_type = Bookmark.reminder_types[reminder_type.to_sym] if reminder_type.present?
+
+    bookmark = Bookmark.create(
+      user_id: @user.id,
+      topic_id: topic_id_for_post(post_id),
+      post_id: post_id,
+      name: name,
+      reminder_type: reminder_type,
+      reminder_at: reminder_at,
+      reminder_set_at: Time.zone.now
+    )
+
+    if bookmark.errors.any?
+      return add_errors_from(bookmark)
+    end
+
+    BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(@user)
+    bookmark
+  end
+
+  def destroy(bookmark_id)
+    bookmark = Bookmark.find_by(id: bookmark_id)
+
+    raise Discourse::NotFound if bookmark.blank?
+    raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_delete?(bookmark)
+
+    bookmark.destroy
+    clear_at_desktop_cache_if_required
+  end
+
+  def destroy_for_topic(topic)
+    topic_bookmarks = Bookmark.where(user_id: @user.id, topic_id: topic.id)
+
+    Bookmark.transaction do
+      topic_bookmarks.each do |bookmark|
+        raise Discourse::InvalidAccess.new if !Guardian.new(user).can_delete?(bookmark)
+        bookmark.destroy
+      end
+    end
+
+    clear_at_desktop_cache_if_required
+  end
+
+  def self.send_reminder_notification(id)
+    bookmark = Bookmark.find_by(id: id)
+    BookmarkReminderNotificationHandler.send_notification(bookmark)
+  end
+
+  private
+
+  def topic_id_for_post(post_id)
+    Post.where(id: post_id).pluck_first(:topic_id)
+  end
+
+  def clear_at_desktop_cache_if_required
+    return if user_has_any_pending_at_desktop_reminders?
+    Discourse.redis.del(BookmarkReminderNotificationHandler::PENDING_AT_DESKTOP_KEY_PREFIX + @user.id.to_s)
+  end
+
+  def user_has_any_pending_at_desktop_reminders?
+    Bookmark.at_desktop_reminders_for_user(@user).any?
+  end
+end
diff --git a/lib/bookmark_reminder_notification_handler.rb b/lib/bookmark_reminder_notification_handler.rb
new file mode 100644
index 0000000000..166c46274e
--- /dev/null
+++ b/lib/bookmark_reminder_notification_handler.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+class BookmarkReminderNotificationHandler
+  PENDING_AT_DESKTOP_KEY_PREFIX ||= 'pending_at_desktop_bookmark_reminder_user_'.freeze
+  PENDING_AT_DESKTOP_EXPIRY_DAYS ||= 20
+
+  def self.send_notification(bookmark)
+    return if bookmark.blank?
+    Bookmark.transaction do
+      if bookmark.post.blank?
+        return clear_reminder(bookmark)
+      end
+
+      create_notification(bookmark)
+      clear_reminder(bookmark)
+    end
+  end
+
+  def self.clear_reminder(bookmark)
+    Rails.logger.debug(
+      "Clearing bookmark reminder for bookmark_id #{bookmark.id}. reminder info: #{bookmark.reminder_at} | #{Bookmark.reminder_types[bookmark.reminder_type]}"
+    )
+
+    bookmark.update(
+      reminder_at: nil,
+      reminder_type: nil,
+      reminder_last_sent_at: Time.zone.now,
+      reminder_set_at: nil
+    )
+  end
+
+  def self.create_notification(bookmark)
+    user = bookmark.user
+    user.notifications.create!(
+      notification_type: Notification.types[:bookmark_reminder],
+      topic_id: bookmark.topic_id,
+      post_number: bookmark.post.post_number,
+      data: {
+        topic_title: bookmark.topic.title,
+        display_username: user.username,
+        bookmark_name: bookmark.name
+      }.to_json
+    )
+  end
+
+  def self.user_has_pending_at_desktop_reminders?(user)
+    Discourse.redis.exists("#{PENDING_AT_DESKTOP_KEY_PREFIX}#{user.id}")
+  end
+
+  def self.cache_pending_at_desktop_reminder(user)
+    Discourse.redis.setex("#{PENDING_AT_DESKTOP_KEY_PREFIX}#{user.id}", PENDING_AT_DESKTOP_EXPIRY_DAYS.days, true)
+  end
+
+  def self.send_at_desktop_reminder(user:, request_user_agent:)
+    return if !SiteSetting.enable_bookmarks_with_reminders
+
+    return if MobileDetection.mobile_device?(BrowserDetection.device(request_user_agent).to_s)
+
+    return if !user_has_pending_at_desktop_reminders?(user)
+
+    DistributedMutex.synchronize("sending_at_desktop_bookmark_reminders_user_#{user.id}") do
+      Bookmark.at_desktop_reminders_for_user(user).each do |bookmark|
+        BookmarkReminderNotificationHandler.send_notification(bookmark)
+      end
+      Discourse.redis.del("#{PENDING_AT_DESKTOP_KEY_PREFIX}#{user.id}")
+    end
+  end
+
+  def self.defer_at_desktop_reminder(user:, request_user_agent:)
+    Scheduler::Defer.later "Sending Desktop Bookmark Reminders" do
+      send_at_desktop_reminder(user: user, request_user_agent: request_user_agent)
+    end
+  end
+end
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index 2e0650cf30..2fd165c848 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -443,6 +443,14 @@ describe Auth::DefaultCurrentUserProvider do
         expect(u.last_seen_at).to eq(nil)
       end
     end
+
+    it "defers any at_desktop bookmark reminders" do
+      BookmarkReminderNotificationHandler.expects(:defer_at_desktop_reminder).with(
+        user: user, request_user_agent: 'test'
+      )
+      provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}", "HTTP_USER_AGENT" => 'test')
+      provider2.current_user
+    end
   end
 
   it "should update last seen for non ajax" do
diff --git a/spec/fabricators/bookmark_fabricator.rb b/spec/fabricators/bookmark_fabricator.rb
index a92f272e52..ede44dfeca 100644
--- a/spec/fabricators/bookmark_fabricator.rb
+++ b/spec/fabricators/bookmark_fabricator.rb
@@ -6,19 +6,21 @@ Fabricator(:bookmark) do
   topic { |attrs| attrs[:post].topic }
   name "This looked interesting"
   reminder_type { Bookmark.reminder_types[:tomorrow] }
-  reminder_at { (Time.now.utc + 1.day).iso8601 }
+  reminder_at { 1.day.from_now.iso8601 }
+  reminder_set_at { Time.zone.now }
 end
 
 Fabricator(:bookmark_next_business_day_reminder, from: :bookmark) do
   reminder_type { Bookmark.reminder_types[:next_business_day] }
   reminder_at do
-    date = if Time.now.utc.friday?
-      Time.now.utc + 3.days
-    elsif Time.now.utc.saturday?
-      Time.now.utc + 2.days
+    date = if Time.zone.now.friday?
+      Time.zone.now + 3.days
+    elsif Time.zone.now.saturday?
+      Time.zone.now + 2.days
     else
-      Time.now.utc + 1.day
+      Time.zone.now + 1.day
     end
     date.iso8601
   end
+  reminder_set_at { Time.zone.now }
 end
diff --git a/spec/jobs/bookmark_reminder_notifications_spec.rb b/spec/jobs/bookmark_reminder_notifications_spec.rb
new file mode 100644
index 0000000000..92ae100020
--- /dev/null
+++ b/spec/jobs/bookmark_reminder_notifications_spec.rb
@@ -0,0 +1,139 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Jobs::BookmarkReminderNotifications do
+  subject { described_class.new }
+
+  let(:five_minutes_ago) { Time.zone.now - 5.minutes }
+  let(:bookmark1) { Fabricate(:bookmark) }
+  let(:bookmark2) { Fabricate(:bookmark) }
+  let(:bookmark3) { Fabricate(:bookmark) }
+  let!(:bookmarks) do
+    [
+      bookmark1,
+      bookmark2,
+      bookmark3
+    ]
+  end
+
+  before do
+    SiteSetting.enable_bookmarks_with_reminders = true
+    # this is done to avoid model validations on Bookmark
+    bookmark1.update_column(:reminder_at, five_minutes_ago - 10.minutes)
+    bookmark2.update_column(:reminder_at, five_minutes_ago - 5.minutes)
+    bookmark3.update_column(:reminder_at, five_minutes_ago)
+    Discourse.redis.flushall
+  end
+
+  it "sends every reminder and marks the reminder_at to nil for all bookmarks, as well as last sent date" do
+    subject.execute
+    bookmark1.reload
+    bookmark2.reload
+    bookmark3.reload
+    expect(bookmark1.reminder_at).to eq(nil)
+    expect(bookmark1.reminder_last_sent_at).not_to eq(nil)
+    expect(bookmark2.reminder_at).to eq(nil)
+    expect(bookmark2.reminder_last_sent_at).not_to eq(nil)
+    expect(bookmark3.reminder_at).to eq(nil)
+    expect(bookmark3.reminder_last_sent_at).not_to eq(nil)
+  end
+
+  it "will not send a reminder for a bookmark in the future" do
+    bookmark4 = Fabricate(:bookmark, reminder_at: Time.zone.now + 1.day)
+    BookmarkReminderNotificationHandler.expects(:send_notification).with(bookmark1)
+    BookmarkReminderNotificationHandler.expects(:send_notification).with(bookmark2)
+    BookmarkReminderNotificationHandler.expects(:send_notification).with(bookmark3)
+    BookmarkReminderNotificationHandler.expects(:send_notification).with(bookmark4).never
+    subject.execute
+    expect(bookmark4.reload.reminder_at).not_to eq(nil)
+  end
+
+  it "increments the job run number correctly and resets to 1 when it reaches 6" do
+    expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq(nil)
+    subject.execute
+    expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq('1')
+    subject.execute
+    subject.execute
+    subject.execute
+    subject.execute
+    subject.execute
+    expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq('6')
+    subject.execute
+    expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq('1')
+  end
+
+  context "when the bookmark with reminder site setting is disabled" do
+    it "does nothing" do
+      Bookmark.expects(:where).never
+      SiteSetting.enable_bookmarks_with_reminders = false
+      subject.execute
+    end
+  end
+
+  context "when one of the bookmark reminder types is at_desktop" do
+    let(:bookmark1) { Fabricate(:bookmark, reminder_type: :at_desktop) }
+    it "is not included in the run, because it is not time-based" do
+      BookmarkManager.any_instance.expects(:send_reminder_notification).with(bookmark1.id).never
+      subject.execute
+    end
+  end
+
+  context "when the number of notifications exceed max_reminder_notifications_per_run" do
+    it "does not send them in the current run, but will send them in the next" do
+      begin
+        Jobs::BookmarkReminderNotifications.max_reminder_notifications_per_run = 2
+        subject.execute
+        expect(bookmark1.reload.reminder_at).to eq(nil)
+        expect(bookmark2.reload.reminder_at).to eq(nil)
+        expect(bookmark3.reload.reminder_at).not_to eq(nil)
+      end
+    end
+  end
+
+  context "when this is the 6th run (so every half hour) of this job we need to ensure consistency of at_desktop reminders" do
+    let(:set_at) { Time.zone.now }
+    let!(:bookmark) do
+      Fabricate(
+        :bookmark,
+        reminder_type: Bookmark.reminder_types[:at_desktop],
+        reminder_at: nil,
+        reminder_set_at: set_at
+      )
+    end
+    before do
+      Discourse.redis.set(Jobs::BookmarkReminderNotifications::JOB_RUN_NUMBER_KEY, 6)
+      bookmark.user.update(last_seen_at: Time.zone.now - 1.minute)
+    end
+    context "when an at_desktop reminder is not pending in redis for a user who should have one" do
+      it "puts the pending reminder into redis" do
+        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(false)
+        subject.execute
+        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(true)
+      end
+
+      context "if the user has not been seen in the past 24 hours" do
+        before do
+          bookmark.user.update(last_seen_at: Time.zone.now - 25.hours)
+        end
+        it "does not put the pending reminder into redis" do
+          subject.execute
+          expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(false)
+        end
+      end
+
+      context "if the at_desktop reminder is expired (set over PENDING_AT_DESKTOP_EXPIRY_DAYS days ago)" do
+        let(:set_at) { Time.zone.now - (BookmarkReminderNotificationHandler::PENDING_AT_DESKTOP_EXPIRY_DAYS + 1).days }
+        it "does not put the pending reminder into redis, and clears the reminder type/time" do
+          expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(false)
+          subject.execute
+          expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(false)
+          bookmark.reload
+          expect(bookmark.reminder_set_at).to eq(nil)
+          expect(bookmark.reminder_last_sent_at).to eq(nil)
+          expect(bookmark.reminder_type).to eq(nil)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
new file mode 100644
index 0000000000..92b7c2df21
--- /dev/null
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -0,0 +1,215 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe BookmarkManager do
+  let(:user) { Fabricate(:user) }
+
+  let(:reminder_type) { 'tomorrow' }
+  let(:reminder_at) { (Time.zone.now + 1.day).iso8601 }
+  fab!(:post) { Fabricate(:post) }
+  let(:name) { 'Check this out!' }
+
+  subject { described_class.new(user) }
+
+  describe ".create" do
+    it "creates the bookmark for the user" do
+      subject.create(post_id: post.id, name: name)
+      bookmark = Bookmark.find_by(user: user)
+
+      expect(bookmark.post_id).to eq(post.id)
+      expect(bookmark.topic_id).to eq(post.topic_id)
+    end
+
+    context "when a reminder time + type is provided" do
+      it "saves the values correctly" do
+        subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
+        bookmark = Bookmark.find_by(user: user)
+
+        expect(bookmark.reminder_at).to eq(reminder_at)
+        expect(bookmark.reminder_set_at).not_to eq(nil)
+        expect(bookmark.reminder_type).to eq(Bookmark.reminder_types[:tomorrow])
+      end
+    end
+
+    context "when the reminder type is at_desktop" do
+      let(:reminder_type) { 'at_desktop' }
+      let(:reminder_at) { nil }
+
+      def create_bookmark
+        subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
+      end
+
+      it "this is a special case which needs client-side logic and has no reminder_at datetime" do
+        create_bookmark
+        bookmark = Bookmark.find_by(user: user)
+
+        expect(bookmark.reminder_at).to eq(nil)
+        expect(bookmark.reminder_type).to eq(Bookmark.reminder_types[:at_desktop])
+      end
+
+      it "sets a redis key for the user so we know they have a pending at_desktop reminder" do
+        create_bookmark
+        expect(Discourse.redis.get("pending_at_desktop_bookmark_reminder_user_#{user.id}")).not_to eq(nil)
+      end
+    end
+
+    context "when the bookmark already exists for the user & post" do
+      before do
+        Bookmark.create(post: post, user: user, topic: post.topic)
+      end
+
+      it "adds an error to the manager" do
+        subject.create(post_id: post.id)
+        expect(subject.errors.full_messages).to include(I18n.t("bookmarks.errors.already_bookmarked_post"))
+      end
+    end
+
+    context "when the reminder time is not provided when it needs to be" do
+      let(:reminder_at) { nil }
+      it "adds an error to the manager" do
+        subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
+        expect(subject.errors.full_messages).to include(
+          "Reminder at " + I18n.t("bookmarks.errors.time_must_be_provided", reminder_type: I18n.t("bookmarks.reminders.at_desktop"))
+        )
+      end
+    end
+
+    context "when the reminder time is in the past" do
+      let(:reminder_at) { (Time.zone.now - 10.days).iso8601 }
+      it "adds an error to the manager" do
+        subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
+        expect(subject.errors.full_messages).to include(I18n.t("bookmarks.errors.cannot_set_past_reminder"))
+      end
+    end
+
+    context "when the reminder time is far-flung (> 10 years from now)" do
+      let(:reminder_at) { (Time.zone.now + 11.years).iso8601 }
+      it "adds an error to the manager" do
+        subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
+        expect(subject.errors.full_messages).to include(I18n.t("bookmarks.errors.cannot_set_reminder_in_distant_future"))
+      end
+    end
+  end
+
+  describe ".destroy" do
+    let!(:bookmark) { Fabricate(:bookmark, user: user, post: post) }
+    it "deletes the existing bookmark" do
+      subject.destroy(bookmark.id)
+      expect(Bookmark.exists?(id: bookmark.id)).to eq(false)
+    end
+
+    context "if the bookmark is belonging to some other user" do
+      let!(:bookmark) { Fabricate(:bookmark, user: Fabricate(:admin), post: post) }
+      it "raises an invalid access error" do
+        expect { subject.destroy(bookmark.id) }.to raise_error(Discourse::InvalidAccess)
+      end
+    end
+
+    context "if the bookmark no longer exists" do
+      it "raises an invalid access error" do
+        expect { subject.destroy(9999) }.to raise_error(Discourse::NotFound)
+      end
+    end
+
+    context "if the user has pending at desktop reminders for another bookmark" do
+      before do
+        Fabricate(:bookmark, user: user, post: Fabricate(:post), reminder_type: Bookmark.reminder_types[:at_desktop])
+        BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user)
+      end
+      it "does not clear the at bookmark redis key" do
+        subject.destroy(bookmark.id)
+        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(user)).to eq(true)
+      end
+    end
+
+    context "if the user has pending at desktop reminders for another bookmark" do
+      it "does clear the at bookmark redis key" do
+        BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user)
+        subject.destroy(bookmark.id)
+        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(user)).to eq(false)
+      end
+    end
+  end
+
+  describe ".destroy_for_topic" do
+    let!(:topic) { Fabricate(:topic) }
+    let(:bookmark1) { Fabricate(:bookmark, topic: topic, post: Fabricate(:post, topic: topic), user: user) }
+    let(:bookmark2) { Fabricate(:bookmark, topic: topic, post: Fabricate(:post, topic: topic), user: user) }
+
+    it "destroys all bookmarks for the topic for the specified user" do
+      subject.destroy_for_topic(topic)
+      expect(Bookmark.where(user: user, topic: topic).length).to eq(0)
+    end
+
+    it "does not destroy any other user's topic bookmarks" do
+      user2 = Fabricate(:user)
+      Fabricate(:bookmark, topic: topic, post: Fabricate(:post, topic: topic), user: user2)
+      subject.destroy_for_topic(topic)
+      expect(Bookmark.where(user: user2, topic: topic).length).to eq(1)
+    end
+
+    context "if the user has pending at desktop reminders for another bookmark" do
+      before do
+        Fabricate(:bookmark, user: user, post: Fabricate(:post), reminder_type: Bookmark.reminder_types[:at_desktop])
+        BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user)
+      end
+      it "does not clear the at bookmark redis key" do
+        subject.destroy_for_topic(topic)
+        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(user)).to eq(true)
+      end
+    end
+
+    context "if the user has pending at desktop reminders for another bookmark" do
+      it "does clear the at bookmark redis key" do
+        BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user)
+        subject.destroy_for_topic(topic)
+        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(user)).to eq(false)
+      end
+    end
+
+  end
+
+  describe ".send_reminder_notification" do
+    let(:bookmark) { Fabricate(:bookmark, user: user) }
+    it "clears the reminder_at and sets the reminder_last_sent_at" do
+      expect(bookmark.reminder_last_sent_at).to eq(nil)
+      described_class.send_reminder_notification(bookmark.id)
+      bookmark.reload
+      expect(bookmark.reminder_at).to eq(nil)
+      expect(bookmark.reminder_last_sent_at).not_to eq(nil)
+    end
+
+    it "creates a notification for the reminder" do
+      described_class.send_reminder_notification(bookmark.id)
+      notif = notifications_for_user.last
+      expect(notif.post_number).to eq(bookmark.post.post_number)
+    end
+
+    context "when the bookmark does no longer exist" do
+      before do
+        bookmark.destroy
+      end
+      it "does not error, and does not create a notification" do
+        described_class.send_reminder_notification(bookmark.id)
+        expect(notifications_for_user.any?).to eq(false)
+      end
+    end
+
+    context "if the post has been deleted" do
+      before do
+        bookmark.post.trash!
+      end
+      it "does not error, and does not create a notification, and clears the reminder" do
+        described_class.send_reminder_notification(bookmark.id)
+        bookmark.reload
+        expect(bookmark.reminder_at).to eq(nil)
+        expect(notifications_for_user.any?).to eq(false)
+      end
+    end
+
+    def notifications_for_user
+      Notification.where(notification_type: Notification.types[:bookmark_reminder], user_id: bookmark.user.id)
+    end
+  end
+end
diff --git a/spec/lib/bookmark_reminder_notification_handler_spec.rb b/spec/lib/bookmark_reminder_notification_handler_spec.rb
new file mode 100644
index 0000000000..e64c9b1c70
--- /dev/null
+++ b/spec/lib/bookmark_reminder_notification_handler_spec.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe BookmarkReminderNotificationHandler do
+  subject { described_class }
+
+  fab!(:user) { Fabricate(:user) }
+
+  before do
+    SiteSetting.enable_bookmarks_with_reminders = true
+  end
+
+  context "when the user agent is for mobile" do
+    let(:user_agent) { "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1" }
+    it "does not attempt to send any reminders" do
+      DistributedMutex.expects(:synchronize).never
+      send_reminder
+    end
+  end
+
+  context "when the user agent is for desktop" do
+    let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
+    fab!(:reminder) do
+      Fabricate(
+        :bookmark,
+        user: user,
+        reminder_type: Bookmark.reminder_types[:at_desktop],
+        reminder_at: nil,
+        reminder_set_at: Time.zone.now
+      )
+    end
+
+    context "when there are pending bookmark at desktop reminders" do
+      before do
+        described_class.cache_pending_at_desktop_reminder(user)
+      end
+
+      it "deletes the key in redis" do
+        send_reminder
+        expect(described_class.user_has_pending_at_desktop_reminders?(user)).to eq(false)
+      end
+
+      it "sends a notification to the user and clears the reminder_at" do
+        send_reminder
+        expect(Notification.where(user: user, notification_type: Notification.types[:bookmark_reminder]).count).to eq(1)
+        expect(reminder.reload.reminder_type).to eq(nil)
+        expect(reminder.reload.reminder_last_sent_at).not_to eq(nil)
+        expect(reminder.reload.reminder_set_at).to eq(nil)
+      end
+    end
+
+    context "when there are no pending bookmark at desktop reminders" do
+      it "does nothing" do
+        DistributedMutex.expects(:synchronize).never
+        send_reminder
+      end
+    end
+
+    context "when enable bookmarks with reminders is disabled" do
+      before do
+        SiteSetting.enable_bookmarks_with_reminders = false
+      end
+
+      it "does nothing" do
+        BrowserDetection.expects(:device).never
+        send_reminder
+      end
+    end
+  end
+
+  def send_reminder
+    subject.send_at_desktop_reminder(user: user, request_user_agent: user_agent)
+  end
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index ef6b64d511..d94d8d47c5 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2212,16 +2212,6 @@ describe User do
     end
   end
 
-  describe "Destroying a user with security key" do
-    let!(:security_key) { Fabricate(:user_security_key_with_random_credential, user: user) }
-    fab!(:admin) { Fabricate(:admin) }
-
-    it "removes the security key" do
-      UserDestroyer.new(admin).destroy(user)
-      expect(UserSecurityKey.where(user_id: user.id).count).to eq(0)
-    end
-  end
-
   describe 'Secure identifier for a user which is a string other than the ID used to identify the user in some cases e.g. security keys' do
     describe '#create_or_fetch_secure_identifier' do
       context 'if the user already has a secure identifier' do
diff --git a/spec/requests/bookmarks_controller_spec.rb b/spec/requests/bookmarks_controller_spec.rb
index cfe7f6c983..8c29af8707 100644
--- a/spec/requests/bookmarks_controller_spec.rb
+++ b/spec/requests/bookmarks_controller_spec.rb
@@ -17,14 +17,14 @@ describe BookmarksController do
         Fabricate(:bookmark, post: bookmark_post, user: bookmark_user)
       end
 
-      it "returns failed JSON with a 422 error" do
+      it "returns failed JSON with a 400 error" do
         post "/bookmarks.json", params: {
           post_id: bookmark_post.id,
           reminder_type: "tomorrow",
-          reminder_at: (Time.now.utc + 1.day).iso8601
+          reminder_at: (Time.zone.now + 1.day).iso8601
         }
 
-        expect(response.status).to eq(422)
+        expect(response.status).to eq(400)
         expect(JSON.parse(response.body)['errors']).to include(
           I18n.t("bookmarks.errors.already_bookmarked_post")
         )
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 481de344e4..42f002f481 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -2387,7 +2387,7 @@ RSpec.describe TopicsController do
         Bookmark.create(post: post, topic: post.topic, user: user)
 
         put "/t/#{post.topic_id}/bookmark.json"
-        expect(response).to be_forbidden
+        expect(response.status).to eq(400)
       end
     end
   end
diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb
index 02f5e506f7..a26da77d4e 100644
--- a/spec/services/user_destroyer_spec.rb
+++ b/spec/services/user_destroyer_spec.rb
@@ -332,6 +332,26 @@ describe UserDestroyer do
       end
     end
 
+    describe "Destroying a user with security key" do
+      let!(:security_key) { Fabricate(:user_security_key_with_random_credential, user: user) }
+      fab!(:admin) { Fabricate(:admin) }
+
+      it "removes the security key" do
+        UserDestroyer.new(admin).destroy(user)
+        expect(UserSecurityKey.where(user_id: user.id).count).to eq(0)
+      end
+    end
+
+    describe "Destroying a user with a bookmark" do
+      let!(:bookmark) { Fabricate(:bookmark, user: user) }
+      fab!(:admin) { Fabricate(:admin) }
+
+      it "removes the bookmark" do
+        UserDestroyer.new(admin).destroy(user)
+        expect(Bookmark.where(user_id: user.id).count).to eq(0)
+      end
+    end
+
     context 'user got an email' do
       let!(:email_log) { Fabricate(:email_log, user: user) }
 

From 849631188fe343b77868fa55152968c8de937b1b Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 12 Mar 2020 10:52:15 +1000
Subject: [PATCH 0183/1830] FEATURE: Allow custom date + time for bookmark
 reminders (#9185)

A custom date and time can now be selected for a bookmark reminder

The reminder will not happen at the exact time but rather at the next 5 minute interval of the bookmark reminder schedule.

This PR also fixes issues with bulk deleting topic bookmarks.
---
 .../discourse/controllers/bookmark.js.es6     | 50 +++++++++++++++----
 .../discourse/templates/modal/bookmark.hbs    | 14 +++++-
 app/controllers/posts_controller.rb           |  8 ++-
 config/locales/client.en.yml                  |  1 +
 lib/bookmark_manager.rb                       |  2 +-
 spec/lib/bookmark_manager_spec.rb             |  4 +-
 spec/requests/posts_controller_spec.rb        | 25 ++++++++++
 7 files changed, 88 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js.es6 b/app/assets/javascripts/discourse/controllers/bookmark.js.es6
index 27e3e8418b..109678a7b2 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js.es6
@@ -1,4 +1,5 @@
 import Controller from "@ember/controller";
+import { Promise } from "rsvp";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -25,6 +26,8 @@ export default Controller.extend(ModalFunctionality, {
   closeWithoutSaving: false,
   isSavingBookmarkManually: false,
   onCloseWithoutSaving: null,
+  customReminderDate: null,
+  customReminderTime: null,
 
   onShow() {
     this.setProperties({
@@ -32,7 +35,9 @@ export default Controller.extend(ModalFunctionality, {
       name: null,
       selectedReminderType: null,
       closeWithoutSaving: false,
-      isSavingBookmarkManually: false
+      isSavingBookmarkManually: false,
+      customReminderDate: null,
+      customReminderTime: null
     });
   },
 
@@ -40,7 +45,7 @@ export default Controller.extend(ModalFunctionality, {
   // clicks the save or cancel button to mimic browser behaviour
   onClose() {
     if (!this.closeWithoutSaving && !this.isSavingBookmarkManually) {
-      this.saveBookmark();
+      this.saveBookmark().catch(e => this.handleSaveError(e));
     }
     if (this.onCloseWithoutSaving && this.closeWithoutSaving) {
       this.onCloseWithoutSaving();
@@ -50,6 +55,11 @@ export default Controller.extend(ModalFunctionality, {
   usingMobileDevice: reads("site.mobileView"),
   showBookmarkReminderControls: true,
 
+  @discourseComputed("selectedReminderType")
+  customDateTimeSelected(selectedReminderType) {
+    return selectedReminderType === REMINDER_TYPES.CUSTOM;
+  },
+
   @discourseComputed()
   reminderTypes: () => {
     return REMINDER_TYPES;
@@ -113,6 +123,11 @@ export default Controller.extend(ModalFunctionality, {
   saveBookmark() {
     const reminderAt = this.reminderAt();
     const reminderAtISO = reminderAt ? reminderAt.toISOString() : null;
+
+    if (!reminderAt) {
+      return Promise.reject(I18n.t("bookmarks.invalid_custom_datetime"));
+    }
+
     const data = {
       reminder_type: this.selectedReminderType,
       reminder_at: reminderAtISO,
@@ -134,8 +149,7 @@ export default Controller.extend(ModalFunctionality, {
 
     switch (this.selectedReminderType) {
       case REMINDER_TYPES.AT_DESKTOP:
-        // TODO: Implement at desktop bookmark reminder functionality
-        return "";
+        return null;
       case REMINDER_TYPES.LATER_TODAY:
         return this.laterToday();
       case REMINDER_TYPES.NEXT_BUSINESS_DAY:
@@ -147,8 +161,18 @@ export default Controller.extend(ModalFunctionality, {
       case REMINDER_TYPES.NEXT_MONTH:
         return this.nextMonth();
       case REMINDER_TYPES.CUSTOM:
-        // TODO: Implement custom bookmark reminder times
-        return "";
+        const customDateTime = moment.tz(
+          this.customReminderDate + " " + this.customReminderTime,
+          this.userTimezone()
+        );
+        if (!customDateTime.isValid()) {
+          this.setProperties({
+            customReminderTime: null,
+            customReminderDate: null
+          });
+          return;
+        }
+        return customDateTime;
     }
   },
 
@@ -200,15 +224,21 @@ export default Controller.extend(ModalFunctionality, {
       : later.add(30, "minutes").startOf("hour");
   },
 
+  handleSaveError(e) {
+    this.isSavingBookmarkManually = false;
+    if (typeof e === "string") {
+      bootbox.alert(e);
+    } else {
+      popupAjaxError(e);
+    }
+  },
+
   actions: {
     saveAndClose() {
       this.isSavingBookmarkManually = true;
       this.saveBookmark()
         .then(() => this.send("closeModal"))
-        .catch(e => {
-          this.isSavingBookmarkManually = false;
-          popupAjaxError(e);
-        });
+        .catch(e => this.handleSaveError(e));
     },
 
     closeWithoutSavingBookmark() {
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index e32f2467eb..4fb9e462f9 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -35,8 +35,20 @@
           {{tap-tile icon="far-sun" text=tomorrowFormatted tileId=reminderTypes.TOMORROW activeTile=grid.activeTile onChange=(action "selectReminderType")}}
           {{tap-tile icon="far-clock" text=nextWeekFormatted tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
           {{tap-tile icon="far-calendar-plus" text=nextMonthFormatted tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-          <!-- {{tap-tile icon="calendar-alt" text=(I18n "bookmarks.reminders.custom") tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}} -->
+          {{tap-tile icon="calendar-alt" text=(I18n "bookmarks.reminders.custom") tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
         {{/tap-tile-grid}}
+        {{#if customDateTimeSelected}}
+          <div class="control-group">
+            {{d-icon "calendar-alt"}}
+            {{date-picker-future
+              value=customReminderDate
+              onSelect=(action (mut customReminderDate))
+            }}
+            {{d-icon "far-clock"}}
+            {{input placeholder="--:--" type="time" value=customReminderTime}}
+          </div>
+        {{/if}}
+
       {{else}}
         <div class="alert alert-info">{{i18n "bookmarks.no_timezone" basePath=basePath }}</div>
       {{/if}}
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 5da0ded422..5d62c6510f 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -512,9 +512,13 @@ class PostsController < ApplicationController
     params.require(:post_id)
 
     existing_bookmark = Bookmark.find_by(post_id: params[:post_id], user_id: current_user.id)
-    existing_bookmark.destroy if existing_bookmark.present?
+    topic_bookmarked = false
+
+    if existing_bookmark.present?
+      topic_bookmarked = Bookmark.exists?(topic_id: existing_bookmark.topic_id, user_id: current_user.id)
+      existing_bookmark.destroy
+    end
 
-    topic_bookmarked = Bookmark.exists?(topic_id: existing_bookmark.topic_id, user_id: current_user.id)
     render json: success_json.merge(topic_bookmarked: topic_bookmarked)
   end
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c699eef32f..d8ff29639d 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -311,6 +311,7 @@ en:
       confirm_clear: "Are you sure you want to clear all your bookmarks from this topic?"
       save: "Save"
       no_timezone: 'You have not set a timezone yet. You will not be able to set reminders. Set one up <a href="%{basePath}/my/preferences/profile">in your profile</a>.'
+      invalid_custom_datetime: "The date and time you provided is invalid, please try again."
       reminders:
         at_desktop: "Next time I'm at my desktop"
         later_today: "Later today <br/>{{date}}"
diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index 0dcfa2b79f..f4831e1350 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -43,7 +43,7 @@ class BookmarkManager
 
     Bookmark.transaction do
       topic_bookmarks.each do |bookmark|
-        raise Discourse::InvalidAccess.new if !Guardian.new(user).can_delete?(bookmark)
+        raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_delete?(bookmark)
         bookmark.destroy
       end
     end
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index 92b7c2df21..dbfecd565d 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -134,8 +134,8 @@ RSpec.describe BookmarkManager do
 
   describe ".destroy_for_topic" do
     let!(:topic) { Fabricate(:topic) }
-    let(:bookmark1) { Fabricate(:bookmark, topic: topic, post: Fabricate(:post, topic: topic), user: user) }
-    let(:bookmark2) { Fabricate(:bookmark, topic: topic, post: Fabricate(:post, topic: topic), user: user) }
+    let!(:bookmark1) { Fabricate(:bookmark, topic: topic, post: Fabricate(:post, topic: topic), user: user) }
+    let!(:bookmark2) { Fabricate(:bookmark, topic: topic, post: Fabricate(:post, topic: topic), user: user) }
 
     it "destroys all bookmarks for the topic for the specified user" do
       subject.destroy_for_topic(topic)
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index dd3afa7cf0..b90b7cd3e3 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -457,6 +457,31 @@ describe PostsController do
     end
   end
 
+  describe "#destroy_bookmark" do
+    fab!(:post) { Fabricate(:post) }
+    fab!(:bookmark) { Fabricate(:bookmark, user: user, post: post, topic: post.topic) }
+
+    before do
+      sign_in(user)
+    end
+
+    it "deletes the bookmark" do
+      bookmark_id = bookmark.id
+      delete "/posts/#{post.id}/bookmark.json"
+      expect(Bookmark.find_by(id: bookmark_id)).to eq(nil)
+    end
+
+    context "when the user still has bookmarks in the topic" do
+      before do
+        Fabricate(:bookmark, user: user, post: Fabricate(:post, topic: post.topic), topic: topic)
+      end
+      it "marks topic_bookmaked as true" do
+        delete "/posts/#{post.id}/bookmark.json"
+        expect(JSON.parse(response.body)['topic_bookmarked']).to eq(true)
+      end
+    end
+  end
+
   describe '#bookmark' do
     include_examples 'action requires login', :put, "/posts/2/bookmark.json"
     let!(:post) { post_by_user }

From e1eb5fb9b3d487c1b24e95eed38cb917a8887245 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 12 Mar 2020 15:20:56 +1000
Subject: [PATCH 0184/1830] FEATURE: MVP Bookmarks with reminders user list
 changes (#8999)

* This PR changes the user activity bookmarks stream to show a new list of bookmarks based on the Bookmark record.
* If a bookmark has a name or reminder it will be shown as metadata above the topic title in the list
* The categories, tags, topic status, and assigned show for each bookmarked post based on the post topic
* Bookmarks can be deleted from the [...] menu in the list
* As well as this, the list of bookmarks from the quick access panel is now drawn from the Bookmarks table for a user:
* All of this new functionality is gated behind the enable_bookmarks_with_reminders site setting
The /bookmarks/ route now redirects directly to /user/:username/activity/bookmarks-with-reminders
* The structure of the Ember for the list of bookmarks is not ideal, this is an MVP PR so we can start testing this functionality internally. There is a little repeated code from topic.js.es6. There is an ongoing effort to start standardizing these lists that will be addressed in future PRs.
* This PR also fixes issues with feature detection for at_desktop bookmark reminders
---
 .../bookmark-actions-dropdown.js.es6          |  33 ++++++
 .../discourse/controllers/bookmark.js.es6     |   2 +-
 ...r-activity-bookmarks-with-reminders.js.es6 |  54 +++++++++
 .../controllers/user-activity.js.es6          |   2 +
 .../discourse/models/bookmark.js.es6          | 109 ++++++++++++++++++
 .../javascripts/discourse/models/topic.js.es6 |   9 +-
 .../javascripts/discourse/models/user.js.es6  |   6 +
 .../discourse/routes/app-route-map.js.es6     |   3 +
 .../discourse/routes/discovery.js.es6         |  19 ++-
 ...r-activity-bookmarks-with-reminders.js.es6 |  29 +++++
 .../discourse/templates/user/activity.hbs     |  12 +-
 .../discourse/templates/user/bookmarks.hbs    |  51 ++++++++
 .../discourse/widgets/post-menu.js.es6        |   2 +
 .../widgets/quick-access-bookmarks.js.es6     |  59 ++++++++--
 .../stylesheets/common/base/_topic-list.scss  |   8 ++
 .../stylesheets/common/base/tagging.scss      |  10 +-
 .../common/components/bookmark-list-item.scss |  19 +++
 app/controllers/users_controller.rb           |  19 ++-
 app/serializers/topic_view_serializer.rb      |   6 +-
 app/serializers/user_bookmark_serializer.rb   |  91 +++++++++++++++
 config/locales/client.en.yml                  |   4 +
 config/routes.rb                              |   1 +
 lib/bookmark_query.rb                         |  32 +++++
 lib/bookmark_reminder_notification_handler.rb |   2 +-
 lib/topic_view.rb                             |   5 +
 ...mark_reminder_notification_handler_spec.rb |  71 ++++++------
 26 files changed, 597 insertions(+), 61 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js.es6
 create mode 100644 app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js.es6
 create mode 100644 app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js.es6
 create mode 100644 app/assets/javascripts/discourse/templates/user/bookmarks.hbs
 create mode 100644 app/assets/stylesheets/common/components/bookmark-list-item.scss
 create mode 100644 app/serializers/user_bookmark_serializer.rb
 create mode 100644 lib/bookmark_query.rb

diff --git a/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js.es6 b/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js.es6
new file mode 100644
index 0000000000..6e72fafc44
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js.es6
@@ -0,0 +1,33 @@
+import { computed } from "@ember/object";
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import { action } from "@ember/object";
+
+export default DropdownSelectBoxComponent.extend({
+  classNames: ["bookmark-actions-dropdown"],
+  pluginApiIdentifiers: ["bookmark-actions-dropdown"],
+  selectKitOptions: {
+    icon: null,
+    translatedNone: "...",
+    showFullTitle: true
+  },
+
+  content: computed(() => {
+    return [
+      {
+        id: "remove",
+        icon: "trash-alt",
+        name: I18n.t("post.bookmarks.actions.delete_bookmark.name"),
+        description: I18n.t(
+          "post.bookmarks.actions.delete_bookmark.description"
+        )
+      }
+    ];
+  }),
+
+  @action
+  onChange(selectedAction) {
+    if (selectedAction === "remove") {
+      this.removeBookmark(this.bookmark);
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js.es6 b/app/assets/javascripts/discourse/controllers/bookmark.js.es6
index 109678a7b2..b4b74ec57e 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js.es6
@@ -124,7 +124,7 @@ export default Controller.extend(ModalFunctionality, {
     const reminderAt = this.reminderAt();
     const reminderAtISO = reminderAt ? reminderAt.toISOString() : null;
 
-    if (!reminderAt) {
+    if (!reminderAt && this.selectedReminderType === REMINDER_TYPES.CUSTOM) {
       return Promise.reject(I18n.t("bookmarks.invalid_custom_datetime"));
     }
 
diff --git a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js.es6
new file mode 100644
index 0000000000..49982b1244
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js.es6
@@ -0,0 +1,54 @@
+import Controller from "@ember/controller";
+import { inject } from "@ember/controller";
+import discourseComputed from "discourse-common/utils/decorators";
+import Bookmark from "discourse/models/bookmark";
+
+export default Controller.extend({
+  application: inject(),
+  user: inject(),
+
+  content: null,
+  loading: false,
+  noResultsHelp: null,
+
+  loadItems() {
+    this.setProperties({
+      content: [],
+      loading: true,
+      noResultsHelp: null
+    });
+
+    return this.model
+      .loadItems()
+      .then(response => {
+        if (response && response.no_results_help) {
+          this.set("noResultsHelp", response.no_results_help);
+        }
+
+        if (response && response.bookmarks) {
+          let bookmarks = [];
+          response.bookmarks.forEach(bookmark => {
+            bookmarks.push(Bookmark.create(bookmark));
+          });
+          this.content.pushObjects(bookmarks);
+        }
+      })
+      .finally(() =>
+        this.setProperties({
+          loaded: true,
+          loading: false
+        })
+      );
+  },
+
+  @discourseComputed("loaded", "content.length")
+  noContent(loaded, content) {
+    return loaded && content.length === 0;
+  },
+
+  actions: {
+    removeBookmark(bookmark) {
+      return bookmark.destroy().then(() => this.loadItems());
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
index 12333fcf07..03828c439b 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -3,6 +3,7 @@ import { inject as service } from "@ember/service";
 import Controller, { inject as controller } from "@ember/controller";
 import { exportUserArchive } from "discourse/lib/export-csv";
 import { observes } from "discourse-common/utils/decorators";
+import { setting } from "discourse/lib/computed";
 
 export default Controller.extend({
   application: controller(),
@@ -11,6 +12,7 @@ export default Controller.extend({
   userActionType: null,
 
   canDownloadPosts: alias("user.viewingSelf"),
+  bookmarksWithRemindersEnabled: setting("enable_bookmarks_with_reminders"),
 
   @observes("userActionType", "model.stream.itemsLoaded")
   _showFooter: function() {
diff --git a/app/assets/javascripts/discourse/models/bookmark.js.es6 b/app/assets/javascripts/discourse/models/bookmark.js.es6
index 2ae4e63e4c..0473c10811 100644
--- a/app/assets/javascripts/discourse/models/bookmark.js.es6
+++ b/app/assets/javascripts/discourse/models/bookmark.js.es6
@@ -1,8 +1,16 @@
+import Category from "discourse/models/category";
+import { isRTL } from "discourse/lib/text-direction";
+import { censor } from "pretty-text/censored-words";
+import { emojiUnescape } from "discourse/lib/text";
+import Site from "discourse/models/site";
+import { longDate } from "discourse/lib/formatter";
+import PreloadStore from "preload-store";
 import { none } from "@ember/object/computed";
 import { computed } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
+import discourseComputed from "discourse-common/utils/decorators";
 
 const Bookmark = RestModel.extend({
   newBookmark: none("id"),
@@ -18,6 +26,107 @@ const Bookmark = RestModel.extend({
     return ajax(this.url, {
       type: "DELETE"
     });
+  },
+
+  @discourseComputed("highest_post_number", "url")
+  lastPostUrl(highestPostNumber) {
+    return this.urlForPostNumber(highestPostNumber);
+  },
+
+  // Helper to build a Url with a post number
+  urlForPostNumber(postNumber) {
+    let url = Discourse.getURL(`/t/${this.topic_id}`);
+    if (postNumber > 0) {
+      url += `/${postNumber}`;
+    }
+    return url;
+  },
+
+  // returns createdAt if there's no bumped date
+  @discourseComputed("bumped_at", "createdAt")
+  bumpedAt(bumped_at, createdAt) {
+    if (bumped_at) {
+      return new Date(bumped_at);
+    } else {
+      return createdAt;
+    }
+  },
+
+  @discourseComputed("bumpedAt", "createdAt")
+  bumpedAtTitle(bumpedAt, createdAt) {
+    const firstPost = I18n.t("first_post");
+    const lastPost = I18n.t("last_post");
+    const createdAtDate = longDate(createdAt);
+    const bumpedAtDate = longDate(bumpedAt);
+
+    return I18n.messageFormat("topic.bumped_at_title_MF", {
+      FIRST_POST: firstPost,
+      CREATED_AT: createdAtDate,
+      LAST_POST: lastPost,
+      BUMPED_AT: bumpedAtDate
+    });
+  },
+
+  @discourseComputed("title")
+  fancyTitle(title) {
+    let fancyTitle = censor(
+      emojiUnescape(title) || "",
+      Site.currentProp("censored_regexp")
+    );
+
+    if (this.siteSettings.support_mixed_text_direction) {
+      const titleDir = isRTL(title) ? "rtl" : "ltr";
+      return `<span dir="${titleDir}">${fancyTitle}</span>`;
+    }
+    return fancyTitle;
+  },
+
+  @discourseComputed("created_at")
+  createdAt(created_at) {
+    return new Date(created_at);
+  },
+
+  @discourseComputed("tags")
+  visibleListTags(tags) {
+    if (!tags || !this.siteSettings.suppress_overlapping_tags_in_list) {
+      return tags;
+    }
+
+    const title = this.title;
+    const newTags = [];
+
+    tags.forEach(function(tag) {
+      if (title.toLowerCase().indexOf(tag) === -1) {
+        newTags.push(tag);
+      }
+    });
+
+    return newTags;
+  },
+
+  @discourseComputed("category_id")
+  category(categoryId) {
+    return Category.findById(categoryId);
+  },
+
+  @discourseComputed("reminder_at")
+  formattedReminder(bookmarkReminderAt) {
+    const currentUser = PreloadStore.get("currentUser");
+    return moment
+      .tz(bookmarkReminderAt, currentUser.timezone || moment.tz.guess())
+      .format(I18n.t("dates.long_with_year"));
+  },
+
+  loadItems() {
+    return ajax(`/u/${this.user.username}/bookmarks.json`, { cache: "false" });
+  }
+});
+
+Bookmark.reopenClass({
+  create(args) {
+    args = args || {};
+    args.siteSettings = args.siteSettings || Discourse.SiteSettings;
+    return this._super(args);
   }
 });
 
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index fa97e11ea7..a3c9ee26c6 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -136,7 +136,12 @@ const Topic = RestModel.extend({
     const createdAtDate = longDate(createdAt);
     const bumpedAtDate = longDate(bumpedAt);
 
-    return `${firstPost}: ${createdAtDate}\n${lastPost}: ${bumpedAtDate}`;
+    return I18n.messageFormat("topic.bumped_at_title_MF", {
+      FIRST_POST: firstPost,
+      CREATED_AT: createdAtDate,
+      LAST_POST: lastPost,
+      BUMPED_AT: bumpedAtDate
+    });
   },
 
   @discourseComputed("created_at")
@@ -259,7 +264,7 @@ const Topic = RestModel.extend({
   // Helper to build a Url with a post number
   urlForPostNumber(postNumber) {
     let url = this.url;
-    if (postNumber && postNumber > 0) {
+    if (postNumber > 0) {
       url += `/${postNumber}`;
     }
     return url;
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 7af461aa30..026b27926a 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -5,6 +5,7 @@ import EmberObject, { computed, getProperties } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { url } from "discourse/lib/computed";
 import RestModel from "discourse/models/rest";
+import Bookmark from "discourse/models/bookmark";
 import UserStream from "discourse/models/user-stream";
 import UserPostsStream from "discourse/models/user-posts-stream";
 import Singleton from "discourse/mixins/singleton";
@@ -52,6 +53,11 @@ const User = RestModel.extend({
     return UserStream.create({ user: this });
   },
 
+  @discourseComputed()
+  bookmarks() {
+    return Bookmark.create({ user: this });
+  },
+
   @discourseComputed()
   postsStream() {
     return UserPostsStream.create({ user: this });
diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
index 16720a568e..fb13822bb2 100644
--- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6
+++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
@@ -122,6 +122,9 @@ export default function() {
           this.route("replies");
           this.route("likesGiven", { path: "likes-given" });
           this.route("bookmarks");
+          this.route("bookmarksWithReminders", {
+            path: "bookmarks-with-reminders"
+          });
           this.route("pending");
           this.route("drafts");
         }
diff --git a/app/assets/javascripts/discourse/routes/discovery.js.es6 b/app/assets/javascripts/discourse/routes/discovery.js.es6
index d812950666..1dd2985c46 100644
--- a/app/assets/javascripts/discourse/routes/discovery.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery.js.es6
@@ -13,16 +13,27 @@ export default DiscourseRoute.extend(OpenComposer, {
   },
 
   beforeModel(transition) {
-    const user = User;
+    // the new bookmark list is radically different to this topic-based one,
+    // including being able to show links to multiple posts to the same topic
+    // and being based on a different model. better to just redirect
     const url = transition.intent.url;
+    if (
+      this.siteSettings.enable_bookmarks_with_reminders &&
+      url === "/bookmarks"
+    ) {
+      this.transitionTo(
+        "userActivity.bookmarksWithReminders",
+        this.currentUser
+      );
+    }
 
     if (
       (url === "/" || url === "/latest" || url === "/categories") &&
       transition.targetName.indexOf("discovery.top") === -1 &&
-      user.currentProp("should_be_redirected_to_top")
+      User.currentProp("should_be_redirected_to_top")
     ) {
-      user.currentProp("should_be_redirected_to_top", false);
-      const period = user.currentProp("redirected_to_top.period") || "all";
+      User.currentProp("should_be_redirected_to_top", false);
+      const period = User.currentProp("redirected_to_top.period") || "all";
       this.replaceWith(`discovery.top${period.capitalize()}`);
     }
   },
diff --git a/app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js.es6
new file mode 100644
index 0000000000..fc8bd07826
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js.es6
@@ -0,0 +1,29 @@
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
+  noContentHelpKey: "user_activity.no_bookmarks",
+
+  queryParams: {
+    acting_username: { refreshModel: true }
+  },
+
+  model() {
+    return this.modelFor("user").get("bookmarks");
+  },
+
+  renderTemplate() {
+    this.render("user_bookmarks");
+  },
+
+  setupController(controller, model) {
+    controller.set("model", model);
+    controller.loadItems();
+  },
+
+  actions: {
+    didTransition() {
+      this.controllerFor("user-activity")._showFooter();
+      return true;
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs
index 6c39cc4618..2623e57c05 100644
--- a/app/assets/javascripts/discourse/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/user/activity.hbs
@@ -18,9 +18,15 @@
       {{#link-to 'userActivity.likesGiven'}}{{i18n 'user_action_groups.1'}}{{/link-to}}
     </li>
     {{#if user.showBookmarks}}
-    <li>
-      {{#link-to 'userActivity.bookmarks'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
-    </li>
+      {{#if bookmarksWithRemindersEnabled}}
+      <li>
+        {{#link-to 'userActivity.bookmarksWithReminders'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
+      </li>
+      {{else}}
+      <li>
+        {{#link-to 'userActivity.bookmarks'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
+      </li>
+      {{/if}}
     {{/if}}
     {{plugin-outlet name="user-activity-bottom"
                     connectorTagName='li'
diff --git a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
new file mode 100644
index 0000000000..228490bfa4
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
@@ -0,0 +1,51 @@
+{{#if noContent}}
+  <div class='alert alert-info'>{{noResultsHelp}}</div>
+{{else}}
+  {{#conditional-loading-spinner condition=loading}}
+  <table class="topic-list">
+    <thead>
+      <th>{{i18n "topic.title"}}</th>
+      <th>{{i18n "post.bookmarks.created"}}</th>
+      <th>{{i18n "activity"}}</th>
+      <th>&nbsp;</th>
+    </thead>
+    <tbody>
+    {{#each content as |bookmark|}}
+      <tr class="topic-list-item bookmark-list-item">
+        <td class="main-link">
+          <span class="link-top-line">
+            <div class="bookmark-metadata">
+              {{#if bookmark.name}}
+                <span class="bookmark-metadata-item">
+                  {{d-icon "info-circle"}}{{bookmark.name}}
+                </span>
+              {{/if}}
+              {{#if bookmark.reminder_at}}
+                <span class="bookmark-metadata-item">
+                  {{d-icon "far-clock"}}{{bookmark.formattedReminder}}
+                </span>
+              {{/if}}
+            </div>
+
+            {{topic-status topic=bookmark}}
+            {{topic-link bookmark}}
+          </span>
+          {{#if bookmark.excerpt}}
+          <p class="post-excerpt">{{html-safe bookmark.excerpt}}</p>
+          {{/if}}
+          <div class="link-bottom-line">
+            {{category-link bookmark.category}}
+            {{discourse-tags bookmark mode="list" tagsForUser=tagsForUser}}
+         </div>
+        </td>
+        <td>{{format-date bookmark.created_at format="tiny"}}</td>
+        {{raw "list/activity-column" topic=bookmark class="num" tagName="td"}}
+        <td>
+          {{bookmark-actions-dropdown bookmark=bookmark removeBookmark=(action "removeBookmark")}}
+        </td>
+      </tr>
+    {{/each}}
+    </tbody>
+  </table>
+  {{/conditional-loading-spinner}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index 6ae6460fac..95c3477ffd 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -321,6 +321,8 @@ registerButton("bookmarkWithReminder", (attrs, state, siteSettings) => {
       titleOptions = {
         date: reminderAtDate.format(I18n.t("dates.long_with_year"))
       };
+    } else if (attrs.bookmarkReminderType === "at_desktop") {
+      title = "bookmarks.created_with_at_desktop_reminder";
     } else {
       title = "bookmarks.created";
     }
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js.es6
index ca1642b897..b63c2b527b 100644
--- a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js.es6
+++ b/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js.es6
@@ -16,7 +16,11 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
   },
 
   showAllHref() {
-    return `${this.attrs.path}/activity/bookmarks`;
+    if (this.siteSettings.enable_bookmarks_with_reminders) {
+      return `${this.attrs.path}/activity/bookmarks-with-reminders`;
+    } else {
+      return `${this.attrs.path}/activity/bookmarks`;
+    }
   },
 
   emptyStatePlaceholderItem() {
@@ -24,6 +28,50 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
   },
 
   findNewItems() {
+    if (this.siteSettings.enable_bookmarks_with_reminders) {
+      return this.loadBookmarksWithReminders();
+    } else {
+      return this.loadUserActivityBookmarks();
+    }
+  },
+
+  itemHtml(bookmark) {
+    return this.attach("quick-access-item", {
+      icon: this.icon(bookmark),
+      href: postUrl(
+        bookmark.slug,
+        bookmark.topic_id,
+        bookmark.post_number || bookmark.linked_post_number
+      ),
+      content: bookmark.title,
+      username: bookmark.username
+    });
+  },
+
+  icon(bookmark) {
+    if (bookmark.reminder_at) {
+      return "discourse-bookmark-clock";
+    }
+    return ICON;
+  },
+
+  loadBookmarksWithReminders() {
+    return ajax(`/u/${this.currentUser.username}/bookmarks.json`, {
+      cache: "false",
+      data: {
+        limit: this.estimateItemLimit()
+      }
+    }).then(result => {
+      // The empty state help text for bookmarks page is localized on the
+      // server.
+      if (result.no_results_help) {
+        this.state.emptyStatePlaceholderItemText = result.no_results_help;
+      }
+      return result.bookmarks;
+    });
+  },
+
+  loadUserActivityBookmarks() {
     return ajax("/user_actions.json", {
       cache: "false",
       data: {
@@ -38,14 +86,5 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
       this.state.emptyStatePlaceholderItemText = no_results_help;
       return user_actions;
     });
-  },
-
-  itemHtml(bookmark) {
-    return this.attach("quick-access-item", {
-      icon: ICON,
-      href: postUrl(bookmark.slug, bookmark.topic_id, bookmark.post_number),
-      content: bookmark.title,
-      username: bookmark.username
-    });
   }
 });
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index bd4f95a01e..2ac61a4487 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -54,6 +54,14 @@
   }
 }
 
+.topic-list-item {
+  .post-excerpt {
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+    font-size: $font-down-2;
+  }
+}
+
 .topic-list-main-link {
   font-size: $font-up-1;
   a.title {
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index adb1631a9b..e2fd9158a8 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -153,10 +153,12 @@ $tag-color: $primary-medium;
   display: inline-block;
 }
 
-.topic-list-item .discourse-tags {
-  display: inline-flex;
-  font-weight: normal;
-  font-size: $font-down-1;
+.topic-list-item {
+  .discourse-tags {
+    display: inline-flex;
+    font-weight: normal;
+    font-size: $font-down-1;
+  }
 }
 
 .categories-list .topic-list-latest .discourse-tags {
diff --git a/app/assets/stylesheets/common/components/bookmark-list-item.scss b/app/assets/stylesheets/common/components/bookmark-list-item.scss
new file mode 100644
index 0000000000..7de562d1d3
--- /dev/null
+++ b/app/assets/stylesheets/common/components/bookmark-list-item.scss
@@ -0,0 +1,19 @@
+.bookmark-list-item {
+  .bookmark-metadata {
+    font-size: $font-down-2;
+    white-space: nowrap;
+    display: flex;
+    align-items: center;
+    margin-bottom: 0.2em;
+
+    &-item {
+      margin-right: 0.5em;
+      display: flex;
+      align-items: center;
+    }
+
+    .d-icon {
+      margin-right: 0.2em;
+    }
+  }
+}
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9405620286..837f19b828 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -10,14 +10,15 @@ class UsersController < ApplicationController
     :enable_second_factor_totp, :disable_second_factor, :list_second_factors,
     :update_second_factor, :create_second_factor_backup, :select_avatar,
     :notification_level, :revoke_auth_token, :register_second_factor_security_key,
-    :create_second_factor_security_key, :feature_topic, :clear_featured_topic
+    :create_second_factor_security_key, :feature_topic, :clear_featured_topic,
+    :bookmarks
   ]
 
   skip_before_action :check_xhr, only: [
     :show, :badges, :password_reset_show, :password_reset_update, :update, :account_created,
     :activate_account, :perform_account_activation, :user_preferences_redirect, :avatar,
     :my_redirect, :toggle_anon, :admin_login, :confirm_admin, :email_login, :summary,
-    :feature_topic, :clear_featured_topic
+    :feature_topic, :clear_featured_topic, :bookmarks
   ]
 
   before_action :second_factor_check_confirmed_password, only: [
@@ -1378,6 +1379,20 @@ class UsersController < ApplicationController
     render json: success_json
   end
 
+  def bookmarks
+    user = fetch_user_from_params
+    bookmarks = BookmarkQuery.new(user, params).list_all
+
+    if bookmarks.empty?
+      render json: {
+        bookmarks: [],
+        no_results_help: I18n.t("user_activity.no_bookmarks.self")
+      }
+    else
+      render_serialized(bookmarks, UserBookmarkSerializer, root: 'bookmarks')
+    end
+  end
+
   HONEYPOT_KEY ||= 'HONEYPOT_KEY'
   CHALLENGE_KEY ||= 'CHALLENGE_KEY'
 
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 780a004d6d..a0f37d3d70 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -182,7 +182,11 @@ class TopicViewSerializer < ApplicationSerializer
   end
 
   def bookmarked
-    object.topic_user&.bookmarked
+    if SiteSetting.enable_bookmarks_with_reminders?
+      object.has_bookmarks?
+    else
+      object.topic_user&.bookmarked
+    end
   end
 
   def topic_timer
diff --git a/app/serializers/user_bookmark_serializer.rb b/app/serializers/user_bookmark_serializer.rb
new file mode 100644
index 0000000000..adef053d30
--- /dev/null
+++ b/app/serializers/user_bookmark_serializer.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require_relative 'post_item_excerpt'
+
+class UserBookmarkSerializer < ApplicationSerializer
+  include PostItemExcerpt
+  include TopicTagsMixin
+
+  attributes :id,
+             :created_at,
+             :topic_id,
+             :linked_post_number,
+             :post_id,
+             :name,
+             :reminder_at,
+             :title,
+             :deleted,
+             :hidden,
+             :category_id,
+             :closed,
+             :archived,
+             :archetype,
+             :highest_post_number,
+             :bumped_at,
+             :slug,
+             :username
+
+  def closed
+    object.topic_closed
+  end
+
+  def archived
+    object.topic_archived
+  end
+
+  def linked_post_number
+    object.post.post_number
+  end
+
+  def title
+    object.topic.title
+  end
+
+  def deleted
+    object.topic.deleted_at.present? || object.post.deleted_at.present?
+  end
+
+  def hidden
+    object.post.hidden
+  end
+
+  def category_id
+    object.topic.category_id
+  end
+
+  def archetype
+    object.topic.archetype
+  end
+
+  def archived
+    object.topic.archived
+  end
+
+  def closed
+    object.topic.closed
+  end
+
+  def highest_post_number
+    object.topic.highest_post_number
+  end
+
+  def bumped_at
+    object.topic.bumped_at
+  end
+
+  def raw
+    object.post.raw
+  end
+
+  def cooked
+    object.post.cooked
+  end
+
+  def slug
+    object.topic.slug
+  end
+
+  def username
+    object.post.user.username
+  end
+end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index d8ff29639d..4d61f5a28a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -307,6 +307,7 @@ en:
       created: "you've bookmarked this post"
       not_bookmarked: "bookmark this post"
       created_with_reminder: "you've bookmarked this post with a reminder at %{date}"
+      created_with_at_desktop_reminder: "you've bookmarked this post and will be reminded next time you are at your desktop"
       remove: "Remove Bookmark"
       confirm_clear: "Are you sure you want to clear all your bookmarks from this topic?"
       save: "Save"
@@ -2116,6 +2117,8 @@ en:
         other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># new</a> topics}
         } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
 
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
+
       browse_all_categories: Browse all categories
 
       view_latest_topics: view latest topics
@@ -2667,6 +2670,7 @@ en:
 
       bookmarks:
         create: "Create bookmark"
+        created: "Created"
         name: "Name"
         name_placeholder: "Name the bookmark to help jog your memory"
         set_reminder: "Set a reminder"
diff --git a/config/routes.rb b/config/routes.rb
index 38047b91eb..7f7a457af3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -469,6 +469,7 @@ Discourse::Application.routes.draw do
     get "#{root_path}/:username/activity" => "users#show", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/activity/:filter" => "users#show", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/badges" => "users#badges", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/bookmarks" => "users#bookmarks", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/notifications" => "users#show", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/notifications/:filter" => "users#show", constraints: { username: RouteFormat.username }
     delete "#{root_path}/:username" => "users#destroy", constraints: { username: RouteFormat.username }
diff --git a/lib/bookmark_query.rb b/lib/bookmark_query.rb
new file mode 100644
index 0000000000..ab18ea9edb
--- /dev/null
+++ b/lib/bookmark_query.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+##
+# Allows us to query Bookmark records for lists. Used mainly
+# in the user/activity/bookmarks page.
+
+class BookmarkQuery
+  def initialize(user, params)
+    @user = user
+    @params = params
+  end
+
+  def list_all
+    results = user_bookmarks
+      .joins('INNER JOIN topics ON topics.id = bookmarks.topic_id')
+      .joins('INNER JOIN posts ON posts.id = bookmarks.post_id')
+      .joins('INNER JOIN users ON users.id = posts.user_id')
+      .order('created_at DESC')
+
+    if @params[:limit]
+      results = results.limit(@params[:limit])
+    end
+
+    results
+  end
+
+  private
+
+  def user_bookmarks
+    Bookmark.where(user: @user).includes(:topic).includes(post: :user)
+  end
+end
diff --git a/lib/bookmark_reminder_notification_handler.rb b/lib/bookmark_reminder_notification_handler.rb
index 166c46274e..83f0b9fb3d 100644
--- a/lib/bookmark_reminder_notification_handler.rb
+++ b/lib/bookmark_reminder_notification_handler.rb
@@ -54,7 +54,7 @@ class BookmarkReminderNotificationHandler
   def self.send_at_desktop_reminder(user:, request_user_agent:)
     return if !SiteSetting.enable_bookmarks_with_reminders
 
-    return if MobileDetection.mobile_device?(BrowserDetection.device(request_user_agent).to_s)
+    return if MobileDetection.mobile_device?(request_user_agent)
 
     return if !user_has_pending_at_desktop_reminders?(user)
 
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 62f953b6fd..3123e19b46 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -349,6 +349,11 @@ class TopicView
     end
   end
 
+  def has_bookmarks?
+    return false if @user.blank?
+    @topic.bookmarks.exists?(user_id: @user.id)
+  end
+
   MAX_PARTICIPANTS = 24
 
   def post_counts_by_user
diff --git a/spec/lib/bookmark_reminder_notification_handler_spec.rb b/spec/lib/bookmark_reminder_notification_handler_spec.rb
index e64c9b1c70..a2bf4a30af 100644
--- a/spec/lib/bookmark_reminder_notification_handler_spec.rb
+++ b/spec/lib/bookmark_reminder_notification_handler_spec.rb
@@ -10,31 +10,36 @@ RSpec.describe BookmarkReminderNotificationHandler do
   before do
     SiteSetting.enable_bookmarks_with_reminders = true
   end
+  fab!(:reminder) do
+    Fabricate(
+      :bookmark,
+      user: user,
+      reminder_type: Bookmark.reminder_types[:at_desktop],
+      reminder_at: nil,
+      reminder_set_at: Time.zone.now
+    )
+  end
+  let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
 
-  context "when the user agent is for mobile" do
-    let(:user_agent) { "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1" }
-    it "does not attempt to send any reminders" do
-      DistributedMutex.expects(:synchronize).never
-      send_reminder
-    end
+  before do
+    Discourse.redis.flushall
   end
 
-  context "when the user agent is for desktop" do
-    let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
-    fab!(:reminder) do
-      Fabricate(
-        :bookmark,
-        user: user,
-        reminder_type: Bookmark.reminder_types[:at_desktop],
-        reminder_at: nil,
-        reminder_set_at: Time.zone.now
-      )
+  context "when there are pending bookmark at desktop reminders" do
+    before do
+      described_class.cache_pending_at_desktop_reminder(user)
     end
 
-    context "when there are pending bookmark at desktop reminders" do
-      before do
-        described_class.cache_pending_at_desktop_reminder(user)
+    context "when the user agent is for mobile" do
+      let(:user_agent) { "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1" }
+      it "does not attempt to send any reminders" do
+        DistributedMutex.expects(:synchronize).never
+        send_reminder
       end
+    end
+
+    context "when the user agent is for desktop" do
+      let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
 
       it "deletes the key in redis" do
         send_reminder
@@ -49,23 +54,23 @@ RSpec.describe BookmarkReminderNotificationHandler do
         expect(reminder.reload.reminder_set_at).to eq(nil)
       end
     end
+  end
 
-    context "when there are no pending bookmark at desktop reminders" do
-      it "does nothing" do
-        DistributedMutex.expects(:synchronize).never
-        send_reminder
-      end
+  context "when there are no pending bookmark at desktop reminders" do
+    it "does nothing" do
+      DistributedMutex.expects(:synchronize).never
+      send_reminder
+    end
+  end
+
+  context "when enable bookmarks with reminders is disabled" do
+    before do
+      SiteSetting.enable_bookmarks_with_reminders = false
     end
 
-    context "when enable bookmarks with reminders is disabled" do
-      before do
-        SiteSetting.enable_bookmarks_with_reminders = false
-      end
-
-      it "does nothing" do
-        BrowserDetection.expects(:device).never
-        send_reminder
-      end
+    it "does nothing" do
+      BrowserDetection.expects(:device).never
+      send_reminder
     end
   end
 

From 03c012bd97275459f75f2f9df6c2d9d1bccf6bf5 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Thu, 12 Mar 2020 16:00:45 +1000
Subject: [PATCH 0185/1830] Unscope post + topic relation for bookmark

* we want to be able to get these records for the bookmark
  even if they are trashed, for serialization for the bookmark
  list
---
 app/models/bookmark.rb                        | 10 ++++++
 app/serializers/user_bookmark_serializer.rb   |  4 +--
 .../user_bookmark_serializer_spec.rb          | 35 +++++++++++++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 spec/serializers/user_bookmark_serializer_spec.rb

diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index d25a30b865..d28e40d263 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -13,6 +13,16 @@ class Bookmark < ActiveRecord::Base
   validate :unique_per_post_for_user
   validate :ensure_sane_reminder_at_time
 
+  # we don't care whether the post or topic is deleted,
+  # they hold important information about the bookmark
+  def post
+    Post.unscoped { super }
+  end
+
+  def topic
+    Topic.unscoped { super }
+  end
+
   def unique_per_post_for_user
     existing_bookmark = Bookmark.find_by(user_id: user_id, post_id: post_id)
     return if existing_bookmark.blank? || existing_bookmark.id == id
diff --git a/app/serializers/user_bookmark_serializer.rb b/app/serializers/user_bookmark_serializer.rb
index adef053d30..39358c2262 100644
--- a/app/serializers/user_bookmark_serializer.rb
+++ b/app/serializers/user_bookmark_serializer.rb
@@ -26,11 +26,11 @@ class UserBookmarkSerializer < ApplicationSerializer
              :username
 
   def closed
-    object.topic_closed
+    object.topic.closed
   end
 
   def archived
-    object.topic_archived
+    object.topic.archived
   end
 
   def linked_post_number
diff --git a/spec/serializers/user_bookmark_serializer_spec.rb b/spec/serializers/user_bookmark_serializer_spec.rb
new file mode 100644
index 0000000000..0bca3a0228
--- /dev/null
+++ b/spec/serializers/user_bookmark_serializer_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe UserBookmarkSerializer do
+  let(:bookmark) do
+    Fabricate(:bookmark)
+    Bookmark.all.includes(post: :user).includes(:topic).last
+  end
+
+  subject { described_class.new(bookmark) }
+
+  context "when the topic is deleted" do
+    before do
+      bookmark.topic.trash!
+      bookmark.reload
+    end
+    it "still returns the topic title because the relationship is unscoped" do
+      expect(subject.title).not_to eq(nil)
+    end
+  end
+
+  context "when the post is deleted" do
+    before do
+      bookmark.post.trash!
+      bookmark.reload
+    end
+    it "still returns the post number because the relationship is unscoped" do
+      expect(subject.linked_post_number).not_to eq(nil)
+    end
+    it "still returns the post username" do
+      expect(subject.username).not_to eq(nil)
+    end
+  end
+end

From 89a1b3a791275a0d2e14eaabf76c8ab5d2cbd22c Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Thu, 12 Mar 2020 16:10:56 +1000
Subject: [PATCH 0186/1830] Make sure reminder not sent for deleted post
 bookmark

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

diff --git a/lib/bookmark_reminder_notification_handler.rb b/lib/bookmark_reminder_notification_handler.rb
index 83f0b9fb3d..4591719fdc 100644
--- a/lib/bookmark_reminder_notification_handler.rb
+++ b/lib/bookmark_reminder_notification_handler.rb
@@ -7,7 +7,7 @@ class BookmarkReminderNotificationHandler
   def self.send_notification(bookmark)
     return if bookmark.blank?
     Bookmark.transaction do
-      if bookmark.post.blank?
+      if bookmark.post.blank? || bookmark.post.deleted_at.present?
         return clear_reminder(bookmark)
       end
 

From 11921c4868051db68b0aadae36926da99a2a95cd Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 12 Mar 2020 07:51:05 +0100
Subject: [PATCH 0187/1830] DEV: enforces ember-template-lint: no-html-comments
 (#9183)

https://github.com/ember-template-lint/ember-template-lint/blob/master/docs/rule/no-html-comments.md
---
 .template-lintrc.js                            |  3 ++-
 .../templates/modal/admin-badge-preview.hbs    | 18 +++++++++---------
 .../components/search-advanced-options.hbs     |  5 ++---
 .../discourse/templates/modal/bookmark.hbs     |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 801225fd33..17279244f3 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -13,6 +13,7 @@ module.exports = {
     "no-unbound": true,
     "simple-unless": true,
     "no-triple-curlies": true,
-    "no-partial": true
+    "no-partial": true,
+    "no-html-comments": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
index 528ed5af24..eaab7e615f 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
@@ -4,15 +4,15 @@
 
     <pre class="badge-errors">{{errors}}</pre>
 
-    <!--
-    TODO we want some help pages for this, link to those instead
-    <p>
-      {{i18n "admin.badges.preview.error_help"}}
-    </p>
-    <ul>
-      <li><a href="https://meta.discourse.org/t/triggered-custom-badge-queries/19336">https://meta.discourse.org/t/triggered-custom-badge-queries/19336</a></li>
-    </ul>
-    -->
+    {{!--
+      TODO we want some help pages for this, link to those instead
+      <p>
+        {{i18n "admin.badges.preview.error_help"}}
+      </p>
+      <ul>
+        <li><a href="https://meta.discourse.org/t/triggered-custom-badge-queries/19336">https://meta.discourse.org/t/triggered-custom-badge-queries/19336</a></li>
+      </ul>
+    --}}
 
   {{else}}
     <p class="grant-count">
diff --git a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
index 36e1b5a4cb..89df8f94e3 100644
--- a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
@@ -24,7 +24,7 @@
   </div>
 </div>
 
-<!-- disable these super-advanced searches for now
+{{!-- disable these super-advanced searches for now
 <div class="container">
   <div class="control-group pull-left">
     <label class="control-label" for="search-in-group">{{i18n "search.advanced.in_group.label"}}</label>
@@ -38,8 +38,7 @@
       {{badge-selector badgeFinder=badgeFinder badgeNames=searchedTerms.badge single="true" canReceiveUpdates="true"}}
     </div>
   </div>
-</div>
--->
+</div> --}}
 
 {{#if siteSettings.tagging_enabled}}
   <div class="container advanced-search-tag-group">
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 4fb9e462f9..782ebe9cab 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -57,7 +57,7 @@
 
     <div class="control-group">
       {{d-button label="bookmarks.save" class="btn-primary" action=(action "saveAndClose")}}
-      {{d-modal-cancel close=(action "closeWithoutSavingBookmark")}}      
+      {{d-modal-cancel close=(action "closeWithoutSavingBookmark")}}
     </div>
   {{/conditional-loading-spinner}}
 {{/d-modal-body}}

From 9c930c622e8f1c7d62e8650e3d40576e56c9e618 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 12 Mar 2020 18:10:03 +1100
Subject: [PATCH 0188/1830] FEATURE: allow for a larger maximum post length

In some documentation heavy sites larger posts may be desirable.

This is not a setting to change without thinking, however where it is
needed it can make sense. Allow for a 50% increase in max over our
previous maximum.

The old limit of 99000 is arbitrary. Stuff gets riskier the longer posts
get especially with complex markdown, however 99000 is not a threshold
where stuff automatically breaks.
---
 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 07d0c5638d..9e9b80aaac 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -637,7 +637,7 @@ posting:
   max_post_length:
     client: true
     default: 32000
-    max: 99000
+    max: 150000
   topic_featured_link_enabled:
     client: true
     default: true

From 8e36816bde97eaa435a4c7c9cbdf6daab693ba89 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 12 Mar 2020 12:50:32 +0530
Subject: [PATCH 0189/1830] UX: respect `prioritize_username_in_ux` setting for
 user avatar title

---
 app/assets/javascripts/discourse/helpers/user-avatar.js.es6 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
index b46a49d6ff..f306a0356f 100644
--- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
@@ -1,6 +1,7 @@
 import { get } from "@ember/object";
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { avatarImg, formatUsername } from "discourse/lib/utilities";
+import { prioritizeNameInUx } from "discourse/lib/settings";
 
 let _customAvatarHelpers;
 
@@ -42,7 +43,9 @@ function renderAvatar(user, options) {
       return "";
     }
 
-    let displayName = name || formatUsername(username);
+    let displayName = prioritizeNameInUx(name, this.siteSettings)
+      ? name
+      : formatUsername(username);
 
     let title = options.title;
     if (!title && !options.ignoreTitle) {

From 00876a5bfc27124cd0e4b1b1998d43714e01983d Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 12 Mar 2020 12:57:23 +0530
Subject: [PATCH 0190/1830] Update required Redis version.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8f9d748d06..c3a200d108 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ To get your environment setup, follow the community setup guide for your operati
 
 If you're familiar with how Rails works and are comfortable setting up your own environment, you can also try out the [**Discourse Advanced Developer Guide**](docs/DEVELOPER-ADVANCED.md), which is aimed primarily at Ubuntu and macOS environments.
 
-Before you get started, ensure you have the following minimum versions: [Ruby 2.6+](https://www.ruby-lang.org/en/downloads/), [PostgreSQL 10+](https://www.postgresql.org/download/), [Redis 2.6+](https://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first!
+Before you get started, ensure you have the following minimum versions: [Ruby 2.6+](https://www.ruby-lang.org/en/downloads/), [PostgreSQL 10+](https://www.postgresql.org/download/), [Redis 4.0+](https://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first!
 
 ## Setting up Discourse
 

From 799613c859713ea0c2e31c78b04c71999a482d32 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 12 Mar 2020 13:15:32 +0530
Subject: [PATCH 0191/1830] fix the build.

---
 app/assets/javascripts/discourse/helpers/user-avatar.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
index f306a0356f..9d5f0cdc05 100644
--- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
@@ -43,7 +43,7 @@ function renderAvatar(user, options) {
       return "";
     }
 
-    let displayName = prioritizeNameInUx(name, this.siteSettings)
+    let displayName = prioritizeNameInUx(name)
       ? name
       : formatUsername(username);
 

From b7fb6d0d06ab7d023ee56d20dfd3a580996eaca9 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Thu, 12 Mar 2020 13:46:12 +0200
Subject: [PATCH 0192/1830] FIX: Show topic progress on iPad when
 portrait-oriented (#9181)

---
 .../javascripts/discourse/components/topic-navigation.js.es6  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
index bff5f73a2e..7c96ccf00c 100644
--- a/app/assets/javascripts/discourse/components/topic-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
@@ -43,11 +43,11 @@ export default Component.extend(PanEvents, {
           headerContainer = document.querySelector(".d-header"),
           headerHeight = (headerContainer && headerContainer.offsetHeight) || 0;
 
-        if (timelineContainer && composer) {
+        if (composer) {
           renderTimeline =
             width > MIN_WIDTH_TIMELINE &&
             window.innerHeight - composer.offsetHeight - headerHeight >
-              timelineContainer.offsetHeight;
+              (timelineContainer ? timelineContainer.offsetHeight : 0);
         }
       }
 

From 8290856a4bdc62dac0366e3e42594c479e93882d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 12 Mar 2020 13:17:52 +0100
Subject: [PATCH 0193/1830] FIX: differentiates flag-modal and flag-modal-body
 (#9187)

This was causing body styles to be applied on the whole modal.
---
 app/assets/javascripts/discourse/templates/modal/flag.hbs | 2 +-
 app/assets/stylesheets/common/base/modal.scss             | 2 +-
 app/assets/stylesheets/mobile/modal.scss                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/templates/modal/flag.hbs
index b085e8211d..056f2bc9a3 100644
--- a/app/assets/javascripts/discourse/templates/modal/flag.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/flag.hbs
@@ -1,4 +1,4 @@
-{{#d-modal-body class="flag-modal" title=title}}
+{{#d-modal-body class="flag-modal-body" title=title}}
   <form>
     {{#flag-selection nameKey=selected.name_key flags=flagsAvailable as |f|}}
       {{flag-action-type flag=f
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index a294453181..90a20854fd 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -594,7 +594,7 @@
   }
 }
 
-.flag-modal {
+.flag-modal-body {
   max-height: 450px;
   .flag-action-type-details {
     width: 100%;
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index b4328ae762..36777b0eee 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -79,7 +79,7 @@
 }
 
 @media only screen and (max-device-width: 568px) {
-  .modal .flag-modal .flag-message {
+  .modal .flag-modal-body .flag-message {
     height: 3em;
   }
 }

From d2bb127e2c8c4a4df30024883ee36472fc86b688 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 12 Mar 2020 13:59:43 +0100
Subject: [PATCH 0194/1830] FIX: prevents crash when to be unescaped emoji is
 not a string (#9189)

I couldn't get a repro so this is a shot in the dark and doesn't solve the root issue, but should prevent topic view from crashing.
---
 app/assets/javascripts/pretty-text/emoji.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/pretty-text/emoji.js.es6 b/app/assets/javascripts/pretty-text/emoji.js.es6
index 12077c0125..fa7754da59 100644
--- a/app/assets/javascripts/pretty-text/emoji.js.es6
+++ b/app/assets/javascripts/pretty-text/emoji.js.es6
@@ -92,7 +92,7 @@ function isReplacableInlineEmoji(string, index, inlineEmoji) {
 }
 
 export function performEmojiUnescape(string, opts) {
-  if (!string) {
+  if (!string || typeof string !== "string") {
     return;
   }
 

From 8d90134d0b4e3243568f1c4cc98151d365ccea77 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Thu, 12 Mar 2020 09:36:45 -0500
Subject: [PATCH 0195/1830] FIX: Enter submits form for hyperlink insert modal
 (#9190)

---
 .../templates/modal/insert-hyperlink.hbs      | 84 ++++++++++---------
 1 file changed, 43 insertions(+), 41 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
index 1be4aab6d5..4f3149b7b6 100644
--- a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
@@ -1,42 +1,44 @@
-{{#d-modal-body title="composer.link_dialog_title" class="insert-link"}}
-    <div class="inputs">
-      {{text-field
-        value=linkUrl
-        placeholderKey="composer.link_url_placeholder"
-        class="link-url"
-        key-up=(action "search")
-      }}
-      {{#if searchLoading}}
-        {{loading-spinner}}
-      {{/if}}
-      {{#if searchResults}}
-        <div class="internal-link-results">
-          {{#each searchResults as |result|}}
-            <a
-              class="search-link"
-              href={{result.url}}
-              onclick={{action "linkClick"}}
-              data-title={{result.title}}>
-              {{topic-status topic=result disableActions=true}}
-              {{replace-emoji result.fancy_title}}
-              <div class="search-category">
-                {{#if result.category.parentCategory}}
-                  {{category-link result.category.parentCategory}}
-                {{/if}}
-                {{category-link result.category hideParent=true}}
-                {{discourse-tags result}}
-              </div>
-            </a>
-          {{/each}}
-        </div>
-      {{/if}}
-    </div>
-    <div class="inputs">
-      {{text-field value=linkText placeholderKey="composer.link_optional_text" class="link-text"}}
-    </div>
-{{/d-modal-body}}
+<form {{action "ok" on="submit"}}>
+  {{#d-modal-body title="composer.link_dialog_title" class="insert-link"}}
+      <div class="inputs">
+        {{text-field
+          value=linkUrl
+          placeholderKey="composer.link_url_placeholder"
+          class="link-url"
+          key-up=(action "search")
+        }}
+        {{#if searchLoading}}
+          {{loading-spinner}}
+        {{/if}}
+        {{#if searchResults}}
+          <div class="internal-link-results">
+            {{#each searchResults as |result|}}
+              <a
+                class="search-link"
+                href={{result.url}}
+                onclick={{action "linkClick"}}
+                data-title={{result.title}}>
+                {{topic-status topic=result disableActions=true}}
+                {{replace-emoji result.fancy_title}}
+                <div class="search-category">
+                  {{#if result.category.parentCategory}}
+                    {{category-link result.category.parentCategory}}
+                  {{/if}}
+                  {{category-link result.category hideParent=true}}
+                  {{discourse-tags result}}
+                </div>
+              </a>
+            {{/each}}
+          </div>
+        {{/if}}
+      </div>
+      <div class="inputs">
+        {{text-field value=linkText placeholderKey="composer.link_optional_text" class="link-text"}}
+      </div>
+  {{/d-modal-body}}
 
-<div class="modal-footer">
-  {{d-button class="btn-primary" label="composer.modal_ok" action=(action "ok")}}
-  {{d-button class="btn-danger" label="composer.modal_cancel" action=(action "cancel")}}
-</div>
+  <div class="modal-footer">
+    {{d-button class="btn-primary" label="composer.modal_ok" action=(action "ok") type="submit"}}
+    {{d-button class="btn-danger" label="composer.modal_cancel" action=(action "cancel")}}
+  </div>
+</form>

From aa4e76b480c292a83607fc882e6f240acd412810 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 12 Mar 2020 11:16:29 -0400
Subject: [PATCH 0196/1830] Build(deps-dev): Bump ruby-prof from 1.3.0 to 1.3.1
 (#9186)

Bumps [ruby-prof](https://github.com/ruby-prof/ruby-prof) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/ruby-prof/ruby-prof/releases)
- [Changelog](https://github.com/ruby-prof/ruby-prof/blob/master/CHANGES)
- [Commits](https://github.com/ruby-prof/ruby-prof/compare/1.3.0...1.3.1)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index ea4840a1ae..60d55158f3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -349,7 +349,7 @@ GEM
       unicode-display_width (>= 1.4.0, < 1.7)
     rubocop-discourse (1.0.2)
       rubocop (>= 0.69.0)
-    ruby-prof (1.3.0)
+    ruby-prof (1.3.1)
     ruby-progressbar (1.10.1)
     ruby-readability (0.7.0)
       guess_html_encoding (>= 0.0.4)

From 1b8793e7a41e8053e53c332da3c05bb40f9d73dc Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <stasiek@michalski.cc>
Date: Thu, 12 Mar 2020 16:23:55 +0100
Subject: [PATCH 0197/1830] FEATURE: Add support for custom gravatar-like
 services (#9137)

Adds 3 config values that allow to set a custom provider of Gravatar-like API accessible from gravatar_base_url. The gravatar_name is purely cosmetic, but helps with associating name with the service that actually provides the avatars. gravatar_login_url is a link relative to gravatar_base_url, which provides the user with the login to the Gravatar service
---
 .../discourse/controllers/avatar-selector.js.es6       |  5 +++++
 .../discourse/templates/modal/avatar-selector.hbs      |  6 +++---
 app/models/user.rb                                     |  2 +-
 app/models/user_avatar.rb                              |  2 +-
 config/locales/client.en.yml                           |  8 ++++----
 config/locales/server.en.yml                           |  4 ++++
 config/site_settings.yml                               |  9 +++++++++
 spec/models/user_spec.rb                               | 10 ++++++++++
 8 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6 b/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
index 959b296cec..5fdbe79e3e 100644
--- a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
+++ b/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
@@ -4,8 +4,13 @@ import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { allowsImages } from "discourse/lib/uploads";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { setting } from "discourse/lib/computed";
 
 export default Controller.extend(ModalFunctionality, {
+  gravatarName: setting("gravatar_name"),
+  gravatarBaseUrl: setting("gravatar_base_url"),
+  gravatarLoginUrl: setting("gravatar_login_url"),
+
   @discourseComputed(
     "selected",
     "user.system_avatar_upload_id",
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
index 10e5c4bf26..98504b0981 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
@@ -14,16 +14,16 @@
     </div>
     <div class="avatar-choice">
       {{radio-button id="gravatar" name="avatar" value="gravatar" selection=selected}}
-      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{i18n 'user.change_avatar.gravatar'}} {{user.email}}</span></label>
+      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{i18n 'user.change_avatar.gravatar' gravatarName=gravatarName gravatarBaseUrl=gravatarBaseUrl gravatarLoginUrl=gravatarLoginUrl }} {{user.email}}</span></label>
 
       {{d-button action=(action "refreshGravatar")
-                 title="user.change_avatar.refresh_gravatar_title"
+                 translatedTitle=(i18n "user.change_avatar.refresh_gravatar_title" gravatarName=gravatarName)
                  disabled=gravatarRefreshDisabled
                  icon="sync"
                  class="btn-default avatar-selector-refresh-gravatar"}}
 
       {{#if gravatarFailed}}
-        <p class="error">{{i18n 'user.change_avatar.gravatar_failed'}}</p>
+        <p class="error">{{I18n 'user.change_avatar.gravatar_failed' gravatarName=gravatarName}}</p>
       {{/if}}
     </div>
     {{#if allowAvatarUpload}}
diff --git a/app/models/user.rb b/app/models/user.rb
index fd81a979d0..4b0437261c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -741,7 +741,7 @@ class User < ActiveRecord::Base
   end
 
   def self.gravatar_template(email)
-    "//www.gravatar.com/avatar/#{self.email_hash(email)}.png?s={size}&r=pg&d=identicon"
+    "//#{SiteSetting.gravatar_base_url}/avatar/#{self.email_hash(email)}.png?s={size}&r=pg&d=identicon"
   end
 
   # Don't pass this up to the client - it's meant for server side use
diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index 215524a743..c3df573c32 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -20,7 +20,7 @@ class UserAvatar < ActiveRecord::Base
         return if user.blank? || user.primary_email.blank?
 
         email_hash = user_id == Discourse::SYSTEM_USER_ID ? User.email_hash("info@discourse.org") : user.email_hash
-        gravatar_url = "https://www.gravatar.com/avatar/#{email_hash}.png?s=#{max}&d=404"
+        gravatar_url = "https://#{SiteSetting.gravatar_base_url}/avatar/#{email_hash}.png?s=#{max}&d=404"
 
         # follow redirects in case gravatar change rules on us
         tempfile = FileHelper.download(
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 4d61f5a28a..a276cc8614 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1057,10 +1057,10 @@ en:
 
       change_avatar:
         title: "Change your profile picture"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, based on"
-        gravatar_title: "Change your avatar on Gravatar's website"
-        gravatar_failed: "We could not find a Gravatar with that email address."
-        refresh_gravatar_title: "Refresh your Gravatar"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, based on"
+        gravatar_title: "Change your avatar on {{gravatarName}}'s website"
+        gravatar_failed: "We could not find a {{gravatarName}} with that email address."
+        refresh_gravatar_title: "Refresh your {{gravatarName}}"
         letter_based: "System assigned profile picture"
         uploaded_avatar: "Custom picture"
         uploaded_avatar_empty: "Add a custom picture"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index f260855087..4b7298af42 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2185,6 +2185,10 @@ en:
 
     dashboard_general_tab_activity_metrics: "Choose reports to be displayed as activity metrics on the general tab."
 
+    gravatar_name: "Name of the Gravatar provider"
+    gravatar_base_url: "Url of the Gravatar provider's API base"
+    gravatar_login_url: "Url relative to gravatar_base_url, which provides the user with the login to the Gravatar service"
+
     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 9e9b80aaac..56d742e565 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -598,6 +598,15 @@ users:
     client: true
   max_notifications_per_user:
     default: 10000
+  gravatar_name:
+    default: Gravatar
+    client: true
+  gravatar_base_url:
+    default: www.gravatar.com
+    client: true
+  gravatar_login_url:
+    default: /emails
+    client: true
 
 groups:
   enable_group_directory:
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d94d8d47c5..3e62fd0588 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1248,6 +1248,16 @@ describe User do
 
   end
 
+  describe "#custom_gravatar" do
+    before do
+      SiteSetting.gravatar_base_url = "seccdn.libravatar.org"
+    end
+
+    it "returns a gravatar url as set in the settings" do
+      expect(User.gravatar_template("em@il.com")).to eq("//seccdn.libravatar.org/avatar/6dc2fde946483a1d8a84b89345a1b638.png?s={size}&r=pg&d=identicon")
+    end
+  end
+
   describe "#letter_avatar_color" do
     before do
       SiteSetting.restrict_letter_avatar_colors = "2F70AC|ED207B|AAAAAA|77FF33"

From 59578dfc5b9c7c445170b55614419362ba08a44b Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Thu, 12 Mar 2020 10:31:16 +0000
Subject: [PATCH 0198/1830] FIX: Notification emails with attachments are
 incorrectly structured

Two behaviors in the mail gem collide:

 1. Attachments are added as extra parts at the top level,
 2. When there are both text and html parts, the content type is set to
    'multipart/alternative'.

Since attachments aren't alternative renderings, for emails that contain
attachments and both html and text parts, some coercing is necessary.
---
 lib/email/sender.rb                  | 44 ++++++++++++++++++++++++++++
 spec/components/email/sender_spec.rb | 10 +++++++
 2 files changed, 54 insertions(+)

diff --git a/lib/email/sender.rb b/lib/email/sender.rb
index 9fab38906b..bce5fc90de 100644
--- a/lib/email/sender.rb
+++ b/lib/email/sender.rb
@@ -270,6 +270,50 @@ module Email
           )
         end
       end
+
+      fix_parts_after_attachments!
+    end
+
+    #
+    # Two behaviors in the mail gem collide:
+    #
+    #  1. Attachments are added as extra parts at the top level,
+    #  2. When there are both text and html parts, the content type is set
+    #     to 'multipart/alternative'.
+    #
+    # Since attachments aren't alternative renderings, for emails that contain
+    # attachments and both html and text parts, some coercing is necessary.
+    #
+    # When there are alternative rendering and attachments, this method causes
+    # the top level to be 'multipart/mixed' and puts the html and text parts
+    # into a nested 'multipart/alternative' part.
+    #
+    # Due to mail gem magic, @message.text_part and @message.html_part still
+    # refer to the same objects.
+    #
+    def fix_parts_after_attachments!
+      has_attachments = @message.attachments.present?
+      has_alternative_renderings =
+        @message.html_part.present? && @message.text_part.present?
+
+      if has_attachments && has_alternative_renderings
+        @message.content_type = "multipart/mixed"
+
+        html_part = @message.html_part
+        @message.html_part = nil
+
+        text_part = @message.text_part
+        @message.text_part = nil
+
+        content = Mail::Part.new do
+          content_type "multipart/alternative"
+
+          part html_part
+          part text_part
+        end
+
+        @message.parts.unshift(content)
+      end
     end
 
     def header_value(name)
diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb
index 59730e9b48..a93e1cd410 100644
--- a/spec/components/email/sender_spec.rb
+++ b/spec/components/email/sender_spec.rb
@@ -412,6 +412,16 @@ describe Email::Sender do
       expect(message.attachments.map(&:filename))
         .to contain_exactly(*[small_pdf, csv_file].map(&:original_filename))
     end
+
+    it "structures the email as a multipart/mixed with a multipart/alternative first part" do
+      SiteSetting.email_total_attachment_size_limit_kb = 10_000
+      Email::Sender.new(message, :valid_type).send
+
+      expect(message.content_type).to start_with("multipart/mixed")
+      expect(message.parts.size).to eq(4)
+      expect(message.parts[0].content_type).to start_with("multipart/alternative")
+      expect(message.parts[0].parts.size).to eq(2)
+    end
   end
 
   context 'with a deleted post' do

From 6102c287f776682c63be1ffb6554622267fe2522 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 12 Mar 2020 16:50:20 +0100
Subject: [PATCH 0199/1830] FIX: prevents i18n helper to return a SafeString
 (#9191)

For convenience the i18n helper has been made returning a SafeString, but when used with other helpers, a String is expected and will cause unexpected behaviors.

This is the root cause of the initial bug fixed in https://github.com/discourse/discourse/commit/d2bb127e2c8c4a4df30024883ee36472fc86b688

This commit is kept as it's a better security in case of unexpected behavior.
---
 .../components/admin-report-storage-stats.hbs        |  2 +-
 .../templates/components/penalty-post-action.hbs     |  2 +-
 .../admin/templates/components/silence-details.hbs   |  2 +-
 .../templates/components/suspension-details.hbs      |  4 ++--
 .../admin/templates/dashboard_general.hbs            |  2 +-
 app/assets/javascripts/admin/templates/embedding.hbs |  2 +-
 .../admin/templates/modal/admin-badge-preview.hbs    |  4 ++--
 .../javascripts/admin/templates/user-index.hbs       |  2 +-
 .../javascripts/discourse-common/helpers/i18n.js.es6 |  3 +--
 .../discourse/helpers/replace-emoji.js.es6           |  8 ++++----
 .../discourse/templates/account-created/resent.hbs   |  2 +-
 .../templates/components/discourse-banner.hbs        |  2 +-
 .../templates/components/edit-category-general.hbs   |  2 +-
 .../templates/components/edit-category-security.hbs  |  2 +-
 .../discourse/templates/components/ip-lookup.hbs     |  2 +-
 .../templates/components/related-messages.hbs        |  2 +-
 .../templates/components/shared-draft-controls.hbs   |  2 +-
 .../discourse/templates/components/tag-info.hbs      |  2 +-
 .../discourse/templates/components/user-stat.hbs     |  2 +-
 .../discourse/templates/modal/activation-resent.hbs  |  2 +-
 .../discourse/templates/modal/auth-token.hbs         |  2 +-
 .../discourse/templates/modal/avatar-selector.hbs    |  4 ++--
 .../discourse/templates/modal/bookmark.hbs           |  2 +-
 .../discourse/templates/modal/change-owner.hbs       |  8 +++++---
 .../templates/modal/delete-topic-disallowed.hbs      |  2 +-
 .../discourse/templates/modal/feature-topic.hbs      | 12 ++++++------
 .../discourse/templates/modal/move-to-topic.hbs      | 10 +++++-----
 .../discourse/templates/modal/not-activated.hbs      |  2 +-
 .../discourse/templates/modal/post-enqueued.hbs      |  2 +-
 .../modal/second-factor-add-security-key.hbs         |  2 +-
 .../templates/modal/second-factor-add-totp.hbs       |  2 +-
 .../templates/modal/second-factor-backup-edit.hbs    |  2 +-
 .../discourse/templates/modal/topic-bulk-actions.hbs |  2 +-
 .../templates/preferences-second-factor.hbs          |  2 +-
 .../discourse/templates/preferences/account.hbs      |  2 +-
 .../discourse/templates/preferences/emails.hbs       |  2 +-
 app/assets/javascripts/discourse/templates/topic.hbs |  2 +-
 .../discourse/templates/user-invited-show.hbs        |  2 +-
 .../components/discourse-local-dates-create-form.hbs |  2 +-
 39 files changed, 58 insertions(+), 57 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
index d6e42cd414..246d23be25 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
@@ -15,7 +15,7 @@
 
       {{#if backupStats.last_backup_taken_at}}
         <br>
-        {{i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true")}}
+        {{html-safe (i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true"))}}
       {{/if}}
     </p>
   </div>
diff --git a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
index a6c848541f..b566df7de6 100644
--- a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
+++ b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
@@ -1,7 +1,7 @@
 <div class='penalty-post-controls'>
   <label>
     <div class='penalty-post-label'>
-      {{i18n 'admin.user.penalty_post_actions'}}
+      {{html-safe (i18n 'admin.user.penalty_post_actions')}}
     </div>
   </label>
   {{combo-box
diff --git a/app/assets/javascripts/admin/templates/components/silence-details.hbs b/app/assets/javascripts/admin/templates/components/silence-details.hbs
index af1b4980d5..bdcb21cbc5 100644
--- a/app/assets/javascripts/admin/templates/components/silence-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/silence-details.hbs
@@ -1,7 +1,7 @@
 <div class='reason-controls'>
   <label>
     <div class='silence-reason-label'>
-      {{i18n 'admin.user.silence_reason_label'}}
+      {{html-safe (i18n 'admin.user.silence_reason_label')}}
     </div>
     </label>
     {{text-field
diff --git a/app/assets/javascripts/admin/templates/components/suspension-details.hbs b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
index 4dcc606b2b..70968ae746 100644
--- a/app/assets/javascripts/admin/templates/components/suspension-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
@@ -2,9 +2,9 @@
   <label>
     <div class='suspend-reason-label'>
       {{#if siteSettings.hide_suspension_reasons}}
-        {{i18n 'admin.user.suspend_reason_hidden_label'}}
+        {{html-safe (i18n 'admin.user.suspend_reason_hidden_label')}}
       {{else}}
-        {{i18n 'admin.user.suspend_reason_label'}}
+        {{html-safe (i18n 'admin.user.suspend_reason_label')}}
       {{/if}}
     </div>
   </label>
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index d190b7664b..94150fef95 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -142,7 +142,7 @@
         filters=trendingSearchFilters
         isEnabled=logSearchQueriesEnabled
         disabledLabel=trendingSearchDisabledLabel}}
-      {{i18n "admin.dashboard.reports.trending_search.more" basePath=basePath}}
+      {{html-safe (i18n "admin.dashboard.reports.trending_search.more" basePath=basePath)}}
     </div>
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index 1777263674..2a5d39f12c 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -23,7 +23,7 @@
 
 {{#if showSecondary}}
   <div class='embedding-secondary'>
-    <p>{{i18n "admin.embedding.sample"}}</p>
+    <p>{{html-safe (i18n "admin.embedding.sample")}}</p>
     {{highlighted-code code=embeddingCode lang="html"}}
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
index eaab7e615f..219dee18d4 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
@@ -17,9 +17,9 @@
   {{else}}
     <p class="grant-count">
       {{#if count}}
-        {{i18n "admin.badges.preview.grant_count" count=count}}
+        {{html-safe (i18n "admin.badges.preview.grant_count" count=count)}}
       {{else}}
-        {{i18n "admin.badges.preview.no_grant_count"}}
+        {{html-safe (i18n "admin.badges.preview.no_grant_count")}}
       {{/if}}
     </p>
 
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 23a1a6aae3..f5abf9f8dd 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -132,7 +132,7 @@
     <div class="field">{{i18n "user.avatar.title"}}</div>
     <div class="value">{{avatar model imageSize="large"}}</div>
     <div class="controls">
-      {{i18n "admin.user.visit_profile" url=preferencesPath}}
+      {{html-safe (i18n "admin.user.visit_profile" url=preferencesPath)}}
     </div>
   </div>
 
diff --git a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
index c3d7f1e448..902ed699bf 100644
--- a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
+++ b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
@@ -1,7 +1,6 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
-import { htmlSafe } from "@ember/template";
 
-registerUnbound("i18n", (key, params) => htmlSafe(I18n.t(key, params)));
+registerUnbound("i18n", (key, params) => I18n.t(key, params));
 registerUnbound("i18n-yes-no", (value, params) =>
   I18n.t(value ? "yes_value" : "no_value", params)
 );
diff --git a/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6 b/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6
index 37365a5781..80a5dd4210 100644
--- a/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6
+++ b/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6
@@ -1,7 +1,7 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { emojiUnescape } from "discourse/lib/text";
+import { htmlSafe } from "@ember/template";
 
-registerUnbound(
-  "replace-emoji",
-  text => new Handlebars.SafeString(emojiUnescape(text))
-);
+registerUnbound("replace-emoji", text => {
+  return htmlSafe(emojiUnescape(text));
+});
diff --git a/app/assets/javascripts/discourse/templates/account-created/resent.hbs b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
index 5ad9168986..16c29c4b9b 100644
--- a/app/assets/javascripts/discourse/templates/account-created/resent.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
@@ -1,6 +1,6 @@
 <div class='ac-message'>
   {{#if email}}
-    {{i18n 'login.sent_activation_email_again' currentEmail=email}}
+    {{html-safe (i18n 'login.sent_activation_email_again' currentEmail=email)}}
   {{else}}
     {{i18n 'login.sent_activation_email_again_generic'}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index cda2c2069a..9b6b18c530 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -5,7 +5,7 @@
       <div id="banner-content">
         {{html-safe content}}
         {{#if currentUser.staff}}
-          <p><a href={{banner.url}}>{{i18n "banner.edit"}}</a></p>
+          <p><a href={{banner.url}}>{{html-safe (i18n "banner.edit")}}</a></p>
         {{/if}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index 7884f85e1f..9799c5ee42 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -1,7 +1,7 @@
 {{#if category.isUncategorizedCategory}}
   <p class="warning">
     {{d-icon "exclamation-triangle"}}
-    {{i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink}}
+    {{html-safe (i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink)}}
   </p>
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index 5b132092c4..68fb66239c 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -11,7 +11,7 @@
       {{#each category.permissions as |p|}}
         <li>
           <span class="name"><span class="badge-group">{{p.group_name}}</span></span>
-          {{i18n "category.can"}}
+          {{html-safe (i18n "category.can")}}
           <span class="permission">{{p.permission.description}}</span>
           {{#if editingPermissions}}
             <a class="remove-permission" href {{action "removePermission" p}}>{{d-icon "times-circle"}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 9b7b7bebc4..35e074e661 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -14,7 +14,7 @@
       {{d-button action=(action "copy") class="pull-right no-text" icon="copy"}}
     {{/if}}
     <h4>{{i18n "ip_lookup.title"}}</h4>
-    <p class='powered-by'>{{i18n "ip_lookup.powered_by"}}</p>
+    <p class='powered-by'>{{html-safe (i18n "ip_lookup.powered_by")}}</p>
     <dl>
       {{#if location}}
         {{#if location.hostname}}
diff --git a/app/assets/javascripts/discourse/templates/components/related-messages.hbs b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
index 09e1abb1a1..d4443bd2c3 100644
--- a/app/assets/javascripts/discourse/templates/components/related-messages.hbs
+++ b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
@@ -10,5 +10,5 @@
 </div>
 
 {{#if targetUser}}
-  <h3 class="see-all-pms-message">{{i18n "related_messages.see_all" path=searchLink username=targetUser.username}}</h3>
+  <h3 class="see-all-pms-message">{{html-safe (i18n "related_messages.see_all" path=searchLink username=targetUser.username)}}</h3>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
index d42eb1b177..f641a14a56 100644
--- a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
+++ b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
@@ -2,7 +2,7 @@
   {{#if publishing}}
     {{i18n "shared_drafts.publishing"}}
   {{else}}
-    {{i18n "shared_drafts.notice" category=topic.category.name}}
+    {{html-safe (i18n "shared_drafts.notice" category=topic.category.name)}}
 
     <div class='publish-field'>
       <label>{{i18n "shared_drafts.destination_category"}}</label>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
index aa1f4889d1..b1031c4558 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
@@ -32,7 +32,7 @@
     {{#if tagInfo.synonyms}}
       <div class="synonyms-list">
         <h3>{{i18n "tagging.synonyms"}}</h3>
-        <div>{{i18n "tagging.synonyms_description" base_tag_name=tagInfo.name}}</div>
+        <div>{{html-safe (i18n "tagging.synonyms_description" base_tag_name=tagInfo.name)}}</div>
         <div class="tag-list">
           {{#each tagInfo.synonyms as |tag|}}
             <div class='tag-box'>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index 69704bf892..20bbb3204a 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -9,5 +9,5 @@
 </span>
 <span class='label'>
   {{#if icon}}{{d-icon icon}}{{/if}}
-  {{i18n label count=value}}
+  {{html-safe (i18n label count=value)}}
 </span>
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
index 7439589d5c..8780608607 100644
--- a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}
+  {{html-safe (i18n 'login.sent_activation_email_again' currentEmail=currentEmail)}}
 {{/d-modal-body}}
 
 {{modal-footer-close closeModal=(route-action "closeModal")}}
diff --git a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
index 5390227a2e..add7e7ce5a 100644
--- a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body title="user.auth_tokens.was_this_you"}}
   <div>
     <p>{{i18n 'user.auth_tokens.was_this_you_description'}}</p>
-    <p>{{i18n 'user.second_factor.extended_description'}}</p>
+    <p>{{html-safe (i18n 'user.second_factor.extended_description')}}</p>
   </div>
 
   <div>
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
index 98504b0981..edc2c4a4d8 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
@@ -10,11 +10,11 @@
   {{else}}
     <div class="avatar-choice">
       {{radio-button id="system-avatar" name="avatar" value="system" selection=selected}}
-      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{i18n 'user.change_avatar.letter_based'}}</label>
+      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{html-safe (i18n 'user.change_avatar.letter_based')}}</label>
     </div>
     <div class="avatar-choice">
       {{radio-button id="gravatar" name="avatar" value="gravatar" selection=selected}}
-      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{i18n 'user.change_avatar.gravatar' gravatarName=gravatarName gravatarBaseUrl=gravatarBaseUrl gravatarLoginUrl=gravatarLoginUrl }} {{user.email}}</span></label>
+      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{html-safe (i18n 'user.change_avatar.gravatar' gravatarName=gravatarName gravatarBaseUrl=gravatarBaseUrl gravatarLoginUrl=gravatarLoginUrl)}} {{user.email}}</span></label>
 
       {{d-button action=(action "refreshGravatar")
                  translatedTitle=(i18n "user.change_avatar.refresh_gravatar_title" gravatarName=gravatarName)
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 782ebe9cab..661ab90f27 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -50,7 +50,7 @@
         {{/if}}
 
       {{else}}
-        <div class="alert alert-info">{{i18n "bookmarks.no_timezone" basePath=basePath }}</div>
+        <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=basePath)}}</div>
       {{/if}}
     </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index a4e0a35c9b..13ee97c97b 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -1,8 +1,10 @@
 {{#d-modal-body class='change-ownership'}}
   <span>
-    {{i18n (if selectedPostsUsername 'topic.change_owner.instructions' 'topic.change_owner.instructions_without_old_user')
-           count=selectedPostsCount
-           old_user=selectedPostsUsername}}
+    {{html-safe (i18n (if selectedPostsUsername 'topic.change_owner.instructions' 'topic.change_owner.instructions_without_old_user')
+        count=selectedPostsCount
+        old_user=selectedPostsUsername
+      )
+    }}
   </span>
 
   <form>
diff --git a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
index 61e693a9af..b6ab282d38 100644
--- a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  <p>{{i18n "post.controls.delete_topic_disallowed_modal"}}</p>
+  <p>{{html-safe (i18n "post.controls.delete_topic_disallowed_modal")}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(route-action "closeModal") class="btn-primary" label="close"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index be55ea8460..4dbbafd384 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -6,9 +6,9 @@
           <p>
             {{#conditional-loading-spinner size="small" condition=loading}}
               {{#if pinnedGloballyCount}}
-                {{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}
+                {{html-safe (i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount)}}
               {{else}}
-                {{i18n "topic.feature_topic.not_pinned_globally"}}
+                {{html-safe (i18n "topic.feature_topic.not_pinned_globally")}}
               {{/if}}
             {{/conditional-loading-spinner}}
           </p>
@@ -74,9 +74,9 @@
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
             {{#if pinnedGloballyCount}}
-              {{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}
+              {{html-safe (i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount)}}
             {{else}}
-              {{i18n "topic.feature_topic.not_pinned_globally"}}
+              {{html-safe (i18n "topic.feature_topic.not_pinned_globally")}}
             {{/if}}
           {{/conditional-loading-spinner}}
         </p>
@@ -123,9 +123,9 @@
         <p>
           {{#conditional-loading-spinner size="small" condition=loading}}
             {{#if bannerCount}}
-              {{i18n "topic.feature_topic.banner_exists"}}
+              {{html-safe (i18n "topic.feature_topic.banner_exists")}}
             {{else}}
-              {{i18n "topic.feature_topic.no_banner_exists"}}
+              {{html-safe (i18n "topic.feature_topic.no_banner_exists")}}
             {{/if}}
           {{/conditional-loading-spinner}}
         </p>
diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
index ae591397a7..d678ce760a 100644
--- a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
@@ -17,7 +17,7 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}</p>
+        <p>{{html-safe (i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount)}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
@@ -31,7 +31,7 @@
     {{/if}}
 
     {{#if existingMessage}}
-      <p>{{i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount}}</p>
+      <p>{{html-safe (i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount)}}</p>
       <form>
         {{choose-message currentTopicId=model.id selectedTopicId=selectedTopicId}}
 
@@ -64,7 +64,7 @@
     </div>
 
     {{#if existingTopic}}
-      <p>{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}</p>
+      <p>{{html-safe (i18n 'topic.merge_topic.instructions' count=selectedPostsCount)}}</p>
       <form>
         {{choose-topic currentTopicId=model.id selectedTopicId=selectedTopicId}}
       </form>
@@ -72,7 +72,7 @@
 
     {{#if canSplitTopic}}
       {{#if newTopic}}
-        <p>{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}</p>
+        <p>{{html-safe (i18n 'topic.split_topic.instructions' count=selectedPostsCount)}}</p>
         <form>
           <label>{{i18n 'topic.split_topic.topic_name'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
@@ -93,7 +93,7 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount}}</p>
+        <p>{{html-safe (i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount)}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
           {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
index e9d93aa8f6..b1ba99bdc9 100644
--- a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{i18n 'login.not_activated' sentTo=sentTo}}
+  {{html-safe (i18n 'login.not_activated' sentTo=sentTo)}}
 {{/d-modal-body}}
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
index 3687b9fb2b..d34557528e 100644
--- a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body}}
   <p>{{i18n "review.approval.description"}}</p>
 
-  <p>{{i18n "review.approval.pending_posts" count=model.pending_count}}</p>
+  <p>{{html-safe (i18n "review.approval.pending_posts" count=model.pending_count)}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(route-action "closeModal") class="btn-primary" label="review.approval.ok"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
index c6539a2e52..c97746956d 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{i18n 'user.second_factor.enable_security_key_description'}}
+        {{html-safe (i18n 'user.second_factor.enable_security_key_description')}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
index 9caf24fc46..dd37835554 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{i18n 'user.second_factor.enable_description'}}
+        {{html-safe (i18n 'user.second_factor.enable_description')}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
index 713bdbfcc4..e9988b486f 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
@@ -14,7 +14,7 @@
     {{/if}}
 
     {{#if backupEnabled}}
-      {{i18n "user.second_factor_backup.remaining_codes" count=remainingCodes}}
+      {{html-safe (i18n "user.second_factor_backup.remaining_codes" count=remainingCodes)}}
     {{/if}}
 
     <div class="actions">
diff --git a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
index fe3ce8be48..b9eb57fe8c 100644
--- a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
@@ -1,4 +1,4 @@
 {{#d-modal-body}}
-  <p>{{i18n 'topics.bulk.selected' count=model.topics.length}}</p>
+  <p>{{html-safe (i18n 'topics.bulk.selected' count=model.topics.length)}}</p>
   {{outlet "bulkOutlet"}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index fc6c00a13b..e146d073ca 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -86,7 +86,7 @@
           <h2>{{i18n "user.second_factor_backup.title"}}</h2>
           {{#if model.second_factor_enabled}}
             {{#if model.second_factor_backup_enabled}}
-              {{i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes}}
+              {{html-safe (i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes)}}
             {{else}}
               {{i18n 'user.second_factor_backup.enable_long'}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 62743b5a5a..3f02b15238 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -9,7 +9,7 @@
   </div>
   {{#if siteSettings.enable_mentions}}
     <div class='instructions'>
-      {{i18n 'user.username.short_instructions' username=model.username}}
+      {{html-safe (i18n 'user.username.short_instructions' username=model.username)}}
     </div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index bd9aa411ac..5e54c3af93 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -73,7 +73,7 @@
   <div class='control-group pref-mailing-list-mode'>
     <label class="control-label">{{i18n 'user.mailing_list_mode.label'}}</label>
     {{preference-checkbox labelKey="user.mailing_list_mode.enabled" checked=model.user_option.mailing_list_mode}}
-    <div class='instructions'>{{i18n 'user.mailing_list_mode.instructions'}}</div>
+    <div class='instructions'>{{html-safe (i18n 'user.mailing_list_mode.instructions')}}</div>
     {{#if model.user_option.mailing_list_mode}}
       <div class='controls controls-dropdown'>
         {{combo-box
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index e5894c03ca..7b8c2d1b81 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -277,7 +277,7 @@
               {{#if model.queued_posts_count}}
                 <div class="has-pending-posts">
                   <div>
-                    {{i18n "review.topic_has_pending" count=model.queued_posts_count}}
+                    {{html-safe (i18n "review.topic_has_pending" count=model.queued_posts_count)}}
                   </div>
 
                   {{#link-to 'review' (query-params topic_id=model.id type="ReviewableQueuedPost" status="pending")}}
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index f8f5effb60..bd8e75f1e4 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -109,7 +109,7 @@
         {{else}}
           <div class="user-invite-none">
             {{#if canBulkInvite}}
-              {{i18n 'user.invited.bulk_invite.none'}}
+              {{html-safe (i18n 'user.invited.bulk_invite.none')}}
             {{else}}
               {{i18n 'user.invited.none'}}
             {{/if}}
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index 6fb9ecf7c6..30bc69e34d 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -85,7 +85,7 @@
             <label class="control-label">
               {{i18n "discourse_local_dates.create.form.recurring_title"}}
             </label>
-            <p>{{i18n "discourse_local_dates.create.form.recurring_description"}}</p>
+            <p>{{html-safe (i18n "discourse_local_dates.create.form.recurring_description")}}</p>
             <div class="controls">
               {{combo-box
                 content=recurringOptions

From ec2d49d48a9576a9d07f2c99b49bf3f6b79cd32f Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 12 Mar 2020 16:35:28 +0000
Subject: [PATCH 0200/1830] DEV: Allow plugins to add theme modifiers via db
 migrations (#9192)

---
 app/models/remote_theme.rb             |  2 +-
 app/models/theme.rb                    |  2 +-
 app/models/theme_modifier_set.rb       | 41 +++++++++++++++++++-------
 lib/theme_modifier_helper.rb           |  2 +-
 spec/models/theme_modifier_set_spec.rb |  6 ++++
 5 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb
index 6afa44c2a1..e95fe25c51 100644
--- a/app/models/remote_theme.rb
+++ b/app/models/remote_theme.rb
@@ -145,7 +145,7 @@ class RemoteTheme < ActiveRecord::Base
       raise ImportError, I18n.t("themes.import_error.about_json_values", errors: self.errors.full_messages.join(","))
     end
 
-    ThemeModifierSet::MODIFIERS.keys.each do |modifier_name|
+    ThemeModifierSet.modifiers.keys.each do |modifier_name|
       theme.theme_modifier_set.public_send(:"#{modifier_name}=", theme_info.dig("modifiers", modifier_name.to_s))
     end
     if !theme.theme_modifier_set.valid?
diff --git a/app/models/theme.rb b/app/models/theme.rb
index 35fd663092..c20e04d905 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -538,7 +538,7 @@ class Theme < ActiveRecord::Base
       end
 
       meta[:modifiers] = {}.tap do |hash|
-        ThemeModifierSet::MODIFIERS.keys.each do |modifier|
+        ThemeModifierSet.modifiers.keys.each do |modifier|
           value = self.theme_modifier_set.public_send(modifier)
           hash[modifier] = value if !value.nil?
         end
diff --git a/app/models/theme_modifier_set.rb b/app/models/theme_modifier_set.rb
index 262b0638ae..99a8818f58 100644
--- a/app/models/theme_modifier_set.rb
+++ b/app/models/theme_modifier_set.rb
@@ -4,16 +4,14 @@ class ThemeModifierSet < ActiveRecord::Base
 
   belongs_to :theme
 
-  MODIFIERS ||= {
-    serialize_topic_excerpts: { combine_mode: :any, type: :boolean },
-    csp_extensions: { combine_mode: :flatten, type: :string_array },
-    svg_icons: { combine_mode: :flatten, type: :string_array },
-  }
+  def self.modifiers
+    @modifiers ||= self.load_modifiers
+  end
 
   validate :type_validator
 
   def type_validator
-    MODIFIERS.each do |k, config|
+    ThemeModifierSet.modifiers.each do |k, config|
       value = public_send(k)
       next if value.nil?
 
@@ -39,18 +37,41 @@ class ThemeModifierSet < ActiveRecord::Base
   # Given the ids of multiple active themes / theme components, this function
   # will combine them into a 'resolved' behavior
   def self.resolve_modifier_for_themes(theme_ids, modifier_name)
-    return nil if !(config = MODIFIERS[modifier_name])
+    return nil if !(config = self.modifiers[modifier_name])
 
     all_values = self.where(theme_id: theme_ids).where.not(modifier_name => nil).pluck(modifier_name)
-    case config[:combine_mode]
-    when :any
+    case config[:type]
+    when :boolean
       all_values.any?
-    when :flatten
+    when :string_array
       all_values.flatten(1)
     else
       raise ThemeModifierSetError "Invalid theme modifier combine_mode"
     end
   end
+
+  private
+
+  # Build the list of modifiers from the DB schema.
+  # This allows plugins to introduce new modifiers by adding columns to the table
+  def self.load_modifiers
+    hash = {}
+    columns_hash.each do |column_name, info|
+      next if ["id", "theme_id"].include?(column_name)
+
+      type = nil
+      if info.type == :string && info.array?
+        type = :string_array
+      elsif info.type == :boolean && !info.array?
+        type = :boolean
+      else
+        raise ThemeModifierSetError "Invalid theme modifier column type" if ![:boolean, :string].include?(info.type)
+      end
+
+      hash[column_name.to_sym] = { type: type }
+    end
+    hash
+  end
 end
 
 # == Schema Information
diff --git a/lib/theme_modifier_helper.rb b/lib/theme_modifier_helper.rb
index 3d72a6d35a..74f49b322a 100644
--- a/lib/theme_modifier_helper.rb
+++ b/lib/theme_modifier_helper.rb
@@ -4,7 +4,7 @@ class ThemeModifierHelper
     @theme_ids = theme_ids || request&.env&.[](:resolved_theme_ids)
   end
 
-  ThemeModifierSet::MODIFIERS.keys.each do |modifier|
+  ThemeModifierSet.modifiers.keys.each do |modifier|
     define_method(modifier) do
       Theme.lookup_modifier(@theme_ids, modifier)
     end
diff --git a/spec/models/theme_modifier_set_spec.rb b/spec/models/theme_modifier_set_spec.rb
index ca770f339f..9e7cbf0e02 100644
--- a/spec/models/theme_modifier_set_spec.rb
+++ b/spec/models/theme_modifier_set_spec.rb
@@ -20,5 +20,11 @@ describe ThemeModifierSet do
 
       expect(ThemeModifierSet.resolve_modifier_for_themes([t1.id, t2.id], :serialize_topic_excerpts)).to eq(false)
     end
+
+    it "builds modifiers list from database" do
+      expect(ThemeModifierSet.modifiers.keys).to include(:serialize_topic_excerpts, :csp_extensions)
+      expect(ThemeModifierSet.modifiers[:serialize_topic_excerpts][:type]).to eq(:boolean)
+      expect(ThemeModifierSet.modifiers[:csp_extensions][:type]).to eq(:string_array)
+    end
   end
 end

From 032205e2029cbf82dc8f05b459fb93adf2503c60 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 12 Mar 2020 13:29:55 -0400
Subject: [PATCH 0201/1830] Rename many `.js.es6` files to `.js`

---
 .github/workflows/ci.yml                             |  2 +-
 Dangerfile                                           |  6 +++---
 .../{email-template.js.es6 => email-template.js}     |  0
 .../discourse/adapters/{group.js.es6 => group.js}    |  0
 .../{notification.js.es6 => notification.js}         |  0
 ...st-reply-history.js.es6 => post-reply-history.js} |  0
 .../adapters/{post-reply.js.es6 => post-reply.js}    |  0
 .../discourse/adapters/{post.js.es6 => post.js}      |  0
 .../discourse/adapters/{rest.js.es6 => rest.js}      |  0
 ...-explanation.js.es6 => reviewable-explanation.js} |  0
 ...ewable-settings.js.es6 => reviewable-settings.js} |  0
 .../{reviewable-topic.js.es6 => reviewable-topic.js} |  0
 .../adapters/{reviewable.js.es6 => reviewable.js}    |  0
 .../adapters/{tag-info.js.es6 => tag-info.js}        |  0
 .../{tag-notification.js.es6 => tag-notification.js} |  0
 .../adapters/{topic-list.js.es6 => topic-list.js}    |  0
 .../discourse/adapters/{topic.js.es6 => topic.js}    |  0
 .../{about-page-users.js.es6 => about-page-users.js} |  0
 ...vation-controls.js.es6 => activation-controls.js} |  0
 ...ag-classes.js.es6 => add-category-tag-classes.js} |  0
 .../{avatar-flair.js.es6 => avatar-flair.js}         |  0
 .../{avatar-uploader.js.es6 => avatar-uploader.js}   |  0
 .../{backup-codes.js.es6 => backup-codes.js}         |  0
 .../{backup-uploader.js.es6 => backup-uploader.js}   |  0
 .../{badge-button.js.es6 => badge-button.js}         |  0
 .../components/{badge-card.js.es6 => badge-card.js}  |  0
 .../{badge-selector.js.es6 => badge-selector.js}     |  0
 .../{badge-title.js.es6 => badge-title.js}           |  0
 .../{basic-topic-list.js.es6 => basic-topic-list.js} |  0
 ...-dropdown.js.es6 => bookmark-actions-dropdown.js} |  0
 .../{bread-crumbs.js.es6 => bread-crumbs.js}         |  0
 ...lk-select-button.js.es6 => bulk-select-button.js} |  0
 ...topics.js.es6 => categories-and-latest-topics.js} |  0
 ...op-topics.js.es6 => categories-and-top-topics.js} |  0
 ...-boxes-topic.js.es6 => categories-boxes-topic.js} |  0
 ...topics.js.es6 => categories-boxes-with-topics.js} |  0
 .../{categories-boxes.js.es6 => categories-boxes.js} |  0
 .../{categories-only.js.es6 => categories-only.js}   |  0
 ...es-topic-list.js.es6 => categories-topic-list.js} |  0
 ...-title-before.js.es6 => category-title-before.js} |  0
 ...gory-title-link.js.es6 => category-title-link.js} |  0
 .../{category-unread.js.es6 => category-unread.js}   |  0
 .../components/{cdn-img.js.es6 => cdn-img.js}        |  0
 .../{choose-message.js.es6 => choose-message.js}     |  0
 .../{choose-topic.js.es6 => choose-topic.js}         |  0
 ...r-picker-choice.js.es6 => color-picker-choice.js} |  0
 .../{color-picker.js.es6 => color-picker.js}         |  0
 ...-action-title.js.es6 => composer-action-title.js} |  0
 .../{composer-body.js.es6 => composer-body.js}       |  0
 .../{composer-editor.js.es6 => composer-editor.js}   |  0
 .../{composer-message.js.es6 => composer-message.js} |  0
 ...composer-messages.js.es6 => composer-messages.js} |  0
 ...er-save-button.js.es6 => composer-save-button.js} |  0
 .../{composer-title.js.es6 => composer-title.js}     |  0
 .../{composer-toggles.js.es6 => composer-toggles.js} |  0
 ...ser-selector.js.es6 => composer-user-selector.js} |  0
 ...section.js.es6 => conditional-loading-section.js} |  0
 ...spinner.js.es6 => conditional-loading-spinner.js} |  0
 ...ector-container.js.es6 => connector-container.js} |  0
 .../components/{cook-text.js.es6 => cook-text.js}    |  0
 .../components/{count-i18n.js.es6 => count-i18n.js}  |  0
 .../{create-account.js.es6 => create-account.js}     |  0
 ...te-topic-button.js.es6 => create-topic-button.js} |  0
 ...-topics-notice.js.es6 => create-topics-notice.js} |  0
 .../{csv-uploader.js.es6 => csv-uploader.js}         |  0
 .../{custom-html.js.es6 => custom-html.js}           |  0
 .../components/{d-button.js.es6 => d-button.js}      |  0
 .../components/{d-editor.js.es6 => d-editor.js}      |  0
 .../{d-modal-body.js.es6 => d-modal-body.js}         |  0
 .../{d-modal-cancel.js.es6 => d-modal-cancel.js}     |  0
 .../components/{d-modal.js.es6 => d-modal.js}        |  0
 .../{d-navigation.js.es6 => d-navigation.js}         |  0
 .../components/{d-section.js.es6 => d-section.js}    |  0
 .../components/{date-input.js.es6 => date-input.js}  |  0
 ...te-picker-future.js.es6 => date-picker-future.js} |  0
 .../{date-picker-past.js.es6 => date-picker-past.js} |  0
 .../{date-picker.js.es6 => date-picker.js}           |  0
 ...e-input-range.js.es6 => date-time-input-range.js} |  0
 .../{date-time-input.js.es6 => date-time-input.js}   |  0
 ...-config.js.es6 => desktop-notification-config.js} |  0
 .../{directory-item.js.es6 => directory-item.js}     |  0
 .../{directory-toggle.js.es6 => directory-toggle.js} |  0
 .../{disabled-icon.js.es6 => disabled-icon.js}       |  0
 .../{discourse-banner.js.es6 => discourse-banner.js} |  0
 ...e-linked-text.js.es6 => discourse-linked-text.js} |  0
 ...ourse-tag-bound.js.es6 => discourse-tag-bound.js} |  0
 .../{discourse-topic.js.es6 => discourse-topic.js}   |  0
 ...ery-categories.js.es6 => discovery-categories.js} |  0
 ...y-topics-list.js.es6 => discovery-topics-list.js} |  0
 ...egory-general.js.es6 => edit-category-general.js} |  0
 ...ategory-images.js.es6 => edit-category-images.js} |  0
 ...-category-panel.js.es6 => edit-category-panel.js} |  0
 ...ory-security.js.es6 => edit-category-security.js} |  0
 ...ory-settings.js.es6 => edit-category-settings.js} |  0
 ...edit-category-tab.js.es6 => edit-category-tab.js} |  0
 ...it-category-tags.js.es6 => edit-category-tags.js} |  0
 ...mplate.js.es6 => edit-category-topic-template.js} |  0
 ...ic-timer-form.js.es6 => edit-topic-timer-form.js} |  0
 .../{emoji-picker.js.es6 => emoji-picker.js}         |  0
 .../{emoji-uploader.js.es6 => emoji-uploader.js}     |  0
 .../{expand-post.js.es6 => expand-post.js}           |  0
 ...nding-text-area.js.es6 => expanding-text-area.js} |  0
 .../{featured-topic.js.es6 => featured-topic.js}     |  0
 .../{flag-action-type.js.es6 => flag-action-type.js} |  0
 .../{flag-selection.js.es6 => flag-selection.js}     |  0
 .../{flat-button.js.es6 => flat-button.js}           |  0
 .../{footer-message.js.es6 => footer-message.js}     |  0
 .../components/{footer-nav.js.es6 => footer-nav.js}  |  0
 ...future-date-input.js.es6 => future-date-input.js} |  0
 ...d-invite-link.js.es6 => generated-invite-link.js} |  0
 .../{global-notice.js.es6 => global-notice.js}       |  0
 .../{google-search.js.es6 => google-search.js}       |  0
 ...tivity-filter.js.es6 => group-activity-filter.js} |  0
 ...p-card-contents.js.es6 => group-card-contents.js} |  0
 ...oup-flair-inputs.js.es6 => group-flair-inputs.js} |  0
 ...oup-index-toggle.js.es6 => group-index-toggle.js} |  0
 ...ogs-filter.js.es6 => group-manage-logs-filter.js} |  0
 ...nage-logs-row.js.es6 => group-manage-logs-row.js} |  0
 ...ave-button.js.es6 => group-manage-save-button.js} |  0
 ...mber-dropdown.js.es6 => group-member-dropdown.js} |  0
 .../{group-member.js.es6 => group-member.js}         |  0
 ...ship-button.js.es6 => group-membership-button.js} |  0
 .../{group-navigation.js.es6 => group-navigation.js} |  0
 .../components/{group-post.js.es6 => group-post.js}  |  0
 .../{group-selector.js.es6 => group-selector.js}     |  0
 ...elds.js.es6 => groups-form-interaction-fields.js} |  0
 ...ields.js.es6 => groups-form-membership-fields.js} |  0
 ...e-fields.js.es6 => groups-form-profile-fields.js} |  0
 .../{groups-info.js.es6 => groups-info.js}           |  0
 ...header-extra-info.js.es6 => header-extra-info.js} |  0
 ...de-modal-trigger.js.es6 => hide-modal-trigger.js} |  0
 .../{highlight-text.js.es6 => highlight-text.js}     |  0
 .../{honeypot-input.js.es6 => honeypot-input.js}     |  0
 .../{iframed-html.js.es6 => iframed-html.js}         |  0
 ...er-list-item.js.es6 => ignored-user-list-item.js} |  0
 ...ignored-user-list.js.es6 => ignored-user-list.js} |  0
 .../{image-uploader.js.es6 => image-uploader.js}     |  0
 .../{images-uploader.js.es6 => images-uploader.js}   |  0
 .../components/{input-tip.js.es6 => input-tip.js}    |  0
 .../{invite-panel.js.es6 => invite-panel.js}         |  0
 ...ic-list-item.js.es6 => latest-topic-list-item.js} |  0
 .../{link-to-input.js.es6 => link-to-input.js}       |  0
 .../{links-redirect.js.es6 => links-redirect.js}     |  0
 .../components/{load-more.js.es6 => load-more.js}    |  0
 .../{login-buttons.js.es6 => login-buttons.js}       |  0
 .../{login-modal.js.es6 => login-modal.js}           |  0
 ...gin-reply-button.js.es6 => login-reply-button.js} |  0
 ...ategory-topic.js.es6 => mobile-category-topic.js} |  0
 .../components/{mobile-nav.js.es6 => mobile-nav.js}  |  0
 .../{modal-panel.js.es6 => modal-panel.js}           |  0
 .../components/{modal-tab.js.es6 => modal-tab.js}    |  0
 .../{mount-widget.js.es6 => mount-widget.js}         |  0
 .../components/{nav-item.js.es6 => nav-item.js}      |  0
 .../{navigation-bar.js.es6 => navigation-bar.js}     |  0
 .../{navigation-item.js.es6 => navigation-item.js}   |  0
 ...-banner.js.es6 => notification-consent-banner.js} |  0
 .../{number-field.js.es6 => number-field.js}         |  0
 .../{password-field.js.es6 => password-field.js}     |  0
 .../{plugin-connector.js.es6 => plugin-connector.js} |  0
 .../{plugin-outlet.js.es6 => plugin-outlet.js}       |  0
 .../{popup-input-tip.js.es6 => popup-input-tip.js}   |  0
 ...erence-checkbox.js.es6 => preference-checkbox.js} |  0
 ...message-glyph.js.es6 => private-message-glyph.js} |  0
 ...a-install-banner.js.es6 => pwa-install-banner.js} |  0
 .../{quote-button.js.es6 => quote-button.js}         |  0
 .../{radio-button.js.es6 => radio-button.js}         |  0
 .../{related-messages.js.es6 => related-messages.js} |  0
 ...ed-action.js.es6 => reviewable-bundled-action.js} |  0
 ...imed-topic.js.es6 => reviewable-claimed-topic.js} |  0
 ...n-post.js.es6 => reviewable-conversation-post.js} |  0
 ...-category.js.es6 => reviewable-field-category.js} |  0
 ...le-field-tags.js.es6 => reviewable-field-tags.js} |  0
 ...lagged-post.js.es6 => reviewable-flagged-post.js} |  0
 ...able-histories.js.es6 => reviewable-histories.js} |  0
 .../{reviewable-item.js.es6 => reviewable-item.js}   |  0
 ...-queued-post.js.es6 => reviewable-queued-post.js} |  0
 .../{reviewable-user.js.es6 => reviewable-user.js}   |  0
 .../{save-controls.js.es6 => save-controls.js}       |  0
 .../{scroll-tracker.js.es6 => scroll-tracker.js}     |  0
 ...g-post-stream.js.es6 => scrolling-post-stream.js} |  0
 ...ced-options.js.es6 => search-advanced-options.js} |  0
 ...search-text-field.js.es6 => search-text-field.js} |  0
 ...cond-factor-form.js.es6 => second-factor-form.js} |  0
 ...nd-factor-input.js.es6 => second-factor-input.js} |  0
 ...security-key-form.js.es6 => security-key-form.js} |  0
 .../{share-panel.js.es6 => share-panel.js}           |  0
 .../{share-popup.js.es6 => share-popup.js}           |  0
 .../{share-source.js.es6 => share-source.js}         |  0
 ...raft-controls.js.es6 => shared-draft-controls.js} |  0
 .../components/{signup-cta.js.es6 => signup-cta.js}  |  0
 .../{site-header.js.es6 => site-header.js}           |  0
 .../{suggested-topics.js.es6 => suggested-topics.js} |  0
 .../{tag-drop-link.js.es6 => tag-drop-link.js}       |  0
 .../{tag-groups-form.js.es6 => tag-groups-form.js}   |  0
 .../components/{tag-info.js.es6 => tag-info.js}      |  0
 .../components/{tag-list.js.es6 => tag-list.js}      |  0
 ...-admin-dropdown.js.es6 => tags-admin-dropdown.js} |  0
 .../{tap-tile-grid.js.es6 => tap-tile-grid.js}       |  0
 .../components/{tap-tile.js.es6 => tap-tile.js}      |  0
 .../components/{text-field.js.es6 => text-field.js}  |  0
 .../{text-overflow.js.es6 => text-overflow.js}       |  0
 .../components/{time-input.js.es6 => time-input.js}  |  0
 ...p-period-buttons.js.es6 => top-period-buttons.js} |  0
 ...menu-button.js.es6 => topic-admin-menu-button.js} |  0
 .../{topic-category.js.es6 => topic-category.js}     |  0
 .../{topic-entrance.js.es6 => topic-entrance.js}     |  0
 ...footer-buttons.js.es6 => topic-footer-buttons.js} |  0
 ...roup-notice.js.es6 => topic-join-group-notice.js} |  0
 .../{topic-list-item.js.es6 => topic-list-item.js}   |  0
 .../components/{topic-list.js.es6 => topic-list.js}  |  0
 .../{topic-navigation.js.es6 => topic-navigation.js} |  0
 ...topic-post-badges.js.es6 => topic-post-badges.js} |  0
 .../{topic-progress.js.es6 => topic-progress.js}     |  0
 .../{topic-status.js.es6 => topic-status.js}         |  0
 .../{topic-timeline.js.es6 => topic-timeline.js}     |  0
 .../{topic-timer-info.js.es6 => topic-timer-info.js} |  0
 .../{topic-title.js.es6 => topic-title.js}           |  0
 .../{track-selected.js.es6 => track-selected.js}     |  0
 .../components/{user-badge.js.es6 => user-badge.js}  |  0
 ...er-card-contents.js.es6 => user-card-contents.js} |  0
 .../components/{user-field.js.es6 => user-field.js}  |  0
 ...lag-percentage.js.es6 => user-flag-percentage.js} |  0
 .../components/{user-info.js.es6 => user-info.js}    |  0
 .../components/{user-link.js.es6 => user-link.js}    |  0
 ...ions-large.js.es6 => user-notifications-large.js} |  0
 .../{user-selector.js.es6 => user-selector.js}       |  0
 .../components/{user-stat.js.es6 => user-stat.js}    |  0
 .../{user-stream-item.js.es6 => user-stream-item.js} |  0
 .../{user-stream.js.es6 => user-stream.js}           |  0
 ...search.js.es6 => user-summary-category-search.js} |  0
 ...ummary-section.js.es6 => user-summary-section.js} |  0
 ...er-summary-topic.js.es6 => user-summary-topic.js} |  0
 ...opics-list.js.es6 => user-summary-topics-list.js} |  0
 ...user-summary-user.js.es6 => user-summary-user.js} |  0
 .../components/{watch-read.js.es6 => watch-read.js}  |  0
 .../discourse/controllers/{about.js.es6 => about.js} |  0
 ...it-email.js.es6 => account-created-edit-email.js} |  0
 ...created-index.js.es6 => account-created-index.js} |  0
 .../{activation-edit.js.es6 => activation-edit.js}   |  0
 .../{add-post-notice.js.es6 => add-post-notice.js}   |  0
 .../{application.js.es6 => application.js}           |  0
 ...t-confirm.js.es6 => associate-account-confirm.js} |  0
 .../controllers/{auth-token.js.es6 => auth-token.js} |  0
 .../{avatar-selector.js.es6 => avatar-selector.js}   |  0
 .../controllers/badges/{index.js.es6 => index.js}    |  0
 .../controllers/badges/{show.js.es6 => show.js}      |  0
 .../{basic-modal-body.js.es6 => basic-modal-body.js} |  0
 .../controllers/{bookmark.js.es6 => bookmark.js}     |  0
 ...ation-level.js.es6 => bulk-notification-level.js} |  0
 .../{change-owner.js.es6 => change-owner.js}         |  0
 .../{change-timestamp.js.es6 => change-timestamp.js} |  0
 .../controllers/{composer.js.es6 => composer.js}     |  0
 ...ublic-topic.js.es6 => convert-to-public-topic.js} |  0
 .../{create-account.js.es6 => create-account.js}     |  0
 ...scovery-sortable.js.es6 => discovery-sortable.js} |  0
 .../controllers/{discovery.js.es6 => discovery.js}   |  0
 .../discovery/{categories.js.es6 => categories.js}   |  0
 .../discovery/{topics.js.es6 => topics.js}           |  0
 .../{edit-category.js.es6 => edit-category.js}       |  0
 .../{edit-topic-timer.js.es6 => edit-topic-timer.js} |  0
 .../{email-login.js.es6 => email-login.js}           |  0
 .../controllers/{exception.js.es6 => exception.js}   |  0
 ...plain-reviewable.js.es6 => explain-reviewable.js} |  0
 ...on-profile.js.es6 => feature-topic-on-profile.js} |  0
 .../{feature-topic.js.es6 => feature-topic.js}       |  0
 .../discourse/controllers/{flag.js.es6 => flag.js}   |  0
 .../{forgot-password.js.es6 => forgot-password.js}   |  0
 .../{full-page-search.js.es6 => full-page-search.js} |  0
 .../{grant-badge.js.es6 => grant-badge.js}           |  0
 ...activity-posts.js.es6 => group-activity-posts.js} |  0
 ...tivity-topics.js.es6 => group-activity-topics.js} |  0
 .../{group-activity.js.es6 => group-activity.js}     |  0
 ...group-add-members.js.es6 => group-add-members.js} |  0
 .../{group-bulk-add.js.es6 => group-bulk-add.js}     |  0
 .../{group-index.js.es6 => group-index.js}           |  0
 ...group-manage-logs.js.es6 => group-manage-logs.js} |  0
 ...manage-profile.js.es6 => group-manage-profile.js} |  0
 .../{group-manage.js.es6 => group-manage.js}         |  0
 .../{group-messages.js.es6 => group-messages.js}     |  0
 .../{group-requests.js.es6 => group-requests.js}     |  0
 .../discourse/controllers/{group.js.es6 => group.js} |  0
 .../{groups-index.js.es6 => groups-index.js}         |  0
 .../controllers/{groups-new.js.es6 => groups-new.js} |  0
 .../controllers/{history.js.es6 => history.js}       |  0
 ...rname.js.es6 => ignore-duration-with-username.js} |  0
 .../{ignore-duration.js.es6 => ignore-duration.js}   |  0
 .../{insert-hyperlink.js.es6 => insert-hyperlink.js} |  0
 .../{invites-show.js.es6 => invites-show.js}         |  0
 .../{jump-to-post.js.es6 => jump-to-post.js}         |  0
 ...rtcuts-help.js.es6 => keyboard-shortcuts-help.js} |  0
 .../discourse/controllers/{login.js.es6 => login.js} |  0
 .../discourse/controllers/{modal.js.es6 => modal.js} |  0
 .../{move-to-topic.js.es6 => move-to-topic.js}       |  0
 .../navigation/{categories.js.es6 => categories.js}  |  0
 .../navigation/{category.js.es6 => category.js}      |  0
 .../navigation/{default.js.es6 => default.js}        |  0
 .../{not-activated.js.es6 => not-activated.js}       |  0
 .../{password-reset.js.es6 => password-reset.js}     |  0
 .../{preferences.js.es6 => preferences.js}           |  0
 .../preferences/{account.js.es6 => account.js}       |  0
 .../preferences/{categories.js.es6 => categories.js} |  0
 .../preferences/{email.js.es6 => email.js}           |  0
 .../preferences/{emails.js.es6 => emails.js}         |  0
 .../preferences/{interface.js.es6 => interface.js}   |  0
 .../{notifications.js.es6 => notifications.js}       |  0
 .../preferences/{profile.js.es6 => profile.js}       |  0
 .../{second-factor.js.es6 => second-factor.js}       |  0
 .../controllers/preferences/{tags.js.es6 => tags.js} |  0
 .../preferences/{username.js.es6 => username.js}     |  0
 .../preferences/{users.js.es6 => users.js}           |  0
 .../controllers/{raw-email.js.es6 => raw-email.js}   |  0
 .../controllers/{rename-tag.js.es6 => rename-tag.js} |  0
 ...order-categories.js.es6 => reorder-categories.js} |  0
 ...-form.js.es6 => request-group-membership-form.js} |  0
 .../{review-index.js.es6 => review-index.js}         |  0
 .../{review-settings.js.es6 => review-settings.js}   |  0
 ...-key.js.es6 => second-factor-add-security-key.js} |  0
 ...tor-add-totp.js.es6 => second-factor-add-totp.js} |  0
 ...ckup-edit.js.es6 => second-factor-backup-edit.js} |  0
 ...key.js.es6 => second-factor-edit-security-key.js} |  0
 ...cond-factor-edit.js.es6 => second-factor-edit.js} |  0
 .../controllers/{static.js.es6 => static.js}         |  0
 .../{tag-groups-edit.js.es6 => tag-groups-edit.js}   |  0
 .../{tag-groups-new.js.es6 => tag-groups-new.js}     |  0
 .../controllers/{tag-groups.js.es6 => tag-groups.js} |  0
 .../controllers/{tags-index.js.es6 => tags-index.js} |  0
 .../controllers/{tags-show.js.es6 => tags-show.js}   |  0
 ...pic-bulk-actions.js.es6 => topic-bulk-actions.js} |  0
 .../discourse/controllers/{topic.js.es6 => topic.js} |  0
 .../{upload-selector.js.es6 => upload-selector.js}   |  0
 ...es6 => user-activity-bookmarks-with-reminders.js} |  0
 .../{user-activity.js.es6 => user-activity.js}       |  0
 .../{user-badges.js.es6 => user-badges.js}           |  0
 .../controllers/{user-card.js.es6 => user-card.js}   |  0
 ...user-invited-show.js.es6 => user-invited-show.js} |  0
 ...er-notifications.js.es6 => user-notifications.js} |  0
 .../controllers/{user-posts.js.es6 => user-posts.js} |  0
 ...ges-tags.js.es6 => user-private-messages-tags.js} |  0
 ...vate-messages.js.es6 => user-private-messages.js} |  0
 .../{user-summary.js.es6 => user-summary.js}         |  0
 .../{user-topics-list.js.es6 => user-topics-list.js} |  0
 .../discourse/controllers/{user.js.es6 => user.js}   |  0
 .../discourse/controllers/{users.js.es6 => users.js} |  0
 .../helpers/{application.js.es6 => application.js}   |  0
 .../helpers/{border-color.js.es6 => border-color.js} |  0
 ...atar-template.js.es6 => bound-avatar-template.js} |  0
 .../helpers/{bound-avatar.js.es6 => bound-avatar.js} |  0
 ...d-category-link.js.es6 => bound-category-link.js} |  0
 .../helpers/{bound-date.js.es6 => bound-date.js}     |  0
 ...capitalize-string.js.es6 => capitalize-string.js} |  0
 .../{category-badge.js.es6 => category-badge.js}     |  0
 .../{category-link.js.es6 => category-link.js}       |  0
 .../{cold-age-class.js.es6 => cold-age-class.js}     |  0
 .../helpers/{custom-html.js.es6 => custom-html.js}   |  0
 .../{dash-if-empty.js.es6 => dash-if-empty.js}       |  0
 .../helpers/{dasherize.js.es6 => dasherize.js}       |  0
 .../helpers/{dir-span.js.es6 => dir-span.js}         |  0
 .../{discourse-tag.js.es6 => discourse-tag.js}       |  0
 .../{discourse-tags.js.es6 => discourse-tags.js}     |  0
 .../{editable-value.js.es6 => editable-value.js}     |  0
 .../helpers/{fa-icon-node.js.es6 => fa-icon-node.js} |  0
 .../discourse/helpers/{float.js.es6 => float.js}     |  0
 .../helpers/{format-age.js.es6 => format-age.js}     |  0
 .../helpers/{format-date.js.es6 => format-date.js}   |  0
 .../{format-username.js.es6 => format-username.js}   |  0
 .../{icon-or-image.js.es6 => icon-or-image.js}       |  0
 .../helpers/{inline-date.js.es6 => inline-date.js}   |  0
 .../discourse/helpers/{node.js.es6 => node.js}       |  0
 .../helpers/{period-title.js.es6 => period-title.js} |  0
 ...raw-plugin-outlet.js.es6 => raw-plugin-outlet.js} |  0
 .../discourse/helpers/{raw.js.es6 => raw.js}         |  0
 .../{replace-emoji.js.es6 => replace-emoji.js}       |  0
 ...tion.js.es6 => reviewable-history-description.js} |  0
 ...reviewable-status.js.es6 => reviewable-status.js} |  0
 .../helpers/{route-action.js.es6 => route-action.js} |  0
 .../helpers/{shorten-url.js.es6 => shorten-url.js}   |  0
 .../{theme-helpers.js.es6 => theme-helpers.js}       |  0
 ...c-featured-link.js.es6 => topic-featured-link.js} |  0
 .../helpers/{topic-link.js.es6 => topic-link.js}     |  0
 ...pic-status-icons.js.es6 => topic-status-icons.js} |  0
 .../helpers/{user-avatar.js.es6 => user-avatar.js}   |  0
 .../helpers/{user-status.js.es6 => user-status.js}   |  0
 .../{asset-version.js.es6 => asset-version.js}       |  0
 .../{auth-complete.js.es6 => auth-complete.js}       |  0
 ...auto-load-modules.js.es6 => auto-load-modules.js} |  0
 .../{avatar-select.js.es6 => avatar-select.js}       |  0
 .../initializers/{badging.js.es6 => badging.js}      |  0
 .../initializers/{banner.js.es6 => banner.js}        |  0
 ...click-interceptor.js.es6 => click-interceptor.js} |  0
 .../{csrf-token.js.es6 => csrf-token.js}             |  0
 .../initializers/{d-popover.js.es6 => d-popover.js}  |  0
 .../{ember-events.js.es6 => ember-events.js}         |  0
 .../{enable-emoji.js.es6 => enable-emoji.js}         |  0
 ...ensions.js.es6 => ensure-max-image-dimensions.js} |  0
 .../{inject-objects.js.es6 => inject-objects.js}     |  0
 .../{jquery-plugins.js.es6 => jquery-plugins.js}     |  0
 ...yboard-shortcuts.js.es6 => keyboard-shortcuts.js} |  0
 .../{live-development.js.es6 => live-development.js} |  0
 .../{localization.js.es6 => localization.js}         |  0
 .../initializers/{logout.js.es6 => logout.js}        |  0
 .../{logs-notice.js.es6 => logs-notice.js}           |  0
 .../{message-bus.js.es6 => message-bus.js}           |  0
 .../initializers/{mobile.js.es6 => mobile.js}        |  0
 .../{page-tracking.js.es6 => page-tracking.js}       |  0
 .../{post-decorations.js.es6 => post-decorations.js} |  0
 .../initializers/{read-only.js.es6 => read-only.js}  |  0
 ...ocation.js.es6 => register-discourse-location.js} |  0
 ...vice-worker.js.es6 => register-service-worker.js} |  0
 .../{relative-ages.js.es6 => relative-ages.js}       |  0
 .../{sharing-sources.js.es6 => sharing-sources.js}   |  0
 .../{show-footer.js.es6 => show-footer.js}           |  0
 .../{signup-cta.js.es6 => signup-cta.js}             |  0
 ...-params.js.es6 => strip-mobile-app-url-params.js} |  0
 ...ations.js.es6 => subscribe-user-notifications.js} |  0
 ...e-notifications.js.es6 => title-notifications.js} |  0
 ...footer-buttons.js.es6 => topic-footer-buttons.js} |  0
 .../{url-redirects.js.es6 => url-redirects.js}       |  0
 .../{after-transition.js.es6 => after-transition.js} |  0
 .../lib/{ajax-error.js.es6 => ajax-error.js}         |  0
 .../lib/{autocomplete.js.es6 => autocomplete.js}     |  0
 ...cached-topic-list.js.es6 => cached-topic-list.js} |  0
 ...category-hashtags.js.es6 => category-hashtags.js} |  0
 ...gory-tag-search.js.es6 => category-tag-search.js} |  0
 .../discourse/lib/{clean-dom.js.es6 => clean-dom.js} |  0
 .../lib/{click-track.js.es6 => click-track.js}       |  0
 .../discourse/lib/{computed.js.es6 => computed.js}   |  0
 .../discourse/lib/{copy-text.js.es6 => copy-text.js} |  0
 .../discourse/lib/{d-popover.js.es6 => d-popover.js} |  0
 .../discourse/lib/{debounce.js.es6 => debounce.js}   |  0
 .../lib/{decimal-adjust.js.es6 => decimal-adjust.js} |  0
 ...notifications.js.es6 => desktop-notifications.js} |  0
 .../lib/{dirty-keys.js.es6 => dirty-keys.js}         |  0
 ...scourse-location.js.es6 => discourse-location.js} |  0
 .../lib/{export-csv.js.es6 => export-csv.js}         |  0
 .../lib/{export-result.js.es6 => export-result.js}   |  0
 .../discourse/lib/{eyeline.js.es6 => eyeline.js}     |  0
 .../discourse/lib/{formatter.js.es6 => formatter.js} |  0
 .../discourse/lib/{hash.js.es6 => hash.js}           |  0
 .../{highlight-syntax.js.es6 => highlight-syntax.js} |  0
 .../lib/{highlight-text.js.es6 => highlight-text.js} |  0
 .../{intercept-click.js.es6 => intercept-click.js}   |  0
 ...-in-viewport.js.es6 => is-element-in-viewport.js} |  0
 .../{key-value-store.js.es6 => key-value-store.js}   |  0
 ...yboard-shortcuts.js.es6 => keyboard-shortcuts.js} |  0
 .../{lazy-load-images.js.es6 => lazy-load-images.js} |  0
 .../discourse/lib/{lightbox.js.es6 => lightbox.js}   |  0
 ...ory-hashtags.js.es6 => link-category-hashtags.js} |  0
 .../lib/{link-lookup.js.es6 => link-lookup.js}       |  0
 .../lib/{link-mentions.js.es6 => link-mentions.js}   |  0
 .../{link-tag-hashtag.js.es6 => link-tag-hashtag.js} |  0
 .../lib/{load-script.js.es6 => load-script.js}       |  0
 .../discourse/lib/{lock-on.js.es6 => lock-on.js}     |  0
 .../discourse/lib/{logout.js.es6 => logout.js}       |  0
 .../discourse/lib/{mobile.js.es6 => mobile.js}       |  0
 ...fication-levels.js.es6 => notification-levels.js} |  0
 ...offset-calculator.js.es6 => offset-calculator.js} |  0
 .../{optional-service.js.es6 => optional-service.js} |  0
 .../lib/{page-tracker.js.es6 => page-tracker.js}     |  0
 .../lib/{page-visible.js.es6 => page-visible.js}     |  0
 .../lib/{plugin-api.js.es6 => plugin-api.js}         |  0
 ...plugin-connectors.js.es6 => plugin-connectors.js} |  0
 ...laceholders.js.es6 => posts-with-placeholders.js} |  0
 ...sh-notifications.js.es6 => push-notifications.js} |  0
 .../discourse/lib/{pwa-utils.js.es6 => pwa-utils.js} |  0
 .../lib/{quote-state.js.es6 => quote-state.js}       |  0
 .../discourse/lib/{quote.js.es6 => quote.js}         |  0
 .../lib/{raw-templates.js.es6 => raw-templates.js}   |  0
 ...button.js.es6 => register-topic-footer-button.js} |  0
 .../lib/{render-tag.js.es6 => render-tag.js}         |  0
 .../lib/{render-tags.js.es6 => render-tags.js}       |  0
 ...red-link.js.es6 => render-topic-featured-link.js} |  0
 .../lib/{reports-loader.js.es6 => reports-loader.js} |  0
 .../discourse/lib/{round.js.es6 => round.js}         |  0
 .../lib/{safari-hacks.js.es6 => safari-hacks.js}     |  0
 .../lib/{screen-track.js.es6 => screen-track.js}     |  0
 .../discourse/lib/{search.js.es6 => search.js}       |  0
 .../discourse/lib/{settings.js.es6 => settings.js}   |  0
 .../discourse/lib/{sharing.js.es6 => sharing.js}     |  0
 .../lib/{show-modal.js.es6 => show-modal.js}         |  0
 ...-route-builder.js.es6 => static-route-builder.js} |  0
 ...svg-sprite-loader.js.es6 => svg-sprite-loader.js} |  0
 .../lib/{tag-hashtags.js.es6 => tag-hashtags.js}     |  0
 .../lib/{text-direction.js.es6 => text-direction.js} |  0
 .../discourse/lib/{text.js.es6 => text.js}           |  0
 .../lib/{theme-selector.js.es6 => theme-selector.js} |  0
 .../lib/{to-markdown.js.es6 => to-markdown.js}       |  0
 .../discourse/lib/{tooltip.js.es6 => tooltip.js}     |  0
 .../lib/{transform-post.js.es6 => transform-post.js} |  0
 .../discourse/lib/{uploads.js.es6 => uploads.js}     |  0
 .../javascripts/discourse/lib/{url.js.es6 => url.js} |  0
 .../{user-activation.js.es6 => user-activation.js}   |  0
 .../lib/{user-search.js.es6 => user-search.js}       |  0
 .../discourse/lib/{utilities.js.es6 => utilities.js} |  0
 .../discourse/lib/{webauthn.js.es6 => webauthn.js}   |  0
 .../{mapping-router.js.es6 => mapping-router.js}     |  0
 ...archetype-class.js.es6 => add-archetype-class.js} |  0
 .../{buffered-content.js.es6 => buffered-content.js} |  0
 ...opic-selection.js.es6 => bulk-topic-selection.js} |  0
 .../{can-check-emails.js.es6 => can-check-emails.js} |  0
 ...rd-contents-base.js.es6 => card-contents-base.js} |  0
 .../mixins/{cleans-up.js.es6 => cleans-up.js}        |  0
 .../discourse/mixins/{docking.js.es6 => docking.js}  |  0
 .../mixins/{filter-mode.js.es6 => filter-mode.js}    |  0
 ...e-controller.js.es6 => grant-badge-controller.js} |  0
 .../{key-enter-escape.js.es6 => key-enter-escape.js} |  0
 .../mixins/{load-more.js.es6 => load-more.js}        |  0
 ...l-direction.js.es6 => mobile-scroll-direction.js} |  0
 ...l-functionality.js.es6 => modal-functionality.js} |  0
 .../{name-validation.js.es6 => name-validation.js}   |  0
 .../{open-composer.js.es6 => open-composer.js}       |  0
 .../mixins/{pan-events.js.es6 => pan-events.js}      |  0
 ...word-validation.js.es6 => password-validation.js} |  0
 .../mixins/{scroll-top.js.es6 => scroll-top.js}      |  0
 .../mixins/{scrolling.js.es6 => scrolling.js}        |  0
 .../mixins/{singleton.js.es6 => singleton.js}        |  0
 .../discourse/mixins/{upload.js.es6 => upload.js}    |  0
 .../mixins/{url-refresh.js.es6 => url-refresh.js}    |  0
 ...s-validation.js.es6 => user-fields-validation.js} |  0
 ...name-validation.js.es6 => username-validation.js} |  0
 ...ing-action-type.js.es6 => viewing-action-type.js} |  0
 .../{action-summary.js.es6 => action-summary.js}     |  0
 .../models/{archetype.js.es6 => archetype.js}        |  0
 .../{badge-grouping.js.es6 => badge-grouping.js}     |  0
 .../discourse/models/{badge.js.es6 => badge.js}      |  0
 .../models/{bookmark.js.es6 => bookmark.js}          |  0
 .../{category-list.js.es6 => category-list.js}       |  0
 .../models/{category.js.es6 => category.js}          |  0
 .../models/{composer.js.es6 => composer.js}          |  0
 .../discourse/models/{draft.js.es6 => draft.js}      |  0
 .../{group-history.js.es6 => group-history.js}       |  0
 .../discourse/models/{group.js.es6 => group.js}      |  0
 .../discourse/models/{invite.js.es6 => invite.js}    |  0
 .../models/{login-method.js.es6 => login-method.js}  |  0
 .../models/{nav-item.js.es6 => nav-item.js}          |  0
 .../{permission-type.js.es6 => permission-type.js}   |  0
 .../{post-action-type.js.es6 => post-action-type.js} |  0
 .../models/{post-stream.js.es6 => post-stream.js}    |  0
 .../discourse/models/{post.js.es6 => post.js}        |  0
 .../discourse/models/{rest.js.es6 => rest.js}        |  0
 .../models/{result-set.js.es6 => result-set.js}      |  0
 ...viewable-history.js.es6 => reviewable-history.js} |  0
 .../models/{reviewable.js.es6 => reviewable.js}      |  0
 .../discourse/models/{session.js.es6 => session.js}  |  0
 .../discourse/models/{site.js.es6 => site.js}        |  0
 .../models/{static-page.js.es6 => static-page.js}    |  0
 .../discourse/models/{store.js.es6 => store.js}      |  0
 .../models/{tag-group.js.es6 => tag-group.js}        |  0
 .../discourse/models/{tag.js.es6 => tag.js}          |  0
 .../{topic-details.js.es6 => topic-details.js}       |  0
 .../models/{topic-list.js.es6 => topic-list.js}      |  0
 .../models/{topic-timer.js.es6 => topic-timer.js}    |  0
 ...tracking-state.js.es6 => topic-tracking-state.js} |  0
 .../discourse/models/{topic.js.es6 => topic.js}      |  0
 .../models/{trust-level.js.es6 => trust-level.js}    |  0
 ...user-action-group.js.es6 => user-action-group.js} |  0
 .../{user-action-stat.js.es6 => user-action-stat.js} |  0
 .../models/{user-action.js.es6 => user-action.js}    |  0
 .../models/{user-badge.js.es6 => user-badge.js}      |  0
 .../models/{user-draft.js.es6 => user-draft.js}      |  0
 ...er-drafts-stream.js.es6 => user-drafts-stream.js} |  0
 ...user-posts-stream.js.es6 => user-posts-stream.js} |  0
 .../models/{user-stream.js.es6 => user-stream.js}    |  0
 .../discourse/models/{user.js.es6 => user.js}        |  0
 ...ute-builders.js.es6 => dynamic-route-builders.js} |  0
 ...se-objects.js.es6 => inject-discourse-objects.js} |  0
 .../{map-routes.js.es6 => map-routes.js}             |  0
 ...om-templates.js.es6 => register-dom-templates.js} |  0
 ...iff-capabilities.js.es6 => sniff-capabilities.js} |  0
 ...-fontawesome.js.es6 => svg-sprite-fontawesome.js} |  0
 ...ount-or-badges.js.es6 => post-count-or-badges.js} |  0
 ...sts-count-column.js.es6 => posts-count-column.js} |  0
 .../list/{visited-line.js.es6 => visited-line.js}    |  0
 ...der-column.js.es6 => topic-list-header-column.js} |  0
 .../{topic-status.js.es6 => topic-status.js}         |  0
 .../discourse/routes/{about.js.es6 => about.js}      |  0
 ...it-email.js.es6 => account-created-edit-email.js} |  0
 ...created-index.js.es6 => account-created-index.js} |  0
 ...eated-resent.js.es6 => account-created-resent.js} |  0
 .../{account-created.js.es6 => account-created.js}   |  0
 .../{app-route-map.js.es6 => app-route-map.js}       |  0
 .../routes/{application.js.es6 => application.js}    |  0
 ...associate-account.js.es6 => associate-account.js} |  0
 .../routes/{badges-index.js.es6 => badges-index.js}  |  0
 .../routes/{badges-show.js.es6 => badges-show.js}    |  0
 ...-route.js.es6 => build-admin-user-posts-route.js} |  0
 ...category-route.js.es6 => build-category-route.js} |  0
 ...es-route.js.es6 => build-group-messages-route.js} |  0
 ...-route.js.es6 => build-private-messages-route.js} |  0
 ...ild-static-route.js.es6 => build-static-route.js} |  0
 ...build-topic-route.js.es6 => build-topic-route.js} |  0
 .../discourse/routes/{conduct.js.es6 => conduct.js}  |  0
 .../routes/{discourse.js.es6 => discourse.js}        |  0
 ...ery-categories.js.es6 => discovery-categories.js} |  0
 .../routes/{discovery.js.es6 => discovery.js}        |  0
 .../routes/{email-login.js.es6 => email-login.js}    |  0
 ...exception-unknown.js.es6 => exception-unknown.js} |  0
 .../routes/{exception.js.es6 => exception.js}        |  0
 .../discourse/routes/{faq.js.es6 => faq.js}          |  0
 .../{forgot-password.js.es6 => forgot-password.js}   |  0
 .../{full-page-search.js.es6 => full-page-search.js} |  0
 ...activity-index.js.es6 => group-activity-index.js} |  0
 ...ty-mentions.js.es6 => group-activity-mentions.js} |  0
 ...activity-posts.js.es6 => group-activity-posts.js} |  0
 ...tivity-topics.js.es6 => group-activity-topics.js} |  0
 .../routes/{group-index.js.es6 => group-index.js}    |  0
 ...oup-manage-index.js.es6 => group-manage-index.js} |  0
 ...nteraction.js.es6 => group-manage-interaction.js} |  0
 ...group-manage-logs.js.es6 => group-manage-logs.js} |  0
 ...-membership.js.es6 => group-manage-membership.js} |  0
 ...manage-profile.js.es6 => group-manage-profile.js} |  0
 .../routes/{group-manage.js.es6 => group-manage.js}  |  0
 .../{group-members.js.es6 => group-members.js}       |  0
 ...ages-archive.js.es6 => group-messages-archive.js} |  0
 ...messages-inbox.js.es6 => group-messages-inbox.js} |  0
 ...messages-index.js.es6 => group-messages-index.js} |  0
 .../{group-messages.js.es6 => group-messages.js}     |  0
 .../{group-requests.js.es6 => group-requests.js}     |  0
 .../discourse/routes/{group.js.es6 => group.js}      |  0
 .../routes/{groups-index.js.es6 => groups-index.js}  |  0
 .../routes/{groups-new.js.es6 => groups-new.js}      |  0
 .../routes/{guidelines.js.es6 => guidelines.js}      |  0
 .../routes/{invites-show.js.es6 => invites-show.js}  |  0
 .../discourse/routes/{login.js.es6 => login.js}      |  0
 .../routes/{new-message.js.es6 => new-message.js}    |  0
 .../routes/{new-topic.js.es6 => new-topic.js}        |  0
 .../{password-reset.js.es6 => password-reset.js}     |  0
 .../discourse/routes/{post.js.es6 => post.js}        |  0
 ...erences-account.js.es6 => preferences-account.js} |  0
 .../{preferences-apps.js.es6 => preferences-apps.js} |  0
 ...s-categories.js.es6 => preferences-categories.js} |  0
 ...preferences-email.js.es6 => preferences-email.js} |  0
 ...eferences-emails.js.es6 => preferences-emails.js} |  0
 ...preferences-index.js.es6 => preferences-index.js} |  0
 ...ces-interface.js.es6 => preferences-interface.js} |  0
 ...fications.js.es6 => preferences-notifications.js} |  0
 ...erences-profile.js.es6 => preferences-profile.js} |  0
 ...nd-factor.js.es6 => preferences-second-factor.js} |  0
 .../{preferences-tags.js.es6 => preferences-tags.js} |  0
 ...ences-username.js.es6 => preferences-username.js} |  0
 ...preferences-users.js.es6 => preferences-users.js} |  0
 .../routes/{preferences.js.es6 => preferences.js}    |  0
 .../discourse/routes/{privacy.js.es6 => privacy.js}  |  0
 .../{restricted-user.js.es6 => restricted-user.js}   |  0
 .../routes/{review-index.js.es6 => review-index.js}  |  0
 .../{review-settings.js.es6 => review-settings.js}   |  0
 .../routes/{review-show.js.es6 => review-show.js}    |  0
 .../{review-topics.js.es6 => review-topics.js}       |  0
 .../discourse/routes/{review.js.es6 => review.js}    |  0
 .../discourse/routes/{rules.js.es6 => rules.js}      |  0
 .../discourse/routes/{signup.js.es6 => signup.js}    |  0
 .../{tag-groups-edit.js.es6 => tag-groups-edit.js}   |  0
 .../{tag-groups-new.js.es6 => tag-groups-new.js}     |  0
 .../routes/{tag-groups.js.es6 => tag-groups.js}      |  0
 .../routes/{tags-index.js.es6 => tags-index.js}      |  0
 ...tags-intersection.js.es6 => tags-intersection.js} |  0
 .../routes/{tags-show.js.es6 => tags-show.js}        |  0
 ...c-by-slug-or-id.js.es6 => topic-by-slug-or-id.js} |  0
 ...-params-near.js.es6 => topic-from-params-near.js} |  0
 ...topic-from-params.js.es6 => topic-from-params.js} |  0
 .../discourse/routes/{topic.js.es6 => topic.js}      |  0
 .../discourse/routes/{tos.js.es6 => tos.js}          |  0
 .../discourse/routes/{unknown.js.es6 => unknown.js}  |  0
 ...es6 => user-activity-bookmarks-with-reminders.js} |  0
 ...y-bookmarks.js.es6 => user-activity-bookmarks.js} |  0
 ...ctivity-drafts.js.es6 => user-activity-drafts.js} |  0
 ...-activity-index.js.es6 => user-activity-index.js} |  0
 ...kes-given.js.es6 => user-activity-likes-given.js} |  0
 ...ivity-pending.js.es6 => user-activity-pending.js} |  0
 ...ivity-replies.js.es6 => user-activity-replies.js} |  0
 ...ctivity-stream.js.es6 => user-activity-stream.js} |  0
 ...ctivity-topics.js.es6 => user-activity-topics.js} |  0
 .../{user-activity.js.es6 => user-activity.js}       |  0
 .../routes/{user-badges.js.es6 => user-badges.js}    |  0
 ...er-deleted-posts.js.es6 => user-deleted-posts.js} |  0
 .../routes/{user-index.js.es6 => user-index.js}      |  0
 ...er-invited-index.js.es6 => user-invited-index.js} |  0
 ...user-invited-show.js.es6 => user-invited-show.js} |  0
 ...ions-edits.js.es6 => user-notifications-edits.js} |  0
 ...ions-index.js.es6 => user-notifications-index.js} |  0
 ...d.js.es6 => user-notifications-likes-received.js} |  0
 ...entions.js.es6 => user-notifications-mentions.js} |  0
 ...ponses.js.es6 => user-notifications-responses.js} |  0
 ...er-notifications.js.es6 => user-notifications.js} |  0
 ...chive.js.es6 => user-private-messages-archive.js} |  0
 ...js.es6 => user-private-messages-group-archive.js} |  0
 ...s-group.js.es6 => user-private-messages-group.js} |  0
 ...s-index.js.es6 => user-private-messages-index.js} |  0
 ...ges-sent.js.es6 => user-private-messages-sent.js} |  0
 ...how.js.es6 => user-private-messages-tags-show.js} |  0
 ...ges-tags.js.es6 => user-private-messages-tags.js} |  0
 ...vate-messages.js.es6 => user-private-messages.js} |  0
 .../routes/{user-summary.js.es6 => user-summary.js}  |  0
 .../{user-topic-list.js.es6 => user-topic-list.js}   |  0
 .../discourse/routes/{user.js.es6 => user.js}        |  0
 .../discourse/routes/{users.js.es6 => users.js}      |  0
 .../services/{app-events.js.es6 => app-events.js}    |  0
 .../services/{emoji-store.js.es6 => emoji-store.js}  |  0
 .../services/{logs-notice.js.es6 => logs-notice.js}  |  0
 .../discourse/services/{search.js.es6 => search.js}  |  0
 .../{theme-settings.js.es6 => theme-settings.js}     |  0
 .../{reviewable-score.js.es6 => reviewable-score.js} |  0
 .../{actions-summary.js.es6 => actions-summary.js}   |  0
 .../widgets/{avatar-flair.js.es6 => avatar-flair.js} |  0
 ...js.es6 => bookmark-reminder-notification-item.js} |  0
 .../discourse/widgets/{button.js.es6 => button.js}   |  0
 .../{category-link.js.es6 => category-link.js}       |  0
 ...onent-connector.js.es6 => component-connector.js} |  0
 .../widgets/{connector.js.es6 => connector.js}       |  0
 ...ation-item.js.es6 => custom-notification-item.js} |  0
 .../{decorator-helper.js.es6 => decorator-helper.js} |  0
 ...tion-item.js.es6 => default-notification-item.js} |  0
 .../{discourse-tags.js.es6 => discourse-tags.js}     |  0
 .../{embedded-post.js.es6 => embedded-post.js}       |  0
 .../discourse/widgets/{emoji.js.es6 => emoji.js}     |  0
 .../widgets/{footer-nav.js.es6 => footer-nav.js}     |  0
 .../discourse/widgets/{glue.js.es6 => glue.js}       |  0
 ...s6 => group-message-summary-notification-item.js} |  0
 ...ger-categories.js.es6 => hamburger-categories.js} |  0
 .../{hamburger-menu.js.es6 => hamburger-menu.js}     |  0
 .../widgets/{hbs-compiler.js.es6 => hbs-compiler.js} |  0
 .../{header-contents.js.es6 => header-contents.js}   |  0
 ...header-topic-info.js.es6 => header-topic-info.js} |  0
 .../discourse/widgets/{header.js.es6 => header.js}   |  0
 .../widgets/{home-logo.js.es6 => home-logo.js}       |  0
 .../discourse/widgets/{hooks.js.es6 => hooks.js}     |  0
 ....js.es6 => invitee-accepted-notification-item.js} |  0
 ...s.es6 => liked-consolidated-notification-item.js} |  0
 ...cation-item.js.es6 => liked-notification-item.js} |  0
 .../discourse/widgets/{link.js.es6 => link.js}       |  0
 ...membership-request-accepted-notification-item.js} |  0
 ...ership-request-consolidated-notification-item.js} |  0
 .../widgets/{menu-panel.js.es6 => menu-panel.js}     |  0
 .../{post-admin-menu.js.es6 => post-admin-menu.js}   |  0
 .../widgets/{post-cooked.js.es6 => post-cooked.js}   |  0
 ...dits-indicator.js.es6 => post-edits-indicator.js} |  0
 .../widgets/{post-gap.js.es6 => post-gap.js}         |  0
 .../widgets/{post-links.js.es6 => post-links.js}     |  0
 .../widgets/{post-menu.js.es6 => post-menu.js}       |  0
 .../{post-placeholder.js.es6 => post-placeholder.js} |  0
 ...post-small-action.js.es6 => post-small-action.js} |  0
 .../widgets/{post-stream.js.es6 => post-stream.js}   |  0
 .../discourse/widgets/{post.js.es6 => post.js}       |  0
 .../widgets/{poster-name.js.es6 => poster-name.js}   |  0
 ...ate-message-map.js.es6 => private-message-map.js} |  0
 ...ss-bookmarks.js.es6 => quick-access-bookmarks.js} |  0
 ...quick-access-item.js.es6 => quick-access-item.js} |  0
 ...cess-messages.js.es6 => quick-access-messages.js} |  0
 ...ications.js.es6 => quick-access-notifications.js} |  0
 ...ick-access-panel.js.es6 => quick-access-panel.js} |  0
 ...access-profile.js.es6 => quick-access-profile.js} |  0
 .../widgets/{raw-html.js.es6 => raw-html.js}         |  0
 ...-menu-controls.js.es6 => search-menu-controls.js} |  0
 ...ch-menu-results.js.es6 => search-menu-results.js} |  0
 .../widgets/{search-menu.js.es6 => search-menu.js}   |  0
 .../widgets/{time-gap.js.es6 => time-gap.js}         |  0
 ...-topic-summary.js.es6 => toggle-topic-summary.js} |  0
 .../{topic-admin-menu.js.es6 => topic-admin-menu.js} |  0
 .../widgets/{topic-map.js.es6 => topic-map.js}       |  0
 .../widgets/{topic-status.js.es6 => topic-status.js} |  0
 .../{topic-timeline.js.es6 => topic-timeline.js}     |  0
 .../widgets/{user-menu.js.es6 => user-menu.js}       |  0
 ...ions-large.js.es6 => user-notifications-large.js} |  0
 .../discourse/widgets/{widget.js.es6 => widget.js}   |  0
 lefthook.yml                                         | 12 +++++++++---
 764 files changed, 13 insertions(+), 7 deletions(-)
 rename app/assets/javascripts/discourse/adapters/{email-template.js.es6 => email-template.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{group.js.es6 => group.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{notification.js.es6 => notification.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{post-reply-history.js.es6 => post-reply-history.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{post-reply.js.es6 => post-reply.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{post.js.es6 => post.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{rest.js.es6 => rest.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{reviewable-explanation.js.es6 => reviewable-explanation.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{reviewable-settings.js.es6 => reviewable-settings.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{reviewable-topic.js.es6 => reviewable-topic.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{reviewable.js.es6 => reviewable.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{tag-info.js.es6 => tag-info.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{tag-notification.js.es6 => tag-notification.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{topic-list.js.es6 => topic-list.js} (100%)
 rename app/assets/javascripts/discourse/adapters/{topic.js.es6 => topic.js} (100%)
 rename app/assets/javascripts/discourse/components/{about-page-users.js.es6 => about-page-users.js} (100%)
 rename app/assets/javascripts/discourse/components/{activation-controls.js.es6 => activation-controls.js} (100%)
 rename app/assets/javascripts/discourse/components/{add-category-tag-classes.js.es6 => add-category-tag-classes.js} (100%)
 rename app/assets/javascripts/discourse/components/{avatar-flair.js.es6 => avatar-flair.js} (100%)
 rename app/assets/javascripts/discourse/components/{avatar-uploader.js.es6 => avatar-uploader.js} (100%)
 rename app/assets/javascripts/discourse/components/{backup-codes.js.es6 => backup-codes.js} (100%)
 rename app/assets/javascripts/discourse/components/{backup-uploader.js.es6 => backup-uploader.js} (100%)
 rename app/assets/javascripts/discourse/components/{badge-button.js.es6 => badge-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{badge-card.js.es6 => badge-card.js} (100%)
 rename app/assets/javascripts/discourse/components/{badge-selector.js.es6 => badge-selector.js} (100%)
 rename app/assets/javascripts/discourse/components/{badge-title.js.es6 => badge-title.js} (100%)
 rename app/assets/javascripts/discourse/components/{basic-topic-list.js.es6 => basic-topic-list.js} (100%)
 rename app/assets/javascripts/discourse/components/{bookmark-actions-dropdown.js.es6 => bookmark-actions-dropdown.js} (100%)
 rename app/assets/javascripts/discourse/components/{bread-crumbs.js.es6 => bread-crumbs.js} (100%)
 rename app/assets/javascripts/discourse/components/{bulk-select-button.js.es6 => bulk-select-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{categories-and-latest-topics.js.es6 => categories-and-latest-topics.js} (100%)
 rename app/assets/javascripts/discourse/components/{categories-and-top-topics.js.es6 => categories-and-top-topics.js} (100%)
 rename app/assets/javascripts/discourse/components/{categories-boxes-topic.js.es6 => categories-boxes-topic.js} (100%)
 rename app/assets/javascripts/discourse/components/{categories-boxes-with-topics.js.es6 => categories-boxes-with-topics.js} (100%)
 rename app/assets/javascripts/discourse/components/{categories-boxes.js.es6 => categories-boxes.js} (100%)
 rename app/assets/javascripts/discourse/components/{categories-only.js.es6 => categories-only.js} (100%)
 rename app/assets/javascripts/discourse/components/{categories-topic-list.js.es6 => categories-topic-list.js} (100%)
 rename app/assets/javascripts/discourse/components/{category-title-before.js.es6 => category-title-before.js} (100%)
 rename app/assets/javascripts/discourse/components/{category-title-link.js.es6 => category-title-link.js} (100%)
 rename app/assets/javascripts/discourse/components/{category-unread.js.es6 => category-unread.js} (100%)
 rename app/assets/javascripts/discourse/components/{cdn-img.js.es6 => cdn-img.js} (100%)
 rename app/assets/javascripts/discourse/components/{choose-message.js.es6 => choose-message.js} (100%)
 rename app/assets/javascripts/discourse/components/{choose-topic.js.es6 => choose-topic.js} (100%)
 rename app/assets/javascripts/discourse/components/{color-picker-choice.js.es6 => color-picker-choice.js} (100%)
 rename app/assets/javascripts/discourse/components/{color-picker.js.es6 => color-picker.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-action-title.js.es6 => composer-action-title.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-body.js.es6 => composer-body.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-editor.js.es6 => composer-editor.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-message.js.es6 => composer-message.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-messages.js.es6 => composer-messages.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-save-button.js.es6 => composer-save-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-title.js.es6 => composer-title.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-toggles.js.es6 => composer-toggles.js} (100%)
 rename app/assets/javascripts/discourse/components/{composer-user-selector.js.es6 => composer-user-selector.js} (100%)
 rename app/assets/javascripts/discourse/components/{conditional-loading-section.js.es6 => conditional-loading-section.js} (100%)
 rename app/assets/javascripts/discourse/components/{conditional-loading-spinner.js.es6 => conditional-loading-spinner.js} (100%)
 rename app/assets/javascripts/discourse/components/{connector-container.js.es6 => connector-container.js} (100%)
 rename app/assets/javascripts/discourse/components/{cook-text.js.es6 => cook-text.js} (100%)
 rename app/assets/javascripts/discourse/components/{count-i18n.js.es6 => count-i18n.js} (100%)
 rename app/assets/javascripts/discourse/components/{create-account.js.es6 => create-account.js} (100%)
 rename app/assets/javascripts/discourse/components/{create-topic-button.js.es6 => create-topic-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{create-topics-notice.js.es6 => create-topics-notice.js} (100%)
 rename app/assets/javascripts/discourse/components/{csv-uploader.js.es6 => csv-uploader.js} (100%)
 rename app/assets/javascripts/discourse/components/{custom-html.js.es6 => custom-html.js} (100%)
 rename app/assets/javascripts/discourse/components/{d-button.js.es6 => d-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{d-editor.js.es6 => d-editor.js} (100%)
 rename app/assets/javascripts/discourse/components/{d-modal-body.js.es6 => d-modal-body.js} (100%)
 rename app/assets/javascripts/discourse/components/{d-modal-cancel.js.es6 => d-modal-cancel.js} (100%)
 rename app/assets/javascripts/discourse/components/{d-modal.js.es6 => d-modal.js} (100%)
 rename app/assets/javascripts/discourse/components/{d-navigation.js.es6 => d-navigation.js} (100%)
 rename app/assets/javascripts/discourse/components/{d-section.js.es6 => d-section.js} (100%)
 rename app/assets/javascripts/discourse/components/{date-input.js.es6 => date-input.js} (100%)
 rename app/assets/javascripts/discourse/components/{date-picker-future.js.es6 => date-picker-future.js} (100%)
 rename app/assets/javascripts/discourse/components/{date-picker-past.js.es6 => date-picker-past.js} (100%)
 rename app/assets/javascripts/discourse/components/{date-picker.js.es6 => date-picker.js} (100%)
 rename app/assets/javascripts/discourse/components/{date-time-input-range.js.es6 => date-time-input-range.js} (100%)
 rename app/assets/javascripts/discourse/components/{date-time-input.js.es6 => date-time-input.js} (100%)
 rename app/assets/javascripts/discourse/components/{desktop-notification-config.js.es6 => desktop-notification-config.js} (100%)
 rename app/assets/javascripts/discourse/components/{directory-item.js.es6 => directory-item.js} (100%)
 rename app/assets/javascripts/discourse/components/{directory-toggle.js.es6 => directory-toggle.js} (100%)
 rename app/assets/javascripts/discourse/components/{disabled-icon.js.es6 => disabled-icon.js} (100%)
 rename app/assets/javascripts/discourse/components/{discourse-banner.js.es6 => discourse-banner.js} (100%)
 rename app/assets/javascripts/discourse/components/{discourse-linked-text.js.es6 => discourse-linked-text.js} (100%)
 rename app/assets/javascripts/discourse/components/{discourse-tag-bound.js.es6 => discourse-tag-bound.js} (100%)
 rename app/assets/javascripts/discourse/components/{discourse-topic.js.es6 => discourse-topic.js} (100%)
 rename app/assets/javascripts/discourse/components/{discovery-categories.js.es6 => discovery-categories.js} (100%)
 rename app/assets/javascripts/discourse/components/{discovery-topics-list.js.es6 => discovery-topics-list.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-category-general.js.es6 => edit-category-general.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-category-images.js.es6 => edit-category-images.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-category-panel.js.es6 => edit-category-panel.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-category-security.js.es6 => edit-category-security.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-category-settings.js.es6 => edit-category-settings.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-category-tab.js.es6 => edit-category-tab.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-category-tags.js.es6 => edit-category-tags.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-category-topic-template.js.es6 => edit-category-topic-template.js} (100%)
 rename app/assets/javascripts/discourse/components/{edit-topic-timer-form.js.es6 => edit-topic-timer-form.js} (100%)
 rename app/assets/javascripts/discourse/components/{emoji-picker.js.es6 => emoji-picker.js} (100%)
 rename app/assets/javascripts/discourse/components/{emoji-uploader.js.es6 => emoji-uploader.js} (100%)
 rename app/assets/javascripts/discourse/components/{expand-post.js.es6 => expand-post.js} (100%)
 rename app/assets/javascripts/discourse/components/{expanding-text-area.js.es6 => expanding-text-area.js} (100%)
 rename app/assets/javascripts/discourse/components/{featured-topic.js.es6 => featured-topic.js} (100%)
 rename app/assets/javascripts/discourse/components/{flag-action-type.js.es6 => flag-action-type.js} (100%)
 rename app/assets/javascripts/discourse/components/{flag-selection.js.es6 => flag-selection.js} (100%)
 rename app/assets/javascripts/discourse/components/{flat-button.js.es6 => flat-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{footer-message.js.es6 => footer-message.js} (100%)
 rename app/assets/javascripts/discourse/components/{footer-nav.js.es6 => footer-nav.js} (100%)
 rename app/assets/javascripts/discourse/components/{future-date-input.js.es6 => future-date-input.js} (100%)
 rename app/assets/javascripts/discourse/components/{generated-invite-link.js.es6 => generated-invite-link.js} (100%)
 rename app/assets/javascripts/discourse/components/{global-notice.js.es6 => global-notice.js} (100%)
 rename app/assets/javascripts/discourse/components/{google-search.js.es6 => google-search.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-activity-filter.js.es6 => group-activity-filter.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-card-contents.js.es6 => group-card-contents.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-flair-inputs.js.es6 => group-flair-inputs.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-index-toggle.js.es6 => group-index-toggle.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-manage-logs-filter.js.es6 => group-manage-logs-filter.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-manage-logs-row.js.es6 => group-manage-logs-row.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-manage-save-button.js.es6 => group-manage-save-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-member-dropdown.js.es6 => group-member-dropdown.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-member.js.es6 => group-member.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-membership-button.js.es6 => group-membership-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-navigation.js.es6 => group-navigation.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-post.js.es6 => group-post.js} (100%)
 rename app/assets/javascripts/discourse/components/{group-selector.js.es6 => group-selector.js} (100%)
 rename app/assets/javascripts/discourse/components/{groups-form-interaction-fields.js.es6 => groups-form-interaction-fields.js} (100%)
 rename app/assets/javascripts/discourse/components/{groups-form-membership-fields.js.es6 => groups-form-membership-fields.js} (100%)
 rename app/assets/javascripts/discourse/components/{groups-form-profile-fields.js.es6 => groups-form-profile-fields.js} (100%)
 rename app/assets/javascripts/discourse/components/{groups-info.js.es6 => groups-info.js} (100%)
 rename app/assets/javascripts/discourse/components/{header-extra-info.js.es6 => header-extra-info.js} (100%)
 rename app/assets/javascripts/discourse/components/{hide-modal-trigger.js.es6 => hide-modal-trigger.js} (100%)
 rename app/assets/javascripts/discourse/components/{highlight-text.js.es6 => highlight-text.js} (100%)
 rename app/assets/javascripts/discourse/components/{honeypot-input.js.es6 => honeypot-input.js} (100%)
 rename app/assets/javascripts/discourse/components/{iframed-html.js.es6 => iframed-html.js} (100%)
 rename app/assets/javascripts/discourse/components/{ignored-user-list-item.js.es6 => ignored-user-list-item.js} (100%)
 rename app/assets/javascripts/discourse/components/{ignored-user-list.js.es6 => ignored-user-list.js} (100%)
 rename app/assets/javascripts/discourse/components/{image-uploader.js.es6 => image-uploader.js} (100%)
 rename app/assets/javascripts/discourse/components/{images-uploader.js.es6 => images-uploader.js} (100%)
 rename app/assets/javascripts/discourse/components/{input-tip.js.es6 => input-tip.js} (100%)
 rename app/assets/javascripts/discourse/components/{invite-panel.js.es6 => invite-panel.js} (100%)
 rename app/assets/javascripts/discourse/components/{latest-topic-list-item.js.es6 => latest-topic-list-item.js} (100%)
 rename app/assets/javascripts/discourse/components/{link-to-input.js.es6 => link-to-input.js} (100%)
 rename app/assets/javascripts/discourse/components/{links-redirect.js.es6 => links-redirect.js} (100%)
 rename app/assets/javascripts/discourse/components/{load-more.js.es6 => load-more.js} (100%)
 rename app/assets/javascripts/discourse/components/{login-buttons.js.es6 => login-buttons.js} (100%)
 rename app/assets/javascripts/discourse/components/{login-modal.js.es6 => login-modal.js} (100%)
 rename app/assets/javascripts/discourse/components/{login-reply-button.js.es6 => login-reply-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{mobile-category-topic.js.es6 => mobile-category-topic.js} (100%)
 rename app/assets/javascripts/discourse/components/{mobile-nav.js.es6 => mobile-nav.js} (100%)
 rename app/assets/javascripts/discourse/components/{modal-panel.js.es6 => modal-panel.js} (100%)
 rename app/assets/javascripts/discourse/components/{modal-tab.js.es6 => modal-tab.js} (100%)
 rename app/assets/javascripts/discourse/components/{mount-widget.js.es6 => mount-widget.js} (100%)
 rename app/assets/javascripts/discourse/components/{nav-item.js.es6 => nav-item.js} (100%)
 rename app/assets/javascripts/discourse/components/{navigation-bar.js.es6 => navigation-bar.js} (100%)
 rename app/assets/javascripts/discourse/components/{navigation-item.js.es6 => navigation-item.js} (100%)
 rename app/assets/javascripts/discourse/components/{notification-consent-banner.js.es6 => notification-consent-banner.js} (100%)
 rename app/assets/javascripts/discourse/components/{number-field.js.es6 => number-field.js} (100%)
 rename app/assets/javascripts/discourse/components/{password-field.js.es6 => password-field.js} (100%)
 rename app/assets/javascripts/discourse/components/{plugin-connector.js.es6 => plugin-connector.js} (100%)
 rename app/assets/javascripts/discourse/components/{plugin-outlet.js.es6 => plugin-outlet.js} (100%)
 rename app/assets/javascripts/discourse/components/{popup-input-tip.js.es6 => popup-input-tip.js} (100%)
 rename app/assets/javascripts/discourse/components/{preference-checkbox.js.es6 => preference-checkbox.js} (100%)
 rename app/assets/javascripts/discourse/components/{private-message-glyph.js.es6 => private-message-glyph.js} (100%)
 rename app/assets/javascripts/discourse/components/{pwa-install-banner.js.es6 => pwa-install-banner.js} (100%)
 rename app/assets/javascripts/discourse/components/{quote-button.js.es6 => quote-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{radio-button.js.es6 => radio-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{related-messages.js.es6 => related-messages.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-bundled-action.js.es6 => reviewable-bundled-action.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-claimed-topic.js.es6 => reviewable-claimed-topic.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-conversation-post.js.es6 => reviewable-conversation-post.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-field-category.js.es6 => reviewable-field-category.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-field-tags.js.es6 => reviewable-field-tags.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-flagged-post.js.es6 => reviewable-flagged-post.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-histories.js.es6 => reviewable-histories.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-item.js.es6 => reviewable-item.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-queued-post.js.es6 => reviewable-queued-post.js} (100%)
 rename app/assets/javascripts/discourse/components/{reviewable-user.js.es6 => reviewable-user.js} (100%)
 rename app/assets/javascripts/discourse/components/{save-controls.js.es6 => save-controls.js} (100%)
 rename app/assets/javascripts/discourse/components/{scroll-tracker.js.es6 => scroll-tracker.js} (100%)
 rename app/assets/javascripts/discourse/components/{scrolling-post-stream.js.es6 => scrolling-post-stream.js} (100%)
 rename app/assets/javascripts/discourse/components/{search-advanced-options.js.es6 => search-advanced-options.js} (100%)
 rename app/assets/javascripts/discourse/components/{search-text-field.js.es6 => search-text-field.js} (100%)
 rename app/assets/javascripts/discourse/components/{second-factor-form.js.es6 => second-factor-form.js} (100%)
 rename app/assets/javascripts/discourse/components/{second-factor-input.js.es6 => second-factor-input.js} (100%)
 rename app/assets/javascripts/discourse/components/{security-key-form.js.es6 => security-key-form.js} (100%)
 rename app/assets/javascripts/discourse/components/{share-panel.js.es6 => share-panel.js} (100%)
 rename app/assets/javascripts/discourse/components/{share-popup.js.es6 => share-popup.js} (100%)
 rename app/assets/javascripts/discourse/components/{share-source.js.es6 => share-source.js} (100%)
 rename app/assets/javascripts/discourse/components/{shared-draft-controls.js.es6 => shared-draft-controls.js} (100%)
 rename app/assets/javascripts/discourse/components/{signup-cta.js.es6 => signup-cta.js} (100%)
 rename app/assets/javascripts/discourse/components/{site-header.js.es6 => site-header.js} (100%)
 rename app/assets/javascripts/discourse/components/{suggested-topics.js.es6 => suggested-topics.js} (100%)
 rename app/assets/javascripts/discourse/components/{tag-drop-link.js.es6 => tag-drop-link.js} (100%)
 rename app/assets/javascripts/discourse/components/{tag-groups-form.js.es6 => tag-groups-form.js} (100%)
 rename app/assets/javascripts/discourse/components/{tag-info.js.es6 => tag-info.js} (100%)
 rename app/assets/javascripts/discourse/components/{tag-list.js.es6 => tag-list.js} (100%)
 rename app/assets/javascripts/discourse/components/{tags-admin-dropdown.js.es6 => tags-admin-dropdown.js} (100%)
 rename app/assets/javascripts/discourse/components/{tap-tile-grid.js.es6 => tap-tile-grid.js} (100%)
 rename app/assets/javascripts/discourse/components/{tap-tile.js.es6 => tap-tile.js} (100%)
 rename app/assets/javascripts/discourse/components/{text-field.js.es6 => text-field.js} (100%)
 rename app/assets/javascripts/discourse/components/{text-overflow.js.es6 => text-overflow.js} (100%)
 rename app/assets/javascripts/discourse/components/{time-input.js.es6 => time-input.js} (100%)
 rename app/assets/javascripts/discourse/components/{top-period-buttons.js.es6 => top-period-buttons.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-admin-menu-button.js.es6 => topic-admin-menu-button.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-category.js.es6 => topic-category.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-entrance.js.es6 => topic-entrance.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-footer-buttons.js.es6 => topic-footer-buttons.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-join-group-notice.js.es6 => topic-join-group-notice.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-list-item.js.es6 => topic-list-item.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-list.js.es6 => topic-list.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-navigation.js.es6 => topic-navigation.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-post-badges.js.es6 => topic-post-badges.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-progress.js.es6 => topic-progress.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-status.js.es6 => topic-status.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-timeline.js.es6 => topic-timeline.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-timer-info.js.es6 => topic-timer-info.js} (100%)
 rename app/assets/javascripts/discourse/components/{topic-title.js.es6 => topic-title.js} (100%)
 rename app/assets/javascripts/discourse/components/{track-selected.js.es6 => track-selected.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-badge.js.es6 => user-badge.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-card-contents.js.es6 => user-card-contents.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-field.js.es6 => user-field.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-flag-percentage.js.es6 => user-flag-percentage.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-info.js.es6 => user-info.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-link.js.es6 => user-link.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-notifications-large.js.es6 => user-notifications-large.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-selector.js.es6 => user-selector.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-stat.js.es6 => user-stat.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-stream-item.js.es6 => user-stream-item.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-stream.js.es6 => user-stream.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-summary-category-search.js.es6 => user-summary-category-search.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-summary-section.js.es6 => user-summary-section.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-summary-topic.js.es6 => user-summary-topic.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-summary-topics-list.js.es6 => user-summary-topics-list.js} (100%)
 rename app/assets/javascripts/discourse/components/{user-summary-user.js.es6 => user-summary-user.js} (100%)
 rename app/assets/javascripts/discourse/components/{watch-read.js.es6 => watch-read.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{about.js.es6 => about.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{account-created-edit-email.js.es6 => account-created-edit-email.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{account-created-index.js.es6 => account-created-index.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{activation-edit.js.es6 => activation-edit.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{add-post-notice.js.es6 => add-post-notice.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{application.js.es6 => application.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{associate-account-confirm.js.es6 => associate-account-confirm.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{auth-token.js.es6 => auth-token.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{avatar-selector.js.es6 => avatar-selector.js} (100%)
 rename app/assets/javascripts/discourse/controllers/badges/{index.js.es6 => index.js} (100%)
 rename app/assets/javascripts/discourse/controllers/badges/{show.js.es6 => show.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{basic-modal-body.js.es6 => basic-modal-body.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{bookmark.js.es6 => bookmark.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{bulk-notification-level.js.es6 => bulk-notification-level.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{change-owner.js.es6 => change-owner.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{change-timestamp.js.es6 => change-timestamp.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{composer.js.es6 => composer.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{convert-to-public-topic.js.es6 => convert-to-public-topic.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{create-account.js.es6 => create-account.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{discovery-sortable.js.es6 => discovery-sortable.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{discovery.js.es6 => discovery.js} (100%)
 rename app/assets/javascripts/discourse/controllers/discovery/{categories.js.es6 => categories.js} (100%)
 rename app/assets/javascripts/discourse/controllers/discovery/{topics.js.es6 => topics.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{edit-category.js.es6 => edit-category.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{edit-topic-timer.js.es6 => edit-topic-timer.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{email-login.js.es6 => email-login.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{exception.js.es6 => exception.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{explain-reviewable.js.es6 => explain-reviewable.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{feature-topic-on-profile.js.es6 => feature-topic-on-profile.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{feature-topic.js.es6 => feature-topic.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{flag.js.es6 => flag.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{forgot-password.js.es6 => forgot-password.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{full-page-search.js.es6 => full-page-search.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{grant-badge.js.es6 => grant-badge.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-activity-posts.js.es6 => group-activity-posts.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-activity-topics.js.es6 => group-activity-topics.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-activity.js.es6 => group-activity.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-add-members.js.es6 => group-add-members.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-bulk-add.js.es6 => group-bulk-add.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-index.js.es6 => group-index.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-manage-logs.js.es6 => group-manage-logs.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-manage-profile.js.es6 => group-manage-profile.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-manage.js.es6 => group-manage.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-messages.js.es6 => group-messages.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group-requests.js.es6 => group-requests.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{group.js.es6 => group.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{groups-index.js.es6 => groups-index.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{groups-new.js.es6 => groups-new.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{history.js.es6 => history.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{ignore-duration-with-username.js.es6 => ignore-duration-with-username.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{ignore-duration.js.es6 => ignore-duration.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{insert-hyperlink.js.es6 => insert-hyperlink.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{invites-show.js.es6 => invites-show.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{jump-to-post.js.es6 => jump-to-post.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{keyboard-shortcuts-help.js.es6 => keyboard-shortcuts-help.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{login.js.es6 => login.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{modal.js.es6 => modal.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{move-to-topic.js.es6 => move-to-topic.js} (100%)
 rename app/assets/javascripts/discourse/controllers/navigation/{categories.js.es6 => categories.js} (100%)
 rename app/assets/javascripts/discourse/controllers/navigation/{category.js.es6 => category.js} (100%)
 rename app/assets/javascripts/discourse/controllers/navigation/{default.js.es6 => default.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{not-activated.js.es6 => not-activated.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{password-reset.js.es6 => password-reset.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{preferences.js.es6 => preferences.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{account.js.es6 => account.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{categories.js.es6 => categories.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{email.js.es6 => email.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{emails.js.es6 => emails.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{interface.js.es6 => interface.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{notifications.js.es6 => notifications.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{profile.js.es6 => profile.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{second-factor.js.es6 => second-factor.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{tags.js.es6 => tags.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{username.js.es6 => username.js} (100%)
 rename app/assets/javascripts/discourse/controllers/preferences/{users.js.es6 => users.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{raw-email.js.es6 => raw-email.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{rename-tag.js.es6 => rename-tag.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{reorder-categories.js.es6 => reorder-categories.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{request-group-membership-form.js.es6 => request-group-membership-form.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{review-index.js.es6 => review-index.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{review-settings.js.es6 => review-settings.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{second-factor-add-security-key.js.es6 => second-factor-add-security-key.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{second-factor-add-totp.js.es6 => second-factor-add-totp.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{second-factor-backup-edit.js.es6 => second-factor-backup-edit.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{second-factor-edit-security-key.js.es6 => second-factor-edit-security-key.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{second-factor-edit.js.es6 => second-factor-edit.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{static.js.es6 => static.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{tag-groups-edit.js.es6 => tag-groups-edit.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{tag-groups-new.js.es6 => tag-groups-new.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{tag-groups.js.es6 => tag-groups.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{tags-index.js.es6 => tags-index.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{tags-show.js.es6 => tags-show.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{topic-bulk-actions.js.es6 => topic-bulk-actions.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{topic.js.es6 => topic.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{upload-selector.js.es6 => upload-selector.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-activity-bookmarks-with-reminders.js.es6 => user-activity-bookmarks-with-reminders.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-activity.js.es6 => user-activity.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-badges.js.es6 => user-badges.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-card.js.es6 => user-card.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-invited-show.js.es6 => user-invited-show.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-notifications.js.es6 => user-notifications.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-posts.js.es6 => user-posts.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-private-messages-tags.js.es6 => user-private-messages-tags.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-private-messages.js.es6 => user-private-messages.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-summary.js.es6 => user-summary.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user-topics-list.js.es6 => user-topics-list.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{user.js.es6 => user.js} (100%)
 rename app/assets/javascripts/discourse/controllers/{users.js.es6 => users.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{application.js.es6 => application.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{border-color.js.es6 => border-color.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{bound-avatar-template.js.es6 => bound-avatar-template.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{bound-avatar.js.es6 => bound-avatar.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{bound-category-link.js.es6 => bound-category-link.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{bound-date.js.es6 => bound-date.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{capitalize-string.js.es6 => capitalize-string.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{category-badge.js.es6 => category-badge.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{category-link.js.es6 => category-link.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{cold-age-class.js.es6 => cold-age-class.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{custom-html.js.es6 => custom-html.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{dash-if-empty.js.es6 => dash-if-empty.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{dasherize.js.es6 => dasherize.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{dir-span.js.es6 => dir-span.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{discourse-tag.js.es6 => discourse-tag.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{discourse-tags.js.es6 => discourse-tags.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{editable-value.js.es6 => editable-value.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{fa-icon-node.js.es6 => fa-icon-node.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{float.js.es6 => float.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{format-age.js.es6 => format-age.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{format-date.js.es6 => format-date.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{format-username.js.es6 => format-username.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{icon-or-image.js.es6 => icon-or-image.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{inline-date.js.es6 => inline-date.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{node.js.es6 => node.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{period-title.js.es6 => period-title.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{raw-plugin-outlet.js.es6 => raw-plugin-outlet.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{raw.js.es6 => raw.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{replace-emoji.js.es6 => replace-emoji.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{reviewable-history-description.js.es6 => reviewable-history-description.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{reviewable-status.js.es6 => reviewable-status.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{route-action.js.es6 => route-action.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{shorten-url.js.es6 => shorten-url.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{theme-helpers.js.es6 => theme-helpers.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{topic-featured-link.js.es6 => topic-featured-link.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{topic-link.js.es6 => topic-link.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{topic-status-icons.js.es6 => topic-status-icons.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{user-avatar.js.es6 => user-avatar.js} (100%)
 rename app/assets/javascripts/discourse/helpers/{user-status.js.es6 => user-status.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{asset-version.js.es6 => asset-version.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{auth-complete.js.es6 => auth-complete.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{auto-load-modules.js.es6 => auto-load-modules.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{avatar-select.js.es6 => avatar-select.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{badging.js.es6 => badging.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{banner.js.es6 => banner.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{click-interceptor.js.es6 => click-interceptor.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{csrf-token.js.es6 => csrf-token.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{d-popover.js.es6 => d-popover.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{ember-events.js.es6 => ember-events.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{enable-emoji.js.es6 => enable-emoji.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{ensure-max-image-dimensions.js.es6 => ensure-max-image-dimensions.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{inject-objects.js.es6 => inject-objects.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{jquery-plugins.js.es6 => jquery-plugins.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{keyboard-shortcuts.js.es6 => keyboard-shortcuts.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{live-development.js.es6 => live-development.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{localization.js.es6 => localization.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{logout.js.es6 => logout.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{logs-notice.js.es6 => logs-notice.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{message-bus.js.es6 => message-bus.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{mobile.js.es6 => mobile.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{page-tracking.js.es6 => page-tracking.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{post-decorations.js.es6 => post-decorations.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{read-only.js.es6 => read-only.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{register-discourse-location.js.es6 => register-discourse-location.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{register-service-worker.js.es6 => register-service-worker.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{relative-ages.js.es6 => relative-ages.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{sharing-sources.js.es6 => sharing-sources.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{show-footer.js.es6 => show-footer.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{signup-cta.js.es6 => signup-cta.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{strip-mobile-app-url-params.js.es6 => strip-mobile-app-url-params.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{subscribe-user-notifications.js.es6 => subscribe-user-notifications.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{title-notifications.js.es6 => title-notifications.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{topic-footer-buttons.js.es6 => topic-footer-buttons.js} (100%)
 rename app/assets/javascripts/discourse/initializers/{url-redirects.js.es6 => url-redirects.js} (100%)
 rename app/assets/javascripts/discourse/lib/{after-transition.js.es6 => after-transition.js} (100%)
 rename app/assets/javascripts/discourse/lib/{ajax-error.js.es6 => ajax-error.js} (100%)
 rename app/assets/javascripts/discourse/lib/{autocomplete.js.es6 => autocomplete.js} (100%)
 rename app/assets/javascripts/discourse/lib/{cached-topic-list.js.es6 => cached-topic-list.js} (100%)
 rename app/assets/javascripts/discourse/lib/{category-hashtags.js.es6 => category-hashtags.js} (100%)
 rename app/assets/javascripts/discourse/lib/{category-tag-search.js.es6 => category-tag-search.js} (100%)
 rename app/assets/javascripts/discourse/lib/{clean-dom.js.es6 => clean-dom.js} (100%)
 rename app/assets/javascripts/discourse/lib/{click-track.js.es6 => click-track.js} (100%)
 rename app/assets/javascripts/discourse/lib/{computed.js.es6 => computed.js} (100%)
 rename app/assets/javascripts/discourse/lib/{copy-text.js.es6 => copy-text.js} (100%)
 rename app/assets/javascripts/discourse/lib/{d-popover.js.es6 => d-popover.js} (100%)
 rename app/assets/javascripts/discourse/lib/{debounce.js.es6 => debounce.js} (100%)
 rename app/assets/javascripts/discourse/lib/{decimal-adjust.js.es6 => decimal-adjust.js} (100%)
 rename app/assets/javascripts/discourse/lib/{desktop-notifications.js.es6 => desktop-notifications.js} (100%)
 rename app/assets/javascripts/discourse/lib/{dirty-keys.js.es6 => dirty-keys.js} (100%)
 rename app/assets/javascripts/discourse/lib/{discourse-location.js.es6 => discourse-location.js} (100%)
 rename app/assets/javascripts/discourse/lib/{export-csv.js.es6 => export-csv.js} (100%)
 rename app/assets/javascripts/discourse/lib/{export-result.js.es6 => export-result.js} (100%)
 rename app/assets/javascripts/discourse/lib/{eyeline.js.es6 => eyeline.js} (100%)
 rename app/assets/javascripts/discourse/lib/{formatter.js.es6 => formatter.js} (100%)
 rename app/assets/javascripts/discourse/lib/{hash.js.es6 => hash.js} (100%)
 rename app/assets/javascripts/discourse/lib/{highlight-syntax.js.es6 => highlight-syntax.js} (100%)
 rename app/assets/javascripts/discourse/lib/{highlight-text.js.es6 => highlight-text.js} (100%)
 rename app/assets/javascripts/discourse/lib/{intercept-click.js.es6 => intercept-click.js} (100%)
 rename app/assets/javascripts/discourse/lib/{is-element-in-viewport.js.es6 => is-element-in-viewport.js} (100%)
 rename app/assets/javascripts/discourse/lib/{key-value-store.js.es6 => key-value-store.js} (100%)
 rename app/assets/javascripts/discourse/lib/{keyboard-shortcuts.js.es6 => keyboard-shortcuts.js} (100%)
 rename app/assets/javascripts/discourse/lib/{lazy-load-images.js.es6 => lazy-load-images.js} (100%)
 rename app/assets/javascripts/discourse/lib/{lightbox.js.es6 => lightbox.js} (100%)
 rename app/assets/javascripts/discourse/lib/{link-category-hashtags.js.es6 => link-category-hashtags.js} (100%)
 rename app/assets/javascripts/discourse/lib/{link-lookup.js.es6 => link-lookup.js} (100%)
 rename app/assets/javascripts/discourse/lib/{link-mentions.js.es6 => link-mentions.js} (100%)
 rename app/assets/javascripts/discourse/lib/{link-tag-hashtag.js.es6 => link-tag-hashtag.js} (100%)
 rename app/assets/javascripts/discourse/lib/{load-script.js.es6 => load-script.js} (100%)
 rename app/assets/javascripts/discourse/lib/{lock-on.js.es6 => lock-on.js} (100%)
 rename app/assets/javascripts/discourse/lib/{logout.js.es6 => logout.js} (100%)
 rename app/assets/javascripts/discourse/lib/{mobile.js.es6 => mobile.js} (100%)
 rename app/assets/javascripts/discourse/lib/{notification-levels.js.es6 => notification-levels.js} (100%)
 rename app/assets/javascripts/discourse/lib/{offset-calculator.js.es6 => offset-calculator.js} (100%)
 rename app/assets/javascripts/discourse/lib/{optional-service.js.es6 => optional-service.js} (100%)
 rename app/assets/javascripts/discourse/lib/{page-tracker.js.es6 => page-tracker.js} (100%)
 rename app/assets/javascripts/discourse/lib/{page-visible.js.es6 => page-visible.js} (100%)
 rename app/assets/javascripts/discourse/lib/{plugin-api.js.es6 => plugin-api.js} (100%)
 rename app/assets/javascripts/discourse/lib/{plugin-connectors.js.es6 => plugin-connectors.js} (100%)
 rename app/assets/javascripts/discourse/lib/{posts-with-placeholders.js.es6 => posts-with-placeholders.js} (100%)
 rename app/assets/javascripts/discourse/lib/{push-notifications.js.es6 => push-notifications.js} (100%)
 rename app/assets/javascripts/discourse/lib/{pwa-utils.js.es6 => pwa-utils.js} (100%)
 rename app/assets/javascripts/discourse/lib/{quote-state.js.es6 => quote-state.js} (100%)
 rename app/assets/javascripts/discourse/lib/{quote.js.es6 => quote.js} (100%)
 rename app/assets/javascripts/discourse/lib/{raw-templates.js.es6 => raw-templates.js} (100%)
 rename app/assets/javascripts/discourse/lib/{register-topic-footer-button.js.es6 => register-topic-footer-button.js} (100%)
 rename app/assets/javascripts/discourse/lib/{render-tag.js.es6 => render-tag.js} (100%)
 rename app/assets/javascripts/discourse/lib/{render-tags.js.es6 => render-tags.js} (100%)
 rename app/assets/javascripts/discourse/lib/{render-topic-featured-link.js.es6 => render-topic-featured-link.js} (100%)
 rename app/assets/javascripts/discourse/lib/{reports-loader.js.es6 => reports-loader.js} (100%)
 rename app/assets/javascripts/discourse/lib/{round.js.es6 => round.js} (100%)
 rename app/assets/javascripts/discourse/lib/{safari-hacks.js.es6 => safari-hacks.js} (100%)
 rename app/assets/javascripts/discourse/lib/{screen-track.js.es6 => screen-track.js} (100%)
 rename app/assets/javascripts/discourse/lib/{search.js.es6 => search.js} (100%)
 rename app/assets/javascripts/discourse/lib/{settings.js.es6 => settings.js} (100%)
 rename app/assets/javascripts/discourse/lib/{sharing.js.es6 => sharing.js} (100%)
 rename app/assets/javascripts/discourse/lib/{show-modal.js.es6 => show-modal.js} (100%)
 rename app/assets/javascripts/discourse/lib/{static-route-builder.js.es6 => static-route-builder.js} (100%)
 rename app/assets/javascripts/discourse/lib/{svg-sprite-loader.js.es6 => svg-sprite-loader.js} (100%)
 rename app/assets/javascripts/discourse/lib/{tag-hashtags.js.es6 => tag-hashtags.js} (100%)
 rename app/assets/javascripts/discourse/lib/{text-direction.js.es6 => text-direction.js} (100%)
 rename app/assets/javascripts/discourse/lib/{text.js.es6 => text.js} (100%)
 rename app/assets/javascripts/discourse/lib/{theme-selector.js.es6 => theme-selector.js} (100%)
 rename app/assets/javascripts/discourse/lib/{to-markdown.js.es6 => to-markdown.js} (100%)
 rename app/assets/javascripts/discourse/lib/{tooltip.js.es6 => tooltip.js} (100%)
 rename app/assets/javascripts/discourse/lib/{transform-post.js.es6 => transform-post.js} (100%)
 rename app/assets/javascripts/discourse/lib/{uploads.js.es6 => uploads.js} (100%)
 rename app/assets/javascripts/discourse/lib/{url.js.es6 => url.js} (100%)
 rename app/assets/javascripts/discourse/lib/{user-activation.js.es6 => user-activation.js} (100%)
 rename app/assets/javascripts/discourse/lib/{user-search.js.es6 => user-search.js} (100%)
 rename app/assets/javascripts/discourse/lib/{utilities.js.es6 => utilities.js} (100%)
 rename app/assets/javascripts/discourse/lib/{webauthn.js.es6 => webauthn.js} (100%)
 rename app/assets/javascripts/discourse/{mapping-router.js.es6 => mapping-router.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{add-archetype-class.js.es6 => add-archetype-class.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{buffered-content.js.es6 => buffered-content.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{bulk-topic-selection.js.es6 => bulk-topic-selection.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{can-check-emails.js.es6 => can-check-emails.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{card-contents-base.js.es6 => card-contents-base.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{cleans-up.js.es6 => cleans-up.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{docking.js.es6 => docking.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{filter-mode.js.es6 => filter-mode.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{grant-badge-controller.js.es6 => grant-badge-controller.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{key-enter-escape.js.es6 => key-enter-escape.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{load-more.js.es6 => load-more.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{mobile-scroll-direction.js.es6 => mobile-scroll-direction.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{modal-functionality.js.es6 => modal-functionality.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{name-validation.js.es6 => name-validation.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{open-composer.js.es6 => open-composer.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{pan-events.js.es6 => pan-events.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{password-validation.js.es6 => password-validation.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{scroll-top.js.es6 => scroll-top.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{scrolling.js.es6 => scrolling.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{singleton.js.es6 => singleton.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{upload.js.es6 => upload.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{url-refresh.js.es6 => url-refresh.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{user-fields-validation.js.es6 => user-fields-validation.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{username-validation.js.es6 => username-validation.js} (100%)
 rename app/assets/javascripts/discourse/mixins/{viewing-action-type.js.es6 => viewing-action-type.js} (100%)
 rename app/assets/javascripts/discourse/models/{action-summary.js.es6 => action-summary.js} (100%)
 rename app/assets/javascripts/discourse/models/{archetype.js.es6 => archetype.js} (100%)
 rename app/assets/javascripts/discourse/models/{badge-grouping.js.es6 => badge-grouping.js} (100%)
 rename app/assets/javascripts/discourse/models/{badge.js.es6 => badge.js} (100%)
 rename app/assets/javascripts/discourse/models/{bookmark.js.es6 => bookmark.js} (100%)
 rename app/assets/javascripts/discourse/models/{category-list.js.es6 => category-list.js} (100%)
 rename app/assets/javascripts/discourse/models/{category.js.es6 => category.js} (100%)
 rename app/assets/javascripts/discourse/models/{composer.js.es6 => composer.js} (100%)
 rename app/assets/javascripts/discourse/models/{draft.js.es6 => draft.js} (100%)
 rename app/assets/javascripts/discourse/models/{group-history.js.es6 => group-history.js} (100%)
 rename app/assets/javascripts/discourse/models/{group.js.es6 => group.js} (100%)
 rename app/assets/javascripts/discourse/models/{invite.js.es6 => invite.js} (100%)
 rename app/assets/javascripts/discourse/models/{login-method.js.es6 => login-method.js} (100%)
 rename app/assets/javascripts/discourse/models/{nav-item.js.es6 => nav-item.js} (100%)
 rename app/assets/javascripts/discourse/models/{permission-type.js.es6 => permission-type.js} (100%)
 rename app/assets/javascripts/discourse/models/{post-action-type.js.es6 => post-action-type.js} (100%)
 rename app/assets/javascripts/discourse/models/{post-stream.js.es6 => post-stream.js} (100%)
 rename app/assets/javascripts/discourse/models/{post.js.es6 => post.js} (100%)
 rename app/assets/javascripts/discourse/models/{rest.js.es6 => rest.js} (100%)
 rename app/assets/javascripts/discourse/models/{result-set.js.es6 => result-set.js} (100%)
 rename app/assets/javascripts/discourse/models/{reviewable-history.js.es6 => reviewable-history.js} (100%)
 rename app/assets/javascripts/discourse/models/{reviewable.js.es6 => reviewable.js} (100%)
 rename app/assets/javascripts/discourse/models/{session.js.es6 => session.js} (100%)
 rename app/assets/javascripts/discourse/models/{site.js.es6 => site.js} (100%)
 rename app/assets/javascripts/discourse/models/{static-page.js.es6 => static-page.js} (100%)
 rename app/assets/javascripts/discourse/models/{store.js.es6 => store.js} (100%)
 rename app/assets/javascripts/discourse/models/{tag-group.js.es6 => tag-group.js} (100%)
 rename app/assets/javascripts/discourse/models/{tag.js.es6 => tag.js} (100%)
 rename app/assets/javascripts/discourse/models/{topic-details.js.es6 => topic-details.js} (100%)
 rename app/assets/javascripts/discourse/models/{topic-list.js.es6 => topic-list.js} (100%)
 rename app/assets/javascripts/discourse/models/{topic-timer.js.es6 => topic-timer.js} (100%)
 rename app/assets/javascripts/discourse/models/{topic-tracking-state.js.es6 => topic-tracking-state.js} (100%)
 rename app/assets/javascripts/discourse/models/{topic.js.es6 => topic.js} (100%)
 rename app/assets/javascripts/discourse/models/{trust-level.js.es6 => trust-level.js} (100%)
 rename app/assets/javascripts/discourse/models/{user-action-group.js.es6 => user-action-group.js} (100%)
 rename app/assets/javascripts/discourse/models/{user-action-stat.js.es6 => user-action-stat.js} (100%)
 rename app/assets/javascripts/discourse/models/{user-action.js.es6 => user-action.js} (100%)
 rename app/assets/javascripts/discourse/models/{user-badge.js.es6 => user-badge.js} (100%)
 rename app/assets/javascripts/discourse/models/{user-draft.js.es6 => user-draft.js} (100%)
 rename app/assets/javascripts/discourse/models/{user-drafts-stream.js.es6 => user-drafts-stream.js} (100%)
 rename app/assets/javascripts/discourse/models/{user-posts-stream.js.es6 => user-posts-stream.js} (100%)
 rename app/assets/javascripts/discourse/models/{user-stream.js.es6 => user-stream.js} (100%)
 rename app/assets/javascripts/discourse/models/{user.js.es6 => user.js} (100%)
 rename app/assets/javascripts/discourse/pre-initializers/{dynamic-route-builders.js.es6 => dynamic-route-builders.js} (100%)
 rename app/assets/javascripts/discourse/pre-initializers/{inject-discourse-objects.js.es6 => inject-discourse-objects.js} (100%)
 rename app/assets/javascripts/discourse/pre-initializers/{map-routes.js.es6 => map-routes.js} (100%)
 rename app/assets/javascripts/discourse/pre-initializers/{register-dom-templates.js.es6 => register-dom-templates.js} (100%)
 rename app/assets/javascripts/discourse/pre-initializers/{sniff-capabilities.js.es6 => sniff-capabilities.js} (100%)
 rename app/assets/javascripts/discourse/pre-initializers/{svg-sprite-fontawesome.js.es6 => svg-sprite-fontawesome.js} (100%)
 rename app/assets/javascripts/discourse/raw-views/list/{post-count-or-badges.js.es6 => post-count-or-badges.js} (100%)
 rename app/assets/javascripts/discourse/raw-views/list/{posts-count-column.js.es6 => posts-count-column.js} (100%)
 rename app/assets/javascripts/discourse/raw-views/list/{visited-line.js.es6 => visited-line.js} (100%)
 rename app/assets/javascripts/discourse/raw-views/{topic-list-header-column.js.es6 => topic-list-header-column.js} (100%)
 rename app/assets/javascripts/discourse/raw-views/{topic-status.js.es6 => topic-status.js} (100%)
 rename app/assets/javascripts/discourse/routes/{about.js.es6 => about.js} (100%)
 rename app/assets/javascripts/discourse/routes/{account-created-edit-email.js.es6 => account-created-edit-email.js} (100%)
 rename app/assets/javascripts/discourse/routes/{account-created-index.js.es6 => account-created-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{account-created-resent.js.es6 => account-created-resent.js} (100%)
 rename app/assets/javascripts/discourse/routes/{account-created.js.es6 => account-created.js} (100%)
 rename app/assets/javascripts/discourse/routes/{app-route-map.js.es6 => app-route-map.js} (100%)
 rename app/assets/javascripts/discourse/routes/{application.js.es6 => application.js} (100%)
 rename app/assets/javascripts/discourse/routes/{associate-account.js.es6 => associate-account.js} (100%)
 rename app/assets/javascripts/discourse/routes/{badges-index.js.es6 => badges-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{badges-show.js.es6 => badges-show.js} (100%)
 rename app/assets/javascripts/discourse/routes/{build-admin-user-posts-route.js.es6 => build-admin-user-posts-route.js} (100%)
 rename app/assets/javascripts/discourse/routes/{build-category-route.js.es6 => build-category-route.js} (100%)
 rename app/assets/javascripts/discourse/routes/{build-group-messages-route.js.es6 => build-group-messages-route.js} (100%)
 rename app/assets/javascripts/discourse/routes/{build-private-messages-route.js.es6 => build-private-messages-route.js} (100%)
 rename app/assets/javascripts/discourse/routes/{build-static-route.js.es6 => build-static-route.js} (100%)
 rename app/assets/javascripts/discourse/routes/{build-topic-route.js.es6 => build-topic-route.js} (100%)
 rename app/assets/javascripts/discourse/routes/{conduct.js.es6 => conduct.js} (100%)
 rename app/assets/javascripts/discourse/routes/{discourse.js.es6 => discourse.js} (100%)
 rename app/assets/javascripts/discourse/routes/{discovery-categories.js.es6 => discovery-categories.js} (100%)
 rename app/assets/javascripts/discourse/routes/{discovery.js.es6 => discovery.js} (100%)
 rename app/assets/javascripts/discourse/routes/{email-login.js.es6 => email-login.js} (100%)
 rename app/assets/javascripts/discourse/routes/{exception-unknown.js.es6 => exception-unknown.js} (100%)
 rename app/assets/javascripts/discourse/routes/{exception.js.es6 => exception.js} (100%)
 rename app/assets/javascripts/discourse/routes/{faq.js.es6 => faq.js} (100%)
 rename app/assets/javascripts/discourse/routes/{forgot-password.js.es6 => forgot-password.js} (100%)
 rename app/assets/javascripts/discourse/routes/{full-page-search.js.es6 => full-page-search.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-activity-index.js.es6 => group-activity-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-activity-mentions.js.es6 => group-activity-mentions.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-activity-posts.js.es6 => group-activity-posts.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-activity-topics.js.es6 => group-activity-topics.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-index.js.es6 => group-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-manage-index.js.es6 => group-manage-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-manage-interaction.js.es6 => group-manage-interaction.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-manage-logs.js.es6 => group-manage-logs.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-manage-membership.js.es6 => group-manage-membership.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-manage-profile.js.es6 => group-manage-profile.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-manage.js.es6 => group-manage.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-members.js.es6 => group-members.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-messages-archive.js.es6 => group-messages-archive.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-messages-inbox.js.es6 => group-messages-inbox.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-messages-index.js.es6 => group-messages-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-messages.js.es6 => group-messages.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group-requests.js.es6 => group-requests.js} (100%)
 rename app/assets/javascripts/discourse/routes/{group.js.es6 => group.js} (100%)
 rename app/assets/javascripts/discourse/routes/{groups-index.js.es6 => groups-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{groups-new.js.es6 => groups-new.js} (100%)
 rename app/assets/javascripts/discourse/routes/{guidelines.js.es6 => guidelines.js} (100%)
 rename app/assets/javascripts/discourse/routes/{invites-show.js.es6 => invites-show.js} (100%)
 rename app/assets/javascripts/discourse/routes/{login.js.es6 => login.js} (100%)
 rename app/assets/javascripts/discourse/routes/{new-message.js.es6 => new-message.js} (100%)
 rename app/assets/javascripts/discourse/routes/{new-topic.js.es6 => new-topic.js} (100%)
 rename app/assets/javascripts/discourse/routes/{password-reset.js.es6 => password-reset.js} (100%)
 rename app/assets/javascripts/discourse/routes/{post.js.es6 => post.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-account.js.es6 => preferences-account.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-apps.js.es6 => preferences-apps.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-categories.js.es6 => preferences-categories.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-email.js.es6 => preferences-email.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-emails.js.es6 => preferences-emails.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-index.js.es6 => preferences-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-interface.js.es6 => preferences-interface.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-notifications.js.es6 => preferences-notifications.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-profile.js.es6 => preferences-profile.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-second-factor.js.es6 => preferences-second-factor.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-tags.js.es6 => preferences-tags.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-username.js.es6 => preferences-username.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences-users.js.es6 => preferences-users.js} (100%)
 rename app/assets/javascripts/discourse/routes/{preferences.js.es6 => preferences.js} (100%)
 rename app/assets/javascripts/discourse/routes/{privacy.js.es6 => privacy.js} (100%)
 rename app/assets/javascripts/discourse/routes/{restricted-user.js.es6 => restricted-user.js} (100%)
 rename app/assets/javascripts/discourse/routes/{review-index.js.es6 => review-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{review-settings.js.es6 => review-settings.js} (100%)
 rename app/assets/javascripts/discourse/routes/{review-show.js.es6 => review-show.js} (100%)
 rename app/assets/javascripts/discourse/routes/{review-topics.js.es6 => review-topics.js} (100%)
 rename app/assets/javascripts/discourse/routes/{review.js.es6 => review.js} (100%)
 rename app/assets/javascripts/discourse/routes/{rules.js.es6 => rules.js} (100%)
 rename app/assets/javascripts/discourse/routes/{signup.js.es6 => signup.js} (100%)
 rename app/assets/javascripts/discourse/routes/{tag-groups-edit.js.es6 => tag-groups-edit.js} (100%)
 rename app/assets/javascripts/discourse/routes/{tag-groups-new.js.es6 => tag-groups-new.js} (100%)
 rename app/assets/javascripts/discourse/routes/{tag-groups.js.es6 => tag-groups.js} (100%)
 rename app/assets/javascripts/discourse/routes/{tags-index.js.es6 => tags-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{tags-intersection.js.es6 => tags-intersection.js} (100%)
 rename app/assets/javascripts/discourse/routes/{tags-show.js.es6 => tags-show.js} (100%)
 rename app/assets/javascripts/discourse/routes/{topic-by-slug-or-id.js.es6 => topic-by-slug-or-id.js} (100%)
 rename app/assets/javascripts/discourse/routes/{topic-from-params-near.js.es6 => topic-from-params-near.js} (100%)
 rename app/assets/javascripts/discourse/routes/{topic-from-params.js.es6 => topic-from-params.js} (100%)
 rename app/assets/javascripts/discourse/routes/{topic.js.es6 => topic.js} (100%)
 rename app/assets/javascripts/discourse/routes/{tos.js.es6 => tos.js} (100%)
 rename app/assets/javascripts/discourse/routes/{unknown.js.es6 => unknown.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-bookmarks-with-reminders.js.es6 => user-activity-bookmarks-with-reminders.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-bookmarks.js.es6 => user-activity-bookmarks.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-drafts.js.es6 => user-activity-drafts.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-index.js.es6 => user-activity-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-likes-given.js.es6 => user-activity-likes-given.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-pending.js.es6 => user-activity-pending.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-replies.js.es6 => user-activity-replies.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-stream.js.es6 => user-activity-stream.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity-topics.js.es6 => user-activity-topics.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-activity.js.es6 => user-activity.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-badges.js.es6 => user-badges.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-deleted-posts.js.es6 => user-deleted-posts.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-index.js.es6 => user-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-invited-index.js.es6 => user-invited-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-invited-show.js.es6 => user-invited-show.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-notifications-edits.js.es6 => user-notifications-edits.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-notifications-index.js.es6 => user-notifications-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-notifications-likes-received.js.es6 => user-notifications-likes-received.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-notifications-mentions.js.es6 => user-notifications-mentions.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-notifications-responses.js.es6 => user-notifications-responses.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-notifications.js.es6 => user-notifications.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-private-messages-archive.js.es6 => user-private-messages-archive.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-private-messages-group-archive.js.es6 => user-private-messages-group-archive.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-private-messages-group.js.es6 => user-private-messages-group.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-private-messages-index.js.es6 => user-private-messages-index.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-private-messages-sent.js.es6 => user-private-messages-sent.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-private-messages-tags-show.js.es6 => user-private-messages-tags-show.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-private-messages-tags.js.es6 => user-private-messages-tags.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-private-messages.js.es6 => user-private-messages.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-summary.js.es6 => user-summary.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user-topic-list.js.es6 => user-topic-list.js} (100%)
 rename app/assets/javascripts/discourse/routes/{user.js.es6 => user.js} (100%)
 rename app/assets/javascripts/discourse/routes/{users.js.es6 => users.js} (100%)
 rename app/assets/javascripts/discourse/services/{app-events.js.es6 => app-events.js} (100%)
 rename app/assets/javascripts/discourse/services/{emoji-store.js.es6 => emoji-store.js} (100%)
 rename app/assets/javascripts/discourse/services/{logs-notice.js.es6 => logs-notice.js} (100%)
 rename app/assets/javascripts/discourse/services/{search.js.es6 => search.js} (100%)
 rename app/assets/javascripts/discourse/services/{theme-settings.js.es6 => theme-settings.js} (100%)
 rename app/assets/javascripts/discourse/templates/components/{reviewable-score.js.es6 => reviewable-score.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{actions-summary.js.es6 => actions-summary.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{avatar-flair.js.es6 => avatar-flair.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{bookmark-reminder-notification-item.js.es6 => bookmark-reminder-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{button.js.es6 => button.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{category-link.js.es6 => category-link.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{component-connector.js.es6 => component-connector.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{connector.js.es6 => connector.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{custom-notification-item.js.es6 => custom-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{decorator-helper.js.es6 => decorator-helper.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{default-notification-item.js.es6 => default-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{discourse-tags.js.es6 => discourse-tags.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{embedded-post.js.es6 => embedded-post.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{emoji.js.es6 => emoji.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{footer-nav.js.es6 => footer-nav.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{glue.js.es6 => glue.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{group-message-summary-notification-item.js.es6 => group-message-summary-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{hamburger-categories.js.es6 => hamburger-categories.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{hamburger-menu.js.es6 => hamburger-menu.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{hbs-compiler.js.es6 => hbs-compiler.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{header-contents.js.es6 => header-contents.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{header-topic-info.js.es6 => header-topic-info.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{header.js.es6 => header.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{home-logo.js.es6 => home-logo.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{hooks.js.es6 => hooks.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{invitee-accepted-notification-item.js.es6 => invitee-accepted-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{liked-consolidated-notification-item.js.es6 => liked-consolidated-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{liked-notification-item.js.es6 => liked-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{link.js.es6 => link.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{membership-request-accepted-notification-item.js.es6 => membership-request-accepted-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{membership-request-consolidated-notification-item.js.es6 => membership-request-consolidated-notification-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{menu-panel.js.es6 => menu-panel.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-admin-menu.js.es6 => post-admin-menu.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-cooked.js.es6 => post-cooked.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-edits-indicator.js.es6 => post-edits-indicator.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-gap.js.es6 => post-gap.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-links.js.es6 => post-links.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-menu.js.es6 => post-menu.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-placeholder.js.es6 => post-placeholder.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-small-action.js.es6 => post-small-action.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post-stream.js.es6 => post-stream.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{post.js.es6 => post.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{poster-name.js.es6 => poster-name.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{private-message-map.js.es6 => private-message-map.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{quick-access-bookmarks.js.es6 => quick-access-bookmarks.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{quick-access-item.js.es6 => quick-access-item.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{quick-access-messages.js.es6 => quick-access-messages.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{quick-access-notifications.js.es6 => quick-access-notifications.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{quick-access-panel.js.es6 => quick-access-panel.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{quick-access-profile.js.es6 => quick-access-profile.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{raw-html.js.es6 => raw-html.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{search-menu-controls.js.es6 => search-menu-controls.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{search-menu-results.js.es6 => search-menu-results.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{search-menu.js.es6 => search-menu.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{time-gap.js.es6 => time-gap.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{toggle-topic-summary.js.es6 => toggle-topic-summary.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{topic-admin-menu.js.es6 => topic-admin-menu.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{topic-map.js.es6 => topic-map.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{topic-status.js.es6 => topic-status.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{topic-timeline.js.es6 => topic-timeline.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{user-menu.js.es6 => user-menu.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{user-notifications-large.js.es6 => user-notifications-large.js} (100%)
 rename app/assets/javascripts/discourse/widgets/{widget.js.es6 => widget.js} (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c02b8d1947..aa94465faf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -132,7 +132,7 @@ jobs:
         if: env.BUILD_TYPE == 'LINT'
         run: |
           yarn prettier -v
-          yarn prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6" "plugins/**/*.scss" "plugins/**/*.es6"
+          yarn prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.js" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6" "plugins/**/*.scss" "plugins/**/*.es6"
 
       - name: Core RSpec
         if: env.BUILD_TYPE == 'BACKEND' && env.TARGET == 'CORE'
diff --git a/Dangerfile b/Dangerfile
index 667918b36a..cfa678978a 100644
--- a/Dangerfile
+++ b/Dangerfile
@@ -4,7 +4,7 @@ if github.pr_json && (github.pr_json["additions"] || 0) > 250 || (github.pr_json
   warn("This pull request is big! We prefer smaller PRs whenever possible, as they are easier to review. Can this be split into a few smaller PRs?")
 end
 
-prettier_offenses = `yarn --silent prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6"`.split("\n")
+prettier_offenses = `yarn --silent prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.js" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6"`.split("\n")
 
 unless prettier_offenses.empty?
   fail(%{
@@ -22,9 +22,9 @@ end
 
 files = (git.added_files + git.modified_files)
   .select { |path| !path.start_with?("plugins/") }
-  .select { |path| path.end_with?("es6") || path.end_with?("rb") }
+  .select { |path| path.end_with?("es6") || path.end_with?("js") || path.end_with?("rb") }
 
-js_files = files.select { |path| path.end_with?(".js.es6") }
+js_files = files.select { |path| path.end_with?(".js.es6") || path.end_with?(".js") }
 js_test_files = js_files.select { |path| path.end_with?("-test.js.es6") }
 
 super_offenses = []
diff --git a/app/assets/javascripts/discourse/adapters/email-template.js.es6 b/app/assets/javascripts/discourse/adapters/email-template.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/email-template.js.es6
rename to app/assets/javascripts/discourse/adapters/email-template.js
diff --git a/app/assets/javascripts/discourse/adapters/group.js.es6 b/app/assets/javascripts/discourse/adapters/group.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/group.js.es6
rename to app/assets/javascripts/discourse/adapters/group.js
diff --git a/app/assets/javascripts/discourse/adapters/notification.js.es6 b/app/assets/javascripts/discourse/adapters/notification.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/notification.js.es6
rename to app/assets/javascripts/discourse/adapters/notification.js
diff --git a/app/assets/javascripts/discourse/adapters/post-reply-history.js.es6 b/app/assets/javascripts/discourse/adapters/post-reply-history.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/post-reply-history.js.es6
rename to app/assets/javascripts/discourse/adapters/post-reply-history.js
diff --git a/app/assets/javascripts/discourse/adapters/post-reply.js.es6 b/app/assets/javascripts/discourse/adapters/post-reply.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/post-reply.js.es6
rename to app/assets/javascripts/discourse/adapters/post-reply.js
diff --git a/app/assets/javascripts/discourse/adapters/post.js.es6 b/app/assets/javascripts/discourse/adapters/post.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/post.js.es6
rename to app/assets/javascripts/discourse/adapters/post.js
diff --git a/app/assets/javascripts/discourse/adapters/rest.js.es6 b/app/assets/javascripts/discourse/adapters/rest.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/rest.js.es6
rename to app/assets/javascripts/discourse/adapters/rest.js
diff --git a/app/assets/javascripts/discourse/adapters/reviewable-explanation.js.es6 b/app/assets/javascripts/discourse/adapters/reviewable-explanation.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/reviewable-explanation.js.es6
rename to app/assets/javascripts/discourse/adapters/reviewable-explanation.js
diff --git a/app/assets/javascripts/discourse/adapters/reviewable-settings.js.es6 b/app/assets/javascripts/discourse/adapters/reviewable-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/reviewable-settings.js.es6
rename to app/assets/javascripts/discourse/adapters/reviewable-settings.js
diff --git a/app/assets/javascripts/discourse/adapters/reviewable-topic.js.es6 b/app/assets/javascripts/discourse/adapters/reviewable-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/reviewable-topic.js.es6
rename to app/assets/javascripts/discourse/adapters/reviewable-topic.js
diff --git a/app/assets/javascripts/discourse/adapters/reviewable.js.es6 b/app/assets/javascripts/discourse/adapters/reviewable.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/reviewable.js.es6
rename to app/assets/javascripts/discourse/adapters/reviewable.js
diff --git a/app/assets/javascripts/discourse/adapters/tag-info.js.es6 b/app/assets/javascripts/discourse/adapters/tag-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/tag-info.js.es6
rename to app/assets/javascripts/discourse/adapters/tag-info.js
diff --git a/app/assets/javascripts/discourse/adapters/tag-notification.js.es6 b/app/assets/javascripts/discourse/adapters/tag-notification.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/tag-notification.js.es6
rename to app/assets/javascripts/discourse/adapters/tag-notification.js
diff --git a/app/assets/javascripts/discourse/adapters/topic-list.js.es6 b/app/assets/javascripts/discourse/adapters/topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/topic-list.js.es6
rename to app/assets/javascripts/discourse/adapters/topic-list.js
diff --git a/app/assets/javascripts/discourse/adapters/topic.js.es6 b/app/assets/javascripts/discourse/adapters/topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/topic.js.es6
rename to app/assets/javascripts/discourse/adapters/topic.js
diff --git a/app/assets/javascripts/discourse/components/about-page-users.js.es6 b/app/assets/javascripts/discourse/components/about-page-users.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/about-page-users.js.es6
rename to app/assets/javascripts/discourse/components/about-page-users.js
diff --git a/app/assets/javascripts/discourse/components/activation-controls.js.es6 b/app/assets/javascripts/discourse/components/activation-controls.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/activation-controls.js.es6
rename to app/assets/javascripts/discourse/components/activation-controls.js
diff --git a/app/assets/javascripts/discourse/components/add-category-tag-classes.js.es6 b/app/assets/javascripts/discourse/components/add-category-tag-classes.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/add-category-tag-classes.js.es6
rename to app/assets/javascripts/discourse/components/add-category-tag-classes.js
diff --git a/app/assets/javascripts/discourse/components/avatar-flair.js.es6 b/app/assets/javascripts/discourse/components/avatar-flair.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/avatar-flair.js.es6
rename to app/assets/javascripts/discourse/components/avatar-flair.js
diff --git a/app/assets/javascripts/discourse/components/avatar-uploader.js.es6 b/app/assets/javascripts/discourse/components/avatar-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/avatar-uploader.js.es6
rename to app/assets/javascripts/discourse/components/avatar-uploader.js
diff --git a/app/assets/javascripts/discourse/components/backup-codes.js.es6 b/app/assets/javascripts/discourse/components/backup-codes.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/backup-codes.js.es6
rename to app/assets/javascripts/discourse/components/backup-codes.js
diff --git a/app/assets/javascripts/discourse/components/backup-uploader.js.es6 b/app/assets/javascripts/discourse/components/backup-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/backup-uploader.js.es6
rename to app/assets/javascripts/discourse/components/backup-uploader.js
diff --git a/app/assets/javascripts/discourse/components/badge-button.js.es6 b/app/assets/javascripts/discourse/components/badge-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/badge-button.js.es6
rename to app/assets/javascripts/discourse/components/badge-button.js
diff --git a/app/assets/javascripts/discourse/components/badge-card.js.es6 b/app/assets/javascripts/discourse/components/badge-card.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/badge-card.js.es6
rename to app/assets/javascripts/discourse/components/badge-card.js
diff --git a/app/assets/javascripts/discourse/components/badge-selector.js.es6 b/app/assets/javascripts/discourse/components/badge-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/badge-selector.js.es6
rename to app/assets/javascripts/discourse/components/badge-selector.js
diff --git a/app/assets/javascripts/discourse/components/badge-title.js.es6 b/app/assets/javascripts/discourse/components/badge-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/badge-title.js.es6
rename to app/assets/javascripts/discourse/components/badge-title.js
diff --git a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 b/app/assets/javascripts/discourse/components/basic-topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/basic-topic-list.js.es6
rename to app/assets/javascripts/discourse/components/basic-topic-list.js
diff --git a/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js.es6 b/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js.es6
rename to app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js
diff --git a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 b/app/assets/javascripts/discourse/components/bread-crumbs.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/bread-crumbs.js.es6
rename to app/assets/javascripts/discourse/components/bread-crumbs.js
diff --git a/app/assets/javascripts/discourse/components/bulk-select-button.js.es6 b/app/assets/javascripts/discourse/components/bulk-select-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/bulk-select-button.js.es6
rename to app/assets/javascripts/discourse/components/bulk-select-button.js
diff --git a/app/assets/javascripts/discourse/components/categories-and-latest-topics.js.es6 b/app/assets/javascripts/discourse/components/categories-and-latest-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-and-latest-topics.js.es6
rename to app/assets/javascripts/discourse/components/categories-and-latest-topics.js
diff --git a/app/assets/javascripts/discourse/components/categories-and-top-topics.js.es6 b/app/assets/javascripts/discourse/components/categories-and-top-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-and-top-topics.js.es6
rename to app/assets/javascripts/discourse/components/categories-and-top-topics.js
diff --git a/app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6
rename to app/assets/javascripts/discourse/components/categories-boxes-topic.js
diff --git a/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-boxes-with-topics.js.es6
rename to app/assets/javascripts/discourse/components/categories-boxes-with-topics.js
diff --git a/app/assets/javascripts/discourse/components/categories-boxes.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-boxes.js.es6
rename to app/assets/javascripts/discourse/components/categories-boxes.js
diff --git a/app/assets/javascripts/discourse/components/categories-only.js.es6 b/app/assets/javascripts/discourse/components/categories-only.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-only.js.es6
rename to app/assets/javascripts/discourse/components/categories-only.js
diff --git a/app/assets/javascripts/discourse/components/categories-topic-list.js.es6 b/app/assets/javascripts/discourse/components/categories-topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-topic-list.js.es6
rename to app/assets/javascripts/discourse/components/categories-topic-list.js
diff --git a/app/assets/javascripts/discourse/components/category-title-before.js.es6 b/app/assets/javascripts/discourse/components/category-title-before.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/category-title-before.js.es6
rename to app/assets/javascripts/discourse/components/category-title-before.js
diff --git a/app/assets/javascripts/discourse/components/category-title-link.js.es6 b/app/assets/javascripts/discourse/components/category-title-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/category-title-link.js.es6
rename to app/assets/javascripts/discourse/components/category-title-link.js
diff --git a/app/assets/javascripts/discourse/components/category-unread.js.es6 b/app/assets/javascripts/discourse/components/category-unread.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/category-unread.js.es6
rename to app/assets/javascripts/discourse/components/category-unread.js
diff --git a/app/assets/javascripts/discourse/components/cdn-img.js.es6 b/app/assets/javascripts/discourse/components/cdn-img.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/cdn-img.js.es6
rename to app/assets/javascripts/discourse/components/cdn-img.js
diff --git a/app/assets/javascripts/discourse/components/choose-message.js.es6 b/app/assets/javascripts/discourse/components/choose-message.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/choose-message.js.es6
rename to app/assets/javascripts/discourse/components/choose-message.js
diff --git a/app/assets/javascripts/discourse/components/choose-topic.js.es6 b/app/assets/javascripts/discourse/components/choose-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/choose-topic.js.es6
rename to app/assets/javascripts/discourse/components/choose-topic.js
diff --git a/app/assets/javascripts/discourse/components/color-picker-choice.js.es6 b/app/assets/javascripts/discourse/components/color-picker-choice.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/color-picker-choice.js.es6
rename to app/assets/javascripts/discourse/components/color-picker-choice.js
diff --git a/app/assets/javascripts/discourse/components/color-picker.js.es6 b/app/assets/javascripts/discourse/components/color-picker.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/color-picker.js.es6
rename to app/assets/javascripts/discourse/components/color-picker.js
diff --git a/app/assets/javascripts/discourse/components/composer-action-title.js.es6 b/app/assets/javascripts/discourse/components/composer-action-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-action-title.js.es6
rename to app/assets/javascripts/discourse/components/composer-action-title.js
diff --git a/app/assets/javascripts/discourse/components/composer-body.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-body.js.es6
rename to app/assets/javascripts/discourse/components/composer-body.js
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-editor.js.es6
rename to app/assets/javascripts/discourse/components/composer-editor.js
diff --git a/app/assets/javascripts/discourse/components/composer-message.js.es6 b/app/assets/javascripts/discourse/components/composer-message.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-message.js.es6
rename to app/assets/javascripts/discourse/components/composer-message.js
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-messages.js.es6
rename to app/assets/javascripts/discourse/components/composer-messages.js
diff --git a/app/assets/javascripts/discourse/components/composer-save-button.js.es6 b/app/assets/javascripts/discourse/components/composer-save-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-save-button.js.es6
rename to app/assets/javascripts/discourse/components/composer-save-button.js
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-title.js.es6
rename to app/assets/javascripts/discourse/components/composer-title.js
diff --git a/app/assets/javascripts/discourse/components/composer-toggles.js.es6 b/app/assets/javascripts/discourse/components/composer-toggles.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-toggles.js.es6
rename to app/assets/javascripts/discourse/components/composer-toggles.js
diff --git a/app/assets/javascripts/discourse/components/composer-user-selector.js.es6 b/app/assets/javascripts/discourse/components/composer-user-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-user-selector.js.es6
rename to app/assets/javascripts/discourse/components/composer-user-selector.js
diff --git a/app/assets/javascripts/discourse/components/conditional-loading-section.js.es6 b/app/assets/javascripts/discourse/components/conditional-loading-section.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/conditional-loading-section.js.es6
rename to app/assets/javascripts/discourse/components/conditional-loading-section.js
diff --git a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6 b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
rename to app/assets/javascripts/discourse/components/conditional-loading-spinner.js
diff --git a/app/assets/javascripts/discourse/components/connector-container.js.es6 b/app/assets/javascripts/discourse/components/connector-container.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/connector-container.js.es6
rename to app/assets/javascripts/discourse/components/connector-container.js
diff --git a/app/assets/javascripts/discourse/components/cook-text.js.es6 b/app/assets/javascripts/discourse/components/cook-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/cook-text.js.es6
rename to app/assets/javascripts/discourse/components/cook-text.js
diff --git a/app/assets/javascripts/discourse/components/count-i18n.js.es6 b/app/assets/javascripts/discourse/components/count-i18n.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/count-i18n.js.es6
rename to app/assets/javascripts/discourse/components/count-i18n.js
diff --git a/app/assets/javascripts/discourse/components/create-account.js.es6 b/app/assets/javascripts/discourse/components/create-account.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/create-account.js.es6
rename to app/assets/javascripts/discourse/components/create-account.js
diff --git a/app/assets/javascripts/discourse/components/create-topic-button.js.es6 b/app/assets/javascripts/discourse/components/create-topic-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/create-topic-button.js.es6
rename to app/assets/javascripts/discourse/components/create-topic-button.js
diff --git a/app/assets/javascripts/discourse/components/create-topics-notice.js.es6 b/app/assets/javascripts/discourse/components/create-topics-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/create-topics-notice.js.es6
rename to app/assets/javascripts/discourse/components/create-topics-notice.js
diff --git a/app/assets/javascripts/discourse/components/csv-uploader.js.es6 b/app/assets/javascripts/discourse/components/csv-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/csv-uploader.js.es6
rename to app/assets/javascripts/discourse/components/csv-uploader.js
diff --git a/app/assets/javascripts/discourse/components/custom-html.js.es6 b/app/assets/javascripts/discourse/components/custom-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/custom-html.js.es6
rename to app/assets/javascripts/discourse/components/custom-html.js
diff --git a/app/assets/javascripts/discourse/components/d-button.js.es6 b/app/assets/javascripts/discourse/components/d-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-button.js.es6
rename to app/assets/javascripts/discourse/components/d-button.js
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-editor.js.es6
rename to app/assets/javascripts/discourse/components/d-editor.js
diff --git a/app/assets/javascripts/discourse/components/d-modal-body.js.es6 b/app/assets/javascripts/discourse/components/d-modal-body.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-modal-body.js.es6
rename to app/assets/javascripts/discourse/components/d-modal-body.js
diff --git a/app/assets/javascripts/discourse/components/d-modal-cancel.js.es6 b/app/assets/javascripts/discourse/components/d-modal-cancel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-modal-cancel.js.es6
rename to app/assets/javascripts/discourse/components/d-modal-cancel.js
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-modal.js.es6
rename to app/assets/javascripts/discourse/components/d-modal.js
diff --git a/app/assets/javascripts/discourse/components/d-navigation.js.es6 b/app/assets/javascripts/discourse/components/d-navigation.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-navigation.js.es6
rename to app/assets/javascripts/discourse/components/d-navigation.js
diff --git a/app/assets/javascripts/discourse/components/d-section.js.es6 b/app/assets/javascripts/discourse/components/d-section.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-section.js.es6
rename to app/assets/javascripts/discourse/components/d-section.js
diff --git a/app/assets/javascripts/discourse/components/date-input.js.es6 b/app/assets/javascripts/discourse/components/date-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-input.js.es6
rename to app/assets/javascripts/discourse/components/date-input.js
diff --git a/app/assets/javascripts/discourse/components/date-picker-future.js.es6 b/app/assets/javascripts/discourse/components/date-picker-future.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-picker-future.js.es6
rename to app/assets/javascripts/discourse/components/date-picker-future.js
diff --git a/app/assets/javascripts/discourse/components/date-picker-past.js.es6 b/app/assets/javascripts/discourse/components/date-picker-past.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-picker-past.js.es6
rename to app/assets/javascripts/discourse/components/date-picker-past.js
diff --git a/app/assets/javascripts/discourse/components/date-picker.js.es6 b/app/assets/javascripts/discourse/components/date-picker.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-picker.js.es6
rename to app/assets/javascripts/discourse/components/date-picker.js
diff --git a/app/assets/javascripts/discourse/components/date-time-input-range.js.es6 b/app/assets/javascripts/discourse/components/date-time-input-range.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-time-input-range.js.es6
rename to app/assets/javascripts/discourse/components/date-time-input-range.js
diff --git a/app/assets/javascripts/discourse/components/date-time-input.js.es6 b/app/assets/javascripts/discourse/components/date-time-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-time-input.js.es6
rename to app/assets/javascripts/discourse/components/date-time-input.js
diff --git a/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6 b/app/assets/javascripts/discourse/components/desktop-notification-config.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
rename to app/assets/javascripts/discourse/components/desktop-notification-config.js
diff --git a/app/assets/javascripts/discourse/components/directory-item.js.es6 b/app/assets/javascripts/discourse/components/directory-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/directory-item.js.es6
rename to app/assets/javascripts/discourse/components/directory-item.js
diff --git a/app/assets/javascripts/discourse/components/directory-toggle.js.es6 b/app/assets/javascripts/discourse/components/directory-toggle.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/directory-toggle.js.es6
rename to app/assets/javascripts/discourse/components/directory-toggle.js
diff --git a/app/assets/javascripts/discourse/components/disabled-icon.js.es6 b/app/assets/javascripts/discourse/components/disabled-icon.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/disabled-icon.js.es6
rename to app/assets/javascripts/discourse/components/disabled-icon.js
diff --git a/app/assets/javascripts/discourse/components/discourse-banner.js.es6 b/app/assets/javascripts/discourse/components/discourse-banner.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discourse-banner.js.es6
rename to app/assets/javascripts/discourse/components/discourse-banner.js
diff --git a/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6 b/app/assets/javascripts/discourse/components/discourse-linked-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discourse-linked-text.js.es6
rename to app/assets/javascripts/discourse/components/discourse-linked-text.js
diff --git a/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6 b/app/assets/javascripts/discourse/components/discourse-tag-bound.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6
rename to app/assets/javascripts/discourse/components/discourse-tag-bound.js
diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discourse-topic.js.es6
rename to app/assets/javascripts/discourse/components/discourse-topic.js
diff --git a/app/assets/javascripts/discourse/components/discovery-categories.js.es6 b/app/assets/javascripts/discourse/components/discovery-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discovery-categories.js.es6
rename to app/assets/javascripts/discourse/components/discovery-categories.js
diff --git a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 b/app/assets/javascripts/discourse/components/discovery-topics-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
rename to app/assets/javascripts/discourse/components/discovery-topics-list.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-general.js.es6 b/app/assets/javascripts/discourse/components/edit-category-general.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-general.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-general.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-images.js.es6 b/app/assets/javascripts/discourse/components/edit-category-images.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-images.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-images.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-panel.js.es6 b/app/assets/javascripts/discourse/components/edit-category-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-panel.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-panel.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-security.js.es6 b/app/assets/javascripts/discourse/components/edit-category-security.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-security.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-security.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-settings.js.es6 b/app/assets/javascripts/discourse/components/edit-category-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-settings.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-settings.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tab.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-tab.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-tab.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-tags.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-tags.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-tags.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-topic-template.js.es6 b/app/assets/javascripts/discourse/components/edit-category-topic-template.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-topic-template.js.es6
rename to app/assets/javascripts/discourse/components/edit-category-topic-template.js
diff --git a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6 b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
rename to app/assets/javascripts/discourse/components/edit-topic-timer-form.js
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/emoji-picker.js.es6
rename to app/assets/javascripts/discourse/components/emoji-picker.js
diff --git a/app/assets/javascripts/discourse/components/emoji-uploader.js.es6 b/app/assets/javascripts/discourse/components/emoji-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/emoji-uploader.js.es6
rename to app/assets/javascripts/discourse/components/emoji-uploader.js
diff --git a/app/assets/javascripts/discourse/components/expand-post.js.es6 b/app/assets/javascripts/discourse/components/expand-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/expand-post.js.es6
rename to app/assets/javascripts/discourse/components/expand-post.js
diff --git a/app/assets/javascripts/discourse/components/expanding-text-area.js.es6 b/app/assets/javascripts/discourse/components/expanding-text-area.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/expanding-text-area.js.es6
rename to app/assets/javascripts/discourse/components/expanding-text-area.js
diff --git a/app/assets/javascripts/discourse/components/featured-topic.js.es6 b/app/assets/javascripts/discourse/components/featured-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/featured-topic.js.es6
rename to app/assets/javascripts/discourse/components/featured-topic.js
diff --git a/app/assets/javascripts/discourse/components/flag-action-type.js.es6 b/app/assets/javascripts/discourse/components/flag-action-type.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/flag-action-type.js.es6
rename to app/assets/javascripts/discourse/components/flag-action-type.js
diff --git a/app/assets/javascripts/discourse/components/flag-selection.js.es6 b/app/assets/javascripts/discourse/components/flag-selection.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/flag-selection.js.es6
rename to app/assets/javascripts/discourse/components/flag-selection.js
diff --git a/app/assets/javascripts/discourse/components/flat-button.js.es6 b/app/assets/javascripts/discourse/components/flat-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/flat-button.js.es6
rename to app/assets/javascripts/discourse/components/flat-button.js
diff --git a/app/assets/javascripts/discourse/components/footer-message.js.es6 b/app/assets/javascripts/discourse/components/footer-message.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/footer-message.js.es6
rename to app/assets/javascripts/discourse/components/footer-message.js
diff --git a/app/assets/javascripts/discourse/components/footer-nav.js.es6 b/app/assets/javascripts/discourse/components/footer-nav.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/footer-nav.js.es6
rename to app/assets/javascripts/discourse/components/footer-nav.js
diff --git a/app/assets/javascripts/discourse/components/future-date-input.js.es6 b/app/assets/javascripts/discourse/components/future-date-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/future-date-input.js.es6
rename to app/assets/javascripts/discourse/components/future-date-input.js
diff --git a/app/assets/javascripts/discourse/components/generated-invite-link.js.es6 b/app/assets/javascripts/discourse/components/generated-invite-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/generated-invite-link.js.es6
rename to app/assets/javascripts/discourse/components/generated-invite-link.js
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/global-notice.js.es6
rename to app/assets/javascripts/discourse/components/global-notice.js
diff --git a/app/assets/javascripts/discourse/components/google-search.js.es6 b/app/assets/javascripts/discourse/components/google-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/google-search.js.es6
rename to app/assets/javascripts/discourse/components/google-search.js
diff --git a/app/assets/javascripts/discourse/components/group-activity-filter.js.es6 b/app/assets/javascripts/discourse/components/group-activity-filter.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-activity-filter.js.es6
rename to app/assets/javascripts/discourse/components/group-activity-filter.js
diff --git a/app/assets/javascripts/discourse/components/group-card-contents.js.es6 b/app/assets/javascripts/discourse/components/group-card-contents.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-card-contents.js.es6
rename to app/assets/javascripts/discourse/components/group-card-contents.js
diff --git a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6 b/app/assets/javascripts/discourse/components/group-flair-inputs.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
rename to app/assets/javascripts/discourse/components/group-flair-inputs.js
diff --git a/app/assets/javascripts/discourse/components/group-index-toggle.js.es6 b/app/assets/javascripts/discourse/components/group-index-toggle.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-index-toggle.js.es6
rename to app/assets/javascripts/discourse/components/group-index-toggle.js
diff --git a/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6 b/app/assets/javascripts/discourse/components/group-manage-logs-filter.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
rename to app/assets/javascripts/discourse/components/group-manage-logs-filter.js
diff --git a/app/assets/javascripts/discourse/components/group-manage-logs-row.js.es6 b/app/assets/javascripts/discourse/components/group-manage-logs-row.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-manage-logs-row.js.es6
rename to app/assets/javascripts/discourse/components/group-manage-logs-row.js
diff --git a/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6 b/app/assets/javascripts/discourse/components/group-manage-save-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-manage-save-button.js.es6
rename to app/assets/javascripts/discourse/components/group-manage-save-button.js
diff --git a/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6 b/app/assets/javascripts/discourse/components/group-member-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
rename to app/assets/javascripts/discourse/components/group-member-dropdown.js
diff --git a/app/assets/javascripts/discourse/components/group-member.js.es6 b/app/assets/javascripts/discourse/components/group-member.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-member.js.es6
rename to app/assets/javascripts/discourse/components/group-member.js
diff --git a/app/assets/javascripts/discourse/components/group-membership-button.js.es6 b/app/assets/javascripts/discourse/components/group-membership-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-membership-button.js.es6
rename to app/assets/javascripts/discourse/components/group-membership-button.js
diff --git a/app/assets/javascripts/discourse/components/group-navigation.js.es6 b/app/assets/javascripts/discourse/components/group-navigation.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-navigation.js.es6
rename to app/assets/javascripts/discourse/components/group-navigation.js
diff --git a/app/assets/javascripts/discourse/components/group-post.js.es6 b/app/assets/javascripts/discourse/components/group-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-post.js.es6
rename to app/assets/javascripts/discourse/components/group-post.js
diff --git a/app/assets/javascripts/discourse/components/group-selector.js.es6 b/app/assets/javascripts/discourse/components/group-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-selector.js.es6
rename to app/assets/javascripts/discourse/components/group-selector.js
diff --git a/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6
rename to app/assets/javascripts/discourse/components/groups-form-interaction-fields.js
diff --git a/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-membership-fields.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6
rename to app/assets/javascripts/discourse/components/groups-form-membership-fields.js
diff --git a/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-profile-fields.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6
rename to app/assets/javascripts/discourse/components/groups-form-profile-fields.js
diff --git a/app/assets/javascripts/discourse/components/groups-info.js.es6 b/app/assets/javascripts/discourse/components/groups-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/groups-info.js.es6
rename to app/assets/javascripts/discourse/components/groups-info.js
diff --git a/app/assets/javascripts/discourse/components/header-extra-info.js.es6 b/app/assets/javascripts/discourse/components/header-extra-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/header-extra-info.js.es6
rename to app/assets/javascripts/discourse/components/header-extra-info.js
diff --git a/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6 b/app/assets/javascripts/discourse/components/hide-modal-trigger.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6
rename to app/assets/javascripts/discourse/components/hide-modal-trigger.js
diff --git a/app/assets/javascripts/discourse/components/highlight-text.js.es6 b/app/assets/javascripts/discourse/components/highlight-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/highlight-text.js.es6
rename to app/assets/javascripts/discourse/components/highlight-text.js
diff --git a/app/assets/javascripts/discourse/components/honeypot-input.js.es6 b/app/assets/javascripts/discourse/components/honeypot-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/honeypot-input.js.es6
rename to app/assets/javascripts/discourse/components/honeypot-input.js
diff --git a/app/assets/javascripts/discourse/components/iframed-html.js.es6 b/app/assets/javascripts/discourse/components/iframed-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/iframed-html.js.es6
rename to app/assets/javascripts/discourse/components/iframed-html.js
diff --git a/app/assets/javascripts/discourse/components/ignored-user-list-item.js.es6 b/app/assets/javascripts/discourse/components/ignored-user-list-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/ignored-user-list-item.js.es6
rename to app/assets/javascripts/discourse/components/ignored-user-list-item.js
diff --git a/app/assets/javascripts/discourse/components/ignored-user-list.js.es6 b/app/assets/javascripts/discourse/components/ignored-user-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/ignored-user-list.js.es6
rename to app/assets/javascripts/discourse/components/ignored-user-list.js
diff --git a/app/assets/javascripts/discourse/components/image-uploader.js.es6 b/app/assets/javascripts/discourse/components/image-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/image-uploader.js.es6
rename to app/assets/javascripts/discourse/components/image-uploader.js
diff --git a/app/assets/javascripts/discourse/components/images-uploader.js.es6 b/app/assets/javascripts/discourse/components/images-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/images-uploader.js.es6
rename to app/assets/javascripts/discourse/components/images-uploader.js
diff --git a/app/assets/javascripts/discourse/components/input-tip.js.es6 b/app/assets/javascripts/discourse/components/input-tip.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/input-tip.js.es6
rename to app/assets/javascripts/discourse/components/input-tip.js
diff --git a/app/assets/javascripts/discourse/components/invite-panel.js.es6 b/app/assets/javascripts/discourse/components/invite-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/invite-panel.js.es6
rename to app/assets/javascripts/discourse/components/invite-panel.js
diff --git a/app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/latest-topic-list-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6
rename to app/assets/javascripts/discourse/components/latest-topic-list-item.js
diff --git a/app/assets/javascripts/discourse/components/link-to-input.js.es6 b/app/assets/javascripts/discourse/components/link-to-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/link-to-input.js.es6
rename to app/assets/javascripts/discourse/components/link-to-input.js
diff --git a/app/assets/javascripts/discourse/components/links-redirect.js.es6 b/app/assets/javascripts/discourse/components/links-redirect.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/links-redirect.js.es6
rename to app/assets/javascripts/discourse/components/links-redirect.js
diff --git a/app/assets/javascripts/discourse/components/load-more.js.es6 b/app/assets/javascripts/discourse/components/load-more.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/load-more.js.es6
rename to app/assets/javascripts/discourse/components/load-more.js
diff --git a/app/assets/javascripts/discourse/components/login-buttons.js.es6 b/app/assets/javascripts/discourse/components/login-buttons.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/login-buttons.js.es6
rename to app/assets/javascripts/discourse/components/login-buttons.js
diff --git a/app/assets/javascripts/discourse/components/login-modal.js.es6 b/app/assets/javascripts/discourse/components/login-modal.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/login-modal.js.es6
rename to app/assets/javascripts/discourse/components/login-modal.js
diff --git a/app/assets/javascripts/discourse/components/login-reply-button.js.es6 b/app/assets/javascripts/discourse/components/login-reply-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/login-reply-button.js.es6
rename to app/assets/javascripts/discourse/components/login-reply-button.js
diff --git a/app/assets/javascripts/discourse/components/mobile-category-topic.js.es6 b/app/assets/javascripts/discourse/components/mobile-category-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/mobile-category-topic.js.es6
rename to app/assets/javascripts/discourse/components/mobile-category-topic.js
diff --git a/app/assets/javascripts/discourse/components/mobile-nav.js.es6 b/app/assets/javascripts/discourse/components/mobile-nav.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/mobile-nav.js.es6
rename to app/assets/javascripts/discourse/components/mobile-nav.js
diff --git a/app/assets/javascripts/discourse/components/modal-panel.js.es6 b/app/assets/javascripts/discourse/components/modal-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/modal-panel.js.es6
rename to app/assets/javascripts/discourse/components/modal-panel.js
diff --git a/app/assets/javascripts/discourse/components/modal-tab.js.es6 b/app/assets/javascripts/discourse/components/modal-tab.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/modal-tab.js.es6
rename to app/assets/javascripts/discourse/components/modal-tab.js
diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/mount-widget.js.es6
rename to app/assets/javascripts/discourse/components/mount-widget.js
diff --git a/app/assets/javascripts/discourse/components/nav-item.js.es6 b/app/assets/javascripts/discourse/components/nav-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/nav-item.js.es6
rename to app/assets/javascripts/discourse/components/nav-item.js
diff --git a/app/assets/javascripts/discourse/components/navigation-bar.js.es6 b/app/assets/javascripts/discourse/components/navigation-bar.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/navigation-bar.js.es6
rename to app/assets/javascripts/discourse/components/navigation-bar.js
diff --git a/app/assets/javascripts/discourse/components/navigation-item.js.es6 b/app/assets/javascripts/discourse/components/navigation-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/navigation-item.js.es6
rename to app/assets/javascripts/discourse/components/navigation-item.js
diff --git a/app/assets/javascripts/discourse/components/notification-consent-banner.js.es6 b/app/assets/javascripts/discourse/components/notification-consent-banner.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/notification-consent-banner.js.es6
rename to app/assets/javascripts/discourse/components/notification-consent-banner.js
diff --git a/app/assets/javascripts/discourse/components/number-field.js.es6 b/app/assets/javascripts/discourse/components/number-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/number-field.js.es6
rename to app/assets/javascripts/discourse/components/number-field.js
diff --git a/app/assets/javascripts/discourse/components/password-field.js.es6 b/app/assets/javascripts/discourse/components/password-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/password-field.js.es6
rename to app/assets/javascripts/discourse/components/password-field.js
diff --git a/app/assets/javascripts/discourse/components/plugin-connector.js.es6 b/app/assets/javascripts/discourse/components/plugin-connector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/plugin-connector.js.es6
rename to app/assets/javascripts/discourse/components/plugin-connector.js
diff --git a/app/assets/javascripts/discourse/components/plugin-outlet.js.es6 b/app/assets/javascripts/discourse/components/plugin-outlet.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/plugin-outlet.js.es6
rename to app/assets/javascripts/discourse/components/plugin-outlet.js
diff --git a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6 b/app/assets/javascripts/discourse/components/popup-input-tip.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/popup-input-tip.js.es6
rename to app/assets/javascripts/discourse/components/popup-input-tip.js
diff --git a/app/assets/javascripts/discourse/components/preference-checkbox.js.es6 b/app/assets/javascripts/discourse/components/preference-checkbox.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/preference-checkbox.js.es6
rename to app/assets/javascripts/discourse/components/preference-checkbox.js
diff --git a/app/assets/javascripts/discourse/components/private-message-glyph.js.es6 b/app/assets/javascripts/discourse/components/private-message-glyph.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/private-message-glyph.js.es6
rename to app/assets/javascripts/discourse/components/private-message-glyph.js
diff --git a/app/assets/javascripts/discourse/components/pwa-install-banner.js.es6 b/app/assets/javascripts/discourse/components/pwa-install-banner.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/pwa-install-banner.js.es6
rename to app/assets/javascripts/discourse/components/pwa-install-banner.js
diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/quote-button.js.es6
rename to app/assets/javascripts/discourse/components/quote-button.js
diff --git a/app/assets/javascripts/discourse/components/radio-button.js.es6 b/app/assets/javascripts/discourse/components/radio-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/radio-button.js.es6
rename to app/assets/javascripts/discourse/components/radio-button.js
diff --git a/app/assets/javascripts/discourse/components/related-messages.js.es6 b/app/assets/javascripts/discourse/components/related-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/related-messages.js.es6
rename to app/assets/javascripts/discourse/components/related-messages.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-bundled-action.js.es6 b/app/assets/javascripts/discourse/components/reviewable-bundled-action.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-bundled-action.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-bundled-action.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js.es6 b/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-claimed-topic.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-claimed-topic.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-conversation-post.js.es6 b/app/assets/javascripts/discourse/components/reviewable-conversation-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-conversation-post.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-conversation-post.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-field-category.js.es6 b/app/assets/javascripts/discourse/components/reviewable-field-category.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-field-category.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-field-category.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-field-tags.js.es6 b/app/assets/javascripts/discourse/components/reviewable-field-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-field-tags.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-field-tags.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6 b/app/assets/javascripts/discourse/components/reviewable-flagged-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-flagged-post.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-histories.js.es6 b/app/assets/javascripts/discourse/components/reviewable-histories.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-histories.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-histories.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-item.js.es6 b/app/assets/javascripts/discourse/components/reviewable-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-item.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-item.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-queued-post.js.es6 b/app/assets/javascripts/discourse/components/reviewable-queued-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-queued-post.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-queued-post.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-user.js.es6 b/app/assets/javascripts/discourse/components/reviewable-user.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-user.js.es6
rename to app/assets/javascripts/discourse/components/reviewable-user.js
diff --git a/app/assets/javascripts/discourse/components/save-controls.js.es6 b/app/assets/javascripts/discourse/components/save-controls.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/save-controls.js.es6
rename to app/assets/javascripts/discourse/components/save-controls.js
diff --git a/app/assets/javascripts/discourse/components/scroll-tracker.js.es6 b/app/assets/javascripts/discourse/components/scroll-tracker.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/scroll-tracker.js.es6
rename to app/assets/javascripts/discourse/components/scroll-tracker.js
diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 b/app/assets/javascripts/discourse/components/scrolling-post-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
rename to app/assets/javascripts/discourse/components/scrolling-post-stream.js
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/search-advanced-options.js.es6
rename to app/assets/javascripts/discourse/components/search-advanced-options.js
diff --git a/app/assets/javascripts/discourse/components/search-text-field.js.es6 b/app/assets/javascripts/discourse/components/search-text-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/search-text-field.js.es6
rename to app/assets/javascripts/discourse/components/search-text-field.js
diff --git a/app/assets/javascripts/discourse/components/second-factor-form.js.es6 b/app/assets/javascripts/discourse/components/second-factor-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/second-factor-form.js.es6
rename to app/assets/javascripts/discourse/components/second-factor-form.js
diff --git a/app/assets/javascripts/discourse/components/second-factor-input.js.es6 b/app/assets/javascripts/discourse/components/second-factor-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/second-factor-input.js.es6
rename to app/assets/javascripts/discourse/components/second-factor-input.js
diff --git a/app/assets/javascripts/discourse/components/security-key-form.js.es6 b/app/assets/javascripts/discourse/components/security-key-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/security-key-form.js.es6
rename to app/assets/javascripts/discourse/components/security-key-form.js
diff --git a/app/assets/javascripts/discourse/components/share-panel.js.es6 b/app/assets/javascripts/discourse/components/share-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/share-panel.js.es6
rename to app/assets/javascripts/discourse/components/share-panel.js
diff --git a/app/assets/javascripts/discourse/components/share-popup.js.es6 b/app/assets/javascripts/discourse/components/share-popup.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/share-popup.js.es6
rename to app/assets/javascripts/discourse/components/share-popup.js
diff --git a/app/assets/javascripts/discourse/components/share-source.js.es6 b/app/assets/javascripts/discourse/components/share-source.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/share-source.js.es6
rename to app/assets/javascripts/discourse/components/share-source.js
diff --git a/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6 b/app/assets/javascripts/discourse/components/shared-draft-controls.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/shared-draft-controls.js.es6
rename to app/assets/javascripts/discourse/components/shared-draft-controls.js
diff --git a/app/assets/javascripts/discourse/components/signup-cta.js.es6 b/app/assets/javascripts/discourse/components/signup-cta.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/signup-cta.js.es6
rename to app/assets/javascripts/discourse/components/signup-cta.js
diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/site-header.js.es6
rename to app/assets/javascripts/discourse/components/site-header.js
diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js.es6 b/app/assets/javascripts/discourse/components/suggested-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/suggested-topics.js.es6
rename to app/assets/javascripts/discourse/components/suggested-topics.js
diff --git a/app/assets/javascripts/discourse/components/tag-drop-link.js.es6 b/app/assets/javascripts/discourse/components/tag-drop-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tag-drop-link.js.es6
rename to app/assets/javascripts/discourse/components/tag-drop-link.js
diff --git a/app/assets/javascripts/discourse/components/tag-groups-form.js.es6 b/app/assets/javascripts/discourse/components/tag-groups-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tag-groups-form.js.es6
rename to app/assets/javascripts/discourse/components/tag-groups-form.js
diff --git a/app/assets/javascripts/discourse/components/tag-info.js.es6 b/app/assets/javascripts/discourse/components/tag-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tag-info.js.es6
rename to app/assets/javascripts/discourse/components/tag-info.js
diff --git a/app/assets/javascripts/discourse/components/tag-list.js.es6 b/app/assets/javascripts/discourse/components/tag-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tag-list.js.es6
rename to app/assets/javascripts/discourse/components/tag-list.js
diff --git a/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6 b/app/assets/javascripts/discourse/components/tags-admin-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
rename to app/assets/javascripts/discourse/components/tags-admin-dropdown.js
diff --git a/app/assets/javascripts/discourse/components/tap-tile-grid.js.es6 b/app/assets/javascripts/discourse/components/tap-tile-grid.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tap-tile-grid.js.es6
rename to app/assets/javascripts/discourse/components/tap-tile-grid.js
diff --git a/app/assets/javascripts/discourse/components/tap-tile.js.es6 b/app/assets/javascripts/discourse/components/tap-tile.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tap-tile.js.es6
rename to app/assets/javascripts/discourse/components/tap-tile.js
diff --git a/app/assets/javascripts/discourse/components/text-field.js.es6 b/app/assets/javascripts/discourse/components/text-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/text-field.js.es6
rename to app/assets/javascripts/discourse/components/text-field.js
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js.es6 b/app/assets/javascripts/discourse/components/text-overflow.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/text-overflow.js.es6
rename to app/assets/javascripts/discourse/components/text-overflow.js
diff --git a/app/assets/javascripts/discourse/components/time-input.js.es6 b/app/assets/javascripts/discourse/components/time-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/time-input.js.es6
rename to app/assets/javascripts/discourse/components/time-input.js
diff --git a/app/assets/javascripts/discourse/components/top-period-buttons.js.es6 b/app/assets/javascripts/discourse/components/top-period-buttons.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/top-period-buttons.js.es6
rename to app/assets/javascripts/discourse/components/top-period-buttons.js
diff --git a/app/assets/javascripts/discourse/components/topic-admin-menu-button.js.es6 b/app/assets/javascripts/discourse/components/topic-admin-menu-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-admin-menu-button.js.es6
rename to app/assets/javascripts/discourse/components/topic-admin-menu-button.js
diff --git a/app/assets/javascripts/discourse/components/topic-category.js.es6 b/app/assets/javascripts/discourse/components/topic-category.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-category.js.es6
rename to app/assets/javascripts/discourse/components/topic-category.js
diff --git a/app/assets/javascripts/discourse/components/topic-entrance.js.es6 b/app/assets/javascripts/discourse/components/topic-entrance.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-entrance.js.es6
rename to app/assets/javascripts/discourse/components/topic-entrance.js
diff --git a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-buttons.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
rename to app/assets/javascripts/discourse/components/topic-footer-buttons.js
diff --git a/app/assets/javascripts/discourse/components/topic-join-group-notice.js.es6 b/app/assets/javascripts/discourse/components/topic-join-group-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-join-group-notice.js.es6
rename to app/assets/javascripts/discourse/components/topic-join-group-notice.js
diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/topic-list-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-list-item.js.es6
rename to app/assets/javascripts/discourse/components/topic-list-item.js
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-list.js.es6
rename to app/assets/javascripts/discourse/components/topic-list.js
diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 b/app/assets/javascripts/discourse/components/topic-navigation.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-navigation.js.es6
rename to app/assets/javascripts/discourse/components/topic-navigation.js
diff --git a/app/assets/javascripts/discourse/components/topic-post-badges.js.es6 b/app/assets/javascripts/discourse/components/topic-post-badges.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-post-badges.js.es6
rename to app/assets/javascripts/discourse/components/topic-post-badges.js
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-progress.js.es6
rename to app/assets/javascripts/discourse/components/topic-progress.js
diff --git a/app/assets/javascripts/discourse/components/topic-status.js.es6 b/app/assets/javascripts/discourse/components/topic-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-status.js.es6
rename to app/assets/javascripts/discourse/components/topic-status.js
diff --git a/app/assets/javascripts/discourse/components/topic-timeline.js.es6 b/app/assets/javascripts/discourse/components/topic-timeline.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-timeline.js.es6
rename to app/assets/javascripts/discourse/components/topic-timeline.js
diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 b/app/assets/javascripts/discourse/components/topic-timer-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-timer-info.js.es6
rename to app/assets/javascripts/discourse/components/topic-timer-info.js
diff --git a/app/assets/javascripts/discourse/components/topic-title.js.es6 b/app/assets/javascripts/discourse/components/topic-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-title.js.es6
rename to app/assets/javascripts/discourse/components/topic-title.js
diff --git a/app/assets/javascripts/discourse/components/track-selected.js.es6 b/app/assets/javascripts/discourse/components/track-selected.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/track-selected.js.es6
rename to app/assets/javascripts/discourse/components/track-selected.js
diff --git a/app/assets/javascripts/discourse/components/user-badge.js.es6 b/app/assets/javascripts/discourse/components/user-badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-badge.js.es6
rename to app/assets/javascripts/discourse/components/user-badge.js
diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js.es6 b/app/assets/javascripts/discourse/components/user-card-contents.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-card-contents.js.es6
rename to app/assets/javascripts/discourse/components/user-card-contents.js
diff --git a/app/assets/javascripts/discourse/components/user-field.js.es6 b/app/assets/javascripts/discourse/components/user-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-field.js.es6
rename to app/assets/javascripts/discourse/components/user-field.js
diff --git a/app/assets/javascripts/discourse/components/user-flag-percentage.js.es6 b/app/assets/javascripts/discourse/components/user-flag-percentage.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-flag-percentage.js.es6
rename to app/assets/javascripts/discourse/components/user-flag-percentage.js
diff --git a/app/assets/javascripts/discourse/components/user-info.js.es6 b/app/assets/javascripts/discourse/components/user-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-info.js.es6
rename to app/assets/javascripts/discourse/components/user-info.js
diff --git a/app/assets/javascripts/discourse/components/user-link.js.es6 b/app/assets/javascripts/discourse/components/user-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-link.js.es6
rename to app/assets/javascripts/discourse/components/user-link.js
diff --git a/app/assets/javascripts/discourse/components/user-notifications-large.js.es6 b/app/assets/javascripts/discourse/components/user-notifications-large.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-notifications-large.js.es6
rename to app/assets/javascripts/discourse/components/user-notifications-large.js
diff --git a/app/assets/javascripts/discourse/components/user-selector.js.es6 b/app/assets/javascripts/discourse/components/user-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-selector.js.es6
rename to app/assets/javascripts/discourse/components/user-selector.js
diff --git a/app/assets/javascripts/discourse/components/user-stat.js.es6 b/app/assets/javascripts/discourse/components/user-stat.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-stat.js.es6
rename to app/assets/javascripts/discourse/components/user-stat.js
diff --git a/app/assets/javascripts/discourse/components/user-stream-item.js.es6 b/app/assets/javascripts/discourse/components/user-stream-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-stream-item.js.es6
rename to app/assets/javascripts/discourse/components/user-stream-item.js
diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-stream.js.es6
rename to app/assets/javascripts/discourse/components/user-stream.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-category-search.js.es6 b/app/assets/javascripts/discourse/components/user-summary-category-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-category-search.js.es6
rename to app/assets/javascripts/discourse/components/user-summary-category-search.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-section.js.es6 b/app/assets/javascripts/discourse/components/user-summary-section.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-section.js.es6
rename to app/assets/javascripts/discourse/components/user-summary-section.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-topic.js.es6 b/app/assets/javascripts/discourse/components/user-summary-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-topic.js.es6
rename to app/assets/javascripts/discourse/components/user-summary-topic.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-topics-list.js.es6 b/app/assets/javascripts/discourse/components/user-summary-topics-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-topics-list.js.es6
rename to app/assets/javascripts/discourse/components/user-summary-topics-list.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-user.js.es6 b/app/assets/javascripts/discourse/components/user-summary-user.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-user.js.es6
rename to app/assets/javascripts/discourse/components/user-summary-user.js
diff --git a/app/assets/javascripts/discourse/components/watch-read.js.es6 b/app/assets/javascripts/discourse/components/watch-read.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/watch-read.js.es6
rename to app/assets/javascripts/discourse/components/watch-read.js
diff --git a/app/assets/javascripts/discourse/controllers/about.js.es6 b/app/assets/javascripts/discourse/controllers/about.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/about.js.es6
rename to app/assets/javascripts/discourse/controllers/about.js
diff --git a/app/assets/javascripts/discourse/controllers/account-created-edit-email.js.es6 b/app/assets/javascripts/discourse/controllers/account-created-edit-email.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/account-created-edit-email.js.es6
rename to app/assets/javascripts/discourse/controllers/account-created-edit-email.js
diff --git a/app/assets/javascripts/discourse/controllers/account-created-index.js.es6 b/app/assets/javascripts/discourse/controllers/account-created-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/account-created-index.js.es6
rename to app/assets/javascripts/discourse/controllers/account-created-index.js
diff --git a/app/assets/javascripts/discourse/controllers/activation-edit.js.es6 b/app/assets/javascripts/discourse/controllers/activation-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/activation-edit.js.es6
rename to app/assets/javascripts/discourse/controllers/activation-edit.js
diff --git a/app/assets/javascripts/discourse/controllers/add-post-notice.js.es6 b/app/assets/javascripts/discourse/controllers/add-post-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/add-post-notice.js.es6
rename to app/assets/javascripts/discourse/controllers/add-post-notice.js
diff --git a/app/assets/javascripts/discourse/controllers/application.js.es6 b/app/assets/javascripts/discourse/controllers/application.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/application.js.es6
rename to app/assets/javascripts/discourse/controllers/application.js
diff --git a/app/assets/javascripts/discourse/controllers/associate-account-confirm.js.es6 b/app/assets/javascripts/discourse/controllers/associate-account-confirm.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/associate-account-confirm.js.es6
rename to app/assets/javascripts/discourse/controllers/associate-account-confirm.js
diff --git a/app/assets/javascripts/discourse/controllers/auth-token.js.es6 b/app/assets/javascripts/discourse/controllers/auth-token.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/auth-token.js.es6
rename to app/assets/javascripts/discourse/controllers/auth-token.js
diff --git a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6 b/app/assets/javascripts/discourse/controllers/avatar-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
rename to app/assets/javascripts/discourse/controllers/avatar-selector.js
diff --git a/app/assets/javascripts/discourse/controllers/badges/index.js.es6 b/app/assets/javascripts/discourse/controllers/badges/index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/badges/index.js.es6
rename to app/assets/javascripts/discourse/controllers/badges/index.js
diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js.es6 b/app/assets/javascripts/discourse/controllers/badges/show.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/badges/show.js.es6
rename to app/assets/javascripts/discourse/controllers/badges/show.js
diff --git a/app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6 b/app/assets/javascripts/discourse/controllers/basic-modal-body.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6
rename to app/assets/javascripts/discourse/controllers/basic-modal-body.js
diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js.es6 b/app/assets/javascripts/discourse/controllers/bookmark.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/bookmark.js.es6
rename to app/assets/javascripts/discourse/controllers/bookmark.js
diff --git a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6 b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
rename to app/assets/javascripts/discourse/controllers/bulk-notification-level.js
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/change-owner.js.es6
rename to app/assets/javascripts/discourse/controllers/change-owner.js
diff --git a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6 b/app/assets/javascripts/discourse/controllers/change-timestamp.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
rename to app/assets/javascripts/discourse/controllers/change-timestamp.js
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/composer.js.es6
rename to app/assets/javascripts/discourse/controllers/composer.js
diff --git a/app/assets/javascripts/discourse/controllers/convert-to-public-topic.js.es6 b/app/assets/javascripts/discourse/controllers/convert-to-public-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/convert-to-public-topic.js.es6
rename to app/assets/javascripts/discourse/controllers/convert-to-public-topic.js
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/create-account.js.es6
rename to app/assets/javascripts/discourse/controllers/create-account.js
diff --git a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 b/app/assets/javascripts/discourse/controllers/discovery-sortable.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
rename to app/assets/javascripts/discourse/controllers/discovery-sortable.js
diff --git a/app/assets/javascripts/discourse/controllers/discovery.js.es6 b/app/assets/javascripts/discourse/controllers/discovery.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/discovery.js.es6
rename to app/assets/javascripts/discourse/controllers/discovery.js
diff --git a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
rename to app/assets/javascripts/discourse/controllers/discovery/categories.js
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
rename to app/assets/javascripts/discourse/controllers/discovery/topics.js
diff --git a/app/assets/javascripts/discourse/controllers/edit-category.js.es6 b/app/assets/javascripts/discourse/controllers/edit-category.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/edit-category.js.es6
rename to app/assets/javascripts/discourse/controllers/edit-category.js
diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6 b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
rename to app/assets/javascripts/discourse/controllers/edit-topic-timer.js
diff --git a/app/assets/javascripts/discourse/controllers/email-login.js.es6 b/app/assets/javascripts/discourse/controllers/email-login.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/email-login.js.es6
rename to app/assets/javascripts/discourse/controllers/email-login.js
diff --git a/app/assets/javascripts/discourse/controllers/exception.js.es6 b/app/assets/javascripts/discourse/controllers/exception.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/exception.js.es6
rename to app/assets/javascripts/discourse/controllers/exception.js
diff --git a/app/assets/javascripts/discourse/controllers/explain-reviewable.js.es6 b/app/assets/javascripts/discourse/controllers/explain-reviewable.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/explain-reviewable.js.es6
rename to app/assets/javascripts/discourse/controllers/explain-reviewable.js
diff --git a/app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js.es6 b/app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js.es6
rename to app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js
diff --git a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6 b/app/assets/javascripts/discourse/controllers/feature-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/feature-topic.js.es6
rename to app/assets/javascripts/discourse/controllers/feature-topic.js
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/flag.js.es6
rename to app/assets/javascripts/discourse/controllers/flag.js
diff --git a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6 b/app/assets/javascripts/discourse/controllers/forgot-password.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/forgot-password.js.es6
rename to app/assets/javascripts/discourse/controllers/forgot-password.js
diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/full-page-search.js.es6
rename to app/assets/javascripts/discourse/controllers/full-page-search.js
diff --git a/app/assets/javascripts/discourse/controllers/grant-badge.js.es6 b/app/assets/javascripts/discourse/controllers/grant-badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/grant-badge.js.es6
rename to app/assets/javascripts/discourse/controllers/grant-badge.js
diff --git a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity-posts.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
rename to app/assets/javascripts/discourse/controllers/group-activity-posts.js
diff --git a/app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6
rename to app/assets/javascripts/discourse/controllers/group-activity-topics.js
diff --git a/app/assets/javascripts/discourse/controllers/group-activity.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-activity.js.es6
rename to app/assets/javascripts/discourse/controllers/group-activity.js
diff --git a/app/assets/javascripts/discourse/controllers/group-add-members.js.es6 b/app/assets/javascripts/discourse/controllers/group-add-members.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-add-members.js.es6
rename to app/assets/javascripts/discourse/controllers/group-add-members.js
diff --git a/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6 b/app/assets/javascripts/discourse/controllers/group-bulk-add.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6
rename to app/assets/javascripts/discourse/controllers/group-bulk-add.js
diff --git a/app/assets/javascripts/discourse/controllers/group-index.js.es6 b/app/assets/javascripts/discourse/controllers/group-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-index.js.es6
rename to app/assets/javascripts/discourse/controllers/group-index.js
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage-logs.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
rename to app/assets/javascripts/discourse/controllers/group-manage-logs.js
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6
rename to app/assets/javascripts/discourse/controllers/group-manage-profile.js
diff --git a/app/assets/javascripts/discourse/controllers/group-manage.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-manage.js.es6
rename to app/assets/javascripts/discourse/controllers/group-manage.js
diff --git a/app/assets/javascripts/discourse/controllers/group-messages.js.es6 b/app/assets/javascripts/discourse/controllers/group-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-messages.js.es6
rename to app/assets/javascripts/discourse/controllers/group-messages.js
diff --git a/app/assets/javascripts/discourse/controllers/group-requests.js.es6 b/app/assets/javascripts/discourse/controllers/group-requests.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-requests.js.es6
rename to app/assets/javascripts/discourse/controllers/group-requests.js
diff --git a/app/assets/javascripts/discourse/controllers/group.js.es6 b/app/assets/javascripts/discourse/controllers/group.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group.js.es6
rename to app/assets/javascripts/discourse/controllers/group.js
diff --git a/app/assets/javascripts/discourse/controllers/groups-index.js.es6 b/app/assets/javascripts/discourse/controllers/groups-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/groups-index.js.es6
rename to app/assets/javascripts/discourse/controllers/groups-index.js
diff --git a/app/assets/javascripts/discourse/controllers/groups-new.js.es6 b/app/assets/javascripts/discourse/controllers/groups-new.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/groups-new.js.es6
rename to app/assets/javascripts/discourse/controllers/groups-new.js
diff --git a/app/assets/javascripts/discourse/controllers/history.js.es6 b/app/assets/javascripts/discourse/controllers/history.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/history.js.es6
rename to app/assets/javascripts/discourse/controllers/history.js
diff --git a/app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js.es6 b/app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js.es6
rename to app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js
diff --git a/app/assets/javascripts/discourse/controllers/ignore-duration.js.es6 b/app/assets/javascripts/discourse/controllers/ignore-duration.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/ignore-duration.js.es6
rename to app/assets/javascripts/discourse/controllers/ignore-duration.js
diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6 b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
rename to app/assets/javascripts/discourse/controllers/insert-hyperlink.js
diff --git a/app/assets/javascripts/discourse/controllers/invites-show.js.es6 b/app/assets/javascripts/discourse/controllers/invites-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/invites-show.js.es6
rename to app/assets/javascripts/discourse/controllers/invites-show.js
diff --git a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6 b/app/assets/javascripts/discourse/controllers/jump-to-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
rename to app/assets/javascripts/discourse/controllers/jump-to-post.js
diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6 b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
rename to app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/login.js.es6
rename to app/assets/javascripts/discourse/controllers/login.js
diff --git a/app/assets/javascripts/discourse/controllers/modal.js.es6 b/app/assets/javascripts/discourse/controllers/modal.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/modal.js.es6
rename to app/assets/javascripts/discourse/controllers/modal.js
diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 b/app/assets/javascripts/discourse/controllers/move-to-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
rename to app/assets/javascripts/discourse/controllers/move-to-topic.js
diff --git a/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/navigation/categories.js.es6
rename to app/assets/javascripts/discourse/controllers/navigation/categories.js
diff --git a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/category.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/navigation/category.js.es6
rename to app/assets/javascripts/discourse/controllers/navigation/category.js
diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/navigation/default.js.es6
rename to app/assets/javascripts/discourse/controllers/navigation/default.js
diff --git a/app/assets/javascripts/discourse/controllers/not-activated.js.es6 b/app/assets/javascripts/discourse/controllers/not-activated.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/not-activated.js.es6
rename to app/assets/javascripts/discourse/controllers/not-activated.js
diff --git a/app/assets/javascripts/discourse/controllers/password-reset.js.es6 b/app/assets/javascripts/discourse/controllers/password-reset.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/password-reset.js.es6
rename to app/assets/javascripts/discourse/controllers/password-reset.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/account.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/account.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/categories.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/email.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/email.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/email.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/email.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/emails.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/emails.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/interface.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/interface.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/notifications.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/profile.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/second-factor.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/second-factor.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/tags.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/username.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/username.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/username.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/users.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/users.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/users.js.es6
rename to app/assets/javascripts/discourse/controllers/preferences/users.js
diff --git a/app/assets/javascripts/discourse/controllers/raw-email.js.es6 b/app/assets/javascripts/discourse/controllers/raw-email.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/raw-email.js.es6
rename to app/assets/javascripts/discourse/controllers/raw-email.js
diff --git a/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 b/app/assets/javascripts/discourse/controllers/rename-tag.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/rename-tag.js.es6
rename to app/assets/javascripts/discourse/controllers/rename-tag.js
diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 b/app/assets/javascripts/discourse/controllers/reorder-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
rename to app/assets/javascripts/discourse/controllers/reorder-categories.js
diff --git a/app/assets/javascripts/discourse/controllers/request-group-membership-form.js.es6 b/app/assets/javascripts/discourse/controllers/request-group-membership-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/request-group-membership-form.js.es6
rename to app/assets/javascripts/discourse/controllers/request-group-membership-form.js
diff --git a/app/assets/javascripts/discourse/controllers/review-index.js.es6 b/app/assets/javascripts/discourse/controllers/review-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/review-index.js.es6
rename to app/assets/javascripts/discourse/controllers/review-index.js
diff --git a/app/assets/javascripts/discourse/controllers/review-settings.js.es6 b/app/assets/javascripts/discourse/controllers/review-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/review-settings.js.es6
rename to app/assets/javascripts/discourse/controllers/review-settings.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js.es6
rename to app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-totp.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-add-totp.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-add-totp.js.es6
rename to app/assets/javascripts/discourse/controllers/second-factor-add-totp.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js.es6
rename to app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-edit-security-key.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-edit-security-key.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-edit-security-key.js.es6
rename to app/assets/javascripts/discourse/controllers/second-factor-edit-security-key.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-edit.js.es6 b/app/assets/javascripts/discourse/controllers/second-factor-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-edit.js.es6
rename to app/assets/javascripts/discourse/controllers/second-factor-edit.js
diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/static.js.es6
rename to app/assets/javascripts/discourse/controllers/static.js
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tag-groups-edit.js.es6
rename to app/assets/javascripts/discourse/controllers/tag-groups-edit.js
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-new.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tag-groups-new.js.es6
rename to app/assets/javascripts/discourse/controllers/tag-groups-new.js
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tag-groups.js.es6
rename to app/assets/javascripts/discourse/controllers/tag-groups.js
diff --git a/app/assets/javascripts/discourse/controllers/tags-index.js.es6 b/app/assets/javascripts/discourse/controllers/tags-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tags-index.js.es6
rename to app/assets/javascripts/discourse/controllers/tags-index.js
diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tags-show.js.es6
rename to app/assets/javascripts/discourse/controllers/tags-show.js
diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
rename to app/assets/javascripts/discourse/controllers/topic-bulk-actions.js
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/topic.js.es6
rename to app/assets/javascripts/discourse/controllers/topic.js
diff --git a/app/assets/javascripts/discourse/controllers/upload-selector.js.es6 b/app/assets/javascripts/discourse/controllers/upload-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/upload-selector.js.es6
rename to app/assets/javascripts/discourse/controllers/upload-selector.js
diff --git a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js.es6
rename to app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-activity.js.es6
rename to app/assets/javascripts/discourse/controllers/user-activity.js
diff --git a/app/assets/javascripts/discourse/controllers/user-badges.js.es6 b/app/assets/javascripts/discourse/controllers/user-badges.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-badges.js.es6
rename to app/assets/javascripts/discourse/controllers/user-badges.js
diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-card.js.es6
rename to app/assets/javascripts/discourse/controllers/user-card.js
diff --git a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6 b/app/assets/javascripts/discourse/controllers/user-invited-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
rename to app/assets/javascripts/discourse/controllers/user-invited-show.js
diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 b/app/assets/javascripts/discourse/controllers/user-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-notifications.js.es6
rename to app/assets/javascripts/discourse/controllers/user-notifications.js
diff --git a/app/assets/javascripts/discourse/controllers/user-posts.js.es6 b/app/assets/javascripts/discourse/controllers/user-posts.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-posts.js.es6
rename to app/assets/javascripts/discourse/controllers/user-posts.js
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-private-messages-tags.js.es6
rename to app/assets/javascripts/discourse/controllers/user-private-messages-tags.js
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
rename to app/assets/javascripts/discourse/controllers/user-private-messages.js
diff --git a/app/assets/javascripts/discourse/controllers/user-summary.js.es6 b/app/assets/javascripts/discourse/controllers/user-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-summary.js.es6
rename to app/assets/javascripts/discourse/controllers/user-summary.js
diff --git a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6 b/app/assets/javascripts/discourse/controllers/user-topics-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
rename to app/assets/javascripts/discourse/controllers/user-topics-list.js
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user.js.es6
rename to app/assets/javascripts/discourse/controllers/user.js
diff --git a/app/assets/javascripts/discourse/controllers/users.js.es6 b/app/assets/javascripts/discourse/controllers/users.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/users.js.es6
rename to app/assets/javascripts/discourse/controllers/users.js
diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/application.js.es6
rename to app/assets/javascripts/discourse/helpers/application.js
diff --git a/app/assets/javascripts/discourse/helpers/border-color.js.es6 b/app/assets/javascripts/discourse/helpers/border-color.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/border-color.js.es6
rename to app/assets/javascripts/discourse/helpers/border-color.js
diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar-template.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6
rename to app/assets/javascripts/discourse/helpers/bound-avatar-template.js
diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
rename to app/assets/javascripts/discourse/helpers/bound-avatar.js
diff --git a/app/assets/javascripts/discourse/helpers/bound-category-link.js.es6 b/app/assets/javascripts/discourse/helpers/bound-category-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/bound-category-link.js.es6
rename to app/assets/javascripts/discourse/helpers/bound-category-link.js
diff --git a/app/assets/javascripts/discourse/helpers/bound-date.js.es6 b/app/assets/javascripts/discourse/helpers/bound-date.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/bound-date.js.es6
rename to app/assets/javascripts/discourse/helpers/bound-date.js
diff --git a/app/assets/javascripts/discourse/helpers/capitalize-string.js.es6 b/app/assets/javascripts/discourse/helpers/capitalize-string.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/capitalize-string.js.es6
rename to app/assets/javascripts/discourse/helpers/capitalize-string.js
diff --git a/app/assets/javascripts/discourse/helpers/category-badge.js.es6 b/app/assets/javascripts/discourse/helpers/category-badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/category-badge.js.es6
rename to app/assets/javascripts/discourse/helpers/category-badge.js
diff --git a/app/assets/javascripts/discourse/helpers/category-link.js.es6 b/app/assets/javascripts/discourse/helpers/category-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/category-link.js.es6
rename to app/assets/javascripts/discourse/helpers/category-link.js
diff --git a/app/assets/javascripts/discourse/helpers/cold-age-class.js.es6 b/app/assets/javascripts/discourse/helpers/cold-age-class.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/cold-age-class.js.es6
rename to app/assets/javascripts/discourse/helpers/cold-age-class.js
diff --git a/app/assets/javascripts/discourse/helpers/custom-html.js.es6 b/app/assets/javascripts/discourse/helpers/custom-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/custom-html.js.es6
rename to app/assets/javascripts/discourse/helpers/custom-html.js
diff --git a/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6 b/app/assets/javascripts/discourse/helpers/dash-if-empty.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6
rename to app/assets/javascripts/discourse/helpers/dash-if-empty.js
diff --git a/app/assets/javascripts/discourse/helpers/dasherize.js.es6 b/app/assets/javascripts/discourse/helpers/dasherize.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/dasherize.js.es6
rename to app/assets/javascripts/discourse/helpers/dasherize.js
diff --git a/app/assets/javascripts/discourse/helpers/dir-span.js.es6 b/app/assets/javascripts/discourse/helpers/dir-span.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/dir-span.js.es6
rename to app/assets/javascripts/discourse/helpers/dir-span.js
diff --git a/app/assets/javascripts/discourse/helpers/discourse-tag.js.es6 b/app/assets/javascripts/discourse/helpers/discourse-tag.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/discourse-tag.js.es6
rename to app/assets/javascripts/discourse/helpers/discourse-tag.js
diff --git a/app/assets/javascripts/discourse/helpers/discourse-tags.js.es6 b/app/assets/javascripts/discourse/helpers/discourse-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/discourse-tags.js.es6
rename to app/assets/javascripts/discourse/helpers/discourse-tags.js
diff --git a/app/assets/javascripts/discourse/helpers/editable-value.js.es6 b/app/assets/javascripts/discourse/helpers/editable-value.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/editable-value.js.es6
rename to app/assets/javascripts/discourse/helpers/editable-value.js
diff --git a/app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6 b/app/assets/javascripts/discourse/helpers/fa-icon-node.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6
rename to app/assets/javascripts/discourse/helpers/fa-icon-node.js
diff --git a/app/assets/javascripts/discourse/helpers/float.js.es6 b/app/assets/javascripts/discourse/helpers/float.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/float.js.es6
rename to app/assets/javascripts/discourse/helpers/float.js
diff --git a/app/assets/javascripts/discourse/helpers/format-age.js.es6 b/app/assets/javascripts/discourse/helpers/format-age.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/format-age.js.es6
rename to app/assets/javascripts/discourse/helpers/format-age.js
diff --git a/app/assets/javascripts/discourse/helpers/format-date.js.es6 b/app/assets/javascripts/discourse/helpers/format-date.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/format-date.js.es6
rename to app/assets/javascripts/discourse/helpers/format-date.js
diff --git a/app/assets/javascripts/discourse/helpers/format-username.js.es6 b/app/assets/javascripts/discourse/helpers/format-username.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/format-username.js.es6
rename to app/assets/javascripts/discourse/helpers/format-username.js
diff --git a/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6 b/app/assets/javascripts/discourse/helpers/icon-or-image.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
rename to app/assets/javascripts/discourse/helpers/icon-or-image.js
diff --git a/app/assets/javascripts/discourse/helpers/inline-date.js.es6 b/app/assets/javascripts/discourse/helpers/inline-date.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/inline-date.js.es6
rename to app/assets/javascripts/discourse/helpers/inline-date.js
diff --git a/app/assets/javascripts/discourse/helpers/node.js.es6 b/app/assets/javascripts/discourse/helpers/node.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/node.js.es6
rename to app/assets/javascripts/discourse/helpers/node.js
diff --git a/app/assets/javascripts/discourse/helpers/period-title.js.es6 b/app/assets/javascripts/discourse/helpers/period-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/period-title.js.es6
rename to app/assets/javascripts/discourse/helpers/period-title.js
diff --git a/app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js.es6 b/app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js.es6
rename to app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js
diff --git a/app/assets/javascripts/discourse/helpers/raw.js.es6 b/app/assets/javascripts/discourse/helpers/raw.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/raw.js.es6
rename to app/assets/javascripts/discourse/helpers/raw.js
diff --git a/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6 b/app/assets/javascripts/discourse/helpers/replace-emoji.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/replace-emoji.js.es6
rename to app/assets/javascripts/discourse/helpers/replace-emoji.js
diff --git a/app/assets/javascripts/discourse/helpers/reviewable-history-description.js.es6 b/app/assets/javascripts/discourse/helpers/reviewable-history-description.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/reviewable-history-description.js.es6
rename to app/assets/javascripts/discourse/helpers/reviewable-history-description.js
diff --git a/app/assets/javascripts/discourse/helpers/reviewable-status.js.es6 b/app/assets/javascripts/discourse/helpers/reviewable-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/reviewable-status.js.es6
rename to app/assets/javascripts/discourse/helpers/reviewable-status.js
diff --git a/app/assets/javascripts/discourse/helpers/route-action.js.es6 b/app/assets/javascripts/discourse/helpers/route-action.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/route-action.js.es6
rename to app/assets/javascripts/discourse/helpers/route-action.js
diff --git a/app/assets/javascripts/discourse/helpers/shorten-url.js.es6 b/app/assets/javascripts/discourse/helpers/shorten-url.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/shorten-url.js.es6
rename to app/assets/javascripts/discourse/helpers/shorten-url.js
diff --git a/app/assets/javascripts/discourse/helpers/theme-helpers.js.es6 b/app/assets/javascripts/discourse/helpers/theme-helpers.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/theme-helpers.js.es6
rename to app/assets/javascripts/discourse/helpers/theme-helpers.js
diff --git a/app/assets/javascripts/discourse/helpers/topic-featured-link.js.es6 b/app/assets/javascripts/discourse/helpers/topic-featured-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/topic-featured-link.js.es6
rename to app/assets/javascripts/discourse/helpers/topic-featured-link.js
diff --git a/app/assets/javascripts/discourse/helpers/topic-link.js.es6 b/app/assets/javascripts/discourse/helpers/topic-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/topic-link.js.es6
rename to app/assets/javascripts/discourse/helpers/topic-link.js
diff --git a/app/assets/javascripts/discourse/helpers/topic-status-icons.js.es6 b/app/assets/javascripts/discourse/helpers/topic-status-icons.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/topic-status-icons.js.es6
rename to app/assets/javascripts/discourse/helpers/topic-status-icons.js
diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/user-avatar.js.es6
rename to app/assets/javascripts/discourse/helpers/user-avatar.js
diff --git a/app/assets/javascripts/discourse/helpers/user-status.js.es6 b/app/assets/javascripts/discourse/helpers/user-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/user-status.js.es6
rename to app/assets/javascripts/discourse/helpers/user-status.js
diff --git a/app/assets/javascripts/discourse/initializers/asset-version.js.es6 b/app/assets/javascripts/discourse/initializers/asset-version.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/asset-version.js.es6
rename to app/assets/javascripts/discourse/initializers/asset-version.js
diff --git a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 b/app/assets/javascripts/discourse/initializers/auth-complete.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/auth-complete.js.es6
rename to app/assets/javascripts/discourse/initializers/auth-complete.js
diff --git a/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6 b/app/assets/javascripts/discourse/initializers/auto-load-modules.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
rename to app/assets/javascripts/discourse/initializers/auto-load-modules.js
diff --git a/app/assets/javascripts/discourse/initializers/avatar-select.js.es6 b/app/assets/javascripts/discourse/initializers/avatar-select.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/avatar-select.js.es6
rename to app/assets/javascripts/discourse/initializers/avatar-select.js
diff --git a/app/assets/javascripts/discourse/initializers/badging.js.es6 b/app/assets/javascripts/discourse/initializers/badging.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/badging.js.es6
rename to app/assets/javascripts/discourse/initializers/badging.js
diff --git a/app/assets/javascripts/discourse/initializers/banner.js.es6 b/app/assets/javascripts/discourse/initializers/banner.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/banner.js.es6
rename to app/assets/javascripts/discourse/initializers/banner.js
diff --git a/app/assets/javascripts/discourse/initializers/click-interceptor.js.es6 b/app/assets/javascripts/discourse/initializers/click-interceptor.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/click-interceptor.js.es6
rename to app/assets/javascripts/discourse/initializers/click-interceptor.js
diff --git a/app/assets/javascripts/discourse/initializers/csrf-token.js.es6 b/app/assets/javascripts/discourse/initializers/csrf-token.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/csrf-token.js.es6
rename to app/assets/javascripts/discourse/initializers/csrf-token.js
diff --git a/app/assets/javascripts/discourse/initializers/d-popover.js.es6 b/app/assets/javascripts/discourse/initializers/d-popover.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/d-popover.js.es6
rename to app/assets/javascripts/discourse/initializers/d-popover.js
diff --git a/app/assets/javascripts/discourse/initializers/ember-events.js.es6 b/app/assets/javascripts/discourse/initializers/ember-events.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/ember-events.js.es6
rename to app/assets/javascripts/discourse/initializers/ember-events.js
diff --git a/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6 b/app/assets/javascripts/discourse/initializers/enable-emoji.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/enable-emoji.js.es6
rename to app/assets/javascripts/discourse/initializers/enable-emoji.js
diff --git a/app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js.es6 b/app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js.es6
rename to app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js
diff --git a/app/assets/javascripts/discourse/initializers/inject-objects.js.es6 b/app/assets/javascripts/discourse/initializers/inject-objects.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/inject-objects.js.es6
rename to app/assets/javascripts/discourse/initializers/inject-objects.js
diff --git a/app/assets/javascripts/discourse/initializers/jquery-plugins.js.es6 b/app/assets/javascripts/discourse/initializers/jquery-plugins.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/jquery-plugins.js.es6
rename to app/assets/javascripts/discourse/initializers/jquery-plugins.js
diff --git a/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js.es6
rename to app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
diff --git a/app/assets/javascripts/discourse/initializers/live-development.js.es6 b/app/assets/javascripts/discourse/initializers/live-development.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/live-development.js.es6
rename to app/assets/javascripts/discourse/initializers/live-development.js
diff --git a/app/assets/javascripts/discourse/initializers/localization.js.es6 b/app/assets/javascripts/discourse/initializers/localization.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/localization.js.es6
rename to app/assets/javascripts/discourse/initializers/localization.js
diff --git a/app/assets/javascripts/discourse/initializers/logout.js.es6 b/app/assets/javascripts/discourse/initializers/logout.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/logout.js.es6
rename to app/assets/javascripts/discourse/initializers/logout.js
diff --git a/app/assets/javascripts/discourse/initializers/logs-notice.js.es6 b/app/assets/javascripts/discourse/initializers/logs-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/logs-notice.js.es6
rename to app/assets/javascripts/discourse/initializers/logs-notice.js
diff --git a/app/assets/javascripts/discourse/initializers/message-bus.js.es6 b/app/assets/javascripts/discourse/initializers/message-bus.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/message-bus.js.es6
rename to app/assets/javascripts/discourse/initializers/message-bus.js
diff --git a/app/assets/javascripts/discourse/initializers/mobile.js.es6 b/app/assets/javascripts/discourse/initializers/mobile.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/mobile.js.es6
rename to app/assets/javascripts/discourse/initializers/mobile.js
diff --git a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6 b/app/assets/javascripts/discourse/initializers/page-tracking.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/page-tracking.js.es6
rename to app/assets/javascripts/discourse/initializers/page-tracking.js
diff --git a/app/assets/javascripts/discourse/initializers/post-decorations.js.es6 b/app/assets/javascripts/discourse/initializers/post-decorations.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/post-decorations.js.es6
rename to app/assets/javascripts/discourse/initializers/post-decorations.js
diff --git a/app/assets/javascripts/discourse/initializers/read-only.js.es6 b/app/assets/javascripts/discourse/initializers/read-only.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/read-only.js.es6
rename to app/assets/javascripts/discourse/initializers/read-only.js
diff --git a/app/assets/javascripts/discourse/initializers/register-discourse-location.js.es6 b/app/assets/javascripts/discourse/initializers/register-discourse-location.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/register-discourse-location.js.es6
rename to app/assets/javascripts/discourse/initializers/register-discourse-location.js
diff --git a/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6 b/app/assets/javascripts/discourse/initializers/register-service-worker.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
rename to app/assets/javascripts/discourse/initializers/register-service-worker.js
diff --git a/app/assets/javascripts/discourse/initializers/relative-ages.js.es6 b/app/assets/javascripts/discourse/initializers/relative-ages.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/relative-ages.js.es6
rename to app/assets/javascripts/discourse/initializers/relative-ages.js
diff --git a/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6 b/app/assets/javascripts/discourse/initializers/sharing-sources.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/sharing-sources.js.es6
rename to app/assets/javascripts/discourse/initializers/sharing-sources.js
diff --git a/app/assets/javascripts/discourse/initializers/show-footer.js.es6 b/app/assets/javascripts/discourse/initializers/show-footer.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/show-footer.js.es6
rename to app/assets/javascripts/discourse/initializers/show-footer.js
diff --git a/app/assets/javascripts/discourse/initializers/signup-cta.js.es6 b/app/assets/javascripts/discourse/initializers/signup-cta.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/signup-cta.js.es6
rename to app/assets/javascripts/discourse/initializers/signup-cta.js
diff --git a/app/assets/javascripts/discourse/initializers/strip-mobile-app-url-params.js.es6 b/app/assets/javascripts/discourse/initializers/strip-mobile-app-url-params.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/strip-mobile-app-url-params.js.es6
rename to app/assets/javascripts/discourse/initializers/strip-mobile-app-url-params.js
diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
rename to app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js
diff --git a/app/assets/javascripts/discourse/initializers/title-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/title-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/title-notifications.js.es6
rename to app/assets/javascripts/discourse/initializers/title-notifications.js
diff --git a/app/assets/javascripts/discourse/initializers/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/initializers/topic-footer-buttons.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/topic-footer-buttons.js.es6
rename to app/assets/javascripts/discourse/initializers/topic-footer-buttons.js
diff --git a/app/assets/javascripts/discourse/initializers/url-redirects.js.es6 b/app/assets/javascripts/discourse/initializers/url-redirects.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/url-redirects.js.es6
rename to app/assets/javascripts/discourse/initializers/url-redirects.js
diff --git a/app/assets/javascripts/discourse/lib/after-transition.js.es6 b/app/assets/javascripts/discourse/lib/after-transition.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/after-transition.js.es6
rename to app/assets/javascripts/discourse/lib/after-transition.js
diff --git a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 b/app/assets/javascripts/discourse/lib/ajax-error.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/ajax-error.js.es6
rename to app/assets/javascripts/discourse/lib/ajax-error.js
diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/autocomplete.js.es6
rename to app/assets/javascripts/discourse/lib/autocomplete.js
diff --git a/app/assets/javascripts/discourse/lib/cached-topic-list.js.es6 b/app/assets/javascripts/discourse/lib/cached-topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/cached-topic-list.js.es6
rename to app/assets/javascripts/discourse/lib/cached-topic-list.js
diff --git a/app/assets/javascripts/discourse/lib/category-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/category-hashtags.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/category-hashtags.js.es6
rename to app/assets/javascripts/discourse/lib/category-hashtags.js
diff --git a/app/assets/javascripts/discourse/lib/category-tag-search.js.es6 b/app/assets/javascripts/discourse/lib/category-tag-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/category-tag-search.js.es6
rename to app/assets/javascripts/discourse/lib/category-tag-search.js
diff --git a/app/assets/javascripts/discourse/lib/clean-dom.js.es6 b/app/assets/javascripts/discourse/lib/clean-dom.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/clean-dom.js.es6
rename to app/assets/javascripts/discourse/lib/clean-dom.js
diff --git a/app/assets/javascripts/discourse/lib/click-track.js.es6 b/app/assets/javascripts/discourse/lib/click-track.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/click-track.js.es6
rename to app/assets/javascripts/discourse/lib/click-track.js
diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/computed.js.es6
rename to app/assets/javascripts/discourse/lib/computed.js
diff --git a/app/assets/javascripts/discourse/lib/copy-text.js.es6 b/app/assets/javascripts/discourse/lib/copy-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/copy-text.js.es6
rename to app/assets/javascripts/discourse/lib/copy-text.js
diff --git a/app/assets/javascripts/discourse/lib/d-popover.js.es6 b/app/assets/javascripts/discourse/lib/d-popover.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/d-popover.js.es6
rename to app/assets/javascripts/discourse/lib/d-popover.js
diff --git a/app/assets/javascripts/discourse/lib/debounce.js.es6 b/app/assets/javascripts/discourse/lib/debounce.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/debounce.js.es6
rename to app/assets/javascripts/discourse/lib/debounce.js
diff --git a/app/assets/javascripts/discourse/lib/decimal-adjust.js.es6 b/app/assets/javascripts/discourse/lib/decimal-adjust.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/decimal-adjust.js.es6
rename to app/assets/javascripts/discourse/lib/decimal-adjust.js
diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 b/app/assets/javascripts/discourse/lib/desktop-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
rename to app/assets/javascripts/discourse/lib/desktop-notifications.js
diff --git a/app/assets/javascripts/discourse/lib/dirty-keys.js.es6 b/app/assets/javascripts/discourse/lib/dirty-keys.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/dirty-keys.js.es6
rename to app/assets/javascripts/discourse/lib/dirty-keys.js
diff --git a/app/assets/javascripts/discourse/lib/discourse-location.js.es6 b/app/assets/javascripts/discourse/lib/discourse-location.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/discourse-location.js.es6
rename to app/assets/javascripts/discourse/lib/discourse-location.js
diff --git a/app/assets/javascripts/discourse/lib/export-csv.js.es6 b/app/assets/javascripts/discourse/lib/export-csv.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/export-csv.js.es6
rename to app/assets/javascripts/discourse/lib/export-csv.js
diff --git a/app/assets/javascripts/discourse/lib/export-result.js.es6 b/app/assets/javascripts/discourse/lib/export-result.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/export-result.js.es6
rename to app/assets/javascripts/discourse/lib/export-result.js
diff --git a/app/assets/javascripts/discourse/lib/eyeline.js.es6 b/app/assets/javascripts/discourse/lib/eyeline.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/eyeline.js.es6
rename to app/assets/javascripts/discourse/lib/eyeline.js
diff --git a/app/assets/javascripts/discourse/lib/formatter.js.es6 b/app/assets/javascripts/discourse/lib/formatter.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/formatter.js.es6
rename to app/assets/javascripts/discourse/lib/formatter.js
diff --git a/app/assets/javascripts/discourse/lib/hash.js.es6 b/app/assets/javascripts/discourse/lib/hash.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/hash.js.es6
rename to app/assets/javascripts/discourse/lib/hash.js
diff --git a/app/assets/javascripts/discourse/lib/highlight-syntax.js.es6 b/app/assets/javascripts/discourse/lib/highlight-syntax.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/highlight-syntax.js.es6
rename to app/assets/javascripts/discourse/lib/highlight-syntax.js
diff --git a/app/assets/javascripts/discourse/lib/highlight-text.js.es6 b/app/assets/javascripts/discourse/lib/highlight-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/highlight-text.js.es6
rename to app/assets/javascripts/discourse/lib/highlight-text.js
diff --git a/app/assets/javascripts/discourse/lib/intercept-click.js.es6 b/app/assets/javascripts/discourse/lib/intercept-click.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/intercept-click.js.es6
rename to app/assets/javascripts/discourse/lib/intercept-click.js
diff --git a/app/assets/javascripts/discourse/lib/is-element-in-viewport.js.es6 b/app/assets/javascripts/discourse/lib/is-element-in-viewport.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/is-element-in-viewport.js.es6
rename to app/assets/javascripts/discourse/lib/is-element-in-viewport.js
diff --git a/app/assets/javascripts/discourse/lib/key-value-store.js.es6 b/app/assets/javascripts/discourse/lib/key-value-store.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/key-value-store.js.es6
rename to app/assets/javascripts/discourse/lib/key-value-store.js
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
rename to app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
diff --git a/app/assets/javascripts/discourse/lib/lazy-load-images.js.es6 b/app/assets/javascripts/discourse/lib/lazy-load-images.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/lazy-load-images.js.es6
rename to app/assets/javascripts/discourse/lib/lazy-load-images.js
diff --git a/app/assets/javascripts/discourse/lib/lightbox.js.es6 b/app/assets/javascripts/discourse/lib/lightbox.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/lightbox.js.es6
rename to app/assets/javascripts/discourse/lib/lightbox.js
diff --git a/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/link-category-hashtags.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6
rename to app/assets/javascripts/discourse/lib/link-category-hashtags.js
diff --git a/app/assets/javascripts/discourse/lib/link-lookup.js.es6 b/app/assets/javascripts/discourse/lib/link-lookup.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/link-lookup.js.es6
rename to app/assets/javascripts/discourse/lib/link-lookup.js
diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js.es6 b/app/assets/javascripts/discourse/lib/link-mentions.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/link-mentions.js.es6
rename to app/assets/javascripts/discourse/lib/link-mentions.js
diff --git a/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6 b/app/assets/javascripts/discourse/lib/link-tag-hashtag.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6
rename to app/assets/javascripts/discourse/lib/link-tag-hashtag.js
diff --git a/app/assets/javascripts/discourse/lib/load-script.js.es6 b/app/assets/javascripts/discourse/lib/load-script.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/load-script.js.es6
rename to app/assets/javascripts/discourse/lib/load-script.js
diff --git a/app/assets/javascripts/discourse/lib/lock-on.js.es6 b/app/assets/javascripts/discourse/lib/lock-on.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/lock-on.js.es6
rename to app/assets/javascripts/discourse/lib/lock-on.js
diff --git a/app/assets/javascripts/discourse/lib/logout.js.es6 b/app/assets/javascripts/discourse/lib/logout.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/logout.js.es6
rename to app/assets/javascripts/discourse/lib/logout.js
diff --git a/app/assets/javascripts/discourse/lib/mobile.js.es6 b/app/assets/javascripts/discourse/lib/mobile.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/mobile.js.es6
rename to app/assets/javascripts/discourse/lib/mobile.js
diff --git a/app/assets/javascripts/discourse/lib/notification-levels.js.es6 b/app/assets/javascripts/discourse/lib/notification-levels.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/notification-levels.js.es6
rename to app/assets/javascripts/discourse/lib/notification-levels.js
diff --git a/app/assets/javascripts/discourse/lib/offset-calculator.js.es6 b/app/assets/javascripts/discourse/lib/offset-calculator.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/offset-calculator.js.es6
rename to app/assets/javascripts/discourse/lib/offset-calculator.js
diff --git a/app/assets/javascripts/discourse/lib/optional-service.js.es6 b/app/assets/javascripts/discourse/lib/optional-service.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/optional-service.js.es6
rename to app/assets/javascripts/discourse/lib/optional-service.js
diff --git a/app/assets/javascripts/discourse/lib/page-tracker.js.es6 b/app/assets/javascripts/discourse/lib/page-tracker.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/page-tracker.js.es6
rename to app/assets/javascripts/discourse/lib/page-tracker.js
diff --git a/app/assets/javascripts/discourse/lib/page-visible.js.es6 b/app/assets/javascripts/discourse/lib/page-visible.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/page-visible.js.es6
rename to app/assets/javascripts/discourse/lib/page-visible.js
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/plugin-api.js.es6
rename to app/assets/javascripts/discourse/lib/plugin-api.js
diff --git a/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6 b/app/assets/javascripts/discourse/lib/plugin-connectors.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
rename to app/assets/javascripts/discourse/lib/plugin-connectors.js
diff --git a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6 b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
rename to app/assets/javascripts/discourse/lib/posts-with-placeholders.js
diff --git a/app/assets/javascripts/discourse/lib/push-notifications.js.es6 b/app/assets/javascripts/discourse/lib/push-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/push-notifications.js.es6
rename to app/assets/javascripts/discourse/lib/push-notifications.js
diff --git a/app/assets/javascripts/discourse/lib/pwa-utils.js.es6 b/app/assets/javascripts/discourse/lib/pwa-utils.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/pwa-utils.js.es6
rename to app/assets/javascripts/discourse/lib/pwa-utils.js
diff --git a/app/assets/javascripts/discourse/lib/quote-state.js.es6 b/app/assets/javascripts/discourse/lib/quote-state.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/quote-state.js.es6
rename to app/assets/javascripts/discourse/lib/quote-state.js
diff --git a/app/assets/javascripts/discourse/lib/quote.js.es6 b/app/assets/javascripts/discourse/lib/quote.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/quote.js.es6
rename to app/assets/javascripts/discourse/lib/quote.js
diff --git a/app/assets/javascripts/discourse/lib/raw-templates.js.es6 b/app/assets/javascripts/discourse/lib/raw-templates.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/raw-templates.js.es6
rename to app/assets/javascripts/discourse/lib/raw-templates.js
diff --git a/app/assets/javascripts/discourse/lib/register-topic-footer-button.js.es6 b/app/assets/javascripts/discourse/lib/register-topic-footer-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/register-topic-footer-button.js.es6
rename to app/assets/javascripts/discourse/lib/register-topic-footer-button.js
diff --git a/app/assets/javascripts/discourse/lib/render-tag.js.es6 b/app/assets/javascripts/discourse/lib/render-tag.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/render-tag.js.es6
rename to app/assets/javascripts/discourse/lib/render-tag.js
diff --git a/app/assets/javascripts/discourse/lib/render-tags.js.es6 b/app/assets/javascripts/discourse/lib/render-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/render-tags.js.es6
rename to app/assets/javascripts/discourse/lib/render-tags.js
diff --git a/app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6 b/app/assets/javascripts/discourse/lib/render-topic-featured-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6
rename to app/assets/javascripts/discourse/lib/render-topic-featured-link.js
diff --git a/app/assets/javascripts/discourse/lib/reports-loader.js.es6 b/app/assets/javascripts/discourse/lib/reports-loader.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/reports-loader.js.es6
rename to app/assets/javascripts/discourse/lib/reports-loader.js
diff --git a/app/assets/javascripts/discourse/lib/round.js.es6 b/app/assets/javascripts/discourse/lib/round.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/round.js.es6
rename to app/assets/javascripts/discourse/lib/round.js
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/safari-hacks.js.es6
rename to app/assets/javascripts/discourse/lib/safari-hacks.js
diff --git a/app/assets/javascripts/discourse/lib/screen-track.js.es6 b/app/assets/javascripts/discourse/lib/screen-track.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/screen-track.js.es6
rename to app/assets/javascripts/discourse/lib/screen-track.js
diff --git a/app/assets/javascripts/discourse/lib/search.js.es6 b/app/assets/javascripts/discourse/lib/search.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/search.js.es6
rename to app/assets/javascripts/discourse/lib/search.js
diff --git a/app/assets/javascripts/discourse/lib/settings.js.es6 b/app/assets/javascripts/discourse/lib/settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/settings.js.es6
rename to app/assets/javascripts/discourse/lib/settings.js
diff --git a/app/assets/javascripts/discourse/lib/sharing.js.es6 b/app/assets/javascripts/discourse/lib/sharing.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/sharing.js.es6
rename to app/assets/javascripts/discourse/lib/sharing.js
diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/show-modal.js.es6
rename to app/assets/javascripts/discourse/lib/show-modal.js
diff --git a/app/assets/javascripts/discourse/lib/static-route-builder.js.es6 b/app/assets/javascripts/discourse/lib/static-route-builder.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/static-route-builder.js.es6
rename to app/assets/javascripts/discourse/lib/static-route-builder.js
diff --git a/app/assets/javascripts/discourse/lib/svg-sprite-loader.js.es6 b/app/assets/javascripts/discourse/lib/svg-sprite-loader.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/svg-sprite-loader.js.es6
rename to app/assets/javascripts/discourse/lib/svg-sprite-loader.js
diff --git a/app/assets/javascripts/discourse/lib/tag-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/tag-hashtags.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/tag-hashtags.js.es6
rename to app/assets/javascripts/discourse/lib/tag-hashtags.js
diff --git a/app/assets/javascripts/discourse/lib/text-direction.js.es6 b/app/assets/javascripts/discourse/lib/text-direction.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/text-direction.js.es6
rename to app/assets/javascripts/discourse/lib/text-direction.js
diff --git a/app/assets/javascripts/discourse/lib/text.js.es6 b/app/assets/javascripts/discourse/lib/text.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/text.js.es6
rename to app/assets/javascripts/discourse/lib/text.js
diff --git a/app/assets/javascripts/discourse/lib/theme-selector.js.es6 b/app/assets/javascripts/discourse/lib/theme-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/theme-selector.js.es6
rename to app/assets/javascripts/discourse/lib/theme-selector.js
diff --git a/app/assets/javascripts/discourse/lib/to-markdown.js.es6 b/app/assets/javascripts/discourse/lib/to-markdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/to-markdown.js.es6
rename to app/assets/javascripts/discourse/lib/to-markdown.js
diff --git a/app/assets/javascripts/discourse/lib/tooltip.js.es6 b/app/assets/javascripts/discourse/lib/tooltip.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/tooltip.js.es6
rename to app/assets/javascripts/discourse/lib/tooltip.js
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/transform-post.js.es6
rename to app/assets/javascripts/discourse/lib/transform-post.js
diff --git a/app/assets/javascripts/discourse/lib/uploads.js.es6 b/app/assets/javascripts/discourse/lib/uploads.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/uploads.js.es6
rename to app/assets/javascripts/discourse/lib/uploads.js
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/url.js.es6
rename to app/assets/javascripts/discourse/lib/url.js
diff --git a/app/assets/javascripts/discourse/lib/user-activation.js.es6 b/app/assets/javascripts/discourse/lib/user-activation.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/user-activation.js.es6
rename to app/assets/javascripts/discourse/lib/user-activation.js
diff --git a/app/assets/javascripts/discourse/lib/user-search.js.es6 b/app/assets/javascripts/discourse/lib/user-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/user-search.js.es6
rename to app/assets/javascripts/discourse/lib/user-search.js
diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/utilities.js.es6
rename to app/assets/javascripts/discourse/lib/utilities.js
diff --git a/app/assets/javascripts/discourse/lib/webauthn.js.es6 b/app/assets/javascripts/discourse/lib/webauthn.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/webauthn.js.es6
rename to app/assets/javascripts/discourse/lib/webauthn.js
diff --git a/app/assets/javascripts/discourse/mapping-router.js.es6 b/app/assets/javascripts/discourse/mapping-router.js
similarity index 100%
rename from app/assets/javascripts/discourse/mapping-router.js.es6
rename to app/assets/javascripts/discourse/mapping-router.js
diff --git a/app/assets/javascripts/discourse/mixins/add-archetype-class.js.es6 b/app/assets/javascripts/discourse/mixins/add-archetype-class.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/add-archetype-class.js.es6
rename to app/assets/javascripts/discourse/mixins/add-archetype-class.js
diff --git a/app/assets/javascripts/discourse/mixins/buffered-content.js.es6 b/app/assets/javascripts/discourse/mixins/buffered-content.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/buffered-content.js.es6
rename to app/assets/javascripts/discourse/mixins/buffered-content.js
diff --git a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6 b/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
rename to app/assets/javascripts/discourse/mixins/bulk-topic-selection.js
diff --git a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6 b/app/assets/javascripts/discourse/mixins/can-check-emails.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
rename to app/assets/javascripts/discourse/mixins/can-check-emails.js
diff --git a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6 b/app/assets/javascripts/discourse/mixins/card-contents-base.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
rename to app/assets/javascripts/discourse/mixins/card-contents-base.js
diff --git a/app/assets/javascripts/discourse/mixins/cleans-up.js.es6 b/app/assets/javascripts/discourse/mixins/cleans-up.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/cleans-up.js.es6
rename to app/assets/javascripts/discourse/mixins/cleans-up.js
diff --git a/app/assets/javascripts/discourse/mixins/docking.js.es6 b/app/assets/javascripts/discourse/mixins/docking.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/docking.js.es6
rename to app/assets/javascripts/discourse/mixins/docking.js
diff --git a/app/assets/javascripts/discourse/mixins/filter-mode.js.es6 b/app/assets/javascripts/discourse/mixins/filter-mode.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/filter-mode.js.es6
rename to app/assets/javascripts/discourse/mixins/filter-mode.js
diff --git a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6 b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
rename to app/assets/javascripts/discourse/mixins/grant-badge-controller.js
diff --git a/app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6 b/app/assets/javascripts/discourse/mixins/key-enter-escape.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6
rename to app/assets/javascripts/discourse/mixins/key-enter-escape.js
diff --git a/app/assets/javascripts/discourse/mixins/load-more.js.es6 b/app/assets/javascripts/discourse/mixins/load-more.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/load-more.js.es6
rename to app/assets/javascripts/discourse/mixins/load-more.js
diff --git a/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6 b/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js.es6
rename to app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js
diff --git a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 b/app/assets/javascripts/discourse/mixins/modal-functionality.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
rename to app/assets/javascripts/discourse/mixins/modal-functionality.js
diff --git a/app/assets/javascripts/discourse/mixins/name-validation.js.es6 b/app/assets/javascripts/discourse/mixins/name-validation.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/name-validation.js.es6
rename to app/assets/javascripts/discourse/mixins/name-validation.js
diff --git a/app/assets/javascripts/discourse/mixins/open-composer.js.es6 b/app/assets/javascripts/discourse/mixins/open-composer.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/open-composer.js.es6
rename to app/assets/javascripts/discourse/mixins/open-composer.js
diff --git a/app/assets/javascripts/discourse/mixins/pan-events.js.es6 b/app/assets/javascripts/discourse/mixins/pan-events.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/pan-events.js.es6
rename to app/assets/javascripts/discourse/mixins/pan-events.js
diff --git a/app/assets/javascripts/discourse/mixins/password-validation.js.es6 b/app/assets/javascripts/discourse/mixins/password-validation.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/password-validation.js.es6
rename to app/assets/javascripts/discourse/mixins/password-validation.js
diff --git a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6 b/app/assets/javascripts/discourse/mixins/scroll-top.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/scroll-top.js.es6
rename to app/assets/javascripts/discourse/mixins/scroll-top.js
diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js.es6 b/app/assets/javascripts/discourse/mixins/scrolling.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/scrolling.js.es6
rename to app/assets/javascripts/discourse/mixins/scrolling.js
diff --git a/app/assets/javascripts/discourse/mixins/singleton.js.es6 b/app/assets/javascripts/discourse/mixins/singleton.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/singleton.js.es6
rename to app/assets/javascripts/discourse/mixins/singleton.js
diff --git a/app/assets/javascripts/discourse/mixins/upload.js.es6 b/app/assets/javascripts/discourse/mixins/upload.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/upload.js.es6
rename to app/assets/javascripts/discourse/mixins/upload.js
diff --git a/app/assets/javascripts/discourse/mixins/url-refresh.js.es6 b/app/assets/javascripts/discourse/mixins/url-refresh.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/url-refresh.js.es6
rename to app/assets/javascripts/discourse/mixins/url-refresh.js
diff --git a/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6 b/app/assets/javascripts/discourse/mixins/user-fields-validation.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
rename to app/assets/javascripts/discourse/mixins/user-fields-validation.js
diff --git a/app/assets/javascripts/discourse/mixins/username-validation.js.es6 b/app/assets/javascripts/discourse/mixins/username-validation.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/username-validation.js.es6
rename to app/assets/javascripts/discourse/mixins/username-validation.js
diff --git a/app/assets/javascripts/discourse/mixins/viewing-action-type.js.es6 b/app/assets/javascripts/discourse/mixins/viewing-action-type.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/viewing-action-type.js.es6
rename to app/assets/javascripts/discourse/mixins/viewing-action-type.js
diff --git a/app/assets/javascripts/discourse/models/action-summary.js.es6 b/app/assets/javascripts/discourse/models/action-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/action-summary.js.es6
rename to app/assets/javascripts/discourse/models/action-summary.js
diff --git a/app/assets/javascripts/discourse/models/archetype.js.es6 b/app/assets/javascripts/discourse/models/archetype.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/archetype.js.es6
rename to app/assets/javascripts/discourse/models/archetype.js
diff --git a/app/assets/javascripts/discourse/models/badge-grouping.js.es6 b/app/assets/javascripts/discourse/models/badge-grouping.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/badge-grouping.js.es6
rename to app/assets/javascripts/discourse/models/badge-grouping.js
diff --git a/app/assets/javascripts/discourse/models/badge.js.es6 b/app/assets/javascripts/discourse/models/badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/badge.js.es6
rename to app/assets/javascripts/discourse/models/badge.js
diff --git a/app/assets/javascripts/discourse/models/bookmark.js.es6 b/app/assets/javascripts/discourse/models/bookmark.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/bookmark.js.es6
rename to app/assets/javascripts/discourse/models/bookmark.js
diff --git a/app/assets/javascripts/discourse/models/category-list.js.es6 b/app/assets/javascripts/discourse/models/category-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/category-list.js.es6
rename to app/assets/javascripts/discourse/models/category-list.js
diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/category.js.es6
rename to app/assets/javascripts/discourse/models/category.js
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/composer.js.es6
rename to app/assets/javascripts/discourse/models/composer.js
diff --git a/app/assets/javascripts/discourse/models/draft.js.es6 b/app/assets/javascripts/discourse/models/draft.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/draft.js.es6
rename to app/assets/javascripts/discourse/models/draft.js
diff --git a/app/assets/javascripts/discourse/models/group-history.js.es6 b/app/assets/javascripts/discourse/models/group-history.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/group-history.js.es6
rename to app/assets/javascripts/discourse/models/group-history.js
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/group.js.es6
rename to app/assets/javascripts/discourse/models/group.js
diff --git a/app/assets/javascripts/discourse/models/invite.js.es6 b/app/assets/javascripts/discourse/models/invite.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/invite.js.es6
rename to app/assets/javascripts/discourse/models/invite.js
diff --git a/app/assets/javascripts/discourse/models/login-method.js.es6 b/app/assets/javascripts/discourse/models/login-method.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/login-method.js.es6
rename to app/assets/javascripts/discourse/models/login-method.js
diff --git a/app/assets/javascripts/discourse/models/nav-item.js.es6 b/app/assets/javascripts/discourse/models/nav-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/nav-item.js.es6
rename to app/assets/javascripts/discourse/models/nav-item.js
diff --git a/app/assets/javascripts/discourse/models/permission-type.js.es6 b/app/assets/javascripts/discourse/models/permission-type.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/permission-type.js.es6
rename to app/assets/javascripts/discourse/models/permission-type.js
diff --git a/app/assets/javascripts/discourse/models/post-action-type.js.es6 b/app/assets/javascripts/discourse/models/post-action-type.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/post-action-type.js.es6
rename to app/assets/javascripts/discourse/models/post-action-type.js
diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/post-stream.js.es6
rename to app/assets/javascripts/discourse/models/post-stream.js
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/post.js.es6
rename to app/assets/javascripts/discourse/models/post.js
diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/rest.js.es6
rename to app/assets/javascripts/discourse/models/rest.js
diff --git a/app/assets/javascripts/discourse/models/result-set.js.es6 b/app/assets/javascripts/discourse/models/result-set.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/result-set.js.es6
rename to app/assets/javascripts/discourse/models/result-set.js
diff --git a/app/assets/javascripts/discourse/models/reviewable-history.js.es6 b/app/assets/javascripts/discourse/models/reviewable-history.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/reviewable-history.js.es6
rename to app/assets/javascripts/discourse/models/reviewable-history.js
diff --git a/app/assets/javascripts/discourse/models/reviewable.js.es6 b/app/assets/javascripts/discourse/models/reviewable.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/reviewable.js.es6
rename to app/assets/javascripts/discourse/models/reviewable.js
diff --git a/app/assets/javascripts/discourse/models/session.js.es6 b/app/assets/javascripts/discourse/models/session.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/session.js.es6
rename to app/assets/javascripts/discourse/models/session.js
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/site.js.es6
rename to app/assets/javascripts/discourse/models/site.js
diff --git a/app/assets/javascripts/discourse/models/static-page.js.es6 b/app/assets/javascripts/discourse/models/static-page.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/static-page.js.es6
rename to app/assets/javascripts/discourse/models/static-page.js
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/store.js.es6
rename to app/assets/javascripts/discourse/models/store.js
diff --git a/app/assets/javascripts/discourse/models/tag-group.js.es6 b/app/assets/javascripts/discourse/models/tag-group.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/tag-group.js.es6
rename to app/assets/javascripts/discourse/models/tag-group.js
diff --git a/app/assets/javascripts/discourse/models/tag.js.es6 b/app/assets/javascripts/discourse/models/tag.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/tag.js.es6
rename to app/assets/javascripts/discourse/models/tag.js
diff --git a/app/assets/javascripts/discourse/models/topic-details.js.es6 b/app/assets/javascripts/discourse/models/topic-details.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic-details.js.es6
rename to app/assets/javascripts/discourse/models/topic-details.js
diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic-list.js.es6
rename to app/assets/javascripts/discourse/models/topic-list.js
diff --git a/app/assets/javascripts/discourse/models/topic-timer.js.es6 b/app/assets/javascripts/discourse/models/topic-timer.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic-timer.js.es6
rename to app/assets/javascripts/discourse/models/topic-timer.js
diff --git a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 b/app/assets/javascripts/discourse/models/topic-tracking-state.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
rename to app/assets/javascripts/discourse/models/topic-tracking-state.js
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic.js.es6
rename to app/assets/javascripts/discourse/models/topic.js
diff --git a/app/assets/javascripts/discourse/models/trust-level.js.es6 b/app/assets/javascripts/discourse/models/trust-level.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/trust-level.js.es6
rename to app/assets/javascripts/discourse/models/trust-level.js
diff --git a/app/assets/javascripts/discourse/models/user-action-group.js.es6 b/app/assets/javascripts/discourse/models/user-action-group.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-action-group.js.es6
rename to app/assets/javascripts/discourse/models/user-action-group.js
diff --git a/app/assets/javascripts/discourse/models/user-action-stat.js.es6 b/app/assets/javascripts/discourse/models/user-action-stat.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-action-stat.js.es6
rename to app/assets/javascripts/discourse/models/user-action-stat.js
diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-action.js.es6
rename to app/assets/javascripts/discourse/models/user-action.js
diff --git a/app/assets/javascripts/discourse/models/user-badge.js.es6 b/app/assets/javascripts/discourse/models/user-badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-badge.js.es6
rename to app/assets/javascripts/discourse/models/user-badge.js
diff --git a/app/assets/javascripts/discourse/models/user-draft.js.es6 b/app/assets/javascripts/discourse/models/user-draft.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-draft.js.es6
rename to app/assets/javascripts/discourse/models/user-draft.js
diff --git a/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6 b/app/assets/javascripts/discourse/models/user-drafts-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
rename to app/assets/javascripts/discourse/models/user-drafts-stream.js
diff --git a/app/assets/javascripts/discourse/models/user-posts-stream.js.es6 b/app/assets/javascripts/discourse/models/user-posts-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-posts-stream.js.es6
rename to app/assets/javascripts/discourse/models/user-posts-stream.js
diff --git a/app/assets/javascripts/discourse/models/user-stream.js.es6 b/app/assets/javascripts/discourse/models/user-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-stream.js.es6
rename to app/assets/javascripts/discourse/models/user-stream.js
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user.js.es6
rename to app/assets/javascripts/discourse/models/user.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6 b/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6 b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6 b/app/assets/javascripts/discourse/pre-initializers/map-routes.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/map-routes.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js.es6 b/app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6 b/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/svg-sprite-fontawesome.js.es6 b/app/assets/javascripts/discourse/pre-initializers/svg-sprite-fontawesome.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/svg-sprite-fontawesome.js.es6
rename to app/assets/javascripts/discourse/pre-initializers/svg-sprite-fontawesome.js
diff --git a/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6 b/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6
rename to app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js
diff --git a/app/assets/javascripts/discourse/raw-views/list/posts-count-column.js.es6 b/app/assets/javascripts/discourse/raw-views/list/posts-count-column.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/list/posts-count-column.js.es6
rename to app/assets/javascripts/discourse/raw-views/list/posts-count-column.js
diff --git a/app/assets/javascripts/discourse/raw-views/list/visited-line.js.es6 b/app/assets/javascripts/discourse/raw-views/list/visited-line.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/list/visited-line.js.es6
rename to app/assets/javascripts/discourse/raw-views/list/visited-line.js
diff --git a/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6 b/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6
rename to app/assets/javascripts/discourse/raw-views/topic-list-header-column.js
diff --git a/app/assets/javascripts/discourse/raw-views/topic-status.js.es6 b/app/assets/javascripts/discourse/raw-views/topic-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/topic-status.js.es6
rename to app/assets/javascripts/discourse/raw-views/topic-status.js
diff --git a/app/assets/javascripts/discourse/routes/about.js.es6 b/app/assets/javascripts/discourse/routes/about.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/about.js.es6
rename to app/assets/javascripts/discourse/routes/about.js
diff --git a/app/assets/javascripts/discourse/routes/account-created-edit-email.js.es6 b/app/assets/javascripts/discourse/routes/account-created-edit-email.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/account-created-edit-email.js.es6
rename to app/assets/javascripts/discourse/routes/account-created-edit-email.js
diff --git a/app/assets/javascripts/discourse/routes/account-created-index.js.es6 b/app/assets/javascripts/discourse/routes/account-created-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/account-created-index.js.es6
rename to app/assets/javascripts/discourse/routes/account-created-index.js
diff --git a/app/assets/javascripts/discourse/routes/account-created-resent.js.es6 b/app/assets/javascripts/discourse/routes/account-created-resent.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/account-created-resent.js.es6
rename to app/assets/javascripts/discourse/routes/account-created-resent.js
diff --git a/app/assets/javascripts/discourse/routes/account-created.js.es6 b/app/assets/javascripts/discourse/routes/account-created.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/account-created.js.es6
rename to app/assets/javascripts/discourse/routes/account-created.js
diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 b/app/assets/javascripts/discourse/routes/app-route-map.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/app-route-map.js.es6
rename to app/assets/javascripts/discourse/routes/app-route-map.js
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/application.js.es6
rename to app/assets/javascripts/discourse/routes/application.js
diff --git a/app/assets/javascripts/discourse/routes/associate-account.js.es6 b/app/assets/javascripts/discourse/routes/associate-account.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/associate-account.js.es6
rename to app/assets/javascripts/discourse/routes/associate-account.js
diff --git a/app/assets/javascripts/discourse/routes/badges-index.js.es6 b/app/assets/javascripts/discourse/routes/badges-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/badges-index.js.es6
rename to app/assets/javascripts/discourse/routes/badges-index.js
diff --git a/app/assets/javascripts/discourse/routes/badges-show.js.es6 b/app/assets/javascripts/discourse/routes/badges-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/badges-show.js.es6
rename to app/assets/javascripts/discourse/routes/badges-show.js
diff --git a/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6 b/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 b/app/assets/javascripts/discourse/routes/build-category-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-category-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-category-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-group-messages-route.js.es6 b/app/assets/javascripts/discourse/routes/build-group-messages-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-group-messages-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-group-messages-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6 b/app/assets/javascripts/discourse/routes/build-private-messages-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-private-messages-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-static-route.js.es6 b/app/assets/javascripts/discourse/routes/build-static-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-static-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-static-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-topic-route.js.es6
rename to app/assets/javascripts/discourse/routes/build-topic-route.js
diff --git a/app/assets/javascripts/discourse/routes/conduct.js.es6 b/app/assets/javascripts/discourse/routes/conduct.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/conduct.js.es6
rename to app/assets/javascripts/discourse/routes/conduct.js
diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/discourse.js.es6
rename to app/assets/javascripts/discourse/routes/discourse.js
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/discovery-categories.js.es6
rename to app/assets/javascripts/discourse/routes/discovery-categories.js
diff --git a/app/assets/javascripts/discourse/routes/discovery.js.es6 b/app/assets/javascripts/discourse/routes/discovery.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/discovery.js.es6
rename to app/assets/javascripts/discourse/routes/discovery.js
diff --git a/app/assets/javascripts/discourse/routes/email-login.js.es6 b/app/assets/javascripts/discourse/routes/email-login.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/email-login.js.es6
rename to app/assets/javascripts/discourse/routes/email-login.js
diff --git a/app/assets/javascripts/discourse/routes/exception-unknown.js.es6 b/app/assets/javascripts/discourse/routes/exception-unknown.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/exception-unknown.js.es6
rename to app/assets/javascripts/discourse/routes/exception-unknown.js
diff --git a/app/assets/javascripts/discourse/routes/exception.js.es6 b/app/assets/javascripts/discourse/routes/exception.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/exception.js.es6
rename to app/assets/javascripts/discourse/routes/exception.js
diff --git a/app/assets/javascripts/discourse/routes/faq.js.es6 b/app/assets/javascripts/discourse/routes/faq.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/faq.js.es6
rename to app/assets/javascripts/discourse/routes/faq.js
diff --git a/app/assets/javascripts/discourse/routes/forgot-password.js.es6 b/app/assets/javascripts/discourse/routes/forgot-password.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/forgot-password.js.es6
rename to app/assets/javascripts/discourse/routes/forgot-password.js
diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/full-page-search.js.es6
rename to app/assets/javascripts/discourse/routes/full-page-search.js
diff --git a/app/assets/javascripts/discourse/routes/group-activity-index.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity-index.js.es6
rename to app/assets/javascripts/discourse/routes/group-activity-index.js
diff --git a/app/assets/javascripts/discourse/routes/group-activity-mentions.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-mentions.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity-mentions.js.es6
rename to app/assets/javascripts/discourse/routes/group-activity-mentions.js
diff --git a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-posts.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
rename to app/assets/javascripts/discourse/routes/group-activity-posts.js
diff --git a/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
rename to app/assets/javascripts/discourse/routes/group-activity-topics.js
diff --git a/app/assets/javascripts/discourse/routes/group-index.js.es6 b/app/assets/javascripts/discourse/routes/group-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-index.js.es6
rename to app/assets/javascripts/discourse/routes/group-index.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-index.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-index.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage-index.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-interaction.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage-interaction.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-logs.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage-logs.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-membership.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage-membership.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage-profile.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage.js.es6 b/app/assets/javascripts/discourse/routes/group-manage.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage.js
diff --git a/app/assets/javascripts/discourse/routes/group-members.js.es6 b/app/assets/javascripts/discourse/routes/group-members.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-members.js.es6
rename to app/assets/javascripts/discourse/routes/group-members.js
diff --git a/app/assets/javascripts/discourse/routes/group-messages-archive.js.es6 b/app/assets/javascripts/discourse/routes/group-messages-archive.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-messages-archive.js.es6
rename to app/assets/javascripts/discourse/routes/group-messages-archive.js
diff --git a/app/assets/javascripts/discourse/routes/group-messages-inbox.js.es6 b/app/assets/javascripts/discourse/routes/group-messages-inbox.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-messages-inbox.js.es6
rename to app/assets/javascripts/discourse/routes/group-messages-inbox.js
diff --git a/app/assets/javascripts/discourse/routes/group-messages-index.js.es6 b/app/assets/javascripts/discourse/routes/group-messages-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-messages-index.js.es6
rename to app/assets/javascripts/discourse/routes/group-messages-index.js
diff --git a/app/assets/javascripts/discourse/routes/group-messages.js.es6 b/app/assets/javascripts/discourse/routes/group-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-messages.js.es6
rename to app/assets/javascripts/discourse/routes/group-messages.js
diff --git a/app/assets/javascripts/discourse/routes/group-requests.js.es6 b/app/assets/javascripts/discourse/routes/group-requests.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-requests.js.es6
rename to app/assets/javascripts/discourse/routes/group-requests.js
diff --git a/app/assets/javascripts/discourse/routes/group.js.es6 b/app/assets/javascripts/discourse/routes/group.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group.js.es6
rename to app/assets/javascripts/discourse/routes/group.js
diff --git a/app/assets/javascripts/discourse/routes/groups-index.js.es6 b/app/assets/javascripts/discourse/routes/groups-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/groups-index.js.es6
rename to app/assets/javascripts/discourse/routes/groups-index.js
diff --git a/app/assets/javascripts/discourse/routes/groups-new.js.es6 b/app/assets/javascripts/discourse/routes/groups-new.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/groups-new.js.es6
rename to app/assets/javascripts/discourse/routes/groups-new.js
diff --git a/app/assets/javascripts/discourse/routes/guidelines.js.es6 b/app/assets/javascripts/discourse/routes/guidelines.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/guidelines.js.es6
rename to app/assets/javascripts/discourse/routes/guidelines.js
diff --git a/app/assets/javascripts/discourse/routes/invites-show.js.es6 b/app/assets/javascripts/discourse/routes/invites-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/invites-show.js.es6
rename to app/assets/javascripts/discourse/routes/invites-show.js
diff --git a/app/assets/javascripts/discourse/routes/login.js.es6 b/app/assets/javascripts/discourse/routes/login.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/login.js.es6
rename to app/assets/javascripts/discourse/routes/login.js
diff --git a/app/assets/javascripts/discourse/routes/new-message.js.es6 b/app/assets/javascripts/discourse/routes/new-message.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/new-message.js.es6
rename to app/assets/javascripts/discourse/routes/new-message.js
diff --git a/app/assets/javascripts/discourse/routes/new-topic.js.es6 b/app/assets/javascripts/discourse/routes/new-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/new-topic.js.es6
rename to app/assets/javascripts/discourse/routes/new-topic.js
diff --git a/app/assets/javascripts/discourse/routes/password-reset.js.es6 b/app/assets/javascripts/discourse/routes/password-reset.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/password-reset.js.es6
rename to app/assets/javascripts/discourse/routes/password-reset.js
diff --git a/app/assets/javascripts/discourse/routes/post.js.es6 b/app/assets/javascripts/discourse/routes/post.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/post.js.es6
rename to app/assets/javascripts/discourse/routes/post.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-account.js.es6 b/app/assets/javascripts/discourse/routes/preferences-account.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-account.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-account.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-apps.js.es6 b/app/assets/javascripts/discourse/routes/preferences-apps.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-apps.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-apps.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-categories.js.es6 b/app/assets/javascripts/discourse/routes/preferences-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-categories.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-categories.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-email.js.es6 b/app/assets/javascripts/discourse/routes/preferences-email.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-email.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-email.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-emails.js.es6 b/app/assets/javascripts/discourse/routes/preferences-emails.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-emails.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-emails.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-index.js.es6 b/app/assets/javascripts/discourse/routes/preferences-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-index.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-index.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-interface.js.es6 b/app/assets/javascripts/discourse/routes/preferences-interface.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-interface.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-interface.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-notifications.js.es6 b/app/assets/javascripts/discourse/routes/preferences-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-notifications.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-notifications.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-profile.js.es6 b/app/assets/javascripts/discourse/routes/preferences-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-profile.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-profile.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6 b/app/assets/javascripts/discourse/routes/preferences-second-factor.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-second-factor.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-tags.js.es6 b/app/assets/javascripts/discourse/routes/preferences-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-tags.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-tags.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-username.js.es6 b/app/assets/javascripts/discourse/routes/preferences-username.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-username.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-username.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-users.js.es6 b/app/assets/javascripts/discourse/routes/preferences-users.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-users.js.es6
rename to app/assets/javascripts/discourse/routes/preferences-users.js
diff --git a/app/assets/javascripts/discourse/routes/preferences.js.es6 b/app/assets/javascripts/discourse/routes/preferences.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences.js.es6
rename to app/assets/javascripts/discourse/routes/preferences.js
diff --git a/app/assets/javascripts/discourse/routes/privacy.js.es6 b/app/assets/javascripts/discourse/routes/privacy.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/privacy.js.es6
rename to app/assets/javascripts/discourse/routes/privacy.js
diff --git a/app/assets/javascripts/discourse/routes/restricted-user.js.es6 b/app/assets/javascripts/discourse/routes/restricted-user.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/restricted-user.js.es6
rename to app/assets/javascripts/discourse/routes/restricted-user.js
diff --git a/app/assets/javascripts/discourse/routes/review-index.js.es6 b/app/assets/javascripts/discourse/routes/review-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review-index.js.es6
rename to app/assets/javascripts/discourse/routes/review-index.js
diff --git a/app/assets/javascripts/discourse/routes/review-settings.js.es6 b/app/assets/javascripts/discourse/routes/review-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review-settings.js.es6
rename to app/assets/javascripts/discourse/routes/review-settings.js
diff --git a/app/assets/javascripts/discourse/routes/review-show.js.es6 b/app/assets/javascripts/discourse/routes/review-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review-show.js.es6
rename to app/assets/javascripts/discourse/routes/review-show.js
diff --git a/app/assets/javascripts/discourse/routes/review-topics.js.es6 b/app/assets/javascripts/discourse/routes/review-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review-topics.js.es6
rename to app/assets/javascripts/discourse/routes/review-topics.js
diff --git a/app/assets/javascripts/discourse/routes/review.js.es6 b/app/assets/javascripts/discourse/routes/review.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review.js.es6
rename to app/assets/javascripts/discourse/routes/review.js
diff --git a/app/assets/javascripts/discourse/routes/rules.js.es6 b/app/assets/javascripts/discourse/routes/rules.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/rules.js.es6
rename to app/assets/javascripts/discourse/routes/rules.js
diff --git a/app/assets/javascripts/discourse/routes/signup.js.es6 b/app/assets/javascripts/discourse/routes/signup.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/signup.js.es6
rename to app/assets/javascripts/discourse/routes/signup.js
diff --git a/app/assets/javascripts/discourse/routes/tag-groups-edit.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tag-groups-edit.js.es6
rename to app/assets/javascripts/discourse/routes/tag-groups-edit.js
diff --git a/app/assets/javascripts/discourse/routes/tag-groups-new.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups-new.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tag-groups-new.js.es6
rename to app/assets/javascripts/discourse/routes/tag-groups-new.js
diff --git a/app/assets/javascripts/discourse/routes/tag-groups.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tag-groups.js.es6
rename to app/assets/javascripts/discourse/routes/tag-groups.js
diff --git a/app/assets/javascripts/discourse/routes/tags-index.js.es6 b/app/assets/javascripts/discourse/routes/tags-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tags-index.js.es6
rename to app/assets/javascripts/discourse/routes/tags-index.js
diff --git a/app/assets/javascripts/discourse/routes/tags-intersection.js.es6 b/app/assets/javascripts/discourse/routes/tags-intersection.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tags-intersection.js.es6
rename to app/assets/javascripts/discourse/routes/tags-intersection.js
diff --git a/app/assets/javascripts/discourse/routes/tags-show.js.es6 b/app/assets/javascripts/discourse/routes/tags-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tags-show.js.es6
rename to app/assets/javascripts/discourse/routes/tags-show.js
diff --git a/app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js.es6 b/app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js.es6
rename to app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params-near.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params-near.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/topic-from-params-near.js.es6
rename to app/assets/javascripts/discourse/routes/topic-from-params-near.js
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/topic-from-params.js.es6
rename to app/assets/javascripts/discourse/routes/topic-from-params.js
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/topic.js.es6
rename to app/assets/javascripts/discourse/routes/topic.js
diff --git a/app/assets/javascripts/discourse/routes/tos.js.es6 b/app/assets/javascripts/discourse/routes/tos.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tos.js.es6
rename to app/assets/javascripts/discourse/routes/tos.js
diff --git a/app/assets/javascripts/discourse/routes/unknown.js.es6 b/app/assets/javascripts/discourse/routes/unknown.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/unknown.js.es6
rename to app/assets/javascripts/discourse/routes/unknown.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-bookmarks.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-drafts.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-drafts.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-index.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-index.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-likes-given.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-likes-given.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-pending.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-pending.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-pending.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-pending.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-replies.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-replies.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-replies.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-replies.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-stream.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-topics.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-topics.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity-topics.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity.js.es6 b/app/assets/javascripts/discourse/routes/user-activity.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity.js.es6
rename to app/assets/javascripts/discourse/routes/user-activity.js
diff --git a/app/assets/javascripts/discourse/routes/user-badges.js.es6 b/app/assets/javascripts/discourse/routes/user-badges.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-badges.js.es6
rename to app/assets/javascripts/discourse/routes/user-badges.js
diff --git a/app/assets/javascripts/discourse/routes/user-deleted-posts.js.es6 b/app/assets/javascripts/discourse/routes/user-deleted-posts.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-deleted-posts.js.es6
rename to app/assets/javascripts/discourse/routes/user-deleted-posts.js
diff --git a/app/assets/javascripts/discourse/routes/user-index.js.es6 b/app/assets/javascripts/discourse/routes/user-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-index.js.es6
rename to app/assets/javascripts/discourse/routes/user-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-invited-index.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-invited-index.js.es6
rename to app/assets/javascripts/discourse/routes/user-invited-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-invited-show.js.es6
rename to app/assets/javascripts/discourse/routes/user-invited-show.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-edits.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-edits.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-edits.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications-edits.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-index.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-index.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-likes-received.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-likes-received.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-likes-received.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications-likes-received.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-mentions.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-mentions.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-mentions.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications-mentions.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-responses.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-responses.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-responses.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications-responses.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications.js.es6
rename to app/assets/javascripts/discourse/routes/user-notifications.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-archive.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-archive.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-archive.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-archive.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-group.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-group.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-index.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-index.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-sent.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-sent.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-sent.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-sent.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages-tags.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages.js.es6
rename to app/assets/javascripts/discourse/routes/user-private-messages.js
diff --git a/app/assets/javascripts/discourse/routes/user-summary.js.es6 b/app/assets/javascripts/discourse/routes/user-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-summary.js.es6
rename to app/assets/javascripts/discourse/routes/user-summary.js
diff --git a/app/assets/javascripts/discourse/routes/user-topic-list.js.es6 b/app/assets/javascripts/discourse/routes/user-topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-topic-list.js.es6
rename to app/assets/javascripts/discourse/routes/user-topic-list.js
diff --git a/app/assets/javascripts/discourse/routes/user.js.es6 b/app/assets/javascripts/discourse/routes/user.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user.js.es6
rename to app/assets/javascripts/discourse/routes/user.js
diff --git a/app/assets/javascripts/discourse/routes/users.js.es6 b/app/assets/javascripts/discourse/routes/users.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/users.js.es6
rename to app/assets/javascripts/discourse/routes/users.js
diff --git a/app/assets/javascripts/discourse/services/app-events.js.es6 b/app/assets/javascripts/discourse/services/app-events.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/app-events.js.es6
rename to app/assets/javascripts/discourse/services/app-events.js
diff --git a/app/assets/javascripts/discourse/services/emoji-store.js.es6 b/app/assets/javascripts/discourse/services/emoji-store.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/emoji-store.js.es6
rename to app/assets/javascripts/discourse/services/emoji-store.js
diff --git a/app/assets/javascripts/discourse/services/logs-notice.js.es6 b/app/assets/javascripts/discourse/services/logs-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/logs-notice.js.es6
rename to app/assets/javascripts/discourse/services/logs-notice.js
diff --git a/app/assets/javascripts/discourse/services/search.js.es6 b/app/assets/javascripts/discourse/services/search.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/search.js.es6
rename to app/assets/javascripts/discourse/services/search.js
diff --git a/app/assets/javascripts/discourse/services/theme-settings.js.es6 b/app/assets/javascripts/discourse/services/theme-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/theme-settings.js.es6
rename to app/assets/javascripts/discourse/services/theme-settings.js
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6 b/app/assets/javascripts/discourse/templates/components/reviewable-score.js
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-score.js.es6
rename to app/assets/javascripts/discourse/templates/components/reviewable-score.js
diff --git a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 b/app/assets/javascripts/discourse/widgets/actions-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/actions-summary.js.es6
rename to app/assets/javascripts/discourse/widgets/actions-summary.js
diff --git a/app/assets/javascripts/discourse/widgets/avatar-flair.js.es6 b/app/assets/javascripts/discourse/widgets/avatar-flair.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/avatar-flair.js.es6
rename to app/assets/javascripts/discourse/widgets/avatar-flair.js
diff --git a/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/button.js.es6 b/app/assets/javascripts/discourse/widgets/button.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/button.js.es6
rename to app/assets/javascripts/discourse/widgets/button.js
diff --git a/app/assets/javascripts/discourse/widgets/category-link.js.es6 b/app/assets/javascripts/discourse/widgets/category-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/category-link.js.es6
rename to app/assets/javascripts/discourse/widgets/category-link.js
diff --git a/app/assets/javascripts/discourse/widgets/component-connector.js.es6 b/app/assets/javascripts/discourse/widgets/component-connector.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/component-connector.js.es6
rename to app/assets/javascripts/discourse/widgets/component-connector.js
diff --git a/app/assets/javascripts/discourse/widgets/connector.js.es6 b/app/assets/javascripts/discourse/widgets/connector.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/connector.js.es6
rename to app/assets/javascripts/discourse/widgets/connector.js
diff --git a/app/assets/javascripts/discourse/widgets/custom-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/custom-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/custom-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/custom-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 b/app/assets/javascripts/discourse/widgets/decorator-helper.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/decorator-helper.js.es6
rename to app/assets/javascripts/discourse/widgets/decorator-helper.js
diff --git a/app/assets/javascripts/discourse/widgets/default-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/default-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/default-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/default-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/discourse-tags.js.es6 b/app/assets/javascripts/discourse/widgets/discourse-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/discourse-tags.js.es6
rename to app/assets/javascripts/discourse/widgets/discourse-tags.js
diff --git a/app/assets/javascripts/discourse/widgets/embedded-post.js.es6 b/app/assets/javascripts/discourse/widgets/embedded-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/embedded-post.js.es6
rename to app/assets/javascripts/discourse/widgets/embedded-post.js
diff --git a/app/assets/javascripts/discourse/widgets/emoji.js.es6 b/app/assets/javascripts/discourse/widgets/emoji.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/emoji.js.es6
rename to app/assets/javascripts/discourse/widgets/emoji.js
diff --git a/app/assets/javascripts/discourse/widgets/footer-nav.js.es6 b/app/assets/javascripts/discourse/widgets/footer-nav.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/footer-nav.js.es6
rename to app/assets/javascripts/discourse/widgets/footer-nav.js
diff --git a/app/assets/javascripts/discourse/widgets/glue.js.es6 b/app/assets/javascripts/discourse/widgets/glue.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/glue.js.es6
rename to app/assets/javascripts/discourse/widgets/glue.js
diff --git a/app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6
rename to app/assets/javascripts/discourse/widgets/hamburger-categories.js
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/hamburger-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/hbs-compiler.js.es6 b/app/assets/javascripts/discourse/widgets/hbs-compiler.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/hbs-compiler.js.es6
rename to app/assets/javascripts/discourse/widgets/hbs-compiler.js
diff --git a/app/assets/javascripts/discourse/widgets/header-contents.js.es6 b/app/assets/javascripts/discourse/widgets/header-contents.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/header-contents.js.es6
rename to app/assets/javascripts/discourse/widgets/header-contents.js
diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 b/app/assets/javascripts/discourse/widgets/header-topic-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/header-topic-info.js.es6
rename to app/assets/javascripts/discourse/widgets/header-topic-info.js
diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/header.js.es6
rename to app/assets/javascripts/discourse/widgets/header.js
diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 b/app/assets/javascripts/discourse/widgets/home-logo.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/home-logo.js.es6
rename to app/assets/javascripts/discourse/widgets/home-logo.js
diff --git a/app/assets/javascripts/discourse/widgets/hooks.js.es6 b/app/assets/javascripts/discourse/widgets/hooks.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/hooks.js.es6
rename to app/assets/javascripts/discourse/widgets/hooks.js
diff --git a/app/assets/javascripts/discourse/widgets/invitee-accepted-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/invitee-accepted-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/invitee-accepted-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/invitee-accepted-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/liked-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/liked-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/liked-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/liked-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/link.js.es6 b/app/assets/javascripts/discourse/widgets/link.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/link.js.es6
rename to app/assets/javascripts/discourse/widgets/link.js
diff --git a/app/assets/javascripts/discourse/widgets/membership-request-accepted-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/membership-request-accepted-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/membership-request-accepted-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/membership-request-accepted-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js.es6
rename to app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/menu-panel.js.es6 b/app/assets/javascripts/discourse/widgets/menu-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/menu-panel.js.es6
rename to app/assets/javascripts/discourse/widgets/menu-panel.js
diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-admin-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/post-admin-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 b/app/assets/javascripts/discourse/widgets/post-cooked.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-cooked.js.es6
rename to app/assets/javascripts/discourse/widgets/post-cooked.js
diff --git a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6 b/app/assets/javascripts/discourse/widgets/post-edits-indicator.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6
rename to app/assets/javascripts/discourse/widgets/post-edits-indicator.js
diff --git a/app/assets/javascripts/discourse/widgets/post-gap.js.es6 b/app/assets/javascripts/discourse/widgets/post-gap.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-gap.js.es6
rename to app/assets/javascripts/discourse/widgets/post-gap.js
diff --git a/app/assets/javascripts/discourse/widgets/post-links.js.es6 b/app/assets/javascripts/discourse/widgets/post-links.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-links.js.es6
rename to app/assets/javascripts/discourse/widgets/post-links.js
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/post-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/post-placeholder.js.es6 b/app/assets/javascripts/discourse/widgets/post-placeholder.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-placeholder.js.es6
rename to app/assets/javascripts/discourse/widgets/post-placeholder.js
diff --git a/app/assets/javascripts/discourse/widgets/post-small-action.js.es6 b/app/assets/javascripts/discourse/widgets/post-small-action.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-small-action.js.es6
rename to app/assets/javascripts/discourse/widgets/post-small-action.js
diff --git a/app/assets/javascripts/discourse/widgets/post-stream.js.es6 b/app/assets/javascripts/discourse/widgets/post-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-stream.js.es6
rename to app/assets/javascripts/discourse/widgets/post-stream.js
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post.js.es6
rename to app/assets/javascripts/discourse/widgets/post.js
diff --git a/app/assets/javascripts/discourse/widgets/poster-name.js.es6 b/app/assets/javascripts/discourse/widgets/poster-name.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/poster-name.js.es6
rename to app/assets/javascripts/discourse/widgets/poster-name.js
diff --git a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 b/app/assets/javascripts/discourse/widgets/private-message-map.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/private-message-map.js.es6
rename to app/assets/javascripts/discourse/widgets/private-message-map.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-item.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-item.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-item.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-messages.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-messages.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-messages.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-notifications.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-notifications.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-notifications.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-panel.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-panel.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-panel.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6
rename to app/assets/javascripts/discourse/widgets/quick-access-profile.js
diff --git a/app/assets/javascripts/discourse/widgets/raw-html.js.es6 b/app/assets/javascripts/discourse/widgets/raw-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/raw-html.js.es6
rename to app/assets/javascripts/discourse/widgets/raw-html.js
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-controls.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
rename to app/assets/javascripts/discourse/widgets/search-menu-controls.js
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-results.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
rename to app/assets/javascripts/discourse/widgets/search-menu-results.js
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/search-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/search-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/time-gap.js.es6 b/app/assets/javascripts/discourse/widgets/time-gap.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/time-gap.js.es6
rename to app/assets/javascripts/discourse/widgets/time-gap.js
diff --git a/app/assets/javascripts/discourse/widgets/toggle-topic-summary.js.es6 b/app/assets/javascripts/discourse/widgets/toggle-topic-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/toggle-topic-summary.js.es6
rename to app/assets/javascripts/discourse/widgets/toggle-topic-summary.js
diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/topic-admin-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 b/app/assets/javascripts/discourse/widgets/topic-map.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/topic-map.js.es6
rename to app/assets/javascripts/discourse/widgets/topic-map.js
diff --git a/app/assets/javascripts/discourse/widgets/topic-status.js.es6 b/app/assets/javascripts/discourse/widgets/topic-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/topic-status.js.es6
rename to app/assets/javascripts/discourse/widgets/topic-status.js
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
rename to app/assets/javascripts/discourse/widgets/topic-timeline.js
diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 b/app/assets/javascripts/discourse/widgets/user-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/user-menu.js.es6
rename to app/assets/javascripts/discourse/widgets/user-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6 b/app/assets/javascripts/discourse/widgets/user-notifications-large.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6
rename to app/assets/javascripts/discourse/widgets/user-notifications-large.js
diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/widget.js.es6
rename to app/assets/javascripts/discourse/widgets/widget.js
diff --git a/lefthook.yml b/lefthook.yml
index 8dae834398..7060a976d4 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -8,10 +8,14 @@ pre-commit:
       glob: "*.{js,es6}"
       exclude: "vendor/*|fixtures|public/javascripts|shims.js|ember-addons|template-lintrc|locale/*|test_helper|run-qunit"
       run: yarn prettier --list-different {staged_files}
-    eslint:
-      glob: "*.{js,es6}"
+    eslint-es6:
+      glob: "*.es6"
       exclude: "vendor/*|fixtures|public/javascripts|shims.js|ember-addons|template-lintrc|locale/*|test_helper|run-qunit"
       run: yarn eslint --ext .es6 -f compact {staged_files}
+    eslint-js:
+      glob: "*.js"
+      exclude: "vendor/*|fixtures|public/javascripts|shims.js|ember-addons|template-lintrc|locale/*|test_helper|run-qunit"
+      run: yarn eslint -f compact {staged_files}
     ember-template-lint:
       run: yarn run ember-template-lint app
     yaml-syntax:
@@ -47,8 +51,10 @@ lints:
     prettier:
       glob: "{app/assets/stylesheets/**/*.scss,app/assets/javascripts/**/*.es6,test/javascripts/**/*.es6}"
       run: yarn prettier --list-different {all_files}
-    eslint-assets:
+    eslint-assets-es6:
       run: yarn eslint --ext .es6 app/assets/javascripts
+    eslint-assets-js:
+      run: yarn eslint app/assets/javascripts
     eslint-test:
       run: yarn eslint --ext .es6 test/javascripts
     eslint-plugins-assets:

From c61ebc9ba67d6588c09c2b93205865e0fd388f51 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 12 Mar 2020 13:30:59 -0400
Subject: [PATCH 0202/1830] Don't blame the big rename commit

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index f1b56462f2..68f769b233 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -7,3 +7,6 @@
 
 # DEV: enforces no self-closing-void-elements
 dafd3c3b47f116c6c1dc56cb18df614c11747733
+
+# Rename many `.js.es6` files to `.js`
+032205e2029cbf82dc8f05b459fb93adf2503c60

From 3339b910795344f9835e02cfedf35b020563f775 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 12 Mar 2020 14:07:38 -0400
Subject: [PATCH 0203/1830] Run prettier on a couple of files

---
 app/assets/javascripts/deprecated.js   |   2 +-
 app/assets/javascripts/locales/i18n.js | 107 ++++++++++++++-----------
 2 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/app/assets/javascripts/deprecated.js b/app/assets/javascripts/deprecated.js
index e96105b581..b660024fec 100644
--- a/app/assets/javascripts/deprecated.js
+++ b/app/assets/javascripts/deprecated.js
@@ -1,4 +1,4 @@
 // ensure Discourse is added as a global
 (function() {
-  window.Discourse = requirejs('discourse').default;
+  window.Discourse = requirejs("discourse").default;
 })();
diff --git a/app/assets/javascripts/locales/i18n.js b/app/assets/javascripts/locales/i18n.js
index ec33b0c523..42ac634359 100644
--- a/app/assets/javascripts/locales/i18n.js
+++ b/app/assets/javascripts/locales/i18n.js
@@ -32,9 +32,9 @@ I18n.lookup = function(scope, options) {
   options = options || {};
 
   var translations = this.prepareOptions(I18n.translations),
-      locale = options.locale || I18n.currentLocale(),
-      messages = translations[locale] || {},
-      currentScope;
+    locale = options.locale || I18n.currentLocale(),
+    messages = translations[locale] || {},
+    currentScope;
 
   options = this.prepareOptions(options);
 
@@ -83,8 +83,8 @@ I18n.lookup = function(scope, options) {
 //
 I18n.prepareOptions = function() {
   var options = {},
-      opts,
-      count = arguments.length;
+    opts,
+    count = arguments.length;
 
   for (var i = 0; i < count; i++) {
     opts = arguments[i];
@@ -107,13 +107,15 @@ I18n.interpolate = function(message, options) {
   options = this.prepareOptions(options);
 
   var matches = message.match(this.PLACEHOLDER),
-      placeholder,
-      value,
-      name;
+    placeholder,
+    value,
+    name;
 
-  if (!matches) { return message; }
+  if (!matches) {
+    return message;
+  }
 
-  for (var i = 0; placeholder = matches[i]; i++) {
+  for (var i = 0; (placeholder = matches[i]); i++) {
     name = placeholder.replace(this.PLACEHOLDER, "$1");
 
     if (typeof options[name] === "string") {
@@ -130,7 +132,9 @@ I18n.interpolate = function(message, options) {
       value = "[missing " + placeholder + " value]";
     }
 
-    var regex = new RegExp(placeholder.replace(/\{/gm, "\\{").replace(/\}/gm, "\\}"));
+    var regex = new RegExp(
+      placeholder.replace(/\{/gm, "\\{").replace(/\}/gm, "\\}")
+    );
     message = message.replace(regex, value);
   }
 
@@ -157,8 +161,8 @@ I18n.translate = function(scope, options) {
       translation = this.findTranslation(scope, options);
     }
 
-    if (!translation && this.currentLocale() !== 'en') {
-      options.locale = 'en';
+    if (!translation && this.currentLocale() !== "en") {
+      options.locale = "en";
       translation = this.findTranslation(scope, options);
     }
   }
@@ -181,25 +185,28 @@ I18n.findTranslation = function(scope, options) {
 };
 
 I18n.toNumber = function(number, options) {
-  options = this.prepareOptions(
-    options,
-    this.lookup("number.format"),
-    {precision: 3, separator: this.SEPARATOR, delimiter: ",", strip_insignificant_zeros: false}
-  );
+  options = this.prepareOptions(options, this.lookup("number.format"), {
+    precision: 3,
+    separator: this.SEPARATOR,
+    delimiter: ",",
+    strip_insignificant_zeros: false
+  });
 
   var negative = number < 0,
-      string = Math.abs(number).toFixed(options.precision).toString(),
-      parts = string.split(this.SEPARATOR),
-      precision,
-      buffer = [],
-      formattedNumber;
+    string = Math.abs(number)
+      .toFixed(options.precision)
+      .toString(),
+    parts = string.split(this.SEPARATOR),
+    precision,
+    buffer = [],
+    formattedNumber;
 
   number = parts[0];
   precision = parts[1];
 
   while (number.length > 0) {
     buffer.unshift(number.substr(Math.max(0, number.length - 3), 3));
-    number = number.substr(0, number.length -3);
+    number = number.substr(0, number.length - 3);
   }
 
   formattedNumber = buffer.join(options.delimiter);
@@ -214,14 +221,13 @@ I18n.toNumber = function(number, options) {
 
   if (options.strip_insignificant_zeros) {
     var regex = {
-        separator: new RegExp(options.separator.replace(/\./, "\\.") + "$"),
-        zeros: /0+$/
+      separator: new RegExp(options.separator.replace(/\./, "\\.") + "$"),
+      zeros: /0+$/
     };
 
     formattedNumber = formattedNumber
       .replace(regex.zeros, "")
-      .replace(regex.separator, "")
-    ;
+      .replace(regex.separator, "");
   }
 
   return formattedNumber;
@@ -229,10 +235,10 @@ I18n.toNumber = function(number, options) {
 
 I18n.toHumanSize = function(number, options) {
   var kb = 1024,
-      size = number,
-      iterations = 0,
-      unit,
-      precision;
+    size = number,
+    iterations = 0,
+    unit,
+    precision;
 
   while (size >= kb && iterations < 4) {
     size = size / kb;
@@ -240,23 +246,24 @@ I18n.toHumanSize = function(number, options) {
   }
 
   if (iterations === 0) {
-    unit = this.t("number.human.storage_units.units.byte", {count: size});
+    unit = this.t("number.human.storage_units.units.byte", { count: size });
     precision = 0;
   } else {
-    unit = this.t("number.human.storage_units.units." + [null, "kb", "mb", "gb", "tb"][iterations]);
-    precision = (size - Math.floor(size) === 0) ? 0 : 1;
+    unit = this.t(
+      "number.human.storage_units.units." +
+        [null, "kb", "mb", "gb", "tb"][iterations]
+    );
+    precision = size - Math.floor(size) === 0 ? 0 : 1;
   }
 
-  options = this.prepareOptions(
-    options,
-    {precision: precision, format: "%n%u", delimiter: ""}
-  );
+  options = this.prepareOptions(options, {
+    precision: precision,
+    format: "%n%u",
+    delimiter: ""
+  });
 
   number = this.toNumber(size, options);
-  number = options.format
-    .replace("%u", unit)
-    .replace("%n", number)
-  ;
+  number = options.format.replace("%u", unit).replace("%n", number);
 
   return number;
 };
@@ -283,7 +290,7 @@ I18n.pluralize = function(translation, scope, options) {
 
   var pluralizer = this.pluralizer(options.locale || this.currentLocale());
   var key = pluralizer(Math.abs(count));
-  var keys = ((typeof key === "object") && (key instanceof Array)) ? key : [key];
+  var keys = typeof key === "object" && key instanceof Array ? key : [key];
 
   var message = this.findAndTranslateValidNode(keys, translation);
 
@@ -295,9 +302,11 @@ I18n.pluralize = function(translation, scope, options) {
 };
 
 I18n.missingTranslation = function(scope, key) {
-  var message = '[' + this.currentLocale() + this.SEPARATOR + scope;
-  if (key) { message += this.SEPARATOR + key; }
-  return message + ']';
+  var message = "[" + this.currentLocale() + this.SEPARATOR + scope;
+  if (key) {
+    message += this.SEPARATOR + key;
+  }
+  return message + "]";
 };
 
 I18n.currentLocale = function() {
@@ -311,7 +320,7 @@ I18n.enableVerboseLocalization = function() {
 
   I18n.noFallbacks = true;
 
-  I18n.t = I18n.translate = function(scope, value){
+  I18n.t = I18n.translate = function(scope, value) {
     var current = keys[scope];
     if (!current) {
       current = keys[scope] = ++counter;
@@ -330,7 +339,7 @@ I18n.enableVerboseLocalizationSession = function() {
   sessionStorage.setItem("verbose_localization", "true");
   I18n.enableVerboseLocalization();
 
-  return 'Verbose localization is enabled. Close the browser tab to turn it off. Reload the page to see the translation keys.';
+  return "Verbose localization is enabled. Close the browser tab to turn it off. Reload the page to see the translation keys.";
 };
 
 // shortcuts

From 4d7f6749beee1e652329dd32cd348b9852d47af7 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Thu, 12 Mar 2020 15:54:30 -0700
Subject: [PATCH 0204/1830] it's 2020 now, though maybe we all wish it wasn't

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c3a200d108..ddf32ba126 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ The original Discourse code contributors can be found in [**AUTHORS.MD**](docs/A
 
 ## Copyright / License
 
-Copyright 2014 - 2019 Civilized Discourse Construction Kit, Inc.
+Copyright 2014 - 2020 Civilized Discourse Construction Kit, Inc.
 
 Licensed under the GNU General Public License Version 2.0 (or later);
 you may not use this work except in compliance with the License.

From 2237ba8c9d235a5e6b34c548253a34630fb042fc Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 13 Mar 2020 10:04:15 +1000
Subject: [PATCH 0205/1830] FIX: Add topic deleted check to email/sender
 (#9166)

It already had a deleted post check and log reason, add a topic one too to avoid errors
---
 app/models/skipped_email_log.rb      |  3 ++-
 config/locales/server.en.yml         |  1 +
 lib/email/sender.rb                  |  9 +++++----
 spec/components/email/sender_spec.rb | 19 +++++++++++++++++++
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/app/models/skipped_email_log.rb b/app/models/skipped_email_log.rb
index 374e8cff0d..9ffa2230e9 100644
--- a/app/models/skipped_email_log.rb
+++ b/app/models/skipped_email_log.rb
@@ -36,7 +36,8 @@ class SkippedEmailLog < ActiveRecord::Base
       sender_body_blank: 19,
       sender_post_deleted: 20,
       sender_message_to_invalid: 21,
-      user_email_access_denied: 22
+      user_email_access_denied: 22,
+      sender_topic_deleted: 23
       # you need to add the reason in server.en.yml below the "skipped_email_log" key
       # when you add a new enum value
     )
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 4b7298af42..ba7ead37b0 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3771,6 +3771,7 @@ en:
     sender_body_blank: "body is blank"
     sender_post_deleted: "post has been deleted"
     sender_message_to_invalid: "recipient has invalid email address"
+    sender_topic_deleted: "topic has been deleted"
 
   color_schemes:
     base_theme_name: "Base"
diff --git a/lib/email/sender.rb b/lib/email/sender.rb
index bce5fc90de..8cd3c613fd 100644
--- a/lib/email/sender.rb
+++ b/lib/email/sender.rb
@@ -96,12 +96,13 @@ module Email
       if topic_id.present? && post_id.present?
         post = Post.find_by(id: post_id, topic_id: topic_id)
 
-        # guards against deleted posts
-        return skip(SkippedEmailLog.reason_types[:sender_post_deleted]) unless post
-
-        add_attachments(post)
+        # guards against deleted posts and topics
+        return skip(SkippedEmailLog.reason_types[:sender_post_deleted]) if post.blank?
 
         topic = post.topic
+        return skip(SkippedEmailLog.reason_types[:sender_topic_deleted]) if topic.blank?
+
+        add_attachments(post)
         first_post = topic.ordered_posts.first
 
         topic_message_id = first_post.incoming_email&.message_id.present? ?
diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb
index a93e1cd410..26d4dcffbe 100644
--- a/spec/components/email/sender_spec.rb
+++ b/spec/components/email/sender_spec.rb
@@ -443,6 +443,25 @@ describe Email::Sender do
 
   end
 
+  context 'with a deleted topic' do
+
+    it 'should skip sending the email' do
+      post = Fabricate(:post, topic: Fabricate(:topic, deleted_at: 1.day.ago))
+
+      message = Mail::Message.new to: 'disc@ourse.org', body: 'some content'
+      message.header['X-Discourse-Post-Id'] = post.id
+      message.header['X-Discourse-Topic-Id'] = post.topic_id
+      message.expects(:deliver_now).never
+
+      email_sender = Email::Sender.new(message, :valid_type)
+      expect { email_sender.send }.to change { SkippedEmailLog.count }
+
+      log = SkippedEmailLog.last
+      expect(log.reason_type).to eq(SkippedEmailLog.reason_types[:sender_topic_deleted])
+    end
+
+  end
+
   context 'with a user' do
     let(:message) do
       message = Mail::Message.new to: 'eviltrout@test.domain', body: 'test body'

From af92444948533aa726e53001f414e346c5321ddd Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 13 Mar 2020 10:44:39 +1000
Subject: [PATCH 0206/1830] FIX: Make sure bookmark serializer works with
 deleted topics + posts (#9195)

---
 app/models/bookmark.rb                        |   4 +
 app/serializers/user_bookmark_serializer.rb   |  40 +++---
 lib/bookmark_query.rb                         |   2 +-
 ...mark_reminder_notification_handler_spec.rb | 126 +++++++++++-------
 .../user_bookmark_serializer_spec.rb          |  42 ++++--
 5 files changed, 140 insertions(+), 74 deletions(-)

diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index d28e40d263..198895fa5c 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -39,6 +39,10 @@ class Bookmark < ActiveRecord::Base
     end
   end
 
+  def no_reminder?
+    self.reminder_at.blank? && self.reminder_type.blank?
+  end
+
   scope :pending_reminders, ->(before_time = Time.now.utc) do
     where("reminder_at IS NOT NULL AND reminder_at <= :before_time", before_time: before_time)
   end
diff --git a/app/serializers/user_bookmark_serializer.rb b/app/serializers/user_bookmark_serializer.rb
index 39358c2262..b87b3a9d00 100644
--- a/app/serializers/user_bookmark_serializer.rb
+++ b/app/serializers/user_bookmark_serializer.rb
@@ -25,67 +25,75 @@ class UserBookmarkSerializer < ApplicationSerializer
              :slug,
              :username
 
+  def topic
+    @topic ||= object.topic || Topic.unscoped.find(object.topic_id)
+  end
+
+  def post
+    @post ||= object.post || Post.unscoped.find(object.post_id)
+  end
+
   def closed
-    object.topic.closed
+    topic.closed
   end
 
   def archived
-    object.topic.archived
+    topic.archived
   end
 
   def linked_post_number
-    object.post.post_number
+    post.post_number
   end
 
   def title
-    object.topic.title
+    topic.title
   end
 
   def deleted
-    object.topic.deleted_at.present? || object.post.deleted_at.present?
+    topic.deleted_at.present? || post.deleted_at.present?
   end
 
   def hidden
-    object.post.hidden
+    post.hidden
   end
 
   def category_id
-    object.topic.category_id
+    topic.category_id
   end
 
   def archetype
-    object.topic.archetype
+    topic.archetype
   end
 
   def archived
-    object.topic.archived
+    topic.archived
   end
 
   def closed
-    object.topic.closed
+    topic.closed
   end
 
   def highest_post_number
-    object.topic.highest_post_number
+    topic.highest_post_number
   end
 
   def bumped_at
-    object.topic.bumped_at
+    topic.bumped_at
   end
 
   def raw
-    object.post.raw
+    post.raw
   end
 
   def cooked
-    object.post.cooked
+    post.cooked
   end
 
   def slug
-    object.topic.slug
+    topic.slug
   end
 
   def username
-    object.post.user.username
+    post.user.username
   end
 end
diff --git a/lib/bookmark_query.rb b/lib/bookmark_query.rb
index ab18ea9edb..44ab7b257f 100644
--- a/lib/bookmark_query.rb
+++ b/lib/bookmark_query.rb
@@ -5,7 +5,7 @@
 # in the user/activity/bookmarks page.
 
 class BookmarkQuery
-  def initialize(user, params)
+  def initialize(user, params = {})
     @user = user
     @params = params
   end
diff --git a/spec/lib/bookmark_reminder_notification_handler_spec.rb b/spec/lib/bookmark_reminder_notification_handler_spec.rb
index a2bf4a30af..8cc1c4b637 100644
--- a/spec/lib/bookmark_reminder_notification_handler_spec.rb
+++ b/spec/lib/bookmark_reminder_notification_handler_spec.rb
@@ -9,72 +9,100 @@ RSpec.describe BookmarkReminderNotificationHandler do
 
   before do
     SiteSetting.enable_bookmarks_with_reminders = true
-  end
-  fab!(:reminder) do
-    Fabricate(
-      :bookmark,
-      user: user,
-      reminder_type: Bookmark.reminder_types[:at_desktop],
-      reminder_at: nil,
-      reminder_set_at: Time.zone.now
-    )
-  end
-  let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
-
-  before do
     Discourse.redis.flushall
   end
 
-  context "when there are pending bookmark at desktop reminders" do
-    before do
-      described_class.cache_pending_at_desktop_reminder(user)
+  describe "#send_notification" do
+    fab!(:bookmark) do
+      Fabricate(:bookmark_next_business_day_reminder, user: user)
     end
 
-    context "when the user agent is for mobile" do
-      let(:user_agent) { "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1" }
-      it "does not attempt to send any reminders" do
+    it "creates a bookmark reminder notification with the correct details" do
+      subject.send_notification(bookmark)
+      notif = bookmark.user.notifications.last
+      expect(notif.notification_type).to eq(Notification.types[:bookmark_reminder])
+      expect(notif.topic_id).to eq(bookmark.topic_id)
+      expect(notif.post_number).to eq(bookmark.post.post_number)
+      data = JSON.parse(notif.data)
+      expect(data["topic_title"]).to eq(bookmark.topic.title)
+      expect(data["display_username"]).to eq(bookmark.user.username)
+      expect(data["bookmark_name"]).to eq(bookmark.name)
+    end
+
+    context "when the post has been deleted" do
+      it "clears the reminder and does not send a notification" do
+        bookmark.post.trash!
+        bookmark.reload
+        subject.send_notification(bookmark)
+        expect(bookmark.reload.no_reminder?).to eq(true)
+      end
+    end
+  end
+
+  describe "#send_at_desktop_reminder" do
+    fab!(:reminder) do
+      Fabricate(
+        :bookmark,
+        user: user,
+        reminder_type: Bookmark.reminder_types[:at_desktop],
+        reminder_at: nil,
+        reminder_set_at: Time.zone.now
+      )
+    end
+    let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
+
+    context "when there are pending bookmark at desktop reminders" do
+      before do
+        described_class.cache_pending_at_desktop_reminder(user)
+      end
+
+      context "when the user agent is for mobile" do
+        let(:user_agent) { "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1" }
+        it "does not attempt to send any reminders" do
+          DistributedMutex.expects(:synchronize).never
+          send_reminder
+        end
+      end
+
+      context "when the user agent is for desktop" do
+        let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
+
+        it "deletes the key in redis" do
+          send_reminder
+          expect(described_class.user_has_pending_at_desktop_reminders?(user)).to eq(false)
+        end
+
+        it "sends a notification to the user and clears the reminder_at" do
+          send_reminder
+          expect(Notification.where(user: user, notification_type: Notification.types[:bookmark_reminder]).count).to eq(1)
+          expect(reminder.reload.reminder_type).to eq(nil)
+          expect(reminder.reload.reminder_last_sent_at).not_to eq(nil)
+          expect(reminder.reload.reminder_set_at).to eq(nil)
+        end
+      end
+    end
+
+    context "when there are no pending bookmark at desktop reminders" do
+      it "does nothing" do
         DistributedMutex.expects(:synchronize).never
         send_reminder
       end
     end
 
-    context "when the user agent is for desktop" do
-      let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
-
-      it "deletes the key in redis" do
-        send_reminder
-        expect(described_class.user_has_pending_at_desktop_reminders?(user)).to eq(false)
+    context "when enable bookmarks with reminders is disabled" do
+      before do
+        SiteSetting.enable_bookmarks_with_reminders = false
       end
 
-      it "sends a notification to the user and clears the reminder_at" do
+      it "does nothing" do
+        BrowserDetection.expects(:device).never
         send_reminder
-        expect(Notification.where(user: user, notification_type: Notification.types[:bookmark_reminder]).count).to eq(1)
-        expect(reminder.reload.reminder_type).to eq(nil)
-        expect(reminder.reload.reminder_last_sent_at).not_to eq(nil)
-        expect(reminder.reload.reminder_set_at).to eq(nil)
       end
     end
-  end
 
-  context "when there are no pending bookmark at desktop reminders" do
-    it "does nothing" do
-      DistributedMutex.expects(:synchronize).never
-      send_reminder
+    def send_reminder
+      subject.send_at_desktop_reminder(user: user, request_user_agent: user_agent)
     end
   end
 
-  context "when enable bookmarks with reminders is disabled" do
-    before do
-      SiteSetting.enable_bookmarks_with_reminders = false
-    end
-
-    it "does nothing" do
-      BrowserDetection.expects(:device).never
-      send_reminder
-    end
-  end
-
-  def send_reminder
-    subject.send_at_desktop_reminder(user: user, request_user_agent: user_agent)
-  end
 end
diff --git a/spec/serializers/user_bookmark_serializer_spec.rb b/spec/serializers/user_bookmark_serializer_spec.rb
index 0bca3a0228..85acabf95c 100644
--- a/spec/serializers/user_bookmark_serializer_spec.rb
+++ b/spec/serializers/user_bookmark_serializer_spec.rb
@@ -3,12 +3,31 @@
 require 'rails_helper'
 
 RSpec.describe UserBookmarkSerializer do
-  let(:bookmark) do
-    Fabricate(:bookmark)
-    Bookmark.all.includes(post: :user).includes(:topic).last
-  end
+  let(:user) { Fabricate(:user) }
+  let(:post) { Fabricate(:post, user: user) }
+  let!(:bookmark) { Fabricate(:bookmark, name: 'Test', user: user, post: post, topic: post.topic) }
 
-  subject { described_class.new(bookmark) }
+  it "serializes all properties correctly" do
+    s = serialized
+    expect(s.id).to eq(bookmark.id)
+    expect(s.created_at).to eq(bookmark.created_at)
+    expect(s.topic_id).to eq(bookmark.topic_id)
+    expect(s.linked_post_number).to eq(bookmark.post.post_number)
+    expect(s.post_id).to eq(bookmark.post_id)
+    expect(s.name).to eq(bookmark.name)
+    expect(s.reminder_at).to eq(bookmark.reminder_at)
+    expect(s.title).to eq(bookmark.topic.title)
+    expect(s.deleted).to eq(false)
+    expect(s.hidden).to eq(false)
+    expect(s.closed).to eq(false)
+    expect(s.archived).to eq(false)
+    expect(s.category_id).to eq(bookmark.topic.category_id)
+    expect(s.archetype).to eq(bookmark.topic.archetype)
+    expect(s.highest_post_number).to eq(1)
+    expect(s.bumped_at.to_s).to eq(bookmark.topic.bumped_at.to_s)
+    expect(s.slug).to eq(bookmark.topic.slug)
+    expect(s.username).to eq(bookmark.post.user.username)
+  end
 
   context "when the topic is deleted" do
     before do
@@ -16,7 +35,8 @@ RSpec.describe UserBookmarkSerializer do
       bookmark.reload
     end
     it "still returns the topic title because the relationship is unscoped" do
-      expect(subject.title).not_to eq(nil)
+      serialized
+      expect(serialized.title).not_to eq(nil)
     end
   end
 
@@ -26,10 +46,16 @@ RSpec.describe UserBookmarkSerializer do
       bookmark.reload
     end
     it "still returns the post number because the relationship is unscoped" do
-      expect(subject.linked_post_number).not_to eq(nil)
+      serialized
+      expect(serialized.linked_post_number).not_to eq(nil)
     end
     it "still returns the post username" do
-      expect(subject.username).not_to eq(nil)
+      serialized
+      expect(serialized.username).not_to eq(nil)
     end
   end
+
+  def serialized
+    described_class.new(BookmarkQuery.new(bookmark.user, {}).list_all.to_ary.last)
+  end
 end

From dc02586d99bceac2e78a7690d9265e93310645d5 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Fri, 13 Mar 2020 13:33:57 +1000
Subject: [PATCH 0207/1830] Fix error on create bookmark for topic

---
 app/controllers/topics_controller.rb    | 2 +-
 spec/requests/topics_controller_spec.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 61b6d4bd68..ee7ba1af18 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -551,7 +551,7 @@ class TopicsController < ApplicationController
       bookmark_manager = BookmarkManager.new(current_user)
       bookmark_manager.create(post_id: first_post.id)
 
-      if bookmark_manager.errors
+      if bookmark_manager.errors.any?
         return render_json_error(bookmark_manager, status: 400)
       end
     else
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 42f002f481..845a7e1930 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -2376,6 +2376,7 @@ RSpec.describe TopicsController do
         post = create_post
         post2 = create_post(topic_id: post.topic_id)
         put "/t/#{post.topic_id}/bookmark.json"
+        expect(response.status).to eq(200)
 
         bookmarks_for_topic = Bookmark.where(topic: post.topic, user: user)
         expect(bookmarks_for_topic.count).to eq(1)

From ac8d8e3b62c8868d5b34331daddf6ce09ac79009 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 13 Mar 2020 16:29:09 +1000
Subject: [PATCH 0208/1830] FEATURE: Add enable_bookmark_at_desktop_reminders
 site setting (#9198)

Add enable_bookmark_at_desktop_reminders site setting default to false a new hidden site setting to hide the "At Desktop" reminder option so we can restrict this further until it is polished.
---
 .../javascripts/discourse/controllers/bookmark.js      | 10 ++++++++--
 .../javascripts/discourse/templates/modal/bookmark.hbs |  2 +-
 config/site_settings.yml                               |  4 ++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index b4b74ec57e..891dd2daf4 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -5,7 +5,6 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { htmlSafe } from "@ember/template";
 import { ajax } from "discourse/lib/ajax";
-import { reads } from "@ember/object/computed";
 
 const START_OF_DAY_HOUR = 8;
 const REMINDER_TYPES = {
@@ -52,9 +51,16 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
-  usingMobileDevice: reads("site.mobileView"),
   showBookmarkReminderControls: true,
 
+  @discourseComputed()
+  showAtDesktop() {
+    return (
+      this.siteSettings.enable_bookmark_at_desktop_reminders &&
+      this.site.mobileView
+    );
+  },
+
   @discourseComputed("selectedReminderType")
   customDateTimeSelected(selectedReminderType) {
     return selectedReminderType === REMINDER_TYPES.CUSTOM;
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 661ab90f27..7adab91b63 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -24,7 +24,7 @@
 
       {{#if userHasTimezoneSet}}
         {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
-          {{#if usingMobileDevice}}
+          {{#if showAtDesktop}}
             {{tap-tile icon="desktop" text=(i18n "bookmarks.reminders.at_desktop") tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
           {{/if}}
 
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 56d742e565..044d7f1de1 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -293,6 +293,10 @@ basic:
     client: true
     default: false
     hidden: true
+  enable_bookmark_at_desktop_reminders:
+    client: true
+    default: false
+    hidden: true
   push_notifications_prompt:
     default: true
     client: true

From b727e39a42847f5c58417f5b39987e01bc8eec12 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 13 Mar 2020 12:41:08 +0100
Subject: [PATCH 0209/1830] DEV: gives sk components a way to trigger a search
 manually (#9199)

---
 .../select-kit/components/select-kit.js.es6   | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index 39e167a24e..828ee6c765 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -231,10 +231,7 @@ export default Component.extend(
       });
 
       if (this.selectKit.isExpanded) {
-        if (this._searchPromise) {
-          cancel(this._searchPromise);
-        }
-        this._searchPromise = this._searchWrapper(this.selectKit.filter);
+        this.triggerSearch();
       }
 
       if (this.computeContent) {
@@ -388,7 +385,7 @@ export default Component.extend(
 
     _debouncedInput(filter) {
       this.selectKit.setProperties({ filter, isLoading: true });
-      this._searchPromise = this._searchWrapper(filter);
+      this.triggerSearch(filter);
     },
 
     _onChangeWrapper(value, items) {
@@ -567,6 +564,15 @@ export default Component.extend(
       return content;
     },
 
+    triggerSearch(filter) {
+      if (this._searchPromise) {
+        cancel(this._searchPromise);
+      }
+      this._searchPromise = this._searchWrapper(
+        filter || this.selectKit.filter
+      );
+    },
+
     _searchWrapper(filter) {
       this.clearErrors();
       this.setProperties({ mainCollection: [], "selectKit.isLoading": true });
@@ -869,10 +875,7 @@ export default Component.extend(
           this.selectKit.options.filterable || this.selectKit.options.allowAny
       });
 
-      if (this._searchPromise) {
-        cancel(this._searchPromise);
-      }
-      this._searchPromise = this._searchWrapper();
+      this.triggerSearch();
 
       this._safeAfterRender(() => {
         this._focusFilter();

From c14e3adac5349b0500fe7d51bd96704d7a813929 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 13 Mar 2020 09:36:04 -0400
Subject: [PATCH 0210/1830] UX: Better spacing for icon in select-kit label

---
 app/assets/stylesheets/common/select-kit/select-kit.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index cea7f6f871..d45978ba64 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -79,6 +79,10 @@
 
       .name {
         display: inline-block;
+        .d-icon {
+          margin-left: 0.5em;
+          margin-right: 0;
+        }
       }
 
       &.select-kit-selected-color {

From 8a4784d36fe7f0a44b4e44aba3fe5743093d3d07 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Mar 2020 13:53:39 +0000
Subject: [PATCH 0211/1830] Build(deps): Bump rails_multisite from 2.1.0 to
 2.1.1 (#9196)

Bumps [rails_multisite]() from 2.1.0 to 2.1.1.

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 60d55158f3..60177e792d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -279,7 +279,7 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails_multisite (2.1.0)
+    rails_multisite (2.1.1)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
     railties (6.0.1)
@@ -416,7 +416,7 @@ GEM
       hkdf (~> 0.2)
       jwt (~> 2.0)
     yaml-lint (0.0.10)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby

From 3d71b68195375f1b584bfe57904444b9cca6df12 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 13 Mar 2020 15:30:31 +0000
Subject: [PATCH 0212/1830] DEV: Introduce plugin api for conditionally
 rendering assets (#9200)

---
 .../common/_discourse_stylesheet.html.erb     |  2 +-
 app/views/layouts/application.html.erb        |  2 +-
 lib/discourse.rb                              | 14 ++++++++++--
 lib/plugin/instance.rb                        |  9 ++++++++
 plugins/discourse-internet-explorer/plugin.rb | 19 +++-------------
 spec/components/discourse_spec.rb             | 22 +++++++++++++++++--
 6 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/app/views/common/_discourse_stylesheet.html.erb b/app/views/common/_discourse_stylesheet.html.erb
index b6f64114e7..2312fa4da7 100644
--- a/app/views/common/_discourse_stylesheet.html.erb
+++ b/app/views/common/_discourse_stylesheet.html.erb
@@ -12,6 +12,6 @@
   <%= discourse_stylesheet_link_tag(mobile_view? ? :mobile_theme : :desktop_theme) %>
 <%- end %>
 
-<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?).each do |file| %>
+<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?, request: request).each do |file| %>
   <%= discourse_stylesheet_link_tag(file) %>
 <%- end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 3340017d75..6c1f3b3074 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -28,7 +28,7 @@
     <%= preload_script "vendor" %>
     <%= preload_script "pretty-text-bundle" %>
     <%= preload_script "application" %>
-    <%- Discourse.find_plugin_js_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?).each do |file| %>
+    <%- Discourse.find_plugin_js_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, request: request).each do |file| %>
       <%= preload_script file %>
     <%- end %>
     <%- if staff? %>
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 0cbc4d8e4c..07810010b6 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -271,6 +271,10 @@ module Discourse
   def self.find_plugin_css_assets(args)
     plugins = self.find_plugins(args)
 
+    plugins = plugins.select do |plugin|
+      plugin.asset_filters.all? { |b| b.call(:css, args[:request]) }
+    end
+
     assets = []
 
     targets = [nil]
@@ -289,9 +293,15 @@ module Discourse
   end
 
   def self.find_plugin_js_assets(args)
-    self.find_plugins(args).find_all do |plugin|
+    plugins = self.find_plugins(args).select do |plugin|
       plugin.js_asset_exists?
-    end.map { |plugin| "plugins/#{plugin.directory_name}" }
+    end
+
+    plugins = plugins.select do |plugin|
+      plugin.asset_filters.all? { |b| b.call(:js, args[:request]) }
+    end
+
+    plugins.map { |plugin| "plugins/#{plugin.directory_name}" }
   end
 
   def self.assets_digest
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index eb7c2322fc..06070d5f02 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -49,6 +49,7 @@ class Plugin::Instance
    :styles,
    :themes,
    :csp_extensions,
+   :asset_filters
  ].each do |att|
     class_eval %Q{
       def #{att}
@@ -413,6 +414,14 @@ class Plugin::Instance
     csp_extensions << extension
   end
 
+  # Register a block to run when adding css and js assets
+  # Two arguments will be passed: (type, request)
+  # Type is :css or :js. `request` is an instance of Rack::Request
+  # When using this, make sure to consider the effect on AnonymousCache
+  def register_asset_filter(&blk)
+    asset_filters << blk
+  end
+
   # @option opts [String] :name
   # @option opts [String] :nativeName
   # @option opts [String] :fallbackLocale
diff --git a/plugins/discourse-internet-explorer/plugin.rb b/plugins/discourse-internet-explorer/plugin.rb
index eedd870fbd..646dfff08a 100644
--- a/plugins/discourse-internet-explorer/plugin.rb
+++ b/plugins/discourse-internet-explorer/plugin.rb
@@ -20,22 +20,9 @@ DiscourseEvent.on(:after_plugin_activation) do ||
 end
 
 after_initialize do
-
-  # Conditionally load the stylesheet. There is unfortunately no easy way to do this via
-  # Plugin API.
-  reloadable_patch do |plugin|
-    ApplicationHelper.module_eval do
-      alias_method :previous_discourse_stylesheet_link_tag, :discourse_stylesheet_link_tag
-      def discourse_stylesheet_link_tag(name, opts = {})
-
-        if name == 'discourse-internet-explorer'
-          return unless SiteSetting.discourse_internet_explorer_enabled?
-          return unless request.env['HTTP_USER_AGENT'] =~ /MSIE|Trident/
-        end
-
-        previous_discourse_stylesheet_link_tag(name, opts)
-      end
-    end
+  # Conditionally load the stylesheet
+  register_asset_filter do |type, request|
+    request.nil? || request.env['HTTP_USER_AGENT'] =~ /MSIE|Trident/
   end
 
   register_anonymous_cache_key(:ie) do
diff --git a/spec/components/discourse_spec.rb b/spec/components/discourse_spec.rb
index 38625ee86d..3f1e62d446 100644
--- a/spec/components/discourse_spec.rb
+++ b/spec/components/discourse_spec.rb
@@ -75,12 +75,17 @@ describe Discourse do
       end
     end
 
-    let(:plugin1) { plugin_class.new.tap { |p| p.enabled = true } }
-    let(:plugin2) { plugin_class.new.tap { |p| p.enabled = false } }
+    let(:plugin1) { plugin_class.new.tap { |p| p.enabled = true; p.path = "my-plugin-1" } }
+    let(:plugin2) { plugin_class.new.tap { |p| p.enabled = false; p.path = "my-plugin-1" } }
 
     before { Discourse.plugins.append(plugin1, plugin2) }
     after { Discourse.plugins.clear }
 
+    before do
+      plugin_class.any_instance.stubs(:css_asset_exists?).returns(true)
+      plugin_class.any_instance.stubs(:js_asset_exists?).returns(true)
+    end
+
     it 'can find plugins correctly' do
       expect(Discourse.plugins).to contain_exactly(plugin1, plugin2)
 
@@ -90,6 +95,19 @@ describe Discourse do
       # Include disabled plugins when requested
       expect(Discourse.find_plugins(include_disabled: true)).to contain_exactly(plugin1, plugin2)
     end
+
+    it 'can find plugin assets' do
+      plugin2.enabled = true
+
+      expect(Discourse.find_plugin_css_assets({}).length).to eq(2)
+      expect(Discourse.find_plugin_js_assets({}).length).to eq(2)
+      plugin1.register_asset_filter do |type, request|
+        false
+      end
+      expect(Discourse.find_plugin_css_assets({}).length).to eq(1)
+      expect(Discourse.find_plugin_js_assets({}).length).to eq(1)
+    end
+
   end
 
   context 'authenticators' do

From ad2ec5b65e50cc41047b57005a40c836d8234fb3 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 13 Mar 2020 15:53:40 +0000
Subject: [PATCH 0213/1830] UX: Improve copy for suspect users feature (#9201)

Co-authored-by: Robin Ward <robin.ward@gmail.com>
---
 config/locales/server.en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index ba7ead37b0..65715d3f21 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1530,7 +1530,7 @@ en:
     markdown_typographer_quotation_marks: "List of double and single quotes replacement pairs"
     post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)."
     must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site."
-    approve_suspect_users: "Staff must approve all suspect accounts"
+    approve_suspect_users: "Add suspicious users to the review queue. Suspicious users have entered a bio/website but have no reading activity."
     pending_users_reminder_delay: "Notify moderators if new users have been waiting for approval for longer than this many hours. Set to -1 to disable notifications."
     maximum_session_age: "User will remain logged in for n hours since last visit"
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code ID, eg: UA-12345678-9; see <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -4698,7 +4698,7 @@ en:
       invite_only: "All new users should be invited. See `invite_only`."
       email_auth_res_enqueue: "This email failed a DMARC check, it most likely isn't from whom it seems to be from. Check the raw email headers for more information."
       email_spam: "This email was flagged as spam by the header defined in `email_in_spam_header`."
-      suspect_user: "Users in the suspect list must be examined by staff. See `approve_suspect_users`."
+      suspect_user: "This user has a bio/website in their profile, without having read any posts. This can indicate a spam account. See `approve_suspect_users`."
 
     actions:
       agree:

From 7c27f9bba9f88ea8bd4947c1b608b1ca2c842391 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Fri, 13 Mar 2020 12:25:46 -0400
Subject: [PATCH 0214/1830] FIX: remove parent tag from tag group

Having a tag be a member of a tag group and the group's parent tag at
the same time causes some unexpected behavior. When a tag is assigned
as the parent, remove it from the group.
---
 app/models/tag_group.rb       |  5 +++++
 spec/models/tag_group_spec.rb | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/app/models/tag_group.rb b/app/models/tag_group.rb
index 1fd5711f82..cf83c9ff2d 100644
--- a/app/models/tag_group.rb
+++ b/app/models/tag_group.rb
@@ -13,6 +13,7 @@ class TagGroup < ActiveRecord::Base
 
   before_create :init_permissions
   before_save :apply_permissions
+  before_save :remove_parent_from_group
 
   after_commit { DiscourseTagging.clear_cache! }
 
@@ -73,6 +74,10 @@ class TagGroup < ActiveRecord::Base
     end
   end
 
+  def remove_parent_from_group
+    tags.delete(parent_tag) if tags.include?(parent_tag)
+  end
+
   def self.visible(guardian)
     if guardian.is_staff?
       TagGroup
diff --git a/spec/models/tag_group_spec.rb b/spec/models/tag_group_spec.rb
index f126194379..bfca9d3b35 100644
--- a/spec/models/tag_group_spec.rb
+++ b/spec/models/tag_group_spec.rb
@@ -101,6 +101,22 @@ describe TagGroup do
       expect_same_tag_names(tag_group.reload.tags, [tag, 'new-tag'])
     end
 
+    it "removes parent tag as group member" do
+      parent = Fabricate(:tag)
+      tag_group.tags = [tag, parent]
+      tag_group.update!(parent_tag: parent)
+      tag_group.reload
+      expect_same_tag_names(tag_group.tags, [tag])
+      expect_same_tag_names([tag_group.parent_tag], [parent])
+    end
+
+    it "removes parent tag as group member when creating the group" do
+      parent = Fabricate(:tag)
+      tg = Fabricate(:tag_group, tags: [tag, parent], parent_tag: parent)
+      expect_same_tag_names(tg.tags, [tag])
+      expect_same_tag_names([tg.parent_tag], [parent])
+    end
+
     context 'with synonyms' do
       fab!(:synonym) { Fabricate(:tag, name: 'synonym', target_tag: tag) }
 

From 3723c64257556adee0d58ce3f133aba2b6a73c26 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 13 Mar 2020 16:45:55 +0000
Subject: [PATCH 0215/1830] DEV: Correct references to theme flags

Followup to d1474e94
---
 config/locales/server.en.yml                  | 2 +-
 spec/components/svg_sprite/svg_sprite_spec.rb | 2 +-
 spec/lib/content_security_policy_spec.rb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 65715d3f21..fd440ec3b6 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -83,7 +83,7 @@ en:
       generic: An error occured while importing that theme
       about_json: "Import Error: about.json does not exist, or is invalid"
       about_json_values: "about.json contains invalid values: %{errors}"
-      flag_values: "about.json flags contain invalid values: %{errors}"
+      modifier_values: "about.json modifiers contain invalid values: %{errors}"
       git: "Error cloning git repository, access is denied or repository is not found"
       unpack_failed: "Failed to unpack file"
       file_too_big: "The uncompressed file is too big."
diff --git a/spec/components/svg_sprite/svg_sprite_spec.rb b/spec/components/svg_sprite/svg_sprite_spec.rb
index a9614c5548..34e4d59b13 100644
--- a/spec/components/svg_sprite/svg_sprite_spec.rb
+++ b/spec/components/svg_sprite/svg_sprite_spec.rb
@@ -142,7 +142,7 @@ describe SvgSprite do
     expect(SvgSprite.all_icons([parent_theme.id])).to include("dragon")
   end
 
-  it 'includes icons defined in theme flags' do
+  it 'includes icons defined in theme modifiers' do
     theme = Fabricate(:theme)
 
     expect(SvgSprite.all_icons([theme.id])).not_to include("dragon")
diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index fa81698019..593ae9d1c0 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -166,7 +166,7 @@ describe ContentSecurityPolicy do
       expect(parse(theme_policy)['worker-src']).to_not include('from-theme.com')
     end
 
-    it 'can be extended by theme flags' do
+    it 'can be extended by theme modifiers' do
       policy # call this first to make sure further actions clear the cache
 
       theme.theme_modifier_set.csp_extensions = ["script-src: https://from-theme-flag.script", "worker-src: from-theme-flag.worker"]

From ac48c4e562a5bbb3a14f10865ba43c1cbbf0b1b8 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 13 Mar 2020 20:58:34 +0100
Subject: [PATCH 0216/1830] UX: uses mod+p instead of ctrl+p and command+p for
 printTopic (#9202)

Mousetrap 1.4 introduced a generic mod helper which lets you set cross platform shortcuts.

Mousetrap.bind('mod+p',  _print);
On Mac this ends up mapping to command+p whereas on Windows and Linux it maps to ctrl+p.

This differs from defining ctrl+p and command+p because both ctrl+p and command+p will trigger print on Mac whereas with the mod helper only command+p will.
---
 app/assets/javascripts/discourse/lib/keyboard-shortcuts.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index 2a401e4fcd..4b5465b986 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -19,8 +19,7 @@ export let bindings = {
   C: { handler: "focusComposer" },
   "ctrl+f": { handler: "showPageSearch", anonymous: true },
   "command+f": { handler: "showPageSearch", anonymous: true },
-  "ctrl+p": { handler: "printTopic", anonymous: true },
-  "command+p": { handler: "printTopic", anonymous: true },
+  "mod+p": { handler: "printTopic", anonymous: true },
   d: { postAction: "deletePost" },
   e: { postAction: "editPost" },
   end: { handler: "goToLastPost", anonymous: true },

From e40e06d78c2234e694f1920bcf7618fc0f2969cc Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 13 Mar 2020 16:59:59 -0400
Subject: [PATCH 0217/1830] Rename `.js.es6` to `.js` in the admin application

---
 .../javascripts/admin/adapters/{api-key.js.es6 => api-key.js}  | 0
 .../admin/adapters/{build-plugin.js.es6 => build-plugin.js}    | 0
 .../{customization-base.js.es6 => customization-base.js}       | 0
 .../admin/adapters/{email-style.js.es6 => email-style.js}      | 0
 .../admin/adapters/{embedding.js.es6 => embedding.js}          | 0
 .../admin/adapters/{site-text.js.es6 => site-text.js}          | 0
 .../adapters/{staff-action-log.js.es6 => staff-action-log.js}  | 0
 .../admin/adapters/{tag-group.js.es6 => tag-group.js}          | 0
 .../javascripts/admin/adapters/{theme.js.es6 => theme.js}      | 0
 .../admin/adapters/{user-field.js.es6 => user-field.js}        | 0
 .../adapters/{web-hook-event.js.es6 => web-hook-event.js}      | 0
 .../admin/adapters/{web-hook.js.es6 => web-hook.js}            | 0
 .../admin/components/{ace-editor.js.es6 => ace-editor.js}      | 0
 .../{admin-backups-logs.js.es6 => admin-backups-logs.js}       | 0
 ...admin-directory-toggle.js.es6 => admin-directory-toggle.js} | 0
 .../{admin-editable-field.js.es6 => admin-editable-field.js}   | 0
 .../components/{admin-form-row.js.es6 => admin-form-row.js}    | 0
 .../admin/components/{admin-graph.js.es6 => admin-graph.js}    | 0
 .../admin/components/{admin-nav.js.es6 => admin-nav.js}        | 0
 .../{admin-report-chart.js.es6 => admin-report-chart.js}       | 0
 .../{admin-report-counters.js.es6 => admin-report-counters.js} | 0
 .../{admin-report-counts.js.es6 => admin-report-counts.js}     | 0
 ...report-inline-table.js.es6 => admin-report-inline-table.js} | 0
 ...rt-per-day-counts.js.es6 => admin-report-per-day-counts.js} | 0
 ...port-stacked-chart.js.es6 => admin-report-stacked-chart.js} | 0
 ...port-storage-stats.js.es6 => admin-report-storage-stats.js} | 0
 ...min-report-table-cell.js.es6 => admin-report-table-cell.js} | 0
 ...report-table-header.js.es6 => admin-report-table-header.js} | 0
 ...admin-report-table-row.js.es6 => admin-report-table-row.js} | 0
 .../{admin-report-table.js.es6 => admin-report-table.js}       | 0
 ...-level-counts.js.es6 => admin-report-trust-level-counts.js} | 0
 .../admin/components/{admin-report.js.es6 => admin-report.js}  | 0
 .../{admin-theme-editor.js.es6 => admin-theme-editor.js}       | 0
 .../{admin-user-field-item.js.es6 => admin-user-field-item.js} | 0
 .../{admin-watched-word.js.es6 => admin-watched-word.js}       | 0
 ...ok-event-chooser.js.es6 => admin-web-hook-event-chooser.js} | 0
 .../{admin-web-hook-event.js.es6 => admin-web-hook-event.js}   | 0
 .../{admin-web-hook-status.js.es6 => admin-web-hook-status.js} | 0
 .../components/{admin-wrapper.js.es6 => admin-wrapper.js}      | 0
 .../admin/components/{cancel-link.js.es6 => cancel-link.js}    | 0
 .../admin/components/{color-input.js.es6 => color-input.js}    | 0
 .../{email-styles-editor.js.es6 => email-styles-editor.js}     | 0
 .../components/{embeddable-host.js.es6 => embeddable-host.js}  | 0
 .../{embedding-setting.js.es6 => embedding-setting.js}         | 0
 .../components/{flag-user-lists.js.es6 => flag-user-lists.js}  | 0
 .../{highlighted-code.js.es6 => highlighted-code.js}           | 0
 .../{inline-edit-checkbox.js.es6 => inline-edit-checkbox.js}   | 0
 .../{install-theme-item.js.es6 => install-theme-item.js}       | 0
 .../admin/components/{ip-lookup.js.es6 => ip-lookup.js}        | 0
 ...deration-history-item.js.es6 => moderation-history-item.js} | 0
 .../{penalty-post-action.js.es6 => penalty-post-action.js}     | 0
 .../components/{permalink-form.js.es6 => permalink-form.js}    | 0
 .../components/report-filters/{category.js.es6 => category.js} | 0
 .../{file-extension.js.es6 => file-extension.js}               | 0
 .../components/report-filters/{filter.js.es6 => filter.js}     | 0
 .../admin/components/report-filters/{group.js.es6 => group.js} | 0
 .../{resumable-upload.js.es6 => resumable-upload.js}           | 0
 ...ened-ip-address-form.js.es6 => screened-ip-address-form.js} | 0
 .../{secret-value-list.js.es6 => secret-value-list.js}         | 0
 .../components/{silence-details.js.es6 => silence-details.js}  | 0
 .../admin/components/{site-setting.js.es6 => site-setting.js}  | 0
 ...s-image-uploader.js.es6 => site-settings-image-uploader.js} | 0
 .../admin/components/site-settings/{bool.js.es6 => bool.js}    | 0
 .../site-settings/{category-list.js.es6 => category-list.js}   | 0
 .../admin/components/site-settings/{color.js.es6 => color.js}  | 0
 .../site-settings/{compact-list.js.es6 => compact-list.js}     | 0
 .../site-settings/{group-list.js.es6 => group-list.js}         | 0
 .../components/site-settings/{tag-list.js.es6 => tag-list.js}  | 0
 .../{uploaded-image-list.js.es6 => uploaded-image-list.js}     | 0
 .../{site-text-summary.js.es6 => site-text-summary.js}         | 0
 .../components/{staff-actions.js.es6 => staff-actions.js}      | 0
 .../{suspension-details.js.es6 => suspension-details.js}       | 0
 .../components/{tags-uploader.js.es6 => tags-uploader.js}      | 0
 .../{theme-setting-editor.js.es6 => theme-setting-editor.js}   | 0
 ...ves-selector.js.es6 => theme-setting-relatives-selector.js} | 0
 .../{theme-translation.js.es6 => theme-translation.js}         | 0
 .../{themes-list-item.js.es6 => themes-list-item.js}           | 0
 .../admin/components/{themes-list.js.es6 => themes-list.js}    | 0
 .../admin/components/{value-list.js.es6 => value-list.js}      | 0
 .../{watched-word-form.js.es6 => watched-word-form.js}         | 0
 .../{watched-word-uploader.js.es6 => watched-word-uploader.js} | 0
 .../{admin-api-keys-index.js.es6 => admin-api-keys-index.js}   | 0
 .../{admin-api-keys-new.js.es6 => admin-api-keys-new.js}       | 0
 .../{admin-api-keys-show.js.es6 => admin-api-keys-show.js}     | 0
 .../controllers/{admin-api-keys.js.es6 => admin-api-keys.js}   | 0
 .../{admin-backups-index.js.es6 => admin-backups-index.js}     | 0
 .../{admin-backups-logs.js.es6 => admin-backups-logs.js}       | 0
 .../controllers/{admin-backups.js.es6 => admin-backups.js}     | 0
 .../{admin-badges-award.js.es6 => admin-badges-award.js}       | 0
 .../{admin-badges-show.js.es6 => admin-badges-show.js}         | 0
 .../admin/controllers/{admin-badges.js.es6 => admin-badges.js} | 0
 ...omize-colors-show.js.es6 => admin-customize-colors-show.js} | 0
 ...admin-customize-colors.js.es6 => admin-customize-colors.js} | 0
 ...l-style-edit.js.es6 => admin-customize-email-style-edit.js} | 0
 ...tes-edit.js.es6 => admin-customize-email-templates-edit.js} | 0
 ...ail-templates.js.es6 => admin-customize-email-templates.js} | 0
 ...stomize-robots-txt.js.es6 => admin-customize-robots-txt.js} | 0
 ...omize-themes-edit.js.es6 => admin-customize-themes-edit.js} | 0
 ...omize-themes-show.js.es6 => admin-customize-themes-show.js} | 0
 ...admin-customize-themes.js.es6 => admin-customize-themes.js} | 0
 ...min-dashboard-general.js.es6 => admin-dashboard-general.js} | 0
 ...shboard-moderation.js.es6 => admin-dashboard-moderation.js} | 0
 ...min-dashboard-reports.js.es6 => admin-dashboard-reports.js} | 0
 .../controllers/{admin-dashboard.js.es6 => admin-dashboard.js} | 0
 ...email-advanced-test.js.es6 => admin-email-advanced-test.js} | 0
 .../{admin-email-bounced.js.es6 => admin-email-bounced.js}     | 0
 .../{admin-email-index.js.es6 => admin-email-index.js}         | 0
 .../{admin-email-logs.js.es6 => admin-email-logs.js}           | 0
 ...ail-preview-digest.js.es6 => admin-email-preview-digest.js} | 0
 .../{admin-email-received.js.es6 => admin-email-received.js}   | 0
 .../{admin-email-rejected.js.es6 => admin-email-rejected.js}   | 0
 .../{admin-email-sent.js.es6 => admin-email-sent.js}           | 0
 .../{admin-email-skipped.js.es6 => admin-email-skipped.js}     | 0
 .../controllers/{admin-embedding.js.es6 => admin-embedding.js} | 0
 .../admin/controllers/{admin-emojis.js.es6 => admin-emojis.js} | 0
 ...gs-screened-emails.js.es6 => admin-logs-screened-emails.js} | 0
 ...ip-addresses.js.es6 => admin-logs-screened-ip-addresses.js} | 0
 ...n-logs-screened-urls.js.es6 => admin-logs-screened-urls.js} | 0
 ...taff-action-logs.js.es6 => admin-logs-staff-action-logs.js} | 0
 .../{admin-permalinks.js.es6 => admin-permalinks.js}           | 0
 .../controllers/{admin-plugins.js.es6 => admin-plugins.js}     | 0
 .../{admin-reports-show.js.es6 => admin-reports-show.js}       | 0
 ...min-search-logs-index.js.es6 => admin-search-logs-index.js} | 0
 ...admin-search-logs-term.js.es6 => admin-search-logs-term.js} | 0
 ...ettings-category.js.es6 => admin-site-settings-category.js} | 0
 .../{admin-site-settings.js.es6 => admin-site-settings.js}     | 0
 .../{admin-site-text-edit.js.es6 => admin-site-text-edit.js}   | 0
 .../{admin-site-text-index.js.es6 => admin-site-text-index.js} | 0
 .../{admin-user-badges.js.es6 => admin-user-badges.js}         | 0
 .../{admin-user-fields.js.es6 => admin-user-fields.js}         | 0
 .../{admin-user-index.js.es6 => admin-user-index.js}           | 0
 .../admin/controllers/{admin-user.js.es6 => admin-user.js}     | 0
 .../{admin-users-list-show.js.es6 => admin-users-list-show.js} | 0
 ...tched-words-action.js.es6 => admin-watched-words-action.js} | 0
 .../{admin-watched-words.js.es6 => admin-watched-words.js}     | 0
 ...hooks-show-events.js.es6 => admin-web-hooks-show-events.js} | 0
 .../{admin-web-hooks-show.js.es6 => admin-web-hooks-show.js}   | 0
 .../controllers/{admin-web-hooks.js.es6 => admin-web-hooks.js} | 0
 .../javascripts/admin/controllers/{admin.js.es6 => admin.js}   | 0
 .../modals/{admin-add-upload.js.es6 => admin-add-upload.js}    | 0
 .../{admin-badge-preview.js.es6 => admin-badge-preview.js}     | 0
 ...me-select-base.js.es6 => admin-color-scheme-select-base.js} | 0
 ...it-badge-groupings.js.es6 => admin-edit-badge-groupings.js} | 0
 .../{admin-incoming-email.js.es6 => admin-incoming-email.js}   | 0
 .../{admin-install-theme.js.es6 => admin-install-theme.js}     | 0
 .../modals/{admin-reseed.js.es6 => admin-reseed.js}            | 0
 .../{admin-silence-user.js.es6 => admin-silence-user.js}       | 0
 ...on-log-details.js.es6 => admin-staff-action-log-details.js} | 0
 .../{admin-start-backup.js.es6 => admin-start-backup.js}       | 0
 .../{admin-suspend-user.js.es6 => admin-suspend-user.js}       | 0
 .../{admin-theme-change.js.es6 => admin-theme-change.js}       | 0
 ...uploaded-image-list.js.es6 => admin-uploaded-image-list.js} | 0
 ...min-watched-word-test.js.es6 => admin-watched-word-test.js} | 0
 ...lt-categories.js.es6 => site-setting-default-categories.js} | 0
 .../admin/helpers/{check-icon.js.es6 => check-icon.js}         | 0
 .../helpers/{disposition-icon.js.es6 => disposition-icon.js}   | 0
 .../admin/helpers/{human-size.js.es6 => human-size.js}         | 0
 .../helpers/{post-action-title.js.es6 => post-action-title.js} | 0
 .../helpers/{preserve-newlines.js.es6 => preserve-newlines.js} | 0
 .../admin/helpers/{value-at-tl.js.es6 => value-at-tl.js}       | 0
 .../{penalty-controller.js.es6 => penalty-controller.js}       | 0
 .../{period-computation.js.es6 => period-computation.js}       | 0
 .../mixins/{setting-component.js.es6 => setting-component.js}  | 0
 .../admin/mixins/{setting-object.js.es6 => setting-object.js}  | 0
 .../models/{admin-dashboard.js.es6 => admin-dashboard.js}      | 0
 .../admin/models/{admin-user.js.es6 => admin-user.js}          | 0
 .../javascripts/admin/models/{api-key.js.es6 => api-key.js}    | 0
 .../admin/models/{backup-status.js.es6 => backup-status.js}    | 0
 .../javascripts/admin/models/{backup.js.es6 => backup.js}      | 0
 .../{color-scheme-color.js.es6 => color-scheme-color.js}       | 0
 .../admin/models/{color-scheme.js.es6 => color-scheme.js}      | 0
 .../admin/models/{email-log.js.es6 => email-log.js}            | 0
 .../admin/models/{email-preview.js.es6 => email-preview.js}    | 0
 .../admin/models/{email-settings.js.es6 => email-settings.js}  | 0
 .../admin/models/{email-style.js.es6 => email-style.js}        | 0
 .../admin/models/{email-template.js.es6 => email-template.js}  | 0
 .../admin/models/{flag-type.js.es6 => flag-type.js}            | 0
 .../admin/models/{incoming-email.js.es6 => incoming-email.js}  | 0
 .../admin/models/{permalink.js.es6 => permalink.js}            | 0
 .../javascripts/admin/models/{report.js.es6 => report.js}      | 0
 .../admin/models/{screened-email.js.es6 => screened-email.js}  | 0
 .../{screened-ip-address.js.es6 => screened-ip-address.js}     | 0
 .../admin/models/{screened-url.js.es6 => screened-url.js}      | 0
 .../admin/models/{site-setting.js.es6 => site-setting.js}      | 0
 .../admin/models/{site-text.js.es6 => site-text.js}            | 0
 .../models/{staff-action-log.js.es6 => staff-action-log.js}    | 0
 .../admin/models/{theme-settings.js.es6 => theme-settings.js}  | 0
 app/assets/javascripts/admin/models/{theme.js.es6 => theme.js} | 0
 .../models/{tl3-requirements.js.es6 => tl3-requirements.js}    | 0
 .../admin/models/{user-field.js.es6 => user-field.js}          | 0
 .../admin/models/{version-check.js.es6 => version-check.js}    | 0
 .../admin/models/{watched-word.js.es6 => watched-word.js}      | 0
 .../javascripts/admin/models/{web-hook.js.es6 => web-hook.js}  | 0
 .../routes/{admin-api-index.js.es6 => admin-api-index.js}      | 0
 .../{admin-api-keys-index.js.es6 => admin-api-keys-index.js}   | 0
 .../{admin-api-keys-show.js.es6 => admin-api-keys-show.js}     | 0
 .../admin/routes/{admin-api-keys.js.es6 => admin-api-keys.js}  | 0
 .../{admin-backups-index.js.es6 => admin-backups-index.js}     | 0
 .../{admin-backups-logs.js.es6 => admin-backups-logs.js}       | 0
 .../admin/routes/{admin-backups.js.es6 => admin-backups.js}    | 0
 .../{admin-badges-award.js.es6 => admin-badges-award.js}       | 0
 .../{admin-badges-index.js.es6 => admin-badges-index.js}       | 0
 .../routes/{admin-badges-show.js.es6 => admin-badges-show.js}  | 0
 .../admin/routes/{admin-badges.js.es6 => admin-badges.js}      | 0
 ...omize-colors-show.js.es6 => admin-customize-colors-show.js} | 0
 ...admin-customize-colors.js.es6 => admin-customize-colors.js} | 0
 ...l-style-edit.js.es6 => admin-customize-email-style-edit.js} | 0
 ...style-index.js.es6 => admin-customize-email-style-index.js} | 0
 ...omize-email-style.js.es6 => admin-customize-email-style.js} | 0
 ...tes-edit.js.es6 => admin-customize-email-templates-edit.js} | 0
 ...ail-templates.js.es6 => admin-customize-email-templates.js} | 0
 .../{admin-customize-index.js.es6 => admin-customize-index.js} | 0
 ...stomize-robots-txt.js.es6 => admin-customize-robots-txt.js} | 0
 ...omize-themes-edit.js.es6 => admin-customize-themes-edit.js} | 0
 ...ize-themes-index.js.es6 => admin-customize-themes-index.js} | 0
 ...omize-themes-show.js.es6 => admin-customize-themes-show.js} | 0
 ...admin-customize-themes.js.es6 => admin-customize-themes.js} | 0
 ...min-dashboard-general.js.es6 => admin-dashboard-general.js} | 0
 ...min-dashboard-reports.js.es6 => admin-dashboard-reports.js} | 0
 .../routes/{admin-dashboard.js.es6 => admin-dashboard.js}      | 0
 .../{admin-email-bounced.js.es6 => admin-email-bounced.js}     | 0
 .../{admin-email-incomings.js.es6 => admin-email-incomings.js} | 0
 .../routes/{admin-email-index.js.es6 => admin-email-index.js}  | 0
 .../routes/{admin-email-logs.js.es6 => admin-email-logs.js}    | 0
 ...ail-preview-digest.js.es6 => admin-email-preview-digest.js} | 0
 .../{admin-email-received.js.es6 => admin-email-received.js}   | 0
 .../{admin-email-rejected.js.es6 => admin-email-rejected.js}   | 0
 .../routes/{admin-email-sent.js.es6 => admin-email-sent.js}    | 0
 .../{admin-email-skipped.js.es6 => admin-email-skipped.js}     | 0
 .../routes/{admin-embedding.js.es6 => admin-embedding.js}      | 0
 .../admin/routes/{admin-emojis.js.es6 => admin-emojis.js}      | 0
 ...n-flags-posts-active.js.es6 => admin-flags-posts-active.js} | 0
 .../{admin-flags-posts-old.js.es6 => admin-flags-posts-old.js} | 0
 ...n-flags-topics-index.js.es6 => admin-flags-topics-index.js} | 0
 .../routes/{admin-logs-index.js.es6 => admin-logs-index.js}    | 0
 ...gs-screened-emails.js.es6 => admin-logs-screened-emails.js} | 0
 ...ip-addresses.js.es6 => admin-logs-screened-ip-addresses.js} | 0
 ...n-logs-screened-urls.js.es6 => admin-logs-screened-urls.js} | 0
 ...taff-action-logs.js.es6 => admin-logs-staff-action-logs.js} | 0
 .../routes/{admin-permalinks.js.es6 => admin-permalinks.js}    | 0
 .../admin/routes/{admin-plugins.js.es6 => admin-plugins.js}    | 0
 .../{admin-reports-index.js.es6 => admin-reports-index.js}     | 0
 .../{admin-reports-show.js.es6 => admin-reports-show.js}       | 0
 .../routes/{admin-route-map.js.es6 => admin-route-map.js}      | 0
 ...min-search-logs-index.js.es6 => admin-search-logs-index.js} | 0
 ...admin-search-logs-term.js.es6 => admin-search-logs-term.js} | 0
 ...ettings-category.js.es6 => admin-site-settings-category.js} | 0
 ...site-settings-index.js.es6 => admin-site-settings-index.js} | 0
 .../{admin-site-settings.js.es6 => admin-site-settings.js}     | 0
 .../{admin-site-text-edit.js.es6 => admin-site-text-edit.js}   | 0
 .../{admin-site-text-index.js.es6 => admin-site-text-index.js} | 0
 .../routes/{admin-user-badges.js.es6 => admin-user-badges.js}  | 0
 .../routes/{admin-user-fields.js.es6 => admin-user-fields.js}  | 0
 .../routes/{admin-user-index.js.es6 => admin-user-index.js}    | 0
 ...-tl3-requirements.js.es6 => admin-user-tl3-requirements.js} | 0
 .../admin/routes/{admin-user.js.es6 => admin-user.js}          | 0
 .../routes/{admin-users-index.js.es6 => admin-users-index.js}  | 0
 ...admin-users-list-index.js.es6 => admin-users-list-index.js} | 0
 .../{admin-users-list-show.js.es6 => admin-users-list-show.js} | 0
 .../routes/{admin-users-list.js.es6 => admin-users-list.js}    | 0
 ...tched-words-action.js.es6 => admin-watched-words-action.js} | 0
 ...watched-words-index.js.es6 => admin-watched-words-index.js} | 0
 .../{admin-watched-words.js.es6 => admin-watched-words.js}     | 0
 ...hooks-show-events.js.es6 => admin-web-hooks-show-events.js} | 0
 .../{admin-web-hooks-show.js.es6 => admin-web-hooks-show.js}   | 0
 .../routes/{admin-web-hooks.js.es6 => admin-web-hooks.js}      | 0
 app/assets/javascripts/admin/routes/{admin.js.es6 => admin.js} | 0
 .../admin/services/{admin-tools.js.es6 => admin-tools.js}      | 0
 lib/discourse_js_processor.rb                                  | 3 ++-
 269 files changed, 2 insertions(+), 1 deletion(-)
 rename app/assets/javascripts/admin/adapters/{api-key.js.es6 => api-key.js} (100%)
 rename app/assets/javascripts/admin/adapters/{build-plugin.js.es6 => build-plugin.js} (100%)
 rename app/assets/javascripts/admin/adapters/{customization-base.js.es6 => customization-base.js} (100%)
 rename app/assets/javascripts/admin/adapters/{email-style.js.es6 => email-style.js} (100%)
 rename app/assets/javascripts/admin/adapters/{embedding.js.es6 => embedding.js} (100%)
 rename app/assets/javascripts/admin/adapters/{site-text.js.es6 => site-text.js} (100%)
 rename app/assets/javascripts/admin/adapters/{staff-action-log.js.es6 => staff-action-log.js} (100%)
 rename app/assets/javascripts/admin/adapters/{tag-group.js.es6 => tag-group.js} (100%)
 rename app/assets/javascripts/admin/adapters/{theme.js.es6 => theme.js} (100%)
 rename app/assets/javascripts/admin/adapters/{user-field.js.es6 => user-field.js} (100%)
 rename app/assets/javascripts/admin/adapters/{web-hook-event.js.es6 => web-hook-event.js} (100%)
 rename app/assets/javascripts/admin/adapters/{web-hook.js.es6 => web-hook.js} (100%)
 rename app/assets/javascripts/admin/components/{ace-editor.js.es6 => ace-editor.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-backups-logs.js.es6 => admin-backups-logs.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-directory-toggle.js.es6 => admin-directory-toggle.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-editable-field.js.es6 => admin-editable-field.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-form-row.js.es6 => admin-form-row.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-graph.js.es6 => admin-graph.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-nav.js.es6 => admin-nav.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-chart.js.es6 => admin-report-chart.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-counters.js.es6 => admin-report-counters.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-counts.js.es6 => admin-report-counts.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-inline-table.js.es6 => admin-report-inline-table.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-per-day-counts.js.es6 => admin-report-per-day-counts.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-stacked-chart.js.es6 => admin-report-stacked-chart.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-storage-stats.js.es6 => admin-report-storage-stats.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-table-cell.js.es6 => admin-report-table-cell.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-table-header.js.es6 => admin-report-table-header.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-table-row.js.es6 => admin-report-table-row.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-table.js.es6 => admin-report-table.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report-trust-level-counts.js.es6 => admin-report-trust-level-counts.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-report.js.es6 => admin-report.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-theme-editor.js.es6 => admin-theme-editor.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-user-field-item.js.es6 => admin-user-field-item.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-watched-word.js.es6 => admin-watched-word.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-web-hook-event-chooser.js.es6 => admin-web-hook-event-chooser.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-web-hook-event.js.es6 => admin-web-hook-event.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-web-hook-status.js.es6 => admin-web-hook-status.js} (100%)
 rename app/assets/javascripts/admin/components/{admin-wrapper.js.es6 => admin-wrapper.js} (100%)
 rename app/assets/javascripts/admin/components/{cancel-link.js.es6 => cancel-link.js} (100%)
 rename app/assets/javascripts/admin/components/{color-input.js.es6 => color-input.js} (100%)
 rename app/assets/javascripts/admin/components/{email-styles-editor.js.es6 => email-styles-editor.js} (100%)
 rename app/assets/javascripts/admin/components/{embeddable-host.js.es6 => embeddable-host.js} (100%)
 rename app/assets/javascripts/admin/components/{embedding-setting.js.es6 => embedding-setting.js} (100%)
 rename app/assets/javascripts/admin/components/{flag-user-lists.js.es6 => flag-user-lists.js} (100%)
 rename app/assets/javascripts/admin/components/{highlighted-code.js.es6 => highlighted-code.js} (100%)
 rename app/assets/javascripts/admin/components/{inline-edit-checkbox.js.es6 => inline-edit-checkbox.js} (100%)
 rename app/assets/javascripts/admin/components/{install-theme-item.js.es6 => install-theme-item.js} (100%)
 rename app/assets/javascripts/admin/components/{ip-lookup.js.es6 => ip-lookup.js} (100%)
 rename app/assets/javascripts/admin/components/{moderation-history-item.js.es6 => moderation-history-item.js} (100%)
 rename app/assets/javascripts/admin/components/{penalty-post-action.js.es6 => penalty-post-action.js} (100%)
 rename app/assets/javascripts/admin/components/{permalink-form.js.es6 => permalink-form.js} (100%)
 rename app/assets/javascripts/admin/components/report-filters/{category.js.es6 => category.js} (100%)
 rename app/assets/javascripts/admin/components/report-filters/{file-extension.js.es6 => file-extension.js} (100%)
 rename app/assets/javascripts/admin/components/report-filters/{filter.js.es6 => filter.js} (100%)
 rename app/assets/javascripts/admin/components/report-filters/{group.js.es6 => group.js} (100%)
 rename app/assets/javascripts/admin/components/{resumable-upload.js.es6 => resumable-upload.js} (100%)
 rename app/assets/javascripts/admin/components/{screened-ip-address-form.js.es6 => screened-ip-address-form.js} (100%)
 rename app/assets/javascripts/admin/components/{secret-value-list.js.es6 => secret-value-list.js} (100%)
 rename app/assets/javascripts/admin/components/{silence-details.js.es6 => silence-details.js} (100%)
 rename app/assets/javascripts/admin/components/{site-setting.js.es6 => site-setting.js} (100%)
 rename app/assets/javascripts/admin/components/{site-settings-image-uploader.js.es6 => site-settings-image-uploader.js} (100%)
 rename app/assets/javascripts/admin/components/site-settings/{bool.js.es6 => bool.js} (100%)
 rename app/assets/javascripts/admin/components/site-settings/{category-list.js.es6 => category-list.js} (100%)
 rename app/assets/javascripts/admin/components/site-settings/{color.js.es6 => color.js} (100%)
 rename app/assets/javascripts/admin/components/site-settings/{compact-list.js.es6 => compact-list.js} (100%)
 rename app/assets/javascripts/admin/components/site-settings/{group-list.js.es6 => group-list.js} (100%)
 rename app/assets/javascripts/admin/components/site-settings/{tag-list.js.es6 => tag-list.js} (100%)
 rename app/assets/javascripts/admin/components/site-settings/{uploaded-image-list.js.es6 => uploaded-image-list.js} (100%)
 rename app/assets/javascripts/admin/components/{site-text-summary.js.es6 => site-text-summary.js} (100%)
 rename app/assets/javascripts/admin/components/{staff-actions.js.es6 => staff-actions.js} (100%)
 rename app/assets/javascripts/admin/components/{suspension-details.js.es6 => suspension-details.js} (100%)
 rename app/assets/javascripts/admin/components/{tags-uploader.js.es6 => tags-uploader.js} (100%)
 rename app/assets/javascripts/admin/components/{theme-setting-editor.js.es6 => theme-setting-editor.js} (100%)
 rename app/assets/javascripts/admin/components/{theme-setting-relatives-selector.js.es6 => theme-setting-relatives-selector.js} (100%)
 rename app/assets/javascripts/admin/components/{theme-translation.js.es6 => theme-translation.js} (100%)
 rename app/assets/javascripts/admin/components/{themes-list-item.js.es6 => themes-list-item.js} (100%)
 rename app/assets/javascripts/admin/components/{themes-list.js.es6 => themes-list.js} (100%)
 rename app/assets/javascripts/admin/components/{value-list.js.es6 => value-list.js} (100%)
 rename app/assets/javascripts/admin/components/{watched-word-form.js.es6 => watched-word-form.js} (100%)
 rename app/assets/javascripts/admin/components/{watched-word-uploader.js.es6 => watched-word-uploader.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-api-keys-index.js.es6 => admin-api-keys-index.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-api-keys-new.js.es6 => admin-api-keys-new.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-api-keys-show.js.es6 => admin-api-keys-show.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-api-keys.js.es6 => admin-api-keys.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-backups-index.js.es6 => admin-backups-index.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-backups-logs.js.es6 => admin-backups-logs.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-backups.js.es6 => admin-backups.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-badges-award.js.es6 => admin-badges-award.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-badges-show.js.es6 => admin-badges-show.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-badges.js.es6 => admin-badges.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-colors-show.js.es6 => admin-customize-colors-show.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-colors.js.es6 => admin-customize-colors.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-email-style-edit.js.es6 => admin-customize-email-style-edit.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-email-templates-edit.js.es6 => admin-customize-email-templates-edit.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-email-templates.js.es6 => admin-customize-email-templates.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-robots-txt.js.es6 => admin-customize-robots-txt.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-themes-edit.js.es6 => admin-customize-themes-edit.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-themes-show.js.es6 => admin-customize-themes-show.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-customize-themes.js.es6 => admin-customize-themes.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-dashboard-general.js.es6 => admin-dashboard-general.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-dashboard-moderation.js.es6 => admin-dashboard-moderation.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-dashboard-reports.js.es6 => admin-dashboard-reports.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-dashboard.js.es6 => admin-dashboard.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-advanced-test.js.es6 => admin-email-advanced-test.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-bounced.js.es6 => admin-email-bounced.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-index.js.es6 => admin-email-index.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-logs.js.es6 => admin-email-logs.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-preview-digest.js.es6 => admin-email-preview-digest.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-received.js.es6 => admin-email-received.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-rejected.js.es6 => admin-email-rejected.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-sent.js.es6 => admin-email-sent.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-email-skipped.js.es6 => admin-email-skipped.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-embedding.js.es6 => admin-embedding.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-emojis.js.es6 => admin-emojis.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-logs-screened-emails.js.es6 => admin-logs-screened-emails.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-logs-screened-ip-addresses.js.es6 => admin-logs-screened-ip-addresses.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-logs-screened-urls.js.es6 => admin-logs-screened-urls.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-logs-staff-action-logs.js.es6 => admin-logs-staff-action-logs.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-permalinks.js.es6 => admin-permalinks.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-plugins.js.es6 => admin-plugins.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-reports-show.js.es6 => admin-reports-show.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-search-logs-index.js.es6 => admin-search-logs-index.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-search-logs-term.js.es6 => admin-search-logs-term.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-site-settings-category.js.es6 => admin-site-settings-category.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-site-settings.js.es6 => admin-site-settings.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-site-text-edit.js.es6 => admin-site-text-edit.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-site-text-index.js.es6 => admin-site-text-index.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-user-badges.js.es6 => admin-user-badges.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-user-fields.js.es6 => admin-user-fields.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-user-index.js.es6 => admin-user-index.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-user.js.es6 => admin-user.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-users-list-show.js.es6 => admin-users-list-show.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-watched-words-action.js.es6 => admin-watched-words-action.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-watched-words.js.es6 => admin-watched-words.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-web-hooks-show-events.js.es6 => admin-web-hooks-show-events.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-web-hooks-show.js.es6 => admin-web-hooks-show.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin-web-hooks.js.es6 => admin-web-hooks.js} (100%)
 rename app/assets/javascripts/admin/controllers/{admin.js.es6 => admin.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-add-upload.js.es6 => admin-add-upload.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-badge-preview.js.es6 => admin-badge-preview.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-color-scheme-select-base.js.es6 => admin-color-scheme-select-base.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-edit-badge-groupings.js.es6 => admin-edit-badge-groupings.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-incoming-email.js.es6 => admin-incoming-email.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-install-theme.js.es6 => admin-install-theme.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-reseed.js.es6 => admin-reseed.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-silence-user.js.es6 => admin-silence-user.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-staff-action-log-details.js.es6 => admin-staff-action-log-details.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-start-backup.js.es6 => admin-start-backup.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-suspend-user.js.es6 => admin-suspend-user.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-theme-change.js.es6 => admin-theme-change.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-uploaded-image-list.js.es6 => admin-uploaded-image-list.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{admin-watched-word-test.js.es6 => admin-watched-word-test.js} (100%)
 rename app/assets/javascripts/admin/controllers/modals/{site-setting-default-categories.js.es6 => site-setting-default-categories.js} (100%)
 rename app/assets/javascripts/admin/helpers/{check-icon.js.es6 => check-icon.js} (100%)
 rename app/assets/javascripts/admin/helpers/{disposition-icon.js.es6 => disposition-icon.js} (100%)
 rename app/assets/javascripts/admin/helpers/{human-size.js.es6 => human-size.js} (100%)
 rename app/assets/javascripts/admin/helpers/{post-action-title.js.es6 => post-action-title.js} (100%)
 rename app/assets/javascripts/admin/helpers/{preserve-newlines.js.es6 => preserve-newlines.js} (100%)
 rename app/assets/javascripts/admin/helpers/{value-at-tl.js.es6 => value-at-tl.js} (100%)
 rename app/assets/javascripts/admin/mixins/{penalty-controller.js.es6 => penalty-controller.js} (100%)
 rename app/assets/javascripts/admin/mixins/{period-computation.js.es6 => period-computation.js} (100%)
 rename app/assets/javascripts/admin/mixins/{setting-component.js.es6 => setting-component.js} (100%)
 rename app/assets/javascripts/admin/mixins/{setting-object.js.es6 => setting-object.js} (100%)
 rename app/assets/javascripts/admin/models/{admin-dashboard.js.es6 => admin-dashboard.js} (100%)
 rename app/assets/javascripts/admin/models/{admin-user.js.es6 => admin-user.js} (100%)
 rename app/assets/javascripts/admin/models/{api-key.js.es6 => api-key.js} (100%)
 rename app/assets/javascripts/admin/models/{backup-status.js.es6 => backup-status.js} (100%)
 rename app/assets/javascripts/admin/models/{backup.js.es6 => backup.js} (100%)
 rename app/assets/javascripts/admin/models/{color-scheme-color.js.es6 => color-scheme-color.js} (100%)
 rename app/assets/javascripts/admin/models/{color-scheme.js.es6 => color-scheme.js} (100%)
 rename app/assets/javascripts/admin/models/{email-log.js.es6 => email-log.js} (100%)
 rename app/assets/javascripts/admin/models/{email-preview.js.es6 => email-preview.js} (100%)
 rename app/assets/javascripts/admin/models/{email-settings.js.es6 => email-settings.js} (100%)
 rename app/assets/javascripts/admin/models/{email-style.js.es6 => email-style.js} (100%)
 rename app/assets/javascripts/admin/models/{email-template.js.es6 => email-template.js} (100%)
 rename app/assets/javascripts/admin/models/{flag-type.js.es6 => flag-type.js} (100%)
 rename app/assets/javascripts/admin/models/{incoming-email.js.es6 => incoming-email.js} (100%)
 rename app/assets/javascripts/admin/models/{permalink.js.es6 => permalink.js} (100%)
 rename app/assets/javascripts/admin/models/{report.js.es6 => report.js} (100%)
 rename app/assets/javascripts/admin/models/{screened-email.js.es6 => screened-email.js} (100%)
 rename app/assets/javascripts/admin/models/{screened-ip-address.js.es6 => screened-ip-address.js} (100%)
 rename app/assets/javascripts/admin/models/{screened-url.js.es6 => screened-url.js} (100%)
 rename app/assets/javascripts/admin/models/{site-setting.js.es6 => site-setting.js} (100%)
 rename app/assets/javascripts/admin/models/{site-text.js.es6 => site-text.js} (100%)
 rename app/assets/javascripts/admin/models/{staff-action-log.js.es6 => staff-action-log.js} (100%)
 rename app/assets/javascripts/admin/models/{theme-settings.js.es6 => theme-settings.js} (100%)
 rename app/assets/javascripts/admin/models/{theme.js.es6 => theme.js} (100%)
 rename app/assets/javascripts/admin/models/{tl3-requirements.js.es6 => tl3-requirements.js} (100%)
 rename app/assets/javascripts/admin/models/{user-field.js.es6 => user-field.js} (100%)
 rename app/assets/javascripts/admin/models/{version-check.js.es6 => version-check.js} (100%)
 rename app/assets/javascripts/admin/models/{watched-word.js.es6 => watched-word.js} (100%)
 rename app/assets/javascripts/admin/models/{web-hook.js.es6 => web-hook.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-api-index.js.es6 => admin-api-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-api-keys-index.js.es6 => admin-api-keys-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-api-keys-show.js.es6 => admin-api-keys-show.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-api-keys.js.es6 => admin-api-keys.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-backups-index.js.es6 => admin-backups-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-backups-logs.js.es6 => admin-backups-logs.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-backups.js.es6 => admin-backups.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-badges-award.js.es6 => admin-badges-award.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-badges-index.js.es6 => admin-badges-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-badges-show.js.es6 => admin-badges-show.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-badges.js.es6 => admin-badges.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-colors-show.js.es6 => admin-customize-colors-show.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-colors.js.es6 => admin-customize-colors.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-email-style-edit.js.es6 => admin-customize-email-style-edit.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-email-style-index.js.es6 => admin-customize-email-style-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-email-style.js.es6 => admin-customize-email-style.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-email-templates-edit.js.es6 => admin-customize-email-templates-edit.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-email-templates.js.es6 => admin-customize-email-templates.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-index.js.es6 => admin-customize-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-robots-txt.js.es6 => admin-customize-robots-txt.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-themes-edit.js.es6 => admin-customize-themes-edit.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-themes-index.js.es6 => admin-customize-themes-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-themes-show.js.es6 => admin-customize-themes-show.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-customize-themes.js.es6 => admin-customize-themes.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-dashboard-general.js.es6 => admin-dashboard-general.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-dashboard-reports.js.es6 => admin-dashboard-reports.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-dashboard.js.es6 => admin-dashboard.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-bounced.js.es6 => admin-email-bounced.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-incomings.js.es6 => admin-email-incomings.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-index.js.es6 => admin-email-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-logs.js.es6 => admin-email-logs.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-preview-digest.js.es6 => admin-email-preview-digest.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-received.js.es6 => admin-email-received.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-rejected.js.es6 => admin-email-rejected.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-sent.js.es6 => admin-email-sent.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-email-skipped.js.es6 => admin-email-skipped.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-embedding.js.es6 => admin-embedding.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-emojis.js.es6 => admin-emojis.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-flags-posts-active.js.es6 => admin-flags-posts-active.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-flags-posts-old.js.es6 => admin-flags-posts-old.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-flags-topics-index.js.es6 => admin-flags-topics-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-logs-index.js.es6 => admin-logs-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-logs-screened-emails.js.es6 => admin-logs-screened-emails.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-logs-screened-ip-addresses.js.es6 => admin-logs-screened-ip-addresses.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-logs-screened-urls.js.es6 => admin-logs-screened-urls.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-logs-staff-action-logs.js.es6 => admin-logs-staff-action-logs.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-permalinks.js.es6 => admin-permalinks.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-plugins.js.es6 => admin-plugins.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-reports-index.js.es6 => admin-reports-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-reports-show.js.es6 => admin-reports-show.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-route-map.js.es6 => admin-route-map.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-search-logs-index.js.es6 => admin-search-logs-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-search-logs-term.js.es6 => admin-search-logs-term.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-site-settings-category.js.es6 => admin-site-settings-category.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-site-settings-index.js.es6 => admin-site-settings-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-site-settings.js.es6 => admin-site-settings.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-site-text-edit.js.es6 => admin-site-text-edit.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-site-text-index.js.es6 => admin-site-text-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-user-badges.js.es6 => admin-user-badges.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-user-fields.js.es6 => admin-user-fields.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-user-index.js.es6 => admin-user-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-user-tl3-requirements.js.es6 => admin-user-tl3-requirements.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-user.js.es6 => admin-user.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-users-index.js.es6 => admin-users-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-users-list-index.js.es6 => admin-users-list-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-users-list-show.js.es6 => admin-users-list-show.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-users-list.js.es6 => admin-users-list.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-watched-words-action.js.es6 => admin-watched-words-action.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-watched-words-index.js.es6 => admin-watched-words-index.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-watched-words.js.es6 => admin-watched-words.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-web-hooks-show-events.js.es6 => admin-web-hooks-show-events.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-web-hooks-show.js.es6 => admin-web-hooks-show.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin-web-hooks.js.es6 => admin-web-hooks.js} (100%)
 rename app/assets/javascripts/admin/routes/{admin.js.es6 => admin.js} (100%)
 rename app/assets/javascripts/admin/services/{admin-tools.js.es6 => admin-tools.js} (100%)

diff --git a/app/assets/javascripts/admin/adapters/api-key.js.es6 b/app/assets/javascripts/admin/adapters/api-key.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/api-key.js.es6
rename to app/assets/javascripts/admin/adapters/api-key.js
diff --git a/app/assets/javascripts/admin/adapters/build-plugin.js.es6 b/app/assets/javascripts/admin/adapters/build-plugin.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/build-plugin.js.es6
rename to app/assets/javascripts/admin/adapters/build-plugin.js
diff --git a/app/assets/javascripts/admin/adapters/customization-base.js.es6 b/app/assets/javascripts/admin/adapters/customization-base.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/customization-base.js.es6
rename to app/assets/javascripts/admin/adapters/customization-base.js
diff --git a/app/assets/javascripts/admin/adapters/email-style.js.es6 b/app/assets/javascripts/admin/adapters/email-style.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/email-style.js.es6
rename to app/assets/javascripts/admin/adapters/email-style.js
diff --git a/app/assets/javascripts/admin/adapters/embedding.js.es6 b/app/assets/javascripts/admin/adapters/embedding.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/embedding.js.es6
rename to app/assets/javascripts/admin/adapters/embedding.js
diff --git a/app/assets/javascripts/admin/adapters/site-text.js.es6 b/app/assets/javascripts/admin/adapters/site-text.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/site-text.js.es6
rename to app/assets/javascripts/admin/adapters/site-text.js
diff --git a/app/assets/javascripts/admin/adapters/staff-action-log.js.es6 b/app/assets/javascripts/admin/adapters/staff-action-log.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/staff-action-log.js.es6
rename to app/assets/javascripts/admin/adapters/staff-action-log.js
diff --git a/app/assets/javascripts/admin/adapters/tag-group.js.es6 b/app/assets/javascripts/admin/adapters/tag-group.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/tag-group.js.es6
rename to app/assets/javascripts/admin/adapters/tag-group.js
diff --git a/app/assets/javascripts/admin/adapters/theme.js.es6 b/app/assets/javascripts/admin/adapters/theme.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/theme.js.es6
rename to app/assets/javascripts/admin/adapters/theme.js
diff --git a/app/assets/javascripts/admin/adapters/user-field.js.es6 b/app/assets/javascripts/admin/adapters/user-field.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/user-field.js.es6
rename to app/assets/javascripts/admin/adapters/user-field.js
diff --git a/app/assets/javascripts/admin/adapters/web-hook-event.js.es6 b/app/assets/javascripts/admin/adapters/web-hook-event.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/web-hook-event.js.es6
rename to app/assets/javascripts/admin/adapters/web-hook-event.js
diff --git a/app/assets/javascripts/admin/adapters/web-hook.js.es6 b/app/assets/javascripts/admin/adapters/web-hook.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/web-hook.js.es6
rename to app/assets/javascripts/admin/adapters/web-hook.js
diff --git a/app/assets/javascripts/admin/components/ace-editor.js.es6 b/app/assets/javascripts/admin/components/ace-editor.js
similarity index 100%
rename from app/assets/javascripts/admin/components/ace-editor.js.es6
rename to app/assets/javascripts/admin/components/ace-editor.js
diff --git a/app/assets/javascripts/admin/components/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/components/admin-backups-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-backups-logs.js.es6
rename to app/assets/javascripts/admin/components/admin-backups-logs.js
diff --git a/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6 b/app/assets/javascripts/admin/components/admin-directory-toggle.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-directory-toggle.js.es6
rename to app/assets/javascripts/admin/components/admin-directory-toggle.js
diff --git a/app/assets/javascripts/admin/components/admin-editable-field.js.es6 b/app/assets/javascripts/admin/components/admin-editable-field.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-editable-field.js.es6
rename to app/assets/javascripts/admin/components/admin-editable-field.js
diff --git a/app/assets/javascripts/admin/components/admin-form-row.js.es6 b/app/assets/javascripts/admin/components/admin-form-row.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-form-row.js.es6
rename to app/assets/javascripts/admin/components/admin-form-row.js
diff --git a/app/assets/javascripts/admin/components/admin-graph.js.es6 b/app/assets/javascripts/admin/components/admin-graph.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-graph.js.es6
rename to app/assets/javascripts/admin/components/admin-graph.js
diff --git a/app/assets/javascripts/admin/components/admin-nav.js.es6 b/app/assets/javascripts/admin/components/admin-nav.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-nav.js.es6
rename to app/assets/javascripts/admin/components/admin-nav.js
diff --git a/app/assets/javascripts/admin/components/admin-report-chart.js.es6 b/app/assets/javascripts/admin/components/admin-report-chart.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-chart.js.es6
rename to app/assets/javascripts/admin/components/admin-report-chart.js
diff --git a/app/assets/javascripts/admin/components/admin-report-counters.js.es6 b/app/assets/javascripts/admin/components/admin-report-counters.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-counters.js.es6
rename to app/assets/javascripts/admin/components/admin-report-counters.js
diff --git a/app/assets/javascripts/admin/components/admin-report-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-counts.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-counts.js.es6
rename to app/assets/javascripts/admin/components/admin-report-counts.js
diff --git a/app/assets/javascripts/admin/components/admin-report-inline-table.js.es6 b/app/assets/javascripts/admin/components/admin-report-inline-table.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-inline-table.js.es6
rename to app/assets/javascripts/admin/components/admin-report-inline-table.js
diff --git a/app/assets/javascripts/admin/components/admin-report-per-day-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-per-day-counts.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-per-day-counts.js.es6
rename to app/assets/javascripts/admin/components/admin-report-per-day-counts.js
diff --git a/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6 b/app/assets/javascripts/admin/components/admin-report-stacked-chart.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6
rename to app/assets/javascripts/admin/components/admin-report-stacked-chart.js
diff --git a/app/assets/javascripts/admin/components/admin-report-storage-stats.js.es6 b/app/assets/javascripts/admin/components/admin-report-storage-stats.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-storage-stats.js.es6
rename to app/assets/javascripts/admin/components/admin-report-storage-stats.js
diff --git a/app/assets/javascripts/admin/components/admin-report-table-cell.js.es6 b/app/assets/javascripts/admin/components/admin-report-table-cell.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-table-cell.js.es6
rename to app/assets/javascripts/admin/components/admin-report-table-cell.js
diff --git a/app/assets/javascripts/admin/components/admin-report-table-header.js.es6 b/app/assets/javascripts/admin/components/admin-report-table-header.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-table-header.js.es6
rename to app/assets/javascripts/admin/components/admin-report-table-header.js
diff --git a/app/assets/javascripts/admin/components/admin-report-table-row.js.es6 b/app/assets/javascripts/admin/components/admin-report-table-row.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-table-row.js.es6
rename to app/assets/javascripts/admin/components/admin-report-table-row.js
diff --git a/app/assets/javascripts/admin/components/admin-report-table.js.es6 b/app/assets/javascripts/admin/components/admin-report-table.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-table.js.es6
rename to app/assets/javascripts/admin/components/admin-report-table.js
diff --git a/app/assets/javascripts/admin/components/admin-report-trust-level-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-trust-level-counts.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-trust-level-counts.js.es6
rename to app/assets/javascripts/admin/components/admin-report-trust-level-counts.js
diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report.js.es6
rename to app/assets/javascripts/admin/components/admin-report.js
diff --git a/app/assets/javascripts/admin/components/admin-theme-editor.js.es6 b/app/assets/javascripts/admin/components/admin-theme-editor.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-theme-editor.js.es6
rename to app/assets/javascripts/admin/components/admin-theme-editor.js
diff --git a/app/assets/javascripts/admin/components/admin-user-field-item.js.es6 b/app/assets/javascripts/admin/components/admin-user-field-item.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-user-field-item.js.es6
rename to app/assets/javascripts/admin/components/admin-user-field-item.js
diff --git a/app/assets/javascripts/admin/components/admin-watched-word.js.es6 b/app/assets/javascripts/admin/components/admin-watched-word.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-watched-word.js.es6
rename to app/assets/javascripts/admin/components/admin-watched-word.js
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js.es6
rename to app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-event.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-web-hook-event.js.es6
rename to app/assets/javascripts/admin/components/admin-web-hook-event.js
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-status.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-web-hook-status.js.es6
rename to app/assets/javascripts/admin/components/admin-web-hook-status.js
diff --git a/app/assets/javascripts/admin/components/admin-wrapper.js.es6 b/app/assets/javascripts/admin/components/admin-wrapper.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-wrapper.js.es6
rename to app/assets/javascripts/admin/components/admin-wrapper.js
diff --git a/app/assets/javascripts/admin/components/cancel-link.js.es6 b/app/assets/javascripts/admin/components/cancel-link.js
similarity index 100%
rename from app/assets/javascripts/admin/components/cancel-link.js.es6
rename to app/assets/javascripts/admin/components/cancel-link.js
diff --git a/app/assets/javascripts/admin/components/color-input.js.es6 b/app/assets/javascripts/admin/components/color-input.js
similarity index 100%
rename from app/assets/javascripts/admin/components/color-input.js.es6
rename to app/assets/javascripts/admin/components/color-input.js
diff --git a/app/assets/javascripts/admin/components/email-styles-editor.js.es6 b/app/assets/javascripts/admin/components/email-styles-editor.js
similarity index 100%
rename from app/assets/javascripts/admin/components/email-styles-editor.js.es6
rename to app/assets/javascripts/admin/components/email-styles-editor.js
diff --git a/app/assets/javascripts/admin/components/embeddable-host.js.es6 b/app/assets/javascripts/admin/components/embeddable-host.js
similarity index 100%
rename from app/assets/javascripts/admin/components/embeddable-host.js.es6
rename to app/assets/javascripts/admin/components/embeddable-host.js
diff --git a/app/assets/javascripts/admin/components/embedding-setting.js.es6 b/app/assets/javascripts/admin/components/embedding-setting.js
similarity index 100%
rename from app/assets/javascripts/admin/components/embedding-setting.js.es6
rename to app/assets/javascripts/admin/components/embedding-setting.js
diff --git a/app/assets/javascripts/admin/components/flag-user-lists.js.es6 b/app/assets/javascripts/admin/components/flag-user-lists.js
similarity index 100%
rename from app/assets/javascripts/admin/components/flag-user-lists.js.es6
rename to app/assets/javascripts/admin/components/flag-user-lists.js
diff --git a/app/assets/javascripts/admin/components/highlighted-code.js.es6 b/app/assets/javascripts/admin/components/highlighted-code.js
similarity index 100%
rename from app/assets/javascripts/admin/components/highlighted-code.js.es6
rename to app/assets/javascripts/admin/components/highlighted-code.js
diff --git a/app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6 b/app/assets/javascripts/admin/components/inline-edit-checkbox.js
similarity index 100%
rename from app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6
rename to app/assets/javascripts/admin/components/inline-edit-checkbox.js
diff --git a/app/assets/javascripts/admin/components/install-theme-item.js.es6 b/app/assets/javascripts/admin/components/install-theme-item.js
similarity index 100%
rename from app/assets/javascripts/admin/components/install-theme-item.js.es6
rename to app/assets/javascripts/admin/components/install-theme-item.js
diff --git a/app/assets/javascripts/admin/components/ip-lookup.js.es6 b/app/assets/javascripts/admin/components/ip-lookup.js
similarity index 100%
rename from app/assets/javascripts/admin/components/ip-lookup.js.es6
rename to app/assets/javascripts/admin/components/ip-lookup.js
diff --git a/app/assets/javascripts/admin/components/moderation-history-item.js.es6 b/app/assets/javascripts/admin/components/moderation-history-item.js
similarity index 100%
rename from app/assets/javascripts/admin/components/moderation-history-item.js.es6
rename to app/assets/javascripts/admin/components/moderation-history-item.js
diff --git a/app/assets/javascripts/admin/components/penalty-post-action.js.es6 b/app/assets/javascripts/admin/components/penalty-post-action.js
similarity index 100%
rename from app/assets/javascripts/admin/components/penalty-post-action.js.es6
rename to app/assets/javascripts/admin/components/penalty-post-action.js
diff --git a/app/assets/javascripts/admin/components/permalink-form.js.es6 b/app/assets/javascripts/admin/components/permalink-form.js
similarity index 100%
rename from app/assets/javascripts/admin/components/permalink-form.js.es6
rename to app/assets/javascripts/admin/components/permalink-form.js
diff --git a/app/assets/javascripts/admin/components/report-filters/category.js.es6 b/app/assets/javascripts/admin/components/report-filters/category.js
similarity index 100%
rename from app/assets/javascripts/admin/components/report-filters/category.js.es6
rename to app/assets/javascripts/admin/components/report-filters/category.js
diff --git a/app/assets/javascripts/admin/components/report-filters/file-extension.js.es6 b/app/assets/javascripts/admin/components/report-filters/file-extension.js
similarity index 100%
rename from app/assets/javascripts/admin/components/report-filters/file-extension.js.es6
rename to app/assets/javascripts/admin/components/report-filters/file-extension.js
diff --git a/app/assets/javascripts/admin/components/report-filters/filter.js.es6 b/app/assets/javascripts/admin/components/report-filters/filter.js
similarity index 100%
rename from app/assets/javascripts/admin/components/report-filters/filter.js.es6
rename to app/assets/javascripts/admin/components/report-filters/filter.js
diff --git a/app/assets/javascripts/admin/components/report-filters/group.js.es6 b/app/assets/javascripts/admin/components/report-filters/group.js
similarity index 100%
rename from app/assets/javascripts/admin/components/report-filters/group.js.es6
rename to app/assets/javascripts/admin/components/report-filters/group.js
diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js
similarity index 100%
rename from app/assets/javascripts/admin/components/resumable-upload.js.es6
rename to app/assets/javascripts/admin/components/resumable-upload.js
diff --git a/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6 b/app/assets/javascripts/admin/components/screened-ip-address-form.js
similarity index 100%
rename from app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
rename to app/assets/javascripts/admin/components/screened-ip-address-form.js
diff --git a/app/assets/javascripts/admin/components/secret-value-list.js.es6 b/app/assets/javascripts/admin/components/secret-value-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/secret-value-list.js.es6
rename to app/assets/javascripts/admin/components/secret-value-list.js
diff --git a/app/assets/javascripts/admin/components/silence-details.js.es6 b/app/assets/javascripts/admin/components/silence-details.js
similarity index 100%
rename from app/assets/javascripts/admin/components/silence-details.js.es6
rename to app/assets/javascripts/admin/components/silence-details.js
diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-setting.js.es6
rename to app/assets/javascripts/admin/components/site-setting.js
diff --git a/app/assets/javascripts/admin/components/site-settings-image-uploader.js.es6 b/app/assets/javascripts/admin/components/site-settings-image-uploader.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings-image-uploader.js.es6
rename to app/assets/javascripts/admin/components/site-settings-image-uploader.js
diff --git a/app/assets/javascripts/admin/components/site-settings/bool.js.es6 b/app/assets/javascripts/admin/components/site-settings/bool.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/bool.js.es6
rename to app/assets/javascripts/admin/components/site-settings/bool.js
diff --git a/app/assets/javascripts/admin/components/site-settings/category-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/category-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/category-list.js.es6
rename to app/assets/javascripts/admin/components/site-settings/category-list.js
diff --git a/app/assets/javascripts/admin/components/site-settings/color.js.es6 b/app/assets/javascripts/admin/components/site-settings/color.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/color.js.es6
rename to app/assets/javascripts/admin/components/site-settings/color.js
diff --git a/app/assets/javascripts/admin/components/site-settings/compact-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/compact-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/compact-list.js.es6
rename to app/assets/javascripts/admin/components/site-settings/compact-list.js
diff --git a/app/assets/javascripts/admin/components/site-settings/group-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/group-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/group-list.js.es6
rename to app/assets/javascripts/admin/components/site-settings/group-list.js
diff --git a/app/assets/javascripts/admin/components/site-settings/tag-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/tag-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/tag-list.js.es6
rename to app/assets/javascripts/admin/components/site-settings/tag-list.js
diff --git a/app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js.es6
rename to app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js
diff --git a/app/assets/javascripts/admin/components/site-text-summary.js.es6 b/app/assets/javascripts/admin/components/site-text-summary.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-text-summary.js.es6
rename to app/assets/javascripts/admin/components/site-text-summary.js
diff --git a/app/assets/javascripts/admin/components/staff-actions.js.es6 b/app/assets/javascripts/admin/components/staff-actions.js
similarity index 100%
rename from app/assets/javascripts/admin/components/staff-actions.js.es6
rename to app/assets/javascripts/admin/components/staff-actions.js
diff --git a/app/assets/javascripts/admin/components/suspension-details.js.es6 b/app/assets/javascripts/admin/components/suspension-details.js
similarity index 100%
rename from app/assets/javascripts/admin/components/suspension-details.js.es6
rename to app/assets/javascripts/admin/components/suspension-details.js
diff --git a/app/assets/javascripts/admin/components/tags-uploader.js.es6 b/app/assets/javascripts/admin/components/tags-uploader.js
similarity index 100%
rename from app/assets/javascripts/admin/components/tags-uploader.js.es6
rename to app/assets/javascripts/admin/components/tags-uploader.js
diff --git a/app/assets/javascripts/admin/components/theme-setting-editor.js.es6 b/app/assets/javascripts/admin/components/theme-setting-editor.js
similarity index 100%
rename from app/assets/javascripts/admin/components/theme-setting-editor.js.es6
rename to app/assets/javascripts/admin/components/theme-setting-editor.js
diff --git a/app/assets/javascripts/admin/components/theme-setting-relatives-selector.js.es6 b/app/assets/javascripts/admin/components/theme-setting-relatives-selector.js
similarity index 100%
rename from app/assets/javascripts/admin/components/theme-setting-relatives-selector.js.es6
rename to app/assets/javascripts/admin/components/theme-setting-relatives-selector.js
diff --git a/app/assets/javascripts/admin/components/theme-translation.js.es6 b/app/assets/javascripts/admin/components/theme-translation.js
similarity index 100%
rename from app/assets/javascripts/admin/components/theme-translation.js.es6
rename to app/assets/javascripts/admin/components/theme-translation.js
diff --git a/app/assets/javascripts/admin/components/themes-list-item.js.es6 b/app/assets/javascripts/admin/components/themes-list-item.js
similarity index 100%
rename from app/assets/javascripts/admin/components/themes-list-item.js.es6
rename to app/assets/javascripts/admin/components/themes-list-item.js
diff --git a/app/assets/javascripts/admin/components/themes-list.js.es6 b/app/assets/javascripts/admin/components/themes-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/themes-list.js.es6
rename to app/assets/javascripts/admin/components/themes-list.js
diff --git a/app/assets/javascripts/admin/components/value-list.js.es6 b/app/assets/javascripts/admin/components/value-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/value-list.js.es6
rename to app/assets/javascripts/admin/components/value-list.js
diff --git a/app/assets/javascripts/admin/components/watched-word-form.js.es6 b/app/assets/javascripts/admin/components/watched-word-form.js
similarity index 100%
rename from app/assets/javascripts/admin/components/watched-word-form.js.es6
rename to app/assets/javascripts/admin/components/watched-word-form.js
diff --git a/app/assets/javascripts/admin/components/watched-word-uploader.js.es6 b/app/assets/javascripts/admin/components/watched-word-uploader.js
similarity index 100%
rename from app/assets/javascripts/admin/components/watched-word-uploader.js.es6
rename to app/assets/javascripts/admin/components/watched-word-uploader.js
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-api-keys-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-api-keys-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys-new.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys-new.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-api-keys-new.js.es6
rename to app/assets/javascripts/admin/controllers/admin-api-keys-new.js
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-api-keys-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-api-keys-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
rename to app/assets/javascripts/admin/controllers/admin-api-keys.js
diff --git a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-backups-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
rename to app/assets/javascripts/admin/controllers/admin-backups-logs.js
diff --git a/app/assets/javascripts/admin/controllers/admin-backups.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-backups.js.es6
rename to app/assets/javascripts/admin/controllers/admin-backups.js
diff --git a/app/assets/javascripts/admin/controllers/admin-badges-award.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges-award.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-badges-award.js.es6
rename to app/assets/javascripts/admin/controllers/admin-badges-award.js
diff --git a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-badges-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-badges.js.es6
rename to app/assets/javascripts/admin/controllers/admin-badges.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-colors-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-colors.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-email-templates.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-themes.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-themes.js
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
rename to app/assets/javascripts/admin/controllers/admin-dashboard-general.js
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js.es6
rename to app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
rename to app/assets/javascripts/admin/controllers/admin-dashboard-reports.js
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
rename to app/assets/javascripts/admin/controllers/admin-dashboard.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-advanced-test.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-advanced-test.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-advanced-test.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-advanced-test.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-bounced.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-bounced.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-logs.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-logs.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-preview-digest.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-received.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-received.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-received.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-received.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-rejected.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-rejected.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-sent.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-sent.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-sent.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-skipped.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-skipped.js
diff --git a/app/assets/javascripts/admin/controllers/admin-embedding.js.es6 b/app/assets/javascripts/admin/controllers/admin-embedding.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-embedding.js.es6
rename to app/assets/javascripts/admin/controllers/admin-embedding.js
diff --git a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 b/app/assets/javascripts/admin/controllers/admin-emojis.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-emojis.js.es6
rename to app/assets/javascripts/admin/controllers/admin-emojis.js
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
rename to app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
rename to app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
rename to app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
rename to app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js
diff --git a/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6 b/app/assets/javascripts/admin/controllers/admin-permalinks.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
rename to app/assets/javascripts/admin/controllers/admin-permalinks.js
diff --git a/app/assets/javascripts/admin/controllers/admin-plugins.js.es6 b/app/assets/javascripts/admin/controllers/admin-plugins.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-plugins.js.es6
rename to app/assets/javascripts/admin/controllers/admin-plugins.js
diff --git a/app/assets/javascripts/admin/controllers/admin-reports-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-reports-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-reports-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-search-logs-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-search-logs-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6 b/app/assets/javascripts/admin/controllers/admin-search-logs-term.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6
rename to app/assets/javascripts/admin/controllers/admin-search-logs-term.js
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings-category.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
rename to app/assets/javascripts/admin/controllers/admin-site-settings-category.js
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
rename to app/assets/javascripts/admin/controllers/admin-site-settings.js
diff --git a/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-text-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6
rename to app/assets/javascripts/admin/controllers/admin-site-text-edit.js
diff --git a/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-text-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-site-text-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-badges.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
rename to app/assets/javascripts/admin/controllers/admin-user-badges.js
diff --git a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-fields.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
rename to app/assets/javascripts/admin/controllers/admin-user-fields.js
diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-user-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-user-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-user.js.es6 b/app/assets/javascripts/admin/controllers/admin-user.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-user.js.es6
rename to app/assets/javascripts/admin/controllers/admin-user.js
diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-users-list-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-users-list-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
rename to app/assets/javascripts/admin/controllers/admin-watched-words-action.js
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
rename to app/assets/javascripts/admin/controllers/admin-watched-words.js
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js.es6
rename to app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-web-hooks-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6
rename to app/assets/javascripts/admin/controllers/admin-web-hooks.js
diff --git a/app/assets/javascripts/admin/controllers/admin.js.es6 b/app/assets/javascripts/admin/controllers/admin.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin.js.es6
rename to app/assets/javascripts/admin/controllers/admin.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-add-upload.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-install-theme.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-install-theme.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-reseed.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-reseed.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-reseed.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-reseed.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-silence-user.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-start-backup.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-theme-change.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-theme-change.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-theme-change.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-theme-change.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-watched-word-test.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-watched-word-test.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-watched-word-test.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-watched-word-test.js
diff --git a/app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js.es6 b/app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js.es6
rename to app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js
diff --git a/app/assets/javascripts/admin/helpers/check-icon.js.es6 b/app/assets/javascripts/admin/helpers/check-icon.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/check-icon.js.es6
rename to app/assets/javascripts/admin/helpers/check-icon.js
diff --git a/app/assets/javascripts/admin/helpers/disposition-icon.js.es6 b/app/assets/javascripts/admin/helpers/disposition-icon.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/disposition-icon.js.es6
rename to app/assets/javascripts/admin/helpers/disposition-icon.js
diff --git a/app/assets/javascripts/admin/helpers/human-size.js.es6 b/app/assets/javascripts/admin/helpers/human-size.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/human-size.js.es6
rename to app/assets/javascripts/admin/helpers/human-size.js
diff --git a/app/assets/javascripts/admin/helpers/post-action-title.js.es6 b/app/assets/javascripts/admin/helpers/post-action-title.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/post-action-title.js.es6
rename to app/assets/javascripts/admin/helpers/post-action-title.js
diff --git a/app/assets/javascripts/admin/helpers/preserve-newlines.js.es6 b/app/assets/javascripts/admin/helpers/preserve-newlines.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/preserve-newlines.js.es6
rename to app/assets/javascripts/admin/helpers/preserve-newlines.js
diff --git a/app/assets/javascripts/admin/helpers/value-at-tl.js.es6 b/app/assets/javascripts/admin/helpers/value-at-tl.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/value-at-tl.js.es6
rename to app/assets/javascripts/admin/helpers/value-at-tl.js
diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 b/app/assets/javascripts/admin/mixins/penalty-controller.js
similarity index 100%
rename from app/assets/javascripts/admin/mixins/penalty-controller.js.es6
rename to app/assets/javascripts/admin/mixins/penalty-controller.js
diff --git a/app/assets/javascripts/admin/mixins/period-computation.js.es6 b/app/assets/javascripts/admin/mixins/period-computation.js
similarity index 100%
rename from app/assets/javascripts/admin/mixins/period-computation.js.es6
rename to app/assets/javascripts/admin/mixins/period-computation.js
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js
similarity index 100%
rename from app/assets/javascripts/admin/mixins/setting-component.js.es6
rename to app/assets/javascripts/admin/mixins/setting-component.js
diff --git a/app/assets/javascripts/admin/mixins/setting-object.js.es6 b/app/assets/javascripts/admin/mixins/setting-object.js
similarity index 100%
rename from app/assets/javascripts/admin/mixins/setting-object.js.es6
rename to app/assets/javascripts/admin/mixins/setting-object.js
diff --git a/app/assets/javascripts/admin/models/admin-dashboard.js.es6 b/app/assets/javascripts/admin/models/admin-dashboard.js
similarity index 100%
rename from app/assets/javascripts/admin/models/admin-dashboard.js.es6
rename to app/assets/javascripts/admin/models/admin-dashboard.js
diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js
similarity index 100%
rename from app/assets/javascripts/admin/models/admin-user.js.es6
rename to app/assets/javascripts/admin/models/admin-user.js
diff --git a/app/assets/javascripts/admin/models/api-key.js.es6 b/app/assets/javascripts/admin/models/api-key.js
similarity index 100%
rename from app/assets/javascripts/admin/models/api-key.js.es6
rename to app/assets/javascripts/admin/models/api-key.js
diff --git a/app/assets/javascripts/admin/models/backup-status.js.es6 b/app/assets/javascripts/admin/models/backup-status.js
similarity index 100%
rename from app/assets/javascripts/admin/models/backup-status.js.es6
rename to app/assets/javascripts/admin/models/backup-status.js
diff --git a/app/assets/javascripts/admin/models/backup.js.es6 b/app/assets/javascripts/admin/models/backup.js
similarity index 100%
rename from app/assets/javascripts/admin/models/backup.js.es6
rename to app/assets/javascripts/admin/models/backup.js
diff --git a/app/assets/javascripts/admin/models/color-scheme-color.js.es6 b/app/assets/javascripts/admin/models/color-scheme-color.js
similarity index 100%
rename from app/assets/javascripts/admin/models/color-scheme-color.js.es6
rename to app/assets/javascripts/admin/models/color-scheme-color.js
diff --git a/app/assets/javascripts/admin/models/color-scheme.js.es6 b/app/assets/javascripts/admin/models/color-scheme.js
similarity index 100%
rename from app/assets/javascripts/admin/models/color-scheme.js.es6
rename to app/assets/javascripts/admin/models/color-scheme.js
diff --git a/app/assets/javascripts/admin/models/email-log.js.es6 b/app/assets/javascripts/admin/models/email-log.js
similarity index 100%
rename from app/assets/javascripts/admin/models/email-log.js.es6
rename to app/assets/javascripts/admin/models/email-log.js
diff --git a/app/assets/javascripts/admin/models/email-preview.js.es6 b/app/assets/javascripts/admin/models/email-preview.js
similarity index 100%
rename from app/assets/javascripts/admin/models/email-preview.js.es6
rename to app/assets/javascripts/admin/models/email-preview.js
diff --git a/app/assets/javascripts/admin/models/email-settings.js.es6 b/app/assets/javascripts/admin/models/email-settings.js
similarity index 100%
rename from app/assets/javascripts/admin/models/email-settings.js.es6
rename to app/assets/javascripts/admin/models/email-settings.js
diff --git a/app/assets/javascripts/admin/models/email-style.js.es6 b/app/assets/javascripts/admin/models/email-style.js
similarity index 100%
rename from app/assets/javascripts/admin/models/email-style.js.es6
rename to app/assets/javascripts/admin/models/email-style.js
diff --git a/app/assets/javascripts/admin/models/email-template.js.es6 b/app/assets/javascripts/admin/models/email-template.js
similarity index 100%
rename from app/assets/javascripts/admin/models/email-template.js.es6
rename to app/assets/javascripts/admin/models/email-template.js
diff --git a/app/assets/javascripts/admin/models/flag-type.js.es6 b/app/assets/javascripts/admin/models/flag-type.js
similarity index 100%
rename from app/assets/javascripts/admin/models/flag-type.js.es6
rename to app/assets/javascripts/admin/models/flag-type.js
diff --git a/app/assets/javascripts/admin/models/incoming-email.js.es6 b/app/assets/javascripts/admin/models/incoming-email.js
similarity index 100%
rename from app/assets/javascripts/admin/models/incoming-email.js.es6
rename to app/assets/javascripts/admin/models/incoming-email.js
diff --git a/app/assets/javascripts/admin/models/permalink.js.es6 b/app/assets/javascripts/admin/models/permalink.js
similarity index 100%
rename from app/assets/javascripts/admin/models/permalink.js.es6
rename to app/assets/javascripts/admin/models/permalink.js
diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js
similarity index 100%
rename from app/assets/javascripts/admin/models/report.js.es6
rename to app/assets/javascripts/admin/models/report.js
diff --git a/app/assets/javascripts/admin/models/screened-email.js.es6 b/app/assets/javascripts/admin/models/screened-email.js
similarity index 100%
rename from app/assets/javascripts/admin/models/screened-email.js.es6
rename to app/assets/javascripts/admin/models/screened-email.js
diff --git a/app/assets/javascripts/admin/models/screened-ip-address.js.es6 b/app/assets/javascripts/admin/models/screened-ip-address.js
similarity index 100%
rename from app/assets/javascripts/admin/models/screened-ip-address.js.es6
rename to app/assets/javascripts/admin/models/screened-ip-address.js
diff --git a/app/assets/javascripts/admin/models/screened-url.js.es6 b/app/assets/javascripts/admin/models/screened-url.js
similarity index 100%
rename from app/assets/javascripts/admin/models/screened-url.js.es6
rename to app/assets/javascripts/admin/models/screened-url.js
diff --git a/app/assets/javascripts/admin/models/site-setting.js.es6 b/app/assets/javascripts/admin/models/site-setting.js
similarity index 100%
rename from app/assets/javascripts/admin/models/site-setting.js.es6
rename to app/assets/javascripts/admin/models/site-setting.js
diff --git a/app/assets/javascripts/admin/models/site-text.js.es6 b/app/assets/javascripts/admin/models/site-text.js
similarity index 100%
rename from app/assets/javascripts/admin/models/site-text.js.es6
rename to app/assets/javascripts/admin/models/site-text.js
diff --git a/app/assets/javascripts/admin/models/staff-action-log.js.es6 b/app/assets/javascripts/admin/models/staff-action-log.js
similarity index 100%
rename from app/assets/javascripts/admin/models/staff-action-log.js.es6
rename to app/assets/javascripts/admin/models/staff-action-log.js
diff --git a/app/assets/javascripts/admin/models/theme-settings.js.es6 b/app/assets/javascripts/admin/models/theme-settings.js
similarity index 100%
rename from app/assets/javascripts/admin/models/theme-settings.js.es6
rename to app/assets/javascripts/admin/models/theme-settings.js
diff --git a/app/assets/javascripts/admin/models/theme.js.es6 b/app/assets/javascripts/admin/models/theme.js
similarity index 100%
rename from app/assets/javascripts/admin/models/theme.js.es6
rename to app/assets/javascripts/admin/models/theme.js
diff --git a/app/assets/javascripts/admin/models/tl3-requirements.js.es6 b/app/assets/javascripts/admin/models/tl3-requirements.js
similarity index 100%
rename from app/assets/javascripts/admin/models/tl3-requirements.js.es6
rename to app/assets/javascripts/admin/models/tl3-requirements.js
diff --git a/app/assets/javascripts/admin/models/user-field.js.es6 b/app/assets/javascripts/admin/models/user-field.js
similarity index 100%
rename from app/assets/javascripts/admin/models/user-field.js.es6
rename to app/assets/javascripts/admin/models/user-field.js
diff --git a/app/assets/javascripts/admin/models/version-check.js.es6 b/app/assets/javascripts/admin/models/version-check.js
similarity index 100%
rename from app/assets/javascripts/admin/models/version-check.js.es6
rename to app/assets/javascripts/admin/models/version-check.js
diff --git a/app/assets/javascripts/admin/models/watched-word.js.es6 b/app/assets/javascripts/admin/models/watched-word.js
similarity index 100%
rename from app/assets/javascripts/admin/models/watched-word.js.es6
rename to app/assets/javascripts/admin/models/watched-word.js
diff --git a/app/assets/javascripts/admin/models/web-hook.js.es6 b/app/assets/javascripts/admin/models/web-hook.js
similarity index 100%
rename from app/assets/javascripts/admin/models/web-hook.js.es6
rename to app/assets/javascripts/admin/models/web-hook.js
diff --git a/app/assets/javascripts/admin/routes/admin-api-index.js.es6 b/app/assets/javascripts/admin/routes/admin-api-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-api-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-api-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-api-keys-index.js.es6 b/app/assets/javascripts/admin/routes/admin-api-keys-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-api-keys-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-api-keys-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-api-keys-show.js.es6 b/app/assets/javascripts/admin/routes/admin-api-keys-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-api-keys-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-api-keys-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-api-keys.js.es6 b/app/assets/javascripts/admin/routes/admin-api-keys.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-api-keys.js.es6
rename to app/assets/javascripts/admin/routes/admin-api-keys.js
diff --git a/app/assets/javascripts/admin/routes/admin-backups-index.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-backups-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-backups-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
rename to app/assets/javascripts/admin/routes/admin-backups-logs.js
diff --git a/app/assets/javascripts/admin/routes/admin-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-backups.js.es6
rename to app/assets/javascripts/admin/routes/admin-backups.js
diff --git a/app/assets/javascripts/admin/routes/admin-badges-award.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-award.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-badges-award.js.es6
rename to app/assets/javascripts/admin/routes/admin-badges-award.js
diff --git a/app/assets/javascripts/admin/routes/admin-badges-index.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-badges-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-badges-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-badges-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-badges-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-badges.js.es6 b/app/assets/javascripts/admin/routes/admin-badges.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-badges.js.es6
rename to app/assets/javascripts/admin/routes/admin-badges.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-colors-show.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-colors-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-colors-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-colors-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-colors.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-colors.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-colors.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-style-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-style-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-email-style-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-email-style-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-style.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-style.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-email-style.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-email-style.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-templates.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-templates.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-email-templates.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-email-templates.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-robots-txt.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-robots-txt.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-robots-txt.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-robots-txt.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-themes-edit.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-themes-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-show.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-themes-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-themes-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-themes.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-themes.js
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-general.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard-general.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-dashboard-general.js.es6
rename to app/assets/javascripts/admin/routes/admin-dashboard-general.js
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-reports.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard-reports.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-dashboard-reports.js.es6
rename to app/assets/javascripts/admin/routes/admin-dashboard-reports.js
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-dashboard.js.es6
rename to app/assets/javascripts/admin/routes/admin-dashboard.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-bounced.js.es6 b/app/assets/javascripts/admin/routes/admin-email-bounced.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-bounced.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-bounced.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-incomings.js.es6 b/app/assets/javascripts/admin/routes/admin-email-incomings.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-incomings.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-incomings.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-index.js.es6 b/app/assets/javascripts/admin/routes/admin-email-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-email-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-logs.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-logs.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6 b/app/assets/javascripts/admin/routes/admin-email-preview-digest.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-preview-digest.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-received.js.es6 b/app/assets/javascripts/admin/routes/admin-email-received.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-received.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-received.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-rejected.js.es6 b/app/assets/javascripts/admin/routes/admin-email-rejected.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-rejected.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-rejected.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-sent.js.es6 b/app/assets/javascripts/admin/routes/admin-email-sent.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-sent.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-sent.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-skipped.js.es6 b/app/assets/javascripts/admin/routes/admin-email-skipped.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-skipped.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-skipped.js
diff --git a/app/assets/javascripts/admin/routes/admin-embedding.js.es6 b/app/assets/javascripts/admin/routes/admin-embedding.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-embedding.js.es6
rename to app/assets/javascripts/admin/routes/admin-embedding.js
diff --git a/app/assets/javascripts/admin/routes/admin-emojis.js.es6 b/app/assets/javascripts/admin/routes/admin-emojis.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-emojis.js.es6
rename to app/assets/javascripts/admin/routes/admin-emojis.js
diff --git a/app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-posts-active.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6
rename to app/assets/javascripts/admin/routes/admin-flags-posts-active.js
diff --git a/app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-posts-old.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6
rename to app/assets/javascripts/admin/routes/admin-flags-posts-old.js
diff --git a/app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-topics-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-flags-topics-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-logs-index.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-logs-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-logs-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
rename to app/assets/javascripts/admin/routes/admin-logs-screened-emails.js
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6
rename to app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
rename to app/assets/javascripts/admin/routes/admin-logs-screened-urls.js
diff --git a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6
rename to app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js
diff --git a/app/assets/javascripts/admin/routes/admin-permalinks.js.es6 b/app/assets/javascripts/admin/routes/admin-permalinks.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-permalinks.js.es6
rename to app/assets/javascripts/admin/routes/admin-permalinks.js
diff --git a/app/assets/javascripts/admin/routes/admin-plugins.js.es6 b/app/assets/javascripts/admin/routes/admin-plugins.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-plugins.js.es6
rename to app/assets/javascripts/admin/routes/admin-plugins.js
diff --git a/app/assets/javascripts/admin/routes/admin-reports-index.js.es6 b/app/assets/javascripts/admin/routes/admin-reports-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-reports-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-reports-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-reports-show.js.es6 b/app/assets/javascripts/admin/routes/admin-reports-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-reports-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-reports-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-route-map.js.es6 b/app/assets/javascripts/admin/routes/admin-route-map.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-route-map.js.es6
rename to app/assets/javascripts/admin/routes/admin-route-map.js
diff --git a/app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6 b/app/assets/javascripts/admin/routes/admin-search-logs-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-search-logs-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6 b/app/assets/javascripts/admin/routes/admin-search-logs-term.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
rename to app/assets/javascripts/admin/routes/admin-search-logs-term.js
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings-category.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6
rename to app/assets/javascripts/admin/routes/admin-site-settings-category.js
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-site-settings-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-site-settings.js.es6
rename to app/assets/javascripts/admin/routes/admin-site-settings.js
diff --git a/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-site-text-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6
rename to app/assets/javascripts/admin/routes/admin-site-text-edit.js
diff --git a/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6 b/app/assets/javascripts/admin/routes/admin-site-text-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-site-text-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-user-badges.js.es6 b/app/assets/javascripts/admin/routes/admin-user-badges.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-user-badges.js.es6
rename to app/assets/javascripts/admin/routes/admin-user-badges.js
diff --git a/app/assets/javascripts/admin/routes/admin-user-fields.js.es6 b/app/assets/javascripts/admin/routes/admin-user-fields.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-user-fields.js.es6
rename to app/assets/javascripts/admin/routes/admin-user-fields.js
diff --git a/app/assets/javascripts/admin/routes/admin-user-index.js.es6 b/app/assets/javascripts/admin/routes/admin-user-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-user-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-user-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6 b/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6
rename to app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js
diff --git a/app/assets/javascripts/admin/routes/admin-user.js.es6 b/app/assets/javascripts/admin/routes/admin-user.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-user.js.es6
rename to app/assets/javascripts/admin/routes/admin-user.js
diff --git a/app/assets/javascripts/admin/routes/admin-users-index.js.es6 b/app/assets/javascripts/admin/routes/admin-users-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-users-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-users-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-users-list-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-users-list-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-users-list-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-users-list.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-users-list.js.es6
rename to app/assets/javascripts/admin/routes/admin-users-list.js
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words-action.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
rename to app/assets/javascripts/admin/routes/admin-watched-words-action.js
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-watched-words-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-watched-words.js.es6
rename to app/assets/javascripts/admin/routes/admin-watched-words.js
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6
rename to app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-web-hooks-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-web-hooks.js.es6
rename to app/assets/javascripts/admin/routes/admin-web-hooks.js
diff --git a/app/assets/javascripts/admin/routes/admin.js.es6 b/app/assets/javascripts/admin/routes/admin.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin.js.es6
rename to app/assets/javascripts/admin/routes/admin.js
diff --git a/app/assets/javascripts/admin/services/admin-tools.js.es6 b/app/assets/javascripts/admin/services/admin-tools.js
similarity index 100%
rename from app/assets/javascripts/admin/services/admin-tools.js.es6
rename to app/assets/javascripts/admin/services/admin-tools.js
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index db276e2586..4056dffc46 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -36,7 +36,8 @@ class DiscourseJsProcessor
     return false unless filename.end_with?(".js") || filename.end_with?(".js.erb")
 
     relative_path = filename.sub(Rails.root.to_s, '').sub(/^\/*/, '')
-    relative_path.start_with?("app/assets/javascripts/discourse/")
+    relative_path.start_with?("app/assets/javascripts/discourse/") ||
+      relative_path.start_with?("app/assets/javascripts/admin/")
   end
 
   def self.skip_module?(data)

From 3e34964c73506159ceea8ac9515f4fd0a1f4a099 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 13 Mar 2020 17:00:55 -0400
Subject: [PATCH 0218/1830] Ignore filename change

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 68f769b233..bf208be1ca 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -10,3 +10,6 @@ dafd3c3b47f116c6c1dc56cb18df614c11747733
 
 # Rename many `.js.es6` files to `.js`
 032205e2029cbf82dc8f05b459fb93adf2503c60
+
+# Rename admin app es6 -> js
+181758e3248b14ad8b53abe063da8dc6a82d3089

From 8022e5117941d1b5e19a15a488ac57dda4111dae Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 12 Mar 2020 18:43:27 +0100
Subject: [PATCH 0219/1830] FIX: Failed to restore backups from versions
 without translation overrides

Rails calls I18n.translate during initialization and by default translation overrides are used. Database migrations would fail if the system tried to migrate from an old version that didn't have the `translation_overrides` table with all its columns yet.

This makes restoring really old backups work again. Running `DISABLE_TRANSLATION_OVERRIDES=1 rake db:migrate` will allow you to upgrade such an old database as well.
---
 config/initializers/100-i18n.rb                   | 2 +-
 lib/backup_restore/database_restorer.rb           | 6 +++++-
 lib/freedom_patches/translate_accelerator.rb      | 4 ++--
 spec/lib/backup_restore/database_restorer_spec.rb | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/config/initializers/100-i18n.rb b/config/initializers/100-i18n.rb
index 10749264a4..739fca222d 100644
--- a/config/initializers/100-i18n.rb
+++ b/config/initializers/100-i18n.rb
@@ -9,7 +9,7 @@ I18n.backend = I18n::Backend::DiscourseI18n.new
 I18n.fallbacks = I18n::Backend::FallbackLocaleList.new
 I18n.config.missing_interpolation_argument_handler = proc { throw(:exception) }
 I18n.reload!
-I18n.init_accelerator!
+I18n.init_accelerator!(overrides_enabled: ENV['DISABLE_TRANSLATION_OVERRIDES'] != '1')
 
 unless Rails.env.test?
   MessageBus.subscribe("/i18n-flush") do
diff --git a/lib/backup_restore/database_restorer.rb b/lib/backup_restore/database_restorer.rb
index d0880c97ed..929e318a9f 100644
--- a/lib/backup_restore/database_restorer.rb
+++ b/lib/backup_restore/database_restorer.rb
@@ -134,7 +134,11 @@ module BackupRestore
       log "Migrating the database..."
 
       log Discourse::Utils.execute_command(
-        { "SKIP_POST_DEPLOYMENT_MIGRATIONS" => "0", "SKIP_OPTIMIZE_ICONS" => "1" },
+        {
+          "SKIP_POST_DEPLOYMENT_MIGRATIONS" => "0",
+          "SKIP_OPTIMIZE_ICONS" => "1",
+          "DISABLE_TRANSLATION_OVERRIDES" => "1"
+        },
         "rake db:migrate",
         failure_message: "Failed to migrate database.",
         chdir: Rails.root
diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index 704da6ec4b..ee724d56d1 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -21,8 +21,8 @@ module I18n
 
     LRU_CACHE_SIZE = 400
 
-    def init_accelerator!
-      @overrides_enabled = true
+    def init_accelerator!(overrides_enabled: true)
+      @overrides_enabled = overrides_enabled
       execute_reload
     end
 
diff --git a/spec/lib/backup_restore/database_restorer_spec.rb b/spec/lib/backup_restore/database_restorer_spec.rb
index 02666093b0..9f1cc0c935 100644
--- a/spec/lib/backup_restore/database_restorer_spec.rb
+++ b/spec/lib/backup_restore/database_restorer_spec.rb
@@ -38,6 +38,7 @@ describe BackupRestore::DatabaseRestorer do
     Discourse::Utils.expects(:execute_command).with do |env, command, options|
       env["SKIP_POST_DEPLOYMENT_MIGRATIONS"] == "0" &&
         env["SKIP_OPTIMIZE_ICONS"] == "1" &&
+        env["DISABLE_TRANSLATION_OVERRIDES"] == "1" &&
         command == "rake db:migrate" &&
         options[:chdir] == Rails.root
     end.once

From ba1b840816e1c6ee831d58bd3f17e548e957bfd2 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Wed, 11 Mar 2020 18:27:37 +0100
Subject: [PATCH 0220/1830] DEV: Don't deactivate suspended users during import

Otherwise a cleanup job might delete those deactivated users.
---
 script/import_scripts/base.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index c827bc5e7e..2d52759822 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -367,8 +367,6 @@ class ImportScripts::Base
     if u.custom_fields['import_email']
       u.suspended_at = Time.zone.at(Time.now)
       u.suspended_till = 200.years.from_now
-      ban_reason = 'Invalid email address on import'
-      u.active = false
       u.save!
 
       user_option = u.user_option
@@ -377,7 +375,7 @@ class ImportScripts::Base
       user_option.email_messages_level = UserOption.email_level_types[:never]
       user_option.save!
       if u.save
-        StaffActionLogger.new(Discourse.system_user).log_user_suspend(u, ban_reason)
+        StaffActionLogger.new(Discourse.system_user).log_user_suspend(u, 'Invalid email address on import')
       else
         Rails.logger.error("Failed to suspend user #{u.username}. #{u.errors.try(:full_messages).try(:inspect)}")
       end

From 36062f43c87aeea62797335b2c4950965a76a67d Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 12 Mar 2020 01:39:16 +0100
Subject: [PATCH 0221/1830] DEV: Improve Telligent import script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Adds ability to map forums to categories and tags as well as ignore forums.
* Fixes regular expression for detecting attachments in posts.
* Handles "remote attachments" 😮 by inserting a link.
* Imports view counts for topics.
* Handles incorrect references of parent posts.
* Better handling of quotes.
* Finds a lot more attachments by trying to replace various Unicode characters in filenames.
---
 script/import_scripts/telligent.rb | 286 +++++++++++++++++++++--------
 1 file changed, 210 insertions(+), 76 deletions(-)

diff --git a/script/import_scripts/telligent.rb b/script/import_scripts/telligent.rb
index db8d6d696d..177ccb8fba 100644
--- a/script/import_scripts/telligent.rb
+++ b/script/import_scripts/telligent.rb
@@ -6,12 +6,43 @@ require 'tiny_tds'
 # Import script for Telligent communities
 #
 # It's really hard to find all attachments, but the script tries to do it anyway.
+#
+# You can supply a JSON file if you need to map and ignore categories during the import
+# by providing the path to the file in the `CATEGORY_MAPPING` environment variable.
+# You can also add tags to remapped categories and remap multiple old forums into one
+# category. Here's an example of such a `mapping.json` file:
+#
+# {
+#   "ignored_forum_ids": [41, 360, 378],
+#
+#   "mapping": [
+#     {
+#       "category": ["New Category 1"],
+#       "forums": [
+#         { "id": 348, "tag": "some_tag" },
+#         { "id": 347, "tag": "another_tag" }
+#       ]
+#     },
+#     {
+#       "category": ["New Category 2"],
+#       "forums": [
+#         { "id": 9 }
+#       ]
+#     },
+#     {
+#       "category": ["Nested", "Category"],
+#       "forums": [
+#         { "id": 322 }
+#       ]
+#     }
+#   ]
+# }
 
 class ImportScripts::Telligent < ImportScripts::Base
   BATCH_SIZE ||= 1000
   LOCAL_AVATAR_REGEX ||= /\A~\/.*(?<directory>communityserver-components-(?:selectable)?avatars)\/(?<path>[^\/]+)\/(?<filename>.+)/i
   REMOTE_AVATAR_REGEX ||= /\Ahttps?:\/\//i
-  EMBEDDED_ATTACHMENT_REGEX ||= /<a href="\/cfs-file(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename1>.+)">(?<filename2>.*?)<\/a>/i
+  EMBEDDED_ATTACHMENT_REGEX ||= /<a href="\/cfs-file(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename1>.+?)".*?>(?<filename2>.*?)<\/a>/i
 
   CATEGORY_LINK_NORMALIZATION = '/.*?(f\/\d+)$/\1'
   TOPIC_LINK_NORMALIZATION = '/.*?(f\/\d+\/t\/\d+)$/\1'
@@ -26,12 +57,14 @@ class ImportScripts::Telligent < ImportScripts::Base
       database: ENV["DB_NAME"],
       timeout: 60 # the user query is very slow
     )
+
+    SiteSetting.tagging_enabled = true
   end
 
   def execute
     add_permalink_normalizations
-    import_users
     import_categories
+    import_users
     import_topics
     import_posts
     mark_topics_as_solved
@@ -64,34 +97,29 @@ class ImportScripts::Telligent < ImportScripts::Base
         SELECT *
         FROM (
             SELECT TOP #{BATCH_SIZE}
-                u.UserID,
-                u.Email,
-                u.UserName,
-                u.CreateDate,
-                p.PropertyName,
-                p.PropertyValue
+              u.UserID, u.Email, u.UserName,u.CreateDate, p.PropertyName, p.PropertyValue
             FROM cs_Users u
-                LEFT OUTER JOIN (
-                    SELECT NULL AS UserID, ap.UserId AS MembershipID, x.PropertyName, x.PropertyValue
-                    FROM aspnet_Profile ap
-                             CROSS APPLY dbo.GetProperties(ap.PropertyNames, ap.PropertyValuesString) x
-                    WHERE ap.PropertyNames NOT LIKE '%:-1%' AND
-                        x.PropertyName IN ('bio', 'commonName', 'location', 'webAddress')
-                    UNION
-                    SELECT up.UserID, NULL AS MembershipID, x.PropertyName, CAST(x.PropertyValue AS NVARCHAR) AS PropertyValue
-                    FROM cs_UserProfile up
-                             CROSS APPLY dbo.GetProperties(up.PropertyNames, up.PropertyValues) x
-                    WHERE up.PropertyNames NOT LIKE '%:-1%' AND
+              LEFT OUTER JOIN (
+                SELECT NULL AS UserID, ap.UserId AS MembershipID, x.PropertyName, x.PropertyValue
+                FROM aspnet_Profile ap
+                  CROSS APPLY dbo.GetProperties(ap.PropertyNames, ap.PropertyValuesString) x
+                WHERE ap.PropertyNames NOT LIKE '%:-1%' AND
+                      x.PropertyName IN ('bio', 'commonName', 'location', 'webAddress')
+                UNION
+                SELECT up.UserID, NULL AS MembershipID, x.PropertyName, CAST(x.PropertyValue AS NVARCHAR) AS PropertyValue
+                  FROM cs_UserProfile up
+                    CROSS APPLY dbo.GetProperties(up.PropertyNames, up.PropertyValues) x
+                  WHERE up.PropertyNames NOT LIKE '%:-1%' AND
                         x.PropertyName IN ('avatarUrl', 'BannedUntil', 'UserBanReason')
-                ) p ON p.UserID = u.UserID OR p.MembershipID = u.MembershipID
+              ) p ON p.UserID = u.UserID OR p.MembershipID = u.MembershipID
             WHERE u.UserID > #{last_user_id} AND #{user_conditions}
             ORDER BY u.UserID
         ) x
-            PIVOT (
-              MAX(PropertyValue)
-              FOR PropertyName
-              IN (bio, commonName, location, webAddress, avatarUrl, BannedUntil, UserBanReason)
-            ) Y
+          PIVOT (
+            MAX(PropertyValue)
+            FOR PropertyName
+            IN (bio, commonName, location, webAddress, avatarUrl, BannedUntil, UserBanReason)
+          ) Y
         ORDER BY UserID
       SQL
 
@@ -134,7 +162,7 @@ class ImportScripts::Telligent < ImportScripts::Base
                               match_data[:path].split("-"),
                               match_data[:filename])
 
-      if File.exists?(avatar_path)
+      if File.file?(avatar_path)
         @uploader.create_avatar(user, avatar_path)
       else
         STDERR.puts "Could not find avatar: #{avatar_path}"
@@ -157,12 +185,75 @@ class ImportScripts::Telligent < ImportScripts::Base
   end
 
   def import_categories
+    if ENV['CATEGORY_MAPPING']
+      import_mapped_forums_as_categories
+    else
+      import_groups_and_forums_as_categories
+    end
+  end
+
+  def import_mapped_forums_as_categories
+    puts "", "Importing categories..."
+
+    json = JSON.parse(File.read(ENV['CATEGORY_MAPPING']))
+
+    categories = []
+    @forum_ids_to_tags = {}
+    @ignored_forum_ids = json["ignored_forum_ids"]
+
+    json["mapping"].each do |m|
+      parent_id = nil
+      last_index = m["category"].size - 1
+      forum_ids = []
+
+      m["forums"].each do |f|
+        forum_ids << f["id"]
+        @forum_ids_to_tags[f["id"]] = f["tag"] if f["tag"].present?
+      end
+
+      m["category"].each_with_index do |name, index|
+        id = Digest::MD5.hexdigest(name)
+        categories << {
+          id: id,
+          name: name,
+          parent_id: parent_id,
+          forum_ids: index == last_index ? forum_ids : nil
+        }
+        parent_id = id
+      end
+    end
+
+    create_categories(categories) do |c|
+      if category_id = category_id_from_imported_category_id(c[:id])
+        map_forum_ids(category_id, c[:forum_ids])
+        nil
+      else
+        {
+          id: c[:id],
+          name: c[:name],
+          parent_category_id: category_id_from_imported_category_id(c[:parent_id]),
+          post_create_action: proc do |category|
+            map_forum_ids(category.id, c[:forum_ids])
+          end
+        }
+      end
+    end
+  end
+
+  def map_forum_ids(category_id, forum_ids)
+    return if forum_ids.blank?
+
+    forum_ids.each do |id|
+      url = "f/#{id}"
+      Permalink.create(url: url, category_id: category_id) unless Permalink.exists?(url: url)
+      add_category(id, Category.find_by_id(category_id))
+    end
+  end
+
+  def import_groups_and_forums_as_categories
     puts "", "Importing parent categories..."
     parent_categories = query(<<~SQL)
-      SELECT
-        GroupID,
-        Name, HtmlDescription,
-        DateCreated, SortOrder
+      SELECT GroupID, Name, HtmlDescription, DateCreated, SortOrder
       FROM cs_Groups g
       WHERE (SELECT COUNT(1)
              FROM te_Forum_Forums f
@@ -181,10 +272,7 @@ class ImportScripts::Telligent < ImportScripts::Base
 
     puts "", "Importing child categories..."
     child_categories = query(<<~SQL)
-      SELECT
-        ForumId, GroupId,
-        Name, Description,
-        DateCreated, SortOrder
+      SELECT ForumId, GroupId, Name, Description, DateCreated, SortOrder
       FROM te_Forum_Forums
       ORDER BY GroupId, SortOrder, Name
     SQL
@@ -203,7 +291,11 @@ class ImportScripts::Telligent < ImportScripts::Base
           parent_category_id: parent_category_id,
           name: clean_category_name(row["Name"]),
           description: html_to_markdown(row["Description"]),
-          position: row["SortOrder"]
+          position: row["SortOrder"],
+          post_create_action: proc do |category|
+            url = "f/#{row['ForumId']}"
+            Permalink.create(url: url, category_id: category.id) unless Permalink.exists?(url: url)
+          end
         }
       end
     end
@@ -236,19 +328,19 @@ class ImportScripts::Telligent < ImportScripts::Base
     puts "", "Importing topics..."
 
     last_topic_id = -1
-    total_count = count("SELECT COUNT(1) AS count FROM te_Forum_Threads")
+    total_count = count("SELECT COUNT(1) AS count FROM te_Forum_Threads t WHERE #{ignored_forum_sql_condition}")
 
     batches do |offset|
       rows = query(<<~SQL)
         SELECT TOP #{BATCH_SIZE}
-          t.ThreadId, t.ForumId, t.UserId,
+          t.ThreadId, t.ForumId, t.UserId, t.TotalViews,
           t.Subject, t.Body, t.DateCreated, t.IsLocked, t.StickyDate,
-          a.ApplicationTypeId, a.ApplicationId, a.ApplicationContentTypeId, a.ContentId, a.FileName
+          a.ApplicationTypeId, a.ApplicationId, a.ApplicationContentTypeId, a.ContentId, a.FileName, a.IsRemote
         FROM te_Forum_Threads t
           LEFT JOIN te_Attachments a
             ON (a.ApplicationId = t.ForumId AND a.ApplicationTypeId = 0 AND a.ContentId = t.ThreadId AND
                 a.ApplicationContentTypeId = 0)
-        WHERE t.ThreadId > #{last_topic_id}
+        WHERE t.ThreadId > #{last_topic_id} AND #{ignored_forum_sql_condition}
         ORDER BY t.ThreadId
       SQL
 
@@ -262,11 +354,12 @@ class ImportScripts::Telligent < ImportScripts::Base
         post = {
           id: import_topic_id(row["ThreadId"]),
           title: CGI.unescapeHTML(row["Subject"]),
-          raw: raw_with_attachment(row, user_id),
+          raw: raw_with_attachment(row, user_id, :topic),
           category: category_id_from_imported_category_id(row["ForumId"]),
           user_id: user_id,
           created_at: row["DateCreated"],
           closed: row["IsLocked"],
+          views: row["TotalViews"],
           post_create_action: proc do |action_post|
             topic = action_post.topic
             Jobs.enqueue_at(topic.pinned_until, :unpin_topic, topic_id: topic.id) if topic.pinned_until
@@ -289,16 +382,27 @@ class ImportScripts::Telligent < ImportScripts::Base
     "T#{topic_id}"
   end
 
+  def ignored_forum_sql_condition
+    @ignored_forum_sql_condition ||= @ignored_forum_ids.present? \
+      ? "t.ForumId NOT IN (#{@ignored_forum_ids.join(',')})" \
+      : "1 = 1"
+  end
+
   def import_posts
     puts "", "Importing posts..."
 
     last_post_id = -1
-    total_count = count("SELECT COUNT(1) AS count FROM te_Forum_ThreadReplies")
+    total_count = count(<<~SQL)
+      SELECT COUNT(1) AS count
+      FROM te_Forum_ThreadReplies tr
+        JOIN te_Forum_Threads t ON (tr.ThreadId = t.ThreadId)
+      WHERE #{ignored_forum_sql_condition}
+    SQL
 
     batches do |offset|
       rows = query(<<~SQL)
         SELECT TOP #{BATCH_SIZE}
-          tr.ThreadReplyId, tr.ThreadId, tr.UserId, tr.ParentReplyId,
+          tr.ThreadReplyId, tr.ThreadId, tr.UserId, pr.ThreadReplyId AS ParentReplyId,
           tr.Body, tr.ThreadReplyDate,
           CONVERT(BIT,
                   CASE WHEN tr.AnswerVerifiedUtcDate IS NOT NULL AND NOT EXISTS(
@@ -309,13 +413,14 @@ class ImportScripts::Telligent < ImportScripts::Base
                   )
                     THEN 1
                   ELSE 0 END) AS IsFirstVerifiedAnswer,
-          a.ApplicationTypeId, a.ApplicationId, a.ApplicationContentTypeId, a.ContentId, a.FileName
+          a.ApplicationTypeId, a.ApplicationId, a.ApplicationContentTypeId, a.ContentId, a.FileName, a.IsRemote
         FROM te_Forum_ThreadReplies tr
           JOIN te_Forum_Threads t ON (tr.ThreadId = t.ThreadId)
+          LEFT JOIN te_Forum_ThreadReplies pr ON (tr.ParentReplyId = pr.ThreadReplyId AND tr.ParentReplyId < tr.ThreadReplyId AND tr.ThreadId = pr.ThreadId)
           LEFT JOIN te_Attachments a
             ON (a.ApplicationId = t.ForumId AND a.ApplicationTypeId = 0 AND a.ContentId = tr.ThreadReplyId AND
                 a.ApplicationContentTypeId = 1)
-        WHERE tr.ThreadReplyId > #{last_post_id}
+        WHERE tr.ThreadReplyId > #{last_post_id} AND #{ignored_forum_sql_condition}
         ORDER BY tr.ThreadReplyId
       SQL
 
@@ -324,14 +429,14 @@ class ImportScripts::Telligent < ImportScripts::Base
       next if all_records_exist?(:post, rows.map { |row| row["ThreadReplyId"] })
 
       create_posts(rows, total: total_count, offset: offset) do |row|
-        imported_parent_id = row["ParentReplyId"] > 0 ? row["ParentReplyId"] : import_topic_id(row["ThreadId"])
+        imported_parent_id = row["ParentReplyId"]&.nonzero? ? row["ParentReplyId"] : import_topic_id(row["ThreadId"])
         parent_post = topic_lookup_from_imported_post_id(imported_parent_id)
         user_id = user_id_from_imported_user_id(row["UserId"]) || Discourse::SYSTEM_USER_ID
 
         if parent_post
           post = {
             id: row["ThreadReplyId"],
-            raw: raw_with_attachment(row, user_id),
+            raw: raw_with_attachment(row, user_id, :post),
             user_id: user_id,
             topic_id: parent_post[:topic_id],
             created_at: row["ThreadReplyDate"],
@@ -347,13 +452,17 @@ class ImportScripts::Telligent < ImportScripts::Base
     end
   end
 
-  def raw_with_attachment(row, user_id)
+  def raw_with_attachment(row, user_id, type)
     raw, embedded_paths, upload_ids = replace_embedded_attachments(row["Body"], user_id)
     raw = html_to_markdown(raw) || ""
 
     filename = row["FileName"]
     return raw if ENV["FILE_BASE_DIR"].blank? || filename.blank?
 
+    if row["IsRemote"]
+      return "#{raw}\n#{filename}"
+    end
+
     path = File.join(
       ENV["FILE_BASE_DIR"],
       "telligent.evolution.components.attachments",
@@ -365,14 +474,15 @@ class ImportScripts::Telligent < ImportScripts::Base
     )
 
     unless embedded_paths.include?(path)
-      if File.exists?(path)
+      if File.file?(path)
         upload = @uploader.create_upload(user_id, path, filename)
 
         if upload.present? && upload.persisted? && !upload_ids.include?(upload.id)
           raw = "#{raw}\n#{@uploader.html_for_upload(upload, filename)}"
         end
       else
-        STDERR.puts "Could not find file: #{path}"
+        id = type == :topic ? row['ThreadId'] : row['ThreadReplyId']
+        STDERR.puts "Could not find file for #{type} #{id}: #{path}"
       end
     end
 
@@ -383,10 +493,12 @@ class ImportScripts::Telligent < ImportScripts::Base
     paths = []
     upload_ids = []
 
+    return [raw, paths, upload_ids] if ENV["FILE_BASE_DIR"].blank?
+
     raw = raw.gsub(EMBEDDED_ATTACHMENT_REGEX) do
       filename, path = attachment_path(Regexp.last_match)
 
-      if File.exists?(path)
+      if File.file?(path)
         upload = @uploader.create_upload(user_id, path, filename)
 
         if upload.present? && upload.persisted?
@@ -403,14 +515,21 @@ class ImportScripts::Telligent < ImportScripts::Base
   end
 
   def clean_filename(filename)
-    CGI.unescapeHTML(filename)
-      .gsub(/[\x00\/\\:\*\?\"<>\|]/, '_')
-      .gsub(/_(?:2B00|2E00|2D00|5B00|5D00|5F00)/, '')
+    filename = CGI.unescapeHTML(filename)
+    filename.gsub!(/[\x00\/\\:\*\?\"<>\|]/, '_')
+
+    %w|( ) # % - _ [ ] = , ' ~ ! + { } & @ #|.each do |c|
+      number = "#{c.ord.to_s(16).upcase}00"
+      filename.gsub!("_#{number}_", c)
+      filename.gsub!("_#{number}#{number}_", c * 2)
+    end
+
+    filename
   end
 
   def attachment_path(match_data)
     filename, path = join_attachment_path(match_data, filename_index: 2)
-    filename, path = join_attachment_path(match_data, filename_index: 1) unless File.exists?(path)
+    filename, path = join_attachment_path(match_data, filename_index: 1) unless File.file?(path)
     [filename, path]
   end
 
@@ -420,40 +539,55 @@ class ImportScripts::Telligent < ImportScripts::Base
     filename = clean_filename(match_data[:"filename#{filename_index}"])
     base_path = File.join(
       ENV["FILE_BASE_DIR"],
-      match_data[:directory].gsub("-", "."),
-      match_data[:path].split("-")
+      match_data[:directory].gsub("-", ".").downcase,
+      match_data[:path].gsub("+", " ").gsub(/_\h{4}_/, "?").split(/[\.\-]/).map(&:strip)
     )
 
-    path = File.join(base_path, filename)
-    return [filename, path] if File.exists?(path)
-
     original_filename = filename.dup
 
-    filename = filename.gsub("-", " ")
+    filename.gsub!(/[_\- ]/, "?")
     path = File.join(base_path, filename)
-    return [filename, path] if File.exists?(path)
+    paths = Dir.glob(path, File::FNM_CASEFOLD)
+    if (path = paths.first) && paths.size == 1
+      filename = File.basename(path)
+      return [filename, path]
+    end
 
-    filename = filename.gsub("_", "-")
+    filename = original_filename.dup
+    filename.gsub!(/_\h{2}00_/, "?")
+    filename.gsub!(/_\h{2}00\h{2}00_/, "??")
+    filename.gsub!(/_\h{2}00\h{2}00\h{2}00_/, "???")
+    filename.gsub!(/[_\- ]/, "?")
     path = File.join(base_path, filename)
-    return [filename, path] if File.exists?(path)
+    paths = Dir.glob(path, File::FNM_CASEFOLD)
+    if (path = paths.first) && paths.size == 1
+      filename = File.basename(path)
+      return [filename, path]
+    end
+
+    filename = original_filename.dup
+    filename.gsub!(/_\h{4}_/, "?")
+    filename.gsub!(/_\h{4}\h{4}_/, "??")
+    filename.gsub!(/_\h{4}\h{4}\h{4}_/, "???")
+    filename.gsub!(/[_\- ]/, "?")
+    path = File.join(base_path, filename)
+    paths = Dir.glob(path, File::FNM_CASEFOLD)
+    if (path = paths.first) && paths.size == 1
+      filename = File.basename(path)
+      return [filename, path]
+    end
 
     [original_filename, File.join(base_path, original_filename)]
   end
 
-  def mark_topics_as_solved
-    puts "", "Marking topics as solved..."
-
-    DB.exec <<~SQL
-      INSERT INTO topic_custom_fields (name, value, topic_id, created_at, updated_at)
-      SELECT 'accepted_answer_post_id', pcf.post_id, p.topic_id, p.created_at, p.created_at
-        FROM post_custom_fields pcf
-        JOIN posts p ON p.id = pcf.post_id
-       WHERE pcf.name = 'is_accepted_answer' AND pcf.value = 'true'
-    SQL
-  end
-
   def html_to_markdown(html)
-    HtmlToMarkdown.new(html).to_markdown if html.present?
+    return html if html.blank?
+
+    md = HtmlToMarkdown.new(html).to_markdown
+    md.gsub!(/\[quote.*?\]/, "\n" + '\0' + "\n")
+    md.gsub!(/(?<!^)\[\/quote\]/, "\n[/quote]\n")
+    md.strip!
+    md
   end
 
   def add_permalink_normalizations

From 0a88232e872cb7ab3d1540a87589aa9ddbfe40bd Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Fri, 13 Mar 2020 23:59:14 +0100
Subject: [PATCH 0222/1830] DEV: Improve mbox import script

* Better documentation of settings
* Add option to exclude trimmed parts of emails (enabled by default) to not revail email addresses
---
 script/import_scripts/mbox.rb                 |  6 +----
 script/import_scripts/mbox/importer.rb        | 10 ++++---
 script/import_scripts/mbox/settings.yml       | 26 +++++++++++++++----
 .../import_scripts/mbox/support/settings.rb   | 20 ++++++++------
 4 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/script/import_scripts/mbox.rb b/script/import_scripts/mbox.rb
index 59d3a3780f..cee093033f 100644
--- a/script/import_scripts/mbox.rb
+++ b/script/import_scripts/mbox.rb
@@ -8,11 +8,7 @@ end
 
 module ImportScripts
   module Mbox
-    require_relative 'mbox/support/settings'
-
-    @settings = Settings.load(ARGV[0])
-
     require_relative 'mbox/importer'
-    Importer.new(@settings).perform
+    Importer.new(ARGV[0]).perform
   end
 end
diff --git a/script/import_scripts/mbox/importer.rb b/script/import_scripts/mbox/importer.rb
index d4f8ec4794..71b405e701 100644
--- a/script/import_scripts/mbox/importer.rb
+++ b/script/import_scripts/mbox/importer.rb
@@ -7,9 +7,8 @@ require_relative 'support/settings'
 
 module ImportScripts::Mbox
   class Importer < ImportScripts::Base
-    # @param settings [ImportScripts::Mbox::Settings]
-    def initialize(settings)
-      @settings = settings
+    def initialize(settings_filename)
+      @settings = Settings.load(settings_filename)
       super()
 
       @database = Database.new(@settings.data_dir, @settings.batch_size)
@@ -139,7 +138,10 @@ module ImportScripts::Mbox
         body = receiver.add_attachments(body, user)
       end
 
-      body = "#{body}#{Email::Receiver.elided_html(elided)}" if elided.present?
+      if elided.present? && @settings.show_trimmed_content
+        body = "#{body}#{Email::Receiver.elided_html(elided)}"
+      end
+
       body
     end
 
diff --git a/script/import_scripts/mbox/settings.yml b/script/import_scripts/mbox/settings.yml
index f118800100..60322ec305 100644
--- a/script/import_scripts/mbox/settings.yml
+++ b/script/import_scripts/mbox/settings.yml
@@ -1,22 +1,38 @@
+# Directory where all emails and mbox files are stored.
 data_dir: /shared/import/data
 
-# mbox files
+# Regular expression for splitting emails in mbox files.
+# Choose one of the following examples that works for you or add your own regular expression.
 split_regex: "^From .+@.+"
 #split_regex: "^From .+@example.com.+"
 
-# individual emails
-#split_regex: ""
-
 # Listserv files
 #split_regex: "^========================================================================="
 
-default_trust_level: 1
+# When each file contains only one email
+#split_regex: ""
+
+# Prefer the HTML part of emails instead of the plain text part.
 prefer_html: true
+
+# The trust level of users created by the import script.
+default_trust_level: 1
+
+# Create staged users instead of regular users.
 staged: true
+
+# You can enable this option if the script should stop after indexing all emails
+# instead of executing the import right away. That's useful if you need to make some changes
+# to the indexed data in the `index.db` created during the indexing step.
 index_only: false
 
+# Only enable this option when the import script fails to group messages with
+# with the `In-Reply-To` and `References` headers.
 group_messages_by_subject: false
 
+# Always show trimmed part of emails. WARNING: This might reveal email addresses.
+show_trimmed_content: false
+
 # Remove prefixes like [FOO] or (BAR) from topic titles and replace them with tags.
 # You can map one or more case-insensitive prefixes to the same tag in Discourse.
 # "Tag name in Discourse": "foo"
diff --git a/script/import_scripts/mbox/support/settings.rb b/script/import_scripts/mbox/support/settings.rb
index f30c5d56d1..9311dff5e7 100644
--- a/script/import_scripts/mbox/support/settings.rb
+++ b/script/import_scripts/mbox/support/settings.rb
@@ -19,6 +19,7 @@ module ImportScripts::Mbox
     attr_reader :group_messages_by_subject
     attr_reader :subject_prefix_regex
     attr_reader :automatically_remove_list_name_prefix
+    attr_reader :show_trimmed_content
     attr_reader :tags
 
     def initialize(yaml)
@@ -31,20 +32,23 @@ module ImportScripts::Mbox
       @index_only = yaml['index_only']
       @group_messages_by_subject = yaml['group_messages_by_subject']
 
-      unless yaml['remove_subject_prefixes'].empty?
+      if yaml['remove_subject_prefixes'].present?
         prefix_regexes = yaml['remove_subject_prefixes'].map { |p| Regexp.new(p) }
         @subject_prefix_regex = /^#{Regexp.union(prefix_regexes).source}/i
       end
 
       @automatically_remove_list_name_prefix = yaml['automatically_remove_list_name_prefix']
+      @show_trimmed_content = yaml['show_trimmed_content']
 
-      @tags = []
-      yaml['tags'].each do |tag_name, value|
-        prefixes = Regexp.union(value).source
-        @tags << {
-          regex: /^(?:(?:\[(?:#{prefixes})\])|(?:\((?:#{prefixes})\)))\s*/i,
-          name: tag_name
-        }
+      if yaml['tags'].present?
+        @tags = []
+        yaml['tags'].each do |tag_name, value|
+          prefixes = Regexp.union(value).source
+          @tags << {
+            regex: /^(?:(?:\[(?:#{prefixes})\])|(?:\((?:#{prefixes})\)))\s*/i,
+            name: tag_name
+          }
+        end
       end
     end
   end

From e825f47daadc551c18e50077771673e2367214aa Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Fri, 13 Mar 2020 23:59:40 +0100
Subject: [PATCH 0223/1830] DEV: Better handling of incremental scrapes for
 Google Groups

---
 script/import_scripts/google_groups.rb | 49 ++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/script/import_scripts/google_groups.rb b/script/import_scripts/google_groups.rb
index d8f58cf323..bbcfb6442b 100755
--- a/script/import_scripts/google_groups.rb
+++ b/script/import_scripts/google_groups.rb
@@ -17,6 +17,7 @@ require "yaml"
 
 DEFAULT_OUTPUT_PATH = "/shared/import/data"
 DEFAULT_COOKIES_TXT = "/shared/import/cookies.txt"
+ABORT_AFTER_SKIPPED_TOPIC_COUNT = 10
 
 def driver
   @driver ||= begin
@@ -77,7 +78,7 @@ def base_url
   end
 end
 
-def crawl_categories
+def crawl_topics
   1.step(nil, 100).each do |start|
     url = "#{base_url}/#{@groupname}[#{start}-#{start + 99}]"
     get(url)
@@ -97,12 +98,24 @@ def crawl_categories
     topic_urls = extract(".subject a[href*='#{@groupname}']") { |a| a["href"].sub("/d/topic/", "/forum/?_escaped_fragment_=topic/") }
     break if topic_urls.size == 0
 
-    topic_urls.each { |topic_url| crawl_topic(topic_url) }
+    topic_urls.each do |topic_url|
+      crawl_topic(topic_url)
+
+      # abort if this in an incremental crawl and there were too many consecutive, skipped topics
+      if @finished && @skipped_topic_count > ABORT_AFTER_SKIPPED_TOPIC_COUNT
+        puts "Skipping all other topics, because this is an incremental crawl.".green
+        return
+      end
+    end
   end
 end
 
 def crawl_topic(url)
-  if @scraped_topic_urls.include?(url)
+  skippable = @scraped_topic_urls.include?(url)
+
+  # Skip this topic if there were already too many consecutive, skipped topics.
+  # Otherwise we have to look if there are new messages in the topic.
+  if skippable && @skipped_topic_count > ABORT_AFTER_SKIPPED_TOPIC_COUNT
     puts "Skipping".green << " #{url}"
     return
   end
@@ -110,13 +123,18 @@ def crawl_topic(url)
   puts "Scraping #{url}"
   get(url)
 
+  messsages_crawled = false
+
   extract(".subject a[href*='#{@groupname}']") do |a|
     [
       a["href"].sub("/d/msg/", "/forum/message/raw?msg="),
       a["title"].empty?
     ]
-  end.each { |msg_url, might_be_deleted| crawl_message(msg_url, might_be_deleted) }
+  end.each do |msg_url, might_be_deleted|
+    messsages_crawled |= crawl_message(msg_url, might_be_deleted)
+  end
 
+  @skipped_topic_count = skippable && messsages_crawled ? 0 : @skipped_topic_count + 1
   @scraped_topic_urls << url
 rescue
   puts "Failed to scrape topic at #{url}".red
@@ -140,7 +158,10 @@ def crawl_message(url, might_be_deleted)
     end
   end
 
+  old_md5 = Digest::MD5.file(filename) if File.exist?(filename)
   File.write(filename, content)
+
+  old_md5 ? old_md5 != Digest::MD5.file(filename) : true
 rescue Selenium::WebDriver::Error::NoSuchElementError
   if might_be_deleted
     puts "Message might be deleted. Skipping #{url}"
@@ -201,14 +222,28 @@ end
 def crawl
   start_time = Time.now
   status_filename = File.join(@path, "status.yml")
-  @scraped_topic_urls = File.exists?(status_filename) ? YAML.load_file(status_filename) : Set.new
+
+  if File.exists?(status_filename)
+    yaml = YAML.load_file(status_filename)
+    @finished = yaml[:finished]
+    @scraped_topic_urls = yaml[:urls]
+  else
+    @finished = false
+    @scraped_topic_urls = Set.new
+  end
+
+  @skipped_topic_count = 0
 
   login
 
   begin
-    crawl_categories
+    crawl_topics
+    @finished = true
   ensure
-    File.write(status_filename, @scraped_topic_urls.to_yaml)
+    File.write(status_filename, {
+      finished: @finished,
+      urls: @scraped_topic_urls
+    }.to_yaml)
   end
 
   elapsed = Time.now - start_time

From 27bc4f51c723ba4b55e22ac323e6675dd8f0e119 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Sat, 14 Mar 2020 08:47:53 -0300
Subject: [PATCH 0224/1830] FIX: Ignore suspect users that were migrated or
 users who were created more than six months ago (#9205)

---
 app/jobs/scheduled/enqueue_suspect_users.rb |  6 +++++-
 spec/jobs/enqueue_suspect_users_spec.rb     | 24 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/jobs/scheduled/enqueue_suspect_users.rb b/app/jobs/scheduled/enqueue_suspect_users.rb
index 1b94dcb309..b88118a3a3 100644
--- a/app/jobs/scheduled/enqueue_suspect_users.rb
+++ b/app/jobs/scheduled/enqueue_suspect_users.rb
@@ -9,15 +9,19 @@ module Jobs
       return if SiteSetting.must_approve_users
 
       users = User
+        .distinct
         .activated
         .human_users
         .where(approved: false)
         .joins(:user_profile, :user_stat)
-        .where("users.created_at <= ?", 1.day.ago)
+        .where("users.created_at <= ? AND users.created_at >= ?", 1.day.ago, 6.months.ago)
         .where("LENGTH(COALESCE(user_profiles.bio_raw, user_profiles.website, '')) > 0")
         .where("user_stats.posts_read_count <= 1 AND user_stats.topics_entered <= 1")
         .joins("LEFT OUTER JOIN reviewables r ON r.target_id = users.id AND r.target_type = 'User'")
         .where('r.id IS NULL')
+        .joins('LEFT OUTER JOIN user_custom_fields ucf ON users.id = ucf.user_id')
+        .group('users.id, ucf.id')
+        .having('ucf.id IS NULL OR NOT bool_or(ucf.name = ?)', 'import_id')
         .limit(10)
 
       users.each do |user|
diff --git a/spec/jobs/enqueue_suspect_users_spec.rb b/spec/jobs/enqueue_suspect_users_spec.rb
index b614899823..b1b30e7795 100644
--- a/spec/jobs/enqueue_suspect_users_spec.rb
+++ b/spec/jobs/enqueue_suspect_users_spec.rb
@@ -56,5 +56,29 @@ describe Jobs::EnqueueSuspectUsers do
 
       expect(ReviewableUser.where(target: suspect_user).exists?).to eq(false)
     end
+
+    it 'ignores users created more than six months ago' do
+      suspect_user.update!(created_at: 1.year.ago)
+
+      subject.execute({})
+
+      expect(ReviewableUser.where(target: suspect_user).exists?).to eq(false)
+    end
+
+    it 'ignores users that were imported from another site' do
+      suspect_user.upsert_custom_fields({ import_id: 'fake_id' })
+
+      subject.execute({})
+
+      expect(ReviewableUser.where(target: suspect_user).exists?).to eq(false)
+    end
+
+    it 'enqueues a suspect users with custom fields' do
+      suspect_user.upsert_custom_fields({ field_a: 'value', field_b: 'value' })
+
+      subject.execute({})
+
+      expect(ReviewableUser.where(target: suspect_user).exists?).to eq(true)
+    end
   end
 end

From d27ece9ded9d6f3c20eff49606d528d71b637d5c Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sat, 14 Mar 2020 22:10:19 +0100
Subject: [PATCH 0225/1830] FIX: Method from Telligent import script was
 deleted by accident

---
 script/import_scripts/telligent.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/script/import_scripts/telligent.rb b/script/import_scripts/telligent.rb
index 177ccb8fba..6fb3c775f0 100644
--- a/script/import_scripts/telligent.rb
+++ b/script/import_scripts/telligent.rb
@@ -590,6 +590,18 @@ class ImportScripts::Telligent < ImportScripts::Base
     md
   end
 
+  def mark_topics_as_solved
+    puts "", "Marking topics as solved..."
+
+    DB.exec <<~SQL
+      INSERT INTO topic_custom_fields (name, value, topic_id, created_at, updated_at)
+      SELECT 'accepted_answer_post_id', pcf.post_id, p.topic_id, p.created_at, p.created_at
+        FROM post_custom_fields pcf
+        JOIN posts p ON p.id = pcf.post_id
+       WHERE pcf.name = 'is_accepted_answer' AND pcf.value = 'true'
+    SQL
+  end
+
   def add_permalink_normalizations
     normalizations = SiteSetting.permalink_normalizations
     normalizations = normalizations.blank? ? [] : normalizations.split('|')

From a14313e9d0102979423559c0c6b98f3620cd10ee Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Sun, 15 Mar 2020 17:24:11 +1100
Subject: [PATCH 0226/1830] FIX: RANDOM_PASSWORD not working rake admin:create

We regressed behavior of this env var which enable admin account
creation with a random password
---
 lib/tasks/admin.rake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/admin.rake b/lib/tasks/admin.rake
index f4d09dbcc4..c5b68e1a8a 100644
--- a/lib/tasks/admin.rake
+++ b/lib/tasks/admin.rake
@@ -65,9 +65,10 @@ task "admin:create" => :environment do
         else
           password = ask("Password:  ") { |q| q.echo = false }
           password_confirmation = ask("Repeat password:  ") { |q| q.echo = false }
-          passwords_match = password == password_confirmation
         end
 
+        passwords_match = password == password_confirmation
+
         say("Passwords don't match, try again...") unless passwords_match
       end while !passwords_match
       admin.password = password

From a1d660d9515fa446fea85bfea3b4c9b96ac75320 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Sun, 15 Mar 2020 21:17:28 +1100
Subject: [PATCH 0227/1830] FEATURE: optional global invite_code for account
 registration

On some sites when bootstrapping communities it is helpful to bootstrap
with a "light weight" invite code.

Use the site setting `invite_code` to set a global invite code.

In this case the administrator can share the code with
a community which is very easy to remember and then anyone who has
that code can easily register accounts.

People without the invite code are not allowed account registration.

Global invite codes are less secure than indevidual codes, in that they
tend to leak in the community however in some cases when starting a brand
new community the security guarantees of invites are not needed.
---
 .../discourse/controllers/create-account.js   |  9 ++++--
 .../javascripts/discourse/models/user.js      | 26 +++++++++------
 .../templates/modal/create-account.hbs        | 11 +++++++
 app/controllers/users_controller.rb           |  5 +++
 app/models/site_setting.rb                    |  5 +++
 config/locales/client.en.yml                  |  4 +++
 config/locales/server.en.yml                  |  2 ++
 config/site_settings.yml                      |  1 +
 spec/requests/users_controller_spec.rb        | 32 ++++++++++++-------
 9 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/create-account.js b/app/assets/javascripts/discourse/controllers/create-account.js
index 3d93a61393..b0567c07b4 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js
+++ b/app/assets/javascripts/discourse/controllers/create-account.js
@@ -40,6 +40,7 @@ export default Controller.extend(
     hasAuthOptions: notEmpty("authOptions"),
     canCreateLocal: setting("enable_local_logins"),
     showCreateForm: or("hasAuthOptions", "canCreateLocal"),
+    requireInviteCode: setting("require_invite_code"),
 
     resetForm() {
       // We wrap the fields in a structure so we can assign a value
@@ -66,7 +67,8 @@ export default Controller.extend(
       "usernameValidation.failed",
       "passwordValidation.failed",
       "userFieldsValidation.failed",
-      "formSubmitted"
+      "formSubmitted",
+      "inviteCode"
     )
     submitDisabled() {
       if (this.formSubmitted) return true;
@@ -78,6 +80,8 @@ export default Controller.extend(
         return true;
       if (this.get("userFieldsValidation.failed")) return true;
 
+      if (this.requireInviteCode && !this.inviteCode) return true;
+
       return false;
     },
 
@@ -225,7 +229,8 @@ export default Controller.extend(
         "accountEmail",
         "accountPassword",
         "accountUsername",
-        "accountChallenge"
+        "accountChallenge",
+        "inviteCode"
       );
 
       attrs["accountPasswordConfirm"] = this.accountHoneypot;
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index 026b27926a..a7d9ce8b29 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -909,17 +909,23 @@ User.reopenClass(Singleton, {
   },
 
   createAccount(attrs) {
+    let data = {
+      name: attrs.accountName,
+      email: attrs.accountEmail,
+      password: attrs.accountPassword,
+      username: attrs.accountUsername,
+      password_confirmation: attrs.accountPasswordConfirm,
+      challenge: attrs.accountChallenge,
+      user_fields: attrs.userFields,
+      timezone: moment.tz.guess()
+    };
+
+    if (attrs.inviteCode) {
+      data.invite_code = attrs.inviteCode;
+    }
+
     return ajax(userPath(), {
-      data: {
-        name: attrs.accountName,
-        email: attrs.accountEmail,
-        password: attrs.accountPassword,
-        username: attrs.accountUsername,
-        password_confirmation: attrs.accountPasswordConfirm,
-        challenge: attrs.accountChallenge,
-        user_fields: attrs.userFields,
-        timezone: moment.tz.guess()
-      },
+      data,
       type: "POST"
     });
   }
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 5c77b2a0a6..bd03f39f24 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -89,6 +89,17 @@
                 </td>
               </tr>
 
+              {{#if requireInviteCode }}
+                <tr class="invite-code">
+                  <td><label for='invite-code'>{{i18n 'user.invite_code.title'}}</label></td>
+                  <td>
+                    {{input value=inviteCode id="inviteCode"}}
+                  </td>
+
+                  <td><label>{{i18n 'user.invite_code.instructions'}}</label></td>
+                </tr>
+              {{/if}}
+
               {{plugin-outlet name="create-account-after-password"
                               noTags=true
                               args=(hash accountName=accountName
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 837f19b828..6acf7651eb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -410,6 +410,7 @@ class UsersController < ApplicationController
   def create
     params.require(:email)
     params.require(:username)
+    params.require(:invite_code) if SiteSetting.require_invite_code
     params.permit(:user_fields)
 
     unless SiteSetting.allow_new_registrations
@@ -424,6 +425,10 @@ class UsersController < ApplicationController
       return fail_with("login.email_too_long")
     end
 
+    if SiteSetting.require_invite_code && SiteSetting.invite_code != params[:invite_code]
+      return fail_with("login.wrong_invite_code")
+    end
+
     if clashing_with_existing_route?(params[:username]) || User.reserved_username?(params[:username])
       return fail_with("login.reserved_username")
     end
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index bf82dbe8fa..7925f91ef1 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -173,6 +173,11 @@ class SiteSetting < ActiveRecord::Base
     SiteSetting::Upload
   end
 
+  def self.require_invite_code
+    invite_code.present?
+  end
+  client_settings << :require_invite_code
+
   %i{
     site_logo_url
     site_logo_small_url
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a276cc8614..7c2a761c6a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1132,6 +1132,10 @@ en:
       password_confirmation:
         title: "Password Again"
 
+      invite_code:
+        title: "Invite Code"
+        instructions: "Account registration requires an invite code"
+
       auth_tokens:
         title: "Recently Used Devices"
         ip: "IP"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index fd440ec3b6..ab280dab92 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1530,6 +1530,7 @@ en:
     markdown_typographer_quotation_marks: "List of double and single quotes replacement pairs"
     post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)."
     must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site."
+    invite_code: "User must type this code to be allowed account registration, ignored when empty"
     approve_suspect_users: "Add suspicious users to the review queue. Suspicious users have entered a bio/website but have no reading activity."
     pending_users_reminder_delay: "Notify moderators if new users have been waiting for approval for longer than this many hours. Set to -1 to disable notifications."
     maximum_session_age: "User will remain logged in for n hours since last visit"
@@ -2382,6 +2383,7 @@ en:
     new_registrations_disabled: "New account registrations are not allowed at this time."
     password_too_long: "Passwords are limited to 200 characters."
     email_too_long: "The email you provided is too long. Mailbox names must be no more than 254 characters, and domain names must be no more than 253 characters."
+    wrong_invite_code: "The invite code you entered was incorrect."
     reserved_username: "That username is not allowed."
     missing_user_field: "You have not completed all the user fields"
     auth_complete: "Authentication is complete."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 044d7f1de1..52b7c6002d 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -336,6 +336,7 @@ login:
   must_approve_users:
     client: true
     default: false
+  invite_code: ""
   enable_local_logins:
     client: true
     default: true
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 38dfe21e96..43e41e5522 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -593,8 +593,8 @@ describe UsersController do
         email: @user.email }
     end
 
-    def post_user
-      post "/u.json", params: post_user_params
+    def post_user(extra_params = {})
+      post "/u.json", params: post_user_params.merge(extra_params)
     end
 
     context 'when email params is missing' do
@@ -616,17 +616,27 @@ describe UsersController do
         expect(User.find_by(username: @user.username).locale).to eq('fr')
       end
 
+      it 'requires invite code when specified' do
+        expect(SiteSetting.require_invite_code).to eq(false)
+        SiteSetting.invite_code = "abc"
+        expect(SiteSetting.require_invite_code).to eq(true)
+
+        post_user(invite_code: "abcd")
+        expect(response.status).to eq(200)
+        json = JSON.parse(response.body)
+        expect(json["success"]).to eq(false)
+
+        post_user(invite_code: "abc")
+        expect(response.status).to eq(200)
+        json = JSON.parse(response.body)
+        expect(json["success"]).to eq(true)
+
+      end
+
       context "when timezone is provided as a guess on signup" do
-        let(:post_user_params) do
-          { name: @user.name,
-            username: @user.username,
-            password: "strongpassword",
-            email: @user.email,
-            timezone: "Australia/Brisbane" }
-        end
 
         it "sets the timezone" do
-          post_user
+          post_user(timezone: "Australia/Brisbane")
           expect(response.status).to eq(200)
           expect(User.find_by(username: @user.username).user_option.timezone).to eq("Australia/Brisbane")
         end
@@ -1440,7 +1450,7 @@ describe UsersController do
       inviter = Fabricate(:user, trust_level: 2)
       sign_in(inviter)
       invitee = Fabricate(:user)
-      invite = Fabricate(:invite, invited_by: inviter, user: invitee)
+      _invite = Fabricate(:invite, invited_by: inviter, user: invitee)
       get "/u/#{user.username}/invited_count.json"
       expect(response.status).to eq(200)
 

From 15ae3145ec1e077245b8f9ba46b16359c75482cc Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Sun, 15 Mar 2020 11:01:24 +0000
Subject: [PATCH 0228/1830] FIX: Plugins may have relative symlinks

---
 lib/stylesheet/watcher.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/stylesheet/watcher.rb b/lib/stylesheet/watcher.rb
index 4c9ab7f595..384f7515d1 100644
--- a/lib/stylesheet/watcher.rb
+++ b/lib/stylesheet/watcher.rb
@@ -57,7 +57,11 @@ module Stylesheet
         Thread.new do
           begin
             plugins_paths = Dir.glob("#{Rails.root}/plugins/*").map do |file|
-              File.symlink?(file) ? File.readlink(file) : file
+              if File.symlink?(file)
+                File.expand_path(File.readlink(file), "#{Rails.root}/plugins")
+              else
+                file
+              end
             end.compact
 
             listener = Listen.to("#{root}/#{watch}", listener_opts) do |modified, added, _|

From 39a7b93c4a9ff5c2798d2fe619bdc8668811064f Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Sun, 15 Mar 2020 11:09:57 -0400
Subject: [PATCH 0229/1830] UX: Remove "Live Notifications" user profile
 section on iOS

---
 .../controllers/preferences/notifications.js       |  3 +++
 .../templates/preferences/notifications.hbs        | 14 ++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/preferences/notifications.js b/app/assets/javascripts/discourse/controllers/preferences/notifications.js
index 078d0b3fbb..5667a55fda 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/notifications.js
+++ b/app/assets/javascripts/discourse/controllers/preferences/notifications.js
@@ -85,6 +85,9 @@ export default Controller.extend({
       },
       { name: I18n.t("user.new_topic_duration.last_here"), value: -2 }
     ];
+
+    const caps = Discourse.__container__.lookup("capabilities:main");
+    this.isIOS = caps.isIOS;
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
index 03ca349d67..f3c1b00f52 100644
--- a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
@@ -43,12 +43,14 @@
   </div>
 </div>
 
-<div class="control-group desktop-notifications">
-  <label class="control-label">{{i18n 'user.desktop_notifications.label'}}</label>
-  {{desktop-notification-config}}
-  <div class="instructions">{{i18n 'user.desktop_notifications.each_browser_note'}}</div>
-  {{plugin-outlet name="user-preferences-desktop-notifications" args=(hash model=model save=(action "save"))}}
-</div>
+{{#unless isIOS}}
+  <div class="control-group desktop-notifications">
+    <label class="control-label">{{i18n 'user.desktop_notifications.label'}}</label>
+    {{desktop-notification-config}}
+    <div class="instructions">{{i18n 'user.desktop_notifications.each_browser_note'}}</div>
+    {{plugin-outlet name="user-preferences-desktop-notifications" args=(hash model=model save=(action "save"))}}
+  </div>
+{{/unless}}
 
 {{#if siteSettings.enable_personal_messages}}
   <div class="control-group private-messages">

From d4595fbf292d2f42af9f3032b2eb28e16ddf8dc6 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Sun, 15 Mar 2020 20:56:54 +0000
Subject: [PATCH 0230/1830] FIX: Fix html response in development after
 ApplicationController reload

In development, if the ApplicationController is reloaded, then, previous
to this commit we were emitting an instance of the previous RenderEmpty
class, but rescuing from the reloaded instance.

Looking up RenderEmpty by its fully qualified name fixes this.
---
 app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 23872ed560..3ae29ee400 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -650,7 +650,7 @@ class ApplicationController < ActionController::Base
   def check_xhr
     # bypass xhr check on PUT / POST / DELETE provided api key is there, otherwise calling api is annoying
     return if !request.get? && (is_api? || is_user_api?)
-    raise RenderEmpty.new unless ((request.format && request.format.json?) || request.xhr?)
+    raise ApplicationController::RenderEmpty.new unless ((request.format && request.format.json?) || request.xhr?)
   end
 
   def self.requires_login(arg = {})

From a6e9057609149cd882491722b7aa315be2d294f3 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Mon, 16 Mar 2020 11:54:14 +1000
Subject: [PATCH 0231/1830] FIX: Ensure show_short URLs handle secure uploads
 using multisite (#9212)

Meta report: https://meta.discourse.org/t/short-url-secure-uploads-s3/144224
* if the show_short route is hit for an upload that is
  secure, we redirect to the secure presigned URL. however
  this was not taking into account multisite so the db name
  was left off the path which broke the presigned URL
* we now use the correct url_for method if we know the
  upload (like in the show_short case) which takes into
  account multisite
---
 app/controllers/uploads_controller.rb    | 14 +++++++++++---
 spec/requests/uploads_controller_spec.rb | 12 +++++++++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 04840a36a1..ad72f998c9 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -102,7 +102,9 @@ class UploadsController < ApplicationController
     sha1 = Upload.sha1_from_base62_encoded(params[:base62])
 
     if upload = Upload.find_by(sha1: sha1)
-      return handle_secure_upload_request(upload, Discourse.store.get_path_for_upload(upload)) if upload.secure? && SiteSetting.secure_media?
+      if upload.secure? && SiteSetting.secure_media?
+        return handle_secure_upload_request(upload)
+      end
 
       if Discourse.store.internal?
         send_file_local_upload(upload)
@@ -128,7 +130,6 @@ class UploadsController < ApplicationController
     upload = Upload.find_by(sha1: sha1)
     return render_404 if upload.blank?
 
-    signed_secure_url = Discourse.store.signed_url_for_path(path_with_ext)
     return handle_secure_upload_request(upload, path_with_ext) if SiteSetting.secure_media?
 
     # we don't want to 404 here if secure media gets disabled
@@ -138,14 +139,21 @@ class UploadsController < ApplicationController
     # if the upload is still secure, that means the ACL is probably still
     # private, so we don't want to go to the CDN url just yet otherwise we
     # will get a 403. if the upload is not secure we assume the ACL is public
+    signed_secure_url = Discourse.store.signed_url_for_path(path_with_ext)
     redirect_to upload.secure? ? signed_secure_url : Discourse.store.cdn_url(upload.url)
   end
 
-  def handle_secure_upload_request(upload, path_with_ext)
+  def handle_secure_upload_request(upload, path_with_ext = nil)
     if upload.access_control_post_id.present?
       raise Discourse::InvalidAccess if !guardian.can_see?(upload.access_control_post)
     end
 
+    # url_for figures out the full URL, handling multisite DBs,
+    # and will return a presigned URL for the upload
+    if path_with_ext.blank?
+      return redirect_to Discourse.store.url_for(upload)
+    end
+
     redirect_to Discourse.store.signed_url_for_path(path_with_ext)
   end
 
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index 55139f9d05..1577695f35 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -398,9 +398,19 @@ describe UploadsController do
           upload.update(access_control_post: post)
 
           get upload.short_path
-
           expect(response.code).to eq("403")
         end
+
+        context "when running on a multisite connection" do
+          before do
+            Rails.configuration.multisite = true
+          end
+          it "redirects to the signed_url_for_path with the multisite DB name in the url" do
+            freeze_time
+            get upload.short_path
+            expect(response.body).to include(RailsMultisite::ConnectionManagement.current_db)
+          end
+        end
       end
     end
   end

From 4cce564b35f36c2b7ba021e050e6019cfff289e9 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Mon, 16 Mar 2020 16:05:44 +1000
Subject: [PATCH 0232/1830] FIX: Bookmark reminders and improvements changes
 (#9213)

* Cosmetic fixes for the bookmark modal
* Do not show "later today" when the later time will be > 5pm
* When a custom reminder time is selected, store it in localStorage. The next time the modal is opened, if the last datetime is > now, then a new tile with "Last" will be shown that lets the user reselect that same time.
* Also add an explicit "No Reminder" option that is selected by default
---
 .../discourse/controllers/bookmark.js         | 88 ++++++++++++++++---
 .../discourse/templates/modal/bookmark.hbs    |  8 +-
 .../common/components/tap-tile.scss           |  1 +
 config/locales/client.en.yml                  |  6 +-
 .../controllers/bookmark-test.js.es6          | 61 ++++++++++---
 5 files changed, 134 insertions(+), 30 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 891dd2daf4..0a8ba8a063 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -7,6 +7,7 @@ import { htmlSafe } from "@ember/template";
 import { ajax } from "discourse/lib/ajax";
 
 const START_OF_DAY_HOUR = 8;
+const LATER_TODAY_CUTOFF_HOUR = 17;
 const REMINDER_TYPES = {
   AT_DESKTOP: "at_desktop",
   LATER_TODAY: "later_today",
@@ -14,7 +15,9 @@ const REMINDER_TYPES = {
   TOMORROW: "tomorrow",
   NEXT_WEEK: "next_week",
   NEXT_MONTH: "next_month",
-  CUSTOM: "custom"
+  CUSTOM: "custom",
+  LAST_CUSTOM: "last_custom",
+  NONE: "none"
 };
 
 export default Controller.extend(ModalFunctionality, {
@@ -27,17 +30,42 @@ export default Controller.extend(ModalFunctionality, {
   onCloseWithoutSaving: null,
   customReminderDate: null,
   customReminderTime: null,
+  lastCustomReminderDate: null,
+  lastCustomReminderTime: null,
 
   onShow() {
     this.setProperties({
       errorMessage: null,
       name: null,
-      selectedReminderType: null,
+      selectedReminderType: REMINDER_TYPES.NONE,
       closeWithoutSaving: false,
       isSavingBookmarkManually: false,
       customReminderDate: null,
-      customReminderTime: null
+      customReminderTime: null,
+      lastCustomReminderDate: null,
+      lastCustomReminderTime: null
     });
+
+    this.loadLastUsedCustomReminderDatetime();
+  },
+
+  loadLastUsedCustomReminderDatetime() {
+    let lastTime = localStorage.lastCustomBookmarkReminderTime;
+    let lastDate = localStorage.lastCustomBookmarkReminderDate;
+
+    if (lastTime && lastDate) {
+      let parsed = this.parseCustomDateTime(lastDate, lastTime);
+
+      if (parsed < this.now()) {
+        return;
+      }
+
+      this.setProperties({
+        lastCustomReminderDate: lastDate,
+        lastCustomReminderTime: lastTime,
+        parsedLastCustomReminderDatetime: parsed
+      });
+    }
   },
 
   // we always want to save the bookmark unless the user specifically
@@ -71,9 +99,29 @@ export default Controller.extend(ModalFunctionality, {
     return REMINDER_TYPES;
   },
 
+  @discourseComputed()
+  showLastCustom() {
+    return this.lastCustomReminderTime && this.lastCustomReminderDate;
+  },
+
   @discourseComputed()
   showLaterToday() {
-    return !this.laterToday().isSame(this.tomorrow(), "date");
+    let later = this.laterToday();
+    return (
+      !later.isSame(this.tomorrow(), "date") &&
+      later.hour() <= LATER_TODAY_CUTOFF_HOUR
+    );
+  },
+
+  @discourseComputed("parsedLastCustomReminderDatetime")
+  lastCustomFormatted(parsedLastCustomReminderDatetime) {
+    return htmlSafe(
+      I18n.t("bookmarks.reminders.last_custom", {
+        date: parsedLastCustomReminderDatetime.format(
+          I18n.t("dates.long_no_year")
+        )
+      })
+    );
   },
 
   @discourseComputed()
@@ -130,12 +178,26 @@ export default Controller.extend(ModalFunctionality, {
     const reminderAt = this.reminderAt();
     const reminderAtISO = reminderAt ? reminderAt.toISOString() : null;
 
-    if (!reminderAt && this.selectedReminderType === REMINDER_TYPES.CUSTOM) {
-      return Promise.reject(I18n.t("bookmarks.invalid_custom_datetime"));
+    if (this.selectedReminderType === REMINDER_TYPES.CUSTOM) {
+      if (!reminderAt) {
+        return Promise.reject(I18n.t("bookmarks.invalid_custom_datetime"));
+      }
+
+      localStorage.lastCustomBookmarkReminderTime = this.customReminderTime;
+      localStorage.lastCustomBookmarkReminderDate = this.customReminderDate;
+    }
+
+    let reminderType;
+    if (this.selectedReminderType === REMINDER_TYPES.NONE) {
+      reminderType = null;
+    } else if (this.selectedReminderType === REMINDER_TYPES.LAST_CUSTOM) {
+      reminderType = REMINDER_TYPES.CUSTOM;
+    } else {
+      reminderType = this.selectedReminderType;
     }
 
     const data = {
-      reminder_type: this.selectedReminderType,
+      reminder_type: reminderType,
       reminder_at: reminderAtISO,
       name: this.name,
       post_id: this.model.postId
@@ -148,6 +210,10 @@ export default Controller.extend(ModalFunctionality, {
     });
   },
 
+  parseCustomDateTime(date, time) {
+    return moment.tz(date + " " + time, this.userTimezone());
+  },
+
   reminderAt() {
     if (!this.selectedReminderType) {
       return;
@@ -167,9 +233,9 @@ export default Controller.extend(ModalFunctionality, {
       case REMINDER_TYPES.NEXT_MONTH:
         return this.nextMonth();
       case REMINDER_TYPES.CUSTOM:
-        const customDateTime = moment.tz(
-          this.customReminderDate + " " + this.customReminderTime,
-          this.userTimezone()
+        const customDateTime = this.parseCustomDateTime(
+          this.customReminderDate,
+          this.customReminderTime
         );
         if (!customDateTime.isValid()) {
           this.setProperties({
@@ -179,6 +245,8 @@ export default Controller.extend(ModalFunctionality, {
           return;
         }
         return customDateTime;
+      case REMINDER_TYPES.LAST_CUSTOM:
+        return this.parsedLastCustomReminderDatetime;
     }
   },
 
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 7adab91b63..192e10fc2f 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -9,10 +9,6 @@
     {{/if}}
 
     <div class="control-group">
-      <label class="control-label" for="name">
-        {{i18n 'post.bookmarks.name'}}
-      </label>
-
       {{input value=name name="name" class="bookmark-name" enter=(action "saveAndClose") placeholder=(i18n "post.bookmarks.name_placeholder")}}
     </div>
 
@@ -36,6 +32,10 @@
           {{tap-tile icon="far-clock" text=nextWeekFormatted tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
           {{tap-tile icon="far-calendar-plus" text=nextMonthFormatted tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
           {{tap-tile icon="calendar-alt" text=(I18n "bookmarks.reminders.custom") tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+          {{#if showLastCustom}}
+            {{tap-tile icon="undo" text=lastCustomFormatted tileId=reminderTypes.LAST_CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+          {{/if}}
+          {{tap-tile icon="ban" text=(I18n "bookmarks.reminders.none") tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
         {{/tap-tile-grid}}
         {{#if customDateTimeSelected}}
           <div class="control-group">
diff --git a/app/assets/stylesheets/common/components/tap-tile.scss b/app/assets/stylesheets/common/components/tap-tile.scss
index 7e8149650a..d7259710e1 100644
--- a/app/assets/stylesheets/common/components/tap-tile.scss
+++ b/app/assets/stylesheets/common/components/tap-tile.scss
@@ -7,6 +7,7 @@
   $horizontal-tile-padding: 5px;
 
   .tap-tile {
+    color: $primary-high;
     padding: 10px $horizontal-tile-padding;
     display: flex;
     flex-direction: column;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 7c2a761c6a..2fa6a8879f 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -321,6 +321,8 @@ en:
         next_week: "Next week <br/>{{date}}"
         next_month: "Next month <br/>{{date}}"
         custom: "Custom date and time"
+        last_custom: "Last <br/>{{date}}"
+        none: "No reminder needed"
 
     drafts:
       resume: "Resume"
@@ -2676,8 +2678,8 @@ en:
         create: "Create bookmark"
         created: "Created"
         name: "Name"
-        name_placeholder: "Name the bookmark to help jog your memory"
-        set_reminder: "Set a reminder"
+        name_placeholder: "What is this bookmark for?"
+        set_reminder: "Remind me"
         actions:
           delete_bookmark:
             name: "Delete bookmark"
diff --git a/test/javascripts/controllers/bookmark-test.js.es6 b/test/javascripts/controllers/bookmark-test.js.es6
index d94d866125..f8fc372011 100644
--- a/test/javascripts/controllers/bookmark-test.js.es6
+++ b/test/javascripts/controllers/bookmark-test.js.es6
@@ -19,22 +19,27 @@ function mockMomentTz(dateString) {
 QUnit.test("showLaterToday when later today is tomorrow do not show", function(
   assert
 ) {
-  mockMomentTz("2019-12-11T13:00:00Z");
+  mockMomentTz("2019-12-11T22:00:00");
 
   assert.equal(BookmarkController.get("showLaterToday"), false);
 });
 
+QUnit.test("showLaterToday when later today is after 5pm", function(assert) {
+  mockMomentTz("2019-12-11T15:00:00");
+  assert.equal(BookmarkController.get("showLaterToday"), false);
+});
+
 QUnit.test(
   "showLaterToday when later today is before the end of the day, show",
   function(assert) {
-    mockMomentTz("2019-12-11T08:00:00Z");
+    mockMomentTz("2019-12-11T10:00:00");
 
     assert.equal(BookmarkController.get("showLaterToday"), true);
   }
 );
 
 QUnit.test("nextWeek gets next week correctly", function(assert) {
-  mockMomentTz("2019-12-11T08:00:00Z");
+  mockMomentTz("2019-12-11T08:00:00");
 
   assert.equal(
     BookmarkController.nextWeek().format("YYYY-MM-DD"),
@@ -43,7 +48,7 @@ QUnit.test("nextWeek gets next week correctly", function(assert) {
 });
 
 QUnit.test("nextMonth gets next month correctly", function(assert) {
-  mockMomentTz("2019-12-11T08:00:00Z");
+  mockMomentTz("2019-12-11T08:00:00");
 
   assert.equal(
     BookmarkController.nextMonth().format("YYYY-MM-DD"),
@@ -54,7 +59,7 @@ QUnit.test("nextMonth gets next month correctly", function(assert) {
 QUnit.test(
   "nextBusinessDay gets next business day of monday correctly if today is friday",
   function(assert) {
-    mockMomentTz("2019-12-13T08:00:00Z");
+    mockMomentTz("2019-12-13T08:00:00");
 
     assert.equal(
       BookmarkController.nextBusinessDay().format("YYYY-MM-DD"),
@@ -66,7 +71,7 @@ QUnit.test(
 QUnit.test(
   "nextBusinessDay gets next business day of monday correctly if today is saturday",
   function(assert) {
-    mockMomentTz("2019-12-14T08:00:00Z");
+    mockMomentTz("2019-12-14T08:00:00");
 
     assert.equal(
       BookmarkController.nextBusinessDay().format("YYYY-MM-DD"),
@@ -78,7 +83,7 @@ QUnit.test(
 QUnit.test(
   "nextBusinessDay gets next business day of monday correctly if today is sunday",
   function(assert) {
-    mockMomentTz("2019-12-15T08:00:00Z");
+    mockMomentTz("2019-12-15T08:00:00");
 
     assert.equal(
       BookmarkController.nextBusinessDay().format("YYYY-MM-DD"),
@@ -90,7 +95,7 @@ QUnit.test(
 QUnit.test(
   "nextBusinessDay gets next business day of thursday correctly if today is wednesday",
   function(assert) {
-    mockMomentTz("2019-12-11T08:00:00Z");
+    mockMomentTz("2019-12-11T08:00:00");
 
     assert.equal(
       BookmarkController.nextBusinessDay().format("YYYY-MM-DD"),
@@ -100,7 +105,7 @@ QUnit.test(
 );
 
 QUnit.test("tomorrow gets tomorrow correctly", function(assert) {
-  mockMomentTz("2019-12-11T08:00:00Z");
+  mockMomentTz("2019-12-11T08:00:00");
 
   assert.equal(
     BookmarkController.tomorrow().format("YYYY-MM-DD"),
@@ -112,7 +117,7 @@ QUnit.test(
   "startOfDay changes the time of the provided date to 8:00am correctly",
   function(assert) {
     let dt = moment.tz(
-      "2019-12-11T11:37:16Z",
+      "2019-12-11T11:37:16",
       BookmarkController.currentUser.timezone
     );
 
@@ -126,11 +131,11 @@ QUnit.test(
 QUnit.test(
   "laterToday gets 3 hours from now and if before half-past, it sets the time to half-past",
   function(assert) {
-    mockMomentTz("2019-12-11T08:13:00Z");
+    mockMomentTz("2019-12-11T08:13:00");
 
     assert.equal(
       BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
-      "2019-12-11 21:30:00"
+      "2019-12-11 11:30:00"
     );
   }
 );
@@ -138,11 +143,39 @@ QUnit.test(
 QUnit.test(
   "laterToday gets 3 hours from now and if after half-past, it rounds up to the next hour",
   function(assert) {
-    mockMomentTz("2019-12-11T08:43:00Z");
+    mockMomentTz("2019-12-11T08:43:00");
 
     assert.equal(
       BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
-      "2019-12-11 22:00:00"
+      "2019-12-11 12:00:00"
     );
   }
 );
+
+QUnit.test(
+  "loadLastUsedCustomReminderDatetime fills the custom reminder date + time if present in localStorage",
+  function(assert) {
+    mockMomentTz("2019-12-11T08:00:00");
+    localStorage.lastCustomBookmarkReminderDate = "2019-12-12";
+    localStorage.lastCustomBookmarkReminderTime = "08:00";
+
+    BookmarkController.loadLastUsedCustomReminderDatetime();
+
+    assert.equal(BookmarkController.lastCustomReminderDate, "2019-12-12");
+    assert.equal(BookmarkController.lastCustomReminderTime, "08:00");
+  }
+);
+
+QUnit.test(
+  "loadLastUsedCustomReminderDatetime does not fills the custom reminder date + time if the datetime in localStorage is < now",
+  function(assert) {
+    mockMomentTz("2019-12-11T08:00:00");
+    localStorage.lastCustomBookmarkReminderDate = "2019-12-11";
+    localStorage.lastCustomBookmarkReminderTime = "07:00";
+
+    BookmarkController.loadLastUsedCustomReminderDatetime();
+
+    assert.equal(BookmarkController.lastCustomReminderDate, null);
+    assert.equal(BookmarkController.lastCustomReminderTime, null);
+  }
+);

From f861345888ba2939114ac6c4369c3aa04f208043 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 16 Mar 2020 14:11:11 +0530
Subject: [PATCH 0233/1830] FIX: check for existence of post before creating
 notification

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

diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index ea1b810590..ae560ec2fd 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -280,7 +280,7 @@ class PostAlerter
 
     DiscourseEvent.trigger(:before_create_notification, user, type, post, opts)
 
-    return if user.blank? || user.bot?
+    return if user.blank? || user.bot? || post.blank?
     return if (topic = post.topic).blank?
 
     is_liked = type == Notification.types[:liked]

From 0c71f7bbd1cd83aa841908ab7912ad3812c03529 Mon Sep 17 00:00:00 2001
From: Rishabh <rishabh.nambiar@discourse.org>
Date: Mon, 16 Mar 2020 16:08:58 +0530
Subject: [PATCH 0234/1830] UX: Improve suspect user copy on /review

---
 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 ab280dab92..d034819d16 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -4700,7 +4700,7 @@ en:
       invite_only: "All new users should be invited. See `invite_only`."
       email_auth_res_enqueue: "This email failed a DMARC check, it most likely isn't from whom it seems to be from. Check the raw email headers for more information."
       email_spam: "This email was flagged as spam by the header defined in `email_in_spam_header`."
-      suspect_user: "This user has a bio/website in their profile, without having read any posts. This can indicate a spam account. See `approve_suspect_users`."
+      suspect_user: "This new user entered profile information without reading any topics or posts, which strongly suggests they may be a spammer. See `approve_suspect_users`."
 
     actions:
       agree:

From ef40b46611a01c4d5a4ae558530a2e0e8008e1e5 Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Mon, 16 Mar 2020 17:42:04 +0530
Subject: [PATCH 0235/1830] DEV: fix "addNavigationBarItem" documentation
 (#9207)

* the filter should return the boolean result
* custom href should return the relative url value
---
 app/assets/javascripts/discourse/lib/plugin-api.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js b/app/assets/javascripts/discourse/lib/plugin-api.js
index cdaaad0263..9439b16319 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js
@@ -755,8 +755,8 @@ class PluginApi {
    *   displayName: "bugs"
    *   href: "/c/bugs",
    *   init: (navItem, category) => { if (category) { navItem.set("category", category)  } }
-   *   customFilter: (category, args, router) => { category && category.name !== 'bug' }
-   *   customHref: (category, args, router) => {  if (category && category.name) === 'not-a-bug') "/a-feature"; },
+   *   customFilter: (category, args, router) => { return category && category.name !== 'bug' }
+   *   customHref: (category, args, router) => {  if (category && category.name) === 'not-a-bug') return "/a-feature"; },
    *   before: "top",
    *   forceActive(category, args, router) => router.currentURL === "/a/b/c/d";
    * })

From 81ba516741c66a9cf815830ca4dc9a23ce345c9b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 13:17:41 +0100
Subject: [PATCH 0236/1830] Build(deps): Bump rubyzip from 2.2.0 to 2.3.0
 (#9208)

Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 2.2.0 to 2.3.0.
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v2.2.0...v2.3.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 60177e792d..87730c3538 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -354,7 +354,7 @@ GEM
     ruby-readability (0.7.0)
       guess_html_encoding (>= 0.0.4)
       nokogiri (>= 1.6.0)
-    rubyzip (2.2.0)
+    rubyzip (2.3.0)
     safe_yaml (1.0.5)
     sanitize (5.1.0)
       crass (~> 1.0.2)

From aad43a6223d5e819cc95e651c0e68a88511ed191 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 13:18:07 +0100
Subject: [PATCH 0237/1830] Build(deps-dev): Bump parallel_tests from 2.31.0 to
 2.32.0 (#9210)

Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.31.0 to 2.32.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.31.0...v2.32.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 87730c3538..0022fe8319 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -250,7 +250,7 @@ GEM
     openssl-signature_algorithm (0.3.0)
     optimist (3.0.0)
     parallel (1.19.1)
-    parallel_tests (2.31.0)
+    parallel_tests (2.32.0)
       parallel
     parser (2.7.0.4)
       ast (~> 2.4.0)

From 5e4cf244a581eb8cda95af1d2b9e310e59119dd4 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Mon, 16 Mar 2020 14:25:45 +0200
Subject: [PATCH 0239/1830] FIX: Show time input in poll builder (#9128)

---
 .../discourse/templates/modal/poll-ui-builder.hbs           | 3 +++
 plugins/poll/assets/stylesheets/common/poll.scss            | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
index e04aebbd8a..28e9f7c8e4 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
@@ -101,6 +101,9 @@
         <div class="input-group poll-date">
           {{date-picker-future value=date containerId="date-container"}}
           {{input type="time" value=time}}
+        </div>
+
+        <div class="input-group poll-date">
           <div id="date-container"></div>
         </div>
       {{/if}}
diff --git a/plugins/poll/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss
index 8306f7bfcf..c683684c9e 100644
--- a/plugins/poll/assets/stylesheets/common/poll.scss
+++ b/plugins/poll/assets/stylesheets/common/poll.scss
@@ -200,3 +200,9 @@ body.crawler {
     }
   }
 }
+
+.poll-ui-builder {
+  .poll-date input {
+    height: 30px;
+  }
+}

From fb8b0ca1973ea6de0ad5fd89adef806090da637b Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 16 Mar 2020 12:37:43 +0000
Subject: [PATCH 0240/1830] DEV: Remove unused middleware (#9203)

This has not been used since January 2014, per 166a8d29
---
 config/initializers/050-force_https.rb | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 config/initializers/050-force_https.rb

diff --git a/config/initializers/050-force_https.rb b/config/initializers/050-force_https.rb
deleted file mode 100644
index a3bdb5d3b2..0000000000
--- a/config/initializers/050-force_https.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-# tiny middleware to force https if needed
-class Discourse::ForceHttpsMiddleware
-
-  def initialize(app, config = {})
-    @app = app
-  end
-
-  def call(env)
-    env['rack.url_scheme'] = 'https' if SiteSetting.force_https
-    @app.call(env)
-  end
-
-end

From ce50695bff8d908e746ab0ec0bebbdf392ece530 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 16 Mar 2020 12:42:23 +0000
Subject: [PATCH 0241/1830] DEV: Bump OAuth2 from 1.4.2 to 1.4.4

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0022fe8319..98ed5e231e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -209,7 +209,7 @@ GEM
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)
     oauth (0.5.4)
-    oauth2 (1.4.2)
+    oauth2 (1.4.4)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
@@ -547,4 +547,4 @@ DEPENDENCIES
   yaml-lint
 
 BUNDLED WITH
-   2.1.1
+   2.1.4

From c02273eb8bd0ba94623f90309c442fe2a25bd5dc Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Mon, 16 Mar 2020 09:51:28 -0300
Subject: [PATCH 0242/1830] FIX: Use delete_all_posts_max to improve
 consistency when using the delete button from the admin view (#9194)

---
 app/assets/javascripts/admin/controllers/admin-user-index.js | 3 ++-
 app/assets/javascripts/discourse/models/user.js              | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js b/app/assets/javascripts/admin/controllers/admin-user-index.js
index 0460c314c7..7bd7abe341 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js
@@ -199,7 +199,8 @@ export default Controller.extend(CanCheckEmails, {
 
     destroy() {
       const postCount = this.get("model.post_count");
-      if (postCount <= 5) {
+      const maxPostCount = this.siteSettings.delete_all_posts_max;
+      if (postCount <= maxPostCount) {
         return this.model.destroy({ deletePosts: true });
       } else {
         return this.model.destroy();
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index a7d9ce8b29..421376609a 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -45,7 +45,8 @@ const User = RestModel.extend({
 
   @discourseComputed("can_be_deleted", "post_count")
   canBeDeleted(canBeDeleted, postCount) {
-    return canBeDeleted && postCount <= 5;
+    const maxPostCount = Discourse.SiteSettings.delete_all_posts_max;
+    return canBeDeleted && postCount <= maxPostCount;
   },
 
   @discourseComputed()

From 4663304775ff7f288935344b9265d21bdb2fc8cb Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Mon, 16 Mar 2020 09:52:08 -0300
Subject: [PATCH 0243/1830] FEATURE: Show rejected posts count in user summary
 (#9204)

---
 .../javascripts/discourse/templates/user.hbs  |  8 ++
 app/controllers/users_controller.rb           |  5 +-
 app/models/user.rb                            |  8 ++
 config/locales/client.en.yml                  |  1 +
 spec/models/user_spec.rb                      | 73 ++++++++++++-------
 5 files changed, 66 insertions(+), 29 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 290b791961..101e25d6c8 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -16,6 +16,14 @@
             {{/link-to}}
           </div>
         {{/if}}
+        {{#if model.number_of_rejected_posts}}
+          <div>
+            {{#link-to 'review' (query-params username=model.username status='rejected' type='ReviewableQueuedPost')}}
+              <span class="flagged-posts">{{model.number_of_rejected_posts}}</span>{{i18n 'user.staff_counters.rejected_posts'}}
+            {{/link-to}}
+          </div>
+        {{/if}}
+        
         {{#if model.number_of_deleted_posts}}
           <div>
             {{#link-to 'user.deletedPosts' model}}
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6acf7651eb..d3289b9d67 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1116,7 +1116,10 @@ class UsersController < ApplicationController
 
     result = {}
 
-    %W{number_of_deleted_posts number_of_flagged_posts number_of_flags_given number_of_suspensions warnings_received_count}.each do |info|
+    %W{
+      number_of_deleted_posts number_of_flagged_posts number_of_flags_given
+      number_of_suspensions warnings_received_count number_of_rejected_posts
+    }.each do |info|
       result[info] = @user.public_send(info)
     end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 4b0437261c..3ddc498bc3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1125,6 +1125,14 @@ class User < ActiveRecord::Base
       .count
   end
 
+  def number_of_rejected_posts
+    Post.with_deleted
+      .where(user_id: self.id)
+      .joins('INNER JOIN reviewables r ON posts.id = r.target_id')
+      .where(r: { status: Reviewable.statuses[:rejected], type: ReviewableQueuedPost.name })
+      .count
+  end
+
   def number_of_flags_given
     PostAction.where(user_id: self.id)
       .where(disagreed_at: nil)
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 2fa6a8879f..9ab7d5c5d7 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -947,6 +947,7 @@ en:
         deleted_posts: "deleted posts"
         suspensions: "suspensions"
         warnings_received: "warnings"
+        rejected_posts: "rejected posts"
 
       messages:
         all: "All"
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 3e62fd0588..1e3998db7d 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1522,48 +1522,65 @@ describe User do
     end
   end
 
-  describe "number_of_flags_given" do
-
+  describe 'staff info' do
     fab!(:user) { Fabricate(:user) }
-    fab!(:moderator) { Fabricate(:moderator) }
 
-    it "doesn't count disagreed flags" do
-      post_agreed = Fabricate(:post)
-      PostActionCreator.inappropriate(user, post_agreed).reviewable.perform(moderator, :agree_and_keep)
+    describe "#number_of_flags_given" do
+      fab!(:moderator) { Fabricate(:moderator) }
 
-      post_deferred = Fabricate(:post)
-      PostActionCreator.inappropriate(user, post_deferred).reviewable.perform(moderator, :ignore)
+      it "doesn't count disagreed flags" do
+        post_agreed = Fabricate(:post)
+        PostActionCreator.inappropriate(user, post_agreed).reviewable.perform(moderator, :agree_and_keep)
 
-      post_disagreed = Fabricate(:post)
-      PostActionCreator.inappropriate(user, post_disagreed).reviewable.perform(moderator, :disagree)
+        post_deferred = Fabricate(:post)
+        PostActionCreator.inappropriate(user, post_deferred).reviewable.perform(moderator, :ignore)
 
-      expect(user.number_of_flags_given).to eq(2)
+        post_disagreed = Fabricate(:post)
+        PostActionCreator.inappropriate(user, post_disagreed).reviewable.perform(moderator, :disagree)
+
+        expect(user.number_of_flags_given).to eq(2)
+      end
     end
 
-  end
+    describe "number_of_deleted_posts" do
+      fab!(:moderator) { Fabricate(:moderator) }
 
-  describe "number_of_deleted_posts" do
+      it "counts all the posts" do
+        # at least 1 "unchanged" post
+        Fabricate(:post, user: user)
 
-    fab!(:user) { Fabricate(:user, id: 2) }
-    fab!(:moderator) { Fabricate(:moderator) }
+        post_deleted_by_moderator = Fabricate(:post, user: user)
+        PostDestroyer.new(moderator, post_deleted_by_moderator).destroy
 
-    it "counts all the posts" do
-      # at least 1 "unchanged" post
-      Fabricate(:post, user: user)
+        post_deleted_by_user = Fabricate(:post, user: user, post_number: 2)
+        PostDestroyer.new(user, post_deleted_by_user).destroy
 
-      post_deleted_by_moderator = Fabricate(:post, user: user)
-      PostDestroyer.new(moderator, post_deleted_by_moderator).destroy
+        # fake stub deletion
+        post_deleted_by_user.update_columns(updated_at: 2.days.ago)
+        PostDestroyer.destroy_stubs
 
-      post_deleted_by_user = Fabricate(:post, user: user, post_number: 2)
-      PostDestroyer.new(user, post_deleted_by_user).destroy
-
-      # fake stub deletion
-      post_deleted_by_user.update_columns(updated_at: 2.days.ago)
-      PostDestroyer.destroy_stubs
-
-      expect(user.number_of_deleted_posts).to eq(2)
+        expect(user.number_of_deleted_posts).to eq(2)
+      end
     end
 
+    describe '#number_of_rejected_posts' do
+      it 'counts rejected posts' do
+        post = Fabricate(:post, user: user)
+
+        Fabricate(:reviewable_queued_post, target: post, status: Reviewable.statuses[:rejected])
+
+        expect(user.number_of_rejected_posts).to eq(1)
+      end
+
+      it 'ignore non-rejected posts' do
+        post = Fabricate(:post, user: user)
+
+        Fabricate(:reviewable_queued_post, target: post, status: Reviewable.statuses[:approved])
+
+        expect(user.number_of_rejected_posts).to eq(0)
+
+      end
+    end
   end
 
   describe "new_user?" do

From 610261f48e2cbe7c95bbfea47c804f5ed8bed8af Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 16 Mar 2020 13:12:10 +0000
Subject: [PATCH 0244/1830] DEV: Bump omniauth from 1.9.0 to 1.9.1

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 98ed5e231e..dc6acaa931 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -216,8 +216,8 @@ GEM
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     oj (3.10.5)
-    omniauth (1.9.0)
-      hashie (>= 3.4.6, < 3.7.0)
+    omniauth (1.9.1)
+      hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
     omniauth-facebook (6.0.0)
       omniauth-oauth2 (~> 1.2)

From 269ec70ba8d5997c7b6a49f97cafc774e4dcf9d2 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Mon, 16 Mar 2020 12:05:24 -0600
Subject: [PATCH 0245/1830] DEV: Only show deprecation message for
 non-whitelisted requests

As another step toward fully dreprecating query parameter authentication
in API requests this change prevents an admin dashboard message from
showing up if using a whitelisted route like rss feeds or the
mail-receiver route.
---
 lib/auth/default_current_user_provider.rb | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index caee9ac1cf..e56e4cfa23 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -295,10 +295,7 @@ class Auth::DefaultCurrentUserProvider
 
       # Check for deprecated api auth
       if !header_api_key?
-        if request.path == "/admin/email/handle_mail"
-          # Notify admins that the mail receiver is still using query auth and to update
-          AdminDashboardData.add_problem_message('dashboard.update_mail_receiver', 1.day)
-        else
+        unless is_whitelisted_query_param_auth_route?(request)
           # Notify admins of deprecated auth method
           AdminDashboardData.add_problem_message('dashboard.deprecated_api_usage', 1.day)
         end
@@ -330,6 +327,19 @@ class Auth::DefaultCurrentUserProvider
 
   private
 
+  def is_whitelisted_query_param_auth_route?(request)
+    (is_rss_feed?(request) || is_handle_mail?(request))
+  end
+
+  def is_rss_feed?(request)
+    return true if request.path.match?(/\/(c|t){1}\/\S*.(rss|json)/) && request.get? # topic or category route
+    return true if request.path.match?(/\/(latest|top|categories).(rss|json)/) && request.get? # specific routes with rss
+  end
+
+  def is_handle_mail?(request)
+    return true if request.path == "/admin/email/handle_mail" && request.post?
+  end
+
   def header_api_key?
     !!@env[HEADER_API_KEY]
   end

From e50abe1317e019fd99172167e7aff0df3a747455 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Mon, 16 Mar 2020 15:32:38 -0300
Subject: [PATCH 0246/1830] FIX: sync-alt is used on composer draft indicator

---
 lib/svg_sprite/svg_sprite.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index 8751f114dc..a1f1c12822 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -173,6 +173,7 @@ module SvgSprite
     "step-backward",
     "step-forward",
     "stream",
+    "sync-alt",
     "sync",
     "table",
     "tag",

From 16799da580a925b334eb623d8f0e0b96e8175dc7 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 17 Mar 2020 15:15:22 +1000
Subject: [PATCH 0247/1830] FIX: Improve bookmark modal on mobile and bookmark
 sync rake task (#9221)

* Improve the bookmark mobile on modal so it doesn't go all the way to the edge and the custom datetime input is easier to use
* Improve the rake task for syncing so it does not error for topics that no longer exist and batches 2000 inserts at a time, clearing the array each time
---
 .../discourse/templates/modal/bookmark.hbs    |  4 +--
 .../common/components/bookmark-modal.scss     | 26 ++++++++++++++++++
 lib/tasks/bookmarks.rake                      | 27 ++++++++++---------
 spec/tasks/bookmarks_spec.rb                  | 11 ++++++++
 4 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 192e10fc2f..2fa0345732 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -38,14 +38,14 @@
           {{tap-tile icon="ban" text=(I18n "bookmarks.reminders.none") tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
         {{/tap-tile-grid}}
         {{#if customDateTimeSelected}}
-          <div class="control-group">
+          <div class="control-group custom-date-time-wrap">
             {{d-icon "calendar-alt"}}
             {{date-picker-future
               value=customReminderDate
               onSelect=(action (mut customReminderDate))
             }}
             {{d-icon "far-clock"}}
-            {{input placeholder="--:--" type="time" value=customReminderTime}}
+            {{input placeholder="--:--" type="time" class="time-input" value=customReminderTime}}
           </div>
         {{/if}}
 
diff --git a/app/assets/stylesheets/common/components/bookmark-modal.scss b/app/assets/stylesheets/common/components/bookmark-modal.scss
index 8df4d57203..daad95285a 100644
--- a/app/assets/stylesheets/common/components/bookmark-modal.scss
+++ b/app/assets/stylesheets/common/components/bookmark-modal.scss
@@ -1,7 +1,11 @@
 .bookmark-with-reminder.modal {
+  .modal-inner-container {
+    max-width: 95%;
+  }
   .modal-body {
     max-width: 410px;
     min-width: 380px;
+    box-sizing: border-box;
 
     .control-label {
       font-weight: 700;
@@ -11,4 +15,26 @@
       width: 100%;
     }
   }
+
+  .custom-date-time-wrap {
+    display: flex;
+    flex-direction: row;
+    align-items: baseline;
+
+    .svg-icon {
+      padding: 0 5px;
+    }
+
+    .date-picker-wrapper {
+      flex: 1;
+
+      .date-picker {
+        width: 100%;
+      }
+    }
+
+    .time-input {
+      flex: 1;
+    }
+  }
 }
diff --git a/lib/tasks/bookmarks.rake b/lib/tasks/bookmarks.rake
index d8f99281cc..db48125b07 100644
--- a/lib/tasks/bookmarks.rake
+++ b/lib/tasks/bookmarks.rake
@@ -17,6 +17,7 @@ task "bookmarks:sync_to_table", [:sync_limit] => :environment do |_t, args|
     .joins(:post)
     .where(deleted_at: nil)
     .joins('LEFT JOIN bookmarks ON bookmarks.post_id = post_actions.post_id AND bookmarks.user_id = post_actions.user_id')
+    .joins('INNER JOIN topics ON topics.id = posts.topic_id')
     .where('bookmarks.id IS NULL')
 
   # if sync_limit is provided as an argument this will cap
@@ -27,11 +28,13 @@ task "bookmarks:sync_to_table", [:sync_limit] => :environment do |_t, args|
   end
 
   post_action_bookmark_count = post_action_bookmarks.count('post_actions.id')
-  bookmarks_to_create = []
   i = 0
 
-  Bookmark.transaction do
-    post_action_bookmarks.find_each(batch_size: 1000) do |pab|
+  post_action_bookmarks.find_each(batch_size: 2000) do |pab|
+    # clear at start of each batch to only insert X at a time
+    bookmarks_to_create = []
+
+    Bookmark.transaction do
       RakeHelpers.print_status_with_label("Creating post new bookmarks.......", i, post_action_bookmark_count)
       now = Time.zone.now
       bookmarks_to_create << {
@@ -43,16 +46,16 @@ task "bookmarks:sync_to_table", [:sync_limit] => :environment do |_t, args|
       }
 
       i += 1
-    end
 
-    # this will ignore conflicts in the bookmarks table so
-    # if the user already has a post bookmarked in the new way,
-    # then we don't error and keep on truckin'
-    #
-    # we shouldn't have duplicates here at any rate because of
-    # the above LEFT JOIN but best to be safe knowing this
-    # won't blow up
-    Bookmark.insert_all(bookmarks_to_create)
+      # this will ignore conflicts in the bookmarks table so
+      # if the user already has a post bookmarked in the new way,
+      # then we don't error and keep on truckin'
+      #
+      # we shouldn't have duplicates here at any rate because of
+      # the above LEFT JOIN but best to be safe knowing this
+      # won't blow up
+      Bookmark.insert_all(bookmarks_to_create)
+    end
   end
 
   RakeHelpers.print_status_with_label("Bookmark creation complete!            ", i, post_action_bookmark_count)
diff --git a/spec/tasks/bookmarks_spec.rb b/spec/tasks/bookmarks_spec.rb
index 68f8588e0b..91249c59f8 100644
--- a/spec/tasks/bookmarks_spec.rb
+++ b/spec/tasks/bookmarks_spec.rb
@@ -43,6 +43,17 @@ RSpec.describe "bookmarks tasks" do
     expect(Bookmark.all.count).to eq(1)
   end
 
+  it "skips post actions where the post topic no longer exists and does not error" do
+    post1.topic.delete
+    post1.reload
+    expect { invoke_task }.not_to raise_error
+  end
+
+  it "skips post actions where the post no longer exists and does not error" do
+    post1.delete
+    expect { invoke_task }.not_to raise_error
+  end
+
   def create_post_actions_and_existing_bookmarks
     Fabricate(:post_action, user: user1, post: post1, post_action_type_id: PostActionType.types[:bookmark])
     Fabricate(:post_action, user: user2, post: post2, post_action_type_id: PostActionType.types[:bookmark])

From 949bb74add770d988b766ebd68a5431eefb032ed Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 17 Mar 2020 16:53:12 +1000
Subject: [PATCH 0248/1830] FIX: Add basePath to link for "no timezone" in
 bookmark modal

---
 app/assets/javascripts/discourse/controllers/bookmark.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 0a8ba8a063..375a9a5341 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -169,6 +169,11 @@ export default Controller.extend(ModalFunctionality, {
     );
   },
 
+  @discourseComputed()
+  basePath() {
+    return Discourse.BaseUri;
+  },
+
   @discourseComputed()
   userHasTimezoneSet() {
     return !_.isEmpty(this.userTimezone());

From 12c29ae955a0834851345cd0e8fd07439ec7dcb5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2020 09:53:44 +0000
Subject: [PATCH 0249/1830] Build(deps): Bump rbtrace from 0.4.11 to 0.4.12

Bumps [rbtrace](https://github.com/tmm1/rbtrace) from 0.4.11 to 0.4.12.
- [Release notes](https://github.com/tmm1/rbtrace/releases)
- [Commits](https://github.com/tmm1/rbtrace/compare/v0.4.11...v0.4.12)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index dc6acaa931..bc54d3f593 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -296,7 +296,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbtrace (0.4.11)
+    rbtrace (0.4.12)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)

From e72c0544b0f2e135dfa57367f983a02b127853ca Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 17 Mar 2020 11:06:17 +0000
Subject: [PATCH 0250/1830] UX: Refresh group membership list when removing
 users or changing owners

---
 app/assets/javascripts/discourse/models/group.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/group.js b/app/assets/javascripts/discourse/models/group.js
index c799f78314..43e1b525bc 100644
--- a/app/assets/javascripts/discourse/models/group.js
+++ b/app/assets/javascripts/discourse/models/group.js
@@ -103,14 +103,14 @@ const Group = RestModel.extend({
     return ajax(`/admin/groups/${this.id}/owners.json`, {
       type: "DELETE",
       data: { user_id: member.id }
-    }).then(() => this.findMembers());
+    }).then(() => this.findMembers({}, true));
   },
 
   removeMember(member, params) {
     return ajax(`/groups/${this.id}/members.json`, {
       type: "DELETE",
       data: { user_id: member.id }
-    }).then(() => this.findMembers(params));
+    }).then(() => this.findMembers(params, true));
   },
 
   addMembers(usernames, filter) {
@@ -134,7 +134,7 @@ const Group = RestModel.extend({
       if (filter) {
         this._filterMembers(response);
       } else {
-        this.findMembers();
+        this.findMembers({}, true);
       }
     });
   },

From 1b2019e7ebd4f54e6e36f17ea77b50d941c1345a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2020 14:09:45 +0300
Subject: [PATCH 0251/1830] Build(deps): Bump rack-mini-profiler from 1.1.6 to
 2.0.1 (#9222)

* Build(deps): Bump rack-mini-profiler from 1.1.6 to 2.0.1

Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 1.1.6 to 2.0.1.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.1.6...v2.0.1)

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

* Enable rails patches

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: OsamaSayegh <asooomaasoooma90@gmail.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 278e0fb961..73f97c0533 100644
--- a/Gemfile
+++ b/Gemfile
@@ -205,7 +205,7 @@ gem 'htmlentities', require: false
 #  we are open to it. by deferring require to the initializer we can configure discourse installs without it
 
 gem 'flamegraph', require: false
-gem 'rack-mini-profiler', require: false
+gem 'rack-mini-profiler', require: ['enable_rails_patches']
 
 gem 'unicorn', require: false, platform: :mri
 gem 'puma', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index bc54d3f593..4a682471dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -268,7 +268,7 @@ GEM
       nio4r (~> 2.0)
     r2 (0.2.7)
     rack (2.0.8)
-    rack-mini-profiler (1.1.6)
+    rack-mini-profiler (2.0.1)
       rack (>= 1.2.0)
     rack-protection (2.0.8.1)
       rack

From 43b38dbbc2eea1dcd21e1605bba431574421e92f Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Tue, 17 Mar 2020 17:48:12 +0200
Subject: [PATCH 0252/1830] FIX: Dismiss notifications on middle click (#9098)

---
 .../widgets/default-notification-item.js      | 12 +++++
 .../default-notification-item-test.js.es6     | 53 +++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 test/javascripts/widgets/default-notification-item-test.js.es6

diff --git a/app/assets/javascripts/discourse/widgets/default-notification-item.js b/app/assets/javascripts/discourse/widgets/default-notification-item.js
index 49d70e086e..da741f45aa 100644
--- a/app/assets/javascripts/discourse/widgets/default-notification-item.js
+++ b/app/assets/javascripts/discourse/widgets/default-notification-item.js
@@ -13,6 +13,7 @@ import {
 import { setTransientHeader } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
 import { iconNode } from "discourse-common/lib/icon-library";
+import { ajax } from "discourse/lib/ajax";
 
 export const DefaultNotificationItem = createWidget(
   "default-notification-item",
@@ -154,6 +155,17 @@ export const DefaultNotificationItem = createWidget(
           );
         }
       });
+    },
+
+    mouseUp(event) {
+      // dismiss notification on middle click
+      if (event.which === 2 && !this.attrs.read) {
+        this.attrs.set("read", true);
+        ajax("/notifications/mark-read", {
+          method: "PUT",
+          data: this.attrs.id
+        });
+      }
     }
   }
 );
diff --git a/test/javascripts/widgets/default-notification-item-test.js.es6 b/test/javascripts/widgets/default-notification-item-test.js.es6
new file mode 100644
index 0000000000..b701407243
--- /dev/null
+++ b/test/javascripts/widgets/default-notification-item-test.js.es6
@@ -0,0 +1,53 @@
+import EmberObject from "@ember/object";
+import pretender from "helpers/create-pretender";
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
+
+moduleForWidget("default-notification-item");
+
+widgetTest("sets notification as read on middle click", {
+  template: '{{mount-widget widget="default-notification-item" args=args}}',
+  beforeEach() {
+    this.set(
+      "args",
+      EmberObject.create({
+        id: 3,
+        user_id: 1,
+        notification_type: 6,
+        read: false,
+        created_at: "2020-01-01T12:00:00.000Z",
+        post_number: 1,
+        topic_id: 10,
+        fancy_title: "Greetings!",
+        slug: "greetings",
+        data: {
+          topic_title: "Greetings!",
+          original_post_id: 14,
+          original_post_type: 1,
+          original_username: "discobot",
+          revision_number: null,
+          display_username: "discobot"
+        }
+      })
+    );
+  },
+  async test(assert) {
+    let requests = 0;
+    pretender.put("/notifications/mark-read", () => {
+      ++requests;
+      return [200, { "Content-Type": "application/json" }, { success: true }];
+    });
+
+    assert.equal(find("li.read").length, 0);
+
+    await $(document).trigger(
+      $.Event("mouseup", {
+        target: find("li")[0],
+        button: 1,
+        which: 2
+      })
+    );
+
+    assert.equal(find("li.read").length, 1);
+    assert.equal(requests, 1);
+  }
+});

From e950471c0f779ce86453b8a87d4925e0e8db996b Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 17 Mar 2020 16:48:24 +0100
Subject: [PATCH 0253/1830] DEV: Replace User.unstage and User#unstage API with
 User#unstage! (#8906)

* DEV: Replace User.unstage and User#unstage API with User#unstage!

Quoting @SamSaffron:

> User.unstage mixes concerns of both unstaging users and updating params which is fragile/surprising.
> u.unstage destroys notifications and raises a user_unstaged event prior to the user becoming unstaged and the user object being saved.

User#unstage! no longer updates user attributes and saves the object before triggering the `user_unstaged` event.

* Update one more spec

* Assign attributes after unstaging
---
 .../users/omniauth_callbacks_controller.rb    |  3 +-
 app/controllers/users_controller.rb           | 12 +++++--
 app/models/discourse_single_sign_on.rb        |  3 +-
 app/models/invite_redeemer.rb                 | 13 +++----
 app/models/user.rb                            | 21 +++++------
 lib/auth/default_current_user_provider.rb     |  9 +----
 spec/models/group_spec.rb                     |  3 +-
 spec/models/post_spec.rb                      |  4 +--
 spec/models/user_spec.rb                      | 35 ++++++-------------
 9 files changed, 41 insertions(+), 62 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 36548585f3..881fb3e9ec 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -113,8 +113,7 @@ class Users::OmniauthCallbacksController < ApplicationController
 
     # automatically activate/unstage any account if a provider marked the email valid
     if @auth_result.email_valid && @auth_result.email == user.email
-      user.unstage
-      user.save
+      user.unstage!
 
       if !user.active || !user.email_confirmed?
         user.update!(password: SecureRandom.hex)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d3289b9d67..fde828aee6 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -436,8 +436,16 @@ class UsersController < ApplicationController
     params[:locale] ||= I18n.locale unless current_user
 
     new_user_params = user_params.except(:timezone)
-    user = User.unstage(new_user_params)
-    user = User.new(new_user_params) if user.nil?
+
+    user = User.where(staged: true).with_email(new_user_params[:email].strip.downcase).first
+
+    if user
+      user.active = false
+      user.unstage!
+    end
+
+    user ||= User.new
+    user.attributes = new_user_params
 
     # Handle API approval
     ReviewableUser.set_approved_fields!(user, current_user) if user.approved?
diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index 9d72a9cc98..bc0916078f 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -74,8 +74,7 @@ class DiscourseSingleSignOn < SingleSignOn
     end
 
     # ensure it's not staged anymore
-    user.unstage
-    user.save
+    user.unstage!
 
     change_external_attributes_and_override(sso_record, user)
 
diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index f3eb839cdc..68a415d274 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -15,26 +15,27 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
 
   # extracted from User cause it is very specific to invites
   def self.create_user_from_invite(invite, username, name, password = nil, user_custom_fields = nil, ip_address = nil)
+    user = User.where(staged: true).with_email(invite.email.strip.downcase).first
+    user.unstage! if user
+
+    user ||= User.new
+
     if username && UsernameValidator.new(username).valid_format? && User.username_available?(username)
       available_username = username
     else
       available_username = UserNameSuggester.suggest(invite.email)
     end
-    available_name = name || available_username
 
-    user_params = {
+    user.attributes = {
       email: invite.email,
       username: available_username,
-      name: available_name,
+      name: name || available_username,
       active: false,
       trust_level: SiteSetting.default_invitee_trust_level,
       ip_address: ip_address,
       registration_ip_address: ip_address
     }
 
-    user = User.unstage(user_params)
-    user = User.new(user_params) if user.nil?
-
     if !SiteSetting.must_approve_users? || (SiteSetting.must_approve_users? && invite.invited_by.staff?)
       ReviewableUser.set_approved_fields!(user, invite.invited_by)
     end
diff --git a/app/models/user.rb b/app/models/user.rb
index 3ddc498bc3..3993d4ea79 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -363,24 +363,19 @@ class User < ActiveRecord::Base
     user
   end
 
-  def unstage
+  def unstage!
     if self.staged
-      self.staged = false
-      self.custom_fields[FROM_STAGED] = true
-      self.notifications.destroy_all
+      ActiveRecord::Base.transaction do
+        self.staged = false
+        self.custom_fields[FROM_STAGED] = true
+        self.notifications.destroy_all
+        save!
+      end
+
       DiscourseEvent.trigger(:user_unstaged, self)
     end
   end
 
-  def self.unstage(params)
-    if user = User.where(staged: true).with_email(params[:email].strip.downcase).first
-      params.each { |k, v| user.public_send("#{k}=", v) }
-      user.active = false
-      user.unstage
-    end
-    user
-  end
-
   def self.suggest_name(string)
     return "" if string.blank?
     (string[/\A[^@]+/].presence || string[/[^@]+\z/]).tr(".", " ").titleize
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index e56e4cfa23..ca8ec4d197 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -167,7 +167,7 @@ class Auth::DefaultCurrentUserProvider
       impersonate: opts[:impersonate])
 
     cookies[TOKEN_COOKIE] = cookie_hash(@user_token.unhashed_auth_token)
-    unstage_user(user)
+    user.unstage!
     make_developer_admin(user)
     enable_bootstrap_mode(user)
 
@@ -191,13 +191,6 @@ class Auth::DefaultCurrentUserProvider
     hash
   end
 
-  def unstage_user(user)
-    if user.staged
-      user.unstage
-      user.save
-    end
-  end
-
   def make_developer_admin(user)
     if  user.active? &&
         !user.admin &&
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index d215a89458..96e7f27757 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -232,8 +232,7 @@ describe Group do
 
       expect(GroupUser.where(user_id: staged.id).count).to eq(0)
 
-      staged.unstage
-      staged.save!
+      staged.unstage!
 
       expect(GroupUser.where(user_id: staged.id).count).to eq(2)
     end
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index b09245460b..903f5c10b0 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1123,7 +1123,7 @@ describe Post do
       SiteSetting.newuser_max_links = 3
       user = Fabricate(:user, staged: true, trust_level: 0)
       user.created_at = 1.hour.ago
-      user.unstage
+      user.unstage!
       post = Fabricate(:post, raw: raw, user: user)
       expect(post.has_host_spam?).to eq(true)
     end
@@ -1133,7 +1133,7 @@ describe Post do
       SiteSetting.newuser_max_links = 3
       user = Fabricate(:user, staged: true, trust_level: 0)
       user.created_at = 2.days.ago
-      user.unstage
+      user.unstage!
       post = Fabricate(:post, raw: raw, user: user)
       expect(post.has_host_spam?).to eq(false)
     end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 1e3998db7d..995a532290 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1840,44 +1840,29 @@ describe User do
     end
   end
 
-  describe "#unstage" do
-    let!(:staged_user) { Fabricate(:staged, email: 'staged@account.com', active: true, username: 'staged1', name: 'Stage Name') }
-    let(:params) { { email: 'staged@account.com', active: true, username: 'unstaged1', name: 'Foo Bar' } }
+  describe "#unstage!" do
+    let!(:user) { Fabricate(:staged, email: 'staged@account.com', active: true, username: 'staged1', name: 'Stage Name') }
 
     it "correctly unstages a user" do
-      user = User.unstage(params)
-
-      expect(user.id).to eq(staged_user.id)
-      expect(user.username).to eq('unstaged1')
-      expect(user.name).to eq('Foo Bar')
-      expect(user.active).to eq(false)
-      expect(user.email).to eq('staged@account.com')
+      user.unstage!
       expect(user.staged).to eq(false)
     end
 
-    it "returns nil when the user cannot be unstaged" do
-      Fabricate(:coding_horror)
-      expect(User.unstage(email: 'jeff@somewhere.com')).to be_nil
-      expect(User.unstage(email: 'no@account.com')).to be_nil
-    end
-
     it "removes all previous notifications during unstaging" do
-      Fabricate(:notification, user: staged_user)
-      Fabricate(:private_message_notification, user: staged_user)
-      staged_user.reload
+      Fabricate(:notification, user: user)
+      Fabricate(:private_message_notification, user: user)
+      expect(user.total_unread_notifications).to eq(2)
 
-      expect(staged_user.total_unread_notifications).to eq(2)
-      user = User.unstage(params)
+      user.unstage!
+      user.reload
       expect(user.total_unread_notifications).to eq(0)
       expect(user.staged).to eq(false)
     end
 
     it "triggers an event" do
-      unstaged_user = nil
-      event = DiscourseEvent.track_events { unstaged_user = User.unstage(params) }.first
-
+      event = DiscourseEvent.track_events { user.unstage! }.first
       expect(event[:event_name]).to eq(:user_unstaged)
-      expect(event[:params].first).to eq(unstaged_user)
+      expect(event[:params].first).to eq(user)
     end
   end
 

From 919e405c4832c5901a616953e1df947717c37743 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Tue, 17 Mar 2020 10:39:24 -0600
Subject: [PATCH 0254/1830] FIX: Don't display webhooks for inactive plugins
 (#9206)

* FIX: Don't display webhooks for inactive plugins

This commit ensures that we don't show webhooks for plugins that are not
installed or that are disabled.

Bug report:

https://meta.discourse.org/t/webhookeventtype-and-the-solved-and-assign-plugins/144180

* rename to just 'active', it's cleaner
---
 app/controllers/admin/web_hooks_controller.rb |  2 +-
 app/models/web_hook_event_type.rb             |  9 +++++++++
 spec/models/web_hook_spec.rb                  | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/web_hooks_controller.rb b/app/controllers/admin/web_hooks_controller.rb
index f5aa0c979c..084af1d085 100644
--- a/app/controllers/admin/web_hooks_controller.rb
+++ b/app/controllers/admin/web_hooks_controller.rb
@@ -16,7 +16,7 @@ class Admin::WebHooksController < Admin::AdminController
     json = {
       web_hooks: serialize_data(web_hooks, AdminWebHookSerializer),
       extras: {
-        event_types: WebHookEventType.all,
+        event_types: WebHookEventType.active,
         default_event_types: WebHook.default_event_types,
         content_types: WebHook.content_types.map { |name, id| { id: id, name: name } },
         delivery_statuses: WebHook.last_delivery_statuses.map { |name, id| { id: id, name: name.to_s } },
diff --git a/app/models/web_hook_event_type.rb b/app/models/web_hook_event_type.rb
index c40c7a21a9..d3822d1ede 100644
--- a/app/models/web_hook_event_type.rb
+++ b/app/models/web_hook_event_type.rb
@@ -19,6 +19,15 @@ class WebHookEventType < ActiveRecord::Base
   default_scope { order('id ASC') }
 
   validates :name, presence: true, uniqueness: true
+
+  def self.active
+    ids_to_exclude = []
+    ids_to_exclude << SOLVED unless defined?(SiteSetting.solved_enabled) && SiteSetting.solved_enabled
+    ids_to_exclude << ASSIGN unless defined?(SiteSetting.assign_enabled) && SiteSetting.assign_enabled
+
+    self.where.not(id: ids_to_exclude)
+  end
+
 end
 
 # == Schema Information
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index 8b0fbb0e52..47b4c20bb7 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -44,6 +44,22 @@ describe WebHook do
       expect(post_hook.payload_url).to eq("https://example.com")
     end
 
+    it "excludes disabled plugin web_hooks" do
+      web_hook_event_types = WebHookEventType.active.find_by(name: 'solved')
+      expect(web_hook_event_types).to eq(nil)
+    end
+
+    it "includes non-plugin web_hooks" do
+      web_hook_event_types = WebHookEventType.active.where(name: 'topic')
+      expect(web_hook_event_types.count).to eq(1)
+    end
+
+    it "includes enabled plugin web_hooks" do
+      SiteSetting.stubs(:solved_enabled).returns(true)
+      web_hook_event_types = WebHookEventType.active.where(name: 'solved')
+      expect(web_hook_event_types.count).to eq(1)
+    end
+
     describe '#active_web_hooks' do
       it "returns unique hooks" do
         post_hook.web_hook_event_types << WebHookEventType.find_by(name: 'topic')

From 8e6be1c3534d6aa67f3864bbfe8690f9de033b40 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Tue, 17 Mar 2020 11:19:26 -0700
Subject: [PATCH 0255/1830] FIX: consistency to show mute/ignore menu in user
 profile

Show the mute/ignore menu for another user even when the current user
cannot message them.
---
 app/assets/javascripts/discourse/templates/user.hbs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 101e25d6c8..10881bb35b 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -58,15 +58,15 @@
                     icon="envelope"
                     label="user.private_message"}}
                 </li>
-                {{#if canMuteOrIgnoreUser}}
-                  <li>
-                    {{user-notifications-dropdown
+              {{/if}}
+              {{#if canMuteOrIgnoreUser}}
+                <li>
+                  {{user-notifications-dropdown
                       user=model
                       value=userNotificationLevel
                       updateNotificationLevel=(action "updateNotificationLevel")
-                    }}
-                  </li>
-                {{/if}}
+                  }}
+                </li>
               {{/if}}
               {{#if currentUser.staff}}
                 <li><a href={{model.adminPath}} class="btn btn-default">{{d-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}</a></li>

From 92e9fa70c71eba9192b4530ca2bdaeeaa9094b5f Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 17 Mar 2020 18:46:17 +0000
Subject: [PATCH 0256/1830] DEV: Add class to backup restore buttons, for
 easier targeting

---
 app/assets/javascripts/admin/templates/backups-index.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/templates/backups-index.hbs b/app/assets/javascripts/admin/templates/backups-index.hbs
index 7f0675e5a5..9bfbfc2181 100644
--- a/app/assets/javascripts/admin/templates/backups-index.hbs
+++ b/app/assets/javascripts/admin/templates/backups-index.hbs
@@ -79,7 +79,7 @@
               action=(route-action "startRestore")
               actionParam=backup
               disabled=status.restoreDisabled
-              class="btn-default"
+              class="btn-default btn-restore"
               title=restoreTitle
               label="admin.backups.operations.restore.label"}}
           {{/if}}

From 125c9966f1e6c491ed29b790ae412d1606b329ad Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2020 15:17:29 -0400
Subject: [PATCH 0257/1830] Build(deps): Bump rspec-expectations from 3.9.0 to
 3.9.1 (#9211)

Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/rspec/rspec-expectations/releases)
- [Changelog](https://github.com/rspec/rspec-expectations/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-expectations/compare/v3.9.0...v3.9.1)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 4a682471dc..5f537b181d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -320,7 +320,7 @@ GEM
       rspec-mocks (~> 3.9.0)
     rspec-core (3.9.1)
       rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-html-matchers (0.9.2)

From 9d8eabd32f3962e1f1c2f991d7dca77a122d9a12 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2020 15:30:12 -0400
Subject: [PATCH 0258/1830] Build(deps): Bump aws-partitions from 1.281.0 to
 1.283.0 (#9217)

Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.281.0 to 1.283.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 5f537b181d..5a8136df2c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,7 +45,7 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.281.0)
+    aws-partitions (1.283.0)
     aws-sdk-core (3.91.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)

From 9101227266c0d5dc07a15f017e176e00e9da262c Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Tue, 17 Mar 2020 15:33:15 -0500
Subject: [PATCH 0259/1830] FEATURE: Demote muted categories on category list
 (#9226)

---
 .../components/categories-boxes-with-topics.hbs  |  6 +++++-
 .../templates/components/categories-boxes.hbs    |  6 +++++-
 .../templates/components/categories-only.hbs     |  6 +++++-
 .../mobile/components/categories-only.hbs        |  4 +++-
 .../stylesheets/common/base/category-list.scss   |  8 ++++++++
 app/models/category_list.rb                      |  7 +++++++
 spec/models/category_list_spec.rb                | 16 ++++++++++++++++
 7 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
index 4ce13a1584..d4a40fc5a9 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
@@ -1,14 +1,16 @@
 {{#each categories as |c|}}
-  <div class='category category-box category-box-{{c.slug}}' style={{border-color c.color}}>
+  <div data-notification-level={{c.notificationLevelString}} class='category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}}' style={{border-color c.color}}>
     <div class='category-box-inner'>
       <div class='category-box-heading'>
         <a href={{c.url}}>
+          {{#unless c.isMuted}}
           {{#if c.uploaded_logo.url}}
             {{cdn-img src=c.uploaded_logo.url
                 class="logo"
                 width=c.uploaded_logo.width
                 height=c.uploaded_logo.height}}
           {{/if}}
+          {{/unless}}
 
           <h3>
             {{category-title-before category=c}}
@@ -20,6 +22,7 @@
         </a>
       </div>
 
+      {{#unless c.isMuted}}
       <div class='featured-topics'>
         {{#if c.topics}}
           <ul>
@@ -29,6 +32,7 @@
           </ul>
         {{/if}}
       </div>
+      {{/unless}}
     </div>
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index 232edea06b..b629646a56 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -1,7 +1,8 @@
 {{#each categories as |c|}}
-  <div class='category category-box category-box-{{c.slug}}' style={{border-color c.color}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}}
+  <div class='category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}}' style={{border-color c.color}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}}
    data-url={{c.url}}>
     <div class='category-box-inner'>
+      {{#unless c.isMuted}}
       <div class="category-logo">
         {{#if c.uploaded_logo.url}}
           {{cdn-img
@@ -11,6 +12,7 @@
               height=c.uploaded_logo.height}}
         {{/if}}
       </div>
+      {{/unless}}
       <div class="category-details">
         <div class='category-box-heading'>
           <a class="parent-box-link" href={{c.url}}>
@@ -23,6 +25,7 @@
           </a>
         </div>
 
+        {{#unless c.isMuted}}
         <div class='description'>
           {{text-overflow class="overflow" text=c.description_excerpt}}
         </div>
@@ -62,6 +65,7 @@
             {{/each}}
           </div>
         {{/if}}
+        {{/unless}}
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index ae71465bf0..24d02fea27 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -12,8 +12,9 @@
     <tbody aria-labelledby="categories-only-category">
       {{#each categories as |c|}}
         <tr data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} class="{{if c.description_excerpt 'has-description' 'no-description'}} {{if c.uploaded_logo.url 'has-logo' 'no-logo'}}">
-          <td class="category" style={{border-color c.color}}>
+          <td class="category {{if c.isMuted 'muted'}}" style={{border-color c.color}}>
             {{category-title-link category=c}}
+            {{#unless c.isMuted}}
             {{#if c.description_excerpt}}
               <div class="category-description">
                 {{dir-span c.description_excerpt}}
@@ -67,11 +68,13 @@
                 {{/each}}
               </div>
             {{/if}}
+            {{/unless}}
           </td>
           <td class="topics">
             <div title={{c.statTitle}}>{{html-safe c.stat}}</div>
             {{category-unread category=c tagName="div" class="unread-new"}}
           </td>
+          {{#unless c.isMuted}}
           {{#if showTopics}}
             <td class="latest">
               {{#each c.featuredTopics as |t|}}
@@ -79,6 +82,7 @@
               {{/each}}
             </td>
           {{/if}}
+          {{/unless}}
         </tr>
       {{/each}}
     </tbody>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index 0421edce8a..ac7691bd10 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -1,7 +1,7 @@
 {{#if categories}}
   <div class="category-list {{if showTopics 'with-topics'}}">
     {{#each categories as |c|}}
-      <div data-category-id={{c.id}} class='category-list-item category' style={{border-color c.color}}>
+      <div data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} class='category-list-item category {{if c.isMuted "muted"}}' style={{border-color c.color}}>
         <table class='topic-list'>
           <tbody>
             <tr>
@@ -10,6 +10,7 @@
               </th>
             </tr>
 
+            {{#unless c.isMuted}}
             {{#if c.description_excerpt}}
               <tr class="category-description">
                 <td colspan="3">
@@ -57,6 +58,7 @@
                 </td>
               </tr>
             {{/if}}
+            {{/unless}}
           </tbody>
         </table>
         <footer class="clearfix">
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index 7a2a95b8df..b7cc6432a7 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -316,3 +316,11 @@
     --max-height: 75px;
   }
 }
+
+.categories-list .category.muted {
+  font-size: $font-down-1;
+  h3,
+  .category-name {
+    color: $primary-medium;
+  }
+}
diff --git a/app/models/category_list.rb b/app/models/category_list.rb
index c50c81f62b..35dcaa7d3a 100644
--- a/app/models/category_list.rb
+++ b/app/models/category_list.rb
@@ -23,6 +23,7 @@ class CategoryList
     find_user_data
     sort_unpinned
     trim_results
+    demote_muted
 
     if preloaded_topic_custom_fields.present?
       displayable_topics = @categories.map(&:displayable_topics)
@@ -162,6 +163,12 @@ class CategoryList
     end
   end
 
+  def demote_muted
+    muted_categories = @categories.select { |category| category.notification_level == 0 }
+    @categories = @categories.reject { |category| category.notification_level == 0 }
+    @categories.concat muted_categories
+  end
+
   def trim_results
     @categories.each do |c|
       next if c.displayable_topics.blank?
diff --git a/spec/models/category_list_spec.rb b/spec/models/category_list_spec.rb
index a68433b96a..8f3784f84f 100644
--- a/spec/models/category_list_spec.rb
+++ b/spec/models/category_list_spec.rb
@@ -220,6 +220,22 @@ describe CategoryList do
         expect(category_ids_admin).to eq([public_cat2.id, public_cat.id])
       end
     end
+
+    context 'some categories are muted' do
+      let!(:cat1) { Fabricate(:category_with_definition) }
+      let!(:muted_cat) { Fabricate(:category_with_definition) }
+      let!(:cat3) { Fabricate(:category_with_definition) }
+
+      before do
+        CategoryUser.set_notification_level_for_category(user, NotificationLevels.all[:muted], muted_cat.id)
+      end
+
+      it "returns muted categories at the end of the list" do
+        category_list = CategoryList.new(Guardian.new user).categories.pluck(:id)
+
+        expect(category_list).to eq([SiteSetting.uncategorized_category_id, cat1.id, cat3.id, muted_cat.id])
+      end
+    end
   end
 
 end

From 0b2e6f43012b7b8031107682a89431055ee50241 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2020 17:22:50 -0400
Subject: [PATCH 0260/1830] Build(deps): Bump aws-partitions from 1.283.0 to
 1.284.0 (#9227)

Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.283.0 to 1.284.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 5a8136df2c..1280352e63 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,7 +45,7 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.283.0)
+    aws-partitions (1.284.0)
     aws-sdk-core (3.91.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)

From 48d690ae01e6a65c2c5ac7995b7e0b8a741599c2 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 18 Mar 2020 03:57:54 +0530
Subject: [PATCH 0261/1830] FIX: Remote themes Github link should go to custom
 branch #9184

---
 .../admin-customize-themes-show.js            | 11 +++++
 .../admin/templates/customize-themes-show.hbs |  2 +-
 app/serializers/theme_serializer.rb           |  2 +-
 .../admin-customize-themes-show-test.js.es6   | 49 +++++++++++++++++++
 4 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6

diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
index a8e25fdec9..006f1728da 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
@@ -203,6 +203,17 @@ export default Controller.extend({
     );
   },
   sourceIsHttp: match("model.remote_theme.remote_url", /^http(s)?:\/\//),
+
+  @discourseComputed(
+    "model.remote_theme.remote_url",
+    "model.remote_theme.branch"
+  )
+  remoteThemeLink(remoteThemeUrl, remoteThemeBranch) {
+    return remoteThemeBranch
+      ? `${remoteThemeUrl.replace(/\.git$/, "")}/tree/${remoteThemeBranch}`
+      : remoteThemeUrl;
+  },
+
   actions: {
     updateToLatest() {
       this.set("updatingRemote", true);
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index b4c4e9a8f4..ed4dcf0eb1 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -63,7 +63,7 @@
 
     {{#if model.remote_theme.remote_url}}
       {{#if sourceIsHttp}}
-        <a class="remote-url" href={{model.remote_theme.remote_url}}>{{i18n "admin.customize.theme.source_url"}}{{d-icon "link"}}</a>
+        <a class="remote-url" href={{remoteThemeLink}}>{{i18n "admin.customize.theme.source_url"}}{{d-icon "link"}}</a>
       {{else}}
         <div class="remote-url"><code>{{model.remote_theme.remote_url}}</code></div>
       {{/if}}
diff --git a/app/serializers/theme_serializer.rb b/app/serializers/theme_serializer.rb
index 0682f69487..7d56890454 100644
--- a/app/serializers/theme_serializer.rb
+++ b/app/serializers/theme_serializer.rb
@@ -47,7 +47,7 @@ class BasicThemeSerializer < ApplicationSerializer
 end
 
 class RemoteThemeSerializer < ApplicationSerializer
-  attributes :id, :remote_url, :remote_version, :local_version, :commits_behind,
+  attributes :id, :remote_url, :remote_version, :local_version, :commits_behind, :branch,
              :remote_updated_at, :updated_at, :github_diff_link, :last_error_text, :is_git?,
              :license_url, :about_url, :authors, :theme_version, :minimum_discourse_version, :maximum_discourse_version
 
diff --git a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
new file mode 100644
index 0000000000..10cc64279e
--- /dev/null
+++ b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
@@ -0,0 +1,49 @@
+import { mapRoutes } from "discourse/mapping-router";
+import Theme from "admin/models/theme";
+
+moduleFor("controller:admin-customize-themes-show", {
+  beforeEach() {
+    this.registry.register("router:main", mapRoutes());
+  },
+  needs: ["controller:adminUser"]
+});
+
+const repoUrl = "https://github.com/discourse/discourse-brand-header.git";
+const remoteTheme = Theme.create({
+  id: 2,
+  default: true,
+  name: "default",
+  remote_theme: {
+    remote_url: repoUrl
+  }
+});
+
+QUnit.test("can display source url for remote themes", function(assert) {
+  const controller = this.subject({
+    model: remoteTheme
+  });
+
+  assert.deepEqual(
+    controller.get("remoteThemeLink"),
+    repoUrl,
+    "returns theme's repo URL"
+  );
+});
+
+QUnit.test("can display source url for remote theme branches", function(
+  assert
+) {
+  const branchUrl =
+    "https://github.com/discourse/discourse-brand-header/tree/beta";
+  remoteTheme["remote_theme"]["branch"] = "beta";
+
+  const controller = this.subject({
+    model: remoteTheme
+  });
+
+  assert.deepEqual(
+    controller.get("remoteThemeLink"),
+    branchUrl,
+    "returns theme's repo URL to branch"
+  );
+});

From 45ce9876ccfeac0c51e5f32fb15bdcc9669204c5 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 18 Mar 2020 04:13:00 +0530
Subject: [PATCH 0262/1830] Fix the build. Remove the branch value if
 available.

48d690ae01e6a65c2c5ac7995b7e0b8a741599c2
---
 .../admin/controllers/admin-customize-themes-show-test.js.es6    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
index 10cc64279e..3e9c0f9006 100644
--- a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
+++ b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
@@ -19,6 +19,7 @@ const remoteTheme = Theme.create({
 });
 
 QUnit.test("can display source url for remote themes", function(assert) {
+  delete remoteTheme["remote_theme"]["branch"];
   const controller = this.subject({
     model: remoteTheme
   });

From e2ce12d414bcbdbab579b2261b67138057086e79 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 18 Mar 2020 11:12:23 +1000
Subject: [PATCH 0263/1830] FIX: Broken computing of userHasTimezone in
 bookmark modal and missing tap-tile templates for regular users (#9229)

Based on reports here https://meta.discourse.org/t/improved-bookmarks-with-reminders/144542

* Because the `userHasTimezone` property was computed and we were checking on an (essentially) global object, ember was not aware that the user timezone had changed because it changed in a different place. instead set the timezone as internal state for the modal on show and base the computed property off of that so it mutates correctly
* The tap-tile components were in the admin folder completely unnecessarily, move them out into the main discourse folder otherwise noone else can use the new bookmarks (icon + text is missing)
---
 .../discourse/controllers/bookmark.js          | 18 ++++++++----------
 .../templates/components/tap-tile-grid.hbs     |  0
 .../templates/components/tap-tile.hbs          |  0
 .../controllers/bookmark-test.js.es6           | 17 +++++++++++++++--
 4 files changed, 23 insertions(+), 12 deletions(-)
 rename app/assets/javascripts/{admin => discourse}/templates/components/tap-tile-grid.hbs (100%)
 rename app/assets/javascripts/{admin => discourse}/templates/components/tap-tile.hbs (100%)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 375a9a5341..ecafa0dd23 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -32,6 +32,7 @@ export default Controller.extend(ModalFunctionality, {
   customReminderTime: null,
   lastCustomReminderDate: null,
   lastCustomReminderTime: null,
+  userTimezone: null,
 
   onShow() {
     this.setProperties({
@@ -43,7 +44,8 @@ export default Controller.extend(ModalFunctionality, {
       customReminderDate: null,
       customReminderTime: null,
       lastCustomReminderDate: null,
-      lastCustomReminderTime: null
+      lastCustomReminderTime: null,
+      userTimezone: this.currentUser.timezone
     });
 
     this.loadLastUsedCustomReminderDatetime();
@@ -174,9 +176,9 @@ export default Controller.extend(ModalFunctionality, {
     return Discourse.BaseUri;
   },
 
-  @discourseComputed()
-  userHasTimezoneSet() {
-    return !_.isEmpty(this.userTimezone());
+  @discourseComputed("userTimezone")
+  userHasTimezoneSet(userTimezone) {
+    return !_.isEmpty(userTimezone);
   },
 
   saveBookmark() {
@@ -216,7 +218,7 @@ export default Controller.extend(ModalFunctionality, {
   },
 
   parseCustomDateTime(date, time) {
-    return moment.tz(date + " " + time, this.userTimezone());
+    return moment.tz(date + " " + time, this.userTimezone);
   },
 
   reminderAt() {
@@ -288,12 +290,8 @@ export default Controller.extend(ModalFunctionality, {
     return momentDate.hour(START_OF_DAY_HOUR).startOf("hour");
   },
 
-  userTimezone() {
-    return this.currentUser.timezone;
-  },
-
   now() {
-    return moment.tz(this.userTimezone());
+    return moment.tz(this.userTimezone);
   },
 
   laterToday() {
diff --git a/app/assets/javascripts/admin/templates/components/tap-tile-grid.hbs b/app/assets/javascripts/discourse/templates/components/tap-tile-grid.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/components/tap-tile-grid.hbs
rename to app/assets/javascripts/discourse/templates/components/tap-tile-grid.hbs
diff --git a/app/assets/javascripts/admin/templates/components/tap-tile.hbs b/app/assets/javascripts/discourse/templates/components/tap-tile.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/components/tap-tile.hbs
rename to app/assets/javascripts/discourse/templates/components/tap-tile.hbs
diff --git a/test/javascripts/controllers/bookmark-test.js.es6 b/test/javascripts/controllers/bookmark-test.js.es6
index f8fc372011..978b7cd19f 100644
--- a/test/javascripts/controllers/bookmark-test.js.es6
+++ b/test/javascripts/controllers/bookmark-test.js.es6
@@ -3,7 +3,8 @@ let BookmarkController;
 
 moduleFor("controller:bookmark", {
   beforeEach() {
-    BookmarkController = this.subject({ currentUser: currentUser() });
+    Discourse.currentUser = currentUser();
+    BookmarkController = this.subject({ currentUser: Discourse.currentUser });
   },
 
   afterEach() {
@@ -12,7 +13,7 @@ moduleFor("controller:bookmark", {
 });
 
 function mockMomentTz(dateString) {
-  let now = moment.tz(dateString, BookmarkController.currentUser.timezone);
+  let now = moment.tz(dateString, BookmarkController.userTimezone);
   sandbox.useFakeTimers(now.valueOf());
 }
 
@@ -179,3 +180,15 @@ QUnit.test(
     assert.equal(BookmarkController.lastCustomReminderTime, null);
   }
 );
+
+QUnit.test(
+  "userHasTimezoneSet updates true/false based on whether the current user timezone is set globally",
+  function(assert) {
+    Discourse.currentUser.timezone = null;
+    BookmarkController.onShow();
+    assert.equal(BookmarkController.userHasTimezoneSet, false);
+    Discourse.currentUser.timezone = "Australia/Brisbane";
+    BookmarkController.onShow();
+    assert.equal(BookmarkController.userHasTimezoneSet, true);
+  }
+);

From ccc9b64a998aef7b5f7da61a810ebe89a5c4673e Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 5 Mar 2020 12:34:11 -0800
Subject: [PATCH 0264/1830] FIX: theme-javascripts using incorrect subfolder
 setting

---
 app/models/javascript_cache.rb         | 2 +-
 lib/content_security_policy/default.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/javascript_cache.rb b/app/models/javascript_cache.rb
index 3f9f72dd20..832a60f7e6 100644
--- a/app/models/javascript_cache.rb
+++ b/app/models/javascript_cache.rb
@@ -8,7 +8,7 @@ class JavascriptCache < ActiveRecord::Base
   before_save :update_digest
 
   def url
-    "#{GlobalSetting.cdn_url}#{GlobalSetting.relative_url_root}/theme-javascripts/#{digest}.js?__ws=#{Discourse.current_hostname}"
+    "#{GlobalSetting.cdn_url}#{Discourse.base_uri}/theme-javascripts/#{digest}.js?__ws=#{Discourse.current_hostname}"
   end
 
   private
diff --git a/lib/content_security_policy/default.rb b/lib/content_security_policy/default.rb
index 2526fc3c8d..d1daff3573 100644
--- a/lib/content_security_policy/default.rb
+++ b/lib/content_security_policy/default.rb
@@ -36,7 +36,7 @@ class ContentSecurityPolicy
         if can_use_s3_cdn && s3_cdn
           s3_cdn + dir
         elsif can_use_cdn && cdn
-          cdn + dir
+          cdn + Discourse.base_uri + dir
         else
           base + dir
         end

From 8e98f39d9ff865be2f54ef77700eb2ae749d11d7 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Tue, 17 Mar 2020 15:23:46 -0700
Subject: [PATCH 0265/1830] Add spec for CSP subfolder

---
 spec/lib/content_security_policy_spec.rb | 29 ++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index 593ae9d1c0..85b8c31e3a 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -99,6 +99,35 @@ describe ContentSecurityPolicy do
         http://test.localhost/extra-locales/
       ])
     end
+
+    it 'adds subfolder to CDN assets' do
+      set_cdn_url('https://cdn.com')
+      set_subfolder('/forum')
+
+      script_srcs = parse(policy)['script-src']
+      expect(script_srcs).to include(*%w[
+        https://cdn.com/forum/assets/
+        https://cdn.com/forum/brotli_asset/
+        https://cdn.com/forum/highlight-js/
+        https://cdn.com/forum/javascripts/
+        https://cdn.com/forum/plugins/
+        https://cdn.com/forum/theme-javascripts/
+        http://test.localhost/forum/extra-locales/
+      ])
+
+      global_setting(:s3_cdn_url, 'https://s3-cdn.com')
+
+      script_srcs = parse(policy)['script-src']
+      expect(script_srcs).to include(*%w[
+        https://s3-cdn.com/assets/
+        https://s3-cdn.com/brotli_asset/
+        https://cdn.com/forum/highlight-js/
+        https://cdn.com/forum/javascripts/
+        https://cdn.com/forum/plugins/
+        https://cdn.com/forum/theme-javascripts/
+        http://test.localhost/forum/extra-locales/
+      ])
+    end
   end
 
   it 'can be extended by plugins' do

From 9b4b690bbab8948aa5209b95e7642abb454de4dd Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 18 Mar 2020 15:54:50 +1000
Subject: [PATCH 0266/1830] FIX: Prevent mobile bookmark modal cutoff

---
 app/assets/stylesheets/common/components/bookmark-modal.scss | 2 +-
 app/assets/stylesheets/common/components/tap-tile.scss       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/components/bookmark-modal.scss b/app/assets/stylesheets/common/components/bookmark-modal.scss
index daad95285a..14f91f70c3 100644
--- a/app/assets/stylesheets/common/components/bookmark-modal.scss
+++ b/app/assets/stylesheets/common/components/bookmark-modal.scss
@@ -4,7 +4,7 @@
   }
   .modal-body {
     max-width: 410px;
-    min-width: 380px;
+    width: 100%;
     box-sizing: border-box;
 
     .control-label {
diff --git a/app/assets/stylesheets/common/components/tap-tile.scss b/app/assets/stylesheets/common/components/tap-tile.scss
index d7259710e1..6f71643cd1 100644
--- a/app/assets/stylesheets/common/components/tap-tile.scss
+++ b/app/assets/stylesheets/common/components/tap-tile.scss
@@ -19,6 +19,10 @@
     font-size: $font-down-2;
     cursor: pointer;
 
+    @media screen and (max-width: 360px) {
+      width: $tile-width - 10;
+    }
+
     &:hover {
       background-color: $tertiary-low;
     }

From 778454e26b5c38c94dad6ccbc9f11439a51f6b6d Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Wed, 18 Mar 2020 16:21:24 +0200
Subject: [PATCH 0267/1830] FIX: Condense line codes in emails (#9225)

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

diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 8ab675f0fd..0b6c3f8d77 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -195,7 +195,7 @@ module Email
       style('div.summary-footer', 'color:#666; font-size:95%; text-align:center; padding-top:15px;')
       style('span.post-count', 'margin: 0 5px; color: #777;')
       style('pre', 'word-wrap: break-word; max-width: 694px;')
-      style('code', 'background-color: #f1f1ff; padding: 2px 5px;')
+      style('code', 'background-color: #f1f1ff; line-height: 50%; padding: 2px 5px;')
       style('pre code', 'display: block; background-color: #f1f1ff; padding: 5px;')
       style('.featured-topic a', "text-decoration: none; font-weight: bold; color: #{SiteSetting.email_link_color}; line-height:1.5em;")
       style('.secure-image-notice', 'font-style: italic; background-color: #f1f1ff; padding: 5px;')

From 1393950dbc44e7ee0390560079852c38cb0e9c2a Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 18 Mar 2020 19:31:10 +0200
Subject: [PATCH 0268/1830] FIX: Improve HTML to Markdown conversion (#9231)

This commit ensures that whitespaces are preserved in <pre>, but removed
inside text paragraphs.
---
 lib/html_to_markdown.rb                  | 17 ++++++++++++++---
 spec/components/html_to_markdown_spec.rb |  2 ++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/html_to_markdown.rb b/lib/html_to_markdown.rb
index a17a78eb2b..a3eb5e8aae 100644
--- a/lib/html_to_markdown.rb
+++ b/lib/html_to_markdown.rb
@@ -31,7 +31,7 @@ class HtmlToMarkdown
 
   def remove_whitespaces!
     @doc.traverse do |node|
-      if node.is_a? Nokogiri::XML::Text
+      if node.is_a?(Nokogiri::XML::Text) && node.parent.name != "pre"
         node.content = node.content.gsub(/\A[[:space:]]+/, "") if node.previous_element&.description&.block?
         node.content = node.content.gsub(/\A[[:space:]]+/, "") if node.previous_element.nil? && node.parent.description&.block?
         node.content = node.content.gsub(/[[:space:]]+\z/, "") if node.next_element&.description&.block?
@@ -220,10 +220,21 @@ class HtmlToMarkdown
   end
 
   def visit_text(node)
+    top_block = @stack[-1]
+
+    if top_block.name == "pre"
+      top_block.markdown << node.text
+      return
+    end
+
     node.content = node.content.gsub(/\A[[:space:]]+/, "") if node.previous_element.nil? && EMPHASIS.include?(node.parent.name)
-    indent = node.text[/^\s+/] || ""
+
+    if top_block.markdown.present? && indent = node.text[/^\s+/]
+      top_block.markdown << indent
+    end
+
     text = node.text.gsub(/^\s+/, "").gsub(/\s{2,}/, " ")
-    @stack[-1].markdown << [indent, text].join("")
+    top_block.markdown << text
   end
 
   def format_block
diff --git a/spec/components/html_to_markdown_spec.rb b/spec/components/html_to_markdown_spec.rb
index aa89ac351c..266e875aca 100644
--- a/spec/components/html_to_markdown_spec.rb
+++ b/spec/components/html_to_markdown_spec.rb
@@ -204,6 +204,7 @@ describe HtmlToMarkdown do
     expect(html_to_markdown("<pre>var foo = 'bar';</pre>")).to eq("```\nvar foo = 'bar';\n```")
     expect(html_to_markdown("<pre><code>var foo = 'bar';</code></pre>")).to eq("```\nvar foo = 'bar';\n```")
     expect(html_to_markdown(%Q{<pre><code class="lang-javascript">var foo = 'bar';</code></pre>})).to eq("```javascript\nvar foo = 'bar';\n```")
+    expect(html_to_markdown("<pre>    function f() {\n        console.log('Hello world!');\n    }</pre>")).to eq("```\n    function f() {\n        console.log('Hello world!');\n    }\n```")
   end
 
   it "supports <pre> inside <blockquote>" do
@@ -220,6 +221,7 @@ describe HtmlToMarkdown do
 
   it "handles <p>" do
     expect(html_to_markdown("<p>1st paragraph</p><p>2nd paragraph</p>")).to eq("1st paragraph\n\n2nd paragraph")
+    expect(html_to_markdown("<body><p>1st paragraph</p>\n    <p>    2nd paragraph\n    2nd paragraph</p>\n<p>3rd paragraph</p></body>")).to eq("1st paragraph\n\n2nd paragraph\n2nd paragraph\n\n3rd paragraph")
   end
 
   it "handles <div>" do

From 1c7680c5680c5152f8115d992d8bb2bda803f8b8 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Wed, 18 Mar 2020 13:38:21 -0600
Subject: [PATCH 0269/1830] FIX: Use id instead of elementId in hbs file

I think this issue is caused by a current regression in ember

https://github.com/emberjs/ember.js/issues/18147

but using `id` works just fine in templates. This also appears to be the
only template file we are using `elementId` directly in the template.
---
 .../javascripts/discourse/templates/modal/move-to-topic.hbs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
index d678ce760a..6f1e802770 100644
--- a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
@@ -20,7 +20,7 @@
         <p>{{html-safe (i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount)}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
-          {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
+          {{text-field value=topicName placeholderKey="composer.title_placeholder" id='split-topic-name'}}
 
           {{#if canTagMessages}}
             <label>{{i18n 'tagging.tags'}}</label>
@@ -75,7 +75,7 @@
         <p>{{html-safe (i18n 'topic.split_topic.instructions' count=selectedPostsCount)}}</p>
         <form>
           <label>{{i18n 'topic.split_topic.topic_name'}}</label>
-          {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
+          {{text-field value=topicName placeholderKey="composer.title_placeholder" id='split-topic-name'}}
 
           <label>{{i18n 'categories.category'}}</label>
           {{category-chooser
@@ -96,7 +96,7 @@
         <p>{{html-safe (i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount)}}</p>
         <form>
           <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
-          {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
+          {{text-field value=topicName placeholderKey="composer.title_placeholder" id='split-topic-name'}}
 
           {{#if canTagMessages}}
             <label>{{i18n 'tagging.tags'}}</label>

From d6838608ff4889aae337d5007dbbec1a5f96d654 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Tue, 17 Mar 2020 19:22:41 -0300
Subject: [PATCH 0270/1830] FEATURE: iCalendar feed for Bookmark reminders

---
 app/controllers/users_controller.rb | 24 ++++++++++++++++--------
 app/views/users/bookmarks.ics.erb   | 14 ++++++++++++++
 config/routes.rb                    |  2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 app/views/users/bookmarks.ics.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index fde828aee6..d7cc5f3de3 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1397,15 +1397,23 @@ class UsersController < ApplicationController
 
   def bookmarks
     user = fetch_user_from_params
-    bookmarks = BookmarkQuery.new(user, params).list_all
 
-    if bookmarks.empty?
-      render json: {
-        bookmarks: [],
-        no_results_help: I18n.t("user_activity.no_bookmarks.self")
-      }
-    else
-      render_serialized(bookmarks, UserBookmarkSerializer, root: 'bookmarks')
+    respond_to do |format|
+      format.json do
+        bookmarks = BookmarkQuery.new(user, params).list_all
+
+        if bookmarks.empty?
+          render json: {
+            bookmarks: [],
+            no_results_help: I18n.t("user_activity.no_bookmarks.self")
+          }
+        else
+          render_serialized(bookmarks, UserBookmarkSerializer, root: 'bookmarks')
+        end
+      end
+      format.ics do
+        @bookmark_reminders = Bookmark.where(user_id: user.id).where.not(reminder_at: nil).joins(:topic)
+      end
     end
   end
 
diff --git a/app/views/users/bookmarks.ics.erb b/app/views/users/bookmarks.ics.erb
new file mode 100644
index 0000000000..da77b9d792
--- /dev/null
+++ b/app/views/users/bookmarks.ics.erb
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Discourse//<%= Discourse.current_hostname %>//<%= Discourse.full_version %>//EN
+<% @bookmark_reminders.each do |bookmark| %>
+BEGIN:VEVENT
+UID:bookmark_reminder_#<%= bookmark.id %>@<%= Discourse.current_hostname %>
+DTSTAMP:<%= bookmark.updated_at.strftime("%Y%m%dT%H%M%SZ") %>
+DTSTART:<%= bookmark.reminder_at.strftime("%Y%m%dT%H%M%SZ") %>
+DTEND:<%= (bookmark.reminder_at + 1.hour).strftime("%Y%m%dT%H%M%SZ") %>
+SUMMARY:<%= bookmark.name.presence || bookmark.topic.title %>
+URL:<%= Discourse.base_url %>/t/-/<%= bookmark.topic_id %>
+END:VEVENT
+<% end %>
+END:VCALENDAR
diff --git a/config/routes.rb b/config/routes.rb
index 7f7a457af3..7cde4b038e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -469,7 +469,7 @@ Discourse::Application.routes.draw do
     get "#{root_path}/:username/activity" => "users#show", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/activity/:filter" => "users#show", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/badges" => "users#badges", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/bookmarks" => "users#bookmarks", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/bookmarks" => "users#bookmarks", constraints: { username: RouteFormat.username, format: /(json|ics)/ }
     get "#{root_path}/:username/notifications" => "users#show", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/notifications/:filter" => "users#show", constraints: { username: RouteFormat.username }
     delete "#{root_path}/:username" => "users#destroy", constraints: { username: RouteFormat.username }

From 8ae472bc41b6360d4a223935a524480b6ec093b6 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Tue, 17 Mar 2020 20:06:15 -0300
Subject: [PATCH 0271/1830] FEATURE: Google Calendar doesn't support URL in
 iCalendar, add fallback description

---
 app/views/users/bookmarks.ics.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/users/bookmarks.ics.erb b/app/views/users/bookmarks.ics.erb
index da77b9d792..cfb50701ae 100644
--- a/app/views/users/bookmarks.ics.erb
+++ b/app/views/users/bookmarks.ics.erb
@@ -8,6 +8,7 @@ DTSTAMP:<%= bookmark.updated_at.strftime("%Y%m%dT%H%M%SZ") %>
 DTSTART:<%= bookmark.reminder_at.strftime("%Y%m%dT%H%M%SZ") %>
 DTEND:<%= (bookmark.reminder_at + 1.hour).strftime("%Y%m%dT%H%M%SZ") %>
 SUMMARY:<%= bookmark.name.presence || bookmark.topic.title %>
+DESCRIPTION:<%= Discourse.base_url %>/t/-/<%= bookmark.topic_id %>
 URL:<%= Discourse.base_url %>/t/-/<%= bookmark.topic_id %>
 END:VEVENT
 <% end %>

From 8769ca08bbb31368f290f84aedb7d8a357f4a636 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Thu, 19 Mar 2020 10:59:32 +1000
Subject: [PATCH 0272/1830] SECURITY: Prevent access to other user's bookmark
 lists

---
 .../user-activity-bookmarks-with-reminders.js |  7 +++++--
 app/controllers/users_controller.rb           |  1 +
 config/locales/client.en.yml                  |  1 +
 spec/requests/users_controller_spec.rb        | 19 +++++++++++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
index 49982b1244..ad8ab35a6b 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
+++ b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
@@ -33,6 +33,9 @@ export default Controller.extend({
           this.content.pushObjects(bookmarks);
         }
       })
+      .catch(() => {
+        this.set("noResultsHelp", I18n.t("bookmarks.list_permission_denied"));
+      })
       .finally(() =>
         this.setProperties({
           loaded: true,
@@ -42,8 +45,8 @@ export default Controller.extend({
   },
 
   @discourseComputed("loaded", "content.length")
-  noContent(loaded, content) {
-    return loaded && content.length === 0;
+  noContent(loaded, contentLength) {
+    return loaded && contentLength === 0;
   },
 
   actions: {
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d7cc5f3de3..6125bf9836 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1397,6 +1397,7 @@ class UsersController < ApplicationController
 
   def bookmarks
     user = fetch_user_from_params
+    guardian.ensure_can_edit!(user)
 
     respond_to do |format|
       format.json do
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9ab7d5c5d7..ef241f4e16 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -313,6 +313,7 @@ en:
       save: "Save"
       no_timezone: 'You have not set a timezone yet. You will not be able to set reminders. Set one up <a href="%{basePath}/my/preferences/profile">in your profile</a>.'
       invalid_custom_datetime: "The date and time you provided is invalid, please try again."
+      list_permission_denied: "You do not have permission to view this user's bookmarks."
       reminders:
         at_desktop: "Next time I'm at my desktop"
         later_today: "Later today <br/>{{date}}"
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 43e41e5522..b2cc43fede 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -4167,6 +4167,25 @@ describe UsersController do
     end
   end
 
+  describe "#bookmarks" do
+    let!(:bookmark1) { Fabricate(:bookmark, user: user) }
+    let!(:bookmark2) { Fabricate(:bookmark, user: user) }
+    let!(:bookmark3) { Fabricate(:bookmark) }
+
+    it "returns a list of serialized bookmarks for the user" do
+      sign_in(user)
+      get "/u/#{user.username}/bookmarks.json"
+      expect(response.status).to eq(200)
+      expect(JSON.parse(response.body)['bookmarks'].map { |b| b['id'] }).to match_array([bookmark1.id, bookmark2.id])
+    end
+
+    it "does not show another user's bookmarks" do
+      sign_in(user)
+      get "/u/#{bookmark3.user.username}/bookmarks.json"
+      expect(response.status).to eq(403)
+    end
+  end
+
   def create_second_factor_security_key
     sign_in(user)
     stub_secure_session_confirmed

From 0cd502a55838d5d27f96f13c0794f3669ac41fcc Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 19 Mar 2020 15:48:23 +1000
Subject: [PATCH 0273/1830] FIX: N1 issues for bookmark list (#9236)

* Preload custom fields for BookmarkQuery and add preload callback. Copy TopicQuery preload methodology to allow plugins to preload data for the BookmarkQuery. This fixes assigned plugin custom fields N1
* Include topic tags in initial query to avoid tags N1

Related: discourse/discourse-assign#63
---
 lib/bookmark_query.rb           | 27 +++++++++++++++--
 spec/lib/bookmark_query_spec.rb | 51 +++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 spec/lib/bookmark_query_spec.rb

diff --git a/lib/bookmark_query.rb b/lib/bookmark_query.rb
index 44ab7b257f..d38bdabf7c 100644
--- a/lib/bookmark_query.rb
+++ b/lib/bookmark_query.rb
@@ -5,6 +5,19 @@
 # in the user/activity/bookmarks page.
 
 class BookmarkQuery
+  cattr_accessor :preloaded_custom_fields
+  self.preloaded_custom_fields = Set.new
+
+  def self.on_preload(&blk)
+    (@preload ||= Set.new) << blk
+  end
+
+  def self.preload(bookmarks, object)
+    if @preload
+      @preload.each { |preload| preload.call(bookmarks, object) }
+    end
+  end
+
   def initialize(user, params = {})
     @user = user
     @params = params
@@ -15,18 +28,28 @@ class BookmarkQuery
       .joins('INNER JOIN topics ON topics.id = bookmarks.topic_id')
       .joins('INNER JOIN posts ON posts.id = bookmarks.post_id')
       .joins('INNER JOIN users ON users.id = posts.user_id')
-      .order('created_at DESC')
+      .order('bookmarks.created_at DESC')
 
     if @params[:limit]
       results = results.limit(@params[:limit])
     end
 
+    if BookmarkQuery.preloaded_custom_fields.any?
+      Topic.preload_custom_fields(
+        results.map(&:topic), BookmarkQuery.preloaded_custom_fields
+      )
+    end
+
+    BookmarkQuery.preload(results, self)
+
     results
   end
 
   private
 
   def user_bookmarks
-    Bookmark.where(user: @user).includes(:topic).includes(post: :user)
+    Bookmark.where(user: @user)
+      .includes(topic: :tags)
+      .includes(post: :user)
   end
 end
diff --git a/spec/lib/bookmark_query_spec.rb b/spec/lib/bookmark_query_spec.rb
new file mode 100644
index 0000000000..2fe99c3893
--- /dev/null
+++ b/spec/lib/bookmark_query_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe BookmarkQuery do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:bookmark1) { Fabricate(:bookmark, user: user) }
+  fab!(:bookmark2) { Fabricate(:bookmark, user: user) }
+  let(:params) { {} }
+
+  subject { described_class.new(user, params) }
+
+  describe "#list_all" do
+    it "returns all the bookmarks for a user" do
+      expect(subject.list_all.count).to eq(2)
+    end
+
+    it "runs the on_preload block provided passing in bookmarks" do
+      preloaded_bookmarks = []
+      BookmarkQuery.on_preload do |bookmarks, bq|
+        (preloaded_bookmarks << bookmarks).flatten
+      end
+      subject.list_all
+      expect(preloaded_bookmarks.any?).to eq(true)
+    end
+
+    context "when the limit param is provided" do
+      let(:params) { { limit: 1 } }
+      it "is respected" do
+        expect(subject.list_all.count).to eq(1)
+      end
+    end
+
+    context "when there are topic custom fields to preload" do
+      before do
+        TopicCustomField.create(
+          topic_id: bookmark1.topic.id, name: 'test_field', value: 'test'
+        )
+        BookmarkQuery.preloaded_custom_fields << "test_field"
+      end
+      it "preloads them" do
+        Topic.expects(:preload_custom_fields)
+        expect(
+          subject.list_all.find do |b|
+            b.topic_id = bookmark1.topic_id
+          end.topic.custom_fields['test_field']
+        ).not_to eq(nil)
+      end
+    end
+  end
+end

From aad12822b7d7c9c6ecd976e23d3a83626c052dce Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 19 Mar 2020 21:06:31 +0530
Subject: [PATCH 0274/1830] FEATURE: automatically delete replies on a topic
 after N days. (#9209)

---
 .../components/edit-topic-timer-form.js       | 51 ++++------------
 .../discourse/components/future-date-input.js | 61 +++++++++++++------
 .../discourse/components/topic-timer-info.js  | 23 +++++--
 .../discourse/controllers/edit-topic-timer.js | 52 +++++++++++++---
 .../discourse/models/topic-timer.js           | 10 ++-
 .../components/edit-topic-timer-form.hbs      | 52 ++++++----------
 .../components/future-date-input.hbs          |  8 ++-
 .../templates/modal/edit-topic-timer.hbs      |  3 +-
 .../future-date-input-selector.js.es6         |  2 +-
 app/controllers/topics_controller.rb          |  5 +-
 app/jobs/regular/delete_replies.rb            | 30 +++++++++
 app/models/topic.rb                           | 17 ++++--
 app/models/topic_timer.rb                     | 19 +++---
 config/locales/client.en.yml                  |  4 ++
 ...0312122846_add_duration_to_topic_timers.rb |  7 +++
 spec/requests/topics_controller_spec.rb       | 22 +++++++
 16 files changed, 241 insertions(+), 125 deletions(-)
 create mode 100644 app/jobs/regular/delete_replies.rb
 create mode 100644 db/migrate/20200312122846_add_duration_to_topic_timers.rb

diff --git a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js
index 4d2be762d3..361a2acbf2 100644
--- a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js
+++ b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js
@@ -1,18 +1,15 @@
-import { isEmpty } from "@ember/utils";
 import { equal, or, readOnly } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
-import discourseComputed, {
-  observes,
-  on
-} from "discourse-common/utils/decorators";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import {
   PUBLISH_TO_CATEGORY_STATUS_TYPE,
   OPEN_STATUS_TYPE,
   DELETE_STATUS_TYPE,
   REMINDER_TYPE,
   CLOSE_STATUS_TYPE,
-  BUMP_TYPE
+  BUMP_TYPE,
+  DELETE_REPLIES_TYPE
 } from "discourse/controllers/edit-topic-timer";
 
 export default Component.extend({
@@ -23,15 +20,18 @@ export default Component.extend({
   autoBump: equal("selection", BUMP_TYPE),
   publishToCategory: equal("selection", PUBLISH_TO_CATEGORY_STATUS_TYPE),
   reminder: equal("selection", REMINDER_TYPE),
+  autoDeleteReplies: equal("selection", DELETE_REPLIES_TYPE),
   showTimeOnly: or("autoOpen", "autoDelete", "reminder", "autoBump"),
-
-  @discourseComputed(
-    "topicTimer.updateTime",
+  showFutureDateInput: or(
+    "showTimeOnly",
     "publishToCategory",
-    "topicTimer.category_id"
-  )
-  saveDisabled(updateTime, publishToCategory, topicTimerCategoryId) {
-    return isEmpty(updateTime) || (publishToCategory && !topicTimerCategoryId);
+    "autoClose",
+    "autoDeleteReplies"
+  ),
+
+  @discourseComputed("autoDeleteReplies")
+  durationType(autoDeleteReplies) {
+    return autoDeleteReplies ? "days" : "hours";
   },
 
   @discourseComputed("topic.visible")
@@ -39,25 +39,6 @@ export default Component.extend({
     if (visible) return this.get("topic.category_id");
   },
 
-  @on("init")
-  @observes("topicTimer", "topicTimer.execute_at", "topicTimer.duration")
-  _setUpdateTime() {
-    let time = null;
-    const executeAt = this.get("topicTimer.execute_at");
-
-    if (executeAt && this.get("topicTimer.based_on_last_post")) {
-      time = this.get("topicTimer.duration");
-    } else if (executeAt) {
-      const closeTime = moment(executeAt);
-
-      if (closeTime > moment()) {
-        time = closeTime.format("YYYY-MM-DD HH:mm");
-      }
-    }
-
-    this.set("topicTimer.updateTime", time);
-  },
-
   @observes("selection")
   _updateBasedOnLastPost() {
     if (!this.autoClose) {
@@ -79,11 +60,5 @@ export default Component.extend({
         );
       }
     });
-  },
-
-  actions: {
-    onChangeTimerType(value) {
-      this.set("topicTimer.status_type", value);
-    }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/future-date-input.js b/app/assets/javascripts/discourse/components/future-date-input.js
index d84ab3c334..d54e68e782 100644
--- a/app/assets/javascripts/discourse/components/future-date-input.js
+++ b/app/assets/javascripts/discourse/components/future-date-input.js
@@ -1,5 +1,5 @@
 import { isEmpty } from "@ember/utils";
-import { equal, and, empty } from "@ember/object/computed";
+import { equal, and, empty, or } from "@ember/object/computed";
 import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { FORMAT } from "select-kit/components/future-date-input-selector";
@@ -10,10 +10,13 @@ export default Component.extend({
   date: null,
   time: null,
   includeDateTime: true,
+  duration: null,
+  durationType: "hours",
   isCustom: equal("selection", "pick_date_and_time"),
   isBasedOnLastPost: equal("selection", "set_based_on_last_post"),
   displayDateAndTimePicker: and("includeDateTime", "isCustom"),
   displayLabel: null,
+  displayNumberInput: or("isBasedOnLastPost", "isBasedOnDuration"),
 
   init() {
     this._super(...arguments);
@@ -21,6 +24,8 @@ export default Component.extend({
     if (this.input) {
       if (this.basedOnLastPost) {
         this.set("selection", "set_based_on_last_post");
+      } else if (this.isBasedOnDuration) {
+        this.set("selection", null);
       } else {
         const datetime = moment(this.input);
         this.setProperties({
@@ -57,28 +62,44 @@ export default Component.extend({
     this.set("basedOnLastPost", this.isBasedOnLastPost);
   },
 
-  @discourseComputed("input", "isBasedOnLastPost")
-  duration(input, isBasedOnLastPost) {
-    const now = moment();
-
-    if (isBasedOnLastPost) {
-      return parseFloat(input);
-    } else {
-      return moment(input) - now;
-    }
+  @observes("duration")
+  _updateDuration() {
+    this.attrs.onChangeDuration &&
+      this.attrs.onChangeDuration(parseInt(this.duration, 0));
   },
 
-  @discourseComputed("input", "isBasedOnLastPost")
-  executeAt(input, isBasedOnLastPost) {
-    if (isBasedOnLastPost) {
-      return moment()
-        .add(input, "hours")
+  @discourseComputed(
+    "input",
+    "duration",
+    "isBasedOnLastPost",
+    "isBasedOnDuration",
+    "durationType"
+  )
+  executeAt(
+    input,
+    duration,
+    isBasedOnLastPost,
+    isBasedOnDuration,
+    durationType
+  ) {
+    if (isBasedOnLastPost || isBasedOnDuration) {
+      return moment(input)
+        .add(parseInt(duration, 0), durationType)
         .format(FORMAT);
     } else {
       return input;
     }
   },
 
+  @discourseComputed("durationType")
+  durationLabel(durationType) {
+    return I18n.t(
+      `topic.topic_status_update.num_of_${
+        durationType === "hours" ? "hours" : "days"
+      }`
+    );
+  },
+
   didReceiveAttrs() {
     this._super(...arguments);
 
@@ -92,7 +113,9 @@ export default Component.extend({
     "date",
     "time",
     "willCloseImmediately",
-    "categoryId"
+    "categoryId",
+    "displayNumberInput",
+    "duration"
   )
   showTopicStatusInfo(
     statusType,
@@ -101,7 +124,9 @@ export default Component.extend({
     date,
     time,
     willCloseImmediately,
-    categoryId
+    categoryId,
+    displayNumberInput,
+    duration
   ) {
     if (!statusType || willCloseImmediately) return false;
 
@@ -114,6 +139,8 @@ export default Component.extend({
         return moment(`${date}${time ? " " + time : ""}`).isAfter(moment());
       }
       return time;
+    } else if (displayNumberInput) {
+      return duration;
     } else {
       return input;
     }
diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js b/app/assets/javascripts/discourse/components/topic-timer-info.js
index 66663b062d..30eb177ca3 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js
@@ -3,7 +3,10 @@ import { cancel, later } from "@ember/runloop";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import Category from "discourse/models/category";
-import { REMINDER_TYPE } from "discourse/controllers/edit-topic-timer";
+import {
+  REMINDER_TYPE,
+  DELETE_REPLIES_TYPE
+} from "discourse/controllers/edit-topic-timer";
 import ENV from "discourse-common/config/environment";
 
 export default Component.extend({
@@ -28,7 +31,13 @@ export default Component.extend({
   },
 
   renderTopicTimer() {
-    if (!this.executeAt || this.executeAt < moment()) {
+    const isDeleteRepliesType = this.statusType === DELETE_REPLIES_TYPE;
+
+    if (
+      !isDeleteRepliesType &&
+      !this.basedOnLastPost &&
+      (!this.executeAt || this.executeAt < moment())
+    ) {
       this.set("showTopicTimer", null);
       return;
     }
@@ -40,7 +49,7 @@ export default Component.extend({
     const statusUpdateAt = moment(this.executeAt);
     const duration = moment.duration(statusUpdateAt - moment());
     const minutesLeft = duration.asMinutes();
-    if (minutesLeft > 0) {
+    if (minutesLeft > 0 || isDeleteRepliesType || this.basedOnLastPost) {
       let rerenderDelay = 1000;
       if (minutesLeft > 2160) {
         rerenderDelay = 12 * 60 * 60000;
@@ -51,11 +60,15 @@ export default Component.extend({
       } else if (minutesLeft > 2) {
         rerenderDelay = 60000;
       }
-      let autoCloseHours = this.duration || 0;
+      let durationHours = parseInt(this.duration, 0) || 0;
+
+      if (isDeleteRepliesType) {
+        durationHours *= 24;
+      }
 
       let options = {
         timeLeft: duration.humanize(true),
-        duration: moment.duration(autoCloseHours, "hours").humanize()
+        duration: moment.duration(durationHours, "hours").humanize()
       };
 
       const categoryId = this.categoryId;
diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js
index e9117532f0..461fa3c64d 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js
@@ -4,6 +4,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import TopicTimer from "discourse/models/topic-timer";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { FORMAT } from "select-kit/components/future-date-input-selector";
 
 export const CLOSE_STATUS_TYPE = "close";
 export const OPEN_STATUS_TYPE = "open";
@@ -11,6 +12,7 @@ export const PUBLISH_TO_CATEGORY_STATUS_TYPE = "publish_to_category";
 export const DELETE_STATUS_TYPE = "delete";
 export const REMINDER_TYPE = "reminder";
 export const BUMP_TYPE = "bump";
+export const DELETE_REPLIES_TYPE = "delete_replies";
 
 export default Controller.extend(ModalFunctionality, {
   loading: false,
@@ -41,10 +43,16 @@ export default Controller.extend(ModalFunctionality, {
       }
     ];
     if (this.currentUser.get("staff")) {
-      types.push({
-        id: DELETE_STATUS_TYPE,
-        name: I18n.t("topic.auto_delete.title")
-      });
+      types.push(
+        {
+          id: DELETE_STATUS_TYPE,
+          name: I18n.t("topic.auto_delete.title")
+        },
+        {
+          id: DELETE_REPLIES_TYPE,
+          name: I18n.t("topic.auto_delete_replies.title")
+        }
+      );
     }
     return types;
   },
@@ -68,7 +76,7 @@ export default Controller.extend(ModalFunctionality, {
     return "true" === isPublic ? publicTopicTimer : privateTopicTimer;
   },
 
-  _setTimer(time, statusType) {
+  _setTimer(time, duration, statusType) {
     this.set("loading", true);
 
     TopicTimer.updateStatus(
@@ -76,10 +84,11 @@ export default Controller.extend(ModalFunctionality, {
       time,
       this.get("topicTimer.based_on_last_post"),
       statusType,
-      this.get("topicTimer.category_id")
+      this.get("topicTimer.category_id"),
+      duration
     )
       .then(result => {
-        if (time) {
+        if (time || duration) {
           this.send("closeModal");
 
           setProperties(this.topicTimer, {
@@ -103,17 +112,39 @@ export default Controller.extend(ModalFunctionality, {
       .finally(() => this.set("loading", false));
   },
 
+  onShow() {
+    let time = null;
+    const executeAt = this.get("topicTimer.execute_at");
+
+    if (executeAt) {
+      const closeTime = moment(executeAt);
+
+      if (closeTime > moment()) {
+        time = closeTime.format(FORMAT);
+      }
+    }
+
+    this.send("onChangeInput", time);
+  },
+
   actions: {
     onChangeStatusType(value) {
       this.set("topicTimer.status_type", value);
     },
 
-    onChangeUpdateTime(value) {
+    onChangeInput(value) {
       this.set("topicTimer.updateTime", value);
     },
 
+    onChangeDuration(value) {
+      this.set("topicTimer.duration", value);
+    },
+
     saveTimer() {
-      if (!this.get("topicTimer.updateTime")) {
+      if (
+        !this.get("topicTimer.updateTime") &&
+        !this.get("topicTimer.duration")
+      ) {
         this.flash(
           I18n.t("topic.topic_status_update.time_frame_required"),
           "alert-error"
@@ -123,12 +154,13 @@ export default Controller.extend(ModalFunctionality, {
 
       this._setTimer(
         this.get("topicTimer.updateTime"),
+        this.get("topicTimer.duration"),
         this.get("topicTimer.status_type")
       );
     },
 
     removeTimer() {
-      this._setTimer(null, this.get("topicTimer.status_type"));
+      this._setTimer(null, null, this.get("topicTimer.status_type"));
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/models/topic-timer.js b/app/assets/javascripts/discourse/models/topic-timer.js
index 31b51ae900..1afe0e92dc 100644
--- a/app/assets/javascripts/discourse/models/topic-timer.js
+++ b/app/assets/javascripts/discourse/models/topic-timer.js
@@ -4,7 +4,14 @@ import RestModel from "discourse/models/rest";
 const TopicTimer = RestModel.extend({});
 
 TopicTimer.reopenClass({
-  updateStatus(topicId, time, basedOnLastPost, statusType, categoryId) {
+  updateStatus(
+    topicId,
+    time,
+    basedOnLastPost,
+    statusType,
+    categoryId,
+    duration
+  ) {
     let data = {
       time,
       status_type: statusType
@@ -12,6 +19,7 @@ TopicTimer.reopenClass({
 
     if (basedOnLastPost) data.based_on_last_post = basedOnLastPost;
     if (categoryId) data.category_id = categoryId;
+    if (duration) data.duration = duration;
 
     return ajax({
       url: `/t/${topicId}/timer`,
diff --git a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
index 1fbfa3f979..e5ad76f979 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
@@ -7,46 +7,32 @@
       value=selection
     }}
   </div>
-
-  <div>
-    {{#if showTimeOnly}}
+  {{#if publishToCategory}}
+    <div class="control-group">
+      <label>{{i18n 'topic.topic_status_update.publish_to'}}</label>
+      {{category-chooser
+        value=topicTimer.category_id
+        excludeCategoryId=excludeCategoryId
+        onChange=(action (mut topicTimer.category_id))
+      }}
+    </div>
+  {{/if}}
+  {{#if showFutureDateInput}}
+    <div class="control-group">
       {{future-date-input
         input=(readonly topicTimer.updateTime)
+        duration=(readonly topicTimer.duration)
         label="topic.topic_status_update.when"
         statusType=selection
         includeWeekend=true
         basedOnLastPost=topicTimer.based_on_last_post
-        onChangeInput=onChangeUpdateTime
-      }}
-    {{else if publishToCategory}}
-      <div class="control-group">
-        <label>{{i18n 'topic.topic_status_update.publish_to'}}</label>
-        {{category-chooser
-          value=topicTimer.category_id
-          excludeCategoryId=excludeCategoryId
-          onChange=(action (mut topicTimer.category_id))
-        }}
-      </div>
-
-      {{future-date-input
-        input=(readonly topicTimer.updateTime)
-        label="topic.topic_status_update.when"
-        statusType=selection
-        includeWeekend=true
+        onChangeInput=onChangeInput
+        onChangeDuration=onChangeDuration
         categoryId=topicTimer.category_id
-        basedOnLastPost=topicTimer.based_on_last_post
-        onChangeInput=onChangeUpdateTime
-      }}
-    {{else if autoClose}}
-      {{future-date-input
-        input=topicTimer.updateTime
-        label="topic.topic_status_update.when"
-        statusType=selection
-        includeWeekend=true
-        basedOnLastPost=topicTimer.based_on_last_post
         lastPostedAt=model.last_posted_at
-        onChangeInput=onChangeUpdateTime
+        isBasedOnDuration=autoDeleteReplies
+        durationType=durationType
       }}
-    {{/if}}
-  </div>
+    </div>
+  {{/if}}
 </form>
diff --git a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
index c1571ad9c5..38451bea90 100644
--- a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
@@ -1,4 +1,5 @@
 <div class="future-date-input">
+  {{#unless isBasedOnDuration}}
   <div class="control-group">
     <label>{{displayLabel}}</label>
     {{future-date-input-selector
@@ -16,6 +17,7 @@
       onChange=(action (mut selection))
     }}
   </div>
+  {{/unless}}
 
   {{#if displayDateAndTimePicker}}
     <div class="control-group">
@@ -33,11 +35,11 @@
     </div>
   {{/if}}
 
-  {{#if isBasedOnLastPost}}
+  {{#if displayNumberInput}}
     <div class="control-group">
       <label>
-        {{i18n 'topic.topic_status_update.num_of_hours'}}
-        {{text-field value=input type="number"}}
+        {{durationLabel}}
+        {{text-field value=duration type="number"}}
       </label>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
index 71d7432113..316e51b00f 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
@@ -17,7 +17,8 @@
     timerTypes=selections
     updateTime=updateTime
     onChangeStatusType=(action "onChangeStatusType")
-    onChangeUpdateTime=(action "onChangeUpdateTime")
+    onChangeInput=(action "onChangeInput")
+    onChangeDuration=(action "onChangeDuration")
   }}
 {{/d-modal-body}}
 
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
index 0c588dbdfe..34efa2551c 100644
--- a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
@@ -203,7 +203,7 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
     return "future-date-input-selector/future-date-input-selector-row";
   },
 
-  content: computed(function() {
+  content: computed("statusType", function() {
     const now = moment();
     const opts = {
       now,
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index ee7ba1af18..0deb6b2efd 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -435,16 +435,19 @@ class TopicsController < ApplicationController
       rescue
         invalid_param(:status_type)
       end
+    based_on_last_post = params[:based_on_last_post]
+    params.require(:duration) if based_on_last_post || TopicTimer.types[:delete_replies] == status_type
 
     topic = Topic.find_by(id: params[:topic_id])
     guardian.ensure_can_moderate!(topic)
 
     options = {
       by_user: current_user,
-      based_on_last_post: params[:based_on_last_post]
+      based_on_last_post: based_on_last_post
     }
 
     options.merge!(category_id: params[:category_id]) if !params[:category_id].blank?
+    options.merge!(duration: params[:duration].to_i) if params[:duration].present?
 
     topic_status_update = topic.set_or_create_timer(
       status_type,
diff --git a/app/jobs/regular/delete_replies.rb b/app/jobs/regular/delete_replies.rb
new file mode 100644
index 0000000000..b8228c7a04
--- /dev/null
+++ b/app/jobs/regular/delete_replies.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Jobs
+  class DeleteReplies < ::Jobs::Base
+
+    def execute(args)
+      topic_timer = TopicTimer.find_by(id: args[:topic_timer_id] || args[:topic_status_update_id])
+
+      topic = topic_timer&.topic
+
+      if topic_timer.blank? || topic.blank? || topic_timer.execute_at > Time.zone.now
+        return
+      end
+
+      unless Guardian.new(topic_timer.user).is_staff?
+        topic_timer.trash!(Discourse.system_user)
+        return
+      end
+
+      replies = topic.posts.where("posts.post_number > 1")
+      replies.where('posts.created_at < ?', topic_timer.duration.days.ago).each do |post|
+        PostDestroyer.new(topic_timer.user, post, context: I18n.t("topic_statuses.auto_deleted_by_timer")).destroy
+      end
+
+      topic_timer.execute_at = (replies.minimum(:created_at) || Time.zone.now) + topic_timer.duration.days.ago
+      topic_timer.save
+    end
+
+  end
+end
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 7947900b13..13f3a8a798 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -1132,8 +1132,8 @@ class Topic < ActiveRecord::Base
   #  * by_user: User who is setting the topic's status update.
   #  * based_on_last_post: True if time should be based on timestamp of the last post.
   #  * category_id: Category that the update will apply to.
-  def set_or_create_timer(status_type, time, by_user: nil, based_on_last_post: false, category_id: SiteSetting.uncategorized_category_id)
-    return delete_topic_timer(status_type, by_user: by_user) if time.blank?
+  def set_or_create_timer(status_type, time, by_user: nil, based_on_last_post: false, category_id: SiteSetting.uncategorized_category_id, duration: nil)
+    return delete_topic_timer(status_type, by_user: by_user) if time.blank? && duration.blank?
 
     public_topic_timer = !!TopicTimer.public_types[status_type]
     topic_timer_options = { topic: self, public_type: public_topic_timer }
@@ -1143,19 +1143,24 @@ class Topic < ActiveRecord::Base
 
     time_now = Time.zone.now
     topic_timer.based_on_last_post = !based_on_last_post.blank?
+    topic_timer.duration = duration
 
     if status_type == TopicTimer.types[:publish_to_category]
       topic_timer.category = Category.find_by(id: category_id)
     end
 
     if topic_timer.based_on_last_post
-      num_hours = time.to_f
-
-      if num_hours > 0
+      if duration > 0
         last_post_created_at = self.ordered_posts.last.present? ? self.ordered_posts.last.created_at : time_now
-        topic_timer.execute_at = last_post_created_at + num_hours.hours
+        topic_timer.execute_at = last_post_created_at + duration.hours
         topic_timer.created_at = last_post_created_at
       end
+    elsif topic_timer.status_type == TopicTimer.types[:delete_replies]
+      if duration > 0
+        first_reply_created_at = (self.ordered_posts.where("post_number > 1").minimum(:created_at) || time_now)
+        topic_timer.execute_at = first_reply_created_at + duration.days
+        topic_timer.created_at = first_reply_created_at
+      end
     else
       utc = Time.find_zone("UTC")
       is_float = (Float(time) rescue nil)
diff --git a/app/models/topic_timer.rb b/app/models/topic_timer.rb
index 1599f77ce5..c8274da9f5 100644
--- a/app/models/topic_timer.rb
+++ b/app/models/topic_timer.rb
@@ -49,7 +49,8 @@ class TopicTimer < ActiveRecord::Base
       publish_to_category: 3,
       delete: 4,
       reminder: 5,
-      bump: 6
+      bump: 6,
+      delete_replies: 7
     )
   end
 
@@ -73,14 +74,6 @@ class TopicTimer < ActiveRecord::Base
     end
   end
 
-  def duration
-    if (self.execute_at && self.created_at)
-      ((self.execute_at - self.created_at) / 1.hour).round(2)
-    else
-      0
-    end
-  end
-
   def public_type?
     !!self.class.public_types[self.status_type]
   end
@@ -120,6 +113,14 @@ class TopicTimer < ActiveRecord::Base
     Jobs.cancel_scheduled_job(:bump_topic, topic_timer_id: id)
   end
 
+  def cancel_auto_delete_replies_job
+    Jobs.cancel_scheduled_job(:delete_replies, topic_timer_id: id)
+  end
+
+  def schedule_auto_delete_replies_job(time)
+    Jobs.enqueue_at(time, :delete_replies, topic_timer_id: id)
+  end
+
   def schedule_auto_bump_job(time)
     Jobs.enqueue_at(time, :bump_topic, topic_timer_id: id)
   end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ef241f4e16..27d207efb7 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2139,6 +2139,7 @@ en:
         title: "Topic Timer"
         save: "Set Timer"
         num_of_hours: "Number of hours:"
+        num_of_days: "Number of days:"
         remove: "Remove Timer"
         publish_to: "Publish To:"
         when: "When:"
@@ -2181,6 +2182,8 @@ en:
         title: "Auto-Bump Topic"
       reminder:
         title: "Remind Me"
+      auto_delete_replies:
+        title: "Auto-Delete Replies"
 
       status_update_notice:
         auto_open: "This topic will automatically open %{timeLeft}."
@@ -2190,6 +2193,7 @@ en:
         auto_delete: "This topic will be automatically deleted %{timeLeft}."
         auto_bump: "This topic will be automatically bumped %{timeLeft}."
         auto_reminder: "You will be reminded about this topic %{timeLeft}."
+        auto_delete_replies: "Replies on this topic are automatically deleted after %{duration}."
       auto_close_title: "Auto-Close Settings"
       auto_close_immediate:
         one: "The last post in the topic is already %{count} hour old, so the topic will be closed immediately."
diff --git a/db/migrate/20200312122846_add_duration_to_topic_timers.rb b/db/migrate/20200312122846_add_duration_to_topic_timers.rb
new file mode 100644
index 0000000000..bc4ba1a35f
--- /dev/null
+++ b/db/migrate/20200312122846_add_duration_to_topic_timers.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDurationToTopicTimers < ActiveRecord::Migration[6.0]
+  def change
+    add_column :topic_timers, :duration, :integer, null: true
+  end
+end
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 845a7e1930..0f0a921e9e 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -2644,6 +2644,28 @@ RSpec.describe TopicsController do
         expect(json['closed']).to eq(topic.closed)
       end
 
+      it 'should be able to create a topic status update with duration' do
+        post "/t/#{topic.id}/timer.json", params: {
+          duration: 5,
+          status_type: TopicTimer.types[7]
+        }
+
+        expect(response.status).to eq(200)
+
+        topic_status_update = TopicTimer.last
+
+        expect(topic_status_update.topic).to eq(topic)
+        expect(topic_status_update.execute_at).to eq_time(5.days.from_now)
+        expect(topic_status_update.duration).to eq(5)
+
+        json = JSON.parse(response.body)
+
+        expect(DateTime.parse(json['execute_at']))
+          .to eq_time(DateTime.parse(topic_status_update.execute_at.to_s))
+
+        expect(json['duration']).to eq(topic_status_update.duration)
+      end
+
       describe 'publishing topic to category in the future' do
         it 'should be able to create the topic status update' do
           post "/t/#{topic.id}/timer.json", params: {

From a1f9b1a7fc909b326eba73f6fb1bfcbc0d9240c0 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Thu, 19 Mar 2020 06:00:46 -1000
Subject: [PATCH 0275/1830] FIX: correctly remove authentication_data cookie on
 oauth login flow (#9238)

Additionally correctly handle cookie path for authentication_data

There were two bugs that exposed an interesting case where two discourse
instances hosted across two subfolder installs in the same domain
with oauth may clash and cause strange redirection on first login:

Log in to example.com/forum1. authentication_data cookie is set with path /
On the first redirection, the current authentication_data cookie is not unset.
Log in to example.com/forum2. In this case, the authentication_data cookie
is already set from forum1 - the initial page load will incorrectly redirect
the user to the redirect URL from the already-stored cookie, to /forum1.

This removes this issue by:
* Setting the cookie for the correct path, and not having it on root
* Correctly removing the cookie on first login
---
 .../users/omniauth_callbacks_controller.rb    |  5 +++-
 app/views/layouts/application.html.erb        |  4 ++--
 .../omniauth_callbacks_controller_spec.rb     | 24 +++++++++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 881fb3e9ec..31c14c66ca 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -74,7 +74,10 @@ class Users::OmniauthCallbacksController < ApplicationController
       @auth_result.authenticator_name = authenticator.name
       complete_response_data
       cookies['_bypass_cache'] = true
-      cookies[:authentication_data] = @auth_result.to_client_hash.to_json
+      cookies[:authentication_data] = {
+        value: @auth_result.to_client_hash.to_json,
+        path: Discourse.base_uri
+      }
       redirect_to @origin
     end
   end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 6c1f3b3074..9f3682b411 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -58,8 +58,8 @@
 
     <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
 
-    <%- if !current_user && cookies[:authentication_data] %>
-      <meta id="data-authentication" data-authentication-data="<%= cookies.delete(:authentication_data) %>">
+    <%- if data = cookies.delete(:authentication_data, path: Discourse.base_uri) && !current_user  %>
+      <meta id="data-authentication" data-authentication-data="<%= data %>">
     <%- end %>
   </head>
 
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index 204c3f1572..e604a89aba 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -269,6 +269,30 @@ RSpec.describe Users::OmniauthCallbacksController do
         expect(user.email_confirmed?).to eq(true)
       end
 
+      it 'should return the authenticated response with the correct path for subfolders' do
+        set_subfolder "/forum"
+        events = DiscourseEvent.track_events do
+          get "/auth/google_oauth2/callback.json"
+        end
+
+        expect(response.headers["Set-Cookie"].match(/^authentication_data=.*; path=\/forum/)).not_to eq(nil)
+
+        expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
+
+        expect(response.status).to eq(302)
+
+        data = JSON.parse(response.cookies["authentication_data"])
+
+        expect(data["authenticated"]).to eq(true)
+        expect(data["awaiting_activation"]).to eq(false)
+        expect(data["awaiting_approval"]).to eq(false)
+        expect(data["not_allowed_from_ip_address"]).to eq(false)
+        expect(data["admin_not_allowed_from_ip_address"]).to eq(false)
+
+        user.reload
+        expect(user.email_confirmed?).to eq(true)
+      end
+
       it "should confirm email even when the tokens are expired" do
         user.email_tokens.update_all(confirmed: false, expired: true)
 

From 22d5ba0f77a7c19188ef5d16c4fee89a88ea0407 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 19 Mar 2020 16:02:12 +0000
Subject: [PATCH 0276/1830] DEV: Load plugin stylesheets before theme
 stylesheets (#9240)

This is a more logical order, since themes are more lightweight than plugins, and are often used to augment plugin styles
---
 app/views/common/_discourse_stylesheet.html.erb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/common/_discourse_stylesheet.html.erb b/app/views/common/_discourse_stylesheet.html.erb
index 2312fa4da7..2992572d0d 100644
--- a/app/views/common/_discourse_stylesheet.html.erb
+++ b/app/views/common/_discourse_stylesheet.html.erb
@@ -8,10 +8,11 @@
   <%= discourse_stylesheet_link_tag(:admin) %>
 <%- end %>
 
+<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?, request: request).each do |file| %>
+  <%= discourse_stylesheet_link_tag(file) %>
+<%- end %>
+
 <%- if theme_ids.present? %>
   <%= discourse_stylesheet_link_tag(mobile_view? ? :mobile_theme : :desktop_theme) %>
 <%- end %>
 
-<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?, request: request).each do |file| %>
-  <%= discourse_stylesheet_link_tag(file) %>
-<%- end %>

From f6d6f1701f18de3589c742592e17b3ed505172c0 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 19 Mar 2020 21:45:05 +0530
Subject: [PATCH 0277/1830] FIX: use the new duration attribute in
 `set_or_create_timer` method.

New `duration` attribute is introduced for the `set_or_create_timer` method in the commit aad12822b7d7c9c6ecd976e23d3a83626c052dce for "based on last post" and "auto delete replies" topic timers.
---
 app/models/topic.rb                        | 6 +++++-
 lib/post_creator.rb                        | 5 +++--
 spec/components/post_creator_spec.rb       | 3 ++-
 spec/models/topic_spec.rb                  | 4 ++--
 spec/services/topic_status_updater_spec.rb | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index 13f3a8a798..07b5c60c6e 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -257,10 +257,14 @@ class Topic < ActiveRecord::Base
        self.category.auto_close_hours &&
        !public_topic_timer&.execute_at
 
+      based_on_last_post = self.category.auto_close_based_on_last_post
+      duration = based_on_last_post ? self.category.auto_close_hours : nil
+
       self.set_or_create_timer(
         TopicTimer.types[:close],
         self.category.auto_close_hours,
-        based_on_last_post: self.category.auto_close_based_on_last_post
+        based_on_last_post: based_on_last_post,
+        duration: duration
       )
     end
   end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 25cd341eea..0e89a93ba1 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -473,8 +473,9 @@ class PostCreator
          topic_timer.duration > 0
 
         @topic.set_or_create_timer(TopicTimer.types[:close],
-          topic_timer.duration,
-          based_on_last_post: topic_timer.based_on_last_post
+          nil,
+          based_on_last_post: topic_timer.based_on_last_post,
+          duration: topic_timer.duration
         )
       end
     end
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index 1fae772752..0b3999a322 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -367,7 +367,8 @@ describe PostCreator do
             Fabricate(:topic_timer,
               based_on_last_post: true,
               execute_at: Time.zone.now - 12.hours,
-              created_at: Time.zone.now - 24.hours
+              created_at: Time.zone.now - 24.hours,
+              duration: 12
             )
           end
 
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 17d49606ff..64ad9b005d 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -1638,7 +1638,7 @@ describe Topic do
 
     it 'can take a number of hours as a string and can handle based on last post' do
       freeze_time now
-      topic.set_or_create_timer(TopicTimer.types[:close], '18', by_user: admin, based_on_last_post: true)
+      topic.set_or_create_timer(TopicTimer.types[:close], nil, by_user: admin, based_on_last_post: true, duration: 18)
       expect(topic.topic_timers.first.execute_at).to eq_time(18.hours.from_now)
     end
 
@@ -1750,7 +1750,7 @@ describe Topic do
       it "should be able to override category's default auto close" do
         Jobs.run_immediately!
 
-        expect(topic.topic_timers.first.duration).to eq(4)
+        expect(topic.topic_timers.first.execute_at).to eq_time(topic.created_at + 4.hours)
 
         topic.set_or_create_timer(TopicTimer.types[:close], 2, by_user: admin)
 
diff --git a/spec/services/topic_status_updater_spec.rb b/spec/services/topic_status_updater_spec.rb
index 7bb6ab4abf..593203eb51 100644
--- a/spec/services/topic_status_updater_spec.rb
+++ b/spec/services/topic_status_updater_spec.rb
@@ -59,7 +59,7 @@ describe TopicStatusUpdater do
     Fabricate(:post, topic: topic)
 
     topic.set_or_create_timer(
-      TopicTimer.types[:close], '10', based_on_last_post: true
+      TopicTimer.types[:close], nil, based_on_last_post: true, duration: 10
     )
 
     TopicStatusUpdater.new(topic, admin).update!("autoclosed", true)

From 226d81fcc5a1a227bbc3a363b8f5e6958e0b74de Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Mon, 16 Mar 2020 19:17:20 -0300
Subject: [PATCH 0278/1830] FIX: Fix a PostgreSQL error when a draft was
 concurrently created

Moves the new draft creation concurrency handling to PostgreSQL
so the database doesn't error out when the draft is being created
by multiple backends.

Also removes `retry_not_unique` parameter from Draft#set` which is
not called anywhere.

Also fixes a draft update not bumping the `updated_at` column.
---
 app/models/draft.rb | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/app/models/draft.rb b/app/models/draft.rb
index 4a3ab41f02..8d1b5ca364 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -7,7 +7,7 @@ class Draft < ActiveRecord::Base
 
   class OutOfSequence < StandardError; end
 
-  def self.set(user, key, sequence, data, owner = nil, retry_not_unique: true)
+  def self.set(user, key, sequence, data, owner = nil)
     if SiteSetting.backup_drafts_to_pm_length > 0 && SiteSetting.backup_drafts_to_pm_length < data.length
       backup_draft(user, key, sequence, data)
     end
@@ -59,30 +59,33 @@ class Draft < ActiveRecord::Base
              , data = :data
              , revisions = revisions + 1
              , owner = :owner
+             , updated_at = CURRENT_TIMESTAMP
          WHERE id = :id
       SQL
 
     elsif sequence != current_sequence
       raise Draft::OutOfSequence
     else
-      begin
-        Draft.create!(
-          user_id: user.id,
-          draft_key: key,
-          data: data,
-          sequence: sequence,
-          owner: owner
-        )
-      rescue ActiveRecord::RecordNotUnique => e
-        # we need this to be fast and with minimal locking, in some cases we can have a race condition
-        # around 2 controller actions calling for draft creation at the exact same time
-        # to avoid complex locking and a distributed mutex, since this is so rare, simply add a single retry
-        if retry_not_unique
-          set(user, key, sequence, data, owner, retry_not_unique: false)
-        else
-          raise e
-        end
-      end
+      opts = {
+        user_id: user.id,
+        draft_key: key,
+        data: data,
+        sequence: sequence,
+        owner: owner
+      }
+
+      DB.exec(<<~SQL, opts)
+        INSERT INTO drafts (user_id, draft_key, data, sequence, owner, created_at, updated_at)
+        VALUES (:user_id, :draft_key, :data, :sequence, :owner, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
+        ON CONFLICT (user_id, draft_key) DO
+        UPDATE
+        SET
+          sequence = :sequence,
+          data = :data,
+          revisions = drafts.revisions + 1,
+          owner = :owner,
+          updated_at = CURRENT_TIMESTAMP
+      SQL
     end
 
     sequence

From 080960a15ed3eee0d35e4708342c9e1a1167e1c3 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Thu, 19 Mar 2020 15:12:42 -0300
Subject: [PATCH 0279/1830] FIX: Show the envelope icon when the flagged post
 is a PM. Flagged PM must be exclusively reviewed by admins (#9232)

---
 .../templates/components/reviewable-topic-link.hbs    |  2 +-
 app/models/reviewable.rb                              |  2 +-
 spec/models/reviewable_spec.rb                        | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs
index 4b1704aec4..b43876ab48 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs
@@ -1,6 +1,6 @@
 <div class='post-topic'>
   {{#if reviewable.topic}}
-    {{topic-status topic=reviewable.topic}}
+    {{topic-status topic=reviewable.topic showPrivateMessageIcon=true}}
     <a href={{reviewable.target_url}} class='title-text'>{{reviewable.topic.title}}</a>
     {{category-badge reviewable.category}}
     {{reviewable-tags tags=reviewable.topic_tags tagName=''}}
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 78d4b98e65..13468019e3 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -133,7 +133,7 @@ class Reviewable < ActiveRecord::Base
       target: target,
       topic: topic,
       created_by: created_by,
-      reviewable_by_moderator: reviewable_by_moderator,
+      reviewable_by_moderator: reviewable_by_moderator && !(topic&.private_message?),
       payload: payload,
       potential_spam: potential_spam
     )
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index 9b46eb7c52..30bd5d6855 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -78,6 +78,17 @@ RSpec.describe Reviewable, type: :model do
       expect(r1.pending?).to eq(true)
       expect(r0.pending?).to eq(false)
     end
+
+    it 'sets the reviewable_by_moderator attribute to false when the topic is a PM' do
+      pm_topic = Fabricate(:private_message_topic)
+      post = Fabricate(:post, topic: pm_topic)
+      reviewable = ReviewableFlaggedPost.needs_review!(
+        target: post, topic: pm_topic,
+        created_by: Discourse.system_user, reviewable_by_moderator: true
+      )
+
+      expect(reviewable.reviewable_by_moderator).to eq(false)
+    end
   end
 
   context ".list_for" do

From 86eb03af85ac54da7001d9d405b84f7b538bb023 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 19 Mar 2020 19:30:08 +0100
Subject: [PATCH 0280/1830] DEV: allows to run up/down migrations of a plugin
 (#9241)

This is mostly useful while developing a plugin, to avoid manual actions of deleting tables and schema_migrations rows.

Usage:
bundle exec rake plugin:migrate:down[discourse-calendar]
---
 lib/tasks/plugin.rake | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/lib/tasks/plugin.rake b/lib/tasks/plugin.rake
index 58b84ccfa0..9da1f43350 100644
--- a/lib/tasks/plugin.rake
+++ b/lib/tasks/plugin.rake
@@ -146,3 +146,32 @@ task 'plugin:qunit', [:plugin, :timeout] do |t, args|
 
   sh cmd
 end
+
+desc 'run all migrations of a plugin'
+namespace 'plugin:migrate' do
+  def list_migrations(plugin_name)
+    plugin_root = File.join(Rails.root, "plugins", plugin_name)
+    migrations_root = File.join(plugin_root, "db", "{post_migrate,migrate}", "*.rb")
+    Dir[migrations_root]
+      .map do |migration_filename|
+        File.basename(migration_filename)[/(^.*?)_/, 1].to_i
+      end
+      .sort
+  end
+
+  def cmd(operation, migration_number)
+    "rails db:migrate:#{operation} LOAD_PLUGINS=1 VERSION=#{migration_number}"
+  end
+
+  task :down, [:plugin] do |t, args|
+    list_migrations(args[:plugin]).reverse.each do |migration_number|
+      sh cmd(:down, migration_number)
+    end
+  end
+
+  task :up, [:plugin] do |t, args|
+    list_migrations(args[:plugin]).each do |migration_number|
+      sh cmd(:up, migration_number)
+    end
+  end
+end

From f3ddc36ac614ea59503b5b79d0aa13145bae5f18 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 20 Mar 2020 00:55:47 +0530
Subject: [PATCH 0281/1830] FIX: update `email_digests` user option when
 `default_email_digest_frequency` updated.

---
 app/controllers/admin/site_settings_controller.rb    |  8 +++-----
 spec/requests/admin/site_settings_controller_spec.rb | 11 ++++++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin/site_settings_controller.rb b/app/controllers/admin/site_settings_controller.rb
index bc550ba103..4d662f7dd5 100644
--- a/app/controllers/admin/site_settings_controller.rb
+++ b/app/controllers/admin/site_settings_controller.rb
@@ -37,12 +37,10 @@ class Admin::SiteSettingsController < Admin::AdminController
           new_value = UserOption.title_count_modes[new_value.to_sym]
         end
 
-        UserOption.where(user_option => previous_value).update_all(user_option => new_value)
+        attrs = { user_option => new_value }
+        attrs[:email_digests] = (new_value.to_i != 0) if id == "default_email_digest_frequency"
 
-        if id == "default_email_digest_frequency"
-          disable_digests = new_value == 0
-          UserOption.where(user_option => 0, email_digests: !disable_digests).update_all(email_digests: disable_digests)
-        end
+        UserOption.where(user_option => previous_value).update_all(attrs)
       elsif id.start_with?("default_categories_")
         previous_category_ids = previous_value.split("|")
         new_category_ids = new_value.split("|")
diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rb
index 9e21a2d37e..5dc564e701 100644
--- a/spec/requests/admin/site_settings_controller_spec.rb
+++ b/spec/requests/admin/site_settings_controller_spec.rb
@@ -77,7 +77,16 @@ describe Admin::SiteSettingsController do
           }.to change { UserOption.where(email_in_reply_to: false).count }.by(0)
         end
 
-        it 'should disable email digests in existing user options' do
+        it 'should update `email_digests` column in existing user options' do
+          UserOption.last.update(email_digests: false)
+
+          expect {
+            put "/admin/site_settings/default_email_digest_frequency.json", params: {
+              default_email_digest_frequency: 30,
+              updateExistingUsers: true
+            }
+          }.to change { UserOption.where(email_digests: true).count }.by(1)
+
           expect {
             put "/admin/site_settings/default_email_digest_frequency.json", params: {
               default_email_digest_frequency: 0,

From e9a3639b107393cb581a484dc89a2b0151623aca Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 19 Mar 2020 19:52:31 +0000
Subject: [PATCH 0282/1830] DEV: Pin hashie and faraday versions for zendesk
 api compatibility (#9214)

---
 Gemfile      | 7 +++++++
 Gemfile.lock | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/Gemfile b/Gemfile
index 73f97c0533..a1f8015d13 100644
--- a/Gemfile
+++ b/Gemfile
@@ -255,3 +255,10 @@ end
 gem 'webpush', require: false
 gem 'colored2', require: false
 gem 'maxminddb'
+
+# These are not direct dependencies, but we need to restrict
+# versions for compatibility with https://github.com/discourse/discourse-zendesk-plugin
+# These restrictions can be removed once the zendesk_api gem is updated
+# for newer versions of hashie and faraday
+gem 'hashie', '< 4.0.0', require: false # https://github.com/zendesk/zendesk_api_client_rb/pull/422
+gem 'faraday', '< 1.0.0', require: false # https://github.com/zendesk/zendesk_api_client_rb/pull/421
diff --git a/Gemfile.lock b/Gemfile.lock
index 1280352e63..9c253f8308 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -456,12 +456,14 @@ DEPENDENCIES
   execjs
   fabrication
   fakeweb
+  faraday (< 1.0.0)
   fast_blank
   fast_xor
   fast_xs
   fastimage
   flamegraph
   gc_tracer
+  hashie (< 4.0.0)
   highline (~> 1.7.0)
   htmlentities
   http_accept_language

From 19814c5e8109dfb30b8a96e0762d062b200db392 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 19 Mar 2020 19:54:42 +0000
Subject: [PATCH 0283/1830] FIX: Allow CSP to work correctly for non-default
 hostnames/schemes (#9180)

- Define the CSP based on the requested domain / scheme (respecting force_https)
- Update EnforceHostname middleware to allow secondary domains, add specs
- Add URL scheme to anon cache key so that CSP headers are cached correctly
---
 lib/content_security_policy.rb                | 13 ++---
 lib/content_security_policy/builder.rb        |  4 +-
 lib/content_security_policy/default.rb        |  7 ++-
 lib/content_security_policy/middleware.rb     |  9 ++-
 lib/middleware/anonymous_cache.rb             |  2 +-
 lib/middleware/enforce_hostname.rb            |  7 ++-
 .../middleware/enforce_hostname_spec.rb       | 39 +++++++++++++
 .../content_security_policy_spec.rb           | 58 +++++++++++++++++++
 .../content_security_policy/builder_spec.rb   |  2 +-
 spec/lib/content_security_policy_spec.rb      |  2 -
 10 files changed, 122 insertions(+), 21 deletions(-)
 create mode 100644 spec/components/middleware/enforce_hostname_spec.rb
 create mode 100644 spec/integration/content_security_policy_spec.rb

diff --git a/lib/content_security_policy.rb b/lib/content_security_policy.rb
index 3a6227b5d3..76d2246e5f 100644
--- a/lib/content_security_policy.rb
+++ b/lib/content_security_policy.rb
@@ -4,18 +4,13 @@ require 'content_security_policy/extension'
 
 class ContentSecurityPolicy
   class << self
-    def policy(theme_ids = [], path_info: "/")
-      new.build(theme_ids, path_info: path_info)
+    def policy(theme_ids = [], base_url: Discourse.base_url, path_info: "/")
+      new.build(theme_ids, base_url: base_url, path_info: path_info)
     end
-
-    def base_url
-      @base_url || Discourse.base_url
-    end
-    attr_writer :base_url
   end
 
-  def build(theme_ids, path_info: "/")
-    builder = Builder.new
+  def build(theme_ids, base_url:, path_info: "/")
+    builder = Builder.new(base_url: base_url)
 
     Extension.theme_extensions(theme_ids).each { |extension| builder << extension }
     Extension.plugin_extensions.each { |extension| builder << extension }
diff --git a/lib/content_security_policy/builder.rb b/lib/content_security_policy/builder.rb
index f7cf1b690f..e59e8e2ecd 100644
--- a/lib/content_security_policy/builder.rb
+++ b/lib/content_security_policy/builder.rb
@@ -25,8 +25,8 @@ class ContentSecurityPolicy
       style_src
     ].freeze
 
-    def initialize
-      @directives = Default.new.directives
+    def initialize(base_url:)
+      @directives = Default.new(base_url: base_url).directives
     end
 
     def <<(extension)
diff --git a/lib/content_security_policy/default.rb b/lib/content_security_policy/default.rb
index d1daff3573..d2f92f20b5 100644
--- a/lib/content_security_policy/default.rb
+++ b/lib/content_security_policy/default.rb
@@ -5,7 +5,8 @@ class ContentSecurityPolicy
   class Default
     attr_reader :directives
 
-    def initialize
+    def initialize(base_url:)
+      @base_url = base_url
       @directives = {}.tap do |directives|
         directives[:base_uri] = [:none]
         directives[:object_src] = [:none]
@@ -17,7 +18,9 @@ class ContentSecurityPolicy
 
     private
 
-    delegate :base_url, to: :ContentSecurityPolicy
+    def base_url
+      @base_url
+    end
 
     SCRIPT_ASSET_DIRECTORIES = [
       # [dir, can_use_s3_cdn, can_use_cdn]
diff --git a/lib/content_security_policy/middleware.rb b/lib/content_security_policy/middleware.rb
index 3e10db2f26..d9b8ece251 100644
--- a/lib/content_security_policy/middleware.rb
+++ b/lib/content_security_policy/middleware.rb
@@ -12,12 +12,15 @@ class ContentSecurityPolicy
       _, headers, _ = response = @app.call(env)
 
       return response unless html_response?(headers)
-      ContentSecurityPolicy.base_url = request.host_with_port if !Rails.env.production?
+
+      # The EnforceHostname middleware ensures request.host_with_port can be trusted
+      protocol = (SiteSetting.force_https || request.ssl?) ? "https://" : "http://"
+      base_url = protocol + request.host_with_port + Discourse.base_uri
 
       theme_ids = env[:resolved_theme_ids]
 
-      headers['Content-Security-Policy'] = policy(theme_ids, path_info: env["PATH_INFO"]) if SiteSetting.content_security_policy
-      headers['Content-Security-Policy-Report-Only'] = policy(theme_ids, path_info: env["PATH_INFO"]) if SiteSetting.content_security_policy_report_only
+      headers['Content-Security-Policy'] = policy(theme_ids, base_url: base_url, path_info: env["PATH_INFO"]) if SiteSetting.content_security_policy
+      headers['Content-Security-Policy-Report-Only'] = policy(theme_ids, base_url: base_url, path_info: env["PATH_INFO"]) if SiteSetting.content_security_policy_report_only
 
       response
     end
diff --git a/lib/middleware/anonymous_cache.rb b/lib/middleware/anonymous_cache.rb
index aa7dd7d1e8..8f1e75606a 100644
--- a/lib/middleware/anonymous_cache.rb
+++ b/lib/middleware/anonymous_cache.rb
@@ -107,7 +107,7 @@ module Middleware
       def cache_key
         return @cache_key if defined?(@cache_key)
 
-        @cache_key = +"ANON_CACHE_#{@env["HTTP_ACCEPT"]}_#{@env["HTTP_HOST"]}#{@env["REQUEST_URI"]}"
+        @cache_key = +"ANON_CACHE_#{@env["HTTP_ACCEPT"]}_#{@env[Rack::RACK_URL_SCHEME]}_#{@env["HTTP_HOST"]}#{@env["REQUEST_URI"]}"
         @cache_key << AnonymousCache.build_cache_key(self)
         @cache_key
       end
diff --git a/lib/middleware/enforce_hostname.rb b/lib/middleware/enforce_hostname.rb
index 130cabb87a..00e8870d57 100644
--- a/lib/middleware/enforce_hostname.rb
+++ b/lib/middleware/enforce_hostname.rb
@@ -13,7 +13,12 @@ module Middleware
       # all Rails helpers are guarenteed to use it unconditionally and
       # never generate incorrect links
       env[Rack::Request::HTTP_X_FORWARDED_HOST] = nil
-      env[Rack::HTTP_HOST] = Discourse.current_hostname
+
+      allowed_hostnames = RailsMultisite::ConnectionManagement.current_db_hostnames
+      requested_hostname = env[Rack::HTTP_HOST]
+
+      env[Rack::HTTP_HOST] = allowed_hostnames.find { |h| h == requested_hostname } || Discourse.current_hostname
+
       @app.call(env)
     end
   end
diff --git a/spec/components/middleware/enforce_hostname_spec.rb b/spec/components/middleware/enforce_hostname_spec.rb
new file mode 100644
index 0000000000..1a065ebdaa
--- /dev/null
+++ b/spec/components/middleware/enforce_hostname_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Middleware::EnforceHostname do
+
+  before do
+    RailsMultisite::ConnectionManagement.stubs(:current_db_hostnames).returns(['primary.example.com', 'secondary.example.com'])
+    RailsMultisite::ConnectionManagement.stubs(:current_hostname).returns('primary.example.com')
+  end
+
+  def check_returned_host(input_host)
+    resolved_host = nil
+
+    app = described_class.new(
+      lambda do |env|
+        resolved_host = env["HTTP_HOST"]
+        [200, {}, ["ok"]]
+      end
+    )
+
+    app.call({ "HTTP_HOST" => input_host })
+
+    resolved_host
+  end
+
+  it "works for the primary domain" do
+    expect(check_returned_host("primary.example.com")).to eq("primary.example.com")
+  end
+
+  it "works for the secondary domain" do
+    expect(check_returned_host("secondary.example.com")).to eq("secondary.example.com")
+  end
+
+  it "returns primary domain otherwise" do
+    expect(check_returned_host("other.example.com")).to eq("primary.example.com")
+    expect(check_returned_host(nil)).to eq("primary.example.com")
+  end
+end
diff --git a/spec/integration/content_security_policy_spec.rb b/spec/integration/content_security_policy_spec.rb
new file mode 100644
index 0000000000..095e3c2287
--- /dev/null
+++ b/spec/integration/content_security_policy_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'content security policy integration' do
+
+  it "adds the csp headers correctly" do
+    SiteSetting.content_security_policy = false
+    get "/"
+    expect(response.headers["Content-Security-Policy"]).to eq(nil)
+
+    SiteSetting.content_security_policy = true
+    get "/"
+    expect(response.headers["Content-Security-Policy"]).to be_present
+  end
+
+  context "with different hostnames" do
+    before do
+      SiteSetting.content_security_policy = true
+      RailsMultisite::ConnectionManagement.stubs(:current_db_hostnames).returns(['primary.example.com', 'secondary.example.com'])
+      RailsMultisite::ConnectionManagement.stubs(:current_hostname).returns('primary.example.com')
+    end
+
+    it "works with the primary domain" do
+      host! "primary.example.com"
+      get "/"
+      expect(response.headers["Content-Security-Policy"]).to include("http://primary.example.com")
+    end
+
+    it "works with the secondary domain" do
+      host! "secondary.example.com"
+      get "/"
+      expect(response.headers["Content-Security-Policy"]).to include("http://secondary.example.com")
+    end
+
+    it "uses the primary domain for unknown hosts" do
+      host! "unknown.example.com"
+      get "/"
+      expect(response.headers["Content-Security-Policy"]).to include("http://primary.example.com")
+    end
+  end
+
+  context "with different protocols" do
+    it "forces https when the site setting is enabled" do
+      SiteSetting.force_https = true
+      get "/"
+      expect(response.headers["Content-Security-Policy"]).to include("https://test.localhost")
+    end
+
+    it "uses https when the site setting is disabled, but request is ssl" do
+      SiteSetting.force_https = false
+      https!
+      get "/"
+      expect(response.headers["Content-Security-Policy"]).to include("https://test.localhost")
+    end
+  end
+
+end
diff --git a/spec/lib/content_security_policy/builder_spec.rb b/spec/lib/content_security_policy/builder_spec.rb
index f188dbcc4c..68d51facb9 100644
--- a/spec/lib/content_security_policy/builder_spec.rb
+++ b/spec/lib/content_security_policy/builder_spec.rb
@@ -2,7 +2,7 @@
 require 'rails_helper'
 
 describe ContentSecurityPolicy::Builder do
-  let(:builder) { described_class.new }
+  let(:builder) { described_class.new(base_url: Discourse.base_url) }
 
   describe '#<<' do
     it 'normalizes directive name' do
diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index 85b8c31e3a..fcbf5ece2c 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -2,8 +2,6 @@
 require 'rails_helper'
 
 describe ContentSecurityPolicy do
-  before { ContentSecurityPolicy.base_url = nil }
-
   after do
     DiscoursePluginRegistry.reset!
   end

From 10b37e1e3660df9fd978d1a6a6a02891d5b4b337 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 20 Mar 2020 15:36:50 +1100
Subject: [PATCH 0284/1830] FIX: add support for sub-sub category slugs in
 search

Previous to this change slugs for leaves in 3 level nestings would not work

Our UX picks only the last two levels

This also makes the results consistent for slugs as it enforces order.
---
 lib/search.rb                  | 22 +++++++++-------------
 spec/components/search_spec.rb | 26 ++++++++++++++++++++------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/lib/search.rb b/lib/search.rb
index e7e97d8ede..6bfc2834cb 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -462,20 +462,16 @@ class Search
     next unless category_slug
 
     if subcategory_slug
-      # sub category
-      parent_category_id = Category
-        .where(
-          "lower(slug) = ? AND parent_category_id IS NULL", category_slug.downcase
-        )
-        .pluck(:id)
-        .first
 
-      category_id = Category
-        .where("lower(slug) = ? AND parent_category_id = ?",
-          subcategory_slug.downcase, parent_category_id
-        )
-        .pluck(:id)
-        .first
+      category_id, _ = DB.query_single(<<~SQL, category_slug.downcase, subcategory_slug.downcase)
+        SELECT sub.id
+        FROM categories sub
+        JOIN categories c ON sub.parent_category_id = c.id
+        WHERE LOWER(c.slug)  = ? AND LOWER(sub.slug) = ?
+        ORDER BY c.id
+        LIMIT 1
+      SQL
+
     else
       # main category
       if category_slug[0] == "="
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index 3f89e63cf3..64e0efb726 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -264,7 +264,7 @@ describe Search do
 
       it 'can find all direct PMs of the current user' do
         pm = create_pm(users: [current, participant])
-        pm_2 = create_pm(users: [participant_2, participant])
+        _pm_2 = create_pm(users: [participant_2, participant])
         pm_3 = create_pm(users: [participant, current])
         pm_4 = create_pm(users: [participant_2, current])
         results = Search.execute("in:personal-direct", guardian: Guardian.new(current))
@@ -275,7 +275,7 @@ describe Search do
       it 'can filter direct PMs by @username' do
         pm = create_pm(users: [current, participant])
         pm_2 = create_pm(users: [participant, current])
-        pm_3 = create_pm(users: [participant_2, current])
+        _pm_3 = create_pm(users: [participant_2, current])
         results = Search.execute("@#{participant.username} in:personal-direct", guardian: Guardian.new(current))
         expect(results.posts.size).to eq(2)
         expect(results.posts.map(&:topic_id)).to contain_exactly(pm.id, pm_2.id)
@@ -283,13 +283,13 @@ describe Search do
       end
 
       it "doesn't include PMs that have more than 2 participants" do
-        pm = create_pm(users: [current, participant, participant_2])
+        _pm = create_pm(users: [current, participant, participant_2])
         results = Search.execute("@#{participant.username} in:personal-direct", guardian: Guardian.new(current))
         expect(results.posts.size).to eq(0)
       end
 
       it "doesn't include PMs that have groups" do
-        pm = create_pm(users: [current, participant], group: group)
+        _pm = create_pm(users: [current, participant], group: group)
         results = Search.execute("@#{participant.username} in:personal-direct", guardian: Guardian.new(current))
         expect(results.posts.size).to eq(0)
       end
@@ -1088,7 +1088,7 @@ describe Search do
       second_topic = post2.topic
       second_topic.update(category: private_category)
 
-      post3 = Fabricate(:post, raw: "another test!", user: topic.user, topic: second_topic)
+      _post3 = Fabricate(:post, raw: "another test!", user: topic.user, topic: second_topic)
 
       expect(Search.execute('test status:public').posts.length).to eq(1)
       expect(Search.execute('test status:closed').posts.length).to eq(0)
@@ -1242,6 +1242,20 @@ describe Search do
       expect(Search.execute('this is a test #beta').posts.size).to eq(0)
     end
 
+    it 'supports sub-sub category slugs' do
+
+      SiteSetting.max_category_nesting = 3
+
+      category = Fabricate(:category, name: 'top', slug: 'top')
+      sub = Fabricate(:category, name: 'middle', slug: 'middle', parent_category_id: category.id)
+      leaf = Fabricate(:category, name: 'leaf', slug: 'leaf', parent_category_id: sub.id)
+
+      topic = Fabricate(:topic, created_at: 3.months.ago, category: leaf)
+      _post = Fabricate(:post, raw: 'Sams first post', topic: topic)
+
+      expect(Search.execute('#Middle:leaf first post').posts.size).to eq(1)
+    end
+
     it 'correctly handles #symbol when no tag or category match' do
       Fabricate(:post, raw: 'testing #1 #9998')
       results = Search.new('testing #1').execute
@@ -1555,7 +1569,7 @@ describe Search do
       topic = Fabricate(:topic, title: 'I am testing a tagged search')
       _post = Fabricate(:post, topic: topic, raw: 'this is the first post')
       tag = Fabricate(:tag)
-      topic_tag = Fabricate(:topic_tag, topic: topic, tag: tag)
+      _topic_tag = Fabricate(:topic_tag, topic: topic, tag: tag)
 
       results = Search.execute('in:untagged')
       expect(results.posts.length).to eq(0)

From 145c90419d4fefd411453fadd2eb85fa9f334791 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 20 Mar 2020 15:48:25 +1100
Subject: [PATCH 0285/1830] DEV: increase timeout for initial context eval

Due to JS refactors our initial payload transpile is taking a bit longer
instead of failing the test suite attempt to give this a bit more time
---
 lib/pretty_text.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index d76e2ed827..55faf8d4c1 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -62,7 +62,7 @@ module PrettyText
   end
 
   def self.create_es6_context
-    ctx = MiniRacer::Context.new(timeout: 15000)
+    ctx = MiniRacer::Context.new(timeout: 25000)
 
     ctx.eval("window = {}; window.devicePixelRatio = 2;") # hack to make code think stuff is retina
 

From 1b24a7b993bf4fd203f0c62f32ed523b2e931cef Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Thu, 19 Mar 2020 14:56:28 +0000
Subject: [PATCH 0286/1830] FIX: Include entire slug path in permalinks

This is a temporary fix since these URLs should contain the id as well.
---
 app/models/category.rb       | 15 +++------
 spec/models/category_spec.rb | 62 +++++++++++++++++++++++++++---------
 2 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index 00f4e1803b..bb4a8d5219 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -682,10 +682,9 @@ class Category < ActiveRecord::Base
   def url
     url = @@url_cache[self.id]
     unless url
-      url = +"#{Discourse.base_uri}/c"
-      url << "/#{parent_category.slug_for_url}" if parent_category_id
-      url << "/#{slug_for_url}"
-      @@url_cache[self.id] = -url
+      url = "#{Discourse.base_uri}/c/#{slug_path.join('/')}"
+
+      @@url_cache[self.id] = url
     end
 
     url
@@ -708,7 +707,7 @@ class Category < ActiveRecord::Base
   def create_category_permalink
     old_slug = saved_changes.transform_values(&:first)["slug"]
     url = +"#{Discourse.base_uri}/c"
-    url << "/#{parent_category.slug}" if parent_category_id
+    url << "/#{parent_category.slug_path.join('/')}" if parent_category_id
     url << "/#{old_slug}"
     url = Permalink.normalize_url(url)
 
@@ -720,11 +719,7 @@ class Category < ActiveRecord::Base
   end
 
   def delete_category_permalink
-    if self.parent_category
-      permalink = Permalink.find_by_url("c/#{self.parent_category.slug}/#{slug}")
-    else
-      permalink = Permalink.find_by_url("c/#{slug}")
-    end
+    permalink = Permalink.find_by_url("c/#{slug_path.join('/')}")
     permalink.destroy if permalink
   end
 
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 68f037bf57..b2da411504 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -661,36 +661,68 @@ describe Category do
   end
 
   describe "#url" do
-    it "builds a url for normal categories" do
-      category = Fabricate(:category_with_definition, name: "cats")
-      expect(category.url).to eq "/c/cats"
+    before_all do
+      SiteSetting.max_category_nesting = 3
+    end
+
+    fab!(:category) { Fabricate(:category, name: "root") }
+
+    fab!(:sub_category) do
+      Fabricate(
+        :category,
+        name: "child",
+        parent_category_id: category.id,
+      )
+    end
+
+    fab!(:sub_sub_category) do
+      Fabricate(
+        :category,
+        name: "child_of_child",
+        parent_category_id: sub_category.id,
+      )
+    end
+
+    describe "for normal categories" do
+      it "builds a url" do
+        expect(category.url).to eq("/c/root")
+      end
     end
 
     describe "for subcategories" do
-      it "includes the parent category" do
-        parent_category = Fabricate(:category_with_definition, name: "parent")
+      it "builds a url" do
+        expect(sub_category.url).to eq("/c/root/child")
+      end
+    end
 
-        subcategory =
-          Fabricate(
-            :category_with_definition,
-            name: "child",
-            parent_category_id: parent_category.id
-          )
-
-        expect(subcategory.url).to eq "/c/parent/child"
+    describe "for sub-sub-categories" do
+      it "builds a url" do
+        expect(sub_sub_category.url)
+          .to eq("/c/root/child/child-of-child")
       end
     end
   end
 
   describe "#url_with_id" do
-    fab!(:category) { Fabricate(:category_with_definition, name: 'cats') }
+    fab!(:category) do
+      Fabricate(
+        :category_with_definition,
+        name: 'cats',
+      )
+    end
 
     it "includes the id in the URL" do
       expect(category.url_with_id).to eq("/c/cats/#{category.id}")
     end
 
     context "child category" do
-      fab!(:child_category) { Fabricate(:category_with_definition, parent_category_id: category.id, name: 'dogs') }
+      fab!(:child_category) do
+        Fabricate(
+          :category,
+          parent_category_id: category.id,
+          name: 'dogs',
+        )
+      end
 
       it "includes the id in the URL" do
         expect(child_category.url_with_id).to eq("/c/cats/dogs/#{child_category.id}")

From 8174f1551cec8cd5e7cc9b7181ec819b1208be40 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2020 09:43:58 -0400
Subject: [PATCH 0287/1830] Build(deps): Bump aws-sdk-s3 from 1.61.0 to 1.61.1
 (#9216)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.61.0 to 1.61.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 9c253f8308..8485b761d9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,7 +54,7 @@ GEM
     aws-sdk-kms (1.30.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.61.0)
+    aws-sdk-s3 (1.61.1)
       aws-sdk-core (~> 3, >= 3.83.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)

From c15056650647e8650288f973d9038500dc9cf7bb Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 20 Mar 2020 09:55:42 -0400
Subject: [PATCH 0288/1830] Migrate pretty-text to `.js` extensions (#9243)

---
 .../{censored-words.js.es6 => censored-words.js}           | 0
 ...classes.js.es6.erb => inline-onebox-css-classes.js.erb} | 0
 .../javascripts/pretty-text/{emoji.js.es6 => emoji.js}     | 0
 .../pretty-text/emoji/{data.js.es6.erb => data.js.erb}     | 0
 .../emoji/{version.js.es6.erb => version.js.erb}           | 0
 ...scourse-markdown-it.js.es6 => discourse-markdown-it.js} | 0
 .../{bbcode-block.js.es6 => bbcode-block.js}               | 0
 .../{bbcode-inline.js.es6 => bbcode-inline.js}             | 0
 .../{category-hashtag.js.es6 => category-hashtag.js}       | 0
 .../discourse-markdown/{censored.js.es6 => censored.js}    | 0
 .../engines/discourse-markdown/{code.js.es6 => code.js}    | 0
 .../discourse-markdown/{d-wrap.js.es6 => d-wrap.js}        | 0
 .../engines/discourse-markdown/{emoji.js.es6 => emoji.js}  | 0
 .../discourse-markdown/{helpers.js.es6 => helpers.js}      | 0
 .../discourse-markdown/{html-img.js.es6 => html-img.js}    | 0
 .../{inject-line-number.js.es6 => inject-line-number.js}   | 0
 .../discourse-markdown/{mentions.js.es6 => mentions.js}    | 0
 .../discourse-markdown/{newline.js.es6 => newline.js}      | 0
 .../discourse-markdown/{onebox.js.es6 => onebox.js}        | 0
 .../discourse-markdown/{paragraph.js.es6 => paragraph.js}  | 0
 .../discourse-markdown/{quotes.js.es6 => quotes.js}        | 0
 .../{resize-controls.js.es6 => resize-controls.js}         | 0
 .../engines/discourse-markdown/{table.js.es6 => table.js}  | 0
 .../{text-post-process.js.es6 => text-post-process.js}     | 0
 .../{upload-protocol.js.es6 => upload-protocol.js}         | 0
 .../javascripts/pretty-text/{guid.js.es6 => guid.js}       | 0
 .../{inline-oneboxer.js.es6 => inline-oneboxer.js}         | 0
 .../{oneboxer-cache.js.es6 => oneboxer-cache.js}           | 0
 .../pretty-text/{oneboxer.js.es6 => oneboxer.js}           | 0
 .../pretty-text/{pretty-text.js.es6 => pretty-text.js}     | 0
 .../pretty-text/{sanitizer.js.es6 => sanitizer.js}         | 0
 .../{upload-short-url.js.es6 => upload-short-url.js}       | 0
 .../pretty-text/{white-lister.js.es6 => white-lister.js}   | 0
 app/assets/javascripts/pretty-text/{xss.js.es6 => xss.js}  | 0
 lib/discourse_js_processor.rb                              | 3 ++-
 lib/pretty_text.rb                                         | 7 +++++--
 36 files changed, 7 insertions(+), 3 deletions(-)
 rename app/assets/javascripts/pretty-text/{censored-words.js.es6 => censored-words.js} (100%)
 rename app/assets/javascripts/pretty-text/context/{inline-onebox-css-classes.js.es6.erb => inline-onebox-css-classes.js.erb} (100%)
 rename app/assets/javascripts/pretty-text/{emoji.js.es6 => emoji.js} (100%)
 rename app/assets/javascripts/pretty-text/emoji/{data.js.es6.erb => data.js.erb} (100%)
 rename app/assets/javascripts/pretty-text/emoji/{version.js.es6.erb => version.js.erb} (100%)
 rename app/assets/javascripts/pretty-text/engines/{discourse-markdown-it.js.es6 => discourse-markdown-it.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{bbcode-block.js.es6 => bbcode-block.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{bbcode-inline.js.es6 => bbcode-inline.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{category-hashtag.js.es6 => category-hashtag.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{censored.js.es6 => censored.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{code.js.es6 => code.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{d-wrap.js.es6 => d-wrap.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{emoji.js.es6 => emoji.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{helpers.js.es6 => helpers.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{html-img.js.es6 => html-img.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{inject-line-number.js.es6 => inject-line-number.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{mentions.js.es6 => mentions.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{newline.js.es6 => newline.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{onebox.js.es6 => onebox.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{paragraph.js.es6 => paragraph.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{quotes.js.es6 => quotes.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{resize-controls.js.es6 => resize-controls.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{table.js.es6 => table.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{text-post-process.js.es6 => text-post-process.js} (100%)
 rename app/assets/javascripts/pretty-text/engines/discourse-markdown/{upload-protocol.js.es6 => upload-protocol.js} (100%)
 rename app/assets/javascripts/pretty-text/{guid.js.es6 => guid.js} (100%)
 rename app/assets/javascripts/pretty-text/{inline-oneboxer.js.es6 => inline-oneboxer.js} (100%)
 rename app/assets/javascripts/pretty-text/{oneboxer-cache.js.es6 => oneboxer-cache.js} (100%)
 rename app/assets/javascripts/pretty-text/{oneboxer.js.es6 => oneboxer.js} (100%)
 rename app/assets/javascripts/pretty-text/{pretty-text.js.es6 => pretty-text.js} (100%)
 rename app/assets/javascripts/pretty-text/{sanitizer.js.es6 => sanitizer.js} (100%)
 rename app/assets/javascripts/pretty-text/{upload-short-url.js.es6 => upload-short-url.js} (100%)
 rename app/assets/javascripts/pretty-text/{white-lister.js.es6 => white-lister.js} (100%)
 rename app/assets/javascripts/pretty-text/{xss.js.es6 => xss.js} (100%)

diff --git a/app/assets/javascripts/pretty-text/censored-words.js.es6 b/app/assets/javascripts/pretty-text/censored-words.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/censored-words.js.es6
rename to app/assets/javascripts/pretty-text/censored-words.js
diff --git a/app/assets/javascripts/pretty-text/context/inline-onebox-css-classes.js.es6.erb b/app/assets/javascripts/pretty-text/context/inline-onebox-css-classes.js.erb
similarity index 100%
rename from app/assets/javascripts/pretty-text/context/inline-onebox-css-classes.js.es6.erb
rename to app/assets/javascripts/pretty-text/context/inline-onebox-css-classes.js.erb
diff --git a/app/assets/javascripts/pretty-text/emoji.js.es6 b/app/assets/javascripts/pretty-text/emoji.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/emoji.js.es6
rename to app/assets/javascripts/pretty-text/emoji.js
diff --git a/app/assets/javascripts/pretty-text/emoji/data.js.es6.erb b/app/assets/javascripts/pretty-text/emoji/data.js.erb
similarity index 100%
rename from app/assets/javascripts/pretty-text/emoji/data.js.es6.erb
rename to app/assets/javascripts/pretty-text/emoji/data.js.erb
diff --git a/app/assets/javascripts/pretty-text/emoji/version.js.es6.erb b/app/assets/javascripts/pretty-text/emoji/version.js.erb
similarity index 100%
rename from app/assets/javascripts/pretty-text/emoji/version.js.es6.erb
rename to app/assets/javascripts/pretty-text/emoji/version.js.erb
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/d-wrap.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/d-wrap.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/d-wrap.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/d-wrap.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/inject-line-number.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/inject-line-number.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/inject-line-number.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/inject-line-number.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js
diff --git a/app/assets/javascripts/pretty-text/guid.js.es6 b/app/assets/javascripts/pretty-text/guid.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/guid.js.es6
rename to app/assets/javascripts/pretty-text/guid.js
diff --git a/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6 b/app/assets/javascripts/pretty-text/inline-oneboxer.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/inline-oneboxer.js.es6
rename to app/assets/javascripts/pretty-text/inline-oneboxer.js
diff --git a/app/assets/javascripts/pretty-text/oneboxer-cache.js.es6 b/app/assets/javascripts/pretty-text/oneboxer-cache.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/oneboxer-cache.js.es6
rename to app/assets/javascripts/pretty-text/oneboxer-cache.js
diff --git a/app/assets/javascripts/pretty-text/oneboxer.js.es6 b/app/assets/javascripts/pretty-text/oneboxer.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/oneboxer.js.es6
rename to app/assets/javascripts/pretty-text/oneboxer.js
diff --git a/app/assets/javascripts/pretty-text/pretty-text.js.es6 b/app/assets/javascripts/pretty-text/pretty-text.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/pretty-text.js.es6
rename to app/assets/javascripts/pretty-text/pretty-text.js
diff --git a/app/assets/javascripts/pretty-text/sanitizer.js.es6 b/app/assets/javascripts/pretty-text/sanitizer.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/sanitizer.js.es6
rename to app/assets/javascripts/pretty-text/sanitizer.js
diff --git a/app/assets/javascripts/pretty-text/upload-short-url.js.es6 b/app/assets/javascripts/pretty-text/upload-short-url.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/upload-short-url.js.es6
rename to app/assets/javascripts/pretty-text/upload-short-url.js
diff --git a/app/assets/javascripts/pretty-text/white-lister.js.es6 b/app/assets/javascripts/pretty-text/white-lister.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/white-lister.js.es6
rename to app/assets/javascripts/pretty-text/white-lister.js
diff --git a/app/assets/javascripts/pretty-text/xss.js.es6 b/app/assets/javascripts/pretty-text/xss.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/xss.js.es6
rename to app/assets/javascripts/pretty-text/xss.js
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 4056dffc46..68bc75ae9a 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -37,7 +37,8 @@ class DiscourseJsProcessor
 
     relative_path = filename.sub(Rails.root.to_s, '').sub(/^\/*/, '')
     relative_path.start_with?("app/assets/javascripts/discourse/") ||
-      relative_path.start_with?("app/assets/javascripts/admin/")
+      relative_path.start_with?("app/assets/javascripts/admin/") ||
+      relative_path.start_with?("app/assets/javascripts/pretty-text/")
   end
 
   def self.skip_module?(data)
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 55faf8d4c1..d29f4e84ee 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -23,6 +23,9 @@ module PrettyText
 
     erb_name = "#{filename}.js.es6.erb"
     return erb_name if File.file?("#{root}#{erb_name}")
+
+    erb_name = "#{filename}.js.erb"
+    return erb_name if File.file?("#{root}#{erb_name}")
   end
 
   def self.apply_es6_file(ctx, root_path, part_name)
@@ -55,7 +58,7 @@ module PrettyText
       elsif l =~ /\/\/= require_tree (\.\/)?(.*)$/
         path = Regexp.last_match[2]
         Dir["#{root_path}/#{path}/**"].sort.each do |f|
-          apply_es6_file(ctx, root_path, f.sub(root_path, '')[1..-1].sub(/\.js.es6$/, ''))
+          apply_es6_file(ctx, root_path, f.sub(root_path, '')[1..-1].sub(/\.js(.es6)?$/, ''))
         end
       end
     end
@@ -94,7 +97,7 @@ module PrettyText
     to_load.uniq.each do |f|
       if f =~ /^.+assets\/javascripts\//
         root = Regexp.last_match[0]
-        apply_es6_file(ctx, root, f.sub(root, '').sub(/\.js\.es6$/, ''))
+        apply_es6_file(ctx, root, f.sub(root, '').sub(/\.js(\.es6)?$/, ''))
       end
     end
 

From 1859e6b7ca1fabd7b11451eff40003db088b4ca3 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 20 Mar 2020 10:43:31 -0400
Subject: [PATCH 0289/1830] FIX: Don't fail if the test environment doesn't
 support Webauthn

---
 .../acceptance/preferences-test.js.es6        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6
index 66af8348ab..4e2f2d5979 100644
--- a/test/javascripts/acceptance/preferences-test.js.es6
+++ b/test/javascripts/acceptance/preferences-test.js.es6
@@ -256,14 +256,19 @@ QUnit.test("second factor security keys", async assert => {
   assert.ok(exists("#security-key-name"), "shows security key name input");
 
   fillIn("#security-key-name", "");
-  await click(".add-security-key");
 
-  assert.ok(
-    find(".alert-error")
-      .html()
-      .indexOf("provide a name") > -1,
-    "shows name missing error message"
-  );
+  // The following tests can only run when Webauthn is enabled. This is not
+  // always the case, for example on a browser running on a non-standard port
+  if (typeof PublicKeyCredential !== "undefined") {
+    await click(".add-security-key");
+
+    assert.ok(
+      find(".alert-error")
+        .html()
+        .indexOf("provide a name") > -1,
+      "shows name missing error message"
+    );
+  }
 });
 
 QUnit.test("default avatar selector", async assert => {

From 20f3be1e9c19a5cec233e16a9579dd503d749e69 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 20 Mar 2020 16:18:34 +0100
Subject: [PATCH 0290/1830] DEV: Use the `type: :multisite` spec setting
 (#9245)

Fixes recent spec flakiness.

Also includes:
DEV: Prevent accidental exit from specs
---
 spec/requests/uploads_controller_spec.rb |  5 +---
 spec/services/inline_uploads_spec.rb     | 36 ++++++++++--------------
 spec/tasks/redis_spec.rb                 |  8 +-----
 spec/tasks/uploads_spec.rb               |  2 +-
 4 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index 1577695f35..e7d66b1ee7 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -401,10 +401,7 @@ describe UploadsController do
           expect(response.code).to eq("403")
         end
 
-        context "when running on a multisite connection" do
-          before do
-            Rails.configuration.multisite = true
-          end
+        context "when running on a multisite connection", type: :multisite do
           it "redirects to the signed_url_for_path with the multisite DB name in the url" do
             freeze_time
             get upload.short_path
diff --git a/spec/services/inline_uploads_spec.rb b/spec/services/inline_uploads_spec.rb
index a087024369..b5bf7ded43 100644
--- a/spec/services/inline_uploads_spec.rb
+++ b/spec/services/inline_uploads_spec.rb
@@ -691,30 +691,24 @@ RSpec.describe InlineUploads do
         MD
       end
 
-      it "should correct image URLs in multisite" do
-        begin
-          Rails.configuration.multisite = true
+      it "should correct image URLs in multisite", type: :multisite do
+        md = <<~MD
+        https:#{upload2.url} https:#{upload2.url}
+        #{URI.join(SiteSetting.s3_cdn_url, URI.parse(upload2.url).path).to_s}
 
-          md = <<~MD
-          https:#{upload2.url} https:#{upload2.url}
-          #{URI.join(SiteSetting.s3_cdn_url, URI.parse(upload2.url).path).to_s}
+        <img src="#{upload.url}" alt="some image">
+        <img src="#{URI.join(SiteSetting.s3_cdn_url, URI.parse(upload2.url).path).to_s}" alt="some image">
+        <img src="#{upload3.url}">
+        MD
 
-          <img src="#{upload.url}" alt="some image">
-          <img src="#{URI.join(SiteSetting.s3_cdn_url, URI.parse(upload2.url).path).to_s}" alt="some image">
-          <img src="#{upload3.url}">
-          MD
+        expect(InlineUploads.process(md)).to eq(<<~MD)
+        #{Discourse.base_url}#{upload2.short_path} #{Discourse.base_url}#{upload2.short_path}
+        #{Discourse.base_url}#{upload2.short_path}
 
-          expect(InlineUploads.process(md)).to eq(<<~MD)
-          #{Discourse.base_url}#{upload2.short_path} #{Discourse.base_url}#{upload2.short_path}
-          #{Discourse.base_url}#{upload2.short_path}
-
-          ![some image](#{upload.short_url})
-          ![some image](#{upload2.short_url})
-          ![](#{upload3.short_url})
-          MD
-        ensure
-          Rails.configuration.multisite = false
-        end
+        ![some image](#{upload.short_url})
+        ![some image](#{upload2.short_url})
+        ![](#{upload3.short_url})
+        MD
       end
     end
   end
diff --git a/spec/tasks/redis_spec.rb b/spec/tasks/redis_spec.rb
index dd9a20f65c..4e22801ab2 100644
--- a/spec/tasks/redis_spec.rb
+++ b/spec/tasks/redis_spec.rb
@@ -2,19 +2,13 @@
 
 require 'rails_helper'
 
-RSpec.describe "Redis rake tasks" do
+RSpec.describe "Redis rake tasks", type: :multisite do
   let(:redis) { Discourse.redis.without_namespace }
 
   before do
-    @multisite = Rails.configuration.multisite
-    Rails.configuration.multisite = true
     Discourse::Application.load_tasks
   end
 
-  after do
-    Rails.configuration.multisite = @multisite
-  end
-
   describe 'clean up' do
     it 'should clean up orphan Redis keys' do
       active_keys = [
diff --git a/spec/tasks/uploads_spec.rb b/spec/tasks/uploads_spec.rb
index 21c769a092..15afad903c 100644
--- a/spec/tasks/uploads_spec.rb
+++ b/spec/tasks/uploads_spec.rb
@@ -43,7 +43,7 @@ RSpec.describe "tasks/uploads" do
     context "when the store is internal" do
       it "does nothing; this is for external store only" do
         Upload.expects(:transaction).never
-        invoke_task
+        expect { invoke_task }.to raise_error(SystemExit)
       end
     end
 

From cfec10a568debe45216137806bfad87e6128bdea Mon Sep 17 00:00:00 2001
From: romanrizzi <rizziromanalejandro@gmail.com>
Date: Fri, 20 Mar 2020 12:28:09 -0300
Subject: [PATCH 0291/1830] FIX: Moderators should be able to review flagged
 PMs since this has always been like this

---
 app/models/reviewable.rb       |  2 +-
 spec/models/reviewable_spec.rb | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 13468019e3..78d4b98e65 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -133,7 +133,7 @@ class Reviewable < ActiveRecord::Base
       target: target,
       topic: topic,
       created_by: created_by,
-      reviewable_by_moderator: reviewable_by_moderator && !(topic&.private_message?),
+      reviewable_by_moderator: reviewable_by_moderator,
       payload: payload,
       potential_spam: potential_spam
     )
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index 30bd5d6855..9b46eb7c52 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -78,17 +78,6 @@ RSpec.describe Reviewable, type: :model do
       expect(r1.pending?).to eq(true)
       expect(r0.pending?).to eq(false)
     end
-
-    it 'sets the reviewable_by_moderator attribute to false when the topic is a PM' do
-      pm_topic = Fabricate(:private_message_topic)
-      post = Fabricate(:post, topic: pm_topic)
-      reviewable = ReviewableFlaggedPost.needs_review!(
-        target: post, topic: pm_topic,
-        created_by: Discourse.system_user, reviewable_by_moderator: true
-      )
-
-      expect(reviewable.reviewable_by_moderator).to eq(false)
-    end
   end
 
   context ".list_for" do

From 69df19a6635ca7a1276312df0599d805cee9769d Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 20 Mar 2020 12:15:58 -0400
Subject: [PATCH 0292/1830] UX: Disable highlight animation on deleted posts

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

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 36ca696ab2..b458f04e37 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -555,6 +555,12 @@ blockquote {
   &.highlighted {
     animation: background-fade-highlight 2.5s ease-out;
   }
+  .deleted & {
+    // Disable so the deleted background is visible immediately
+    &.highlighted {
+      animation: none;
+    }
+  }
 }
 
 .post-info {

From 07813c4a9101fe4c3da6eecdb15793570bb1f471 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 20 Mar 2020 12:40:32 -0400
Subject: [PATCH 0293/1830] Convert select-kit from es6 to js (#9246)

* Convert select-kit from es6 to js

* Hide more git blames
---
 .git-blame-ignore-revs                                      | 6 ++++++
 ...{admin-group-selector.js.es6 => admin-group-selector.js} | 0
 ...s-admin-dropdown.js.es6 => categories-admin-dropdown.js} | 0
 .../{category-chooser.js.es6 => category-chooser.js}        | 0
 .../components/{category-drop.js.es6 => category-drop.js}   | 0
 ...{category-drop-header.js.es6 => category-drop-header.js} | 0
 ...tions-button.js.es6 => category-notifications-button.js} | 0
 .../components/{category-row.js.es6 => category-row.js}     | 0
 .../{category-selector.js.es6 => category-selector.js}      | 0
 .../components/{color-palettes.js.es6 => color-palettes.js} | 0
 .../{color-palettes-row.js.es6 => color-palettes-row.js}    | 0
 .../components/{combo-box.js.es6 => combo-box.js}           | 0
 .../{combo-box-header.js.es6 => combo-box-header.js}        | 0
 .../{composer-actions.js.es6 => composer-actions.js}        | 0
 .../{create-color-row.js.es6 => create-color-row.js}        | 0
 .../{dropdown-select-box.js.es6 => dropdown-select-box.js}  | 0
 ...lect-box-header.js.es6 => dropdown-select-box-header.js} | 0
 ...own-select-box-row.js.es6 => dropdown-select-box-row.js} | 0
 ...-input-selector.js.es6 => future-date-input-selector.js} | 0
 ...r-header.js.es6 => future-date-input-selector-header.js} | 0
 ...elector-row.js.es6 => future-date-input-selector-row.js} | 0
 .../future-date-input-selector/{mixin.js.es6 => mixin.js}   | 0
 .../components/{group-dropdown.js.es6 => group-dropdown.js} | 0
 ...up-members-dropdown.js.es6 => group-members-dropdown.js} | 0
 ...ications-button.js.es6 => group-notifications-button.js} | 0
 .../components/{icon-picker.js.es6 => icon-picker.js}       | 0
 .../components/{list-setting.js.es6 => list-setting.js}     | 0
 .../{mini-tag-chooser.js.es6 => mini-tag-chooser.js}        | 0
 ...tag-chooser-header.js.es6 => mini-tag-chooser-header.js} | 0
 .../{selected-collection.js.es6 => selected-collection.js}  | 0
 .../components/{multi-select.js.es6 => multi-select.js}     | 0
 .../{multi-select-filter.js.es6 => multi-select-filter.js}  | 0
 .../{multi-select-header.js.es6 => multi-select-header.js}  | 0
 .../{selected-category.js.es6 => selected-category.js}      | 0
 .../{selected-color.js.es6 => selected-color.js}            | 0
 .../{none-category-row.js.es6 => none-category-row.js}      | 0
 ...{notifications-button.js.es6 => notifications-button.js} | 0
 ...ations-button-row.js.es6 => notifications-button-row.js} | 0
 .../components/{period-chooser.js.es6 => period-chooser.js} | 0
 ...eriod-chooser-header.js.es6 => period-chooser-header.js} | 0
 .../{period-chooser-row.js.es6 => period-chooser-row.js}    | 0
 .../components/{pinned-button.js.es6 => pinned-button.js}   | 0
 .../components/{pinned-options.js.es6 => pinned-options.js} | 0
 ...y-chooser.js.es6 => search-advanced-category-chooser.js} | 0
 .../components/{select-kit.js.es6 => select-kit.js}         | 0
 .../{errors-collection.js.es6 => errors-collection.js}      | 0
 .../{select-kit-body.js.es6 => select-kit-body.js}          | 0
 ...elect-kit-collection.js.es6 => select-kit-collection.js} | 0
 ...elect-kit-create-row.js.es6 => select-kit-create-row.js} | 0
 .../{select-kit-filter.js.es6 => select-kit-filter.js}      | 0
 .../{select-kit-header.js.es6 => select-kit-header.js}      | 0
 .../{select-kit-none-row.js.es6 => select-kit-none-row.js}  | 0
 .../select-kit/{select-kit-row.js.es6 => select-kit-row.js} | 0
 ...{single-select-header.js.es6 => single-select-header.js} | 0
 .../components/{selected-color.js.es6 => selected-color.js} | 0
 .../components/{selected-name.js.es6 => selected-name.js}   | 0
 .../components/{single-select.js.es6 => single-select.js}   | 0
 .../{tag-chooser-row.js.es6 => tag-chooser-row.js}          | 0
 .../components/{tag-chooser.js.es6 => tag-chooser.js}       | 0
 .../select-kit/components/{tag-drop.js.es6 => tag-drop.js}  | 0
 .../tag-drop/{tag-drop-header.js.es6 => tag-drop-header.js} | 0
 .../{tag-group-chooser.js.es6 => tag-group-chooser.js}      | 0
 ...ifications-button.js.es6 => tag-notifications-button.js} | 0
 .../select-kit/components/{tag-row.js.es6 => tag-row.js}    | 0
 .../components/{timezone-input.js.es6 => timezone-input.js} | 0
 ...up-menu-options.js.es6 => toolbar-popup-menu-options.js} | 0
 ...heading.js.es6 => toolbar-popup-menu-options-heading.js} | 0
 ...bile-dropdown.js.es6 => topic-footer-mobile-dropdown.js} | 0
 ...ications-button.js.es6 => topic-notifications-button.js} | 0
 ...ations-options.js.es6 => topic-notifications-options.js} | 0
 .../components/{user-chooser.js.es6 => user-chooser.js}     | 0
 .../user-chooser/{user-row.js.es6 => user-row.js}           | 0
 ...tions-dropdown.js.es6 => user-notifications-dropdown.js} | 0
 .../select-kit/mixins/{plugin-api.js.es6 => plugin-api.js}  | 0
 .../javascripts/select-kit/mixins/{tags.js.es6 => tags.js}  | 0
 .../select-kit/mixins/{utils.js.es6 => utils.js}            | 0
 lib/discourse_js_processor.rb                               | 3 ++-
 77 files changed, 8 insertions(+), 1 deletion(-)
 rename app/assets/javascripts/select-kit/components/{admin-group-selector.js.es6 => admin-group-selector.js} (100%)
 rename app/assets/javascripts/select-kit/components/{categories-admin-dropdown.js.es6 => categories-admin-dropdown.js} (100%)
 rename app/assets/javascripts/select-kit/components/{category-chooser.js.es6 => category-chooser.js} (100%)
 rename app/assets/javascripts/select-kit/components/{category-drop.js.es6 => category-drop.js} (100%)
 rename app/assets/javascripts/select-kit/components/category-drop/{category-drop-header.js.es6 => category-drop-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/{category-notifications-button.js.es6 => category-notifications-button.js} (100%)
 rename app/assets/javascripts/select-kit/components/{category-row.js.es6 => category-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{category-selector.js.es6 => category-selector.js} (100%)
 rename app/assets/javascripts/select-kit/components/{color-palettes.js.es6 => color-palettes.js} (100%)
 rename app/assets/javascripts/select-kit/components/color-palettes/{color-palettes-row.js.es6 => color-palettes-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{combo-box.js.es6 => combo-box.js} (100%)
 rename app/assets/javascripts/select-kit/components/combo-box/{combo-box-header.js.es6 => combo-box-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/{composer-actions.js.es6 => composer-actions.js} (100%)
 rename app/assets/javascripts/select-kit/components/{create-color-row.js.es6 => create-color-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{dropdown-select-box.js.es6 => dropdown-select-box.js} (100%)
 rename app/assets/javascripts/select-kit/components/dropdown-select-box/{dropdown-select-box-header.js.es6 => dropdown-select-box-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/dropdown-select-box/{dropdown-select-box-row.js.es6 => dropdown-select-box-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{future-date-input-selector.js.es6 => future-date-input-selector.js} (100%)
 rename app/assets/javascripts/select-kit/components/future-date-input-selector/{future-date-input-selector-header.js.es6 => future-date-input-selector-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/future-date-input-selector/{future-date-input-selector-row.js.es6 => future-date-input-selector-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/future-date-input-selector/{mixin.js.es6 => mixin.js} (100%)
 rename app/assets/javascripts/select-kit/components/{group-dropdown.js.es6 => group-dropdown.js} (100%)
 rename app/assets/javascripts/select-kit/components/{group-members-dropdown.js.es6 => group-members-dropdown.js} (100%)
 rename app/assets/javascripts/select-kit/components/{group-notifications-button.js.es6 => group-notifications-button.js} (100%)
 rename app/assets/javascripts/select-kit/components/{icon-picker.js.es6 => icon-picker.js} (100%)
 rename app/assets/javascripts/select-kit/components/{list-setting.js.es6 => list-setting.js} (100%)
 rename app/assets/javascripts/select-kit/components/{mini-tag-chooser.js.es6 => mini-tag-chooser.js} (100%)
 rename app/assets/javascripts/select-kit/components/mini-tag-chooser/{mini-tag-chooser-header.js.es6 => mini-tag-chooser-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/mini-tag-chooser/{selected-collection.js.es6 => selected-collection.js} (100%)
 rename app/assets/javascripts/select-kit/components/{multi-select.js.es6 => multi-select.js} (100%)
 rename app/assets/javascripts/select-kit/components/multi-select/{multi-select-filter.js.es6 => multi-select-filter.js} (100%)
 rename app/assets/javascripts/select-kit/components/multi-select/{multi-select-header.js.es6 => multi-select-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/multi-select/{selected-category.js.es6 => selected-category.js} (100%)
 rename app/assets/javascripts/select-kit/components/multi-select/{selected-color.js.es6 => selected-color.js} (100%)
 rename app/assets/javascripts/select-kit/components/{none-category-row.js.es6 => none-category-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{notifications-button.js.es6 => notifications-button.js} (100%)
 rename app/assets/javascripts/select-kit/components/notifications-button/{notifications-button-row.js.es6 => notifications-button-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{period-chooser.js.es6 => period-chooser.js} (100%)
 rename app/assets/javascripts/select-kit/components/period-chooser/{period-chooser-header.js.es6 => period-chooser-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/period-chooser/{period-chooser-row.js.es6 => period-chooser-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{pinned-button.js.es6 => pinned-button.js} (100%)
 rename app/assets/javascripts/select-kit/components/{pinned-options.js.es6 => pinned-options.js} (100%)
 rename app/assets/javascripts/select-kit/components/{search-advanced-category-chooser.js.es6 => search-advanced-category-chooser.js} (100%)
 rename app/assets/javascripts/select-kit/components/{select-kit.js.es6 => select-kit.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{errors-collection.js.es6 => errors-collection.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{select-kit-body.js.es6 => select-kit-body.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{select-kit-collection.js.es6 => select-kit-collection.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{select-kit-create-row.js.es6 => select-kit-create-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{select-kit-filter.js.es6 => select-kit-filter.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{select-kit-header.js.es6 => select-kit-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{select-kit-none-row.js.es6 => select-kit-none-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{select-kit-row.js.es6 => select-kit-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/select-kit/{single-select-header.js.es6 => single-select-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/{selected-color.js.es6 => selected-color.js} (100%)
 rename app/assets/javascripts/select-kit/components/{selected-name.js.es6 => selected-name.js} (100%)
 rename app/assets/javascripts/select-kit/components/{single-select.js.es6 => single-select.js} (100%)
 rename app/assets/javascripts/select-kit/components/{tag-chooser-row.js.es6 => tag-chooser-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{tag-chooser.js.es6 => tag-chooser.js} (100%)
 rename app/assets/javascripts/select-kit/components/{tag-drop.js.es6 => tag-drop.js} (100%)
 rename app/assets/javascripts/select-kit/components/tag-drop/{tag-drop-header.js.es6 => tag-drop-header.js} (100%)
 rename app/assets/javascripts/select-kit/components/{tag-group-chooser.js.es6 => tag-group-chooser.js} (100%)
 rename app/assets/javascripts/select-kit/components/{tag-notifications-button.js.es6 => tag-notifications-button.js} (100%)
 rename app/assets/javascripts/select-kit/components/{tag-row.js.es6 => tag-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{timezone-input.js.es6 => timezone-input.js} (100%)
 rename app/assets/javascripts/select-kit/components/{toolbar-popup-menu-options.js.es6 => toolbar-popup-menu-options.js} (100%)
 rename app/assets/javascripts/select-kit/components/toolbar-popup-menu-options/{toolbar-popup-menu-options-heading.js.es6 => toolbar-popup-menu-options-heading.js} (100%)
 rename app/assets/javascripts/select-kit/components/{topic-footer-mobile-dropdown.js.es6 => topic-footer-mobile-dropdown.js} (100%)
 rename app/assets/javascripts/select-kit/components/{topic-notifications-button.js.es6 => topic-notifications-button.js} (100%)
 rename app/assets/javascripts/select-kit/components/{topic-notifications-options.js.es6 => topic-notifications-options.js} (100%)
 rename app/assets/javascripts/select-kit/components/{user-chooser.js.es6 => user-chooser.js} (100%)
 rename app/assets/javascripts/select-kit/components/user-chooser/{user-row.js.es6 => user-row.js} (100%)
 rename app/assets/javascripts/select-kit/components/{user-notifications-dropdown.js.es6 => user-notifications-dropdown.js} (100%)
 rename app/assets/javascripts/select-kit/mixins/{plugin-api.js.es6 => plugin-api.js} (100%)
 rename app/assets/javascripts/select-kit/mixins/{tags.js.es6 => tags.js} (100%)
 rename app/assets/javascripts/select-kit/mixins/{utils.js.es6 => utils.js} (100%)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index bf208be1ca..cc4b81d793 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -13,3 +13,9 @@ dafd3c3b47f116c6c1dc56cb18df614c11747733
 
 # Rename admin app es6 -> js
 181758e3248b14ad8b53abe063da8dc6a82d3089
+
+# Rename pretty-text from es6 -> js
+c15056650647e8650288f973d9038500dc9cf7bb
+
+# Rename select kit from es6 -> js
+acc5cbdf8ecb9293a0fa9474ee73baf499c02428
diff --git a/app/assets/javascripts/select-kit/components/admin-group-selector.js.es6 b/app/assets/javascripts/select-kit/components/admin-group-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/admin-group-selector.js.es6
rename to app/assets/javascripts/select-kit/components/admin-group-selector.js
diff --git a/app/assets/javascripts/select-kit/components/categories-admin-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/categories-admin-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/categories-admin-dropdown.js.es6
rename to app/assets/javascripts/select-kit/components/categories-admin-dropdown.js
diff --git a/app/assets/javascripts/select-kit/components/category-chooser.js.es6 b/app/assets/javascripts/select-kit/components/category-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-chooser.js.es6
rename to app/assets/javascripts/select-kit/components/category-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/category-drop.js.es6 b/app/assets/javascripts/select-kit/components/category-drop.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-drop.js.es6
rename to app/assets/javascripts/select-kit/components/category-drop.js
diff --git a/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6 b/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6
rename to app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js
diff --git a/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/category-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-notifications-button.js.es6
rename to app/assets/javascripts/select-kit/components/category-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/components/category-row.js.es6 b/app/assets/javascripts/select-kit/components/category-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-row.js.es6
rename to app/assets/javascripts/select-kit/components/category-row.js
diff --git a/app/assets/javascripts/select-kit/components/category-selector.js.es6 b/app/assets/javascripts/select-kit/components/category-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-selector.js.es6
rename to app/assets/javascripts/select-kit/components/category-selector.js
diff --git a/app/assets/javascripts/select-kit/components/color-palettes.js.es6 b/app/assets/javascripts/select-kit/components/color-palettes.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/color-palettes.js.es6
rename to app/assets/javascripts/select-kit/components/color-palettes.js
diff --git a/app/assets/javascripts/select-kit/components/color-palettes/color-palettes-row.js.es6 b/app/assets/javascripts/select-kit/components/color-palettes/color-palettes-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/color-palettes/color-palettes-row.js.es6
rename to app/assets/javascripts/select-kit/components/color-palettes/color-palettes-row.js
diff --git a/app/assets/javascripts/select-kit/components/combo-box.js.es6 b/app/assets/javascripts/select-kit/components/combo-box.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/combo-box.js.es6
rename to app/assets/javascripts/select-kit/components/combo-box.js
diff --git a/app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js.es6 b/app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js.es6
rename to app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js
diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/composer-actions.js.es6
rename to app/assets/javascripts/select-kit/components/composer-actions.js
diff --git a/app/assets/javascripts/select-kit/components/create-color-row.js.es6 b/app/assets/javascripts/select-kit/components/create-color-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/create-color-row.js.es6
rename to app/assets/javascripts/select-kit/components/create-color-row.js
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box.js.es6 b/app/assets/javascripts/select-kit/components/dropdown-select-box.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/dropdown-select-box.js.es6
rename to app/assets/javascripts/select-kit/components/dropdown-select-box.js
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6 b/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6
rename to app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js.es6 b/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js.es6
rename to app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
rename to app/assets/javascripts/select-kit/components/future-date-input-selector.js
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-header.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-header.js.es6
rename to app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-header.js
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-row.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-row.js.es6
rename to app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-row.js
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js.es6
rename to app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js
diff --git a/app/assets/javascripts/select-kit/components/group-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/group-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/group-dropdown.js.es6
rename to app/assets/javascripts/select-kit/components/group-dropdown.js
diff --git a/app/assets/javascripts/select-kit/components/group-members-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/group-members-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/group-members-dropdown.js.es6
rename to app/assets/javascripts/select-kit/components/group-members-dropdown.js
diff --git a/app/assets/javascripts/select-kit/components/group-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/group-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/group-notifications-button.js.es6
rename to app/assets/javascripts/select-kit/components/group-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/components/icon-picker.js.es6 b/app/assets/javascripts/select-kit/components/icon-picker.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/icon-picker.js.es6
rename to app/assets/javascripts/select-kit/components/icon-picker.js
diff --git a/app/assets/javascripts/select-kit/components/list-setting.js.es6 b/app/assets/javascripts/select-kit/components/list-setting.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/list-setting.js.es6
rename to app/assets/javascripts/select-kit/components/list-setting.js
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
rename to app/assets/javascripts/select-kit/components/mini-tag-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js.es6
rename to app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser/selected-collection.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser/selected-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/mini-tag-chooser/selected-collection.js.es6
rename to app/assets/javascripts/select-kit/components/mini-tag-chooser/selected-collection.js
diff --git a/app/assets/javascripts/select-kit/components/multi-select.js.es6 b/app/assets/javascripts/select-kit/components/multi-select.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/multi-select.js.es6
rename to app/assets/javascripts/select-kit/components/multi-select.js
diff --git a/app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js.es6
rename to app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js
diff --git a/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6
rename to app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-category.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/selected-category.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/multi-select/selected-category.js.es6
rename to app/assets/javascripts/select-kit/components/multi-select/selected-category.js
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/selected-color.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6
rename to app/assets/javascripts/select-kit/components/multi-select/selected-color.js
diff --git a/app/assets/javascripts/select-kit/components/none-category-row.js.es6 b/app/assets/javascripts/select-kit/components/none-category-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/none-category-row.js.es6
rename to app/assets/javascripts/select-kit/components/none-category-row.js
diff --git a/app/assets/javascripts/select-kit/components/notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/notifications-button.js.es6
rename to app/assets/javascripts/select-kit/components/notifications-button.js
diff --git a/app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js.es6 b/app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js.es6
rename to app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js
diff --git a/app/assets/javascripts/select-kit/components/period-chooser.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/period-chooser.js.es6
rename to app/assets/javascripts/select-kit/components/period-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js.es6
rename to app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js
diff --git a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6
rename to app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js
diff --git a/app/assets/javascripts/select-kit/components/pinned-button.js.es6 b/app/assets/javascripts/select-kit/components/pinned-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/pinned-button.js.es6
rename to app/assets/javascripts/select-kit/components/pinned-button.js
diff --git a/app/assets/javascripts/select-kit/components/pinned-options.js.es6 b/app/assets/javascripts/select-kit/components/pinned-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/pinned-options.js.es6
rename to app/assets/javascripts/select-kit/components/pinned-options.js
diff --git a/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6 b/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6
rename to app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/errors-collection.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/errors-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/errors-collection.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/errors-collection.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-body.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-body.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-body.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/select-kit-body.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/single-select-header.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/single-select-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/single-select-header.js.es6
rename to app/assets/javascripts/select-kit/components/select-kit/single-select-header.js
diff --git a/app/assets/javascripts/select-kit/components/selected-color.js.es6 b/app/assets/javascripts/select-kit/components/selected-color.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/selected-color.js.es6
rename to app/assets/javascripts/select-kit/components/selected-color.js
diff --git a/app/assets/javascripts/select-kit/components/selected-name.js.es6 b/app/assets/javascripts/select-kit/components/selected-name.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/selected-name.js.es6
rename to app/assets/javascripts/select-kit/components/selected-name.js
diff --git a/app/assets/javascripts/select-kit/components/single-select.js.es6 b/app/assets/javascripts/select-kit/components/single-select.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/single-select.js.es6
rename to app/assets/javascripts/select-kit/components/single-select.js
diff --git a/app/assets/javascripts/select-kit/components/tag-chooser-row.js.es6 b/app/assets/javascripts/select-kit/components/tag-chooser-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-chooser-row.js.es6
rename to app/assets/javascripts/select-kit/components/tag-chooser-row.js
diff --git a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/tag-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-chooser.js.es6
rename to app/assets/javascripts/select-kit/components/tag-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-drop.js.es6
rename to app/assets/javascripts/select-kit/components/tag-drop.js
diff --git a/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js.es6
rename to app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js
diff --git a/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6 b/app/assets/javascripts/select-kit/components/tag-group-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6
rename to app/assets/javascripts/select-kit/components/tag-group-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/tag-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6
rename to app/assets/javascripts/select-kit/components/tag-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/components/tag-row.js.es6 b/app/assets/javascripts/select-kit/components/tag-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-row.js.es6
rename to app/assets/javascripts/select-kit/components/tag-row.js
diff --git a/app/assets/javascripts/select-kit/components/timezone-input.js.es6 b/app/assets/javascripts/select-kit/components/timezone-input.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/timezone-input.js.es6
rename to app/assets/javascripts/select-kit/components/timezone-input.js
diff --git a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6 b/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6
rename to app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js
diff --git a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js.es6 b/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js.es6
rename to app/assets/javascripts/select-kit/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
diff --git a/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6
rename to app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js
diff --git a/app/assets/javascripts/select-kit/components/topic-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/topic-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/topic-notifications-button.js.es6
rename to app/assets/javascripts/select-kit/components/topic-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/components/topic-notifications-options.js.es6 b/app/assets/javascripts/select-kit/components/topic-notifications-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/topic-notifications-options.js.es6
rename to app/assets/javascripts/select-kit/components/topic-notifications-options.js
diff --git a/app/assets/javascripts/select-kit/components/user-chooser.js.es6 b/app/assets/javascripts/select-kit/components/user-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/user-chooser.js.es6
rename to app/assets/javascripts/select-kit/components/user-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/user-chooser/user-row.js.es6 b/app/assets/javascripts/select-kit/components/user-chooser/user-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/user-chooser/user-row.js.es6
rename to app/assets/javascripts/select-kit/components/user-chooser/user-row.js
diff --git a/app/assets/javascripts/select-kit/components/user-notifications-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/user-notifications-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/user-notifications-dropdown.js.es6
rename to app/assets/javascripts/select-kit/components/user-notifications-dropdown.js
diff --git a/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6 b/app/assets/javascripts/select-kit/mixins/plugin-api.js
similarity index 100%
rename from app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
rename to app/assets/javascripts/select-kit/mixins/plugin-api.js
diff --git a/app/assets/javascripts/select-kit/mixins/tags.js.es6 b/app/assets/javascripts/select-kit/mixins/tags.js
similarity index 100%
rename from app/assets/javascripts/select-kit/mixins/tags.js.es6
rename to app/assets/javascripts/select-kit/mixins/tags.js
diff --git a/app/assets/javascripts/select-kit/mixins/utils.js.es6 b/app/assets/javascripts/select-kit/mixins/utils.js
similarity index 100%
rename from app/assets/javascripts/select-kit/mixins/utils.js.es6
rename to app/assets/javascripts/select-kit/mixins/utils.js
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 68bc75ae9a..5ba3673b2f 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -38,7 +38,8 @@ class DiscourseJsProcessor
     relative_path = filename.sub(Rails.root.to_s, '').sub(/^\/*/, '')
     relative_path.start_with?("app/assets/javascripts/discourse/") ||
       relative_path.start_with?("app/assets/javascripts/admin/") ||
-      relative_path.start_with?("app/assets/javascripts/pretty-text/")
+      relative_path.start_with?("app/assets/javascripts/pretty-text/") ||
+      relative_path.start_with?("app/assets/javascripts/select-kit/")
   end
 
   def self.skip_module?(data)

From 0d3386d25597edba4809fdad9e0489e2ad04917e Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 20 Mar 2020 15:24:45 -0400
Subject: [PATCH 0294/1830] Revert "FIX: correctly remove authentication_data
 cookie on oauth login flow (#9238)"

This reverts commit a1f9b1a7fc909b326eba73f6fb1bfcbc0d9240c0.

This might have caused a problem with social logins. We are confirming
via this revert and will follow up.
---
 .../users/omniauth_callbacks_controller.rb    |  5 +---
 app/views/layouts/application.html.erb        |  4 ++--
 .../omniauth_callbacks_controller_spec.rb     | 24 -------------------
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 31c14c66ca..881fb3e9ec 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -74,10 +74,7 @@ class Users::OmniauthCallbacksController < ApplicationController
       @auth_result.authenticator_name = authenticator.name
       complete_response_data
       cookies['_bypass_cache'] = true
-      cookies[:authentication_data] = {
-        value: @auth_result.to_client_hash.to_json,
-        path: Discourse.base_uri
-      }
+      cookies[:authentication_data] = @auth_result.to_client_hash.to_json
       redirect_to @origin
     end
   end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 9f3682b411..6c1f3b3074 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -58,8 +58,8 @@
 
     <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
 
-    <%- if data = cookies.delete(:authentication_data, path: Discourse.base_uri) && !current_user  %>
-      <meta id="data-authentication" data-authentication-data="<%= data %>">
+    <%- if !current_user && cookies[:authentication_data] %>
+      <meta id="data-authentication" data-authentication-data="<%= cookies.delete(:authentication_data) %>">
     <%- end %>
   </head>
 
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index e604a89aba..204c3f1572 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -269,30 +269,6 @@ RSpec.describe Users::OmniauthCallbacksController do
         expect(user.email_confirmed?).to eq(true)
       end
 
-      it 'should return the authenticated response with the correct path for subfolders' do
-        set_subfolder "/forum"
-        events = DiscourseEvent.track_events do
-          get "/auth/google_oauth2/callback.json"
-        end
-
-        expect(response.headers["Set-Cookie"].match(/^authentication_data=.*; path=\/forum/)).not_to eq(nil)
-
-        expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
-
-        expect(response.status).to eq(302)
-
-        data = JSON.parse(response.cookies["authentication_data"])
-
-        expect(data["authenticated"]).to eq(true)
-        expect(data["awaiting_activation"]).to eq(false)
-        expect(data["awaiting_approval"]).to eq(false)
-        expect(data["not_allowed_from_ip_address"]).to eq(false)
-        expect(data["admin_not_allowed_from_ip_address"]).to eq(false)
-
-        user.reload
-        expect(user.email_confirmed?).to eq(true)
-      end
-
       it "should confirm email even when the tokens are expired" do
         user.email_tokens.update_all(confirmed: false, expired: true)
 

From 330102fd20d6a3ecf144cce4928379226a58dc5c Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Fri, 20 Mar 2020 11:29:00 -0700
Subject: [PATCH 0295/1830] FEATURE: Show votes in an "on voted" poll to the
 creator

This required properly plumbing the guardian into the serializer.

Notably, the default state in the client was not changed - if you haven't voted in
the poll, you need to click the button to view the results instead of the results
being immediately visible on page load.

Implements https://meta.discourse.org/t/-/138108
---
 plugins/poll/app/models/poll.rb                   |  6 +++++-
 plugins/poll/app/serializers/poll_serializer.rb   |  2 +-
 .../javascripts/widgets/discourse-poll.js.es6     |  3 ++-
 plugins/poll/lib/polls_updater.rb                 |  2 +-
 plugins/poll/plugin.rb                            | 15 +++++++++------
 plugins/poll/spec/models/poll_spec.rb             | 13 ++++++++++++-
 6 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/plugins/poll/app/models/poll.rb b/plugins/poll/app/models/poll.rb
index fcf71f9158..4f7e0bd584 100644
--- a/plugins/poll/app/models/poll.rb
+++ b/plugins/poll/app/models/poll.rb
@@ -47,7 +47,11 @@ class Poll < ActiveRecord::Base
 
   def can_see_results?(user)
     return !!user&.staff? if staff_only?
-    !!(always? || (on_vote? && has_voted?(user)) || is_closed?)
+    !!(always? || (on_vote? && (is_me?(user) || has_voted?(user))) || is_closed?)
+  end
+
+  def is_me?(user)
+    user && post.user&.id == user&.id
   end
 
   def has_voted?(user)
diff --git a/plugins/poll/app/serializers/poll_serializer.rb b/plugins/poll/app/serializers/poll_serializer.rb
index 53b7c1d5e2..c540d7b34b 100644
--- a/plugins/poll/app/serializers/poll_serializer.rb
+++ b/plugins/poll/app/serializers/poll_serializer.rb
@@ -61,7 +61,7 @@ class PollSerializer < ApplicationSerializer
   end
 
   def include_preloaded_voters?
-    object.can_see_voters?(scope)
+    object.can_see_voters?(scope.user)
   end
 
 end
diff --git a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
index 1f71dea021..9564ec89e0 100644
--- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
+++ b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
@@ -678,6 +678,7 @@ createWidget("discourse-poll-buttons", {
     const staffOnly = poll.results === "staff_only";
     const isStaff = this.currentUser && this.currentUser.staff;
     const isAdmin = this.currentUser && this.currentUser.admin;
+    const isMe = this.currentUser && post.user_id === this.currentUser.id;
     const dataExplorerEnabled = this.siteSettings.data_explorer_enabled;
     const hideResultsDisabled = !staffOnly && (closed || topicArchived);
     const exportQueryID = this.siteSettings.poll_export_data_explorer_query_id;
@@ -710,7 +711,7 @@ createWidget("discourse-poll-buttons", {
         })
       );
     } else {
-      if (poll.get("results") === "on_vote" && !attrs.hasVoted) {
+      if (poll.get("results") === "on_vote" && !attrs.hasVoted && !isMe) {
         contents.push(infoTextHtml(I18n.t("poll.results.vote.title")));
       } else if (poll.get("results") === "on_close" && !closed) {
         contents.push(infoTextHtml(I18n.t("poll.results.closed.title")));
diff --git a/plugins/poll/lib/polls_updater.rb b/plugins/poll/lib/polls_updater.rb
index 1b2e62f8a1..f50edc0f4e 100644
--- a/plugins/poll/lib/polls_updater.rb
+++ b/plugins/poll/lib/polls_updater.rb
@@ -93,7 +93,7 @@ module DiscoursePoll
 
         if has_changed
           polls = ::Poll.includes(poll_options: :poll_votes).where(post: post)
-          polls = ActiveModel::ArraySerializer.new(polls, each_serializer: PollSerializer, root: false).as_json
+          polls = ActiveModel::ArraySerializer.new(polls, each_serializer: PollSerializer, root: false, scope: Guardian.new(nil)).as_json
           post.publish_message!("/polls/#{post.topic_id}", post_id: post.id, polls: polls)
         end
       end
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index bf5163295b..e0c1057e36 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -62,7 +62,8 @@ after_initialize do
           end
 
           # user must be allowed to post in topic
-          if !Guardian.new(user).can_create_post?(post.topic)
+          guardian = Guardian.new(user)
+          if !guardian.can_create_post?(post.topic)
             raise StandardError.new I18n.t("poll.user_cant_post_in_topic")
           end
 
@@ -108,7 +109,7 @@ after_initialize do
 
           poll.reload
 
-          serialized_poll = PollSerializer.new(poll, root: false).as_json
+          serialized_poll = PollSerializer.new(poll, root: false, scope: guardian).as_json
           payload = { post_id: post_id, polls: [serialized_poll] }
 
           post.publish_message!("/polls/#{post.topic_id}", payload)
@@ -120,6 +121,7 @@ after_initialize do
       def toggle_status(post_id, poll_name, status, user, raise_errors = true)
         Poll.transaction do
           post = Post.find_by(id: post_id)
+          guardian = Guardian.new(user)
 
           # post must not be deleted
           if post.nil? || post.trashed?
@@ -149,7 +151,7 @@ after_initialize do
           poll.status = status
           poll.save!
 
-          serialized_poll = PollSerializer.new(poll, root: false).as_json
+          serialized_poll = PollSerializer.new(poll, root: false, scope: guardian).as_json
           payload = { post_id: post_id, polls: [serialized_poll] }
 
           post.publish_message!("/polls/#{post.topic_id}", payload)
@@ -542,11 +544,12 @@ after_initialize do
     end
   end
 
-  on(:post_created) do |post|
+  on(:post_created) do |post, _opts, user|
+    guardian = Guardian.new(user)
     DiscoursePoll::Poll.schedule_jobs(post)
 
     unless post.is_first_post?
-      polls = ActiveModel::ArraySerializer.new(post.polls, each_serializer: PollSerializer, root: false).as_json
+      polls = ActiveModel::ArraySerializer.new(post.polls, each_serializer: PollSerializer, root: false, scope: guardian).as_json
       post.publish_message!("/polls/#{post.topic_id}", post_id: post.id, polls: polls)
     end
   end
@@ -594,7 +597,7 @@ after_initialize do
   end
 
   add_to_serializer(:post, :polls, false) do
-    preloaded_polls.map { |p| PollSerializer.new(p, root: false) }
+    preloaded_polls.map { |p| PollSerializer.new(p, root: false, scope: self.scope) }
   end
 
   add_to_serializer(:post, :include_polls?) do
diff --git a/plugins/poll/spec/models/poll_spec.rb b/plugins/poll/spec/models/poll_spec.rb
index a8df54a2f7..55e6567d47 100644
--- a/plugins/poll/spec/models/poll_spec.rb
+++ b/plugins/poll/spec/models/poll_spec.rb
@@ -31,10 +31,21 @@ describe ::DiscoursePoll::Poll do
       option = poll.poll_options.first
 
       expect(poll.can_see_results?(user)).to eq(false)
-      poll.poll_votes.create!(poll_option_id: option.id , user_id: user.id)
+      poll.poll_votes.create!(poll_option_id: option.id, user_id: user.id)
       expect(poll.can_see_results?(user)).to eq(true)
     end
 
+    it "author can see results when results setting is on_vote" do
+      author = Fabricate(:user)
+      post = Fabricate(:post, user: author, raw: "[poll results=on_vote]\n- A\n- B\n[/poll]")
+      poll = post.polls.first
+      option = poll.poll_options.first
+
+      expect(poll.can_see_results?(author)).to eq(true)
+      poll.poll_votes.create!(poll_option_id: option.id, user_id: author.id)
+      expect(poll.can_see_results?(author)).to eq(true)
+    end
+
     it "everyone can see results when results setting is on_vote and poll is closed" do
       post = Fabricate(:post, raw: "[poll results=on_vote]\n- A\n- B\n[/poll]")
       user = Fabricate(:user)

From beaeb0c4b2ba0d273d7707d2fbc79feb63083a81 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Fri, 20 Mar 2020 11:03:38 -1000
Subject: [PATCH 0296/1830] FIX: correctly remove authentication_data cookie on
 oauth login flow (#9238) (#9251)

Attempt 2, with more test.

Additionally correctly handle cookie path for authentication_data

There were two bugs that exposed an interesting case where two discourse
instances hosted across two subfolder installs in the same domain
with oauth may clash and cause strange redirection on first login:

Log in to example.com/forum1. authentication_data cookie is set with path /
On the first redirection, the current authentication_data cookie is not unset.
Log in to example.com/forum2. In this case, the authentication_data cookie
is already set from forum1 - the initial page load will incorrectly redirect
the user to the redirect URL from the already-stored cookie, to /forum1.

This removes this issue by:

Setting the cookie for the correct path, and not having it on root
Correctly removing the cookie on first login
---
 .../users/omniauth_callbacks_controller.rb    |  5 +++-
 app/views/layouts/application.html.erb        |  4 ++--
 spec/requests/application_controller_spec.rb  |  8 +++++++
 .../omniauth_callbacks_controller_spec.rb     | 24 +++++++++++++++++++
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 881fb3e9ec..31c14c66ca 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -74,7 +74,10 @@ class Users::OmniauthCallbacksController < ApplicationController
       @auth_result.authenticator_name = authenticator.name
       complete_response_data
       cookies['_bypass_cache'] = true
-      cookies[:authentication_data] = @auth_result.to_client_hash.to_json
+      cookies[:authentication_data] = {
+        value: @auth_result.to_client_hash.to_json,
+        path: Discourse.base_uri
+      }
       redirect_to @origin
     end
   end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 6c1f3b3074..7fa77c809a 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -58,8 +58,8 @@
 
     <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
 
-    <%- if !current_user && cookies[:authentication_data] %>
-      <meta id="data-authentication" data-authentication-data="<%= cookies.delete(:authentication_data) %>">
+    <%- if (data = cookies.delete(:authentication_data, path: Discourse.base_uri)) && !current_user  %>
+      <meta id="data-authentication" data-authentication-data="<%= data %>">
     <%- end %>
   </head>
 
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index 4aaf547e33..2c65450ae6 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -84,6 +84,14 @@ RSpec.describe ApplicationController do
         expect(response).to redirect_to("/login")
       end
     end
+
+    it 'contains authentication data when cookies exist' do
+      COOKIE_DATA = "someauthenticationdata"
+      cookies['authentication_data'] = COOKIE_DATA
+      get '/login'
+      expect(response.status).to eq(200)
+      expect(response.body).to include("data-authentication-data=\"#{COOKIE_DATA }\"")
+    end
   end
 
   describe '#redirect_to_second_factor_if_required' do
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index 204c3f1572..e604a89aba 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -269,6 +269,30 @@ RSpec.describe Users::OmniauthCallbacksController do
         expect(user.email_confirmed?).to eq(true)
       end
 
+      it 'should return the authenticated response with the correct path for subfolders' do
+        set_subfolder "/forum"
+        events = DiscourseEvent.track_events do
+          get "/auth/google_oauth2/callback.json"
+        end
+
+        expect(response.headers["Set-Cookie"].match(/^authentication_data=.*; path=\/forum/)).not_to eq(nil)
+
+        expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
+
+        expect(response.status).to eq(302)
+
+        data = JSON.parse(response.cookies["authentication_data"])
+
+        expect(data["authenticated"]).to eq(true)
+        expect(data["awaiting_activation"]).to eq(false)
+        expect(data["awaiting_approval"]).to eq(false)
+        expect(data["not_allowed_from_ip_address"]).to eq(false)
+        expect(data["admin_not_allowed_from_ip_address"]).to eq(false)
+
+        user.reload
+        expect(user.email_confirmed?).to eq(true)
+      end
+
       it "should confirm email even when the tokens are expired" do
         user.email_tokens.update_all(confirmed: false, expired: true)
 

From 4ecc0a25aeb0114dcb1c0c02253c089547e7af92 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Fri, 20 Mar 2020 14:37:55 -0700
Subject: [PATCH 0297/1830] Revert "FIX: correctly remove authentication_data
 cookie on oauth login flow (#9238) (#9251)"

This reverts commit beaeb0c4b2ba0d273d7707d2fbc79feb63083a81.
---
 .../users/omniauth_callbacks_controller.rb    |  5 +---
 app/views/layouts/application.html.erb        |  4 ++--
 spec/requests/application_controller_spec.rb  |  8 -------
 .../omniauth_callbacks_controller_spec.rb     | 24 -------------------
 4 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 31c14c66ca..881fb3e9ec 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -74,10 +74,7 @@ class Users::OmniauthCallbacksController < ApplicationController
       @auth_result.authenticator_name = authenticator.name
       complete_response_data
       cookies['_bypass_cache'] = true
-      cookies[:authentication_data] = {
-        value: @auth_result.to_client_hash.to_json,
-        path: Discourse.base_uri
-      }
+      cookies[:authentication_data] = @auth_result.to_client_hash.to_json
       redirect_to @origin
     end
   end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 7fa77c809a..6c1f3b3074 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -58,8 +58,8 @@
 
     <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
 
-    <%- if (data = cookies.delete(:authentication_data, path: Discourse.base_uri)) && !current_user  %>
-      <meta id="data-authentication" data-authentication-data="<%= data %>">
+    <%- if !current_user && cookies[:authentication_data] %>
+      <meta id="data-authentication" data-authentication-data="<%= cookies.delete(:authentication_data) %>">
     <%- end %>
   </head>
 
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index 2c65450ae6..4aaf547e33 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -84,14 +84,6 @@ RSpec.describe ApplicationController do
         expect(response).to redirect_to("/login")
       end
     end
-
-    it 'contains authentication data when cookies exist' do
-      COOKIE_DATA = "someauthenticationdata"
-      cookies['authentication_data'] = COOKIE_DATA
-      get '/login'
-      expect(response.status).to eq(200)
-      expect(response.body).to include("data-authentication-data=\"#{COOKIE_DATA }\"")
-    end
   end
 
   describe '#redirect_to_second_factor_if_required' do
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index e604a89aba..204c3f1572 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -269,30 +269,6 @@ RSpec.describe Users::OmniauthCallbacksController do
         expect(user.email_confirmed?).to eq(true)
       end
 
-      it 'should return the authenticated response with the correct path for subfolders' do
-        set_subfolder "/forum"
-        events = DiscourseEvent.track_events do
-          get "/auth/google_oauth2/callback.json"
-        end
-
-        expect(response.headers["Set-Cookie"].match(/^authentication_data=.*; path=\/forum/)).not_to eq(nil)
-
-        expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
-
-        expect(response.status).to eq(302)
-
-        data = JSON.parse(response.cookies["authentication_data"])
-
-        expect(data["authenticated"]).to eq(true)
-        expect(data["awaiting_activation"]).to eq(false)
-        expect(data["awaiting_approval"]).to eq(false)
-        expect(data["not_allowed_from_ip_address"]).to eq(false)
-        expect(data["admin_not_allowed_from_ip_address"]).to eq(false)
-
-        user.reload
-        expect(user.email_confirmed?).to eq(true)
-      end
-
       it "should confirm email even when the tokens are expired" do
         user.email_tokens.update_all(confirmed: false, expired: true)
 

From 3215f2b6ee683b4a1290f8fd61c08ab7ac27090d Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 20 Mar 2020 22:06:20 +0000
Subject: [PATCH 0298/1830] FIX: Permalinks should redirect to category URL
 including the ID

This is a temporary fix. Urls for third-level categories should function without the id. Once that is fixed, this change can be reverted
---
 app/models/permalink.rb       | 2 +-
 spec/models/permalink_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/permalink.rb b/app/models/permalink.rb
index c6c28026ee..925f640f7e 100644
--- a/app/models/permalink.rb
+++ b/app/models/permalink.rb
@@ -79,7 +79,7 @@ class Permalink < ActiveRecord::Base
     return external_url if external_url
     return "#{Discourse::base_uri}#{post.url}" if post
     return topic.relative_url if topic
-    return category.url if category
+    return "#{category.url}/#{category.id}" if category
     nil
   end
 
diff --git a/spec/models/permalink_spec.rb b/spec/models/permalink_spec.rb
index 15c47b0032..8cd9d30a46 100644
--- a/spec/models/permalink_spec.rb
+++ b/spec/models/permalink_spec.rb
@@ -62,7 +62,7 @@ describe Permalink do
 
     it "returns a category url when category_id is set" do
       permalink.category_id = category.id
-      expect(target_url).to eq(category.url)
+      expect(target_url).to eq("#{category.url}/#{category.id}")
     end
 
     it "returns nil when category_id is set but category is not found" do

From dbfec4b268c5e70cea75254eb4c624df91739acd Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 20 Mar 2020 22:26:45 +0000
Subject: [PATCH 0299/1830] DEV: Update spec for category permalink

Followup to 3215f2b6ee683b4a1290f8fd61c08ab7ac27090d
---
 spec/requests/application_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index 4aaf547e33..f933429114 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -297,7 +297,7 @@ RSpec.describe ApplicationController do
         permalink = Permalink.create!(url: trashed_topic.relative_url, category_id: category.id)
         get "/t/#{trashed_topic.slug}/#{trashed_topic.id}"
         expect(response.status).to eq(301)
-        expect(response).to redirect_to("/forum/c/#{category.slug}")
+        expect(response).to redirect_to("/forum/c/#{category.slug}/#{category.id}")
 
         permalink.destroy
         permalink = Permalink.create!(url: trashed_topic.relative_url, post_id: new_topic.posts.last.id)

From c97244ca115c6e8d287d9c4e6033bf3e1d084f70 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Sat, 21 Mar 2020 07:33:10 -0600
Subject: [PATCH 0300/1830] FIX: post edited webhook does not reflect updated
 topic title

This fix ensures that when a topic title is edited the new title shows
up in the post webhook instead of the old title.

Rather than passing in the old topic object to the PostRevisor the
PostRevisor initializer will load the updated topic object inside of the
initializer if you don't pass it in. This will allow the post_edited
webhook to have the correct topic values.

Original bug reported at:

https://meta.discourse.org/t/post-edited-webhook-does-not-reflect-updated-topic-title/144722
---
 app/controllers/topics_controller.rb    |  2 +-
 spec/requests/topics_controller_spec.rb | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 0deb6b2efd..99ff5fb625 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -366,7 +366,7 @@ class TopicsController < ApplicationController
 
     if changes.length > 0
       first_post = topic.ordered_posts.first
-      success = PostRevisor.new(first_post, topic).revise!(current_user, changes, validate_post: false)
+      success = PostRevisor.new(first_post).revise!(current_user, changes, validate_post: false)
     end
 
     # this is used to return the title to the client as it may have been changed by "TextCleaner"
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 0f0a921e9e..947d244971 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -946,6 +946,9 @@ RSpec.describe TopicsController do
       end
 
       describe 'with permission' do
+        fab!(:post_hook) { Fabricate(:post_web_hook) }
+        fab!(:topic_hook) { Fabricate(:topic_web_hook) }
+
         it 'succeeds' do
           put "/t/#{topic.slug}/#{topic.id}.json"
 
@@ -971,6 +974,13 @@ RSpec.describe TopicsController do
 
           topic.reload
           expect(topic.title).to eq('This is a new title for the topic')
+
+          expect(Jobs::EmitWebHookEvent.jobs.length).to eq(2)
+          job_args = Jobs::EmitWebHookEvent.jobs[0]["args"].first
+
+          expect(job_args["event_name"]).to eq("post_edited")
+          payload = JSON.parse(job_args["payload"])
+          expect(payload["topic_title"]).to eq('This is a new title for the topic')
         end
 
         it "returns errors with invalid titles" do

From 3189dab622dead97d73651af99f2cf23ed6e188f Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Sat, 21 Mar 2020 13:24:49 -0700
Subject: [PATCH 0301/1830] FIX: correctly remove authentication_data cookie on
 oauth login flow

Additionally correctly handle cookie path for authentication_data

There were two bugs that exposed an interesting case where two discourse
instances hosted across two subfolder installs in the same domain
with oauth may clash and cause strange redirection on first login:

Log in to example.com/forum1. authentication_data cookie is set with path /
On the first redirection, the current authentication_data cookie is not unset.
Log in to example.com/forum2. In this case, the authentication_data cookie
is already set from forum1 - the initial page load will incorrectly redirect
the user to the redirect URL from the already-stored cookie, to /forum1.

This removes this issue by:

* Setting the cookie for the correct path, and not having it on root
* Correctly removing the cookie on first login
---
 .../users/omniauth_callbacks_controller.rb    |  5 +++-
 app/views/layouts/application.html.erb        |  4 ++--
 spec/requests/application_controller_spec.rb  |  8 +++++++
 .../omniauth_callbacks_controller_spec.rb     | 24 +++++++++++++++++++
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 881fb3e9ec..4bcd8c8f5f 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -74,7 +74,10 @@ class Users::OmniauthCallbacksController < ApplicationController
       @auth_result.authenticator_name = authenticator.name
       complete_response_data
       cookies['_bypass_cache'] = true
-      cookies[:authentication_data] = @auth_result.to_client_hash.to_json
+      cookies[:authentication_data] = {
+        value: @auth_result.to_client_hash.to_json,
+        path: Discourse.base_uri("/")
+      }
       redirect_to @origin
     end
   end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 6c1f3b3074..0b037d521f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -58,8 +58,8 @@
 
     <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
 
-    <%- if !current_user && cookies[:authentication_data] %>
-      <meta id="data-authentication" data-authentication-data="<%= cookies.delete(:authentication_data) %>">
+    <%- if !current_user && (data = cookies.delete(:authentication_data, path: Discourse.base_uri("/"))) %>
+      <meta id="data-authentication" data-authentication-data="<%= data %>">
     <%- end %>
   </head>
 
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index f933429114..4d551942f6 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -84,6 +84,14 @@ RSpec.describe ApplicationController do
         expect(response).to redirect_to("/login")
       end
     end
+
+    it 'contains authentication data when cookies exist' do
+      COOKIE_DATA = "someauthenticationdata"
+      cookies['authentication_data'] = COOKIE_DATA
+      get '/login'
+      expect(response.status).to eq(200)
+      expect(response.body).to include("data-authentication-data=\"#{COOKIE_DATA }\"")
+    end
   end
 
   describe '#redirect_to_second_factor_if_required' do
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index 204c3f1572..e604a89aba 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -269,6 +269,30 @@ RSpec.describe Users::OmniauthCallbacksController do
         expect(user.email_confirmed?).to eq(true)
       end
 
+      it 'should return the authenticated response with the correct path for subfolders' do
+        set_subfolder "/forum"
+        events = DiscourseEvent.track_events do
+          get "/auth/google_oauth2/callback.json"
+        end
+
+        expect(response.headers["Set-Cookie"].match(/^authentication_data=.*; path=\/forum/)).not_to eq(nil)
+
+        expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
+
+        expect(response.status).to eq(302)
+
+        data = JSON.parse(response.cookies["authentication_data"])
+
+        expect(data["authenticated"]).to eq(true)
+        expect(data["awaiting_activation"]).to eq(false)
+        expect(data["awaiting_approval"]).to eq(false)
+        expect(data["not_allowed_from_ip_address"]).to eq(false)
+        expect(data["admin_not_allowed_from_ip_address"]).to eq(false)
+
+        user.reload
+        expect(user.email_confirmed?).to eq(true)
+      end
+
       it "should confirm email even when the tokens are expired" do
         user.email_tokens.update_all(confirmed: false, expired: true)
 

From c4bc734b11ba310086b1a7ab28f0d57e6a6030d8 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Mon, 23 Mar 2020 01:08:18 -0300
Subject: [PATCH 0302/1830] FIX: Backfill topic timer duration (#9249)

---
 app/services/topic_status_updater.rb          |  2 +-
 ...0193612_back_fill_topic_timer_durations.rb | 20 +++++++++++++++++++
 lib/post_creator.rb                           |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20200320193612_back_fill_topic_timer_durations.rb

diff --git a/app/services/topic_status_updater.rb b/app/services/topic_status_updater.rb
index f3aa541199..795538cbd0 100644
--- a/app/services/topic_status_updater.rb
+++ b/app/services/topic_status_updater.rb
@@ -89,7 +89,7 @@ TopicStatusUpdater = Struct.new(:topic, :user) do
   def message_for_autoclosed(locale_key)
     num_minutes =
       if @topic_status_update&.based_on_last_post
-        @topic_status_update.duration.hours
+        (@topic_status_update.duration || 0).hours
       elsif @topic_status_update&.created_at
         Time.zone.now - @topic_status_update.created_at
       else
diff --git a/db/migrate/20200320193612_back_fill_topic_timer_durations.rb b/db/migrate/20200320193612_back_fill_topic_timer_durations.rb
new file mode 100644
index 0000000000..a4174413e2
--- /dev/null
+++ b/db/migrate/20200320193612_back_fill_topic_timer_durations.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class BackFillTopicTimerDurations < ActiveRecord::Migration[6.0]
+  def up
+    DB.exec <<~SQL
+      UPDATE topic_timers
+      SET duration = 0
+      WHERE duration IS NULL AND (execute_at IS NULL OR created_at IS NULL)
+    SQL
+
+    DB.exec <<~SQL
+      UPDATE topic_timers
+      SET duration = EXTRACT(EPOCH FROM execute_at - created_at) / 3600
+      WHERE duration IS NULL AND execute_at IS NOT NULL AND created_at IS NOT NULL
+    SQL
+  end
+
+  def down
+  end
+end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 0e89a93ba1..39fe22c283 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -470,7 +470,7 @@ class PostCreator
 
       if topic_timer &&
          topic_timer.based_on_last_post &&
-         topic_timer.duration > 0
+         topic_timer.duration.to_i > 0
 
         @topic.set_or_create_timer(TopicTimer.types[:close],
           nil,

From 445b35381d82a9ab34a02e66484aa9e700da9872 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Mon, 23 Mar 2020 09:13:36 +0100
Subject: [PATCH 0303/1830] Improve Telligent import script

* Detects mostly all attachments and it's a lot faster
* Parses user properties in Ruby instead of the DB, because that's less errorprone
* Imports user avatars
* Imports topic views by users
* Better handling of quotes and YouTube links
---
 script/import_scripts/telligent.rb | 313 +++++++++++++++++++----------
 1 file changed, 207 insertions(+), 106 deletions(-)

diff --git a/script/import_scripts/telligent.rb b/script/import_scripts/telligent.rb
index 6fb3c775f0..0e166523cd 100644
--- a/script/import_scripts/telligent.rb
+++ b/script/import_scripts/telligent.rb
@@ -42,11 +42,43 @@ class ImportScripts::Telligent < ImportScripts::Base
   BATCH_SIZE ||= 1000
   LOCAL_AVATAR_REGEX ||= /\A~\/.*(?<directory>communityserver-components-(?:selectable)?avatars)\/(?<path>[^\/]+)\/(?<filename>.+)/i
   REMOTE_AVATAR_REGEX ||= /\Ahttps?:\/\//i
-  EMBEDDED_ATTACHMENT_REGEX ||= /<a href="\/cfs-file(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename1>.+?)".*?>(?<filename2>.*?)<\/a>/i
+  EMBEDDED_ATTACHMENT_REGEX ||= /<a href="\/cfs-file(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)".*?>.*?<\/a>/i
+  EMBEDDED_VIEW_ATTACHMENT_REGEX ||= /\[View:~\/cfs-file(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)(?:\:[:\d\s]*?)\]/i
+  PROPERTY_NAMES_REGEX ||= /(?<name>\w+):S:(?<start>\d+):(?<length>\d+):/
 
   CATEGORY_LINK_NORMALIZATION = '/.*?(f\/\d+)$/\1'
   TOPIC_LINK_NORMALIZATION = '/.*?(f\/\d+\/t\/\d+)$/\1'
 
+  UNICODE_REPLACEMENTS = {
+    "5F00" => "_",
+    "2800" => "(",
+    "2900" => ")",
+    "2D00" => "-",
+    "2C00" => ",",
+    "2700" => "'",
+    "5B00" => "[",
+    "5D00" => "]",
+    "3D00" => "=",
+    "2600" => "&",
+    "2100" => "!",
+    "2300" => "#",
+    "7E00" => "~",
+    "2500" => "%",
+    "2E00" => ".",
+    "4000" => "@",
+    "2B00" => "+",
+    "2400" => "$",
+    "1920" => "’",
+    "E900" => "é",
+    "E000" => "à",
+    "F300" => "ó",
+    "1C20" => "“",
+    "1D20" => "”",
+    "B000" => "°",
+    "0003" => ["0300".to_i(16)].pack("U"),
+    "0103" => ["0301".to_i(16)].pack("U")
+  }
+
   def initialize
     super()
 
@@ -58,11 +90,16 @@ class ImportScripts::Telligent < ImportScripts::Base
       timeout: 60 # the user query is very slow
     )
 
+    @filestore_root_directory = ENV["FILE_BASE_DIR"]
+    @files = {}
+
     SiteSetting.tagging_enabled = true
   end
 
   def execute
     add_permalink_normalizations
+    index_filestore
+
     import_categories
     import_users
     import_topics
@@ -70,6 +107,11 @@ class ImportScripts::Telligent < ImportScripts::Base
     mark_topics_as_solved
   end
 
+  def index_filestore
+    puts "", "Indexing filestore..."
+    index_directory(@filestore_root_directory)
+  end
+
   def import_users
     puts "", "Importing users..."
 
@@ -94,32 +136,14 @@ class ImportScripts::Telligent < ImportScripts::Base
 
     loop do
       rows = query(<<~SQL)
-        SELECT *
-        FROM (
-            SELECT TOP #{BATCH_SIZE}
-              u.UserID, u.Email, u.UserName,u.CreateDate, p.PropertyName, p.PropertyValue
-            FROM cs_Users u
-              LEFT OUTER JOIN (
-                SELECT NULL AS UserID, ap.UserId AS MembershipID, x.PropertyName, x.PropertyValue
-                FROM aspnet_Profile ap
-                  CROSS APPLY dbo.GetProperties(ap.PropertyNames, ap.PropertyValuesString) x
-                WHERE ap.PropertyNames NOT LIKE '%:-1%' AND
-                      x.PropertyName IN ('bio', 'commonName', 'location', 'webAddress')
-                UNION
-                SELECT up.UserID, NULL AS MembershipID, x.PropertyName, CAST(x.PropertyValue AS NVARCHAR) AS PropertyValue
-                  FROM cs_UserProfile up
-                    CROSS APPLY dbo.GetProperties(up.PropertyNames, up.PropertyValues) x
-                  WHERE up.PropertyNames NOT LIKE '%:-1%' AND
-                        x.PropertyName IN ('avatarUrl', 'BannedUntil', 'UserBanReason')
-              ) p ON p.UserID = u.UserID OR p.MembershipID = u.MembershipID
-            WHERE u.UserID > #{last_user_id} AND #{user_conditions}
-            ORDER BY u.UserID
-        ) x
-          PIVOT (
-            MAX(PropertyValue)
-            FOR PropertyName
-            IN (bio, commonName, location, webAddress, avatarUrl, BannedUntil, UserBanReason)
-          ) Y
+        SELECT TOP #{BATCH_SIZE}
+            u.UserID, u.Email, u.UserName, u.CreateDate,
+            ap.PropertyNames AP_PropertyNames, ap.PropertyValuesString AS AP_PropertyValues,
+            up.PropertyNames UP_PropertyNames, up.PropertyValues AS UP_PropertyValues
+        FROM cs_Users u
+            LEFT OUTER JOIN aspnet_Profile ap ON ap.UserId = u.MembershipID
+            LEFT OUTER JOIN cs_UserProfile up ON up.UserID = u.UserID
+        WHERE u.UserID > #{last_user_id} AND #{user_conditions}
         ORDER BY UserID
       SQL
 
@@ -132,18 +156,21 @@ class ImportScripts::Telligent < ImportScripts::Base
       end
 
       create_users(rows, total: total_count, offset: import_count) do |row|
+        ap_properties = parse_properties(row["AP_PropertyNames"], row["AP_PropertyValues"])
+        up_properties = parse_properties(row["UP_PropertyNames"], row["UP_PropertyValues"])
+
         {
           id: row["UserID"],
           email: row["Email"],
           username: row["UserName"],
-          name: row["commonName"],
+          name: ap_properties["commonName"],
           created_at: row["CreateDate"],
-          bio_raw: html_to_markdown(row["bio"]),
-          location: row["location"],
-          website: row["webAddress"],
+          bio_raw: html_to_markdown(ap_properties["bio"]),
+          location: ap_properties["location"],
+          website: ap_properties["webAddress"],
           post_create_action: proc do |user|
-            import_avatar(user, row["avatarUrl"])
-            suspend_user(user, row["BannedUntil"], row["UserBanReason"])
+            import_avatar(user, up_properties["avatarUrl"])
+            suspend_user(user, up_properties["BannedUntil"], up_properties["UserBanReason"])
           end
         }
       end
@@ -154,10 +181,10 @@ class ImportScripts::Telligent < ImportScripts::Base
 
   # TODO move into base importer (create_user) and use consistent error handling
   def import_avatar(user, avatar_url)
-    return if ENV["FILE_BASE_DIR"].blank? || avatar_url.blank? || avatar_url.include?("anonymous")
+    return if @filestore_root_directory.blank? || avatar_url.blank? || avatar_url.include?("anonymous")
 
     if match_data = avatar_url.match(LOCAL_AVATAR_REGEX)
-      avatar_path = File.join(ENV["FILE_BASE_DIR"],
+      avatar_path = File.join(@filestore_root_directory,
                               match_data[:directory].gsub("-", "."),
                               match_data[:path].split("-"),
                               match_data[:filename])
@@ -333,7 +360,7 @@ class ImportScripts::Telligent < ImportScripts::Base
     batches do |offset|
       rows = query(<<~SQL)
         SELECT TOP #{BATCH_SIZE}
-          t.ThreadId, t.ForumId, t.UserId, t.TotalViews,
+          t.ThreadId, t.ForumId, t.UserId, t.TotalViews, t.ContentID AS TopicContentId,
           t.Subject, t.Body, t.DateCreated, t.IsLocked, t.StickyDate,
           a.ApplicationTypeId, a.ApplicationId, a.ApplicationContentTypeId, a.ContentId, a.FileName, a.IsRemote
         FROM te_Forum_Threads t
@@ -365,6 +392,7 @@ class ImportScripts::Telligent < ImportScripts::Base
             Jobs.enqueue_at(topic.pinned_until, :unpin_topic, topic_id: topic.id) if topic.pinned_until
             url = "f/#{row['ForumId']}/t/#{row['ThreadId']}"
             Permalink.create(url: url, topic_id: topic.id) unless Permalink.exists?(url: url)
+            import_topic_views(topic, row["TopicContentId"])
           end
         }
 
@@ -382,6 +410,29 @@ class ImportScripts::Telligent < ImportScripts::Base
     "T#{topic_id}"
   end
 
+  def import_topic_views(topic, content_id)
+    last_user_id = -1
+
+    batches do |_|
+      rows = query(<<~SQL)
+        SELECT TOP #{BATCH_SIZE}
+          UserId, MAX(CreatedUtcDate) AS ViewDate
+        FROM te_Content_Views
+        WHERE ContentId = '#{content_id}' AND UserId > #{last_user_id}
+        GROUP BY UserId
+        ORDER BY UserId
+      SQL
+
+      break if rows.blank?
+      last_user_id = rows[-1]["UserId"]
+
+      rows.each do |row|
+        user_id = user_id_from_imported_user_id(row["UserId"])
+        TopicViewItem.add(topic.id, "127.0.0.1", user_id, row["ViewDate"], true) if user_id
+      end
+    end
+  end
+
   def ignored_forum_sql_condition
     @ignored_forum_sql_condition ||= @ignored_forum_ids.present? \
       ? "t.ForumId NOT IN (#{@ignored_forum_ids.join(',')})" \
@@ -452,28 +503,42 @@ class ImportScripts::Telligent < ImportScripts::Base
     end
   end
 
+  def index_directory(root_directory)
+    Dir.foreach(root_directory) do |directory_name|
+      next if directory_name == "." || directory_name == ".."
+
+      path = File.join(root_directory, directory_name)
+      if File.directory?(path)
+        index_directory(path)
+      else
+        path.delete_prefix!(@filestore_root_directory)
+        path.delete_prefix!("/")
+        @files[path.downcase] = path
+      end
+    end
+  end
+
   def raw_with_attachment(row, user_id, type)
     raw, embedded_paths, upload_ids = replace_embedded_attachments(row["Body"], user_id)
     raw = html_to_markdown(raw) || ""
 
     filename = row["FileName"]
-    return raw if ENV["FILE_BASE_DIR"].blank? || filename.blank?
+    return raw if @filestore_root_directory.blank? || filename.blank?
 
     if row["IsRemote"]
       return "#{raw}\n#{filename}"
     end
 
     path = File.join(
-      ENV["FILE_BASE_DIR"],
       "telligent.evolution.components.attachments",
       "%02d" % row["ApplicationTypeId"],
       "%02d" % row["ApplicationId"],
       "%02d" % row["ApplicationContentTypeId"],
-      ("%010d" % row["ContentId"]).scan(/.{2}/),
-      clean_filename(filename)
+      ("%010d" % row["ContentId"]).scan(/.{2}/)
     )
+    path = fix_attachment_path(path, filename)
 
-    unless embedded_paths.include?(path)
+    if path && !embedded_paths.include?(path)
       if File.file?(path)
         upload = @uploader.create_upload(user_id, path, filename)
 
@@ -493,91 +558,110 @@ class ImportScripts::Telligent < ImportScripts::Base
     paths = []
     upload_ids = []
 
-    return [raw, paths, upload_ids] if ENV["FILE_BASE_DIR"].blank?
+    return [raw, paths, upload_ids] if @filestore_root_directory.blank?
 
-    raw = raw.gsub(EMBEDDED_ATTACHMENT_REGEX) do
-      filename, path = attachment_path(Regexp.last_match)
+    [EMBEDDED_ATTACHMENT_REGEX, EMBEDDED_VIEW_ATTACHMENT_REGEX].each do |regex|
+      raw = raw.gsub(regex) do
+        match_data = Regexp.last_match
 
-      if File.file?(path)
-        upload = @uploader.create_upload(user_id, path, filename)
+        path = File.join(match_data[:directory], match_data[:path])
+        fixed_path = fix_attachment_path(path, match_data[:filename])
 
-        if upload.present? && upload.persisted?
-          paths << path
-          upload_ids << upload.id
-          @uploader.html_for_upload(upload, filename)
+        if fixed_path && File.file?(fixed_path)
+          filename = File.basename(fixed_path)
+          upload = @uploader.create_upload(user_id, fixed_path, filename)
+
+          if upload.present? && upload.persisted?
+            paths << fixed_path
+            upload_ids << upload.id
+            @uploader.html_for_upload(upload, filename)
+          end
+        else
+          path = File.join(path, match_data[:filename])
+          STDERR.puts "Could not find file: #{path}"
         end
-      else
-        STDERR.puts "Could not find file: #{path}"
       end
     end
 
     [raw, paths, upload_ids]
   end
 
-  def clean_filename(filename)
+  def fix_attachment_path(base_path, filename)
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
+
+    base_path.downcase!
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
+
     filename = CGI.unescapeHTML(filename)
-    filename.gsub!(/[\x00\/\\:\*\?\"<>\|]/, '_')
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
 
-    %w|( ) # % - _ [ ] = , ' ~ ! + { } & @ #|.each do |c|
-      number = "#{c.ord.to_s(16).upcase}00"
-      filename.gsub!("_#{number}_", c)
-      filename.gsub!("_#{number}#{number}_", c * 2)
-    end
+    filename.gsub!("-", " ")
+    filename.strip!
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
 
-    filename
+    directories = base_path.split(File::SEPARATOR)
+    first_directory = directories.shift
+    first_directory.gsub!("-", ".")
+    base_path = File.join(first_directory, directories)
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
+
+    directories.map! { |d| File.join(d.split(/[\.\-]/).map(&:strip)) }
+    base_path = File.join(first_directory, directories)
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
+
+    directories = base_path.split(File::SEPARATOR)
+    directories.map! { |d| d.gsub("+", " ").strip }
+    base_path = File.join(directories)
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
+
+    replace_codes!(filename)
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
+
+    replace_codes!(base_path)
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
+
+    filename.gsub!(/(?:\:\d+)+$/, "")
+    path = find_correct_path(base_path, filename)
+    return path if attachment_exists?(path)
+
+    path = File.join(base_path, filename)
+    path_regex = Regexp.new("^#{Regexp.escape(path)}-\\d+x\\d+\\.\\w+$", Regexp::IGNORECASE)
+    path = find_correct_path_with_regex(path_regex)
+    return path if attachment_exists?(path)
+
+    nil
   end
 
-  def attachment_path(match_data)
-    filename, path = join_attachment_path(match_data, filename_index: 2)
-    filename, path = join_attachment_path(match_data, filename_index: 1) unless File.file?(path)
-    [filename, path]
+  def find_correct_path(base_path, filename)
+    path = File.join(base_path, filename)
+    path = @files[path.downcase]
+    path ? File.join(@filestore_root_directory, path) : nil
   end
 
-  # filenames are a total mess - try to guess the correct filename
-  # works for 70% of all files
-  def join_attachment_path(match_data, filename_index:)
-    filename = clean_filename(match_data[:"filename#{filename_index}"])
-    base_path = File.join(
-      ENV["FILE_BASE_DIR"],
-      match_data[:directory].gsub("-", ".").downcase,
-      match_data[:path].gsub("+", " ").gsub(/_\h{4}_/, "?").split(/[\.\-]/).map(&:strip)
-    )
+  def find_correct_path_with_regex(regex)
+    keys = @files.keys.filter { |key| regex =~ key }
+    keys.size == 1 ? File.join(@filestore_root_directory, @files[keys.first]) : nil
+  end
 
-    original_filename = filename.dup
+  def attachment_exists?(path)
+    path.present? && File.file?(path)
+  end
 
-    filename.gsub!(/[_\- ]/, "?")
-    path = File.join(base_path, filename)
-    paths = Dir.glob(path, File::FNM_CASEFOLD)
-    if (path = paths.first) && paths.size == 1
-      filename = File.basename(path)
-      return [filename, path]
+  def replace_codes!(text)
+    text.gsub!(/_(\h{4}+)_/i) do
+      codes = Regexp.last_match[1].upcase.scan(/.{4}/)
+      mapped_codes = codes.map { |c| UNICODE_REPLACEMENTS[c] }
+      mapped_codes.any? { |c| c.nil? } ? Regexp.last_match[0] : mapped_codes.join("")
     end
-
-    filename = original_filename.dup
-    filename.gsub!(/_\h{2}00_/, "?")
-    filename.gsub!(/_\h{2}00\h{2}00_/, "??")
-    filename.gsub!(/_\h{2}00\h{2}00\h{2}00_/, "???")
-    filename.gsub!(/[_\- ]/, "?")
-    path = File.join(base_path, filename)
-    paths = Dir.glob(path, File::FNM_CASEFOLD)
-    if (path = paths.first) && paths.size == 1
-      filename = File.basename(path)
-      return [filename, path]
-    end
-
-    filename = original_filename.dup
-    filename.gsub!(/_\h{4}_/, "?")
-    filename.gsub!(/_\h{4}\h{4}_/, "??")
-    filename.gsub!(/_\h{4}\h{4}\h{4}_/, "???")
-    filename.gsub!(/[_\- ]/, "?")
-    path = File.join(base_path, filename)
-    paths = Dir.glob(path, File::FNM_CASEFOLD)
-    if (path = paths.first) && paths.size == 1
-      filename = File.basename(path)
-      return [filename, path]
-    end
-
-    [original_filename, File.join(base_path, original_filename)]
   end
 
   def html_to_markdown(html)
@@ -586,10 +670,27 @@ class ImportScripts::Telligent < ImportScripts::Base
     md = HtmlToMarkdown.new(html).to_markdown
     md.gsub!(/\[quote.*?\]/, "\n" + '\0' + "\n")
     md.gsub!(/(?<!^)\[\/quote\]/, "\n[/quote]\n")
+    md.gsub!(/\[\/quote\](?!$)/, "\n[/quote]\n")
+    md.gsub!(/\[View:(http.*?)[:\d\s]*?(?:\]|\z)/i, '\1')
     md.strip!
     md
   end
 
+  def parse_properties(names, values)
+    properties = {}
+    return properties if names.blank? || values.blank?
+
+    names.scan(PROPERTY_NAMES_REGEX).each do |property|
+      name = property[0]
+      start_index = property[1].to_i
+      end_index = start_index + property[2].to_i - 1
+
+      properties[name] = values[start_index..end_index]
+    end
+
+    properties
+  end
+
   def mark_topics_as_solved
     puts "", "Marking topics as solved..."
 

From 3f9b922d20d12aaaded47ddc88b791fc92e94ffe Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 23 Mar 2020 12:28:16 +0100
Subject: [PATCH 0304/1830] FIX: middle click was reading every notifications
 (#9252)

---
 .../discourse/widgets/default-notification-item.js       | 2 +-
 .../widgets/default-notification-item-test.js.es6        | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/default-notification-item.js b/app/assets/javascripts/discourse/widgets/default-notification-item.js
index da741f45aa..60e4c94ed1 100644
--- a/app/assets/javascripts/discourse/widgets/default-notification-item.js
+++ b/app/assets/javascripts/discourse/widgets/default-notification-item.js
@@ -163,7 +163,7 @@ export const DefaultNotificationItem = createWidget(
         this.attrs.set("read", true);
         ajax("/notifications/mark-read", {
           method: "PUT",
-          data: this.attrs.id
+          data: { id: this.attrs.id }
         });
       }
     }
diff --git a/test/javascripts/widgets/default-notification-item-test.js.es6 b/test/javascripts/widgets/default-notification-item-test.js.es6
index b701407243..4c9795c1b5 100644
--- a/test/javascripts/widgets/default-notification-item-test.js.es6
+++ b/test/javascripts/widgets/default-notification-item-test.js.es6
@@ -32,8 +32,15 @@ widgetTest("sets notification as read on middle click", {
   },
   async test(assert) {
     let requests = 0;
-    pretender.put("/notifications/mark-read", () => {
+    pretender.put("/notifications/mark-read", request => {
       ++requests;
+
+      assert.equal(
+        request.requestBody,
+        `id=${this.args.id}`,
+        "it sets correct request parameters"
+      );
+
       return [200, { "Content-Type": "application/json" }, { success: true }];
     });
 

From 5ff505cea6f224d10ca0559cc0ccba5ed8b196d7 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 23 Mar 2020 11:02:24 +0000
Subject: [PATCH 0305/1830] SECURITY: Respect topic permissions when loading
 draft metadata

Co-authored-by: Sam Saffron <sam.saffron@gmail.com>
---
 app/controllers/drafts_controller.rb    |  11 ---
 app/models/draft.rb                     | 103 +++++++++++++++++-------
 app/models/post.rb                      |  10 +--
 app/models/topic.rb                     |  14 ++++
 app/serializers/draft_serializer.rb     |  50 +++++++++---
 spec/models/draft_spec.rb               |  63 +++++++++------
 spec/requests/drafts_controller_spec.rb |  20 +++++
 7 files changed, 188 insertions(+), 83 deletions(-)

diff --git a/app/controllers/drafts_controller.rb b/app/controllers/drafts_controller.rb
index 6f70e769b9..db6f87782a 100644
--- a/app/controllers/drafts_controller.rb
+++ b/app/controllers/drafts_controller.rb
@@ -23,17 +23,6 @@ class DraftsController < ApplicationController
     }
 
     stream = Draft.stream(opts)
-    stream.each do |d|
-      parsed_data = JSON.parse(d.data)
-      if parsed_data
-        if parsed_data['reply']
-          d.raw = parsed_data['reply']
-        end
-        if parsed_data['categoryId'].present? && !d.category_id.present?
-          d.category_id = parsed_data['categoryId']
-        end
-      end
-    end
 
     render json: {
       drafts: stream ? serialize_data(stream, DraftSerializer) : [],
diff --git a/app/models/draft.rb b/app/models/draft.rb
index 8d1b5ca364..9d4c08e56f 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -5,6 +5,8 @@ class Draft < ActiveRecord::Base
   NEW_PRIVATE_MESSAGE ||= 'new_private_message'
   EXISTING_TOPIC ||= 'topic_'
 
+  belongs_to :user
+
   class OutOfSequence < StandardError; end
 
   def self.set(user, key, sequence, data, owner = nil)
@@ -137,6 +139,72 @@ class Draft < ActiveRecord::Base
     Draft.where(user_id: user.id, draft_key: key).destroy_all
   end
 
+  def display_user
+    post&.user || topic&.user || user
+  end
+
+  def parsed_data
+    JSON.parse(data)
+  end
+
+  def topic_id
+    if draft_key.starts_with?(EXISTING_TOPIC)
+      draft_key.gsub(EXISTING_TOPIC, "").to_i
+    end
+  end
+
+  def topic_preloaded?
+    !!defined?(@topic)
+  end
+
+  def topic
+    topic_preloaded? ? @topic : @topic = Draft.allowed_draft_topics_for_user(user).find_by(id: topic_id)
+  end
+
+  def preload_topic(topic)
+    @topic = topic
+  end
+
+  def post_id
+    parsed_data["postId"]
+  end
+
+  def post_preloaded?
+    !!defined?(@post)
+  end
+
+  def post
+    post_preloaded? ? @post : @post = Draft.allowed_draft_posts_for_user(user).find_by(id: post_id)
+  end
+
+  def preload_post(post)
+    @post = post
+  end
+
+  def self.preload_data(drafts, user)
+    topic_ids = drafts.map(&:topic_id)
+    post_ids = drafts.map(&:post_id)
+
+    topics = self.allowed_draft_topics_for_user(user).where(id: topic_ids)
+    posts = self.allowed_draft_posts_for_user(user).where(id: post_ids)
+
+    drafts.each do |draft|
+      draft.preload_topic(topics.detect { |t| t.id == draft.topic_id })
+      draft.preload_post(posts.detect { |p| p.id == draft.post_id })
+    end
+  end
+
+  def self.allowed_draft_topics_for_user(user)
+    topics = Topic.listable_topics.secured(Guardian.new(user))
+    pms = Topic.private_messages_for_user(user)
+    topics.or(pms)
+  end
+
+  def self.allowed_draft_posts_for_user(user)
+    # .secured handles whispers, merge handles topic/pm visibility
+    Post.secured(Guardian.new(user)).joins(:topic).merge(self.allowed_draft_topics_for_user(user))
+  end
+
   def self.stream(opts = nil)
     opts ||= {}
 
@@ -144,36 +212,15 @@ class Draft < ActiveRecord::Base
     offset = (opts[:offset] || 0).to_i
     limit = (opts[:limit] || 30).to_i
 
-    # JOIN of topics table based on manipulating draft_key seems imperfect
-    builder = DB.build <<~SQL
-      SELECT
-        d.*, t.title, t.id topic_id, t.archetype,
-        t.category_id, t.closed topic_closed, t.archived topic_archived,
-        pu.username, pu.name, pu.id user_id, pu.uploaded_avatar_id, pu.username_lower,
-        du.username draft_username, NULL as raw, NULL as cooked, NULL as post_number
-      FROM drafts d
-      LEFT JOIN LATERAL json_extract_path_text (d.data::json, 'postId') postId ON TRUE
-      LEFT JOIN posts p ON postId :: BIGINT = p.id
-      LEFT JOIN topics t ON
-        CASE
-            WHEN d.draft_key LIKE '%' || '#{EXISTING_TOPIC}' || '%'
-              THEN CAST(replace(d.draft_key, '#{EXISTING_TOPIC}', '') AS INT)
-            ELSE 0
-        END = t.id
-      JOIN users pu on pu.id = COALESCE(p.user_id, t.user_id, d.user_id)
-      JOIN users du on du.id = #{user_id}
-      /*where*/
-      /*order_by*/
-      /*offset*/
-      /*limit*/
-    SQL
-
-    builder
-      .where('d.user_id = :user_id', user_id: user_id.to_i)
-      .order_by('d.updated_at desc')
+    stream = Draft.where(user_id: user_id)
+      .order(updated_at: :desc)
       .offset(offset)
       .limit(limit)
-      .query
+
+    # Preload posts and topics to avoid N+1 queries
+    Draft.preload_data(stream, opts[:user])
+
+    stream
   end
 
   def self.cleanup!
diff --git a/app/models/post.rb b/app/models/post.rb
index 85432556e7..b57a9502c6 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -69,15 +69,7 @@ class Post < ActiveRecord::Base
   register_custom_field_type(MISSING_UPLOADS_IGNORED, :boolean)
 
   scope :private_posts_for_user, ->(user) {
-    where("posts.topic_id IN (SELECT topic_id
-             FROM topic_allowed_users
-             WHERE user_id = :user_id
-             UNION ALL
-             SELECT tg.topic_id
-             FROM topic_allowed_groups tg
-             JOIN group_users gu ON gu.user_id = :user_id AND
-                                      gu.group_id = tg.group_id)",
-                                              user_id: user.id)
+    where("posts.topic_id IN (#{Topic::PRIVATE_MESSAGES_SQL})", user_id: user.id)
   }
 
   scope :by_newest, -> { order('created_at DESC, id DESC') }
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 07b5c60c6e..a50c35dcb8 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -152,6 +152,20 @@ class Topic < ActiveRecord::Base
   # Return private message topics
   scope :private_messages, -> { where(archetype: Archetype.private_message) }
 
+  PRIVATE_MESSAGES_SQL = <<~SQL
+    SELECT topic_id
+    FROM topic_allowed_users
+    WHERE user_id = :user_id
+    UNION ALL
+    SELECT tg.topic_id
+    FROM topic_allowed_groups tg
+    JOIN group_users gu ON gu.user_id = :user_id AND gu.group_id = tg.group_id
+  SQL
+
+  scope :private_messages_for_user, ->(user) {
+    private_messages.where("topics.id IN (#{PRIVATE_MESSAGES_SQL})", user_id: user.id)
+  }
+
   scope :listable_topics, -> { where('topics.archetype <> ?', Archetype.private_message) }
 
   scope :by_newest, -> { order('topics.created_at desc, topics.id desc') }
diff --git a/app/serializers/draft_serializer.rb b/app/serializers/draft_serializer.rb
index 1d19f0d18b..bcdfa257fc 100644
--- a/app/serializers/draft_serializer.rb
+++ b/app/serializers/draft_serializer.rb
@@ -23,36 +23,68 @@ class DraftSerializer < ApplicationSerializer
              :archetype,
              :archived
 
+  def cooked
+    object.parsed_data['reply'] || ""
+  end
+
+  def draft_username
+    object.user.username
+  end
+
   def avatar_template
-    User.avatar_template(object.username, object.uploaded_avatar_id)
+    object.user.avatar_template
+  end
+
+  def username
+    object.display_user&.username
+  end
+
+  def username_lower
+    object.display_user&.username_lower
+  end
+
+  def name
+    object.display_user&.name
+  end
+
+  def title
+    object.topic&.title
   end
 
   def slug
-    Slug.for(object.title)
+    object.topic&.slug
   end
 
-  def include_slug?
-    object.title.present?
+  def category_id
+    object.topic&.category_id
   end
 
   def closed
-    object.topic_closed
+    object.topic&.closed
   end
 
   def archived
-    object.topic_archived
+    object.topic&.archived
+  end
+
+  def archetype
+    object&.topic&.archetype
+  end
+
+  def include_slug?
+    object.topic&.title&.present?
   end
 
   def include_closed?
-    object.topic_closed.present?
+    object.topic&.closed&.present?
   end
 
   def include_archived?
-    object.topic_archived.present?
+    object.topic&.archived&.present?
   end
 
   def include_category_id?
-    object.category_id.present?
+    object.topic&.category_id&.present?
   end
 
 end
diff --git a/spec/models/draft_spec.rb b/spec/models/draft_spec.rb
index 1d6050fdaa..823ab5fab9 100644
--- a/spec/models/draft_spec.rb
+++ b/spec/models/draft_spec.rb
@@ -8,6 +8,10 @@ describe Draft do
     Fabricate(:user)
   end
 
+  fab!(:post) do
+    Fabricate(:post)
+  end
+
   context 'backup_drafts_to_pm_length' do
     it "correctly backs up drafts to a personal message" do
       SiteSetting.backup_drafts_to_pm_length = 1
@@ -111,7 +115,6 @@ describe Draft do
   end
 
   it 'can cleanup old drafts' do
-    user = Fabricate(:user)
     key = Draft::NEW_TOPIC
 
     Draft.set(user, key, 0, 'draft')
@@ -164,39 +167,35 @@ describe Draft do
     it "should include the right draft username in the stream" do
       Draft.set(user, "topic_#{public_topic.id}", 0, '{"reply":"hey"}')
       draft_row = stream.first
-      expect(draft_row.draft_username).to eq(user.username)
+      expect(draft_row.user.username).to eq(user.username)
     end
 
   end
 
   context 'key expiry' do
     it 'nukes new topic draft after a topic is created' do
-      u = Fabricate(:user)
-      Draft.set(u, Draft::NEW_TOPIC, 0, 'my draft')
-      _t = Fabricate(:topic, user: u)
-      s = DraftSequence.current(u, Draft::NEW_TOPIC)
-      expect(Draft.get(u, Draft::NEW_TOPIC, s)).to eq nil
+      Draft.set(user, Draft::NEW_TOPIC, 0, 'my draft')
+      _t = Fabricate(:topic, user: user)
+      s = DraftSequence.current(user, Draft::NEW_TOPIC)
+      expect(Draft.get(user, Draft::NEW_TOPIC, s)).to eq nil
       expect(Draft.count).to eq 0
     end
 
     it 'nukes new pm draft after a pm is created' do
-      u = Fabricate(:user)
-      Draft.set(u, Draft::NEW_PRIVATE_MESSAGE, 0, 'my draft')
-      t = Fabricate(:topic, user: u, archetype: Archetype.private_message, category_id: nil)
+      Draft.set(user, Draft::NEW_PRIVATE_MESSAGE, 0, 'my draft')
+      t = Fabricate(:topic, user: user, archetype: Archetype.private_message, category_id: nil)
       s = DraftSequence.current(t.user, Draft::NEW_PRIVATE_MESSAGE)
-      expect(Draft.get(u, Draft::NEW_PRIVATE_MESSAGE, s)).to eq nil
+      expect(Draft.get(user, Draft::NEW_PRIVATE_MESSAGE, s)).to eq nil
     end
 
     it 'does not nuke new topic draft after a pm is created' do
-      u = Fabricate(:user)
-      Draft.set(u, Draft::NEW_TOPIC, 0, 'my draft')
-      t = Fabricate(:topic, user: u, archetype: Archetype.private_message, category_id: nil)
+      Draft.set(user, Draft::NEW_TOPIC, 0, 'my draft')
+      t = Fabricate(:topic, user: user, archetype: Archetype.private_message, category_id: nil)
       s = DraftSequence.current(t.user, Draft::NEW_TOPIC)
-      expect(Draft.get(u, Draft::NEW_TOPIC, s)).to eq 'my draft'
+      expect(Draft.get(user, Draft::NEW_TOPIC, s)).to eq 'my draft'
     end
 
     it 'nukes the post draft when a post is created' do
-      user = Fabricate(:user)
       topic = Fabricate(:topic)
 
       Draft.set(user, topic.draft_key, 0, 'hello')
@@ -207,23 +206,20 @@ describe Draft do
     end
 
     it 'nukes the post draft when a post is revised' do
-      p = Fabricate(:post)
-      Draft.set(p.user, p.topic.draft_key, 0, 'hello')
-      p.revise(p.user, raw: 'another test')
-      s = DraftSequence.current(p.user, p.topic.draft_key)
-      expect(Draft.get(p.user, p.topic.draft_key, s)).to eq nil
+      Draft.set(post.user, post.topic.draft_key, 0, 'hello')
+      post.revise(post.user, raw: 'another test')
+      s = DraftSequence.current(post.user, post.topic.draft_key)
+      expect(Draft.get(post.user, post.topic.draft_key, s)).to eq nil
     end
 
     it 'increases revision each time you set' do
-      u = User.first
-      Draft.set(u, 'new_topic', 0, 'hello')
-      Draft.set(u, 'new_topic', 0, 'goodbye')
+      Draft.set(user, 'new_topic', 0, 'hello')
+      Draft.set(user, 'new_topic', 0, 'goodbye')
 
-      expect(Draft.find_by(user_id: u.id, draft_key: 'new_topic').revisions).to eq(2)
+      expect(Draft.find_by(user_id: user.id, draft_key: 'new_topic').revisions).to eq(2)
     end
 
     it 'handles owner switching gracefully' do
-      user = Fabricate(:user)
       draft_seq = Draft.set(user, 'new_topic', 0, 'hello', _owner = 'ABCDEF')
       expect(draft_seq).to eq(0)
 
@@ -233,5 +229,20 @@ describe Draft do
       draft_seq = Draft.set(user, 'new_topic', 1, 'hello world', _owner = 'HIJKL')
       expect(draft_seq).to eq(1)
     end
+
+    it 'can correctly preload drafts' do
+      Draft.set(user, "#{Draft::EXISTING_TOPIC}#{post.topic_id}", 0, { raw: 'hello', postId: post.id }.to_json)
+
+      drafts = Draft.where(user_id: user.id).to_a
+
+      Draft.preload_data(drafts, user)
+
+      expect(drafts[0].topic_preloaded?).to eq(true)
+      expect(drafts[0].topic.id).to eq(post.topic_id)
+
+      expect(drafts[0].post_preloaded?).to eq(true)
+      expect(drafts[0].post.id).to eq(post.id)
+    end
+
   end
 end
diff --git a/spec/requests/drafts_controller_spec.rb b/spec/requests/drafts_controller_spec.rb
index 242846d72c..d67d32828c 100644
--- a/spec/requests/drafts_controller_spec.rb
+++ b/spec/requests/drafts_controller_spec.rb
@@ -34,4 +34,24 @@ describe DraftsController do
     get "/drafts.json", params: { username: user_b.username }
     expect(response.status).to eq(403)
   end
+
+  it 'does not include topic details when user cannot see topic' do
+    topic = Fabricate(:private_message_topic)
+    topic_user = topic.user
+    other_user = Fabricate(:user)
+    Draft.set(topic_user, "topic_#{topic.id}", 0, '{}')
+    Draft.set(other_user, "topic_#{topic.id}", 0, '{}')
+
+    sign_in(topic_user)
+    get "/drafts.json", params: { username: topic_user.username }
+    expect(response.status).to eq(200)
+    parsed = JSON.parse(response.body)
+    expect(parsed["drafts"].first["title"]).to eq(topic.title)
+
+    sign_in(other_user)
+    get "/drafts.json", params: { username: other_user.username }
+    expect(response.status).to eq(200)
+    parsed = JSON.parse(response.body)
+    expect(parsed["drafts"].first["title"]).to eq(nil)
+  end
 end

From 5db41cd578dba75129c9bad24f2280845ef4db70 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 23 Mar 2020 11:04:39 +0000
Subject: [PATCH 0306/1830] SECURITY: Respect topic permissions when loading
 bookmark metadata

Co-authored-by: Martin Brennan <martin@discourse.org>
Co-authored-by: Sam Saffron <sam.saffron@gmail.com>
---
 app/controllers/users_controller.rb           |   2 +-
 lib/bookmark_manager.rb                       |  11 +-
 lib/bookmark_query.rb                         |  16 ++-
 lib/guardian/bookmark_guardian.rb             |   4 +
 spec/lib/bookmark_manager_spec.rb             |  18 +++
 spec/lib/bookmark_query_spec.rb               | 105 +++++++++++++++++-
 spec/requests/users_controller_spec.rb        |   5 +
 .../user_bookmark_serializer_spec.rb          |  21 ++--
 8 files changed, 151 insertions(+), 31 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6125bf9836..da9ba484ee 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1401,7 +1401,7 @@ class UsersController < ApplicationController
 
     respond_to do |format|
       format.json do
-        bookmarks = BookmarkQuery.new(user, params).list_all
+        bookmarks = BookmarkQuery.new(user: user, guardian: guardian, params: params).list_all
 
         if bookmarks.empty?
           render json: {
diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index f4831e1350..c2184b394c 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -8,12 +8,15 @@ class BookmarkManager
   end
 
   def create(post_id:, name: nil, reminder_type: nil, reminder_at: nil)
+    post = Post.unscoped.includes(:topic).find(post_id)
     reminder_type = Bookmark.reminder_types[reminder_type.to_sym] if reminder_type.present?
 
+    raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_see_post?(post)
+
     bookmark = Bookmark.create(
       user_id: @user.id,
-      topic_id: topic_id_for_post(post_id),
-      post_id: post_id,
+      topic: post.topic,
+      post: post,
       name: name,
       reminder_type: reminder_type,
       reminder_at: reminder_at,
@@ -58,10 +61,6 @@ class BookmarkManager
 
   private
 
-  def topic_id_for_post(post_id)
-    Post.where(id: post_id).pluck_first(:topic_id)
-  end
-
   def clear_at_desktop_cache_if_required
     return if user_has_any_pending_at_desktop_reminders?
     Discourse.redis.del(BookmarkReminderNotificationHandler::PENDING_AT_DESKTOP_KEY_PREFIX + @user.id.to_s)
diff --git a/lib/bookmark_query.rb b/lib/bookmark_query.rb
index d38bdabf7c..b55e8eb8b6 100644
--- a/lib/bookmark_query.rb
+++ b/lib/bookmark_query.rb
@@ -18,18 +18,22 @@ class BookmarkQuery
     end
   end
 
-  def initialize(user, params = {})
+  def initialize(user:, guardian: nil, params: {})
     @user = user
     @params = params
+    @guardian = guardian || Guardian.new(@user)
   end
 
   def list_all
     results = user_bookmarks
-      .joins('INNER JOIN topics ON topics.id = bookmarks.topic_id')
-      .joins('INNER JOIN posts ON posts.id = bookmarks.post_id')
-      .joins('INNER JOIN users ON users.id = posts.user_id')
       .order('bookmarks.created_at DESC')
 
+    topics = Topic.listable_topics.secured(@guardian)
+    pms = Topic.private_messages_for_user(@user)
+    results = results.merge(topics.or(pms))
+
+    results = results.merge(Post.secured(@guardian))
+
     if @params[:limit]
       results = results.limit(@params[:limit])
     end
@@ -42,7 +46,7 @@ class BookmarkQuery
 
     BookmarkQuery.preload(results, self)
 
-    results
+    @guardian.filter_allowed_categories(results)
   end
 
   private
@@ -51,5 +55,7 @@ class BookmarkQuery
     Bookmark.where(user: @user)
       .includes(topic: :tags)
       .includes(post: :user)
+      .references(:topic)
+      .references(:post)
   end
 end
diff --git a/lib/guardian/bookmark_guardian.rb b/lib/guardian/bookmark_guardian.rb
index 9f44975777..1754c280e2 100644
--- a/lib/guardian/bookmark_guardian.rb
+++ b/lib/guardian/bookmark_guardian.rb
@@ -4,4 +4,8 @@ module BookmarkGuardian
   def can_delete_bookmark?(bookmark)
     @user == bookmark.user
   end
+
+  def can_create_bookmark?(bookmark)
+    can_see_topic?(bookmark.topic)
+  end
 end
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index dbfecd565d..11a0b7d859 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -90,6 +90,24 @@ RSpec.describe BookmarkManager do
         expect(subject.errors.full_messages).to include(I18n.t("bookmarks.errors.cannot_set_reminder_in_distant_future"))
       end
     end
+
+    context "when the post is inaccessable for the user" do
+      before do
+        post.trash!
+      end
+      it "raises an invalid access error" do
+        expect { subject.create(post_id: post.id, name: name) }.to raise_error(Discourse::InvalidAccess)
+      end
+    end
+
+    context "when the topic is inaccessable for the user" do
+      before do
+        post.topic.update(category: Fabricate(:private_category, group: Fabricate(:group)))
+      end
+      it "raises an invalid access error" do
+        expect { subject.create(post_id: post.id, name: name) }.to raise_error(Discourse::InvalidAccess)
+      end
+    end
   end
 
   describe ".destroy" do
diff --git a/spec/lib/bookmark_query_spec.rb b/spec/lib/bookmark_query_spec.rb
index 2fe99c3893..c627abfc85 100644
--- a/spec/lib/bookmark_query_spec.rb
+++ b/spec/lib/bookmark_query_spec.rb
@@ -8,11 +8,28 @@ RSpec.describe BookmarkQuery do
   fab!(:bookmark2) { Fabricate(:bookmark, user: user) }
   let(:params) { {} }
 
-  subject { described_class.new(user, params) }
+  def bookmark_query(user: nil, params: nil)
+    BookmarkQuery.new(user: user || self.user, params: params || self.params)
+  end
+
+  before do
+    TopicUser.change(user.id, bookmark1.topic_id, total_msecs_viewed: 1)
+    TopicUser.change(user.id, bookmark2.topic_id, total_msecs_viewed: 1)
+  end
 
   describe "#list_all" do
     it "returns all the bookmarks for a user" do
-      expect(subject.list_all.count).to eq(2)
+      expect(bookmark_query.list_all.count).to eq(2)
+    end
+
+    it "does not return deleted posts" do
+      bookmark1.post.trash!
+      expect(bookmark_query.list_all.count).to eq(1)
+    end
+
+    it "does not return deleted topics" do
+      bookmark1.topic.trash!
+      expect(bookmark_query.list_all.count).to eq(1)
     end
 
     it "runs the on_preload block provided passing in bookmarks" do
@@ -20,14 +37,92 @@ RSpec.describe BookmarkQuery do
       BookmarkQuery.on_preload do |bookmarks, bq|
         (preloaded_bookmarks << bookmarks).flatten
       end
-      subject.list_all
+      bookmark_query.list_all
       expect(preloaded_bookmarks.any?).to eq(true)
     end
 
+    context "for a whispered post" do
+      before do
+        bookmark1.post.update(post_type: Post.types[:whisper])
+      end
+      context "when the user is moderator" do
+        it "does return the whispered post" do
+          user.update!(moderator: true)
+          expect(bookmark_query.list_all.count).to eq(2)
+        end
+      end
+      context "when the user is admin" do
+        it "does return the whispered post" do
+          user.update!(admin: true)
+          expect(bookmark_query.list_all.count).to eq(2)
+        end
+      end
+      context "when the user is not staff" do
+        it "does not return the whispered post" do
+          expect(bookmark_query.list_all.count).to eq(1)
+        end
+      end
+    end
+
+    context "for a private message topic bookmark" do
+      let(:pm_topic) { Fabricate(:private_message_topic) }
+      before do
+        bookmark1.update(topic: pm_topic, post: Fabricate(:post, topic: pm_topic))
+        TopicUser.change(user.id, pm_topic.id, total_msecs_viewed: 1)
+      end
+
+      context "when the user is a topic_allowed_user" do
+        before do
+          TopicAllowedUser.create(topic: pm_topic, user: user)
+        end
+        it "shows the user the bookmark in the PM" do
+          expect(bookmark_query.list_all.map(&:id).count).to eq(2)
+        end
+      end
+
+      context "when the user is in a topic_allowed_group" do
+        before do
+          group = Fabricate(:group)
+          GroupUser.create(group: group, user: user)
+          TopicAllowedGroup.create(topic: pm_topic, group: group)
+        end
+        it "shows the user the bookmark in the PM" do
+          expect(bookmark_query.list_all.map(&:id).count).to eq(2)
+        end
+      end
+
+      context "when the user is not a topic_allowed_user" do
+        it "does not show the user a bookmarked post in a PM where they are not an allowed user" do
+          expect(bookmark_query.list_all.map(&:id).count).to eq(1)
+        end
+      end
+
+      context "when the user is not in a topic_allowed_group" do
+        it "does not show the user a bookmarked post in a PM where they are not in an allowed group" do
+          expect(bookmark_query.list_all.map(&:id).count).to eq(1)
+        end
+      end
+    end
+
+    context "when the topic category is private" do
+      let(:group) { Fabricate(:group) }
+      before do
+        bookmark1.topic.update(category: Fabricate(:private_category, group: group))
+        bookmark1.reload
+      end
+      it "does not show the user a post/topic in a private category they cannot see" do
+        expect(bookmark_query.list_all.map(&:id)).not_to include(bookmark1.id)
+      end
+      it "does show the user a post/topic in a private category they can see" do
+        GroupUser.create(user: user, group: group)
+        expect(bookmark_query.list_all.map(&:id)).to include(bookmark1.id)
+      end
+    end
+
     context "when the limit param is provided" do
       let(:params) { { limit: 1 } }
       it "is respected" do
-        expect(subject.list_all.count).to eq(1)
+        expect(bookmark_query.list_all.count).to eq(1)
       end
     end
 
@@ -41,7 +136,7 @@ RSpec.describe BookmarkQuery do
       it "preloads them" do
         Topic.expects(:preload_custom_fields)
         expect(
-          subject.list_all.find do |b|
+          bookmark_query.list_all.find do |b|
             b.topic_id = bookmark1.topic_id
           end.topic.custom_fields['test_field']
         ).not_to eq(nil)
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index b2cc43fede..57a936aa33 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -4172,6 +4172,11 @@ describe UsersController do
     let!(:bookmark2) { Fabricate(:bookmark, user: user) }
     let!(:bookmark3) { Fabricate(:bookmark) }
 
+    before do
+      TopicUser.change(user.id, bookmark1.topic_id, total_msecs_viewed: 1)
+      TopicUser.change(user.id, bookmark2.topic_id, total_msecs_viewed: 1)
+    end
+
     it "returns a list of serialized bookmarks for the user" do
       sign_in(user)
       get "/u/#{user.username}/bookmarks.json"
diff --git a/spec/serializers/user_bookmark_serializer_spec.rb b/spec/serializers/user_bookmark_serializer_spec.rb
index 85acabf95c..36b05abf7b 100644
--- a/spec/serializers/user_bookmark_serializer_spec.rb
+++ b/spec/serializers/user_bookmark_serializer_spec.rb
@@ -6,9 +6,11 @@ RSpec.describe UserBookmarkSerializer do
   let(:user) { Fabricate(:user) }
   let(:post) { Fabricate(:post, user: user) }
   let!(:bookmark) { Fabricate(:bookmark, name: 'Test', user: user, post: post, topic: post.topic) }
+  let(:bookmark_list) { BookmarkQuery.new(user: bookmark.user).list_all.to_ary }
 
   it "serializes all properties correctly" do
-    s = serialized
+    s = UserBookmarkSerializer.new(bookmark_list.last)
+
     expect(s.id).to eq(bookmark.id)
     expect(s.created_at).to eq(bookmark.created_at)
     expect(s.topic_id).to eq(bookmark.topic_id)
@@ -34,9 +36,8 @@ RSpec.describe UserBookmarkSerializer do
       bookmark.topic.trash!
       bookmark.reload
     end
-    it "still returns the topic title because the relationship is unscoped" do
-      serialized
-      expect(serialized.title).not_to eq(nil)
+    it "it has nothing to serialize" do
+      expect(bookmark_list).to eq([])
     end
   end
 
@@ -45,17 +46,9 @@ RSpec.describe UserBookmarkSerializer do
       bookmark.post.trash!
       bookmark.reload
     end
-    it "still returns the post number because the relationship is unscoped" do
-      serialized
-      expect(serialized.linked_post_number).not_to eq(nil)
-    end
-    it "still returns the post username" do
-      serialized
-      expect(serialized.username).not_to eq(nil)
+    it "it has nothing to serialize" do
+      expect(bookmark_list).to eq([])
     end
   end
 
-  def serialized
-    described_class.new(BookmarkQuery.new(bookmark.user, {}).list_all.to_ary.last)
-  end
 end

From 5715f0ad01b621cafe16785e71f2b93f2a48d669 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Mon, 23 Mar 2020 14:00:51 +0200
Subject: [PATCH 0307/1830] UX: Hotkey K can select partial posts

When no post is selected, K selects first partial post and J selects
first full post.
---
 app/assets/javascripts/discourse/lib/keyboard-shortcuts.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index 4b5465b986..5da8be5bc9 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -455,7 +455,11 @@ export default {
       const offset = minimumOffset();
       $selected = $articles
         .toArray()
-        .find(article => article.getBoundingClientRect().top > offset);
+        .find(article =>
+          direction > 0
+            ? article.getBoundingClientRect().top > offset
+            : article.getBoundingClientRect().bottom > offset
+        );
       if (!$selected) {
         $selected = $articles[$articles.length - 1];
       }

From f413ea6b38791defbdde0c1b5b3721b3f419fb4d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2020 10:18:30 -0400
Subject: [PATCH 0308/1830] Build(deps): Bump onebox from 1.9.26 to 1.9.27.1
 (#9255)

Bumps [onebox](https://github.com/discourse/onebox) from 1.9.26 to 1.9.27.1.
- [Release notes](https://github.com/discourse/onebox/releases)
- [Changelog](https://github.com/discourse/onebox/blob/master/CHANGELOG.md)
- [Commits](https://github.com/discourse/onebox/compare/v1.9.26...v1.9.27.1)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 8485b761d9..0bdf3adf50 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -240,7 +240,7 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.9.26)
+    onebox (1.9.27.1)
       addressable (~> 2.7.0)
       htmlentities (~> 4.3)
       multi_json (~> 1.11)

From e58f0adfcc963305fb16d6c796f51ccfcbe58e00 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 23 Mar 2020 20:27:23 +0530
Subject: [PATCH 0309/1830] FIX: respect `prioritize_username_in_ux` setting on
 /about page

---
 .../discourse/components/about-page-users.js   | 18 ++++++++++++------
 .../templates/components/about-page-users.hbs  |  8 ++++++--
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/about-page-users.js b/app/assets/javascripts/discourse/components/about-page-users.js
index fb9076cb30..92936610d2 100644
--- a/app/assets/javascripts/discourse/components/about-page-users.js
+++ b/app/assets/javascripts/discourse/components/about-page-users.js
@@ -4,22 +4,28 @@ import { formatUsername } from "discourse/lib/utilities";
 import { normalize } from "discourse/components/user-info";
 import { renderAvatar } from "discourse/helpers/user-avatar";
 import { computed } from "@ember/object";
+import { prioritizeNameInUx } from "discourse/lib/settings";
 
 export default Component.extend({
   usersTemplates: computed("users.[]", function() {
     return (this.users || []).map(user => {
-      let name = "";
-      if (user.name && normalize(user.username) !== normalize(user.name)) {
-        name = user.name;
+      let name = user.name;
+      let username = user.username;
+      let prioritizeName = prioritizeNameInUx(name, this.siteSettings);
+      let hideName = false;
+      if (normalize(username) === normalize(name)) {
+        hideName = true;
       }
 
       return {
-        username: user.username,
         name,
-        userPath: userPath(user.username),
+        username,
+        userPath: userPath(username),
         avatar: renderAvatar(user, { imageSize: "large" }),
         title: user.title || "",
-        formatedUsername: formatUsername(user.username)
+        formatedUsername: formatUsername(username),
+        prioritizeName,
+        hideName
       };
     });
   })
diff --git a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
index 4b7161ba18..f27899f0e7 100644
--- a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
+++ b/app/assets/javascripts/discourse/templates/components/about-page-users.hbs
@@ -11,10 +11,14 @@
       <div class="name-line">
         <span class="username">
           <a href={{userTemplate.userPath}} data-user-card={{userTemplate.username}}>
-            {{userTemplate.username}}
+            {{#if userTemplate.prioritizeName}}{{userTemplate.name}}{{else}}{{userTemplate.username}}{{/if}}
           </a>
         </span>
-        <span class="name">{{userTemplate.name}}</span>
+        <span class="name">
+          {{#unless userTemplate.hideName}}
+            {{#if userTemplate.prioritizeName}}{{userTemplate.username}}{{else}}{{userTemplate.name}}{{/if}}
+          {{/unless}}
+        </span>
       </div>
       <div class="title">{{userTemplate.title}}</div>
     </div>

From 48c1de4836ed6240a6ce57761c95f2b3d69f0c91 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 23 Mar 2020 16:58:40 +0100
Subject: [PATCH 0310/1830] DEV: adds afterCreate/beforeUpdate hooks to rest
 models (#9253)

We already have beforeCreate and afterUpdate and it seems these hooks can be useful and it's also unexpected to not have parity on this.
---
 app/assets/javascripts/discourse/models/rest.js | 6 ++++++
 test/javascripts/models/rest-model-test.js.es6  | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/app/assets/javascripts/discourse/models/rest.js b/app/assets/javascripts/discourse/models/rest.js
index 40b38e5107..e0a697e827 100644
--- a/app/assets/javascripts/discourse/models/rest.js
+++ b/app/assets/javascripts/discourse/models/rest.js
@@ -9,6 +9,9 @@ const RestModel = EmberObject.extend({
   isSaving: false,
 
   beforeCreate() {},
+  afterCreate() {},
+
+  beforeUpdate() {},
   afterUpdate() {},
 
   update(props) {
@@ -18,6 +21,8 @@ const RestModel = EmberObject.extend({
 
     props = props || this.updateProperties();
 
+    this.beforeUpdate(props);
+
     this.set("isSaving", true);
     return this.store
       .update(this.__type, this.id, props)
@@ -65,6 +70,7 @@ const RestModel = EmberObject.extend({
           this.set("__state", "created");
         }
 
+        this.afterCreate(res);
         res.target = this;
         return res;
       })
diff --git a/test/javascripts/models/rest-model-test.js.es6 b/test/javascripts/models/rest-model-test.js.es6
index c7c44bba26..8213e96e8d 100644
--- a/test/javascripts/models/rest-model-test.js.es6
+++ b/test/javascripts/models/rest-model-test.js.es6
@@ -24,10 +24,14 @@ QUnit.test("update", async assert => {
   assert.equal(widget.get("name"), "Trout Lure");
   assert.ok(!widget.get("isSaving"), "it is not saving");
 
+  const spyBeforeUpdate = sandbox.spy(widget, "beforeUpdate");
+  const spyAfterUpdate = sandbox.spy(widget, "afterUpdate");
   const promise = widget.update({ name: "new name" });
   assert.ok(widget.get("isSaving"), "it is saving");
+  assert.ok(spyBeforeUpdate.calledOn(widget));
 
   const result = await promise;
+  assert.ok(spyAfterUpdate.calledOn(widget));
   assert.ok(!widget.get("isSaving"), "it is no longer saving");
   assert.equal(widget.get("name"), "new name");
 
@@ -61,10 +65,14 @@ QUnit.test("save new", async assert => {
   assert.ok(!widget.get("isCreated"), "it is not created");
   assert.ok(!widget.get("isSaving"), "it is not saving");
 
+  const spyBeforeCreate = sandbox.spy(widget, "beforeCreate");
+  const spyAfterCreate = sandbox.spy(widget, "afterCreate");
   const promise = widget.save({ name: "Evil Widget" });
   assert.ok(widget.get("isSaving"), "it is not saving");
+  assert.ok(spyBeforeCreate.calledOn(widget));
 
   const result = await promise;
+  assert.ok(spyAfterCreate.calledOn(widget));
   assert.ok(!widget.get("isSaving"), "it is no longer saving");
   assert.ok(widget.get("id"), "it has an id");
   assert.ok(widget.get("name"), "Evil Widget");

From 39dde33cbba1c9e7b9175b466a4fc574a0b9e35c Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 23 Mar 2020 13:25:33 -0400
Subject: [PATCH 0311/1830] UX: Larger tap areas for profile panel in user menu
 on mobile devices

---
 .../javascripts/discourse/widgets/quick-access-profile.js   | 2 ++
 app/assets/stylesheets/common/base/menu-panel.scss          | 5 +----
 app/assets/stylesheets/mobile/menu-panel.scss               | 6 ++++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/quick-access-profile.js b/app/assets/javascripts/discourse/widgets/quick-access-profile.js
index cb4c58e154..c4c7b71927 100644
--- a/app/assets/javascripts/discourse/widgets/quick-access-profile.js
+++ b/app/assets/javascripts/discourse/widgets/quick-access-profile.js
@@ -3,6 +3,8 @@ import { createWidgetFrom } from "discourse/widgets/widget";
 import { Promise } from "rsvp";
 
 createWidgetFrom(QuickAccessPanel, "quick-access-profile", {
+  tagName: "div.quick-access-panel.quick-access-profile",
+
   buildKey: () => "quick-access-profile",
 
   hasMore() {
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index a446bff050..ca1f2b530f 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -7,10 +7,7 @@
   }
 
   .panel-body {
-    position: absolute;
-    top: 3px;
-    bottom: 37px;
-    width: 97%;
+    width: 100%;
   }
 }
 .header-cloak {
diff --git a/app/assets/stylesheets/mobile/menu-panel.scss b/app/assets/stylesheets/mobile/menu-panel.scss
index 9392ae7898..ab6a5e33cc 100644
--- a/app/assets/stylesheets/mobile/menu-panel.scss
+++ b/app/assets/stylesheets/mobile/menu-panel.scss
@@ -15,3 +15,9 @@
     transition: opacity 0.2s ease-out;
   }
 }
+
+.user-menu .quick-access-profile li:not(.show-all) {
+  margin: 0.5em 0 0.75em;
+  padding: 0.75em;
+  border: 1px solid $primary-low;
+}

From 1ac02422011f89716ab27250d39b0e0212e03892 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 23 Mar 2020 14:15:16 -0400
Subject: [PATCH 0312/1830] Convert wizard es6 files to js

---
 .../{homepage-preview.js.es6 => homepage-preview.js}           | 0
 .../{image-preview-favicon.js.es6 => image-preview-favicon.js} | 0
 ...e-preview-large-icon.js.es6 => image-preview-large-icon.js} | 0
 ...e-preview-logo-small.js.es6 => image-preview-logo-small.js} | 0
 .../{image-preview-logo.js.es6 => image-preview-logo.js}       | 0
 .../{invite-list-user.js.es6 => invite-list-user.js}           | 0
 .../wizard/components/{invite-list.js.es6 => invite-list.js}   | 0
 .../components/{popular-themes.js.es6 => popular-themes.js}    | 0
 .../wizard/components/{radio-button.js.es6 => radio-button.js} | 0
 .../wizard/components/{staff-count.js.es6 => staff-count.js}   | 0
 .../components/{theme-preview.js.es6 => theme-preview.js}      | 0
 .../components/{theme-previews.js.es6 => theme-previews.js}    | 0
 .../components/{wizard-canvas.js.es6 => wizard-canvas.js}      | 0
 .../{wizard-field-dropdown.js.es6 => wizard-field-dropdown.js} | 0
 .../{wizard-field-image.js.es6 => wizard-field-image.js}       | 0
 .../{wizard-field-radio.js.es6 => wizard-field-radio.js}       | 0
 .../{wizard-field-textarea.js.es6 => wizard-field-textarea.js} | 0
 .../wizard/components/{wizard-field.js.es6 => wizard-field.js} | 0
 .../{wizard-image-preview.js.es6 => wizard-image-preview.js}   | 0
 .../{wizard-step-form.js.es6 => wizard-step-form.js}           | 0
 .../wizard/components/{wizard-step.js.es6 => wizard-step.js}   | 0
 .../wizard/controllers/{application.js.es6 => application.js}  | 0
 .../javascripts/wizard/controllers/{step.js.es6 => step.js}    | 0
 .../initializers/{load-helpers.js.es6 => load-helpers.js}      | 0
 app/assets/javascripts/wizard/lib/{ajax.js.es6 => ajax.js}     | 0
 .../javascripts/wizard/lib/{preview.js.es6 => preview.js}      | 0
 .../wizard/mixins/{valid-state.js.es6 => valid-state.js}       | 0
 app/assets/javascripts/wizard/models/{step.js.es6 => step.js}  | 0
 .../wizard/models/{wizard-field.js.es6 => wizard-field.js}     | 0
 .../javascripts/wizard/models/{wizard.js.es6 => wizard.js}     | 0
 app/assets/javascripts/wizard/{router.js.es6 => router.js}     | 0
 .../wizard/routes/{application.js.es6 => application.js}       | 0
 .../javascripts/wizard/routes/{index.js.es6 => index.js}       | 0
 app/assets/javascripts/wizard/routes/{step.js.es6 => step.js}  | 0
 .../test/acceptance/{wizard-test.js.es6 => wizard-test.js}     | 0
 .../{invite-list-test.js.es6 => invite-list-test.js}           | 0
 .../test/helpers/{component-test.js.es6 => component-test.js}  | 0
 .../wizard/test/helpers/{start-app.js.es6 => start-app.js}     | 0
 .../models/{wizard-field-test.js.es6 => wizard-field-test.js}  | 0
 .../test/{wizard-pretender.js.es6 => wizard-pretender.js}      | 0
 app/assets/javascripts/wizard/{wizard.js.es6 => wizard.js}     | 0
 lib/discourse_js_processor.rb                                  | 3 ++-
 42 files changed, 2 insertions(+), 1 deletion(-)
 rename app/assets/javascripts/wizard/components/{homepage-preview.js.es6 => homepage-preview.js} (100%)
 rename app/assets/javascripts/wizard/components/{image-preview-favicon.js.es6 => image-preview-favicon.js} (100%)
 rename app/assets/javascripts/wizard/components/{image-preview-large-icon.js.es6 => image-preview-large-icon.js} (100%)
 rename app/assets/javascripts/wizard/components/{image-preview-logo-small.js.es6 => image-preview-logo-small.js} (100%)
 rename app/assets/javascripts/wizard/components/{image-preview-logo.js.es6 => image-preview-logo.js} (100%)
 rename app/assets/javascripts/wizard/components/{invite-list-user.js.es6 => invite-list-user.js} (100%)
 rename app/assets/javascripts/wizard/components/{invite-list.js.es6 => invite-list.js} (100%)
 rename app/assets/javascripts/wizard/components/{popular-themes.js.es6 => popular-themes.js} (100%)
 rename app/assets/javascripts/wizard/components/{radio-button.js.es6 => radio-button.js} (100%)
 rename app/assets/javascripts/wizard/components/{staff-count.js.es6 => staff-count.js} (100%)
 rename app/assets/javascripts/wizard/components/{theme-preview.js.es6 => theme-preview.js} (100%)
 rename app/assets/javascripts/wizard/components/{theme-previews.js.es6 => theme-previews.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-canvas.js.es6 => wizard-canvas.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-field-dropdown.js.es6 => wizard-field-dropdown.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-field-image.js.es6 => wizard-field-image.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-field-radio.js.es6 => wizard-field-radio.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-field-textarea.js.es6 => wizard-field-textarea.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-field.js.es6 => wizard-field.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-image-preview.js.es6 => wizard-image-preview.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-step-form.js.es6 => wizard-step-form.js} (100%)
 rename app/assets/javascripts/wizard/components/{wizard-step.js.es6 => wizard-step.js} (100%)
 rename app/assets/javascripts/wizard/controllers/{application.js.es6 => application.js} (100%)
 rename app/assets/javascripts/wizard/controllers/{step.js.es6 => step.js} (100%)
 rename app/assets/javascripts/wizard/initializers/{load-helpers.js.es6 => load-helpers.js} (100%)
 rename app/assets/javascripts/wizard/lib/{ajax.js.es6 => ajax.js} (100%)
 rename app/assets/javascripts/wizard/lib/{preview.js.es6 => preview.js} (100%)
 rename app/assets/javascripts/wizard/mixins/{valid-state.js.es6 => valid-state.js} (100%)
 rename app/assets/javascripts/wizard/models/{step.js.es6 => step.js} (100%)
 rename app/assets/javascripts/wizard/models/{wizard-field.js.es6 => wizard-field.js} (100%)
 rename app/assets/javascripts/wizard/models/{wizard.js.es6 => wizard.js} (100%)
 rename app/assets/javascripts/wizard/{router.js.es6 => router.js} (100%)
 rename app/assets/javascripts/wizard/routes/{application.js.es6 => application.js} (100%)
 rename app/assets/javascripts/wizard/routes/{index.js.es6 => index.js} (100%)
 rename app/assets/javascripts/wizard/routes/{step.js.es6 => step.js} (100%)
 rename app/assets/javascripts/wizard/test/acceptance/{wizard-test.js.es6 => wizard-test.js} (100%)
 rename app/assets/javascripts/wizard/test/components/{invite-list-test.js.es6 => invite-list-test.js} (100%)
 rename app/assets/javascripts/wizard/test/helpers/{component-test.js.es6 => component-test.js} (100%)
 rename app/assets/javascripts/wizard/test/helpers/{start-app.js.es6 => start-app.js} (100%)
 rename app/assets/javascripts/wizard/test/models/{wizard-field-test.js.es6 => wizard-field-test.js} (100%)
 rename app/assets/javascripts/wizard/test/{wizard-pretender.js.es6 => wizard-pretender.js} (100%)
 rename app/assets/javascripts/wizard/{wizard.js.es6 => wizard.js} (100%)

diff --git a/app/assets/javascripts/wizard/components/homepage-preview.js.es6 b/app/assets/javascripts/wizard/components/homepage-preview.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/homepage-preview.js.es6
rename to app/assets/javascripts/wizard/components/homepage-preview.js
diff --git a/app/assets/javascripts/wizard/components/image-preview-favicon.js.es6 b/app/assets/javascripts/wizard/components/image-preview-favicon.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/image-preview-favicon.js.es6
rename to app/assets/javascripts/wizard/components/image-preview-favicon.js
diff --git a/app/assets/javascripts/wizard/components/image-preview-large-icon.js.es6 b/app/assets/javascripts/wizard/components/image-preview-large-icon.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/image-preview-large-icon.js.es6
rename to app/assets/javascripts/wizard/components/image-preview-large-icon.js
diff --git a/app/assets/javascripts/wizard/components/image-preview-logo-small.js.es6 b/app/assets/javascripts/wizard/components/image-preview-logo-small.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/image-preview-logo-small.js.es6
rename to app/assets/javascripts/wizard/components/image-preview-logo-small.js
diff --git a/app/assets/javascripts/wizard/components/image-preview-logo.js.es6 b/app/assets/javascripts/wizard/components/image-preview-logo.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/image-preview-logo.js.es6
rename to app/assets/javascripts/wizard/components/image-preview-logo.js
diff --git a/app/assets/javascripts/wizard/components/invite-list-user.js.es6 b/app/assets/javascripts/wizard/components/invite-list-user.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/invite-list-user.js.es6
rename to app/assets/javascripts/wizard/components/invite-list-user.js
diff --git a/app/assets/javascripts/wizard/components/invite-list.js.es6 b/app/assets/javascripts/wizard/components/invite-list.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/invite-list.js.es6
rename to app/assets/javascripts/wizard/components/invite-list.js
diff --git a/app/assets/javascripts/wizard/components/popular-themes.js.es6 b/app/assets/javascripts/wizard/components/popular-themes.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/popular-themes.js.es6
rename to app/assets/javascripts/wizard/components/popular-themes.js
diff --git a/app/assets/javascripts/wizard/components/radio-button.js.es6 b/app/assets/javascripts/wizard/components/radio-button.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/radio-button.js.es6
rename to app/assets/javascripts/wizard/components/radio-button.js
diff --git a/app/assets/javascripts/wizard/components/staff-count.js.es6 b/app/assets/javascripts/wizard/components/staff-count.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/staff-count.js.es6
rename to app/assets/javascripts/wizard/components/staff-count.js
diff --git a/app/assets/javascripts/wizard/components/theme-preview.js.es6 b/app/assets/javascripts/wizard/components/theme-preview.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/theme-preview.js.es6
rename to app/assets/javascripts/wizard/components/theme-preview.js
diff --git a/app/assets/javascripts/wizard/components/theme-previews.js.es6 b/app/assets/javascripts/wizard/components/theme-previews.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/theme-previews.js.es6
rename to app/assets/javascripts/wizard/components/theme-previews.js
diff --git a/app/assets/javascripts/wizard/components/wizard-canvas.js.es6 b/app/assets/javascripts/wizard/components/wizard-canvas.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-canvas.js.es6
rename to app/assets/javascripts/wizard/components/wizard-canvas.js
diff --git a/app/assets/javascripts/wizard/components/wizard-field-dropdown.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-dropdown.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-field-dropdown.js.es6
rename to app/assets/javascripts/wizard/components/wizard-field-dropdown.js
diff --git a/app/assets/javascripts/wizard/components/wizard-field-image.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-image.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-field-image.js.es6
rename to app/assets/javascripts/wizard/components/wizard-field-image.js
diff --git a/app/assets/javascripts/wizard/components/wizard-field-radio.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-radio.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-field-radio.js.es6
rename to app/assets/javascripts/wizard/components/wizard-field-radio.js
diff --git a/app/assets/javascripts/wizard/components/wizard-field-textarea.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-textarea.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-field-textarea.js.es6
rename to app/assets/javascripts/wizard/components/wizard-field-textarea.js
diff --git a/app/assets/javascripts/wizard/components/wizard-field.js.es6 b/app/assets/javascripts/wizard/components/wizard-field.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-field.js.es6
rename to app/assets/javascripts/wizard/components/wizard-field.js
diff --git a/app/assets/javascripts/wizard/components/wizard-image-preview.js.es6 b/app/assets/javascripts/wizard/components/wizard-image-preview.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-image-preview.js.es6
rename to app/assets/javascripts/wizard/components/wizard-image-preview.js
diff --git a/app/assets/javascripts/wizard/components/wizard-step-form.js.es6 b/app/assets/javascripts/wizard/components/wizard-step-form.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-step-form.js.es6
rename to app/assets/javascripts/wizard/components/wizard-step-form.js
diff --git a/app/assets/javascripts/wizard/components/wizard-step.js.es6 b/app/assets/javascripts/wizard/components/wizard-step.js
similarity index 100%
rename from app/assets/javascripts/wizard/components/wizard-step.js.es6
rename to app/assets/javascripts/wizard/components/wizard-step.js
diff --git a/app/assets/javascripts/wizard/controllers/application.js.es6 b/app/assets/javascripts/wizard/controllers/application.js
similarity index 100%
rename from app/assets/javascripts/wizard/controllers/application.js.es6
rename to app/assets/javascripts/wizard/controllers/application.js
diff --git a/app/assets/javascripts/wizard/controllers/step.js.es6 b/app/assets/javascripts/wizard/controllers/step.js
similarity index 100%
rename from app/assets/javascripts/wizard/controllers/step.js.es6
rename to app/assets/javascripts/wizard/controllers/step.js
diff --git a/app/assets/javascripts/wizard/initializers/load-helpers.js.es6 b/app/assets/javascripts/wizard/initializers/load-helpers.js
similarity index 100%
rename from app/assets/javascripts/wizard/initializers/load-helpers.js.es6
rename to app/assets/javascripts/wizard/initializers/load-helpers.js
diff --git a/app/assets/javascripts/wizard/lib/ajax.js.es6 b/app/assets/javascripts/wizard/lib/ajax.js
similarity index 100%
rename from app/assets/javascripts/wizard/lib/ajax.js.es6
rename to app/assets/javascripts/wizard/lib/ajax.js
diff --git a/app/assets/javascripts/wizard/lib/preview.js.es6 b/app/assets/javascripts/wizard/lib/preview.js
similarity index 100%
rename from app/assets/javascripts/wizard/lib/preview.js.es6
rename to app/assets/javascripts/wizard/lib/preview.js
diff --git a/app/assets/javascripts/wizard/mixins/valid-state.js.es6 b/app/assets/javascripts/wizard/mixins/valid-state.js
similarity index 100%
rename from app/assets/javascripts/wizard/mixins/valid-state.js.es6
rename to app/assets/javascripts/wizard/mixins/valid-state.js
diff --git a/app/assets/javascripts/wizard/models/step.js.es6 b/app/assets/javascripts/wizard/models/step.js
similarity index 100%
rename from app/assets/javascripts/wizard/models/step.js.es6
rename to app/assets/javascripts/wizard/models/step.js
diff --git a/app/assets/javascripts/wizard/models/wizard-field.js.es6 b/app/assets/javascripts/wizard/models/wizard-field.js
similarity index 100%
rename from app/assets/javascripts/wizard/models/wizard-field.js.es6
rename to app/assets/javascripts/wizard/models/wizard-field.js
diff --git a/app/assets/javascripts/wizard/models/wizard.js.es6 b/app/assets/javascripts/wizard/models/wizard.js
similarity index 100%
rename from app/assets/javascripts/wizard/models/wizard.js.es6
rename to app/assets/javascripts/wizard/models/wizard.js
diff --git a/app/assets/javascripts/wizard/router.js.es6 b/app/assets/javascripts/wizard/router.js
similarity index 100%
rename from app/assets/javascripts/wizard/router.js.es6
rename to app/assets/javascripts/wizard/router.js
diff --git a/app/assets/javascripts/wizard/routes/application.js.es6 b/app/assets/javascripts/wizard/routes/application.js
similarity index 100%
rename from app/assets/javascripts/wizard/routes/application.js.es6
rename to app/assets/javascripts/wizard/routes/application.js
diff --git a/app/assets/javascripts/wizard/routes/index.js.es6 b/app/assets/javascripts/wizard/routes/index.js
similarity index 100%
rename from app/assets/javascripts/wizard/routes/index.js.es6
rename to app/assets/javascripts/wizard/routes/index.js
diff --git a/app/assets/javascripts/wizard/routes/step.js.es6 b/app/assets/javascripts/wizard/routes/step.js
similarity index 100%
rename from app/assets/javascripts/wizard/routes/step.js.es6
rename to app/assets/javascripts/wizard/routes/step.js
diff --git a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6 b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js
similarity index 100%
rename from app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
rename to app/assets/javascripts/wizard/test/acceptance/wizard-test.js
diff --git a/app/assets/javascripts/wizard/test/components/invite-list-test.js.es6 b/app/assets/javascripts/wizard/test/components/invite-list-test.js
similarity index 100%
rename from app/assets/javascripts/wizard/test/components/invite-list-test.js.es6
rename to app/assets/javascripts/wizard/test/components/invite-list-test.js
diff --git a/app/assets/javascripts/wizard/test/helpers/component-test.js.es6 b/app/assets/javascripts/wizard/test/helpers/component-test.js
similarity index 100%
rename from app/assets/javascripts/wizard/test/helpers/component-test.js.es6
rename to app/assets/javascripts/wizard/test/helpers/component-test.js
diff --git a/app/assets/javascripts/wizard/test/helpers/start-app.js.es6 b/app/assets/javascripts/wizard/test/helpers/start-app.js
similarity index 100%
rename from app/assets/javascripts/wizard/test/helpers/start-app.js.es6
rename to app/assets/javascripts/wizard/test/helpers/start-app.js
diff --git a/app/assets/javascripts/wizard/test/models/wizard-field-test.js.es6 b/app/assets/javascripts/wizard/test/models/wizard-field-test.js
similarity index 100%
rename from app/assets/javascripts/wizard/test/models/wizard-field-test.js.es6
rename to app/assets/javascripts/wizard/test/models/wizard-field-test.js
diff --git a/app/assets/javascripts/wizard/test/wizard-pretender.js.es6 b/app/assets/javascripts/wizard/test/wizard-pretender.js
similarity index 100%
rename from app/assets/javascripts/wizard/test/wizard-pretender.js.es6
rename to app/assets/javascripts/wizard/test/wizard-pretender.js
diff --git a/app/assets/javascripts/wizard/wizard.js.es6 b/app/assets/javascripts/wizard/wizard.js
similarity index 100%
rename from app/assets/javascripts/wizard/wizard.js.es6
rename to app/assets/javascripts/wizard/wizard.js
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 5ba3673b2f..e1530090de 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -39,7 +39,8 @@ class DiscourseJsProcessor
     relative_path.start_with?("app/assets/javascripts/discourse/") ||
       relative_path.start_with?("app/assets/javascripts/admin/") ||
       relative_path.start_with?("app/assets/javascripts/pretty-text/") ||
-      relative_path.start_with?("app/assets/javascripts/select-kit/")
+      relative_path.start_with?("app/assets/javascripts/select-kit/") ||
+      relative_path.start_with?("app/assets/javascripts/wizard/")
   end
 
   def self.skip_module?(data)

From 37ed6d5a0e0dbd919d5aea9bcb249f9c17afb9bc Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 23 Mar 2020 14:15:53 -0400
Subject: [PATCH 0313/1830] Ignore wizard es6 rename

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index cc4b81d793..10aef88535 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -19,3 +19,6 @@ c15056650647e8650288f973d9038500dc9cf7bb
 
 # Rename select kit from es6 -> js
 acc5cbdf8ecb9293a0fa9474ee73baf499c02428
+
+# Rename wizard from es6 -> js
+1ac02422011f89716ab27250d39b0e0212e03892

From 7f3bb06ac733f90c3c894ea735b9cfd3180c1609 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 23 Mar 2020 14:25:25 -0400
Subject: [PATCH 0314/1830] FIX: Wizard tests were missing

---
 app/assets/javascripts/wizard/test/test_helper.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/wizard/test/test_helper.js b/app/assets/javascripts/wizard/test/test_helper.js
index 50ed3d4afd..5835ba12ba 100644
--- a/app/assets/javascripts/wizard/test/test_helper.js
+++ b/app/assets/javascripts/wizard/test/test_helper.js
@@ -1,3 +1,4 @@
+// discourse-skip-module
 /*global document, sinon, Logster, QUnit */
 
 //= require env

From 8b7dc35e7687f1d2ea85c5c835f3c3c04a1b8a3a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2020 14:27:51 -0400
Subject: [PATCH 0315/1830] Build(deps): Bump sidekiq from 6.0.5 to 6.0.6
 (#9258)

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.0.5 to 6.0.6.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.0.5...v6.0.6)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 0bdf3adf50..87f3b6d817 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -374,7 +374,7 @@ GEM
       activesupport (>= 3.1)
     shoulda-matchers (4.3.0)
       activesupport (>= 4.2.0)
-    sidekiq (6.0.5)
+    sidekiq (6.0.6)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       rack-protection (>= 2.0.0)

From 27641f21e4c7a3294ac14408cdc5fd266f8d899c Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 23 Mar 2020 15:05:03 -0400
Subject: [PATCH 0316/1830] Migrate `discourse-common` from es6 -> js

---
 .../config/{environment.js.es6 => environment.js}            | 0
 .../helpers/{bound-i18n.js.es6 => bound-i18n.js}             | 0
 ...ent-for-collection.js.es6 => component-for-collection.js} | 0
 .../{component-for-row.js.es6 => component-for-row.js}       | 0
 .../discourse-common/helpers/{d-icon.js.es6 => d-icon.js}    | 0
 .../discourse-common/helpers/{fa-icon.js.es6 => fa-icon.js}  | 0
 .../discourse-common/helpers/{get-url.js.es6 => get-url.js}  | 0
 .../helpers/{html-safe.js.es6 => html-safe.js}               | 0
 .../discourse-common/helpers/{i18n.js.es6 => i18n.js}        | 0
 .../helpers/{popular-themes.js.es6 => popular-themes.js}     | 0
 .../lib/{attribute-hook.js.es6 => attribute-hook.js}         | 0
 .../lib/{deprecated.js.es6 => deprecated.js}                 | 0
 .../discourse-common/lib/{get-owner.js.es6 => get-owner.js}  | 5 +++--
 .../discourse-common/lib/{get-url.js.es6 => get-url.js}      | 0
 .../discourse-common/lib/{helpers.js.es6 => helpers.js}      | 0
 .../lib/{icon-library.js.es6 => icon-library.js}             | 0
 ...w-handlebars-helpers.js.es6 => raw-handlebars-helpers.js} | 0
 .../lib/{raw-handlebars.js.es6 => raw-handlebars.js}         | 0
 .../mixins/{focus-event.js.es6 => focus-event.js}            | 0
 .../discourse-common/{resolver.js.es6 => resolver.js}        | 0
 .../utils/{decorators.js.es6 => decorators.js}               | 1 +
 lib/discourse_js_processor.rb                                | 3 ++-
 lib/freedom_patches/raw_handlebars.rb                        | 2 +-
 23 files changed, 7 insertions(+), 4 deletions(-)
 rename app/assets/javascripts/discourse-common/config/{environment.js.es6 => environment.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{bound-i18n.js.es6 => bound-i18n.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{component-for-collection.js.es6 => component-for-collection.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{component-for-row.js.es6 => component-for-row.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{d-icon.js.es6 => d-icon.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{fa-icon.js.es6 => fa-icon.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{get-url.js.es6 => get-url.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{html-safe.js.es6 => html-safe.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{i18n.js.es6 => i18n.js} (100%)
 rename app/assets/javascripts/discourse-common/helpers/{popular-themes.js.es6 => popular-themes.js} (100%)
 rename app/assets/javascripts/discourse-common/lib/{attribute-hook.js.es6 => attribute-hook.js} (100%)
 rename app/assets/javascripts/discourse-common/lib/{deprecated.js.es6 => deprecated.js} (100%)
 rename app/assets/javascripts/discourse-common/lib/{get-owner.js.es6 => get-owner.js} (85%)
 rename app/assets/javascripts/discourse-common/lib/{get-url.js.es6 => get-url.js} (100%)
 rename app/assets/javascripts/discourse-common/lib/{helpers.js.es6 => helpers.js} (100%)
 rename app/assets/javascripts/discourse-common/lib/{icon-library.js.es6 => icon-library.js} (100%)
 rename app/assets/javascripts/discourse-common/lib/{raw-handlebars-helpers.js.es6 => raw-handlebars-helpers.js} (100%)
 rename app/assets/javascripts/discourse-common/lib/{raw-handlebars.js.es6 => raw-handlebars.js} (100%)
 rename app/assets/javascripts/discourse-common/mixins/{focus-event.js.es6 => focus-event.js} (100%)
 rename app/assets/javascripts/discourse-common/{resolver.js.es6 => resolver.js} (100%)
 rename app/assets/javascripts/discourse-common/utils/{decorators.js.es6 => decorators.js} (99%)

diff --git a/app/assets/javascripts/discourse-common/config/environment.js.es6 b/app/assets/javascripts/discourse-common/config/environment.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/config/environment.js.es6
rename to app/assets/javascripts/discourse-common/config/environment.js
diff --git a/app/assets/javascripts/discourse-common/helpers/bound-i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/bound-i18n.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/bound-i18n.js.es6
rename to app/assets/javascripts/discourse-common/helpers/bound-i18n.js
diff --git a/app/assets/javascripts/discourse-common/helpers/component-for-collection.js.es6 b/app/assets/javascripts/discourse-common/helpers/component-for-collection.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/component-for-collection.js.es6
rename to app/assets/javascripts/discourse-common/helpers/component-for-collection.js
diff --git a/app/assets/javascripts/discourse-common/helpers/component-for-row.js.es6 b/app/assets/javascripts/discourse-common/helpers/component-for-row.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/component-for-row.js.es6
rename to app/assets/javascripts/discourse-common/helpers/component-for-row.js
diff --git a/app/assets/javascripts/discourse-common/helpers/d-icon.js.es6 b/app/assets/javascripts/discourse-common/helpers/d-icon.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/d-icon.js.es6
rename to app/assets/javascripts/discourse-common/helpers/d-icon.js
diff --git a/app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6 b/app/assets/javascripts/discourse-common/helpers/fa-icon.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6
rename to app/assets/javascripts/discourse-common/helpers/fa-icon.js
diff --git a/app/assets/javascripts/discourse-common/helpers/get-url.js.es6 b/app/assets/javascripts/discourse-common/helpers/get-url.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/get-url.js.es6
rename to app/assets/javascripts/discourse-common/helpers/get-url.js
diff --git a/app/assets/javascripts/discourse-common/helpers/html-safe.js.es6 b/app/assets/javascripts/discourse-common/helpers/html-safe.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/html-safe.js.es6
rename to app/assets/javascripts/discourse-common/helpers/html-safe.js
diff --git a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/i18n.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/i18n.js.es6
rename to app/assets/javascripts/discourse-common/helpers/i18n.js
diff --git a/app/assets/javascripts/discourse-common/helpers/popular-themes.js.es6 b/app/assets/javascripts/discourse-common/helpers/popular-themes.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/popular-themes.js.es6
rename to app/assets/javascripts/discourse-common/helpers/popular-themes.js
diff --git a/app/assets/javascripts/discourse-common/lib/attribute-hook.js.es6 b/app/assets/javascripts/discourse-common/lib/attribute-hook.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/attribute-hook.js.es6
rename to app/assets/javascripts/discourse-common/lib/attribute-hook.js
diff --git a/app/assets/javascripts/discourse-common/lib/deprecated.js.es6 b/app/assets/javascripts/discourse-common/lib/deprecated.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/deprecated.js.es6
rename to app/assets/javascripts/discourse-common/lib/deprecated.js
diff --git a/app/assets/javascripts/discourse-common/lib/get-owner.js.es6 b/app/assets/javascripts/discourse-common/lib/get-owner.js
similarity index 85%
rename from app/assets/javascripts/discourse-common/lib/get-owner.js.es6
rename to app/assets/javascripts/discourse-common/lib/get-owner.js
index 38b75b80a0..0fd653bb9b 100644
--- a/app/assets/javascripts/discourse-common/lib/get-owner.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/get-owner.js
@@ -1,8 +1,9 @@
 import deprecated from "discourse-common/lib/deprecated";
+import { getOwner as emberGetOwner } from "@ember/application";
 
 export function getOwner(obj) {
-  if (Ember.getOwner) {
-    return Ember.getOwner(obj) || Discourse.__container__;
+  if (emberGetOwner) {
+    return emberGetOwner(obj) || Discourse.__container__;
   }
 
   return obj.container;
diff --git a/app/assets/javascripts/discourse-common/lib/get-url.js.es6 b/app/assets/javascripts/discourse-common/lib/get-url.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/get-url.js.es6
rename to app/assets/javascripts/discourse-common/lib/get-url.js
diff --git a/app/assets/javascripts/discourse-common/lib/helpers.js.es6 b/app/assets/javascripts/discourse-common/lib/helpers.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/helpers.js.es6
rename to app/assets/javascripts/discourse-common/lib/helpers.js
diff --git a/app/assets/javascripts/discourse-common/lib/icon-library.js.es6 b/app/assets/javascripts/discourse-common/lib/icon-library.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/icon-library.js.es6
rename to app/assets/javascripts/discourse-common/lib/icon-library.js
diff --git a/app/assets/javascripts/discourse-common/lib/raw-handlebars-helpers.js.es6 b/app/assets/javascripts/discourse-common/lib/raw-handlebars-helpers.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/raw-handlebars-helpers.js.es6
rename to app/assets/javascripts/discourse-common/lib/raw-handlebars-helpers.js
diff --git a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6 b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
rename to app/assets/javascripts/discourse-common/lib/raw-handlebars.js
diff --git a/app/assets/javascripts/discourse-common/mixins/focus-event.js.es6 b/app/assets/javascripts/discourse-common/mixins/focus-event.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/mixins/focus-event.js.es6
rename to app/assets/javascripts/discourse-common/mixins/focus-event.js
diff --git a/app/assets/javascripts/discourse-common/resolver.js.es6 b/app/assets/javascripts/discourse-common/resolver.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/resolver.js.es6
rename to app/assets/javascripts/discourse-common/resolver.js
diff --git a/app/assets/javascripts/discourse-common/utils/decorators.js.es6 b/app/assets/javascripts/discourse-common/utils/decorators.js
similarity index 99%
rename from app/assets/javascripts/discourse-common/utils/decorators.js.es6
rename to app/assets/javascripts/discourse-common/utils/decorators.js
index 3339eb03fa..36e537a063 100644
--- a/app/assets/javascripts/discourse-common/utils/decorators.js.es6
+++ b/app/assets/javascripts/discourse-common/utils/decorators.js
@@ -41,6 +41,7 @@ export function readOnly(target, name, desc) {
 
 import decoratorAlias from "ember-addons/decorator-alias";
 
+/* eslint-disable */
 export var on = decoratorAlias(Ember.on, "Can not `on` without event names");
 export var observes = decoratorAlias(
   Ember.observer,
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index e1530090de..d2d671e0ac 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -40,7 +40,8 @@ class DiscourseJsProcessor
       relative_path.start_with?("app/assets/javascripts/admin/") ||
       relative_path.start_with?("app/assets/javascripts/pretty-text/") ||
       relative_path.start_with?("app/assets/javascripts/select-kit/") ||
-      relative_path.start_with?("app/assets/javascripts/wizard/")
+      relative_path.start_with?("app/assets/javascripts/wizard/") ||
+      relative_path.start_with?("app/assets/javascripts/discourse-common/")
   end
 
   def self.skip_module?(data)
diff --git a/lib/freedom_patches/raw_handlebars.rb b/lib/freedom_patches/raw_handlebars.rb
index 488061fb56..0f4a0bd8f7 100644
--- a/lib/freedom_patches/raw_handlebars.rb
+++ b/lib/freedom_patches/raw_handlebars.rb
@@ -11,7 +11,7 @@ class Barber::Precompiler
   def precompiler
     if !@precompiler
 
-      source = File.read("#{Rails.root}/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6")
+      source = File.read("#{Rails.root}/app/assets/javascripts/discourse-common/lib/raw-handlebars.js")
       transpiler = DiscourseJsProcessor::Transpiler.new(skip_module: true)
       transpiled = transpiler.perform(source)
 

From 4ecf0be93ddfba10c3711ef2afdedaeba7533c1e Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 23 Mar 2020 15:05:37 -0400
Subject: [PATCH 0317/1830] Don't blame these renames

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 10aef88535..3e7bf97bb8 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -22,3 +22,6 @@ acc5cbdf8ecb9293a0fa9474ee73baf499c02428
 
 # Rename wizard from es6 -> js
 1ac02422011f89716ab27250d39b0e0212e03892
+
+# Rename discourse-common es6 -> js
+167503ca4824e37a2e93d74b3f50271556d0ba8e

From dc1836573d96768b4cc685c52c2c15aeac9f069e Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Tue, 24 Mar 2020 01:13:25 +0530
Subject: [PATCH 0318/1830] UX: display avatar flair in categories route topic
 list items (#9197)

---
 app/assets/javascripts/discourse/models/topic.js   | 14 ++++++++++++--
 .../components/latest-topic-list-item.hbs          | 11 +++++++++--
 .../templates/mobile/list/topic-list-item.hbr      |  2 +-
 .../stylesheets/desktop/latest-topic-list.scss     |  6 ++++++
 .../category_and_topic_lists_serializer.rb         | 11 +++++++++++
 5 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index a3c9ee26c6..ea118dbc7a 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -63,9 +63,19 @@ const Topic = RestModel.extend({
       const latest = posters.filter(
         p => p.extras && p.extras.indexOf("latest") >= 0
       )[0];
-      user = latest && latest.user;
+      user = latest;
     }
-    return user || this.creator;
+    return user || posters.firstObject;
+  },
+
+  @discourseComputed("lastPoster")
+  lastPosterUser(poster) {
+    return poster.user;
+  },
+
+  @discourseComputed("lastPoster")
+  lastPosterGroup(poster) {
+    return poster.primary_group;
   },
 
   @discourseComputed("posters.[]", "participants.[]", "allowed_user_count")
diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
index a1f459f725..c071eaaef1 100644
--- a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
@@ -1,7 +1,14 @@
 <div class='topic-poster'>
-  {{#user-link user=topic.lastPoster}}
-    {{avatar topic.lastPoster imageSize="large"}}
+  {{#user-link user=topic.lastPosterUser}}
+    {{avatar topic.lastPosterUser imageSize="large"}}
   {{/user-link}}
+  {{#if topic.lastPosterGroup}}
+    {{avatar-flair
+      flairURL=topic.lastPosterGroup.flair_url
+      flairBgColor=topic.lastPosterGroup.flair_bg_color
+      flairColor=topic.lastPosterGroup.flair_color
+      groupName=topic.lastPosterGroup.name}}
+  {{/if}}
 </div>
 <div class='main-link'>
   <div class='top-row'>
diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr b/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr
index 727c8382d8..07acb21db6 100644
--- a/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr
+++ b/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr
@@ -1,7 +1,7 @@
 <td>
   {{~#unless expandPinned}}
   <div class='pull-left'>
-    <a href="{{topic.lastPostUrl}}" data-user-card="{{topic.last_poster_username}}">{{avatar topic.lastPoster imageSize="large"}}</a>
+    <a href="{{topic.lastPostUrl}}" data-user-card="{{topic.last_poster_username}}">{{avatar topic.lastPosterUser imageSize="large"}}</a>
   </div>
   <div class='right'>
     {{else}}
diff --git a/app/assets/stylesheets/desktop/latest-topic-list.scss b/app/assets/stylesheets/desktop/latest-topic-list.scss
index 490023dc6f..6169e0830f 100644
--- a/app/assets/stylesheets/desktop/latest-topic-list.scss
+++ b/app/assets/stylesheets/desktop/latest-topic-list.scss
@@ -21,7 +21,13 @@
   align-items: center;
 
   .topic-poster {
+    position: relative;
     width: 60px;
+    .avatar-flair {
+      position: absolute;
+      bottom: 0;
+      right: 10px;
+    }
   }
   .main-link {
     @extend .topic-list-main-link;
diff --git a/app/serializers/category_and_topic_lists_serializer.rb b/app/serializers/category_and_topic_lists_serializer.rb
index 568ac1255a..edea6be090 100644
--- a/app/serializers/category_and_topic_lists_serializer.rb
+++ b/app/serializers/category_and_topic_lists_serializer.rb
@@ -4,6 +4,7 @@ class CategoryAndTopicListsSerializer < ApplicationSerializer
   has_one :category_list, serializer: CategoryListSerializer, embed: :objects
   has_one :topic_list, serializer: TopicListSerializer, embed: :objects
   has_many :users, serializer: BasicUserSerializer, embed: :objects
+  has_many :primary_groups, serializer: PrimaryGroupSerializer, embed: :objects
 
   def users
     users = object.topic_list.topics.map do |t|
@@ -15,4 +16,14 @@ class CategoryAndTopicListsSerializer < ApplicationSerializer
     users
   end
 
+  def primary_groups
+    groups = object.topic_list.topics.map do |t|
+      t.posters.map { |poster| poster.try(:primary_group) }
+    end
+    groups.flatten!
+    groups.compact!
+    groups.uniq!(&:id)
+    groups
+  end
+
 end

From 4b8acce92bc791b538b4a83bd07cddf180cd91db Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 5 Mar 2020 17:33:25 -0800
Subject: [PATCH 0319/1830] FIX: Check for permalinks before showing the 404
 page

Limitations: the user profile "open external links in new tab setting" is
slightly broken for "External URL" permalinks.

Remove the copy from the admin permalinks page stating that this doesn't work.
---
 app/assets/javascripts/discourse/lib/url.js   |  1 -
 .../javascripts/discourse/routes/unknown.js   | 20 +++++++--
 app/controllers/permalinks_controller.rb      | 26 ++++++++++-
 config/locales/client.en.yml                  |  2 +-
 config/routes.rb                              |  2 +
 .../acceptance/unknown-test.js.es6            | 45 ++++++++++++++++++-
 .../helpers/create-pretender.js.es6           | 11 +++--
 7 files changed, 93 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/url.js b/app/assets/javascripts/discourse/lib/url.js
index 7892abafd9..a475c4aec3 100644
--- a/app/assets/javascripts/discourse/lib/url.js
+++ b/app/assets/javascripts/discourse/lib/url.js
@@ -24,7 +24,6 @@ const SERVER_SIDE_ONLY = [
   /^\/posts\/\d+\/raw/,
   /^\/raw\/\d+/,
   /^\/wizard/,
-  /^\/go\//, // EXPERIMENTAL: https://meta.discourse.org/t/-/142605
   /\.rss$/,
   /\.json$/,
   /^\/admin\/upgrade$/,
diff --git a/app/assets/javascripts/discourse/routes/unknown.js b/app/assets/javascripts/discourse/routes/unknown.js
index 3df278df6f..28cba698d0 100644
--- a/app/assets/javascripts/discourse/routes/unknown.js
+++ b/app/assets/javascripts/discourse/routes/unknown.js
@@ -1,8 +1,22 @@
-import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
+import DiscourseURL from "discourse/lib/url";
+import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
-  model() {
-    return ajax("/404-body", { dataType: "html" });
+  model(params, transition) {
+    const path = params.path;
+    return ajax("/permalink-check.json", {
+      data: { path }
+    }).then(results => {
+      if (results.found) {
+        // Avoid polluting the history stack for external links
+        transition.abort();
+        DiscourseURL.routeTo(results.target_url);
+        return "";
+      } else {
+        // 404 body HTML
+        return results.html;
+      }
+    });
   }
 });
diff --git a/app/controllers/permalinks_controller.rb b/app/controllers/permalinks_controller.rb
index 260979614e..33f8d04c40 100644
--- a/app/controllers/permalinks_controller.rb
+++ b/app/controllers/permalinks_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class PermalinksController < ApplicationController
-  skip_before_action :check_xhr, :preload_json
+  skip_before_action :check_xhr, :preload_json, only: [:show]
 
   def show
     url = request.fullpath
@@ -17,4 +17,28 @@ class PermalinksController < ApplicationController
     end
   end
 
+  def check
+    begin
+      raise Discourse::NotFound if params[:path].blank?
+
+      permalink = Permalink.find_by_url(params[:path])
+
+      raise Discourse::NotFound unless permalink
+
+      data = {
+        found: true,
+        internal: permalink.external_url.nil?,
+        target_url: permalink.target_url,
+      }
+
+      render json: MultiJson.dump(data)
+    rescue Discourse::NotFound
+      data = {
+        found: false,
+        html: build_not_found_page(status: 200),
+      }
+      render json: MultiJson.dump(data)
+    end
+  end
+
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 27d207efb7..4382448fea 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4578,7 +4578,7 @@ en:
 
       permalink:
         title: "Permalinks"
-        description: "Please note this only applies to external sources, links posted on your forum will not be redirected."
+        description: "Redirections to apply for URLs not known by the forum."
         url: "URL"
         topic_id: "Topic ID"
         topic_title: "Topic"
diff --git a/config/routes.rb b/config/routes.rb
index 7cde4b038e..8306dcc40a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -954,6 +954,8 @@ Discourse::Application.routes.draw do
 
   resources :csp_reports, only: [:create]
 
+  get "/permalink-check", to: 'permalinks#check'
+
   get "*url", to: 'permalinks#show', constraints: PermalinkConstraint.new
   end
 end
diff --git a/test/javascripts/acceptance/unknown-test.js.es6 b/test/javascripts/acceptance/unknown-test.js.es6
index 3283d362ee..abc4b0d955 100644
--- a/test/javascripts/acceptance/unknown-test.js.es6
+++ b/test/javascripts/acceptance/unknown-test.js.es6
@@ -1,8 +1,49 @@
 import { acceptance } from "helpers/qunit-helpers";
+import pretender from "helpers/create-pretender";
 acceptance("Unknown");
 
-QUnit.test("Unknown URL", async assert => {
-  assert.expect(1);
+QUnit.test("Permalink Unknown URL", async assert => {
   await visit("/url-that-doesn't-exist");
   assert.ok(exists(".page-not-found"), "The not found content is present");
 });
+
+QUnit.test("Permalink URL to a Topic", async assert => {
+  pretender.get("/permalink-check.json", () => {
+    return [
+      200,
+      { "Content-Type": "application/json" },
+      {
+        found: true,
+        internal: true,
+        target_url: "/t/internationalization-localization/280"
+      }
+    ];
+  });
+
+  await visit("/viewtopic.php?f=8&t=280");
+  assert.ok(exists(".topic-post"));
+});
+
+QUnit.test("Permalink URL to a static page", async assert => {
+  pretender.get("/permalink-check.json", () => {
+    return [
+      200,
+      { "Content-Type": "application/json" },
+      {
+        found: true,
+        internal: true,
+        target_url: "/faq"
+      }
+    ];
+  });
+
+  await visit("/not-the-url-for-faq");
+
+  // body is outside of #ember-testing-container and needs to be targeted
+  // through document instead of find
+  assert.ok(
+    document.querySelector("body.static-faq"),
+    "routed to the faq page"
+  );
+  assert.ok(exists(".body-page"));
+});
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index 934b6a652b..d5e92e55ed 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -267,12 +267,11 @@ export function applyDefaultHandlers(pretender) {
   pretender.put("/t/:id/recover", success);
   pretender.put("/t/:id/publish", success);
 
-  pretender.get("/404-body", () => {
-    return [
-      200,
-      { "Content-Type": "text/html" },
-      "<div class='page-not-found'>not found</div>"
-    ];
+  pretender.get("/permalink-check.json", () => {
+    return response({
+      found: false,
+      html: "<div class='page-not-found'>not found</div>"
+    });
   });
 
   pretender.delete("/draft.json", success);

From b8b29e79ad5341ee5a3c533b990434cc4feb42b3 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 24 Mar 2020 11:39:09 +1000
Subject: [PATCH 0320/1830] FIX: Improve user timezone saving (#9230)

Based on issues identified in https://meta.discourse.org/t/improved-bookmarks-with-reminders/144542/20

* Implement the resolvedTimezone() function on the user model where we return the user's timezone if it has been set, or we guess it using moment and save it to the user using an update call if it has not yet been set. This covers the cases of users who do not log out/in often who will not get their timezone set via login. This also makes sure the guess + save is done in a non-obtrusive way not on every page -- only when it is needed.

* Before if a user's timezone was blank when they visited their profile page we were autofilling the dropdown with the guessed timezone from moment. However this was confusing as it would appear you have that timezone saved in the DB when you really didn't. Now we do not autofill the dropdown and added a button to automatically guess the current timezone to make everything more explicit.
---
 .../discourse/controllers/bookmark.js         |  2 +-
 .../controllers/preferences/profile.js        |  6 ++-
 .../javascripts/discourse/models/bookmark.js  |  2 +-
 .../javascripts/discourse/models/user.js      | 33 ++++++++++++++-
 .../discourse/routes/preferences-profile.js   |  5 ---
 .../templates/preferences/profile.hbs         |  1 +
 .../discourse/widgets/post-menu.js            |  2 +-
 app/assets/stylesheets/common/base/user.scss  |  4 ++
 config/locales/client.en.yml                  |  1 +
 .../controllers/bookmark-test.js.es6          | 40 ++++++++++++-------
 test/javascripts/models/user-test.js.es6      | 38 ++++++++++++++++++
 11 files changed, 109 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index ecafa0dd23..18a6112a25 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -45,7 +45,7 @@ export default Controller.extend(ModalFunctionality, {
       customReminderTime: null,
       lastCustomReminderDate: null,
       lastCustomReminderTime: null,
-      userTimezone: this.currentUser.timezone
+      userTimezone: this.currentUser.resolvedTimezone()
     });
 
     this.loadLastUsedCustomReminderDatetime();
diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js b/app/assets/javascripts/discourse/controllers/preferences/profile.js
index 57d8759ac8..71992e99fd 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/profile.js
+++ b/app/assets/javascripts/discourse/controllers/preferences/profile.js
@@ -73,6 +73,10 @@ export default Controller.extend({
       );
     },
 
+    useCurrentTimezone() {
+      this.model.set("user_option.timezone", moment.tz.guess());
+    },
+
     save() {
       this.set("saved", false);
 
@@ -95,7 +99,7 @@ export default Controller.extend({
           // update the timezone in memory so we can use the new
           // one if we change routes without reloading the user
           if (this.currentUser.id === this.model.id) {
-            this.currentUser.timezone = this.model.user_option.timezone;
+            this.currentUser.changeTimezone(this.model.user_option.timezone);
           }
 
           cookAsync(model.get("bio_raw"))
diff --git a/app/assets/javascripts/discourse/models/bookmark.js b/app/assets/javascripts/discourse/models/bookmark.js
index 0473c10811..bb88e7da52 100644
--- a/app/assets/javascripts/discourse/models/bookmark.js
+++ b/app/assets/javascripts/discourse/models/bookmark.js
@@ -113,7 +113,7 @@ const Bookmark = RestModel.extend({
   formattedReminder(bookmarkReminderAt) {
     const currentUser = PreloadStore.get("currentUser");
     return moment
-      .tz(bookmarkReminderAt, currentUser.timezone || moment.tz.guess())
+      .tz(bookmarkReminderAt, currentUser.resolvedTimezone())
       .format(I18n.t("dates.long_with_year"));
   },
 
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index 421376609a..7b106d9206 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -840,10 +840,40 @@ const User = RestModel.extend({
       !secondFactorEnabled &&
       (enforce === "all" || (enforce === "staff" && staff))
     );
+  },
+
+  resolvedTimezone() {
+    if (this._timezone) {
+      return this._timezone;
+    }
+
+    this.changeTimezone(moment.tz.guess());
+    ajax(userPath(this.username + ".json"), {
+      type: "PUT",
+      dataType: "json",
+      data: { timezone: this._timezone }
+    });
+
+    return this._timezone;
+  },
+
+  changeTimezone(tz) {
+    this._timezone = tz;
   }
 });
 
 User.reopenClass(Singleton, {
+  munge(json) {
+    // timezone should not be directly accessed, use
+    // resolvedTimezone() and changeTimezone(tz)
+    if (!json._timezone) {
+      json._timezone = json.timezone;
+      delete json.timezone;
+    }
+
+    return json;
+  },
+
   // Find a `User` for a given username.
   findByUsername(username, options) {
     const user = User.create({ username: username });
@@ -852,7 +882,7 @@ User.reopenClass(Singleton, {
 
   // TODO: Use app.register and junk Singleton
   createCurrent() {
-    const userJson = PreloadStore.get("currentUser");
+    let userJson = PreloadStore.get("currentUser");
 
     if (userJson && userJson.primary_group_id) {
       const primaryGroup = userJson.groups.find(
@@ -864,6 +894,7 @@ User.reopenClass(Singleton, {
     }
 
     if (userJson) {
+      userJson = User.munge(userJson);
       const store = Discourse.__container__.lookup("service:store");
       return store.createRecord("user", userJson);
     }
diff --git a/app/assets/javascripts/discourse/routes/preferences-profile.js b/app/assets/javascripts/discourse/routes/preferences-profile.js
index 02eb4df866..fb9a2ff527 100644
--- a/app/assets/javascripts/discourse/routes/preferences-profile.js
+++ b/app/assets/javascripts/discourse/routes/preferences-profile.js
@@ -1,13 +1,8 @@
 import RestrictedUserRoute from "discourse/routes/restricted-user";
-import { set } from "@ember/object";
 
 export default RestrictedUserRoute.extend({
   showFooter: true,
   setupController(controller, model) {
-    if (!model.user_option.timezone) {
-      set(model, "user_option.timezone", moment.tz.guess());
-    }
-
     controller.set("model", model);
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index f07c8a9a38..fded99a5fd 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -14,6 +14,7 @@
     onChange=(action (mut model.user_option.timezone))
     class="input-xxlarge"
   }}
+  {{d-button icon="globe" label="user.use_current_timezone" action=(action "useCurrentTimezone") }}
 </div>
 
 <div class="control-group pref-location">
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js b/app/assets/javascripts/discourse/widgets/post-menu.js
index 95c3477ffd..c21d60f698 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js
@@ -315,7 +315,7 @@ registerButton("bookmarkWithReminder", (attrs, state, siteSettings) => {
 
     if (attrs.bookmarkReminderAt) {
       let reminderAtDate = moment(attrs.bookmarkReminderAt).tz(
-        Discourse.currentUser.timezone
+        Discourse.currentUser.resolvedTimezone()
       );
       title = "bookmarks.created_with_reminder";
       titleOptions = {
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index ae62bc5fdf..c06f4fc655 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -724,3 +724,7 @@
     }
   }
 }
+
+.timezone-input {
+  margin-bottom: 0.5em;
+}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 4382448fea..9f72e5b3d8 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -846,6 +846,7 @@ en:
         clear:
           title: "Clear"
           warning: "Are you sure you want to clear your featured topic?"
+      use_current_timezone: "Use Current Timezone"
       profile_hidden: "This user's public profile is hidden."
       expand_profile: "Expand"
       collapse_profile: "Collapse"
diff --git a/test/javascripts/controllers/bookmark-test.js.es6 b/test/javascripts/controllers/bookmark-test.js.es6
index 978b7cd19f..c517ad2a89 100644
--- a/test/javascripts/controllers/bookmark-test.js.es6
+++ b/test/javascripts/controllers/bookmark-test.js.es6
@@ -1,10 +1,11 @@
-import { currentUser } from "helpers/qunit-helpers";
+import { logIn } from "helpers/qunit-helpers";
+import User from "discourse/models/user";
 let BookmarkController;
 
 moduleFor("controller:bookmark", {
   beforeEach() {
-    Discourse.currentUser = currentUser();
-    BookmarkController = this.subject({ currentUser: Discourse.currentUser });
+    logIn();
+    BookmarkController = this.subject({ currentUser: User.current() });
   },
 
   afterEach() {
@@ -119,7 +120,7 @@ QUnit.test(
   function(assert) {
     let dt = moment.tz(
       "2019-12-11T11:37:16",
-      BookmarkController.currentUser.timezone
+      BookmarkController.currentUser.resolvedTimezone()
     );
 
     assert.equal(
@@ -181,14 +182,23 @@ QUnit.test(
   }
 );
 
-QUnit.test(
-  "userHasTimezoneSet updates true/false based on whether the current user timezone is set globally",
-  function(assert) {
-    Discourse.currentUser.timezone = null;
-    BookmarkController.onShow();
-    assert.equal(BookmarkController.userHasTimezoneSet, false);
-    Discourse.currentUser.timezone = "Australia/Brisbane";
-    BookmarkController.onShow();
-    assert.equal(BookmarkController.userHasTimezoneSet, true);
-  }
-);
+QUnit.test("user timezone updates when the modal is shown", function(assert) {
+  User.current().changeTimezone(null);
+  let stub = sandbox.stub(moment.tz, "guess").returns("Europe/Moscow");
+  BookmarkController.onShow();
+  assert.equal(BookmarkController.userHasTimezoneSet, true);
+  assert.equal(
+    BookmarkController.userTimezone,
+    "Europe/Moscow",
+    "the user does not have their timezone set and a timezone is guessed"
+  );
+  User.current().changeTimezone("Australia/Brisbane");
+  BookmarkController.onShow();
+  assert.equal(BookmarkController.userHasTimezoneSet, true);
+  assert.equal(
+    BookmarkController.userTimezone,
+    "Australia/Brisbane",
+    "the user does their timezone set"
+  );
+  stub.restore();
+});
diff --git a/test/javascripts/models/user-test.js.es6 b/test/javascripts/models/user-test.js.es6
index 20ef656cf2..4675043adf 100644
--- a/test/javascripts/models/user-test.js.es6
+++ b/test/javascripts/models/user-test.js.es6
@@ -1,5 +1,7 @@
 import User from "discourse/models/user";
 import Group from "discourse/models/group";
+import * as ajaxlib from "discourse/lib/ajax";
+import pretender from "helpers/create-pretender";
 
 QUnit.module("model:user");
 
@@ -66,3 +68,39 @@ QUnit.test("canMangeGroup", assert => {
     "a group owner should be able to manage the group"
   );
 });
+
+QUnit.test("resolvedTimezone", assert => {
+  const tz = "Australia/Brisbane";
+  let user = User.create({ timezone: tz, username: "chuck" });
+  let stub = sandbox.stub(moment.tz, "guess").returns("America/Chicago");
+
+  pretender.put("/u/chuck.json", () => {
+    return [200, { "Content-Type": "application/json" }, {}];
+  });
+
+  let spy = sandbox.spy(ajaxlib, "ajax");
+  assert.equal(
+    user.resolvedTimezone(),
+    tz,
+    "if the user already has a timezone return it"
+  );
+  assert.ok(
+    spy.notCalled,
+    "if the user already has a timezone do not call AJAX update"
+  );
+  user = User.create({ username: "chuck" });
+  assert.equal(
+    user.resolvedTimezone(),
+    "America/Chicago",
+    "if the user has no timezone guess it with moment"
+  );
+  assert.ok(
+    spy.calledWith("/u/chuck.json", {
+      type: "PUT",
+      dataType: "json",
+      data: { timezone: "America/Chicago" }
+    }),
+    "if the user has no timezone save it with an AJAX update"
+  );
+  stub.restore();
+});

From 9726a0e0b447d7137031190ccdd67cf5ca15c36a Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 24 Mar 2020 15:21:50 +1100
Subject: [PATCH 0321/1830] DEV: upgrade json gem and add explicit dependency

json is shipped out of sync with Ruby. Even though we use OJ for many things
we still use the json gem sometimes, this ensures we use the latest

https://github.com/discourse/discourse/blob/b8b29e79ad5341ee5a3c533b990434cc4feb42b3/config/initializers/100-oj.rb#L9-L9
---
 Gemfile      | 2 ++
 Gemfile.lock | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Gemfile b/Gemfile
index a1f8015d13..2c0ed01915 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,6 +28,8 @@ else
   gem 'sprockets-rails'
 end
 
+gem 'json'
+
 # TODO: At the moment Discourse does not work with Sprockets 4, we would need to correct internals
 # This is a desired upgrade we should get to.
 gem 'sprockets', '3.7.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 87f3b6d817..0ce536ba02 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -157,6 +157,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    json (2.3.0)
     jwt (2.2.1)
     kgio (2.11.3)
     libv8 (7.3.492.27.1)
@@ -467,6 +468,7 @@ DEPENDENCIES
   highline (~> 1.7.0)
   htmlentities
   http_accept_language
+  json
   listen
   lograge
   logstash-event

From ecda9dbf25ddfc32a6d0dbaec16a51c9f3fd1f62 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 24 Mar 2020 16:23:16 +1100
Subject: [PATCH 0322/1830] DEV: Bump annotate from 3.1.0 to 3.1.1 (#9261)

Bumps [annotate](https://github.com/ctran/annotate_models) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/ctran/annotate_models/releases)
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ctran/annotate_models/compare/v3.1.0...v3.1.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Very safe upgrade, annotate only used in dev
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0ce536ba02..46656e88a8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,7 +40,7 @@ GEM
       zeitwerk (~> 2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    annotate (3.1.0)
+    annotate (3.1.1)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.0)

From 4452817ed0078fad248772e2f10110251b06e78f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 24 Mar 2020 16:25:52 +1100
Subject: [PATCH 0323/1830] DEV: Bump pg from 1.2.2 to 1.2.3 (#9235)

Bumps [pg](https://github.com/ged/ruby-pg) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/commits)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Pretty safe, adds protection for 2 possible segfaults.
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 46656e88a8..925a89aa68 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -255,7 +255,7 @@ GEM
       parallel
     parser (2.7.0.4)
       ast (~> 2.4.0)
-    pg (1.2.2)
+    pg (1.2.3)
     progress (3.5.2)
     pry (0.12.2)
       coderay (~> 1.1.0)

From 58ae0d4bd9b7d75904f2524370e0516413738039 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Mon, 23 Mar 2020 22:28:07 -0700
Subject: [PATCH 0324/1830] DEV: Add test case for /srv/status probers (#9259)

---
 spec/components/middleware/request_tracker_spec.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb
index d6c413cb9d..f0b605b53e 100644
--- a/spec/components/middleware/request_tracker_spec.rb
+++ b/spec/components/middleware/request_tracker_spec.rb
@@ -79,10 +79,18 @@ describe Middleware::RequestTracker do
 
       Middleware::RequestTracker.log_request(data)
 
+      # /srv/status is never a tracked view because content-type is text/plain
+      data = Middleware::RequestTracker.get_data(env(
+        "HTTP_USER_AGENT" => "kube-probe/1.18",
+        "REQUEST_URI" => "/srv/status?shutdown_ok=1",
+      ), ["200", { "Content-Type" => 'text/plain' }], 0.1)
+
+      Middleware::RequestTracker.log_request(data)
+
       ApplicationRequest.write_cache!
 
-      expect(ApplicationRequest.http_total.first.count).to eq(3)
-      expect(ApplicationRequest.http_2xx.first.count).to eq(3)
+      expect(ApplicationRequest.http_total.first.count).to eq(4)
+      expect(ApplicationRequest.http_2xx.first.count).to eq(4)
 
       expect(ApplicationRequest.page_view_anon.first.count).to eq(2)
       expect(ApplicationRequest.page_view_crawler.first.count).to eq(1)

From 5b3bb4b2f007edbe6a81122f441787c08e59c99e Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 24 Mar 2020 16:47:40 +1100
Subject: [PATCH 0325/1830] DEV: upgrade Rails

Latest version of Rails contains compatibility fixes for Ruby 2.7 and some
minor security fixes we would like to have
---
 Gemfile      | 14 ++++++-------
 Gemfile.lock | 56 ++++++++++++++++++++++++++--------------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2c0ed01915..94b5dc86f4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,13 +18,13 @@ else
   # this allows us to include the bits of rails we use without pieces we do not.
   #
   # To issue a rails update bump the version number here
-  gem 'actionmailer', '6.0.1'
-  gem 'actionpack', '6.0.1'
-  gem 'actionview', '6.0.1'
-  gem 'activemodel', '6.0.1'
-  gem 'activerecord', '6.0.1'
-  gem 'activesupport', '6.0.1'
-  gem 'railties', '6.0.1'
+  gem 'actionmailer', '6.0.2.2'
+  gem 'actionpack', '6.0.2.2'
+  gem 'actionview', '6.0.2.2'
+  gem 'activemodel', '6.0.2.2'
+  gem 'activerecord', '6.0.2.2'
+  gem 'activesupport', '6.0.2.2'
+  gem 'railties', '6.0.2.2'
   gem 'sprockets-rails'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 925a89aa68..6e92b23687 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (6.0.1)
-      actionpack (= 6.0.1)
-      actionview (= 6.0.1)
-      activejob (= 6.0.1)
+    actionmailer (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      actionview (= 6.0.2.2)
+      activejob (= 6.0.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.1)
-      actionview (= 6.0.1)
-      activesupport (= 6.0.1)
-      rack (~> 2.0)
+    actionpack (6.0.2.2)
+      actionview (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.1)
-      activesupport (= 6.0.1)
+    actionview (6.0.2.2)
+      activesupport (= 6.0.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -24,15 +24,15 @@ GEM
       actionview (>= 6.0.a)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (6.0.1)
-      activesupport (= 6.0.1)
+    activejob (6.0.2.2)
+      activesupport (= 6.0.2.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.1)
-      activesupport (= 6.0.1)
-    activerecord (6.0.1)
-      activemodel (= 6.0.1)
-      activesupport (= 6.0.1)
-    activesupport (6.0.1)
+    activemodel (6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activerecord (6.0.2.2)
+      activemodel (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activesupport (6.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -283,9 +283,9 @@ GEM
     rails_multisite (2.1.1)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
-    railties (6.0.1)
-      actionpack (= 6.0.1)
-      activesupport (= 6.0.1)
+    railties (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -423,14 +423,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (= 6.0.1)
-  actionpack (= 6.0.1)
-  actionview (= 6.0.1)
+  actionmailer (= 6.0.2.2)
+  actionpack (= 6.0.2.2)
+  actionview (= 6.0.2.2)
   actionview_precompiler
   active_model_serializers (~> 0.8.3)
-  activemodel (= 6.0.1)
-  activerecord (= 6.0.1)
-  activesupport (= 6.0.1)
+  activemodel (= 6.0.2.2)
+  activerecord (= 6.0.2.2)
+  activesupport (= 6.0.2.2)
   addressable
   annotate
   aws-sdk-s3
@@ -510,7 +510,7 @@ DEPENDENCIES
   rack-mini-profiler
   rack-protection
   rails_multisite
-  railties (= 6.0.1)
+  railties (= 6.0.2.2)
   rake
   rb-fsevent
   rb-inotify (~> 0.9)

From 46a962224621eef623e208f2810af67ad55553c9 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 24 Mar 2020 16:59:42 +1100
Subject: [PATCH 0326/1830] FIX: prevent scheduled publishing to deleted
 category

We missed a dependency which left timers firing on missing categories.

Co-authored-by: tshenry
---
 app/models/category.rb                      | 1 +
 spec/requests/categories_controller_spec.rb | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index bb4a8d5219..6e0a073a6b 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -42,6 +42,7 @@ class Category < ActiveRecord::Base
 
   has_many :category_groups, dependent: :destroy
   has_many :groups, through: :category_groups
+  has_many :topic_timers, dependent: :destroy
 
   has_and_belongs_to_many :web_hooks
 
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index ff5110a0ac..8451936ccc 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -46,7 +46,7 @@ describe CategoriesController do
     end
 
     it "respects permalinks before redirecting /category paths to /c paths" do
-      perm = Permalink.create!(url: "category/something", category_id: category.id)
+      _perm = Permalink.create!(url: "category/something", category_id: category.id)
 
       get "/category/something"
       expect(response.status).to eq(301)
@@ -218,11 +218,15 @@ describe CategoriesController do
 
       it "deletes the record" do
         sign_in(admin)
+
+        id = Fabricate(:topic_timer, category: category).id
+
         expect do
           delete "/categories/#{category.slug}.json"
         end.to change(Category, :count).by(-1)
         expect(response.status).to eq(200)
         expect(UserHistory.count).to eq(1)
+        expect(TopicTimer.where(id: id).exists?).to eq(false)
       end
     end
   end
@@ -321,7 +325,7 @@ describe CategoriesController do
       end
 
       it "returns 422 if email_in address is already in use for other category" do
-        other_category = Fabricate(:category, name: "Other", email_in: "mail@examle.com")
+        _other_category = Fabricate(:category, name: "Other", email_in: "mail@examle.com")
 
         put "/categories/#{category.id}.json", params: {
           name: "Email",

From c7151f0fd649a7a5025e22db38754be669aa4b17 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 24 Mar 2020 17:11:13 +1100
Subject: [PATCH 0327/1830] Revert "DEV: upgrade Rails"

This reverts commit 5b3bb4b2f007edbe6a81122f441787c08e59c99e.

This erratically breaks multisite operation, we need more debugging
---
 Gemfile      | 14 ++++++-------
 Gemfile.lock | 56 ++++++++++++++++++++++++++--------------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Gemfile b/Gemfile
index 94b5dc86f4..2c0ed01915 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,13 +18,13 @@ else
   # this allows us to include the bits of rails we use without pieces we do not.
   #
   # To issue a rails update bump the version number here
-  gem 'actionmailer', '6.0.2.2'
-  gem 'actionpack', '6.0.2.2'
-  gem 'actionview', '6.0.2.2'
-  gem 'activemodel', '6.0.2.2'
-  gem 'activerecord', '6.0.2.2'
-  gem 'activesupport', '6.0.2.2'
-  gem 'railties', '6.0.2.2'
+  gem 'actionmailer', '6.0.1'
+  gem 'actionpack', '6.0.1'
+  gem 'actionview', '6.0.1'
+  gem 'activemodel', '6.0.1'
+  gem 'activerecord', '6.0.1'
+  gem 'activesupport', '6.0.1'
+  gem 'railties', '6.0.1'
   gem 'sprockets-rails'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 6e92b23687..925a89aa68 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      actionview (= 6.0.2.2)
-      activejob (= 6.0.2.2)
+    actionmailer (6.0.1)
+      actionpack (= 6.0.1)
+      actionview (= 6.0.1)
+      activejob (= 6.0.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.2.2)
-      actionview (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.0.1)
+      actionview (= 6.0.1)
+      activesupport (= 6.0.1)
+      rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionview (6.0.1)
+      activesupport (= 6.0.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -24,15 +24,15 @@ GEM
       actionview (>= 6.0.a)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    activejob (6.0.1)
+      activesupport (= 6.0.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activerecord (6.0.2.2)
-      activemodel (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activesupport (6.0.2.2)
+    activemodel (6.0.1)
+      activesupport (= 6.0.1)
+    activerecord (6.0.1)
+      activemodel (= 6.0.1)
+      activesupport (= 6.0.1)
+    activesupport (6.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -283,9 +283,9 @@ GEM
     rails_multisite (2.1.1)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
-    railties (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    railties (6.0.1)
+      actionpack (= 6.0.1)
+      activesupport (= 6.0.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -423,14 +423,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (= 6.0.2.2)
-  actionpack (= 6.0.2.2)
-  actionview (= 6.0.2.2)
+  actionmailer (= 6.0.1)
+  actionpack (= 6.0.1)
+  actionview (= 6.0.1)
   actionview_precompiler
   active_model_serializers (~> 0.8.3)
-  activemodel (= 6.0.2.2)
-  activerecord (= 6.0.2.2)
-  activesupport (= 6.0.2.2)
+  activemodel (= 6.0.1)
+  activerecord (= 6.0.1)
+  activesupport (= 6.0.1)
   addressable
   annotate
   aws-sdk-s3
@@ -510,7 +510,7 @@ DEPENDENCIES
   rack-mini-profiler
   rack-protection
   rails_multisite
-  railties (= 6.0.2.2)
+  railties (= 6.0.1)
   rake
   rb-fsevent
   rb-inotify (~> 0.9)

From bef8468510fe33ef1f89c982c11363a945b0f2c4 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Tue, 24 Mar 2020 13:04:46 +0530
Subject: [PATCH 0328/1830] Make qunit test code more clean.

45ce9876ccfeac0c51e5f32fb15bdcc9669204c5
---
 .../admin-customize-themes-show-test.js.es6   | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
index 3e9c0f9006..63a9453e36 100644
--- a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
+++ b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
@@ -8,18 +8,16 @@ moduleFor("controller:admin-customize-themes-show", {
   needs: ["controller:adminUser"]
 });
 
-const repoUrl = "https://github.com/discourse/discourse-brand-header.git";
-const remoteTheme = Theme.create({
-  id: 2,
-  default: true,
-  name: "default",
-  remote_theme: {
-    remote_url: repoUrl
-  }
-});
-
 QUnit.test("can display source url for remote themes", function(assert) {
-  delete remoteTheme["remote_theme"]["branch"];
+  const repoUrl = "https://github.com/discourse/discourse-brand-header.git";
+  const remoteTheme = Theme.create({
+    id: 2,
+    default: true,
+    name: "default",
+    remote_theme: {
+      remote_url: repoUrl
+    }
+  });
   const controller = this.subject({
     model: remoteTheme
   });
@@ -34,17 +32,22 @@ QUnit.test("can display source url for remote themes", function(assert) {
 QUnit.test("can display source url for remote theme branches", function(
   assert
 ) {
-  const branchUrl =
-    "https://github.com/discourse/discourse-brand-header/tree/beta";
-  remoteTheme["remote_theme"]["branch"] = "beta";
-
+  const remoteTheme = Theme.create({
+    id: 2,
+    default: true,
+    name: "default",
+    remote_theme: {
+      remote_url: "https://github.com/discourse/discourse-brand-header.git",
+      branch: "beta"
+    }
+  });
   const controller = this.subject({
     model: remoteTheme
   });
 
   assert.deepEqual(
     controller.get("remoteThemeLink"),
-    branchUrl,
+    "https://github.com/discourse/discourse-brand-header/tree/beta",
     "returns theme's repo URL to branch"
   );
 });

From d8640fd042d23ede3bbfbd4ae9a01fa16e5f2e0d Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Tue, 24 Mar 2020 11:12:52 +0200
Subject: [PATCH 0329/1830] DEV: Move requested_group_id custom field from post
 to topic (#9127)

Follow-up-to accbbded15974846523c3aeca85a59454e3f2f05
---
 .../discourse/lib/transform-post.js           |  4 +++
 .../javascripts/discourse/widgets/post.js     | 21 ++++++++++++++
 .../stylesheets/common/base/topic-post.scss   |  4 +++
 .../stylesheets/desktop/topic-post.scss       |  3 ++
 app/controllers/groups_controller.rb          |  2 +-
 app/serializers/basic_post_serializer.rb      | 29 +------------------
 app/serializers/topic_view_serializer.rb      | 20 ++++++++++++-
 config/locales/client.en.yml                  |  1 +
 config/locales/server.en.yml                  |  1 -
 lib/topic_view.rb                             |  2 +-
 spec/requests/groups_controller_spec.rb       |  2 +-
 .../serializers/basic_post_serializer_spec.rb | 23 ---------------
 test/javascripts/widgets/post-test.js.es6     | 15 ++++++++++
 13 files changed, 71 insertions(+), 56 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/transform-post.js b/app/assets/javascripts/discourse/lib/transform-post.js
index 09cb6d967c..585bb02af3 100644
--- a/app/assets/javascripts/discourse/lib/transform-post.js
+++ b/app/assets/javascripts/discourse/lib/transform-post.js
@@ -139,6 +139,10 @@ export default function transformPost(
     }
   }
 
+  if (post.post_number === 1 && topic.requested_group_name) {
+    postAtts.requestedGroupName = topic.requested_group_name;
+  }
+
   const showPMMap =
     topic.archetype === "private_message" && post.post_number === 1;
   if (showPMMap) {
diff --git a/app/assets/javascripts/discourse/widgets/post.js b/app/assets/javascripts/discourse/widgets/post.js
index bd84bfb428..c6fc4f3319 100644
--- a/app/assets/javascripts/discourse/widgets/post.js
+++ b/app/assets/javascripts/discourse/widgets/post.js
@@ -344,6 +344,22 @@ createWidget("expand-post-button", {
   }
 });
 
+createWidget("post-group-request", {
+  buildKey: attrs => `post-group-request-${attrs.id}`,
+
+  buildClasses() {
+    return ["group-request"];
+  },
+
+  html(attrs) {
+    const href = Discourse.getURL(
+      "/g/" + attrs.requestedGroupName + "/requests?filter=" + attrs.username
+    );
+
+    return h("a", { attributes: { href } }, I18n.t("groups.requests.handle"));
+  }
+});
+
 createWidget("post-contents", {
   buildKey: attrs => `post-contents-${attrs.id}`,
 
@@ -366,6 +382,11 @@ createWidget("post-contents", {
     let result = [
       new PostCooked(attrs, new DecoratorHelper(this), this.currentUser)
     ];
+
+    if (attrs.requestedGroupName) {
+      result.push(this.attach("post-group-request", attrs));
+    }
+
     result = result.concat(applyDecorators(this, "after-cooked", attrs, state));
 
     if (attrs.cooked_hidden) {
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index b458f04e37..2f028e3c5d 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -552,6 +552,10 @@ blockquote {
   .cooked {
     overflow: hidden;
   }
+  .group-request {
+    border-top: 1px solid $primary-low;
+    padding-top: 0.5em;
+  }
   &.highlighted {
     animation: background-fade-highlight 2.5s ease-out;
   }
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index a23e46d335..d404169fd8 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -613,6 +613,9 @@ blockquote {
   .cooked {
     padding: 0 $topic-body-width-padding 0.25em $topic-body-width-padding;
   }
+  .group-request {
+    padding: 0.5em $topic-body-width-padding 0 $topic-body-width-padding;
+  }
   a.expand-hidden {
     padding-left: $topic-body-width-padding;
   }
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 126d0910af..0df1f49012 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -439,7 +439,7 @@ class GroupsController < ApplicationController
       raw: params[:reason],
       archetype: Archetype.private_message,
       target_usernames: usernames.join(','),
-      custom_fields: { requested_group_id: group.id },
+      topic_opts: { custom_fields: { requested_group_id: group.id } },
       skip_validations: true
     ).create!
 
diff --git a/app/serializers/basic_post_serializer.rb b/app/serializers/basic_post_serializer.rb
index 32c14b5c72..3486c47bc2 100644
--- a/app/serializers/basic_post_serializer.rb
+++ b/app/serializers/basic_post_serializer.rb
@@ -40,34 +40,7 @@ class BasicPostSerializer < ApplicationSerializer
         I18n.t('flagging.user_must_edit')
       end
     else
-      cooked = object.filter_quotes(@parent_post)
-
-      if scope&.user
-
-        # PERF: this should not run on every post, only specific ones
-        # also, why is this in basic post serializer?
-        requested_group_id = post_custom_fields['requested_group_id'].to_i
-
-        if requested_group_id > 0
-          group = Group
-            .joins('JOIN group_users ON groups.id = group_users.group_id')
-            .find_by(
-              id: object.custom_fields['requested_group_id'].to_i,
-              group_users: { user_id: scope.user.id, owner: true }
-            )
-
-          if group
-            cooked << <<~EOF
-              <hr />
-              <a href="#{Discourse.base_uri}/g/#{group.name}/requests">
-                #{I18n.t('groups.request_membership_pm.handle')}
-              </a>
-            EOF
-          end
-        end
-      end
-
-      cooked
+      object.filter_quotes(@parent_post)
     end
   end
 
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index a0f37d3d70..824dfcb068 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -70,7 +70,8 @@ class TopicViewSerializer < ApplicationSerializer
     :destination_category_id,
     :pm_with_non_human_user,
     :queued_posts_count,
-    :show_read_indicator
+    :show_read_indicator,
+    :requested_group_name
   )
 
   has_one :details, serializer: TopicViewDetailsSerializer, root: false, embed: :objects
@@ -255,4 +256,21 @@ class TopicViewSerializer < ApplicationSerializer
   def show_read_indicator
     object.show_read_indicator?
   end
+
+  def requested_group_name
+    if scope&.user
+      group = Group
+        .joins('JOIN group_users ON groups.id = group_users.group_id')
+        .find_by(
+          id: object.topic.custom_fields['requested_group_id'].to_i,
+          group_users: { user_id: scope.user.id, owner: true }
+        )
+
+      group.name if group
+    end
+  end
+
+  def include_requested_group_name?
+    object.personal_message
+  end
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9f72e5b3d8..e9ad9aac7c 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -614,6 +614,7 @@ en:
         deny: "Deny"
         denied: "denied"
         undone: "request undone"
+        handle: "handle membership request"
       manage:
         title: "Manage"
         name: "Name"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index d034819d16..6d1c849522 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -427,7 +427,6 @@ en:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "Membership Request for @%{group_name}"
-      handle: "handle membership request"
     view_hidden_topic_request_reason: "I would like to join the group '%{group_name}', so I may access [this topic](%{topic_url})"
 
   education:
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 3123e19b46..94f31f44b1 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -35,7 +35,7 @@ class TopicView
   end
 
   def self.default_post_custom_fields
-    @default_post_custom_fields ||= [Post::NOTICE_TYPE, Post::NOTICE_ARGS, "action_code_who", "requested_group_id"]
+    @default_post_custom_fields ||= [Post::NOTICE_TYPE, Post::NOTICE_ARGS, "action_code_who"]
   end
 
   def self.post_custom_fields_whitelisters
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index f26f2483ee..381e247e42 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -1479,7 +1479,7 @@ describe GroupsController do
       body = JSON.parse(response.body)
 
       expect(body['relative_url']).to eq(topic.relative_url)
-      expect(post.custom_fields['requested_group_id'].to_i).to eq(group.id)
+      expect(post.topic.custom_fields['requested_group_id'].to_i).to eq(group.id)
       expect(post.user).to eq(user)
 
       expect(topic.title).to eq(I18n.t('groups.request_membership_pm.title',
diff --git a/spec/serializers/basic_post_serializer_spec.rb b/spec/serializers/basic_post_serializer_spec.rb
index 04f70583c4..c390527ca1 100644
--- a/spec/serializers/basic_post_serializer_spec.rb
+++ b/spec/serializers/basic_post_serializer_spec.rb
@@ -22,27 +22,4 @@ describe BasicPostSerializer do
 
   end
 
-  context "cooked" do
-    it "includes membership requests" do
-      user = Fabricate(:user)
-      member = Fabricate(:user)
-      owner = Fabricate(:user)
-
-      group = Fabricate(:group)
-      group.add(member)
-      group.add_owner(owner)
-
-      post = Fabricate(:post, custom_fields: { requested_group_id: group.id })
-
-      json = BasicPostSerializer.new(post, scope: Guardian.new(user), root: false).as_json
-      expect(json[:cooked]).not_to include(I18n.t('groups.request_membership_pm.handle'))
-
-      json = BasicPostSerializer.new(post, scope: Guardian.new(member), root: false).as_json
-      expect(json[:cooked]).not_to include(I18n.t('groups.request_membership_pm.handle'))
-
-      json = BasicPostSerializer.new(post, scope: Guardian.new(owner), root: false).as_json
-      expect(json[:cooked]).to include(I18n.t('groups.request_membership_pm.handle'))
-    end
-  end
-
 end
diff --git a/test/javascripts/widgets/post-test.js.es6 b/test/javascripts/widgets/post-test.js.es6
index 23a7b17bdf..7c19c715e6 100644
--- a/test/javascripts/widgets/post-test.js.es6
+++ b/test/javascripts/widgets/post-test.js.es6
@@ -922,3 +922,18 @@ widgetTest("post notice - with name", {
     );
   }
 });
+
+widgetTest("show group request in post", {
+  template: '{{mount-widget widget="post" args=args}}',
+  beforeEach() {
+    this.set("args", {
+      username: "foo",
+      requestedGroupName: "testGroup"
+    });
+  },
+  test(assert) {
+    const link = find(".group-request a");
+    assert.equal(link.text().trim(), I18n.t("groups.requests.handle"));
+    assert.equal(link.attr("href"), "/g/testGroup/requests?filter=foo");
+  }
+});

From 61c1af0124a086d034ad7d5f8d92557a445e107a Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nenciu.bianca@gmail.com>
Date: Mon, 9 Mar 2020 22:04:05 +0200
Subject: [PATCH 0330/1830] SECURITY: Ensure user can see group and group
 members

---
 app/controllers/directory_items_controller.rb    |  7 ++++++-
 spec/requests/directory_items_controller_spec.rb | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/controllers/directory_items_controller.rb b/app/controllers/directory_items_controller.rb
index e6d6ea4b3c..5cf99b710c 100644
--- a/app/controllers/directory_items_controller.rb
+++ b/app/controllers/directory_items_controller.rb
@@ -12,7 +12,12 @@ class DirectoryItemsController < ApplicationController
     result = DirectoryItem.where(period_type: period_type).includes(:user)
 
     if params[:group]
-      result = result.includes(user: :groups).where(users: { groups: { name: params[:group] } })
+      group = Group.find_by(name: params[:group])
+      raise Discourse::InvalidParameters.new(:group) if group.blank?
+      guardian.ensure_can_see!(group)
+      guardian.ensure_can_see_group_members!(group)
+
+      result = result.includes(user: :groups).where(users: { groups: { id: group.id } })
     else
       result = result.includes(user: :primary_group)
     end
diff --git a/spec/requests/directory_items_controller_spec.rb b/spec/requests/directory_items_controller_spec.rb
index 41f42b9c45..6d1e777e68 100644
--- a/spec/requests/directory_items_controller_spec.rb
+++ b/spec/requests/directory_items_controller_spec.rb
@@ -103,5 +103,20 @@ describe DirectoryItemsController do
       expect(json['directory_items'][0]['user']['username']).to eq(evil_trout.username) | eq(stage_user.username)
       expect(json['directory_items'][1]['user']['username']).to eq(evil_trout.username) | eq(stage_user.username)
     end
+
+    it "checks group permissions" do
+      group.update!(visibility_level: Group.visibility_levels[:members])
+
+      sign_in(evil_trout)
+      get '/directory_items.json', params: { period: 'all', group: group.name }
+      expect(response.status).to eq(200)
+
+      get '/directory_items.json', params: { period: 'all', group: 'not a group' }
+      expect(response.status).to eq(400)
+
+      sign_in(user)
+      get '/directory_items.json', params: { period: 'all', group: group.name }
+      expect(response.status).to eq(403)
+    end
   end
 end

From 58ced428ee84190fc9df2e0ec81ff2d9dd43242d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 24 Mar 2020 15:16:42 +0100
Subject: [PATCH 0331/1830] FIX: race conditions in search menu (#9262)

Race conditions could lead the previous query search term to be used in the next query. This commit also attempts to simplify code.
---
 .../discourse/widgets/search-menu-controls.js |  3 ++-
 .../discourse/widgets/search-menu.js          | 24 ++++---------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/search-menu-controls.js b/app/assets/javascripts/discourse/widgets/search-menu-controls.js
index 93312553bd..7884b1ac77 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-controls.js
+++ b/app/assets/javascripts/discourse/widgets/search-menu-controls.js
@@ -35,7 +35,8 @@ createWidget("search-term", {
     }
 
     const val = this.attrs.value;
-    const newVal = $(`#${this.buildId()}`).val();
+    // remove zero-width chars
+    const newVal = e.target.value.replace(/[\u200B-\u200D\uFEFF]/, "");
 
     if (newVal !== val) {
       this.sendWidgetAction("searchTermChanged", newVal);
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js b/app/assets/javascripts/discourse/widgets/search-menu.js
index 690dc80bff..7bc56bfdbb 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js
@@ -1,5 +1,5 @@
 import { get } from "@ember/object";
-import { debounce, later } from "@ember/runloop";
+import { debounce, cancel } from "@ember/runloop";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { searchForTerm, isValidSearchTerm } from "discourse/lib/search";
 import { createWidget } from "discourse/widgets/widget";
@@ -23,28 +23,17 @@ initSearchData();
 // Helps with debouncing and cancelling promises
 const SearchHelper = {
   _activeSearch: null,
-  _cancelSearch: null,
 
   // for cancelling debounced search
   cancel() {
     if (this._activeSearch) {
-      this._activeSearch.abort();
+      cancel(this._activeSearch);
+      this._activeSearch = null;
     }
-
-    this._cancelSearch = true;
-    later(() => (this._cancelSearch = false), 400);
   },
 
   perform(widget) {
-    if (this._cancelSearch) {
-      this._cancelSearch = null;
-      return;
-    }
-
-    if (this._activeSearch) {
-      this._activeSearch.abort();
-      this._activeSearch = null;
-    }
+    this.cancel();
 
     const { term, typeFilter, contextEnabled } = searchData;
     const searchContext = contextEnabled ? widget.searchContext() : null;
@@ -67,11 +56,6 @@ const SearchHelper = {
       this._activeSearch
         .then(content => {
           searchData.noResults = content.resultTypes.length === 0;
-
-          if (content.grouped_search_result) {
-            searchData.term = content.grouped_search_result.term;
-          }
-
           searchData.results = content;
 
           if (searchContext && searchContext.type === "topic") {

From c9390018760d5ce6e222382c460be68f74220e65 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 24 Mar 2020 15:52:14 +0000
Subject: [PATCH 0332/1830] DEV: Bump theme compiler version for CSP change

We need to regenerate cached themes, so that the JS paths are updated to include the subfolder prefix

Followup to 8e98f39d9ff865be2f54ef77700eb2ae749d11d7
---
 app/models/theme_field.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index ef98ea0390..085a0e649e 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -60,7 +60,7 @@ class ThemeField < ActiveRecord::Base
   validates :name, format: { with: /\A[a-z_][a-z0-9_-]*\z/i },
                    if: Proc.new { |field| ThemeField.theme_var_type_ids.include?(field.type_id) }
 
-  BASE_COMPILER_VERSION = 14
+  BASE_COMPILER_VERSION = 15
   DEPENDENT_CONSTANTS = [
     BASE_COMPILER_VERSION,
     Ember::VERSION,

From 5b2b769eb7ed54d2c4d094f1a970067c5db776b6 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 24 Mar 2020 17:07:59 +0100
Subject: [PATCH 0333/1830] DEV: Ensure uploads aren't deleted during imports

Sidekiq might delete uploads if you, for some reason, create upload records before using them in posts.
---
 script/import_scripts/base.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 2d52759822..4e7ca2af27 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -83,7 +83,9 @@ class ImportScripts::Base
       max_image_size_kb: 102400,
       authorized_extensions: '*',
       clean_up_inactive_users_after_days: 0,
-      clean_up_unused_staged_users_after_days: 0
+      clean_up_unused_staged_users_after_days: 0,
+      clean_up_uploads: false,
+      clean_orphan_uploads_grace_period_hours: 1800
     }
   end
 

From 9659da1044b3bae897bff4d8f686e5cb37e2824f Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Tue, 24 Mar 2020 12:40:11 -0500
Subject: [PATCH 0334/1830] UI: Update margin select kit category name

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

diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index 3881ee7b70..37fb23b821 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -29,6 +29,7 @@
     .category-name {
       text-overflow: ellipsis;
       overflow: hidden;
+      margin-left: 5px;
     }
     .d-icon {
       margin-right: 3px;

From 4d190c93b6c993ddefce9fbb8b344c19507b96af Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 24 Mar 2020 16:10:51 -0400
Subject: [PATCH 0335/1830] Migrate ember-addons from ES6 -> JS

---
 .../{decorator-alias.js.es6 => decorator-alias.js}             | 0
 app/assets/javascripts/ember-addons/{fmt.js.es6 => fmt.js}     | 0
 .../ember-addons/{macro-alias.js.es6 => macro-alias.js}        | 0
 .../utils/{extract-value.js.es6 => extract-value.js}           | 0
 .../utils/{handle-descriptor.js.es6 => handle-descriptor.js}   | 0
 .../utils/{is-descriptor.js.es6 => is-descriptor.js}           | 0
 lib/discourse_js_processor.rb                                  | 3 ++-
 7 files changed, 2 insertions(+), 1 deletion(-)
 rename app/assets/javascripts/ember-addons/{decorator-alias.js.es6 => decorator-alias.js} (100%)
 rename app/assets/javascripts/ember-addons/{fmt.js.es6 => fmt.js} (100%)
 rename app/assets/javascripts/ember-addons/{macro-alias.js.es6 => macro-alias.js} (100%)
 rename app/assets/javascripts/ember-addons/utils/{extract-value.js.es6 => extract-value.js} (100%)
 rename app/assets/javascripts/ember-addons/utils/{handle-descriptor.js.es6 => handle-descriptor.js} (100%)
 rename app/assets/javascripts/ember-addons/utils/{is-descriptor.js.es6 => is-descriptor.js} (100%)

diff --git a/app/assets/javascripts/ember-addons/decorator-alias.js.es6 b/app/assets/javascripts/ember-addons/decorator-alias.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/decorator-alias.js.es6
rename to app/assets/javascripts/ember-addons/decorator-alias.js
diff --git a/app/assets/javascripts/ember-addons/fmt.js.es6 b/app/assets/javascripts/ember-addons/fmt.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/fmt.js.es6
rename to app/assets/javascripts/ember-addons/fmt.js
diff --git a/app/assets/javascripts/ember-addons/macro-alias.js.es6 b/app/assets/javascripts/ember-addons/macro-alias.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/macro-alias.js.es6
rename to app/assets/javascripts/ember-addons/macro-alias.js
diff --git a/app/assets/javascripts/ember-addons/utils/extract-value.js.es6 b/app/assets/javascripts/ember-addons/utils/extract-value.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/utils/extract-value.js.es6
rename to app/assets/javascripts/ember-addons/utils/extract-value.js
diff --git a/app/assets/javascripts/ember-addons/utils/handle-descriptor.js.es6 b/app/assets/javascripts/ember-addons/utils/handle-descriptor.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/utils/handle-descriptor.js.es6
rename to app/assets/javascripts/ember-addons/utils/handle-descriptor.js
diff --git a/app/assets/javascripts/ember-addons/utils/is-descriptor.js.es6 b/app/assets/javascripts/ember-addons/utils/is-descriptor.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/utils/is-descriptor.js.es6
rename to app/assets/javascripts/ember-addons/utils/is-descriptor.js
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index d2d671e0ac..5d41d23bb7 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -41,7 +41,8 @@ class DiscourseJsProcessor
       relative_path.start_with?("app/assets/javascripts/pretty-text/") ||
       relative_path.start_with?("app/assets/javascripts/select-kit/") ||
       relative_path.start_with?("app/assets/javascripts/wizard/") ||
-      relative_path.start_with?("app/assets/javascripts/discourse-common/")
+      relative_path.start_with?("app/assets/javascripts/discourse-common/") ||
+      relative_path.start_with?("app/assets/javascripts/ember-addons/")
   end
 
   def self.skip_module?(data)

From ac34c7740ad1b44af9c255f428e79eee360527ea Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 24 Mar 2020 16:11:33 -0400
Subject: [PATCH 0336/1830] Ignore more commits

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 3e7bf97bb8..0a9d3812b4 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -25,3 +25,6 @@ acc5cbdf8ecb9293a0fa9474ee73baf499c02428
 
 # Rename discourse-common es6 -> js
 167503ca4824e37a2e93d74b3f50271556d0ba8e
+
+# Rename ember-addons es6 -> js
+16ba50bce362c1eefe1881f86c67bec66f493abb

From 0fd0a04019fff3c1a80126913be92ca290682793 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 24 Mar 2020 16:13:30 -0400
Subject: [PATCH 0337/1830] This should be js

---
 app/assets/javascripts/admin/routes/admin-api-keys-new.es6 | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 app/assets/javascripts/admin/routes/admin-api-keys-new.es6

diff --git a/app/assets/javascripts/admin/routes/admin-api-keys-new.es6 b/app/assets/javascripts/admin/routes/admin-api-keys-new.es6
deleted file mode 100644
index 3969615c9f..0000000000
--- a/app/assets/javascripts/admin/routes/admin-api-keys-new.es6
+++ /dev/null
@@ -1,7 +0,0 @@
-import Route from "@ember/routing/route";
-
-export default Route.extend({
-  model() {
-    return this.store.createRecord("api-key");
-  }
-});

From 4876884fd1ed42fde6de7e834296ee478c88f99b Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 24 Mar 2020 16:18:56 -0400
Subject: [PATCH 0338/1830] More JS files

---
 app/assets/javascripts/admin/routes/admin-api-keys-new.js  | 7 +++++++
 .../{onpopstate-handler.js.es6 => onpopstate-handler.js}   | 0
 .../javascripts/{wizard-start.js.es6 => wizard-start.js}   | 0
 3 files changed, 7 insertions(+)
 create mode 100644 app/assets/javascripts/admin/routes/admin-api-keys-new.js
 rename app/assets/javascripts/{onpopstate-handler.js.es6 => onpopstate-handler.js} (100%)
 rename app/assets/javascripts/{wizard-start.js.es6 => wizard-start.js} (100%)

diff --git a/app/assets/javascripts/admin/routes/admin-api-keys-new.js b/app/assets/javascripts/admin/routes/admin-api-keys-new.js
new file mode 100644
index 0000000000..3969615c9f
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-api-keys-new.js
@@ -0,0 +1,7 @@
+import Route from "@ember/routing/route";
+
+export default Route.extend({
+  model() {
+    return this.store.createRecord("api-key");
+  }
+});
diff --git a/app/assets/javascripts/onpopstate-handler.js.es6 b/app/assets/javascripts/onpopstate-handler.js
similarity index 100%
rename from app/assets/javascripts/onpopstate-handler.js.es6
rename to app/assets/javascripts/onpopstate-handler.js
diff --git a/app/assets/javascripts/wizard-start.js.es6 b/app/assets/javascripts/wizard-start.js
similarity index 100%
rename from app/assets/javascripts/wizard-start.js.es6
rename to app/assets/javascripts/wizard-start.js

From a11938d58d4b1bea1ff43306450da7b24f05db0a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 24 Mar 2020 16:32:56 -0400
Subject: [PATCH 0339/1830] Rename more es6 files to js

---
 .../javascripts/{discourse.js.es6 => discourse.js}     |  0
 ...ication-data.js.es6 => preload-application-data.js} | 10 +++++-----
 .../{preload-store.js.es6 => preload-store.js}         |  0
 app/assets/javascripts/wizard-start.js                 |  2 +-
 lib/discourse_js_processor.rb                          |  7 ++++++-
 5 files changed, 12 insertions(+), 7 deletions(-)
 rename app/assets/javascripts/{discourse.js.es6 => discourse.js} (100%)
 rename app/assets/javascripts/{preload-application-data.js.es6 => preload-application-data.js} (87%)
 rename app/assets/javascripts/{preload-store.js.es6 => preload-store.js} (100%)

diff --git a/app/assets/javascripts/discourse.js.es6 b/app/assets/javascripts/discourse.js
similarity index 100%
rename from app/assets/javascripts/discourse.js.es6
rename to app/assets/javascripts/discourse.js
diff --git a/app/assets/javascripts/preload-application-data.js.es6 b/app/assets/javascripts/preload-application-data.js
similarity index 87%
rename from app/assets/javascripts/preload-application-data.js.es6
rename to app/assets/javascripts/preload-application-data.js
index 6c3852f5ca..c72d4a66d1 100644
--- a/app/assets/javascripts/preload-application-data.js.es6
+++ b/app/assets/javascripts/preload-application-data.js
@@ -1,11 +1,11 @@
 // discourse-skip-module
 (function() {
-  var ps = require("preload-store").default;
-  var preloadedDataElement = document.getElementById("data-preloaded");
-  var setupData = document.getElementById("data-discourse-setup").dataset;
+  const ps = require("preload-store").default;
+  const preloadedDataElement = document.getElementById("data-preloaded");
+  const setupData = document.getElementById("data-discourse-setup").dataset;
 
   if (preloadedDataElement) {
-    var preloaded = JSON.parse(preloadedDataElement.dataset.preloaded);
+    const preloaded = JSON.parse(preloadedDataElement.dataset.preloaded);
 
     Object.keys(preloaded).forEach(function(key) {
       ps.store(key, JSON.parse(preloaded[key]));
@@ -34,7 +34,7 @@
   Discourse.start();
   Discourse.set("assetVersion", setupData.assetVersion);
 
-  let Session = require("discourse/models/session").default;
+  const Session = require("discourse/models/session").default;
   Session.currentProp(
     "disableCustomCSS",
     setupData.disableCustomCss === "true"
diff --git a/app/assets/javascripts/preload-store.js.es6 b/app/assets/javascripts/preload-store.js
similarity index 100%
rename from app/assets/javascripts/preload-store.js.es6
rename to app/assets/javascripts/preload-store.js
diff --git a/app/assets/javascripts/wizard-start.js b/app/assets/javascripts/wizard-start.js
index 79c022f6fc..4fee8d2fed 100644
--- a/app/assets/javascripts/wizard-start.js
+++ b/app/assets/javascripts/wizard-start.js
@@ -1,5 +1,5 @@
 // discourse-skip-module
 (function() {
-  var wizard = require("wizard/wizard").default.create();
+  const wizard = require("wizard/wizard").default.create();
   wizard.start();
 })();
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 5d41d23bb7..3e101328cf 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -42,7 +42,12 @@ class DiscourseJsProcessor
       relative_path.start_with?("app/assets/javascripts/select-kit/") ||
       relative_path.start_with?("app/assets/javascripts/wizard/") ||
       relative_path.start_with?("app/assets/javascripts/discourse-common/") ||
-      relative_path.start_with?("app/assets/javascripts/ember-addons/")
+      relative_path.start_with?("app/assets/javascripts/ember-addons/") ||
+      relative_path == "app/assets/javascripts/preload-store.js" ||
+      relative_path == "app/assets/javascripts/preload-application-data.js" ||
+      relative_path == "app/assets/javascripts/wizard-start.js" ||
+      relative_path == "app/assets/javascripts/onpopstate-handler.js" ||
+      relative_path == "app/assets/javascripts/discourse.js"
   end
 
   def self.skip_module?(data)

From 772583b9c3da194db1711e4bab418349aa49238a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 24 Mar 2020 16:33:43 -0400
Subject: [PATCH 0340/1830] Ignore more

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 0a9d3812b4..5e86efd0f0 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -28,3 +28,6 @@ acc5cbdf8ecb9293a0fa9474ee73baf499c02428
 
 # Rename ember-addons es6 -> js
 16ba50bce362c1eefe1881f86c67bec66f493abb
+
+# Rename some root files
+11938d58d4b1bea1ff43306450da7b24f05db0a

From 2501c0cd0f530450bb7d720711178a0bbd53b1e1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 24 Mar 2020 22:17:26 +0100
Subject: [PATCH 0341/1830] FIX: user-selector was not excluding currentUser
 (#9266)

concat doesn't mutate the variable so it has to be assigned.
---
 app/assets/javascripts/discourse/components/user-selector.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/user-selector.js b/app/assets/javascripts/discourse/components/user-selector.js
index 3d796d03d6..d362c60e62 100644
--- a/app/assets/javascripts/discourse/components/user-selector.js
+++ b/app/assets/javascripts/discourse/components/user-selector.js
@@ -72,7 +72,7 @@ export default TextField.extend({
       let usernames = single ? [] : selected;
 
       if (currentUser && excludeCurrentUser) {
-        usernames.concat([currentUser.username]);
+        usernames = usernames.concat([currentUser.username]);
       }
 
       return usernames.concat(this.excludedUsernames || []);

From 7282435e17836997b8e084eff7122d246dce62a2 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Tue, 24 Mar 2020 14:57:44 -0700
Subject: [PATCH 0342/1830] FEATURE: Unassign the review queue topic when a
 flag is handled

---
 app/models/reviewable_flagged_post.rb       | 23 +++++++++++++++++++++
 spec/models/reviewable_flagged_post_spec.rb | 14 +++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/app/models/reviewable_flagged_post.rb b/app/models/reviewable_flagged_post.rb
index 340d63c8b5..1dc89856b2 100644
--- a/app/models/reviewable_flagged_post.rb
+++ b/app/models/reviewable_flagged_post.rb
@@ -120,6 +120,7 @@ class ReviewableFlaggedPost < Reviewable
     end
 
     if actions.first.present?
+      unassign_topic performed_by, post
       DiscourseEvent.trigger(:flag_reviewed, post)
       DiscourseEvent.trigger(:flag_deferred, actions.first)
     end
@@ -190,6 +191,7 @@ class ReviewableFlaggedPost < Reviewable
     Post.with_deleted.where(id: target_id).update_all(cached)
 
     if actions.first.present?
+      unassign_topic performed_by, post
       DiscourseEvent.trigger(:flag_reviewed, post)
       DiscourseEvent.trigger(:flag_disagreed, actions.first)
     end
@@ -256,6 +258,7 @@ protected
     DiscourseEvent.trigger(:confirmed_spam_post, post) if trigger_spam
 
     if actions.first.present?
+      unassign_topic performed_by, post
       DiscourseEvent.trigger(:flag_reviewed, post)
       DiscourseEvent.trigger(:flag_agreed, actions.first)
       yield(actions.first) if block_given?
@@ -279,6 +282,26 @@ protected
     end
   end
 
+  def unassign_topic(performed_by, post)
+    topic = post.topic
+    return unless topic && performed_by && SiteSetting.reviewable_claiming != 'disabled'
+    ReviewableClaimedTopic.where(topic_id: topic.id).delete_all
+    topic.reviewables.find_each do |reviewable|
+      reviewable.log_history(:unclaimed, performed_by)
+    end
+
+    user_ids = User.staff.pluck(:id)
+
+    if SiteSetting.enable_category_group_review? && group_id = topic.category&.reviewable_by_group_id.presence
+      user_ids.concat(GroupUser.where(group_id: group_id).pluck(:user_id))
+      user_ids.uniq!
+    end
+
+    data = { topic_id: topic.id }
+
+    MessageBus.publish("/reviewable_claimed", data, user_ids: user_ids)
+  end
+
 private
 
   def destroyer(performed_by, post)
diff --git a/spec/models/reviewable_flagged_post_spec.rb b/spec/models/reviewable_flagged_post_spec.rb
index f656e5763b..07124680d8 100644
--- a/spec/models/reviewable_flagged_post_spec.rb
+++ b/spec/models/reviewable_flagged_post_spec.rb
@@ -93,6 +93,20 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
       expect(post).not_to be_hidden
     end
 
+    describe "with reviewable claiming enabled" do
+      fab!(:claimed) { Fabricate(:reviewable_claimed_topic, topic: post.topic, user: moderator) }
+      it "clears the claimed topic on resolve" do
+        SiteSetting.reviewable_claiming = 'required'
+        reviewable.perform(moderator, :agree_and_keep)
+        expect(reviewable).to be_approved
+        expect(score.reload).to be_agreed
+        expect(post).not_to be_hidden
+        expect(ReviewableClaimedTopic.where(topic_id: post.topic.id).exists?).to eq(false)
+        expect(post.topic.reviewables.first.history.where(reviewable_history_type: ReviewableHistory.types[:unclaimed]).size).to eq(1)
+      end
+
+    end
+
     it "agree_and_suspend agrees with the flags and keeps the post" do
       reviewable.perform(moderator, :agree_and_suspend)
       expect(reviewable).to be_approved

From 35e153d84f77351143742149a3fad1e8de9b2b6b Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 25 Mar 2020 15:38:25 +1100
Subject: [PATCH 0343/1830] DEV: update unicorn

This is a minor update to unicorn, in this update unicorn handles
chunked encoding a bit more correctly according to RFC

Should have no impact, but message bus will be validated in production
to confirm chunked encoding still works as expected
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 925a89aa68..471bb0f956 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -405,7 +405,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.6)
     unicode-display_width (1.6.1)
-    unicorn (5.5.3)
+    unicorn (5.5.4)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.13.0)

From 70012f20278430362649a26a28d3cb4b39449b64 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 25 Mar 2020 06:45:35 +0200
Subject: [PATCH 0344/1830] FEATURE: Navigate through search results using J/K
 (#9264)

---
 app/assets/javascripts/discourse/lib/keyboard-shortcuts.js  | 6 +++++-
 app/assets/stylesheets/common/base/search.scss              | 2 ++
 .../stylesheets/common/components/keyboard_shortcuts.scss   | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index 5da8be5bc9..064c2eeb58 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -53,7 +53,8 @@ export let bindings = {
       ".topic-list tr.selected a.title",
       ".latest-topic-list .latest-topic-list-item.selected div.main-link a.title",
       ".top-topic-list .latest-topic-list-item.selected div.main-link a.title",
-      ".latest .featured-topic.selected a.title"
+      ".latest .featured-topic.selected a.title",
+      ".search-results .search-link"
     ].join(", "),
     anonymous: true
   }, // open selected topic on latest or categories page
@@ -589,6 +590,7 @@ export default {
     const $topicList = $(".topic-list");
     const $postsWrapper = $(".posts-wrapper");
     const $categoriesTopicsList = this.categoriesTopicsList();
+    const $searchResults = $(".search-results");
 
     if ($postsWrapper.length > 0) {
       return $(".posts-wrapper .topic-post, .topic-list tbody tr");
@@ -596,6 +598,8 @@ export default {
       return $topicList.find(".topic-list-item");
     } else if ($categoriesTopicsList.length > 0) {
       return $categoriesTopicsList;
+    } else if ($searchResults.length > 0) {
+      return $searchResults.find(".fps-result");
     }
   },
 
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index 9561a6b47d..e62f24f292 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -192,6 +192,8 @@
 
 .fps-result {
   display: flex;
+  padding: 0 0.5em;
+
   .author {
     display: inline-block;
     vertical-align: top;
diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
index c40eaefee9..e74397664b 100644
--- a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
+++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
@@ -5,7 +5,8 @@
 
 .topic-list tr.selected td:first-child,
 .topic-list-item.selected td:first-child,
-.latest-topic-list-item.selected {
+.latest-topic-list-item.selected,
+.search-results .fps-result.selected {
   box-shadow: inset 3px 0 0 $danger; // needs to be inset for Edge
 }
 

From cff9d4726c1aa51f3113b3e1bf927134877ba04a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 25 Mar 2020 10:00:48 +0100
Subject: [PATCH 0345/1830] FIX: ensures search-menu is not briefly showing
 previous results (#9272)

---
 .../discourse/widgets/search-menu.js          | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js b/app/assets/javascripts/discourse/widgets/search-menu.js
index 7bc56bfdbb..cec34e75a9 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js
@@ -1,5 +1,5 @@
 import { get } from "@ember/object";
-import { debounce, cancel } from "@ember/runloop";
+import { debounce } from "@ember/runloop";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { searchForTerm, isValidSearchTerm } from "discourse/lib/search";
 import { createWidget } from "discourse/widgets/widget";
@@ -27,7 +27,7 @@ const SearchHelper = {
   // for cancelling debounced search
   cancel() {
     if (this._activeSearch) {
-      cancel(this._activeSearch);
+      this._activeSearch.abort();
       this._activeSearch = null;
     }
   },
@@ -55,21 +55,24 @@ const SearchHelper = {
       });
       this._activeSearch
         .then(content => {
-          searchData.noResults = content.resultTypes.length === 0;
-          searchData.results = content;
+          // we ensure the current search term is the one used
+          // when starting the query
+          if (term === searchData.term) {
+            searchData.noResults = content.resultTypes.length === 0;
+            searchData.results = content;
 
-          if (searchContext && searchContext.type === "topic") {
-            widget.appEvents.trigger("post-stream:refresh", { force: true });
-            searchData.topicId = searchContext.id;
-          } else {
-            searchData.topicId = null;
+            if (searchContext && searchContext.type === "topic") {
+              widget.appEvents.trigger("post-stream:refresh", { force: true });
+              searchData.topicId = searchContext.id;
+            } else {
+              searchData.topicId = null;
+            }
           }
         })
         .catch(popupAjaxError)
         .finally(() => {
           searchData.loading = false;
           widget.scheduleRerender();
-          this._activeSearch = null;
         });
     }
   }

From 49395ec5772c86f8929ed9bcb5c1e589c3a7af31 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 25 Mar 2020 12:59:16 +0200
Subject: [PATCH 0346/1830] FIX: Fix image optimization pipeline (#9257)

* FIX: Do not use original filename to extract the original filename

Prefer extracting filename from the destination path, which is build
using extracted image information.

* UX: Show better error images
---
 config/locales/server.en.yml | 1 +
 lib/upload_creator.rb        | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 6d1c849522..986905fba1 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3734,6 +3734,7 @@ en:
     file_missing: "Sorry, you must provide a file to upload."
     empty: "Sorry, but the file you provided is empty."
     png_to_jpg_conversion_failure_message: "An error happened when converting from PNG to JPG."
+    optimize_failure_message: "An error occured while optimizing the uploaded image."
     attachments:
       too_large: "Sorry, the file you are trying to upload is too big (maximum size is %{max_size_kb}KB)."
     images:
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index 9c66754861..d9c21f1920 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -252,7 +252,6 @@ class UploadCreator
         from,
         to,
         "50%",
-        filename: @filename,
         allow_animation: allow_animation,
         raise_on_error: true
       )
@@ -264,6 +263,8 @@ class UploadCreator
 
       return if filesize >= original_size || pixels == 0 || !should_downsize?
     end
+  rescue
+    @upload.errors.add(:base, I18n.t("upload.optimize_failure_message"))
   end
 
   def is_still_too_big?

From 572bb5988f4a46bc5f66f7e9d4a09b7241c532fb Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 25 Mar 2020 18:39:19 +0530
Subject: [PATCH 0347/1830] FIX: word boundary regex (\b) not working in
 Unicode languages. (#9163)

---
 .../admin/components/site-text-summary.js     |  13 ++-
 .../admin/templates/search-logs-term.hbs      |   6 +-
 ...{highlight-text.js => highlight-search.js} |   4 +-
 .../discourse/lib/highlight-html.js           |  93 +++++++++++++++
 ...{highlight-text.js => highlight-search.js} |   7 +-
 .../discourse/templates/full-page-search.hbs  |   6 +-
 .../discourse/widgets/post-cooked.js          |  18 +--
 .../discourse/widgets/search-menu-results.js  |   4 +-
 app/assets/javascripts/vendor.js              |   1 -
 .../javascripts/acceptance/search-test.js.es6 |   2 +-
 .../lib/highlight-search-test.js.es6          |  48 ++++++++
 .../lib/highlight-text-test.js.es6            |  26 -----
 vendor/assets/javascripts/highlight.js        | 108 ------------------
 13 files changed, 175 insertions(+), 161 deletions(-)
 rename app/assets/javascripts/discourse/components/{highlight-text.js => highlight-search.js} (68%)
 create mode 100644 app/assets/javascripts/discourse/lib/highlight-html.js
 rename app/assets/javascripts/discourse/lib/{highlight-text.js => highlight-search.js} (71%)
 create mode 100644 test/javascripts/lib/highlight-search-test.js.es6
 delete mode 100644 test/javascripts/lib/highlight-text-test.js.es6
 delete mode 100644 vendor/assets/javascripts/highlight.js

diff --git a/app/assets/javascripts/admin/components/site-text-summary.js b/app/assets/javascripts/admin/components/site-text-summary.js
index 11c6bc45eb..23ee2d8aa6 100644
--- a/app/assets/javascripts/admin/components/site-text-summary.js
+++ b/app/assets/javascripts/admin/components/site-text-summary.js
@@ -1,5 +1,6 @@
 import Component from "@ember/component";
 import { on } from "discourse-common/utils/decorators";
+import highlightHTML from "discourse/lib/highlight-html";
 
 export default Component.extend({
   classNames: ["site-text"],
@@ -10,11 +11,13 @@ export default Component.extend({
     const term = this._searchTerm();
 
     if (term) {
-      $(
-        this.element.querySelector(".site-text-id, .site-text-value")
-      ).highlight(term, {
-        className: "text-highlight"
-      });
+      highlightHTML(
+        this.element.querySelector(".site-text-id, .site-text-value"),
+        term,
+        {
+          className: "text-highlight"
+        }
+      );
     }
     $(this.element.querySelector(".site-text-value")).ellipsis();
   },
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 27f61f2940..ac55d129e0 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -31,7 +31,7 @@
       <div class='fps-topic'>
         <div class='topic'>
           <a class='search-link' href={{result.url}}>
-            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-search highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-search}}</span>
           </a>
 
           <div class='search-category'>
@@ -54,9 +54,9 @@
           </span>
 
           {{#if result.blurb}}
-            {{#highlight-text highlight=term}}
+            {{#highlight-search highlight=term}}
               {{html-safe result.blurb}}
-            {{/highlight-text}}
+            {{/highlight-search}}
           {{/if}}
         </div>
       </div>
diff --git a/app/assets/javascripts/discourse/components/highlight-text.js b/app/assets/javascripts/discourse/components/highlight-search.js
similarity index 68%
rename from app/assets/javascripts/discourse/components/highlight-text.js
rename to app/assets/javascripts/discourse/components/highlight-search.js
index a98ffdb653..322336699f 100644
--- a/app/assets/javascripts/discourse/components/highlight-text.js
+++ b/app/assets/javascripts/discourse/components/highlight-search.js
@@ -1,12 +1,12 @@
 import Component from "@ember/component";
-import highlightText from "discourse/lib/highlight-text";
+import highlightSearch from "discourse/lib/highlight-search";
 
 export default Component.extend({
   tagName: "span",
 
   _highlightOnInsert: function() {
     const term = this.highlight;
-    highlightText($(this.element), term);
+    highlightSearch($(this.element), term);
   }
     .observes("highlight")
     .on("didInsertElement")
diff --git a/app/assets/javascripts/discourse/lib/highlight-html.js b/app/assets/javascripts/discourse/lib/highlight-html.js
new file mode 100644
index 0000000000..94a1cd863c
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/highlight-html.js
@@ -0,0 +1,93 @@
+function highlight(node, pattern, nodeName, className) {
+  if (
+    ![Node.ELEMENT_NODE, Node.TEXT_NODE].includes(node.nodeType) ||
+    ["SCRIPT", "STYLE"].includes(node.tagName) ||
+    (node.tagName === nodeName && node.className === className)
+  ) {
+    return 0;
+  }
+
+  if (node.nodeType === Node.ELEMENT_NODE && node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) {
+      i += highlight(node.childNodes[i], pattern, nodeName, className);
+    }
+    return 0;
+  }
+
+  if (node.nodeType === Node.TEXT_NODE) {
+    const match = node.data.match(pattern);
+
+    if (!match) {
+      return 0;
+    }
+
+    const element = document.createElement(nodeName);
+    element.className = className;
+    element.innerText = match[0];
+    const matchNode = node.splitText(match.index);
+    matchNode.splitText(match[0].length);
+    matchNode.parentNode.replaceChild(element, matchNode);
+    return 1;
+  }
+
+  return 0;
+}
+
+export default function(node, words, opts = {}) {
+  let settings = {
+    nodeName: "span",
+    className: "highlighted",
+    wholeWord: false,
+    matchCase: false
+  };
+
+  Object.assign(settings, opts);
+  words = typeof words === "string" ? [words] : words;
+  words = words
+    .filter(Boolean)
+    .map(word => word.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&"));
+
+  if (!words.length) return node;
+
+  let pattern = `(${words.join("|")})`;
+  let flag;
+
+  if (settings.wholeWord) {
+    const hasUnicode = words.some(word => {
+      return !word.match(new RegExp(`\b${word}\b`));
+    });
+    pattern = hasUnicode
+      ? `(?<=[\\s,.:;"']|^)${pattern}(?=[\\s,.:;"']|$)`
+      : `\b${pattern}\b`;
+  }
+
+  if (settings.matchCase) {
+    flag = "i";
+  }
+
+  highlight(
+    node,
+    new RegExp(pattern, flag),
+    settings.nodeName.toUpperCase(),
+    settings.className
+  );
+
+  return node;
+}
+
+export function unhighlightHTML(opts = {}) {
+  let settings = {
+    nodeName: "span",
+    className: "highlighted"
+  };
+
+  Object.assign(settings, opts);
+
+  document
+    .querySelectorAll(`${settings.nodeName}.${settings.className}`)
+    .forEach(e => {
+      const parentNode = e.parentNode;
+      parentNode.replaceChild(e.firstChild, e);
+      parentNode.normalize();
+    });
+}
diff --git a/app/assets/javascripts/discourse/lib/highlight-text.js b/app/assets/javascripts/discourse/lib/highlight-search.js
similarity index 71%
rename from app/assets/javascripts/discourse/lib/highlight-text.js
rename to app/assets/javascripts/discourse/lib/highlight-search.js
index 6fa7a09faf..870e9c3693 100644
--- a/app/assets/javascripts/discourse/lib/highlight-text.js
+++ b/app/assets/javascripts/discourse/lib/highlight-search.js
@@ -1,4 +1,5 @@
 import { PHRASE_MATCH_REGEXP_PATTERN } from "discourse/lib/concerns/search-constants";
+import highlightHTML from "discourse/lib/highlight-html";
 
 export const CLASS_NAME = "search-highlight";
 
@@ -11,8 +12,10 @@ export default function($elem, term, opts = {}) {
     );
 
     words = words.map(w => w.replace(/^"(.*)"$/, "$1"));
-    const highlightOpts = { wordsOnly: true };
+    const highlightOpts = { wholeWord: true };
     if (!opts.defaultClassName) highlightOpts.className = CLASS_NAME;
-    $elem.highlight(words, highlightOpts);
+    for (let i = 0; i <= $elem.length; i++) {
+      highlightHTML($elem[0], words, highlightOpts);
+    }
   }
 }
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 9394f35486..2ed17fa1bd 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -88,7 +88,7 @@
 
                   <a class='search-link' href={{result.url}} {{action "logClick" result.topic_id}}>
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
-                    <span class='topic-title'>{{#highlight-text highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+                    <span class='topic-title'>{{#highlight-search highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-search}}</span>
                   </a>
 
                   <div class='search-category'>
@@ -112,9 +112,9 @@
                   </span>
 
                   {{#if result.blurb}}
-                    {{#highlight-text highlight=highlightQuery}}
+                    {{#highlight-search highlight=highlightQuery}}
                       {{html-safe result.blurb}}
-                    {{/highlight-text}}
+                    {{/highlight-search}}
                   {{/if}}
                 </div>
 
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js b/app/assets/javascripts/discourse/widgets/post-cooked.js
index 3d55314f08..c16820de44 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js
@@ -2,7 +2,11 @@ import { iconHTML } from "discourse-common/lib/icon-library";
 import { ajax } from "discourse/lib/ajax";
 import { isValidLink } from "discourse/lib/click-track";
 import { number } from "discourse/lib/formatter";
-import highlightText from "discourse/lib/highlight-text";
+import highlightSearch from "discourse/lib/highlight-search";
+import {
+  default as highlightHTML,
+  unhighlightHTML
+} from "discourse/lib/highlight-html";
 
 let _decorators = [];
 
@@ -52,13 +56,13 @@ export default class PostCooked {
 
     if (highlight && highlight.length > 2) {
       if (this._highlighted) {
-        $html.unhighlight();
+        unhighlightHTML($html[0]);
       }
 
-      highlightText($html, highlight, { defaultClassName: true });
+      highlightSearch($html, highlight, { defaultClassName: true });
       this._highlighted = true;
     } else if (this._highlighted) {
-      $html.unhighlight();
+      unhighlightHTML($html[0]);
       this._highlighted = false;
     }
   }
@@ -175,10 +179,8 @@ export default class PostCooked {
           div.html(result.cooked);
           _decorators.forEach(cb => cb(div, this.decoratorHelper));
 
-          div.highlight(originalText, {
-            caseSensitive: true,
-            element: "span",
-            className: "highlighted"
+          highlightHTML(div[0], originalText, {
+            matchCase: true
           });
           $blockQuote.showHtml(div, "fast", finished);
         })
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js b/app/assets/javascripts/discourse/widgets/search-menu-results.js
index 636c069f94..e85eefcd8e 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-results.js
+++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js
@@ -3,7 +3,7 @@ import { dateNode } from "discourse/helpers/node";
 import RawHtml from "discourse/widgets/raw-html";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
-import highlightText from "discourse/lib/highlight-text";
+import highlightSearch from "discourse/lib/highlight-search";
 import { escapeExpression, formatUsername } from "discourse/lib/utilities";
 import { iconNode } from "discourse-common/lib/icon-library";
 import renderTag from "discourse/lib/render-tag";
@@ -15,7 +15,7 @@ class Highlighted extends RawHtml {
   }
 
   decorate($html) {
-    highlightText($html, this.term);
+    highlightSearch($html, this.term);
   }
 }
 
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index 3b36c27ea1..39626bfd19 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -29,5 +29,4 @@
 //= require jquery.autoellipsis-1.0.10
 //= require virtual-dom
 //= require virtual-dom-amd
-//= require highlight.js
 //= require intersection-observer
diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js.es6
index 1b930c7905..c9567ad8b5 100644
--- a/test/javascripts/acceptance/search-test.js.es6
+++ b/test/javascripts/acceptance/search-test.js.es6
@@ -94,7 +94,7 @@ QUnit.test("Search with context", async assert => {
 
   const highlighted = [];
 
-  find("#post_7 span.highlight-strong").map((_, span) => {
+  find("#post_7 span.highlighted").map((_, span) => {
     highlighted.push(span.innerText);
   });
 
diff --git a/test/javascripts/lib/highlight-search-test.js.es6 b/test/javascripts/lib/highlight-search-test.js.es6
new file mode 100644
index 0000000000..2a2524f765
--- /dev/null
+++ b/test/javascripts/lib/highlight-search-test.js.es6
@@ -0,0 +1,48 @@
+import highlightSearch, { CLASS_NAME } from "discourse/lib/highlight-search";
+import { fixture } from "helpers/qunit-helpers";
+
+QUnit.module("lib:highlight-search");
+
+QUnit.test("highlighting text", assert => {
+  fixture().html(
+    `
+    <p>This is some text to highlight</p>
+    `
+  );
+
+  highlightSearch(fixture(), "some text");
+
+  const terms = [];
+
+  fixture(`.${CLASS_NAME}`).each((_, elem) => {
+    terms.push(elem.textContent);
+  });
+
+  assert.equal(
+    terms.join(" "),
+    "some text",
+    "it should highlight the terms correctly"
+  );
+});
+
+QUnit.test("highlighting unicode text", assert => {
+  fixture().html(
+    `
+    <p>This is some தமிழ் and русский text to highlight</p>
+    `
+  );
+
+  highlightSearch(fixture(), "தமிழ் русский");
+
+  const terms = [];
+
+  fixture(`.${CLASS_NAME}`).each((_, elem) => {
+    terms.push(elem.textContent);
+  });
+
+  assert.equal(
+    terms.join(" "),
+    "தமிழ் русский",
+    "it should highlight the terms correctly"
+  );
+});
diff --git a/test/javascripts/lib/highlight-text-test.js.es6 b/test/javascripts/lib/highlight-text-test.js.es6
deleted file mode 100644
index d222b8a753..0000000000
--- a/test/javascripts/lib/highlight-text-test.js.es6
+++ /dev/null
@@ -1,26 +0,0 @@
-import highlightText, { CLASS_NAME } from "discourse/lib/highlight-text";
-import { fixture } from "helpers/qunit-helpers";
-
-QUnit.module("lib:highlight-text");
-
-QUnit.test("highlighting text", assert => {
-  fixture().html(
-    `
-    <p>This is some text to highlight</p>
-    `
-  );
-
-  highlightText(fixture(), "some text");
-
-  const terms = [];
-
-  fixture(`.${CLASS_NAME}`).each((_, elem) => {
-    terms.push(elem.textContent);
-  });
-
-  assert.equal(
-    terms.join(" "),
-    "some text",
-    "it should highlight the terms correctly"
-  );
-});
diff --git a/vendor/assets/javascripts/highlight.js b/vendor/assets/javascripts/highlight.js
deleted file mode 100644
index c13dd7ff9f..0000000000
--- a/vendor/assets/javascripts/highlight.js
+++ /dev/null
@@ -1,108 +0,0 @@
-// forked cause we may want to amend the logic a bit
-/*
- * jQuery Highlight plugin
- *
- * Based on highlight v3 by Johann Burkard
- * http://johannburkard.de/blog/programming/javascript/highlight-javascript-text-higlighting-jquery-plugin.html
- *
- * Code a little bit refactored and cleaned (in my humble opinion).
- * Most important changes:
- *  - has an option to highlight only entire words (wordsOnly - false by default),
- *  - has an option to be case sensitive (caseSensitive - false by default)
- *  - highlight element tag and class names can be specified in options
- *
- * Usage:
- *   // wrap every occurrance of text 'lorem' in content
- *   // with <span class='highlight'> (default options)
- *   $('#content').highlight('lorem');
- *
- *   // search for and highlight more terms at once
- *   // so you can save some time on traversing DOM
- *   $('#content').highlight(['lorem', 'ipsum']);
- *   $('#content').highlight('lorem ipsum');
- *
- *   // search only for entire word 'lorem'
- *   $('#content').highlight('lorem', { wordsOnly: true });
- *
- *   // don't ignore case during search of term 'lorem'
- *   $('#content').highlight('lorem', { caseSensitive: true });
- *
- *   // wrap every occurrance of term 'ipsum' in content
- *   // with <em class='important'>
- *   $('#content').highlight('ipsum', { element: 'em', className: 'important' });
- *
- *   // remove default highlight
- *   $('#content').unhighlight();
- *
- *   // remove custom highlight
- *   $('#content').unhighlight({ element: 'em', className: 'important' });
- *
- *
- * Copyright (c) 2009 Bartek Szopka
- *
- * Licensed under MIT license.
- *
- */
-
-jQuery.extend({
-    highlight: function (node, re, nodeName, className) {
-        if (node.nodeType === 3) {
-            var match = node.data.match(re);
-            if (match) {
-                var highlight = document.createElement(nodeName || 'span');
-                highlight.className = className || 'highlight';
-                var wordNode = node.splitText(match.index);
-                wordNode.splitText(match[0].length);
-                var wordClone = wordNode.cloneNode(true);
-                highlight.appendChild(wordClone);
-                wordNode.parentNode.replaceChild(highlight, wordNode);
-                return 1; //skip added node in parent
-            }
-        } else if ((node.nodeType === 1 && node.childNodes) && // only element nodes that have children
-                !/(script|style)/i.test(node.tagName) && // ignore script and style nodes
-                !(node.tagName === nodeName.toUpperCase() && node.className === className)) { // skip if already highlighted
-            for (var i = 0; i < node.childNodes.length; i++) {
-                i += jQuery.highlight(node.childNodes[i], re, nodeName, className);
-            }
-        }
-        return 0;
-    }
-});
-
-jQuery.fn.unhighlight = function (options) {
-    var settings = { className: 'highlight-strong', element: 'span' };
-    jQuery.extend(settings, options);
-
-    return this.find(settings.element + "." + settings.className).each(function () {
-        var parent = this.parentNode;
-        parent.replaceChild(this.firstChild, this);
-        parent.normalize();
-    }).end();
-};
-
-jQuery.fn.highlight = function (words, options) {
-    var settings = { className: 'highlight-strong', element: 'span', caseSensitive: false, wordsOnly: false };
-    jQuery.extend(settings, options);
-
-    if (words.constructor === String) {
-        words = [words];
-    }
-    words = jQuery.grep(words, function(word){
-      return word !== '';
-    });
-    words = jQuery.map(words, function(word) {
-      return word.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
-    });
-    if (words.length === 0) { return this; }
-
-    var flag = settings.caseSensitive ? "" : "i";
-    var pattern = "(" + words.join("|") + ")";
-    if (settings.wordsOnly) {
-        pattern = "\\b" + pattern + "\\b";
-    }
-    var re = new RegExp(pattern, flag);
-
-    return this.each(function () {
-        jQuery.highlight(this, re, settings.element, settings.className);
-    });
-};

From 9521a88984e7e265133dc53779663e9d38b8ce4e Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <jordan@jordanvidrine.com>
Date: Wed, 25 Mar 2020 08:59:00 -0500
Subject: [PATCH 0348/1830] UI: Fix 'lock' icon spacing in category dropdown

---
 app/assets/stylesheets/common/components/badges.scss        | 1 -
 app/assets/stylesheets/common/select-kit/category-drop.scss | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index 37fb23b821..3881ee7b70 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -29,7 +29,6 @@
     .category-name {
       text-overflow: ellipsis;
       overflow: hidden;
-      margin-left: 5px;
     }
     .d-icon {
       margin-right: 3px;
diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss
index 88a970fa9c..2f84f85a3c 100644
--- a/app/assets/stylesheets/common/select-kit/category-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/category-drop.scss
@@ -12,6 +12,9 @@
 
           span.badge-category {
             margin: 0;
+            .d-icon-lock {
+              margin-right: 5px;
+            }
           }
         }
       }

From d62d258fe5948e609c9cd26bf43aef9d4960c14a Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 25 Mar 2020 14:34:45 +0000
Subject: [PATCH 0349/1830] Revert "FIX: word boundary regex (\b) not working
 in Unicode languages. (#9163)"

Lookbehind regex is not supported in Firefox or IE11

This reverts commit 572bb5988f4a46bc5f66f7e9d4a09b7241c532fb.
---
 .../admin/components/site-text-summary.js     |  13 +--
 .../admin/templates/search-logs-term.hbs      |   6 +-
 ...{highlight-search.js => highlight-text.js} |   4 +-
 .../discourse/lib/highlight-html.js           |  93 ---------------
 ...{highlight-search.js => highlight-text.js} |   7 +-
 .../discourse/templates/full-page-search.hbs  |   6 +-
 .../discourse/widgets/post-cooked.js          |  18 ++-
 .../discourse/widgets/search-menu-results.js  |   4 +-
 app/assets/javascripts/vendor.js              |   1 +
 .../20200323155812_add_post_thumbnails.rb     |  10 ++
 .../javascripts/acceptance/search-test.js.es6 |   2 +-
 .../lib/highlight-search-test.js.es6          |  48 --------
 .../lib/highlight-text-test.js.es6            |  26 +++++
 vendor/assets/javascripts/highlight.js        | 108 ++++++++++++++++++
 14 files changed, 171 insertions(+), 175 deletions(-)
 rename app/assets/javascripts/discourse/components/{highlight-search.js => highlight-text.js} (68%)
 delete mode 100644 app/assets/javascripts/discourse/lib/highlight-html.js
 rename app/assets/javascripts/discourse/lib/{highlight-search.js => highlight-text.js} (71%)
 create mode 100644 db/migrate/20200323155812_add_post_thumbnails.rb
 delete mode 100644 test/javascripts/lib/highlight-search-test.js.es6
 create mode 100644 test/javascripts/lib/highlight-text-test.js.es6
 create mode 100644 vendor/assets/javascripts/highlight.js

diff --git a/app/assets/javascripts/admin/components/site-text-summary.js b/app/assets/javascripts/admin/components/site-text-summary.js
index 23ee2d8aa6..11c6bc45eb 100644
--- a/app/assets/javascripts/admin/components/site-text-summary.js
+++ b/app/assets/javascripts/admin/components/site-text-summary.js
@@ -1,6 +1,5 @@
 import Component from "@ember/component";
 import { on } from "discourse-common/utils/decorators";
-import highlightHTML from "discourse/lib/highlight-html";
 
 export default Component.extend({
   classNames: ["site-text"],
@@ -11,13 +10,11 @@ export default Component.extend({
     const term = this._searchTerm();
 
     if (term) {
-      highlightHTML(
-        this.element.querySelector(".site-text-id, .site-text-value"),
-        term,
-        {
-          className: "text-highlight"
-        }
-      );
+      $(
+        this.element.querySelector(".site-text-id, .site-text-value")
+      ).highlight(term, {
+        className: "text-highlight"
+      });
     }
     $(this.element.querySelector(".site-text-value")).ellipsis();
   },
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index ac55d129e0..27f61f2940 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -31,7 +31,7 @@
       <div class='fps-topic'>
         <div class='topic'>
           <a class='search-link' href={{result.url}}>
-            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-search highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-search}}</span>
+            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
           </a>
 
           <div class='search-category'>
@@ -54,9 +54,9 @@
           </span>
 
           {{#if result.blurb}}
-            {{#highlight-search highlight=term}}
+            {{#highlight-text highlight=term}}
               {{html-safe result.blurb}}
-            {{/highlight-search}}
+            {{/highlight-text}}
           {{/if}}
         </div>
       </div>
diff --git a/app/assets/javascripts/discourse/components/highlight-search.js b/app/assets/javascripts/discourse/components/highlight-text.js
similarity index 68%
rename from app/assets/javascripts/discourse/components/highlight-search.js
rename to app/assets/javascripts/discourse/components/highlight-text.js
index 322336699f..a98ffdb653 100644
--- a/app/assets/javascripts/discourse/components/highlight-search.js
+++ b/app/assets/javascripts/discourse/components/highlight-text.js
@@ -1,12 +1,12 @@
 import Component from "@ember/component";
-import highlightSearch from "discourse/lib/highlight-search";
+import highlightText from "discourse/lib/highlight-text";
 
 export default Component.extend({
   tagName: "span",
 
   _highlightOnInsert: function() {
     const term = this.highlight;
-    highlightSearch($(this.element), term);
+    highlightText($(this.element), term);
   }
     .observes("highlight")
     .on("didInsertElement")
diff --git a/app/assets/javascripts/discourse/lib/highlight-html.js b/app/assets/javascripts/discourse/lib/highlight-html.js
deleted file mode 100644
index 94a1cd863c..0000000000
--- a/app/assets/javascripts/discourse/lib/highlight-html.js
+++ /dev/null
@@ -1,93 +0,0 @@
-function highlight(node, pattern, nodeName, className) {
-  if (
-    ![Node.ELEMENT_NODE, Node.TEXT_NODE].includes(node.nodeType) ||
-    ["SCRIPT", "STYLE"].includes(node.tagName) ||
-    (node.tagName === nodeName && node.className === className)
-  ) {
-    return 0;
-  }
-
-  if (node.nodeType === Node.ELEMENT_NODE && node.childNodes) {
-    for (let i = 0; i < node.childNodes.length; i++) {
-      i += highlight(node.childNodes[i], pattern, nodeName, className);
-    }
-    return 0;
-  }
-
-  if (node.nodeType === Node.TEXT_NODE) {
-    const match = node.data.match(pattern);
-
-    if (!match) {
-      return 0;
-    }
-
-    const element = document.createElement(nodeName);
-    element.className = className;
-    element.innerText = match[0];
-    const matchNode = node.splitText(match.index);
-    matchNode.splitText(match[0].length);
-    matchNode.parentNode.replaceChild(element, matchNode);
-    return 1;
-  }
-
-  return 0;
-}
-
-export default function(node, words, opts = {}) {
-  let settings = {
-    nodeName: "span",
-    className: "highlighted",
-    wholeWord: false,
-    matchCase: false
-  };
-
-  Object.assign(settings, opts);
-  words = typeof words === "string" ? [words] : words;
-  words = words
-    .filter(Boolean)
-    .map(word => word.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&"));
-
-  if (!words.length) return node;
-
-  let pattern = `(${words.join("|")})`;
-  let flag;
-
-  if (settings.wholeWord) {
-    const hasUnicode = words.some(word => {
-      return !word.match(new RegExp(`\b${word}\b`));
-    });
-    pattern = hasUnicode
-      ? `(?<=[\\s,.:;"']|^)${pattern}(?=[\\s,.:;"']|$)`
-      : `\b${pattern}\b`;
-  }
-
-  if (settings.matchCase) {
-    flag = "i";
-  }
-
-  highlight(
-    node,
-    new RegExp(pattern, flag),
-    settings.nodeName.toUpperCase(),
-    settings.className
-  );
-
-  return node;
-}
-
-export function unhighlightHTML(opts = {}) {
-  let settings = {
-    nodeName: "span",
-    className: "highlighted"
-  };
-
-  Object.assign(settings, opts);
-
-  document
-    .querySelectorAll(`${settings.nodeName}.${settings.className}`)
-    .forEach(e => {
-      const parentNode = e.parentNode;
-      parentNode.replaceChild(e.firstChild, e);
-      parentNode.normalize();
-    });
-}
diff --git a/app/assets/javascripts/discourse/lib/highlight-search.js b/app/assets/javascripts/discourse/lib/highlight-text.js
similarity index 71%
rename from app/assets/javascripts/discourse/lib/highlight-search.js
rename to app/assets/javascripts/discourse/lib/highlight-text.js
index 870e9c3693..6fa7a09faf 100644
--- a/app/assets/javascripts/discourse/lib/highlight-search.js
+++ b/app/assets/javascripts/discourse/lib/highlight-text.js
@@ -1,5 +1,4 @@
 import { PHRASE_MATCH_REGEXP_PATTERN } from "discourse/lib/concerns/search-constants";
-import highlightHTML from "discourse/lib/highlight-html";
 
 export const CLASS_NAME = "search-highlight";
 
@@ -12,10 +11,8 @@ export default function($elem, term, opts = {}) {
     );
 
     words = words.map(w => w.replace(/^"(.*)"$/, "$1"));
-    const highlightOpts = { wholeWord: true };
+    const highlightOpts = { wordsOnly: true };
     if (!opts.defaultClassName) highlightOpts.className = CLASS_NAME;
-    for (let i = 0; i <= $elem.length; i++) {
-      highlightHTML($elem[0], words, highlightOpts);
-    }
+    $elem.highlight(words, highlightOpts);
   }
 }
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 2ed17fa1bd..9394f35486 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -88,7 +88,7 @@
 
                   <a class='search-link' href={{result.url}} {{action "logClick" result.topic_id}}>
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
-                    <span class='topic-title'>{{#highlight-search highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-search}}</span>
+                    <span class='topic-title'>{{#highlight-text highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
                   </a>
 
                   <div class='search-category'>
@@ -112,9 +112,9 @@
                   </span>
 
                   {{#if result.blurb}}
-                    {{#highlight-search highlight=highlightQuery}}
+                    {{#highlight-text highlight=highlightQuery}}
                       {{html-safe result.blurb}}
-                    {{/highlight-search}}
+                    {{/highlight-text}}
                   {{/if}}
                 </div>
 
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js b/app/assets/javascripts/discourse/widgets/post-cooked.js
index c16820de44..3d55314f08 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js
@@ -2,11 +2,7 @@ import { iconHTML } from "discourse-common/lib/icon-library";
 import { ajax } from "discourse/lib/ajax";
 import { isValidLink } from "discourse/lib/click-track";
 import { number } from "discourse/lib/formatter";
-import highlightSearch from "discourse/lib/highlight-search";
-import {
-  default as highlightHTML,
-  unhighlightHTML
-} from "discourse/lib/highlight-html";
+import highlightText from "discourse/lib/highlight-text";
 
 let _decorators = [];
 
@@ -56,13 +52,13 @@ export default class PostCooked {
 
     if (highlight && highlight.length > 2) {
       if (this._highlighted) {
-        unhighlightHTML($html[0]);
+        $html.unhighlight();
       }
 
-      highlightSearch($html, highlight, { defaultClassName: true });
+      highlightText($html, highlight, { defaultClassName: true });
       this._highlighted = true;
     } else if (this._highlighted) {
-      unhighlightHTML($html[0]);
+      $html.unhighlight();
       this._highlighted = false;
     }
   }
@@ -179,8 +175,10 @@ export default class PostCooked {
           div.html(result.cooked);
           _decorators.forEach(cb => cb(div, this.decoratorHelper));
 
-          highlightHTML(div[0], originalText, {
-            matchCase: true
+          div.highlight(originalText, {
+            caseSensitive: true,
+            element: "span",
+            className: "highlighted"
           });
           $blockQuote.showHtml(div, "fast", finished);
         })
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js b/app/assets/javascripts/discourse/widgets/search-menu-results.js
index e85eefcd8e..636c069f94 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-results.js
+++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js
@@ -3,7 +3,7 @@ import { dateNode } from "discourse/helpers/node";
 import RawHtml from "discourse/widgets/raw-html";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
-import highlightSearch from "discourse/lib/highlight-search";
+import highlightText from "discourse/lib/highlight-text";
 import { escapeExpression, formatUsername } from "discourse/lib/utilities";
 import { iconNode } from "discourse-common/lib/icon-library";
 import renderTag from "discourse/lib/render-tag";
@@ -15,7 +15,7 @@ class Highlighted extends RawHtml {
   }
 
   decorate($html) {
-    highlightSearch($html, this.term);
+    highlightText($html, this.term);
   }
 }
 
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index 39626bfd19..3b36c27ea1 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -29,4 +29,5 @@
 //= require jquery.autoellipsis-1.0.10
 //= require virtual-dom
 //= require virtual-dom-amd
+//= require highlight.js
 //= require intersection-observer
diff --git a/db/migrate/20200323155812_add_post_thumbnails.rb b/db/migrate/20200323155812_add_post_thumbnails.rb
new file mode 100644
index 0000000000..01ea53c1b0
--- /dev/null
+++ b/db/migrate/20200323155812_add_post_thumbnails.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddPostThumbnails < ActiveRecord::Migration[6.0]
+  def change
+    add_table :post_thumbnails do |t|
+      t.references :posts, foreign_key: { to_table: :posts }, null: false
+    end
+
+  end
+end
diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js.es6
index c9567ad8b5..1b930c7905 100644
--- a/test/javascripts/acceptance/search-test.js.es6
+++ b/test/javascripts/acceptance/search-test.js.es6
@@ -94,7 +94,7 @@ QUnit.test("Search with context", async assert => {
 
   const highlighted = [];
 
-  find("#post_7 span.highlighted").map((_, span) => {
+  find("#post_7 span.highlight-strong").map((_, span) => {
     highlighted.push(span.innerText);
   });
 
diff --git a/test/javascripts/lib/highlight-search-test.js.es6 b/test/javascripts/lib/highlight-search-test.js.es6
deleted file mode 100644
index 2a2524f765..0000000000
--- a/test/javascripts/lib/highlight-search-test.js.es6
+++ /dev/null
@@ -1,48 +0,0 @@
-import highlightSearch, { CLASS_NAME } from "discourse/lib/highlight-search";
-import { fixture } from "helpers/qunit-helpers";
-
-QUnit.module("lib:highlight-search");
-
-QUnit.test("highlighting text", assert => {
-  fixture().html(
-    `
-    <p>This is some text to highlight</p>
-    `
-  );
-
-  highlightSearch(fixture(), "some text");
-
-  const terms = [];
-
-  fixture(`.${CLASS_NAME}`).each((_, elem) => {
-    terms.push(elem.textContent);
-  });
-
-  assert.equal(
-    terms.join(" "),
-    "some text",
-    "it should highlight the terms correctly"
-  );
-});
-
-QUnit.test("highlighting unicode text", assert => {
-  fixture().html(
-    `
-    <p>This is some தமிழ் and русский text to highlight</p>
-    `
-  );
-
-  highlightSearch(fixture(), "தமிழ் русский");
-
-  const terms = [];
-
-  fixture(`.${CLASS_NAME}`).each((_, elem) => {
-    terms.push(elem.textContent);
-  });
-
-  assert.equal(
-    terms.join(" "),
-    "தமிழ் русский",
-    "it should highlight the terms correctly"
-  );
-});
diff --git a/test/javascripts/lib/highlight-text-test.js.es6 b/test/javascripts/lib/highlight-text-test.js.es6
new file mode 100644
index 0000000000..d222b8a753
--- /dev/null
+++ b/test/javascripts/lib/highlight-text-test.js.es6
@@ -0,0 +1,26 @@
+import highlightText, { CLASS_NAME } from "discourse/lib/highlight-text";
+import { fixture } from "helpers/qunit-helpers";
+
+QUnit.module("lib:highlight-text");
+
+QUnit.test("highlighting text", assert => {
+  fixture().html(
+    `
+    <p>This is some text to highlight</p>
+    `
+  );
+
+  highlightText(fixture(), "some text");
+
+  const terms = [];
+
+  fixture(`.${CLASS_NAME}`).each((_, elem) => {
+    terms.push(elem.textContent);
+  });
+
+  assert.equal(
+    terms.join(" "),
+    "some text",
+    "it should highlight the terms correctly"
+  );
+});
diff --git a/vendor/assets/javascripts/highlight.js b/vendor/assets/javascripts/highlight.js
new file mode 100644
index 0000000000..c13dd7ff9f
--- /dev/null
+++ b/vendor/assets/javascripts/highlight.js
@@ -0,0 +1,108 @@
+// forked cause we may want to amend the logic a bit
+/*
+ * jQuery Highlight plugin
+ *
+ * Based on highlight v3 by Johann Burkard
+ * http://johannburkard.de/blog/programming/javascript/highlight-javascript-text-higlighting-jquery-plugin.html
+ *
+ * Code a little bit refactored and cleaned (in my humble opinion).
+ * Most important changes:
+ *  - has an option to highlight only entire words (wordsOnly - false by default),
+ *  - has an option to be case sensitive (caseSensitive - false by default)
+ *  - highlight element tag and class names can be specified in options
+ *
+ * Usage:
+ *   // wrap every occurrance of text 'lorem' in content
+ *   // with <span class='highlight'> (default options)
+ *   $('#content').highlight('lorem');
+ *
+ *   // search for and highlight more terms at once
+ *   // so you can save some time on traversing DOM
+ *   $('#content').highlight(['lorem', 'ipsum']);
+ *   $('#content').highlight('lorem ipsum');
+ *
+ *   // search only for entire word 'lorem'
+ *   $('#content').highlight('lorem', { wordsOnly: true });
+ *
+ *   // don't ignore case during search of term 'lorem'
+ *   $('#content').highlight('lorem', { caseSensitive: true });
+ *
+ *   // wrap every occurrance of term 'ipsum' in content
+ *   // with <em class='important'>
+ *   $('#content').highlight('ipsum', { element: 'em', className: 'important' });
+ *
+ *   // remove default highlight
+ *   $('#content').unhighlight();
+ *
+ *   // remove custom highlight
+ *   $('#content').unhighlight({ element: 'em', className: 'important' });
+ *
+ *
+ * Copyright (c) 2009 Bartek Szopka
+ *
+ * Licensed under MIT license.
+ *
+ */
+
+jQuery.extend({
+    highlight: function (node, re, nodeName, className) {
+        if (node.nodeType === 3) {
+            var match = node.data.match(re);
+            if (match) {
+                var highlight = document.createElement(nodeName || 'span');
+                highlight.className = className || 'highlight';
+                var wordNode = node.splitText(match.index);
+                wordNode.splitText(match[0].length);
+                var wordClone = wordNode.cloneNode(true);
+                highlight.appendChild(wordClone);
+                wordNode.parentNode.replaceChild(highlight, wordNode);
+                return 1; //skip added node in parent
+            }
+        } else if ((node.nodeType === 1 && node.childNodes) && // only element nodes that have children
+                !/(script|style)/i.test(node.tagName) && // ignore script and style nodes
+                !(node.tagName === nodeName.toUpperCase() && node.className === className)) { // skip if already highlighted
+            for (var i = 0; i < node.childNodes.length; i++) {
+                i += jQuery.highlight(node.childNodes[i], re, nodeName, className);
+            }
+        }
+        return 0;
+    }
+});
+
+jQuery.fn.unhighlight = function (options) {
+    var settings = { className: 'highlight-strong', element: 'span' };
+    jQuery.extend(settings, options);
+
+    return this.find(settings.element + "." + settings.className).each(function () {
+        var parent = this.parentNode;
+        parent.replaceChild(this.firstChild, this);
+        parent.normalize();
+    }).end();
+};
+
+jQuery.fn.highlight = function (words, options) {
+    var settings = { className: 'highlight-strong', element: 'span', caseSensitive: false, wordsOnly: false };
+    jQuery.extend(settings, options);
+
+    if (words.constructor === String) {
+        words = [words];
+    }
+    words = jQuery.grep(words, function(word){
+      return word !== '';
+    });
+    words = jQuery.map(words, function(word) {
+      return word.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+    });
+    if (words.length === 0) { return this; }
+
+    var flag = settings.caseSensitive ? "" : "i";
+    var pattern = "(" + words.join("|") + ")";
+    if (settings.wordsOnly) {
+        pattern = "\\b" + pattern + "\\b";
+    }
+    var re = new RegExp(pattern, flag);
+
+    return this.each(function () {
+        jQuery.highlight(this, re, settings.element, settings.className);
+    });
+};

From 2ed0f8d120b16a2d53c170293c7286efffa399f3 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 25 Mar 2020 14:49:59 +0000
Subject: [PATCH 0350/1830] DEV: Remove migration which was erroneously added
 in d62d258f

---
 db/migrate/20200323155812_add_post_thumbnails.rb | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 db/migrate/20200323155812_add_post_thumbnails.rb

diff --git a/db/migrate/20200323155812_add_post_thumbnails.rb b/db/migrate/20200323155812_add_post_thumbnails.rb
deleted file mode 100644
index 01ea53c1b0..0000000000
--- a/db/migrate/20200323155812_add_post_thumbnails.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-class AddPostThumbnails < ActiveRecord::Migration[6.0]
-  def change
-    add_table :post_thumbnails do |t|
-      t.references :posts, foreign_key: { to_table: :posts }, null: false
-    end
-
-  end
-end

From 7d7c5641b44e56f0698874631713dce806fe80f0 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 25 Mar 2020 15:51:30 +0100
Subject: [PATCH 0351/1830] DEV: allows to use routeAction from
 components/widgets (#9267)

ATM this is only usable as a helper in templates.
---
 .../discourse/helpers/route-action.js         | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/discourse/helpers/route-action.js b/app/assets/javascripts/discourse/helpers/route-action.js
index 4e010498bd..1de922938a 100644
--- a/app/assets/javascripts/discourse/helpers/route-action.js
+++ b/app/assets/javascripts/discourse/helpers/route-action.js
@@ -32,29 +32,32 @@ function getRouteWithAction(router, actionName) {
   return { action, handler };
 }
 
+export function routeAction(actionName, router, ...params) {
+  assert("[ember-route-action-helper] Unable to lookup router", router);
+
+  runInDebug(() => {
+    let { handler } = getRouteWithAction(router, actionName);
+    assert(
+      `[ember-route-action-helper] Unable to find action ${actionName}`,
+      handler
+    );
+  });
+
+  return function(...invocationArgs) {
+    let { action, handler } = getRouteWithAction(router, actionName);
+    let args = params.concat(invocationArgs);
+    return run.join(handler, action, ...args);
+  };
+}
+
 export default Helper.extend({
-  router: computed(function() {
-    return getOwner(this).lookup("router:main");
-  }).readOnly(),
+  router: computed({
+    get() {
+      return getOwner(this).lookup("router:main");
+    }
+  }),
 
   compute([actionName, ...params]) {
-    let router = get(this, "router");
-    assert("[ember-route-action-helper] Unable to lookup router", router);
-
-    runInDebug(() => {
-      let { handler } = getRouteWithAction(router, actionName);
-      assert(
-        `[ember-route-action-helper] Unable to find action ${actionName}`,
-        handler
-      );
-    });
-
-    let routeAction = function(...invocationArgs) {
-      let { action, handler } = getRouteWithAction(router, actionName);
-      let args = params.concat(invocationArgs);
-      return run.join(handler, action, ...args);
-    };
-
-    return routeAction;
+    return routeAction(actionName, get(this, "router"), ...params);
   }
 });

From 3ae26c6c59c8f9bfaabc3241495194a119026c78 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 25 Mar 2020 17:11:33 +0200
Subject: [PATCH 0352/1830] FEATURE: List search menu shortcuts in instructions
 modal (#9273)

---
 .../discourse/controllers/keyboard-shortcuts-help.js   | 10 ++++++++++
 .../templates/modal/keyboard-shortcuts-help.hbs        |  7 +++++++
 config/locales/client.en.yml                           |  4 ++++
 3 files changed, 21 insertions(+)

diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
index 1c2d8f4221..62feb5b404 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
@@ -172,6 +172,16 @@ export default Controller.extend(ModalFunctionality, {
         keys1: [SHIFT, "a"],
         keysDelimiter: PLUS
       })
+    },
+    search_menu: {
+      prev_next: buildShortcut("search_menu.prev_next", {
+        keys1: ["&uarr;"],
+        keys2: ["&darr;"],
+        shortcutsDelimiter: "slash"
+      }),
+      insert_url: buildShortcut("search_menu.insert_url", {
+        keys1: ["a"]
+      })
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 2203c90174..cfa90cb67e 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -78,5 +78,12 @@
         <li>{{html-safe shortcuts.actions.topic_admin_actions}}</li>
       </ul>
     </section>
+    <section>
+      <h4>{{i18n "keyboard_shortcuts_help.search_menu.title"}}</h4>
+      <ul>
+        <li>{{html-safe shortcuts.search_menu.prev_next}}</li>
+        <li>{{html-safe shortcuts.search_menu.insert_url}}</li>
+      </ul>
+    </section>
   </div>
 {{/d-modal-body}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e9ad9aac7c..a793ae920d 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3091,6 +3091,10 @@ en:
         print: "%{shortcut} Print topic"
         defer: "%{shortcut} Defer topic"
         topic_admin_actions: "%{shortcut} Open topic admin actions"
+      search_menu:
+        title: "Search Menu"
+        prev_next: "%{shortcut} Move selection up and down"
+        insert_url: "%{shortcut} Insert selection into open composer"
 
     badges:
       earned_n_times:

From 55b8620b4333dd616400803cdfe580cef3ea9630 Mon Sep 17 00:00:00 2001
From: romanrizzi <rizziromanalejandro@gmail.com>
Date: Wed, 25 Mar 2020 12:57:31 -0300
Subject: [PATCH 0353/1830] FIX: TopicEmbed#absolutize_urls was trying to
 modify a frozen string

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

diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index b71726d413..15922f7c4c 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -192,7 +192,7 @@ class TopicEmbed < ActiveRecord::Base
       return contents
     end
     prefix = "#{uri.scheme}://#{uri.host}"
-    prefix << ":#{uri.port}" if uri.port != 80 && uri.port != 443
+    prefix += ":#{uri.port}" if uri.port != 80 && uri.port != 443
 
     fragment = Nokogiri::HTML.fragment("<div>#{contents}</div>")
     fragment.css('a').each do |a|

From f2f8ede22c7a7905a1465674779d1d1f01b24cdf Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 11:30:33 -0400
Subject: [PATCH 0354/1830] Last ES6 files in our app/assets/javascripts

---
 .../{activate-account.js.es6 => activate-account.js}      | 0
 .../{auto-redirect.js.es6 => auto-redirect.js}            | 0
 .../confirm-new-email/{bootstrap.js.es6 => bootstrap.js}  | 0
 .../{confirm-new-email.js.es6 => confirm-new-email.js}    | 0
 .../{auth-token-dropdown.es6 => auth-token-dropdown.js}   | 0
 ...ities.js.es6.erb => category-search-priorities.js.erb} | 0
 .../helpers/{loading-spinner.es6 => loading-spinner.js}   | 0
 ...earch-constants.js.es6.erb => search-constants.js.erb} | 0
 .../models/{live-post-counts.es6 => live-post-counts.js}  | 0
 .../{embed-application.js.es6 => embed-application.js}    | 0
 .../{google-tag-manager.js.es6 => google-tag-manager.js}  | 0
 ...sal-analytics.js.es6 => google-universal-analytics.js} | 0
 lib/discourse_js_processor.rb                             | 8 +++++++-
 13 files changed, 7 insertions(+), 1 deletion(-)
 rename app/assets/javascripts/{activate-account.js.es6 => activate-account.js} (100%)
 rename app/assets/javascripts/{auto-redirect.js.es6 => auto-redirect.js} (100%)
 rename app/assets/javascripts/confirm-new-email/{bootstrap.js.es6 => bootstrap.js} (100%)
 rename app/assets/javascripts/confirm-new-email/{confirm-new-email.js.es6 => confirm-new-email.js} (100%)
 rename app/assets/javascripts/discourse/components/{auth-token-dropdown.es6 => auth-token-dropdown.js} (100%)
 rename app/assets/javascripts/discourse/components/concerns/{category-search-priorities.js.es6.erb => category-search-priorities.js.erb} (100%)
 rename app/assets/javascripts/discourse/helpers/{loading-spinner.es6 => loading-spinner.js} (100%)
 rename app/assets/javascripts/discourse/lib/concerns/{search-constants.js.es6.erb => search-constants.js.erb} (100%)
 rename app/assets/javascripts/discourse/models/{live-post-counts.es6 => live-post-counts.js} (100%)
 rename app/assets/javascripts/{embed-application.js.es6 => embed-application.js} (100%)
 rename app/assets/javascripts/{google-tag-manager.js.es6 => google-tag-manager.js} (100%)
 rename app/assets/javascripts/{google-universal-analytics.js.es6 => google-universal-analytics.js} (100%)

diff --git a/app/assets/javascripts/activate-account.js.es6 b/app/assets/javascripts/activate-account.js
similarity index 100%
rename from app/assets/javascripts/activate-account.js.es6
rename to app/assets/javascripts/activate-account.js
diff --git a/app/assets/javascripts/auto-redirect.js.es6 b/app/assets/javascripts/auto-redirect.js
similarity index 100%
rename from app/assets/javascripts/auto-redirect.js.es6
rename to app/assets/javascripts/auto-redirect.js
diff --git a/app/assets/javascripts/confirm-new-email/bootstrap.js.es6 b/app/assets/javascripts/confirm-new-email/bootstrap.js
similarity index 100%
rename from app/assets/javascripts/confirm-new-email/bootstrap.js.es6
rename to app/assets/javascripts/confirm-new-email/bootstrap.js
diff --git a/app/assets/javascripts/confirm-new-email/confirm-new-email.js.es6 b/app/assets/javascripts/confirm-new-email/confirm-new-email.js
similarity index 100%
rename from app/assets/javascripts/confirm-new-email/confirm-new-email.js.es6
rename to app/assets/javascripts/confirm-new-email/confirm-new-email.js
diff --git a/app/assets/javascripts/discourse/components/auth-token-dropdown.es6 b/app/assets/javascripts/discourse/components/auth-token-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/auth-token-dropdown.es6
rename to app/assets/javascripts/discourse/components/auth-token-dropdown.js
diff --git a/app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.es6.erb b/app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.erb
similarity index 100%
rename from app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.es6.erb
rename to app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.erb
diff --git a/app/assets/javascripts/discourse/helpers/loading-spinner.es6 b/app/assets/javascripts/discourse/helpers/loading-spinner.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/loading-spinner.es6
rename to app/assets/javascripts/discourse/helpers/loading-spinner.js
diff --git a/app/assets/javascripts/discourse/lib/concerns/search-constants.js.es6.erb b/app/assets/javascripts/discourse/lib/concerns/search-constants.js.erb
similarity index 100%
rename from app/assets/javascripts/discourse/lib/concerns/search-constants.js.es6.erb
rename to app/assets/javascripts/discourse/lib/concerns/search-constants.js.erb
diff --git a/app/assets/javascripts/discourse/models/live-post-counts.es6 b/app/assets/javascripts/discourse/models/live-post-counts.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/live-post-counts.es6
rename to app/assets/javascripts/discourse/models/live-post-counts.js
diff --git a/app/assets/javascripts/embed-application.js.es6 b/app/assets/javascripts/embed-application.js
similarity index 100%
rename from app/assets/javascripts/embed-application.js.es6
rename to app/assets/javascripts/embed-application.js
diff --git a/app/assets/javascripts/google-tag-manager.js.es6 b/app/assets/javascripts/google-tag-manager.js
similarity index 100%
rename from app/assets/javascripts/google-tag-manager.js.es6
rename to app/assets/javascripts/google-tag-manager.js
diff --git a/app/assets/javascripts/google-universal-analytics.js.es6 b/app/assets/javascripts/google-universal-analytics.js
similarity index 100%
rename from app/assets/javascripts/google-universal-analytics.js.es6
rename to app/assets/javascripts/google-universal-analytics.js
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 3e101328cf..bbadfa84af 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -43,11 +43,17 @@ class DiscourseJsProcessor
       relative_path.start_with?("app/assets/javascripts/wizard/") ||
       relative_path.start_with?("app/assets/javascripts/discourse-common/") ||
       relative_path.start_with?("app/assets/javascripts/ember-addons/") ||
+      relative_path.start_with?("app/assets/javascripts/confirm-new-email/") ||
       relative_path == "app/assets/javascripts/preload-store.js" ||
       relative_path == "app/assets/javascripts/preload-application-data.js" ||
       relative_path == "app/assets/javascripts/wizard-start.js" ||
       relative_path == "app/assets/javascripts/onpopstate-handler.js" ||
-      relative_path == "app/assets/javascripts/discourse.js"
+      relative_path == "app/assets/javascripts/discourse.js" ||
+      relative_path == "app/assets/javascripts/google-tag-manager.js" ||
+      relative_path == "app/assets/javascripts/google-universal-analytics.js" ||
+      relative_path == "app/assets/javascripts/activate-account.js" ||
+      relative_path == "app/assets/javascripts/auto-redirect.js" ||
+      relative_path == "app/assets/javascripts/embed-application.js"
   end
 
   def self.skip_module?(data)

From 0025806b7ea9fbac10ed63d1001d25c2b433e7d7 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 12:30:08 -0400
Subject: [PATCH 0355/1830] Ignore latest

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 5e86efd0f0..eec6fc3a2f 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -31,3 +31,6 @@ acc5cbdf8ecb9293a0fa9474ee73baf499c02428
 
 # Rename some root files
 11938d58d4b1bea1ff43306450da7b24f05db0a
+
+# The last remaining ES6
+aabeb17aab4e73de5ef56753ab22ef5d416d2932

From c14f6d4ceda5fec6cb1730fb37d5426ef154d74a Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 25 Mar 2020 11:36:42 -0500
Subject: [PATCH 0356/1830] FEATURE: Allow plugins to exclude wizard steps
 (#9275)

---
 lib/wizard.rb                         |  8 ++++++++
 spec/components/wizard/wizard_spec.rb | 20 ++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/lib/wizard.rb b/lib/wizard.rb
index a254d8935d..f334081444 100644
--- a/lib/wizard.rb
+++ b/lib/wizard.rb
@@ -5,6 +5,8 @@ class Wizard
   attr_reader :steps, :user
   attr_accessor :max_topics_to_require_completion
 
+  @@excluded_steps = []
+
   def initialize(user)
     @steps = []
     @user = user
@@ -17,6 +19,8 @@ class Wizard
   end
 
   def append_step(step)
+    return if @@excluded_steps.include?(step)
+
     step = create_step(step) if step.is_a?(String)
 
     yield step if block_given?
@@ -36,6 +40,10 @@ class Wizard
     end
   end
 
+  def self.exclude_step(step)
+    @@excluded_steps << step
+  end
+
   def steps_with_fields
     @steps_with_fields ||= @steps.select(&:has_fields?)
   end
diff --git a/spec/components/wizard/wizard_spec.rb b/spec/components/wizard/wizard_spec.rb
index bf5490adef..0faef40829 100644
--- a/spec/components/wizard/wizard_spec.rb
+++ b/spec/components/wizard/wizard_spec.rb
@@ -61,6 +61,26 @@ describe Wizard do
     end
   end
 
+  describe ".exclude_step" do
+    let(:user) { Fabricate.build(:moderator) }
+    let(:wizard) { Wizard.new(user) }
+
+    it 'excludes steps even if they are added via append_step' do
+      wizard.append_step('first') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+
+      Wizard.exclude_step("random-step123")
+
+      wizard.append_step('random-step123') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+      wizard.append_step('finished')
+
+      expect(wizard.steps.map(&:id)).to eq(['first', 'finished'])
+    end
+  end
+
   describe "completed?" do
     let(:user) { Fabricate.build(:moderator) }
     let(:wizard) { Wizard.new(user) }

From 105cc5505c4efe4edd43b6fe409667f34db53a43 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 25 Mar 2020 17:57:43 +0100
Subject: [PATCH 0357/1830] FIX: ensures we have a date object in
 date-time-input (#9276)

---
 .../discourse/components/date-time-input.js           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/date-time-input.js b/app/assets/javascripts/discourse/components/date-time-input.js
index 392dc5dac0..81a7a10b92 100644
--- a/app/assets/javascripts/discourse/components/date-time-input.js
+++ b/app/assets/javascripts/discourse/components/date-time-input.js
@@ -7,19 +7,20 @@ export default Component.extend({
   showTime: true,
 
   _hours: computed("date", function() {
-    return this.date && this.showTime ? this.date.getHours() : null;
+    return this.date && this.showTime ? new Date(this.date).getHours() : null;
   }),
 
   _minutes: computed("date", function() {
-    return this.date && this.showTime ? this.date.getMinutes() : null;
+    return this.date && this.showTime ? new Date(this.date).getMinutes() : null;
   }),
 
   actions: {
     onChangeTime(time) {
       if (this.onChange) {
-        const year = this.date.getFullYear();
-        const month = this.date.getMonth();
-        const day = this.date.getDate();
+        const date = new Date(this.date);
+        const year = date.getFullYear();
+        const month = date.getMonth();
+        const day = date.getDate();
         this.onChange(new Date(year, month, day, time.hours, time.minutes));
       }
     },

From dbc323e12abb9d50a174bbe0de5c36ee54e66a12 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 25 Mar 2020 23:32:32 +0530
Subject: [PATCH 0358/1830] Fix the typo.

---
 app/assets/javascripts/select-kit/components/tag-chooser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/tag-chooser.js b/app/assets/javascripts/select-kit/components/tag-chooser.js
index ff43a16b66..65e7597aa9 100644
--- a/app/assets/javascripts/select-kit/components/tag-chooser.js
+++ b/app/assets/javascripts/select-kit/components/tag-chooser.js
@@ -25,7 +25,7 @@ export default MultiSelectComponent.extend(TagsMixin, {
   excludeHasSynonyms: false,
 
   canCreateTag: computed("site.can_create_tag", "allowCreate", function() {
-    return this.allowCreate || this.site.can_create_tag;
+    return this.allowCreate && this.site.can_create_tag;
   }),
 
   maximumTagCount: computed(

From 6acbd1bedfaa1c8f6d3e48cc928f3d7038333d58 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 25 Mar 2020 19:05:11 +0100
Subject: [PATCH 0359/1830] DEV: allows time-input to be clearable (#9277)

---
 app/assets/javascripts/discourse/components/date-input.js   | 6 +++++-
 .../javascripts/discourse/components/date-time-input.js     | 5 +++++
 .../templates/components/date-time-input-range.hbs          | 1 +
 .../discourse/templates/components/date-time-input.hbs      | 4 ++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/date-input.js b/app/assets/javascripts/discourse/components/date-input.js
index 7bb967455f..0aaea9304b 100644
--- a/app/assets/javascripts/discourse/components/date-input.js
+++ b/app/assets/javascripts/discourse/components/date-input.js
@@ -32,10 +32,14 @@ export default Component.extend({
   didUpdateAttrs() {
     this._super(...arguments);
 
-    if (this._picker && typeof date === "string") {
+    if (this._picker && typeof this.date === "string") {
       const [year, month, day] = this.date.split("-").map(x => parseInt(x, 10));
       this._picker.setDate(new Date(year, month - 1, day), true);
     }
+
+    if (this._picker && !this.date) {
+      this._picker.setDate(null);
+    }
   },
 
   _loadPikadayPicker(container) {
diff --git a/app/assets/javascripts/discourse/components/date-time-input.js b/app/assets/javascripts/discourse/components/date-time-input.js
index 81a7a10b92..eff8b99edc 100644
--- a/app/assets/javascripts/discourse/components/date-time-input.js
+++ b/app/assets/javascripts/discourse/components/date-time-input.js
@@ -5,6 +5,7 @@ export default Component.extend({
   classNames: ["d-date-time-input"],
   date: null,
   showTime: true,
+  clearable: false,
 
   _hours: computed("date", function() {
     return this.date && this.showTime ? new Date(this.date).getHours() : null;
@@ -15,6 +16,10 @@ export default Component.extend({
   }),
 
   actions: {
+    onClear() {
+      this.onChange(null);
+    },
+
     onChangeTime(time) {
       if (this.onChange) {
         const date = new Date(this.date);
diff --git a/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs b/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs
index e4476ae948..0df2fbcc70 100644
--- a/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs
+++ b/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs
@@ -30,5 +30,6 @@
     date=to
     onChange=(action "_onChange" (hash prop="to"))
     showTime=showToTime
+    clearable=true
   }}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/date-time-input.hbs b/app/assets/javascripts/discourse/templates/components/date-time-input.hbs
index a2da31c28c..0b243e74a4 100644
--- a/app/assets/javascripts/discourse/templates/components/date-time-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/date-time-input.hbs
@@ -6,4 +6,8 @@
     minutes=_minutes
     onChange=(action "onChangeTime")
   }}
+
+  {{#if clearable}}
+    {{d-button icon="times" action=(action "onClear")}}
+  {{/if}}
 {{/if}}

From b09f79366e5c31073687d56a384f35cab77f1b96 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 25 Mar 2020 23:37:46 +0530
Subject: [PATCH 0360/1830] UX: disallow tag creation in "default tags" site
 setting choosers.

---
 .../admin/templates/components/site-settings/tag-list.hbs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
index 21e7e1ab0a..1fb69c595b 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
@@ -1,3 +1,3 @@
-{{tag-chooser tags=selectedTags}}
+{{tag-chooser tags=selectedTags allowCreate=false}}
 <div class='desc'>{{html-safe setting.description}}</div>
 {{setting-validation-message message=validationMessage}}

From 6a1fe9ff8743db44fcd7620cd52b762a2bcbfd0e Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Wed, 25 Mar 2020 11:30:39 -0700
Subject: [PATCH 0361/1830] FIX: Use 1 column instead of 4 for permalink
 destination (#9260)

---
 .../javascripts/admin/models/permalink.js     | 13 ++++++++++++
 .../admin/templates/permalinks.hbs            | 20 +++++++------------
 config/locales/client.en.yml                  |  1 +
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/admin/models/permalink.js b/app/assets/javascripts/admin/models/permalink.js
index b86e931692..b13dcd6f52 100644
--- a/app/assets/javascripts/admin/models/permalink.js
+++ b/app/assets/javascripts/admin/models/permalink.js
@@ -1,4 +1,7 @@
 import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
+import DiscourseURL from "discourse/lib/url";
+import Category from "discourse/models/category";
 import EmberObject from "@ember/object";
 
 const Permalink = EmberObject.extend({
@@ -13,6 +16,16 @@ const Permalink = EmberObject.extend({
     });
   },
 
+  @discourseComputed("category_id")
+  category: function(category_id) {
+    return Category.findById(category_id);
+  },
+
+  @discourseComputed("external_url")
+  linkIsExternal: function(external_url) {
+    return !DiscourseURL.isInternal(external_url);
+  },
+
   destroy: function() {
     return ajax("/admin/permalinks/" + this.id + ".json", {
       type: "DELETE"
diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs
index 7c7ac2df6b..a9f1067909 100644
--- a/app/assets/javascripts/admin/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/templates/permalinks.hbs
@@ -15,33 +15,27 @@
     <table class='admin-logs-table permalinks grid'>
       <thead class="heading-container">
         <th class="col heading first url">{{i18n 'admin.permalink.url'}}</th>
-        <th class="col heading topic">{{i18n 'admin.permalink.topic_title'}}</th>
-        <th class="col heading post">{{i18n 'admin.permalink.post_title'}}</th>
-        <th class="col heading category">{{i18n 'admin.permalink.category_title'}}</th>
-        <th class="col heading external_url">{{i18n 'admin.permalink.external_url'}}</th>
+        <th class="col heading destination">{{i18n 'admin.permalink.destination'}}</th>
         <th class="col heading actions"></th>
       </thead>
       <tbody>
         {{#each model as |pl|}}
           <tr class="admin-list-item">
             <td class="col first url">{{pl.url}}</td>
-            <td class="col topic">
+            <td class="col destination">
               {{#if pl.topic_id}}
                 <a href={{pl.topic_url}}>{{pl.topic_title}}</a>
               {{/if}}
-            </td>
-            <td class="col post">
               {{#if pl.post_id}}
-                <a href={{pl.post_url}}>#{{pl.post_number}} {{pl.post_topic_title}}</a>
+                <a href={{pl.post_url}}>{{pl.post_topic_title}} #{{pl.post_number}}</a>
               {{/if}}
-            </td>
-            <td class="col category">
               {{#if pl.category_id}}
-                <a href={{pl.category_url}}>{{pl.category_name}}</a>
+                {{category-link pl.category}}
               {{/if}}
-            </td>
-            <td class="col external_url">
               {{#if pl.external_url}}
+                {{#if pl.linkIsExternal}}
+                  {{d-icon "external-link-alt"}}
+                {{/if}}
                 <a href={{pl.external_url}}>{{pl.external_url}}</a>
               {{/if}}
             </td>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a793ae920d..50f5134381 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4593,6 +4593,7 @@ en:
         category_id: "Category ID"
         category_title: "Category"
         external_url: "External URL"
+        destination: "Destination"
         delete_confirm: Are you sure you want to delete this permalink?
         form:
           label: "New:"

From 2abe85b8344de1102c1589a9ac9421a8b296f2b5 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 14:51:05 -0400
Subject: [PATCH 0362/1830] Rename all test files from JS -> ES6

---
 lib/discourse_js_processor.rb                 | 39 ++++++++++---------
 .../{about-test.js.es6 => about-test.js}      |  0
 ...ed-test.js.es6 => account-created-test.js} |  0
 ...mails-test.js.es6 => admin-emails-test.js} |  0
 ...t.js.es6 => admin-search-log-term-test.js} |  0
 ...-test.js.es6 => admin-search-logs-test.js} |  0
 ...est.js.es6 => admin-site-settings-test.js} |  0
 ...xt-test.js.es6 => admin-site-text-test.js} |  0
 ...test.js.es6 => admin-suspend-user-test.js} |  0
 ...-test.js.es6 => admin-user-badges-test.js} |  0
 ...-test.js.es6 => admin-user-emails-test.js} |  0
 ...x-test.js.es6 => admin-user-index-test.js} |  0
 ...t-test.js.es6 => admin-users-list-test.js} |  0
 ...est.js.es6 => admin-watched-words-test.js} |  0
 ...lete-test.js.es6 => auth-complete-test.js} |  0
 .../{badges-test.js.es6 => badges-test.js}    |  0
 ...r-test.js.es6 => category-chooser-test.js} |  0
 ....js.es6 => category-edit-security-test.js} |  0
 ...edit-test.js.es6 => category-edit-test.js} |  0
 ...g-test.js.es6 => category-hashtag-test.js} |  0
 ...-track-test.js.es6 => click-track-test.js} |  0
 ...s-test.js.es6 => composer-actions-test.js} |  0
 ...est.js.es6 => composer-attachment-test.js} |  0
 ....js.es6 => composer-edit-conflict-test.js} |  0
 ...test.js.es6 => composer-hyperlink-test.js} |  0
 ...ox-test.js.es6 => composer-onebox-test.js} |  0
 ...{composer-test.js.es6 => composer-test.js} |  0
 ...st.js.es6 => composer-topic-links-test.js} |  0
 ....js.es6 => composer-uncategorized-test.js} |  0
 ...es6 => create-account-user-fields-test.js} |  0
 ...et-test.js.es6 => custom-html-set-test.js} |  0
 ...st.js.es6 => custom-html-template-test.js} |  0
 ...ashboard-test.js.es6 => dashboard-test.js} |  0
 ...otice-test.js.es6 => email-notice-test.js} |  0
 ...icker-test.js.es6 => emoji-picker-test.js} |  0
 .../{emoji-test.js.es6 => emoji-test.js}      |  0
 ...t.js.es6 => enforce-second-factor-test.js} |  0
 ...rd-test.js.es6 => forgot-password-test.js} |  0
 ...-test.js.es6 => group-card-mobile-test.js} |  0
 ...up-card-test.js.es6 => group-card-test.js} |  0
 ...-index-test.js.es6 => group-index-test.js} |  0
 ...s.es6 => group-manage-interaction-test.js} |  0
 ...-test.js.es6 => group-manage-logs-test.js} |  0
 ...js.es6 => group-manage-membership-test.js} |  0
 ...st.js.es6 => group-manage-profile-test.js} |  0
 ...sts-test.js.es6 => group-requests-test.js} |  0
 .../{group-test.js.es6 => group-test.js}      |  0
 ...index-test.js.es6 => groups-index-test.js} |  0
 ...ups-new-test.js.es6 => groups-new-test.js} |  0
 ...cept-test.js.es6 => invite-accept-test.js} |  0
 ...js.es6 => invite-show-user-fields-test.js} |  0
 .../{jump-to-test.js.es6 => jump-to-test.js}  |  0
 ...test.js.es6 => keyboard-shortcuts-test.js} |  0
 ...ect-test.js.es6 => login-redirect-test.js} |  0
 ...red-test.js.es6 => login-required-test.js} |  0
 ...mail-and-hide-email-address-taken-test.js} |  0
 ...n-with-email-and-no-social-logins-test.js} |  0
 ....es6 => login-with-email-disabled-test.js} |  0
 ...l-test.js.es6 => login-with-email-test.js} |  0
 ...y-test.js.es6 => mobile-discovery-test.js} |  0
 ...-in-test.js.es6 => mobile-sign-in-test.js} |  0
 ...users-test.js.es6 => mobile-users-test.js} |  0
 .../{modal-test.js.es6 => modal-test.js}      |  0
 ...essage-test.js.es6 => new-message-test.js} |  0
 ...ew-topic-test.js.es6 => new-topic-test.js} |  0
 ...set-test.js.es6 => password-reset-test.js} |  0
 ...e-test.js.es6 => personal-message-test.js} |  0
 ... => plugin-outlet-connector-class-test.js} |  0
 ...js.es6 => plugin-outlet-decorator-test.js} |  0
 ...6 => plugin-outlet-multi-template-test.js} |  0
 ... => plugin-outlet-single-template-test.js} |  0
 ...rences-test.js.es6 => preferences-test.js} |  0
 ...-test.js.es6 => raw-plugin-outlet-test.js} |  0
 ...op-test.js.es6 => redirect-to-top-test.js} |  0
 .../{reports-test.js.es6 => reports-test.js}  |  0
 .../{review-test.js.es6 => review-test.js}    |  0
 ...h-full-test.js.es6 => search-full-test.js} |  0
 ...bile-test.js.es6 => search-mobile-test.js} |  0
 .../{search-test.js.es6 => search-test.js}    |  0
 ...s.es6 => share-and-invite-desktop-test.js} |  0
 ...js.es6 => share-and-invite-mobile-test.js} |  0
 ...afts-test.js.es6 => shared-drafts-test.js} |  0
 .../{sign-in-test.js.es6 => sign-in-test.js}  |  0
 .../{static-test.js.es6 => static-test.js}    |  0
 ...-groups-test.js.es6 => tag-groups-test.js} |  0
 ...ashtag-test.js.es6 => tag-hashtag-test.js} |  0
 ...-test.js.es6 => tags-intersection-test.js} |  0
 .../{tags-test.js.es6 => tags-test.js}        |  0
 ...us-test.js.es6 => topic-anonymous-test.js} |  0
 ...ry-test.js.es6 => topic-discovery-test.js} |  0
 ...r-test.js.es6 => topic-edit-timer-test.js} |  0
 ...s6 => topic-footer-buttons-mobile-test.js} |  0
 ...s-test.js.es6 => topic-move-posts-test.js} |  0
 ...es6 => topic-notifications-button-test.js} |  0
 .../{topic-test.js.es6 => topic-test.js}      |  0
 .../{unknown-test.js.es6 => unknown-test.js}  |  0
 ...ous-test.js.es6 => user-anonymous-test.js} |  0
 ...e-test.js.es6 => user-card-mobile-test.js} |  0
 ...ser-card-test.js.es6 => user-card-test.js} |  0
 ...test.js.es6 => user-drafts-stream-test.js} |  0
 .../{user-test.js.es6 => user-test.js}        |  0
 .../{users-test.js.es6 => users-test.js}      |  0
 ...test.js.es6 => group-list-setting-test.js} |  0
 ...m-test.js.es6 => themes-list-item-test.js} |  0
 ...s-list-test.js.es6 => themes-list-test.js} |  0
 ...s6 => admin-customize-themes-show-test.js} |  0
 ....js.es6 => admin-customize-themes-test.js} |  0
 ...-test.js.es6 => admin-user-badges-test.js} |  0
 .../{theme-test.js.es6 => theme-test.js}      |  0
 ...-editor-test.js.es6 => ace-editor-test.js} |  0
 ...eport-test.js.es6 => admin-report-test.js} |  0
 ...-title-test.js.es6 => badge-title-test.js} |  0
 ...{d-button-test.js.es6 => d-button-test.js} |  0
 ...{d-editor-test.js.es6 => d-editor-test.js} |  0
 .../{d-icon-test.js.es6 => d-icon-test.js}    |  0
 ...e-input-test.js.es6 => date-input-test.js} |  0
 ...t.js.es6 => date-time-input-range-test.js} |  0
 ...ut-test.js.es6 => date-time-input-test.js} |  0
 ...js.es6 => group-membership-button-test.js} |  0
 ...r-test.js.es6 => html-safe-helper-test.js} |  0
 ...-html-test.js.es6 => iframed-html-test.js} |  0
 ...der-test.js.es6 => image-uploader-test.js} |  0
 ...test.js.es6 => keyboard-shortcuts-test.js} |  0
 ...oad-more-test.js.es6 => load-more-test.js} |  0
 ...-test.js.es6 => secret-value-list-test.js} |  0
 ...r-test.js.es6 => category-chooser-test.js} |  0
 ...drop-test.js.es6 => category-drop-test.js} |  0
 ...ombo-box-test.js.es6 => combo-box-test.js} |  0
 ...est.js.es6 => dropdown-select-box-test.js} |  0
 ...tting-test.js.es6 => list-setting-test.js} |  0
 ...r-test.js.es6 => mini-tag-chooser-test.js} |  0
 ...elect-test.js.es6 => multi-select-test.js} |  0
 ...st.js.es6 => notifications-button-test.js} |  0
 ...ons-test.js.es6 => pinned-options-test.js} |  0
 ...elper.js.es6 => select-kit-test-helper.js} |  0
 ...lect-test.js.es6 => single-select-test.js} |  0
 ...{tag-drop-test.js.es6 => tag-drop-test.js} |  0
 ...es6 => topic-notifications-button-test.js} |  0
 ...s6 => topic-notifications-options-test.js} |  0
 ...ooser-test.js.es6 => user-chooser-test.js} |  0
 ...utton-test.js.es6 => share-button-test.js} |  0
 .../{share-button.js.es6 => share-button.js}  |  0
 ...t-field-test.js.es6 => text-field-test.js} |  0
 ...flow-test.js.es6 => text-overflow-test.js} |  0
 ...e-input-test.js.es6 => time-input-test.js} |  0
 ...ctor-test.js.es6 => user-selector-test.js} |  0
 ...ue-list-test.js.es6 => value-list-test.js} |  0
 ...or-test.js.es6 => avatar-selector-test.js} |  0
 ...{bookmark-test.js.es6 => bookmark-test.js} |  0
 ...unt-test.js.es6 => create-account-test.js} |  0
 .../{group-test.js.es6 => group-test.js}      |  0
 .../{history-test.js.es6 => history-test.js}  |  0
 ...est.js.es6 => preferences-account-test.js} |  0
 ....es6 => preferences-second-factor-test.js} |  0
 ...test.js.es6 => reorder-categories-test.js} |  0
 .../{topic-test.js.es6 => topic-test.js}      |  0
 ...{resolver-test.js.es6 => resolver-test.js} |  0
 .../fixtures/{about.js.es6 => about.js}       |  0
 ...adges_fixture.js.es6 => badges_fixture.js} |  0
 ...y-fixtures.js.es6 => category-fixtures.js} |  0
 ...s.js.es6.erb => notification-types.js.erb} |  0
 ...rd-general.js.es6 => dashboard-general.js} |  0
 .../{dashboard.js.es6 => dashboard.js}        |  0
 ...-fixtures.js.es6 => directory-fixtures.js} |  0
 ..._fixtures.js.es6 => discovery_fixtures.js} |  0
 .../fixtures/{draft.js.es6 => draft.js}       |  0
 .../fixtures/{drafts.js.es6 => drafts.js}     |  0
 ...roup-fixtures.js.es6 => group-fixtures.js} |  0
 ...ups-fixtures.js.es6 => groups-fixtures.js} |  0
 ...xtures.js.es6 => notification_fixtures.js} |  0
 .../fixtures/{poll.js.es6 => poll.js}         |  0
 .../fixtures/{post.js.es6 => post.js}         |  0
 ...es.js.es6 => private_messages_fixtures.js} |  0
 .../fixtures/{problems.js.es6 => problems.js} |  0
 .../fixtures/{reports.js.es6 => reports.js}   |  0
 .../{reports_bulk.js.es6 => reports_bulk.js}  |  0
 ...rch-fixtures.js.es6 => search-fixtures.js} |  0
 ...on-fixtures.js.es6 => session-fixtures.js} |  0
 ...{site-fixtures.js.es6 => site-fixtures.js} |  0
 ...{site_settings.js.es6 => site_settings.js} |  0
 ...tic_fixtures.js.es6 => static_fixtures.js} |  0
 .../{top_fixture.js.es6 => top_fixture.js}    |  0
 .../fixtures/{topic.js.es6 => topic.js}       |  0
 .../{user-badges.js.es6 => user-badges.js}    |  0
 ...{user_fixtures.js.es6 => user_fixtures.js} |  0
 ...tures.js.es6 => watched-words-fixtures.js} |  0
 test/javascripts/helpers/assertions.js        | 13 ++++---
 ...omponent-test.js.es6 => component-test.js} |  0
 ...e-pretender.js.es6 => create-pretender.js} |  0
 .../{create-store.js.es6 => create-store.js}  |  0
 ...ditor-helper.js.es6 => d-editor-helper.js} |  0
 ...-pretender.js.es6 => fixture-pretender.js} |  0
 .../{html-helper.js.es6 => html-helper.js}    |  0
 test/javascripts/helpers/init-ember-qunit.js  |  2 -
 ...{qunit-helpers.js.es6 => qunit-helpers.js} |  0
 ...w-pretender.js.es6 => review-pretender.js} |  0
 ...kit-helper.js.es6 => select-kit-helper.js} |  0
 test/javascripts/helpers/site-settings.js     | 10 +++--
 .../helpers/{site.js.es6 => site.js}          |  0
 ...re-pretender.js.es6 => store-pretender.js} |  0
 ...er.js.es6 => textarea-selection-helper.js} |  0
 .../{widget-test.js.es6 => widget-test.js}    |  0
 ...ation-test.js.es6 => localization-test.js} |  0
 .../{bbcode-test.js.es6 => bbcode-test.js}    |  0
 ...tring-test.js.es6 => break-string-test.js} |  0
 ...dge-test.js.es6 => category-badge-test.js} |  0
 ...s.es6 => click-track-edit-history-test.js} |  0
 ...s.es6 => click-track-profile-page-test.js} |  0
 ...-track-test.js.es6 => click-track-test.js} |  0
 ...{computed-test.js.es6 => computed-test.js} |  0
 ...iscourse-test.js.es6 => discourse-test.js} |  0
 ...-store-test.js.es6 => emoji-store-test.js} |  0
 .../lib/{emoji-test.js.es6 => emoji-test.js}  |  0
 ...ormatter-test.js.es6 => formatter-test.js} |  0
 ...ext-test.js.es6 => highlight-text-test.js} |  0
 .../lib/{i18n-test.js.es6 => i18n-test.js}    |  0
 ...brary-test.js.es6 => icon-library-test.js} |  0
 ...re-test.js.es6 => key-value-store-test.js} |  0
 ...ions-test.js.es6 => link-mentions-test.js} |  0
 ...script-test.js.es6 => load-script-test.js} |  0
 ...{oneboxer-test.js.es6 => oneboxer-test.js} |  0
 ...tore-test.js.es6 => preload-store-test.js} |  0
 ...y-text-test.js.es6 => pretty-text-test.js} |  0
 ...anitizer-test.js.es6 => sanitizer-test.js} |  0
 ...track-test.js.es6 => screen-track-test.js} |  0
 .../{search-test.js.es6 => search-test.js}    |  0
 .../{sharing-test.js.es6 => sharing-test.js}  |  0
 ...ion-test.js.es6 => text-direction-test.js} |  0
 ...rkdown-test.js.es6 => to-markdown-test.js} |  0
 .../{tooltip-test.js.es6 => tooltip-test.js}  |  0
 ...l-test.js.es6 => upload-short-url-test.js} |  0
 .../{uploads-test.js.es6 => uploads-test.js}  |  0
 .../lib/{url-test.js.es6 => url-test.js}      |  0
 ...search-test.js.es6 => user-search-test.js} |  0
 ...tilities-test.js.es6 => utilities-test.js} |  0
 ...ister-test.js.es6 => white-lister-test.js} |  0
 ....js.es6 => grant-badge-controller-test.js} |  0
 ...ect-test.js.es6 => setting-object-test.js} |  0
 ...ingleton-test.js.es6 => singleton-test.js} |  0
 .../{badge-test.js.es6 => badge-test.js}      |  0
 ...{category-test.js.es6 => category-test.js} |  0
 ...{composer-test.js.es6 => composer-test.js} |  0
 ...mail-log-test.js.es6 => email-log-test.js} |  0
 .../{group-test.js.es6 => group-test.js}      |  0
 .../{invite-test.js.es6 => invite-test.js}    |  0
 ...{nav-item-test.js.es6 => nav-item-test.js} |  0
 ...stream-test.js.es6 => post-stream-test.js} |  0
 .../models/{post-test.js.es6 => post-test.js} |  0
 .../{report-test.js.es6 => report-test.js}    |  0
 ...t-model-test.js.es6 => rest-model-test.js} |  0
 ...ult-set-test.js.es6 => result-set-test.js} |  0
 .../{session-test.js.es6 => session-test.js}  |  0
 .../models/{site-test.js.es6 => site-test.js} |  0
 ...g-test.js.es6 => staff-action-log-test.js} |  0
 .../{store-test.js.es6 => store-test.js}      |  0
 ...ails-test.js.es6 => topic-details-test.js} |  0
 .../{topic-test.js.es6 => topic-test.js}      |  0
 ...st.js.es6 => topic-tracking-state-test.js} |  0
 ...action-test.js.es6 => user-action-test.js} |  0
 ...r-badge-test.js.es6 => user-badge-test.js} |  0
 ...drafts-test.js.es6 => user-drafts-test.js} |  0
 ...stream-test.js.es6 => user-stream-test.js} |  0
 .../models/{user-test.js.es6 => user-test.js} |  0
 ...orators-test.js.es6 => decorators-test.js} |  0
 ...ry-test.js.es6 => actions-summary-test.js} |  0
 ...flair-test.js.es6 => avatar-flair-test.js} |  0
 .../{button-test.js.es6 => button-test.js}    |  0
 ....es6 => default-notification-item-test.js} |  0
 ...enu-test.js.es6 => hamburger-menu-test.js} |  0
 .../{header-test.js.es6 => header-test.js}    |  0
 ...ome-logo-test.js.es6 => home-logo-test.js} |  0
 ...t-links-test.js.es6 => post-links-test.js} |  0
 ...stream-test.js.es6 => post-stream-test.js} |  0
 .../{post-test.js.es6 => post-test.js}        |  0
 ...r-name-test.js.es6 => poster-name-test.js} |  0
 ...-test.js.es6 => quick-access-item-test.js} |  0
 ...u-test.js.es6 => topic-admin-menu-test.js} |  0
 ...-test.js.es6 => topic-participant-test.js} |  0
 ...tatus-test.js.es6 => topic-status-test.js} |  0
 ...ser-menu-test.js.es6 => user-menu-test.js} |  0
 .../{widget-test.js.es6 => widget-test.js}    |  0
 281 files changed, 35 insertions(+), 29 deletions(-)
 rename test/javascripts/acceptance/{about-test.js.es6 => about-test.js} (100%)
 rename test/javascripts/acceptance/{account-created-test.js.es6 => account-created-test.js} (100%)
 rename test/javascripts/acceptance/{admin-emails-test.js.es6 => admin-emails-test.js} (100%)
 rename test/javascripts/acceptance/{admin-search-log-term-test.js.es6 => admin-search-log-term-test.js} (100%)
 rename test/javascripts/acceptance/{admin-search-logs-test.js.es6 => admin-search-logs-test.js} (100%)
 rename test/javascripts/acceptance/{admin-site-settings-test.js.es6 => admin-site-settings-test.js} (100%)
 rename test/javascripts/acceptance/{admin-site-text-test.js.es6 => admin-site-text-test.js} (100%)
 rename test/javascripts/acceptance/{admin-suspend-user-test.js.es6 => admin-suspend-user-test.js} (100%)
 rename test/javascripts/acceptance/{admin-user-badges-test.js.es6 => admin-user-badges-test.js} (100%)
 rename test/javascripts/acceptance/{admin-user-emails-test.js.es6 => admin-user-emails-test.js} (100%)
 rename test/javascripts/acceptance/{admin-user-index-test.js.es6 => admin-user-index-test.js} (100%)
 rename test/javascripts/acceptance/{admin-users-list-test.js.es6 => admin-users-list-test.js} (100%)
 rename test/javascripts/acceptance/{admin-watched-words-test.js.es6 => admin-watched-words-test.js} (100%)
 rename test/javascripts/acceptance/{auth-complete-test.js.es6 => auth-complete-test.js} (100%)
 rename test/javascripts/acceptance/{badges-test.js.es6 => badges-test.js} (100%)
 rename test/javascripts/acceptance/{category-chooser-test.js.es6 => category-chooser-test.js} (100%)
 rename test/javascripts/acceptance/{category-edit-security-test.js.es6 => category-edit-security-test.js} (100%)
 rename test/javascripts/acceptance/{category-edit-test.js.es6 => category-edit-test.js} (100%)
 rename test/javascripts/acceptance/{category-hashtag-test.js.es6 => category-hashtag-test.js} (100%)
 rename test/javascripts/acceptance/{click-track-test.js.es6 => click-track-test.js} (100%)
 rename test/javascripts/acceptance/{composer-actions-test.js.es6 => composer-actions-test.js} (100%)
 rename test/javascripts/acceptance/{composer-attachment-test.js.es6 => composer-attachment-test.js} (100%)
 rename test/javascripts/acceptance/{composer-edit-conflict-test.js.es6 => composer-edit-conflict-test.js} (100%)
 rename test/javascripts/acceptance/{composer-hyperlink-test.js.es6 => composer-hyperlink-test.js} (100%)
 rename test/javascripts/acceptance/{composer-onebox-test.js.es6 => composer-onebox-test.js} (100%)
 rename test/javascripts/acceptance/{composer-test.js.es6 => composer-test.js} (100%)
 rename test/javascripts/acceptance/{composer-topic-links-test.js.es6 => composer-topic-links-test.js} (100%)
 rename test/javascripts/acceptance/{composer-uncategorized-test.js.es6 => composer-uncategorized-test.js} (100%)
 rename test/javascripts/acceptance/{create-account-user-fields-test.js.es6 => create-account-user-fields-test.js} (100%)
 rename test/javascripts/acceptance/{custom-html-set-test.js.es6 => custom-html-set-test.js} (100%)
 rename test/javascripts/acceptance/{custom-html-template-test.js.es6 => custom-html-template-test.js} (100%)
 rename test/javascripts/acceptance/{dashboard-test.js.es6 => dashboard-test.js} (100%)
 rename test/javascripts/acceptance/{email-notice-test.js.es6 => email-notice-test.js} (100%)
 rename test/javascripts/acceptance/{emoji-picker-test.js.es6 => emoji-picker-test.js} (100%)
 rename test/javascripts/acceptance/{emoji-test.js.es6 => emoji-test.js} (100%)
 rename test/javascripts/acceptance/{enforce-second-factor-test.js.es6 => enforce-second-factor-test.js} (100%)
 rename test/javascripts/acceptance/{forgot-password-test.js.es6 => forgot-password-test.js} (100%)
 rename test/javascripts/acceptance/{group-card-mobile-test.js.es6 => group-card-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{group-card-test.js.es6 => group-card-test.js} (100%)
 rename test/javascripts/acceptance/{group-index-test.js.es6 => group-index-test.js} (100%)
 rename test/javascripts/acceptance/{group-manage-interaction-test.js.es6 => group-manage-interaction-test.js} (100%)
 rename test/javascripts/acceptance/{group-manage-logs-test.js.es6 => group-manage-logs-test.js} (100%)
 rename test/javascripts/acceptance/{group-manage-membership-test.js.es6 => group-manage-membership-test.js} (100%)
 rename test/javascripts/acceptance/{group-manage-profile-test.js.es6 => group-manage-profile-test.js} (100%)
 rename test/javascripts/acceptance/{group-requests-test.js.es6 => group-requests-test.js} (100%)
 rename test/javascripts/acceptance/{group-test.js.es6 => group-test.js} (100%)
 rename test/javascripts/acceptance/{groups-index-test.js.es6 => groups-index-test.js} (100%)
 rename test/javascripts/acceptance/{groups-new-test.js.es6 => groups-new-test.js} (100%)
 rename test/javascripts/acceptance/{invite-accept-test.js.es6 => invite-accept-test.js} (100%)
 rename test/javascripts/acceptance/{invite-show-user-fields-test.js.es6 => invite-show-user-fields-test.js} (100%)
 rename test/javascripts/acceptance/{jump-to-test.js.es6 => jump-to-test.js} (100%)
 rename test/javascripts/acceptance/{keyboard-shortcuts-test.js.es6 => keyboard-shortcuts-test.js} (100%)
 rename test/javascripts/acceptance/{login-redirect-test.js.es6 => login-redirect-test.js} (100%)
 rename test/javascripts/acceptance/{login-required-test.js.es6 => login-required-test.js} (100%)
 rename test/javascripts/acceptance/{login-with-email-and-hide-email-address-taken-test.js.es6 => login-with-email-and-hide-email-address-taken-test.js} (100%)
 rename test/javascripts/acceptance/{login-with-email-and-no-social-logins-test.js.es6 => login-with-email-and-no-social-logins-test.js} (100%)
 rename test/javascripts/acceptance/{login-with-email-disabled-test.js.es6 => login-with-email-disabled-test.js} (100%)
 rename test/javascripts/acceptance/{login-with-email-test.js.es6 => login-with-email-test.js} (100%)
 rename test/javascripts/acceptance/{mobile-discovery-test.js.es6 => mobile-discovery-test.js} (100%)
 rename test/javascripts/acceptance/{mobile-sign-in-test.js.es6 => mobile-sign-in-test.js} (100%)
 rename test/javascripts/acceptance/{mobile-users-test.js.es6 => mobile-users-test.js} (100%)
 rename test/javascripts/acceptance/{modal-test.js.es6 => modal-test.js} (100%)
 rename test/javascripts/acceptance/{new-message-test.js.es6 => new-message-test.js} (100%)
 rename test/javascripts/acceptance/{new-topic-test.js.es6 => new-topic-test.js} (100%)
 rename test/javascripts/acceptance/{password-reset-test.js.es6 => password-reset-test.js} (100%)
 rename test/javascripts/acceptance/{personal-message-test.js.es6 => personal-message-test.js} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-connector-class-test.js.es6 => plugin-outlet-connector-class-test.js} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-decorator-test.js.es6 => plugin-outlet-decorator-test.js} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-multi-template-test.js.es6 => plugin-outlet-multi-template-test.js} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-single-template-test.js.es6 => plugin-outlet-single-template-test.js} (100%)
 rename test/javascripts/acceptance/{preferences-test.js.es6 => preferences-test.js} (100%)
 rename test/javascripts/acceptance/{raw-plugin-outlet-test.js.es6 => raw-plugin-outlet-test.js} (100%)
 rename test/javascripts/acceptance/{redirect-to-top-test.js.es6 => redirect-to-top-test.js} (100%)
 rename test/javascripts/acceptance/{reports-test.js.es6 => reports-test.js} (100%)
 rename test/javascripts/acceptance/{review-test.js.es6 => review-test.js} (100%)
 rename test/javascripts/acceptance/{search-full-test.js.es6 => search-full-test.js} (100%)
 rename test/javascripts/acceptance/{search-mobile-test.js.es6 => search-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{search-test.js.es6 => search-test.js} (100%)
 rename test/javascripts/acceptance/{share-and-invite-desktop-test.js.es6 => share-and-invite-desktop-test.js} (100%)
 rename test/javascripts/acceptance/{share-and-invite-mobile-test.js.es6 => share-and-invite-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{shared-drafts-test.js.es6 => shared-drafts-test.js} (100%)
 rename test/javascripts/acceptance/{sign-in-test.js.es6 => sign-in-test.js} (100%)
 rename test/javascripts/acceptance/{static-test.js.es6 => static-test.js} (100%)
 rename test/javascripts/acceptance/{tag-groups-test.js.es6 => tag-groups-test.js} (100%)
 rename test/javascripts/acceptance/{tag-hashtag-test.js.es6 => tag-hashtag-test.js} (100%)
 rename test/javascripts/acceptance/{tags-intersection-test.js.es6 => tags-intersection-test.js} (100%)
 rename test/javascripts/acceptance/{tags-test.js.es6 => tags-test.js} (100%)
 rename test/javascripts/acceptance/{topic-anonymous-test.js.es6 => topic-anonymous-test.js} (100%)
 rename test/javascripts/acceptance/{topic-discovery-test.js.es6 => topic-discovery-test.js} (100%)
 rename test/javascripts/acceptance/{topic-edit-timer-test.js.es6 => topic-edit-timer-test.js} (100%)
 rename test/javascripts/acceptance/{topic-footer-buttons-mobile-test.js.es6 => topic-footer-buttons-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{topic-move-posts-test.js.es6 => topic-move-posts-test.js} (100%)
 rename test/javascripts/acceptance/{topic-notifications-button-test.js.es6 => topic-notifications-button-test.js} (100%)
 rename test/javascripts/acceptance/{topic-test.js.es6 => topic-test.js} (100%)
 rename test/javascripts/acceptance/{unknown-test.js.es6 => unknown-test.js} (100%)
 rename test/javascripts/acceptance/{user-anonymous-test.js.es6 => user-anonymous-test.js} (100%)
 rename test/javascripts/acceptance/{user-card-mobile-test.js.es6 => user-card-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{user-card-test.js.es6 => user-card-test.js} (100%)
 rename test/javascripts/acceptance/{user-drafts-stream-test.js.es6 => user-drafts-stream-test.js} (100%)
 rename test/javascripts/acceptance/{user-test.js.es6 => user-test.js} (100%)
 rename test/javascripts/acceptance/{users-test.js.es6 => users-test.js} (100%)
 rename test/javascripts/admin/components/{group-list-setting-test.js.es6 => group-list-setting-test.js} (100%)
 rename test/javascripts/admin/components/{themes-list-item-test.js.es6 => themes-list-item-test.js} (100%)
 rename test/javascripts/admin/components/{themes-list-test.js.es6 => themes-list-test.js} (100%)
 rename test/javascripts/admin/controllers/{admin-customize-themes-show-test.js.es6 => admin-customize-themes-show-test.js} (100%)
 rename test/javascripts/admin/controllers/{admin-customize-themes-test.js.es6 => admin-customize-themes-test.js} (100%)
 rename test/javascripts/admin/controllers/{admin-user-badges-test.js.es6 => admin-user-badges-test.js} (100%)
 rename test/javascripts/admin/models/{theme-test.js.es6 => theme-test.js} (100%)
 rename test/javascripts/components/{ace-editor-test.js.es6 => ace-editor-test.js} (100%)
 rename test/javascripts/components/{admin-report-test.js.es6 => admin-report-test.js} (100%)
 rename test/javascripts/components/{badge-title-test.js.es6 => badge-title-test.js} (100%)
 rename test/javascripts/components/{d-button-test.js.es6 => d-button-test.js} (100%)
 rename test/javascripts/components/{d-editor-test.js.es6 => d-editor-test.js} (100%)
 rename test/javascripts/components/{d-icon-test.js.es6 => d-icon-test.js} (100%)
 rename test/javascripts/components/{date-input-test.js.es6 => date-input-test.js} (100%)
 rename test/javascripts/components/{date-time-input-range-test.js.es6 => date-time-input-range-test.js} (100%)
 rename test/javascripts/components/{date-time-input-test.js.es6 => date-time-input-test.js} (100%)
 rename test/javascripts/components/{group-membership-button-test.js.es6 => group-membership-button-test.js} (100%)
 rename test/javascripts/components/{html-safe-helper-test.js.es6 => html-safe-helper-test.js} (100%)
 rename test/javascripts/components/{iframed-html-test.js.es6 => iframed-html-test.js} (100%)
 rename test/javascripts/components/{image-uploader-test.js.es6 => image-uploader-test.js} (100%)
 rename test/javascripts/components/{keyboard-shortcuts-test.js.es6 => keyboard-shortcuts-test.js} (100%)
 rename test/javascripts/components/{load-more-test.js.es6 => load-more-test.js} (100%)
 rename test/javascripts/components/{secret-value-list-test.js.es6 => secret-value-list-test.js} (100%)
 rename test/javascripts/components/select-kit/{category-chooser-test.js.es6 => category-chooser-test.js} (100%)
 rename test/javascripts/components/select-kit/{category-drop-test.js.es6 => category-drop-test.js} (100%)
 rename test/javascripts/components/select-kit/{combo-box-test.js.es6 => combo-box-test.js} (100%)
 rename test/javascripts/components/select-kit/{dropdown-select-box-test.js.es6 => dropdown-select-box-test.js} (100%)
 rename test/javascripts/components/select-kit/{list-setting-test.js.es6 => list-setting-test.js} (100%)
 rename test/javascripts/components/select-kit/{mini-tag-chooser-test.js.es6 => mini-tag-chooser-test.js} (100%)
 rename test/javascripts/components/select-kit/{multi-select-test.js.es6 => multi-select-test.js} (100%)
 rename test/javascripts/components/select-kit/{notifications-button-test.js.es6 => notifications-button-test.js} (100%)
 rename test/javascripts/components/select-kit/{pinned-options-test.js.es6 => pinned-options-test.js} (100%)
 rename test/javascripts/components/select-kit/{select-kit-test-helper.js.es6 => select-kit-test-helper.js} (100%)
 rename test/javascripts/components/select-kit/{single-select-test.js.es6 => single-select-test.js} (100%)
 rename test/javascripts/components/select-kit/{tag-drop-test.js.es6 => tag-drop-test.js} (100%)
 rename test/javascripts/components/select-kit/{topic-notifications-button-test.js.es6 => topic-notifications-button-test.js} (100%)
 rename test/javascripts/components/select-kit/{topic-notifications-options-test.js.es6 => topic-notifications-options-test.js} (100%)
 rename test/javascripts/components/select-kit/{user-chooser-test.js.es6 => user-chooser-test.js} (100%)
 rename test/javascripts/components/{share-button-test.js.es6 => share-button-test.js} (100%)
 rename test/javascripts/components/{share-button.js.es6 => share-button.js} (100%)
 rename test/javascripts/components/{text-field-test.js.es6 => text-field-test.js} (100%)
 rename test/javascripts/components/{text-overflow-test.js.es6 => text-overflow-test.js} (100%)
 rename test/javascripts/components/{time-input-test.js.es6 => time-input-test.js} (100%)
 rename test/javascripts/components/{user-selector-test.js.es6 => user-selector-test.js} (100%)
 rename test/javascripts/components/{value-list-test.js.es6 => value-list-test.js} (100%)
 rename test/javascripts/controllers/{avatar-selector-test.js.es6 => avatar-selector-test.js} (100%)
 rename test/javascripts/controllers/{bookmark-test.js.es6 => bookmark-test.js} (100%)
 rename test/javascripts/controllers/{create-account-test.js.es6 => create-account-test.js} (100%)
 rename test/javascripts/controllers/{group-test.js.es6 => group-test.js} (100%)
 rename test/javascripts/controllers/{history-test.js.es6 => history-test.js} (100%)
 rename test/javascripts/controllers/{preferences-account-test.js.es6 => preferences-account-test.js} (100%)
 rename test/javascripts/controllers/{preferences-second-factor-test.js.es6 => preferences-second-factor-test.js} (100%)
 rename test/javascripts/controllers/{reorder-categories-test.js.es6 => reorder-categories-test.js} (100%)
 rename test/javascripts/controllers/{topic-test.js.es6 => topic-test.js} (100%)
 rename test/javascripts/ember/{resolver-test.js.es6 => resolver-test.js} (100%)
 rename test/javascripts/fixtures/{about.js.es6 => about.js} (100%)
 rename test/javascripts/fixtures/{badges_fixture.js.es6 => badges_fixture.js} (100%)
 rename test/javascripts/fixtures/{category-fixtures.js.es6 => category-fixtures.js} (100%)
 rename test/javascripts/fixtures/concerns/{notification-types.js.es6.erb => notification-types.js.erb} (100%)
 rename test/javascripts/fixtures/{dashboard-general.js.es6 => dashboard-general.js} (100%)
 rename test/javascripts/fixtures/{dashboard.js.es6 => dashboard.js} (100%)
 rename test/javascripts/fixtures/{directory-fixtures.js.es6 => directory-fixtures.js} (100%)
 rename test/javascripts/fixtures/{discovery_fixtures.js.es6 => discovery_fixtures.js} (100%)
 rename test/javascripts/fixtures/{draft.js.es6 => draft.js} (100%)
 rename test/javascripts/fixtures/{drafts.js.es6 => drafts.js} (100%)
 rename test/javascripts/fixtures/{group-fixtures.js.es6 => group-fixtures.js} (100%)
 rename test/javascripts/fixtures/{groups-fixtures.js.es6 => groups-fixtures.js} (100%)
 rename test/javascripts/fixtures/{notification_fixtures.js.es6 => notification_fixtures.js} (100%)
 rename test/javascripts/fixtures/{poll.js.es6 => poll.js} (100%)
 rename test/javascripts/fixtures/{post.js.es6 => post.js} (100%)
 rename test/javascripts/fixtures/{private_messages_fixtures.js.es6 => private_messages_fixtures.js} (100%)
 rename test/javascripts/fixtures/{problems.js.es6 => problems.js} (100%)
 rename test/javascripts/fixtures/{reports.js.es6 => reports.js} (100%)
 rename test/javascripts/fixtures/{reports_bulk.js.es6 => reports_bulk.js} (100%)
 rename test/javascripts/fixtures/{search-fixtures.js.es6 => search-fixtures.js} (100%)
 rename test/javascripts/fixtures/{session-fixtures.js.es6 => session-fixtures.js} (100%)
 rename test/javascripts/fixtures/{site-fixtures.js.es6 => site-fixtures.js} (100%)
 rename test/javascripts/fixtures/{site_settings.js.es6 => site_settings.js} (100%)
 rename test/javascripts/fixtures/{static_fixtures.js.es6 => static_fixtures.js} (100%)
 rename test/javascripts/fixtures/{top_fixture.js.es6 => top_fixture.js} (100%)
 rename test/javascripts/fixtures/{topic.js.es6 => topic.js} (100%)
 rename test/javascripts/fixtures/{user-badges.js.es6 => user-badges.js} (100%)
 rename test/javascripts/fixtures/{user_fixtures.js.es6 => user_fixtures.js} (100%)
 rename test/javascripts/fixtures/{watched-words-fixtures.js.es6 => watched-words-fixtures.js} (100%)
 rename test/javascripts/helpers/{component-test.js.es6 => component-test.js} (100%)
 rename test/javascripts/helpers/{create-pretender.js.es6 => create-pretender.js} (100%)
 rename test/javascripts/helpers/{create-store.js.es6 => create-store.js} (100%)
 rename test/javascripts/helpers/{d-editor-helper.js.es6 => d-editor-helper.js} (100%)
 rename test/javascripts/helpers/{fixture-pretender.js.es6 => fixture-pretender.js} (100%)
 rename test/javascripts/helpers/{html-helper.js.es6 => html-helper.js} (100%)
 delete mode 100644 test/javascripts/helpers/init-ember-qunit.js
 rename test/javascripts/helpers/{qunit-helpers.js.es6 => qunit-helpers.js} (100%)
 rename test/javascripts/helpers/{review-pretender.js.es6 => review-pretender.js} (100%)
 rename test/javascripts/helpers/{select-kit-helper.js.es6 => select-kit-helper.js} (100%)
 rename test/javascripts/helpers/{site.js.es6 => site.js} (100%)
 rename test/javascripts/helpers/{store-pretender.js.es6 => store-pretender.js} (100%)
 rename test/javascripts/helpers/{textarea-selection-helper.js.es6 => textarea-selection-helper.js} (100%)
 rename test/javascripts/helpers/{widget-test.js.es6 => widget-test.js} (100%)
 rename test/javascripts/initializers/{localization-test.js.es6 => localization-test.js} (100%)
 rename test/javascripts/lib/{bbcode-test.js.es6 => bbcode-test.js} (100%)
 rename test/javascripts/lib/{break-string-test.js.es6 => break-string-test.js} (100%)
 rename test/javascripts/lib/{category-badge-test.js.es6 => category-badge-test.js} (100%)
 rename test/javascripts/lib/{click-track-edit-history-test.js.es6 => click-track-edit-history-test.js} (100%)
 rename test/javascripts/lib/{click-track-profile-page-test.js.es6 => click-track-profile-page-test.js} (100%)
 rename test/javascripts/lib/{click-track-test.js.es6 => click-track-test.js} (100%)
 rename test/javascripts/lib/{computed-test.js.es6 => computed-test.js} (100%)
 rename test/javascripts/lib/{discourse-test.js.es6 => discourse-test.js} (100%)
 rename test/javascripts/lib/{emoji-store-test.js.es6 => emoji-store-test.js} (100%)
 rename test/javascripts/lib/{emoji-test.js.es6 => emoji-test.js} (100%)
 rename test/javascripts/lib/{formatter-test.js.es6 => formatter-test.js} (100%)
 rename test/javascripts/lib/{highlight-text-test.js.es6 => highlight-text-test.js} (100%)
 rename test/javascripts/lib/{i18n-test.js.es6 => i18n-test.js} (100%)
 rename test/javascripts/lib/{icon-library-test.js.es6 => icon-library-test.js} (100%)
 rename test/javascripts/lib/{key-value-store-test.js.es6 => key-value-store-test.js} (100%)
 rename test/javascripts/lib/{link-mentions-test.js.es6 => link-mentions-test.js} (100%)
 rename test/javascripts/lib/{load-script-test.js.es6 => load-script-test.js} (100%)
 rename test/javascripts/lib/{oneboxer-test.js.es6 => oneboxer-test.js} (100%)
 rename test/javascripts/lib/{preload-store-test.js.es6 => preload-store-test.js} (100%)
 rename test/javascripts/lib/{pretty-text-test.js.es6 => pretty-text-test.js} (100%)
 rename test/javascripts/lib/{sanitizer-test.js.es6 => sanitizer-test.js} (100%)
 rename test/javascripts/lib/{screen-track-test.js.es6 => screen-track-test.js} (100%)
 rename test/javascripts/lib/{search-test.js.es6 => search-test.js} (100%)
 rename test/javascripts/lib/{sharing-test.js.es6 => sharing-test.js} (100%)
 rename test/javascripts/lib/{text-direction-test.js.es6 => text-direction-test.js} (100%)
 rename test/javascripts/lib/{to-markdown-test.js.es6 => to-markdown-test.js} (100%)
 rename test/javascripts/lib/{tooltip-test.js.es6 => tooltip-test.js} (100%)
 rename test/javascripts/lib/{upload-short-url-test.js.es6 => upload-short-url-test.js} (100%)
 rename test/javascripts/lib/{uploads-test.js.es6 => uploads-test.js} (100%)
 rename test/javascripts/lib/{url-test.js.es6 => url-test.js} (100%)
 rename test/javascripts/lib/{user-search-test.js.es6 => user-search-test.js} (100%)
 rename test/javascripts/lib/{utilities-test.js.es6 => utilities-test.js} (100%)
 rename test/javascripts/lib/{white-lister-test.js.es6 => white-lister-test.js} (100%)
 rename test/javascripts/mixins/{grant-badge-controller-test.js.es6 => grant-badge-controller-test.js} (100%)
 rename test/javascripts/mixins/{setting-object-test.js.es6 => setting-object-test.js} (100%)
 rename test/javascripts/mixins/{singleton-test.js.es6 => singleton-test.js} (100%)
 rename test/javascripts/models/{badge-test.js.es6 => badge-test.js} (100%)
 rename test/javascripts/models/{category-test.js.es6 => category-test.js} (100%)
 rename test/javascripts/models/{composer-test.js.es6 => composer-test.js} (100%)
 rename test/javascripts/models/{email-log-test.js.es6 => email-log-test.js} (100%)
 rename test/javascripts/models/{group-test.js.es6 => group-test.js} (100%)
 rename test/javascripts/models/{invite-test.js.es6 => invite-test.js} (100%)
 rename test/javascripts/models/{nav-item-test.js.es6 => nav-item-test.js} (100%)
 rename test/javascripts/models/{post-stream-test.js.es6 => post-stream-test.js} (100%)
 rename test/javascripts/models/{post-test.js.es6 => post-test.js} (100%)
 rename test/javascripts/models/{report-test.js.es6 => report-test.js} (100%)
 rename test/javascripts/models/{rest-model-test.js.es6 => rest-model-test.js} (100%)
 rename test/javascripts/models/{result-set-test.js.es6 => result-set-test.js} (100%)
 rename test/javascripts/models/{session-test.js.es6 => session-test.js} (100%)
 rename test/javascripts/models/{site-test.js.es6 => site-test.js} (100%)
 rename test/javascripts/models/{staff-action-log-test.js.es6 => staff-action-log-test.js} (100%)
 rename test/javascripts/models/{store-test.js.es6 => store-test.js} (100%)
 rename test/javascripts/models/{topic-details-test.js.es6 => topic-details-test.js} (100%)
 rename test/javascripts/models/{topic-test.js.es6 => topic-test.js} (100%)
 rename test/javascripts/models/{topic-tracking-state-test.js.es6 => topic-tracking-state-test.js} (100%)
 rename test/javascripts/models/{user-action-test.js.es6 => user-action-test.js} (100%)
 rename test/javascripts/models/{user-badge-test.js.es6 => user-badge-test.js} (100%)
 rename test/javascripts/models/{user-drafts-test.js.es6 => user-drafts-test.js} (100%)
 rename test/javascripts/models/{user-stream-test.js.es6 => user-stream-test.js} (100%)
 rename test/javascripts/models/{user-test.js.es6 => user-test.js} (100%)
 rename test/javascripts/utils/{decorators-test.js.es6 => decorators-test.js} (100%)
 rename test/javascripts/widgets/{actions-summary-test.js.es6 => actions-summary-test.js} (100%)
 rename test/javascripts/widgets/{avatar-flair-test.js.es6 => avatar-flair-test.js} (100%)
 rename test/javascripts/widgets/{button-test.js.es6 => button-test.js} (100%)
 rename test/javascripts/widgets/{default-notification-item-test.js.es6 => default-notification-item-test.js} (100%)
 rename test/javascripts/widgets/{hamburger-menu-test.js.es6 => hamburger-menu-test.js} (100%)
 rename test/javascripts/widgets/{header-test.js.es6 => header-test.js} (100%)
 rename test/javascripts/widgets/{home-logo-test.js.es6 => home-logo-test.js} (100%)
 rename test/javascripts/widgets/{post-links-test.js.es6 => post-links-test.js} (100%)
 rename test/javascripts/widgets/{post-stream-test.js.es6 => post-stream-test.js} (100%)
 rename test/javascripts/widgets/{post-test.js.es6 => post-test.js} (100%)
 rename test/javascripts/widgets/{poster-name-test.js.es6 => poster-name-test.js} (100%)
 rename test/javascripts/widgets/{quick-access-item-test.js.es6 => quick-access-item-test.js} (100%)
 rename test/javascripts/widgets/{topic-admin-menu-test.js.es6 => topic-admin-menu-test.js} (100%)
 rename test/javascripts/widgets/{topic-participant-test.js.es6 => topic-participant-test.js} (100%)
 rename test/javascripts/widgets/{topic-status-test.js.es6 => topic-status-test.js} (100%)
 rename test/javascripts/widgets/{user-menu-test.js.es6 => user-menu-test.js} (100%)
 rename test/javascripts/widgets/{widget-test.js.es6 => widget-test.js} (100%)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index bbadfa84af..4060b16225 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -36,24 +36,27 @@ class DiscourseJsProcessor
     return false unless filename.end_with?(".js") || filename.end_with?(".js.erb")
 
     relative_path = filename.sub(Rails.root.to_s, '').sub(/^\/*/, '')
-    relative_path.start_with?("app/assets/javascripts/discourse/") ||
-      relative_path.start_with?("app/assets/javascripts/admin/") ||
-      relative_path.start_with?("app/assets/javascripts/pretty-text/") ||
-      relative_path.start_with?("app/assets/javascripts/select-kit/") ||
-      relative_path.start_with?("app/assets/javascripts/wizard/") ||
-      relative_path.start_with?("app/assets/javascripts/discourse-common/") ||
-      relative_path.start_with?("app/assets/javascripts/ember-addons/") ||
-      relative_path.start_with?("app/assets/javascripts/confirm-new-email/") ||
-      relative_path == "app/assets/javascripts/preload-store.js" ||
-      relative_path == "app/assets/javascripts/preload-application-data.js" ||
-      relative_path == "app/assets/javascripts/wizard-start.js" ||
-      relative_path == "app/assets/javascripts/onpopstate-handler.js" ||
-      relative_path == "app/assets/javascripts/discourse.js" ||
-      relative_path == "app/assets/javascripts/google-tag-manager.js" ||
-      relative_path == "app/assets/javascripts/google-universal-analytics.js" ||
-      relative_path == "app/assets/javascripts/activate-account.js" ||
-      relative_path == "app/assets/javascripts/auto-redirect.js" ||
-      relative_path == "app/assets/javascripts/embed-application.js"
+
+    js_root = "app/assets/javascripts"
+    test_root = "test/javascripts"
+
+    return false if relative_path.start_with?("#{js_root}/locales/")
+
+    return true if %w(
+      preload-store
+      preload-application-data
+      wizard-start
+      onpopstate-handler
+      discourse
+      google-tag-manager
+      google-universal-analytics.js
+      activate-account.js
+      auto-redirect.js
+      embed-application
+    ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
+
+    relative_path =~ /^#{js_root}\/[^\/]+\// ||
+      relative_path =~ /^#{test_root}\/[^\/]+\//
   end
 
   def self.skip_module?(data)
diff --git a/test/javascripts/acceptance/about-test.js.es6 b/test/javascripts/acceptance/about-test.js
similarity index 100%
rename from test/javascripts/acceptance/about-test.js.es6
rename to test/javascripts/acceptance/about-test.js
diff --git a/test/javascripts/acceptance/account-created-test.js.es6 b/test/javascripts/acceptance/account-created-test.js
similarity index 100%
rename from test/javascripts/acceptance/account-created-test.js.es6
rename to test/javascripts/acceptance/account-created-test.js
diff --git a/test/javascripts/acceptance/admin-emails-test.js.es6 b/test/javascripts/acceptance/admin-emails-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-emails-test.js.es6
rename to test/javascripts/acceptance/admin-emails-test.js
diff --git a/test/javascripts/acceptance/admin-search-log-term-test.js.es6 b/test/javascripts/acceptance/admin-search-log-term-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-search-log-term-test.js.es6
rename to test/javascripts/acceptance/admin-search-log-term-test.js
diff --git a/test/javascripts/acceptance/admin-search-logs-test.js.es6 b/test/javascripts/acceptance/admin-search-logs-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-search-logs-test.js.es6
rename to test/javascripts/acceptance/admin-search-logs-test.js
diff --git a/test/javascripts/acceptance/admin-site-settings-test.js.es6 b/test/javascripts/acceptance/admin-site-settings-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-site-settings-test.js.es6
rename to test/javascripts/acceptance/admin-site-settings-test.js
diff --git a/test/javascripts/acceptance/admin-site-text-test.js.es6 b/test/javascripts/acceptance/admin-site-text-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-site-text-test.js.es6
rename to test/javascripts/acceptance/admin-site-text-test.js
diff --git a/test/javascripts/acceptance/admin-suspend-user-test.js.es6 b/test/javascripts/acceptance/admin-suspend-user-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-suspend-user-test.js.es6
rename to test/javascripts/acceptance/admin-suspend-user-test.js
diff --git a/test/javascripts/acceptance/admin-user-badges-test.js.es6 b/test/javascripts/acceptance/admin-user-badges-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-user-badges-test.js.es6
rename to test/javascripts/acceptance/admin-user-badges-test.js
diff --git a/test/javascripts/acceptance/admin-user-emails-test.js.es6 b/test/javascripts/acceptance/admin-user-emails-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-user-emails-test.js.es6
rename to test/javascripts/acceptance/admin-user-emails-test.js
diff --git a/test/javascripts/acceptance/admin-user-index-test.js.es6 b/test/javascripts/acceptance/admin-user-index-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-user-index-test.js.es6
rename to test/javascripts/acceptance/admin-user-index-test.js
diff --git a/test/javascripts/acceptance/admin-users-list-test.js.es6 b/test/javascripts/acceptance/admin-users-list-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-users-list-test.js.es6
rename to test/javascripts/acceptance/admin-users-list-test.js
diff --git a/test/javascripts/acceptance/admin-watched-words-test.js.es6 b/test/javascripts/acceptance/admin-watched-words-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-watched-words-test.js.es6
rename to test/javascripts/acceptance/admin-watched-words-test.js
diff --git a/test/javascripts/acceptance/auth-complete-test.js.es6 b/test/javascripts/acceptance/auth-complete-test.js
similarity index 100%
rename from test/javascripts/acceptance/auth-complete-test.js.es6
rename to test/javascripts/acceptance/auth-complete-test.js
diff --git a/test/javascripts/acceptance/badges-test.js.es6 b/test/javascripts/acceptance/badges-test.js
similarity index 100%
rename from test/javascripts/acceptance/badges-test.js.es6
rename to test/javascripts/acceptance/badges-test.js
diff --git a/test/javascripts/acceptance/category-chooser-test.js.es6 b/test/javascripts/acceptance/category-chooser-test.js
similarity index 100%
rename from test/javascripts/acceptance/category-chooser-test.js.es6
rename to test/javascripts/acceptance/category-chooser-test.js
diff --git a/test/javascripts/acceptance/category-edit-security-test.js.es6 b/test/javascripts/acceptance/category-edit-security-test.js
similarity index 100%
rename from test/javascripts/acceptance/category-edit-security-test.js.es6
rename to test/javascripts/acceptance/category-edit-security-test.js
diff --git a/test/javascripts/acceptance/category-edit-test.js.es6 b/test/javascripts/acceptance/category-edit-test.js
similarity index 100%
rename from test/javascripts/acceptance/category-edit-test.js.es6
rename to test/javascripts/acceptance/category-edit-test.js
diff --git a/test/javascripts/acceptance/category-hashtag-test.js.es6 b/test/javascripts/acceptance/category-hashtag-test.js
similarity index 100%
rename from test/javascripts/acceptance/category-hashtag-test.js.es6
rename to test/javascripts/acceptance/category-hashtag-test.js
diff --git a/test/javascripts/acceptance/click-track-test.js.es6 b/test/javascripts/acceptance/click-track-test.js
similarity index 100%
rename from test/javascripts/acceptance/click-track-test.js.es6
rename to test/javascripts/acceptance/click-track-test.js
diff --git a/test/javascripts/acceptance/composer-actions-test.js.es6 b/test/javascripts/acceptance/composer-actions-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-actions-test.js.es6
rename to test/javascripts/acceptance/composer-actions-test.js
diff --git a/test/javascripts/acceptance/composer-attachment-test.js.es6 b/test/javascripts/acceptance/composer-attachment-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-attachment-test.js.es6
rename to test/javascripts/acceptance/composer-attachment-test.js
diff --git a/test/javascripts/acceptance/composer-edit-conflict-test.js.es6 b/test/javascripts/acceptance/composer-edit-conflict-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-edit-conflict-test.js.es6
rename to test/javascripts/acceptance/composer-edit-conflict-test.js
diff --git a/test/javascripts/acceptance/composer-hyperlink-test.js.es6 b/test/javascripts/acceptance/composer-hyperlink-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-hyperlink-test.js.es6
rename to test/javascripts/acceptance/composer-hyperlink-test.js
diff --git a/test/javascripts/acceptance/composer-onebox-test.js.es6 b/test/javascripts/acceptance/composer-onebox-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-onebox-test.js.es6
rename to test/javascripts/acceptance/composer-onebox-test.js
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-test.js.es6
rename to test/javascripts/acceptance/composer-test.js
diff --git a/test/javascripts/acceptance/composer-topic-links-test.js.es6 b/test/javascripts/acceptance/composer-topic-links-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-topic-links-test.js.es6
rename to test/javascripts/acceptance/composer-topic-links-test.js
diff --git a/test/javascripts/acceptance/composer-uncategorized-test.js.es6 b/test/javascripts/acceptance/composer-uncategorized-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-uncategorized-test.js.es6
rename to test/javascripts/acceptance/composer-uncategorized-test.js
diff --git a/test/javascripts/acceptance/create-account-user-fields-test.js.es6 b/test/javascripts/acceptance/create-account-user-fields-test.js
similarity index 100%
rename from test/javascripts/acceptance/create-account-user-fields-test.js.es6
rename to test/javascripts/acceptance/create-account-user-fields-test.js
diff --git a/test/javascripts/acceptance/custom-html-set-test.js.es6 b/test/javascripts/acceptance/custom-html-set-test.js
similarity index 100%
rename from test/javascripts/acceptance/custom-html-set-test.js.es6
rename to test/javascripts/acceptance/custom-html-set-test.js
diff --git a/test/javascripts/acceptance/custom-html-template-test.js.es6 b/test/javascripts/acceptance/custom-html-template-test.js
similarity index 100%
rename from test/javascripts/acceptance/custom-html-template-test.js.es6
rename to test/javascripts/acceptance/custom-html-template-test.js
diff --git a/test/javascripts/acceptance/dashboard-test.js.es6 b/test/javascripts/acceptance/dashboard-test.js
similarity index 100%
rename from test/javascripts/acceptance/dashboard-test.js.es6
rename to test/javascripts/acceptance/dashboard-test.js
diff --git a/test/javascripts/acceptance/email-notice-test.js.es6 b/test/javascripts/acceptance/email-notice-test.js
similarity index 100%
rename from test/javascripts/acceptance/email-notice-test.js.es6
rename to test/javascripts/acceptance/email-notice-test.js
diff --git a/test/javascripts/acceptance/emoji-picker-test.js.es6 b/test/javascripts/acceptance/emoji-picker-test.js
similarity index 100%
rename from test/javascripts/acceptance/emoji-picker-test.js.es6
rename to test/javascripts/acceptance/emoji-picker-test.js
diff --git a/test/javascripts/acceptance/emoji-test.js.es6 b/test/javascripts/acceptance/emoji-test.js
similarity index 100%
rename from test/javascripts/acceptance/emoji-test.js.es6
rename to test/javascripts/acceptance/emoji-test.js
diff --git a/test/javascripts/acceptance/enforce-second-factor-test.js.es6 b/test/javascripts/acceptance/enforce-second-factor-test.js
similarity index 100%
rename from test/javascripts/acceptance/enforce-second-factor-test.js.es6
rename to test/javascripts/acceptance/enforce-second-factor-test.js
diff --git a/test/javascripts/acceptance/forgot-password-test.js.es6 b/test/javascripts/acceptance/forgot-password-test.js
similarity index 100%
rename from test/javascripts/acceptance/forgot-password-test.js.es6
rename to test/javascripts/acceptance/forgot-password-test.js
diff --git a/test/javascripts/acceptance/group-card-mobile-test.js.es6 b/test/javascripts/acceptance/group-card-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-card-mobile-test.js.es6
rename to test/javascripts/acceptance/group-card-mobile-test.js
diff --git a/test/javascripts/acceptance/group-card-test.js.es6 b/test/javascripts/acceptance/group-card-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-card-test.js.es6
rename to test/javascripts/acceptance/group-card-test.js
diff --git a/test/javascripts/acceptance/group-index-test.js.es6 b/test/javascripts/acceptance/group-index-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-index-test.js.es6
rename to test/javascripts/acceptance/group-index-test.js
diff --git a/test/javascripts/acceptance/group-manage-interaction-test.js.es6 b/test/javascripts/acceptance/group-manage-interaction-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-manage-interaction-test.js.es6
rename to test/javascripts/acceptance/group-manage-interaction-test.js
diff --git a/test/javascripts/acceptance/group-manage-logs-test.js.es6 b/test/javascripts/acceptance/group-manage-logs-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-manage-logs-test.js.es6
rename to test/javascripts/acceptance/group-manage-logs-test.js
diff --git a/test/javascripts/acceptance/group-manage-membership-test.js.es6 b/test/javascripts/acceptance/group-manage-membership-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-manage-membership-test.js.es6
rename to test/javascripts/acceptance/group-manage-membership-test.js
diff --git a/test/javascripts/acceptance/group-manage-profile-test.js.es6 b/test/javascripts/acceptance/group-manage-profile-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-manage-profile-test.js.es6
rename to test/javascripts/acceptance/group-manage-profile-test.js
diff --git a/test/javascripts/acceptance/group-requests-test.js.es6 b/test/javascripts/acceptance/group-requests-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-requests-test.js.es6
rename to test/javascripts/acceptance/group-requests-test.js
diff --git a/test/javascripts/acceptance/group-test.js.es6 b/test/javascripts/acceptance/group-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-test.js.es6
rename to test/javascripts/acceptance/group-test.js
diff --git a/test/javascripts/acceptance/groups-index-test.js.es6 b/test/javascripts/acceptance/groups-index-test.js
similarity index 100%
rename from test/javascripts/acceptance/groups-index-test.js.es6
rename to test/javascripts/acceptance/groups-index-test.js
diff --git a/test/javascripts/acceptance/groups-new-test.js.es6 b/test/javascripts/acceptance/groups-new-test.js
similarity index 100%
rename from test/javascripts/acceptance/groups-new-test.js.es6
rename to test/javascripts/acceptance/groups-new-test.js
diff --git a/test/javascripts/acceptance/invite-accept-test.js.es6 b/test/javascripts/acceptance/invite-accept-test.js
similarity index 100%
rename from test/javascripts/acceptance/invite-accept-test.js.es6
rename to test/javascripts/acceptance/invite-accept-test.js
diff --git a/test/javascripts/acceptance/invite-show-user-fields-test.js.es6 b/test/javascripts/acceptance/invite-show-user-fields-test.js
similarity index 100%
rename from test/javascripts/acceptance/invite-show-user-fields-test.js.es6
rename to test/javascripts/acceptance/invite-show-user-fields-test.js
diff --git a/test/javascripts/acceptance/jump-to-test.js.es6 b/test/javascripts/acceptance/jump-to-test.js
similarity index 100%
rename from test/javascripts/acceptance/jump-to-test.js.es6
rename to test/javascripts/acceptance/jump-to-test.js
diff --git a/test/javascripts/acceptance/keyboard-shortcuts-test.js.es6 b/test/javascripts/acceptance/keyboard-shortcuts-test.js
similarity index 100%
rename from test/javascripts/acceptance/keyboard-shortcuts-test.js.es6
rename to test/javascripts/acceptance/keyboard-shortcuts-test.js
diff --git a/test/javascripts/acceptance/login-redirect-test.js.es6 b/test/javascripts/acceptance/login-redirect-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-redirect-test.js.es6
rename to test/javascripts/acceptance/login-redirect-test.js
diff --git a/test/javascripts/acceptance/login-required-test.js.es6 b/test/javascripts/acceptance/login-required-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-required-test.js.es6
rename to test/javascripts/acceptance/login-required-test.js
diff --git a/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6 b/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6
rename to test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js
diff --git a/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6 b/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6
rename to test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js
diff --git a/test/javascripts/acceptance/login-with-email-disabled-test.js.es6 b/test/javascripts/acceptance/login-with-email-disabled-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-disabled-test.js.es6
rename to test/javascripts/acceptance/login-with-email-disabled-test.js
diff --git a/test/javascripts/acceptance/login-with-email-test.js.es6 b/test/javascripts/acceptance/login-with-email-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-test.js.es6
rename to test/javascripts/acceptance/login-with-email-test.js
diff --git a/test/javascripts/acceptance/mobile-discovery-test.js.es6 b/test/javascripts/acceptance/mobile-discovery-test.js
similarity index 100%
rename from test/javascripts/acceptance/mobile-discovery-test.js.es6
rename to test/javascripts/acceptance/mobile-discovery-test.js
diff --git a/test/javascripts/acceptance/mobile-sign-in-test.js.es6 b/test/javascripts/acceptance/mobile-sign-in-test.js
similarity index 100%
rename from test/javascripts/acceptance/mobile-sign-in-test.js.es6
rename to test/javascripts/acceptance/mobile-sign-in-test.js
diff --git a/test/javascripts/acceptance/mobile-users-test.js.es6 b/test/javascripts/acceptance/mobile-users-test.js
similarity index 100%
rename from test/javascripts/acceptance/mobile-users-test.js.es6
rename to test/javascripts/acceptance/mobile-users-test.js
diff --git a/test/javascripts/acceptance/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js
similarity index 100%
rename from test/javascripts/acceptance/modal-test.js.es6
rename to test/javascripts/acceptance/modal-test.js
diff --git a/test/javascripts/acceptance/new-message-test.js.es6 b/test/javascripts/acceptance/new-message-test.js
similarity index 100%
rename from test/javascripts/acceptance/new-message-test.js.es6
rename to test/javascripts/acceptance/new-message-test.js
diff --git a/test/javascripts/acceptance/new-topic-test.js.es6 b/test/javascripts/acceptance/new-topic-test.js
similarity index 100%
rename from test/javascripts/acceptance/new-topic-test.js.es6
rename to test/javascripts/acceptance/new-topic-test.js
diff --git a/test/javascripts/acceptance/password-reset-test.js.es6 b/test/javascripts/acceptance/password-reset-test.js
similarity index 100%
rename from test/javascripts/acceptance/password-reset-test.js.es6
rename to test/javascripts/acceptance/password-reset-test.js
diff --git a/test/javascripts/acceptance/personal-message-test.js.es6 b/test/javascripts/acceptance/personal-message-test.js
similarity index 100%
rename from test/javascripts/acceptance/personal-message-test.js.es6
rename to test/javascripts/acceptance/personal-message-test.js
diff --git a/test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-connector-class-test.js
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6
rename to test/javascripts/acceptance/plugin-outlet-connector-class-test.js
diff --git a/test/javascripts/acceptance/plugin-outlet-decorator-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-decorator-test.js
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-decorator-test.js.es6
rename to test/javascripts/acceptance/plugin-outlet-decorator-test.js
diff --git a/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-multi-template-test.js
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6
rename to test/javascripts/acceptance/plugin-outlet-multi-template-test.js
diff --git a/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-single-template-test.js
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6
rename to test/javascripts/acceptance/plugin-outlet-single-template-test.js
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js
similarity index 100%
rename from test/javascripts/acceptance/preferences-test.js.es6
rename to test/javascripts/acceptance/preferences-test.js
diff --git a/test/javascripts/acceptance/raw-plugin-outlet-test.js.es6 b/test/javascripts/acceptance/raw-plugin-outlet-test.js
similarity index 100%
rename from test/javascripts/acceptance/raw-plugin-outlet-test.js.es6
rename to test/javascripts/acceptance/raw-plugin-outlet-test.js
diff --git a/test/javascripts/acceptance/redirect-to-top-test.js.es6 b/test/javascripts/acceptance/redirect-to-top-test.js
similarity index 100%
rename from test/javascripts/acceptance/redirect-to-top-test.js.es6
rename to test/javascripts/acceptance/redirect-to-top-test.js
diff --git a/test/javascripts/acceptance/reports-test.js.es6 b/test/javascripts/acceptance/reports-test.js
similarity index 100%
rename from test/javascripts/acceptance/reports-test.js.es6
rename to test/javascripts/acceptance/reports-test.js
diff --git a/test/javascripts/acceptance/review-test.js.es6 b/test/javascripts/acceptance/review-test.js
similarity index 100%
rename from test/javascripts/acceptance/review-test.js.es6
rename to test/javascripts/acceptance/review-test.js
diff --git a/test/javascripts/acceptance/search-full-test.js.es6 b/test/javascripts/acceptance/search-full-test.js
similarity index 100%
rename from test/javascripts/acceptance/search-full-test.js.es6
rename to test/javascripts/acceptance/search-full-test.js
diff --git a/test/javascripts/acceptance/search-mobile-test.js.es6 b/test/javascripts/acceptance/search-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/search-mobile-test.js.es6
rename to test/javascripts/acceptance/search-mobile-test.js
diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js
similarity index 100%
rename from test/javascripts/acceptance/search-test.js.es6
rename to test/javascripts/acceptance/search-test.js
diff --git a/test/javascripts/acceptance/share-and-invite-desktop-test.js.es6 b/test/javascripts/acceptance/share-and-invite-desktop-test.js
similarity index 100%
rename from test/javascripts/acceptance/share-and-invite-desktop-test.js.es6
rename to test/javascripts/acceptance/share-and-invite-desktop-test.js
diff --git a/test/javascripts/acceptance/share-and-invite-mobile-test.js.es6 b/test/javascripts/acceptance/share-and-invite-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/share-and-invite-mobile-test.js.es6
rename to test/javascripts/acceptance/share-and-invite-mobile-test.js
diff --git a/test/javascripts/acceptance/shared-drafts-test.js.es6 b/test/javascripts/acceptance/shared-drafts-test.js
similarity index 100%
rename from test/javascripts/acceptance/shared-drafts-test.js.es6
rename to test/javascripts/acceptance/shared-drafts-test.js
diff --git a/test/javascripts/acceptance/sign-in-test.js.es6 b/test/javascripts/acceptance/sign-in-test.js
similarity index 100%
rename from test/javascripts/acceptance/sign-in-test.js.es6
rename to test/javascripts/acceptance/sign-in-test.js
diff --git a/test/javascripts/acceptance/static-test.js.es6 b/test/javascripts/acceptance/static-test.js
similarity index 100%
rename from test/javascripts/acceptance/static-test.js.es6
rename to test/javascripts/acceptance/static-test.js
diff --git a/test/javascripts/acceptance/tag-groups-test.js.es6 b/test/javascripts/acceptance/tag-groups-test.js
similarity index 100%
rename from test/javascripts/acceptance/tag-groups-test.js.es6
rename to test/javascripts/acceptance/tag-groups-test.js
diff --git a/test/javascripts/acceptance/tag-hashtag-test.js.es6 b/test/javascripts/acceptance/tag-hashtag-test.js
similarity index 100%
rename from test/javascripts/acceptance/tag-hashtag-test.js.es6
rename to test/javascripts/acceptance/tag-hashtag-test.js
diff --git a/test/javascripts/acceptance/tags-intersection-test.js.es6 b/test/javascripts/acceptance/tags-intersection-test.js
similarity index 100%
rename from test/javascripts/acceptance/tags-intersection-test.js.es6
rename to test/javascripts/acceptance/tags-intersection-test.js
diff --git a/test/javascripts/acceptance/tags-test.js.es6 b/test/javascripts/acceptance/tags-test.js
similarity index 100%
rename from test/javascripts/acceptance/tags-test.js.es6
rename to test/javascripts/acceptance/tags-test.js
diff --git a/test/javascripts/acceptance/topic-anonymous-test.js.es6 b/test/javascripts/acceptance/topic-anonymous-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-anonymous-test.js.es6
rename to test/javascripts/acceptance/topic-anonymous-test.js
diff --git a/test/javascripts/acceptance/topic-discovery-test.js.es6 b/test/javascripts/acceptance/topic-discovery-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-discovery-test.js.es6
rename to test/javascripts/acceptance/topic-discovery-test.js
diff --git a/test/javascripts/acceptance/topic-edit-timer-test.js.es6 b/test/javascripts/acceptance/topic-edit-timer-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-edit-timer-test.js.es6
rename to test/javascripts/acceptance/topic-edit-timer-test.js
diff --git a/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js.es6 b/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-footer-buttons-mobile-test.js.es6
rename to test/javascripts/acceptance/topic-footer-buttons-mobile-test.js
diff --git a/test/javascripts/acceptance/topic-move-posts-test.js.es6 b/test/javascripts/acceptance/topic-move-posts-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-move-posts-test.js.es6
rename to test/javascripts/acceptance/topic-move-posts-test.js
diff --git a/test/javascripts/acceptance/topic-notifications-button-test.js.es6 b/test/javascripts/acceptance/topic-notifications-button-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-notifications-button-test.js.es6
rename to test/javascripts/acceptance/topic-notifications-button-test.js
diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-test.js.es6
rename to test/javascripts/acceptance/topic-test.js
diff --git a/test/javascripts/acceptance/unknown-test.js.es6 b/test/javascripts/acceptance/unknown-test.js
similarity index 100%
rename from test/javascripts/acceptance/unknown-test.js.es6
rename to test/javascripts/acceptance/unknown-test.js
diff --git a/test/javascripts/acceptance/user-anonymous-test.js.es6 b/test/javascripts/acceptance/user-anonymous-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-anonymous-test.js.es6
rename to test/javascripts/acceptance/user-anonymous-test.js
diff --git a/test/javascripts/acceptance/user-card-mobile-test.js.es6 b/test/javascripts/acceptance/user-card-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-card-mobile-test.js.es6
rename to test/javascripts/acceptance/user-card-mobile-test.js
diff --git a/test/javascripts/acceptance/user-card-test.js.es6 b/test/javascripts/acceptance/user-card-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-card-test.js.es6
rename to test/javascripts/acceptance/user-card-test.js
diff --git a/test/javascripts/acceptance/user-drafts-stream-test.js.es6 b/test/javascripts/acceptance/user-drafts-stream-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-drafts-stream-test.js.es6
rename to test/javascripts/acceptance/user-drafts-stream-test.js
diff --git a/test/javascripts/acceptance/user-test.js.es6 b/test/javascripts/acceptance/user-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-test.js.es6
rename to test/javascripts/acceptance/user-test.js
diff --git a/test/javascripts/acceptance/users-test.js.es6 b/test/javascripts/acceptance/users-test.js
similarity index 100%
rename from test/javascripts/acceptance/users-test.js.es6
rename to test/javascripts/acceptance/users-test.js
diff --git a/test/javascripts/admin/components/group-list-setting-test.js.es6 b/test/javascripts/admin/components/group-list-setting-test.js
similarity index 100%
rename from test/javascripts/admin/components/group-list-setting-test.js.es6
rename to test/javascripts/admin/components/group-list-setting-test.js
diff --git a/test/javascripts/admin/components/themes-list-item-test.js.es6 b/test/javascripts/admin/components/themes-list-item-test.js
similarity index 100%
rename from test/javascripts/admin/components/themes-list-item-test.js.es6
rename to test/javascripts/admin/components/themes-list-item-test.js
diff --git a/test/javascripts/admin/components/themes-list-test.js.es6 b/test/javascripts/admin/components/themes-list-test.js
similarity index 100%
rename from test/javascripts/admin/components/themes-list-test.js.es6
rename to test/javascripts/admin/components/themes-list-test.js
diff --git a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js
similarity index 100%
rename from test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
rename to test/javascripts/admin/controllers/admin-customize-themes-show-test.js
diff --git a/test/javascripts/admin/controllers/admin-customize-themes-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-test.js
similarity index 100%
rename from test/javascripts/admin/controllers/admin-customize-themes-test.js.es6
rename to test/javascripts/admin/controllers/admin-customize-themes-test.js
diff --git a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6 b/test/javascripts/admin/controllers/admin-user-badges-test.js
similarity index 100%
rename from test/javascripts/admin/controllers/admin-user-badges-test.js.es6
rename to test/javascripts/admin/controllers/admin-user-badges-test.js
diff --git a/test/javascripts/admin/models/theme-test.js.es6 b/test/javascripts/admin/models/theme-test.js
similarity index 100%
rename from test/javascripts/admin/models/theme-test.js.es6
rename to test/javascripts/admin/models/theme-test.js
diff --git a/test/javascripts/components/ace-editor-test.js.es6 b/test/javascripts/components/ace-editor-test.js
similarity index 100%
rename from test/javascripts/components/ace-editor-test.js.es6
rename to test/javascripts/components/ace-editor-test.js
diff --git a/test/javascripts/components/admin-report-test.js.es6 b/test/javascripts/components/admin-report-test.js
similarity index 100%
rename from test/javascripts/components/admin-report-test.js.es6
rename to test/javascripts/components/admin-report-test.js
diff --git a/test/javascripts/components/badge-title-test.js.es6 b/test/javascripts/components/badge-title-test.js
similarity index 100%
rename from test/javascripts/components/badge-title-test.js.es6
rename to test/javascripts/components/badge-title-test.js
diff --git a/test/javascripts/components/d-button-test.js.es6 b/test/javascripts/components/d-button-test.js
similarity index 100%
rename from test/javascripts/components/d-button-test.js.es6
rename to test/javascripts/components/d-button-test.js
diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js
similarity index 100%
rename from test/javascripts/components/d-editor-test.js.es6
rename to test/javascripts/components/d-editor-test.js
diff --git a/test/javascripts/components/d-icon-test.js.es6 b/test/javascripts/components/d-icon-test.js
similarity index 100%
rename from test/javascripts/components/d-icon-test.js.es6
rename to test/javascripts/components/d-icon-test.js
diff --git a/test/javascripts/components/date-input-test.js.es6 b/test/javascripts/components/date-input-test.js
similarity index 100%
rename from test/javascripts/components/date-input-test.js.es6
rename to test/javascripts/components/date-input-test.js
diff --git a/test/javascripts/components/date-time-input-range-test.js.es6 b/test/javascripts/components/date-time-input-range-test.js
similarity index 100%
rename from test/javascripts/components/date-time-input-range-test.js.es6
rename to test/javascripts/components/date-time-input-range-test.js
diff --git a/test/javascripts/components/date-time-input-test.js.es6 b/test/javascripts/components/date-time-input-test.js
similarity index 100%
rename from test/javascripts/components/date-time-input-test.js.es6
rename to test/javascripts/components/date-time-input-test.js
diff --git a/test/javascripts/components/group-membership-button-test.js.es6 b/test/javascripts/components/group-membership-button-test.js
similarity index 100%
rename from test/javascripts/components/group-membership-button-test.js.es6
rename to test/javascripts/components/group-membership-button-test.js
diff --git a/test/javascripts/components/html-safe-helper-test.js.es6 b/test/javascripts/components/html-safe-helper-test.js
similarity index 100%
rename from test/javascripts/components/html-safe-helper-test.js.es6
rename to test/javascripts/components/html-safe-helper-test.js
diff --git a/test/javascripts/components/iframed-html-test.js.es6 b/test/javascripts/components/iframed-html-test.js
similarity index 100%
rename from test/javascripts/components/iframed-html-test.js.es6
rename to test/javascripts/components/iframed-html-test.js
diff --git a/test/javascripts/components/image-uploader-test.js.es6 b/test/javascripts/components/image-uploader-test.js
similarity index 100%
rename from test/javascripts/components/image-uploader-test.js.es6
rename to test/javascripts/components/image-uploader-test.js
diff --git a/test/javascripts/components/keyboard-shortcuts-test.js.es6 b/test/javascripts/components/keyboard-shortcuts-test.js
similarity index 100%
rename from test/javascripts/components/keyboard-shortcuts-test.js.es6
rename to test/javascripts/components/keyboard-shortcuts-test.js
diff --git a/test/javascripts/components/load-more-test.js.es6 b/test/javascripts/components/load-more-test.js
similarity index 100%
rename from test/javascripts/components/load-more-test.js.es6
rename to test/javascripts/components/load-more-test.js
diff --git a/test/javascripts/components/secret-value-list-test.js.es6 b/test/javascripts/components/secret-value-list-test.js
similarity index 100%
rename from test/javascripts/components/secret-value-list-test.js.es6
rename to test/javascripts/components/secret-value-list-test.js
diff --git a/test/javascripts/components/select-kit/category-chooser-test.js.es6 b/test/javascripts/components/select-kit/category-chooser-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/category-chooser-test.js.es6
rename to test/javascripts/components/select-kit/category-chooser-test.js
diff --git a/test/javascripts/components/select-kit/category-drop-test.js.es6 b/test/javascripts/components/select-kit/category-drop-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/category-drop-test.js.es6
rename to test/javascripts/components/select-kit/category-drop-test.js
diff --git a/test/javascripts/components/select-kit/combo-box-test.js.es6 b/test/javascripts/components/select-kit/combo-box-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/combo-box-test.js.es6
rename to test/javascripts/components/select-kit/combo-box-test.js
diff --git a/test/javascripts/components/select-kit/dropdown-select-box-test.js.es6 b/test/javascripts/components/select-kit/dropdown-select-box-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/dropdown-select-box-test.js.es6
rename to test/javascripts/components/select-kit/dropdown-select-box-test.js
diff --git a/test/javascripts/components/select-kit/list-setting-test.js.es6 b/test/javascripts/components/select-kit/list-setting-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/list-setting-test.js.es6
rename to test/javascripts/components/select-kit/list-setting-test.js
diff --git a/test/javascripts/components/select-kit/mini-tag-chooser-test.js.es6 b/test/javascripts/components/select-kit/mini-tag-chooser-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/mini-tag-chooser-test.js.es6
rename to test/javascripts/components/select-kit/mini-tag-chooser-test.js
diff --git a/test/javascripts/components/select-kit/multi-select-test.js.es6 b/test/javascripts/components/select-kit/multi-select-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/multi-select-test.js.es6
rename to test/javascripts/components/select-kit/multi-select-test.js
diff --git a/test/javascripts/components/select-kit/notifications-button-test.js.es6 b/test/javascripts/components/select-kit/notifications-button-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/notifications-button-test.js.es6
rename to test/javascripts/components/select-kit/notifications-button-test.js
diff --git a/test/javascripts/components/select-kit/pinned-options-test.js.es6 b/test/javascripts/components/select-kit/pinned-options-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/pinned-options-test.js.es6
rename to test/javascripts/components/select-kit/pinned-options-test.js
diff --git a/test/javascripts/components/select-kit/select-kit-test-helper.js.es6 b/test/javascripts/components/select-kit/select-kit-test-helper.js
similarity index 100%
rename from test/javascripts/components/select-kit/select-kit-test-helper.js.es6
rename to test/javascripts/components/select-kit/select-kit-test-helper.js
diff --git a/test/javascripts/components/select-kit/single-select-test.js.es6 b/test/javascripts/components/select-kit/single-select-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/single-select-test.js.es6
rename to test/javascripts/components/select-kit/single-select-test.js
diff --git a/test/javascripts/components/select-kit/tag-drop-test.js.es6 b/test/javascripts/components/select-kit/tag-drop-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/tag-drop-test.js.es6
rename to test/javascripts/components/select-kit/tag-drop-test.js
diff --git a/test/javascripts/components/select-kit/topic-notifications-button-test.js.es6 b/test/javascripts/components/select-kit/topic-notifications-button-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/topic-notifications-button-test.js.es6
rename to test/javascripts/components/select-kit/topic-notifications-button-test.js
diff --git a/test/javascripts/components/select-kit/topic-notifications-options-test.js.es6 b/test/javascripts/components/select-kit/topic-notifications-options-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/topic-notifications-options-test.js.es6
rename to test/javascripts/components/select-kit/topic-notifications-options-test.js
diff --git a/test/javascripts/components/select-kit/user-chooser-test.js.es6 b/test/javascripts/components/select-kit/user-chooser-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/user-chooser-test.js.es6
rename to test/javascripts/components/select-kit/user-chooser-test.js
diff --git a/test/javascripts/components/share-button-test.js.es6 b/test/javascripts/components/share-button-test.js
similarity index 100%
rename from test/javascripts/components/share-button-test.js.es6
rename to test/javascripts/components/share-button-test.js
diff --git a/test/javascripts/components/share-button.js.es6 b/test/javascripts/components/share-button.js
similarity index 100%
rename from test/javascripts/components/share-button.js.es6
rename to test/javascripts/components/share-button.js
diff --git a/test/javascripts/components/text-field-test.js.es6 b/test/javascripts/components/text-field-test.js
similarity index 100%
rename from test/javascripts/components/text-field-test.js.es6
rename to test/javascripts/components/text-field-test.js
diff --git a/test/javascripts/components/text-overflow-test.js.es6 b/test/javascripts/components/text-overflow-test.js
similarity index 100%
rename from test/javascripts/components/text-overflow-test.js.es6
rename to test/javascripts/components/text-overflow-test.js
diff --git a/test/javascripts/components/time-input-test.js.es6 b/test/javascripts/components/time-input-test.js
similarity index 100%
rename from test/javascripts/components/time-input-test.js.es6
rename to test/javascripts/components/time-input-test.js
diff --git a/test/javascripts/components/user-selector-test.js.es6 b/test/javascripts/components/user-selector-test.js
similarity index 100%
rename from test/javascripts/components/user-selector-test.js.es6
rename to test/javascripts/components/user-selector-test.js
diff --git a/test/javascripts/components/value-list-test.js.es6 b/test/javascripts/components/value-list-test.js
similarity index 100%
rename from test/javascripts/components/value-list-test.js.es6
rename to test/javascripts/components/value-list-test.js
diff --git a/test/javascripts/controllers/avatar-selector-test.js.es6 b/test/javascripts/controllers/avatar-selector-test.js
similarity index 100%
rename from test/javascripts/controllers/avatar-selector-test.js.es6
rename to test/javascripts/controllers/avatar-selector-test.js
diff --git a/test/javascripts/controllers/bookmark-test.js.es6 b/test/javascripts/controllers/bookmark-test.js
similarity index 100%
rename from test/javascripts/controllers/bookmark-test.js.es6
rename to test/javascripts/controllers/bookmark-test.js
diff --git a/test/javascripts/controllers/create-account-test.js.es6 b/test/javascripts/controllers/create-account-test.js
similarity index 100%
rename from test/javascripts/controllers/create-account-test.js.es6
rename to test/javascripts/controllers/create-account-test.js
diff --git a/test/javascripts/controllers/group-test.js.es6 b/test/javascripts/controllers/group-test.js
similarity index 100%
rename from test/javascripts/controllers/group-test.js.es6
rename to test/javascripts/controllers/group-test.js
diff --git a/test/javascripts/controllers/history-test.js.es6 b/test/javascripts/controllers/history-test.js
similarity index 100%
rename from test/javascripts/controllers/history-test.js.es6
rename to test/javascripts/controllers/history-test.js
diff --git a/test/javascripts/controllers/preferences-account-test.js.es6 b/test/javascripts/controllers/preferences-account-test.js
similarity index 100%
rename from test/javascripts/controllers/preferences-account-test.js.es6
rename to test/javascripts/controllers/preferences-account-test.js
diff --git a/test/javascripts/controllers/preferences-second-factor-test.js.es6 b/test/javascripts/controllers/preferences-second-factor-test.js
similarity index 100%
rename from test/javascripts/controllers/preferences-second-factor-test.js.es6
rename to test/javascripts/controllers/preferences-second-factor-test.js
diff --git a/test/javascripts/controllers/reorder-categories-test.js.es6 b/test/javascripts/controllers/reorder-categories-test.js
similarity index 100%
rename from test/javascripts/controllers/reorder-categories-test.js.es6
rename to test/javascripts/controllers/reorder-categories-test.js
diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js
similarity index 100%
rename from test/javascripts/controllers/topic-test.js.es6
rename to test/javascripts/controllers/topic-test.js
diff --git a/test/javascripts/ember/resolver-test.js.es6 b/test/javascripts/ember/resolver-test.js
similarity index 100%
rename from test/javascripts/ember/resolver-test.js.es6
rename to test/javascripts/ember/resolver-test.js
diff --git a/test/javascripts/fixtures/about.js.es6 b/test/javascripts/fixtures/about.js
similarity index 100%
rename from test/javascripts/fixtures/about.js.es6
rename to test/javascripts/fixtures/about.js
diff --git a/test/javascripts/fixtures/badges_fixture.js.es6 b/test/javascripts/fixtures/badges_fixture.js
similarity index 100%
rename from test/javascripts/fixtures/badges_fixture.js.es6
rename to test/javascripts/fixtures/badges_fixture.js
diff --git a/test/javascripts/fixtures/category-fixtures.js.es6 b/test/javascripts/fixtures/category-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/category-fixtures.js.es6
rename to test/javascripts/fixtures/category-fixtures.js
diff --git a/test/javascripts/fixtures/concerns/notification-types.js.es6.erb b/test/javascripts/fixtures/concerns/notification-types.js.erb
similarity index 100%
rename from test/javascripts/fixtures/concerns/notification-types.js.es6.erb
rename to test/javascripts/fixtures/concerns/notification-types.js.erb
diff --git a/test/javascripts/fixtures/dashboard-general.js.es6 b/test/javascripts/fixtures/dashboard-general.js
similarity index 100%
rename from test/javascripts/fixtures/dashboard-general.js.es6
rename to test/javascripts/fixtures/dashboard-general.js
diff --git a/test/javascripts/fixtures/dashboard.js.es6 b/test/javascripts/fixtures/dashboard.js
similarity index 100%
rename from test/javascripts/fixtures/dashboard.js.es6
rename to test/javascripts/fixtures/dashboard.js
diff --git a/test/javascripts/fixtures/directory-fixtures.js.es6 b/test/javascripts/fixtures/directory-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/directory-fixtures.js.es6
rename to test/javascripts/fixtures/directory-fixtures.js
diff --git a/test/javascripts/fixtures/discovery_fixtures.js.es6 b/test/javascripts/fixtures/discovery_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/discovery_fixtures.js.es6
rename to test/javascripts/fixtures/discovery_fixtures.js
diff --git a/test/javascripts/fixtures/draft.js.es6 b/test/javascripts/fixtures/draft.js
similarity index 100%
rename from test/javascripts/fixtures/draft.js.es6
rename to test/javascripts/fixtures/draft.js
diff --git a/test/javascripts/fixtures/drafts.js.es6 b/test/javascripts/fixtures/drafts.js
similarity index 100%
rename from test/javascripts/fixtures/drafts.js.es6
rename to test/javascripts/fixtures/drafts.js
diff --git a/test/javascripts/fixtures/group-fixtures.js.es6 b/test/javascripts/fixtures/group-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/group-fixtures.js.es6
rename to test/javascripts/fixtures/group-fixtures.js
diff --git a/test/javascripts/fixtures/groups-fixtures.js.es6 b/test/javascripts/fixtures/groups-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/groups-fixtures.js.es6
rename to test/javascripts/fixtures/groups-fixtures.js
diff --git a/test/javascripts/fixtures/notification_fixtures.js.es6 b/test/javascripts/fixtures/notification_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/notification_fixtures.js.es6
rename to test/javascripts/fixtures/notification_fixtures.js
diff --git a/test/javascripts/fixtures/poll.js.es6 b/test/javascripts/fixtures/poll.js
similarity index 100%
rename from test/javascripts/fixtures/poll.js.es6
rename to test/javascripts/fixtures/poll.js
diff --git a/test/javascripts/fixtures/post.js.es6 b/test/javascripts/fixtures/post.js
similarity index 100%
rename from test/javascripts/fixtures/post.js.es6
rename to test/javascripts/fixtures/post.js
diff --git a/test/javascripts/fixtures/private_messages_fixtures.js.es6 b/test/javascripts/fixtures/private_messages_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/private_messages_fixtures.js.es6
rename to test/javascripts/fixtures/private_messages_fixtures.js
diff --git a/test/javascripts/fixtures/problems.js.es6 b/test/javascripts/fixtures/problems.js
similarity index 100%
rename from test/javascripts/fixtures/problems.js.es6
rename to test/javascripts/fixtures/problems.js
diff --git a/test/javascripts/fixtures/reports.js.es6 b/test/javascripts/fixtures/reports.js
similarity index 100%
rename from test/javascripts/fixtures/reports.js.es6
rename to test/javascripts/fixtures/reports.js
diff --git a/test/javascripts/fixtures/reports_bulk.js.es6 b/test/javascripts/fixtures/reports_bulk.js
similarity index 100%
rename from test/javascripts/fixtures/reports_bulk.js.es6
rename to test/javascripts/fixtures/reports_bulk.js
diff --git a/test/javascripts/fixtures/search-fixtures.js.es6 b/test/javascripts/fixtures/search-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/search-fixtures.js.es6
rename to test/javascripts/fixtures/search-fixtures.js
diff --git a/test/javascripts/fixtures/session-fixtures.js.es6 b/test/javascripts/fixtures/session-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/session-fixtures.js.es6
rename to test/javascripts/fixtures/session-fixtures.js
diff --git a/test/javascripts/fixtures/site-fixtures.js.es6 b/test/javascripts/fixtures/site-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/site-fixtures.js.es6
rename to test/javascripts/fixtures/site-fixtures.js
diff --git a/test/javascripts/fixtures/site_settings.js.es6 b/test/javascripts/fixtures/site_settings.js
similarity index 100%
rename from test/javascripts/fixtures/site_settings.js.es6
rename to test/javascripts/fixtures/site_settings.js
diff --git a/test/javascripts/fixtures/static_fixtures.js.es6 b/test/javascripts/fixtures/static_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/static_fixtures.js.es6
rename to test/javascripts/fixtures/static_fixtures.js
diff --git a/test/javascripts/fixtures/top_fixture.js.es6 b/test/javascripts/fixtures/top_fixture.js
similarity index 100%
rename from test/javascripts/fixtures/top_fixture.js.es6
rename to test/javascripts/fixtures/top_fixture.js
diff --git a/test/javascripts/fixtures/topic.js.es6 b/test/javascripts/fixtures/topic.js
similarity index 100%
rename from test/javascripts/fixtures/topic.js.es6
rename to test/javascripts/fixtures/topic.js
diff --git a/test/javascripts/fixtures/user-badges.js.es6 b/test/javascripts/fixtures/user-badges.js
similarity index 100%
rename from test/javascripts/fixtures/user-badges.js.es6
rename to test/javascripts/fixtures/user-badges.js
diff --git a/test/javascripts/fixtures/user_fixtures.js.es6 b/test/javascripts/fixtures/user_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/user_fixtures.js.es6
rename to test/javascripts/fixtures/user_fixtures.js
diff --git a/test/javascripts/fixtures/watched-words-fixtures.js.es6 b/test/javascripts/fixtures/watched-words-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/watched-words-fixtures.js.es6
rename to test/javascripts/fixtures/watched-words-fixtures.js
diff --git a/test/javascripts/helpers/assertions.js b/test/javascripts/helpers/assertions.js
index 95d7b2a7dd..81fbd40b1b 100644
--- a/test/javascripts/helpers/assertions.js
+++ b/test/javascripts/helpers/assertions.js
@@ -1,5 +1,4 @@
-/* exported exists, count, present, blank, containsInstance, not, visible, invisible */
-
+// discourse-skip-module
 function exists(selector) {
   return count(selector) > 0;
 }
@@ -13,8 +12,10 @@ function visible(selector) {
 }
 
 function invisible(selector) {
-  var $items = find(selector + ":visible");
-  return $items.length === 0 ||
-         $items.css("opacity") === "0" ||
-         $items.css("visibility") === "hidden";
+  const $items = find(selector + ":visible");
+  return (
+    $items.length === 0 ||
+    $items.css("opacity") === "0" ||
+    $items.css("visibility") === "hidden"
+  );
 }
diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js
similarity index 100%
rename from test/javascripts/helpers/component-test.js.es6
rename to test/javascripts/helpers/component-test.js
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js
similarity index 100%
rename from test/javascripts/helpers/create-pretender.js.es6
rename to test/javascripts/helpers/create-pretender.js
diff --git a/test/javascripts/helpers/create-store.js.es6 b/test/javascripts/helpers/create-store.js
similarity index 100%
rename from test/javascripts/helpers/create-store.js.es6
rename to test/javascripts/helpers/create-store.js
diff --git a/test/javascripts/helpers/d-editor-helper.js.es6 b/test/javascripts/helpers/d-editor-helper.js
similarity index 100%
rename from test/javascripts/helpers/d-editor-helper.js.es6
rename to test/javascripts/helpers/d-editor-helper.js
diff --git a/test/javascripts/helpers/fixture-pretender.js.es6 b/test/javascripts/helpers/fixture-pretender.js
similarity index 100%
rename from test/javascripts/helpers/fixture-pretender.js.es6
rename to test/javascripts/helpers/fixture-pretender.js
diff --git a/test/javascripts/helpers/html-helper.js.es6 b/test/javascripts/helpers/html-helper.js
similarity index 100%
rename from test/javascripts/helpers/html-helper.js.es6
rename to test/javascripts/helpers/html-helper.js
diff --git a/test/javascripts/helpers/init-ember-qunit.js b/test/javascripts/helpers/init-ember-qunit.js
deleted file mode 100644
index 32d0184e7d..0000000000
--- a/test/javascripts/helpers/init-ember-qunit.js
+++ /dev/null
@@ -1,2 +0,0 @@
-var buildResolver = require('discourse-common/resolver').buildResolver;
-window.setResolver(buildResolver('discourse').create({ namespace: Discourse }));
diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js
similarity index 100%
rename from test/javascripts/helpers/qunit-helpers.js.es6
rename to test/javascripts/helpers/qunit-helpers.js
diff --git a/test/javascripts/helpers/review-pretender.js.es6 b/test/javascripts/helpers/review-pretender.js
similarity index 100%
rename from test/javascripts/helpers/review-pretender.js.es6
rename to test/javascripts/helpers/review-pretender.js
diff --git a/test/javascripts/helpers/select-kit-helper.js.es6 b/test/javascripts/helpers/select-kit-helper.js
similarity index 100%
rename from test/javascripts/helpers/select-kit-helper.js.es6
rename to test/javascripts/helpers/select-kit-helper.js
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index 621aa3d6ac..c39424b0df 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -1,4 +1,5 @@
-/*jshint maxlen:10000000 */
+// discourse-skip-module
+
 Discourse.SiteSettingsOriginal = {
   title: "QUnit Discourse Tests",
   site_logo_url: "/assets/logo.png",
@@ -12,8 +13,10 @@ Discourse.SiteSettingsOriginal = {
   ga_universal_tracking_code: "",
   ga_universal_domain_name: "auto",
   top_menu: "latest|new|unread|categories|top",
-  post_menu: "like|share|flag|edit|bookmark|bookmarkWithReminder|delete|admin|reply",
-  post_menu_hidden_items: "flag|bookmark|bookmarkWithReminder|edit|delete|admin",
+  post_menu:
+    "like|share|flag|edit|bookmark|bookmarkWithReminder|delete|admin|reply",
+  post_menu_hidden_items:
+    "flag|bookmark|bookmarkWithReminder|edit|delete|admin",
   share_links: "twitter|facebook|email",
   category_colors:
     "BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|27AA5B|B3B5B4|E45735",
@@ -102,6 +105,7 @@ Discourse.SiteSettingsOriginal = {
   unicode_usernames: false,
   secure_media: false
 };
+
 Discourse.SiteSettings = jQuery.extend(
   true,
   {},
diff --git a/test/javascripts/helpers/site.js.es6 b/test/javascripts/helpers/site.js
similarity index 100%
rename from test/javascripts/helpers/site.js.es6
rename to test/javascripts/helpers/site.js
diff --git a/test/javascripts/helpers/store-pretender.js.es6 b/test/javascripts/helpers/store-pretender.js
similarity index 100%
rename from test/javascripts/helpers/store-pretender.js.es6
rename to test/javascripts/helpers/store-pretender.js
diff --git a/test/javascripts/helpers/textarea-selection-helper.js.es6 b/test/javascripts/helpers/textarea-selection-helper.js
similarity index 100%
rename from test/javascripts/helpers/textarea-selection-helper.js.es6
rename to test/javascripts/helpers/textarea-selection-helper.js
diff --git a/test/javascripts/helpers/widget-test.js.es6 b/test/javascripts/helpers/widget-test.js
similarity index 100%
rename from test/javascripts/helpers/widget-test.js.es6
rename to test/javascripts/helpers/widget-test.js
diff --git a/test/javascripts/initializers/localization-test.js.es6 b/test/javascripts/initializers/localization-test.js
similarity index 100%
rename from test/javascripts/initializers/localization-test.js.es6
rename to test/javascripts/initializers/localization-test.js
diff --git a/test/javascripts/lib/bbcode-test.js.es6 b/test/javascripts/lib/bbcode-test.js
similarity index 100%
rename from test/javascripts/lib/bbcode-test.js.es6
rename to test/javascripts/lib/bbcode-test.js
diff --git a/test/javascripts/lib/break-string-test.js.es6 b/test/javascripts/lib/break-string-test.js
similarity index 100%
rename from test/javascripts/lib/break-string-test.js.es6
rename to test/javascripts/lib/break-string-test.js
diff --git a/test/javascripts/lib/category-badge-test.js.es6 b/test/javascripts/lib/category-badge-test.js
similarity index 100%
rename from test/javascripts/lib/category-badge-test.js.es6
rename to test/javascripts/lib/category-badge-test.js
diff --git a/test/javascripts/lib/click-track-edit-history-test.js.es6 b/test/javascripts/lib/click-track-edit-history-test.js
similarity index 100%
rename from test/javascripts/lib/click-track-edit-history-test.js.es6
rename to test/javascripts/lib/click-track-edit-history-test.js
diff --git a/test/javascripts/lib/click-track-profile-page-test.js.es6 b/test/javascripts/lib/click-track-profile-page-test.js
similarity index 100%
rename from test/javascripts/lib/click-track-profile-page-test.js.es6
rename to test/javascripts/lib/click-track-profile-page-test.js
diff --git a/test/javascripts/lib/click-track-test.js.es6 b/test/javascripts/lib/click-track-test.js
similarity index 100%
rename from test/javascripts/lib/click-track-test.js.es6
rename to test/javascripts/lib/click-track-test.js
diff --git a/test/javascripts/lib/computed-test.js.es6 b/test/javascripts/lib/computed-test.js
similarity index 100%
rename from test/javascripts/lib/computed-test.js.es6
rename to test/javascripts/lib/computed-test.js
diff --git a/test/javascripts/lib/discourse-test.js.es6 b/test/javascripts/lib/discourse-test.js
similarity index 100%
rename from test/javascripts/lib/discourse-test.js.es6
rename to test/javascripts/lib/discourse-test.js
diff --git a/test/javascripts/lib/emoji-store-test.js.es6 b/test/javascripts/lib/emoji-store-test.js
similarity index 100%
rename from test/javascripts/lib/emoji-store-test.js.es6
rename to test/javascripts/lib/emoji-store-test.js
diff --git a/test/javascripts/lib/emoji-test.js.es6 b/test/javascripts/lib/emoji-test.js
similarity index 100%
rename from test/javascripts/lib/emoji-test.js.es6
rename to test/javascripts/lib/emoji-test.js
diff --git a/test/javascripts/lib/formatter-test.js.es6 b/test/javascripts/lib/formatter-test.js
similarity index 100%
rename from test/javascripts/lib/formatter-test.js.es6
rename to test/javascripts/lib/formatter-test.js
diff --git a/test/javascripts/lib/highlight-text-test.js.es6 b/test/javascripts/lib/highlight-text-test.js
similarity index 100%
rename from test/javascripts/lib/highlight-text-test.js.es6
rename to test/javascripts/lib/highlight-text-test.js
diff --git a/test/javascripts/lib/i18n-test.js.es6 b/test/javascripts/lib/i18n-test.js
similarity index 100%
rename from test/javascripts/lib/i18n-test.js.es6
rename to test/javascripts/lib/i18n-test.js
diff --git a/test/javascripts/lib/icon-library-test.js.es6 b/test/javascripts/lib/icon-library-test.js
similarity index 100%
rename from test/javascripts/lib/icon-library-test.js.es6
rename to test/javascripts/lib/icon-library-test.js
diff --git a/test/javascripts/lib/key-value-store-test.js.es6 b/test/javascripts/lib/key-value-store-test.js
similarity index 100%
rename from test/javascripts/lib/key-value-store-test.js.es6
rename to test/javascripts/lib/key-value-store-test.js
diff --git a/test/javascripts/lib/link-mentions-test.js.es6 b/test/javascripts/lib/link-mentions-test.js
similarity index 100%
rename from test/javascripts/lib/link-mentions-test.js.es6
rename to test/javascripts/lib/link-mentions-test.js
diff --git a/test/javascripts/lib/load-script-test.js.es6 b/test/javascripts/lib/load-script-test.js
similarity index 100%
rename from test/javascripts/lib/load-script-test.js.es6
rename to test/javascripts/lib/load-script-test.js
diff --git a/test/javascripts/lib/oneboxer-test.js.es6 b/test/javascripts/lib/oneboxer-test.js
similarity index 100%
rename from test/javascripts/lib/oneboxer-test.js.es6
rename to test/javascripts/lib/oneboxer-test.js
diff --git a/test/javascripts/lib/preload-store-test.js.es6 b/test/javascripts/lib/preload-store-test.js
similarity index 100%
rename from test/javascripts/lib/preload-store-test.js.es6
rename to test/javascripts/lib/preload-store-test.js
diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js
similarity index 100%
rename from test/javascripts/lib/pretty-text-test.js.es6
rename to test/javascripts/lib/pretty-text-test.js
diff --git a/test/javascripts/lib/sanitizer-test.js.es6 b/test/javascripts/lib/sanitizer-test.js
similarity index 100%
rename from test/javascripts/lib/sanitizer-test.js.es6
rename to test/javascripts/lib/sanitizer-test.js
diff --git a/test/javascripts/lib/screen-track-test.js.es6 b/test/javascripts/lib/screen-track-test.js
similarity index 100%
rename from test/javascripts/lib/screen-track-test.js.es6
rename to test/javascripts/lib/screen-track-test.js
diff --git a/test/javascripts/lib/search-test.js.es6 b/test/javascripts/lib/search-test.js
similarity index 100%
rename from test/javascripts/lib/search-test.js.es6
rename to test/javascripts/lib/search-test.js
diff --git a/test/javascripts/lib/sharing-test.js.es6 b/test/javascripts/lib/sharing-test.js
similarity index 100%
rename from test/javascripts/lib/sharing-test.js.es6
rename to test/javascripts/lib/sharing-test.js
diff --git a/test/javascripts/lib/text-direction-test.js.es6 b/test/javascripts/lib/text-direction-test.js
similarity index 100%
rename from test/javascripts/lib/text-direction-test.js.es6
rename to test/javascripts/lib/text-direction-test.js
diff --git a/test/javascripts/lib/to-markdown-test.js.es6 b/test/javascripts/lib/to-markdown-test.js
similarity index 100%
rename from test/javascripts/lib/to-markdown-test.js.es6
rename to test/javascripts/lib/to-markdown-test.js
diff --git a/test/javascripts/lib/tooltip-test.js.es6 b/test/javascripts/lib/tooltip-test.js
similarity index 100%
rename from test/javascripts/lib/tooltip-test.js.es6
rename to test/javascripts/lib/tooltip-test.js
diff --git a/test/javascripts/lib/upload-short-url-test.js.es6 b/test/javascripts/lib/upload-short-url-test.js
similarity index 100%
rename from test/javascripts/lib/upload-short-url-test.js.es6
rename to test/javascripts/lib/upload-short-url-test.js
diff --git a/test/javascripts/lib/uploads-test.js.es6 b/test/javascripts/lib/uploads-test.js
similarity index 100%
rename from test/javascripts/lib/uploads-test.js.es6
rename to test/javascripts/lib/uploads-test.js
diff --git a/test/javascripts/lib/url-test.js.es6 b/test/javascripts/lib/url-test.js
similarity index 100%
rename from test/javascripts/lib/url-test.js.es6
rename to test/javascripts/lib/url-test.js
diff --git a/test/javascripts/lib/user-search-test.js.es6 b/test/javascripts/lib/user-search-test.js
similarity index 100%
rename from test/javascripts/lib/user-search-test.js.es6
rename to test/javascripts/lib/user-search-test.js
diff --git a/test/javascripts/lib/utilities-test.js.es6 b/test/javascripts/lib/utilities-test.js
similarity index 100%
rename from test/javascripts/lib/utilities-test.js.es6
rename to test/javascripts/lib/utilities-test.js
diff --git a/test/javascripts/lib/white-lister-test.js.es6 b/test/javascripts/lib/white-lister-test.js
similarity index 100%
rename from test/javascripts/lib/white-lister-test.js.es6
rename to test/javascripts/lib/white-lister-test.js
diff --git a/test/javascripts/mixins/grant-badge-controller-test.js.es6 b/test/javascripts/mixins/grant-badge-controller-test.js
similarity index 100%
rename from test/javascripts/mixins/grant-badge-controller-test.js.es6
rename to test/javascripts/mixins/grant-badge-controller-test.js
diff --git a/test/javascripts/mixins/setting-object-test.js.es6 b/test/javascripts/mixins/setting-object-test.js
similarity index 100%
rename from test/javascripts/mixins/setting-object-test.js.es6
rename to test/javascripts/mixins/setting-object-test.js
diff --git a/test/javascripts/mixins/singleton-test.js.es6 b/test/javascripts/mixins/singleton-test.js
similarity index 100%
rename from test/javascripts/mixins/singleton-test.js.es6
rename to test/javascripts/mixins/singleton-test.js
diff --git a/test/javascripts/models/badge-test.js.es6 b/test/javascripts/models/badge-test.js
similarity index 100%
rename from test/javascripts/models/badge-test.js.es6
rename to test/javascripts/models/badge-test.js
diff --git a/test/javascripts/models/category-test.js.es6 b/test/javascripts/models/category-test.js
similarity index 100%
rename from test/javascripts/models/category-test.js.es6
rename to test/javascripts/models/category-test.js
diff --git a/test/javascripts/models/composer-test.js.es6 b/test/javascripts/models/composer-test.js
similarity index 100%
rename from test/javascripts/models/composer-test.js.es6
rename to test/javascripts/models/composer-test.js
diff --git a/test/javascripts/models/email-log-test.js.es6 b/test/javascripts/models/email-log-test.js
similarity index 100%
rename from test/javascripts/models/email-log-test.js.es6
rename to test/javascripts/models/email-log-test.js
diff --git a/test/javascripts/models/group-test.js.es6 b/test/javascripts/models/group-test.js
similarity index 100%
rename from test/javascripts/models/group-test.js.es6
rename to test/javascripts/models/group-test.js
diff --git a/test/javascripts/models/invite-test.js.es6 b/test/javascripts/models/invite-test.js
similarity index 100%
rename from test/javascripts/models/invite-test.js.es6
rename to test/javascripts/models/invite-test.js
diff --git a/test/javascripts/models/nav-item-test.js.es6 b/test/javascripts/models/nav-item-test.js
similarity index 100%
rename from test/javascripts/models/nav-item-test.js.es6
rename to test/javascripts/models/nav-item-test.js
diff --git a/test/javascripts/models/post-stream-test.js.es6 b/test/javascripts/models/post-stream-test.js
similarity index 100%
rename from test/javascripts/models/post-stream-test.js.es6
rename to test/javascripts/models/post-stream-test.js
diff --git a/test/javascripts/models/post-test.js.es6 b/test/javascripts/models/post-test.js
similarity index 100%
rename from test/javascripts/models/post-test.js.es6
rename to test/javascripts/models/post-test.js
diff --git a/test/javascripts/models/report-test.js.es6 b/test/javascripts/models/report-test.js
similarity index 100%
rename from test/javascripts/models/report-test.js.es6
rename to test/javascripts/models/report-test.js
diff --git a/test/javascripts/models/rest-model-test.js.es6 b/test/javascripts/models/rest-model-test.js
similarity index 100%
rename from test/javascripts/models/rest-model-test.js.es6
rename to test/javascripts/models/rest-model-test.js
diff --git a/test/javascripts/models/result-set-test.js.es6 b/test/javascripts/models/result-set-test.js
similarity index 100%
rename from test/javascripts/models/result-set-test.js.es6
rename to test/javascripts/models/result-set-test.js
diff --git a/test/javascripts/models/session-test.js.es6 b/test/javascripts/models/session-test.js
similarity index 100%
rename from test/javascripts/models/session-test.js.es6
rename to test/javascripts/models/session-test.js
diff --git a/test/javascripts/models/site-test.js.es6 b/test/javascripts/models/site-test.js
similarity index 100%
rename from test/javascripts/models/site-test.js.es6
rename to test/javascripts/models/site-test.js
diff --git a/test/javascripts/models/staff-action-log-test.js.es6 b/test/javascripts/models/staff-action-log-test.js
similarity index 100%
rename from test/javascripts/models/staff-action-log-test.js.es6
rename to test/javascripts/models/staff-action-log-test.js
diff --git a/test/javascripts/models/store-test.js.es6 b/test/javascripts/models/store-test.js
similarity index 100%
rename from test/javascripts/models/store-test.js.es6
rename to test/javascripts/models/store-test.js
diff --git a/test/javascripts/models/topic-details-test.js.es6 b/test/javascripts/models/topic-details-test.js
similarity index 100%
rename from test/javascripts/models/topic-details-test.js.es6
rename to test/javascripts/models/topic-details-test.js
diff --git a/test/javascripts/models/topic-test.js.es6 b/test/javascripts/models/topic-test.js
similarity index 100%
rename from test/javascripts/models/topic-test.js.es6
rename to test/javascripts/models/topic-test.js
diff --git a/test/javascripts/models/topic-tracking-state-test.js.es6 b/test/javascripts/models/topic-tracking-state-test.js
similarity index 100%
rename from test/javascripts/models/topic-tracking-state-test.js.es6
rename to test/javascripts/models/topic-tracking-state-test.js
diff --git a/test/javascripts/models/user-action-test.js.es6 b/test/javascripts/models/user-action-test.js
similarity index 100%
rename from test/javascripts/models/user-action-test.js.es6
rename to test/javascripts/models/user-action-test.js
diff --git a/test/javascripts/models/user-badge-test.js.es6 b/test/javascripts/models/user-badge-test.js
similarity index 100%
rename from test/javascripts/models/user-badge-test.js.es6
rename to test/javascripts/models/user-badge-test.js
diff --git a/test/javascripts/models/user-drafts-test.js.es6 b/test/javascripts/models/user-drafts-test.js
similarity index 100%
rename from test/javascripts/models/user-drafts-test.js.es6
rename to test/javascripts/models/user-drafts-test.js
diff --git a/test/javascripts/models/user-stream-test.js.es6 b/test/javascripts/models/user-stream-test.js
similarity index 100%
rename from test/javascripts/models/user-stream-test.js.es6
rename to test/javascripts/models/user-stream-test.js
diff --git a/test/javascripts/models/user-test.js.es6 b/test/javascripts/models/user-test.js
similarity index 100%
rename from test/javascripts/models/user-test.js.es6
rename to test/javascripts/models/user-test.js
diff --git a/test/javascripts/utils/decorators-test.js.es6 b/test/javascripts/utils/decorators-test.js
similarity index 100%
rename from test/javascripts/utils/decorators-test.js.es6
rename to test/javascripts/utils/decorators-test.js
diff --git a/test/javascripts/widgets/actions-summary-test.js.es6 b/test/javascripts/widgets/actions-summary-test.js
similarity index 100%
rename from test/javascripts/widgets/actions-summary-test.js.es6
rename to test/javascripts/widgets/actions-summary-test.js
diff --git a/test/javascripts/widgets/avatar-flair-test.js.es6 b/test/javascripts/widgets/avatar-flair-test.js
similarity index 100%
rename from test/javascripts/widgets/avatar-flair-test.js.es6
rename to test/javascripts/widgets/avatar-flair-test.js
diff --git a/test/javascripts/widgets/button-test.js.es6 b/test/javascripts/widgets/button-test.js
similarity index 100%
rename from test/javascripts/widgets/button-test.js.es6
rename to test/javascripts/widgets/button-test.js
diff --git a/test/javascripts/widgets/default-notification-item-test.js.es6 b/test/javascripts/widgets/default-notification-item-test.js
similarity index 100%
rename from test/javascripts/widgets/default-notification-item-test.js.es6
rename to test/javascripts/widgets/default-notification-item-test.js
diff --git a/test/javascripts/widgets/hamburger-menu-test.js.es6 b/test/javascripts/widgets/hamburger-menu-test.js
similarity index 100%
rename from test/javascripts/widgets/hamburger-menu-test.js.es6
rename to test/javascripts/widgets/hamburger-menu-test.js
diff --git a/test/javascripts/widgets/header-test.js.es6 b/test/javascripts/widgets/header-test.js
similarity index 100%
rename from test/javascripts/widgets/header-test.js.es6
rename to test/javascripts/widgets/header-test.js
diff --git a/test/javascripts/widgets/home-logo-test.js.es6 b/test/javascripts/widgets/home-logo-test.js
similarity index 100%
rename from test/javascripts/widgets/home-logo-test.js.es6
rename to test/javascripts/widgets/home-logo-test.js
diff --git a/test/javascripts/widgets/post-links-test.js.es6 b/test/javascripts/widgets/post-links-test.js
similarity index 100%
rename from test/javascripts/widgets/post-links-test.js.es6
rename to test/javascripts/widgets/post-links-test.js
diff --git a/test/javascripts/widgets/post-stream-test.js.es6 b/test/javascripts/widgets/post-stream-test.js
similarity index 100%
rename from test/javascripts/widgets/post-stream-test.js.es6
rename to test/javascripts/widgets/post-stream-test.js
diff --git a/test/javascripts/widgets/post-test.js.es6 b/test/javascripts/widgets/post-test.js
similarity index 100%
rename from test/javascripts/widgets/post-test.js.es6
rename to test/javascripts/widgets/post-test.js
diff --git a/test/javascripts/widgets/poster-name-test.js.es6 b/test/javascripts/widgets/poster-name-test.js
similarity index 100%
rename from test/javascripts/widgets/poster-name-test.js.es6
rename to test/javascripts/widgets/poster-name-test.js
diff --git a/test/javascripts/widgets/quick-access-item-test.js.es6 b/test/javascripts/widgets/quick-access-item-test.js
similarity index 100%
rename from test/javascripts/widgets/quick-access-item-test.js.es6
rename to test/javascripts/widgets/quick-access-item-test.js
diff --git a/test/javascripts/widgets/topic-admin-menu-test.js.es6 b/test/javascripts/widgets/topic-admin-menu-test.js
similarity index 100%
rename from test/javascripts/widgets/topic-admin-menu-test.js.es6
rename to test/javascripts/widgets/topic-admin-menu-test.js
diff --git a/test/javascripts/widgets/topic-participant-test.js.es6 b/test/javascripts/widgets/topic-participant-test.js
similarity index 100%
rename from test/javascripts/widgets/topic-participant-test.js.es6
rename to test/javascripts/widgets/topic-participant-test.js
diff --git a/test/javascripts/widgets/topic-status-test.js.es6 b/test/javascripts/widgets/topic-status-test.js
similarity index 100%
rename from test/javascripts/widgets/topic-status-test.js.es6
rename to test/javascripts/widgets/topic-status-test.js
diff --git a/test/javascripts/widgets/user-menu-test.js.es6 b/test/javascripts/widgets/user-menu-test.js
similarity index 100%
rename from test/javascripts/widgets/user-menu-test.js.es6
rename to test/javascripts/widgets/user-menu-test.js
diff --git a/test/javascripts/widgets/widget-test.js.es6 b/test/javascripts/widgets/widget-test.js
similarity index 100%
rename from test/javascripts/widgets/widget-test.js.es6
rename to test/javascripts/widgets/widget-test.js

From f68c3d51fcf89d22ebc2dc343fe23b435587686a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 14:51:49 -0400
Subject: [PATCH 0363/1830] Another ignore entry

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index eec6fc3a2f..5167656c3c 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -34,3 +34,6 @@ acc5cbdf8ecb9293a0fa9474ee73baf499c02428
 
 # The last remaining ES6
 aabeb17aab4e73de5ef56753ab22ef5d416d2932
+
+# All test files es6 -> js
+2bf9b997eadd617e9a674360fa2be2a9c0bdc48b

From 5d66a2c16e6bd21246e6becbef34da8ed07926bc Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 15:03:02 -0400
Subject: [PATCH 0364/1830] Move the widget-hbs compiler to js from es6

---
 lib/discourse_js_processor.rb                               | 6 +++---
 .../{widget-hbs-compiler.js.es6 => widget-hbs-compiler.js}  | 0
 script/compile_hbs.rb                                       | 2 +-
 script/test_hbs_compiler.rb                                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename lib/javascripts/{widget-hbs-compiler.js.es6 => widget-hbs-compiler.js} (100%)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 4060b16225..fdf61e9e1c 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -55,8 +55,8 @@ class DiscourseJsProcessor
       embed-application
     ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
 
-    relative_path =~ /^#{js_root}\/[^\/]+\// ||
-      relative_path =~ /^#{test_root}\/[^\/]+\//
+    !!(relative_path =~ /^#{js_root}\/[^\/]+\// ||
+      relative_path =~ /^#{test_root}\/[^\/]+\//)
   end
 
   def self.skip_module?(data)
@@ -87,7 +87,7 @@ class DiscourseJsProcessor
       }
 
 JS
-      source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
+      source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
       js_source = ::JSON.generate(source, quirks_mode: true)
       js = ctx.eval("Babel.transform(#{js_source}, { ast: false, plugins: ['check-es2015-constants', 'transform-es2015-arrow-functions', 'transform-es2015-block-scoped-functions', 'transform-es2015-block-scoping', 'transform-es2015-classes', 'transform-es2015-computed-properties', 'transform-es2015-destructuring', 'transform-es2015-duplicate-keys', 'transform-es2015-for-of', 'transform-es2015-function-name', 'transform-es2015-literals', 'transform-es2015-object-super', 'transform-es2015-parameters', 'transform-es2015-shorthand-properties', 'transform-es2015-spread', 'transform-es2015-sticky-regex', 'transform-es2015-template-literals', 'transform-es2015-typeof-symbol', 'transform-es2015-unicode-regex'] }).code")
       ctx.eval(js)
diff --git a/lib/javascripts/widget-hbs-compiler.js.es6 b/lib/javascripts/widget-hbs-compiler.js
similarity index 100%
rename from lib/javascripts/widget-hbs-compiler.js.es6
rename to lib/javascripts/widget-hbs-compiler.js
diff --git a/script/compile_hbs.rb b/script/compile_hbs.rb
index cfec4386a2..ee072ea35d 100644
--- a/script/compile_hbs.rb
+++ b/script/compile_hbs.rb
@@ -14,7 +14,7 @@ console = {
 }
 
 JS
-source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
+source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
 js_source = ::JSON.generate(source, quirks_mode: true)
 js = ctx.eval("Babel.transform(#{js_source}, { ast: false, plugins: ['check-es2015-constants', 'transform-es2015-arrow-functions', 'transform-es2015-block-scoped-functions', 'transform-es2015-block-scoping', 'transform-es2015-classes', 'transform-es2015-computed-properties', 'transform-es2015-destructuring', 'transform-es2015-duplicate-keys', 'transform-es2015-for-of', 'transform-es2015-function-name', 'transform-es2015-literals', 'transform-es2015-object-super', 'transform-es2015-parameters', 'transform-es2015-shorthand-properties', 'transform-es2015-spread', 'transform-es2015-sticky-regex', 'transform-es2015-template-literals', 'transform-es2015-typeof-symbol', 'transform-es2015-unicode-regex'] }).code")
 ctx.eval(js)
diff --git a/script/test_hbs_compiler.rb b/script/test_hbs_compiler.rb
index badbd227e4..f3c5be35c1 100644
--- a/script/test_hbs_compiler.rb
+++ b/script/test_hbs_compiler.rb
@@ -22,7 +22,7 @@ console = {
 }
 
 JS
-source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
+source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
 ctx.eval(source)
 
 js_source = ::JSON.generate(template, quirks_mode: true)

From 661aebdc877a80f7debb93c4d727f2242084908f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 15:40:45 -0400
Subject: [PATCH 0365/1830] FIX: Resolver wasn't being set properly

---
 test/javascripts/test_helper.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index c2c3520a3b..77598e4712 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -1,3 +1,5 @@
+// discourse-skip-module
+
 /*global document, sinon, QUnit, Logster */
 //= require env
 //= require jquery.debug
@@ -42,6 +44,9 @@
 //
 //= require jquery.magnific-popup.min.js
 
+const buildResolver = require("discourse-common/resolver").buildResolver;
+window.setResolver(buildResolver("discourse").create({ namespace: Discourse }));
+
 sinon.config = {
   injectIntoThis: false,
   injectInto: null,
@@ -103,7 +108,7 @@ function resetSite(siteSettings, extras) {
 QUnit.testStart(function(ctx) {
   server = createPretender.default;
   createPretender.applyDefaultHandlers(server);
-  server.handlers = []
+  server.handlers = [];
 
   server.prepareBody = function(body) {
     if (body && typeof body === "object") {

From 6d1263812f9c23c05683868b82f611964c28e14d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 16:05:16 -0400
Subject: [PATCH 0366/1830] FIX: Allow JS transpilation

---
 app/assets/stylesheets/common/base/onebox.scss | 1 +
 app/models/theme_field.rb                      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 694ea8214a..7c5c10ec6b 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -15,6 +15,7 @@ a.loading-onebox {
   }
 }
 
+// test
 .onebox-result {
   @include post-aside;
 
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index 085a0e649e..ed0966fb5c 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -134,7 +134,7 @@ class ThemeField < ActiveRecord::Base
     filename, extension = name.split(".", 2)
     begin
       case extension
-      when "js.es6"
+      when "js.es6", "js"
         js_compiler.append_module(content, filename)
       when "hbs"
         js_compiler.append_ember_template(filename.sub("discourse/templates/", ""), content)

From a12c7fcb2f76995f21cc1222add968ed2aedece3 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 16:13:01 -0400
Subject: [PATCH 0367/1830] Revert "FIX: Allow JS transpilation"

This reverts commit 6d1263812f9c23c05683868b82f611964c28e14d.
---
 app/assets/stylesheets/common/base/onebox.scss | 1 -
 app/models/theme_field.rb                      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 7c5c10ec6b..694ea8214a 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -15,7 +15,6 @@ a.loading-onebox {
   }
 }
 
-// test
 .onebox-result {
   @include post-aside;
 
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index ed0966fb5c..085a0e649e 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -134,7 +134,7 @@ class ThemeField < ActiveRecord::Base
     filename, extension = name.split(".", 2)
     begin
       case extension
-      when "js.es6", "js"
+      when "js.es6"
         js_compiler.append_module(content, filename)
       when "hbs"
         js_compiler.append_ember_template(filename.sub("discourse/templates/", ""), content)

From 8316500a3919992858861b6edadd440cb61d2d39 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 16:13:18 -0400
Subject: [PATCH 0368/1830] Revert "FIX: Resolver wasn't being set properly"

This reverts commit 661aebdc877a80f7debb93c4d727f2242084908f.
---
 test/javascripts/test_helper.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 77598e4712..c2c3520a3b 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -1,5 +1,3 @@
-// discourse-skip-module
-
 /*global document, sinon, QUnit, Logster */
 //= require env
 //= require jquery.debug
@@ -44,9 +42,6 @@
 //
 //= require jquery.magnific-popup.min.js
 
-const buildResolver = require("discourse-common/resolver").buildResolver;
-window.setResolver(buildResolver("discourse").create({ namespace: Discourse }));
-
 sinon.config = {
   injectIntoThis: false,
   injectInto: null,
@@ -108,7 +103,7 @@ function resetSite(siteSettings, extras) {
 QUnit.testStart(function(ctx) {
   server = createPretender.default;
   createPretender.applyDefaultHandlers(server);
-  server.handlers = [];
+  server.handlers = []
 
   server.prepareBody = function(body) {
     if (body && typeof body === "object") {

From eaa324ecbd4a131a4dde5fe79da11133e85f9480 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 16:13:26 -0400
Subject: [PATCH 0369/1830] Revert "Move the widget-hbs compiler to js from
 es6"

This reverts commit 5d66a2c16e6bd21246e6becbef34da8ed07926bc.
---
 lib/discourse_js_processor.rb                               | 6 +++---
 .../{widget-hbs-compiler.js => widget-hbs-compiler.js.es6}  | 0
 script/compile_hbs.rb                                       | 2 +-
 script/test_hbs_compiler.rb                                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename lib/javascripts/{widget-hbs-compiler.js => widget-hbs-compiler.js.es6} (100%)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index fdf61e9e1c..4060b16225 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -55,8 +55,8 @@ class DiscourseJsProcessor
       embed-application
     ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
 
-    !!(relative_path =~ /^#{js_root}\/[^\/]+\// ||
-      relative_path =~ /^#{test_root}\/[^\/]+\//)
+    relative_path =~ /^#{js_root}\/[^\/]+\// ||
+      relative_path =~ /^#{test_root}\/[^\/]+\//
   end
 
   def self.skip_module?(data)
@@ -87,7 +87,7 @@ class DiscourseJsProcessor
       }
 
 JS
-      source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
+      source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
       js_source = ::JSON.generate(source, quirks_mode: true)
       js = ctx.eval("Babel.transform(#{js_source}, { ast: false, plugins: ['check-es2015-constants', 'transform-es2015-arrow-functions', 'transform-es2015-block-scoped-functions', 'transform-es2015-block-scoping', 'transform-es2015-classes', 'transform-es2015-computed-properties', 'transform-es2015-destructuring', 'transform-es2015-duplicate-keys', 'transform-es2015-for-of', 'transform-es2015-function-name', 'transform-es2015-literals', 'transform-es2015-object-super', 'transform-es2015-parameters', 'transform-es2015-shorthand-properties', 'transform-es2015-spread', 'transform-es2015-sticky-regex', 'transform-es2015-template-literals', 'transform-es2015-typeof-symbol', 'transform-es2015-unicode-regex'] }).code")
       ctx.eval(js)
diff --git a/lib/javascripts/widget-hbs-compiler.js b/lib/javascripts/widget-hbs-compiler.js.es6
similarity index 100%
rename from lib/javascripts/widget-hbs-compiler.js
rename to lib/javascripts/widget-hbs-compiler.js.es6
diff --git a/script/compile_hbs.rb b/script/compile_hbs.rb
index ee072ea35d..cfec4386a2 100644
--- a/script/compile_hbs.rb
+++ b/script/compile_hbs.rb
@@ -14,7 +14,7 @@ console = {
 }
 
 JS
-source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
+source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
 js_source = ::JSON.generate(source, quirks_mode: true)
 js = ctx.eval("Babel.transform(#{js_source}, { ast: false, plugins: ['check-es2015-constants', 'transform-es2015-arrow-functions', 'transform-es2015-block-scoped-functions', 'transform-es2015-block-scoping', 'transform-es2015-classes', 'transform-es2015-computed-properties', 'transform-es2015-destructuring', 'transform-es2015-duplicate-keys', 'transform-es2015-for-of', 'transform-es2015-function-name', 'transform-es2015-literals', 'transform-es2015-object-super', 'transform-es2015-parameters', 'transform-es2015-shorthand-properties', 'transform-es2015-spread', 'transform-es2015-sticky-regex', 'transform-es2015-template-literals', 'transform-es2015-typeof-symbol', 'transform-es2015-unicode-regex'] }).code")
 ctx.eval(js)
diff --git a/script/test_hbs_compiler.rb b/script/test_hbs_compiler.rb
index f3c5be35c1..badbd227e4 100644
--- a/script/test_hbs_compiler.rb
+++ b/script/test_hbs_compiler.rb
@@ -22,7 +22,7 @@ console = {
 }
 
 JS
-source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
+source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
 ctx.eval(source)
 
 js_source = ::JSON.generate(template, quirks_mode: true)

From a42668ead08e996aa71ad10fb3373aafcf35c68f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 16:13:33 -0400
Subject: [PATCH 0370/1830] Revert "Another ignore entry"

This reverts commit f68c3d51fcf89d22ebc2dc343fe23b435587686a.
---
 .git-blame-ignore-revs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 5167656c3c..eec6fc3a2f 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -34,6 +34,3 @@ acc5cbdf8ecb9293a0fa9474ee73baf499c02428
 
 # The last remaining ES6
 aabeb17aab4e73de5ef56753ab22ef5d416d2932
-
-# All test files es6 -> js
-2bf9b997eadd617e9a674360fa2be2a9c0bdc48b

From 4fa580fbd13f87a295a31d83bf142e9fb56395ac Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 25 Mar 2020 16:13:43 -0400
Subject: [PATCH 0371/1830] Revert "Rename all test files from JS -> ES6"

This reverts commit 2abe85b8344de1102c1589a9ac9421a8b296f2b5.
---
 lib/discourse_js_processor.rb                 | 39 +++++++++----------
 .../{about-test.js => about-test.js.es6}      |  0
 ...ed-test.js => account-created-test.js.es6} |  0
 ...mails-test.js => admin-emails-test.js.es6} |  0
 ...t.js => admin-search-log-term-test.js.es6} |  0
 ...-test.js => admin-search-logs-test.js.es6} |  0
 ...est.js => admin-site-settings-test.js.es6} |  0
 ...xt-test.js => admin-site-text-test.js.es6} |  0
 ...test.js => admin-suspend-user-test.js.es6} |  0
 ...-test.js => admin-user-badges-test.js.es6} |  0
 ...-test.js => admin-user-emails-test.js.es6} |  0
 ...x-test.js => admin-user-index-test.js.es6} |  0
 ...t-test.js => admin-users-list-test.js.es6} |  0
 ...est.js => admin-watched-words-test.js.es6} |  0
 ...lete-test.js => auth-complete-test.js.es6} |  0
 .../{badges-test.js => badges-test.js.es6}    |  0
 ...r-test.js => category-chooser-test.js.es6} |  0
 ....js => category-edit-security-test.js.es6} |  0
 ...edit-test.js => category-edit-test.js.es6} |  0
 ...g-test.js => category-hashtag-test.js.es6} |  0
 ...-track-test.js => click-track-test.js.es6} |  0
 ...s-test.js => composer-actions-test.js.es6} |  0
 ...est.js => composer-attachment-test.js.es6} |  0
 ....js => composer-edit-conflict-test.js.es6} |  0
 ...test.js => composer-hyperlink-test.js.es6} |  0
 ...ox-test.js => composer-onebox-test.js.es6} |  0
 ...{composer-test.js => composer-test.js.es6} |  0
 ...st.js => composer-topic-links-test.js.es6} |  0
 ....js => composer-uncategorized-test.js.es6} |  0
 ...=> create-account-user-fields-test.js.es6} |  0
 ...et-test.js => custom-html-set-test.js.es6} |  0
 ...st.js => custom-html-template-test.js.es6} |  0
 ...ashboard-test.js => dashboard-test.js.es6} |  0
 ...otice-test.js => email-notice-test.js.es6} |  0
 ...icker-test.js => emoji-picker-test.js.es6} |  0
 .../{emoji-test.js => emoji-test.js.es6}      |  0
 ...t.js => enforce-second-factor-test.js.es6} |  0
 ...rd-test.js => forgot-password-test.js.es6} |  0
 ...-test.js => group-card-mobile-test.js.es6} |  0
 ...up-card-test.js => group-card-test.js.es6} |  0
 ...-index-test.js => group-index-test.js.es6} |  0
 ...s => group-manage-interaction-test.js.es6} |  0
 ...-test.js => group-manage-logs-test.js.es6} |  0
 ...js => group-manage-membership-test.js.es6} |  0
 ...st.js => group-manage-profile-test.js.es6} |  0
 ...sts-test.js => group-requests-test.js.es6} |  0
 .../{group-test.js => group-test.js.es6}      |  0
 ...index-test.js => groups-index-test.js.es6} |  0
 ...ups-new-test.js => groups-new-test.js.es6} |  0
 ...cept-test.js => invite-accept-test.js.es6} |  0
 ...js => invite-show-user-fields-test.js.es6} |  0
 .../{jump-to-test.js => jump-to-test.js.es6}  |  0
 ...test.js => keyboard-shortcuts-test.js.es6} |  0
 ...ect-test.js => login-redirect-test.js.es6} |  0
 ...red-test.js => login-required-test.js.es6} |  0
 ...-and-hide-email-address-taken-test.js.es6} |  0
 ...th-email-and-no-social-logins-test.js.es6} |  0
 ... => login-with-email-disabled-test.js.es6} |  0
 ...l-test.js => login-with-email-test.js.es6} |  0
 ...y-test.js => mobile-discovery-test.js.es6} |  0
 ...-in-test.js => mobile-sign-in-test.js.es6} |  0
 ...users-test.js => mobile-users-test.js.es6} |  0
 .../{modal-test.js => modal-test.js.es6}      |  0
 ...essage-test.js => new-message-test.js.es6} |  0
 ...ew-topic-test.js => new-topic-test.js.es6} |  0
 ...set-test.js => password-reset-test.js.es6} |  0
 ...e-test.js => personal-message-test.js.es6} |  0
 ...plugin-outlet-connector-class-test.js.es6} |  0
 ...js => plugin-outlet-decorator-test.js.es6} |  0
 ... plugin-outlet-multi-template-test.js.es6} |  0
 ...plugin-outlet-single-template-test.js.es6} |  0
 ...rences-test.js => preferences-test.js.es6} |  0
 ...-test.js => raw-plugin-outlet-test.js.es6} |  0
 ...op-test.js => redirect-to-top-test.js.es6} |  0
 .../{reports-test.js => reports-test.js.es6}  |  0
 .../{review-test.js => review-test.js.es6}    |  0
 ...h-full-test.js => search-full-test.js.es6} |  0
 ...bile-test.js => search-mobile-test.js.es6} |  0
 .../{search-test.js => search-test.js.es6}    |  0
 ...s => share-and-invite-desktop-test.js.es6} |  0
 ...js => share-and-invite-mobile-test.js.es6} |  0
 ...afts-test.js => shared-drafts-test.js.es6} |  0
 .../{sign-in-test.js => sign-in-test.js.es6}  |  0
 .../{static-test.js => static-test.js.es6}    |  0
 ...-groups-test.js => tag-groups-test.js.es6} |  0
 ...ashtag-test.js => tag-hashtag-test.js.es6} |  0
 ...-test.js => tags-intersection-test.js.es6} |  0
 .../{tags-test.js => tags-test.js.es6}        |  0
 ...us-test.js => topic-anonymous-test.js.es6} |  0
 ...ry-test.js => topic-discovery-test.js.es6} |  0
 ...r-test.js => topic-edit-timer-test.js.es6} |  0
 ...> topic-footer-buttons-mobile-test.js.es6} |  0
 ...s-test.js => topic-move-posts-test.js.es6} |  0
 ...=> topic-notifications-button-test.js.es6} |  0
 .../{topic-test.js => topic-test.js.es6}      |  0
 .../{unknown-test.js => unknown-test.js.es6}  |  0
 ...ous-test.js => user-anonymous-test.js.es6} |  0
 ...e-test.js => user-card-mobile-test.js.es6} |  0
 ...ser-card-test.js => user-card-test.js.es6} |  0
 ...test.js => user-drafts-stream-test.js.es6} |  0
 .../{user-test.js => user-test.js.es6}        |  0
 .../{users-test.js => users-test.js.es6}      |  0
 ...test.js => group-list-setting-test.js.es6} |  0
 ...m-test.js => themes-list-item-test.js.es6} |  0
 ...s-list-test.js => themes-list-test.js.es6} |  0
 ...> admin-customize-themes-show-test.js.es6} |  0
 ....js => admin-customize-themes-test.js.es6} |  0
 ...-test.js => admin-user-badges-test.js.es6} |  0
 .../{theme-test.js => theme-test.js.es6}      |  0
 ...-editor-test.js => ace-editor-test.js.es6} |  0
 ...eport-test.js => admin-report-test.js.es6} |  0
 ...-title-test.js => badge-title-test.js.es6} |  0
 ...{d-button-test.js => d-button-test.js.es6} |  0
 ...{d-editor-test.js => d-editor-test.js.es6} |  0
 .../{d-icon-test.js => d-icon-test.js.es6}    |  0
 ...e-input-test.js => date-input-test.js.es6} |  0
 ...t.js => date-time-input-range-test.js.es6} |  0
 ...ut-test.js => date-time-input-test.js.es6} |  0
 ...js => group-membership-button-test.js.es6} |  0
 ...r-test.js => html-safe-helper-test.js.es6} |  0
 ...-html-test.js => iframed-html-test.js.es6} |  0
 ...der-test.js => image-uploader-test.js.es6} |  0
 ...test.js => keyboard-shortcuts-test.js.es6} |  0
 ...oad-more-test.js => load-more-test.js.es6} |  0
 ...-test.js => secret-value-list-test.js.es6} |  0
 ...r-test.js => category-chooser-test.js.es6} |  0
 ...drop-test.js => category-drop-test.js.es6} |  0
 ...ombo-box-test.js => combo-box-test.js.es6} |  0
 ...est.js => dropdown-select-box-test.js.es6} |  0
 ...tting-test.js => list-setting-test.js.es6} |  0
 ...r-test.js => mini-tag-chooser-test.js.es6} |  0
 ...elect-test.js => multi-select-test.js.es6} |  0
 ...st.js => notifications-button-test.js.es6} |  0
 ...ons-test.js => pinned-options-test.js.es6} |  0
 ...elper.js => select-kit-test-helper.js.es6} |  0
 ...lect-test.js => single-select-test.js.es6} |  0
 ...{tag-drop-test.js => tag-drop-test.js.es6} |  0
 ...=> topic-notifications-button-test.js.es6} |  0
 ...> topic-notifications-options-test.js.es6} |  0
 ...ooser-test.js => user-chooser-test.js.es6} |  0
 ...utton-test.js => share-button-test.js.es6} |  0
 .../{share-button.js => share-button.js.es6}  |  0
 ...t-field-test.js => text-field-test.js.es6} |  0
 ...flow-test.js => text-overflow-test.js.es6} |  0
 ...e-input-test.js => time-input-test.js.es6} |  0
 ...ctor-test.js => user-selector-test.js.es6} |  0
 ...ue-list-test.js => value-list-test.js.es6} |  0
 ...or-test.js => avatar-selector-test.js.es6} |  0
 ...{bookmark-test.js => bookmark-test.js.es6} |  0
 ...unt-test.js => create-account-test.js.es6} |  0
 .../{group-test.js => group-test.js.es6}      |  0
 .../{history-test.js => history-test.js.es6}  |  0
 ...est.js => preferences-account-test.js.es6} |  0
 ... => preferences-second-factor-test.js.es6} |  0
 ...test.js => reorder-categories-test.js.es6} |  0
 .../{topic-test.js => topic-test.js.es6}      |  0
 ...{resolver-test.js => resolver-test.js.es6} |  0
 .../fixtures/{about.js => about.js.es6}       |  0
 ...adges_fixture.js => badges_fixture.js.es6} |  0
 ...y-fixtures.js => category-fixtures.js.es6} |  0
 ...s.js.erb => notification-types.js.es6.erb} |  0
 ...rd-general.js => dashboard-general.js.es6} |  0
 .../{dashboard.js => dashboard.js.es6}        |  0
 ...-fixtures.js => directory-fixtures.js.es6} |  0
 ..._fixtures.js => discovery_fixtures.js.es6} |  0
 .../fixtures/{draft.js => draft.js.es6}       |  0
 .../fixtures/{drafts.js => drafts.js.es6}     |  0
 ...roup-fixtures.js => group-fixtures.js.es6} |  0
 ...ups-fixtures.js => groups-fixtures.js.es6} |  0
 ...xtures.js => notification_fixtures.js.es6} |  0
 .../fixtures/{poll.js => poll.js.es6}         |  0
 .../fixtures/{post.js => post.js.es6}         |  0
 ...es.js => private_messages_fixtures.js.es6} |  0
 .../fixtures/{problems.js => problems.js.es6} |  0
 .../fixtures/{reports.js => reports.js.es6}   |  0
 .../{reports_bulk.js => reports_bulk.js.es6}  |  0
 ...rch-fixtures.js => search-fixtures.js.es6} |  0
 ...on-fixtures.js => session-fixtures.js.es6} |  0
 ...{site-fixtures.js => site-fixtures.js.es6} |  0
 ...{site_settings.js => site_settings.js.es6} |  0
 ...tic_fixtures.js => static_fixtures.js.es6} |  0
 .../{top_fixture.js => top_fixture.js.es6}    |  0
 .../fixtures/{topic.js => topic.js.es6}       |  0
 .../{user-badges.js => user-badges.js.es6}    |  0
 ...{user_fixtures.js => user_fixtures.js.es6} |  0
 ...tures.js => watched-words-fixtures.js.es6} |  0
 test/javascripts/helpers/assertions.js        | 13 +++----
 ...omponent-test.js => component-test.js.es6} |  0
 ...e-pretender.js => create-pretender.js.es6} |  0
 .../{create-store.js => create-store.js.es6}  |  0
 ...ditor-helper.js => d-editor-helper.js.es6} |  0
 ...-pretender.js => fixture-pretender.js.es6} |  0
 .../{html-helper.js => html-helper.js.es6}    |  0
 test/javascripts/helpers/init-ember-qunit.js  |  2 +
 ...{qunit-helpers.js => qunit-helpers.js.es6} |  0
 ...w-pretender.js => review-pretender.js.es6} |  0
 ...kit-helper.js => select-kit-helper.js.es6} |  0
 test/javascripts/helpers/site-settings.js     | 10 ++---
 .../helpers/{site.js => site.js.es6}          |  0
 ...re-pretender.js => store-pretender.js.es6} |  0
 ...er.js => textarea-selection-helper.js.es6} |  0
 .../{widget-test.js => widget-test.js.es6}    |  0
 ...ation-test.js => localization-test.js.es6} |  0
 .../{bbcode-test.js => bbcode-test.js.es6}    |  0
 ...tring-test.js => break-string-test.js.es6} |  0
 ...dge-test.js => category-badge-test.js.es6} |  0
 ...s => click-track-edit-history-test.js.es6} |  0
 ...s => click-track-profile-page-test.js.es6} |  0
 ...-track-test.js => click-track-test.js.es6} |  0
 ...{computed-test.js => computed-test.js.es6} |  0
 ...iscourse-test.js => discourse-test.js.es6} |  0
 ...-store-test.js => emoji-store-test.js.es6} |  0
 .../lib/{emoji-test.js => emoji-test.js.es6}  |  0
 ...ormatter-test.js => formatter-test.js.es6} |  0
 ...ext-test.js => highlight-text-test.js.es6} |  0
 .../lib/{i18n-test.js => i18n-test.js.es6}    |  0
 ...brary-test.js => icon-library-test.js.es6} |  0
 ...re-test.js => key-value-store-test.js.es6} |  0
 ...ions-test.js => link-mentions-test.js.es6} |  0
 ...script-test.js => load-script-test.js.es6} |  0
 ...{oneboxer-test.js => oneboxer-test.js.es6} |  0
 ...tore-test.js => preload-store-test.js.es6} |  0
 ...y-text-test.js => pretty-text-test.js.es6} |  0
 ...anitizer-test.js => sanitizer-test.js.es6} |  0
 ...track-test.js => screen-track-test.js.es6} |  0
 .../{search-test.js => search-test.js.es6}    |  0
 .../{sharing-test.js => sharing-test.js.es6}  |  0
 ...ion-test.js => text-direction-test.js.es6} |  0
 ...rkdown-test.js => to-markdown-test.js.es6} |  0
 .../{tooltip-test.js => tooltip-test.js.es6}  |  0
 ...l-test.js => upload-short-url-test.js.es6} |  0
 .../{uploads-test.js => uploads-test.js.es6}  |  0
 .../lib/{url-test.js => url-test.js.es6}      |  0
 ...search-test.js => user-search-test.js.es6} |  0
 ...tilities-test.js => utilities-test.js.es6} |  0
 ...ister-test.js => white-lister-test.js.es6} |  0
 ....js => grant-badge-controller-test.js.es6} |  0
 ...ect-test.js => setting-object-test.js.es6} |  0
 ...ingleton-test.js => singleton-test.js.es6} |  0
 .../{badge-test.js => badge-test.js.es6}      |  0
 ...{category-test.js => category-test.js.es6} |  0
 ...{composer-test.js => composer-test.js.es6} |  0
 ...mail-log-test.js => email-log-test.js.es6} |  0
 .../{group-test.js => group-test.js.es6}      |  0
 .../{invite-test.js => invite-test.js.es6}    |  0
 ...{nav-item-test.js => nav-item-test.js.es6} |  0
 ...stream-test.js => post-stream-test.js.es6} |  0
 .../models/{post-test.js => post-test.js.es6} |  0
 .../{report-test.js => report-test.js.es6}    |  0
 ...t-model-test.js => rest-model-test.js.es6} |  0
 ...ult-set-test.js => result-set-test.js.es6} |  0
 .../{session-test.js => session-test.js.es6}  |  0
 .../models/{site-test.js => site-test.js.es6} |  0
 ...g-test.js => staff-action-log-test.js.es6} |  0
 .../{store-test.js => store-test.js.es6}      |  0
 ...ails-test.js => topic-details-test.js.es6} |  0
 .../{topic-test.js => topic-test.js.es6}      |  0
 ...st.js => topic-tracking-state-test.js.es6} |  0
 ...action-test.js => user-action-test.js.es6} |  0
 ...r-badge-test.js => user-badge-test.js.es6} |  0
 ...drafts-test.js => user-drafts-test.js.es6} |  0
 ...stream-test.js => user-stream-test.js.es6} |  0
 .../models/{user-test.js => user-test.js.es6} |  0
 ...orators-test.js => decorators-test.js.es6} |  0
 ...ry-test.js => actions-summary-test.js.es6} |  0
 ...flair-test.js => avatar-flair-test.js.es6} |  0
 .../{button-test.js => button-test.js.es6}    |  0
 ... => default-notification-item-test.js.es6} |  0
 ...enu-test.js => hamburger-menu-test.js.es6} |  0
 .../{header-test.js => header-test.js.es6}    |  0
 ...ome-logo-test.js => home-logo-test.js.es6} |  0
 ...t-links-test.js => post-links-test.js.es6} |  0
 ...stream-test.js => post-stream-test.js.es6} |  0
 .../{post-test.js => post-test.js.es6}        |  0
 ...r-name-test.js => poster-name-test.js.es6} |  0
 ...-test.js => quick-access-item-test.js.es6} |  0
 ...u-test.js => topic-admin-menu-test.js.es6} |  0
 ...-test.js => topic-participant-test.js.es6} |  0
 ...tatus-test.js => topic-status-test.js.es6} |  0
 ...ser-menu-test.js => user-menu-test.js.es6} |  0
 .../{widget-test.js => widget-test.js.es6}    |  0
 281 files changed, 29 insertions(+), 35 deletions(-)
 rename test/javascripts/acceptance/{about-test.js => about-test.js.es6} (100%)
 rename test/javascripts/acceptance/{account-created-test.js => account-created-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-emails-test.js => admin-emails-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-search-log-term-test.js => admin-search-log-term-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-search-logs-test.js => admin-search-logs-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-site-settings-test.js => admin-site-settings-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-site-text-test.js => admin-site-text-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-suspend-user-test.js => admin-suspend-user-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-user-badges-test.js => admin-user-badges-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-user-emails-test.js => admin-user-emails-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-user-index-test.js => admin-user-index-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-users-list-test.js => admin-users-list-test.js.es6} (100%)
 rename test/javascripts/acceptance/{admin-watched-words-test.js => admin-watched-words-test.js.es6} (100%)
 rename test/javascripts/acceptance/{auth-complete-test.js => auth-complete-test.js.es6} (100%)
 rename test/javascripts/acceptance/{badges-test.js => badges-test.js.es6} (100%)
 rename test/javascripts/acceptance/{category-chooser-test.js => category-chooser-test.js.es6} (100%)
 rename test/javascripts/acceptance/{category-edit-security-test.js => category-edit-security-test.js.es6} (100%)
 rename test/javascripts/acceptance/{category-edit-test.js => category-edit-test.js.es6} (100%)
 rename test/javascripts/acceptance/{category-hashtag-test.js => category-hashtag-test.js.es6} (100%)
 rename test/javascripts/acceptance/{click-track-test.js => click-track-test.js.es6} (100%)
 rename test/javascripts/acceptance/{composer-actions-test.js => composer-actions-test.js.es6} (100%)
 rename test/javascripts/acceptance/{composer-attachment-test.js => composer-attachment-test.js.es6} (100%)
 rename test/javascripts/acceptance/{composer-edit-conflict-test.js => composer-edit-conflict-test.js.es6} (100%)
 rename test/javascripts/acceptance/{composer-hyperlink-test.js => composer-hyperlink-test.js.es6} (100%)
 rename test/javascripts/acceptance/{composer-onebox-test.js => composer-onebox-test.js.es6} (100%)
 rename test/javascripts/acceptance/{composer-test.js => composer-test.js.es6} (100%)
 rename test/javascripts/acceptance/{composer-topic-links-test.js => composer-topic-links-test.js.es6} (100%)
 rename test/javascripts/acceptance/{composer-uncategorized-test.js => composer-uncategorized-test.js.es6} (100%)
 rename test/javascripts/acceptance/{create-account-user-fields-test.js => create-account-user-fields-test.js.es6} (100%)
 rename test/javascripts/acceptance/{custom-html-set-test.js => custom-html-set-test.js.es6} (100%)
 rename test/javascripts/acceptance/{custom-html-template-test.js => custom-html-template-test.js.es6} (100%)
 rename test/javascripts/acceptance/{dashboard-test.js => dashboard-test.js.es6} (100%)
 rename test/javascripts/acceptance/{email-notice-test.js => email-notice-test.js.es6} (100%)
 rename test/javascripts/acceptance/{emoji-picker-test.js => emoji-picker-test.js.es6} (100%)
 rename test/javascripts/acceptance/{emoji-test.js => emoji-test.js.es6} (100%)
 rename test/javascripts/acceptance/{enforce-second-factor-test.js => enforce-second-factor-test.js.es6} (100%)
 rename test/javascripts/acceptance/{forgot-password-test.js => forgot-password-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-card-mobile-test.js => group-card-mobile-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-card-test.js => group-card-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-index-test.js => group-index-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-manage-interaction-test.js => group-manage-interaction-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-manage-logs-test.js => group-manage-logs-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-manage-membership-test.js => group-manage-membership-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-manage-profile-test.js => group-manage-profile-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-requests-test.js => group-requests-test.js.es6} (100%)
 rename test/javascripts/acceptance/{group-test.js => group-test.js.es6} (100%)
 rename test/javascripts/acceptance/{groups-index-test.js => groups-index-test.js.es6} (100%)
 rename test/javascripts/acceptance/{groups-new-test.js => groups-new-test.js.es6} (100%)
 rename test/javascripts/acceptance/{invite-accept-test.js => invite-accept-test.js.es6} (100%)
 rename test/javascripts/acceptance/{invite-show-user-fields-test.js => invite-show-user-fields-test.js.es6} (100%)
 rename test/javascripts/acceptance/{jump-to-test.js => jump-to-test.js.es6} (100%)
 rename test/javascripts/acceptance/{keyboard-shortcuts-test.js => keyboard-shortcuts-test.js.es6} (100%)
 rename test/javascripts/acceptance/{login-redirect-test.js => login-redirect-test.js.es6} (100%)
 rename test/javascripts/acceptance/{login-required-test.js => login-required-test.js.es6} (100%)
 rename test/javascripts/acceptance/{login-with-email-and-hide-email-address-taken-test.js => login-with-email-and-hide-email-address-taken-test.js.es6} (100%)
 rename test/javascripts/acceptance/{login-with-email-and-no-social-logins-test.js => login-with-email-and-no-social-logins-test.js.es6} (100%)
 rename test/javascripts/acceptance/{login-with-email-disabled-test.js => login-with-email-disabled-test.js.es6} (100%)
 rename test/javascripts/acceptance/{login-with-email-test.js => login-with-email-test.js.es6} (100%)
 rename test/javascripts/acceptance/{mobile-discovery-test.js => mobile-discovery-test.js.es6} (100%)
 rename test/javascripts/acceptance/{mobile-sign-in-test.js => mobile-sign-in-test.js.es6} (100%)
 rename test/javascripts/acceptance/{mobile-users-test.js => mobile-users-test.js.es6} (100%)
 rename test/javascripts/acceptance/{modal-test.js => modal-test.js.es6} (100%)
 rename test/javascripts/acceptance/{new-message-test.js => new-message-test.js.es6} (100%)
 rename test/javascripts/acceptance/{new-topic-test.js => new-topic-test.js.es6} (100%)
 rename test/javascripts/acceptance/{password-reset-test.js => password-reset-test.js.es6} (100%)
 rename test/javascripts/acceptance/{personal-message-test.js => personal-message-test.js.es6} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-connector-class-test.js => plugin-outlet-connector-class-test.js.es6} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-decorator-test.js => plugin-outlet-decorator-test.js.es6} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-multi-template-test.js => plugin-outlet-multi-template-test.js.es6} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-single-template-test.js => plugin-outlet-single-template-test.js.es6} (100%)
 rename test/javascripts/acceptance/{preferences-test.js => preferences-test.js.es6} (100%)
 rename test/javascripts/acceptance/{raw-plugin-outlet-test.js => raw-plugin-outlet-test.js.es6} (100%)
 rename test/javascripts/acceptance/{redirect-to-top-test.js => redirect-to-top-test.js.es6} (100%)
 rename test/javascripts/acceptance/{reports-test.js => reports-test.js.es6} (100%)
 rename test/javascripts/acceptance/{review-test.js => review-test.js.es6} (100%)
 rename test/javascripts/acceptance/{search-full-test.js => search-full-test.js.es6} (100%)
 rename test/javascripts/acceptance/{search-mobile-test.js => search-mobile-test.js.es6} (100%)
 rename test/javascripts/acceptance/{search-test.js => search-test.js.es6} (100%)
 rename test/javascripts/acceptance/{share-and-invite-desktop-test.js => share-and-invite-desktop-test.js.es6} (100%)
 rename test/javascripts/acceptance/{share-and-invite-mobile-test.js => share-and-invite-mobile-test.js.es6} (100%)
 rename test/javascripts/acceptance/{shared-drafts-test.js => shared-drafts-test.js.es6} (100%)
 rename test/javascripts/acceptance/{sign-in-test.js => sign-in-test.js.es6} (100%)
 rename test/javascripts/acceptance/{static-test.js => static-test.js.es6} (100%)
 rename test/javascripts/acceptance/{tag-groups-test.js => tag-groups-test.js.es6} (100%)
 rename test/javascripts/acceptance/{tag-hashtag-test.js => tag-hashtag-test.js.es6} (100%)
 rename test/javascripts/acceptance/{tags-intersection-test.js => tags-intersection-test.js.es6} (100%)
 rename test/javascripts/acceptance/{tags-test.js => tags-test.js.es6} (100%)
 rename test/javascripts/acceptance/{topic-anonymous-test.js => topic-anonymous-test.js.es6} (100%)
 rename test/javascripts/acceptance/{topic-discovery-test.js => topic-discovery-test.js.es6} (100%)
 rename test/javascripts/acceptance/{topic-edit-timer-test.js => topic-edit-timer-test.js.es6} (100%)
 rename test/javascripts/acceptance/{topic-footer-buttons-mobile-test.js => topic-footer-buttons-mobile-test.js.es6} (100%)
 rename test/javascripts/acceptance/{topic-move-posts-test.js => topic-move-posts-test.js.es6} (100%)
 rename test/javascripts/acceptance/{topic-notifications-button-test.js => topic-notifications-button-test.js.es6} (100%)
 rename test/javascripts/acceptance/{topic-test.js => topic-test.js.es6} (100%)
 rename test/javascripts/acceptance/{unknown-test.js => unknown-test.js.es6} (100%)
 rename test/javascripts/acceptance/{user-anonymous-test.js => user-anonymous-test.js.es6} (100%)
 rename test/javascripts/acceptance/{user-card-mobile-test.js => user-card-mobile-test.js.es6} (100%)
 rename test/javascripts/acceptance/{user-card-test.js => user-card-test.js.es6} (100%)
 rename test/javascripts/acceptance/{user-drafts-stream-test.js => user-drafts-stream-test.js.es6} (100%)
 rename test/javascripts/acceptance/{user-test.js => user-test.js.es6} (100%)
 rename test/javascripts/acceptance/{users-test.js => users-test.js.es6} (100%)
 rename test/javascripts/admin/components/{group-list-setting-test.js => group-list-setting-test.js.es6} (100%)
 rename test/javascripts/admin/components/{themes-list-item-test.js => themes-list-item-test.js.es6} (100%)
 rename test/javascripts/admin/components/{themes-list-test.js => themes-list-test.js.es6} (100%)
 rename test/javascripts/admin/controllers/{admin-customize-themes-show-test.js => admin-customize-themes-show-test.js.es6} (100%)
 rename test/javascripts/admin/controllers/{admin-customize-themes-test.js => admin-customize-themes-test.js.es6} (100%)
 rename test/javascripts/admin/controllers/{admin-user-badges-test.js => admin-user-badges-test.js.es6} (100%)
 rename test/javascripts/admin/models/{theme-test.js => theme-test.js.es6} (100%)
 rename test/javascripts/components/{ace-editor-test.js => ace-editor-test.js.es6} (100%)
 rename test/javascripts/components/{admin-report-test.js => admin-report-test.js.es6} (100%)
 rename test/javascripts/components/{badge-title-test.js => badge-title-test.js.es6} (100%)
 rename test/javascripts/components/{d-button-test.js => d-button-test.js.es6} (100%)
 rename test/javascripts/components/{d-editor-test.js => d-editor-test.js.es6} (100%)
 rename test/javascripts/components/{d-icon-test.js => d-icon-test.js.es6} (100%)
 rename test/javascripts/components/{date-input-test.js => date-input-test.js.es6} (100%)
 rename test/javascripts/components/{date-time-input-range-test.js => date-time-input-range-test.js.es6} (100%)
 rename test/javascripts/components/{date-time-input-test.js => date-time-input-test.js.es6} (100%)
 rename test/javascripts/components/{group-membership-button-test.js => group-membership-button-test.js.es6} (100%)
 rename test/javascripts/components/{html-safe-helper-test.js => html-safe-helper-test.js.es6} (100%)
 rename test/javascripts/components/{iframed-html-test.js => iframed-html-test.js.es6} (100%)
 rename test/javascripts/components/{image-uploader-test.js => image-uploader-test.js.es6} (100%)
 rename test/javascripts/components/{keyboard-shortcuts-test.js => keyboard-shortcuts-test.js.es6} (100%)
 rename test/javascripts/components/{load-more-test.js => load-more-test.js.es6} (100%)
 rename test/javascripts/components/{secret-value-list-test.js => secret-value-list-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{category-chooser-test.js => category-chooser-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{category-drop-test.js => category-drop-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{combo-box-test.js => combo-box-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{dropdown-select-box-test.js => dropdown-select-box-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{list-setting-test.js => list-setting-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{mini-tag-chooser-test.js => mini-tag-chooser-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{multi-select-test.js => multi-select-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{notifications-button-test.js => notifications-button-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{pinned-options-test.js => pinned-options-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{select-kit-test-helper.js => select-kit-test-helper.js.es6} (100%)
 rename test/javascripts/components/select-kit/{single-select-test.js => single-select-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{tag-drop-test.js => tag-drop-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{topic-notifications-button-test.js => topic-notifications-button-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{topic-notifications-options-test.js => topic-notifications-options-test.js.es6} (100%)
 rename test/javascripts/components/select-kit/{user-chooser-test.js => user-chooser-test.js.es6} (100%)
 rename test/javascripts/components/{share-button-test.js => share-button-test.js.es6} (100%)
 rename test/javascripts/components/{share-button.js => share-button.js.es6} (100%)
 rename test/javascripts/components/{text-field-test.js => text-field-test.js.es6} (100%)
 rename test/javascripts/components/{text-overflow-test.js => text-overflow-test.js.es6} (100%)
 rename test/javascripts/components/{time-input-test.js => time-input-test.js.es6} (100%)
 rename test/javascripts/components/{user-selector-test.js => user-selector-test.js.es6} (100%)
 rename test/javascripts/components/{value-list-test.js => value-list-test.js.es6} (100%)
 rename test/javascripts/controllers/{avatar-selector-test.js => avatar-selector-test.js.es6} (100%)
 rename test/javascripts/controllers/{bookmark-test.js => bookmark-test.js.es6} (100%)
 rename test/javascripts/controllers/{create-account-test.js => create-account-test.js.es6} (100%)
 rename test/javascripts/controllers/{group-test.js => group-test.js.es6} (100%)
 rename test/javascripts/controllers/{history-test.js => history-test.js.es6} (100%)
 rename test/javascripts/controllers/{preferences-account-test.js => preferences-account-test.js.es6} (100%)
 rename test/javascripts/controllers/{preferences-second-factor-test.js => preferences-second-factor-test.js.es6} (100%)
 rename test/javascripts/controllers/{reorder-categories-test.js => reorder-categories-test.js.es6} (100%)
 rename test/javascripts/controllers/{topic-test.js => topic-test.js.es6} (100%)
 rename test/javascripts/ember/{resolver-test.js => resolver-test.js.es6} (100%)
 rename test/javascripts/fixtures/{about.js => about.js.es6} (100%)
 rename test/javascripts/fixtures/{badges_fixture.js => badges_fixture.js.es6} (100%)
 rename test/javascripts/fixtures/{category-fixtures.js => category-fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/concerns/{notification-types.js.erb => notification-types.js.es6.erb} (100%)
 rename test/javascripts/fixtures/{dashboard-general.js => dashboard-general.js.es6} (100%)
 rename test/javascripts/fixtures/{dashboard.js => dashboard.js.es6} (100%)
 rename test/javascripts/fixtures/{directory-fixtures.js => directory-fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{discovery_fixtures.js => discovery_fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{draft.js => draft.js.es6} (100%)
 rename test/javascripts/fixtures/{drafts.js => drafts.js.es6} (100%)
 rename test/javascripts/fixtures/{group-fixtures.js => group-fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{groups-fixtures.js => groups-fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{notification_fixtures.js => notification_fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{poll.js => poll.js.es6} (100%)
 rename test/javascripts/fixtures/{post.js => post.js.es6} (100%)
 rename test/javascripts/fixtures/{private_messages_fixtures.js => private_messages_fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{problems.js => problems.js.es6} (100%)
 rename test/javascripts/fixtures/{reports.js => reports.js.es6} (100%)
 rename test/javascripts/fixtures/{reports_bulk.js => reports_bulk.js.es6} (100%)
 rename test/javascripts/fixtures/{search-fixtures.js => search-fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{session-fixtures.js => session-fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{site-fixtures.js => site-fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{site_settings.js => site_settings.js.es6} (100%)
 rename test/javascripts/fixtures/{static_fixtures.js => static_fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{top_fixture.js => top_fixture.js.es6} (100%)
 rename test/javascripts/fixtures/{topic.js => topic.js.es6} (100%)
 rename test/javascripts/fixtures/{user-badges.js => user-badges.js.es6} (100%)
 rename test/javascripts/fixtures/{user_fixtures.js => user_fixtures.js.es6} (100%)
 rename test/javascripts/fixtures/{watched-words-fixtures.js => watched-words-fixtures.js.es6} (100%)
 rename test/javascripts/helpers/{component-test.js => component-test.js.es6} (100%)
 rename test/javascripts/helpers/{create-pretender.js => create-pretender.js.es6} (100%)
 rename test/javascripts/helpers/{create-store.js => create-store.js.es6} (100%)
 rename test/javascripts/helpers/{d-editor-helper.js => d-editor-helper.js.es6} (100%)
 rename test/javascripts/helpers/{fixture-pretender.js => fixture-pretender.js.es6} (100%)
 rename test/javascripts/helpers/{html-helper.js => html-helper.js.es6} (100%)
 create mode 100644 test/javascripts/helpers/init-ember-qunit.js
 rename test/javascripts/helpers/{qunit-helpers.js => qunit-helpers.js.es6} (100%)
 rename test/javascripts/helpers/{review-pretender.js => review-pretender.js.es6} (100%)
 rename test/javascripts/helpers/{select-kit-helper.js => select-kit-helper.js.es6} (100%)
 rename test/javascripts/helpers/{site.js => site.js.es6} (100%)
 rename test/javascripts/helpers/{store-pretender.js => store-pretender.js.es6} (100%)
 rename test/javascripts/helpers/{textarea-selection-helper.js => textarea-selection-helper.js.es6} (100%)
 rename test/javascripts/helpers/{widget-test.js => widget-test.js.es6} (100%)
 rename test/javascripts/initializers/{localization-test.js => localization-test.js.es6} (100%)
 rename test/javascripts/lib/{bbcode-test.js => bbcode-test.js.es6} (100%)
 rename test/javascripts/lib/{break-string-test.js => break-string-test.js.es6} (100%)
 rename test/javascripts/lib/{category-badge-test.js => category-badge-test.js.es6} (100%)
 rename test/javascripts/lib/{click-track-edit-history-test.js => click-track-edit-history-test.js.es6} (100%)
 rename test/javascripts/lib/{click-track-profile-page-test.js => click-track-profile-page-test.js.es6} (100%)
 rename test/javascripts/lib/{click-track-test.js => click-track-test.js.es6} (100%)
 rename test/javascripts/lib/{computed-test.js => computed-test.js.es6} (100%)
 rename test/javascripts/lib/{discourse-test.js => discourse-test.js.es6} (100%)
 rename test/javascripts/lib/{emoji-store-test.js => emoji-store-test.js.es6} (100%)
 rename test/javascripts/lib/{emoji-test.js => emoji-test.js.es6} (100%)
 rename test/javascripts/lib/{formatter-test.js => formatter-test.js.es6} (100%)
 rename test/javascripts/lib/{highlight-text-test.js => highlight-text-test.js.es6} (100%)
 rename test/javascripts/lib/{i18n-test.js => i18n-test.js.es6} (100%)
 rename test/javascripts/lib/{icon-library-test.js => icon-library-test.js.es6} (100%)
 rename test/javascripts/lib/{key-value-store-test.js => key-value-store-test.js.es6} (100%)
 rename test/javascripts/lib/{link-mentions-test.js => link-mentions-test.js.es6} (100%)
 rename test/javascripts/lib/{load-script-test.js => load-script-test.js.es6} (100%)
 rename test/javascripts/lib/{oneboxer-test.js => oneboxer-test.js.es6} (100%)
 rename test/javascripts/lib/{preload-store-test.js => preload-store-test.js.es6} (100%)
 rename test/javascripts/lib/{pretty-text-test.js => pretty-text-test.js.es6} (100%)
 rename test/javascripts/lib/{sanitizer-test.js => sanitizer-test.js.es6} (100%)
 rename test/javascripts/lib/{screen-track-test.js => screen-track-test.js.es6} (100%)
 rename test/javascripts/lib/{search-test.js => search-test.js.es6} (100%)
 rename test/javascripts/lib/{sharing-test.js => sharing-test.js.es6} (100%)
 rename test/javascripts/lib/{text-direction-test.js => text-direction-test.js.es6} (100%)
 rename test/javascripts/lib/{to-markdown-test.js => to-markdown-test.js.es6} (100%)
 rename test/javascripts/lib/{tooltip-test.js => tooltip-test.js.es6} (100%)
 rename test/javascripts/lib/{upload-short-url-test.js => upload-short-url-test.js.es6} (100%)
 rename test/javascripts/lib/{uploads-test.js => uploads-test.js.es6} (100%)
 rename test/javascripts/lib/{url-test.js => url-test.js.es6} (100%)
 rename test/javascripts/lib/{user-search-test.js => user-search-test.js.es6} (100%)
 rename test/javascripts/lib/{utilities-test.js => utilities-test.js.es6} (100%)
 rename test/javascripts/lib/{white-lister-test.js => white-lister-test.js.es6} (100%)
 rename test/javascripts/mixins/{grant-badge-controller-test.js => grant-badge-controller-test.js.es6} (100%)
 rename test/javascripts/mixins/{setting-object-test.js => setting-object-test.js.es6} (100%)
 rename test/javascripts/mixins/{singleton-test.js => singleton-test.js.es6} (100%)
 rename test/javascripts/models/{badge-test.js => badge-test.js.es6} (100%)
 rename test/javascripts/models/{category-test.js => category-test.js.es6} (100%)
 rename test/javascripts/models/{composer-test.js => composer-test.js.es6} (100%)
 rename test/javascripts/models/{email-log-test.js => email-log-test.js.es6} (100%)
 rename test/javascripts/models/{group-test.js => group-test.js.es6} (100%)
 rename test/javascripts/models/{invite-test.js => invite-test.js.es6} (100%)
 rename test/javascripts/models/{nav-item-test.js => nav-item-test.js.es6} (100%)
 rename test/javascripts/models/{post-stream-test.js => post-stream-test.js.es6} (100%)
 rename test/javascripts/models/{post-test.js => post-test.js.es6} (100%)
 rename test/javascripts/models/{report-test.js => report-test.js.es6} (100%)
 rename test/javascripts/models/{rest-model-test.js => rest-model-test.js.es6} (100%)
 rename test/javascripts/models/{result-set-test.js => result-set-test.js.es6} (100%)
 rename test/javascripts/models/{session-test.js => session-test.js.es6} (100%)
 rename test/javascripts/models/{site-test.js => site-test.js.es6} (100%)
 rename test/javascripts/models/{staff-action-log-test.js => staff-action-log-test.js.es6} (100%)
 rename test/javascripts/models/{store-test.js => store-test.js.es6} (100%)
 rename test/javascripts/models/{topic-details-test.js => topic-details-test.js.es6} (100%)
 rename test/javascripts/models/{topic-test.js => topic-test.js.es6} (100%)
 rename test/javascripts/models/{topic-tracking-state-test.js => topic-tracking-state-test.js.es6} (100%)
 rename test/javascripts/models/{user-action-test.js => user-action-test.js.es6} (100%)
 rename test/javascripts/models/{user-badge-test.js => user-badge-test.js.es6} (100%)
 rename test/javascripts/models/{user-drafts-test.js => user-drafts-test.js.es6} (100%)
 rename test/javascripts/models/{user-stream-test.js => user-stream-test.js.es6} (100%)
 rename test/javascripts/models/{user-test.js => user-test.js.es6} (100%)
 rename test/javascripts/utils/{decorators-test.js => decorators-test.js.es6} (100%)
 rename test/javascripts/widgets/{actions-summary-test.js => actions-summary-test.js.es6} (100%)
 rename test/javascripts/widgets/{avatar-flair-test.js => avatar-flair-test.js.es6} (100%)
 rename test/javascripts/widgets/{button-test.js => button-test.js.es6} (100%)
 rename test/javascripts/widgets/{default-notification-item-test.js => default-notification-item-test.js.es6} (100%)
 rename test/javascripts/widgets/{hamburger-menu-test.js => hamburger-menu-test.js.es6} (100%)
 rename test/javascripts/widgets/{header-test.js => header-test.js.es6} (100%)
 rename test/javascripts/widgets/{home-logo-test.js => home-logo-test.js.es6} (100%)
 rename test/javascripts/widgets/{post-links-test.js => post-links-test.js.es6} (100%)
 rename test/javascripts/widgets/{post-stream-test.js => post-stream-test.js.es6} (100%)
 rename test/javascripts/widgets/{post-test.js => post-test.js.es6} (100%)
 rename test/javascripts/widgets/{poster-name-test.js => poster-name-test.js.es6} (100%)
 rename test/javascripts/widgets/{quick-access-item-test.js => quick-access-item-test.js.es6} (100%)
 rename test/javascripts/widgets/{topic-admin-menu-test.js => topic-admin-menu-test.js.es6} (100%)
 rename test/javascripts/widgets/{topic-participant-test.js => topic-participant-test.js.es6} (100%)
 rename test/javascripts/widgets/{topic-status-test.js => topic-status-test.js.es6} (100%)
 rename test/javascripts/widgets/{user-menu-test.js => user-menu-test.js.es6} (100%)
 rename test/javascripts/widgets/{widget-test.js => widget-test.js.es6} (100%)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 4060b16225..bbadfa84af 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -36,27 +36,24 @@ class DiscourseJsProcessor
     return false unless filename.end_with?(".js") || filename.end_with?(".js.erb")
 
     relative_path = filename.sub(Rails.root.to_s, '').sub(/^\/*/, '')
-
-    js_root = "app/assets/javascripts"
-    test_root = "test/javascripts"
-
-    return false if relative_path.start_with?("#{js_root}/locales/")
-
-    return true if %w(
-      preload-store
-      preload-application-data
-      wizard-start
-      onpopstate-handler
-      discourse
-      google-tag-manager
-      google-universal-analytics.js
-      activate-account.js
-      auto-redirect.js
-      embed-application
-    ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
-
-    relative_path =~ /^#{js_root}\/[^\/]+\// ||
-      relative_path =~ /^#{test_root}\/[^\/]+\//
+    relative_path.start_with?("app/assets/javascripts/discourse/") ||
+      relative_path.start_with?("app/assets/javascripts/admin/") ||
+      relative_path.start_with?("app/assets/javascripts/pretty-text/") ||
+      relative_path.start_with?("app/assets/javascripts/select-kit/") ||
+      relative_path.start_with?("app/assets/javascripts/wizard/") ||
+      relative_path.start_with?("app/assets/javascripts/discourse-common/") ||
+      relative_path.start_with?("app/assets/javascripts/ember-addons/") ||
+      relative_path.start_with?("app/assets/javascripts/confirm-new-email/") ||
+      relative_path == "app/assets/javascripts/preload-store.js" ||
+      relative_path == "app/assets/javascripts/preload-application-data.js" ||
+      relative_path == "app/assets/javascripts/wizard-start.js" ||
+      relative_path == "app/assets/javascripts/onpopstate-handler.js" ||
+      relative_path == "app/assets/javascripts/discourse.js" ||
+      relative_path == "app/assets/javascripts/google-tag-manager.js" ||
+      relative_path == "app/assets/javascripts/google-universal-analytics.js" ||
+      relative_path == "app/assets/javascripts/activate-account.js" ||
+      relative_path == "app/assets/javascripts/auto-redirect.js" ||
+      relative_path == "app/assets/javascripts/embed-application.js"
   end
 
   def self.skip_module?(data)
diff --git a/test/javascripts/acceptance/about-test.js b/test/javascripts/acceptance/about-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/about-test.js
rename to test/javascripts/acceptance/about-test.js.es6
diff --git a/test/javascripts/acceptance/account-created-test.js b/test/javascripts/acceptance/account-created-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/account-created-test.js
rename to test/javascripts/acceptance/account-created-test.js.es6
diff --git a/test/javascripts/acceptance/admin-emails-test.js b/test/javascripts/acceptance/admin-emails-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-emails-test.js
rename to test/javascripts/acceptance/admin-emails-test.js.es6
diff --git a/test/javascripts/acceptance/admin-search-log-term-test.js b/test/javascripts/acceptance/admin-search-log-term-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-search-log-term-test.js
rename to test/javascripts/acceptance/admin-search-log-term-test.js.es6
diff --git a/test/javascripts/acceptance/admin-search-logs-test.js b/test/javascripts/acceptance/admin-search-logs-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-search-logs-test.js
rename to test/javascripts/acceptance/admin-search-logs-test.js.es6
diff --git a/test/javascripts/acceptance/admin-site-settings-test.js b/test/javascripts/acceptance/admin-site-settings-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-site-settings-test.js
rename to test/javascripts/acceptance/admin-site-settings-test.js.es6
diff --git a/test/javascripts/acceptance/admin-site-text-test.js b/test/javascripts/acceptance/admin-site-text-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-site-text-test.js
rename to test/javascripts/acceptance/admin-site-text-test.js.es6
diff --git a/test/javascripts/acceptance/admin-suspend-user-test.js b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-suspend-user-test.js
rename to test/javascripts/acceptance/admin-suspend-user-test.js.es6
diff --git a/test/javascripts/acceptance/admin-user-badges-test.js b/test/javascripts/acceptance/admin-user-badges-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-user-badges-test.js
rename to test/javascripts/acceptance/admin-user-badges-test.js.es6
diff --git a/test/javascripts/acceptance/admin-user-emails-test.js b/test/javascripts/acceptance/admin-user-emails-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-user-emails-test.js
rename to test/javascripts/acceptance/admin-user-emails-test.js.es6
diff --git a/test/javascripts/acceptance/admin-user-index-test.js b/test/javascripts/acceptance/admin-user-index-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-user-index-test.js
rename to test/javascripts/acceptance/admin-user-index-test.js.es6
diff --git a/test/javascripts/acceptance/admin-users-list-test.js b/test/javascripts/acceptance/admin-users-list-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-users-list-test.js
rename to test/javascripts/acceptance/admin-users-list-test.js.es6
diff --git a/test/javascripts/acceptance/admin-watched-words-test.js b/test/javascripts/acceptance/admin-watched-words-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/admin-watched-words-test.js
rename to test/javascripts/acceptance/admin-watched-words-test.js.es6
diff --git a/test/javascripts/acceptance/auth-complete-test.js b/test/javascripts/acceptance/auth-complete-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/auth-complete-test.js
rename to test/javascripts/acceptance/auth-complete-test.js.es6
diff --git a/test/javascripts/acceptance/badges-test.js b/test/javascripts/acceptance/badges-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/badges-test.js
rename to test/javascripts/acceptance/badges-test.js.es6
diff --git a/test/javascripts/acceptance/category-chooser-test.js b/test/javascripts/acceptance/category-chooser-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/category-chooser-test.js
rename to test/javascripts/acceptance/category-chooser-test.js.es6
diff --git a/test/javascripts/acceptance/category-edit-security-test.js b/test/javascripts/acceptance/category-edit-security-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/category-edit-security-test.js
rename to test/javascripts/acceptance/category-edit-security-test.js.es6
diff --git a/test/javascripts/acceptance/category-edit-test.js b/test/javascripts/acceptance/category-edit-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/category-edit-test.js
rename to test/javascripts/acceptance/category-edit-test.js.es6
diff --git a/test/javascripts/acceptance/category-hashtag-test.js b/test/javascripts/acceptance/category-hashtag-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/category-hashtag-test.js
rename to test/javascripts/acceptance/category-hashtag-test.js.es6
diff --git a/test/javascripts/acceptance/click-track-test.js b/test/javascripts/acceptance/click-track-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/click-track-test.js
rename to test/javascripts/acceptance/click-track-test.js.es6
diff --git a/test/javascripts/acceptance/composer-actions-test.js b/test/javascripts/acceptance/composer-actions-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/composer-actions-test.js
rename to test/javascripts/acceptance/composer-actions-test.js.es6
diff --git a/test/javascripts/acceptance/composer-attachment-test.js b/test/javascripts/acceptance/composer-attachment-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/composer-attachment-test.js
rename to test/javascripts/acceptance/composer-attachment-test.js.es6
diff --git a/test/javascripts/acceptance/composer-edit-conflict-test.js b/test/javascripts/acceptance/composer-edit-conflict-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/composer-edit-conflict-test.js
rename to test/javascripts/acceptance/composer-edit-conflict-test.js.es6
diff --git a/test/javascripts/acceptance/composer-hyperlink-test.js b/test/javascripts/acceptance/composer-hyperlink-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/composer-hyperlink-test.js
rename to test/javascripts/acceptance/composer-hyperlink-test.js.es6
diff --git a/test/javascripts/acceptance/composer-onebox-test.js b/test/javascripts/acceptance/composer-onebox-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/composer-onebox-test.js
rename to test/javascripts/acceptance/composer-onebox-test.js.es6
diff --git a/test/javascripts/acceptance/composer-test.js b/test/javascripts/acceptance/composer-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/composer-test.js
rename to test/javascripts/acceptance/composer-test.js.es6
diff --git a/test/javascripts/acceptance/composer-topic-links-test.js b/test/javascripts/acceptance/composer-topic-links-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/composer-topic-links-test.js
rename to test/javascripts/acceptance/composer-topic-links-test.js.es6
diff --git a/test/javascripts/acceptance/composer-uncategorized-test.js b/test/javascripts/acceptance/composer-uncategorized-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/composer-uncategorized-test.js
rename to test/javascripts/acceptance/composer-uncategorized-test.js.es6
diff --git a/test/javascripts/acceptance/create-account-user-fields-test.js b/test/javascripts/acceptance/create-account-user-fields-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/create-account-user-fields-test.js
rename to test/javascripts/acceptance/create-account-user-fields-test.js.es6
diff --git a/test/javascripts/acceptance/custom-html-set-test.js b/test/javascripts/acceptance/custom-html-set-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/custom-html-set-test.js
rename to test/javascripts/acceptance/custom-html-set-test.js.es6
diff --git a/test/javascripts/acceptance/custom-html-template-test.js b/test/javascripts/acceptance/custom-html-template-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/custom-html-template-test.js
rename to test/javascripts/acceptance/custom-html-template-test.js.es6
diff --git a/test/javascripts/acceptance/dashboard-test.js b/test/javascripts/acceptance/dashboard-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/dashboard-test.js
rename to test/javascripts/acceptance/dashboard-test.js.es6
diff --git a/test/javascripts/acceptance/email-notice-test.js b/test/javascripts/acceptance/email-notice-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/email-notice-test.js
rename to test/javascripts/acceptance/email-notice-test.js.es6
diff --git a/test/javascripts/acceptance/emoji-picker-test.js b/test/javascripts/acceptance/emoji-picker-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/emoji-picker-test.js
rename to test/javascripts/acceptance/emoji-picker-test.js.es6
diff --git a/test/javascripts/acceptance/emoji-test.js b/test/javascripts/acceptance/emoji-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/emoji-test.js
rename to test/javascripts/acceptance/emoji-test.js.es6
diff --git a/test/javascripts/acceptance/enforce-second-factor-test.js b/test/javascripts/acceptance/enforce-second-factor-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/enforce-second-factor-test.js
rename to test/javascripts/acceptance/enforce-second-factor-test.js.es6
diff --git a/test/javascripts/acceptance/forgot-password-test.js b/test/javascripts/acceptance/forgot-password-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/forgot-password-test.js
rename to test/javascripts/acceptance/forgot-password-test.js.es6
diff --git a/test/javascripts/acceptance/group-card-mobile-test.js b/test/javascripts/acceptance/group-card-mobile-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-card-mobile-test.js
rename to test/javascripts/acceptance/group-card-mobile-test.js.es6
diff --git a/test/javascripts/acceptance/group-card-test.js b/test/javascripts/acceptance/group-card-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-card-test.js
rename to test/javascripts/acceptance/group-card-test.js.es6
diff --git a/test/javascripts/acceptance/group-index-test.js b/test/javascripts/acceptance/group-index-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-index-test.js
rename to test/javascripts/acceptance/group-index-test.js.es6
diff --git a/test/javascripts/acceptance/group-manage-interaction-test.js b/test/javascripts/acceptance/group-manage-interaction-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-manage-interaction-test.js
rename to test/javascripts/acceptance/group-manage-interaction-test.js.es6
diff --git a/test/javascripts/acceptance/group-manage-logs-test.js b/test/javascripts/acceptance/group-manage-logs-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-manage-logs-test.js
rename to test/javascripts/acceptance/group-manage-logs-test.js.es6
diff --git a/test/javascripts/acceptance/group-manage-membership-test.js b/test/javascripts/acceptance/group-manage-membership-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-manage-membership-test.js
rename to test/javascripts/acceptance/group-manage-membership-test.js.es6
diff --git a/test/javascripts/acceptance/group-manage-profile-test.js b/test/javascripts/acceptance/group-manage-profile-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-manage-profile-test.js
rename to test/javascripts/acceptance/group-manage-profile-test.js.es6
diff --git a/test/javascripts/acceptance/group-requests-test.js b/test/javascripts/acceptance/group-requests-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-requests-test.js
rename to test/javascripts/acceptance/group-requests-test.js.es6
diff --git a/test/javascripts/acceptance/group-test.js b/test/javascripts/acceptance/group-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/group-test.js
rename to test/javascripts/acceptance/group-test.js.es6
diff --git a/test/javascripts/acceptance/groups-index-test.js b/test/javascripts/acceptance/groups-index-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/groups-index-test.js
rename to test/javascripts/acceptance/groups-index-test.js.es6
diff --git a/test/javascripts/acceptance/groups-new-test.js b/test/javascripts/acceptance/groups-new-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/groups-new-test.js
rename to test/javascripts/acceptance/groups-new-test.js.es6
diff --git a/test/javascripts/acceptance/invite-accept-test.js b/test/javascripts/acceptance/invite-accept-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/invite-accept-test.js
rename to test/javascripts/acceptance/invite-accept-test.js.es6
diff --git a/test/javascripts/acceptance/invite-show-user-fields-test.js b/test/javascripts/acceptance/invite-show-user-fields-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/invite-show-user-fields-test.js
rename to test/javascripts/acceptance/invite-show-user-fields-test.js.es6
diff --git a/test/javascripts/acceptance/jump-to-test.js b/test/javascripts/acceptance/jump-to-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/jump-to-test.js
rename to test/javascripts/acceptance/jump-to-test.js.es6
diff --git a/test/javascripts/acceptance/keyboard-shortcuts-test.js b/test/javascripts/acceptance/keyboard-shortcuts-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/keyboard-shortcuts-test.js
rename to test/javascripts/acceptance/keyboard-shortcuts-test.js.es6
diff --git a/test/javascripts/acceptance/login-redirect-test.js b/test/javascripts/acceptance/login-redirect-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/login-redirect-test.js
rename to test/javascripts/acceptance/login-redirect-test.js.es6
diff --git a/test/javascripts/acceptance/login-required-test.js b/test/javascripts/acceptance/login-required-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/login-required-test.js
rename to test/javascripts/acceptance/login-required-test.js.es6
diff --git a/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js b/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js
rename to test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6
diff --git a/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js b/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js
rename to test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6
diff --git a/test/javascripts/acceptance/login-with-email-disabled-test.js b/test/javascripts/acceptance/login-with-email-disabled-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-disabled-test.js
rename to test/javascripts/acceptance/login-with-email-disabled-test.js.es6
diff --git a/test/javascripts/acceptance/login-with-email-test.js b/test/javascripts/acceptance/login-with-email-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-test.js
rename to test/javascripts/acceptance/login-with-email-test.js.es6
diff --git a/test/javascripts/acceptance/mobile-discovery-test.js b/test/javascripts/acceptance/mobile-discovery-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/mobile-discovery-test.js
rename to test/javascripts/acceptance/mobile-discovery-test.js.es6
diff --git a/test/javascripts/acceptance/mobile-sign-in-test.js b/test/javascripts/acceptance/mobile-sign-in-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/mobile-sign-in-test.js
rename to test/javascripts/acceptance/mobile-sign-in-test.js.es6
diff --git a/test/javascripts/acceptance/mobile-users-test.js b/test/javascripts/acceptance/mobile-users-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/mobile-users-test.js
rename to test/javascripts/acceptance/mobile-users-test.js.es6
diff --git a/test/javascripts/acceptance/modal-test.js b/test/javascripts/acceptance/modal-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/modal-test.js
rename to test/javascripts/acceptance/modal-test.js.es6
diff --git a/test/javascripts/acceptance/new-message-test.js b/test/javascripts/acceptance/new-message-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/new-message-test.js
rename to test/javascripts/acceptance/new-message-test.js.es6
diff --git a/test/javascripts/acceptance/new-topic-test.js b/test/javascripts/acceptance/new-topic-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/new-topic-test.js
rename to test/javascripts/acceptance/new-topic-test.js.es6
diff --git a/test/javascripts/acceptance/password-reset-test.js b/test/javascripts/acceptance/password-reset-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/password-reset-test.js
rename to test/javascripts/acceptance/password-reset-test.js.es6
diff --git a/test/javascripts/acceptance/personal-message-test.js b/test/javascripts/acceptance/personal-message-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/personal-message-test.js
rename to test/javascripts/acceptance/personal-message-test.js.es6
diff --git a/test/javascripts/acceptance/plugin-outlet-connector-class-test.js b/test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-connector-class-test.js
rename to test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6
diff --git a/test/javascripts/acceptance/plugin-outlet-decorator-test.js b/test/javascripts/acceptance/plugin-outlet-decorator-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-decorator-test.js
rename to test/javascripts/acceptance/plugin-outlet-decorator-test.js.es6
diff --git a/test/javascripts/acceptance/plugin-outlet-multi-template-test.js b/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-multi-template-test.js
rename to test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6
diff --git a/test/javascripts/acceptance/plugin-outlet-single-template-test.js b/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-single-template-test.js
rename to test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6
diff --git a/test/javascripts/acceptance/preferences-test.js b/test/javascripts/acceptance/preferences-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/preferences-test.js
rename to test/javascripts/acceptance/preferences-test.js.es6
diff --git a/test/javascripts/acceptance/raw-plugin-outlet-test.js b/test/javascripts/acceptance/raw-plugin-outlet-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/raw-plugin-outlet-test.js
rename to test/javascripts/acceptance/raw-plugin-outlet-test.js.es6
diff --git a/test/javascripts/acceptance/redirect-to-top-test.js b/test/javascripts/acceptance/redirect-to-top-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/redirect-to-top-test.js
rename to test/javascripts/acceptance/redirect-to-top-test.js.es6
diff --git a/test/javascripts/acceptance/reports-test.js b/test/javascripts/acceptance/reports-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/reports-test.js
rename to test/javascripts/acceptance/reports-test.js.es6
diff --git a/test/javascripts/acceptance/review-test.js b/test/javascripts/acceptance/review-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/review-test.js
rename to test/javascripts/acceptance/review-test.js.es6
diff --git a/test/javascripts/acceptance/search-full-test.js b/test/javascripts/acceptance/search-full-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/search-full-test.js
rename to test/javascripts/acceptance/search-full-test.js.es6
diff --git a/test/javascripts/acceptance/search-mobile-test.js b/test/javascripts/acceptance/search-mobile-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/search-mobile-test.js
rename to test/javascripts/acceptance/search-mobile-test.js.es6
diff --git a/test/javascripts/acceptance/search-test.js b/test/javascripts/acceptance/search-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/search-test.js
rename to test/javascripts/acceptance/search-test.js.es6
diff --git a/test/javascripts/acceptance/share-and-invite-desktop-test.js b/test/javascripts/acceptance/share-and-invite-desktop-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/share-and-invite-desktop-test.js
rename to test/javascripts/acceptance/share-and-invite-desktop-test.js.es6
diff --git a/test/javascripts/acceptance/share-and-invite-mobile-test.js b/test/javascripts/acceptance/share-and-invite-mobile-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/share-and-invite-mobile-test.js
rename to test/javascripts/acceptance/share-and-invite-mobile-test.js.es6
diff --git a/test/javascripts/acceptance/shared-drafts-test.js b/test/javascripts/acceptance/shared-drafts-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/shared-drafts-test.js
rename to test/javascripts/acceptance/shared-drafts-test.js.es6
diff --git a/test/javascripts/acceptance/sign-in-test.js b/test/javascripts/acceptance/sign-in-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/sign-in-test.js
rename to test/javascripts/acceptance/sign-in-test.js.es6
diff --git a/test/javascripts/acceptance/static-test.js b/test/javascripts/acceptance/static-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/static-test.js
rename to test/javascripts/acceptance/static-test.js.es6
diff --git a/test/javascripts/acceptance/tag-groups-test.js b/test/javascripts/acceptance/tag-groups-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/tag-groups-test.js
rename to test/javascripts/acceptance/tag-groups-test.js.es6
diff --git a/test/javascripts/acceptance/tag-hashtag-test.js b/test/javascripts/acceptance/tag-hashtag-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/tag-hashtag-test.js
rename to test/javascripts/acceptance/tag-hashtag-test.js.es6
diff --git a/test/javascripts/acceptance/tags-intersection-test.js b/test/javascripts/acceptance/tags-intersection-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/tags-intersection-test.js
rename to test/javascripts/acceptance/tags-intersection-test.js.es6
diff --git a/test/javascripts/acceptance/tags-test.js b/test/javascripts/acceptance/tags-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/tags-test.js
rename to test/javascripts/acceptance/tags-test.js.es6
diff --git a/test/javascripts/acceptance/topic-anonymous-test.js b/test/javascripts/acceptance/topic-anonymous-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/topic-anonymous-test.js
rename to test/javascripts/acceptance/topic-anonymous-test.js.es6
diff --git a/test/javascripts/acceptance/topic-discovery-test.js b/test/javascripts/acceptance/topic-discovery-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/topic-discovery-test.js
rename to test/javascripts/acceptance/topic-discovery-test.js.es6
diff --git a/test/javascripts/acceptance/topic-edit-timer-test.js b/test/javascripts/acceptance/topic-edit-timer-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/topic-edit-timer-test.js
rename to test/javascripts/acceptance/topic-edit-timer-test.js.es6
diff --git a/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js b/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/topic-footer-buttons-mobile-test.js
rename to test/javascripts/acceptance/topic-footer-buttons-mobile-test.js.es6
diff --git a/test/javascripts/acceptance/topic-move-posts-test.js b/test/javascripts/acceptance/topic-move-posts-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/topic-move-posts-test.js
rename to test/javascripts/acceptance/topic-move-posts-test.js.es6
diff --git a/test/javascripts/acceptance/topic-notifications-button-test.js b/test/javascripts/acceptance/topic-notifications-button-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/topic-notifications-button-test.js
rename to test/javascripts/acceptance/topic-notifications-button-test.js.es6
diff --git a/test/javascripts/acceptance/topic-test.js b/test/javascripts/acceptance/topic-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/topic-test.js
rename to test/javascripts/acceptance/topic-test.js.es6
diff --git a/test/javascripts/acceptance/unknown-test.js b/test/javascripts/acceptance/unknown-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/unknown-test.js
rename to test/javascripts/acceptance/unknown-test.js.es6
diff --git a/test/javascripts/acceptance/user-anonymous-test.js b/test/javascripts/acceptance/user-anonymous-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/user-anonymous-test.js
rename to test/javascripts/acceptance/user-anonymous-test.js.es6
diff --git a/test/javascripts/acceptance/user-card-mobile-test.js b/test/javascripts/acceptance/user-card-mobile-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/user-card-mobile-test.js
rename to test/javascripts/acceptance/user-card-mobile-test.js.es6
diff --git a/test/javascripts/acceptance/user-card-test.js b/test/javascripts/acceptance/user-card-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/user-card-test.js
rename to test/javascripts/acceptance/user-card-test.js.es6
diff --git a/test/javascripts/acceptance/user-drafts-stream-test.js b/test/javascripts/acceptance/user-drafts-stream-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/user-drafts-stream-test.js
rename to test/javascripts/acceptance/user-drafts-stream-test.js.es6
diff --git a/test/javascripts/acceptance/user-test.js b/test/javascripts/acceptance/user-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/user-test.js
rename to test/javascripts/acceptance/user-test.js.es6
diff --git a/test/javascripts/acceptance/users-test.js b/test/javascripts/acceptance/users-test.js.es6
similarity index 100%
rename from test/javascripts/acceptance/users-test.js
rename to test/javascripts/acceptance/users-test.js.es6
diff --git a/test/javascripts/admin/components/group-list-setting-test.js b/test/javascripts/admin/components/group-list-setting-test.js.es6
similarity index 100%
rename from test/javascripts/admin/components/group-list-setting-test.js
rename to test/javascripts/admin/components/group-list-setting-test.js.es6
diff --git a/test/javascripts/admin/components/themes-list-item-test.js b/test/javascripts/admin/components/themes-list-item-test.js.es6
similarity index 100%
rename from test/javascripts/admin/components/themes-list-item-test.js
rename to test/javascripts/admin/components/themes-list-item-test.js.es6
diff --git a/test/javascripts/admin/components/themes-list-test.js b/test/javascripts/admin/components/themes-list-test.js.es6
similarity index 100%
rename from test/javascripts/admin/components/themes-list-test.js
rename to test/javascripts/admin/components/themes-list-test.js.es6
diff --git a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
similarity index 100%
rename from test/javascripts/admin/controllers/admin-customize-themes-show-test.js
rename to test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
diff --git a/test/javascripts/admin/controllers/admin-customize-themes-test.js b/test/javascripts/admin/controllers/admin-customize-themes-test.js.es6
similarity index 100%
rename from test/javascripts/admin/controllers/admin-customize-themes-test.js
rename to test/javascripts/admin/controllers/admin-customize-themes-test.js.es6
diff --git a/test/javascripts/admin/controllers/admin-user-badges-test.js b/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
similarity index 100%
rename from test/javascripts/admin/controllers/admin-user-badges-test.js
rename to test/javascripts/admin/controllers/admin-user-badges-test.js.es6
diff --git a/test/javascripts/admin/models/theme-test.js b/test/javascripts/admin/models/theme-test.js.es6
similarity index 100%
rename from test/javascripts/admin/models/theme-test.js
rename to test/javascripts/admin/models/theme-test.js.es6
diff --git a/test/javascripts/components/ace-editor-test.js b/test/javascripts/components/ace-editor-test.js.es6
similarity index 100%
rename from test/javascripts/components/ace-editor-test.js
rename to test/javascripts/components/ace-editor-test.js.es6
diff --git a/test/javascripts/components/admin-report-test.js b/test/javascripts/components/admin-report-test.js.es6
similarity index 100%
rename from test/javascripts/components/admin-report-test.js
rename to test/javascripts/components/admin-report-test.js.es6
diff --git a/test/javascripts/components/badge-title-test.js b/test/javascripts/components/badge-title-test.js.es6
similarity index 100%
rename from test/javascripts/components/badge-title-test.js
rename to test/javascripts/components/badge-title-test.js.es6
diff --git a/test/javascripts/components/d-button-test.js b/test/javascripts/components/d-button-test.js.es6
similarity index 100%
rename from test/javascripts/components/d-button-test.js
rename to test/javascripts/components/d-button-test.js.es6
diff --git a/test/javascripts/components/d-editor-test.js b/test/javascripts/components/d-editor-test.js.es6
similarity index 100%
rename from test/javascripts/components/d-editor-test.js
rename to test/javascripts/components/d-editor-test.js.es6
diff --git a/test/javascripts/components/d-icon-test.js b/test/javascripts/components/d-icon-test.js.es6
similarity index 100%
rename from test/javascripts/components/d-icon-test.js
rename to test/javascripts/components/d-icon-test.js.es6
diff --git a/test/javascripts/components/date-input-test.js b/test/javascripts/components/date-input-test.js.es6
similarity index 100%
rename from test/javascripts/components/date-input-test.js
rename to test/javascripts/components/date-input-test.js.es6
diff --git a/test/javascripts/components/date-time-input-range-test.js b/test/javascripts/components/date-time-input-range-test.js.es6
similarity index 100%
rename from test/javascripts/components/date-time-input-range-test.js
rename to test/javascripts/components/date-time-input-range-test.js.es6
diff --git a/test/javascripts/components/date-time-input-test.js b/test/javascripts/components/date-time-input-test.js.es6
similarity index 100%
rename from test/javascripts/components/date-time-input-test.js
rename to test/javascripts/components/date-time-input-test.js.es6
diff --git a/test/javascripts/components/group-membership-button-test.js b/test/javascripts/components/group-membership-button-test.js.es6
similarity index 100%
rename from test/javascripts/components/group-membership-button-test.js
rename to test/javascripts/components/group-membership-button-test.js.es6
diff --git a/test/javascripts/components/html-safe-helper-test.js b/test/javascripts/components/html-safe-helper-test.js.es6
similarity index 100%
rename from test/javascripts/components/html-safe-helper-test.js
rename to test/javascripts/components/html-safe-helper-test.js.es6
diff --git a/test/javascripts/components/iframed-html-test.js b/test/javascripts/components/iframed-html-test.js.es6
similarity index 100%
rename from test/javascripts/components/iframed-html-test.js
rename to test/javascripts/components/iframed-html-test.js.es6
diff --git a/test/javascripts/components/image-uploader-test.js b/test/javascripts/components/image-uploader-test.js.es6
similarity index 100%
rename from test/javascripts/components/image-uploader-test.js
rename to test/javascripts/components/image-uploader-test.js.es6
diff --git a/test/javascripts/components/keyboard-shortcuts-test.js b/test/javascripts/components/keyboard-shortcuts-test.js.es6
similarity index 100%
rename from test/javascripts/components/keyboard-shortcuts-test.js
rename to test/javascripts/components/keyboard-shortcuts-test.js.es6
diff --git a/test/javascripts/components/load-more-test.js b/test/javascripts/components/load-more-test.js.es6
similarity index 100%
rename from test/javascripts/components/load-more-test.js
rename to test/javascripts/components/load-more-test.js.es6
diff --git a/test/javascripts/components/secret-value-list-test.js b/test/javascripts/components/secret-value-list-test.js.es6
similarity index 100%
rename from test/javascripts/components/secret-value-list-test.js
rename to test/javascripts/components/secret-value-list-test.js.es6
diff --git a/test/javascripts/components/select-kit/category-chooser-test.js b/test/javascripts/components/select-kit/category-chooser-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/category-chooser-test.js
rename to test/javascripts/components/select-kit/category-chooser-test.js.es6
diff --git a/test/javascripts/components/select-kit/category-drop-test.js b/test/javascripts/components/select-kit/category-drop-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/category-drop-test.js
rename to test/javascripts/components/select-kit/category-drop-test.js.es6
diff --git a/test/javascripts/components/select-kit/combo-box-test.js b/test/javascripts/components/select-kit/combo-box-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/combo-box-test.js
rename to test/javascripts/components/select-kit/combo-box-test.js.es6
diff --git a/test/javascripts/components/select-kit/dropdown-select-box-test.js b/test/javascripts/components/select-kit/dropdown-select-box-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/dropdown-select-box-test.js
rename to test/javascripts/components/select-kit/dropdown-select-box-test.js.es6
diff --git a/test/javascripts/components/select-kit/list-setting-test.js b/test/javascripts/components/select-kit/list-setting-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/list-setting-test.js
rename to test/javascripts/components/select-kit/list-setting-test.js.es6
diff --git a/test/javascripts/components/select-kit/mini-tag-chooser-test.js b/test/javascripts/components/select-kit/mini-tag-chooser-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/mini-tag-chooser-test.js
rename to test/javascripts/components/select-kit/mini-tag-chooser-test.js.es6
diff --git a/test/javascripts/components/select-kit/multi-select-test.js b/test/javascripts/components/select-kit/multi-select-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/multi-select-test.js
rename to test/javascripts/components/select-kit/multi-select-test.js.es6
diff --git a/test/javascripts/components/select-kit/notifications-button-test.js b/test/javascripts/components/select-kit/notifications-button-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/notifications-button-test.js
rename to test/javascripts/components/select-kit/notifications-button-test.js.es6
diff --git a/test/javascripts/components/select-kit/pinned-options-test.js b/test/javascripts/components/select-kit/pinned-options-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/pinned-options-test.js
rename to test/javascripts/components/select-kit/pinned-options-test.js.es6
diff --git a/test/javascripts/components/select-kit/select-kit-test-helper.js b/test/javascripts/components/select-kit/select-kit-test-helper.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/select-kit-test-helper.js
rename to test/javascripts/components/select-kit/select-kit-test-helper.js.es6
diff --git a/test/javascripts/components/select-kit/single-select-test.js b/test/javascripts/components/select-kit/single-select-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/single-select-test.js
rename to test/javascripts/components/select-kit/single-select-test.js.es6
diff --git a/test/javascripts/components/select-kit/tag-drop-test.js b/test/javascripts/components/select-kit/tag-drop-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/tag-drop-test.js
rename to test/javascripts/components/select-kit/tag-drop-test.js.es6
diff --git a/test/javascripts/components/select-kit/topic-notifications-button-test.js b/test/javascripts/components/select-kit/topic-notifications-button-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/topic-notifications-button-test.js
rename to test/javascripts/components/select-kit/topic-notifications-button-test.js.es6
diff --git a/test/javascripts/components/select-kit/topic-notifications-options-test.js b/test/javascripts/components/select-kit/topic-notifications-options-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/topic-notifications-options-test.js
rename to test/javascripts/components/select-kit/topic-notifications-options-test.js.es6
diff --git a/test/javascripts/components/select-kit/user-chooser-test.js b/test/javascripts/components/select-kit/user-chooser-test.js.es6
similarity index 100%
rename from test/javascripts/components/select-kit/user-chooser-test.js
rename to test/javascripts/components/select-kit/user-chooser-test.js.es6
diff --git a/test/javascripts/components/share-button-test.js b/test/javascripts/components/share-button-test.js.es6
similarity index 100%
rename from test/javascripts/components/share-button-test.js
rename to test/javascripts/components/share-button-test.js.es6
diff --git a/test/javascripts/components/share-button.js b/test/javascripts/components/share-button.js.es6
similarity index 100%
rename from test/javascripts/components/share-button.js
rename to test/javascripts/components/share-button.js.es6
diff --git a/test/javascripts/components/text-field-test.js b/test/javascripts/components/text-field-test.js.es6
similarity index 100%
rename from test/javascripts/components/text-field-test.js
rename to test/javascripts/components/text-field-test.js.es6
diff --git a/test/javascripts/components/text-overflow-test.js b/test/javascripts/components/text-overflow-test.js.es6
similarity index 100%
rename from test/javascripts/components/text-overflow-test.js
rename to test/javascripts/components/text-overflow-test.js.es6
diff --git a/test/javascripts/components/time-input-test.js b/test/javascripts/components/time-input-test.js.es6
similarity index 100%
rename from test/javascripts/components/time-input-test.js
rename to test/javascripts/components/time-input-test.js.es6
diff --git a/test/javascripts/components/user-selector-test.js b/test/javascripts/components/user-selector-test.js.es6
similarity index 100%
rename from test/javascripts/components/user-selector-test.js
rename to test/javascripts/components/user-selector-test.js.es6
diff --git a/test/javascripts/components/value-list-test.js b/test/javascripts/components/value-list-test.js.es6
similarity index 100%
rename from test/javascripts/components/value-list-test.js
rename to test/javascripts/components/value-list-test.js.es6
diff --git a/test/javascripts/controllers/avatar-selector-test.js b/test/javascripts/controllers/avatar-selector-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/avatar-selector-test.js
rename to test/javascripts/controllers/avatar-selector-test.js.es6
diff --git a/test/javascripts/controllers/bookmark-test.js b/test/javascripts/controllers/bookmark-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/bookmark-test.js
rename to test/javascripts/controllers/bookmark-test.js.es6
diff --git a/test/javascripts/controllers/create-account-test.js b/test/javascripts/controllers/create-account-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/create-account-test.js
rename to test/javascripts/controllers/create-account-test.js.es6
diff --git a/test/javascripts/controllers/group-test.js b/test/javascripts/controllers/group-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/group-test.js
rename to test/javascripts/controllers/group-test.js.es6
diff --git a/test/javascripts/controllers/history-test.js b/test/javascripts/controllers/history-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/history-test.js
rename to test/javascripts/controllers/history-test.js.es6
diff --git a/test/javascripts/controllers/preferences-account-test.js b/test/javascripts/controllers/preferences-account-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/preferences-account-test.js
rename to test/javascripts/controllers/preferences-account-test.js.es6
diff --git a/test/javascripts/controllers/preferences-second-factor-test.js b/test/javascripts/controllers/preferences-second-factor-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/preferences-second-factor-test.js
rename to test/javascripts/controllers/preferences-second-factor-test.js.es6
diff --git a/test/javascripts/controllers/reorder-categories-test.js b/test/javascripts/controllers/reorder-categories-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/reorder-categories-test.js
rename to test/javascripts/controllers/reorder-categories-test.js.es6
diff --git a/test/javascripts/controllers/topic-test.js b/test/javascripts/controllers/topic-test.js.es6
similarity index 100%
rename from test/javascripts/controllers/topic-test.js
rename to test/javascripts/controllers/topic-test.js.es6
diff --git a/test/javascripts/ember/resolver-test.js b/test/javascripts/ember/resolver-test.js.es6
similarity index 100%
rename from test/javascripts/ember/resolver-test.js
rename to test/javascripts/ember/resolver-test.js.es6
diff --git a/test/javascripts/fixtures/about.js b/test/javascripts/fixtures/about.js.es6
similarity index 100%
rename from test/javascripts/fixtures/about.js
rename to test/javascripts/fixtures/about.js.es6
diff --git a/test/javascripts/fixtures/badges_fixture.js b/test/javascripts/fixtures/badges_fixture.js.es6
similarity index 100%
rename from test/javascripts/fixtures/badges_fixture.js
rename to test/javascripts/fixtures/badges_fixture.js.es6
diff --git a/test/javascripts/fixtures/category-fixtures.js b/test/javascripts/fixtures/category-fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/category-fixtures.js
rename to test/javascripts/fixtures/category-fixtures.js.es6
diff --git a/test/javascripts/fixtures/concerns/notification-types.js.erb b/test/javascripts/fixtures/concerns/notification-types.js.es6.erb
similarity index 100%
rename from test/javascripts/fixtures/concerns/notification-types.js.erb
rename to test/javascripts/fixtures/concerns/notification-types.js.es6.erb
diff --git a/test/javascripts/fixtures/dashboard-general.js b/test/javascripts/fixtures/dashboard-general.js.es6
similarity index 100%
rename from test/javascripts/fixtures/dashboard-general.js
rename to test/javascripts/fixtures/dashboard-general.js.es6
diff --git a/test/javascripts/fixtures/dashboard.js b/test/javascripts/fixtures/dashboard.js.es6
similarity index 100%
rename from test/javascripts/fixtures/dashboard.js
rename to test/javascripts/fixtures/dashboard.js.es6
diff --git a/test/javascripts/fixtures/directory-fixtures.js b/test/javascripts/fixtures/directory-fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/directory-fixtures.js
rename to test/javascripts/fixtures/directory-fixtures.js.es6
diff --git a/test/javascripts/fixtures/discovery_fixtures.js b/test/javascripts/fixtures/discovery_fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/discovery_fixtures.js
rename to test/javascripts/fixtures/discovery_fixtures.js.es6
diff --git a/test/javascripts/fixtures/draft.js b/test/javascripts/fixtures/draft.js.es6
similarity index 100%
rename from test/javascripts/fixtures/draft.js
rename to test/javascripts/fixtures/draft.js.es6
diff --git a/test/javascripts/fixtures/drafts.js b/test/javascripts/fixtures/drafts.js.es6
similarity index 100%
rename from test/javascripts/fixtures/drafts.js
rename to test/javascripts/fixtures/drafts.js.es6
diff --git a/test/javascripts/fixtures/group-fixtures.js b/test/javascripts/fixtures/group-fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/group-fixtures.js
rename to test/javascripts/fixtures/group-fixtures.js.es6
diff --git a/test/javascripts/fixtures/groups-fixtures.js b/test/javascripts/fixtures/groups-fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/groups-fixtures.js
rename to test/javascripts/fixtures/groups-fixtures.js.es6
diff --git a/test/javascripts/fixtures/notification_fixtures.js b/test/javascripts/fixtures/notification_fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/notification_fixtures.js
rename to test/javascripts/fixtures/notification_fixtures.js.es6
diff --git a/test/javascripts/fixtures/poll.js b/test/javascripts/fixtures/poll.js.es6
similarity index 100%
rename from test/javascripts/fixtures/poll.js
rename to test/javascripts/fixtures/poll.js.es6
diff --git a/test/javascripts/fixtures/post.js b/test/javascripts/fixtures/post.js.es6
similarity index 100%
rename from test/javascripts/fixtures/post.js
rename to test/javascripts/fixtures/post.js.es6
diff --git a/test/javascripts/fixtures/private_messages_fixtures.js b/test/javascripts/fixtures/private_messages_fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/private_messages_fixtures.js
rename to test/javascripts/fixtures/private_messages_fixtures.js.es6
diff --git a/test/javascripts/fixtures/problems.js b/test/javascripts/fixtures/problems.js.es6
similarity index 100%
rename from test/javascripts/fixtures/problems.js
rename to test/javascripts/fixtures/problems.js.es6
diff --git a/test/javascripts/fixtures/reports.js b/test/javascripts/fixtures/reports.js.es6
similarity index 100%
rename from test/javascripts/fixtures/reports.js
rename to test/javascripts/fixtures/reports.js.es6
diff --git a/test/javascripts/fixtures/reports_bulk.js b/test/javascripts/fixtures/reports_bulk.js.es6
similarity index 100%
rename from test/javascripts/fixtures/reports_bulk.js
rename to test/javascripts/fixtures/reports_bulk.js.es6
diff --git a/test/javascripts/fixtures/search-fixtures.js b/test/javascripts/fixtures/search-fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/search-fixtures.js
rename to test/javascripts/fixtures/search-fixtures.js.es6
diff --git a/test/javascripts/fixtures/session-fixtures.js b/test/javascripts/fixtures/session-fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/session-fixtures.js
rename to test/javascripts/fixtures/session-fixtures.js.es6
diff --git a/test/javascripts/fixtures/site-fixtures.js b/test/javascripts/fixtures/site-fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/site-fixtures.js
rename to test/javascripts/fixtures/site-fixtures.js.es6
diff --git a/test/javascripts/fixtures/site_settings.js b/test/javascripts/fixtures/site_settings.js.es6
similarity index 100%
rename from test/javascripts/fixtures/site_settings.js
rename to test/javascripts/fixtures/site_settings.js.es6
diff --git a/test/javascripts/fixtures/static_fixtures.js b/test/javascripts/fixtures/static_fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/static_fixtures.js
rename to test/javascripts/fixtures/static_fixtures.js.es6
diff --git a/test/javascripts/fixtures/top_fixture.js b/test/javascripts/fixtures/top_fixture.js.es6
similarity index 100%
rename from test/javascripts/fixtures/top_fixture.js
rename to test/javascripts/fixtures/top_fixture.js.es6
diff --git a/test/javascripts/fixtures/topic.js b/test/javascripts/fixtures/topic.js.es6
similarity index 100%
rename from test/javascripts/fixtures/topic.js
rename to test/javascripts/fixtures/topic.js.es6
diff --git a/test/javascripts/fixtures/user-badges.js b/test/javascripts/fixtures/user-badges.js.es6
similarity index 100%
rename from test/javascripts/fixtures/user-badges.js
rename to test/javascripts/fixtures/user-badges.js.es6
diff --git a/test/javascripts/fixtures/user_fixtures.js b/test/javascripts/fixtures/user_fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/user_fixtures.js
rename to test/javascripts/fixtures/user_fixtures.js.es6
diff --git a/test/javascripts/fixtures/watched-words-fixtures.js b/test/javascripts/fixtures/watched-words-fixtures.js.es6
similarity index 100%
rename from test/javascripts/fixtures/watched-words-fixtures.js
rename to test/javascripts/fixtures/watched-words-fixtures.js.es6
diff --git a/test/javascripts/helpers/assertions.js b/test/javascripts/helpers/assertions.js
index 81fbd40b1b..95d7b2a7dd 100644
--- a/test/javascripts/helpers/assertions.js
+++ b/test/javascripts/helpers/assertions.js
@@ -1,4 +1,5 @@
-// discourse-skip-module
+/* exported exists, count, present, blank, containsInstance, not, visible, invisible */
+
 function exists(selector) {
   return count(selector) > 0;
 }
@@ -12,10 +13,8 @@ function visible(selector) {
 }
 
 function invisible(selector) {
-  const $items = find(selector + ":visible");
-  return (
-    $items.length === 0 ||
-    $items.css("opacity") === "0" ||
-    $items.css("visibility") === "hidden"
-  );
+  var $items = find(selector + ":visible");
+  return $items.length === 0 ||
+         $items.css("opacity") === "0" ||
+         $items.css("visibility") === "hidden";
 }
diff --git a/test/javascripts/helpers/component-test.js b/test/javascripts/helpers/component-test.js.es6
similarity index 100%
rename from test/javascripts/helpers/component-test.js
rename to test/javascripts/helpers/component-test.js.es6
diff --git a/test/javascripts/helpers/create-pretender.js b/test/javascripts/helpers/create-pretender.js.es6
similarity index 100%
rename from test/javascripts/helpers/create-pretender.js
rename to test/javascripts/helpers/create-pretender.js.es6
diff --git a/test/javascripts/helpers/create-store.js b/test/javascripts/helpers/create-store.js.es6
similarity index 100%
rename from test/javascripts/helpers/create-store.js
rename to test/javascripts/helpers/create-store.js.es6
diff --git a/test/javascripts/helpers/d-editor-helper.js b/test/javascripts/helpers/d-editor-helper.js.es6
similarity index 100%
rename from test/javascripts/helpers/d-editor-helper.js
rename to test/javascripts/helpers/d-editor-helper.js.es6
diff --git a/test/javascripts/helpers/fixture-pretender.js b/test/javascripts/helpers/fixture-pretender.js.es6
similarity index 100%
rename from test/javascripts/helpers/fixture-pretender.js
rename to test/javascripts/helpers/fixture-pretender.js.es6
diff --git a/test/javascripts/helpers/html-helper.js b/test/javascripts/helpers/html-helper.js.es6
similarity index 100%
rename from test/javascripts/helpers/html-helper.js
rename to test/javascripts/helpers/html-helper.js.es6
diff --git a/test/javascripts/helpers/init-ember-qunit.js b/test/javascripts/helpers/init-ember-qunit.js
new file mode 100644
index 0000000000..32d0184e7d
--- /dev/null
+++ b/test/javascripts/helpers/init-ember-qunit.js
@@ -0,0 +1,2 @@
+var buildResolver = require('discourse-common/resolver').buildResolver;
+window.setResolver(buildResolver('discourse').create({ namespace: Discourse }));
diff --git a/test/javascripts/helpers/qunit-helpers.js b/test/javascripts/helpers/qunit-helpers.js.es6
similarity index 100%
rename from test/javascripts/helpers/qunit-helpers.js
rename to test/javascripts/helpers/qunit-helpers.js.es6
diff --git a/test/javascripts/helpers/review-pretender.js b/test/javascripts/helpers/review-pretender.js.es6
similarity index 100%
rename from test/javascripts/helpers/review-pretender.js
rename to test/javascripts/helpers/review-pretender.js.es6
diff --git a/test/javascripts/helpers/select-kit-helper.js b/test/javascripts/helpers/select-kit-helper.js.es6
similarity index 100%
rename from test/javascripts/helpers/select-kit-helper.js
rename to test/javascripts/helpers/select-kit-helper.js.es6
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index c39424b0df..621aa3d6ac 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -1,5 +1,4 @@
-// discourse-skip-module
-
+/*jshint maxlen:10000000 */
 Discourse.SiteSettingsOriginal = {
   title: "QUnit Discourse Tests",
   site_logo_url: "/assets/logo.png",
@@ -13,10 +12,8 @@ Discourse.SiteSettingsOriginal = {
   ga_universal_tracking_code: "",
   ga_universal_domain_name: "auto",
   top_menu: "latest|new|unread|categories|top",
-  post_menu:
-    "like|share|flag|edit|bookmark|bookmarkWithReminder|delete|admin|reply",
-  post_menu_hidden_items:
-    "flag|bookmark|bookmarkWithReminder|edit|delete|admin",
+  post_menu: "like|share|flag|edit|bookmark|bookmarkWithReminder|delete|admin|reply",
+  post_menu_hidden_items: "flag|bookmark|bookmarkWithReminder|edit|delete|admin",
   share_links: "twitter|facebook|email",
   category_colors:
     "BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|27AA5B|B3B5B4|E45735",
@@ -105,7 +102,6 @@ Discourse.SiteSettingsOriginal = {
   unicode_usernames: false,
   secure_media: false
 };
-
 Discourse.SiteSettings = jQuery.extend(
   true,
   {},
diff --git a/test/javascripts/helpers/site.js b/test/javascripts/helpers/site.js.es6
similarity index 100%
rename from test/javascripts/helpers/site.js
rename to test/javascripts/helpers/site.js.es6
diff --git a/test/javascripts/helpers/store-pretender.js b/test/javascripts/helpers/store-pretender.js.es6
similarity index 100%
rename from test/javascripts/helpers/store-pretender.js
rename to test/javascripts/helpers/store-pretender.js.es6
diff --git a/test/javascripts/helpers/textarea-selection-helper.js b/test/javascripts/helpers/textarea-selection-helper.js.es6
similarity index 100%
rename from test/javascripts/helpers/textarea-selection-helper.js
rename to test/javascripts/helpers/textarea-selection-helper.js.es6
diff --git a/test/javascripts/helpers/widget-test.js b/test/javascripts/helpers/widget-test.js.es6
similarity index 100%
rename from test/javascripts/helpers/widget-test.js
rename to test/javascripts/helpers/widget-test.js.es6
diff --git a/test/javascripts/initializers/localization-test.js b/test/javascripts/initializers/localization-test.js.es6
similarity index 100%
rename from test/javascripts/initializers/localization-test.js
rename to test/javascripts/initializers/localization-test.js.es6
diff --git a/test/javascripts/lib/bbcode-test.js b/test/javascripts/lib/bbcode-test.js.es6
similarity index 100%
rename from test/javascripts/lib/bbcode-test.js
rename to test/javascripts/lib/bbcode-test.js.es6
diff --git a/test/javascripts/lib/break-string-test.js b/test/javascripts/lib/break-string-test.js.es6
similarity index 100%
rename from test/javascripts/lib/break-string-test.js
rename to test/javascripts/lib/break-string-test.js.es6
diff --git a/test/javascripts/lib/category-badge-test.js b/test/javascripts/lib/category-badge-test.js.es6
similarity index 100%
rename from test/javascripts/lib/category-badge-test.js
rename to test/javascripts/lib/category-badge-test.js.es6
diff --git a/test/javascripts/lib/click-track-edit-history-test.js b/test/javascripts/lib/click-track-edit-history-test.js.es6
similarity index 100%
rename from test/javascripts/lib/click-track-edit-history-test.js
rename to test/javascripts/lib/click-track-edit-history-test.js.es6
diff --git a/test/javascripts/lib/click-track-profile-page-test.js b/test/javascripts/lib/click-track-profile-page-test.js.es6
similarity index 100%
rename from test/javascripts/lib/click-track-profile-page-test.js
rename to test/javascripts/lib/click-track-profile-page-test.js.es6
diff --git a/test/javascripts/lib/click-track-test.js b/test/javascripts/lib/click-track-test.js.es6
similarity index 100%
rename from test/javascripts/lib/click-track-test.js
rename to test/javascripts/lib/click-track-test.js.es6
diff --git a/test/javascripts/lib/computed-test.js b/test/javascripts/lib/computed-test.js.es6
similarity index 100%
rename from test/javascripts/lib/computed-test.js
rename to test/javascripts/lib/computed-test.js.es6
diff --git a/test/javascripts/lib/discourse-test.js b/test/javascripts/lib/discourse-test.js.es6
similarity index 100%
rename from test/javascripts/lib/discourse-test.js
rename to test/javascripts/lib/discourse-test.js.es6
diff --git a/test/javascripts/lib/emoji-store-test.js b/test/javascripts/lib/emoji-store-test.js.es6
similarity index 100%
rename from test/javascripts/lib/emoji-store-test.js
rename to test/javascripts/lib/emoji-store-test.js.es6
diff --git a/test/javascripts/lib/emoji-test.js b/test/javascripts/lib/emoji-test.js.es6
similarity index 100%
rename from test/javascripts/lib/emoji-test.js
rename to test/javascripts/lib/emoji-test.js.es6
diff --git a/test/javascripts/lib/formatter-test.js b/test/javascripts/lib/formatter-test.js.es6
similarity index 100%
rename from test/javascripts/lib/formatter-test.js
rename to test/javascripts/lib/formatter-test.js.es6
diff --git a/test/javascripts/lib/highlight-text-test.js b/test/javascripts/lib/highlight-text-test.js.es6
similarity index 100%
rename from test/javascripts/lib/highlight-text-test.js
rename to test/javascripts/lib/highlight-text-test.js.es6
diff --git a/test/javascripts/lib/i18n-test.js b/test/javascripts/lib/i18n-test.js.es6
similarity index 100%
rename from test/javascripts/lib/i18n-test.js
rename to test/javascripts/lib/i18n-test.js.es6
diff --git a/test/javascripts/lib/icon-library-test.js b/test/javascripts/lib/icon-library-test.js.es6
similarity index 100%
rename from test/javascripts/lib/icon-library-test.js
rename to test/javascripts/lib/icon-library-test.js.es6
diff --git a/test/javascripts/lib/key-value-store-test.js b/test/javascripts/lib/key-value-store-test.js.es6
similarity index 100%
rename from test/javascripts/lib/key-value-store-test.js
rename to test/javascripts/lib/key-value-store-test.js.es6
diff --git a/test/javascripts/lib/link-mentions-test.js b/test/javascripts/lib/link-mentions-test.js.es6
similarity index 100%
rename from test/javascripts/lib/link-mentions-test.js
rename to test/javascripts/lib/link-mentions-test.js.es6
diff --git a/test/javascripts/lib/load-script-test.js b/test/javascripts/lib/load-script-test.js.es6
similarity index 100%
rename from test/javascripts/lib/load-script-test.js
rename to test/javascripts/lib/load-script-test.js.es6
diff --git a/test/javascripts/lib/oneboxer-test.js b/test/javascripts/lib/oneboxer-test.js.es6
similarity index 100%
rename from test/javascripts/lib/oneboxer-test.js
rename to test/javascripts/lib/oneboxer-test.js.es6
diff --git a/test/javascripts/lib/preload-store-test.js b/test/javascripts/lib/preload-store-test.js.es6
similarity index 100%
rename from test/javascripts/lib/preload-store-test.js
rename to test/javascripts/lib/preload-store-test.js.es6
diff --git a/test/javascripts/lib/pretty-text-test.js b/test/javascripts/lib/pretty-text-test.js.es6
similarity index 100%
rename from test/javascripts/lib/pretty-text-test.js
rename to test/javascripts/lib/pretty-text-test.js.es6
diff --git a/test/javascripts/lib/sanitizer-test.js b/test/javascripts/lib/sanitizer-test.js.es6
similarity index 100%
rename from test/javascripts/lib/sanitizer-test.js
rename to test/javascripts/lib/sanitizer-test.js.es6
diff --git a/test/javascripts/lib/screen-track-test.js b/test/javascripts/lib/screen-track-test.js.es6
similarity index 100%
rename from test/javascripts/lib/screen-track-test.js
rename to test/javascripts/lib/screen-track-test.js.es6
diff --git a/test/javascripts/lib/search-test.js b/test/javascripts/lib/search-test.js.es6
similarity index 100%
rename from test/javascripts/lib/search-test.js
rename to test/javascripts/lib/search-test.js.es6
diff --git a/test/javascripts/lib/sharing-test.js b/test/javascripts/lib/sharing-test.js.es6
similarity index 100%
rename from test/javascripts/lib/sharing-test.js
rename to test/javascripts/lib/sharing-test.js.es6
diff --git a/test/javascripts/lib/text-direction-test.js b/test/javascripts/lib/text-direction-test.js.es6
similarity index 100%
rename from test/javascripts/lib/text-direction-test.js
rename to test/javascripts/lib/text-direction-test.js.es6
diff --git a/test/javascripts/lib/to-markdown-test.js b/test/javascripts/lib/to-markdown-test.js.es6
similarity index 100%
rename from test/javascripts/lib/to-markdown-test.js
rename to test/javascripts/lib/to-markdown-test.js.es6
diff --git a/test/javascripts/lib/tooltip-test.js b/test/javascripts/lib/tooltip-test.js.es6
similarity index 100%
rename from test/javascripts/lib/tooltip-test.js
rename to test/javascripts/lib/tooltip-test.js.es6
diff --git a/test/javascripts/lib/upload-short-url-test.js b/test/javascripts/lib/upload-short-url-test.js.es6
similarity index 100%
rename from test/javascripts/lib/upload-short-url-test.js
rename to test/javascripts/lib/upload-short-url-test.js.es6
diff --git a/test/javascripts/lib/uploads-test.js b/test/javascripts/lib/uploads-test.js.es6
similarity index 100%
rename from test/javascripts/lib/uploads-test.js
rename to test/javascripts/lib/uploads-test.js.es6
diff --git a/test/javascripts/lib/url-test.js b/test/javascripts/lib/url-test.js.es6
similarity index 100%
rename from test/javascripts/lib/url-test.js
rename to test/javascripts/lib/url-test.js.es6
diff --git a/test/javascripts/lib/user-search-test.js b/test/javascripts/lib/user-search-test.js.es6
similarity index 100%
rename from test/javascripts/lib/user-search-test.js
rename to test/javascripts/lib/user-search-test.js.es6
diff --git a/test/javascripts/lib/utilities-test.js b/test/javascripts/lib/utilities-test.js.es6
similarity index 100%
rename from test/javascripts/lib/utilities-test.js
rename to test/javascripts/lib/utilities-test.js.es6
diff --git a/test/javascripts/lib/white-lister-test.js b/test/javascripts/lib/white-lister-test.js.es6
similarity index 100%
rename from test/javascripts/lib/white-lister-test.js
rename to test/javascripts/lib/white-lister-test.js.es6
diff --git a/test/javascripts/mixins/grant-badge-controller-test.js b/test/javascripts/mixins/grant-badge-controller-test.js.es6
similarity index 100%
rename from test/javascripts/mixins/grant-badge-controller-test.js
rename to test/javascripts/mixins/grant-badge-controller-test.js.es6
diff --git a/test/javascripts/mixins/setting-object-test.js b/test/javascripts/mixins/setting-object-test.js.es6
similarity index 100%
rename from test/javascripts/mixins/setting-object-test.js
rename to test/javascripts/mixins/setting-object-test.js.es6
diff --git a/test/javascripts/mixins/singleton-test.js b/test/javascripts/mixins/singleton-test.js.es6
similarity index 100%
rename from test/javascripts/mixins/singleton-test.js
rename to test/javascripts/mixins/singleton-test.js.es6
diff --git a/test/javascripts/models/badge-test.js b/test/javascripts/models/badge-test.js.es6
similarity index 100%
rename from test/javascripts/models/badge-test.js
rename to test/javascripts/models/badge-test.js.es6
diff --git a/test/javascripts/models/category-test.js b/test/javascripts/models/category-test.js.es6
similarity index 100%
rename from test/javascripts/models/category-test.js
rename to test/javascripts/models/category-test.js.es6
diff --git a/test/javascripts/models/composer-test.js b/test/javascripts/models/composer-test.js.es6
similarity index 100%
rename from test/javascripts/models/composer-test.js
rename to test/javascripts/models/composer-test.js.es6
diff --git a/test/javascripts/models/email-log-test.js b/test/javascripts/models/email-log-test.js.es6
similarity index 100%
rename from test/javascripts/models/email-log-test.js
rename to test/javascripts/models/email-log-test.js.es6
diff --git a/test/javascripts/models/group-test.js b/test/javascripts/models/group-test.js.es6
similarity index 100%
rename from test/javascripts/models/group-test.js
rename to test/javascripts/models/group-test.js.es6
diff --git a/test/javascripts/models/invite-test.js b/test/javascripts/models/invite-test.js.es6
similarity index 100%
rename from test/javascripts/models/invite-test.js
rename to test/javascripts/models/invite-test.js.es6
diff --git a/test/javascripts/models/nav-item-test.js b/test/javascripts/models/nav-item-test.js.es6
similarity index 100%
rename from test/javascripts/models/nav-item-test.js
rename to test/javascripts/models/nav-item-test.js.es6
diff --git a/test/javascripts/models/post-stream-test.js b/test/javascripts/models/post-stream-test.js.es6
similarity index 100%
rename from test/javascripts/models/post-stream-test.js
rename to test/javascripts/models/post-stream-test.js.es6
diff --git a/test/javascripts/models/post-test.js b/test/javascripts/models/post-test.js.es6
similarity index 100%
rename from test/javascripts/models/post-test.js
rename to test/javascripts/models/post-test.js.es6
diff --git a/test/javascripts/models/report-test.js b/test/javascripts/models/report-test.js.es6
similarity index 100%
rename from test/javascripts/models/report-test.js
rename to test/javascripts/models/report-test.js.es6
diff --git a/test/javascripts/models/rest-model-test.js b/test/javascripts/models/rest-model-test.js.es6
similarity index 100%
rename from test/javascripts/models/rest-model-test.js
rename to test/javascripts/models/rest-model-test.js.es6
diff --git a/test/javascripts/models/result-set-test.js b/test/javascripts/models/result-set-test.js.es6
similarity index 100%
rename from test/javascripts/models/result-set-test.js
rename to test/javascripts/models/result-set-test.js.es6
diff --git a/test/javascripts/models/session-test.js b/test/javascripts/models/session-test.js.es6
similarity index 100%
rename from test/javascripts/models/session-test.js
rename to test/javascripts/models/session-test.js.es6
diff --git a/test/javascripts/models/site-test.js b/test/javascripts/models/site-test.js.es6
similarity index 100%
rename from test/javascripts/models/site-test.js
rename to test/javascripts/models/site-test.js.es6
diff --git a/test/javascripts/models/staff-action-log-test.js b/test/javascripts/models/staff-action-log-test.js.es6
similarity index 100%
rename from test/javascripts/models/staff-action-log-test.js
rename to test/javascripts/models/staff-action-log-test.js.es6
diff --git a/test/javascripts/models/store-test.js b/test/javascripts/models/store-test.js.es6
similarity index 100%
rename from test/javascripts/models/store-test.js
rename to test/javascripts/models/store-test.js.es6
diff --git a/test/javascripts/models/topic-details-test.js b/test/javascripts/models/topic-details-test.js.es6
similarity index 100%
rename from test/javascripts/models/topic-details-test.js
rename to test/javascripts/models/topic-details-test.js.es6
diff --git a/test/javascripts/models/topic-test.js b/test/javascripts/models/topic-test.js.es6
similarity index 100%
rename from test/javascripts/models/topic-test.js
rename to test/javascripts/models/topic-test.js.es6
diff --git a/test/javascripts/models/topic-tracking-state-test.js b/test/javascripts/models/topic-tracking-state-test.js.es6
similarity index 100%
rename from test/javascripts/models/topic-tracking-state-test.js
rename to test/javascripts/models/topic-tracking-state-test.js.es6
diff --git a/test/javascripts/models/user-action-test.js b/test/javascripts/models/user-action-test.js.es6
similarity index 100%
rename from test/javascripts/models/user-action-test.js
rename to test/javascripts/models/user-action-test.js.es6
diff --git a/test/javascripts/models/user-badge-test.js b/test/javascripts/models/user-badge-test.js.es6
similarity index 100%
rename from test/javascripts/models/user-badge-test.js
rename to test/javascripts/models/user-badge-test.js.es6
diff --git a/test/javascripts/models/user-drafts-test.js b/test/javascripts/models/user-drafts-test.js.es6
similarity index 100%
rename from test/javascripts/models/user-drafts-test.js
rename to test/javascripts/models/user-drafts-test.js.es6
diff --git a/test/javascripts/models/user-stream-test.js b/test/javascripts/models/user-stream-test.js.es6
similarity index 100%
rename from test/javascripts/models/user-stream-test.js
rename to test/javascripts/models/user-stream-test.js.es6
diff --git a/test/javascripts/models/user-test.js b/test/javascripts/models/user-test.js.es6
similarity index 100%
rename from test/javascripts/models/user-test.js
rename to test/javascripts/models/user-test.js.es6
diff --git a/test/javascripts/utils/decorators-test.js b/test/javascripts/utils/decorators-test.js.es6
similarity index 100%
rename from test/javascripts/utils/decorators-test.js
rename to test/javascripts/utils/decorators-test.js.es6
diff --git a/test/javascripts/widgets/actions-summary-test.js b/test/javascripts/widgets/actions-summary-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/actions-summary-test.js
rename to test/javascripts/widgets/actions-summary-test.js.es6
diff --git a/test/javascripts/widgets/avatar-flair-test.js b/test/javascripts/widgets/avatar-flair-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/avatar-flair-test.js
rename to test/javascripts/widgets/avatar-flair-test.js.es6
diff --git a/test/javascripts/widgets/button-test.js b/test/javascripts/widgets/button-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/button-test.js
rename to test/javascripts/widgets/button-test.js.es6
diff --git a/test/javascripts/widgets/default-notification-item-test.js b/test/javascripts/widgets/default-notification-item-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/default-notification-item-test.js
rename to test/javascripts/widgets/default-notification-item-test.js.es6
diff --git a/test/javascripts/widgets/hamburger-menu-test.js b/test/javascripts/widgets/hamburger-menu-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/hamburger-menu-test.js
rename to test/javascripts/widgets/hamburger-menu-test.js.es6
diff --git a/test/javascripts/widgets/header-test.js b/test/javascripts/widgets/header-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/header-test.js
rename to test/javascripts/widgets/header-test.js.es6
diff --git a/test/javascripts/widgets/home-logo-test.js b/test/javascripts/widgets/home-logo-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/home-logo-test.js
rename to test/javascripts/widgets/home-logo-test.js.es6
diff --git a/test/javascripts/widgets/post-links-test.js b/test/javascripts/widgets/post-links-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/post-links-test.js
rename to test/javascripts/widgets/post-links-test.js.es6
diff --git a/test/javascripts/widgets/post-stream-test.js b/test/javascripts/widgets/post-stream-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/post-stream-test.js
rename to test/javascripts/widgets/post-stream-test.js.es6
diff --git a/test/javascripts/widgets/post-test.js b/test/javascripts/widgets/post-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/post-test.js
rename to test/javascripts/widgets/post-test.js.es6
diff --git a/test/javascripts/widgets/poster-name-test.js b/test/javascripts/widgets/poster-name-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/poster-name-test.js
rename to test/javascripts/widgets/poster-name-test.js.es6
diff --git a/test/javascripts/widgets/quick-access-item-test.js b/test/javascripts/widgets/quick-access-item-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/quick-access-item-test.js
rename to test/javascripts/widgets/quick-access-item-test.js.es6
diff --git a/test/javascripts/widgets/topic-admin-menu-test.js b/test/javascripts/widgets/topic-admin-menu-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/topic-admin-menu-test.js
rename to test/javascripts/widgets/topic-admin-menu-test.js.es6
diff --git a/test/javascripts/widgets/topic-participant-test.js b/test/javascripts/widgets/topic-participant-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/topic-participant-test.js
rename to test/javascripts/widgets/topic-participant-test.js.es6
diff --git a/test/javascripts/widgets/topic-status-test.js b/test/javascripts/widgets/topic-status-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/topic-status-test.js
rename to test/javascripts/widgets/topic-status-test.js.es6
diff --git a/test/javascripts/widgets/user-menu-test.js b/test/javascripts/widgets/user-menu-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/user-menu-test.js
rename to test/javascripts/widgets/user-menu-test.js.es6
diff --git a/test/javascripts/widgets/widget-test.js b/test/javascripts/widgets/widget-test.js.es6
similarity index 100%
rename from test/javascripts/widgets/widget-test.js
rename to test/javascripts/widgets/widget-test.js.es6

From 097851c1352210be38d78e47eae50cd68a780770 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 26 Mar 2020 07:16:02 +1000
Subject: [PATCH 0372/1830] FIX: Change secure media to encompass attachments
 as well (#9271)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the “secure media” site setting is enabled then ALL files uploaded to Discourse (images, video, audio, pdf, txt, zip etc. etc.) will follow the secure media rules. The “prevent anons from downloading files” setting will no longer have any bearing on upload security. Basically, the feature will more appropriately be called “secure uploads” instead of “secure media”.

This is being done because there are communities out there that would like all attachments and media to be secure based on category rules but still allow anonymous users to download attachments in public places, which is not possible in the current arrangement.
---
 app/controllers/uploads_controller.rb         |  5 +-
 .../regular/update_private_uploads_acl.rb     | 17 ------
 .../initializers/014-track-setting-changes.rb |  2 -
 config/locales/server.en.yml                  |  2 +-
 lib/post_creator.rb                           |  5 +-
 lib/tasks/s3.rake                             |  3 +-
 lib/upload_security.rb                        | 10 +---
 .../update_private_uploads_acl_spec.rb        | 54 ------------------
 spec/lib/upload_creator_spec.rb               | 11 ----
 spec/lib/upload_security_spec.rb              |  8 +--
 spec/models/post_spec.rb                      |  6 +-
 spec/models/upload_spec.rb                    |  8 +--
 spec/multisite/s3_store_spec.rb               |  1 -
 .../uploads_controller_multisite_spec.rb      | 35 ++++++++++++
 spec/requests/uploads_controller_spec.rb      | 57 ++++++++++++++++---
 spec/tasks/uploads_spec.rb                    |  9 +--
 16 files changed, 106 insertions(+), 127 deletions(-)
 delete mode 100644 app/jobs/regular/update_private_uploads_acl.rb
 delete mode 100644 spec/jobs/regular/update_private_uploads_acl_spec.rb
 create mode 100644 spec/requests/uploads_controller_multisite_spec.rb

diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index ad72f998c9..ccbd762e72 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -3,7 +3,7 @@
 require "mini_mime"
 
 class UploadsController < ApplicationController
-  requires_login except: [:show, :show_short]
+  requires_login except: [:show, :show_short, :show_secure]
 
   skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required, only: [:show, :show_short, :show_secure]
   protect_from_forgery except: :show
@@ -130,6 +130,7 @@ class UploadsController < ApplicationController
     upload = Upload.find_by(sha1: sha1)
     return render_404 if upload.blank?
 
+    return render_404 if SiteSetting.prevent_anons_from_downloading_files && current_user.nil?
     return handle_secure_upload_request(upload, path_with_ext) if SiteSetting.secure_media?
 
     # we don't want to 404 here if secure media gets disabled
@@ -146,6 +147,8 @@ class UploadsController < ApplicationController
   def handle_secure_upload_request(upload, path_with_ext = nil)
     if upload.access_control_post_id.present?
       raise Discourse::InvalidAccess if !guardian.can_see?(upload.access_control_post)
+    else
+      return render_404 if current_user.nil?
     end
 
     # url_for figures out the full URL, handling multisite DBs,
diff --git a/app/jobs/regular/update_private_uploads_acl.rb b/app/jobs/regular/update_private_uploads_acl.rb
deleted file mode 100644
index 661f84437c..0000000000
--- a/app/jobs/regular/update_private_uploads_acl.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class UpdatePrivateUploadsAcl < ::Jobs::Base
-    # only runs when SiteSetting.prevent_anons_from_downloading_files is updated
-    def execute(args)
-      return if !SiteSetting.Upload.enable_s3_uploads
-
-      Upload.find_each do |upload|
-        if !FileHelper.is_supported_media?(upload.original_filename)
-          upload.update_secure_status
-        end
-      end
-    end
-
-  end
-end
diff --git a/config/initializers/014-track-setting-changes.rb b/config/initializers/014-track-setting-changes.rb
index 200f2c2da6..d3156d46d9 100644
--- a/config/initializers/014-track-setting-changes.rb
+++ b/config/initializers/014-track-setting-changes.rb
@@ -35,8 +35,6 @@ DiscourseEvent.on(:site_setting_changed) do |name, old_value, new_value|
 
   Jobs.enqueue(:update_s3_inventory) if [:enable_s3_inventory, :s3_upload_bucket].include?(name)
 
-  Jobs.enqueue(:update_private_uploads_acl) if name == :prevent_anons_from_downloading_files
-
   SvgSprite.expire_cache if name.to_s.include?("_icon")
 
   if SiteIconManager::WATCHED_SETTINGS.include?(name)
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 986905fba1..110d3980d5 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2079,7 +2079,7 @@ en:
     bootstrap_mode_min_users: "Minimum number of users required to disable bootstrap mode (set to 0 to disable)"
 
     prevent_anons_from_downloading_files: "Prevent anonymous users from downloading attachments. WARNING: this will prevent any non-image site assets posted as attachments from working."
-    secure_media: 'Limits access to media uploads (images, video, audio). If "login required" is enabled, only logged-in users can access media uploads. Otherwise, access will be limited only for media uploads in private messages. Note: S3 uploads must be enabled prior to enabling this setting.'
+    secure_media: 'Limits access to ALL uploads (images, video, audio, text, pdfs, zips, and others). If “login required” is enabled, only logged-in users can access uploads. Otherwise, access will be limited only for media uploads in private messages and private categories. WARNING: This setting is complex and requires deep administrative understanding. See <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">the secure media topic on Meta</a> for details.'
     slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all."
 
     enable_emoji: "Enable emoji"
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 39fe22c283..fab3de1954 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -379,9 +379,8 @@ class PostCreator
   end
 
   def update_uploads_secure_status
-    if SiteSetting.secure_media? || SiteSetting.prevent_anons_from_downloading_files?
-      @post.update_uploads_secure_status
-    end
+    return if !SiteSetting.secure_media?
+    @post.update_uploads_secure_status
   end
 
   def handle_spam
diff --git a/lib/tasks/s3.rake b/lib/tasks/s3.rake
index f1b42dd90d..b72b9e083f 100644
--- a/lib/tasks/s3.rake
+++ b/lib/tasks/s3.rake
@@ -147,7 +147,6 @@ task 's3:correct_cachecontrol' => :environment do
 
   base_url = Discourse.store.absolute_base_url
 
-  acl = SiteSetting.prevent_anons_from_downloading_files ? 'private' : 'public-read'
   cache_control = 'max-age=31556952, public, immutable'
 
   objects = Upload.pluck(:id, :url).map { |array| array << :upload }
@@ -165,7 +164,7 @@ task 's3:correct_cachecontrol' => :environment do
         object = Discourse.store.s3_helper.object(key)
         object.copy_from(
           copy_source: "#{object.bucket_name}/#{object.key}",
-          acl: acl,
+          acl: "public-read",
           cache_control: cache_control,
           content_type: object.content_type,
           content_disposition: object.content_disposition,
diff --git a/lib/upload_security.rb b/lib/upload_security.rb
index 2c9d2f2386..5ce74ece10 100644
--- a/lib/upload_security.rb
+++ b/lib/upload_security.rb
@@ -23,7 +23,7 @@ class UploadSecurity
   def should_be_secure?
     return false if !SiteSetting.secure_media?
     return false if uploading_in_public_context?
-    (secure_attachment? || supported_media?) && uploading_in_secure_context?
+    uploading_in_secure_context?
   end
 
   private
@@ -32,14 +32,6 @@ class UploadSecurity
     @upload.for_theme || @upload.for_site_setting || @upload.for_gravatar || public_type? || used_for_custom_emoji? || based_on_regular_emoji?
   end
 
-  def supported_media?
-    FileHelper.is_supported_media?(@upload.original_filename)
-  end
-
-  def secure_attachment?
-    !supported_media? && SiteSetting.prevent_anons_from_downloading_files
-  end
-
   def uploading_in_secure_context?
     return true if SiteSetting.login_required?
     if @upload.access_control_post_id.present?
diff --git a/spec/jobs/regular/update_private_uploads_acl_spec.rb b/spec/jobs/regular/update_private_uploads_acl_spec.rb
deleted file mode 100644
index 9c51ef734f..0000000000
--- a/spec/jobs/regular/update_private_uploads_acl_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Jobs::UpdatePrivateUploadsAcl do
-  let(:args) { [] }
-
-  before do
-    SiteSetting.authorized_extensions = "pdf"
-  end
-
-  describe '#execute' do
-    context "if not SiteSetting.Upload.enable_s3_uploads" do
-      before do
-        SiteSetting.Upload.stubs(:enable_s3_uploads).returns(false)
-      end
-      it "returns early and changes no uploads" do
-        Upload.expects(:find_each).never
-        subject.execute(args)
-      end
-    end
-    context "if SiteSetting.Upload.enable_s3_uploads" do
-      let!(:upload) { Fabricate(:upload_s3, extension: 'pdf', original_filename: "watchmen.pdf", secure: false) }
-      before do
-        SiteSetting.login_required = true
-        SiteSetting.prevent_anons_from_downloading_files = true
-        Discourse.stubs(:store).returns(stub(external?: false))
-        enable_s3_uploads([upload])
-        SiteSetting.secure_media = true
-      end
-
-      it "changes the upload to secure" do
-        subject.execute(args)
-        expect(upload.reload.secure).to eq(true)
-      end
-    end
-  end
-
-  def enable_s3_uploads(uploads)
-    SiteSetting.enable_s3_uploads = true
-    SiteSetting.s3_upload_bucket = "s3-upload-bucket"
-    SiteSetting.s3_access_key_id = "some key"
-    SiteSetting.s3_secret_access_key = "some secrets3_region key"
-
-    stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/")
-
-    uploads.each do |upload|
-      stub_request(
-        :put,
-        "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/original/1X/#{upload.sha1}.#{upload.extension}?acl"
-      )
-    end
-  end
-end
diff --git a/spec/lib/upload_creator_spec.rb b/spec/lib/upload_creator_spec.rb
index 6e796ea36f..cc012acd25 100644
--- a/spec/lib/upload_creator_spec.rb
+++ b/spec/lib/upload_creator_spec.rb
@@ -178,7 +178,6 @@ RSpec.describe UploadCreator do
       before do
         enable_s3_uploads
         SiteSetting.secure_media = true
-        SiteSetting.prevent_anons_from_downloading_files = true
         SiteSetting.authorized_extensions = 'pdf|svg|jpg'
       end
 
@@ -195,15 +194,6 @@ RSpec.describe UploadCreator do
 
         expect(upload.secure?).to eq(false)
       end
-
-      it 'should not apply prevent_anons_from_downloading_files to image uploads' do
-        fname = "logo.jpg"
-        upload = UploadCreator.new(file_from_fixtures(fname), fname).create_for(user.id)
-        stored_upload = Upload.last
-
-        expect(stored_upload.original_filename).to eq(fname)
-        expect(stored_upload.secure?).to eq(false)
-      end
     end
 
     context 'uploading to s3' do
@@ -228,7 +218,6 @@ RSpec.describe UploadCreator do
       end
 
       it 'should return signed URL for secure attachments in S3' do
-        SiteSetting.prevent_anons_from_downloading_files = true
         SiteSetting.authorized_extensions = 'pdf'
         SiteSetting.secure_media = true
 
diff --git a/spec/lib/upload_security_spec.rb b/spec/lib/upload_security_spec.rb
index eabf061678..8f99025df2 100644
--- a/spec/lib/upload_security_spec.rb
+++ b/spec/lib/upload_security_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 RSpec.describe UploadSecurity do
   let(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }
   let(:post_in_secure_context) { Fabricate(:post, topic: Fabricate(:topic, category: private_category)) }
-  let(:upload) { Fabricate(:upload) }
+  fab!(:upload) { Fabricate(:upload) }
   let(:type) { nil }
   let(:opts) { { type: type } }
   subject { described_class.new(upload, opts) }
@@ -144,9 +144,8 @@ RSpec.describe UploadSecurity do
       end
     end
 
-    context "when prevent_anons_from_downloading_files enabled for attachment" do
+    context "for attachments" do
       before do
-        SiteSetting.prevent_anons_from_downloading_files = true
         upload.update(original_filename: 'test.pdf')
       end
 
@@ -169,9 +168,8 @@ RSpec.describe UploadSecurity do
       expect(subject.should_be_secure?).to eq(false)
     end
 
-    context "when prevent_anons_from_downloading_files enabled for attachment" do
+    context "for attachments" do
       before do
-        SiteSetting.prevent_anons_from_downloading_files = true
         upload.update(original_filename: 'test.pdf')
       end
       it "returns false" do
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 903f5c10b0..66ba358ad5 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1415,13 +1415,14 @@ describe Post do
         )
       end
 
-      it "marks image uploads as secure in PMs when secure_media is ON" do
+      it "marks image and attachment uploads as secure in PMs when secure_media is ON" do
+        SiteSetting.secure_media = true
         post = Fabricate(:post, raw: raw, user: user, topic: Fabricate(:private_message_topic, user: user))
         post.link_post_uploads
         post.update_uploads_secure_status
 
         expect(PostUpload.where(post: post).joins(:upload).pluck(:upload_id, :secure)).to contain_exactly(
-          [attachment_upload.id, false],
+          [attachment_upload.id, true],
           [image_upload.id, true]
         )
       end
@@ -1439,7 +1440,6 @@ describe Post do
       end
 
       it "marks attachments as secure when relevant setting is enabled" do
-        SiteSetting.prevent_anons_from_downloading_files = true
         SiteSetting.secure_media = true
         private_category = Fabricate(:private_category, group: Fabricate(:group))
         post = Fabricate(:post, raw: raw, user: user, topic: Fabricate(:topic, user: user, category: private_category))
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index 5ae6b3ced0..739ab43d5a 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -356,8 +356,7 @@ describe Upload do
       expect(upload.secure).to eq(false)
     end
 
-    it 'marks a local attachment as secure if prevent_anons_from_downloading_files is enabled' do
-      SiteSetting.prevent_anons_from_downloading_files = true
+    it 'marks a local attachment as secure if secure media enabled' do
       SiteSetting.authorized_extensions = "pdf"
       upload.update!(original_filename: "small.pdf", extension: "pdf", secure: false, access_control_post: Fabricate(:private_message_post))
       enable_secure_media
@@ -368,8 +367,7 @@ describe Upload do
       expect(upload.secure).to eq(true)
     end
 
-    it 'marks a local attachment as not secure if prevent_anons_from_downloading_files is disabled' do
-      SiteSetting.prevent_anons_from_downloading_files = false
+    it 'marks a local attachment as not secure if secure media enabled' do
       SiteSetting.authorized_extensions = "pdf"
       upload.update!(original_filename: "small.pdf", extension: "pdf", secure: true)
 
@@ -379,7 +377,7 @@ describe Upload do
       expect(upload.secure).to eq(false)
     end
 
-    it 'does not change secure status of a non-attachment when prevent_anons_from_downloading_files is enabled' do
+    it 'does not change secure status of a non-attachment when prevent_anons_from_downloading_files is enabled by itself' do
       SiteSetting.prevent_anons_from_downloading_files = true
       SiteSetting.authorized_extensions = "mp4"
       upload.update!(original_filename: "small.mp4", extension: "mp4")
diff --git a/spec/multisite/s3_store_spec.rb b/spec/multisite/s3_store_spec.rb
index f2107a4b0b..922c5f433b 100644
--- a/spec/multisite/s3_store_spec.rb
+++ b/spec/multisite/s3_store_spec.rb
@@ -134,7 +134,6 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
       SiteSetting.s3_access_key_id = "s3-access-key-id"
       SiteSetting.s3_secret_access_key = "s3-secret-access-key"
       SiteSetting.enable_s3_uploads = true
-      SiteSetting.prevent_anons_from_downloading_files = true
       SiteSetting.authorized_extensions = "pdf|png|jpg|gif"
     end
 
diff --git a/spec/requests/uploads_controller_multisite_spec.rb b/spec/requests/uploads_controller_multisite_spec.rb
new file mode 100644
index 0000000000..0865dd6752
--- /dev/null
+++ b/spec/requests/uploads_controller_multisite_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe UploadsController do
+  let!(:user) { Fabricate(:user) }
+
+  describe "#show_short" do
+    describe "s3 store" do
+      let(:upload) { Fabricate(:upload_s3) }
+
+      before do
+        SiteSetting.enable_s3_uploads = true
+        SiteSetting.s3_access_key_id = "fakeid7974664"
+        SiteSetting.s3_secret_access_key = "fakesecretid7974664"
+      end
+
+      context "when upload is secure and secure media enabled" do
+        before do
+          SiteSetting.secure_media = true
+          upload.update(secure: true)
+          stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/")
+        end
+        context "when running on a multisite connection", type: :multisite do
+          it "redirects to the signed_url_for_path with the multisite DB name in the url" do
+            sign_in(user)
+            freeze_time
+            get upload.short_path
+            expect(response.body).to include(RailsMultisite::ConnectionManagement.current_db)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index e7d66b1ee7..baa2f54270 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -352,7 +352,7 @@ describe UploadsController do
       end
 
       it "returns the right response when anon tries to download a file " \
-         "when prevent_anons_from_downloading_files is true" do
+        "when prevent_anons_from_downloading_files is true" do
 
         delete "/session/#{user.username}.json"
         SiteSetting.prevent_anons_from_downloading_files = true
@@ -386,6 +386,7 @@ describe UploadsController do
         end
 
         it "redirects to the signed_url_for_path" do
+          sign_in(user)
           freeze_time
           get upload.short_path
 
@@ -393,6 +394,7 @@ describe UploadsController do
         end
 
         it "raises invalid access if the user cannot access the upload access control post" do
+          sign_in(user)
           post = Fabricate(:post)
           post.topic.change_category_to_id(Fabricate(:private_category, group: Fabricate(:group)).id)
           upload.update(access_control_post: post)
@@ -400,14 +402,6 @@ describe UploadsController do
           get upload.short_path
           expect(response.code).to eq("403")
         end
-
-        context "when running on a multisite connection", type: :multisite do
-          it "redirects to the signed_url_for_path with the multisite DB name in the url" do
-            freeze_time
-            get upload.short_path
-            expect(response.body).to include(RailsMultisite::ConnectionManagement.current_db)
-          end
-        end
       end
     end
   end
@@ -430,10 +424,15 @@ describe UploadsController do
 
       def sign_in_and_stub_head
         sign_in(user)
+        stub_head
+      end
+
+      def stub_head
         stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/")
       end
 
       before do
+        SiteSetting.authorized_extensions = "*"
         SiteSetting.enable_s3_uploads = true
         SiteSetting.s3_upload_bucket = "s3-upload-bucket"
         SiteSetting.s3_access_key_id = "fakeid7974664"
@@ -508,6 +507,46 @@ describe UploadsController do
         end
       end
 
+      context "when the upload is an attachment file" do
+        before do
+          upload.update(original_filename: 'test.pdf')
+        end
+        it "redirects to the signed_url_for_path" do
+          sign_in_and_stub_head
+          get secure_url
+          expect(response.status).to eq(302)
+          expect(response.redirect_url).to match("Amz-Expires")
+        end
+
+        context "when the user does not have access to the access control post via guardian" do
+          let(:post) { Fabricate(:post) }
+          let!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }
+
+          before do
+            post.topic.change_category_to_id(private_category.id)
+            upload.update(access_control_post_id: post.id)
+          end
+
+          it "returns a 403" do
+            sign_in_and_stub_head
+            get secure_url
+            expect(response.status).to eq(403)
+          end
+        end
+
+        context "when the prevent_anons_from_downloading_files setting is enabled and the user is anon" do
+          before do
+            SiteSetting.prevent_anons_from_downloading_files = true
+          end
+          it "returns a 404" do
+            stub_head
+            delete "/session/#{user.username}.json"
+            get secure_url
+            expect(response.status).to eq(404)
+          end
+        end
+      end
+
       context "when secure media is disabled" do
         before do
           SiteSetting.secure_media = false
diff --git a/spec/tasks/uploads_spec.rb b/spec/tasks/uploads_spec.rb
index 15afad903c..4041d8a968 100644
--- a/spec/tasks/uploads_spec.rb
+++ b/spec/tasks/uploads_spec.rb
@@ -14,13 +14,14 @@ RSpec.describe "tasks/uploads" do
       [
         multi_post_upload1,
         upload1,
-        upload2
+        upload2,
+        upload3
       ]
     end
     let(:multi_post_upload1) { Fabricate(:upload_s3) }
     let(:upload1) { Fabricate(:upload_s3) }
     let(:upload2) { Fabricate(:upload_s3) }
-    let(:upload3) { Fabricate(:upload_s3, original_filename: 'test.pdf') }
+    let(:upload3) { Fabricate(:upload_s3, original_filename: 'test.pdf', extension: 'pdf') }
 
     let!(:post1) { Fabricate(:post) }
     let!(:post2) { Fabricate(:post) }
@@ -65,12 +66,12 @@ RSpec.describe "tasks/uploads" do
           expect(upload3.reload.access_control_post).to eq(post3)
         end
 
-        it "sets the upload in the read restricted topic category to secure" do
+        it "sets the uploads that are media and attachments in the read restricted topic category to secure" do
           post3.topic.update(category: Fabricate(:private_category, group: Fabricate(:group)))
           invoke_task
           expect(upload2.reload.secure).to eq(true)
           expect(upload1.reload.secure).to eq(false)
-          expect(upload3.reload.secure).to eq(false)
+          expect(upload3.reload.secure).to eq(true)
         end
 
         it "sets the upload in the PM topic to secure" do

From ecb098bcbb0aad9e7d3777e036e4eafb0cfece9b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 25 Mar 2020 22:40:52 +0100
Subject: [PATCH 0373/1830] DEV: skip this test for now, failing randomly on CI
 (#9280)

Works on local
---
 test/javascripts/acceptance/topic-edit-timer-test.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/acceptance/topic-edit-timer-test.js.es6 b/test/javascripts/acceptance/topic-edit-timer-test.js.es6
index 39d99e7598..83190f6a94 100644
--- a/test/javascripts/acceptance/topic-edit-timer-test.js.es6
+++ b/test/javascripts/acceptance/topic-edit-timer-test.js.es6
@@ -66,7 +66,7 @@ QUnit.test("autoclose - specific time", async assert => {
   assert.ok(regex.test(html));
 });
 
-QUnit.test("autoclose", async assert => {
+QUnit.skip("autoclose", async assert => {
   updateCurrentUser({ moderator: true, canManageTopic: true });
   const futureDateInputSelector = selectKit(".future-date-input-selector");
 

From b2aa203e67ac9f87e85a78060b624c4f29f601a5 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 25 Mar 2020 21:40:51 -0400
Subject: [PATCH 0374/1830] Add additional classes to topic-map stats

---
 .../javascripts/discourse/widgets/topic-map.js     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js b/app/assets/javascripts/discourse/widgets/topic-map.js
index fcd719fcb9..c434e84985 100644
--- a/app/assets/javascripts/discourse/widgets/topic-map.js
+++ b/app/assets/javascripts/discourse/widgets/topic-map.js
@@ -85,7 +85,7 @@ createWidget("topic-map-summary", {
   html(attrs, state) {
     const contents = [];
     contents.push(
-      h("li", [
+      h("li.created-at", [
         h(
           "h4",
           {
@@ -105,7 +105,7 @@ createWidget("topic-map-summary", {
     );
     contents.push(
       h(
-        "li",
+        "li.last-reply",
         h("a", { attributes: { href: attrs.lastPostUrl } }, [
           h(
             "h4",
@@ -126,7 +126,7 @@ createWidget("topic-map-summary", {
       )
     );
     contents.push(
-      h("li", [
+      h("li.replies", [
         numberNode(attrs.topicReplyCount),
         h(
           "h4",
@@ -140,7 +140,7 @@ createWidget("topic-map-summary", {
       ])
     );
     contents.push(
-      h("li.secondary", [
+      h("li.secondary.views", [
         numberNode(attrs.topicViews, { className: attrs.topicViewsHeat }),
         h(
           "h4",
@@ -154,7 +154,7 @@ createWidget("topic-map-summary", {
 
     if (attrs.participantCount > 0) {
       contents.push(
-        h("li.secondary", [
+        h("li.secondary.users", [
           numberNode(attrs.participantCount),
           h(
             "h4",
@@ -171,7 +171,7 @@ createWidget("topic-map-summary", {
 
     if (attrs.topicLikeCount) {
       contents.push(
-        h("li.secondary", [
+        h("li.secondary.likes", [
           numberNode(attrs.topicLikeCount),
           h(
             "h4",
@@ -188,7 +188,7 @@ createWidget("topic-map-summary", {
 
     if (attrs.topicLinkLength > 0) {
       contents.push(
-        h("li.secondary", [
+        h("li.secondary.links", [
           numberNode(attrs.topicLinkLength),
           h(
             "h4",

From ecbccab1599d44903477fd9656e44286e8200829 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 26 Mar 2020 13:44:02 +1100
Subject: [PATCH 0375/1830] FEATURE: invite_code is case-insensitive

Previously we required exact casing for invite code, this can cause a lot
of confusion. Relax the requirement.
---
 app/controllers/users_controller.rb    | 2 +-
 config/locales/server.en.yml           | 2 +-
 spec/requests/users_controller_spec.rb | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index da9ba484ee..79bee4208d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -425,7 +425,7 @@ class UsersController < ApplicationController
       return fail_with("login.email_too_long")
     end
 
-    if SiteSetting.require_invite_code && SiteSetting.invite_code != params[:invite_code]
+    if SiteSetting.require_invite_code && SiteSetting.invite_code.strip.downcase != params[:invite_code].strip.downcase
       return fail_with("login.wrong_invite_code")
     end
 
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 110d3980d5..b1fd87890d 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1529,7 +1529,7 @@ en:
     markdown_typographer_quotation_marks: "List of double and single quotes replacement pairs"
     post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)."
     must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site."
-    invite_code: "User must type this code to be allowed account registration, ignored when empty"
+    invite_code: "User must type this code to be allowed account registration, ignored when empty (case-insensitive)"
     approve_suspect_users: "Add suspicious users to the review queue. Suspicious users have entered a bio/website but have no reading activity."
     pending_users_reminder_delay: "Notify moderators if new users have been waiting for approval for longer than this many hours. Set to -1 to disable notifications."
     maximum_session_age: "User will remain logged in for n hours since last visit"
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 57a936aa33..95d675f372 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -618,7 +618,7 @@ describe UsersController do
 
       it 'requires invite code when specified' do
         expect(SiteSetting.require_invite_code).to eq(false)
-        SiteSetting.invite_code = "abc"
+        SiteSetting.invite_code = "abc def"
         expect(SiteSetting.require_invite_code).to eq(true)
 
         post_user(invite_code: "abcd")
@@ -626,7 +626,8 @@ describe UsersController do
         json = JSON.parse(response.body)
         expect(json["success"]).to eq(false)
 
-        post_user(invite_code: "abc")
+        # case insensitive and stripped of leading/ending spaces
+        post_user(invite_code: " AbC deF ")
         expect(response.status).to eq(200)
         json = JSON.parse(response.body)
         expect(json["success"]).to eq(true)

From efd5fb665b0f478c0159b7dfb315dc0afa820c17 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 26 Mar 2020 13:31:39 +1000
Subject: [PATCH 0376/1830] DEV: Fix flaky time sensitive uploads.rake specs
 (#9283)

Also fix issues in spec where certain uploads were not considered secure
---
 lib/tasks/uploads.rake       |  2 +-
 spec/support/time_matcher.rb |  3 +++
 spec/tasks/uploads_spec.rb   | 37 +++++++++++++++++++++++-------------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 33c69b7d6c..6b7473ebb3 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -768,7 +768,7 @@ def adjust_acls(uploads_to_adjust_acl_for)
     Discourse.store.update_upload_ACL(upload)
     i += 1
   end
-  RakeHelpers.print_status_with_label("Updaing ACLs complete!        ", i, total_count)
+  RakeHelpers.print_status_with_label("Updating ACLs complete!        ", i, total_count)
 end
 
 def mark_all_as_secure_login_required(uploads_to_update)
diff --git a/spec/support/time_matcher.rb b/spec/support/time_matcher.rb
index ec7930e35a..b578fe3833 100644
--- a/spec/support/time_matcher.rb
+++ b/spec/support/time_matcher.rb
@@ -16,4 +16,7 @@ RSpec::Matchers.define :eq_time do |expected_time|
   failure_message do |actual_time|
     "#{actual_time} is not within 1 millisecond of #{expected_time}"
   end
+  failure_message_when_negated do |actual_time|
+    "#{actual_time} is within 1 millisecond of #{expected_time}"
+  end
 end
diff --git a/spec/tasks/uploads_spec.rb b/spec/tasks/uploads_spec.rb
index 4041d8a968..cbbd5b1705 100644
--- a/spec/tasks/uploads_spec.rb
+++ b/spec/tasks/uploads_spec.rb
@@ -81,16 +81,19 @@ RSpec.describe "tasks/uploads" do
           expect(upload1.reload.secure).to eq(false)
         end
 
-        it "rebakes the posts attached" do
-          post1_baked = post1.baked_at
-          post2_baked = post2.baked_at
-          post3_baked = post3.baked_at
+        it "rebakes the posts attached for uploads that change secure status" do
+          post3.topic.update(category: Fabricate(:private_category, group: Fabricate(:group)))
+          freeze_time
+
+          post1.update_columns(baked_at: 1.week.ago)
+          post2.update_columns(baked_at: 1.week.ago)
+          post3.update_columns(baked_at: 1.week.ago)
 
           invoke_task
 
-          expect(post1.reload.baked_at).not_to eq(post1_baked)
-          expect(post2.reload.baked_at).not_to eq(post2_baked)
-          expect(post3.reload.baked_at).not_to eq(post3_baked)
+          expect(post1.reload.baked_at).to eq_time(1.week.ago)
+          expect(post2.reload.baked_at).to eq_time(1.week.ago)
+          expect(post3.reload.baked_at).not_to eq_time(1.week.ago)
         end
 
         context "for an upload that is already secure and does not need to change" do
@@ -98,12 +101,17 @@ RSpec.describe "tasks/uploads" do
             post3.topic.update(archetype: 'private_message', category: nil)
             upload2.update(access_control_post: post3)
             upload2.update_secure_status
+            upload3.update(access_control_post: post3)
+            upload3.update_secure_status
           end
 
           it "does not rebake the associated post" do
-            post3_baked = post3.baked_at.to_s
+            freeze_time
+
+            post3.update_columns(baked_at: 1.week.ago)
             invoke_task
-            expect(post3.reload.baked_at.to_s).to eq(post3_baked)
+
+            expect(post3.reload.baked_at).to eq_time(1.week.ago)
           end
 
           it "does not attempt to update the acl" do
@@ -168,11 +176,14 @@ RSpec.describe "tasks/uploads" do
     end
 
     it "rebakes the associated posts" do
-      baked_post1 = post1.baked_at
-      baked_post2 = post2.baked_at
+      freeze_time
+
+      post1.update_columns(baked_at: 1.week.ago)
+      post2.update_columns(baked_at: 1.week.ago)
       invoke_task
-      expect(post1.reload.baked_at).not_to eq(baked_post1)
-      expect(post2.reload.baked_at).not_to eq(baked_post2)
+
+      expect(post1.reload.baked_at).not_to eq_time(1.week.ago)
+      expect(post2.reload.baked_at).not_to eq_time(1.week.ago)
     end
 
     it "updates the affected ACLs" do

From 6f978bc95cf806a32c4fe133a117aae83178fecf Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 26 Mar 2020 15:59:57 +1000
Subject: [PATCH 0377/1830] FIX: First pass to improve efficiency of secure
 uploads rake task (#9284)

Get rid of harmful each loop over uploads to update. Instead we put all the unique access control posts for the uploads into a map for fast access (vs using the slow .find through array) and look up the post when it is needed when looping through the uploads in batches.

On a Discourse instance with ~93k uploads, a simplified version of the old method takes > 1 minute, and a simplified version of the new method takes ~18s and uses a lot less memory.
---
 lib/tasks/uploads.rake | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 6b7473ebb3..f02534610c 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -710,13 +710,6 @@ task "uploads:secure_upload_analyse_and_update" => :environment do
       # secure based on site settings.
       uploads_to_update = Upload.includes(:posts, :optimized_images).joins(:post_uploads)
 
-      # we do this to avoid a heavier post query, and to make sure we only
-      # get unique posts AND include deleted posts (unscoped)
-      unique_access_control_posts = Post.unscoped.select(:id, :topic_id).includes(topic: :category).where(id: uploads_to_update.pluck(:access_control_post_id).uniq)
-      uploads_to_update.each do |upload|
-        upload.access_control_post = unique_access_control_posts.find { |post| post.id == upload.access_control_post_id }
-      end
-
       puts "There are #{uploads_to_update.count} upload(s) that could be marked secure.", ""
 
       # Simply mark all these uploads as secure if login_required because no anons will be able to access them
@@ -840,8 +833,20 @@ def determine_upload_security_and_posts_to_rebake(uploads_to_update, mark_secure
   uploads_to_adjust_acl_for = []
   posts_to_rebake = {}
 
+  # we do this to avoid a heavier post query, and to make sure we only
+  # get unique posts AND include deleted posts (unscoped)
+  unique_access_control_posts = {}
+  Post.unscoped.select(:id, :topic_id)
+    .includes(topic: :category)
+    .where(id: uploads_to_update.pluck(:access_control_post_id).uniq).find_each do |post|
+    unique_access_control_posts[post.id] = post
+  end
+
   i = 0
-  uploads_to_update.find_each(batch_size: 50) do |upload_to_update|
+  uploads_to_update.find_each do |upload_to_update|
+
+    # fetch the post out of the already populated map to avoid n1s
+    upload_to_update.access_control_post = unique_access_control_posts[upload_to_update.access_control_post_id]
 
     # we just need to determine the post security here so the ACL is set to the correct thing,
     # because the update_upload_ACL method uses upload.secure?

From 25f1f23288e116ef04ce787df803460ed5e51dca Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 26 Mar 2020 17:35:32 +1100
Subject: [PATCH 0378/1830] FEATURE: Stricter rules for user presence

Previously we would consider a user "present" and "last seen" if the
browser window was visible.

This has many edge cases, you could be considered present and around for
days just by having a window open and no screensaver on.

Instead we now also check that you either clicked, transitioned around app
or scrolled the page in the last minute in combination with window
visibility

This will lead to more reliable notifications via email and reduce load of
message bus for cases where a user walks away from the terminal
---
 Gemfile.lock                                  |  2 +-
 app/assets/javascripts/application.js         |  2 +-
 .../discourse/initializers/message-bus.js     | 11 ++---
 app/assets/javascripts/discourse/lib/ajax.js  |  6 +--
 .../discourse/lib/user-presence.js            | 45 +++++++++++++++++++
 .../javascripts/discourse/routes/discourse.js |  5 +++
 config/initializers/004-message_bus.rb        |  2 +-
 config/initializers/008-rack-cors.rb          |  2 +-
 lib/auth/default_current_user_provider.rb     |  2 +-
 .../default_current_user_provider_spec.rb     |  8 ++--
 spec/components/hijack_spec.rb                |  2 +-
 11 files changed, 69 insertions(+), 18 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/lib/user-presence.js

diff --git a/Gemfile.lock b/Gemfile.lock
index 471bb0f956..08056d633d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -182,7 +182,7 @@ GEM
       mini_mime (>= 0.1.1)
     maxminddb (0.1.22)
     memory_profiler (0.9.14)
-    message_bus (2.2.3)
+    message_bus (2.2.4)
       rack (>= 1.1.3)
     metaclass (0.0.4)
     method_source (0.9.2)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 35cc29acce..9addddf9ef 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -11,7 +11,7 @@
 // Stuff we need to load first
 //= require ./discourse/lib/to-markdown
 //= require ./discourse/lib/utilities
-//= require ./discourse/lib/page-visible
+//= require ./discourse/lib/user-presence
 //= require ./discourse/lib/logout
 //= require ./discourse/mixins/singleton
 //= require ./discourse/models/rest
diff --git a/app/assets/javascripts/discourse/initializers/message-bus.js b/app/assets/javascripts/discourse/initializers/message-bus.js
index 960aaaaf1c..61905e42a0 100644
--- a/app/assets/javascripts/discourse/initializers/message-bus.js
+++ b/app/assets/javascripts/discourse/initializers/message-bus.js
@@ -1,5 +1,5 @@
 // Initialize the message bus to receive messages.
-import pageVisible from "discourse/lib/page-visible";
+import userPresent from "discourse/lib/user-presence";
 import { handleLogoff } from "discourse/lib/ajax";
 
 function ajax(opts) {
@@ -31,6 +31,7 @@ export default {
       siteSettings = container.lookup("site-settings:main");
 
     messageBus.alwaysLongPoll = Discourse.Environment === "development";
+    messageBus.shouldLongPollCallback = userPresent;
 
     // we do not want to start anything till document is complete
     messageBus.stop();
@@ -65,16 +66,16 @@ export default {
         opts.headers["X-Shared-Session-Key"] = $(
           "meta[name=shared_session_key]"
         ).attr("content");
-        if (pageVisible()) {
-          opts.headers["Discourse-Visible"] = "true";
+        if (userPresent()) {
+          opts.headers["Discourse-Present"] = "true";
         }
         return ajax(opts);
       };
     } else {
       messageBus.ajax = function(opts) {
         opts.headers = opts.headers || {};
-        if (pageVisible()) {
-          opts.headers["Discourse-Visible"] = "true";
+        if (userPresent()) {
+          opts.headers["Discourse-Present"] = "true";
         }
         return ajax(opts);
       };
diff --git a/app/assets/javascripts/discourse/lib/ajax.js b/app/assets/javascripts/discourse/lib/ajax.js
index 54de18d4c8..37052a4d79 100644
--- a/app/assets/javascripts/discourse/lib/ajax.js
+++ b/app/assets/javascripts/discourse/lib/ajax.js
@@ -1,5 +1,5 @@
 import { run } from "@ember/runloop";
-import pageVisible from "discourse/lib/page-visible";
+import userPresent from "discourse/lib/user-presence";
 import logout from "discourse/lib/logout";
 import Session from "discourse/models/session";
 import { Promise } from "rsvp";
@@ -92,8 +92,8 @@ export function ajax() {
       args.headers["Discourse-Track-View"] = "true";
     }
 
-    if (pageVisible()) {
-      args.headers["Discourse-Visible"] = "true";
+    if (userPresent()) {
+      args.headers["Discourse-Present"] = "true";
     }
 
     args.success = (data, textStatus, xhr) => {
diff --git a/app/assets/javascripts/discourse/lib/user-presence.js b/app/assets/javascripts/discourse/lib/user-presence.js
new file mode 100644
index 0000000000..67d332981f
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/user-presence.js
@@ -0,0 +1,45 @@
+// for android we test webkit
+const hiddenProperty =
+  document.hidden !== undefined
+    ? "hidden"
+    : document.webkitHidden !== undefined
+    ? "webkitHidden"
+    : undefined;
+
+const MAX_UNSEEN_TIME = 60000;
+
+let seenUserTime = Date.now();
+
+export default function() {
+  const now = Date.now();
+
+  if (seenUserTime + MAX_UNSEEN_TIME < now) {
+    return false;
+  }
+
+  if (hiddenProperty !== undefined) {
+    return !document[hiddenProperty];
+  } else {
+    return document && document.hasFocus;
+  }
+}
+
+export function seenUser() {
+  seenUserTime = Date.now();
+}
+
+// We could piggieback on the Scroll mixin, but it is not applied
+// consistently to all pages
+//
+// We try to keep this as cheap as possible by performing absolute minimal
+// amount of work when the event handler is fired
+//
+// An alternative would be to use a timer that looks at the scroll position
+// however this will not work as message bus can issue page updates and scroll
+// page around when user is not present
+//
+// We avoid tracking mouse move which would be very expensive
+
+$(document).bind("touchmove.discourse-track-presence", seenUser);
+$(document).bind("click.discourse-track-presence", seenUser);
+$(window).bind("scroll.discourse-track-presence", seenUser);
diff --git a/app/assets/javascripts/discourse/routes/discourse.js b/app/assets/javascripts/discourse/routes/discourse.js
index 980e986cd9..91be0b4331 100644
--- a/app/assets/javascripts/discourse/routes/discourse.js
+++ b/app/assets/javascripts/discourse/routes/discourse.js
@@ -3,10 +3,15 @@ import Composer from "discourse/models/composer";
 import { getOwner } from "discourse-common/lib/get-owner";
 import Route from "@ember/routing/route";
 import deprecated from "discourse-common/lib/deprecated";
+import { seenUser } from "discourse/lib/user-presence";
 
 const DiscourseRoute = Route.extend({
   showFooter: false,
 
+  willTransition() {
+    seenUser();
+  },
+
   // Set to true to refresh a model without a transition if a query param
   // changes
   resfreshQueryWithoutTransition: false,
diff --git a/config/initializers/004-message_bus.rb b/config/initializers/004-message_bus.rb
index da12f03bed..924fe6dc71 100644
--- a/config/initializers/004-message_bus.rb
+++ b/config/initializers/004-message_bus.rb
@@ -30,7 +30,7 @@ def setup_message_bus_env(env)
     extra_headers = {
       "Access-Control-Allow-Origin" => Discourse.base_url_no_prefix,
       "Access-Control-Allow-Methods" => "GET, POST",
-      "Access-Control-Allow-Headers" => "X-SILENCE-LOGGER, X-Shared-Session-Key, Dont-Chunk, Discourse-Visible"
+      "Access-Control-Allow-Headers" => "X-SILENCE-LOGGER, X-Shared-Session-Key, Dont-Chunk, Discourse-Present"
     }
 
     user = nil
diff --git a/config/initializers/008-rack-cors.rb b/config/initializers/008-rack-cors.rb
index 5f1c6f4068..cc5bb8cd96 100644
--- a/config/initializers/008-rack-cors.rb
+++ b/config/initializers/008-rack-cors.rb
@@ -39,7 +39,7 @@ class Discourse::Cors
       end
 
       headers['Access-Control-Allow-Origin'] = origin || cors_origins[0]
-      headers['Access-Control-Allow-Headers'] = 'Content-Type, Cache-Control, X-Requested-With, X-CSRF-Token, Discourse-Visible, User-Api-Key, User-Api-Client-Id, Authorization'
+      headers['Access-Control-Allow-Headers'] = 'Content-Type, Cache-Control, X-Requested-With, X-CSRF-Token, Discourse-Present, User-Api-Key, User-Api-Client-Id, Authorization'
       headers['Access-Control-Allow-Credentials'] = 'true'
       headers['Access-Control-Allow-Methods'] = 'POST, PUT, GET, OPTIONS, DELETE'
     end
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index ca8ec4d197..3e293dcb77 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -251,7 +251,7 @@ class Auth::DefaultCurrentUserProvider
     api = !!(@env[API_KEY_ENV]) || !!(@env[USER_API_KEY_ENV])
 
     if @request.xhr? || api
-      @env["HTTP_DISCOURSE_VISIBLE".freeze] == "true".freeze
+      @env["HTTP_DISCOURSE_PRESENT"] == "true"
     else
       true
     end
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index 2fd165c848..f0c6fbc90e 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -462,18 +462,18 @@ describe Auth::DefaultCurrentUserProvider do
     expect(provider("/topic/anything/goes",
                     :method => "POST",
                     "HTTP_X_REQUESTED_WITH" => "XMLHttpRequest",
-                    "HTTP_DISCOURSE_VISIBLE" => "true"
+                    "HTTP_DISCOURSE_PRESENT" => "true"
           ).should_update_last_seen?).to eq(true)
   end
 
-  it "should not update last seen for ajax calls without Discourse-Visible header" do
+  it "should not update last seen for ajax calls without Discourse-Present header" do
     expect(provider("/topic/anything/goes",
                     :method => "POST",
                     "HTTP_X_REQUESTED_WITH" => "XMLHttpRequest"
           ).should_update_last_seen?).to eq(false)
   end
 
-  it "should update last seen for API calls with Discourse-Visible header" do
+  it "should update last seen for API calls with Discourse-Present header" do
     user = Fabricate(:user)
     api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
     params = { :method => "POST",
@@ -482,7 +482,7 @@ describe Auth::DefaultCurrentUserProvider do
               }
 
     expect(provider("/topic/anything/goes", params).should_update_last_seen?).to eq(false)
-    expect(provider("/topic/anything/goes", params.merge("HTTP_DISCOURSE_VISIBLE" => "true")).should_update_last_seen?).to eq(true)
+    expect(provider("/topic/anything/goes", params.merge("HTTP_DISCOURSE_PRESENT" => "true")).should_update_last_seen?).to eq(true)
   end
 
   it "correctly rotates tokens" do
diff --git a/spec/components/hijack_spec.rb b/spec/components/hijack_spec.rb
index 7e30a5439e..93bf9c98bf 100644
--- a/spec/components/hijack_spec.rb
+++ b/spec/components/hijack_spec.rb
@@ -108,7 +108,7 @@ describe Hijack do
 
     expected = {
       "Access-Control-Allow-Origin" => "www.rainbows.com",
-      "Access-Control-Allow-Headers" => "Content-Type, Cache-Control, X-Requested-With, X-CSRF-Token, Discourse-Visible, User-Api-Key, User-Api-Client-Id, Authorization",
+      "Access-Control-Allow-Headers" => "Content-Type, Cache-Control, X-Requested-With, X-CSRF-Token, Discourse-Present, User-Api-Key, User-Api-Client-Id, Authorization",
       "Access-Control-Allow-Credentials" => "true",
       "Access-Control-Allow-Methods" => "POST, PUT, GET, OPTIONS, DELETE"
     }

From e62071830d734e598acd81a800f37a3b9dfd5275 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 26 Mar 2020 17:36:42 +1100
Subject: [PATCH 0379/1830] DEV: prefer Date.now() over new Date().getTime()

`New Date().getTime()` is both uglier and slower than `Date.now()`

`Date.now()` is available on all the browsers we support.
---
 app/assets/javascripts/discourse/components/mount-widget.js | 4 ++--
 app/assets/javascripts/discourse/components/signup-cta.js   | 2 +-
 app/assets/javascripts/discourse/initializers/signup-cta.js | 2 +-
 app/assets/javascripts/discourse/lib/lock-on.js             | 4 ++--
 app/assets/javascripts/discourse/lib/screen-track.js        | 6 +++---
 app/assets/javascripts/discourse/lib/url.js                 | 2 +-
 app/assets/javascripts/discourse/mixins/pan-events.js       | 4 ++--
 .../javascripts/discourse/routes/topic-from-params.js       | 2 +-
 .../javascripts/discourse/widgets/post-edits-indicator.js   | 2 +-
 app/assets/javascripts/discourse/widgets/post.js            | 4 ++--
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/mount-widget.js b/app/assets/javascripts/discourse/components/mount-widget.js
index dc98bf9f6d..dc1eb2e166 100644
--- a/app/assets/javascripts/discourse/components/mount-widget.js
+++ b/app/assets/javascripts/discourse/components/mount-widget.js
@@ -112,7 +112,7 @@ export default Component.extend({
         return;
       }
 
-      const t0 = new Date().getTime();
+      const t0 = Date.now();
       const args = this.args || this.buildArgs();
       const opts = {
         model: this.model,
@@ -139,7 +139,7 @@ export default Component.extend({
 
       if (this.profileWidget) {
         // eslint-disable-next-line no-console
-        console.log(new Date().getTime() - t0);
+        console.log(Date.now() - t0);
       }
     }
   }
diff --git a/app/assets/javascripts/discourse/components/signup-cta.js b/app/assets/javascripts/discourse/components/signup-cta.js
index 7d6f1623e4..43aee26cc9 100644
--- a/app/assets/javascripts/discourse/components/signup-cta.js
+++ b/app/assets/javascripts/discourse/components/signup-cta.js
@@ -12,7 +12,7 @@ export default Component.extend({
     },
     hideForSession() {
       this.session.set("hideSignupCta", true);
-      this.keyValueStore.setItem("anon-cta-hidden", new Date().getTime());
+      this.keyValueStore.setItem("anon-cta-hidden", Date.now());
       later(() => this.session.set("showSignupCta", false), 20 * 1000);
     }
   },
diff --git a/app/assets/javascripts/discourse/initializers/signup-cta.js b/app/assets/javascripts/discourse/initializers/signup-cta.js
index a46d12f851..db674ccde1 100644
--- a/app/assets/javascripts/discourse/initializers/signup-cta.js
+++ b/app/assets/javascripts/discourse/initializers/signup-cta.js
@@ -38,7 +38,7 @@ export default {
         return; // hidden forever
       }
 
-      const now = new Date().getTime();
+      const now = Date.now();
       const hiddenAt = keyValueStore.getInt("anon-cta-hidden", 0);
       if (hiddenAt > now - PROMPT_HIDE_DURATION) {
         return; // hidden in last 24 hours
diff --git a/app/assets/javascripts/discourse/lib/lock-on.js b/app/assets/javascripts/discourse/lib/lock-on.js
index 90cc641dfe..d17353d4c1 100644
--- a/app/assets/javascripts/discourse/lib/lock-on.js
+++ b/app/assets/javascripts/discourse/lib/lock-on.js
@@ -49,7 +49,7 @@ export default class LockOn {
   }
 
   lock() {
-    const startedAt = new Date().getTime();
+    const startedAt = Date.now();
     let previousTop = this.elementTop();
     previousTop && $(window).scrollTop(previousTop);
 
@@ -73,7 +73,7 @@ export default class LockOn {
       }
 
       // Stop after a little while
-      if (new Date().getTime() - startedAt > LOCK_DURATION_MS) {
+      if (Date.now() - startedAt > LOCK_DURATION_MS) {
         return this.clearLock(interval);
       }
     }, 50);
diff --git a/app/assets/javascripts/discourse/lib/screen-track.js b/app/assets/javascripts/discourse/lib/screen-track.js
index 91e0d42a83..ccfd9d8b3f 100644
--- a/app/assets/javascripts/discourse/lib/screen-track.js
+++ b/app/assets/javascripts/discourse/lib/screen-track.js
@@ -65,7 +65,7 @@ export default class {
 
   // Reset our timers
   reset() {
-    const now = new Date().getTime();
+    const now = Date.now();
     this._lastTick = now;
     this._lastScrolled = now;
     this._lastFlush = 0;
@@ -79,7 +79,7 @@ export default class {
   }
 
   scrolled() {
-    this._lastScrolled = new Date().getTime();
+    this._lastScrolled = Date.now();
   }
 
   registerAnonCallback(cb) {
@@ -212,7 +212,7 @@ export default class {
   }
 
   tick() {
-    const now = new Date().getTime();
+    const now = Date.now();
 
     // If the user hasn't scrolled the browser in a long time, stop tracking time read
     const sinceScrolled = now - this._lastScrolled;
diff --git a/app/assets/javascripts/discourse/lib/url.js b/app/assets/javascripts/discourse/lib/url.js
index a475c4aec3..ed46452529 100644
--- a/app/assets/javascripts/discourse/lib/url.js
+++ b/app/assets/javascripts/discourse/lib/url.js
@@ -368,7 +368,7 @@ const DiscourseURL = EmberObject.extend({
           const closest = postStream.closestPostNumberFor(opts.nearPost || 1);
           topicController.setProperties({
             "model.currentPost": closest,
-            enteredAt: new Date().getTime().toString()
+            enteredAt: Date.now().toString()
           });
 
           this.appEvents.trigger("post:highlight", closest);
diff --git a/app/assets/javascripts/discourse/mixins/pan-events.js b/app/assets/javascripts/discourse/mixins/pan-events.js
index fb05901205..b41d002f63 100644
--- a/app/assets/javascripts/discourse/mixins/pan-events.js
+++ b/app/assets/javascripts/discourse/mixins/pan-events.js
@@ -61,7 +61,7 @@ export default Mixin.create({
     if (e.type === "pointerup" || e.type === "pointercancel") {
       return oldState;
     }
-    const newTimestamp = new Date().getTime();
+    const newTimestamp = Date.now();
     const timeDiffSeconds = newTimestamp - oldState.timestamp;
     if (timeDiffSeconds === 0) {
       return oldState;
@@ -109,7 +109,7 @@ export default Mixin.create({
       deltaY: 0,
       distance: 0,
       start: true,
-      timestamp: new Date().getTime(),
+      timestamp: Date.now(),
       direction: null
     };
     this.set("_panState", newState);
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js b/app/assets/javascripts/discourse/routes/topic-from-params.js
index dd2215520f..1429fb0c16 100644
--- a/app/assets/javascripts/discourse/routes/topic-from-params.js
+++ b/app/assets/javascripts/discourse/routes/topic-from-params.js
@@ -53,7 +53,7 @@ export default DiscourseRoute.extend({
         topicController.setProperties({
           "model.currentPost": closest,
           enteredIndex: topic.postStream.progressIndexOfPost(closestPost),
-          enteredAt: new Date().getTime().toString()
+          enteredAt: Date.now().toString()
         });
 
         this.appEvents.trigger("page:topic-loaded", topic);
diff --git a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js b/app/assets/javascripts/discourse/widgets/post-edits-indicator.js
index 46f7ed3f4d..f928df4727 100644
--- a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js
+++ b/app/assets/javascripts/discourse/widgets/post-edits-indicator.js
@@ -13,7 +13,7 @@ export function historyHeat(siteSettings, updatedAt) {
   }
 
   // Show heat on age
-  const rightNow = new Date().getTime();
+  const rightNow = Date.now();
   const updatedAtTime = updatedAt.getTime();
 
   if (updatedAtTime > rightNow - mult(siteSettings.history_hours_low)) {
diff --git a/app/assets/javascripts/discourse/widgets/post.js b/app/assets/javascripts/discourse/widgets/post.js
index c6fc4f3319..d2f79335e2 100644
--- a/app/assets/javascripts/discourse/widgets/post.js
+++ b/app/assets/javascripts/discourse/widgets/post.js
@@ -730,7 +730,7 @@ export default createWidget("post", {
     const lastWarnedLikes = kvs.get("lastWarnedLikes");
 
     // only warn once per day
-    const yesterday = new Date().getTime() - 1000 * 60 * 60 * 24;
+    const yesterday = Date.now() - 1000 * 60 * 60 * 24;
     if (lastWarnedLikes && parseInt(lastWarnedLikes, 10) > yesterday) {
       return;
     }
@@ -739,7 +739,7 @@ export default createWidget("post", {
     const threshold = Math.ceil(max * 0.1);
     if (remaining === threshold) {
       bootbox.alert(I18n.t("post.few_likes_left"));
-      kvs.set({ key: "lastWarnedLikes", value: new Date().getTime() });
+      kvs.set({ key: "lastWarnedLikes", value: Date.now() });
     }
   }
 });

From 6bceb1d15a49a205d9fddba9b1314d0d6152d0aa Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Thu, 26 Mar 2020 09:07:41 -0300
Subject: [PATCH 0380/1830] FIX: Display small post actions when embedding a
 topic (#9278)

---
 app/helpers/embed_helper.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/helpers/embed_helper.rb b/app/helpers/embed_helper.rb
index 9db2fa5b9b..42e728ddba 100644
--- a/app/helpers/embed_helper.rb
+++ b/app/helpers/embed_helper.rb
@@ -17,6 +17,9 @@ module EmbedHelper
   end
 
   def get_html(post)
-    raw PrettyText.format_for_email(post.cooked, post)
+    key = "js.action_codes.#{post.action_code}"
+    cooked = post.cooked.blank? ? I18n.t(key, when: nil).humanize : post.cooked
+
+    raw PrettyText.format_for_email(cooked, post)
   end
 end

From ba1a08510eb9574803955a9a2e6e7a8f7b2d1a43 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Thu, 26 Mar 2020 14:24:07 +0200
Subject: [PATCH 0381/1830] FIX: Use correct spacing in emails with code
 (#9274)

Follow-up-to 778454e26b5c38c94dad6ccbc9f11439a51f6b6d
---
 lib/email/styles.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 0b6c3f8d77..4d299fcff3 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -195,7 +195,8 @@ module Email
       style('div.summary-footer', 'color:#666; font-size:95%; text-align:center; padding-top:15px;')
       style('span.post-count', 'margin: 0 5px; color: #777;')
       style('pre', 'word-wrap: break-word; max-width: 694px;')
-      style('code', 'background-color: #f1f1ff; line-height: 50%; padding: 2px 5px;')
+      style('code', 'background-color: #f1f1ff; padding: 2px 5px;')
+      style('code ol', 'line-height: 50%;')
       style('pre code', 'display: block; background-color: #f1f1ff; padding: 5px;')
       style('.featured-topic a', "text-decoration: none; font-weight: bold; color: #{SiteSetting.email_link_color}; line-height:1.5em;")
       style('.secure-image-notice', 'font-style: italic; background-color: #f1f1ff; padding: 5px;')

From 7952cbb9a2598d6389bdb77e23c2ce64665a1d4f Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Thu, 26 Mar 2020 16:40:00 +0200
Subject: [PATCH 0382/1830] FIX: Perform crop using user-specified image sizes
 (#9224)

* FIX: Perform crop using user-specified image sizes

It used to resize the images to max width and height first and then
perform the crop operation. This is wrong because it ignored the user
specified image sizes from the Markdown.

* DEV: Use real images in test
---
 app/assets/stylesheets/common/d-editor.scss   |  4 ++
 lib/cooked_post_processor.rb                  | 30 +++++-----
 spec/components/cooked_post_processor_spec.rb | 57 ++++++++++---------
 spec/fabricators/upload_fabricator.rb         | 14 +++++
 4 files changed, 63 insertions(+), 42 deletions(-)

diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index c4a7979588..401a4cc4f6 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -187,6 +187,10 @@
   &.site-icon {
     padding-bottom: 0;
   }
+  &.resizable {
+    object-fit: cover;
+    object-position: top;
+  }
 }
 
 .d-editor-preview .image-wrapper {
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index bd56c12ca0..2ec33c0d2c 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -308,29 +308,34 @@ class CookedPostProcessor
   end
 
   def convert_to_link!(img)
+    w, h = img["width"].to_i, img["height"].to_i
+    user_width, user_height = (w > 0 && h > 0 && [w, h]) ||
+                              get_size_from_attributes(img) ||
+                              get_size_from_image_sizes(img["src"], @opts[:image_sizes])
+
+    limit_size!(img)
+
     src = img["src"]
     return if src.blank? || is_a_hyperlink?(img) || is_svg?(img)
 
-    width, height = img["width"].to_i, img["height"].to_i
-    # TODO: store original dimentions in db
     original_width, original_height = (get_size(src) || [0, 0]).map(&:to_i)
-
-    # can't reach the image...
     if original_width == 0 || original_height == 0
       Rails.logger.info "Can't reach '#{src}' to get its dimension."
       return
     end
 
-    return if original_width <= width && original_height <= height
     return if original_width <= SiteSetting.max_image_width && original_height <= SiteSetting.max_image_height
 
-    crop   = SiteSetting.min_ratio_to_crop > 0
-    crop &&= original_width.to_f / original_height.to_f < SiteSetting.min_ratio_to_crop
+    user_width, user_height = [original_width, original_height] if user_width.to_i <= 0 && user_height.to_i <= 0
+    width, height = user_width, user_height
+
+    crop = SiteSetting.min_ratio_to_crop > 0 && width.to_f / height.to_f < SiteSetting.min_ratio_to_crop
 
     if crop
-      width, height = ImageSizer.crop(original_width, original_height)
-      img["width"] = width
-      img["height"] = height
+      width, height = ImageSizer.crop(width, height)
+      img["width"], img["height"] = width, height
+    else
+      width, height = ImageSizer.resize(width, height)
     end
 
     # if the upload already exists and is attached to a different post,
@@ -700,10 +705,7 @@ class CookedPostProcessor
 
   def post_process_images
     extract_images.each do |img|
-      unless add_image_placeholder!(img)
-        limit_size!(img)
-        convert_to_link!(img)
-      end
+      convert_to_link!(img) unless add_image_placeholder!(img)
     end
   end
 
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 799e3a3cd3..d986651562 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -416,12 +416,17 @@ describe CookedPostProcessor do
       end
 
       context "with unsized images" do
+        fab!(:upload) { Fabricate(:image_upload, width: 123, height: 456) }
+
+        fab!(:post) do
+          Fabricate(:post, raw: <<~HTML)
+          <img src="#{upload.url}">
+          HTML
+        end
 
-        fab!(:post) { Fabricate(:post_with_unsized_images) }
         let(:cpp) { CookedPostProcessor.new(post) }
 
         it "adds the width and height to images that don't have them" do
-          FastImage.expects(:size).returns([123, 456])
           cpp.post_process
           expect(cpp.html).to match(/width="123" height="456"/)
           expect(cpp).to be_dirty
@@ -430,6 +435,8 @@ describe CookedPostProcessor do
       end
 
       context "with large images" do
+        fab!(:upload) { Fabricate(:image_upload, width: 1750, height: 2000) }
+
         fab!(:post) do
           Fabricate(:post, raw: <<~HTML)
           <img src="#{upload.url}">
@@ -441,13 +448,9 @@ describe CookedPostProcessor do
         before do
           SiteSetting.max_image_height = 2000
           SiteSetting.create_thumbnails = true
-          FastImage.expects(:size).returns([1750, 2000])
         end
 
         it "generates overlay information" do
-          OptimizedImage.expects(:resize).returns(true)
-          FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
-
           cpp.post_process
 
           expect(cpp.html).to match_html <<~HTML
@@ -468,6 +471,8 @@ describe CookedPostProcessor do
           end
 
           it 'should not add lightbox' do
+            FastImage.expects(:size).returns([1750, 2000])
+
             cpp.post_process
 
             expect(cpp.html).to match_html <<~HTML
@@ -482,6 +487,8 @@ describe CookedPostProcessor do
           end
 
           it 'should not add lightbox' do
+            FastImage.expects(:size).returns([1750, 2000])
+
             cpp.post_process
 
             expect(cpp.html).to match_html <<~HTML
@@ -495,6 +502,8 @@ describe CookedPostProcessor do
             end
 
             it 'should not add lightbox' do
+              FastImage.expects(:size).returns([1750, 2000])
+
               SiteSetting.crawl_images = true
               cpp.post_process
 
@@ -537,8 +546,8 @@ describe CookedPostProcessor do
 
           context "when the upload is attached to the correct post" do
             before do
+              FastImage.expects(:size).returns([1750, 2000])
               OptimizedImage.expects(:resize).returns(true)
-              FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
               Discourse.store.class.any_instance.expects(:has_been_uploaded?).at_least_once.returns(true)
               upload.update(secure: true, access_control_post: post)
             end
@@ -568,6 +577,8 @@ describe CookedPostProcessor do
       end
 
       context "with tall images" do
+        fab!(:upload) { Fabricate(:image_upload, width: 860, height: 2000) }
+
         fab!(:post) do
           Fabricate(:post, raw: <<~HTML)
           <img src="#{upload.url}">
@@ -578,10 +589,6 @@ describe CookedPostProcessor do
 
         before do
           SiteSetting.create_thumbnails = true
-          FastImage.expects(:size).returns([860, 2000])
-          OptimizedImage.expects(:resize).never
-          OptimizedImage.expects(:crop).returns(true)
-          FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
         end
 
         it "crops the image" do
@@ -594,6 +601,8 @@ describe CookedPostProcessor do
       end
 
       context "with iPhone X screenshots" do
+        fab!(:upload) { Fabricate(:image_upload, width: 1125, height: 2436) }
+
         fab!(:post) do
           Fabricate(:post, raw: <<~HTML)
           <img src="#{upload.url}">
@@ -604,10 +613,6 @@ describe CookedPostProcessor do
 
         before do
           SiteSetting.create_thumbnails = true
-          FastImage.expects(:size).returns([1125, 2436])
-          OptimizedImage.expects(:resize).returns(true)
-          OptimizedImage.expects(:crop).never
-          FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
         end
 
         it "crops the image" do
@@ -625,6 +630,8 @@ describe CookedPostProcessor do
       end
 
       context "with large images when using subfolders" do
+        fab!(:upload) { Fabricate(:image_upload, width: 1750, height: 2000) }
+
         fab!(:post) do
           Fabricate(:post, raw: <<~HTML)
           <img src="/subfolder#{upload.url}">
@@ -635,13 +642,10 @@ describe CookedPostProcessor do
 
         before do
           set_subfolder "/subfolder"
+          stub_request(:get, "http://#{Discourse.current_hostname}/subfolder#{upload.url}").to_return(status: 200, body: File.new(Discourse.store.path_for(upload)))
 
           SiteSetting.max_image_height = 2000
           SiteSetting.create_thumbnails = true
-          FastImage.expects(:size).returns([1750, 2000])
-          OptimizedImage.expects(:resize).returns(true)
-
-          FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
         end
 
         it "generates overlay information" do
@@ -670,6 +674,8 @@ describe CookedPostProcessor do
       end
 
       context "with title and alt" do
+        fab!(:upload) { Fabricate(:image_upload, width: 1750, height: 2000) }
+
         fab!(:post) do
           Fabricate(:post, raw: <<~HTML)
           <img src="#{upload.url}" title="WAT" alt="RED">
@@ -681,9 +687,6 @@ describe CookedPostProcessor do
         before do
           SiteSetting.max_image_height = 2000
           SiteSetting.create_thumbnails = true
-          FastImage.expects(:size).returns([1750, 2000])
-          OptimizedImage.expects(:resize).returns(true)
-          FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
         end
 
         it "generates overlay information using image title and ignores alt" do
@@ -701,6 +704,8 @@ describe CookedPostProcessor do
       end
 
       context "with title only" do
+        fab!(:upload) { Fabricate(:image_upload, width: 1750, height: 2000) }
+
         fab!(:post) do
           Fabricate(:post, raw: <<~HTML)
           <img src="#{upload.url}" title="WAT">
@@ -712,9 +717,6 @@ describe CookedPostProcessor do
         before do
           SiteSetting.max_image_height = 2000
           SiteSetting.create_thumbnails = true
-          FastImage.expects(:size).returns([1750, 2000])
-          OptimizedImage.expects(:resize).returns(true)
-          FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
         end
 
         it "generates overlay information using image title" do
@@ -732,6 +734,8 @@ describe CookedPostProcessor do
       end
 
       context "with alt only" do
+        fab!(:upload) { Fabricate(:image_upload, width: 1750, height: 2000) }
+
         fab!(:post) do
           Fabricate(:post, raw: <<~HTML)
           <img src="#{upload.url}" alt="RED">
@@ -743,9 +747,6 @@ describe CookedPostProcessor do
         before do
           SiteSetting.max_image_height = 2000
           SiteSetting.create_thumbnails = true
-          FastImage.expects(:size).returns([1750, 2000])
-          OptimizedImage.expects(:resize).returns(true)
-          FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
         end
 
         it "generates overlay information using image alt" do
diff --git a/spec/fabricators/upload_fabricator.rb b/spec/fabricators/upload_fabricator.rb
index 01d05d9da5..72bcb6c723 100644
--- a/spec/fabricators/upload_fabricator.rb
+++ b/spec/fabricators/upload_fabricator.rb
@@ -21,6 +21,20 @@ Fabricator(:upload) do
   extension "png"
 end
 
+Fabricator(:image_upload, from: :upload) do
+  after_create do |upload|
+    file = Tempfile.new(['fabricated', '.png'])
+    `convert -size #{upload.width}x#{upload.height} xc:white "#{file.path}"`
+
+    upload.url = Discourse.store.store_upload(file, upload)
+    upload.sha1 = Upload.generate_digest(file.path)
+
+    WebMock
+      .stub_request(:get, "http://#{Discourse.current_hostname}#{upload.url}")
+      .to_return(status: 200, body: File.new(file.path))
+  end
+end
+
 Fabricator(:video_upload, from: :upload) do
   original_filename "video.mp4"
   width nil

From ef3d6d6580941872344b7f7138db078be4c0402c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 26 Mar 2020 15:46:31 +0100
Subject: [PATCH 0383/1830] FIX: groups filtering input was causing a full page
 reload (#9282)

---
 .../discourse/controllers/groups-index.js     | 58 ++++++++++++-------
 .../discourse/routes/groups-index.js          | 10 +---
 .../discourse/templates/groups/index.hbs      | 27 +++++----
 3 files changed, 57 insertions(+), 38 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/groups-index.js b/app/assets/javascripts/discourse/controllers/groups-index.js
index 6674322677..228527bc38 100644
--- a/app/assets/javascripts/discourse/controllers/groups-index.js
+++ b/app/assets/javascripts/discourse/controllers/groups-index.js
@@ -1,6 +1,8 @@
 import Controller, { inject as controller } from "@ember/controller";
-import discourseDebounce from "discourse/lib/debounce";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { debounce } from "@ember/runloop";
+import { action } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
+import { INPUT_DELAY } from "discourse-common/config/environment";
 
 export default Controller.extend({
   application: controller(),
@@ -9,37 +11,53 @@ export default Controller.extend({
   asc: null,
   filter: "",
   type: null,
+  groups: null,
+  isLoading: false,
 
-  @discourseComputed("model.extras.type_filters")
+  @discourseComputed("groups.extras.type_filters")
   types(typeFilters) {
     const types = [];
 
     if (typeFilters) {
-      typeFilters.forEach(type => {
-        types.push({ id: type, name: I18n.t(`groups.index.${type}_groups`) });
-      });
+      typeFilters.forEach(type =>
+        types.push({ id: type, name: I18n.t(`groups.index.${type}_groups`) })
+      );
     }
 
     return types;
   },
 
-  @observes("filterInput")
-  _setFilter: discourseDebounce(function() {
-    this.set("filter", this.filterInput);
-  }, 500),
+  loadGroups(params) {
+    this.set("isLoading", true);
 
-  @observes("model.canLoadMore")
-  _showFooter() {
-    this.set("application.showFooter", !this.get("model.canLoadMore"));
+    this.store
+      .findAll("group", params)
+      .then(groups => {
+        this.set("groups", groups);
+
+        if (groups.canLoadMore) {
+          this.set("application.showFooter", !groups.canLoadMore);
+        }
+      })
+      .finally(() => this.set("isLoading", false));
   },
 
-  actions: {
-    loadMore() {
-      this.model.loadMore();
-    },
+  @action
+  onFilterChanged(filter) {
+    debounce(this, this._debouncedFilter, filter, INPUT_DELAY);
+  },
 
-    new() {
-      this.transitionToRoute("groups.new");
-    }
+  @action
+  loadMore() {
+    this.groups && this.groups.loadMore();
+  },
+
+  @action
+  new() {
+    this.transitionToRoute("groups.new");
+  },
+
+  _debouncedFilter(filter) {
+    this.set("filter", filter);
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/groups-index.js b/app/assets/javascripts/discourse/routes/groups-index.js
index a510bd93b6..dff87c3cb2 100644
--- a/app/assets/javascripts/discourse/routes/groups-index.js
+++ b/app/assets/javascripts/discourse/routes/groups-index.js
@@ -14,14 +14,10 @@ export default DiscourseRoute.extend({
   },
 
   model(params) {
-    this._params = params;
-    return this.store.findAll("group", params);
+    return params;
   },
 
-  setupController(controller, model) {
-    controller.setProperties({
-      model,
-      filterInput: this._params.filter
-    });
+  setupController(controller, params) {
+    controller.loadGroups(params);
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/templates/groups/index.hbs
index 36d0a644b1..bf610c81ac 100644
--- a/app/assets/javascripts/discourse/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/index.hbs
@@ -1,16 +1,21 @@
 {{#d-section pageClass="groups"}}
   <div class="groups-header">
     {{#if currentUser.admin}}
-      {{d-button action=(action "new")
-          class="btn-default groups-header-new pull-right"
-          icon="plus"
-          label="admin.groups.new.title"}}
+      {{d-button
+        action=(action "new")
+        class="btn-default groups-header-new pull-right"
+        icon="plus"
+        label="admin.groups.new.title"
+      }}
     {{/if}}
 
     <div class="groups-header-filters">
-      {{text-field value=filterInput
-          placeholderKey="groups.index.all"
-          class="groups-header-filters-name no-blur"}}
+      {{input
+        value=(readonly filter)
+        placeholderKey="groups.index.all"
+        class="groups-header-filters-name no-blur"
+        input=(action "onFilterChanged" value="target.value")
+      }}
 
       {{combo-box
         value=type
@@ -25,12 +30,12 @@
     </div>
   </div>
 
-  {{#if model}}
-    {{#conditional-loading-spinner condition=model.loading}}
+  {{#if groups}}
+    {{#conditional-loading-spinner condition=isLoading}}
       {{#load-more selector=".groups-boxes .group-box" action=(action "loadMore")}}
         <div class='container'>
           <div class="groups-boxes">
-            {{#each model as |group|}}
+            {{#each groups as |group|}}
               {{#link-to "group.members" group.name class="group-box"}}
                 <div class="group-box-inner">
                   <div class="group-info-wrapper">
@@ -87,7 +92,7 @@
         </div>
       {{/load-more}}
 
-      {{conditional-loading-spinner condition=model.loadingMore}}
+      {{conditional-loading-spinner condition=groups.loadingMore}}
     {{/conditional-loading-spinner}}
   {{else}}
     <p>{{i18n "groups.index.empty"}}</p>

From d21d80198c7e77a420590d00dc773e3de8b23ef5 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Thu, 26 Mar 2020 16:32:41 +0100
Subject: [PATCH 0384/1830] DEV: Update rubocop-discourse (#9270)

Includes:
* DEV: Use `eq_time` matcher
---
 .rubocop.yml                                    | 17 ++++++++---------
 Gemfile.lock                                    |  4 ++--
 lib/autospec/simple_runner.rb                   |  2 +-
 script/plugin-translations.rb                   |  2 +-
 spec/lib/bookmark_manager_spec.rb               | 10 ++++++----
 spec/models/post_spec.rb                        |  2 +-
 spec/rails_helper.rb                            |  4 ++--
 .../user_bookmark_serializer_spec.rb            |  6 +++---
 spec/services/anonymous_shadow_creator_spec.rb  |  2 +-
 9 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 1e682c1045..f9dafa672c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -12,6 +12,14 @@ AllCops:
     - "public/**/*"
     - "plugins/**/gems/**/*"
 
+Discourse:
+  Enabled: true
+
+Discourse/NoChdir:
+  Exclude:
+    - 'spec/**/*' # Specs are run sequentially, so chdir can be used
+    - 'plugins/*/spec/**/*'
+
 # Prefer &&/|| over and/or.
 Style/AndOr:
   Enabled: true
@@ -127,15 +135,6 @@ Style/Semicolon:
 Style/RedundantReturn:
   Enabled: true
 
-DiscourseCops/NoChdir:
-  Enabled: true
-  Exclude:
-    - 'spec/**/*' # Specs are run sequentially, so chdir can be used
-    - 'plugins/*/spec/**/*'
-
-DiscourseCops/NoURIEscapeEncode:
-  Enabled: true
-
 Style/GlobalVars:
   Enabled: true
   Severity: warning
diff --git a/Gemfile.lock b/Gemfile.lock
index 08056d633d..cc1ebd682f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -253,7 +253,7 @@ GEM
     parallel (1.19.1)
     parallel_tests (2.32.0)
       parallel
-    parser (2.7.0.4)
+    parser (2.7.0.5)
       ast (~> 2.4.0)
     pg (1.2.3)
     progress (3.5.2)
@@ -348,7 +348,7 @@ GEM
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-discourse (1.0.2)
+    rubocop-discourse (2.0.1)
       rubocop (>= 0.69.0)
     ruby-prof (1.3.1)
     ruby-progressbar (1.10.1)
diff --git a/lib/autospec/simple_runner.rb b/lib/autospec/simple_runner.rb
index 1f944d906f..a5c295d929 100644
--- a/lib/autospec/simple_runner.rb
+++ b/lib/autospec/simple_runner.rb
@@ -32,7 +32,7 @@ module Autospec
       end
 
       # launch rspec
-      Dir.chdir(Rails.root) do # rubocop:disable DiscourseCops/NoChdir because this is not part of the app
+      Dir.chdir(Rails.root) do # rubocop:disable Discourse/NoChdir because this is not part of the app
         env = { "RAILS_ENV" => "test" }
         if specs.split(' ').any? { |s| s =~ /^(.\/)?plugins/ }
           env["LOAD_PLUGINS"] = "1"
diff --git a/script/plugin-translations.rb b/script/plugin-translations.rb
index 78535b4a54..87bf4e8db8 100644
--- a/script/plugin-translations.rb
+++ b/script/plugin-translations.rb
@@ -42,7 +42,7 @@ class PluginTxUpdater
     PLUGINS.each do |plugin_name|
       plugin_dir = File.join(@base_dir, plugin_name)
       Bundler.with_clean_env do
-        Dir.chdir(plugin_dir) do # rubocop:disable DiscourseCops/NoChdir because this is not part of the app
+        Dir.chdir(plugin_dir) do # rubocop:disable Discourse/NoChdir because this is not part of the app
           puts '', plugin_dir, '-' * 80, ''
 
           begin
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index 11a0b7d859..a19380bb83 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe BookmarkManager do
   let(:user) { Fabricate(:user) }
 
   let(:reminder_type) { 'tomorrow' }
-  let(:reminder_at) { (Time.zone.now + 1.day).iso8601 }
+  let(:reminder_at) { 1.day.from_now }
   fab!(:post) { Fabricate(:post) }
   let(:name) { 'Check this out!' }
 
@@ -26,7 +26,7 @@ RSpec.describe BookmarkManager do
         subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
         bookmark = Bookmark.find_by(user: user)
 
-        expect(bookmark.reminder_at).to eq(reminder_at)
+        expect(bookmark.reminder_at).to eq_time(reminder_at)
         expect(bookmark.reminder_set_at).not_to eq(nil)
         expect(bookmark.reminder_type).to eq(Bookmark.reminder_types[:tomorrow])
       end
@@ -76,7 +76,8 @@ RSpec.describe BookmarkManager do
     end
 
     context "when the reminder time is in the past" do
-      let(:reminder_at) { (Time.zone.now - 10.days).iso8601 }
+      let(:reminder_at) { 10.days.ago }
+
       it "adds an error to the manager" do
         subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
         expect(subject.errors.full_messages).to include(I18n.t("bookmarks.errors.cannot_set_past_reminder"))
@@ -84,7 +85,8 @@ RSpec.describe BookmarkManager do
     end
 
     context "when the reminder time is far-flung (> 10 years from now)" do
-      let(:reminder_at) { (Time.zone.now + 11.years).iso8601 }
+      let(:reminder_at) { 11.years.from_now }
+
       it "adds an error to the manager" do
         subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
         expect(subject.errors.full_messages).to include(I18n.t("bookmarks.errors.cannot_set_reminder_in_distant_future"))
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 66ba358ad5..4cc716d691 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1172,7 +1172,7 @@ describe Post do
 
       result = post.rebake!
 
-      expect(post.baked_at).not_to eq(first_baked)
+      expect(post.baked_at).not_to eq_time(first_baked)
       expect(post.cooked).to eq(first_cooked)
       expect(result).to eq(true)
     end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 4bc237ab27..dc649a9b91 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -240,7 +240,7 @@ RSpec.configure do |config|
   config.before :each, &TestSetup.method(:test_setup)
 
   config.before(:each, type: :multisite) do
-    Rails.configuration.multisite = true
+    Rails.configuration.multisite = true # rubocop:disable Discourse/NoDirectMultisiteManipulation
 
     RailsMultisite::ConnectionManagement.config_filename =
       "spec/fixtures/multisite/two_dbs.yml"
@@ -248,7 +248,7 @@ RSpec.configure do |config|
 
   config.after(:each, type: :multisite) do
     ActiveRecord::Base.clear_all_connections!
-    Rails.configuration.multisite = false
+    Rails.configuration.multisite = false # rubocop:disable Discourse/NoDirectMultisiteManipulation
     RailsMultisite::ConnectionManagement.clear_settings!
     ActiveRecord::Base.establish_connection
   end
diff --git a/spec/serializers/user_bookmark_serializer_spec.rb b/spec/serializers/user_bookmark_serializer_spec.rb
index 36b05abf7b..e97ebfe467 100644
--- a/spec/serializers/user_bookmark_serializer_spec.rb
+++ b/spec/serializers/user_bookmark_serializer_spec.rb
@@ -12,12 +12,12 @@ RSpec.describe UserBookmarkSerializer do
     s = UserBookmarkSerializer.new(bookmark_list.last)
 
     expect(s.id).to eq(bookmark.id)
-    expect(s.created_at).to eq(bookmark.created_at)
+    expect(s.created_at).to eq_time(bookmark.created_at)
     expect(s.topic_id).to eq(bookmark.topic_id)
     expect(s.linked_post_number).to eq(bookmark.post.post_number)
     expect(s.post_id).to eq(bookmark.post_id)
     expect(s.name).to eq(bookmark.name)
-    expect(s.reminder_at).to eq(bookmark.reminder_at)
+    expect(s.reminder_at).to eq_time(bookmark.reminder_at)
     expect(s.title).to eq(bookmark.topic.title)
     expect(s.deleted).to eq(false)
     expect(s.hidden).to eq(false)
@@ -26,7 +26,7 @@ RSpec.describe UserBookmarkSerializer do
     expect(s.category_id).to eq(bookmark.topic.category_id)
     expect(s.archetype).to eq(bookmark.topic.archetype)
     expect(s.highest_post_number).to eq(1)
-    expect(s.bumped_at.to_s).to eq(bookmark.topic.bumped_at.to_s)
+    expect(s.bumped_at).to eq_time(bookmark.topic.bumped_at)
     expect(s.slug).to eq(bookmark.topic.slug)
     expect(s.username).to eq(bookmark.post.user.username)
   end
diff --git a/spec/services/anonymous_shadow_creator_spec.rb b/spec/services/anonymous_shadow_creator_spec.rb
index c47635f955..cb5fcb4abd 100644
--- a/spec/services/anonymous_shadow_creator_spec.rb
+++ b/spec/services/anonymous_shadow_creator_spec.rb
@@ -56,7 +56,7 @@ describe AnonymousShadowCreator do
       expect(shadow.trust_level).to eq(1)
       expect(shadow.username).to eq("anonymous")
 
-      expect(shadow.created_at).not_to eq(user.created_at)
+      expect(shadow.created_at).not_to eq_time(user.created_at)
 
       p = create_post
 

From c94b63bc756ff8468087d7be7f4b423da1d445e5 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 26 Mar 2020 16:33:38 +0100
Subject: [PATCH 0385/1830] DEV: Improve import of attachments from Telligent

---
 script/import_scripts/telligent.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/script/import_scripts/telligent.rb b/script/import_scripts/telligent.rb
index 0e166523cd..d9b364fb15 100644
--- a/script/import_scripts/telligent.rb
+++ b/script/import_scripts/telligent.rb
@@ -42,8 +42,13 @@ class ImportScripts::Telligent < ImportScripts::Base
   BATCH_SIZE ||= 1000
   LOCAL_AVATAR_REGEX ||= /\A~\/.*(?<directory>communityserver-components-(?:selectable)?avatars)\/(?<path>[^\/]+)\/(?<filename>.+)/i
   REMOTE_AVATAR_REGEX ||= /\Ahttps?:\/\//i
-  EMBEDDED_ATTACHMENT_REGEX ||= /<a href="\/cfs-file(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)".*?>.*?<\/a>/i
-  EMBEDDED_VIEW_ATTACHMENT_REGEX ||= /\[View:~\/cfs-file(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)(?:\:[:\d\s]*?)\]/i
+  ATTACHMENT_REGEXES ||= [
+    /<a[^>]*\shref="[^"]*?\/cfs-file(?:systemfile)?(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)".*?>.*?<\/a>/i,
+    /<img[^>]*\ssrc="[^"]*?\/cfs-file(?:systemfile)?(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)".*?>/i,
+    /\[View:[^\]]*?\/cfs-file(?:systemfile)?(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)(?:\:[:\d\s]*?)?\]/i,
+    /\[(?<tag>img|url)\][^\[]*?cfs-file(?:systemfile)?(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)\[\/\k<tag>\]/i,
+    /\[(?<tag>img|url)=[^\[]*?cfs-file(?:systemfile)?(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)\][^\[]*?\[\/\k<tag>\]/i
+  ]
   PROPERTY_NAMES_REGEX ||= /(?<name>\w+):S:(?<start>\d+):(?<length>\d+):/
 
   CATEGORY_LINK_NORMALIZATION = '/.*?(f\/\d+)$/\1'
@@ -560,7 +565,7 @@ class ImportScripts::Telligent < ImportScripts::Base
 
     return [raw, paths, upload_ids] if @filestore_root_directory.blank?
 
-    [EMBEDDED_ATTACHMENT_REGEX, EMBEDDED_VIEW_ATTACHMENT_REGEX].each do |regex|
+    ATTACHMENT_REGEXES.each do |regex|
       raw = raw.gsub(regex) do
         match_data = Regexp.last_match
 
@@ -579,6 +584,7 @@ class ImportScripts::Telligent < ImportScripts::Base
         else
           path = File.join(path, match_data[:filename])
           STDERR.puts "Could not find file: #{path}"
+          match_data[0]
         end
       end
     end

From d216483c532f3394d56808fa5362f8ccfede5781 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 26 Mar 2020 16:36:38 +0100
Subject: [PATCH 0386/1830] FIX: Importing with pgbouncer failed

Checking if all records have been imported uses a temp table in PostgreSQL. This fails when pgbouncer is used unless the temp table is created inside a transaction.
---
 script/import_scripts/base.rb | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 4e7ca2af27..ea43db2730 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -219,24 +219,28 @@ class ImportScripts::Base
   def all_records_exist?(type, import_ids)
     return false if import_ids.empty?
 
-    connection = ActiveRecord::Base.connection.raw_connection
-    connection.exec('CREATE TEMP TABLE import_ids(val text PRIMARY KEY)')
+    ActiveRecord::Base.transaction do
+      begin
+        connection = ActiveRecord::Base.connection.raw_connection
+        connection.exec('CREATE TEMP TABLE import_ids(val text PRIMARY KEY)')
 
-    import_id_clause = import_ids.map { |id| "('#{PG::Connection.escape_string(id.to_s)}')" }.join(",")
+        import_id_clause = import_ids.map { |id| "('#{PG::Connection.escape_string(id.to_s)}')" }.join(",")
 
-    connection.exec("INSERT INTO import_ids VALUES #{import_id_clause}")
+        connection.exec("INSERT INTO import_ids VALUES #{import_id_clause}")
 
-    existing = "#{type.to_s.classify}CustomField".constantize
-    existing = existing.where(name: 'import_id')
-      .joins('JOIN import_ids ON val = value')
-      .count
+        existing = "#{type.to_s.classify}CustomField".constantize
+        existing = existing.where(name: 'import_id')
+          .joins('JOIN import_ids ON val = value')
+          .count
 
-    if existing == import_ids.length
-      puts "Skipping #{import_ids.length} already imported #{type}"
-      true
+        if existing == import_ids.length
+          puts "Skipping #{import_ids.length} already imported #{type}"
+          true
+        end
+      ensure
+        connection.exec('DROP TABLE import_ids') unless connection.nil?
+      end
     end
-  ensure
-    connection.exec('DROP TABLE import_ids') unless connection.nil?
   end
 
   def created_user(user)

From 5bffb033dfcd4ca1bdba8575e550a092a606ca12 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 26 Mar 2020 16:37:42 +0100
Subject: [PATCH 0387/1830] FIX: The migrate_to_s3 rake task couldn't find the
 AWS SDK

---
 lib/file_store/to_s3_migration.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/file_store/to_s3_migration.rb b/lib/file_store/to_s3_migration.rb
index 456e428657..01c69dc1ee 100644
--- a/lib/file_store/to_s3_migration.rb
+++ b/lib/file_store/to_s3_migration.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'aws-sdk-s3'
+
 module FileStore
   ToS3MigrationError = Class.new(RuntimeError)
 

From 739430c01e5d24d582e5feb87923ae59f0cca589 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 26 Mar 2020 16:40:34 +0100
Subject: [PATCH 0388/1830] FIX: mbox import failed if no tags were configured

---
 script/import_scripts/mbox/support/settings.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/import_scripts/mbox/support/settings.rb b/script/import_scripts/mbox/support/settings.rb
index 9311dff5e7..e1fd15b869 100644
--- a/script/import_scripts/mbox/support/settings.rb
+++ b/script/import_scripts/mbox/support/settings.rb
@@ -40,8 +40,8 @@ module ImportScripts::Mbox
       @automatically_remove_list_name_prefix = yaml['automatically_remove_list_name_prefix']
       @show_trimmed_content = yaml['show_trimmed_content']
 
+      @tags = []
       if yaml['tags'].present?
-        @tags = []
         yaml['tags'].each do |tag_name, value|
           prefixes = Regexp.union(value).source
           @tags << {

From 60df2ade8db0ff2ad3105fd2965f8ec7a114e992 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 26 Mar 2020 12:22:33 -0400
Subject: [PATCH 0389/1830] Retry: Rename all test files from JS -> ES6

---
 lib/discourse_js_processor.rb                 | 40 ++++++++++---------
 .../{about-test.js.es6 => about-test.js}      |  0
 ...ed-test.js.es6 => account-created-test.js} |  0
 ...mails-test.js.es6 => admin-emails-test.js} |  0
 ...t.js.es6 => admin-search-log-term-test.js} |  0
 ...-test.js.es6 => admin-search-logs-test.js} |  0
 ...est.js.es6 => admin-site-settings-test.js} |  0
 ...xt-test.js.es6 => admin-site-text-test.js} |  0
 ...test.js.es6 => admin-suspend-user-test.js} |  0
 ...-test.js.es6 => admin-user-badges-test.js} |  0
 ...-test.js.es6 => admin-user-emails-test.js} |  0
 ...x-test.js.es6 => admin-user-index-test.js} |  0
 ...t-test.js.es6 => admin-users-list-test.js} |  0
 ...est.js.es6 => admin-watched-words-test.js} |  0
 ...lete-test.js.es6 => auth-complete-test.js} |  0
 .../{badges-test.js.es6 => badges-test.js}    |  0
 ...r-test.js.es6 => category-chooser-test.js} |  0
 ....js.es6 => category-edit-security-test.js} |  0
 ...edit-test.js.es6 => category-edit-test.js} |  0
 ...g-test.js.es6 => category-hashtag-test.js} |  0
 ...-track-test.js.es6 => click-track-test.js} |  0
 ...s-test.js.es6 => composer-actions-test.js} |  0
 ...est.js.es6 => composer-attachment-test.js} |  0
 ....js.es6 => composer-edit-conflict-test.js} |  0
 ...test.js.es6 => composer-hyperlink-test.js} |  0
 ...ox-test.js.es6 => composer-onebox-test.js} |  0
 ...{composer-test.js.es6 => composer-test.js} |  0
 ...st.js.es6 => composer-topic-links-test.js} |  0
 ....js.es6 => composer-uncategorized-test.js} |  0
 ...es6 => create-account-user-fields-test.js} |  0
 ...et-test.js.es6 => custom-html-set-test.js} |  0
 ...st.js.es6 => custom-html-template-test.js} |  0
 ...ashboard-test.js.es6 => dashboard-test.js} |  0
 ...otice-test.js.es6 => email-notice-test.js} |  0
 ...icker-test.js.es6 => emoji-picker-test.js} |  0
 .../{emoji-test.js.es6 => emoji-test.js}      |  0
 ...t.js.es6 => enforce-second-factor-test.js} |  0
 ...rd-test.js.es6 => forgot-password-test.js} |  0
 ...-test.js.es6 => group-card-mobile-test.js} |  0
 ...up-card-test.js.es6 => group-card-test.js} |  0
 ...-index-test.js.es6 => group-index-test.js} |  0
 ...s.es6 => group-manage-interaction-test.js} |  0
 ...-test.js.es6 => group-manage-logs-test.js} |  0
 ...js.es6 => group-manage-membership-test.js} |  0
 ...st.js.es6 => group-manage-profile-test.js} |  0
 ...sts-test.js.es6 => group-requests-test.js} |  0
 .../{group-test.js.es6 => group-test.js}      |  0
 ...index-test.js.es6 => groups-index-test.js} |  0
 ...ups-new-test.js.es6 => groups-new-test.js} |  0
 ...cept-test.js.es6 => invite-accept-test.js} |  0
 ...js.es6 => invite-show-user-fields-test.js} |  0
 .../{jump-to-test.js.es6 => jump-to-test.js}  |  0
 ...test.js.es6 => keyboard-shortcuts-test.js} |  0
 ...ect-test.js.es6 => login-redirect-test.js} |  0
 ...red-test.js.es6 => login-required-test.js} |  0
 ...mail-and-hide-email-address-taken-test.js} |  0
 ...n-with-email-and-no-social-logins-test.js} |  0
 ....es6 => login-with-email-disabled-test.js} |  0
 ...l-test.js.es6 => login-with-email-test.js} |  0
 ...y-test.js.es6 => mobile-discovery-test.js} |  0
 ...-in-test.js.es6 => mobile-sign-in-test.js} |  0
 ...users-test.js.es6 => mobile-users-test.js} |  0
 .../{modal-test.js.es6 => modal-test.js}      |  0
 ...essage-test.js.es6 => new-message-test.js} |  0
 ...ew-topic-test.js.es6 => new-topic-test.js} |  0
 ...set-test.js.es6 => password-reset-test.js} |  0
 ...e-test.js.es6 => personal-message-test.js} |  0
 ... => plugin-outlet-connector-class-test.js} |  0
 ...js.es6 => plugin-outlet-decorator-test.js} |  0
 ...6 => plugin-outlet-multi-template-test.js} |  0
 ... => plugin-outlet-single-template-test.js} |  0
 ...rences-test.js.es6 => preferences-test.js} |  0
 ...-test.js.es6 => raw-plugin-outlet-test.js} |  0
 ...op-test.js.es6 => redirect-to-top-test.js} |  0
 .../{reports-test.js.es6 => reports-test.js}  |  0
 .../{review-test.js.es6 => review-test.js}    |  0
 ...h-full-test.js.es6 => search-full-test.js} |  0
 ...bile-test.js.es6 => search-mobile-test.js} |  0
 .../{search-test.js.es6 => search-test.js}    |  0
 ...s.es6 => share-and-invite-desktop-test.js} |  0
 ...js.es6 => share-and-invite-mobile-test.js} |  0
 ...afts-test.js.es6 => shared-drafts-test.js} |  0
 .../{sign-in-test.js.es6 => sign-in-test.js}  |  0
 .../{static-test.js.es6 => static-test.js}    |  0
 ...-groups-test.js.es6 => tag-groups-test.js} |  0
 ...ashtag-test.js.es6 => tag-hashtag-test.js} |  0
 ...-test.js.es6 => tags-intersection-test.js} |  0
 .../{tags-test.js.es6 => tags-test.js}        |  0
 ...us-test.js.es6 => topic-anonymous-test.js} |  0
 ...ry-test.js.es6 => topic-discovery-test.js} |  0
 ...r-test.js.es6 => topic-edit-timer-test.js} |  0
 ...s6 => topic-footer-buttons-mobile-test.js} |  0
 ...s-test.js.es6 => topic-move-posts-test.js} |  0
 ...es6 => topic-notifications-button-test.js} |  0
 .../{topic-test.js.es6 => topic-test.js}      |  0
 .../{unknown-test.js.es6 => unknown-test.js}  |  0
 ...ous-test.js.es6 => user-anonymous-test.js} |  0
 ...e-test.js.es6 => user-card-mobile-test.js} |  0
 ...ser-card-test.js.es6 => user-card-test.js} |  0
 ...test.js.es6 => user-drafts-stream-test.js} |  0
 .../{user-test.js.es6 => user-test.js}        |  0
 .../{users-test.js.es6 => users-test.js}      |  0
 ...test.js.es6 => group-list-setting-test.js} |  0
 ...m-test.js.es6 => themes-list-item-test.js} |  0
 ...s-list-test.js.es6 => themes-list-test.js} |  0
 ...s6 => admin-customize-themes-show-test.js} |  0
 ....js.es6 => admin-customize-themes-test.js} |  0
 ...-test.js.es6 => admin-user-badges-test.js} |  0
 .../{theme-test.js.es6 => theme-test.js}      |  0
 ...-editor-test.js.es6 => ace-editor-test.js} |  0
 ...eport-test.js.es6 => admin-report-test.js} |  0
 ...-title-test.js.es6 => badge-title-test.js} |  0
 ...{d-button-test.js.es6 => d-button-test.js} |  0
 ...{d-editor-test.js.es6 => d-editor-test.js} |  0
 .../{d-icon-test.js.es6 => d-icon-test.js}    |  0
 ...e-input-test.js.es6 => date-input-test.js} |  0
 ...t.js.es6 => date-time-input-range-test.js} |  0
 ...ut-test.js.es6 => date-time-input-test.js} |  0
 ...js.es6 => group-membership-button-test.js} |  0
 ...r-test.js.es6 => html-safe-helper-test.js} |  0
 ...-html-test.js.es6 => iframed-html-test.js} |  0
 ...der-test.js.es6 => image-uploader-test.js} |  0
 ...test.js.es6 => keyboard-shortcuts-test.js} |  0
 ...oad-more-test.js.es6 => load-more-test.js} |  0
 ...-test.js.es6 => secret-value-list-test.js} |  0
 ...r-test.js.es6 => category-chooser-test.js} |  0
 ...drop-test.js.es6 => category-drop-test.js} |  0
 ...ombo-box-test.js.es6 => combo-box-test.js} |  0
 ...est.js.es6 => dropdown-select-box-test.js} |  0
 ...tting-test.js.es6 => list-setting-test.js} |  0
 ...r-test.js.es6 => mini-tag-chooser-test.js} |  0
 ...elect-test.js.es6 => multi-select-test.js} |  0
 ...st.js.es6 => notifications-button-test.js} |  0
 ...ons-test.js.es6 => pinned-options-test.js} |  0
 ...elper.js.es6 => select-kit-test-helper.js} |  0
 ...lect-test.js.es6 => single-select-test.js} |  0
 ...{tag-drop-test.js.es6 => tag-drop-test.js} |  0
 ...es6 => topic-notifications-button-test.js} |  0
 ...s6 => topic-notifications-options-test.js} |  0
 ...ooser-test.js.es6 => user-chooser-test.js} |  0
 ...utton-test.js.es6 => share-button-test.js} |  0
 .../{share-button.js.es6 => share-button.js}  |  0
 ...t-field-test.js.es6 => text-field-test.js} |  0
 ...flow-test.js.es6 => text-overflow-test.js} |  0
 ...e-input-test.js.es6 => time-input-test.js} |  0
 ...ctor-test.js.es6 => user-selector-test.js} |  0
 ...ue-list-test.js.es6 => value-list-test.js} |  0
 ...or-test.js.es6 => avatar-selector-test.js} |  0
 ...{bookmark-test.js.es6 => bookmark-test.js} |  0
 ...unt-test.js.es6 => create-account-test.js} |  0
 .../{group-test.js.es6 => group-test.js}      |  0
 .../{history-test.js.es6 => history-test.js}  |  0
 ...est.js.es6 => preferences-account-test.js} |  0
 ....es6 => preferences-second-factor-test.js} |  0
 ...test.js.es6 => reorder-categories-test.js} |  0
 .../{topic-test.js.es6 => topic-test.js}      |  0
 ...{resolver-test.js.es6 => resolver-test.js} |  0
 .../fixtures/{about.js.es6 => about.js}       |  0
 ...adges_fixture.js.es6 => badges_fixture.js} |  0
 ...y-fixtures.js.es6 => category-fixtures.js} |  0
 ...s.js.es6.erb => notification-types.js.erb} |  0
 ...rd-general.js.es6 => dashboard-general.js} |  0
 .../{dashboard.js.es6 => dashboard.js}        |  0
 ...-fixtures.js.es6 => directory-fixtures.js} |  0
 ..._fixtures.js.es6 => discovery_fixtures.js} |  0
 .../fixtures/{draft.js.es6 => draft.js}       |  0
 .../fixtures/{drafts.js.es6 => drafts.js}     |  0
 ...roup-fixtures.js.es6 => group-fixtures.js} |  0
 ...ups-fixtures.js.es6 => groups-fixtures.js} |  0
 ...xtures.js.es6 => notification_fixtures.js} |  0
 .../fixtures/{poll.js.es6 => poll.js}         |  0
 .../fixtures/{post.js.es6 => post.js}         |  0
 ...es.js.es6 => private_messages_fixtures.js} |  0
 .../fixtures/{problems.js.es6 => problems.js} |  0
 .../fixtures/{reports.js.es6 => reports.js}   |  0
 .../{reports_bulk.js.es6 => reports_bulk.js}  |  0
 ...rch-fixtures.js.es6 => search-fixtures.js} |  0
 ...on-fixtures.js.es6 => session-fixtures.js} |  0
 ...{site-fixtures.js.es6 => site-fixtures.js} |  0
 ...{site_settings.js.es6 => site_settings.js} |  0
 ...tic_fixtures.js.es6 => static_fixtures.js} |  0
 .../{top_fixture.js.es6 => top_fixture.js}    |  0
 .../fixtures/{topic.js.es6 => topic.js}       |  0
 .../{user-badges.js.es6 => user-badges.js}    |  0
 ...{user_fixtures.js.es6 => user_fixtures.js} |  0
 ...tures.js.es6 => watched-words-fixtures.js} |  0
 test/javascripts/helpers/assertions.js        | 13 +++---
 ...omponent-test.js.es6 => component-test.js} |  0
 ...e-pretender.js.es6 => create-pretender.js} |  0
 .../{create-store.js.es6 => create-store.js}  |  0
 ...ditor-helper.js.es6 => d-editor-helper.js} |  0
 ...-pretender.js.es6 => fixture-pretender.js} |  0
 .../{html-helper.js.es6 => html-helper.js}    |  0
 test/javascripts/helpers/init-ember-qunit.js  |  2 -
 ...{qunit-helpers.js.es6 => qunit-helpers.js} |  0
 ...w-pretender.js.es6 => review-pretender.js} |  0
 ...kit-helper.js.es6 => select-kit-helper.js} |  0
 test/javascripts/helpers/site-settings.js     | 10 +++--
 .../helpers/{site.js.es6 => site.js}          |  0
 ...re-pretender.js.es6 => store-pretender.js} |  0
 ...er.js.es6 => textarea-selection-helper.js} |  0
 .../{widget-test.js.es6 => widget-test.js}    |  0
 ...ation-test.js.es6 => localization-test.js} |  0
 .../{bbcode-test.js.es6 => bbcode-test.js}    |  0
 ...tring-test.js.es6 => break-string-test.js} |  0
 ...dge-test.js.es6 => category-badge-test.js} |  0
 ...s.es6 => click-track-edit-history-test.js} |  0
 ...s.es6 => click-track-profile-page-test.js} |  0
 ...-track-test.js.es6 => click-track-test.js} |  0
 ...{computed-test.js.es6 => computed-test.js} |  0
 ...iscourse-test.js.es6 => discourse-test.js} |  0
 ...-store-test.js.es6 => emoji-store-test.js} |  0
 .../lib/{emoji-test.js.es6 => emoji-test.js}  |  0
 ...ormatter-test.js.es6 => formatter-test.js} |  0
 ...ext-test.js.es6 => highlight-text-test.js} |  0
 .../lib/{i18n-test.js.es6 => i18n-test.js}    |  0
 ...brary-test.js.es6 => icon-library-test.js} |  0
 ...re-test.js.es6 => key-value-store-test.js} |  0
 ...ions-test.js.es6 => link-mentions-test.js} |  0
 ...script-test.js.es6 => load-script-test.js} |  0
 ...{oneboxer-test.js.es6 => oneboxer-test.js} |  0
 ...tore-test.js.es6 => preload-store-test.js} |  0
 ...y-text-test.js.es6 => pretty-text-test.js} |  0
 ...anitizer-test.js.es6 => sanitizer-test.js} |  0
 ...track-test.js.es6 => screen-track-test.js} |  0
 .../{search-test.js.es6 => search-test.js}    |  0
 .../{sharing-test.js.es6 => sharing-test.js}  |  0
 ...ion-test.js.es6 => text-direction-test.js} |  0
 ...rkdown-test.js.es6 => to-markdown-test.js} |  0
 .../{tooltip-test.js.es6 => tooltip-test.js}  |  0
 ...l-test.js.es6 => upload-short-url-test.js} |  0
 .../{uploads-test.js.es6 => uploads-test.js}  |  0
 .../lib/{url-test.js.es6 => url-test.js}      |  0
 ...search-test.js.es6 => user-search-test.js} |  0
 ...tilities-test.js.es6 => utilities-test.js} |  0
 ...ister-test.js.es6 => white-lister-test.js} |  0
 ....js.es6 => grant-badge-controller-test.js} |  0
 ...ect-test.js.es6 => setting-object-test.js} |  0
 ...ingleton-test.js.es6 => singleton-test.js} |  0
 .../{badge-test.js.es6 => badge-test.js}      |  0
 ...{category-test.js.es6 => category-test.js} |  0
 ...{composer-test.js.es6 => composer-test.js} |  0
 ...mail-log-test.js.es6 => email-log-test.js} |  0
 .../{group-test.js.es6 => group-test.js}      |  0
 .../{invite-test.js.es6 => invite-test.js}    |  0
 ...{nav-item-test.js.es6 => nav-item-test.js} |  0
 ...stream-test.js.es6 => post-stream-test.js} |  0
 .../models/{post-test.js.es6 => post-test.js} |  0
 .../{report-test.js.es6 => report-test.js}    |  0
 ...t-model-test.js.es6 => rest-model-test.js} |  0
 ...ult-set-test.js.es6 => result-set-test.js} |  0
 .../{session-test.js.es6 => session-test.js}  |  0
 .../models/{site-test.js.es6 => site-test.js} |  0
 ...g-test.js.es6 => staff-action-log-test.js} |  0
 .../{store-test.js.es6 => store-test.js}      |  0
 ...ails-test.js.es6 => topic-details-test.js} |  0
 .../{topic-test.js.es6 => topic-test.js}      |  0
 ...st.js.es6 => topic-tracking-state-test.js} |  0
 ...action-test.js.es6 => user-action-test.js} |  0
 ...r-badge-test.js.es6 => user-badge-test.js} |  0
 ...drafts-test.js.es6 => user-drafts-test.js} |  0
 ...stream-test.js.es6 => user-stream-test.js} |  0
 .../models/{user-test.js.es6 => user-test.js} |  0
 ...orators-test.js.es6 => decorators-test.js} |  0
 ...ry-test.js.es6 => actions-summary-test.js} |  0
 ...flair-test.js.es6 => avatar-flair-test.js} |  0
 .../{button-test.js.es6 => button-test.js}    |  0
 ....es6 => default-notification-item-test.js} |  0
 ...enu-test.js.es6 => hamburger-menu-test.js} |  0
 .../{header-test.js.es6 => header-test.js}    |  0
 ...ome-logo-test.js.es6 => home-logo-test.js} |  0
 ...t-links-test.js.es6 => post-links-test.js} |  0
 ...stream-test.js.es6 => post-stream-test.js} |  0
 .../{post-test.js.es6 => post-test.js}        |  0
 ...r-name-test.js.es6 => poster-name-test.js} |  0
 ...-test.js.es6 => quick-access-item-test.js} |  0
 ...u-test.js.es6 => topic-admin-menu-test.js} |  0
 ...-test.js.es6 => topic-participant-test.js} |  0
 ...tatus-test.js.es6 => topic-status-test.js} |  0
 ...ser-menu-test.js.es6 => user-menu-test.js} |  0
 .../{widget-test.js.es6 => widget-test.js}    |  0
 281 files changed, 36 insertions(+), 29 deletions(-)
 rename test/javascripts/acceptance/{about-test.js.es6 => about-test.js} (100%)
 rename test/javascripts/acceptance/{account-created-test.js.es6 => account-created-test.js} (100%)
 rename test/javascripts/acceptance/{admin-emails-test.js.es6 => admin-emails-test.js} (100%)
 rename test/javascripts/acceptance/{admin-search-log-term-test.js.es6 => admin-search-log-term-test.js} (100%)
 rename test/javascripts/acceptance/{admin-search-logs-test.js.es6 => admin-search-logs-test.js} (100%)
 rename test/javascripts/acceptance/{admin-site-settings-test.js.es6 => admin-site-settings-test.js} (100%)
 rename test/javascripts/acceptance/{admin-site-text-test.js.es6 => admin-site-text-test.js} (100%)
 rename test/javascripts/acceptance/{admin-suspend-user-test.js.es6 => admin-suspend-user-test.js} (100%)
 rename test/javascripts/acceptance/{admin-user-badges-test.js.es6 => admin-user-badges-test.js} (100%)
 rename test/javascripts/acceptance/{admin-user-emails-test.js.es6 => admin-user-emails-test.js} (100%)
 rename test/javascripts/acceptance/{admin-user-index-test.js.es6 => admin-user-index-test.js} (100%)
 rename test/javascripts/acceptance/{admin-users-list-test.js.es6 => admin-users-list-test.js} (100%)
 rename test/javascripts/acceptance/{admin-watched-words-test.js.es6 => admin-watched-words-test.js} (100%)
 rename test/javascripts/acceptance/{auth-complete-test.js.es6 => auth-complete-test.js} (100%)
 rename test/javascripts/acceptance/{badges-test.js.es6 => badges-test.js} (100%)
 rename test/javascripts/acceptance/{category-chooser-test.js.es6 => category-chooser-test.js} (100%)
 rename test/javascripts/acceptance/{category-edit-security-test.js.es6 => category-edit-security-test.js} (100%)
 rename test/javascripts/acceptance/{category-edit-test.js.es6 => category-edit-test.js} (100%)
 rename test/javascripts/acceptance/{category-hashtag-test.js.es6 => category-hashtag-test.js} (100%)
 rename test/javascripts/acceptance/{click-track-test.js.es6 => click-track-test.js} (100%)
 rename test/javascripts/acceptance/{composer-actions-test.js.es6 => composer-actions-test.js} (100%)
 rename test/javascripts/acceptance/{composer-attachment-test.js.es6 => composer-attachment-test.js} (100%)
 rename test/javascripts/acceptance/{composer-edit-conflict-test.js.es6 => composer-edit-conflict-test.js} (100%)
 rename test/javascripts/acceptance/{composer-hyperlink-test.js.es6 => composer-hyperlink-test.js} (100%)
 rename test/javascripts/acceptance/{composer-onebox-test.js.es6 => composer-onebox-test.js} (100%)
 rename test/javascripts/acceptance/{composer-test.js.es6 => composer-test.js} (100%)
 rename test/javascripts/acceptance/{composer-topic-links-test.js.es6 => composer-topic-links-test.js} (100%)
 rename test/javascripts/acceptance/{composer-uncategorized-test.js.es6 => composer-uncategorized-test.js} (100%)
 rename test/javascripts/acceptance/{create-account-user-fields-test.js.es6 => create-account-user-fields-test.js} (100%)
 rename test/javascripts/acceptance/{custom-html-set-test.js.es6 => custom-html-set-test.js} (100%)
 rename test/javascripts/acceptance/{custom-html-template-test.js.es6 => custom-html-template-test.js} (100%)
 rename test/javascripts/acceptance/{dashboard-test.js.es6 => dashboard-test.js} (100%)
 rename test/javascripts/acceptance/{email-notice-test.js.es6 => email-notice-test.js} (100%)
 rename test/javascripts/acceptance/{emoji-picker-test.js.es6 => emoji-picker-test.js} (100%)
 rename test/javascripts/acceptance/{emoji-test.js.es6 => emoji-test.js} (100%)
 rename test/javascripts/acceptance/{enforce-second-factor-test.js.es6 => enforce-second-factor-test.js} (100%)
 rename test/javascripts/acceptance/{forgot-password-test.js.es6 => forgot-password-test.js} (100%)
 rename test/javascripts/acceptance/{group-card-mobile-test.js.es6 => group-card-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{group-card-test.js.es6 => group-card-test.js} (100%)
 rename test/javascripts/acceptance/{group-index-test.js.es6 => group-index-test.js} (100%)
 rename test/javascripts/acceptance/{group-manage-interaction-test.js.es6 => group-manage-interaction-test.js} (100%)
 rename test/javascripts/acceptance/{group-manage-logs-test.js.es6 => group-manage-logs-test.js} (100%)
 rename test/javascripts/acceptance/{group-manage-membership-test.js.es6 => group-manage-membership-test.js} (100%)
 rename test/javascripts/acceptance/{group-manage-profile-test.js.es6 => group-manage-profile-test.js} (100%)
 rename test/javascripts/acceptance/{group-requests-test.js.es6 => group-requests-test.js} (100%)
 rename test/javascripts/acceptance/{group-test.js.es6 => group-test.js} (100%)
 rename test/javascripts/acceptance/{groups-index-test.js.es6 => groups-index-test.js} (100%)
 rename test/javascripts/acceptance/{groups-new-test.js.es6 => groups-new-test.js} (100%)
 rename test/javascripts/acceptance/{invite-accept-test.js.es6 => invite-accept-test.js} (100%)
 rename test/javascripts/acceptance/{invite-show-user-fields-test.js.es6 => invite-show-user-fields-test.js} (100%)
 rename test/javascripts/acceptance/{jump-to-test.js.es6 => jump-to-test.js} (100%)
 rename test/javascripts/acceptance/{keyboard-shortcuts-test.js.es6 => keyboard-shortcuts-test.js} (100%)
 rename test/javascripts/acceptance/{login-redirect-test.js.es6 => login-redirect-test.js} (100%)
 rename test/javascripts/acceptance/{login-required-test.js.es6 => login-required-test.js} (100%)
 rename test/javascripts/acceptance/{login-with-email-and-hide-email-address-taken-test.js.es6 => login-with-email-and-hide-email-address-taken-test.js} (100%)
 rename test/javascripts/acceptance/{login-with-email-and-no-social-logins-test.js.es6 => login-with-email-and-no-social-logins-test.js} (100%)
 rename test/javascripts/acceptance/{login-with-email-disabled-test.js.es6 => login-with-email-disabled-test.js} (100%)
 rename test/javascripts/acceptance/{login-with-email-test.js.es6 => login-with-email-test.js} (100%)
 rename test/javascripts/acceptance/{mobile-discovery-test.js.es6 => mobile-discovery-test.js} (100%)
 rename test/javascripts/acceptance/{mobile-sign-in-test.js.es6 => mobile-sign-in-test.js} (100%)
 rename test/javascripts/acceptance/{mobile-users-test.js.es6 => mobile-users-test.js} (100%)
 rename test/javascripts/acceptance/{modal-test.js.es6 => modal-test.js} (100%)
 rename test/javascripts/acceptance/{new-message-test.js.es6 => new-message-test.js} (100%)
 rename test/javascripts/acceptance/{new-topic-test.js.es6 => new-topic-test.js} (100%)
 rename test/javascripts/acceptance/{password-reset-test.js.es6 => password-reset-test.js} (100%)
 rename test/javascripts/acceptance/{personal-message-test.js.es6 => personal-message-test.js} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-connector-class-test.js.es6 => plugin-outlet-connector-class-test.js} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-decorator-test.js.es6 => plugin-outlet-decorator-test.js} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-multi-template-test.js.es6 => plugin-outlet-multi-template-test.js} (100%)
 rename test/javascripts/acceptance/{plugin-outlet-single-template-test.js.es6 => plugin-outlet-single-template-test.js} (100%)
 rename test/javascripts/acceptance/{preferences-test.js.es6 => preferences-test.js} (100%)
 rename test/javascripts/acceptance/{raw-plugin-outlet-test.js.es6 => raw-plugin-outlet-test.js} (100%)
 rename test/javascripts/acceptance/{redirect-to-top-test.js.es6 => redirect-to-top-test.js} (100%)
 rename test/javascripts/acceptance/{reports-test.js.es6 => reports-test.js} (100%)
 rename test/javascripts/acceptance/{review-test.js.es6 => review-test.js} (100%)
 rename test/javascripts/acceptance/{search-full-test.js.es6 => search-full-test.js} (100%)
 rename test/javascripts/acceptance/{search-mobile-test.js.es6 => search-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{search-test.js.es6 => search-test.js} (100%)
 rename test/javascripts/acceptance/{share-and-invite-desktop-test.js.es6 => share-and-invite-desktop-test.js} (100%)
 rename test/javascripts/acceptance/{share-and-invite-mobile-test.js.es6 => share-and-invite-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{shared-drafts-test.js.es6 => shared-drafts-test.js} (100%)
 rename test/javascripts/acceptance/{sign-in-test.js.es6 => sign-in-test.js} (100%)
 rename test/javascripts/acceptance/{static-test.js.es6 => static-test.js} (100%)
 rename test/javascripts/acceptance/{tag-groups-test.js.es6 => tag-groups-test.js} (100%)
 rename test/javascripts/acceptance/{tag-hashtag-test.js.es6 => tag-hashtag-test.js} (100%)
 rename test/javascripts/acceptance/{tags-intersection-test.js.es6 => tags-intersection-test.js} (100%)
 rename test/javascripts/acceptance/{tags-test.js.es6 => tags-test.js} (100%)
 rename test/javascripts/acceptance/{topic-anonymous-test.js.es6 => topic-anonymous-test.js} (100%)
 rename test/javascripts/acceptance/{topic-discovery-test.js.es6 => topic-discovery-test.js} (100%)
 rename test/javascripts/acceptance/{topic-edit-timer-test.js.es6 => topic-edit-timer-test.js} (100%)
 rename test/javascripts/acceptance/{topic-footer-buttons-mobile-test.js.es6 => topic-footer-buttons-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{topic-move-posts-test.js.es6 => topic-move-posts-test.js} (100%)
 rename test/javascripts/acceptance/{topic-notifications-button-test.js.es6 => topic-notifications-button-test.js} (100%)
 rename test/javascripts/acceptance/{topic-test.js.es6 => topic-test.js} (100%)
 rename test/javascripts/acceptance/{unknown-test.js.es6 => unknown-test.js} (100%)
 rename test/javascripts/acceptance/{user-anonymous-test.js.es6 => user-anonymous-test.js} (100%)
 rename test/javascripts/acceptance/{user-card-mobile-test.js.es6 => user-card-mobile-test.js} (100%)
 rename test/javascripts/acceptance/{user-card-test.js.es6 => user-card-test.js} (100%)
 rename test/javascripts/acceptance/{user-drafts-stream-test.js.es6 => user-drafts-stream-test.js} (100%)
 rename test/javascripts/acceptance/{user-test.js.es6 => user-test.js} (100%)
 rename test/javascripts/acceptance/{users-test.js.es6 => users-test.js} (100%)
 rename test/javascripts/admin/components/{group-list-setting-test.js.es6 => group-list-setting-test.js} (100%)
 rename test/javascripts/admin/components/{themes-list-item-test.js.es6 => themes-list-item-test.js} (100%)
 rename test/javascripts/admin/components/{themes-list-test.js.es6 => themes-list-test.js} (100%)
 rename test/javascripts/admin/controllers/{admin-customize-themes-show-test.js.es6 => admin-customize-themes-show-test.js} (100%)
 rename test/javascripts/admin/controllers/{admin-customize-themes-test.js.es6 => admin-customize-themes-test.js} (100%)
 rename test/javascripts/admin/controllers/{admin-user-badges-test.js.es6 => admin-user-badges-test.js} (100%)
 rename test/javascripts/admin/models/{theme-test.js.es6 => theme-test.js} (100%)
 rename test/javascripts/components/{ace-editor-test.js.es6 => ace-editor-test.js} (100%)
 rename test/javascripts/components/{admin-report-test.js.es6 => admin-report-test.js} (100%)
 rename test/javascripts/components/{badge-title-test.js.es6 => badge-title-test.js} (100%)
 rename test/javascripts/components/{d-button-test.js.es6 => d-button-test.js} (100%)
 rename test/javascripts/components/{d-editor-test.js.es6 => d-editor-test.js} (100%)
 rename test/javascripts/components/{d-icon-test.js.es6 => d-icon-test.js} (100%)
 rename test/javascripts/components/{date-input-test.js.es6 => date-input-test.js} (100%)
 rename test/javascripts/components/{date-time-input-range-test.js.es6 => date-time-input-range-test.js} (100%)
 rename test/javascripts/components/{date-time-input-test.js.es6 => date-time-input-test.js} (100%)
 rename test/javascripts/components/{group-membership-button-test.js.es6 => group-membership-button-test.js} (100%)
 rename test/javascripts/components/{html-safe-helper-test.js.es6 => html-safe-helper-test.js} (100%)
 rename test/javascripts/components/{iframed-html-test.js.es6 => iframed-html-test.js} (100%)
 rename test/javascripts/components/{image-uploader-test.js.es6 => image-uploader-test.js} (100%)
 rename test/javascripts/components/{keyboard-shortcuts-test.js.es6 => keyboard-shortcuts-test.js} (100%)
 rename test/javascripts/components/{load-more-test.js.es6 => load-more-test.js} (100%)
 rename test/javascripts/components/{secret-value-list-test.js.es6 => secret-value-list-test.js} (100%)
 rename test/javascripts/components/select-kit/{category-chooser-test.js.es6 => category-chooser-test.js} (100%)
 rename test/javascripts/components/select-kit/{category-drop-test.js.es6 => category-drop-test.js} (100%)
 rename test/javascripts/components/select-kit/{combo-box-test.js.es6 => combo-box-test.js} (100%)
 rename test/javascripts/components/select-kit/{dropdown-select-box-test.js.es6 => dropdown-select-box-test.js} (100%)
 rename test/javascripts/components/select-kit/{list-setting-test.js.es6 => list-setting-test.js} (100%)
 rename test/javascripts/components/select-kit/{mini-tag-chooser-test.js.es6 => mini-tag-chooser-test.js} (100%)
 rename test/javascripts/components/select-kit/{multi-select-test.js.es6 => multi-select-test.js} (100%)
 rename test/javascripts/components/select-kit/{notifications-button-test.js.es6 => notifications-button-test.js} (100%)
 rename test/javascripts/components/select-kit/{pinned-options-test.js.es6 => pinned-options-test.js} (100%)
 rename test/javascripts/components/select-kit/{select-kit-test-helper.js.es6 => select-kit-test-helper.js} (100%)
 rename test/javascripts/components/select-kit/{single-select-test.js.es6 => single-select-test.js} (100%)
 rename test/javascripts/components/select-kit/{tag-drop-test.js.es6 => tag-drop-test.js} (100%)
 rename test/javascripts/components/select-kit/{topic-notifications-button-test.js.es6 => topic-notifications-button-test.js} (100%)
 rename test/javascripts/components/select-kit/{topic-notifications-options-test.js.es6 => topic-notifications-options-test.js} (100%)
 rename test/javascripts/components/select-kit/{user-chooser-test.js.es6 => user-chooser-test.js} (100%)
 rename test/javascripts/components/{share-button-test.js.es6 => share-button-test.js} (100%)
 rename test/javascripts/components/{share-button.js.es6 => share-button.js} (100%)
 rename test/javascripts/components/{text-field-test.js.es6 => text-field-test.js} (100%)
 rename test/javascripts/components/{text-overflow-test.js.es6 => text-overflow-test.js} (100%)
 rename test/javascripts/components/{time-input-test.js.es6 => time-input-test.js} (100%)
 rename test/javascripts/components/{user-selector-test.js.es6 => user-selector-test.js} (100%)
 rename test/javascripts/components/{value-list-test.js.es6 => value-list-test.js} (100%)
 rename test/javascripts/controllers/{avatar-selector-test.js.es6 => avatar-selector-test.js} (100%)
 rename test/javascripts/controllers/{bookmark-test.js.es6 => bookmark-test.js} (100%)
 rename test/javascripts/controllers/{create-account-test.js.es6 => create-account-test.js} (100%)
 rename test/javascripts/controllers/{group-test.js.es6 => group-test.js} (100%)
 rename test/javascripts/controllers/{history-test.js.es6 => history-test.js} (100%)
 rename test/javascripts/controllers/{preferences-account-test.js.es6 => preferences-account-test.js} (100%)
 rename test/javascripts/controllers/{preferences-second-factor-test.js.es6 => preferences-second-factor-test.js} (100%)
 rename test/javascripts/controllers/{reorder-categories-test.js.es6 => reorder-categories-test.js} (100%)
 rename test/javascripts/controllers/{topic-test.js.es6 => topic-test.js} (100%)
 rename test/javascripts/ember/{resolver-test.js.es6 => resolver-test.js} (100%)
 rename test/javascripts/fixtures/{about.js.es6 => about.js} (100%)
 rename test/javascripts/fixtures/{badges_fixture.js.es6 => badges_fixture.js} (100%)
 rename test/javascripts/fixtures/{category-fixtures.js.es6 => category-fixtures.js} (100%)
 rename test/javascripts/fixtures/concerns/{notification-types.js.es6.erb => notification-types.js.erb} (100%)
 rename test/javascripts/fixtures/{dashboard-general.js.es6 => dashboard-general.js} (100%)
 rename test/javascripts/fixtures/{dashboard.js.es6 => dashboard.js} (100%)
 rename test/javascripts/fixtures/{directory-fixtures.js.es6 => directory-fixtures.js} (100%)
 rename test/javascripts/fixtures/{discovery_fixtures.js.es6 => discovery_fixtures.js} (100%)
 rename test/javascripts/fixtures/{draft.js.es6 => draft.js} (100%)
 rename test/javascripts/fixtures/{drafts.js.es6 => drafts.js} (100%)
 rename test/javascripts/fixtures/{group-fixtures.js.es6 => group-fixtures.js} (100%)
 rename test/javascripts/fixtures/{groups-fixtures.js.es6 => groups-fixtures.js} (100%)
 rename test/javascripts/fixtures/{notification_fixtures.js.es6 => notification_fixtures.js} (100%)
 rename test/javascripts/fixtures/{poll.js.es6 => poll.js} (100%)
 rename test/javascripts/fixtures/{post.js.es6 => post.js} (100%)
 rename test/javascripts/fixtures/{private_messages_fixtures.js.es6 => private_messages_fixtures.js} (100%)
 rename test/javascripts/fixtures/{problems.js.es6 => problems.js} (100%)
 rename test/javascripts/fixtures/{reports.js.es6 => reports.js} (100%)
 rename test/javascripts/fixtures/{reports_bulk.js.es6 => reports_bulk.js} (100%)
 rename test/javascripts/fixtures/{search-fixtures.js.es6 => search-fixtures.js} (100%)
 rename test/javascripts/fixtures/{session-fixtures.js.es6 => session-fixtures.js} (100%)
 rename test/javascripts/fixtures/{site-fixtures.js.es6 => site-fixtures.js} (100%)
 rename test/javascripts/fixtures/{site_settings.js.es6 => site_settings.js} (100%)
 rename test/javascripts/fixtures/{static_fixtures.js.es6 => static_fixtures.js} (100%)
 rename test/javascripts/fixtures/{top_fixture.js.es6 => top_fixture.js} (100%)
 rename test/javascripts/fixtures/{topic.js.es6 => topic.js} (100%)
 rename test/javascripts/fixtures/{user-badges.js.es6 => user-badges.js} (100%)
 rename test/javascripts/fixtures/{user_fixtures.js.es6 => user_fixtures.js} (100%)
 rename test/javascripts/fixtures/{watched-words-fixtures.js.es6 => watched-words-fixtures.js} (100%)
 rename test/javascripts/helpers/{component-test.js.es6 => component-test.js} (100%)
 rename test/javascripts/helpers/{create-pretender.js.es6 => create-pretender.js} (100%)
 rename test/javascripts/helpers/{create-store.js.es6 => create-store.js} (100%)
 rename test/javascripts/helpers/{d-editor-helper.js.es6 => d-editor-helper.js} (100%)
 rename test/javascripts/helpers/{fixture-pretender.js.es6 => fixture-pretender.js} (100%)
 rename test/javascripts/helpers/{html-helper.js.es6 => html-helper.js} (100%)
 delete mode 100644 test/javascripts/helpers/init-ember-qunit.js
 rename test/javascripts/helpers/{qunit-helpers.js.es6 => qunit-helpers.js} (100%)
 rename test/javascripts/helpers/{review-pretender.js.es6 => review-pretender.js} (100%)
 rename test/javascripts/helpers/{select-kit-helper.js.es6 => select-kit-helper.js} (100%)
 rename test/javascripts/helpers/{site.js.es6 => site.js} (100%)
 rename test/javascripts/helpers/{store-pretender.js.es6 => store-pretender.js} (100%)
 rename test/javascripts/helpers/{textarea-selection-helper.js.es6 => textarea-selection-helper.js} (100%)
 rename test/javascripts/helpers/{widget-test.js.es6 => widget-test.js} (100%)
 rename test/javascripts/initializers/{localization-test.js.es6 => localization-test.js} (100%)
 rename test/javascripts/lib/{bbcode-test.js.es6 => bbcode-test.js} (100%)
 rename test/javascripts/lib/{break-string-test.js.es6 => break-string-test.js} (100%)
 rename test/javascripts/lib/{category-badge-test.js.es6 => category-badge-test.js} (100%)
 rename test/javascripts/lib/{click-track-edit-history-test.js.es6 => click-track-edit-history-test.js} (100%)
 rename test/javascripts/lib/{click-track-profile-page-test.js.es6 => click-track-profile-page-test.js} (100%)
 rename test/javascripts/lib/{click-track-test.js.es6 => click-track-test.js} (100%)
 rename test/javascripts/lib/{computed-test.js.es6 => computed-test.js} (100%)
 rename test/javascripts/lib/{discourse-test.js.es6 => discourse-test.js} (100%)
 rename test/javascripts/lib/{emoji-store-test.js.es6 => emoji-store-test.js} (100%)
 rename test/javascripts/lib/{emoji-test.js.es6 => emoji-test.js} (100%)
 rename test/javascripts/lib/{formatter-test.js.es6 => formatter-test.js} (100%)
 rename test/javascripts/lib/{highlight-text-test.js.es6 => highlight-text-test.js} (100%)
 rename test/javascripts/lib/{i18n-test.js.es6 => i18n-test.js} (100%)
 rename test/javascripts/lib/{icon-library-test.js.es6 => icon-library-test.js} (100%)
 rename test/javascripts/lib/{key-value-store-test.js.es6 => key-value-store-test.js} (100%)
 rename test/javascripts/lib/{link-mentions-test.js.es6 => link-mentions-test.js} (100%)
 rename test/javascripts/lib/{load-script-test.js.es6 => load-script-test.js} (100%)
 rename test/javascripts/lib/{oneboxer-test.js.es6 => oneboxer-test.js} (100%)
 rename test/javascripts/lib/{preload-store-test.js.es6 => preload-store-test.js} (100%)
 rename test/javascripts/lib/{pretty-text-test.js.es6 => pretty-text-test.js} (100%)
 rename test/javascripts/lib/{sanitizer-test.js.es6 => sanitizer-test.js} (100%)
 rename test/javascripts/lib/{screen-track-test.js.es6 => screen-track-test.js} (100%)
 rename test/javascripts/lib/{search-test.js.es6 => search-test.js} (100%)
 rename test/javascripts/lib/{sharing-test.js.es6 => sharing-test.js} (100%)
 rename test/javascripts/lib/{text-direction-test.js.es6 => text-direction-test.js} (100%)
 rename test/javascripts/lib/{to-markdown-test.js.es6 => to-markdown-test.js} (100%)
 rename test/javascripts/lib/{tooltip-test.js.es6 => tooltip-test.js} (100%)
 rename test/javascripts/lib/{upload-short-url-test.js.es6 => upload-short-url-test.js} (100%)
 rename test/javascripts/lib/{uploads-test.js.es6 => uploads-test.js} (100%)
 rename test/javascripts/lib/{url-test.js.es6 => url-test.js} (100%)
 rename test/javascripts/lib/{user-search-test.js.es6 => user-search-test.js} (100%)
 rename test/javascripts/lib/{utilities-test.js.es6 => utilities-test.js} (100%)
 rename test/javascripts/lib/{white-lister-test.js.es6 => white-lister-test.js} (100%)
 rename test/javascripts/mixins/{grant-badge-controller-test.js.es6 => grant-badge-controller-test.js} (100%)
 rename test/javascripts/mixins/{setting-object-test.js.es6 => setting-object-test.js} (100%)
 rename test/javascripts/mixins/{singleton-test.js.es6 => singleton-test.js} (100%)
 rename test/javascripts/models/{badge-test.js.es6 => badge-test.js} (100%)
 rename test/javascripts/models/{category-test.js.es6 => category-test.js} (100%)
 rename test/javascripts/models/{composer-test.js.es6 => composer-test.js} (100%)
 rename test/javascripts/models/{email-log-test.js.es6 => email-log-test.js} (100%)
 rename test/javascripts/models/{group-test.js.es6 => group-test.js} (100%)
 rename test/javascripts/models/{invite-test.js.es6 => invite-test.js} (100%)
 rename test/javascripts/models/{nav-item-test.js.es6 => nav-item-test.js} (100%)
 rename test/javascripts/models/{post-stream-test.js.es6 => post-stream-test.js} (100%)
 rename test/javascripts/models/{post-test.js.es6 => post-test.js} (100%)
 rename test/javascripts/models/{report-test.js.es6 => report-test.js} (100%)
 rename test/javascripts/models/{rest-model-test.js.es6 => rest-model-test.js} (100%)
 rename test/javascripts/models/{result-set-test.js.es6 => result-set-test.js} (100%)
 rename test/javascripts/models/{session-test.js.es6 => session-test.js} (100%)
 rename test/javascripts/models/{site-test.js.es6 => site-test.js} (100%)
 rename test/javascripts/models/{staff-action-log-test.js.es6 => staff-action-log-test.js} (100%)
 rename test/javascripts/models/{store-test.js.es6 => store-test.js} (100%)
 rename test/javascripts/models/{topic-details-test.js.es6 => topic-details-test.js} (100%)
 rename test/javascripts/models/{topic-test.js.es6 => topic-test.js} (100%)
 rename test/javascripts/models/{topic-tracking-state-test.js.es6 => topic-tracking-state-test.js} (100%)
 rename test/javascripts/models/{user-action-test.js.es6 => user-action-test.js} (100%)
 rename test/javascripts/models/{user-badge-test.js.es6 => user-badge-test.js} (100%)
 rename test/javascripts/models/{user-drafts-test.js.es6 => user-drafts-test.js} (100%)
 rename test/javascripts/models/{user-stream-test.js.es6 => user-stream-test.js} (100%)
 rename test/javascripts/models/{user-test.js.es6 => user-test.js} (100%)
 rename test/javascripts/utils/{decorators-test.js.es6 => decorators-test.js} (100%)
 rename test/javascripts/widgets/{actions-summary-test.js.es6 => actions-summary-test.js} (100%)
 rename test/javascripts/widgets/{avatar-flair-test.js.es6 => avatar-flair-test.js} (100%)
 rename test/javascripts/widgets/{button-test.js.es6 => button-test.js} (100%)
 rename test/javascripts/widgets/{default-notification-item-test.js.es6 => default-notification-item-test.js} (100%)
 rename test/javascripts/widgets/{hamburger-menu-test.js.es6 => hamburger-menu-test.js} (100%)
 rename test/javascripts/widgets/{header-test.js.es6 => header-test.js} (100%)
 rename test/javascripts/widgets/{home-logo-test.js.es6 => home-logo-test.js} (100%)
 rename test/javascripts/widgets/{post-links-test.js.es6 => post-links-test.js} (100%)
 rename test/javascripts/widgets/{post-stream-test.js.es6 => post-stream-test.js} (100%)
 rename test/javascripts/widgets/{post-test.js.es6 => post-test.js} (100%)
 rename test/javascripts/widgets/{poster-name-test.js.es6 => poster-name-test.js} (100%)
 rename test/javascripts/widgets/{quick-access-item-test.js.es6 => quick-access-item-test.js} (100%)
 rename test/javascripts/widgets/{topic-admin-menu-test.js.es6 => topic-admin-menu-test.js} (100%)
 rename test/javascripts/widgets/{topic-participant-test.js.es6 => topic-participant-test.js} (100%)
 rename test/javascripts/widgets/{topic-status-test.js.es6 => topic-status-test.js} (100%)
 rename test/javascripts/widgets/{user-menu-test.js.es6 => user-menu-test.js} (100%)
 rename test/javascripts/widgets/{widget-test.js.es6 => widget-test.js} (100%)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index bbadfa84af..c0ebc2210e 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -36,24 +36,28 @@ class DiscourseJsProcessor
     return false unless filename.end_with?(".js") || filename.end_with?(".js.erb")
 
     relative_path = filename.sub(Rails.root.to_s, '').sub(/^\/*/, '')
-    relative_path.start_with?("app/assets/javascripts/discourse/") ||
-      relative_path.start_with?("app/assets/javascripts/admin/") ||
-      relative_path.start_with?("app/assets/javascripts/pretty-text/") ||
-      relative_path.start_with?("app/assets/javascripts/select-kit/") ||
-      relative_path.start_with?("app/assets/javascripts/wizard/") ||
-      relative_path.start_with?("app/assets/javascripts/discourse-common/") ||
-      relative_path.start_with?("app/assets/javascripts/ember-addons/") ||
-      relative_path.start_with?("app/assets/javascripts/confirm-new-email/") ||
-      relative_path == "app/assets/javascripts/preload-store.js" ||
-      relative_path == "app/assets/javascripts/preload-application-data.js" ||
-      relative_path == "app/assets/javascripts/wizard-start.js" ||
-      relative_path == "app/assets/javascripts/onpopstate-handler.js" ||
-      relative_path == "app/assets/javascripts/discourse.js" ||
-      relative_path == "app/assets/javascripts/google-tag-manager.js" ||
-      relative_path == "app/assets/javascripts/google-universal-analytics.js" ||
-      relative_path == "app/assets/javascripts/activate-account.js" ||
-      relative_path == "app/assets/javascripts/auto-redirect.js" ||
-      relative_path == "app/assets/javascripts/embed-application.js"
+
+    js_root = "app/assets/javascripts"
+    test_root = "test/javascripts"
+
+    return false if relative_path.start_with?("#{js_root}/locales/")
+    return false if relative_path.start_with?("#{js_root}/plugins/")
+
+    return true if %w(
+      preload-store
+      preload-application-data
+      wizard-start
+      onpopstate-handler
+      discourse
+      google-tag-manager
+      google-universal-analytics.js
+      activate-account.js
+      auto-redirect.js
+      embed-application
+    ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
+
+    relative_path =~ /^#{js_root}\/[^\/]+\// ||
+      relative_path =~ /^#{test_root}\/[^\/]+\//
   end
 
   def self.skip_module?(data)
diff --git a/test/javascripts/acceptance/about-test.js.es6 b/test/javascripts/acceptance/about-test.js
similarity index 100%
rename from test/javascripts/acceptance/about-test.js.es6
rename to test/javascripts/acceptance/about-test.js
diff --git a/test/javascripts/acceptance/account-created-test.js.es6 b/test/javascripts/acceptance/account-created-test.js
similarity index 100%
rename from test/javascripts/acceptance/account-created-test.js.es6
rename to test/javascripts/acceptance/account-created-test.js
diff --git a/test/javascripts/acceptance/admin-emails-test.js.es6 b/test/javascripts/acceptance/admin-emails-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-emails-test.js.es6
rename to test/javascripts/acceptance/admin-emails-test.js
diff --git a/test/javascripts/acceptance/admin-search-log-term-test.js.es6 b/test/javascripts/acceptance/admin-search-log-term-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-search-log-term-test.js.es6
rename to test/javascripts/acceptance/admin-search-log-term-test.js
diff --git a/test/javascripts/acceptance/admin-search-logs-test.js.es6 b/test/javascripts/acceptance/admin-search-logs-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-search-logs-test.js.es6
rename to test/javascripts/acceptance/admin-search-logs-test.js
diff --git a/test/javascripts/acceptance/admin-site-settings-test.js.es6 b/test/javascripts/acceptance/admin-site-settings-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-site-settings-test.js.es6
rename to test/javascripts/acceptance/admin-site-settings-test.js
diff --git a/test/javascripts/acceptance/admin-site-text-test.js.es6 b/test/javascripts/acceptance/admin-site-text-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-site-text-test.js.es6
rename to test/javascripts/acceptance/admin-site-text-test.js
diff --git a/test/javascripts/acceptance/admin-suspend-user-test.js.es6 b/test/javascripts/acceptance/admin-suspend-user-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-suspend-user-test.js.es6
rename to test/javascripts/acceptance/admin-suspend-user-test.js
diff --git a/test/javascripts/acceptance/admin-user-badges-test.js.es6 b/test/javascripts/acceptance/admin-user-badges-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-user-badges-test.js.es6
rename to test/javascripts/acceptance/admin-user-badges-test.js
diff --git a/test/javascripts/acceptance/admin-user-emails-test.js.es6 b/test/javascripts/acceptance/admin-user-emails-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-user-emails-test.js.es6
rename to test/javascripts/acceptance/admin-user-emails-test.js
diff --git a/test/javascripts/acceptance/admin-user-index-test.js.es6 b/test/javascripts/acceptance/admin-user-index-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-user-index-test.js.es6
rename to test/javascripts/acceptance/admin-user-index-test.js
diff --git a/test/javascripts/acceptance/admin-users-list-test.js.es6 b/test/javascripts/acceptance/admin-users-list-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-users-list-test.js.es6
rename to test/javascripts/acceptance/admin-users-list-test.js
diff --git a/test/javascripts/acceptance/admin-watched-words-test.js.es6 b/test/javascripts/acceptance/admin-watched-words-test.js
similarity index 100%
rename from test/javascripts/acceptance/admin-watched-words-test.js.es6
rename to test/javascripts/acceptance/admin-watched-words-test.js
diff --git a/test/javascripts/acceptance/auth-complete-test.js.es6 b/test/javascripts/acceptance/auth-complete-test.js
similarity index 100%
rename from test/javascripts/acceptance/auth-complete-test.js.es6
rename to test/javascripts/acceptance/auth-complete-test.js
diff --git a/test/javascripts/acceptance/badges-test.js.es6 b/test/javascripts/acceptance/badges-test.js
similarity index 100%
rename from test/javascripts/acceptance/badges-test.js.es6
rename to test/javascripts/acceptance/badges-test.js
diff --git a/test/javascripts/acceptance/category-chooser-test.js.es6 b/test/javascripts/acceptance/category-chooser-test.js
similarity index 100%
rename from test/javascripts/acceptance/category-chooser-test.js.es6
rename to test/javascripts/acceptance/category-chooser-test.js
diff --git a/test/javascripts/acceptance/category-edit-security-test.js.es6 b/test/javascripts/acceptance/category-edit-security-test.js
similarity index 100%
rename from test/javascripts/acceptance/category-edit-security-test.js.es6
rename to test/javascripts/acceptance/category-edit-security-test.js
diff --git a/test/javascripts/acceptance/category-edit-test.js.es6 b/test/javascripts/acceptance/category-edit-test.js
similarity index 100%
rename from test/javascripts/acceptance/category-edit-test.js.es6
rename to test/javascripts/acceptance/category-edit-test.js
diff --git a/test/javascripts/acceptance/category-hashtag-test.js.es6 b/test/javascripts/acceptance/category-hashtag-test.js
similarity index 100%
rename from test/javascripts/acceptance/category-hashtag-test.js.es6
rename to test/javascripts/acceptance/category-hashtag-test.js
diff --git a/test/javascripts/acceptance/click-track-test.js.es6 b/test/javascripts/acceptance/click-track-test.js
similarity index 100%
rename from test/javascripts/acceptance/click-track-test.js.es6
rename to test/javascripts/acceptance/click-track-test.js
diff --git a/test/javascripts/acceptance/composer-actions-test.js.es6 b/test/javascripts/acceptance/composer-actions-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-actions-test.js.es6
rename to test/javascripts/acceptance/composer-actions-test.js
diff --git a/test/javascripts/acceptance/composer-attachment-test.js.es6 b/test/javascripts/acceptance/composer-attachment-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-attachment-test.js.es6
rename to test/javascripts/acceptance/composer-attachment-test.js
diff --git a/test/javascripts/acceptance/composer-edit-conflict-test.js.es6 b/test/javascripts/acceptance/composer-edit-conflict-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-edit-conflict-test.js.es6
rename to test/javascripts/acceptance/composer-edit-conflict-test.js
diff --git a/test/javascripts/acceptance/composer-hyperlink-test.js.es6 b/test/javascripts/acceptance/composer-hyperlink-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-hyperlink-test.js.es6
rename to test/javascripts/acceptance/composer-hyperlink-test.js
diff --git a/test/javascripts/acceptance/composer-onebox-test.js.es6 b/test/javascripts/acceptance/composer-onebox-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-onebox-test.js.es6
rename to test/javascripts/acceptance/composer-onebox-test.js
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-test.js.es6
rename to test/javascripts/acceptance/composer-test.js
diff --git a/test/javascripts/acceptance/composer-topic-links-test.js.es6 b/test/javascripts/acceptance/composer-topic-links-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-topic-links-test.js.es6
rename to test/javascripts/acceptance/composer-topic-links-test.js
diff --git a/test/javascripts/acceptance/composer-uncategorized-test.js.es6 b/test/javascripts/acceptance/composer-uncategorized-test.js
similarity index 100%
rename from test/javascripts/acceptance/composer-uncategorized-test.js.es6
rename to test/javascripts/acceptance/composer-uncategorized-test.js
diff --git a/test/javascripts/acceptance/create-account-user-fields-test.js.es6 b/test/javascripts/acceptance/create-account-user-fields-test.js
similarity index 100%
rename from test/javascripts/acceptance/create-account-user-fields-test.js.es6
rename to test/javascripts/acceptance/create-account-user-fields-test.js
diff --git a/test/javascripts/acceptance/custom-html-set-test.js.es6 b/test/javascripts/acceptance/custom-html-set-test.js
similarity index 100%
rename from test/javascripts/acceptance/custom-html-set-test.js.es6
rename to test/javascripts/acceptance/custom-html-set-test.js
diff --git a/test/javascripts/acceptance/custom-html-template-test.js.es6 b/test/javascripts/acceptance/custom-html-template-test.js
similarity index 100%
rename from test/javascripts/acceptance/custom-html-template-test.js.es6
rename to test/javascripts/acceptance/custom-html-template-test.js
diff --git a/test/javascripts/acceptance/dashboard-test.js.es6 b/test/javascripts/acceptance/dashboard-test.js
similarity index 100%
rename from test/javascripts/acceptance/dashboard-test.js.es6
rename to test/javascripts/acceptance/dashboard-test.js
diff --git a/test/javascripts/acceptance/email-notice-test.js.es6 b/test/javascripts/acceptance/email-notice-test.js
similarity index 100%
rename from test/javascripts/acceptance/email-notice-test.js.es6
rename to test/javascripts/acceptance/email-notice-test.js
diff --git a/test/javascripts/acceptance/emoji-picker-test.js.es6 b/test/javascripts/acceptance/emoji-picker-test.js
similarity index 100%
rename from test/javascripts/acceptance/emoji-picker-test.js.es6
rename to test/javascripts/acceptance/emoji-picker-test.js
diff --git a/test/javascripts/acceptance/emoji-test.js.es6 b/test/javascripts/acceptance/emoji-test.js
similarity index 100%
rename from test/javascripts/acceptance/emoji-test.js.es6
rename to test/javascripts/acceptance/emoji-test.js
diff --git a/test/javascripts/acceptance/enforce-second-factor-test.js.es6 b/test/javascripts/acceptance/enforce-second-factor-test.js
similarity index 100%
rename from test/javascripts/acceptance/enforce-second-factor-test.js.es6
rename to test/javascripts/acceptance/enforce-second-factor-test.js
diff --git a/test/javascripts/acceptance/forgot-password-test.js.es6 b/test/javascripts/acceptance/forgot-password-test.js
similarity index 100%
rename from test/javascripts/acceptance/forgot-password-test.js.es6
rename to test/javascripts/acceptance/forgot-password-test.js
diff --git a/test/javascripts/acceptance/group-card-mobile-test.js.es6 b/test/javascripts/acceptance/group-card-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-card-mobile-test.js.es6
rename to test/javascripts/acceptance/group-card-mobile-test.js
diff --git a/test/javascripts/acceptance/group-card-test.js.es6 b/test/javascripts/acceptance/group-card-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-card-test.js.es6
rename to test/javascripts/acceptance/group-card-test.js
diff --git a/test/javascripts/acceptance/group-index-test.js.es6 b/test/javascripts/acceptance/group-index-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-index-test.js.es6
rename to test/javascripts/acceptance/group-index-test.js
diff --git a/test/javascripts/acceptance/group-manage-interaction-test.js.es6 b/test/javascripts/acceptance/group-manage-interaction-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-manage-interaction-test.js.es6
rename to test/javascripts/acceptance/group-manage-interaction-test.js
diff --git a/test/javascripts/acceptance/group-manage-logs-test.js.es6 b/test/javascripts/acceptance/group-manage-logs-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-manage-logs-test.js.es6
rename to test/javascripts/acceptance/group-manage-logs-test.js
diff --git a/test/javascripts/acceptance/group-manage-membership-test.js.es6 b/test/javascripts/acceptance/group-manage-membership-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-manage-membership-test.js.es6
rename to test/javascripts/acceptance/group-manage-membership-test.js
diff --git a/test/javascripts/acceptance/group-manage-profile-test.js.es6 b/test/javascripts/acceptance/group-manage-profile-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-manage-profile-test.js.es6
rename to test/javascripts/acceptance/group-manage-profile-test.js
diff --git a/test/javascripts/acceptance/group-requests-test.js.es6 b/test/javascripts/acceptance/group-requests-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-requests-test.js.es6
rename to test/javascripts/acceptance/group-requests-test.js
diff --git a/test/javascripts/acceptance/group-test.js.es6 b/test/javascripts/acceptance/group-test.js
similarity index 100%
rename from test/javascripts/acceptance/group-test.js.es6
rename to test/javascripts/acceptance/group-test.js
diff --git a/test/javascripts/acceptance/groups-index-test.js.es6 b/test/javascripts/acceptance/groups-index-test.js
similarity index 100%
rename from test/javascripts/acceptance/groups-index-test.js.es6
rename to test/javascripts/acceptance/groups-index-test.js
diff --git a/test/javascripts/acceptance/groups-new-test.js.es6 b/test/javascripts/acceptance/groups-new-test.js
similarity index 100%
rename from test/javascripts/acceptance/groups-new-test.js.es6
rename to test/javascripts/acceptance/groups-new-test.js
diff --git a/test/javascripts/acceptance/invite-accept-test.js.es6 b/test/javascripts/acceptance/invite-accept-test.js
similarity index 100%
rename from test/javascripts/acceptance/invite-accept-test.js.es6
rename to test/javascripts/acceptance/invite-accept-test.js
diff --git a/test/javascripts/acceptance/invite-show-user-fields-test.js.es6 b/test/javascripts/acceptance/invite-show-user-fields-test.js
similarity index 100%
rename from test/javascripts/acceptance/invite-show-user-fields-test.js.es6
rename to test/javascripts/acceptance/invite-show-user-fields-test.js
diff --git a/test/javascripts/acceptance/jump-to-test.js.es6 b/test/javascripts/acceptance/jump-to-test.js
similarity index 100%
rename from test/javascripts/acceptance/jump-to-test.js.es6
rename to test/javascripts/acceptance/jump-to-test.js
diff --git a/test/javascripts/acceptance/keyboard-shortcuts-test.js.es6 b/test/javascripts/acceptance/keyboard-shortcuts-test.js
similarity index 100%
rename from test/javascripts/acceptance/keyboard-shortcuts-test.js.es6
rename to test/javascripts/acceptance/keyboard-shortcuts-test.js
diff --git a/test/javascripts/acceptance/login-redirect-test.js.es6 b/test/javascripts/acceptance/login-redirect-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-redirect-test.js.es6
rename to test/javascripts/acceptance/login-redirect-test.js
diff --git a/test/javascripts/acceptance/login-required-test.js.es6 b/test/javascripts/acceptance/login-required-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-required-test.js.es6
rename to test/javascripts/acceptance/login-required-test.js
diff --git a/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6 b/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6
rename to test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js
diff --git a/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6 b/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6
rename to test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js
diff --git a/test/javascripts/acceptance/login-with-email-disabled-test.js.es6 b/test/javascripts/acceptance/login-with-email-disabled-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-disabled-test.js.es6
rename to test/javascripts/acceptance/login-with-email-disabled-test.js
diff --git a/test/javascripts/acceptance/login-with-email-test.js.es6 b/test/javascripts/acceptance/login-with-email-test.js
similarity index 100%
rename from test/javascripts/acceptance/login-with-email-test.js.es6
rename to test/javascripts/acceptance/login-with-email-test.js
diff --git a/test/javascripts/acceptance/mobile-discovery-test.js.es6 b/test/javascripts/acceptance/mobile-discovery-test.js
similarity index 100%
rename from test/javascripts/acceptance/mobile-discovery-test.js.es6
rename to test/javascripts/acceptance/mobile-discovery-test.js
diff --git a/test/javascripts/acceptance/mobile-sign-in-test.js.es6 b/test/javascripts/acceptance/mobile-sign-in-test.js
similarity index 100%
rename from test/javascripts/acceptance/mobile-sign-in-test.js.es6
rename to test/javascripts/acceptance/mobile-sign-in-test.js
diff --git a/test/javascripts/acceptance/mobile-users-test.js.es6 b/test/javascripts/acceptance/mobile-users-test.js
similarity index 100%
rename from test/javascripts/acceptance/mobile-users-test.js.es6
rename to test/javascripts/acceptance/mobile-users-test.js
diff --git a/test/javascripts/acceptance/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js
similarity index 100%
rename from test/javascripts/acceptance/modal-test.js.es6
rename to test/javascripts/acceptance/modal-test.js
diff --git a/test/javascripts/acceptance/new-message-test.js.es6 b/test/javascripts/acceptance/new-message-test.js
similarity index 100%
rename from test/javascripts/acceptance/new-message-test.js.es6
rename to test/javascripts/acceptance/new-message-test.js
diff --git a/test/javascripts/acceptance/new-topic-test.js.es6 b/test/javascripts/acceptance/new-topic-test.js
similarity index 100%
rename from test/javascripts/acceptance/new-topic-test.js.es6
rename to test/javascripts/acceptance/new-topic-test.js
diff --git a/test/javascripts/acceptance/password-reset-test.js.es6 b/test/javascripts/acceptance/password-reset-test.js
similarity index 100%
rename from test/javascripts/acceptance/password-reset-test.js.es6
rename to test/javascripts/acceptance/password-reset-test.js
diff --git a/test/javascripts/acceptance/personal-message-test.js.es6 b/test/javascripts/acceptance/personal-message-test.js
similarity index 100%
rename from test/javascripts/acceptance/personal-message-test.js.es6
rename to test/javascripts/acceptance/personal-message-test.js
diff --git a/test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-connector-class-test.js
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6
rename to test/javascripts/acceptance/plugin-outlet-connector-class-test.js
diff --git a/test/javascripts/acceptance/plugin-outlet-decorator-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-decorator-test.js
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-decorator-test.js.es6
rename to test/javascripts/acceptance/plugin-outlet-decorator-test.js
diff --git a/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-multi-template-test.js
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6
rename to test/javascripts/acceptance/plugin-outlet-multi-template-test.js
diff --git a/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-single-template-test.js
similarity index 100%
rename from test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6
rename to test/javascripts/acceptance/plugin-outlet-single-template-test.js
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js
similarity index 100%
rename from test/javascripts/acceptance/preferences-test.js.es6
rename to test/javascripts/acceptance/preferences-test.js
diff --git a/test/javascripts/acceptance/raw-plugin-outlet-test.js.es6 b/test/javascripts/acceptance/raw-plugin-outlet-test.js
similarity index 100%
rename from test/javascripts/acceptance/raw-plugin-outlet-test.js.es6
rename to test/javascripts/acceptance/raw-plugin-outlet-test.js
diff --git a/test/javascripts/acceptance/redirect-to-top-test.js.es6 b/test/javascripts/acceptance/redirect-to-top-test.js
similarity index 100%
rename from test/javascripts/acceptance/redirect-to-top-test.js.es6
rename to test/javascripts/acceptance/redirect-to-top-test.js
diff --git a/test/javascripts/acceptance/reports-test.js.es6 b/test/javascripts/acceptance/reports-test.js
similarity index 100%
rename from test/javascripts/acceptance/reports-test.js.es6
rename to test/javascripts/acceptance/reports-test.js
diff --git a/test/javascripts/acceptance/review-test.js.es6 b/test/javascripts/acceptance/review-test.js
similarity index 100%
rename from test/javascripts/acceptance/review-test.js.es6
rename to test/javascripts/acceptance/review-test.js
diff --git a/test/javascripts/acceptance/search-full-test.js.es6 b/test/javascripts/acceptance/search-full-test.js
similarity index 100%
rename from test/javascripts/acceptance/search-full-test.js.es6
rename to test/javascripts/acceptance/search-full-test.js
diff --git a/test/javascripts/acceptance/search-mobile-test.js.es6 b/test/javascripts/acceptance/search-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/search-mobile-test.js.es6
rename to test/javascripts/acceptance/search-mobile-test.js
diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js
similarity index 100%
rename from test/javascripts/acceptance/search-test.js.es6
rename to test/javascripts/acceptance/search-test.js
diff --git a/test/javascripts/acceptance/share-and-invite-desktop-test.js.es6 b/test/javascripts/acceptance/share-and-invite-desktop-test.js
similarity index 100%
rename from test/javascripts/acceptance/share-and-invite-desktop-test.js.es6
rename to test/javascripts/acceptance/share-and-invite-desktop-test.js
diff --git a/test/javascripts/acceptance/share-and-invite-mobile-test.js.es6 b/test/javascripts/acceptance/share-and-invite-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/share-and-invite-mobile-test.js.es6
rename to test/javascripts/acceptance/share-and-invite-mobile-test.js
diff --git a/test/javascripts/acceptance/shared-drafts-test.js.es6 b/test/javascripts/acceptance/shared-drafts-test.js
similarity index 100%
rename from test/javascripts/acceptance/shared-drafts-test.js.es6
rename to test/javascripts/acceptance/shared-drafts-test.js
diff --git a/test/javascripts/acceptance/sign-in-test.js.es6 b/test/javascripts/acceptance/sign-in-test.js
similarity index 100%
rename from test/javascripts/acceptance/sign-in-test.js.es6
rename to test/javascripts/acceptance/sign-in-test.js
diff --git a/test/javascripts/acceptance/static-test.js.es6 b/test/javascripts/acceptance/static-test.js
similarity index 100%
rename from test/javascripts/acceptance/static-test.js.es6
rename to test/javascripts/acceptance/static-test.js
diff --git a/test/javascripts/acceptance/tag-groups-test.js.es6 b/test/javascripts/acceptance/tag-groups-test.js
similarity index 100%
rename from test/javascripts/acceptance/tag-groups-test.js.es6
rename to test/javascripts/acceptance/tag-groups-test.js
diff --git a/test/javascripts/acceptance/tag-hashtag-test.js.es6 b/test/javascripts/acceptance/tag-hashtag-test.js
similarity index 100%
rename from test/javascripts/acceptance/tag-hashtag-test.js.es6
rename to test/javascripts/acceptance/tag-hashtag-test.js
diff --git a/test/javascripts/acceptance/tags-intersection-test.js.es6 b/test/javascripts/acceptance/tags-intersection-test.js
similarity index 100%
rename from test/javascripts/acceptance/tags-intersection-test.js.es6
rename to test/javascripts/acceptance/tags-intersection-test.js
diff --git a/test/javascripts/acceptance/tags-test.js.es6 b/test/javascripts/acceptance/tags-test.js
similarity index 100%
rename from test/javascripts/acceptance/tags-test.js.es6
rename to test/javascripts/acceptance/tags-test.js
diff --git a/test/javascripts/acceptance/topic-anonymous-test.js.es6 b/test/javascripts/acceptance/topic-anonymous-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-anonymous-test.js.es6
rename to test/javascripts/acceptance/topic-anonymous-test.js
diff --git a/test/javascripts/acceptance/topic-discovery-test.js.es6 b/test/javascripts/acceptance/topic-discovery-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-discovery-test.js.es6
rename to test/javascripts/acceptance/topic-discovery-test.js
diff --git a/test/javascripts/acceptance/topic-edit-timer-test.js.es6 b/test/javascripts/acceptance/topic-edit-timer-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-edit-timer-test.js.es6
rename to test/javascripts/acceptance/topic-edit-timer-test.js
diff --git a/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js.es6 b/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-footer-buttons-mobile-test.js.es6
rename to test/javascripts/acceptance/topic-footer-buttons-mobile-test.js
diff --git a/test/javascripts/acceptance/topic-move-posts-test.js.es6 b/test/javascripts/acceptance/topic-move-posts-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-move-posts-test.js.es6
rename to test/javascripts/acceptance/topic-move-posts-test.js
diff --git a/test/javascripts/acceptance/topic-notifications-button-test.js.es6 b/test/javascripts/acceptance/topic-notifications-button-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-notifications-button-test.js.es6
rename to test/javascripts/acceptance/topic-notifications-button-test.js
diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js
similarity index 100%
rename from test/javascripts/acceptance/topic-test.js.es6
rename to test/javascripts/acceptance/topic-test.js
diff --git a/test/javascripts/acceptance/unknown-test.js.es6 b/test/javascripts/acceptance/unknown-test.js
similarity index 100%
rename from test/javascripts/acceptance/unknown-test.js.es6
rename to test/javascripts/acceptance/unknown-test.js
diff --git a/test/javascripts/acceptance/user-anonymous-test.js.es6 b/test/javascripts/acceptance/user-anonymous-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-anonymous-test.js.es6
rename to test/javascripts/acceptance/user-anonymous-test.js
diff --git a/test/javascripts/acceptance/user-card-mobile-test.js.es6 b/test/javascripts/acceptance/user-card-mobile-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-card-mobile-test.js.es6
rename to test/javascripts/acceptance/user-card-mobile-test.js
diff --git a/test/javascripts/acceptance/user-card-test.js.es6 b/test/javascripts/acceptance/user-card-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-card-test.js.es6
rename to test/javascripts/acceptance/user-card-test.js
diff --git a/test/javascripts/acceptance/user-drafts-stream-test.js.es6 b/test/javascripts/acceptance/user-drafts-stream-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-drafts-stream-test.js.es6
rename to test/javascripts/acceptance/user-drafts-stream-test.js
diff --git a/test/javascripts/acceptance/user-test.js.es6 b/test/javascripts/acceptance/user-test.js
similarity index 100%
rename from test/javascripts/acceptance/user-test.js.es6
rename to test/javascripts/acceptance/user-test.js
diff --git a/test/javascripts/acceptance/users-test.js.es6 b/test/javascripts/acceptance/users-test.js
similarity index 100%
rename from test/javascripts/acceptance/users-test.js.es6
rename to test/javascripts/acceptance/users-test.js
diff --git a/test/javascripts/admin/components/group-list-setting-test.js.es6 b/test/javascripts/admin/components/group-list-setting-test.js
similarity index 100%
rename from test/javascripts/admin/components/group-list-setting-test.js.es6
rename to test/javascripts/admin/components/group-list-setting-test.js
diff --git a/test/javascripts/admin/components/themes-list-item-test.js.es6 b/test/javascripts/admin/components/themes-list-item-test.js
similarity index 100%
rename from test/javascripts/admin/components/themes-list-item-test.js.es6
rename to test/javascripts/admin/components/themes-list-item-test.js
diff --git a/test/javascripts/admin/components/themes-list-test.js.es6 b/test/javascripts/admin/components/themes-list-test.js
similarity index 100%
rename from test/javascripts/admin/components/themes-list-test.js.es6
rename to test/javascripts/admin/components/themes-list-test.js
diff --git a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js
similarity index 100%
rename from test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6
rename to test/javascripts/admin/controllers/admin-customize-themes-show-test.js
diff --git a/test/javascripts/admin/controllers/admin-customize-themes-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-test.js
similarity index 100%
rename from test/javascripts/admin/controllers/admin-customize-themes-test.js.es6
rename to test/javascripts/admin/controllers/admin-customize-themes-test.js
diff --git a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6 b/test/javascripts/admin/controllers/admin-user-badges-test.js
similarity index 100%
rename from test/javascripts/admin/controllers/admin-user-badges-test.js.es6
rename to test/javascripts/admin/controllers/admin-user-badges-test.js
diff --git a/test/javascripts/admin/models/theme-test.js.es6 b/test/javascripts/admin/models/theme-test.js
similarity index 100%
rename from test/javascripts/admin/models/theme-test.js.es6
rename to test/javascripts/admin/models/theme-test.js
diff --git a/test/javascripts/components/ace-editor-test.js.es6 b/test/javascripts/components/ace-editor-test.js
similarity index 100%
rename from test/javascripts/components/ace-editor-test.js.es6
rename to test/javascripts/components/ace-editor-test.js
diff --git a/test/javascripts/components/admin-report-test.js.es6 b/test/javascripts/components/admin-report-test.js
similarity index 100%
rename from test/javascripts/components/admin-report-test.js.es6
rename to test/javascripts/components/admin-report-test.js
diff --git a/test/javascripts/components/badge-title-test.js.es6 b/test/javascripts/components/badge-title-test.js
similarity index 100%
rename from test/javascripts/components/badge-title-test.js.es6
rename to test/javascripts/components/badge-title-test.js
diff --git a/test/javascripts/components/d-button-test.js.es6 b/test/javascripts/components/d-button-test.js
similarity index 100%
rename from test/javascripts/components/d-button-test.js.es6
rename to test/javascripts/components/d-button-test.js
diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js
similarity index 100%
rename from test/javascripts/components/d-editor-test.js.es6
rename to test/javascripts/components/d-editor-test.js
diff --git a/test/javascripts/components/d-icon-test.js.es6 b/test/javascripts/components/d-icon-test.js
similarity index 100%
rename from test/javascripts/components/d-icon-test.js.es6
rename to test/javascripts/components/d-icon-test.js
diff --git a/test/javascripts/components/date-input-test.js.es6 b/test/javascripts/components/date-input-test.js
similarity index 100%
rename from test/javascripts/components/date-input-test.js.es6
rename to test/javascripts/components/date-input-test.js
diff --git a/test/javascripts/components/date-time-input-range-test.js.es6 b/test/javascripts/components/date-time-input-range-test.js
similarity index 100%
rename from test/javascripts/components/date-time-input-range-test.js.es6
rename to test/javascripts/components/date-time-input-range-test.js
diff --git a/test/javascripts/components/date-time-input-test.js.es6 b/test/javascripts/components/date-time-input-test.js
similarity index 100%
rename from test/javascripts/components/date-time-input-test.js.es6
rename to test/javascripts/components/date-time-input-test.js
diff --git a/test/javascripts/components/group-membership-button-test.js.es6 b/test/javascripts/components/group-membership-button-test.js
similarity index 100%
rename from test/javascripts/components/group-membership-button-test.js.es6
rename to test/javascripts/components/group-membership-button-test.js
diff --git a/test/javascripts/components/html-safe-helper-test.js.es6 b/test/javascripts/components/html-safe-helper-test.js
similarity index 100%
rename from test/javascripts/components/html-safe-helper-test.js.es6
rename to test/javascripts/components/html-safe-helper-test.js
diff --git a/test/javascripts/components/iframed-html-test.js.es6 b/test/javascripts/components/iframed-html-test.js
similarity index 100%
rename from test/javascripts/components/iframed-html-test.js.es6
rename to test/javascripts/components/iframed-html-test.js
diff --git a/test/javascripts/components/image-uploader-test.js.es6 b/test/javascripts/components/image-uploader-test.js
similarity index 100%
rename from test/javascripts/components/image-uploader-test.js.es6
rename to test/javascripts/components/image-uploader-test.js
diff --git a/test/javascripts/components/keyboard-shortcuts-test.js.es6 b/test/javascripts/components/keyboard-shortcuts-test.js
similarity index 100%
rename from test/javascripts/components/keyboard-shortcuts-test.js.es6
rename to test/javascripts/components/keyboard-shortcuts-test.js
diff --git a/test/javascripts/components/load-more-test.js.es6 b/test/javascripts/components/load-more-test.js
similarity index 100%
rename from test/javascripts/components/load-more-test.js.es6
rename to test/javascripts/components/load-more-test.js
diff --git a/test/javascripts/components/secret-value-list-test.js.es6 b/test/javascripts/components/secret-value-list-test.js
similarity index 100%
rename from test/javascripts/components/secret-value-list-test.js.es6
rename to test/javascripts/components/secret-value-list-test.js
diff --git a/test/javascripts/components/select-kit/category-chooser-test.js.es6 b/test/javascripts/components/select-kit/category-chooser-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/category-chooser-test.js.es6
rename to test/javascripts/components/select-kit/category-chooser-test.js
diff --git a/test/javascripts/components/select-kit/category-drop-test.js.es6 b/test/javascripts/components/select-kit/category-drop-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/category-drop-test.js.es6
rename to test/javascripts/components/select-kit/category-drop-test.js
diff --git a/test/javascripts/components/select-kit/combo-box-test.js.es6 b/test/javascripts/components/select-kit/combo-box-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/combo-box-test.js.es6
rename to test/javascripts/components/select-kit/combo-box-test.js
diff --git a/test/javascripts/components/select-kit/dropdown-select-box-test.js.es6 b/test/javascripts/components/select-kit/dropdown-select-box-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/dropdown-select-box-test.js.es6
rename to test/javascripts/components/select-kit/dropdown-select-box-test.js
diff --git a/test/javascripts/components/select-kit/list-setting-test.js.es6 b/test/javascripts/components/select-kit/list-setting-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/list-setting-test.js.es6
rename to test/javascripts/components/select-kit/list-setting-test.js
diff --git a/test/javascripts/components/select-kit/mini-tag-chooser-test.js.es6 b/test/javascripts/components/select-kit/mini-tag-chooser-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/mini-tag-chooser-test.js.es6
rename to test/javascripts/components/select-kit/mini-tag-chooser-test.js
diff --git a/test/javascripts/components/select-kit/multi-select-test.js.es6 b/test/javascripts/components/select-kit/multi-select-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/multi-select-test.js.es6
rename to test/javascripts/components/select-kit/multi-select-test.js
diff --git a/test/javascripts/components/select-kit/notifications-button-test.js.es6 b/test/javascripts/components/select-kit/notifications-button-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/notifications-button-test.js.es6
rename to test/javascripts/components/select-kit/notifications-button-test.js
diff --git a/test/javascripts/components/select-kit/pinned-options-test.js.es6 b/test/javascripts/components/select-kit/pinned-options-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/pinned-options-test.js.es6
rename to test/javascripts/components/select-kit/pinned-options-test.js
diff --git a/test/javascripts/components/select-kit/select-kit-test-helper.js.es6 b/test/javascripts/components/select-kit/select-kit-test-helper.js
similarity index 100%
rename from test/javascripts/components/select-kit/select-kit-test-helper.js.es6
rename to test/javascripts/components/select-kit/select-kit-test-helper.js
diff --git a/test/javascripts/components/select-kit/single-select-test.js.es6 b/test/javascripts/components/select-kit/single-select-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/single-select-test.js.es6
rename to test/javascripts/components/select-kit/single-select-test.js
diff --git a/test/javascripts/components/select-kit/tag-drop-test.js.es6 b/test/javascripts/components/select-kit/tag-drop-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/tag-drop-test.js.es6
rename to test/javascripts/components/select-kit/tag-drop-test.js
diff --git a/test/javascripts/components/select-kit/topic-notifications-button-test.js.es6 b/test/javascripts/components/select-kit/topic-notifications-button-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/topic-notifications-button-test.js.es6
rename to test/javascripts/components/select-kit/topic-notifications-button-test.js
diff --git a/test/javascripts/components/select-kit/topic-notifications-options-test.js.es6 b/test/javascripts/components/select-kit/topic-notifications-options-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/topic-notifications-options-test.js.es6
rename to test/javascripts/components/select-kit/topic-notifications-options-test.js
diff --git a/test/javascripts/components/select-kit/user-chooser-test.js.es6 b/test/javascripts/components/select-kit/user-chooser-test.js
similarity index 100%
rename from test/javascripts/components/select-kit/user-chooser-test.js.es6
rename to test/javascripts/components/select-kit/user-chooser-test.js
diff --git a/test/javascripts/components/share-button-test.js.es6 b/test/javascripts/components/share-button-test.js
similarity index 100%
rename from test/javascripts/components/share-button-test.js.es6
rename to test/javascripts/components/share-button-test.js
diff --git a/test/javascripts/components/share-button.js.es6 b/test/javascripts/components/share-button.js
similarity index 100%
rename from test/javascripts/components/share-button.js.es6
rename to test/javascripts/components/share-button.js
diff --git a/test/javascripts/components/text-field-test.js.es6 b/test/javascripts/components/text-field-test.js
similarity index 100%
rename from test/javascripts/components/text-field-test.js.es6
rename to test/javascripts/components/text-field-test.js
diff --git a/test/javascripts/components/text-overflow-test.js.es6 b/test/javascripts/components/text-overflow-test.js
similarity index 100%
rename from test/javascripts/components/text-overflow-test.js.es6
rename to test/javascripts/components/text-overflow-test.js
diff --git a/test/javascripts/components/time-input-test.js.es6 b/test/javascripts/components/time-input-test.js
similarity index 100%
rename from test/javascripts/components/time-input-test.js.es6
rename to test/javascripts/components/time-input-test.js
diff --git a/test/javascripts/components/user-selector-test.js.es6 b/test/javascripts/components/user-selector-test.js
similarity index 100%
rename from test/javascripts/components/user-selector-test.js.es6
rename to test/javascripts/components/user-selector-test.js
diff --git a/test/javascripts/components/value-list-test.js.es6 b/test/javascripts/components/value-list-test.js
similarity index 100%
rename from test/javascripts/components/value-list-test.js.es6
rename to test/javascripts/components/value-list-test.js
diff --git a/test/javascripts/controllers/avatar-selector-test.js.es6 b/test/javascripts/controllers/avatar-selector-test.js
similarity index 100%
rename from test/javascripts/controllers/avatar-selector-test.js.es6
rename to test/javascripts/controllers/avatar-selector-test.js
diff --git a/test/javascripts/controllers/bookmark-test.js.es6 b/test/javascripts/controllers/bookmark-test.js
similarity index 100%
rename from test/javascripts/controllers/bookmark-test.js.es6
rename to test/javascripts/controllers/bookmark-test.js
diff --git a/test/javascripts/controllers/create-account-test.js.es6 b/test/javascripts/controllers/create-account-test.js
similarity index 100%
rename from test/javascripts/controllers/create-account-test.js.es6
rename to test/javascripts/controllers/create-account-test.js
diff --git a/test/javascripts/controllers/group-test.js.es6 b/test/javascripts/controllers/group-test.js
similarity index 100%
rename from test/javascripts/controllers/group-test.js.es6
rename to test/javascripts/controllers/group-test.js
diff --git a/test/javascripts/controllers/history-test.js.es6 b/test/javascripts/controllers/history-test.js
similarity index 100%
rename from test/javascripts/controllers/history-test.js.es6
rename to test/javascripts/controllers/history-test.js
diff --git a/test/javascripts/controllers/preferences-account-test.js.es6 b/test/javascripts/controllers/preferences-account-test.js
similarity index 100%
rename from test/javascripts/controllers/preferences-account-test.js.es6
rename to test/javascripts/controllers/preferences-account-test.js
diff --git a/test/javascripts/controllers/preferences-second-factor-test.js.es6 b/test/javascripts/controllers/preferences-second-factor-test.js
similarity index 100%
rename from test/javascripts/controllers/preferences-second-factor-test.js.es6
rename to test/javascripts/controllers/preferences-second-factor-test.js
diff --git a/test/javascripts/controllers/reorder-categories-test.js.es6 b/test/javascripts/controllers/reorder-categories-test.js
similarity index 100%
rename from test/javascripts/controllers/reorder-categories-test.js.es6
rename to test/javascripts/controllers/reorder-categories-test.js
diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js
similarity index 100%
rename from test/javascripts/controllers/topic-test.js.es6
rename to test/javascripts/controllers/topic-test.js
diff --git a/test/javascripts/ember/resolver-test.js.es6 b/test/javascripts/ember/resolver-test.js
similarity index 100%
rename from test/javascripts/ember/resolver-test.js.es6
rename to test/javascripts/ember/resolver-test.js
diff --git a/test/javascripts/fixtures/about.js.es6 b/test/javascripts/fixtures/about.js
similarity index 100%
rename from test/javascripts/fixtures/about.js.es6
rename to test/javascripts/fixtures/about.js
diff --git a/test/javascripts/fixtures/badges_fixture.js.es6 b/test/javascripts/fixtures/badges_fixture.js
similarity index 100%
rename from test/javascripts/fixtures/badges_fixture.js.es6
rename to test/javascripts/fixtures/badges_fixture.js
diff --git a/test/javascripts/fixtures/category-fixtures.js.es6 b/test/javascripts/fixtures/category-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/category-fixtures.js.es6
rename to test/javascripts/fixtures/category-fixtures.js
diff --git a/test/javascripts/fixtures/concerns/notification-types.js.es6.erb b/test/javascripts/fixtures/concerns/notification-types.js.erb
similarity index 100%
rename from test/javascripts/fixtures/concerns/notification-types.js.es6.erb
rename to test/javascripts/fixtures/concerns/notification-types.js.erb
diff --git a/test/javascripts/fixtures/dashboard-general.js.es6 b/test/javascripts/fixtures/dashboard-general.js
similarity index 100%
rename from test/javascripts/fixtures/dashboard-general.js.es6
rename to test/javascripts/fixtures/dashboard-general.js
diff --git a/test/javascripts/fixtures/dashboard.js.es6 b/test/javascripts/fixtures/dashboard.js
similarity index 100%
rename from test/javascripts/fixtures/dashboard.js.es6
rename to test/javascripts/fixtures/dashboard.js
diff --git a/test/javascripts/fixtures/directory-fixtures.js.es6 b/test/javascripts/fixtures/directory-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/directory-fixtures.js.es6
rename to test/javascripts/fixtures/directory-fixtures.js
diff --git a/test/javascripts/fixtures/discovery_fixtures.js.es6 b/test/javascripts/fixtures/discovery_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/discovery_fixtures.js.es6
rename to test/javascripts/fixtures/discovery_fixtures.js
diff --git a/test/javascripts/fixtures/draft.js.es6 b/test/javascripts/fixtures/draft.js
similarity index 100%
rename from test/javascripts/fixtures/draft.js.es6
rename to test/javascripts/fixtures/draft.js
diff --git a/test/javascripts/fixtures/drafts.js.es6 b/test/javascripts/fixtures/drafts.js
similarity index 100%
rename from test/javascripts/fixtures/drafts.js.es6
rename to test/javascripts/fixtures/drafts.js
diff --git a/test/javascripts/fixtures/group-fixtures.js.es6 b/test/javascripts/fixtures/group-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/group-fixtures.js.es6
rename to test/javascripts/fixtures/group-fixtures.js
diff --git a/test/javascripts/fixtures/groups-fixtures.js.es6 b/test/javascripts/fixtures/groups-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/groups-fixtures.js.es6
rename to test/javascripts/fixtures/groups-fixtures.js
diff --git a/test/javascripts/fixtures/notification_fixtures.js.es6 b/test/javascripts/fixtures/notification_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/notification_fixtures.js.es6
rename to test/javascripts/fixtures/notification_fixtures.js
diff --git a/test/javascripts/fixtures/poll.js.es6 b/test/javascripts/fixtures/poll.js
similarity index 100%
rename from test/javascripts/fixtures/poll.js.es6
rename to test/javascripts/fixtures/poll.js
diff --git a/test/javascripts/fixtures/post.js.es6 b/test/javascripts/fixtures/post.js
similarity index 100%
rename from test/javascripts/fixtures/post.js.es6
rename to test/javascripts/fixtures/post.js
diff --git a/test/javascripts/fixtures/private_messages_fixtures.js.es6 b/test/javascripts/fixtures/private_messages_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/private_messages_fixtures.js.es6
rename to test/javascripts/fixtures/private_messages_fixtures.js
diff --git a/test/javascripts/fixtures/problems.js.es6 b/test/javascripts/fixtures/problems.js
similarity index 100%
rename from test/javascripts/fixtures/problems.js.es6
rename to test/javascripts/fixtures/problems.js
diff --git a/test/javascripts/fixtures/reports.js.es6 b/test/javascripts/fixtures/reports.js
similarity index 100%
rename from test/javascripts/fixtures/reports.js.es6
rename to test/javascripts/fixtures/reports.js
diff --git a/test/javascripts/fixtures/reports_bulk.js.es6 b/test/javascripts/fixtures/reports_bulk.js
similarity index 100%
rename from test/javascripts/fixtures/reports_bulk.js.es6
rename to test/javascripts/fixtures/reports_bulk.js
diff --git a/test/javascripts/fixtures/search-fixtures.js.es6 b/test/javascripts/fixtures/search-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/search-fixtures.js.es6
rename to test/javascripts/fixtures/search-fixtures.js
diff --git a/test/javascripts/fixtures/session-fixtures.js.es6 b/test/javascripts/fixtures/session-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/session-fixtures.js.es6
rename to test/javascripts/fixtures/session-fixtures.js
diff --git a/test/javascripts/fixtures/site-fixtures.js.es6 b/test/javascripts/fixtures/site-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/site-fixtures.js.es6
rename to test/javascripts/fixtures/site-fixtures.js
diff --git a/test/javascripts/fixtures/site_settings.js.es6 b/test/javascripts/fixtures/site_settings.js
similarity index 100%
rename from test/javascripts/fixtures/site_settings.js.es6
rename to test/javascripts/fixtures/site_settings.js
diff --git a/test/javascripts/fixtures/static_fixtures.js.es6 b/test/javascripts/fixtures/static_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/static_fixtures.js.es6
rename to test/javascripts/fixtures/static_fixtures.js
diff --git a/test/javascripts/fixtures/top_fixture.js.es6 b/test/javascripts/fixtures/top_fixture.js
similarity index 100%
rename from test/javascripts/fixtures/top_fixture.js.es6
rename to test/javascripts/fixtures/top_fixture.js
diff --git a/test/javascripts/fixtures/topic.js.es6 b/test/javascripts/fixtures/topic.js
similarity index 100%
rename from test/javascripts/fixtures/topic.js.es6
rename to test/javascripts/fixtures/topic.js
diff --git a/test/javascripts/fixtures/user-badges.js.es6 b/test/javascripts/fixtures/user-badges.js
similarity index 100%
rename from test/javascripts/fixtures/user-badges.js.es6
rename to test/javascripts/fixtures/user-badges.js
diff --git a/test/javascripts/fixtures/user_fixtures.js.es6 b/test/javascripts/fixtures/user_fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/user_fixtures.js.es6
rename to test/javascripts/fixtures/user_fixtures.js
diff --git a/test/javascripts/fixtures/watched-words-fixtures.js.es6 b/test/javascripts/fixtures/watched-words-fixtures.js
similarity index 100%
rename from test/javascripts/fixtures/watched-words-fixtures.js.es6
rename to test/javascripts/fixtures/watched-words-fixtures.js
diff --git a/test/javascripts/helpers/assertions.js b/test/javascripts/helpers/assertions.js
index 95d7b2a7dd..81fbd40b1b 100644
--- a/test/javascripts/helpers/assertions.js
+++ b/test/javascripts/helpers/assertions.js
@@ -1,5 +1,4 @@
-/* exported exists, count, present, blank, containsInstance, not, visible, invisible */
-
+// discourse-skip-module
 function exists(selector) {
   return count(selector) > 0;
 }
@@ -13,8 +12,10 @@ function visible(selector) {
 }
 
 function invisible(selector) {
-  var $items = find(selector + ":visible");
-  return $items.length === 0 ||
-         $items.css("opacity") === "0" ||
-         $items.css("visibility") === "hidden";
+  const $items = find(selector + ":visible");
+  return (
+    $items.length === 0 ||
+    $items.css("opacity") === "0" ||
+    $items.css("visibility") === "hidden"
+  );
 }
diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js
similarity index 100%
rename from test/javascripts/helpers/component-test.js.es6
rename to test/javascripts/helpers/component-test.js
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js
similarity index 100%
rename from test/javascripts/helpers/create-pretender.js.es6
rename to test/javascripts/helpers/create-pretender.js
diff --git a/test/javascripts/helpers/create-store.js.es6 b/test/javascripts/helpers/create-store.js
similarity index 100%
rename from test/javascripts/helpers/create-store.js.es6
rename to test/javascripts/helpers/create-store.js
diff --git a/test/javascripts/helpers/d-editor-helper.js.es6 b/test/javascripts/helpers/d-editor-helper.js
similarity index 100%
rename from test/javascripts/helpers/d-editor-helper.js.es6
rename to test/javascripts/helpers/d-editor-helper.js
diff --git a/test/javascripts/helpers/fixture-pretender.js.es6 b/test/javascripts/helpers/fixture-pretender.js
similarity index 100%
rename from test/javascripts/helpers/fixture-pretender.js.es6
rename to test/javascripts/helpers/fixture-pretender.js
diff --git a/test/javascripts/helpers/html-helper.js.es6 b/test/javascripts/helpers/html-helper.js
similarity index 100%
rename from test/javascripts/helpers/html-helper.js.es6
rename to test/javascripts/helpers/html-helper.js
diff --git a/test/javascripts/helpers/init-ember-qunit.js b/test/javascripts/helpers/init-ember-qunit.js
deleted file mode 100644
index 32d0184e7d..0000000000
--- a/test/javascripts/helpers/init-ember-qunit.js
+++ /dev/null
@@ -1,2 +0,0 @@
-var buildResolver = require('discourse-common/resolver').buildResolver;
-window.setResolver(buildResolver('discourse').create({ namespace: Discourse }));
diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js
similarity index 100%
rename from test/javascripts/helpers/qunit-helpers.js.es6
rename to test/javascripts/helpers/qunit-helpers.js
diff --git a/test/javascripts/helpers/review-pretender.js.es6 b/test/javascripts/helpers/review-pretender.js
similarity index 100%
rename from test/javascripts/helpers/review-pretender.js.es6
rename to test/javascripts/helpers/review-pretender.js
diff --git a/test/javascripts/helpers/select-kit-helper.js.es6 b/test/javascripts/helpers/select-kit-helper.js
similarity index 100%
rename from test/javascripts/helpers/select-kit-helper.js.es6
rename to test/javascripts/helpers/select-kit-helper.js
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index 621aa3d6ac..c39424b0df 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -1,4 +1,5 @@
-/*jshint maxlen:10000000 */
+// discourse-skip-module
+
 Discourse.SiteSettingsOriginal = {
   title: "QUnit Discourse Tests",
   site_logo_url: "/assets/logo.png",
@@ -12,8 +13,10 @@ Discourse.SiteSettingsOriginal = {
   ga_universal_tracking_code: "",
   ga_universal_domain_name: "auto",
   top_menu: "latest|new|unread|categories|top",
-  post_menu: "like|share|flag|edit|bookmark|bookmarkWithReminder|delete|admin|reply",
-  post_menu_hidden_items: "flag|bookmark|bookmarkWithReminder|edit|delete|admin",
+  post_menu:
+    "like|share|flag|edit|bookmark|bookmarkWithReminder|delete|admin|reply",
+  post_menu_hidden_items:
+    "flag|bookmark|bookmarkWithReminder|edit|delete|admin",
   share_links: "twitter|facebook|email",
   category_colors:
     "BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|27AA5B|B3B5B4|E45735",
@@ -102,6 +105,7 @@ Discourse.SiteSettingsOriginal = {
   unicode_usernames: false,
   secure_media: false
 };
+
 Discourse.SiteSettings = jQuery.extend(
   true,
   {},
diff --git a/test/javascripts/helpers/site.js.es6 b/test/javascripts/helpers/site.js
similarity index 100%
rename from test/javascripts/helpers/site.js.es6
rename to test/javascripts/helpers/site.js
diff --git a/test/javascripts/helpers/store-pretender.js.es6 b/test/javascripts/helpers/store-pretender.js
similarity index 100%
rename from test/javascripts/helpers/store-pretender.js.es6
rename to test/javascripts/helpers/store-pretender.js
diff --git a/test/javascripts/helpers/textarea-selection-helper.js.es6 b/test/javascripts/helpers/textarea-selection-helper.js
similarity index 100%
rename from test/javascripts/helpers/textarea-selection-helper.js.es6
rename to test/javascripts/helpers/textarea-selection-helper.js
diff --git a/test/javascripts/helpers/widget-test.js.es6 b/test/javascripts/helpers/widget-test.js
similarity index 100%
rename from test/javascripts/helpers/widget-test.js.es6
rename to test/javascripts/helpers/widget-test.js
diff --git a/test/javascripts/initializers/localization-test.js.es6 b/test/javascripts/initializers/localization-test.js
similarity index 100%
rename from test/javascripts/initializers/localization-test.js.es6
rename to test/javascripts/initializers/localization-test.js
diff --git a/test/javascripts/lib/bbcode-test.js.es6 b/test/javascripts/lib/bbcode-test.js
similarity index 100%
rename from test/javascripts/lib/bbcode-test.js.es6
rename to test/javascripts/lib/bbcode-test.js
diff --git a/test/javascripts/lib/break-string-test.js.es6 b/test/javascripts/lib/break-string-test.js
similarity index 100%
rename from test/javascripts/lib/break-string-test.js.es6
rename to test/javascripts/lib/break-string-test.js
diff --git a/test/javascripts/lib/category-badge-test.js.es6 b/test/javascripts/lib/category-badge-test.js
similarity index 100%
rename from test/javascripts/lib/category-badge-test.js.es6
rename to test/javascripts/lib/category-badge-test.js
diff --git a/test/javascripts/lib/click-track-edit-history-test.js.es6 b/test/javascripts/lib/click-track-edit-history-test.js
similarity index 100%
rename from test/javascripts/lib/click-track-edit-history-test.js.es6
rename to test/javascripts/lib/click-track-edit-history-test.js
diff --git a/test/javascripts/lib/click-track-profile-page-test.js.es6 b/test/javascripts/lib/click-track-profile-page-test.js
similarity index 100%
rename from test/javascripts/lib/click-track-profile-page-test.js.es6
rename to test/javascripts/lib/click-track-profile-page-test.js
diff --git a/test/javascripts/lib/click-track-test.js.es6 b/test/javascripts/lib/click-track-test.js
similarity index 100%
rename from test/javascripts/lib/click-track-test.js.es6
rename to test/javascripts/lib/click-track-test.js
diff --git a/test/javascripts/lib/computed-test.js.es6 b/test/javascripts/lib/computed-test.js
similarity index 100%
rename from test/javascripts/lib/computed-test.js.es6
rename to test/javascripts/lib/computed-test.js
diff --git a/test/javascripts/lib/discourse-test.js.es6 b/test/javascripts/lib/discourse-test.js
similarity index 100%
rename from test/javascripts/lib/discourse-test.js.es6
rename to test/javascripts/lib/discourse-test.js
diff --git a/test/javascripts/lib/emoji-store-test.js.es6 b/test/javascripts/lib/emoji-store-test.js
similarity index 100%
rename from test/javascripts/lib/emoji-store-test.js.es6
rename to test/javascripts/lib/emoji-store-test.js
diff --git a/test/javascripts/lib/emoji-test.js.es6 b/test/javascripts/lib/emoji-test.js
similarity index 100%
rename from test/javascripts/lib/emoji-test.js.es6
rename to test/javascripts/lib/emoji-test.js
diff --git a/test/javascripts/lib/formatter-test.js.es6 b/test/javascripts/lib/formatter-test.js
similarity index 100%
rename from test/javascripts/lib/formatter-test.js.es6
rename to test/javascripts/lib/formatter-test.js
diff --git a/test/javascripts/lib/highlight-text-test.js.es6 b/test/javascripts/lib/highlight-text-test.js
similarity index 100%
rename from test/javascripts/lib/highlight-text-test.js.es6
rename to test/javascripts/lib/highlight-text-test.js
diff --git a/test/javascripts/lib/i18n-test.js.es6 b/test/javascripts/lib/i18n-test.js
similarity index 100%
rename from test/javascripts/lib/i18n-test.js.es6
rename to test/javascripts/lib/i18n-test.js
diff --git a/test/javascripts/lib/icon-library-test.js.es6 b/test/javascripts/lib/icon-library-test.js
similarity index 100%
rename from test/javascripts/lib/icon-library-test.js.es6
rename to test/javascripts/lib/icon-library-test.js
diff --git a/test/javascripts/lib/key-value-store-test.js.es6 b/test/javascripts/lib/key-value-store-test.js
similarity index 100%
rename from test/javascripts/lib/key-value-store-test.js.es6
rename to test/javascripts/lib/key-value-store-test.js
diff --git a/test/javascripts/lib/link-mentions-test.js.es6 b/test/javascripts/lib/link-mentions-test.js
similarity index 100%
rename from test/javascripts/lib/link-mentions-test.js.es6
rename to test/javascripts/lib/link-mentions-test.js
diff --git a/test/javascripts/lib/load-script-test.js.es6 b/test/javascripts/lib/load-script-test.js
similarity index 100%
rename from test/javascripts/lib/load-script-test.js.es6
rename to test/javascripts/lib/load-script-test.js
diff --git a/test/javascripts/lib/oneboxer-test.js.es6 b/test/javascripts/lib/oneboxer-test.js
similarity index 100%
rename from test/javascripts/lib/oneboxer-test.js.es6
rename to test/javascripts/lib/oneboxer-test.js
diff --git a/test/javascripts/lib/preload-store-test.js.es6 b/test/javascripts/lib/preload-store-test.js
similarity index 100%
rename from test/javascripts/lib/preload-store-test.js.es6
rename to test/javascripts/lib/preload-store-test.js
diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js
similarity index 100%
rename from test/javascripts/lib/pretty-text-test.js.es6
rename to test/javascripts/lib/pretty-text-test.js
diff --git a/test/javascripts/lib/sanitizer-test.js.es6 b/test/javascripts/lib/sanitizer-test.js
similarity index 100%
rename from test/javascripts/lib/sanitizer-test.js.es6
rename to test/javascripts/lib/sanitizer-test.js
diff --git a/test/javascripts/lib/screen-track-test.js.es6 b/test/javascripts/lib/screen-track-test.js
similarity index 100%
rename from test/javascripts/lib/screen-track-test.js.es6
rename to test/javascripts/lib/screen-track-test.js
diff --git a/test/javascripts/lib/search-test.js.es6 b/test/javascripts/lib/search-test.js
similarity index 100%
rename from test/javascripts/lib/search-test.js.es6
rename to test/javascripts/lib/search-test.js
diff --git a/test/javascripts/lib/sharing-test.js.es6 b/test/javascripts/lib/sharing-test.js
similarity index 100%
rename from test/javascripts/lib/sharing-test.js.es6
rename to test/javascripts/lib/sharing-test.js
diff --git a/test/javascripts/lib/text-direction-test.js.es6 b/test/javascripts/lib/text-direction-test.js
similarity index 100%
rename from test/javascripts/lib/text-direction-test.js.es6
rename to test/javascripts/lib/text-direction-test.js
diff --git a/test/javascripts/lib/to-markdown-test.js.es6 b/test/javascripts/lib/to-markdown-test.js
similarity index 100%
rename from test/javascripts/lib/to-markdown-test.js.es6
rename to test/javascripts/lib/to-markdown-test.js
diff --git a/test/javascripts/lib/tooltip-test.js.es6 b/test/javascripts/lib/tooltip-test.js
similarity index 100%
rename from test/javascripts/lib/tooltip-test.js.es6
rename to test/javascripts/lib/tooltip-test.js
diff --git a/test/javascripts/lib/upload-short-url-test.js.es6 b/test/javascripts/lib/upload-short-url-test.js
similarity index 100%
rename from test/javascripts/lib/upload-short-url-test.js.es6
rename to test/javascripts/lib/upload-short-url-test.js
diff --git a/test/javascripts/lib/uploads-test.js.es6 b/test/javascripts/lib/uploads-test.js
similarity index 100%
rename from test/javascripts/lib/uploads-test.js.es6
rename to test/javascripts/lib/uploads-test.js
diff --git a/test/javascripts/lib/url-test.js.es6 b/test/javascripts/lib/url-test.js
similarity index 100%
rename from test/javascripts/lib/url-test.js.es6
rename to test/javascripts/lib/url-test.js
diff --git a/test/javascripts/lib/user-search-test.js.es6 b/test/javascripts/lib/user-search-test.js
similarity index 100%
rename from test/javascripts/lib/user-search-test.js.es6
rename to test/javascripts/lib/user-search-test.js
diff --git a/test/javascripts/lib/utilities-test.js.es6 b/test/javascripts/lib/utilities-test.js
similarity index 100%
rename from test/javascripts/lib/utilities-test.js.es6
rename to test/javascripts/lib/utilities-test.js
diff --git a/test/javascripts/lib/white-lister-test.js.es6 b/test/javascripts/lib/white-lister-test.js
similarity index 100%
rename from test/javascripts/lib/white-lister-test.js.es6
rename to test/javascripts/lib/white-lister-test.js
diff --git a/test/javascripts/mixins/grant-badge-controller-test.js.es6 b/test/javascripts/mixins/grant-badge-controller-test.js
similarity index 100%
rename from test/javascripts/mixins/grant-badge-controller-test.js.es6
rename to test/javascripts/mixins/grant-badge-controller-test.js
diff --git a/test/javascripts/mixins/setting-object-test.js.es6 b/test/javascripts/mixins/setting-object-test.js
similarity index 100%
rename from test/javascripts/mixins/setting-object-test.js.es6
rename to test/javascripts/mixins/setting-object-test.js
diff --git a/test/javascripts/mixins/singleton-test.js.es6 b/test/javascripts/mixins/singleton-test.js
similarity index 100%
rename from test/javascripts/mixins/singleton-test.js.es6
rename to test/javascripts/mixins/singleton-test.js
diff --git a/test/javascripts/models/badge-test.js.es6 b/test/javascripts/models/badge-test.js
similarity index 100%
rename from test/javascripts/models/badge-test.js.es6
rename to test/javascripts/models/badge-test.js
diff --git a/test/javascripts/models/category-test.js.es6 b/test/javascripts/models/category-test.js
similarity index 100%
rename from test/javascripts/models/category-test.js.es6
rename to test/javascripts/models/category-test.js
diff --git a/test/javascripts/models/composer-test.js.es6 b/test/javascripts/models/composer-test.js
similarity index 100%
rename from test/javascripts/models/composer-test.js.es6
rename to test/javascripts/models/composer-test.js
diff --git a/test/javascripts/models/email-log-test.js.es6 b/test/javascripts/models/email-log-test.js
similarity index 100%
rename from test/javascripts/models/email-log-test.js.es6
rename to test/javascripts/models/email-log-test.js
diff --git a/test/javascripts/models/group-test.js.es6 b/test/javascripts/models/group-test.js
similarity index 100%
rename from test/javascripts/models/group-test.js.es6
rename to test/javascripts/models/group-test.js
diff --git a/test/javascripts/models/invite-test.js.es6 b/test/javascripts/models/invite-test.js
similarity index 100%
rename from test/javascripts/models/invite-test.js.es6
rename to test/javascripts/models/invite-test.js
diff --git a/test/javascripts/models/nav-item-test.js.es6 b/test/javascripts/models/nav-item-test.js
similarity index 100%
rename from test/javascripts/models/nav-item-test.js.es6
rename to test/javascripts/models/nav-item-test.js
diff --git a/test/javascripts/models/post-stream-test.js.es6 b/test/javascripts/models/post-stream-test.js
similarity index 100%
rename from test/javascripts/models/post-stream-test.js.es6
rename to test/javascripts/models/post-stream-test.js
diff --git a/test/javascripts/models/post-test.js.es6 b/test/javascripts/models/post-test.js
similarity index 100%
rename from test/javascripts/models/post-test.js.es6
rename to test/javascripts/models/post-test.js
diff --git a/test/javascripts/models/report-test.js.es6 b/test/javascripts/models/report-test.js
similarity index 100%
rename from test/javascripts/models/report-test.js.es6
rename to test/javascripts/models/report-test.js
diff --git a/test/javascripts/models/rest-model-test.js.es6 b/test/javascripts/models/rest-model-test.js
similarity index 100%
rename from test/javascripts/models/rest-model-test.js.es6
rename to test/javascripts/models/rest-model-test.js
diff --git a/test/javascripts/models/result-set-test.js.es6 b/test/javascripts/models/result-set-test.js
similarity index 100%
rename from test/javascripts/models/result-set-test.js.es6
rename to test/javascripts/models/result-set-test.js
diff --git a/test/javascripts/models/session-test.js.es6 b/test/javascripts/models/session-test.js
similarity index 100%
rename from test/javascripts/models/session-test.js.es6
rename to test/javascripts/models/session-test.js
diff --git a/test/javascripts/models/site-test.js.es6 b/test/javascripts/models/site-test.js
similarity index 100%
rename from test/javascripts/models/site-test.js.es6
rename to test/javascripts/models/site-test.js
diff --git a/test/javascripts/models/staff-action-log-test.js.es6 b/test/javascripts/models/staff-action-log-test.js
similarity index 100%
rename from test/javascripts/models/staff-action-log-test.js.es6
rename to test/javascripts/models/staff-action-log-test.js
diff --git a/test/javascripts/models/store-test.js.es6 b/test/javascripts/models/store-test.js
similarity index 100%
rename from test/javascripts/models/store-test.js.es6
rename to test/javascripts/models/store-test.js
diff --git a/test/javascripts/models/topic-details-test.js.es6 b/test/javascripts/models/topic-details-test.js
similarity index 100%
rename from test/javascripts/models/topic-details-test.js.es6
rename to test/javascripts/models/topic-details-test.js
diff --git a/test/javascripts/models/topic-test.js.es6 b/test/javascripts/models/topic-test.js
similarity index 100%
rename from test/javascripts/models/topic-test.js.es6
rename to test/javascripts/models/topic-test.js
diff --git a/test/javascripts/models/topic-tracking-state-test.js.es6 b/test/javascripts/models/topic-tracking-state-test.js
similarity index 100%
rename from test/javascripts/models/topic-tracking-state-test.js.es6
rename to test/javascripts/models/topic-tracking-state-test.js
diff --git a/test/javascripts/models/user-action-test.js.es6 b/test/javascripts/models/user-action-test.js
similarity index 100%
rename from test/javascripts/models/user-action-test.js.es6
rename to test/javascripts/models/user-action-test.js
diff --git a/test/javascripts/models/user-badge-test.js.es6 b/test/javascripts/models/user-badge-test.js
similarity index 100%
rename from test/javascripts/models/user-badge-test.js.es6
rename to test/javascripts/models/user-badge-test.js
diff --git a/test/javascripts/models/user-drafts-test.js.es6 b/test/javascripts/models/user-drafts-test.js
similarity index 100%
rename from test/javascripts/models/user-drafts-test.js.es6
rename to test/javascripts/models/user-drafts-test.js
diff --git a/test/javascripts/models/user-stream-test.js.es6 b/test/javascripts/models/user-stream-test.js
similarity index 100%
rename from test/javascripts/models/user-stream-test.js.es6
rename to test/javascripts/models/user-stream-test.js
diff --git a/test/javascripts/models/user-test.js.es6 b/test/javascripts/models/user-test.js
similarity index 100%
rename from test/javascripts/models/user-test.js.es6
rename to test/javascripts/models/user-test.js
diff --git a/test/javascripts/utils/decorators-test.js.es6 b/test/javascripts/utils/decorators-test.js
similarity index 100%
rename from test/javascripts/utils/decorators-test.js.es6
rename to test/javascripts/utils/decorators-test.js
diff --git a/test/javascripts/widgets/actions-summary-test.js.es6 b/test/javascripts/widgets/actions-summary-test.js
similarity index 100%
rename from test/javascripts/widgets/actions-summary-test.js.es6
rename to test/javascripts/widgets/actions-summary-test.js
diff --git a/test/javascripts/widgets/avatar-flair-test.js.es6 b/test/javascripts/widgets/avatar-flair-test.js
similarity index 100%
rename from test/javascripts/widgets/avatar-flair-test.js.es6
rename to test/javascripts/widgets/avatar-flair-test.js
diff --git a/test/javascripts/widgets/button-test.js.es6 b/test/javascripts/widgets/button-test.js
similarity index 100%
rename from test/javascripts/widgets/button-test.js.es6
rename to test/javascripts/widgets/button-test.js
diff --git a/test/javascripts/widgets/default-notification-item-test.js.es6 b/test/javascripts/widgets/default-notification-item-test.js
similarity index 100%
rename from test/javascripts/widgets/default-notification-item-test.js.es6
rename to test/javascripts/widgets/default-notification-item-test.js
diff --git a/test/javascripts/widgets/hamburger-menu-test.js.es6 b/test/javascripts/widgets/hamburger-menu-test.js
similarity index 100%
rename from test/javascripts/widgets/hamburger-menu-test.js.es6
rename to test/javascripts/widgets/hamburger-menu-test.js
diff --git a/test/javascripts/widgets/header-test.js.es6 b/test/javascripts/widgets/header-test.js
similarity index 100%
rename from test/javascripts/widgets/header-test.js.es6
rename to test/javascripts/widgets/header-test.js
diff --git a/test/javascripts/widgets/home-logo-test.js.es6 b/test/javascripts/widgets/home-logo-test.js
similarity index 100%
rename from test/javascripts/widgets/home-logo-test.js.es6
rename to test/javascripts/widgets/home-logo-test.js
diff --git a/test/javascripts/widgets/post-links-test.js.es6 b/test/javascripts/widgets/post-links-test.js
similarity index 100%
rename from test/javascripts/widgets/post-links-test.js.es6
rename to test/javascripts/widgets/post-links-test.js
diff --git a/test/javascripts/widgets/post-stream-test.js.es6 b/test/javascripts/widgets/post-stream-test.js
similarity index 100%
rename from test/javascripts/widgets/post-stream-test.js.es6
rename to test/javascripts/widgets/post-stream-test.js
diff --git a/test/javascripts/widgets/post-test.js.es6 b/test/javascripts/widgets/post-test.js
similarity index 100%
rename from test/javascripts/widgets/post-test.js.es6
rename to test/javascripts/widgets/post-test.js
diff --git a/test/javascripts/widgets/poster-name-test.js.es6 b/test/javascripts/widgets/poster-name-test.js
similarity index 100%
rename from test/javascripts/widgets/poster-name-test.js.es6
rename to test/javascripts/widgets/poster-name-test.js
diff --git a/test/javascripts/widgets/quick-access-item-test.js.es6 b/test/javascripts/widgets/quick-access-item-test.js
similarity index 100%
rename from test/javascripts/widgets/quick-access-item-test.js.es6
rename to test/javascripts/widgets/quick-access-item-test.js
diff --git a/test/javascripts/widgets/topic-admin-menu-test.js.es6 b/test/javascripts/widgets/topic-admin-menu-test.js
similarity index 100%
rename from test/javascripts/widgets/topic-admin-menu-test.js.es6
rename to test/javascripts/widgets/topic-admin-menu-test.js
diff --git a/test/javascripts/widgets/topic-participant-test.js.es6 b/test/javascripts/widgets/topic-participant-test.js
similarity index 100%
rename from test/javascripts/widgets/topic-participant-test.js.es6
rename to test/javascripts/widgets/topic-participant-test.js
diff --git a/test/javascripts/widgets/topic-status-test.js.es6 b/test/javascripts/widgets/topic-status-test.js
similarity index 100%
rename from test/javascripts/widgets/topic-status-test.js.es6
rename to test/javascripts/widgets/topic-status-test.js
diff --git a/test/javascripts/widgets/user-menu-test.js.es6 b/test/javascripts/widgets/user-menu-test.js
similarity index 100%
rename from test/javascripts/widgets/user-menu-test.js.es6
rename to test/javascripts/widgets/user-menu-test.js
diff --git a/test/javascripts/widgets/widget-test.js.es6 b/test/javascripts/widgets/widget-test.js
similarity index 100%
rename from test/javascripts/widgets/widget-test.js.es6
rename to test/javascripts/widgets/widget-test.js

From 6f2e3d61eec5a023ab898f4bb7b11021a3e821b1 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 26 Mar 2020 12:33:29 -0400
Subject: [PATCH 0390/1830] Revert "FIX: Resolver wasn't being set properly"

This reverts commit 661aebdc877a80f7debb93c4d727f2242084908f.
---
 test/javascripts/test_helper.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index c2c3520a3b..77598e4712 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -1,3 +1,5 @@
+// discourse-skip-module
+
 /*global document, sinon, QUnit, Logster */
 //= require env
 //= require jquery.debug
@@ -42,6 +44,9 @@
 //
 //= require jquery.magnific-popup.min.js
 
+const buildResolver = require("discourse-common/resolver").buildResolver;
+window.setResolver(buildResolver("discourse").create({ namespace: Discourse }));
+
 sinon.config = {
   injectIntoThis: false,
   injectInto: null,
@@ -103,7 +108,7 @@ function resetSite(siteSettings, extras) {
 QUnit.testStart(function(ctx) {
   server = createPretender.default;
   createPretender.applyDefaultHandlers(server);
-  server.handlers = []
+  server.handlers = [];
 
   server.prepareBody = function(body) {
     if (body && typeof body === "object") {

From 358ddb9b954837befe37e2c0b16c524dd8ffe52f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 26 Mar 2020 12:47:10 -0400
Subject: [PATCH 0391/1830] FIX: `nil` != `false`

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

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index c0ebc2210e..49fa3a7601 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -56,8 +56,8 @@ class DiscourseJsProcessor
       embed-application
     ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
 
-    relative_path =~ /^#{js_root}\/[^\/]+\// ||
-      relative_path =~ /^#{test_root}\/[^\/]+\//
+    !!(relative_path =~ /^#{js_root}\/[^\/]+\// ||
+      relative_path =~ /^#{test_root}\/[^\/]+\//)
   end
 
   def self.skip_module?(data)

From 388e14b9dc1d13750f8bc782a863277fd638a2da Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 26 Mar 2020 13:12:17 -0400
Subject: [PATCH 0392/1830] FIX: Broken transpilation

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

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 49fa3a7601..40cf861795 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -50,8 +50,8 @@ class DiscourseJsProcessor
       onpopstate-handler
       discourse
       google-tag-manager
-      google-universal-analytics.js
-      activate-account.js
+      google-universal-analytics
+      activate-account
       auto-redirect.js
       embed-application
     ).any? { |f| relative_path == "#{js_root}/#{f}.js" }

From 7d2c71dd5f14ac4591507080f2e6fa621fca9c1e Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 26 Mar 2020 13:21:04 -0400
Subject: [PATCH 0393/1830] FIX: Auto redirect had invalid extension

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

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 40cf861795..ebe2559982 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -52,7 +52,7 @@ class DiscourseJsProcessor
       google-tag-manager
       google-universal-analytics
       activate-account
-      auto-redirect.js
+      auto-redirect
       embed-application
     ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
 

From 05e2824a232cbc929a5a325d36f0c83d995143ec Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Thu, 26 Mar 2020 19:59:33 +0100
Subject: [PATCH 0394/1830] DEV: Fix flaky emoji-store tests

This set of tests cleared the emoji store *before* each test, while the other set - *after*. So if these were run first, they would break a single test from the other set.
---
 test/javascripts/acceptance/emoji-picker-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/acceptance/emoji-picker-test.js b/test/javascripts/acceptance/emoji-picker-test.js
index 1b90106d4d..71e06e1321 100644
--- a/test/javascripts/acceptance/emoji-picker-test.js
+++ b/test/javascripts/acceptance/emoji-picker-test.js
@@ -3,7 +3,7 @@ import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
 
 acceptance("EmojiPicker", {
   loggedIn: true,
-  beforeEach() {
+  afterEach() {
     const store = Discourse.__container__.lookup("service:emoji-store");
     store.reset();
   }

From af41c37d42247630b1e7de2e6df02e0591b7bb8f Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:13:54 -0700
Subject: [PATCH 0395/1830] DEV: Enable all 'recommended' passing ember
 template linting rules

Also sort the ember template linting rules
---
 .template-lintrc.js | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 17279244f3..32360e0a9e 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -3,17 +3,36 @@ module.exports = {
   ignore: ["**/*.raw"],
 
   rules: {
-    "self-closing-void-elements": true,
-    "table-groups": true,
-    "style-concatenation": true,
-    "no-invalid-interactive": true,
+    "deprecated-render-helper": true,
     "link-rel-noopener": true,
+    "no-abstract-roles": true,
+    "no-args-paths": true,
+    "no-attrs-in-components": true,
+    "no-debugger": true,
+    "no-extra-mut-helper-argument": true,
+    "no-html-comments": true,
+    "no-index-component-invocation": true,
+    "no-input-block": true,
+    "no-input-tagname": true,
+    "no-invalid-interactive": true,
+    "no-invalid-link-text": true,
+    "no-invalid-meta": true,
+    "no-invalid-role": true,
+    "no-log": true,
+    "no-negated-condition": true,
+    "no-nested-interactive": true,
+    "no-obsolete-elements": true,
+    "no-outlet-outside-routes": true,
+    "no-partial": true,
+    "no-shadowed-elements": true,
+    "no-triple-curlies": true,
     "no-unnecessary-concat": true,
+    "no-unnecessary-component-helper": true,
     "no-unused-block-params": true,
     "no-unbound": true,
+    "self-closing-void-elements": true,
     "simple-unless": true,
-    "no-triple-curlies": true,
-    "no-partial": true,
-    "no-html-comments": true
+    "style-concatenation": true,
+    "table-groups": true
   }
 };

From a17fa222afff6e035d5b610487d6888896913d35 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:17:31 -0700
Subject: [PATCH 0396/1830] DEV: Enable and fix link-href-attributes lint

---
 .template-lintrc.js                                           | 1 +
 .../discourse/templates/components/share-panel.hbs            | 2 +-
 .../discourse/templates/components/share-popup.hbs            | 2 +-
 app/assets/javascripts/discourse/templates/composer.hbs       | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 32360e0a9e..994a145b9b 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -5,6 +5,7 @@ module.exports = {
   rules: {
     "deprecated-render-helper": true,
     "link-rel-noopener": true,
+    "link-href-attributes": true,
     "no-abstract-roles": true,
     "no-args-paths": true,
     "no-attrs-in-components": true,
diff --git a/app/assets/javascripts/discourse/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
index 1808d6cc1f..4a2b9935cf 100644
--- a/app/assets/javascripts/discourse/templates/components/share-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
@@ -4,7 +4,7 @@
 
 <div class="body">
   {{textarea value=shareUrl class="topic-share-url"}}
-  <div class="topic-share-url-for-touch"><a></a></div>
+  <div class="topic-share-url-for-touch"><a href>{{! set by component }}</a></div>
 
   <div class="sources">
     {{#each sources as |source|}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index 54e8029cf6..38641694bd 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -8,7 +8,7 @@
 
 <div>
   <input type="text">
-  <div class="share-for-touch"><div class="overflow-ellipsis"><a></a></div></div>
+  <div class="share-for-touch"><div class="overflow-ellipsis"><a href>{{! set by component }}</a></div></div>
 </div>
 
 <div class="actions">
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 43af40a527..f255cd5d4d 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -191,7 +191,7 @@
 
               {{#if site.mobileView}}
                 {{#if allowUpload}}
-                  <a class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">
+                  <a href class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">
                     {{d-icon uploadIcon}}
                   </a>
                 {{/if}}
@@ -213,7 +213,7 @@
       {{else}}
         <div class='saving-text'>
           {{#if model.createdPost}}
-            {{i18n 'composer.saved'}} <a class='permalink' href={{createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
+            {{i18n 'composer.saved'}} <a href class='permalink' href={{createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
           {{else}}
             {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
           {{/if}}

From 07dc8d20c43e7b6487f0a8bfef3ff0216512c09a Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:31:02 -0700
Subject: [PATCH 0397/1830] DEV: Enable and fix the 'require-iframe-title' lint

---
 .template-lintrc.js                                             | 1 +
 app/assets/javascripts/admin/templates/email-preview-digest.hbs | 2 +-
 config/locales/client.en.yml                                    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 994a145b9b..344b969597 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -31,6 +31,7 @@ module.exports = {
     "no-unnecessary-component-helper": true,
     "no-unused-block-params": true,
     "no-unbound": true,
+    "require-iframe-title": true,
     "self-closing-void-elements": true,
     "simple-unless": true,
     "style-concatenation": true,
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 58733c1eb3..0dfcb04531 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -50,7 +50,7 @@
         {{#if htmlEmpty}}
           <p>{{i18n 'admin.email.no_result'}}</p>
         {{else}}
-          <iframe srcdoc={{model.html_content}} />
+          <iframe title={{i18n 'admin.email.html_preview'}} srcdoc={{model.html_content}} />
         {{/if}}
       {{else}}
         <pre>{{html-safe model.text_content}}</pre>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 50f5134381..f3ea234cb8 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3907,6 +3907,7 @@ en:
         format: "Format"
         html: "html"
         text: "text"
+        html_preview: "Email Content Preview"
         last_seen_user: "Last Seen User:"
         no_result: "No results found for summary."
         reply_key: "Reply Key"

From eff4974829567e7512584a269720171e35132bda Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:31:31 -0700
Subject: [PATCH 0398/1830] sorting fix

---
 .template-lintrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 344b969597..8013d049aa 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -27,10 +27,10 @@ module.exports = {
     "no-partial": true,
     "no-shadowed-elements": true,
     "no-triple-curlies": true,
+    "no-unbound": true,
     "no-unnecessary-concat": true,
     "no-unnecessary-component-helper": true,
     "no-unused-block-params": true,
-    "no-unbound": true,
     "require-iframe-title": true,
     "self-closing-void-elements": true,
     "simple-unless": true,

From e98e83a1ff0fdbbd2c95b15c6e0188e8d028dfe2 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:37:12 -0700
Subject: [PATCH 0399/1830] DEV: Disable all failing 'recommended' lints and
 extend 'recommended'

---
 .template-lintrc.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 8013d049aa..b0823d968f 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -1,20 +1,25 @@
 module.exports = {
-  // extends: "recommended",
+  extends: "recommended",
   ignore: ["**/*.raw"],
 
   rules: {
+    "block-indentation": false,
     "deprecated-render-helper": true,
+    "img-alt-attributes": false,
     "link-rel-noopener": true,
     "link-href-attributes": true,
     "no-abstract-roles": true,
     "no-args-paths": true,
     "no-attrs-in-components": true,
     "no-debugger": true,
+    "no-duplicate-attributes": false,
     "no-extra-mut-helper-argument": true,
     "no-html-comments": true,
     "no-index-component-invocation": true,
+    "no-inline-styles": false,
     "no-input-block": true,
     "no-input-tagname": true,
+    "no-implicit-this": false,
     "no-invalid-interactive": true,
     "no-invalid-link-text": true,
     "no-invalid-meta": true,
@@ -25,13 +30,18 @@ module.exports = {
     "no-obsolete-elements": true,
     "no-outlet-outside-routes": true,
     "no-partial": true,
+    "no-positive-tabindex": false,
+    "no-quoteless-attributes": false,
     "no-shadowed-elements": true,
     "no-triple-curlies": true,
     "no-unbound": true,
     "no-unnecessary-concat": true,
     "no-unnecessary-component-helper": true,
     "no-unused-block-params": true,
+    "quotes": false,
+    "require-button-type": false,
     "require-iframe-title": true,
+    "require-valid-alt-text": false,
     "self-closing-void-elements": true,
     "simple-unless": true,
     "style-concatenation": true,

From 7c14d9ae9f376f39bff0bf4aaabecbdc4767e465 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:48:28 -0700
Subject: [PATCH 0400/1830] DEV: Add and disable all failing 'stylistic' lints

---
 .template-lintrc.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index b0823d968f..41c0cd5e34 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -2,10 +2,14 @@ module.exports = {
   extends: "recommended",
   ignore: ["**/*.raw"],
 
+  // Pending:
+  // "eol-last": "always",
+
   rules: {
     "block-indentation": false,
     "deprecated-render-helper": true,
     "img-alt-attributes": false,
+    "linebreak-style": true,
     "link-rel-noopener": true,
     "link-href-attributes": true,
     "no-abstract-roles": true,
@@ -27,12 +31,14 @@ module.exports = {
     "no-log": true,
     "no-negated-condition": true,
     "no-nested-interactive": true,
+    "no-multiple-empty-lines": false,
     "no-obsolete-elements": true,
     "no-outlet-outside-routes": true,
     "no-partial": true,
     "no-positive-tabindex": false,
     "no-quoteless-attributes": false,
     "no-shadowed-elements": true,
+    "no-trailing-spaces": false,
     "no-triple-curlies": true,
     "no-unbound": true,
     "no-unnecessary-concat": true,

From 17211b940fc6d897d3b1db58f6d7a7a456ebe703 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 12:21:20 -0700
Subject: [PATCH 0401/1830] DEV: Enable and fix the 'no-duplicate-attributes'
 lint

---
 .template-lintrc.js                                     | 2 +-
 app/assets/javascripts/discourse/templates/composer.hbs | 2 +-
 app/assets/javascripts/discourse/templates/topic.hbs    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 41c0cd5e34..85a2b8381e 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -16,7 +16,7 @@ module.exports = {
     "no-args-paths": true,
     "no-attrs-in-components": true,
     "no-debugger": true,
-    "no-duplicate-attributes": false,
+    "no-duplicate-attributes": true,
     "no-extra-mut-helper-argument": true,
     "no-html-comments": true,
     "no-index-component-invocation": true,
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index f255cd5d4d..e86aefbfe3 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -213,7 +213,7 @@
       {{else}}
         <div class='saving-text'>
           {{#if model.createdPost}}
-            {{i18n 'composer.saved'}} <a href class='permalink' href={{createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
+            {{i18n 'composer.saved'}} <a class='permalink' href={{createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
           {{else}}
             {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 7b8c2d1b81..c79b3da18a 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -36,7 +36,6 @@
                 options=(hash
                   filterable=true
                   categoryId=buffered.category_id
-                  filterable=true
                 )
               }}
             {{/if}}

From 67b34600d54f1476b002291d6530f20ad31b73be Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Thu, 26 Mar 2020 21:00:10 +0100
Subject: [PATCH 0402/1830] DEV: Use `type` instead of `method` in ajax calls
 (#8974)

Even though `type` is an alias for `method`, we have custom logic in `/discourse/lib/ajax` that checks only `type`, and ~200 other ajax calls in the codebase already use `type` param.
---
 .../controllers/admin-customize-robots-txt.js |  4 ++--
 .../controllers/admin-watched-words-action.js |  2 +-
 .../modals/admin-edit-badge-groupings.js      |  2 +-
 .../controllers/modals/admin-install-theme.js |  2 +-
 .../admin/controllers/modals/admin-reseed.js  |  2 +-
 .../admin/models/email-template.js            |  2 +-
 .../admin/models/screened-email.js            |  2 +-
 .../javascripts/admin/models/site-text.js     |  2 +-
 .../admin/routes/admin-badges-show.js         |  2 +-
 .../javascripts/discourse/adapters/post.js    |  2 +-
 .../javascripts/discourse/adapters/rest.js    |  2 +-
 .../components/reviewable-claimed-topic.js    |  2 +-
 .../discourse/components/reviewable-item.js   |  2 +-
 .../discourse/controllers/avatar-selector.js  |  2 +-
 .../discourse/controllers/group-bulk-add.js   |  2 +-
 .../discourse/controllers/review-settings.js  |  2 +-
 .../discourse/controllers/static.js           |  2 +-
 .../controllers/user-notifications.js         |  2 +-
 app/assets/javascripts/discourse/lib/ajax.js  |  5 +++++
 .../javascripts/discourse/lib/export-csv.js   |  2 +-
 .../javascripts/discourse/models/topic.js     |  2 +-
 .../discourse/routes/application.js           |  2 +-
 .../discourse/widgets/hamburger-menu.js       |  2 +-
 .../widgets/quick-access-notifications.js     |  2 +-
 .../pretty-text/upload-short-url.js           |  2 +-
 test/javascripts/models/rest-model-test.js    | 10 ++++------
 test/javascripts/models/store-test.js         | 19 ++++++++-----------
 27 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js b/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js
index 5c6d2499f4..a3e43f2038 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js
+++ b/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js
@@ -18,7 +18,7 @@ export default Controller.extend(bufferedProperty("model"), {
       });
 
       ajax("robots.json", {
-        method: "PUT",
+        type: "PUT",
         data: { robots_txt: this.buffered.get("robots_txt") }
       })
         .then(data => {
@@ -34,7 +34,7 @@ export default Controller.extend(bufferedProperty("model"), {
         isSaving: true,
         saved: false
       });
-      ajax("robots.json", { method: "DELETE" })
+      ajax("robots.json", { type: "DELETE" })
         .then(data => {
           this.buffered.set("robots_txt", data.robots_txt);
           this.commitBuffer();
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js
index 5de00031a5..cf5815da73 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js
@@ -92,7 +92,7 @@ export default Controller.extend({
         result => {
           if (result) {
             ajax(`/admin/logs/watched_words/action/${actionKey}.json`, {
-              method: "DELETE"
+              type: "DELETE"
             }).then(() => {
               const action = this.findAction(actionKey);
               if (action) {
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js
index 7bc3603887..f1d1274abd 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js
+++ b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js
@@ -65,7 +65,7 @@ export default Controller.extend(ModalFunctionality, {
 
       ajax("/admin/badges/badge_groupings", {
         data: { ids: groupIds, names },
-        method: "POST"
+        type: "POST"
       }).then(
         data => {
           items = this.model;
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js b/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js
index 7c0036539c..16cf2034d5 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js
+++ b/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js
@@ -84,7 +84,7 @@ export default Controller.extend(ModalFunctionality, {
     const checked = this.privateChecked;
     if (checked && !this._keyLoading) {
       this._keyLoading = true;
-      ajax(this.keyGenUrl, { method: "POST" })
+      ajax(this.keyGenUrl, { type: "POST" })
         .then(pair => {
           this.setProperties({
             privateKey: pair.private_key,
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-reseed.js b/app/assets/javascripts/admin/controllers/modals/admin-reseed.js
index 176c46be36..326a3a66a7 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-reseed.js
+++ b/app/assets/javascripts/admin/controllers/modals/admin-reseed.js
@@ -31,7 +31,7 @@ export default Controller.extend(ModalFunctionality, {
           category_ids: this._extractSelectedIds(this.categories),
           topic_ids: this._extractSelectedIds(this.topics)
         },
-        method: "POST"
+        type: "POST"
       })
         .then(
           () => this.send("closeModal"),
diff --git a/app/assets/javascripts/admin/models/email-template.js b/app/assets/javascripts/admin/models/email-template.js
index 2dddb272dc..550148e0ab 100644
--- a/app/assets/javascripts/admin/models/email-template.js
+++ b/app/assets/javascripts/admin/models/email-template.js
@@ -5,7 +5,7 @@ const { getProperties } = Ember;
 export default RestModel.extend({
   revert() {
     return ajax(`/admin/customize/email_templates/${this.id}`, {
-      method: "DELETE"
+      type: "DELETE"
     }).then(result =>
       getProperties(result.email_template, "subject", "body", "can_revert")
     );
diff --git a/app/assets/javascripts/admin/models/screened-email.js b/app/assets/javascripts/admin/models/screened-email.js
index ea72510551..4ef3217edf 100644
--- a/app/assets/javascripts/admin/models/screened-email.js
+++ b/app/assets/javascripts/admin/models/screened-email.js
@@ -10,7 +10,7 @@ const ScreenedEmail = EmberObject.extend({
 
   clearBlock: function() {
     return ajax("/admin/logs/screened_emails/" + this.id, {
-      method: "DELETE"
+      type: "DELETE"
     });
   }
 });
diff --git a/app/assets/javascripts/admin/models/site-text.js b/app/assets/javascripts/admin/models/site-text.js
index 8bcb8c7f0f..793ab33b54 100644
--- a/app/assets/javascripts/admin/models/site-text.js
+++ b/app/assets/javascripts/admin/models/site-text.js
@@ -5,7 +5,7 @@ const { getProperties } = Ember;
 export default RestModel.extend({
   revert() {
     return ajax(`/admin/customize/site_texts/${this.id}`, {
-      method: "DELETE"
+      type: "DELETE"
     }).then(result => getProperties(result.site_text, "value", "can_revert"));
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js b/app/assets/javascripts/admin/routes/admin-badges-show.js
index 67acdcba58..4a29cfae0a 100644
--- a/app/assets/javascripts/admin/routes/admin-badges-show.js
+++ b/app/assets/javascripts/admin/routes/admin-badges-show.js
@@ -40,7 +40,7 @@ export default Route.extend({
     preview(badge, explain) {
       badge.set("preview_loading", true);
       ajax("/admin/badges/preview.json", {
-        method: "post",
+        type: "POST",
         data: {
           sql: badge.get("query"),
           target_posts: !!badge.get("target_posts"),
diff --git a/app/assets/javascripts/discourse/adapters/post.js b/app/assets/javascripts/discourse/adapters/post.js
index 950198067e..1382d8d1f3 100644
--- a/app/assets/javascripts/discourse/adapters/post.js
+++ b/app/assets/javascripts/discourse/adapters/post.js
@@ -13,7 +13,7 @@ export default RestAdapter.extend({
   createRecord(store, type, args) {
     const typeField = underscore(type);
     args.nested_post = true;
-    return ajax(this.pathFor(store, type), { method: "POST", data: args }).then(
+    return ajax(this.pathFor(store, type), { type: "POST", data: args }).then(
       function(json) {
         return new Result(json[typeField], json);
       }
diff --git a/app/assets/javascripts/discourse/adapters/rest.js b/app/assets/javascripts/discourse/adapters/rest.js
index bc2839985f..e92f325f84 100644
--- a/app/assets/javascripts/discourse/adapters/rest.js
+++ b/app/assets/javascripts/discourse/adapters/rest.js
@@ -133,7 +133,7 @@ export default EmberObject.extend({
 
   destroyRecord(store, type, record) {
     return ajax(this.pathFor(store, type, record.get("id")), {
-      method: "DELETE"
+      type: "DELETE"
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js b/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js
index 273b51afa7..5ebc97aeb0 100644
--- a/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js
+++ b/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js
@@ -14,7 +14,7 @@ export default Component.extend({
   actions: {
     unclaim() {
       ajax(`/reviewable_claimed_topics/${this.topicId}`, {
-        method: "DELETE"
+        type: "DELETE"
       }).then(() => {
         this.set("claimedBy", null);
       });
diff --git a/app/assets/javascripts/discourse/components/reviewable-item.js b/app/assets/javascripts/discourse/components/reviewable-item.js
index c301f1aa93..6f62710478 100644
--- a/app/assets/javascripts/discourse/components/reviewable-item.js
+++ b/app/assets/javascripts/discourse/components/reviewable-item.js
@@ -97,7 +97,7 @@ export default Component.extend({
       return ajax(
         `/review/${reviewable.id}/perform/${action.id}?version=${version}`,
         {
-          method: "PUT"
+          type: "PUT"
         }
       )
         .then(result => {
diff --git a/app/assets/javascripts/discourse/controllers/avatar-selector.js b/app/assets/javascripts/discourse/controllers/avatar-selector.js
index 5fdbe79e3e..38d5da9a69 100644
--- a/app/assets/javascripts/discourse/controllers/avatar-selector.js
+++ b/app/assets/javascripts/discourse/controllers/avatar-selector.js
@@ -63,7 +63,7 @@ export default Controller.extend(ModalFunctionality, {
 
       return ajax(
         `/user_avatar/${this.get("user.username")}/refresh_gravatar.json`,
-        { method: "POST" }
+        { type: "POST" }
       )
         .then(result => {
           if (!result.gravatar_upload_id) {
diff --git a/app/assets/javascripts/discourse/controllers/group-bulk-add.js b/app/assets/javascripts/discourse/controllers/group-bulk-add.js
index 0310d4e309..cf4f86916c 100644
--- a/app/assets/javascripts/discourse/controllers/group-bulk-add.js
+++ b/app/assets/javascripts/discourse/controllers/group-bulk-add.js
@@ -31,7 +31,7 @@ export default Controller.extend(ModalFunctionality, {
 
       ajax("/admin/groups/bulk", {
         data: { users, group_id: this.get("model.id") },
-        method: "PUT"
+        type: "PUT"
       })
         .then(result => {
           this.set("result", result);
diff --git a/app/assets/javascripts/discourse/controllers/review-settings.js b/app/assets/javascripts/discourse/controllers/review-settings.js
index 8e670adb2a..e98e4d8c37 100644
--- a/app/assets/javascripts/discourse/controllers/review-settings.js
+++ b/app/assets/javascripts/discourse/controllers/review-settings.js
@@ -15,7 +15,7 @@ export default Controller.extend({
 
       this.set("saving", true);
       ajax("/review/settings", {
-        method: "PUT",
+        type: "PUT",
         data: { reviewable_priorities: priorities }
       })
         .then(() => {
diff --git a/app/assets/javascripts/discourse/controllers/static.js b/app/assets/javascripts/discourse/controllers/static.js
index 9f139b6d92..9474c20c64 100644
--- a/app/assets/javascripts/discourse/controllers/static.js
+++ b/app/assets/javascripts/discourse/controllers/static.js
@@ -23,7 +23,7 @@ export default Controller.extend({
     markFaqRead() {
       const currentUser = this.currentUser;
       if (currentUser) {
-        ajax(userPath("read-faq"), { method: "POST" }).then(() => {
+        ajax(userPath("read-faq"), { type: "POST" }).then(() => {
           currentUser.set("read_faq", true);
         });
       }
diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js b/app/assets/javascripts/discourse/controllers/user-notifications.js
index b6cceef185..dc9147105e 100644
--- a/app/assets/javascripts/discourse/controllers/user-notifications.js
+++ b/app/assets/javascripts/discourse/controllers/user-notifications.js
@@ -28,7 +28,7 @@ export default Controller.extend({
 
   actions: {
     resetNew() {
-      ajax("/notifications/mark-read", { method: "PUT" }).then(() => {
+      ajax("/notifications/mark-read", { type: "PUT" }).then(() => {
         this.model.forEach(n => n.set("read", true));
       });
     },
diff --git a/app/assets/javascripts/discourse/lib/ajax.js b/app/assets/javascripts/discourse/lib/ajax.js
index 37052a4d79..e2318b0d9f 100644
--- a/app/assets/javascripts/discourse/lib/ajax.js
+++ b/app/assets/javascripts/discourse/lib/ajax.js
@@ -139,6 +139,11 @@ export function ajax() {
       });
     };
 
+    if (args.method) {
+      args.type = args.method;
+      delete args.method;
+    }
+
     // We default to JSON on GET. If we don't, sometimes if the server doesn't return the proper header
     // it will not be parsed as an object.
     if (!args.type) args.type = "GET";
diff --git a/app/assets/javascripts/discourse/lib/export-csv.js b/app/assets/javascripts/discourse/lib/export-csv.js
index 39b19771f3..41957f9bf5 100644
--- a/app/assets/javascripts/discourse/lib/export-csv.js
+++ b/app/assets/javascripts/discourse/lib/export-csv.js
@@ -3,7 +3,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 
 function exportEntityByType(type, entity, args) {
   return ajax("/export_csv/export_entity.json", {
-    method: "POST",
+    type: "POST",
     data: { entity, args }
   });
 }
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index ea118dbc7a..26afbd4ba2 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -634,7 +634,7 @@ const Topic = RestModel.extend({
   updateDestinationCategory(categoryId) {
     this.set("destination_category_id", categoryId);
     return ajax(`/t/${this.id}/shared-draft`, {
-      method: "PUT",
+      type: "PUT",
       data: { category_id: categoryId }
     });
   },
diff --git a/app/assets/javascripts/discourse/routes/application.js b/app/assets/javascripts/discourse/routes/application.js
index 0a028cdceb..07926eb568 100644
--- a/app/assets/javascripts/discourse/routes/application.js
+++ b/app/assets/javascripts/discourse/routes/application.js
@@ -29,7 +29,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
 
   actions: {
     toggleAnonymous() {
-      ajax(userPath("toggle-anon"), { method: "POST" }).then(() => {
+      ajax(userPath("toggle-anon"), { type: "POST" }).then(() => {
         window.location.reload();
       });
     },
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js b/app/assets/javascripts/discourse/widgets/hamburger-menu.js
index 912594351e..48af267c16 100644
--- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js
+++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js
@@ -26,7 +26,7 @@ createWidget("priority-faq-link", {
   click(e) {
     e.preventDefault();
     if (this.siteSettings.faq_url === this.attrs.href) {
-      ajax(userPath("read-faq"), { method: "POST" }).then(() => {
+      ajax(userPath("read-faq"), { type: "POST" }).then(() => {
         this.currentUser.set("read_faq", true);
         DiscourseURL.routeToTag($(e.target).closest("a")[0]);
       });
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-notifications.js b/app/assets/javascripts/discourse/widgets/quick-access-notifications.js
index 515e702ace..2841da9a84 100644
--- a/app/assets/javascripts/discourse/widgets/quick-access-notifications.js
+++ b/app/assets/javascripts/discourse/widgets/quick-access-notifications.js
@@ -7,7 +7,7 @@ createWidgetFrom(QuickAccessPanel, "quick-access-notifications", {
   emptyStatePlaceholderItemKey: "notifications.empty",
 
   markReadRequest() {
-    return ajax("/notifications/mark-read", { method: "PUT" });
+    return ajax("/notifications/mark-read", { type: "PUT" });
   },
 
   newItemsLoaded() {
diff --git a/app/assets/javascripts/pretty-text/upload-short-url.js b/app/assets/javascripts/pretty-text/upload-short-url.js
index 401d73dff0..87d948693d 100644
--- a/app/assets/javascripts/pretty-text/upload-short-url.js
+++ b/app/assets/javascripts/pretty-text/upload-short-url.js
@@ -15,7 +15,7 @@ export function lookupUncachedUploadUrls(urls, ajax) {
   }
 
   return ajax("/uploads/lookup-urls", {
-    method: "POST",
+    type: "POST",
     data: { short_urls: urls }
   }).then(uploads => {
     uploads.forEach(upload => {
diff --git a/test/javascripts/models/rest-model-test.js b/test/javascripts/models/rest-model-test.js
index 8213e96e8d..c6aea1e7dd 100644
--- a/test/javascripts/models/rest-model-test.js
+++ b/test/javascripts/models/rest-model-test.js
@@ -100,13 +100,11 @@ QUnit.test("creating simultaneously", assert => {
   });
 });
 
-QUnit.test("destroyRecord", assert => {
+QUnit.test("destroyRecord", async assert => {
   const store = createStore();
-  return store.find("widget", 123).then(function(widget) {
-    widget.destroyRecord().then(function(result) {
-      assert.ok(result);
-    });
-  });
+  const widget = await store.find("widget", 123);
+
+  assert.ok(await widget.destroyRecord());
 });
 
 QUnit.test("custom api name", async assert => {
diff --git a/test/javascripts/models/store-test.js b/test/javascripts/models/store-test.js
index 2e220b152c..386094151c 100644
--- a/test/javascripts/models/store-test.js
+++ b/test/javascripts/models/store-test.js
@@ -114,21 +114,18 @@ QUnit.test("findAll", async assert => {
   assert.equal(widget.get("name"), "Evil Repellant");
 });
 
-QUnit.test("destroyRecord", function(assert) {
+QUnit.test("destroyRecord", async assert => {
   const store = createStore();
-  return store.find("widget", 123).then(function(w) {
-    store.destroyRecord("widget", w).then(function(result) {
-      assert.ok(result);
-    });
-  });
+  const widget = await store.find("widget", 123);
+
+  assert.ok(await store.destroyRecord("widget", widget));
 });
 
-QUnit.test("destroyRecord when new", function(assert) {
+QUnit.test("destroyRecord when new", async assert => {
   const store = createStore();
-  const w = store.createRecord("widget", { name: "hello" });
-  store.destroyRecord("widget", w).then(function(result) {
-    assert.ok(result);
-  });
+  const widget = store.createRecord("widget", { name: "hello" });
+
+  assert.ok(await store.destroyRecord("widget", widget));
 });
 
 QUnit.test("find embedded", async assert => {

From 257f59f36643a33afa084fcbd69a25e7e0399cce Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 27 Mar 2020 03:41:56 +0530
Subject: [PATCH 0403/1830] FEATURE: option to update child theme components
 via theme CLI.

https://github.com/discourse/discourse_theme/commit/423ce44112ac1ac56eaafa36252b7d7eea04193f
---
 app/controllers/admin/themes_controller.rb |  3 ++-
 app/models/remote_theme.rb                 | 24 +++++++++++++++++++---
 app/models/theme.rb                        |  4 +++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb
index d6bc528c3f..00e17991b8 100644
--- a/app/controllers/admin/themes_controller.rb
+++ b/app/controllers/admin/themes_controller.rb
@@ -97,9 +97,10 @@ class Admin::ThemesController < Admin::AdminController
       # params[:bundle] used by theme CLI. params[:theme] used by admin UI
       bundle = params[:bundle] || params[:theme]
       theme_id = params[:theme_id]
+      update_components = params[:components]
       match_theme_by_name = !!params[:bundle] && !params.key?(:theme_id) # Old theme CLI behavior, match by name. Remove Jan 2020
       begin
-        @theme = RemoteTheme.update_zipped_theme(bundle.path, bundle.original_filename, match_theme: match_theme_by_name, user: theme_user, theme_id: theme_id)
+        @theme = RemoteTheme.update_zipped_theme(bundle.path, bundle.original_filename, match_theme: match_theme_by_name, user: theme_user, theme_id: theme_id, update_components: update_components)
         log_theme_change(nil, @theme)
         render json: @theme, status: :created
       rescue RemoteTheme::ImportError => e
diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb
index e95fe25c51..292ba79d7e 100644
--- a/app/models/remote_theme.rb
+++ b/app/models/remote_theme.rb
@@ -30,17 +30,22 @@ class RemoteTheme < ActiveRecord::Base
     raise ImportError.new I18n.t("themes.import_error.about_json")
   end
 
-  def self.update_zipped_theme(filename, original_filename, match_theme: false, user: Discourse.system_user, theme_id: nil)
+  def self.update_zipped_theme(filename, original_filename, match_theme: false, user: Discourse.system_user, theme_id: nil, update_components: nil)
     importer = ThemeStore::ZipImporter.new(filename, original_filename)
     importer.import!
 
     theme_info = RemoteTheme.extract_theme_info(importer)
     theme = Theme.find_by(name: theme_info["name"]) if match_theme # Old theme CLI method, remove Jan 2020
     theme = Theme.find_by(id: theme_id) if theme_id # New theme CLI method
-    theme ||= Theme.new(user_id: user&.id || -1, name: theme_info["name"])
+
+    existing = true
+    if theme.blank?
+      theme = Theme.new(user_id: user&.id || -1, name: theme_info["name"])
+      existing = false
+    end
 
     theme.component = theme_info["component"].to_s == "true"
-    theme.child_components = theme_info["components"].presence || []
+    theme.child_components = child_components = theme_info["components"].presence || []
 
     remote_theme = new
     remote_theme.theme = theme
@@ -48,6 +53,19 @@ class RemoteTheme < ActiveRecord::Base
     remote_theme.update_from_remote(importer, skip_update: true)
 
     theme.save!
+
+    if existing && update_components.present? && update_components != "none"
+      child_components = child_components.map { |url| ThemeStore::GitImporter.new(url.strip).url }
+
+      if update_components == "sync"
+        ChildTheme.joins(child_theme: :remote_theme).where("remote_themes.remote_url NOT IN (?)", child_components).delete_all
+      end
+
+      child_components -= theme.child_themes.joins(:remote_theme).where("remote_themes.remote_url IN (?)", child_components).pluck("remote_themes.remote_url")
+      theme.child_components = child_components
+      theme.update_child_components
+    end
+
     theme
   ensure
     begin
diff --git a/app/models/theme.rb b/app/models/theme.rb
index c20e04d905..69f6c2899e 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -25,6 +25,8 @@ class Theme < ActiveRecord::Base
 
   validate :component_validations
 
+  after_create :update_child_components
+
   scope :user_selectable, ->() {
     where('user_selectable OR id = ?', SiteSetting.default_theme_id)
   }
@@ -70,7 +72,7 @@ class Theme < ActiveRecord::Base
     notify_theme_change(with_scheme: notify_with_scheme)
   end
 
-  after_create do
+  def update_child_components
     if !component? && child_components.present?
       child_components.each do |url|
         url = ThemeStore::GitImporter.new(url.strip).url

From bed3f7f69a718a0b47199e09bc1570a3164597a8 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 27 Mar 2020 10:14:13 +1100
Subject: [PATCH 0404/1830] DEV: long poll for 20 extra minutes when user stops
 interacting

We have no way of detecting if a browser window is behind another window
or off screen on a virtual desktop.

In some cases we may want events to be delivered quicker to the browser.
Specifically a user may still have a window in view but is not interacting.

This gives users 20 minutes of extra "long polling time" prior to shifting
to short polling.
---
 app/assets/javascripts/discourse/initializers/message-bus.js | 5 ++++-
 app/assets/javascripts/discourse/lib/user-presence.js        | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/initializers/message-bus.js b/app/assets/javascripts/discourse/initializers/message-bus.js
index 61905e42a0..f732065c0f 100644
--- a/app/assets/javascripts/discourse/initializers/message-bus.js
+++ b/app/assets/javascripts/discourse/initializers/message-bus.js
@@ -2,6 +2,8 @@
 import userPresent from "discourse/lib/user-presence";
 import { handleLogoff } from "discourse/lib/ajax";
 
+const LONG_POLL_AFTER_UNSEEN_TIME = 1200000; // 20 minutes
+
 function ajax(opts) {
   if (opts.complete) {
     const oldComplete = opts.complete;
@@ -31,7 +33,8 @@ export default {
       siteSettings = container.lookup("site-settings:main");
 
     messageBus.alwaysLongPoll = Discourse.Environment === "development";
-    messageBus.shouldLongPollCallback = userPresent;
+    messageBus.shouldLongPollCallback = () =>
+      userPresent(LONG_POLL_AFTER_UNSEEN_TIME);
 
     // we do not want to start anything till document is complete
     messageBus.stop();
diff --git a/app/assets/javascripts/discourse/lib/user-presence.js b/app/assets/javascripts/discourse/lib/user-presence.js
index 67d332981f..7d6e02d737 100644
--- a/app/assets/javascripts/discourse/lib/user-presence.js
+++ b/app/assets/javascripts/discourse/lib/user-presence.js
@@ -10,10 +10,11 @@ const MAX_UNSEEN_TIME = 60000;
 
 let seenUserTime = Date.now();
 
-export default function() {
+export default function(maxUnseenTime) {
+  maxUnseenTime = maxUnseenTime === undefined ? MAX_UNSEEN_TIME : maxUnseenTime;
   const now = Date.now();
 
-  if (seenUserTime + MAX_UNSEEN_TIME < now) {
+  if (seenUserTime + maxUnseenTime < now) {
     return false;
   }
 

From 33350c31c07330e8dec8e5ba35ee8de6728a1c6a Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 26 Mar 2020 19:15:33 -0400
Subject: [PATCH 0405/1830] UX: Align bulk select menu toggle relative to main
 wrapper when possible

---
 .../discourse/components/bulk-select-button.js  | 15 +++++++++++++++
 app/assets/stylesheets/desktop/topic-list.scss  | 17 ++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/bulk-select-button.js b/app/assets/javascripts/discourse/components/bulk-select-button.js
index 1070402ca0..11beee344e 100644
--- a/app/assets/javascripts/discourse/components/bulk-select-button.js
+++ b/app/assets/javascripts/discourse/components/bulk-select-button.js
@@ -1,9 +1,24 @@
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import showModal from "discourse/lib/show-modal";
 
 export default Component.extend({
   classNames: ["bulk-select-container"],
 
+  didInsertElement() {
+    this._super(...arguments);
+
+    schedule("afterRender", () => {
+      let mainOutletPadding =
+        window.getComputedStyle(document.querySelector("#main-outlet"))
+          .paddingTop || 0;
+
+      document.querySelector(
+        ".bulk-select-container"
+      ).style.top = mainOutletPadding;
+    });
+  },
+
   actions: {
     showBulkActions() {
       const controller = showModal("topic-bulk-actions", {
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 03ab18a8b9..13e1d03da1 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -188,13 +188,28 @@
   }
 }
 
+.bulk-select-container {
+  @supports (position: sticky) {
+    @media screen and (min-width: 1250px) {
+      position: sticky;
+      position: -webkit-sticky;
+    }
+  }
+}
+
 #bulk-select {
   position: fixed;
   right: 20px;
   top: 130px;
-  padding: 5px;
   background-color: $secondary;
   z-index: z("dropdown");
+  @supports (position: sticky) {
+    @media screen and (min-width: 1250px) {
+      position: absolute;
+      right: -60px;
+      top: 0;
+    }
+  }
 }
 
 button.dismiss-read {

From 40b6e278a08d58ffd9525c52318daac397465b37 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 27 Mar 2020 12:41:06 +1100
Subject: [PATCH 0406/1830] FIX: ensure wiki editor is assigned consistently

`DISTINCT ON` was not providing stability, this ensures the backfill will
be stable on a specific post avoiding risk around double grants.
---
 lib/badge_queries.rb      | 18 ++++++++++++------
 spec/models/badge_spec.rb | 22 +++++++++++++++-------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/lib/badge_queries.rb b/lib/badge_queries.rb
index 1c42e99b7b..8348087873 100644
--- a/lib/badge_queries.rb
+++ b/lib/badge_queries.rb
@@ -103,12 +103,18 @@ module BadgeQueries
   SQL
 
   WikiEditor = <<~SQL
-    SELECT DISTINCT ON (pr.user_id) pr.user_id, pr.post_id, pr.created_at granted_at
-    FROM post_revisions pr
-    JOIN badge_posts p on p.id = pr.post_id
-    WHERE p.wiki
-        AND NOT pr.hidden
-        AND (:backfill OR p.id IN (:post_ids))
+    SELECT pr2.user_id, pr2.post_id, pr2.created_at granted_at
+    FROM
+    (
+      SELECT min(pr.id) id
+      FROM post_revisions pr
+      JOIN badge_posts p on p.id = pr.post_id
+      WHERE p.wiki
+          AND NOT pr.hidden
+          AND (:backfill OR p.id IN (:post_ids))
+      GROUP BY pr.user_id
+    ) as X
+    JOIN post_revisions pr2 ON pr2.id = X.id
   SQL
 
   Welcome = <<~SQL
diff --git a/spec/models/badge_spec.rb b/spec/models/badge_spec.rb
index bd1639a69c..221569de08 100644
--- a/spec/models/badge_spec.rb
+++ b/spec/models/badge_spec.rb
@@ -3,13 +3,6 @@
 require 'rails_helper'
 
 describe Badge do
-  it { is_expected.to belong_to(:badge_type) }
-  it { is_expected.to belong_to(:badge_grouping) }
-  it { is_expected.to have_many(:user_badges).dependent(:destroy) }
-
-  it { is_expected.to validate_presence_of(:name) }
-  it { is_expected.to validate_presence_of(:badge_type) }
-  it { is_expected.to validate_uniqueness_of(:name) }
 
   it 'has a valid system attribute for new badges' do
     expect(Badge.create!(name: "test", badge_type_id: 1).system?).to be false
@@ -151,6 +144,21 @@ describe Badge do
     end
   end
 
+  context "WikiEditor badge" do
+
+    it "is awarded" do
+      wiki_editor_badge = Badge.find(Badge::WikiEditor)
+      post = Fabricate(:post, wiki: true)
+      revisor = PostRevisor.new(post)
+      revisor.revise!(post.user, { raw: "I am editing a wiki" }, force_new_version: true)
+
+      BadgeGranter.backfill(wiki_editor_badge)
+
+      expect(UserBadge.where(user_id: post.user.id, badge_id: Badge::WikiEditor).count).to eq(1)
+    end
+
+  end
+
   context "PopularLink badge" do
 
     let(:popular_link_badge) do

From 0cb40fe9ed5b97214a41e48de6d6d9c94819ff16 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 27 Mar 2020 12:17:18 +1000
Subject: [PATCH 0407/1830] FIX: Narrative bot not working for bookmarks with
 reminders (#9289)

Reported https://meta.discourse.org/t/improved-bookmarks-with-reminders/144542/42?u=mjrbrennan

* There was no callback on the bookmark model to trigger the next step of the narrative bot on bookmark.
* Also the translation URL path was hardcoded, needs to be conditional based on whether the site setting is enabled.
---
 .../config/locales/server.en.yml              |  2 +-
 .../new_user_narrative.rb                     |  8 ++++++-
 plugins/discourse-narrative-bot/plugin.rb     |  8 +++++++
 .../new_user_narrative_spec.rb                | 21 ++++++++++++++++++-
 4 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index 1aa80d2df1..86d081b5bb 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -244,7 +244,7 @@ en:
         instructions: |-
           If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this personal message**. If you do, there may be a :gift: in your future!
         reply: |-
-          Excellent! Now you can easily find your way back to our private conversation any time, right from [the bookmarks tab on your profile](%{profile_page_url}/activity/bookmarks). Just select your profile picture at the upper right &#8599;
+          Excellent! Now you can easily find your way back to our private conversation any time, right from [the bookmarks tab on your profile](%{bookmark_url}). Just select your profile picture at the upper right &#8599;
         not_found: |-
           Uh oh, I don’t see any bookmarks in this topic. Did you find the bookmark under each post? Use the show more <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> to reveal additional actions if needed.
 
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
index 8d033ac6be..0acd31d5bb 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
@@ -233,8 +233,14 @@ module DiscourseNarrativeBot
       return unless valid_topic?(@post.topic_id)
       return unless @post.user_id == self.discobot_user.id
 
+      profile_page_url = url_helpers(:user_url, username: @user.username)
+      bookmark_url = if SiteSetting.enable_bookmarks_with_reminders?
+        "#{profile_page_url}/activity/bookmarks-with-reminders"
+      else
+        "#{profile_page_url}/activity/bookmarks"
+      end
       raw = <<~RAW
-        #{I18n.t("#{I18N_KEY}.bookmark.reply", i18n_post_args(profile_page_url: url_helpers(:user_url, username: @user.username)))}
+        #{I18n.t("#{I18N_KEY}.bookmark.reply", i18n_post_args(bookmark_url: bookmark_url))}
 
         #{instance_eval(&@next_instructions)}
       RAW
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index ea145c4873..3acbcc7a92 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -240,6 +240,14 @@ after_initialize do
     end
   end
 
+  self.add_model_callback(Bookmark, :after_commit, on: :create) do
+    if SiteSetting.enable_bookmarks_with_reminders?
+      if self.post && self.user.enqueue_narrative_bot_job?
+        Jobs.enqueue(:bot_input, user_id: self.user_id, post_id: self.post_id, input: :bookmark)
+      end
+    end
+  end
+
   self.on(:topic_notification_level_changed) do |_, user_id, topic_id|
     user = User.find_by(id: user_id)
 
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
index bb642a733e..6648337caf 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
@@ -256,7 +256,26 @@ describe DiscourseNarrativeBot::NewUserNarrative do
         profile_page_url = "#{Discourse.base_url}/u/#{user.username}"
 
         expected_raw = <<~RAW
-          #{I18n.t('discourse_narrative_bot.new_user_narrative.bookmark.reply', profile_page_url: profile_page_url, base_uri: '')}
+          #{I18n.t('discourse_narrative_bot.new_user_narrative.bookmark.reply', bookmark_url: "#{profile_page_url}/activity/bookmarks", base_uri: '')}
+
+          #{I18n.t('discourse_narrative_bot.new_user_narrative.onebox.instructions', base_uri: '')}
+        RAW
+
+        expect(new_post.raw).to eq(expected_raw.chomp)
+        expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_onebox)
+      end
+
+      it 'should create the right reply when bookmarks with reminders are enabled' do
+        SiteSetting.enable_bookmarks_with_reminders = true
+        post.update!(user: discobot_user)
+        narrative.expects(:enqueue_timeout_job).with(user)
+
+        narrative.input(:bookmark, user, post: post)
+        new_post = Post.last
+        profile_page_url = "#{Discourse.base_url}/u/#{user.username}"
+
+        expected_raw = <<~RAW
+          #{I18n.t('discourse_narrative_bot.new_user_narrative.bookmark.reply', bookmark_url: "#{profile_page_url}/activity/bookmarks-with-reminders", base_uri: '')}
 
           #{I18n.t('discourse_narrative_bot.new_user_narrative.onebox.instructions', base_uri: '')}
         RAW

From 57321b90f09a321bf7baaa0b4547c4070b3548e6 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Fri, 27 Mar 2020 07:38:55 -0300
Subject: [PATCH 0408/1830] Completely remove read only mode during backups
 (#9279)

---
 lib/backup_restore/backuper.rb | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb
index 0ae246dd88..ae7cee8696 100644
--- a/lib/backup_restore/backuper.rb
+++ b/lib/backup_restore/backuper.rb
@@ -34,9 +34,6 @@ module BackupRestore
 
       update_metadata
 
-      ### READ-ONLY / START ###
-      enable_readonly_mode
-
       begin
         pause_sidekiq
         wait_for_sidekiq
@@ -45,9 +42,6 @@ module BackupRestore
         unpause_sidekiq
       end
 
-      disable_readonly_mode
-      ### READ-ONLY / END ###
-
       log "Finalizing backup..."
 
       @with_uploads ? create_archive : move_dump_backup
@@ -106,7 +100,6 @@ module BackupRestore
         end
 
       @logs = []
-      @readonly_mode_was_enabled = Discourse.readonly_mode?
     end
 
     def listen_for_shutdown_signal
@@ -134,12 +127,6 @@ module BackupRestore
       BackupMetadata.create!(name: "multisite", value: Rails.configuration.multisite)
     end
 
-    def enable_readonly_mode
-      return if @readonly_mode_was_enabled
-      log "Enabling readonly mode..."
-      Discourse.enable_readonly_mode
-    end
-
     def pause_sidekiq
       log "Pausing sidekiq..."
       Sidekiq.pause!
@@ -364,7 +351,6 @@ module BackupRestore
       log "Cleaning stuff up..."
       delete_uploaded_archive
       remove_tar_leftovers
-      disable_readonly_mode if Discourse.readonly_mode?
       mark_backup_as_not_running
       refresh_disk_space
     end
@@ -411,14 +397,6 @@ module BackupRestore
       log "Something went wrong while unpausing Sidekiq.", ex
     end
 
-    def disable_readonly_mode
-      return if @readonly_mode_was_enabled
-      log "Disabling readonly mode..."
-      Discourse.disable_readonly_mode
-    rescue => ex
-      log "Something went wrong while disabling readonly mode.", ex
-    end
-
     def mark_backup_as_not_running
       log "Marking backup as finished..."
       BackupRestore.mark_as_not_running!

From e6e6d209125f37bbcb5da9e5ec87c78f36cf8f9c Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 27 Mar 2020 11:43:00 +0000
Subject: [PATCH 0409/1830] Revert "DEV: Enable and fix link-href-attributes
 lint"

Introducing an href attribute on the upload button caused the page to reload when clicked

This reverts commit a17fa222afff6e035d5b610487d6888896913d35.
---
 .template-lintrc.js                                             | 1 -
 .../javascripts/discourse/templates/components/share-panel.hbs  | 2 +-
 .../javascripts/discourse/templates/components/share-popup.hbs  | 2 +-
 app/assets/javascripts/discourse/templates/composer.hbs         | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 85a2b8381e..7c94a35a76 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -11,7 +11,6 @@ module.exports = {
     "img-alt-attributes": false,
     "linebreak-style": true,
     "link-rel-noopener": true,
-    "link-href-attributes": true,
     "no-abstract-roles": true,
     "no-args-paths": true,
     "no-attrs-in-components": true,
diff --git a/app/assets/javascripts/discourse/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
index 4a2b9935cf..1808d6cc1f 100644
--- a/app/assets/javascripts/discourse/templates/components/share-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
@@ -4,7 +4,7 @@
 
 <div class="body">
   {{textarea value=shareUrl class="topic-share-url"}}
-  <div class="topic-share-url-for-touch"><a href>{{! set by component }}</a></div>
+  <div class="topic-share-url-for-touch"><a></a></div>
 
   <div class="sources">
     {{#each sources as |source|}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index 38641694bd..54e8029cf6 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -8,7 +8,7 @@
 
 <div>
   <input type="text">
-  <div class="share-for-touch"><div class="overflow-ellipsis"><a href>{{! set by component }}</a></div></div>
+  <div class="share-for-touch"><div class="overflow-ellipsis"><a></a></div></div>
 </div>
 
 <div class="actions">
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index e86aefbfe3..43af40a527 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -191,7 +191,7 @@
 
               {{#if site.mobileView}}
                 {{#if allowUpload}}
-                  <a href class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">
+                  <a class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">
                     {{d-icon uploadIcon}}
                   </a>
                 {{/if}}

From 1b09a0cd1782364f95ec359d76398ec66e060c82 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 27 Mar 2020 13:29:58 +0100
Subject: [PATCH 0410/1830] UX: improves date-time-input on mobile (#9291)

---
 .../javascripts/discourse/components/date-time-input.js     | 1 +
 app/assets/stylesheets/common/components/date-input.scss    | 3 +++
 .../stylesheets/common/components/date-time-input.scss      | 6 ++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/date-time-input.js b/app/assets/javascripts/discourse/components/date-time-input.js
index eff8b99edc..592b94a33a 100644
--- a/app/assets/javascripts/discourse/components/date-time-input.js
+++ b/app/assets/javascripts/discourse/components/date-time-input.js
@@ -32,6 +32,7 @@ export default Component.extend({
 
     onChangeDate(date) {
       if (this.onChange) {
+        date = new Date(this.date);
         const year = date.getFullYear();
         const month = date.getMonth();
         const day = date.getDate();
diff --git a/app/assets/stylesheets/common/components/date-input.scss b/app/assets/stylesheets/common/components/date-input.scss
index 583039a001..7917f408d0 100644
--- a/app/assets/stylesheets/common/components/date-input.scss
+++ b/app/assets/stylesheets/common/components/date-input.scss
@@ -1,4 +1,7 @@
 .d-date-input {
+  display: flex;
+  flex: 1;
+
   .date-picker {
     margin: 0;
     text-align: left;
diff --git a/app/assets/stylesheets/common/components/date-time-input.scss b/app/assets/stylesheets/common/components/date-time-input.scss
index 634bc21961..1ebe50f9f9 100644
--- a/app/assets/stylesheets/common/components/date-time-input.scss
+++ b/app/assets/stylesheets/common/components/date-time-input.scss
@@ -2,14 +2,16 @@
   display: flex;
   align-items: center;
   border: 1px solid $primary-low;
-  width: 258px;
   box-sizing: border-box;
   position: relative;
   flex: 1;
-  justify-content: space-between;
 
   .date-picker,
   .fields {
     border: 0;
   }
+
+  .d-date-time-input {
+    margin-left: auto;
+  }
 }

From eda8f319a2f84e4c54a5433eeaf070ceb402d69a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 27 Mar 2020 14:15:14 +0100
Subject: [PATCH 0411/1830] FIX: keep date object (#9292)

---
 app/assets/javascripts/discourse/components/date-time-input.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/date-time-input.js b/app/assets/javascripts/discourse/components/date-time-input.js
index 592b94a33a..eff8b99edc 100644
--- a/app/assets/javascripts/discourse/components/date-time-input.js
+++ b/app/assets/javascripts/discourse/components/date-time-input.js
@@ -32,7 +32,6 @@ export default Component.extend({
 
     onChangeDate(date) {
       if (this.onChange) {
-        date = new Date(this.date);
         const year = date.getFullYear();
         const month = date.getMonth();
         const day = date.getDate();

From c721bdb3005278e990f0cae0cfcfaa1892bc893c Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 27 Mar 2020 10:02:48 -0500
Subject: [PATCH 0412/1830] DEV: Add build_plugin_html to wizard head (#9293)

---
 app/views/wizard/index.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/wizard/index.html.erb b/app/views/wizard/index.html.erb
index 382f68b433..a4ca2cb460 100644
--- a/app/views/wizard/index.html.erb
+++ b/app/views/wizard/index.html.erb
@@ -9,6 +9,7 @@
     <%= preload_script 'wizard-vendor' %>
     <%= preload_script 'wizard-application' %>
     <%= preload_script_url ExtraLocalesController.url('wizard') %>
+    <%= build_plugin_html 'wizard:head' %>
     <%= csrf_meta_tags %>
 
     <%= render partial: "layouts/head" %>

From 38e347aee6c9bd4ab8fb6e88fec647fa97d23999 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 27 Mar 2020 16:50:31 +0100
Subject: [PATCH 0413/1830] DEV: allows to decorate topic list item (#9294)

Co-authored-by: David Taylor <david@taylorhq.com>
---
 .../discourse/components/topic-list-item.js   | 14 +++++++++
 .../discourse/components/topic-title.js       | 29 ++++++++++++++++++-
 .../javascripts/discourse/lib/plugin-api.js   | 23 ++++++++++++++-
 test/javascripts/acceptance/topic-test.js     | 28 ++++++++++++++++++
 test/javascripts/helpers/qunit-helpers.js     |  2 ++
 5 files changed, 94 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js b/app/assets/javascripts/discourse/components/topic-list-item.js
index 7bc2d64603..0746ed95f6 100644
--- a/app/assets/javascripts/discourse/components/topic-list-item.js
+++ b/app/assets/javascripts/discourse/components/topic-list-item.js
@@ -7,6 +7,8 @@ import { findRawTemplate } from "discourse/lib/raw-templates";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { on } from "@ember/object/evented";
 
+import { topicTitleDecorators } from "discourse/components/topic-title";
+
 export function showEntrance(e) {
   let target = $(e.target);
 
@@ -67,6 +69,18 @@ export default Component.extend({
         }
       });
     }
+
+    schedule("afterRender", () => {
+      if (this.element && !this.isDestroying && !this.isDestroyed) {
+        const rawTopicLink = this.element.querySelector(".raw-topic-link");
+
+        rawTopicLink &&
+          topicTitleDecorators &&
+          topicTitleDecorators.forEach(cb =>
+            cb(this.topic, rawTopicLink, "topic-list-item-title")
+          );
+      }
+    });
   },
 
   willDestroyElement() {
diff --git a/app/assets/javascripts/discourse/components/topic-title.js b/app/assets/javascripts/discourse/components/topic-title.js
index 7bbc478cb3..82d41f4ad0 100644
--- a/app/assets/javascripts/discourse/components/topic-title.js
+++ b/app/assets/javascripts/discourse/components/topic-title.js
@@ -1,6 +1,33 @@
 import Component from "@ember/component";
 import KeyEnterEscape from "discourse/mixins/key-enter-escape";
+import { schedule } from "@ember/runloop";
+
+export let topicTitleDecorators = [];
+
+export function addTopicTitleDecorator(decorator) {
+  topicTitleDecorators.push(decorator);
+}
+
+export function resetTopicTitleDecorators() {
+  topicTitleDecorators = [];
+}
 
 export default Component.extend(KeyEnterEscape, {
-  elementId: "topic-title"
+  elementId: "topic-title",
+
+  didInsertElement() {
+    this._super(...arguments);
+
+    schedule("afterRender", () => {
+      if (this.element && !this.isDestroying && !this.isDestroyed) {
+        const fancyTitle = this.element.querySelector(".fancy-title");
+
+        fancyTitle &&
+          topicTitleDecorators &&
+          topicTitleDecorators.forEach(cb =>
+            cb(this.model, fancyTitle, "topic-title")
+          );
+      }
+    });
+  }
 });
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js b/app/assets/javascripts/discourse/lib/plugin-api.js
index 9439b16319..aaafba5b4c 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js
@@ -3,6 +3,7 @@ import deprecated from "discourse-common/lib/deprecated";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { addDecorator } from "discourse/widgets/post-cooked";
 import { addPluginOutletDecorator } from "discourse/components/plugin-connector";
+import { addTopicTitleDecorator } from "discourse/components/topic-title";
 import ComposerEditor from "discourse/components/composer-editor";
 import DiscourseBanner from "discourse/components/discourse-banner";
 import { addButton } from "discourse/widgets/post-menu";
@@ -54,7 +55,7 @@ import { on } from "@ember/object/evented";
 import KeyboardShortcuts, { bindings } from "discourse/lib/keyboard-shortcuts";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.8.39";
+const PLUGIN_API_VERSION = "0.8.40";
 
 class PluginApi {
   constructor(version, container) {
@@ -1017,6 +1018,26 @@ class PluginApi {
   decoratePluginOutlet(outletName, callback, opts) {
     addPluginOutletDecorator(outletName, callback, opts || {});
   }
+
+  /**
+   * Allows altering the topic title in the topic list, and in the topic view
+   *
+   * topicTitleType can be `topic-title` or `topic-list-item-title`
+   *
+   * For example, to replace the topic title:
+   *
+   * ```
+   * api.decorateTopicTitle(
+   *   (topicModel, node, topicTitleType) => {
+   *     node.innerText("my new topic title");
+   *   }
+   * );
+   * ```
+   *
+   **/
+  decorateTopicTitle(callback) {
+    addTopicTitleDecorator(callback);
+  }
 }
 
 let _pluginv01;
diff --git a/test/javascripts/acceptance/topic-test.js b/test/javascripts/acceptance/topic-test.js
index af05e5fc9e..68e6ab2c8a 100644
--- a/test/javascripts/acceptance/topic-test.js
+++ b/test/javascripts/acceptance/topic-test.js
@@ -1,3 +1,4 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
 import selectKit from "helpers/select-kit-helper";
 import { acceptance } from "helpers/qunit-helpers";
 import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
@@ -358,3 +359,30 @@ QUnit.test("Bookmarks Modal", async assert => {
   await click(".topic-post:first-child button.bookmark");
   assert.ok(exists("#bookmark-reminder-modal"), "it shows the bookmark modal");
 });
+
+acceptance("Topic with title decorated", {
+  loggedIn: true,
+  beforeEach() {
+    withPluginApi("0.8.40", api => {
+      api.decorateTopicTitle((topic, node, topicTitleType) => {
+        node.innerText = `${node.innerText}-${topic.id}-${topicTitleType}`;
+      });
+    });
+  }
+});
+
+QUnit.test("Decorate topic title", async assert => {
+  await visit("/t/internationalization-localization/280");
+
+  assert.ok(
+    find(".fancy-title")[0].innerText.endsWith("-280-topic-title"),
+    "it decorates topic title"
+  );
+
+  assert.ok(
+    find(".raw-topic-link:nth-child(1)")[0].innerText.endsWith(
+      "-27331-topic-list-item-title"
+    ),
+    "it decorates topic list item title"
+  );
+});
diff --git a/test/javascripts/helpers/qunit-helpers.js b/test/javascripts/helpers/qunit-helpers.js
index 4b6ed9330f..e0621c294d 100644
--- a/test/javascripts/helpers/qunit-helpers.js
+++ b/test/javascripts/helpers/qunit-helpers.js
@@ -16,6 +16,7 @@ import { clearRewrites } from "discourse/lib/url";
 import { initSearchData } from "discourse/widgets/search-menu";
 import { resetDecorators } from "discourse/widgets/widget";
 import { resetWidgetCleanCallbacks } from "discourse/components/mount-widget";
+import { resetTopicTitleDecorators } from "discourse/components/topic-title";
 import { resetDecorators as resetPostCookedDecorators } from "discourse/widgets/post-cooked";
 import { resetDecorators as resetPluginOutletDecorators } from "discourse/components/plugin-connector";
 import { resetCache as resetOneboxCache } from "pretty-text/oneboxer";
@@ -129,6 +130,7 @@ export function acceptance(name, options) {
       resetDecorators();
       resetPostCookedDecorators();
       resetPluginOutletDecorators();
+      resetTopicTitleDecorators();
       resetOneboxCache();
       resetCustomPostMessageCallbacks();
       Discourse._runInitializer("instanceInitializers", function(

From b2b7afd31085aa0c15e6dfdf84f9ee994659b70d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 27 Mar 2020 12:06:14 -0400
Subject: [PATCH 0414/1830] Rename the server side widget hbs compiler

---
 lib/discourse_js_processor.rb                                   | 2 +-
 .../{widget-hbs-compiler.js.es6 => widget-hbs-compiler.js}      | 0
 script/compile_hbs.rb                                           | 2 +-
 script/test_hbs_compiler.rb                                     | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/javascripts/{widget-hbs-compiler.js.es6 => widget-hbs-compiler.js} (100%)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index ebe2559982..7417207ff5 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -88,7 +88,7 @@ class DiscourseJsProcessor
       }
 
 JS
-      source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
+      source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
       js_source = ::JSON.generate(source, quirks_mode: true)
       js = ctx.eval("Babel.transform(#{js_source}, { ast: false, plugins: ['check-es2015-constants', 'transform-es2015-arrow-functions', 'transform-es2015-block-scoped-functions', 'transform-es2015-block-scoping', 'transform-es2015-classes', 'transform-es2015-computed-properties', 'transform-es2015-destructuring', 'transform-es2015-duplicate-keys', 'transform-es2015-for-of', 'transform-es2015-function-name', 'transform-es2015-literals', 'transform-es2015-object-super', 'transform-es2015-parameters', 'transform-es2015-shorthand-properties', 'transform-es2015-spread', 'transform-es2015-sticky-regex', 'transform-es2015-template-literals', 'transform-es2015-typeof-symbol', 'transform-es2015-unicode-regex'] }).code")
       ctx.eval(js)
diff --git a/lib/javascripts/widget-hbs-compiler.js.es6 b/lib/javascripts/widget-hbs-compiler.js
similarity index 100%
rename from lib/javascripts/widget-hbs-compiler.js.es6
rename to lib/javascripts/widget-hbs-compiler.js
diff --git a/script/compile_hbs.rb b/script/compile_hbs.rb
index cfec4386a2..ee072ea35d 100644
--- a/script/compile_hbs.rb
+++ b/script/compile_hbs.rb
@@ -14,7 +14,7 @@ console = {
 }
 
 JS
-source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
+source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
 js_source = ::JSON.generate(source, quirks_mode: true)
 js = ctx.eval("Babel.transform(#{js_source}, { ast: false, plugins: ['check-es2015-constants', 'transform-es2015-arrow-functions', 'transform-es2015-block-scoped-functions', 'transform-es2015-block-scoping', 'transform-es2015-classes', 'transform-es2015-computed-properties', 'transform-es2015-destructuring', 'transform-es2015-duplicate-keys', 'transform-es2015-for-of', 'transform-es2015-function-name', 'transform-es2015-literals', 'transform-es2015-object-super', 'transform-es2015-parameters', 'transform-es2015-shorthand-properties', 'transform-es2015-spread', 'transform-es2015-sticky-regex', 'transform-es2015-template-literals', 'transform-es2015-typeof-symbol', 'transform-es2015-unicode-regex'] }).code")
 ctx.eval(js)
diff --git a/script/test_hbs_compiler.rb b/script/test_hbs_compiler.rb
index badbd227e4..f3c5be35c1 100644
--- a/script/test_hbs_compiler.rb
+++ b/script/test_hbs_compiler.rb
@@ -22,7 +22,7 @@ console = {
 }
 
 JS
-source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
+source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
 ctx.eval(source)
 
 js_source = ::JSON.generate(template, quirks_mode: true)

From 7ff889574d85464b946b4cc140e637ab9ed62cff Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 27 Mar 2020 17:35:40 +0100
Subject: [PATCH 0415/1830] DEV: Add rubocop-rspec (#9288)

This adds rubocop-rspec, and enables some cops that were either already passing or are passing now, after fixing them in this commit.

Some new cops are disabled for now, with annotation: "TODO" or "To be decided". Those either need to be discussed first, or require manual changes, or the number of found and fixed offenses is too large to bundle them up in a single PR.

Includes:

* DEV: Update rubocop's `TargetRubyVersion` to 2.6
* DEV: Enable RSpec/VoidExpect
* DEV: Enable RSpec/SharedContext
* DEV: Enable RSpec/EmptyExampleGroup (Removed an obsolete empty spec file)
* DEV: Enable RSpec/ItBehavesLike
* DEV: Remove RSpec/ScatteredLet (It's too strict, as it doesn't recognize fab! as a let-like)
* DEV: Remove RSpec/MultipleExpectations
---
 .rubocop.yml                                  | 212 +++++++++++++++++-
 Gemfile                                       |   1 +
 Gemfile.lock                                  |   3 +
 spec/lib/backup_restore/restorer_spec.rb      |   7 -
 spec/lib/seed_data/categories_spec.rb         |   2 +-
 .../lib/topic_upload_security_manager_spec.rb |   8 +-
 spec/mailers/user_notifications_spec.rb       |   2 +-
 spec/models/site_setting_spec.rb              |   2 +-
 spec/models/topic_spec.rb                     |   4 +-
 9 files changed, 224 insertions(+), 17 deletions(-)
 delete mode 100644 spec/lib/backup_restore/restorer_spec.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index f9dafa672c..f74aa303ee 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,8 +1,9 @@
 require:
   - rubocop-discourse
+  - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
   DisabledByDefault: true
   Exclude:
     - "db/schema.rb"
@@ -143,3 +144,212 @@ Style/GlobalVars:
     - 'script/**/*'
     - 'spec/**/*.rb'
     - 'plugins/*/spec/**/*'
+
+# Specs
+
+RSpec/AnyInstance:
+  Enabled: false # To be decided
+
+RSpec/AroundBlock:
+  Enabled: true
+
+RSpec/BeforeAfterAll:
+  Enabled: false # To be decided
+
+RSpec/ContextMethod:
+  Enabled: false # TODO
+
+RSpec/ContextWording:
+  Enabled: false # To be decided
+
+RSpec/DescribeClass:
+  Enabled: false # To be decided
+
+RSpec/DescribeMethod:
+  Enabled: true
+
+RSpec/DescribeSymbol:
+  Enabled: false # To be decided
+
+RSpec/DescribedClass:
+  Enabled: false # To be decided
+
+RSpec/DescribedClassModuleWrapping:
+  Enabled: false # To be decided
+
+RSpec/EmptyExampleGroup:
+  Enabled: true
+
+RSpec/EmptyLineAfterExample:
+  Enabled: false # TODO
+
+RSpec/EmptyLineAfterExampleGroup:
+  Enabled: false # TODO
+
+RSpec/EmptyLineAfterFinalLet:
+  Enabled: false # TODO
+
+RSpec/EmptyLineAfterHook:
+  Enabled: false # TODO
+
+RSpec/EmptyLineAfterSubject:
+  Enabled: false # TODO
+
+RSpec/ExampleLength:
+  Enabled: false # To be decided
+
+RSpec/ExampleWithoutDescription:
+  Enabled: true
+
+RSpec/ExampleWording:
+  Enabled: false # TODO
+
+RSpec/ExpectActual:
+  Enabled: true
+
+RSpec/ExpectChange:
+  Enabled: false # To be decided
+
+RSpec/ExpectInHook:
+  Enabled: false # To be decided
+
+RSpec/ExpectOutput:
+  Enabled: true
+
+RSpec/FilePath:
+  Enabled: false # To be decided
+
+RSpec/Focus:
+  Enabled: true
+
+RSpec/HookArgument:
+  Enabled: false # TODO
+
+RSpec/HooksBeforeExamples:
+  Enabled: false # TODO
+
+RSpec/ImplicitBlockExpectation:
+  Enabled: true
+
+RSpec/ImplicitExpect:
+  Enabled: false # To be decided
+
+RSpec/ImplicitSubject:
+  Enabled: false # To be decided
+
+RSpec/InstanceSpy:
+  Enabled: true
+
+RSpec/InstanceVariable:
+  Enabled: false # TODO
+
+RSpec/InvalidPredicateMatcher:
+  Enabled: true
+
+RSpec/ItBehavesLike:
+  Enabled: true
+
+RSpec/IteratedExpectation:
+  Enabled: false # To be decided
+
+RSpec/LeadingSubject:
+  Enabled: false # TODO
+
+RSpec/LeakyConstantDeclaration:
+  Enabled: false # To be decided
+
+RSpec/LetBeforeExamples:
+  Enabled: false # TODO
+
+RSpec/LetSetup:
+  Enabled: false # TODO
+
+RSpec/MessageChain:
+  Enabled: true
+
+RSpec/MessageSpies:
+  Enabled: true
+
+RSpec/MissingExampleGroupArgument:
+  Enabled: true
+
+RSpec/MultipleDescribes:
+  Enabled: false # TODO
+
+RSpec/MultipleSubjects:
+  Enabled: true
+
+RSpec/NamedSubject:
+  Enabled: false # To be decided
+
+RSpec/NestedGroups:
+  Enabled: false # To be decided
+
+RSpec/OverwritingSetup:
+  Enabled: true
+
+RSpec/ReceiveCounts:
+  Enabled: true
+
+RSpec/ReceiveNever:
+  Enabled: true
+
+RSpec/RepeatedDescription:
+  Enabled: false # TODO
+
+RSpec/RepeatedExample:
+  Enabled: false # TODO
+
+RSpec/RepeatedExampleGroupBody:
+  Enabled: false # TODO
+
+RSpec/RepeatedExampleGroupDescription:
+  Enabled: false # TODO
+
+RSpec/ReturnFromStub:
+  Enabled: true
+
+RSpec/ScatteredSetup:
+  Enabled: false # TODO
+
+RSpec/SharedContext:
+  Enabled: true
+
+RSpec/SharedExamples:
+  Enabled: true
+
+RSpec/SingleArgumentMessageChain:
+  Enabled: true
+
+RSpec/SubjectStub:
+  Enabled: true
+
+RSpec/UnspecifiedException:
+  Enabled: true
+
+RSpec/VerifiedDoubles:
+  Enabled: true
+
+RSpec/VoidExpect:
+  Enabled: true
+
+RSpec/Yield:
+  Enabled: true
+
+Capybara/CurrentPathExpectation:
+  Enabled: true
+
+Capybara/FeatureMethods:
+  Enabled: true
+
+FactoryBot/AttributeDefinedStatically:
+  Enabled: true
+
+FactoryBot/CreateList:
+  Enabled: true
+
+FactoryBot/FactoryClassName:
+  Enabled: true
+
+Rails/HttpStatus:
+  Enabled: true
diff --git a/Gemfile b/Gemfile
index 2c0ed01915..9e4b7cb7bf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -180,6 +180,7 @@ group :test, :development do
   gem 'byebug', require: ENV['RM_INFO'].nil?, platform: :mri
   gem 'rubocop', require: false
   gem "rubocop-discourse", require: false
+  gem "rubocop-rspec", require: false
   gem 'parallel_tests'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index cc1ebd682f..71e97943f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -350,6 +350,8 @@ GEM
       unicode-display_width (>= 1.4.0, < 1.7)
     rubocop-discourse (2.0.1)
       rubocop (>= 0.69.0)
+    rubocop-rspec (1.38.1)
+      rubocop (>= 0.68.1)
     ruby-prof (1.3.1)
     ruby-progressbar (1.10.1)
     ruby-readability (0.7.0)
@@ -527,6 +529,7 @@ DEPENDENCIES
   rtlit
   rubocop
   rubocop-discourse
+  rubocop-rspec
   ruby-prof
   ruby-readability
   rubyzip
diff --git a/spec/lib/backup_restore/restorer_spec.rb b/spec/lib/backup_restore/restorer_spec.rb
deleted file mode 100644
index 47dea3e32d..0000000000
--- a/spec/lib/backup_restore/restorer_spec.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe BackupRestore::Restorer do
-
-end
diff --git a/spec/lib/seed_data/categories_spec.rb b/spec/lib/seed_data/categories_spec.rb
index 90a58cd996..e848c5ef38 100644
--- a/spec/lib/seed_data/categories_spec.rb
+++ b/spec/lib/seed_data/categories_spec.rb
@@ -33,7 +33,7 @@ describe SeedData::Categories do
       expect(category.user_id).to eq(Discourse::SYSTEM_USER_ID)
       expect(category.category_groups.count).to eq(1)
       expect(category.category_groups.first).to have_attributes(permissions(:staff, :full))
-      expect(Topic.exists?(category.topic_id))
+      expect(Topic.exists?(category.topic_id)).to eq(true)
       expect(description_post(category).raw).to eq(I18n.t("staff_category_description"))
       expect(SiteSetting.staff_category_id).to eq(category.id)
     end
diff --git a/spec/lib/topic_upload_security_manager_spec.rb b/spec/lib/topic_upload_security_manager_spec.rb
index e0800f503c..5947ceecab 100644
--- a/spec/lib/topic_upload_security_manager_spec.rb
+++ b/spec/lib/topic_upload_security_manager_spec.rb
@@ -120,7 +120,7 @@ describe TopicUploadSecurityManager do
         end
 
         it "changes the upload secure status to true and changes the ACL and rebakes the post and sets the access control post" do
-          expect(Post.any_instance.expects(:rebake!).once)
+          Post.any_instance.expects(:rebake!).once
           subject.run
           expect(upload3.reload.secure?).to eq(true)
           expect(upload3.reload.access_control_post).to eq(post4)
@@ -146,7 +146,7 @@ describe TopicUploadSecurityManager do
         end
 
         it "does not change the upload secure status and does not set the access control post" do
-          expect(Post.any_instance.expects(:rebake!).never)
+          Post.any_instance.expects(:rebake!).never
           subject.run
           expect(upload3.reload.secure?).to eq(false)
           expect(upload3.reload.access_control_post).to eq(nil)
@@ -174,14 +174,14 @@ describe TopicUploadSecurityManager do
   end
 
   def expect_upload_status_not_to_change
-    expect(Post.any_instance.expects(:rebake!).never)
+    Post.any_instance.expects(:rebake!).never
     subject.run
     expect(upload.reload.secure?).to eq(true)
     expect(upload2.reload.secure?).to eq(true)
   end
 
   def expect_upload_status_to_change_and_rebake
-    expect(Post.any_instance.expects(:rebake!).twice)
+    Post.any_instance.expects(:rebake!).twice
     subject.run
     expect(upload.reload.secure?).to eq(false)
     expect(upload2.reload.secure?).to eq(false)
diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb
index dd86e29e3c..90f6535cb1 100644
--- a/spec/mailers/user_notifications_spec.rb
+++ b/spec/mailers/user_notifications_spec.rb
@@ -968,7 +968,7 @@ describe UserNotifications do
   end
 
   # notification emails derived from templates are translated into the user's locale
-  shared_examples "notification derived from template" do
+  shared_context "notification derived from template" do
     let(:user) { Fabricate(:user, locale: locale) }
     let(:mail_type) { mail_type }
     let(:notification) { Fabricate(:notification, user: user) }
diff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rb
index 5c8f973ccc..fc18541545 100644
--- a/spec/models/site_setting_spec.rb
+++ b/spec/models/site_setting_spec.rb
@@ -178,7 +178,7 @@ describe SiteSetting do
         end.to change { @fake_logger.warnings.count }.by(2)
 
         expect do
-          expect(SiteSetting.use_https(warn: false))
+          SiteSetting.use_https(warn: false)
         end.to_not change { @fake_logger.warnings }
 
         SiteSetting.use_https = false
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 64ad9b005d..d2661162f7 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -1122,7 +1122,7 @@ describe Topic do
 
     context 'closed' do
       let(:status) { 'closed' }
-      it_should_behave_like 'a status that closes a topic'
+      it_behaves_like 'a status that closes a topic'
 
       it 'should archive group message' do
         group = Fabricate(:group)
@@ -1135,7 +1135,7 @@ describe Topic do
 
     context 'autoclosed' do
       let(:status) { 'autoclosed' }
-      it_should_behave_like 'a status that closes a topic'
+      it_behaves_like 'a status that closes a topic'
 
       context 'topic was set to close when it was created' do
         it 'includes the autoclose duration in the moderator post' do

From 702879cbda52b69179002c4410ac9b8fcfc4b12d Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Fri, 27 Mar 2020 23:01:48 +0530
Subject: [PATCH 0416/1830] FIX: check for presence of name before normalizing

---
 app/assets/javascripts/discourse/components/about-page-users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/about-page-users.js b/app/assets/javascripts/discourse/components/about-page-users.js
index 92936610d2..ce2589491d 100644
--- a/app/assets/javascripts/discourse/components/about-page-users.js
+++ b/app/assets/javascripts/discourse/components/about-page-users.js
@@ -13,7 +13,7 @@ export default Component.extend({
       let username = user.username;
       let prioritizeName = prioritizeNameInUx(name, this.siteSettings);
       let hideName = false;
-      if (normalize(username) === normalize(name)) {
+      if (name && normalize(username) === normalize(name)) {
         hideName = true;
       }
 

From 9026c55fe468e155c5d82e144888827c1e37a531 Mon Sep 17 00:00:00 2001
From: Michael Brown <michael.brown@discourse.org>
Date: Fri, 27 Mar 2020 14:16:14 -0400
Subject: [PATCH 0417/1830] FIX: custom SQL with a trailing comment might break
 BadgeGranter SQL (#9285)

For example given a custom badge with SQL:
```
SELECT 1
-- I am a comment
```

You end up with

```
FROM (SELECT 1
-- I am a comment) q
```

This fix adds newlines so you end up with the now-valid:

```
FROM (
  SELECT 1
-- I am a comment
) q
```
---
 app/services/badge_granter.rb       | 36 ++++++++++++++++++++---------
 spec/services/badge_granter_spec.rb | 11 +++++++++
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index 18dc48493f..2249b33692 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -222,13 +222,21 @@ class BadgeGranter
     BadgeGranter.contract_checks!(sql, opts)
 
     # hack to allow for params, otherwise sanitizer will trigger sprintf
-    count_sql = "SELECT COUNT(*) count FROM (#{sql}) q WHERE :backfill = :backfill"
+    count_sql = <<~SQL
+      SELECT COUNT(*) count
+                 FROM (
+                        #{sql}
+                      ) q
+                WHERE :backfill = :backfill
+    SQL
     grant_count = DB.query_single(count_sql, params).first.to_i
 
     grants_sql = if opts[:target_posts]
       <<~SQL
         SELECT u.id, u.username, q.post_id, t.title, q.granted_at
-          FROM (#{sql}) q
+          FROM (
+                 #{sql}
+               ) q
           JOIN users u on u.id = q.user_id
      LEFT JOIN badge_posts p on p.id = q.post_id
      LEFT JOIN topics t on t.id = p.topic_id
@@ -238,7 +246,9 @@ class BadgeGranter
     else
       <<~SQL
         SELECT u.id, u.username, q.granted_at
-         FROM (#{sql}) q
+         FROM (
+                #{sql}
+              ) q
          JOIN users u on u.id = q.user_id
         WHERE :backfill = :backfill
         LIMIT 10
@@ -293,13 +303,15 @@ class BadgeGranter
 
     sql = <<~SQL
       DELETE FROM user_badges
-       WHERE id IN (
-         SELECT ub.id
-           FROM user_badges ub
-      LEFT JOIN (#{badge.query}) q ON q.user_id = ub.user_id
-         #{post_clause}
-         WHERE ub.badge_id = :id AND q.user_id IS NULL
-      )
+        WHERE id IN (
+          SELECT ub.id
+          FROM user_badges ub
+          LEFT JOIN (
+            #{badge.query}
+          ) q ON q.user_id = ub.user_id
+          #{post_clause}
+          WHERE ub.badge_id = :id AND q.user_id IS NULL
+        )
     SQL
 
     DB.exec(
@@ -315,7 +327,9 @@ class BadgeGranter
       WITH w as (
         INSERT INTO user_badges(badge_id, user_id, granted_at, granted_by_id, post_id)
         SELECT :id, q.user_id, q.granted_at, -1, #{post_id_field}
-          FROM (#{badge.query}) q
+          FROM (
+                 #{badge.query}
+               ) q
      LEFT JOIN user_badges ub ON ub.badge_id = :id AND ub.user_id = q.user_id
         #{post_clause}
         /*where*/
diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb
index 362e03dff3..d6e08a1a63 100644
--- a/spec/services/badge_granter_spec.rb
+++ b/spec/services/badge_granter_spec.rb
@@ -47,6 +47,11 @@ describe BadgeGranter do
       expect(result[:grant_count]).to eq(1)
       expect(result[:query_plan]).to be_present
     end
+
+    it 'with badges containing trailing comments do not break generated SQL' do
+      query = Badge.find(1).query + "\n-- a comment"
+      expect(BadgeGranter.preview(query)[:errors]).to be_nil
+    end
   end
 
   describe 'backfill' do
@@ -114,6 +119,12 @@ describe BadgeGranter do
 
       expect(notification_badge_name).not_to eq(name_english)
     end
+
+    it 'with badges containing trailing comments do not break generated SQL' do
+      badge = Fabricate(:badge)
+      badge.query = Badge.find(1).query + "\n-- a comment"
+      expect { BadgeGranter.backfill(badge) }.not_to raise_error
+    end
   end
 
   describe 'grant' do

From 104b647ca4874329717657b228a87450e5ab5a69 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 27 Mar 2020 20:39:25 +0100
Subject: [PATCH 0418/1830] DEV: Fix another time-sensitive flaky spec

---
 spec/models/topic_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index d2661162f7..525541e414 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -1748,6 +1748,7 @@ describe Topic do
       let(:topic) { Fabricate(:topic, category: category) }
 
       it "should be able to override category's default auto close" do
+        freeze_time
         Jobs.run_immediately!
 
         expect(topic.topic_timers.first.execute_at).to eq_time(topic.created_at + 4.hours)

From a3d47f1aad104402383f1559edeac0e73ce3f59e Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 27 Mar 2020 16:06:40 -0400
Subject: [PATCH 0419/1830] UX: Better spacing for icons in select-kit labels

Followup to c14e3adac5349b0500fe7d51bd96704d7a813929
---
 app/assets/stylesheets/common/select-kit/select-kit.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index d45978ba64..65a2125971 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -79,12 +79,16 @@
 
       .name {
         display: inline-block;
-        .d-icon {
+        > .d-icon {
           margin-left: 0.5em;
           margin-right: 0;
         }
       }
 
+      > .d-icon {
+        margin-right: 0;
+      }
+
       &.select-kit-selected-color {
         border-bottom-width: 5px;
         border-bottom-style: solid;

From 7a32a995953db70c778f69a9f69a6e5c7f96463e Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Sat, 28 Mar 2020 22:24:43 +0530
Subject: [PATCH 0420/1830] FIX: Quoting a nested quote should preserve
 original post info.

---
 app/assets/javascripts/discourse/components/quote-button.js | 1 +
 app/assets/javascripts/discourse/lib/utilities.js           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/quote-button.js b/app/assets/javascripts/discourse/components/quote-button.js
index 141d9f32ac..3a9ec42fe0 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js
+++ b/app/assets/javascripts/discourse/components/quote-button.js
@@ -65,6 +65,7 @@ export default Component.extend({
         opts.username = element.dataset.username || getQuoteTitle(element);
         opts.post = element.dataset.post;
         opts.topic = element.dataset.topic;
+        break;
       }
     }
 
diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js
index e44a60d53a..87aeb9a821 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js
+++ b/app/assets/javascripts/discourse/lib/utilities.js
@@ -149,7 +149,7 @@ export function selectedText() {
 export function selectedElement() {
   const selection = window.getSelection();
   if (selection.rangeCount > 0) {
-    return selection.getRangeAt(0).startContainer.parentElement;
+    return selection.getRangeAt(0).commonAncestorContainer.parentElement;
   }
 }
 

From 3914e9cb5c719f74813597e55367d8bcd59309ae Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Sat, 28 Mar 2020 20:20:51 +0200
Subject: [PATCH 0421/1830] FIX: get_size_from_image_sizes should return
 [width, height] or nil (#9298)

---
 lib/cooked_post_processor.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 2ec33c0d2c..3cbada96b1 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -268,6 +268,7 @@ class CookedPostProcessor
         return [size["width"], size["height"]]
       end
     end
+    nil
   end
 
   def add_to_size_cache(url, w, h)

From 8ab39f69169d6336c3a319c4c259a41f4d7eaae3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 30 Mar 2020 07:52:04 +0300
Subject: [PATCH 0422/1830] Build(deps): Bump logster from 2.7.1 to 2.8.0
 (#9310)

This includes Font Awesome upgrade to version 5.

Bumps [logster](https://github.com/discourse/logster) from 2.7.1 to 2.8.0.
- [Release notes](https://github.com/discourse/logster/releases)
- [Changelog](https://github.com/discourse/logster/blob/master/CHANGELOG.md)
- [Commits](https://github.com/discourse/logster/compare/v2.7.1...v2.8.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 71e97943f9..5dc837b089 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -172,7 +172,7 @@ GEM
     logstash-event (1.2.02)
     logstash-logger (0.26.1)
       logstash-event (~> 1.2)
-    logster (2.7.1)
+    logster (2.8.0)
     loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)

From 435fe8ac6e17423eb8a786846338f613a39f385a Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 30 Mar 2020 10:35:12 +0530
Subject: [PATCH 0423/1830] FIX: allow invite email field to be blank for
 invite tokens

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

diff --git a/app/models/invite.rb b/app/models/invite.rb
index bced2785df..2618b37de9 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -18,7 +18,7 @@ class Invite < ActiveRecord::Base
   has_many :topic_invites
   has_many :topics, through: :topic_invites, source: :topic
   validates_presence_of :invited_by_id
-  validates :email, email: true, format: { with: EmailValidator.email_regex }
+  validates :email, email: true, format: { with: EmailValidator.email_regex }, allow_blank: true
 
   before_create do
     self.invite_key ||= SecureRandom.hex

From 92e81d2ae536c1822c2d4b484f79a5a62d1f5c9d Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 30 Mar 2020 09:23:00 -0400
Subject: [PATCH 0424/1830] UX: Fix composer position on iPads with a hardware
 keyboard

Adds padding to the composer when the keyboard accessory bar is shown (i.e. submit button no longer hides behind said bar)
---
 .../discourse/components/composer-body.js       | 17 +++++++++++++++++
 app/assets/stylesheets/common/base/compose.scss |  8 +++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/composer-body.js b/app/assets/javascripts/discourse/components/composer-body.js
index 1bd4c639ed..80bb8d38bb 100644
--- a/app/assets/javascripts/discourse/components/composer-body.js
+++ b/app/assets/javascripts/discourse/components/composer-body.js
@@ -156,6 +156,23 @@ export default Component.extend(KeyEnterEscape, {
       "--composer-vh",
       `${composerVH}px`
     );
+
+    const viewportWindowDiff =
+      window.innerHeight - window.visualViewport.height;
+
+    // adds bottom padding when using a hardware keyboard and the accessory bar is visible
+    // accessory bar height is 55px, using 75 allows a small buffer
+    if (viewportWindowDiff > 0 && viewportWindowDiff < 75) {
+      document.documentElement.style.setProperty(
+        "--composer-ipad-padding",
+        `${viewportWindowDiff}px`
+      );
+    } else {
+      document.documentElement.style.setProperty(
+        "--composer-ipad-padding",
+        "0px"
+      );
+    }
   },
 
   didInsertElement() {
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 7dca1ac5ea..d67224cc61 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -18,7 +18,7 @@
   }
   z-index: z("composer", "content");
   transition: height 250ms ease, background 250ms ease, transform 250ms ease,
-    max-width 250ms ease;
+    max-width 250ms ease, padding-bottom 250ms ease;
   background-color: $secondary;
   box-shadow: shadow("composer");
 
@@ -496,3 +496,9 @@ body.ios-safari-composer-hacks {
     }
   }
 }
+
+body:not(.ios-safari-composer-hacks) {
+  #reply-control.open {
+    padding-bottom: var(--composer-ipad-padding);
+  }
+}

From 2b78bd01ab2431aa90b642326d170df7c51e492b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 15:23:59 +0200
Subject: [PATCH 0425/1830] FIX: allows adapters to define a custom primaryKey
 (#9254)

---
 .../javascripts/discourse/adapters/rest.js    |  4 +-
 .../javascripts/discourse/models/store.js     | 59 +++++++++++--------
 test/javascripts/helpers/create-store.js      |  9 +++
 test/javascripts/helpers/store-pretender.js   | 14 +++++
 test/javascripts/models/store-test.js         |  6 ++
 5 files changed, 68 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/discourse/adapters/rest.js b/app/assets/javascripts/discourse/adapters/rest.js
index e92f325f84..a2287919dc 100644
--- a/app/assets/javascripts/discourse/adapters/rest.js
+++ b/app/assets/javascripts/discourse/adapters/rest.js
@@ -27,6 +27,8 @@ function rethrow(error) {
 }
 
 export default EmberObject.extend({
+  primaryKey: "id",
+
   storageKey(type, findArgs, options) {
     if (options && options.cacheKey) {
       return options.cacheKey;
@@ -132,7 +134,7 @@ export default EmberObject.extend({
   },
 
   destroyRecord(store, type, record) {
-    return ajax(this.pathFor(store, type, record.get("id")), {
+    return ajax(this.pathFor(store, type, record.get(this.primaryKey)), {
       type: "DELETE"
     });
   }
diff --git a/app/assets/javascripts/discourse/models/store.js b/app/assets/javascripts/discourse/models/store.js
index 1bc9fdf355..94441169e1 100644
--- a/app/assets/javascripts/discourse/models/store.js
+++ b/app/assets/javascripts/discourse/models/store.js
@@ -124,14 +124,14 @@ export default EmberObject.extend({
 
       if (adapter.cache) {
         const stale = adapter.findStale(this, type, findArgs, opts);
-        hydrated = this._updateStale(stale, hydrated);
+        hydrated = this._updateStale(stale, hydrated, adapter.primaryKey);
         adapter.cacheFind(this, type, findArgs, opts, hydrated);
       }
       return hydrated;
     });
   },
 
-  _updateStale(stale, hydrated) {
+  _updateStale(stale, hydrated, primaryKey) {
     if (!stale) {
       return hydrated;
     }
@@ -139,7 +139,7 @@ export default EmberObject.extend({
     hydrated.set(
       "content",
       hydrated.get("content").map(item => {
-        var staleItem = stale.content.findBy("id", item.get("id"));
+        var staleItem = stale.content.findBy(primaryKey, item.get(primaryKey));
         if (staleItem) {
           staleItem.setProperties(item);
         } else {
@@ -186,12 +186,11 @@ export default EmberObject.extend({
   },
 
   update(type, id, attrs) {
-    return this.adapterFor(type).update(this, type, id, attrs, function(
-      result
-    ) {
-      if (result && result[type] && result[type].id) {
+    const adapter = this.adapterFor(type);
+    return adapter.update(this, type, id, attrs, function(result) {
+      if (result && result[type] && result[type][adapter.primaryKey]) {
         const oldRecord = findAndRemoveMap(type, id);
-        storeMap(type, result[type].id, oldRecord);
+        storeMap(type, result[type][adapter.primaryKey], oldRecord);
       }
       return result;
     });
@@ -199,22 +198,25 @@ export default EmberObject.extend({
 
   createRecord(type, attrs) {
     attrs = attrs || {};
-    return !!attrs.id ? this._hydrate(type, attrs) : this._build(type, attrs);
+    const adapter = this.adapterFor(type);
+    return !!attrs[adapter.primaryKey]
+      ? this._hydrate(type, attrs)
+      : this._build(type, attrs);
   },
 
   destroyRecord(type, record) {
+    const adapter = this.adapterFor(type);
+
     // If the record is new, don't perform an Ajax call
     if (record.get("isNew")) {
-      removeMap(type, record.get("id"));
+      removeMap(type, record.get(adapter.primaryKey));
       return Promise.resolve(true);
     }
 
-    return this.adapterFor(type)
-      .destroyRecord(this, type, record)
-      .then(function(result) {
-        removeMap(type, record.get("id"));
-        return result;
-      });
+    return adapter.destroyRecord(this, type, record).then(function(result) {
+      removeMap(type, record.get(adapter.primaryKey));
+      return result;
+    });
   },
 
   _resultSet(type, result, findArgs) {
@@ -252,9 +254,10 @@ export default EmberObject.extend({
   },
 
   _build(type, obj) {
+    const adapter = this.adapterFor(type);
     obj.store = this;
     obj.__type = type;
-    obj.__state = obj.id ? "created" : "new";
+    obj.__state = obj[adapter.primaryKey] ? "created" : "new";
 
     // TODO: Have injections be automatic
     obj.topicTrackingState = this.register.lookup("topic-tracking-state:main");
@@ -264,7 +267,7 @@ export default EmberObject.extend({
     const klass = this.register.lookupFactory("model:" + type) || RestModel;
     const model = klass.create(obj);
 
-    storeMap(type, obj.id, model);
+    storeMap(type, obj[adapter.primaryKey], model);
     return model;
   },
 
@@ -288,6 +291,7 @@ export default EmberObject.extend({
       subType = root.meta.types[subType] || subType;
     }
 
+    const subTypeAdapter = this.adapterFor(subType);
     const pluralType = this.pluralize(subType);
     const collection = root[this.pluralize(subType)];
     if (collection) {
@@ -296,7 +300,7 @@ export default EmberObject.extend({
       if (!hashedCollection) {
         hashedCollection = {};
         collection.forEach(function(it) {
-          hashedCollection[it.id] = it;
+          hashedCollection[it[subTypeAdapter.primaryKey]] = it;
         });
         root[hashedProp] = hashedCollection;
       }
@@ -311,7 +315,12 @@ export default EmberObject.extend({
   },
 
   _hydrateEmbedded(type, obj, root) {
+    const adapter = this.adapterFor(type);
     Object.keys(obj).forEach(k => {
+      if (k === adapter.primaryKey) {
+        return;
+      }
+
       const m = /(.+)\_id(s?)$/.exec(k);
       if (m) {
         const subType = m[1];
@@ -340,9 +349,13 @@ export default EmberObject.extend({
       throw new Error("Can't hydrate " + type + " of `null`");
     }
 
-    const id = obj.id;
+    const adapter = this.adapterFor(type);
+
+    const id = obj[adapter.primaryKey];
     if (!id) {
-      throw new Error("Can't hydrate " + type + " without an `id`");
+      throw new Error(
+        `Can't hydrate ${type} without primaryKey: \`${adapter.primaryKey}\``
+      );
     }
 
     root = root || obj;
@@ -357,7 +370,7 @@ export default EmberObject.extend({
     }
 
     if (existing) {
-      delete obj.id;
+      delete obj[adapter.primaryKey];
       let klass = this.register.lookupFactory("model:" + type);
 
       if (klass && klass.class) {
@@ -369,7 +382,7 @@ export default EmberObject.extend({
       }
 
       existing.setProperties(klass.munge(obj));
-      obj.id = id;
+      obj[adapter.primaryKey] = id;
       return existing;
     }
 
diff --git a/test/javascripts/helpers/create-store.js b/test/javascripts/helpers/create-store.js
index 8eccc0d6ea..5385a48fd0 100644
--- a/test/javascripts/helpers/create-store.js
+++ b/test/javascripts/helpers/create-store.js
@@ -5,12 +5,21 @@ import TopicListAdapter from "discourse/adapters/topic-list";
 import TopicTrackingState from "discourse/models/topic-tracking-state";
 import { buildResolver } from "discourse-common/resolver";
 
+const CatAdapter = RestAdapter.extend({
+  primaryKey: "cat_id"
+});
+
 export default function(customLookup = () => {}) {
   const resolver = buildResolver("discourse").create();
 
   return Store.create({
     register: {
       lookup(type) {
+        if (type === "adapter:cat") {
+          this._catAdapter =
+            this._catAdapter || CatAdapter.create({ owner: this });
+          return this._catAdapter;
+        }
         if (type === "adapter:rest") {
           if (!this._restAdapter) {
             this._restAdapter = RestAdapter.create({ owner: this });
diff --git a/test/javascripts/helpers/store-pretender.js b/test/javascripts/helpers/store-pretender.js
index 30be5640f7..1579abaace 100644
--- a/test/javascripts/helpers/store-pretender.js
+++ b/test/javascripts/helpers/store-pretender.js
@@ -26,9 +26,23 @@ const colors = [
   { id: 3, name: "Yellow" }
 ];
 
+const cats = [
+  {
+    cat_id: 1,
+    name: "souna"
+  }
+];
+
 export default function(helpers) {
   const { response, success, parsePostData } = helpers;
 
+  this.get("/cats", function() {
+    return response({
+      __rest_serializer: "1",
+      cats
+    });
+  });
+
   this.get("/fruits/:id", function(request) {
     const fruit = fruits.find(f => f.id === parseInt(request.params.id, 10));
     return response({ __rest_serializer: "1", fruit, farmers, colors });
diff --git a/test/javascripts/models/store-test.js b/test/javascripts/models/store-test.js
index 386094151c..f002726e65 100644
--- a/test/javascripts/models/store-test.js
+++ b/test/javascripts/models/store-test.js
@@ -182,3 +182,9 @@ QUnit.test("findAll embedded", async assert => {
 
   assert.equal(fruits.objectAt(2).get("farmer.name"), "Luke Skywalker");
 });
+
+QUnit.test("custom primaryKey", async assert => {
+  const store = createStore();
+  const cats = await store.findAll("cat");
+  assert.equal(cats.objectAt(0).name, "souna");
+});

From 0841ba1c6b76ef554e651c459af89a5804ea3ce0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 30 Mar 2020 11:18:31 -0400
Subject: [PATCH 0426/1830] Build(deps): Bump unf_ext from 0.0.7.6 to 0.0.7.7
 (#9306)

Bumps [unf_ext](https://github.com/knu/ruby-unf_ext) from 0.0.7.6 to 0.0.7.7.
- [Release notes](https://github.com/knu/ruby-unf_ext/releases)
- [Changelog](https://github.com/knu/ruby-unf_ext/blob/master/CHANGELOG.md)
- [Commits](https://github.com/knu/ruby-unf_ext/commits)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 5dc837b089..3645c97d85 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -405,7 +405,7 @@ GEM
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.7.7)
     unicode-display_width (1.6.1)
     unicorn (5.5.4)
       kgio (~> 2.6)

From 14b8e221e7332cd4334b3f71e04e568f6b259aac Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 30 Mar 2020 11:18:55 -0400
Subject: [PATCH 0427/1830] Build(deps): Bump cose from 0.11.0 to 1.0.0 (#9307)

Bumps [cose](https://github.com/cedarcode/cose-ruby) from 0.11.0 to 1.0.0.
- [Release notes](https://github.com/cedarcode/cose-ruby/releases)
- [Changelog](https://github.com/cedarcode/cose-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cedarcode/cose-ruby/compare/v0.11.0...v1.0.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3645c97d85..75aa846e21 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,9 +86,9 @@ GEM
     colored2 (3.1.2)
     concurrent-ruby (1.1.6)
     connection_pool (2.2.2)
-    cose (0.11.0)
+    cose (1.0.0)
       cbor (~> 0.5.9)
-      openssl-signature_algorithm (~> 0.3.0)
+      openssl-signature_algorithm (~> 0.4.0)
     cppjieba_rb (0.3.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -248,7 +248,7 @@ GEM
       mustache
       nokogiri (~> 1.7)
       sanitize
-    openssl-signature_algorithm (0.3.0)
+    openssl-signature_algorithm (0.4.0)
     optimist (3.0.0)
     parallel (1.19.1)
     parallel_tests (2.32.0)

From d0d5f0c912a207abfc5b993bef25c880ee530831 Mon Sep 17 00:00:00 2001
From: Zdravko Curic <zcuric@users.noreply.github.com>
Date: Mon, 30 Mar 2020 17:37:14 +0200
Subject: [PATCH 0428/1830] DEV: Add Ember.PromiseProxyMixin to ember modules
 (#9312)

---
 app/assets/javascripts/discourse-loader.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index cde52ac72c..e73ecd2b7b 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -77,6 +77,7 @@ var define, requirejs;
       },
       "@ember/object/mixin": { default: Ember.Mixin },
       "@ember/object/proxy": { default: Ember.ObjectProxy },
+      "@ember/object/promise-proxy-mixin": { default: Ember.PromiseProxyMixin },
       "@ember/object/evented": {
         default: Ember.Evented,
         on: Ember.on

From 6c2717eda04885ca54a5836eb55c271548067e1e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 17:59:25 +0200
Subject: [PATCH 0429/1830] UX: ensures esc key is correctly working when in
 dates form (#9299)

1 esc close modal focus date button in toolbar
2 esc reduces composer
---
 .../discourse-local-dates-create-modal.js.es6 | 21 +++++++++++++++++++
 .../discourse-local-dates-create-form.hbs     |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 plugins/discourse-local-dates/assets/javascripts/discourse/controllers/discourse-local-dates-create-modal.js.es6

diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/controllers/discourse-local-dates-create-modal.js.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse/controllers/discourse-local-dates-create-modal.js.es6
new file mode 100644
index 0000000000..103ac02adc
--- /dev/null
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/controllers/discourse-local-dates-create-modal.js.es6
@@ -0,0 +1,21 @@
+import Controller from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { schedule } from "@ember/runloop";
+
+export default Controller.extend(ModalFunctionality, {
+  onShow() {
+    schedule("afterRender", () => {
+      const fromButton = document.getElementById("from-date-time");
+      fromButton && fromButton.focus();
+    });
+  },
+
+  onClose() {
+    schedule("afterRender", () => {
+      const localDatesBtn = document.querySelector(
+        ".d-editor-button-bar .local-dates.btn"
+      );
+      localDatesBtn && localDatesBtn.focus();
+    });
+  }
+});
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index 30bc69e34d..92adae679a 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -23,6 +23,7 @@
         <div class="date-time-control from {{if fromSelected 'is-selected'}} {{if fromFilled 'is-filled'}}">
           {{d-icon "calendar-alt"}}
           {{d-button
+            id="from-date-time"
             action=(action "focusFrom")
             translatedLabel=formattedFrom
             class="date-time"}}

From 96e841a635776e23a788f93e2fe99b78b45f73f2 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 18:02:34 +0200
Subject: [PATCH 0430/1830] DEV: trigger :username_changed when a user is
 renamed (#9301)

---
 app/jobs/regular/update_username.rb    | 2 ++
 spec/services/username_changer_spec.rb | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/jobs/regular/update_username.rb b/app/jobs/regular/update_username.rb
index a92cf82c6e..d43c119060 100644
--- a/app/jobs/regular/update_username.rb
+++ b/app/jobs/regular/update_username.rb
@@ -34,6 +34,8 @@ module Jobs
       update_revisions
       update_notifications
       update_post_custom_fields
+
+      DiscourseEvent.trigger(:username_changed, @old_username, @new_username)
     end
 
     def update_posts
diff --git a/spec/services/username_changer_spec.rb b/spec/services/username_changer_spec.rb
index 3fb20ceb4d..0013c82a94 100644
--- a/spec/services/username_changer_spec.rb
+++ b/spec/services/username_changer_spec.rb
@@ -11,13 +11,20 @@ describe UsernameChanger do
     let(:user) { Fabricate(:user) }
 
     context 'success' do
+      let!(:old_username) { user.username }
       let(:new_username) { "#{user.username}1234" }
 
       it 'should change the username' do
-        @result = UsernameChanger.change(user, new_username)
+        event = DiscourseEvent.track_events {
+          @result = UsernameChanger.change(user, new_username)
+        }.last
 
         expect(@result).to eq(true)
 
+        expect(event[:event_name]).to eq(:username_changed)
+        expect(event[:params].first).to eq(old_username)
+        expect(event[:params].second).to eq(new_username)
+
         user.reload
         expect(user.username).to eq(new_username)
         expect(user.username_lower).to eq(new_username.downcase)

From acdbcabd0e45cadb0a2de843fdacf5cf75157e2a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 18:12:32 +0200
Subject: [PATCH 0431/1830] DEV: Allows moduleForWidget to use before/afterEach
 options (#9296)

---
 test/javascripts/helpers/widget-test.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/javascripts/helpers/widget-test.js b/test/javascripts/helpers/widget-test.js
index 2289e7381d..6cd3fbd16f 100644
--- a/test/javascripts/helpers/widget-test.js
+++ b/test/javascripts/helpers/widget-test.js
@@ -1,7 +1,14 @@
 import componentTest from "helpers/component-test";
 
-export function moduleForWidget(name) {
-  moduleForComponent(name, `widget:${name}`, { integration: true });
+export function moduleForWidget(name, options = {}) {
+  moduleForComponent(
+    name,
+    `widget:${name}`,
+    Object.assign(
+      { integration: true },
+      { beforeEach: options.beforeEach, afterEach: options.afterEach }
+    )
+  );
 }
 
 export function widgetTest(name, opts) {

From f8cb46c0e1886992b45ee9860e0f9ceab2c6851b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 18:55:15 +0200
Subject: [PATCH 0432/1830] FIX: prevents exception when clicking component
 title above ace editor (#9309)

---
 app/assets/javascripts/admin/components/ace-editor.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/admin/components/ace-editor.js b/app/assets/javascripts/admin/components/ace-editor.js
index 4fc881dae4..123193c0c0 100644
--- a/app/assets/javascripts/admin/components/ace-editor.js
+++ b/app/assets/javascripts/admin/components/ace-editor.js
@@ -57,7 +57,7 @@ export default Component.extend({
     }
     if (this.appEvents) {
       // xxx: don't run during qunit tests
-      this.appEvents.off("ace:resize", this, this.resize);
+      this.appEvents.off("ace:resize", this, "resize");
     }
 
     $(window).off("ace:resize");
@@ -97,9 +97,7 @@ export default Component.extend({
 
         $(window)
           .off("ace:resize")
-          .on("ace:resize", () => {
-            this.appEvents.trigger("ace:resize");
-          });
+          .on("ace:resize", () => this.appEvents.trigger("ace:resize"));
 
         if (this.appEvents) {
           // xxx: don't run during qunit tests

From aeaea3c154c5caa0d44b059015efd4b234467187 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 19:08:47 +0200
Subject: [PATCH 0433/1830] FIX: correctly take category/group filters into csv
 export (#9300)

---
 app/jobs/regular/export_csv_file.rb | 13 ++++++++++--
 spec/jobs/export_csv_file_spec.rb   | 33 ++++++++++++++++++++++-------
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index ee172de679..39f9c565b1 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -7,6 +7,10 @@ module Jobs
   class ExportCsvFile < ::Jobs::Base
     sidekiq_options retry: false
 
+    attr_accessor :extra
+    attr_accessor :current_user
+    attr_accessor :entity
+
     HEADER_ATTRS_FOR ||= HashWithIndifferentAccess.new(
       user_archive: ['topic_title', 'categories', 'is_pm', 'post', 'like_count', 'reply_count', 'url', 'created_at'],
       user_list: ['id', 'name', 'username', 'email', 'title', 'created_at', 'last_seen_at', 'last_posted_at', 'last_emailed_at', 'trust_level', 'approved', 'suspended_at', 'suspended_till', 'silenced_till', 'active', 'admin', 'moderator', 'ip_address', 'staged', 'secondary_emails'],
@@ -180,8 +184,13 @@ module Jobs
 
       @extra[:start_date] = @extra[:start_date].to_date.beginning_of_day if @extra[:start_date].is_a?(String)
       @extra[:end_date] = @extra[:end_date].to_date.end_of_day if @extra[:end_date].is_a?(String)
-      @extra[:category_id] = @extra[:category_id].present? ? @extra[:category_id].to_i : nil
-      @extra[:group_id] = @extra[:group_id].present? ? @extra[:group_id].to_i : nil
+      @extra[:filters] = {}
+      if @extra[:category_id].present?
+        @extra[:filters][:category] = @extra[:category_id].to_i
+      end
+      if @extra[:group_id].present?
+        @extra[:filters][:group] = @extra[:group_id].to_i
+      end
 
       report = Report.find(@extra[:name], @extra)
 
diff --git a/spec/jobs/export_csv_file_spec.rb b/spec/jobs/export_csv_file_spec.rb
index 3852494cb1..62ffb151ba 100644
--- a/spec/jobs/export_csv_file_spec.rb
+++ b/spec/jobs/export_csv_file_spec.rb
@@ -55,7 +55,7 @@ describe Jobs::ExportCsvFile do
       post = Fabricate(:post, topic: topic, user: user)
 
       exporter = Jobs::ExportCsvFile.new
-      exporter.instance_variable_set(:@current_user, User.find_by(id: user.id))
+      exporter.current_user = User.find_by(id: user.id)
 
       rows = []
       exporter.user_archive_export { |row| rows << row }
@@ -79,9 +79,9 @@ describe Jobs::ExportCsvFile do
 
     let(:exporter) do
       exporter = Jobs::ExportCsvFile.new
-      exporter.instance_variable_set(:@entity, 'report')
-      exporter.instance_variable_set(:@extra, HashWithIndifferentAccess.new(start_date: '2010-01-01', end_date: '2011-01-01'))
-      exporter.instance_variable_set(:@current_user, User.find_by(id: user.id))
+      exporter.entity = 'report'
+      exporter.extra = HashWithIndifferentAccess.new(start_date: '2010-01-01', end_date: '2011-01-01')
+      exporter.current_user = User.find_by(id: user.id)
       exporter
     end
 
@@ -89,7 +89,7 @@ describe Jobs::ExportCsvFile do
       user.user_visits.create!(visited_at: '2010-01-01', posts_read: 42)
       Fabricate(:user).user_visits.create!(visited_at: '2010-01-03', posts_read: 420)
 
-      exporter.instance_variable_get(:@extra)['name'] = 'dau_by_mau'
+      exporter.extra['name'] = 'dau_by_mau'
       report = exporter.report_export.to_a
 
       expect(report.first).to contain_exactly("Day", "Percent")
@@ -97,11 +97,28 @@ describe Jobs::ExportCsvFile do
       expect(report.third).to contain_exactly("2010-01-03", "50.0")
     end
 
+    it 'works with filters' do
+      user.user_visits.create!(visited_at: '2010-01-01', posts_read: 42)
+
+      group = Fabricate(:group)
+      user1 = Fabricate(:user)
+      group_user = Fabricate(:group_user, group: group, user: user1)
+      user1.user_visits.create!(visited_at: '2010-01-03', posts_read: 420)
+
+      exporter.extra['name'] = 'visits'
+      exporter.extra['group_id'] = group.id
+      report = exporter.report_export.to_a
+
+      expect(report.length).to eq(2)
+      expect(report.first).to contain_exactly("Day", "Count")
+      expect(report.second).to contain_exactly("2010-01-03", "1")
+    end
+
     it 'works with single-column reports with default label' do
       user.user_visits.create!(visited_at: '2010-01-01')
       Fabricate(:user).user_visits.create!(visited_at: '2010-01-03')
 
-      exporter.instance_variable_get(:@extra)['name'] = 'visits'
+      exporter.extra['name'] = 'visits'
       report = exporter.report_export.to_a
 
       expect(report.first).to contain_exactly("Day", "Count")
@@ -113,7 +130,7 @@ describe Jobs::ExportCsvFile do
       DiscourseIpInfo.stubs(:get).with("1.1.1.1").returns(location: "Earth")
       user.user_auth_token_logs.create!(action: "login", client_ip: "1.1.1.1", created_at: '2010-01-01')
 
-      exporter.instance_variable_get(:@extra)['name'] = 'staff_logins'
+      exporter.extra['name'] = 'staff_logins'
       report = exporter.report_export.to_a
 
       expect(report.first).to contain_exactly("User", "Location", "Login at")
@@ -133,7 +150,7 @@ describe Jobs::ExportCsvFile do
       ApplicationRequest.create!(date: '2010-01-02', req_type: 'page_view_crawler', count: 8)
       ApplicationRequest.create!(date: '2010-01-03', req_type: 'page_view_crawler', count: 9)
 
-      exporter.instance_variable_get(:@extra)['name'] = 'consolidated_page_views'
+      exporter.extra['name'] = 'consolidated_page_views'
       report = exporter.report_export.to_a
 
       expect(report[0]).to contain_exactly("Day", "Logged in users", "Anonymous users", "Crawlers")

From a3345057f2a14b25cf8f436e248d17e78502a8ce Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 19:17:08 +0200
Subject: [PATCH 0434/1830] FIX: prevents rendering empty timeline-controls
 (#9304)

The streamlength/height code when true would return just after we had inserted the timeline-controls, resulting, on topic-progress event to display an empty timeline-controls when clicked.

I think this code in unecessary and we should only rely on the code in `hideProgress` which will currenly hide the progress is the stream has only one post displayed on desktop (always shown on mobile).
---
 .../javascripts/discourse/components/topic-progress.js |  7 ++-----
 .../javascripts/discourse/widgets/topic-timeline.js    | 10 ----------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/topic-progress.js b/app/assets/javascripts/discourse/components/topic-progress.js
index 61c4484be4..35e40d175e 100644
--- a/app/assets/javascripts/discourse/components/topic-progress.js
+++ b/app/assets/javascripts/discourse/components/topic-progress.js
@@ -34,11 +34,8 @@ export default Component.extend({
     "postStream.filteredPostsCount"
   )
   hideProgress(loaded, currentPost, filteredPostsCount) {
-    return (
-      !loaded ||
-      !currentPost ||
-      (!this.site.mobileView && filteredPostsCount < 2)
-    );
+    const hideOnShortStream = !this.site.mobileView && filteredPostsCount < 2;
+    return !loaded || !currentPost || hideOnShortStream;
   },
 
   @discourseComputed("postStream.filteredPostsCount")
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js b/app/assets/javascripts/discourse/widgets/topic-timeline.js
index f6ba07b742..617a13bcd4 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js
@@ -442,7 +442,6 @@ export default createWidget("topic-timeline", {
   html(attrs) {
     const { topic } = attrs;
     const createdAt = new Date(topic.created_at);
-    const stream = attrs.topic.get("postStream.stream");
     const { currentUser } = this;
     const { tagging_enabled, topic_featured_link_enabled } = this.siteSettings;
 
@@ -517,15 +516,6 @@ export default createWidget("topic-timeline", {
     }
 
     result.push(this.attach("timeline-controls", attrs));
-    const streamLength = stream.length;
-
-    if (streamLength !== 0 && streamLength < 3) {
-      const topicHeight = $("#topic").height();
-      const windowHeight = $(window).height();
-      if (topicHeight / windowHeight < 2.0) {
-        return result;
-      }
-    }
 
     const bottomAge = relativeAge(new Date(topic.last_posted_at), {
       addAgo: true,

From fa5ba6beb88be44c64c9db9bdede4e2e7da65d3d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 19:34:53 +0200
Subject: [PATCH 0435/1830] FIX: ensures mini-tag-chooser display min tags req
 if no selection (#9303)

---
 .../select-kit/components/mini-tag-chooser.js      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
index 4f89e380b8..d8c63c9ae5 100644
--- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
+++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
@@ -77,6 +77,20 @@ export default ComboBox.extend(TagsMixin, {
     );
   }),
 
+  modifyNoSelection() {
+    if (this.selectKit.options.minimum) {
+      const minimum = parseInt(this.selectKit.options.minimum, 10);
+      if (minimum > 0) {
+        return this.defaultItem(
+          null,
+          I18n.t("select_kit.min_content_not_reached", { count: minimum })
+        );
+      }
+    }
+
+    return this._super(...arguments);
+  },
+
   init() {
     this._super(...arguments);
 

From 0996c3b7b36c37c3b478985da6e968f54dc4835c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 20:16:10 +0200
Subject: [PATCH 0436/1830] FEATURE: allows multiple custom emoji groups
 (#9308)

Note: DBHelper would fail with a sql syntax error on columns like "group".

Co-authored-by: Jarek Radosz <jradosz@gmail.com>
---
 .../admin/controllers/admin-emojis.js         | 83 ++++++++++++++-----
 .../javascripts/admin/templates/emojis.hbs    | 68 +++++++++------
 .../discourse/components/emoji-picker.js      | 29 +++++--
 .../discourse/components/emoji-uploader.js    | 48 +++++++++--
 .../discourse/initializers/enable-emoji.js    |  2 +-
 .../templates/components/emoji-uploader.hbs   | 59 ++++++++++---
 .../discourse/templates/emoji-picker.hbr.erb  | 36 ++++----
 app/assets/javascripts/pretty-text/emoji.js   | 14 ++--
 .../stylesheets/common/admin/admin_base.scss  |  1 +
 .../common/admin/admin_emojis.scss            | 50 +++++++++++
 .../stylesheets/common/admin/customize.scss   |  2 +-
 app/assets/stylesheets/common/base/emoji.scss |  2 +
 app/assets/stylesheets/mobile/emoji.scss      |  4 +
 app/controllers/admin/emojis_controller.rb    |  5 +-
 app/models/custom_emoji.rb                    |  1 +
 app/models/emoji.rb                           | 18 ++--
 app/serializers/emoji_serializer.rb           |  2 +-
 config/locales/client.en.yml                  |  3 +-
 ...200116092259_add_group_to_custom_emojis.rb |  7 ++
 lib/db_helper.rb                              | 22 ++---
 lib/plugin/instance.rb                        | 25 ++++--
 spec/components/plugin/instance_spec.rb       | 26 ++++++
 spec/requests/admin/emojis_controller_spec.rb | 40 ++++++---
 test/javascripts/lib/pretty-text-test.js      | 19 +++++
 24 files changed, 428 insertions(+), 138 deletions(-)
 create mode 100644 app/assets/stylesheets/common/admin/admin_emojis.scss
 create mode 100644 db/migrate/20200116092259_add_group_to_custom_emojis.rb

diff --git a/app/assets/javascripts/admin/controllers/admin-emojis.js b/app/assets/javascripts/admin/controllers/admin-emojis.js
index 6a1d295759..1a49670703 100644
--- a/app/assets/javascripts/admin/controllers/admin-emojis.js
+++ b/app/assets/javascripts/admin/controllers/admin-emojis.js
@@ -1,37 +1,74 @@
 import { sort } from "@ember/object/computed";
-import EmberObject from "@ember/object";
+import EmberObject, { action, computed } from "@ember/object";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
+
+const ALL_FILTER = "all";
+
 export default Controller.extend({
-  sortedEmojis: sort("model", "emojiSorting"),
+  filter: null,
+  sorting: null,
 
   init() {
     this._super(...arguments);
 
-    this.emojiSorting = ["name"];
+    this.setProperties({
+      filter: ALL_FILTER,
+      sorting: ["group", "name"]
+    });
   },
 
-  actions: {
-    emojiUploaded(emoji) {
-      emoji.url += "?t=" + new Date().getTime();
-      this.model.pushObject(EmberObject.create(emoji));
-    },
+  sortedEmojis: sort("filteredEmojis.[]", "sorting"),
 
-    destroy(emoji) {
-      return bootbox.confirm(
-        I18n.t("admin.emoji.delete_confirm", { name: emoji.get("name") }),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        destroy => {
-          if (destroy) {
-            return ajax("/admin/customize/emojis/" + emoji.get("name"), {
-              type: "DELETE"
-            }).then(() => {
-              this.model.removeObject(emoji);
-            });
-          }
-        }
-      );
+  emojiGroups: computed("model", {
+    get() {
+      return this.model.mapBy("group").uniq();
     }
+  }),
+
+  sortingGroups: computed("emojiGroups.[]", {
+    get() {
+      return [ALL_FILTER].concat(this.emojiGroups);
+    }
+  }),
+
+  filteredEmojis: computed("model.[]", "filter", {
+    get() {
+      if (!this.filter || this.filter === ALL_FILTER) {
+        return this.model;
+      } else {
+        return this.model.filterBy("group", this.filter);
+      }
+    }
+  }),
+
+  @action
+  filterGroups(value) {
+    this.set("filter", value);
+  },
+
+  @action
+  emojiUploaded(emoji, group) {
+    emoji.url += "?t=" + new Date().getTime();
+    emoji.group = group;
+    this.model.pushObject(EmberObject.create(emoji));
+  },
+
+  @action
+  destroyEmoji(emoji) {
+    return bootbox.confirm(
+      I18n.t("admin.emoji.delete_confirm", { name: emoji.get("name") }),
+      I18n.t("no_value"),
+      I18n.t("yes_value"),
+      destroy => {
+        if (destroy) {
+          return ajax("/admin/customize/emojis/" + emoji.get("name"), {
+            type: "DELETE"
+          }).then(() => {
+            this.model.removeObject(emoji);
+          });
+        }
+      }
+    );
   }
 });
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index 5f9de8104c..f2547b9678 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -1,35 +1,49 @@
-<div class='emoji'>
-  <h2>{{i18n 'admin.emoji.title'}}</h2>
+<div class='admin-emojis'>
+  <h1>{{i18n 'admin.emoji.title'}}</h1>
 
-  <p class="desc">{{i18n 'admin.emoji.help'}}</p>
+  <p class="desc">{{i18n "admin.emoji.help"}}</p>
 
-  <p>{{emoji-uploader done=(action "emojiUploaded")}}</p>
+  {{emoji-uploader
+    emojiGroups=emojiGroups
+    done=(action "emojiUploaded")
+  }}
+
+  <hr>
 
   {{#if sortedEmojis}}
-    <div>
-      <table id="custom_emoji">
-        <thead>
+    <table id="custom_emoji">
+      <thead>
+        <tr>
+          <th>{{i18n "admin.emoji.image"}}</th>
+          <th>{{i18n "admin.emoji.name"}}</th>
+          <th>
+            {{combo-box
+              value=filter
+              content=sortingGroups
+              nameProperty=null
+              valueProperty=null
+              onChange=(action "filterGroups")
+            }}
+          </th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        {{#each sortedEmojis as |e|}}
           <tr>
-            <th>{{i18n "admin.emoji.image"}}</th>
-            <th>{{i18n "admin.emoji.name"}}</th>
-            <th></th>
+            <th><img class="emoji emoji-custom" src={{e.url}} title={{e.name}}></th>
+            <th>:{{e.name}}:</th>
+            <th>{{e.group}}</th>
+            <th>
+              {{d-button
+                action=(action "destroyEmoji" e)
+                class="btn-danger"
+                icon="far-trash-alt"
+              }}
+            </th>
           </tr>
-        </thead>
-        <tbody>
-          {{#each sortedEmojis as |e|}}
-            <tr>
-              <th><img class="emoji emoji-custom" src={{e.url}} title={{e.name}}></th>
-              <th>:{{e.name}}:</th>
-              <th>
-                {{d-button
-                  action=(action "destroy" e)
-                  class="btn-danger pull-right"
-                  icon="far-trash-alt"}}
-              </th>
-            </tr>
-          {{/each}}
-        </tbody>
-      </table>
-    </div>
+        {{/each}}
+      </tbody>
+    </table>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js b/app/assets/javascripts/discourse/components/emoji-picker.js
index 2696ca1358..ef56c4182a 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js
@@ -14,9 +14,26 @@ import ENV, { INPUT_DELAY } from "discourse-common/config/environment";
 const { run } = Ember;
 
 const PER_ROW = 11;
-const customEmojis = _.keys(extendedEmojiList()).map(code => {
-  return { code, src: emojiUrlFor(code) };
-});
+function customEmojis() {
+  const list = extendedEmojiList();
+  const emojis = Object.keys(list)
+    .map(code => {
+      const { group } = list[code];
+      return {
+        code,
+        src: emojiUrlFor(code),
+        group,
+        key: `emoji_picker.${group || "default"}`
+      };
+    })
+    .reduce((acc, curr) => {
+      if (!acc[curr.group]) acc[curr.group] = [];
+      acc[curr.group].push(curr);
+      return acc;
+    }, {});
+
+  return Object.values(emojis);
+}
 
 export default Component.extend({
   automaticPositioning: true,
@@ -35,7 +52,9 @@ export default Component.extend({
   },
 
   show() {
-    const template = findRawTemplate("emoji-picker")({ customEmojis });
+    const template = findRawTemplate("emoji-picker")({
+      customEmojis: customEmojis()
+    });
     this.$picker.html(template);
 
     this.$filter = this.$picker.find(".filter");
@@ -579,7 +598,7 @@ export default Component.extend({
       this.$picker.width() -
       this.$picker.find(".categories-column").width() -
       this.$picker.find(".diversity-picker").width() -
-      32;
+      60;
     this.$picker.find(".info").css("max-width", infoMaxWidth);
   },
 
diff --git a/app/assets/javascripts/discourse/components/emoji-uploader.js b/app/assets/javascripts/discourse/components/emoji-uploader.js
index 77e2d5e9ff..9693811c15 100644
--- a/app/assets/javascripts/discourse/components/emoji-uploader.js
+++ b/app/assets/javascripts/discourse/components/emoji-uploader.js
@@ -1,23 +1,53 @@
 import { notEmpty, not } from "@ember/object/computed";
+import { action } from "@ember/object";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import UploadMixin from "discourse/mixins/upload";
 
+const DEFAULT_GROUP = "default";
+
 export default Component.extend(UploadMixin, {
   type: "emoji",
   uploadUrl: "/admin/customize/emojis",
   hasName: notEmpty("name"),
+  hasGroup: notEmpty("group"),
   addDisabled: not("hasName"),
+  group: "default",
+  emojiGroups: null,
+  newEmojiGroups: null,
+  tagName: null,
 
-  uploadOptions() {
-    return {
-      sequentialUploads: true
-    };
+  didReceiveAttrs() {
+    this._super(...arguments);
+
+    this.set("newEmojiGroups", this.emojiGroups);
   },
 
-  @discourseComputed("hasName", "name")
-  data(hasName, name) {
-    return hasName ? { name } : {};
+  uploadOptions() {
+    return { sequentialUploads: true };
+  },
+
+  @action
+  createEmojiGroup(group) {
+    this.setProperties({
+      newEmojiGroups: this.emojiGroups.concat([group]).uniq(),
+      group
+    });
+  },
+
+  @discourseComputed("hasName", "name", "hasGroup", "group")
+  data(hasName, name, hasGroup, group) {
+    const payload = {};
+
+    if (hasName) {
+      payload.name = name;
+    }
+
+    if (hasGroup && group !== DEFAULT_GROUP) {
+      payload.group = group;
+    }
+
+    return payload;
   },
 
   validateUploadedFilesOptions() {
@@ -25,7 +55,7 @@ export default Component.extend(UploadMixin, {
   },
 
   uploadDone(upload) {
-    this.set("name", null);
-    this.done(upload);
+    this.done(upload, this.group);
+    this.setProperties({ name: null, group: DEFAULT_GROUP });
   }
 });
diff --git a/app/assets/javascripts/discourse/initializers/enable-emoji.js b/app/assets/javascripts/discourse/initializers/enable-emoji.js
index 71bf416025..a6e3e6d03a 100644
--- a/app/assets/javascripts/discourse/initializers/enable-emoji.js
+++ b/app/assets/javascripts/discourse/initializers/enable-emoji.js
@@ -24,7 +24,7 @@ export default {
     });
 
     (PreloadStore.get("customEmoji") || []).forEach(emoji =>
-      registerEmoji(emoji.name, emoji.url)
+      registerEmoji(emoji.name, emoji.url, emoji.group)
     );
   }
 };
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs b/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
index 153fe696a6..186ee15afe 100644
--- a/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
@@ -1,11 +1,48 @@
-{{text-field name="name" placeholderKey="admin.emoji.name" value=name}}
-
-<label class="btn btn-primary {{if addDisabled 'disabled'}}">
-  {{d-icon "plus"}}
-  {{i18n "admin.emoji.add"}}
-  <input
-    class="hidden-upload-field"
-    disabled={{addDisabled}}
-    type="file"
-    accept=".png,.gif">
-</label>
+{{#conditional-loading-section isLoading=uploading}}
+  <div class="emoji-uploader">
+    <div class="control">
+      <span class="label">
+        {{i18n "admin.emoji.name"}}
+      </span>
+      <div class="input">
+        {{input
+          name="name"
+          placeholderKey="admin.emoji.name"
+          value=(readonly name)
+          input=(action (mut name) value="target.value")
+        }}
+      </div>
+    </div>
+    <div class="control">
+      <span class="label">
+        {{i18n "admin.emoji.group"}}
+      </span>
+      <div class="input">
+        {{combo-box
+          name="group"
+          value=group
+          content=newEmojiGroups
+          onChange=(action "createEmojiGroup")
+          valueProperty=null
+          nameProperty=null
+          options=(hash
+            allowAny=true
+          )
+        }}
+      </div>
+    </div>
+    <div class="control">
+      <div class="input">
+        <label class="btn btn-default btn-primary {{if addDisabled 'disabled'}}">
+          {{d-icon "plus"}}
+          {{i18n "admin.emoji.add"}}
+          <input
+            class="hidden-upload-field"
+            disabled={{addDisabled}}
+            type="file"
+            accept=".png,.gif">
+        </label>
+      </div>
+    </div>
+  </div>
+{{/conditional-loading-section}}
diff --git a/app/assets/javascripts/discourse/templates/emoji-picker.hbr.erb b/app/assets/javascripts/discourse/templates/emoji-picker.hbr.erb
index dd04f149d3..5a33352165 100644
--- a/app/assets/javascripts/discourse/templates/emoji-picker.hbr.erb
+++ b/app/assets/javascripts/discourse/templates/emoji-picker.hbr.erb
@@ -9,10 +9,12 @@
     </div>
   <% end %>
 
-  <% if !Emoji.custom.blank? %>
-    <div class='category-icon'>
-      <button data-tabicon="<%= Emoji.custom.first.name %>" type="button" class="emoji" tabindex="-1" data-section="ungrouped" title="{{i18n 'emoji_picker.custom'}}"></button>
-    </div>
+  <% Emoji.custom.group_by { |emoji| emoji.group }.each do |group, emojis| %>
+    <% if emojis.present? %>
+      <div class='category-icon'>
+        <button data-tabicon="<%= emojis.first.name %>" type="button" class="emoji" tabindex="-1" data-section="custom-<%= group %>" title="{{i18n 'emoji_picker.<%= group %>'}}"></button>
+      </div>
+    <% end %>
   <% end %>
 </div>
 
@@ -49,18 +51,22 @@
       </div>
     <% end %>
 
-    {{#if customEmojis.length}}
-      <div class='section' data-section='ungrouped'>
-        <div class='section-header'>
-          <span class="title">{{i18n 'emoji_picker.custom'}}</span>
+    {{#each customEmojis as |emojis|}}
+      {{#if emojis.length}}
+        <div class='section' data-section='custom-{{emojis.firstObject.group}}'>
+          <div class='section-header'>
+            <span class="title">
+              {{i18n emojis.firstObject.key}}
+            </span>
+          </div>
+          <div class='section-group'>
+            {{#each emojis as |emoji|}}
+              <button style="background-url: url("{{emoji.src}}")" type="button" class="emoji" tabindex="-1" title="{{emoji.code}}"></button>
+            {{/each}}
+          </div>
         </div>
-        <div class='section-group'>
-          {{#each customEmojis as |emoji|}}
-            <button style="background-url: url("{{emoji.src}}")" type="button" class="emoji" tabindex="-1" title="{{emoji.code}}"></button>
-          {{/each}}
-        </div>
-      </div>
-    {{/if}}
+      {{/if}}
+    {{/each}}
   </div>
   <div class='footer'>
     <div class='info'></div>
diff --git a/app/assets/javascripts/pretty-text/emoji.js b/app/assets/javascripts/pretty-text/emoji.js
index fa7754da59..6346cd93b1 100644
--- a/app/assets/javascripts/pretty-text/emoji.js
+++ b/app/assets/javascripts/pretty-text/emoji.js
@@ -10,9 +10,9 @@ import { IMAGE_VERSION } from "pretty-text/emoji/version";
 
 const extendedEmoji = {};
 
-export function registerEmoji(code, url) {
+export function registerEmoji(code, url, group) {
   code = code.toLowerCase();
-  extendedEmoji[code] = url;
+  extendedEmoji[code] = { url, group };
 }
 
 export function extendedEmojiList() {
@@ -92,7 +92,7 @@ function isReplacableInlineEmoji(string, index, inlineEmoji) {
 }
 
 export function performEmojiUnescape(string, opts) {
-  if (!string || typeof string !== "string") {
+  if (!string) {
     return;
   }
 
@@ -126,6 +126,8 @@ export function performEmojiUnescape(string, opts) {
         } alt='${emojiVal}' class='${classes}'>`
       : m;
   });
+
+  return string;
 }
 
 export function performEmojiEscape(string, opts) {
@@ -143,6 +145,8 @@ export function performEmojiEscape(string, opts) {
 
     return m;
   });
+
+  return string;
 }
 
 export function isCustomEmoji(code, opts) {
@@ -157,11 +161,11 @@ export function buildEmojiUrl(code, opts) {
   let url;
   code = String(code).toLowerCase();
   if (extendedEmoji.hasOwnProperty(code)) {
-    url = extendedEmoji[code];
+    url = extendedEmoji[code].url;
   }
 
   if (opts && opts.customEmoji && opts.customEmoji[code]) {
-    url = opts.customEmoji[code];
+    url = opts.customEmoji[code].url || opts.customEmoji[code];
   }
 
   const noToneMatch = code.match(/([^:]+):?/);
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 61f73bc2b2..afdc9a7e3b 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -979,3 +979,4 @@ a.inline-editable-field {
 @import "common/admin/admin_report_table";
 @import "common/admin/admin_report_inline_table";
 @import "common/admin/admin_intro";
+@import "common/admin/admin_emojis";
diff --git a/app/assets/stylesheets/common/admin/admin_emojis.scss b/app/assets/stylesheets/common/admin/admin_emojis.scss
new file mode 100644
index 0000000000..c6cf4c2fbd
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/admin_emojis.scss
@@ -0,0 +1,50 @@
+.admin-emojis {
+  #custom_emoji {
+    .select-kit {
+      width: 220px;
+    }
+  }
+}
+
+.emoji-uploader {
+  display: flex;
+  align-items: flex-end;
+
+  input,
+  .select-kit {
+    width: 220px;
+    margin: 0 1em 0 0;
+  }
+
+  .upload-container {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+  }
+}
+
+.mobile-view {
+  .admin-emojis {
+    .emoji-uploader {
+      flex-direction: column;
+
+      .fields {
+        input,
+        .select-kit {
+          width: 100%;
+        }
+      }
+
+      .upload-container {
+        margin: 1em 0 0 0;
+      }
+    }
+
+    #custom_emoji {
+      .select-kit {
+        display: none;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 86c1cb9442..d887275e94 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -556,7 +556,7 @@
 }
 
 #custom_emoji {
-  width: 27%;
+  width: 100%;
 }
 
 .modal-body .inputs .branch {
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index d7a29b8dc6..b4c2098104 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -45,6 +45,8 @@ sup img.emoji {
   justify-content: space-between;
   border-right: 1px solid $primary-low;
   min-width: 36px;
+  overflow-y: auto;
+  padding: 0.5em;
 }
 
 .emoji-picker .category-icon {
diff --git a/app/assets/stylesheets/mobile/emoji.scss b/app/assets/stylesheets/mobile/emoji.scss
index 233c32bd05..d130186a7e 100644
--- a/app/assets/stylesheets/mobile/emoji.scss
+++ b/app/assets/stylesheets/mobile/emoji.scss
@@ -6,3 +6,7 @@
 .emoji-picker .category-icon {
   margin: 2px;
 }
+
+.emoji-picker .categories-column {
+  padding: 0;
+}
diff --git a/app/controllers/admin/emojis_controller.rb b/app/controllers/admin/emojis_controller.rb
index cc74777778..72e1c30801 100644
--- a/app/controllers/admin/emojis_controller.rb
+++ b/app/controllers/admin/emojis_controller.rb
@@ -9,6 +9,7 @@ class Admin::EmojisController < Admin::AdminController
   def create
     file = params[:file] || params[:files].first
     name = params[:name] || File.basename(file.original_filename, ".*")
+    group = params[:group] ? params[:group].downcase : nil
 
     hijack do
       # fix the name
@@ -26,11 +27,11 @@ class Admin::EmojisController < Admin::AdminController
 
       data =
         if upload.persisted?
-          custom_emoji = CustomEmoji.new(name: name, upload: upload)
+          custom_emoji = CustomEmoji.new(name: name, upload: upload, group: group)
 
           if custom_emoji.save
             Emoji.clear_cache
-            { name: custom_emoji.name, url: custom_emoji.upload.url }
+            { name: custom_emoji.name, url: custom_emoji.upload.url, group: group }
           else
             good = false
             failed_json.merge(errors: custom_emoji.errors.full_messages)
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index 8a9d3c9236..118615c98e 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -14,6 +14,7 @@ end
 #  id         :integer          not null, primary key
 #  name       :string           not null
 #  upload_id  :integer          not null
+#  group      :string
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #
diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index 5b8774c2c0..e57fc3b81a 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -6,9 +6,11 @@ class Emoji
 
   FITZPATRICK_SCALE ||= [ "1f3fb", "1f3fc", "1f3fd", "1f3fe", "1f3ff" ]
 
+  DEFAULT_GROUP ||= "default"
+
   include ActiveModel::SerializerSupport
 
-  attr_accessor :name, :url, :tonable
+  attr_accessor :name, :url, :tonable, :group
 
   def self.all
     Discourse.cache.fetch(cache_key("all_emojis")) { standard | custom }
@@ -104,15 +106,19 @@ class Emoji
         result << Emoji.new.tap do |e|
           e.name = emoji.name
           e.url = emoji.upload&.url
+          e.group = emoji.group || DEFAULT_GROUP
         end
       end
     end
 
-    Plugin::CustomEmoji.emojis.each do |name, url|
-      result << Emoji.new.tap do |e|
-        e.name = name
-        url = (Discourse.base_uri + url) if url[/^\/[^\/]/]
-        e.url = url
+    Plugin::CustomEmoji.emojis.each do |group, emojis|
+      emojis.each do |name, url|
+        result << Emoji.new.tap do |e|
+          e.name = name
+          url = (Discourse.base_uri + url) if url[/^\/[^\/]/]
+          e.url = url
+          e.group = group || DEFAULT_GROUP
+        end
       end
     end
 
diff --git a/app/serializers/emoji_serializer.rb b/app/serializers/emoji_serializer.rb
index 2e45b03415..d0d440e24d 100644
--- a/app/serializers/emoji_serializer.rb
+++ b/app/serializers/emoji_serializer.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class EmojiSerializer < ApplicationSerializer
-  attributes :name, :url
+  attributes :name, :url, :group
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f3ea234cb8..c60d83b608 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1651,7 +1651,6 @@ en:
       objects: Objects
       symbols: Symbols
       flags: Flags
-      custom: Custom emojis
       recent: Recently used
       default_tone: No skin tone
       light_tone: Light skin tone
@@ -1659,6 +1658,7 @@ en:
       medium_tone: Medium skin tone
       medium_dark_tone: Medium dark skin tone
       dark_tone: Dark skin tone
+      default: Custom emojis
 
     shared_drafts:
       title: "Shared Drafts"
@@ -4556,6 +4556,7 @@ en:
         help: "Add new emoji that will be available to everyone. (PROTIP: drag & drop multiple files at once)"
         add: "Add New Emoji"
         name: "Name"
+        group: "Group"
         image: "Image"
         delete_confirm: "Are you sure you want to delete the :%{name}: emoji?"
 
diff --git a/db/migrate/20200116092259_add_group_to_custom_emojis.rb b/db/migrate/20200116092259_add_group_to_custom_emojis.rb
new file mode 100644
index 0000000000..ddc80c984a
--- /dev/null
+++ b/db/migrate/20200116092259_add_group_to_custom_emojis.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddGroupToCustomEmojis < ActiveRecord::Migration[6.0]
+  def change
+    add_column :custom_emojis, :group, :string, null: true, limit: 20
+  end
+end
diff --git a/lib/db_helper.rb b/lib/db_helper.rb
index ede8cf0de2..86f14ebc8b 100644
--- a/lib/db_helper.rb
+++ b/lib/db_helper.rb
@@ -29,17 +29,17 @@ class DbHelper
 
     text_columns.each do |table, columns|
       set = columns.map do |column|
-        replace = "REPLACE(#{column[:name]}, :from, :to)"
+        replace = "REPLACE(\"#{column[:name]}\", :from, :to)"
         replace = truncate(replace, table, column)
-        "#{column[:name]} = #{replace}"
+        "\"#{column[:name]}\" = #{replace}"
       end.join(", ")
 
       where = columns.map do |column|
-        "#{column[:name]} IS NOT NULL AND #{column[:name]} LIKE :like"
+        "\"#{column[:name]}\" IS NOT NULL AND \"#{column[:name]}\" LIKE :like"
       end.join(" OR ")
 
       rows = DB.exec(<<~SQL, from: from, to: to, like: like)
-        UPDATE #{table}
+        UPDATE \"#{table}\"
            SET #{set}
          WHERE #{where}
       SQL
@@ -55,17 +55,17 @@ class DbHelper
 
     text_columns.each do |table, columns|
       set = columns.map do |column|
-        replace = "REGEXP_REPLACE(#{column[:name]}, :pattern, :replacement, :flags)"
+        replace = "REGEXP_REPLACE(\"#{column[:name]}\", :pattern, :replacement, :flags)"
         replace = truncate(replace, table, column)
-        "#{column[:name]} = #{replace}"
+        "\"#{column[:name]}\" = #{replace}"
       end.join(", ")
 
       where = columns.map do |column|
-        "#{column[:name]} IS NOT NULL AND #{column[:name]} #{match} :pattern"
+        "\"#{column[:name]}\" IS NOT NULL AND \"#{column[:name]}\" #{match} :pattern"
       end.join(" OR ")
 
       rows = DB.exec(<<~SQL, pattern: pattern, replacement: replacement, flags: flags, match: match)
-        UPDATE #{table}
+        UPDATE \"#{table}\"
            SET #{set}
          WHERE #{where}
       SQL
@@ -84,9 +84,9 @@ class DbHelper
       next if excluded_tables.include?(r.table_name)
 
       rows = DB.query(<<~SQL, like: like)
-        SELECT #{r.column_name}
-          FROM #{r.table_name}
-         WHERE #{r.column_name} LIKE :like
+        SELECT \"#{r.column_name}\"
+          FROM \"#{r.table_name}\"
+         WHERE \""#{r.column_name}"\" LIKE :like
       SQL
 
       if rows.size > 0
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 06070d5f02..2510e6c499 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -6,21 +6,29 @@ require_dependency 'plugin/metadata'
 require_dependency 'auth'
 
 class Plugin::CustomEmoji
+  CACHE_KEY ||= "plugin-emoji"
   def self.cache_key
-    @@cache_key ||= "plugin-emoji"
+    @@cache_key ||= CACHE_KEY
   end
 
   def self.emojis
     @@emojis ||= {}
   end
 
-  def self.register(name, url)
-    @@cache_key = Digest::SHA1.hexdigest(cache_key + name)[0..10]
-    emojis[name] = url
+  def self.clear_cache
+    @@cache_key = CACHE_KEY
+    @@emojis = {}
   end
 
-  def self.unregister(name)
-    emojis.delete(name)
+  def self.register(name, url, group = Emoji::DEFAULT_GROUP)
+    @@cache_key = Digest::SHA1.hexdigest(cache_key + name + group)[0..10]
+    new_group = emojis[group] || {}
+    new_group[name] = url
+    emojis[group] = new_group
+  end
+
+  def self.unregister(name, group = Emoji::DEFAULT_GROUP)
+    emojis[group].delete(name)
   end
 
   def self.translations
@@ -471,8 +479,9 @@ class Plugin::Instance
     DiscoursePluginRegistry.register_seed_path_builder(&block)
   end
 
-  def register_emoji(name, url)
-    Plugin::CustomEmoji.register(name, url)
+  def register_emoji(name, url, group = Emoji::DEFAULT_GROUP)
+    Plugin::CustomEmoji.register(name, url, group)
+    Emoji.clear_cache
   end
 
   def translate_emoji(from, to)
diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb
index bd33bb4847..6453339706 100644
--- a/spec/components/plugin/instance_spec.rb
+++ b/spec/components/plugin/instance_spec.rb
@@ -538,4 +538,30 @@ describe Plugin::Instance do
       expect(Reviewable.types).to match_array(current_list << new_element)
     end
   end
+
+  describe '#register_emoji' do
+    before do
+      Plugin::CustomEmoji.clear_cache
+    end
+
+    it 'allows to register an emoji' do
+      Plugin::Instance.new.register_emoji("foo", "/foo/bar.png")
+
+      custom_emoji = Emoji.custom.first
+
+      expect(custom_emoji.name).to eq("foo")
+      expect(custom_emoji.url).to eq("/foo/bar.png")
+      expect(custom_emoji.group).to eq(Emoji::DEFAULT_GROUP)
+    end
+
+    it 'allows to register an emoji with a group' do
+      Plugin::Instance.new.register_emoji("bar", "/baz/bar.png", "baz")
+
+      custom_emoji = Emoji.custom.first
+
+      expect(custom_emoji.name).to eq("bar")
+      expect(custom_emoji.url).to eq("/baz/bar.png")
+      expect(custom_emoji.group).to eq("baz")
+    end
+  end
 end
diff --git a/spec/requests/admin/emojis_controller_spec.rb b/spec/requests/admin/emojis_controller_spec.rb
index a0f6d8cec8..5ab52b3447 100644
--- a/spec/requests/admin/emojis_controller_spec.rb
+++ b/spec/requests/admin/emojis_controller_spec.rb
@@ -59,22 +59,38 @@ RSpec.describe Admin::EmojisController do
     it 'should allow an admin to add a custom emoji' do
       Emoji.expects(:clear_cache)
 
-        post "/admin/customize/emojis.json", params: {
-          name: 'test',
-          file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
-        }
+      post "/admin/customize/emojis.json", params: {
+        name: 'test',
+        file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
+      }
 
-        custom_emoji = CustomEmoji.last
-        upload = custom_emoji.upload
+      custom_emoji = CustomEmoji.last
+      upload = custom_emoji.upload
 
-        expect(upload.original_filename).to eq('logo.png')
+      expect(upload.original_filename).to eq('logo.png')
 
-        data = JSON.parse(response.body)
+      data = JSON.parse(response.body)
+      expect(response.status).to eq(200)
+      expect(data["errors"]).to eq(nil)
+      expect(data["name"]).to eq(custom_emoji.name)
+      expect(data["url"]).to eq(upload.url)
+      expect(custom_emoji.group).to eq(nil)
+    end
 
-        expect(response.status).to eq(200)
-        expect(data["errors"]).to eq(nil)
-        expect(data["name"]).to eq(custom_emoji.name)
-        expect(data["url"]).to eq(upload.url)
+    it 'should allow an admin to add a custom emoji with a custom group' do
+      Emoji.expects(:clear_cache)
+
+      post "/admin/customize/emojis.json", params: {
+        name: 'test',
+        group: 'Foo',
+        file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
+      }
+
+      custom_emoji = CustomEmoji.last
+
+      data = JSON.parse(response.body)
+      expect(response.status).to eq(200)
+      expect(custom_emoji.group).to eq("foo")
     end
   end
 
diff --git a/test/javascripts/lib/pretty-text-test.js b/test/javascripts/lib/pretty-text-test.js
index 7c75034529..522356e6de 100644
--- a/test/javascripts/lib/pretty-text-test.js
+++ b/test/javascripts/lib/pretty-text-test.js
@@ -8,6 +8,7 @@ import {
   deleteCachedInlineOnebox
 } from "pretty-text/inline-oneboxer";
 import { extractDataAttribute } from "pretty-text/engines/discourse-markdown-it";
+import { registerEmoji } from "pretty-text/emoji";
 
 QUnit.module("lib:pretty-text");
 
@@ -1519,6 +1520,24 @@ QUnit.test("emoji - emojiSet", assert => {
   );
 });
 
+QUnit.test("emoji - registerEmoji", assert => {
+  registerEmoji("foo", "/foo.png");
+
+  assert.cookedOptions(
+    ":foo:",
+    {},
+    `<p><img src="/foo.png?v=${v}" title=":foo:" class="emoji emoji-custom only-emoji" alt=":foo:"></p>`
+  );
+
+  registerEmoji("bar", "/bar.png", "baz");
+
+  assert.cookedOptions(
+    ":bar:",
+    {},
+    `<p><img src="/bar.png?v=${v}" title=":bar:" class="emoji emoji-custom only-emoji" alt=":bar:"></p>`
+  );
+});
+
 QUnit.test("extractDataAttribute", assert => {
   assert.deepEqual(extractDataAttribute("foo="), ["data-foo", ""]);
   assert.deepEqual(extractDataAttribute("foo=bar"), ["data-foo", "bar"]);

From db35baba26946d327a104fe6507857913242649e Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 30 Mar 2020 14:27:49 -0400
Subject: [PATCH 0437/1830] FEATURE: Display "Last Updated At" on user
 directory

---
 .../javascripts/discourse/routes/users.js      |  6 +++++-
 .../discourse/templates/mobile/users.hbs       |  8 +++++++-
 .../javascripts/discourse/templates/users.hbs  | 12 ++++++++++--
 .../stylesheets/common/base/directory.scss     | 18 ++++++++++++------
 app/assets/stylesheets/mobile/directory.scss   |  4 ++--
 app/controllers/directory_items_controller.rb  |  2 ++
 app/models/directory_item.rb                   |  9 +++++++++
 config/locales/client.en.yml                   |  1 +
 .../directory_items_controller_spec.rb         |  1 +
 9 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse/routes/users.js b/app/assets/javascripts/discourse/routes/users.js
index 4fec3c1604..76f310d11b 100644
--- a/app/assets/javascripts/discourse/routes/users.js
+++ b/app/assets/javascripts/discourse/routes/users.js
@@ -1,4 +1,5 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import { longDate } from "discourse/lib/formatter";
 
 export default DiscourseRoute.extend({
   queryParams: {
@@ -22,7 +23,8 @@ export default DiscourseRoute.extend({
         asc: null,
         name: "",
         group: null,
-        exclude_usernames: null
+        exclude_usernames: null,
+        lastUpdatedAt: null
       });
     }
   },
@@ -41,8 +43,10 @@ export default DiscourseRoute.extend({
 
   setupController(controller, model) {
     const params = this._params;
+    const lastUpdatedAt = model.get("resultSetMeta.last_updated_at");
     controller.setProperties({
       model,
+      lastUpdatedAt: lastUpdatedAt ? longDate(lastUpdatedAt) : null,
       period: params.period,
       nameInput: params.name
     });
diff --git a/app/assets/javascripts/discourse/templates/mobile/users.hbs b/app/assets/javascripts/discourse/templates/mobile/users.hbs
index 776409d6b5..7f208e2abb 100644
--- a/app/assets/javascripts/discourse/templates/mobile/users.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/users.hbs
@@ -3,8 +3,14 @@
     <div class='directory'>
       {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
 
-      <div class='clearfix user-controls'>
+      <div class='directory-controls'>
         {{period-chooser period=period onChange=(action (mut period))}}
+        {{#if lastUpdatedAt}}
+          <div class='directory-last-updated'>
+            {{i18n "directory.last_updated"}}
+            {{lastUpdatedAt}}
+          </div>
+        {{/if}}
         {{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name no-blur"}}
       </div>
 
diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs
index 6a44c7ce1b..09f4ba4f0c 100644
--- a/app/assets/javascripts/discourse/templates/users.hbs
+++ b/app/assets/javascripts/discourse/templates/users.hbs
@@ -3,8 +3,16 @@
     <div class="container">
       <div class='directory'>
         {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
-        <div class='clearfix'>
-          {{period-chooser period=period onChange=(action (mut period))}}
+        <div class='directory-controls'>
+          <div class='period-controls'>
+            {{period-chooser period=period onChange=(action (mut period))}}
+            {{#if lastUpdatedAt}}
+              <div class='directory-last-updated'>
+                {{i18n "directory.last_updated"}}
+                {{lastUpdatedAt}}
+              </div>
+            {{/if}}
+          </div>
           {{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name no-blur"}}
         </div>
 
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index 4bc304f8a6..81045260a5 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -5,16 +5,22 @@
     margin-bottom: 0;
   }
 
-  .period-chooser {
-    float: left;
-  }
-  .filter-name {
-    float: right;
-  }
   .spinner {
     clear: both;
   }
 
+  .directory-controls {
+    display: flex;
+    justify-content: space-between;
+    .filter-name {
+      height: 1em;
+    }
+  }
+  .directory-last-updated {
+    margin-bottom: 0.5em;
+    color: $primary-medium;
+  }
+
   table {
     width: 100%;
     margin-bottom: 1em;
diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss
index 90de7b3517..c1057bd636 100644
--- a/app/assets/stylesheets/mobile/directory.scss
+++ b/app/assets/stylesheets/mobile/directory.scss
@@ -6,8 +6,8 @@
     margin-bottom: 0.25em;
   }
 
-  .filter-name {
-    float: left;
+  .directory-controls {
+    display: block;
   }
 
   .total-rows {
diff --git a/app/controllers/directory_items_controller.rb b/app/controllers/directory_items_controller.rb
index 5cf99b710c..9acc1a24eb 100644
--- a/app/controllers/directory_items_controller.rb
+++ b/app/controllers/directory_items_controller.rb
@@ -79,7 +79,9 @@ class DirectoryItemsController < ApplicationController
 
     end
 
+    last_updated_at = DirectoryItem.last_updated_at(period_type)
     render_json_dump(directory_items: serialize_data(result, DirectoryItemSerializer),
+                     meta: { last_updated_at: last_updated_at },
                      total_rows_directory_items: result_count,
                      load_more_directory_items: directory_items_path(more_params))
   end
diff --git a/app/models/directory_item.rb b/app/models/directory_item.rb
index 89f8daf2d3..930c782929 100644
--- a/app/models/directory_item.rb
+++ b/app/models/directory_item.rb
@@ -27,8 +27,17 @@ class DirectoryItem < ActiveRecord::Base
     period_types.each_key { |p| refresh_period!(p) }
   end
 
+  def self.last_updated_at(period_type)
+    val = Discourse.redis.get("directory_#{period_type}")
+    return nil if val.nil?
+
+    Time.zone.at(val.to_i)
+  end
+
   def self.refresh_period!(period_type, force: false)
 
+    Discourse.redis.set("directory_#{period_types[period_type]}", Time.zone.now.to_i)
+
     # Don't calculate it if the user directory is disabled
     return unless SiteSetting.enable_user_directory? || force
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c60d83b608..98d4a5bf1b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -587,6 +587,7 @@ en:
       days_visited_long: "Days Visited"
       posts_read: "Read"
       posts_read_long: "Posts Read"
+      last_updated: "Last Updated:"
       total_rows:
         one: "%{count} user"
         other: "%{count} users"
diff --git a/spec/requests/directory_items_controller_spec.rb b/spec/requests/directory_items_controller_spec.rb
index 6d1e777e68..8dc0ccabce 100644
--- a/spec/requests/directory_items_controller_spec.rb
+++ b/spec/requests/directory_items_controller_spec.rb
@@ -46,6 +46,7 @@ describe DirectoryItemsController do
       expect(json['directory_items']).to be_present
       expect(json['total_rows_directory_items']).to be_present
       expect(json['load_more_directory_items']).to be_present
+      expect(json['meta']['last_updated_at']).to be_present
 
       expect(json['directory_items'].length).to eq(4)
       expect(json['total_rows_directory_items']).to eq(4)

From 339ddb8701bbb1933969530346b63ea32157bc08 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 22:02:24 +0200
Subject: [PATCH 0438/1830] FIX: makes clicking and displaying date picker more
 reliable (#9302)

---
 .../discourse/components/date-input.js        | 59 ++++++++++---------
 .../templates/components/date-input.hbs       |  3 +
 .../common/components/date-input.scss         |  3 +
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/date-input.js b/app/assets/javascripts/discourse/components/date-input.js
index 0aaea9304b..b44640bcd4 100644
--- a/app/assets/javascripts/discourse/components/date-input.js
+++ b/app/assets/javascripts/discourse/components/date-input.js
@@ -1,4 +1,4 @@
-import { next } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 /* global Pikaday:true */
 import loadScript from "discourse/lib/load-script";
@@ -16,17 +16,19 @@ export default Component.extend({
 
   @on("didInsertElement")
   _loadDatePicker() {
-    const container = this.element.querySelector(`#${this.containerId}`);
+    schedule("afterRender", () => {
+      const container = this.element.querySelector(`#${this.containerId}`);
 
-    if (this.site.mobileView) {
-      this._loadNativePicker(container);
-    } else {
-      this._loadPikadayPicker(container);
-    }
+      if (this.site.mobileView) {
+        this._loadNativePicker(container);
+      } else {
+        this._loadPikadayPicker(container);
+      }
 
-    if (this.date && this._picker) {
-      this._picker.setDate(this.date, true);
-    }
+      if (this.date && this._picker) {
+        this._picker.setDate(this.date, true);
+      }
+    });
   },
 
   didUpdateAttrs() {
@@ -44,26 +46,25 @@ export default Component.extend({
 
   _loadPikadayPicker(container) {
     loadScript("/javascripts/pikaday.js").then(() => {
-      next(() => {
-        const default_opts = {
-          field: this.element.querySelector(".date-picker"),
-          container: container || this.element,
-          bound: container === null,
-          format: "LL",
-          firstDay: 1,
-          i18n: {
-            previousMonth: I18n.t("dates.previous_month"),
-            nextMonth: I18n.t("dates.next_month"),
-            months: moment.months(),
-            weekdays: moment.weekdays(),
-            weekdaysShort: moment.weekdaysShort()
-          },
-          onSelect: date => this._handleSelection(date)
-        };
+      const defaultOptions = {
+        field: this.element.querySelector(".date-picker"),
+        container: container || this.element.querySelector(".picker-container"),
+        bound: container === null,
+        format: "LL",
+        firstDay: 1,
+        trigger: this.element,
+        i18n: {
+          previousMonth: I18n.t("dates.previous_month"),
+          nextMonth: I18n.t("dates.next_month"),
+          months: moment.months(),
+          weekdays: moment.weekdays(),
+          weekdaysShort: moment.weekdaysShort()
+        },
+        onSelect: date => this._handleSelection(date)
+      };
 
-        this._picker = new Pikaday(Object.assign(default_opts, this._opts()));
-        this._picker.setDate(this.date, true);
-      });
+      this._picker = new Pikaday(Object.assign(defaultOptions, this._opts()));
+      this._picker.setDate(this.date, true);
     });
   },
 
diff --git a/app/assets/javascripts/discourse/templates/components/date-input.hbs b/app/assets/javascripts/discourse/templates/components/date-input.hbs
index 3ed544b507..ad48e3e25d 100644
--- a/app/assets/javascripts/discourse/templates/components/date-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/date-input.hbs
@@ -4,4 +4,7 @@
   placeholder=placeholder
   value=value
   input=(action "onInput")
+  readonly=true
 }}
+
+<div class="picker-container"></div>
diff --git a/app/assets/stylesheets/common/components/date-input.scss b/app/assets/stylesheets/common/components/date-input.scss
index 7917f408d0..b24ad8ea4e 100644
--- a/app/assets/stylesheets/common/components/date-input.scss
+++ b/app/assets/stylesheets/common/components/date-input.scss
@@ -1,8 +1,11 @@
 .d-date-input {
   display: flex;
   flex: 1;
+  cursor: pointer;
+  flex-direction: column;
 
   .date-picker {
+    cursor: pointer;
     margin: 0;
     text-align: left;
     width: 100%;

From 29e733832d7f95669310a662594ca53b07938f38 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Mon, 30 Mar 2020 16:42:47 -0400
Subject: [PATCH 0439/1830] FIX: error when changing a topic's category and
 creating a tag

---
 app/controllers/topics_controller.rb    |  2 ++
 spec/requests/topics_controller_spec.rb | 26 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 99ff5fb625..238746ffb0 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -342,6 +342,8 @@ class TopicsController < ApplicationController
             end
           end
 
+          invalid_tags = Tag.where_name(invalid_tags).pluck(:name)
+
           if !invalid_tags.empty?
             if (invalid_tags & DiscourseTagging.hidden_tag_names).present?
               return render_json_error(I18n.t('category.errors.disallowed_tags_generic'))
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 947d244971..c5ff3ecc7a 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -1038,6 +1038,32 @@ RSpec.describe TopicsController do
             expect(topic.tags.pluck(:id)).to contain_exactly(tag.id)
           end
 
+          it "can create a tag" do
+            SiteSetting.min_trust_to_create_tag = 0
+            expect do
+              put "/t/#{topic.slug}/#{topic.id}.json", params: {
+                tags: ["newtag"]
+              }
+            end.to change { topic.reload.first_post.revisions.count }.by(1)
+
+            expect(response.status).to eq(200)
+            expect(topic.reload.tags.pluck(:name)).to contain_exactly("newtag")
+          end
+
+          it "can change the category and create a new tag" do
+            SiteSetting.min_trust_to_create_tag = 0
+            category = Fabricate(:category)
+            expect do
+              put "/t/#{topic.slug}/#{topic.id}.json", params: {
+                tags: ["newtag"],
+                category_id: category.id
+              }
+            end.to change { topic.reload.first_post.revisions.count }.by(1)
+
+            expect(response.status).to eq(200)
+            expect(topic.reload.tags.pluck(:name)).to contain_exactly("newtag")
+          end
+
           it "can add a tag to wiki topic" do
             SiteSetting.min_trust_to_edit_wiki_post = 2
             topic.first_post.update!(wiki: true)

From 170327005502b27d3d3c6658a1486842efbfe839 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:49:38 -0700
Subject: [PATCH 0440/1830] DEV: Enable and fix no-trailing-spaces lint

---
 .template-lintrc.js                                           | 2 +-
 app/assets/javascripts/admin/templates/api-keys-index.hbs     | 3 +--
 .../discourse/templates/modal/associate-account-confirm.hbs   | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 7c94a35a76..0a26ee1992 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -37,7 +37,7 @@ module.exports = {
     "no-positive-tabindex": false,
     "no-quoteless-attributes": false,
     "no-shadowed-elements": true,
-    "no-trailing-spaces": false,
+    "no-trailing-spaces": true,
     "no-triple-curlies": true,
     "no-unbound": true,
     "no-unnecessary-concat": true,
diff --git a/app/assets/javascripts/admin/templates/api-keys-index.hbs b/app/assets/javascripts/admin/templates/api-keys-index.hbs
index 7943a5b9e2..bd91228055 100644
--- a/app/assets/javascripts/admin/templates/api-keys-index.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys-index.hbs
@@ -61,7 +61,6 @@
               icon="times"
               title="admin.api.revoke"}}
           {{/if}}
-          
         </td>
       </tr>
     {{/each}}
@@ -69,4 +68,4 @@
   </table>
 {{else}}
   <p>{{i18n "admin.api.none"}}</p>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs b/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs
index d24c1d7392..ae5a9419f4 100644
--- a/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs
@@ -1,6 +1,6 @@
-{{#d-modal-body 
+{{#d-modal-body
     rawTitle=(
-      i18n "user.associated_accounts.confirm_modal_title" 
+      i18n "user.associated_accounts.confirm_modal_title"
       provider=(i18n (concat "login." model.provider_name ".name"))
     )
 }}

From f900efaa4a294c499b43db7be1268fc9a645ec75 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:55:42 -0700
Subject: [PATCH 0441/1830] DEV: composer.hbs: fix indentation

---
 .../discourse/templates/composer.hbs          | 376 +++++++++---------
 1 file changed, 187 insertions(+), 189 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 43af40a527..7cd5c8f42a 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -6,136 +6,136 @@
                  save=(action "save")}}
   <div class="grippie"></div>
   {{#if visible}}
-      {{composer-messages composer=model
-                          messageCount=messageCount
-                          addLinkLookup=(action "addLinkLookup")}}
-      {{#if model.viewOpenOrFullscreen}}
-        <div class="reply-area {{if canEditTags 'with-tags'}}">
-          <div class='composer-fields'>
-            {{plugin-outlet name="composer-open" args=(hash model=model)}}
-            <div class='reply-to'>
-              {{#unless model.viewFullscreen}}
-                <div class="reply-details">
-                  {{composer-action-title
-                    model=model
-                    openComposer=(action "openComposer")
-                    closeComposer=(action "closeComposer")
-                    canWhisper=canWhisper
-                    tabindex=8}}
-                  {{plugin-outlet name="composer-action-after" noTags=true args=(hash model=model)}}
-
-                  {{#unless site.mobileView}}
-                    {{#if isWhispering}}
-                      <span class='whisper'>{{d-icon "far-eye-slash"}}</span>
-                    {{/if}}
-                    {{#if model.unlistTopic}}
-                      <span class='whisper'>({{i18n 'composer.unlist'}})</span>
-                    {{/if}}
-                    {{#if model.noBump}}
-                      <span class="no-bump">{{d-icon "anchor"}}</span>
-                    {{/if}}
-                  {{/unless}}
-
-                  {{#if canEdit}}
-                    {{#link-to-input onClick=(action "displayEditReason") showInput=showEditReason icon="info-circle" class="display-edit-reason"}}
-                      {{text-field value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
-                    {{/link-to-input}}
-                  {{/if}}
-                </div>
-              {{/unless}}
-              {{composer-toggles composeState=model.composeState
-                        toggleComposer=(action "toggle")
-                        toggleToolbar=(action "toggleToolbar")
-                        toggleFullscreen=(action "fullscreenComposer")}}
-            </div>
+    {{composer-messages composer=model
+                        messageCount=messageCount
+                        addLinkLookup=(action "addLinkLookup")}}
+    {{#if model.viewOpenOrFullscreen}}
+      <div class="reply-area {{if canEditTags 'with-tags'}}">
+        <div class='composer-fields'>
+          {{plugin-outlet name="composer-open" args=(hash model=model)}}
+          <div class='reply-to'>
             {{#unless model.viewFullscreen}}
-              {{#if model.canEditTitle}}
-                {{#if model.creatingPrivateMessage}}
-                  <div class='user-selector'>
-                    {{composer-user-selector topicId=topicModel.id
-                                             usernames=model.targetRecipients
-                                             hasGroups=model.hasTargetGroups
-                                             focusTarget=focusTarget
-                                             class="users-input"}}
-                    {{#if showWarning}}
-                      <label class='add-warning'>
-                        {{input type="checkbox" checked=model.isWarning tabindex="3"}}
-                        {{i18n "composer.add_warning"}}
-                      </label>
-                    {{/if}}
-                  </div>
-                {{/if}}
+              <div class="reply-details">
+                {{composer-action-title
+                  model=model
+                  openComposer=(action "openComposer")
+                  closeComposer=(action "closeComposer")
+                  canWhisper=canWhisper
+                  tabindex=8}}
+                {{plugin-outlet name="composer-action-after" noTags=true args=(hash model=model)}}
 
-                <div class="title-and-category {{if showPreview 'with-preview'}}">
-
-                  {{composer-title composer=model lastValidatedAt=lastValidatedAt focusTarget=focusTarget}}
-
-                  {{#if model.showCategoryChooser}}
-                    <div class="category-input">
-                      {{category-chooser
-                        value=model.categoryId
-                        tabindex="3"
-                        onChange=(action (mut model.categoryId))
-                        isDisabled=disableCategoryChooser
-                        options=(hash
-                          scopedCategoryId=scopedCategoryId
-                        )
-                      }}
-                      {{popup-input-tip validation=categoryValidation}}
-                    </div>
+                {{#unless site.mobileView}}
+                  {{#if isWhispering}}
+                    <span class='whisper'>{{d-icon "far-eye-slash"}}</span>
                   {{/if}}
-                  {{#if canEditTags}}
-                    {{mini-tag-chooser
-                      value=model.tags
-                      tabindex=4
-                      isDisabled=disableTagsChooser
-                      onChange=(action (mut model.tags))
-                      options=(hash
-                        categoryId=model.categoryId
-                        minimum=model.minimumRequiredTags
-                      )
-                    }}
-                    {{popup-input-tip validation=tagValidation}}
+                  {{#if model.unlistTopic}}
+                    <span class='whisper'>({{i18n 'composer.unlist'}})</span>
+                  {{/if}}
+                  {{#if model.noBump}}
+                    <span class="no-bump">{{d-icon "anchor"}}</span>
+                  {{/if}}
+                {{/unless}}
+
+                {{#if canEdit}}
+                  {{#link-to-input onClick=(action "displayEditReason") showInput=showEditReason icon="info-circle" class="display-edit-reason"}}
+                    {{text-field value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
+                  {{/link-to-input}}
+                {{/if}}
+              </div>
+            {{/unless}}
+            {{composer-toggles composeState=model.composeState
+                      toggleComposer=(action "toggle")
+                      toggleToolbar=(action "toggleToolbar")
+                      toggleFullscreen=(action "fullscreenComposer")}}
+          </div>
+          {{#unless model.viewFullscreen}}
+            {{#if model.canEditTitle}}
+              {{#if model.creatingPrivateMessage}}
+                <div class='user-selector'>
+                  {{composer-user-selector topicId=topicModel.id
+                                           usernames=model.targetRecipients
+                                           hasGroups=model.hasTargetGroups
+                                           focusTarget=focusTarget
+                                           class="users-input"}}
+                  {{#if showWarning}}
+                    <label class='add-warning'>
+                      {{input type="checkbox" checked=model.isWarning tabindex="3"}}
+                      {{i18n "composer.add_warning"}}
+                    </label>
                   {{/if}}
                 </div>
               {{/if}}
 
-              {{plugin-outlet name="composer-fields" args=(hash model=model)}}
-            {{/unless}}
+              <div class="title-and-category {{if showPreview 'with-preview'}}">
 
-          </div>
+                {{composer-title composer=model lastValidatedAt=lastValidatedAt focusTarget=focusTarget}}
 
-          {{composer-editor topic=topic
-                            composer=model
-                            lastValidatedAt=lastValidatedAt
-                            canWhisper=canWhisper
-                            storeToolbarState=(action "storeToolbarState")
-                            onPopupMenuAction=(action "onPopupMenuAction")
-                            showUploadModal=(route-action "showUploadSelector")
-                            popupMenuOptions=popupMenuOptions
-                            draftStatus=model.draftStatus
-                            isUploading=isUploading
-                            allowUpload=allowUpload
-                            uploadIcon=uploadIcon
-                            isCancellable=isCancellable
-                            uploadProgress=uploadProgress
-                            groupsMentioned=(action "groupsMentioned")
-                            cannotSeeMention=(action "cannotSeeMention")
-                            importQuote=(action "importQuote")
-                            togglePreview=(action "togglePreview")
-                            showToolbar=showToolbar
-                            afterRefresh=(action "afterRefresh")
-                            focusTarget=focusTarget}}
+                {{#if model.showCategoryChooser}}
+                  <div class="category-input">
+                    {{category-chooser
+                      value=model.categoryId
+                      tabindex="3"
+                      onChange=(action (mut model.categoryId))
+                      isDisabled=disableCategoryChooser
+                      options=(hash
+                        scopedCategoryId=scopedCategoryId
+                      )
+                    }}
+                    {{popup-input-tip validation=categoryValidation}}
+                  </div>
+                {{/if}}
+                {{#if canEditTags}}
+                  {{mini-tag-chooser
+                    value=model.tags
+                    tabindex=4
+                    isDisabled=disableTagsChooser
+                    onChange=(action (mut model.tags))
+                    options=(hash
+                      categoryId=model.categoryId
+                      minimum=model.minimumRequiredTags
+                    )
+                  }}
+                  {{popup-input-tip validation=tagValidation}}
+                {{/if}}
+              </div>
+            {{/if}}
 
-          <div class='submit-panel'>
-            {{plugin-outlet name="composer-fields-below" args=(hash model=model)}}
+            {{plugin-outlet name="composer-fields" args=(hash model=model)}}
+          {{/unless}}
 
-            <div class='save-or-cancel'>
-              {{#unless model.viewFullscreen}}
-                {{composer-save-button action=(action "save")
-                                       icon=saveIcon
-                                       label=saveLabel
-                                       disableSubmit=disableSubmit}}
+        </div>
+
+        {{composer-editor topic=topic
+                          composer=model
+                          lastValidatedAt=lastValidatedAt
+                          canWhisper=canWhisper
+                          storeToolbarState=(action "storeToolbarState")
+                          onPopupMenuAction=(action "onPopupMenuAction")
+                          showUploadModal=(route-action "showUploadSelector")
+                          popupMenuOptions=popupMenuOptions
+                          draftStatus=model.draftStatus
+                          isUploading=isUploading
+                          allowUpload=allowUpload
+                          uploadIcon=uploadIcon
+                          isCancellable=isCancellable
+                          uploadProgress=uploadProgress
+                          groupsMentioned=(action "groupsMentioned")
+                          cannotSeeMention=(action "cannotSeeMention")
+                          importQuote=(action "importQuote")
+                          togglePreview=(action "togglePreview")
+                          showToolbar=showToolbar
+                          afterRefresh=(action "afterRefresh")
+                          focusTarget=focusTarget}}
+
+        <div class='submit-panel'>
+          {{plugin-outlet name="composer-fields-below" args=(hash model=model)}}
+
+          <div class='save-or-cancel'>
+            {{#unless model.viewFullscreen}}
+              {{composer-save-button action=(action "save")
+                                     icon=saveIcon
+                                     label=saveLabel
+                                     disableSubmit=disableSubmit}}
 
               {{#if site.mobileView}}
                 <a href {{action "cancel"}} class='cancel' tabindex="6" title={{i18n 'cancel'}}>
@@ -150,89 +150,87 @@
               {{/if}}
             {{/unless}}
 
-
-              {{#if site.mobileView}}
-                {{#if whisperOrUnlistTopic}}
-                  <span class='whisper'>
-                    {{d-icon "far-eye-slash"}}
-                  </span>
-                {{/if}}
-                {{#if model.noBump}}
-                  <span class="no-bump">{{d-icon "anchor"}}</span>
-                {{/if}}
+            {{#if site.mobileView}}
+              {{#if whisperOrUnlistTopic}}
+                <span class='whisper'>
+                  {{d-icon "far-eye-slash"}}
+                </span>
               {{/if}}
-
-
-              {{#if isUploading}}
-                <div id="file-uploading">
-                  {{loading-spinner size="small"}}<span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
-                  {{#if isCancellable}}
-                    <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{d-icon "times"}}</a>
-                  {{/if}}
-                </div>
+              {{#if model.noBump}}
+                <span class="no-bump">{{d-icon "anchor"}}</span>
               {{/if}}
-              <div id='draft-status' class={{if isUploading 'hidden'}}>
-                {{#if model.draftSaving}}<div class="spinner small"></div>{{/if}}
-                {{#if model.draftSaved}}{{d-icon 'check' class='save-animation'}}{{/if}}
-                {{#if model.draftStatus}}
-                  <span title={{model.draftStatus}}>
-                    {{#if model.draftConflictUser}}
-                      {{avatar model.draftConflictUser imageSize="small"}} {{d-icon 'user-edit'}}
-                    {{else}}
-                      {{d-icon 'sync-alt'}}
-                    {{/if}}
-                    {{#unless site.mobileView}}
-                      {{model.draftStatus}}
-                    {{/unless}}
-                  </span>
+            {{/if}}
+
+            {{#if isUploading}}
+              <div id="file-uploading">
+                {{loading-spinner size="small"}}<span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
+                {{#if isCancellable}}
+                  <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{d-icon "times"}}</a>
                 {{/if}}
               </div>
-            </div>
-
-              {{#if site.mobileView}}
-                {{#if allowUpload}}
-                  <a class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">
-                    {{d-icon uploadIcon}}
-                  </a>
-                {{/if}}
-
-                <a href class="btn btn-default no-text mobile-preview" title={{i18n 'composer.show_preview'}} {{action "togglePreview"}}>
-                  {{d-icon "desktop"}}
-                </a>
-
-                {{#if showPreview}}
-                  {{d-button action=(action "togglePreview") class="hide-preview" label="composer.hide_preview"}}
-                {{/if}}
-              {{else}}
-                <a href {{action "togglePreview"}} class='toggle-preview'>{{html-safe toggleText}}</a>
+            {{/if}}
+            <div id='draft-status' class={{if isUploading 'hidden'}}>
+              {{#if model.draftSaving}}<div class="spinner small"></div>{{/if}}
+              {{#if model.draftSaved}}{{d-icon 'check' class='save-animation'}}{{/if}}
+              {{#if model.draftStatus}}
+                <span title={{model.draftStatus}}>
+                  {{#if model.draftConflictUser}}
+                    {{avatar model.draftConflictUser imageSize="small"}} {{d-icon 'user-edit'}}
+                  {{else}}
+                    {{d-icon 'sync-alt'}}
+                  {{/if}}
+                  {{#unless site.mobileView}}
+                    {{model.draftStatus}}
+                  {{/unless}}
+                </span>
               {{/if}}
-
+            </div>
           </div>
-        </div>
 
-      {{else}}
-        <div class='saving-text'>
-          {{#if model.createdPost}}
-            {{i18n 'composer.saved'}} <a class='permalink' href={{createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
+          {{#if site.mobileView}}
+            {{#if allowUpload}}
+              <a class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">
+                {{d-icon uploadIcon}}
+              </a>
+            {{/if}}
+
+            <a href class="btn btn-default no-text mobile-preview" title={{i18n 'composer.show_preview'}} {{action "togglePreview"}}>
+              {{d-icon "desktop"}}
+            </a>
+
+            {{#if showPreview}}
+              {{d-button action=(action "togglePreview") class="hide-preview" label="composer.hide_preview"}}
+            {{/if}}
           {{else}}
-            {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
+            <a href {{action "togglePreview"}} class='toggle-preview'>{{html-safe toggleText}}</a>
           {{/if}}
+
         </div>
+      </div>
 
-        <div class='draft-text'>
-          {{#if model.topic}}
-            {{d-icon "share"}} {{html-safe draftTitle}}
-          {{else}}
-            {{i18n "composer.saved_draft"}}
-          {{/if}}
-        </div>
+    {{else}}
+      <div class='saving-text'>
+        {{#if model.createdPost}}
+          {{i18n 'composer.saved'}} <a class='permalink' href={{createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
+        {{else}}
+          {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
+        {{/if}}
+      </div>
 
-        {{composer-toggles composeState=model.composeState
-          toggleFullscreen=(action "openIfDraft")
-          toggleComposer=(action "toggle")
-          toggleToolbar=(action "toggleToolbar")}}
+      <div class='draft-text'>
+        {{#if model.topic}}
+          {{d-icon "share"}} {{html-safe draftTitle}}
+        {{else}}
+          {{i18n "composer.saved_draft"}}
+        {{/if}}
+      </div>
 
-      {{/if}}
+      {{composer-toggles composeState=model.composeState
+        toggleFullscreen=(action "openIfDraft")
+        toggleComposer=(action "toggle")
+        toggleToolbar=(action "toggleToolbar")}}
+
+    {{/if}}
 
   {{/if}}
 

From 2afb95fe3e5dc82bda23166e6d38b81ed5d69a0c Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 11:56:42 -0700
Subject: [PATCH 0442/1830] DEV: Enable and fix the 'no-multiple-empty-lines'
 lint

---
 .template-lintrc.js                                            | 2 +-
 app/assets/javascripts/admin/templates/admin.hbs               | 2 --
 .../admin/templates/components/admin-theme-editor.hbs          | 1 -
 .../javascripts/admin/templates/components/themes-list.hbs     | 2 --
 app/assets/javascripts/admin/templates/plugins-index.hbs       | 3 ---
 .../discourse/templates/components/image-uploader.hbs          | 1 -
 .../javascripts/discourse/templates/components/share-popup.hbs | 1 -
 .../javascripts/discourse/templates/preferences/account.hbs    | 2 --
 .../javascripts/discourse/templates/preferences/categories.hbs | 2 --
 .../javascripts/discourse/templates/preferences/interface.hbs  | 1 -
 .../javascripts/discourse/templates/preferences/profile.hbs    | 1 -
 .../javascripts/discourse/templates/preferences/users.hbs      | 1 -
 app/assets/javascripts/discourse/templates/topic.hbs           | 1 -
 13 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 0a26ee1992..1f377ea0f1 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -30,7 +30,7 @@ module.exports = {
     "no-log": true,
     "no-negated-condition": true,
     "no-nested-interactive": true,
-    "no-multiple-empty-lines": false,
+    "no-multiple-empty-lines": true,
     "no-obsolete-elements": true,
     "no-outlet-outside-routes": true,
     "no-partial": true,
diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index aec3433a0b..2396114db6 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -29,11 +29,9 @@
         {{/if}}
         {{nav-item route='adminPlugins' label='admin.plugins.title'}}
         {{plugin-outlet name="admin-menu" connectorTagName="" tagName=""}}
-
       </ul>
       </div>
 
-
       <div class='boxed white admin-content'>
         <div class='admin-contents {{adminContentsClassName}}'>
           {{outlet}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
index ad669f4d3d..ba31c888c3 100644
--- a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
@@ -87,7 +87,6 @@
     </nav>
 </div>
 
-
 {{#if error}}
     <pre class='field-error'>{{error}}</pre>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/themes-list.hbs b/app/assets/javascripts/admin/templates/components/themes-list.hbs
index 4654371a23..2bfbc8843b 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list.hbs
@@ -44,8 +44,6 @@
       <span class="empty">{{i18n "admin.customize.theme.empty"}}</span>
     </div>
   {{/if}}
-
-
 </div>
 
 <div class="create-actions">
diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index 9370d8457c..d3d7c23785 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -1,9 +1,6 @@
 {{#if model.length}}
-
-
   <h3>{{i18n "admin.plugins.installed"}}</h3>
 
-
   <table class="admin-plugins grid">
     <thead>
       <tr>
diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
index bf75d0929a..9820cb33a0 100644
--- a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
@@ -29,7 +29,6 @@
     <span class="btn {{unless uploading 'hidden'}}">{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
   </div>
 
-
   {{#if imageUrl}}
     <a class="lightbox"
        href={{imageCDNURL}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index 54e8029cf6..c61f43cf64 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -35,7 +35,6 @@
       </div>
     {{/if}}
 
-
     {{d-button 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/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 3f02b15238..70b8d20cd8 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -165,7 +165,6 @@
   </div>
 {{/if}}
 
-
 {{#if canCheckEmails}}
   <div class="control-group pref-auth-tokens">
     <label class="control-label">{{i18n 'user.auth_tokens.title'}}</label>
@@ -218,7 +217,6 @@
   {{save-controls model=model action=(action "save") saved=saved}}
 {{/if}}
 
-
 {{#if model.canDeleteAccount}}
   <div class="control-group delete-account">
     <br>
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index b0fc96c15b..dacfbc1c8b 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -14,7 +14,6 @@
   </div>
   <div class="instructions">{{i18n 'user.watched_categories_instructions'}}</div>
 
-
   <div class="controls tracking-controls">
     <label>{{d-icon "d-tracking"}} {{i18n 'user.tracked_categories'}}</label>
     {{#if canSee}}
@@ -28,7 +27,6 @@
   </div>
   <div class="instructions">{{i18n 'user.tracked_categories_instructions'}}</div>
 
-
   <div class="controls tracking-controls">
     <label>{{d-icon "d-watching-first"}} {{i18n 'user.watched_first_post_categories'}}</label>
     {{category-selector
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
index 338a7d883e..acd5aa60bb 100644
--- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
@@ -54,7 +54,6 @@
   </div>
 {{/if}}
 
-
 <div class="control-group home">
   <label class="control-label">{{i18n 'user.home'}}</label>
   <div class="controls">
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index fded99a5fd..fed0da9e91 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -87,7 +87,6 @@
   </div>
 {{/if}}
 
-
 {{plugin-outlet name="user-preferences-profile" args=(hash model=model save=(action "save"))}}
 
 {{plugin-outlet name="user-custom-preferences" args=(hash model=model)}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/users.hbs b/app/assets/javascripts/discourse/templates/preferences/users.hbs
index d4c183c3a0..799b9c5c5a 100644
--- a/app/assets/javascripts/discourse/templates/preferences/users.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/users.hbs
@@ -27,5 +27,4 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-
 {{#save-controls model=model action=(action "save") saved=saved}}{{/save-controls}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index c79b3da18a..c6297b021d 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -87,7 +87,6 @@
       {{/topic-title}}
     {{/if}}
 
-
     <div class="container posts">
       <div class='selected-posts {{unless multiSelect 'hidden'}}'>
         {{selected-posts

From 2a2555e598034a4cb320ffa705353ad81e46f018 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 26 Mar 2020 12:36:19 -0700
Subject: [PATCH 0443/1830] DEV: Partial 'block-indentation' linting fixes

---
 .../templates/components/user-fields/text.hbs |  4 +-
 .../mobile/components/basic-topic-list.hbs    | 98 +++++++++----------
 .../mobile/components/categories-only.hbs     | 90 +++++++++--------
 .../mobile/components/mobile-nav.hbs          |  2 +-
 .../mobile/components/navigation-bar.hbs      | 16 +--
 .../templates/components/invite-list.hbs      | 10 +-
 6 files changed, 110 insertions(+), 110 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 1c33ea1452..1518688a95 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,4 +1,6 @@
-<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>
+  {{html-safe field.name}}
+  {{#if field.required}}<span class='required'>*</span>{{/if}}
 </label>
 <div class='controls'>
   {{input id=(concat 'user-' elementId) value=value maxlength=site.user_field_max_length}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 0949b56ee7..72ed944b94 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -1,59 +1,59 @@
 {{#conditional-loading-spinner condition=loading}}
   {{#if hasIncoming}}
-  <div class="show-mores">
-    <a href class='alert alert-info clickable' {{action showInserted}}>
-      {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
-    </a>
-  </div>
+    <div class="show-mores">
+      <a href class='alert alert-info clickable' {{action showInserted}}>
+	{{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
+      </a>
+    </div>
   {{/if}}
 
   {{#if topics}}
     <table class="topic-list">
       <tbody>
-      {{#each topics as |t|}}
-        <tr class="topic-list-item {{if t.archived 'archived'}} {{if t.visited 'visited'}}" data-topic-id={{t.id}}>
-          <td>
-            <div class='main-link'>
-              {{topic-status topic=t}}
-              {{topic-link t}}
-              {{raw "list/unread-indicator" includeUnreadIndicator=showUnreadIndicator
-                                            topicId=t.id
-                                            unreadClass=(if t.unread_by_group_member "" "read")}}
-              {{#if t.unseen}}
-                <span class="badge-notification new-topic"></span>
-              {{/if}}
-              {{#if t.hasExcerpt}}
-                <div class="topic-excerpt">
-                  {{html-safe t.excerpt}}
-                  {{#if t.excerptTruncated}}
-                    {{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
-                  {{/if}}
-                  {{#if t.canClearPin}}
-                    <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>{{i18n 'topic.clear_pin.title'}}</a>
-                  {{/if}}
-                </div>
-              {{/if}}
-            </div>
-            <div class='pull-right'>
-              {{raw "list/post-count-or-badges" topic=t postBadgesEnabled="true"}}
-            </div>
-            <div class='clearfix'></div>
-            <div class="topic-item-stats clearfix">
-              {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
-              <div class="pull-right">
-                {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
-                <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
-              </div>
-              {{#unless hideCategory}}
-                <div class='category'>
-                  {{category-link t.category}}
-                </div>
-              {{/unless}}
-              <div class="clearfix"></div>
-            </div>
-          </td>
-        </tr>
-      {{/each}}
+	{{#each topics as |t|}}
+	  <tr class="topic-list-item {{if t.archived 'archived'}} {{if t.visited 'visited'}}" data-topic-id={{t.id}}>
+	    <td>
+	      <div class='main-link'>
+		{{topic-status topic=t}}
+		{{topic-link t}}
+		{{raw "list/unread-indicator" includeUnreadIndicator=showUnreadIndicator
+					      topicId=t.id
+					      unreadClass=(if t.unread_by_group_member "" "read")}}
+		{{#if t.unseen}}
+		  <span class="badge-notification new-topic"></span>
+		{{/if}}
+		{{#if t.hasExcerpt}}
+		  <div class="topic-excerpt">
+		    {{html-safe t.excerpt}}
+		    {{#if t.excerptTruncated}}
+		      {{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
+		    {{/if}}
+		    {{#if t.canClearPin}}
+		      <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>{{i18n 'topic.clear_pin.title'}}</a>
+		    {{/if}}
+		  </div>
+		{{/if}}
+	      </div>
+	      <div class='pull-right'>
+		{{raw "list/post-count-or-badges" topic=t postBadgesEnabled="true"}}
+	      </div>
+	      <div class='clearfix'></div>
+	      <div class="topic-item-stats clearfix">
+		{{discourse-tags t mode="list" tagsForUser=tagsForUser}}
+		<div class="pull-right">
+		  {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
+		  <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
+		</div>
+		{{#unless hideCategory}}
+		  <div class='category'>
+		    {{category-link t.category}}
+		  </div>
+		{{/unless}}
+		<div class="clearfix"></div>
+	      </div>
+	    </td>
+	  </tr>
+	{{/each}}
       </tbody>
     </table>
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index ac7691bd10..b57dfeb001 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -11,58 +11,56 @@
             </tr>
 
             {{#unless c.isMuted}}
-            {{#if c.description_excerpt}}
-              <tr class="category-description">
-                <td colspan="3">
-                  {{html-safe c.description_excerpt}}
-                </td>
-              </tr>
-            {{/if}}
+	      {{#if c.description_excerpt}}
+		<tr class="category-description">
+		  <td colspan="3">
+		    {{html-safe c.description_excerpt}}
+		  </td>
+		</tr>
+	      {{/if}}
 
-            {{#if showTopics}}
-              {{#each c.topics as |t|}}
-                {{mobile-category-topic topic=t}}
-              {{/each}}
-            {{/if}}
+	      {{#if showTopics}}
+		{{#each c.topics as |t|}}
+		  {{mobile-category-topic topic=t}}
+		{{/each}}
+	      {{/if}}
 
-            {{#if c.isGrandParent}}
-              {{#each c.subcategories as |subcategory|}}
-                <tr data-category-id={{c.id}} class='subcategory-list-item category' style={{border-color subcategory.color}}>
-                  <td>
-                    {{category-title-link tagName="h4" category=subcategory}}
-
-                    <div class="subcategories-list">
-                      {{#if subcategory.subcategories}}
-                        <div class='subcategories'>
-                          {{#each subcategory.subcategories as |subsubcategory|}}
-                            {{#unless subsubcategory.isMuted}}
-                              {{category-link subsubcategory}}
-                            {{/unless}}
-                          {{/each}}
-                        </div>
-                      {{/if}}
-                    </div>
-                  </td>
-                </tr>
-              {{/each}}
-            {{else if c.subcategories}}
-              <tr class="subcategories-list">
-                <td>
-                  <div class='subcategories'>
-                    {{#each c.subcategories as |subcategory|}}
-                      {{#unless subcategory.isMuted}}
-                        {{category-link subcategory}}
-                      {{/unless}}
-                    {{/each}}
-                  </div>
-                </td>
-              </tr>
-            {{/if}}
+	      {{#if c.isGrandParent}}
+		{{#each c.subcategories as |subcategory|}}
+		  <tr data-category-id={{c.id}} class='subcategory-list-item category' style={{border-color subcategory.color}}>
+		    <td>
+		      {{category-title-link tagName="h4" category=subcategory}}
+		      <div class="subcategories-list">
+			{{#if subcategory.subcategories}}
+			  <div class='subcategories'>
+			    {{#each subcategory.subcategories as |subsubcategory|}}
+			      {{#unless subsubcategory.isMuted}}
+				{{category-link subsubcategory}}
+			      {{/unless}}
+			    {{/each}}
+			  </div>
+			{{/if}}
+		      </div>
+		    </td>
+		  </tr>
+		{{/each}}
+	      {{else if c.subcategories}}
+		<tr class="subcategories-list">
+		  <td>
+		    <div class='subcategories'>
+		      {{#each c.subcategories as |subcategory|}}
+			{{#unless subcategory.isMuted}}
+			  {{category-link subcategory}}
+			{{/unless}}
+		      {{/each}}
+		    </div>
+		  </td>
+		</tr>
+	      {{/if}}
             {{/unless}}
           </tbody>
         </table>
         <footer class="clearfix">
-
           <figure title={{i18n 'all_time_desc'}}>{{number c.topics_all_time}} <figcaption>{{i18n 'all_time'}}</figcaption></figure>
 
           {{#if c.pickMonth}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
index ca6140be54..c657025ee4 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
@@ -7,5 +7,5 @@
   </li>
 {{/if}}
 <ul class='drop {{if expanded 'expanded'}}'>
-{{yield}}
+  {{yield}}
 </ul>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
index d760be82d2..dc7b593da3 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
@@ -5,12 +5,12 @@
   </a>
 </li>
 {{#if expanded}}
-<ul class='drop'>
-  {{#each navItems as |navItem|}}
-    {{navigation-item content=navItem filterMode=filterMode category=category}}
-  {{/each}}
-  {{#each connectors as |c|}}
-  {{plugin-connector connector=c class=c.classNames tagName="li" args=(hash category=category filterMode=filterMode)}}
-  {{/each}}
-</ul>
+  <ul class='drop'>
+    {{#each navItems as |navItem|}}
+      {{navigation-item content=navItem filterMode=filterMode category=category}}
+    {{/each}}
+    {{#each connectors as |c|}}
+      {{plugin-connector connector=c class=c.classNames tagName="li" args=(hash category=category filterMode=filterMode)}}
+    {{/each}}
+  </ul>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list.hbs b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
index 4a8ea1ffae..95739573ee 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
@@ -1,10 +1,10 @@
 
 {{#if users}}
-<div class="users-list">
-  {{#each users as |user|}}
-    {{invite-list-user user=user roles=roles removeUser=(action "removeUser")}}
-  {{/each}}
-</div>
+  <div class="users-list">
+    {{#each users as |user|}}
+      {{invite-list-user user=user roles=roles removeUser=(action "removeUser")}}
+    {{/each}}
+  </div>
 {{/if}}
 
 <div class="new-user">

From 5b6cdd6fb544786947c58a205fbc819ff0943bfe Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 23:17:00 +0200
Subject: [PATCH 0444/1830] DEV: adds a loading property to d-button (#9072)

Usage:

```
{{d-button icon="times" label="foo.bar" isLoading=true}}
```

Note that  a button loading without an icon will shrink text size to prevent button to jump in size.

A button while loading is disabled.
---
 .../discourse/components/d-button.js          | 24 +++++++++-
 .../templates/components/d-button.hbs         | 10 +++-
 .../common/components/buttons.scss            | 25 ++++++++++
 lib/svg_sprite/svg_sprite.rb                  |  3 +-
 test/javascripts/components/d-button-test.js  | 46 +++++++++++++++++++
 5 files changed, 104 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/d-button.js b/app/assets/javascripts/discourse/components/d-button.js
index 1210432127..4df816a347 100644
--- a/app/assets/javascripts/discourse/components/d-button.js
+++ b/app/assets/javascripts/discourse/components/d-button.js
@@ -1,4 +1,5 @@
 import { notEmpty, empty, equal } from "@ember/object/computed";
+import { computed } from "@ember/object";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import DiscourseURL from "discourse/lib/url";
@@ -11,17 +12,36 @@ export default Component.extend({
 
   type: "button",
 
+  isLoading: computed({
+    set(key, value) {
+      this.set("forceDisabled", value);
+      return value;
+    }
+  }),
+
   tagName: "button",
-  classNameBindings: ["btnLink::btn", "btnLink", "noText", "btnType"],
+  classNameBindings: [
+    "isLoading:is-loading",
+    "btnLink::btn",
+    "btnLink",
+    "noText",
+    "btnType"
+  ],
   attributeBindings: [
     "form",
-    "disabled",
+    "isDisabled:disabled",
     "translatedTitle:title",
     "translatedLabel:aria-label",
     "tabindex",
     "type"
   ],
 
+  isDisabled: computed("disabled", "forceDisabled", function() {
+    return this.forceDisabled || this.disabled;
+  }),
+
+  forceDisabled: false,
+
   btnIcon: notEmpty("icon"),
 
   btnLink: equal("display", "link"),
diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/templates/components/d-button.hbs
index aeb5f6b6f6..58105b2cd2 100644
--- a/app/assets/javascripts/discourse/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-button.hbs
@@ -1,5 +1,13 @@
 {{#if icon}}
-  {{d-icon icon}}
+  {{#if isLoading}}
+    {{d-icon "spinner" class="loading-icon"}}
+  {{else}}
+    {{d-icon icon}}
+  {{/if}}
+{{else}}
+  {{#if isLoading}}
+    {{d-icon "spinner" class="loading-icon"}}
+  {{/if}}
 {{/if}}
 
 {{#if translatedLabel}}
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index 1f7ea76555..643975ec50 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -67,6 +67,31 @@
     }
     cursor: not-allowed;
   }
+
+  .loading-container {
+    display: none;
+    margin: 0 6.75px 0 0;
+  }
+
+  &.is-loading {
+    &.btn-text {
+      .d-button-label {
+        font-size: $font-down-2;
+      }
+
+      &.btn-small {
+        .loading-icon {
+          font-size: $font-down-1;
+          margin-right: 0.2em;
+        }
+      }
+    }
+
+    .loading-icon {
+      -webkit-animation: rotate-forever 1s infinite linear, fadein 1s;
+      animation: rotate-forever 1s infinite linear, fadein 1s;
+    }
+  }
 }
 
 .btn.hidden {
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index a1f1c12822..f2c4bcdbb7 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -198,7 +198,8 @@ module SvgSprite
     "user-shield",
     "user-times",
     "users",
-    "wrench"
+    "wrench",
+    "spinner"
   ])
 
   FA_ICON_MAP = { 'far fa-' => 'far-', 'fab fa-' => 'fab-', 'fas fa-' => '', 'fa-' => '' }
diff --git a/test/javascripts/components/d-button-test.js b/test/javascripts/components/d-button-test.js
index cf86842b98..521fe7bb18 100644
--- a/test/javascripts/components/d-button-test.js
+++ b/test/javascripts/components/d-button-test.js
@@ -54,3 +54,49 @@ componentTest("link-styled button", {
     );
   }
 });
+
+componentTest("isLoading button", {
+  template: "{{d-button isLoading=isLoading}}",
+
+  beforeEach() {
+    this.set("isLoading", true);
+  },
+
+  test(assert) {
+    assert.ok(
+      find("button.is-loading .spinner").length,
+      "it has a spinner showing"
+    );
+    assert.ok(
+      find("button[disabled]").length,
+      "while loading the button is disabled"
+    );
+
+    this.set("isLoading", false);
+
+    assert.notOk(
+      find("button .spinner").length,
+      "it doesn't have a spinner showing"
+    );
+    assert.ok(
+      find("button:not([disabled])").length,
+      "while not loading the button is enabled"
+    );
+  }
+});
+
+componentTest("disabled button", {
+  template: "{{d-button disabled=disabled}}",
+
+  beforeEach() {
+    this.set("disabled", true);
+  },
+
+  test(assert) {
+    assert.ok(find("button[disabled]").length, "the button is disabled");
+
+    this.set("disabled", false);
+
+    assert.ok(find("button:not([disabled])").length, "the button is enabled");
+  }
+});

From 8f4b54fedd7273d3b8544f1ec7a254392a4daca5 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 30 Mar 2020 23:42:21 +0200
Subject: [PATCH 0445/1830] fix d-button tests (#9316)

---
 test/javascripts/components/d-button-test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/javascripts/components/d-button-test.js b/test/javascripts/components/d-button-test.js
index 521fe7bb18..5b0bdeb150 100644
--- a/test/javascripts/components/d-button-test.js
+++ b/test/javascripts/components/d-button-test.js
@@ -64,7 +64,7 @@ componentTest("isLoading button", {
 
   test(assert) {
     assert.ok(
-      find("button.is-loading .spinner").length,
+      find("button.is-loading .loading-icon").length,
       "it has a spinner showing"
     );
     assert.ok(
@@ -75,7 +75,7 @@ componentTest("isLoading button", {
     this.set("isLoading", false);
 
     assert.notOk(
-      find("button .spinner").length,
+      find("button .loading-icon").length,
       "it doesn't have a spinner showing"
     );
     assert.ok(

From 5f1c95329e1a727bc6badab11f32dabf2ed950c1 Mon Sep 17 00:00:00 2001
From: Ben Bowler <ben@benbowler.com>
Date: Mon, 30 Mar 2020 23:52:23 +0100
Subject: [PATCH 0446/1830] DOCS: Update DEVELOPER-ADVANCED.md (#9313)

Update correct python software-properties-common package post Ubuntu 12.04
---
 docs/DEVELOPER-ADVANCED.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/DEVELOPER-ADVANCED.md b/docs/DEVELOPER-ADVANCED.md
index d6f39aabee..2dc64f098b 100644
--- a/docs/DEVELOPER-ADVANCED.md
+++ b/docs/DEVELOPER-ADVANCED.md
@@ -12,7 +12,7 @@ To get your Ubuntu 16.04 or 18.04 LTS install up and running to develop Discours
     whoami > /tmp/username
     sudo add-apt-repository ppa:chris-lea/redis-server
     sudo apt-get -yqq update
-    sudo apt-get -yqq install python-software-properties vim curl expect debconf-utils git-core build-essential zlib1g-dev libssl-dev openssl libcurl4-openssl-dev libreadline6-dev libpcre3 libpcre3-dev imagemagick redis-server advancecomp gifsicle jhead jpegoptim libjpeg-turbo-progs optipng pngcrush pngquant gnupg2
+    sudo apt-get -yqq install software-properties-common vim curl expect debconf-utils git-core build-essential zlib1g-dev libssl-dev openssl libcurl4-openssl-dev libreadline6-dev libpcre3 libpcre3-dev imagemagick redis-server advancecomp gifsicle jhead jpegoptim libjpeg-turbo-progs optipng pngcrush pngquant gnupg2
 
     # Ruby
     curl -sSL https://rvm.io/mpapis.asc | gpg2 --import -

From a34711c23a58c991e44af2ff5e62f618107b244d Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 31 Mar 2020 11:48:54 +1100
Subject: [PATCH 0447/1830] FIX: do not save draft while it is loading

When editing a post we were incorrectly saving a draft prior to user typing

This caused a bloat in the amount of drafts saved per user and inconsistency
around behavior of "escape" button.

It also lead to lots of warnings about draft conflicts when copying stuff
between posts.

The code is improved to use promises more appropriately, however further
changes are needed to clean up internals so methods consistently return
promises.

Too many methods in the controller sometimes return a promise and sometimes
an object. Long term the methods will become async and all of this will be
corrected.
---
 .../discourse/controllers/composer.js         | 140 +++++++++++-------
 .../javascripts/discourse/models/composer.js  |  41 ++---
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/composer.js b/app/assets/javascripts/discourse/controllers/composer.js
index e7d02fbd3c..297d635fc0 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js
+++ b/app/assets/javascripts/discourse/controllers/composer.js
@@ -27,6 +27,8 @@ import EmberObject, { computed } from "@ember/object";
 import deprecated from "discourse-common/lib/deprecated";
 
 function loadDraft(store, opts) {
+  let promise = Promise.resolve();
+
   opts = opts || {};
 
   let draft = opts.draft;
@@ -59,10 +61,10 @@ function loadDraft(store, opts) {
       attrs[f] = draft[f] || opts[f];
     });
 
-    composer.open(attrs);
-
-    return composer;
+    promise = promise.then(() => composer.open(attrs)).then(() => composer);
   }
+
+  return promise;
 }
 
 const _popupMenuOptionsCallbacks = [];
@@ -799,7 +801,8 @@ export default Controller.extend({
     this.setProperties({
       showEditReason: false,
       editReason: null,
-      scopedCategoryId: null
+      scopedCategoryId: null,
+      skipAutoSave: true
     });
 
     // Scope the categories drop down to the category we opened the composer with.
@@ -820,7 +823,7 @@ export default Controller.extend({
       composerModel = null;
     }
 
-    return new Promise((resolve, reject) => {
+    let promise = new Promise((resolve, reject) => {
       if (composerModel && composerModel.replyDirty) {
         // If we're already open, we don't have to do anything
         if (
@@ -870,7 +873,7 @@ export default Controller.extend({
               opts.draft = data.draft;
             }
             opts.draftSequence = data.draft_sequence;
-            this._setModel(composerModel, opts);
+            return this._setModel(composerModel, opts);
           })
           .then(resolve, reject);
       }
@@ -884,72 +887,88 @@ export default Controller.extend({
             if (data.draft) {
               opts.draft = data.draft;
               opts.draftSequence = data.draft_sequence;
-              this.open(opts);
+              return this.open(opts);
             }
           });
       }
 
-      this._setModel(composerModel, opts);
-      resolve();
+      this._setModel(composerModel, opts).then(resolve, reject);
     });
+
+    promise = promise.finally(() => {
+      this.skipAutoSave = false;
+    });
+    return promise;
   },
 
   // Given a potential instance and options, set the model for this composer.
-  _setModel(composerModel, opts) {
+  _setModel(optionalComposerModel, opts) {
+    let promise = Promise.resolve();
+
     this.set("linkLookup", null);
 
-    if (opts.draft) {
-      composerModel = loadDraft(this.store, opts);
-      if (composerModel) {
-        composerModel.set("topic", opts.topic);
+    promise = promise.then(() => {
+      if (opts.draft) {
+        return loadDraft(this.store, opts).then(model => {
+          if (!model) {
+            throw new Error("draft was not found");
+          }
+          return model;
+        });
+      } else {
+        let model =
+          optionalComposerModel || this.store.createRecord("composer");
+        return model.open(opts).then(() => model);
       }
-    } else {
-      composerModel = composerModel || this.store.createRecord("composer");
-      composerModel.open(opts);
-    }
-
-    this.set("model", composerModel);
-    composerModel.setProperties({
-      composeState: Composer.OPEN,
-      isWarning: false
     });
 
-    if (!this.model.targetRecipients) {
-      if (opts.usernames) {
-        deprecated("`usernames` is deprecated, use `recipients` instead.");
-        this.model.set("targetRecipients", opts.usernames);
-      } else if (opts.recipients) {
-        this.model.set("targetRecipients", opts.recipients);
+    promise.then(composerModel => {
+      this.set("model", composerModel);
+
+      composerModel.setProperties({
+        composeState: Composer.OPEN,
+        isWarning: false
+      });
+
+      if (!this.model.targetRecipients) {
+        if (opts.usernames) {
+          deprecated("`usernames` is deprecated, use `recipients` instead.");
+          this.model.set("targetRecipients", opts.usernames);
+        } else if (opts.recipients) {
+          this.model.set("targetRecipients", opts.recipients);
+        }
       }
-    }
 
-    if (
-      opts.topicTitle &&
-      opts.topicTitle.length <= this.siteSettings.max_topic_title_length
-    ) {
-      this.model.set("title", opts.topicTitle);
-    }
+      if (
+        opts.topicTitle &&
+        opts.topicTitle.length <= this.siteSettings.max_topic_title_length
+      ) {
+        this.model.set("title", opts.topicTitle);
+      }
 
-    if (opts.topicCategoryId) {
-      this.model.set("categoryId", opts.topicCategoryId);
-    }
+      if (opts.topicCategoryId) {
+        this.model.set("categoryId", opts.topicCategoryId);
+      }
 
-    if (opts.topicTags && !this.site.mobileView && this.site.can_tag_topics) {
-      let tags = escapeExpression(opts.topicTags)
-        .split(",")
-        .slice(0, this.siteSettings.max_tags_per_topic);
+      if (opts.topicTags && !this.site.mobileView && this.site.can_tag_topics) {
+        let tags = escapeExpression(opts.topicTags)
+          .split(",")
+          .slice(0, this.siteSettings.max_tags_per_topic);
 
-      tags.forEach(
-        (tag, index, array) =>
-          (array[index] = tag.substring(0, this.siteSettings.max_tag_length))
-      );
+        tags.forEach(
+          (tag, index, array) =>
+            (array[index] = tag.substring(0, this.siteSettings.max_tag_length))
+        );
 
-      this.model.set("tags", tags);
-    }
+        this.model.set("tags", tags);
+      }
 
-    if (opts.topicBody) {
-      this.model.set("reply", opts.topicBody);
-    }
+      if (opts.topicBody) {
+        this.model.set("reply", opts.topicBody);
+      }
+    });
+
+    return promise;
   },
 
   viewNewReply() {
@@ -1009,10 +1028,12 @@ export default Controller.extend({
   },
 
   cancelComposer(differentDraft = false) {
+    this.skipAutoSave = true;
+
     const keyPrefix =
       this.model.action === "edit" ? "post.abandon_edit" : "post.abandon";
 
-    return new Promise(resolve => {
+    let promise = new Promise(resolve => {
       if (this.get("model.hasMetaData") || this.get("model.replyDirty")) {
         bootbox.dialog(I18n.t(keyPrefix + ".confirm"), [
           {
@@ -1051,6 +1072,10 @@ export default Controller.extend({
         });
       }
     });
+
+    return promise.finally(() => {
+      this.skipAutoSave = false;
+    });
   },
 
   shrink() {
@@ -1073,7 +1098,14 @@ export default Controller.extend({
 
   @observes("model.reply", "model.title")
   _shouldSaveDraft() {
-    debounce(this, this._saveDraft, 2000);
+    if (
+      this.model &&
+      !this.model.loading &&
+      !this.skipAutoSave &&
+      !this.model.disableDrafts
+    ) {
+      debounce(this, this._saveDraft, 2000);
+    }
   },
 
   @discourseComputed("model.categoryId", "lastValidatedAt")
diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js
index 1b53ed8927..9d0dcb8c45 100644
--- a/app/assets/javascripts/discourse/models/composer.js
+++ b/app/assets/javascripts/discourse/models/composer.js
@@ -673,14 +673,16 @@ const Composer = RestModel.extend({
        quote    - If we're opening a reply from a quote, the quote we're making
   */
   open(opts) {
+    let promise = Promise.resolve();
+
     if (!opts) opts = {};
-    this.set("loading", false);
+    this.set("loading", true);
 
     const replyBlank = isEmpty(this.reply);
 
     const composer = this;
     if (!replyBlank && (opts.reply || isEdit(opts.action)) && this.replyDirty) {
-      return;
+      return promise;
     }
 
     if (opts.action === REPLY && isEdit(this.action)) {
@@ -741,11 +743,11 @@ const Composer = RestModel.extend({
     }
 
     if (opts.postId) {
-      this.set("loading", true);
-
-      this.store
-        .find("post", opts.postId)
-        .then(post => composer.setProperties({ post, loading: false }));
+      promise = promise.then(() =>
+        this.store
+          .find("post", opts.postId)
+          .then(post => composer.setProperties({ post }))
+      );
     }
 
     // If we are editing a post, load it.
@@ -759,15 +761,16 @@ const Composer = RestModel.extend({
       }
       this.setProperties(topicProps);
 
-      this.store.find("post", opts.post.id).then(post => {
-        composer.setProperties({
-          reply: post.raw,
-          originalText: post.raw,
-          loading: false
-        });
+      promise = promise.then(() =>
+        this.store.find("post", opts.post.id).then(post => {
+          composer.setProperties({
+            reply: post.raw,
+            originalText: post.raw
+          });
 
-        composer.appEvents.trigger("composer:reply-reloaded", composer);
-      });
+          composer.appEvents.trigger("composer:reply-reloaded", composer);
+        })
+      );
     } else if (opts.action === REPLY && opts.quote) {
       this.setProperties({
         reply: opts.quote,
@@ -785,7 +788,9 @@ const Composer = RestModel.extend({
     }
 
     if (!isEdit(opts.action) || !opts.post) {
-      composer.appEvents.trigger("composer:reply-reloaded", composer);
+      promise = promise.then(() =>
+        composer.appEvents.trigger("composer:reply-reloaded", composer)
+      );
     }
 
     // Ensure additional draft fields are set
@@ -793,7 +798,9 @@ const Composer = RestModel.extend({
       this.set(_add_draft_fields[f], opts[f]);
     });
 
-    return false;
+    return promise.finally(() => {
+      this.set("loading", false);
+    });
   },
 
   // Overwrite to implement custom logic

From d282233d3178dcbceb8ada3464aa94a3d0e1728d Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 30 Mar 2020 21:40:11 -0400
Subject: [PATCH 0448/1830] UX: Add flair styles to latest topic list

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

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 2f028e3c5d..1f4e99171c 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -464,7 +464,8 @@ blockquote {
 .user-card-avatar,
 .topic-map .poster,
 .user-profile-avatar,
-.user-image {
+.user-image,
+.latest-topic-list-item {
   .avatar-flair {
     display: flex;
     align-items: center;
@@ -479,7 +480,8 @@ blockquote {
 .topic-avatar .avatar-flair,
 .avatar-flair-preview .avatar-flair,
 .collapsed-info .user-profile-avatar .avatar-flair,
-.user-image .avatar-flair {
+.user-image .avatar-flair,
+.latest-topic-list-item .avatar-flair {
   background-size: 20px 20px;
   width: 20px;
   height: 20px;

From fcc5ef9625069e7a33a7ae75063ae5de38fc06e9 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 31 Mar 2020 14:40:00 +1100
Subject: [PATCH 0449/1830] FIX: when switching reply type update options

Previously we were not correctly updating reply types leading to inconsistent
behavior when using drop down in composer (for reply type)
---
 .../select-kit/components/composer-actions.js          | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js b/app/assets/javascripts/select-kit/components/composer-actions.js
index 773c2b10e7..720dddd2ca 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js
@@ -20,6 +20,7 @@ export function _clearSnapshots() {
 }
 
 export default DropdownSelectBoxComponent.extend({
+  _seq: 0,
   pluginApiIdentifiers: ["composer-actions"],
   classNames: ["composer-actions"],
 
@@ -29,6 +30,10 @@ export default DropdownSelectBoxComponent.extend({
     showFullTitle: false
   },
 
+  contentChanged() {
+    this.set("_seq", this._seq + 1);
+  },
+
   didReceiveAttrs() {
     this._super(...arguments);
 
@@ -40,6 +45,7 @@ export default DropdownSelectBoxComponent.extend({
     ) {
       _topicSnapshot = this.get("composerModel.topic");
       _postSnapshot = this.get("composerModel.post");
+      this.contentChanged();
     }
 
     // if we hit reply on a different post we want to change postSnapshot
@@ -48,6 +54,7 @@ export default DropdownSelectBoxComponent.extend({
       (!_postSnapshot || this.get("composerModel.post.id") !== _postSnapshot.id)
     ) {
       _postSnapshot = this.get("composerModel.post");
+      this.contentChanged();
     }
 
     if (isEmpty(this.content)) {
@@ -59,7 +66,7 @@ export default DropdownSelectBoxComponent.extend({
     return {};
   },
 
-  content: computed(function() {
+  content: computed("_seq", function() {
     let items = [];
 
     if (
@@ -304,6 +311,7 @@ export default DropdownSelectBoxComponent.extend({
           ),
           this.composerModel
         );
+        this.contentChanged();
       } else {
         // eslint-disable-next-line no-console
         console.error(`No method '${action}' found`);

From 6d3d9ecf6c2323d239357df2318ea74aee8d1080 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 31 Mar 2020 14:40:40 +1100
Subject: [PATCH 0450/1830] DEV: adjust rake autospec to work with renamed es6
 files

We no longer use es6 files, update autospec
---
 lib/autospec/qunit_runner.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/autospec/qunit_runner.rb b/lib/autospec/qunit_runner.rb
index 37bc6d76e0..579e6834ce 100644
--- a/lib/autospec/qunit_runner.rb
+++ b/lib/autospec/qunit_runner.rb
@@ -16,9 +16,9 @@ module Autospec
     end
 
     # Discourse specific
-    watch(%r{^app/assets/javascripts/discourse/(.+)\.js.es6$}) { |m| "test/javascripts/#{m[1]}-test.js.es6" }
-    watch(%r{^app/assets/javascripts/admin/(.+)\.js.es6$})     { |m| "test/javascripts/admin/#{m[1]}-test.js.es6" }
-    watch(%r{^test/javascripts/.+\.js.es6$})
+    watch(%r{^app/assets/javascripts/discourse/(.+)\.js$}) { |m| "test/javascripts/#{m[1]}-test.js" }
+    watch(%r{^app/assets/javascripts/admin/(.+)\.js$})     { |m| "test/javascripts/admin/#{m[1]}-test.js" }
+    watch(%r{^test/javascripts/.+\.js$})
 
     RELOADERS = Set.new
     def self.reload(pattern)
@@ -33,7 +33,7 @@ module Autospec
     reload(%r{^test/javascripts/(helpers|mixins)/.+\.js(\.es6)?$})
     reload("test/javascripts/test_helper.js")
 
-    watch(%r{^plugins/.*/test/.+\.js.es6$})
+    watch(%r{^plugins/.*/test/.+\.js(\.es6)?$})
 
     require "socket"
 

From a0f59a55ccc75678703e34748b58d9531f4254e1 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Tue, 31 Mar 2020 16:19:47 +1100
Subject: [PATCH 0451/1830] FIX: when a post is moved copy notifications level
 (#9311)

This is a revert of https://github.com/discourse/discourse/commit/2c011252f1c0443965ca5317169550083a43c657

More information on meta: https://meta.discourse.org/t/when-a-reply-is-moved-to-a-new-topic-the-followers-of-the-previous-topic-are-automatically-follower-of-the-new-topic-as-well/130025
---
 app/models/post_mover.rb       | 23 +++++++++--------------
 spec/models/post_mover_spec.rb |  4 ++--
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb
index 1037c3ff00..0e36834ac8 100644
--- a/app/models/post_mover.rb
+++ b/app/models/post_mover.rb
@@ -332,8 +332,7 @@ class PostMover
       old_topic_id: original_topic.id,
       new_topic_id: destination_topic.id,
       old_highest_post_number: destination_topic.highest_post_number,
-      old_highest_staff_post_number: destination_topic.highest_staff_post_number,
-      default_notification_level: NotificationLevels.topic_levels[:regular]
+      old_highest_staff_post_number: destination_topic.highest_staff_post_number
     }
 
     DB.exec(<<~SQL, params)
@@ -342,9 +341,13 @@ class PostMover
                               notifications_changed_at, notifications_reason_id)
       SELECT tu.user_id,
              :new_topic_id                               AS topic_id,
-             CASE
-               WHEN p.user_id IS NULL THEN FALSE
-               ELSE TRUE END                             AS posted,
+               EXISTS(
+                 SELECT 1
+                 FROM posts p
+                 WHERE p.topic_id = :new_topic_id
+                   AND p.user_id = tu.user_id
+                 LIMIT 1
+               )                                         AS posted,
              (
                SELECT MAX(lr.new_post_number)
                FROM moved_posts lr
@@ -365,19 +368,11 @@ class PostMover
              )                                           AS last_emailed_post_number,
              GREATEST(tu.first_visited_at, t.created_at) AS first_visited_at,
              GREATEST(tu.last_visited_at, t.created_at)  AS last_visited_at,
-             CASE
-               WHEN p.user_id IS NOT NULL THEN tu.notification_level
-               ELSE :default_notification_level END      AS notification_level,
+             tu.notification_level,
              tu.notifications_changed_at,
              tu.notifications_reason_id
       FROM topic_users tu
            JOIN topics t ON (t.id = :new_topic_id)
-           LEFT OUTER JOIN
-           (
-             SELECT DISTINCT user_id
-             FROM posts
-             WHERE topic_id = :new_topic_id
-           ) p ON (p.user_id = tu.user_id)
       WHERE tu.topic_id = :old_topic_id
         AND GREATEST(
                 tu.last_read_post_number,
diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb
index d198e2d33c..aebfefe12d 100644
--- a/spec/models/post_mover_spec.rb
+++ b/spec/models/post_mover_spec.rb
@@ -470,7 +470,7 @@ describe PostMover do
                       last_read_post_number: 2,
                       highest_seen_post_number: 2,
                       last_emailed_post_number: 2,
-                      notification_level: TopicUser.notification_levels[:regular],
+                      notification_level: TopicUser.notification_levels[:tracking],
                       posted: false
                     )
               expect(TopicUser.find_by(topic: new_topic, user: user2))
@@ -486,7 +486,7 @@ describe PostMover do
                       last_read_post_number: 1,
                       highest_seen_post_number: 2,
                       last_emailed_post_number: 2,
-                      notification_level: TopicUser.notification_levels[:regular],
+                      notification_level: TopicUser.notification_levels[:watching],
                       posted: false
                     )
             end

From 9bbaaea1e8561692d7c095c034637de99a791d29 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 31 Mar 2020 08:55:47 +0200
Subject: [PATCH 0452/1830] UX: better customize emoji layout on mobile (#9319)

---
 .../common/admin/admin_emojis.scss            | 49 +++++--------------
 app/assets/stylesheets/mobile.scss            |  1 +
 .../stylesheets/mobile/admin_emojis.scss      | 35 +++++++++++++
 3 files changed, 48 insertions(+), 37 deletions(-)
 create mode 100644 app/assets/stylesheets/mobile/admin_emojis.scss

diff --git a/app/assets/stylesheets/common/admin/admin_emojis.scss b/app/assets/stylesheets/common/admin/admin_emojis.scss
index c6cf4c2fbd..fd2cfddb06 100644
--- a/app/assets/stylesheets/common/admin/admin_emojis.scss
+++ b/app/assets/stylesheets/common/admin/admin_emojis.scss
@@ -4,47 +4,22 @@
       width: 220px;
     }
   }
-}
 
-.emoji-uploader {
-  display: flex;
-  align-items: flex-end;
-
-  input,
-  .select-kit {
-    width: 220px;
-    margin: 0 1em 0 0;
-  }
-
-  .upload-container {
+  .emoji-uploader {
     display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-direction: column;
-  }
-}
+    align-items: flex-end;
 
-.mobile-view {
-  .admin-emojis {
-    .emoji-uploader {
+    input,
+    .select-kit {
+      width: 220px;
+      margin: 0 1em 0 0;
+    }
+
+    .upload-container {
+      display: flex;
+      align-items: center;
+      justify-content: center;
       flex-direction: column;
-
-      .fields {
-        input,
-        .select-kit {
-          width: 100%;
-        }
-      }
-
-      .upload-container {
-        margin: 1em 0 0 0;
-      }
-    }
-
-    #custom_emoji {
-      .select-kit {
-        display: none;
-      }
     }
   }
 }
diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss
index 567a051794..ee9c3ed92d 100644
--- a/app/assets/stylesheets/mobile.scss
+++ b/app/assets/stylesheets/mobile.scss
@@ -29,6 +29,7 @@
 @import "mobile/admin_report";
 @import "mobile/admin_report_table";
 @import "mobile/admin_report_counters";
+@import "mobile/admin_emojis";
 @import "mobile/menu-panel";
 @import "mobile/reviewables";
 
diff --git a/app/assets/stylesheets/mobile/admin_emojis.scss b/app/assets/stylesheets/mobile/admin_emojis.scss
new file mode 100644
index 0000000000..2014a51ba3
--- /dev/null
+++ b/app/assets/stylesheets/mobile/admin_emojis.scss
@@ -0,0 +1,35 @@
+.admin-emojis {
+  #custom_emoji {
+    .select-kit {
+      display: none;
+    }
+
+    tbody tr th {
+      @include ellipsis;
+
+      &:nth-child(2) {
+        max-width: 80px;
+      }
+    }
+  }
+
+  .emoji-uploader {
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: center;
+
+    .control {
+      margin-bottom: 1em;
+      width: 100%;
+
+      input,
+      .select-kit {
+        width: 100%;
+      }
+    }
+
+    .upload-container {
+      margin: 0;
+    }
+  }
+}

From 4f6d722e45e02eb80efa392c474cce41d276195c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 31 Mar 2020 09:13:16 +0200
Subject: [PATCH 0453/1830] DEV: adds a new dropdown widget usable in any
 widget (#9297)

---
 .../discourse/widgets/widget-dropdown.js      | 263 ++++++++++++++++
 .../common/components/widget-dropdown.scss    |  51 +++
 .../widgets/widget-dropdown-test.js           | 298 ++++++++++++++++++
 3 files changed, 612 insertions(+)
 create mode 100644 app/assets/javascripts/discourse/widgets/widget-dropdown.js
 create mode 100644 app/assets/stylesheets/common/components/widget-dropdown.scss
 create mode 100644 test/javascripts/widgets/widget-dropdown-test.js

diff --git a/app/assets/javascripts/discourse/widgets/widget-dropdown.js b/app/assets/javascripts/discourse/widgets/widget-dropdown.js
new file mode 100644
index 0000000000..e882588d67
--- /dev/null
+++ b/app/assets/javascripts/discourse/widgets/widget-dropdown.js
@@ -0,0 +1,263 @@
+import { createWidget } from "discourse/widgets/widget";
+import hbs from "discourse/widgets/hbs-compiler";
+
+/*
+
+  widget-dropdown
+
+  Usage
+  -----
+
+  {{attach
+    widget="widget-dropdown"
+    attrs=(hash
+      id=id
+      label=label
+      content=content
+      onChange=onChange
+      options=(hash)
+    )
+  }}
+
+  Mandatory attributes:
+
+    - id: must be unique in the application
+
+    - label or translatedLabel:
+        - label: an i18n key to be translated and displayed on the header
+        - translatedLabel: an already translated label to display on the header
+
+    - onChange: action called when a click happens on a row, content[rowIndex] will be passed as params
+
+  Optional attributes:
+
+    - class: adds css class to the dropdown
+    - content: list of items to display, if undefined or empty dropdown won't display
+      Example content:
+
+      ```
+      [
+        { id: 1, label: "foo.bar" },
+        "separator",
+        { id: 2, translatedLabel: "FooBar" },
+        { id: 3 label: "foo.baz", icon: "times" },
+        { id: 4, html: "<b>foo</b>" }
+      ]
+      ```
+
+    - options: accepts a hash of optional attributes
+      - headerClass: adds css class to the dropdown header
+      - bodyClass: adds css class to the dropdown header
+*/
+
+export const WidgetDropdownHeaderClass = {
+  tagName: "button",
+
+  transform(attrs) {
+    return {
+      label: attrs.translatedLabel ? attrs.translatedLabel : I18n.t(attrs.label)
+    };
+  },
+
+  buildClasses(attrs) {
+    let classes = ["widget-dropdown-header", "btn", "btn-default"];
+    if (attrs.class) {
+      classes = classes.concat(attrs.class.split(" "));
+    }
+    return classes.filter(Boolean).join(" ");
+  },
+
+  click(event) {
+    event.preventDefault();
+
+    this.sendWidgetAction("_onTrigger");
+  },
+
+  template: hbs`
+    {{#if attrs.icon}}
+      {{d-icon attrs.icon}}
+    {{/if}}
+    <span class="label">
+      {{transformed.label}}
+    </span>
+  `
+};
+
+createWidget("widget-dropdown-header", WidgetDropdownHeaderClass);
+
+export const WidgetDropdownItemClass = {
+  tagName: "div",
+
+  transform(attrs) {
+    return {
+      content:
+        attrs.item === "separator"
+          ? "<hr>"
+          : attrs.item.html
+          ? attrs.item.html
+          : attrs.item.translatedLabel
+          ? attrs.item.translatedLabel
+          : I18n.t(attrs.item.label)
+    };
+  },
+
+  buildAttributes(attrs) {
+    return { "data-id": attrs.item.id };
+  },
+
+  buildClasses(attrs) {
+    return [
+      "widget-dropdown-item",
+      attrs.item === "separator" ? "separator" : `item-${attrs.item.id}`
+    ].join(" ");
+  },
+
+  click(event) {
+    event.preventDefault();
+
+    this.sendWidgetAction("_onChange", this.attrs.item);
+  },
+
+  template: hbs`
+    {{#if attrs.item.icon}}
+      {{d-icon attrs.item.icon}}
+    {{/if}}
+    {{{transformed.content}}}
+  `
+};
+
+createWidget("widget-dropdown-item", WidgetDropdownItemClass);
+
+export const WidgetDropdownClass = {
+  tagName: "div",
+
+  init(attrs) {
+    if (!attrs) {
+      throw "A widget-dropdown expects attributes.";
+    }
+
+    if (!attrs.id) {
+      throw "A widget-dropdown expects a unique `id` attribute.";
+    }
+
+    if (!attrs.label && !attrs.translatedLabel) {
+      throw "A widget-dropdown expects at least a `label` or `translatedLabel`";
+    }
+  },
+
+  buildKey: attrs => {
+    return attrs.id;
+  },
+
+  buildAttributes(attrs) {
+    return { id: attrs.id };
+  },
+
+  defaultState() {
+    return {
+      opened: false
+    };
+  },
+
+  buildClasses(attrs) {
+    const classes = ["widget-dropdown"];
+    classes.push(this.state.opened ? "opened" : "closed");
+    return classes.join(" ") + " " + (attrs.class || "");
+  },
+
+  transform(attrs) {
+    const options = attrs.options || {};
+
+    return {
+      options,
+      bodyClass: `widget-dropdown-body ${options.bodyClass || ""}`
+    };
+  },
+
+  clickOutside() {
+    this.state.opened = false;
+    this.scheduleRerender();
+  },
+
+  _onChange(params) {
+    this.state.opened = false;
+    if (this.attrs.onChange) {
+      if (typeof this.attrs.onChange === "string") {
+        this.sendWidgetAction(this.attrs.onChange, params);
+      } else {
+        this.attrs.onChange(params);
+      }
+    }
+  },
+
+  _onTrigger() {
+    if (this.state.opened) {
+      this.state.opened = false;
+      this._closeDropdown(this.attrs.id);
+    } else {
+      this.state.opened = true;
+      this._openDropdown(this.attrs.id);
+    }
+
+    this._popper && this._popper.update();
+  },
+
+  destroy() {
+    if (this._popper) {
+      this._popper.destroy();
+      this._popper = null;
+    }
+  },
+
+  template: hbs`
+    {{#if attrs.content}}
+      {{attach
+        widget="widget-dropdown-header"
+        attrs=(hash
+          icon=attrs.icon
+          label=attrs.label
+          translatedLabel=attrs.translatedLabel
+          class=this.transformed.options.headerClass
+        )
+      }}
+
+      <div class={{transformed.bodyClass}}>
+        {{#each attrs.content as |item|}}
+          {{attach
+            widget="widget-dropdown-item"
+            attrs=(hash item=item)
+          }}
+        {{/each}}
+      </div>
+    {{/if}}
+  `,
+
+  _closeDropdown() {
+    this._popper && this._popper.destroy();
+  },
+
+  _openDropdown(id) {
+    const dropdownHeader = document.querySelector(
+      `#${id} .widget-dropdown-header`
+    );
+    const dropdownBody = document.querySelector(`#${id} .widget-dropdown-body`);
+
+    if (dropdownHeader && dropdownBody) {
+      /* global Popper:true */
+      this._popper = Popper.createPopper(dropdownHeader, dropdownBody, {
+        strategy: "fixed",
+        placement: "bottom-start",
+        modifiers: [
+          {
+            name: "offset",
+            options: {
+              offset: [0, 5]
+            }
+          }
+        ]
+      });
+    }
+  }
+};
+
+export default createWidget("widget-dropdown", WidgetDropdownClass);
diff --git a/app/assets/stylesheets/common/components/widget-dropdown.scss b/app/assets/stylesheets/common/components/widget-dropdown.scss
new file mode 100644
index 0000000000..b84b389bf9
--- /dev/null
+++ b/app/assets/stylesheets/common/components/widget-dropdown.scss
@@ -0,0 +1,51 @@
+.widget-dropdown {
+  margin: 1em;
+  display: inline-flex;
+  box-sizing: border-box;
+
+  &.closed {
+    .widget-dropdown-body {
+      display: none;
+    }
+  }
+
+  .widget-dropdown-body {
+    display: flex;
+    flex-direction: column;
+    padding: 0.25em;
+    background: $secondary;
+    margin-top: 5px;
+    z-index: z("dropdown");
+    border: 1px solid $primary-low;
+    max-height: 250px;
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+
+  .widget-dropdown-item {
+    cursor: pointer;
+    padding: 0.25em;
+    display: flex;
+    flex: 1;
+    align-items: center;
+
+    .d-icon {
+      color: $primary-medium;
+      margin-right: 0.25em;
+    }
+
+    &.separator {
+      padding: 0;
+      background: $primary-low;
+      margin: 0.25em 0;
+    }
+
+    &:hover {
+      background: $tertiary-low;
+    }
+  }
+
+  .widget-dropdown-header {
+    cursor: pointer;
+  }
+}
diff --git a/test/javascripts/widgets/widget-dropdown-test.js b/test/javascripts/widgets/widget-dropdown-test.js
new file mode 100644
index 0000000000..511af7964f
--- /dev/null
+++ b/test/javascripts/widgets/widget-dropdown-test.js
@@ -0,0 +1,298 @@
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
+
+moduleForWidget("widget-dropdown");
+
+const DEFAULT_CONTENT = {
+  content: [
+    { id: 1, label: "foo" },
+    { id: 2, translatedLabel: "FooBar" },
+    "separator",
+    { id: 3, translatedLabel: "With icon", icon: "times" },
+    { id: 4, html: "<b>baz</b>" }
+  ],
+  label: "foo"
+};
+
+async function clickRowById(id) {
+  await click(`#my-dropdown .widget-dropdown-item.item-${id}`);
+}
+
+function rowById(id) {
+  return find(`#my-dropdown .widget-dropdown-item.item-${id}`)[0];
+}
+
+async function toggle() {
+  await click("#my-dropdown .widget-dropdown-header");
+}
+
+function headerLabel() {
+  return find(
+    "#my-dropdown .widget-dropdown-header .label"
+  )[0].innerText.trim();
+}
+
+function header() {
+  return find("#my-dropdown .widget-dropdown-header")[0];
+}
+
+function body() {
+  return find("#my-dropdown .widget-dropdown-body")[0];
+}
+
+const TEMPLATE = `
+  {{mount-widget
+    widget="widget-dropdown"
+    args=(hash
+      id="my-dropdown"
+      icon=icon
+      label=label
+      class=class
+      translatedLabel=translatedLabel
+      content=content
+      options=options
+    )
+}}`;
+
+widgetTest("dropdown id", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  test(assert) {
+    assert.ok(exists("#my-dropdown"));
+  }
+});
+
+widgetTest("label", {
+  template: TEMPLATE,
+
+  _translations: I18n.translations,
+
+  beforeEach() {
+    I18n.translations = { en: { js: { foo: "FooBaz" } } };
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  afterEach() {
+    I18n.translations = this._translations;
+  },
+
+  test(assert) {
+    assert.equal(headerLabel(), "FooBaz");
+  }
+});
+
+widgetTest("translatedLabel", {
+  template: TEMPLATE,
+
+  _translations: I18n.translations,
+
+  beforeEach() {
+    I18n.translations = { en: { js: { foo: "FooBaz" } } };
+    this.setProperties(DEFAULT_CONTENT);
+    this.set("translatedLabel", "BazFoo");
+  },
+
+  afterEach() {
+    I18n.translations = this._translations;
+  },
+
+  test(assert) {
+    assert.equal(headerLabel(), this.translatedLabel);
+  }
+});
+
+widgetTest("content", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  test(assert) {
+    assert.equal(rowById(1).dataset.id, 1, "it creates rows");
+    assert.equal(rowById(2).dataset.id, 2, "it creates rows");
+    assert.equal(rowById(3).dataset.id, 3, "it creates rows");
+  }
+});
+
+widgetTest("onChange action", {
+  template: `
+    <div id="test"></div>
+    {{mount-widget
+      widget="widget-dropdown"
+      args=(hash
+        id="my-dropdown"
+        label=label
+        content=content
+        onChange=(action "onChange")
+      )
+    }}
+  `,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+
+    this.on(
+      "onChange",
+      item => (this._element.querySelector("#test").innerText = item.id)
+    );
+  },
+
+  async test(assert) {
+    await clickRowById(2);
+    assert.equal(find("#test").text(), 2, "it calls the onChange actions");
+  }
+});
+
+widgetTest("can be opened and closed", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  async test(assert) {
+    assert.ok(exists("#my-dropdown.closed"));
+    await toggle();
+    assert.ok(exists("#my-dropdown.opened"));
+    await toggle();
+    assert.ok(exists("#my-dropdown.closed"));
+  }
+});
+
+widgetTest("icon", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+    this.set("icon", "times");
+  },
+
+  test(assert) {
+    assert.ok(exists(header().querySelector(".d-icon-times")));
+  }
+});
+
+widgetTest("class", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+    this.set("class", "activated");
+  },
+
+  test(assert) {
+    assert.ok(exists("#my-dropdown.activated"));
+  }
+});
+
+widgetTest("content with translatedLabel", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  test(assert) {
+    assert.equal(rowById(2).innerText.trim(), "FooBar");
+  }
+});
+
+widgetTest("content with label", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    I18n.translations = { en: { js: { foo: "FooBaz" } } };
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  test(assert) {
+    assert.equal(rowById(1).innerText.trim(), "FooBaz");
+  }
+});
+
+widgetTest("content with icon", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  test(assert) {
+    assert.ok(exists(rowById(3).querySelector(".d-icon-times")));
+  }
+});
+
+widgetTest("content with html", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  test(assert) {
+    assert.equal(rowById(4).innerHTML.trim(), "<span><b>baz</b></span>");
+  }
+});
+
+widgetTest("separator", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+  },
+
+  test(assert) {
+    assert.ok(
+      find(
+        "#my-dropdown .widget-dropdown-item:nth-child(3)"
+      )[0].classList.contains("separator")
+    );
+  }
+});
+
+widgetTest("hides widget if no content", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties({ content: null, label: "foo" });
+  },
+
+  test(assert) {
+    assert.notOk(exists("#my-dropdown .widget-dropdown-header"));
+    assert.notOk(exists("#my-dropdown .widget-dropdown-body"));
+  }
+});
+
+widgetTest("headerClass option", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+    this.set("options", { headerClass: "btn-small and-text" });
+  },
+
+  test(assert) {
+    assert.ok(header().classList.contains("widget-dropdown-header"));
+    assert.ok(header().classList.contains("btn-small"));
+    assert.ok(header().classList.contains("and-text"));
+  }
+});
+
+widgetTest("bodyClass option", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+    this.set("options", { bodyClass: "gigantic and-yet-small" });
+  },
+
+  test(assert) {
+    assert.ok(body().classList.contains("widget-dropdown-body"));
+    assert.ok(body().classList.contains("gigantic"));
+    assert.ok(body().classList.contains("and-yet-small"));
+  }
+});

From acc0a9673e929ad3823dc44180b37cb566418af1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 31 Mar 2020 09:21:59 +0200
Subject: [PATCH 0454/1830] FIX: the correct action for group-member-dropdown
 is now actOnGroup (#9320)

---
 app/assets/javascripts/discourse/templates/group-index.hbs | 4 ----
 .../javascripts/discourse/templates/mobile/group-index.hbs | 7 +++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs
index 01393c0dfa..36d9acfe88 100644
--- a/app/assets/javascripts/discourse/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/group-index.hbs
@@ -63,11 +63,7 @@
             <td>
               {{#if canManageGroup}}
                 {{group-member-dropdown
-                  removeMember=(action "removeMember")
-                  makeOwner=(action "makeOwner")
-                  removeOwner=(action "removeOwner")
                   member=m
-                  group=model
                   onChange=(action "actOnGroup" m)
                 }}
               {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
index 84a906d4c4..e95a8cb20f 100644
--- a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
@@ -41,10 +41,9 @@
 
             {{#if canManageGroup}}
               {{group-member-dropdown
-                  removeMember=(action "removeMember")
-                  makeOwner=(action "makeOwner")
-                  removeOwner=(action "removeOwner")
-                  member=user}}
+                member=user
+                onChange=(action "actOnGroup" user)
+              }}
             {{/if}}
           {{/user-info}}
         </div>

From cbd72d51b441277d1a5249aa20c62d61a57b4543 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 31 Mar 2020 09:26:35 +0200
Subject: [PATCH 0455/1830] fix translations impacting other tests (#9321)

---
 test/javascripts/widgets/widget-dropdown-test.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/javascripts/widgets/widget-dropdown-test.js b/test/javascripts/widgets/widget-dropdown-test.js
index 511af7964f..46625d7d7b 100644
--- a/test/javascripts/widgets/widget-dropdown-test.js
+++ b/test/javascripts/widgets/widget-dropdown-test.js
@@ -204,11 +204,17 @@ widgetTest("content with translatedLabel", {
 widgetTest("content with label", {
   template: TEMPLATE,
 
+  _translations: I18n.translations,
+
   beforeEach() {
     I18n.translations = { en: { js: { foo: "FooBaz" } } };
     this.setProperties(DEFAULT_CONTENT);
   },
 
+  afterEach() {
+    I18n.translations = this._translations;
+  },
+
   test(assert) {
     assert.equal(rowById(1).innerText.trim(), "FooBaz");
   }

From f724cf1cfeab9beb8754d611ab3591b7679ca214 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 31 Mar 2020 10:12:52 +0200
Subject: [PATCH 0456/1830] UX: minor tweaks to users directory last updated at
 styling (#9322)

---
 .../discourse/templates/mobile/users.hbs         |  2 +-
 .../javascripts/discourse/templates/users.hbs    |  2 +-
 .../stylesheets/common/base/directory.scss       | 13 +++++++++++++
 app/assets/stylesheets/mobile/directory.scss     | 16 ++++++++++++----
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/mobile/users.hbs b/app/assets/javascripts/discourse/templates/mobile/users.hbs
index 7f208e2abb..808458bbcb 100644
--- a/app/assets/javascripts/discourse/templates/mobile/users.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/users.hbs
@@ -1,6 +1,6 @@
 {{#load-more selector=".directory .user" action=(action "loadMore")}}
   <div class="container">
-    <div class='directory'>
+    <div class='users-directory directory'>
       {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
 
       <div class='directory-controls'>
diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs
index 09f4ba4f0c..af5d17f15b 100644
--- a/app/assets/javascripts/discourse/templates/users.hbs
+++ b/app/assets/javascripts/discourse/templates/users.hbs
@@ -1,7 +1,7 @@
 {{#d-section pageClass="users"}}
   {{#load-more selector=".directory tbody tr" action=(action "loadMore")}}
     <div class="container">
-      <div class='directory'>
+      <div class='users-directory directory'>
         {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
         <div class='directory-controls'>
           <div class='period-controls'>
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index 81045260a5..b01248d144 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -1,6 +1,17 @@
 .directory {
   margin-bottom: 100px;
 
+  &.users-directory {
+    .period-chooser {
+      .selected-name {
+        margin: 0;
+      }
+      .period-chooser-header .caret-icon {
+        margin: 0;
+      }
+    }
+  }
+
   .user-info {
     margin-bottom: 0;
   }
@@ -16,9 +27,11 @@
       height: 1em;
     }
   }
+
   .directory-last-updated {
     margin-bottom: 0.5em;
     color: $primary-medium;
+    font-size: $font-down-1;
   }
 
   table {
diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss
index c1057bd636..f963433e29 100644
--- a/app/assets/stylesheets/mobile/directory.scss
+++ b/app/assets/stylesheets/mobile/directory.scss
@@ -1,9 +1,17 @@
 .directory {
-  .select-kit.dropdown-select-box.period-chooser
-    .period-chooser-header
-    h2.selected-name {
+  .period-chooser .period-chooser-header h2.selected-name {
     font-size: $font-up-1;
-    margin-bottom: 0.25em;
+  }
+
+  &.users-directory {
+    .filter-name {
+      width: 100%;
+      margin-bottom: 1em;
+    }
+
+    .directory-last-updated {
+      margin-bottom: 1em;
+    }
   }
 
   .directory-controls {

From 511264879616cd5bae10aa7a07dc17aa99f8b34c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 31 Mar 2020 17:19:47 +0200
Subject: [PATCH 0457/1830] fix documentation (#9327)

---
 app/assets/javascripts/discourse/lib/plugin-api.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js b/app/assets/javascripts/discourse/lib/plugin-api.js
index aaafba5b4c..b0594f7b8d 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js
@@ -1027,11 +1027,9 @@ class PluginApi {
    * For example, to replace the topic title:
    *
    * ```
-   * api.decorateTopicTitle(
-   *   (topicModel, node, topicTitleType) => {
-   *     node.innerText("my new topic title");
-   *   }
-   * );
+   * api.decorateTopicTitle((topicModel, node, topicTitleType) => {
+   *   node.innerText = "my new topic title";
+   * });
    * ```
    *
    **/

From 0e3fa4072fb83994e52df58909d46c5744e03009 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 31 Mar 2020 15:47:13 +0100
Subject: [PATCH 0458/1830] FIX: Bypass serviceworker cache for auth routes

This avoids samesite cookie-related issues in iOS PWAs during the authentication flow
---
 app/assets/javascripts/service-worker.js.erb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/service-worker.js.erb b/app/assets/javascripts/service-worker.js.erb
index 1d88932289..f264094817 100644
--- a/app/assets/javascripts/service-worker.js.erb
+++ b/app/assets/javascripts/service-worker.js.erb
@@ -7,11 +7,15 @@ workbox.setConfig({
   debug: false
 });
 
+var authUrl = "<%= Discourse.base_path %>/auth/";
+
 var cacheVersion = "1";
 
 // Cache all GET requests, so Discourse can be used while offline
 workbox.routing.registerRoute(
-  new RegExp('.*?'), // Matches all, GET is implicit
+  function(args) {
+    return !(args.url.origin === location.origin && args.url.pathname.startsWith(authUrl));
+  }, // Match all except auth routes
   new workbox.strategies.NetworkFirst({ // This will only use the cache when a network request fails
     cacheName: "discourse-" + cacheVersion,
     plugins: [

From b2a0d34bb783d251ae61881e5d4b9b9aafdf9c09 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Tue, 31 Mar 2020 23:59:15 +0530
Subject: [PATCH 0459/1830] FEATURE: add setting `auto_approve_email_domains`
 to auto approve users (#9323)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* FEATURE: add setting `auto_approve_email_domains` to auto approve users

This commit adds a new site setting `auto_approve_email_domains` to
auto approve users based on their email address domain.

Note that if a domain already exists in `email_domains_whitelist` then
`auto_approve_email_domains` needs to be duplicated there as well,
since users won’t be able to register with email address that is
not allowed in `email_domains_whitelist`.

* Update config/locales/server.en.yml

Co-Authored-By: Robin Ward <robin.ward@gmail.com>
---
 app/controllers/users_controller.rb            |  7 +++++--
 app/models/invite_redeemer.rb                  |  4 +++-
 config/locales/server.en.yml                   |  1 +
 config/site_settings.yml                       |  3 +++
 lib/validators/email_validator.rb              |  8 ++++++++
 .../validators/email_validator_spec.rb         | 17 +++++++++++++++++
 spec/models/invite_redeemer_spec.rb            | 12 +++++++++++-
 spec/requests/users_controller_spec.rb         | 18 +++++++++++++++++-
 8 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 79bee4208d..15e36dd9d1 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -447,8 +447,11 @@ class UsersController < ApplicationController
     user ||= User.new
     user.attributes = new_user_params
 
-    # Handle API approval
-    ReviewableUser.set_approved_fields!(user, current_user) if user.approved?
+    # Handle API approval and
+    # auto approve users based on auto_approve_email_domains setting
+    if user.approved? || EmailValidator.can_auto_approve_user?(user.email)
+      ReviewableUser.set_approved_fields!(user, current_user)
+    end
 
     # Handle custom fields
     user_fields = UserField.all
diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index 68a415d274..172e06f3a7 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -36,7 +36,9 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
       registration_ip_address: ip_address
     }
 
-    if !SiteSetting.must_approve_users? || (SiteSetting.must_approve_users? && invite.invited_by.staff?)
+    if !SiteSetting.must_approve_users? ||
+        (SiteSetting.must_approve_users? && invite.invited_by.staff?) ||
+        EmailValidator.can_auto_approve_user?(user.email)
       ReviewableUser.set_approved_fields!(user, invite.invited_by)
     end
 
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index b1fd87890d..8fa0a36087 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1582,6 +1582,7 @@ en:
     allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines. In exceptional cases you can permanently <a href='%{base_path}/admin/customize/robots'>override robots.txt</a>."
     email_domains_blacklist: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net"
     email_domains_whitelist: "A pipe-delimited list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!"
+    auto_approve_email_domains: "Users with email addresses from this list of domains will be automatically approved."
     hide_email_address_taken: "Don't inform users that an account exists with a given email address during signup and from the forgot password form."
     log_out_strict: "When logging out, log out ALL sessions for the user on all devices"
     version_checks: "Ping the Discourse Hub for version updates and show new version messages on the <a href='%{base_path}/admin' target='_blank'>/admin</a> dashboard"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 52b7c6002d..33501a4df4 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -459,6 +459,9 @@ login:
   email_domains_whitelist:
     default: ""
     type: list
+  auto_approve_email_domains:
+    default: ""
+    type: list
   hide_email_address_taken: false
   log_out_strict: true
   pending_users_reminder_delay:
diff --git a/lib/validators/email_validator.rb b/lib/validators/email_validator.rb
index 46d47f8f0d..6436161b82 100644
--- a/lib/validators/email_validator.rb
+++ b/lib/validators/email_validator.rb
@@ -22,6 +22,14 @@ class EmailValidator < ActiveModel::EachValidator
     true
   end
 
+  def self.can_auto_approve_user?(email)
+    if (setting = SiteSetting.auto_approve_email_domains).present?
+      return !!(EmailValidator.allowed?(email) && email_in_restriction_setting?(setting, email))
+    end
+
+    false
+  end
+
   def self.email_in_restriction_setting?(setting, value)
     domains = setting.gsub('.', '\.')
     regexp = Regexp.new("@(.+\\.)?(#{domains})$", true)
diff --git a/spec/components/validators/email_validator_spec.rb b/spec/components/validators/email_validator_spec.rb
index 0c4616817a..41c29e1b51 100644
--- a/spec/components/validators/email_validator_spec.rb
+++ b/spec/components/validators/email_validator_spec.rb
@@ -41,6 +41,23 @@ describe EmailValidator do
     end
   end
 
+  context "auto approve email domains" do
+    it "works as expected" do
+      SiteSetting.auto_approve_email_domains = "example.com"
+
+      expect(EmailValidator.can_auto_approve_user?("foobar@example.com.fr")).to eq(false)
+      expect(EmailValidator.can_auto_approve_user?("foobar@example.com")).to eq(true)
+    end
+
+    it "returns false if domain not present in email_domains_whitelist" do
+      SiteSetting.email_domains_whitelist = "googlemail.com"
+      SiteSetting.auto_approve_email_domains = "example.com|googlemail.com"
+
+      expect(EmailValidator.can_auto_approve_user?("foobar@example.com")).to eq(false)
+      expect(EmailValidator.can_auto_approve_user?("foobar@googlemail.com")).to eq(true)
+    end
+  end
+
   context '.email_regex' do
     it 'should match valid emails' do
       expect(!!('test@discourse.org' =~ EmailValidator.email_regex)).to eq(true)
diff --git a/spec/models/invite_redeemer_spec.rb b/spec/models/invite_redeemer_spec.rb
index 6098adddcd..814fe42124 100644
--- a/spec/models/invite_redeemer_spec.rb
+++ b/spec/models/invite_redeemer_spec.rb
@@ -59,7 +59,7 @@ describe InviteRedeemer do
   end
 
   describe "#redeem" do
-    fab!(:invite) { Fabricate(:invite) }
+    fab!(:invite) { Fabricate(:invite, email: "foobar@example.com") }
     let(:name) { 'john snow' }
     let(:username) { 'kingofthenorth' }
     let(:password) { 'know5nOthiNG' }
@@ -102,6 +102,16 @@ describe InviteRedeemer do
       expect(user.approved).to eq(true)
     end
 
+    it "should redeem the invite if invited by non staff and approve if email in auto_approve_email_domains setting" do
+      SiteSetting.must_approve_users = true
+      SiteSetting.auto_approve_email_domains = "example.com"
+      user = invite_redeemer.redeem
+
+      expect(user.name).to eq(name)
+      expect(user.username).to eq(username)
+      expect(user.approved).to eq(true)
+    end
+
     it "should not blow up if invited_by user has been removed" do
       invite.invited_by.destroy!
       invite.reload
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 95d675f372..561eaeb12d 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -583,7 +583,7 @@ describe UsersController do
       UsersController.any_instance.stubs(:honeypot_value).returns(nil)
       UsersController.any_instance.stubs(:challenge_value).returns(nil)
       SiteSetting.allow_new_registrations = true
-      @user = Fabricate.build(:user, password: "strongpassword")
+      @user = Fabricate.build(:user, email: "foobar@example.com", password: "strongpassword")
     end
 
     let(:post_user_params) do
@@ -826,6 +826,22 @@ describe UsersController do
           new_user = User.find(json["user_id"])
           expect(new_user.locale).not_to eq("fr")
         end
+
+        it "will auto approve user if the user email domain matches auto_approve_email_domains setting" do
+          Jobs.run_immediately!
+          SiteSetting.must_approve_users = true
+          SiteSetting.auto_approve_email_domains = "example.com"
+
+          post "/u.json", params: post_user_params.merge(active: true, api_key: api_key.key)
+
+          expect(response.status).to eq(200)
+          json = JSON.parse(response.body)
+
+          new_user = User.find(json["user_id"])
+          expect(json['active']).to be_truthy
+          expect(new_user.approved).to be_truthy
+          expect(ReviewableUser.pending.find_by(target: new_user)).to be_blank
+        end
       end
     end
 

From b79ea986ac44c1ced0b332722c1bb16b4239b565 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 1 Apr 2020 09:09:20 +1000
Subject: [PATCH 0460/1830] FEATURE: High priority bookmark reminder
 notifications (#9290)

Introduce the concept of "high priority notifications" which include PM and bookmark reminder notifications. Now bookmark reminder notifications act in the same way as PM notifications (float to top of recent list, show in the green bubble) and most instances of unread_private_messages in the UI have been replaced with unread_high_priority_notifications.

The user email digest is changed to just have a section about unread high priority notifications, the unread PM section has been removed.

A high_priority boolean column has been added to the Notification table and relevant indices added to account for it.

unread_private_messages has been kept on the User model purely for backwards compat, but now just returns unread_high_priority_notifications count so this may cause some inconsistencies in the UI.
---
 .../discourse/components/site-header.js       |  2 +-
 .../discourse/initializers/badging.js         |  2 +-
 .../subscribe-user-notifications.js           | 11 ++--
 .../initializers/title-notifications.js       |  2 +-
 .../javascripts/discourse/widgets/header.js   | 14 +++--
 .../stylesheets/common/base/discourse.scss    |  2 +-
 .../stylesheets/common/base/header.scss       |  2 +-
 app/mailers/user_notifications.rb             |  4 +-
 app/models/notification.rb                    | 38 ++++++++----
 app/models/user.rb                            | 45 ++++++++++----
 app/serializers/current_user_serializer.rb    |  1 +
 config/locales/client.en.yml                  |  3 +
 config/locales/server.en.yml                  |  2 +-
 ...d_high_priority_column_to_notifications.rb | 42 +++++++++++++
 ...drop_old_unread_pm_notification_indices.rb | 12 ++++
 spec/fabricators/notification_fabricator.rb   | 19 ++++++
 spec/models/notification_spec.rb              | 53 +++++++++++++---
 spec/models/user_spec.rb                      | 62 +++++++++++++++++--
 test/javascripts/fixtures/session-fixtures.js |  1 +
 19 files changed, 263 insertions(+), 54 deletions(-)
 create mode 100644 db/migrate/20200329222246_add_high_priority_column_to_notifications.rb
 create mode 100644 db/post_migrate/20200330233427_drop_old_unread_pm_notification_indices.rb

diff --git a/app/assets/javascripts/discourse/components/site-header.js b/app/assets/javascripts/discourse/components/site-header.js
index b8b6ed90e3..03bc7b3608 100644
--- a/app/assets/javascripts/discourse/components/site-header.js
+++ b/app/assets/javascripts/discourse/components/site-header.js
@@ -24,7 +24,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
 
   @observes(
     "currentUser.unread_notifications",
-    "currentUser.unread_private_messages",
+    "currentUser.unread_high_priority_notifications",
     "currentUser.reviewable_count"
   )
   notificationsChanged() {
diff --git a/app/assets/javascripts/discourse/initializers/badging.js b/app/assets/javascripts/discourse/initializers/badging.js
index f406604dfa..8bcefa7915 100644
--- a/app/assets/javascripts/discourse/initializers/badging.js
+++ b/app/assets/javascripts/discourse/initializers/badging.js
@@ -10,7 +10,7 @@ export default {
     if (!user) return; // must be logged in
 
     this.notifications =
-      user.unread_notifications + user.unread_private_messages;
+      user.unread_notifications + user.unread_high_priority_notifications;
 
     container
       .lookup("service:app-events")
diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js
index 14c2bc5f95..1482cf9d18 100644
--- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js
+++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js
@@ -32,24 +32,27 @@ export default {
         data => {
           const store = container.lookup("service:store");
           const oldUnread = user.get("unread_notifications");
-          const oldPM = user.get("unread_private_messages");
+          const oldHighPriority = user.get(
+            "unread_high_priority_notifications"
+          );
 
           user.setProperties({
             unread_notifications: data.unread_notifications,
-            unread_private_messages: data.unread_private_messages,
+            unread_high_priority_notifications:
+              data.unread_high_priority_notifications,
             read_first_notification: data.read_first_notification
           });
 
           if (
             oldUnread !== data.unread_notifications ||
-            oldPM !== data.unread_private_messages
+            oldHighPriority !== data.unread_high_priority_notifications
           ) {
             appEvents.trigger("notifications:changed");
 
             if (
               site.mobileView &&
               (data.unread_notifications - oldUnread > 0 ||
-                data.unread_private_messages - oldPM > 0)
+                data.unread_high_priority_notifications - oldHighPriority > 0)
             ) {
               appEvents.trigger("header:update-topic", null, 5000);
             }
diff --git a/app/assets/javascripts/discourse/initializers/title-notifications.js b/app/assets/javascripts/discourse/initializers/title-notifications.js
index 9801e1f688..cfc0c3ed6d 100644
--- a/app/assets/javascripts/discourse/initializers/title-notifications.js
+++ b/app/assets/javascripts/discourse/initializers/title-notifications.js
@@ -18,7 +18,7 @@ export default {
     if (!user) return; // must be logged in
 
     const notifications =
-      user.unread_notifications + user.unread_private_messages;
+      user.unread_notifications + user.unread_high_priority_notifications;
 
     Discourse.updateNotificationCount(notifications);
   }
diff --git a/app/assets/javascripts/discourse/widgets/header.js b/app/assets/javascripts/discourse/widgets/header.js
index e08bab8741..4910913a4e 100644
--- a/app/assets/javascripts/discourse/widgets/header.js
+++ b/app/assets/javascripts/discourse/widgets/header.js
@@ -67,8 +67,9 @@ createWidget("header-notifications", {
       );
     }
 
-    const unreadPMs = user.get("unread_private_messages");
-    if (!!unreadPMs) {
+    const unreadHighPriority = user.get("unread_high_priority_notifications");
+    if (!!unreadHighPriority) {
+      // highlight the avatar if the first ever PM is not read
       if (
         !user.get("read_first_notification") &&
         !user.get("enforcedSecondFactor")
@@ -90,14 +91,15 @@ createWidget("header-notifications", {
         }
       }
 
+      // add the counter for the unread high priority
       contents.push(
         this.attach("link", {
           action: attrs.action,
-          className: "badge-notification unread-private-messages",
-          rawLabel: unreadPMs,
+          className: "badge-notification unread-high-priority-notifications",
+          rawLabel: unreadHighPriority,
           omitSpan: true,
-          title: "notifications.tooltip.message",
-          titleOptions: { count: unreadPMs }
+          title: "notifications.tooltip.high_priority",
+          titleOptions: { count: unreadHighPriority }
         })
       );
     }
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 023154c7da..831aba61b0 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -422,7 +422,7 @@ table {
   align-items: center;
 }
 
-.unread-private-messages {
+.unread-high-priority-notifications {
   color: $secondary;
   background: $success;
 
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index ba3ccb1d2f..42e57ae88f 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -202,7 +202,7 @@
     right: -3px;
     background-color: dark-light-choose($tertiary-medium, $tertiary);
   }
-  .unread-private-messages,
+  .unread-high-priority-notifications,
   .ring {
     left: auto;
     right: 25px;
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index d91ee570ec..7b35e9b3e8 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -216,8 +216,8 @@ class UserNotifications < ActionMailer::Base
       value = user.unread_notifications
       @counts << { label_key: 'user_notifications.digest.unread_notifications', value: value, href: "#{Discourse.base_url}/my/notifications" } if value > 0
 
-      value = user.unread_private_messages
-      @counts << { label_key: 'user_notifications.digest.unread_messages', value: value, href: "#{Discourse.base_url}/my/messages" } if value > 0
+      value = user.unread_high_priority_notifications
+      @counts << { label_key: 'user_notifications.digest.unread_high_priority', value: value, href: "#{Discourse.base_url}/my/notifications" } if value > 0
 
       if @counts.size < 3
         value = user.unread_notifications_of_type(Notification.types[:liked])
diff --git a/app/models/notification.rb b/app/models/notification.rb
index a44086f652..0407f17c96 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -44,6 +44,10 @@ class Notification < ActiveRecord::Base
     send_email unless NotificationConsolidator.new(self).consolidate!
   end
 
+  before_create do
+    self.high_priority = Notification.high_priority_types.include?(self.notification_type)
+  end
+
   def self.purge_old!
     return if SiteSetting.max_notifications_per_user == 0
 
@@ -64,10 +68,10 @@ class Notification < ActiveRecord::Base
   end
 
   def self.ensure_consistency!
-    DB.exec(<<~SQL, Notification.types[:private_message])
+    DB.exec(<<~SQL)
       DELETE
         FROM notifications n
-       WHERE notification_type = ?
+       WHERE high_priority
          AND NOT EXISTS (
             SELECT 1
               FROM posts p
@@ -108,6 +112,17 @@ class Notification < ActiveRecord::Base
                        )
   end
 
+  def self.high_priority_types
+    @high_priority_types ||= [
+      types[:private_message],
+      types[:bookmark_reminder]
+    ]
+  end
+
+  def self.normal_priority_types
+    @normal_priority_types ||= types.reject { |_k, v| high_priority_types.include?(v) }.values
+  end
+
   def self.mark_posts_read(user, topic_id, post_numbers)
     Notification
       .where(
@@ -210,14 +225,14 @@ class Notification < ActiveRecord::Base
 
     if notifications.present?
 
-      ids = DB.query_single(<<~SQL, count.to_i)
+      ids = DB.query_single(<<~SQL, limit: count.to_i)
          SELECT n.id FROM notifications n
          WHERE
-           n.notification_type = 6 AND
+           n.high_priority = TRUE AND
            n.user_id = #{user.id.to_i} AND
            NOT read
         ORDER BY n.id ASC
-        LIMIT ?
+        LIMIT :limit
       SQL
 
       if ids.length > 0
@@ -230,9 +245,9 @@ class Notification < ActiveRecord::Base
       end
 
       notifications.uniq(&:id).sort do |x, y|
-        if x.unread_pm? && !y.unread_pm?
+        if x.unread_high_priority? && !y.unread_high_priority?
           -1
-        elsif y.unread_pm? && !x.unread_pm?
+        elsif y.unread_high_priority? && !x.unread_high_priority?
           1
         else
           y.created_at <=> x.created_at
@@ -244,8 +259,8 @@ class Notification < ActiveRecord::Base
 
   end
 
-  def unread_pm?
-    Notification.types[:private_message] == self.notification_type && !read
+  def unread_high_priority?
+    self.high_priority? && !read
   end
 
   def post_id
@@ -280,14 +295,15 @@ end
 #  topic_id          :integer
 #  post_number       :integer
 #  post_action_id    :integer
+#  high_priority     :boolean          default(FALSE), not null
 #
 # Indexes
 #
 #  idx_notifications_speedup_unread_count                       (user_id,notification_type) WHERE (NOT read)
 #  index_notifications_on_post_action_id                        (post_action_id)
-#  index_notifications_on_read_or_n_type                        (user_id,id DESC,read,topic_id) UNIQUE WHERE (read OR (notification_type <> 6))
 #  index_notifications_on_topic_id_and_post_number              (topic_id,post_number)
 #  index_notifications_on_user_id_and_created_at                (user_id,created_at)
-#  index_notifications_on_user_id_and_id                        (user_id,id) UNIQUE WHERE ((notification_type = 6) AND (NOT read))
 #  index_notifications_on_user_id_and_topic_id_and_post_number  (user_id,topic_id,post_number)
+#  index_notifications_read_or_not_high_priority                (user_id,id DESC,read,topic_id) WHERE (read OR (high_priority = false))
+#  index_notifications_unique_unread_high_priority              (user_id,id) UNIQUE WHERE ((NOT read) AND (high_priority = true))
 #
diff --git a/app/models/user.rb b/app/models/user.rb
index 3993d4ea79..284f15c788 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -470,6 +470,8 @@ class User < ActiveRecord::Base
     @unread_notifications = nil
     @unread_total_notifications = nil
     @unread_pms = nil
+    @unread_bookmarks = nil
+    @unread_high_prios = nil
     @user_fields_cache = nil
     @ignored_user_ids = nil
     @muted_user_ids = nil
@@ -491,17 +493,41 @@ class User < ActiveRecord::Base
           FROM notifications n
      LEFT JOIN topics t ON t.id = n.topic_id
          WHERE t.deleted_at IS NULL
-           AND n.notification_type = :type
+           AND n.notification_type = :notification_type
            AND n.user_id = :user_id
            AND NOT read
     SQL
 
     # to avoid coalesce we do to_i
-    DB.query_single(sql, user_id: id, type: notification_type)[0].to_i
+    DB.query_single(sql, user_id: id, notification_type: notification_type)[0].to_i
   end
 
+  def unread_notifications_of_priority(high_priority:)
+    # perf critical, much more efficient than AR
+    sql = <<~SQL
+        SELECT COUNT(*)
+          FROM notifications n
+     LEFT JOIN topics t ON t.id = n.topic_id
+         WHERE t.deleted_at IS NULL
+           AND n.high_priority = :high_priority
+           AND n.user_id = :user_id
+           AND NOT read
+    SQL
+
+    # to avoid coalesce we do to_i
+    DB.query_single(sql, user_id: id, high_priority: high_priority)[0].to_i
+  end
+
+  ###
+  # DEPRECATED: This is only maintained for backwards compat until v2.5. There
+  # may be inconsistencies with counts in the UI because of this, because unread
+  # high priority includes PMs AND bookmark reminders.
   def unread_private_messages
-    @unread_pms ||= unread_notifications_of_type(Notification.types[:private_message])
+    @unread_pms ||= unread_high_priority_notifications
+  end
+
+  def unread_high_priority_notifications
+    @unread_high_prios ||= unread_notifications_of_priority(high_priority: true)
   end
 
   # PERF: This safeguard is in place to avoid situations where
@@ -526,7 +552,7 @@ class User < ActiveRecord::Base
           notifications n
           LEFT JOIN topics t ON t.id = n.topic_id
            WHERE t.deleted_at IS NULL AND
-            n.notification_type <> :pm AND
+            n.high_priority = FALSE AND
             n.user_id = :user_id AND
             n.id > :seen_notification_id AND
             NOT read
@@ -537,7 +563,6 @@ class User < ActiveRecord::Base
       DB.query_single(sql,
         user_id: id,
         seen_notification_id: seen_notification_id,
-        pm: Notification.types[:private_message],
         limit: User.max_unread_notifications
     )[0].to_i
     end
@@ -579,7 +604,7 @@ class User < ActiveRecord::Base
          LEFT JOIN topics t ON n.topic_id = t.id
          WHERE
           t.deleted_at IS NULL AND
-          n.notification_type = :type AND
+          n.high_priority AND
           n.user_id = :user_id AND
           NOT read
         ORDER BY n.id DESC
@@ -591,23 +616,21 @@ class User < ActiveRecord::Base
        LEFT JOIN topics t ON n.topic_id = t.id
        WHERE
         t.deleted_at IS NULL AND
-        (n.notification_type <> :type OR read) AND
+        (n.high_priority = FALSE OR read) AND
         n.user_id = :user_id
        ORDER BY n.id DESC
        LIMIT 20
       ) AS y
     SQL
 
-    recent = DB.query(sql,
-      user_id: id,
-      type: Notification.types[:private_message]
-    ).map! do |r|
+    recent = DB.query(sql, user_id: id).map! do |r|
       [r.id, r.read]
     end
 
     payload = {
       unread_notifications: unread_notifications,
       unread_private_messages: unread_private_messages,
+      unread_high_priority_notifications: unread_high_priority_notifications,
       read_first_notification: read_first_notification?,
       last_notification: json,
       recent: recent,
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index 9851baab7d..5fa2db54e8 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -5,6 +5,7 @@ class CurrentUserSerializer < BasicUserSerializer
   attributes :name,
              :unread_notifications,
              :unread_private_messages,
+             :unread_high_priority_notifications,
              :read_first_notification?,
              :admin?,
              :notification_channel_position,
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 98d4a5bf1b..e9bbb29609 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1812,6 +1812,9 @@ en:
         message:
           one: "%{count} unread message"
           other: "{{count}} unread messages"
+        high_priority:
+          one: "%{count} unread high priority notification"
+          other: "%{count} unread high priority notificationis"
       title: "notifications of @name mentions, replies to your posts and topics, messages, etc"
       none: "Unable to load notifications at this time."
       empty: "No notifications found."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 8fa0a36087..e3b8271e5d 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3521,8 +3521,8 @@ en:
       why: "A brief summary of %{site_link} since your last visit on %{last_seen_at}"
       since_last_visit: "Since your last visit"
       new_topics: "New Topics"
-      unread_messages: "Unread Messages"
       unread_notifications: "Unread Notifications"
+      unread_high_priority: "Unread High Priority Notifications"
       liked_received: "Likes Received"
       new_users: "New Users"
       popular_topics: "Popular Topics"
diff --git a/db/migrate/20200329222246_add_high_priority_column_to_notifications.rb b/db/migrate/20200329222246_add_high_priority_column_to_notifications.rb
new file mode 100644
index 0000000000..4bb5f39d1e
--- /dev/null
+++ b/db/migrate/20200329222246_add_high_priority_column_to_notifications.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+class AddHighPriorityColumnToNotifications < ActiveRecord::Migration[6.0]
+  disable_ddl_transaction!
+  def up
+    if !column_exists?(:notifications, :high_priority)
+      add_column :notifications, :high_priority, :boolean, default: nil
+    end
+
+    # type 6 = private message, 24 = bookmark reminder
+    # priority 0 = low, 1 = normal, 2 = high
+    if column_exists?(:notifications, :high_priority)
+      execute <<~SQL
+        UPDATE notifications SET high_priority = TRUE WHERE notification_type IN (6, 24);
+      SQL
+
+      execute <<~SQL
+        UPDATE notifications SET high_priority = FALSE WHERE notification_type NOT IN (6, 24);
+      SQL
+
+      execute <<~SQL
+        ALTER TABLE notifications ALTER COLUMN high_priority SET DEFAULT FALSE;
+      SQL
+
+      execute <<~SQL
+        ALTER TABLE notifications ALTER COLUMN high_priority SET NOT NULL;
+      SQL
+    end
+
+    execute <<~SQL
+      CREATE INDEX CONCURRENTLY IF NOT EXISTS index_notifications_read_or_not_high_priority ON notifications(user_id, id DESC, read, topic_id) WHERE (read OR (high_priority = FALSE));
+    SQL
+
+    execute <<~SQL
+      CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS index_notifications_unique_unread_high_priority ON notifications(user_id, id) WHERE NOT read AND high_priority = TRUE;
+    SQL
+  end
+
+  def down
+    DB.exec("ALTER TABLE notifications DROP COLUMN IF EXISTS high_priority")
+  end
+end
diff --git a/db/post_migrate/20200330233427_drop_old_unread_pm_notification_indices.rb b/db/post_migrate/20200330233427_drop_old_unread_pm_notification_indices.rb
new file mode 100644
index 0000000000..33f27cffa2
--- /dev/null
+++ b/db/post_migrate/20200330233427_drop_old_unread_pm_notification_indices.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class DropOldUnreadPmNotificationIndices < ActiveRecord::Migration[6.0]
+  def up
+    DB.exec("DROP INDEX IF EXISTS index_notifications_on_user_id_and_id")
+    DB.exec("DROP INDEX IF EXISTS index_notifications_on_read_or_n_type")
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/spec/fabricators/notification_fabricator.rb b/spec/fabricators/notification_fabricator.rb
index 6c386c7336..6ee4c1bcfb 100644
--- a/spec/fabricators/notification_fabricator.rb
+++ b/spec/fabricators/notification_fabricator.rb
@@ -3,6 +3,7 @@
 Fabricator(:notification) do
   transient :post
   notification_type Notification.types[:mentioned]
+  high_priority false
   user
   topic { |attrs| attrs[:post]&.topic || Fabricate(:topic, user: attrs[:user]) }
   post_number { |attrs| attrs[:post]&.post_number }
@@ -17,6 +18,7 @@ end
 
 Fabricator(:private_message_notification, from: :notification) do
   notification_type Notification.types[:private_message]
+  high_priority true
   data do |attrs|
     post = attrs[:post] || Fabricate(:post, topic: attrs[:topic], user: attrs[:user])
     {
@@ -30,6 +32,23 @@ Fabricator(:private_message_notification, from: :notification) do
   end
 end
 
+Fabricator(:bookmark_reminder_notification, from: :notification) do
+  notification_type Notification.types[:bookmark_reminder]
+  high_priority true
+  data do |attrs|
+    post = attrs[:post] || Fabricate(:post, topic: attrs[:topic], user: attrs[:user])
+    {
+      topic_title: attrs[:topic].title,
+      original_post_id: post.id,
+      original_post_type: post.post_type,
+      original_username: post.user.username,
+      revision_number: nil,
+      display_username: post.user.username,
+      bookmark_name: "Check out Mr Freeze's opinion here"
+    }.to_json
+  end
+end
+
 Fabricator(:replied_notification, from: :notification) do
   notification_type Notification.types[:replied]
   data do |attrs|
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index f8bf62a82f..9f0a38a836 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -117,6 +117,24 @@ describe Notification do
       it "increases unread_private_messages" do
         expect { Fabricate(:private_message_notification, user: user); user.reload }.to change(user, :unread_private_messages)
       end
+
+      it "increases unread_high_priority_notifications" do
+        expect { Fabricate(:private_message_notification, user: user); user.reload }.to change(user, :unread_high_priority_notifications)
+      end
+    end
+
+    context 'a bookmark reminder message' do
+      it "doesn't increase unread_notifications" do
+        expect { Fabricate(:bookmark_reminder_notification, user: user); user.reload }.not_to change(user, :unread_notifications)
+      end
+
+      it 'increases total_unread_notifications' do
+        expect { Fabricate(:notification, user: user); user.reload }.to change(user, :total_unread_notifications)
+      end
+
+      it "increases unread_high_priority_notifications" do
+        expect { Fabricate(:bookmark_reminder_notification, user: user); user.reload }.to change(user, :unread_high_priority_notifications)
+      end
     end
 
   end
@@ -219,6 +237,13 @@ describe Notification do
                            data: '{}',
                            notification_type: Notification.types[:private_message])
 
+      Notification.create!(read: false,
+                           user_id: user.id,
+                           topic_id: t.id,
+                           post_number: 1,
+                           data: '{}',
+                           notification_type: Notification.types[:bookmark_reminder])
+
       other = Notification.create!(read: false,
                                    user_id: user.id,
                                    topic_id: t.id,
@@ -230,8 +255,11 @@ describe Notification do
       user.reload
 
       expect(user.unread_notifications).to eq(0)
-      expect(user.total_unread_notifications).to eq(2)
-      expect(user.unread_private_messages).to eq(1)
+      expect(user.total_unread_notifications).to eq(3)
+      # NOTE: because of deprecation this will be equal to unread_high_priority_notifications,
+      #       to be remonved in 2.5
+      expect(user.unread_private_messages).to eq(2)
+      expect(user.unread_high_priority_notifications).to eq(2)
     end
   end
 
@@ -248,7 +276,7 @@ describe Notification do
     end
   end
 
-  describe 'ensure consistency' do
+  describe '#ensure_consistency!' do
     it 'deletes notifications if post is missing or deleted' do
 
       NotificationEmailer.disable
@@ -260,6 +288,8 @@ describe Notification do
                            notification_type: Notification.types[:private_message])
       Notification.create!(read: false, user_id: p2.user_id, topic_id: p2.topic_id, post_number: p2.post_number, data: '[]',
                            notification_type: Notification.types[:private_message])
+      Notification.create!(read: false, user_id: p2.user_id, topic_id: p2.topic_id, post_number: p2.post_number, data: '[]',
+                           notification_type: Notification.types[:bookmark_reminder])
 
       Notification.create!(read: false, user_id: p2.user_id, topic_id: p2.topic_id, post_number: p2.post_number, data: '[]',
                            notification_type: Notification.types[:liked])
@@ -321,6 +351,10 @@ describe Notification do
       fab(Notification.types[:private_message], false)
     end
 
+    def unread_bookmark_reminder
+      fab(Notification.types[:bookmark_reminder], false)
+    end
+
     def pm
       fab(Notification.types[:private_message], true)
     end
@@ -340,16 +374,17 @@ describe Notification do
       expect(Notification.visible.count).to eq(0)
     end
 
-    it 'orders stuff correctly' do
+    it 'orders stuff by creation descending, bumping unread high priority (pms, bookmark reminders) to top' do
+      # note we expect the final order to read bottom-up for this list of variables,
+      # with unread pm + bookmark reminder at the top of that list
       a = unread_pm
-          regular
+      regular
+      b = unread_bookmark_reminder
       c = pm
       d = regular
 
-      # bumps unread pms to front of list
-
-      notifications = Notification.recent_report(user, 3)
-      expect(notifications.map { |n| n.id }).to eq([a.id, d.id, c.id])
+      notifications = Notification.recent_report(user, 4)
+      expect(notifications.map { |n| n.id }).to eq([b.id, a.id, d.id, c.id])
 
     end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 995a532290..bb27aa4af0 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1779,7 +1779,7 @@ describe User do
   end
 
   describe '#publish_notifications_state' do
-    it 'should publish the right message' do
+    it 'should publish the right message sorted by ID desc' do
       notification = Fabricate(:notification, user: user)
       notification2 = Fabricate(:notification, user: user, read: true)
 
@@ -1788,8 +1788,41 @@ describe User do
       end.first
 
       expect(message.data[:recent]).to eq([
-                                            [notification2.id, true], [notification.id, false]
-                                          ])
+        [notification2.id, true], [notification.id, false]
+      ])
+    end
+
+    it 'floats the unread high priority notifications to the top' do
+      notification = Fabricate(:notification, user: user)
+      notification2 = Fabricate(:notification, user: user, read: true)
+      notification3 = Fabricate(:notification, user: user, notification_type: Notification.types[:private_message])
+      notification4 = Fabricate(:notification, user: user, notification_type: Notification.types[:bookmark_reminder])
+
+      message = MessageBus.track_publish("/notification/#{user.id}") do
+        user.publish_notifications_state
+      end.first
+
+      expect(message.data[:recent]).to eq([
+        [notification4.id, false], [notification3.id, false],
+        [notification2.id, true], [notification.id, false]
+      ])
+    end
+
+    it "has the correct counts" do
+      notification = Fabricate(:notification, user: user)
+      notification2 = Fabricate(:notification, user: user, read: true)
+      notification3 = Fabricate(:notification, user: user, notification_type: Notification.types[:private_message])
+      notification4 = Fabricate(:notification, user: user, notification_type: Notification.types[:bookmark_reminder])
+
+      message = MessageBus.track_publish("/notification/#{user.id}") do
+        user.publish_notifications_state
+      end.first
+
+      expect(message.data[:unread_notifications]).to eq(1)
+      # NOTE: because of deprecation this will be equal to unread_high_priority_notifications,
+      #       to be remonved in 2.5
+      expect(message.data[:unread_private_messages]).to eq(2)
+      expect(message.data[:unread_high_priority_notifications]).to eq(2)
     end
   end
 
@@ -1821,6 +1854,7 @@ describe User do
   end
 
   describe "#unread_notifications" do
+    fab!(:user) { Fabricate(:user) }
     before do
       User.max_unread_notifications = 3
     end
@@ -1830,14 +1864,32 @@ describe User do
     end
 
     it "limits to MAX_UNREAD_NOTIFICATIONS" do
-      user = Fabricate(:user)
-
       4.times do
         Notification.create!(user_id: user.id, notification_type: 1, read: false, data: '{}')
       end
 
       expect(user.unread_notifications).to eq(3)
     end
+
+    it "does not include high priority notifications" do
+      Notification.create!(user_id: user.id, notification_type: 1, read: false, data: '{}')
+      Notification.create!(user_id: user.id, notification_type: Notification.types[:private_message], read: false, data: '{}')
+      Notification.create!(user_id: user.id, notification_type: Notification.types[:bookmark_reminder], read: false, data: '{}')
+
+      expect(user.unread_notifications).to eq(1)
+    end
+  end
+
+  describe "#unread_high_priority_notifications" do
+    fab!(:user) { Fabricate(:user) }
+
+    it "only returns an unread count of PM and bookmark reminder notifications" do
+      Notification.create!(user_id: user.id, notification_type: 1, read: false, data: '{}')
+      Notification.create!(user_id: user.id, notification_type: Notification.types[:private_message], read: false, data: '{}')
+      Notification.create!(user_id: user.id, notification_type: Notification.types[:bookmark_reminder], read: false, data: '{}')
+
+      expect(user.unread_high_priority_notifications).to eq(2)
+    end
   end
 
   describe "#unstage!" do
diff --git a/test/javascripts/fixtures/session-fixtures.js b/test/javascripts/fixtures/session-fixtures.js
index 090bf09936..fe26b20cd6 100644
--- a/test/javascripts/fixtures/session-fixtures.js
+++ b/test/javascripts/fixtures/session-fixtures.js
@@ -8,6 +8,7 @@ export default {
       name: "Robin Ward",
       unread_notifications: 0,
       unread_private_messages: 0,
+      unread_high_priority_notifications: 0,
       admin: true,
       notification_channel_position: null,
       site_flagged_posts_count: 1,

From 8a527567d3da969bbacfcd1569b48a44a2c02e8c Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 31 Mar 2020 20:55:11 -0400
Subject: [PATCH 0461/1830] UX: Break very long words in titles within menus

---
 app/assets/stylesheets/common/base/menu-panel.scss  | 2 +-
 app/assets/stylesheets/common/base/search-menu.scss | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index ca1f2b530f..08ecec45a8 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -186,7 +186,7 @@
         padding: 0;
         > div {
           overflow: hidden; // clears the text from wrapping below icons
-
+          overflow-wrap: anywhere;
           // Truncate items with more than 2 lines.
           display: -webkit-box;
           -webkit-line-clamp: 2;
diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss
index 04d4714463..64f44f7c6a 100644
--- a/app/assets/stylesheets/common/base/search-menu.scss
+++ b/app/assets/stylesheets/common/base/search-menu.scss
@@ -265,6 +265,7 @@
     }
 
     .topic-title {
+      overflow-wrap: anywhere;
       margin-right: 0.25em;
     }
   }

From 771dec9a449564797e73e472383c1988903d29da Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 1 Apr 2020 11:13:53 +1000
Subject: [PATCH 0462/1830] Fix currentUser not being loaded correctly in
 bookmark.js

* this caused errors because resolvedTimezone was no longer
  accessible
---
 app/assets/javascripts/discourse/models/bookmark.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/bookmark.js b/app/assets/javascripts/discourse/models/bookmark.js
index bb88e7da52..1997ab632c 100644
--- a/app/assets/javascripts/discourse/models/bookmark.js
+++ b/app/assets/javascripts/discourse/models/bookmark.js
@@ -4,7 +4,6 @@ import { censor } from "pretty-text/censored-words";
 import { emojiUnescape } from "discourse/lib/text";
 import Site from "discourse/models/site";
 import { longDate } from "discourse/lib/formatter";
-import PreloadStore from "preload-store";
 import { none } from "@ember/object/computed";
 import { computed } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
@@ -109,9 +108,8 @@ const Bookmark = RestModel.extend({
     return Category.findById(categoryId);
   },
 
-  @discourseComputed("reminder_at")
-  formattedReminder(bookmarkReminderAt) {
-    const currentUser = PreloadStore.get("currentUser");
+  @discourseComputed("reminder_at", "currentUser")
+  formattedReminder(bookmarkReminderAt, currentUser) {
     return moment
       .tz(bookmarkReminderAt, currentUser.resolvedTimezone())
       .format(I18n.t("dates.long_with_year"));
@@ -126,6 +124,7 @@ Bookmark.reopenClass({
   create(args) {
     args = args || {};
     args.siteSettings = args.siteSettings || Discourse.SiteSettings;
+    args.currentUser = args.currentUser || Discourse.currentUser;
     return this._super(args);
   }
 });

From 8bd693891a126063f7da45bf86e5e04fab67982d Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 31 Mar 2020 21:57:09 -0400
Subject: [PATCH 0463/1830] Follow-up to 8a52756 for safari

---
 app/assets/stylesheets/common/base/menu-panel.scss  | 4 ++++
 app/assets/stylesheets/common/base/search-menu.scss | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 08ecec45a8..24fa749aeb 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -187,6 +187,10 @@
         > div {
           overflow: hidden; // clears the text from wrapping below icons
           overflow-wrap: anywhere;
+          @supports not (overflow-wrap: anywhere) {
+            word-break: break-word;
+          }
+
           // Truncate items with more than 2 lines.
           display: -webkit-box;
           -webkit-line-clamp: 2;
diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss
index 64f44f7c6a..c3b6813e2c 100644
--- a/app/assets/stylesheets/common/base/search-menu.scss
+++ b/app/assets/stylesheets/common/base/search-menu.scss
@@ -266,6 +266,9 @@
 
     .topic-title {
       overflow-wrap: anywhere;
+      @supports not (overflow-wrap: anywhere) {
+        word-break: break-word;
+      }
       margin-right: 0.25em;
     }
   }

From 04b431b6a449648bb665ec50c6fab0abdd2fb521 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Tue, 31 Mar 2020 20:12:51 -0600
Subject: [PATCH 0464/1830] FIX: Staged users getting user_linked and
 user_quoted emails

This fix ensures that if a staged user is linked to or quoted they won't
be emailed about it.

A staged user could email into a category, and another user could quote
them inside of a completely different category and we don't want a
staged user to receive an email for this.

Bug report:

https://meta.discourse.org/t/-/145202/9
---
 app/services/notification_emailer.rb       |  1 +
 spec/services/notification_emailer_spec.rb | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/services/notification_emailer.rb b/app/services/notification_emailer.rb
index 40e044105d..db51246e3d 100644
--- a/app/services/notification_emailer.rb
+++ b/app/services/notification_emailer.rb
@@ -90,6 +90,7 @@ class NotificationEmailer
       user = notification.user
       return unless user.active? || user.staged?
       return if SiteSetting.must_approve_users? && !user.approved? && !user.staged?
+      return if user.staged? && (type == :user_linked || type == :user_quoted)
 
       return unless EMAILABLE_POST_TYPES.include?(post_type)
 
diff --git a/spec/services/notification_emailer_spec.rb b/spec/services/notification_emailer_spec.rb
index e28e17201d..9ca6d40957 100644
--- a/spec/services/notification_emailer_spec.rb
+++ b/spec/services/notification_emailer_spec.rb
@@ -36,17 +36,24 @@ describe NotificationEmailer do
         NotificationEmailer.process_notification(notification)
       end
 
-      it "enqueues a job if the user is staged" do
+      it "enqueues a job if the user is staged for non-linked and non-quoted types" do
         notification.user.staged = true
-        Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification, type))
+        if type == :user_linked || type == :user_quoted
+          Jobs.expects(:enqueue_in).with(delay, :user_email, has_entry(type: type)).never
+        else
+          Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification, type))
+        end
         NotificationEmailer.process_notification(notification)
       end
 
-      it "enqueues a job if the user is staged even if site requires user approval" do
-        SiteSetting.must_approve_users = true
-
+      it "enqueues a job if the user is staged even if site requires user approval for non-linked and non-quoted typed" do
         notification.user.staged = true
-        Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification, type))
+        SiteSetting.must_approve_users = true
+        if type == :user_linked || type == :user_quoted
+          Jobs.expects(:enqueue_in).with(delay, :user_email, has_entry(type: type)).never
+        else
+          Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification, type))
+        end
         NotificationEmailer.process_notification(notification)
       end
     end

From b8d2261db9f216414b86a27d83435f4ee99561cc Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 1 Apr 2020 14:23:26 +1100
Subject: [PATCH 0465/1830] FIX: correctly load drafts based of id

Previously we relied on race conditions to correctly open a draft, so this
broke.

New code is deliberate.

Also corrects missing observers on composer action
---
 .../javascripts/discourse/models/composer.js     | 13 +++++++++----
 .../components/composer-action-title.hbs         |  2 ++
 .../select-kit/components/composer-actions.js    | 16 ++++++----------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js
index 9d0dcb8c45..1b1fd0ace3 100644
--- a/app/assets/javascripts/discourse/models/composer.js
+++ b/app/assets/javascripts/discourse/models/composer.js
@@ -744,9 +744,12 @@ const Composer = RestModel.extend({
 
     if (opts.postId) {
       promise = promise.then(() =>
-        this.store
-          .find("post", opts.postId)
-          .then(post => composer.setProperties({ post }))
+        this.store.find("post", opts.postId).then(post => {
+          composer.set("post", post);
+          if (post) {
+            composer.set("topic", post.topic);
+          }
+        })
       );
     }
 
@@ -765,7 +768,9 @@ const Composer = RestModel.extend({
         this.store.find("post", opts.post.id).then(post => {
           composer.setProperties({
             reply: post.raw,
-            originalText: post.raw
+            originalText: post.raw,
+            post: post,
+            topic: post.topic
           });
 
           composer.appEvents.trigger("composer:reply-reloaded", composer);
diff --git a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
index 3f26b6e3c5..5d3b2eef4d 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
@@ -9,6 +9,8 @@
     closeComposer=closeComposer
     action=model.action
     tabindex=tabindex
+    topic=model.topic
+    post=model.post
   }}
 {{/if}}
 
diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js b/app/assets/javascripts/select-kit/components/composer-actions.js
index 720dddd2ca..548a0ef701 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js
@@ -39,21 +39,17 @@ export default DropdownSelectBoxComponent.extend({
 
     // if we change topic we want to change both snapshots
     if (
-      this.get("composerModel.topic") &&
-      (!_topicSnapshot ||
-        this.get("composerModel.topic.id") !== _topicSnapshot.id)
+      this.topic &&
+      (!_topicSnapshot || this.topic.id !== _topicSnapshot.id)
     ) {
-      _topicSnapshot = this.get("composerModel.topic");
-      _postSnapshot = this.get("composerModel.post");
+      _topicSnapshot = this.topic;
+      _postSnapshot = this.post;
       this.contentChanged();
     }
 
     // if we hit reply on a different post we want to change postSnapshot
-    if (
-      this.get("composerModel.post") &&
-      (!_postSnapshot || this.get("composerModel.post.id") !== _postSnapshot.id)
-    ) {
-      _postSnapshot = this.get("composerModel.post");
+    if (this.post && (!_postSnapshot || this.post.id !== _postSnapshot.id)) {
+      _postSnapshot = this.post;
       this.contentChanged();
     }
 

From c07dd0d22ab3afdf440f7dcb1e6f770334c1d0d5 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 1 Apr 2020 14:09:07 +1000
Subject: [PATCH 0466/1830] FEATURE: Add lazy loading to user bookmarks list
 (#9317)

This is so users with huge amount of bookmarks do not have to wait a long time to see results.

* Add a bookmark list and list serializer to server-side to be able to handle paging and load more URL
* Use load-more component to load more bookmark items, 20 at a time in user activity
* Change the way current user is loaded for bookmark ember models because it was breaking/losing resolvedTimezone when loading more items
---
 .../user-activity-bookmarks-with-reminders.js | 50 +++++++---
 .../javascripts/discourse/models/bookmark.js  | 16 ++++
 .../discourse/templates/user/bookmarks.hbs    | 91 ++++++++++---------
 .../widgets/quick-access-bookmarks.js         |  2 +
 app/controllers/users_controller.rb           |  9 +-
 app/models/user.rb                            |  1 +
 app/models/user_bookmark_list.rb              | 26 ++++++
 .../user_bookmark_list_serializer.rb          | 11 +++
 lib/bookmark_query.rb                         |  8 +-
 spec/requests/users_controller_spec.rb        |  2 +-
 10 files changed, 155 insertions(+), 61 deletions(-)
 create mode 100644 app/models/user_bookmark_list.rb
 create mode 100644 app/serializers/user_bookmark_list_serializer.rb

diff --git a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
index ad8ab35a6b..11cc0bb622 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
+++ b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
@@ -1,4 +1,5 @@
 import Controller from "@ember/controller";
+import { Promise } from "rsvp";
 import { inject } from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 import Bookmark from "discourse/models/bookmark";
@@ -21,17 +22,7 @@ export default Controller.extend({
     return this.model
       .loadItems()
       .then(response => {
-        if (response && response.no_results_help) {
-          this.set("noResultsHelp", response.no_results_help);
-        }
-
-        if (response && response.bookmarks) {
-          let bookmarks = [];
-          response.bookmarks.forEach(bookmark => {
-            bookmarks.push(Bookmark.create(bookmark));
-          });
-          this.content.pushObjects(bookmarks);
-        }
+        this.processLoadResponse(response);
       })
       .catch(() => {
         this.set("noResultsHelp", I18n.t("bookmarks.list_permission_denied"));
@@ -49,9 +40,46 @@ export default Controller.extend({
     return loaded && contentLength === 0;
   },
 
+  processLoadResponse(response) {
+    response = response.user_bookmark_list;
+
+    if (response && response.no_results_help) {
+      this.set("noResultsHelp", response.no_results_help);
+    }
+
+    this.model.more_bookmarks_url = response.more_bookmarks_url;
+
+    if (response && response.bookmarks) {
+      let bookmarks = [];
+      response.bookmarks.forEach(bookmark => {
+        bookmarks.push(Bookmark.create(bookmark));
+      });
+      this.content.pushObjects(bookmarks);
+    }
+  },
+
   actions: {
     removeBookmark(bookmark) {
       return bookmark.destroy().then(() => this.loadItems());
+    },
+
+    loadMore() {
+      if (this.loadingMore) {
+        return Promise.resolve();
+      }
+      this.set("loadingMore", true);
+
+      return this.model
+        .loadMore()
+        .then(response => this.processLoadResponse(response))
+        .catch(() => {
+          this.set("noResultsHelp", I18n.t("bookmarks.list_permission_denied"));
+        })
+        .finally(() =>
+          this.setProperties({
+            loadingMore: false
+          })
+        );
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/models/bookmark.js b/app/assets/javascripts/discourse/models/bookmark.js
index 1997ab632c..8a8c09f35f 100644
--- a/app/assets/javascripts/discourse/models/bookmark.js
+++ b/app/assets/javascripts/discourse/models/bookmark.js
@@ -117,6 +117,22 @@ const Bookmark = RestModel.extend({
 
   loadItems() {
     return ajax(`/u/${this.user.username}/bookmarks.json`, { cache: "false" });
+  },
+
+  loadMore() {
+    if (!this.more_bookmarks_url) {
+      return Promise.resolve();
+    }
+
+    let moreUrl = this.more_bookmarks_url;
+    if (moreUrl) {
+      let [url, params] = moreUrl.split("?");
+      moreUrl = url;
+      if (params) {
+        moreUrl += "?" + params;
+      }
+    }
+    return ajax({ url: moreUrl });
   }
 });
 
diff --git a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
index 228490bfa4..92c9979b54 100644
--- a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
+++ b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
@@ -2,50 +2,53 @@
   <div class='alert alert-info'>{{noResultsHelp}}</div>
 {{else}}
   {{#conditional-loading-spinner condition=loading}}
-  <table class="topic-list">
-    <thead>
-      <th>{{i18n "topic.title"}}</th>
-      <th>{{i18n "post.bookmarks.created"}}</th>
-      <th>{{i18n "activity"}}</th>
-      <th>&nbsp;</th>
-    </thead>
-    <tbody>
-    {{#each content as |bookmark|}}
-      <tr class="topic-list-item bookmark-list-item">
-        <td class="main-link">
-          <span class="link-top-line">
-            <div class="bookmark-metadata">
-              {{#if bookmark.name}}
-                <span class="bookmark-metadata-item">
-                  {{d-icon "info-circle"}}{{bookmark.name}}
-                </span>
-              {{/if}}
-              {{#if bookmark.reminder_at}}
-                <span class="bookmark-metadata-item">
-                  {{d-icon "far-clock"}}{{bookmark.formattedReminder}}
-                </span>
-              {{/if}}
-            </div>
+    {{#load-more selector=".bookmark-list tr" action=(action "loadMore")}}
+      <table class="topic-list bookmark-list">
+        <thead>
+          <th>{{i18n "topic.title"}}</th>
+          <th>{{i18n "post.bookmarks.created"}}</th>
+          <th>{{i18n "activity"}}</th>
+          <th>&nbsp;</th>
+        </thead>
+        <tbody>
+        {{#each content as |bookmark|}}
+          <tr class="topic-list-item bookmark-list-item">
+            <td class="main-link">
+              <span class="link-top-line">
+                <div class="bookmark-metadata">
+                  {{#if bookmark.name}}
+                    <span class="bookmark-metadata-item">
+                      {{d-icon "info-circle"}}{{bookmark.name}}
+                    </span>
+                  {{/if}}
+                  {{#if bookmark.reminder_at}}
+                    <span class="bookmark-metadata-item">
+                      {{d-icon "far-clock"}}{{bookmark.formattedReminder}}
+                    </span>
+                  {{/if}}
+                </div>
 
-            {{topic-status topic=bookmark}}
-            {{topic-link bookmark}}
-          </span>
-          {{#if bookmark.excerpt}}
-          <p class="post-excerpt">{{html-safe bookmark.excerpt}}</p>
-          {{/if}}
-          <div class="link-bottom-line">
-            {{category-link bookmark.category}}
-            {{discourse-tags bookmark mode="list" tagsForUser=tagsForUser}}
-         </div>
-        </td>
-        <td>{{format-date bookmark.created_at format="tiny"}}</td>
-        {{raw "list/activity-column" topic=bookmark class="num" tagName="td"}}
-        <td>
-          {{bookmark-actions-dropdown bookmark=bookmark removeBookmark=(action "removeBookmark")}}
-        </td>
-      </tr>
-    {{/each}}
-    </tbody>
-  </table>
+                {{topic-status topic=bookmark}}
+                {{topic-link bookmark}}
+              </span>
+              {{#if bookmark.excerpt}}
+              <p class="post-excerpt">{{html-safe bookmark.excerpt}}</p>
+              {{/if}}
+              <div class="link-bottom-line">
+                {{category-link bookmark.category}}
+                {{discourse-tags bookmark mode="list" tagsForUser=tagsForUser}}
+             </div>
+            </td>
+            <td>{{format-date bookmark.created_at format="tiny"}}</td>
+            {{raw "list/activity-column" topic=bookmark class="num" tagName="td"}}
+            <td>
+              {{bookmark-actions-dropdown bookmark=bookmark removeBookmark=(action "removeBookmark")}}
+            </td>
+          </tr>
+        {{/each}}
+        </tbody>
+      </table>
+      {{conditional-loading-spinner condition=loadingMore}}
+    {{/load-more}}
   {{/conditional-loading-spinner}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js b/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
index b63c2b527b..7bbae63198 100644
--- a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
+++ b/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
@@ -62,6 +62,8 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
         limit: this.estimateItemLimit()
       }
     }).then(result => {
+      result = result.user_bookmark_list;
+
       // The empty state help text for bookmarks page is localized on the
       // server.
       if (result.no_results_help) {
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 15e36dd9d1..81eeddab05 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1404,15 +1404,18 @@ class UsersController < ApplicationController
 
     respond_to do |format|
       format.json do
-        bookmarks = BookmarkQuery.new(user: user, guardian: guardian, params: params).list_all
+        bookmark_list = UserBookmarkList.new(user: user, guardian: guardian, params: params)
+        bookmark_list.load
 
-        if bookmarks.empty?
+        if bookmark_list.bookmarks.empty?
           render json: {
             bookmarks: [],
             no_results_help: I18n.t("user_activity.no_bookmarks.self")
           }
         else
-          render_serialized(bookmarks, UserBookmarkSerializer, root: 'bookmarks')
+          page = params[:page].to_i + 1
+          bookmark_list.more_bookmarks_url = "#{Discourse.base_path}/u/#{params[:username]}/bookmarks.json?page=#{page}"
+          render_serialized(bookmark_list, UserBookmarkListSerializer)
         end
       end
       format.ics do
diff --git a/app/models/user.rb b/app/models/user.rb
index 284f15c788..4ae0f86cc0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -14,6 +14,7 @@ class User < ActiveRecord::Base
   has_many :tag_users, dependent: :destroy
   has_many :user_api_keys, dependent: :destroy
   has_many :topics
+  has_many :bookmarks
 
   # dependent deleting handled via before_destroy
   has_many :user_actions
diff --git a/app/models/user_bookmark_list.rb b/app/models/user_bookmark_list.rb
new file mode 100644
index 0000000000..3c5a00280f
--- /dev/null
+++ b/app/models/user_bookmark_list.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class UserBookmarkList
+  include ActiveModel::Serialization
+
+  PER_PAGE = 20
+
+  attr_reader :bookmarks
+  attr_accessor :more_bookmarks_url
+
+  def initialize(user: user, guardian: guardian, params: params)
+    @user = user
+    @guardian = guardian
+    @params = params.merge(per_page: PER_PAGE)
+    @bookmarks = []
+  end
+
+  def load
+    @bookmarks = BookmarkQuery.new(user: @user, guardian: @guardian, params: @params).list_all
+    @bookmarks
+  end
+
+  def per_page
+    @per_page ||= PER_PAGE
+  end
+end
diff --git a/app/serializers/user_bookmark_list_serializer.rb b/app/serializers/user_bookmark_list_serializer.rb
new file mode 100644
index 0000000000..4e82e44b17
--- /dev/null
+++ b/app/serializers/user_bookmark_list_serializer.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class UserBookmarkListSerializer < ApplicationSerializer
+  attributes :more_bookmarks_url
+
+  has_many :bookmarks, serializer: UserBookmarkSerializer, embed: :objects
+
+  def include_more_bookmarks_url?
+    object.bookmarks.size == object.per_page
+  end
+end
diff --git a/lib/bookmark_query.rb b/lib/bookmark_query.rb
index b55e8eb8b6..45442c211f 100644
--- a/lib/bookmark_query.rb
+++ b/lib/bookmark_query.rb
@@ -22,6 +22,8 @@ class BookmarkQuery
     @user = user
     @params = params
     @guardian = guardian || Guardian.new(@user)
+    @page = @params[:page].to_i
+    @limit = @params[:limit].present? ? @params[:limit].to_i : @params[:per_page]
   end
 
   def list_all
@@ -34,10 +36,12 @@ class BookmarkQuery
 
     results = results.merge(Post.secured(@guardian))
 
-    if @params[:limit]
-      results = results.limit(@params[:limit])
+    if @page.positive?
+      results = results.offset(@page * @params[:per_page])
     end
 
+    results = results.limit(@limit)
+
     if BookmarkQuery.preloaded_custom_fields.any?
       Topic.preload_custom_fields(
         results.map(&:topic), BookmarkQuery.preloaded_custom_fields
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 561eaeb12d..59f705f8eb 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -4198,7 +4198,7 @@ describe UsersController do
       sign_in(user)
       get "/u/#{user.username}/bookmarks.json"
       expect(response.status).to eq(200)
-      expect(JSON.parse(response.body)['bookmarks'].map { |b| b['id'] }).to match_array([bookmark1.id, bookmark2.id])
+      expect(JSON.parse(response.body)['user_bookmark_list']['bookmarks'].map { |b| b['id'] }).to match_array([bookmark1.id, bookmark2.id])
     end
 
     it "does not show another user's bookmarks" do

From debed81022e84de634ae85a47ec78f0b0772a44b Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 1 Apr 2020 15:04:04 +1000
Subject: [PATCH 0467/1830] Get rid of named param double reference in
 UserBookmarkList

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

diff --git a/app/models/user_bookmark_list.rb b/app/models/user_bookmark_list.rb
index 3c5a00280f..df885e609d 100644
--- a/app/models/user_bookmark_list.rb
+++ b/app/models/user_bookmark_list.rb
@@ -8,7 +8,7 @@ class UserBookmarkList
   attr_reader :bookmarks
   attr_accessor :more_bookmarks_url
 
-  def initialize(user: user, guardian: guardian, params: params)
+  def initialize(user:, guardian:, params:)
     @user = user
     @guardian = guardian
     @params = params.merge(per_page: PER_PAGE)

From a098464af3dcf60fa461071fc33a176203ef8227 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 1 Apr 2020 16:40:55 +1100
Subject: [PATCH 0468/1830] FIX: ninja edit for replies not working

There is an edge case, in some cases when pulling a post from the store
there is no topic, this ensures it is loaded correctly.
---
 .../javascripts/discourse/models/composer.js   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js
index 1b1fd0ace3..0f6d9ae620 100644
--- a/app/assets/javascripts/discourse/models/composer.js
+++ b/app/assets/javascripts/discourse/models/composer.js
@@ -769,11 +769,23 @@ const Composer = RestModel.extend({
           composer.setProperties({
             reply: post.raw,
             originalText: post.raw,
-            post: post,
-            topic: post.topic
+            post: post
           });
 
-          composer.appEvents.trigger("composer:reply-reloaded", composer);
+          promise = Promise.resolve();
+          // edge case ... make a post then edit right away
+          // store does not have topic for the post
+          if (composer.topic && composer.topic.id === post.topic_id) {
+            // nothing to do ... we have the right topic
+          } else {
+            promise = this.store.find("topic", post.topic_id).then(topic => {
+              this.set("topic", topic);
+            });
+          }
+
+          return promise.then(() => {
+            composer.appEvents.trigger("composer:reply-reloaded", composer);
+          });
         })
       );
     } else if (opts.action === REPLY && opts.quote) {

From acc16dada3af735bd185c485bdd2a860e32f2911 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 1 Apr 2020 17:44:18 +1100
Subject: [PATCH 0469/1830] DEV: post fixture mismatching topic fixture

post 398 belongs to a non PM topic, use a unique id for this PM topic
---
 test/javascripts/fixtures/post.js  | 63 ++++++++++++++++++++++++++++++
 test/javascripts/fixtures/topic.js |  2 +-
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/test/javascripts/fixtures/post.js b/test/javascripts/fixtures/post.js
index 4cbed4acae..bed4d1b461 100644
--- a/test/javascripts/fixtures/post.js
+++ b/test/javascripts/fixtures/post.js
@@ -1,4 +1,67 @@
 export default {
+  "/posts/98737532": {
+    id: 98737532,
+    name: null,
+    username: "tim.lange",
+    avatar_template: "/images/avatar.png",
+    created_at: "2019-03-28T07:57:50.527Z",
+    cooked: "<p>I am writing this private message to you</p>",
+    ignored: false,
+    post_number: 1,
+    post_type: 1,
+    updated_at: "2019-03-28T07:57:50.527Z",
+    reply_count: 0,
+    reply_to_post_number: null,
+    quote_count: 0,
+    incoming_link_count: 0,
+    reads: 2,
+    score: 1.15,
+    yours: true,
+    topic_id: 34,
+    topic_slug: "test-pm",
+    display_username: null,
+    primary_group_name: null,
+    primary_group_flair_url: null,
+    primary_group_flair_bg_color: null,
+    primary_group_flair_color: null,
+    version: 1,
+    can_edit: true,
+    can_delete: false,
+    can_recover: null,
+    can_wiki: true,
+    read: true,
+    user_title: null,
+    actions_summary: [
+      {
+        id: 3,
+        can_act: true
+      },
+      {
+        id: 4,
+        can_act: true
+      },
+      {
+        id: 8,
+        can_act: true
+      },
+      {
+        id: 7,
+        can_act: true
+      }
+    ],
+    moderator: false,
+    admin: true,
+    staff: true,
+    user_id: 1,
+    hidden: false,
+    trust_level: 1,
+    deleted_at: null,
+    user_deleted: false,
+    edit_reason: null,
+    can_view_edit_history: true,
+    wiki: false
+  },
+
   "/posts/398": {
     id: 398,
     name: "Uwe Keim",
diff --git a/test/javascripts/fixtures/topic.js b/test/javascripts/fixtures/topic.js
index b4c79e2fd6..7c380de3a0 100644
--- a/test/javascripts/fixtures/topic.js
+++ b/test/javascripts/fixtures/topic.js
@@ -4749,7 +4749,7 @@ export default {
     post_stream: {
       posts: [
         {
-          id: 398,
+          id: 98737532,
           name: null,
           username: "tim.lange",
           avatar_template: "/images/avatar.png",

From b2f30aa0b5dee1b481f62d212819985930f6a851 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Wed, 1 Apr 2020 09:20:45 -0300
Subject: [PATCH 0470/1830] FIX: FlagSockpuppets should not flag a post if a
 post of that user was already rejected by staff (#9328)

* FIX: FlagSockpuppets should not flag a post if a post of that user was already rejected by staff

* Update spec/services/flag_sockpuppets_spec.rb

Co-Authored-By: Robin Ward <robin.ward@gmail.com>

Co-authored-by: Robin Ward <robin.ward@gmail.com>
---
 app/services/spam_rule/flag_sockpuppets.rb | 21 ++++++++++++++------
 spec/services/flag_sockpuppets_spec.rb     | 23 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/app/services/spam_rule/flag_sockpuppets.rb b/app/services/spam_rule/flag_sockpuppets.rb
index 26c53ff120..1bc930b48c 100644
--- a/app/services/spam_rule/flag_sockpuppets.rb
+++ b/app/services/spam_rule/flag_sockpuppets.rb
@@ -19,8 +19,6 @@ class SpamRule::FlagSockpuppets
 
   def reply_is_from_sockpuppet?
     return false if @post.try(:post_number) == 1
-
-    first_post = @post.topic.posts.by_post_number.first
     return false if first_post.user.nil?
 
     !first_post.user.staff? &&
@@ -41,11 +39,22 @@ class SpamRule::FlagSockpuppets
       locale: SiteSetting.default_locale
     )
 
-    PostActionCreator.create(Discourse.system_user, @post, :spam, message: message)
+    flag_post(@post, message)
 
-    if (first_post = @post.topic.posts.by_post_number.first).try(:user).try(:new_user?)
-      PostActionCreator.create(Discourse.system_user, first_post, :spam, message: message)
-    end
+    flag_post(first_post, message) if first_post&.user&.new_user?
+  end
+
+  private
+
+  def flag_post(post, message)
+    can_trust_user = ReviewableFlaggedPost.where(status: Reviewable.statuses[:rejected], target_created_by: post.user).exists?
+    return if can_trust_user
+
+    PostActionCreator.create(Discourse.system_user, post, :spam, message: message)
+  end
+
+  def first_post
+    @first_post ||= @post.topic.posts.by_post_number.first
   end
 
 end
diff --git a/spec/services/flag_sockpuppets_spec.rb b/spec/services/flag_sockpuppets_spec.rb
index 985d8fc5b9..cebb398a21 100644
--- a/spec/services/flag_sockpuppets_spec.rb
+++ b/spec/services/flag_sockpuppets_spec.rb
@@ -150,5 +150,28 @@ describe SpamRule::FlagSockpuppets do
       expect(PostAction.where(user: system, post: post2, post_action_type_id: spam).exists?).to eq(true)
       expect(PostAction.where(user: system, post: post1, post_action_type_id: spam).exists?).to eq(false)
     end
+
+    it "doesn't flag the first post if it was already rejected by staff before" do
+      flagged_post = Fabricate(
+        :reviewable_flagged_post,
+        target: post1, status: Reviewable.statuses[:rejected], target_created_by: post1.user
+      )
+
+      described_class.new(post2).perform
+
+      expect(flagged_post.reload.status).to eq(Reviewable.statuses[:rejected])
+    end
+
+    it "doesn't flag the post if another post of the same user was rejected by staff before" do
+      another_post = Fabricate(:post, user: user1)
+      flagged_post = Fabricate(
+        :reviewable_flagged_post,
+        target: another_post, status: Reviewable.statuses[:rejected], target_created_by: another_post.user
+      )
+
+      described_class.new(post2).perform
+
+      expect(ReviewableFlaggedPost.where(target_created_by: user1).count).to eq(1)
+    end
   end
 end

From 689c61b46205d670e8df03bce7a88f10f93b4ea2 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 1 Apr 2020 08:36:50 -0500
Subject: [PATCH 0471/1830] DEV: Allow plugins to add wizard steps after
 specific steps (#9315)

---
 .../wizard/components/wizard-step.js          |  5 ++
 .../templates/components/wizard-step.hbs      | 14 +++---
 lib/wizard.rb                                 | 21 ++++++--
 spec/components/wizard/wizard_spec.rb         | 50 +++++++++++++++++++
 4 files changed, 81 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/wizard/components/wizard-step.js b/app/assets/javascripts/wizard/components/wizard-step.js
index 7884a27005..dd36c58891 100644
--- a/app/assets/javascripts/wizard/components/wizard-step.js
+++ b/app/assets/javascripts/wizard/components/wizard-step.js
@@ -61,6 +61,11 @@ export default Component.extend({
     return getUrl(`/images/wizard/${src}`);
   },
 
+  @discourseComputed("step.id")
+  bannerAndDescriptionClass(id) {
+    return `wizard-banner-and-description wizard-banner-and-description-${id}`;
+  },
+
   @observes("step.id")
   _stepChanged() {
     this.set("saving", false);
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
index 4f0686acf7..67f9b50e5f 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -3,13 +3,15 @@
     <h1 class='wizard-step-title'>{{step.title}}</h1>
   {{/if}}
 
-  {{#if bannerImage}}
-    <img src={{bannerImage}} class="wizard-step-banner">
-  {{/if}}
+  <div class={{bannerAndDescriptionClass}}>
+    {{#if bannerImage}}
+      <img src={{bannerImage}} class="wizard-step-banner">
+    {{/if}}
 
-  {{#if step.description}}
-    <p class='wizard-step-description'>{{html-safe step.description}}</p>
-  {{/if}}
+    {{#if step.description}}
+      <p class='wizard-step-description'>{{html-safe step.description}}</p>
+    {{/if}}
+  </div>
 
   {{#wizard-step-form step=step}}
     {{#each step.fields as |field|}}
diff --git a/lib/wizard.rb b/lib/wizard.rb
index f334081444..c58d652e48 100644
--- a/lib/wizard.rb
+++ b/lib/wizard.rb
@@ -18,15 +18,30 @@ class Wizard
     Step.new(step_name)
   end
 
-  def append_step(step)
+  def append_step(step, after: nil)
     return if @@excluded_steps.include?(step)
 
     step = create_step(step) if step.is_a?(String)
-
     yield step if block_given?
 
-    last_step = @steps.last
+    if after
+      before_step = @steps.detect { |s| s.id == after }
 
+      if before_step
+        step.previous = before_step
+        step.index = before_step.index + 1
+        if before_step.next
+          step.next = before_step.next
+          before_step.next.previous = step
+        end
+        before_step.next = step
+        @steps.insert(before_step.index + 1, step)
+        step.index += 1 while (step = step.next)
+        return
+      end
+    end
+
+    last_step = @steps.last
     @steps << step
 
     # If it's the first step
diff --git a/spec/components/wizard/wizard_spec.rb b/spec/components/wizard/wizard_spec.rb
index 0faef40829..74fddb113d 100644
--- a/spec/components/wizard/wizard_spec.rb
+++ b/spec/components/wizard/wizard_spec.rb
@@ -81,6 +81,56 @@ describe Wizard do
     end
   end
 
+  describe "#append_step with after specified" do
+    let(:user) { Fabricate.build(:moderator) }
+    let(:wizard) { Wizard.new(user) }
+
+    it 'inserts steps after the proper step' do
+      wizard.append_step('first') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+      wizard.append_step('second') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+      wizard.append_step('actually-second', after: 'first') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+
+      expect(wizard.steps.sort_by(&:index).map(&:id)).to eq(["first", "actually-second", "second"])
+      expect(wizard.steps.map(&:index).sort).to eq([0, 1, 2])
+    end
+
+    it 'inserts steps at the end if the after value does not match an existing step' do
+      wizard.append_step('first') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+      wizard.append_step('second') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+      wizard.append_step('should_be_last', after: 'abcdefghi') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+
+      expect(wizard.steps.sort_by(&:index).map(&:id)).to eq(["first", "second", "should_be_last"])
+      expect(wizard.steps.map(&:index).sort).to eq([0, 1, 2])
+    end
+
+    it 'inserts steps at the end' do
+      wizard.append_step('first') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+      wizard.append_step('second') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+      wizard.append_step('last', after: 'second') do |step|
+        step.add_field(id: 'another_element', type: 'text')
+      end
+
+      expect(wizard.steps.sort_by(&:index).map(&:id)).to eq(["first", "second", "last"])
+      expect(wizard.steps.map(&:index).sort).to eq([0, 1, 2])
+    end
+  end
+
   describe "completed?" do
     let(:user) { Fabricate.build(:moderator) }
     let(:wizard) { Wizard.new(user) }

From 0d646d1a265179854dbf54fccc58639966b82050 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2020 11:31:14 -0400
Subject: [PATCH 0472/1830] Build(deps-dev): Bump rubocop from 0.80.1 to 0.81.0
 (#9330)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.80.1 to 0.81.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.80.1...v0.81.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 75aa846e21..b76e9ec387 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -340,14 +340,14 @@ GEM
       rspec-support (~> 3.8)
     rspec-support (3.9.2)
     rtlit (0.0.5)
-    rubocop (0.80.1)
+    rubocop (0.81.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-discourse (2.0.1)
       rubocop (>= 0.69.0)
     rubocop-rspec (1.38.1)
@@ -406,7 +406,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.7.0)
     unicorn (5.5.4)
       kgio (~> 2.6)
       raindrops (~> 0.7)

From 13b4eb9ccef99779f76eca846cd0b493f61f4c59 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 31 Mar 2020 15:07:52 +0200
Subject: [PATCH 0473/1830] FIX: Restore failed if schema contained objects not
 owned by the current DB user

---
 lib/backup_restore.rb          | 10 ++++++----
 lib/backup_restore/backuper.rb |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/backup_restore.rb b/lib/backup_restore.rb
index 4775fdd612..4d75734c27 100644
--- a/lib/backup_restore.rb
+++ b/lib/backup_restore.rb
@@ -83,12 +83,14 @@ module BackupRestore
   end
 
   def self.move_tables_between_schemas(source, destination)
+    owner = database_configuration.username
+
     ActiveRecord::Base.transaction do
-      DB.exec(move_tables_between_schemas_sql(source, destination))
+      DB.exec(move_tables_between_schemas_sql(source, destination, owner))
     end
   end
 
-  def self.move_tables_between_schemas_sql(source, destination)
+  def self.move_tables_between_schemas_sql(source, destination, owner)
     <<~SQL
       DO $$DECLARE row record;
       BEGIN
@@ -97,13 +99,13 @@ module BackupRestore
         -- otherwise extensions (like hstore & pg_trgm) won't work anymore...
         CREATE SCHEMA IF NOT EXISTS #{destination};
         -- move all <source> tables to <destination> schema
-        FOR row IN SELECT tablename FROM pg_tables WHERE schemaname = '#{source}'
+        FOR row IN SELECT tablename FROM pg_tables WHERE schemaname = '#{source}'  AND tableowner = '#{owner}'
         LOOP
           EXECUTE 'DROP TABLE IF EXISTS #{destination}.' || quote_ident(row.tablename) || ' CASCADE;';
           EXECUTE 'ALTER TABLE #{source}.' || quote_ident(row.tablename) || ' SET SCHEMA #{destination};';
         END LOOP;
         -- move all <source> views to <destination> schema
-        FOR row IN SELECT viewname FROM pg_views WHERE schemaname = '#{source}'
+        FOR row IN SELECT viewname FROM pg_views WHERE schemaname = '#{source}' AND viewowner = '#{owner}'
         LOOP
           EXECUTE 'DROP VIEW IF EXISTS #{destination}.' || quote_ident(row.viewname) || ' CASCADE;';
           EXECUTE 'ALTER VIEW #{source}.' || quote_ident(row.viewname) || ' SET SCHEMA #{destination};';
diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb
index ae7cee8696..dd4f81c72e 100644
--- a/lib/backup_restore/backuper.rb
+++ b/lib/backup_restore/backuper.rb
@@ -194,6 +194,7 @@ module BackupRestore
       [ password_argument,            # pass the password to pg_dump (if any)
         "pg_dump",                    # the pg_dump command
         "--schema=public",            # only public schema
+        "-T public.pg_*",             # exclude tables and views whose name starts with "pg_"
         "--file='#{@dump_filename}'", # output to the dump.sql file
         "--no-owner",                 # do not output commands to set ownership of objects
         "--no-privileges",            # prevent dumping of access privileges

From 32e14045c493dba8e9d4065a6add201a5993f626 Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Wed, 1 Apr 2020 09:27:14 -0700
Subject: [PATCH 0474/1830] UX: use color variable for background of shortcut
 keys

---
 .../stylesheets/common/components/keyboard_shortcuts.scss       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
index e74397664b..303acbdd65 100644
--- a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
+++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
@@ -51,7 +51,7 @@
     }
 
     span {
-      background: #f2f2f2;
+      background: $primary-very-low;
       border-radius: 3px;
       display: inline-flex;
       margin: 0 6px;

From 65d9a9c1ce56554a4af00552fbbfe8011bce5aee Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 1 Apr 2020 13:30:38 -0500
Subject: [PATCH 0475/1830] DEV: Create wizard-field-checkboxes component
 (#9333)

---
 .../components/wizard-field-checkboxes.js     | 33 +++++++++++++++++++
 .../components/wizard-field-checkboxes.hbs    | 11 +++++++
 2 files changed, 44 insertions(+)
 create mode 100644 app/assets/javascripts/wizard/components/wizard-field-checkboxes.js
 create mode 100644 app/assets/javascripts/wizard/templates/components/wizard-field-checkboxes.hbs

diff --git a/app/assets/javascripts/wizard/components/wizard-field-checkboxes.js b/app/assets/javascripts/wizard/components/wizard-field-checkboxes.js
new file mode 100644
index 0000000000..8c814f5859
--- /dev/null
+++ b/app/assets/javascripts/wizard/components/wizard-field-checkboxes.js
@@ -0,0 +1,33 @@
+import Component from "@ember/component";
+import { set } from "@ember/object";
+
+export default Component.extend({
+  init(...args) {
+    this._super(...args);
+    this.set("field.value", this.field.value || []);
+
+    for (let choice of this.field.choices) {
+      if (this.field.value.includes(choice.id)) {
+        set(choice, "checked", true);
+      }
+    }
+  },
+  actions: {
+    changed(checkbox) {
+      let newFieldValue = this.field.value;
+      const checkboxValue = checkbox.parentElement
+        .getAttribute("value")
+        .toLowerCase();
+
+      if (checkbox.checked) {
+        newFieldValue.push(checkboxValue);
+      } else {
+        const index = newFieldValue.indexOf(checkboxValue);
+        if (index > -1) {
+          newFieldValue.splice(index, 1);
+        }
+      }
+      this.set("field.value", newFieldValue);
+    }
+  }
+});
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-checkboxes.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-checkboxes.hbs
new file mode 100644
index 0000000000..25aeadbbde
--- /dev/null
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-checkboxes.hbs
@@ -0,0 +1,11 @@
+{{#each field.choices as |c|}}
+  <div class="checkbox-field-choice {{fieldClass}}">
+    <label id={{c.id}} value={{c.label}}>
+      {{input type="checkbox"
+            class="wizard-checkbox"
+            click=(action "changed" value="target")
+            checked=c.checked}}
+      {{c.label}}
+    </label>
+  </div>
+{{/each}}

From b82f6098ce02720acfca93989eac000362ccb292 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 1 Apr 2020 15:18:30 -0400
Subject: [PATCH 0476/1830] UX: Remove share as link fallback on touch devices
 (#9332)

---
 .../discourse/components/share-panel.js       | 33 +++++--------------
 .../discourse/components/share-popup.js       | 26 ++++++---------
 .../templates/components/share-panel.hbs      |  1 -
 .../templates/components/share-popup.hbs      |  1 -
 .../stylesheets/common/base/share_link.scss   | 14 --------
 .../components/share-and-invite-modal.scss    |  8 -----
 6 files changed, 18 insertions(+), 65 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/share-panel.js b/app/assets/javascripts/discourse/components/share-panel.js
index 78bc76db23..00bfd41082 100644
--- a/app/assets/javascripts/discourse/components/share-panel.js
+++ b/app/assets/javascripts/discourse/components/share-panel.js
@@ -1,10 +1,10 @@
 import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
-import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { escapeExpression } from "discourse/lib/utilities";
 import discourseComputed from "discourse-common/utils/decorators";
 import Sharing from "discourse/lib/sharing";
+import { later } from "@ember/runloop";
 
 export default Component.extend({
   tagName: null,
@@ -43,31 +43,14 @@ export default Component.extend({
 
   didInsertElement() {
     this._super(...arguments);
-
-    const shareUrl = this.shareUrl;
-    const $linkInput = $(this.element.querySelector(".topic-share-url"));
-    const $linkForTouch = $(
-      this.element.querySelector(".topic-share-url-for-touch a")
-    );
-
-    schedule("afterRender", () => {
-      if (!this.capabilities.touch) {
-        $linkForTouch.parent().remove();
-
-        $linkInput
-          .val(shareUrl)
-          .select()
-          .focus();
-      } else {
-        $linkInput.remove();
-
-        $linkForTouch.attr("href", shareUrl).text(shareUrl);
-
-        const range = window.document.createRange();
-        range.selectNode($linkForTouch[0]);
-        window.getSelection().addRange(range);
+    later(() => {
+      if (this.element) {
+        const textArea = this.element.querySelector(".topic-share-url");
+        textArea.style.height = textArea.scrollHeight + "px";
+        textArea.focus();
+        textArea.setSelectionRange(0, this.shareUrl.length);
       }
-    });
+    }, 200);
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/components/share-popup.js b/app/assets/javascripts/discourse/components/share-popup.js
index ca86058b73..9a9db6a494 100644
--- a/app/assets/javascripts/discourse/components/share-popup.js
+++ b/app/assets/javascripts/discourse/components/share-popup.js
@@ -1,5 +1,5 @@
 import { isEmpty } from "@ember/utils";
-import { bind, scheduleOnce } from "@ember/runloop";
+import { bind, scheduleOnce, later } from "@ember/runloop";
 import Component from "@ember/component";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { longDateNoYear } from "discourse/lib/formatter";
@@ -35,21 +35,15 @@ export default Component.extend({
   },
 
   _focusUrl() {
-    const link = this.link;
-    if (!this.capabilities.touch) {
-      const $linkInput = $("#share-link input");
-      $linkInput.val(link);
-
-      // Wait for the fade-in transition to finish before selecting the link:
-      window.setTimeout(() => $linkInput.select().focus(), 160);
-    } else {
-      const $linkForTouch = $("#share-link .share-for-touch a");
-      $linkForTouch.attr("href", link);
-      $linkForTouch.text(link);
-      const range = window.document.createRange();
-      range.selectNode($linkForTouch[0]);
-      window.getSelection().addRange(range);
-    }
+    // Wait for the fade-in transition to finish before selecting the link:
+    later(() => {
+      if (this.element) {
+        const linkInput = this.element.querySelector("#share-link input");
+        linkInput.value = this.link;
+        linkInput.setSelectionRange(0, this.link.length);
+        linkInput.focus();
+      }
+    }, 200);
   },
 
   _showUrl($target, url) {
diff --git a/app/assets/javascripts/discourse/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
index 1808d6cc1f..1f33acbe3c 100644
--- a/app/assets/javascripts/discourse/templates/components/share-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-panel.hbs
@@ -4,7 +4,6 @@
 
 <div class="body">
   {{textarea value=shareUrl class="topic-share-url"}}
-  <div class="topic-share-url-for-touch"><a></a></div>
 
   <div class="sources">
     {{#each sources as |source|}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index c61f43cf64..4a40880ebf 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -8,7 +8,6 @@
 
 <div>
   <input type="text">
-  <div class="share-for-touch"><div class="overflow-ellipsis"><a></a></div></div>
 </div>
 
 <div class="actions">
diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss
index 6f5e4f69dc..20b15d756e 100644
--- a/app/assets/stylesheets/common/base/share_link.scss
+++ b/app/assets/stylesheets/common/base/share_link.scss
@@ -15,12 +15,6 @@
   input[type="text"] {
     width: 100%;
   }
-  .share-for-touch .overflow-ellipsis {
-    clear: both;
-  }
-  .share-for-touch {
-    margin: 14px 0;
-  }
 
   .title {
     margin-bottom: s(1);
@@ -107,11 +101,3 @@
     }
   }
 }
-
-.discourse-no-touch #share-link .share-for-touch {
-  display: none;
-}
-
-.discourse-touch #share-link input[type="text"] {
-  display: none;
-}
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 827448b45a..624109f9ba 100644
--- a/app/assets/stylesheets/common/components/share-and-invite-modal.scss
+++ b/app/assets/stylesheets/common/components/share-and-invite-modal.scss
@@ -44,14 +44,6 @@
       box-sizing: border-box;
     }
 
-    .topic-share-url-for-touch {
-      a {
-        word-break: break-all;
-        font-size: $font-up-1;
-      }
-    }
-
-    .topic-share-url-for-touch,
     .topic-share-url {
       margin-bottom: s(2);
     }

From 90fcede832f04c3824c9bf3c50b5e16f75e8e5bb Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 1 Apr 2020 15:42:36 -0400
Subject: [PATCH 0477/1830] FIX: replace default welcome topic post with new
 value from wizard

Previously the text entered in the wizard would be prepended onto the
default first paragraph.
---
 lib/introduction_updater.rb           |  9 ++++---
 spec/lib/introduction_updater_spec.rb | 38 +++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/lib/introduction_updater.rb b/lib/introduction_updater.rb
index b6c1a45966..dc2ffbe3a5 100644
--- a/lib/introduction_updater.rb
+++ b/lib/introduction_updater.rb
@@ -18,9 +18,12 @@ class IntroductionUpdater
 
     if previous_value != new_value
       revisor = PostRevisor.new(post)
-
-      remaining = post.raw.split("\n")[1..-1]
-      revisor.revise!(@user, raw: "#{new_value}\n#{remaining.join("\n")}")
+      if post.raw.chomp == I18n.t('discourse_welcome_topic.body', base_path: Discourse.base_path).chomp
+        revisor.revise!(@user, raw: new_value)
+      else
+        remaining = post.raw[previous_value.length..-1]
+        revisor.revise!(@user, raw: "#{new_value}#{remaining}")
+      end
     end
   end
 
diff --git a/spec/lib/introduction_updater_spec.rb b/spec/lib/introduction_updater_spec.rb
index 66f91a6341..49698e56e0 100644
--- a/spec/lib/introduction_updater_spec.rb
+++ b/spec/lib/introduction_updater_spec.rb
@@ -55,4 +55,42 @@ describe IntroductionUpdater do
       end
     end
   end
+
+  describe "update_summary" do
+    let(:welcome_topic) do
+      topic = Fabricate(:topic, title: I18n.t("discourse_welcome_topic.title"))
+      Fabricate(
+        :post,
+        topic: topic,
+        raw: I18n.t("discourse_welcome_topic.body", base_path: Discourse.base_path),
+        post_number: 1
+      )
+      topic
+    end
+
+    let(:first_post) { welcome_topic.posts.first }
+
+    let(:new_summary) { "Welcome to my new site. It's gonna be good." }
+
+    subject { IntroductionUpdater.new(Fabricate(:admin)).update_summary(new_summary) }
+
+    before do
+      SiteSetting.welcome_topic_id = welcome_topic.id
+    end
+
+    it "completely replaces post if it has default value" do
+      subject
+      expect {
+        expect(first_post.reload.raw).to eq(new_summary)
+      }.to_not change { welcome_topic.reload.category_id }
+    end
+
+    it "only replaces first paragraph if it has custom content" do
+      paragraph1 = "This is the summary of my community"
+      paragraph2 = "And this is something I added later"
+      first_post.update!(raw: [paragraph1, paragraph2].join("\n\n"))
+      subject
+      expect(first_post.reload.raw).to eq([new_summary, paragraph2].join("\n\n"))
+    end
+  end
 end

From cdaa60b56bb285b3458a3f0054bcaffd23f300de Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Wed, 1 Apr 2020 13:10:17 -0700
Subject: [PATCH 0478/1830] FEATURE: Allow admins to disable self-service
 account deletion

https://meta.discourse.org/t/-/146276
---
 app/models/user.rb                            |  2 +-
 config/locales/server.en.yml                  |  1 +
 config/site_settings.yml                      |  3 +++
 lib/guardian/user_guardian.rb                 |  2 +-
 .../components/guardian/user_guardian_spec.rb | 24 +++++++++++++++++++
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 4ae0f86cc0..562291438f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -233,7 +233,6 @@ class User < ActiveRecord::Base
     LAST_VISIT = -2
   end
 
-  MAX_SELF_DELETE_POST_COUNT ||= 1
   MAX_STAFF_DELETE_POST_COUNT ||= 5
 
   def self.max_password_length
@@ -1286,6 +1285,7 @@ class User < ActiveRecord::Base
 
   def has_more_posts_than?(max_post_count)
     return true if user_stat && (user_stat.topic_count + user_stat.post_count) > max_post_count
+    return true if max_post_count < 0
 
     DB.query_single(<<~SQL, user_id: self.id).first > max_post_count
       SELECT COUNT(1)
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index e3b8271e5d..410f545eba 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1952,6 +1952,7 @@ en:
     relative_date_duration: "Number of days after posting where post dates will be shown as relative (7d) instead of absolute (20 Feb)."
     delete_user_max_post_age: "Don't allow deleting users whose first post is older than (x) days."
     delete_all_posts_max: "The maximum number of posts that can be deleted at once with the Delete All Posts button. If a user has more than this many posts, the posts cannot all be deleted at once and the user can't be deleted."
+    delete_user_self_max_post_count: "The maximum number of posts a user can have while allowing self-service account deletion. Set to -1 to disable self-service account deletion."
     username_change_period: "The maximum number of days after registration that accounts can change their username (0 to disallow username change)."
     email_editable: "Allow users to change their e-mail address after registration."
     logout_redirect: "Location to redirect browser to after logout (eg: https://example.com/logout)"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 33501a4df4..018d7390cc 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -542,6 +542,9 @@ users:
     client: true
     default: 15
     min: 1
+  delete_user_self_max_post_count:
+    default: 1
+    min: -1
   redirect_users_to_top_page: true
   prioritize_username_in_ux:
     client: true
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index 26e726437b..ecdff65838 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -62,7 +62,7 @@ module UserGuardian
     return false if user.nil? || user.admin?
     if is_me?(user)
       !SiteSetting.enable_sso &&
-      !user.has_more_posts_than?(User::MAX_SELF_DELETE_POST_COUNT)
+      !user.has_more_posts_than?(SiteSetting.delete_user_self_max_post_count)
     else
       is_staff? && (
         user.first_post_created_at.nil? ||
diff --git a/spec/components/guardian/user_guardian_spec.rb b/spec/components/guardian/user_guardian_spec.rb
index 12fbdd02a2..e870843549 100644
--- a/spec/components/guardian/user_guardian_spec.rb
+++ b/spec/components/guardian/user_guardian_spec.rb
@@ -303,6 +303,30 @@ describe UserGuardian do
         Fabricate(:post, user: user, topic: topic)
         expect(guardian.can_delete_user?(user)).to eq(false)
       end
+
+      it "isn't allowed when site admin blocked self deletion" do
+        expect(user.first_post_created_at).to be_nil
+
+        SiteSetting.delete_user_self_max_post_count = -1
+        expect(guardian.can_delete_user?(user)).to eq(false)
+      end
+
+      it "correctly respects the delete_user_self_max_post_count setting" do
+        SiteSetting.delete_user_self_max_post_count = 0
+        expect(guardian.can_delete_user?(user)).to eq(true)
+
+        Fabricate(:post, user: user)
+
+        expect(guardian.can_delete_user?(user)).to eq(false)
+        SiteSetting.delete_user_self_max_post_count = 1
+        expect(guardian.can_delete_user?(user)).to eq(true)
+
+        Fabricate(:post, user: user)
+
+        expect(guardian.can_delete_user?(user)).to eq(false)
+        SiteSetting.delete_user_self_max_post_count = 2
+        expect(guardian.can_delete_user?(user)).to eq(true)
+      end
     end
 
     context "for moderators" do

From cade4957ae2b6839557ea3a5b13fd247315d46c0 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 2 Apr 2020 10:21:57 +1100
Subject: [PATCH 0479/1830] DEV: don't use _ cause property is observed

Followup on fcc5ef96
---
 .../javascripts/select-kit/components/composer-actions.js   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js b/app/assets/javascripts/select-kit/components/composer-actions.js
index 548a0ef701..6b82d66f97 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js
@@ -20,7 +20,7 @@ export function _clearSnapshots() {
 }
 
 export default DropdownSelectBoxComponent.extend({
-  _seq: 0,
+  seq: 0,
   pluginApiIdentifiers: ["composer-actions"],
   classNames: ["composer-actions"],
 
@@ -31,7 +31,7 @@ export default DropdownSelectBoxComponent.extend({
   },
 
   contentChanged() {
-    this.set("_seq", this._seq + 1);
+    this.set("seq", this.seq + 1);
   },
 
   didReceiveAttrs() {
@@ -62,7 +62,7 @@ export default DropdownSelectBoxComponent.extend({
     return {};
   },
 
-  content: computed("_seq", function() {
+  content: computed("seq", function() {
     let items = [];
 
     if (

From 393215266f17cee97706d43e68b6ee9e58549dc1 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 2 Apr 2020 09:32:39 +1000
Subject: [PATCH 0480/1830] FIX: Set null high_priority columns to false in
 high priority notification migration (#9335)

Some DBs failed on this migration, possibly due to new records being added, with the error

ActiveRecord::NotNullViolation: PG::NotNullViolation: ERROR:  column "high_priority" contains null values

Luckily, the migration is retryable as is.
---
 ...0200329222246_add_high_priority_column_to_notifications.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/db/migrate/20200329222246_add_high_priority_column_to_notifications.rb b/db/migrate/20200329222246_add_high_priority_column_to_notifications.rb
index 4bb5f39d1e..caae9309aa 100644
--- a/db/migrate/20200329222246_add_high_priority_column_to_notifications.rb
+++ b/db/migrate/20200329222246_add_high_priority_column_to_notifications.rb
@@ -22,6 +22,10 @@ class AddHighPriorityColumnToNotifications < ActiveRecord::Migration[6.0]
         ALTER TABLE notifications ALTER COLUMN high_priority SET DEFAULT FALSE;
       SQL
 
+      execute <<~SQL
+        UPDATE notifications SET high_priority = FALSE WHERE high_priority IS NULL;
+      SQL
+
       execute <<~SQL
         ALTER TABLE notifications ALTER COLUMN high_priority SET NOT NULL;
       SQL

From d261a809e2b4d7c24a4a3fd2790dab948a315e09 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 2 Apr 2020 09:57:48 +1000
Subject: [PATCH 0481/1830] FEATURE: Bookmark reminder type changes and
 bugfixes (#9329)

New Reminder Types
-------------------------------------

* Add a "later this week" reminder which is today + 2 days, will not show if we are on the days Thu-Sun
* Add a "start of next business week" reminder which is 8am Monday

Bugfixes and Tweaks
--------------------------------------

* Move dates out of translation for reminder types and yield HTML for tap-tile for more customizable content and styling
* Make sure double clicking the bookmark icon in quick access takes users to the new bookmarks-with-reminders page
* Sane default to 8am (start of day) for custom reminder with no time
---
 .../discourse/controllers/bookmark.js         | 95 ++++++++-----------
 .../templates/components/tap-tile.hbs         |  2 +-
 .../discourse/templates/modal/bookmark.hbs    | 48 ++++++++--
 .../discourse/widgets/user-menu.js            |  5 +-
 app/models/bookmark.rb                        |  4 +-
 config/locales/client.en.yml                  | 14 +--
 test/javascripts/controllers/bookmark-test.js | 84 ++++++++--------
 7 files changed, 139 insertions(+), 113 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 18a6112a25..c14329d253 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -3,7 +3,6 @@ import { Promise } from "rsvp";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { htmlSafe } from "@ember/template";
 import { ajax } from "discourse/lib/ajax";
 
 const START_OF_DAY_HOUR = 8;
@@ -17,7 +16,9 @@ const REMINDER_TYPES = {
   NEXT_MONTH: "next_month",
   CUSTOM: "custom",
   LAST_CUSTOM: "last_custom",
-  NONE: "none"
+  NONE: "none",
+  START_OF_NEXT_BUSINESS_WEEK: "start_of_next_business_week",
+  LATER_THIS_WEEK: "later_this_week"
 };
 
 export default Controller.extend(ModalFunctionality, {
@@ -115,60 +116,48 @@ export default Controller.extend(ModalFunctionality, {
     );
   },
 
+  @discourseComputed()
+  showLaterThisWeek() {
+    return this.now().day() < 4; // 4 is Thursday
+  },
+
   @discourseComputed("parsedLastCustomReminderDatetime")
   lastCustomFormatted(parsedLastCustomReminderDatetime) {
-    return htmlSafe(
-      I18n.t("bookmarks.reminders.last_custom", {
-        date: parsedLastCustomReminderDatetime.format(
-          I18n.t("dates.long_no_year")
-        )
-      })
+    return parsedLastCustomReminderDatetime.format(
+      I18n.t("dates.long_no_year")
     );
   },
 
+  @discourseComputed()
+  startNextBusinessWeekFormatted() {
+    return this.nextWeek()
+      .day("Monday")
+      .format(I18n.t("dates.long_no_year"));
+  },
+
   @discourseComputed()
   laterTodayFormatted() {
-    return htmlSafe(
-      I18n.t("bookmarks.reminders.later_today", {
-        date: this.laterToday().format(I18n.t("dates.time"))
-      })
-    );
+    return this.laterToday().format(I18n.t("dates.time"));
   },
 
   @discourseComputed()
   tomorrowFormatted() {
-    return htmlSafe(
-      I18n.t("bookmarks.reminders.tomorrow", {
-        date: this.tomorrow().format(I18n.t("dates.time_short_day"))
-      })
-    );
-  },
-
-  @discourseComputed()
-  nextBusinessDayFormatted() {
-    return htmlSafe(
-      I18n.t("bookmarks.reminders.next_business_day", {
-        date: this.nextBusinessDay().format(I18n.t("dates.time_short_day"))
-      })
-    );
+    return this.tomorrow().format(I18n.t("dates.time_short_day"));
   },
 
   @discourseComputed()
   nextWeekFormatted() {
-    return htmlSafe(
-      I18n.t("bookmarks.reminders.next_week", {
-        date: this.nextWeek().format(I18n.t("dates.long_no_year"))
-      })
-    );
+    return this.nextWeek().format(I18n.t("dates.long_no_year"));
+  },
+
+  @discourseComputed()
+  laterThisWeekFormatted() {
+    return this.laterThisWeek().format(I18n.t("dates.time_short_day"));
   },
 
   @discourseComputed()
   nextMonthFormatted() {
-    return htmlSafe(
-      I18n.t("bookmarks.reminders.next_month", {
-        date: this.nextMonth().format(I18n.t("dates.long_no_year"))
-      })
-    );
+    return this.nextMonth().format(I18n.t("dates.long_no_year"));
   },
 
   @discourseComputed()
@@ -237,9 +226,17 @@ export default Controller.extend(ModalFunctionality, {
         return this.tomorrow();
       case REMINDER_TYPES.NEXT_WEEK:
         return this.nextWeek();
+      case REMINDER_TYPES.START_OF_NEXT_BUSINESS_WEEK:
+        return this.nextWeek().day("Monday");
+      case REMINDER_TYPES.LATER_THIS_WEEK:
+        return this.laterThisWeek();
       case REMINDER_TYPES.NEXT_MONTH:
         return this.nextMonth();
       case REMINDER_TYPES.CUSTOM:
+        this.set(
+          "customReminderTime",
+          this.customReminderTime || `0${START_OF_DAY_HOUR}:00`
+        );
         const customDateTime = this.parseCustomDateTime(
           this.customReminderDate,
           this.customReminderTime
@@ -265,23 +262,6 @@ export default Controller.extend(ModalFunctionality, {
     return this.startOfDay(this.now().add(1, "month"));
   },
 
-  nextBusinessDay() {
-    const currentDay = this.now().isoWeekday(); // 1=Mon, 7=Sun
-    let next = null;
-
-    // friday
-    if (currentDay === 5) {
-      next = this.now().add(3, "days");
-      // saturday
-    } else if (currentDay === 6) {
-      next = this.now().add(2, "days");
-    } else {
-      next = this.now().add(1, "day");
-    }
-
-    return this.startOfDay(next);
-  },
-
   tomorrow() {
     return this.startOfDay(this.now().add(1, "day"));
   },
@@ -301,6 +281,13 @@ export default Controller.extend(ModalFunctionality, {
       : later.add(30, "minutes").startOf("hour");
   },
 
+  laterThisWeek() {
+    if (!this.showLaterThisWeek) {
+      return;
+    }
+    return this.startOfDay(this.now().add(2, "days"));
+  },
+
   handleSaveError(e) {
     this.isSavingBookmarkManually = false;
     if (typeof e === "string") {
diff --git a/app/assets/javascripts/discourse/templates/components/tap-tile.hbs b/app/assets/javascripts/discourse/templates/components/tap-tile.hbs
index 4e04200945..df17a2fd98 100644
--- a/app/assets/javascripts/discourse/templates/components/tap-tile.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tap-tile.hbs
@@ -1,2 +1,2 @@
 {{d-icon icon}}
-{{text}}
+{{ yield }}
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 2fa0345732..5a1082c711 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -21,21 +21,51 @@
       {{#if userHasTimezoneSet}}
         {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
           {{#if showAtDesktop}}
-            {{tap-tile icon="desktop" text=(i18n "bookmarks.reminders.at_desktop") tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{#tap-tile icon="desktop" tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              {{i18n "bookmarks.reminders.at_desktop"}}
+            {{/tap-tile}}
           {{/if}}
 
           {{#if showLaterToday}}
-            {{tap-tile icon="far-moon" text=laterTodayFormatted tileId=reminderTypes.LATER_TODAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{#tap-tile icon="far-moon" tileId=reminderTypes.LATER_TODAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              {{i18n "bookmarks.reminders.later_today"}}<br>
+              {{laterTodayFormatted}}
+            {{/tap-tile}}
           {{/if}}
-          {{tap-tile icon="briefcase" text=nextBusinessDayFormatted tileId=reminderTypes.NEXT_BUSINESS_DAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-          {{tap-tile icon="far-sun" text=tomorrowFormatted tileId=reminderTypes.TOMORROW activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-          {{tap-tile icon="far-clock" text=nextWeekFormatted tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-          {{tap-tile icon="far-calendar-plus" text=nextMonthFormatted tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-          {{tap-tile icon="calendar-alt" text=(I18n "bookmarks.reminders.custom") tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+          {{#tap-tile icon="far-sun" tileId=reminderTypes.TOMORROW activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{i18n "bookmarks.reminders.tomorrow"}}<br>
+            {{tomorrowFormatted}}
+          {{/tap-tile}}
+          {{#if showLaterThisWeek}}
+            {{#tap-tile icon="angle-double-right" tileId=reminderTypes.LATER_THIS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              {{i18n "bookmarks.reminders.later_this_week"}}<br>
+              {{laterThisWeekFormatted}}
+            {{/tap-tile}}
+          {{/if}}
+          {{#tap-tile icon="briefcase" tileId=reminderTypes.START_OF_NEXT_BUSINESS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{i18n "bookmarks.reminders.start_of_next_business_week"}}<br>
+            {{startNextBusinessWeekFormatted}}
+          {{/tap-tile}}
+          {{#tap-tile icon="far-clock" tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{i18n "bookmarks.reminders.next_week"}}<br>
+            {{nextWeekFormatted}}
+          {{/tap-tile}}
+          {{#tap-tile icon="far-calendar-plus" tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{i18n "bookmarks.reminders.next_month"}}<br>
+            {{nextMonthFormatted}}
+          {{/tap-tile}}
+          {{#tap-tile icon="calendar-alt" tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{i18n "bookmarks.reminders.custom"}}
+          {{/tap-tile}}
           {{#if showLastCustom}}
-            {{tap-tile icon="undo" text=lastCustomFormatted tileId=reminderTypes.LAST_CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{#tap-tile icon="undo" tileId=reminderTypes.LAST_CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              {{i18n "bookmarks.reminders.last_custom"}}<br>
+              {{lastCustomFormatted}}
+            {{/tap-tile}}
           {{/if}}
-          {{tap-tile icon="ban" text=(I18n "bookmarks.reminders.none") tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+          {{#tap-tile icon="ban" tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            {{i18n "bookmarks.reminders.none"}}
+          {{/tap-tile}}
         {{/tap-tile-grid}}
         {{#if customDateTimeSelected}}
           <div class="control-group custom-date-time-wrap">
diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js b/app/assets/javascripts/discourse/widgets/user-menu.js
index 6f4b5c323c..1198729726 100644
--- a/app/assets/javascripts/discourse/widgets/user-menu.js
+++ b/app/assets/javascripts/discourse/widgets/user-menu.js
@@ -56,13 +56,16 @@ createWidget("user-menu-links", {
   },
 
   bookmarksGlyph() {
+    let path = this.siteSettings.enable_bookmarks_with_reminders
+      ? "bookmarks-with-reminders"
+      : "bookmarks";
     return {
       action: UserMenuAction.QUICK_ACCESS,
       actionParam: QuickAccess.BOOKMARKS,
       label: "user.bookmarks",
       className: "user-bookmarks-link",
       icon: "bookmark",
-      href: `${this.attrs.path}/activity/bookmarks`
+      href: `${this.attrs.path}/activity/${path}`
     };
   },
 
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index 198895fa5c..f34e58c695 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -67,7 +67,9 @@ class Bookmark < ActiveRecord::Base
       tomorrow: 3,
       next_week: 4,
       next_month: 5,
-      custom: 6
+      custom: 6,
+      start_of_next_business_week: 7,
+      later_this_week: 8
     )
   end
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e9bbb29609..289e14161b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -316,13 +316,15 @@ en:
       list_permission_denied: "You do not have permission to view this user's bookmarks."
       reminders:
         at_desktop: "Next time I'm at my desktop"
-        later_today: "Later today <br/>{{date}}"
-        next_business_day: "Next business day <br/>{{date}}"
-        tomorrow: "Tomorrow <br/>{{date}}"
-        next_week: "Next week <br/>{{date}}"
-        next_month: "Next month <br/>{{date}}"
+        later_today: "Later today"
+        next_business_day: "Next business day"
+        tomorrow: "Tomorrow"
+        next_week: "Next week"
+        later_this_week: "Later this week"
+        start_of_next_business_week: "Next Monday"
+        next_month: "Next month"
         custom: "Custom date and time"
-        last_custom: "Last <br/>{{date}}"
+        last_custom: "Last"
         none: "No reminder needed"
 
     drafts:
diff --git a/test/javascripts/controllers/bookmark-test.js b/test/javascripts/controllers/bookmark-test.js
index c517ad2a89..84d323d382 100644
--- a/test/javascripts/controllers/bookmark-test.js
+++ b/test/javascripts/controllers/bookmark-test.js
@@ -6,6 +6,7 @@ moduleFor("controller:bookmark", {
   beforeEach() {
     logIn();
     BookmarkController = this.subject({ currentUser: User.current() });
+    BookmarkController.onShow();
   },
 
   afterEach() {
@@ -58,54 +59,34 @@ QUnit.test("nextMonth gets next month correctly", function(assert) {
   );
 });
 
-QUnit.test(
-  "nextBusinessDay gets next business day of monday correctly if today is friday",
-  function(assert) {
-    mockMomentTz("2019-12-13T08:00:00");
+QUnit.test("laterThisWeek gets 2 days from now", function(assert) {
+  mockMomentTz("2019-12-10T08:00:00");
 
-    assert.equal(
-      BookmarkController.nextBusinessDay().format("YYYY-MM-DD"),
-      "2019-12-16"
-    );
-  }
-);
+  assert.equal(
+    BookmarkController.laterThisWeek().format("YYYY-MM-DD"),
+    "2019-12-12"
+  );
+});
 
-QUnit.test(
-  "nextBusinessDay gets next business day of monday correctly if today is saturday",
-  function(assert) {
-    mockMomentTz("2019-12-14T08:00:00");
+QUnit.test("laterThisWeek returns null if we are at Thursday already", function(
+  assert
+) {
+  mockMomentTz("2019-12-12T08:00:00");
 
-    assert.equal(
-      BookmarkController.nextBusinessDay().format("YYYY-MM-DD"),
-      "2019-12-16"
-    );
-  }
-);
+  assert.equal(BookmarkController.laterThisWeek(), null);
+});
 
-QUnit.test(
-  "nextBusinessDay gets next business day of monday correctly if today is sunday",
-  function(assert) {
-    mockMomentTz("2019-12-15T08:00:00");
+QUnit.test("showLaterThisWeek returns true if < Thursday", function(assert) {
+  mockMomentTz("2019-12-10T08:00:00");
 
-    assert.equal(
-      BookmarkController.nextBusinessDay().format("YYYY-MM-DD"),
-      "2019-12-16"
-    );
-  }
-);
+  assert.equal(BookmarkController.showLaterThisWeek, true);
+});
 
-QUnit.test(
-  "nextBusinessDay gets next business day of thursday correctly if today is wednesday",
-  function(assert) {
-    mockMomentTz("2019-12-11T08:00:00");
-
-    assert.equal(
-      BookmarkController.nextBusinessDay().format("YYYY-MM-DD"),
-      "2019-12-12"
-    );
-  }
-);
+QUnit.test("showLaterThisWeek returns false if > Thursday", function(assert) {
+  mockMomentTz("2019-12-12T08:00:00");
 
+  assert.equal(BookmarkController.showLaterThisWeek, false);
+});
 QUnit.test("tomorrow gets tomorrow correctly", function(assert) {
   mockMomentTz("2019-12-11T08:00:00");
 
@@ -154,6 +135,27 @@ QUnit.test(
   }
 );
 
+QUnit.test(
+  "reminderAt - custom - defaults to 8:00am if the time is not selected",
+  function(assert) {
+    BookmarkController.customReminderDate = "2028-12-12";
+    BookmarkController.selectedReminderType =
+      BookmarkController.reminderTypes.CUSTOM;
+    const reminderAt = BookmarkController.reminderAt();
+    assert.equal(BookmarkController.customReminderTime, "08:00");
+    assert.equal(
+      reminderAt.toString(),
+      moment
+        .tz(
+          "2028-12-12 08:00",
+          BookmarkController.currentUser.resolvedTimezone()
+        )
+        .toString(),
+      "the custom date and time are parsed correctly with default time"
+    );
+  }
+);
+
 QUnit.test(
   "loadLastUsedCustomReminderDatetime fills the custom reminder date + time if present in localStorage",
   function(assert) {

From 37bf38f801408035c53faeb8667c445d6f5e48e6 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 2 Apr 2020 05:59:35 +0530
Subject: [PATCH 0482/1830] FIX: removing a timer with `duration` doesn't work.

---
 .../discourse/controllers/edit-topic-timer.js          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js
index 461fa3c64d..926c2492b9 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js
@@ -76,15 +76,15 @@ export default Controller.extend(ModalFunctionality, {
     return "true" === isPublic ? publicTopicTimer : privateTopicTimer;
   },
 
-  _setTimer(time, duration, statusType) {
+  _setTimer(time, duration, statusType, basedOnLastPost, categoryId) {
     this.set("loading", true);
 
     TopicTimer.updateStatus(
       this.get("model.id"),
       time,
-      this.get("topicTimer.based_on_last_post"),
+      basedOnLastPost,
       statusType,
-      this.get("topicTimer.category_id"),
+      categoryId,
       duration
     )
       .then(result => {
@@ -155,7 +155,9 @@ export default Controller.extend(ModalFunctionality, {
       this._setTimer(
         this.get("topicTimer.updateTime"),
         this.get("topicTimer.duration"),
-        this.get("topicTimer.status_type")
+        this.get("topicTimer.status_type"),
+        this.get("topicTimer.based_on_last_post"),
+        this.get("topicTimer.category_id")
       );
     },
 

From 8a50ab45aaed7b7d52ec3735765e60b4cefd2e30 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 2 Apr 2020 16:01:38 +1100
Subject: [PATCH 0483/1830] DEV: use REPORT_REQUESTS=1 to find all requests

We can use this to profile our pretender and ensure nothing is superfluous
and nothing is missing
---
 lib/tasks/qunit.rake            |  8 ++++++--
 test/javascripts/test_helper.js | 10 ++++++++++
 test/run-qunit.js               |  7 +++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/qunit.rake b/lib/tasks/qunit.rake
index a233c56dfd..2c4e965e1f 100644
--- a/lib/tasks/qunit.rake
+++ b/lib/tasks/qunit.rake
@@ -24,6 +24,8 @@ task "qunit:test", [:timeout, :qunit_path] do |_, args|
     abort "Yarn is not installed. Download from https://yarnpkg.com/lang/en/docs/install/"
   end
 
+  report_requests = ENV['REPORT_REQUESTS'] == "1"
+
   system("yarn install --dev")
 
   # ensure we have this port available
@@ -63,10 +65,12 @@ task "qunit:test", [:timeout, :qunit_path] do |_, args|
       options[arg] = ENV[arg.upcase] if ENV[arg.upcase].present?
     end
 
-    if options.present?
-      cmd += "?#{options.to_query.gsub('+', '%20').gsub("&", '\\\&')}"
+    if report_requests
+      options['report_requests'] = '1'
     end
 
+    cmd += "?#{options.to_query.gsub('+', '%20').gsub("&", '\\\&')}"
+
     if args[:timeout].present?
       cmd += " #{args[:timeout]}"
     end
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 77598e4712..0f2fd5ec0a 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -117,7 +117,17 @@ QUnit.testStart(function(ctx) {
     return body;
   };
 
+  if (QUnit.config.logAllRequests) {
+    server.handledRequest = function(verb, path, request) {
+      console.log("REQ: " + verb + " " + path);
+    };
+  }
+
   server.unhandledRequest = function(verb, path) {
+    if (QUnit.config.logAllRequests) {
+      console.log("REQ: " + verb + " " + path + " missing");
+    }
+
     const error =
       "Unhandled request in test environment: " + path + " (" + verb + ")";
     window.console.error(error);
diff --git a/test/run-qunit.js b/test/run-qunit.js
index 57a0676b47..905745b6b5 100644
--- a/test/run-qunit.js
+++ b/test/run-qunit.js
@@ -112,6 +112,13 @@ async function runAllTests() {
     await Runtime.evaluate({
       expression: `(${qunit_script})()`
     });
+
+    if (args[0].indexOf("report_requests=1") > -1) {
+      await Runtime.evaluate({
+        expression: "QUnit.config.logAllRequests = true"
+      });
+    }
+
     const timeout = parseInt(args[1] || 300000, 10);
     var start = Date.now();
 

From a91843f0dc7b97e700dc85505404eafd62b7f8c5 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Mon, 30 Mar 2020 12:01:06 +0100
Subject: [PATCH 0484/1830] REFACTOR: Move the multisite middleware to the
 front

Both request tracking and message bus rely on multisite before the
middleware has run which is not ideal.
---
 ...st_tracker.rb => 200-first_middlewares.rb} | 17 ++++++++++++++--
 .../freedom_patches/rails_multisite.rb        |  8 --------
 lib/middleware/request_tracker.rb             | 20 ++++++-------------
 3 files changed, 21 insertions(+), 24 deletions(-)
 rename config/initializers/{200-message_bus_request_tracker.rb => 200-first_middlewares.rb} (58%)
 rename config/initializers/004-rails_multisite.rb => lib/freedom_patches/rails_multisite.rb (77%)

diff --git a/config/initializers/200-message_bus_request_tracker.rb b/config/initializers/200-first_middlewares.rb
similarity index 58%
rename from config/initializers/200-message_bus_request_tracker.rb
rename to config/initializers/200-first_middlewares.rb
index c0ebcfcb1b..6ae5816fba 100644
--- a/config/initializers/200-message_bus_request_tracker.rb
+++ b/config/initializers/200-first_middlewares.rb
@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
-# we want MesageBus in the absolute front
+# we want MesageBus to be close to the front
 # this is important cause the vast majority of web requests go to it
 # this allows us to avoid full middleware crawls each time
-# Pending https://github.com/rails/rails/pull/27936
+#
+# We aren't manipulating the middleware stack directly because of
+# https://github.com/rails/rails/pull/27936
 session_operations = Rails::Configuration::MiddlewareStackProxy.new([
    [:delete, MessageBus::Rack::Middleware],
    [:unshift, MessageBus::Rack::Middleware],
@@ -21,3 +23,14 @@ if Rails.env != 'development' || ENV['TRACK_REQUESTS']
     MethodProfiler.ensure_discourse_instrumentation!
   end
 end
+
+if Rails.configuration.multisite
+  # Multisite needs to be first, because the request tracker and message bus
+  # rely on it
+  session_operations = Rails::Configuration::MiddlewareStackProxy.new([
+     [:delete, RailsMultisite::Middleware],
+     [:unshift, RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config],
+  ])
+
+  Rails.configuration.middleware = Rails.configuration.middleware + session_operations
+end
diff --git a/config/initializers/004-rails_multisite.rb b/lib/freedom_patches/rails_multisite.rb
similarity index 77%
rename from config/initializers/004-rails_multisite.rb
rename to lib/freedom_patches/rails_multisite.rb
index 21543492ea..c4627daa2a 100644
--- a/config/initializers/004-rails_multisite.rb
+++ b/lib/freedom_patches/rails_multisite.rb
@@ -26,11 +26,3 @@ module RailsMultisite
     end
   end
 end
-
-if Rails.configuration.multisite
-  Rails.configuration.middleware.swap(
-    RailsMultisite::Middleware,
-    RailsMultisite::Middleware,
-    RailsMultisite::DiscoursePatches.config
-  )
-end
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 41ad8a60b4..4fbe3d1b2a 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -51,14 +51,6 @@ class Middleware::RequestTracker
     @app = app
   end
 
-  def self.log_request_on_site(data, host)
-    RailsMultisite::ConnectionManagement.with_hostname(host) do
-      unless Discourse.pg_readonly_mode?
-        log_request(data)
-      end
-    end
-  end
-
   def self.log_request(data)
     status = data[:status]
     track_view = data[:track_view]
@@ -135,7 +127,6 @@ class Middleware::RequestTracker
 
     # we got to skip this on error ... its just logging
     data = self.class.get_data(env, result, info) rescue nil
-    host = RailsMultisite::ConnectionManagement.host(env)
 
     if data
       if result && (headers = result[1])
@@ -146,7 +137,7 @@ class Middleware::RequestTracker
         @@detailed_request_loggers.each { |logger| logger.call(env, data) }
       end
 
-      log_later(data, host)
+      log_later(data)
     end
 
   end
@@ -296,10 +287,11 @@ class Middleware::RequestTracker
     end
   end
 
-  def log_later(data, host)
-    Scheduler::Defer.later("Track view", _db = nil) do
-      self.class.log_request_on_site(data, host)
+  def log_later(data)
+    Scheduler::Defer.later("Track view") do
+      unless Discourse.pg_readonly_mode?
+        self.class.log_request(data)
+      end
     end
   end
-
 end

From 41510d5b8410badbfca8928caed19bf403495169 Mon Sep 17 00:00:00 2001
From: Zdravko Curic <zcuric@users.noreply.github.com>
Date: Thu, 2 Apr 2020 15:54:51 +0200
Subject: [PATCH 0485/1830] FIX: jQuery deprecation warning (#9331)

---
 app/assets/javascripts/discourse-common/lib/icon-library.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse-common/lib/icon-library.js b/app/assets/javascripts/discourse-common/lib/icon-library.js
index dab500bbdf..047cbd854c 100644
--- a/app/assets/javascripts/discourse-common/lib/icon-library.js
+++ b/app/assets/javascripts/discourse-common/lib/icon-library.js
@@ -1,6 +1,7 @@
 import { h } from "virtual-dom";
 import attributeHook from "discourse-common/lib/attribute-hook";
 import deprecated from "discourse-common/lib/deprecated";
+import jQuery from "jquery";
 
 const SVG_NAMESPACE = "http://www.w3.org/2000/svg";
 let _renderers = [];
@@ -594,7 +595,7 @@ function warnIfDeprecated(oldId, newId) {
       stacktrace: Error().stack
     };
 
-    Ember.$.ajax(`${Discourse.BaseUri}/logs/report_js_error`, {
+    jQuery.ajax(`${Discourse.BaseUri}/logs/report_js_error`, {
       data: errorData,
       type: "POST",
       cache: false

From ca1208a63669d4d4ad7452367008d40fa090f645 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Thu, 2 Apr 2020 15:19:42 +0100
Subject: [PATCH 0486/1830] Revert "REFACTOR: Move the multisite middleware to
 the front"

Looks like this is causing problems.

Follow-up-to: a91843f0dc7b97e700dc85505404eafd62b7f8c5
---
 .../initializers/004-rails_multisite.rb       |  8 ++++++++
 ....rb => 200-message_bus_request_tracker.rb} | 17 ++--------------
 lib/middleware/request_tracker.rb             | 20 +++++++++++++------
 3 files changed, 24 insertions(+), 21 deletions(-)
 rename lib/freedom_patches/rails_multisite.rb => config/initializers/004-rails_multisite.rb (77%)
 rename config/initializers/{200-first_middlewares.rb => 200-message_bus_request_tracker.rb} (58%)

diff --git a/lib/freedom_patches/rails_multisite.rb b/config/initializers/004-rails_multisite.rb
similarity index 77%
rename from lib/freedom_patches/rails_multisite.rb
rename to config/initializers/004-rails_multisite.rb
index c4627daa2a..21543492ea 100644
--- a/lib/freedom_patches/rails_multisite.rb
+++ b/config/initializers/004-rails_multisite.rb
@@ -26,3 +26,11 @@ module RailsMultisite
     end
   end
 end
+
+if Rails.configuration.multisite
+  Rails.configuration.middleware.swap(
+    RailsMultisite::Middleware,
+    RailsMultisite::Middleware,
+    RailsMultisite::DiscoursePatches.config
+  )
+end
diff --git a/config/initializers/200-first_middlewares.rb b/config/initializers/200-message_bus_request_tracker.rb
similarity index 58%
rename from config/initializers/200-first_middlewares.rb
rename to config/initializers/200-message_bus_request_tracker.rb
index 6ae5816fba..c0ebcfcb1b 100644
--- a/config/initializers/200-first_middlewares.rb
+++ b/config/initializers/200-message_bus_request_tracker.rb
@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-# we want MesageBus to be close to the front
+# we want MesageBus in the absolute front
 # this is important cause the vast majority of web requests go to it
 # this allows us to avoid full middleware crawls each time
-#
-# We aren't manipulating the middleware stack directly because of
-# https://github.com/rails/rails/pull/27936
+# Pending https://github.com/rails/rails/pull/27936
 session_operations = Rails::Configuration::MiddlewareStackProxy.new([
    [:delete, MessageBus::Rack::Middleware],
    [:unshift, MessageBus::Rack::Middleware],
@@ -23,14 +21,3 @@ if Rails.env != 'development' || ENV['TRACK_REQUESTS']
     MethodProfiler.ensure_discourse_instrumentation!
   end
 end
-
-if Rails.configuration.multisite
-  # Multisite needs to be first, because the request tracker and message bus
-  # rely on it
-  session_operations = Rails::Configuration::MiddlewareStackProxy.new([
-     [:delete, RailsMultisite::Middleware],
-     [:unshift, RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config],
-  ])
-
-  Rails.configuration.middleware = Rails.configuration.middleware + session_operations
-end
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 4fbe3d1b2a..41ad8a60b4 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -51,6 +51,14 @@ class Middleware::RequestTracker
     @app = app
   end
 
+  def self.log_request_on_site(data, host)
+    RailsMultisite::ConnectionManagement.with_hostname(host) do
+      unless Discourse.pg_readonly_mode?
+        log_request(data)
+      end
+    end
+  end
+
   def self.log_request(data)
     status = data[:status]
     track_view = data[:track_view]
@@ -127,6 +135,7 @@ class Middleware::RequestTracker
 
     # we got to skip this on error ... its just logging
     data = self.class.get_data(env, result, info) rescue nil
+    host = RailsMultisite::ConnectionManagement.host(env)
 
     if data
       if result && (headers = result[1])
@@ -137,7 +146,7 @@ class Middleware::RequestTracker
         @@detailed_request_loggers.each { |logger| logger.call(env, data) }
       end
 
-      log_later(data)
+      log_later(data, host)
     end
 
   end
@@ -287,11 +296,10 @@ class Middleware::RequestTracker
     end
   end
 
-  def log_later(data)
-    Scheduler::Defer.later("Track view") do
-      unless Discourse.pg_readonly_mode?
-        self.class.log_request(data)
-      end
+  def log_later(data, host)
+    Scheduler::Defer.later("Track view", _db = nil) do
+      self.class.log_request_on_site(data, host)
     end
   end
+
 end

From ef7753953d7def6b0a5ae00d6858f540d6334108 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 2 Apr 2020 20:35:35 +0530
Subject: [PATCH 0487/1830] FIX: show today's date on /top page period chooser

---
 app/assets/javascripts/discourse/templates/discovery/topics.hbs | 2 +-
 .../javascripts/discourse/templates/mobile/discovery/topics.hbs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index 5413f9d9bf..208de9a709 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -39,7 +39,7 @@
 {{#discovery-topics-list model=model refresh=(action "refresh") incomingCount=topicTrackingState.incomingCount as |discoveryTopicList|}}
   {{#if top}}
     <div class='top-lists'>
-      {{period-chooser period=period action=(action "changePeriod")}}
+      {{period-chooser period=period action=(action "changePeriod") fullDay=false}}
     </div>
   {{else}}
     {{#if topicTrackingState.hasIncoming}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
index 01527f451b..394aea6d86 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
@@ -1,7 +1,7 @@
 {{#discovery-topics-list model=model refresh=(action "refresh") incomingCount=topicTrackingState.incomingCount as |discoveryTopicList|}}
   {{#if top}}
     <div class='top-lists'>
-      {{period-chooser period=period action=(action "changePeriod")}}
+      {{period-chooser period=period action=(action "changePeriod") fullDay=false}}
     </div>
   {{else}}
     {{#if topicTrackingState.hasIncoming}}

From 724d2e99de9ed0d5331eb67458e2ab3f0d978d98 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 2 Apr 2020 11:16:38 -0400
Subject: [PATCH 0488/1830] DEV: Only include "report-sample" CSP directive
 when reporting is enabled (#9337)

---
 app/controllers/csp_reports_controller.rb    | 2 +-
 lib/content_security_policy/default.rb       | 2 +-
 spec/lib/content_security_policy_spec.rb     | 7 ++++++-
 spec/requests/csp_reports_controller_spec.rb | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/controllers/csp_reports_controller.rb b/app/controllers/csp_reports_controller.rb
index b0b1091270..30824e3536 100644
--- a/app/controllers/csp_reports_controller.rb
+++ b/app/controllers/csp_reports_controller.rb
@@ -6,7 +6,7 @@ class CspReportsController < ApplicationController
     raise Discourse::NotFound unless report_collection_enabled?
 
     Logster.add_to_env(request.env, 'CSP Report', report)
-    Rails.logger.warn("CSP Violation: '#{report['blocked-uri']}'")
+    Rails.logger.warn("CSP Violation: '#{report['blocked-uri']}' \n\n#{report['script-sample']}")
 
     head :ok
   end
diff --git a/lib/content_security_policy/default.rb b/lib/content_security_policy/default.rb
index d2f92f20b5..78ca564815 100644
--- a/lib/content_security_policy/default.rb
+++ b/lib/content_security_policy/default.rb
@@ -48,12 +48,12 @@ class ContentSecurityPolicy
 
     def script_src
       [
-        :report_sample,
         "#{base_url}/logs/",
         "#{base_url}/sidekiq/",
         "#{base_url}/mini-profiler-resources/",
         *script_assets
       ].tap do |sources|
+        sources << :report_sample if SiteSetting.content_security_policy_collect_reports
         sources << :unsafe_eval if Rails.env.development? # TODO remove this once we have proper source maps in dev
         sources << 'https://www.google-analytics.com/analytics.js' if SiteSetting.ga_universal_tracking_code.present?
         sources << 'https://www.googletagmanager.com/gtm.js' if SiteSetting.gtm_container_id.present?
diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index fcbf5ece2c..68a5dc2da2 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -46,7 +46,6 @@ describe ContentSecurityPolicy do
     it 'always has self, logster, sidekiq, and assets' do
       script_srcs = parse(policy)['script-src']
       expect(script_srcs).to include(*%w[
-        'report-sample'
         http://test.localhost/logs/
         http://test.localhost/sidekiq/
         http://test.localhost/mini-profiler-resources/
@@ -61,6 +60,12 @@ describe ContentSecurityPolicy do
       ])
     end
 
+    it 'includes "report-sample" when report collection is enabled' do
+      SiteSetting.content_security_policy_collect_reports = true
+      script_srcs = parse(policy)['script-src']
+      expect(script_srcs).to include("'report-sample'")
+    end
+
     it 'whitelists Google Analytics and Tag Manager when integrated' do
       SiteSetting.ga_universal_tracking_code = 'UA-12345678-9'
       SiteSetting.gtm_container_id = 'GTM-ABCDEF'
diff --git a/spec/requests/csp_reports_controller_spec.rb b/spec/requests/csp_reports_controller_spec.rb
index 2c3bfe521d..07e8aeafb4 100644
--- a/spec/requests/csp_reports_controller_spec.rb
+++ b/spec/requests/csp_reports_controller_spec.rb
@@ -29,7 +29,7 @@ describe CspReportsController do
           "line-number": 25,
           "source-file": "http://localhost:3000/",
           "status-code": 200,
-          "script-sample": ""
+          "script-sample": "console.log('unsafe')"
         }
       }.to_json, headers: { "Content-Type": "application/csp-report" }
     end
@@ -52,7 +52,7 @@ describe CspReportsController do
 
     it 'logs the violation report' do
       send_report
-      expect(Rails.logger.warnings).to include("CSP Violation: 'http://suspicio.us/assets.js'")
+      expect(Rails.logger.warnings).to include("CSP Violation: 'http://suspicio.us/assets.js' \n\nconsole.log('unsafe')")
     end
   end
 end

From bca126f3f523d5667fe0f92c2a29c68f438103bb Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Mon, 30 Mar 2020 12:01:06 +0100
Subject: [PATCH 0489/1830] REFACTOR: Move the multisite middleware to the
 front

Both request tracking and message bus rely on multisite before the
middleware has run which is not ideal.

Follow-up-to: ca1208a63669d4d4ad7452367008d40fa090f645
---
 ...st_tracker.rb => 200-first_middlewares.rb} | 17 ++++++++++++++--
 .../freedom_patches/rails_multisite.rb        |  8 --------
 lib/middleware/request_tracker.rb             | 20 ++++++-------------
 3 files changed, 21 insertions(+), 24 deletions(-)
 rename config/initializers/{200-message_bus_request_tracker.rb => 200-first_middlewares.rb} (58%)
 rename config/initializers/004-rails_multisite.rb => lib/freedom_patches/rails_multisite.rb (77%)

diff --git a/config/initializers/200-message_bus_request_tracker.rb b/config/initializers/200-first_middlewares.rb
similarity index 58%
rename from config/initializers/200-message_bus_request_tracker.rb
rename to config/initializers/200-first_middlewares.rb
index c0ebcfcb1b..2647fd039a 100644
--- a/config/initializers/200-message_bus_request_tracker.rb
+++ b/config/initializers/200-first_middlewares.rb
@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
-# we want MesageBus in the absolute front
+# we want MesageBus to be close to the front
 # this is important cause the vast majority of web requests go to it
 # this allows us to avoid full middleware crawls each time
-# Pending https://github.com/rails/rails/pull/27936
+#
+# We aren't manipulating the middleware stack directly because of
+# https://github.com/rails/rails/pull/27936
 session_operations = Rails::Configuration::MiddlewareStackProxy.new([
    [:delete, MessageBus::Rack::Middleware],
    [:unshift, MessageBus::Rack::Middleware],
@@ -21,3 +23,14 @@ if Rails.env != 'development' || ENV['TRACK_REQUESTS']
     MethodProfiler.ensure_discourse_instrumentation!
   end
 end
+
+if Rails.configuration.multisite
+  # Multisite needs to be first, because the request tracker and message bus
+  # rely on it
+  session_operations = Rails::Configuration::MiddlewareStackProxy.new([
+     [:delete, RailsMultisite::Middleware],
+     [:unshift, [RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config]],
+  ])
+
+  Rails.configuration.middleware = Rails.configuration.middleware + session_operations
+end
diff --git a/config/initializers/004-rails_multisite.rb b/lib/freedom_patches/rails_multisite.rb
similarity index 77%
rename from config/initializers/004-rails_multisite.rb
rename to lib/freedom_patches/rails_multisite.rb
index 21543492ea..c4627daa2a 100644
--- a/config/initializers/004-rails_multisite.rb
+++ b/lib/freedom_patches/rails_multisite.rb
@@ -26,11 +26,3 @@ module RailsMultisite
     end
   end
 end
-
-if Rails.configuration.multisite
-  Rails.configuration.middleware.swap(
-    RailsMultisite::Middleware,
-    RailsMultisite::Middleware,
-    RailsMultisite::DiscoursePatches.config
-  )
-end
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 41ad8a60b4..4fbe3d1b2a 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -51,14 +51,6 @@ class Middleware::RequestTracker
     @app = app
   end
 
-  def self.log_request_on_site(data, host)
-    RailsMultisite::ConnectionManagement.with_hostname(host) do
-      unless Discourse.pg_readonly_mode?
-        log_request(data)
-      end
-    end
-  end
-
   def self.log_request(data)
     status = data[:status]
     track_view = data[:track_view]
@@ -135,7 +127,6 @@ class Middleware::RequestTracker
 
     # we got to skip this on error ... its just logging
     data = self.class.get_data(env, result, info) rescue nil
-    host = RailsMultisite::ConnectionManagement.host(env)
 
     if data
       if result && (headers = result[1])
@@ -146,7 +137,7 @@ class Middleware::RequestTracker
         @@detailed_request_loggers.each { |logger| logger.call(env, data) }
       end
 
-      log_later(data, host)
+      log_later(data)
     end
 
   end
@@ -296,10 +287,11 @@ class Middleware::RequestTracker
     end
   end
 
-  def log_later(data, host)
-    Scheduler::Defer.later("Track view", _db = nil) do
-      self.class.log_request_on_site(data, host)
+  def log_later(data)
+    Scheduler::Defer.later("Track view") do
+      unless Discourse.pg_readonly_mode?
+        self.class.log_request(data)
+      end
     end
   end
-
 end

From 76610acb6fec91fc8087bed670c9f3277227559f Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Thu, 2 Apr 2020 18:25:41 +0100
Subject: [PATCH 0490/1830] FIX: Default to light theme in wizard so that
 previews are displayed

Previously, without a theme selection, the previews wouldn't show.
---
 lib/wizard/builder.rb                         |  2 +-
 spec/components/wizard/wizard_builder_spec.rb | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/wizard/builder.rb b/lib/wizard/builder.rb
index a8727bdde8..40318d8aa9 100644
--- a/lib/wizard/builder.rb
+++ b/lib/wizard/builder.rb
@@ -155,7 +155,7 @@ class Wizard
           id: 'theme_previews',
           type: 'component',
           required: !default_theme_override,
-          value: scheme_id
+          value: scheme_id || ColorScheme::LIGHT_THEME_ID
         )
 
         # fix for the case when base_scheme is nil
diff --git a/spec/components/wizard/wizard_builder_spec.rb b/spec/components/wizard/wizard_builder_spec.rb
index 88cb9512f6..b63ed9c94a 100644
--- a/spec/components/wizard/wizard_builder_spec.rb
+++ b/spec/components/wizard/wizard_builder_spec.rb
@@ -176,14 +176,26 @@ describe Wizard::Builder do
       end
     end
 
-    describe "when the default theme has been override" do
+    describe "when the default theme has been overridden by a theme without a color scheme" do
       before do
         theme.set_default!
       end
 
       it 'should set the right default values' do
         expect(field.required).to eq(false)
-        expect(field.value).to eq(nil)
+        expect(field.value).to eq("Light")
+      end
+    end
+
+    describe "when the default theme has been overridden by a theme with a color scheme" do
+      before do
+        theme.update(color_scheme_id: ColorScheme.find_by_name("Dark").id)
+        theme.set_default!
+      end
+
+      it 'should set the right default values' do
+        expect(field.required).to eq(false)
+        expect(field.value).to eq("Dark")
       end
     end
   end

From e7e931b70b5790a71d41893834d5e8c9945c92df Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 3 Apr 2020 00:08:29 +0530
Subject: [PATCH 0491/1830] FIX: track links in onebox body if it's same as
 header link.

---
 app/assets/javascripts/discourse/lib/click-track.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/assets/javascripts/discourse/lib/click-track.js b/app/assets/javascripts/discourse/lib/click-track.js
index 534c04a6c4..31bf961ab4 100644
--- a/app/assets/javascripts/discourse/lib/click-track.js
+++ b/app/assets/javascripts/discourse/lib/click-track.js
@@ -18,6 +18,13 @@ export function isValidLink($link) {
     return false;
   }
 
+  if ($link.closest(".onebox-result, .onebox-body").length) {
+    const $a = $link.closest(".onebox").find("header a");
+    if ($a[0] && $a[0].href === $link[0].href) {
+      return true;
+    }
+  }
+
   return (
     $link.hasClass("track-link") ||
     $link.closest(".hashtag, .badge-category, .onebox-result, .onebox-body")

From 9c43963ff3c4ba3c04764ddccf5dee0f4876ec61 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 2 Apr 2020 21:19:31 +0200
Subject: [PATCH 0492/1830] FIX: allows color-input to set hex and color names
 through input (#9339)

---
 app/assets/javascripts/admin/components/color-input.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/components/color-input.js b/app/assets/javascripts/admin/components/color-input.js
index 44fe738b43..d1b6102c61 100644
--- a/app/assets/javascripts/admin/components/color-input.js
+++ b/app/assets/javascripts/admin/components/color-input.js
@@ -24,8 +24,7 @@ export default Component.extend({
 
   @action
   onHexInput(color) {
-    this.attrs.onChangeColor &&
-      this.attrs.onChangeColor((color || "").replace(/^#/, ""));
+    this.attrs.onChangeColor && this.attrs.onChangeColor(color || "");
   },
 
   @observes("hexValue", "brightnessValue", "valid")

From 2f9879a9a134f3b9bf17489dce977e1655df5d37 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 3 Apr 2020 07:32:50 +0530
Subject: [PATCH 0493/1830] FIX: move total rows count & load more URL inside
 meta.

We're fetching "total rows count" from root attributes only if meta object not found. https://github.com/discourse/discourse/blob/2b78bd01ab2431aa90b642326d170df7c51e492b/app/assets/javascripts/discourse/models/store.js#L236
---
 app/controllers/directory_items_controller.rb    |  9 ++++++---
 spec/requests/directory_items_controller_spec.rb | 14 +++++++-------
 test/javascripts/fixtures/directory-fixtures.js  |  9 ++++++---
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/controllers/directory_items_controller.rb b/app/controllers/directory_items_controller.rb
index 9acc1a24eb..d01d71b5d8 100644
--- a/app/controllers/directory_items_controller.rb
+++ b/app/controllers/directory_items_controller.rb
@@ -81,8 +81,11 @@ class DirectoryItemsController < ApplicationController
 
     last_updated_at = DirectoryItem.last_updated_at(period_type)
     render_json_dump(directory_items: serialize_data(result, DirectoryItemSerializer),
-                     meta: { last_updated_at: last_updated_at },
-                     total_rows_directory_items: result_count,
-                     load_more_directory_items: directory_items_path(more_params))
+                     meta: {
+                        last_updated_at: last_updated_at,
+                        total_rows_directory_items: result_count,
+                        load_more_directory_items: directory_items_path(more_params)
+                      }
+                    )
   end
 end
diff --git a/spec/requests/directory_items_controller_spec.rb b/spec/requests/directory_items_controller_spec.rb
index 8dc0ccabce..31f416f6d4 100644
--- a/spec/requests/directory_items_controller_spec.rb
+++ b/spec/requests/directory_items_controller_spec.rb
@@ -44,12 +44,12 @@ describe DirectoryItemsController do
 
       expect(json).to be_present
       expect(json['directory_items']).to be_present
-      expect(json['total_rows_directory_items']).to be_present
-      expect(json['load_more_directory_items']).to be_present
+      expect(json['meta']['total_rows_directory_items']).to be_present
+      expect(json['meta']['load_more_directory_items']).to be_present
       expect(json['meta']['last_updated_at']).to be_present
 
       expect(json['directory_items'].length).to eq(4)
-      expect(json['total_rows_directory_items']).to eq(4)
+      expect(json['meta']['total_rows_directory_items']).to eq(4)
     end
 
     it "fails when the directory is disabled" do
@@ -66,7 +66,7 @@ describe DirectoryItemsController do
       json = ::JSON.parse(response.body)
       expect(json).to be_present
       expect(json['directory_items'].length).to eq(1)
-      expect(json['total_rows_directory_items']).to eq(1)
+      expect(json['meta']['total_rows_directory_items']).to eq(1)
       expect(json['directory_items'][0]['user']['username']).to eq('eviltrout')
     end
 
@@ -77,7 +77,7 @@ describe DirectoryItemsController do
       json = ::JSON.parse(response.body)
       expect(json).to be_present
       expect(json['directory_items'].length).to eq(1)
-      expect(json['total_rows_directory_items']).to eq(1)
+      expect(json['meta']['total_rows_directory_items']).to eq(1)
       expect(json['directory_items'][0]['user']['username']).to eq('stage_user')
     end
 
@@ -88,7 +88,7 @@ describe DirectoryItemsController do
       json = ::JSON.parse(response.body)
       expect(json).to be_present
       expect(json['directory_items'].length).to eq(2)
-      expect(json['total_rows_directory_items']).to eq(2)
+      expect(json['meta']['total_rows_directory_items']).to eq(2)
       expect(json['directory_items'][0]['user']['username']).to eq(walter_white.username) | eq(user.username)
       expect(json['directory_items'][1]['user']['username']).to eq(walter_white.username) | eq(user.username)
     end
@@ -100,7 +100,7 @@ describe DirectoryItemsController do
       json = ::JSON.parse(response.body)
       expect(json).to be_present
       expect(json['directory_items'].length).to eq(2)
-      expect(json['total_rows_directory_items']).to eq(2)
+      expect(json['meta']['total_rows_directory_items']).to eq(2)
       expect(json['directory_items'][0]['user']['username']).to eq(evil_trout.username) | eq(stage_user.username)
       expect(json['directory_items'][1]['user']['username']).to eq(evil_trout.username) | eq(stage_user.username)
     end
diff --git a/test/javascripts/fixtures/directory-fixtures.js b/test/javascripts/fixtures/directory-fixtures.js
index ab1b647f4e..dab359e8b5 100644
--- a/test/javascripts/fixtures/directory-fixtures.js
+++ b/test/javascripts/fixtures/directory-fixtures.js
@@ -602,8 +602,11 @@ export default {
         post_count: 146
       }
     ],
-    total_rows_directory_items: 12546,
-    load_more_directory_items:
-      "/directory_items?id=all&order=likes_received&page=1"
+    meta: {
+      last_updated_at: "2020-04-02T02:19:20.000Z",
+      total_rows_directory_items: 12546,
+      load_more_directory_items:
+        "/directory_items?id=all&order=likes_received&page=1"
+    }
   }
 };

From 83f5f9176bf3ab2f2aa391ff03a7b78974cbaec5 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 3 Apr 2020 14:13:01 +1100
Subject: [PATCH 0494/1830] DEV: only load staff logs when page is visited

Previously we would load admin staff action logs unconditionally as soon
as the controller was instantiated, this is not desirable we only want to
run the query when you visit the route.
---
 .../admin/controllers/admin-logs-staff-action-logs.js        | 3 +--
 .../javascripts/admin/routes/admin-logs-staff-action-logs.js | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js
index 849861c921..7ef84b45ad 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js
+++ b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js
@@ -4,7 +4,7 @@ import { scheduleOnce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
-import discourseComputed, { on } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   model: null,
@@ -17,7 +17,6 @@ export default Controller.extend({
     return name ? I18n.t("admin.logs.staff_actions.actions." + name) : null;
   },
 
-  @on("init")
   resetFilters() {
     this.setProperties({
       model: EmberObject.create({ loadingMore: true }),
diff --git a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js
index 0ef8e6e232..b007ecafa7 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js
+++ b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js
@@ -9,6 +9,11 @@ export default DiscourseRoute.extend({
     });
   },
 
+  activate() {
+    let controller = this.controllerFor("admin-logs-staff-action-logs");
+    if (controller.filters === null) controller.resetFilters();
+  },
+
   actions: {
     showDetailsModal(model) {
       showModal("admin-staff-action-log-details", { model, admin: true });

From 20d8b49adddd9927af8cdf01104663d412bf33fc Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 3 Apr 2020 14:35:30 +1100
Subject: [PATCH 0495/1830] DEV: remove targetUsernames deprecation

Stable already has this rename, no need to carry the deprecation anymore.
---
 app/assets/javascripts/discourse/models/composer.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js
index 0f6d9ae620..9c16503e68 100644
--- a/app/assets/javascripts/discourse/models/composer.js
+++ b/app/assets/javascripts/discourse/models/composer.js
@@ -77,8 +77,6 @@ const CLOSED = "closed",
     composerTime: "composerTime",
     typingTime: "typingTime",
     postId: "post.id",
-    // TODO remove together with 'targetUsername' deprecations
-    usernames: "targetUsernames",
     recipients: "targetRecipients"
   },
   _add_draft_fields = {},
@@ -342,14 +340,6 @@ const Composer = RestModel.extend({
     return options;
   },
 
-  @discourseComputed("targetRecipients")
-  targetUsernames(targetRecipients) {
-    deprecated(
-      "`targetUsernames` is deprecated, use `targetRecipients` instead."
-    );
-    return targetRecipients;
-  },
-
   @discourseComputed("targetRecipients")
   targetRecipientsArray(targetRecipients) {
     const recipients = targetRecipients ? targetRecipients.split(",") : [];

From 8d5cc8956d979a48140cf840585069e10207c2e6 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 3 Apr 2020 14:45:27 +1100
Subject: [PATCH 0496/1830] DEV: avoid leaked HTTP call in test

We were running a failed request on route transition, this avoids it by
faking it.
---
 test/javascripts/acceptance/composer-test.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/javascripts/acceptance/composer-test.js b/test/javascripts/acceptance/composer-test.js
index b9da96ee5e..5af2698555 100644
--- a/test/javascripts/acceptance/composer-test.js
+++ b/test/javascripts/acceptance/composer-test.js
@@ -841,6 +841,10 @@ QUnit.test("can reply to a private message", async assert => {
     return [200, { "Content-Type": "application/json" }, {}];
   });
 
+  // a bit messy but we need a fake here cause we issue a route transition
+  // to the new post
+  server.get("/t/34/4.json", () => server.get("/t/34.json"));
+
   await visit("/t/34");
   await click(".topic-post:eq(0) button.reply");
   await fillIn(".d-editor-input", "this is the *content* of the reply");

From 82201fa466bda0d620a65e1f143b5a41b900b81a Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 3 Apr 2020 09:23:40 +0530
Subject: [PATCH 0497/1830] FIX: jobs/delete_replies: Add Time+Duration, not
 Time+Time #9314

Co-authored-by: Kane York <kanepyork@gmail.com>
---
 app/jobs/regular/delete_replies.rb |  2 +-
 spec/jobs/delete_replies_spec.rb   | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 spec/jobs/delete_replies_spec.rb

diff --git a/app/jobs/regular/delete_replies.rb b/app/jobs/regular/delete_replies.rb
index b8228c7a04..bbc0bec8ff 100644
--- a/app/jobs/regular/delete_replies.rb
+++ b/app/jobs/regular/delete_replies.rb
@@ -22,7 +22,7 @@ module Jobs
         PostDestroyer.new(topic_timer.user, post, context: I18n.t("topic_statuses.auto_deleted_by_timer")).destroy
       end
 
-      topic_timer.execute_at = (replies.minimum(:created_at) || Time.zone.now) + topic_timer.duration.days.ago
+      topic_timer.execute_at = (replies.minimum(:created_at) || Time.zone.now) + topic_timer.duration.days
       topic_timer.save
     end
 
diff --git a/spec/jobs/delete_replies_spec.rb b/spec/jobs/delete_replies_spec.rb
new file mode 100644
index 0000000000..a1968bc671
--- /dev/null
+++ b/spec/jobs/delete_replies_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Jobs::DeleteReplies do
+  fab!(:admin) { Fabricate(:admin) }
+
+  fab!(:topic) { Fabricate(:topic) }
+  fab!(:topic_timer) do
+    Fabricate(:topic_timer, status_type: TopicTimer.types[:delete_replies], duration: 2, user: admin, topic: topic, execute_at: 2.days.from_now)
+  end
+
+  before do
+    3.times { create_post(topic: topic) }
+  end
+
+  it "can delete replies of a topic" do
+    freeze_time (2.days.from_now)
+
+    expect {
+      described_class.new.execute(topic_timer_id: topic_timer.id)
+    }.to change { topic.posts.count }.by(-2)
+
+    topic_timer.reload
+    expect(topic_timer.execute_at).to eq_time(2.day.from_now)
+  end
+end

From 624a9bf2344083ec65fa7866a733f2ad99921661 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 3 Apr 2020 14:56:03 +1100
Subject: [PATCH 0498/1830] DEV: allow for internal format change of Drafts

This follows up on 20d8b49adddd9927 we should no longer be testing with
usernames in the draft
---
 test/javascripts/acceptance/composer-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/acceptance/composer-test.js b/test/javascripts/acceptance/composer-test.js
index 5af2698555..48237ff552 100644
--- a/test/javascripts/acceptance/composer-test.js
+++ b/test/javascripts/acceptance/composer-test.js
@@ -683,7 +683,7 @@ QUnit.test("Loading draft also replaces the recipients", async assert => {
     sandbox.stub(Draft, "get").returns(
       Promise.resolve({
         draft:
-          '{"reply":"hello","action":"privateMessage","title":"hello","categoryId":null,"archetypeId":"private_message","metaData":null,"usernames":"codinghorror","composerTime":9159,"typingTime":2500}',
+          '{"reply":"hello","action":"privateMessage","title":"hello","categoryId":null,"archetypeId":"private_message","metaData":null,"recipients":"codinghorror","composerTime":9159,"typingTime":2500}',
         draft_sequence: 0
       })
     );

From 76bb01c31cde4c7d6ad59bf6ab536cbe5c4e2bb9 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Fri, 3 Apr 2020 13:29:42 +0100
Subject: [PATCH 0499/1830] DEV: Increase process_post lock timeout

The process_post job uses CookedPostProcessor which also uses a
DistributedMutex. There's no good reason for the timeout of the outer
lock to be smaller than the timeout of the inner lock.
---
 app/jobs/regular/process_post.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/jobs/regular/process_post.rb b/app/jobs/regular/process_post.rb
index 8dd7487f36..b13d69d61d 100644
--- a/app/jobs/regular/process_post.rb
+++ b/app/jobs/regular/process_post.rb
@@ -7,7 +7,7 @@ module Jobs
   class ProcessPost < ::Jobs::Base
 
     def execute(args)
-      DistributedMutex.synchronize("process_post_#{args[:post_id]}") do
+      DistributedMutex.synchronize("process_post_#{args[:post_id]}", validity: 10.minutes) do
         post = Post.find_by(id: args[:post_id])
         # two levels of deletion
         return unless post.present? && post.topic.present?

From 883901e4c0bc293463d15fdcacde1c80707ca2cb Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 3 Apr 2020 16:27:56 +0200
Subject: [PATCH 0500/1830] FIX: do not attempt to deselect tags if filter is
 not empty (#9345)

---
 .../javascripts/select-kit/components/mini-tag-chooser.js     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
index d8c63c9ae5..bf11e816dc 100644
--- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
+++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
@@ -188,7 +188,9 @@ export default ComboBox.extend(TagsMixin, {
     const value = makeArray(this.value);
 
     if (event.keyCode === 8) {
-      this._onBackspace(this.value, this.highlightedTag);
+      if (!this.selectKit.filter) {
+        this._onBackspace(this.value, this.highlightedTag);
+      }
     } else if (event.keyCode === 37) {
       if (this.highlightedTag) {
         const index = value.indexOf(this.highlightedTag);

From 06de6f80f821c08691120fe030978b6f01129ba2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 3 Apr 2020 10:31:45 -0400
Subject: [PATCH 0501/1830] Build(deps): Bump tzinfo from 1.2.6 to 1.2.7
 (#9340)

Bumps [tzinfo](https://github.com/tzinfo/tzinfo) from 1.2.6 to 1.2.7.
- [Release notes](https://github.com/tzinfo/tzinfo/releases)
- [Changelog](https://github.com/tzinfo/tzinfo/blob/master/CHANGES.md)
- [Commits](https://github.com/tzinfo/tzinfo/compare/v1.2.6...v1.2.7)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index b76e9ec387..8344446223 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -399,7 +399,7 @@ GEM
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)

From 4500928a39394dbc8d7d147babdda326790a4b5e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 3 Apr 2020 10:32:05 -0400
Subject: [PATCH 0502/1830] Build(deps-dev): Bump fabrication from 2.21.0 to
 2.21.1 (#9341)

Bumps [fabrication](https://github.com/paulelliott/fabrication) from 2.21.0 to 2.21.1.
- [Release notes](https://github.com/paulelliott/fabrication/releases)
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown)
- [Commits](https://github.com/paulelliott/fabrication/compare/2.21.0...2.21.1)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 8344446223..a087e40104 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -124,7 +124,7 @@ GEM
     excon (0.72.0)
     execjs (2.7.0)
     exifr (1.3.6)
-    fabrication (2.21.0)
+    fabrication (2.21.1)
     fakeweb (1.3.0)
     faraday (0.17.3)
       multipart-post (>= 1.2, < 3)

From 91fff746a476a9d77a8f8029c084d827536dae75 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 3 Apr 2020 15:50:13 +0100
Subject: [PATCH 0503/1830] FIX: Check active themes for all requests

Previously, the list of active themes was only used in html views. Now we have theme modifiers, themes can affect .json routes.
---
 app/controllers/application_controller.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3ae29ee400..813af0c12f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -376,8 +376,7 @@ class ApplicationController < ActionController::Base
   end
 
   def handle_theme
-    return if request.xhr? || request.format == "json" || request.format == "js"
-    return if request.method != "GET"
+    return if request.format == "js"
 
     resolve_safe_mode
     return if request.env[NO_CUSTOM]

From 3cfe086a94a4d9c1cac2b8a7173c64c0df1baecd Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 3 Apr 2020 16:42:01 +0100
Subject: [PATCH 0504/1830] FIX: Limit personal message participants when
 converting from topic (#9343)

Previously all topic posters would be added which could lead to major performance issues. Now if there are too many posters, only the acting user will be added as a participant.
---
 app/jobs/regular/topic_action_converter.rb |  2 +-
 app/models/topic_converter.rb              |  4 ++++
 spec/models/topic_converter_spec.rb        | 12 ++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/jobs/regular/topic_action_converter.rb b/app/jobs/regular/topic_action_converter.rb
index dff892d06a..370e8cbb02 100644
--- a/app/jobs/regular/topic_action_converter.rb
+++ b/app/jobs/regular/topic_action_converter.rb
@@ -13,7 +13,7 @@ class Jobs::TopicActionConverter < ::Jobs::Base
       action_type: [UserAction::GOT_PRIVATE_MESSAGE, UserAction::NEW_PRIVATE_MESSAGE]).find_each do |ua|
         UserAction.remove_action!(ua.attributes.symbolize_keys.slice(:action_type, :user_id, :acting_user_id, :target_topic_id, :target_post_id))
       end
-    topic.posts.each { |post| UserActionManager.post_created(post) }
+    topic.posts.find_each { |post| UserActionManager.post_created(post) }
     UserActionManager.topic_created(topic)
   end
 
diff --git a/app/models/topic_converter.rb b/app/models/topic_converter.rb
index 6b9e6ca92c..925c98c64b 100644
--- a/app/models/topic_converter.rb
+++ b/app/models/topic_converter.rb
@@ -82,6 +82,10 @@ class TopicConverter
     existing_allowed_users = @topic.topic_allowed_users.pluck(:user_id)
     users_to_allow = posters << @user.id
 
+    if (users_to_allow | existing_allowed_users).length > SiteSetting.max_allowed_message_recipients
+      users_to_allow = [@user.id]
+    end
+
     (users_to_allow - existing_allowed_users).uniq.each do |user_id|
       @topic.topic_allowed_users.build(user_id: user_id)
     end
diff --git a/spec/models/topic_converter_spec.rb b/spec/models/topic_converter_spec.rb
index 7d1c1602d0..9c888f8f41 100644
--- a/spec/models/topic_converter_spec.rb
+++ b/spec/models/topic_converter_spec.rb
@@ -152,6 +152,18 @@ describe TopicConverter do
         expect(Notification.exists?(user_notification.id)).to eq(false)
         expect(Notification.exists?(admin_notification.id)).to eq(true)
       end
+
+      it "limits PM participants" do
+        SiteSetting.max_allowed_message_recipients = 2
+        Fabricate(:post, topic: topic)
+        Fabricate(:post, topic: topic)
+
+        private_message = topic.convert_to_private_message(post.user)
+
+        # Skips posters and just adds the acting user
+        expect(private_message.topic_allowed_users.count).to eq(1)
+      end
+
     end
 
     context 'topic has replies' do

From 2b2584912a380813b2ab6b2601a57317cfa43203 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Fri, 3 Apr 2020 18:10:52 +0200
Subject: [PATCH 0505/1830] Improve Telligent import script

* Imports private messages
* Replaces internal links for topics and replies
* Allows incremental import of accepted answers
---
 script/import_scripts/telligent.rb | 164 +++++++++++++++++++++++++++--
 1 file changed, 158 insertions(+), 6 deletions(-)

diff --git a/script/import_scripts/telligent.rb b/script/import_scripts/telligent.rb
index d9b364fb15..a6b1218e41 100644
--- a/script/import_scripts/telligent.rb
+++ b/script/import_scripts/telligent.rb
@@ -50,6 +50,7 @@ class ImportScripts::Telligent < ImportScripts::Base
     /\[(?<tag>img|url)=[^\[]*?cfs-file(?:systemfile)?(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename>.+?)\][^\[]*?\[\/\k<tag>\]/i
   ]
   PROPERTY_NAMES_REGEX ||= /(?<name>\w+):S:(?<start>\d+):(?<length>\d+):/
+  INTERNAL_LINK_REGEX ||= /\shref=".*?\/f\/\d+(?:(\/t\/(?<topic_id>\d+))|(?:\/p\/\d+\/(?<post_id>\d+))|(?:\/p\/(?<post_id>\d+)\/reply))\.aspx[^"]*?"/i
 
   CATEGORY_LINK_NORMALIZATION = '/.*?(f\/\d+)$/\1'
   TOPIC_LINK_NORMALIZATION = '/.*?(f\/\d+\/t\/\d+)$/\1'
@@ -109,6 +110,7 @@ class ImportScripts::Telligent < ImportScripts::Base
     import_users
     import_topics
     import_posts
+    import_messages
     mark_topics_as_solved
   end
 
@@ -127,7 +129,12 @@ class ImportScripts::Telligent < ImportScripts::Base
                WHERE t.UserId = u.UserID) OR
         EXISTS(SELECT 1
                FROM te_Forum_ThreadReplies r
-               WHERE r.UserId = u.UserID)
+               WHERE r.UserId = u.UserID) OR
+        EXISTS(SELECT 1
+               FROM cs_Messaging_ConversationParticipants p
+                 JOIN cs_Messaging_ConversationMessages cm ON p.ConversationId = cm.ConversationId
+                 JOIN cs_Messaging_Messages m ON m.MessageId = cm.MessageId
+               WHERE p.ParticipantId = u.UserID)
       )
     SQL
 
@@ -508,6 +515,116 @@ class ImportScripts::Telligent < ImportScripts::Base
     end
   end
 
+  def import_messages
+    puts "", "Importing messages..."
+
+    current_conversation_id = ""
+    current_topic_import_id = ""
+
+    last_conversation_id = ""
+
+    total_count = count(<<~SQL)
+      SELECT COUNT(1) AS count
+      FROM cs_Messaging_Messages m
+        JOIN cs_Messaging_ConversationMessages cm ON m.MessageId = cm.MessageId
+    SQL
+
+    batches do |offset|
+      if last_conversation_id.blank?
+        conditions = ""
+      else
+        conditions = <<~SQL
+          WHERE cm.ConversationId > '#{last_conversation_id}'
+        SQL
+      end
+
+      rows = query(<<~SQL)
+        SELECT TOP #{BATCH_SIZE}
+          cm.ConversationId, m.MessageId, m.AuthorId, m.Subject, m.Body, m.DateCreated,
+          STUFF((SELECT ';' + CONVERT(VARCHAR, p.ParticipantId)
+                 FROM cs_Messaging_ConversationParticipants p
+                 WHERE p.ConversationId = cm.ConversationId
+                 ORDER BY p.ParticipantId
+                 FOR XML PATH('')), 1, 1, '') AS ParticipantIds
+        FROM cs_Messaging_Messages m
+          JOIN cs_Messaging_ConversationMessages cm ON m.MessageId = cm.MessageId
+        #{conditions}
+        ORDER BY cm.ConversationId, m.DateCreated, m.MessageId
+      SQL
+
+      break if rows.blank?
+
+      last_row = rows[-1]
+      last_conversation_id = last_row["ConversationId"]
+      next if all_records_exist?(:post, rows.map { |row| row["MessageId"] })
+
+      create_posts(rows, total: total_count, offset: offset) do |row|
+        user_id = user_id_from_imported_user_id(row["AuthorId"]) || Discourse::SYSTEM_USER_ID
+
+        post = {
+          id: row["MessageId"],
+          raw: raw_with_attachment(row, user_id, :message),
+          user_id: user_id,
+          created_at: row["DateCreated"]
+        }
+
+        if current_conversation_id == row["ConversationId"]
+          parent_post = topic_lookup_from_imported_post_id(current_topic_import_id)
+
+          if parent_post
+            post[:topic_id] = parent_post[:topic_id]
+          else
+            puts "Failed to import message #{row['MessageId']}. Parent was not found."
+            post = nil
+          end
+        else
+          post[:title] = CGI.unescapeHTML(row["Subject"])
+          post[:archetype] = Archetype.private_message
+          post[:target_usernames] = get_recipient_usernames(row)
+
+          if post[:target_usernames].empty?
+            puts "Private message without recipients. Skipping #{row['MessageId']}"
+            post = nil
+          end
+
+          current_topic_import_id = row["MessageId"]
+        end
+
+        current_conversation_id = row["ConversationId"]
+        post
+      end
+    end
+
+    # Mark all imported messages as read
+    DB.exec(<<~SQL)
+      UPDATE topic_users tu
+      SET last_read_post_number = t.highest_post_number,
+          highest_seen_post_number = t.highest_post_number
+      FROM topics t
+        JOIN topic_custom_fields tcf ON t.id = tcf.topic_id
+      WHERE tu.topic_id = t.id
+        AND tu.user_id > 0
+        AND t.archetype = 'private_message'
+        AND tcf.name = 'import_id'
+    SQL
+  end
+
+  def get_recipient_user_ids(participant_ids)
+    return [] if participant_ids.blank?
+
+    user_ids = participant_ids.split(';')
+    user_ids.uniq!
+    user_ids.map!(&:strip)
+  end
+
+  def get_recipient_usernames(row)
+    import_user_ids = get_recipient_user_ids(row["ParticipantIds"])
+
+    import_user_ids.map! do |import_user_id|
+      find_user_by_import_id(import_user_id).try(:username)
+    end.compact
+  end
+
   def index_directory(root_directory)
     Dir.foreach(root_directory) do |directory_name|
       next if directory_name == "." || directory_name == ".."
@@ -524,7 +641,7 @@ class ImportScripts::Telligent < ImportScripts::Base
   end
 
   def raw_with_attachment(row, user_id, type)
-    raw, embedded_paths, upload_ids = replace_embedded_attachments(row["Body"], user_id)
+    raw, embedded_paths, upload_ids = replace_embedded_attachments(row, user_id, type)
     raw = html_to_markdown(raw) || ""
 
     filename = row["FileName"]
@@ -551,15 +668,28 @@ class ImportScripts::Telligent < ImportScripts::Base
           raw = "#{raw}\n#{@uploader.html_for_upload(upload, filename)}"
         end
       else
-        id = type == :topic ? row['ThreadId'] : row['ThreadReplyId']
-        STDERR.puts "Could not find file for #{type} #{id}: #{path}"
+        print_file_not_found_error(type, path, row)
       end
     end
 
     raw
   end
 
-  def replace_embedded_attachments(raw, user_id)
+  def print_file_not_found_error(type, path, row)
+    case type
+    when :topic
+      id = row['ThreadId']
+    when :post
+      id = row['ThreadReplyId']
+    when :message
+      id = row['MessageId']
+    end
+
+    STDERR.puts "Could not find file for #{type} #{id}: #{path}"
+  end
+
+  def replace_embedded_attachments(row, user_id, type)
+    raw = row["Body"]
     paths = []
     upload_ids = []
 
@@ -583,7 +713,7 @@ class ImportScripts::Telligent < ImportScripts::Base
           end
         else
           path = File.join(path, match_data[:filename])
-          STDERR.puts "Could not find file: #{path}"
+          print_file_not_found_error(type, path, row)
           match_data[0]
         end
       end
@@ -673,6 +803,8 @@ class ImportScripts::Telligent < ImportScripts::Base
   def html_to_markdown(html)
     return html if html.blank?
 
+    html = fix_internal_links(html)
+
     md = HtmlToMarkdown.new(html).to_markdown
     md.gsub!(/\[quote.*?\]/, "\n" + '\0' + "\n")
     md.gsub!(/(?<!^)\[\/quote\]/, "\n[/quote]\n")
@@ -682,6 +814,21 @@ class ImportScripts::Telligent < ImportScripts::Base
     md
   end
 
+  def fix_internal_links(html)
+    html.gsub(INTERNAL_LINK_REGEX) do
+      match_data = Regexp.last_match
+
+      if match_data[:topic_id].present?
+        imported_id = import_topic_id(match_data[:topic_id])
+      else
+        imported_id = match_data[:post_id]
+      end
+
+      post = topic_lookup_from_imported_post_id(imported_id) if imported_id
+      post ? %Q| href="#{Discourse.base_url}#{post[:url]}"| : match_data[0]
+    end
+  end
+
   def parse_properties(names, values)
     properties = {}
     return properties if names.blank? || values.blank?
@@ -706,6 +853,11 @@ class ImportScripts::Telligent < ImportScripts::Base
         FROM post_custom_fields pcf
         JOIN posts p ON p.id = pcf.post_id
        WHERE pcf.name = 'is_accepted_answer' AND pcf.value = 'true'
+         AND NOT EXISTS (
+           SELECT 1
+           FROM topic_custom_fields x
+           WHERE x.topic_id = p.topic_id AND x.name = 'accepted_answer_post_id'
+         )
     SQL
   end
 

From ad6709772a7838f4d1ed07c08b87616f9db248a4 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Fri, 3 Apr 2020 18:13:34 +0200
Subject: [PATCH 0506/1830] PERF: Backup with lots of uploads stored on S3 was
 slow

Creating the backup needs a lot more disk space after this change, but it is a lot faster.
---
 lib/backup_restore/backuper.rb | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb
index dd4f81c72e..80e45da59c 100644
--- a/lib/backup_restore/backuper.rb
+++ b/lib/backup_restore/backuper.rb
@@ -291,20 +291,17 @@ module BackupRestore
           log "Failed to download file with upload ID #{upload.id} from S3", ex
         end
 
-        if File.exists?(filename)
-          Discourse::Utils.execute_command(
-            'tar', '--append', '--file', tar_filename, upload_directory,
-            failure_message: "Failed to add #{upload.original_filename} to archive.", success_status_codes: [0, 1],
-            chdir: @tmp_directory
-          )
-
-          File.delete(filename)
-        end
-
         count += 1
         log "#{count} files have already been downloaded. Still downloading..." if count % 500 == 0
       end
 
+      log "Appending uploads to archive..."
+      Discourse::Utils.execute_command(
+        'tar', '--append', '--file', tar_filename, upload_directory,
+        failure_message: "Failed to append uploads to archive.", success_status_codes: [0, 1],
+        chdir: @tmp_directory
+      )
+
       log "No uploads found on S3. Skipping archiving of uploads stored on S3..." if count == 0
     end
 

From 751f229665ac0311bae13dc77b7afba9a17369a5 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Fri, 3 Apr 2020 15:09:01 -0500
Subject: [PATCH 0507/1830] UX: removes color on categories if no style chosen
 (#9346)

* UX: removes color on categories if no style chosen

* Update app/assets/javascripts/discourse/templates/components/categories-only.hbs

* Update messages.hbs

Co-authored-by: Robin Ward <robin.ward@gmail.com>
---
 .../javascripts/discourse/components/categories-only.js      | 5 ++++-
 .../discourse/templates/components/categories-only.hbs       | 2 +-
 app/assets/stylesheets/desktop/category-list.scss            | 5 +++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/categories-only.js b/app/assets/javascripts/discourse/components/categories-only.js
index 89720fbbe8..d218d69643 100644
--- a/app/assets/javascripts/discourse/components/categories-only.js
+++ b/app/assets/javascripts/discourse/components/categories-only.js
@@ -1,4 +1,7 @@
 import Component from "@ember/component";
+import { equal } from "@ember/object/computed";
+
 export default Component.extend({
-  tagName: ""
+  tagName: "",
+  noCategoryStyle: equal("siteSettings.category_style", "none")
 });
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index 24d02fea27..6c02050bbd 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -12,7 +12,7 @@
     <tbody aria-labelledby="categories-only-category">
       {{#each categories as |c|}}
         <tr data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} class="{{if c.description_excerpt 'has-description' 'no-description'}} {{if c.uploaded_logo.url 'has-logo' 'no-logo'}}">
-          <td class="category {{if c.isMuted 'muted'}}" style={{border-color c.color}}>
+          <td class="category {{if c.isMuted 'muted'}} {{if noCategoryStyle "no-category-style"}}" style={{unless noCategoryStyle (border-color c.color)}}>
             {{category-title-link category=c}}
             {{#unless c.isMuted}}
             {{#if c.description_excerpt}}
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index 50801d9d34..c5774106ab 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -94,6 +94,11 @@
 
   tbody {
     .category {
+      &.no-category-style {
+        border-color: transparent;
+        border-left: 0px;
+        padding-left: 0px;
+      }
       border-left: 6px solid;
       h3,
       h4 {

From a8002baaed2b7227e22fd1c9e9d47fc5015f0971 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 3 Apr 2020 20:49:09 -0400
Subject: [PATCH 0508/1830] UX: Restyle bookmark reminder modal

---
 .../discourse/templates/modal/bookmark.hbs    | 63 ++++++++++---------
 .../common/components/bookmark-modal.scss     | 37 +++++++----
 .../common/components/tap-tile.scss           | 43 +++++--------
 3 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 5a1082c711..538b30c74f 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -22,62 +22,69 @@
         {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
           {{#if showAtDesktop}}
             {{#tap-tile icon="desktop" tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              {{i18n "bookmarks.reminders.at_desktop"}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.at_desktop"}}</div>
             {{/tap-tile}}
           {{/if}}
 
           {{#if showLaterToday}}
             {{#tap-tile icon="far-moon" tileId=reminderTypes.LATER_TODAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              {{i18n "bookmarks.reminders.later_today"}}<br>
-              {{laterTodayFormatted}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_today"}}</div>
+              <div class="tap-tile-date">{{laterTodayFormatted}}</div>
             {{/tap-tile}}
           {{/if}}
           {{#tap-tile icon="far-sun" tileId=reminderTypes.TOMORROW activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            {{i18n "bookmarks.reminders.tomorrow"}}<br>
-            {{tomorrowFormatted}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.tomorrow"}}</div>
+            <div class="tap-tile-date">{{tomorrowFormatted}}</div>
           {{/tap-tile}}
           {{#if showLaterThisWeek}}
             {{#tap-tile icon="angle-double-right" tileId=reminderTypes.LATER_THIS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              {{i18n "bookmarks.reminders.later_this_week"}}<br>
-              {{laterThisWeekFormatted}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_this_week"}}</div>
+              <div class="tap-tile-date">{{laterThisWeekFormatted}}</div>
             {{/tap-tile}}
           {{/if}}
           {{#tap-tile icon="briefcase" tileId=reminderTypes.START_OF_NEXT_BUSINESS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            {{i18n "bookmarks.reminders.start_of_next_business_week"}}<br>
-            {{startNextBusinessWeekFormatted}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.start_of_next_business_week"}}</div>
+            <div class="tap-tile-date">{{startNextBusinessWeekFormatted}}</div>
           {{/tap-tile}}
           {{#tap-tile icon="far-clock" tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            {{i18n "bookmarks.reminders.next_week"}}<br>
-            {{nextWeekFormatted}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_week"}}</div>
+            <div class="tap-tile-date">{{nextWeekFormatted}}</div>
           {{/tap-tile}}
           {{#tap-tile icon="far-calendar-plus" tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            {{i18n "bookmarks.reminders.next_month"}}<br>
-            {{nextMonthFormatted}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_month"}}</div>
+            <div class="tap-tile-date">{{nextMonthFormatted}}</div>
           {{/tap-tile}}
           {{#tap-tile icon="calendar-alt" tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            {{i18n "bookmarks.reminders.custom"}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.custom"}}</div>
           {{/tap-tile}}
+
+          {{#if customDateTimeSelected}}
+            <div class="control-group custom-date-time-wrap">
+              <div class="tap-tile-date-input">
+                {{d-icon "calendar-alt"}}
+                {{date-picker-future
+                  value=customReminderDate
+                  onSelect=(action (mut customReminderDate))
+                }}
+              </div>
+              <div class="tap-tile-time-input">
+                {{d-icon "far-clock"}}
+                {{input placeholder="--:--" type="time" class="time-input" value=customReminderTime}}
+              </div>
+            </div>
+          {{/if}}
+
           {{#if showLastCustom}}
             {{#tap-tile icon="undo" tileId=reminderTypes.LAST_CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              {{i18n "bookmarks.reminders.last_custom"}}<br>
-              {{lastCustomFormatted}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.last_custom"}}</div>
+              <div class="tap-tile-date">{{lastCustomFormatted}}</div>
             {{/tap-tile}}
           {{/if}}
+
           {{#tap-tile icon="ban" tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            {{i18n "bookmarks.reminders.none"}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.none"}}</div>
           {{/tap-tile}}
         {{/tap-tile-grid}}
-        {{#if customDateTimeSelected}}
-          <div class="control-group custom-date-time-wrap">
-            {{d-icon "calendar-alt"}}
-            {{date-picker-future
-              value=customReminderDate
-              onSelect=(action (mut customReminderDate))
-            }}
-            {{d-icon "far-clock"}}
-            {{input placeholder="--:--" type="time" class="time-input" value=customReminderTime}}
-          </div>
-        {{/if}}
 
       {{else}}
         <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=basePath)}}</div>
diff --git a/app/assets/stylesheets/common/components/bookmark-modal.scss b/app/assets/stylesheets/common/components/bookmark-modal.scss
index 14f91f70c3..0b08a4c8bd 100644
--- a/app/assets/stylesheets/common/components/bookmark-modal.scss
+++ b/app/assets/stylesheets/common/components/bookmark-modal.scss
@@ -1,9 +1,8 @@
 .bookmark-with-reminder.modal {
   .modal-inner-container {
-    max-width: 95%;
+    box-sizing: border-box;
   }
   .modal-body {
-    max-width: 410px;
     width: 100%;
     box-sizing: border-box;
 
@@ -17,24 +16,36 @@
   }
 
   .custom-date-time-wrap {
-    display: flex;
-    flex-direction: row;
-    align-items: baseline;
-
-    .svg-icon {
-      padding: 0 5px;
+    padding: 1em 1em 0.5em;
+    border: 1px solid $primary-low;
+    border-top: none;
+    margin-top: -0.667em;
+    background: $primary-very-low;
+    .d-icon {
+      padding: 0 0.75em 0 0;
+      color: $primary-high;
+      margin-top: -0.5em;
     }
 
-    .date-picker-wrapper {
-      flex: 1;
-
-      .date-picker {
+    .tap-tile-date-input,
+    .tap-tile-time-input {
+      display: flex;
+      align-items: center;
+      input {
         width: 100%;
+        min-width: unset;
       }
     }
 
+    .date-picker,
     .time-input {
-      flex: 1;
+      text-align: left;
+      padding-top: 5px;
+    }
+
+    .time-input,
+    .date-picker-wrapper {
+      flex: 1 1 auto;
     }
   }
 }
diff --git a/app/assets/stylesheets/common/components/tap-tile.scss b/app/assets/stylesheets/common/components/tap-tile.scss
index 6f71643cd1..e558b7adbf 100644
--- a/app/assets/stylesheets/common/components/tap-tile.scss
+++ b/app/assets/stylesheets/common/components/tap-tile.scss
@@ -1,28 +1,17 @@
 .tap-tile-grid {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
   justify-content: space-between;
-  $tile-width: 100px;
-  $horizontal-tile-padding: 5px;
+  margin: 0.5em 0 1em 0;
 
   .tap-tile {
     color: $primary-high;
-    padding: 10px $horizontal-tile-padding;
+    padding: 0.75em;
     display: flex;
-    flex-direction: column;
-    text-align: center;
+    flex-wrap: wrap;
     align-items: center;
-    border: 1px solid $primary-medium;
-    margin: 0 0 20px;
-    width: $tile-width;
-    font-size: $font-down-2;
+    border: 1px solid $primary-low;
+    margin: 0 0 0.5em;
     cursor: pointer;
 
-    @media screen and (max-width: 360px) {
-      width: $tile-width - 10;
-    }
-
     &:hover {
       background-color: $tertiary-low;
     }
@@ -31,16 +20,18 @@
       background-color: $highlight-medium;
     }
 
-    .svg-icon,
-    .svg-icon-title {
-      width: 2.5em;
-      height: 2.5em;
-      margin-bottom: 10px;
+    .d-icon {
+      color: $primary-medium;
+      margin: 0 0.5em 0 0;
+    }
+
+    .tap-tile-title {
+      font-weight: bold;
+      margin-right: auto;
+    }
+
+    .tap-tile-date {
+      margin-left: 1em;
     }
   }
-
-  &::after {
-    content: "";
-    width: $tile-width + ($horizontal-tile-padding * 3);
-  }
 }

From b9d411a4ebd0fa84855e9a68af9555a4c73c678a Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Sat, 4 Apr 2020 13:31:34 +0300
Subject: [PATCH 0509/1830] FIX: Topic.time_to_first_response should include
 sub-sub-categories (#9349)

---
 app/models/category.rb    | 19 +++++++++++++++++++
 app/models/topic.rb       | 11 +++--------
 lib/topic_query.rb        | 20 +-------------------
 spec/models/topic_spec.rb | 14 ++++++++++++++
 4 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index 6e0a073a6b..8a29f61250 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -153,6 +153,25 @@ class Category < ActiveRecord::Base
     Category.reset_topic_ids_cache
   end
 
+  def self.subcategory_ids(category_id)
+    sql = <<~SQL
+        WITH RECURSIVE subcategories AS (
+            SELECT :category_id id, 1 depth
+            UNION
+            SELECT categories.id, (subcategories.depth + 1) depth
+            FROM categories
+            JOIN subcategories ON subcategories.id = categories.parent_category_id
+            WHERE subcategories.depth < :max_category_nesting
+        )
+        SELECT id FROM subcategories
+      SQL
+    DB.query_single(
+      sql,
+      category_id: category_id,
+      max_category_nesting: SiteSetting.max_category_nesting
+    )
+  end
+
   def self.scoped_to_permissions(guardian, permission_types)
     if guardian.try(:is_admin?)
       all
diff --git a/app/models/topic.rb b/app/models/topic.rb
index a50c35dcb8..7a3a1a5b0b 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -189,11 +189,6 @@ class Topic < ActiveRecord::Base
     where("topics.category_id IS NULL OR topics.category_id IN (SELECT id FROM categories WHERE #{condition[0]})", condition[1])
   }
 
-  IN_CATEGORY_AND_SUBCATEGORIES_SQL = <<~SQL
-       t.category_id = :category_id
-    OR t.category_id IN (SELECT id FROM categories WHERE categories.parent_category_id = :category_id)
-  SQL
-
   scope :in_category_and_subcategories, lambda { |category_id|
     where("topics.category_id = ? OR topics.category_id IN (SELECT id FROM categories WHERE categories.parent_category_id = ?)",
         category_id,
@@ -1300,7 +1295,7 @@ class Topic < ActiveRecord::Base
     builder = DB.build(sql)
     builder.where("t.created_at >= :start_date", start_date: opts[:start_date]) if opts[:start_date]
     builder.where("t.created_at < :end_date", end_date: opts[:end_date]) if opts[:end_date]
-    builder.where(IN_CATEGORY_AND_SUBCATEGORIES_SQL, category_id: opts[:category_id]) if opts[:category_id]
+    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(opts[:category_id])) if opts[:category_id]
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.where("p.deleted_at IS NULL")
@@ -1339,7 +1334,7 @@ class Topic < ActiveRecord::Base
     builder = DB.build(WITH_NO_RESPONSE_SQL)
     builder.where("t.created_at >= :start_date", start_date: start_date) if start_date
     builder.where("t.created_at < :end_date", end_date: end_date) if end_date
-    builder.where(IN_CATEGORY_AND_SUBCATEGORIES_SQL, category_id: category_id) if category_id
+    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(category_id)) if category_id
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.query_hash
@@ -1359,7 +1354,7 @@ class Topic < ActiveRecord::Base
 
   def self.with_no_response_total(opts = {})
     builder = DB.build(WITH_NO_RESPONSE_TOTAL_SQL)
-    builder.where(IN_CATEGORY_AND_SUBCATEGORIES_SQL, category_id: opts[:category_id]) if opts[:category_id]
+    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(opts[:category_id])) if opts[:category_id]
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.query_single.first.to_i
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index f77d37e746..24a35b021e 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -1054,25 +1054,7 @@ class TopicQuery
 
   def subcategory_ids(category_id)
     @subcategory_ids ||= {}
-    @subcategory_ids[category_id] ||=
-      begin
-        sql = <<~SQL
-            WITH RECURSIVE subcategories AS (
-                SELECT :category_id id, 1 depth
-                UNION
-                SELECT categories.id, (subcategories.depth + 1) depth
-                FROM categories
-                JOIN subcategories ON subcategories.id = categories.parent_category_id
-                WHERE subcategories.depth < :max_category_nesting
-            )
-            SELECT id FROM subcategories
-          SQL
-        DB.query_single(
-          sql,
-          category_id: category_id,
-          max_category_nesting: SiteSetting.max_category_nesting
-        )
-      end
+    @subcategory_ids[category_id] ||= Category.subcategory_ids(category_id)
   end
 
   def sanitize_sql_array(input)
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 525541e414..84df06dd0d 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -2348,6 +2348,20 @@ describe Topic do
       expect(Topic.time_to_first_response_total).to eq(1)
     end
 
+    it "should have results if there's a topic with replies" do
+      SiteSetting.max_category_nesting = 3
+
+      category = Fabricate(:category_with_definition)
+      subcategory = Fabricate(:category_with_definition, parent_category_id: category.id)
+      subsubcategory = Fabricate(:category_with_definition, parent_category_id: subcategory.id)
+
+      topic = Fabricate(:topic, category: subsubcategory, created_at: 3.hours.ago)
+      Fabricate(:post, topic: topic, user: topic.user, post_number: 1, created_at: 3.hours.ago)
+      Fabricate(:post, topic: topic, post_number: 2, created_at: 2.hours.ago)
+
+      expect(Topic.time_to_first_response_total(category_id: category.id)).to eq(1)
+    end
+
     it "should only count regular posts as the first response" do
       topic = Fabricate(:topic, created_at: 5.hours.ago)
       Fabricate(:post, topic: topic, user: topic.user, post_number: 1, created_at: 5.hours.ago)

From f8ec5f309a80ef34776eacaac951c398693caa69 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Sat, 4 Apr 2020 14:20:01 +0300
Subject: [PATCH 0510/1830] FIX: Ensure category_id is an integer

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

diff --git a/app/models/category.rb b/app/models/category.rb
index 8a29f61250..5fb020c556 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -167,7 +167,7 @@ class Category < ActiveRecord::Base
       SQL
     DB.query_single(
       sql,
-      category_id: category_id,
+      category_id: category_id.to_i,
       max_category_nesting: SiteSetting.max_category_nesting
     )
   end

From ce00da3bcd29f1555dcfcfe241e968efbd249944 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Mon, 6 Apr 2020 09:56:47 +1000
Subject: [PATCH 0511/1830] FIX: guardian always got user but sometimes it is
 anonymous (#9342)

* FIX: guardian always got user but sometimes it is anonymous

```
  def initialize(user = nil, request = nil)
    @user = user.presence || AnonymousUser.new
    @request = request
  end
```

AnonymouseUser defines `blank?` method
```
  class AnonymousUser
    def blank?
      true
    end
    ...
  end
```
so if we would use @user.present? it would be correct, however, just @user is always true
---
 lib/guardian.rb                  | 4 ++--
 spec/components/guardian_spec.rb | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/guardian.rb b/lib/guardian.rb
index fae144f2b6..851dddf881 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -319,7 +319,7 @@ class Guardian
   # Support sites that have to approve users
   def can_access_forum?
     return true unless SiteSetting.must_approve_users?
-    return false unless @user
+    return false if anonymous?
 
     # Staff can't lock themselves out of a site
     return true if is_staff?
@@ -442,7 +442,7 @@ class Guardian
   end
 
   def can_export_entity?(entity)
-    return false unless @user
+    return false if anonymous?
     return true if is_admin?
     return entity != 'user_list' if is_moderator?
 
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index 14d528fa7c..bea0404696 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -2743,6 +2743,7 @@ describe Guardian do
   end
 
   describe '#can_export_entity?' do
+    let(:anonymous_guardian) { Guardian.new }
     let(:user_guardian) { Guardian.new(user) }
     let(:moderator_guardian) { Guardian.new(moderator) }
     let(:admin_guardian) { Guardian.new(admin) }
@@ -2758,6 +2759,10 @@ describe Guardian do
       expect(moderator_guardian.can_export_entity?('staff_action')).to be_truthy
       expect(admin_guardian.can_export_entity?('staff_action')).to be_truthy
     end
+
+    it 'does not allow anonymous to export' do
+      expect(anonymous_guardian.can_export_entity?('user_archive')).to be_falsey
+    end
   end
 
   describe '#can_ignore_user?' do

From 40546af21746d469e39dfdcc9ca48987fef6cf3c Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Mon, 6 Apr 2020 13:14:46 +1000
Subject: [PATCH 0512/1830] FIX: Remove date from bookmark reminder non-English
 translations (#9354)

The {{date}} interpolated value was removed from the English translations in #9329 but not from the other translations, causing breakages.

Also adds a , inbetween date and time for reminders using long_no_year for readability.
---
 config/locales/client.ar.yml    |  2 +-
 config/locales/client.bg.yml    | 12 ++++++------
 config/locales/client.bs_BA.yml | 12 ++++++------
 config/locales/client.ca.yml    |  2 +-
 config/locales/client.cs.yml    |  2 +-
 config/locales/client.da.yml    |  8 ++++----
 config/locales/client.de.yml    | 12 ++++++------
 config/locales/client.el.yml    |  2 +-
 config/locales/client.en.yml    |  2 +-
 config/locales/client.en_US.yml |  2 +-
 config/locales/client.es.yml    | 12 ++++++------
 config/locales/client.et.yml    |  2 +-
 config/locales/client.fa_IR.yml | 12 ++++++------
 config/locales/client.fi.yml    | 12 ++++++------
 config/locales/client.fr.yml    |  2 +-
 config/locales/client.gl.yml    |  2 +-
 config/locales/client.he.yml    | 12 ++++++------
 config/locales/client.hu.yml    |  2 +-
 config/locales/client.hy.yml    |  2 +-
 config/locales/client.id.yml    |  2 +-
 config/locales/client.it.yml    |  2 +-
 config/locales/client.ja.yml    |  2 +-
 config/locales/client.ko.yml    |  2 +-
 config/locales/client.lt.yml    |  2 +-
 config/locales/client.lv.yml    |  2 +-
 config/locales/client.nb_NO.yml |  2 +-
 config/locales/client.nl.yml    | 12 ++++++------
 config/locales/client.pl_PL.yml |  2 +-
 config/locales/client.pt.yml    |  2 +-
 config/locales/client.pt_BR.yml | 12 ++++++------
 config/locales/client.ro.yml    |  2 +-
 config/locales/client.ru.yml    | 12 ++++++------
 config/locales/client.sk.yml    |  2 +-
 config/locales/client.sl.yml    |  2 +-
 config/locales/client.sq.yml    |  2 +-
 config/locales/client.sr.yml    |  2 +-
 config/locales/client.sv.yml    | 12 ++++++------
 config/locales/client.sw.yml    |  2 +-
 config/locales/client.te.yml    |  2 +-
 config/locales/client.th.yml    |  2 +-
 config/locales/client.tr_TR.yml |  2 +-
 config/locales/client.uk.yml    |  2 +-
 config/locales/client.ur.yml    |  2 +-
 config/locales/client.vi.yml    |  2 +-
 config/locales/client.zh_CN.yml |  8 ++++----
 config/locales/client.zh_TW.yml |  2 +-
 config/locales/server.bg.yml    | 10 +++++-----
 config/locales/server.bs_BA.yml | 10 +++++-----
 config/locales/server.da.yml    |  6 +++---
 config/locales/server.de.yml    | 10 +++++-----
 config/locales/server.en.yml    | 10 +++++-----
 config/locales/server.es.yml    | 10 +++++-----
 config/locales/server.fa_IR.yml | 10 +++++-----
 config/locales/server.fi.yml    | 10 +++++-----
 config/locales/server.fr.yml    |  8 ++++----
 config/locales/server.he.yml    | 10 +++++-----
 config/locales/server.nl.yml    | 10 +++++-----
 config/locales/server.pt_BR.yml | 10 +++++-----
 config/locales/server.ru.yml    | 10 +++++-----
 config/locales/server.sv.yml    | 10 +++++-----
 config/locales/server.zh_CN.yml |  8 ++++----
 61 files changed, 178 insertions(+), 178 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index bb88c38715..8b7e95c922 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -33,7 +33,7 @@ ar:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM h:mm a"
+      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY h:mm a"
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index 9dd640fb5b..9f1e68be00 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -28,7 +28,7 @@ bg:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM h:mm a"
+      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -260,11 +260,11 @@ bg:
       remove: "Премахнете отметката"
       save: "Запази"
       reminders:
-        later_today: "По-късно днес <br/>{{date}}"
-        next_business_day: "Следващият работен ден <br/>{{date}}"
-        tomorrow: "Утре <br/>{{date}}"
-        next_week: "Следващата седмица <br/>{{date}}"
-        next_month: "Следващият месец <br/>{{date}}"
+        later_today: "По-късно днес"
+        next_business_day: "Следващият работен ден"
+        tomorrow: "Утре"
+        next_week: "Следващата седмица"
+        next_month: "Следващият месец"
     drafts:
       resume: "Продължи"
       remove: "Премахване"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 99061a6922..a93fe0eb6b 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -29,7 +29,7 @@ bs_BA:
     dates:
       time: "HH: mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -294,11 +294,11 @@ bs_BA:
       no_timezone: 'Još uvijek niste postavili vremensku zonu, tako da nećete biti u mogućnosti koristiti podsjetnike. Postavite vremensku zonu <a href="%{basePath}/my/preferences/profile">na vašem profilu</a>.'
       reminders:
         at_desktop: "Sljedeći put sam za svojim desktop kompjuterom"
-        later_today: "Danas, malo kasnije <br/>{{date}}"
-        next_business_day: "Sljedeći radni dan <br/>{{date}}"
-        tomorrow: "Sutradan <br/>{{date}}"
-        next_week: "Sljedeće sedmice <br/>{{date}}"
-        next_month: "Sljedeći mjesec <br/>{{date}}"
+        later_today: "Danas, malo kasnije"
+        next_business_day: "Sljedeći radni dan"
+        tomorrow: "Sutradan"
+        next_week: "Sljedeće sedmice"
+        next_month: "Sljedeći mjesec"
         custom: "Precizno vrijeme i datum"
     drafts:
       resume: "Nastavi"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 74b0aab013..2eaf662830 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -28,7 +28,7 @@ ca:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM YYYY HH:mm"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 6040acb33b..6353c5eb02 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -30,7 +30,7 @@ cs:
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMMM H:mm"
+      long_no_year: "D. MMMM, H:mm"
       long_no_year_no_time: "D. MMMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. M. YYYY, H:mm"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 87ac724689..e4435f7242 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -28,7 +28,7 @@ da:
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMM HH:mm"
+      long_no_year: "D. MMM, HH:mm"
       long_no_year_no_time: "D. MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. MMM YYYY HH:mm"
@@ -265,9 +265,9 @@ da:
       confirm_clear: "Er du sikker på, at du vil rydde alle dine bogmærker fra dette emne?"
       save: "Gem"
       reminders:
-        tomorrow: "I morgen <br/>{{date}}"
-        next_week: "Næste uge <br/>{{date}}"
-        next_month: "Næste måned <br/>{{date}}"
+        tomorrow: "I morgen"
+        next_week: "Næste uge"
+        next_month: "Næste måned"
         custom: "Valgfri dato og tid"
     drafts:
       resume: "Genoptag"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index d39417f661..26b948f584 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -29,7 +29,7 @@ de:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMM [um] HH:mm"
+      long_no_year: "D. MMM, [um] HH:mm"
       long_no_year_no_time: "D. MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. MMM YYYY [um] HH:mm"
@@ -271,11 +271,11 @@ de:
       no_timezone: 'Du hast noch keine Zeitzone ausgewählt. Du wirst keine Erinnerungen erstellen können. Stelle eine <a href="%{basePath}/my/preferences/profile">in deinem Profil</a> ein.'
       reminders:
         at_desktop: "Nächstes mal wenn ich an meinem PC bin"
-        later_today: "Im Laufe des Tages <br/>{{date}}"
-        next_business_day: "Nächster Geschäftstag <br/>{{date}}"
-        tomorrow: "Morgen <br/>{{date}}"
-        next_week: "Nächste Woche <br/>{{date}}"
-        next_month: "Nächster Monat <br/>{{date}}"
+        later_today: "Im Laufe des Tages"
+        next_business_day: "Nächster Geschäftstag"
+        tomorrow: "Morgen"
+        next_week: "Nächste Woche"
+        next_month: "Nächster Monat"
         custom: "Eigenes Datum und Zeit"
     drafts:
       resume: "Fortsetzen"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 141223b830..810484e771 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -28,7 +28,7 @@ el:
     dates:
       time: "ΗΗ:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "DD MMM HH:mm"
+      long_no_year: "DD MMM, HH:mm"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY HH:mm"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 289e14161b..df0c07d641 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -44,7 +44,7 @@ en:
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
       timeline_date: "MMM YYYY"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_no_year: "D MMM HH:mm"
+      long_no_year: "D MMM, HH:mm"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
       long_no_year_no_time: "D MMM"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
diff --git a/config/locales/client.en_US.yml b/config/locales/client.en_US.yml
index 1f75f5f43e..96cf5c211d 100644
--- a/config/locales/client.en_US.yml
+++ b/config/locales/client.en_US.yml
@@ -8,7 +8,7 @@ en_US:
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
       timeline_date: "MMM YYYY"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
       long_no_year_no_time: "MMM D"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index f103b397ae..8a417d3868 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -29,7 +29,7 @@ es:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM HH:mm"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY HH:mm"
@@ -271,11 +271,11 @@ es:
       no_timezone: 'No has establecido una zona horaria todavía. No podrás establecer recordatorios. Puedes elegir una <a href="%{basePath}/my/preferences/profile">en tu perfil</a>.'
       reminders:
         at_desktop: "La próxima vez que esté en mi ordenador"
-        later_today: "Más tarde hoy <br/>{{date}}"
-        next_business_day: "El próximo día hábil <br/>{{date}}"
-        tomorrow: "Mañana <br/>{{date}}"
-        next_week: "La próxima semana <br/>{{date}}"
-        next_month: "El mes que viene <br/>{{date}}"
+        later_today: "Más tarde hoy"
+        next_business_day: "El próximo día hábil"
+        tomorrow: "Mañana"
+        next_week: "La próxima semana"
+        next_month: "El mes que viene"
         custom: "Fecha y hora personalizadas"
     drafts:
       resume: "Reanudar"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index b2300de284..ab3c11c8dc 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -28,7 +28,7 @@ et:
     dates:
       time: "hh:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMMM hh:mm"
+      long_no_year: "D. MMMM, hh:mm"
       long_no_year_no_time: "D. MMMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D. MMMM, YYYY hh:mm"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 2cae3f58ea..cc5a914031 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -29,7 +29,7 @@ fa_IR:
       time: "h:mm a"
       time_short_day: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -271,11 +271,11 @@ fa_IR:
       no_timezone: 'شما هنوز منطقه زمانی مشخص نکرده اید. شما قادر به تنظیم کردن یادآوری نیستید. یکی را در <a href="%{basePath}/my/preferences/profile"> پروفایل تان </a> تنظیم کنید.'
       reminders:
         at_desktop: "بار آینده من پشت میزم هستم"
-        later_today: "امروز کمی بعد <br/>{{date}}"
-        next_business_day: "روز کاری آینده <br/>{{date}}"
-        tomorrow: "فردا <br/>{{date}}"
-        next_week: "هفته ی آینده <br/>{{date}}"
-        next_month: "ماه آینده <br/>{{date}}"
+        later_today: "امروز کمی بعد"
+        next_business_day: "روز کاری آینده"
+        tomorrow: "فردا"
+        next_week: "هفته ی آینده"
+        next_month: "ماه آینده"
         custom: "درج تاریخ و ساعت"
     drafts:
       resume: "از سر گیری"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 7b4b32cd72..c64a976e1f 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -29,7 +29,7 @@ fi:
       time: "H:mm"
       time_short_day: "ddd HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMMM[ta] H:mm"
+      long_no_year: "D. MMMM[ta], H:mm"
       long_no_year_no_time: "D. MMMM[ta]"
       full_no_year_no_time: "Do MMMM[ta]"
       long_with_year: "D. MMMM[ta] YYYY H:mm"
@@ -271,11 +271,11 @@ fi:
       no_timezone: 'Et ole valinnut aikavyöhykettä, joten et voi asettaa muistutuksia. Aseta se  <a href="%{basePath}/my/preferences/profile">profiilisivullasi</a>.'
       reminders:
         at_desktop: "Ensi kerralla kun olen työpöytäympäristössäni"
-        later_today: "Myöhemmin tänään  <br/>{{date}}"
-        next_business_day: "Seuraavana arkipäivänä <br/>{{date}}"
-        tomorrow: "Huomenna <br/>{{date}}"
-        next_week: "Ensi viikolla <br/>{{date}}"
-        next_month: "Ensi kuussa <br/>{{date}}"
+        later_today: "Myöhemmin tänään "
+        next_business_day: "Seuraavana arkipäivänä"
+        tomorrow: "Huomenna"
+        next_week: "Ensi viikolla"
+        next_month: "Ensi kuussa"
         custom: "Valitse päivämäärä ja kellonaika"
     drafts:
       resume: "Jatka"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index a4f35a7890..f5ff9f75b8 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -29,7 +29,7 @@ fr:
       time: "HH:mm"
       time_short_day: "ddd [à] HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "DD MMM H:mm"
+      long_no_year: "DD MMM, H:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "DD MMM YYYY H:mm"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 76119eb82c..7003482704 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -28,7 +28,7 @@ gl:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM h:mm a"
+      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D MMMM"
       long_with_year: "D MMM, YYYY h:mm a"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index c6c9b2b68e..d8390f7145 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -31,7 +31,7 @@ he:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D בMMM ‏HH:mm"
+      long_no_year: "D בMMM, ‏HH:mm"
       long_no_year_no_time: "D בMMM"
       full_no_year_no_time: "Do בMMMM"
       long_with_year: "D בMMM ‏YYYY ‏HH:mm"
@@ -319,11 +319,11 @@ he:
       no_timezone: 'עדיין לא הגדרת אזור זמן. לא תהיה לך אפשרות להגדיר תזכורות. ניתן להגדיר אותו <a href="%{basePath}/my/preferences/profile">בפרופיל שלך</a>.'
       reminders:
         at_desktop: "בשימוש הבא דרך שולחן העבודה"
-        later_today: "המשך היום <br/>{{date}}"
-        next_business_day: "ביום העסקים הבא <br/>{{date}}"
-        tomorrow: "מחר <br/>{{date}}"
-        next_week: "בשבוע הבא <br/>{{date}}"
-        next_month: "בחודש הבא <br/>{{date}}"
+        later_today: "המשך היום"
+        next_business_day: "ביום העסקים הבא"
+        tomorrow: "מחר"
+        next_week: "בשבוע הבא"
+        next_month: "בחודש הבא"
         custom: "תאריך ושעה מותאמים אישית"
     drafts:
       resume: "המשך"
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index 32a29333d0..d93084fe01 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -28,7 +28,7 @@ hu:
     dates:
       time: "h:mm a"
       timeline_date: "YYYY MMMM"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMM DD"
       long_with_year: "MMM D, YYYY h:mm a"
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index 64b3eaeea8..072bd750b9 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -28,7 +28,7 @@ hy:
     dates:
       time: "h:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm"
+      long_no_year: "MMM D, h:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index b209cd0d38..81216edbec 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -28,7 +28,7 @@ id:
       time: "h:mm a"
       time_short_day: "ddd, HH: mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "BBB D h:mm a"
+      long_no_year: "BBB D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index a58d8484b1..cc6521b9d7 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -29,7 +29,7 @@ it:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM h:mm a"
+      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM YYYY h:mm a"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 8ecc2938e0..cda1e3e757 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -27,7 +27,7 @@ ja:
     dates:
       time: "H:mm"
       timeline_date: "YYYY年M月"
-      long_no_year: "M月D日 H:mm"
+      long_no_year: "M月D日, H:mm"
       long_no_year_no_time: "M月D日"
       full_no_year_no_time: "M月D日"
       long_with_year: "YYYY年M月D日 H:mm"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index f158cd492e..ad53763b2a 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -27,7 +27,7 @@ ko:
     dates:
       time: "a h:mm"
       timeline_date: "YYYY MMM"
-      long_no_year: "M D a h:mm"
+      long_no_year: "M D a, h:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "YYYY MMM D a h:mm"
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 10c0ee7acf..23861ae56e 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -30,7 +30,7 @@ lt:
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMMM D H:mm"
+      long_no_year: "MMMM D, H:mm"
       long_no_year_no_time: "MMMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "YYYY MMMM D H:mm"
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 4c85e26365..76235f9292 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -29,7 +29,7 @@ lv:
     dates:
       time: "hh:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D hh:mm"
+      long_no_year: "MMM D, hh:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY hh:mm"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index c6c078ae0b..53162f8a7e 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -28,7 +28,7 @@ nb_NO:
     dates:
       time: "LT"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM LT"
+      long_no_year: "D MMM, LT"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D MMM YYYY LT"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 9cbacc231d..183ec2ebb6 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -29,7 +29,7 @@ nl:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM HH:mm"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D MMMM"
       long_with_year: "D MMM YYYY HH:mm"
@@ -271,11 +271,11 @@ nl:
       no_timezone: 'U hebt nog geen tijdzone ingesteld. Hierdoor kunt u geen herinneringen instellen. Stel er een in <a href="%{basePath}/my/preferences/profile">in uw profiel</a>.'
       reminders:
         at_desktop: "De volgende keer vanaf mijn computer"
-        later_today: "Later vandaag <br/>{{date}}"
-        next_business_day: "Volgende werkdag <br/>{{date}}"
-        tomorrow: "Morgen <br/>{{date}}"
-        next_week: "Volgende week <br/>{{date}}"
-        next_month: "Volgende maand <br/>{{date}}"
+        later_today: "Later vandaag"
+        next_business_day: "Volgende werkdag"
+        tomorrow: "Morgen"
+        next_week: "Volgende week"
+        next_month: "Volgende maand"
         custom: "Aangepaste datum en tijd"
     drafts:
       resume: "Hervatten"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index a6bfdba8c2..0e170d8ca8 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -30,7 +30,7 @@ pl_PL:
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM H:mm"
+      long_no_year: "D MMM, H:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM YYYY H:mm"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index e90bc7df8e..7a8e4cb363 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -28,7 +28,7 @@ pt:
     dates:
       time: "hh:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "DD MMM hh:mm"
+      long_no_year: "DD MMM, hh:mm"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "DD MMM YYYY hh:mm"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index a792d11c64..c2100cc36d 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -29,7 +29,7 @@ pt_BR:
       time: "H:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM H:mm"
+      long_no_year: "D MMM, H:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D de MMMM"
       long_with_year: "D MMM, YYYY H:mm"
@@ -270,11 +270,11 @@ 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>.'
       reminders:
         at_desktop: "Da próxima vez que estiver na minha área de trabalho"
-        later_today: "Hoje mais tarde <br/>{{date}}"
-        next_business_day: "Próximo dia comercial <br/>{{date}}"
-        tomorrow: "Amanhã <br/>{{date}}"
-        next_week: "Próxima semana <br/>{{date}}"
-        next_month: "Próximo mês <br/>{{date}}"
+        later_today: "Hoje mais tarde"
+        next_business_day: "Próximo dia comercial"
+        tomorrow: "Amanhã"
+        next_week: "Próxima semana"
+        next_month: "Próximo mês"
         custom: "Data e hora personalizadas"
     drafts:
       resume: "Resumir"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 3249c29358..b5352de22d 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -29,7 +29,7 @@ ro:
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "DD MMM HH:mm"
+      long_no_year: "DD MMM, HH:mm"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM "
       long_with_year: "DD MMM YYYY HH:mm"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 72064bfd92..de1b818d13 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -31,7 +31,7 @@ ru:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM HH:mm"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D MMM"
       long_with_year: "D MMM YYYY, HH:mm"
@@ -319,11 +319,11 @@ ru:
       no_timezone: 'Укажите ваш часовой пояс <a href="%{basePath}/my/preferences/profile">в настройках своей учетной записи</a>, чтобы активировать функцию напоминаний.'
       reminders:
         at_desktop: "При следующем посещении форума"
-        later_today: "На сегодня, но чуть позже <br/>{{date}}"
-        next_business_day: "На следующий рабочий день <br/>{{date}}"
-        tomorrow: "На завтра <br/>{{date}}"
-        next_week: "На следующую неделю <br/>{{date}}"
-        next_month: "На следующий месяц <br/>{{date}}"
+        later_today: "На сегодня, но чуть позже"
+        next_business_day: "На следующий рабочий день"
+        tomorrow: "На завтра"
+        next_week: "На следующую неделю"
+        next_month: "На следующий месяц"
         custom: "Установить дату и время напоминания"
     drafts:
       resume: "Продолжить"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 80ca90c2e9..581b512a14 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -30,7 +30,7 @@ sk:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 3c84ec4ce6..1cb2bae4eb 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -30,7 +30,7 @@ sl:
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMM H:mm"
+      long_no_year: "D. MMM, H:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. MMM YYYY H:mm"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index e45a058273..2d814f9718 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -28,7 +28,7 @@ sq:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index e5ac7b8c51..20f594e376 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -29,7 +29,7 @@ sr:
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM HH:mm"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM YYYY HH:mm"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 268b3d9cb1..d856489c4d 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -29,7 +29,7 @@ sv:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM, YYYY h:mm a"
@@ -271,11 +271,11 @@ sv:
       no_timezone: 'Du har ännu inte valt tidszon. Du kommer därför inte kunna sätta påminnelser. Ange en <a href="%{basePath}/my/preferences/profile">i din profil</a>.'
       reminders:
         at_desktop: "Nästa gång är jag vid datorn"
-        later_today: "Senare idag <br/>{{date}}"
-        next_business_day: "Nästa arbetsdag <br/>{{date}}"
-        tomorrow: "Imorgon <br/>{{date}}"
-        next_week: "Nästa vecka <br/>{{date}}"
-        next_month: "Nästa månad <br/>{{date}}"
+        later_today: "Senare idag"
+        next_business_day: "Nästa arbetsdag"
+        tomorrow: "Imorgon"
+        next_week: "Nästa vecka"
+        next_month: "Nästa månad"
         custom: "Anpassa datum och tid"
     drafts:
       resume: "Återuppta"
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 37a5bbea3e..5f1e71b61e 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -28,7 +28,7 @@ sw:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index dd6bb45f82..3e792c170f 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -24,7 +24,7 @@ te:
             tb: టీబీ
     dates:
       time: "h:mm a"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       long_with_year: "MMM D, YYYY h:mm a"
       long_with_year_no_time: "MMM D, YYYY"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index bb31cf179d..3149fc5af8 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -27,7 +27,7 @@ th:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 90724174ad..65a225f7c8 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -29,7 +29,7 @@ tr_TR:
       time: "h:mm a"
       time_short_day: "ggg, SS:dd"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM h:mm a"
+      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM, YYYY h:mm a"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 2ffafbd745..be53040281 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -31,7 +31,7 @@ uk:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM HH:mm"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY, HH:mm"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 8187555885..99524b1b41 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -28,7 +28,7 @@ ur:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index f69a16b7d1..f71871ae86 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -28,7 +28,7 @@ vi:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM HH:mm"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY HH:mm"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 7ad3ead0be..ced1e8b9f5 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -28,7 +28,7 @@ zh_CN:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "YYYY[年]M[月]"
-      long_no_year: "M[月]D[日] HH:mm"
+      long_no_year: "M[月]D[日], HH:mm"
       long_no_year_no_time: "M月D日"
       full_no_year_no_time: "M月D日"
       long_with_year: "YYYY年M月D日 HH:mm"
@@ -248,9 +248,9 @@ zh_CN:
       reminders:
         at_desktop: "下次我使用桌面设备时"
         later_today: "今天晚些时候<br/> {{date}}"
-        next_business_day: "下个工作日<br/>{{date}}"
-        tomorrow: "明天<br/>{{date}}"
-        next_week: "下周<br/>{{date}}"
+        next_business_day: "下个工作日"
+        tomorrow: "明天"
+        next_week: "下周"
         next_month: "下个月<br/> {{date}}"
         custom: "自定义日期和时间"
     drafts:
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index eccce60986..80d0e7920c 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -27,7 +27,7 @@ zh_TW:
     dates:
       time: "h:mm a"
       timeline_date: "YYYY年 M月"
-      long_no_year: "M月 D日 h:mm a"
+      long_no_year: "M月 D日, h:mm a"
       long_no_year_no_time: "M月 D日"
       full_no_year_no_time: "M月 D日"
       long_with_year: "YYYY年 M月 D日 h:mm a"
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index c835d6fdc6..93a19cfefd 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -176,11 +176,11 @@ bg:
   excerpt_image: "изображение"
   bookmarks:
     reminders:
-      later_today: "По-късно днес <br/>{{date}}"
-      next_business_day: "Следващият работен ден <br/>{{date}}"
-      tomorrow: "Утре <br/>{{date}}"
-      next_week: "Следващата седмица <br/>{{date}}"
-      next_month: "Следващият месец <br/>{{date}}"
+      later_today: "По-късно днес"
+      next_business_day: "Следващият работен ден"
+      tomorrow: "Утре"
+      next_week: "Следващата седмица"
+      next_month: "Следващият месец"
   groups:
     errors:
       invalid_domain: "'%{domain}' е невалиден домейн."
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 1d8c0b4e2b..49473d134d 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -154,11 +154,11 @@ bs_BA:
   bookmarks:
     reminders:
       at_desktop: "Sljedeći put sam za svojim desktop kompjuterom"
-      later_today: "Danas, malo kasnije <br/>{{date}}"
-      next_business_day: "Sljedeći radni dan <br/>{{date}}"
-      tomorrow: "Sutradan <br/>{{date}}"
-      next_week: "Sljedeće sedmice <br/>{{date}}"
-      next_month: "Naredni mjesec <br/>{{date}}"
+      later_today: "Danas, malo kasnije"
+      next_business_day: "Sljedeći radni dan"
+      tomorrow: "Sutradan"
+      next_week: "Sljedeće sedmice"
+      next_month: "Naredni mjesec"
       custom: "Ciljano vrijeme i datum"
   groups:
     default_names:
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index f7f60829ff..05e49b2d2c 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -293,9 +293,9 @@ da:
   excerpt_image: "billede"
   bookmarks:
     reminders:
-      tomorrow: "I morgen <br/>{{date}}"
-      next_week: "Næste uge <br/>{{date}}"
-      next_month: "Næste måned <br/>{{date}}"
+      tomorrow: "I morgen"
+      next_week: "Næste uge"
+      next_month: "Næste måned"
       custom: "Valgfri dato og tid"
   groups:
     success:
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index e463bdcec1..e8570280b0 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -331,11 +331,11 @@ de:
       time_must_be_provided: "Zeit muss eingestellt werden für alle Erinnerungen ausser '%{reminder_type}'"
     reminders:
       at_desktop: "Nächstes mal wenn ich an meinem PC bin"
-      later_today: "Im Laufe des Tages <br/>{{date}}"
-      next_business_day: "Nächster Geschäftstag <br/>{{date}}"
-      tomorrow: "Morgen <br/>{{date}}"
-      next_week: "Nächste Woche <br/>{{date}}"
-      next_month: "Nächster Monat <br/>{{date}}"
+      later_today: "Im Laufe des Tages"
+      next_business_day: "Nächster Geschäftstag"
+      tomorrow: "Morgen"
+      next_week: "Nächste Woche"
+      next_month: "Nächster Monat"
       custom: "Eigenes Datum und Zeit"
   groups:
     success:
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 410f545eba..5574f69ae8 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -391,11 +391,11 @@ en:
 
     reminders:
       at_desktop: "Next time I'm at my desktop"
-      later_today: "Later today <br/>{{date}}"
-      next_business_day: "Next business day <br/>{{date}}"
-      tomorrow: "Tomorrow <br/>{{date}}"
-      next_week: "Next week <br/>{{date}}"
-      next_month: "Next month <br/>{{date}}"
+      later_today: "Later today"
+      next_business_day: "Next business day"
+      tomorrow: "Tomorrow"
+      next_week: "Next week"
+      next_month: "Next month"
       custom: "Custom date and time"
 
   groups:
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index a8d10b3571..9f545d92eb 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -331,11 +331,11 @@ es:
       time_must_be_provided: "se debe especificar la hora para todos los recordatorios excepto '%{reminder_type}'"
     reminders:
       at_desktop: "La próxima vez que esté en mi ordenador"
-      later_today: "Más tarde hoy <br/>{{date}}"
-      next_business_day: "El próximo día hábil <br/>{{date}}"
-      tomorrow: "Mañana <br/>{{date}}"
-      next_week: "La próxima semana <br/>{{date}}"
-      next_month: "El mes que viene <br/>{{date}}"
+      later_today: "Más tarde hoy"
+      next_business_day: "El próximo día hábil"
+      tomorrow: "Mañana"
+      next_week: "La próxima semana"
+      next_month: "El mes que viene"
       custom: "Fecha y hora personalizadas"
   groups:
     success:
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index fec91a39a9..d957ab034e 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -222,11 +222,11 @@ fa_IR:
   bookmarks:
     reminders:
       at_desktop: "بار آینده من پشت میزم هستم"
-      later_today: "امروز کمی بعد <br/>{{date}}"
-      next_business_day: "روز کاری آینده <br/>{{date}}"
-      tomorrow: "فردا <br/>{{date}}"
-      next_week: "هفته ی آینده <br/>{{date}}"
-      next_month: "ماه آینده <br/>{{date}}"
+      later_today: "امروز کمی بعد"
+      next_business_day: "روز کاری آینده"
+      tomorrow: "فردا"
+      next_week: "هفته ی آینده"
+      next_month: "ماه آینده"
       custom: "درج تاریخ و ساعت"
   groups:
     errors:
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index cc70ad1c0b..875c63ffc0 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -331,11 +331,11 @@ fi:
       time_must_be_provided: "kaikkiin muistutuksiin paitsi '%{reminder_type}' tarvitaan aika"
     reminders:
       at_desktop: "Ensi kerralla kun olen työpöytäympäristössäni"
-      later_today: "Myöhemmin tänään  <br/>{{date}}"
-      next_business_day: "Seuraavana arkipäivänä <br/>{{date}}"
-      tomorrow: "Huomenna <br/>{{date}}"
-      next_week: "Ensi viikolla <br/>{{date}}"
-      next_month: "Ensi kuussa <br/>{{date}}"
+      later_today: "Myöhemmin tänään "
+      next_business_day: "Seuraavana arkipäivänä"
+      tomorrow: "Huomenna"
+      next_week: "Ensi viikolla"
+      next_month: "Ensi kuussa"
       custom: "Valitse päivämäärä ja kellonaika"
   groups:
     success:
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index ed4897d43e..8169754c58 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -328,10 +328,10 @@ fr:
     reminders:
       at_desktop: "La prochaine fois je suis à mon bureau"
       later_today: "Plus tard dans la journée\n{{date}}"
-      next_business_day: "Prochain jour ouvré<br/>{{date}}"
-      tomorrow: "Demain<br/>{{date}}"
-      next_week: "La semaine prochaine<br/>{{date}}"
-      next_month: "Le mois prochain<br/>{{date}}"
+      next_business_day: "Prochain jour ouvré"
+      tomorrow: "Demain"
+      next_week: "La semaine prochaine"
+      next_month: "Le mois prochain"
       custom: "Date et heure personnalisés"
   groups:
     success:
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 7d39b64201..2a4d0b5263 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -362,11 +362,11 @@ he:
       time_must_be_provided: "צריך לציין זמן לכל התזכורות למעט ‚%{reminder_type}’"
     reminders:
       at_desktop: "בשימוש הבא דרך שולחן העבודה"
-      later_today: "המשך היום <br/>{{date}}"
-      next_business_day: "ביום העסקים הבא <br/>{{date}}"
-      tomorrow: "מחר <br/>{{date}}"
-      next_week: "בשבוע הבא <br/>{{date}}"
-      next_month: "בחודש הבא <br/>{{date}}"
+      later_today: "המשך היום"
+      next_business_day: "ביום העסקים הבא"
+      tomorrow: "מחר"
+      next_week: "בשבוע הבא"
+      next_month: "בחודש הבא"
       custom: "תאריך ושעה מותאמים אישית"
   groups:
     success:
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index adebe50938..a0199c90ca 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -332,11 +332,11 @@ nl:
       time_must_be_provided: "tijd moet voor alle herinneringen behalve '%{reminder_type}' worden opgegeven"
     reminders:
       at_desktop: "De volgende keer vanaf mijn computer"
-      later_today: "Later vandaag <br/>{{date}}"
-      next_business_day: "Volgende werkdag <br/>{{date}}"
-      tomorrow: "Morgen <br/>{{date}}"
-      next_week: "Volgende week <br/>{{date}}"
-      next_month: "Volgende maand <br/>{{date}}"
+      later_today: "Later vandaag"
+      next_business_day: "Volgende werkdag"
+      tomorrow: "Morgen"
+      next_week: "Volgende week"
+      next_month: "Volgende maand"
       custom: "Aangepaste datum en tijd"
   groups:
     success:
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 34f2e9b252..d2967f6158 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -316,11 +316,11 @@ pt_BR:
   bookmarks:
     reminders:
       at_desktop: "Da próxima vez que estiver na minha área de trabalho"
-      later_today: "Hoje mais tarde <br/>{{date}}"
-      next_business_day: "Próximo dia comercial <br/>{{date}}"
-      tomorrow: "Amanhã <br/>{{date}}"
-      next_week: "Próxima semana <br/>{{date}}"
-      next_month: "Próximo mês <br/>{{date}}"
+      later_today: "Hoje mais tarde"
+      next_business_day: "Próximo dia comercial"
+      tomorrow: "Amanhã"
+      next_week: "Próxima semana"
+      next_month: "Próximo mês"
       custom: "Data e hora personalizadas"
   groups:
     success:
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 6699cf541d..df0609a743 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -353,11 +353,11 @@ ru:
       time_must_be_provided: "время должно быть установлено для всех напоминаний, кроме '%{reminder_type}'"
     reminders:
       at_desktop: "При следующем посещении форума"
-      later_today: "На сегодня, но чуть позже <br/>{{date}}"
-      next_business_day: "На следующий рабочий день <br/>{{date}}"
-      tomorrow: "На завтра <br/>{{date}}"
-      next_week: "На следующую неделю <br/>{{date}}"
-      next_month: "На следующий месяц <br/>{{date}}"
+      later_today: "На сегодня, но чуть позже"
+      next_business_day: "На следующий рабочий день"
+      tomorrow: "На завтра"
+      next_week: "На следующую неделю"
+      next_month: "На следующий месяц"
       custom: "Установить дату и время напоминания"
   groups:
     success:
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 68dc3866d4..94f6b6b931 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -332,11 +332,11 @@ sv:
       time_must_be_provided: "tid måste tillhandahållas för alla påminnelser utom '%{reminder_type}'"
     reminders:
       at_desktop: "Nästa gång är jag vid datorn"
-      later_today: "Senare idag <br/>{{date}}"
-      next_business_day: "Nästa arbetsdag <br/>{{date}}"
-      tomorrow: "Imorgon <br/>{{date}}"
-      next_week: "Nästa vecka <br/>{{date}}"
-      next_month: "Nästa månad <br/>{{date}}"
+      later_today: "Senare idag"
+      next_business_day: "Nästa arbetsdag"
+      tomorrow: "Imorgon"
+      next_week: "Nästa vecka"
+      next_month: "Nästa månad"
       custom: "Anpassa datum och tid"
   groups:
     success:
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index af53b87eb5..09c3f2f18d 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -317,10 +317,10 @@ zh_CN:
       time_must_be_provided: "必须为除“ %{reminder_type}”以外的所有提醒提供时间"
     reminders:
       at_desktop: "下次我使用桌面设备时"
-      later_today: "晚于今天的<br/>{{date}}"
-      next_business_day: "下个工作日的<br/>{{date}}"
-      tomorrow: "明天<br/>{{date}}"
-      next_week: "下周<br/>{{date}}"
+      later_today: "晚于今天的"
+      next_business_day: "下个工作日的"
+      tomorrow: "明天"
+      next_week: "下周"
       next_month: "下个月<br/> {{date}}"
       custom: "自定义日期和时间"
   groups:

From 81c912bb003e7f7d97f2decee876b7581486de29 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 6 Apr 2020 16:29:14 +1000
Subject: [PATCH 0513/1830] FIX: when loading drafts set the topic

the behavior of loadDraft regressed and it no longer correctly set the topic
model leading to "undefined" when attempting to reply
---
 app/assets/javascripts/discourse/controllers/composer.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/controllers/composer.js b/app/assets/javascripts/discourse/controllers/composer.js
index 297d635fc0..c26be5f36a 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js
+++ b/app/assets/javascripts/discourse/controllers/composer.js
@@ -54,7 +54,8 @@ function loadDraft(store, opts) {
       draftKey,
       draftSequence,
       draft: true,
-      composerState: Composer.DRAFT
+      composerState: Composer.DRAFT,
+      topic: opts.topic
     };
 
     serializedFields.forEach(f => {

From a947b7b839cfdd7436d533752d4df3eee1ce8bec Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 6 Apr 2020 15:06:26 +0200
Subject: [PATCH 0514/1830] FIX: prevents registering multiple
 `topic-notifications-button:changed` (#9356)

A large topic page will always have the bottom tracking button, and will also have the timeline, meaning we already had 2 tracking events.

But it gets even worse when you know that the timeline button is a component connector which will trigger `didInsertElement` very frequently, meaning we were constantly adding more and more appEvents handlers.
---
 .../discourse/widgets/topic-timeline.js       |  3 ++-
 .../components/topic-notifications-button.js  | 24 +++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js b/app/assets/javascripts/discourse/widgets/topic-timeline.js
index 617a13bcd4..5f3cabfb8e 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js
@@ -388,7 +388,8 @@ createWidget("timeline-footer-controls", {
             topic,
             showFullTitle: false,
             appendReason: false,
-            placement: "bottom-end"
+            placement: "bottom-end",
+            mountedAsWidget: true
           },
           ["notificationLevel"]
         )
diff --git a/app/assets/javascripts/select-kit/components/topic-notifications-button.js b/app/assets/javascripts/select-kit/components/topic-notifications-button.js
index 747685c2ae..a0c16738b5 100644
--- a/app/assets/javascripts/select-kit/components/topic-notifications-button.js
+++ b/app/assets/javascripts/select-kit/components/topic-notifications-button.js
@@ -10,21 +10,25 @@ export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
 
-    this.appEvents.on(
-      "topic-notifications-button:changed",
-      this,
-      "_changeTopicNotificationLevel"
-    );
+    if (!this.mountedAsWidget) {
+      this.appEvents.on(
+        "topic-notifications-button:changed",
+        this,
+        "_changeTopicNotificationLevel"
+      );
+    }
   },
 
   willDestroyElement() {
     this._super(...arguments);
 
-    this.appEvents.off(
-      "topic-notifications-button:changed",
-      this,
-      "_changeTopicNotificationLevel"
-    );
+    if (!this.mountedAsWidget) {
+      this.appEvents.off(
+        "topic-notifications-button:changed",
+        this,
+        "_changeTopicNotificationLevel"
+      );
+    }
   },
 
   _changeTopicNotificationLevel(level) {

From fd39c85c1aea29bc396836ea7a9626a5b1793cb0 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Mon, 6 Apr 2020 20:43:38 +0530
Subject: [PATCH 0515/1830] FIX: add category hashtags support for sub-sub
 categories.

Hashtags will include last two levels only (ex: "parent:child").
---
 .../javascripts/discourse/lib/category-tag-search.js |  2 +-
 app/assets/javascripts/discourse/models/category.js  |  7 ++++---
 app/models/concerns/category_hashtag.rb              |  8 ++++----
 spec/components/concern/category_hashtag_spec.rb     | 12 ++++++++++++
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/category-tag-search.js b/app/assets/javascripts/discourse/lib/category-tag-search.js
index ca1ddcc85e..c258ddb6ae 100644
--- a/app/assets/javascripts/discourse/lib/category-tag-search.js
+++ b/app/assets/javascripts/discourse/lib/category-tag-search.js
@@ -76,7 +76,7 @@ export function search(term, siteSettings) {
   var numOfCategories = categories.length;
 
   categories = categories.map(category => {
-    return { model: category, text: Category.slugFor(category, SEPARATOR) };
+    return { model: category, text: Category.slugFor(category, SEPARATOR, 2) };
   });
 
   if (numOfCategories !== limit && siteSettings.tagging_enabled) {
diff --git a/app/assets/javascripts/discourse/models/category.js b/app/assets/javascripts/discourse/models/category.js
index bbbe590d0b..f264248f52 100644
--- a/app/assets/javascripts/discourse/models/category.js
+++ b/app/assets/javascripts/discourse/models/category.js
@@ -264,14 +264,15 @@ Category.reopenClass({
     return _uncategorized;
   },
 
-  slugFor(category, separator = "/") {
+  slugFor(category, separator = "/", depth = 3) {
     if (!category) return "";
 
     const parentCategory = get(category, "parentCategory");
     let result = "";
 
-    if (parentCategory) {
-      result = Category.slugFor(parentCategory) + separator;
+    if (parentCategory && depth > 1) {
+      result =
+        Category.slugFor(parentCategory, separator, depth - 1) + separator;
     }
 
     const id = get(category, "id"),
diff --git a/app/models/concerns/category_hashtag.rb b/app/models/concerns/category_hashtag.rb
index 5a8c92f92c..95b1521c25 100644
--- a/app/models/concerns/category_hashtag.rb
+++ b/app/models/concerns/category_hashtag.rb
@@ -9,17 +9,17 @@ module CategoryHashtag
     def query_from_hashtag_slug(category_slug)
       parent_slug, child_slug = category_slug.split(SEPARATOR, 2)
 
-      category = Category.where(slug: parent_slug, parent_category_id: nil)
+      categories = Category.where(slug: parent_slug)
 
       if child_slug
-        Category.where(slug: child_slug, parent_category_id: category.select(:id)).first
+        Category.where(slug: child_slug, parent_category_id: categories.select(:id)).first
       else
-        category.first
+        categories.where(parent_category_id: nil).first
       end
     end
   end
 
   def hashtag_slug
-    full_slug(SEPARATOR)
+    full_slug.split("-").last(2).join(SEPARATOR)
   end
 end
diff --git a/spec/components/concern/category_hashtag_spec.rb b/spec/components/concern/category_hashtag_spec.rb
index 3d59995bab..81f437efae 100644
--- a/spec/components/concern/category_hashtag_spec.rb
+++ b/spec/components/concern/category_hashtag_spec.rb
@@ -36,5 +36,17 @@ describe CategoryHashtag do
       expect(Category.query_from_hashtag_slug("apple")).to eq(nil)
       expect(Category.query_from_hashtag_slug("apple#{CategoryHashtag::SEPARATOR}orange")).to eq(nil)
     end
+
+    context "multi-level categories" do
+      before do
+        SiteSetting.max_category_nesting = 3
+      end
+
+      it "should return the right result for a grand child category slug" do
+        category = Fabricate(:category, parent_category: child_category)
+        expect(Category.query_from_hashtag_slug("#{child_category.slug}#{CategoryHashtag::SEPARATOR}#{category.slug}"))
+          .to eq(category)
+      end
+    end
   end
 end

From a00cfe853a438d57e23c570819e83e7e94f0d700 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 6 Apr 2020 11:34:59 -0400
Subject: [PATCH 0516/1830] Build(deps): Bump parser from 2.7.0.5 to 2.7.1.0
 (#9347)

Bumps [parser](https://github.com/whitequark/parser) from 2.7.0.5 to 2.7.1.0.
- [Release notes](https://github.com/whitequark/parser/releases)
- [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/whitequark/parser/compare/v2.7.0.5...v2.7.1.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index a087e40104..25b0c3c6b1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -253,7 +253,7 @@ GEM
     parallel (1.19.1)
     parallel_tests (2.32.0)
       parallel
-    parser (2.7.0.5)
+    parser (2.7.1.0)
       ast (~> 2.4.0)
     pg (1.2.3)
     progress (3.5.2)

From 8c06c64bfb663c6bbcb0cdfad53e5a44875b5795 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 6 Apr 2020 11:35:29 -0400
Subject: [PATCH 0517/1830] Build(deps): Bump aws-sdk-s3 from 1.61.1 to 1.61.2
 (#9348)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.61.1 to 1.61.2.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 25b0c3c6b1..c471c491cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,8 +45,8 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.284.0)
-    aws-sdk-core (3.91.0)
+    aws-partitions (1.294.0)
+    aws-sdk-core (3.92.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -54,7 +54,7 @@ GEM
     aws-sdk-kms (1.30.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.61.1)
+    aws-sdk-s3 (1.61.2)
       aws-sdk-core (~> 3, >= 3.83.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)

From 24fbe3e7962bb7088884a5f25a4cce1a31697df5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 6 Apr 2020 11:40:45 -0400
Subject: [PATCH 0518/1830] Build(deps): Bump oj from 3.10.5 to 3.10.6 (#9351)

Bumps [oj](https://github.com/ohler55/oj) from 3.10.5 to 3.10.6.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.5...v3.10.6)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index c471c491cd..0144fa498f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -216,7 +216,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.10.5)
+    oj (3.10.6)
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)

From c72fb252a564904cd4d3f4d21e35f2fcc833493d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 6 Apr 2020 11:41:47 -0400
Subject: [PATCH 0519/1830] Build(deps): Bump loofah from 2.4.0 to 2.5.0
 (#9352)

Bumps [loofah](https://github.com/flavorjones/loofah) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.4.0...v2.5.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 0144fa498f..cffd95eeb1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -173,7 +173,7 @@ GEM
     logstash-logger (0.26.1)
       logstash-event (~> 1.2)
     logster (2.8.0)
-    loofah (2.4.0)
+    loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)

From ed74a6c1264e0674caeb5bcf684da1e322e4dffc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 6 Apr 2020 11:42:03 -0400
Subject: [PATCH 0520/1830] Build(deps): Bump public_suffix from 4.0.3 to 4.0.4
 (#9353)

Bumps [public_suffix](https://github.com/weppos/publicsuffix-ruby) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/weppos/publicsuffix-ruby/releases)
- [Changelog](https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/weppos/publicsuffix-ruby/compare/4.0.3...v4.0.4)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index cffd95eeb1..cb70d824a3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -264,7 +264,7 @@ GEM
       pry (>= 0.9.10, < 0.13.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (4.0.3)
+    public_suffix (4.0.4)
     puma (4.3.3)
       nio4r (~> 2.0)
     r2 (0.2.7)

From 3814ca06a82e064222e8a46933acad734d5b97c4 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 6 Apr 2020 17:24:59 +0100
Subject: [PATCH 0521/1830] DEV: Allow using .js extension for javascript
 modules in themes (#9358)

---
 app/models/theme_field.rb       | 2 +-
 spec/models/theme_field_spec.rb | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index 085a0e649e..ed0966fb5c 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -134,7 +134,7 @@ class ThemeField < ActiveRecord::Base
     filename, extension = name.split(".", 2)
     begin
       case extension
-      when "js.es6"
+      when "js.es6", "js"
         js_compiler.append_module(content, filename)
       when "hbs"
         js_compiler.append_ember_template(filename.sub("discourse/templates/", ""), content)
diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rb
index 28d2e3de14..306b3aeec3 100644
--- a/spec/models/theme_field_spec.rb
+++ b/spec/models/theme_field_spec.rb
@@ -173,7 +173,8 @@ HTML
 
   it "correctly handles extra JS fields" do
     theme = Fabricate(:theme)
-    js_field = theme.set_field(target: :extra_js, name: "discourse/controllers/discovery.js.es6", value: "import 'discourse/lib/ajax'; console.log('hello');")
+    js_field = theme.set_field(target: :extra_js, name: "discourse/controllers/discovery.js.es6", value: "import 'discourse/lib/ajax'; console.log('hello from .js.es6');")
+    js_2_field = theme.set_field(target: :extra_js, name: "discourse/controllers/discovery-2.js", value: "import 'discourse/lib/ajax'; console.log('hello from .js');")
     hbs_field = theme.set_field(target: :extra_js, name: "discourse/templates/discovery.hbs", value: "{{hello-world}}")
     raw_hbs_field = theme.set_field(target: :extra_js, name: "discourse/templates/discovery.hbr", value: "{{hello-world}}")
     hbr_field = theme.set_field(target: :extra_js, name: "discourse/templates/other_discovery.hbr", value: "{{hello-world}}")
@@ -189,7 +190,7 @@ HTML
         var themePrefix = function themePrefix(key) {
           return "theme_translations.#{theme.id}." + key;
         };
-        console.log('hello');
+        console.log('hello from .js.es6');
       });
     JS
     expect(js_field.reload.value_baked).to eq(expected_js.strip)
@@ -204,6 +205,7 @@ HTML
     expect(theme.javascript_cache.content).to include('Ember.TEMPLATES["discovery"]')
     expect(theme.javascript_cache.content).to include('Discourse.RAW_TEMPLATES["discovery"]')
     expect(theme.javascript_cache.content).to include('define("discourse/controllers/discovery"')
+    expect(theme.javascript_cache.content).to include('define("discourse/controllers/discovery-2"')
     expect(theme.javascript_cache.content).to include("var settings =")
   end
 

From 30983021e266489b65a12c1ad32d3e42806d2186 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Mon, 6 Apr 2020 12:02:33 -0500
Subject: [PATCH 0522/1830] No category styles (#9359)

* UI: "No category styles" apply to category boxes
---
 .../components/categories-boxes-with-topics.js   |  2 ++
 .../discourse/components/categories-boxes.js     |  2 ++
 .../components/categories-boxes-with-topics.hbs  |  2 +-
 .../templates/components/categories-boxes.hbs    |  2 +-
 .../discourse/templates/user/messages.hbs        |  4 ++--
 .../stylesheets/common/base/category-list.scss   | 16 ++++++++++++++++
 .../stylesheets/desktop/category-list.scss       |  5 -----
 7 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js b/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js
index ffd3a77ca8..40fb4df22f 100644
--- a/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js
+++ b/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js
@@ -1,6 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import Component from "@ember/component";
+import { equal } from "@ember/object/computed";
 
 export default Component.extend({
   tagName: "section",
@@ -8,6 +9,7 @@ export default Component.extend({
     ":category-boxes-with-topics",
     "anyLogos:with-logos:no-logos"
   ],
+  noCategoryStyle: equal("siteSettings.category_style", "none"),
 
   @discourseComputed("categories.[].uploaded_logo.url")
   anyLogos() {
diff --git a/app/assets/javascripts/discourse/components/categories-boxes.js b/app/assets/javascripts/discourse/components/categories-boxes.js
index c3aadd638c..331d06c216 100644
--- a/app/assets/javascripts/discourse/components/categories-boxes.js
+++ b/app/assets/javascripts/discourse/components/categories-boxes.js
@@ -1,6 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import Component from "@ember/component";
+import { equal } from "@ember/object/computed";
 
 export default Component.extend({
   tagName: "section",
@@ -9,6 +10,7 @@ export default Component.extend({
     "anyLogos:with-logos:no-logos",
     "hasSubcategories:with-subcategories"
   ],
+  noCategoryStyle: equal("siteSettings.category_style", "none"),
 
   @discourseComputed("categories.[].uploaded_logo.url")
   anyLogos() {
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
index d4a40fc5a9..fc71891854 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
@@ -1,5 +1,5 @@
 {{#each categories as |c|}}
-  <div data-notification-level={{c.notificationLevelString}} class='category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}}' style={{border-color c.color}}>
+  <div data-notification-level={{c.notificationLevelString}} class='category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-boxes-style"}}' style={{unless noCategoryStyle (border-color c.color)}}>
     <div class='category-box-inner'>
       <div class='category-box-heading'>
         <a href={{c.url}}>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index b629646a56..755eea2b72 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -1,5 +1,5 @@
 {{#each categories as |c|}}
-  <div class='category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}}' style={{border-color c.color}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}}
+  <div class='category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-boxes-style"}}' style={{unless noCategoryStyle (border-color c.color)}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}}
    data-url={{c.url}}>
     <div class='category-box-inner'>
       {{#unless c.isMuted}}
diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs
index 3dc34f67a1..643928faa1 100644
--- a/app/assets/javascripts/discourse/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/user/messages.hbs
@@ -1,7 +1,7 @@
 {{#d-section class="user-secondary-navigation" pageClass="user-messages"}}
   {{#unless site.mobileView}}
     {{#if showNewPM}}
-      {{d-button class="btn-primary new-private-message" action=(route-action "composePrivateMessage") icon="envelope" label="user.new_private_message"}}
+      {{d-button class="btn-primary new-" action=(route-action "composePrivateMessage") icon="envelope" label="user.new_private_message"}}
     {{/if}}
   {{/unless}}
 
@@ -72,7 +72,7 @@
     {{#if site.mobileView}}
       {{#if showNewPM}}
         {{d-button
-          class="btn-primary new-private-message"
+          class="btn-primary new-"
           action=(route-action "composePrivateMessage")
           icon="envelope"
           label="user.new_private_message"}}
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index b7cc6432a7..782415c5dc 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -324,3 +324,19 @@
     color: $primary-medium;
   }
 }
+
+.category-list {
+  tbody {
+    .category {
+      &.no-category-style {
+        border-color: transparent;
+        border-left: 0px;
+        padding-left: 0px;
+      }
+    }
+  }
+}
+
+.category-box.no-category-boxes-style {
+  border-left-width: 2px;
+}
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index c5774106ab..50801d9d34 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -94,11 +94,6 @@
 
   tbody {
     .category {
-      &.no-category-style {
-        border-color: transparent;
-        border-left: 0px;
-        padding-left: 0px;
-      }
       border-left: 6px solid;
       h3,
       h4 {

From 028915e4b9b0c72bfcb794aa52c57fb0d7abf5b1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 6 Apr 2020 19:22:29 +0200
Subject: [PATCH 0523/1830] FIX: revert inadvertently removed css class (#9360)

---
 app/assets/javascripts/discourse/templates/user/messages.hbs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs
index 643928faa1..3dc34f67a1 100644
--- a/app/assets/javascripts/discourse/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/user/messages.hbs
@@ -1,7 +1,7 @@
 {{#d-section class="user-secondary-navigation" pageClass="user-messages"}}
   {{#unless site.mobileView}}
     {{#if showNewPM}}
-      {{d-button class="btn-primary new-" action=(route-action "composePrivateMessage") icon="envelope" label="user.new_private_message"}}
+      {{d-button class="btn-primary new-private-message" action=(route-action "composePrivateMessage") icon="envelope" label="user.new_private_message"}}
     {{/if}}
   {{/unless}}
 
@@ -72,7 +72,7 @@
     {{#if site.mobileView}}
       {{#if showNewPM}}
         {{d-button
-          class="btn-primary new-"
+          class="btn-primary new-private-message"
           action=(route-action "composePrivateMessage")
           icon="envelope"
           label="user.new_private_message"}}

From b248c553c26ada437c5f1b81677a83d08b455fb2 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 6 Apr 2020 19:41:59 +0200
Subject: [PATCH 0524/1830] DEV: ensures CustomEmoji cache is cleared after
 spec (#9361)

---
 spec/components/plugin/instance_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb
index 6453339706..26dd0d39c7 100644
--- a/spec/components/plugin/instance_spec.rb
+++ b/spec/components/plugin/instance_spec.rb
@@ -544,6 +544,10 @@ describe Plugin::Instance do
       Plugin::CustomEmoji.clear_cache
     end
 
+    after do
+      Plugin::CustomEmoji.clear_cache
+    end
+
     it 'allows to register an emoji' do
       Plugin::Instance.new.register_emoji("foo", "/foo/bar.png")
 

From 58bec3b20023797b8711b65423b61398f76150c1 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 6 Apr 2020 14:00:55 -0500
Subject: [PATCH 0525/1830] DEV: Option for adding an icon in
 wizard-field-checkboxes component (#9363)

---
 .../wizard/templates/components/wizard-field-checkboxes.hbs    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-checkboxes.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-checkboxes.hbs
index 25aeadbbde..fa8427ac19 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field-checkboxes.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-checkboxes.hbs
@@ -5,6 +5,9 @@
             class="wizard-checkbox"
             click=(action "changed" value="target")
             checked=c.checked}}
+      {{#if c.icon}}
+        {{d-icon c.icon}}
+      {{/if}}
       {{c.label}}
     </label>
   </div>

From d04ba4b3b2e4c750d3f4bd32a2263cd6e405eb69 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Mon, 6 Apr 2020 16:55:44 -0600
Subject: [PATCH 0526/1830] DEPRECATION: Remove support for api creds in query
 params (#9106)

* DEPRECATION: Remove support for api creds in query params

This commit removes support for api credentials in query params except
for a few whitelisted routes like rss/json feeds and the handle_mail
route.

Several tests were written to valid these changes, but the bulk of the
spec changes are just switching them over to use header based auth so
that they will pass without changing what they were actually testing.

Original commit that notified admins this change was coming was created
over 3 months ago: 2db20031879dbafd1a90cbb1a43bca55d51c1b08

* fix tests

* Also allow iCalendar feeds

Co-authored-by: Rafael dos Santos Silva <xfalcox@gmail.com>
---
 lib/auth/default_current_user_provider.rb     |  11 +-
 .../default_current_user_provider_spec.rb     | 109 +++++++++++++----
 .../invite_only_registration_spec.rb          |  17 +--
 spec/integration/rate_limiting_spec.rb        |  12 +-
 spec/requests/admin/users_controller_spec.rb  |   5 +-
 spec/requests/embed_controller_spec.rb        |   6 +-
 spec/requests/posts_controller_spec.rb        | 113 ++++++------------
 spec/requests/uploads_controller_spec.rb      |   5 +-
 spec/requests/user_badges_controller_spec.rb  |  10 +-
 spec/requests/users_controller_spec.rb        |  25 ++--
 10 files changed, 170 insertions(+), 143 deletions(-)

diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index 3e293dcb77..c43580c042 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -286,12 +286,8 @@ class Auth::DefaultCurrentUserProvider
     if api_key = ApiKey.active.with_key(api_key_value).includes(:user).first
       api_username = header_api_key? ? @env[HEADER_API_USERNAME] : request[API_USERNAME]
 
-      # Check for deprecated api auth
       if !header_api_key?
-        unless is_whitelisted_query_param_auth_route?(request)
-          # Notify admins of deprecated auth method
-          AdminDashboardData.add_problem_message('dashboard.deprecated_api_usage', 1.day)
-        end
+        raise Discourse::InvalidAccess unless is_whitelisted_query_param_auth_route?(request)
       end
 
       if api_key.allowed_ips.present? && !api_key.allowed_ips.any? { |ip| ip.include?(request.ip) }
@@ -321,12 +317,13 @@ class Auth::DefaultCurrentUserProvider
   private
 
   def is_whitelisted_query_param_auth_route?(request)
-    (is_rss_feed?(request) || is_handle_mail?(request))
+    (is_user_feed?(request) || is_handle_mail?(request))
   end
 
-  def is_rss_feed?(request)
+  def is_user_feed?(request)
     return true if request.path.match?(/\/(c|t){1}\/\S*.(rss|json)/) && request.get? # topic or category route
     return true if request.path.match?(/\/(latest|top|categories).(rss|json)/) && request.get? # specific routes with rss
+    return true if request.path.match?(/\/u\/\S*\/bookmarks.(ics|json)/) && request.get? # specific routes with ics
   end
 
   def is_handle_mail?(request)
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index f0c6fbc90e..621ece61e0 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -33,7 +33,8 @@ describe Auth::DefaultCurrentUserProvider do
     it "finds a user for a correct per-user api key" do
       user = Fabricate(:user)
       api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
-      good_provider = provider("/?api_key=#{api_key.key}")
+      params = { "HTTP_API_KEY" => api_key.key }
+      good_provider = provider("/", params)
       expect(good_provider.current_user.id).to eq(user.id)
       expect(good_provider.is_api?).to eq(true)
       expect(good_provider.is_user_api?).to eq(false)
@@ -67,20 +68,22 @@ describe Auth::DefaultCurrentUserProvider do
 
     it "raises for a revoked key" do
       user = Fabricate(:user)
-      key = ApiKey.create!
+      api_key = ApiKey.create!
+      params = { "HTTP_API_USERNAME" => user.username.downcase, "HTTP_API_KEY" => api_key.key }
       expect(
-        provider("/?api_key=#{key.key}&api_username=#{user.username.downcase}").current_user.id
+        provider("/", params).current_user.id
       ).to eq(user.id)
 
-      key.reload.update(revoked_at: Time.zone.now, last_used_at: nil)
-      expect(key.reload.last_used_at).to eq(nil)
+      api_key.reload.update(revoked_at: Time.zone.now, last_used_at: nil)
+      expect(api_key.reload.last_used_at).to eq(nil)
+      params = { "HTTP_API_USERNAME" => user.username.downcase, "HTTP_API_KEY" => api_key.key }
 
       expect {
-        provider("/?api_key=#{key.key}&api_username=#{user.username.downcase}").current_user
+        provider("/", params).current_user
       }.to raise_error(Discourse::InvalidAccess)
 
-      key.reload
-      expect(key.last_used_at).to eq(nil)
+      api_key.reload
+      expect(api_key.last_used_at).to eq(nil)
     end
 
     it "raises for a user with a mismatching ip" do
@@ -97,25 +100,35 @@ describe Auth::DefaultCurrentUserProvider do
       freeze_time
 
       user = Fabricate(:user)
-      key = ApiKey.create!(user_id: user.id, created_by_id: -1, allowed_ips: ['100.0.0.0/24'])
+      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1, allowed_ips: ['100.0.0.0/24'])
+      params = {
+        "HTTP_API_USERNAME" => user.username.downcase,
+        "HTTP_API_KEY" => api_key.key,
+        "REMOTE_ADDR" => "100.0.0.22"
+      }
 
-      found_user = provider("/?api_key=#{key.key}&api_username=#{user.username.downcase}",
-                            "REMOTE_ADDR" => "100.0.0.22").current_user
+      found_user = provider("/", params).current_user
 
       expect(found_user.id).to eq(user.id)
 
-      found_user = provider("/?api_key=#{key.key}&api_username=#{user.username.downcase}",
-                            "HTTP_X_FORWARDED_FOR" => "10.1.1.1, 100.0.0.22").current_user
+      params = {
+        "HTTP_API_USERNAME" => user.username.downcase,
+        "HTTP_API_KEY" => api_key.key,
+        "HTTP_X_FORWARDED_FOR" => "10.1.1.1, 100.0.0.22"
+      }
+
+      found_user = provider("/", params).current_user
       expect(found_user.id).to eq(user.id)
 
-      key.reload
-      expect(key.last_used_at).to eq_time(Time.zone.now)
+      api_key.reload
+      expect(api_key.last_used_at).to eq_time(Time.zone.now)
     end
 
     it "finds a user for a correct system api key" do
       user = Fabricate(:user)
       api_key = ApiKey.create!(created_by_id: -1)
-      expect(provider("/?api_key=#{api_key.key}&api_username=#{user.username.downcase}").current_user.id).to eq(user.id)
+      params = { "HTTP_API_USERNAME" => user.username.downcase, "HTTP_API_KEY" => api_key.key }
+      expect(provider("/", params).current_user.id).to eq(user.id)
     end
 
     it "raises for a mismatched api_key param and header username" do
@@ -130,8 +143,9 @@ describe Auth::DefaultCurrentUserProvider do
     it "finds a user for a correct system api key with external id" do
       user = Fabricate(:user)
       api_key = ApiKey.create!(created_by_id: -1)
+      params = { "HTTP_API_KEY" => api_key.key, "HTTP_API_USER_EXTERNAL_ID" => "abc" }
       SingleSignOnRecord.create(user_id: user.id, external_id: "abc", last_payload: '')
-      expect(provider("/?api_key=#{api_key.key}&api_user_external_id=abc").current_user.id).to eq(user.id)
+      expect(provider("/", params).current_user.id).to eq(user.id)
     end
 
     it "raises for a mismatched api_key param and header external id" do
@@ -147,7 +161,8 @@ describe Auth::DefaultCurrentUserProvider do
     it "finds a user for a correct system api key with id" do
       user = Fabricate(:user)
       api_key = ApiKey.create!(created_by_id: -1)
-      expect(provider("/?api_key=#{api_key.key}&api_user_id=#{user.id}").current_user.id).to eq(user.id)
+      params = { "HTTP_API_USER_ID" => user.id, "HTTP_API_KEY" => api_key.key }
+      expect(provider("/", params).current_user.id).to eq(user.id)
     end
 
     it "raises for a mismatched api_key param and header user id" do
@@ -176,36 +191,80 @@ describe Auth::DefaultCurrentUserProvider do
         user = Fabricate(:user)
         api_key = ApiKey.create!(created_by_id: -1)
         key = api_key.key
+        user_params = { "HTTP_API_KEY" => key, "HTTP_API_USERNAME" => user.username.downcase }
+        system_params = { "HTTP_API_KEY" => key, "HTTP_API_USERNAME" => "system" }
 
-        provider("/?api_key=#{key}&api_username=#{user.username.downcase}").current_user
-        provider("/?api_key=#{key}&api_username=system").current_user
-        provider("/?api_key=#{key}&api_username=#{user.username.downcase}").current_user
+        provider("/", user_params).current_user
+        provider("/", system_params).current_user
+        provider("/", user_params).current_user
 
         expect do
-          provider("/?api_key=#{key}&api_username=system").current_user
+          provider("/", system_params).current_user
         end.to raise_error(RateLimiter::LimitExceeded)
 
         freeze_time 59.seconds.from_now
 
         expect do
-          provider("/?api_key=#{key}&api_username=system").current_user
+          provider("/", system_params).current_user
         end.to raise_error(RateLimiter::LimitExceeded)
 
         freeze_time 2.seconds.from_now
 
         # 1 minute elapsed
-        provider("/?api_key=#{key}&api_username=system").current_user
+        provider("/", system_params).current_user
 
         # should not rake limit a random key
         api_key.destroy
         api_key = ApiKey.create!(created_by_id: -1)
-        provider("/?api_key=#{api_key.key}&api_username=#{user.username.downcase}").current_user
+        user_params = { "HTTP_API_KEY" => api_key.key, "HTTP_API_USERNAME" => user.username.downcase }
+        provider("/", user_params).current_user
 
       end
     end
 
   end
 
+  context "whitelisted api auth query param routes" do
+
+    it "allows rss feeds" do
+      user = Fabricate(:user)
+      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
+      url = "/latest.rss?api_key=#{api_key.key}&api_username=#{user.username.downcase}"
+      expect(provider(url).current_user.id).to eq(user.id)
+    end
+
+    it "allows ics feeds" do
+      user = Fabricate(:user)
+      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
+      url = "/u/#{user.username}/bookmarks.ics?api_key=#{api_key.key}&api_username=#{user.username.downcase}"
+      expect(provider(url).current_user.id).to eq(user.id)
+    end
+
+    it "allows handle mail route" do
+      user = Fabricate(:user)
+      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
+      url = "/admin/email/handle_mail?api_key=#{api_key.key}&api_username=#{user.username.downcase}"
+      opts = { method: "POST" }
+      expect(provider(url, opts).current_user.id).to eq(user.id)
+    end
+
+    it "raises errors for non whitlisted routes" do
+      user = Fabricate(:user)
+      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
+      url = "/u?api_key=#{api_key.key}&api_username=#{user.username.downcase}"
+      expect {
+        provider(url).current_user
+      }.to raise_error(Discourse::InvalidAccess)
+    end
+
+    it "still allows header based auth" do
+      user = Fabricate(:user)
+      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
+      params = { "HTTP_API_KEY" => api_key.key, "HTTP_API_USERNAME" => user.username.downcase }
+      expect(provider("/", params).current_user.id).to eq(user.id)
+    end
+  end
+
   context "server header api" do
 
     it "raises errors for incorrect api_key" do
diff --git a/spec/integration/invite_only_registration_spec.rb b/spec/integration/invite_only_registration_spec.rb
index 6047bc054c..5f19efb60f 100644
--- a/spec/integration/invite_only_registration_spec.rb
+++ b/spec/integration/invite_only_registration_spec.rb
@@ -19,22 +19,23 @@ describe 'invite only' do
         username: 'bob',
         password: 'strongpassword',
         email: 'bob@bob.com',
-        api_key: api_key.key,
-        api_username: admin.username
+      }, headers: {
+        HTTP_API_KEY: api_key.key,
+        HTTP_API_USERNAME: admin.username
       }
 
       user_id = JSON.parse(response.body)["user_id"]
       expect(user_id).to be > 0
 
       # activate and approve
-      put "/admin/users/#{user_id}/activate.json", params: {
-        api_key: api_key.key,
-        api_username: admin.username
+      put "/admin/users/#{user_id}/activate.json", headers: {
+        HTTP_API_KEY: api_key.key,
+        HTTP_API_USERNAME: admin.username
       }
 
-      put "/admin/users/#{user_id}/approve.json", params: {
-        api_key: api_key.key,
-        api_username: admin.username
+      put "/admin/users/#{user_id}/approve.json", headers: {
+        HTTP_API_KEY: api_key.key,
+        HTTP_API_USERNAME: admin.username
       }
 
       u = User.find(user_id)
diff --git a/spec/integration/rate_limiting_spec.rb b/spec/integration/rate_limiting_spec.rb
index 13fe8f7359..9a41f9120f 100644
--- a/spec/integration/rate_limiting_spec.rb
+++ b/spec/integration/rate_limiting_spec.rb
@@ -60,16 +60,16 @@ describe 'rate limiter integration' do
 
     global_setting :max_admin_api_reqs_per_key_per_minute, 1
 
-    get '/admin/api/keys.json', params: {
-      api_key: api_key.key,
-      api_username: admin.username
+    get '/admin/api/keys.json', headers: {
+      HTTP_API_KEY: api_key.key,
+      HTTP_API_USERNAME: admin.username
     }
 
     expect(response.status).to eq(200)
 
-    get '/admin/api/keys.json', params: {
-      api_key: api_key.key,
-      api_username: admin.username
+    get '/admin/api/keys.json', headers: {
+      HTTP_API_KEY: api_key.key,
+      HTTP_API_USERNAME: admin.username
     }
 
     expect(response.status).to eq(429)
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index fd82b1d1d9..8d52b133f8 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -254,9 +254,8 @@ RSpec.describe Admin::UsersController do
       api_key = Fabricate(:api_key, user: user)
 
       put "/posts/#{Fabricate(:post).id}/bookmark.json", params: {
-        bookmarked: "true",
-        api_key: api_key.key
-      }
+        bookmarked: "true"
+      }, headers: { HTTP_API_KEY: api_key.key }
       expect(response.status).to eq(200)
 
       put "/admin/users/#{user.id}/suspend.json", params: suspend_params
diff --git a/spec/requests/embed_controller_spec.rb b/spec/requests/embed_controller_spec.rb
index 6969279502..71d6eef807 100644
--- a/spec/requests/embed_controller_spec.rb
+++ b/spec/requests/embed_controller_spec.rb
@@ -49,7 +49,8 @@ describe EmbedController do
 
         it "returns information about the topic" do
           get '/embed/info.json',
-            params: { embed_url: topic_embed.embed_url, api_key: api_key.key, api_username: "system" }
+            params: { embed_url: topic_embed.embed_url },
+            headers: { HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: "system" }
 
           json = JSON.parse(response.body)
           expect(json['topic_id']).to eq(topic_embed.topic.id)
@@ -61,7 +62,8 @@ describe EmbedController do
       context "without invalid embed url" do
         it "returns error response" do
           get '/embed/info.json',
-            params: { embed_url: "http://nope.com", api_key: api_key.key, api_username: "system" }
+            params: { embed_url: "http://nope.com" },
+            headers: { HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: "system" }
 
           json = JSON.parse(response.body)
           expect(json["error_type"]).to eq("not_found")
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index b90b7cd3e3..534bcdecd5 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -556,10 +556,9 @@ describe PostsController do
 
       # choosing an arbitrarily easy to mock trusted activity
       it 'allows users with api key to bookmark posts' do
-        put "/posts/#{post.id}/bookmark.json", params: {
-          bookmarked: "true",
-          api_key: api_key.key
-        }
+        put "/posts/#{post.id}/bookmark.json",
+          params: { bookmarked: "true" },
+          headers: { HTTP_API_KEY: api_key.key }
 
         expect(response.status).to eq(200)
         expect(PostAction.where(
@@ -570,21 +569,17 @@ describe PostsController do
       end
 
       it 'raises an error with a user key that does not match an optionally specified username' do
-        put "/posts/#{post.id}/bookmark.json", params: {
-          bookmarked: "true",
-          api_key: api_key.key,
-          api_username: 'made_up'
-        }
+        put "/posts/#{post.id}/bookmark.json",
+          params: { bookmarked: "true" },
+          headers: { HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: 'made_up' }
 
         expect(response.status).to eq(403)
       end
 
       it 'allows users with a master api key to bookmark posts' do
-        put "/posts/#{post.id}/bookmark.json", params: {
-          bookmarked: "true",
-          api_key: master_key.key,
-          api_username: user.username
-        }
+        put "/posts/#{post.id}/bookmark.json",
+          params: { bookmarked: "true" },
+          headers: { HTTP_API_KEY: master_key.key, HTTP_API_USERNAME: user.username }
 
         expect(response.status).to eq(200)
         expect(PostAction.where(
@@ -595,21 +590,17 @@ describe PostsController do
       end
 
       it 'disallows phonies to bookmark posts' do
-        put "/posts/#{post.id}/bookmark.json", params: {
-          bookmarked: "true",
-          api_key: SecureRandom.hex(32),
-          api_username: user.username
-        }
+        put "/posts/#{post.id}/bookmark.json",
+          params: { bookmarked: "true" },
+          headers: { HTTP_API_KEY: SecureRandom.hex(32), HTTP_API_USERNAME: user.username }
 
         expect(response.status).to eq(403)
       end
 
       it 'disallows blank api' do
-        put "/posts/#{post.id}/bookmark.json", params: {
-          bookmarked: "true",
-          api_key: "",
-          api_username: user.username
-        }
+        put "/posts/#{post.id}/bookmark.json",
+          params: { bookmarked: "true" },
+          headers: { HTTP_API_KEY: "", HTTP_API_USERNAME: user.username }
 
         expect(response.status).to eq(403)
       end
@@ -740,24 +731,16 @@ describe PostsController do
 
         master_key = Fabricate(:api_key).key
 
-        post "/posts.json", params: {
-          api_username: user.username,
-          api_key: master_key,
-          raw: raw,
-          title: title,
-          wpid: 1
-        }
+        post "/posts.json",
+          params: { raw: raw, title: title, wpid: 1 },
+          headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
 
         expect(response.status).to eq(200)
         original = response.body
 
-        post "/posts.json", params: {
-          api_username: user.username_lower,
-          api_key: master_key,
-          raw: raw,
-          title: title,
-          wpid: 2
-        }
+        post "/posts.json",
+          params: { raw: raw, title: title, wpid: 2 },
+          headers: { HTTP_API_USERNAME: user.username_lower, HTTP_API_KEY: master_key }
 
         expect(response.status).to eq(200)
         expect(response.body).to eq(original)
@@ -769,38 +752,24 @@ describe PostsController do
         post_1 = Fabricate(:post)
         master_key = Fabricate(:api_key).key
 
-        post "/posts.json", params: {
-          api_username: user.username,
-          api_key: master_key,
-          raw: 'this is test reply 1',
-          topic_id: post_1.topic.id,
-          reply_to_post_number: 1
-        }
+        post "/posts.json",
+          params: { raw: 'this is test reply 1', topic_id: post_1.topic.id, reply_to_post_number: 1 },
+          headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
 
         expect(response.status).to eq(200)
         expect(post_1.topic.user.notifications.count).to eq(1)
         post_1.topic.user.notifications.destroy_all
 
-        post "/posts.json", params: {
-          api_username: user.username,
-          api_key: master_key,
-          raw: 'this is test reply 2',
-          topic_id: post_1.topic.id,
-          reply_to_post_number: 1,
-          import_mode: true
-        }
+        post "/posts.json",
+          params: { raw: 'this is test reply 2', topic_id: post_1.topic.id, reply_to_post_number: 1, import_mode: true },
+          headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
 
         expect(response.status).to eq(200)
         expect(post_1.topic.user.notifications.count).to eq(0)
 
-        post "/posts.json", params: {
-          api_username: user.username,
-          api_key: master_key,
-          raw: 'this is test reply 3',
-          topic_id: post_1.topic.id,
-          reply_to_post_number: 1,
-          import_mode: false
-        }
+        post "/posts.json",
+          params: { raw: 'this is test reply 3', topic_id: post_1.topic.id, reply_to_post_number: 1, import_mode: false },
+          headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
 
         expect(response.status).to eq(200)
         expect(post_1.topic.user.notifications.count).to eq(1)
@@ -810,14 +779,10 @@ describe PostsController do
         post_1 = Fabricate(:post)
         user_key = ApiKey.create!(user: user).key
 
-        post "/posts.json", params: {
-          api_username: user.username,
-          api_key: user_key,
-          raw: 'this is test whisper',
-          topic_id: post_1.topic.id,
-          reply_to_post_number: 1,
-          whisper: true
-        }
+        post "/posts.json",
+          params: { raw: 'this is test whisper', topic_id: post_1.topic.id, reply_to_post_number: 1, whisper: true },
+          headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: user_key }
+
         expect(response.status).to eq(403)
       end
 
@@ -825,13 +790,9 @@ describe PostsController do
         user = Fabricate(:admin)
         master_key = Fabricate(:api_key).key
 
-        post "/posts.json", params: {
-          api_username: user.username,
-          api_key: master_key,
-          title: 'this is a test title',
-          raw: 'this is test body',
-          category: 'invalid'
-        }
+        post "/posts.json",
+          params: { title: 'this is a test title', raw: 'this is test body', category: 'invalid' },
+          headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
 
         expect(response.status).to eq(400)
 
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index baa2f54270..13298866c0 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -60,7 +60,10 @@ describe UploadsController do
 
         stub_request(:get, url).to_return(status: 200, body: png)
 
-        post "/uploads.json", params: { url: url, type: "avatar", api_key: api_key, api_username: user.username }
+        post "/uploads.json", params: { url: url, type: "avatar" }, headers: {
+          HTTP_API_KEY: api_key,
+          HTTP_API_USERNAME: user.username.downcase
+        }
 
         json = ::JSON.parse(response.body)
 
diff --git a/spec/requests/user_badges_controller_spec.rb b/spec/requests/user_badges_controller_spec.rb
index 1034c36bde..bd0c8ca354 100644
--- a/spec/requests/user_badges_controller_spec.rb
+++ b/spec/requests/user_badges_controller_spec.rb
@@ -123,9 +123,13 @@ describe UserBadgesController do
     it 'grants badges from master api calls' do
       api_key = Fabricate(:api_key)
 
-      post "/user_badges.json", params: {
-        badge_id: badge.id, username: user.username, api_key: api_key.key, api_username: "system"
-      }
+      post "/user_badges.json",
+        params: {
+          badge_id: badge.id, username: user.username
+        },
+        headers: {
+          HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: "system"
+        }
 
       expect(response.status).to eq(200)
       user_badge = UserBadge.find_by(user: user, badge: badge)
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 59f705f8eb..d35e8f9727 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -743,7 +743,7 @@ describe UsersController do
 
         it "won't create the user as active with a regular key" do
           post "/u.json",
-            params: post_user_params.merge(active: true, api_key: api_key.key)
+            params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key }
 
           expect(response.status).to eq(200)
           expect(JSON.parse(response.body)['active']).to be_falsey
@@ -759,7 +759,7 @@ describe UsersController do
           SiteSetting.must_approve_users = true
 
           #Sidekiq::Client.expects(:enqueue).never
-          post "/u.json", params: post_user_params.merge(approved: true, active: true, api_key: api_key.key)
+          post "/u.json", params: post_user_params.merge(approved: true, active: true), headers: { HTTP_API_KEY: api_key.key }
 
           expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
           expect(Jobs::SendSystemMessage.jobs.size).to eq(0)
@@ -781,7 +781,7 @@ describe UsersController do
           Jobs.run_immediately!
           SiteSetting.must_approve_users = true
 
-          post "/u.json", params: post_user_params.merge(active: true, api_key: api_key.key)
+          post "/u.json", params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key }
 
           expect(response.status).to eq(200)
           json = JSON.parse(response.body)
@@ -796,7 +796,7 @@ describe UsersController do
           Jobs.run_immediately!
           SiteSetting.must_approve_users = true
 
-          post "/u.json", params: post_user_params.merge(api_key: api_key.key)
+          post "/u.json", params: post_user_params, headers: { HTTP_API_KEY: api_key.key }
 
           expect(response.status).to eq(200)
           json = JSON.parse(response.body)
@@ -810,7 +810,7 @@ describe UsersController do
         it "won't create the developer as active" do
           UsernameCheckerService.expects(:is_developer?).returns(true)
 
-          post "/u.json", params: post_user_params.merge(active: true, api_key: api_key.key)
+          post "/u.json", params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key }
           expect(response.status).to eq(200)
           expect(JSON.parse(response.body)['active']).to be_falsy
         end
@@ -819,7 +819,7 @@ describe UsersController do
           SiteSetting.allow_user_locale = true
           admin.update!(locale: :fr)
 
-          post "/u.json", params: post_user_params.merge(active: true, api_key: api_key.key)
+          post "/u.json", params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key }
           expect(response.status).to eq(200)
 
           json = JSON.parse(response.body)
@@ -832,7 +832,7 @@ describe UsersController do
           SiteSetting.must_approve_users = true
           SiteSetting.auto_approve_email_domains = "example.com"
 
-          post "/u.json", params: post_user_params.merge(active: true, api_key: api_key.key)
+          post "/u.json", params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key }
 
           expect(response.status).to eq(200)
           json = JSON.parse(response.body)
@@ -858,7 +858,7 @@ describe UsersController do
         fab!(:api_key, refind: false) { Fabricate(:api_key, user: user) }
 
         it "won't create the user as staged with a regular key" do
-          post "/u.json", params: post_user_params.merge(staged: true, api_key: api_key.key)
+          post "/u.json", params: post_user_params.merge(staged: true), headers: { HTTP_API_KEY: api_key.key }
           expect(response.status).to eq(200)
 
           new_user = User.where(username: post_user_params[:username]).first
@@ -871,7 +871,7 @@ describe UsersController do
         fab!(:api_key, refind: false) { Fabricate(:api_key, user: user) }
 
         it "creates the user as staged with a regular key" do
-          post "/u.json", params: post_user_params.merge(staged: true, api_key: api_key.key)
+          post "/u.json", params: post_user_params.merge(staged: true), headers: { HTTP_API_KEY: api_key.key }
           expect(response.status).to eq(200)
 
           new_user = User.where(username: post_user_params[:username]).first
@@ -880,7 +880,7 @@ describe UsersController do
 
         it "won't create the developer as staged" do
           UsernameCheckerService.expects(:is_developer?).returns(true)
-          post "/u.json", params: post_user_params.merge(staged: true, api_key: api_key.key)
+          post "/u.json", params: post_user_params.merge(staged: true), headers: { HTTP_API_KEY: api_key.key }
           expect(response.status).to eq(200)
 
           new_user = User.where(username: post_user_params[:username]).first
@@ -1850,8 +1850,9 @@ describe UsersController do
                 },
                 user_fields: {
                   user_field.id.to_s => 'user field value'
-                },
-                api_key: api_key.key
+                }
+              }, headers: {
+                HTTP_API_KEY: api_key.key
               }
               expect(response.status).to eq(200)
               u = User.find_by_email('user@mail.com')

From 93c38cc1756d409a3055628b14d61bd3d3c0c08c Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 7 Apr 2020 14:03:15 +1000
Subject: [PATCH 0527/1830] FEATURE: Bookmark keyboard shortcuts (#9318)

Adds keyboard bindings and associated help menu for selecting reminder type in bookmark modal, and pressing Enter to save.

Introduce the following APIs for `KeyboardShortcuts`:

* `pause` - Uses the provided array of combinations and unbinds them using `Mousetrap`.
* `unpause` - Uses the provided combinations and rebinds them to their default shortcuts listed in `KeyboardShortcuts`.
* `addBindings` - Adds the array of keyboard shortcut bindings and calls the provided callback when a binding is fired with Mousetrap.
* `unbind` - Takes an object literal of a binding map and unbinds all of them e.g. `{ enter: { handler: saveAndClose" } };`
---
 .../discourse/controllers/bookmark.js         | 76 +++++++++++++++--
 .../controllers/keyboard-shortcuts-help.js    | 38 +++++++++
 .../discourse/controllers/topic.js            |  3 +
 .../initializers/keyboard-shortcuts.js        |  3 +-
 .../discourse/lib/keyboard-shortcuts.js       | 82 ++++++++++++++-----
 .../discourse/templates/modal/bookmark.hbs    |  2 +-
 .../modal/keyboard-shortcuts-help.hbs         | 17 ++++
 config/locales/client.en.yml                  | 12 +++
 8 files changed, 205 insertions(+), 28 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index c14329d253..140b6f8597 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -1,10 +1,22 @@
+import { and } from "@ember/object/computed";
+import { next } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { Promise } from "rsvp";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { ajax } from "discourse/lib/ajax";
+import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 
+// global shortcuts that interfere with these modal shortcuts, they are rebound when the
+// modal is closed
+//
+// c createTopic
+// r replyToPost
+// l toggle like
+// d deletePost
+// t replyAsNewTopic
+const GLOBAL_SHORTCUTS_TO_PAUSE = ["c", "r", "l", "d", "t"];
 const START_OF_DAY_HOUR = 8;
 const LATER_TODAY_CUTOFF_HOUR = 17;
 const REMINDER_TYPES = {
@@ -21,6 +33,28 @@ const REMINDER_TYPES = {
   LATER_THIS_WEEK: "later_this_week"
 };
 
+const BOOKMARK_BINDINGS = {
+  enter: { handler: "saveAndClose" },
+  "l t": { handler: "selectReminderType", args: [REMINDER_TYPES.LATER_TODAY] },
+  "l w": {
+    handler: "selectReminderType",
+    args: [REMINDER_TYPES.LATER_THIS_WEEK]
+  },
+  "n b d": {
+    handler: "selectReminderType",
+    args: [REMINDER_TYPES.NEXT_BUSINESS_DAY]
+  },
+  "n d": { handler: "selectReminderType", args: [REMINDER_TYPES.TOMORROW] },
+  "n w": { handler: "selectReminderType", args: [REMINDER_TYPES.NEXT_WEEK] },
+  "n b w": {
+    handler: "selectReminderType",
+    args: [REMINDER_TYPES.START_OF_NEXT_BUSINESS_WEEK]
+  },
+  "n m": { handler: "selectReminderType", args: [REMINDER_TYPES.NEXT_MONTH] },
+  "c r": { handler: "selectReminderType", args: [REMINDER_TYPES.CUSTOM] },
+  "n r": { handler: "selectReminderType", args: [REMINDER_TYPES.NONE] }
+};
+
 export default Controller.extend(ModalFunctionality, {
   loading: false,
   errorMessage: null,
@@ -33,6 +67,7 @@ export default Controller.extend(ModalFunctionality, {
   customReminderTime: null,
   lastCustomReminderDate: null,
   lastCustomReminderTime: null,
+  mouseTrap: null,
   userTimezone: null,
 
   onShow() {
@@ -49,7 +84,12 @@ export default Controller.extend(ModalFunctionality, {
       userTimezone: this.currentUser.resolvedTimezone()
     });
 
+    this.bindKeyboardShortcuts();
     this.loadLastUsedCustomReminderDatetime();
+
+    // make sure the input is cleared, otherwise the keyboard shortcut to toggle
+    // bookmark for post ends up in the input
+    next(() => this.set("name", null));
   },
 
   loadLastUsedCustomReminderDatetime() {
@@ -71,9 +111,29 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
+  bindKeyboardShortcuts() {
+    KeyboardShortcuts.pause(GLOBAL_SHORTCUTS_TO_PAUSE);
+    KeyboardShortcuts.addBindings(BOOKMARK_BINDINGS, binding => {
+      if (binding.args) {
+        return this.send(binding.handler, ...binding.args);
+      }
+      this.send(binding.handler);
+    });
+  },
+
+  unbindKeyboardShortcuts() {
+    KeyboardShortcuts.unbind(BOOKMARK_BINDINGS, this.mouseTrap);
+  },
+
+  restoreGlobalShortcuts() {
+    KeyboardShortcuts.unpause(...GLOBAL_SHORTCUTS_TO_PAUSE);
+  },
+
   // we always want to save the bookmark unless the user specifically
   // clicks the save or cancel button to mimic browser behaviour
   onClose() {
+    this.unbindKeyboardShortcuts();
+    this.restoreGlobalShortcuts();
     if (!this.closeWithoutSaving && !this.isSavingBookmarkManually) {
       this.saveBookmark().catch(e => this.handleSaveError(e));
     }
@@ -102,10 +162,7 @@ export default Controller.extend(ModalFunctionality, {
     return REMINDER_TYPES;
   },
 
-  @discourseComputed()
-  showLastCustom() {
-    return this.lastCustomReminderTime && this.lastCustomReminderDate;
-  },
+  showLastCustom: and("lastCustomReminderTime", "lastCustomReminderDate"),
 
   @discourseComputed()
   showLaterToday() {
@@ -299,10 +356,16 @@ export default Controller.extend(ModalFunctionality, {
 
   actions: {
     saveAndClose() {
+      if (this.saving) {
+        return;
+      }
+
+      this.saving = true;
       this.isSavingBookmarkManually = true;
       this.saveBookmark()
         .then(() => this.send("closeModal"))
-        .catch(e => this.handleSaveError(e));
+        .catch(e => this.handleSaveError(e))
+        .finally(() => (this.saving = false));
     },
 
     closeWithoutSavingBookmark() {
@@ -311,6 +374,9 @@ export default Controller.extend(ModalFunctionality, {
     },
 
     selectReminderType(type) {
+      if (type === REMINDER_TYPES.LATER_TODAY && !this.showLaterToday) {
+        return;
+      }
       this.set("selectedReminderType", type);
     }
   }
diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
index 62feb5b404..0bc9fe3971 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
@@ -1,5 +1,6 @@
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { setting } from "discourse/lib/computed";
 
 const KEY = "keyboard_shortcuts_help";
 
@@ -51,6 +52,8 @@ export default Controller.extend(ModalFunctionality, {
     this.set("modal.modalClass", "keyboard-shortcuts-modal");
   },
 
+  showBookmarkShortcuts: setting("enable_bookmarks_with_reminders"),
+
   shortcuts: {
     jump_to: {
       home: buildShortcut("jump_to.home", { keys1: ["g", "h"] }),
@@ -125,6 +128,41 @@ export default Controller.extend(ModalFunctionality, {
         keysDelimiter: PLUS
       })
     },
+    bookmarks: {
+      enter: buildShortcut("bookmarks.enter", { keys1: [ENTER] }),
+      later_today: buildShortcut("bookmarks.later_today", {
+        keys1: ["l", "t"],
+        shortcutsDelimiter: "space"
+      }),
+      later_this_week: buildShortcut("bookmarks.later_this_week", {
+        keys1: ["l", "w"],
+        shortcutsDelimiter: "space"
+      }),
+      tomorrow: buildShortcut("bookmarks.tomorrow", {
+        keys1: ["n", "d"],
+        shortcutsDelimiter: "space"
+      }),
+      next_week: buildShortcut("bookmarks.next_week", {
+        keys1: ["n", "w"],
+        shortcutsDelimiter: "space"
+      }),
+      next_business_week: buildShortcut("bookmarks.next_business_week", {
+        keys1: ["n", "b", "w"],
+        shortcutsDelimiter: "space"
+      }),
+      next_business_day: buildShortcut("bookmarks.next_business_day", {
+        keys1: ["n", "b", "d"],
+        shortcutsDelimiter: "space"
+      }),
+      custom: buildShortcut("bookmarks.custom", {
+        keys1: ["c", "r"],
+        shortcutsDelimiter: "space"
+      }),
+      none: buildShortcut("bookmarks.none", {
+        keys1: ["n", "r"],
+        shortcutsDelimiter: "space"
+      })
+    },
     actions: {
       bookmark_topic: buildShortcut("actions.bookmark_topic", { keys1: ["f"] }),
       reply_as_new_topic: buildShortcut("actions.reply_as_new_topic", {
diff --git a/app/assets/javascripts/discourse/controllers/topic.js b/app/assets/javascripts/discourse/controllers/topic.js
index 80e6124f6d..01a84f7352 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js
+++ b/app/assets/javascripts/discourse/controllers/topic.js
@@ -662,6 +662,9 @@ export default Controller.extend(bufferedProperty("model"), {
       if (!this.currentUser) {
         return bootbox.alert(I18n.t("bookmarks.not_bookmarked"));
       } else if (post) {
+        if (this.siteSettings.enable_bookmarks_with_reminders) {
+          return post.toggleBookmarkWithReminder();
+        }
         return post.toggleBookmark().catch(popupAjaxError);
       } else {
         return this.model.toggleBookmark().then(changedIds => {
diff --git a/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js b/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
index 8801d112d9..a0de2c5d2a 100644
--- a/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
@@ -5,6 +5,7 @@ export default {
   name: "keyboard-shortcuts",
 
   initialize(container) {
-    KeyboardShortcuts.bindEvents(Mousetrap, container);
+    KeyboardShortcuts.init(Mousetrap, container);
+    KeyboardShortcuts.bindEvents();
   }
 };
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index 064c2eeb58..c4a962ac68 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -6,7 +6,7 @@ import { ajax } from "discourse/lib/ajax";
 import { throttle } from "@ember/runloop";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 
-export let bindings = {
+export let DEFAULT_BINDINGS = {
   "!": { postAction: "showFlags" },
   "#": { handler: "goToPost", anonymous: true },
   "/": { handler: "toggleSearch", anonymous: true },
@@ -84,7 +84,7 @@ export let bindings = {
 const animationDuration = 100;
 
 export default {
-  bindEvents(keyTrapper, container) {
+  init(keyTrapper, container) {
     this.keyTrapper = keyTrapper;
     this.container = container;
     this._stopCallback();
@@ -96,32 +96,72 @@ export default {
 
     // Disable the shortcut if private messages are disabled
     if (!siteSettings.enable_personal_messages) {
-      delete bindings["g m"];
+      delete DEFAULT_BINDINGS["g m"];
+    }
+  },
+
+  bindEvents() {
+    Object.keys(DEFAULT_BINDINGS).forEach(key => {
+      this.bindKey(key);
+    });
+  },
+
+  bindKey(key) {
+    const binding = DEFAULT_BINDINGS[key];
+    if (!binding.anonymous && !this.currentUser) {
+      return;
     }
 
-    Object.keys(bindings).forEach(key => {
-      const binding = bindings[key];
-      if (!binding.anonymous && !this.currentUser) {
-        return;
+    if (binding.path) {
+      this._bindToPath(binding.path, key);
+    } else if (binding.handler) {
+      if (binding.global) {
+        // global shortcuts will trigger even while focusing on input/textarea
+        this._globalBindToFunction(binding.handler, key);
+      } else {
+        this._bindToFunction(binding.handler, key);
       }
+    } else if (binding.postAction) {
+      this._bindToSelectedPost(binding.postAction, key);
+    } else if (binding.click) {
+      this._bindToClick(binding.click, key);
+    }
+  },
 
-      if (binding.path) {
-        this._bindToPath(binding.path, key);
-      } else if (binding.handler) {
-        if (binding.global) {
-          // global shortcuts will trigger even while focusing on input/textarea
-          this._globalBindToFunction(binding.handler, key);
-        } else {
-          this._bindToFunction(binding.handler, key);
-        }
-      } else if (binding.postAction) {
-        this._bindToSelectedPost(binding.postAction, key);
-      } else if (binding.click) {
-        this._bindToClick(binding.click, key);
-      }
+  // for cases when you want to disable global keyboard shortcuts
+  // so that you can override them (e.g. inside a modal)
+  pause(combinations) {
+    combinations.forEach(combo => this.keyTrapper.unbind(combo));
+  },
+
+  // restore global shortcuts that you have paused
+  unpause(...combinations) {
+    combinations.forEach(combo => this.bindKey(combo));
+  },
+
+  // add bindings to the key trapper, if none is specified then
+  // the shortcuts will be bound globally.
+  addBindings(newBindings, callback) {
+    Object.keys(newBindings).forEach(key => {
+      let binding = newBindings[key];
+      this.keyTrapper.bind(key, event => {
+        // usually the caller that is adding the binding
+        // will want to decide what to do with it when the
+        // event is fired
+        callback(binding, event);
+        event.stopPropagation();
+      });
     });
   },
 
+  // unbinds all the shortcuts in a key binding object e.g.
+  // {
+  //   'c': createTopic
+  // }
+  unbind(bindings) {
+    this.pause(Object.keys(bindings));
+  },
+
   toggleBookmark() {
     this.sendToSelectedPost("toggleBookmark");
     this.sendToTopicListItemView("toggleBookmark");
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 538b30c74f..890a7dbdcc 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -9,7 +9,7 @@
     {{/if}}
 
     <div class="control-group">
-      {{input value=name name="name" class="bookmark-name" enter=(action "saveAndClose") placeholder=(i18n "post.bookmarks.name_placeholder")}}
+      {{input value=name name="name" class="bookmark-name" placeholder=(i18n "post.bookmarks.name_placeholder")}}
     </div>
 
     {{#if showBookmarkReminderControls}}
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index cfa90cb67e..43f550d15e 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -55,6 +55,23 @@
         <li>{{html-safe shortcuts.actions.quote_post}}</li>
       </ul>
     </section>
+    {{#if showBookmarkShortcuts}}
+    <section class="keyboard-shortcuts-bookmark-section">
+      <h4>{{i18n "keyboard_shortcuts_help.bookmarks.title"}}</h4>
+      <ul>
+        <li>{{html-safe shortcuts.bookmarks.enter}}</li>
+        <li>{{html-safe shortcuts.bookmarks.later_today}}</li>
+        <li>{{html-safe shortcuts.bookmarks.later_this_week}}</li>
+        <li>{{html-safe shortcuts.bookmarks.tomorrow}}</li>
+        <li>{{html-safe shortcuts.bookmarks.next_week}}</li>
+        <li>{{html-safe shortcuts.bookmarks.next_month}}</li>
+        <li>{{html-safe shortcuts.bookmarks.next_business_week}}</li>
+        <li>{{html-safe shortcuts.bookmarks.next_business_day}}</li>
+        <li>{{html-safe shortcuts.bookmarks.custom}}</li>
+        <li>{{html-safe shortcuts.bookmarks.none}}</li>
+      </ul>
+    </section>
+    {{/if}}
   </div>
   <div class="column">
     <section>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index df0c07d641..a05ced4e1e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3075,6 +3075,18 @@ en:
         title: "Composing"
         return: "%{shortcut} Return to composer"
         fullscreen: "%{shortcut} Fullscreen composer"
+      bookmarks:
+        title: "Bookmarking"
+        enter: "%{shortcut} Save and close"
+        later_today: "%{shortcut} Later today"
+        later_this_week: "%{shortcut} Later this week"
+        tomorrow: "%{shortcut} Tomorrow"
+        next_week: "%{shortcut} Next week"
+        next_month: "%{shortcut} Next month"
+        next_business_week: "%{shortcut} Start of next week"
+        next_business_day: "%{shortcut} Next business day"
+        custom: "%{shortcut} Custom date and time"
+        none: "%{shortcut} No reminder"
       actions:
         title: "Actions"
         bookmark_topic: "%{shortcut} Toggle bookmark topic"

From 7e429635909983001b0c5547f304a019766c7222 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 7 Apr 2020 14:40:03 +1000
Subject: [PATCH 0528/1830] DEV: Define keyboard shortcuts help onShow, and
 un-define onClose (#9355)

This is so we don't have a big hash just sitting in the controller definition, it is only created when it is needed. From comment here #9318 (comment)
---
 .../controllers/keyboard-shortcuts-help.js    | 346 +++++++++---------
 1 file changed, 179 insertions(+), 167 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
index 0bc9fe3971..85ee690151 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
@@ -50,176 +50,188 @@ function buildShortcut(
 export default Controller.extend(ModalFunctionality, {
   onShow() {
     this.set("modal.modalClass", "keyboard-shortcuts-modal");
+    this._defineShortcuts();
+  },
+
+  onClose() {
+    this.set("shortcuts", null);
   },
 
   showBookmarkShortcuts: setting("enable_bookmarks_with_reminders"),
 
-  shortcuts: {
-    jump_to: {
-      home: buildShortcut("jump_to.home", { keys1: ["g", "h"] }),
-      latest: buildShortcut("jump_to.latest", { keys1: ["g", "l"] }),
-      new: buildShortcut("jump_to.new", { keys1: ["g", "n"] }),
-      unread: buildShortcut("jump_to.unread", { keys1: ["g", "u"] }),
-      categories: buildShortcut("jump_to.categories", { keys1: ["g", "c"] }),
-      top: buildShortcut("jump_to.top", { keys1: ["g", "t"] }),
-      bookmarks: buildShortcut("jump_to.bookmarks", { keys1: ["g", "b"] }),
-      profile: buildShortcut("jump_to.profile", { keys1: ["g", "p"] }),
-      messages: buildShortcut("jump_to.messages", { keys1: ["g", "m"] }),
-      drafts: buildShortcut("jump_to.drafts", { keys1: ["g", "d"] })
-    },
-    navigation: {
-      back: buildShortcut("navigation.back", { keys1: ["u"] }),
-      jump: buildShortcut("navigation.jump", { keys1: ["#"] }),
-      up_down: buildShortcut("navigation.up_down", {
-        keys1: ["k"],
-        keys2: ["j"],
-        shortcutsDelimiter: "slash"
-      }),
-      open: buildShortcut("navigation.open", { keys1: ["o"], keys2: [ENTER] }),
-      next_prev: buildShortcut("navigation.next_prev", {
-        keys1: [SHIFT, "j"],
-        keys2: [SHIFT, "k"],
-        keysDelimiter: PLUS,
-        shortcutsDelimiter: "slash"
-      }),
-      go_to_unread_post: buildShortcut("navigation.go_to_unread_post", {
-        keys1: [SHIFT, "l"],
-        keysDelimiter: PLUS
-      })
-    },
-    application: {
-      hamburger_menu: buildShortcut("application.hamburger_menu", {
-        keys1: ["="]
-      }),
-      user_profile_menu: buildShortcut("application.user_profile_menu", {
-        keys1: ["p"]
-      }),
-      create: buildShortcut("application.create", { keys1: ["c"] }),
-      show_incoming_updated_topics: buildShortcut(
-        "application.show_incoming_updated_topics",
-        { keys1: ["."] }
-      ),
-      search: buildShortcut("application.search", {
-        keys1: ["/"],
-        keys2: [CTRL, ALT, "f"],
-        keysDelimiter: PLUS
-      }),
-      help: buildShortcut("application.help", { keys1: ["?"] }),
-      dismiss_new_posts: buildShortcut("application.dismiss_new_posts", {
-        keys1: ["x", "r"]
-      }),
-      dismiss_topics: buildShortcut("application.dismiss_topics", {
-        keys1: ["x", "t"]
-      }),
-      log_out: buildShortcut("application.log_out", {
-        keys1: [SHIFT, "z"],
-        keys2: [SHIFT, "z"],
-        keysDelimiter: PLUS,
-        shortcutsDelimiter: "space"
-      })
-    },
-    composing: {
-      return: buildShortcut("composing.return", {
-        keys1: [SHIFT, "c"],
-        keysDelimiter: PLUS
-      }),
-      fullscreen: buildShortcut("composing.fullscreen", {
-        keys1: [SHIFT, "F11"],
-        keysDelimiter: PLUS
-      })
-    },
-    bookmarks: {
-      enter: buildShortcut("bookmarks.enter", { keys1: [ENTER] }),
-      later_today: buildShortcut("bookmarks.later_today", {
-        keys1: ["l", "t"],
-        shortcutsDelimiter: "space"
-      }),
-      later_this_week: buildShortcut("bookmarks.later_this_week", {
-        keys1: ["l", "w"],
-        shortcutsDelimiter: "space"
-      }),
-      tomorrow: buildShortcut("bookmarks.tomorrow", {
-        keys1: ["n", "d"],
-        shortcutsDelimiter: "space"
-      }),
-      next_week: buildShortcut("bookmarks.next_week", {
-        keys1: ["n", "w"],
-        shortcutsDelimiter: "space"
-      }),
-      next_business_week: buildShortcut("bookmarks.next_business_week", {
-        keys1: ["n", "b", "w"],
-        shortcutsDelimiter: "space"
-      }),
-      next_business_day: buildShortcut("bookmarks.next_business_day", {
-        keys1: ["n", "b", "d"],
-        shortcutsDelimiter: "space"
-      }),
-      custom: buildShortcut("bookmarks.custom", {
-        keys1: ["c", "r"],
-        shortcutsDelimiter: "space"
-      }),
-      none: buildShortcut("bookmarks.none", {
-        keys1: ["n", "r"],
-        shortcutsDelimiter: "space"
-      })
-    },
-    actions: {
-      bookmark_topic: buildShortcut("actions.bookmark_topic", { keys1: ["f"] }),
-      reply_as_new_topic: buildShortcut("actions.reply_as_new_topic", {
-        keys1: ["t"]
-      }),
-      reply_topic: buildShortcut("actions.reply_topic", {
-        keys1: [SHIFT, "r"],
-        keysDelimiter: PLUS
-      }),
-      reply_post: buildShortcut("actions.reply_post", { keys1: ["r"] }),
-      quote_post: buildShortcut("actions.quote_post", { keys1: ["q"] }),
-      pin_unpin_topic: buildShortcut("actions.pin_unpin_topic", {
-        keys1: [SHIFT, "p"],
-        keysDelimiter: PLUS
-      }),
-      share_topic: buildShortcut("actions.share_topic", {
-        keys1: [SHIFT, "s"],
-        keysDelimiter: PLUS
-      }),
-      share_post: buildShortcut("actions.share_post", { keys1: ["s"] }),
-      like: buildShortcut("actions.like", { keys1: ["l"] }),
-      flag: buildShortcut("actions.flag", { keys1: ["!"] }),
-      bookmark: buildShortcut("actions.bookmark", { keys1: ["b"] }),
-      edit: buildShortcut("actions.edit", { keys1: ["e"] }),
-      delete: buildShortcut("actions.delete", { keys1: ["d"] }),
-      mark_muted: buildShortcut("actions.mark_muted", { keys1: ["m", "m"] }),
-      mark_regular: buildShortcut("actions.mark_regular", {
-        keys1: ["m", "r"]
-      }),
-      mark_tracking: buildShortcut("actions.mark_tracking", {
-        keys1: ["m", "t"]
-      }),
-      mark_watching: buildShortcut("actions.mark_watching", {
-        keys1: ["m", "w"]
-      }),
-      print: buildShortcut("actions.print", {
-        keys1: [CTRL, "p"],
-        keysDelimiter: PLUS
-      }),
-      defer: buildShortcut("actions.defer", {
-        keys1: [SHIFT, "u"],
-        keysDelimiter: PLUS
-      }),
-      topic_admin_actions: buildShortcut("actions.topic_admin_actions", {
-        keys1: [SHIFT, "a"],
-        keysDelimiter: PLUS
-      })
-    },
-    search_menu: {
-      prev_next: buildShortcut("search_menu.prev_next", {
-        keys1: ["&uarr;"],
-        keys2: ["&darr;"],
-        shortcutsDelimiter: "slash"
-      }),
-      insert_url: buildShortcut("search_menu.insert_url", {
-        keys1: ["a"]
-      })
-    }
+  _defineShortcuts() {
+    this.set("shortcuts", {
+      jump_to: {
+        home: buildShortcut("jump_to.home", { keys1: ["g", "h"] }),
+        latest: buildShortcut("jump_to.latest", { keys1: ["g", "l"] }),
+        new: buildShortcut("jump_to.new", { keys1: ["g", "n"] }),
+        unread: buildShortcut("jump_to.unread", { keys1: ["g", "u"] }),
+        categories: buildShortcut("jump_to.categories", { keys1: ["g", "c"] }),
+        top: buildShortcut("jump_to.top", { keys1: ["g", "t"] }),
+        bookmarks: buildShortcut("jump_to.bookmarks", { keys1: ["g", "b"] }),
+        profile: buildShortcut("jump_to.profile", { keys1: ["g", "p"] }),
+        messages: buildShortcut("jump_to.messages", { keys1: ["g", "m"] }),
+        drafts: buildShortcut("jump_to.drafts", { keys1: ["g", "d"] })
+      },
+      navigation: {
+        back: buildShortcut("navigation.back", { keys1: ["u"] }),
+        jump: buildShortcut("navigation.jump", { keys1: ["#"] }),
+        up_down: buildShortcut("navigation.up_down", {
+          keys1: ["k"],
+          keys2: ["j"],
+          shortcutsDelimiter: "slash"
+        }),
+        open: buildShortcut("navigation.open", {
+          keys1: ["o"],
+          keys2: [ENTER]
+        }),
+        next_prev: buildShortcut("navigation.next_prev", {
+          keys1: [SHIFT, "j"],
+          keys2: [SHIFT, "k"],
+          keysDelimiter: PLUS,
+          shortcutsDelimiter: "slash"
+        }),
+        go_to_unread_post: buildShortcut("navigation.go_to_unread_post", {
+          keys1: [SHIFT, "l"],
+          keysDelimiter: PLUS
+        })
+      },
+      application: {
+        hamburger_menu: buildShortcut("application.hamburger_menu", {
+          keys1: ["="]
+        }),
+        user_profile_menu: buildShortcut("application.user_profile_menu", {
+          keys1: ["p"]
+        }),
+        create: buildShortcut("application.create", { keys1: ["c"] }),
+        show_incoming_updated_topics: buildShortcut(
+          "application.show_incoming_updated_topics",
+          { keys1: ["."] }
+        ),
+        search: buildShortcut("application.search", {
+          keys1: ["/"],
+          keys2: [CTRL, ALT, "f"],
+          keysDelimiter: PLUS
+        }),
+        help: buildShortcut("application.help", { keys1: ["?"] }),
+        dismiss_new_posts: buildShortcut("application.dismiss_new_posts", {
+          keys1: ["x", "r"]
+        }),
+        dismiss_topics: buildShortcut("application.dismiss_topics", {
+          keys1: ["x", "t"]
+        }),
+        log_out: buildShortcut("application.log_out", {
+          keys1: [SHIFT, "z"],
+          keys2: [SHIFT, "z"],
+          keysDelimiter: PLUS,
+          shortcutsDelimiter: "space"
+        })
+      },
+      composing: {
+        return: buildShortcut("composing.return", {
+          keys1: [SHIFT, "c"],
+          keysDelimiter: PLUS
+        }),
+        fullscreen: buildShortcut("composing.fullscreen", {
+          keys1: [SHIFT, "F11"],
+          keysDelimiter: PLUS
+        })
+      },
+      bookmarks: {
+        enter: buildShortcut("bookmarks.enter", { keys1: [ENTER] }),
+        later_today: buildShortcut("bookmarks.later_today", {
+          keys1: ["l", "t"],
+          shortcutsDelimiter: "space"
+        }),
+        later_this_week: buildShortcut("bookmarks.later_this_week", {
+          keys1: ["l", "w"],
+          shortcutsDelimiter: "space"
+        }),
+        tomorrow: buildShortcut("bookmarks.tomorrow", {
+          keys1: ["n", "d"],
+          shortcutsDelimiter: "space"
+        }),
+        next_week: buildShortcut("bookmarks.next_week", {
+          keys1: ["n", "w"],
+          shortcutsDelimiter: "space"
+        }),
+        next_business_week: buildShortcut("bookmarks.next_business_week", {
+          keys1: ["n", "b", "w"],
+          shortcutsDelimiter: "space"
+        }),
+        next_business_day: buildShortcut("bookmarks.next_business_day", {
+          keys1: ["n", "b", "d"],
+          shortcutsDelimiter: "space"
+        }),
+        custom: buildShortcut("bookmarks.custom", {
+          keys1: ["c", "r"],
+          shortcutsDelimiter: "space"
+        }),
+        none: buildShortcut("bookmarks.none", {
+          keys1: ["n", "r"],
+          shortcutsDelimiter: "space"
+        })
+      },
+      actions: {
+        bookmark_topic: buildShortcut("actions.bookmark_topic", {
+          keys1: ["f"]
+        }),
+        reply_as_new_topic: buildShortcut("actions.reply_as_new_topic", {
+          keys1: ["t"]
+        }),
+        reply_topic: buildShortcut("actions.reply_topic", {
+          keys1: [SHIFT, "r"],
+          keysDelimiter: PLUS
+        }),
+        reply_post: buildShortcut("actions.reply_post", { keys1: ["r"] }),
+        quote_post: buildShortcut("actions.quote_post", { keys1: ["q"] }),
+        pin_unpin_topic: buildShortcut("actions.pin_unpin_topic", {
+          keys1: [SHIFT, "p"],
+          keysDelimiter: PLUS
+        }),
+        share_topic: buildShortcut("actions.share_topic", {
+          keys1: [SHIFT, "s"],
+          keysDelimiter: PLUS
+        }),
+        share_post: buildShortcut("actions.share_post", { keys1: ["s"] }),
+        like: buildShortcut("actions.like", { keys1: ["l"] }),
+        flag: buildShortcut("actions.flag", { keys1: ["!"] }),
+        bookmark: buildShortcut("actions.bookmark", { keys1: ["b"] }),
+        edit: buildShortcut("actions.edit", { keys1: ["e"] }),
+        delete: buildShortcut("actions.delete", { keys1: ["d"] }),
+        mark_muted: buildShortcut("actions.mark_muted", { keys1: ["m", "m"] }),
+        mark_regular: buildShortcut("actions.mark_regular", {
+          keys1: ["m", "r"]
+        }),
+        mark_tracking: buildShortcut("actions.mark_tracking", {
+          keys1: ["m", "t"]
+        }),
+        mark_watching: buildShortcut("actions.mark_watching", {
+          keys1: ["m", "w"]
+        }),
+        print: buildShortcut("actions.print", {
+          keys1: [CTRL, "p"],
+          keysDelimiter: PLUS
+        }),
+        defer: buildShortcut("actions.defer", {
+          keys1: [SHIFT, "u"],
+          keysDelimiter: PLUS
+        }),
+        topic_admin_actions: buildShortcut("actions.topic_admin_actions", {
+          keys1: [SHIFT, "a"],
+          keysDelimiter: PLUS
+        })
+      },
+      search_menu: {
+        prev_next: buildShortcut("search_menu.prev_next", {
+          keys1: ["&uarr;"],
+          keys2: ["&darr;"],
+          shortcutsDelimiter: "slash"
+        }),
+        insert_url: buildShortcut("search_menu.insert_url", {
+          keys1: ["a"]
+        })
+      }
+    });
   }
 });

From 42c2678d8f4b46490a7794effaefbf2e5c13434c Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 7 Apr 2020 15:43:00 +1000
Subject: [PATCH 0529/1830] FIX: Show topic level bookmark with reminder modal
 (#9336)

* When using the topic-level bookmark button or shortcut, we now show the bookmark with reminder modal for consistency.
* When hovering on a bookmark reminder notification where the bookmark has a name, show the name of the bookmark on hover.
---
 .../javascripts/discourse/models/post.js      | 44 +++++-----
 .../javascripts/discourse/models/topic.js     | 81 +++++++++++--------
 .../bookmark-reminder-notification-item.js    | 13 +++
 config/locales/client.en.yml                  |  1 +
 4 files changed, 87 insertions(+), 52 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/post.js b/app/assets/javascripts/discourse/models/post.js
index 2629afcb33..535ac4b419 100644
--- a/app/assets/javascripts/discourse/models/post.js
+++ b/app/assets/javascripts/discourse/models/post.js
@@ -339,26 +339,30 @@ const Post = RestModel.extend({
   toggleBookmarkWithReminder() {
     this.toggleProperty("bookmarked_with_reminder");
     if (this.bookmarked_with_reminder) {
-      let controller = showModal("bookmark", {
-        model: {
-          postId: this.id
-        },
-        title: "post.bookmarks.create",
-        modalClass: "bookmark-with-reminder"
-      });
-      controller.setProperties({
-        onCloseWithoutSaving: () => {
-          this.toggleProperty("bookmarked_with_reminder");
-          this.appEvents.trigger("post-stream:refresh", { id: this.id });
-        },
-        afterSave: (reminderAtISO, reminderType) => {
-          this.setProperties({
-            "topic.bookmarked": true,
-            bookmark_reminder_at: reminderAtISO,
-            bookmark_reminder_type: reminderType
-          });
-          this.appEvents.trigger("post-stream:refresh", { id: this.id });
-        }
+      return new Promise(resolve => {
+        let controller = showModal("bookmark", {
+          model: {
+            postId: this.id
+          },
+          title: "post.bookmarks.create",
+          modalClass: "bookmark-with-reminder"
+        });
+        controller.setProperties({
+          onCloseWithoutSaving: () => {
+            this.toggleProperty("bookmarked_with_reminder");
+            this.appEvents.trigger("post-stream:refresh", { id: this.id });
+            resolve();
+          },
+          afterSave: (reminderAtISO, reminderType) => {
+            this.setProperties({
+              "topic.bookmarked": true,
+              bookmark_reminder_at: reminderAtISO,
+              bookmark_reminder_type: reminderType
+            });
+            this.appEvents.trigger("post-stream:refresh", { id: this.id });
+            resolve();
+          }
+        });
       });
     } else {
       this.setProperties({
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index 26afbd4ba2..045f31123d 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -397,6 +397,16 @@ const Topic = RestModel.extend({
     }).then(() => this.set("archetype", "regular"));
   },
 
+  afterTopicBookmarked(firstPost) {
+    if (firstPost) {
+      firstPost.set("bookmarked", true);
+      if (this.siteSettings.enable_bookmarks_with_reminders) {
+        firstPost.set("bookmarked_with_reminder", true);
+      }
+      return [firstPost.id];
+    }
+  },
+
   toggleBookmark() {
     if (this.bookmarking) {
       return Promise.resolve();
@@ -408,41 +418,48 @@ const Topic = RestModel.extend({
     const firstPost =
       posts && posts[0] && posts[0].get("post_number") === 1 && posts[0];
     const bookmark = !this.bookmarked;
-    const path = bookmark ? "/bookmark" : "/remove_bookmarks";
 
     const toggleBookmarkOnServer = () => {
-      return ajax(`/t/${this.id}${path}`, { type: "PUT" })
-        .then(() => {
-          this.toggleProperty("bookmarked");
-          if (bookmark && firstPost) {
-            firstPost.set("bookmarked", true);
-            if (this.siteSettings.enable_bookmarks_with_reminders) {
-              firstPost.set("bookmarked_with_reminder", true);
+      if (bookmark) {
+        if (this.siteSettings.enable_bookmarks_with_reminders) {
+          return firstPost.toggleBookmarkWithReminder().then(() => {
+            this.set("bookmarking", false);
+            return this.afterTopicBookmarked(firstPost);
+          });
+        } else {
+          return ajax(`/t/${this.id}/bookmark`, { type: "PUT" })
+            .then(() => {
+              this.toggleProperty("bookmarked");
+              return this.afterTopicBookmarked(firstPost);
+            })
+            .catch(popupAjaxError)
+            .finally(() => this.set("bookmarking", false));
+        }
+      } else {
+        return ajax(`/t/${this.id}/remove_bookmarks`, { type: "PUT" })
+          .then(() => {
+            this.toggleProperty("bookmarked");
+            if (posts) {
+              const updated = [];
+              posts.forEach(post => {
+                if (post.get("bookmarked")) {
+                  post.set("bookmarked", false);
+                  updated.push(post.id);
+                }
+                if (
+                  this.siteSettings.enable_bookmarks_with_reminders &&
+                  post.get("bookmarked_with_reminder")
+                ) {
+                  post.set("bookmarked_with_reminder", false);
+                  updated.push(post.id);
+                }
+              });
+              return updated;
             }
-            return [firstPost.id];
-          }
-          if (!bookmark && posts) {
-            const updated = [];
-            posts.forEach(post => {
-              if (post.get("bookmarked")) {
-                post.set("bookmarked", false);
-                updated.push(post.id);
-              }
-              if (
-                this.siteSettings.enable_bookmarks_with_reminders &&
-                post.get("bookmarked_with_reminder")
-              ) {
-                post.set("bookmarked_with_reminder", false);
-                updated.push(post.id);
-              }
-            });
-            return updated;
-          }
-
-          return [];
-        })
-        .catch(popupAjaxError)
-        .finally(() => this.set("bookmarking", false));
+          })
+          .catch(popupAjaxError)
+          .finally(() => this.set("bookmarking", false));
+      }
     };
 
     const unbookmarkedPosts = [];
diff --git a/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js b/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js
index f02bc7a223..1a6691dda8 100644
--- a/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js
+++ b/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js
@@ -14,6 +14,19 @@ createWidgetFrom(
         description,
         username
       });
+    },
+    notificationTitle(notificationName, data) {
+      if (notificationName) {
+        if (data.bookmark_name) {
+          return I18n.t(`notifications.titles.${notificationName}_with_name`, {
+            name: data.bookmark_name
+          });
+        } else {
+          return I18n.t(`notifications.titles.${notificationName}`);
+        }
+      } else {
+        return "";
+      }
     }
   }
 );
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a05ced4e1e..62cfd14763 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1880,6 +1880,7 @@ en:
         moved_post: "post moved"
         linked: "linked"
         bookmark_reminder: "bookmark reminder"
+        bookmark_reminder_with_name: "bookmark reminder - %{name}"
         granted_badge: "badge granted"
         invited_to_topic: "invited to topic"
         group_mentioned: "group mentioned"

From 34df9f790846b1127a69e1d263a8ed299736f64b Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 7 Apr 2020 16:27:13 +1000
Subject: [PATCH 0530/1830] Revert DEFAULT_SHORTCUTS plugin API-breaking change

* this was done in previous commit
93c38cc1756d409a3055628b14d61bd3d3c0c08c,
  unaware that addKeyboardShortcut in plugin-api.js imports
  bindings from KeyboardShortcuts
---
 .../javascripts/discourse/lib/keyboard-shortcuts.js  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index c4a962ac68..37fe28618c 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -6,7 +6,7 @@ import { ajax } from "discourse/lib/ajax";
 import { throttle } from "@ember/runloop";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 
-export let DEFAULT_BINDINGS = {
+export let bindings = {
   "!": { postAction: "showFlags" },
   "#": { handler: "goToPost", anonymous: true },
   "/": { handler: "toggleSearch", anonymous: true },
@@ -96,18 +96,18 @@ export default {
 
     // Disable the shortcut if private messages are disabled
     if (!siteSettings.enable_personal_messages) {
-      delete DEFAULT_BINDINGS["g m"];
+      delete bindings["g m"];
     }
   },
 
   bindEvents() {
-    Object.keys(DEFAULT_BINDINGS).forEach(key => {
+    Object.keys(bindings).forEach(key => {
       this.bindKey(key);
     });
   },
 
   bindKey(key) {
-    const binding = DEFAULT_BINDINGS[key];
+    const binding = bindings[key];
     if (!binding.anonymous && !this.currentUser) {
       return;
     }
@@ -158,8 +158,8 @@ export default {
   // {
   //   'c': createTopic
   // }
-  unbind(bindings) {
-    this.pause(Object.keys(bindings));
+  unbind(combinations) {
+    this.pause(Object.keys(combinations));
   },
 
   toggleBookmark() {

From 0653750fbf7d690f96ef064932b3dd44550bcb45 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Tue, 7 Apr 2020 16:42:52 +0300
Subject: [PATCH 0531/1830] FEATURE: Hash user API keys in the database (#9344)

The 'key' column will be dropped in a future commit.
---
 app/controllers/user_api_keys_controller.rb   |  3 +-
 app/models/user_api_key.rb                    | 23 +++++++++++++
 ...0403100259_add_key_hash_to_user_api_key.rb | 32 +++++++++++++++++++
 lib/auth/default_current_user_provider.rb     |  2 +-
 spec/integration/user_api_keys_spec.rb        |  4 +--
 .../requests/user_api_keys_controller_spec.rb |  6 ++--
 6 files changed, 62 insertions(+), 8 deletions(-)
 create mode 100644 db/migrate/20200403100259_add_key_hash_to_user_api_key.rb

diff --git a/app/controllers/user_api_keys_controller.rb b/app/controllers/user_api_keys_controller.rb
index d4f2ae3d2b..6de32f04af 100644
--- a/app/controllers/user_api_keys_controller.rb
+++ b/app/controllers/user_api_keys_controller.rb
@@ -71,7 +71,6 @@ class UserApiKeysController < ApplicationController
       client_id: params[:client_id],
       user_id: current_user.id,
       push_url: params[:push_url],
-      key: SecureRandom.hex,
       scopes: scopes
     )
 
@@ -146,7 +145,7 @@ class UserApiKeysController < ApplicationController
     revoke_key = find_key if params[:id]
 
     if current_key = request.env['HTTP_USER_API_KEY']
-      request_key = UserApiKey.find_by(key: current_key)
+      request_key = UserApiKey.with_key(current_key).first
       revoke_key ||= request_key
       if request_key && request_key.id != revoke_key.id && !request_key.scopes.include?("write")
         raise Discourse::InvalidAccess
diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb
index 7d696246ca..e937c44a8e 100644
--- a/app/models/user_api_key.rb
+++ b/app/models/user_api_key.rb
@@ -20,6 +20,28 @@ class UserApiKey < ActiveRecord::Base
 
   belongs_to :user
 
+  scope :active, -> { where(revoked_at: nil) }
+  scope :with_key, ->(key) { where(key_hash: ApiKey.hash_key(key)) }
+
+  after_initialize :generate_key
+
+  def generate_key
+    if !self.key_hash
+      @key ||= SecureRandom.hex
+      self.key = @key
+      self.key_hash = ApiKey.hash_key(@key)
+    end
+  end
+
+  def key
+    raise ApiKey::KeyAccessError.new "API key is only accessible immediately after creation" unless key_available?
+    @key
+  end
+
+  def key_available?
+    @key.present?
+  end
+
   def self.allowed_scopes
     Set.new(SiteSetting.allow_user_api_key_scopes.split("|"))
   end
@@ -88,6 +110,7 @@ end
 #  revoked_at       :datetime
 #  scopes           :text             default([]), not null, is an Array
 #  last_used_at     :datetime         not null
+#  key_hash         :string           not null
 #
 # Indexes
 #
diff --git a/db/migrate/20200403100259_add_key_hash_to_user_api_key.rb b/db/migrate/20200403100259_add_key_hash_to_user_api_key.rb
new file mode 100644
index 0000000000..2e998fc255
--- /dev/null
+++ b/db/migrate/20200403100259_add_key_hash_to_user_api_key.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class AddKeyHashToUserApiKey < ActiveRecord::Migration[6.0]
+  def up
+    add_column :user_api_keys, :key_hash, :string
+
+    batch_size = 500
+    loop do
+      rows = DB
+        .query("SELECT id, key FROM user_api_keys WHERE key_hash IS NULL LIMIT #{batch_size}")
+        .map { |row| { id: row.id, key_hash: Digest::SHA256.hexdigest(key) } }
+
+      break if rows.size == 0
+
+      data_string = rows.map { |r| "(#{r[:id]}, '#{r[:key_hash]}')" }.join(",")
+      execute <<~SQL
+        UPDATE user_api_keys
+        SET key_hash = data.key_hash
+        FROM (VALUES #{data_string}) AS data(id, key_hash)
+        WHERE user_api_keys.id = data.id
+      SQL
+
+      break if rows.size < batch_size
+    end
+
+    change_column_null :user_api_keys, :key_hash, false
+  end
+
+  def down
+    drop_column :user_api_keys, :key_hash, :string
+  end
+end
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index c43580c042..fc7f850026 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -260,7 +260,7 @@ class Auth::DefaultCurrentUserProvider
   protected
 
   def lookup_user_api_user_and_update_key(user_api_key, client_id)
-    if api_key = UserApiKey.where(key: user_api_key, revoked_at: nil).includes(:user).first
+    if api_key = UserApiKey.active.with_key(user_api_key).includes(:user).first
       unless api_key.allow?(@env)
         raise Discourse::InvalidAccess
       end
diff --git a/spec/integration/user_api_keys_spec.rb b/spec/integration/user_api_keys_spec.rb
index 8cd4edcd7a..5bbdff319e 100644
--- a/spec/integration/user_api_keys_spec.rb
+++ b/spec/integration/user_api_keys_spec.rb
@@ -3,12 +3,12 @@
 require 'rails_helper'
 
 describe 'user api keys integration' do
-  fab!(:user_api_key) { Fabricate(:readonly_user_api_key) }
-
   it 'updates last used time on use' do
     freeze_time
 
+    user_api_key = Fabricate(:readonly_user_api_key)
     user_api_key.update_columns(last_used_at: 7.days.ago)
+
     get '/session/current.json', headers: {
       HTTP_USER_API_KEY: user_api_key.key,
     }
diff --git a/spec/requests/user_api_keys_controller_spec.rb b/spec/requests/user_api_keys_controller_spec.rb
index aa965b9a11..8148bef88a 100644
--- a/spec/requests/user_api_keys_controller_spec.rb
+++ b/spec/requests/user_api_keys_controller_spec.rb
@@ -205,7 +205,7 @@ describe UserApiKeysController do
       expect(parsed["nonce"]).to eq(args[:nonce])
       expect(parsed["push"]).to eq(true)
 
-      api_key = UserApiKey.find_by(key: parsed["key"])
+      api_key = UserApiKey.with_key(parsed["key"]).first
 
       expect(api_key.user_id).to eq(user.id)
       expect(api_key.scopes.sort).to eq(["push", "message_bus", "notifications", "session_info", "one_time_password"].sort)
@@ -242,7 +242,7 @@ describe UserApiKeysController do
       encrypted = Base64.decode64(payload)
       key = OpenSSL::PKey::RSA.new(private_key)
       parsed = JSON.parse(key.private_decrypt(encrypted))
-      api_key = UserApiKey.find_by(key: parsed["key"])
+      api_key = UserApiKey.with_key(parsed["key"]).first
       expect(api_key.user_id).to eq(user.id)
     end
 
@@ -259,7 +259,7 @@ describe UserApiKeysController do
       encrypted = Base64.decode64(payload)
       key = OpenSSL::PKey::RSA.new(private_key)
       parsed = JSON.parse(key.private_decrypt(encrypted))
-      api_key = UserApiKey.find_by(key: parsed["key"])
+      api_key = UserApiKey.with_key(parsed["key"]).first
       expect(api_key.user_id).to eq(user.id)
 
     end

From 2e8f54e9ee727a271b366edcae91fb579ee1069c Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Tue, 7 Apr 2020 17:10:05 +0300
Subject: [PATCH 0532/1830] DEV: Fix build

Follow up to 0653750fbf7d690f96ef064932b3dd44550bcb45.
---
 db/migrate/20200403100259_add_key_hash_to_user_api_key.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20200403100259_add_key_hash_to_user_api_key.rb b/db/migrate/20200403100259_add_key_hash_to_user_api_key.rb
index 2e998fc255..138cf28b55 100644
--- a/db/migrate/20200403100259_add_key_hash_to_user_api_key.rb
+++ b/db/migrate/20200403100259_add_key_hash_to_user_api_key.rb
@@ -8,7 +8,7 @@ class AddKeyHashToUserApiKey < ActiveRecord::Migration[6.0]
     loop do
       rows = DB
         .query("SELECT id, key FROM user_api_keys WHERE key_hash IS NULL LIMIT #{batch_size}")
-        .map { |row| { id: row.id, key_hash: Digest::SHA256.hexdigest(key) } }
+        .map { |row| { id: row.id, key_hash: Digest::SHA256.hexdigest(row.key) } }
 
       break if rows.size == 0
 

From 3e176f9bf49e99bbb6a1aa1c4faa28357d5f3949 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 7 Apr 2020 10:29:49 -0400
Subject: [PATCH 0533/1830] Build(deps): Bump mini_sql from 0.2.4 to 0.2.5
 (#9368)

Bumps [mini_sql](https://github.com/discourse/mini_sql) from 0.2.4 to 0.2.5.
- [Release notes](https://github.com/discourse/mini_sql/releases)
- [Changelog](https://github.com/discourse/mini_sql/blob/master/CHANGELOG)
- [Commits](https://github.com/discourse/mini_sql/compare/v0.2.4...v0.2.5)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index cb70d824a3..e668ecd8cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -192,7 +192,7 @@ GEM
       libv8 (>= 6.9.411)
     mini_scheduler (0.12.2)
       sidekiq
-    mini_sql (0.2.4)
+    mini_sql (0.2.5)
     mini_suffix (0.3.0)
       ffi (~> 1.9)
     minitest (5.14.0)

From e52e7f6e75f247fcf0e0d4369ca81edb7d93e5a5 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Tue, 7 Apr 2020 11:42:12 -0300
Subject: [PATCH 0534/1830] FIX: Include pending queued users regardless of
 their score (#9372)

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

diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 78d4b98e65..771b37f4ee 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -476,7 +476,10 @@ class Reviewable < ActiveRecord::Base
     result = result.where("created_at <= ?", to_date) if to_date
 
     if min_score > 0 && status == :pending && type.nil?
-      result = result.where("score >= ? OR type = ?", min_score, ReviewableQueuedPost.name)
+      result = result.where(
+        "score >= ? OR type IN (?)",
+        min_score, [ReviewableQueuedPost.name, ReviewableUser.name]
+      )
     elsif min_score > 0
       result = result.where("score >= ?", min_score)
     end
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index 9b46eb7c52..5fd051fc0c 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -181,10 +181,11 @@ RSpec.describe Reviewable, type: :model do
             SiteSetting.reviewable_default_visibility = :high
             Reviewable.set_priorities(high: 10)
             @queued_post = Fabricate(:reviewable_queued_post, score: 0, target: post)
+            @queued_user = Fabricate(:reviewable_user, score: 0)
           end
 
           it 'includes queued posts when searching for pending reviewables' do
-            expect(Reviewable.list_for(user)).to contain_exactly(@queued_post)
+            expect(Reviewable.list_for(user)).to contain_exactly(@queued_post, @queued_user)
           end
 
           it 'excludes pending queued posts when applying a different status filter' do

From 09145e68cd5ce274c919b30e818bb3cd83cce17c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 7 Apr 2020 17:01:02 +0200
Subject: [PATCH 0535/1830] DEV: upgrades vendored handlebars to 4.7.6 (#9371)

---
 package.json                                  |   2 +-
 vendor/assets/javascripts/handlebars.js       | 400 +++++++++++++-----
 .../assets/javascripts/handlebars.runtime.js  | 286 +++++++++++--
 yarn.lock                                     |  38 +-
 4 files changed, 570 insertions(+), 156 deletions(-)

diff --git a/package.json b/package.json
index 7c327e06eb..fa7ea12185 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "chart.js": "2.9.3",
     "eslint-plugin-lodash": "^6.0.0",
     "favcount": "https://github.com/chrishunt/favcount",
-    "handlebars": "^4.3.0",
+    "handlebars": "^4.7.0",
     "highlight.js": "https://github.com/highlightjs/highlight.js",
     "htmlparser": "https://github.com/tautologistics/node-htmlparser",
     "intersection-observer": "^0.5.1",
diff --git a/vendor/assets/javascripts/handlebars.js b/vendor/assets/javascripts/handlebars.js
index 646b3c3b46..05d9f6141a 100644
--- a/vendor/assets/javascripts/handlebars.js
+++ b/vendor/assets/javascripts/handlebars.js
@@ -1,9 +1,9 @@
 /**!
 
  @license
- handlebars v4.5.3
+ handlebars v4.7.6
 
-Copyright (C) 2011-2017 by Yehuda Katz
+Copyright (C) 2011-2019 by Yehuda Katz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -92,23 +92,23 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	// Compiler imports
 
-	var _handlebarsCompilerAst = __webpack_require__(40);
+	var _handlebarsCompilerAst = __webpack_require__(45);
 
 	var _handlebarsCompilerAst2 = _interopRequireDefault(_handlebarsCompilerAst);
 
-	var _handlebarsCompilerBase = __webpack_require__(41);
+	var _handlebarsCompilerBase = __webpack_require__(46);
 
-	var _handlebarsCompilerCompiler = __webpack_require__(46);
+	var _handlebarsCompilerCompiler = __webpack_require__(51);
 
-	var _handlebarsCompilerJavascriptCompiler = __webpack_require__(49);
+	var _handlebarsCompilerJavascriptCompiler = __webpack_require__(52);
 
 	var _handlebarsCompilerJavascriptCompiler2 = _interopRequireDefault(_handlebarsCompilerJavascriptCompiler);
 
-	var _handlebarsCompilerVisitor = __webpack_require__(44);
+	var _handlebarsCompilerVisitor = __webpack_require__(49);
 
 	var _handlebarsCompilerVisitor2 = _interopRequireDefault(_handlebarsCompilerVisitor);
 
-	var _handlebarsNoConflict = __webpack_require__(39);
+	var _handlebarsNoConflict = __webpack_require__(44);
 
 	var _handlebarsNoConflict2 = _interopRequireDefault(_handlebarsNoConflict);
 
@@ -178,7 +178,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	// Each of these augment the Handlebars object. No need to setup here.
 	// (This is done to easily share code between commonjs and browse envs)
 
-	var _handlebarsSafeString = __webpack_require__(33);
+	var _handlebarsSafeString = __webpack_require__(37);
 
 	var _handlebarsSafeString2 = _interopRequireDefault(_handlebarsSafeString);
 
@@ -190,11 +190,11 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var Utils = _interopRequireWildcard(_handlebarsUtils);
 
-	var _handlebarsRuntime = __webpack_require__(34);
+	var _handlebarsRuntime = __webpack_require__(38);
 
 	var runtime = _interopRequireWildcard(_handlebarsRuntime);
 
-	var _handlebarsNoConflict = __webpack_require__(39);
+	var _handlebarsNoConflict = __webpack_require__(44);
 
 	var _handlebarsNoConflict2 = _interopRequireDefault(_handlebarsNoConflict);
 
@@ -276,7 +276,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _logger2 = _interopRequireDefault(_logger);
 
-	var VERSION = '4.5.3';
+	var _internalProtoAccess = __webpack_require__(33);
+
+	var VERSION = '4.7.6';
 	exports.VERSION = VERSION;
 	var COMPILER_REVISION = 8;
 	exports.COMPILER_REVISION = COMPILER_REVISION;
@@ -352,6 +354,13 @@ return /******/ (function(modules) { // webpackBootstrap
 	  },
 	  unregisterDecorator: function unregisterDecorator(name) {
 	    delete this.decorators[name];
+	  },
+	  /**
+	   * Reset the memory of illegal property accesses that have already been logged.
+	   * @deprecated should only be used in handlebars test-cases
+	   */
+	  resetLoggedPropertyAccesses: function resetLoggedPropertyAccesses() {
+	    _internalProtoAccess.resetLoggedProperties();
 	  }
 	};
 
@@ -375,7 +384,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.createFrame = createFrame;
 	exports.blockParams = blockParams;
 	exports.appendContextPath = appendContextPath;
-
 	var escape = {
 	  '&': '&amp;',
 	  '<': '&lt;',
@@ -499,7 +507,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	var _Object$defineProperty = __webpack_require__(7)['default'];
 
 	exports.__esModule = true;
-
 	var errorProps = ['description', 'fileName', 'lineNumber', 'endLineNumber', 'message', 'name', 'number', 'stack'];
 
 	function Exception(message, node) {
@@ -1047,7 +1054,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	    if (arguments.length != 2) {
 	      throw new _exception2['default']('#unless requires exactly one argument');
 	    }
-	    return instance.helpers['if'].call(this, conditional, { fn: options.inverse, inverse: options.fn, hash: options.hash });
+	    return instance.helpers['if'].call(this, conditional, {
+	      fn: options.inverse,
+	      inverse: options.fn,
+	      hash: options.hash
+	    });
 	  });
 	};
 
@@ -1090,22 +1101,19 @@ return /******/ (function(modules) { // webpackBootstrap
 	'use strict';
 
 	exports.__esModule = true;
-	var dangerousPropertyRegex = /^(constructor|__defineGetter__|__defineSetter__|__lookupGetter__|__proto__)$/;
-
-	exports.dangerousPropertyRegex = dangerousPropertyRegex;
 
 	exports['default'] = function (instance) {
-	  instance.registerHelper('lookup', function (obj, field) {
+	  instance.registerHelper('lookup', function (obj, field, options) {
 	    if (!obj) {
+	      // Note for 5.0: Change to "obj == null" in 5.0
 	      return obj;
 	    }
-	    if (dangerousPropertyRegex.test(String(field)) && !Object.prototype.propertyIsEnumerable.call(obj, field)) {
-	      return undefined;
-	    }
-	    return obj[field];
+	    return options.lookupProperty(obj, field);
 	  });
 	};
 
+	module.exports = exports['default'];
+
 /***/ }),
 /* 29 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -1238,8 +1246,8 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	    if (typeof console !== 'undefined' && logger.lookupLevel(logger.level) <= level) {
 	      var method = logger.methodMap[level];
+	      // eslint-disable-next-line no-console
 	      if (!console[method]) {
-	        // eslint-disable-line no-console
 	        method = 'log';
 	      }
 
@@ -1257,6 +1265,129 @@ return /******/ (function(modules) { // webpackBootstrap
 
 /***/ }),
 /* 33 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _Object$create = __webpack_require__(34)['default'];
+
+	var _Object$keys = __webpack_require__(13)['default'];
+
+	var _interopRequireWildcard = __webpack_require__(3)['default'];
+
+	exports.__esModule = true;
+	exports.createProtoAccessControl = createProtoAccessControl;
+	exports.resultIsAllowed = resultIsAllowed;
+	exports.resetLoggedProperties = resetLoggedProperties;
+
+	var _createNewLookupObject = __webpack_require__(36);
+
+	var _logger = __webpack_require__(32);
+
+	var logger = _interopRequireWildcard(_logger);
+
+	var loggedProperties = _Object$create(null);
+
+	function createProtoAccessControl(runtimeOptions) {
+	  var defaultMethodWhiteList = _Object$create(null);
+	  defaultMethodWhiteList['constructor'] = false;
+	  defaultMethodWhiteList['__defineGetter__'] = false;
+	  defaultMethodWhiteList['__defineSetter__'] = false;
+	  defaultMethodWhiteList['__lookupGetter__'] = false;
+
+	  var defaultPropertyWhiteList = _Object$create(null);
+	  // eslint-disable-next-line no-proto
+	  defaultPropertyWhiteList['__proto__'] = false;
+
+	  return {
+	    properties: {
+	      whitelist: _createNewLookupObject.createNewLookupObject(defaultPropertyWhiteList, runtimeOptions.allowedProtoProperties),
+	      defaultValue: runtimeOptions.allowProtoPropertiesByDefault
+	    },
+	    methods: {
+	      whitelist: _createNewLookupObject.createNewLookupObject(defaultMethodWhiteList, runtimeOptions.allowedProtoMethods),
+	      defaultValue: runtimeOptions.allowProtoMethodsByDefault
+	    }
+	  };
+	}
+
+	function resultIsAllowed(result, protoAccessControl, propertyName) {
+	  if (typeof result === 'function') {
+	    return checkWhiteList(protoAccessControl.methods, propertyName);
+	  } else {
+	    return checkWhiteList(protoAccessControl.properties, propertyName);
+	  }
+	}
+
+	function checkWhiteList(protoAccessControlForType, propertyName) {
+	  if (protoAccessControlForType.whitelist[propertyName] !== undefined) {
+	    return protoAccessControlForType.whitelist[propertyName] === true;
+	  }
+	  if (protoAccessControlForType.defaultValue !== undefined) {
+	    return protoAccessControlForType.defaultValue;
+	  }
+	  logUnexpecedPropertyAccessOnce(propertyName);
+	  return false;
+	}
+
+	function logUnexpecedPropertyAccessOnce(propertyName) {
+	  if (loggedProperties[propertyName] !== true) {
+	    loggedProperties[propertyName] = true;
+	    logger.log('error', 'Handlebars: Access has been denied to resolve the property "' + propertyName + '" because it is not an "own property" of its parent.\n' + 'You can add a runtime option to disable the check or this warning:\n' + 'See https://handlebarsjs.com/api-reference/runtime-options.html#options-to-control-prototype-access for details');
+	  }
+	}
+
+	function resetLoggedProperties() {
+	  _Object$keys(loggedProperties).forEach(function (propertyName) {
+	    delete loggedProperties[propertyName];
+	  });
+	}
+
+/***/ }),
+/* 34 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	module.exports = { "default": __webpack_require__(35), __esModule: true };
+
+/***/ }),
+/* 35 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	var $ = __webpack_require__(9);
+	module.exports = function create(P, D){
+	  return $.create(P, D);
+	};
+
+/***/ }),
+/* 36 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _Object$create = __webpack_require__(34)['default'];
+
+	exports.__esModule = true;
+	exports.createNewLookupObject = createNewLookupObject;
+
+	var _utils = __webpack_require__(5);
+
+	/**
+	 * Create a new object with "null"-prototype to avoid truthy results on prototype properties.
+	 * The resulting object can be used with "object[property]" to check if a property exists
+	 * @param {...object} sources a varargs parameter of source objects that will be merged
+	 * @returns {object}
+	 */
+
+	function createNewLookupObject() {
+	  for (var _len = arguments.length, sources = Array(_len), _key = 0; _key < _len; _key++) {
+	    sources[_key] = arguments[_key];
+	  }
+
+	  return _utils.extend.apply(undefined, [_Object$create(null)].concat(sources));
+	}
+
+/***/ }),
+/* 37 */
 /***/ (function(module, exports) {
 
 	// Build out our basic SafeString type
@@ -1275,12 +1406,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 
 /***/ }),
-/* 34 */
+/* 38 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var _Object$seal = __webpack_require__(35)['default'];
+	var _Object$seal = __webpack_require__(39)['default'];
+
+	var _Object$keys = __webpack_require__(13)['default'];
 
 	var _interopRequireWildcard = __webpack_require__(3)['default'];
 
@@ -1306,6 +1439,10 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _helpers = __webpack_require__(10);
 
+	var _internalWrapHelper = __webpack_require__(43);
+
+	var _internalProtoAccess = __webpack_require__(33);
+
 	function checkRevision(compilerInfo) {
 	  var compilerRevision = compilerInfo && compilerInfo[0] || 1,
 	      currentRevision = _base.COMPILER_REVISION;
@@ -1325,7 +1462,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 	function template(templateSpec, env) {
-
 	  /* istanbul ignore next */
 	  if (!env) {
 	    throw new _exception2['default']('No environment passed to template');
@@ -1352,13 +1488,16 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }
 	    partial = env.VM.resolvePartial.call(this, partial, context, options);
 
-	    var optionsWithHooks = Utils.extend({}, options, { hooks: this.hooks });
+	    var extendedOptions = Utils.extend({}, options, {
+	      hooks: this.hooks,
+	      protoAccessControl: this.protoAccessControl
+	    });
 
-	    var result = env.VM.invokePartial.call(this, partial, context, optionsWithHooks);
+	    var result = env.VM.invokePartial.call(this, partial, context, extendedOptions);
 
 	    if (result == null && env.compile) {
 	      options.partials[options.name] = env.compile(partial, templateSpec.compilerOptions, env);
-	      result = options.partials[options.name](context, optionsWithHooks);
+	      result = options.partials[options.name](context, extendedOptions);
 	    }
 	    if (result != null) {
 	      if (options.indent) {
@@ -1382,14 +1521,31 @@ return /******/ (function(modules) { // webpackBootstrap
 	  var container = {
 	    strict: function strict(obj, name, loc) {
 	      if (!obj || !(name in obj)) {
-	        throw new _exception2['default']('"' + name + '" not defined in ' + obj, { loc: loc });
+	        throw new _exception2['default']('"' + name + '" not defined in ' + obj, {
+	          loc: loc
+	        });
 	      }
 	      return obj[name];
 	    },
+	    lookupProperty: function lookupProperty(parent, propertyName) {
+	      var result = parent[propertyName];
+	      if (result == null) {
+	        return result;
+	      }
+	      if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
+	        return result;
+	      }
+
+	      if (_internalProtoAccess.resultIsAllowed(result, container.protoAccessControl, propertyName)) {
+	        return result;
+	      }
+	      return undefined;
+	    },
 	    lookup: function lookup(depths, name) {
 	      var len = depths.length;
 	      for (var i = 0; i < len; i++) {
-	        if (depths[i] && depths[i][name] != null) {
+	        var result = depths[i] && container.lookupProperty(depths[i], name);
+	        if (result != null) {
 	          return depths[i][name];
 	        }
 	      }
@@ -1425,6 +1581,15 @@ return /******/ (function(modules) { // webpackBootstrap
 	      }
 	      return value;
 	    },
+	    mergeIfNeeded: function mergeIfNeeded(param, common) {
+	      var obj = param || common;
+
+	      if (param && common && param !== common) {
+	        obj = Utils.extend({}, common, param);
+	      }
+
+	      return obj;
+	    },
 	    // An empty object to use as replacement for null-contexts
 	    nullContext: _Object$seal({}),
 
@@ -1454,28 +1619,35 @@ return /******/ (function(modules) { // webpackBootstrap
 	    function main(context /*, options*/) {
 	      return '' + templateSpec.main(container, context, container.helpers, container.partials, data, blockParams, depths);
 	    }
+
 	    main = executeDecorators(templateSpec.main, main, container, options.depths || [], data, blockParams);
 	    return main(context, options);
 	  }
+
 	  ret.isTop = true;
 
 	  ret._setup = function (options) {
 	    if (!options.partial) {
-	      container.helpers = Utils.extend({}, env.helpers, options.helpers);
+	      var mergedHelpers = Utils.extend({}, env.helpers, options.helpers);
+	      wrapHelpersToPassLookupProperty(mergedHelpers, container);
+	      container.helpers = mergedHelpers;
 
 	      if (templateSpec.usePartial) {
-	        container.partials = Utils.extend({}, env.partials, options.partials);
+	        // Use mergeIfNeeded here to prevent compiling global partials multiple times
+	        container.partials = container.mergeIfNeeded(options.partials, env.partials);
 	      }
 	      if (templateSpec.usePartial || templateSpec.useDecorators) {
 	        container.decorators = Utils.extend({}, env.decorators, options.decorators);
 	      }
 
 	      container.hooks = {};
+	      container.protoAccessControl = _internalProtoAccess.createProtoAccessControl(options);
 
 	      var keepHelperInHelpers = options.allowCallsToHelperMissing || templateWasPrecompiledWithCompilerV7;
 	      _helpers.moveHelperToHooks(container, 'helperMissing', keepHelperInHelpers);
 	      _helpers.moveHelperToHooks(container, 'blockHelperMissing', keepHelperInHelpers);
 	    } else {
+	      container.protoAccessControl = options.protoAccessControl; // internal option
 	      container.helpers = options.helpers;
 	      container.partials = options.partials;
 	      container.decorators = options.decorators;
@@ -1596,25 +1768,39 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return prog;
 	}
 
-/***/ }),
-/* 35 */
-/***/ (function(module, exports, __webpack_require__) {
+	function wrapHelpersToPassLookupProperty(mergedHelpers, container) {
+	  _Object$keys(mergedHelpers).forEach(function (helperName) {
+	    var helper = mergedHelpers[helperName];
+	    mergedHelpers[helperName] = passLookupPropertyOption(helper, container);
+	  });
+	}
 
-	module.exports = { "default": __webpack_require__(36), __esModule: true };
+	function passLookupPropertyOption(helper, container) {
+	  var lookupProperty = container.lookupProperty;
+	  return _internalWrapHelper.wrapHelper(helper, function (options) {
+	    return Utils.extend({ lookupProperty: lookupProperty }, options);
+	  });
+	}
 
 /***/ }),
-/* 36 */
+/* 39 */
 /***/ (function(module, exports, __webpack_require__) {
 
-	__webpack_require__(37);
+	module.exports = { "default": __webpack_require__(40), __esModule: true };
+
+/***/ }),
+/* 40 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	__webpack_require__(41);
 	module.exports = __webpack_require__(21).Object.seal;
 
 /***/ }),
-/* 37 */
+/* 41 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	// 19.1.2.17 Object.seal(O)
-	var isObject = __webpack_require__(38);
+	var isObject = __webpack_require__(42);
 
 	__webpack_require__(18)('seal', function($seal){
 	  return function seal(it){
@@ -1623,7 +1809,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	});
 
 /***/ }),
-/* 38 */
+/* 42 */
 /***/ (function(module, exports) {
 
 	module.exports = function(it){
@@ -1631,12 +1817,34 @@ return /******/ (function(modules) { // webpackBootstrap
 	};
 
 /***/ }),
-/* 39 */
+/* 43 */
 /***/ (function(module, exports) {
 
-	/* WEBPACK VAR INJECTION */(function(global) {/* global window */
 	'use strict';
 
+	exports.__esModule = true;
+	exports.wrapHelper = wrapHelper;
+
+	function wrapHelper(helper, transformOptionsFn) {
+	  if (typeof helper !== 'function') {
+	    // This should not happen, but apparently it does in https://github.com/wycats/handlebars.js/issues/1639
+	    // We try to make the wrapper least-invasive by not wrapping it, if the helper is not a function.
+	    return helper;
+	  }
+	  var wrapper = function wrapper() /* dynamic arguments */{
+	    var options = arguments[arguments.length - 1];
+	    arguments[arguments.length - 1] = transformOptionsFn(options);
+	    return helper.apply(this, arguments);
+	  };
+	  return wrapper;
+	}
+
+/***/ }),
+/* 44 */
+/***/ (function(module, exports) {
+
+	/* WEBPACK VAR INJECTION */(function(global) {'use strict';
+
 	exports.__esModule = true;
 
 	exports['default'] = function (Handlebars) {
@@ -1656,7 +1864,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }())))
 
 /***/ }),
-/* 40 */
+/* 45 */
 /***/ (function(module, exports) {
 
 	'use strict';
@@ -1691,7 +1899,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 
 /***/ }),
-/* 41 */
+/* 46 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -1704,15 +1912,15 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.parseWithoutProcessing = parseWithoutProcessing;
 	exports.parse = parse;
 
-	var _parser = __webpack_require__(42);
+	var _parser = __webpack_require__(47);
 
 	var _parser2 = _interopRequireDefault(_parser);
 
-	var _whitespaceControl = __webpack_require__(43);
+	var _whitespaceControl = __webpack_require__(48);
 
 	var _whitespaceControl2 = _interopRequireDefault(_whitespaceControl);
 
-	var _helpers = __webpack_require__(45);
+	var _helpers = __webpack_require__(50);
 
 	var Helpers = _interopRequireWildcard(_helpers);
 
@@ -1749,7 +1957,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 /***/ }),
-/* 42 */
+/* 47 */
 /***/ (function(module, exports) {
 
 	// File ignored in coverage tests via setting in .istanbul.yml
@@ -2490,7 +2698,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports["default"];
 
 /***/ }),
-/* 43 */
+/* 48 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -2499,7 +2707,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	exports.__esModule = true;
 
-	var _visitor = __webpack_require__(44);
+	var _visitor = __webpack_require__(49);
 
 	var _visitor2 = _interopRequireDefault(_visitor);
 
@@ -2714,7 +2922,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 
 /***/ }),
-/* 44 */
+/* 49 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -2857,7 +3065,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 
 /***/ }),
-/* 45 */
+/* 50 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -3088,14 +3296,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 /***/ }),
-/* 46 */
+/* 51 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	/* eslint-disable new-cap */
 
 	'use strict';
 
-	var _Object$create = __webpack_require__(47)['default'];
+	var _Object$create = __webpack_require__(34)['default'];
 
 	var _interopRequireDefault = __webpack_require__(1)['default'];
 
@@ -3110,7 +3318,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _utils = __webpack_require__(5);
 
-	var _ast = __webpack_require__(40);
+	var _ast = __webpack_require__(45);
 
 	var _ast2 = _interopRequireDefault(_ast);
 
@@ -3165,14 +3373,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	    options.blockParams = options.blockParams || [];
 
 	    options.knownHelpers = _utils.extend(_Object$create(null), {
-	      'helperMissing': true,
-	      'blockHelperMissing': true,
-	      'each': true,
+	      helperMissing: true,
+	      blockHelperMissing: true,
+	      each: true,
 	      'if': true,
-	      'unless': true,
+	      unless: true,
 	      'with': true,
-	      'log': true,
-	      'lookup': true
+	      log: true,
+	      lookup: true
 	    }, options.knownHelpers);
 
 	    return this.accept(program);
@@ -3439,7 +3647,11 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	  // HELPERS
 	  opcode: function opcode(name) {
-	    this.opcodes.push({ opcode: name, args: slice.call(arguments, 1), loc: this.sourceNode[0].loc });
+	    this.opcodes.push({
+	      opcode: name,
+	      args: slice.call(arguments, 1),
+	      loc: this.sourceNode[0].loc
+	    });
 	  },
 
 	  addDepth: function addDepth(depth) {
@@ -3655,22 +3867,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 /***/ }),
-/* 47 */
-/***/ (function(module, exports, __webpack_require__) {
-
-	module.exports = { "default": __webpack_require__(48), __esModule: true };
-
-/***/ }),
-/* 48 */
-/***/ (function(module, exports, __webpack_require__) {
-
-	var $ = __webpack_require__(9);
-	module.exports = function create(P, D){
-	  return $.create(P, D);
-	};
-
-/***/ }),
-/* 49 */
+/* 52 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -3689,12 +3886,10 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _utils = __webpack_require__(5);
 
-	var _codeGen = __webpack_require__(50);
+	var _codeGen = __webpack_require__(53);
 
 	var _codeGen2 = _interopRequireDefault(_codeGen);
 
-	var _helpersLookup = __webpack_require__(28);
-
 	function Literal(value) {
 	  this.value = value;
 	}
@@ -3704,20 +3899,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	JavaScriptCompiler.prototype = {
 	  // PUBLIC API: You can override these methods in a subclass to provide
 	  // alternative compiled forms for name lookup and buffering semantics
-	  nameLookup: function nameLookup(parent, name /* , type*/) {
-	    if (_helpersLookup.dangerousPropertyRegex.test(name)) {
-	      var isEnumerable = [this.aliasable('container.propertyIsEnumerable'), '.call(', parent, ',', JSON.stringify(name), ')'];
-	      return ['(', isEnumerable, '?', _actualLookup(), ' : undefined)'];
-	    }
-	    return _actualLookup();
-
-	    function _actualLookup() {
-	      if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
-	        return [parent, '.', name];
-	      } else {
-	        return [parent, '[', JSON.stringify(name), ']'];
-	      }
-	    }
+	  nameLookup: function nameLookup(parent, name /*,  type */) {
+	    return this.internalNameLookup(parent, name);
 	  },
 	  depthedLookup: function depthedLookup(name) {
 	    return [this.aliasable('container.lookup'), '(depths, "', name, '")'];
@@ -3753,6 +3936,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	    return this.quotedString('');
 	  },
 	  // END PUBLIC API
+	  internalNameLookup: function internalNameLookup(parent, name) {
+	    this.lookupPropertyFunctionIsUsed = true;
+	    return ['lookupProperty(', parent, ',', JSON.stringify(name), ')'];
+	  },
+
+	  lookupPropertyFunctionIsUsed: false,
 
 	  compile: function compile(environment, options, context, asObject) {
 	    this.environment = environment;
@@ -3811,7 +4000,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    if (!this.decorators.isEmpty()) {
 	      this.useDecorators = true;
 
-	      this.decorators.prepend('var decorators = container.decorators;\n');
+	      this.decorators.prepend(['var decorators = container.decorators, ', this.lookupPropertyFunctionVarDeclaration(), ';\n']);
 	      this.decorators.push('return fn;');
 
 	      if (asObject) {
@@ -3924,6 +4113,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	      }
 	    });
 
+	    if (this.lookupPropertyFunctionIsUsed) {
+	      varDeclarations += ', ' + this.lookupPropertyFunctionVarDeclaration();
+	    }
+
 	    var params = ['container', 'depth0', 'helpers', 'partials', 'data'];
 
 	    if (this.useBlockParams || this.useDepths) {
@@ -4002,6 +4195,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	    return this.source.merge();
 	  },
 
+	  lookupPropertyFunctionVarDeclaration: function lookupPropertyFunctionVarDeclaration() {
+	    return '\n      lookupProperty = container.lookupProperty || function(parent, propertyName) {\n        if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {\n          return parent[propertyName];\n        }\n        return undefined\n    }\n    '.trim();
+	  },
+
 	  // [blockValue]
 	  //
 	  // On stack, before: hash, inverse, program, value
@@ -4804,6 +5001,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }
 	})();
 
+	/**
+	 * @deprecated May be removed in the next major version
+	 */
 	JavaScriptCompiler.isValidJavaScriptVariableName = function (name) {
 	  return !JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(name);
 	};
@@ -4831,7 +5031,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 
 /***/ }),
-/* 50 */
+/* 53 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	/* global define */
diff --git a/vendor/assets/javascripts/handlebars.runtime.js b/vendor/assets/javascripts/handlebars.runtime.js
index f2255e7830..ac3976acbd 100644
--- a/vendor/assets/javascripts/handlebars.runtime.js
+++ b/vendor/assets/javascripts/handlebars.runtime.js
@@ -1,9 +1,9 @@
 /**!
 
  @license
- handlebars v4.5.3
+ handlebars v4.7.6
 
-Copyright (C) 2011-2017 by Yehuda Katz
+Copyright (C) 2011-2019 by Yehuda Katz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -95,7 +95,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	// Each of these augment the Handlebars object. No need to setup here.
 	// (This is done to easily share code between commonjs and browse envs)
 
-	var _handlebarsSafeString = __webpack_require__(32);
+	var _handlebarsSafeString = __webpack_require__(36);
 
 	var _handlebarsSafeString2 = _interopRequireDefault(_handlebarsSafeString);
 
@@ -107,11 +107,11 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var Utils = _interopRequireWildcard(_handlebarsUtils);
 
-	var _handlebarsRuntime = __webpack_require__(33);
+	var _handlebarsRuntime = __webpack_require__(37);
 
 	var runtime = _interopRequireWildcard(_handlebarsRuntime);
 
-	var _handlebarsNoConflict = __webpack_require__(38);
+	var _handlebarsNoConflict = __webpack_require__(43);
 
 	var _handlebarsNoConflict2 = _interopRequireDefault(_handlebarsNoConflict);
 
@@ -207,7 +207,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _logger2 = _interopRequireDefault(_logger);
 
-	var VERSION = '4.5.3';
+	var _internalProtoAccess = __webpack_require__(32);
+
+	var VERSION = '4.7.6';
 	exports.VERSION = VERSION;
 	var COMPILER_REVISION = 8;
 	exports.COMPILER_REVISION = COMPILER_REVISION;
@@ -283,6 +285,13 @@ return /******/ (function(modules) { // webpackBootstrap
 	  },
 	  unregisterDecorator: function unregisterDecorator(name) {
 	    delete this.decorators[name];
+	  },
+	  /**
+	   * Reset the memory of illegal property accesses that have already been logged.
+	   * @deprecated should only be used in handlebars test-cases
+	   */
+	  resetLoggedPropertyAccesses: function resetLoggedPropertyAccesses() {
+	    _internalProtoAccess.resetLoggedProperties();
 	  }
 	};
 
@@ -306,7 +315,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.createFrame = createFrame;
 	exports.blockParams = blockParams;
 	exports.appendContextPath = appendContextPath;
-
 	var escape = {
 	  '&': '&amp;',
 	  '<': '&lt;',
@@ -430,7 +438,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	var _Object$defineProperty = __webpack_require__(6)['default'];
 
 	exports.__esModule = true;
-
 	var errorProps = ['description', 'fileName', 'lineNumber', 'endLineNumber', 'message', 'name', 'number', 'stack'];
 
 	function Exception(message, node) {
@@ -978,7 +985,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	    if (arguments.length != 2) {
 	      throw new _exception2['default']('#unless requires exactly one argument');
 	    }
-	    return instance.helpers['if'].call(this, conditional, { fn: options.inverse, inverse: options.fn, hash: options.hash });
+	    return instance.helpers['if'].call(this, conditional, {
+	      fn: options.inverse,
+	      inverse: options.fn,
+	      hash: options.hash
+	    });
 	  });
 	};
 
@@ -1021,22 +1032,19 @@ return /******/ (function(modules) { // webpackBootstrap
 	'use strict';
 
 	exports.__esModule = true;
-	var dangerousPropertyRegex = /^(constructor|__defineGetter__|__defineSetter__|__lookupGetter__|__proto__)$/;
-
-	exports.dangerousPropertyRegex = dangerousPropertyRegex;
 
 	exports['default'] = function (instance) {
-	  instance.registerHelper('lookup', function (obj, field) {
+	  instance.registerHelper('lookup', function (obj, field, options) {
 	    if (!obj) {
+	      // Note for 5.0: Change to "obj == null" in 5.0
 	      return obj;
 	    }
-	    if (dangerousPropertyRegex.test(String(field)) && !Object.prototype.propertyIsEnumerable.call(obj, field)) {
-	      return undefined;
-	    }
-	    return obj[field];
+	    return options.lookupProperty(obj, field);
 	  });
 	};
 
+	module.exports = exports['default'];
+
 /***/ }),
 /* 28 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -1169,8 +1177,8 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	    if (typeof console !== 'undefined' && logger.lookupLevel(logger.level) <= level) {
 	      var method = logger.methodMap[level];
+	      // eslint-disable-next-line no-console
 	      if (!console[method]) {
-	        // eslint-disable-line no-console
 	        method = 'log';
 	      }
 
@@ -1188,6 +1196,129 @@ return /******/ (function(modules) { // webpackBootstrap
 
 /***/ }),
 /* 32 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _Object$create = __webpack_require__(33)['default'];
+
+	var _Object$keys = __webpack_require__(12)['default'];
+
+	var _interopRequireWildcard = __webpack_require__(1)['default'];
+
+	exports.__esModule = true;
+	exports.createProtoAccessControl = createProtoAccessControl;
+	exports.resultIsAllowed = resultIsAllowed;
+	exports.resetLoggedProperties = resetLoggedProperties;
+
+	var _createNewLookupObject = __webpack_require__(35);
+
+	var _logger = __webpack_require__(31);
+
+	var logger = _interopRequireWildcard(_logger);
+
+	var loggedProperties = _Object$create(null);
+
+	function createProtoAccessControl(runtimeOptions) {
+	  var defaultMethodWhiteList = _Object$create(null);
+	  defaultMethodWhiteList['constructor'] = false;
+	  defaultMethodWhiteList['__defineGetter__'] = false;
+	  defaultMethodWhiteList['__defineSetter__'] = false;
+	  defaultMethodWhiteList['__lookupGetter__'] = false;
+
+	  var defaultPropertyWhiteList = _Object$create(null);
+	  // eslint-disable-next-line no-proto
+	  defaultPropertyWhiteList['__proto__'] = false;
+
+	  return {
+	    properties: {
+	      whitelist: _createNewLookupObject.createNewLookupObject(defaultPropertyWhiteList, runtimeOptions.allowedProtoProperties),
+	      defaultValue: runtimeOptions.allowProtoPropertiesByDefault
+	    },
+	    methods: {
+	      whitelist: _createNewLookupObject.createNewLookupObject(defaultMethodWhiteList, runtimeOptions.allowedProtoMethods),
+	      defaultValue: runtimeOptions.allowProtoMethodsByDefault
+	    }
+	  };
+	}
+
+	function resultIsAllowed(result, protoAccessControl, propertyName) {
+	  if (typeof result === 'function') {
+	    return checkWhiteList(protoAccessControl.methods, propertyName);
+	  } else {
+	    return checkWhiteList(protoAccessControl.properties, propertyName);
+	  }
+	}
+
+	function checkWhiteList(protoAccessControlForType, propertyName) {
+	  if (protoAccessControlForType.whitelist[propertyName] !== undefined) {
+	    return protoAccessControlForType.whitelist[propertyName] === true;
+	  }
+	  if (protoAccessControlForType.defaultValue !== undefined) {
+	    return protoAccessControlForType.defaultValue;
+	  }
+	  logUnexpecedPropertyAccessOnce(propertyName);
+	  return false;
+	}
+
+	function logUnexpecedPropertyAccessOnce(propertyName) {
+	  if (loggedProperties[propertyName] !== true) {
+	    loggedProperties[propertyName] = true;
+	    logger.log('error', 'Handlebars: Access has been denied to resolve the property "' + propertyName + '" because it is not an "own property" of its parent.\n' + 'You can add a runtime option to disable the check or this warning:\n' + 'See https://handlebarsjs.com/api-reference/runtime-options.html#options-to-control-prototype-access for details');
+	  }
+	}
+
+	function resetLoggedProperties() {
+	  _Object$keys(loggedProperties).forEach(function (propertyName) {
+	    delete loggedProperties[propertyName];
+	  });
+	}
+
+/***/ }),
+/* 33 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	module.exports = { "default": __webpack_require__(34), __esModule: true };
+
+/***/ }),
+/* 34 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	var $ = __webpack_require__(8);
+	module.exports = function create(P, D){
+	  return $.create(P, D);
+	};
+
+/***/ }),
+/* 35 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _Object$create = __webpack_require__(33)['default'];
+
+	exports.__esModule = true;
+	exports.createNewLookupObject = createNewLookupObject;
+
+	var _utils = __webpack_require__(4);
+
+	/**
+	 * Create a new object with "null"-prototype to avoid truthy results on prototype properties.
+	 * The resulting object can be used with "object[property]" to check if a property exists
+	 * @param {...object} sources a varargs parameter of source objects that will be merged
+	 * @returns {object}
+	 */
+
+	function createNewLookupObject() {
+	  for (var _len = arguments.length, sources = Array(_len), _key = 0; _key < _len; _key++) {
+	    sources[_key] = arguments[_key];
+	  }
+
+	  return _utils.extend.apply(undefined, [_Object$create(null)].concat(sources));
+	}
+
+/***/ }),
+/* 36 */
 /***/ (function(module, exports) {
 
 	// Build out our basic SafeString type
@@ -1206,12 +1337,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 
 /***/ }),
-/* 33 */
+/* 37 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var _Object$seal = __webpack_require__(34)['default'];
+	var _Object$seal = __webpack_require__(38)['default'];
+
+	var _Object$keys = __webpack_require__(12)['default'];
 
 	var _interopRequireWildcard = __webpack_require__(1)['default'];
 
@@ -1237,6 +1370,10 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _helpers = __webpack_require__(9);
 
+	var _internalWrapHelper = __webpack_require__(42);
+
+	var _internalProtoAccess = __webpack_require__(32);
+
 	function checkRevision(compilerInfo) {
 	  var compilerRevision = compilerInfo && compilerInfo[0] || 1,
 	      currentRevision = _base.COMPILER_REVISION;
@@ -1256,7 +1393,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 	function template(templateSpec, env) {
-
 	  /* istanbul ignore next */
 	  if (!env) {
 	    throw new _exception2['default']('No environment passed to template');
@@ -1283,13 +1419,16 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }
 	    partial = env.VM.resolvePartial.call(this, partial, context, options);
 
-	    var optionsWithHooks = Utils.extend({}, options, { hooks: this.hooks });
+	    var extendedOptions = Utils.extend({}, options, {
+	      hooks: this.hooks,
+	      protoAccessControl: this.protoAccessControl
+	    });
 
-	    var result = env.VM.invokePartial.call(this, partial, context, optionsWithHooks);
+	    var result = env.VM.invokePartial.call(this, partial, context, extendedOptions);
 
 	    if (result == null && env.compile) {
 	      options.partials[options.name] = env.compile(partial, templateSpec.compilerOptions, env);
-	      result = options.partials[options.name](context, optionsWithHooks);
+	      result = options.partials[options.name](context, extendedOptions);
 	    }
 	    if (result != null) {
 	      if (options.indent) {
@@ -1313,14 +1452,31 @@ return /******/ (function(modules) { // webpackBootstrap
 	  var container = {
 	    strict: function strict(obj, name, loc) {
 	      if (!obj || !(name in obj)) {
-	        throw new _exception2['default']('"' + name + '" not defined in ' + obj, { loc: loc });
+	        throw new _exception2['default']('"' + name + '" not defined in ' + obj, {
+	          loc: loc
+	        });
 	      }
 	      return obj[name];
 	    },
+	    lookupProperty: function lookupProperty(parent, propertyName) {
+	      var result = parent[propertyName];
+	      if (result == null) {
+	        return result;
+	      }
+	      if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
+	        return result;
+	      }
+
+	      if (_internalProtoAccess.resultIsAllowed(result, container.protoAccessControl, propertyName)) {
+	        return result;
+	      }
+	      return undefined;
+	    },
 	    lookup: function lookup(depths, name) {
 	      var len = depths.length;
 	      for (var i = 0; i < len; i++) {
-	        if (depths[i] && depths[i][name] != null) {
+	        var result = depths[i] && container.lookupProperty(depths[i], name);
+	        if (result != null) {
 	          return depths[i][name];
 	        }
 	      }
@@ -1356,6 +1512,15 @@ return /******/ (function(modules) { // webpackBootstrap
 	      }
 	      return value;
 	    },
+	    mergeIfNeeded: function mergeIfNeeded(param, common) {
+	      var obj = param || common;
+
+	      if (param && common && param !== common) {
+	        obj = Utils.extend({}, common, param);
+	      }
+
+	      return obj;
+	    },
 	    // An empty object to use as replacement for null-contexts
 	    nullContext: _Object$seal({}),
 
@@ -1385,28 +1550,35 @@ return /******/ (function(modules) { // webpackBootstrap
 	    function main(context /*, options*/) {
 	      return '' + templateSpec.main(container, context, container.helpers, container.partials, data, blockParams, depths);
 	    }
+
 	    main = executeDecorators(templateSpec.main, main, container, options.depths || [], data, blockParams);
 	    return main(context, options);
 	  }
+
 	  ret.isTop = true;
 
 	  ret._setup = function (options) {
 	    if (!options.partial) {
-	      container.helpers = Utils.extend({}, env.helpers, options.helpers);
+	      var mergedHelpers = Utils.extend({}, env.helpers, options.helpers);
+	      wrapHelpersToPassLookupProperty(mergedHelpers, container);
+	      container.helpers = mergedHelpers;
 
 	      if (templateSpec.usePartial) {
-	        container.partials = Utils.extend({}, env.partials, options.partials);
+	        // Use mergeIfNeeded here to prevent compiling global partials multiple times
+	        container.partials = container.mergeIfNeeded(options.partials, env.partials);
 	      }
 	      if (templateSpec.usePartial || templateSpec.useDecorators) {
 	        container.decorators = Utils.extend({}, env.decorators, options.decorators);
 	      }
 
 	      container.hooks = {};
+	      container.protoAccessControl = _internalProtoAccess.createProtoAccessControl(options);
 
 	      var keepHelperInHelpers = options.allowCallsToHelperMissing || templateWasPrecompiledWithCompilerV7;
 	      _helpers.moveHelperToHooks(container, 'helperMissing', keepHelperInHelpers);
 	      _helpers.moveHelperToHooks(container, 'blockHelperMissing', keepHelperInHelpers);
 	    } else {
+	      container.protoAccessControl = options.protoAccessControl; // internal option
 	      container.helpers = options.helpers;
 	      container.partials = options.partials;
 	      container.decorators = options.decorators;
@@ -1527,25 +1699,39 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return prog;
 	}
 
-/***/ }),
-/* 34 */
-/***/ (function(module, exports, __webpack_require__) {
+	function wrapHelpersToPassLookupProperty(mergedHelpers, container) {
+	  _Object$keys(mergedHelpers).forEach(function (helperName) {
+	    var helper = mergedHelpers[helperName];
+	    mergedHelpers[helperName] = passLookupPropertyOption(helper, container);
+	  });
+	}
 
-	module.exports = { "default": __webpack_require__(35), __esModule: true };
+	function passLookupPropertyOption(helper, container) {
+	  var lookupProperty = container.lookupProperty;
+	  return _internalWrapHelper.wrapHelper(helper, function (options) {
+	    return Utils.extend({ lookupProperty: lookupProperty }, options);
+	  });
+	}
 
 /***/ }),
-/* 35 */
+/* 38 */
 /***/ (function(module, exports, __webpack_require__) {
 
-	__webpack_require__(36);
+	module.exports = { "default": __webpack_require__(39), __esModule: true };
+
+/***/ }),
+/* 39 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	__webpack_require__(40);
 	module.exports = __webpack_require__(20).Object.seal;
 
 /***/ }),
-/* 36 */
+/* 40 */
 /***/ (function(module, exports, __webpack_require__) {
 
 	// 19.1.2.17 Object.seal(O)
-	var isObject = __webpack_require__(37);
+	var isObject = __webpack_require__(41);
 
 	__webpack_require__(17)('seal', function($seal){
 	  return function seal(it){
@@ -1554,7 +1740,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	});
 
 /***/ }),
-/* 37 */
+/* 41 */
 /***/ (function(module, exports) {
 
 	module.exports = function(it){
@@ -1562,12 +1748,34 @@ return /******/ (function(modules) { // webpackBootstrap
 	};
 
 /***/ }),
-/* 38 */
+/* 42 */
 /***/ (function(module, exports) {
 
-	/* WEBPACK VAR INJECTION */(function(global) {/* global window */
 	'use strict';
 
+	exports.__esModule = true;
+	exports.wrapHelper = wrapHelper;
+
+	function wrapHelper(helper, transformOptionsFn) {
+	  if (typeof helper !== 'function') {
+	    // This should not happen, but apparently it does in https://github.com/wycats/handlebars.js/issues/1639
+	    // We try to make the wrapper least-invasive by not wrapping it, if the helper is not a function.
+	    return helper;
+	  }
+	  var wrapper = function wrapper() /* dynamic arguments */{
+	    var options = arguments[arguments.length - 1];
+	    arguments[arguments.length - 1] = transformOptionsFn(options);
+	    return helper.apply(this, arguments);
+	  };
+	  return wrapper;
+	}
+
+/***/ }),
+/* 43 */
+/***/ (function(module, exports) {
+
+	/* WEBPACK VAR INJECTION */(function(global) {'use strict';
+
 	exports.__esModule = true;
 
 	exports['default'] = function (Handlebars) {
diff --git a/yarn.lock b/yarn.lock
index 94d8af25c3..7bb2c64415 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1279,17 +1279,6 @@ graceful-fs@^4.1.2:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
   integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
 
-handlebars@^4.3.0:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
-  integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
-  dependencies:
-    neo-async "^2.6.0"
-    optimist "^0.6.1"
-    source-map "^0.6.1"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
 handlebars@^4.5.1:
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.3.tgz#8ece2797826886cf8082d1726ff21d2a022550ee"
@@ -1301,6 +1290,18 @@ handlebars@^4.5.1:
   optionalDependencies:
     uglify-js "^3.1.4"
 
+handlebars@^4.7.0:
+  version "4.7.6"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
+  integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
+  dependencies:
+    minimist "^1.2.5"
+    neo-async "^2.6.0"
+    source-map "^0.6.1"
+    wordwrap "^1.0.0"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -1873,6 +1874,11 @@ minimist@^1.1.1, minimist@^1.2.0:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
+minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
@@ -2816,16 +2822,16 @@ wordwrap@0.0.2:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
   integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
 
+wordwrap@^1.0.0, wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
   integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
-wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
-
 workbox-core@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-4.3.1.tgz#005d2c6a06a171437afd6ca2904a5727ecd73be6"

From 4f42bb1fd2519463d977c33155ef6f03a2bcd243 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 7 Apr 2020 11:41:21 -0400
Subject: [PATCH 0536/1830] DEV: Support for `onChange` on `{{text-field}}`
 (#9362)

* DEV: Support for `onChange` on `{{text-field}}`

This will automatically be debounced and only fired when the value
changes.

There is also `onChangeImmediate` which is not debounced in case you
need that, but in almost all cases when observing text in an element you
should debounce.

* Add cancel for timer
---
 .../discourse/components/text-field.js        | 33 +++++++++++++++
 .../javascripts/components/text-field-test.js | 40 +++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/app/assets/javascripts/discourse/components/text-field.js b/app/assets/javascripts/discourse/components/text-field.js
index 23440b291d..bb57f25309 100644
--- a/app/assets/javascripts/discourse/components/text-field.js
+++ b/app/assets/javascripts/discourse/components/text-field.js
@@ -1,8 +1,14 @@
 import { TextField } from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import { siteDir, isRTL, isLTR } from "discourse/lib/text-direction";
+import { next, debounce, cancel } from "@ember/runloop";
+
+const DEBOUNCE_MS = 500;
 
 export default TextField.extend({
+  _prevValue: null,
+  _timer: null,
+
   attributeBindings: [
     "autocorrect",
     "autocapitalize",
@@ -11,6 +17,28 @@ export default TextField.extend({
     "dir"
   ],
 
+  didReceiveAttrs() {
+    this._super(...arguments);
+    this._prevValue = this.value;
+  },
+
+  didUpdateAttrs() {
+    this._super(...arguments);
+    if (this._prevValue !== this.value) {
+      if (this.onChangeImmediate) {
+        next(() => this.onChangeImmediate(this.value));
+      }
+      if (this.onChange) {
+        cancel(this._timer);
+        this._timer = debounce(this, this._debouncedChange, DEBOUNCE_MS);
+      }
+    }
+  },
+
+  _debouncedChange() {
+    next(() => this.onChange(this.value));
+  },
+
   @discourseComputed
   dir() {
     if (this.siteSettings.support_mixed_text_direction) {
@@ -23,6 +51,11 @@ export default TextField.extend({
     }
   },
 
+  willDestroyElement() {
+    this._super(...arguments);
+    cancel(this._timer);
+  },
+
   keyUp(event) {
     this._super(event);
 
diff --git a/test/javascripts/components/text-field-test.js b/test/javascripts/components/text-field-test.js
index dae51393b1..7b26dddb10 100644
--- a/test/javascripts/components/text-field-test.js
+++ b/test/javascripts/components/text-field-test.js
@@ -44,3 +44,43 @@ componentTest("sets the dir attribute to ltr for English text", {
     assert.equal(find("input").attr("dir"), "ltr");
   }
 });
+
+componentTest("supports onChange", {
+  template: `{{text-field class="tf-test" value=value onChange=changed}}`,
+  beforeEach() {
+    this.called = false;
+    this.newValue = null;
+    this.set("value", "hello");
+    this.set("changed", v => {
+      this.newValue = v;
+      this.called = true;
+    });
+  },
+  async test(assert) {
+    await fillIn(".tf-test", "hello");
+    assert.ok(!this.called);
+    await fillIn(".tf-test", "new text");
+    assert.ok(this.called);
+    assert.equal(this.newValue, "new text");
+  }
+});
+
+componentTest("supports onChangeImmediate", {
+  template: `{{text-field class="tf-test" value=value onChangeImmediate=changed}}`,
+  beforeEach() {
+    this.called = false;
+    this.newValue = null;
+    this.set("value", "old");
+    this.set("changed", v => {
+      this.newValue = v;
+      this.called = true;
+    });
+  },
+  async test(assert) {
+    await fillIn(".tf-test", "old");
+    assert.ok(!this.called);
+    await fillIn(".tf-test", "no longer old");
+    assert.ok(this.called);
+    assert.equal(this.newValue, "no longer old");
+  }
+});

From e8fad7a69eee1149bb0a6201b2ccdfe73d8b86c9 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Tue, 7 Apr 2020 11:58:49 -0400
Subject: [PATCH 0537/1830] DEV: changes so plugins can customize invites UI
 (#9365)

* DEV: changes so plugins can customize invites UI

Co-Authored-By: Robin Ward <robin.ward@gmail.com>
---
 .../discourse/controllers/share-and-invite.js |  4 ++++
 app/controllers/users_controller.rb           |  8 +++++--
 app/serializers/invited_serializer.rb         | 22 +++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/controllers/share-and-invite.js
 create mode 100644 app/serializers/invited_serializer.rb

diff --git a/app/assets/javascripts/discourse/controllers/share-and-invite.js b/app/assets/javascripts/discourse/controllers/share-and-invite.js
new file mode 100644
index 0000000000..06110e0113
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/share-and-invite.js
@@ -0,0 +1,4 @@
+import Controller from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+
+export default Controller.extend(ModalFunctionality);
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 81eeddab05..b3acc1f74c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -317,8 +317,12 @@ class UsersController < ApplicationController
       filter_sql = '(LOWER(invites.email) LIKE :filter) or (LOWER(users.username) LIKE :filter)' if show_emails
       invites = invites.where(filter_sql, filter: "%#{params[:search].downcase}%")
     end
-    render_json_dump invites: serialize_data(invites.to_a, InviteSerializer, show_emails: show_emails),
-                     can_see_invite_details: guardian.can_see_invite_details?(inviter)
+
+    render json: MultiJson.dump(InvitedSerializer.new(
+      OpenStruct.new(invite_list: invites.to_a, show_emails: show_emails, inviter: inviter),
+      scope: guardian,
+      root: false
+    ))
   end
 
   def invited_count
diff --git a/app/serializers/invited_serializer.rb b/app/serializers/invited_serializer.rb
new file mode 100644
index 0000000000..c0b07faa86
--- /dev/null
+++ b/app/serializers/invited_serializer.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class InvitedSerializer < ApplicationSerializer
+  attributes :invites, :can_see_invite_details
+
+  def invites
+    ActiveModel::ArraySerializer.new(
+      object.invite_list,
+      scope: scope,
+      root: false,
+      show_emails: object.show_emails
+    ).as_json
+  end
+
+  def can_see_invite_details
+    scope.can_see_invite_details?(object.inviter)
+  end
+
+  def read_attribute_for_serialization(attr)
+    object.respond_to?(attr) ? object.public_send(attr) : public_send(attr)
+  end
+end

From ce663d67e1e659519e484633eb36295a5929a240 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 7 Apr 2020 14:05:27 -0400
Subject: [PATCH 0538/1830] FIX: CSV Exports were throwing errors with invalid
 dates

This fix will consider any invalid dates to be non-existant.
---
 app/jobs/regular/export_csv_file.rb | 10 ++++++++--
 spec/jobs/export_csv_file_spec.rb   |  8 ++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index 39f9c565b1..6092fb1a65 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -182,8 +182,14 @@ module Jobs
     def report_export
       return enum_for(:report_export) unless block_given?
 
-      @extra[:start_date] = @extra[:start_date].to_date.beginning_of_day if @extra[:start_date].is_a?(String)
-      @extra[:end_date] = @extra[:end_date].to_date.end_of_day if @extra[:end_date].is_a?(String)
+      # If dates are invalid consider then `nil`
+      if @extra[:start_date].is_a?(String)
+        @extra[:start_date] = @extra[:start_date].to_date.beginning_of_day rescue nil
+      end
+      if @extra[:end_date].is_a?(String)
+        @extra[:end_date] = @extra[:end_date].to_date.end_of_day rescue nil
+      end
+
       @extra[:filters] = {}
       if @extra[:category_id].present?
         @extra[:filters][:category] = @extra[:category_id].to_i
diff --git a/spec/jobs/export_csv_file_spec.rb b/spec/jobs/export_csv_file_spec.rb
index 62ffb151ba..8322265a72 100644
--- a/spec/jobs/export_csv_file_spec.rb
+++ b/spec/jobs/export_csv_file_spec.rb
@@ -85,6 +85,14 @@ describe Jobs::ExportCsvFile do
       exporter
     end
 
+    it "does not throw an error when the dates are invalid" do
+      Jobs::ExportCsvFile.new.execute(
+        entity: 'report',
+        user_id: user.id,
+        args: { start_date: 'asdfasdf', end_date: 'not-a-date', name: 'dau_by_mau' }
+      )
+    end
+
     it 'works with single-column reports' do
       user.user_visits.create!(visited_at: '2010-01-01', posts_read: 42)
       Fabricate(:user).user_visits.create!(visited_at: '2010-01-03', posts_read: 420)

From 3f49b13e5fd146a04290f0dff7e476407752dd39 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Tue, 7 Apr 2020 13:46:40 -0500
Subject: [PATCH 0539/1830] FIX: Fix untitled/long links extending out box

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

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 1f4e99171c..f4d20080d1 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -365,6 +365,7 @@ blockquote {
   td {
     vertical-align: top;
     padding: 1px;
+    word-wrap: anywhere;
   }
 
   .topic-links {

From 3053c6d95ef3a4f39ec604c408a07accd634e070 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Tue, 7 Apr 2020 16:58:21 -0300
Subject: [PATCH 0540/1830] FEATURE: Enable offline browsing and fullscreen PWA
 in iOS by default

---
 config/site_settings.yml                  |  2 +-
 spec/requests/metadata_controller_spec.rb | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index 018d7390cc..ea69ebe702 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1975,7 +1975,7 @@ uncategorized:
     hidden: true
 
   pwa_display_browser_regex:
-    default: "iPad|iPhone"
+    default: "a^"
     hidden: true
 
   app_association_android:
diff --git a/spec/requests/metadata_controller_spec.rb b/spec/requests/metadata_controller_spec.rb
index 3089bc3163..4e00f5a1c6 100644
--- a/spec/requests/metadata_controller_spec.rb
+++ b/spec/requests/metadata_controller_spec.rb
@@ -55,20 +55,20 @@ RSpec.describe MetadataController do
       expect(manifest["display"]).to eq("standalone")
     end
 
-    it 'defaults to display browser for iPhone' do
-      get "/manifest.webmanifest", params: {}, headers: { 'USER-AGENT' => 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1' }
-      manifest = JSON.parse(response.body)
-      expect(manifest["display"]).to eq("browser")
-    end
-
-    it 'can be changed to display standalone for iPhones using a site setting' do
-      SiteSetting.pwa_display_browser_regex = "a^" # this never matches
-
+    it 'defaults to display standalone for iPhone' do
       get "/manifest.webmanifest", params: {}, headers: { 'USER-AGENT' => 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1' }
       manifest = JSON.parse(response.body)
       expect(manifest["display"]).to eq("standalone")
     end
 
+    it 'can be changed to display browser for iPhones using a site setting' do
+      SiteSetting.pwa_display_browser_regex = "iPhone"
+
+      get "/manifest.webmanifest", params: {}, headers: { 'USER-AGENT' => 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1' }
+      manifest = JSON.parse(response.body)
+      expect(manifest["display"]).to eq("browser")
+    end
+
     it 'uses the short_title if it is set' do
       title = 'FooBarBaz Forum'
       SiteSetting.title = title

From a81197602304f209c75c83d03efccc476f64eefc Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 8 Apr 2020 07:35:42 +1000
Subject: [PATCH 0541/1830] FIX: reset gravatar cache by adding random param to
 URL (#9370)

Users noticed that sometimes, avatar from Gravatar is not correctly updated - https://meta.discourse.org/t/updated-image-on-gravatar-not-seeing-it-update-on-site/54357

A potential reason for that is that even if you update your avatar in Gravatar, URL stays the same and if the cache is involved, service is still receiving the old photo.

For example. In my case, when I click the button to refresh avatar the
new Upload record is created with `origin` URL to new avatar, and `url` to
old one

I made some tests in the rails console and adding random param to Gravatar URL is deceiving cache and correct, the newest avatar is downloaded
---
 app/models/user_avatar.rb       | 2 +-
 spec/models/user_avatar_spec.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index c3df573c32..f6dbf13312 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -20,7 +20,7 @@ class UserAvatar < ActiveRecord::Base
         return if user.blank? || user.primary_email.blank?
 
         email_hash = user_id == Discourse::SYSTEM_USER_ID ? User.email_hash("info@discourse.org") : user.email_hash
-        gravatar_url = "https://#{SiteSetting.gravatar_base_url}/avatar/#{email_hash}.png?s=#{max}&d=404"
+        gravatar_url = "https://#{SiteSetting.gravatar_base_url}/avatar/#{email_hash}.png?s=#{max}&d=404&reset_cache=#{SecureRandom.urlsafe_base64(5)}"
 
         # follow redirects in case gravatar change rules on us
         tempfile = FileHelper.download(
diff --git a/spec/models/user_avatar_spec.rb b/spec/models/user_avatar_spec.rb
index b4e6a5468b..c2434f1d09 100644
--- a/spec/models/user_avatar_spec.rb
+++ b/spec/models/user_avatar_spec.rb
@@ -99,10 +99,10 @@ describe UserAvatar do
     describe "404 should be silent, nothing to do really" do
 
       it "does nothing when avatar is 404" do
-
+        SecureRandom.stubs(:urlsafe_base64).returns("5555")
         freeze_time Time.now
 
-        stub_request(:get, "https://www.gravatar.com/avatar/#{avatar.user.email_hash}.png?d=404&s=360").
+        stub_request(:get, "https://www.gravatar.com/avatar/#{avatar.user.email_hash}.png?d=404&reset_cache=5555&s=360").
           to_return(status: 404, body: "", headers: {})
 
         expect do

From c45574c9e72ad0235bbdd0cada5933df8c9f306d Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Tue, 7 Apr 2020 17:32:18 -0400
Subject: [PATCH 0542/1830] FIX: exclude private messages from TL3 requirements

It wasn't intended that people should be able to earn trust level
3 without participating in public topics. When counting topic
views and likes given/received, don't count private topics.
---
 app/models/topic_view_item.rb                 |  1 +
 app/models/trust_level3_requirements.rb       | 24 ++++-
 spec/models/trust_level3_requirements_spec.rb | 98 ++++++++++++++++---
 3 files changed, 105 insertions(+), 18 deletions(-)

diff --git a/app/models/topic_view_item.rb b/app/models/topic_view_item.rb
index ff8ff957c2..d37e8ec7a6 100644
--- a/app/models/topic_view_item.rb
+++ b/app/models/topic_view_item.rb
@@ -6,6 +6,7 @@ require 'ipaddr'
 class TopicViewItem < ActiveRecord::Base
   self.table_name = 'topic_views'
   belongs_to :user
+  belongs_to :topic
   validates_presence_of :topic_id, :ip_address, :viewed_at
 
   def self.add(topic_id, ip, user_id = nil, at = nil, skip_redis = false)
diff --git a/app/models/trust_level3_requirements.rb b/app/models/trust_level3_requirements.rb
index d40283dbf8..b01da6c10e 100644
--- a/app/models/trust_level3_requirements.rb
+++ b/app/models/trust_level3_requirements.rb
@@ -142,7 +142,11 @@ class TrustLevel3Requirements
   end
 
   def num_topics_replied_to
-    @user.posts.select('distinct topic_id').where('created_at > ? AND post_number > 1', time_period.days.ago).count
+    @user.posts
+      .public_posts
+      .where("posts.created_at > ? AND posts.post_number > 1", time_period.days.ago)
+      .select("distinct topic_id")
+      .count
   end
 
   def min_topics_replied_to
@@ -150,7 +154,10 @@ class TrustLevel3Requirements
   end
 
   def topics_viewed_query
-    TopicViewItem.where(user_id: @user.id).select('topic_id')
+    TopicViewItem.where(user_id: @user.id)
+      .joins(:topic)
+      .where("topics.archetype <> ?", Archetype.private_message)
+      .select("topic_id")
   end
 
   def topics_viewed
@@ -218,7 +225,11 @@ class TrustLevel3Requirements
   end
 
   def num_likes_given
-    UserAction.where(user_id: @user.id, action_type: UserAction::LIKE).where('created_at > ?', time_period.days.ago).count
+    UserAction.where(user_id: @user.id, action_type: UserAction::LIKE)
+      .where("user_actions.created_at > ?", time_period.days.ago)
+      .joins(:target_topic)
+      .where("topics.archetype <> ?", Archetype.private_message)
+      .count
   end
 
   def min_likes_given
@@ -226,7 +237,10 @@ class TrustLevel3Requirements
   end
 
   def num_likes_received_query
-    UserAction.where(user_id: @user.id, action_type: UserAction::WAS_LIKED).where('created_at > ?', time_period.days.ago)
+    UserAction.where(user_id: @user.id, action_type: UserAction::WAS_LIKED)
+      .where("user_actions.created_at > ?", time_period.days.ago)
+      .joins(:target_topic)
+      .where("topics.archetype <> ?", Archetype.private_message)
   end
 
   def num_likes_received
@@ -239,7 +253,7 @@ class TrustLevel3Requirements
 
   def num_likes_received_days
     # don't do a COUNT(DISTINCT date(created_at)) here!
-    num_likes_received_query.pluck('date(created_at)').uniq.size
+    num_likes_received_query.pluck('date(user_actions.created_at)').uniq.size
   end
 
   def min_likes_received_days
diff --git a/spec/models/trust_level3_requirements_spec.rb b/spec/models/trust_level3_requirements_spec.rb
index ede04a1c7b..ef36c18728 100644
--- a/spec/models/trust_level3_requirements_spec.rb
+++ b/spec/models/trust_level3_requirements_spec.rb
@@ -13,6 +13,7 @@ describe TrustLevel3Requirements do
   end
 
   def make_view(id, at, user_id)
+    Fabricate(:topic, id: id) unless Topic.where(id: id).exists?
     TopicViewItem.add(id, '11.22.33.44', user_id, at, _skip_redis = true)
   end
 
@@ -250,6 +251,20 @@ describe TrustLevel3Requirements do
 
       expect(tl3_requirements.num_topics_replied_to).to eq(1)
     end
+
+    it "excludes private messages" do
+      user.save!
+
+      private_topic = create_post(
+        user: moderator,
+        archetype: Archetype.private_message,
+        target_usernames: [user.username, moderator.username]
+      ).topic
+
+      _reply1 = create_post(topic: private_topic, user: user)
+
+      expect(tl3_requirements.num_topics_replied_to).to eq(0)
+    end
   end
 
   describe "topics_viewed" do
@@ -272,6 +287,19 @@ describe TrustLevel3Requirements do
       make_view(4, 201.days.ago, user.id) # too long ago
       expect(tl3_requirements.topics_viewed).to eq(3)
     end
+
+    it "excludes private messages" do
+      user.save
+      private_topic = create_post(
+        user: moderator,
+        archetype: Archetype.private_message,
+        target_usernames: [user.username, moderator.username]
+      ).topic
+
+      make_view(9, 1.day.ago, user.id)
+      make_view(private_topic.id, 1.day.ago, user.id)
+      expect(tl3_requirements.topics_viewed).to eq(1)
+    end
   end
 
   describe "posts_read" do
@@ -293,6 +321,22 @@ describe TrustLevel3Requirements do
       make_view(8,  101.days.ago, user.id)
       expect(tl3_requirements.topics_viewed_all_time).to eq(3)
     end
+
+    it "excludes private messages" do
+      user.save
+      private_topic = create_post(
+        user: moderator,
+        archetype: Archetype.private_message,
+        target_usernames: [user.username, moderator.username]
+      ).topic
+
+      make_view(10, 1.day.ago,    user.id)
+      make_view(9,  100.days.ago, user.id)
+      make_view(8,  101.days.ago, user.id)
+      make_view(private_topic.id, 1.day.ago, user.id)
+      make_view(private_topic.id, 100.days.ago, user.id)
+      expect(tl3_requirements.topics_viewed_all_time).to eq(3)
+    end
   end
 
   describe "posts_read_all_time" do
@@ -336,37 +380,65 @@ describe TrustLevel3Requirements do
   end
 
   describe "num_likes_given" do
-    it "counts likes given in the last 100 days" do
+    before do
       UserActionManager.enable
-
-      recent_post1 = create_post(created_at: 1.hour.ago)
-      recent_post2 = create_post(created_at: 10.days.ago)
-      old_post     = create_post(created_at: 102.days.ago)
-
       user.save
+    end
+
+    let(:recent_post1) { create_post(created_at: 1.hour.ago) }
+    let(:recent_post2) { create_post(created_at: 10.days.ago) }
+    let(:old_post) { create_post(created_at: 102.days.ago) }
+    let(:private_post) do
+      create_post(
+        user: moderator,
+        archetype: Archetype.private_message,
+        target_usernames: [user.username, moderator.username]
+      )
+    end
+
+    it "counts likes given in the last 100 days" do
       like_at(user, recent_post1, 2.hours.ago)
       like_at(user, recent_post2, 5.days.ago)
       like_at(user, old_post, 101.days.ago)
 
       expect(tl3_requirements.num_likes_given).to eq(2)
     end
+
+    it "excludes private messages" do
+      like_at(user, recent_post1, 2.hours.ago)
+      like_at(user, private_post, 2.hours.ago)
+
+      expect(tl3_requirements.num_likes_given).to eq(1)
+    end
   end
 
   describe "num_likes_received" do
-    it "counts likes received in the last 100 days" do
+    before do
       UserActionManager.enable
+    end
 
-      t = Fabricate(:topic, user: user, created_at: 102.days.ago)
-      old_post = create_post(topic: t, user: user, created_at: 102.days.ago)
-      recent_post2 = create_post(topic: t, user: user, created_at: 10.days.ago)
-      recent_post1 = create_post(topic: t, user: user, created_at: 1.hour.ago)
+    let(:topic) { Fabricate(:topic, user: user, created_at: 102.days.ago) }
+    let(:old_post) { create_post(topic: topic, user: user, created_at: 102.days.ago) }
+    let(:recent_post1) { create_post(topic: topic, user: user, created_at: 1.hour.ago) }
+    let(:recent_post2) { create_post(topic: topic, user: user, created_at: 10.days.ago) }
+    let(:private_post) do
+      create_post(
+        user: user,
+        archetype: Archetype.private_message,
+        target_usernames: [liker.username, liker2.username]
+      )
+    end
 
-      liker = Fabricate(:user)
-      liker2 = Fabricate(:user)
+    let(:liker) { Fabricate(:user) }
+    let(:liker2) { Fabricate(:user) }
+
+    it "counts likes received in the last 100 days" do
       like_at(liker, recent_post1, 2.hours.ago)
       like_at(liker2, recent_post1, 2.hours.ago)
       like_at(liker, recent_post2, 5.days.ago)
       like_at(liker, old_post, 101.days.ago)
+      like_at(liker, private_post, 2.hours.ago)
+      like_at(liker2, private_post, 5.days.ago)
 
       expect(tl3_requirements.num_likes_received).to eq(3)
       expect(tl3_requirements.num_likes_received_days).to eq(2)

From ed95a6005bae108f8f6b1d571215fe4e5193de6a Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Tue, 7 Apr 2020 11:39:50 -0700
Subject: [PATCH 0543/1830] FEATURE: screenreader landmarks for main, suggested
 topics

In order to avoid a boatload of attributeBindings, I moved the root
element of the suggested-topics component into the template. Also,
autoformat their hbs files.

Testing info: https://www.scottohara.me/blog/2018/03/03/landmarks.html#using-screen-readers-to-navigate-landmarks

Additionally, flag modals with aria-modal=true to avoid the screenreader
accidentally escaping the modal. There's no need to ever toggle the
attribute to false, because we display:none the modal root when it's
closed.
---
 .../discourse/components/d-modal.js           |  4 ++-
 .../discourse/components/related-messages.js  |  3 +-
 .../discourse/components/suggested-topics.js  |  3 +-
 .../discourse/templates/application.hbs       |  2 +-
 .../templates/components/related-messages.hbs | 35 ++++++++++++-------
 .../templates/components/suggested-topics.hbs | 34 ++++++++++--------
 app/views/layouts/application.html.erb        |  2 +-
 7 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/d-modal.js b/app/assets/javascripts/discourse/components/d-modal.js
index eeae7edc3f..a2372013bc 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js
+++ b/app/assets/javascripts/discourse/components/d-modal.js
@@ -10,7 +10,7 @@ export default Component.extend({
     "modalStyle",
     "hasPanels"
   ],
-  attributeBindings: ["data-keyboard"],
+  attributeBindings: ["data-keyboard", "aria-modal"],
   dismissable: true,
   title: null,
   subtitle: null,
@@ -28,6 +28,8 @@ export default Component.extend({
 
   // We handle ESC ourselves
   "data-keyboard": "false",
+  // Inform screenreaders of the modal
+  "aria-modal": "true",
 
   @on("didInsertElement")
   setUp() {
diff --git a/app/assets/javascripts/discourse/components/related-messages.js b/app/assets/javascripts/discourse/components/related-messages.js
index 46732424f8..1e1457db7d 100644
--- a/app/assets/javascripts/discourse/components/related-messages.js
+++ b/app/assets/javascripts/discourse/components/related-messages.js
@@ -2,8 +2,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 
 export default Component.extend({
-  elementId: "related-messages",
-  classNames: ["suggested-topics"],
+  tagName: "",
 
   @discourseComputed("topic")
   targetUser(topic) {
diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js b/app/assets/javascripts/discourse/components/suggested-topics.js
index 9d5b83839a..11dc410ab0 100644
--- a/app/assets/javascripts/discourse/components/suggested-topics.js
+++ b/app/assets/javascripts/discourse/components/suggested-topics.js
@@ -5,8 +5,7 @@ import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import Site from "discourse/models/site";
 
 export default Component.extend({
-  elementId: "suggested-topics",
-  classNames: ["suggested-topics"],
+  tagName: "",
 
   suggestedTitleLabel: computed("topic", function() {
     const href = this.currentUser && this.currentUser.pmPath(this.topic);
diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/templates/application.hbs
index 437754ce7b..aeb8c91232 100644
--- a/app/assets/javascripts/discourse/templates/application.hbs
+++ b/app/assets/javascripts/discourse/templates/application.hbs
@@ -9,7 +9,7 @@
 
 {{plugin-outlet name="below-site-header" args=(hash currentPath=router._router.currentPath)}}
 
-<div id="main-outlet" class="wrap">
+<div id="main-outlet" class="wrap" role="main">
   {{plugin-outlet name="above-main-container"}}
   <div class="container">
     {{#if showTop}}
diff --git a/app/assets/javascripts/discourse/templates/components/related-messages.hbs b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
index d4443bd2c3..c16f2b6b79 100644
--- a/app/assets/javascripts/discourse/templates/components/related-messages.hbs
+++ b/app/assets/javascripts/discourse/templates/components/related-messages.hbs
@@ -1,14 +1,25 @@
-<h3 class="suggested-topics-title">
-  {{i18n "related_messages.title"}}
-</h3>
+<div id="related-messages" class="suggested-topics" role="complementary" aria-labelledby="related-messages-title">
+  <h3 class="suggested-topics-title" id="related-messages-title">
+    {{i18n "related_messages.title"}}
+  </h3>
 
-<div class="topics">
-  {{basic-topic-list
-    hideCategory="true"
-    showPosters="true"
-    topics=topic.relatedMessages}}
+  <div class="topics">
+    {{basic-topic-list
+      hideCategory="true"
+      showPosters="true"
+      topics=topic.relatedMessages
+    }}
+  </div>
+
+  {{#if targetUser}}
+    <h3 class="see-all-pms-message">
+      {{html-safe
+        (i18n
+          "related_messages.see_all"
+          path=searchLink
+          username=targetUser.username
+        )
+      }}
+    </h3>
+  {{/if}}
 </div>
-
-{{#if targetUser}}
-  <h3 class="see-all-pms-message">{{html-safe (i18n "related_messages.see_all" path=searchLink username=targetUser.username)}}</h3>
-{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
index ae7db1c907..0ec8ec2b05 100644
--- a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
@@ -1,16 +1,22 @@
-<h3 class="suggested-topics-title">
-  {{i18n suggestedTitleLabel}}
-</h3>
+<div id="suggested-topics" class="suggested-topics"
+    role="complementary" aria-labelledby="suggested-topics-title">
+  <h3 id="suggested-topics-title" class="suggested-topics-title">
+    {{i18n suggestedTitleLabel}}
+  </h3>
 
-<div class="topics">
-  {{#if topic.isPrivateMessage}}
-    {{basic-topic-list
-      hideCategory="true"
-      showPosters="true"
-      topics=topic.suggestedTopics}}
-  {{else}}
-    {{basic-topic-list topics=topic.suggestedTopics}}
-  {{/if}}
+  <div class="topics">
+    {{#if topic.isPrivateMessage}}
+      {{basic-topic-list
+        hideCategory="true"
+        showPosters="true"
+        topics=topic.suggestedTopics
+      }}
+    {{else}}
+      {{basic-topic-list topics=topic.suggestedTopics}}
+    {{/if}}
+  </div>
+
+  <h3 class="suggested-topics-message">
+    {{html-safe browseMoreMessage}}
+  </h3>
 </div>
-
-<h3 class="suggested-topics-message">{{html-safe browseMoreMessage}}</h3>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 0b037d521f..7340c45a46 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -67,7 +67,7 @@
     <%= render_google_tag_manager_body_code %>
     <noscript data-path="<%= request.env['PATH_INFO'] %>">
       <%= render partial: 'header' %>
-      <div id="main-outlet" class="wrap">
+      <div id="main-outlet" class="wrap" role="main">
         <!-- preload-content: -->
         <%= yield %>
         <!-- :preload-content -->

From 0991c4ae7e20f22551de0126cc5dd46875807e1d Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Tue, 7 Apr 2020 17:44:57 -0500
Subject: [PATCH 0544/1830] FIX: Widen modal on desktop

---
 .../stylesheets/common/components/bookmark-modal.scss       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/components/bookmark-modal.scss b/app/assets/stylesheets/common/components/bookmark-modal.scss
index 0b08a4c8bd..2c15181cf6 100644
--- a/app/assets/stylesheets/common/components/bookmark-modal.scss
+++ b/app/assets/stylesheets/common/components/bookmark-modal.scss
@@ -3,9 +3,13 @@
     box-sizing: border-box;
   }
   .modal-body {
-    width: 100%;
+    width: 375px;
     box-sizing: border-box;
 
+    @media (max-width: 600px) {
+      width: 100%;
+    }
+
     .control-label {
       font-weight: 700;
     }

From 236833ed5de64d50ab87ac943ce8fb880a6c4eb1 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 8 Apr 2020 07:10:58 +0530
Subject: [PATCH 0545/1830] FIX: redirect `/my/*path` to `/login-preferences`
 on client side

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

diff --git a/app/assets/javascripts/discourse/lib/url.js b/app/assets/javascripts/discourse/lib/url.js
index ed46452529..4ee7e5a097 100644
--- a/app/assets/javascripts/discourse/lib/url.js
+++ b/app/assets/javascripts/discourse/lib/url.js
@@ -249,7 +249,7 @@ const DiscourseURL = EmberObject.extend({
           userPath(currentUser.get("username_lower") + "/")
         );
       } else {
-        return redirectTo("/404");
+        return redirectTo("/login-preferences");
       }
     }
 

From 0375a5ac0b5b06fc54b2236641d3b19d28291e38 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 8 Apr 2020 12:42:28 +1000
Subject: [PATCH 0546/1830] DEV: reduce logging when no external id is
 specified

Previously we were returning an unknown sso error and logging a message
when external id was blank. This noise is not needed.
---
 app/controllers/session_controller.rb    |  4 ++++
 spec/components/scheduler/defer_spec.rb  | 20 --------------------
 spec/rails_helper.rb                     | 23 +++++++++++++++++++++++
 spec/requests/session_controller_spec.rb | 15 ++++++++-------
 4 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index c8696e0581..5f8b1c3430 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -254,6 +254,10 @@ class SessionController < ApplicationController
 
       render_sso_error(text: text || I18n.t("sso.unknown_error"), status: 500)
 
+    rescue DiscourseSingleSignOn::BlankExternalId
+
+      render_sso_error(text: I18n.t("sso.blank_id_error"), status: 500)
+
     rescue => e
       message = +"Failed to create or lookup user: #{e}."
       message << "  "
diff --git a/spec/components/scheduler/defer_spec.rb b/spec/components/scheduler/defer_spec.rb
index 533e2ff380..ab1aa06f60 100644
--- a/spec/components/scheduler/defer_spec.rb
+++ b/spec/components/scheduler/defer_spec.rb
@@ -15,26 +15,6 @@ describe Scheduler::Defer do
     end
   end
 
-  class TrackingLogger < ::Logger
-    attr_reader :messages
-    def initialize
-      super(nil)
-      @messages = []
-    end
-    def add(*args, &block)
-      @messages << args
-    end
-  end
-
-  def track_log_messages
-    old_logger = Rails.logger
-    logger = Rails.logger = TrackingLogger.new
-    yield logger.messages
-    logger.messages
-  ensure
-    Rails.logger = old_logger
-  end
-
   before do
     @defer = DeferInstance.new
     @defer.async = true
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index dc649a9b91..011dc0309e 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -385,3 +385,26 @@ def silence_stdout
 ensure
   STDOUT.unstub(:write)
 end
+
+class TrackingLogger < ::Logger
+  attr_reader :messages
+  def initialize(level: nil)
+    super(nil)
+    @messages = []
+    @level = level
+  end
+  def add(*args, &block)
+    if !level || args[0].to_i >= level
+      @messages << args
+    end
+  end
+end
+
+def track_log_messages(level: nil)
+  old_logger = Rails.logger
+  logger = Rails.logger = TrackingLogger.new(level: level)
+  yield logger.messages
+  logger.messages
+ensure
+  Rails.logger = old_logger
+end
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index 068230b272..316bc719d6 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -563,9 +563,13 @@ RSpec.describe SessionController do
       sso.external_id = '   '
       sso.username = 'sam'
 
-      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
+      messages = track_log_messages(level: Logger::WARN) do
+        get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
+      end
 
+      expect(messages.length).to eq(0)
       expect(response.status).to eq(500)
+      expect(response.body).to include(I18n.t('sso.blank_id_error'))
     end
 
     it 'can handle invalid sso external ids due to banned word' do
@@ -1165,12 +1169,9 @@ RSpec.describe SessionController do
         SiteSetting.enable_local_logins_via_email = false
       end
       it 'doesnt matter, logs in correctly' do
-        events = DiscourseEvent.track_events do
-          post "/session.json", params: {
-            login: user.username, password: 'myawesomepassword'
-          }
-        end
-
+        post "/session.json", params: {
+          login: user.username, password: 'myawesomepassword'
+        }
         expect(response.status).to eq(200)
       end
     end

From b824898f614d21c43a78fec30481757341106d5a Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 8 Apr 2020 16:33:50 +1000
Subject: [PATCH 0547/1830] FIX: respect automatic group membership when sso
 changes email

Previously we were only updating group membership when a user record was
first created in an SSO setting.

This corrects it so we also update it if SSO changes the email
---
 app/models/discourse_single_sign_on.rb   |  7 +++++++
 spec/requests/session_controller_spec.rb | 26 +++++++++++++++++++++++-
 spec/support/integration_helpers.rb      |  4 ++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index bc0916078f..085946cf84 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -100,6 +100,10 @@ class DiscourseSingleSignOn < SingleSignOn
     user.user_avatar.save! if user.user_avatar
     user.save!
 
+    if @email_changed && user.active
+      user.set_automatic_groups
+    end
+
     # The user might require approval
     user.create_reviewable
 
@@ -251,9 +255,12 @@ class DiscourseSingleSignOn < SingleSignOn
   end
 
   def change_external_attributes_and_override(sso_record, user)
+    @email_changed = false
+
     if SiteSetting.sso_overrides_email && user.email != Email.downcase(email)
       user.email = email
       user.active = false if require_activation
+      @email_changed = true
     end
 
     if SiteSetting.sso_overrides_username? && username.present?
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index 316bc719d6..50c4eb7ea0 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -584,8 +584,9 @@ RSpec.describe SessionController do
     end
 
     it 'can take over an account' do
+      user = Fabricate(:user, email: 'bill@bill.com')
+
       sso = get_sso("/")
-      user = Fabricate(:user)
       sso.email = user.email
       sso.external_id = 'abc'
       sso.username = 'sam'
@@ -597,6 +598,25 @@ RSpec.describe SessionController do
       expect(logged_on_user.email).to eq(user.email)
       expect(logged_on_user.single_sign_on_record.external_id).to eq("abc")
       expect(logged_on_user.single_sign_on_record.external_username).to eq('sam')
+
+      # we are updating the email ... ensure auto group membership works
+
+      sign_out
+
+      SiteSetting.email_editable = false
+      SiteSetting.sso_overrides_email = true
+
+      group = Fabricate(:group, name: :bob, automatic_membership_email_domains: 'jane.com')
+      sso = get_sso("/")
+      sso.email = "hello@jane.com"
+      sso.external_id = 'abc'
+
+      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
+
+      logged_on_user = Discourse.current_user_provider.new(request.env).current_user
+
+      expect(logged_on_user.email).to eq('hello@jane.com')
+      expect(group.users.count).to eq(1)
     end
 
     def sso_for_ip_specs
@@ -722,6 +742,8 @@ RSpec.describe SessionController do
     end
 
     it 'allows you to create an account' do
+      group = Fabricate(:group, name: :bob, automatic_membership_email_domains: 'bob.com')
+
       sso = get_sso('/a/')
       sso.external_id = '666' # the number of the beast
       sso.email = 'bob@bob.com'
@@ -742,6 +764,8 @@ RSpec.describe SessionController do
 
       logged_on_user = Discourse.current_user_provider.new(request.env).current_user
 
+      expect(group.users.where(id: logged_on_user.id).count).to eq(1)
+
       # ensure nothing is transient
       logged_on_user = User.find(logged_on_user.id)
 
diff --git a/spec/support/integration_helpers.rb b/spec/support/integration_helpers.rb
index d44adc333b..b306814aea 100644
--- a/spec/support/integration_helpers.rb
+++ b/spec/support/integration_helpers.rb
@@ -30,6 +30,10 @@ module IntegrationHelpers
     user
   end
 
+  def sign_out
+    delete "/session"
+  end
+
   def read_secure_session
     SecureSession.new(session[:secure_session_id])
   end

From 25f95af418d5c3d3425066b0e10276e292cba403 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 8 Apr 2020 08:53:21 +0200
Subject: [PATCH 0548/1830] REFACTOR: local dates to improve reliability with
 DST and recurrence (#9379)

This commit improves testing and separates local-date generation from dates with zone manipulations.
---
 .../javascripts/discourse-local-dates.js.es6  | 357 --------------
 .../initializers/discourse-local-dates.js.es6 |  77 ++-
 .../lib/date-with-zone-helper.js.es6          |  89 ++++
 .../javascripts/lib/local-date-builder.js.es6 | 243 +++++++++
 plugins/discourse-local-dates/plugin.rb       |   1 -
 .../acceptance/local-dates-test.js.es6        | 463 ------------------
 .../lib/date-with-zone-helper-test.js.es6     | 168 +++++++
 .../lib/local-date-builder-test.js.es6        | 420 ++++++++++++++++
 8 files changed, 994 insertions(+), 824 deletions(-)
 delete mode 100644 plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.es6
 create mode 100644 plugins/discourse-local-dates/assets/javascripts/lib/date-with-zone-helper.js.es6
 create mode 100644 plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
 delete mode 100644 plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-test.js.es6
 create mode 100644 plugins/discourse-local-dates/test/javascripts/lib/date-with-zone-helper-test.js.es6
 create mode 100644 plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6

diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.es6
deleted file mode 100644
index aba41b68ce..0000000000
--- a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.es6
+++ /dev/null
@@ -1,357 +0,0 @@
-// discourse-skip-module
-(function($) {
-  const DATE_TEMPLATE = `
-    <span>
-      <svg class="fa d-icon d-icon-globe-americas svg-icon" xmlns="http://www.w3.org/2000/svg">
-        <use xlink:href="#globe-americas"></use>
-      </svg>
-      <span class="relative-time"></span>
-    </span>
-  `;
-
-  const PREVIEW_TEMPLATE = `
-    <div class='preview'>
-      <span class='timezone'></span>
-      <span class='date-time'></span>
-    </div>
-  `;
-
-  function processElement($element, options = {}) {
-    clearTimeout(this.timeout);
-
-    const utc = moment().utc();
-    const dateTime = options.time
-      ? `${options.date} ${options.time}`
-      : options.date;
-
-    let displayedTimezone;
-    if (options.time) {
-      displayedTimezone = options.displayedTimezone || moment.tz.guess();
-    } else {
-      displayedTimezone =
-        options.displayedTimezone || options.timezone || moment.tz.guess();
-    }
-
-    // if timezone given we convert date and time from given zone to Etc/UTC
-    let utcDateTime;
-    if (options.timezone) {
-      utcDateTime = _applyZoneToDateTime(dateTime, options.timezone);
-    } else {
-      utcDateTime = moment.utc(dateTime);
-    }
-
-    if (utcDateTime < utc) {
-      // if event is in the past we want to bump it no next occurrence when
-      // recurring is set
-      if (options.recurring) {
-        utcDateTime = _applyRecurrence(utcDateTime, options);
-      } else {
-        $element.addClass("past");
-      }
-    }
-
-    // once we have the correct UTC date we want
-    // we adjust it to watching user timezone
-    const adjustedDateTime = utcDateTime.tz(displayedTimezone);
-
-    const previews = _generatePreviews(
-      adjustedDateTime.clone(),
-      displayedTimezone,
-      options
-    );
-    const textPreview = _generateTextPreview(previews);
-    const htmlPreview = _generateHtmlPreview(previews);
-
-    const formatedDateTime = _applyFormatting(
-      adjustedDateTime,
-      displayedTimezone,
-      options
-    );
-
-    $element
-      .html(DATE_TEMPLATE)
-      .attr("aria-label", textPreview)
-      .attr(
-        "data-html-tooltip",
-        `<div class="locale-dates-previews">${htmlPreview}</div>`
-      )
-      .addClass("cooked-date")
-      .find(".relative-time")
-      .text(formatedDateTime);
-
-    this.timeout = setTimeout(
-      () => processElement($element, options),
-      60 * 1000
-    );
-  }
-
-  function _formatTimezone(timezone) {
-    return timezone
-      .replace("_", " ")
-      .replace("Etc/", "")
-      .split("/");
-  }
-
-  function _zoneWithoutPrefix(timezone) {
-    const parts = _formatTimezone(timezone);
-    return parts[1] || parts[0];
-  }
-
-  function _applyZoneToDateTime(dateTime, timezone) {
-    return moment.tz(dateTime, timezone).utc();
-  }
-
-  function _translateCalendarKey(time, key) {
-    const translated = I18n.t(`discourse_local_dates.relative_dates.${key}`, {
-      time: "LT"
-    });
-
-    if (time) {
-      return translated
-        .split("LT")
-        .map(w => `[${w}]`)
-        .join("LT");
-    } else {
-      return `[${translated.replace(" LT", "")}]`;
-    }
-  }
-
-  function _calendarFormats(time) {
-    return {
-      sameDay: _translateCalendarKey(time, "today"),
-      nextDay: _translateCalendarKey(time, "tomorrow"),
-      lastDay: _translateCalendarKey(time, "yesterday"),
-      sameElse: "L"
-    };
-  }
-
-  function _isEqualZones(timezoneA, timezoneB) {
-    if ((timezoneA || timezoneB) && (!timezoneA || !timezoneB)) {
-      return false;
-    }
-
-    if (timezoneA.includes(timezoneB) || timezoneB.includes(timezoneA)) {
-      return true;
-    }
-
-    return (
-      moment.tz(timezoneA).utcOffset() === moment.tz(timezoneB).utcOffset()
-    );
-  }
-
-  function _applyFormatting(dateTime, displayedTimezone, options) {
-    if (options.countdown) {
-      const diffTime = dateTime.diff(moment());
-      if (diffTime < 0) {
-        return I18n.t("discourse_local_dates.relative_dates.countdown.passed");
-      } else {
-        return moment.duration(diffTime).humanize();
-      }
-    }
-
-    const sameTimezone = _isEqualZones(displayedTimezone, moment.tz.guess());
-    const inCalendarRange = dateTime.isBetween(
-      moment().subtract(2, "days"),
-      moment()
-        .add(1, "days")
-        .endOf("day")
-    );
-
-    if (options.calendar && inCalendarRange) {
-      if (sameTimezone) {
-        if (options.time) {
-          dateTime = dateTime.calendar(null, _calendarFormats(options.time));
-        } else {
-          dateTime = dateTime.calendar(null, _calendarFormats(null));
-        }
-      } else {
-        dateTime = dateTime.format(options.format);
-        dateTime = dateTime.replace("TZ", "");
-        dateTime = `${dateTime} (${_zoneWithoutPrefix(displayedTimezone)})`;
-      }
-    } else {
-      if (options.time) {
-        dateTime = dateTime.format(options.format);
-
-        if (options.displayedTimezone && !sameTimezone) {
-          dateTime = dateTime.replace("TZ", "");
-          dateTime = `${dateTime} (${_zoneWithoutPrefix(displayedTimezone)})`;
-        } else {
-          dateTime = dateTime.replace(
-            "TZ",
-            _formatTimezone(displayedTimezone).join(": ")
-          );
-        }
-      } else {
-        dateTime = dateTime.format(options.format);
-
-        if (!sameTimezone) {
-          dateTime = dateTime.replace("TZ", "");
-          dateTime = `${dateTime} (${_zoneWithoutPrefix(displayedTimezone)})`;
-        } else {
-          dateTime = dateTime.replace(
-            "TZ",
-            _zoneWithoutPrefix(displayedTimezone)
-          );
-        }
-      }
-    }
-
-    return dateTime;
-  }
-
-  function _applyRecurrence(dateTime, { recurring, timezone }) {
-    const parts = recurring.split(".");
-    const count = parseInt(parts[0], 10);
-    const type = parts[1];
-    const diff = moment().diff(dateTime, type);
-    const add = Math.ceil(diff + count);
-
-    // we create new moment object from format
-    // to ensure it's created in user context
-    const wasDST = moment(dateTime.format()).isDST();
-    let dateTimeWithRecurrence = moment(dateTime).add(add, type);
-    const isDST = moment(dateTimeWithRecurrence.format()).isDST();
-
-    // these dates are more or less DST "certain"
-    const noDSTOffset = moment
-      .tz({ month: 0, day: 1 }, timezone || "Etc/UTC")
-      .utcOffset();
-    const withDSTOffset = moment
-      .tz({ month: 5, day: 1 }, timezone || "Etc/UTC")
-      .utcOffset();
-
-    // we remove the DST offset present when the date was created,
-    // and add current DST offset
-    if (!wasDST && isDST) {
-      dateTimeWithRecurrence.add(-withDSTOffset + noDSTOffset, "minutes");
-    }
-
-    // we add the DST offset present when the date was created,
-    // and remove current DST offset
-    if (wasDST && !isDST) {
-      dateTimeWithRecurrence.add(withDSTOffset - noDSTOffset, "minutes");
-    }
-
-    return dateTimeWithRecurrence;
-  }
-
-  function _createDateTimeRange(dateTime, timezone) {
-    const dt = moment(dateTime).tz(timezone);
-
-    return [dt.format("LLL"), "→", dt.add(24, "hours").format("LLL")].join(" ");
-  }
-
-  function _generatePreviews(dateTime, displayedTimezone, options) {
-    const previewedTimezones = [];
-    const watchingUserTimezone = moment.tz.guess();
-    const timezones = options.timezones.filter(
-      timezone =>
-        !_isEqualZones(timezone, watchingUserTimezone) &&
-        !_isEqualZones(timezone, options.timezone)
-    );
-
-    previewedTimezones.push({
-      timezone: watchingUserTimezone,
-      current: true,
-      dateTime: options.time
-        ? moment(dateTime)
-            .tz(watchingUserTimezone)
-            .format("LLL")
-        : _createDateTimeRange(dateTime, watchingUserTimezone)
-    });
-
-    if (
-      options.timezone &&
-      displayedTimezone === watchingUserTimezone &&
-      options.timezone !== displayedTimezone &&
-      !_isEqualZones(displayedTimezone, options.timezone)
-    ) {
-      timezones.unshift(options.timezone);
-    }
-
-    Array.from(new Set(timezones.filter(Boolean))).forEach(timezone => {
-      if (_isEqualZones(timezone, displayedTimezone)) {
-        return;
-      }
-
-      if (_isEqualZones(timezone, watchingUserTimezone)) {
-        timezone = watchingUserTimezone;
-      }
-
-      previewedTimezones.push({
-        timezone,
-        dateTime: options.time
-          ? moment(dateTime)
-              .tz(timezone)
-              .format("LLL")
-          : _createDateTimeRange(dateTime, timezone)
-      });
-    });
-
-    if (!previewedTimezones.length) {
-      previewedTimezones.push({
-        timezone: "Etc/UTC",
-        dateTime: options.time
-          ? moment(dateTime)
-              .tz("Etc/UTC")
-              .format("LLL")
-          : _createDateTimeRange(dateTime, "Etc/UTC")
-      });
-    }
-
-    return _.uniq(previewedTimezones, "timezone");
-  }
-
-  function _generateTextPreview(previews) {
-    return previews
-      .map(preview => {
-        const formatedZone = _zoneWithoutPrefix(preview.timezone);
-
-        if (preview.dateTime.match(/TZ/)) {
-          return preview.dateTime.replace(/TZ/, formatedZone);
-        } else {
-          return `${formatedZone} ${preview.dateTime}`;
-        }
-      })
-      .join(", ");
-  }
-
-  function _generateHtmlPreview(previews) {
-    return previews
-      .map(preview => {
-        const $template = $(PREVIEW_TEMPLATE);
-
-        if (preview.current) $template.addClass("current");
-
-        $template.find(".timezone").text(_zoneWithoutPrefix(preview.timezone));
-        $template.find(".date-time").text(preview.dateTime);
-        return $template[0].outerHTML;
-      })
-      .join("");
-  }
-
-  $.fn.applyLocalDates = function() {
-    return this.each(function() {
-      const $element = $(this);
-
-      const options = {};
-      options.time = $element.attr("data-time");
-      options.date = $element.attr("data-date");
-      options.recurring = $element.attr("data-recurring");
-      options.timezones = (
-        $element.attr("data-timezones") ||
-        Discourse.SiteSettings.discourse_local_dates_default_timezones ||
-        "Etc/UTC"
-      ).split("|");
-      options.timezone = $element.attr("data-timezone");
-      options.calendar = ($element.attr("data-calendar") || "on") === "on";
-      options.displayedTimezone = $element.attr("data-displayed-timezone");
-      options.format =
-        $element.attr("data-format") || (options.time ? "LLL" : "LL");
-      options.countdown = $element.attr("data-countdown");
-
-      processElement($element, options);
-    });
-  };
-})(jQuery);
diff --git a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6 b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6
index 352ea1159e..7b3faee0c3 100644
--- a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6
@@ -1,11 +1,19 @@
 import { withPluginApi } from "discourse/lib/plugin-api";
 import showModal from "discourse/lib/show-modal";
+import LocalDateBuilder from "../lib/local-date-builder";
+
+const DATE_TEMPLATE = `
+  <span>
+    <svg class="fa d-icon d-icon-globe-americas svg-icon" xmlns="http://www.w3.org/2000/svg">
+      <use xlink:href="#globe-americas"></use>
+    </svg>
+    <span class="relative-time"></span>
+  </span>
+`;
 
 function initializeDiscourseLocalDates(api) {
   api.decorateCooked(
-    $elem => {
-      $(".discourse-local-date", $elem).applyLocalDates();
-    },
+    $elem => $(".discourse-local-date", $elem).applyLocalDates(),
     { id: "discourse-local-date" }
   );
 
@@ -37,6 +45,69 @@ export default {
   initialize(container) {
     const siteSettings = container.lookup("site-settings:main");
     if (siteSettings.discourse_local_dates_enabled) {
+      $.fn.applyLocalDates = function() {
+        return this.each(function() {
+          const opts = {};
+          const dataset = this.dataset;
+          opts.time = dataset.time;
+          opts.date = dataset.date;
+          opts.recurring = dataset.recurring;
+          opts.timezones = (
+            dataset.timezones ||
+            siteSettings.discourse_local_dates_default_timezones ||
+            "Etc/UTC"
+          )
+            .split("|")
+            .filter(Boolean);
+          opts.timezone = dataset.timezone;
+          opts.calendar = (dataset.calendar || "on") === "on";
+          opts.displayedTimezone = dataset.displayedTimezone;
+          opts.format = dataset.format || (opts.time ? "LLL" : "LL");
+          opts.countdown = dataset.countdown;
+
+          const localDateBuilder = new LocalDateBuilder(
+            opts,
+            moment.tz.guess()
+          ).build();
+
+          const htmlPreviews = localDateBuilder.previews.map(preview => {
+            const previewNode = document.createElement("div");
+            previewNode.classList.add("preview");
+            if (preview.current) {
+              previewNode.classList.add("current");
+            }
+
+            const timezoneNode = document.createElement("span");
+            timezoneNode.classList.add("timezone");
+            timezoneNode.innerText = preview.timezone;
+            previewNode.appendChild(timezoneNode);
+
+            const dateTimeNode = document.createElement("span");
+            dateTimeNode.classList.add("date-time");
+            dateTimeNode.innerText = preview.formated;
+            previewNode.appendChild(dateTimeNode);
+
+            return previewNode;
+          });
+
+          const previewsNode = document.createElement("div");
+          previewsNode.classList.add("locale-dates-previews");
+          htmlPreviews.forEach(htmlPreview =>
+            previewsNode.appendChild(htmlPreview)
+          );
+
+          this.innerHTML = DATE_TEMPLATE;
+          this.setAttribute("aria-label", localDateBuilder.textPreview);
+          this.dataset.htmlTooltip = previewsNode.outerHTML;
+          this.classList.add("cooked-date");
+          if (localDateBuilder.pastEvent) {
+            this.classList.add("past");
+          }
+          const relativeTime = this.querySelector(".relative-time");
+          relativeTime.innerText = localDateBuilder.formated;
+        });
+      };
+
       withPluginApi("0.8.8", initializeDiscourseLocalDates);
     }
   }
diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/date-with-zone-helper.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/date-with-zone-helper.js.es6
new file mode 100644
index 0000000000..9ffc6edb17
--- /dev/null
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/date-with-zone-helper.js.es6
@@ -0,0 +1,89 @@
+const { getProperties } = Ember;
+
+/*
+  DateWithZoneHelper provides a limited list of helpers
+  to manipulate a moment object with timezones
+
+  - add(count unit) adds a COUNT of UNITS to a date
+  - subtract(count unit) subtracts a COUNT of UNITS to a date
+  - format(format) formats a date with zone in a consitent way, optional moment format
+  - isDST() allows to know if a date in a specified timezone is currently under DST
+  - datetimeWithZone(timezone) returns a new moment object with timezone applied
+  - datetime returns the moment object
+  - repetitionsBetweenDates(duration, date) return the number of repertitions of
+  duration between two dates, eg for duration: "1.weeks", "2.months"...
+*/
+export default class DateWithZoneHelper {
+  constructor(params = {}) {
+    this.timezone = params.timezone || "UTC";
+    this.localTimezone = params.localTimezone || moment.tz.guess();
+
+    this.datetime = moment.tz(
+      getProperties(params, [
+        "year",
+        "month",
+        "day",
+        "hour",
+        "minute",
+        "second"
+      ]),
+      this.timezone
+    );
+  }
+
+  isDST() {
+    return this.datetime.tz(this.localTimezone).isDST();
+  }
+
+  repetitionsBetweenDates(duration, date) {
+    const [count, unit] = duration.split(".");
+    const diff = this.datetime.diff(date, unit);
+    const repetitions = diff / parseInt(count, 10);
+    return Math.abs((Math.round(repetitions * 10) / 10).toFixed(1));
+  }
+
+  add(count, unit) {
+    return this._fromDatetime(
+      this.datetime.clone().add(count, unit),
+      this.timezone,
+      this.localTimezone
+    );
+  }
+
+  subtract(count, unit) {
+    return this._fromDatetime(
+      this.datetime.clone().subtract(count, unit),
+      this.timezone,
+      this.localTimezone
+    );
+  }
+
+  datetimeWithZone(timezone) {
+    return this.datetime.clone().tz(timezone);
+  }
+
+  format(format) {
+    if (format) {
+      return this.datetime.tz(this.localTimezone).format(format);
+    }
+
+    return this.datetime.tz(this.localTimezone).toISOString(true);
+  }
+
+  static fromDatetime(datetime, timezone, localTimezone) {
+    return new DateWithZoneHelper({
+      year: datetime.year(),
+      month: datetime.month(),
+      day: datetime.date(),
+      hour: datetime.hour(),
+      minute: datetime.minute(),
+      second: datetime.second(),
+      timezone,
+      localTimezone
+    });
+  }
+
+  _fromDatetime(datetime, timezone, localTimezone) {
+    return DateWithZoneHelper.fromDatetime(datetime, timezone, localTimezone);
+  }
+}
diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
new file mode 100644
index 0000000000..3f81303cbf
--- /dev/null
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
@@ -0,0 +1,243 @@
+import DateWithZoneHelper from "./date-with-zone-helper";
+
+const TIME_FORMAT = "LLL";
+const DATE_FORMAT = "LL";
+const RANGE_SEPARATOR = "→";
+
+export default class LocalDateBuilder {
+  constructor(params = {}, localTimezone) {
+    this.time = params.time;
+    this.date = params.date;
+    this.recurring = params.recurring;
+    this.timezones = Array.from(
+      new Set((params.timezones || []).filter(Boolean))
+    );
+    this.timezone = params.timezone || "UTC";
+    this.calendar =
+      typeof params.calendar === "undefined" ? true : params.calendar;
+    this.displayedTimezone = params.displayedTimezone;
+    this.format = params.format || (this.time ? TIME_FORMAT : DATE_FORMAT);
+    this.countdown = params.countdown;
+    this.localTimezone = localTimezone;
+  }
+
+  build() {
+    const [year, month, day] = this.date.split("-").map(x => parseInt(x, 10));
+    const [hour, minute] = (this.time || "")
+      .split(":")
+      .map(x => (x ? parseInt(x, 10) : undefined));
+
+    let displayedTimezone;
+    if (this.time) {
+      displayedTimezone = this.displayedTimezone || this.localTimezone;
+    } else {
+      displayedTimezone =
+        this.displayedTimezone || this.localTimezone || this.timezone;
+    }
+
+    let localDate = new DateWithZoneHelper({
+      year,
+      month: month ? month - 1 : null,
+      day,
+      hour,
+      minute,
+      timezone: this.timezone,
+      localTimezone: this.localTimezone
+    });
+
+    if (this.recurring) {
+      const [count, type] = this.recurring.split(".");
+
+      const repetitionsForType = localDate.repetitionsBetweenDates(
+        this.recurring,
+        moment.tz(this.localTimezone)
+      );
+
+      localDate = localDate.add(repetitionsForType + parseInt(count, 10), type);
+    }
+
+    const previews = this._generatePreviews(localDate, displayedTimezone);
+
+    return {
+      pastEvent:
+        !this.recurring &&
+        moment.tz(this.localTimezone).isAfter(localDate.datetime),
+      formated: this._applyFormatting(localDate, displayedTimezone),
+      previews,
+      textPreview: this._generateTextPreviews(previews)
+    };
+  }
+
+  _generateTextPreviews(previews) {
+    return previews
+      .map(preview => {
+        const formatedZone = this._zoneWithoutPrefix(preview.timezone);
+        return `${formatedZone} ${preview.formated}`;
+      })
+      .join(", ");
+  }
+
+  _generatePreviews(localDate, displayedTimezone) {
+    const previewedTimezones = [];
+
+    const timezones = this.timezones.filter(
+      timezone =>
+        !this._isEqualZones(timezone, this.localTimezone) &&
+        !this._isEqualZones(timezone, this.timezone)
+    );
+
+    previewedTimezones.push({
+      timezone: this.localTimezone,
+      current: true,
+      formated: this._createDateTimeRange(localDate, this.time)
+    });
+
+    if (
+      this.timezone &&
+      displayedTimezone === this.localTimezone &&
+      this.timezone !== displayedTimezone &&
+      !this._isEqualZones(displayedTimezone, this.timezone)
+    ) {
+      timezones.unshift(this.timezone);
+    }
+
+    timezones.forEach(timezone => {
+      if (this._isEqualZones(timezone, displayedTimezone)) {
+        return;
+      }
+
+      if (this._isEqualZones(timezone, this.localTimezone)) {
+        timezone = this.localTimezone;
+      }
+
+      previewedTimezones.push({
+        timezone,
+        formated: this._createDateTimeRange(
+          localDate.datetimeWithZone(timezone),
+          this.time
+        )
+      });
+    });
+
+    if (!previewedTimezones.length) {
+      previewedTimezones.push({
+        timezone: "Etc/UTC",
+        formated: this._createDateTimeRange(
+          localDate.datetimeWithZone("Etc/UTC"),
+          this.time
+        )
+      });
+    }
+
+    return previewedTimezones.uniqBy("timezone");
+  }
+
+  _isEqualZones(timezoneA, timezoneB) {
+    if ((timezoneA || timezoneB) && (!timezoneA || !timezoneB)) {
+      return false;
+    }
+
+    if (timezoneA.includes(timezoneB) || timezoneB.includes(timezoneA)) {
+      return true;
+    }
+
+    return (
+      moment.tz(timezoneA).utcOffset() === moment.tz(timezoneB).utcOffset()
+    );
+  }
+
+  _createDateTimeRange(startRange, time) {
+    // if a time has been given we do not attempt to automatically create a range
+    // instead we show only one date with a format showing the time
+    if (time) {
+      return startRange.format(TIME_FORMAT);
+    } else {
+      const endRange = startRange.add(24, "hours");
+      return [
+        startRange.format(this.format || "LLLL"),
+        RANGE_SEPARATOR,
+        endRange.format(this.format || "LLLL")
+      ].join(" ");
+    }
+  }
+
+  _applyFormatting(localDate, displayedTimezone) {
+    if (this.countdown) {
+      const diffTime = moment.tz(this.localTimezone).diff(localDate.datetime);
+
+      if (diffTime < 0) {
+        return moment.duration(diffTime).humanize();
+      } else {
+        return I18n.t("discourse_local_dates.relative_dates.countdown.passed");
+      }
+    }
+
+    const sameTimezone = this._isEqualZones(
+      displayedTimezone,
+      this.localTimezone
+    );
+
+    if (this.calendar) {
+      const inCalendarRange = moment
+        .tz(this.localTimezone)
+        .isBetween(
+          localDate.subtract(2, "day").datetime,
+          localDate.add(1, "day").datetime.endOf("day")
+        );
+
+      if (inCalendarRange && sameTimezone) {
+        return localDate.datetime.calendar(
+          moment.tz(this.localTimezone),
+          this._calendarFormats(this.time ? this.time : null)
+        );
+      }
+    }
+
+    if (!sameTimezone) {
+      return this._formatWithZone(localDate, displayedTimezone, this.format);
+    }
+
+    return localDate.format(this.format);
+  }
+
+  _calendarFormats(time) {
+    return {
+      sameDay: this._translateCalendarKey(time, "today"),
+      nextDay: this._translateCalendarKey(time, "tomorrow"),
+      lastDay: this._translateCalendarKey(time, "yesterday"),
+      sameElse: "L"
+    };
+  }
+
+  _translateCalendarKey(time, key) {
+    const translated = I18n.t(`discourse_local_dates.relative_dates.${key}`, {
+      time: "LT"
+    });
+
+    if (time) {
+      return translated
+        .split("LT")
+        .map(w => `[${w}]`)
+        .join("LT");
+    } else {
+      return `[${translated.replace(" LT", "")}]`;
+    }
+  }
+
+  _formatTimezone(timezone) {
+    return timezone
+      .replace("_", " ")
+      .replace("Etc/", "")
+      .split("/");
+  }
+
+  _zoneWithoutPrefix(timezone) {
+    const [part1, part2] = this._formatTimezone(timezone);
+    return part2 || part1;
+  }
+
+  _formatWithZone(localDate, displayedTimezone, format) {
+    let formated = localDate.datetimeWithZone(displayedTimezone).format(format);
+    return `${formated} (${this._zoneWithoutPrefix(displayedTimezone)})`;
+  }
+}
diff --git a/plugins/discourse-local-dates/plugin.rb b/plugins/discourse-local-dates/plugin.rb
index d4ac0160df..b4fdae639f 100644
--- a/plugins/discourse-local-dates/plugin.rb
+++ b/plugins/discourse-local-dates/plugin.rb
@@ -6,7 +6,6 @@
 # author: Joffrey Jaffeux
 hide_plugin if self.respond_to?(:hide_plugin)
 
-register_asset 'javascripts/discourse-local-dates.js.es6'
 register_asset 'stylesheets/common/discourse-local-dates.scss'
 register_asset 'moment.js', :vendored_core_pretty_text
 register_asset 'moment-timezone.js', :vendored_core_pretty_text
diff --git a/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-test.js.es6
deleted file mode 100644
index 6d2a17f2a3..0000000000
--- a/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-test.js.es6
+++ /dev/null
@@ -1,463 +0,0 @@
-import { acceptance } from "helpers/qunit-helpers";
-
-const sandbox = sinon.createSandbox();
-
-acceptance("Local Dates", {
-  loggedIn: true,
-  settings: {
-    discourse_local_dates_enabled: true,
-    discourse_local_dates_default_timezones: "Europe/Paris|America/Los_Angeles"
-  },
-  beforeEach() {
-    freezeDateAndZone();
-  },
-  afterEach() {
-    sandbox.restore();
-    moment.tz.setDefault();
-  }
-});
-
-const DEFAULT_DATE = "2018-06-20";
-const DEFAULT_ZONE = "Europe/Paris";
-const DEFAULT_ZONE_FORMATED = DEFAULT_ZONE.split("/")[1];
-
-function advance(count, unit = "days") {
-  return moment(DEFAULT_DATE)
-    .add(count, unit)
-    .format("YYYY-MM-DD");
-}
-
-function rewind(count, unit = "days") {
-  return moment(DEFAULT_DATE)
-    .subtract(count, unit)
-    .format("YYYY-MM-DD");
-}
-
-function freezeDateAndZone(date, zone, cb) {
-  date = date || DEFAULT_DATE;
-  zone = zone || DEFAULT_ZONE;
-
-  sandbox.restore();
-  sandbox.stub(moment.tz, "guess");
-  moment.tz.guess.returns(zone);
-  moment.tz.setDefault(zone);
-
-  const now = moment(date).valueOf();
-  sandbox.useFakeTimers(now);
-
-  if (cb) {
-    cb();
-
-    moment.tz.guess.returns(DEFAULT_ZONE);
-    moment.tz.setDefault(DEFAULT_ZONE);
-    sandbox.useFakeTimers(moment(DEFAULT_DATE).valueOf());
-  }
-}
-
-function generateHTML(options = {}) {
-  let output = `<span class="discourse-local-date past cooked-date"`;
-
-  output += ` data-date="${options.date || DEFAULT_DATE}"`;
-  if (options.format) output += ` data-format="${options.format}"`;
-  if (options.timezones) output += ` data-timezones="${options.timezones}"`;
-  if (options.time) output += ` data-time="${options.time}"`;
-  output += ` data-timezone="${options.timezone || DEFAULT_ZONE}"`;
-  if (options.calendar) output += ` data-calendar="${options.calendar}"`;
-  if (options.recurring) output += ` data-recurring="${options.recurring}"`;
-  if (options.displayedTimezone)
-    output += ` data-displayed-timezone="${options.displayedTimezone}"`;
-
-  return (output += "></span>");
-}
-
-test("default format - time specified", assert => {
-  const html = generateHTML({ date: advance(3), time: "02:00" });
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "June 23, 2018 2:00 AM",
-    "it uses moment LLL format"
-  );
-});
-
-test("default format - no time specified", assert => {
-  let html = generateHTML({ date: advance(3) });
-  let transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "June 23, 2018",
-    "it uses moment LL format as default if not time is specified"
-  );
-
-  freezeDateAndZone(advance(1), "Pacific/Auckland", () => {
-    html = generateHTML({ date: advance(3) });
-    transformed = $(html).applyLocalDates();
-
-    assert.equal(
-      transformed.text().trim(),
-      `June 23, 2018 (${DEFAULT_ZONE_FORMATED})`,
-      "it appends creator timezone if watching user timezone is different"
-    );
-  });
-
-  freezeDateAndZone(advance(1), "Europe/Vienna", () => {
-    html = generateHTML({ date: advance(3) });
-    transformed = $(html).applyLocalDates();
-
-    assert.equal(
-      transformed.text().trim(),
-      "June 23, 2018",
-      "it doesn’t append timezone if different but with the same utc offset"
-    );
-  });
-});
-
-test("today", assert => {
-  const html = generateHTML({ time: "16:00" });
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(transformed.text().trim(), "Today 4:00 PM", "it display Today");
-});
-
-test("today - no time", assert => {
-  const html = generateHTML();
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Today",
-    "it display Today without time"
-  );
-});
-
-test("yesterday", assert => {
-  const html = generateHTML({ date: rewind(1), time: "16:00" });
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Yesterday 4:00 PM",
-    "it displays yesterday"
-  );
-});
-
-test("yesterday - no time", assert => {
-  const html = generateHTML({ date: rewind(1) });
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Yesterday",
-    "it displays yesterday without time"
-  );
-});
-
-test("tomorrow", assert => {
-  const html = generateHTML({ date: advance(1), time: "16:00" });
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Tomorrow 4:00 PM",
-    "it displays tomorrow"
-  );
-});
-
-test("tomorrow - no time", assert => {
-  const html = generateHTML({ date: advance(1) });
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Tomorrow",
-    "it displays tomorrow without time"
-  );
-});
-
-test("today - no time with different zones", assert => {
-  const html = generateHTML();
-  let transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Today",
-    "it displays today without time"
-  );
-
-  freezeDateAndZone(rewind(12, "hours"), "Pacific/Auckland", () => {
-    transformed = $(html).applyLocalDates();
-    assert.equal(
-      transformed.text().trim(),
-      `June 20, 2018 (${DEFAULT_ZONE_FORMATED})`,
-      "it displays the date without calendar and creator timezone"
-    );
-  });
-});
-
-test("calendar off", assert => {
-  const html = generateHTML({ calendar: "off", time: "16:00" });
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "June 20, 2018 4:00 PM",
-    "it displays the date without Today"
-  );
-});
-
-test("recurring", assert => {
-  const html = generateHTML({ recurring: "1.week", time: "16:00" });
-  let transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Today 4:00 PM",
-    "it displays the next occurrence"
-  );
-
-  freezeDateAndZone(advance(1), null, () => {
-    transformed = $(html).applyLocalDates();
-
-    assert.equal(
-      transformed.text().trim(),
-      "June 27, 2018 4:00 PM",
-      "it displays the next occurrence"
-    );
-  });
-});
-
-test("format", assert => {
-  const html = generateHTML({
-    date: advance(3),
-    format: "YYYY | MM - DD"
-  });
-  const transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "2018 | 06 - 23",
-    "it uses the given format"
-  );
-});
-
-test("displayedTimezone", assert => {
-  let html = generateHTML({
-    date: advance(3),
-    displayedTimezone: "America/Chicago",
-    time: "16:00"
-  });
-  let transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "June 23, 2018 9:00 AM (Chicago)",
-    "it displays timezone when different from watching user"
-  );
-
-  html = generateHTML({
-    date: advance(3),
-    displayedTimezone: DEFAULT_ZONE,
-    time: "16:00"
-  });
-
-  transformed = $(html).applyLocalDates();
-  assert.equal(
-    transformed.text().trim(),
-    "June 23, 2018 4:00 PM",
-    "it doesn’t display timezone when same from watching user"
-  );
-
-  html = generateHTML({ displayedTimezone: "Etc/UTC" });
-  transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "June 19, 2018 (UTC)",
-    "it displays timezone and drops calendar mode when timezone is different from watching user"
-  );
-
-  html = generateHTML({ displayedTimezone: DEFAULT_ZONE });
-  transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Today",
-    "it doesn’t display timezone and doesn’t drop calendar mode when timezone is same from watching user"
-  );
-
-  html = generateHTML({
-    timezone: "America/Chicago"
-  });
-  transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "June 20, 2018 (Chicago)",
-    "it uses timezone when displayedTimezone is not set"
-  );
-
-  html = generateHTML();
-  transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "Today",
-    "it uses user’s timezone when displayedTimezone and timezone are not set"
-  );
-
-  html = generateHTML({
-    timezone: "America/Chicago",
-    displayedTimezone: "Pacific/Auckland"
-  });
-  transformed = $(html).applyLocalDates();
-
-  assert.equal(
-    transformed.text().trim(),
-    "June 20, 2018 (Auckland)",
-    "it uses displayedTimezone over timezone"
-  );
-});
-
-test("tooltip", assert => {
-  let html = generateHTML({ timezone: "America/Chicago" });
-  let transformed = $(html).applyLocalDates();
-  let htmlToolip = transformed.attr("data-html-tooltip");
-  let currentUserPreview = $(htmlToolip).find(".preview.current");
-  let timezone = currentUserPreview.find(".timezone").text();
-  let dateTime = currentUserPreview.find(".date-time").text();
-
-  assert.equal(
-    timezone,
-    DEFAULT_ZONE_FORMATED,
-    "it adds watching user timezone as preview"
-  );
-  assert.equal(
-    dateTime,
-    "June 20, 2018 7:00 AM → June 21, 2018 7:00 AM",
-    "it creates a range adjusted to watching user timezone"
-  );
-
-  freezeDateAndZone(DEFAULT_DATE, "Pacific/Auckland", () => {
-    html = generateHTML({ timezone: "Pacific/Auckland" });
-    transformed = $(html).applyLocalDates();
-    htmlToolip = transformed.attr("data-html-tooltip");
-    currentUserPreview = $(htmlToolip).find(".preview.current");
-
-    assert.ok(
-      exists(currentUserPreview),
-      "it creates an entry if watching user has the same timezone than creator"
-    );
-  });
-
-  html = generateHTML({
-    timezones: "Etc/UTC",
-    timezone: "America/Chicago",
-    time: "14:00:00"
-  });
-  transformed = $(html).applyLocalDates();
-  htmlToolip = transformed.attr("data-html-tooltip");
-
-  assert.ok(
-    exists($(htmlToolip).find(".preview.current")),
-    "doesn’t create current timezone when displayed timezone equals watching user timezone"
-  );
-
-  let $firstPreview = $(htmlToolip).find(".preview:nth-child(2)");
-  dateTime = $firstPreview.find(".date-time").text();
-  timezone = $firstPreview.find(".timezone").text();
-  assert.equal(
-    dateTime,
-    "June 20, 2018 2:00 PM",
-    "it doesn’t create range if time has been set"
-  );
-  assert.equal(timezone, "Chicago", "it adds the timezone of the creator");
-
-  let $secondPreview = $(htmlToolip).find(".preview:nth-child(3)");
-  dateTime = $secondPreview.find(".date-time").text();
-  timezone = $secondPreview.find(".timezone").text();
-  assert.equal(timezone, "UTC", "Etc/UTC is rewritten to UTC");
-
-  freezeDateAndZone(moment("2018-11-26 21:00:00"), "Europe/Vienna", () => {
-    html = generateHTML({
-      date: "2018-11-22",
-      timezone: "America/Chicago",
-      time: "14:00"
-    });
-    transformed = $(html).applyLocalDates();
-    htmlToolip = transformed.attr("data-html-tooltip");
-
-    $firstPreview = $(htmlToolip).find(".preview:nth-child(2)");
-
-    assert.equal(
-      $firstPreview.find(".timezone").text(),
-      "Chicago",
-      "it adds the creator timezone to the previews"
-    );
-    assert.equal(
-      $firstPreview.find(".date-time").text(),
-      "November 22, 2018 2:00 PM",
-      "it adds the creator timezone to the previews"
-    );
-  });
-
-  freezeDateAndZone(DEFAULT_DATE, "Europe/Vienna", () => {
-    html = generateHTML({
-      date: "2018-11-22",
-      timezone: "America/Chicago",
-      timezones: "Europe/Paris"
-    });
-    transformed = $(html).applyLocalDates();
-    htmlToolip = transformed.attr("data-html-tooltip");
-
-    $firstPreview = $(htmlToolip)
-      .find(".preview")
-      .first();
-
-    assert.equal(
-      $firstPreview.find(".timezone").text(),
-      "Vienna",
-      "it rewrites timezone with same offset and different name than watching user"
-    );
-  });
-});
-
-test("test utils", assert => {
-  assert.equal(
-    moment().format("LLLL"),
-    moment(DEFAULT_DATE).format("LLLL"),
-    "it has defaults"
-  );
-
-  assert.equal(moment.tz.guess(), DEFAULT_ZONE, "it has defaults");
-
-  freezeDateAndZone(advance(1), DEFAULT_ZONE, () => {
-    assert.equal(
-      moment().format("LLLL"),
-      moment(DEFAULT_DATE)
-        .add(1, "days")
-        .format("LLLL"),
-      "it applies new time"
-    );
-    assert.equal(moment.tz.guess(), DEFAULT_ZONE);
-  });
-
-  assert.equal(
-    moment().format("LLLL"),
-    moment(DEFAULT_DATE).format("LLLL"),
-    "it restores time"
-  );
-
-  freezeDateAndZone(advance(1), "Pacific/Auckland", () => {
-    assert.equal(
-      moment().format("LLLL"),
-      moment(DEFAULT_DATE)
-        .add(1, "days")
-        .format("LLLL")
-    );
-    assert.equal(moment.tz.guess(), "Pacific/Auckland", "it applies new zone");
-  });
-
-  assert.equal(moment.tz.guess(), DEFAULT_ZONE, "it restores zone");
-});
diff --git a/plugins/discourse-local-dates/test/javascripts/lib/date-with-zone-helper-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/lib/date-with-zone-helper-test.js.es6
new file mode 100644
index 0000000000..4f3351935a
--- /dev/null
+++ b/plugins/discourse-local-dates/test/javascripts/lib/date-with-zone-helper-test.js.es6
@@ -0,0 +1,168 @@
+import DateWithZoneHelper from "./date-with-zone-helper";
+
+const PARIS = "Europe/Paris";
+const SYDNEY = "Australia/Sydney";
+
+QUnit.module("lib:date-with-zone-helper");
+
+function buildDateHelper(params = {}) {
+  return new DateWithZoneHelper({
+    year: params.year || 2020,
+    day: params.day || 22,
+    month: params.month || 2,
+    hour: params.hour || 10,
+    minute: params.minute || 5,
+    timezone: params.timezone,
+    localTimezone: PARIS
+  });
+}
+
+QUnit.test("#format", assert => {
+  let date = buildDateHelper({
+    day: 15,
+    month: 2,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+  assert.equal(date.format(), "2020-03-15T15:36:00.000+01:00");
+});
+
+QUnit.test("#repetitionsBetweenDates", assert => {
+  let date;
+
+  date = buildDateHelper({
+    day: 15,
+    month: 1,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+  assert.equal(
+    date.repetitionsBetweenDates(
+      "1.hour",
+      moment.tz("2020-02-15 15:36", SYDNEY)
+    ),
+    10,
+    "it correctly finds difference between timezones"
+  );
+
+  date = buildDateHelper({
+    day: 15,
+    month: 1,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+  assert.equal(
+    date.repetitionsBetweenDates(
+      "1.minute",
+      moment.tz("2020-02-15 15:36", PARIS)
+    ),
+    0,
+    "it correctly finds no difference"
+  );
+
+  date = buildDateHelper({
+    day: 15,
+    month: 1,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+  assert.equal(
+    date.repetitionsBetweenDates(
+      "1.minute",
+      moment.tz("2020-02-15 15:37", PARIS)
+    ),
+    1,
+    "it correctly finds no difference"
+  );
+
+  date = buildDateHelper({
+    day: 15,
+    month: 1,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+  assert.equal(
+    date.repetitionsBetweenDates(
+      "2.minute",
+      moment.tz("2020-02-15 15:41", PARIS)
+    ),
+    2.5,
+    "it correctly finds difference with a multiplicator"
+  );
+});
+
+QUnit.test("#add", assert => {
+  let date;
+  let futureLocalDate;
+
+  date = buildDateHelper({
+    day: 19,
+    month: 2,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+
+  assert.notOk(date.isDST());
+  futureLocalDate = date.add(8, "months");
+  assert.notOk(futureLocalDate.isDST());
+  assert.equal(
+    futureLocalDate.format(),
+    "2020-11-19T15:36:00.000+01:00",
+    "it correctly adds from a !isDST date to a !isDST date"
+  );
+
+  date = buildDateHelper({
+    day: 25,
+    month: 3,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+  assert.ok(date.isDST());
+  futureLocalDate = date.add(1, "year");
+  assert.ok(futureLocalDate.isDST());
+  assert.equal(
+    futureLocalDate.format(),
+    "2021-04-25T15:36:00.000+02:00",
+    "it correctly adds from a isDST date to a isDST date"
+  );
+
+  date = buildDateHelper({
+    day: 25,
+    month: 2,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+  assert.notOk(date.isDST());
+  futureLocalDate = date.add(1, "week");
+  assert.ok(futureLocalDate.isDST());
+  assert.equal(
+    futureLocalDate.format(),
+    "2020-04-01T15:36:00.000+02:00",
+    "it correctly adds from a !isDST date to a isDST date"
+  );
+
+  date = buildDateHelper({
+    day: 1,
+    month: 3,
+    hour: 15,
+    minute: 36,
+    timezone: PARIS
+  });
+
+  assert.ok(date.isDST());
+  futureLocalDate = date.add(8, "months");
+  assert.notOk(futureLocalDate.isDST());
+  assert.equal(
+    futureLocalDate.format(),
+    "2020-12-01T15:36:00.000+01:00",
+    "it correctly adds from a isDST date to a !isDST date"
+  );
+});
diff --git a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
new file mode 100644
index 0000000000..7895ca01cd
--- /dev/null
+++ b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
@@ -0,0 +1,420 @@
+import LocalDateBuilder from "./local-date-builder";
+
+const UTC = "Etc/UTC";
+const SYDNEY = "Australia/Sydney";
+const LOS_ANGELES = "America/Los_Angeles";
+const PARIS = "Europe/Paris";
+const LAGOS = "Africa/Lagos";
+const LONDON = "Europe/London";
+
+QUnit.module("lib:local-date-builder");
+
+const sandbox = sinon.createSandbox();
+
+function freezeTime({ date, timezone }, cb) {
+  date = date || "2020-01-22 10:34";
+  const newTimezone = timezone || PARIS;
+  const previousZone = moment.tz.guess();
+  const now = moment.tz(date, newTimezone).valueOf();
+
+  sandbox.useFakeTimers(now);
+  sandbox.stub(moment.tz, "guess");
+  moment.tz.guess.returns(newTimezone);
+  moment.tz.setDefault(newTimezone);
+
+  cb();
+
+  moment.tz.guess.returns(previousZone);
+  moment.tz.setDefault(previousZone);
+  sandbox.restore();
+}
+
+QUnit.assert.buildsCorrectDate = function(options, expected, message) {
+  const localTimezone = options.localTimezone || PARIS;
+  delete options.localTimezone;
+
+  const localDateBuilder = new LocalDateBuilder(
+    Object.assign(
+      {},
+      {
+        date: "2020-03-22"
+      },
+      options
+    ),
+    localTimezone
+  );
+
+  if (expected.formated) {
+    this.test.assert.equal(
+      localDateBuilder.build().formated,
+      expected.formated,
+      message || "it formates the date correctly"
+    );
+  }
+
+  if (expected.previews) {
+    this.test.assert.deepEqual(
+      localDateBuilder.build().previews,
+      expected.previews,
+      message || "it formates the previews correctly"
+    );
+  }
+};
+
+QUnit.test("date", assert => {
+  freezeTime({ date: "2020-03-11" }, () => {
+    assert.buildsCorrectDate(
+      { date: "2020-03-22", timezone: PARIS },
+      { formated: "March 22, 2020" },
+      "it displays the date without time"
+    );
+
+    assert.buildsCorrectDate(
+      { date: "2020-04-11", time: "11:00" },
+      { formated: "April 11, 2020 1:00 PM" },
+      "it displays the date with time"
+    );
+  });
+});
+
+QUnit.test("option[format]", assert => {
+  freezeTime({ date: "2020-03-11" }, () => {
+    assert.buildsCorrectDate(
+      { format: "YYYY" },
+      { formated: "2020" },
+      "it uses custom format"
+    );
+  });
+});
+
+QUnit.test("option[displayedTimezone]", assert => {
+  freezeTime({}, () => {
+    assert.buildsCorrectDate(
+      { displayedTimezone: SYDNEY },
+      { formated: "March 22, 2020 (Sydney)" },
+      "it displays the timezone if the timezone is different from the date"
+    );
+  });
+
+  freezeTime({}, () => {
+    assert.buildsCorrectDate(
+      { displayedTimezone: PARIS, timezone: PARIS },
+      { formated: "March 22, 2020" },
+      "it doesn't display the timezone if the timezone is the same than the date"
+    );
+  });
+
+  freezeTime({}, () => {
+    assert.buildsCorrectDate(
+      { timezone: UTC, displayedTimezone: UTC },
+      { formated: "March 22, 2020 (UTC)" },
+      "it replaces `Etc/`"
+    );
+  });
+
+  freezeTime({}, () => {
+    assert.buildsCorrectDate(
+      { timezone: LOS_ANGELES, displayedTimezone: LOS_ANGELES },
+      { formated: "March 22, 2020 (Los Angeles)" },
+      "it removes prefix and replaces `_`"
+    );
+  });
+});
+
+QUnit.test("option[timezone]", assert => {
+  freezeTime({}, () => {
+    assert.buildsCorrectDate(
+      { timezone: SYDNEY, displayedTimezone: PARIS },
+      { formated: "March 21, 2020" },
+      "it correctly parses a date with the given timezone context"
+    );
+  });
+});
+
+QUnit.test("option[recurring]", assert => {
+  freezeTime({ date: "2020-04-06 06:00", timezone: LAGOS }, () => {
+    assert.buildsCorrectDate(
+      {
+        date: "2019-11-25",
+        time: "11:00",
+        timezone: PARIS,
+        displayedTimezone: LAGOS,
+        recurring: "1.weeks"
+      },
+      {
+        formated: "April 6, 2020 10:00 AM (Lagos)"
+      },
+      "it correctly formats a recurring date starting from a !isDST timezone to a isDST timezone date when displayed to a user using a timezone with no DST"
+    );
+  });
+
+  freezeTime({ date: "2020-04-06 01:00", timezone: SYDNEY }, () => {
+    assert.buildsCorrectDate(
+      {
+        date: "2020-03-09",
+        time: "02:00",
+        timezone: UTC,
+        recurring: "1.weeks",
+        calendar: false,
+        displayedTimezone: SYDNEY
+      },
+      {
+        formated: "April 6, 2020 12:00 PM (Sydney)"
+      },
+      "it correctly formats a recurring date spanning over weeks"
+    );
+  });
+
+  freezeTime({ date: "2020-04-07 22:00" }, () => {
+    assert.buildsCorrectDate(
+      {
+        date: "2019-11-25",
+        time: "11:00",
+        recurring: "1.weeks",
+        timezone: PARIS
+      },
+      {
+        formated: "April 13, 2020 11:00 AM"
+      },
+      "it correctly adds from a !isDST date to a isDST date"
+    );
+  });
+
+  freezeTime({ date: "2020-04-06 10:59" }, () => {
+    assert.buildsCorrectDate(
+      {
+        date: "2020-03-30",
+        time: "11:00",
+        recurring: "1.weeks",
+        timezone: PARIS
+      },
+      {
+        formated: "Today 11:00 AM"
+      },
+      "it works to the minute"
+    );
+  });
+
+  freezeTime({ date: "2020-04-06 11:01" }, () => {
+    assert.buildsCorrectDate(
+      {
+        date: "2020-03-30",
+        time: "11:00",
+        recurring: "1.weeks",
+        timezone: PARIS
+      },
+      {
+        formated: "April 13, 2020 11:00 AM"
+      },
+      "it works to the minute"
+    );
+  });
+});
+
+QUnit.test("option[countown]", assert => {
+  freezeTime({ date: "2020-03-21 23:59" }, () => {
+    assert.buildsCorrectDate(
+      {
+        countdown: true,
+        timezone: PARIS
+      },
+      { formated: "a minute" },
+      "it shows the time remaining"
+    );
+  });
+
+  freezeTime({ date: "2020-03-22 00:01" }, () => {
+    assert.buildsCorrectDate(
+      {
+        countdown: true,
+        timezone: PARIS
+      },
+      {
+        formated: I18n.t(
+          "discourse_local_dates.relative_dates.countdown.passed"
+        )
+      },
+      "it shows the date has passed"
+    );
+  });
+});
+
+QUnit.test("option[calendar]", assert => {
+  freezeTime({ date: "2020-03-23 23:00" }, () => {
+    assert.buildsCorrectDate(
+      { date: "2020-03-22", time: "23:59", timezone: PARIS },
+      { formated: "Yesterday 11:59 PM" },
+      "it drops calendar mode when event date is more than one day before current date"
+    );
+  });
+
+  freezeTime({ date: "2020-03-20 23:59" }, () =>
+    assert.buildsCorrectDate(
+      { date: "2020-03-21", time: "00:00", timezone: PARIS },
+      { formated: "Tomorrow 12:00 AM" }
+    )
+  );
+
+  freezeTime({ date: "2020-03-20 23:59" }, () => {
+    assert.buildsCorrectDate(
+      { date: "2020-03-21", time: "23:59", timezone: PARIS },
+      { formated: "Tomorrow 11:59 PM" }
+    );
+  });
+
+  freezeTime({ date: "2020-03-21 00:00" }, () =>
+    assert.buildsCorrectDate(
+      { date: "2020-03-21", time: "23:00", timezone: PARIS },
+      { formated: "Today 11:00 PM" }
+    )
+  );
+
+  freezeTime({ date: "2020-03-22 23:59" }, () =>
+    assert.buildsCorrectDate(
+      { date: "2020-03-21", time: "23:59", timezone: PARIS },
+      { formated: "Yesterday 11:59 PM" }
+    )
+  );
+
+  freezeTime({ date: "2020-03-22 23:59" }, () =>
+    assert.buildsCorrectDate(
+      { date: "2020-03-21", time: "23:59", timezone: PARIS },
+      { formated: "Yesterday 11:59 PM" }
+    )
+  );
+
+  freezeTime({ date: "2020-03-22 23:59" }, () =>
+    assert.buildsCorrectDate(
+      { calendar: false, date: "2020-03-21", time: "23:59", timezone: PARIS },
+      { formated: "March 21, 2020 11:59 PM" },
+      "it doesn't use calendar when disabled"
+    )
+  );
+
+  freezeTime({ date: "2020-03-24 01:00" }, () =>
+    assert.buildsCorrectDate(
+      { date: "2020-03-21", timezone: PARIS },
+      { formated: "March 21, 2020" },
+      "it stops formating out of calendar range"
+    )
+  );
+});
+
+QUnit.test("previews", assert => {
+  freezeTime({ date: "2020-03-22" }, () => {
+    assert.buildsCorrectDate(
+      { timezone: PARIS },
+      {
+        previews: [
+          {
+            current: true,
+            formated: "March 22, 2020 → March 23, 2020",
+            timezone: "Europe/Paris"
+          }
+        ]
+      }
+    );
+  });
+
+  freezeTime({ date: "2020-03-22", timezone: PARIS }, () => {
+    assert.buildsCorrectDate(
+      { timezone: PARIS, timezones: [SYDNEY] },
+      {
+        previews: [
+          {
+            current: true,
+            formated: "March 22, 2020 → March 23, 2020",
+            timezone: "Europe/Paris"
+          },
+          {
+            formated: "March 23, 2020 → March 23, 2020",
+            timezone: "Australia/Sydney"
+          }
+        ]
+      }
+    );
+  });
+
+  freezeTime({ date: "2020-03-22", timezone: PARIS }, () => {
+    assert.buildsCorrectDate(
+      { timezone: PARIS, displayedTimezone: LOS_ANGELES },
+      {
+        previews: [
+          {
+            current: true,
+            formated: "March 22, 2020 → March 23, 2020",
+            timezone: "Europe/Paris"
+          }
+        ]
+      }
+    );
+  });
+
+  freezeTime({ date: "2020-03-22", timezone: PARIS }, () => {
+    assert.buildsCorrectDate(
+      { timezone: PARIS, isplayedTimezone: PARIS },
+      {
+        previews: [
+          {
+            current: true,
+            formated: "March 22, 2020 → March 23, 2020",
+            timezone: "Europe/Paris"
+          }
+        ]
+      }
+    );
+  });
+
+  freezeTime({ date: "2020-03-22", timezone: PARIS }, () => {
+    assert.buildsCorrectDate(
+      { timezone: PARIS, timezones: [PARIS] },
+      {
+        previews: [
+          {
+            current: true,
+            formated: "March 22, 2020 → March 23, 2020",
+            timezone: "Europe/Paris"
+          }
+        ]
+      }
+    );
+  });
+
+  freezeTime({ date: "2020-03-22", timezone: PARIS }, () => {
+    assert.buildsCorrectDate(
+      { time: "11:34", timezone: PARIS, timezones: [PARIS] },
+      {
+        previews: [
+          {
+            current: true,
+            formated: "March 22, 2020 11:34 AM",
+            timezone: "Europe/Paris"
+          }
+        ]
+      }
+    );
+  });
+
+  freezeTime({ date: "2020-04-06", timezone: PARIS }, () => {
+    assert.buildsCorrectDate(
+      { timezone: PARIS, date: "2020-04-07", timezones: [LONDON, LAGOS] },
+      {
+        previews: [
+          {
+            current: true,
+            formated: "April 7, 2020 → April 8, 2020",
+            timezone: "Europe/Paris"
+          },
+          {
+            formated: "April 7, 2020 → April 7, 2020",
+            timezone: "Europe/London"
+          },
+          {
+            formated: "April 7, 2020 → April 7, 2020",
+            timezone: "Africa/Lagos"
+          }
+        ]
+      }
+    );
+  });
+});

From 66d375cb1d6b9881c6f320c541b5f7fe456e9ff1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 8 Apr 2020 11:02:00 +0200
Subject: [PATCH 0549/1830] UX: display zones without prefix to reduce noise
 (#9383)

---
 .../javascripts/lib/local-date-builder.js.es6 |  6 +++---
 .../lib/local-date-builder-test.js.es6        | 20 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
index 3f81303cbf..578bd7a330 100644
--- a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
@@ -87,7 +87,7 @@ export default class LocalDateBuilder {
     );
 
     previewedTimezones.push({
-      timezone: this.localTimezone,
+      timezone: this._zoneWithoutPrefix(this.localTimezone),
       current: true,
       formated: this._createDateTimeRange(localDate, this.time)
     });
@@ -111,7 +111,7 @@ export default class LocalDateBuilder {
       }
 
       previewedTimezones.push({
-        timezone,
+        timezone: this._zoneWithoutPrefix(timezone),
         formated: this._createDateTimeRange(
           localDate.datetimeWithZone(timezone),
           this.time
@@ -121,7 +121,7 @@ export default class LocalDateBuilder {
 
     if (!previewedTimezones.length) {
       previewedTimezones.push({
-        timezone: "Etc/UTC",
+        timezone: "UTC",
         formated: this._createDateTimeRange(
           localDate.datetimeWithZone("Etc/UTC"),
           this.time
diff --git a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
index 7895ca01cd..a27d319eef 100644
--- a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
+++ b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
@@ -309,7 +309,7 @@ QUnit.test("previews", assert => {
           {
             current: true,
             formated: "March 22, 2020 → March 23, 2020",
-            timezone: "Europe/Paris"
+            timezone: "Paris"
           }
         ]
       }
@@ -324,11 +324,11 @@ QUnit.test("previews", assert => {
           {
             current: true,
             formated: "March 22, 2020 → March 23, 2020",
-            timezone: "Europe/Paris"
+            timezone: "Paris"
           },
           {
             formated: "March 23, 2020 → March 23, 2020",
-            timezone: "Australia/Sydney"
+            timezone: "Sydney"
           }
         ]
       }
@@ -343,7 +343,7 @@ QUnit.test("previews", assert => {
           {
             current: true,
             formated: "March 22, 2020 → March 23, 2020",
-            timezone: "Europe/Paris"
+            timezone: "Paris"
           }
         ]
       }
@@ -358,7 +358,7 @@ QUnit.test("previews", assert => {
           {
             current: true,
             formated: "March 22, 2020 → March 23, 2020",
-            timezone: "Europe/Paris"
+            timezone: "Paris"
           }
         ]
       }
@@ -373,7 +373,7 @@ QUnit.test("previews", assert => {
           {
             current: true,
             formated: "March 22, 2020 → March 23, 2020",
-            timezone: "Europe/Paris"
+            timezone: "Paris"
           }
         ]
       }
@@ -388,7 +388,7 @@ QUnit.test("previews", assert => {
           {
             current: true,
             formated: "March 22, 2020 11:34 AM",
-            timezone: "Europe/Paris"
+            timezone: "Paris"
           }
         ]
       }
@@ -403,15 +403,15 @@ QUnit.test("previews", assert => {
           {
             current: true,
             formated: "April 7, 2020 → April 8, 2020",
-            timezone: "Europe/Paris"
+            timezone: "Paris"
           },
           {
             formated: "April 7, 2020 → April 7, 2020",
-            timezone: "Europe/London"
+            timezone: "London"
           },
           {
             formated: "April 7, 2020 → April 7, 2020",
-            timezone: "Africa/Lagos"
+            timezone: "Lagos"
           }
         ]
       }

From 94c02286818214fa48a064503496698849a7f237 Mon Sep 17 00:00:00 2001
From: dave0688 <d.kreutzer@pulsdrei.de>
Date: Wed, 8 Apr 2020 11:03:50 +0200
Subject: [PATCH 0550/1830] FEATURE: Add same site cookie 'None' option to make
 cross domain systems possible (#9374)

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

diff --git a/config/site_settings.yml b/config/site_settings.yml
index ea69ebe702..ccbcc8150a 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1377,7 +1377,8 @@ security:
       - Lax
       - Strict
       - Disabled
-    regex: "^(Lax|Strict|Disabled)$"
+      - None
+    regex: "^(Lax|Strict|Disabled|None)$"
   enable_escaped_fragments: true
   allow_index_in_robots_txt: true
   moderators_create_categories: false

From 6d0ba74b9808c2b5cf5e4a64e9d5e8907627172d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 8 Apr 2020 11:43:47 +0200
Subject: [PATCH 0551/1830] UX: Ensures timezone is used over localTimezone
 when displaying dates

---
 .../assets/javascripts/lib/local-date-builder.js.es6            | 2 +-
 .../test/javascripts/lib/local-date-builder-test.js.es6         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
index 578bd7a330..b424d38590 100644
--- a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
@@ -32,7 +32,7 @@ export default class LocalDateBuilder {
       displayedTimezone = this.displayedTimezone || this.localTimezone;
     } else {
       displayedTimezone =
-        this.displayedTimezone || this.localTimezone || this.timezone;
+        this.displayedTimezone || this.timezone || this.localTimezone;
     }
 
     let localDate = new DateWithZoneHelper({
diff --git a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
index a27d319eef..b18e63632f 100644
--- a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
+++ b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
@@ -81,7 +81,7 @@ QUnit.test("option[format]", assert => {
   freezeTime({ date: "2020-03-11" }, () => {
     assert.buildsCorrectDate(
       { format: "YYYY" },
-      { formated: "2020" },
+      { formated: "2020 (UTC)" },
       "it uses custom format"
     );
   });

From 6171141211b29d59a4b047b9503fecd385e5a9e6 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 8 Apr 2020 11:44:06 +0200
Subject: [PATCH 0552/1830] UX: displays full date time when displaying ranges
 (#9386)

---
 .../javascripts/lib/local-date-builder.js.es6 |  4 +--
 .../lib/local-date-builder-test.js.es6        | 27 ++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
index b424d38590..827ba74ad5 100644
--- a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
@@ -154,9 +154,9 @@ export default class LocalDateBuilder {
     } else {
       const endRange = startRange.add(24, "hours");
       return [
-        startRange.format(this.format || "LLLL"),
+        startRange.format("LLLL"),
         RANGE_SEPARATOR,
-        endRange.format(this.format || "LLLL")
+        endRange.format("LLLL")
       ].join(" ");
     }
   }
diff --git a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
index b18e63632f..34499440d6 100644
--- a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
+++ b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
@@ -308,7 +308,8 @@ QUnit.test("previews", assert => {
         previews: [
           {
             current: true,
-            formated: "March 22, 2020 → March 23, 2020",
+            formated:
+              "Sunday, March 22, 2020 12:00 AM → Monday, March 23, 2020 12:00 AM",
             timezone: "Paris"
           }
         ]
@@ -323,11 +324,13 @@ QUnit.test("previews", assert => {
         previews: [
           {
             current: true,
-            formated: "March 22, 2020 → March 23, 2020",
+            formated:
+              "Sunday, March 22, 2020 12:00 AM → Monday, March 23, 2020 12:00 AM",
             timezone: "Paris"
           },
           {
-            formated: "March 23, 2020 → March 23, 2020",
+            formated:
+              "Monday, March 23, 2020 10:00 AM → Monday, March 23, 2020 10:00 AM",
             timezone: "Sydney"
           }
         ]
@@ -342,7 +345,8 @@ QUnit.test("previews", assert => {
         previews: [
           {
             current: true,
-            formated: "March 22, 2020 → March 23, 2020",
+            formated:
+              "Sunday, March 22, 2020 12:00 AM → Monday, March 23, 2020 12:00 AM",
             timezone: "Paris"
           }
         ]
@@ -357,7 +361,8 @@ QUnit.test("previews", assert => {
         previews: [
           {
             current: true,
-            formated: "March 22, 2020 → March 23, 2020",
+            formated:
+              "Sunday, March 22, 2020 12:00 AM → Monday, March 23, 2020 12:00 AM",
             timezone: "Paris"
           }
         ]
@@ -372,7 +377,8 @@ QUnit.test("previews", assert => {
         previews: [
           {
             current: true,
-            formated: "March 22, 2020 → March 23, 2020",
+            formated:
+              "Sunday, March 22, 2020 12:00 AM → Monday, March 23, 2020 12:00 AM",
             timezone: "Paris"
           }
         ]
@@ -402,15 +408,18 @@ QUnit.test("previews", assert => {
         previews: [
           {
             current: true,
-            formated: "April 7, 2020 → April 8, 2020",
+            formated:
+              "Tuesday, April 7, 2020 12:00 AM → Wednesday, April 8, 2020 12:00 AM",
             timezone: "Paris"
           },
           {
-            formated: "April 7, 2020 → April 7, 2020",
+            formated:
+              "Tuesday, April 7, 2020 11:00 PM → Tuesday, April 7, 2020 11:00 PM",
             timezone: "London"
           },
           {
-            formated: "April 7, 2020 → April 7, 2020",
+            formated:
+              "Tuesday, April 7, 2020 11:00 PM → Tuesday, April 7, 2020 11:00 PM",
             timezone: "Lagos"
           }
         ]

From 874999941a848ea7edeb3813e7dd5feeca843822 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 8 Apr 2020 12:46:43 +0200
Subject: [PATCH 0553/1830] DEV: Fix some more flaky tests (#9384)

Includes:
* DEV: Don't overwrite a computed property in test
---
 spec/helpers/emoji_helper_spec.rb                     | 10 +++++++---
 test/javascripts/acceptance/emoji-picker-test.js      |  4 ++++
 .../controllers/preferences-account-test.js           | 11 +++++------
 test/javascripts/lib/emoji-store-test.js              |  4 ++++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/spec/helpers/emoji_helper_spec.rb b/spec/helpers/emoji_helper_spec.rb
index 7dec3b3c55..a8b13a9ccb 100644
--- a/spec/helpers/emoji_helper_spec.rb
+++ b/spec/helpers/emoji_helper_spec.rb
@@ -4,6 +4,13 @@
 require 'rails_helper'
 
 describe EmojiHelper do
+  before do
+    Plugin::CustomEmoji.clear_cache
+  end
+
+  after do
+    Plugin::CustomEmoji.clear_cache
+  end
 
   describe "emoji_codes_to_img" do
     it "replaces emoji codes by images" do
@@ -13,8 +20,6 @@ describe EmojiHelper do
       replaced_str = helper.emoji_codes_to_img(str)
 
       expect(replaced_str).to eq("This is a good day <img src=\"/public/xxxxxx.png\" title=\"xxxxxx\" class=\"emoji\" alt=\"xxxxxx\"> <img src=\"/images/emoji/twitter/woman.png?v=#{Emoji::EMOJI_VERSION}\" title=\"woman\" class=\"emoji\" alt=\"woman\"> <img src=\"/images/emoji/twitter/man/4.png?v=#{Emoji::EMOJI_VERSION}\" title=\"man:t4\" class=\"emoji\" alt=\"man:t4\">")
-
-      Plugin::CustomEmoji.unregister("xxxxxx")
     end
 
     it "doesn't replace if code doesn't exist" do
@@ -24,5 +29,4 @@ describe EmojiHelper do
       expect(replaced_str).to eq("This is a good day <img src=\"/images/emoji/twitter/woman.png?v=#{Emoji::EMOJI_VERSION}\" title=\"woman\" class=\"emoji\" alt=\"woman\"> :foo: :bar:t4: :man:t8:")
     end
   end
-
 end
diff --git a/test/javascripts/acceptance/emoji-picker-test.js b/test/javascripts/acceptance/emoji-picker-test.js
index 71e06e1321..fac37414a6 100644
--- a/test/javascripts/acceptance/emoji-picker-test.js
+++ b/test/javascripts/acceptance/emoji-picker-test.js
@@ -3,6 +3,10 @@ import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
 
 acceptance("EmojiPicker", {
   loggedIn: true,
+  beforeEach() {
+    const store = Discourse.__container__.lookup("service:emoji-store");
+    store.reset();
+  },
   afterEach() {
     const store = Discourse.__container__.lookup("service:emoji-store");
     store.reset();
diff --git a/test/javascripts/controllers/preferences-account-test.js b/test/javascripts/controllers/preferences-account-test.js
index a0a8ae3840..f953fb0332 100644
--- a/test/javascripts/controllers/preferences-account-test.js
+++ b/test/javascripts/controllers/preferences-account-test.js
@@ -7,27 +7,26 @@ QUnit.test("updating of associated accounts", function(assert) {
       enable_google_oauth2_logins: true
     },
     model: EmberObject.create({
+      id: 70,
       second_factor_enabled: true,
       is_anonymous: true
     }),
+    currentUser: EmberObject.create({
+      id: 1234,
+    }),
     site: EmberObject.create({
       isMobileDevice: false
     })
   });
 
-  controller.set("canCheckEmails", false);
-
   assert.equal(controller.get("canUpdateAssociatedAccounts"), false);
 
   controller.set("model.second_factor_enabled", false);
-
   assert.equal(controller.get("canUpdateAssociatedAccounts"), false);
 
   controller.set("model.is_anonymous", false);
-
   assert.equal(controller.get("canUpdateAssociatedAccounts"), false);
 
-  controller.set("canCheckEmails", true);
-
+  controller.set("model.id", 1234);
   assert.equal(controller.get("canUpdateAssociatedAccounts"), true);
 });
diff --git a/test/javascripts/lib/emoji-store-test.js b/test/javascripts/lib/emoji-store-test.js
index f0c521a58f..3a137ed4c9 100644
--- a/test/javascripts/lib/emoji-store-test.js
+++ b/test/javascripts/lib/emoji-store-test.js
@@ -1,4 +1,8 @@
 QUnit.module("lib:emoji-store", {
+  beforeEach() {
+    const store = Discourse.__container__.lookup("service:emoji-store");
+    store.reset();
+  },
   afterEach() {
     const store = Discourse.__container__.lookup("service:emoji-store");
     store.reset();

From 8e1bdc9458c7e3c0a5a60f799b57434260111929 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Wed, 8 Apr 2020 10:44:31 -0300
Subject: [PATCH 0554/1830] FIX: Prevent low score flags from auto-closing a
 topic if the reviewable default visibility is higher than low (#9375)

---
 app/models/topic.rb       |  5 +++--
 spec/models/topic_spec.rb | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index 7a3a1a5b0b..4f69e3055d 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -1423,8 +1423,9 @@ class Topic < ActiveRecord::Base
 
     scores = ReviewableScore.pending
       .joins(:reviewable)
-      .where("reviewables.topic_id = ?", self.id)
-      .pluck("COUNT(DISTINCT reviewable_scores.user_id), COALESCE(SUM(reviewable_scores.score), 0.0)")
+      .where('reviewable_scores.score >= ?', Reviewable.min_score_for_priority)
+      .where('reviewables.topic_id = ?', self.id)
+      .pluck('COUNT(DISTINCT reviewable_scores.user_id), COALESCE(SUM(reviewable_scores.score), 0.0)')
       .first
 
     scores[0] >= SiteSetting.num_flaggers_to_close_topic && scores[1] >= Reviewable.score_to_auto_close_topic
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 84df06dd0d..e4db2d1d00 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -2574,4 +2574,40 @@ describe Topic do
       expect(user.user_profile.reload.featured_topic).to eq(nil)
     end
   end
+
+  describe '#auto_close_threshold_reached?' do
+    before do
+      Reviewable.set_priorities(low: 2.0, medium: 6.0, high: 9.0)
+      SiteSetting.num_flaggers_to_close_topic = 2
+      SiteSetting.reviewable_default_visibility = 'medium'
+      SiteSetting.auto_close_topic_sensitivity = Reviewable.sensitivity[:high]
+      post = Fabricate(:post)
+      @topic = post.topic
+      @reviewable = Fabricate(:reviewable_flagged_post, target: post, topic: @topic)
+    end
+
+    it 'ignores flags with a low score' do
+      5.times do
+        @reviewable.add_score(
+          Fabricate(:user, trust_level: TrustLevel[0]),
+          PostActionType.types[:spam],
+          created_at: 1.minute.ago
+        )
+      end
+
+      expect(@topic.auto_close_threshold_reached?).to eq(false)
+    end
+
+    it 'returns true when the flags have a high score' do
+      5.times do
+        @reviewable.add_score(
+          Fabricate(:user, admin: true),
+          PostActionType.types[:spam],
+          created_at: 1.minute.ago
+        )
+      end
+
+      expect(@topic.auto_close_threshold_reached?).to eq(true)
+    end
+  end
 end

From ae1a391377860bf1ab6d434de7458cc1b7c5dd31 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 8 Apr 2020 16:28:23 +0200
Subject: [PATCH 0555/1830] FIX: Quoting posts (#9378)

Fixes to the quote feature. Most important changes listed below:

* FIX: Correctly attribute quotes when using Reply button
* FIX: Correctly attribute quotes when using replyAsNewTopic
* FIX: Allow quoting a quote
* FIX: Correctly mark quotes as "full"
* FIX: Don't try to create a quote if it's empty
* DEV: Remove an obsolete method `loadQuote`
  It isn't used in core anymore, the only use in core has been removed over 4 years ago in 3251bcb. It's not used in any plugins in all-the-plugins and all references to it on GitHub are from outdated forks (https://github.com/search?q=%22Post.loadQuote%22&type=Code)
---
 .../discourse/components/quote-button.js      | 30 +++++++---
 .../discourse/controllers/composer.js         |  9 ++-
 .../discourse/controllers/topic.js            | 53 ++++++++---------
 app/assets/javascripts/discourse/lib/quote.js | 57 +++++-------------
 .../javascripts/discourse/lib/utilities.js    |  2 +-
 .../javascripts/discourse/models/composer.js  |  6 +-
 .../javascripts/discourse/models/post.js      |  8 ---
 .../templates/components/d-editor.hbs         |  2 +-
 .../javascripts/discourse/templates/topic.hbs |  1 -
 test/javascripts/acceptance/topic-test.js     | 58 +++++++++++++++++--
 test/javascripts/lib/pretty-text-test.js      | 33 +++++++++--
 11 files changed, 153 insertions(+), 106 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/quote-button.js b/app/assets/javascripts/discourse/components/quote-button.js
index 3a9ec42fe0..3a35269153 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js
+++ b/app/assets/javascripts/discourse/components/quote-button.js
@@ -1,6 +1,7 @@
 import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import discourseDebounce from "discourse/lib/debounce";
+import toMarkdown from "discourse/lib/to-markdown";
 import { selectedText, selectedElement } from "discourse/lib/utilities";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 
@@ -38,12 +39,13 @@ export default Component.extend({
     let firstRange, postId;
     for (let r = 0; r < selection.rangeCount; r++) {
       const range = selection.getRangeAt(r);
-
-      if ($(range.startContainer.parentNode).closest(".cooked").length === 0)
-        return;
-
+      const $selectionStart = $(range.startContainer);
       const $ancestor = $(range.commonAncestorContainer);
 
+      if ($selectionStart.closest(".cooked").length === 0) {
+        return;
+      }
+
       firstRange = firstRange || range;
       postId = postId || $ancestor.closest(".boxed, .reply").data("post-id");
 
@@ -55,9 +57,21 @@ export default Component.extend({
       }
     }
 
-    let opts = { raw: true };
+    const _selectedElement = selectedElement();
+    const _selectedText = selectedText();
+
+    const $selectedElement = $(_selectedElement);
+    const cooked =
+      $selectedElement.find(".cooked")[0] ||
+      $selectedElement.closest(".cooked")[0];
+    const postBody = toMarkdown(cooked.innerHTML);
+
+    let opts = {
+      full: _selectedText === postBody
+    };
+
     for (
-      let element = selectedElement();
+      let element = _selectedElement;
       element && element.tagName !== "ARTICLE";
       element = element.parentElement
     ) {
@@ -69,7 +83,6 @@ export default Component.extend({
       }
     }
 
-    const _selectedText = selectedText();
     quoteState.selected(postId, _selectedText, opts);
     this.set("visible", quoteState.buffer.length > 0);
 
@@ -186,8 +199,7 @@ export default Component.extend({
   },
 
   click() {
-    const { postId, buffer, opts } = this.quoteState;
-    this.attrs.selectText(postId, buffer, opts).then(() => this._hideButton());
+    this.attrs.selectText().then(() => this._hideButton());
     return false;
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/composer.js b/app/assets/javascripts/discourse/controllers/composer.js
index c26be5f36a..1706c82dd9 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js
+++ b/app/assets/javascripts/discourse/controllers/composer.js
@@ -5,7 +5,7 @@ import { inject as service } from "@ember/service";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import DiscourseURL from "discourse/lib/url";
-import Quote from "discourse/lib/quote";
+import { buildQuote } from "discourse/lib/quote";
 import Draft from "discourse/models/draft";
 import Composer from "discourse/models/composer";
 import discourseComputed, {
@@ -501,15 +501,14 @@ export default Controller.extend({
 
       if (postId) {
         this.set("model.loading", true);
-        const composer = this;
 
         return this.store.find("post", postId).then(post => {
-          const quote = Quote.build(post, post.raw, {
-            raw: true,
+          const quote = buildQuote(post, post.raw, {
             full: true
           });
+
           toolbarEvent.addText(quote);
-          composer.set("model.loading", false);
+          this.set("model.loading", false);
         });
       }
     },
diff --git a/app/assets/javascripts/discourse/controllers/topic.js b/app/assets/javascripts/discourse/controllers/topic.js
index 01a84f7352..c273591100 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js
+++ b/app/assets/javascripts/discourse/controllers/topic.js
@@ -8,7 +8,7 @@ import { bufferedProperty } from "discourse/mixins/buffered-content";
 import Composer from "discourse/models/composer";
 import DiscourseURL from "discourse/lib/url";
 import Post from "discourse/models/post";
-import Quote from "discourse/lib/quote";
+import { buildQuote } from "discourse/lib/quote";
 import QuoteState from "discourse/lib/quote-state";
 import Topic from "discourse/models/topic";
 import discourseDebounce from "discourse/lib/debounce";
@@ -265,7 +265,8 @@ export default Controller.extend(bufferedProperty("model"), {
       this.send("showFeatureTopic");
     },
 
-    selectText(postId, buffer, opts) {
+    selectText() {
+      const { postId, buffer, opts } = this.quoteState;
       const loadedPost = this.get("model.postStream").findLoadedPost(postId);
       const promise = loadedPost
         ? Promise.resolve(loadedPost)
@@ -274,11 +275,10 @@ export default Controller.extend(bufferedProperty("model"), {
       return promise.then(post => {
         const composer = this.composer;
         const viewOpen = composer.get("model.viewOpen");
-        const quotedText = Quote.build(post, buffer, opts);
 
         // If we can't create a post, delegate to reply as new topic
         if (!viewOpen && !this.get("model.details.can_create_post")) {
-          this.send("replyAsNewTopic", post, quotedText);
+          this.send("replyAsNewTopic", post);
           return;
         }
 
@@ -300,7 +300,9 @@ export default Controller.extend(bufferedProperty("model"), {
           composerOpts.post = composerPost;
         }
 
+        const quotedText = buildQuote(post, buffer, opts);
         composerOpts.quote = quotedText;
+
         if (composer.get("model.viewOpen")) {
           this.appEvents.trigger("composer:insert-block", quotedText);
         } else if (composer.get("model.viewDraft")) {
@@ -483,7 +485,11 @@ export default Controller.extend(bufferedProperty("model"), {
       }
 
       const quotedPost = postStream.findLoadedPost(quoteState.postId);
-      const quotedText = Quote.build(quotedPost, quoteState.buffer);
+      const quotedText = buildQuote(
+        quotedPost,
+        quoteState.buffer,
+        quoteState.opts
+      );
 
       quoteState.clear();
 
@@ -967,14 +973,14 @@ export default Controller.extend(bufferedProperty("model"), {
       }
     },
 
-    replyAsNewTopic(post, quotedText) {
+    replyAsNewTopic(post) {
       const composerController = this.composer;
-
       const { quoteState } = this;
-      quotedText = quotedText || Quote.build(post, quoteState.buffer);
+      const quotedText = buildQuote(post, quoteState.buffer, quoteState.opts);
+
       quoteState.clear();
 
-      var options;
+      let options;
       if (this.get("model.isPrivateMessage")) {
         let users = this.get("model.details.allowed_users");
         let groups = this.get("model.details.allowed_groups");
@@ -998,25 +1004,16 @@ export default Controller.extend(bufferedProperty("model"), {
         };
       }
 
-      composerController
-        .open(options)
-        .then(() => {
-          return isEmpty(quotedText) ? "" : quotedText;
-        })
-        .then(q => {
-          const postUrl = `${location.protocol}//${location.host}${post.get(
-            "url"
-          )}`;
-          const postLink = `[${Handlebars.escapeExpression(
-            this.get("model.title")
-          )}](${postUrl})`;
-          composerController
-            .get("model")
-            .prependText(
-              `${I18n.t("post.continue_discussion", { postLink })}\n\n${q}`,
-              { new_line: true }
-            );
-        });
+      composerController.open(options).then(() => {
+        const title = Handlebars.escapeExpression(this.model.title);
+        const postUrl = `${location.protocol}//${location.host}${post.url}`;
+        const postLink = `[${title}](${postUrl})`;
+        const text = `${I18n.t("post.continue_discussion", {
+          postLink
+        })}\n\n${quotedText}`;
+
+        composerController.model.prependText(text, { new_line: true });
+      });
     },
 
     retryLoading() {
diff --git a/app/assets/javascripts/discourse/lib/quote.js b/app/assets/javascripts/discourse/lib/quote.js
index 7a39c6da30..35870d06ca 100644
--- a/app/assets/javascripts/discourse/lib/quote.js
+++ b/app/assets/javascripts/discourse/lib/quote.js
@@ -1,43 +1,18 @@
-export default {
-  REGEXP: /\[quote=([^\]]*)\]((?:[\s\S](?!\[quote=[^\]]*\]))*?)\[\/quote\]/im,
+export const QUOTE_REGEXP = /\[quote=([^\]]*)\]((?:[\s\S](?!\[quote=[^\]]*\]))*?)\[\/quote\]/im;
 
-  // Build the BBCode quote around the selected text
-  build(post, contents, opts) {
-    if (!post) {
-      return "";
-    }
-
-    if (!contents) contents = "";
-    if (!opts) opts = {};
-
-    const sansQuotes = contents.replace(this.REGEXP, "").trim();
-    if (sansQuotes.length === 0) {
-      return "";
-    }
-
-    // Strip the HTML from cooked
-    const stripped = $("<div/>")
-      .html(post.get("cooked"))
-      .text();
-
-    // Let's remove any non-word characters as a kind of hash.
-    // Yes it's not accurate but it should work almost every time we need it to.
-    // It would be unlikely that the user would quote another post that matches in exactly this way.
-    const sameContent =
-      stripped.replace(/\W/g, "") === contents.replace(/\W/g, "");
-
-    const params = [
-      opts.username || post.username,
-      `post:${opts.post || post.post_number}`,
-      `topic:${opts.topic || post.topic_id}`
-    ];
-
-    opts = opts || {};
-
-    if (opts["full"] || sameContent) params.push("full:true");
-
-    return `[quote="${params.join(", ")}"]\n${
-      opts["raw"] ? contents : sansQuotes
-    }\n[/quote]\n\n`;
+// Build the BBCode quote around the selected text
+export function buildQuote(post, contents, opts = {}) {
+  if (!post || !contents) {
+    return "";
   }
-};
+
+  const params = [
+    opts.username || post.username,
+    `post:${opts.post || post.post_number}`,
+    `topic:${opts.topic || post.topic_id}`
+  ];
+
+  if (opts.full) params.push("full:true");
+
+  return `[quote="${params.join(", ")}"]\n${contents.trim()}\n[/quote]\n\n`;
+}
diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js
index 87aeb9a821..03ef200016 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js
+++ b/app/assets/javascripts/discourse/lib/utilities.js
@@ -149,7 +149,7 @@ export function selectedText() {
 export function selectedElement() {
   const selection = window.getSelection();
   if (selection.rangeCount > 0) {
-    return selection.getRangeAt(0).commonAncestorContainer.parentElement;
+    return selection.getRangeAt(0).commonAncestorContainer;
   }
 }
 
diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js
index 9c16503e68..56e4d1ac80 100644
--- a/app/assets/javascripts/discourse/models/composer.js
+++ b/app/assets/javascripts/discourse/models/composer.js
@@ -5,7 +5,7 @@ import { cancel, later, next, throttle } from "@ember/runloop";
 import RestModel from "discourse/models/rest";
 import Topic from "discourse/models/topic";
 import { throwAjaxError } from "discourse/lib/ajax-error";
-import Quote from "discourse/lib/quote";
+import { QUOTE_REGEXP } from "discourse/lib/quote";
 import Draft from "discourse/models/draft";
 import discourseComputed, {
   observes,
@@ -517,10 +517,10 @@ const Composer = RestModel.extend({
       return reply.length;
     }
 
-    while (Quote.REGEXP.test(reply)) {
+    while (QUOTE_REGEXP.test(reply)) {
       // make it global so we can strip as many quotes at once
       // keep in mind nested quotes mean we still need a loop here
-      const regex = new RegExp(Quote.REGEXP.source, "img");
+      const regex = new RegExp(QUOTE_REGEXP.source, "img");
       reply = reply.replace(regex, "");
     }
 
diff --git a/app/assets/javascripts/discourse/models/post.js b/app/assets/javascripts/discourse/models/post.js
index 535ac4b419..9b2dac96cd 100644
--- a/app/assets/javascripts/discourse/models/post.js
+++ b/app/assets/javascripts/discourse/models/post.js
@@ -7,7 +7,6 @@ import RestModel from "discourse/models/rest";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import ActionSummary from "discourse/models/action-summary";
 import { propertyEqual } from "discourse/lib/computed";
-import Quote from "discourse/lib/quote";
 import { postUrl } from "discourse/lib/utilities";
 import { cookAsync } from "discourse/lib/text";
 import { userPath } from "discourse/lib/url";
@@ -468,13 +467,6 @@ Post.reopenClass({
     });
   },
 
-  loadQuote(postId) {
-    return ajax(`/posts/${postId}.json`).then(result => {
-      const post = Post.create(result);
-      return Quote.build(post, post.raw, { raw: true, full: true });
-    });
-  },
-
   loadRawEmail(postId) {
     return ajax(`/posts/${postId}/raw-email.json`);
   }
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index 97effd78d4..955ef53a71 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -7,7 +7,7 @@
             {{toolbar-popup-menu-options
               content=popupMenuOptions
               onChange=onPopupMenuAction
-              onExpand=(action b.action b)
+              onOpen=(action b.action b)
               class=b.className
               options=(hash
                 popupTitle=b.title
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index c6297b021d..138c39b892 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -205,7 +205,6 @@
                 deletePost=(action "deletePost")
                 recoverPost=(action "recoverPost")
                 expandHidden=(action "expandHidden")
-                newTopicAction=(action "replyAsNewTopic")
                 toggleBookmark=(action "toggleBookmark")
                 toggleBookmarkWithReminder=(action "toggleBookmarkWithReminder")
                 togglePostType=(action "togglePostType")
diff --git a/test/javascripts/acceptance/topic-test.js b/test/javascripts/acceptance/topic-test.js
index 68e6ab2c8a..b5e2684e6f 100644
--- a/test/javascripts/acceptance/topic-test.js
+++ b/test/javascripts/acceptance/topic-test.js
@@ -328,15 +328,19 @@ QUnit.test("View Hidden Replies", async assert => {
   assert.equal(find(".gap").length, 0, "it hides gap");
 });
 
-QUnit.test("Quoting a quote keeps the original poster name", async assert => {
-  await visit("/t/internationalization-localization/280");
+function selectText(selector) {
+  const range = document.createRange();
+  const node = document.querySelector(selector);
+  range.selectNodeContents(node);
 
   const selection = window.getSelection();
-  const range = document.createRange();
-  range.selectNodeContents($("#post_5 blockquote")[0]);
   selection.removeAllRanges();
   selection.addRange(range);
+}
 
+QUnit.test("Quoting a quote keeps the original poster name", async assert => {
+  await visit("/t/internationalization-localization/280");
+  selectText("#post_5 blockquote");
   await click(".quote-button");
 
   assert.ok(
@@ -346,6 +350,52 @@ QUnit.test("Quoting a quote keeps the original poster name", async assert => {
   );
 });
 
+QUnit.test(
+  "Quoting a quote with the Reply button keeps the original poster name",
+  async assert => {
+    await visit("/t/internationalization-localization/280");
+    selectText("#post_5 blockquote");
+    await click(".reply");
+
+    assert.ok(
+      find(".d-editor-input")
+        .val()
+        .indexOf('quote="codinghorror said, post:3, topic:280"') !== -1
+    );
+  }
+);
+
+QUnit.test(
+  "Quoting a quote with replyAsNewTopic keeps the original poster name",
+  async assert => {
+    await visit("/t/internationalization-localization/280");
+    selectText("#post_5 blockquote");
+    await keyEvent(document, "keypress", "j".charCodeAt(0));
+    await keyEvent(document, "keypress", "t".charCodeAt(0));
+
+    assert.ok(
+      find(".d-editor-input")
+        .val()
+        .indexOf('quote="codinghorror said, post:3, topic:280"') !== -1
+    );
+  }
+);
+
+QUnit.test(
+  "Quoting by selecting text can mark the quote as full",
+  async assert => {
+    await visit("/t/internationalization-localization/280");
+    selectText("#post_5 .cooked");
+    await click(".quote-button");
+
+    assert.ok(
+      find(".d-editor-input")
+        .val()
+        .indexOf('quote="pekka, post:5, topic:280, full:true"') !== -1
+    );
+  }
+);
+
 acceptance("Topic + Post Bookmarks with Reminders", {
   loggedIn: true,
   settings: {
diff --git a/test/javascripts/lib/pretty-text-test.js b/test/javascripts/lib/pretty-text-test.js
index 522356e6de..8443cccdb6 100644
--- a/test/javascripts/lib/pretty-text-test.js
+++ b/test/javascripts/lib/pretty-text-test.js
@@ -1,4 +1,4 @@
-import Quote from "discourse/lib/quote";
+import { buildQuote } from "discourse/lib/quote";
 import Post from "discourse/models/post";
 import PrettyText, { buildOptions } from "pretty-text/pretty-text";
 import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
@@ -1289,8 +1289,8 @@ QUnit.test("quotes", assert => {
     topic_id: 2
   });
 
-  function formatQuote(val, expected, text) {
-    assert.equal(Quote.build(post, val), expected, text);
+  function formatQuote(val, expected, text, opts) {
+    assert.equal(buildQuote(post, val, opts), expected, text);
   }
 
   formatQuote(undefined, "", "empty string for undefined content");
@@ -1312,12 +1312,13 @@ QUnit.test("quotes", assert => {
   formatQuote(
     "lorem ipsum",
     '[quote="eviltrout, post:1, topic:2, full:true"]\nlorem ipsum\n[/quote]\n\n',
-    "marks quotes as full when the quote is the full message"
+    "marks quotes as full if the `full` option is passed",
+    { full: true }
   );
 
   formatQuote(
     "**lorem** ipsum",
-    '[quote="eviltrout, post:1, topic:2, full:true"]\n**lorem** ipsum\n[/quote]\n\n',
+    '[quote="eviltrout, post:1, topic:2"]\n**lorem** ipsum\n[/quote]\n\n',
     "keeps BBCode formatting"
   );
 
@@ -1340,6 +1341,28 @@ QUnit.test("quotes", assert => {
   );
 });
 
+QUnit.test("quoting a quote", assert => {
+  const post = Post.create({
+    cooked: new PrettyText(defaultOpts).cook(
+      '[quote="sam, post:1, topic:1, full:true"]\nhello\n[/quote]\n*Test*'
+    ),
+    username: "eviltrout",
+    post_number: 1,
+    topic_id: 2
+  });
+
+  const quote = buildQuote(
+    post,
+    '[quote="sam, post:1, topic:1, full:true"]\nhello\n[/quote]'
+  );
+
+  assert.equal(
+    quote,
+    '[quote="eviltrout, post:1, topic:2"]\n[quote="sam, post:1, topic:1, full:true"]\nhello\n[/quote]\n[/quote]\n\n',
+    "allows quoting a quote"
+  );
+});
+
 QUnit.test("quote formatting", assert => {
   assert.cooked(
     '[quote="EvilTrout, post:123, topic:456, full:true"]\n[sam]\n[/quote]',

From 84f344c5d1f72e5a5d026f5d26422f8d4602cb53 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 8 Apr 2020 11:38:25 -0400
Subject: [PATCH 0556/1830] FIX: ensure .gap width does not exceed window width

Fixes an issue where the viewport was horizontally scrollable on iPad.
---
 app/assets/stylesheets/desktop/topic-post.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index d404169fd8..1b60137985 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -633,6 +633,7 @@ blockquote {
   width: calc(
     #{$topic-avatar-width} + #{$topic-body-width} + 2 * #{$topic-body-width-padding}
   );
+  box-sizing: border-box;
 }
 
 /* hide the reply border above the time gap notices */

From b64b590cfb42b2d8b8129d2bee44e6407f11d284 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 8 Apr 2020 19:49:18 +0300
Subject: [PATCH 0557/1830] FIX: Add index on user_api_keys.key_hash (#9387)

---
 app/models/user_api_key.rb                                 | 1 +
 ...20200408121834_add_index_to_user_api_key_on_key_hash.rb | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 db/migrate/20200408121834_add_index_to_user_api_key_on_key_hash.rb

diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb
index e937c44a8e..4fac1230bc 100644
--- a/app/models/user_api_key.rb
+++ b/app/models/user_api_key.rb
@@ -116,5 +116,6 @@ end
 #
 #  index_user_api_keys_on_client_id  (client_id) UNIQUE
 #  index_user_api_keys_on_key        (key) UNIQUE
+#  index_user_api_keys_on_key_hash   (key_hash) UNIQUE
 #  index_user_api_keys_on_user_id    (user_id)
 #
diff --git a/db/migrate/20200408121834_add_index_to_user_api_key_on_key_hash.rb b/db/migrate/20200408121834_add_index_to_user_api_key_on_key_hash.rb
new file mode 100644
index 0000000000..9d6c67f651
--- /dev/null
+++ b/db/migrate/20200408121834_add_index_to_user_api_key_on_key_hash.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddIndexToUserApiKeyOnKeyHash < ActiveRecord::Migration[6.0]
+  def change
+    add_index :user_api_keys, :key_hash, unique: true
+  end
+end

From e1f8014acd2877cda539b14b4694d9c077f6b36d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 8 Apr 2020 12:52:36 -0400
Subject: [PATCH 0558/1830] FEATURE: Support for publishing topics as pages
 (#9364)

If the feature is enabled, staff members can construct a URL and publish a
topic for others to browse without the regular Discourse chrome.

This is useful if you want to use Discourse like a CMS and publish
topics as articles, which can then be embedded into other systems.
---
 .../discourse/adapters/published-page.js      |   9 +
 .../discourse/components/text-field.js        |  21 +++
 .../discourse/controllers/publish-page.js     | 121 +++++++++++++
 .../discourse/lib/transform-post.js           |   5 +-
 .../discourse/models/published-page.js        |   8 +
 .../javascripts/discourse/models/topic.js     |   7 +
 .../javascripts/discourse/routes/topic.js     |   8 +
 .../templates/modal/publish-page.hbs          |  62 +++++++
 .../javascripts/discourse/templates/topic.hbs |  22 ++-
 .../discourse/widgets/post-admin-menu.js      |   9 +
 app/assets/stylesheets/common/base/modal.scss |  21 +++
 app/assets/stylesheets/common/base/topic.scss |  11 ++
 app/assets/stylesheets/publish.scss           |  32 ++++
 app/controllers/published_pages_controller.rb |  59 ++++++
 app/models/published_page.rb                  |  46 +++++
 app/models/topic.rb                           |   1 +
 app/models/user_history.rb                    |   8 +-
 app/serializers/published_page_serializer.rb  |   9 +
 .../topic_view_details_serializer.rb          |   7 +-
 app/serializers/topic_view_serializer.rb      |   8 +-
 app/services/staff_action_logger.rb           |  16 ++
 app/views/layouts/publish.html.erb            |  15 ++
 app/views/published_pages/show.html.erb       |  19 ++
 config/locales/client.en.yml                  |  16 ++
 config/locales/server.en.yml                  |   7 +
 config/routes.rb                              |   6 +
 config/site_settings.yml                      |   2 +
 .../20200401172023_create_published_pages.rb  |  13 ++
 lib/guardian.rb                               |   8 +
 lib/stylesheet/watcher.rb                     |   2 +-
 lib/topic_view.rb                             |   4 +
 spec/components/guardian_spec.rb              |  32 ++++
 spec/fabricators/published_page_fabricator.rb |   6 +
 spec/models/published_page_spec.rb            |  27 +++
 .../published_pages_controller_spec.rb        | 170 ++++++++++++++++++
 .../serializers/topic_view_serializer_spec.rb |  32 ++++
 .../acceptance/page-publishing-test.js        |  40 +++++
 test/javascripts/fixtures/topic.js            |   1 +
 38 files changed, 883 insertions(+), 7 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/adapters/published-page.js
 create mode 100644 app/assets/javascripts/discourse/controllers/publish-page.js
 create mode 100644 app/assets/javascripts/discourse/models/published-page.js
 create mode 100644 app/assets/javascripts/discourse/templates/modal/publish-page.hbs
 create mode 100644 app/assets/stylesheets/publish.scss
 create mode 100644 app/controllers/published_pages_controller.rb
 create mode 100644 app/models/published_page.rb
 create mode 100644 app/serializers/published_page_serializer.rb
 create mode 100644 app/views/layouts/publish.html.erb
 create mode 100644 app/views/published_pages/show.html.erb
 create mode 100644 db/migrate/20200401172023_create_published_pages.rb
 create mode 100644 spec/fabricators/published_page_fabricator.rb
 create mode 100644 spec/models/published_page_spec.rb
 create mode 100644 spec/requests/published_pages_controller_spec.rb
 create mode 100644 test/javascripts/acceptance/page-publishing-test.js

diff --git a/app/assets/javascripts/discourse/adapters/published-page.js b/app/assets/javascripts/discourse/adapters/published-page.js
new file mode 100644
index 0000000000..1922673935
--- /dev/null
+++ b/app/assets/javascripts/discourse/adapters/published-page.js
@@ -0,0 +1,9 @@
+import RestAdapter from "discourse/adapters/rest";
+
+export default RestAdapter.extend({
+  jsonMode: true,
+
+  pathFor(store, type, id) {
+    return `/pub/by-topic/${id}`;
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/text-field.js b/app/assets/javascripts/discourse/components/text-field.js
index bb57f25309..3477520d0b 100644
--- a/app/assets/javascripts/discourse/components/text-field.js
+++ b/app/assets/javascripts/discourse/components/text-field.js
@@ -71,6 +71,27 @@ export default TextField.extend({
     }
   },
 
+  didReceiveAttrs() {
+    this._super(...arguments);
+    this._prevValue = this.value;
+  },
+
+  didUpdateAttrs() {
+    this._super(...arguments);
+    if (this._prevValue !== this.value) {
+      if (this.onChangeImmediate) {
+        next(() => this.onChangeImmediate(this.value));
+      }
+      if (this.onChange) {
+        debounce(this, this._debouncedChange, DEBOUNCE_MS);
+      }
+    }
+  },
+
+  _debouncedChange() {
+    next(() => this.onChange(this.value));
+  },
+
   @discourseComputed("placeholderKey")
   placeholder: {
     get() {
diff --git a/app/assets/javascripts/discourse/controllers/publish-page.js b/app/assets/javascripts/discourse/controllers/publish-page.js
new file mode 100644
index 0000000000..37462fce38
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/publish-page.js
@@ -0,0 +1,121 @@
+import Controller from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { computed, action } from "@ember/object";
+import { equal, not } from "@ember/object/computed";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+
+const States = {
+  initializing: "initializing",
+  checking: "checking",
+  valid: "valid",
+  invalid: "invalid",
+  saving: "saving",
+  new: "new",
+  existing: "existing",
+  unpublishing: "unpublishing",
+  unpublished: "unpublished"
+};
+
+const StateHelpers = {};
+Object.keys(States).forEach(name => {
+  StateHelpers[name] = equal("state", name);
+});
+
+export default Controller.extend(ModalFunctionality, StateHelpers, {
+  state: null,
+  reason: null,
+  publishedPage: null,
+  disabled: not("valid"),
+  publishedPage: null,
+
+  showUrl: computed("state", function() {
+    return (
+      this.state === States.valid ||
+      this.state === States.saving ||
+      this.state === States.existing
+    );
+  }),
+  showUnpublish: computed("state", function() {
+    return this.state === States.existing || this.state === States.unpublishing;
+  }),
+
+  onShow() {
+    this.set("state", States.initializing);
+
+    this.store
+      .find("published_page", this.model.id)
+      .then(page => {
+        this.setProperties({ state: States.existing, publishedPage: page });
+      })
+      .catch(this.startNew);
+  },
+
+  @action
+  startCheckSlug() {
+    if (this.state === States.existing) {
+      return;
+    }
+
+    this.set("state", States.checking);
+  },
+
+  @action
+  checkSlug() {
+    if (this.state === States.existing) {
+      return;
+    }
+    return ajax("/pub/check-slug", {
+      data: { slug: this.publishedPage.slug }
+    }).then(result => {
+      if (result.valid_slug) {
+        this.set("state", States.valid);
+      } else {
+        this.setProperties({ state: States.invalid, reason: result.reason });
+      }
+    });
+  },
+
+  @action
+  unpublish() {
+    this.set("state", States.unpublishing);
+    return this.publishedPage
+      .destroyRecord()
+      .then(() => {
+        this.set("state", States.unpublished);
+        this.model.set("publishedPage", null);
+      })
+      .catch(result => {
+        this.set("state", States.existing);
+        popupAjaxError(result);
+      });
+  },
+
+  @action
+  publish() {
+    this.set("state", States.saving);
+
+    return this.publishedPage
+      .update({ slug: this.publishedPage.slug })
+      .then(() => {
+        this.set("state", States.existing);
+        this.model.set("publishedPage", this.publishedPage);
+      })
+      .catch(errResult => {
+        popupAjaxError(errResult);
+        this.set("state", States.existing);
+      });
+  },
+
+  @action
+  startNew() {
+    this.setProperties({
+      state: States.new,
+      publishedPage: this.store.createRecord("published_page", {
+        id: this.model.id,
+        slug: this.model.slug
+      })
+    });
+    this.checkSlug();
+  }
+});
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js b/app/assets/javascripts/discourse/lib/transform-post.js
index 585bb02af3..986dc46c3c 100644
--- a/app/assets/javascripts/discourse/lib/transform-post.js
+++ b/app/assets/javascripts/discourse/lib/transform-post.js
@@ -76,7 +76,8 @@ export function transformBasicPost(post) {
     replyCount: post.reply_count,
     locked: post.locked,
     userCustomFields: post.user_custom_fields,
-    readCount: post.readers_count
+    readCount: post.readers_count,
+    canPublishPage: false
   };
 
   _additionalAttributes.forEach(a => (postAtts[a] = post[a]));
@@ -118,6 +119,8 @@ export default function transformPost(
     currentUser && (currentUser.id === post.user_id || currentUser.staff);
   postAtts.canReplyAsNewTopic = details.can_reply_as_new_topic;
   postAtts.canReviewTopic = !!details.can_review_topic;
+  postAtts.canPublishPage =
+    !!details.can_publish_page && post.post_number === 1;
   postAtts.isWarning = topic.is_warning;
   postAtts.links = post.get("internalLinks");
   postAtts.replyDirectlyBelow =
diff --git a/app/assets/javascripts/discourse/models/published-page.js b/app/assets/javascripts/discourse/models/published-page.js
new file mode 100644
index 0000000000..7f0c12ddf5
--- /dev/null
+++ b/app/assets/javascripts/discourse/models/published-page.js
@@ -0,0 +1,8 @@
+import RestModel from "discourse/models/rest";
+import { computed } from "@ember/object";
+
+export default RestModel.extend({
+  url: computed("slug", function() {
+    return `${Discourse.BaseUrl}/pub/${this.slug}`;
+  })
+});
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index 045f31123d..41734e6e8f 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -545,6 +545,13 @@ const Topic = RestModel.extend({
       this.details.updateFromJson(json.details);
 
       keys.removeObjects(["details", "post_stream"]);
+
+      if (json.published_page) {
+        this.set(
+          "publishedPage",
+          this.store.createRecord("published-page", json.published_page)
+        );
+      }
     }
     keys.forEach(key => this.set(key, json[key]));
   },
diff --git a/app/assets/javascripts/discourse/routes/topic.js b/app/assets/javascripts/discourse/routes/topic.js
index 33e60412c6..5aebefe6a4 100644
--- a/app/assets/javascripts/discourse/routes/topic.js
+++ b/app/assets/javascripts/discourse/routes/topic.js
@@ -89,6 +89,14 @@ const TopicRoute = DiscourseRoute.extend({
       controller.setProperties({ flagTopic: true });
     },
 
+    showPagePublish() {
+      const model = this.modelFor("topic");
+      showModal("publish-page", {
+        model,
+        title: "topic.publish_page.title"
+      });
+    },
+
     showTopicStatusUpdate() {
       const model = this.modelFor("topic");
 
diff --git a/app/assets/javascripts/discourse/templates/modal/publish-page.hbs b/app/assets/javascripts/discourse/templates/modal/publish-page.hbs
new file mode 100644
index 0000000000..027f3ee764
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/modal/publish-page.hbs
@@ -0,0 +1,62 @@
+{{#d-modal-body}}
+  {{#if unpublished}}
+    <p>{{i18n "topic.publish_page.unpublished"}}</p>
+  {{else}}
+    {{#conditional-loading-spinner condition=initializing}}
+      <p class="publish-description">{{i18n "topic.publish_page.description"}}</p>
+
+      <form>
+        <label>{{i18n "topic.publish_page.slug"}}</label>
+        {{text-field value=publishedPage.slug onChange=(action "checkSlug") onChangeImmediate=(action "startCheckSlug") disabled=existing class="publish-slug"}}
+      </form>
+
+      <div class="publish-url">
+        {{conditional-loading-spinner condition=checking}}
+
+        {{#if existing}}
+          <div class='current-url'>
+            {{i18n "topic.publish_page.publish_url"}}
+            <div>
+              <a href={{publishedPage.url}} target="_blank" rel="noopener">{{publishedPage.url}}</a>
+            </div>
+          </div>
+        {{else}}
+          {{#if showUrl}}
+            <div class="valid-slug">
+              {{i18n "topic.publish_page.preview_url"}}
+              <div class='example-url'>{{publishedPage.url}}</div>
+            </div>
+          {{/if}}
+
+          {{#if invalid}}
+            {{i18n "topic.publish_page.invalid_slug"}} <span class="invalid-slug">{{reason}}.</span>
+          {{/if}}
+        {{/if}}
+
+      </div>
+    {{/conditional-loading-spinner}}
+  {{/if}}
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  {{#if showUnpublish}}
+    {{d-button icon="times" label="close" action=(action "closeModal")}}
+
+    {{d-button
+      label="topic.publish_page.unpublish"
+      icon="trash"
+      class="btn-danger"
+      isLoading=unpublishing
+      action=(action "unpublish") }}
+  {{else if unpublished}}
+    {{d-button label="topic.publish_page.publishing_settings" action=(action "startNew")}}
+  {{else}}
+    {{d-button
+      label="topic.publish_page.publish"
+      class="btn-primary publish-page"
+      icon="file"
+      disabled=disabled
+      isLoading=saving
+      action=(action "publish") }}
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 138c39b892..ed26ae62ba 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -85,6 +85,25 @@
           {{topic-category topic=model class="topic-category"}}
         {{/if}}
       {{/topic-title}}
+
+      {{#if model.publishedPage}}
+        <div class='published-page'>
+          <div class="details">
+            {{i18n "topic.publish_page.topic_published"}}
+            <div>
+              <a href={{model.publishedPage.url}} target="_blank" rel="noopener">{{model.publishedPage.url}}</a>
+            </div>
+          </div>
+          <div class="controls">
+            {{d-button
+              icon="file"
+              label="topic.publish_page.publishing_settings"
+              action=(route-action "showPagePublish")
+            }}
+          </div>
+        </div>
+      {{/if}}
+
     {{/if}}
 
     <div class="container posts">
@@ -230,7 +249,8 @@
                 selectBelow=(action "selectBelow")
                 fillGapBefore=(action "fillGapBefore")
                 fillGapAfter=(action "fillGapAfter")
-                showInvite=(route-action "showInvite")}}
+                showInvite=(route-action "showInvite")
+                showPagePublish=(route-action "showPagePublish")}}
             {{/unless}}
 
             {{conditional-loading-spinner condition=model.postStream.loadingBelow}}
diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js b/app/assets/javascripts/discourse/widgets/post-admin-menu.js
index 40dc1d3c85..2b94b8a85c 100644
--- a/app/assets/javascripts/discourse/widgets/post-admin-menu.js
+++ b/app/assets/javascripts/discourse/widgets/post-admin-menu.js
@@ -120,6 +120,15 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
     }
   }
 
+  if (attrs.canPublishPage) {
+    contents.push({
+      icon: "file",
+      label: "post.controls.publish_page",
+      action: "showPagePublish",
+      className: "btn-default publish-page"
+    });
+  }
+
   if (attrs.canManage) {
     contents.push({
       icon: "cog",
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 90a20854fd..cb7e0a4c35 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -684,6 +684,27 @@
   }
 }
 
+.publish-page-modal .modal-body {
+  p.publish-description {
+    margin-top: 0;
+  }
+  input.publish-slug {
+    width: 100%;
+  }
+
+  .publish-url {
+    margin-bottom: 1em;
+    .example-url,
+    .invalid-slug {
+      font-weight: bold;
+    }
+  }
+
+  .publish-slug:disabled {
+    cursor: not-allowed;
+  }
+}
+
 .modal:not(.has-tabs) {
   .modal-tab {
     position: absolute;
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index 927ee0e250..cd7c7d70cc 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -295,3 +295,14 @@ a.topic-featured-link {
     }
   }
 }
+
+.published-page {
+  display: flex;
+  justify-content: space-between;
+  padding-bottom: 1em;
+  max-width: calc(
+    #{$topic-body-width} + #{$topic-avatar-width} + #{$topic-body-width-padding *
+      2}
+  );
+  align-items: center;
+}
diff --git a/app/assets/stylesheets/publish.scss b/app/assets/stylesheets/publish.scss
new file mode 100644
index 0000000000..b59a480ef0
--- /dev/null
+++ b/app/assets/stylesheets/publish.scss
@@ -0,0 +1,32 @@
+@import "common";
+
+body {
+  background-color: $secondary;
+  color: $primary;
+}
+
+.published-page {
+  margin: 2em auto;
+  max-width: 800px;
+
+  h1 {
+    color: $header_primary;
+  }
+
+  .published-page-author {
+    margin-top: 1em;
+    margin-bottom: 2em;
+    display: flex;
+
+    .avatar {
+      margin-right: 1em;
+    }
+    .topic-created-at {
+      color: $primary-medium;
+    }
+  }
+
+  .published-page-body {
+    font-size: 1.25em;
+  }
+}
diff --git a/app/controllers/published_pages_controller.rb b/app/controllers/published_pages_controller.rb
new file mode 100644
index 0000000000..a133732867
--- /dev/null
+++ b/app/controllers/published_pages_controller.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+class PublishedPagesController < ApplicationController
+
+  skip_before_action :preload_json
+  skip_before_action :check_xhr, :verify_authenticity_token, only: [:show]
+  before_action :ensure_publish_enabled
+
+  def show
+    params.require(:slug)
+
+    pp = PublishedPage.find_by(slug: params[:slug])
+    raise Discourse::NotFound unless pp
+
+    guardian.ensure_can_see!(pp.topic)
+    @topic = pp.topic
+    @canonical_url = @topic.url
+    render layout: 'publish'
+  end
+
+  def details
+    pp = PublishedPage.find_by(topic: fetch_topic)
+    raise Discourse::NotFound if pp.blank?
+    render_serialized(pp, PublishedPageSerializer)
+  end
+
+  def upsert
+    result, pp = PublishedPage.publish!(current_user, fetch_topic, params[:published_page][:slug].strip)
+    json_result(pp, serializer: PublishedPageSerializer) { result }
+  end
+
+  def destroy
+    PublishedPage.unpublish!(current_user, fetch_topic)
+    render json: success_json
+  end
+
+  def check_slug
+    pp = PublishedPage.new(topic: Topic.new, slug: params[:slug].strip)
+
+    if pp.valid?
+      render json: { valid_slug: true }
+    else
+      render json: { valid_slug: false, reason: pp.errors.full_messages.first }
+    end
+  end
+
+private
+
+  def fetch_topic
+    topic = Topic.find_by(id: params[:topic_id])
+    guardian.ensure_can_publish_page!(topic)
+    topic
+  end
+
+  def ensure_publish_enabled
+    raise Discourse::NotFound unless SiteSetting.enable_page_publishing?
+  end
+
+end
diff --git a/app/models/published_page.rb b/app/models/published_page.rb
new file mode 100644
index 0000000000..da89df53bc
--- /dev/null
+++ b/app/models/published_page.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class PublishedPage < ActiveRecord::Base
+  belongs_to :topic
+
+  validates_presence_of :slug
+  validates_uniqueness_of :slug, :topic_id
+
+  validate :slug_format
+  def slug_format
+    if slug !~ /^[a-zA-Z\-\_0-9]+$/
+      errors.add(:slug, I18n.t("publish_page.slug_errors.invalid"))
+    elsif ["check-slug", "by-topic"].include?(slug)
+      errors.add(:slug, I18n.t("publish_page.slug_errors.unavailable"))
+    end
+  end
+
+  def path
+    "/pub/#{slug}"
+  end
+
+  def url
+    "#{Discourse.base_url}#{path}"
+  end
+
+  def self.publish!(publisher, topic, slug)
+    transaction do
+      pp = find_or_initialize_by(topic: topic)
+      pp.slug = slug.strip
+
+      if pp.save
+        StaffActionLogger.new(publisher).log_published_page(topic.id, slug)
+        return [true, pp]
+      end
+    end
+
+    [false, pp]
+  end
+
+  def self.unpublish!(publisher, topic)
+    if pp = PublishedPage.find_by(topic_id: topic.id)
+      pp.destroy!
+      StaffActionLogger.new(publisher).log_unpublished_page(topic.id, pp.slug)
+    end
+  end
+end
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 4f69e3055d..dd9460ce3a 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -114,6 +114,7 @@ class Topic < ActiveRecord::Base
 
   has_one :top_topic
   has_one :shared_draft, dependent: :destroy
+  has_one :published_page
 
   belongs_to :user
   belongs_to :last_poster, class_name: 'User', foreign_key: :last_post_user_id
diff --git a/app/models/user_history.rb b/app/models/user_history.rb
index 3adbb62eb1..49a545b815 100644
--- a/app/models/user_history.rb
+++ b/app/models/user_history.rb
@@ -103,7 +103,9 @@ class UserHistory < ActiveRecord::Base
       api_key_destroy: 82,
       revoke_title: 83,
       change_title: 84,
-      override_upload_secure_status: 85
+      override_upload_secure_status: 85,
+      page_published: 86,
+      page_unpublished: 87
     )
   end
 
@@ -183,7 +185,9 @@ class UserHistory < ActiveRecord::Base
       :api_key_create,
       :api_key_update,
       :api_key_destroy,
-      :override_upload_secure_status
+      :override_upload_secure_status,
+      :page_published,
+      :page_unpublished
     ]
   end
 
diff --git a/app/serializers/published_page_serializer.rb b/app/serializers/published_page_serializer.rb
new file mode 100644
index 0000000000..bdee8d14f7
--- /dev/null
+++ b/app/serializers/published_page_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class PublishedPageSerializer < ApplicationSerializer
+  attributes :id, :slug
+
+  def id
+    object.topic_id
+  end
+end
diff --git a/app/serializers/topic_view_details_serializer.rb b/app/serializers/topic_view_details_serializer.rb
index d21b1a778b..32a1737527 100644
--- a/app/serializers/topic_view_details_serializer.rb
+++ b/app/serializers/topic_view_details_serializer.rb
@@ -15,7 +15,8 @@ class TopicViewDetailsSerializer < ApplicationSerializer
      :can_flag_topic,
      :can_convert_topic,
      :can_review_topic,
-     :can_edit_tags]
+     :can_edit_tags,
+     :can_publish_page]
   end
 
   attributes(
@@ -133,6 +134,10 @@ class TopicViewDetailsSerializer < ApplicationSerializer
     !scope.can_edit?(object.topic) && scope.can_edit_tags?(object.topic)
   end
 
+  def include_can_publish_page?
+    scope.can_publish_page?(object.topic)
+  end
+
   def allowed_users
     object.topic.allowed_users.reject { |user| object.group_allowed_user_ids.include?(user.id) }
   end
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 824dfcb068..1aec5f442d 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -71,12 +71,14 @@ class TopicViewSerializer < ApplicationSerializer
     :pm_with_non_human_user,
     :queued_posts_count,
     :show_read_indicator,
-    :requested_group_name
+    :requested_group_name,
   )
 
   has_one :details, serializer: TopicViewDetailsSerializer, root: false, embed: :objects
   has_many :pending_posts, serializer: TopicPendingPostSerializer, root: false, embed: :objects
 
+  has_one :published_page, embed: :objects
+
   def details
     object
   end
@@ -273,4 +275,8 @@ class TopicViewSerializer < ApplicationSerializer
   def include_requested_group_name?
     object.personal_message
   end
+
+  def include_published_page?
+    SiteSetting.enable_page_publishing? && scope.is_staff? && object.published_page.present?
+  end
 end
diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb
index 9130f34692..117353cb17 100644
--- a/app/services/staff_action_logger.rb
+++ b/app/services/staff_action_logger.rb
@@ -728,6 +728,22 @@ class StaffActionLogger
     ))
   end
 
+  def log_published_page(topic_id, slug)
+    UserHistory.create!(params.merge(
+      subject: slug,
+      topic_id: topic_id,
+      action: UserHistory.actions[:page_published]
+    ))
+  end
+
+  def log_unpublished_page(topic_id, slug)
+    UserHistory.create!(params.merge(
+      subject: slug,
+      topic_id: topic_id,
+      action: UserHistory.actions[:page_unpublished]
+    ))
+  end
+
   private
 
   def get_changes(changes)
diff --git a/app/views/layouts/publish.html.erb b/app/views/layouts/publish.html.erb
new file mode 100644
index 0000000000..2b3d727dc7
--- /dev/null
+++ b/app/views/layouts/publish.html.erb
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, user-scalable=yes, viewport-fit=cover">
+    <%= discourse_stylesheet_link_tag 'publish', theme_ids: nil %>
+
+    <%- if @canonical_url -%>
+      <link rel="canonical" href="<%= @canonical_url %>" />
+    <%- end -%>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/published_pages/show.html.erb b/app/views/published_pages/show.html.erb
new file mode 100644
index 0000000000..08f5474b81
--- /dev/null
+++ b/app/views/published_pages/show.html.erb
@@ -0,0 +1,19 @@
+<div class="published-page">
+  <div class="published-page-header">
+    <h1 class="published-page-title"><%= @topic.title %></h1>
+
+    <div class="published-page-author">
+      <img src="<%= @topic.user.small_avatar_url %>" class="avatar">
+      <div class="published-page-author-details">
+        <div class="username"><%= @topic.user.username %></div>
+        <div class="topic-created-at"><%= short_date(@topic.created_at) %></div>
+      </div>
+    </div>
+
+    <%- if @topic.first_post.present? %>
+      <div class="published-page-body">
+        <%= @topic.first_post.cooked.html_safe %>
+      </div>
+    <%- end -%>
+  </div>
+</div>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 62cfd14763..7e28c6620d 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2439,6 +2439,19 @@ en:
         action: "merge selected posts"
         error: "There was an error merging the selected posts."
 
+      publish_page:
+        title: "Page Publishing"
+        publish: "Publish"
+        description: "When a topic is published as a page, its URL can be shared and it will displayed with custom styling."
+        slug: "Slug"
+        publish_url: "Your page has been published at:"
+        topic_published: "Your topic has been published at:"
+        preview_url: "Your page will be published at:"
+        invalid_slug: "Sorry, you can't publish this page."
+        unpublish: "Unpublish"
+        unpublished: "Your page has been unpublished and is no longer accessible."
+        publishing_settings: "Publishing Settings"
+
       change_owner:
         title: "Change Owner"
         action: "change ownership"
@@ -2591,6 +2604,7 @@ en:
         convert_to_moderator: "Add Staff Color"
         revert_to_regular: "Remove Staff Color"
         rebake: "Rebuild HTML"
+        publish_page: "Page Publishing"
         unhide: "Unhide"
         change_owner: "Change Ownership"
         grant_badge: "Grant Badge"
@@ -4083,6 +4097,8 @@ en:
             api_key_update: "api key update"
             api_key_destroy: "api key destroy"
             override_upload_secure_status: "override upload secure status"
+            page_published: "page published"
+            page_unpublished: "page unpublished"
         screened_emails:
           title: "Screened Emails"
           description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 5574f69ae8..f5f03a1b9d 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2107,6 +2107,7 @@ en:
     new_user_notice_tl: "Minimum trust level required to see new user post notices."
     returning_user_notice_tl: "Minimum trust level required to see returning user post notices."
     returning_users_days: "How many days should pass before a user is considered to be returning."
+    enable_page_publishing: "Allow staff members to publish topics to new URLs with their own styling."
 
     default_email_digest_frequency: "How often users receive summary emails by default."
     default_include_tl0_in_digests: "Include posts from new users in summary emails by default. Users can change this in their preferences."
@@ -2299,6 +2300,12 @@ en:
   change_owner:
     post_revision_text: "Ownership transferred"
 
+  publish_page:
+    slug_errors:
+      blank: "can't be blank"
+      unavailable: "is unavailable"
+      invalid: "contains invalid characters"
+
   topic_statuses:
     autoclosed_message_max_posts:
       one: "This message was automatically closed after reaching the maximum limit of %{count} reply."
diff --git a/config/routes.rb b/config/routes.rb
index 8306dcc40a..1a92a5440d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -45,6 +45,12 @@ Discourse::Application.routes.draw do
   get "finish-installation/confirm-email" => "finish_installation#confirm_email"
   put "finish-installation/resend-email" => "finish_installation#resend_email"
 
+  get "pub/check-slug" => "published_pages#check_slug"
+  get "pub/by-topic/:topic_id" => "published_pages#details"
+  put "pub/by-topic/:topic_id" => "published_pages#upsert"
+  delete "pub/by-topic/:topic_id" => "published_pages#destroy"
+  get "pub/:slug" => "published_pages#show"
+
   resources :directory_items
 
   get "site" => "site#site"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index ccbcc8150a..e2fc35aac4 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -933,6 +933,8 @@ posting:
     enum: "TrustLevelSetting"
   returning_users_days:
     default: 120
+  enable_page_publishing:
+    default: false
 
 email:
   email_time_window_mins:
diff --git a/db/migrate/20200401172023_create_published_pages.rb b/db/migrate/20200401172023_create_published_pages.rb
new file mode 100644
index 0000000000..201b08c9d6
--- /dev/null
+++ b/db/migrate/20200401172023_create_published_pages.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreatePublishedPages < ActiveRecord::Migration[6.0]
+  def change
+    create_table :published_pages do |t|
+      t.references :topic, null: false, index: { unique: true }
+      t.string :slug, null: false
+      t.timestamps
+    end
+
+    add_index :published_pages, :slug, unique: true
+  end
+end
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 851dddf881..00d496e46e 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -485,6 +485,14 @@ class Guardian
       (components - Theme.components_for(parent)).empty?
   end
 
+  def can_publish_page?(topic)
+    return false unless SiteSetting.enable_page_publishing?
+    return false if topic.blank?
+    return false if topic.private_message?
+    return false unless can_see_topic?(topic)
+    is_staff?
+  end
+
   def auth_token
     if cookie = request&.cookies[Auth::DefaultCurrentUserProvider::TOKEN_COOKIE]
       UserAuthToken.hash_token(cookie)
diff --git a/lib/stylesheet/watcher.rb b/lib/stylesheet/watcher.rb
index 384f7515d1..d2d49c2ab9 100644
--- a/lib/stylesheet/watcher.rb
+++ b/lib/stylesheet/watcher.rb
@@ -78,7 +78,7 @@ module Stylesheet
 
                 target = nil
                 if !plugin_name
-                  target_match = long.match(/admin|desktop|mobile/)
+                  target_match = long.match(/admin|desktop|mobile|publish/)
                   if target_match&.length
                     target = target_match[0]
                   end
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 94f31f44b1..82ae26c573 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -596,6 +596,10 @@ class TopicView
     ReviewableQueuedPost.viewable_by(@user).where(topic_id: @topic.id).pending.count
   end
 
+  def published_page
+    @topic.published_page
+  end
+
   protected
 
   def read_posts_set
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index bea0404696..97a1b0c2e0 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -3476,4 +3476,36 @@ describe Guardian do
       expect(guardian.auth_token).to eq(token.auth_token)
     end
   end
+
+  describe "can_publish_page?" do
+    context "when disabled" do
+      it "is false for staff" do
+        expect(Guardian.new(admin).can_publish_page?(topic)).to eq(false)
+      end
+    end
+
+    context "when enabled" do
+      before do
+        SiteSetting.enable_page_publishing = true
+      end
+
+      it "is false for anonymous users" do
+        expect(Guardian.new.can_publish_page?(topic)).to eq(false)
+      end
+
+      it "is false for regular users" do
+        expect(Guardian.new(user).can_publish_page?(topic)).to eq(false)
+      end
+
+      it "is true for staff" do
+        expect(Guardian.new(moderator).can_publish_page?(topic)).to eq(true)
+        expect(Guardian.new(admin).can_publish_page?(topic)).to eq(true)
+      end
+
+      it "is false if the topic is a private message" do
+        post = Fabricate(:private_message_post, user: admin)
+        expect(Guardian.new(admin).can_publish_page?(post.topic)).to eq(false)
+      end
+    end
+  end
 end
diff --git a/spec/fabricators/published_page_fabricator.rb b/spec/fabricators/published_page_fabricator.rb
new file mode 100644
index 0000000000..44f8da98da
--- /dev/null
+++ b/spec/fabricators/published_page_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:published_page) do
+  topic
+  slug "published-page-test"
+end
diff --git a/spec/models/published_page_spec.rb b/spec/models/published_page_spec.rb
new file mode 100644
index 0000000000..e863cdb473
--- /dev/null
+++ b/spec/models/published_page_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe PublishedPage, type: :model do
+
+  fab!(:topic) { Fabricate(:topic) }
+
+  it "has path and url helpers" do
+    pp = PublishedPage.create!(topic: topic, slug: 'hello-world')
+    expect(pp.path).to eq("/pub/hello-world")
+    expect(pp.url).to eq(Discourse.base_url + "/pub/hello-world")
+  end
+
+  it "validates the slug" do
+    expect(PublishedPage.new(topic: topic, slug: "this-is-valid")).to be_valid
+    expect(PublishedPage.new(topic: topic, slug: "10_things_i_hate_about_slugs")).to be_valid
+    expect(PublishedPage.new(topic: topic, slug: "YELLING")).to be_valid
+
+    expect(PublishedPage.new(topic: topic, slug: "how about some space")).not_to be_valid
+    expect(PublishedPage.new(topic: topic, slug: "slugs are %%%%")).not_to be_valid
+
+    expect(PublishedPage.new(topic: topic, slug: "check-slug")).not_to be_valid
+    expect(PublishedPage.new(topic: topic, slug: "by-topic")).not_to be_valid
+  end
+
+end
diff --git a/spec/requests/published_pages_controller_spec.rb b/spec/requests/published_pages_controller_spec.rb
new file mode 100644
index 0000000000..6b3a6894f4
--- /dev/null
+++ b/spec/requests/published_pages_controller_spec.rb
@@ -0,0 +1,170 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe PublishedPagesController do
+  fab!(:published_page) { Fabricate(:published_page) }
+  fab!(:admin) { Fabricate(:admin) }
+  fab!(:user) { Fabricate(:user) }
+
+  context "when enabled" do
+    before do
+      SiteSetting.enable_page_publishing = true
+    end
+
+    context "check slug availability" do
+      it "returns true for a new slug" do
+        get "/pub/check-slug.json?slug=cool-slug-man"
+        expect(response).to be_successful
+        expect(response.parsed_body["valid_slug"]).to eq(true)
+      end
+
+      it "returns true for a new slug with whitespace" do
+        get "/pub/check-slug.json?slug=cool-slug-man%20"
+        expect(response).to be_successful
+        expect(response.parsed_body["valid_slug"]).to eq(true)
+      end
+
+      it "returns false for an empty value" do
+        get "/pub/check-slug.json?slug="
+        expect(response).to be_successful
+        expect(response.parsed_body["valid_slug"]).to eq(false)
+        expect(response.parsed_body["reason"]).to be_present
+      end
+
+      it "returns false for a reserved value" do
+        get "/pub/check-slug.json", params: { slug: "check-slug" }
+        expect(response).to be_successful
+        expect(response.parsed_body["valid_slug"]).to eq(false)
+        expect(response.parsed_body["reason"]).to be_present
+      end
+    end
+
+    context "show" do
+      it "returns 404 for a missing article" do
+        get "/pub/no-article-here-no-thx"
+        expect(response.status).to eq(404)
+      end
+
+      context "private topic" do
+        fab!(:group) { Fabricate(:group) }
+        fab!(:private_category) { Fabricate(:private_category, group: group) }
+
+        before do
+          published_page.topic.update!(category: private_category)
+        end
+
+        it "returns 403 for a topic you can't see" do
+          get published_page.path
+          expect(response.status).to eq(403)
+        end
+
+        context "as an admin" do
+          before do
+            sign_in(admin)
+          end
+
+          it "returns 200" do
+            get published_page.path
+            expect(response.status).to eq(200)
+          end
+        end
+      end
+
+      it "returns an error for an article you can't see" do
+        get "/pub/no-article-here-no-thx"
+        expect(response.status).to eq(404)
+      end
+
+      it "returns 200 for a valid article" do
+        get published_page.path
+        expect(response.status).to eq(200)
+      end
+    end
+
+    context "publishing" do
+      fab!(:topic) { Fabricate(:topic) }
+
+      it "returns invalid access for non-staff" do
+        sign_in(user)
+        put "/pub/by-topic/#{topic.id}.json", params: { published_page: { slug: 'cant-do-this' } }
+        expect(response.status).to eq(403)
+      end
+
+      context "with a valid staff account" do
+        before do
+          sign_in(admin)
+        end
+
+        it "creates the published page record" do
+          put "/pub/by-topic/#{topic.id}.json", params: { published_page: { slug: 'i-hate-salt' } }
+          expect(response).to be_successful
+          expect(response.parsed_body['published_page']).to be_present
+          expect(response.parsed_body['published_page']['slug']).to eq("i-hate-salt")
+
+          expect(PublishedPage.exists?(topic_id: response.parsed_body['published_page']['id'])).to eq(true)
+          expect(UserHistory.exists?(
+            acting_user_id: admin.id,
+            action: UserHistory.actions[:page_published],
+            topic_id: topic.id
+          )).to be(true)
+        end
+
+        it "returns an error if the slug is already taken" do
+          PublishedPage.create!(slug: 'i-hate-salt', topic: Fabricate(:topic))
+          put "/pub/by-topic/#{topic.id}.json", params: { published_page: { slug: 'i-hate-salt' } }
+          expect(response).not_to be_successful
+        end
+
+        it "returns an error if the topic already has been published" do
+          PublishedPage.create!(slug: 'already-done-pal', topic: topic)
+          put "/pub/by-topic/#{topic.id}.json", params: { published_page: { slug: 'i-hate-salt' } }
+          expect(response).to be_successful
+          expect(PublishedPage.exists?(topic_id: topic.id)).to eq(true)
+        end
+
+      end
+    end
+
+    context "destroy" do
+
+      it "returns invalid access for non-staff" do
+        sign_in(user)
+        delete "/pub/by-topic/#{published_page.topic_id}.json"
+        expect(response.status).to eq(403)
+      end
+
+      context "with a valid staff account" do
+        before do
+          sign_in(admin)
+        end
+
+        it "deletes the record" do
+          topic_id = published_page.topic_id
+
+          delete "/pub/by-topic/#{topic_id}.json"
+          expect(response).to be_successful
+          expect(PublishedPage.exists?(slug: published_page.slug)).to eq(false)
+
+          expect(UserHistory.exists?(
+            acting_user_id: admin.id,
+            action: UserHistory.actions[:page_unpublished],
+            topic_id: topic_id
+          )).to be(true)
+        end
+      end
+    end
+  end
+
+  context "when disabled" do
+    before do
+      SiteSetting.enable_page_publishing = false
+    end
+
+    it "returns 404 for any article" do
+      get published_page.path
+      expect(response.status).to eq(404)
+    end
+  end
+
+end
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index b0627ab05f..a80f884812 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -258,6 +258,16 @@ describe TopicViewSerializer do
       expect(details[:allowed_groups].find { |ag| ag[:id] == group.id }).to be_present
     end
 
+    it "has can_publish_page if possible" do
+      SiteSetting.enable_page_publishing = true
+
+      json = serialize_topic(topic, user)
+      expect(json[:details][:can_publish_page]).to be_blank
+
+      json = serialize_topic(topic, admin)
+      expect(json[:details][:can_publish_page]).to eq(true)
+    end
+
     context "can_edit_tags" do
       before do
         SiteSetting.tagging_enabled = true
@@ -279,4 +289,26 @@ describe TopicViewSerializer do
     end
   end
 
+  context "published_page" do
+    fab!(:published_page) { Fabricate(:published_page, topic: topic) }
+
+    it "doesn't return the published page if not enabled" do
+      json = serialize_topic(topic, admin)
+      expect(json[:published_page]).to be_blank
+    end
+
+    it "doesn't return the published page unless staff" do
+      SiteSetting.enable_page_publishing = true
+      json = serialize_topic(topic, user)
+      expect(json[:published_page]).to be_blank
+    end
+
+    it "returns the published page if enabled and staff" do
+      SiteSetting.enable_page_publishing = true
+      json = serialize_topic(topic, admin)
+      expect(json[:published_page]).to be_present
+      expect(json[:published_page][:slug]).to eq("published-page-test")
+    end
+  end
+
 end
diff --git a/test/javascripts/acceptance/page-publishing-test.js b/test/javascripts/acceptance/page-publishing-test.js
new file mode 100644
index 0000000000..2b51229bb2
--- /dev/null
+++ b/test/javascripts/acceptance/page-publishing-test.js
@@ -0,0 +1,40 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Page Publishing", {
+  loggedIn: true,
+  pretend(server, helper) {
+    const validSlug = helper.response({ valid_slug: true });
+
+    server.put("/pub/by-topic/280", () => {
+      return helper.response({});
+    });
+    server.get("/pub/by-topic/280", () => {
+      return helper.response({});
+    });
+    server.get("/pub/check-slug", req => {
+      if (req.queryParams.slug === "internationalization-localization") {
+        return validSlug;
+      }
+      return helper.response({
+        valid_slug: false,
+        reason: "i don't need a reason"
+      });
+    });
+  }
+});
+QUnit.test("can publish a page via modal", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click(".topic-post:eq(0) button.show-more-actions");
+  await click(".topic-post:eq(0) button.show-post-admin-menu");
+  await click(".topic-post:eq(0) .publish-page");
+
+  await fillIn(".publish-slug", "bad-slug");
+  assert.ok(!exists(".valid-slug"));
+  assert.ok(exists(".invalid-slug"));
+  await fillIn(".publish-slug", "internationalization-localization");
+  assert.ok(exists(".valid-slug"));
+  assert.ok(!exists(".invalid-slug"));
+
+  await click(".publish-page");
+  assert.ok(exists(".current-url"));
+});
diff --git a/test/javascripts/fixtures/topic.js b/test/javascripts/fixtures/topic.js
index 7c380de3a0..dedf9814b8 100644
--- a/test/javascripts/fixtures/topic.js
+++ b/test/javascripts/fixtures/topic.js
@@ -1977,6 +1977,7 @@ export default {
     pinned: false,
     pinned_at: null,
     details: {
+      can_publish_page: true,
       can_invite_via_email: true,
       auto_close_at: null,
       auto_close_hours: null,

From 73d71e3feed0923f17673f5e7ddf0bd29ce8120e Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 8 Apr 2020 20:24:18 +0300
Subject: [PATCH 0559/1830] FEATURE: Show noscript view to unsupported browsers
 (#9373)

---
 app/assets/javascripts/browser-detect.js      |  3 +++
 app/assets/javascripts/discourse.js           |  4 ++++
 app/views/layouts/application.html.erb        |  2 ++
 config/application.rb                         |  1 +
 .../config/locales/server.en.yml              |  2 +-
 .../public/js/ie.js                           |  3 +++
 .../assets/javascripts/browser-update.js.erb  | 23 ++++++++++---------
 7 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 app/assets/javascripts/browser-detect.js

diff --git a/app/assets/javascripts/browser-detect.js b/app/assets/javascripts/browser-detect.js
new file mode 100644
index 0000000000..bdbbc27b3e
--- /dev/null
+++ b/app/assets/javascripts/browser-detect.js
@@ -0,0 +1,3 @@
+if (!window.WeakMap || !window.Promise) {
+  window.unsupportedBrowser = true;
+}
diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js
index 10fb7dd407..eea5c75640 100644
--- a/app/assets/javascripts/discourse.js
+++ b/app/assets/javascripts/discourse.js
@@ -6,6 +6,10 @@ import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import FocusEvent from "discourse-common/mixins/focus-event";
 import deprecated from "discourse-common/lib/deprecated";
 
+if (window.unsupportedBrowser) {
+  throw "Unsupported browser detected";
+}
+
 const _pluginCallbacks = [];
 
 const Discourse = Application.extend(FocusEvent, {
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 7340c45a46..22a29e19e4 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -19,6 +19,8 @@
 
     <%= build_plugin_html 'server:before-script-load' %>
 
+    <%= preload_script 'browser-detect' %>
+
     <%= preload_script "locales/#{I18n.locale}" %>
     <%- if ExtraLocalesController.client_overrides_exist? %>
       <%= preload_script_url ExtraLocalesController.url('overrides') %>
diff --git a/config/application.rb b/config/application.rb
index cf820c39dc..bad76c94f6 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -135,6 +135,7 @@ module Discourse
       vendor.js
       admin.js
       preload-store.js
+      browser-detect.js
       browser-update.js
       break_string.js
       ember_jquery.js
diff --git a/plugins/discourse-internet-explorer/config/locales/server.en.yml b/plugins/discourse-internet-explorer/config/locales/server.en.yml
index 6e1292efeb..03100823db 100644
--- a/plugins/discourse-internet-explorer/config/locales/server.en.yml
+++ b/plugins/discourse-internet-explorer/config/locales/server.en.yml
@@ -1,4 +1,4 @@
 en:
   site_settings:
-    discourse_internet_explorer_enabled: "Internet Explorer support"
+    discourse_internet_explorer_enabled: "Enable temporary Internet Explorer support. This plugin is an effort to maintain compatibility with older browsers and will be completely removed in the near future."
     discourse_internet_explorer_deprecation_warning: "Show an Internet Explorer deprecation warning"
diff --git a/plugins/discourse-internet-explorer/public/js/ie.js b/plugins/discourse-internet-explorer/public/js/ie.js
index 6c998e402a..168731d5ff 100644
--- a/plugins/discourse-internet-explorer/public/js/ie.js
+++ b/plugins/discourse-internet-explorer/public/js/ie.js
@@ -972,6 +972,9 @@ if (!String.prototype.startsWith) {
 /* eslint-enable */
 
 // Polyfill Promise - used by popper.js
+if (!window.Promise) {
+  window.Promise = true;
+}
 window.addEventListener(
   "load",
   function() {
diff --git a/vendor/assets/javascripts/browser-update.js.erb b/vendor/assets/javascripts/browser-update.js.erb
index 7309e8fdcf..b32410b8e6 100644
--- a/vendor/assets/javascripts/browser-update.js.erb
+++ b/vendor/assets/javascripts/browser-update.js.erb
@@ -4,24 +4,25 @@
 (function() {
 
 var $buo = function() {
-
-  var badAndroid = false, ua = null;
-
   // Sometimes we have to resort to parsing the user agent string. :(
   if (navigator && navigator.userAgent) {
-    ua = navigator.userAgent;
+    var ua = navigator.userAgent;
+
+    // we don't ask Googlebot to update their browser
+    if (ua.indexOf('Googlebot') >= 0 || ua.indexOf('Mediapartners') >= 0 || ua.indexOf('AdsBot') >= 0) {
+      return;
+    }
   }
 
-  // sam: we require WeakMap, this allows us to easily feature detect IE10 that does not support it
-  // This also catches ancient android phones that never had that feature (2.2 and below)
-  if (window.WeakMap) {
+  if (!window.unsupportedBrowser) {
     return;
   }
 
-  // we don't ask Googlebot to update their browser
-  if (ua.indexOf('Googlebot') >= 0 || ua.indexOf('Mediapartners') >= 0 || ua.indexOf('AdsBot') >= 0) {
-    return;
-  }
+  var mainElement = document.getElementById("main");
+  var noscriptElements = document.getElementsByTagName("noscript");
+  // noscriptElements[0].innerHTML contains encoded HTML
+  var innerHTML = noscriptElements[0].childNodes[0].nodeValue;
+  mainElement.innerHTML = innerHTML;
 
   // retrieve localized browser upgrade text
   var t = <%= "'" + I18n.t('js.browser_update') + "'" %>;

From abdc10ae7062a26233b26ce1fff69ba9a175e909 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Tue, 7 Apr 2020 12:10:39 -0700
Subject: [PATCH 0560/1830] FIX: Labels for modal close and dismiss-error
 buttons

---
 .../javascripts/discourse/templates/components/d-modal.hbs    | 4 ++--
 config/locales/client.en.yml                                  | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
index 6c6106bbad..9df8af3a17 100644
--- a/app/assets/javascripts/discourse/templates/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
@@ -3,7 +3,7 @@
     <div class="modal-inner-container">
       <div class="modal-header">
         {{#if dismissable}}
-          {{d-button icon="times" action=(route-action "closeModal") class="btn btn-flat modal-close close" }}
+          {{d-button icon="times" action=(route-action "closeModal") class="btn btn-flat modal-close close" title="modal.close"}}
         {{/if}}
 
         {{#if panels}}
@@ -33,7 +33,7 @@
 
       {{#each errors as |error|}}
         <div class="alert alert-error">
-          <button class="close" data-dismiss="alert">×</button>
+          <button class="close" data-dismiss="alert" aria-label={{i18n "modal.dismiss_error"}}>×</button>
           {{error}}
         </div>
       {{/each}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 7e28c6620d..9345ba5272 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1381,6 +1381,9 @@ en:
         back: "Go Back"
         again: "Try Again"
         fixed: "Load Page"
+    modal:
+      close: "close"
+      dismiss_error: "Dismiss error"
     close: "Close"
     assets_changed_confirm: "This site was just updated. Refresh now for the latest version?"
     logout: "You were logged out."

From 3b7ba8ec9987e740d08413a26518af6167eb23ae Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Tue, 7 Apr 2020 18:32:18 -0700
Subject: [PATCH 0561/1830] FIX: WCAG-AA compliant topic list heatmap colors

Color #ec7213: 3.0, Bold - AA Large Pass
Color #b06318: 4.50, Normal - AA Pass
Color #93704a: 4.51, Normal - AA Pass

Used the Chrome Inspector color picker curves to preserve the hue and make minimally invasive changes to the coloring.
---
 app/assets/stylesheets/common/base/_topic-list.scss | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 2ac61a4487..4250650446 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -212,15 +212,16 @@
 
 .heatmap-high,
 .heatmap-high a {
-  color: #fe7a15 !important;
+  color: #ec7213 !important;
+  font-weight: bold;
 }
 .heatmap-med,
 .heatmap-med a {
-  color: #cf7721 !important;
+  color: #b06318 !important;
 }
 .heatmap-low,
 .heatmap-low a {
-  color: #9b764f !important;
+  color: #93704a !important;
 }
 
 .loading .topic-list {

From c3593dd9e2125763832489b05715e42049e5e86a Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 8 Apr 2020 16:13:02 -0400
Subject: [PATCH 0562/1830] DEV: Replace jquery.putCursorAtEnd (#9390)

---
 .../discourse/components/composer-editor.js   |  7 ++--
 .../discourse/components/composer-title.js    | 12 ++----
 .../components/composer-user-selector.js      |  3 +-
 .../javascripts/discourse/lib/utilities.js    |  6 +++
 app/assets/javascripts/vendor.js              |  1 -
 .../javascripts/jquery.putcursoratend.js      | 38 -------------------
 6 files changed, 16 insertions(+), 51 deletions(-)
 delete mode 100644 vendor/assets/javascripts/jquery.putcursoratend.js

diff --git a/app/assets/javascripts/discourse/components/composer-editor.js b/app/assets/javascripts/discourse/components/composer-editor.js
index 4ff3b961b1..b14b0af74a 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/components/composer-editor.js
@@ -30,7 +30,8 @@ import {
   clipboardData,
   safariHacksDisabled,
   caretPosition,
-  inCodeBlock
+  inCodeBlock,
+  putCursorAtEnd
 } from "discourse/lib/utilities";
 import {
   validateUploadedFiles,
@@ -123,7 +124,7 @@ export default Component.extend({
   @observes("focusTarget")
   setFocus() {
     if (this.focusTarget === "editor") {
-      $(this.element.querySelector("textarea")).putCursorAtEnd();
+      putCursorAtEnd(this.element.querySelector("textarea"));
     }
   },
 
@@ -213,7 +214,7 @@ export default Component.extend({
       !this.get("composer.canEditTitle") &&
       (!this.capabilities.isIOS || safariHacksDisabled())
     ) {
-      $(this.element.querySelector(".d-editor-input")).putCursorAtEnd();
+      putCursorAtEnd(this.element.querySelector(".d-editor-input"));
     }
 
     this._bindUploadTarget();
diff --git a/app/assets/javascripts/discourse/components/composer-title.js b/app/assets/javascripts/discourse/components/composer-title.js
index 9ba4f501bf..e036beef1a 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js
+++ b/app/assets/javascripts/discourse/components/composer-title.js
@@ -5,9 +5,9 @@ import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { load } from "pretty-text/oneboxer";
 import { lookupCache } from "pretty-text/oneboxer-cache";
 import { ajax } from "discourse/lib/ajax";
-import afterTransition from "discourse/lib/after-transition";
 import ENV from "discourse-common/config/environment";
 import EmberObject from "@ember/object";
+import { putCursorAtEnd } from "discourse/lib/utilities";
 
 export default Component.extend({
   classNames: ["title-input"],
@@ -17,11 +17,7 @@ export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
     if (this.focusTarget === "title") {
-      const $input = $(this.element.querySelector("input"));
-
-      afterTransition($(this.element).closest("#reply-control"), () => {
-        $input.putCursorAtEnd();
-      });
+      putCursorAtEnd(this.element.querySelector("input"));
     }
 
     if (this.get("composer.titleLength") > 0) {
@@ -136,14 +132,14 @@ export default Component.extend({
           .finally(() => {
             this.set("composer.loading", false);
             schedule("afterRender", () => {
-              $(this.element.querySelector("input")).putCursorAtEnd();
+              putCursorAtEnd(this.element.querySelector("input"));
             });
           });
       } else {
         this._updatePost(loadOnebox);
         this.set("composer.loading", false);
         schedule("afterRender", () => {
-          $(this.element.querySelector("input")).putCursorAtEnd();
+          putCursorAtEnd(this.element.querySelector("input"));
         });
       }
     }
diff --git a/app/assets/javascripts/discourse/components/composer-user-selector.js b/app/assets/javascripts/discourse/components/composer-user-selector.js
index 913a9356f7..3418697207 100644
--- a/app/assets/javascripts/discourse/components/composer-user-selector.js
+++ b/app/assets/javascripts/discourse/components/composer-user-selector.js
@@ -1,6 +1,7 @@
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { putCursorAtEnd } from "discourse/lib/utilities";
 
 export default Component.extend({
   showSelector: true,
@@ -11,7 +12,7 @@ export default Component.extend({
     this._super(...arguments);
 
     if (this.focusTarget === "usernames") {
-      $(this.element.querySelector("input")).putCursorAtEnd();
+      putCursorAtEnd(this.element.querySelector("input"));
     }
   },
 
diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js
index 03ef200016..c753f4b0cf 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js
+++ b/app/assets/javascripts/discourse/lib/utilities.js
@@ -444,5 +444,11 @@ export function inCodeBlock(text, pos) {
   return result;
 }
 
+export function putCursorAtEnd(element) {
+  element.focus();
+  const len = element.value.length;
+  element.setSelectionRange(len, len);
+}
+
 // This prevents a mini racer crash
 export default {};
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index 3b36c27ea1..adc682eba5 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -17,7 +17,6 @@
 //= require jquery.cookie.js
 //= require jquery.fileupload.js
 //= require jquery.iframe-transport.js
-//= require jquery.putcursoratend.js
 //= require jquery.tagsinput.js
 //= require jquery.sortable.js
 //= require lodash.js
diff --git a/vendor/assets/javascripts/jquery.putcursoratend.js b/vendor/assets/javascripts/jquery.putcursoratend.js
deleted file mode 100644
index d957d03f74..0000000000
--- a/vendor/assets/javascripts/jquery.putcursoratend.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// jQuery plugin: PutCursorAtEnd 1.0
-// http://plugins.jquery.com/project/PutCursorAtEnd
-// by teedyay
-//
-// Puts the cursor at the end of a textbox/ textarea
-
-// codesnippet: 691e18b1-f4f9-41b4-8fe8-bc8ee51b48d4
-(function($)
-{
-    jQuery.fn.putCursorAtEnd = function()
-    {
-    return this.each(function()
-    {
-        $(this).focus()
-
-        // If this function exists...
-        if (this.setSelectionRange)
-        {
-        // ... then use it
-        // (Doesn't work in IE)
-
-        // Double the length because Opera is inconsistent about whether a carriage return is one character or two. Sigh.
-        var len = $(this).val().length * 2;
-        this.setSelectionRange(len, len);
-        }
-        else
-        {
-        // ... otherwise replace the contents with itself
-        // (Doesn't work in Google Chrome)
-        $(this).val($(this).val());
-        }
-
-        // Scroll to the bottom, in case we're in a tall textarea
-        // (Necessary for Firefox and Google Chrome)
-        this.scrollTop = 999999;
-    });
-    };
-})(jQuery);
\ No newline at end of file

From 14467757df40d1b80808cd6d41d60a92683599c8 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 8 Apr 2020 17:29:13 -0400
Subject: [PATCH 0563/1830] UX: Adjust noscript footer nav

---
 .../stylesheets/common/base/crawler_layout.scss  | 16 ++++++++++++++--
 app/views/layouts/application.html.erb           |  4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/common/base/crawler_layout.scss b/app/assets/stylesheets/common/base/crawler_layout.scss
index 61c12d2dbe..8f42f9ae0b 100644
--- a/app/assets/stylesheets/common/base/crawler_layout.scss
+++ b/app/assets/stylesheets/common/base/crawler_layout.scss
@@ -32,11 +32,23 @@ body.crawler {
   }
 
   footer {
-    margin-top: 3em;
-    border-top: 1px solid $primary-low-mid;
+    margin-top: 4em;
   }
 }
 
+.noscript-footer-nav {
+  clear: both;
+  margin-top: 4em;
+  a {
+    margin-right: 0.25em;
+    white-space: nowrap;
+  }
+}
+
+#noscript-footer {
+  padding: 0 10px;
+}
+
 .crawler-topic-title {
   margin-top: 0.5em;
 }
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 22a29e19e4..f1984038e7 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -73,7 +73,7 @@
         <!-- preload-content: -->
         <%= yield %>
         <!-- :preload-content -->
-        <footer>
+        <footer class="noscript-footer-nav">
           <nav itemscope itemtype='http://schema.org/SiteNavigationElement'>
             <a href='<%= path "/" %>'><%= t 'home_title' %></a>
             <%= link_to t('js.filters.categories.title'), path("/categories") %>
@@ -85,7 +85,7 @@
       </div>
 
       <footer id='noscript-footer'>
-        <p style="text-align:center;"><%= t 'powered_by_html' %></p>
+        <p><%= t 'powered_by_html' %></p>
       </footer>
     </noscript>
 

From 138d4aebde37f2f4cd2bb3efe8828f38680098da Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Wed, 8 Apr 2020 11:34:35 -0700
Subject: [PATCH 0564/1830] FEATURE: Webhooks and Event for user being granted
 a badge

Adding a webhook for badge revocation is left for future work as it's relatively rare.
---
 app/models/web_hook_event_type.rb          |  1 +
 app/services/badge_granter.rb              |  6 +++++-
 config/initializers/012-web_hook_events.rb | 10 +++++++++
 config/locales/client.en.yml               |  3 +++
 db/fixtures/007_web_hook_event_types.rb    |  5 +++++
 spec/fabricators/web_hook_fabricator.rb    |  8 +++++++
 spec/models/web_hook_spec.rb               | 25 ++++++++++++++++++++++
 7 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/app/models/web_hook_event_type.rb b/app/models/web_hook_event_type.rb
index d3822d1ede..952c1c2062 100644
--- a/app/models/web_hook_event_type.rb
+++ b/app/models/web_hook_event_type.rb
@@ -13,6 +13,7 @@ class WebHookEventType < ActiveRecord::Base
   NOTIFICATION = 10
   SOLVED = 11
   ASSIGN = 12
+  USER_BADGE = 13
 
   has_and_belongs_to_many :web_hooks
 
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index 2249b33692..c6dfd82170 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -410,7 +410,7 @@ class BadgeGranter
   end
 
   def self.send_notification(user_id, username, locale, badge)
-    I18n.with_locale(notification_locale(locale)) do
+    notification = I18n.with_locale(notification_locale(locale)) do
       Notification.create!(
         user_id: user_id,
         notification_type: Notification.types[:granted_badge],
@@ -423,6 +423,10 @@ class BadgeGranter
         }.to_json
       )
     end
+
+    DiscourseEvent.trigger(:user_badge_granted, badge, user_id)
+
+    notification
   end
 
 end
diff --git a/config/initializers/012-web_hook_events.rb b/config/initializers/012-web_hook_events.rb
index 6ce6501ff3..727119a627 100644
--- a/config/initializers/012-web_hook_events.rb
+++ b/config/initializers/012-web_hook_events.rb
@@ -74,6 +74,16 @@ end
   end
 end
 
+%i(
+  user_badge_granted
+).each do |event|
+  # user_badge_revoked
+  DiscourseEvent.on(event) do |badge, user_id|
+    ub = UserBadge.find_by(badge: badge, user_id: user_id)
+    WebHook.enqueue_object_hooks(:user_badge, ub, event, UserBadgeSerializer)
+  end
+end
+
 DiscourseEvent.on(:reviewable_created) do |reviewable|
   WebHook.enqueue_object_hooks(:reviewable, reviewable, :reviewable_created, reviewable.serializer)
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9345ba5272..f395e62717 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3562,6 +3562,9 @@ en:
         notification_event:
           name: "Notification Event"
           details: "When a user receives a notification in their feed."
+        user_badge_event:
+          name: "Badge Grant Event"
+          details: "When a user receives a badge."
         delivery_status:
           title: "Delivery Status"
           inactive: "Inactive"
diff --git a/db/fixtures/007_web_hook_event_types.rb b/db/fixtures/007_web_hook_event_types.rb
index 5cbcd3edc2..8bf8e93805 100644
--- a/db/fixtures/007_web_hook_event_types.rb
+++ b/db/fixtures/007_web_hook_event_types.rb
@@ -59,3 +59,8 @@ WebHookEventType.seed do |b|
   b.id = WebHookEventType::ASSIGN
   b.name = "assign"
 end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::USER_BADGE
+  b.name = "user_badge"
+end
diff --git a/spec/fabricators/web_hook_fabricator.rb b/spec/fabricators/web_hook_fabricator.rb
index 6d03c7b47f..4647251080 100644
--- a/spec/fabricators/web_hook_fabricator.rb
+++ b/spec/fabricators/web_hook_fabricator.rb
@@ -102,3 +102,11 @@ Fabricator(:notification_web_hook, from: :web_hook) do
     web_hook.web_hook_event_types = [transients[:notification_hook]]
   end
 end
+
+Fabricator(:user_badge_web_hook, from: :web_hook) do
+  transient user_badge_hook: WebHookEventType.find_by(name: 'user_badge')
+
+  after_build do |web_hook, transients|
+    web_hook.web_hook_event_types = [transients[:user_badge_hook]]
+  end
+end
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index 47b4c20bb7..586458a614 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -486,5 +486,30 @@ describe WebHook do
       payload = JSON.parse(job_args["payload"])
       expect(payload["id"]).to eq(reviewable.id)
     end
+
+    it 'should enqueue the right hooks for badge grants' do
+      Fabricate(:user_badge_web_hook)
+      badge = Fabricate(:badge)
+      badge.multiple_grant = true
+      badge.show_posts = true
+      badge.save
+
+      now = Time.now
+      freeze_time now
+
+      BadgeGranter.grant(badge, user, granted_by: admin, post_id: post.id)
+
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+      expect(job_args["event_name"]).to eq("user_badge_granted")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["badge_id"]).to eq(badge.id)
+      expect(payload["user_id"]).to eq(user.id)
+      expect(payload["granted_by_id"]).to eq(admin.id)
+      # be_within required because rounding occurs
+      expect(Time.zone.parse(payload["granted_at"]).to_f).to be_within(0.001).of(now.to_f)
+      expect(payload["post_id"]).to eq(post.id)
+
+      # Future work: revoke badge hook
+    end
   end
 end

From 452d0c868f30a8d4bcfcb6e254e0cb94d7325ee1 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 9 Apr 2020 09:42:03 +1000
Subject: [PATCH 0565/1830] FIX: Ensure first post is loaded before trying to
 bookmark topic (#9382)

Load first post if not loaded when trying to bookmark topic

* if the first post was not loaded we could not bookmark it because
  now we call the toggleBookmarkReminder function on an actual post
  to open the modal window
* add a firstPost function to the topic model to get the first post
  from the stream if it is loaded and if not do a GET request to load
  it
* use the firstPost promise when bookmarking topic
---
 .../discourse/controllers/topic.js            |  19 +--
 .../javascripts/discourse/models/topic.js     | 137 ++++++++++--------
 2 files changed, 80 insertions(+), 76 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/topic.js b/app/assets/javascripts/discourse/controllers/topic.js
index c273591100..49da4ed9f4 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js
+++ b/app/assets/javascripts/discourse/controllers/topic.js
@@ -453,22 +453,9 @@ export default Controller.extend(bufferedProperty("model"), {
     },
 
     editFirstPost() {
-      const postStream = this.get("model.postStream");
-      let firstPost = postStream.get("posts.firstObject");
-
-      if (firstPost.get("post_number") !== 1) {
-        const postId = postStream.findPostIdForPostNumber(1);
-        // try loading from identity map first
-        firstPost = postStream.findLoadedPost(postId);
-        if (firstPost === undefined) {
-          return this.get("model.postStream")
-            .loadPost(postId)
-            .then(post => {
-              this.send("editPost", post);
-            });
-        }
-      }
-      this.send("editPost", firstPost);
+      this.model
+        .firstPost()
+        .then(firstPost => this.send("editPost", firstPost));
     },
 
     // Post related methods
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index 41734e6e8f..5da7217819 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -1,4 +1,4 @@
-import EmberObject, { get } from "@ember/object";
+import EmberObject from "@ember/object";
 import { not, notEmpty, equal, and, or } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
 import { flushMap } from "discourse/models/store";
@@ -407,82 +407,99 @@ const Topic = RestModel.extend({
     }
   },
 
+  firstPost() {
+    const postStream = this.postStream;
+    let firstPost = postStream.get("posts.firstObject");
+
+    if (firstPost.post_number === 1) {
+      return Promise.resolve(firstPost);
+    }
+
+    const postId = postStream.findPostIdForPostNumber(1);
+
+    // try loading from identity map first
+    firstPost = postStream.findLoadedPost(postId);
+    if (firstPost) {
+      return Promise.resolve(firstPost);
+    }
+
+    return this.postStream.loadPost(postId);
+  },
+
   toggleBookmark() {
     if (this.bookmarking) {
       return Promise.resolve();
     }
     this.set("bookmarking", true);
-
-    const stream = this.postStream;
-    const posts = get(stream, "posts");
-    const firstPost =
-      posts && posts[0] && posts[0].get("post_number") === 1 && posts[0];
     const bookmark = !this.bookmarked;
+    let posts = this.postStream.posts;
 
-    const toggleBookmarkOnServer = () => {
-      if (bookmark) {
-        if (this.siteSettings.enable_bookmarks_with_reminders) {
-          return firstPost.toggleBookmarkWithReminder().then(() => {
-            this.set("bookmarking", false);
-            return this.afterTopicBookmarked(firstPost);
-          });
+    return this.firstPost().then(firstPost => {
+      const toggleBookmarkOnServer = () => {
+        if (bookmark) {
+          if (this.siteSettings.enable_bookmarks_with_reminders) {
+            return firstPost.toggleBookmarkWithReminder().then(() => {
+              this.set("bookmarking", false);
+              return this.afterTopicBookmarked(firstPost);
+            });
+          } else {
+            return ajax(`/t/${this.id}/bookmark`, { type: "PUT" })
+              .then(() => {
+                this.toggleProperty("bookmarked");
+                return this.afterTopicBookmarked(firstPost);
+              })
+              .catch(popupAjaxError)
+              .finally(() => this.set("bookmarking", false));
+          }
         } else {
-          return ajax(`/t/${this.id}/bookmark`, { type: "PUT" })
+          return ajax(`/t/${this.id}/remove_bookmarks`, { type: "PUT" })
             .then(() => {
               this.toggleProperty("bookmarked");
-              return this.afterTopicBookmarked(firstPost);
+              if (posts) {
+                const updated = [];
+                posts.forEach(post => {
+                  if (post.bookmarked) {
+                    post.set("bookmarked", false);
+                    updated.push(post.id);
+                  }
+                  if (
+                    this.siteSettings.enable_bookmarks_with_reminders &&
+                    post.bookmarked_with_reminder
+                  ) {
+                    post.set("bookmarked_with_reminder", false);
+                    updated.push(post.id);
+                  }
+                });
+                return updated;
+              }
             })
             .catch(popupAjaxError)
             .finally(() => this.set("bookmarking", false));
         }
-      } else {
-        return ajax(`/t/${this.id}/remove_bookmarks`, { type: "PUT" })
-          .then(() => {
-            this.toggleProperty("bookmarked");
-            if (posts) {
-              const updated = [];
-              posts.forEach(post => {
-                if (post.get("bookmarked")) {
-                  post.set("bookmarked", false);
-                  updated.push(post.id);
-                }
-                if (
-                  this.siteSettings.enable_bookmarks_with_reminders &&
-                  post.get("bookmarked_with_reminder")
-                ) {
-                  post.set("bookmarked_with_reminder", false);
-                  updated.push(post.id);
-                }
-              });
-              return updated;
-            }
-          })
-          .catch(popupAjaxError)
-          .finally(() => this.set("bookmarking", false));
-      }
-    };
+      };
 
-    const unbookmarkedPosts = [];
-    if (!bookmark && posts) {
-      posts.forEach(
-        post =>
-          (post.get("bookmarked") || post.get("bookmarked_with_reminder")) &&
-          unbookmarkedPosts.push(post)
-      );
-    }
-
-    return new Promise(resolve => {
-      if (unbookmarkedPosts.length > 1) {
-        bootbox.confirm(
-          I18n.t("bookmarks.confirm_clear"),
-          I18n.t("no_value"),
-          I18n.t("yes_value"),
-          confirmed =>
-            confirmed ? toggleBookmarkOnServer().then(resolve) : resolve()
+      const unbookmarkedPosts = [];
+      if (!bookmark && posts) {
+        posts.forEach(
+          post =>
+            (post.bookmarked || post.bookmarked_with_reminder) &&
+            unbookmarkedPosts.push(post)
         );
-      } else {
-        toggleBookmarkOnServer().then(resolve);
       }
+
+      return new Promise(resolve => {
+        if (unbookmarkedPosts.length > 1) {
+          bootbox.confirm(
+            I18n.t("bookmarks.confirm_clear"),
+            I18n.t("no_value"),
+            I18n.t("yes_value"),
+            confirmed =>
+              confirmed ? toggleBookmarkOnServer().then(resolve) : resolve()
+          );
+        } else {
+          toggleBookmarkOnServer().then(resolve);
+        }
+      });
     });
   },
 

From f062ebf27473afe1adc26256650fa95d71bcc946 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 9 Apr 2020 10:05:22 +1000
Subject: [PATCH 0566/1830] DEV: reduce noise in logs regarding migration

If a migration performs no changes it should not output stuff.

Previously we would output information about seeds which was very noisy.

On multisite this was particularly bad
---
 lib/tasks/db.rake | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index df830da6ac..14b2eb4e20 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -75,13 +75,11 @@ task 'db:migrate' => ['load_config', 'environment', 'set_locale'] do |_, args|
     Rake::Task['db:_dump'].invoke
   end
 
+  SeedFu.quiet = true
   SeedFu.seed(DiscoursePluginRegistry.seed_paths)
 
   if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
-    puts
-    print "Optimizing site icons... "
     SiteIconManager.ensure_optimized!
-    puts "Done"
   end
 
   if !Discourse.is_parallel_test? && MultisiteTestHelpers.load_multisite?

From befaf39aca3af22756a988134245bf1a88a7481d Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 9 Apr 2020 10:30:26 +1000
Subject: [PATCH 0567/1830] DEV: Refactor and test plugin addKeyboardShortcut
 (#9381)

Refactor plugin-api `addKeyboardShortcut` to point to `KeyboardShortcuts`.
* Do not add shortcuts to the default object directly.
* Create an addShortcut function in keyboard-shortcuts to add shortcuts safely and call to bindKey to be able to use opts.
* Refactor controllers/bookmark.js to use new addShortcut func and emove unnecessary addBindings.
* No longer export keyboard shortcut bindings, rename to DEFAULT_BINDINGS and remove export, these do not need to be accessed by anything else.
---
 .../discourse/controllers/bookmark.js         | 17 +++---
 .../discourse/lib/keyboard-shortcuts.js       | 46 +++++++++-------
 .../javascripts/discourse/lib/plugin-api.js   | 12 ++---
 .../plugin-keyboard-shortcut-test.js          | 54 +++++++++++++++++++
 .../components/keyboard-shortcuts-test.js     |  6 +--
 5 files changed, 99 insertions(+), 36 deletions(-)
 create mode 100644 test/javascripts/acceptance/plugin-keyboard-shortcut-test.js

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 140b6f8597..22218715b3 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -113,20 +113,23 @@ export default Controller.extend(ModalFunctionality, {
 
   bindKeyboardShortcuts() {
     KeyboardShortcuts.pause(GLOBAL_SHORTCUTS_TO_PAUSE);
-    KeyboardShortcuts.addBindings(BOOKMARK_BINDINGS, binding => {
-      if (binding.args) {
-        return this.send(binding.handler, ...binding.args);
-      }
-      this.send(binding.handler);
+    Object.keys(BOOKMARK_BINDINGS).forEach(shortcut => {
+      KeyboardShortcuts.addShortcut(shortcut, () => {
+        let binding = BOOKMARK_BINDINGS[shortcut];
+        if (binding.args) {
+          return this.send(binding.handler, ...binding.args);
+        }
+        this.send(binding.handler);
+      });
     });
   },
 
   unbindKeyboardShortcuts() {
-    KeyboardShortcuts.unbind(BOOKMARK_BINDINGS, this.mouseTrap);
+    KeyboardShortcuts.unbind(BOOKMARK_BINDINGS);
   },
 
   restoreGlobalShortcuts() {
-    KeyboardShortcuts.unpause(...GLOBAL_SHORTCUTS_TO_PAUSE);
+    KeyboardShortcuts.unpause(GLOBAL_SHORTCUTS_TO_PAUSE);
   },
 
   // we always want to save the bookmark unless the user specifically
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index 37fe28618c..db3400cabd 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -6,7 +6,7 @@ import { ajax } from "discourse/lib/ajax";
 import { throttle } from "@ember/runloop";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 
-export let bindings = {
+const DEFAULT_BINDINGS = {
   "!": { postAction: "showFlags" },
   "#": { handler: "goToPost", anonymous: true },
   "/": { handler: "toggleSearch", anonymous: true },
@@ -96,18 +96,21 @@ export default {
 
     // Disable the shortcut if private messages are disabled
     if (!siteSettings.enable_personal_messages) {
-      delete bindings["g m"];
+      delete DEFAULT_BINDINGS["g m"];
     }
   },
 
   bindEvents() {
-    Object.keys(bindings).forEach(key => {
+    Object.keys(DEFAULT_BINDINGS).forEach(key => {
       this.bindKey(key);
     });
   },
 
-  bindKey(key) {
-    const binding = bindings[key];
+  bindKey(key, binding = null) {
+    if (!binding) {
+      binding = DEFAULT_BINDINGS[key];
+    }
+
     if (!binding.anonymous && !this.currentUser) {
       return;
     }
@@ -135,23 +138,28 @@ export default {
   },
 
   // restore global shortcuts that you have paused
-  unpause(...combinations) {
+  unpause(combinations) {
     combinations.forEach(combo => this.bindKey(combo));
   },
 
-  // add bindings to the key trapper, if none is specified then
-  // the shortcuts will be bound globally.
-  addBindings(newBindings, callback) {
-    Object.keys(newBindings).forEach(key => {
-      let binding = newBindings[key];
-      this.keyTrapper.bind(key, event => {
-        // usually the caller that is adding the binding
-        // will want to decide what to do with it when the
-        // event is fired
-        callback(binding, event);
-        event.stopPropagation();
-      });
-    });
+  /**
+   * addShortcut(shortcut, callback, opts)
+   *
+   * Used to bind a keyboard shortcut, which will fire the provided
+   * callback when pressed. Valid options are:
+   *
+   * - global     - makes the shortcut work anywhere, including when an input is focused
+   * - anonymous  - makes the shortcut work even if a user is not logged in
+   * - path       - a specific path to limit the shortcut to .e.g /latest
+   * - postAction - binds the shortcut to fire the specified post action when a
+   *                post is selected
+   **/
+  addShortcut(shortcut, callback, opts = {}) {
+    // we trim but leave whitespace between characters, as shortcuts
+    // like `z z` are valid for Mousetrap
+    shortcut = shortcut.trim();
+    let newBinding = Object.assign({ handler: callback }, opts);
+    this.bindKey(shortcut, newBinding);
   },
 
   // unbinds all the shortcuts in a key binding object e.g.
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js b/app/assets/javascripts/discourse/lib/plugin-api.js
index b0594f7b8d..6df49e453d 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js
@@ -1,4 +1,3 @@
-/*global Mousetrap:true*/
 import deprecated from "discourse-common/lib/deprecated";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { addDecorator } from "discourse/widgets/post-cooked";
@@ -52,7 +51,7 @@ import { addCategorySortCriteria } from "discourse/components/edit-category-sett
 import { queryRegistry } from "discourse/widgets/widget";
 import Composer from "discourse/models/composer";
 import { on } from "@ember/object/evented";
-import KeyboardShortcuts, { bindings } from "discourse/lib/keyboard-shortcuts";
+import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 
 // If you add any methods to the API ensure you bump up this number
 const PLUGIN_API_VERSION = "0.8.40";
@@ -230,12 +229,11 @@ class PluginApi {
     }
   }
 
+  /**
+   * See KeyboardShortcuts.addShortcut documentation.
+   **/
   addKeyboardShortcut(shortcut, callback, opts = {}) {
-    shortcut = shortcut.trim().replace(/\s/g, ""); // Strip all whitespace
-    let newBinding = {};
-    newBinding[shortcut] = Object.assign({ handler: callback }, opts);
-    Object.assign(bindings, newBinding);
-    KeyboardShortcuts.bindEvents(Mousetrap, this.container);
+    KeyboardShortcuts.addShortcut(shortcut, callback, opts);
   }
 
   /**
diff --git a/test/javascripts/acceptance/plugin-keyboard-shortcut-test.js b/test/javascripts/acceptance/plugin-keyboard-shortcut-test.js
new file mode 100644
index 0000000000..3541bb26b0
--- /dev/null
+++ b/test/javascripts/acceptance/plugin-keyboard-shortcut-test.js
@@ -0,0 +1,54 @@
+import { acceptance } from "helpers/qunit-helpers";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
+import KeyboardShortcutInitializer from "discourse/initializers/keyboard-shortcuts";
+
+function initKeyboardShortcuts() {
+  // this is here because initializers/keyboard-shortcuts is not
+  // firing for this acceptance test, and it needs to be fired before
+  // more keyboard shortcuts can be added
+  KeyboardShortcutInitializer.initialize(Discourse.__container__);
+}
+
+acceptance("Plugin Keyboard Shortcuts - Logged In", {
+  loggedIn: true
+});
+
+test("a plugin can add a keyboard shortcut", async assert => {
+  initKeyboardShortcuts();
+  withPluginApi("0.8.38", api => {
+    api.addKeyboardShortcut("]", () => {
+      $("#qunit-fixture").html(
+        "<div id='added-element'>Test adding plugin shortcut</div>"
+      );
+    });
+  });
+
+  await visit("/t/this-is-a-test-topic/9");
+  await keyEvent(document, "keypress", "]".charCodeAt(0));
+  assert.equal(
+    $("#added-element").length,
+    1,
+    "the keyboard shortcut callback fires successfully"
+  );
+});
+
+acceptance("Plugin Keyboard Shortcuts - Anonymous", {
+  loggedIn: false
+});
+
+test("a plugin can add a keyboard shortcut with an option", async assert => {
+  var spy = sandbox.spy(KeyboardShortcuts, "_bindToPath");
+  initKeyboardShortcuts();
+  withPluginApi("0.8.38", api => {
+    api.addKeyboardShortcut("]", () => {}, {
+      anonymous: true,
+      path: "test-path"
+    });
+  });
+
+  assert.ok(
+    spy.calledWith("test-path", "]"),
+    "bindToPath is called due to options provided"
+  );
+});
diff --git a/test/javascripts/components/keyboard-shortcuts-test.js b/test/javascripts/components/keyboard-shortcuts-test.js
index d7f60a85c0..025bec5ecf 100644
--- a/test/javascripts/components/keyboard-shortcuts-test.js
+++ b/test/javascripts/components/keyboard-shortcuts-test.js
@@ -74,7 +74,7 @@ Object.keys(pathBindings).forEach(path => {
   var testName = binding + " goes to " + path;
 
   test(testName, function(assert) {
-    KeyboardShortcuts.bindEvents(testMouseTrap, Discourse.__container__);
+    KeyboardShortcuts.bindEvents();
     testMouseTrap.trigger(binding);
 
     assert.ok(DiscourseURL.routeTo.calledWith(path));
@@ -89,7 +89,7 @@ Object.keys(clickBindings).forEach(selector => {
   var testName = binding + " clicks on " + selector;
 
   test(testName, function(assert) {
-    KeyboardShortcuts.bindEvents(testMouseTrap, Discourse.__container__);
+    KeyboardShortcuts.bindEvents();
     $(selector).on("click", function() {
       assert.ok(true, selector + " was clicked");
     });
@@ -109,7 +109,7 @@ Object.keys(functionBindings).forEach(func => {
     sandbox.stub(KeyboardShortcuts, func, function() {
       assert.ok(true, func + " is called when " + binding + " is triggered");
     });
-    KeyboardShortcuts.bindEvents(testMouseTrap, Discourse.__container__);
+    KeyboardShortcuts.bindEvents();
 
     testMouseTrap.trigger(binding);
   });

From 708dd97dfd0380c703678a0ee070dc62880e57f1 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 9 Apr 2020 11:58:02 +1000
Subject: [PATCH 0568/1830] PERF: speed up migrations on multisite

Previously we were migrating multisites serially, this is extremely slow
especially when 200 dbs are involved.

The new implementation defaults to running 20 migrations concurrently, leading
to a 20x speedup.

We also amended it so errors are printed out last, something that makes
debugging failures easier.

This is code specific to Discourse cause we integrate SeedFu with our
migrations and can not include this in the multisite gem.
---
 lib/tasks/db.rake | 65 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 14b2eb4e20..027483f39d 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -66,6 +66,71 @@ task 'db:rollback' => ['environment', 'set_locale'] do |_, args|
   Rake::Task['db:_dump'].invoke
 end
 
+# our optimized version of multisite migrate, we have many sites and we have seeds
+# this ensures we can run migrations concurrently to save huge amounts of time
+Rake::Task['multisite:migrate'].clear
+
+task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |_, args|
+  if ENV["RAILS_ENV"] != "production"
+    raise "Multisite migrate is only supported in production"
+  end
+
+  concurrency = (ENV['MIGRATE_CONCURRENCY'].presence || "20").to_i
+
+  puts "Multisite migrator is running using #{concurrency} threads"
+  puts
+
+  queue = Queue.new
+  exceptions = Queue.new
+
+  RailsMultisite::ConnectionManagement.each_connection do |db|
+    queue << db
+  end
+
+  concurrency.times { queue << :done }
+
+  SeedFu.quiet = true
+
+  (1..concurrency).map do
+    Thread.new {
+      while true
+        db = queue.pop
+        break if db == :done
+
+        RailsMultisite::ConnectionManagement.with_connection(db) do
+          begin
+            puts "Migrating #{db}"
+            ActiveRecord::Tasks::DatabaseTasks.migrate
+            SeedFu.seed(DiscoursePluginRegistry.seed_paths)
+            if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
+              SiteIconManager.ensure_optimized!
+            end
+          rescue => e
+            exceptions << [db, e]
+          end
+        end
+      end
+    }
+  end.each(&:join)
+
+  if exceptions.length > 0
+    STDERR.puts
+    STDERR.puts "-" * 80
+    STDERR.puts "#{exceptions.length} migrations failed!"
+    while !exceptions.empty?
+      db, e = exceptions.pop
+      STDERR.puts
+      STDERR.puts "Failed to migrate #{db}"
+      STDERR.puts e.inspect
+      STDERR.puts e.backtrace
+      STDERR.puts
+    end
+    exit 1
+  end
+
+  Rake::Task['db:_dump'].invoke
+end
+
 # we need to run seed_fu every time we run rake db:migrate
 task 'db:migrate' => ['load_config', 'environment', 'set_locale'] do |_, args|
 

From a5b582f686c0a8427aad3f6caf9f3a8105e66ee9 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 9 Apr 2020 12:50:14 +1000
Subject: [PATCH 0569/1830] DEV: demux stdout when running multisite migrate

This avoids mixing up output in such a way that we can not tell which
site ran which migrations

Avoids threads all fighting for output
---
 lib/tasks/db.rake | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 027483f39d..6b1a8b657b 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -70,6 +70,25 @@ end
 # this ensures we can run migrations concurrently to save huge amounts of time
 Rake::Task['multisite:migrate'].clear
 
+class StdOutDemux
+  def initialize(stdout)
+    @stdout = stdout
+    @data = {}
+  end
+
+  def write(data)
+    (@data[Thread.current] ||= +"") << data
+  end
+
+  def finish_chunk
+    data = @data[Thread.current]
+    if data
+      @stdout.write(data)
+      @data.delete Thread.current
+    end
+  end
+end
+
 task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |_, args|
   if ENV["RAILS_ENV"] != "production"
     raise "Multisite migrate is only supported in production"
@@ -83,6 +102,9 @@ task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |
   queue = Queue.new
   exceptions = Queue.new
 
+  old_stdout = $stdout
+  $stdout = StdOutDemux.new($stdout)
+
   RailsMultisite::ConnectionManagement.each_connection do |db|
     queue << db
   end
@@ -107,12 +129,21 @@ task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |
             end
           rescue => e
             exceptions << [db, e]
+          ensure
+            begin
+              $stdout.finish_chunk
+            rescue => ex
+              STDERR.puts ex.inspect
+              STDERR.puts ex.backtrace
+            end
           end
         end
       end
     }
   end.each(&:join)
 
+  $stdout = old_stdout
+
   if exceptions.length > 0
     STDERR.puts
     STDERR.puts "-" * 80

From 6b192d29fa095e91cb40b71e76dfc811f4aa205c Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 9 Apr 2020 13:41:03 +1000
Subject: [PATCH 0570/1830] DEV: only enable SafeMigrate in development and
 test

SafeMigrate outputs text when we detect attempts to unsafely drop tables
and columns

It is unfortunately not thread safe

This is not needed in production as we would have already caught it by then
in our test suite.
---
 lib/freedom_patches/safe_migrations.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/freedom_patches/safe_migrations.rb b/lib/freedom_patches/safe_migrations.rb
index 718ffffb89..161d9fa8a7 100644
--- a/lib/freedom_patches/safe_migrations.rb
+++ b/lib/freedom_patches/safe_migrations.rb
@@ -2,4 +2,11 @@
 
 require_dependency 'migration/safe_migrate'
 
-Migration::SafeMigrate.patch_active_record!
+# We do not run this in production cause it is intrusive and has
+# potential to break stuff, it also breaks under concurrent use
+# which rake:multisite_migrate uses
+#
+# The protection is only needed in Dev and Test
+if ENV['RAILS_ENV'] != "production"
+  Migration::SafeMigrate.patch_active_record!
+end

From de5f2d33087c8e9c12f83d573015d275098bd68f Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 9 Apr 2020 13:54:18 +1000
Subject: [PATCH 0571/1830] DEV: avoid loading module in production

---
 lib/freedom_patches/safe_migrations.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/freedom_patches/safe_migrations.rb b/lib/freedom_patches/safe_migrations.rb
index 161d9fa8a7..cdf989fdd5 100644
--- a/lib/freedom_patches/safe_migrations.rb
+++ b/lib/freedom_patches/safe_migrations.rb
@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require_dependency 'migration/safe_migrate'
-
 # We do not run this in production cause it is intrusive and has
 # potential to break stuff, it also breaks under concurrent use
 # which rake:multisite_migrate uses
 #
 # The protection is only needed in Dev and Test
 if ENV['RAILS_ENV'] != "production"
+  require_dependency 'migration/safe_migrate'
   Migration::SafeMigrate.patch_active_record!
 end

From 80e832662b719425872e7ac3736fb9fc56d85aca Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 9 Apr 2020 14:36:01 +1000
Subject: [PATCH 0572/1830] DEV: fake stdout must respond to close

If it does not respond to close Logger will refuse to use it
---
 lib/tasks/db.rake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 6b1a8b657b..81087473a0 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -80,6 +80,10 @@ class StdOutDemux
     (@data[Thread.current] ||= +"") << data
   end
 
+  def close
+    finish_chunk
+  end
+
   def finish_chunk
     data = @data[Thread.current]
     if data

From bedefd2e8aa45a86b8d6ae5d417232044000456b Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Thu, 9 Apr 2020 14:51:57 +1000
Subject: [PATCH 0573/1830] Fix broken bookmark translations for French

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

diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index f5ff9f75b8..dec75c46b7 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -271,11 +271,11 @@ fr:
       no_timezone: 'Vous n&#39;avez pas encore défini de fuseau horaire. Vous ne pourrez pas définir de rappels. Configurez-en un <a href="%{basePath}/my/preferences/profile">dans votre profil</a>.'
       reminders:
         at_desktop: "La prochaine fois je suis à mon bureau"
-        later_today: "Plus tard dans la journée<br/>{{date}}"
-        next_business_day: "Prochain jour ouvré<br/>{{date}}"
-        tomorrow: "Demain<br/>{{date}}"
-        next_week: "La semaine prochaine<br/>{{date}}"
-        next_month: "Le mois prochain<br/>{{date}}"
+        later_today: "Plus tard dans la journée"
+        next_business_day: "Prochain jour ouvré"
+        tomorrow: "Demain"
+        next_week: "La semaine prochaine"
+        next_month: "Le mois prochain"
         custom: "Date et heure personnalisés"
     drafts:
       resume: "Reprendre"

From 1cd8c6ce4caf15c4d0bd27077dcfc2592f7d1974 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Thu, 9 Apr 2020 11:47:59 +0300
Subject: [PATCH 0574/1830] FIX: Detect more unsupported browsers

---
 app/assets/javascripts/browser-detect.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/browser-detect.js b/app/assets/javascripts/browser-detect.js
index bdbbc27b3e..57fb1e7f6c 100644
--- a/app/assets/javascripts/browser-detect.js
+++ b/app/assets/javascripts/browser-detect.js
@@ -1,3 +1,3 @@
-if (!window.WeakMap || !window.Promise) {
+if (!window.WeakMap || !window.WeakSet || !window.Promise) {
   window.unsupportedBrowser = true;
 }

From 3d9c320aabd54c3cce1bb4e9f29769f0d7c4c9ab Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Thu, 9 Apr 2020 15:42:24 +0300
Subject: [PATCH 0575/1830] PERF: Cache Category.subcategory_ids (#9350)

Also reset category cache after backup restore.
---
 app/models/category.rb                        | 44 ++++++++++++-------
 app/models/topic.rb                           | 10 ++---
 .../initializers/014-track-setting-changes.rb |  2 +
 lib/backup_restore/restorer.rb                |  7 +++
 lib/topic_query.rb                            |  7 +--
 5 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index 5fb020c556..44d115cad0 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -74,6 +74,7 @@ class Category < ActiveRecord::Base
   after_save :publish_discourse_stylesheet
   after_save :publish_category
   after_save :reset_topic_ids_cache
+  after_save :clear_subcategory_ids
   after_save :clear_url_cache
   after_save :index_search
   after_save :update_reviewables
@@ -153,23 +154,36 @@ class Category < ActiveRecord::Base
     Category.reset_topic_ids_cache
   end
 
+  @@subcategory_ids = DistributedCache.new('subcategory_ids')
+
   def self.subcategory_ids(category_id)
-    sql = <<~SQL
-        WITH RECURSIVE subcategories AS (
-            SELECT :category_id id, 1 depth
-            UNION
-            SELECT categories.id, (subcategories.depth + 1) depth
-            FROM categories
-            JOIN subcategories ON subcategories.id = categories.parent_category_id
-            WHERE subcategories.depth < :max_category_nesting
+    @@subcategory_ids[category_id] ||=
+      begin
+        sql = <<~SQL
+            WITH RECURSIVE subcategories AS (
+                SELECT :category_id id, 1 depth
+                UNION
+                SELECT categories.id, (subcategories.depth + 1) depth
+                FROM categories
+                JOIN subcategories ON subcategories.id = categories.parent_category_id
+                WHERE subcategories.depth < :max_category_nesting
+            )
+            SELECT id FROM subcategories
+          SQL
+        DB.query_single(
+          sql,
+          category_id: category_id,
+          max_category_nesting: SiteSetting.max_category_nesting
         )
-        SELECT id FROM subcategories
-      SQL
-    DB.query_single(
-      sql,
-      category_id: category_id.to_i,
-      max_category_nesting: SiteSetting.max_category_nesting
-    )
+      end
+  end
+
+  def self.clear_subcategory_ids
+    @@subcategory_ids.clear
+  end
+
+  def clear_subcategory_ids
+    Category.clear_subcategory_ids
   end
 
   def self.scoped_to_permissions(guardian, permission_types)
diff --git a/app/models/topic.rb b/app/models/topic.rb
index dd9460ce3a..d080fbee32 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -191,9 +191,7 @@ class Topic < ActiveRecord::Base
   }
 
   scope :in_category_and_subcategories, lambda { |category_id|
-    where("topics.category_id = ? OR topics.category_id IN (SELECT id FROM categories WHERE categories.parent_category_id = ?)",
-        category_id,
-        category_id) if category_id
+    where("topics.category_id IN (?)", Category.subcategory_ids(category_id.to_i)) if category_id
   }
 
   scope :with_subtype, ->(subtype) { where('topics.subtype = ?', subtype) }
@@ -1296,7 +1294,7 @@ class Topic < ActiveRecord::Base
     builder = DB.build(sql)
     builder.where("t.created_at >= :start_date", start_date: opts[:start_date]) if opts[:start_date]
     builder.where("t.created_at < :end_date", end_date: opts[:end_date]) if opts[:end_date]
-    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(opts[:category_id])) if opts[:category_id]
+    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(opts[:category_id].to_i)) if opts[:category_id]
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.where("p.deleted_at IS NULL")
@@ -1335,7 +1333,7 @@ class Topic < ActiveRecord::Base
     builder = DB.build(WITH_NO_RESPONSE_SQL)
     builder.where("t.created_at >= :start_date", start_date: start_date) if start_date
     builder.where("t.created_at < :end_date", end_date: end_date) if end_date
-    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(category_id)) if category_id
+    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(category_id.to_i)) if category_id
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.query_hash
@@ -1355,7 +1353,7 @@ class Topic < ActiveRecord::Base
 
   def self.with_no_response_total(opts = {})
     builder = DB.build(WITH_NO_RESPONSE_TOTAL_SQL)
-    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(opts[:category_id])) if opts[:category_id]
+    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(opts[:category_id].to_i)) if opts[:category_id]
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.query_single.first.to_i
diff --git a/config/initializers/014-track-setting-changes.rb b/config/initializers/014-track-setting-changes.rb
index d3156d46d9..c469af48fc 100644
--- a/config/initializers/014-track-setting-changes.rb
+++ b/config/initializers/014-track-setting-changes.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 DiscourseEvent.on(:site_setting_changed) do |name, old_value, new_value|
+  Category.clear_subcategory_ids if name === :max_category_nesting
+
   # Enabling `must_approve_users` on an existing site is odd, so we assume that the
   # existing users are approved.
   if name == :must_approve_users && new_value == true
diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb
index eaf3ee4083..7a2b37d01a 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -52,6 +52,7 @@ module BackupRestore
 
       @system.disable_readonly_mode
 
+      clear_category_cache
       clear_emoji_cache
       clear_theme_cache
 
@@ -119,6 +120,12 @@ module BackupRestore
       end
     end
 
+    def clear_category_cache
+      log "Clearing category cache..."
+      Category.reset_topic_ids_cache
+      Category.clear_subcategory_ids
+    end
+
     def clear_emoji_cache
       log "Clearing emoji cache..."
       Emoji.clear_cache
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 24a35b021e..fa851e916a 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -669,7 +669,7 @@ class TopicQuery
       if options[:no_subcategories]
         result = result.where('categories.id = ?', category_id)
       else
-        result = result.where(<<~SQL, subcategory_ids: subcategory_ids(category_id), category_id: category_id)
+        result = result.where(<<~SQL, subcategory_ids: Category.subcategory_ids(category_id), category_id: category_id)
           categories.id in (:subcategory_ids) AND (
             categories.topic_id <> topics.id OR categories.id = :category_id
           )
@@ -1052,11 +1052,6 @@ class TopicQuery
 
   private
 
-  def subcategory_ids(category_id)
-    @subcategory_ids ||= {}
-    @subcategory_ids[category_id] ||= Category.subcategory_ids(category_id)
-  end
-
   def sanitize_sql_array(input)
     ActiveRecord::Base.public_send(:sanitize_sql_array, input.join(','))
   end

From 81c7f369ebddbc788e8d8724616e122cedf504d4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 9 Apr 2020 09:57:50 -0400
Subject: [PATCH 0576/1830] Build(deps): Bump aws-eventstream from 1.0.3 to
 1.1.0 (#9395)

Bumps [aws-eventstream](https://github.com/aws/aws-sdk-ruby) from 1.0.3 to 1.1.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-eventstream/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.0.3...1.1.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index e668ecd8cc..020705664b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,7 +44,7 @@ GEM
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.0)
-    aws-eventstream (1.0.3)
+    aws-eventstream (1.1.0)
     aws-partitions (1.294.0)
     aws-sdk-core (3.92.0)
       aws-eventstream (~> 1.0, >= 1.0.2)

From 64ec771dc63eea5fb503481b590d656cfa885733 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Thu, 9 Apr 2020 12:13:15 -0300
Subject: [PATCH 0577/1830] REFACTOR: Resize controls (#9393)

---
 .../discourse-markdown/resize-controls.js     | 150 +++++++-----------
 1 file changed, 56 insertions(+), 94 deletions(-)

diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js
index 5a863bb212..16e5a17aab 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js
@@ -1,3 +1,5 @@
+const SCALES = ["100", "75", "50"];
+
 function isUpload(token) {
   return token.content.includes("upload://");
 }
@@ -6,16 +8,8 @@ function hasMetadata(token) {
   return token.content.match(/(\d{1,4}x\d{1,4})/);
 }
 
-function buildToken(state, type, tag, klass, nesting) {
-  const token = new state.Token(type, tag, nesting);
-  token.block = true;
-  token.attrs = [["class", klass]];
-  return token;
-}
-
-function wrapImage(tokens, index, state, imgNumber) {
-  const imgToken = tokens[index];
-  const sizePart = imgToken.content
+function appendMetaData(index, token) {
+  const sizePart = token.content
     .split("|")
     .find(x => x.match(/\d{1,4}x\d{1,4}(,\s*\d{1,3}%)?/));
   let selectedScale =
@@ -23,114 +17,53 @@ function wrapImage(tokens, index, state, imgNumber) {
     sizePart
       .split(",")
       .pop()
-      .trim();
-  tokens.splice(
-    index,
-    0,
-    buildToken(state, "wrap_image_open", "span", "image-wrapper", 1)
-  );
+      .trim()
+      .replace("%", "");
 
-  const newElements = [];
-  const btnWrapper = buildToken(
-    state,
-    "wrap_button_open",
-    "span",
-    "button-wrapper",
-    1
-  );
-  btnWrapper.attrs.push(["data-image-index", imgNumber]);
-  newElements.push(btnWrapper);
+  const overwriteScale = !SCALES.find(scale => scale === selectedScale);
+  if (overwriteScale) selectedScale = "100";
 
-  const minimumScale = 50;
-  const scales = [100, 75, minimumScale];
-  const overwriteScale = !scales.find(scale => `${scale}%` === selectedScale);
-  if (overwriteScale) selectedScale = "100%";
-
-  scales.forEach(scale => {
-    const scaleText = `${scale}%`;
-
-    const btnClass =
-      scaleText === selectedScale ? "scale-btn active" : "scale-btn";
-    const scaleBtn = buildToken(
-      state,
-      "scale_button_open",
-      "span",
-      btnClass,
-      1
-    );
-    scaleBtn.attrs.push(["data-scale", scale]);
-    newElements.push(scaleBtn);
-
-    let textToken = buildToken(state, "text", "", "", 0);
-    textToken.content = scaleText;
-    newElements.push(textToken);
-
-    newElements.push(buildToken(state, "scale_button_close", "span", "", -1));
-
-    if (scale !== minimumScale) {
-      newElements.push(buildToken(state, "separator", "span", "separator", 1));
-      let separatorToken = buildToken(state, "text", "", "", 0);
-      separatorToken.content = " • ";
-      newElements.push(separatorToken);
-      newElements.push(buildToken(state, "separator_close", "span", "", -1));
-    }
-  });
-  newElements.push(buildToken(state, "wrap_button_close", "span", "", -1));
-
-  newElements.push(buildToken(state, "wrap_image_close", "span", "", -1));
-
-  const afterImageIndex = index + 2;
-  tokens.splice(afterImageIndex, 0, ...newElements);
-}
-
-function updateIndexes(indexes, name) {
-  indexes[name].push(indexes.current);
-  indexes.current++;
-}
-
-function wrapImages(tokens, tokenIndexes, state, imgNumberIndexes) {
-  //We do this in reverse order because it's easier for #wrapImage to manipulate the tokens array.
-  for (let j = tokenIndexes.length - 1; j >= 0; j--) {
-    let index = tokenIndexes[j];
-    wrapImage(tokens, index, state, imgNumberIndexes.pop());
-  }
+  token.attrs.push(["index-image", index]);
+  token.attrs.push(["scale", selectedScale]);
 }
 
 function rule(state) {
-  let blockIndexes = [];
-  const indexNumbers = { current: 0, blocks: [], childrens: [] };
+  let currentIndex = 0;
 
   for (let i = 0; i < state.tokens.length; i++) {
     let blockToken = state.tokens[i];
     const blockTokenImage = blockToken.tag === "img";
 
     if (blockTokenImage && isUpload(blockToken) && hasMetadata(blockToken)) {
-      blockIndexes.push(i);
-      updateIndexes(indexNumbers, "blocks");
+      appendMetaData(currentIndex, blockToken);
+      currentIndex++;
     }
 
     if (!blockToken.children) continue;
 
-    const childrenIndexes = [];
     for (let j = 0; j < blockToken.children.length; j++) {
       let token = blockToken.children[j];
       const childrenImage = token.tag === "img";
 
       if (childrenImage && isUpload(blockToken) && hasMetadata(token)) {
-        childrenIndexes.push(j);
-        updateIndexes(indexNumbers, "childrens");
+        appendMetaData(currentIndex, token);
+        currentIndex++;
       }
     }
-
-    wrapImages(
-      blockToken.children,
-      childrenIndexes,
-      state,
-      indexNumbers.childrens
-    );
   }
+}
 
-  wrapImages(state.tokens, blockIndexes, state, indexNumbers.blocks);
+function buildScaleButton(selectedScale, scale) {
+  const activeScaleClass = selectedScale === scale ? "active" : "";
+  return (
+    "<span class='scale-btn" +
+    activeScaleClass +
+    "' data-scale='" +
+    scale +
+    "'>" +
+    scale +
+    "%</span>"
+  );
 }
 
 export function setup(helper) {
@@ -147,6 +80,35 @@ export function setup(helper) {
     ]);
 
     helper.registerPlugin(md => {
+      const oldRule = md.renderer.rules.image;
+
+      md.renderer.rules.image = function(tokens, idx, options, env, slf) {
+        const token = tokens[idx];
+        const scaleIndex = token.attrIndex("scale");
+        const imageIndex = token.attrIndex("index-image");
+
+        if (scaleIndex !== -1) {
+          var selectedScale = token.attrs[scaleIndex][1];
+          var index = token.attrs[imageIndex][1];
+
+          let result = "<span class='image-wrapper'>";
+          result += oldRule(tokens, idx, options, env, slf);
+
+          result +=
+            "<span class='button-wrapper' data-image-index='" + index + "'>";
+
+          result += SCALES.map(scale =>
+            buildScaleButton(selectedScale, scale)
+          ).join("<span class='separator'>&nbsp;•&nbsp;</span>");
+
+          result += "</span></span>";
+
+          return result;
+        } else {
+          return oldRule(tokens, idx, options, env, slf);
+        }
+      };
+
       md.core.ruler.after("upload-protocol", "resize-controls", rule);
     });
   }

From 8b46f14744d4bab9339d075825914d86da6bd5eb Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 9 Apr 2020 14:17:43 -0400
Subject: [PATCH 0578/1830] We have had errors reported due to migrations
 breaking and are reverting these series of commits.

See:
https://meta.discourse.org/t/new-installation-fails-on-migration/147425

This reverts commit 80e832662b719425872e7ac3736fb9fc56d85aca.
This reverts commit de5f2d33087c8e9c12f83d573015d275098bd68f.
This reverts commit 6b192d29fa095e91cb40b71e76dfc811f4aa205c.
This reverts commit a5b582f686c0a8427aad3f6caf9f3a8105e66ee9.
This reverts commit 708dd97dfd0380c703678a0ee070dc62880e57f1.
---
 lib/freedom_patches/safe_migrations.rb |  12 +--
 lib/tasks/db.rake                      | 100 -------------------------
 2 files changed, 3 insertions(+), 109 deletions(-)

diff --git a/lib/freedom_patches/safe_migrations.rb b/lib/freedom_patches/safe_migrations.rb
index cdf989fdd5..718ffffb89 100644
--- a/lib/freedom_patches/safe_migrations.rb
+++ b/lib/freedom_patches/safe_migrations.rb
@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-# We do not run this in production cause it is intrusive and has
-# potential to break stuff, it also breaks under concurrent use
-# which rake:multisite_migrate uses
-#
-# The protection is only needed in Dev and Test
-if ENV['RAILS_ENV'] != "production"
-  require_dependency 'migration/safe_migrate'
-  Migration::SafeMigrate.patch_active_record!
-end
+require_dependency 'migration/safe_migrate'
+
+Migration::SafeMigrate.patch_active_record!
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 81087473a0..14b2eb4e20 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -66,106 +66,6 @@ task 'db:rollback' => ['environment', 'set_locale'] do |_, args|
   Rake::Task['db:_dump'].invoke
 end
 
-# our optimized version of multisite migrate, we have many sites and we have seeds
-# this ensures we can run migrations concurrently to save huge amounts of time
-Rake::Task['multisite:migrate'].clear
-
-class StdOutDemux
-  def initialize(stdout)
-    @stdout = stdout
-    @data = {}
-  end
-
-  def write(data)
-    (@data[Thread.current] ||= +"") << data
-  end
-
-  def close
-    finish_chunk
-  end
-
-  def finish_chunk
-    data = @data[Thread.current]
-    if data
-      @stdout.write(data)
-      @data.delete Thread.current
-    end
-  end
-end
-
-task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |_, args|
-  if ENV["RAILS_ENV"] != "production"
-    raise "Multisite migrate is only supported in production"
-  end
-
-  concurrency = (ENV['MIGRATE_CONCURRENCY'].presence || "20").to_i
-
-  puts "Multisite migrator is running using #{concurrency} threads"
-  puts
-
-  queue = Queue.new
-  exceptions = Queue.new
-
-  old_stdout = $stdout
-  $stdout = StdOutDemux.new($stdout)
-
-  RailsMultisite::ConnectionManagement.each_connection do |db|
-    queue << db
-  end
-
-  concurrency.times { queue << :done }
-
-  SeedFu.quiet = true
-
-  (1..concurrency).map do
-    Thread.new {
-      while true
-        db = queue.pop
-        break if db == :done
-
-        RailsMultisite::ConnectionManagement.with_connection(db) do
-          begin
-            puts "Migrating #{db}"
-            ActiveRecord::Tasks::DatabaseTasks.migrate
-            SeedFu.seed(DiscoursePluginRegistry.seed_paths)
-            if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
-              SiteIconManager.ensure_optimized!
-            end
-          rescue => e
-            exceptions << [db, e]
-          ensure
-            begin
-              $stdout.finish_chunk
-            rescue => ex
-              STDERR.puts ex.inspect
-              STDERR.puts ex.backtrace
-            end
-          end
-        end
-      end
-    }
-  end.each(&:join)
-
-  $stdout = old_stdout
-
-  if exceptions.length > 0
-    STDERR.puts
-    STDERR.puts "-" * 80
-    STDERR.puts "#{exceptions.length} migrations failed!"
-    while !exceptions.empty?
-      db, e = exceptions.pop
-      STDERR.puts
-      STDERR.puts "Failed to migrate #{db}"
-      STDERR.puts e.inspect
-      STDERR.puts e.backtrace
-      STDERR.puts
-    end
-    exit 1
-  end
-
-  Rake::Task['db:_dump'].invoke
-end
-
 # we need to run seed_fu every time we run rake db:migrate
 task 'db:migrate' => ['load_config', 'environment', 'set_locale'] do |_, args|
 

From 5ccbc5f3ee8508927ee715fe59e6da9d08ef427b Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Thu, 9 Apr 2020 08:32:39 -1000
Subject: [PATCH 0579/1830] FEATURE: add after-reviewable-post-user plugin
 outlet (#9397)

FEATURE: add after-reviewable-post-user plugin outlet

Add a plugin outlet after reviewable post user

Add a basic user serializer that includes custom fields.
Allows review queue serializer to include custom fields for its users
---
 .../components/reviewable-created-by-name.hbs |  3 +++
 app/serializers/reviewable_serializer.rb      |  6 ++---
 .../user_with_custom_fields_serializer.rb     | 27 +++++++++++++++++++
 spec/requests/reviewables_controller_spec.rb  | 26 ++++++++++++++++++
 4 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 app/serializers/user_with_custom_fields_serializer.rb

diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs
index e2f2afd097..f45506550f 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs
@@ -9,4 +9,7 @@
       {{i18n "review.deleted_user"}}
     {{/if}}
   </span>
+  {{plugin-outlet name="after-reviewable-post-user"
+      tagName=""
+      args=(hash user=user)}}
 </div>
diff --git a/app/serializers/reviewable_serializer.rb b/app/serializers/reviewable_serializer.rb
index af03419d2a..bd7f69d462 100644
--- a/app/serializers/reviewable_serializer.rb
+++ b/app/serializers/reviewable_serializer.rb
@@ -19,13 +19,13 @@ class ReviewableSerializer < ApplicationSerializer
     :version,
   )
 
-  has_one :created_by, serializer: BasicUserSerializer, root: 'users'
-  has_one :target_created_by, serializer: BasicUserSerializer, root: 'users'
+  has_one :created_by, serializer: UserWithCustomFieldsSerializer, root: 'users'
+  has_one :target_created_by, serializer: UserWithCustomFieldsSerializer, root: 'users'
   has_one :topic, serializer: ListableTopicSerializer
   has_many :editable_fields, serializer: ReviewableEditableFieldSerializer, embed: :objects
   has_many :reviewable_scores, serializer: ReviewableScoreSerializer
   has_many :bundled_actions, serializer: ReviewableBundledActionSerializer
-  has_one :claimed_by, serializer: BasicUserSerializer, root: 'users'
+  has_one :claimed_by, serializer: UserWithCustomFieldsSerializer, root: 'users'
 
   # Used to keep track of our payload attributes
   class_attribute :_payload_for_serialization
diff --git a/app/serializers/user_with_custom_fields_serializer.rb b/app/serializers/user_with_custom_fields_serializer.rb
new file mode 100644
index 0000000000..6492d2f695
--- /dev/null
+++ b/app/serializers/user_with_custom_fields_serializer.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# A basic user serializer, with custom fields
+class UserWithCustomFieldsSerializer < BasicUserSerializer
+  attributes :custom_fields
+
+  def custom_fields
+    fields = custom_field_keys
+
+    if fields.present?
+      if object.custom_fields_preloaded?
+        {}.tap { |h| fields.each { |f| h[f] = object.custom_fields[f] } }
+      else
+        User.custom_fields_for_ids([object.id], fields)[object.id] || {}
+      end
+    else
+      {}
+    end
+  end
+
+  private
+
+  def custom_field_keys
+    # Can be extended by other serializers
+    User.whitelisted_user_custom_fields(scope)
+  end
+end
diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rb
index 6ae6dfae8a..e42d67ae40 100644
--- a/spec/requests/reviewables_controller_spec.rb
+++ b/spec/requests/reviewables_controller_spec.rb
@@ -192,6 +192,32 @@ describe ReviewablesController do
           expect(json_review['id']).to eq(reviewable.id)
         end
       end
+
+      context "with user custom field" do
+        before do
+          plugin = Plugin::Instance.new
+          plugin.whitelist_public_user_custom_field :public_field
+        end
+
+        after do
+          User.plugin_public_user_custom_fields.clear
+        end
+
+        it "returns user data with custom fields" do
+          user = Fabricate(:user)
+          user.custom_fields["public_field"] = "public"
+          user.custom_fields["private_field"] = "private"
+          user.save!
+
+          reviewable = Fabricate(:reviewable, target_created_by: user)
+
+          get "/review.json"
+          json = response.parsed_body
+          expect(json['users']).to be_present
+          expect(json['users'].any? { |u| u['id'] == reviewable.target_created_by_id && u['custom_fields']['public_field'] == 'public' }).to eq(true)
+          expect(json['users'].any? { |u| u['id'] == reviewable.target_created_by_id && u['custom_fields']['private_field'] == 'private' }).to eq(false)
+        end
+      end
     end
 
     context "#show" do

From d891665ac519efac6b648b454c275e88c70baa6a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 9 Apr 2020 21:57:06 +0200
Subject: [PATCH 0580/1830] DEV: allows groups-selector to have an
 onChangeCallback (#9399)

---
 .../javascripts/discourse/components/group-selector.js     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/group-selector.js b/app/assets/javascripts/discourse/components/group-selector.js
index 74c1c4b16f..3fe2e505f8 100644
--- a/app/assets/javascripts/discourse/components/group-selector.js
+++ b/app/assets/javascripts/discourse/components/group-selector.js
@@ -35,7 +35,12 @@ export default Component.extend({
       updateData: opts && opts.updateData ? opts.updateData : false,
       onChangeItems: items => {
         selectedGroups = items;
-        this.set("groupNames", items.join(","));
+
+        if (this.onChangeCallback) {
+          this.onChangeCallback(this.groupNames, selectedGroups);
+        } else {
+          this.set("groupNames", items.join(","));
+        }
       },
       transformComplete: g => {
         return g.name;

From 3cac60f07c29c14ebe816d1136b1360f607c314f Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 9 Apr 2020 22:00:44 +0200
Subject: [PATCH 0581/1830] DEV: enforce no-quoteless-attributes
 ember-template-lint (#9400)

---
 .template-lintrc.js                                             | 2 +-
 .../javascripts/discourse/templates/preferences/account.hbs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 1f377ea0f1..232c2549ca 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -35,7 +35,7 @@ module.exports = {
     "no-outlet-outside-routes": true,
     "no-partial": true,
     "no-positive-tabindex": false,
-    "no-quoteless-attributes": false,
+    "no-quoteless-attributes": true,
     "no-shadowed-elements": true,
     "no-trailing-spaces": true,
     "no-triple-curlies": true,
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 70b8d20cd8..40802f66df 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -119,7 +119,7 @@
             {{else}}
               <tr class={{dasherize authProvider.method.name}}>
                 <td>{{authProvider.method.prettyName}}</td>
-                  <td colspan=2>
+                  <td colspan="2">
                     {{#if authProvider.method.can_connect}}
                       {{d-button action=(action "connectAccount") actionParam=authProvider.method label="user.associated_accounts.connect" class="btn-default" icon="plug" disabled=disableConnectButtons}}
                     {{else}}

From 80a80ef2bd028c2292bed0ef491de6ccba93f8f2 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Thu, 9 Apr 2020 20:46:51 -0600
Subject: [PATCH 0582/1830] DEV: Use method instead of constant for discobot
 badge names

This change refactors the code a bit so that a plugin could easily
replace which badge is awarded when completing the discobot new user
tutorial and advanced tutorial.

By adding a static method and putting the BADGE_NAME constant inside of
that method we can simply call that method now instead of the constant.
A plugin could then `class_eval` that method and replace it with
whatever badge name they choose. This is way cleaner than having the
plugin change the frozen constant! eeek.
---
 .../autoload/jobs/onceoff/grant_badges.rb                     | 4 ++--
 .../lib/discourse_narrative_bot/advanced_user_narrative.rb    | 4 ++++
 .../lib/discourse_narrative_bot/base.rb                       | 2 +-
 .../lib/discourse_narrative_bot/new_user_narrative.rb         | 4 ++++
 .../discourse_narrative_bot/advanced_user_narrative_spec.rb   | 2 +-
 .../spec/discourse_narrative_bot/new_user_narrative_spec.rb   | 2 +-
 .../spec/discourse_narrative_bot/track_selector_spec.rb       | 2 +-
 .../spec/jobs/onceoff/grant_badges_spec.rb                    | 4 ++--
 8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/plugins/discourse-narrative-bot/autoload/jobs/onceoff/grant_badges.rb b/plugins/discourse-narrative-bot/autoload/jobs/onceoff/grant_badges.rb
index 373b3b7a4f..c723d176e9 100644
--- a/plugins/discourse-narrative-bot/autoload/jobs/onceoff/grant_badges.rb
+++ b/plugins/discourse-narrative-bot/autoload/jobs/onceoff/grant_badges.rb
@@ -5,11 +5,11 @@ module Jobs
     class GrantBadges < ::Jobs::Onceoff
       def execute_onceoff(args)
         new_user_track_badge = Badge.find_by(
-          name: ::DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME
+          name: ::DiscourseNarrativeBot::NewUserNarrative.badge_name
         )
 
         advanced_user_track_badge = Badge.find_by(
-          name: ::DiscourseNarrativeBot::AdvancedUserNarrative::BADGE_NAME
+          name: ::DiscourseNarrativeBot::AdvancedUserNarrative.badge_name
         )
 
         PluginStoreRow.where(
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
index 185d472ea6..aa66cb1802 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
@@ -98,6 +98,10 @@ module DiscourseNarrativeBot
       }
     }
 
+    def self.badge_name
+      BADGE_NAME
+    end
+
     def self.reset_trigger
       I18n.t('discourse_narrative_bot.advanced_user_narrative.reset_trigger')
     end
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
index 2cccd93ac8..404dd084b4 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
@@ -74,7 +74,7 @@ module DiscourseNarrativeBot
               cancel_timeout_job(user)
 
               BadgeGranter.grant(
-                Badge.find_by(name: self.class::BADGE_NAME),
+                Badge.find_by(name: self.class.badge_name),
                 user
               )
 
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
index 0acd31d5bb..89afd4eb87 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
@@ -117,6 +117,10 @@ module DiscourseNarrativeBot
       }
     }
 
+    def self.badge_name
+      BADGE_NAME
+    end
+
     def self.search_answer
       ':herb:'
     end
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
index 28fec30417..da97a7df58 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
@@ -725,7 +725,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
                                                "topic_id" => topic.id,
                                                "track" => described_class.to_s)
 
-        expect(user.badges.where(name: DiscourseNarrativeBot::AdvancedUserNarrative::BADGE_NAME).exists?)
+        expect(user.badges.where(name: DiscourseNarrativeBot::AdvancedUserNarrative.badge_name).exists?)
           .to eq(true)
       end
     end
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
index 6648337caf..43ff1ac52a 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
@@ -1007,7 +1007,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
           )
 
           expect(user.badges.where(
-            name: DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME).exists?
+            name: DiscourseNarrativeBot::NewUserNarrative.badge_name).exists?
           ).to eq(true)
         end
       end
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
index c957cfe627..4e24b9feae 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
@@ -319,7 +319,7 @@ describe DiscourseNarrativeBot::TrackSelector do
                 )
 
                 BadgeGranter.grant(
-                  Badge.find_by(name: DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME),
+                  Badge.find_by(name: DiscourseNarrativeBot::NewUserNarrative.badge_name),
                   user
                 )
 
diff --git a/plugins/discourse-narrative-bot/spec/jobs/onceoff/grant_badges_spec.rb b/plugins/discourse-narrative-bot/spec/jobs/onceoff/grant_badges_spec.rb
index 5a0b3a98c1..35950b6d42 100644
--- a/plugins/discourse-narrative-bot/spec/jobs/onceoff/grant_badges_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/jobs/onceoff/grant_badges_spec.rb
@@ -19,8 +19,8 @@ RSpec.describe Jobs::DiscourseNarrativeBot::GrantBadges do
     expect(user.badges.count).to eq(2)
 
     expect(user.badges.map(&:name)).to contain_exactly(
-      DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME,
-      DiscourseNarrativeBot::AdvancedUserNarrative::BADGE_NAME,
+      DiscourseNarrativeBot::NewUserNarrative.badge_name,
+      DiscourseNarrativeBot::AdvancedUserNarrative.badge_name,
     )
 
     expect(other_user.badges.count).to eq(0)

From 3e10d4133dd9d75a9905297881c2e59145e7859c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 10 Apr 2020 13:52:33 +0200
Subject: [PATCH 0583/1830] FIX: adds values/entries/NodeList.forEach/before
 polyfills for iOS 9.3 (#9401)

---
 app/assets/javascripts/polyfills.js | 65 +++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/app/assets/javascripts/polyfills.js b/app/assets/javascripts/polyfills.js
index 0129823fc8..358a213467 100644
--- a/app/assets/javascripts/polyfills.js
+++ b/app/assets/javascripts/polyfills.js
@@ -49,4 +49,69 @@ if (!String.prototype.padEnd) {
   };
 }
 
+// Needed for iOS 9.3
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries
+if (!Object.entries) {
+  Object.entries = function(obj) {
+    var ownProps = Object.keys(obj),
+      i = ownProps.length,
+      resArray = new Array(i); // preallocate the Array
+    while (i--) resArray[i] = [ownProps[i], obj[ownProps[i]]];
+
+    return resArray;
+  };
+}
+
+// Needed for iOS 9.3
+// adapted from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries
+if (!Object.values) {
+  Object.values = function(obj) {
+    var ownProps = Object.keys(obj),
+      i = ownProps.length,
+      resArray = new Array(i); // preallocate the Array
+    while (i--) resArray[i] = obj[ownProps[i]];
+
+    return resArray;
+  };
+}
+
+// Needed for iOS 9.3
+// https://developer.mozilla.org/fr/docs/Web/API/NodeList/forEach
+if (window.NodeList && !NodeList.prototype.forEach) {
+  NodeList.prototype.forEach = function(callback, thisArg) {
+    thisArg = thisArg || window;
+    for (var i = 0; i < this.length; i++) {
+      callback.call(thisArg, this[i], i, this);
+    }
+  };
+}
+
+// Needed for iOS 9.3
+// from: https://github.com/jserz/js_piece/blob/master/DOM/ChildNode/before()/before().md
+(function(arr) {
+  arr.forEach(function(item) {
+    if (item.hasOwnProperty("before")) {
+      return;
+    }
+    Object.defineProperty(item, "before", {
+      configurable: true,
+      enumerable: true,
+      writable: true,
+      value: function before() {
+        var argArr = Array.prototype.slice.call(arguments),
+          docFrag = document.createDocumentFragment();
+
+        argArr.forEach(function(argItem) {
+          var isNode = argItem instanceof Node;
+          docFrag.appendChild(
+            isNode ? argItem : document.createTextNode(String(argItem))
+          );
+        });
+
+        this.parentNode.insertBefore(docFrag, this);
+      }
+    });
+  });
+})([Element.prototype, CharacterData.prototype, DocumentType.prototype]);
+
 /* eslint-enable */

From b57d4586d713102ce939fd8d17f2ce200f290171 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 10 Apr 2020 18:16:47 +0530
Subject: [PATCH 0584/1830] FIX: use correct command line attribute for
 `gifsicle` while scale down the gif.

---
 app/models/optimized_image.rb | 3 ++-
 lib/upload_creator.rb         | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index 3f5614a084..e5783532c8 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -236,11 +236,12 @@ class OptimizedImage < ActiveRecord::Base
 
   def self.resize_instructions_animated(from, to, dimensions, opts = {})
     ensure_safe_paths!(from, to)
+    resize_method = opts[:scale_image] ? "scale" : "resize-fit"
 
     %W{
       gifsicle
       --colors=#{opts[:colors] || 256}
-      --resize-fit #{dimensions}
+      --#{resize_method} #{dimensions}
       --optimize=3
       --output #{to}
       #{from}
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index d9c21f1920..b806e2fc52 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -245,14 +245,16 @@ class UploadCreator
 
       from = @file.path
       to = down_tempfile.path
+      scale = (from =~ /\.GIF$/i) ? "0.5" : "50%"
 
       OptimizedImage.ensure_safe_paths!(from, to)
 
       OptimizedImage.downsize(
         from,
         to,
-        "50%",
+        scale,
         allow_animation: allow_animation,
+        scale_image: true,
         raise_on_error: true
       )
 

From 058506bb77680537f377cef0cad90711c2e578a5 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 10 Apr 2020 16:47:27 +0200
Subject: [PATCH 0585/1830] DEV: prevents toolbar callbacks to leak between
 tests (#9403)

---
 app/assets/javascripts/discourse/components/d-editor.js | 5 ++++-
 test/javascripts/components/d-editor-test.js            | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/d-editor.js b/app/assets/javascripts/discourse/components/d-editor.js
index b83b667bca..199266c2a8 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js
+++ b/app/assets/javascripts/discourse/components/d-editor.js
@@ -52,7 +52,7 @@ const OP = {
 
 const FOUR_SPACES_INDENT = "4-spaces-indent";
 
-const _createCallbacks = [];
+let _createCallbacks = [];
 
 const isInside = (text, regex) => {
   const matches = text.match(regex);
@@ -212,6 +212,9 @@ class Toolbar {
 export function addToolbarCallback(func) {
   _createCallbacks.push(func);
 }
+export function clearToolbarCallbacks() {
+  _createCallbacks = [];
+}
 
 export function onToolbarCreate(func) {
   deprecated("`onToolbarCreate` is deprecated, use the plugin api instead.");
diff --git a/test/javascripts/components/d-editor-test.js b/test/javascripts/components/d-editor-test.js
index 131de74e68..6582979c1f 100644
--- a/test/javascripts/components/d-editor-test.js
+++ b/test/javascripts/components/d-editor-test.js
@@ -1,4 +1,5 @@
 import { next } from "@ember/runloop";
+import { clearToolbarCallbacks } from "discourse/components/d-editor";
 import componentTest from "helpers/component-test";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import formatTextWithSelection from "helpers/d-editor-helper";
@@ -633,6 +634,11 @@ componentTest("emoji", {
     });
     this.set("value", "hello world.");
   },
+
+  afterEach() {
+    clearToolbarCallbacks();
+  },
+
   async test(assert) {
     jumpEnd(find("textarea.d-editor-input")[0]);
     await click("button.emoji");

From 617692a6c43a21b0c158f3cea53f1142b4a35195 Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Fri, 10 Apr 2020 09:46:36 -0700
Subject: [PATCH 0586/1830] UX: Note "Summarize This Topic" settings behavior

We use the `periodical_updates` and `weekly` background jobs to retroactively add/remove the "Summarize This Topic" button for topics according to the `summary_posts_required` or `summary_likes_required` site settings.
---
 config/locales/server.en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index f5f03a1b9d..4fd326065f 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1490,8 +1490,8 @@ en:
     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 SSO."
     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"
-    summary_likes_required: "Minimum likes in a topic before 'Summarize This Topic' is enabled"
+    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."
     summary_percent_filter: "When a user clicks 'Summarize This Topic', show the top % of posts"
     summary_max_results: "Maximum posts returned by 'Summarize This Topic'"
 

From 5471c065cdb97f2aad2de552014eaa23bb50c5df Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Fri, 10 Apr 2020 13:19:39 -0500
Subject: [PATCH 0587/1830] FIX: Missing timezone guess on email session login
 (#9404)

Timezone is guessed by moment.js if unset upon a normal login, but was not when
logging in via an email link. This adds logic to update a guessed
timezone upon email login so timezones don't end up blank.
---
 .../javascripts/discourse/controllers/email-login.js      | 5 ++++-
 app/controllers/session_controller.rb                     | 1 +
 spec/requests/session_controller_spec.rb                  | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/controllers/email-login.js b/app/assets/javascripts/discourse/controllers/email-login.js
index 4eab7fc1ba..4000618587 100644
--- a/app/assets/javascripts/discourse/controllers/email-login.js
+++ b/app/assets/javascripts/discourse/controllers/email-login.js
@@ -23,7 +23,10 @@ export default Controller.extend({
 
   actions: {
     finishLogin() {
-      let data = { second_factor_method: this.secondFactorMethod };
+      let data = {
+        second_factor_method: this.secondFactorMethod,
+        timezone: moment.tz.guess()
+      };
       if (this.securityKeyCredential) {
         data.second_factor_token = this.securityKeyCredential;
       } else {
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index 5f8b1c3430..aa46f2dba2 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -368,6 +368,7 @@ class SessionController < ApplicationController
       elsif payload = login_error_check(user)
         return render json: payload
       else
+        user.update_timezone_if_missing(params[:timezone])
         log_on_user(user)
         return render json: success_json
       end
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index 50c4eb7ea0..70f88f8e2a 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -252,6 +252,14 @@ RSpec.describe SessionController do
         end
       end
 
+      context "when timezone param is provided" do
+        it "sets the user_option timezone for the user" do
+          post "/session/email-login/#{email_token.token}.json", params: { timezone: "Australia/Melbourne" }
+          expect(response.status).to eq(200)
+          expect(user.reload.user_option.timezone).to eq("Australia/Melbourne")
+        end
+      end
+
       it "fails when user is suspended" do
         user.update!(
           suspended_till: 2.days.from_now,

From d984848aa94971c8fcab10b43bd596107fdbe9c5 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 10 Apr 2020 22:39:19 +0200
Subject: [PATCH 0588/1830] FIX: ensures toolbar is updated on composer action
 change (#9402)

---
 .../discourse/components/d-editor.js            |  2 +-
 test/javascripts/components/d-editor-test.js    | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/d-editor.js b/app/assets/javascripts/discourse/components/d-editor.js
index 199266c2a8..4dd2c72700 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js
+++ b/app/assets/javascripts/discourse/components/d-editor.js
@@ -328,7 +328,7 @@ export default Component.extend({
     $(this.element.querySelector(".d-editor-preview")).off("click.preview");
   },
 
-  @discourseComputed
+  @discourseComputed("attrs.outletArgs.composer.action")
   toolbar() {
     const toolbar = new Toolbar(
       this.getProperties("site", "siteSettings", "showLink")
diff --git a/test/javascripts/components/d-editor-test.js b/test/javascripts/components/d-editor-test.js
index 6582979c1f..222ddeea76 100644
--- a/test/javascripts/components/d-editor-test.js
+++ b/test/javascripts/components/d-editor-test.js
@@ -584,7 +584,7 @@ testCase(`list button with line sequence`, async function(assert, textarea) {
   assert.equal(textarea.selectionEnd, 18);
 });
 
-componentTest("clicking the toggle-direction button toggles the direction", {
+componentTest("clicking the toggle-direction changes dir from ltr to rtl", {
   template: "{{d-editor value=value}}",
   beforeEach() {
     this.siteSettings.support_mixed_text_direction = true;
@@ -595,8 +595,21 @@ componentTest("clicking the toggle-direction button toggles the direction", {
     const textarea = find("textarea.d-editor-input");
     await click("button.toggle-direction");
     assert.equal(textarea.attr("dir"), "rtl");
+  }
+});
+
+componentTest("clicking the toggle-direction changes dir from ltr to rtl", {
+  template: "{{d-editor value=value}}",
+  beforeEach() {
+    this.siteSettings.support_mixed_text_direction = true;
+    this.siteSettings.default_locale = "en_US";
+  },
+
+  async test(assert) {
+    const textarea = find("textarea.d-editor-input");
+    textarea.attr("dir", "ltr");
     await click("button.toggle-direction");
-    assert.equal(textarea.attr("dir"), "ltr");
+    assert.equal(textarea.attr("dir"), "rtl");
   }
 });
 

From 600cb2130da405718c69c38effe39a64979f3023 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Sat, 11 Apr 2020 06:34:13 +0530
Subject: [PATCH 0589/1830] FIX: show today's date on /users page period
 chooser

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

diff --git a/app/assets/javascripts/discourse/templates/mobile/users.hbs b/app/assets/javascripts/discourse/templates/mobile/users.hbs
index 808458bbcb..a24f118619 100644
--- a/app/assets/javascripts/discourse/templates/mobile/users.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/users.hbs
@@ -4,7 +4,7 @@
       {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
 
       <div class='directory-controls'>
-        {{period-chooser period=period onChange=(action (mut period))}}
+        {{period-chooser period=period onChange=(action (mut period)) fullDay=false}}
         {{#if lastUpdatedAt}}
           <div class='directory-last-updated'>
             {{i18n "directory.last_updated"}}
diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs
index af5d17f15b..35e1f5d19b 100644
--- a/app/assets/javascripts/discourse/templates/users.hbs
+++ b/app/assets/javascripts/discourse/templates/users.hbs
@@ -5,7 +5,7 @@
         {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
         <div class='directory-controls'>
           <div class='period-controls'>
-            {{period-chooser period=period onChange=(action (mut period))}}
+            {{period-chooser period=period onChange=(action (mut period)) fullDay=false}}
             {{#if lastUpdatedAt}}
               <div class='directory-last-updated'>
                 {{i18n "directory.last_updated"}}

From 0cef409d498f3aa3f714f3f05924f933b4a610e5 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Sun, 12 Apr 2020 21:05:23 +0530
Subject: [PATCH 0590/1830] UX: strip base64 image URLs when converting HTML to
 markdown.

---
 app/assets/javascripts/discourse/lib/to-markdown.js | 4 ++++
 test/javascripts/lib/to-markdown-test.js            | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/app/assets/javascripts/discourse/lib/to-markdown.js b/app/assets/javascripts/discourse/lib/to-markdown.js
index 83d7b28d04..25e49bfc85 100644
--- a/app/assets/javascripts/discourse/lib/to-markdown.js
+++ b/app/assets/javascripts/discourse/lib/to-markdown.js
@@ -291,6 +291,10 @@ export class Tag {
         }
 
         if (src) {
+          if (src.match(/^data:image\/([a-zA-Z]*);base64,([^\"]*)$/)) {
+            return "[image]";
+          }
+
           let alt = attr.alt || pAttr.alt || "";
           const width = attr.width || pAttr.width;
           const height = attr.height || pAttr.height;
diff --git a/test/javascripts/lib/to-markdown-test.js b/test/javascripts/lib/to-markdown-test.js
index bcda89c9f2..3ae081d0fb 100644
--- a/test/javascripts/lib/to-markdown-test.js
+++ b/test/javascripts/lib/to-markdown-test.js
@@ -413,3 +413,9 @@ there is a quote above
 
   assert.equal(toMarkdown(html), markdown.trim());
 });
+
+QUnit.test("strips base64 image URLs", assert => {
+  const html =
+    '<img src="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAPAAA/+4AJkFkb2JlAGTAAAAAAQMAFQQDBgoNAAABywAAAgsAAAJpAAACyf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoKDBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8IAEQgAEAAQAwERAAIRAQMRAf/EAJQAAQEBAAAAAAAAAAAAAAAAAAMFBwEAAwEAAAAAAAAAAAAAAAAAAAEDAhAAAQUBAQAAAAAAAAAAAAAAAgABAwQFESARAAIBAwIHAAAAAAAAAAAAAAERAgAhMRIDQWGRocEiIxIBAAAAAAAAAAAAAAAAAAAAIBMBAAMAAQQDAQAAAAAAAAAAAQARITHwQVGBYXGR4f/aAAwDAQACEQMRAAAB0UlMciEJn//aAAgBAQABBQK5bGtFn6pWi2K12wWTRkjb/9oACAECAAEFAvH/2gAIAQMAAQUCIuIJOqRndRiv/9oACAECAgY/Ah//2gAIAQMCBj8CH//aAAgBAQEGPwLWQzwHepfNbcUNfM4tUIbA9QL4AvnxTlAxacpWJReOlf/aAAgBAQMBPyHZDveuCyu4B4lz2lDKto2ca5uclPK0aoq32x8xgTSLeSgbyzT65n//2gAIAQIDAT8hlQjP/9oACAEDAwE/IaE9GcZFJ//aAAwDAQACEQMRAAAQ5F//2gAIAQEDAT8Q1oowKccI3KTdAWkPLw2ssIrwKYUzuJoUJsIHOCoG23ISlja+rU9QvCx//9oACAECAwE/EAuNIiKf/9oACAEDAwE/ECujJzHf7iwHOv5NhK+8efH50z//2Q==" />';
+  assert.equal(toMarkdown(html), "[image]");
+});

From 0f14bce79990f34669eaf8cfc50fff07ceb7b90c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 12 Apr 2020 21:14:58 +0200
Subject: [PATCH 0591/1830] FIX: remove invalid background (#9406)

---
 .../stylesheets/common/components/date-time-input-range.scss     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/common/components/date-time-input-range.scss b/app/assets/stylesheets/common/components/date-time-input-range.scss
index 438de7742e..e46dd6f0b6 100644
--- a/app/assets/stylesheets/common/components/date-time-input-range.scss
+++ b/app/assets/stylesheets/common/components/date-time-input-range.scss
@@ -1,6 +1,5 @@
 .d-date-time-input-range {
   padding: 0.5em;
-  background: whitesmole;
   border: 1px solid $primary-low;
   width: 300px;
   display: flex;

From a863d8eecba22f45599f8fc7b3f7ea83bfb58b32 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 12 Apr 2020 21:21:21 +0200
Subject: [PATCH 0592/1830] UX: applies default background color to onebox
 (#9407)

---
 app/assets/stylesheets/common/base/onebox.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 694ea8214a..4c0a9f357b 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -98,6 +98,7 @@ aside.onebox {
   margin-bottom: 1em;
   padding: 12px 25px 12px 12px;
   font-size: $font-0;
+  background: $secondary;
 
   header {
     margin-bottom: 8px;

From b66b277dc44bcd2122dc21965dab209c30636214 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 13 Apr 2020 17:17:20 +0200
Subject: [PATCH 0593/1830] DEV: enforces block-indentation of
 ember-template-lint rules (#9408)

---
 .template-lintrc.js                           |   2 +-
 .../javascripts/admin/templates/admin.hbs     |  55 ++-
 .../admin/templates/api-keys-index.hbs        | 118 +++---
 .../admin/templates/api-keys-show.hbs         |   8 +-
 .../admin/templates/backups-index.hbs         | 104 ++---
 .../components/admin-report-inline-table.hbs  |   2 +-
 .../templates/components/admin-report.hbs     | 372 +++++++++---------
 .../components/admin-theme-editor.hbs         |  94 +++--
 .../templates/components/embeddable-host.hbs  |   4 +-
 .../templates/components/silence-details.hbs  |  11 +-
 .../templates/components/site-setting.hbs     |   8 +-
 .../admin/templates/customize-colors-show.hbs |  98 ++---
 .../templates/customize-themes-index.hbs      |   2 +-
 .../admin/templates/dashboard_reports.hbs     |  18 +-
 .../admin/templates/email-advanced-test.hbs   |  30 +-
 .../admin/templates/email-preview-digest.hbs  |   7 +-
 .../javascripts/admin/templates/embedding.hbs |   6 +-
 .../admin/templates/logs/screened-emails.hbs  |  30 +-
 .../templates/logs/screened-ip-addresses.hbs  | 138 +++----
 .../admin/templates/logs/screened-urls.hbs    |  22 +-
 .../templates/logs/staff-action-logs.hbs      |  59 ++-
 .../templates/modal/admin-add-upload.hbs      |  20 +-
 .../modal/admin-watched-word-test.hbs         |  28 +-
 .../modal/site-setting-default-categories.hbs |   2 +-
 .../admin/templates/plugins-index.hbs         |   6 +-
 .../javascripts/admin/templates/plugins.hbs   |  20 +-
 .../admin/templates/search-logs-index.hbs     |  22 +-
 .../admin/templates/search-logs-term.hbs      |  72 ++--
 .../admin/templates/user-badges.hbs           |  42 +-
 .../admin/templates/user-index.hbs            | 112 +++---
 .../admin/templates/user-tl3-requirements.hbs |  39 +-
 .../admin/templates/web-hooks-show-events.hbs |  52 +--
 .../javascripts/admin/templates/web-hooks.hbs |  56 +--
 .../javascripts/discourse/templates/about.hbs |   4 +-
 .../discourse/templates/badges/show.hbs       |  24 +-
 .../templates/components/avatar-uploader.hbs  |   5 +-
 .../templates/components/basic-topic-list.hbs |  41 +-
 .../categories-boxes-with-topics.hbs          |  29 +-
 .../templates/components/categories-boxes.hbs |  89 ++---
 .../templates/components/categories-only.hbs  | 108 ++---
 .../templates/components/choose-message.hbs   |   2 +-
 .../components/composer-user-selector.hbs     |  24 +-
 .../components/edit-category-settings.hbs     | 141 ++++---
 .../components/future-date-input.hbs          |  34 +-
 .../components/group-card-contents.hbs        |  25 +-
 .../components/group-manage-save-button.hbs   |   8 +-
 .../templates/components/group-post.hbs       |  33 +-
 .../templates/components/invite-panel.hbs     |   9 +-
 .../templates/components/navigation-bar.hbs   |   2 +-
 .../templates/components/navigation-item.hbs  |   8 +-
 .../components/reviewable-flagged-post.hbs    |   2 +-
 .../components/reviewable-histories.hbs       |  40 +-
 .../components/reviewable-scores.hbs          |   8 +-
 .../components/search-advanced-options.hbs    |   4 +-
 .../templates/components/topic-progress.hbs   |   8 +-
 .../components/user-card-contents.hbs         |   6 +-
 .../components/user-fields/dropdown.hbs       |   7 +-
 .../templates/components/user-stream-item.hbs |  10 +-
 .../discourse/templates/full-page-search.hbs  |   4 +-
 .../discourse/templates/group-index.hbs       | 147 +++----
 .../discourse/templates/group-requests.hbs    |  98 ++---
 .../javascripts/discourse/templates/group.hbs |  17 +-
 .../discourse/templates/group/activity.hbs    |   4 +-
 .../discourse/templates/group/manage.hbs      |   2 +-
 .../discourse/templates/group/messages.hbs    |   5 +-
 .../discourse/templates/groups/index.hbs      |  16 +-
 .../discourse/templates/invites/show.hbs      |  20 +-
 .../mobile/components/basic-topic-list.hbs    |  96 ++---
 .../mobile/components/categories-only.hbs     | 109 ++---
 .../templates/mobile/group-index.hbs          | 103 ++---
 .../discourse/templates/modal/bookmark.hbs    | 144 +++----
 .../templates/modal/create-account.hbs        | 196 ++++-----
 .../discourse/templates/modal/flag.hbs        |  30 +-
 .../templates/modal/insert-hyperlink.hbs      |  70 ++--
 .../modal/keyboard-shortcuts-help.hbs         |  30 +-
 .../templates/modal/reorder-categories.hbs    |  32 +-
 .../modal/second-factor-add-totp.hbs          |   8 +-
 .../modal/second-factor-backup-edit.hbs       |  82 ++--
 .../modal/second-factor-edit-security-key.hbs |  15 +-
 .../templates/modal/second-factor-edit.hbs    |  15 +-
 .../discourse/templates/password-reset.hbs    |   3 +-
 .../templates/preferences-second-factor.hbs   | 293 +++++++-------
 .../templates/preferences/account.hbs         |  81 ++--
 .../discourse/templates/preferences/apps.hbs  |  44 +--
 .../templates/preferences/emails.hbs          |   2 +-
 .../templates/preferences/interface.hbs       |  26 +-
 .../templates/preferences/notifications.hbs   |   2 +-
 .../templates/preferences/profile.hbs         |  14 +-
 .../discourse/templates/preferences/tags.hbs  | 113 +++---
 .../discourse/templates/review-topics.hbs     |  46 +--
 .../discourse/templates/tags/show.hbs         |  96 ++---
 .../discourse/templates/user-invited-show.hbs |   4 +-
 .../javascripts/discourse/templates/user.hbs  | 276 +++++++------
 .../discourse/templates/user/activity.hbs     |  33 +-
 .../discourse/templates/user/bookmarks.hbs    |  68 ++--
 .../discourse/templates/user/messages.hbs     |   9 +-
 .../templates/user/notifications.hbs          |  20 +-
 .../discourse/templates/user/summary.hbs      | 298 +++++++-------
 .../templates/components/multi-select.hbs     |  10 +-
 .../templates/components/single-select.hbs    |  10 +-
 .../components/wizard-field-checkbox.hbs      |  11 +-
 101 files changed, 2543 insertions(+), 2489 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 232c2549ca..f5ff55a03d 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -6,7 +6,7 @@ module.exports = {
   // "eol-last": "always",
 
   rules: {
-    "block-indentation": false,
+    "block-indentation": true,
     "deprecated-render-helper": true,
     "img-alt-attributes": false,
     "linebreak-style": true,
diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index 2396114db6..dacf526c53 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -1,35 +1,33 @@
 {{#admin-wrapper class="container"}}
   <div class="row">
     <div class="full-width">
-    <div class="admin-main-nav">
-
-      <ul class="nav nav-pills">
-
-        {{nav-item route='admin.dashboard' label='admin.dashboard.title'}}
-        {{#if currentUser.admin}}
-          {{nav-item route='adminSiteSettings' label='admin.site_settings.title'}}
-        {{/if}}
-        {{nav-item route='adminUsersList' label='admin.users.title'}}
-        {{#if showGroups}}
-          {{nav-item route='groups' label='admin.groups.title'}}
-        {{/if}}
-        {{#if showBadges}}
-          {{nav-item route='adminBadges' label='admin.badges.title'}}
-        {{/if}}
-        {{#if currentUser.admin}}
-          {{nav-item route='adminEmail' label='admin.email.title'}}
-        {{/if}}
-        {{nav-item route='adminLogs' label='admin.logs.title'}}
-        {{#if currentUser.admin}}
-          {{nav-item route='adminCustomize' label='admin.customize.title'}}
-          {{nav-item route='adminApi' label='admin.api.title'}}
-          {{#if siteSettings.enable_backups}}
-            {{nav-item route='admin.backups' label='admin.backups.title'}}
+      <div class="admin-main-nav">
+        <ul class="nav nav-pills">
+          {{nav-item route='admin.dashboard' label='admin.dashboard.title'}}
+          {{#if currentUser.admin}}
+            {{nav-item route='adminSiteSettings' label='admin.site_settings.title'}}
           {{/if}}
-        {{/if}}
-        {{nav-item route='adminPlugins' label='admin.plugins.title'}}
-        {{plugin-outlet name="admin-menu" connectorTagName="" tagName=""}}
-      </ul>
+          {{nav-item route='adminUsersList' label='admin.users.title'}}
+          {{#if showGroups}}
+            {{nav-item route='groups' label='admin.groups.title'}}
+          {{/if}}
+          {{#if showBadges}}
+            {{nav-item route='adminBadges' label='admin.badges.title'}}
+          {{/if}}
+          {{#if currentUser.admin}}
+            {{nav-item route='adminEmail' label='admin.email.title'}}
+          {{/if}}
+          {{nav-item route='adminLogs' label='admin.logs.title'}}
+          {{#if currentUser.admin}}
+            {{nav-item route='adminCustomize' label='admin.customize.title'}}
+            {{nav-item route='adminApi' label='admin.api.title'}}
+            {{#if siteSettings.enable_backups}}
+              {{nav-item route='admin.backups' label='admin.backups.title'}}
+            {{/if}}
+          {{/if}}
+          {{nav-item route='adminPlugins' label='admin.plugins.title'}}
+          {{plugin-outlet name="admin-menu" connectorTagName="" tagName=""}}
+        </ul>
       </div>
 
       <div class='boxed white admin-content'>
@@ -37,7 +35,6 @@
           {{outlet}}
         </div>
       </div>
-
     </div>
   </div>
 {{/admin-wrapper}}
diff --git a/app/assets/javascripts/admin/templates/api-keys-index.hbs b/app/assets/javascripts/admin/templates/api-keys-index.hbs
index bd91228055..0672b99f4f 100644
--- a/app/assets/javascripts/admin/templates/api-keys-index.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys-index.hbs
@@ -6,65 +6,65 @@
 
 {{#if model}}
   <table class="api-keys grid">
-  <thead>
-    <th>{{i18n "admin.api.key"}}</th>
-    <th>{{i18n "admin.api.description"}}</th>
-    <th>{{i18n "admin.api.user"}}</th>
-    <th>{{i18n "admin.api.created"}}</th>
-    <th>{{i18n "admin.api.last_used"}}</th>
-    <th>&nbsp;</th>
-  </thead>
-  <tbody>
-    {{#each model as |k|}}
-      <tr class={{if k.revoked_at "revoked"}}>
-        <td class="key">
-          {{#if k.revoked_at}}{{d-icon 'times-circle'}}{{/if}}
-          {{k.truncatedKey}}
-        </td>
-        <td class="key-description">
-          {{k.shortDescription}}
-        </td>
-        <td class="key-user">
-          <div class="label">{{i18n 'admin.api.user'}}</div>
-          {{#if k.user}}
-            {{#link-to "adminUser" k.user}}
-              {{avatar k.user imageSize="small"}}
-            {{/link-to}}
-          {{else}}
-            {{i18n "admin.api.all_users"}}
-          {{/if}}
-        </td>
-        <td class="key-created">
-          <div class="label">{{i18n 'admin.api.created'}}</div>
-          {{format-date k.created_at}}
-        </td>
-        <td class="key-last-used">
-          <div class="label">{{i18n 'admin.api.last_used'}}</div>
-          {{#if k.last_used_at}}
-            {{format-date k.last_used_at}}
-          {{else}}
-            {{i18n "admin.api.never_used"}}
-          {{/if}}
-        </td>
-        <td class="key-controls">
-          {{d-button action=(route-action "show" k) icon="far-eye" title="admin.api.show_details"}}
-          {{#if k.revoked_at}}
-            {{d-button
-              action=(action "undoRevokeKey")
-              actionParam=k icon="undo"
-              title="admin.api.undo_revoke"}}
-          {{else}}
-            {{d-button
-              class="btn-danger"
-              action=(action "revokeKey")
-              actionParam=k
-              icon="times"
-              title="admin.api.revoke"}}
-          {{/if}}
-        </td>
-      </tr>
-    {{/each}}
-  </tbody>
+    <thead>
+      <th>{{i18n "admin.api.key"}}</th>
+      <th>{{i18n "admin.api.description"}}</th>
+      <th>{{i18n "admin.api.user"}}</th>
+      <th>{{i18n "admin.api.created"}}</th>
+      <th>{{i18n "admin.api.last_used"}}</th>
+      <th>&nbsp;</th>
+    </thead>
+    <tbody>
+      {{#each model as |k|}}
+        <tr class={{if k.revoked_at "revoked"}}>
+          <td class="key">
+            {{#if k.revoked_at}}{{d-icon 'times-circle'}}{{/if}}
+            {{k.truncatedKey}}
+          </td>
+          <td class="key-description">
+            {{k.shortDescription}}
+          </td>
+          <td class="key-user">
+            <div class="label">{{i18n 'admin.api.user'}}</div>
+            {{#if k.user}}
+              {{#link-to "adminUser" k.user}}
+                {{avatar k.user imageSize="small"}}
+              {{/link-to}}
+            {{else}}
+              {{i18n "admin.api.all_users"}}
+            {{/if}}
+          </td>
+          <td class="key-created">
+            <div class="label">{{i18n 'admin.api.created'}}</div>
+            {{format-date k.created_at}}
+          </td>
+          <td class="key-last-used">
+            <div class="label">{{i18n 'admin.api.last_used'}}</div>
+            {{#if k.last_used_at}}
+              {{format-date k.last_used_at}}
+            {{else}}
+              {{i18n "admin.api.never_used"}}
+            {{/if}}
+          </td>
+          <td class="key-controls">
+            {{d-button action=(route-action "show" k) icon="far-eye" title="admin.api.show_details"}}
+            {{#if k.revoked_at}}
+              {{d-button
+                action=(action "undoRevokeKey")
+                actionParam=k icon="undo"
+                title="admin.api.undo_revoke"}}
+            {{else}}
+              {{d-button
+                class="btn-danger"
+                action=(action "revokeKey")
+                actionParam=k
+                icon="times"
+                title="admin.api.revoke"}}
+            {{/if}}
+          </td>
+        </tr>
+      {{/each}}
+    </tbody>
   </table>
 {{else}}
   <p>{{i18n "admin.api.none"}}</p>
diff --git a/app/assets/javascripts/admin/templates/api-keys-show.hbs b/app/assets/javascripts/admin/templates/api-keys-show.hbs
index b96bc109b3..736a4ef777 100644
--- a/app/assets/javascripts/admin/templates/api-keys-show.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys-show.hbs
@@ -30,11 +30,11 @@
 
   {{#admin-form-row label="admin.api.user"}}
     {{#if model.user}}
-        {{#link-to "adminUser" model.user}}
-            {{avatar model.user imageSize="small"}} {{model.user.username}}
-        {{/link-to}}
+      {{#link-to "adminUser" model.user}}
+        {{avatar model.user imageSize="small"}} {{model.user.username}}
+      {{/link-to}}
     {{else}}
-        {{i18n "admin.api.all_users"}}
+      {{i18n "admin.api.all_users"}}
     {{/if}}
   {{/admin-form-row}}
 
diff --git a/app/assets/javascripts/admin/templates/backups-index.hbs b/app/assets/javascripts/admin/templates/backups-index.hbs
index 9bfbfc2181..8c5e593a63 100644
--- a/app/assets/javascripts/admin/templates/backups-index.hbs
+++ b/app/assets/javascripts/admin/templates/backups-index.hbs
@@ -41,57 +41,57 @@
     <th></th>
   </thead>
   <tbody>
-  {{#each model as |backup|}}
-    <tr>
-      <td class="backup-filename">{{backup.filename}}</td>
-      <td class="backup-size">{{human-size backup.size}}</td>
-      <td class="backup-controls">
-        <div>
-          {{d-button class="btn-default download"
-             action=(action "download")
-             actionParam=backup
-             icon="download"
-             title="admin.backups.operations.download.title"
-             label="admin.backups.operations.download.label"}}
-          {{#if status.isOperationRunning}}
-            {{d-button
-              icon="far-trash-alt"
-              action=(route-action "destroyBackup")
-              actionParam=backup class="btn-danger"
-              disabled="true"
-              title="admin.backups.operations.is_running"}}
-            {{d-button
-              icon="play"
-              action=(route-action "startRestore")
-              actionParam=backup disabled=status.restoreDisabled
-              class="btn-default"
-              title=restoreTitle
-              label="admin.backups.operations.restore.label"}}
-          {{else}}
-            {{d-button
-              icon="far-trash-alt"
-              action=(route-action "destroyBackup")
-              actionParam=backup
-              class="btn-danger"
-              title="admin.backups.operations.destroy.title"}}
-            {{d-button
-              icon="play"
-              action=(route-action "startRestore")
-              actionParam=backup
-              disabled=status.restoreDisabled
-              class="btn-default btn-restore"
-              title=restoreTitle
-              label="admin.backups.operations.restore.label"}}
-          {{/if}}
-        </div>
-      </td>
-    </tr>
-  {{else}}
-    <tr>
-      <td>{{i18n "admin.backups.none"}}</td>
-      <td></td>
-      <td></td>
-    </tr>
-  {{/each}}
+    {{#each model as |backup|}}
+      <tr>
+        <td class="backup-filename">{{backup.filename}}</td>
+        <td class="backup-size">{{human-size backup.size}}</td>
+        <td class="backup-controls">
+          <div>
+            {{d-button class="btn-default download"
+               action=(action "download")
+               actionParam=backup
+               icon="download"
+               title="admin.backups.operations.download.title"
+               label="admin.backups.operations.download.label"}}
+            {{#if status.isOperationRunning}}
+              {{d-button
+                icon="far-trash-alt"
+                action=(route-action "destroyBackup")
+                actionParam=backup class="btn-danger"
+                disabled="true"
+                title="admin.backups.operations.is_running"}}
+              {{d-button
+                icon="play"
+                action=(route-action "startRestore")
+                actionParam=backup disabled=status.restoreDisabled
+                class="btn-default"
+                title=restoreTitle
+                label="admin.backups.operations.restore.label"}}
+            {{else}}
+              {{d-button
+                icon="far-trash-alt"
+                action=(route-action "destroyBackup")
+                actionParam=backup
+                class="btn-danger"
+                title="admin.backups.operations.destroy.title"}}
+              {{d-button
+                icon="play"
+                action=(route-action "startRestore")
+                actionParam=backup
+                disabled=status.restoreDisabled
+                class="btn-default btn-restore"
+                title=restoreTitle
+                label="admin.backups.operations.restore.label"}}
+            {{/if}}
+          </div>
+        </td>
+      </tr>
+    {{else}}
+      <tr>
+        <td>{{i18n "admin.backups.none"}}</td>
+        <td></td>
+        <td></td>
+      </tr>
+    {{/each}}
   </tbody>
 </table>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
index 76c8eacb0b..9b7f797d03 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
@@ -8,7 +8,7 @@
         {{data.x}}
       </span>
       <span class="value">
-          {{number data.y}}
+        {{number data.y}}
       </span>
     </a>
   {{/each}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index 48bd58cab9..15d7314622 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -1,202 +1,202 @@
 {{#if isEnabled}}
-{{#conditional-loading-section isLoading=isLoading}}
-  {{#if showHeader}}
-    <div class="header">
-      {{#if showTitle}}
-        <ul class="breadcrumb">
-          {{#if showAllReportsLink}}
-            <li class="item all-reports">
-              {{#link-to "admin.dashboardReports" class="report-url"}}
-                {{i18n "admin.dashboard.all_reports"}}
-              {{/link-to}}
-            </li>
+  {{#conditional-loading-section isLoading=isLoading}}
+    {{#if showHeader}}
+      <div class="header">
+        {{#if showTitle}}
+          <ul class="breadcrumb">
+            {{#if showAllReportsLink}}
+              <li class="item all-reports">
+                {{#link-to "admin.dashboardReports" class="report-url"}}
+                  {{i18n "admin.dashboard.all_reports"}}
+                {{/link-to}}
+              </li>
+
+              {{#unless showNotFoundError}}
+                <li class="item separator">|</li>
+              {{/unless}}
+            {{/if}}
 
             {{#unless showNotFoundError}}
-              <li class="item separator">|</li>
-            {{/unless}}
-          {{/if}}
-
-          {{#unless showNotFoundError}}
-          <li class="item report">
-            <a href={{model.reportUrl}} class="report-url">
-              {{model.title}}
-            </a>
-
-            {{#if model.description}}
-              {{#if model.description_link}}
-                <a target="_blank" rel="noopener" href={{model.description_link}} class="info" data-tooltip={{model.description}}>
-                  {{d-icon "question-circle"}}
-                </a>
-              {{else}}
-                <span class="info" data-tooltip={{model.description}}>
-                  {{d-icon "question-circle"}}
-                </span>
-              {{/if}}
-            {{/if}}
-          </li>
-          {{/unless}}
-        </ul>
-      {{/if}}
-
-      {{#if shouldDisplayTrend}}
-        <div class="trend {{model.trend}}">
-          <span class="value" title={{model.trendTitle}}>
-            {{#if model.average}}
-              {{number model.currentAverage}}{{#if model.percent}}%{{/if}}
-            {{else}}
-              {{number model.currentTotal noTitle="true"}}{{#if model.percent}}%{{/if}}
-            {{/if}}
-
-            {{#if model.trendIcon}}
-              {{d-icon model.trendIcon class="icon"}}
-            {{/if}}
-          </span>
-        </div>
-      {{/if}}
-    </div>
-  {{/if}}
-
-  <div class="body">
-    <div class="main">
-      {{#if showError}}
-        {{#if showTimeoutError}}
-          <div class="alert alert-error report-alert timeout">
-            {{d-icon "exclamation-triangle"}}
-            <span>{{i18n "admin.dashboard.timeout_error"}}</span>
-          </div>
-        {{/if}}
-
-        {{#if showExceptionError}}
-          <div class="alert alert-error report-alert exception">
-            {{d-icon "exclamation-triangle"}}
-            <span>{{i18n "admin.dashboard.exception_error"}}</span>
-          </div>
-        {{/if}}
-
-        {{#if showNotFoundError}}
-          <div class="alert alert-error report-alert not-found">
-            {{d-icon "exclamation-triangle"}}
-            <span>{{i18n "admin.dashboard.not_found_error"}}</span>
-          </div>
-        {{/if}}
-      {{else}}
-        {{#if hasData}}
-          {{#if currentMode}}
-            {{component modeComponent model=model options=options}}
-
-            {{#if model.relatedReport}}
-              {{admin-report showFilteringUI=false dataSourceName=model.relatedReport.type}}
-            {{/if}}
-          {{/if}}
-        {{else}}
-          {{#if rateLimitationString}}
-            <div class="alert alert-error report-alert rate-limited">
-              {{d-icon "thermometer-three-quarters"}}
-              <span>{{rateLimitationString}}</span>
-            </div>
-          {{else}}
-            <div class="alert alert-info report-alert no-data">
-              {{d-icon "chart-pie"}}
-              {{#if model.reportUrl}}
+              <li class="item report">
                 <a href={{model.reportUrl}} class="report-url">
-                  <span>
-                    {{#if model.title}}
-                      {{model.title}} —
-                    {{/if}}
-                    {{i18n "admin.dashboard.reports.no_data"}}
-                  </span>
+                  {{model.title}}
                 </a>
+
+                {{#if model.description}}
+                  {{#if model.description_link}}
+                    <a target="_blank" rel="noopener" href={{model.description_link}} class="info" data-tooltip={{model.description}}>
+                      {{d-icon "question-circle"}}
+                    </a>
+                  {{else}}
+                    <span class="info" data-tooltip={{model.description}}>
+                      {{d-icon "question-circle"}}
+                    </span>
+                  {{/if}}
+                {{/if}}
+              </li>
+            {{/unless}}
+          </ul>
+        {{/if}}
+
+        {{#if shouldDisplayTrend}}
+          <div class="trend {{model.trend}}">
+            <span class="value" title={{model.trendTitle}}>
+              {{#if model.average}}
+                {{number model.currentAverage}}{{#if model.percent}}%{{/if}}
               {{else}}
-                <span>{{i18n "admin.dashboard.reports.no_data"}}</span>
+                {{number model.currentTotal noTitle="true"}}{{#if model.percent}}%{{/if}}
               {{/if}}
-            </div>
-          {{/if}}
-        {{/if}}
-      {{/if}}
-    </div>
 
-    {{#if showFilteringUI}}
-      <div class="filters">
-        {{#if showModes}}
-          <div class="modes">
-            {{#each displayedModes as |displayedMode|}}
-              {{d-button
-                action=(action "changeMode")
-                actionParam=displayedMode.mode
-                class=displayedMode.cssClass
-                icon=displayedMode.icon}}
-            {{/each}}
-          </div>
-        {{/if}}
-
-        {{#if showDatesOptions}}
-          <div class="control">
-            <span class="label">
-              {{i18n 'admin.dashboard.reports.start_date'}}
+              {{#if model.trendIcon}}
+                {{d-icon model.trendIcon class="icon"}}
+              {{/if}}
             </span>
-
-            <div class="input">
-              {{date-input
-                date=startDate
-                onChange=(action "onChangeStartDate")
-              }}
-            </div>
-          </div>
-
-          <div class="control">
-            <span class="label">
-              {{i18n 'admin.dashboard.reports.end_date'}}
-            </span>
-
-            <div class="input">
-              {{date-input
-                date=endDate
-                onChange=(action "onChangeEndDate")
-              }}
-            </div>
-          </div>
-        {{/if}}
-
-        {{#each model.available_filters as |filter|}}
-          <div class="control">
-            <span class="label">
-              {{i18n (concat "admin.dashboard.reports.filters." filter.id ".label")}}
-            </span>
-
-            <div class="input">
-              {{component
-                (concat "report-filters/" filter.id)
-                filter=filter
-                applyFilter=(action "applyFilter")}}
-            </div>
-          </div>
-        {{/each}}
-
-        <div class="control">
-          <div class="input">
-            {{d-button
-              class="btn-default export-csv-btn"
-              action=(action "exportCsv")
-              label="admin.export_csv.button_text"
-              icon="download"}}
-          </div>
-        </div>
-
-        {{#if showRefresh}}
-          <div class="control">
-            <div class="input">
-              {{d-button
-                class="refresh-report-btn btn-primary"
-                action=(action "refreshReport")
-                label="admin.dashboard.reports.refresh_report"
-                icon="sync"}}
-            </div>
           </div>
         {{/if}}
       </div>
     {{/if}}
-  </div>
-{{/conditional-loading-section}}
+
+    <div class="body">
+      <div class="main">
+        {{#if showError}}
+          {{#if showTimeoutError}}
+            <div class="alert alert-error report-alert timeout">
+              {{d-icon "exclamation-triangle"}}
+              <span>{{i18n "admin.dashboard.timeout_error"}}</span>
+            </div>
+          {{/if}}
+
+          {{#if showExceptionError}}
+            <div class="alert alert-error report-alert exception">
+              {{d-icon "exclamation-triangle"}}
+              <span>{{i18n "admin.dashboard.exception_error"}}</span>
+            </div>
+          {{/if}}
+
+          {{#if showNotFoundError}}
+            <div class="alert alert-error report-alert not-found">
+              {{d-icon "exclamation-triangle"}}
+              <span>{{i18n "admin.dashboard.not_found_error"}}</span>
+            </div>
+          {{/if}}
+        {{else}}
+          {{#if hasData}}
+            {{#if currentMode}}
+              {{component modeComponent model=model options=options}}
+
+              {{#if model.relatedReport}}
+                {{admin-report showFilteringUI=false dataSourceName=model.relatedReport.type}}
+              {{/if}}
+            {{/if}}
+          {{else}}
+            {{#if rateLimitationString}}
+              <div class="alert alert-error report-alert rate-limited">
+                {{d-icon "thermometer-three-quarters"}}
+                <span>{{rateLimitationString}}</span>
+              </div>
+            {{else}}
+              <div class="alert alert-info report-alert no-data">
+                {{d-icon "chart-pie"}}
+                {{#if model.reportUrl}}
+                  <a href={{model.reportUrl}} class="report-url">
+                    <span>
+                      {{#if model.title}}
+                        {{model.title}} —
+                      {{/if}}
+                      {{i18n "admin.dashboard.reports.no_data"}}
+                    </span>
+                  </a>
+                {{else}}
+                  <span>{{i18n "admin.dashboard.reports.no_data"}}</span>
+                {{/if}}
+              </div>
+            {{/if}}
+          {{/if}}
+        {{/if}}
+      </div>
+
+      {{#if showFilteringUI}}
+        <div class="filters">
+          {{#if showModes}}
+            <div class="modes">
+              {{#each displayedModes as |displayedMode|}}
+                {{d-button
+                  action=(action "changeMode")
+                  actionParam=displayedMode.mode
+                  class=displayedMode.cssClass
+                  icon=displayedMode.icon}}
+              {{/each}}
+            </div>
+          {{/if}}
+
+          {{#if showDatesOptions}}
+            <div class="control">
+              <span class="label">
+                {{i18n 'admin.dashboard.reports.start_date'}}
+              </span>
+
+              <div class="input">
+                {{date-input
+                  date=startDate
+                  onChange=(action "onChangeStartDate")
+                }}
+              </div>
+            </div>
+
+            <div class="control">
+              <span class="label">
+                {{i18n 'admin.dashboard.reports.end_date'}}
+              </span>
+
+              <div class="input">
+                {{date-input
+                  date=endDate
+                  onChange=(action "onChangeEndDate")
+                }}
+              </div>
+            </div>
+          {{/if}}
+
+          {{#each model.available_filters as |filter|}}
+            <div class="control">
+              <span class="label">
+                {{i18n (concat "admin.dashboard.reports.filters." filter.id ".label")}}
+              </span>
+
+              <div class="input">
+                {{component
+                  (concat "report-filters/" filter.id)
+                  filter=filter
+                  applyFilter=(action "applyFilter")}}
+              </div>
+            </div>
+          {{/each}}
+
+          <div class="control">
+            <div class="input">
+              {{d-button
+                class="btn-default export-csv-btn"
+                action=(action "exportCsv")
+                label="admin.export_csv.button_text"
+                icon="download"}}
+            </div>
+          </div>
+
+          {{#if showRefresh}}
+            <div class="control">
+              <div class="input">
+                {{d-button
+                  class="refresh-report-btn btn-primary"
+                  action=(action "refreshReport")
+                  label="admin.dashboard.reports.refresh_report"
+                  icon="sync"}}
+              </div>
+            </div>
+          {{/if}}
+        </div>
+      {{/if}}
+    </div>
+  {{/conditional-loading-section}}
 {{else}}
   <div class="alert alert-info">
     {{html-safe disabledLabel}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
index ba31c888c3..3f9e09eec8 100644
--- a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
@@ -1,94 +1,90 @@
 <div class='edit-main-nav admin-controls'>
-    <nav>
+  <nav>
     <ul class='nav nav-pills target'>
-        {{#each visibleTargets as |target|}}
+      {{#each visibleTargets as |target|}}
         <li>
-            {{#link-to editRouteName
-                theme.id
-                target.name
-                fieldName
-                replace=true
-                title=field.title
-                class=(if target.edited 'edited' 'blank')
-            }}
+          {{#link-to editRouteName
+            theme.id
+            target.name
+            fieldName
+            replace=true
+            title=field.title
+            class=(if target.edited 'edited' 'blank')
+          }}
             {{#if target.error}}{{d-icon 'exclamation-triangle'}}{{/if}}
-            {{#if target.icon}}
-                {{d-icon target.icon}}
-            {{/if}}
+            {{#if target.icon}}{{d-icon target.icon}}{{/if}}
             {{i18n (concat 'admin.customize.theme.' target.name)}}
-            {{/link-to}}
+          {{/link-to}}
         </li>
-        {{/each}}
+      {{/each}}
 
-        {{#if allowAdvanced}}
+      {{#if allowAdvanced}}
         <li>
-            <a {{action "toggleShowAdvanced"}}
-                class='no-text'
-                href
-                title={{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}
-            >
-                {{d-icon (if showAdvanced "angle-double-left" "angle-double-right")}}
-            </a>
+          <a {{action "toggleShowAdvanced"}}
+            class='no-text'
+            href
+            title={{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}>
+            {{d-icon (if showAdvanced "angle-double-left" "angle-double-right")}}
+          </a>
         </li>
-        {{/if}}
-
-        <li class="spacer"></li>
-        <li>
+      {{/if}}
+      <li class="spacer"></li>
+      <li>
         <label>
-            {{input type="checkbox" checked=onlyOverridden click=(action "onlyOverriddenChanged" value="target.checked")}}
-            {{i18n 'admin.customize.theme.hide_unused_fields'}}
+          {{input type="checkbox" checked=onlyOverridden click=(action "onlyOverriddenChanged" value="target.checked")}}
+          {{i18n 'admin.customize.theme.hide_unused_fields'}}
         </label>
-        </li>
+      </li>
     </ul>
-    </nav>
+  </nav>
 </div>
 
 <div class='admin-controls'>
-    <nav>
+  <nav>
     <ul class='nav nav-pills fields'>
-        {{#each visibleFields as |field|}}
+      {{#each visibleFields as |field|}}
         <li>
-            {{#link-to editRouteName
+          {{#link-to editRouteName
             theme.id
             currentTargetName
             field.name
             replace=true
             title=field.title
             class=(if field.edited 'edited' 'blank')
-            }}
+          }}
             {{#if field.error}}{{d-icon 'exclamation-triangle'}}{{/if}}
             {{#if field.icon}}{{d-icon field.icon}}{{/if}}
             {{field.translatedName}}
-
-            {{/link-to}}
+          {{/link-to}}
         </li>
-        {{/each}}
+      {{/each}}
 
-        {{#if showAddField}}
+      {{#if showAddField}}
         <li>
-            {{#if addingField}}
+          {{#if addingField}}
             {{input type=text value=newFieldName enter=(action 'addField') escape-press=(action "cancelAddField")}}
             {{d-button class="ok" action=(action "addField" newFieldName) icon="check"}}
             {{d-button class="cancel" action=(action "cancelAddField") icon="times"}}
-            {{else}}
+          {{else}}
             <a href {{action "toggleAddField" currentTargetName}} class="no-text">
-            {{d-icon "plus"}}
+              {{d-icon "plus"}}
             </a>
-            {{/if}}
+          {{/if}}
         </li>
-        {{/if}}
-        <li class='spacer'></li>
-        <li>
+      {{/if}}
+
+      <li class='spacer'></li>
+      <li>
         <a href {{action "toggleMaximize"}} class="no-text">
           {{d-icon maximizeIcon}}
         </a>
-        </li>
+      </li>
     </ul>
-    </nav>
+  </nav>
 </div>
 
 {{#if error}}
-    <pre class='field-error'>{{error}}</pre>
+  <pre class='field-error'>{{error}}</pre>
 {{/if}}
 
 {{ace-editor content=activeSection editorId=editorId mode=activeSectionMode autofocus="true"}}
diff --git a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
index b7833d621d..393cf15165 100644
--- a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
@@ -3,10 +3,10 @@
     <div class="label">{{i18n "admin.embedding.host"}}</div>
     {{input value=buffered.host placeholder="example.com" enter=(action "save") class="host-name"}}
   </td>
-	<td class="editing-input">
+  <td class="editing-input">
     <div class="label">{{i18n "admin.embedding.class_name"}}</div>
     {{input value=buffered.class_name placeholder="class" enter=(action "save") class="class-name"}}
-	</td>
+  </td>
   <td class="editing-input">
     <div class="label">{{i18n "admin.embedding.path_whitelist"}}</div>
     {{input value=buffered.path_whitelist placeholder="/blog/.*" enter=(action "save") class="path-whitelist"}}
diff --git a/app/assets/javascripts/admin/templates/components/silence-details.hbs b/app/assets/javascripts/admin/templates/components/silence-details.hbs
index bdcb21cbc5..f34559ec3d 100644
--- a/app/assets/javascripts/admin/templates/components/silence-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/silence-details.hbs
@@ -3,11 +3,12 @@
     <div class='silence-reason-label'>
       {{html-safe (i18n 'admin.user.silence_reason_label')}}
     </div>
-    </label>
-    {{text-field
-      value=reason
-      class="silence-reason"
-      placeholderKey="admin.user.silence_reason_placeholder"}}
+  </label>
+  {{text-field
+    value=reason
+    class="silence-reason"
+    placeholderKey="admin.user.silence_reason_placeholder"
+  }}
 </div>
 
 <label>
diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs
index 23eee45b6d..6984723cd6 100644
--- a/app/assets/javascripts/admin/templates/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-setting.hbs
@@ -1,8 +1,8 @@
 <div class='setting-label'>
-   <h3>{{settingName}}</h3>
-   {{#if defaultIsAvailable}}
-     <a href onClick={{action 'setDefaultValues'}}>{{setting.setDefaultValuesLabel}}</a>
-   {{/if}}
+  <h3>{{settingName}}</h3>
+  {{#if defaultIsAvailable}}
+    <a href onClick={{action 'setDefaultValues'}}>{{setting.setDefaultValuesLabel}}</a>
+  {{/if}}
 </div>
 <div class="setting-value">
   {{component componentName setting=setting value=buffered.value validationMessage=validationMessage preview=preview isSecret=isSecret allowAny=allowAny}}
diff --git a/app/assets/javascripts/admin/templates/customize-colors-show.hbs b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
index ca912cfc33..825095909e 100644
--- a/app/assets/javascripts/admin/templates/customize-colors-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
@@ -3,31 +3,35 @@
     <h1>{{#if model.theme_id}}{{model.name}}{{else}}{{text-field class="style-name" value=model.name}}{{/if}}</h1>
     <div class="controls">
       {{#unless model.theme_id}}
-      {{d-button
-        class="btn-primary"
-        action=(action "save")
-        disabled=model.disableSave
-        label="admin.customize.save"}}
+        {{d-button
+          class="btn-primary"
+          action=(action "save")
+          disabled=model.disableSave
+          label="admin.customize.save"
+        }}
       {{/unless}}
       {{d-button
         class="btn-default"
         action=(action "copy" model)
         icon="copy"
-        label="admin.customize.copy"}}
+        label="admin.customize.copy"
+      }}
       {{d-button
         class="btn-default"
         action=(action "copyToClipboard" model)
         icon="far-clipboard"
-        label="admin.customize.copy_to_clipboard"}}
+        label="admin.customize.copy_to_clipboard"
+      }}
       {{#if model.theme_id}}
-      {{i18n "admin.customize.theme_owner"}}
-      {{#link-to "adminCustomizeThemes.show" model.theme_id}}{{model.theme_name}}{{/link-to}}
+        {{i18n "admin.customize.theme_owner"}}
+        {{#link-to "adminCustomizeThemes.show" model.theme_id}}{{model.theme_name}}{{/link-to}}
       {{else}}
-      {{d-button
-        action=(action "destroy")
-        class="btn-danger"
-        icon="far-trash-alt"
-        label="admin.customize.delete"}}
+        {{d-button
+          action=(action "destroy")
+          class="btn-danger"
+          icon="far-trash-alt"
+          label="admin.customize.delete"
+        }}
       {{/if}}
       <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
     </div>
@@ -44,40 +48,40 @@
     </div>
 
     {{#if colors.length}}
-    <table class="table colors">
-      <thead>
-        <tr>
-          <th></th>
-          <th class="hex">{{i18n 'admin.customize.color'}}</th>
-          <th></th>
-        </tr>
-      </thead>
-      <tbody>
-        {{#each colors as |c|}}
-          <tr class="{{if c.changed 'changed'}} {{if c.valid 'valid' 'invalid'}}">
-            <td class="name" title={{c.name}}>
-              <h3>{{c.translatedName}}</h3>
-              <p class="description">{{c.description}}</p>
-            </td>
-            <td class="hex">{{color-input hexValue=c.hex brightnessValue=c.brightness valid=c.valid}}</td>
-            <td class="actions">
-            {{#unless model.theme_id}}
-              {{d-button
-                class=(concat "btn-default revert " (unless c.savedIsOverriden "invisible"))
-                action=(action "revert" c)
-                title="admin.customize.colors.revert_title"
-                label="revert"}}
-              {{d-button
-                class=(concat "btn-default undo " (unless c.changed "invisible"))
-                action=(action "undo" c)
-                title="admin.customize.colors.undo_title"
-                label="undo"}}
-            {{/unless}}
-            </td>
+      <table class="table colors">
+        <thead>
+          <tr>
+            <th></th>
+            <th class="hex">{{i18n 'admin.customize.color'}}</th>
+            <th></th>
           </tr>
-        {{/each}}
-      </tbody>
-    </table>
+        </thead>
+        <tbody>
+          {{#each colors as |c|}}
+            <tr class="{{if c.changed 'changed'}} {{if c.valid 'valid' 'invalid'}}">
+              <td class="name" title={{c.name}}>
+                <h3>{{c.translatedName}}</h3>
+                <p class="description">{{c.description}}</p>
+              </td>
+              <td class="hex">{{color-input hexValue=c.hex brightnessValue=c.brightness valid=c.valid}}</td>
+              <td class="actions">
+                {{#unless model.theme_id}}
+                  {{d-button
+                    class=(concat "btn-default revert " (unless c.savedIsOverriden "invisible"))
+                    action=(action "revert" c)
+                    title="admin.customize.colors.revert_title"
+                    label="revert"}}
+                  {{d-button
+                    class=(concat "btn-default undo " (unless c.changed "invisible"))
+                    action=(action "undo" c)
+                    title="admin.customize.colors.undo_title"
+                    label="undo"}}
+                {{/unless}}
+              </td>
+            </tr>
+          {{/each}}
+        </tbody>
+      </table>
     {{else}}
       <p>{{i18n 'search.no_results'}}</p>
     {{/if}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
index 32ad33db10..1c17f0b99b 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-index.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
@@ -2,7 +2,7 @@
   <img src={{womanArtistEmojiURL}}>
   <div class="content-wrapper">
     <h1>{{i18n "admin.customize.theme.themes_intro"}}</h1>
-     <div class="create-actions">
+    <div class="create-actions">
       {{d-button action=(route-action "installModal") icon="upload" label="admin.customize.install" class="btn-primary"}}
     </div>
     <div class="external-resources">
diff --git a/app/assets/javascripts/admin/templates/dashboard_reports.hbs b/app/assets/javascripts/admin/templates/dashboard_reports.hbs
index d6666cee71..e5660e9c50 100644
--- a/app/assets/javascripts/admin/templates/dashboard_reports.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_reports.hbs
@@ -1,12 +1,13 @@
 {{#conditional-loading-spinner condition=isLoading}}
-   <div class="reports-index section">
-     <div class="section-title">
-       <h2>{{i18n "admin.reports.title"}}</h2>
+  <div class="reports-index section">
+    <div class="section-title">
+      <h2>{{i18n "admin.reports.title"}}</h2>
       {{input
         class="filter-reports-input"
         input=(action "filterReports" value="target.value")
         placeholder=(i18n "admin.dashboard.filter_reports")
-        autofocus=true}}
+        autofocus=true
+      }}
     </div>
 
     <ul class="reports-list">
@@ -14,12 +15,11 @@
         <li class="report">
           {{#link-to 'adminReports.show' report.type}}
             <h3 class="report-title">{{report.title}}</h3>
-
             {{#if report.description}}
-            <p class="report-description">
-              {{report.description}}
-            </p>
-          {{/if}}
+              <p class="report-description">
+                {{report.description}}
+              </p>
+            {{/if}}
           {{/link-to}}
         </li>
       {{/each}}
diff --git a/app/assets/javascripts/admin/templates/email-advanced-test.hbs b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
index f0dcaa5c6a..fe55b11009 100644
--- a/app/assets/javascripts/admin/templates/email-advanced-test.hbs
+++ b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
@@ -5,23 +5,21 @@
   {{textarea name="email" value=email class="email-body"}}
   {{d-button
     action=(action "run")
-    label="admin.email.advanced_test.run"}}
+    label="admin.email.advanced_test.run"
+  }}
 </div>
 
 {{#conditional-loading-spinner condition=loading}}
-
-{{#if format}}
-  <hr>
-  <div class="text">
-    <h3>{{i18n 'admin.email.advanced_test.text'}}</h3>
-    <pre class="full-reason">{{html-safe text}}</pre>
-  </div>
-
-  <hr>
-  <div class="elided">
-    <h3>{{i18n 'admin.email.advanced_test.elided'}}</h3>
-    <pre class="full-reason">{{html-safe elided}}</pre>
-  </div>
-{{/if}}
-
+  {{#if format}}
+    <hr>
+    <div class="text">
+      <h3>{{i18n 'admin.email.advanced_test.text'}}</h3>
+      <pre class="full-reason">{{html-safe text}}</pre>
+    </div>
+    <hr>
+    <div class="elided">
+      <h3>{{i18n 'admin.email.advanced_test.elided'}}</h3>
+      <pre class="full-reason">{{html-safe elided}}</pre>
+    </div>
+  {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 0dfcb04531..82217bacfb 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -13,8 +13,11 @@
     <div class="toggle">
       <label>{{i18n 'admin.email.format'}}</label>
       {{#if showHtml}}
-        <span>{{i18n 'admin.email.html'}}</span> | <a href
-         {{action "toggleShowHtml"}}>{{i18n 'admin.email.text'}}</a>
+        <span>{{i18n 'admin.email.html'}}</span>
+         |
+        <a href {{action "toggleShowHtml"}}>
+          {{i18n 'admin.email.text'}}
+        </a>
       {{else}}
         <a href {{action "toggleShowHtml"}}>{{i18n 'admin.email.html'}}</a> |
         <span>{{i18n 'admin.email.text'}}</span>
diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index 2a5d39f12c..b9422bbb11 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -9,9 +9,9 @@
         <th style='width: 10%'>&nbsp;</th>
       </thead>
       <tbody>
-      {{#each embedding.embeddable_hosts as |host|}}
-        {{embeddable-host host=host deleteHost=(action "deleteHost")}}
-      {{/each}}
+        {{#each embedding.embeddable_hosts as |host|}}
+          {{embeddable-host host=host deleteHost=(action "deleteHost")}}
+        {{/each}}
       </tbody>
     </table>
   {{else}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
index e8cb30140c..6cc1239783 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
@@ -25,21 +25,21 @@
         <th class="action"></th>
       </thead>
       <tbody>
-      {{#each model as |item|}}
-        <tr class="admin-list-item">
-          <td class="col first email">
-            <div class="overflow-ellipsis" title={{item.email}}>{{item.email}}</div>
-          </td>
-          <td class="action">{{item.actionName}}</td>
-          <td class="match_count"><div class="label">{{i18n 'admin.logs.match_count'}}</div>{{item.match_count}}</td>
-          <td class="last_match_at"><div class="label">{{i18n 'admin.logs.last_match_at'}}</div>{{age-with-tooltip item.last_match_at}}</td>
-          <td class="created_at"><div class="label">{{i18n 'admin.logs.created_at'}}</div>{{age-with-tooltip item.created_at}}</td>
-          <td class="ip_address">{{item.ip_address}}</td>
-          <td class="action">
-            {{d-button action=(action "clearBlock") actionParam=item icon="check" label="admin.logs.screened_emails.actions.allow"}}
-          </td>
-        </tr>
-      {{/each}}
+        {{#each model as |item|}}
+          <tr class="admin-list-item">
+            <td class="col first email">
+              <div class="overflow-ellipsis" title={{item.email}}>{{item.email}}</div>
+            </td>
+            <td class="action">{{item.actionName}}</td>
+            <td class="match_count"><div class="label">{{i18n 'admin.logs.match_count'}}</div>{{item.match_count}}</td>
+            <td class="last_match_at"><div class="label">{{i18n 'admin.logs.last_match_at'}}</div>{{age-with-tooltip item.last_match_at}}</td>
+            <td class="created_at"><div class="label">{{i18n 'admin.logs.created_at'}}</div>{{age-with-tooltip item.created_at}}</td>
+            <td class="ip_address">{{item.ip_address}}</td>
+            <td class="action">
+              {{d-button action=(action "clearBlock") actionParam=item icon="check" label="admin.logs.screened_emails.actions.allow"}}
+            </td>
+          </tr>
+        {{/each}}
       </tbody>
     </table>
 
diff --git a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
index 96a185fb17..2d256ce151 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
@@ -36,83 +36,83 @@
         <th class="col heading actions"></th>
       </thead>
       <tbody>
-      {{#each model as |item|}}
-        <tr class="admin-list-item">
-          <td class="col first ip_address">
-            {{#if item.editing}}
-              {{text-field value=item.ip_address autofocus="autofocus"}}
-            {{else}}
-              <a href {{action "edit" item}} class="inline-editable-field">
-                {{#if item.isRange}}
-                  <strong>{{item.ip_address}}</strong>
-                {{else}}
-                  {{item.ip_address}}
-                {{/if}}
-              </a>
-            {{/if}}
-          </td>
-          <td class="col action">
-            {{#if item.isBlocked}}
-              {{d-icon "ban"}}
-            {{else}}
-              {{d-icon "check"}}
-            {{/if}}
-            {{item.actionName}}
-          </td>
-          <td class="col match_count">
-            <div class="label">{{i18n "admin.logs.match_count"}}</div>
-            {{item.match_count}}
-          </td>
-          <td class="col created_at">
-            <div class="label">{{i18n "admin.logs.created_at"}}</div>
-            {{age-with-tooltip item.created_at}}
-          </td>
-          <td class="col last_match_at">
-            {{#if item.last_match_at}}
-              <div class="label">
-                {{i18n "admin.logs.last_match_at"}}
-                {{age-with-tooltip item.last_match_at}}
-              </div>
-            {{/if}}
-          </td>
-          <td class="col actions">
-            {{#if item.editing}}
-              {{d-button
-                class="btn-default"
-                action=(action "save")
-                actionParam=item
-                label="admin.logs.save"}}
-              <a href {{action "cancel" item}}>{{i18n "cancel"}}</a>
-            {{else}}
-              {{d-button
-                class="btn-default btn-danger"
-                action=(action "destroy")
-                actionParam=item
-                icon="far-trash-alt"}}
-              {{d-button
-                class="btn-default"
-                action=(action "edit")
-                actionParam=item
-                icon="pencil-alt"}}
+        {{#each model as |item|}}
+          <tr class="admin-list-item">
+            <td class="col first ip_address">
+              {{#if item.editing}}
+                {{text-field value=item.ip_address autofocus="autofocus"}}
+              {{else}}
+                <a href {{action "edit" item}} class="inline-editable-field">
+                  {{#if item.isRange}}
+                    <strong>{{item.ip_address}}</strong>
+                  {{else}}
+                    {{item.ip_address}}
+                  {{/if}}
+                </a>
+              {{/if}}
+            </td>
+            <td class="col action">
               {{#if item.isBlocked}}
+                {{d-icon "ban"}}
+              {{else}}
+                {{d-icon "check"}}
+              {{/if}}
+              {{item.actionName}}
+            </td>
+            <td class="col match_count">
+              <div class="label">{{i18n "admin.logs.match_count"}}</div>
+              {{item.match_count}}
+            </td>
+            <td class="col created_at">
+              <div class="label">{{i18n "admin.logs.created_at"}}</div>
+              {{age-with-tooltip item.created_at}}
+            </td>
+            <td class="col last_match_at">
+              {{#if item.last_match_at}}
+                <div class="label">
+                  {{i18n "admin.logs.last_match_at"}}
+                  {{age-with-tooltip item.last_match_at}}
+                </div>
+              {{/if}}
+            </td>
+            <td class="col actions">
+              {{#if item.editing}}
                 {{d-button
                   class="btn-default"
-                  action=(action "allow")
+                  action=(action "save")
                   actionParam=item
-                  icon="check"
-                  label="admin.logs.screened_ips.actions.do_nothing"}}
+                  label="admin.logs.save"}}
+                <a href {{action "cancel" item}}>{{i18n "cancel"}}</a>
               {{else}}
                 {{d-button
-                  class="btn-default"
-                  action=(action "block")
+                  class="btn-default btn-danger"
+                  action=(action "destroy")
                   actionParam=item
-                  icon="ban"
-                  label="admin.logs.screened_ips.actions.block"}}
+                  icon="far-trash-alt"}}
+                {{d-button
+                  class="btn-default"
+                  action=(action "edit")
+                  actionParam=item
+                  icon="pencil-alt"}}
+                {{#if item.isBlocked}}
+                  {{d-button
+                    class="btn-default"
+                    action=(action "allow")
+                    actionParam=item
+                    icon="check"
+                    label="admin.logs.screened_ips.actions.do_nothing"}}
+                {{else}}
+                  {{d-button
+                    class="btn-default"
+                    action=(action "block")
+                    actionParam=item
+                    icon="ban"
+                    label="admin.logs.screened_ips.actions.block"}}
+                {{/if}}
               {{/if}}
-            {{/if}}
-          </td>
-        </tr>
-      {{/each}}
+            </td>
+          </tr>
+        {{/each}}
       </tbody>
     </table>
   {{else}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
index 1ee4274368..ab3fcf1883 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
@@ -20,17 +20,17 @@
         <th class="created_at">{{i18n 'admin.logs.created_at'}}</th>
       </thead>
       <tbody>
-      {{#each model as |url|}}
-        <tr class="admin-list-item">
-          <td class="col first domain">
-            <div class="overflow-ellipsis" title={{url.domain}}>{{url.domain}}</div>
-          </td>
-          <td class="col action">{{url.actionName}}</td>
-          <td class="col match_count"><div class="label">{{i18n 'admin.logs.match_count'}}</div>{{url.match_count}}</td>
-          <td class="col last_match_at"><div class="label">{{i18n 'admin.logs.last_match_at'}}</div>{{age-with-tooltip url.last_match_at}}</td>
-          <td class="col created_at"><div class="label">{{i18n 'admin.logs.created_at'}}</div>{{age-with-tooltip url.created_at}}</td>
-        </tr>
-      {{/each}}
+        {{#each model as |url|}}
+          <tr class="admin-list-item">
+            <td class="col first domain">
+              <div class="overflow-ellipsis" title={{url.domain}}>{{url.domain}}</div>
+            </td>
+            <td class="col action">{{url.actionName}}</td>
+            <td class="col match_count"><div class="label">{{i18n 'admin.logs.match_count'}}</div>{{url.match_count}}</td>
+            <td class="col last_match_at"><div class="label">{{i18n 'admin.logs.last_match_at'}}</div>{{age-with-tooltip url.last_match_at}}</td>
+            <td class="col created_at"><div class="label">{{i18n 'admin.logs.created_at'}}</div>{{age-with-tooltip url.created_at}}</td>
+          </tr>
+        {{/each}}
       </tbody>
     </table>
   {{else}}
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index ab4c70d39e..5a81de8f1d 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -1,34 +1,34 @@
 <div class="staff-action-logs-controls">
   {{#if filtersExists}}
-  <div class='staff-action-logs-filters'>
-    <a href {{action "clearAllFilters"}} class="clear-filters filter">
-      <span class="label">{{i18n 'admin.logs.staff_actions.clear_filters'}}</span>
-    </a>
-    {{#if actionFilter}}
-      <a href {{action "clearFilter" "actionFilter"}} class="filter">
-        <span class="label">{{i18n 'admin.logs.action'}}</span>: {{actionFilter}}
-        {{d-icon "times-circle"}}
+    <div class='staff-action-logs-filters'>
+      <a href {{action "clearAllFilters"}} class="clear-filters filter">
+        <span class="label">{{i18n 'admin.logs.staff_actions.clear_filters'}}</span>
       </a>
-    {{/if}}
-    {{#if filters.acting_user}}
-      <a href {{action "clearFilter" "acting_user"}} class="filter">
-        <span class="label">{{i18n 'admin.logs.staff_actions.staff_user'}}</span>: {{filters.acting_user}}
-        {{d-icon "times-circle"}}
-      </a>
-    {{/if}}
-    {{#if filters.target_user}}
-      <a href {{action "clearFilter" "target_user"}} class="filter">
-        <span class="label">{{i18n 'admin.logs.staff_actions.target_user'}}</span>: {{filters.target_user}}
-        {{d-icon "times-circle"}}
-      </a>
-    {{/if}}
-    {{#if filters.subject}}
-      <a href {{action "clearFilter" "subject"}} class="filter">
-        <span class="label">{{i18n 'admin.logs.staff_actions.subject'}}</span>: {{filters.subject}}
-        {{d-icon "times-circle"}}
-      </a>
-    {{/if}}
-  </div>
+      {{#if actionFilter}}
+        <a href {{action "clearFilter" "actionFilter"}} class="filter">
+          <span class="label">{{i18n 'admin.logs.action'}}</span>: {{actionFilter}}
+          {{d-icon "times-circle"}}
+        </a>
+      {{/if}}
+      {{#if filters.acting_user}}
+        <a href {{action "clearFilter" "acting_user"}} class="filter">
+          <span class="label">{{i18n 'admin.logs.staff_actions.staff_user'}}</span>: {{filters.acting_user}}
+          {{d-icon "times-circle"}}
+        </a>
+      {{/if}}
+      {{#if filters.target_user}}
+        <a href {{action "clearFilter" "target_user"}} class="filter">
+          <span class="label">{{i18n 'admin.logs.staff_actions.target_user'}}</span>: {{filters.target_user}}
+          {{d-icon "times-circle"}}
+        </a>
+      {{/if}}
+      {{#if filters.subject}}
+        <a href {{action "clearFilter" "subject"}} class="filter">
+          <span class="label">{{i18n 'admin.logs.staff_actions.subject'}}</span>: {{filters.subject}}
+          {{d-icon "times-circle"}}
+        </a>
+      {{/if}}
+    </div>
   {{else}}
     {{i18n "admin.logs.staff_actions.filter"}}
     {{combo-box
@@ -41,10 +41,10 @@
 
   {{d-button class="btn-default" action=(action "exportStaffActionLogs") label="admin.export_csv.button_text" icon="download"}}
 </div>
+
 <div class="clearfix"></div>
 
 {{#staff-actions}}
-
   {{#load-more selector=".staff-logs tr" action=(action "loadMore")}}
     {{#if model.content}}
       <table class='table staff-logs grid'>
@@ -108,5 +108,4 @@
       {{i18n 'search.no_results'}}
     {{/if}}
   {{/load-more}}
-
 {{/staff-actions}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs b/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
index f59c73b89e..160ca685ad 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
@@ -1,19 +1,19 @@
 {{#d-modal-body class='add-upload-modal' title="admin.customize.theme.add_upload"}}
-    <div class="inputs">
-      <section class="field">
+  <div class="inputs">
+    <section class="field">
       <input onchange={{action "updateName"}} type="file" id="file-input" accept='*'>
       <label for="file-input">{{i18n 'admin.customize.theme.upload_file_tip'}}</label>
-      </section>
-      <section class="field">
+    </section>
+    <section class="field">
       <label for="theme-variable-name">{{i18n 'admin.customize.theme.variable_name'}}</label>
       {{input id="theme-variable-name" value=name}}
-      </section>
-      {{#if fileSelected}}
-        {{#if errorMessage}}
-          <span class="alert alert-error">{{errorMessage}}</span>
-        {{/if}}
+    </section>
+    {{#if fileSelected}}
+      {{#if errorMessage}}
+        <span class="alert alert-error">{{errorMessage}}</span>
       {{/if}}
-    </div>
+    {{/if}}
+  </div>
 {{/d-modal-body}}
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/admin/templates/modal/admin-watched-word-test.hbs b/app/assets/javascripts/admin/templates/modal/admin-watched-word-test.hbs
index a46f4ddb7b..ef56567cdd 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-watched-word-test.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-watched-word-test.hbs
@@ -1,16 +1,16 @@
 {{#d-modal-body rawTitle=(i18n "admin.watched_words.test.modal_title" action=model.name) class="watched-words-test-modal"}}
-    <p>{{i18n "admin.watched_words.test.description"}}</p>
-    {{textarea name="test_value" value=value autofocus="autofocus"}}
-    {{#if matches}}
-        <p>
-            {{i18n "admin.watched_words.test.found_matches"}}
-            <ul>
-                {{#each matches as |match|}}
-                    <li>{{match}}</li>
-                {{/each}}
-            </ul>
-        </p>
-    {{else}}
-        <p>{{i18n "admin.watched_words.test.no_matches"}}</p>
-    {{/if}}
+  <p>{{i18n "admin.watched_words.test.description"}}</p>
+  {{textarea name="test_value" value=value autofocus="autofocus"}}
+  {{#if matches}}
+    <p>
+      {{i18n "admin.watched_words.test.found_matches"}}
+      <ul>
+        {{#each matches as |match|}}
+          <li>{{match}}</li>
+        {{/each}}
+      </ul>
+    </p>
+  {{else}}
+    <p>{{i18n "admin.watched_words.test.no_matches"}}</p>
+  {{/if}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs b/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs
index 0bd05c2ba8..38a08b7627 100644
--- a/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs
+++ b/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body class="incoming-emails" rawTitle=model.key}}
-{{i18n "admin.site_settings.default_categories.modal_description" count=model.count}}
+  {{i18n "admin.site_settings.default_categories.modal_description" count=model.count}}
 {{/d-modal-body}}
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index d3d7c23785..e17804d7ff 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -29,8 +29,10 @@
               {{plugin.name}}
             {{/if}}
           </td>
-          <td class="version">              <div class="label">{{i18n "admin.plugins.version"}}</div>
-{{plugin.version}}</td>
+          <td class="version">
+            <div class="label">{{i18n "admin.plugins.version"}}</div>
+            {{plugin.version}}
+          </td>
           <td class="col-enabled">
             <div class="label">{{i18n "admin.plugins.enabled"}}</div>
             {{#if plugin.enabled_setting}}
diff --git a/app/assets/javascripts/admin/templates/plugins.hbs b/app/assets/javascripts/admin/templates/plugins.hbs
index 9b41e0976d..dbe648daef 100644
--- a/app/assets/javascripts/admin/templates/plugins.hbs
+++ b/app/assets/javascripts/admin/templates/plugins.hbs
@@ -1,17 +1,17 @@
-  <div class='admin-controls'>
-
+<div class='admin-controls'>
   <div class='controls'>
     {{d-button action=(action "toggleMenu") class="menu-toggle" icon="bars"}}
 
-  {{#if currentUser.admin}}
-    {{d-button label="admin.plugins.change_settings"
-               icon="cog"
-               class="btn-default settings-button"
-               action=(route-action "showSettings")}}
-  {{/if}}
-  </div>
-
+    {{#if currentUser.admin}}
+      {{d-button
+        label="admin.plugins.change_settings"
+        icon="cog"
+        class="btn-default settings-button"
+        action=(route-action "showSettings")
+      }}
+    {{/if}}
   </div>
+</div>
 
 <div class="admin-nav pull-left">
   <ul class="nav nav-stacked">
diff --git a/app/assets/javascripts/admin/templates/search-logs-index.hbs b/app/assets/javascripts/admin/templates/search-logs-index.hbs
index b56a1400fb..a0cb23a89b 100644
--- a/app/assets/javascripts/admin/templates/search-logs-index.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-index.hbs
@@ -18,17 +18,17 @@
         <th class="col heading">{{i18n 'admin.logs.search_logs.click_through_rate'}}</th>
       </thead>
       <tbody>
-      {{#each model as |item|}}
-        <tr class="admin-list-item">
-          <td class="col term">
-            {{#link-to 'adminSearchLogs.term' (query-params term=item.term period=period) class="test"}}
-              {{item.term}}
-            {{/link-to}}
-          </td>
-          <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.searches'}}</div>{{item.searches}}</td>
-          <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.click_through_rate'}}</div>{{item.ctr}}%</td>
-        </tr>
-      {{/each}}
+        {{#each model as |item|}}
+          <tr class="admin-list-item">
+            <td class="col term">
+              {{#link-to 'adminSearchLogs.term' (query-params term=item.term period=period) class="test"}}
+                {{item.term}}
+              {{/link-to}}
+            </td>
+            <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.searches'}}</div>{{item.searches}}</td>
+            <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.click_through_rate'}}</div>{{item.ctr}}%</td>
+          </tr>
+        {{/each}}
       </tbody>
     </table>
 
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 27f61f2940..c38b4c9e59 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -20,47 +20,47 @@
   <br>
 
   <div class='header-search-results'>
-  {{#each model.search_result.posts as |result|}}
-    <div class='fps-result'>
-      <div class='author'>
-        <a href={{result.userPath}} data-user-card={{result.username}}>
-          {{avatar result imageSize="large"}}
-        </a>
-      </div>
-
-      <div class='fps-topic'>
-        <div class='topic'>
-          <a class='search-link' href={{result.url}}>
-            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+    {{#each model.search_result.posts as |result|}}
+      <div class='fps-result'>
+        <div class='author'>
+          <a href={{result.userPath}} data-user-card={{result.username}}>
+            {{avatar result imageSize="large"}}
           </a>
+        </div>
 
-          <div class='search-category'>
-            {{#if result.topic.category.parentCategory}}
-              {{category-link result.topic.category.parentCategory}}
+        <div class='fps-topic'>
+          <div class='topic'>
+            <a class='search-link' href={{result.url}}>
+              {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+            </a>
+
+            <div class='search-category'>
+              {{#if result.topic.category.parentCategory}}
+                {{category-link result.topic.category.parentCategory}}
+              {{/if}}
+              {{category-link result.topic.category hideParent=true}}
+              {{#each result.topic.tags as |tag|}}
+                {{discourse-tag tag}}
+              {{/each}}
+            </div>
+          </div>
+
+          <div class='blurb container'>
+            <span class='date'>
+              {{format-age result.created_at}}
+              {{#if result.blurb}}
+                -
+              {{/if}}
+            </span>
+
+            {{#if result.blurb}}
+              {{#highlight-text highlight=term}}
+                {{html-safe result.blurb}}
+              {{/highlight-text}}
             {{/if}}
-            {{category-link result.topic.category hideParent=true}}
-            {{#each result.topic.tags as |tag|}}
-              {{discourse-tag tag}}
-            {{/each}}
           </div>
         </div>
-
-        <div class='blurb container'>
-          <span class='date'>
-            {{format-age result.created_at}}
-            {{#if result.blurb}}
-              -
-            {{/if}}
-          </span>
-
-          {{#if result.blurb}}
-            {{#highlight-text highlight=term}}
-              {{html-safe result.blurb}}
-            {{/highlight-text}}
-          {{/if}}
-        </div>
       </div>
-    </div>
-  {{/each}}
+    {{/each}}
   </div>
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index 39d227bcf8..f85db56737 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -13,26 +13,26 @@
     {{#if noGrantableBadges}}
       <p>{{i18n 'admin.badges.no_badges'}}</p>
     {{else}}
-    <form class="form-horizontal">
-      <div>
-        <label>{{i18n 'admin.badges.badge'}}</label>
-        {{combo-box
-          filterable=true
-          value=selectedBadgeId
-          content=grantableBadges
-          onChange=(action (mut selectedBadgeId))
-        }}
-      </div>
-      <div>
-      <label>{{i18n 'admin.badges.reason'}}</label>
-      {{input type="text" value=badgeReason}}<br><small>{{i18n 'admin.badges.reason_help'}}</small>
-      </div>
-      {{d-button
-        class="btn-primary"
-        action=(action "grantBadge")
-        type="submit"
-        label="admin.badges.grant"}}
-    </form>
+      <form class="form-horizontal">
+        <div>
+          <label>{{i18n 'admin.badges.badge'}}</label>
+          {{combo-box
+            filterable=true
+            value=selectedBadgeId
+            content=grantableBadges
+            onChange=(action (mut selectedBadgeId))
+          }}
+        </div>
+        <div>
+          <label>{{i18n 'admin.badges.reason'}}</label>
+          {{input type="text" value=badgeReason}}<br><small>{{i18n 'admin.badges.reason_help'}}</small>
+        </div>
+        {{d-button
+          class="btn-primary"
+          action=(action "grantBadge")
+          type="submit"
+          label="admin.badges.grant"}}
+      </form>
     {{/if}}
 
     <table id='user-badges'>
@@ -55,7 +55,7 @@
             </td>
             <td class='reason'>
               {{#if userBadge.postUrl}}
-              <a href={{userBadge.postUrl}}>{{userBadge.topic_title}}</a>
+                <a href={{userBadge.postUrl}}>{{userBadge.topic_title}}</a>
               {{/if}}
             </td>
             <td>{{age-with-tooltip userBadge.granted_at}}</td>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index f5abf9f8dd..6cabbb87ad 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -474,7 +474,7 @@
       <div class="value">
         {{#link-to "adminUser" model.silencedBy}}
           {{avatar model.silencedBy imageSize="tiny"}}
-          {{/link-to}}
+        {{/link-to}}
         {{#link-to "adminUser" model.silencedBy}}
           {{model.silencedBy.username}}
         {{/link-to}}
@@ -507,45 +507,45 @@
 {{#if currentUser.admin}}
   <section class="details">
     <h1>{{i18n "admin.groups.title"}}</h1>
-      <div class="display-row">
-        <div class="field">{{i18n "admin.groups.automatic"}}</div>
-        <div class="value">{{html-safe automaticGroups}}</div>
+    <div class="display-row">
+      <div class="field">{{i18n "admin.groups.automatic"}}</div>
+      <div class="value">{{html-safe automaticGroups}}</div>
+    </div>
+    <div class="display-row">
+      <div class="field">{{i18n "admin.groups.custom"}}</div>
+      <div class="value">
+        {{admin-group-selector
+          content=availableGroups
+          value=customGroupIdsBuffer
+          onChange=(action (mut customGroupIdsBuffer))
+        }}
       </div>
+      {{#if customGroupsDirty}}
+        <div class="controls">
+          {{d-button icon="check" class="ok" action=(action "saveCustomGroups")}}
+          {{d-button icon="times" class="cancel" action=(action "resetCustomGroups")}}
+        </div>
+      {{/if}}
+    </div>
+    {{#if model.customGroups}}
       <div class="display-row">
-        <div class="field">{{i18n "admin.groups.custom"}}</div>
+        <div class="field">{{i18n "admin.groups.primary"}}</div>
         <div class="value">
-          {{admin-group-selector
-            content=availableGroups
-            value=customGroupIdsBuffer
-            onChange=(action (mut customGroupIdsBuffer))
+          {{combo-box
+            content=model.customGroups
+            value=model.primary_group_id
+            none="admin.groups.no_primary"
+            onChange=(action (mut model.primary_group_id))
           }}
         </div>
-        {{#if customGroupsDirty}}
+        {{#if primaryGroupDirty}}
           <div class="controls">
-            {{d-button icon="check" class="ok" action=(action "saveCustomGroups")}}
-            {{d-button icon="times" class="cancel" action=(action "resetCustomGroups")}}
+            {{d-button icon="check" class="ok" action=(action "savePrimaryGroup")}}
+            {{d-button icon="times" class="cancel" action=(action "resetPrimaryGroup")}}
           </div>
         {{/if}}
       </div>
-      {{#if model.customGroups}}
-        <div class="display-row">
-          <div class="field">{{i18n "admin.groups.primary"}}</div>
-          <div class="value">
-            {{combo-box
-              content=model.customGroups
-              value=model.primary_group_id
-              none="admin.groups.no_primary"
-              onChange=(action (mut model.primary_group_id))
-            }}
-          </div>
-          {{#if primaryGroupDirty}}
-            <div class="controls">
-              {{d-button icon="check" class="ok" action=(action "savePrimaryGroup")}}
-              {{d-button icon="times" class="cancel" action=(action "resetPrimaryGroup")}}
-            </div>
-          {{/if}}
-        </div>
-      {{/if}}
+    {{/if}}
   </section>
 {{/if}}
 
@@ -625,34 +625,34 @@
 </section>
 
 {{#if model.single_sign_on_record}}
-<section class="details">
-  <h1>{{i18n "admin.user.sso.title"}}</h1>
+  <section class="details">
+    <h1>{{i18n "admin.user.sso.title"}}</h1>
 
-  {{#with model.single_sign_on_record as |sso|}}
-    <div class="display-row">
-      <div class="field">{{i18n "admin.user.sso.external_id"}}</div>
-      <div class="value">{{sso.external_id}}</div>
-    </div>
-    <div class="display-row">
-      <div class="field">{{i18n "admin.user.sso.external_username"}}</div>
-      <div class="value">{{sso.external_username}}</div>
-    </div>
-    <div class="display-row">
-      <div class="field">{{i18n "admin.user.sso.external_name"}}</div>
-      <div class="value">{{sso.external_name}}</div>
-    </div>
-    {{#if sso.external_email}}
+    {{#with model.single_sign_on_record as |sso|}}
       <div class="display-row">
-        <div class="field">{{i18n "admin.user.sso.external_email"}}</div>
-        <div class="value">{{sso.external_email}}</div>
+        <div class="field">{{i18n "admin.user.sso.external_id"}}</div>
+        <div class="value">{{sso.external_id}}</div>
       </div>
-    {{/if}}
-    <div class="display-row">
-      <div class="field">{{i18n "admin.user.sso.external_avatar_url"}}</div>
-      <div class="value">{{sso.external_avatar_url}}</div>
-    </div>
-  {{/with}}
-</section>
+      <div class="display-row">
+        <div class="field">{{i18n "admin.user.sso.external_username"}}</div>
+        <div class="value">{{sso.external_username}}</div>
+      </div>
+      <div class="display-row">
+        <div class="field">{{i18n "admin.user.sso.external_name"}}</div>
+        <div class="value">{{sso.external_name}}</div>
+      </div>
+      {{#if sso.external_email}}
+        <div class="display-row">
+          <div class="field">{{i18n "admin.user.sso.external_email"}}</div>
+          <div class="value">{{sso.external_email}}</div>
+        </div>
+      {{/if}}
+      <div class="display-row">
+        <div class="field">{{i18n "admin.user.sso.external_avatar_url"}}</div>
+        <div class="value">{{sso.external_avatar_url}}</div>
+      </div>
+    {{/with}}
+  </section>
 {{/if}}
 
 {{plugin-outlet name="after-user-details" args=(hash model=model)}}
diff --git a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
index 8dc98a948a..8fcc81a7ce 100644
--- a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
+++ b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
@@ -117,31 +117,42 @@
       {{#if model.tl3Requirements.requirements_lost}}
         {{! tl implicitly not locked }}
         {{#if model.tl3Requirements.on_grace_period}}
-          {{d-icon "times"}} {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
-        {{else}} {{! not on grace period }}
-          {{d-icon "times"}} {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
-                                      {{i18n 'admin.user.tl3_requirements.will_be_demoted'}}
+          {{d-icon "times"}}
+          {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
+        {{else}}
+          {{! not on grace period }}
+          {{d-icon "times"}}
+          {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
+          {{i18n 'admin.user.tl3_requirements.will_be_demoted'}}
         {{/if}}
-      {{else}} {{! requirements not lost - remains tl3 }}
+      {{else}}
+        {{! requirements not lost - remains tl3 }}
         {{#if model.tl3Requirements.trust_level_locked}}
-          {{d-icon "lock"}} {{i18n 'admin.user.tl3_requirements.locked_will_not_be_demoted'}}
-        {{else}} {{! tl not locked }}
-          {{d-icon "check"}} {{i18n 'admin.user.tl3_requirements.qualifies'}}
+          {{d-icon "lock"}}
+          {{i18n 'admin.user.tl3_requirements.locked_will_not_be_demoted'}}
+        {{else}}
+          {{! tl not locked }}
+          {{d-icon "check"}}
+          {{i18n 'admin.user.tl3_requirements.qualifies'}}
           {{#if model.tl3Requirements.on_grace_period}}
             {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
           {{/if}}
         {{/if}}
       {{/if}}
-    {{else}} {{! is not tl3 }}
+    {{else}}
+      {{! is not tl3 }}
       {{#if model.tl3Requirements.requirements_met}}
         {{! met & not tl3 - will be promoted}}
-        {{d-icon "check"}} {{i18n 'admin.user.tl3_requirements.qualifies'}}
-                                    {{i18n 'admin.user.tl3_requirements.will_be_promoted'}}
-      {{else}} {{! requirements not met - remains regular }}
+        {{d-icon "check"}}
+        {{i18n 'admin.user.tl3_requirements.qualifies'}}
+        {{i18n 'admin.user.tl3_requirements.will_be_promoted'}}
+      {{else}}
+        {{! requirements not met - remains regular }}
         {{#if model.tl3Requirements.trust_level_locked}}
-          {{d-icon "lock"}} {{i18n 'admin.user.tl3_requirements.locked_will_not_be_promoted'}}
+          {{d-icon "lock"}}
+          {{i18n 'admin.user.tl3_requirements.locked_will_not_be_promoted'}}
         {{else}}
-          {{d-icon "times"}} {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
+          {{d-icon "times"}}
         {{/if}}
       {{/if}}
     {{/if}}
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
index 38e4d2215f..7161ff0a0a 100644
--- a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
@@ -9,31 +9,31 @@
 </div>
 
 <div class='web-hook-events-listing'>
-{{#if model}}
-  {{#load-more selector=".web-hook-events li" action=(action "loadMore")}}
-    <div class='web-hook-events content-list'>
-      <div class='heading-container'>
-        <div class='col heading first status'>{{i18n 'admin.web_hooks.events.status'}}</div>
-        <div class='col heading event-id'>{{i18n 'admin.web_hooks.events.event_id'}}</div>
-        <div class='col heading timestamp'>{{i18n 'admin.web_hooks.events.timestamp'}}</div>
-        <div class='col heading completion'>{{i18n 'admin.web_hooks.events.completion'}}</div>
-        <div class='col heading actions'>{{i18n 'admin.web_hooks.events.actions'}}</div>
-        <div class='clearfix'></div>
+  {{#if model}}
+    {{#load-more selector=".web-hook-events li" action=(action "loadMore")}}
+      <div class='web-hook-events content-list'>
+        <div class='heading-container'>
+          <div class='col heading first status'>{{i18n 'admin.web_hooks.events.status'}}</div>
+          <div class='col heading event-id'>{{i18n 'admin.web_hooks.events.event_id'}}</div>
+          <div class='col heading timestamp'>{{i18n 'admin.web_hooks.events.timestamp'}}</div>
+          <div class='col heading completion'>{{i18n 'admin.web_hooks.events.completion'}}</div>
+          <div class='col heading actions'>{{i18n 'admin.web_hooks.events.actions'}}</div>
+          <div class='clearfix'></div>
+        </div>
+        {{#if hasIncoming}}
+          <a href class='alert alert-info clickable' tabindex="0" {{action "showInserted"}}>
+            {{count-i18n key="admin.web_hooks.events.incoming" count=incomingCount}}
+          </a>
+        {{/if}}
+        <ul>
+          {{#each model as |webHookEvent|}}
+            {{admin-web-hook-event model=webHookEvent}}
+          {{/each}}
+        </ul>
       </div>
-      {{#if hasIncoming}}
-        <a href class='alert alert-info clickable' tabindex="0" {{action "showInserted"}}>
-          {{count-i18n key="admin.web_hooks.events.incoming" count=incomingCount}}
-        </a>
-      {{/if}}
-      <ul>
-        {{#each model as |webHookEvent|}}
-          {{admin-web-hook-event model=webHookEvent}}
-        {{/each}}
-      </ul>
-    </div>
-    {{conditional-loading-spinner condition=model.loadingMore}}
-  {{/load-more}}
-{{else}}
-  <p>{{i18n 'admin.web_hooks.events.none'}}</p>
-{{/if}}
+      {{conditional-loading-spinner condition=model.loadingMore}}
+    {{/load-more}}
+  {{else}}
+    <p>{{i18n 'admin.web_hooks.events.none'}}</p>
+  {{/if}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/web-hooks.hbs b/app/assets/javascripts/admin/templates/web-hooks.hbs
index e63dac0828..c65964d41f 100644
--- a/app/assets/javascripts/admin/templates/web-hooks.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks.hbs
@@ -5,34 +5,34 @@
       {{d-icon 'plus'}} {{i18n 'admin.web_hooks.new'}}
     {{/link-to}}
   </div>
-{{#if model}}
-  {{#load-more selector=".web-hooks tr" action=(action "loadMore")}}
-    <table class='web-hooks grid'>
-      <thead>
-        <tr>
-          <th>{{i18n 'admin.web_hooks.delivery_status.title'}}</th>
-          <th>{{i18n 'admin.web_hooks.payload_url'}}</th>
-          <th>{{i18n 'admin.web_hooks.description'}}</th>
-          <th>{{i18n 'admin.web_hooks.controls'}}</th>
-        </tr>
-      </thead>
-      <tbody>
-        {{#each model as |webHook|}}
+  {{#if model}}
+    {{#load-more selector=".web-hooks tr" action=(action "loadMore")}}
+      <table class='web-hooks grid'>
+        <thead>
           <tr>
-            <td class='delivery-status'>{{#link-to 'adminWebHooks.showEvents' webHook.id}}{{admin-web-hook-status deliveryStatuses=deliveryStatuses model=webHook}}{{/link-to}}</td>
-            <td class='payload-url'>{{#link-to 'adminWebHooks.show' webHook}}{{webHook.payload_url}}{{/link-to}}</td>
-            <td class='description'>{{webHook.description}}</td>
-            <td class='controls'>
-              {{#link-to 'adminWebHooks.show' webHook tagName='button' classNames='btn btn-default no-text'}}{{d-icon 'far-edit'}}{{/link-to}}
-              {{d-button class="destroy btn-danger" action=(action "destroy") actionParam=webHook icon="times"}}
-            </td>
+            <th>{{i18n 'admin.web_hooks.delivery_status.title'}}</th>
+            <th>{{i18n 'admin.web_hooks.payload_url'}}</th>
+            <th>{{i18n 'admin.web_hooks.description'}}</th>
+            <th>{{i18n 'admin.web_hooks.controls'}}</th>
           </tr>
-        {{/each}}
-      </tbody>
-    </table>
-    {{conditional-loading-spinner condition=model.loadingMore}}
-  {{/load-more}}
-{{else}}
-  <p>{{i18n 'admin.web_hooks.none'}}</p>
-{{/if}}
+        </thead>
+        <tbody>
+          {{#each model as |webHook|}}
+            <tr>
+              <td class='delivery-status'>{{#link-to 'adminWebHooks.showEvents' webHook.id}}{{admin-web-hook-status deliveryStatuses=deliveryStatuses model=webHook}}{{/link-to}}</td>
+              <td class='payload-url'>{{#link-to 'adminWebHooks.show' webHook}}{{webHook.payload_url}}{{/link-to}}</td>
+              <td class='description'>{{webHook.description}}</td>
+              <td class='controls'>
+                {{#link-to 'adminWebHooks.show' webHook tagName='button' classNames='btn btn-default no-text'}}{{d-icon 'far-edit'}}{{/link-to}}
+                {{d-button class="destroy btn-danger" action=(action "destroy") actionParam=webHook icon="times"}}
+              </td>
+            </tr>
+          {{/each}}
+        </tbody>
+      </table>
+      {{conditional-loading-spinner condition=model.loadingMore}}
+    {{/load-more}}
+  {{else}}
+    <p>{{i18n 'admin.web_hooks.none'}}</p>
+  {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index ad65dbb57e..11c0471480 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -111,8 +111,8 @@
 
       {{#if contactInfo}}
         <section class='about contact'>
-            <h3>{{d-icon "far-envelope"}} {{i18n 'about.contact'}}</h3>
-            <p>{{html-safe contactInfo}}</p>
+          <h3>{{d-icon "far-envelope"}} {{i18n 'about.contact'}}</h3>
+          <p>{{html-safe contactInfo}}</p>
         </section>
       {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index fe7b489159..38869b6f0d 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -37,23 +37,23 @@
   {{#if userBadges}}
     <div class="user-badges {{model.slug}}">
       {{#load-more selector=".badge-info" action=(action "loadMore")}}
-      <div class="badges-granted">
-        {{#each userBadges as |ub|}}
-          {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
-            <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
-            {{#if ub.post_number}}
-              <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{html-safe ub.topic.fancyTitle}}</a>
-            {{/if}}
-          {{/user-info}}
-        {{/each}}
+        <div class="badges-granted">
+          {{#each userBadges as |ub|}}
+            {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
+              <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
+              {{#if ub.post_number}}
+                <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{html-safe ub.topic.fancyTitle}}</a>
+              {{/if}}
+            {{/user-info}}
+          {{/each}}
         </div>
       {{/load-more}}
 
       {{#unless canLoadMore}}
         {{#if canShowOthers}}
-        <div class='clearfix'>
-          <a class='btn' href={{model.url}}>{{i18n 'badges.others_count' count=othersCount}}</a>
-        </div>
+          <div class='clearfix'>
+            <a class='btn' href={{model.url}}>{{i18n 'badges.others_count' count=othersCount}}</a>
+          </div>
         {{/if}}
       {{/unless}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
index 6545208bb7..80bbae0936 100644
--- a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
@@ -1,11 +1,10 @@
 <label class="btn btn-default btn-icon-text" disabled={{uploading}} title={{i18n 'user.change_avatar.upload_title'}}>
   {{d-icon "far-image"}}
   {{#if uploading}}
-  {{i18n 'uploading'}} {{uploadProgress}}%
+    {{i18n 'uploading'}} {{uploadProgress}}%
   {{else}}
-  {{i18n 'upload'}}
+    {{i18n 'upload'}}
   {{/if}}
-
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*">
 </label>
 
diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
index b047846db5..39a6b0112d 100644
--- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
@@ -1,30 +1,31 @@
 {{#conditional-loading-spinner condition=loading}}
   {{#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}}
-    </a>
-  </div>
+    <div class="show-mores">
+      <a tabindex="0" href {{action showInserted}} class='alert alert-info clickable'>
+        {{count-i18n key="topic_count_" suffix="latest" count=2}}
+      </a>
+    </div>
   {{/if}}
 
   {{#if topics}}
-    {{topic-list showPosters=showPosters
-                 hideCategory=hideCategory
-                 topics=topics
-                 expandExcerpts=expandExcerpts
-                 bulkSelectEnabled=bulkSelectEnabled
-                 canBulkSelect=canBulkSelect
-                 selected=selected
-                 skipHeader=skipHeader
-                 tagsForUser=tagsForUser
-                 onScroll=onScroll
-                 scrollOnLoad=scrollOnLoad}}
-
+    {{topic-list
+      showPosters=showPosters
+      hideCategory=hideCategory
+      topics=topics
+      expandExcerpts=expandExcerpts
+      bulkSelectEnabled=bulkSelectEnabled
+      canBulkSelect=canBulkSelect
+      selected=selected
+      skipHeader=skipHeader
+      tagsForUser=tagsForUser
+      onScroll=onScroll
+      scrollOnLoad=scrollOnLoad
+    }}
   {{else}}
     {{#unless loadingMore}}
-    <div class='alert alert-info'>
-      {{i18n 'choose_topic.none_found'}}
-    </div>
+      <div class='alert alert-info'>
+        {{i18n 'choose_topic.none_found'}}
+      </div>
     {{/unless}}
   {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
index fc71891854..ea6853b37d 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
@@ -4,14 +4,15 @@
       <div class='category-box-heading'>
         <a href={{c.url}}>
           {{#unless c.isMuted}}
-          {{#if c.uploaded_logo.url}}
-            {{cdn-img src=c.uploaded_logo.url
+            {{#if c.uploaded_logo.url}}
+              {{cdn-img
+                src=c.uploaded_logo.url
                 class="logo"
                 width=c.uploaded_logo.width
-                height=c.uploaded_logo.height}}
-          {{/if}}
+                height=c.uploaded_logo.height
+              }}
+            {{/if}}
           {{/unless}}
-
           <h3>
             {{category-title-before category=c}}
             {{#if c.read_restricted}}
@@ -23,15 +24,15 @@
       </div>
 
       {{#unless c.isMuted}}
-      <div class='featured-topics'>
-        {{#if c.topics}}
-          <ul>
-            {{#each c.topics as |topic|}}
-              {{categories-boxes-topic topic=topic}}
-            {{/each}}
-          </ul>
-        {{/if}}
-      </div>
+        <div class='featured-topics'>
+          {{#if c.topics}}
+            <ul>
+              {{#each c.topics as |topic|}}
+                {{categories-boxes-topic topic=topic}}
+              {{/each}}
+            </ul>
+          {{/if}}
+        </div>
       {{/unless}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index 755eea2b72..40b256d283 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -3,15 +3,16 @@
    data-url={{c.url}}>
     <div class='category-box-inner'>
       {{#unless c.isMuted}}
-      <div class="category-logo">
-        {{#if c.uploaded_logo.url}}
-          {{cdn-img
+        <div class="category-logo">
+          {{#if c.uploaded_logo.url}}
+            {{cdn-img
               src=c.uploaded_logo.url
               class="logo"
               width=c.uploaded_logo.width
-              height=c.uploaded_logo.height}}
-        {{/if}}
-      </div>
+              height=c.uploaded_logo.height
+            }}
+          {{/if}}
+        </div>
       {{/unless}}
       <div class="category-details">
         <div class='category-box-heading'>
@@ -26,45 +27,45 @@
         </div>
 
         {{#unless c.isMuted}}
-        <div class='description'>
-          {{text-overflow class="overflow" text=c.description_excerpt}}
-        </div>
-        {{#if c.isGrandParent}}
-          {{#each c.subcategories as |subcategory|}}
-            <div data-category-id={{subcategory.id}} data-notification-level={{subcategory.notificationLevelString}}  style={{border-color subcategory.color}} class="subcategory with-subcategories {{if subcategory.uploaded_logo.url 'has-logo' 'no-logo'}}">
-              <div class="subcategory-box-inner">
-                {{category-title-link tagName="h4" category=subcategory}}
-                {{#if subcategory.subcategories}}
-                  <div class='subcategories'>
-                    {{#each subcategory.subcategories as |subsubcategory|}}
-                      {{#unless subsubcategory.isMuted}}
-                        <span class='subcategory'>
-                          {{category-title-before category=subsubcategory}}
-                          {{category-link subsubcategory hideParent="true"}}
-                        </span>
-                      {{/unless}}
-                    {{/each}}
-                  </div>
-                {{/if}}
-            </div>
-           </div>
-          {{/each}}
-        {{else if c.subcategories}}
-          <div class='subcategories'>
-            {{#each c.subcategories as |sc|}}
-              <a class="subcategory" href={{sc.url}}>
-                <span class="subcategory-image-placeholder">
-                  {{cdn-img
-                      src=sc.uploaded_logo.url
-                      class="logo"
-                      width=sc.uploaded_logo.width
-                      height=sc.uploaded_logo.height}}
-                </span>
-                {{category-link sc hideParent="true"}}
-              </a>
-            {{/each}}
+          <div class='description'>
+            {{text-overflow class="overflow" text=c.description_excerpt}}
           </div>
-        {{/if}}
+          {{#if c.isGrandParent}}
+            {{#each c.subcategories as |subcategory|}}
+              <div data-category-id={{subcategory.id}} data-notification-level={{subcategory.notificationLevelString}}  style={{border-color subcategory.color}} class="subcategory with-subcategories {{if subcategory.uploaded_logo.url 'has-logo' 'no-logo'}}">
+                <div class="subcategory-box-inner">
+                  {{category-title-link tagName="h4" category=subcategory}}
+                  {{#if subcategory.subcategories}}
+                    <div class='subcategories'>
+                      {{#each subcategory.subcategories as |subsubcategory|}}
+                        {{#unless subsubcategory.isMuted}}
+                          <span class='subcategory'>
+                            {{category-title-before category=subsubcategory}}
+                            {{category-link subsubcategory hideParent="true"}}
+                          </span>
+                        {{/unless}}
+                      {{/each}}
+                    </div>
+                  {{/if}}
+                </div>
+              </div>
+            {{/each}}
+          {{else if c.subcategories}}
+            <div class='subcategories'>
+              {{#each c.subcategories as |sc|}}
+                <a class="subcategory" href={{sc.url}}>
+                  <span class="subcategory-image-placeholder">
+                    {{cdn-img
+                        src=sc.uploaded_logo.url
+                        class="logo"
+                        width=sc.uploaded_logo.width
+                        height=sc.uploaded_logo.height}}
+                  </span>
+                  {{category-link sc hideParent="true"}}
+                </a>
+              {{/each}}
+            </div>
+          {{/if}}
         {{/unless}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index 6c02050bbd..495a40ec9f 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -15,59 +15,59 @@
           <td class="category {{if c.isMuted 'muted'}} {{if noCategoryStyle "no-category-style"}}" style={{unless noCategoryStyle (border-color c.color)}}>
             {{category-title-link category=c}}
             {{#unless c.isMuted}}
-            {{#if c.description_excerpt}}
-              <div class="category-description">
-                {{dir-span c.description_excerpt}}
-              </div>
-            {{/if}}
-            {{#if c.isGrandParent}}
-              <table class="category-list subcategories-with-subcategories">
-                <tbody>
-                  {{#each c.subcategories as |subcategory|}}
-                    <tr data-category-id={{subcategory.id}} data-notification-level={{subcategory.notificationLevelString}} class="{{if subcategory.description_excerpt 'has-description' 'no-description'}} {{if subcategory.uploaded_logo.url 'has-logo' 'no-logo'}}">
-                      <td class="category" style={{border-color subcategory.color}}>
-                        {{category-title-link tagName="h4" category=subcategory}}
-                        {{#if subcategory.description_excerpt}}
-                          <div class="category-description subcategory-description">
-                            {{dir-span subcategory.description_excerpt}}
-                          </div>
-                        {{/if}}
-                        {{#if subcategory.subcategories}}
-                          <div class='subcategories'>
-                            {{#each subcategory.subcategories as |subsubcategory|}}
-                              {{#unless subsubcategory.isMuted}}
-                                <span class='subcategory'>
-                                  {{category-title-before category=subsubcategory}}
-                                  {{category-link subsubcategory hideParent="true"}}
-                                </span>
-                              {{/unless}}
-                            {{/each}}
-                          </div>
-                        {{else}}
+              {{#if c.description_excerpt}}
+                <div class="category-description">
+                  {{dir-span c.description_excerpt}}
+                </div>
+              {{/if}}
+              {{#if c.isGrandParent}}
+                <table class="category-list subcategories-with-subcategories">
+                  <tbody>
+                    {{#each c.subcategories as |subcategory|}}
+                      <tr data-category-id={{subcategory.id}} data-notification-level={{subcategory.notificationLevelString}} class="{{if subcategory.description_excerpt 'has-description' 'no-description'}} {{if subcategory.uploaded_logo.url 'has-logo' 'no-logo'}}">
+                        <td class="category" style={{border-color subcategory.color}}>
+                          {{category-title-link tagName="h4" category=subcategory}}
                           {{#if subcategory.description_excerpt}}
                             <div class="category-description subcategory-description">
                               {{dir-span subcategory.description_excerpt}}
                             </div>
                           {{/if}}
-                        {{/if}}
-                      </td>
-                    </tr>
+                          {{#if subcategory.subcategories}}
+                            <div class='subcategories'>
+                              {{#each subcategory.subcategories as |subsubcategory|}}
+                                {{#unless subsubcategory.isMuted}}
+                                  <span class='subcategory'>
+                                    {{category-title-before category=subsubcategory}}
+                                    {{category-link subsubcategory hideParent="true"}}
+                                  </span>
+                                {{/unless}}
+                              {{/each}}
+                            </div>
+                          {{else}}
+                            {{#if subcategory.description_excerpt}}
+                              <div class="category-description subcategory-description">
+                                {{dir-span subcategory.description_excerpt}}
+                              </div>
+                            {{/if}}
+                          {{/if}}
+                        </td>
+                      </tr>
+                    {{/each}}
+                  </tbody>
+                </table>
+              {{else if c.subcategories}}
+                <div class='subcategories'>
+                  {{#each c.subcategories as |subcategory|}}
+                    {{#unless subcategory.isMuted}}
+                      <span class='subcategory'>
+                        {{category-title-before category=subcategory}}
+                        {{category-link subcategory hideParent="true"}}
+                        {{category-unread category=subcategory}}
+                      </span>
+                    {{/unless}}
                   {{/each}}
-                </tbody>
-              </table>
-            {{else if c.subcategories}}
-              <div class='subcategories'>
-                {{#each c.subcategories as |subcategory|}}
-                  {{#unless subcategory.isMuted}}
-                    <span class='subcategory'>
-                      {{category-title-before category=subcategory}}
-                      {{category-link subcategory hideParent="true"}}
-                      {{category-unread category=subcategory}}
-                    </span>
-                  {{/unless}}
-                {{/each}}
-              </div>
-            {{/if}}
+                </div>
+              {{/if}}
             {{/unless}}
           </td>
           <td class="topics">
@@ -75,13 +75,13 @@
             {{category-unread category=c tagName="div" class="unread-new"}}
           </td>
           {{#unless c.isMuted}}
-          {{#if showTopics}}
-            <td class="latest">
-              {{#each c.featuredTopics as |t|}}
-                {{featured-topic topic=t latestTopicOnly=latestTopicOnly}}
-              {{/each}}
-            </td>
-          {{/if}}
+            {{#if showTopics}}
+              <td class="latest">
+                {{#each c.featuredTopics as |t|}}
+                  {{featured-topic topic=t latestTopicOnly=latestTopicOnly}}
+                {{/each}}
+              </td>
+            {{/if}}
           {{/unless}}
         </tr>
       {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/choose-message.hbs b/app/assets/javascripts/discourse/templates/components/choose-message.hbs
index 6c21242484..b602627f0f 100644
--- a/app/assets/javascripts/discourse/templates/components/choose-message.hbs
+++ b/app/assets/javascripts/discourse/templates/components/choose-message.hbs
@@ -15,7 +15,7 @@
           <span class="message-title">
             {{m.title}}
           </span>
-       </label>
+        </label>
       </div>
     {{/each}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
index bf89487741..dd7ad30ff6 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
@@ -1,16 +1,18 @@
 {{#if showSelector}}
-  {{user-selector topicId=topicId
-                  onChangeCallback=(action "triggerResize")
-                  id="private-message-users"
-                  includeMessageableGroups='true'
-                  placeholderKey="composer.users_placeholder"
-                  tabindex="1"
-                  usernames=usernames
-                  hasGroups=hasGroups
-                  allowEmails='true'
-                  autocomplete="discourse"}}
+  {{user-selector
+    topicId=topicId
+    onChangeCallback=(action "triggerResize")
+    id="private-message-users"
+    includeMessageableGroups='true'
+    placeholderKey="composer.users_placeholder"
+    tabindex="1"
+    usernames=usernames
+    hasGroups=hasGroups
+    allowEmails='true'
+    autocomplete="discourse"
+  }}
 {{else}}
-    <a href {{action "toggleSelector"}}>
+  <a href {{action "toggleSelector"}}>
     <div class='ac-wrap composer-user-selector-limited'>
       <span>{{limitedUsernames}}</span>
       <span class='btn btn-primary'>{{hiddenUsersCount}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
index 73ca697a71..401f4ebcb7 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -6,7 +6,7 @@
       <label for="category-position">
         {{i18n 'category.position'}}
       </label>
-            {{text-field value=category.position id="category-position" class="position-input" type="number"}}
+      {{text-field value=category.position id="category-position" class="position-input" type="number"}}
     </section>
   {{/if}}
 
@@ -33,16 +33,16 @@
       {{i18n "category.search_priority.label"}}
     </label>
     <div class="controls">
-    {{combo-box
-      valueProperty="value"
-      id="category-search-priority"
-      content=searchPrioritiesOptions
-      value=category.search_priority
-      onChange=(action (mut category.search_priority))
-      options=(hash
-        placementStrategy="absolute"
-      )
-    }}
+      {{combo-box
+        valueProperty="value"
+        id="category-search-priority"
+        content=searchPrioritiesOptions
+        value=category.search_priority
+        onChange=(action (mut category.search_priority))
+        options=(hash
+          placementStrategy="absolute"
+        )
+      }}
     </div>
   </section>
 
@@ -77,13 +77,10 @@
       {{i18n "category.all_topics_wiki"}}
     </label>
   </section>
-
 </section>
 
 <section>
-
   <h3>{{i18n 'category.settings_sections.moderation'}}</h3>
-
   {{#if siteSettings.enable_category_group_review}}
     <section class="field">
       <label for="reviewable-by-group">
@@ -93,7 +90,8 @@
         groupFinder=groupFinder
         single="true"
         groupNames=category.reviewable_by_group_name
-        placeholderKey="category.review_group_name"}}
+        placeholderKey="category.review_group_name"
+      }}
     </section>
   {{/if}}
 
@@ -139,12 +137,10 @@
     </label>
     {{text-field value=category.custom_fields.num_auto_bump_daily id="category-number-daily-bump" type="number"}}
   </section>
-
 </section>
 
 <section>
-
-  <h3> {{i18n "category.settings_sections.appearance"}}</h3>
+  <h3>{{i18n "category.settings_sections.appearance"}}</h3>
 
   <section class="field default-view-field">
     <label for="category-default-view">
@@ -185,75 +181,73 @@
       {{i18n "category.sort_order"}}
     </label>
     <div class="controls">
-    {{combo-box valueProperty="value" content=availableSorts value=category.sort_order none="category.sort_options.default"}}
-    {{#unless isDefaultSortOrder}}
-      {{combo-box
-        castBoolean=true
-        valueProperty="value"
-        content=sortAscendingOptions
-        value=category.sort_ascending
-        none="category.sort_options.default"
-        options=(hash
-          placementStrategy="absolute"
-        )
-      }}
-    {{/unless}}
-      </div>
-  </section>
-
-    {{#if isParentCategory}}
-      <section class="field show-subcategory-list-field">
-        <label>
-          {{input type="checkbox" checked=category.show_subcategory_list}}
-          {{i18n "category.show_subcategory_list"}}
-        </label>
-      </section>
-    {{/if}}
-
-    {{#if showSubcategoryListStyle}}
-      <section class="field subcategory-list-style-field">
-        <label for="subcategory-list-style">
-          {{i18n "category.subcategory_list_style"}}
-        </label>
+      {{combo-box valueProperty="value" content=availableSorts value=category.sort_order none="category.sort_options.default"}}
+      {{#unless isDefaultSortOrder}}
         {{combo-box
+          castBoolean=true
           valueProperty="value"
-          id="subcategory-list-style"
-          content=availableSubcategoryListStyles
-          value=category.subcategory_list_style
+          content=sortAscendingOptions
+          value=category.sort_ascending
+          none="category.sort_options.default"
           options=(hash
             placementStrategy="absolute"
           )
         }}
-      </section>
-    {{/if}}
+      {{/unless}}
+    </div>
+  </section>
+  {{#if isParentCategory}}
+    <section class="field show-subcategory-list-field">
+      <label>
+        {{input type="checkbox" checked=category.show_subcategory_list}}
+        {{i18n "category.show_subcategory_list"}}
+      </label>
+    </section>
+  {{/if}}
 
+  {{#if showSubcategoryListStyle}}
+    <section class="field subcategory-list-style-field">
+      <label for="subcategory-list-style">
+        {{i18n "category.subcategory_list_style"}}
+      </label>
+      {{combo-box
+        valueProperty="value"
+        id="subcategory-list-style"
+        content=availableSubcategoryListStyles
+        value=category.subcategory_list_style
+        options=(hash
+          placementStrategy="absolute"
+        )
+      }}
+    </section>
+  {{/if}}
 </section>
 
 <section>
-  <h3> {{i18n "category.settings_sections.email"}}</h3>
+  <h3>{{i18n "category.settings_sections.email"}}</h3>
 
   {{#if emailInEnabled}}
-      <section class='field'>
-        <label for="category-email-in">
-          {{d-icon "far-envelope"}}
-          {{i18n 'category.email_in'}}
-        </label>
-                {{text-field id="category-email-in" class="email-in" value=category.email_in}}
-      </section>
+    <section class='field'>
+      <label for="category-email-in">
+        {{d-icon "far-envelope"}}
+        {{i18n 'category.email_in'}}
+      </label>
+      {{text-field id="category-email-in" class="email-in" value=category.email_in}}
+    </section>
 
-      <section class='field'>
-        <label>
-          {{input type="checkbox" checked=category.email_in_allow_strangers}}
-          {{i18n 'category.email_in_allow_strangers'}}
-        </label>
-      </section>
+    <section class='field'>
+      <label>
+        {{input type="checkbox" checked=category.email_in_allow_strangers}}
+        {{i18n 'category.email_in_allow_strangers'}}
+      </label>
+    </section>
 
-      <section class='field'>
-          <label>
-            {{input type="checkbox" checked=category.mailinglist_mirror}}
-            {{i18n 'category.mailinglist_mirror'}}
-          </label>
-      </section>
+    <section class='field'>
+      <label>
+        {{input type="checkbox" checked=category.mailinglist_mirror}}
+        {{i18n 'category.mailinglist_mirror'}}
+      </label>
+    </section>
 
     {{plugin-outlet name="category-email-in" args=(hash category=category)}}
   {{/if}}
@@ -264,7 +258,6 @@
       <a href={{get-url '/admin/site_settings/category/email'}}>{{i18n 'category.email_in_disabled_click'}}</a>
     </section>
   {{/unless}}
-
 </section>
 
 {{plugin-outlet name="category-custom-settings" args=(hash category=category) connectorTagName="" tagName="section"}}
diff --git a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
index 38451bea90..14da87147f 100644
--- a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
@@ -1,22 +1,22 @@
 <div class="future-date-input">
   {{#unless isBasedOnDuration}}
-  <div class="control-group">
-    <label>{{displayLabel}}</label>
-    {{future-date-input-selector
-      minimumResultsForSearch=-1
-      statusType=statusType
-      value=(readonly selection)
-      input=(readonly input)
-      includeDateTime=includeDateTime
-      includeWeekend=includeWeekend
-      includeFarFuture=includeFarFuture
-      includeMidFuture=includeMidFuture
-      clearable=clearable
-      none="topic.auto_update_input.none"
-      onChangeInput=onChangeInput
-      onChange=(action (mut selection))
-    }}
-  </div>
+    <div class="control-group">
+      <label>{{displayLabel}}</label>
+      {{future-date-input-selector
+        minimumResultsForSearch=-1
+        statusType=statusType
+        value=(readonly selection)
+        input=(readonly input)
+        includeDateTime=includeDateTime
+        includeWeekend=includeWeekend
+        includeFarFuture=includeFarFuture
+        includeMidFuture=includeMidFuture
+        clearable=clearable
+        none="topic.auto_update_input.none"
+        onChangeInput=onChangeInput
+        onChange=(action (mut selection))
+      }}
+    </div>
   {{/unless}}
 
   {{#if displayDateAndTimePicker}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index 7f6104b836..cc819f07a9 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -1,14 +1,14 @@
 {{#if visible}}
   <div class="card-content">
-
     <div class="card-row first-row">
       <div class="group-card-avatar">
         <a href={{groupPath}} {{action "showGroup" group}} class="card-huge-avatar">
           {{avatar-flair
-          flairURL=group.flair_url
-          flairBgColor=group.flair_bg_color
-          flairColor=group.flair_color
-          groupName=group.name}}
+            flairURL=group.flair_url
+            flairBgColor=group.flair_bg_color
+            flairColor=group.flair_color
+            groupName=group.name
+          }}
         </a>
       </div>
       <div class="names">
@@ -26,8 +26,9 @@
       <ul class="usercard-controls group-details-button">
         <li>
           {{group-membership-button
-           model=group
-           showLogin=(route-action "showLogin")}}
+             model=group
+             showLogin=(route-action "showLogin")
+           }}
         </li>
         {{#if group.messageable}}
           <li>
@@ -35,7 +36,8 @@
               action=(action "messageGroup")
               class="btn-primary group-message-button inline"
               icon="envelope"
-              label="groups.message"}}
+              label="groups.message"
+            }}
           </li>
         {{/if}}
       </ul>
@@ -74,13 +76,12 @@
             <a href {{action 'showUser' user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
           {{/each}}
           {{#if showMoreMembers}}
-            <a href={{groupPath}} {{action "showGroup" group}} class="more-members-link"><span
-               class="more-members-count">+{{moreMembersCount}}
-                {{i18n "more"}}</span></a>
+            <a href={{groupPath}} {{action "showGroup" group}} class="more-members-link">
+              <span class="more-members-count">+{{moreMembersCount}}{{i18n "more"}}</span>
+            </a>
           {{/if}}
         </div>
       </div>
     {{/if}}
-
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
index 6c7afbab65..3efeac10ac 100644
--- a/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
@@ -1,9 +1,9 @@
 <div class='control-group buttons'>
   {{#d-button action=(action "save")
-      disabled=saving
-      class='btn btn-primary group-manage-save'}}
-
-      {{savingText}}
+    disabled=saving
+    class='btn btn-primary group-manage-save'
+  }}
+    {{savingText}}
   {{/d-button}}
 
   {{#if saved}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index d4a9673708..451904c542 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -1,25 +1,24 @@
 <div class='clearfix info'>
-    <a href={{post.user.userUrl}} data-user-card={{post.user.username}} class='avatar-link'>
-      {{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
-    </a>
-    <span class='time'>{{format-date post.created_at leaveAgo="true"}}</span>
-    {{expand-post item=post}}
+  <a href={{post.user.userUrl}} data-user-card={{post.user.username}} class='avatar-link'>
+    {{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
+  </a>
+  <span class='time'>{{format-date post.created_at leaveAgo="true"}}</span>
+  {{expand-post item=post}}
 
   <div class='stream-topic-details'>
-      <div class='stream-topic-title'>
-        <span class='title'>
-          <a href={{postUrl}}>{{html-safe post.topic.fancyTitle}}</a>
-        </span>
+    <div class='stream-topic-title'>
+      <span class='title'>
+        <a href={{postUrl}}>{{html-safe post.topic.fancyTitle}}</a>
+      </span>
+    </div>
+    <div class="group-post-category">{{category-link post.category}}</div>
+    {{#if post.user.name}}
+      <div class="group-member-info">
+        <span class="name">{{post.user.name}}</span>
+        {{#if post.user.title}}<span class="title">, {{post.user.title}}</span>{{/if}}
       </div>
-      <div class="group-post-category">{{category-link post.category}}</div>
-      {{#if post.user.name}}
-        <div class="group-member-info">
-          <span class="name">{{post.user.name}}</span>
-          {{#if post.user.title}}<span class="title">, {{post.user.title}}</span>{{/if}}
-        </div>
-      {{/if}}
+    {{/if}}
   </div>
-
 </div>
 
 <div class='excerpt'>
diff --git a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
index a7a7875219..ad366bfc1f 100644
--- a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/invite-panel.hbs
@@ -38,12 +38,13 @@
             value=emailOrUsername
             placeholderKey="topic.invite_reply.email_placeholder"}}
         {{/if}}
-          {{#if showContactPicker}}
-            {{d-button
+        {{#if showContactPicker}}
+          {{d-button
             icon="address-book"
             action=(action "searchContact")
-            class="btn-primary open-contact-picker"}}
-          {{/if}}
+            class="btn-primary open-contact-picker"
+          }}
+        {{/if}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs b/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs
index 0808efcc6d..25a520642a 100644
--- a/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs
@@ -4,5 +4,5 @@
 {{custom-html name="extraNavItem" tagName="li"}}
 {{!- this is done to avoid DIV in the UL, originally {{plugin-outlet name="extra-nav-item"}}
 {{#each connectors as |c|}}
-{{plugin-connector connector=c class=c.classNames tagName="li" args=(hash category=category filterMode=filterMode)}}
+  {{plugin-connector connector=c class=c.classNames tagName="li" args=(hash category=category filterMode=filterMode)}}
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/navigation-item.hbs b/app/assets/javascripts/discourse/templates/components/navigation-item.hbs
index f6ebd1b786..7cd996da0c 100644
--- a/app/assets/javascripts/discourse/templates/components/navigation-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/navigation-item.hbs
@@ -1,6 +1,6 @@
 <a href={{hrefLink}} class={{activeClass}}>
-{{#if hasIcon}}
-<span class={{content.name}}></span>
-{{/if}}
-{{content.displayName}}
+  {{#if hasIcon}}
+    <span class={{content.name}}></span>
+  {{/if}}
+  {{content.displayName}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
index 2ac3b61ff7..6cbad0ec06 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
@@ -4,7 +4,7 @@
     <a href {{action "showEditHistory"}}
       class="has-edits {{historyClass}}"
       title="{{i18n "post.last_edited_on"}} {{editedDate}}">
-        {{d-icon "pencil-alt"}}
+      {{d-icon "pencil-alt"}}
     </a>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs
index 33c3e016ac..6b1f327638 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs
@@ -2,28 +2,26 @@
   <table class='reviewable-histories'>
     <thead>
       <tr>
-      <th colspan="3">{{i18n "review.history.title"}}</th>
-    </tr>
+        <th colspan="3">{{i18n "review.history.title"}}</th>
+      </tr>
     </thead>
     <tbody>
-    {{#each filteredHistories as |rh|}}
-      {{#unless rh.created}}
-        <tr>
-          <td>
-            {{reviewable-history-description rh}}
-          </td>
-          <td>
-            {{#user-link user=rs.user}}
-              {{avatar rh.created_by imageSize="tiny"}}
-              {{rh.created_by.username}}
-            {{/user-link}}
-          </td>
-          <td>{{format-date rh.created_at format="medium"}}</td>
-
-        </tr>
-      {{/unless}}
-    {{/each}}
-  </tbody>
-
+      {{#each filteredHistories as |rh|}}
+        {{#unless rh.created}}
+          <tr>
+            <td>
+              {{reviewable-history-description rh}}
+            </td>
+            <td>
+              {{#user-link user=rs.user}}
+                {{avatar rh.created_by imageSize="tiny"}}
+                {{rh.created_by.username}}
+              {{/user-link}}
+            </td>
+            <td>{{format-date rh.created_at format="medium"}}</td>
+          </tr>
+        {{/unless}}
+      {{/each}}
+    </tbody>
   </table>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
index e811554285..f15b9e4ace 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
@@ -1,9 +1,9 @@
 {{#if reviewable.reviewable_scores}}
   <table class='reviewable-scores'>
     <tbody>
-    {{#each reviewable.reviewable_scores as |rs|}}
-      {{reviewable-score rs=rs reviewable=reviewable}}
-    {{/each}}
-  </tbody>
+      {{#each reviewable.reviewable_scores as |rs|}}
+        {{reviewable-score rs=rs reviewable=reviewable}}
+      {{/each}}
+    </tbody>
   </table>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
index 89df8f94e3..c3548b7c58 100644
--- a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
@@ -53,9 +53,9 @@
           unlimitedTagCount=true
           onChange=(action (mut searchedTerms.tags))
         }}
-      <section class="field">
+        <section class="field">
           <label>{{ input type="checkbox" class="all-tags" checked=searchedTerms.special.all_tags}} {{i18n "search.advanced.filters.all_tags"}} </label>
-      </section>
+        </section>
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
index d9c0ff5802..4bfcbdc6fd 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
@@ -10,8 +10,10 @@
 
 <nav id='topic-progress' title={{i18n 'topic.progress.title'}} class={{if hideProgress 'hidden'}}>
   <div class='nums'>
-    <h4>{{progressPosition}}</h4><span class={{if hugeNumberOfPosts 'hidden'}}>
-    <span>/</span>
-    <h4>{{postStream.filteredPostsCount}}</h4></span>
+    <h4>{{progressPosition}}</h4>
+    <span class={{if hugeNumberOfPosts 'hidden'}}>
+      <span>/</span>
+      <h4>{{postStream.filteredPostsCount}}</h4>
+    </span>
   </div>
 </nav>
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index 4bc61d7a7c..60bf8008b9 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -153,8 +153,10 @@
         <div class="card-row">
           <div class="location-and-website">
             {{#if user.location}}
-              <span class='location'>{{d-icon "map-marker-alt"}}
-                <span>{{user.location}}</span></span>
+              <span class='location'>
+                {{d-icon "map-marker-alt"}}
+                <span>{{user.location}}</span>
+              </span>
             {{/if}}
             {{#if user.website_name}}
               <span class='website-name'>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index fd3cb91917..5583c96f89 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,5 +1,10 @@
-<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}}
+<label class="control-label" for={{concat 'user-' elementId}}>
+  {{html-safe field.name}}
+  {{#if field.required}}
+    <span class='required'>*</span>
+  {{/if}}
 </label>
+
 <div class='controls'>
   {{combo-box
     id=(concat 'user-' elementId)
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index f6da96aa0c..50d4f6ee86 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -46,7 +46,8 @@
 </p>
 
 {{#each item.children as |child|}}
-  <div class='user-stream-item-actions child-actions'>{{!-- DEPRECATED: 'child-actions' class --}}
+  {{!-- DEPRECATED: 'child-actions' class --}}
+  <div class='user-stream-item-actions child-actions'>
     {{d-icon child.icon class="icon"}}
     {{#each child.items as |grandChild|}}
       {{#if grandChild.removableBookmark}}
@@ -54,10 +55,11 @@
           class="btn-default remove-bookmark"
           action=(action removeBookmark grandChild)
           icon="times"
-          label="bookmarks.remove"}}
+          label="bookmarks.remove"
+        }}
       {{else}}
-          <a href={{grandChild.userUrl}} data-user-card={{grandChild.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true" avatarTemplatePath="acting_avatar_template"}}</div></a>
-          {{#if grandChild.edit_reason}} &mdash; <span class="edit-reason">{{grandChild.edit_reason}}</span>{{/if}}
+        <a href={{grandChild.userUrl}} data-user-card={{grandChild.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true" avatarTemplatePath="acting_avatar_template"}}</div></a>
+        {{#if grandChild.edit_reason}} &mdash; <span class="edit-reason">{{grandChild.edit_reason}}</span>{{/if}}
       {{/if}}
     {{/each}}
   </div>
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 9394f35486..649c3af0e4 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -93,7 +93,7 @@
 
                   <div class='search-category'>
                     {{#if result.topic.category.parentCategory}}
-                    {{category-link result.topic.category.parentCategory}}
+                      {{category-link result.topic.category.parentCategory}}
                     {{/if}}
                     {{category-link result.topic.category hideParent=true}}
                     {{#each result.topic.tags as |tag|}}
@@ -107,7 +107,7 @@
                   <span class='date'>
                     {{format-age result.created_at}}
                     {{#if result.blurb}}
-                    -
+                      -
                     {{/if}}
                   </span>
 
diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs
index 36d9acfe88..cd2608f2c2 100644
--- a/app/assets/javascripts/discourse/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/group-index.hbs
@@ -1,88 +1,89 @@
 <section class="user-content">
-
-<div class="group-members-actions">
+  <div class="group-members-actions">
     {{#if model.can_see_members}}
-      {{text-field value=filterInput
-          placeholderKey=filterPlaceholder
-          autocomplete="discourse"
-          class="group-username-filter no-blur"}}
+      {{text-field
+        value=filterInput
+        placeholderKey=filterPlaceholder
+        autocomplete="discourse"
+        class="group-username-filter no-blur"
+      }}
     {{/if}}
 
-  <div class="group-members-manage">
-    {{#if canManageGroup}}
-      {{d-button icon="plus"
-      action=(route-action "showAddMembersModal")
-      label="groups.add_members.title"
-      class="group-members-add"}}
-      {{#if currentUser.admin}}
+    <div class="group-members-manage">
+      {{#if canManageGroup}}
         {{d-button icon="plus"
-        action=(route-action "showBulkAddModal")
-        label="admin.groups.bulk_add.title"
-        class="group-bulk-add"}}
+        action=(route-action "showAddMembersModal")
+        label="groups.add_members.title"
+        class="group-members-add"}}
+        {{#if currentUser.admin}}
+          {{d-button icon="plus"
+          action=(route-action "showBulkAddModal")
+          label="admin.groups.bulk_add.title"
+          class="group-bulk-add"}}
+        {{/if}}
       {{/if}}
-    {{/if}}
+    </div>
   </div>
-</div>
 
-{{#if hasMembers}}
-  {{#load-more selector=".group-members tr" action=(action "loadMore")}}
-    <table class='group-members'>
-      <thead>
-        {{group-index-toggle order=order desc=desc field='username_lower' i18nKey='username'}}
-        <th class='group-owner'>{{i18n "groups.members.owner"}}</th>
-        {{group-index-toggle order=order desc=desc field='added_at' i18nKey='groups.member_added'}}
-        {{group-index-toggle order=order desc=desc field='last_posted_at' i18nKey='last_post'}}
-        {{group-index-toggle order=order desc=desc field='last_seen_at'  i18nKey='last_seen'}}
-        <th></th>
-      </thead>
+  {{#if hasMembers}}
+    {{#load-more selector=".group-members tr" action=(action "loadMore")}}
+      <table class='group-members'>
+        <thead>
+          {{group-index-toggle order=order desc=desc field='username_lower' i18nKey='username'}}
+          <th class='group-owner'>{{i18n "groups.members.owner"}}</th>
+          {{group-index-toggle order=order desc=desc field='added_at' i18nKey='groups.member_added'}}
+          {{group-index-toggle order=order desc=desc field='last_posted_at' i18nKey='last_post'}}
+          {{group-index-toggle order=order desc=desc field='last_seen_at'  i18nKey='last_seen'}}
+          <th></th>
+        </thead>
 
-      <tbody>
-        {{#each model.members as |m|}}
-          <tr>
-            <td class='avatar'>
-              {{user-info user=m skipName=skipName}}
-            </td>
+        <tbody>
+          {{#each model.members as |m|}}
+            <tr>
+              <td class='avatar'>
+                {{user-info user=m skipName=skipName}}
+              </td>
 
-            <td class='group-owner'>
-              {{#if m.owner}}
-                <strong class="group-owner-label">
-                  {{d-icon "shield-alt"}}
-                </strong>
-              {{/if}}
-            </td>
-            <td>
-              <span class="text">{{bound-date m.added_at}}</span>
-            </td>
-            <td>
-              <span class="text">{{bound-date m.last_posted_at}}</span>
-            </td>
-            <td>
-              <span class="text">{{bound-date m.last_seen_at}}</span>
-            </td>
+              <td class='group-owner'>
+                {{#if m.owner}}
+                  <strong class="group-owner-label">
+                    {{d-icon "shield-alt"}}
+                  </strong>
+                {{/if}}
+              </td>
+              <td>
+                <span class="text">{{bound-date m.added_at}}</span>
+              </td>
+              <td>
+                <span class="text">{{bound-date m.last_posted_at}}</span>
+              </td>
+              <td>
+                <span class="text">{{bound-date m.last_seen_at}}</span>
+              </td>
 
-            <td>
-              {{#if canManageGroup}}
-                {{group-member-dropdown
-                  member=m
-                  onChange=(action "actOnGroup" m)
-                }}
-              {{/if}}
-              {{!-- group parameter is used by plugins --}}
-            </td>
-          </tr>
-        {{/each}}
-      </tbody>
-    </table>
-  {{/load-more}}
+              <td>
+                {{#if canManageGroup}}
+                  {{group-member-dropdown
+                    member=m
+                    onChange=(action "actOnGroup" m)
+                  }}
+                {{/if}}
+                {{!-- group parameter is used by plugins --}}
+              </td>
+            </tr>
+          {{/each}}
+        </tbody>
+      </table>
+    {{/load-more}}
 
-  {{conditional-loading-spinner condition=loading}}
-{{else if model.can_see_members}}
-  <br>
+    {{conditional-loading-spinner condition=loading}}
+  {{else if model.can_see_members}}
+    <br>
 
-  <div>{{i18n "groups.empty.members"}}</div>
-{{else}}
-  <br>
+    <div>{{i18n "groups.empty.members"}}</div>
+  {{else}}
+    <br>
 
-  <div>{{i18n "groups.members.forbidden"}}</div>
-{{/if}}
+    <div>{{i18n "groups.members.forbidden"}}</div>
+  {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/group-requests.hbs b/app/assets/javascripts/discourse/templates/group-requests.hbs
index d018c23d7c..7b8b793315 100644
--- a/app/assets/javascripts/discourse/templates/group-requests.hbs
+++ b/app/assets/javascripts/discourse/templates/group-requests.hbs
@@ -1,55 +1,57 @@
 <section class="user-content">
 
-<div class="group-members-actions">
-    {{text-field value=filterInput
-        placeholderKey=filterPlaceholder
-        class="group-username-filter no-blur"}}
-</div>
+  <div class="group-members-actions">
+    {{text-field
+      value=filterInput
+      placeholderKey=filterPlaceholder
+      class="group-username-filter no-blur"
+    }}
+  </div>
 
-{{#if hasRequesters}}
-  {{#load-more selector=".group-members tr" action=(action "loadMore")}}
-    <table class='group-members'>
-      <thead>
-        {{group-index-toggle order=order desc=desc field='username_lower' i18nKey='username'}}
-        {{group-index-toggle order=order desc=desc field='requested_at' i18nKey='groups.member_requested'}}
-        <th>{{i18n "groups.requests.reason"}}</th>
-        <th></th>
-        <th></th>
-      </thead>
+  {{#if hasRequesters}}
+    {{#load-more selector=".group-members tr" action=(action "loadMore")}}
+      <table class='group-members'>
+        <thead>
+          {{group-index-toggle order=order desc=desc field='username_lower' i18nKey='username'}}
+          {{group-index-toggle order=order desc=desc field='requested_at' i18nKey='groups.member_requested'}}
+          <th>{{i18n "groups.requests.reason"}}</th>
+          <th></th>
+          <th></th>
+        </thead>
 
-      <tbody>
-        {{#each model.requesters as |m|}}
-          <tr>
-            <td class='avatar'>
-              {{user-info user=m skipName=skipName}}
-            </td>
-            <td>
-              <span class="text">{{bound-date m.requested_at}}</span>
-            </td>
-            <td>{{m.reason}}</td>
-            <td>
-              {{#if m.request_undone}}
-                {{i18n "groups.requests.undone"}}
-              {{else if m.request_accepted}}
-                {{i18n "groups.requests.accepted"}}
-                {{d-button action=(action "undoAcceptRequest") actionParam=m label="undo"}}
-              {{else if m.request_denied}}
-                {{i18n "groups.requests.denied"}}
-              {{else}}
-                {{d-button action=(action "acceptRequest") actionParam=m label="groups.requests.accept" class="btn-primary"}}
-                {{d-button action=(action "denyRequest") actionParam=m label="groups.requests.deny" class="btn-danger"}}
-              {{/if}}
-            </td>
-            <td></td>
-          </tr>
-        {{/each}}
-      </tbody>
-    </table>
-  {{/load-more}}
+        <tbody>
+          {{#each model.requesters as |m|}}
+            <tr>
+              <td class='avatar'>
+                {{user-info user=m skipName=skipName}}
+              </td>
+              <td>
+                <span class="text">{{bound-date m.requested_at}}</span>
+              </td>
+              <td>{{m.reason}}</td>
+              <td>
+                {{#if m.request_undone}}
+                  {{i18n "groups.requests.undone"}}
+                {{else if m.request_accepted}}
+                  {{i18n "groups.requests.accepted"}}
+                  {{d-button action=(action "undoAcceptRequest") actionParam=m label="undo"}}
+                {{else if m.request_denied}}
+                  {{i18n "groups.requests.denied"}}
+                {{else}}
+                  {{d-button action=(action "acceptRequest") actionParam=m label="groups.requests.accept" class="btn-primary"}}
+                  {{d-button action=(action "denyRequest") actionParam=m label="groups.requests.deny" class="btn-danger"}}
+                {{/if}}
+              </td>
+              <td></td>
+            </tr>
+          {{/each}}
+        </tbody>
+      </table>
+    {{/load-more}}
 
-  {{conditional-loading-spinner condition=loading}}
-{{else}}
-  <div>{{i18n "groups.empty.requests"}}</div>
-{{/if}}
+    {{conditional-loading-spinner condition=loading}}
+  {{else}}
+    <div>{{i18n "groups.empty.requests"}}</div>
+  {{/if}}
 
 </section>
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 1bc9734c13..4cb1033389 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -53,13 +53,12 @@
       {{/if}}
     </div>
   </div>
-<div class="user-content-wrapper">
-  <section class="user-primary-navigation">
-    <div class="container">
-      {{group-navigation group=model currentPath=currentPath tabs=tabs}}
-    </div>
-  </section>
-
-        {{outlet}}
-</div>
+  <div class="user-content-wrapper">
+    <section class="user-primary-navigation">
+      <div class="container">
+        {{group-navigation group=model currentPath=currentPath tabs=tabs}}
+      </div>
+    </section>
+    {{outlet}}
+  </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/group/activity.hbs b/app/assets/javascripts/discourse/templates/group/activity.hbs
index 896228f959..5d94db7b56 100644
--- a/app/assets/javascripts/discourse/templates/group/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/group/activity.hbs
@@ -1,4 +1,4 @@
-  <section class="user-secondary-navigation">
+<section class="user-secondary-navigation">
   {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=router._router.currentPath}}
     {{#if model.can_see_members}}
       {{group-activity-filter filter="posts" categoryId=category_id}}
@@ -12,4 +12,4 @@
 </section>
 <section class="user-content">
   {{outlet}}
-  </section>
+</section>
diff --git a/app/assets/javascripts/discourse/templates/group/manage.hbs b/app/assets/javascripts/discourse/templates/group/manage.hbs
index 5ee0f8591f..459cdd7a18 100644
--- a/app/assets/javascripts/discourse/templates/group/manage.hbs
+++ b/app/assets/javascripts/discourse/templates/group/manage.hbs
@@ -11,4 +11,4 @@
 </section>
 <section class="user-content">
   {{outlet}}
-  </section>
+</section>
diff --git a/app/assets/javascripts/discourse/templates/group/messages.hbs b/app/assets/javascripts/discourse/templates/group/messages.hbs
index 1d3edaa440..f923416abb 100644
--- a/app/assets/javascripts/discourse/templates/group/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/group/messages.hbs
@@ -1,6 +1,5 @@
-  <section class="user-secondary-navigation">
+<section class="user-secondary-navigation">
   {{#mobile-nav class='messages-nav' desktopClass='nav-stacked action-list' currentPath=router._router.currentPath}}
-
     <li>
       {{#link-to 'group.messages.inbox' model.name}}
         {{i18n 'user.messages.inbox'}}
@@ -14,5 +13,5 @@
   {{/mobile-nav}}
 </section>
 <section class="user-content">
-    {{outlet}}
+  {{outlet}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/templates/groups/index.hbs
index bf610c81ac..a3f46e47db 100644
--- a/app/assets/javascripts/discourse/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/index.hbs
@@ -61,15 +61,15 @@
                   <div class="group-membership">
                     {{#group-membership-button tagName='' model=group showLogin=(route-action "showLogin")}}
                       {{#if group.is_group_owner}}
-                      <span class="is-group-owner">
-                        {{d-icon "shield-alt"}}
-                        {{i18n "groups.index.is_group_owner"}}
-                      </span>
+                        <span class="is-group-owner">
+                          {{d-icon "shield-alt"}}
+                          {{i18n "groups.index.is_group_owner"}}
+                        </span>
                       {{else if group.is_group_user}}
-                      <span class="is-group-member">
-                        {{d-icon "check"}}
-                        {{i18n "groups.index.is_group_user"}}
-                      </span>
+                        <span class="is-group-member">
+                          {{d-icon "check"}}
+                          {{i18n "groups.index.is_group_user"}}
+                        </span>
                       {{else if group.public_admission}}
                         {{i18n 'groups.index.public'}}
                       {{else if group.isPrivate}}
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index f2f1e73678..ce3f115efa 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -1,5 +1,4 @@
 <div class="container invites-show clearfix">
-
   <h2>{{welcomeTitle}}</h2>
 
   <div class="two-col">
@@ -10,15 +9,18 @@
     <div class="col-form">
       {{#if successMessage}}
         <br><br>
-        <div class='alert alert-info'><p>{{html-safe successMessage}}</p></div>
+        <div class='alert alert-info'>
+          <p>{{html-safe successMessage}}</p>
+        </div>
       {{else}}
         <p>{{i18n 'invites.invited_by'}}</p>
         <p>{{user-info user=invitedBy}}</p>
 
-        <p>{{html-safe yourEmailMessage}}
-        {{#if externalAuthsEnabled}}
-             {{i18n 'invites.social_login_available'}}
-        {{/if}}
+        <p>
+          {{html-safe yourEmailMessage}}
+          {{#if externalAuthsEnabled}}
+            {{i18n 'invites.social_login_available'}}
+          {{/if}}
         </p>
 
         <form>
@@ -44,7 +46,8 @@
             <div class="instructions">
               {{passwordInstructions}} {{i18n 'invites.optional_description'}}
               <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
-                {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div>
+                {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}
+              </div>
             </div>
           </div>
 
@@ -61,7 +64,8 @@
             action=(action "submit")
             type="submit"
             disabled=submitDisabled
-            label="invites.accept_invite"}}
+            label="invites.accept_invite"
+          }}
 
           {{#if errorMessage}}
             <br><br>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 72ed944b94..f9fa81455a 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -2,7 +2,7 @@
   {{#if hasIncoming}}
     <div class="show-mores">
       <a href class='alert alert-info clickable' {{action showInserted}}>
-	{{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
+        {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
       </a>
     </div>
   {{/if}}
@@ -10,50 +10,56 @@
   {{#if topics}}
     <table class="topic-list">
       <tbody>
-	{{#each topics as |t|}}
-	  <tr class="topic-list-item {{if t.archived 'archived'}} {{if t.visited 'visited'}}" data-topic-id={{t.id}}>
-	    <td>
-	      <div class='main-link'>
-		{{topic-status topic=t}}
-		{{topic-link t}}
-		{{raw "list/unread-indicator" includeUnreadIndicator=showUnreadIndicator
-					      topicId=t.id
-					      unreadClass=(if t.unread_by_group_member "" "read")}}
-		{{#if t.unseen}}
-		  <span class="badge-notification new-topic"></span>
-		{{/if}}
-		{{#if t.hasExcerpt}}
-		  <div class="topic-excerpt">
-		    {{html-safe t.excerpt}}
-		    {{#if t.excerptTruncated}}
-		      {{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
-		    {{/if}}
-		    {{#if t.canClearPin}}
-		      <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>{{i18n 'topic.clear_pin.title'}}</a>
-		    {{/if}}
-		  </div>
-		{{/if}}
-	      </div>
-	      <div class='pull-right'>
-		{{raw "list/post-count-or-badges" topic=t postBadgesEnabled="true"}}
-	      </div>
-	      <div class='clearfix'></div>
-	      <div class="topic-item-stats clearfix">
-		{{discourse-tags t mode="list" tagsForUser=tagsForUser}}
-		<div class="pull-right">
-		  {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
-		  <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
-		</div>
-		{{#unless hideCategory}}
-		  <div class='category'>
-		    {{category-link t.category}}
-		  </div>
-		{{/unless}}
-		<div class="clearfix"></div>
-	      </div>
-	    </td>
-	  </tr>
-	{{/each}}
+        {{#each topics as |t|}}
+          <tr class="topic-list-item {{if t.archived 'archived'}} {{if t.visited 'visited'}}" data-topic-id={{t.id}}>
+            <td>
+              <div class='main-link'>
+                {{topic-status topic=t}}
+                {{topic-link t}}
+                {{raw "list/unread-indicator"
+                  includeUnreadIndicator=showUnreadIndicator
+                  topicId=t.id
+                  unreadClass=(if t.unread_by_group_member "" "read")
+                }}
+                {{#if t.unseen}}
+                  <span class="badge-notification new-topic"></span>
+                {{/if}}
+                {{#if t.hasExcerpt}}
+                  <div class="topic-excerpt">
+                    {{html-safe t.excerpt}}
+                    {{#if t.excerptTruncated}}
+                      {{#unless t.canClearPin}}
+                        <a href={{t.url}}>{{i18n 'read_more'}}</a>
+                      {{/unless}}
+                    {{/if}}
+                    {{#if t.canClearPin}}
+                      <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>
+                        {{i18n 'topic.clear_pin.title'}}
+                      </a>
+                    {{/if}}
+                  </div>
+                {{/if}}
+              </div>
+              <div class='pull-right'>
+                {{raw "list/post-count-or-badges" topic=t postBadgesEnabled="true"}}
+              </div>
+              <div class='clearfix'></div>
+              <div class="topic-item-stats clearfix">
+                {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
+                <div class="pull-right">
+                  {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
+                  <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
+                </div>
+                {{#unless hideCategory}}
+                  <div class='category'>
+                    {{category-link t.category}}
+                  </div>
+                {{/unless}}
+                <div class="clearfix"></div>
+              </div>
+            </td>
+          </tr>
+        {{/each}}
       </tbody>
     </table>
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index b57dfeb001..148c009254 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -9,68 +9,71 @@
                 {{category-title-link category=c}}
               </th>
             </tr>
-
             {{#unless c.isMuted}}
-	      {{#if c.description_excerpt}}
-		<tr class="category-description">
-		  <td colspan="3">
-		    {{html-safe c.description_excerpt}}
-		  </td>
-		</tr>
-	      {{/if}}
-
-	      {{#if showTopics}}
-		{{#each c.topics as |t|}}
-		  {{mobile-category-topic topic=t}}
-		{{/each}}
-	      {{/if}}
-
-	      {{#if c.isGrandParent}}
-		{{#each c.subcategories as |subcategory|}}
-		  <tr data-category-id={{c.id}} class='subcategory-list-item category' style={{border-color subcategory.color}}>
-		    <td>
-		      {{category-title-link tagName="h4" category=subcategory}}
-		      <div class="subcategories-list">
-			{{#if subcategory.subcategories}}
-			  <div class='subcategories'>
-			    {{#each subcategory.subcategories as |subsubcategory|}}
-			      {{#unless subsubcategory.isMuted}}
-				{{category-link subsubcategory}}
-			      {{/unless}}
-			    {{/each}}
-			  </div>
-			{{/if}}
-		      </div>
-		    </td>
-		  </tr>
-		{{/each}}
-	      {{else if c.subcategories}}
-		<tr class="subcategories-list">
-		  <td>
-		    <div class='subcategories'>
-		      {{#each c.subcategories as |subcategory|}}
-			{{#unless subcategory.isMuted}}
-			  {{category-link subcategory}}
-			{{/unless}}
-		      {{/each}}
-		    </div>
-		  </td>
-		</tr>
-	      {{/if}}
+              {{#if c.description_excerpt}}
+                <tr class="category-description">
+                  <td colspan="3">
+                    {{html-safe c.description_excerpt}}
+                  </td>
+                </tr>
+              {{/if}}
+              {{#if showTopics}}
+                {{#each c.topics as |t|}}
+                  {{mobile-category-topic topic=t}}
+                {{/each}}
+              {{/if}}
+              {{#if c.isGrandParent}}
+                {{#each c.subcategories as |subcategory|}}
+                  <tr data-category-id={{c.id}} class='subcategory-list-item category' style={{border-color subcategory.color}}>
+                    <td>
+                      {{category-title-link tagName="h4" category=subcategory}}
+                      <div class="subcategories-list">
+                        {{#if subcategory.subcategories}}
+                          <div class='subcategories'>
+                            {{#each subcategory.subcategories as |subsubcategory|}}
+                              {{#unless subsubcategory.isMuted}}
+                                {{category-link subsubcategory}}
+                              {{/unless}}
+                            {{/each}}
+                          </div>
+                        {{/if}}
+                      </div>
+                    </td>
+                  </tr>
+                {{/each}}
+              {{else if c.subcategories}}
+                <tr class="subcategories-list">
+                  <td>
+                    <div class='subcategories'>
+                      {{#each c.subcategories as |subcategory|}}
+                        {{#unless subcategory.isMuted}}
+                          {{category-link subcategory}}
+                        {{/unless}}
+                      {{/each}}
+                    </div>
+                  </td>
+                </tr>
+              {{/if}}
             {{/unless}}
           </tbody>
         </table>
         <footer class="clearfix">
-          <figure title={{i18n 'all_time_desc'}}>{{number c.topics_all_time}} <figcaption>{{i18n 'all_time'}}</figcaption></figure>
-
+          <figure title={{i18n 'all_time_desc'}}>
+            {{number c.topics_all_time}}
+            <figcaption>{{i18n 'all_time'}}</figcaption>
+          </figure>
           {{#if c.pickMonth}}
-          <figure title={{i18n 'month_desc'}}>{{number c.topics_month}} <figcaption>/ {{i18n 'month'}}</figcaption></figure>
+            <figure title={{i18n 'month_desc'}}>
+              {{number c.topics_month}}
+              <figcaption>/ {{i18n 'month'}}</figcaption>
+            </figure>
           {{/if}}
-
           {{#if c.pickWeek}}
-            <figure title={{i18n 'week_desc'}}>{{number c.topics_week}} <figcaption>/ {{i18n 'week'}}</figcaption></figure>
+            <figure title={{i18n 'week_desc'}}>
+              {{number c.topics_week}}
+              <figcaption>/ {{i18n 'week'}}</figcaption>
+            </figure>
           {{/if}}
-
         </footer>
       </div>
     {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
index e95a8cb20f..7ec577917c 100644
--- a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
@@ -1,60 +1,63 @@
 <section class="user-content">
-{{text-field value=filterInput
+  {{text-field
+    value=filterInput
     placeholderKey=filterPlaceholder
     autocomplete="discourse"
-    class="group-username-filter no-blur"}}
+    class="group-username-filter no-blur"
+  }}
 
-<div class="group-members-manage">
-  {{#if canManageGroup}}
-    {{#if currentUser.admin}}
-      {{group-members-dropdown
-        showAddMembersModal=(route-action "showAddMembersModal")
-        showBulkAddModal=(route-action "showBulkAddModal")
-      }}
-    {{else}}
-      {{d-button
+  <div class="group-members-manage">
+    {{#if canManageGroup}}
+      {{#if currentUser.admin}}
+        {{group-members-dropdown
+          showAddMembersModal=(route-action "showAddMembersModal")
+          showBulkAddModal=(route-action "showBulkAddModal")
+        }}
+      {{else}}
+        {{d-button
           icon="plus"
           label="groups.add_members.title"
           class="group-members-add"
-          action=(route-action "showAddMembersModal")}}
+          action=(route-action "showAddMembersModal")
+        }}
+      {{/if}}
     {{/if}}
+  </div>
+
+  {{#if hasMembers}}
+    {{#load-more selector=".group-members .user-info" action=(action "loadMore")}}
+      <div class="group-members">
+        {{#each model.members as |user|}}
+          <div class="group-member">
+            {{#user-info user=user skipName=skipName}}
+              {{#if user.owner}}<strong class="group-owner-label">{{i18n "groups.owner"}}</strong>{{/if}}
+
+              <div class="group-member-info">
+                <label>{{i18n "last_post"}}</label>
+                <span class="text">{{bound-date user.last_posted_at}}</span>
+              </div>
+
+              <div class="group-member-info">
+                <label>{{i18n "last_seen"}}</label>
+                <span class="text">{{bound-date user.last_seen_at}}</span>
+              </div>
+
+              {{#if canManageGroup}}
+                {{group-member-dropdown
+                  member=user
+                  onChange=(action "actOnGroup" user)
+                }}
+              {{/if}}
+            {{/user-info}}
+          </div>
+        {{/each}}
+      </div>
+    {{/load-more}}
+
+    {{conditional-loading-spinner condition=loading}}
+  {{else}}
+    <br>
+
+    <div>{{i18n "groups.empty.members"}}</div>
   {{/if}}
-</div>
-
-{{#if hasMembers}}
-  {{#load-more selector=".group-members .user-info" action=(action "loadMore")}}
-    <div class="group-members">
-      {{#each model.members as |user|}}
-        <div class="group-member">
-          {{#user-info user=user skipName=skipName}}
-            {{#if user.owner}}<strong class="group-owner-label">{{i18n "groups.owner"}}</strong>{{/if}}
-
-            <div class="group-member-info">
-              <label>{{i18n "last_post"}}</label>
-              <span class="text">{{bound-date user.last_posted_at}}</span>
-            </div>
-
-            <div class="group-member-info">
-              <label>{{i18n "last_seen"}}</label>
-              <span class="text">{{bound-date user.last_seen_at}}</span>
-            </div>
-
-            {{#if canManageGroup}}
-              {{group-member-dropdown
-                member=user
-                onChange=(action "actOnGroup" user)
-              }}
-            {{/if}}
-          {{/user-info}}
-        </div>
-      {{/each}}
-    </div>
-  {{/load-more}}
-
-  {{conditional-loading-spinner condition=loading}}
-{{else}}
-  <br>
-
-  <div>{{i18n "groups.empty.members"}}</div>
-{{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 890a7dbdcc..553705c7a5 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -1,11 +1,11 @@
 {{#d-modal-body id="bookmark-reminder-modal"}}
   {{#conditional-loading-spinner condition=loading}}
     {{#if errorMessage}}
-    <div class="control-group">
-      <div class="controls">
-        <div class='alert alert-error'>{{errorMessage}}</div>
+      <div class="control-group">
+        <div class="controls">
+          <div class='alert alert-error'>{{errorMessage}}</div>
+        </div>
       </div>
-    </div>
     {{/if}}
 
     <div class="control-group">
@@ -13,83 +13,83 @@
     </div>
 
     {{#if showBookmarkReminderControls}}
-    <div class="control-group">
-      <label class="control-label" for="set_reminder">
-        {{i18n 'post.bookmarks.set_reminder'}}
-      </label>
+      <div class="control-group">
+        <label class="control-label" for="set_reminder">
+          {{i18n 'post.bookmarks.set_reminder'}}
+        </label>
 
-      {{#if userHasTimezoneSet}}
-        {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
-          {{#if showAtDesktop}}
-            {{#tap-tile icon="desktop" tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.at_desktop"}}</div>
-            {{/tap-tile}}
-          {{/if}}
+        {{#if userHasTimezoneSet}}
+          {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
+            {{#if showAtDesktop}}
+              {{#tap-tile icon="desktop" tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+                <div class="tap-tile-title">{{i18n "bookmarks.reminders.at_desktop"}}</div>
+              {{/tap-tile}}
+            {{/if}}
 
-          {{#if showLaterToday}}
-            {{#tap-tile icon="far-moon" tileId=reminderTypes.LATER_TODAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_today"}}</div>
-              <div class="tap-tile-date">{{laterTodayFormatted}}</div>
+            {{#if showLaterToday}}
+              {{#tap-tile icon="far-moon" tileId=reminderTypes.LATER_TODAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+                <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_today"}}</div>
+                <div class="tap-tile-date">{{laterTodayFormatted}}</div>
+              {{/tap-tile}}
+            {{/if}}
+            {{#tap-tile icon="far-sun" tileId=reminderTypes.TOMORROW activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.tomorrow"}}</div>
+              <div class="tap-tile-date">{{tomorrowFormatted}}</div>
             {{/tap-tile}}
-          {{/if}}
-          {{#tap-tile icon="far-sun" tileId=reminderTypes.TOMORROW activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            <div class="tap-tile-title">{{i18n "bookmarks.reminders.tomorrow"}}</div>
-            <div class="tap-tile-date">{{tomorrowFormatted}}</div>
-          {{/tap-tile}}
-          {{#if showLaterThisWeek}}
-            {{#tap-tile icon="angle-double-right" tileId=reminderTypes.LATER_THIS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_this_week"}}</div>
-              <div class="tap-tile-date">{{laterThisWeekFormatted}}</div>
+            {{#if showLaterThisWeek}}
+              {{#tap-tile icon="angle-double-right" tileId=reminderTypes.LATER_THIS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+                <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_this_week"}}</div>
+                <div class="tap-tile-date">{{laterThisWeekFormatted}}</div>
+              {{/tap-tile}}
+            {{/if}}
+            {{#tap-tile icon="briefcase" tileId=reminderTypes.START_OF_NEXT_BUSINESS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.start_of_next_business_week"}}</div>
+              <div class="tap-tile-date">{{startNextBusinessWeekFormatted}}</div>
+            {{/tap-tile}}
+            {{#tap-tile icon="far-clock" tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_week"}}</div>
+              <div class="tap-tile-date">{{nextWeekFormatted}}</div>
+            {{/tap-tile}}
+            {{#tap-tile icon="far-calendar-plus" tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_month"}}</div>
+              <div class="tap-tile-date">{{nextMonthFormatted}}</div>
+            {{/tap-tile}}
+            {{#tap-tile icon="calendar-alt" tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.custom"}}</div>
             {{/tap-tile}}
-          {{/if}}
-          {{#tap-tile icon="briefcase" tileId=reminderTypes.START_OF_NEXT_BUSINESS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            <div class="tap-tile-title">{{i18n "bookmarks.reminders.start_of_next_business_week"}}</div>
-            <div class="tap-tile-date">{{startNextBusinessWeekFormatted}}</div>
-          {{/tap-tile}}
-          {{#tap-tile icon="far-clock" tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_week"}}</div>
-            <div class="tap-tile-date">{{nextWeekFormatted}}</div>
-          {{/tap-tile}}
-          {{#tap-tile icon="far-calendar-plus" tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_month"}}</div>
-            <div class="tap-tile-date">{{nextMonthFormatted}}</div>
-          {{/tap-tile}}
-          {{#tap-tile icon="calendar-alt" tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            <div class="tap-tile-title">{{i18n "bookmarks.reminders.custom"}}</div>
-          {{/tap-tile}}
 
-          {{#if customDateTimeSelected}}
-            <div class="control-group custom-date-time-wrap">
-              <div class="tap-tile-date-input">
-                {{d-icon "calendar-alt"}}
-                {{date-picker-future
-                  value=customReminderDate
-                  onSelect=(action (mut customReminderDate))
-                }}
+            {{#if customDateTimeSelected}}
+              <div class="control-group custom-date-time-wrap">
+                <div class="tap-tile-date-input">
+                  {{d-icon "calendar-alt"}}
+                  {{date-picker-future
+                    value=customReminderDate
+                    onSelect=(action (mut customReminderDate))
+                  }}
+                </div>
+                <div class="tap-tile-time-input">
+                  {{d-icon "far-clock"}}
+                  {{input placeholder="--:--" type="time" class="time-input" value=customReminderTime}}
+                </div>
               </div>
-              <div class="tap-tile-time-input">
-                {{d-icon "far-clock"}}
-                {{input placeholder="--:--" type="time" class="time-input" value=customReminderTime}}
-              </div>
-            </div>
-          {{/if}}
+            {{/if}}
 
-          {{#if showLastCustom}}
-            {{#tap-tile icon="undo" tileId=reminderTypes.LAST_CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.last_custom"}}</div>
-              <div class="tap-tile-date">{{lastCustomFormatted}}</div>
+            {{#if showLastCustom}}
+              {{#tap-tile icon="undo" tileId=reminderTypes.LAST_CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+                <div class="tap-tile-title">{{i18n "bookmarks.reminders.last_custom"}}</div>
+                <div class="tap-tile-date">{{lastCustomFormatted}}</div>
+              {{/tap-tile}}
+            {{/if}}
+
+            {{#tap-tile icon="ban" tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.none"}}</div>
             {{/tap-tile}}
-          {{/if}}
+          {{/tap-tile-grid}}
 
-          {{#tap-tile icon="ban" tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-            <div class="tap-tile-title">{{i18n "bookmarks.reminders.none"}}</div>
-          {{/tap-tile}}
-        {{/tap-tile-grid}}
-
-      {{else}}
-        <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=basePath)}}</div>
-      {{/if}}
-    </div>
+        {{else}}
+          <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=basePath)}}</div>
+        {{/if}}
+      </div>
     {{/if}}
 
     <div class="control-group">
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index bd03f39f24..c5b493a8a1 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -10,117 +10,123 @@
       {{#if showCreateForm}}
         <div class="login-form">
           <form>
-          <table>
-            <tbody>
-              <tr class="input create-account-email">
-                    <td class="label"><label for='new-account-email'>{{i18n 'user.email.title'}}</label></td>
-                    <td>
-                    {{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated name="email" autofocus="autofocus"}}
-                    </td>
-              </tr>
-
-              <tr class="instructions create-account-email">
-                <td></td>
-                    {{input-tip validation=emailValidation id="account-email-validation"}}
-                    <td><label>{{i18n 'user.email.instructions'}}</label></td>
-              </tr>
-
-              {{#if usernameRequired}}
-                <tr class="input">
-                      <td class="label"><label for='new-account-username'>{{i18n 'user.username.title'}}</label></td>
-                      <td>
-                      {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="discourse"}}
-                      </td>
-                </tr>
-                <tr class="instructions">
-                  <td></td>
-                  {{input-tip validation=usernameValidation id="username-validation"}}
-                  <td><label>{{i18n 'user.username.instructions'}}</label></td>
-                </tr>
-              {{/if}}
-
-              {{#if fullnameRequired}}
-                <tr class="input">
-                  <td class="label">
-                    <label for='new-account-name'>{{i18n 'user.name.title'}}</label>
-                  </td>
+            <table>
+              <tbody>
+                <tr class="input create-account-email">
+                  <td class="label"><label for='new-account-email'>{{i18n 'user.email.title'}}</label></td>
                   <td>
-                    {{text-field value=accountName id="new-account-name"}}
+                    {{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated name="email" autofocus="autofocus"}}
                   </td>
                 </tr>
-                <tr class="instructions">
+
+                <tr class="instructions create-account-email">
                   <td></td>
-                  {{input-tip validation=nameValidation}}
-                  <td><label>{{nameInstructions}}</label></td>
+                  {{input-tip validation=emailValidation id="account-email-validation"}}
+                  <td><label>{{i18n 'user.email.instructions'}}</label></td>
                 </tr>
-              {{/if}}
 
-              {{plugin-outlet name="create-account-before-password"
-                              noTags=true
-                              args=(hash accountName=accountName
-                                         accountUsername=accountUsername
-                                         accountPassword=accountPassword
-                                         userFields=userFields
-                                         authOptions=authOptions)}}
+                {{#if usernameRequired}}
+                  <tr class="input">
+                    <td class="label"><label for='new-account-username'>{{i18n 'user.username.title'}}</label></td>
+                    <td>
+                      {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="discourse"}}
+                    </td>
+                  </tr>
+                  <tr class="instructions">
+                    <td></td>
+                    {{input-tip validation=usernameValidation id="username-validation"}}
+                    <td><label>{{i18n 'user.username.instructions'}}</label></td>
+                  </tr>
+                {{/if}}
 
-              {{#if passwordRequired}}
-                <tr class="input">
+                {{#if fullnameRequired}}
+                  <tr class="input">
+                    <td class="label">
+                      <label for='new-account-name'>{{i18n 'user.name.title'}}</label>
+                    </td>
+                    <td>
+                      {{text-field value=accountName id="new-account-name"}}
+                    </td>
+                  </tr>
+                  <tr class="instructions">
+                    <td></td>
+                    {{input-tip validation=nameValidation}}
+                    <td><label>{{nameInstructions}}</label></td>
+                  </tr>
+                {{/if}}
+
+                {{plugin-outlet
+                  name="create-account-before-password"
+                  noTags=true
+                  args=(hash
+                    accountName=accountName
+                    accountUsername=accountUsername
+                    accountPassword=accountPassword
+                    userFields=userFields
+                    authOptions=authOptions
+                  )
+                }}
+
+                {{#if passwordRequired}}
+                  <tr class="input">
                     <td class="label"><label for='new-account-password'>{{i18n 'user.password.title'}}</label></td>
                     <td>
-                    {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
+                      {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
                     </td>
-                </tr>
-                <tr class="instructions">
-                  <td></td>
-                  {{input-tip validation=passwordValidation}}
+                  </tr>
+                  <tr class="instructions">
+                    <td></td>
+                    {{input-tip validation=passwordValidation}}
+                    <td>
+                      <label>{{passwordInstructions}}</label>
+                      <div class="caps-lock-warning {{unless capsLockOn 'hidden'}}">
+                        {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}
+                      </div>
+                    </td>
+                  </tr>
+                {{/if}}
+
+                <tr class="password-confirmation">
+                  <td><label for='new-account-password-confirmation'>{{i18n 'user.password_confirmation.title'}}</label></td>
                   <td>
-                    <label>{{passwordInstructions}}</label>
-                    <div class="caps-lock-warning {{unless capsLockOn 'hidden'}}">
-                      {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div>
+                    {{honeypot-input id="new-account-confirmation" autocomplete="new-password" value=accountHoneypot}}
+                    {{input value=accountChallenge id="new-account-challenge"}}
                   </td>
                 </tr>
-              {{/if}}
 
-              <tr class="password-confirmation">
-                <td><label for='new-account-password-confirmation'>{{i18n 'user.password_confirmation.title'}}</label></td>
-                <td>
-                  {{honeypot-input id="new-account-confirmation" autocomplete="new-password" value=accountHoneypot}}
-                  {{input value=accountChallenge id="new-account-challenge"}}
-                </td>
-              </tr>
+                {{#if requireInviteCode }}
+                  <tr class="invite-code">
+                    <td><label for='invite-code'>{{i18n 'user.invite_code.title'}}</label></td>
+                    <td>
+                      {{input value=inviteCode id="inviteCode"}}
+                    </td>
+                    <td><label>{{i18n 'user.invite_code.instructions'}}</label></td>
+                  </tr>
+                {{/if}}
 
-              {{#if requireInviteCode }}
-                <tr class="invite-code">
-                  <td><label for='invite-code'>{{i18n 'user.invite_code.title'}}</label></td>
-                  <td>
-                    {{input value=inviteCode id="inviteCode"}}
-                  </td>
-
-                  <td><label>{{i18n 'user.invite_code.instructions'}}</label></td>
-                </tr>
-              {{/if}}
-
-              {{plugin-outlet name="create-account-after-password"
-                              noTags=true
-                              args=(hash accountName=accountName
-                                         accountUsername=accountUsername
-                                         accountPassword=accountPassword
-                                         userFields=userFields)}}
-            </tbody>
-          </table>
-
-          {{#if userFields}}
-            <div class='user-fields'>
-              {{#each userFields as |f|}}
-                {{user-field field=f.field value=f.value}}
-              {{/each}}
-            </div>
-          {{/if}}
+                {{plugin-outlet
+                  name="create-account-after-password"
+                  noTags=true
+                  args=(hash
+                    accountName=accountName
+                    accountUsername=accountUsername
+                    accountPassword=accountPassword
+                    userFields=userFields
+                  )
+                }}
+              </tbody>
+            </table>
 
+            {{#if userFields}}
+              <div class='user-fields'>
+                {{#each userFields as |f|}}
+                  {{user-field field=f.field value=f.value}}
+                {{/each}}
+              </div>
+            {{/if}}
           </form>
         </div>
       {{/if}}
-
     {{/d-modal-body}}
 
     {{#if showCreateForm}}
@@ -129,7 +135,8 @@
           class="btn-large btn-primary"
           action=(action "createAccount")
           disabled=submitDisabled
-          label="create_account.title"}}
+          label="create_account.title"
+        }}
 
         {{#conditional-loading-spinner condition=formSubmitted size="small"}}
           {{#d-button class="btn-large" id="login-link" action=(route-action "showLogin")}}
@@ -137,11 +144,10 @@
           {{/d-button}}
         {{/conditional-loading-spinner}}
 
-      <div class='disclaimer'>{{html-safe disclaimerHtml}}</div>
+        <div class='disclaimer'>{{html-safe disclaimerHtml}}</div>
       </div>
 
       {{plugin-outlet name="create-account-after-modal-footer" tagName=""}}
-
     {{/if}}
   {{/unless}}
 {{/create-account}}
diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/templates/modal/flag.hbs
index 056f2bc9a3..4a37ee0337 100644
--- a/app/assets/javascripts/discourse/templates/modal/flag.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/flag.hbs
@@ -1,14 +1,16 @@
 {{#d-modal-body class="flag-modal-body" title=title}}
   <form>
     {{#flag-selection nameKey=selected.name_key flags=flagsAvailable as |f|}}
-      {{flag-action-type flag=f
-                         message=message
-                         isWarning=isWarning
-                         selectedFlag=selected
-                         username=model.username
-                         staffFlagsAvailable=staffFlagsAvailable
-                         changePostActionType=(action "changePostActionType")}}
-   {{/flag-selection}}
+      {{flag-action-type
+        flag=f
+        message=message
+        isWarning=isWarning
+        selectedFlag=selected
+        username=model.username
+        staffFlagsAvailable=staffFlagsAvailable
+        changePostActionType=(action "changePostActionType")
+      }}
+    {{/flag-selection}}
   </form>
 {{/d-modal-body}}
 
@@ -19,7 +21,8 @@
     disabled=submitDisabled
     title="flagging.submit_tooltip"
     icon=submitIcon
-    label=submitLabel}}
+    label=submitLabel
+  }}
 
   {{#if canSendWarning}}
     {{d-button
@@ -27,7 +30,8 @@
       action=(action "createFlagAsWarning")
       disabled=submitDisabled
       icon="exclamation-triangle"
-      label="flagging.official_warning"}}
+      label="flagging.official_warning"
+    }}
   {{/if}}
 
   {{#if canTakeAction}}
@@ -37,7 +41,8 @@
       disabled=submitDisabled
       title="flagging.take_action_tooltip"
       icon="gavel"
-      label="flagging.take_action"}}
+      label="flagging.take_action"
+    }}
   {{/if}}
 
   {{#if showDeleteSpammer}}
@@ -46,6 +51,7 @@
       action=(action "deleteSpammer")
       disabled=submitDisabled
       icon="exclamation-triangle"
-      label="flagging.delete_spammer"}}
+      label="flagging.delete_spammer"
+    }}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
index 4f3149b7b6..331b08587e 100644
--- a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
@@ -1,40 +1,40 @@
 <form {{action "ok" on="submit"}}>
   {{#d-modal-body title="composer.link_dialog_title" class="insert-link"}}
-      <div class="inputs">
-        {{text-field
-          value=linkUrl
-          placeholderKey="composer.link_url_placeholder"
-          class="link-url"
-          key-up=(action "search")
-        }}
-        {{#if searchLoading}}
-          {{loading-spinner}}
-        {{/if}}
-        {{#if searchResults}}
-          <div class="internal-link-results">
-            {{#each searchResults as |result|}}
-              <a
-                class="search-link"
-                href={{result.url}}
-                onclick={{action "linkClick"}}
-                data-title={{result.title}}>
-                {{topic-status topic=result disableActions=true}}
-                {{replace-emoji result.fancy_title}}
-                <div class="search-category">
-                  {{#if result.category.parentCategory}}
-                    {{category-link result.category.parentCategory}}
-                  {{/if}}
-                  {{category-link result.category hideParent=true}}
-                  {{discourse-tags result}}
-                </div>
-              </a>
-            {{/each}}
-          </div>
-        {{/if}}
-      </div>
-      <div class="inputs">
-        {{text-field value=linkText placeholderKey="composer.link_optional_text" class="link-text"}}
-      </div>
+    <div class="inputs">
+      {{text-field
+        value=linkUrl
+        placeholderKey="composer.link_url_placeholder"
+        class="link-url"
+        key-up=(action "search")
+      }}
+      {{#if searchLoading}}
+        {{loading-spinner}}
+      {{/if}}
+      {{#if searchResults}}
+        <div class="internal-link-results">
+          {{#each searchResults as |result|}}
+            <a
+              class="search-link"
+              href={{result.url}}
+              onclick={{action "linkClick"}}
+              data-title={{result.title}}>
+              {{topic-status topic=result disableActions=true}}
+              {{replace-emoji result.fancy_title}}
+              <div class="search-category">
+                {{#if result.category.parentCategory}}
+                  {{category-link result.category.parentCategory}}
+                {{/if}}
+                {{category-link result.category hideParent=true}}
+                {{discourse-tags result}}
+              </div>
+            </a>
+          {{/each}}
+        </div>
+      {{/if}}
+    </div>
+    <div class="inputs">
+      {{text-field value=linkText placeholderKey="composer.link_optional_text" class="link-text"}}
+    </div>
   {{/d-modal-body}}
 
   <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 43f550d15e..f2d6b022e9 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -56,21 +56,21 @@
       </ul>
     </section>
     {{#if showBookmarkShortcuts}}
-    <section class="keyboard-shortcuts-bookmark-section">
-      <h4>{{i18n "keyboard_shortcuts_help.bookmarks.title"}}</h4>
-      <ul>
-        <li>{{html-safe shortcuts.bookmarks.enter}}</li>
-        <li>{{html-safe shortcuts.bookmarks.later_today}}</li>
-        <li>{{html-safe shortcuts.bookmarks.later_this_week}}</li>
-        <li>{{html-safe shortcuts.bookmarks.tomorrow}}</li>
-        <li>{{html-safe shortcuts.bookmarks.next_week}}</li>
-        <li>{{html-safe shortcuts.bookmarks.next_month}}</li>
-        <li>{{html-safe shortcuts.bookmarks.next_business_week}}</li>
-        <li>{{html-safe shortcuts.bookmarks.next_business_day}}</li>
-        <li>{{html-safe shortcuts.bookmarks.custom}}</li>
-        <li>{{html-safe shortcuts.bookmarks.none}}</li>
-      </ul>
-    </section>
+      <section class="keyboard-shortcuts-bookmark-section">
+        <h4>{{i18n "keyboard_shortcuts_help.bookmarks.title"}}</h4>
+        <ul>
+          <li>{{html-safe shortcuts.bookmarks.enter}}</li>
+          <li>{{html-safe shortcuts.bookmarks.later_today}}</li>
+          <li>{{html-safe shortcuts.bookmarks.later_this_week}}</li>
+          <li>{{html-safe shortcuts.bookmarks.tomorrow}}</li>
+          <li>{{html-safe shortcuts.bookmarks.next_week}}</li>
+          <li>{{html-safe shortcuts.bookmarks.next_month}}</li>
+          <li>{{html-safe shortcuts.bookmarks.next_business_week}}</li>
+          <li>{{html-safe shortcuts.bookmarks.next_business_day}}</li>
+          <li>{{html-safe shortcuts.bookmarks.custom}}</li>
+          <li>{{html-safe shortcuts.bookmarks.none}}</li>
+        </ul>
+      </section>
     {{/if}}
   </div>
   <div class="column">
diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
index 9461b5d3c4..df4dd14513 100644
--- a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
@@ -2,25 +2,25 @@
   <div id="rc-scroll-anchor"></div>
   <table>
     <thead>
-    <th class="th-cat">{{i18n "categories.category"}}</th>
-    <th class="th-pos">{{i18n "categories.reorder.position"}}</th>
+      <th class="th-cat">{{i18n "categories.category"}}</th>
+      <th class="th-pos">{{i18n "categories.reorder.position"}}</th>
     </thead>
     <tbody>
-    {{#each categoriesOrdered as |cat|}}
-      <tr data-category-id={{cat.id}}>
-        <td>
-          <div class={{concat 'reorder-categories-depth-' cat.depth}}>
-            {{category-badge cat allowUncategorized="true"}}
-          </div>
-        </td>
+      {{#each categoriesOrdered as |cat|}}
+        <tr data-category-id={{cat.id}}>
+          <td>
+            <div class={{concat 'reorder-categories-depth-' cat.depth}}>
+              {{category-badge cat allowUncategorized="true"}}
+            </div>
+          </td>
 
-        <td>
-          {{number-field number=(readonly cat.position) change=(action 'change' cat)}}
-          {{d-button class="btn-default no-text" action=(action "moveUp") actionParam=cat icon="arrow-up"}}
-          {{d-button class="btn-default no-text" action=(action "moveDown") actionParam=cat icon="arrow-down"}}
-        </td>
-      </tr>
-    {{/each}}
+          <td>
+            {{number-field number=(readonly cat.position) change=(action 'change' cat)}}
+            {{d-button class="btn-default no-text" action=(action "moveUp") actionParam=cat icon="arrow-up"}}
+            {{d-button class="btn-default no-text" action=(action "moveDown") actionParam=cat icon="arrow-down"}}
+          </td>
+        </tr>
+      {{/each}}
     </tbody>
   </table>
   <div id="rc-scroll-bottom"></div>
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
index dd37835554..c993a811a2 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
@@ -1,11 +1,11 @@
 {{#d-modal-body}}
   {{#conditional-loading-spinner condition=loading}}
     {{#if errorMessage}}
-    <div class="control-group">
-      <div class="controls">
-        <div class='alert alert-error'>{{errorMessage}}</div>
+      <div class="control-group">
+        <div class="controls">
+          <div class='alert alert-error'>{{errorMessage}}</div>
+        </div>
       </div>
-    </div>
     {{/if}}
 
     <div class="control-group">
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
index e9988b486f..8a9e433672 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
@@ -1,51 +1,51 @@
 {{#d-modal-body}}
-<section class="user-preferences solo-preference  second-factor-backup-preferences">
-  <form class="form-horizontal">
-    {{#if successMessage}}
-      <div class="alert alert-success">
-        {{successMessage}}
-      </div>
-    {{/if}}
+  <section class="user-preferences solo-preference  second-factor-backup-preferences">
+    <form class="form-horizontal">
+      {{#if successMessage}}
+        <div class="alert alert-success">
+          {{successMessage}}
+        </div>
+      {{/if}}
 
-    {{#if errorMessage}}
-      <div class="alert alert-error">
-        {{errorMessage}}
-      </div>
-    {{/if}}
+      {{#if errorMessage}}
+        <div class="alert alert-error">
+          {{errorMessage}}
+        </div>
+      {{/if}}
 
-    {{#if backupEnabled}}
-      {{html-safe (i18n "user.second_factor_backup.remaining_codes" count=remainingCodes)}}
-    {{/if}}
-
-    <div class="actions">
-      {{d-button
-        class="btn-primary"
-        action=(action "generateSecondFactorCodes")
-        type="submit"
-        disabled=loading
-        label=generateBackupCodeBtnLabel}}
       {{#if backupEnabled}}
+        {{html-safe (i18n "user.second_factor_backup.remaining_codes" count=remainingCodes)}}
+      {{/if}}
+
+      <div class="actions">
         {{d-button
-          class="btn-danger"
-          action=(action "disableSecondFactorBackup")
+          class="btn-primary"
+          action=(action "generateSecondFactorCodes")
+          type="submit"
           disabled=loading
-          label="user.second_factor_backup.disable"}}
-      {{/if}}
-    </div>
+          label=generateBackupCodeBtnLabel}}
+        {{#if backupEnabled}}
+          {{d-button
+            class="btn-danger"
+            action=(action "disableSecondFactorBackup")
+            disabled=loading
+            label="user.second_factor_backup.disable"}}
+        {{/if}}
+      </div>
 
-    {{#conditional-loading-section isLoading=loading}}
-      {{#if backupCodes}}
-        <h3>{{i18n "user.second_factor_backup.codes.title"}}</h3>
+      {{#conditional-loading-section isLoading=loading}}
+        {{#if backupCodes}}
+          <h3>{{i18n "user.second_factor_backup.codes.title"}}</h3>
 
-        <p>
-          {{i18n "user.second_factor_backup.codes.description"}}
-        </p>
+          <p>
+            {{i18n "user.second_factor_backup.codes.description"}}
+          </p>
 
-        {{backup-codes
-          copyBackupCode=(action "copyBackupCode")
-          backupCodes=backupCodes}}
-      {{/if}}
-    {{/conditional-loading-section}}
-  </form>
-</section>
+          {{backup-codes
+            copyBackupCode=(action "copyBackupCode")
+            backupCodes=backupCodes}}
+        {{/if}}
+      {{/conditional-loading-section}}
+    </form>
+  </section>
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs
index 7de9e5a2ad..b7e9bb651d 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs
@@ -1,15 +1,18 @@
 {{#d-modal-body}}
   <div class="form-horizontal">
-  {{input type="text" value=model.name}}
+    {{input type="text" value=model.name}}
   </div>
   <div class='second-factor instructions'>
     {{i18n 'user.second_factor.security_key.edit_description'}}
   </div>
-  {{d-button action=(action "editSecurityKey")
+  {{d-button
+    action=(action "editSecurityKey")
     class="btn-primary"
-    label="user.second_factor.security_key.edit"}}
-
-  {{d-button action=(action "disableSecurityKey")
+    label="user.second_factor.security_key.edit"
+  }}
+  {{d-button
+    action=(action "disableSecurityKey")
     class="btn-danger"
-    label="user.second_factor.security_key.delete"}}
+    label="user.second_factor.security_key.delete"
+  }}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs
index 48a4670230..4155ce69f6 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs
@@ -1,15 +1,18 @@
 {{#d-modal-body}}
   <div class="form-horizontal">
-  {{input type="text" value=model.name}}
+    {{input type="text" value=model.name}}
   </div>
   <div class='second-factor instructions'>
     {{i18n 'user.second_factor.edit_description'}}
   </div>
-  {{d-button action=(action "editSecondFactor")
+  {{d-button
+    action=(action "editSecondFactor")
     class="btn-primary"
-    label="user.second_factor.edit"}}
-
-  {{d-button action=(action "disableSecondFactor")
+    label="user.second_factor.edit"
+  }}
+  {{d-button
+    action=(action "disableSecondFactor")
     class="btn-danger"
-    label="user.second_factor.disable"}}
+    label="user.second_factor.disable"
+  }}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/templates/password-reset.hbs
index f641f8b0e0..0d3e5b8818 100644
--- a/app/assets/javascripts/discourse/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/templates/password-reset.hbs
@@ -53,7 +53,8 @@
 
           <div class="instructions">
             <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
-              {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div>
+              {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}
+            </div>
           </div>
 
           {{d-button action=(action "submit") class='btn-primary' label='user.change_password.set_password' type='submit'}}
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index e146d073ca..0d3d8f48c8 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -1,162 +1,161 @@
 <section class='user-preferences solo-preference second-factor'>
   {{#conditional-loading-spinner condition=loading}}
-  <form class="form-horizontal">
-
-    {{#if showEnforcedNotice}}
-      <div class="control-group">
-        <div class="controls">
-          <div class='alert alert-error'>{{i18n 'user.second_factor.enforced_notice'}}</div>
-        </div>
-      </div>
-    {{/if}}
-
-    {{#if displayOAuthWarning}}
-      <div class="control-group">
-        <div class="controls">
-          {{i18n 'user.second_factor.oauth_enabled_warning'}}
-        </div>
-      </div>
-    {{/if}}
-
-    {{#if errorMessage}}
-      <div class="control-group">
-        <div class="controls">
-          <div class='alert alert-error'>{{errorMessage}}</div>
-        </div>
-      </div>
-    {{/if}}
-
-    {{#if loaded}}
-      <div class="control-group totp">
-        <div class="controls">
-          <h2>{{i18n "user.second_factor.totp.title"}}</h2>
-          {{d-button action=(action "createTotp")
-            class="btn-primary new-totp"
-            disabled=loading
-            label="user.second_factor.totp.add"}}
-          {{#each totps as |totp|}}
-            <div class="second-factor-item">
-              {{#if totp.name}}
-                {{totp.name}}
-              {{else}}
-                {{i18n "user.second_factor.totp.default_name"}}
-              {{/if}}
-
-              {{#if isCurrentUser}}
-                {{d-button action=(action "editSecondFactor" totp)
-                  class="btn-default btn-small btn-icon pad-left no-text edit"
-                  disabled=loading
-                  icon="pencil-alt"
-                }}
-              {{/if}}
-            </div>
-          {{/each}}
-        </div>
-      </div>
-
-      <div class="control-group security-key">
-        <div class="controls">
-          <h2>{{i18n "user.second_factor.security_key.title"}}</h2>
-          {{d-button action=(action "createSecurityKey")
-            class="btn-primary new-security-key"
-            disabled=loading
-            label="user.second_factor.security_key.add"}}
-          {{#each security_keys as |security_key|}}
-            <div class="second-factor-item">
-              {{#if security_key.name}}
-                {{security_key.name}}
-              {{else}}
-                {{i18n "user.second_factor.security_key.default_name"}}
-              {{/if}}
-
-              {{#if isCurrentUser}}
-                {{d-button action=(action "editSecurityKey" security_key)
-                  class="btn-default btn-small btn-icon pad-left no-text edit"
-                  disabled=loading
-                  icon="pencil-alt"
-                }}
-              {{/if}}
-            </div>
-          {{/each}}
-        </div>
-      </div>
-
-      <div class="control-group pref-second-factor-backup">
-        <div class="controls pref-second-factor-backup">
-          <h2>{{i18n "user.second_factor_backup.title"}}</h2>
-          {{#if model.second_factor_enabled}}
-            {{#if model.second_factor_backup_enabled}}
-              {{html-safe (i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes)}}
-            {{else}}
-              {{i18n 'user.second_factor_backup.enable_long'}}
-            {{/if}}
-
-            {{#if isCurrentUser}}
-              {{d-button action=(action "editSecondFactorBackup")
-                class="btn-default btn-small btn-icon pad-left no-text edit edit-2fa-backup"
-                disabled=loading
-                icon="pencil-alt"
-              }}
-            {{/if}}
-          {{else}}
-            {{i18n "user.second_factor_backup.enable_prerequisites"}}
-          {{/if}}
-        </div>
-      </div>
-
-      {{#if model.second_factor_enabled}}
-        {{#unless showEnforcedNotice}}
-          <div class="control-group">
-            <div class="controls">
-              <h2>{{i18n "user.second_factor.disable_title"}}</h2>
-              {{d-button
-                class="btn-danger"
-                action=(action "disableAllSecondFactors")
-                disabled=loading
-                label="disable"}}
-            </div>
+    <form class="form-horizontal">
+      {{#if showEnforcedNotice}}
+        <div class="control-group">
+          <div class="controls">
+            <div class='alert alert-error'>{{i18n 'user.second_factor.enforced_notice'}}</div>
           </div>
-        {{/unless}}
+        </div>
       {{/if}}
-    {{else}}
-      <div class="control-group">
-        <label class='control-label'>{{i18n 'user.password.title'}}</label>
 
-        <div class="controls">
-          <div>
-            {{text-field value=password
-              id="password"
-              type="password"
-              classNames="input-large"
-              autofocus="autofocus"}}
-          </div>
-          <div class='instructions'>
-            {{i18n 'user.second_factor.confirm_password_description'}}
+      {{#if displayOAuthWarning}}
+        <div class="control-group">
+          <div class="controls">
+            {{i18n 'user.second_factor.oauth_enabled_warning'}}
           </div>
         </div>
-      </div>
+      {{/if}}
 
-      <div class="control-group">
-        <div class="controls">
-          {{d-button
-            class="btn-primary"
-            type="submit"
-            action=(action "confirmPassword")
-            disabled=loading
-            label="continue"}}
+      {{#if errorMessage}}
+        <div class="control-group">
+          <div class="controls">
+            <div class='alert alert-error'>{{errorMessage}}</div>
+          </div>
+        </div>
+      {{/if}}
 
+      {{#if loaded}}
+        <div class="control-group totp">
+          <div class="controls">
+            <h2>{{i18n "user.second_factor.totp.title"}}</h2>
+            {{d-button action=(action "createTotp")
+              class="btn-primary new-totp"
+              disabled=loading
+              label="user.second_factor.totp.add"}}
+            {{#each totps as |totp|}}
+              <div class="second-factor-item">
+                {{#if totp.name}}
+                  {{totp.name}}
+                {{else}}
+                  {{i18n "user.second_factor.totp.default_name"}}
+                {{/if}}
+
+                {{#if isCurrentUser}}
+                  {{d-button action=(action "editSecondFactor" totp)
+                    class="btn-default btn-small btn-icon pad-left no-text edit"
+                    disabled=loading
+                    icon="pencil-alt"
+                  }}
+                {{/if}}
+              </div>
+            {{/each}}
+          </div>
+        </div>
+
+        <div class="control-group security-key">
+          <div class="controls">
+            <h2>{{i18n "user.second_factor.security_key.title"}}</h2>
+            {{d-button action=(action "createSecurityKey")
+              class="btn-primary new-security-key"
+              disabled=loading
+              label="user.second_factor.security_key.add"}}
+            {{#each security_keys as |security_key|}}
+              <div class="second-factor-item">
+                {{#if security_key.name}}
+                  {{security_key.name}}
+                {{else}}
+                  {{i18n "user.second_factor.security_key.default_name"}}
+                {{/if}}
+
+                {{#if isCurrentUser}}
+                  {{d-button action=(action "editSecurityKey" security_key)
+                    class="btn-default btn-small btn-icon pad-left no-text edit"
+                    disabled=loading
+                    icon="pencil-alt"
+                  }}
+                {{/if}}
+              </div>
+            {{/each}}
+          </div>
+        </div>
+
+        <div class="control-group pref-second-factor-backup">
+          <div class="controls pref-second-factor-backup">
+            <h2>{{i18n "user.second_factor_backup.title"}}</h2>
+            {{#if model.second_factor_enabled}}
+              {{#if model.second_factor_backup_enabled}}
+                {{html-safe (i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes)}}
+              {{else}}
+                {{i18n 'user.second_factor_backup.enable_long'}}
+              {{/if}}
+
+              {{#if isCurrentUser}}
+                {{d-button action=(action "editSecondFactorBackup")
+                  class="btn-default btn-small btn-icon pad-left no-text edit edit-2fa-backup"
+                  disabled=loading
+                  icon="pencil-alt"
+                }}
+              {{/if}}
+            {{else}}
+              {{i18n "user.second_factor_backup.enable_prerequisites"}}
+            {{/if}}
+          </div>
+        </div>
+
+        {{#if model.second_factor_enabled}}
           {{#unless showEnforcedNotice}}
-            {{cancel-link route="preferences.account" args=model.username}}
+            <div class="control-group">
+              <div class="controls">
+                <h2>{{i18n "user.second_factor.disable_title"}}</h2>
+                {{d-button
+                  class="btn-danger"
+                  action=(action "disableAllSecondFactors")
+                  disabled=loading
+                  label="disable"}}
+              </div>
+            </div>
           {{/unless}}
+        {{/if}}
+      {{else}}
+        <div class="control-group">
+          <label class='control-label'>{{i18n 'user.password.title'}}</label>
+
+          <div class="controls">
+            <div>
+              {{text-field value=password
+                id="password"
+                type="password"
+                classNames="input-large"
+                autofocus="autofocus"}}
+            </div>
+            <div class='instructions'>
+              {{i18n 'user.second_factor.confirm_password_description'}}
+            </div>
+          </div>
         </div>
-        <div class="controls" style="margin-top: 5px">
-          {{resetPasswordProgress}}
-          {{#unless resetPasswordLoading}}
-            <a href class="instructions" {{action "resetPassword"}}>{{ i18n 'user.second_factor.forgot_password' }}</a>
-          {{/unless}}
+
+        <div class="control-group">
+          <div class="controls">
+            {{d-button
+              class="btn-primary"
+              type="submit"
+              action=(action "confirmPassword")
+              disabled=loading
+              label="continue"}}
+
+            {{#unless showEnforcedNotice}}
+              {{cancel-link route="preferences.account" args=model.username}}
+            {{/unless}}
+          </div>
+          <div class="controls" style="margin-top: 5px">
+            {{resetPasswordProgress}}
+            {{#unless resetPasswordLoading}}
+              <a href class="instructions" {{action "resetPassword"}}>{{ i18n 'user.second_factor.forgot_password' }}</a>
+            {{/unless}}
+          </div>
         </div>
-      </div>
-    {{/if}}
-  </form>
+      {{/if}}
+    </form>
   {{/conditional-loading-spinner}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 40802f66df..9c1483e50e 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -4,7 +4,8 @@
     <span class='static'>{{model.username}}</span>
     {{#if model.can_edit_username}}
       {{#link-to "preferences.username" class="btn btn-default btn-small btn-icon pad-left no-text"}}
-      {{d-icon "pencil-alt"}} {{/link-to}}
+        {{d-icon "pencil-alt"}}
+      {{/link-to}}
     {{/if}}
   </div>
   {{#if siteSettings.enable_mentions}}
@@ -66,37 +67,37 @@
 {{/if}}
 
 {{#if canChangePassword}}
-<div class="control-group pref-password">
-  <label class="control-label">{{i18n 'user.password.title'}}</label>
-  <div class="controls">
-    <a href {{action "changePassword"}} class='btn btn-default'>
-      {{d-icon "envelope"}}
-      {{#if model.no_password}}
-        {{i18n 'user.change_password.set_password'}}
-      {{else}}
-        {{i18n 'user.change_password.action'}}
-      {{/if}}
-    </a>
+  <div class="control-group pref-password">
+    <label class="control-label">{{i18n 'user.password.title'}}</label>
+    <div class="controls">
+      <a href {{action "changePassword"}} class='btn btn-default'>
+        {{d-icon "envelope"}}
+        {{#if model.no_password}}
+          {{i18n 'user.change_password.set_password'}}
+        {{else}}
+          {{i18n 'user.change_password.action'}}
+        {{/if}}
+      </a>
 
-    {{passwordProgress}}
+      {{passwordProgress}}
+    </div>
   </div>
-</div>
 
-<div class="control-group pref-second-factor">
-  <label class="control-label">{{i18n 'user.second_factor.title'}}</label>
-  {{#unless model.second_factor_enabled}}
-    <label>
+  <div class="control-group pref-second-factor">
+    <label class="control-label">{{i18n 'user.second_factor.title'}}</label>
+    {{#unless model.second_factor_enabled}}
+      <label>
         {{i18n 'user.second_factor.short_description'}}
-    </label>
-  {{/unless}}
-  <div class="controls pref-second-factor">
-    {{#if isCurrentUser}}
-      {{#link-to "preferences.second-factor" class="btn btn-default"}}
-        {{d-icon "lock"}} <span>{{i18n 'user.second_factor.enable'}}</span>
-      {{/link-to}}
-    {{/if}}
+      </label>
+    {{/unless}}
+    <div class="controls pref-second-factor">
+      {{#if isCurrentUser}}
+        {{#link-to "preferences.second-factor" class="btn btn-default"}}
+          {{d-icon "lock"}} <span>{{i18n 'user.second_factor.enable'}}</span>
+        {{/link-to}}
+      {{/if}}
+    </div>
   </div>
-</div>
 {{/if}}
 
 {{#if canUpdateAssociatedAccounts}}
@@ -109,23 +110,23 @@
             {{#if authProvider.account}}
               <tr class="{{dasherize authProvider.method.name}} account-connected">
                 <td>{{authProvider.method.prettyName}}</td>
-                  <td>{{authProvider.account.description}}</td>
-                  <td>
-                    {{#if authProvider.method.can_revoke}}
-                      {{d-button action=(action "revokeAccount") actionParam=authProvider.account title="user.associated_accounts.revoke" class="btn-danger no-text" icon="trash-alt" disabled=(get revoking authProvider.method.name) }}
-                    {{/if}}
-                  </td>
+                <td>{{authProvider.account.description}}</td>
+                <td>
+                  {{#if authProvider.method.can_revoke}}
+                    {{d-button action=(action "revokeAccount") actionParam=authProvider.account title="user.associated_accounts.revoke" class="btn-danger no-text" icon="trash-alt" disabled=(get revoking authProvider.method.name) }}
+                  {{/if}}
+                </td>
               </tr>
             {{else}}
               <tr class={{dasherize authProvider.method.name}}>
                 <td>{{authProvider.method.prettyName}}</td>
-                  <td colspan="2">
-                    {{#if authProvider.method.can_connect}}
-                      {{d-button action=(action "connectAccount") actionParam=authProvider.method label="user.associated_accounts.connect" class="btn-default" icon="plug" disabled=disableConnectButtons}}
-                    {{else}}
-                      {{i18n 'user.associated_accounts.not_connected'}}
-                    {{/if}}
-                  </td>
+                <td colspan="2">
+                  {{#if authProvider.method.can_connect}}
+                    {{d-button action=(action "connectAccount") actionParam=authProvider.method label="user.associated_accounts.connect" class="btn-default" icon="plug" disabled=disableConnectButtons}}
+                  {{else}}
+                    {{i18n 'user.associated_accounts.not_connected'}}
+                  {{/if}}
+                </td>
               </tr>
             {{/if}}
           {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/apps.hbs b/app/assets/javascripts/discourse/templates/preferences/apps.hbs
index 2add47b39c..bb9216086c 100644
--- a/app/assets/javascripts/discourse/templates/preferences/apps.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/apps.hbs
@@ -1,28 +1,28 @@
 {{#if model.userApiKeys}}
-<div class="control-group apps">
-  <label class="control-label">{{i18n 'user.apps'}}</label>
-  <div class="controls">
-    {{#each model.userApiKeys as |key|}}
-    <div>
-      <span>{{key.application_name}}</span>
-      {{#if key.revoked}}
-        {{d-button action=(route-action "undoRevokeApiKey") actionParam=key class="btn" label="user.undo_revoke_access"}}
-      {{else}}
-        {{d-button action=(route-action "revokeApiKey") actionParam=key class="btn" label="user.revoke_access"}}
-      {{/if}}
-      <p>
-        <ul>
-          {{#each key.scopes as |scope|}}
-          <li>{{scope}}</li>
-          {{/each}}
-        </ul>
-      </p>
-      <p><span>{{i18n "user.api_approved"}}</span> {{bound-date key.created_at}}</p>
-      <p><span>{{i18n "user.api_last_used_at"}}</span> {{bound-date key.last_used_at}}</p>
+  <div class="control-group apps">
+    <label class="control-label">{{i18n 'user.apps'}}</label>
+    <div class="controls">
+      {{#each model.userApiKeys as |key|}}
+        <div>
+          <span>{{key.application_name}}</span>
+          {{#if key.revoked}}
+            {{d-button action=(route-action "undoRevokeApiKey") actionParam=key class="btn" label="user.undo_revoke_access"}}
+          {{else}}
+            {{d-button action=(route-action "revokeApiKey") actionParam=key class="btn" label="user.revoke_access"}}
+          {{/if}}
+          <p>
+            <ul>
+              {{#each key.scopes as |scope|}}
+                <li>{{scope}}</li>
+              {{/each}}
+            </ul>
+          </p>
+          <p><span>{{i18n "user.api_approved"}}</span> {{bound-date key.created_at}}</p>
+          <p><span>{{i18n "user.api_last_used_at"}}</span> {{bound-date key.last_used_at}}</p>
+        </div>
+      {{/each}}
     </div>
-    {{/each}}
   </div>
-</div>
 {{/if}}
 
 {{plugin-outlet name="user-preferences-apps" args=(hash model=model)}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index 5e54c3af93..367ea59b0d 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -1,7 +1,7 @@
 {{#unless siteSettings.disable_mailing_list_mode}}
   {{~#if model.user_option.mailing_list_mode}}
     <div class="warning-wrap">
-        <div class="warning">{{i18n 'user.mailing_list_mode.warning'}}</div>
+      <div class="warning">{{i18n 'user.mailing_list_mode.warning'}}</div>
     </div>
   {{/if}}
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
index acd5aa60bb..63b96865b2 100644
--- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
@@ -1,19 +1,19 @@
 {{#if showThemeSelector}}
-<div class="control-group theme">
-  <label class="control-label">{{i18n 'user.theme'}}</label>
-  <div class="controls">
-    {{combo-box
-      content=userSelectableThemes
-      value=themeId
-      onChange=(action (mut themeId))
-    }}
-  </div>
-  {{#if showThemeSetDefault}}
+  <div class="control-group theme">
+    <label class="control-label">{{i18n 'user.theme'}}</label>
     <div class="controls">
-      {{preference-checkbox labelKey="user.theme_default_on_all_devices" checked=makeThemeDefault}}
+      {{combo-box
+        content=userSelectableThemes
+        value=themeId
+        onChange=(action (mut themeId))
+      }}
     </div>
-  {{/if}}
-</div>
+    {{#if showThemeSetDefault}}
+      <div class="controls">
+        {{preference-checkbox labelKey="user.theme_default_on_all_devices" checked=makeThemeDefault}}
+      </div>
+    {{/if}}
+  </div>
 {{/if}}
 
 <div class="control-group text-size">
diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
index f3c1b00f52..a676f29787 100644
--- a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
@@ -1,5 +1,5 @@
 <div class="control-group notifications">
-      <label class="control-label">{{i18n 'user.notifications'}}</label>
+  <label class="control-label">{{i18n 'user.notifications'}}</label>
 
   <div class="controls controls-dropdown">
     <label>{{i18n 'user.new_topic_duration.label'}}</label>
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index fed0da9e91..b9a95dc9bb 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -1,10 +1,10 @@
 {{#if canChangeBio}}
-<div class="control-group pref-bio">
-  <label class="control-label">{{i18n 'user.bio'}}</label>
-  <div class="controls bio-composer input-xxlarge">
-    {{d-editor value=model.bio_raw}}
+  <div class="control-group pref-bio">
+    <label class="control-label">{{i18n 'user.bio'}}</label>
+    <div class="controls bio-composer input-xxlarge">
+      {{d-editor value=model.bio_raw}}
+    </div>
   </div>
-</div>
 {{/if}}
 
 <div class="control-group pref-timezone">
@@ -67,7 +67,9 @@
     <label class="control-label">{{i18n 'user.featured_topic'}}</label>
     {{#if model.featured_topic}}
       <label class="featured-topic-link">
-      {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe (replace-emoji model.featured_topic.fancy_title)}}{{/link-to}}
+        {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}
+          {{html-safe (replace-emoji model.featured_topic.fancy_title)}}
+        {{/link-to}}
       </label>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/tags.hbs b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
index 906d7761c0..e645e8175a 100644
--- a/app/assets/javascripts/discourse/templates/preferences/tags.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
@@ -1,64 +1,67 @@
 {{#if siteSettings.tagging_enabled}}
-<div class="control-group tag-notifications">
+  <div class="control-group tag-notifications">
+    <label class="control-label">{{i18n 'user.tag_settings'}}</label>
 
-  <label class="control-label">{{i18n 'user.tag_settings'}}</label>
+    <div class="controls tracking-controls">
+      <label>{{d-icon "d-watching" class="icon watching"}} {{i18n 'user.watched_tags'}}</label>
+      {{tag-chooser
+        tags=model.watched_tags
+        blacklist=selectedTags
+        filterPlaceholder="select_kit.filter_placeholder"
+        allowCreate=false
+        everyTag=true
+        unlimitedTagCount=true
+      }}
+    </div>
 
-  <div class="controls tracking-controls">
-    <label>{{d-icon "d-watching" class="icon watching"}} {{i18n 'user.watched_tags'}}</label>
-    {{tag-chooser
-      tags=model.watched_tags
-      blacklist=selectedTags
-      filterPlaceholder="select_kit.filter_placeholder"
-      allowCreate=false
-      everyTag=true
-      unlimitedTagCount=true}}
+    <div class="instructions">{{i18n 'user.watched_tags_instructions'}}</div>
+
+    <div class="controls tracking-controls">
+      <label>{{d-icon "d-tracking" class="icon tracking"}} {{i18n 'user.tracked_tags'}}</label>
+      {{tag-chooser
+        tags=model.tracked_tags
+        blacklist=selectedTags
+        filterPlaceholder="select_kit.filter_placeholder"
+        allowCreate=false
+        everyTag=true
+        unlimitedTagCount=true}}
+    </div>
+
+    <div class="instructions">{{i18n 'user.tracked_tags_instructions'}}</div>
+
+    <div class="controls tracking-controls">
+      <label>{{d-icon "d-watching-first" class="icon watching-first-post"}} {{i18n 'user.watched_first_post_tags'}}</label>
+      {{tag-chooser
+        tags=model.watching_first_post_tags
+        blacklist=selectedTags
+        filterPlaceholder="select_kit.filter_placeholder"
+        allowCreate=false
+        everyTag=true
+        unlimitedTagCount=true}}
+    </div>
+
+    <div class="instructions">
+      {{i18n 'user.watched_first_post_tags_instructions'}}
+    </div>
+
+    <div class="controls tracking-controls">
+      <label>{{d-icon "d-muted" class="icon muted"}} {{i18n 'user.muted_tags'}}</label>
+      {{tag-chooser
+        tags=model.muted_tags
+        blacklist=selectedTags
+        filterPlaceholder="select_kit.filter_placeholder"
+        allowCreate=false
+        everyTag=true
+        unlimitedTagCount=true}}
+    </div>
+    <div class="instructions">{{i18n 'user.muted_tags_instructions'}}</div>
   </div>
-  <div class="instructions">{{i18n 'user.watched_tags_instructions'}}</div>
 
-  <div class="controls tracking-controls">
-    <label>{{d-icon "d-tracking" class="icon tracking"}} {{i18n 'user.tracked_tags'}}</label>
-    {{tag-chooser
-      tags=model.tracked_tags
-      blacklist=selectedTags
-      filterPlaceholder="select_kit.filter_placeholder"
-      allowCreate=false
-      everyTag=true
-      unlimitedTagCount=true}}
-  </div>
-  <div class="instructions">{{i18n 'user.tracked_tags_instructions'}}</div>
+  {{plugin-outlet name="user-preferences-tags" args=(hash model=model save=(action "save"))}}
 
-  <div class="controls tracking-controls">
-    <label>{{d-icon "d-watching-first" class="icon watching-first-post"}} {{i18n 'user.watched_first_post_tags'}}</label>
-    {{tag-chooser
-      tags=model.watching_first_post_tags
-      blacklist=selectedTags
-      filterPlaceholder="select_kit.filter_placeholder"
-      allowCreate=false
-      everyTag=true
-      unlimitedTagCount=true}}
-  </div>
-  <div class="instructions">{{i18n 'user.watched_first_post_tags_instructions'}}</div>
+  <br>
 
-  <div class="controls tracking-controls">
-    <label>{{d-icon "d-muted" class="icon muted"}} {{i18n 'user.muted_tags'}}</label>
-    {{tag-chooser
-      tags=model.muted_tags
-      blacklist=selectedTags
-      filterPlaceholder="select_kit.filter_placeholder"
-      allowCreate=false
-      everyTag=true
-      unlimitedTagCount=true}}
-  </div>
-  <div class="instructions">{{i18n 'user.muted_tags_instructions'}}</div>
-
-</div>
-
-{{plugin-outlet name="user-preferences-tags" args=(hash model=model save=(action "save"))}}
-
-<br>
-
-{{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
-
-{{save-controls model=model action=(action "save") saved=saved}}
+  {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
+  {{save-controls model=model action=(action "save") saved=saved}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/review-topics.hbs b/app/assets/javascripts/discourse/templates/review-topics.hbs
index 5e548c3215..36cdb89b7b 100644
--- a/app/assets/javascripts/discourse/templates/review-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/review-topics.hbs
@@ -7,29 +7,29 @@
       <th></th>
     </thead>
     <tbody>
-    {{#each reviewableTopics as |rt|}}
-      <tr class='reviewable-topic'>
-        <td class="topic-title">
-          <div class='combined-title'>
-            {{topic-status topic=rt}}
-            <a href={{rt.relative_url}} rel="noopener" target="_blank">{{replace-emoji rt.fancy_title}}</a>
-          </div>
-        </td>
-        <td class="reviewable-count">
-          {{rt.stats.count}}
-        </td>
-        <td class="reported-by">
-          {{i18n "review.topics.unique_users" count=rt.stats.unique_users}}
-        </td>
-        <td class="reviewable-details">
-          {{reviewable-claimed-topic topicId=rt.id claimedBy=rt.claimed_by}}
-          {{#link-to "review.index" (query-params topic_id=rt.id) class="btn btn-primary btn-small"}}
-            {{d-icon "list"}}
-            <span>{{i18n "review.topics.details"}}</span>
-          {{/link-to}}
-        </td>
-      </tr>
-    {{/each}}
+      {{#each reviewableTopics as |rt|}}
+        <tr class='reviewable-topic'>
+          <td class="topic-title">
+            <div class='combined-title'>
+              {{topic-status topic=rt}}
+              <a href={{rt.relative_url}} rel="noopener" target="_blank">{{replace-emoji rt.fancy_title}}</a>
+            </div>
+          </td>
+          <td class="reviewable-count">
+            {{rt.stats.count}}
+          </td>
+          <td class="reported-by">
+            {{i18n "review.topics.unique_users" count=rt.stats.unique_users}}
+          </td>
+          <td class="reviewable-details">
+            {{reviewable-claimed-topic topicId=rt.id claimedBy=rt.claimed_by}}
+            {{#link-to "review.index" (query-params topic_id=rt.id) class="btn btn-primary btn-small"}}
+              {{d-icon "list"}}
+              <span>{{i18n "review.topics.details"}}</span>
+            {{/link-to}}
+          </td>
+        </tr>
+      {{/each}}
     </tbody>
   </table>
 {{else}}
diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs
index 923dfb991f..638701e3da 100644
--- a/app/assets/javascripts/discourse/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/show.hbs
@@ -5,44 +5,45 @@
 <div class="list-controls">
   <div class="container">
     <section class="navigation-container">
-
-    {{#if showTagFilter}}
-      {{bread-crumbs categories=categories
-                     category=category
-                     tagId=tag.id
-                     noSubcategories=noSubcategories}}
-
-      {{navigation-bar navItems=navItems filterMode=filterMode}}
-    {{else}}
-      <h2 class="tag-show-heading">
-        {{#link-to 'tags'}}{{i18n "tagging.tags"}}{{/link-to}}
-        {{d-icon "angle-right"}}
-        {{discourse-tag-bound tagRecord=tag style="simple"}}
-        {{#each additionalTags as |tag|}}
-          <span>&amp;</span>
-          {{discourse-tag tag style="simple"}}
-        {{/each}}
-      </h2>
-    {{/if}}
-
-    {{#if tagNotification}}
-      {{#unless additionalTags}}
-        {{tag-notifications-button
-          onChange=(action "changeTagNotificationLevel")
-          value=tagNotification.notification_level
+      {{#if showTagFilter}}
+        {{bread-crumbs
+          categories=categories
+          category=category
+          tagId=tag.id
+          noSubcategories=noSubcategories
         }}
-      {{/unless}}
-    {{/if}}
+        {{navigation-bar navItems=navItems filterMode=filterMode}}
+      {{else}}
+        <h2 class="tag-show-heading">
+          {{#link-to 'tags'}}{{i18n "tagging.tags"}}{{/link-to}}
+          {{d-icon "angle-right"}}
+          {{discourse-tag-bound tagRecord=tag style="simple"}}
+          {{#each additionalTags as |tag|}}
+            <span>&amp;</span>
+            {{discourse-tag tag style="simple"}}
+          {{/each}}
+        </h2>
+      {{/if}}
 
-    {{create-topic-button
-      canCreateTopic=canCreateTopic
-      disabled=createTopicDisabled
-      label=createTopicLabel
-      action=(route-action "createTopic")}}
+      {{#if tagNotification}}
+        {{#unless additionalTags}}
+          {{tag-notifications-button
+            onChange=(action "changeTagNotificationLevel")
+            value=tagNotification.notification_level
+          }}
+        {{/unless}}
+      {{/if}}
 
-    {{#if showToggleInfo}}
-      {{d-button icon="tag" label="tagging.info" action=(action "toggleInfo") id="show-tag-info"}}
-    {{/if}}
+      {{create-topic-button
+        canCreateTopic=canCreateTopic
+        disabled=createTopicDisabled
+        label=createTopicLabel
+        action=(route-action "createTopic")
+      }}
+
+      {{#if showToggleInfo}}
+        {{d-button icon="tag" label="tagging.info" action=(action "toggleInfo") id="show-tag-info"}}
+      {{/if}}
     </section>
   </div>
 </div>
@@ -52,6 +53,7 @@
 {{/if}}
 
 {{plugin-outlet name="discovery-list-container-top"}}
+
 <div class="container list-container">
   <div class="row">
     <div class="full-width">
@@ -59,18 +61,18 @@
         {{#unless loading}}
           {{#if list.topics}}
             {{#discovery-topics-list model=list refresh=(action "refresh")}}
-            {{bulk-select-button selected=selected action=(action "refresh")}}
-
-            {{topic-list topics=list.topics
-                        canBulkSelect=canBulkSelect
-                        toggleBulkSelect=(action "toggleBulkSelect")
-                        bulkSelectEnabled=bulkSelectEnabled
-                        selected=selected
-                        showPosters=true
-                        order=order
-                        ascending=ascending
-                        changeSort=(action "changeSort")}}
-
+              {{bulk-select-button selected=selected action=(action "refresh")}}
+              {{topic-list
+                topics=list.topics
+                canBulkSelect=canBulkSelect
+                toggleBulkSelect=(action "toggleBulkSelect")
+                bulkSelectEnabled=bulkSelectEnabled
+                selected=selected
+                showPosters=true
+                order=order
+                ascending=ascending
+                changeSort=(action "changeSort")
+              }}
             {{/discovery-topics-list}}
           {{else}}
             <footer class='topic-list-bottom'>
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index bd8e75f1e4..fde0c26227 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -91,8 +91,8 @@
                       {{else}}
                         {{d-button icon="times" action=(action "rescind") actionParam=invite label="user.invited.rescind"}}
                       {{/if}}
-                     </td>
-                     <td>
+                    </td>
+                    <td>
                       {{#if invite.reinvited}}
                         <div>{{i18n 'user.invited.reinvited'}}</div>
                       {{else}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 10881bb35b..59334e9ded 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -1,51 +1,49 @@
 {{plugin-outlet name="above-user-profile" tagName='' args=(hash model=model)}}
 <div class="container {{if viewingSelf 'viewing-self'}}">
   {{#d-section class="user-main"}}
-
     <section class="{{if collapsedInfo 'collapsed-info'}} about {{if hasProfileBackgroundUrl 'has-background' 'no-background'}}" >
-    {{#unless collapsedInfo}}
-    {{#if showStaffCounters}}
-      <div class='staff-counters'>
-        {{#if model.number_of_flags_given}}
-          <div><span class="helpful-flags">{{model.number_of_flags_given}}</span>{{i18n 'user.staff_counters.flags_given'}}</div>
-        {{/if}}
-        {{#if model.number_of_flagged_posts}}
-          <div>
-            {{#link-to 'review' (query-params username=model.username status='all' type='ReviewableFlaggedPost')}}
-              <span class="flagged-posts">{{model.number_of_flagged_posts}}</span>{{i18n 'user.staff_counters.flagged_posts'}}
-            {{/link-to}}
-          </div>
-        {{/if}}
-        {{#if model.number_of_rejected_posts}}
-          <div>
-            {{#link-to 'review' (query-params username=model.username status='rejected' type='ReviewableQueuedPost')}}
-              <span class="flagged-posts">{{model.number_of_rejected_posts}}</span>{{i18n 'user.staff_counters.rejected_posts'}}
-            {{/link-to}}
-          </div>
-        {{/if}}
-        
-        {{#if model.number_of_deleted_posts}}
-          <div>
-            {{#link-to 'user.deletedPosts' model}}
-              <span class="deleted-posts">{{model.number_of_deleted_posts}}</span>{{i18n 'user.staff_counters.deleted_posts'}}
-            {{/link-to}}
-          </div>
-        {{/if}}
-        {{#if model.number_of_suspensions}}
-          <div>
-            <a href {{action "showSuspensions"}}>
-              <span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n 'user.staff_counters.suspensions'}}
-            </a>
-          </div>
-        {{/if}}
-        {{#if model.warnings_received_count}}
-          <div><span class="warnings-received">{{model.warnings_received_count}}</span>{{i18n 'user.staff_counters.warnings_received'}}</div>
-        {{/if}}
-      </div>
-    {{/if}}
-    <div class="user-profile-image" style={{model.profileBackgroundUrl}}></div>
-    {{/unless}}
+      {{#unless collapsedInfo}}
+        {{#if showStaffCounters}}
+          <div class='staff-counters'>
+            {{#if model.number_of_flags_given}}
+              <div><span class="helpful-flags">{{model.number_of_flags_given}}</span>{{i18n 'user.staff_counters.flags_given'}}</div>
+            {{/if}}
+            {{#if model.number_of_flagged_posts}}
+              <div>
+                {{#link-to 'review' (query-params username=model.username status='all' type='ReviewableFlaggedPost')}}
+                  <span class="flagged-posts">{{model.number_of_flagged_posts}}</span>{{i18n 'user.staff_counters.flagged_posts'}}
+                {{/link-to}}
+              </div>
+            {{/if}}
+            {{#if model.number_of_rejected_posts}}
+              <div>
+                {{#link-to 'review' (query-params username=model.username status='rejected' type='ReviewableQueuedPost')}}
+                  <span class="flagged-posts">{{model.number_of_rejected_posts}}</span>{{i18n 'user.staff_counters.rejected_posts'}}
+                {{/link-to}}
+              </div>
+            {{/if}}
 
+            {{#if model.number_of_deleted_posts}}
+              <div>
+                {{#link-to 'user.deletedPosts' model}}
+                  <span class="deleted-posts">{{model.number_of_deleted_posts}}</span>{{i18n 'user.staff_counters.deleted_posts'}}
+                {{/link-to}}
+              </div>
+            {{/if}}
+            {{#if model.number_of_suspensions}}
+              <div>
+                <a href {{action "showSuspensions"}}>
+                  <span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n 'user.staff_counters.suspensions'}}
+                </a>
+              </div>
+            {{/if}}
+            {{#if model.warnings_received_count}}
+              <div><span class="warnings-received">{{model.warnings_received_count}}</span>{{i18n 'user.staff_counters.warnings_received'}}</div>
+            {{/if}}
+          </div>
+        {{/if}}
+        <div class="user-profile-image" style={{model.profileBackgroundUrl}}></div>
+      {{/unless}}
       <div class='details'>
         <div class='primary'>
           {{user-profile-avatar user=model tagName=""}}
@@ -113,19 +111,19 @@
             {{/if}}
 
             <h3 class="location-and-website">
-            {{#if model.location}}<div class="user-profile-location">{{d-icon "map-marker-alt"}} {{model.location}}</div>{{/if}}
-            {{#if model.website_name}}
-            <div class="user-profile-website">
-              {{d-icon "globe"}}
-              {{#if linkWebsite}}
-                {{!-- template-lint-disable  --}}
-                <a href={{model.website}} rel="noopener {{unless removeNoFollow 'nofollow ugc'}}" target="_blank">{{model.website_name}}</a>
-              {{else}}
-                <span title={{model.website}}>{{model.website_name}}</span>
+              {{#if model.location}}<div class="user-profile-location">{{d-icon "map-marker-alt"}} {{model.location}}</div>{{/if}}
+              {{#if model.website_name}}
+                <div class="user-profile-website">
+                  {{d-icon "globe"}}
+                  {{#if linkWebsite}}
+                    {{!-- template-lint-disable  --}}
+                    <a href={{model.website}} rel="noopener {{unless removeNoFollow 'nofollow ugc'}}" target="_blank">{{model.website_name}}</a>
+                  {{else}}
+                    <span title={{model.website}}>{{model.website_name}}</span>
+                  {{/if}}
+                </div>
               {{/if}}
-              </div>
-            {{/if}}
-            {{plugin-outlet name="user-location-and-website" args=(hash model=model)}}
+              {{plugin-outlet name="user-location-and-website" args=(hash model=model)}}
             </h3>
 
             <div class='bio'>
@@ -138,7 +136,8 @@
                     {{else}}
                       {{i18n 'user.suspended_notice' date=model.suspendedTillDate}}
                     {{/if}}
-                  </b><br>
+                  </b>
+                  <br>
                   {{#if model.suspend_reason}}
                     <b>{{i18n 'user.suspended_reason'}}</b> {{model.suspend_reason}}
                   {{/if}}
@@ -170,97 +169,90 @@
           </div>
         </div>
         {{#unless collapsedInfo}}
-        <div class='secondary'>
-          <dl>
-            {{#if model.created_at}}
-              <div><dt>{{i18n 'user.created'}}</dt><dd>{{bound-date model.created_at}}</dd></div>
-            {{/if}}
-            {{#if model.last_posted_at}}
-              <div><dt>{{i18n 'user.last_posted'}}</dt><dd>{{bound-date model.last_posted_at}}</dd></div>
-            {{/if}}
-            {{#if model.last_seen_at}}
-              <div><dt>{{i18n 'user.last_seen'}}</dt><dd>{{bound-date model.last_seen_at}}</dd></div>
-            {{/if}}
-            {{#if model.profile_view_count}}
-              <div><dt>{{i18n 'views'}}</dt><dd>{{model.profile_view_count}}</dd></div>
-            {{/if}}
-            {{#if model.invited_by}}
-              <div><dt class="invited-by">{{i18n 'user.invited_by'}}</dt><dd class="invited-by">{{#link-to 'user' model.invited_by}}{{model.invited_by.username}}{{/link-to}}</dd></div>
-            {{/if}}
-            {{#if model.trust_level}}
-              <div><dt class="trust-level">{{i18n 'user.trust_level'}}</dt><dd class="trust-level">{{model.trustLevel.name}}</dd></div>
-            {{/if}}
-            {{#if canCheckEmails}}
-              <div><dt>{{i18n 'user.email.title'}}</dt>
-              <dd title={{model.email}}>
-                {{#if model.email}}
-                  {{model.email}}
-                {{else}}
-                  {{d-button action=(route-action "checkEmail") actionParam=model icon="far-envelope" label="admin.users.check_email.text" class="btn-primary"}}
-                {{/if}}
-              </dd>
-              </div>
-            {{/if}}
+          <div class='secondary'>
+            <dl>
+              {{#if model.created_at}}
+                <div><dt>{{i18n 'user.created'}}</dt><dd>{{bound-date model.created_at}}</dd></div>
+              {{/if}}
+              {{#if model.last_posted_at}}
+                <div><dt>{{i18n 'user.last_posted'}}</dt><dd>{{bound-date model.last_posted_at}}</dd></div>
+              {{/if}}
+              {{#if model.last_seen_at}}
+                <div><dt>{{i18n 'user.last_seen'}}</dt><dd>{{bound-date model.last_seen_at}}</dd></div>
+              {{/if}}
+              {{#if model.profile_view_count}}
+                <div><dt>{{i18n 'views'}}</dt><dd>{{model.profile_view_count}}</dd></div>
+              {{/if}}
+              {{#if model.invited_by}}
+                <div><dt class="invited-by">{{i18n 'user.invited_by'}}</dt><dd class="invited-by">{{#link-to 'user' model.invited_by}}{{model.invited_by.username}}{{/link-to}}</dd></div>
+              {{/if}}
+              {{#if model.trust_level}}
+                <div><dt class="trust-level">{{i18n 'user.trust_level'}}</dt><dd class="trust-level">{{model.trustLevel.name}}</dd></div>
+              {{/if}}
+              {{#if canCheckEmails}}
+                <div><dt>{{i18n 'user.email.title'}}</dt>
+                <dd title={{model.email}}>
+                  {{#if model.email}}
+                    {{model.email}}
+                  {{else}}
+                    {{d-button action=(route-action "checkEmail") actionParam=model icon="far-envelope" label="admin.users.check_email.text" class="btn-primary"}}
+                  {{/if}}
+                </dd>
+                </div>
+              {{/if}}
+              {{#if model.displayGroups}}
+                <div><dt class="groups">{{i18n 'groups.title' count=model.displayGroups.length}}</dt>
+                <dd class='groups'>
+                  {{#each model.displayGroups as |group|}}
+                    <span>{{#link-to 'group' group.name class="group-link"}}{{group.name}}{{/link-to}}</span>
+                  {{/each}}
 
-            {{#if model.displayGroups}}
-              <div><dt class="groups">{{i18n 'groups.title' count=model.displayGroups.length}}</dt>
-              <dd class='groups'>
-                {{#each model.displayGroups as |group|}}
-                  <span>{{#link-to 'group' group.name class="group-link"}}{{group.name}}{{/link-to}}</span>
-                {{/each}}
+                  {{#link-to "groups" (query-params username=model.username)}}
+                    ...
+                  {{/link-to}}
+                </dd>
+                </div>
+              {{/if}}
 
-                {{#link-to "groups" (query-params username=model.username)}}
-                  ...
-                {{/link-to}}
-              </dd>
-              </div>
-            {{/if}}
-
-            {{#if canDeleteUser}}
-              <div class='pull-right'>{{d-button action=(action "adminDelete") icon="exclamation-triangle" label="user.admin_delete" class="btn-danger"}}</div>
-            {{/if}}
-          </dl>
-          {{plugin-outlet name="user-profile-secondary" args=(hash model=model)}}
-        </div>
+              {{#if canDeleteUser}}
+                <div class='pull-right'>{{d-button action=(action "adminDelete") icon="exclamation-triangle" label="user.admin_delete" class="btn-danger"}}</div>
+              {{/if}}
+            </dl>
+            {{plugin-outlet name="user-profile-secondary" args=(hash model=model)}}
+          </div>
         {{/unless}}
       </div>
-
-
     </section>
-
     <div class='user-content-wrapper'>
-
-    <section class="user-primary-navigation">
-    {{#mobile-nav class='main-nav' desktopClass="nav nav-pills user-nav" currentPath=currentPath}}
-      {{#unless model.profile_hidden}}
-        <li>{{#link-to 'user.summary'}}{{i18n 'user.summary.title'}}{{/link-to}}</li>
-        <li>{{#link-to 'userActivity'}}{{i18n 'user.activity_stream'}}{{/link-to}}</li>
-      {{/unless}}
-      {{#if showNotificationsTab}}
-        <li>
-          {{#link-to 'userNotifications'}}
-            {{d-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
-          {{/link-to}}
-        </li>
-      {{/if}}
-      {{#if showPrivateMessages}}
-        <li>{{#link-to 'userPrivateMessages'}}{{d-icon "far-envelope"}}{{i18n 'user.private_messages'}}{{/link-to}}</li>
-      {{/if}}
-      {{#if canInviteToForum}}
-        <li>{{#link-to 'userInvited'}}{{d-icon "user-plus"}}{{i18n 'user.invited.title'}}{{/link-to}}</li>
-      {{/if}}
-      {{#if showBadges}}
-        <li>{{#link-to 'user.badges'}}{{d-icon "certificate"}}{{i18n 'badges.title'}}{{/link-to}}</li>
-      {{/if}}
-      {{plugin-outlet name="user-main-nav" tagName='' connectorTagName='li' args=(hash model=model)}}
-      {{#if model.can_edit}}
-        <li>{{#link-to 'preferences'}}{{d-icon "cog"}}{{i18n 'user.preferences'}}{{/link-to}}</li>
-      {{/if}}
-    {{/mobile-nav}}
-    </section>
-
-        {{outlet}}
-    </div>
-
+      <section class="user-primary-navigation">
+        {{#mobile-nav class='main-nav' desktopClass="nav nav-pills user-nav" currentPath=currentPath}}
+          {{#unless model.profile_hidden}}
+            <li>{{#link-to 'user.summary'}}{{i18n 'user.summary.title'}}{{/link-to}}</li>
+            <li>{{#link-to 'userActivity'}}{{i18n 'user.activity_stream'}}{{/link-to}}</li>
+          {{/unless}}
+          {{#if showNotificationsTab}}
+            <li>
+              {{#link-to 'userNotifications'}}
+                {{d-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
+              {{/link-to}}
+            </li>
+          {{/if}}
+          {{#if showPrivateMessages}}
+            <li>{{#link-to 'userPrivateMessages'}}{{d-icon "far-envelope"}}{{i18n 'user.private_messages'}}{{/link-to}}</li>
+          {{/if}}
+          {{#if canInviteToForum}}
+            <li>{{#link-to 'userInvited'}}{{d-icon "user-plus"}}{{i18n 'user.invited.title'}}{{/link-to}}</li>
+          {{/if}}
+          {{#if showBadges}}
+            <li>{{#link-to 'user.badges'}}{{d-icon "certificate"}}{{i18n 'badges.title'}}{{/link-to}}</li>
+          {{/if}}
+          {{plugin-outlet name="user-main-nav" tagName='' connectorTagName='li' args=(hash model=model)}}
+          {{#if model.can_edit}}
+            <li>{{#link-to 'preferences'}}{{d-icon "cog"}}{{i18n 'user.preferences'}}{{/link-to}}</li>
+          {{/if}}
+        {{/mobile-nav}}
+      </section>
+    {{outlet}}
+  </div>
   {{/d-section}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs
index 2623e57c05..809b8a1629 100644
--- a/app/assets/javascripts/discourse/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/user/activity.hbs
@@ -10,34 +10,35 @@
       {{#link-to 'userActivity.replies'}}{{i18n 'user_action_groups.5'}}{{/link-to}}
     </li>
     {{#if user.showDrafts}}
-    <li>
-      {{#link-to 'userActivity.drafts'}}{{i18n 'user_action_groups.15'}}{{/link-to}}
-    </li>
+      <li>
+        {{#link-to 'userActivity.drafts'}}{{i18n 'user_action_groups.15'}}{{/link-to}}
+      </li>
     {{/if}}
     <li>
       {{#link-to 'userActivity.likesGiven'}}{{i18n 'user_action_groups.1'}}{{/link-to}}
     </li>
     {{#if user.showBookmarks}}
       {{#if bookmarksWithRemindersEnabled}}
-      <li>
-        {{#link-to 'userActivity.bookmarksWithReminders'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
-      </li>
+        <li>
+          {{#link-to 'userActivity.bookmarksWithReminders'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
+        </li>
       {{else}}
-      <li>
-        {{#link-to 'userActivity.bookmarks'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
-      </li>
+        <li>
+          {{#link-to 'userActivity.bookmarks'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
+        </li>
       {{/if}}
     {{/if}}
-    {{plugin-outlet name="user-activity-bottom"
-                    connectorTagName='li'
-                    args=(hash model=model)}}
+    {{plugin-outlet
+      name="user-activity-bottom"
+      connectorTagName='li'
+      args=(hash model=model)
+    }}
   {{/mobile-nav}}
-
 {{/d-section}}
 {{#if canDownloadPosts}}
-    <section class='user-additional-controls'>
-      {{d-button action=(action "exportUserArchive") class="btn-default" label="user.download_archive.button_text" icon="download"}}
-    </section>
+  <section class='user-additional-controls'>
+    {{d-button action=(action "exportUserArchive") class="btn-default" label="user.download_archive.button_text" icon="download"}}
+  </section>
 {{/if}}
 <section class='user-content'>
   {{outlet}}
diff --git a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
index 92c9979b54..75e5b2ce10 100644
--- a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
+++ b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
@@ -11,41 +11,41 @@
           <th>&nbsp;</th>
         </thead>
         <tbody>
-        {{#each content as |bookmark|}}
-          <tr class="topic-list-item bookmark-list-item">
-            <td class="main-link">
-              <span class="link-top-line">
-                <div class="bookmark-metadata">
-                  {{#if bookmark.name}}
-                    <span class="bookmark-metadata-item">
-                      {{d-icon "info-circle"}}{{bookmark.name}}
-                    </span>
-                  {{/if}}
-                  {{#if bookmark.reminder_at}}
-                    <span class="bookmark-metadata-item">
-                      {{d-icon "far-clock"}}{{bookmark.formattedReminder}}
-                    </span>
-                  {{/if}}
-                </div>
+          {{#each content as |bookmark|}}
+            <tr class="topic-list-item bookmark-list-item">
+              <td class="main-link">
+                <span class="link-top-line">
+                  <div class="bookmark-metadata">
+                    {{#if bookmark.name}}
+                      <span class="bookmark-metadata-item">
+                        {{d-icon "info-circle"}}{{bookmark.name}}
+                      </span>
+                    {{/if}}
+                    {{#if bookmark.reminder_at}}
+                      <span class="bookmark-metadata-item">
+                        {{d-icon "far-clock"}}{{bookmark.formattedReminder}}
+                      </span>
+                    {{/if}}
+                  </div>
 
-                {{topic-status topic=bookmark}}
-                {{topic-link bookmark}}
-              </span>
-              {{#if bookmark.excerpt}}
-              <p class="post-excerpt">{{html-safe bookmark.excerpt}}</p>
-              {{/if}}
-              <div class="link-bottom-line">
-                {{category-link bookmark.category}}
-                {{discourse-tags bookmark mode="list" tagsForUser=tagsForUser}}
-             </div>
-            </td>
-            <td>{{format-date bookmark.created_at format="tiny"}}</td>
-            {{raw "list/activity-column" topic=bookmark class="num" tagName="td"}}
-            <td>
-              {{bookmark-actions-dropdown bookmark=bookmark removeBookmark=(action "removeBookmark")}}
-            </td>
-          </tr>
-        {{/each}}
+                  {{topic-status topic=bookmark}}
+                  {{topic-link bookmark}}
+                </span>
+                {{#if bookmark.excerpt}}
+                  <p class="post-excerpt">{{html-safe bookmark.excerpt}}</p>
+                {{/if}}
+                <div class="link-bottom-line">
+                  {{category-link bookmark.category}}
+                  {{discourse-tags bookmark mode="list" tagsForUser=tagsForUser}}
+                </div>
+              </td>
+              <td>{{format-date bookmark.created_at format="tiny"}}</td>
+              {{raw "list/activity-column" topic=bookmark class="num" tagName="td"}}
+              <td>
+                {{bookmark-actions-dropdown bookmark=bookmark removeBookmark=(action "removeBookmark")}}
+              </td>
+            </tr>
+          {{/each}}
         </tbody>
       </table>
       {{conditional-loading-spinner condition=loadingMore}}
diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs
index 3dc34f67a1..64e8d53549 100644
--- a/app/assets/javascripts/discourse/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/user/messages.hbs
@@ -56,9 +56,7 @@
 {{/d-section}}
 
 <section class='user-content'>
-
-<div class="list-actions">
-
+  <div class="list-actions">
     {{#unless site.mobileView}}
       {{#if showToggleBulkSelect}}
         {{d-button
@@ -106,7 +104,6 @@
         onChange=(action "changeGroupNotificationLevel")
       }}
     {{/if}}
-</div>
-
-{{outlet}}
+  </div>
+  {{outlet}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs
index 8dca10c91f..2db8a54784 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs
@@ -32,15 +32,17 @@
 {{/d-section}}
 
 {{#if model}}
-<section class="user-additional-controls">
-    {{d-button title='user.dismiss_notifications_tooltip'
-               class='btn btn-default dismiss-notifications'
-               action=(action "resetNew")
-               label='user.dismiss_notifications'
-               icon='check'
-               disabled=allNotificationsRead}}
-               </section>
-  {{/if}}
+  <section class="user-additional-controls">
+    {{d-button
+      title='user.dismiss_notifications_tooltip'
+      class='btn btn-default dismiss-notifications'
+      action=(action "resetNew")
+      label='user.dismiss_notifications'
+      icon='check'
+      disabled=allNotificationsRead
+    }}
+  </section>
+{{/if}}
 
 <section class='user-content'>
   {{#load-more class="notification-history user-stream" selector=".user-stream .notification" action=(action "loadMore")}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index 26ee193bde..d28017469d 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -1,163 +1,163 @@
 {{#d-section pageClass="user-summary" tagName=""}}
-<div class="user-content">
-  <div class='top-section stats-section'>
-    <h3 class='stats-title'>{{i18n "user.summary.stats"}}</h3>
-    <ul>
-      <li>
-        {{user-stat value=model.days_visited label="user.summary.days_visited"}}
-      </li>
-      <li>
-        {{user-stat value=timeRead label="user.summary.time_read" type="string"}}
-      </li>
-      {{#if showRecentTimeRead}}
+  <div class="user-content">
+    <div class='top-section stats-section'>
+      <h3 class='stats-title'>{{i18n "user.summary.stats"}}</h3>
+      <ul>
         <li>
-          {{user-stat value=recentTimeRead label="user.summary.recent_time_read" type="string"}}
+          {{user-stat value=model.days_visited label="user.summary.days_visited"}}
+        </li>
+        <li>
+          {{user-stat value=timeRead label="user.summary.time_read" type="string"}}
+        </li>
+        {{#if showRecentTimeRead}}
+          <li>
+            {{user-stat value=recentTimeRead label="user.summary.recent_time_read" type="string"}}
+          </li>
+        {{/if}}
+        <li>
+          {{user-stat value=model.topics_entered label="user.summary.topics_entered"}}
+        </li>
+        <li>
+          {{user-stat value=model.posts_read_count label="user.summary.posts_read"}}
         </li>
-      {{/if}}
-      <li>
-        {{user-stat value=model.topics_entered label="user.summary.topics_entered"}}
-      </li>
-      <li>
-        {{user-stat value=model.posts_read_count label="user.summary.posts_read"}}
-      </li>
-      <li class="linked-stat">
-        {{#link-to 'userActivity.likesGiven'}}
-          {{user-stat value=model.likes_given icon="heart" label="user.summary.likes_given"}}
-        {{/link-to}}
-      </li>
-      {{#if model.bookmark_count}}
         <li class="linked-stat">
-          {{#link-to 'userActivity.bookmarks'}}
-            {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}}
+          {{#link-to 'userActivity.likesGiven'}}
+            {{user-stat value=model.likes_given icon="heart" label="user.summary.likes_given"}}
           {{/link-to}}
         </li>
-      {{/if}}
-      <li class="linked-stat">
-        {{#link-to 'userActivity.topics'}}
-          {{user-stat value=model.topic_count label="user.summary.topic_count"}}
-        {{/link-to}}
-      </li>
-      <li class="linked-stat">
-        {{#link-to 'userActivity.replies'}}
-          {{user-stat value=model.post_count label="user.summary.post_count"}}
-        {{/link-to}}
-      </li>
-      <li>
-        {{user-stat value=model.likes_received icon="heart" label="user.summary.likes_received"}}
-      </li>
-      {{plugin-outlet name="user-summary-stat" tagName="" connectorTagName="li" args=(hash model=model)}}
-    </ul>
-  </div>
+        {{#if model.bookmark_count}}
+          <li class="linked-stat">
+            {{#link-to 'userActivity.bookmarks'}}
+              {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}}
+            {{/link-to}}
+          </li>
+        {{/if}}
+        <li class="linked-stat">
+          {{#link-to 'userActivity.topics'}}
+            {{user-stat value=model.topic_count label="user.summary.topic_count"}}
+          {{/link-to}}
+        </li>
+        <li class="linked-stat">
+          {{#link-to 'userActivity.replies'}}
+            {{user-stat value=model.post_count label="user.summary.post_count"}}
+          {{/link-to}}
+        </li>
+        <li>
+          {{user-stat value=model.likes_received icon="heart" label="user.summary.likes_received"}}
+        </li>
+        {{plugin-outlet name="user-summary-stat" tagName="" connectorTagName="li" args=(hash model=model)}}
+      </ul>
+    </div>
 
-  <div class='top-section'>
-    {{#user-summary-section title="top_replies" class="replies-section pull-left"}}
-      {{#user-summary-topics-list type="replies" items=model.replies user=user as |reply|}}
-        {{user-summary-topic
-          createdAt=reply.createdAt
-          topic=reply.topic
-          likes=reply.like_count
-          url=reply.url}}
-      {{/user-summary-topics-list}}
-    {{/user-summary-section}}
+    <div class='top-section'>
+      {{#user-summary-section title="top_replies" class="replies-section pull-left"}}
+        {{#user-summary-topics-list type="replies" items=model.replies user=user as |reply|}}
+          {{user-summary-topic
+            createdAt=reply.createdAt
+            topic=reply.topic
+            likes=reply.like_count
+            url=reply.url}}
+        {{/user-summary-topics-list}}
+      {{/user-summary-section}}
 
-    {{#user-summary-section title="top_topics" class="topics-section pull-right"}}
-      {{#user-summary-topics-list type="topics" items=model.topics user=user as |topic|}}
-        {{user-summary-topic
-          createdAt=topic.created_at
-          topic=topic
-          likes=topic.like_count
-          url=topic.url}}
-      {{/user-summary-topics-list}}
-    {{/user-summary-section}}
-  </div>
-
-  <div class='top-section'>
-    {{#user-summary-section title="top_links" class="links-section pull-left"}}
-      {{#if model.links.length}}
-        <ul>
-          {{!-- template-lint-disable --}}
-          {{#each model.links as |link|}}
-            <li>
-              <a class='domain'
-                 href={{link.url}}
-                 title={{link.title}}
-                 rel='noopener {{unless user.removeNoFollow 'nofollow ugc'}}'
-                 target='_blank'>
-                {{shorten-url link.url}}
-              </a>
-              <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=link.clicks}}'>{{number link.clicks}}</span>
-              <br>
-              <a href="{{link.post_url}}">{{html-safe link.topic.fancyTitle}}</a>
-            </li>
-          {{/each}}
-        </ul>
-      {{else}}
-        <p>{{i18n "user.summary.no_links"}}</p>
-      {{/if}}
-    {{/user-summary-section}}
-
-    {{#user-summary-section title="most_replied_to_users" class="summary-user-list replied-section pull-right"}}
-      {{#user-summary-users-list none="no_replies" users=model.most_replied_to_users as |user|}}
-        {{user-summary-user user=user icon="reply" countClass="replies"}}
-      {{/user-summary-users-list}}
-    {{/user-summary-section}}
-  </div>
-
-  <div class='top-section most-liked-section'>
-    {{#user-summary-section title="most_liked_by" class="summary-user-list liked-by-section pull-left"}}
-      {{#user-summary-users-list none="no_likes" users=model.most_liked_by_users as |user|}}
-        {{user-summary-user user=user icon="heart" countClass="likes"}}
-      {{/user-summary-users-list}}
-    {{/user-summary-section}}
-
-    {{#user-summary-section title="most_liked_users" class="summary-user-list liked-section pull-right"}}
-      {{#user-summary-users-list none="no_likes" users=model.most_liked_users as |user|}}
-        {{user-summary-user user=user icon="heart" countClass="likes"}}
-      {{/user-summary-users-list}}
-    {{/user-summary-section}}
-  </div>
-
-  {{#if model.top_categories.length}}
-    <div class='top-section top-categories-section'>
-      {{#user-summary-section title="top_categories" class="summary-category-list pull-left"}}
-        <table>
-          <thead>
-            <th class="category-link"></th>
-            <th class='topic-count'>{{i18n "user.summary.topics"}}</th>
-            <th class='reply-count'>{{i18n "user.summary.replies"}}</th>
-          </thead>
-          <tbody>
-            {{#each model.top_categories as |category|}}
-              <tr>
-                <td class="category-link">
-                  {{category-link category allowUncategorized="true" hideParent=false}}
-                </td>
-                <td class='topic-count'>
-                  {{user-summary-category-search user=user category=category count=category.topic_count}}
-                </td>
-                <td class='reply-count'>
-                  {{user-summary-category-search user=user category=category count=category.post_count}}
-                </td>
-              </tr>
-            {{/each}}
-          </tbody>
-        </table>
+      {{#user-summary-section title="top_topics" class="topics-section pull-right"}}
+        {{#user-summary-topics-list type="topics" items=model.topics user=user as |topic|}}
+          {{user-summary-topic
+            createdAt=topic.created_at
+            topic=topic
+            likes=topic.like_count
+            url=topic.url}}
+        {{/user-summary-topics-list}}
       {{/user-summary-section}}
     </div>
-  {{/if}}
 
-  {{#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}}
-      {{else}}
-        <p>{{i18n "user.summary.no_badges"}}</p>
-      {{/each}}
-      {{#if moreBadges}}
-        <p>{{#link-to "user.badges" user class="more"}}{{i18n "user.summary.more_badges"}}{{/link-to}}</p>
-      {{/if}}
+    <div class='top-section'>
+      {{#user-summary-section title="top_links" class="links-section pull-left"}}
+        {{#if model.links.length}}
+          <ul>
+            {{!-- template-lint-disable --}}
+            {{#each model.links as |link|}}
+              <li>
+                <a class='domain'
+                   href={{link.url}}
+                   title={{link.title}}
+                   rel='noopener {{unless user.removeNoFollow 'nofollow ugc'}}'
+                   target='_blank'>
+                  {{shorten-url link.url}}
+                </a>
+                <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=link.clicks}}'>{{number link.clicks}}</span>
+                <br>
+                <a href="{{link.post_url}}">{{html-safe link.topic.fancyTitle}}</a>
+              </li>
+            {{/each}}
+          </ul>
+        {{else}}
+          <p>{{i18n "user.summary.no_links"}}</p>
+        {{/if}}
+      {{/user-summary-section}}
+
+      {{#user-summary-section title="most_replied_to_users" class="summary-user-list replied-section pull-right"}}
+        {{#user-summary-users-list none="no_replies" users=model.most_replied_to_users as |user|}}
+          {{user-summary-user user=user icon="reply" countClass="replies"}}
+        {{/user-summary-users-list}}
+      {{/user-summary-section}}
     </div>
-  {{/if}}
+
+    <div class='top-section most-liked-section'>
+      {{#user-summary-section title="most_liked_by" class="summary-user-list liked-by-section pull-left"}}
+        {{#user-summary-users-list none="no_likes" users=model.most_liked_by_users as |user|}}
+          {{user-summary-user user=user icon="heart" countClass="likes"}}
+        {{/user-summary-users-list}}
+      {{/user-summary-section}}
+
+      {{#user-summary-section title="most_liked_users" class="summary-user-list liked-section pull-right"}}
+        {{#user-summary-users-list none="no_likes" users=model.most_liked_users as |user|}}
+          {{user-summary-user user=user icon="heart" countClass="likes"}}
+        {{/user-summary-users-list}}
+      {{/user-summary-section}}
+    </div>
+
+    {{#if model.top_categories.length}}
+      <div class='top-section top-categories-section'>
+        {{#user-summary-section title="top_categories" class="summary-category-list pull-left"}}
+          <table>
+            <thead>
+              <th class="category-link"></th>
+              <th class='topic-count'>{{i18n "user.summary.topics"}}</th>
+              <th class='reply-count'>{{i18n "user.summary.replies"}}</th>
+            </thead>
+            <tbody>
+              {{#each model.top_categories as |category|}}
+                <tr>
+                  <td class="category-link">
+                    {{category-link category allowUncategorized="true" hideParent=false}}
+                  </td>
+                  <td class='topic-count'>
+                    {{user-summary-category-search user=user category=category count=category.topic_count}}
+                  </td>
+                  <td class='reply-count'>
+                    {{user-summary-category-search user=user category=category count=category.post_count}}
+                  </td>
+                </tr>
+              {{/each}}
+            </tbody>
+          </table>
+        {{/user-summary-section}}
+      </div>
+    {{/if}}
+
+    {{#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}}
+        {{else}}
+          <p>{{i18n "user.summary.no_badges"}}</p>
+        {{/each}}
+        {{#if moreBadges}}
+          <p>{{#link-to "user.badges" user class="more"}}{{i18n "user.summary.more_badges"}}{{/link-to}}</p>
+        {{/if}}
+      </div>
+    {{/if}}
   </div>
 {{/d-section}}
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
index c2b12d8b7c..e0d1f54f00 100644
--- a/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
@@ -13,11 +13,11 @@
       </span>
     {{else}}
       {{#if selectKit.filter}}
-      {{#if selectKit.hasNoContent}}
-        <span class="no-content">
-          {{i18n "select_kit.no_content"}}
-        </span>
-      {{/if}}
+        {{#if selectKit.hasNoContent}}
+          <span class="no-content">
+            {{i18n "select_kit.no_content"}}
+          </span>
+        {{/if}}
       {{/if}}
 
       {{#each collections as |collection|}}
diff --git a/app/assets/javascripts/select-kit/templates/components/single-select.hbs b/app/assets/javascripts/select-kit/templates/components/single-select.hbs
index 9e210f7317..a3b71cba23 100644
--- a/app/assets/javascripts/select-kit/templates/components/single-select.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/single-select.hbs
@@ -17,11 +17,11 @@
       </span>
     {{else}}
       {{#if selectKit.filter}}
-      {{#if selectKit.hasNoContent}}
-        <span class="no-content">
-          {{i18n "select_kit.no_content"}}
-        </span>
-      {{/if}}
+        {{#if selectKit.hasNoContent}}
+          <span class="no-content">
+            {{i18n "select_kit.no_content"}}
+          </span>
+        {{/if}}
       {{/if}}
 
       {{#each collections as |collection|}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs
index d520465bd9..dddf1b81e4 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs
@@ -1,7 +1,8 @@
 <label>
-{{input type="checkbox"
-        class="wizard-checkbox"
-        checked=field.value}}
-
-{{field.placeholder}}
+  {{input
+    type="checkbox"
+    class="wizard-checkbox"
+    checked=field.value
+  }}
+  {{field.placeholder}}
 </label>

From 73c3fb8fb8d3ca0883eea1bd95058ddd6eaef318 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 13 Apr 2020 17:24:02 +0200
Subject: [PATCH 0594/1830] DEV: hides block-indentation lint changes from git
 blame (#9409)

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index eec6fc3a2f..5fac6c2850 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -34,3 +34,6 @@ acc5cbdf8ecb9293a0fa9474ee73baf499c02428
 
 # The last remaining ES6
 aabeb17aab4e73de5ef56753ab22ef5d416d2932
+
+# DEV: enforces block-indentation of ember-template-lint rules
+b66b277dc44bcd2122dc21965dab209c30636214

From a10c36994b80c6451af458c0faa998190a66e301 Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Mon, 13 Apr 2020 08:57:27 -0700
Subject: [PATCH 0595/1830] UX: Improve published page avatar resolution
 (#9405)

---
 app/views/published_pages/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/published_pages/show.html.erb b/app/views/published_pages/show.html.erb
index 08f5474b81..43b11f6851 100644
--- a/app/views/published_pages/show.html.erb
+++ b/app/views/published_pages/show.html.erb
@@ -3,7 +3,7 @@
     <h1 class="published-page-title"><%= @topic.title %></h1>
 
     <div class="published-page-author">
-      <img src="<%= @topic.user.small_avatar_url %>" class="avatar">
+      <img width="45" height="45" src="<%= @topic.user.avatar_template.gsub('{size}', '90') %>" class="avatar">
       <div class="published-page-author-details">
         <div class="username"><%= @topic.user.username %></div>
         <div class="topic-created-at"><%= short_date(@topic.created_at) %></div>

From 799ddeea3c328658a596baab22233444f1e9e915 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Mon, 13 Apr 2020 18:57:52 +0300
Subject: [PATCH 0596/1830] FIX: Include subcategories in 'posts' report
 (#9410)

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

diff --git a/app/models/post.rb b/app/models/post.rb
index b57a9502c6..1fe1bed985 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -767,7 +767,7 @@ class Post < ActiveRecord::Base
   def self.public_posts_count_per_day(start_date, end_date, category_id = nil)
     result = public_posts.where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date)
       .where(post_type: Post.types[:regular])
-    result = result.where('topics.category_id = ?', category_id) if category_id
+    result = result.where('topics.category_id IN (?)', Category.subcategory_ids(category_id.to_i)) if category_id
     result
       .group('date(posts.created_at)')
       .order('date(posts.created_at)')

From 7b4fdebbce3bd564e5c5becb72ac49ebf96265b6 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 13 Apr 2020 15:05:46 -0400
Subject: [PATCH 0597/1830] FEATURE: Plugin support for transpiling regular
 `.js` files (#9398)

This adds support for a new piece of metadata to your plugin.rb
files. If you add:

```
transpile_js: true
```

Then Discourse will support transpilation of assets in your
`assets/javascripts` directory. Previously they had to be named
`.js.es6` but now regular `.js` will work.

Note this is opt-in because some plugins currently have `.js` files in
app/assets that are not meant to be transpiled.

Going forward all plugins should migrate to this setting as they are
comfortable able to do so.
---
 lib/discourse_js_processor.rb |  6 ++++++
 lib/plugin/instance.rb        | 22 +++++++++++++++++++---
 lib/plugin/metadata.rb        |  2 +-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 7417207ff5..6d56af7098 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -4,6 +4,10 @@ require 'mini_racer'
 
 class DiscourseJsProcessor
 
+  def self.plugin_transpile_paths
+    @@plugin_transpile_paths ||= Set.new
+  end
+
   def self.call(input)
     root_path = input[:load_path] || ''
     logical_path = (input[:filename] || '').sub(root_path, '').gsub(/\.(js|es6).*$/, '').sub(/^\//, '')
@@ -56,6 +60,8 @@ class DiscourseJsProcessor
       embed-application
     ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
 
+    return true if plugin_transpile_paths.any? { |prefix| relative_path.start_with?(prefix) }
+
     !!(relative_path =~ /^#{js_root}\/[^\/]+\// ||
       relative_path =~ /^#{test_root}\/[^\/]+\//)
   end
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 2510e6c499..85f06dfb22 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -66,6 +66,13 @@ class Plugin::Instance
     }
   end
 
+  # If plugins provide `transpile_js: true` in their metadata we will
+  # transpile regular JS files in the assets folders. Going forward,
+  # all plugins should do this.
+  def transpile_js
+    metadata.try(:transpile_js) == "true"
+  end
+
   def seed_data
     @seed_data ||= HashWithIndifferentAccess.new({})
   end
@@ -511,16 +518,22 @@ class Plugin::Instance
   def activate!
 
     if @path
+      root_dir_name = File.dirname(@path)
+
       # Automatically include all ES6 JS and hbs files
-      root_path = "#{File.dirname(@path)}/assets/javascripts"
+      root_path = "#{root_dir_name}/assets/javascripts"
       DiscoursePluginRegistry.register_glob(root_path, 'js.es6')
       DiscoursePluginRegistry.register_glob(root_path, 'hbs')
       DiscoursePluginRegistry.register_glob(root_path, 'hbr')
 
-      admin_path = "#{File.dirname(@path)}/admin/assets/javascripts"
+      admin_path = "#{root_dir_name}/admin/assets/javascripts"
       DiscoursePluginRegistry.register_glob(admin_path, 'js.es6', admin: true)
       DiscoursePluginRegistry.register_glob(admin_path, 'hbs', admin: true)
       DiscoursePluginRegistry.register_glob(admin_path, 'hbr', admin: true)
+
+      if transpile_js
+        DiscourseJsProcessor.plugin_transpile_paths << root_path.sub(Rails.root.to_s, '').sub(/^\/*/, '')
+      end
     end
 
     self.instance_eval File.read(path), path
@@ -663,9 +676,12 @@ class Plugin::Instance
       root_path = "#{File.dirname(@path)}/assets/javascripts"
 
       Dir.glob("#{root_path}/**/*") do |f|
+        f_str = f.to_s
         if File.directory?(f)
           yield [f, true]
-        elsif f.to_s.ends_with?(".js.es6") || f.to_s.ends_with?(".hbs") || f.to_s.ends_with?(".hbr")
+        elsif f_str.ends_with?(".js.es6") || f_str.ends_with?(".hbs") || f_str.ends_with?(".hbr")
+          yield [f, false]
+        elsif transpile_js && f_str.ends_with?(".js")
           yield [f, false]
         end
       end
diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index 5ceabfde79..1af6c15750 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -78,7 +78,7 @@ class Plugin::Metadata
     "discourse-internet-explorer"
   ])
 
-  FIELDS ||= [:name, :about, :version, :authors, :url, :required_version]
+  FIELDS ||= [:name, :about, :version, :authors, :url, :required_version, :transpile_js]
   attr_accessor(*FIELDS)
 
   def self.parse(text)

From b6b92a562c48895720d7e2ea9cb6dad15efa0107 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 13 Apr 2020 15:17:02 -0400
Subject: [PATCH 0598/1830] FEATURE: New site setting `embed_unlisted` (#9391)

If enabled, posts imported to discourse via embeddings will default to
unlisted until they receive a reply.
---
 .../javascripts/admin/templates/embedding.hbs  |  1 +
 app/models/embedding.rb                        |  1 +
 app/models/post.rb                             |  3 ++-
 app/models/topic_embed.rb                      | 18 ++++++++++++------
 config/locales/client.en.yml                   |  1 +
 config/locales/server.en.yml                   |  1 +
 config/site_settings.yml                       | 10 ++++------
 lib/post_creator.rb                            | 11 +++++++++++
 spec/models/topic_embed_spec.rb                | 15 +++++++++++++++
 9 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index b9422bbb11..4bf9135fce 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -38,6 +38,7 @@
                         value=embedding.embed_title_scrubber
                         placeholder="- site.com$"}}
     {{embedding-setting field="embed_truncate" value=embedding.embed_truncate type="checkbox"}}
+    {{embedding-setting field="embed_unlisted" value=embedding.embed_unlisted type="checkbox"}}
   </div>
 
   <div class='embedding-secondary'>
diff --git a/app/models/embedding.rb b/app/models/embedding.rb
index 1f2be1ee0f..055cb2b32c 100644
--- a/app/models/embedding.rb
+++ b/app/models/embedding.rb
@@ -10,6 +10,7 @@ class Embedding < OpenStruct
        embed_post_limit
        embed_title_scrubber
        embed_truncate
+       embed_unlisted
        embed_whitelist_selector
        embed_blacklist_selector
        embed_classname_whitelist)
diff --git a/app/models/post.rb b/app/models/post.rb
index 1fe1bed985..86dafde6bc 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -127,7 +127,8 @@ class Post < ActiveRecord::Base
                                  flagged_by_tl3_user: 4,
                                  email_spam_header_found: 5,
                                  flagged_by_tl4_user: 6,
-                                 email_authentication_result_header: 7)
+                                 email_authentication_result_header: 7,
+                                 imported_as_unlisted: 8)
   end
 
   def self.types
diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 15922f7c4c..1947a3c640 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -53,12 +53,18 @@ class TopicEmbed < ActiveRecord::Base
           Post.cook_methods[:raw_html]
         end
 
-        creator = PostCreator.new(user,
-                                  title: title,
-                                  raw: absolutize_urls(url, contents),
-                                  skip_validations: true,
-                                  cook_method: cook_method,
-                                  category: eh.try(:category_id))
+        create_args = {
+          title: title,
+          raw: absolutize_urls(url, contents),
+          skip_validations: true,
+          cook_method: cook_method,
+          category: eh.try(:category_id)
+        }
+        if SiteSetting.embed_unlisted?
+          create_args[:visible] = false
+        end
+
+        creator = PostCreator.new(user, create_args)
         post = creator.create
         if post.present?
           TopicEmbed.create!(topic_id: post.topic_id,
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f395e62717..4b7b33fa58 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4620,6 +4620,7 @@ en:
         embed_post_limit: "Maximum number of posts to embed"
         embed_title_scrubber: "Regular expression used to scrub the title of posts"
         embed_truncate: "Truncate the embedded posts"
+        embed_unlisted: "Imported topics will be unlisted until there is a reply."
         embed_whitelist_selector: "CSS selector for elements that are allowed in embeds"
         embed_blacklist_selector: "CSS selector for elements that are removed from embeds"
         embed_classname_whitelist: "Allowed CSS class names"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 4fd326065f..df6709c262 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2068,6 +2068,7 @@ en:
     embed_topics_list: "Support HTML embedding of topics lists"
     embed_set_canonical_url: "Set the canonical URL for embeded topics to the embeded content's URL."
     embed_truncate: "Truncate the embedded posts."
+    embed_unlisted: "Imported topics will be unlisted until a user replies."
     embed_support_markdown: "Support Markdown formatting for embedded posts."
     embed_whitelist_selector: "A comma separated list of CSS elements that are allowed in embeds."
     allowed_href_schemes: "Schemes allowed in links in addition to http and https."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index e2fc35aac4..c5b7a3d5cc 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -901,12 +901,10 @@ posting:
   embed_any_origin: false
   embed_topics_list: false
   embed_set_canonical_url: false
-  embed_truncate:
-    default: true
-  embed_support_markdown:
-    default: false
-  embed_whitelist_selector:
-    default: ""
+  embed_unlisted: false
+  embed_truncate: true
+  embed_support_markdown: false
+  embed_whitelist_selector: ""
   allowed_href_schemes:
     client: true
     default: ""
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index fab3de1954..0d3d61a99e 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -186,6 +186,7 @@ class PostCreator
         @post.link_post_uploads
         update_uploads_secure_status
         ensure_in_allowed_users if guardian.is_staff?
+        make_visible
         unarchive_message
         if !@opts[:import_mode]
           DraftSequence.next!(@user, draft_key)
@@ -414,6 +415,16 @@ class PostCreator
     end
   end
 
+  def make_visible
+    return unless SiteSetting.embed_unlisted?
+    return unless @post.post_number > 1
+    return if @post.topic.visible?
+
+    if embed = @post.topic.topic_embed
+      @post.topic.update_status('visible', true, @user)
+    end
+  end
+
   def unarchive_message
     return unless @topic.private_message? && @topic.id
 
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index 4e931f4f99..f15f55fff8 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -41,6 +41,7 @@ describe TopicEmbed do
         expect(TopicEmbed.where(topic_id: post.topic_id)).to be_present
 
         expect(post.topic.category).to eq(embeddable_host.category)
+        expect(post.topic).to be_visible
       end
 
       it "Supports updating the post content" do
@@ -71,6 +72,20 @@ describe TopicEmbed do
         post = TopicEmbed.import(user, cased_url, title, "some random content")
         expect(post.cooked).to match(/#{cased_url}/)
       end
+
+      it "will make the topic unlisted if `embed_unlisted` is set until someone replies" do
+        SiteSetting.embed_unlisted = true
+        imported_post = TopicEmbed.import(user, "http://eviltrout.com/abcd", title, "some random content")
+        expect(imported_post.topic).not_to be_visible
+        pc = PostCreator.new(
+          Fabricate(:user),
+          raw: "this is a reply that will make the topic visible",
+          topic_id: imported_post.topic_id,
+          reply_to_post_number: 1
+        )
+        pc.create
+        expect(imported_post.topic.reload).to be_visible
+      end
     end
 
     context "post creation supports markdown rendering" do

From 10c2087a02865d455cebe3d6ac82ccad389541e7 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 13 Apr 2020 17:23:37 -0400
Subject: [PATCH 0599/1830] UX: Prevent category dropdown from wrapping count,
 limit mobile width

---
 app/assets/stylesheets/common/select-kit/category-row.scss  | 1 -
 app/assets/stylesheets/mobile/select-kit/category-drop.scss | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/select-kit/category-row.scss b/app/assets/stylesheets/common/select-kit/category-row.scss
index e0126ab130..aca31f3dd2 100644
--- a/app/assets/stylesheets/common/select-kit/category-row.scss
+++ b/app/assets/stylesheets/common/select-kit/category-row.scss
@@ -2,7 +2,6 @@
   .category-row {
     .category-status {
       display: flex;
-      flex-wrap: wrap;
       align-items: center;
       max-width: 100%;
       -webkit-box-flex: 0;
diff --git a/app/assets/stylesheets/mobile/select-kit/category-drop.scss b/app/assets/stylesheets/mobile/select-kit/category-drop.scss
index 6205494dea..6697ca91e7 100644
--- a/app/assets/stylesheets/mobile/select-kit/category-drop.scss
+++ b/app/assets/stylesheets/mobile/select-kit/category-drop.scss
@@ -12,6 +12,10 @@
       .select-kit-row {
         font-weight: normal;
       }
+
+      .category-name {
+        max-width: 70vw;
+      }
     }
   }
 }

From 7d1c90e5ebe81594c799ecdb83255765f29957b9 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 14 Apr 2020 00:43:55 +0200
Subject: [PATCH 0600/1830] DEV: upgrades ember-template-lint 2.5.2 (#9411)

---
 .template-lintrc.js |   5 +-
 package.json        |   2 +-
 yarn.lock           | 648 ++++++++++++++++++++++++++++++++++----------
 3 files changed, 502 insertions(+), 153 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index f5ff55a03d..b4d322875e 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -8,7 +8,7 @@ module.exports = {
   rules: {
     "block-indentation": true,
     "deprecated-render-helper": true,
-    "img-alt-attributes": false,
+    "require-valid-alt-text": false,
     "linebreak-style": true,
     "link-rel-noopener": true,
     "no-abstract-roles": true,
@@ -50,6 +50,7 @@ module.exports = {
     "self-closing-void-elements": true,
     "simple-unless": true,
     "style-concatenation": true,
-    "table-groups": true
+    "table-groups": true,
+    "link-href-attributes": false
   }
 };
diff --git a/package.json b/package.json
index fa7ea12185..eeafd9ec52 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@arkweid/lefthook": "^0.6.3",
     "chrome-launcher": "^0.12.0",
     "chrome-remote-interface": "^0.25",
-    "ember-template-lint": "^1.13.2",
+    "ember-template-lint": "^2.5.2",
     "eslint-config-discourse": "1.1.0",
     "eslint-plugin-discourse-ember": "0.0.3",
     "lodash-cli": "https://github.com/lodash-archive/lodash-cli.git",
diff --git a/yarn.lock b/yarn.lock
index 7bb2c64415..e49da23ce4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -97,42 +97,57 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.11.2.tgz#8644bc25b19475779a7b7c1fc104bc0a794f4465"
   integrity sha512-XiUPoS79r1G7PcpnNtq85TJ7inJWe0v+b5oZJZKb0pGHNIV6+UiNeQWiFGmuQ0aj7GEhnD/v9iqxIsjuRKtEnQ==
 
-"@glimmer/interfaces@^0.45.3":
-  version "0.45.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.45.3.tgz#9a54b6cc3f9d5887fc26c39750fd180d9dc650c0"
-  integrity sha512-RsjpflPimJUgkJwzhKWhu/CJ8HdRwqBFcSNPL9Fu8cElE1DyERdcqJbSCfw7pkFornVrhoU8gTNxzo24ly1H3g==
+"@glimmer/env@0.1.7":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
+  integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
+
+"@glimmer/interfaces@^0.50.2":
+  version "0.50.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.50.2.tgz#5637beb45242b9c23b1b82b404ad085f1827ce16"
+  integrity sha512-SbrEspWDHQ6j0DI0inYpg29SMlfEEUS895apZWxMzC2RyGHy5SKmZJ4xjishaq7A0E1AaTfDKYnE/wfWrQZSsw==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.45.0":
-  version "0.45.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.45.3.tgz#298c1eff98661726eb8df0806a241e7b43ac662b"
-  integrity sha512-olTpMV4FiF7ylLYWTHzlNGiirQvCPGSVFDtohDcrNgHVkXwYYpaCF6QUgsHQMPCrY2Zu2Ohqv4PpZo1cJXY0ug==
+"@glimmer/syntax@^0.50.0":
+  version "0.50.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.50.2.tgz#e69731df2fb9069d30469c700eb9bae79e51c257"
+  integrity sha512-kmMZK4bN674sUhphLuads1RQNm3pzEuNcW7SHQiDJJz3zDsMFQ69YPtgYBrpJZtPgF6Oj/QgwUcD0d+ql5/cpw==
   dependencies:
-    "@glimmer/interfaces" "^0.45.3"
-    "@glimmer/util" "^0.45.3"
+    "@glimmer/interfaces" "^0.50.2"
+    "@glimmer/util" "^0.50.2"
     handlebars "^4.5.1"
-    simple-html-tokenizer "^0.5.8"
+    simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.45.3":
-  version "0.45.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.45.3.tgz#da902da3c5e36a8dfc79c9993718044d88eacc76"
-  integrity sha512-2lf+f3ND5OiKIFbjeHMq/1me0xymqAanvJoVjxHMd//s74o6GVsjFUSVx7FJ53E8VE2gmtdL4m/Yz5smAJHD4A==
+"@glimmer/util@^0.50.2":
+  version "0.50.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.50.2.tgz#1519064c2722143871964a183ceb825b5c24f5d3"
+  integrity sha512-FG3gWONYZWUBwZojvuYdPALu6DWKzc2QGBzb6zBgY5vO2otAqLsi8WlfGP8ekkFsEHUtlPGeUAOqr+lSox+DQw==
   dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "^0.50.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@mrmlnc/readdir-enhanced@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
-  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
+"@nodelib/fs.scandir@2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
+  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
   dependencies:
-    call-me-maybe "^1.0.1"
-    glob-to-regexp "^0.3.0"
+    "@nodelib/fs.stat" "2.0.3"
+    run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@^1.1.2":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
-  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
+"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
+  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
+  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.3"
+    fastq "^1.6.0"
 
 "@popperjs/core@v2.0.6":
   version "2.0.6"
@@ -173,24 +188,10 @@
   resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
   integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
 
-"@types/events@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
-  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
-
-"@types/glob@^7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
-  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
-  dependencies:
-    "@types/events" "*"
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
-"@types/minimatch@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
 "@types/node@*":
   version "12.12.6"
@@ -265,6 +266,11 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -277,6 +283,14 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -312,17 +326,10 @@ array-from@^2.1.1:
   resolved "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"
   integrity sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=
 
-array-union@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
 array-unique@^0.3.2:
   version "0.3.2"
@@ -339,6 +346,21 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
   integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
+async-promise-queue@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/async-promise-queue/-/async-promise-queue-1.0.5.tgz#cb23bce9fce903a133946a700cc85f27f09ea49d"
+  integrity sha512-xi0aQ1rrjPWYmqbwr18rrSKbSaXIeIwSd1J4KAgVfkq8utNbdZoht7GfvfY6swFUAMJ9obkc4WPJmtGwl+B8dw==
+  dependencies:
+    async "^2.4.1"
+    debug "^2.6.8"
+
+async@^2.4.1:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  dependencies:
+    lodash "^4.17.14"
+
 async@~0.2.6:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
@@ -427,6 +449,13 @@ braces@^2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+braces@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@@ -454,11 +483,6 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-call-me-maybe@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
-  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
-
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
@@ -476,6 +500,11 @@ camelcase@^1.0.2:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
   integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
 
+camelcase@^5.0.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
 capture-exit@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
@@ -502,7 +531,7 @@ chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.1.0:
+chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -511,6 +540,22 @@ chalk@^2.0.0, chalk@^2.1.0:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chalk@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72"
+  integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
@@ -580,6 +625,18 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
+cli-spinners@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.3.0.tgz#0632239a4b5aa4c958610142c34bb7a651fc8df5"
+  integrity sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==
+
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -594,6 +651,20 @@ cliui@^2.1.0:
     right-align "^0.1.1"
     wordwrap "0.0.2"
 
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
+
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
 closure-compiler@0.2.12:
   version "0.2.12"
   resolved "https://registry.yarnpkg.com/closure-compiler/-/closure-compiler-0.2.12.tgz#6c3087cad12742c79e47f0ce50e87af91cf8e171"
@@ -626,16 +697,28 @@ color-convert@^1.9.0:
   dependencies:
     color-name "1.1.3"
 
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-name@^1.0.0:
+color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+colors@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
 commander@2.11.x:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
@@ -646,6 +729,11 @@ commander@2.12.2:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
   integrity sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==
 
+commander@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-5.0.0.tgz#dbf1909b49e5044f8fdaf0adc809f0c0722bdfd0"
+  integrity sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==
+
 commander@~2.20.3:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -722,7 +810,7 @@ debug@^4.1.0:
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.0.0:
+decamelize@^1.0.0, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -737,6 +825,13 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  dependencies:
+    clone "^1.0.2"
+
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -769,12 +864,12 @@ diff@^3.5.0:
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
-dir-glob@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
-  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
   dependencies:
-    path-type "^3.0.0"
+    path-type "^4.0.0"
 
 doctrine@^2.1.0:
   version "2.1.0"
@@ -783,17 +878,38 @@ doctrine@^2.1.0:
   dependencies:
     esutils "^2.0.2"
 
-ember-template-lint@^1.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-1.13.2.tgz#d4664e37f7af3b74a80eb41e9f03592900cc7e25"
-  integrity sha512-hcOp91lROLo27Ym/qUHEB3QI80rNOSTDO2K4SUeQg7t/MlZ5wie3WkPSVH+jadyvADA3McQZjxX5i9qoPVaLAA==
+ember-template-lint@^2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-2.5.2.tgz#f1f9c3b1f3355f1a82870fbc81f672ae80e375fe"
+  integrity sha512-IwZziVgoWzqbfLCAQiCkwQ3jv6ZsPF2/pvu7ep3giAdNWbQKVx5NFrktQ+cy8tOG+QYmgrN9v7+8BkMgmE+21Q==
   dependencies:
-    "@glimmer/syntax" "^0.45.0"
-    chalk "^2.0.0"
-    globby "^9.0.0"
-    minimatch "^3.0.4"
-    resolve "^1.1.3"
-    strip-bom "^3.0.0"
+    chalk "^4.0.0"
+    ember-template-recast "^4.1.2"
+    find-up "^4.1.0"
+    globby "^11.0.0"
+    micromatch "^4.0.2"
+    resolve "^1.15.1"
+    yargs "^15.3.1"
+
+ember-template-recast@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-4.1.2.tgz#1999c49df482a042fe3ad02712d62b6d3566addd"
+  integrity sha512-ySBuPVKnGPvJ+y+5MEZ7qHE1p2LunM2CV9RUES0CP4O+fksPNwl79HPV+8rL0gJvN2nUOfkatNF6pcWNxxXaxg==
+  dependencies:
+    "@glimmer/syntax" "^0.50.0"
+    async-promise-queue "^1.0.5"
+    colors "^1.4.0"
+    commander "^5.0.0"
+    globby "^11.0.0"
+    ora "^4.0.3"
+    slash "^3.0.0"
+    tmp "^0.1.0"
+    workerpool "^5.0.4"
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 end-of-stream@^1.1.0:
   version "1.4.1"
@@ -1062,17 +1178,17 @@ fast-deep-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
   integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
-fast-glob@^2.2.6:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
-  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
+fast-glob@^3.1.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d"
+  integrity sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==
   dependencies:
-    "@mrmlnc/readdir-enhanced" "^2.2.1"
-    "@nodelib/fs.stat" "^1.1.2"
-    glob-parent "^3.1.0"
-    is-glob "^4.0.0"
-    merge2 "^1.2.3"
-    micromatch "^3.1.10"
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
 
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
@@ -1084,6 +1200,13 @@ fast-levenshtein@~2.0.4:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fastq@^1.6.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.7.0.tgz#fcd79a08c5bd7ec5b55cd3f5c4720db551929801"
+  integrity sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==
+  dependencies:
+    reusify "^1.0.4"
+
 "favcount@https://github.com/chrishunt/favcount":
   version "0.0.0"
   resolved "https://github.com/chrishunt/favcount#d053eac5ce33e2e299363ab927103e2ff6c7361e"
@@ -1127,6 +1250,21 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
 findup-sync@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
@@ -1169,6 +1307,11 @@ functional-red-black-tree@^1.0.1:
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
 get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -1181,18 +1324,12 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
+glob-parent@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
   dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-to-regexp@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
-  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
+    is-glob "^4.0.1"
 
 glob@7.1.1:
   version "7.1.1"
@@ -1255,19 +1392,17 @@ globals@^11.0.1, globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globby@^9.0.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
-  integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
+globby@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.0.tgz#56fd0e9f0d4f8fb0c456f1ab0dee96e1380bc154"
+  integrity sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==
   dependencies:
-    "@types/glob" "^7.1.1"
-    array-union "^1.0.2"
-    dir-glob "^2.2.2"
-    fast-glob "^2.2.6"
-    glob "^7.1.3"
-    ignore "^4.0.3"
-    pify "^4.0.1"
-    slash "^2.0.0"
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
 
 google-closure-compiler@20150901.x:
   version "20150901.0.0"
@@ -1314,6 +1449,11 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -1380,10 +1520,10 @@ ignore@^3.3.3:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
   integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
 
-ignore@^4.0.3:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+ignore@^5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
+  integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
 
 imurmurhash@^0.1.4:
   version "0.1.4"
@@ -1513,6 +1653,11 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -1520,13 +1665,18 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0:
+is-glob@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 
+is-interactive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -1534,6 +1684,11 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -1716,6 +1871,13 @@ linkify-it@^2.0.0:
   dependencies:
     uc.micro "^1.0.1"
 
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
 "lodash-cli@https://github.com/lodash-archive/lodash-cli.git":
   version "4.17.15"
   resolved "https://github.com/lodash-archive/lodash-cli.git#91176e422d7c10634a59c7e367fe224795ef5a24"
@@ -1726,7 +1888,7 @@ linkify-it@^2.0.0:
     semver "5.3.0"
     uglify-js "2.7.5"
 
-lodash@4.17.15, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
+lodash@4.17.15, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -1736,6 +1898,13 @@ lodash@^4.17.11:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"
   integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==
 
+log-symbols@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
+  integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==
+  dependencies:
+    chalk "^2.4.2"
+
 lolex@^2.3.2:
   version "2.7.5"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.7.5.tgz#113001d56bfc7e02d56e36291cc5c413d1aa0733"
@@ -1818,7 +1987,7 @@ mdurl@^1.0.1:
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
-merge2@^1.2.3:
+merge2@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
   integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
@@ -1828,7 +1997,7 @@ merge@^1.2.0:
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
   integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
 
-micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
+micromatch@^3.0.4, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -1847,6 +2016,14 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
 mime@^2.0.3:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
@@ -1857,6 +2034,11 @@ mimic-fn@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
 minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -1939,6 +2121,11 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -2043,6 +2230,13 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+onetime@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
+  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+  dependencies:
+    mimic-fn "^2.1.0"
+
 optimist@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
@@ -2063,6 +2257,20 @@ optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
+ora@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.3.tgz#752a1b7b4be4825546a7a3d59256fa523b6b6d05"
+  integrity sha512-fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg==
+  dependencies:
+    chalk "^3.0.0"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.2.0"
+    is-interactive "^1.0.0"
+    log-symbols "^3.0.0"
+    mute-stream "0.0.8"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
+
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -2073,6 +2281,25 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
@@ -2083,10 +2310,10 @@ pascalcase@^0.1.1:
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
   integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
@@ -2115,27 +2342,20 @@ path-to-regexp@^1.7.0:
   dependencies:
     isarray "0.0.1"
 
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
 
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+picomatch@^2.0.5, picomatch@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
 
 pikaday@1.8.0:
   version "1.8.0"
@@ -2266,6 +2486,16 @@ repeat-string@^1.5.2, repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
 require-uncached@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
@@ -2304,10 +2534,10 @@ resolve@1.5.0:
   dependencies:
     path-parse "^1.0.5"
 
-resolve@^1.1.3:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz#1b7ca96073ebb52e741ffd799f6b39ea462c67f5"
-  integrity sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==
+resolve@^1.15.1:
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
+  integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
   dependencies:
     path-parse "^1.0.6"
 
@@ -2319,6 +2549,14 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
 resumablejs@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/resumablejs/-/resumablejs-1.1.0.tgz#3160633688ac35bc2a0f119803c190ec369ef4d2"
@@ -2329,6 +2567,11 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -2343,6 +2586,13 @@ rimraf@^2.6.1:
   dependencies:
     glob "^7.0.5"
 
+rimraf@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@~2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@ -2367,6 +2617,11 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
+run-parallel@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
+  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
+
 rx-lite-aggregates@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
@@ -2426,6 +2681,11 @@ semver@^5.5.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
 set-value@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
@@ -2463,7 +2723,7 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-simple-html-tokenizer@^0.5.8:
+simple-html-tokenizer@^0.5.9:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.9.tgz#1a83fe97f5a3e39b335fddf71cfe9b0263b581c2"
   integrity sha512-w/3FEDN94r4JQ9WoYrIr8RqDIPZdyNkdpbK9glFady1CAEyD97XWCv8HFetQO21w81e7h7Nh59iYTyG1mUJftg==
@@ -2481,10 +2741,10 @@ sinon@^7.2.5:
     nise "^1.4.10"
     supports-color "^5.5.0"
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
 slice-ansi@1.0.0:
   version "1.0.0"
@@ -2582,6 +2842,15 @@ string-width@^2.1.0, string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
+
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -2603,10 +2872,12 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
 
 strip-eof@^1.0.0:
   version "1.0.0"
@@ -2630,6 +2901,13 @@ supports-color@^5.3.0, supports-color@^5.5.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  dependencies:
+    has-flag "^4.0.0"
+
 table@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
@@ -2659,6 +2937,13 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmp@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
+  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
+  dependencies:
+    rimraf "^2.6.3"
+
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
@@ -2684,6 +2969,13 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
@@ -2805,6 +3097,18 @@ watch@~0.18.0:
     exec-sh "^0.2.0"
     minimist "^1.2.0"
 
+wcwidth@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  dependencies:
+    defaults "^1.0.3"
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+
 which@^1.2.14, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -2863,6 +3167,20 @@ workbox-sw@^4.3.1:
   resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-4.3.1.tgz#df69e395c479ef4d14499372bcd84c0f5e246164"
   integrity sha512-0jXdusCL2uC5gM3yYFT6QMBzKfBr2XTk0g5TPAV4y8IZDyVNDyj1a8uSXy3/XrvkVTmQvLN4O5k3JawGReXr9w==
 
+workerpool@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-5.0.4.tgz#4f67cb70ff7550a27ab94de25b0b843cd92059a2"
+  integrity sha512-Sywova24Ow2NQ24JPB68bI89EdqMDjUXo4OpofK/QMD7C2ZVMloYBgQ5J3PChcBJHj2vspsmGx1/3nBKXtUkXQ==
+
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -2891,11 +3209,41 @@ ws@^6.1.0:
   dependencies:
     async-limiter "~1.0.0"
 
+y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
+yargs-parser@^18.1.1:
+  version "18.1.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1"
+  integrity sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs@^15.3.1:
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
+  integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.1"
+
 yargs@~3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"

From e2284cf7391aa94ed2f22662305bc14e9e51262c Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 14 Apr 2020 11:21:31 +1000
Subject: [PATCH 0601/1830] Revert "We have had errors reported due to
 migrations breaking and are reverting"

This reverts commit 8b46f14744d4bab9339d075825914d86da6bd5eb.

It corrects the reason for the revert:

We rely on SafeMigrate existing cause we call it from migrations,
Zeitwerk will autoload it.

Instead of previous pattern we explicitly bypass all the hacks in
production mode.

We need to disable SafeMigrate cause it is not thread safe.

A thread safe implementation is possible but not worth the effort,
we catch the issues in dev and test.
---
 lib/freedom_patches/safe_migrations.rb |  12 ++-
 lib/migration/safe_migrate.rb          |   5 ++
 lib/tasks/db.rake                      | 100 +++++++++++++++++++++++++
 3 files changed, 114 insertions(+), 3 deletions(-)

diff --git a/lib/freedom_patches/safe_migrations.rb b/lib/freedom_patches/safe_migrations.rb
index 718ffffb89..cdf989fdd5 100644
--- a/lib/freedom_patches/safe_migrations.rb
+++ b/lib/freedom_patches/safe_migrations.rb
@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
-require_dependency 'migration/safe_migrate'
-
-Migration::SafeMigrate.patch_active_record!
+# We do not run this in production cause it is intrusive and has
+# potential to break stuff, it also breaks under concurrent use
+# which rake:multisite_migrate uses
+#
+# The protection is only needed in Dev and Test
+if ENV['RAILS_ENV'] != "production"
+  require_dependency 'migration/safe_migrate'
+  Migration::SafeMigrate.patch_active_record!
+end
diff --git a/lib/migration/safe_migrate.rb b/lib/migration/safe_migrate.rb
index d9adb518f1..cf6c43be91 100644
--- a/lib/migration/safe_migrate.rb
+++ b/lib/migration/safe_migrate.rb
@@ -73,6 +73,7 @@ class Migration::SafeMigrate
 
   def self.enable!
     return if PG::Connection.method_defined?(:exec_migrator_unpatched)
+    return if ENV['RAILS_ENV'] == "production"
 
     PG::Connection.class_eval do
       alias_method :exec_migrator_unpatched, :exec
@@ -92,6 +93,8 @@ class Migration::SafeMigrate
 
   def self.disable!
     return if !PG::Connection.method_defined?(:exec_migrator_unpatched)
+    return if ENV['RAILS_ENV'] == "production"
+
     PG::Connection.class_eval do
       alias_method :exec, :exec_migrator_unpatched
       alias_method :async_exec, :async_exec_migrator_unpatched
@@ -102,6 +105,8 @@ class Migration::SafeMigrate
   end
 
   def self.patch_active_record!
+    return if ENV['RAILS_ENV'] == "production"
+
     ActiveSupport.on_load(:active_record) do
       ActiveRecord::Migration.prepend(SafeMigration)
     end
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 14b2eb4e20..81087473a0 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -66,6 +66,106 @@ task 'db:rollback' => ['environment', 'set_locale'] do |_, args|
   Rake::Task['db:_dump'].invoke
 end
 
+# our optimized version of multisite migrate, we have many sites and we have seeds
+# this ensures we can run migrations concurrently to save huge amounts of time
+Rake::Task['multisite:migrate'].clear
+
+class StdOutDemux
+  def initialize(stdout)
+    @stdout = stdout
+    @data = {}
+  end
+
+  def write(data)
+    (@data[Thread.current] ||= +"") << data
+  end
+
+  def close
+    finish_chunk
+  end
+
+  def finish_chunk
+    data = @data[Thread.current]
+    if data
+      @stdout.write(data)
+      @data.delete Thread.current
+    end
+  end
+end
+
+task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |_, args|
+  if ENV["RAILS_ENV"] != "production"
+    raise "Multisite migrate is only supported in production"
+  end
+
+  concurrency = (ENV['MIGRATE_CONCURRENCY'].presence || "20").to_i
+
+  puts "Multisite migrator is running using #{concurrency} threads"
+  puts
+
+  queue = Queue.new
+  exceptions = Queue.new
+
+  old_stdout = $stdout
+  $stdout = StdOutDemux.new($stdout)
+
+  RailsMultisite::ConnectionManagement.each_connection do |db|
+    queue << db
+  end
+
+  concurrency.times { queue << :done }
+
+  SeedFu.quiet = true
+
+  (1..concurrency).map do
+    Thread.new {
+      while true
+        db = queue.pop
+        break if db == :done
+
+        RailsMultisite::ConnectionManagement.with_connection(db) do
+          begin
+            puts "Migrating #{db}"
+            ActiveRecord::Tasks::DatabaseTasks.migrate
+            SeedFu.seed(DiscoursePluginRegistry.seed_paths)
+            if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
+              SiteIconManager.ensure_optimized!
+            end
+          rescue => e
+            exceptions << [db, e]
+          ensure
+            begin
+              $stdout.finish_chunk
+            rescue => ex
+              STDERR.puts ex.inspect
+              STDERR.puts ex.backtrace
+            end
+          end
+        end
+      end
+    }
+  end.each(&:join)
+
+  $stdout = old_stdout
+
+  if exceptions.length > 0
+    STDERR.puts
+    STDERR.puts "-" * 80
+    STDERR.puts "#{exceptions.length} migrations failed!"
+    while !exceptions.empty?
+      db, e = exceptions.pop
+      STDERR.puts
+      STDERR.puts "Failed to migrate #{db}"
+      STDERR.puts e.inspect
+      STDERR.puts e.backtrace
+      STDERR.puts
+    end
+    exit 1
+  end
+
+  Rake::Task['db:_dump'].invoke
+end
+
 # we need to run seed_fu every time we run rake db:migrate
 task 'db:migrate' => ['load_config', 'environment', 'set_locale'] do |_, args|
 

From 6f9177e2ed273ebebb8306299425cbfabbf57101 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 14 Apr 2020 14:16:30 +1000
Subject: [PATCH 0602/1830] FEATURE: enforce_canonical_emails site setting

The new `enforce_canonical_emails` site setting ensures that emails in the
canonical form are unique.

This mean that if `s.a.m+1@gmail.com` is registered `sam@gmail.com` will
not be allowed.

The commit contains a blanket "tag strip" (stripping everything after +)
it also contains special handling of a "dot strip" for googlemail and gmail.

The setting only impacts new registrations after `enforce_canonical_emails`

The setting is default false so it will not impact any existing installs.
---
 app/models/user_email.rb                      | 41 +++++++++++++++----
 config/locales/server.en.yml                  |  1 +
 config/site_settings.yml                      |  1 +
 ...34210_add_canonical_email_to_user_email.rb |  7 ++++
 spec/jobs/user_email_spec.rb                  | 28 +++++++++++++
 5 files changed, 70 insertions(+), 8 deletions(-)
 create mode 100644 db/migrate/20200414034210_add_canonical_email_to_user_email.rb

diff --git a/app/models/user_email.rb b/app/models/user_email.rb
index e6fdaa8fc6..57032164c9 100644
--- a/app/models/user_email.rb
+++ b/app/models/user_email.rb
@@ -15,10 +15,27 @@ class UserEmail < ActiveRecord::Base
   validate :user_id_not_changed, if: :primary
   validate :unique_email
 
+  before_save :save_canonical
+
   scope :secondary, -> { where(primary: false) }
 
+  def self.canonical(email)
+    name, domain = email.split('@', 2)
+    name = name.gsub(/\+.*/, '')
+    if ['gmail.com', 'googlemail.com'].include?(domain.downcase)
+      name = name.gsub('.', '')
+    end
+    "#{name}@#{domain}".downcase
+  end
+
   private
 
+  def save_canonical
+    if SiteSetting.enforce_canonical_emails && self.will_save_change_to_email?
+      self.canonical_email = UserEmail.canonical(self.email)
+    end
+  end
+
   def strip_downcase_email
     if self.email
       self.email = self.email.strip
@@ -32,8 +49,14 @@ class UserEmail < ActiveRecord::Base
   end
 
   def unique_email
-    if self.will_save_change_to_email? && self.class.where("lower(email) = ?", email).exists?
-      self.errors.add(:email, :taken)
+    if self.will_save_change_to_email?
+      exists = self.class.where("lower(email) = ?", email).exists?
+      exists ||= SiteSetting.enforce_canonical_emails &&
+        self.class.where("canonical_email = ?", UserEmail.canonical(email)).exists?
+
+      if exists
+        self.errors.add(:email, :taken)
+      end
     end
   end
 
@@ -50,15 +73,17 @@ end
 #
 # Table name: user_emails
 #
-#  id         :integer          not null, primary key
-#  user_id    :integer          not null
-#  email      :string(513)      not null
-#  primary    :boolean          default(FALSE), not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id              :integer          not null, primary key
+#  user_id         :integer          not null
+#  email           :string(513)      not null
+#  primary         :boolean          default(FALSE), not null
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  canonical_email :string
 #
 # Indexes
 #
+#  index_user_emails_on_canonical_email      (canonical_email) WHERE (canonical_email IS NOT NULL)
 #  index_user_emails_on_email                (lower((email)::text)) UNIQUE
 #  index_user_emails_on_user_id              (user_id)
 #  index_user_emails_on_user_id_and_primary  (user_id,primary) UNIQUE WHERE "primary"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index df6709c262..ffd392888e 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1582,6 +1582,7 @@ en:
     allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines. In exceptional cases you can permanently <a href='%{base_path}/admin/customize/robots'>override robots.txt</a>."
     email_domains_blacklist: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net"
     email_domains_whitelist: "A pipe-delimited list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!"
+    enforce_canonical_emails: "Prior to creating users strip email to canonical form ensuring uniqueness. Setting will only take effect on new account registrations. When set user+1@domain.com will not be allowed to register if user+2@domain.com is already registered."
     auto_approve_email_domains: "Users with email addresses from this list of domains will be automatically approved."
     hide_email_address_taken: "Don't inform users that an account exists with a given email address during signup and from the forgot password form."
     log_out_strict: "When logging out, log out ALL sessions for the user on all devices"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index c5b7a3d5cc..e9175a34d6 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -459,6 +459,7 @@ login:
   email_domains_whitelist:
     default: ""
     type: list
+  enforce_canonical_emails: false
   auto_approve_email_domains:
     default: ""
     type: list
diff --git a/db/migrate/20200414034210_add_canonical_email_to_user_email.rb b/db/migrate/20200414034210_add_canonical_email_to_user_email.rb
new file mode 100644
index 0000000000..7033f55bb7
--- /dev/null
+++ b/db/migrate/20200414034210_add_canonical_email_to_user_email.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+class AddCanonicalEmailToUserEmail < ActiveRecord::Migration[6.0]
+  def change
+    add_column :user_emails, :canonical_email, :string, length: 513
+    add_index :user_emails, :canonical_email, where: 'canonical_email IS NOT NULL'
+  end
+end
diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb
index e6def350b2..3cea6c3078 100644
--- a/spec/jobs/user_email_spec.rb
+++ b/spec/jobs/user_email_spec.rb
@@ -672,4 +672,32 @@ describe Jobs::UserEmail do
     end
 
   end
+
+  context "canonical emails" do
+    it "correctly creates canonical emails" do
+      expect(UserEmail.canonical('s.a.m+1@gmail.com')).to eq('sam@gmail.com')
+      expect(UserEmail.canonical('sa.m+1@googlemail.com')).to eq('sam@googlemail.com')
+      expect(UserEmail.canonical('sa.m+1722@sam.com')).to eq('sa.m@sam.com')
+      expect(UserEmail.canonical('sa.m@sam.com')).to eq('sa.m@sam.com')
+    end
+
+    it "correctly bans non canonical emails" do
+
+      email = UserEmail.create!(email: 'sam@sam.com', user_id: user.id)
+      expect(email.canonical_email).to eq(nil)
+
+      email = UserEmail.create!(email: 'sam+1@sam.com', user_id: user.id)
+      expect(email.canonical_email).to eq(nil)
+
+      SiteSetting.enforce_canonical_emails = true
+
+      email = UserEmail.create!(email: 'Sam+5@sam.com', user_id: user.id)
+      expect(email.canonical_email).to eq('sam@sam.com')
+
+      expect do
+        UserEmail.create!(email: 'saM+3@sam.com', user_id: user.id)
+      end.to raise_error(ActiveRecord::RecordInvalid)
+
+    end
+  end
 end

From 2d122f0393fb3e80a34de733171ae0b6424fa804 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 14 Apr 2020 15:17:24 +1000
Subject: [PATCH 0603/1830] FIX: Toggle bookmark for topic was not working
 after cancelling the modal (#9418)

* When bookmarking the topic, if the user cancelled the bookmark modal the bookmark topic button no longer worked because we did not reset the "bookmarked" property
* Prefill the custom reminder time to 8:00am
---
 app/assets/javascripts/discourse/controllers/bookmark.js | 8 ++++++--
 app/assets/javascripts/discourse/models/post.js          | 4 ++--
 app/assets/javascripts/discourse/models/topic.js         | 8 ++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 22218715b3..ebd999874d 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -78,7 +78,7 @@ export default Controller.extend(ModalFunctionality, {
       closeWithoutSaving: false,
       isSavingBookmarkManually: false,
       customReminderDate: null,
-      customReminderTime: null,
+      customReminderTime: this.defaultCustomReminderTime(),
       lastCustomReminderDate: null,
       lastCustomReminderTime: null,
       userTimezone: this.currentUser.resolvedTimezone()
@@ -270,6 +270,10 @@ export default Controller.extend(ModalFunctionality, {
     return moment.tz(date + " " + time, this.userTimezone);
   },
 
+  defaultCustomReminderTime() {
+    return `0${START_OF_DAY_HOUR}:00`;
+  },
+
   reminderAt() {
     if (!this.selectedReminderType) {
       return;
@@ -295,7 +299,7 @@ export default Controller.extend(ModalFunctionality, {
       case REMINDER_TYPES.CUSTOM:
         this.set(
           "customReminderTime",
-          this.customReminderTime || `0${START_OF_DAY_HOUR}:00`
+          this.customReminderTime || this.defaultCustomReminderTime()
         );
         const customDateTime = this.parseCustomDateTime(
           this.customReminderDate,
diff --git a/app/assets/javascripts/discourse/models/post.js b/app/assets/javascripts/discourse/models/post.js
index 9b2dac96cd..f3ae53a606 100644
--- a/app/assets/javascripts/discourse/models/post.js
+++ b/app/assets/javascripts/discourse/models/post.js
@@ -349,8 +349,8 @@ const Post = RestModel.extend({
         controller.setProperties({
           onCloseWithoutSaving: () => {
             this.toggleProperty("bookmarked_with_reminder");
+            resolve({ closedWithoutSaving: true });
             this.appEvents.trigger("post-stream:refresh", { id: this.id });
-            resolve();
           },
           afterSave: (reminderAtISO, reminderType) => {
             this.setProperties({
@@ -358,8 +358,8 @@ const Post = RestModel.extend({
               bookmark_reminder_at: reminderAtISO,
               bookmark_reminder_type: reminderType
             });
+            resolve({ closedWithoutSaving: false });
             this.appEvents.trigger("post-stream:refresh", { id: this.id });
-            resolve();
           }
         });
       });
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index 5da7217819..c783fe8827 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -438,9 +438,13 @@ const Topic = RestModel.extend({
       const toggleBookmarkOnServer = () => {
         if (bookmark) {
           if (this.siteSettings.enable_bookmarks_with_reminders) {
-            return firstPost.toggleBookmarkWithReminder().then(() => {
+            return firstPost.toggleBookmarkWithReminder().then(response => {
               this.set("bookmarking", false);
-              return this.afterTopicBookmarked(firstPost);
+              if (response.closedWithoutSaving) {
+                this.set("bookmarked", false);
+              } else {
+                return this.afterTopicBookmarked(firstPost);
+              }
             });
           } else {
             return ajax(`/t/${this.id}/bookmark`, { type: "PUT" })

From c4644c61d97c823b7dd940ffaf0967a104f4b58c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 14 Apr 2020 08:18:49 +0200
Subject: [PATCH 0604/1830] DEV: enforces double quotes ember-template-lint
 (#9416)

---
 .template-lintrc.js                           |  2 +-
 .../javascripts/admin/templates/admin.hbs     | 26 +++----
 .../admin/templates/api-keys-index.hbs        |  8 +-
 .../admin/templates/api-keys-new.hbs          |  6 +-
 .../admin/templates/api-keys-show.hbs         | 12 +--
 .../javascripts/admin/templates/api.hbs       |  4 +-
 .../javascripts/admin/templates/backups.hbs   |  6 +-
 .../admin/templates/badges-award.hbs          | 22 +++---
 .../admin/templates/badges-index.hbs          |  2 +-
 .../admin/templates/badges-show.hbs           | 48 ++++++------
 .../javascripts/admin/templates/badges.hbs    | 14 ++--
 .../admin/templates/components/ace-editor.hbs |  2 +-
 .../components/admin-editable-field.hbs       |  8 +-
 .../templates/components/admin-form-row.hbs   |  4 +-
 .../admin/templates/components/admin-nav.hbs  |  2 +-
 .../components/admin-report-storage-stats.hbs |  2 +-
 .../components/admin-report-table.hbs         |  6 +-
 .../admin-report-trust-level-counts.hbs       | 10 +--
 .../templates/components/admin-report.hbs     |  4 +-
 .../components/admin-theme-editor.hbs         | 30 ++++----
 .../components/dashboard-problems.hbs         |  4 +-
 .../components/email-styles-editor.hbs        | 18 ++---
 .../templates/components/embeddable-host.hbs  |  2 +-
 .../components/embedding-setting.hbs          |  2 +-
 .../templates/components/flag-user-lists.hbs  | 14 ++--
 .../admin/templates/components/flag-user.hbs  | 14 ++--
 .../components/inline-edit-checkbox.hbs       |  2 +-
 .../components/install-theme-item.hbs         |  4 +-
 .../components/penalty-post-action.hbs        |  8 +-
 .../templates/components/resumable-upload.hbs |  4 +-
 .../components/screened-ip-address-form.hbs   |  2 +-
 .../components/setting-validation-message.hbs |  2 +-
 .../templates/components/silence-details.hbs  |  8 +-
 .../site-customization-change-details.hbs     |  2 +-
 .../site-customization-change-field.hbs       |  2 +-
 .../templates/components/site-setting.hbs     |  6 +-
 .../site-settings/category-list.hbs           |  2 +-
 .../components/site-settings/category.hbs     |  2 +-
 .../components/site-settings/compact-list.hbs |  2 +-
 .../components/site-settings/enum.hbs         |  2 +-
 .../components/site-settings/group-list.hbs   |  2 +-
 .../components/site-settings/host-list.hbs    |  2 +-
 .../components/site-settings/list.hbs         |  2 +-
 .../components/site-settings/secret-list.hbs  |  2 +-
 .../components/site-settings/string.hbs       |  2 +-
 .../components/site-settings/tag-list.hbs     |  2 +-
 .../components/site-settings/upload.hbs       |  2 +-
 .../site-settings/uploaded-image-list.hbs     |  2 +-
 .../components/site-settings/url-list.hbs     |  2 +-
 .../components/site-settings/value-list.hbs   |  2 +-
 .../components/site-text-summary.hbs          |  8 +-
 .../components/suspension-details.hbs         | 10 +--
 .../templates/components/tags-uploader.hbs    |  6 +-
 .../templates/components/themes-list-item.hbs |  2 +-
 .../templates/components/themes-list.hbs      |  4 +-
 .../admin/templates/components/value-list.hbs |  4 +-
 .../components/watched-word-form.hbs          |  2 +-
 .../components/watched-word-uploader.hbs      |  6 +-
 .../templates/customize-colors-index.hbs      |  2 +-
 .../admin/templates/customize-colors-show.hbs | 14 ++--
 .../templates/customize-email-style-edit.hbs  |  6 +-
 .../admin/templates/customize-email-style.hbs |  6 +-
 .../customize-email-templates-edit.hbs        |  4 +-
 .../admin/templates/customize-themes-edit.hbs | 22 +++---
 .../admin/templates/customize-themes-show.hbs | 32 ++++----
 .../javascripts/admin/templates/customize.hbs | 18 ++---
 .../admin/templates/dashboard_general.hbs     | 10 +--
 .../admin/templates/dashboard_moderation.hbs  |  2 +-
 .../admin/templates/dashboard_reports.hbs     |  2 +-
 .../admin/templates/email-advanced-test.hbs   | 10 +--
 .../admin/templates/email-bounced.hbs         | 20 ++---
 .../admin/templates/email-index.hbs           | 14 ++--
 .../admin/templates/email-preview-digest.hbs  | 30 ++++----
 .../admin/templates/email-received.hbs        | 16 ++--
 .../admin/templates/email-rejected.hbs        | 20 ++---
 .../admin/templates/email-sent.hbs            | 28 +++----
 .../admin/templates/email-skipped.hbs         | 22 +++---
 .../javascripts/admin/templates/email.hbs     | 18 ++---
 .../javascripts/admin/templates/embedding.hbs | 22 +++---
 .../javascripts/admin/templates/emojis.hbs    |  4 +-
 .../javascripts/admin/templates/logs.hbs      | 14 ++--
 .../admin/templates/logs/screened-emails.hbs  | 24 +++---
 .../admin/templates/logs/screened-urls.hbs    | 22 +++---
 .../templates/logs/staff-action-logs.hbs      | 40 +++++-----
 .../templates/modal/admin-add-upload.hbs      | 10 +--
 .../templates/modal/admin-install-theme.hbs   | 30 ++++----
 .../templates/modal/admin-silence-user.hbs    |  2 +-
 .../templates/modal/admin-suspend-user.hbs    |  4 +-
 .../templates/modal/admin-theme-item.hbs      |  2 +-
 .../modal/site-setting-default-categories.hbs |  4 +-
 .../admin/templates/permalinks.hbs            | 12 +--
 .../javascripts/admin/templates/plugins.hbs   |  6 +-
 .../admin/templates/search-logs-index.hbs     | 16 ++--
 .../admin/templates/search-logs-term.hbs      | 22 +++---
 .../templates/site-settings-category.hbs      |  4 +-
 .../admin/templates/site-settings.hbs         | 10 +--
 .../admin/templates/site-text-edit.hbs        | 10 +--
 .../admin/templates/site-text-index.hbs       |  6 +-
 .../javascripts/admin/templates/site-text.hbs |  2 +-
 .../admin/templates/user-badges.hbs           | 34 ++++-----
 .../admin/templates/user-fields.hbs           |  6 +-
 .../admin/templates/user-index.hbs            |  4 +-
 .../admin/templates/user-tl3-requirements.hbs | 66 ++++++++---------
 .../admin/templates/users-list-show.hbs       | 34 ++++-----
 .../admin/templates/users-list.hbs            | 16 ++--
 .../admin/templates/watched-words-action.hbs  |  4 +-
 .../admin/templates/watched-words.hbs         |  6 +-
 .../admin/templates/web-hooks-show-events.hbs | 30 ++++----
 .../admin/templates/web-hooks-show.hbs        | 52 ++++++-------
 .../javascripts/admin/templates/web-hooks.hbs | 32 ++++----
 .../javascripts/discourse/templates/about.hbs | 74 +++++++++----------
 .../discourse/templates/account-created.hbs   |  4 +-
 .../templates/account-created/edit-email.hbs  |  4 +-
 .../templates/account-created/index.hbs       |  2 +-
 .../templates/account-created/resent.hbs      |  6 +-
 .../discourse/templates/badges/index.hbs      | 10 +--
 .../discourse/templates/badges/show.hbs       | 24 +++---
 .../templates/components/avatar-uploader.hbs  |  8 +-
 .../templates/components/backup-uploader.hbs  |  2 +-
 .../templates/components/badge-card.hbs       | 16 ++--
 .../templates/components/badge-selector.hbs   |  2 +-
 .../templates/components/badge-title.hbs      |  6 +-
 .../templates/components/basic-topic-list.hbs |  6 +-
 .../components/bulk-select-button.hbs         |  2 +-
 .../templates/components/cancel-link.hbs      |  2 +-
 .../categories-and-latest-topics.hbs          |  4 +-
 .../components/categories-and-top-topics.hbs  |  4 +-
 .../components/categories-boxes-topic.hbs     |  2 +-
 .../categories-boxes-with-topics.hbs          | 10 +--
 .../templates/components/categories-boxes.hbs | 19 +++--
 .../templates/components/categories-only.hbs  | 22 +++---
 .../components/categories-topic-list.hbs      |  6 +-
 .../components/category-name-fields.hbs       |  6 +-
 .../components/category-title-link.hbs        |  2 +-
 .../templates/components/category-unread.hbs  |  4 +-
 .../templates/components/choose-message.hbs   | 12 +--
 .../templates/components/choose-topic.hbs     | 12 +--
 .../templates/components/color-picker.hbs     |  2 +-
 .../components/composer-user-selector.hbs     |  8 +-
 .../components/create-topics-notice.hbs       |  4 +-
 .../templates/components/csv-uploader.hbs     |  2 +-
 .../templates/components/d-button.hbs         |  2 +-
 .../templates/components/d-editor.hbs         | 10 +--
 .../templates/components/d-modal-cancel.hbs   |  2 +-
 .../templates/components/d-modal.hbs          |  2 +-
 .../components/date-time-input-range.hbs      |  4 +-
 .../desktop-notification-config.hbs           |  2 +-
 .../templates/components/directory-item.hbs   |  2 +-
 .../components/edit-category-general.hbs      | 34 ++++-----
 .../components/edit-category-images.hbs       |  8 +-
 .../components/edit-category-security.hbs     |  8 +-
 .../components/edit-category-settings.hbs     | 56 +++++++-------
 .../components/edit-category-tab.hbs          |  2 +-
 .../components/edit-category-tags.hbs         | 34 ++++-----
 .../edit-category-topic-template.hbs          |  2 +-
 .../components/edit-topic-timer-form.hbs      |  2 +-
 .../templates/components/emoji-picker.hbs     |  4 +-
 .../templates/components/emoji-uploader.hbs   |  2 +-
 .../templates/components/featured-topic.hbs   |  6 +-
 .../templates/components/flag-action-type.hbs | 20 ++---
 .../templates/components/flag-selection.hbs   |  2 +-
 .../components/generated-invite-link.hbs      |  2 +-
 .../templates/components/google-search.hbs    |  6 +-
 .../components/group-activity-filter.hbs      |  4 +-
 .../components/group-card-contents.hbs        | 12 +--
 .../components/group-flair-inputs.hbs         | 18 ++---
 .../components/group-manage-logs-row.hbs      | 10 +--
 .../components/group-manage-save-button.hbs   |  6 +-
 .../templates/components/group-member.hbs     |  2 +-
 .../templates/components/group-navigation.hbs |  4 +-
 .../templates/components/group-post.hbs       | 14 ++--
 .../templates/components/group-selector.hbs   |  2 +-
 .../groups-form-interaction-fields.hbs        | 26 +++----
 .../groups-form-membership-fields.hbs         | 22 +++---
 .../components/groups-form-profile-fields.hbs | 12 +--
 .../templates/components/groups-info.hbs      |  4 +-
 .../components/ignored-user-list.hbs          |  6 +-
 .../templates/components/image-uploader.hbs   |  4 +-
 .../templates/components/images-uploader.hbs  |  2 +-
 .../templates/components/ip-lookup.hbs        |  2 +-
 .../components/latest-topic-list-item.hbs     | 10 +--
 .../components/mobile-category-topic.hbs      |  6 +-
 .../templates/components/popup-input-tip.hbs  |  2 +-
 .../components/preference-checkbox.hbs        |  2 +-
 .../templates/components/quote-button.hbs     |  2 +-
 .../components/reviewable-claimed-topic.hbs   |  6 +-
 .../reviewable-conversation-post.hbs          |  4 +-
 .../components/reviewable-created-by-name.hbs |  2 +-
 .../components/reviewable-created-by.hbs      |  2 +-
 .../components/reviewable-field-text.hbs      |  2 +-
 .../templates/components/reviewable-field.hbs |  4 +-
 .../components/reviewable-flagged-post.hbs    | 14 ++--
 .../components/reviewable-histories.hbs       |  2 +-
 .../templates/components/reviewable-item.hbs  | 38 +++++-----
 .../components/reviewable-post-header.hbs     |  6 +-
 .../components/reviewable-queued-post.hbs     | 16 ++--
 .../templates/components/reviewable-score.hbs | 18 ++---
 .../components/reviewable-scores.hbs          |  2 +-
 .../components/reviewable-topic-link.hbs      |  6 +-
 .../templates/components/reviewable-user.hbs  | 28 +++----
 .../templates/components/save-controls.hbs    |  2 +-
 .../templates/components/score-value.hbs      |  8 +-
 .../components/search-advanced-options.hbs    |  4 +-
 .../components/security-key-form.hbs          |  4 +-
 .../components/shared-draft-controls.hbs      |  6 +-
 .../templates/components/tag-groups-form.hbs  | 14 ++--
 .../templates/components/tag-info.hbs         |  6 +-
 .../templates/components/tag-list.hbs         |  4 +-
 .../templates/components/topic-entrance.hbs   |  4 +-
 .../components/topic-footer-buttons.hbs       |  2 +-
 .../components/topic-post-badges.hbs          |  6 +-
 .../templates/components/topic-progress.hbs   |  8 +-
 .../templates/components/topic-status.hbs     | 20 ++---
 .../components/user-card-contents.hbs         | 34 ++++-----
 .../components/user-fields/confirm.hbs        | 10 +--
 .../components/user-fields/dropdown.hbs       |  8 +-
 .../templates/components/user-fields/text.hbs |  8 +-
 .../components/user-flag-percentage.hbs       |  2 +-
 .../templates/components/user-info.hbs        |  4 +-
 .../components/user-profile-avatar.hbs        |  4 +-
 .../templates/components/user-stat.hbs        |  4 +-
 .../templates/components/user-stream-item.hbs | 26 +++----
 .../user-summary-category-search.hbs          |  2 +-
 .../components/user-summary-section.hbs       |  2 +-
 .../components/user-summary-topic.hbs         |  4 +-
 .../discourse/templates/composer.hbs          | 50 ++++++-------
 .../templates/composer/custom-body.hbs        |  2 +-
 .../templates/composer/education.hbs          |  2 +-
 .../templates/composer/group-mentioned.hbs    |  2 +-
 .../templates/composer/similar-topics.hbs     |  6 +-
 .../discourse/templates/discovery/topics.hbs  | 14 ++--
 .../discourse/templates/email-login.hbs       |  2 +-
 .../discourse/templates/exception.hbs         |  2 +-
 .../discourse/templates/full-page-search.hbs  | 34 ++++-----
 .../discourse/templates/group-index.hbs       | 16 ++--
 .../discourse/templates/group-requests.hbs    |  8 +-
 .../javascripts/discourse/templates/group.hbs | 14 ++--
 .../discourse/templates/group/activity.hbs    |  4 +-
 .../discourse/templates/group/manage.hbs      |  4 +-
 .../discourse/templates/group/manage/logs.hbs | 10 +--
 .../discourse/templates/group/messages.hbs    | 10 +--
 .../discourse/templates/groups/index.hbs      | 14 ++--
 .../discourse/templates/groups/new.hbs        | 10 +--
 .../discourse/templates/invites/show.hbs      | 24 +++---
 .../discourse/templates/login-preferences.hbs |  4 +-
 .../mobile/components/basic-topic-list.hbs    | 24 +++---
 .../mobile/components/categories-only.hbs     | 24 +++---
 .../mobile/components/mobile-nav.hbs          |  4 +-
 .../mobile/components/navigation-bar.hbs      |  6 +-
 .../templates/mobile/discovery/topics.hbs     | 12 +--
 .../templates/mobile/modal/login.hbs          | 12 +--
 .../discourse/templates/mobile/users.hbs      | 12 +--
 .../templates/modal/activation-resent.hbs     |  2 +-
 .../modal/associate-account-confirm.hbs       |  2 +-
 .../discourse/templates/modal/auth-token.hbs  |  8 +-
 .../templates/modal/avatar-selector.hbs       | 10 +--
 .../discourse/templates/modal/bookmark.hbs    |  4 +-
 .../templates/modal/bulk-actions-buttons.hbs  |  2 +-
 .../modal/bulk-notification-level.hbs         |  6 +-
 .../templates/modal/change-owner.hbs          |  4 +-
 .../templates/modal/change-timestamp.hbs      |  6 +-
 .../modal/convert-to-public-topic.hbs         |  4 +-
 .../templates/modal/create-account.hbs        | 26 +++----
 .../templates/modal/edit-topic-timer.hbs      | 10 +--
 .../templates/modal/explain-reviewable.hbs    | 10 +--
 .../modal/feature-topic-on-profile.hbs        |  2 +-
 .../templates/modal/forgot-password.hbs       |  4 +-
 .../discourse/templates/modal/grant-badge.hbs |  4 +-
 .../templates/modal/group-bulk-add.hbs        |  2 +-
 .../discourse/templates/modal/history.hbs     |  8 +-
 .../templates/modal/jump-to-post.hbs          |  6 +-
 .../discourse/templates/modal/login.hbs       | 16 ++--
 .../templates/modal/move-to-topic.hbs         | 54 +++++++-------
 .../templates/modal/not-activated.hbs         |  2 +-
 .../templates/modal/publish-page.hbs          |  4 +-
 .../discourse/templates/modal/raw-email.hbs   |  8 +-
 .../templates/modal/reorder-categories.hbs    |  4 +-
 .../modal/request-group-membership-form.hbs   |  2 +-
 .../modal/second-factor-add-security-key.hbs  |  6 +-
 .../modal/second-factor-add-totp.hbs          | 14 ++--
 .../modal/second-factor-edit-security-key.hbs |  4 +-
 .../templates/modal/second-factor-edit.hbs    |  4 +-
 .../discourse/templates/modal/tag-upload.hbs  |  2 +-
 .../templates/modal/topic-bulk-actions.hbs    |  2 +-
 .../templates/modal/upload-selector.hbs       | 10 +--
 .../templates/navigation/category.hbs         |  4 +-
 .../discourse/templates/password-reset.hbs    | 16 ++--
 .../discourse/templates/preferences-email.hbs | 18 ++---
 .../templates/preferences-second-factor.hbs   | 20 ++---
 .../templates/preferences-username.hbs        | 12 +--
 .../discourse/templates/preferences.hbs       | 58 +++++++--------
 .../templates/preferences/account.hbs         | 58 +++++++--------
 .../discourse/templates/preferences/apps.hbs  |  2 +-
 .../templates/preferences/categories.hbs      | 26 +++----
 .../templates/preferences/emails.hbs          | 34 ++++-----
 .../templates/preferences/interface.hbs       | 18 ++---
 .../templates/preferences/notifications.hbs   | 16 ++--
 .../templates/preferences/profile.hbs         | 30 ++++----
 .../discourse/templates/preferences/tags.hbs  | 18 ++---
 .../discourse/templates/preferences/users.hbs |  8 +-
 .../discourse/templates/review-index.hbs      | 30 ++++----
 .../discourse/templates/review-settings.hbs   | 16 ++--
 .../discourse/templates/review-topics.hbs     |  6 +-
 .../discourse/templates/review.hbs            |  6 +-
 .../discourse/templates/static.hbs            |  2 +-
 .../discourse/templates/tag-groups-index.hbs  |  2 +-
 .../discourse/templates/tag-groups.hbs        |  2 +-
 .../discourse/templates/tags/index.hbs        |  6 +-
 .../discourse/templates/tags/show.hbs         |  8 +-
 .../javascripts/discourse/templates/topic.hbs | 32 ++++----
 .../discourse/templates/unknown.hbs           |  2 +-
 .../discourse/templates/user-invited-show.hbs | 50 ++++++-------
 .../templates/user-private-messages-tags.hbs  |  6 +-
 .../javascripts/discourse/templates/user.hbs  | 42 +++++------
 .../discourse/templates/user/activity.hbs     | 22 +++---
 .../discourse/templates/user/bookmarks.hbs    |  2 +-
 .../discourse/templates/user/messages.hbs     | 32 ++++----
 .../templates/user/notifications-index.hbs    |  6 +-
 .../templates/user/notifications.hbs          | 32 ++++----
 .../templates/user/profile-hidden.hbs         |  2 +-
 .../discourse/templates/user/stream.hbs       |  2 +-
 .../discourse/templates/user/summary.hbs      | 32 ++++----
 .../javascripts/discourse/templates/users.hbs | 12 +--
 .../multi-select/selected-category.hbs        |  2 +-
 .../wizard/templates/application.hbs          |  8 +-
 .../templates/components/invite-list-user.hbs |  4 +-
 .../templates/components/invite-list.hbs      |  2 +-
 .../templates/components/radio-button.hbs     |  8 +-
 .../templates/components/staff-count.hbs      |  2 +-
 .../components/wizard-field-image.hbs         |  2 +-
 .../templates/components/wizard-field.hbs     |  8 +-
 .../templates/components/wizard-step.hbs      | 28 +++----
 332 files changed, 1788 insertions(+), 1789 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index b4d322875e..1150803258 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -43,7 +43,7 @@ module.exports = {
     "no-unnecessary-concat": true,
     "no-unnecessary-component-helper": true,
     "no-unused-block-params": true,
-    "quotes": false,
+    quotes: "double",
     "require-button-type": false,
     "require-iframe-title": true,
     "require-valid-alt-text": false,
diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index dacf526c53..bcbe6940d4 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -3,35 +3,35 @@
     <div class="full-width">
       <div class="admin-main-nav">
         <ul class="nav nav-pills">
-          {{nav-item route='admin.dashboard' label='admin.dashboard.title'}}
+          {{nav-item route="admin.dashboard" label="admin.dashboard.title"}}
           {{#if currentUser.admin}}
-            {{nav-item route='adminSiteSettings' label='admin.site_settings.title'}}
+            {{nav-item route="adminSiteSettings" label="admin.site_settings.title"}}
           {{/if}}
-          {{nav-item route='adminUsersList' label='admin.users.title'}}
+          {{nav-item route="adminUsersList" label="admin.users.title"}}
           {{#if showGroups}}
-            {{nav-item route='groups' label='admin.groups.title'}}
+            {{nav-item route="groups" label="admin.groups.title"}}
           {{/if}}
           {{#if showBadges}}
-            {{nav-item route='adminBadges' label='admin.badges.title'}}
+            {{nav-item route="adminBadges" label="admin.badges.title"}}
           {{/if}}
           {{#if currentUser.admin}}
-            {{nav-item route='adminEmail' label='admin.email.title'}}
+            {{nav-item route="adminEmail" label="admin.email.title"}}
           {{/if}}
-          {{nav-item route='adminLogs' label='admin.logs.title'}}
+          {{nav-item route="adminLogs" label="admin.logs.title"}}
           {{#if currentUser.admin}}
-            {{nav-item route='adminCustomize' label='admin.customize.title'}}
-            {{nav-item route='adminApi' label='admin.api.title'}}
+            {{nav-item route="adminCustomize" label="admin.customize.title"}}
+            {{nav-item route="adminApi" label="admin.api.title"}}
             {{#if siteSettings.enable_backups}}
-              {{nav-item route='admin.backups' label='admin.backups.title'}}
+              {{nav-item route="admin.backups" label="admin.backups.title"}}
             {{/if}}
           {{/if}}
-          {{nav-item route='adminPlugins' label='admin.plugins.title'}}
+          {{nav-item route="adminPlugins" label="admin.plugins.title"}}
           {{plugin-outlet name="admin-menu" connectorTagName="" tagName=""}}
         </ul>
       </div>
 
-      <div class='boxed white admin-content'>
-        <div class='admin-contents {{adminContentsClassName}}'>
+      <div class="boxed white admin-content">
+        <div class="admin-contents {{adminContentsClassName}}">
           {{outlet}}
         </div>
       </div>
diff --git a/app/assets/javascripts/admin/templates/api-keys-index.hbs b/app/assets/javascripts/admin/templates/api-keys-index.hbs
index 0672b99f4f..ac5dbf7c6b 100644
--- a/app/assets/javascripts/admin/templates/api-keys-index.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys-index.hbs
@@ -18,14 +18,14 @@
       {{#each model as |k|}}
         <tr class={{if k.revoked_at "revoked"}}>
           <td class="key">
-            {{#if k.revoked_at}}{{d-icon 'times-circle'}}{{/if}}
+            {{#if k.revoked_at}}{{d-icon "times-circle"}}{{/if}}
             {{k.truncatedKey}}
           </td>
           <td class="key-description">
             {{k.shortDescription}}
           </td>
           <td class="key-user">
-            <div class="label">{{i18n 'admin.api.user'}}</div>
+            <div class="label">{{i18n "admin.api.user"}}</div>
             {{#if k.user}}
               {{#link-to "adminUser" k.user}}
                 {{avatar k.user imageSize="small"}}
@@ -35,11 +35,11 @@
             {{/if}}
           </td>
           <td class="key-created">
-            <div class="label">{{i18n 'admin.api.created'}}</div>
+            <div class="label">{{i18n "admin.api.created"}}</div>
             {{format-date k.created_at}}
           </td>
           <td class="key-last-used">
-            <div class="label">{{i18n 'admin.api.last_used'}}</div>
+            <div class="label">{{i18n "admin.api.last_used"}}</div>
             {{#if k.last_used_at}}
               {{format-date k.last_used_at}}
             {{else}}
diff --git a/app/assets/javascripts/admin/templates/api-keys-new.hbs b/app/assets/javascripts/admin/templates/api-keys-new.hbs
index 3dac84dae2..d48da805e5 100644
--- a/app/assets/javascripts/admin/templates/api-keys-new.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys-new.hbs
@@ -1,6 +1,6 @@
-{{#link-to 'adminApiKeys.index' class="go-back"}}
-  {{d-icon 'arrow-left'}}
-  {{i18n 'admin.api.all_api_keys'}}
+{{#link-to "adminApiKeys.index" class="go-back"}}
+  {{d-icon "arrow-left"}}
+  {{i18n "admin.api.all_api_keys"}}
 {{/link-to}}
 
 <div class="api-key">
diff --git a/app/assets/javascripts/admin/templates/api-keys-show.hbs b/app/assets/javascripts/admin/templates/api-keys-show.hbs
index 736a4ef777..d1d35da017 100644
--- a/app/assets/javascripts/admin/templates/api-keys-show.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys-show.hbs
@@ -1,11 +1,11 @@
-{{#link-to 'adminApiKeys.index' class="go-back"}}
-  {{d-icon 'arrow-left'}}
-  {{i18n 'admin.api.all_api_keys'}}
+{{#link-to "adminApiKeys.index" class="go-back"}}
+  {{d-icon "arrow-left"}}
+  {{i18n "admin.api.all_api_keys"}}
 {{/link-to}}
 
 <div class="api-key">
   {{#admin-form-row label="admin.api.key"}}
-    {{#if model.revoked_at}}{{d-icon 'times-circle'}}{{/if}}
+    {{#if model.revoked_at}}{{d-icon "times-circle"}}{{/if}}
     {{model.truncatedKey}}
   {{/admin-form-row}}
 
@@ -18,7 +18,7 @@
       </span>
     {{/if}}
 
-    <div class='controls'>
+    <div class="controls">
       {{#if editingDescription}}
         {{d-button class="ok" action=(action "saveDescription") icon="check"}}
         {{d-button class="cancel" action=(action "editDescription") icon="times"}}
@@ -58,7 +58,7 @@
     {{#if model.revoked_at}}
       {{format-date model.revoked_at leaveAgo="true"}}
     {{/if}}
-    <div class='controls'>
+    <div class="controls">
       {{#if model.revoked_at}}
         {{d-button
           action=(action "undoRevokeKey")
diff --git a/app/assets/javascripts/admin/templates/api.hbs b/app/assets/javascripts/admin/templates/api.hbs
index 45bfbd9ca7..288bbc71fe 100644
--- a/app/assets/javascripts/admin/templates/api.hbs
+++ b/app/assets/javascripts/admin/templates/api.hbs
@@ -1,6 +1,6 @@
 {{#admin-nav}}
-  {{nav-item route='adminApiKeys' label='admin.api.title'}}
-  {{nav-item route='adminWebHooks' label='admin.web_hooks.title'}}
+  {{nav-item route="adminApiKeys" label="admin.api.title"}}
+  {{nav-item route="adminWebHooks" label="admin.web_hooks.title"}}
 {{/admin-nav}}
 
 <div class="admin-container">
diff --git a/app/assets/javascripts/admin/templates/backups.hbs b/app/assets/javascripts/admin/templates/backups.hbs
index c8d72599e8..23fb6dc458 100644
--- a/app/assets/javascripts/admin/templates/backups.hbs
+++ b/app/assets/javascripts/admin/templates/backups.hbs
@@ -1,9 +1,9 @@
-<div class='admin-backups'>
+<div class="admin-backups">
   <div class="admin-controls">
     <nav>
       <ul class="nav nav-pills">
-        {{nav-item route='admin.backups.index' label='admin.backups.menu.backups'}}
-        {{nav-item route='admin.backups.logs' label='admin.backups.menu.logs'}}
+        {{nav-item route="admin.backups.index" label="admin.backups.menu.backups"}}
+        {{nav-item route="admin.backups.logs" label="admin.backups.menu.logs"}}
         {{plugin-outlet name="downloader" tagName=""}}
         <div class="admin-actions">
           {{#if model.canRollback}}
diff --git a/app/assets/javascripts/admin/templates/badges-award.hbs b/app/assets/javascripts/admin/templates/badges-award.hbs
index d0082dc349..bb6c4bf22e 100644
--- a/app/assets/javascripts/admin/templates/badges-award.hbs
+++ b/app/assets/javascripts/admin/templates/badges-award.hbs
@@ -1,39 +1,39 @@
 {{#d-section class="award-badge"}}
-  <h1>{{i18n 'admin.badges.mass_award.title'}}</h1>
-  <p>{{i18n 'admin.badges.mass_award.description'}}</p>
+  <h1>{{i18n "admin.badges.mass_award.title"}}</h1>
+  <p>{{i18n "admin.badges.mass_award.description"}}</p>
 
   {{#if model}}
     <form class="form-horizontal">
-      <div class='badge-preview'>
+      <div class="badge-preview">
         {{#if model}}
           {{icon-or-image model}}
           <span class="badge-display-name">{{model.name}}</span>
         {{else}}
-          <span class='badge-placeholder'>{{i18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+          <span class="badge-placeholder">{{i18n "admin.badges.mass_award.no_badge_selected"}}</span>
         {{/if}}
       </div>
       <div>
-        <h4>{{i18n 'admin.badges.mass_award.upload_csv'}}</h4>
-        <input type='file' id='massAwardCSVUpload' accept='.csv'>
+        <h4>{{i18n "admin.badges.mass_award.upload_csv"}}</h4>
+        <input type="file" id="massAwardCSVUpload" accept=".csv">
       </div>
       <div>
         <label>
           {{input type="checkbox" checked=replaceBadgeOwners}}
-          {{i18n 'admin.badges.mass_award.replace_owners'}}
+          {{i18n "admin.badges.mass_award.replace_owners"}}
         </label>
       </div>
       {{d-button
           class="btn-primary"
-          action=(action 'massAward')
+          action=(action "massAward")
           type="submit"
           disabled=saving
           label="admin.badges.mass_award.perform"}}
-      {{#link-to 'adminBadges.index' class="btn btn-danger"}}
+      {{#link-to "adminBadges.index" class="btn btn-danger"}}
         {{d-icon "times"}}
-        <span>{{i18n 'cancel'}}</span>
+        <span>{{i18n "cancel"}}</span>
       {{/link-to}}
     </form>
   {{else}}
-    <span class='badge-required'>{{i18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+    <span class="badge-required">{{i18n "admin.badges.mass_award.no_badge_selected"}}</span>
   {{/if}}
 {{/d-section}}
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index 49c5945ea1..f2b2efeaef 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -2,7 +2,7 @@
   <div class="badge-intro admin-intro">
     <img src={{badgeIntroEmoji}} class="badge-intro-emoji">
     <div class="content-wrapper">
-      <h1>{{i18n 'admin.badges.badge_intro.title'}}</h1>
+      <h1>{{i18n "admin.badges.badge_intro.title"}}</h1>
       <div class="external-resources">
         {{#each badgeIntroLinks as |link|}}
           <a href={{link.href}} class="external-link" target="_blank" rel="noopener">
diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs
index f3935c4f2f..c121df1cc4 100644
--- a/app/assets/javascripts/admin/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/templates/badges-show.hbs
@@ -1,7 +1,7 @@
 {{#d-section class="current-badge content-body"}}
   <form class="form-horizontal">
     <div>
-      <label for="name">{{i18n 'admin.badges.name'}}</label>
+      <label for="name">{{i18n "admin.badges.name"}}</label>
       {{#if readOnly}}
         {{input type="text" name="name" value=buffered.name disabled=true}}
       {{else}}
@@ -10,7 +10,7 @@
     </div>
 
     <div>
-      <label for="icon">{{i18n 'admin.badges.icon'}}</label>
+      <label for="icon">{{i18n "admin.badges.icon"}}</label>
       {{icon-picker
         name="icon"
         value=buffered.icon
@@ -20,17 +20,17 @@
         onChange=(action (mut buffered.icon))
       }}
 
-      <p class='help'>{{i18n 'admin.badges.icon_help'}}</p>
+      <p class="help">{{i18n "admin.badges.icon_help"}}</p>
     </div>
 
     <div>
-      <label for="image">{{i18n 'admin.badges.image'}}</label>
+      <label for="image">{{i18n "admin.badges.image"}}</label>
       {{input type="text" name="image" value=buffered.image}}
-      <p class='help'>{{i18n 'admin.badges.image_help'}}</p>
+      <p class="help">{{i18n "admin.badges.image_help"}}</p>
     </div>
 
     <div>
-      <label for="badge_type_id">{{i18n 'admin.badges.badge_type'}}</label>
+      <label for="badge_type_id">{{i18n "admin.badges.badge_type"}}</label>
       {{combo-box
         name="badge_type_id"
         value=buffered.badge_type_id
@@ -41,7 +41,7 @@
     </div>
 
     <div>
-      <label for="badge_grouping_id">{{i18n 'admin.badges.badge_grouping'}}</label>
+      <label for="badge_grouping_id">{{i18n "admin.badges.badge_grouping"}}</label>
 
       <div class="badge-grouping-control">
         {{combo-box
@@ -61,7 +61,7 @@
     </div>
 
     <div>
-      <label for="description">{{i18n 'admin.badges.description'}}</label>
+      <label for="description">{{i18n "admin.badges.description"}}</label>
       {{#if buffered.system}}
         {{textarea name="description" value=buffered.description disabled=true}}
       {{else}}
@@ -70,7 +70,7 @@
     </div>
 
     <div>
-      <label for="long_description">{{i18n 'admin.badges.long_description'}}</label>
+      <label for="long_description">{{i18n "admin.badges.long_description"}}</label>
       {{#if buffered.system}}
         {{textarea name="long_description" value=buffered.long_description disabled=true}}
       {{else}}
@@ -80,34 +80,34 @@
 
     {{#if siteSettings.enable_badge_sql}}
       <div>
-        <label for="query">{{i18n 'admin.badges.query'}}</label>
+        <label for="query">{{i18n "admin.badges.query"}}</label>
         {{ace-editor content=buffered.query mode="sql" disabled=readOnly}}
       </div>
 
       {{#if hasQuery}}
-        <a href {{action "preview" buffered "false"}}>{{i18n 'admin.badges.preview.link_text'}}</a>
+        <a href {{action "preview" buffered "false"}}>{{i18n "admin.badges.preview.link_text"}}</a>
         |
-        <a href {{action "preview" buffered "true"}}>{{i18n 'admin.badges.preview.plan_text'}}</a>
+        <a href {{action "preview" buffered "true"}}>{{i18n "admin.badges.preview.plan_text"}}</a>
         {{#if preview_loading}}
-          {{i18n 'loading'}}...
+          {{i18n "loading"}}...
         {{/if}}
 
         <div>
           <label>
             {{input type="checkbox" checked=buffered.auto_revoke disabled=readOnly}}
-            {{i18n 'admin.badges.auto_revoke'}}
+            {{i18n "admin.badges.auto_revoke"}}
           </label>
         </div>
 
         <div>
           <label>
             {{input type="checkbox" checked=buffered.target_posts disabled=readOnly}}
-            {{i18n 'admin.badges.target_posts'}}
+            {{i18n "admin.badges.target_posts"}}
           </label>
         </div>
 
         <div>
-          <label for="trigger">{{i18n 'admin.badges.trigger'}}</label>
+          <label for="trigger">{{i18n "admin.badges.trigger"}}</label>
           {{combo-box
             name="trigger"
             value=buffered.trigger
@@ -122,46 +122,46 @@
     <div>
       <label>
         {{input type="checkbox" checked=buffered.allow_title}}
-        {{i18n 'admin.badges.allow_title'}}
+        {{i18n "admin.badges.allow_title"}}
       </label>
     </div>
 
     <div>
       <label>
         {{input type="checkbox" checked=buffered.multiple_grant disabled=readOnly}}
-        {{i18n 'admin.badges.multiple_grant'}}
+        {{i18n "admin.badges.multiple_grant"}}
       </label>
     </div>
 
     <div>
       <label>
         {{input type="checkbox" checked=buffered.listable disabled=readOnly}}
-        {{i18n 'admin.badges.listable'}}
+        {{i18n "admin.badges.listable"}}
       </label>
     </div>
 
     <div>
       <label>
         {{input type="checkbox" checked=buffered.show_posts disabled=readOnly}}
-        {{i18n 'admin.badges.show_posts'}}
+        {{i18n "admin.badges.show_posts"}}
       </label>
     </div>
 
     <div>
       <label>
         {{input type="checkbox" checked=buffered.enabled}}
-        {{i18n 'admin.badges.enabled'}}
+        {{i18n "admin.badges.enabled"}}
       </label>
     </div>
 
-    <div class='buttons'>
+    <div class="buttons">
       {{d-button
         class="btn-primary"
         action=(action "save")
         type="submit"
         disabled=saving
         label="admin.badges.save"}}
-      <span class='saving'>{{savingStatus}}</span>
+      <span class="saving">{{savingStatus}}</span>
       {{#unless readOnly}}
         {{d-button
           action=(action "destroy")
@@ -176,7 +176,7 @@
 {{#if grant_count}}
   <div class="content-body current-badge-actions">
     <div>
-      {{#link-to 'badges.show' this}}{{i18n 'badges.granted' count=grant_count}}{{/link-to}}
+      {{#link-to "badges.show" this}}{{i18n "badges.granted" count=grant_count}}{{/link-to}}
     </div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/badges.hbs b/app/assets/javascripts/admin/templates/badges.hbs
index f5ff6c7a0d..82d77418d3 100644
--- a/app/assets/javascripts/admin/templates/badges.hbs
+++ b/app/assets/javascripts/admin/templates/badges.hbs
@@ -1,26 +1,26 @@
 <div class="badges">
   <div class="badges-header">
-    <h3 class="badges-heading">{{i18n 'admin.badges.title'}}</h3>
+    <h3 class="badges-heading">{{i18n "admin.badges.title"}}</h3>
     <div class="create-new-badge">
-      {{#link-to 'adminBadges.show' 'new' class="btn btn-primary"}}
+      {{#link-to "adminBadges.show" "new" class="btn btn-primary"}}
         {{d-icon "plus"}}
-        <span>{{i18n 'admin.badges.new'}}</span>
+        <span>{{i18n "admin.badges.new"}}</span>
       {{/link-to}}
 
-      {{#link-to 'adminBadges.award' 'new' class="btn"}}
+      {{#link-to "adminBadges.award" "new" class="btn"}}
         {{d-icon "upload"}}
-        <span>{{i18n 'admin.badges.mass_award.title'}}</span>
+        <span>{{i18n "admin.badges.mass_award.title"}}</span>
       {{/link-to}}
     </div>
   </div>
-  <div class='content-list'>
+  <div class="content-list">
     <ul class="admin-badge-list">
       {{#each model as |badge|}}
         <li class="admin-badge-list-item">
           {{#link-to selectedRoute badge.id}}
             {{badge-button badge=badge}}
             {{#if badge.newBadge}}
-              <span class="list-badge">{{i18n 'filters.new.lower_title'}}</span>
+              <span class="list-badge">{{i18n "filters.new.lower_title"}}</span>
             {{/if}}
           {{/link-to}}
         </li>
diff --git a/app/assets/javascripts/admin/templates/components/ace-editor.hbs b/app/assets/javascripts/admin/templates/components/ace-editor.hbs
index c837b2b34e..b5e30e5323 100644
--- a/app/assets/javascripts/admin/templates/components/ace-editor.hbs
+++ b/app/assets/javascripts/admin/templates/components/ace-editor.hbs
@@ -1 +1 @@
-<div class='ace'>{{content}}</div>
+<div class="ace">{{content}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-editable-field.hbs b/app/assets/javascripts/admin/templates/components/admin-editable-field.hbs
index 05250286a8..7377a782b9 100644
--- a/app/assets/javascripts/admin/templates/components/admin-editable-field.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-editable-field.hbs
@@ -1,5 +1,5 @@
-<div class='field'>{{i18n name}}</div>
-<div class='value'>
+<div class="field">{{i18n name}}</div>
+<div class="value">
   {{#if editing}}
     {{text-field value=buffer autofocus="autofocus" autocomplete="discourse"}}
   {{else}}
@@ -8,10 +8,10 @@
     </a>
   {{/if}}
 </div>
-<div class='controls'>
+<div class="controls">
   {{#if editing}}
     {{d-button class="btn-default" action=(action "save") label="admin.user_fields.save"}}
-    <a href {{action "edit"}}>{{i18n 'cancel'}}</a>
+    <a href {{action "edit"}}>{{i18n "cancel"}}</a>
   {{else}}
     {{d-button class="btn-default" action=(action "edit") icon="pencil-alt"}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-form-row.hbs b/app/assets/javascripts/admin/templates/components/admin-form-row.hbs
index aee95b6701..4d1163f95e 100644
--- a/app/assets/javascripts/admin/templates/components/admin-form-row.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-form-row.hbs
@@ -1,11 +1,11 @@
-<div class='form-element label-area'>
+<div class="form-element label-area">
   {{#if label}}
     <label>{{i18n label}}</label>
   {{else}}
     &nbsp;
   {{/if}}
 </div>
-<div class='form-element input-area'>
+<div class="form-element input-area">
   {{#if wrapLabel}}
     <label>{{yield}}</label>
   {{else}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-nav.hbs b/app/assets/javascripts/admin/templates/components/admin-nav.hbs
index eb705949e5..24ea6ca9b9 100644
--- a/app/assets/javascripts/admin/templates/components/admin-nav.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-nav.hbs
@@ -1,4 +1,4 @@
-<div class='admin-controls'>
+<div class="admin-controls">
   <nav>
     <ul class="nav nav-pills">
       {{yield}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
index 246d23be25..9a8986e9e6 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs
@@ -1,7 +1,7 @@
 {{#if showBackupStats}}
   <div class="backups">
     <h3 class="storage-stats-title">
-      <a href={{get-url '/admin/backups'}}>{{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}</a>
+      <a href={{get-url "/admin/backups"}}>{{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}</a>
     </h3>
     <p>
       {{#if backupStats.free_bytes}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
index 8188fb3abd..dca6767298 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
@@ -25,7 +25,7 @@
     {{#if showTotalForSample}}
       <tr class="total-row">
         <td colspan={{totalsForSample.length}}>
-          {{i18n 'admin.dashboard.reports.totals_for_sample'}}
+          {{i18n "admin.dashboard.reports.totals_for_sample"}}
         </td>
       </tr>
       <tr class="admin-report-table-row">
@@ -40,7 +40,7 @@
     {{#if showTotal}}
       <tr class="total-row">
         <td colspan="2">
-          {{i18n 'admin.dashboard.reports.total'}}
+          {{i18n "admin.dashboard.reports.total"}}
         </td>
       </tr>
       <tr class="admin-report-table-row">
@@ -52,7 +52,7 @@
     {{#if showAverage}}
       <tr class="total-row">
         <td colspan="2">
-          {{i18n 'admin.dashboard.reports.average_for_sample'}}
+          {{i18n "admin.dashboard.reports.average_for_sample"}}
         </td>
       </tr>
       <tr class="admin-report-table-row">
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs b/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs
index 3db7af1daa..ddd2282a16 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs
@@ -1,6 +1,6 @@
 <td class="title">{{report.title}}</td>
-<td class="value">{{#link-to 'adminUsersList.show' 'newuser'}}{{number (value-at-tl report.data level="0")}}{{/link-to}}</td>
-<td class="value">{{#link-to 'adminUsersList.show' 'basic'}}{{number (value-at-tl report.data level="1")}}{{/link-to}}</td>
-<td class="value">{{#link-to 'adminUsersList.show' 'member'}}{{number (value-at-tl report.data level="2")}}{{/link-to}}</td>
-<td class="value">{{#link-to 'adminUsersList.show' 'regular'}}{{number (value-at-tl report.data level="3")}}{{/link-to}}</td>
-<td class="value">{{#link-to 'adminUsersList.show' 'leader'}}{{number (value-at-tl report.data level="4")}}{{/link-to}}</td>
+<td class="value">{{#link-to "adminUsersList.show" "newuser"}}{{number (value-at-tl report.data level="0")}}{{/link-to}}</td>
+<td class="value">{{#link-to "adminUsersList.show" "basic"}}{{number (value-at-tl report.data level="1")}}{{/link-to}}</td>
+<td class="value">{{#link-to "adminUsersList.show" "member"}}{{number (value-at-tl report.data level="2")}}{{/link-to}}</td>
+<td class="value">{{#link-to "adminUsersList.show" "regular"}}{{number (value-at-tl report.data level="3")}}{{/link-to}}</td>
+<td class="value">{{#link-to "adminUsersList.show" "leader"}}{{number (value-at-tl report.data level="4")}}{{/link-to}}</td>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index 15d7314622..eeb7894099 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -132,7 +132,7 @@
           {{#if showDatesOptions}}
             <div class="control">
               <span class="label">
-                {{i18n 'admin.dashboard.reports.start_date'}}
+                {{i18n "admin.dashboard.reports.start_date"}}
               </span>
 
               <div class="input">
@@ -145,7 +145,7 @@
 
             <div class="control">
               <span class="label">
-                {{i18n 'admin.dashboard.reports.end_date'}}
+                {{i18n "admin.dashboard.reports.end_date"}}
               </span>
 
               <div class="input">
diff --git a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
index 3f9e09eec8..3ebd8f2c86 100644
--- a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
@@ -1,6 +1,6 @@
-<div class='edit-main-nav admin-controls'>
+<div class="edit-main-nav admin-controls">
   <nav>
-    <ul class='nav nav-pills target'>
+    <ul class="nav nav-pills target">
       {{#each visibleTargets as |target|}}
         <li>
           {{#link-to editRouteName
@@ -9,11 +9,11 @@
             fieldName
             replace=true
             title=field.title
-            class=(if target.edited 'edited' 'blank')
+            class=(if target.edited "edited" "blank")
           }}
-            {{#if target.error}}{{d-icon 'exclamation-triangle'}}{{/if}}
+            {{#if target.error}}{{d-icon "exclamation-triangle"}}{{/if}}
             {{#if target.icon}}{{d-icon target.icon}}{{/if}}
-            {{i18n (concat 'admin.customize.theme.' target.name)}}
+            {{i18n (concat "admin.customize.theme." target.name)}}
           {{/link-to}}
         </li>
       {{/each}}
@@ -21,9 +21,9 @@
       {{#if allowAdvanced}}
         <li>
           <a {{action "toggleShowAdvanced"}}
-            class='no-text'
             href
-            title={{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}>
+            title={{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}
+            class="no-text">
             {{d-icon (if showAdvanced "angle-double-left" "angle-double-right")}}
           </a>
         </li>
@@ -32,16 +32,16 @@
       <li>
         <label>
           {{input type="checkbox" checked=onlyOverridden click=(action "onlyOverriddenChanged" value="target.checked")}}
-          {{i18n 'admin.customize.theme.hide_unused_fields'}}
+          {{i18n "admin.customize.theme.hide_unused_fields"}}
         </label>
       </li>
     </ul>
   </nav>
 </div>
 
-<div class='admin-controls'>
+<div class="admin-controls">
   <nav>
-    <ul class='nav nav-pills fields'>
+    <ul class="nav nav-pills fields">
       {{#each visibleFields as |field|}}
         <li>
           {{#link-to editRouteName
@@ -50,9 +50,9 @@
             field.name
             replace=true
             title=field.title
-            class=(if field.edited 'edited' 'blank')
+            class=(if field.edited "edited" "blank")
           }}
-            {{#if field.error}}{{d-icon 'exclamation-triangle'}}{{/if}}
+            {{#if field.error}}{{d-icon "exclamation-triangle"}}{{/if}}
             {{#if field.icon}}{{d-icon field.icon}}{{/if}}
             {{field.translatedName}}
           {{/link-to}}
@@ -62,7 +62,7 @@
       {{#if showAddField}}
         <li>
           {{#if addingField}}
-            {{input type=text value=newFieldName enter=(action 'addField') escape-press=(action "cancelAddField")}}
+            {{input type=text value=newFieldName enter=(action "addField") escape-press=(action "cancelAddField")}}
             {{d-button class="ok" action=(action "addField" newFieldName) icon="check"}}
             {{d-button class="cancel" action=(action "cancelAddField") icon="times"}}
           {{else}}
@@ -73,7 +73,7 @@
         </li>
       {{/if}}
 
-      <li class='spacer'></li>
+      <li class="spacer"></li>
       <li>
         <a href {{action "toggleMaximize"}} class="no-text">
           {{d-icon maximizeIcon}}
@@ -84,7 +84,7 @@
 </div>
 
 {{#if error}}
-  <pre class='field-error'>{{error}}</pre>
+  <pre class="field-error">{{error}}</pre>
 {{/if}}
 
 {{ace-editor content=activeSection editorId=editorId mode=activeSectionMode autofocus="true"}}
diff --git a/app/assets/javascripts/admin/templates/components/dashboard-problems.hbs b/app/assets/javascripts/admin/templates/components/dashboard-problems.hbs
index cb8311a4e3..1160a25213 100644
--- a/app/assets/javascripts/admin/templates/components/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/templates/components/dashboard-problems.hbs
@@ -3,7 +3,7 @@
     <div class="section-title">
       <h2>
         {{d-icon "heart"}}
-        {{i18n 'admin.dashboard.problems_found'}}
+        {{i18n "admin.dashboard.problems_found"}}
       </h2>
     </div>
 
@@ -19,7 +19,7 @@
 
         <p class="actions">
           {{d-button action=refreshProblems class="btn-default" icon="sync" label="admin.dashboard.refresh_problems"}}
-          {{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}
+          {{i18n "admin.dashboard.last_checked"}}: {{problemsTimestamp}}
         </p>
       {{/conditional-loading-section}}
     </div>
diff --git a/app/assets/javascripts/admin/templates/components/email-styles-editor.hbs b/app/assets/javascripts/admin/templates/components/email-styles-editor.hbs
index e03feb7cb7..742c71a5b3 100644
--- a/app/assets/javascripts/admin/templates/components/email-styles-editor.hbs
+++ b/app/assets/javascripts/admin/templates/components/email-styles-editor.hbs
@@ -1,9 +1,9 @@
-<div class='row'>
-  <div class='admin-controls'>
+<div class="row">
+  <div class="admin-controls">
     <nav>
-      <ul class='nav nav-pills'>
-        <li>{{#link-to 'adminCustomizeEmailStyle.edit' 'html' replace=true}}{{i18n 'admin.customize.email_style.html'}}{{/link-to}}</li>
-        <li>{{#link-to 'adminCustomizeEmailStyle.edit' 'css' replace=true}}{{i18n 'admin.customize.email_style.css'}}{{/link-to}}</li>
+      <ul class="nav nav-pills">
+        <li>{{#link-to "adminCustomizeEmailStyle.edit" "html" replace=true}}{{i18n "admin.customize.email_style.html"}}{{/link-to}}</li>
+        <li>{{#link-to "adminCustomizeEmailStyle.edit" "css" replace=true}}{{i18n "admin.customize.email_style.css"}}{{/link-to}}</li>
       </ul>
     </nav>
   </div>
@@ -11,10 +11,10 @@
 
 {{ace-editor content=editorContents mode=currentEditorMode editorId=editorId}}
 
-<div class='admin-footer'>
-  <div class='buttons'>
-    {{#d-button action=(action "reset") disabled=resetDisabled class='btn-default'}}
-      {{i18n 'admin.customize.email_style.reset'}}
+<div class="admin-footer">
+  <div class="buttons">
+    {{#d-button action=(action "reset") disabled=resetDisabled class="btn-default"}}
+      {{i18n "admin.customize.email_style.reset"}}
     {{/d-button}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
index 393cf15165..9c418be5eb 100644
--- a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
@@ -30,6 +30,6 @@
   <td><div class="label">{{i18n "admin.embedding.category"}}</div>{{category-badge host.category}}</td>
   <td class="controls">
     {{d-button icon="pencil-alt" action=(action "edit")}}
-    {{d-button icon="far-trash-alt" action=(action "delete") class='btn-danger'}}
+    {{d-button icon="far-trash-alt" action=(action "delete") class="btn-danger"}}
   </td>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/embedding-setting.hbs b/app/assets/javascripts/admin/templates/components/embedding-setting.hbs
index eb63c40af9..5ac27a9981 100644
--- a/app/assets/javascripts/admin/templates/components/embedding-setting.hbs
+++ b/app/assets/javascripts/admin/templates/components/embedding-setting.hbs
@@ -8,4 +8,4 @@
   {{input value=value id=inputId placeholder=placeholder}}
 {{/if}}
 
-<div class='clearfix'></div>
+<div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/components/flag-user-lists.hbs b/app/assets/javascripts/admin/templates/components/flag-user-lists.hbs
index 62224b13c1..78b30290ee 100644
--- a/app/assets/javascripts/admin/templates/components/flag-user-lists.hbs
+++ b/app/assets/javascripts/admin/templates/components/flag-user-lists.hbs
@@ -1,11 +1,11 @@
-<div class='flagged-by'>
-  <div class='user-list-title'>
+<div class="flagged-by">
+  <div class="user-list-title">
     {{i18n "admin.flags.flagged_by"}}
   </div>
-  <div class='flag-users'>
+  <div class="flag-users">
     {{#each flaggedPost.post_actions as |postAction|}}
       {{#flag-user user=postAction.user date=postAction.created_at}}
-        <div class='flagger-flag-type'>
+        <div class="flagger-flag-type">
           {{post-action-title postAction.post_action_type_id postAction.name_key}}
         </div>
         {{user-flag-percentage
@@ -18,11 +18,11 @@
 </div>
 
 {{#if showResolvedBy}}
-  <div class='flagged-post-resolved-by'>
-    <div class='user-list-title'>
+  <div class="flagged-post-resolved-by">
+    <div class="user-list-title">
       {{i18n "admin.flags.resolved_by"}}
     </div>
-    <div class='flag-users'>
+    <div class="flag-users">
       {{#each flaggedPost.post_actions as |postAction|}}
         {{#flag-user user=postAction.disposed_by date=postAction.disposed_at}}
           {{disposition-icon postAction.disposition}}
diff --git a/app/assets/javascripts/admin/templates/components/flag-user.hbs b/app/assets/javascripts/admin/templates/components/flag-user.hbs
index a6a4ce0f95..0662859c2d 100644
--- a/app/assets/javascripts/admin/templates/components/flag-user.hbs
+++ b/app/assets/javascripts/admin/templates/components/flag-user.hbs
@@ -1,17 +1,17 @@
-<div class='flag-user'>
-  {{#link-to 'adminUser' user.id user.username class='flag-user-avatar'}}
+<div class="flag-user">
+  {{#link-to "adminUser" user.id user.username class="flag-user-avatar"}}
     {{avatar user imageSize="small"}}
   {{/link-to}}
-  <div class='flag-user-details'>
-    <div class='flag-user-who'>
-      {{#link-to 'adminUser' user.id user.username class="flag-user-username"}}
+  <div class="flag-user-details">
+    <div class="flag-user-who">
+      {{#link-to "adminUser" user.id user.username class="flag-user-username"}}
         {{user.username}}
       {{/link-to}}
-      <div class='flag-user-date' title={{raw-date date}}>
+      <div title={{raw-date date}} class="flag-user-date">
         {{format-age date}}
       </div>
     </div>
-    <div class='flag-user-extra'>
+    <div class="flag-user-extra">
       {{yield}}
     </div>
   </div>
diff --git a/app/assets/javascripts/admin/templates/components/inline-edit-checkbox.hbs b/app/assets/javascripts/admin/templates/components/inline-edit-checkbox.hbs
index 7c8e0f280e..015cd13ad0 100644
--- a/app/assets/javascripts/admin/templates/components/inline-edit-checkbox.hbs
+++ b/app/assets/javascripts/admin/templates/components/inline-edit-checkbox.hbs
@@ -1,4 +1,4 @@
-<label class='checkbox-label'>
+<label class="checkbox-label">
   {{input type="checkbox" disabled=disabled checked=checkedInternal}}
   {{label}}
 </label>
diff --git a/app/assets/javascripts/admin/templates/components/install-theme-item.hbs b/app/assets/javascripts/admin/templates/components/install-theme-item.hbs
index 2697ffe8b9..a44f6837aa 100644
--- a/app/assets/javascripts/admin/templates/components/install-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/install-theme-item.hbs
@@ -1,8 +1,8 @@
 {{radio-button name="install-items" id=value value=value selection=selection}}
 <label class="radio" for={{value}}>
   {{#if showIcon}}
-    {{d-icon 'plus'}}
+    {{d-icon "plus"}}
   {{/if}}
   {{i18n label}}
 </label>
-{{d-icon 'caret-right'}}
+{{d-icon "caret-right"}}
diff --git a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
index b566df7de6..a796f09057 100644
--- a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
+++ b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs
@@ -1,7 +1,7 @@
-<div class='penalty-post-controls'>
+<div class="penalty-post-controls">
   <label>
-    <div class='penalty-post-label'>
-      {{html-safe (i18n 'admin.user.penalty_post_actions')}}
+    <div class="penalty-post-label">
+      {{html-safe (i18n "admin.user.penalty_post_actions")}}
     </div>
   </label>
   {{combo-box
@@ -12,7 +12,7 @@
 </div>
 
 {{#if editing}}
-  <div class='penalty-post-edit'>
+  <div class="penalty-post-edit">
     {{textarea
       value=postEdit
       class="post-editor"}}
diff --git a/app/assets/javascripts/admin/templates/components/resumable-upload.hbs b/app/assets/javascripts/admin/templates/components/resumable-upload.hbs
index dfa89864b7..9186abcbe5 100644
--- a/app/assets/javascripts/admin/templates/components/resumable-upload.hbs
+++ b/app/assets/javascripts/admin/templates/components/resumable-upload.hbs
@@ -1,3 +1,3 @@
 {{uploadingIcon}}
-<span class='ru-label'>{{text}}</span>
-<span class='ru-progress' style={{progressBar}}></span>
+<span class="ru-label">{{text}}</span>
+<span style={{progressBar}} class="ru-progress"></span>
diff --git a/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs b/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs
index 2be732079e..488c14fb5f 100644
--- a/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs
+++ b/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs
@@ -1,4 +1,4 @@
-<b>{{i18n 'admin.logs.screened_ips.form.label'}}</b>
+<b>{{i18n "admin.logs.screened_ips.form.label"}}</b>
 {{text-field value=ip_address disabled=formSubmitted class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.ip_address" autocorrect="off" autocapitalize="off"}}
 
 {{combo-box
diff --git a/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs b/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs
index 88d59816fe..61683c73b0 100644
--- a/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs
+++ b/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs
@@ -1,4 +1,4 @@
-<div class="validation-error {{unless message 'hidden'}}">
+<div class="validation-error {{unless message "hidden"}}">
   {{d-icon "times"}}
   {{message}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/silence-details.hbs b/app/assets/javascripts/admin/templates/components/silence-details.hbs
index f34559ec3d..c0a37f55bb 100644
--- a/app/assets/javascripts/admin/templates/components/silence-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/silence-details.hbs
@@ -1,7 +1,7 @@
-<div class='reason-controls'>
+<div class="reason-controls">
   <label>
-    <div class='silence-reason-label'>
-      {{html-safe (i18n 'admin.user.silence_reason_label')}}
+    <div class="silence-reason-label">
+      {{html-safe (i18n "admin.user.silence_reason_label")}}
     </div>
   </label>
   {{text-field
@@ -12,7 +12,7 @@
 </div>
 
 <label>
-  <div class='silence-message-label'>
+  <div class="silence-message-label">
     {{i18n "admin.user.silence_message"}}
   </div>
 </label>
diff --git a/app/assets/javascripts/admin/templates/components/site-customization-change-details.hbs b/app/assets/javascripts/admin/templates/components/site-customization-change-details.hbs
index a9ea9cea09..a3358b195b 100644
--- a/app/assets/javascripts/admin/templates/components/site-customization-change-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-customization-change-details.hbs
@@ -1,5 +1,5 @@
 <section class="field">
-  <b>{{i18n 'admin.customize.enabled'}}</b>: {{change.enabled}}
+  <b>{{i18n "admin.customize.enabled"}}</b>: {{change.enabled}}
 </section>
 
 {{site-customization-change-field field=change.stylesheet name="admin.customize.css"}}
diff --git a/app/assets/javascripts/admin/templates/components/site-customization-change-field.hbs b/app/assets/javascripts/admin/templates/components/site-customization-change-field.hbs
index 65fb3b3b66..b11022cb3c 100644
--- a/app/assets/javascripts/admin/templates/components/site-customization-change-field.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-customization-change-field.hbs
@@ -1,6 +1,6 @@
 {{#if field}}
   <section class="field">
-    <b>{{i18n name}}</b>: ({{i18n 'character_count' count=field.length}})
+    <b>{{i18n name}}</b>: ({{i18n "character_count" count=field.length}})
     <br>
     {{textarea value=field class="plain"}}
   </section>
diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs
index 6984723cd6..88f9919692 100644
--- a/app/assets/javascripts/admin/templates/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-setting.hbs
@@ -1,14 +1,14 @@
-<div class='setting-label'>
+<div class="setting-label">
   <h3>{{settingName}}</h3>
   {{#if defaultIsAvailable}}
-    <a href onClick={{action 'setDefaultValues'}}>{{setting.setDefaultValuesLabel}}</a>
+    <a href onClick={{action "setDefaultValues"}}>{{setting.setDefaultValuesLabel}}</a>
   {{/if}}
 </div>
 <div class="setting-value">
   {{component componentName setting=setting value=buffered.value validationMessage=validationMessage preview=preview isSecret=isSecret allowAny=allowAny}}
 </div>
 {{#if dirty}}
-  <div class='setting-controls'>
+  <div class="setting-controls">
     {{d-button class="ok" action=(action "update") icon="check"}}
     {{d-button class="cancel" action=(action "cancel") icon="times"}}
   </div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
index b9609e2843..a551fd9f12 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
@@ -3,5 +3,5 @@
   onChange=(action "onChangeSelectedCategories")
 }}
 
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
index 4358b408de..80a793834e 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category.hbs
@@ -4,4 +4,4 @@
   onChange=(action (mut value))
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
index 1e7e369b93..4d37e15e87 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
@@ -8,4 +8,4 @@
 }}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
index 0b4104086e..265301db6a 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
@@ -14,6 +14,6 @@
 
 {{setting-validation-message message=validationMessage}}
 
-<div class='desc'>
+<div class="desc">
   {{html-safe setting.description}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
index 091573eb53..9ad465c8d4 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs
@@ -7,4 +7,4 @@
   onChange=(action "onChangeGroupListSetting")
 }}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
index 70366aba38..d1486292dd 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_host"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
index 090cc2a5f1..753b9ba987 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value inputDelimiter="|" choices=setting.choices}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
index 7451959841..08b9992e88 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs
@@ -1,3 +1,3 @@
 {{secret-value-list setting=setting values=value isSecret=isSecret}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
index 160f041df9..91106e9bdd 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
@@ -7,4 +7,4 @@
 {{/if}}
 
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
index 1fb69c595b..f7519e770d 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
@@ -1,3 +1,3 @@
 {{tag-chooser tags=selectedTags allowCreate=false}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
index 2758b7be5a..652f773f36 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs
@@ -1,2 +1,2 @@
 {{site-settings-image-uploader imageUrl=value placeholderUrl=setting.placeholder type="site_setting"}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
index 146c9d3722..bf8148800c 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
@@ -1,2 +1,2 @@
 {{d-button label="admin.site_settings.uploaded_image_list.label" action=(action "showUploadModal") actionParam=(hash value=value setting=setting)}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
index 7a6cdc517b..7d22100489 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value addKey="admin.site_settings.add_url"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
index 234ec83f3c..52a0fcc5c9 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
@@ -1,3 +1,3 @@
 {{value-list values=value}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{html-safe setting.description}}</div>
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-text-summary.hbs b/app/assets/javascripts/admin/templates/components/site-text-summary.hbs
index c0c7063309..42323a1834 100644
--- a/app/assets/javascripts/admin/templates/components/site-text-summary.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-text-summary.hbs
@@ -1,5 +1,5 @@
-{{d-button label="admin.site_text.edit" class='btn-default edit' action=editAction actionParam=siteText}}
-<h3 class='site-text-id'>{{siteText.id}}</h3>
-<div class='site-text-value'>{{siteText.value}}</div>
+{{d-button label="admin.site_text.edit" class="btn-default edit" action=editAction actionParam=siteText}}
+<h3 class="site-text-id">{{siteText.id}}</h3>
+<div class="site-text-value">{{siteText.value}}</div>
 
-<div class='clearfix'></div>
+<div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/components/suspension-details.hbs b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
index 70968ae746..b7ed0428d3 100644
--- a/app/assets/javascripts/admin/templates/components/suspension-details.hbs
+++ b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
@@ -1,10 +1,10 @@
-<div class='reason-controls'>
+<div class="reason-controls">
   <label>
-    <div class='suspend-reason-label'>
+    <div class="suspend-reason-label">
       {{#if siteSettings.hide_suspension_reasons}}
-        {{html-safe (i18n 'admin.user.suspend_reason_hidden_label')}}
+        {{html-safe (i18n "admin.user.suspend_reason_hidden_label")}}
       {{else}}
-        {{html-safe (i18n 'admin.user.suspend_reason_label')}}
+        {{html-safe (i18n "admin.user.suspend_reason_label")}}
       {{/if}}
     </div>
   </label>
@@ -15,7 +15,7 @@
 </div>
 
 <label>
-  <div class='suspend-message-label'>
+  <div class="suspend-message-label">
     {{i18n "admin.user.suspend_message"}}
   </div>
 </label>
diff --git a/app/assets/javascripts/admin/templates/components/tags-uploader.hbs b/app/assets/javascripts/admin/templates/components/tags-uploader.hbs
index 62e353810f..1531feb677 100644
--- a/app/assets/javascripts/admin/templates/components/tags-uploader.hbs
+++ b/app/assets/javascripts/admin/templates/components/tags-uploader.hbs
@@ -1,6 +1,6 @@
-<label class="btn {{if addDisabled 'disabled'}}">
+<label class="btn {{if addDisabled "disabled"}}">
   {{d-icon "upload"}}
-  {{i18n 'admin.watched_words.form.upload'}}
+  {{i18n "admin.watched_words.form.upload"}}
   <input class="hidden-upload-field" disabled={{addDisabled}} type="file" accept="text/plain,text/csv">
 </label>
-<span class="instructions">{{i18n 'tagging.upload_instructions'}}</span>
+<span class="instructions">{{i18n "tagging.upload_instructions"}}</span>
diff --git a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
index 0c253e0214..c829fe887d 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs
@@ -1,5 +1,5 @@
 <div class="inner-wrapper">
-  {{plugin-outlet name="admin-customize-themes-list-item" connectorTagName='span' args=(hash theme=theme)}}
+  {{plugin-outlet name="admin-customize-themes-list-item" connectorTagName="span" args=(hash theme=theme)}}
 
   <div class="info">
     <span class="name">
diff --git a/app/assets/javascripts/admin/templates/components/themes-list.hbs b/app/assets/javascripts/admin/templates/components/themes-list.hbs
index 2bfbc8843b..a02fb2f2ce 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list.hbs
@@ -2,13 +2,13 @@
   {{d-button
     action=(action "changeView")
     actionParam=THEMES
-    class=(concat "themes-tab " "tab " (if themesTabActive 'btn-danger active' ''))
+    class=(concat "themes-tab " "tab " (if themesTabActive "btn-danger active" ""))
     label="admin.customize.theme.title"
   }}
   {{d-button
     action=(action "changeView")
     actionParam=COMPONENTS
-    class=(concat "components-tab " "tab " (if componentsTabActive 'btn-danger active' ''))
+    class=(concat "components-tab " "tab " (if componentsTabActive "btn-danger active" ""))
     label="admin.customize.theme.components"
     icon="puzzle-piece"
   }}
diff --git a/app/assets/javascripts/admin/templates/components/value-list.hbs b/app/assets/javascripts/admin/templates/components/value-list.hbs
index a5ade53ee0..853daac745 100644
--- a/app/assets/javascripts/admin/templates/components/value-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/value-list.hbs
@@ -1,7 +1,7 @@
 {{#if collection}}
-  <div class='values'>
+  <div class="values">
     {{#each collection as |value index|}}
-      <div class='value' data-index={{index}}>
+      <div data-index={{index}} class="value">
         {{d-button
           action=(action "removeValue")
           actionParam=value
diff --git a/app/assets/javascripts/admin/templates/components/watched-word-form.hbs b/app/assets/javascripts/admin/templates/components/watched-word-form.hbs
index 13454f21a5..0aa201b602 100644
--- a/app/assets/javascripts/admin/templates/components/watched-word-form.hbs
+++ b/app/assets/javascripts/admin/templates/components/watched-word-form.hbs
@@ -1,4 +1,4 @@
-<b>{{i18n 'admin.watched_words.form.label'}}</b>
+<b>{{i18n "admin.watched_words.form.label"}}</b>
 {{text-field value=word disabled=formSubmitted class="watched-word-input" autocorrect="off" autocapitalize="off" placeholderKey=placeholderKey}}
 {{d-button class="btn-default" action=(action "submit") disabled=formSubmitted label="admin.watched_words.form.add"}}
 
diff --git a/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs b/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs
index 3b9518186a..5d92bcc409 100644
--- a/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs
+++ b/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs
@@ -1,6 +1,6 @@
-<label class="btn btn-default {{if addDisabled 'disabled'}}">
+<label class="btn btn-default {{if addDisabled "disabled"}}">
   {{d-icon "upload"}}
-  {{i18n 'admin.watched_words.form.upload'}}
+  {{i18n "admin.watched_words.form.upload"}}
   <input class="hidden-upload-field" disabled={{addDisabled}} type="file" accept="text/plain">
 </label>
-<span class="instructions">{{i18n 'admin.watched_words.one_word_per_line'}}</span>
+<span class="instructions">{{i18n "admin.watched_words.one_word_per_line"}}</span>
diff --git a/app/assets/javascripts/admin/templates/customize-colors-index.hbs b/app/assets/javascripts/admin/templates/customize-colors-index.hbs
index 62bbb7a8fc..25788d42d4 100644
--- a/app/assets/javascripts/admin/templates/customize-colors-index.hbs
+++ b/app/assets/javascripts/admin/templates/customize-colors-index.hbs
@@ -1 +1 @@
-<p class="about">{{i18n 'admin.customize.colors.about'}}</p>
+<p class="about">{{i18n "admin.customize.colors.about"}}</p>
diff --git a/app/assets/javascripts/admin/templates/customize-colors-show.hbs b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
index 825095909e..b360a1c26b 100644
--- a/app/assets/javascripts/admin/templates/customize-colors-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
@@ -33,16 +33,16 @@
           label="admin.customize.delete"
         }}
       {{/if}}
-      <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
+      <span class="saving {{unless model.savingStatus "hidden"}}">{{model.savingStatus}}</span>
     </div>
 
     <br>
 
-    <div class='admin-controls'>
-      <div class='search controls'>
+    <div class="admin-controls">
+      <div class="search controls">
         <label>
           {{input type="checkbox" checked=onlyOverridden}}
-          {{i18n 'admin.settings.show_overriden'}}
+          {{i18n "admin.settings.show_overriden"}}
         </label>
       </div>
     </div>
@@ -52,13 +52,13 @@
         <thead>
           <tr>
             <th></th>
-            <th class="hex">{{i18n 'admin.customize.color'}}</th>
+            <th class="hex">{{i18n "admin.customize.color"}}</th>
             <th></th>
           </tr>
         </thead>
         <tbody>
           {{#each colors as |c|}}
-            <tr class="{{if c.changed 'changed'}} {{if c.valid 'valid' 'invalid'}}">
+            <tr class="{{if c.changed "changed"}} {{if c.valid "valid" "invalid"}}">
               <td class="name" title={{c.name}}>
                 <h3>{{c.translatedName}}</h3>
                 <p class="description">{{c.description}}</p>
@@ -83,7 +83,7 @@
         </tbody>
       </table>
     {{else}}
-      <p>{{i18n 'search.no_results'}}</p>
+      <p>{{i18n "search.no_results"}}</p>
     {{/if}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/customize-email-style-edit.hbs b/app/assets/javascripts/admin/templates/customize-email-style-edit.hbs
index 1e68fd0c1a..17baf19938 100644
--- a/app/assets/javascripts/admin/templates/customize-email-style-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-email-style-edit.hbs
@@ -1,8 +1,8 @@
 {{email-styles-editor styles=model fieldName=fieldName}}
 
-<div class='admin-footer'>
-  <div class='buttons'>
-    {{#d-button action=(action "save") disabled=saveDisabled class='btn-primary'}}
+<div class="admin-footer">
+  <div class="buttons">
+    {{#d-button action=(action "save") disabled=saveDisabled class="btn-primary"}}
       {{saveButtonText}}
     {{/d-button}}
   </div>
diff --git a/app/assets/javascripts/admin/templates/customize-email-style.hbs b/app/assets/javascripts/admin/templates/customize-email-style.hbs
index d46e732603..2904742035 100644
--- a/app/assets/javascripts/admin/templates/customize-email-style.hbs
+++ b/app/assets/javascripts/admin/templates/customize-email-style.hbs
@@ -1,7 +1,7 @@
-<div class='row'>
-  <h2>{{i18n 'admin.customize.email_style.heading'}}</h2>
+<div class="row">
+  <h2>{{i18n "admin.customize.email_style.heading"}}</h2>
 
-  <p>{{i18n 'admin.customize.email_style.instructions'}}</p>
+  <p>{{i18n "admin.customize.email_style.instructions"}}</p>
 </div>
 
 {{outlet}}
diff --git a/app/assets/javascripts/admin/templates/customize-email-templates-edit.hbs b/app/assets/javascripts/admin/templates/customize-email-templates-edit.hbs
index 4b80de8718..61abefaa72 100644
--- a/app/assets/javascripts/admin/templates/customize-email-templates-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-email-templates-edit.hbs
@@ -1,7 +1,7 @@
-<div class='email-template'>
+<div class="email-template">
   <label>{{i18n "admin.customize.email_templates.subject"}}</label>
   {{#if hasMultipleSubjects}}
-    <h3>{{#link-to 'adminSiteText' (query-params q=hasMultipleSubjects)}}{{i18n "admin.customize.email_templates.multiple_subjects"}}{{/link-to}}</h3>
+    <h3>{{#link-to "adminSiteText" (query-params q=hasMultipleSubjects)}}{{i18n "admin.customize.email_templates.multiple_subjects"}}{{/link-to}}</h3>
   {{else}}
     {{input value=buffered.subject}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
index 5f6d29e953..31ad084c23 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
@@ -1,28 +1,28 @@
-<div class="current-style {{if maximized 'maximized'}}">
-  <div class='wrapper'>
-    <h2>{{i18n 'admin.customize.theme.edit_css_html'}} {{#link-to showRouteName model.id replace=true}}{{model.name}}{{/link-to}}</h2>
+<div class="current-style {{if maximized "maximized"}}">
+  <div class="wrapper">
+    <h2>{{i18n "admin.customize.theme.edit_css_html"}} {{#link-to showRouteName model.id replace=true}}{{model.name}}{{/link-to}}</h2>
 
     {{admin-theme-editor
       theme=model
       editRouteName=editRouteName
       currentTargetName=currentTargetName
       fieldName=fieldName
-      fieldAdded=(action 'fieldAdded')
+      fieldAdded=(action "fieldAdded")
       maximized=maximized
-      onlyOverriddenChanged=(action 'onlyOverriddenChanged')
+      onlyOverriddenChanged=(action "onlyOverriddenChanged")
     }}
 
-    <div class='admin-footer'>
-      <div class='status-actions'>
+    <div class="admin-footer">
+      <div class="status-actions">
         {{#unless model.changed}}
-          <a class='preview-link' href={{previewUrl}} rel="noopener" target='_blank' title={{i18n 'admin.customize.explain_preview'}}>
-            {{i18n 'admin.customize.preview'}}
+          <a href={{previewUrl}} rel="noopener" title={{i18n "admin.customize.explain_preview"}} class="preview-link" target="_blank">
+            {{i18n "admin.customize.preview"}}
           </a>
         {{/unless}}
       </div>
 
-      <div class='buttons'>
-        {{#d-button action=(action "save") disabled=saveDisabled class='btn-primary'}}
+      <div class="buttons">
+        {{#d-button action=(action "save") disabled=saveDisabled class="btn-primary"}}
           {{saveButtonText}}
         {{/d-button}}
       </div>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index ed4dcf0eb1..c391701c15 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -45,7 +45,7 @@
         {{i18n "admin.customize.theme.disabled"}}
       {{/if}}
       {{d-button
-        class='btn-default'
+        class="btn-default"
         action=(action "enableComponent")
         icon="check"
         label="admin.customize.theme.enable"}}
@@ -97,31 +97,31 @@
         {{/if}}
 
         {{#if model.remote_theme.commits_behind}}
-          {{#d-button action=(action "updateToLatest") icon="download" class='btn-primary'}}{{i18n "admin.customize.theme.update_to_latest"}}{{/d-button}}
+          {{#d-button action=(action "updateToLatest") icon="download" class="btn-primary"}}{{i18n "admin.customize.theme.update_to_latest"}}{{/d-button}}
         {{else}}
           {{#d-button action=(action "checkForThemeUpdates") icon="sync" class="btn-default"}}{{i18n "admin.customize.theme.check_for_updates"}}{{/d-button}}
         {{/if}}
 
-        <span class='status-message'>
+        <span class="status-message">
           {{#if updatingRemote}}
-            {{i18n 'admin.customize.theme.updating'}}
+            {{i18n "admin.customize.theme.updating"}}
           {{else}}
             {{#if model.remote_theme.commits_behind}}
-              {{i18n 'admin.customize.theme.commits_behind' count=model.remote_theme.commits_behind}}
+              {{i18n "admin.customize.theme.commits_behind" count=model.remote_theme.commits_behind}}
               {{#if model.remote_theme.github_diff_link}}
                 <a href={{model.remote_theme.github_diff_link}}>
-                  {{i18n 'admin.customize.theme.compare_commits'}}
+                  {{i18n "admin.customize.theme.compare_commits"}}
                 </a>
               {{/if}}
             {{else}}
               {{#unless showRemoteError}}
-                {{i18n 'admin.customize.theme.up_to_date'}} {{format-date model.remote_theme.updated_at leaveAgo="true"}}
+                {{i18n "admin.customize.theme.up_to_date"}} {{format-date model.remote_theme.updated_at leaveAgo="true"}}
               {{/unless}}
             {{/if}}
           {{/if}}
         </span>
       {{else}}
-        <span class='status-message'>
+        <span class="status-message">
           {{d-icon "info-circle"}} {{i18n "admin.customize.theme.imported_from_archive"}}
         </span>
       {{/if}}
@@ -159,7 +159,7 @@
       <div class="mini-title">{{i18n "admin.customize.theme.component_of"}}</div>
       <ul>
         {{#each parentThemes as |theme|}}
-          <li>{{#link-to 'adminCustomizeThemes.show' theme replace=true}}{{theme.name}}{{/link-to}}</li>
+          <li>{{#link-to "adminCustomizeThemes.show" theme replace=true}}{{theme.name}}{{/link-to}}</li>
         {{/each}}
       </ul>
     </div>
@@ -203,11 +203,11 @@
   <div class="control-unit">
     <div class="mini-title">{{i18n "admin.customize.theme.uploads"}}</div>
     {{#if model.uploads}}
-      <ul class='removable-list'>
+      <ul class="removable-list">
         {{#each model.uploads as |upload|}}
           <li>
-            <span class='col'>${{upload.name}}: <a href={{upload.url}} rel="noopener" target='_blank'>{{upload.filename}}</a></span>
-            <span class='col'>
+            <span class="col">${{upload.name}}: <a href={{upload.url}} rel="noopener" target="_blank">{{upload.filename}}</a></span>
+            <span class="col">
               {{d-button action=(action "removeUpload") actionParam=upload class="second btn-default btn-default cancel-edit" icon="times"}}
             </span>
           </li>
@@ -241,21 +241,21 @@
     </div>
   {{/if}}
 
-  <a href={{previewUrl}} title={{i18n 'admin.customize.explain_preview'}} rel="noopener" target='_blank' class='btn btn-default'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
-  <a class="btn btn-default export" rel="noopener" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
+  <a href={{previewUrl}} title={{i18n "admin.customize.explain_preview"}} rel="noopener" target="_blank" class="btn btn-default">{{d-icon "desktop"}}{{i18n "admin.customize.theme.preview"}}</a>
+  <a class="btn btn-default export" rel="noopener" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n "admin.export_json.button_text"}}</a>
 
   {{d-button action=(action "switchType") label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}}
 
   {{#if model.component}}
     {{#if model.enabled}}
       {{d-button
-        class='btn-default'
+        class="btn-default"
         action=(action "disableComponent")
         icon="ban"
         label="admin.customize.theme.disable"}}
     {{else}}
       {{d-button
-        class='btn-default'
+        class="btn-default"
         action=(action "enableComponent")
         icon="check"
         label="admin.customize.theme.enable"}}
diff --git a/app/assets/javascripts/admin/templates/customize.hbs b/app/assets/javascripts/admin/templates/customize.hbs
index 768eaf29a2..d017abe67f 100644
--- a/app/assets/javascripts/admin/templates/customize.hbs
+++ b/app/assets/javascripts/admin/templates/customize.hbs
@@ -1,13 +1,13 @@
 {{#admin-nav}}
-  {{nav-item route='adminCustomizeThemes' label='admin.customize.theme.title'}}
-  {{nav-item route='adminCustomize.colors' label='admin.customize.colors.title'}}
-  {{nav-item route='adminSiteText' label='admin.site_text.title'}}
-  {{nav-item route='adminCustomizeEmailTemplates' label='admin.customize.email_templates.title'}}
-  {{nav-item route='adminCustomizeEmailStyle' label='admin.customize.email_style.title'}}
-  {{nav-item route='adminUserFields' label='admin.user_fields.title'}}
-  {{nav-item route='adminEmojis' label='admin.emoji.title'}}
-  {{nav-item route='adminPermalinks' label='admin.permalink.title'}}
-  {{nav-item route='adminEmbedding' label='admin.embedding.title'}}
+  {{nav-item route="adminCustomizeThemes" label="admin.customize.theme.title"}}
+  {{nav-item route="adminCustomize.colors" label="admin.customize.colors.title"}}
+  {{nav-item route="adminSiteText" label="admin.site_text.title"}}
+  {{nav-item route="adminCustomizeEmailTemplates" label="admin.customize.email_templates.title"}}
+  {{nav-item route="adminCustomizeEmailStyle" label="admin.customize.email_style.title"}}
+  {{nav-item route="adminUserFields" label="admin.user_fields.title"}}
+  {{nav-item route="adminEmojis" label="admin.emoji.title"}}
+  {{nav-item route="adminPermalinks" label="admin.permalink.title"}}
+  {{nav-item route="adminEmbedding" label="admin.embedding.title"}}
 {{/admin-nav}}
 
 <div class="admin-container">
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index 94150fef95..2eca2b7d02 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -5,7 +5,7 @@
     <div class="period-section">
       <div class="section-title">
         <h2>
-          <a href={{get-url '/admin/dashboard/reports'}}>
+          <a href={{get-url "/admin/dashboard/reports"}}>
             {{i18n "admin.dashboard.community_health"}}
           </a>
         </h2>
@@ -76,10 +76,10 @@
             <div class="counters-list">
               <div class="counters-header">
                 <div class="counters-cell"></div>
-                <div class="counters-cell">{{i18n 'admin.dashboard.reports.today'}}</div>
-                <div class="counters-cell">{{i18n 'admin.dashboard.reports.yesterday'}}</div>
-                <div class="counters-cell">{{i18n 'admin.dashboard.reports.last_7_days'}}</div>
-                <div class="counters-cell">{{i18n 'admin.dashboard.reports.last_30_days'}}</div>
+                <div class="counters-cell">{{i18n "admin.dashboard.reports.today"}}</div>
+                <div class="counters-cell">{{i18n "admin.dashboard.reports.yesterday"}}</div>
+                <div class="counters-cell">{{i18n "admin.dashboard.reports.last_7_days"}}</div>
+                <div class="counters-cell">{{i18n "admin.dashboard.reports.last_30_days"}}</div>
               </div>
 
               {{#each activityMetrics as |metric|}}
diff --git a/app/assets/javascripts/admin/templates/dashboard_moderation.hbs b/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
index 019ffb5990..06ae3567f6 100644
--- a/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
@@ -4,7 +4,7 @@
   <div class="moderators-activity section">
     <div class="section-title">
       <h2>
-        <a href={{get-url '/admin/reports/moderators_activity'}}>
+        <a href={{get-url "/admin/reports/moderators_activity"}}>
           {{i18n "admin.dashboard.moderators_activity"}}
         </a>
       </h2>
diff --git a/app/assets/javascripts/admin/templates/dashboard_reports.hbs b/app/assets/javascripts/admin/templates/dashboard_reports.hbs
index e5660e9c50..83f3ad74eb 100644
--- a/app/assets/javascripts/admin/templates/dashboard_reports.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_reports.hbs
@@ -13,7 +13,7 @@
     <ul class="reports-list">
       {{#each filterReports as |report|}}
         <li class="report">
-          {{#link-to 'adminReports.show' report.type}}
+          {{#link-to "adminReports.show" report.type}}
             <h3 class="report-title">{{report.title}}</h3>
             {{#if report.description}}
               <p class="report-description">
diff --git a/app/assets/javascripts/admin/templates/email-advanced-test.hbs b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
index fe55b11009..8e4b0cbff0 100644
--- a/app/assets/javascripts/admin/templates/email-advanced-test.hbs
+++ b/app/assets/javascripts/admin/templates/email-advanced-test.hbs
@@ -1,7 +1,7 @@
-<p>{{i18n 'admin.email.advanced_test.desc'}}</p>
+<p>{{i18n "admin.email.advanced_test.desc"}}</p>
 
-<div class='email-advanced-test'>
-  <label for="email">{{i18n 'admin.email.advanced_test.email'}}</label>
+<div class="email-advanced-test">
+  <label for="email">{{i18n "admin.email.advanced_test.email"}}</label>
   {{textarea name="email" value=email class="email-body"}}
   {{d-button
     action=(action "run")
@@ -13,12 +13,12 @@
   {{#if format}}
     <hr>
     <div class="text">
-      <h3>{{i18n 'admin.email.advanced_test.text'}}</h3>
+      <h3>{{i18n "admin.email.advanced_test.text"}}</h3>
       <pre class="full-reason">{{html-safe text}}</pre>
     </div>
     <hr>
     <div class="elided">
-      <h3>{{i18n 'admin.email.advanced_test.elided'}}</h3>
+      <h3>{{i18n "admin.email.advanced_test.elided"}}</h3>
       <pre class="full-reason">{{html-safe elided}}</pre>
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/email-bounced.hbs b/app/assets/javascripts/admin/templates/email-bounced.hbs
index 9868012f2c..85a8ff0d27 100644
--- a/app/assets/javascripts/admin/templates/email-bounced.hbs
+++ b/app/assets/javascripts/admin/templates/email-bounced.hbs
@@ -1,16 +1,16 @@
 {{#load-more selector=".email-list tr" action=(action "loadMore")}}
-  <table class='table email-list'>
+  <table class="table email-list">
     <thead>
       <tr>
-        <th>{{i18n 'admin.email.time'}}</th>
-        <th>{{i18n 'admin.email.user'}}</th>
-        <th>{{i18n 'admin.email.to_address'}}</th>
-        <th>{{i18n 'admin.email.email_type'}}</th>
+        <th>{{i18n "admin.email.time"}}</th>
+        <th>{{i18n "admin.email.user"}}</th>
+        <th>{{i18n "admin.email.to_address"}}</th>
+        <th>{{i18n "admin.email.email_type"}}</th>
       </tr>
     </thead>
     <tbody>
       <tr class="filters">
-        <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+        <td>{{i18n "admin.email.logs.filters.title"}}</td>
         <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
         <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
         <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
@@ -21,13 +21,13 @@
           <td>{{format-date l.created_at}}</td>
           <td>
             {{#if l.user}}
-              {{#link-to 'adminUser' l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
-              {{#link-to 'adminUser' l.user}}{{l.user.username}}{{/link-to}}
+              {{#link-to "adminUser" l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
+              {{#link-to "adminUser" l.user}}{{l.user.username}}{{/link-to}}
             {{else}}
               &mdash;
             {{/if}}
           </td>
-          <td><a href='mailto:{{l.to_address}}'>{{l.to_address}}</a></td>
+          <td><a href="mailto:{{l.to_address}}">{{l.to_address}}</a></td>
           {{#if l.has_bounce_key}}
             <td><a href {{action "showIncomingEmail" l.id}}>{{l.email_type}}</a></td>
           {{else}}
@@ -36,7 +36,7 @@
         </tr>
       {{else}}
         {{#unless loading}}
-          <tr><td colspan="4">{{i18n 'admin.email.logs.none'}}</td></tr>
+          <tr><td colspan="4">{{i18n "admin.email.logs.none"}}</td></tr>
         {{/unless}}
       {{/each}}
     </tbody>
diff --git a/app/assets/javascripts/admin/templates/email-index.hbs b/app/assets/javascripts/admin/templates/email-index.hbs
index d510b2f4fc..ddf914fee4 100644
--- a/app/assets/javascripts/admin/templates/email-index.hbs
+++ b/app/assets/javascripts/admin/templates/email-index.hbs
@@ -1,13 +1,13 @@
 <table class="table">
   <tbody>
     <tr>
-      <th>{{i18n 'admin.email.delivery_method'}}</th>
+      <th>{{i18n "admin.email.delivery_method"}}</th>
       <td>{{delivery_method}}</td>
     </tr>
 
     {{#each model.settings as |s|}}
       <tr>
-        <th style='width: 25%'>{{s.name}}</th>
+        <th style="width: 25%">{{s.name}}</th>
         <td>{{s.value}}</td>
       </tr>
     {{/each}}
@@ -15,21 +15,21 @@
 </table>
 
 <form>
-  <div class='admin-controls'>
+  <div class="admin-controls">
     {{#if sendingEmail}}
-      <div class='controls'>{{i18n 'admin.email.sending_test'}}</div>
+      <div class="controls">{{i18n "admin.email.sending_test"}}</div>
     {{else}}
-      <div class='controls'>
+      <div class="controls">
         {{text-field value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
       </div>
-      <div class='controls'>
+      <div class="controls">
         {{d-button
           class="btn-primary"
           action=(action "sendTestEmail")
           disabled=sendTestEmailDisabled
           label="admin.email.send_test"
           type="submit"}}
-        {{#if sentTestEmailMessage}}<span class='result-message'>{{sentTestEmailMessage}}</span>{{/if}}
+        {{#if sentTestEmailMessage}}<span class="result-message">{{sentTestEmailMessage}}</span>{{/if}}
       </div>
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 82217bacfb..8d10ac3a8b 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -1,26 +1,26 @@
-<p>{{i18n 'admin.email.preview_digest_desc'}}</p>
+<p>{{i18n "admin.email.preview_digest_desc"}}</p>
 
-<div class='admin-controls email-preview'>
-  <div class='controls'>
-    <label for='last-seen'>{{i18n 'admin.email.last_seen_user'}}</label>
+<div class="admin-controls email-preview">
+  <div class="controls">
+    <label for="last-seen">{{i18n "admin.email.last_seen_user"}}</label>
     {{date-picker-past value=lastSeen id="last-seen"}}
-    <label>{{i18n 'admin.email.user'}}:</label>
+    <label>{{i18n "admin.email.user"}}:</label>
     {{user-selector single="true" usernames=username canReceiveUpdates=true}}
     {{d-button
       class="btn-primary digest-refresh-button"
       action=(action "refresh")
       label="admin.email.refresh"}}
     <div class="toggle">
-      <label>{{i18n 'admin.email.format'}}</label>
+      <label>{{i18n "admin.email.format"}}</label>
       {{#if showHtml}}
-        <span>{{i18n 'admin.email.html'}}</span>
+        <span>{{i18n "admin.email.html"}}</span>
          |
         <a href {{action "toggleShowHtml"}}>
-          {{i18n 'admin.email.text'}}
+          {{i18n "admin.email.text"}}
         </a>
       {{else}}
-        <a href {{action "toggleShowHtml"}}>{{i18n 'admin.email.html'}}</a> |
-        <span>{{i18n 'admin.email.text'}}</span>
+        <a href {{action "toggleShowHtml"}}>{{i18n "admin.email.html"}}</a> |
+        <span>{{i18n "admin.email.text"}}</span>
       {{/if}}
     </div>
   </div>
@@ -32,9 +32,9 @@
     {{#if showSendEmailForm}}
       <div class="controls">
         {{#if sendingEmail}}
-          {{i18n 'admin.email.sending_test'}}
+          {{i18n "admin.email.sending_test"}}
         {{else}}
-          <label>{{i18n 'admin.email.send_digest_label'}}</label>
+          <label>{{i18n "admin.email.send_digest_label"}}</label>
           {{text-field value=email placeholderKey="admin.email.test_email_address"}}
           {{d-button
             class="btn-default"
@@ -42,7 +42,7 @@
             disabled=sendEmailDisabled
             label="admin.email.send_digest"}}
           {{#if sentEmail}}
-            <span class='result-message'>{{i18n 'admin.email.sent_test'}}</span>
+            <span class="result-message">{{i18n "admin.email.sent_test"}}</span>
           {{/if}}
         {{/if}}
       </div>
@@ -51,9 +51,9 @@
     <div class="preview-output">
       {{#if showHtml}}
         {{#if htmlEmpty}}
-          <p>{{i18n 'admin.email.no_result'}}</p>
+          <p>{{i18n "admin.email.no_result"}}</p>
         {{else}}
-          <iframe title={{i18n 'admin.email.html_preview'}} srcdoc={{model.html_content}} />
+          <iframe title={{i18n "admin.email.html_preview"}} srcdoc={{model.html_content}} />
         {{/if}}
       {{else}}
         <pre>{{html-safe model.text_content}}</pre>
diff --git a/app/assets/javascripts/admin/templates/email-received.hbs b/app/assets/javascripts/admin/templates/email-received.hbs
index aff40a6601..e8632cc687 100644
--- a/app/assets/javascripts/admin/templates/email-received.hbs
+++ b/app/assets/javascripts/admin/templates/email-received.hbs
@@ -1,17 +1,17 @@
 {{#load-more selector=".email-list tr" action=(action "loadMore")}}
-  <table class='table email-list'>
+  <table class="table email-list">
     <thead>
       <tr>
-        <th>{{i18n 'admin.email.time'}}</th>
-        <th>{{i18n 'admin.email.incoming_emails.from_address'}}</th>
-        <th>{{i18n 'admin.email.incoming_emails.to_addresses'}}</th>
-        <th>{{i18n 'admin.email.incoming_emails.subject'}}</th>
+        <th>{{i18n "admin.email.time"}}</th>
+        <th>{{i18n "admin.email.incoming_emails.from_address"}}</th>
+        <th>{{i18n "admin.email.incoming_emails.to_addresses"}}</th>
+        <th>{{i18n "admin.email.incoming_emails.subject"}}</th>
       </tr>
     </thead>
 
     <tbody>
       <tr class="filters">
-        <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+        <td>{{i18n "admin.email.logs.filters.title"}}</td>
         <td>{{text-field value=filter.from placeholderKey="admin.email.incoming_emails.filters.from_placeholder"}}</td>
         <td>{{text-field value=filter.to placeholderKey="admin.email.incoming_emails.filters.to_placeholder"}}</td>
         <td>{{text-field value=filter.subject placeholderKey="admin.email.incoming_emails.filters.subject_placeholder"}}</td>
@@ -23,7 +23,7 @@
           <td class="username">
             <div>
               {{#if email.user}}
-                {{#link-to 'adminUser' email.user}}
+                {{#link-to "adminUser" email.user}}
                   {{avatar email.user imageSize="tiny"}}
                   {{email.from_address}}
                 {{/link-to}}
@@ -49,7 +49,7 @@
           </td>
         </tr>
       {{else}}
-        <tr><td colspan="4">{{i18n 'admin.email.incoming_emails.none'}}</td></tr>
+        <tr><td colspan="4">{{i18n "admin.email.incoming_emails.none"}}</td></tr>
       {{/each}}
     </tbody>
   </table>
diff --git a/app/assets/javascripts/admin/templates/email-rejected.hbs b/app/assets/javascripts/admin/templates/email-rejected.hbs
index 9cc9710660..2338af8d15 100644
--- a/app/assets/javascripts/admin/templates/email-rejected.hbs
+++ b/app/assets/javascripts/admin/templates/email-rejected.hbs
@@ -1,18 +1,18 @@
 {{#load-more selector=".email-list tr" action=(action "loadMore")}}
-  <table class='table email-list'>
+  <table class="table email-list">
     <thead>
       <tr>
-        <th>{{i18n 'admin.email.time'}}</th>
-        <th>{{i18n 'admin.email.incoming_emails.from_address'}}</th>
-        <th>{{i18n 'admin.email.incoming_emails.to_addresses'}}</th>
-        <th>{{i18n 'admin.email.incoming_emails.subject'}}</th>
-        <th>{{i18n 'admin.email.incoming_emails.error'}}</th>
+        <th>{{i18n "admin.email.time"}}</th>
+        <th>{{i18n "admin.email.incoming_emails.from_address"}}</th>
+        <th>{{i18n "admin.email.incoming_emails.to_addresses"}}</th>
+        <th>{{i18n "admin.email.incoming_emails.subject"}}</th>
+        <th>{{i18n "admin.email.incoming_emails.error"}}</th>
       </tr>
     </thead>
 
     <tbody>
       <tr class="filters">
-        <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+        <td>{{i18n "admin.email.logs.filters.title"}}</td>
         <td>{{text-field value=filter.from placeholderKey="admin.email.incoming_emails.filters.from_placeholder"}}</td>
         <td>{{text-field value=filter.to placeholderKey="admin.email.incoming_emails.filters.to_placeholder"}}</td>
         <td>{{text-field value=filter.subject placeholderKey="admin.email.incoming_emails.filters.subject_placeholder"}}</td>
@@ -25,13 +25,13 @@
           <td class="username">
             <div>
               {{#if email.user}}
-                {{#link-to 'adminUser' email.user}}
+                {{#link-to "adminUser" email.user}}
                   {{avatar email.user imageSize="tiny"}}
                   {{email.from_address}}
                 {{/link-to}}
               {{else}}
                 {{#if email.from_address}}
-                  <a href='mailto:{{email.from_address}}'>{{email.from_address}}</a>
+                  <a href="mailto:{{email.from_address}}">{{email.from_address}}</a>
                 {{else}}
                   &mdash;
                 {{/if}}
@@ -52,7 +52,7 @@
           </td>
         </tr>
       {{else}}
-        <tr><td colspan="5">{{i18n 'admin.email.incoming_emails.none'}}</td></tr>
+        <tr><td colspan="5">{{i18n "admin.email.incoming_emails.none"}}</td></tr>
       {{/each}}
     </tbody>
   </table>
diff --git a/app/assets/javascripts/admin/templates/email-sent.hbs b/app/assets/javascripts/admin/templates/email-sent.hbs
index 633b81cb3d..ab0afaaf2d 100644
--- a/app/assets/javascripts/admin/templates/email-sent.hbs
+++ b/app/assets/javascripts/admin/templates/email-sent.hbs
@@ -1,17 +1,17 @@
 {{#load-more selector=".email-list tr" action=(action "loadMore")}}
-  <table class='table email-list'>
+  <table class="table email-list">
     <thead>
       <tr>
-        <th>{{i18n 'admin.email.sent_at'}}</th>
-        <th>{{i18n 'admin.email.user'}}</th>
-        <th>{{i18n 'admin.email.to_address'}}</th>
-        <th>{{i18n 'admin.email.email_type'}}</th>
-        <th>{{i18n 'admin.email.reply_key'}}</th>
+        <th>{{i18n "admin.email.sent_at"}}</th>
+        <th>{{i18n "admin.email.user"}}</th>
+        <th>{{i18n "admin.email.to_address"}}</th>
+        <th>{{i18n "admin.email.email_type"}}</th>
+        <th>{{i18n "admin.email.reply_key"}}</th>
       </tr>
     </thead>
     <tbody>
       <tr class="filters">
-        <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+        <td>{{i18n "admin.email.logs.filters.title"}}</td>
         <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
         <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
         <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
@@ -23,29 +23,29 @@
           <td>{{format-date l.created_at}}</td>
           <td>
             {{#if l.user}}
-              {{#link-to 'adminUser' l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
-              {{#link-to 'adminUser' l.user}}{{l.user.username}}{{/link-to}}
+              {{#link-to "adminUser" l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
+              {{#link-to "adminUser" l.user}}{{l.user.username}}{{/link-to}}
             {{else}}
               &mdash;
             {{/if}}
           </td>
           <td>
             {{#if l.bounced}}{{d-icon "redo" title="admin.email.bounced"}}{{/if}}
-            <a href='mailto:{{l.to_address}}'>{{l.to_address}}</a>
+            <a href="mailto:{{l.to_address}}">{{l.to_address}}</a>
           </td>
           <td>{{l.email_type}}</td>
-          <td class='post-link'>
+          <td class="post-link">
             {{#if l.post_url}}
               <a href={{l.post_url}}>{{l.post_description}}</a>
-              <span class='reply-key'>{{l.reply_key}}</span>
+              <span class="reply-key">{{l.reply_key}}</span>
             {{else}}
-              <span class='reply-key'>{{l.reply_key}}</span>
+              <span class="reply-key">{{l.reply_key}}</span>
             {{/if}}
           </td>
         </tr>
       {{else}}
         {{#unless loading}}
-          <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
+          <tr><td colspan="5">{{i18n "admin.email.logs.none"}}</td></tr>
         {{/unless}}
       {{/each}}
     </tbody>
diff --git a/app/assets/javascripts/admin/templates/email-skipped.hbs b/app/assets/javascripts/admin/templates/email-skipped.hbs
index da27e86914..f125beef36 100644
--- a/app/assets/javascripts/admin/templates/email-skipped.hbs
+++ b/app/assets/javascripts/admin/templates/email-skipped.hbs
@@ -1,17 +1,17 @@
 {{#load-more selector=".email-list tr" action=(action "loadMore")}}
-  <table class='table email-list'>
+  <table class="table email-list">
     <thead>
       <tr>
-        <th>{{i18n 'admin.email.time'}}</th>
-        <th>{{i18n 'admin.email.user'}}</th>
-        <th>{{i18n 'admin.email.to_address'}}</th>
-        <th>{{i18n 'admin.email.email_type'}}</th>
-        <th>{{i18n 'admin.email.skipped_reason'}}</th>
+        <th>{{i18n "admin.email.time"}}</th>
+        <th>{{i18n "admin.email.user"}}</th>
+        <th>{{i18n "admin.email.to_address"}}</th>
+        <th>{{i18n "admin.email.email_type"}}</th>
+        <th>{{i18n "admin.email.skipped_reason"}}</th>
       </tr>
     </thead>
     <tbody>
       <tr class="filters">
-        <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+        <td>{{i18n "admin.email.logs.filters.title"}}</td>
         <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
         <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
         <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
@@ -23,13 +23,13 @@
           <td>{{format-date l.created_at}}</td>
           <td>
             {{#if l.user}}
-              {{#link-to 'adminUser' l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
-              {{#link-to 'adminUser' l.user}}{{l.user.username}}{{/link-to}}
+              {{#link-to "adminUser" l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
+              {{#link-to "adminUser" l.user}}{{l.user.username}}{{/link-to}}
             {{else}}
               &mdash;
             {{/if}}
           </td>
-          <td><a href='mailto:{{l.to_address}}'>{{l.to_address}}</a></td>
+          <td><a href="mailto:{{l.to_address}}">{{l.to_address}}</a></td>
           <td>{{l.email_type}}</td>
           <td>
             {{#if l.post_url}}
@@ -41,7 +41,7 @@
         </tr>
       {{else}}
         {{#unless loading}}
-          <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
+          <tr><td colspan="5">{{i18n "admin.email.logs.none"}}</td></tr>
         {{/unless}}
       {{/each}}
     </tbody>
diff --git a/app/assets/javascripts/admin/templates/email.hbs b/app/assets/javascripts/admin/templates/email.hbs
index b8a379d8ae..b61bdcae84 100644
--- a/app/assets/javascripts/admin/templates/email.hbs
+++ b/app/assets/javascripts/admin/templates/email.hbs
@@ -1,13 +1,13 @@
 {{#admin-nav}}
-  {{nav-item route='adminEmail.index' label='admin.email.settings'}}
-  {{nav-item route='adminEmail.previewDigest' label='admin.email.preview_digest'}}
-  {{nav-item route='adminEmail.advancedTest' label='admin.email.advanced_test.title'}}
-  {{nav-item route='adminCustomizeEmailTemplates' label='admin.email.templates'}}
-  {{nav-item route='adminEmail.sent' label='admin.email.sent'}}
-  {{nav-item route='adminEmail.skipped' label='admin.email.skipped'}}
-  {{nav-item route='adminEmail.bounced' label='admin.email.bounced'}}
-  {{nav-item route='adminEmail.received' label='admin.email.received'}}
-  {{nav-item route='adminEmail.rejected' label='admin.email.rejected'}}
+  {{nav-item route="adminEmail.index" label="admin.email.settings"}}
+  {{nav-item route="adminEmail.previewDigest" label="admin.email.preview_digest"}}
+  {{nav-item route="adminEmail.advancedTest" label="admin.email.advanced_test.title"}}
+  {{nav-item route="adminCustomizeEmailTemplates" label="admin.email.templates"}}
+  {{nav-item route="adminEmail.sent" label="admin.email.sent"}}
+  {{nav-item route="adminEmail.skipped" label="admin.email.skipped"}}
+  {{nav-item route="adminEmail.bounced" label="admin.email.bounced"}}
+  {{nav-item route="adminEmail.received" label="admin.email.received"}}
+  {{nav-item route="adminEmail.rejected" label="admin.email.rejected"}}
 {{/admin-nav}}
 
 <div class="admin-container">
diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index 4bf9135fce..b70a9be306 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -1,12 +1,12 @@
-<div class='embeddable-hosts'>
+<div class="embeddable-hosts">
   {{#if embedding.embeddable_hosts}}
-    <table class='embedding grid'>
+    <table class="embedding grid">
       <thead>
-        <th style='width: 25%'>{{i18n "admin.embedding.host"}}</th>
-        <th style='width: 15%'>{{i18n "admin.embedding.class_name"}}</th>
-        <th style='width: 25%'>{{i18n "admin.embedding.path_whitelist"}}</th>
-        <th style='width: 25%'>{{i18n "admin.embedding.category"}}</th>
-        <th style='width: 10%'>&nbsp;</th>
+        <th style="width: 25%">{{i18n "admin.embedding.host"}}</th>
+        <th style="width: 15%">{{i18n "admin.embedding.class_name"}}</th>
+        <th style="width: 25%">{{i18n "admin.embedding.path_whitelist"}}</th>
+        <th style="width: 25%">{{i18n "admin.embedding.category"}}</th>
+        <th style="width: 10%">&nbsp;</th>
       </thead>
       <tbody>
         {{#each embedding.embeddable_hosts as |host|}}
@@ -22,14 +22,14 @@
 </div>
 
 {{#if showSecondary}}
-  <div class='embedding-secondary'>
+  <div class="embedding-secondary">
     <p>{{html-safe (i18n "admin.embedding.sample")}}</p>
     {{highlighted-code code=embeddingCode lang="html"}}
   </div>
 
   <hr>
 
-  <div class='embedding-secondary'>
+  <div class="embedding-secondary">
     <h3>{{i18n "admin.embedding.settings"}}</h3>
 
     {{embedding-setting field="embed_by_username" value=embedding.embed_by_username}}
@@ -41,7 +41,7 @@
     {{embedding-setting field="embed_unlisted" value=embedding.embed_unlisted type="checkbox"}}
   </div>
 
-  <div class='embedding-secondary'>
+  <div class="embedding-secondary">
     <h3>{{i18n "admin.embedding.crawling_settings"}}</h3>
     <p class="description">{{i18n "admin.embedding.crawling_description"}}</p>
 
@@ -58,7 +58,7 @@
                         placeholder="emoji, classname"}}
   </div>
 
-  <div class='embedding-secondary'>
+  <div class="embedding-secondary">
     {{d-button label="admin.embedding.save"
                action=(action "saveChanges")
                class="btn-primary embed-save"
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index f2547b9678..b2935978b3 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -1,5 +1,5 @@
-<div class='admin-emojis'>
-  <h1>{{i18n 'admin.emoji.title'}}</h1>
+<div class="admin-emojis">
+  <h1>{{i18n "admin.emoji.title"}}</h1>
 
   <p class="desc">{{i18n "admin.emoji.help"}}</p>
 
diff --git a/app/assets/javascripts/admin/templates/logs.hbs b/app/assets/javascripts/admin/templates/logs.hbs
index b936904999..194f6ec8bf 100644
--- a/app/assets/javascripts/admin/templates/logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs.hbs
@@ -1,12 +1,12 @@
 {{#admin-nav}}
-  {{nav-item route='adminLogs.staffActionLogs' label='admin.logs.staff_actions.title'}}
-  {{nav-item route='adminLogs.screenedEmails' label='admin.logs.screened_emails.title'}}
-  {{nav-item route='adminLogs.screenedIpAddresses' label='admin.logs.screened_ips.title'}}
-  {{nav-item route='adminLogs.screenedUrls' label='admin.logs.screened_urls.title'}}
-  {{nav-item route='adminWatchedWords' label='admin.watched_words.title'}}
-  {{nav-item route='adminSearchLogs' label='admin.logs.search_logs.title'}}
+  {{nav-item route="adminLogs.staffActionLogs" label="admin.logs.staff_actions.title"}}
+  {{nav-item route="adminLogs.screenedEmails" label="admin.logs.screened_emails.title"}}
+  {{nav-item route="adminLogs.screenedIpAddresses" label="admin.logs.screened_ips.title"}}
+  {{nav-item route="adminLogs.screenedUrls" label="admin.logs.screened_urls.title"}}
+  {{nav-item route="adminWatchedWords" label="admin.watched_words.title"}}
+  {{nav-item route="adminSearchLogs" label="admin.logs.search_logs.title"}}
   {{#if currentUser.admin}}
-    {{nav-item path='/logs' label='admin.logs.logster.title'}}
+    {{nav-item path="/logs" label="admin.logs.logster.title"}}
   {{/if}}
 {{/admin-nav}}
 
diff --git a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
index 6cc1239783..17b4316629 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
@@ -1,5 +1,5 @@
 <p>
-  {{i18n 'admin.logs.screened_emails.description'}}
+  {{i18n "admin.logs.screened_emails.description"}}
 </p>
 
 {{d-button
@@ -14,14 +14,14 @@
 {{#conditional-loading-spinner condition=loading}}
   {{#if model.length}}
 
-    <table class='screened-emails grid'>
+    <table class="screened-emails grid">
       <thead>
-        <th class="first email">{{i18n 'admin.logs.screened_emails.email'}}</th>
-        <th class="action">{{i18n 'admin.logs.action'}}</th>
-        <th class="match_count">{{i18n 'admin.logs.match_count'}}</th>
-        <th class="last_match_at">{{i18n 'admin.logs.last_match_at'}}</th>
-        <th class="created_at">{{i18n 'admin.logs.created_at'}}</th>
-        <th class="ip_address">{{i18n 'admin.logs.ip_address'}}</th>
+        <th class="first email">{{i18n "admin.logs.screened_emails.email"}}</th>
+        <th class="action">{{i18n "admin.logs.action"}}</th>
+        <th class="match_count">{{i18n "admin.logs.match_count"}}</th>
+        <th class="last_match_at">{{i18n "admin.logs.last_match_at"}}</th>
+        <th class="created_at">{{i18n "admin.logs.created_at"}}</th>
+        <th class="ip_address">{{i18n "admin.logs.ip_address"}}</th>
         <th class="action"></th>
       </thead>
       <tbody>
@@ -31,9 +31,9 @@
               <div class="overflow-ellipsis" title={{item.email}}>{{item.email}}</div>
             </td>
             <td class="action">{{item.actionName}}</td>
-            <td class="match_count"><div class="label">{{i18n 'admin.logs.match_count'}}</div>{{item.match_count}}</td>
-            <td class="last_match_at"><div class="label">{{i18n 'admin.logs.last_match_at'}}</div>{{age-with-tooltip item.last_match_at}}</td>
-            <td class="created_at"><div class="label">{{i18n 'admin.logs.created_at'}}</div>{{age-with-tooltip item.created_at}}</td>
+            <td class="match_count"><div class="label">{{i18n "admin.logs.match_count"}}</div>{{item.match_count}}</td>
+            <td class="last_match_at"><div class="label">{{i18n "admin.logs.last_match_at"}}</div>{{age-with-tooltip item.last_match_at}}</td>
+            <td class="created_at"><div class="label">{{i18n "admin.logs.created_at"}}</div>{{age-with-tooltip item.created_at}}</td>
             <td class="ip_address">{{item.ip_address}}</td>
             <td class="action">
               {{d-button action=(action "clearBlock") actionParam=item icon="check" label="admin.logs.screened_emails.actions.allow"}}
@@ -44,6 +44,6 @@
     </table>
 
   {{else}}
-    {{i18n 'search.no_results'}}
+    {{i18n "search.no_results"}}
   {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
index ab3fcf1883..d48248152d 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
@@ -1,5 +1,5 @@
 <p>
-  {{i18n 'admin.logs.screened_urls.description'}}
+  {{i18n "admin.logs.screened_urls.description"}}
 </p>
   {{d-button
     class="btn-default"
@@ -11,13 +11,13 @@
 
 {{#conditional-loading-spinner condition=loading}}
   {{#if model.length}}
-    <table class='screened-urls grid'>
+    <table class="screened-urls grid">
       <thead>
-        <th class="first domain">{{i18n 'admin.logs.screened_urls.domain'}}</th>
-        <th class="action">{{i18n 'admin.logs.action'}}</th>
-        <th class="match_count">{{i18n 'admin.logs.match_count'}}</th>
-        <th class="last_match_at">{{i18n 'admin.logs.last_match_at'}}</th>
-        <th class="created_at">{{i18n 'admin.logs.created_at'}}</th>
+        <th class="first domain">{{i18n "admin.logs.screened_urls.domain"}}</th>
+        <th class="action">{{i18n "admin.logs.action"}}</th>
+        <th class="match_count">{{i18n "admin.logs.match_count"}}</th>
+        <th class="last_match_at">{{i18n "admin.logs.last_match_at"}}</th>
+        <th class="created_at">{{i18n "admin.logs.created_at"}}</th>
       </thead>
       <tbody>
         {{#each model as |url|}}
@@ -26,14 +26,14 @@
               <div class="overflow-ellipsis" title={{url.domain}}>{{url.domain}}</div>
             </td>
             <td class="col action">{{url.actionName}}</td>
-            <td class="col match_count"><div class="label">{{i18n 'admin.logs.match_count'}}</div>{{url.match_count}}</td>
-            <td class="col last_match_at"><div class="label">{{i18n 'admin.logs.last_match_at'}}</div>{{age-with-tooltip url.last_match_at}}</td>
-            <td class="col created_at"><div class="label">{{i18n 'admin.logs.created_at'}}</div>{{age-with-tooltip url.created_at}}</td>
+            <td class="col match_count"><div class="label">{{i18n "admin.logs.match_count"}}</div>{{url.match_count}}</td>
+            <td class="col last_match_at"><div class="label">{{i18n "admin.logs.last_match_at"}}</div>{{age-with-tooltip url.last_match_at}}</td>
+            <td class="col created_at"><div class="label">{{i18n "admin.logs.created_at"}}</div>{{age-with-tooltip url.created_at}}</td>
           </tr>
         {{/each}}
       </tbody>
     </table>
   {{else}}
-    {{i18n 'search.no_results'}}
+    {{i18n "search.no_results"}}
   {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index 5a81de8f1d..3996ac2469 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -1,30 +1,30 @@
 <div class="staff-action-logs-controls">
   {{#if filtersExists}}
-    <div class='staff-action-logs-filters'>
+    <div class="staff-action-logs-filters">
       <a href {{action "clearAllFilters"}} class="clear-filters filter">
-        <span class="label">{{i18n 'admin.logs.staff_actions.clear_filters'}}</span>
+        <span class="label">{{i18n "admin.logs.staff_actions.clear_filters"}}</span>
       </a>
       {{#if actionFilter}}
         <a href {{action "clearFilter" "actionFilter"}} class="filter">
-          <span class="label">{{i18n 'admin.logs.action'}}</span>: {{actionFilter}}
+          <span class="label">{{i18n "admin.logs.action"}}</span>: {{actionFilter}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
       {{#if filters.acting_user}}
         <a href {{action "clearFilter" "acting_user"}} class="filter">
-          <span class="label">{{i18n 'admin.logs.staff_actions.staff_user'}}</span>: {{filters.acting_user}}
+          <span class="label">{{i18n "admin.logs.staff_actions.staff_user"}}</span>: {{filters.acting_user}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
       {{#if filters.target_user}}
         <a href {{action "clearFilter" "target_user"}} class="filter">
-          <span class="label">{{i18n 'admin.logs.staff_actions.target_user'}}</span>: {{filters.target_user}}
+          <span class="label">{{i18n "admin.logs.staff_actions.target_user"}}</span>: {{filters.target_user}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
       {{#if filters.subject}}
         <a href {{action "clearFilter" "subject"}} class="filter">
-          <span class="label">{{i18n 'admin.logs.staff_actions.subject'}}</span>: {{filters.subject}}
+          <span class="label">{{i18n "admin.logs.staff_actions.subject"}}</span>: {{filters.subject}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
@@ -47,25 +47,25 @@
 {{#staff-actions}}
   {{#load-more selector=".staff-logs tr" action=(action "loadMore")}}
     {{#if model.content}}
-      <table class='table staff-logs grid'>
+      <table class="table staff-logs grid">
         <thead>
-          <th>{{i18n 'admin.logs.staff_actions.staff_user'}}</th>
-          <th>{{i18n 'admin.logs.action'}}</th>
-          <th>{{i18n 'admin.logs.staff_actions.subject'}}</th>
-          <th>{{i18n 'admin.logs.staff_actions.when'}}</th>
-          <th>{{i18n 'admin.logs.staff_actions.details'}}</th>
-          <th>{{i18n 'admin.logs.staff_actions.context'}}</th>
+          <th>{{i18n "admin.logs.staff_actions.staff_user"}}</th>
+          <th>{{i18n "admin.logs.action"}}</th>
+          <th>{{i18n "admin.logs.staff_actions.subject"}}</th>
+          <th>{{i18n "admin.logs.staff_actions.when"}}</th>
+          <th>{{i18n "admin.logs.staff_actions.details"}}</th>
+          <th>{{i18n "admin.logs.staff_actions.context"}}</th>
         </thead>
         <tbody>
           {{#each model.content as |item|}}
-            <tr class='admin-list-item'>
+            <tr class="admin-list-item">
               <td class="staff-users">
                 <div class="staff-user">
                   {{#if item.acting_user}}
-                    {{#link-to 'adminUser' item.acting_user}}{{avatar item.acting_user imageSize="tiny"}}{{/link-to}}
+                    {{#link-to "adminUser" item.acting_user}}{{avatar item.acting_user imageSize="tiny"}}{{/link-to}}
                     <a href {{action "filterByStaffUser" item.acting_user}}>{{item.acting_user.username}}</a>
                   {{else}}
-                    <span class="deleted-user" title={{i18n 'admin.user.deleted'}}>
+                    <span class="deleted-user" title={{i18n "admin.user.deleted"}}>
                       {{d-icon "far-trash-alt"}}
                     </span>
                   {{/if}}
@@ -77,7 +77,7 @@
               <td class="col value subject">
                 <div class="subject">
                   {{#if item.target_user}}
-                    {{#link-to 'adminUser' item.target_user}}{{avatar item.target_user imageSize="tiny"}}{{/link-to}}
+                    {{#link-to "adminUser" item.target_user}}{{avatar item.target_user imageSize="tiny"}}{{/link-to}}
                     <a href {{action "filterByTargetUser" item.target_user}}>{{item.target_user.username}}</a>
                   {{/if}}
                   {{#if item.subject}}
@@ -90,10 +90,10 @@
                 <div>
                   {{html-safe item.formattedDetails}}
                   {{#if item.useCustomModalForDetails}}
-                    <a href {{action "showCustomDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n 'admin.logs.staff_actions.show'}}</a>
+                    <a href {{action "showCustomDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n "admin.logs.staff_actions.show"}}</a>
                   {{/if}}
                   {{#if item.useModalForDetails}}
-                    <a href {{action "showDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n 'admin.logs.staff_actions.show'}}</a>
+                    <a href {{action "showDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n "admin.logs.staff_actions.show"}}</a>
                   {{/if}}
                 </div>
               </td>
@@ -105,7 +105,7 @@
     {{else if model.loadingMore}}
       {{conditional-loading-spinner condition=model.loadingMore}}
     {{else}}
-      {{i18n 'search.no_results'}}
+      {{i18n "search.no_results"}}
     {{/if}}
   {{/load-more}}
 {{/staff-actions}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs b/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
index 160ca685ad..100a36afce 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
@@ -1,11 +1,11 @@
-{{#d-modal-body class='add-upload-modal' title="admin.customize.theme.add_upload"}}
+{{#d-modal-body class="add-upload-modal" title="admin.customize.theme.add_upload"}}
   <div class="inputs">
     <section class="field">
-      <input onchange={{action "updateName"}} type="file" id="file-input" accept='*'>
-      <label for="file-input">{{i18n 'admin.customize.theme.upload_file_tip'}}</label>
+      <input onchange={{action "updateName"}} type="file" id="file-input" accept="*">
+      <label for="file-input">{{i18n "admin.customize.theme.upload_file_tip"}}</label>
     </section>
     <section class="field">
-      <label for="theme-variable-name">{{i18n 'admin.customize.theme.variable_name'}}</label>
+      <label for="theme-variable-name">{{i18n "admin.customize.theme.variable_name"}}</label>
       {{input id="theme-variable-name" value=name}}
     </section>
     {{#if fileSelected}}
@@ -17,6 +17,6 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button action=(action "upload") disabled=disabled class='btn btn-primary' icon='upload' label='admin.customize.theme.upload'}}
+  {{d-button action=(action "upload") disabled=disabled class="btn btn-primary" icon="upload" label="admin.customize.theme.upload"}}
   {{d-modal-cancel close=(route-action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
index 5ed497ae57..6c8ab04311 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
@@ -1,4 +1,4 @@
-{{#d-modal-body class='upload-selector install-theme' title="admin.customize.theme.install"}}
+{{#d-modal-body class="upload-selector install-theme" title="admin.customize.theme.install"}}
   <div class="install-theme-items">
     {{install-theme-item value="popular" selection=selection label="admin.customize.theme.install_popular"}}
     {{install-theme-item value="local" selection=selection label="admin.customize.theme.install_upload"}}
@@ -13,7 +13,7 @@
             <div class="popular-theme-name">
               <a href={{theme.meta_url}} rel="noopener" target="_blank">
                 {{#if theme.component}}
-                  {{d-icon 'puzzle-piece' title='admin.customize.theme.component'}}
+                  {{d-icon "puzzle-piece" title="admin.customize.theme.component"}}
                 {{/if}}
                 {{theme.name}}
               </a>
@@ -26,7 +26,7 @@
               {{#if theme.installed}}
                 <span>{{i18n "admin.customize.theme.installed"}}</span>
               {{else}}
-                {{d-button class='btn-small'
+                {{d-button class="btn-small"
                   label="admin.customize.theme.install"
                   disabled=installDisabled
                   icon="upload"
@@ -44,38 +44,38 @@
 
     {{#if local}}
       <div class="inputs">
-        <input onchange={{action "uploadLocaleFile"}} type="file" id="file-input" accept='.dcstyle.json,application/json,.tar.gz,application/x-gzip,.zip,application/zip'><br>
-        <span class="description">{{i18n 'admin.customize.theme.import_file_tip'}}</span>
+        <input onchange={{action "uploadLocaleFile"}} type="file" id="file-input" accept=".dcstyle.json,application/json,.tar.gz,application/x-gzip,.zip,application/zip"><br>
+        <span class="description">{{i18n "admin.customize.theme.import_file_tip"}}</span>
       </div>
     {{/if}}
 
     {{#if remote}}
       <div class="inputs">
-        <div class='repo'>
-          <div class="label">{{i18n 'admin.customize.theme.import_web_tip'}}</div>
+        <div class="repo">
+          <div class="label">{{i18n "admin.customize.theme.import_web_tip"}}</div>
           {{input value=uploadUrl placeholder=urlPlaceholder}}
         </div>
 
         {{d-button
           class="btn-small advanced-repo"
           action=(action "toggleAdvanced")
-          label='admin.customize.theme.import_web_advanced'}}
+          label="admin.customize.theme.import_web_advanced"}}
 
         {{#if advancedVisible}}
-          <div class='branch'>
-            <div class="label">{{i18n 'admin.customize.theme.remote_branch'}}</div>
+          <div class="branch">
+            <div class="label">{{i18n "admin.customize.theme.remote_branch"}}</div>
             {{input value=branch placeholder="master"}}
           </div>
 
-          <div class='check-private'>
+          <div class="check-private">
             <label>
               {{input type="checkbox" checked=privateChecked}}
-              {{i18n 'admin.customize.theme.is_private'}}
+              {{i18n "admin.customize.theme.is_private"}}
             </label>
           </div>
           {{#if showPublicKey}}
-            <div class='public-key'>
-              <div class="label">{{i18n 'admin.customize.theme.public_key'}}</div>
+            <div class="public-key">
+              <div class="label">{{i18n "admin.customize.theme.public_key"}}</div>
               {{textarea readonly=true value=publicKey}}
             </div>
           {{/if}}
@@ -103,7 +103,7 @@
 
 {{#unless popular}}
   <div class="modal-footer">
-    {{d-button action=(action "installTheme") disabled=installDisabled class='btn btn-primary' label=submitLabel}}
+    {{d-button action=(action "installTheme") disabled=installDisabled class="btn btn-primary" label=submitLabel}}
     {{d-modal-cancel close=(route-action "closeModal")}}
   </div>
 {{/unless}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
index 0b123cdc6a..5e18b4cfb4 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body title="admin.user.silence_modal_title"}}
   {{#conditional-loading-spinner condition=loadingUser}}
 
-    <div class='until-controls'>
+    <div class="until-controls">
       <label>
         {{future-date-input
           class="silence-until"
diff --git a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
index a10ecd9c95..24e837efea 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
@@ -2,7 +2,7 @@
   {{#conditional-loading-spinner condition=loadingUser}}
 
     {{#if user.canSuspend}}
-      <div class='until-controls'>
+      <div class="until-controls">
         <label>
           {{future-date-input
             class="suspend-until"
@@ -24,7 +24,7 @@
       {{/if}}
 
     {{else}}
-      <div class='cant-suspend'>
+      <div class="cant-suspend">
         {{i18n "admin.user.cant_suspend"}}
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
index 724af5ace4..1a50682819 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
@@ -9,7 +9,7 @@
     {{#if theme.installed}}
       <span>{{i18n "admin.customize.theme.installed"}}</span>
     {{else}}
-      {{d-button class='btn-small'
+      {{d-button class="btn-small"
         label="admin.customize.theme.install"
         disabled=installDisabled
         icon="upload"
diff --git a/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs b/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs
index 38a08b7627..cd3e3c6745 100644
--- a/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs
+++ b/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs
@@ -3,6 +3,6 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button action=(action "updateExistingUsers") class='btn-primary' label='admin.site_settings.default_categories.modal_yes'}}
-  {{d-button action=(action "cancel") label='admin.site_settings.default_categories.modal_no'}}
+  {{d-button action=(action "updateExistingUsers") class="btn-primary" label="admin.site_settings.default_categories.modal_yes"}}
+  {{d-button action=(action "cancel") label="admin.site_settings.default_categories.modal_no"}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs
index a9f1067909..dcfca2a918 100644
--- a/app/assets/javascripts/admin/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/templates/permalinks.hbs
@@ -1,8 +1,8 @@
 <div class="permalink-title">
-  <h2>{{i18n 'admin.permalink.title'}}</h2>
+  <h2>{{i18n "admin.permalink.title"}}</h2>
 </div>
 <div class="permalink-description">
-  <span>{{i18n 'admin.permalink.description'}}</span>
+  <span>{{i18n "admin.permalink.description"}}</span>
 </div>
 <div class="permalink-search">
   {{text-field value=filter class="url-input" placeholderKey="admin.permalink.form.filter" autocorrect="off" autocapitalize="off"}}
@@ -12,10 +12,10 @@
 
 {{#conditional-loading-spinner condition=loading}}
   {{#if model.length}}
-    <table class='admin-logs-table permalinks grid'>
+    <table class="admin-logs-table permalinks grid">
       <thead class="heading-container">
-        <th class="col heading first url">{{i18n 'admin.permalink.url'}}</th>
-        <th class="col heading destination">{{i18n 'admin.permalink.destination'}}</th>
+        <th class="col heading first url">{{i18n "admin.permalink.url"}}</th>
+        <th class="col heading destination">{{i18n "admin.permalink.destination"}}</th>
         <th class="col heading actions"></th>
       </thead>
       <tbody>
@@ -47,6 +47,6 @@
       </tbody>
     </table>
   {{else}}
-    {{i18n 'search.no_results'}}
+    {{i18n "search.no_results"}}
   {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/plugins.hbs b/app/assets/javascripts/admin/templates/plugins.hbs
index dbe648daef..9dad110efc 100644
--- a/app/assets/javascripts/admin/templates/plugins.hbs
+++ b/app/assets/javascripts/admin/templates/plugins.hbs
@@ -1,5 +1,5 @@
-<div class='admin-controls'>
-  <div class='controls'>
+<div class="admin-controls">
+  <div class="controls">
     {{d-button action=(action "toggleMenu") class="menu-toggle" icon="bars"}}
 
     {{#if currentUser.admin}}
@@ -15,7 +15,7 @@
 
 <div class="admin-nav pull-left">
   <ul class="nav nav-stacked">
-    {{nav-item route='adminPlugins.index' label="admin.plugins.title"}}
+    {{nav-item route="adminPlugins.index" label="admin.plugins.title"}}
 
     {{#each adminRoutes as |route|}}
       {{nav-item route=route.full_location label=route.label}}
diff --git a/app/assets/javascripts/admin/templates/search-logs-index.hbs b/app/assets/javascripts/admin/templates/search-logs-index.hbs
index a0cb23a89b..baf516489d 100644
--- a/app/assets/javascripts/admin/templates/search-logs-index.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-index.hbs
@@ -11,28 +11,28 @@
 {{#conditional-loading-spinner condition=loading}}
   {{#if model.length}}
 
-    <table class='search-logs-list grid'>
+    <table class="search-logs-list grid">
       <thead>
-        <th class="col heading term">{{i18n 'admin.logs.search_logs.term'}}</th>
-        <th class="col heading">{{i18n 'admin.logs.search_logs.searches'}}</th>
-        <th class="col heading">{{i18n 'admin.logs.search_logs.click_through_rate'}}</th>
+        <th class="col heading term">{{i18n "admin.logs.search_logs.term"}}</th>
+        <th class="col heading">{{i18n "admin.logs.search_logs.searches"}}</th>
+        <th class="col heading">{{i18n "admin.logs.search_logs.click_through_rate"}}</th>
       </thead>
       <tbody>
         {{#each model as |item|}}
           <tr class="admin-list-item">
             <td class="col term">
-              {{#link-to 'adminSearchLogs.term' (query-params term=item.term period=period) class="test"}}
+              {{#link-to "adminSearchLogs.term" (query-params term=item.term period=period) class="test"}}
                 {{item.term}}
               {{/link-to}}
             </td>
-            <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.searches'}}</div>{{item.searches}}</td>
-            <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.click_through_rate'}}</div>{{item.ctr}}%</td>
+            <td class="col"><div class="label">{{i18n "admin.logs.search_logs.searches"}}</div>{{item.searches}}</td>
+            <td class="col"><div class="label">{{i18n "admin.logs.search_logs.click_through_rate"}}</div>{{item.ctr}}%</td>
           </tr>
         {{/each}}
       </tbody>
     </table>
 
   {{else}}
-    {{i18n 'search.no_results'}}
+    {{i18n "search.no_results"}}
   {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index c38b4c9e59..5014fd7b90 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -9,7 +9,7 @@
 </div>
 
 <h2>
-  {{#link-to 'full-page-search' (query-params q=term)}}{{term}}{{/link-to}}
+  {{#link-to "full-page-search" (query-params q=term)}}{{term}}{{/link-to}}
 </h2>
 
 {{#conditional-loading-spinner condition=refreshing}}
@@ -19,22 +19,22 @@
   <h2> {{i18n "admin.logs.search_logs.header_search_results"}} </h2>
   <br>
 
-  <div class='header-search-results'>
+  <div class="header-search-results">
     {{#each model.search_result.posts as |result|}}
-      <div class='fps-result'>
-        <div class='author'>
+      <div class="fps-result">
+        <div class="author">
           <a href={{result.userPath}} data-user-card={{result.username}}>
             {{avatar result imageSize="large"}}
           </a>
         </div>
 
-        <div class='fps-topic'>
-          <div class='topic'>
-            <a class='search-link' href={{result.url}}>
-              {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+        <div class="fps-topic">
+          <div class="topic">
+            <a href={{result.url}} class="search-link">
+              {{topic-status topic=result.topic disableActions=true}}<span class="topic-title">{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
             </a>
 
-            <div class='search-category'>
+            <div class="search-category">
               {{#if result.topic.category.parentCategory}}
                 {{category-link result.topic.category.parentCategory}}
               {{/if}}
@@ -45,8 +45,8 @@
             </div>
           </div>
 
-          <div class='blurb container'>
-            <span class='date'>
+          <div class="blurb container">
+            <span class="date">
               {{format-age result.created_at}}
               {{#if result.blurb}}
                 -
diff --git a/app/assets/javascripts/admin/templates/site-settings-category.hbs b/app/assets/javascripts/admin/templates/site-settings-category.hbs
index 2e97b008d4..3703cf3c8f 100644
--- a/app/assets/javascripts/admin/templates/site-settings-category.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings-category.hbs
@@ -4,10 +4,10 @@
       {{site-setting setting=setting afterSave=(route-action "refreshAll")}}
     {{/each}}
     {{#if category.hasMore}}
-      <p class="warning">{{i18n 'admin.site_settings.more_than_30_results'}}</p>
+      <p class="warning">{{i18n "admin.site_settings.more_than_30_results"}}</p>
     {{/if}}
   {{/d-section}}
 {{else}}
   <br>
-  {{i18n 'admin.site_settings.no_results'}}
+  {{i18n "admin.site_settings.no_results"}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/site-settings.hbs b/app/assets/javascripts/admin/templates/site-settings.hbs
index 01264be5b5..c316639558 100644
--- a/app/assets/javascripts/admin/templates/site-settings.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings.hbs
@@ -1,14 +1,14 @@
-<div class='admin-controls'>
+<div class="admin-controls">
 
-  <div class='controls'>
+  <div class="controls">
     {{d-button action=(action "toggleMenu") class="menu-toggle" icon="bars"}}
     {{text-field id="setting-filter" value=filter placeholderKey="type_to_filter" class="no-blur"}}
     {{d-button class="btn-default" id="clear-filter" action=(action "clearFilter") label="admin.site_settings.clear_filter"}}
   </div>
-  <div class='search controls'>
+  <div class="search controls">
     <label>
       {{input type="checkbox" checked=onlyOverridden}}
-      {{i18n 'admin.settings.show_overriden'}}
+      {{i18n "admin.settings.show_overriden"}}
     </label>
   </div>
 </div>
@@ -17,7 +17,7 @@
   <ul class="nav nav-stacked">
     {{#each visibleSiteSettings as |category|}}
       <li class={{category.nameKey}}>
-        {{#link-to 'adminSiteSettingsCategory' category.nameKey class=category.nameKey}}
+        {{#link-to "adminSiteSettingsCategory" category.nameKey class=category.nameKey}}
           {{category.name}}
           {{#if category.count}}<span class="count">({{category.count}})</span>{{/if}}
         {{/link-to}}
diff --git a/app/assets/javascripts/admin/templates/site-text-edit.hbs b/app/assets/javascripts/admin/templates/site-text-edit.hbs
index dc42c3ba26..279a5a5acb 100644
--- a/app/assets/javascripts/admin/templates/site-text-edit.hbs
+++ b/app/assets/javascripts/admin/templates/site-text-edit.hbs
@@ -1,6 +1,6 @@
-<div class='edit-site-text'>
+<div class="edit-site-text">
 
-  <div class='title'>
+  <div class="title">
     <h3>{{siteText.id}}</h3>
   </div>
 
@@ -12,9 +12,9 @@
     {{/if}}
   {{/save-controls}}
 
-  {{#link-to 'adminSiteText.index' class="go-back"}}
-    {{d-icon 'arrow-left'}}
-    {{i18n 'admin.site_text.go_back'}}
+  {{#link-to "adminSiteText.index" class="go-back"}}
+    {{d-icon "arrow-left"}}
+    {{i18n "admin.site_text.go_back"}}
   {{/link-to}}
 
 </div>
diff --git a/app/assets/javascripts/admin/templates/site-text-index.hbs b/app/assets/javascripts/admin/templates/site-text-index.hbs
index de6b4e707d..fa72cc36f4 100644
--- a/app/assets/javascripts/admin/templates/site-text-index.hbs
+++ b/app/assets/javascripts/admin/templates/site-text-index.hbs
@@ -1,4 +1,4 @@
-<div class='search-area'>
+<div class="search-area">
   <p>{{i18n "admin.site_text.description"}}</p>
 
   {{text-field value=q
@@ -18,7 +18,7 @@
   <p class="filter-options">
     <label>
       {{input type="checkbox" checked=overridden click=(action "toggleOverridden")}}
-      {{i18n 'admin.site_text.show_overriden'}}
+      {{i18n "admin.site_text.show_overriden"}}
     </label>
   </p>
 </div>
@@ -33,6 +33,6 @@
   {{/each}}
 
   {{#if siteTexts.extras.has_more}}
-    <p class="warning">{{i18n 'admin.site_text.more_than_50_results'}}</p>
+    <p class="warning">{{i18n "admin.site_text.more_than_50_results"}}</p>
   {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/site-text.hbs b/app/assets/javascripts/admin/templates/site-text.hbs
index e12a542d79..5f63ea5b7e 100644
--- a/app/assets/javascripts/admin/templates/site-text.hbs
+++ b/app/assets/javascripts/admin/templates/site-text.hbs
@@ -1,3 +1,3 @@
-<div class='row site-texts'>
+<div class="row site-texts">
   {{outlet}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index f85db56737..a5e66640d3 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -1,21 +1,21 @@
-<div class='admin-controls'>
+<div class="admin-controls">
   <nav>
-    <ul class='nav nav-pills'>
-      <li>{{#link-to 'adminUser' user}}{{d-icon "caret-left"}} &nbsp;{{user.username}}{{/link-to}}</li>
+    <ul class="nav nav-pills">
+      <li>{{#link-to "adminUser" user}}{{d-icon "caret-left"}} &nbsp;{{user.username}}{{/link-to}}</li>
     </ul>
   </nav>
 </div>
 
 {{#conditional-loading-spinner condition=loading}}
-  <div class='admin-container user-badges'>
-    <h2>{{i18n 'admin.badges.grant_badge'}}</h2>
+  <div class="admin-container user-badges">
+    <h2>{{i18n "admin.badges.grant_badge"}}</h2>
     <br>
     {{#if noGrantableBadges}}
-      <p>{{i18n 'admin.badges.no_badges'}}</p>
+      <p>{{i18n "admin.badges.no_badges"}}</p>
     {{else}}
       <form class="form-horizontal">
         <div>
-          <label>{{i18n 'admin.badges.badge'}}</label>
+          <label>{{i18n "admin.badges.badge"}}</label>
           {{combo-box
             filterable=true
             value=selectedBadgeId
@@ -24,8 +24,8 @@
           }}
         </div>
         <div>
-          <label>{{i18n 'admin.badges.reason'}}</label>
-          {{input type="text" value=badgeReason}}<br><small>{{i18n 'admin.badges.reason_help'}}</small>
+          <label>{{i18n "admin.badges.reason"}}</label>
+          {{input type="text" value=badgeReason}}<br><small>{{i18n "admin.badges.reason_help"}}</small>
         </div>
         {{d-button
           class="btn-primary"
@@ -35,25 +35,25 @@
       </form>
     {{/if}}
 
-    <table id='user-badges'>
+    <table id="user-badges">
       <tbody>
         <tr>
-          <th>{{i18n 'admin.badges.badge'}}</th>
-          <th>{{i18n 'admin.badges.granted_by'}}</th>
-          <th class='reason'>{{i18n 'admin.badges.reason'}}</th>
-          <th>{{i18n 'admin.badges.granted_at'}}</th>
+          <th>{{i18n "admin.badges.badge"}}</th>
+          <th>{{i18n "admin.badges.granted_by"}}</th>
+          <th class="reason">{{i18n "admin.badges.reason"}}</th>
+          <th>{{i18n "admin.badges.granted_at"}}</th>
           <th></th>
         </tr>
         {{#each groupedBadges as |userBadge|}}
           <tr>
             <td>{{user-badge badge=userBadge.badge count=userBadge.count}}</td>
             <td>
-              {{#link-to 'adminUser' userBadge.badge.granted_by}}
+              {{#link-to "adminUser" userBadge.badge.granted_by}}
                 {{avatar userBadge.granted_by imageSize="tiny"}}
                 {{userBadge.granted_by.username}}
               {{/link-to}}
             </td>
-            <td class='reason'>
+            <td class="reason">
               {{#if userBadge.postUrl}}
                 <a href={{userBadge.postUrl}}>{{userBadge.topic_title}}</a>
               {{/if}}
@@ -75,7 +75,7 @@
         {{else}}
           <tr>
             <td colspan="5">
-              <p>{{i18n 'admin.badges.no_user_badges' name=user.username}}</p>
+              <p>{{i18n "admin.badges.no_user_badges" name=user.username}}</p>
             </td>
           </tr>
         {{/each}}
diff --git a/app/assets/javascripts/admin/templates/user-fields.hbs b/app/assets/javascripts/admin/templates/user-fields.hbs
index a766d86269..a14119e92b 100644
--- a/app/assets/javascripts/admin/templates/user-fields.hbs
+++ b/app/assets/javascripts/admin/templates/user-fields.hbs
@@ -1,7 +1,7 @@
-<div class='user-fields'>
-  <h2>{{i18n 'admin.user_fields.title'}}</h2>
+<div class="user-fields">
+  <h2>{{i18n "admin.user_fields.title"}}</h2>
 
-  <p class="desc">{{i18n 'admin.user_fields.help'}}</p>
+  <p class="desc">{{i18n "admin.user_fields.help"}}</p>
 
   {{#if model}}
     {{#each sortedFields as |uf|}}
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 6cabbb87ad..c23c88a3d6 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -1,4 +1,4 @@
-<section class="details {{unless model.active 'not-activated'}}">
+<section class="details {{unless model.active "not-activated"}}">
   <div class="user-controls">
     {{#if model.canViewProfile}}
       {{#link-to "user" model class="btn btn-default"}}
@@ -604,7 +604,7 @@
     </div>
     <div class="controls">
       {{#if model.flags_received_count}}
-        {{#link-to 'review' (query-params username=model.username type="ReviewableFlaggedPost" status="all") class="btn"}}
+        {{#link-to "review" (query-params username=model.username type="ReviewableFlaggedPost" status="all") class="btn"}}
           {{i18n "admin.user.show_flags_received"}}
         {{/link-to}}
       {{/if}}
diff --git a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
index 8fcc81a7ce..6a76b438a1 100644
--- a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
+++ b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
@@ -1,109 +1,109 @@
-<div class='admin-controls'>
+<div class="admin-controls">
   <nav>
     <ul class="nav nav-pills">
-      <li>{{#link-to 'adminUser' model}}{{d-icon "caret-left"}} &nbsp;{{model.username}}{{/link-to}}</li>
-      <li>{{#link-to 'adminUsersList.show' 'member'}}{{i18n 'admin.user.trust_level_2_users'}}{{/link-to}}</li>
+      <li>{{#link-to "adminUser" model}}{{d-icon "caret-left"}} &nbsp;{{model.username}}{{/link-to}}</li>
+      <li>{{#link-to "adminUsersList.show" "member"}}{{i18n "admin.user.trust_level_2_users"}}{{/link-to}}</li>
     </ul>
   </nav>
 </div>
 
 <div class="admin-container tl3-requirements">
-  <h2>{{model.username}} - {{i18n 'admin.user.tl3_requirements.title'}}</h2>
+  <h2>{{model.username}} - {{i18n "admin.user.tl3_requirements.title"}}</h2>
   <br>
-  <p>{{i18n 'admin.user.tl3_requirements.table_title' count=model.tl3Requirements.time_period}}</p>
+  <p>{{i18n "admin.user.tl3_requirements.table_title" count=model.tl3Requirements.time_period}}</p>
 
   <table class="table" style="width: auto;">
     <thead>
       <tr>
         <th></th>
         <th></th>
-        <th>{{i18n 'admin.user.tl3_requirements.value_heading'}}</th>
-        <th>{{i18n 'admin.user.tl3_requirements.requirement_heading'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.value_heading"}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.requirement_heading"}}</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.visits'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.visits"}}</th>
         <td>{{check-icon model.tl3Requirements.met.days_visited}}</td>
         <td>
-          {{model.tl3Requirements.days_visited_percent}}% ({{model.tl3Requirements.days_visited}} / {{model.tl3Requirements.time_period}} {{i18n 'admin.user.tl3_requirements.days'}})
+          {{model.tl3Requirements.days_visited_percent}}% ({{model.tl3Requirements.days_visited}} / {{model.tl3Requirements.time_period}} {{i18n "admin.user.tl3_requirements.days"}})
         </td>
         <td>{{model.tl3Requirements.min_days_visited_percent}}%</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.topics_replied_to'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.topics_replied_to"}}</th>
         <td>{{check-icon model.tl3Requirements.met.topics_replied_to}}</td>
         <td>{{model.tl3Requirements.num_topics_replied_to}}</td>
         <td>{{model.tl3Requirements.min_topics_replied_to}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.topics_viewed'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.topics_viewed"}}</th>
         <td>{{check-icon model.tl3Requirements.met.topics_viewed}}</td>
         <td>{{model.tl3Requirements.topics_viewed}}</td>
         <td>{{model.tl3Requirements.min_topics_viewed}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.topics_viewed_all_time'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.topics_viewed_all_time"}}</th>
         <td>{{check-icon model.tl3Requirements.met.topics_viewed_all_time}}</td>
         <td>{{model.tl3Requirements.topics_viewed_all_time}}</td>
         <td>{{model.tl3Requirements.min_topics_viewed_all_time}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.posts_read'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.posts_read"}}</th>
         <td>{{check-icon model.tl3Requirements.met.posts_read}}</td>
         <td>{{model.tl3Requirements.posts_read}}</td>
         <td>{{model.tl3Requirements.min_posts_read}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.posts_read_all_time'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.posts_read_all_time"}}</th>
         <td>{{check-icon model.tl3Requirements.met.posts_read_all_time}}</td>
         <td>{{model.tl3Requirements.posts_read_all_time}}</td>
         <td>{{model.tl3Requirements.min_posts_read_all_time}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.flagged_posts'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.flagged_posts"}}</th>
         <td>{{check-icon model.tl3Requirements.met.flagged_posts}}</td>
         <td>{{model.tl3Requirements.num_flagged_posts}}</td>
-        <td>{{i18n 'max_of_count' count=model.tl3Requirements.max_flagged_posts}}</td>
+        <td>{{i18n "max_of_count" count=model.tl3Requirements.max_flagged_posts}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.flagged_by_users'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.flagged_by_users"}}</th>
         <td>{{check-icon model.tl3Requirements.met.flagged_by_users}}</td>
         <td>{{model.tl3Requirements.num_flagged_by_users}}</td>
-        <td>{{i18n 'max_of_count' count=model.tl3Requirements.max_flagged_by_users}}</td>
+        <td>{{i18n "max_of_count" count=model.tl3Requirements.max_flagged_by_users}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.likes_given'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.likes_given"}}</th>
         <td>{{check-icon model.tl3Requirements.met.likes_given}}</td>
         <td>{{model.tl3Requirements.num_likes_given}}</td>
         <td>{{model.tl3Requirements.min_likes_given}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.likes_received'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.likes_received"}}</th>
         <td>{{check-icon model.tl3Requirements.met.likes_received}}</td>
         <td>{{model.tl3Requirements.num_likes_received}}</td>
         <td>{{model.tl3Requirements.min_likes_received}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.likes_received_days'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.likes_received_days"}}</th>
         <td>{{check-icon model.tl3Requirements.met.likes_received_days}}</td>
         <td>{{model.tl3Requirements.num_likes_received_days}}</td>
         <td>{{model.tl3Requirements.min_likes_received_days}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.likes_received_users'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.likes_received_users"}}</th>
         <td>{{check-icon model.tl3Requirements.met.likes_received_users}}</td>
         <td>{{model.tl3Requirements.num_likes_received_users}}</td>
         <td>{{model.tl3Requirements.min_likes_received_users}}</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.silenced'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.silenced"}}</th>
         <td>{{check-icon model.tl3Requirements.met.silenced}}</td>
         <td>{{model.tl3Requirements.penalty_counts.silenced}}</td>
         <td>0</td>
       </tr>
       <tr>
-        <th>{{i18n 'admin.user.tl3_requirements.suspended'}}</th>
+        <th>{{i18n "admin.user.tl3_requirements.suspended"}}</th>
         <td>{{check-icon model.tl3Requirements.met.suspended}}</td>
         <td>{{model.tl3Requirements.penalty_counts.suspended}}</td>
         <td>0</td>
@@ -118,24 +118,24 @@
         {{! tl implicitly not locked }}
         {{#if model.tl3Requirements.on_grace_period}}
           {{d-icon "times"}}
-          {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
+          {{i18n "admin.user.tl3_requirements.on_grace_period"}}
         {{else}}
           {{! not on grace period }}
           {{d-icon "times"}}
-          {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
-          {{i18n 'admin.user.tl3_requirements.will_be_demoted'}}
+          {{i18n "admin.user.tl3_requirements.does_not_qualify"}}
+          {{i18n "admin.user.tl3_requirements.will_be_demoted"}}
         {{/if}}
       {{else}}
         {{! requirements not lost - remains tl3 }}
         {{#if model.tl3Requirements.trust_level_locked}}
           {{d-icon "lock"}}
-          {{i18n 'admin.user.tl3_requirements.locked_will_not_be_demoted'}}
+          {{i18n "admin.user.tl3_requirements.locked_will_not_be_demoted"}}
         {{else}}
           {{! tl not locked }}
           {{d-icon "check"}}
-          {{i18n 'admin.user.tl3_requirements.qualifies'}}
+          {{i18n "admin.user.tl3_requirements.qualifies"}}
           {{#if model.tl3Requirements.on_grace_period}}
-            {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
+            {{i18n "admin.user.tl3_requirements.on_grace_period"}}
           {{/if}}
         {{/if}}
       {{/if}}
@@ -144,13 +144,13 @@
       {{#if model.tl3Requirements.requirements_met}}
         {{! met & not tl3 - will be promoted}}
         {{d-icon "check"}}
-        {{i18n 'admin.user.tl3_requirements.qualifies'}}
-        {{i18n 'admin.user.tl3_requirements.will_be_promoted'}}
+        {{i18n "admin.user.tl3_requirements.qualifies"}}
+        {{i18n "admin.user.tl3_requirements.will_be_promoted"}}
       {{else}}
         {{! requirements not met - remains regular }}
         {{#if model.tl3Requirements.trust_level_locked}}
           {{d-icon "lock"}}
-          {{i18n 'admin.user.tl3_requirements.locked_will_not_be_promoted'}}
+          {{i18n "admin.user.tl3_requirements.locked_will_not_be_promoted"}}
         {{else}}
           {{d-icon "times"}}
         {{/if}}
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 6b0253aeda..e96f794a67 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -15,65 +15,65 @@
   {{/if}}
 </div>
 
-<div class='username controls'>
+<div class="username controls">
   {{text-field value=listFilter placeholder=searchHint}}
 </div>
 
 {{#load-more selector=".users-list tr" action=(action "loadMore")}}
   {{#if model}}
-    <table class='table users-list grid'>
+    <table class="table users-list grid">
       <thead>
-        {{admin-directory-toggle field="username" i18nKey='username' order=order ascending=ascending}}
-        {{admin-directory-toggle field="email" i18nKey='email' order=order ascending=ascending}}
-        {{admin-directory-toggle field="last_emailed" i18nKey='admin.users.last_emailed' order=order ascending=ascending}}
-        {{admin-directory-toggle field="seen" i18nKey='last_seen' order=order ascending=ascending}}
+        {{admin-directory-toggle field="username" i18nKey="username" order=order ascending=ascending}}
+        {{admin-directory-toggle field="email" i18nKey="email" order=order ascending=ascending}}
+        {{admin-directory-toggle field="last_emailed" i18nKey="admin.users.last_emailed" order=order ascending=ascending}}
+        {{admin-directory-toggle field="seen" i18nKey="last_seen" order=order ascending=ascending}}
         {{admin-directory-toggle field="topics_viewed" i18nKey="admin.user.topics_entered" order=order ascending=ascending}}
         {{admin-directory-toggle field="posts_read" i18nKey="admin.user.posts_read_count" order=order ascending=ascending}}
         {{admin-directory-toggle field="read_time" i18nKey="admin.user.time_read" order=order ascending=ascending}}
         {{admin-directory-toggle field="created" i18nKey="created" order=order ascending=ascending}}
         {{#if siteSettings.must_approve_users}}
-          <th>{{i18n 'admin.users.approved'}}</th>
+          <th>{{i18n "admin.users.approved"}}</th>
         {{/if}}
         <th>&nbsp;</th>
       </thead>
       <tbody>
         {{#each model as |user|}}
-          <tr class="user {{user.selected}} {{unless user.active 'not-activated'}}">
+          <tr class="user {{user.selected}} {{unless user.active "not-activated"}}">
             <td class="username">
               <a href={{user.path}} data-user-card={{user.username}}>
                 {{avatar user imageSize="small"}}
               </a>
-              {{#link-to 'adminUser' user}}{{user.username}}{{/link-to}}
+              {{#link-to "adminUser" user}}{{user.username}}{{/link-to}}
               {{#if user.staged}}
                 {{d-icon "far-envelope" title="user.staged" }}
               {{/if}}
             </td>
-            <td class='email'>
+            <td class="email">
               {{~user.email~}}
             </td>
             <td class="last-emailed">
-              <div class="label">{{i18n 'admin.users.last_emailed'}}</div>
+              <div class="label">{{i18n "admin.users.last_emailed"}}</div>
               <div>{{format-duration user.last_emailed_age}}</div>
             </td>
             <td class="last-seen">
-              <div class="label">{{i18n 'last_seen'}}</div>
+              <div class="label">{{i18n "last_seen"}}</div>
               <div>{{format-duration user.last_seen_age}}</div>
             </td>
             <td class="topics-entered">
-              <div class="label">{{i18n 'admin.user.topics_entered'}}</div>
+              <div class="label">{{i18n "admin.user.topics_entered"}}</div>
               <div>{{number user.topics_entered}}</div>
             </td>
             <td class="posts-read">
-              <div class="label">{{i18n 'admin.user.posts_read_count'}}</div>
+              <div class="label">{{i18n "admin.user.posts_read_count"}}</div>
               <div>{{number user.posts_read_count}}</div>
             </td>
             <td class="time-read">
-              <div class="label">{{i18n 'admin.user.time_read'}}</div>
+              <div class="label">{{i18n "admin.user.time_read"}}</div>
               <div>{{format-duration user.time_read}}</div>
             </td>
 
             <td class="created">
-              <div class="label">{{i18n 'created'}}</div>
+              <div class="label">{{i18n "created"}}</div>
               <div>{{format-duration user.created_at_age}}</div>
             </td>
 
@@ -100,6 +100,6 @@
     {{conditional-loading-spinner condition=refreshing}}
 
   {{else}}
-    <p>{{i18n 'search.no_results'}}</p>
+    <p>{{i18n "search.no_results"}}</p>
   {{/if}}
 {{/load-more}}
diff --git a/app/assets/javascripts/admin/templates/users-list.hbs b/app/assets/javascripts/admin/templates/users-list.hbs
index 2e1fe0c3ab..27d3684917 100644
--- a/app/assets/javascripts/admin/templates/users-list.hbs
+++ b/app/assets/javascripts/admin/templates/users-list.hbs
@@ -1,13 +1,13 @@
-<div class='admin-controls'>
+<div class="admin-controls">
   <nav>
     <ul class="nav nav-pills">
-      {{nav-item route='adminUsersList.show' routeParam='active' label='admin.users.nav.active'}}
-      {{nav-item route='adminUsersList.show' routeParam='new' label='admin.users.nav.new'}}
-      {{nav-item route='adminUsersList.show' routeParam='staff' label='admin.users.nav.staff'}}
-      {{nav-item route='adminUsersList.show' routeParam='suspended' label='admin.users.nav.suspended'}}
-      {{nav-item route='adminUsersList.show' routeParam='silenced' label='admin.users.nav.silenced'}}
-      {{nav-item route='adminUsersList.show' routeParam='staged' label='admin.users.nav.staged'}}
-      {{nav-item route='groups' label='groups.index.title'}}
+      {{nav-item route="adminUsersList.show" routeParam="active" label="admin.users.nav.active"}}
+      {{nav-item route="adminUsersList.show" routeParam="new" label="admin.users.nav.new"}}
+      {{nav-item route="adminUsersList.show" routeParam="staff" label="admin.users.nav.staff"}}
+      {{nav-item route="adminUsersList.show" routeParam="suspended" label="admin.users.nav.suspended"}}
+      {{nav-item route="adminUsersList.show" routeParam="silenced" label="admin.users.nav.silenced"}}
+      {{nav-item route="adminUsersList.show" routeParam="staged" label="admin.users.nav.staged"}}
+      {{nav-item route="groups" label="groups.index.title"}}
 
       <li class="admin-actions">
         {{#if currentUser.can_invite_to_forum}}
diff --git a/app/assets/javascripts/admin/templates/watched-words-action.hbs b/app/assets/javascripts/admin/templates/watched-words-action.hbs
index 68222ccedb..4f15862a8a 100644
--- a/app/assets/javascripts/admin/templates/watched-words-action.hbs
+++ b/app/assets/javascripts/admin/templates/watched-words-action.hbs
@@ -24,7 +24,7 @@
 <div>
   <label class="show-words-checkbox">
     {{input type="checkbox" checked=adminWatchedWords.showWords disabled=adminWatchedWords.disableShowWords}}
-    {{i18n 'admin.watched_words.show_words'}}
+    {{i18n "admin.watched_words.show_words"}}
   </label>
 </div>
 <div class="watched-words-list">
@@ -33,7 +33,7 @@
       <div class="watched-word-box">{{admin-watched-word word=word action=(action "recordRemoved")}}</div>
     {{/each}}
   {{else}}
-    {{i18n 'admin.watched_words.word_count' count=wordCount}}
+    {{i18n "admin.watched_words.word_count" count=wordCount}}
   {{/if}}
 </div>
 
diff --git a/app/assets/javascripts/admin/templates/watched-words.hbs b/app/assets/javascripts/admin/templates/watched-words.hbs
index 6897721197..02f81d7866 100644
--- a/app/assets/javascripts/admin/templates/watched-words.hbs
+++ b/app/assets/javascripts/admin/templates/watched-words.hbs
@@ -1,5 +1,5 @@
-<div class='admin-controls'>
-  <div class='controls'>
+<div class="admin-controls">
+  <div class="controls">
     {{d-button action=(action "toggleMenu") class="menu-toggle" icon="bars"}}
     {{text-field value=filter placeholderKey="admin.watched_words.search" class="no-blur"}}
     {{d-button action=(action "clearFilter") label="admin.watched_words.clear_filter"}}
@@ -10,7 +10,7 @@
   <ul class="nav nav-stacked">
     {{#each model as |action|}}
       <li class={{action.nameKey}}>
-        {{#link-to 'adminWatchedWords.action' action.nameKey}}
+        {{#link-to "adminWatchedWords.action" action.nameKey}}
           {{action.name}}
           {{#if action.count}}<span class="count">({{action.count}})</span>{{/if}}
         {{/link-to}}
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
index 7161ff0a0a..14557341d8 100644
--- a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
@@ -1,27 +1,27 @@
 <div class="web-hook-direction">
-  {{#link-to 'adminWebHooks' tagName='button' classNames='btn'}}
-    {{d-icon 'list'}} {{i18n 'admin.web_hooks.events.go_list'}}
+  {{#link-to "adminWebHooks" tagName="button" classNames="btn"}}
+    {{d-icon "list"}} {{i18n "admin.web_hooks.events.go_list"}}
   {{/link-to}}
   {{d-button icon="paper-plane" label="admin.web_hooks.events.ping" action=(action "ping") disabled=pingDisabled}}
-  {{#link-to 'adminWebHooks.show' model.extras.web_hook_id tagName='button' classNames='btn'}}
-    {{d-icon 'far-edit'}} {{i18n 'admin.web_hooks.events.go_details'}}
+  {{#link-to "adminWebHooks.show" model.extras.web_hook_id tagName="button" classNames="btn"}}
+    {{d-icon "far-edit"}} {{i18n "admin.web_hooks.events.go_details"}}
   {{/link-to}}
 </div>
 
-<div class='web-hook-events-listing'>
+<div class="web-hook-events-listing">
   {{#if model}}
     {{#load-more selector=".web-hook-events li" action=(action "loadMore")}}
-      <div class='web-hook-events content-list'>
-        <div class='heading-container'>
-          <div class='col heading first status'>{{i18n 'admin.web_hooks.events.status'}}</div>
-          <div class='col heading event-id'>{{i18n 'admin.web_hooks.events.event_id'}}</div>
-          <div class='col heading timestamp'>{{i18n 'admin.web_hooks.events.timestamp'}}</div>
-          <div class='col heading completion'>{{i18n 'admin.web_hooks.events.completion'}}</div>
-          <div class='col heading actions'>{{i18n 'admin.web_hooks.events.actions'}}</div>
-          <div class='clearfix'></div>
+      <div class="web-hook-events content-list">
+        <div class="heading-container">
+          <div class="col heading first status">{{i18n "admin.web_hooks.events.status"}}</div>
+          <div class="col heading event-id">{{i18n "admin.web_hooks.events.event_id"}}</div>
+          <div class="col heading timestamp">{{i18n "admin.web_hooks.events.timestamp"}}</div>
+          <div class="col heading completion">{{i18n "admin.web_hooks.events.completion"}}</div>
+          <div class="col heading actions">{{i18n "admin.web_hooks.events.actions"}}</div>
+          <div class="clearfix"></div>
         </div>
         {{#if hasIncoming}}
-          <a href class='alert alert-info clickable' tabindex="0" {{action "showInserted"}}>
+          <a href tabindex="0" {{action "showInserted"}} class="alert alert-info clickable">
             {{count-i18n key="admin.web_hooks.events.incoming" count=incomingCount}}
           </a>
         {{/if}}
@@ -34,6 +34,6 @@
       {{conditional-loading-spinner condition=model.loadingMore}}
     {{/load-more}}
   {{else}}
-    <p>{{i18n 'admin.web_hooks.events.none'}}</p>
+    <p>{{i18n "admin.web_hooks.events.none"}}</p>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show.hbs b/app/assets/javascripts/admin/templates/web-hooks-show.hbs
index ee7cb36eca..83540a03da 100644
--- a/app/assets/javascripts/admin/templates/web-hooks-show.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks-show.hbs
@@ -1,19 +1,19 @@
-{{#link-to 'adminWebHooks' class="go-back"}}
-  {{d-icon 'arrow-left'}}
-  {{i18n 'admin.web_hooks.go_back'}}
+{{#link-to "adminWebHooks" class="go-back"}}
+  {{d-icon "arrow-left"}}
+  {{i18n "admin.web_hooks.go_back"}}
 {{/link-to}}
 
-<div class='web-hook-container'>
-  <p>{{i18n 'admin.web_hooks.detailed_instruction'}}</p>
-  <form class='web-hook form-horizontal'>
+<div class="web-hook-container">
+  <p>{{i18n "admin.web_hooks.detailed_instruction"}}</p>
+  <form class="web-hook form-horizontal">
     <div>
-      <label for='payload-url'>{{i18n 'admin.web_hooks.payload_url'}}</label>
+      <label for="payload-url">{{i18n "admin.web_hooks.payload_url"}}</label>
       {{text-field name="payload-url" value=model.payload_url placeholderKey="admin.web_hooks.payload_url_placeholder"}}
       {{input-tip validation=urlValidation}}
     </div>
 
     <div>
-      <label for='content-type'>{{i18n 'admin.web_hooks.content_type'}}</label>
+      <label for="content-type">{{i18n "admin.web_hooks.content_type"}}</label>
       {{combo-box
         content=contentTypes
         name="content-type"
@@ -23,16 +23,16 @@
     </div>
 
     <div>
-      <label for='secret'>{{i18n 'admin.web_hooks.secret'}}</label>
+      <label for="secret">{{i18n "admin.web_hooks.secret"}}</label>
       {{text-field name="secret" value=model.secret placeholderKey="admin.web_hooks.secret_placeholder"}}
       {{input-tip validation=secretValidation}}
     </div>
 
     <div class="cbox10">
-      <label>{{i18n 'admin.web_hooks.event_chooser'}}</label>
+      <label>{{i18n "admin.web_hooks.event_chooser"}}</label>
       <div>
         {{radio-button class="subscription-choice" name="subscription-choice" value="individual" selection=model.webHookType}}
-        {{i18n 'admin.web_hooks.individual_event'}}
+        {{i18n "admin.web_hooks.individual_event"}}
         {{input-tip validation=eventTypeValidation}}
       </div>
       {{#unless model.wildcard_web_hook}}
@@ -44,57 +44,57 @@
       {{/unless}}
       <div>
         {{radio-button class="subscription-choice" name="subscription-choice" value="wildcard" selection=model.webHookType}}
-        {{i18n 'admin.web_hooks.wildcard_event'}}
+        {{i18n "admin.web_hooks.wildcard_event"}}
       </div>
     </div>
 
-    <div class='filters'>
+    <div class="filters">
       <div class="filter">
-        <label>{{d-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.categories_filter'}}</label>
+        <label>{{d-icon "circle" class="tracking"}}{{i18n "admin.web_hooks.categories_filter"}}</label>
         {{category-selector
           categories=model.categories
           onChange=(action (mut model.categories))
         }}
-        <div class="instructions">{{i18n 'admin.web_hooks.categories_filter_instructions'}}</div>
+        <div class="instructions">{{i18n "admin.web_hooks.categories_filter_instructions"}}</div>
       </div>
       {{#if showTagsFilter}}
         <div class="filter">
-          <label>{{d-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.tags_filter'}}</label>
+          <label>{{d-icon "circle" class="tracking"}}{{i18n "admin.web_hooks.tags_filter"}}</label>
           {{tag-chooser tags=model.tag_names everyTag=true excludeSynonyms=true}}
-          <div class="instructions">{{i18n 'admin.web_hooks.tags_filter_instructions'}}</div>
+          <div class="instructions">{{i18n "admin.web_hooks.tags_filter_instructions"}}</div>
         </div>
       {{/if}}
       <div class="filter">
-        <label>{{d-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.groups_filter'}}</label>
+        <label>{{d-icon "circle" class="tracking"}}{{i18n "admin.web_hooks.groups_filter"}}</label>
         {{group-selector groupNames=model.groupsFilterInName groupFinder=model.groupFinder}}
-        <div class="instructions">{{i18n 'admin.web_hooks.groups_filter_instructions'}}</div>
+        <div class="instructions">{{i18n "admin.web_hooks.groups_filter_instructions"}}</div>
       </div>
     </div>
 
     {{plugin-outlet name="web-hook-fields" args=(hash model=model)}}
 
     <div>
-      {{input type="checkbox" name="verify_certificate" checked=model.verify_certificate}} {{i18n 'admin.web_hooks.verify_certificate'}}
+      {{input type="checkbox" name="verify_certificate" checked=model.verify_certificate}} {{i18n "admin.web_hooks.verify_certificate"}}
     </div>
     <div>
       <div>
-        {{input type="checkbox" name="active" checked=model.active}} {{i18n 'admin.web_hooks.active'}}
+        {{input type="checkbox" name="active" checked=model.active}} {{i18n "admin.web_hooks.active"}}
       </div>
       {{#if model.active}}
-        <div class="instructions">{{i18n 'admin.web_hooks.active_notice'}}</div>
+        <div class="instructions">{{i18n "admin.web_hooks.active_notice"}}</div>
       {{/if}}
     </div>
   </form>
 
-  <div class='controls'>
+  <div class="controls">
     {{d-button class="btn-default" translatedLabel=saveButtonText action=(action "save") disabled=saveButtonDisabled}}
 
     {{#unless model.isNew}}
       {{d-button class="btn-danger" label="admin.web_hooks.destroy" action=(action "destroy")}}
-      {{#link-to 'adminWebHooks.showEvents' model.id class="btn"}}
-        {{i18n 'admin.web_hooks.events.go_events'}}
+      {{#link-to "adminWebHooks.showEvents" model.id class="btn"}}
+        {{i18n "admin.web_hooks.events.go_events"}}
       {{/link-to}}
     {{/unless}}
-    <span class='saving'>{{savingStatus}}</span>
+    <span class="saving">{{savingStatus}}</span>
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/web-hooks.hbs b/app/assets/javascripts/admin/templates/web-hooks.hbs
index c65964d41f..abc2b6e90e 100644
--- a/app/assets/javascripts/admin/templates/web-hooks.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks.hbs
@@ -1,29 +1,29 @@
-<div class='web-hooks-listing'>
-  <p>{{i18n 'admin.web_hooks.instruction'}}</p>
-  <div class='new-webhook'>
-    {{#link-to 'adminWebHooks.show' 'new' tagName='button' classNames='btn btn-default'}}
-      {{d-icon 'plus'}} {{i18n 'admin.web_hooks.new'}}
+<div class="web-hooks-listing">
+  <p>{{i18n "admin.web_hooks.instruction"}}</p>
+  <div class="new-webhook">
+    {{#link-to "adminWebHooks.show" "new" tagName="button" classNames="btn btn-default"}}
+      {{d-icon "plus"}} {{i18n "admin.web_hooks.new"}}
     {{/link-to}}
   </div>
   {{#if model}}
     {{#load-more selector=".web-hooks tr" action=(action "loadMore")}}
-      <table class='web-hooks grid'>
+      <table class="web-hooks grid">
         <thead>
           <tr>
-            <th>{{i18n 'admin.web_hooks.delivery_status.title'}}</th>
-            <th>{{i18n 'admin.web_hooks.payload_url'}}</th>
-            <th>{{i18n 'admin.web_hooks.description'}}</th>
-            <th>{{i18n 'admin.web_hooks.controls'}}</th>
+            <th>{{i18n "admin.web_hooks.delivery_status.title"}}</th>
+            <th>{{i18n "admin.web_hooks.payload_url"}}</th>
+            <th>{{i18n "admin.web_hooks.description"}}</th>
+            <th>{{i18n "admin.web_hooks.controls"}}</th>
           </tr>
         </thead>
         <tbody>
           {{#each model as |webHook|}}
             <tr>
-              <td class='delivery-status'>{{#link-to 'adminWebHooks.showEvents' webHook.id}}{{admin-web-hook-status deliveryStatuses=deliveryStatuses model=webHook}}{{/link-to}}</td>
-              <td class='payload-url'>{{#link-to 'adminWebHooks.show' webHook}}{{webHook.payload_url}}{{/link-to}}</td>
-              <td class='description'>{{webHook.description}}</td>
-              <td class='controls'>
-                {{#link-to 'adminWebHooks.show' webHook tagName='button' classNames='btn btn-default no-text'}}{{d-icon 'far-edit'}}{{/link-to}}
+              <td class="delivery-status">{{#link-to "adminWebHooks.showEvents" webHook.id}}{{admin-web-hook-status deliveryStatuses=deliveryStatuses model=webHook}}{{/link-to}}</td>
+              <td class="payload-url">{{#link-to "adminWebHooks.show" webHook}}{{webHook.payload_url}}{{/link-to}}</td>
+              <td class="description">{{webHook.description}}</td>
+              <td class="controls">
+                {{#link-to "adminWebHooks.show" webHook tagName="button" classNames="btn btn-default no-text"}}{{d-icon "far-edit"}}{{/link-to}}
                 {{d-button class="destroy btn-danger" action=(action "destroy") actionParam=webHook icon="times"}}
               </td>
             </tr>
@@ -33,6 +33,6 @@
       {{conditional-loading-spinner condition=model.loadingMore}}
     {{/load-more}}
   {{else}}
-    <p>{{i18n 'admin.web_hooks.none'}}</p>
+    <p>{{i18n "admin.web_hooks.none"}}</p>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index 11c0471480..63cae2c260 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -1,106 +1,106 @@
 {{#d-section pageClass="about"}}
-  <div class='container'>
-    <div class='contents clearfix body-page'>
+  <div class="container">
+    <div class="contents clearfix body-page">
 
       <ul class="nav-pills">
-        <li class="nav-item-about">{{#link-to 'about' class="active"}}{{i18n 'about.simple_title'}}{{/link-to}}</li>
+        <li class="nav-item-about">{{#link-to "about" class="active"}}{{i18n "about.simple_title"}}{{/link-to}}</li>
         {{#if faqOverriden}}
-          <li class="nav-item-guidelines">{{#link-to 'guidelines'}}{{i18n 'guidelines'}}{{/link-to}}</li>
-          <li class="nav-item-faq">{{#link-to 'faq'}}{{i18n 'faq'}}{{/link-to}}</li>
+          <li class="nav-item-guidelines">{{#link-to "guidelines"}}{{i18n "guidelines"}}{{/link-to}}</li>
+          <li class="nav-item-faq">{{#link-to "faq"}}{{i18n "faq"}}{{/link-to}}</li>
         {{else}}
-          <li class="nav-item-faq">{{#link-to 'faq'}}{{i18n 'faq'}}{{/link-to}}</li>
+          <li class="nav-item-faq">{{#link-to "faq"}}{{i18n "faq"}}{{/link-to}}</li>
         {{/if}}
-        <li class="nav-item-tos">{{#link-to 'tos'}}{{i18n 'tos'}}{{/link-to}}</li>
-        <li class="nav-item-privacy">{{#link-to 'privacy'}}{{i18n 'privacy'}}{{/link-to}}</li>
+        <li class="nav-item-tos">{{#link-to "tos"}}{{i18n "tos"}}{{/link-to}}</li>
+        <li class="nav-item-privacy">{{#link-to "privacy"}}{{i18n "privacy"}}{{/link-to}}</li>
       </ul>
 
-      <section class='about description'>
-        <h2>{{i18n 'about.title' title=model.title}}</h2>
+      <section class="about description">
+        <h2>{{i18n "about.title" title=model.title}}</h2>
         <p>{{model.description}}</p>
       </section>
 
       {{plugin-outlet name="about-after-description"
-              connectorTagName='section'
-              tagName=''
+              connectorTagName="section"
+              tagName=""
               args=(hash model=model)}}
 
       {{#if model.admins}}
-        <section class='about admins'>
-          <h3>{{d-icon "users"}} {{i18n 'about.our_admins'}}</h3>
+        <section class="about admins">
+          <h3>{{d-icon "users"}} {{i18n "about.our_admins"}}</h3>
 
           {{about-page-users users=model.admins}}
-          <div class='clearfix'></div>
+          <div class="clearfix"></div>
 
         </section>
       {{/if}}
 
       {{plugin-outlet name="about-after-admins"
-                    connectorTagName='section'
+                    connectorTagName="section"
                     args=(hash model=model)}}
 
       {{#if model.moderators}}
-        <section class='about moderators'>
-          <h3>{{d-icon "users"}} {{i18n 'about.our_moderators'}}</h3>
+        <section class="about moderators">
+          <h3>{{d-icon "users"}} {{i18n "about.our_moderators"}}</h3>
 
-          <div class='users'>
+          <div class="users">
             {{about-page-users users=model.moderators}}
           </div>
-          <div class='clearfix'></div>
+          <div class="clearfix"></div>
         </section>
       {{/if}}
 
       {{plugin-outlet name="about-after-moderators"
-                    connectorTagName='section'
+                    connectorTagName="section"
                     args=(hash model=model)}}
 
       {{#if model.category_moderators.length}}
         {{#each model.category_moderators as |cm|}}
-          <section class='about category-moderators moderators-{{cm.category.slug}}'>
+          <section class="about category-moderators moderators-{{cm.category.slug}}">
             <h3>{{category-link cm.category}}{{i18n "about.moderators"}}</h3>
-            <div class='users'>
+            <div class="users">
               {{about-page-users users=cm.moderators}}
             </div>
-            <div class='clearfix'></div>
+            <div class="clearfix"></div>
           </section>
         {{/each}}
       {{/if}}
-      <section class='about stats'>
-        <h3>{{d-icon "far-chart-bar"}}  {{i18n 'about.stats'}}</h3>
+      <section class="about stats">
+        <h3>{{d-icon "far-chart-bar"}}  {{i18n "about.stats"}}</h3>
 
-        <table class='table'>
+        <table class="table">
           <tbody>
             <tr>
               <th>&nbsp;</th>
-              <th>{{i18n 'about.stat.last_7_days'}}</th>
-              <th>{{i18n 'about.stat.last_30_days'}}</th>
-              <th>{{i18n 'about.stat.all_time'}}</th>
+              <th>{{i18n "about.stat.last_7_days"}}</th>
+              <th>{{i18n "about.stat.last_30_days"}}</th>
+              <th>{{i18n "about.stat.all_time"}}</th>
             </tr>
             <tr>
-              <td class='title'>{{i18n 'about.topic_count'}}</td>
+              <td class="title">{{i18n "about.topic_count"}}</td>
               <td>{{number model.stats.topics_7_days}}</td>
               <td>{{number model.stats.topics_30_days}}</td>
               <td>{{number model.stats.topic_count}}</td>
             </tr>
             <tr>
-              <td>{{i18n 'about.post_count'}}</td>
+              <td>{{i18n "about.post_count"}}</td>
               <td>{{number model.stats.posts_7_days}}</td>
               <td>{{number model.stats.posts_30_days}}</td>
               <td>{{number model.stats.post_count}}</td>
             </tr>
             <tr>
-              <td>{{i18n 'about.user_count'}}</td>
+              <td>{{i18n "about.user_count"}}</td>
               <td>{{number model.stats.users_7_days}}</td>
               <td>{{number model.stats.users_30_days}}</td>
               <td>{{number model.stats.user_count}}</td>
             </tr>
             <tr>
-              <td>{{i18n 'about.active_user_count'}}</td>
+              <td>{{i18n "about.active_user_count"}}</td>
               <td>{{number model.stats.active_users_7_days}}</td>
               <td>{{number model.stats.active_users_30_days}}</td>
               <td>&mdash;</td>
             </tr>
             <tr>
-              <td>{{i18n 'about.like_count'}}</td>
+              <td>{{i18n "about.like_count"}}</td>
               <td>{{number model.stats.likes_7_days}}</td>
               <td>{{number model.stats.likes_30_days}}</td>
               <td>{{number model.stats.like_count}}</td>
@@ -110,8 +110,8 @@
       </section>
 
       {{#if contactInfo}}
-        <section class='about contact'>
-          <h3>{{d-icon "far-envelope"}} {{i18n 'about.contact'}}</h3>
+        <section class="about contact">
+          <h3>{{d-icon "far-envelope"}} {{i18n "about.contact"}}</h3>
           <p>{{html-safe contactInfo}}</p>
         </section>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/account-created.hbs b/app/assets/javascripts/discourse/templates/account-created.hbs
index e2d9b1756a..46bbcd1094 100644
--- a/app/assets/javascripts/discourse/templates/account-created.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created.hbs
@@ -1,5 +1,5 @@
-<div id='simple-container'>
-  <div class='account-created'>
+<div id="simple-container">
+  <div class="account-created">
     {{outlet}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/account-created/edit-email.hbs b/app/assets/javascripts/discourse/templates/account-created/edit-email.hbs
index dfbfaba92b..677a6c5634 100644
--- a/app/assets/javascripts/discourse/templates/account-created/edit-email.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/edit-email.hbs
@@ -1,8 +1,8 @@
-<div class='ac-message'>
+<div class="ac-message">
   {{activation-email-form email=newEmail}}
 </div>
 
-<div class='activation-controls'>
+<div class="activation-controls">
   {{d-button action=(action "changeEmail")
              label="login.submit_new_email"
              disabled=submitDisabled
diff --git a/app/assets/javascripts/discourse/templates/account-created/index.hbs b/app/assets/javascripts/discourse/templates/account-created/index.hbs
index 8122270cd6..3bbbb93011 100644
--- a/app/assets/javascripts/discourse/templates/account-created/index.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/index.hbs
@@ -1,4 +1,4 @@
-<div class='ac-message'>
+<div class="ac-message">
   {{html-safe accountCreated.message}}
 </div>
 {{#if accountCreated.show_controls}}
diff --git a/app/assets/javascripts/discourse/templates/account-created/resent.hbs b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
index 16c29c4b9b..17863fd965 100644
--- a/app/assets/javascripts/discourse/templates/account-created/resent.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/resent.hbs
@@ -1,7 +1,7 @@
-<div class='ac-message'>
+<div class="ac-message">
   {{#if email}}
-    {{html-safe (i18n 'login.sent_activation_email_again' currentEmail=email)}}
+    {{html-safe (i18n "login.sent_activation_email_again" currentEmail=email)}}
   {{else}}
-    {{i18n 'login.sent_activation_email_again_generic'}}
+    {{i18n "login.sent_activation_email_again_generic"}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/badges/index.hbs b/app/assets/javascripts/discourse/templates/badges/index.hbs
index 8c7288185f..0f64b83f62 100644
--- a/app/assets/javascripts/discourse/templates/badges/index.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/index.hbs
@@ -1,11 +1,11 @@
 {{#d-section pageClass="badges"}}
-  <div class='container badges'>
-    <h1>{{i18n 'badges.title'}}</h1>
+  <div class="container badges">
+    <h1>{{i18n "badges.title"}}</h1>
 
-    <div class='badge-groups'>
+    <div class="badge-groups">
       {{#each badgeGroups as |bg|}}
-        <div class='badge-grouping'>
-          <div class='title'>
+        <div class="badge-grouping">
+          <div class="title">
             <h3>{{bg.badgeGrouping.displayName}}</h3>
           </div>
           <div class="badge-group-list">
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 38869b6f0d..7080c1af16 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -1,17 +1,17 @@
-<div class='container show-badge {{model.slug}}'>
+<div class="container show-badge {{model.slug}}">
   <h1>
-    {{#link-to 'badges.index'}}{{i18n 'badges.title'}}{{/link-to}}
+    {{#link-to "badges.index"}}{{i18n "badges.title"}}{{/link-to}}
      /
     {{model.name}}
   </h1>
 
-  <div class='show-badge-details'>
+  <div class="show-badge-details">
     {{badge-card badge=model size="large" count=userBadges.grant_count}}
-    <div class='badge-grant-info {{if hiddenSetTitle '' 'hidden'}}'>
+    <div class="badge-grant-info {{if hiddenSetTitle "" "hidden"}}">
       <div>
         {{#if canSelectTitle}}
-          <div class='grant-info-item'>
-            {{i18n 'badges.allow_title'}}
+          <div class="grant-info-item">
+            {{i18n "badges.allow_title"}}
             {{d-button
               class="btn-default pad-left"
               action=(action "toggleSetUserTitle")
@@ -19,15 +19,15 @@
           </div>
         {{/if}}
         {{#if model.multiple_grant}}
-          <div class='grant-info-item'>
-            {{i18n 'badges.multiple_grant'}}
+          <div class="grant-info-item">
+            {{i18n "badges.multiple_grant"}}
           </div>
         {{/if}}
       </div>
     </div>
 
     {{#if canSelectTitle}}
-      <div class='badge-set-title {{if hiddenSetTitle 'hidden' ''}}'>
+      <div class="badge-set-title {{if hiddenSetTitle "hidden" ""}}">
         {{badge-title selectableUserBadges=selectableUserBadges user=user}}
         {{d-button class="btn-default close-btn" action=(action "toggleSetUserTitle") label="close"}}
       </div>
@@ -40,7 +40,7 @@
         <div class="badges-granted">
           {{#each userBadges as |ub|}}
             {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
-              <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
+              <div class="granted-on">{{i18n "badges.granted_on" date=(inline-date ub.granted_at)}}</div>
               {{#if ub.post_number}}
                 <a class="post-link" href="{{ub.topic.url}}/{{ub.post_number}}">{{html-safe ub.topic.fancyTitle}}</a>
               {{/if}}
@@ -51,8 +51,8 @@
 
       {{#unless canLoadMore}}
         {{#if canShowOthers}}
-          <div class='clearfix'>
-            <a class='btn' href={{model.url}}>{{i18n 'badges.others_count' count=othersCount}}</a>
+          <div class="clearfix">
+            <a href={{model.url}} class="btn">{{i18n "badges.others_count" count=othersCount}}</a>
           </div>
         {{/if}}
       {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
index 80bbae0936..c33db7c9a5 100644
--- a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
@@ -1,13 +1,13 @@
-<label class="btn btn-default btn-icon-text" disabled={{uploading}} title={{i18n 'user.change_avatar.upload_title'}}>
+<label class="btn btn-default btn-icon-text" disabled={{uploading}} title={{i18n "user.change_avatar.upload_title"}}>
   {{d-icon "far-image"}}
   {{#if uploading}}
-    {{i18n 'uploading'}} {{uploadProgress}}%
+    {{i18n "uploading"}} {{uploadProgress}}%
   {{else}}
-    {{i18n 'upload'}}
+    {{i18n "upload"}}
   {{/if}}
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*">
 </label>
 
 {{#if imageIsNotASquare}}
-  <div class="warning">{{i18n 'user.change_avatar.image_is_not_a_square'}}</div>
+  <div class="warning">{{i18n "user.change_avatar.image_is_not_a_square"}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs b/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
index 77581a3598..90c8c9f10b 100644
--- a/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
@@ -1,4 +1,4 @@
-<label class="btn" disabled={{uploading}} title={{i18n 'admin.backups.upload.title'}}>
+<label class="btn" disabled={{uploading}} title={{i18n "admin.backups.upload.title"}}>
   {{d-icon "upload"}}&nbsp;{{uploadButtonText}}
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept=".gz">
 </label>
diff --git a/app/assets/javascripts/discourse/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
index 4fb6aa77c0..415e4738c0 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-card.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
@@ -1,17 +1,17 @@
 {{#if displayCount}}
-  <a href={{url}} class='grant-count' title={{i18n 'badges.granted' count=displayCount}}>{{displayCount}}</a>
+  <a href={{url}} title={{i18n "badges.granted" count=displayCount}} class="grant-count">{{displayCount}}</a>
 {{/if}}
 {{#if badge.has_badge}}
-  <a href={{url}} class='check-display status-checked'>{{d-icon "check"}}</a>
+  <a href={{url}} class="check-display status-checked">{{d-icon "check"}}</a>
 {{/if}}
-<div class='badge-contents'>
-  <div class='badge-icon {{badge.badgeTypeClassName}}'>
+<div class="badge-contents">
+  <div class="badge-icon {{badge.badgeTypeClassName}}">
     <a href={{url}}>{{icon-or-image badge}}</a>
   </div>
-  <div class='badge-info'>
-    <div class='badge-info-item'>
-      <h3><a href={{url}} class='badge-link'>{{badge.name}}</a></h3>
-      <div class='badge-summary'>{{html-safe summary}}</div>
+  <div class="badge-info">
+    <div class="badge-info-item">
+      <h3><a href={{url}} class="badge-link">{{badge.name}}</a></h3>
+      <div class="badge-summary">{{html-safe summary}}</div>
     </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/badge-selector.hbs b/app/assets/javascripts/discourse/templates/components/badge-selector.hbs
index c1c29859e2..5ea3c796ec 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-selector.hbs
@@ -1 +1 @@
-<input class='ember-text-field badge-names' type="text" placeholder={{placeholder}} name="badges">
+<input type="text" placeholder={{placeholder}} name="badges" class="ember-text-field badge-names">
diff --git a/app/assets/javascripts/discourse/templates/components/badge-title.hbs b/app/assets/javascripts/discourse/templates/components/badge-title.hbs
index abb66e44aa..de1e7fbafa 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-title.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-title.hbs
@@ -1,9 +1,9 @@
-<section class='user-content'>
+<section class="user-content">
   <form class="form-horizontal">
 
     <div class="control-group">
       <div class="controls">
-        <h3>{{i18n 'badges.select_badge_for_title'}}</h3>
+        <h3>{{i18n "badges.select_badge_for_title"}}</h3>
       </div>
     </div>
 
@@ -25,7 +25,7 @@
           action=(action "save")
           disabled=saving
           label=(if saving "saving" "save")}}
-        {{#if saved}}{{i18n 'saved'}}{{/if}}
+        {{#if saved}}{{i18n "saved"}}{{/if}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
index 39a6b0112d..b0c43c6639 100644
--- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
@@ -1,7 +1,7 @@
 {{#conditional-loading-spinner condition=loading}}
   {{#if hasIncoming}}
     <div class="show-mores">
-      <a tabindex="0" href {{action showInserted}} class='alert alert-info clickable'>
+      <a tabindex="0" href {{action showInserted}} class="alert alert-info clickable">
         {{count-i18n key="topic_count_" suffix="latest" count=2}}
       </a>
     </div>
@@ -23,8 +23,8 @@
     }}
   {{else}}
     {{#unless loadingMore}}
-      <div class='alert alert-info'>
-        {{i18n 'choose_topic.none_found'}}
+      <div class="alert alert-info">
+        {{i18n "choose_topic.none_found"}}
       </div>
     {{/unless}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs b/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs
index eca71a610a..9a950ed741 100644
--- a/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs
@@ -1,5 +1,5 @@
 {{#if selected}}
-  <div id='bulk-select'>
+  <div id="bulk-select">
     {{d-button class="btn-default" action=(action "showBulkActions") icon="wrench"}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/cancel-link.hbs b/app/assets/javascripts/discourse/templates/components/cancel-link.hbs
index 4455e8b8d4..311aaceae0 100644
--- a/app/assets/javascripts/discourse/templates/components/cancel-link.hbs
+++ b/app/assets/javascripts/discourse/templates/components/cancel-link.hbs
@@ -1,3 +1,3 @@
 {{#link-to route args class="cancel"}}
-  {{i18n 'cancel'}}
+  {{i18n "cancel"}}
 {{/link-to}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs
index be7ee3e4a3..29c22f16fa 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs
@@ -1,7 +1,7 @@
-<div class='column categories'>
+<div class="column categories">
   {{categories-only categories=categories}}
 </div>
 
-<div class='column'>
+<div class="column">
   {{categories-topic-list topics=topics filter="latest" class="latest-topic-list"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-and-top-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-and-top-topics.hbs
index 4e84c4d631..ebb4a35781 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-and-top-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-and-top-topics.hbs
@@ -1,7 +1,7 @@
-<div class='column categories'>
+<div class="column categories">
   {{categories-only categories=categories}}
 </div>
 
-<div class='column'>
+<div class="column">
   {{categories-topic-list topics=topics filter="top" class="top-topic-list"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
index b95a06db7a..63277909ec 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
@@ -1,5 +1,5 @@
 {{d-icon topicStatusIcon}}
 
-<a class='title' href={{topic.lastUnreadUrl}}>
+<a href={{topic.lastUnreadUrl}} class="title">
   {{text-overflow class="overflow" text=topic.fancyTitle}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
index ea6853b37d..16861c98f0 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
@@ -1,7 +1,7 @@
 {{#each categories as |c|}}
-  <div data-notification-level={{c.notificationLevelString}} class='category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-boxes-style"}}' style={{unless noCategoryStyle (border-color c.color)}}>
-    <div class='category-box-inner'>
-      <div class='category-box-heading'>
+  <div data-notification-level={{c.notificationLevelString}} style={{unless noCategoryStyle (border-color c.color)}} class="category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-boxes-style"}}">
+    <div class="category-box-inner">
+      <div class="category-box-heading">
         <a href={{c.url}}>
           {{#unless c.isMuted}}
             {{#if c.uploaded_logo.url}}
@@ -16,7 +16,7 @@
           <h3>
             {{category-title-before category=c}}
             {{#if c.read_restricted}}
-              {{d-icon 'lock'}}
+              {{d-icon "lock"}}
             {{/if}}
             {{c.name}}
           </h3>
@@ -24,7 +24,7 @@
       </div>
 
       {{#unless c.isMuted}}
-        <div class='featured-topics'>
+        <div class="featured-topics">
           {{#if c.topics}}
             <ul>
               {{#each c.topics as |topic|}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index 40b256d283..1b224b7c58 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -1,7 +1,6 @@
 {{#each categories as |c|}}
-  <div class='category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-boxes-style"}}' style={{unless noCategoryStyle (border-color c.color)}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}}
-   data-url={{c.url}}>
-    <div class='category-box-inner'>
+  <div style={{unless noCategoryStyle (border-color c.color)}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} data-url={{c.url}} class="category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-boxes-style"}}">
+    <div class="category-box-inner">
       {{#unless c.isMuted}}
         <div class="category-logo">
           {{#if c.uploaded_logo.url}}
@@ -15,11 +14,11 @@
         </div>
       {{/unless}}
       <div class="category-details">
-        <div class='category-box-heading'>
+        <div class="category-box-heading">
           <a class="parent-box-link" href={{c.url}}>
             <h3>
               {{#if c.read_restricted}}
-                {{d-icon 'lock'}}
+                {{d-icon "lock"}}
               {{/if}}
               {{c.name}}
             </h3>
@@ -27,19 +26,19 @@
         </div>
 
         {{#unless c.isMuted}}
-          <div class='description'>
+          <div class="description">
             {{text-overflow class="overflow" text=c.description_excerpt}}
           </div>
           {{#if c.isGrandParent}}
             {{#each c.subcategories as |subcategory|}}
-              <div data-category-id={{subcategory.id}} data-notification-level={{subcategory.notificationLevelString}}  style={{border-color subcategory.color}} class="subcategory with-subcategories {{if subcategory.uploaded_logo.url 'has-logo' 'no-logo'}}">
+              <div data-category-id={{subcategory.id}} data-notification-level={{subcategory.notificationLevelString}} style={{border-color subcategory.color}} class="subcategory with-subcategories {{if subcategory.uploaded_logo.url "has-logo" "no-logo"}}">
                 <div class="subcategory-box-inner">
                   {{category-title-link tagName="h4" category=subcategory}}
                   {{#if subcategory.subcategories}}
-                    <div class='subcategories'>
+                    <div class="subcategories">
                       {{#each subcategory.subcategories as |subsubcategory|}}
                         {{#unless subsubcategory.isMuted}}
-                          <span class='subcategory'>
+                          <span class="subcategory">
                             {{category-title-before category=subsubcategory}}
                             {{category-link subsubcategory hideParent="true"}}
                           </span>
@@ -51,7 +50,7 @@
               </div>
             {{/each}}
           {{else if c.subcategories}}
-            <div class='subcategories'>
+            <div class="subcategories">
               {{#each c.subcategories as |sc|}}
                 <a class="subcategory" href={{sc.url}}>
                   <span class="subcategory-image-placeholder">
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index 495a40ec9f..787968d3d5 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -1,18 +1,18 @@
 {{#if categories}}
-  <table class="category-list {{if showTopics 'with-topics'}}">
+  <table class="category-list {{if showTopics "with-topics"}}">
     <thead>
       <tr>
-        <th class="category"><span aria-role="heading" aria-level="2" id="categories-only-category">{{i18n 'categories.category'}}</span></th>
-        <th class="topics">{{i18n 'categories.topics'}}</th>
+        <th class="category"><span aria-role="heading" aria-level="2" id="categories-only-category">{{i18n "categories.category"}}</span></th>
+        <th class="topics">{{i18n "categories.topics"}}</th>
         {{#if showTopics}}
-          <th class="latest">{{i18n 'categories.latest'}}</th>
+          <th class="latest">{{i18n "categories.latest"}}</th>
         {{/if}}
       </tr>
     </thead>
     <tbody aria-labelledby="categories-only-category">
       {{#each categories as |c|}}
-        <tr data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} class="{{if c.description_excerpt 'has-description' 'no-description'}} {{if c.uploaded_logo.url 'has-logo' 'no-logo'}}">
-          <td class="category {{if c.isMuted 'muted'}} {{if noCategoryStyle "no-category-style"}}" style={{unless noCategoryStyle (border-color c.color)}}>
+        <tr data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} class="{{if c.description_excerpt "has-description" "no-description"}} {{if c.uploaded_logo.url "has-logo" "no-logo"}}">
+          <td class="category {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-style"}}" style={{unless noCategoryStyle (border-color c.color)}}>
             {{category-title-link category=c}}
             {{#unless c.isMuted}}
               {{#if c.description_excerpt}}
@@ -24,7 +24,7 @@
                 <table class="category-list subcategories-with-subcategories">
                   <tbody>
                     {{#each c.subcategories as |subcategory|}}
-                      <tr data-category-id={{subcategory.id}} data-notification-level={{subcategory.notificationLevelString}} class="{{if subcategory.description_excerpt 'has-description' 'no-description'}} {{if subcategory.uploaded_logo.url 'has-logo' 'no-logo'}}">
+                      <tr data-category-id={{subcategory.id}} data-notification-level={{subcategory.notificationLevelString}} class="{{if subcategory.description_excerpt "has-description" "no-description"}} {{if subcategory.uploaded_logo.url "has-logo" "no-logo"}}">
                         <td class="category" style={{border-color subcategory.color}}>
                           {{category-title-link tagName="h4" category=subcategory}}
                           {{#if subcategory.description_excerpt}}
@@ -33,10 +33,10 @@
                             </div>
                           {{/if}}
                           {{#if subcategory.subcategories}}
-                            <div class='subcategories'>
+                            <div class="subcategories">
                               {{#each subcategory.subcategories as |subsubcategory|}}
                                 {{#unless subsubcategory.isMuted}}
-                                  <span class='subcategory'>
+                                  <span class="subcategory">
                                     {{category-title-before category=subsubcategory}}
                                     {{category-link subsubcategory hideParent="true"}}
                                   </span>
@@ -56,10 +56,10 @@
                   </tbody>
                 </table>
               {{else if c.subcategories}}
-                <div class='subcategories'>
+                <div class="subcategories">
                   {{#each c.subcategories as |subcategory|}}
                     {{#unless subcategory.isMuted}}
-                      <span class='subcategory'>
+                      <span class="subcategory">
                         {{category-title-before category=subcategory}}
                         {{category-link subcategory hideParent="true"}}
                         {{category-unread category=subcategory}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
index 8a70f1b6fc..7c94faebd2 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
@@ -1,4 +1,4 @@
-<div class='table-heading' aria-role="heading" aria-level="2">
+<div aria-role="heading" aria-level="2" class="table-heading">
   {{i18n (concat "filters." filter ".title")}}
 </div>
 
@@ -7,10 +7,10 @@
     {{latest-topic-list-item topic=t}}
   {{/each}}
   <div class="more-topics">
-    <a href={{get-url (concat '/' filter)}} class="btn btn-default pull-right">{{i18n "more"}}</a>
+    <a href={{get-url (concat "/" filter)}} class="btn btn-default pull-right">{{i18n "more"}}</a>
   </div>
 {{else}}
-  <div class='no-topics'>
+  <div class="no-topics">
     <h3>{{i18n (concat "topics.none." filter)}}</h3>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/category-name-fields.hbs b/app/assets/javascripts/discourse/templates/components/category-name-fields.hbs
index d6449d3136..b54858ff79 100644
--- a/app/assets/javascripts/discourse/templates/components/category-name-fields.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-name-fields.hbs
@@ -1,12 +1,12 @@
-<section class='field'>
+<section class="field">
   {{#unless category.isUncategorizedCategory}}
     <section class="field-item">
-      <label>{{i18n 'category.name'}}</label>
+      <label>{{i18n "category.name"}}</label>
       {{text-field value=category.name placeholderKey="category.name_placeholder" maxlength="50"}}
     </section>
   {{/unless}}
   <section class="field-item">
-    <label>{{i18n 'category.slug'}}</label>
+    <label>{{i18n "category.slug"}}</label>
     {{text-field value=category.slug placeholderKey="category.slug_placeholder" maxlength="255"}}
   </section>
 </section>
diff --git a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
index f973a28f1f..a37e55354f 100644
--- a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
@@ -2,7 +2,7 @@
   <div class="category-text-title">
     {{category-title-before category=category}}
     {{#if category.read_restricted}}
-      {{d-icon 'lock'}}
+      {{d-icon "lock"}}
     {{/if}}
     <span class="category-name">{{dir-span category.name}}</span>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/category-unread.hbs b/app/assets/javascripts/discourse/templates/components/category-unread.hbs
index 15604d0f3c..f50c843f85 100644
--- a/app/assets/javascripts/discourse/templates/components/category-unread.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-unread.hbs
@@ -1,6 +1,6 @@
 {{#if category.unreadTopics}}
-  <a href={{category.unreadUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.unread_topics' count=category.unreadTopics}}>{{i18n 'filters.unread.lower_title_with_count' count=category.unreadTopics}}</a>
+  <a href={{category.unreadUrl}} title={{i18n "topic.unread_topics" count=category.unreadTopics}} class="badge new-posts badge-notification">{{i18n "filters.unread.lower_title_with_count" count=category.unreadTopics}}</a>
 {{/if}}
 {{#if category.newTopics}}
-  <a href={{category.newUrl}} class='badge new-posts badge-notification' title={{i18n 'topic.new_topics' count=category.newTopics}}>{{i18n 'filters.new.lower_title_with_count' count=category.newTopics}}</a>
+  <a href={{category.newUrl}} title={{i18n "topic.new_topics" count=category.newTopics}} class="badge new-posts badge-notification">{{i18n "filters.new.lower_title_with_count" count=category.newTopics}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/choose-message.hbs b/app/assets/javascripts/discourse/templates/components/choose-message.hbs
index b602627f0f..f8005caa4a 100644
--- a/app/assets/javascripts/discourse/templates/components/choose-message.hbs
+++ b/app/assets/javascripts/discourse/templates/components/choose-message.hbs
@@ -1,17 +1,17 @@
-<label for='choose-message-title'>{{i18n 'choose_message.title.search'}}</label>
+<label for="choose-message-title">{{i18n "choose_message.title.search"}}</label>
 
 {{text-field value=messageTitle placeholderKey="choose_message.title.placeholder" id="choose-message-title"}}
 
 {{#if loading}}
-  <p>{{i18n 'loading'}}</p>
+  <p>{{i18n "loading"}}</p>
 {{else}}
   {{#if noResults}}
-    <p>{{i18n 'choose_message.none_found'}}</p>
+    <p>{{i18n "choose_message.none_found"}}</p>
   {{else}}
     {{#each messages as |m|}}
-      <div class='controls existing-message'>
-        <label class='radio'>
-          <input type='radio' id="choose-message-{{m.id}}" name='choose_message_id' {{action "chooseMessage" m}}>
+      <div class="controls existing-message">
+        <label class="radio">
+          <input id="choose-message-{{m.id}}" {{action "chooseMessage" m}} type="radio" name="choose_message_id">
           <span class="message-title">
             {{m.title}}
           </span>
diff --git a/app/assets/javascripts/discourse/templates/components/choose-topic.hbs b/app/assets/javascripts/discourse/templates/components/choose-topic.hbs
index 2e5921d0e7..65a8dd3639 100644
--- a/app/assets/javascripts/discourse/templates/components/choose-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/choose-topic.hbs
@@ -1,17 +1,17 @@
-<label for='choose-topic-title'>{{i18n labelText}}</label>
+<label for="choose-topic-title">{{i18n labelText}}</label>
 
 {{text-field value=topicTitle placeholderKey="choose_topic.title.placeholder" id="choose-topic-title"}}
 
 {{#if loading}}
-  <p>{{i18n 'loading'}}</p>
+  <p>{{i18n "loading"}}</p>
 {{else}}
   {{#if noResults}}
-    <p>{{i18n 'choose_topic.none_found'}}</p>
+    <p>{{i18n "choose_topic.none_found"}}</p>
   {{else}}
     {{#each topics as |t|}}
-      <div class='controls existing-topic'>
-        <label class='radio'>
-          <input type='radio' id="choose-topic-{{t.id}}" name='choose_topic_id' {{action "chooseTopic" t}}>
+      <div class="controls existing-topic">
+        <label class="radio">
+          <input id="choose-topic-{{t.id}}" {{action "chooseTopic" t}} type="radio" name="choose_topic_id">
           {{raw "topic-status" topic=t}}
           <span class="topic-title">
             {{t.title}}
diff --git a/app/assets/javascripts/discourse/templates/components/color-picker.hbs b/app/assets/javascripts/discourse/templates/components/color-picker.hbs
index 9832ffdf7d..a7b3613fa5 100644
--- a/app/assets/javascripts/discourse/templates/components/color-picker.hbs
+++ b/app/assets/javascripts/discourse/templates/components/color-picker.hbs
@@ -1,5 +1,5 @@
 {{#each colors as |c|}}
   {{#color-picker-choice color=c usedColors=usedColors selectColor=(action "selectColor")}}
-    {{d-icon 'check'}}
+    {{d-icon "check"}}
   {{/color-picker-choice}}
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
index dd7ad30ff6..34e72ab50e 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
@@ -3,19 +3,19 @@
     topicId=topicId
     onChangeCallback=(action "triggerResize")
     id="private-message-users"
-    includeMessageableGroups='true'
+    includeMessageableGroups="true"
     placeholderKey="composer.users_placeholder"
     tabindex="1"
     usernames=usernames
     hasGroups=hasGroups
-    allowEmails='true'
+    allowEmails="true"
     autocomplete="discourse"
   }}
 {{else}}
   <a href {{action "toggleSelector"}}>
-    <div class='ac-wrap composer-user-selector-limited'>
+    <div class="ac-wrap composer-user-selector-limited">
       <span>{{limitedUsernames}}</span>
-      <span class='btn btn-primary'>{{hiddenUsersCount}}</span>
+      <span class="btn btn-primary">{{hiddenUsersCount}}</span>
     </div>
   </a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/create-topics-notice.hbs b/app/assets/javascripts/discourse/templates/components/create-topics-notice.hbs
index a508a69b39..af83ebbb10 100644
--- a/app/assets/javascripts/discourse/templates/components/create-topics-notice.hbs
+++ b/app/assets/javascripts/discourse/templates/components/create-topics-notice.hbs
@@ -1,6 +1,6 @@
 {{#unless hidden}}
-  <div class='row'>
-    <div class='alert alert-info alert-too-few-topics'>
+  <div class="row">
+    <div class="alert alert-info alert-too-few-topics">
       {{message}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs b/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
index 51fc598783..4d03e30953 100644
--- a/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
@@ -3,5 +3,5 @@
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept=".csv">
 </label>
 {{#if uploading}}
-  <span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
+  <span>{{i18n "upload_selector.uploading"}} {{uploadProgress}}%</span>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/templates/components/d-button.hbs
index 58105b2cd2..6c9ed40075 100644
--- a/app/assets/javascripts/discourse/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-button.hbs
@@ -11,7 +11,7 @@
 {{/if}}
 
 {{#if translatedLabel}}
-  <span class='d-button-label'>{{html-safe translatedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
+  <span class="d-button-label">{{html-safe translatedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
 {{/if}}
 
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index 955ef53a71..f48dc424ac 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -1,6 +1,6 @@
-<div class='d-editor-container'>
+<div class="d-editor-container">
   <div class="d-editor-textarea-wrapper {{if disabled "disabled"}}">
-    <div class='d-editor-button-bar'>
+    <div class="d-editor-button-bar">
       {{#each toolbar.groups as |group|}}
         {{#each group.buttons as |b|}}
           {{#if b.popupMenu}}
@@ -27,7 +27,7 @@
         {{/each}}
 
         {{#unless group.lastGroup}}
-          <div class='d-editor-spacer'></div>
+          <div class="d-editor-spacer"></div>
         {{/unless}}
       {{/each}}
     </div>
@@ -45,10 +45,10 @@
     {{plugin-outlet name="after-d-editor" tagName="" args=outletArgs}}
   </div>
 
-  <div class="d-editor-preview-wrapper {{if forcePreview 'force-preview'}}">
+  <div class="d-editor-preview-wrapper {{if forcePreview "force-preview"}}">
     <div class="d-editor-preview">{{html-safe preview}}</div>
     {{plugin-outlet name="editor-preview" classNames="d-editor-plugin" args=outletArgs}}
   </div>
 </div>
 
-{{emoji-picker active=emojiPickerIsActive isEditorFocused=isEditorFocused emojiSelected=(action 'emojiSelected')}}
+{{emoji-picker active=emojiPickerIsActive isEditorFocused=isEditorFocused emojiSelected=(action "emojiSelected")}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-modal-cancel.hbs b/app/assets/javascripts/discourse/templates/components/d-modal-cancel.hbs
index f61b3ed7c7..1acf461025 100644
--- a/app/assets/javascripts/discourse/templates/components/d-modal-cancel.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-modal-cancel.hbs
@@ -1 +1 @@
-<a href {{action close}} class='d-modal-cancel'>{{i18n 'cancel'}}</a>
+<a href {{action close}} class="d-modal-cancel">{{i18n "cancel"}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
index 9df8af3a17..f9e2c830dd 100644
--- a/app/assets/javascripts/discourse/templates/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
@@ -27,7 +27,7 @@
         {{/if}}
       </div>
 
-      <div id='modal-alert'></div>
+      <div id="modal-alert"></div>
 
       {{yield}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs b/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs
index 0df2fbcc70..faa96a1eca 100644
--- a/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs
+++ b/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs
@@ -17,7 +17,7 @@
   <div class="alert error">{{error}}</div>
 {{/if}}
 
-<div class="panel from {{if fromPanelActive 'visible'}}">
+<div class="panel from {{if fromPanelActive "visible"}}">
   {{date-time-input
     date=from
     onChange=(action "_onChange" (hash prop="from"))
@@ -25,7 +25,7 @@
   }}
 </div>
 
-<div class="panel to {{if toPanelActive 'visible'}}">
+<div class="panel to {{if toPanelActive "visible"}}">
   {{date-time-input
     date=to
     onChange=(action "_onChange" (hash prop="to"))
diff --git a/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs b/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs
index 4b1ea0f111..0d88488ae4 100644
--- a/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs
+++ b/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs
@@ -2,7 +2,7 @@
   {{d-button icon="bell-slash" class="btn-default" label="user.desktop_notifications.not_supported" disabled="true"}}
 {{/if}}
 {{#if isDeniedPermission}}
-  {{d-button icon="bell-slash" class="btn-default"  label="user.desktop_notifications.perm_denied_btn" action=(action "recheckPermission") disabled='true'}}
+  {{d-button icon="bell-slash" class="btn-default" label="user.desktop_notifications.perm_denied_btn" action=(action "recheckPermission") disabled="true"}}
   {{i18n "user.desktop_notifications.perm_denied_expl"}}
 {{else}}
   {{#if isEnabled}}
diff --git a/app/assets/javascripts/discourse/templates/components/directory-item.hbs b/app/assets/javascripts/discourse/templates/components/directory-item.hbs
index e7758227f4..d939e353b4 100644
--- a/app/assets/javascripts/discourse/templates/components/directory-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/directory-item.hbs
@@ -7,5 +7,5 @@
 <td>{{number item.posts_read}}</td>
 <td>{{number item.days_visited}}</td>
 {{#if showTimeRead}}
-  <td><span class='time-read'>{{format-duration item.time_read}}</span></td>
+  <td><span class="time-read">{{format-duration item.time_read}}</span></td>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index 9799c5ee42..75590dbbdb 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -1,7 +1,7 @@
 {{#if category.isUncategorizedCategory}}
   <p class="warning">
     {{d-icon "exclamation-triangle"}}
-    {{html-safe (i18n 'category.uncategorized_general_warning' settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink)}}
+    {{html-safe (i18n "category.uncategorized_general_warning" settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink)}}
   </p>
 {{/if}}
 
@@ -9,8 +9,8 @@
   {{category-name-fields category=category tagName=""}}
 
   {{#if canSelectParentCategory}}
-    <section class='field'>
-      <label>{{i18n 'category.parent'}}</label>
+    <section class="field">
+      <label>{{i18n "category.parent"}}</label>
       {{category-chooser
         rootNone=true
         value=category.parent_category_id
@@ -24,8 +24,8 @@
   {{/if}}
 
   {{#if subCategories}}
-    <section class='field'>
-      <label>{{i18n 'categories.subcategories'}}</label>
+    <section class="field">
+      <label>{{i18n "categories.subcategories"}}</label>
       {{#each subCategories as |s|}}
         {{category-badge s hideParent="true"}}
       {{/each}}
@@ -33,12 +33,12 @@
   {{/if}}
 
   {{#if showDescription}}
-    <section class='field'>
-      <label>{{i18n 'category.description'}}</label>
+    <section class="field">
+      <label>{{i18n "category.description"}}</label>
       {{#if category.description}}
         {{html-safe category.description}}
       {{else}}
-        {{i18n 'category.no_description'}}
+        {{i18n "category.no_description"}}
       {{/if}}
       {{#if category.topic_url}}
         <br>
@@ -48,24 +48,24 @@
   {{/if}}
 
   {{#unless noCategoryStyle}}
-    <section class='field'>
-      <label>{{i18n 'category.badge_colors'}}</label>
+    <section class="field">
+      <label>{{i18n "category.badge_colors"}}</label>
       <div class="category-color-editor">
         {{html-safe categoryBadgePreview}}
 
-        <div class='input-prepend input-append' style="margin-top: 10px;">
-          <span class='color-title'>{{i18n 'category.background_color'}}:</span>
+        <div style="margin-top: 10px;" class="input-prepend input-append">
+          <span class="color-title">{{i18n "category.background_color"}}:</span>
           <div class="colorpicker-wrapper">
-            <span class='add-on'>#</span>{{text-field value=category.color placeholderKey="category.color_placeholder" maxlength="6"}}
+            <span class="add-on">#</span>{{text-field value=category.color placeholderKey="category.color_placeholder" maxlength="6"}}
             {{color-picker colors=backgroundColors usedColors=usedBackgroundColors value=category.color}}
           </div>
         </div>
 
-        <div class='input-prepend input-append'>
-          <span class='color-title'>{{i18n 'category.foreground_color'}}:</span>
+        <div class="input-prepend input-append">
+          <span class="color-title">{{i18n "category.foreground_color"}}:</span>
           <div class="colorpicker-wrapper">
-            <span class='add-on'>#</span>{{text-field value=category.text_color placeholderKey="category.color_placeholder" maxlength="6"}}
-            {{color-picker colors=foregroundColors value=category.text_color id='edit-text-color'}}
+            <span class="add-on">#</span>{{text-field value=category.text_color placeholderKey="category.color_placeholder" maxlength="6"}}
+            {{color-picker colors=foregroundColors value=category.text_color id="edit-text-color"}}
           </div>
         </div>
       </div>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-images.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-images.hbs
index f84d3e88a1..e55962d806 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-images.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-images.hbs
@@ -1,5 +1,5 @@
-<section class='field'>
-  <label>{{i18n 'category.logo'}}</label>
+<section class="field">
+  <label>{{i18n "category.logo"}}</label>
   {{image-uploader
     imageUrl=logoImageUrl
     onUploadDone=(action "logoUploadDone")
@@ -8,8 +8,8 @@
     class="no-repeat contain-image"}}
 </section>
 
-<section class='field'>
-  <label>{{i18n 'category.background_image'}}</label>
+<section class="field">
+  <label>{{i18n "category.background_image"}}</label>
   {{image-uploader
     imageUrl=backgroundImageUrl
     onUploadDone=(action "backgroundUploadDone")
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index 68fb66239c..91978bec1c 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -1,13 +1,13 @@
-<section class='field'>
+<section class="field">
   {{#if category.is_special}}
     {{#if category.isUncategorizedCategory}}
-      <p class="warning">{{i18n 'category.uncategorized_security_warning'}}</p>
+      <p class="warning">{{i18n "category.uncategorized_security_warning"}}</p>
     {{else}}
-      <p class="warning">{{i18n 'category.special_warning'}}</p>
+      <p class="warning">{{i18n "category.special_warning"}}</p>
     {{/if}}
   {{/if}}
   {{#unless category.isUncategorizedCategory}}
-    <ul class='permission-list'>
+    <ul class="permission-list">
       {{#each category.permissions as |p|}}
         <li>
           <span class="name"><span class="badge-group">{{p.group_name}}</span></span>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
index 401f4ebcb7..f7b4981e7a 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -1,19 +1,19 @@
 <section>
-  <h3>{{i18n 'category.settings_sections.general'}}</h3>
+  <h3>{{i18n "category.settings_sections.general"}}</h3>
 
   {{#if showPositionInput}}
-    <section class='field position-fields'>
+    <section class="field position-fields">
       <label for="category-position">
-        {{i18n 'category.position'}}
+        {{i18n "category.position"}}
       </label>
       {{text-field value=category.position id="category-position" class="position-input" type="number"}}
     </section>
   {{/if}}
 
   {{#unless showPositionInput}}
-    <section class='field'>
-      {{i18n 'category.position_disabled'}}
-      <a href={{get-url '/admin/site_settings/category/basic'}}>{{i18n 'category.position_disabled_click'}}</a>
+    <section class="field">
+      {{i18n "category.position_disabled"}}
+      <a href={{get-url "/admin/site_settings/category/basic"}}>{{i18n "category.position_disabled_click"}}</a>
     </section>
   {{/unless}}
 
@@ -46,19 +46,19 @@
     </div>
   </section>
 
-  <section class='field'>
+  <section class="field">
     <label>
       {{input type="checkbox" checked=category.allow_badges}}
-      {{i18n 'category.allow_badges_label'}}
+      {{i18n "category.allow_badges_label"}}
     </label>
   </section>
 
   {{#if siteSettings.topic_featured_link_enabled}}
-    <section class='field'>
+    <section class="field">
       <div class="allowed-topic-featured-link-category">
         <label class="checkbox-label">
           {{input type="checkbox" checked=category.topic_featured_link_allowed}}
-          {{i18n 'category.topic_featured_link_allowed'}}
+          {{i18n "category.topic_featured_link_allowed"}}
         </label>
       </div>
     </section>
@@ -80,11 +80,11 @@
 </section>
 
 <section>
-  <h3>{{i18n 'category.settings_sections.moderation'}}</h3>
+  <h3>{{i18n "category.settings_sections.moderation"}}</h3>
   {{#if siteSettings.enable_category_group_review}}
     <section class="field">
       <label for="reviewable-by-group">
-        {{i18n 'category.reviewable_by_group'}}
+        {{i18n "category.reviewable_by_group"}}
       </label>
       {{group-selector
         groupFinder=groupFinder
@@ -98,34 +98,34 @@
   <section class="field">
     <label>
       {{input type="checkbox" checked=category.custom_fields.require_topic_approval}}
-      {{i18n 'category.require_topic_approval'}}
+      {{i18n "category.require_topic_approval"}}
     </label>
   </section>
 
   <section class="field">
     <label>
       {{input type="checkbox" checked=category.custom_fields.require_reply_approval}}
-      {{i18n 'category.require_reply_approval'}}
+      {{i18n "category.require_reply_approval"}}
     </label>
   </section>
 
-  <section class='field'>
+  <section class="field">
     <div class="control-group">
       <label for="topic-auto-close">
-        {{i18n 'topic.auto_close.label'}}
+        {{i18n "topic.auto_close.label"}}
       </label>
       {{text-field value=category.auto_close_hours id="topic-auto-close" type="number"}}
       <label>
         {{input type="checkbox" checked=category.auto_close_based_on_last_post}}
-        {{i18n 'topic.auto_close.based_on_last_post'}}
+        {{i18n "topic.auto_close.based_on_last_post"}}
       </label>
     </div>
   </section>
 
   {{#if siteSettings.tagging_enabled}}
-    <section class='field minimum-required-tags'>
+    <section class="field minimum-required-tags">
       <label for="category-minimum-tags">
-        {{i18n 'category.minimum_required_tags'}}
+        {{i18n "category.minimum_required_tags"}}
       </label>
       {{text-field value=category.minimum_required_tags id="category-minimum-tags" type="number" min="0"}}
     </section>
@@ -227,25 +227,25 @@
   <h3>{{i18n "category.settings_sections.email"}}</h3>
 
   {{#if emailInEnabled}}
-    <section class='field'>
+    <section class="field">
       <label for="category-email-in">
         {{d-icon "far-envelope"}}
-        {{i18n 'category.email_in'}}
+        {{i18n "category.email_in"}}
       </label>
       {{text-field id="category-email-in" class="email-in" value=category.email_in}}
     </section>
 
-    <section class='field'>
+    <section class="field">
       <label>
         {{input type="checkbox" checked=category.email_in_allow_strangers}}
-        {{i18n 'category.email_in_allow_strangers'}}
+        {{i18n "category.email_in_allow_strangers"}}
       </label>
     </section>
 
-    <section class='field'>
+    <section class="field">
       <label>
         {{input type="checkbox" checked=category.mailinglist_mirror}}
-        {{i18n 'category.mailinglist_mirror'}}
+        {{i18n "category.mailinglist_mirror"}}
       </label>
     </section>
 
@@ -253,9 +253,9 @@
   {{/if}}
 
   {{#unless emailInEnabled}}
-    <section class='field'>
-      {{i18n 'category.email_in_disabled'}}
-      <a href={{get-url '/admin/site_settings/category/email'}}>{{i18n 'category.email_in_disabled_click'}}</a>
+    <section class="field">
+      {{i18n "category.email_in_disabled"}}
+      <a href={{get-url "/admin/site_settings/category/email"}}>{{i18n "category.email_in_disabled_click"}}</a>
     </section>
   {{/unless}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
index f56683a3f6..4338f2cb57 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
@@ -1 +1 @@
-<a href {{action "select"}} class={{if active 'active'}}>{{title}}</a>
+<a href {{action "select"}} class={{if active "active"}}>{{title}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs
index 593d835744..6fcb4bded0 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs
@@ -1,5 +1,5 @@
 <section class="field">
-  <label for="category-allowed-tags">{{i18n 'category.tags_allowed_tags'}}</label>
+  <label for="category-allowed-tags">{{i18n "category.tags_allowed_tags"}}</label>
   {{tag-chooser
     id="category-allowed-tags"
     tags=category.allowed_tags
@@ -14,36 +14,36 @@
 </section>
 
 <section class="field">
-  <label for="category-allowed-tag-groups">{{i18n 'category.tags_allowed_tag_groups'}}</label>
+  <label for="category-allowed-tag-groups">{{i18n "category.tags_allowed_tag_groups"}}</label>
   {{tag-group-chooser
     id="category-allowed-tag-groups"
     tagGroups=category.allowed_tag_groups
   }}
-  {{#link-to 'tagGroups'}}{{i18n 'category.manage_tag_groups_link'}}{{/link-to}}
-</section>
-
-<section class='field'>
-  <label>
-    {{input type="checkbox" checked=category.allow_global_tags id="allow_global_tags" disabled=disableAllowGlobalTags}}
-    {{i18n 'category.allow_global_tags_label'}}
-  </label>
-</section>
-
-<section class='field'>
-  {{i18n 'category.tags_tab_description'}}
+  {{#link-to "tagGroups"}}{{i18n "category.manage_tag_groups_link"}}{{/link-to}}
 </section>
 
 <section class="field">
-  {{i18n 'category.required_tag_group_description'}}
+  <label>
+    {{input type="checkbox" checked=category.allow_global_tags id="allow_global_tags" disabled=disableAllowGlobalTags}}
+    {{i18n "category.allow_global_tags_label"}}
+  </label>
+</section>
+
+<section class="field">
+  {{i18n "category.tags_tab_description"}}
+</section>
+
+<section class="field">
+  {{i18n "category.required_tag_group_description"}}
 </section>
 
 <section class="field with-items">
   <section class="field-item">
-    <label>{{i18n 'category.min_tags_from_required_group_label'}}</label>
+    <label>{{i18n "category.min_tags_from_required_group_label"}}</label>
     {{text-field value=category.min_tags_from_required_group id="category-min-tags-from-group" type="number" min="1"}}
   </section>
   <section class="field-item">
-    <label>{{i18n 'category.required_tag_group_label'}}</label>
+    <label>{{i18n "category.required_tag_group_label"}}</label>
     {{tag-group-chooser
       id="category-required-tag-group"
       tagGroups=category.required_tag_groups
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-topic-template.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-topic-template.hbs
index c0d58fbbd9..6b9fa9b84d 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-topic-template.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-topic-template.hbs
@@ -1,2 +1,2 @@
-<label>{{i18n 'category.topic_template'}}</label>
+<label>{{i18n "category.topic_template"}}</label>
 {{d-editor value=category.topic_template}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
index e5ad76f979..0303a494a6 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
@@ -9,7 +9,7 @@
   </div>
   {{#if publishToCategory}}
     <div class="control-group">
-      <label>{{i18n 'topic.topic_status_update.publish_to'}}</label>
+      <label>{{i18n "topic.topic_status_update.publish_to"}}</label>
       {{category-chooser
         value=topicTimer.category_id
         excludeCategoryId=excludeCategoryId
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
index a5a525b4f1..7f7490eef7 100644
--- a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
+++ b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
@@ -1,2 +1,2 @@
-<div class='emoji-picker'></div>
-<div class='emoji-picker-modal'></div>
+<div class="emoji-picker"></div>
+<div class="emoji-picker-modal"></div>
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs b/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
index 186ee15afe..7e1506383c 100644
--- a/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
@@ -33,7 +33,7 @@
     </div>
     <div class="control">
       <div class="input">
-        <label class="btn btn-default btn-primary {{if addDisabled 'disabled'}}">
+        <label class="btn btn-default btn-primary {{if addDisabled "disabled"}}">
           {{d-icon "plus"}}
           {{i18n "admin.emoji.add"}}
           <input
diff --git a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
index 10d9d5fcba..937d05c1d5 100644
--- a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs
@@ -1,10 +1,10 @@
 {{raw "topic-status" topic=topic}}
-<a class='title' href={{topic.lastUnreadUrl}}>{{html-safe topic.fancyTitle}}</a>
+<a href={{topic.lastUnreadUrl}} class="title">{{html-safe topic.fancyTitle}}</a>
 {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
 
 {{#if latestTopicOnly}}
-  <div class='last-user-info'>
-    {{i18n 'categories.latest_by'}} <a href={{html-safe topic.lastPosterUrl}}>{{topic.last_poster.username}}</a>
+  <div class="last-user-info">
+    {{i18n "categories.latest_by"}} <a href={{html-safe topic.lastPosterUrl}}>{{topic.last_poster.username}}</a>
     <a href={{topic.lastPostUrl}}>{{format-age topic.last_posted_at}}</a>
   </div>
 {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
index cc7b592b42..88166064c0 100644
--- a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
@@ -1,11 +1,11 @@
 {{#if isNotifyUser}}
   <h3>{{formattedName}}</h3>
-  <div class='controls'>
-    <label class='radio'>
-      <input type='radio' id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
+  <div class="controls">
+    <label class="radio">
+      <input id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} type="radio" name="post_action_type_index">
 
-      <div class='flag-action-type-details'>
-        <span class='description'>{{html-safe flag.description}}</span>
+      <div class="flag-action-type-details">
+        <span class="description">{{html-safe flag.description}}</span>
         {{#if showMessageInput}}
           {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
           <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
@@ -15,16 +15,16 @@
   </div>
   {{#if staffFlagsAvailable}}
     <hr>
-    <h3>{{i18n 'flagging.notify_staff'}}</h3>
+    <h3>{{i18n "flagging.notify_staff"}}</h3>
   {{/if}}
 {{else}}
   <div class="controls {{flag.name_key}}">
-    <label class='radio'>
-      <input type='radio' id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
-      <div class='flag-action-type-details'>
+    <label class="radio">
+      <input id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} type="radio" name="post_action_type_index">
+      <div class="flag-action-type-details">
         <strong>{{formattedName}}</strong>
         {{#if showDescription}}
-          <div class='description'>{{html-safe description}}</div>
+          <div class="description">{{html-safe description}}</div>
         {{/if}}
         {{#if showMessageInput}}
           {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
diff --git a/app/assets/javascripts/discourse/templates/components/flag-selection.hbs b/app/assets/javascripts/discourse/templates/components/flag-selection.hbs
index 4aadb91c82..86dbbe8093 100644
--- a/app/assets/javascripts/discourse/templates/components/flag-selection.hbs
+++ b/app/assets/javascripts/discourse/templates/components/flag-selection.hbs
@@ -1,5 +1,5 @@
 {{#each flags as |f|}}
   {{yield f}}
 {{else}}
-  {{i18n 'flagging.cant'}}
+  {{i18n "flagging.cant"}}
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/generated-invite-link.hbs b/app/assets/javascripts/discourse/templates/components/generated-invite-link.hbs
index 09d02aae71..9e10822972 100644
--- a/app/assets/javascripts/discourse/templates/components/generated-invite-link.hbs
+++ b/app/assets/javascripts/discourse/templates/components/generated-invite-link.hbs
@@ -1,5 +1,5 @@
 <p>{{i18n "user.invited.link_generated"}}</p>
 <p>
-  <input class='invite-link-input' style='width: 75%' type='text' value={{link}}>
+  <input value={{link}} class="invite-link-input" style="width: 75%" type="text">
 </p>
 <p>{{i18n "user.invited.valid_for" email=email}}</p>
diff --git a/app/assets/javascripts/discourse/templates/components/google-search.hbs b/app/assets/javascripts/discourse/templates/components/google-search.hbs
index 28893ffff8..ce28f58662 100644
--- a/app/assets/javascripts/discourse/templates/components/google-search.hbs
+++ b/app/assets/javascripts/discourse/templates/components/google-search.hbs
@@ -1,7 +1,7 @@
 <div>
-  <form action='//google.com/search' id='google-search'>
+  <form action="//google.com/search" id="google-search">
     <input type="text" name="q" value={{searchTerm}}>
-    <input type='hidden' name="as_sitesearch" value={{siteUrl}}>
-    <button class="btn btn-primary">{{i18n 'search.search_google_button'}}</button>
+    <input name="as_sitesearch" value={{siteUrl}} type="hidden">
+    <button class="btn btn-primary">{{i18n "search.search_google_button"}}</button>
   </form>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/group-activity-filter.hbs b/app/assets/javascripts/discourse/templates/components/group-activity-filter.hbs
index 68623d09c8..85e3a212ae 100644
--- a/app/assets/javascripts/discourse/templates/components/group-activity-filter.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-activity-filter.hbs
@@ -1,3 +1,3 @@
-{{#link-to (concat 'group.activity.' filter) (query-params category_id=categoryId)}}
-  {{i18n (concat 'groups.' filter)}}
+{{#link-to (concat "group.activity." filter) (query-params category_id=categoryId)}}
+  {{i18n (concat "groups." filter)}}
 {{/link-to}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index cc819f07a9..3c867903a2 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -14,12 +14,12 @@
       <div class="names">
         <span>
           <h1 class={{group.name}}>
-            <a href={{groupPath}} {{action "showGroup" group}} class='group-page-link'>{{group.name}}</a>
+            <a href={{groupPath}} {{action "showGroup" group}} class="group-page-link">{{group.name}}</a>
           </h1>
           {{#if group.full_name}}
-            <h2 class='full-name'>{{group.full_name}}</h2>
+            <h2 class="full-name">{{group.full_name}}</h2>
           {{else}}
-            <h2 class='username'>{{group.name}}</h2>
+            <h2 class="username">{{group.name}}</h2>
           {{/if}}
         </span>
       </div>
@@ -45,7 +45,7 @@
 
     {{#if group.bio_cooked}}
       <div class="card-row second-row">
-        <div class='bio'>{{html-safe group.bio_cooked}}</div>
+        <div class="bio">{{html-safe group.bio_cooked}}</div>
       </div>
     {{/if}}
 
@@ -54,7 +54,7 @@
         <div class="metadata">
           <h3>
             <span class="desc">
-              {{i18n 'groups.user_count'}}
+              {{i18n "groups.user_count"}}
             </span>
             {{group.user_count}}
           </h3>
@@ -73,7 +73,7 @@
       <div class="card-row fourth-row">
         <div class="members metadata">
           {{#each group.members as |user|}}
-            <a href {{action 'showUser' user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
+            <a href {{action "showUser" user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
           {{/each}}
           {{#if showMoreMembers}}
             <a href={{groupPath}} {{action "showGroup" group}} class="more-members-link">
diff --git a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
index 319fa80805..85077306a2 100644
--- a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
@@ -1,17 +1,17 @@
-<div class='control-group'>
-  <label class="control-label" for="flair_url">{{i18n 'groups.flair_url'}}</label>
+<div class="control-group">
+  <label class="control-label" for="flair_url">{{i18n "groups.flair_url"}}</label>
 
   {{text-field name="flair_url"
       class="input-xxlarge"
       value=model.flair_url
       placeholderKey="groups.flair_url_placeholder"}}
   <div class="control-instructions">
-    {{i18n 'groups.flair_url_description'}}
+    {{i18n "groups.flair_url_description"}}
   </div>
 </div>
 
-<div class='control-group'>
-  <label class="control-label" for="flair_bg_color">{{i18n 'groups.flair_bg_color'}}</label>
+<div class="control-group">
+  <label class="control-label" for="flair_bg_color">{{i18n "groups.flair_bg_color"}}</label>
 
   {{text-field name="flair_bg_color"
       class="group-flair-bg-color input-xxlarge"
@@ -20,8 +20,8 @@
 </div>
 
 {{#if flairPreviewIcon}}
-  <div class='control-group'>
-    <label class="control-label" for="flair_color">{{i18n 'groups.flair_color'}}</label>
+  <div class="control-group">
+    <label class="control-label" for="flair_color">{{i18n "groups.flair_color"}}</label>
 
     {{text-field name="flair_color"
         class="group-flair-color input-xxlarge"
@@ -30,8 +30,8 @@
   </div>
 {{/if}}
 
-<div class='control-group'>
-  <label class='control-label'>{{flairPreviewLabel}}</label>
+<div class="control-group">
+  <label class="control-label">{{flairPreviewLabel}}</label>
 
   <div class="avatar-flair-preview">
     <div class="avatar-wrapper">
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
index dd929c5617..d835fb97c6 100644
--- a/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
@@ -6,7 +6,7 @@
   </td>
 
   <td>
-    <span>{{avatar log.acting_user imageSize='tiny'}}</span>
+    <span>{{avatar log.acting_user imageSize="tiny"}}</span>
 
     {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.acting_user.username key="acting_user")}}
       {{log.acting_user.username}}
@@ -15,7 +15,7 @@
 
   <td>
     {{#if log.target_user}}
-      <span>{{avatar log.target_user imageSize='tiny'}}</span>
+      <span>{{avatar log.target_user imageSize="tiny"}}</span>
 
       {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.target_user.username key="target_user")}}
         {{log.target_user.username}}
@@ -45,13 +45,13 @@
 
 {{#if expandDetails}}
   <tr>
-    <td colspan='6'>
+    <td colspan="6">
       <p>
-        <strong>{{i18n 'groups.manage.logs.from'}}</strong>: <code>{{log.prev_value}}</code>
+        <strong>{{i18n "groups.manage.logs.from"}}</strong>: <code>{{log.prev_value}}</code>
       </p>
 
       <p>
-        <strong>{{i18n 'groups.manage.logs.to'}}</strong>: <code>{{log.new_value}}</code>
+        <strong>{{i18n "groups.manage.logs.to"}}</strong>: <code>{{log.new_value}}</code>
       </p>
     </td>
   </tr>
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
index 3efeac10ac..a01cf4d384 100644
--- a/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
@@ -1,12 +1,12 @@
-<div class='control-group buttons'>
+<div class="control-group buttons">
   {{#d-button action=(action "save")
     disabled=saving
-    class='btn btn-primary group-manage-save'
+    class="btn btn-primary group-manage-save"
   }}
     {{savingText}}
   {{/d-button}}
 
   {{#if saved}}
-    <span>{{i18n 'saved'}}</span>
+    <span>{{i18n "saved"}}</span>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/group-member.hbs b/app/assets/javascripts/discourse/templates/components/group-member.hbs
index dcdfc050d6..10da5fb4df 100644
--- a/app/assets/javascripts/discourse/templates/components/group-member.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-member.hbs
@@ -3,7 +3,7 @@
 </a>
 <span>{{member.username}}</span>
 {{#unless automatic}}
-  <a href class='remove' {{action "remove"}}>
+  <a href {{action "remove"}} class="remove">
     {{d-icon "times"}}
   </a>
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-navigation.hbs b/app/assets/javascripts/discourse/templates/components/group-navigation.hbs
index eb9c9140cb..cea8bb0a7e 100644
--- a/app/assets/javascripts/discourse/templates/components/group-navigation.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-navigation.hbs
@@ -1,4 +1,4 @@
-{{#mobile-nav class='group-nav' desktopClass="nav nav-pills" currentPath=currentPath}}
+{{#mobile-nav class="group-nav" desktopClass="nav nav-pills" currentPath=currentPath}}
   {{#if site.mobileView}}
     <li>
       {{#link-to "groups.index"}}
@@ -17,7 +17,7 @@
       {{#link-to tab.route group title=tab.message class=tab.name}}
         {{#if tab.icon}}{{d-icon tab.icon}}{{/if}}
         {{tab.message}}
-        {{#if tab.count}}<span class='count'>({{tab.count}})</span>{{/if}}
+        {{#if tab.count}}<span class="count">({{tab.count}})</span>{{/if}}
       {{/link-to}}
     </li>
   {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index 451904c542..25c500b782 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -1,13 +1,13 @@
-<div class='clearfix info'>
-  <a href={{post.user.userUrl}} data-user-card={{post.user.username}} class='avatar-link'>
+<div class="clearfix info">
+  <a href={{post.user.userUrl}} data-user-card={{post.user.username}} class="avatar-link">
     {{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
   </a>
-  <span class='time'>{{format-date post.created_at leaveAgo="true"}}</span>
+  <span class="time">{{format-date post.created_at leaveAgo="true"}}</span>
   {{expand-post item=post}}
 
-  <div class='stream-topic-details'>
-    <div class='stream-topic-title'>
-      <span class='title'>
+  <div class="stream-topic-details">
+    <div class="stream-topic-title">
+      <span class="title">
         <a href={{postUrl}}>{{html-safe post.topic.fancyTitle}}</a>
       </span>
     </div>
@@ -21,7 +21,7 @@
   </div>
 </div>
 
-<div class='excerpt'>
+<div class="excerpt">
   {{#if post.expandedExcerpt}}
     {{html-safe post.expandedExcerpt}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-selector.hbs b/app/assets/javascripts/discourse/templates/components/group-selector.hbs
index af73c13cbc..0ceb9144ce 100644
--- a/app/assets/javascripts/discourse/templates/components/group-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-selector.hbs
@@ -1 +1 @@
-<input class='group-selector' placeholder={{placeholder}} type='text' name='groups'>
+<input placeholder={{placeholder}} class="group-selector" type="text" name="groups">
diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs b/app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs
index fcc29b71b2..1a2c473824 100644
--- a/app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs
+++ b/app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs
@@ -1,7 +1,7 @@
 {{#if currentUser.admin}}
   <div class="control-group">
-    <label class="control-label">{{i18n 'admin.groups.manage.interaction.visibility'}}</label>
-    <label for="visiblity">{{i18n 'admin.groups.manage.interaction.visibility_levels.title'}}</label>
+    <label class="control-label">{{i18n "admin.groups.manage.interaction.visibility"}}</label>
+    <label for="visiblity">{{i18n "admin.groups.manage.interaction.visibility_levels.title"}}</label>
 
     {{combo-box
       name="alias"
@@ -14,12 +14,12 @@
     }}
 
     <div class="control-instructions">
-      {{i18n 'admin.groups.manage.interaction.visibility_levels.description'}}
+      {{i18n "admin.groups.manage.interaction.visibility_levels.description"}}
     </div>
   </div>
 
   <div class="control-group">
-    <label for="visiblity">{{i18n 'admin.groups.manage.interaction.members_visibility_levels.title'}}</label>
+    <label for="visiblity">{{i18n "admin.groups.manage.interaction.members_visibility_levels.title"}}</label>
 
     {{combo-box name="alias"
         valueProperty="value"
@@ -29,14 +29,14 @@
         class="groups-form-members-visibility-level"}}
 
     <div class="control-instructions">
-      {{i18n 'admin.groups.manage.interaction.members_visibility_levels.description'}}
+      {{i18n "admin.groups.manage.interaction.members_visibility_levels.description"}}
     </div>
   </div>
 {{/if}}
 
 <div class="control-group">
-  <label class="control-label">{{i18n 'groups.manage.interaction.posting'}}</label>
-  <label for="alias">{{i18n 'groups.alias_levels.mentionable'}}</label>
+  <label class="control-label">{{i18n "groups.manage.interaction.posting"}}</label>
+  <label for="alias">{{i18n "groups.alias_levels.mentionable"}}</label>
 
   {{combo-box
     name="alias"
@@ -49,7 +49,7 @@
 </div>
 
 <div class="control-group">
-  <label for="alias">{{i18n 'groups.alias_levels.messageable'}}</label>
+  <label for="alias">{{i18n "groups.alias_levels.messageable"}}</label>
 
   {{combo-box
     name="alias"
@@ -67,14 +67,14 @@
           checked=model.publish_read_state
           class="groups-form-publish-read-state"}}
 
-    {{i18n 'admin.groups.manage.interaction.publish_read_state'}}
+    {{i18n "admin.groups.manage.interaction.publish_read_state"}}
   </label>
 </div>
 
 {{#if showEmailSettings}}
   <div class="control-group">
-    <label class="control-label">{{i18n 'admin.groups.manage.interaction.email'}}</label>
-    <label for="incoming_email">{{i18n 'admin.groups.manage.interaction.incoming_email'}}</label>
+    <label class="control-label">{{i18n "admin.groups.manage.interaction.email"}}</label>
+    <label for="incoming_email">{{i18n "admin.groups.manage.interaction.incoming_email"}}</label>
 
     {{text-field name="incoming_email"
         class="input-xxlarge groups-form-incoming-email"
@@ -85,10 +85,10 @@
   </div>
 {{/if}}
 
-<label class="control-label">{{i18n 'groups.manage.interaction.notification'}}</label>
+<label class="control-label">{{i18n "groups.manage.interaction.notification"}}</label>
 
 <div class="control-group">
-  <label>{{i18n 'groups.notification_level'}}</label>
+  <label>{{i18n "groups.notification_level"}}</label>
 
   {{notifications-button
     value=model.default_notification_level
diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs b/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
index 3b1a41304a..b92c678716 100644
--- a/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
+++ b/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
@@ -3,7 +3,7 @@
     <label class="control-label">{{i18n "admin.groups.manage.membership.automatic"}}</label>
 
     <label for="automatic_membership">
-      {{i18n 'admin.groups.manage.membership.automatic_membership_email_domains'}}
+      {{i18n "admin.groups.manage.membership.automatic_membership_email_domains"}}
     </label>
 
     {{list-setting
@@ -23,7 +23,7 @@
           checked=model.automatic_membership_retroactive
           class="groups-form-automatic-membership-retroactive"}}
 
-      {{i18n 'admin.groups.manage.membership.automatic_membership_retroactive'}}
+      {{i18n "admin.groups.manage.membership.automatic_membership_retroactive"}}
     </label>
   </div>
 
@@ -32,7 +32,7 @@
 
   <div class="control-group">
     <label class="control-label">{{i18n "admin.groups.manage.membership.effects"}}</label>
-    <label for="grant_trust_level">{{i18n 'admin.groups.manage.membership.trust_levels_title'}}</label>
+    <label for="grant_trust_level">{{i18n "admin.groups.manage.membership.trust_levels_title"}}</label>
 
     {{combo-box
       name="grant_trust_level"
@@ -47,7 +47,7 @@
           checked=model.primary_group
           class="groups-form-primary-group"}}
 
-      {{i18n 'admin.groups.manage.membership.primary_group'}}
+      {{i18n "admin.groups.manage.membership.primary_group"}}
     </label>
 
   </div>
@@ -62,15 +62,15 @@
         checked=model.public_admission
         disabled=disablePublicSetting}}
 
-    {{i18n 'groups.public_admission'}}
+    {{i18n "groups.public_admission"}}
   </label>
 
   <label>
-    {{input type='checkbox'
-        class='group-form-public-exit'
+    {{input type="checkbox"
+        class="group-form-public-exit"
         checked=model.public_exit}}
 
-    {{i18n 'groups.public_exit'}}
+    {{i18n "groups.public_exit"}}
   </label>
 
   <label>
@@ -79,17 +79,17 @@
         checked=model.allow_membership_requests
         disabled=disableMembershipRequestSetting}}
 
-    {{i18n 'groups.allow_membership_requests'}}
+    {{i18n "groups.allow_membership_requests"}}
   </label>
 
   {{#if model.allow_membership_requests}}
     <div>
       <label for="membership-request-template">
-        {{i18n 'groups.membership_request_template'}}
+        {{i18n "groups.membership_request_template"}}
       </label>
 
       {{expanding-text-area name="membership-request-template"
-          class='group-form-membership-request-template input-xxlarge'
+          class="group-form-membership-request-template input-xxlarge"
           value=model.membership_request_template}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs b/app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs
index c99bd33ad5..15230779e4 100644
--- a/app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs
+++ b/app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs
@@ -1,7 +1,7 @@
 {{#if canEdit}}
   {{#if this.currentUser.admin}}
     <div class="control-group">
-      <label class="control-label" for="name">{{i18n 'groups.name'}}</label>
+      <label class="control-label" for="name">{{i18n "groups.name"}}</label>
 
       {{text-field name="name"
           class="input-xxlarge group-form-name"
@@ -13,9 +13,9 @@
   {{/if}}
 
   <div class="control-group">
-    <label class="control-label" for='full_name'>{{i18n 'groups.manage.full_name'}}</label>
+    <label class="control-label" for="full_name">{{i18n "groups.manage.full_name"}}</label>
 
-    {{text-field name='full_name'
+    {{text-field name="full_name"
         class="input-xxlarge group-form-full-name"
         value=model.full_name}}
   </div>
@@ -23,20 +23,20 @@
   {{#if this.currentUser.admin}}
     <div class="control-group">
       <label class="control-label" for="title">
-        {{i18n 'admin.groups.default_title'}}
+        {{i18n "admin.groups.default_title"}}
       </label>
 
       {{input value=model.title name="title" class="input-xxlarge"}}
 
       <div class="control-instructions">
-        {{i18n 'admin.groups.default_title_description'}}
+        {{i18n "admin.groups.default_title_description"}}
       </div>
     </div>
   {{/if}}
 {{/if}}
 
 <div class="control-group">
-  <label class="control-label" for="bio">{{i18n 'groups.bio'}}</label>
+  <label class="control-label" for="bio">{{i18n "groups.bio"}}</label>
   {{d-editor value=model.bio_raw class="group-form-bio input-xxlarge"}}
 </div>
 
diff --git a/app/assets/javascripts/discourse/templates/components/groups-info.hbs b/app/assets/javascripts/discourse/templates/components/groups-info.hbs
index 69a583598d..a82509be40 100644
--- a/app/assets/javascripts/discourse/templates/components/groups-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/groups-info.hbs
@@ -1,5 +1,5 @@
 {{#if showFullName}}
-  <span class='groups-info-name'>{{group.full_name}}</span>
+  <span class="groups-info-name">{{group.full_name}}</span>
 {{else}}
-  <span class='groups-info-name'>{{group.displayName}}</span>
+  <span class="groups-info-name">{{group.displayName}}</span>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/ignored-user-list.hbs b/app/assets/javascripts/discourse/templates/components/ignored-user-list.hbs
index 12e1f06942..73e122024d 100644
--- a/app/assets/javascripts/discourse/templates/components/ignored-user-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ignored-user-list.hbs
@@ -2,8 +2,8 @@
   {{#each items as |item|}}
     {{ignored-user-list-item item=item onRemoveIgnoredUser=(action "removeIgnoredUser")}}
   {{else}}
-    {{i18n 'user.user_notifications.ignore_no_users'}}
+    {{i18n "user.user_notifications.ignore_no_users"}}
   {{/each}}
 </div>
-<div class="instructions">{{i18n 'user.ignored_users_instructions'}}</div>
-<div>{{#d-button action=(action "newIgnoredUser") class="btn-default" icon="plus"}}{{i18n 'user.user_notifications.add_ignored_user'}}{{/d-button}}</div>
+<div class="instructions">{{i18n "user.ignored_users_instructions"}}</div>
+<div>{{#d-button action=(action "newIgnoredUser") class="btn-default" icon="plus"}}{{i18n "user.user_notifications.add_ignored_user"}}{{/d-button}}</div>
diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
index 9820cb33a0..04096a287a 100644
--- a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
@@ -3,7 +3,7 @@
     <div class="placeholder-overlay" style={{placeholderStyle}}></div>
   {{/if}}
   <div class="image-upload-controls">
-    <label class="btn btn-default pad-left no-text {{if uploading 'disabled'}}">
+    <label class="btn btn-default pad-left no-text {{if uploading "disabled"}}">
       {{d-icon "far-image"}}
       <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*">
     </label>
@@ -26,7 +26,7 @@
       }}
     {{/if}}
 
-    <span class="btn {{unless uploading 'hidden'}}">{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
+    <span class="btn {{unless uploading "hidden"}}">{{i18n "upload_selector.uploading"}} {{uploadProgress}}%</span>
   </div>
 
   {{#if imageUrl}}
diff --git a/app/assets/javascripts/discourse/templates/components/images-uploader.hbs b/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
index ea9a23d1e4..b7c195cc65 100644
--- a/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
@@ -3,5 +3,5 @@
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" multiple>
 </label>
 {{#if uploading}}
-  <span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
+  <span>{{i18n "upload_selector.uploading"}} {{uploadProgress}}%</span>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 35e074e661..3e57bd71d8 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -14,7 +14,7 @@
       {{d-button action=(action "copy") class="pull-right no-text" icon="copy"}}
     {{/if}}
     <h4>{{i18n "ip_lookup.title"}}</h4>
-    <p class='powered-by'>{{html-safe (i18n "ip_lookup.powered_by")}}</p>
+    <p class="powered-by">{{html-safe (i18n "ip_lookup.powered_by")}}</p>
     <dl>
       {{#if location}}
         {{#if location.hostname}}
diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
index c071eaaef1..5e369f51f9 100644
--- a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
@@ -1,4 +1,4 @@
-<div class='topic-poster'>
+<div class="topic-poster">
   {{#user-link user=topic.lastPosterUser}}
     {{avatar topic.lastPosterUser imageSize="large"}}
   {{/user-link}}
@@ -10,8 +10,8 @@
       groupName=topic.lastPosterGroup.name}}
   {{/if}}
 </div>
-<div class='main-link'>
-  <div class='top-row'>
+<div class="main-link">
+  <div class="top-row">
     {{raw "topic-status" topic=topic}}
     {{topic-link topic}}
     {{#if topic.featured_link}}
@@ -19,12 +19,12 @@
     {{/if}}
     {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
   </div>
-  <div class='bottom-row'>
+  <div class="bottom-row">
     {{category-link topic.category}}
     {{discourse-tags topic mode="list"}}
   </div>
 </div>
-<div class='topic-stats'>
+<div class="topic-stats">
   {{raw "list/posts-count-column" topic=topic tagName="div"}}
   <div class="topic-last-activity">
     <a href={{topic.lastPostUrl}} title={{topic.bumpedAtTitle}}>{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
index 3c4fcf9491..1f1fc1ec80 100644
--- a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
@@ -1,5 +1,5 @@
-<td class='main-link'>
-  <div class='topic-inset'>
+<td class="main-link">
+  <div class="topic-inset">
     {{raw "topic-status" topic=topic}}
     {{topic-link topic}}
     {{#if topic.unseen}}
@@ -8,4 +8,4 @@
     <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{format-age topic.last_posted_at}}</span>
   </div>
 </td>
-<td class='num posts'>{{raw "list/post-count-or-badges" topic=topic postBadgesEnabled="true"}}</td>
+<td class="num posts">{{raw "list/post-count-or-badges" topic=topic postBadgesEnabled="true"}}</td>
diff --git a/app/assets/javascripts/discourse/templates/components/popup-input-tip.hbs b/app/assets/javascripts/discourse/templates/components/popup-input-tip.hbs
index ded803482f..f58909e3b2 100644
--- a/app/assets/javascripts/discourse/templates/components/popup-input-tip.hbs
+++ b/app/assets/javascripts/discourse/templates/components/popup-input-tip.hbs
@@ -1 +1 @@
-<span class='close'>{{closeIcon}}</span>{{tipReason}}
+<span class="close">{{closeIcon}}</span>{{tipReason}}
diff --git a/app/assets/javascripts/discourse/templates/components/preference-checkbox.hbs b/app/assets/javascripts/discourse/templates/components/preference-checkbox.hbs
index f7931d5918..1d5fd86eb7 100644
--- a/app/assets/javascripts/discourse/templates/components/preference-checkbox.hbs
+++ b/app/assets/javascripts/discourse/templates/components/preference-checkbox.hbs
@@ -1,4 +1,4 @@
-<label class='checkbox-label'>
+<label class="checkbox-label">
   {{input type="checkbox" disabled=disabled checked=checked}}
   {{label}}
 </label>
diff --git a/app/assets/javascripts/discourse/templates/components/quote-button.hbs b/app/assets/javascripts/discourse/templates/components/quote-button.hbs
index 163e768ec0..868baa320f 100644
--- a/app/assets/javascripts/discourse/templates/components/quote-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/quote-button.hbs
@@ -1 +1 @@
-{{d-icon "quote-left"}} <span class='quote-label'>{{i18n "post.quote_reply"}}</span>
+{{d-icon "quote-left"}} <span class="quote-label">{{i18n "post.quote_reply"}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-claimed-topic.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-claimed-topic.hbs
index 92f3fccfb4..80e825fa08 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-claimed-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-claimed-topic.hbs
@@ -1,9 +1,9 @@
 {{#if enabled}}
-  <div class='reviewable-claimed-topic'>
+  <div class="reviewable-claimed-topic">
     {{#if claimedBy}}
-      <div class='claimed-by'>
+      <div class="claimed-by">
         {{avatar claimedBy imageSize="small"}}
-        <span class='claimed-username'>{{claimedBy.username}}</span>
+        <span class="claimed-username">{{claimedBy.username}}</span>
       </div>
       {{d-button
         icon="times"
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
index 25aeea0726..a9c94a9cf7 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
@@ -1,7 +1,7 @@
 {{#if post}}
-  <div class='reviewable-conversation-post'>
+  <div class="reviewable-conversation-post">
     {{#if showUsername}}
-      {{#link-to 'user' post.user class="username"}}@{{post.user.username}}{{/link-to}}
+      {{#link-to "user" post.user class="username"}}@{{post.user.username}}{{/link-to}}
     {{/if}}
     {{html-safe post.excerpt}}
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs
index f45506550f..aaa17dcd34 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs
@@ -1,4 +1,4 @@
-<div class='names'>
+<div class="names">
   <span class="username">
     {{#if user}}
       {{#user-link user=user}}{{user.username}}{{/user-link}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-created-by.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-created-by.hbs
index 7bcc990233..ea8f4fd878 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-created-by.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-created-by.hbs
@@ -1,4 +1,4 @@
-<div class='created-by'>
+<div class="created-by">
   {{#if user}}
     {{#user-link user=user}}{{avatar user imageSize="large"}}{{/user-link}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field-text.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-field-text.hbs
index 2b3e5f0f8e..e41a036af6 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-field-text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-field-text.hbs
@@ -1 +1 @@
-{{input value=value change=valueChanged class='reviewable-input-text'}}
+{{input value=value change=valueChanged class="reviewable-input-text"}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-field.hbs
index 821a601d33..af12e4c377 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-field.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-field.hbs
@@ -1,6 +1,6 @@
 {{#if value}}
   <div class={{classes}}>
-    <div class='name'>{{name}}</div>
-    <div class='value'>{{value}}</div>
+    <div class="name">{{name}}</div>
+    <div class="value">{{value}}</div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
index 6cbad0ec06..3302312732 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
@@ -1,5 +1,5 @@
-<div class='flagged-post-header'>
-  {{reviewable-topic-link reviewable=reviewable tagName=''}}
+<div class="flagged-post-header">
+  {{reviewable-topic-link reviewable=reviewable tagName=""}}
   {{#if hasEdits}}
     <a href {{action "showEditHistory"}}
       class="has-edits {{historyClass}}"
@@ -9,11 +9,11 @@
   {{/if}}
 </div>
 
-<div class='post-contents-wrapper'>
-  {{reviewable-created-by user=reviewable.target_created_by tagName=''}}
-  <div class='post-contents'>
-    {{reviewable-post-header reviewable=reviewable createdBy=reviewable.target_created_by tagName=''}}
-    <div class='post-body'>
+<div class="post-contents-wrapper">
+  {{reviewable-created-by user=reviewable.target_created_by tagName=""}}
+  <div class="post-contents">
+    {{reviewable-post-header reviewable=reviewable createdBy=reviewable.target_created_by tagName=""}}
+    <div class="post-body">
       {{#if reviewable.blank_post}}
         <p>{{i18n "review.deleted_post"}}</p>
       {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs
index 6b1f327638..433ee1f15d 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs
@@ -1,5 +1,5 @@
 {{#if filteredHistories}}
-  <table class='reviewable-histories'>
+  <table class="reviewable-histories">
     <thead>
       <tr>
         <th colspan="3">{{i18n "review.history.title"}}</th>
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
index 7b3a7a2f2a..3df7b43133 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
@@ -1,34 +1,34 @@
-<div class='reviewable-item {{customClass}}' data-reviewable-id={{reviewable.id}}>
-  <div class='reviewable-meta-data'>
-    <span class='reviewable-type'>{{reviewable.humanType}}</span>
+<div data-reviewable-id={{reviewable.id}} class="reviewable-item {{customClass}}">
+  <div class="reviewable-meta-data">
+    <span class="reviewable-type">{{reviewable.humanType}}</span>
     {{#if reviewable.reply_count}}
-      <span class='reply-count'>{{i18n "review.replies" count=reviewable.reply_count}}</span>
+      <span class="reply-count">{{i18n "review.replies" count=reviewable.reply_count}}</span>
     {{/if}}
-    <span class='created-at'>
-      {{#link-to 'review.show' reviewable.id}}{{age-with-tooltip reviewable.created_at}}{{/link-to}}
+    <span class="created-at">
+      {{#link-to "review.show" reviewable.id}}{{age-with-tooltip reviewable.created_at}}{{/link-to}}
     </span>
-    <span class='status'>
+    <span class="status">
       {{reviewable-status reviewable.status}}
     </span>
-    <a href {{action "explainReviewable" reviewable}} class='explain' title={{i18n "review.explain.why"}}>
+    <a href {{action "explainReviewable" reviewable}} title={{i18n "review.explain.why"}} class="explain">
       {{d-icon "question-circle"}}
     </a>
   </div>
 
-  <div class='reviewable-contents'>
+  <div class="reviewable-contents">
     {{#if editing}}
-      <div class='editable-fields'>
+      <div class="editable-fields">
         {{#if reviewable.created_by}}
-          <div class='editable-created-by'>
+          <div class="editable-created-by">
             {{avatar reviewable.created_by imageSize="tiny"}}
-            {{reviewable-created-by-name user=reviewable.created_by tagName=''}}
+            {{reviewable-created-by-name user=reviewable.created_by tagName=""}}
           </div>
         {{/if}}
 
         {{#each reviewable.editable_fields as |f|}}
-          <div class='editable-field {{dasherize f.id}}'>
+          <div class="editable-field {{dasherize f.id}}">
             {{component (concat "reviewable-field-" f.type)
-              tagName=''
+              tagName=""
               value=(editable-value reviewable f.id)
               tagCategoryId=reviewable.category.id
               valueChanged=(action "valueChanged" f.id)
@@ -38,15 +38,15 @@
         {{/each}}
       </div>
     {{else}}
-      {{#component reviewableComponent reviewable=reviewable tagName=''}}
-        {{reviewable-scores reviewable=reviewable tagName=''}}
+      {{#component reviewableComponent reviewable=reviewable tagName=""}}
+        {{reviewable-scores reviewable=reviewable tagName=""}}
       {{/component}}
     {{/if}}
   </div>
-  <div class='reviewable-actions'>
+  <div class="reviewable-actions">
     {{#if claimEnabled}}
-      <div class='claimed-actions'>
-        <span class='help'>{{html-safe claimHelp}}</span>
+      <div class="claimed-actions">
+        <span class="help">{{html-safe claimHelp}}</span>
         {{reviewable-claimed-topic topicId=topicId claimedBy=reviewable.claimed_by}}
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-post-header.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-post-header.hbs
index 70b7d32673..3d2ffd8234 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-post-header.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-post-header.hbs
@@ -1,7 +1,7 @@
-<div class='reviewable-post-header'>
-  {{reviewable-created-by-name user=createdBy tagName=''}}
+<div class="reviewable-post-header">
+  {{reviewable-created-by-name user=createdBy tagName=""}}
   {{#if reviewable.reply_to_post_number}}
-    <a href={{concat reviewable.topic_url "/" reviewable.reply_to_post_number}} class='reviewable-reply-to'>
+    <a href={{concat reviewable.topic_url "/" reviewable.reply_to_post_number}} class="reviewable-reply-to">
       {{d-icon "share"}}
       <span>{{i18n "review.in_reply_to"}}</span>
     </a>
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-queued-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-queued-post.hbs
index 30aff53c6a..215b4e7005 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-queued-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-queued-post.hbs
@@ -1,24 +1,24 @@
-{{#reviewable-topic-link reviewable=reviewable tagName=''}}
+{{#reviewable-topic-link reviewable=reviewable tagName=""}}
   <div class="title-text">
     {{d-icon "plus-square" title="review.new_topic"}}
     {{reviewable.payload.title}}
   </div>
   {{category-badge reviewable.category}}
-  {{reviewable-tags tags=reviewable.payload.tags tagName=''}}
+  {{reviewable-tags tags=reviewable.payload.tags tagName=""}}
   {{#if reviewable.payload.via_email}}
-    <a href {{action "showRawEmail"}} class='show-raw-email'>
+    <a href {{action "showRawEmail"}} class="show-raw-email">
       {{d-icon "far-envelope" title="post.via_email"}}
     </a>
   {{/if}}
 {{/reviewable-topic-link}}
 
-<div class='post-contents-wrapper'>
-  {{reviewable-created-by user=reviewable.created_by tagName=''}}
+<div class="post-contents-wrapper">
+  {{reviewable-created-by user=reviewable.created_by tagName=""}}
 
-  <div class='post-contents'>
-    {{reviewable-post-header reviewable=reviewable createdBy=reviewable.created_by tagName=''}}
+  <div class="post-contents">
+    {{reviewable-post-header reviewable=reviewable createdBy=reviewable.created_by tagName=""}}
 
-    <div class='post-body'>
+    <div class="post-body">
       {{cook-text reviewable.payload.raw}}
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
index 847cc42154..58ce2cb9fa 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
@@ -1,5 +1,5 @@
-<tr class='reviewable-score'>
-  <td class='user'>
+<tr class="reviewable-score">
+  <td class="user">
     {{#user-link user=rs.user}}
       {{avatar rs.user imageSize="tiny"}}
       {{rs.user.username}}
@@ -22,7 +22,7 @@
       {{d-icon "angle-double-right"}}
     </td>
 
-    <td class='reviewed-by'>
+    <td class="reviewed-by">
       {{#if rs.reviewed_by}}
         {{#user-link user=rs.reviewed_by}}
           {{avatar rs.reviewed_by imageSize="tiny"}}
@@ -48,21 +48,21 @@
 
 {{#if rs.reason}}
   <tr>
-    <td colspan='7'>
-      <div class='reviewable-score-reason'>{{html-safe rs.reason}}</div>
+    <td colspan="7">
+      <div class="reviewable-score-reason">{{html-safe rs.reason}}</div>
     </td>
   </tr>
 {{/if}}
 
 {{#if rs.reviewable_conversation}}
   <tr>
-    <td colspan='7'>
-      <div class='reviewable-conversation'>
+    <td colspan="7">
+      <div class="reviewable-conversation">
         {{#each rs.reviewable_conversation.conversation_posts as |p index|}}
           {{reviewable-conversation-post post=p index=index}}
         {{/each}}
-        <div class='controls'>
-          <a href={{rs.reviewable_conversation.permalink}} class='btn btn-small'>
+        <div class="controls">
+          <a href={{rs.reviewable_conversation.permalink}} class="btn btn-small">
             {{i18n "review.conversation.view_full"}}
           </a>
         </div>
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
index f15b9e4ace..3d6bb9d09b 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
@@ -1,5 +1,5 @@
 {{#if reviewable.reviewable_scores}}
-  <table class='reviewable-scores'>
+  <table class="reviewable-scores">
     <tbody>
       {{#each reviewable.reviewable_scores as |rs|}}
         {{reviewable-score rs=rs reviewable=reviewable}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs
index b43876ab48..2860b51b82 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs
@@ -1,9 +1,9 @@
-<div class='post-topic'>
+<div class="post-topic">
   {{#if reviewable.topic}}
     {{topic-status topic=reviewable.topic showPrivateMessageIcon=true}}
-    <a href={{reviewable.target_url}} class='title-text'>{{reviewable.topic.title}}</a>
+    <a href={{reviewable.target_url}} class="title-text">{{reviewable.topic.title}}</a>
     {{category-badge reviewable.category}}
-    {{reviewable-tags tags=reviewable.topic_tags tagName=''}}
+    {{reviewable-tags tags=reviewable.topic_tags tagName=""}}
   {{else if (has-block)}}
     {{yield}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs
index e3f4ea1efd..4c246153ce 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs
@@ -1,8 +1,8 @@
-<div class='reviewable-user-info'>
-  <div class='reviewable-user-fields'>
-    <div class='reviewable-user-details username'>
-      <div class='name'>{{i18n "review.user.username"}}</div>
-      <div class='value'>
+<div class="reviewable-user-info">
+  <div class="reviewable-user-fields">
+    <div class="reviewable-user-details username">
+      <div class="name">{{i18n "review.user.username"}}</div>
+      <div class="value">
         {{#if reviewable.link_admin}}
           <a href={{get-url (concat "/admin/users/" reviewable.user_id "/" reviewable.payload.username)}}>
             {{reviewable.payload.username}}
@@ -13,29 +13,29 @@
       </div>
     </div>
 
-    {{reviewable-field classes='reviewable-user-details name'
-                       name=(i18n 'review.user.name')
+    {{reviewable-field classes="reviewable-user-details name"
+                       name=(i18n "review.user.name")
                        value=reviewable.payload.name}}
 
-    {{reviewable-field classes='reviewable-user-details email'
-                       name=(i18n 'review.user.email')
+    {{reviewable-field classes="reviewable-user-details email"
+                       name=(i18n "review.user.email")
                        value=reviewable.payload.email}}
 
-    {{reviewable-field classes='reviewable-user-details bio'
-                       name=(i18n 'review.user.bio')
+    {{reviewable-field classes="reviewable-user-details bio"
+                       name=(i18n "review.user.bio")
                        value=reviewable.payload.bio}}
 
     {{#if reviewable.payload.website}}
       <div class="reviewable-user-details website">
-        <div class='name'>{{i18n 'review.user.website'}}</div>
-        <div class='value'>
+        <div class="name">{{i18n "review.user.website"}}</div>
+        <div class="value">
           <a href={{reviewable.payload.website}} target="_blank" rel="noopener">{{reviewable.payload.website}}</a>
         </div>
       </div>
     {{/if}}
 
     {{#each userFields as |f|}}
-      {{reviewable-field classes='reviewable-user-details user-field'
+      {{reviewable-field classes="reviewable-user-details user-field"
                          name=f.name
                          value=f.value}}
     {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/save-controls.hbs b/app/assets/javascripts/discourse/templates/components/save-controls.hbs
index 013cb6e0b7..9d95f47a31 100644
--- a/app/assets/javascripts/discourse/templates/components/save-controls.hbs
+++ b/app/assets/javascripts/discourse/templates/components/save-controls.hbs
@@ -1,6 +1,6 @@
 {{d-button action=action disabled=buttonDisabled label=savingText class="btn-primary save-changes"}}
 {{#if saved}}
-  <span class='saved'>{{i18n 'saved'}}</span>
+  <span class="saved">{{i18n "saved"}}</span>
 {{/if}}
 
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/score-value.hbs b/app/assets/javascripts/discourse/templates/components/score-value.hbs
index e78eeb32b2..c6ba3e7160 100644
--- a/app/assets/javascripts/discourse/templates/components/score-value.hbs
+++ b/app/assets/javascripts/discourse/templates/components/score-value.hbs
@@ -1,11 +1,11 @@
 {{#if value}}
-  <span class='score-value'>
-    <span class='score-number'>{{float value}}</span>
+  <span class="score-value">
+    <span class="score-number">{{float value}}</span>
     {{#if label}}
-      <span class='score-value-type' title={{i18n (concat "review.explain." label ".title")}}>
+      <span title={{i18n (concat "review.explain." label ".title")}} class="score-value-type">
         {{i18n (concat "review.explain." label ".name")}}
       </span>
     {{/if}}
   </span>
-  <span class='op'>+</span>
+  <span class="op">+</span>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
index c3548b7c58..9b46c49f42 100644
--- a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
@@ -66,7 +66,7 @@
     <label class="control-label" for="search-in-options">{{i18n "search.advanced.filters.label"}}</label>
     <div class="controls">
       {{#if currentUser}}
-        <section class='field'>
+        <section class="field">
           <label>{{input type="checkbox" class="in-title" checked=searchedTerms.special.in.title}} {{i18n "search.advanced.filters.title"}}</label>
           <label>{{input type="checkbox" class="in-likes" checked=searchedTerms.special.in.likes}} {{i18n "search.advanced.filters.likes"}}</label>
           <label>{{input type="checkbox" class="in-private" checked=searchedTerms.special.in.personal}} {{i18n "search.advanced.filters.private"}}</label>
@@ -119,7 +119,7 @@
   <div class="control-group pull-left">
     <label class="control-label" for="search-min-post-count">{{i18n "search.advanced.post.count.label"}}</label>
     <div class="controls">
-      {{input type="number" value=searchedTerms.min_post_count class="input-small" id='search-min-post-count'}}
+      {{input type="number" value=searchedTerms.min_post_count class="input-small" id="search-min-post-count"}}
     </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/security-key-form.hbs b/app/assets/javascripts/discourse/templates/components/security-key-form.hbs
index e5bc247ad3..93158de33c 100644
--- a/app/assets/javascripts/discourse/templates/components/security-key-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/security-key-form.hbs
@@ -5,10 +5,10 @@
       id="security-key-authenticate-button"
       label="login.security_key_authenticate"
       type="button"
-      class='btn btn-large btn-primary'}}
+      class="btn btn-large btn-primary"}}
   <p>
     {{#if otherMethodAllowed}}
-      <a href="" class="toggle-second-factor-method" {{action "useAnotherMethod"}}>{{ i18n 'login.security_key_alternative' }}</a>
+      <a href="" class="toggle-second-factor-method" {{action "useAnotherMethod"}}>{{ i18n "login.security_key_alternative" }}</a>
     {{/if}}
   </p>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
index f641a14a56..03bc3de807 100644
--- a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
+++ b/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
@@ -1,10 +1,10 @@
-<div class='shared-draft-controls'>
+<div class="shared-draft-controls">
   {{#if publishing}}
     {{i18n "shared_drafts.publishing"}}
   {{else}}
     {{html-safe (i18n "shared_drafts.notice" category=topic.category.name)}}
 
-    <div class='publish-field'>
+    <div class="publish-field">
       <label>{{i18n "shared_drafts.destination_category"}}</label>
       {{category-chooser
         value=topic.destination_category_id
@@ -12,7 +12,7 @@
       }}
     </div>
 
-    <div class='publish-field'>
+    <div class="publish-field">
       {{#if validCategory}}
         {{d-button
           action=(action "publish")
diff --git a/app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs b/app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs
index e0cd0eb1d9..0bca43013d 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs
@@ -3,7 +3,7 @@
   <br>
 
   <section class="group-tags-list">
-    <label>{{i18n 'tagging.groups.tags_label'}}</label><br>
+    <label>{{i18n "tagging.groups.tags_label"}}</label><br>
     {{tag-chooser
       tags=buffered.tag_names
       everyTag=true
@@ -14,7 +14,7 @@
   </section>
 
   <section class="parent-tag-section">
-    <label>{{i18n 'tagging.groups.parent_tag_label'}}</label>
+    <label>{{i18n "tagging.groups.parent_tag_label"}}</label>
     {{tag-chooser
       tags=buffered.parent_tag_name
       everyTag=true
@@ -22,13 +22,13 @@
       allowCreate=true
       excludeSynonyms=true
       filterPlaceholder="tagging.groups.parent_tag_placeholder"}}
-    <span class="description">{{i18n 'tagging.groups.parent_tag_description'}}</span>
+    <span class="description">{{i18n "tagging.groups.parent_tag_description"}}</span>
   </section>
 
   <section class="group-one-per-topic">
     <label>
       {{input type="checkbox" checked=buffered.one_per_topic name="onepertopic"}}
-      {{i18n 'tagging.groups.one_per_topic_label'}}
+      {{i18n "tagging.groups.one_per_topic_label"}}
     </label>
   </section>
 
@@ -43,7 +43,7 @@
         onChange=(action "setPermissions")}}
 
       <label class="radio" for="public-permission">
-        {{i18n 'tagging.groups.everyone_can_use'}}
+        {{i18n "tagging.groups.everyone_can_use"}}
       </label>
     </div>
     <div>
@@ -56,7 +56,7 @@
         onChange=(action "setPermissions")}}
 
       <label class="radio" for="visible-permission">
-        {{i18n 'tagging.groups.usable_only_by_staff'}}
+        {{i18n "tagging.groups.usable_only_by_staff"}}
       </label>
     </div>
     <div>
@@ -69,7 +69,7 @@
         onChange=(action "setPermissions")}}
 
       <label class="radio" for="private-permission">
-        {{i18n 'tagging.groups.visible_only_to_staff'}}
+        {{i18n "tagging.groups.visible_only_to_staff"}}
       </label>
     </div>
   </section>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
index b1031c4558..ba20f68a74 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-info.hbs
@@ -35,7 +35,7 @@
         <div>{{html-safe (i18n "tagging.synonyms_description" base_tag_name=tagInfo.name)}}</div>
         <div class="tag-list">
           {{#each tagInfo.synonyms as |tag|}}
-            <div class='tag-box'>
+            <div class="tag-box">
               {{discourse-tag tag.id pmOnly=tag.pmOnly tagName="div"}}
               {{#if editSynonymsMode}}
                 <a href {{action "unlinkSynonym" tag}} class="unlink-synonym">
@@ -52,7 +52,7 @@
     {{/if}}
     {{#if editSynonymsMode}}
       <section class="add-synonyms field">
-        <label for="add-synonyms">{{i18n 'tagging.add_synonyms_label'}}</label>
+        <label for="add-synonyms">{{i18n "tagging.add_synonyms_label"}}</label>
         {{tag-chooser
           id="add-synonyms"
           tags=newSynonyms
@@ -69,6 +69,6 @@
     {{/if}}
   {{/if}}
   {{#if loading}}
-    <div>{{i18n 'loading'}}</div>
+    <div>{{i18n "loading"}}</div>
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-list.hbs b/app/assets/javascripts/discourse/templates/components/tag-list.hbs
index b7ce5970dc..6f5f0da581 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-list.hbs
@@ -8,8 +8,8 @@
   <h3>{{tagGroupName}}</h3>
 {{/if}}
 {{#each sortedTags as |tag|}}
-  <div class='tag-box'>
-    {{discourse-tag tag.id isPrivateMessage=isPrivateMessage pmOnly=tag.pmOnly tagsForUser=tagsForUser}} {{#if tag.pmOnly}}{{d-icon "far-envelope"}}{{/if}}{{#if tag.totalCount}} <span class='tag-count'>x {{tag.totalCount}}</span>{{/if}}
+  <div class="tag-box">
+    {{discourse-tag tag.id isPrivateMessage=isPrivateMessage pmOnly=tag.pmOnly tagsForUser=tagsForUser}} {{#if tag.pmOnly}}{{d-icon "far-envelope"}}{{/if}}{{#if tag.totalCount}} <span class="tag-count">x {{tag.totalCount}}</span>{{/if}}
   </div>
 {{/each}}
 <div class="clearfix"></div>
diff --git a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
index 227674d60c..9872c066aa 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
@@ -1,7 +1,7 @@
 {{#d-button action=(action "enterTop") class="full jump-top"}}
-  {{d-icon 'step-backward'}} {{html-safe topDate}}
+  {{d-icon "step-backward"}} {{html-safe topDate}}
 {{/d-button}}
 
 {{#d-button action=(action "enterBottom") class="full jump-bottom"}}
-  {{html-safe bottomDate}} {{d-icon 'step-forward'}}
+  {{html-safe bottomDate}} {{d-icon "step-forward"}}
 {{/d-button}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
index 67f890abd2..766ae9bf2b 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
@@ -1,4 +1,4 @@
-<div class='topic-footer-main-buttons'>
+<div class="topic-footer-main-buttons">
   {{topic-admin-menu-button
     topic=topic
     openUpwards="true"
diff --git a/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs b/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs
index 1d992c500e..98e3ea3c3f 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs
@@ -1,9 +1,9 @@
 {{#if unread }}
-  &nbsp;<a href={{url}} class='badge badge-notification unread' title={{i18n "topic.unread_posts" count=unread}}>{{unread}}</a>
+  &nbsp;<a href={{url}} title={{i18n "topic.unread_posts" count=unread}} class="badge badge-notification unread">{{unread}}</a>
 {{/if}}
 {{#if newPosts}}
-  &nbsp;<a href={{url}} class='badge badge-notification new-posts' title={{i18n "topic.total_unread_posts" count=newPosts}}>{{newPosts}}</a>
+  &nbsp;<a href={{url}} title={{i18n "topic.total_unread_posts" count=newPosts}} class="badge badge-notification new-posts">{{newPosts}}</a>
 {{/if}}
 {{#if unseen}}
-  &nbsp;<a href={{url}} class='badge badge-notification new-topic' title={{i18n "topic.new"}}>{{newDotText}}</a>
+  &nbsp;<a href={{url}} title={{i18n "topic.new"}} class="badge badge-notification new-topic">{{newDotText}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
index 4bfcbdc6fd..326aeb3538 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
@@ -3,15 +3,15 @@
 {{/unless}}
 
 {{#if showBackButton}}
-  <div class='progress-back-container'>
+  <div class="progress-back-container">
     {{d-button label="topic.timeline.back" class="btn-primary progress-back" action=(action "goBack") icon="arrow-down"}}
   </div>
 {{/if}}
 
-<nav id='topic-progress' title={{i18n 'topic.progress.title'}} class={{if hideProgress 'hidden'}}>
-  <div class='nums'>
+<nav title={{i18n "topic.progress.title"}} class={{if hideProgress "hidden"}} id="topic-progress">
+  <div class="nums">
     <h4>{{progressPosition}}</h4>
-    <span class={{if hugeNumberOfPosts 'hidden'}}>
+    <span class={{if hugeNumberOfPosts "hidden"}}>
       <span>/</span>
       <h4>{{postStream.filteredPostsCount}}</h4>
     </span>
diff --git a/app/assets/javascripts/discourse/templates/components/topic-status.hbs b/app/assets/javascripts/discourse/templates/components/topic-status.hbs
index bf655d9219..23761e150f 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-status.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-status.hbs
@@ -1,32 +1,32 @@
 {{~#if topicClosedArchived~}}
-  <span class='topic-status' title={{closedArchivedTitle}}>{{closedArchivedIcon}}</span>
+  <span title={{closedArchivedTitle}} class="topic-status">{{closedArchivedIcon}}</span>
 {{~/if~}}
 {{~#if closedIcon~}}
-  <span class='topic-status' title={{closedTitle}}>{{closedIcon}}</span>
+  <span title={{closedTitle}} class="topic-status">{{closedIcon}}</span>
 {{~/if~}}
 {{~#if archivedIcon~}}
-  <span class='topic-status' title={{archivedTitle}}>{{archivedIcon}}</span>
+  <span title={{archivedTitle}} class="topic-status">{{archivedIcon}}</span>
 {{~/if~}}
 {{~#if topicPrivateMessage~}}
-  <span class='topic-status' title={{privateMessageTitle}}>{{privateMessageIcon}}</span>
+  <span title={{privateMessageTitle}} class="topic-status">{{privateMessageIcon}}</span>
 {{~/if~}}
 {{~#if topicWarning~}}
-  <span class='topic-status topic-status-warning' title={{warningTitle}}>{{warningIcon}}</span>
+  <span title={{warningTitle}} class="topic-status topic-status-warning">{{warningIcon}}</span>
 {{~/if~}}
 {{~#if topicPinned~}}
   {{~#if canAct~}}
-    <a href="" class='topic-status' title={{pinnedTitle}}>{{pinnedIcon}}</a>
+    <a href="" title={{pinnedTitle}} class="topic-status">{{pinnedIcon}}</a>
   {{~else~}}
-    <span class='topic-status' title={{pinnedTitle}}>{{pinnedIcon}}</span>
+    <span title={{pinnedTitle}} class="topic-status">{{pinnedIcon}}</span>
   {{~/if~}}
 {{~/if~}}
 {{~#if topicUnpinned~}}
   {{~#if canAct~}}
-    <a href="" class='topic-status' title={{unpinnedTitle}}>{{unpinnedIcon}}</a>
+    <a href="" title={{unpinnedTitle}} class="topic-status">{{unpinnedIcon}}</a>
   {{~else~}}
-    <span class='topic-status' title={{unpinnedTitle}}>{{unpinnedIcon}}</span>
+    <span title={{unpinnedTitle}} class="topic-status">{{unpinnedIcon}}</span>
   {{~/if~}}
 {{~/if~}}
 {{~#if topicInvisible~}}
-  <span class='topic-status' title={{invisibleTitle}}>{{invisibleIcon}}</span>
+  <span title={{invisibleTitle}} class="topic-status">{{invisibleIcon}}</span>
 {{~/if~}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index 60bf8008b9..e5ac4178c2 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -34,7 +34,7 @@
             flairColor=user.primary_group_flair_color
             groupName=user.primary_group_name}}
           {{/if}}
-          {{plugin-outlet name="user-card-avatar-flair" args=(hash user=user) tagName='div'}}
+          {{plugin-outlet name="user-card-avatar-flair" args=(hash user=user) tagName="div"}}
         </div>
         <div class="names">
           <h1 class="{{staff}} {{newUser}} {{if nameFirst "full-name" "username"}}">
@@ -43,7 +43,7 @@
                 {{if nameFirst user.name (format-username username)}}
               </span>
             {{else}}
-              <a href={{user.path}} {{action "showUser" user}} class='user-profile-link'>
+              <a href={{user.path}} {{action "showUser" user}} class="user-profile-link">
                 <span class="name-username-wrapper">
                   {{if nameFirst user.name (format-username username)}}
                 </span>
@@ -51,25 +51,25 @@
               </a>
             {{/if}}
           </h1>
-          {{plugin-outlet name="user-card-after-username" args=(hash user=user showUser=(action "showUser" user)) tagName=''}}
+          {{plugin-outlet name="user-card-after-username" args=(hash user=user showUser=(action "showUser" user)) tagName=""}}
           {{#if nameFirst}}
-            <h2 class='username'>{{username}}</h2>
+            <h2 class="username">{{username}}</h2>
           {{else}}
             {{#if user.name}}
-              <h2 class='full-name'>{{user.name}}</h2>
+              <h2 class="full-name">{{user.name}}</h2>
             {{/if}}
           {{/if}}
           {{#if user.title}}
             <h2>{{user.title}}</h2>
           {{/if}}
           {{#if user.staged}}
-            <h2 class="staged">{{i18n 'user.staged'}}</h2>
+            <h2 class="staged">{{i18n "user.staged"}}</h2>
           {{/if}}
-          {{plugin-outlet name="user-card-post-names" args=(hash user=user) tagName='div'}}
+          {{plugin-outlet name="user-card-post-names" args=(hash user=user) tagName="div"}}
         </div>
         <ul class="usercard-controls">
           {{#if user.can_send_private_message_to_user}}
-            <li class='compose-pm'>
+            <li class="compose-pm">
               {{d-button
               class="btn-primary"
               action=(action "composePM" user post)
@@ -113,7 +113,7 @@
 
       {{#if user.profile_hidden}}
         <div class="card-row second-row">
-          <div class='profile-hidden'>
+          <div class="profile-hidden">
             <span>{{i18n "user.profile_hidden"}}</span>
           </div>
         </div>
@@ -122,19 +122,19 @@
       {{#if isSuspendedOrHasBio}}
         <div class="card-row second-row">
           {{#if user.suspend_reason}}
-            <div class='suspended'>
+            <div class="suspended">
               <div class="suspension-date">
                 {{d-icon "ban"}}
-                {{i18n 'user.suspended_notice' date=user.suspendedTillDate}}
+                {{i18n "user.suspended_notice" date=user.suspendedTillDate}}
               </div>
-              <div class='suspension-reason'>
-                <span class="suspension-reason-title">{{i18n 'user.suspended_reason'}}</span>
+              <div class="suspension-reason">
+                <span class="suspension-reason-title">{{i18n "user.suspended_reason"}}</span>
                 <span class="suspension-reason-description">{{user.suspend_reason}}</span>
               </div>
             </div>
           {{else}}
             {{#if user.bio_excerpt}}
-              <div class='bio'>{{text-overflow class="overflow" text=user.bio_excerpt}}</div>
+              <div class="bio">{{text-overflow class="overflow" text=user.bio_excerpt}}</div>
             {{/if}}
           {{/if}}
         </div>
@@ -143,7 +143,7 @@
       {{#if showFeaturedTopic}}
         <div class="card-row">
           <div class="featured-topic">
-            <span class="desc">{{i18n 'user.featured_topic'}}</span>
+            <span class="desc">{{i18n "user.featured_topic"}}</span>
             {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{html-safe (replace-emoji user.featured_topic.fancy_title)}}{{/link-to}}
           </div>
         </div>
@@ -153,13 +153,13 @@
         <div class="card-row">
           <div class="location-and-website">
             {{#if user.location}}
-              <span class='location'>
+              <span class="location">
                 {{d-icon "map-marker-alt"}}
                 <span>{{user.location}}</span>
               </span>
             {{/if}}
             {{#if user.website_name}}
-              <span class='website-name'>
+              <span class="website-name">
                 {{d-icon "globe"}}
                 {{#if linkWebsite}}
                   {{!-- template-lint-disable  --}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index c09e659301..64ee54fa82 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,14 +1,14 @@
 {{#if field.name}}
-  <label class="control-label" for={{concat 'user-' elementId}}>
-    {{html-safe field.name}}   {{#if field.required}}<span class='required'>*</span>{{/if}}
+  <label class="control-label" for={{concat "user-" elementId}}>
+    {{html-safe field.name}}   {{#if field.required}}<span class="required">*</span>{{/if}}
   </label>
 {{/if}}
 
-<div class='controls'>
+<div class="controls">
   <label class="control-label checkbox-label">
-    {{input id=(concat 'user-' elementId) checked=value type="checkbox"}}
+    {{input id=(concat "user-" elementId) checked=value type="checkbox"}}
     <span>
-      {{html-safe field.description}}   {{#unless field.name}}{{#if field.required}}<span class='required'>*</span>{{/if}}{{/unless}}
+      {{html-safe field.description}}   {{#unless field.name}}{{#if field.required}}<span class="required">*</span>{{/if}}{{/unless}}
     </span>
   </label>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index 5583c96f89..f59b0dfd05 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,13 +1,13 @@
-<label class="control-label" for={{concat 'user-' elementId}}>
+<label class="control-label" for={{concat "user-" elementId}}>
   {{html-safe field.name}}
   {{#if field.required}}
-    <span class='required'>*</span>
+    <span class="required">*</span>
   {{/if}}
 </label>
 
-<div class='controls'>
+<div class="controls">
   {{combo-box
-    id=(concat 'user-' elementId)
+    id=(concat "user-" elementId)
     content=field.options
     valueProperty=null
     nameProperty=null
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 1518688a95..09a8a136e7 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,8 +1,8 @@
-<label class="control-label" for={{concat 'user-' elementId}}>
+<label class="control-label" for={{concat "user-" elementId}}>
   {{html-safe field.name}}
-  {{#if field.required}}<span class='required'>*</span>{{/if}}
+  {{#if field.required}}<span class="required">*</span>{{/if}}
 </label>
-<div class='controls'>
-  {{input id=(concat 'user-' elementId) value=value maxlength=site.user_field_max_length}}
+<div class="controls">
+  {{input id=(concat "user-" elementId) value=value maxlength=site.user_field_max_length}}
   <div class="instructions">{{html-safe field.description}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs b/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs
index b358f961e7..93b924b75d 100644
--- a/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs
@@ -1,5 +1,5 @@
 {{#if showPercentage}}
-  <div class='user-flag-percentage' title={{percentage.title}}>
+  <div title={{percentage.title}} class="user-flag-percentage">
     <span class="percentage-label {{percentage.className}}">{{percentage.label}}</span>
     {{d-icon percentage.icon}}
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-info.hbs b/app/assets/javascripts/discourse/templates/components/user-info.hbs
index 6c3e7aaceb..59160413bb 100644
--- a/app/assets/javascripts/discourse/templates/components/user-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-info.hbs
@@ -12,14 +12,14 @@
 </div>
 
 <div class="user-detail">
-  <div class='name-line'>
+  <div class="name-line">
     <span class="username"><a href={{userPath}} data-user-card={{user.username}}>{{format-username user.username}}</a></span>
     <span class="name">{{name}}</span>
   </div>
   <div class="title">{{user.title}}</div>
 
   {{#if hasBlock}}
-    <div class='details'>
+    <div class="details">
       {{yield}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs b/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs
index 757526cf38..303878d412 100644
--- a/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs
@@ -1,4 +1,4 @@
-<div class='user-profile-avatar'>
+<div class="user-profile-avatar">
   {{bound-avatar user "huge"}}
   {{#if user.primary_group_name}}
     {{avatar-flair
@@ -7,5 +7,5 @@
       flairColor=user.primary_group_flair_color
       groupName=user.primary_group_name}}
   {{/if}}
-  {{plugin-outlet name="user-profile-avatar-flair" args=(hash model=user) tagName='div'}}
+  {{plugin-outlet name="user-profile-avatar-flair" args=(hash model=user) tagName="div"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index 20bbb3204a..e95ab17d31 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -1,4 +1,4 @@
-<span class='value'>
+<span class="value">
   {{#if isNumber}}
     {{number value}}
   {{else if isDuration}}
@@ -7,7 +7,7 @@
     {{value}}
   {{/if}}
 </span>
-<span class='label'>
+<span class="label">
   {{#if icon}}{{d-icon icon}}{{/if}}
   {{html-safe (i18n label count=value)}}
 </span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index 50d4f6ee86..278606bdb9 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -1,13 +1,13 @@
-<div class='clearfix info'>
-  <a href={{item.userUrl}} data-user-card={{item.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
-  <span class='time'>{{format-date item.created_at}}</span>
+<div class="clearfix info">
+  <a href={{item.userUrl}} data-user-card={{item.username}} class="avatar-link"><div class="avatar-wrapper">{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
+  <span class="time">{{format-date item.created_at}}</span>
   {{#if item.draftType}}
-    <span class='draft-type'>{{html-safe item.draftType}}</span>
+    <span class="draft-type">{{html-safe item.draftType}}</span>
   {{else}}
     {{expand-post item=item}}
   {{/if}}
-  <div class='stream-topic-details'>
-    <div class='stream-topic-title'>
+  <div class="stream-topic-details">
+    <div class="stream-topic-title">
       {{topic-status topic=item disableActions=true}}
       <span class="title">
         {{#if item.postUrl}}
@@ -32,10 +32,10 @@
 </div>
 
 {{#if actionDescription}}
-  <p class='excerpt'>{{actionDescription}}</p>
+  <p class="excerpt">{{actionDescription}}</p>
 {{/if}}
 
-<p class='excerpt' data-topic-id={{item.topic_id}} data-post-id={{item.post_id}} data-user-id={{item.user_id}}>
+<p data-topic-id={{item.topic_id}} data-post-id={{item.post_id}} data-user-id={{item.user_id}} class="excerpt">
   {{!-- template-lint-disable no-triple-curlies --}}
   {{~#if item.expandedExcerpt}}
     {{~{item.expandedExcerpt}~}}
@@ -47,7 +47,7 @@
 
 {{#each item.children as |child|}}
   {{!-- DEPRECATED: 'child-actions' class --}}
-  <div class='user-stream-item-actions child-actions'>
+  <div class="user-stream-item-actions child-actions">
     {{d-icon child.icon class="icon"}}
     {{#each child.items as |grandChild|}}
       {{#if grandChild.removableBookmark}}
@@ -58,7 +58,7 @@
           label="bookmarks.remove"
         }}
       {{else}}
-        <a href={{grandChild.userUrl}} data-user-card={{grandChild.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true" avatarTemplatePath="acting_avatar_template"}}</div></a>
+        <a href={{grandChild.userUrl}} data-user-card={{grandChild.username}} class="avatar-link"><div class="avatar-wrapper">{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true" avatarTemplatePath="acting_avatar_template"}}</div></a>
         {{#if grandChild.edit_reason}} &mdash; <span class="edit-reason">{{grandChild.edit_reason}}</span>{{/if}}
       {{/if}}
     {{/each}}
@@ -66,8 +66,8 @@
 {{/each}}
 
 {{#if item.editableDraft}}
-  <div class='user-stream-item-draft-actions'>
-    {{d-button action=resumeDraft actionParam=item icon="pencil-alt" label='drafts.resume' class="btn-default resume-draft"}}
-    {{d-button action=removeDraft actionParam=item icon="far-trash-alt" label='drafts.remove' class="btn-default remove-draft"}}
+  <div class="user-stream-item-draft-actions">
+    {{d-button action=resumeDraft actionParam=item icon="pencil-alt" label="drafts.resume" class="btn-default resume-draft"}}
+    {{d-button action=removeDraft actionParam=item icon="far-trash-alt" label="drafts.remove" class="btn-default remove-draft"}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs
index 50ab46f1dc..4694405f99 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs
@@ -1,5 +1,5 @@
 {{#if count}}
-  {{#link-to 'full-page-search' (query-params q=searchParams)}}
+  {{#link-to "full-page-search" (query-params q=searchParams)}}
     {{count}}
   {{/link-to}}
 {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
index 28bdf9d7b8..69763aba1d 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
@@ -1,2 +1,2 @@
-<h3 class='stats-title'>{{i18n (concat "user.summary." title)}}</h3>
+<h3 class="stats-title">{{i18n (concat "user.summary." title)}}</h3>
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
index 970592ece4..b1ab485fa6 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -1,8 +1,8 @@
-<span class='topic-info'>
+<span class="topic-info">
   {{format-date createdAt format="tiny" noTitle="true"}}
   {{#if likes}}
     &middot;
-    {{d-icon 'heart'}}&nbsp;<span class='like-count'>{{number likes}}</span>
+    {{d-icon "heart"}}&nbsp;<span class="like-count">{{number likes}}</span>
   {{/if}}
 </span>
 <br>
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 7cd5c8f42a..6f133154bd 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -10,10 +10,10 @@
                         messageCount=messageCount
                         addLinkLookup=(action "addLinkLookup")}}
     {{#if model.viewOpenOrFullscreen}}
-      <div class="reply-area {{if canEditTags 'with-tags'}}">
-        <div class='composer-fields'>
+      <div class="reply-area {{if canEditTags "with-tags"}}">
+        <div class="composer-fields">
           {{plugin-outlet name="composer-open" args=(hash model=model)}}
-          <div class='reply-to'>
+          <div class="reply-to">
             {{#unless model.viewFullscreen}}
               <div class="reply-details">
                 {{composer-action-title
@@ -26,10 +26,10 @@
 
                 {{#unless site.mobileView}}
                   {{#if isWhispering}}
-                    <span class='whisper'>{{d-icon "far-eye-slash"}}</span>
+                    <span class="whisper">{{d-icon "far-eye-slash"}}</span>
                   {{/if}}
                   {{#if model.unlistTopic}}
-                    <span class='whisper'>({{i18n 'composer.unlist'}})</span>
+                    <span class="whisper">({{i18n "composer.unlist"}})</span>
                   {{/if}}
                   {{#if model.noBump}}
                     <span class="no-bump">{{d-icon "anchor"}}</span>
@@ -51,14 +51,14 @@
           {{#unless model.viewFullscreen}}
             {{#if model.canEditTitle}}
               {{#if model.creatingPrivateMessage}}
-                <div class='user-selector'>
+                <div class="user-selector">
                   {{composer-user-selector topicId=topicModel.id
                                            usernames=model.targetRecipients
                                            hasGroups=model.hasTargetGroups
                                            focusTarget=focusTarget
                                            class="users-input"}}
                   {{#if showWarning}}
-                    <label class='add-warning'>
+                    <label class="add-warning">
                       {{input type="checkbox" checked=model.isWarning tabindex="3"}}
                       {{i18n "composer.add_warning"}}
                     </label>
@@ -66,7 +66,7 @@
                 </div>
               {{/if}}
 
-              <div class="title-and-category {{if showPreview 'with-preview'}}">
+              <div class="title-and-category {{if showPreview "with-preview"}}">
 
                 {{composer-title composer=model lastValidatedAt=lastValidatedAt focusTarget=focusTarget}}
 
@@ -127,10 +127,10 @@
                           afterRefresh=(action "afterRefresh")
                           focusTarget=focusTarget}}
 
-        <div class='submit-panel'>
+        <div class="submit-panel">
           {{plugin-outlet name="composer-fields-below" args=(hash model=model)}}
 
-          <div class='save-or-cancel'>
+          <div class="save-or-cancel">
             {{#unless model.viewFullscreen}}
               {{composer-save-button action=(action "save")
                                      icon=saveIcon
@@ -138,7 +138,7 @@
                                      disableSubmit=disableSubmit}}
 
               {{#if site.mobileView}}
-                <a href {{action "cancel"}} class='cancel' tabindex="6" title={{i18n 'cancel'}}>
+                <a href {{action "cancel"}} tabindex="6" title={{i18n "cancel"}} class="cancel">
                   {{#if canEdit}}
                     {{d-icon "times"}}
                   {{else}}
@@ -146,13 +146,13 @@
                   {{/if}}
                 </a>
               {{else}}
-                <a href {{action "cancel"}} class='cancel' tabindex="6" >{{i18n 'cancel'}}</a>
+                <a href {{action "cancel"}} tabindex="6" class="cancel" >{{i18n "cancel"}}</a>
               {{/if}}
             {{/unless}}
 
             {{#if site.mobileView}}
               {{#if whisperOrUnlistTopic}}
-                <span class='whisper'>
+                <span class="whisper">
                   {{d-icon "far-eye-slash"}}
                 </span>
               {{/if}}
@@ -163,21 +163,21 @@
 
             {{#if isUploading}}
               <div id="file-uploading">
-                {{loading-spinner size="small"}}<span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
+                {{loading-spinner size="small"}}<span>{{i18n "upload_selector.uploading"}} {{uploadProgress}}%</span>
                 {{#if isCancellable}}
                   <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{d-icon "times"}}</a>
                 {{/if}}
               </div>
             {{/if}}
-            <div id='draft-status' class={{if isUploading 'hidden'}}>
+            <div class={{if isUploading "hidden"}} id="draft-status">
               {{#if model.draftSaving}}<div class="spinner small"></div>{{/if}}
-              {{#if model.draftSaved}}{{d-icon 'check' class='save-animation'}}{{/if}}
+              {{#if model.draftSaved}}{{d-icon "check" class="save-animation"}}{{/if}}
               {{#if model.draftStatus}}
                 <span title={{model.draftStatus}}>
                   {{#if model.draftConflictUser}}
-                    {{avatar model.draftConflictUser imageSize="small"}} {{d-icon 'user-edit'}}
+                    {{avatar model.draftConflictUser imageSize="small"}} {{d-icon "user-edit"}}
                   {{else}}
-                    {{d-icon 'sync-alt'}}
+                    {{d-icon "sync-alt"}}
                   {{/if}}
                   {{#unless site.mobileView}}
                     {{model.draftStatus}}
@@ -189,12 +189,12 @@
 
           {{#if site.mobileView}}
             {{#if allowUpload}}
-              <a class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">
+              <a class="btn btn-default no-text mobile-file-upload {{if isUploading "hidden"}}">
                 {{d-icon uploadIcon}}
               </a>
             {{/if}}
 
-            <a href class="btn btn-default no-text mobile-preview" title={{i18n 'composer.show_preview'}} {{action "togglePreview"}}>
+            <a href class="btn btn-default no-text mobile-preview" title={{i18n "composer.show_preview"}} {{action "togglePreview"}}>
               {{d-icon "desktop"}}
             </a>
 
@@ -202,22 +202,22 @@
               {{d-button action=(action "togglePreview") class="hide-preview" label="composer.hide_preview"}}
             {{/if}}
           {{else}}
-            <a href {{action "togglePreview"}} class='toggle-preview'>{{html-safe toggleText}}</a>
+            <a href {{action "togglePreview"}} class="toggle-preview">{{html-safe toggleText}}</a>
           {{/if}}
 
         </div>
       </div>
 
     {{else}}
-      <div class='saving-text'>
+      <div class="saving-text">
         {{#if model.createdPost}}
-          {{i18n 'composer.saved'}} <a class='permalink' href={{createdPost.url}} {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
+          {{i18n "composer.saved"}} <a href={{createdPost.url}} {{action "viewNewReply"}} class="permalink">{{i18n "composer.view_new_post"}}</a>
         {{else}}
-          {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
+          {{i18n "composer.saving"}} {{loading-spinner size="small"}}
         {{/if}}
       </div>
 
-      <div class='draft-text'>
+      <div class="draft-text">
         {{#if model.topic}}
           {{d-icon "share"}} {{html-safe draftTitle}}
         {{else}}
diff --git a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
index 238de27da0..50f12536d6 100644
--- a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
@@ -1,3 +1,3 @@
-<a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
+<a href {{action "closeMessage"}} class="close">{{d-icon "times"}}</a>
 {{#if message.title}}<h3>{{message.title}}</h3>{{/if}}
 <p>{{html-safe message.body}}</p>
diff --git a/app/assets/javascripts/discourse/templates/composer/education.hbs b/app/assets/javascripts/discourse/templates/composer/education.hbs
index 269e44e595..ea644416c0 100644
--- a/app/assets/javascripts/discourse/templates/composer/education.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/education.hbs
@@ -1,2 +1,2 @@
-<a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
+<a href {{action "closeMessage"}} class="close">{{d-icon "times"}}</a>
 {{html-safe message.body}}
diff --git a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
index 269e44e595..ea644416c0 100644
--- a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
@@ -1,2 +1,2 @@
-<a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
+<a href {{action "closeMessage"}} class="close">{{d-icon "times"}}</a>
 {{html-safe message.body}}
diff --git a/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
index 6972b13d07..8a44bb09de 100644
--- a/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
@@ -1,6 +1,6 @@
-<a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
-<h3>{{i18n 'composer.similar_topics'}}</h3>
+<a href {{action "closeMessage"}} class="close">{{d-icon "times"}}</a>
+<h3>{{i18n "composer.similar_topics"}}</h3>
 
-<ul class='topics'>
+<ul class="topics">
   {{mount-widget widget="search-result-topic" args=(hash results=message.similarTopics)}}
 </ul>
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index 208de9a709..8f13b1b615 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -38,13 +38,13 @@
 
 {{#discovery-topics-list model=model refresh=(action "refresh") incomingCount=topicTrackingState.incomingCount as |discoveryTopicList|}}
   {{#if top}}
-    <div class='top-lists'>
+    <div class="top-lists">
       {{period-chooser period=period action=(action "changePeriod") fullDay=false}}
     </div>
   {{else}}
     {{#if topicTrackingState.hasIncoming}}
-      <div class="show-more {{if hasTopics 'has-topics'}}">
-        <a class='alert alert-info clickable' tabindex="0" href {{action "showInserted"}}>
+      <div class="show-more {{if hasTopics "has-topics"}}">
+        <a tabindex="0" href {{action "showInserted"}} class="alert alert-info clickable">
           {{count-i18n key="topic_count_" suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
         </a>
       </div>
@@ -75,7 +75,7 @@
   {{/if}}
 {{/discovery-topics-list}}
 
-<footer class='topic-list-bottom'>
+<footer class="topic-list-bottom">
   {{conditional-loading-spinner condition=model.loadingMore}}
   {{#if allLoaded}}
     {{#if showDismissRead}}
@@ -97,12 +97,12 @@
 
     {{#footer-message education=footerEducation message=footerMessage}}
       {{#if latest}}
-        {{#if canCreateTopicOnCategory}}<a href {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>{{/if}}
+        {{#if canCreateTopicOnCategory}}<a href {{action "createTopic"}}>{{i18n "topic.suggest_create_topic"}}</a>{{/if}}
       {{else if top}}
-        {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}
+        {{#link-to "discovery.categories"}}{{i18n "topic.browse_all_categories"}}{{/link-to}}, {{#link-to "discovery.latest"}}{{i18n "topic.view_latest_topics"}}{{/link-to}} {{i18n "or"}} {{i18n "filters.top.other_periods"}}
         {{top-period-buttons period=period action=(action "changePeriod")}}
       {{else}}
-        {{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}
+        {{#link-to "discovery.categories"}} {{i18n "topic.browse_all_categories"}}{{/link-to}} {{i18n "or"}} {{#link-to "discovery.latest"}}{{i18n "topic.view_latest_topics"}}{{/link-to}}
       {{/if}}
     {{/footer-message}}
 
diff --git a/app/assets/javascripts/discourse/templates/email-login.hbs b/app/assets/javascripts/discourse/templates/email-login.hbs
index 96ba848bfb..3e89b6cc61 100644
--- a/app/assets/javascripts/discourse/templates/email-login.hbs
+++ b/app/assets/javascripts/discourse/templates/email-login.hbs
@@ -6,7 +6,7 @@
   <div class="pull-left col-form">
     <form>
       {{#if model.error}}
-        <div class='alert alert-error'>
+        <div class="alert alert-error">
           {{model.error}}
         </div>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/exception.hbs b/app/assets/javascripts/discourse/templates/exception.hbs
index 2c6d59e487..99d6e459a9 100644
--- a/app/assets/javascripts/discourse/templates/exception.hbs
+++ b/app/assets/javascripts/discourse/templates/exception.hbs
@@ -3,7 +3,7 @@
     <div class="face">:(</div>
     <div class="reason">{{reason}}</div>
     <div class="url">
-      {{i18n 'errors.prev_page'}} <a href={{requestUrl}} data-auto-route="true">{{requestUrl}}</a>
+      {{i18n "errors.prev_page"}} <a href={{requestUrl}} data-auto-route="true">{{requestUrl}}</a>
     </div>
     <div class="desc">
       {{#if networkFixed}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 649c3af0e4..d6cdd92227 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -20,7 +20,7 @@
     {{!-- context is only provided when searching from mobile view --}}
     <div class="search-context">
       {{#if context}}
-        <div class='fps-search-context'>
+        <div class="fps-search-context">
           <label>
             {{input type="checkbox" name="searchContext" checked=searchContextEnabled}} {{searchContextDescription}}
           </label>
@@ -29,7 +29,7 @@
     </div>
 
     {{#if hasResults}}
-      <div class='search-title'>
+      <div class="search-title">
         {{#if hasResults}}
           {{create-topic-button canCreateTopic=canCreateTopic action=(action "createTopic" searchTerm)}}
         {{/if}}
@@ -40,19 +40,19 @@
         {{/if}}
 
         {{#if bulkSelectEnabled}}
-          <div class='fps-select'>
+          <div class="fps-select">
             <a href {{action "selectAll"}}>{{i18n "search.select_all"}}</a>
             <a href {{action "clearAll"}}>{{i18n "search.clear_all"}}</a>
           </div>
         {{/if}}
       </div>
 
-      <div class='search-info'>
-        <div class='result-count'>
+      <div class="search-info">
+        <div class="result-count">
           {{html-safe resultCountLabel}}
         </div>
-        <div class='sort-by'>
-          <span class='desc'>
+        <div class="sort-by">
+          <span class="desc">
             {{i18n "search.sort_by"}}
           </span>
           {{combo-box
@@ -73,25 +73,25 @@
       <div class="search-results">
         {{#load-more selector=".fps-result" action=(action "loadMore")}}
           {{#each model.posts as |result|}}
-            <div class='fps-result'>
-              <div class='author'>
+            <div class="fps-result">
+              <div class="author">
                 <a href={{result.userPath}} data-user-card={{result.username}}>
                   {{avatar result imageSize="large"}}
                 </a>
               </div>
 
-              <div class='fps-topic'>
-                <div class='topic'>
+              <div class="fps-topic">
+                <div class="topic">
                   {{#if bulkSelectEnabled}}
                     {{track-selected selectedList=selected selectedId=result.topic}}
                   {{/if}}
 
-                  <a class='search-link' href={{result.url}} {{action "logClick" result.topic_id}}>
+                  <a href={{result.url}} {{action "logClick" result.topic_id}} class="search-link">
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
-                    <span class='topic-title'>{{#highlight-text highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+                    <span class="topic-title">{{#highlight-text highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
                   </a>
 
-                  <div class='search-category'>
+                  <div class="search-category">
                     {{#if result.topic.category.parentCategory}}
                       {{category-link result.topic.category.parentCategory}}
                     {{/if}}
@@ -103,8 +103,8 @@
                   </div>
                 </div>
 
-                <div class='blurb container'>
-                  <span class='date'>
+                <div class="blurb container">
+                  <span class="date">
                     {{format-age result.created_at}}
                     {{#if result.blurb}}
                       -
@@ -120,7 +120,7 @@
 
                 {{#if showLikeCount}}
                   {{#if result.like_count}}
-                    <span class='like-count'>
+                    <span class="like-count">
                       {{result.like_count}} {{d-icon "heart"}}
                     </span>
                   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs
index cd2608f2c2..f917c42d76 100644
--- a/app/assets/javascripts/discourse/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/group-index.hbs
@@ -27,24 +27,24 @@
 
   {{#if hasMembers}}
     {{#load-more selector=".group-members tr" action=(action "loadMore")}}
-      <table class='group-members'>
+      <table class="group-members">
         <thead>
-          {{group-index-toggle order=order desc=desc field='username_lower' i18nKey='username'}}
-          <th class='group-owner'>{{i18n "groups.members.owner"}}</th>
-          {{group-index-toggle order=order desc=desc field='added_at' i18nKey='groups.member_added'}}
-          {{group-index-toggle order=order desc=desc field='last_posted_at' i18nKey='last_post'}}
-          {{group-index-toggle order=order desc=desc field='last_seen_at'  i18nKey='last_seen'}}
+          {{group-index-toggle order=order desc=desc field="username_lower" i18nKey="username"}}
+          <th class="group-owner">{{i18n "groups.members.owner"}}</th>
+          {{group-index-toggle order=order desc=desc field="added_at" i18nKey="groups.member_added"}}
+          {{group-index-toggle order=order desc=desc field="last_posted_at" i18nKey="last_post"}}
+          {{group-index-toggle order=order desc=desc field="last_seen_at" i18nKey="last_seen"}}
           <th></th>
         </thead>
 
         <tbody>
           {{#each model.members as |m|}}
             <tr>
-              <td class='avatar'>
+              <td class="avatar">
                 {{user-info user=m skipName=skipName}}
               </td>
 
-              <td class='group-owner'>
+              <td class="group-owner">
                 {{#if m.owner}}
                   <strong class="group-owner-label">
                     {{d-icon "shield-alt"}}
diff --git a/app/assets/javascripts/discourse/templates/group-requests.hbs b/app/assets/javascripts/discourse/templates/group-requests.hbs
index 7b8b793315..7ee73b8fb6 100644
--- a/app/assets/javascripts/discourse/templates/group-requests.hbs
+++ b/app/assets/javascripts/discourse/templates/group-requests.hbs
@@ -10,10 +10,10 @@
 
   {{#if hasRequesters}}
     {{#load-more selector=".group-members tr" action=(action "loadMore")}}
-      <table class='group-members'>
+      <table class="group-members">
         <thead>
-          {{group-index-toggle order=order desc=desc field='username_lower' i18nKey='username'}}
-          {{group-index-toggle order=order desc=desc field='requested_at' i18nKey='groups.member_requested'}}
+          {{group-index-toggle order=order desc=desc field="username_lower" i18nKey="username"}}
+          {{group-index-toggle order=order desc=desc field="requested_at" i18nKey="groups.member_requested"}}
           <th>{{i18n "groups.requests.reason"}}</th>
           <th></th>
           <th></th>
@@ -22,7 +22,7 @@
         <tbody>
           {{#each model.requesters as |m|}}
             <tr>
-              <td class='avatar'>
+              <td class="avatar">
                 {{user-info user=m skipName=skipName}}
               </td>
               <td>
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 4cb1033389..0a53f7f1c0 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -1,10 +1,10 @@
 {{plugin-outlet name="before-group-container" args=(hash group=model)}}
 
 <div class="container group {{model.name}}">
-  <div class='group-details-container'>
-    <div class='group-info'>
+  <div class="group-details-container">
+    <div class="group-info">
       {{#if model.flair_url}}
-        <span class='group-avatar-flair'>
+        <span class="group-avatar-flair">
           {{avatar-flair
             flairURL=model.flair_url
             flairBgColor=model.flair_bg_color
@@ -14,10 +14,10 @@
       {{/if}}
 
       <span>
-        <span class='group-info-name'>{{groupName}}</span>
+        <span class="group-info-name">{{groupName}}</span>
 
         <div>
-          {{#if model.full_name}}<span class='group-info-full-name'>{{model.name}}</span>{{/if}}
+          {{#if model.full_name}}<span class="group-info-full-name">{{model.name}}</span>{{/if}}
         </div>
       </span>
     </div>
@@ -25,7 +25,7 @@
     {{#if model.bio_cooked}}
       <hr>
 
-      <div class='group-bio'>
+      <div class="group-bio">
         <p>{{html-safe model.bio_cooked}}</p>
       </div>
     {{/if}}
@@ -48,7 +48,7 @@
         {{d-button action=(action "destroy")
             disabled=destroying
             icon="trash-alt"
-            class='btn-danger'
+            class="btn-danger"
             label="admin.groups.delete"}}
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/group/activity.hbs b/app/assets/javascripts/discourse/templates/group/activity.hbs
index 5d94db7b56..c8f26f44af 100644
--- a/app/assets/javascripts/discourse/templates/group/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/group/activity.hbs
@@ -1,5 +1,5 @@
 <section class="user-secondary-navigation">
-  {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=router._router.currentPath}}
+  {{#mobile-nav class="activity-nav" desktopClass="action-list activity-list nav-stacked" currentPath=router._router.currentPath}}
     {{#if model.can_see_members}}
       {{group-activity-filter filter="posts" categoryId=category_id}}
       {{group-activity-filter filter="topics" categoryId=category_id}}
@@ -7,7 +7,7 @@
     {{#if siteSettings.enable_mentions}}
       {{group-activity-filter filter="mentions" categoryId=category_id}}
     {{/if}}
-    {{plugin-outlet name="group-activity-bottom" tagName='' connectorTagName='li'}}
+    {{plugin-outlet name="group-activity-bottom" tagName="" connectorTagName="li"}}
   {{/mobile-nav}}
 </section>
 <section class="user-content">
diff --git a/app/assets/javascripts/discourse/templates/group/manage.hbs b/app/assets/javascripts/discourse/templates/group/manage.hbs
index 459cdd7a18..de09c82655 100644
--- a/app/assets/javascripts/discourse/templates/group/manage.hbs
+++ b/app/assets/javascripts/discourse/templates/group/manage.hbs
@@ -1,5 +1,5 @@
-<section class='user-secondary-navigation'>
-  {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=router._router.currentPath}}
+<section class="user-secondary-navigation">
+  {{#mobile-nav class="activity-nav" desktopClass="action-list activity-list nav-stacked" currentPath=router._router.currentPath}}
     {{#each tabs as |tab|}}
       <li>
         {{#link-to tab.route model.name}}
diff --git a/app/assets/javascripts/discourse/templates/group/manage/logs.hbs b/app/assets/javascripts/discourse/templates/group/manage/logs.hbs
index 96ee61cd8d..a124328634 100644
--- a/app/assets/javascripts/discourse/templates/group/manage/logs.hbs
+++ b/app/assets/javascripts/discourse/templates/group/manage/logs.hbs
@@ -9,11 +9,11 @@
   {{#load-more selector=".group-manage-logs .group-manage-logs-row" action=(action "loadMore")}}
     <table class="group-manage-logs">
       <thead>
-        <th>{{i18n 'groups.manage.logs.action'}}</th>
-        <th>{{i18n 'groups.manage.logs.acting_user'}}</th>
-        <th>{{i18n 'groups.manage.logs.target_user'}}</th>
-        <th>{{i18n 'groups.manage.logs.subject'}}</th>
-        <th>{{i18n 'groups.manage.logs.when'}}</th>
+        <th>{{i18n "groups.manage.logs.action"}}</th>
+        <th>{{i18n "groups.manage.logs.acting_user"}}</th>
+        <th>{{i18n "groups.manage.logs.target_user"}}</th>
+        <th>{{i18n "groups.manage.logs.subject"}}</th>
+        <th>{{i18n "groups.manage.logs.when"}}</th>
         <th></th>
       </thead>
 
diff --git a/app/assets/javascripts/discourse/templates/group/messages.hbs b/app/assets/javascripts/discourse/templates/group/messages.hbs
index f923416abb..2a05efd124 100644
--- a/app/assets/javascripts/discourse/templates/group/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/group/messages.hbs
@@ -1,13 +1,13 @@
 <section class="user-secondary-navigation">
-  {{#mobile-nav class='messages-nav' desktopClass='nav-stacked action-list' currentPath=router._router.currentPath}}
+  {{#mobile-nav class="messages-nav" desktopClass="nav-stacked action-list" currentPath=router._router.currentPath}}
     <li>
-      {{#link-to 'group.messages.inbox' model.name}}
-        {{i18n 'user.messages.inbox'}}
+      {{#link-to "group.messages.inbox" model.name}}
+        {{i18n "user.messages.inbox"}}
       {{/link-to}}
     </li>
     <li>
-      {{#link-to 'group.messages.archive' model.name}}
-        {{i18n 'user.messages.archive'}}
+      {{#link-to "group.messages.archive" model.name}}
+        {{i18n "user.messages.archive"}}
       {{/link-to}}
     </li>
   {{/mobile-nav}}
diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/templates/groups/index.hbs
index a3f46e47db..d1e4330e3f 100644
--- a/app/assets/javascripts/discourse/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/index.hbs
@@ -33,14 +33,14 @@
   {{#if groups}}
     {{#conditional-loading-spinner condition=isLoading}}
       {{#load-more selector=".groups-boxes .group-box" action=(action "loadMore")}}
-        <div class='container'>
+        <div class="container">
           <div class="groups-boxes">
             {{#each groups as |group|}}
               {{#link-to "group.members" group.name class="group-box"}}
                 <div class="group-box-inner">
                   <div class="group-info-wrapper">
                     {{#if group.flair_url}}
-                      <span class='group-avatar-flair'>
+                      <span class="group-avatar-flair">
                         {{avatar-flair
                           flairURL=group.flair_url
                           flairBgColor=group.flair_bg_color
@@ -59,7 +59,7 @@
                   <div class="group-description">{{html-safe group.bio_excerpt}}</div>
 
                   <div class="group-membership">
-                    {{#group-membership-button tagName='' model=group showLogin=(route-action "showLogin")}}
+                    {{#group-membership-button tagName="" model=group showLogin=(route-action "showLogin")}}
                       {{#if group.is_group_owner}}
                         <span class="is-group-owner">
                           {{d-icon "shield-alt"}}
@@ -71,16 +71,16 @@
                           {{i18n "groups.index.is_group_user"}}
                         </span>
                       {{else if group.public_admission}}
-                        {{i18n 'groups.index.public'}}
+                        {{i18n "groups.index.public"}}
                       {{else if group.isPrivate}}
                         {{d-icon "far-eye-slash"}}
-                        {{i18n 'groups.index.private'}}
+                        {{i18n "groups.index.private"}}
                       {{else}}
                         {{#if group.automatic}}
-                          {{i18n 'groups.index.automatic'}}
+                          {{i18n "groups.index.automatic"}}
                         {{else}}
                           {{d-icon "ban"}}
-                          {{i18n 'groups.index.closed'}}
+                          {{i18n "groups.index.closed"}}
                         {{/if}}
                       {{/if}}
                     {{/group-membership-button}}
diff --git a/app/assets/javascripts/discourse/templates/groups/new.hbs b/app/assets/javascripts/discourse/templates/groups/new.hbs
index b472353ee5..0a923cf3aa 100644
--- a/app/assets/javascripts/discourse/templates/groups/new.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/new.hbs
@@ -6,7 +6,7 @@
   <form class="groups-form form-vertical">
     {{#groups-form-profile-fields model=model disableSave=saving}}
       <div class="control-group">
-        <label class="control-label" for="owner-selector">{{i18n 'admin.groups.add_owners'}}</label>
+        <label class="control-label" for="owner-selector">{{i18n "admin.groups.add_owners"}}</label>
 
         {{user-selector usernames=model.ownerUsernames
             class="input-xxlarge"
@@ -15,7 +15,7 @@
       </div>
 
       <div class="control-group">
-        <label class="control-label" for="member-selector">{{i18n 'groups.members.title'}}</label>
+        <label class="control-label" for="member-selector">{{i18n "groups.members.title"}}</label>
 
         {{user-selector usernames=model.usernames
             class="input-xxlarge"
@@ -27,16 +27,16 @@
     {{groups-form-membership-fields model=model}}
     {{groups-form-interaction-fields model=model}}
 
-    <div class='control-group buttons'>
+    <div class="control-group buttons">
       {{d-button
         action=(action "save")
         type="submit"
         disabled=saving
-        class='btn btn-primary group-form-save'
+        class="btn btn-primary group-form-save"
         label="admin.groups.new.create"}}
 
       {{#link-to "groups"}}
-        {{i18n 'cancel'}}
+        {{i18n "cancel"}}
       {{/link-to}}
     </div>
   </form>
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index ce3f115efa..816303a5c7 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -9,50 +9,50 @@
     <div class="col-form">
       {{#if successMessage}}
         <br><br>
-        <div class='alert alert-info'>
+        <div class="alert alert-info">
           <p>{{html-safe successMessage}}</p>
         </div>
       {{else}}
-        <p>{{i18n 'invites.invited_by'}}</p>
+        <p>{{i18n "invites.invited_by"}}</p>
         <p>{{user-info user=invitedBy}}</p>
 
         <p>
           {{html-safe yourEmailMessage}}
           {{#if externalAuthsEnabled}}
-            {{i18n 'invites.social_login_available'}}
+            {{i18n "invites.social_login_available"}}
           {{/if}}
         </p>
 
         <form>
           <div class="input username-input">
-            <label>{{i18n 'user.username.title'}}</label>
+            <label>{{i18n "user.username.title"}}</label>
             {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="discourse"}}
             &nbsp;{{input-tip validation=usernameValidation id="username-validation"}}
-            <div class="instructions">{{i18n 'user.username.instructions'}}</div>
+            <div class="instructions">{{i18n "user.username.instructions"}}</div>
           </div>
 
           {{#if fullnameRequired}}
             <div class="input name-input">
-              <label>{{i18n 'invites.name_label'}}</label>
+              <label>{{i18n "invites.name_label"}}</label>
               {{input value=accountName id="new-account-name" name="name"}}
               <div class="instructions">{{nameInstructions}}</div>
             </div>
           {{/if}}
 
           <div class="input password-input">
-            <label>{{i18n 'invites.password_label'}}</label>
+            <label>{{i18n "invites.password_label"}}</label>
             {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
             &nbsp;{{input-tip validation=passwordValidation}}
             <div class="instructions">
-              {{passwordInstructions}} {{i18n 'invites.optional_description'}}
-              <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
-                {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}
+              {{passwordInstructions}} {{i18n "invites.optional_description"}}
+              <div class="caps-lock-warning {{unless capsLockOn "invisible"}}">
+                {{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}
               </div>
             </div>
           </div>
 
           {{#if userFields}}
-            <div class='user-fields'>
+            <div class="user-fields">
               {{#each userFields as |f|}}
                 {{user-field field=f.field value=f.value}}
               {{/each}}
@@ -69,7 +69,7 @@
 
           {{#if errorMessage}}
             <br><br>
-            <div class='alert alert-error'>{{errorMessage}}</div>
+            <div class="alert alert-error">{{errorMessage}}</div>
           {{/if}}
         </form>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/login-preferences.hbs b/app/assets/javascripts/discourse/templates/login-preferences.hbs
index 24b7dce52f..4fb2bfe4b4 100644
--- a/app/assets/javascripts/discourse/templates/login-preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/login-preferences.hbs
@@ -1,7 +1,7 @@
-<div class='container'>
+<div class="container">
   <h2>{{i18n "login.to_continue"}}</h2>
 
-  <p style='margin-top: 1em'>{{i18n "login.preferences"}}</p>
+  <p style="margin-top: 1em">{{i18n "login.preferences"}}</p>
 
   {{d-button class="btn-primary" action=(route-action "showLogin") label="log_in"}}
   {{#unless siteSettings.enable_sso}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index f9fa81455a..9a3961ad71 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -1,7 +1,7 @@
 {{#conditional-loading-spinner condition=loading}}
   {{#if hasIncoming}}
     <div class="show-mores">
-      <a href class='alert alert-info clickable' {{action showInserted}}>
+      <a href {{action showInserted}} class="alert alert-info clickable">
         {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
       </a>
     </div>
@@ -11,9 +11,9 @@
     <table class="topic-list">
       <tbody>
         {{#each topics as |t|}}
-          <tr class="topic-list-item {{if t.archived 'archived'}} {{if t.visited 'visited'}}" data-topic-id={{t.id}}>
+          <tr class="topic-list-item {{if t.archived "archived"}} {{if t.visited "visited"}}" data-topic-id={{t.id}}>
             <td>
-              <div class='main-link'>
+              <div class="main-link">
                 {{topic-status topic=t}}
                 {{topic-link t}}
                 {{raw "list/unread-indicator"
@@ -29,29 +29,29 @@
                     {{html-safe t.excerpt}}
                     {{#if t.excerptTruncated}}
                       {{#unless t.canClearPin}}
-                        <a href={{t.url}}>{{i18n 'read_more'}}</a>
+                        <a href={{t.url}}>{{i18n "read_more"}}</a>
                       {{/unless}}
                     {{/if}}
                     {{#if t.canClearPin}}
-                      <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>
-                        {{i18n 'topic.clear_pin.title'}}
+                      <a href {{action "clearPin" t}} title={{i18n "topic.clear_pin.help"}}>
+                        {{i18n "topic.clear_pin.title"}}
                       </a>
                     {{/if}}
                   </div>
                 {{/if}}
               </div>
-              <div class='pull-right'>
+              <div class="pull-right">
                 {{raw "list/post-count-or-badges" topic=t postBadgesEnabled="true"}}
               </div>
-              <div class='clearfix'></div>
+              <div class="clearfix"></div>
               <div class="topic-item-stats clearfix">
                 {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
                 <div class="pull-right">
                   {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
-                  <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
+                  <a href={{t.lastPostUrl}} title="{{i18n "last_post"}}: {{raw-date t.bumped_at}}">{{t.last_poster_username}}</a>
                 </div>
                 {{#unless hideCategory}}
-                  <div class='category'>
+                  <div class="category">
                     {{category-link t.category}}
                   </div>
                 {{/unless}}
@@ -63,8 +63,8 @@
       </tbody>
     </table>
   {{else}}
-    <div class='alert alert-info'>
-      {{i18n 'choose_topic.none_found'}}
+    <div class="alert alert-info">
+      {{i18n "choose_topic.none_found"}}
     </div>
   {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index 148c009254..04cf4d8578 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -1,8 +1,8 @@
 {{#if categories}}
-  <div class="category-list {{if showTopics 'with-topics'}}">
+  <div class="category-list {{if showTopics "with-topics"}}">
     {{#each categories as |c|}}
-      <div data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} class='category-list-item category {{if c.isMuted "muted"}}' style={{border-color c.color}}>
-        <table class='topic-list'>
+      <div data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} style={{border-color c.color}} class="category-list-item category {{if c.isMuted "muted"}}">
+        <table class="topic-list">
           <tbody>
             <tr>
               <th class="main-link">
@@ -24,12 +24,12 @@
               {{/if}}
               {{#if c.isGrandParent}}
                 {{#each c.subcategories as |subcategory|}}
-                  <tr data-category-id={{c.id}} class='subcategory-list-item category' style={{border-color subcategory.color}}>
+                  <tr data-category-id={{c.id}} style={{border-color subcategory.color}} class="subcategory-list-item category">
                     <td>
                       {{category-title-link tagName="h4" category=subcategory}}
                       <div class="subcategories-list">
                         {{#if subcategory.subcategories}}
-                          <div class='subcategories'>
+                          <div class="subcategories">
                             {{#each subcategory.subcategories as |subsubcategory|}}
                               {{#unless subsubcategory.isMuted}}
                                 {{category-link subsubcategory}}
@@ -44,7 +44,7 @@
               {{else if c.subcategories}}
                 <tr class="subcategories-list">
                   <td>
-                    <div class='subcategories'>
+                    <div class="subcategories">
                       {{#each c.subcategories as |subcategory|}}
                         {{#unless subcategory.isMuted}}
                           {{category-link subcategory}}
@@ -58,20 +58,20 @@
           </tbody>
         </table>
         <footer class="clearfix">
-          <figure title={{i18n 'all_time_desc'}}>
+          <figure title={{i18n "all_time_desc"}}>
             {{number c.topics_all_time}}
-            <figcaption>{{i18n 'all_time'}}</figcaption>
+            <figcaption>{{i18n "all_time"}}</figcaption>
           </figure>
           {{#if c.pickMonth}}
-            <figure title={{i18n 'month_desc'}}>
+            <figure title={{i18n "month_desc"}}>
               {{number c.topics_month}}
-              <figcaption>/ {{i18n 'month'}}</figcaption>
+              <figcaption>/ {{i18n "month"}}</figcaption>
             </figure>
           {{/if}}
           {{#if c.pickWeek}}
-            <figure title={{i18n 'week_desc'}}>
+            <figure title={{i18n "week_desc"}}>
               {{number c.topics_week}}
-              <figcaption>/ {{i18n 'week'}}</figcaption>
+              <figcaption>/ {{i18n "week"}}</figcaption>
             </figure>
           {{/if}}
         </footer>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
index c657025ee4..be9b156b45 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
@@ -1,11 +1,11 @@
 {{#if selectedHtml}}
   <li>
-    <a href class='expander' {{action 'toggleExpanded'}}>
+    <a href {{action "toggleExpanded"}} class="expander">
       <span>{{html-safe selectedHtml}}</span>
       {{d-icon "caret-down"}}
     </a>
   </li>
 {{/if}}
-<ul class='drop {{if expanded 'expanded'}}'>
+<ul class="drop {{if expanded "expanded"}}">
   {{yield}}
 </ul>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
index dc7b593da3..d0610da670 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
@@ -1,11 +1,11 @@
-<li class='navigation-toggle'>
-  <a href {{action "toggleDrop"}} class='toggle-link'>
+<li class="navigation-toggle">
+  <a href {{action "toggleDrop"}} class="toggle-link">
     {{selectedNavItem.displayName}}
     {{d-icon "caret-down"}}
   </a>
 </li>
 {{#if expanded}}
-  <ul class='drop'>
+  <ul class="drop">
     {{#each navItems as |navItem|}}
       {{navigation-item content=navItem filterMode=filterMode category=category}}
     {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
index 394aea6d86..d9b2df6cd0 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
@@ -1,11 +1,11 @@
 {{#discovery-topics-list model=model refresh=(action "refresh") incomingCount=topicTrackingState.incomingCount as |discoveryTopicList|}}
   {{#if top}}
-    <div class='top-lists'>
+    <div class="top-lists">
       {{period-chooser period=period action=(action "changePeriod") fullDay=false}}
     </div>
   {{else}}
     {{#if topicTrackingState.hasIncoming}}
-      <a href class='alert alert-info clickable' {{action "showInserted"}}>
+      <a href {{action "showInserted"}} class="alert alert-info clickable">
         {{count-i18n key="topic_count_" suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
       </a>
     {{/if}}
@@ -27,7 +27,7 @@
   {{/if}}
 {{/discovery-topics-list}}
 
-<footer class='topic-list-bottom'>
+<footer class="topic-list-bottom">
   {{conditional-loading-spinner condition=model.loadingMore}}
   {{#if allLoaded}}
     {{#if showDismissRead}}
@@ -49,12 +49,12 @@
 
     {{#footer-message education=footerEducation message=footerMessage}}
       {{#if latest}}
-        {{#if canCreateTopicOnCategory}}<a href {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>{{/if}}
+        {{#if canCreateTopicOnCategory}}<a href {{action "createTopic"}}>{{i18n "topic.suggest_create_topic"}}</a>{{/if}}
       {{else if top}}
-        {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}
+        {{#link-to "discovery.categories"}}{{i18n "topic.browse_all_categories"}}{{/link-to}}, {{#link-to "discovery.latest"}}{{i18n "topic.view_latest_topics"}}{{/link-to}} {{i18n "or"}} {{i18n "filters.top.other_periods"}}
         {{top-period-buttons period=period action=(action "changePeriod")}}
       {{else}}
-        {{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}
+        {{#link-to "discovery.categories"}} {{i18n "topic.browse_all_categories"}}{{/link-to}} {{i18n "or"}} {{#link-to "discovery.latest"}}{{i18n "topic.view_latest_topics"}}{{/link-to}}
       {{/if}}
     {{/footer-message}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
index 514416915b..d8be898136 100644
--- a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
@@ -10,13 +10,13 @@
     {{/if}}
 
     {{#if canLoginLocal}}
-      <form id='login-form' method='post'>
+      <form id="login-form" method="post">
         <div id="credentials" class={{credentialsClass}}>
           <table>
             <tbody>
               <tr>
                 <td>
-                  <label for='login-account-name'>{{i18n 'login.username'}}</label>
+                  <label for="login-account-name">{{i18n "login.username"}}</label>
                 </td>
                 <td>
                   {{text-field value=loginName type="email" placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" disabled=showSecondFactor}}
@@ -24,7 +24,7 @@
               </tr>
               <tr>
                 <td>
-                  <label for='login-account-password'>{{i18n 'login.password'}}</label>
+                  <label for="login-account-password">{{i18n "login.password"}}</label>
                 </td>
                 <td>
                   {{text-field value=loginPassword type="password" id="login-account-password" maxlength="200" disabled=showSecondFactor}}
@@ -33,7 +33,7 @@
               <tr>
                 <td></td>
                 <td>
-                  <a href id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n 'forgot_password.action'}}</a>
+                  <a href id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n "forgot_password.action"}}</a>
                 </td>
               </tr>
             </tbody>
@@ -56,7 +56,7 @@
               action=(action "authenticateSecurityKey")}}
             {{/security-key-form}}
           {{else}}
-            {{second-factor-input value=secondFactorToken inputId='login-second-factor' secondFactorMethod=secondFactorMethod backupEnabled=backupEnabled}}
+            {{second-factor-input value=secondFactorToken inputId="login-second-factor" secondFactorMethod=secondFactorMethod backupEnabled=backupEnabled}}
           {{/if}}
         {{/second-factor-form}}
       </form>
@@ -84,5 +84,5 @@
 
   {{plugin-outlet name="login-after-modal-footer" tagName=""}}
 
-  <div id='login-alert' class={{alertClass}}>{{alert}}</div>
+  <div class={{alertClass}} id="login-alert">{{alert}}</div>
 {{/login-modal}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/users.hbs b/app/assets/javascripts/discourse/templates/mobile/users.hbs
index a24f118619..e7f3884e52 100644
--- a/app/assets/javascripts/discourse/templates/mobile/users.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/users.hbs
@@ -1,12 +1,12 @@
 {{#load-more selector=".directory .user" action=(action "loadMore")}}
   <div class="container">
-    <div class='users-directory directory'>
-      {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
+    <div class="users-directory directory">
+      {{plugin-outlet name="users-top" connectorTagName="div" args=(hash model=model)}}
 
-      <div class='directory-controls'>
+      <div class="directory-controls">
         {{period-chooser period=period onChange=(action (mut period)) fullDay=false}}
         {{#if lastUpdatedAt}}
-          <div class='directory-last-updated'>
+          <div class="directory-last-updated">
             {{i18n "directory.last_updated"}}
             {{lastUpdatedAt}}
           </div>
@@ -16,14 +16,14 @@
 
       {{#conditional-loading-spinner condition=model.loading}}
         {{#if model.length}}
-          <div class='total-rows'>{{i18n "directory.total_rows" count=model.totalRows}}</div>
+          <div class="total-rows">{{i18n "directory.total_rows" count=model.totalRows}}</div>
           {{#each model as |item|}}
             {{directory-item tagName="div" class="user" item=item showTimeRead=showTimeRead}}
           {{/each}}
 
           {{conditional-loading-spinner condition=model.loadingMore}}
         {{else}}
-          <div class='clearfix'></div>
+          <div class="clearfix"></div>
           <p>{{i18n "directory.no_results"}}</p>
         {{/if}}
       {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
index 8780608607..6928158040 100644
--- a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{html-safe (i18n 'login.sent_activation_email_again' currentEmail=currentEmail)}}
+  {{html-safe (i18n "login.sent_activation_email_again" currentEmail=currentEmail)}}
 {{/d-modal-body}}
 
 {{modal-footer-close closeModal=(route-action "closeModal")}}
diff --git a/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs b/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs
index ae5a9419f4..3d8b26af63 100644
--- a/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs
@@ -5,7 +5,7 @@
     )
 }}
   {{#if model.error}}
-    <div class='alert alert-error'>
+    <div class="alert alert-error">
       {{model.error}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
index add7e7ce5a..11d8da0bf6 100644
--- a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
@@ -1,11 +1,11 @@
 {{#d-modal-body title="user.auth_tokens.was_this_you"}}
   <div>
-    <p>{{i18n 'user.auth_tokens.was_this_you_description'}}</p>
-    <p>{{html-safe (i18n 'user.second_factor.extended_description')}}</p>
+    <p>{{i18n "user.auth_tokens.was_this_you_description"}}</p>
+    <p>{{html-safe (i18n "user.second_factor.extended_description")}}</p>
   </div>
 
   <div>
-    <h3>{{i18n 'user.auth_tokens.details'}}</h3>
+    <h3>{{i18n "user.auth_tokens.details"}}</h3>
     <ul style="list-style-type:none">
       <li>{{d-icon "far-clock"}} {{format-date model.seen_at}}</li>
       <li>{{d-icon "map-marker-alt"}} {{model.location}}</li>
@@ -16,7 +16,7 @@
   {{#if latest_post}}
     <div>
       <h3>
-        {{i18n 'user.auth_tokens.latest_post'}}
+        {{i18n "user.auth_tokens.latest_post"}}
         <a href {{action "toggleExpanded"}}>{{d-icon (if expanded "caret-up" "caret-down")}}</a>
       </h3>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
index edc2c4a4d8..67429842ef 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
@@ -10,11 +10,11 @@
   {{else}}
     <div class="avatar-choice">
       {{radio-button id="system-avatar" name="avatar" value="system" selection=selected}}
-      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{html-safe (i18n 'user.change_avatar.letter_based')}}</label>
+      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{html-safe (i18n "user.change_avatar.letter_based")}}</label>
     </div>
     <div class="avatar-choice">
       {{radio-button id="gravatar" name="avatar" value="gravatar" selection=selected}}
-      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{html-safe (i18n 'user.change_avatar.gravatar' gravatarName=gravatarName gravatarBaseUrl=gravatarBaseUrl gravatarLoginUrl=gravatarLoginUrl)}} {{user.email}}</span></label>
+      <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{html-safe (i18n "user.change_avatar.gravatar" gravatarName=gravatarName gravatarBaseUrl=gravatarBaseUrl gravatarLoginUrl=gravatarLoginUrl)}} {{user.email}}</span></label>
 
       {{d-button action=(action "refreshGravatar")
                  translatedTitle=(i18n "user.change_avatar.refresh_gravatar_title" gravatarName=gravatarName)
@@ -23,7 +23,7 @@
                  class="btn-default avatar-selector-refresh-gravatar"}}
 
       {{#if gravatarFailed}}
-        <p class="error">{{I18n 'user.change_avatar.gravatar_failed' gravatarName=gravatarName}}</p>
+        <p class="error">{{I18n "user.change_avatar.gravatar_failed" gravatarName=gravatarName}}</p>
       {{/if}}
     </div>
     {{#if allowAvatarUpload}}
@@ -32,9 +32,9 @@
         <label class="radio" for="uploaded-avatar">
           {{#if user.custom_avatar_template}}
             {{bound-avatar-template user.custom_avatar_template "large"}}
-            {{i18n 'user.change_avatar.uploaded_avatar'}}
+            {{i18n "user.change_avatar.uploaded_avatar"}}
           {{else}}
-            {{i18n 'user.change_avatar.uploaded_avatar_empty'}}
+            {{i18n "user.change_avatar.uploaded_avatar_empty"}}
           {{/if}}
         </label>
         {{avatar-uploader user_id=user.id
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 553705c7a5..51d6c2b734 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -3,7 +3,7 @@
     {{#if errorMessage}}
       <div class="control-group">
         <div class="controls">
-          <div class='alert alert-error'>{{errorMessage}}</div>
+          <div class="alert alert-error">{{errorMessage}}</div>
         </div>
       </div>
     {{/if}}
@@ -15,7 +15,7 @@
     {{#if showBookmarkReminderControls}}
       <div class="control-group">
         <label class="control-label" for="set_reminder">
-          {{i18n 'post.bookmarks.set_reminder'}}
+          {{i18n "post.bookmarks.set_reminder"}}
         </label>
 
         {{#if userHasTimezoneSet}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs
index 286b77ac36..0217263bd7 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs
@@ -1,4 +1,4 @@
-<div class='bulk-buttons'>
+<div class="bulk-buttons">
   {{#each buttons as |button|}}
     {{d-button action=(action button.action) label=button.label icon=button.icon class=button.class}}
   {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
index 0cfc45782d..26e9d7df3c 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
@@ -1,8 +1,8 @@
 {{#each notificationLevels as |level|}}
-  <div class='controls'>
-    <label class='radio'>
+  <div class="controls">
+    <label class="radio">
       {{radio-button value=level.id name="notification_level" selection=notificationLevelId}} <strong>{{level.name}}</strong>
-      <div class='description'>{{html-safe level.description}}</div>
+      <div class="description">{{html-safe level.description}}</div>
     </label>
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index 13ee97c97b..0e06efcf1b 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -1,6 +1,6 @@
-{{#d-modal-body class='change-ownership'}}
+{{#d-modal-body class="change-ownership"}}
   <span>
-    {{html-safe (i18n (if selectedPostsUsername 'topic.change_owner.instructions' 'topic.change_owner.instructions_without_old_user')
+    {{html-safe (i18n (if selectedPostsUsername "topic.change_owner.instructions" "topic.change_owner.instructions_without_old_user")
         count=selectedPostsCount
         old_user=selectedPostsUsername
       )
diff --git a/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs b/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs
index 242f01bf78..268a446501 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs
@@ -1,10 +1,10 @@
 {{#d-modal-body class="change-timestamp"}}
   <p>
-    {{i18n 'topic.change_timestamp.instructions'}}
+    {{i18n "topic.change_timestamp.instructions"}}
   </p>
 
-  <p class="alert alert-error {{unless validTimestamp 'hidden'}}">
-    {{i18n 'topic.change_timestamp.invalid_timestamp'}}
+  <p class="alert alert-error {{unless validTimestamp "hidden"}}">
+    {{i18n "topic.change_timestamp.invalid_timestamp"}}
   </p>
 
   <form>
diff --git a/app/assets/javascripts/discourse/templates/modal/convert-to-public-topic.hbs b/app/assets/javascripts/discourse/templates/modal/convert-to-public-topic.hbs
index 66d01ec2b4..314a5478f5 100644
--- a/app/assets/javascripts/discourse/templates/modal/convert-to-public-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/convert-to-public-topic.hbs
@@ -1,6 +1,6 @@
 {{#d-modal-body title="topic.make_public.title"}}
 
-  <div class='instructions'>
+  <div class="instructions">
     {{i18n "topic.make_public.choose_category"}}
   </div>
   {{category-chooser
@@ -10,7 +10,7 @@
 
 {{/d-modal-body}}
 
-<div class='modal-footer'>
+<div class="modal-footer">
   {{d-button class="btn-primary" action=(action "makePublic") label="composer.modal_ok" disabled=saving}}
   {{d-modal-cancel close=(route-action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index c5b493a8a1..df8acfc051 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -13,7 +13,7 @@
             <table>
               <tbody>
                 <tr class="input create-account-email">
-                  <td class="label"><label for='new-account-email'>{{i18n 'user.email.title'}}</label></td>
+                  <td class="label"><label for="new-account-email">{{i18n "user.email.title"}}</label></td>
                   <td>
                     {{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated name="email" autofocus="autofocus"}}
                   </td>
@@ -22,12 +22,12 @@
                 <tr class="instructions create-account-email">
                   <td></td>
                   {{input-tip validation=emailValidation id="account-email-validation"}}
-                  <td><label>{{i18n 'user.email.instructions'}}</label></td>
+                  <td><label>{{i18n "user.email.instructions"}}</label></td>
                 </tr>
 
                 {{#if usernameRequired}}
                   <tr class="input">
-                    <td class="label"><label for='new-account-username'>{{i18n 'user.username.title'}}</label></td>
+                    <td class="label"><label for="new-account-username">{{i18n "user.username.title"}}</label></td>
                     <td>
                       {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="discourse"}}
                     </td>
@@ -35,14 +35,14 @@
                   <tr class="instructions">
                     <td></td>
                     {{input-tip validation=usernameValidation id="username-validation"}}
-                    <td><label>{{i18n 'user.username.instructions'}}</label></td>
+                    <td><label>{{i18n "user.username.instructions"}}</label></td>
                   </tr>
                 {{/if}}
 
                 {{#if fullnameRequired}}
                   <tr class="input">
                     <td class="label">
-                      <label for='new-account-name'>{{i18n 'user.name.title'}}</label>
+                      <label for="new-account-name">{{i18n "user.name.title"}}</label>
                     </td>
                     <td>
                       {{text-field value=accountName id="new-account-name"}}
@@ -69,7 +69,7 @@
 
                 {{#if passwordRequired}}
                   <tr class="input">
-                    <td class="label"><label for='new-account-password'>{{i18n 'user.password.title'}}</label></td>
+                    <td class="label"><label for="new-account-password">{{i18n "user.password.title"}}</label></td>
                     <td>
                       {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
                     </td>
@@ -79,15 +79,15 @@
                     {{input-tip validation=passwordValidation}}
                     <td>
                       <label>{{passwordInstructions}}</label>
-                      <div class="caps-lock-warning {{unless capsLockOn 'hidden'}}">
-                        {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}
+                      <div class="caps-lock-warning {{unless capsLockOn "hidden"}}">
+                        {{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}
                       </div>
                     </td>
                   </tr>
                 {{/if}}
 
                 <tr class="password-confirmation">
-                  <td><label for='new-account-password-confirmation'>{{i18n 'user.password_confirmation.title'}}</label></td>
+                  <td><label for="new-account-password-confirmation">{{i18n "user.password_confirmation.title"}}</label></td>
                   <td>
                     {{honeypot-input id="new-account-confirmation" autocomplete="new-password" value=accountHoneypot}}
                     {{input value=accountChallenge id="new-account-challenge"}}
@@ -96,11 +96,11 @@
 
                 {{#if requireInviteCode }}
                   <tr class="invite-code">
-                    <td><label for='invite-code'>{{i18n 'user.invite_code.title'}}</label></td>
+                    <td><label for="invite-code">{{i18n "user.invite_code.title"}}</label></td>
                     <td>
                       {{input value=inviteCode id="inviteCode"}}
                     </td>
-                    <td><label>{{i18n 'user.invite_code.instructions'}}</label></td>
+                    <td><label>{{i18n "user.invite_code.instructions"}}</label></td>
                   </tr>
                 {{/if}}
 
@@ -118,7 +118,7 @@
             </table>
 
             {{#if userFields}}
-              <div class='user-fields'>
+              <div class="user-fields">
                 {{#each userFields as |f|}}
                   {{user-field field=f.field value=f.value}}
                 {{/each}}
@@ -144,7 +144,7 @@
           {{/d-button}}
         {{/conditional-loading-spinner}}
 
-        <div class='disclaimer'>{{html-safe disclaimerHtml}}</div>
+        <div class="disclaimer">{{html-safe disclaimerHtml}}</div>
       </div>
 
       {{plugin-outlet name="create-account-after-modal-footer" tagName=""}}
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
index 316e51b00f..7f6634297b 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
@@ -1,13 +1,13 @@
 {{#d-modal-body title="topic.topic_status_update.title" autoFocus="false"}}
   <div class="radios">
     <label for="public-topic-timer">
-      {{radio-button id='public-topic-timer' name="topic-timer" value="true" selection=isPublic}}
-      <b>{{i18n 'topic.topic_status_update.public_timer_types'}}</b>
+      {{radio-button id="public-topic-timer" name="topic-timer" value="true" selection=isPublic}}
+      <b>{{i18n "topic.topic_status_update.public_timer_types"}}</b>
     </label>
 
     <label for="private-topic-timer">
-      {{radio-button id='private-topic-timer' name="topic-timer" value="false" selection=isPublic}}
-      <b>{{i18n 'topic.topic_status_update.private_timer_types'}}</b>
+      {{radio-button id="private-topic-timer" name="topic-timer" value="false" selection=isPublic}}
+      <b>{{i18n "topic.topic_status_update.private_timer_types"}}</b>
     </label>
   </div>
 
@@ -33,6 +33,6 @@
   {{#if topicTimer.execute_at}}
     {{d-button class="pull-right btn-danger"
         action=(action "removeTimer")
-        label='topic.topic_status_update.remove'}}
+        label="topic.topic_status_update.remove"}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/explain-reviewable.hbs b/app/assets/javascripts/discourse/templates/modal/explain-reviewable.hbs
index 2c398264d4..27ad4bf86c 100644
--- a/app/assets/javascripts/discourse/templates/modal/explain-reviewable.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/explain-reviewable.hbs
@@ -15,27 +15,27 @@
               {{score-value value=s.trust_level_bonus label="trust_level_bonus" tagName=""}}
               {{score-value value=s.user_accuracy_bonus label="user_accuracy_bonus" tagName=""}}
             </td>
-            <td class='sum'>{{float s.score}}</td>
+            <td class="sum">{{float s.score}}</td>
           </tr>
         {{/each}}
         <tr class="total">
           <td>{{i18n "review.explain.total"}}</td>
-          <td class='sum'>{{float reviewableExplanation.total_score}}</td>
+          <td class="sum">{{float reviewableExplanation.total_score}}</td>
         </tr>
       </tbody>
     </table>
 
-    <table class='thresholds'>
+    <table class="thresholds">
       <tbody>
         <tr>
           <td>{{i18n "review.explain.min_score_visibility"}}</td>
-          <td class='sum'>
+          <td class="sum">
             {{float reviewableExplanation.min_score_visibility}}
           </td>
         </tr>
         <tr>
           <td>{{i18n "review.explain.score_to_hide"}}</td>
-          <td class='sum'>
+          <td class="sum">
             {{float reviewableExplanation.hide_post_score}}
           </td>
         </tr>
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic-on-profile.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic-on-profile.hbs
index 82331a0ea3..a53e8745a5 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic-on-profile.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic-on-profile.hbs
@@ -1,4 +1,4 @@
-{{#d-modal-body class="feature-topic-on-profile" id='choosing-topic'}}
+{{#d-modal-body class="feature-topic-on-profile" id="choosing-topic"}}
   {{choose-topic currentTopicId=model.featured_topic.id
     selectedTopicId=newFeaturedTopicId
     additionalFilters="status:public"
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index 19be52ceb5..9e85097906 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
@@ -3,7 +3,7 @@
     {{#if offerHelp}}
       {{html-safe offerHelp}}
     {{else}}
-      <label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label>
+      <label for="username-or-email">{{i18n "forgot_password.invite"}}</label>
       {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
     {{/if}}
   {{/d-modal-body}}
@@ -24,7 +24,7 @@
                  label="forgot_password.reset"
                  disabled=submitDisabled
                  class="btn-primary forgot-password-reset"
-                 type='submit'}}
+                 type="submit"}}
     {{/if}}
   </div>
 </form>
diff --git a/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs b/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs
index 985c7fe1f1..4a4d464690 100644
--- a/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs
@@ -1,7 +1,7 @@
-{{#d-modal-body class='grant-badge'}}
+{{#d-modal-body class="grant-badge"}}
   {{#conditional-loading-spinner condition=loading}}
     {{#if noGrantableBadges}}
-      <p>{{i18n 'admin.badges.no_badges'}}</p>
+      <p>{{i18n "admin.badges.no_badges"}}</p>
     {{else}}
       <p>
         {{combo-box
diff --git a/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs b/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs
index 495c4a16c0..7e47e247df 100644
--- a/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs
@@ -14,7 +14,7 @@
     {{/if}}
 
     <div class="">
-      <a href {{action 'cancel'}}>{{i18n 'cancel'}}</a>
+      <a href {{action "cancel"}}>{{i18n "cancel"}}</a>
     </div>
   {{else}}
     <form class="form-vertical group-bulk-add">
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index c81dfe2238..fb41be53b0 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -2,7 +2,7 @@
   <div id="revision">
     <div id="revision-details">
       {{d-icon "pencil-alt"}}
-      {{#link-to 'user' model.username}}
+      {{#link-to "user" model.username}}
         {{bound-avatar-template model.avatar_template "small"}} {{model.username}}
       {{/link-to}}
       <span class="date">{{bound-date model.created_at}}</span>
@@ -77,7 +77,7 @@
       {{/if}}
     {{/if}}
     {{#if model.tags_changes}}
-      <div class='row'>
+      <div class="row">
         {{i18n "tagging.changed"}}
         {{#each previousTagChanges as |t|}}
           {{discourse-tag t}}
@@ -90,7 +90,7 @@
       </div>
     {{/if}}
     {{#if model.featured_link_changes}}
-      <div class='row'>
+      <div class="row">
         {{model.featured_link_changes.previous}}
         &rarr;
         {{model.featured_link_changes.current}}
@@ -109,7 +109,7 @@
     <div id="revision-controls">
       {{d-button class="btn-default" action=(action "loadFirstVersion") icon="fast-backward" title="post.revisions.controls.first" disabled=loadFirstDisabled}}
       {{d-button class="btn-default" action=(action "loadPreviousVersion") icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}}
-      <div id="revision-numbers" class={{unless displayRevisions 'invisible'}}>
+      <div id="revision-numbers" class={{unless displayRevisions "invisible"}}>
         {{#conditional-loading-spinner condition=loading size="small"}}
           {{html-safe revisionsText}}
         {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs b/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs
index 671d594032..61b764ddce 100644
--- a/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs
@@ -4,7 +4,7 @@
     <div class="jump-to-post-control">
       <span class="index">#</span>
       {{input id="post-jump" type="number" value=postNumber insert-newline=(action "jump")}}
-      <span class='input-hint-text post-number'>
+      <span class="input-hint-text post-number">
         {{i18n "topic.progress.jump_prompt_of" count=filteredPostsCount}}
       </span>
     </div>
@@ -17,7 +17,7 @@
     </div>
 
     <div class="jump-to-date-control">
-      <span class='input-hint-text post-date'>
+      <span class="input-hint-text post-date">
         {{i18n "topic.progress.jump_prompt_to_date"}}
       </span>
       {{date-picker id="post-date" class="date-input" value=postDate defaultDate="YYYY-MM-DD"}}
@@ -25,7 +25,7 @@
   </div>
 {{/d-modal-body}}
 
-<div class='modal-footer'>
+<div class="modal-footer">
   {{d-button class="btn-primary" action=(action "jump") label="composer.modal_ok"}}
   {{d-modal-cancel close=(route-action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs
index 151cc42e0a..87c5c8c6fc 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/login.hbs
@@ -3,22 +3,22 @@
   {{#d-modal-body title="login.title" class=modalBodyClasses}}
 
     {{#if canLoginLocal}}
-      <form id='login-form' method='post'>
+      <form id="login-form" method="post">
         <div id="credentials" class={{credentialsClass}}>
           <table>
             <tbody>
               <tr>
-                <td><label for='login-account-name'>{{i18n 'login.username'}}</label></td>
+                <td><label for="login-account-name">{{i18n "login.username"}}</label></td>
                 <td>{{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" autofocus="autofocus" disabled=disableLoginFields}}</td>
               </tr>
               <tr>
-                <td><label for='login-account-password'>{{i18n 'login.password'}}</label></td>
+                <td><label for="login-account-password">{{i18n "login.password"}}</label></td>
                 <td>{{password-field value=loginPassword type="password" id="login-account-password" maxlength="200" capsLockOn=capsLockOn disabled=disableLoginFields}}</td>
-                <td><a href id="forgot-password-link" {{action "forgotPassword"}}>{{i18n 'forgot_password.action'}}</a></td>
+                <td><a href id="forgot-password-link" {{action "forgotPassword"}}>{{i18n "forgot_password.action"}}</a></td>
               </tr>
               <tr>
                 <td></td>
-                <td><div class="caps-lock-warning {{unless capsLockOn 'hidden'}}">{{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div></td>
+                <td><div class="caps-lock-warning {{unless capsLockOn "hidden"}}">{{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}</div></td>
                 <td></td>
               </tr>
             </tbody>
@@ -41,7 +41,7 @@
               action=(action "authenticateSecurityKey")}}
             {{/security-key-form}}
           {{else}}
-            {{second-factor-input value=secondFactorToken inputId='login-second-factor' secondFactorMethod=secondFactorMethod backupEnabled=backupEnabled}}
+            {{second-factor-input value=secondFactorToken inputId="login-second-factor" secondFactorMethod=secondFactorMethod backupEnabled=backupEnabled}}
           {{/if}}
         {{/second-factor-form}}
       </form>
@@ -65,7 +65,7 @@
           icon="unlock"
           label=loginButtonLabel
           disabled=loginDisabled
-          class='btn btn-large btn-primary'}}
+          class="btn btn-large btn-primary"}}
       {{/unless}}
 
       {{#if showSignupLink}}
@@ -82,5 +82,5 @@
 
   {{plugin-outlet name="login-after-modal-footer" tagName=""}}
 
-  <div id='login-alert' class={{alertClass}}>{{alert}}</div>
+  <div class={{alertClass}} id="login-alert">{{alert}}</div>
 {{/login-modal}}
diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
index 6f1e802770..6386cecd2a 100644
--- a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
@@ -1,29 +1,29 @@
-{{#d-modal-body id='choosing-topic'}}
+{{#d-modal-body id="choosing-topic"}}
 
   {{#if model.isPrivateMessage}}
     <div class="radios">
       {{#if canSplitToPM}}
         <label class="radio-label" for="move-to-new-message">
-          {{radio-button id='move-to-new-message' name="move-to-entity" value="new_message" selection=selection}}
-          <b>{{i18n 'topic.move_to_new_message.radio_label'}}</b>
+          {{radio-button id="move-to-new-message" name="move-to-entity" value="new_message" selection=selection}}
+          <b>{{i18n "topic.move_to_new_message.radio_label"}}</b>
         </label>
       {{/if}}
 
       <label class="radio-label" for="move-to-existing-message">
-        {{radio-button id='move-to-existing-message' name="move-to-entity" value="existing_message" selection=selection}}
-        <b>{{i18n 'topic.move_to_existing_message.radio_label'}}</b>
+        {{radio-button id="move-to-existing-message" name="move-to-entity" value="existing_message" selection=selection}}
+        <b>{{i18n "topic.move_to_existing_message.radio_label"}}</b>
       </label>
     </div>
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{html-safe (i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount)}}</p>
+        <p>{{html-safe (i18n "topic.move_to_new_message.instructions" count=selectedPostsCount)}}</p>
         <form>
-          <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
-          {{text-field value=topicName placeholderKey="composer.title_placeholder" id='split-topic-name'}}
+          <label>{{i18n "topic.move_to_new_message.message_title"}}</label>
+          {{text-field value=topicName placeholderKey="composer.title_placeholder" id="split-topic-name"}}
 
           {{#if canTagMessages}}
-            <label>{{i18n 'tagging.tags'}}</label>
+            <label>{{i18n "tagging.tags"}}</label>
             {{tag-chooser tags=tags filterable=true}}
           {{/if}}
         </form>
@@ -31,11 +31,11 @@
     {{/if}}
 
     {{#if existingMessage}}
-      <p>{{html-safe (i18n 'topic.move_to_existing_message.instructions' count=selectedPostsCount)}}</p>
+      <p>{{html-safe (i18n "topic.move_to_existing_message.instructions" count=selectedPostsCount)}}</p>
       <form>
         {{choose-message currentTopicId=model.id selectedTopicId=selectedTopicId}}
 
-        <label>{{i18n 'topic.move_to_new_message.participants'}}</label>
+        <label>{{i18n "topic.move_to_new_message.participants"}}</label>
         {{user-selector usernames=participants class="participant-selector"}}
       </form>
     {{/if}}
@@ -45,26 +45,26 @@
     <div class="radios">
       {{#if canSplitTopic}}
         <label class="radio-label" for="move-to-new-topic">
-          {{radio-button id='move-to-new-topic' name="move-to-entity" value="new_topic" selection=selection}}
-          <b>{{i18n 'topic.split_topic.radio_label'}}</b>
+          {{radio-button id="move-to-new-topic" name="move-to-entity" value="new_topic" selection=selection}}
+          <b>{{i18n "topic.split_topic.radio_label"}}</b>
         </label>
       {{/if}}
 
       <label class="radio-label" for="move-to-existing-topic">
-        {{radio-button id='move-to-existing-topic' name="move-to-entity" value="existing_topic" selection=selection}}
-        <b>{{i18n 'topic.merge_topic.radio_label'}}</b>
+        {{radio-button id="move-to-existing-topic" name="move-to-entity" value="existing_topic" selection=selection}}
+        <b>{{i18n "topic.merge_topic.radio_label"}}</b>
       </label>
 
       {{#if canSplitToPM}}
         <label class="radio-label" for="move-to-new-message">
-          {{radio-button id='move-to-new-message' name="move-to-entity" value="new_message" selection=selection}}
-          <b>{{i18n 'topic.move_to_new_message.radio_label'}}</b>
+          {{radio-button id="move-to-new-message" name="move-to-entity" value="new_message" selection=selection}}
+          <b>{{i18n "topic.move_to_new_message.radio_label"}}</b>
         </label>
       {{/if}}
     </div>
 
     {{#if existingTopic}}
-      <p>{{html-safe (i18n 'topic.merge_topic.instructions' count=selectedPostsCount)}}</p>
+      <p>{{html-safe (i18n "topic.merge_topic.instructions" count=selectedPostsCount)}}</p>
       <form>
         {{choose-topic currentTopicId=model.id selectedTopicId=selectedTopicId}}
       </form>
@@ -72,19 +72,19 @@
 
     {{#if canSplitTopic}}
       {{#if newTopic}}
-        <p>{{html-safe (i18n 'topic.split_topic.instructions' count=selectedPostsCount)}}</p>
+        <p>{{html-safe (i18n "topic.split_topic.instructions" count=selectedPostsCount)}}</p>
         <form>
-          <label>{{i18n 'topic.split_topic.topic_name'}}</label>
-          {{text-field value=topicName placeholderKey="composer.title_placeholder" id='split-topic-name'}}
+          <label>{{i18n "topic.split_topic.topic_name"}}</label>
+          {{text-field value=topicName placeholderKey="composer.title_placeholder" id="split-topic-name"}}
 
-          <label>{{i18n 'categories.category'}}</label>
+          <label>{{i18n "categories.category"}}</label>
           {{category-chooser
             value=categoryId
             class="small"
             onChange=(action (mut categoryId))
           }}
           {{#if canAddTags}}
-            <label>{{i18n 'tagging.tags'}}</label>
+            <label>{{i18n "tagging.tags"}}</label>
             {{tag-chooser tags=tags filterable=true categoryId=categoryId}}
           {{/if}}
         </form>
@@ -93,13 +93,13 @@
 
     {{#if canSplitTopic}}
       {{#if newMessage}}
-        <p>{{html-safe (i18n 'topic.move_to_new_message.instructions' count=selectedPostsCount)}}</p>
+        <p>{{html-safe (i18n "topic.move_to_new_message.instructions" count=selectedPostsCount)}}</p>
         <form>
-          <label>{{i18n 'topic.move_to_new_message.message_title'}}</label>
-          {{text-field value=topicName placeholderKey="composer.title_placeholder" id='split-topic-name'}}
+          <label>{{i18n "topic.move_to_new_message.message_title"}}</label>
+          {{text-field value=topicName placeholderKey="composer.title_placeholder" id="split-topic-name"}}
 
           {{#if canTagMessages}}
-            <label>{{i18n 'tagging.tags'}}</label>
+            <label>{{i18n "tagging.tags"}}</label>
             {{tag-chooser tags=tags filterable=true}}
           {{/if}}
         </form>
diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
index b1ba99bdc9..16adb4032d 100644
--- a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
@@ -1,5 +1,5 @@
 {{#d-modal-body}}
-  {{html-safe (i18n 'login.not_activated' sentTo=sentTo)}}
+  {{html-safe (i18n "login.not_activated" sentTo=sentTo)}}
 {{/d-modal-body}}
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/templates/modal/publish-page.hbs b/app/assets/javascripts/discourse/templates/modal/publish-page.hbs
index 027f3ee764..a3c780ddbe 100644
--- a/app/assets/javascripts/discourse/templates/modal/publish-page.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/publish-page.hbs
@@ -14,7 +14,7 @@
         {{conditional-loading-spinner condition=checking}}
 
         {{#if existing}}
-          <div class='current-url'>
+          <div class="current-url">
             {{i18n "topic.publish_page.publish_url"}}
             <div>
               <a href={{publishedPage.url}} target="_blank" rel="noopener">{{publishedPage.url}}</a>
@@ -24,7 +24,7 @@
           {{#if showUrl}}
             <div class="valid-slug">
               {{i18n "topic.publish_page.preview_url"}}
-              <div class='example-url'>{{publishedPage.url}}</div>
+              <div class="example-url">{{publishedPage.url}}</div>
             </div>
           {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/modal/raw-email.hbs b/app/assets/javascripts/discourse/templates/modal/raw-email.hbs
index 0a3a0eda22..cce4c69cdb 100644
--- a/app/assets/javascripts/discourse/templates/modal/raw-email.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/raw-email.hbs
@@ -3,14 +3,14 @@
     {{d-button action=(action "displayRaw")
                label="post.raw_email.displays.raw.button"
                title="post.raw_email.displays.raw.title"
-               class=(if showRawEmail 'active')
+               class=(if showRawEmail "active")
     }}
 
     {{#if textPart}}
       {{d-button action=(action "displayTextPart")
                  label="post.raw_email.displays.text_part.button"
                  title="post.raw_email.displays.text_part.title"
-                 class=(if showTextPart 'active')
+                 class=(if showTextPart "active")
       }}
     {{/if}}
 
@@ -18,7 +18,7 @@
       {{d-button action=(action "displayHtmlPart")
                  label="post.raw_email.displays.html_part.button"
                  title="post.raw_email.displays.html_part.title"
-                 class=(if showHtmlPart 'active')
+                 class=(if showHtmlPart "active")
       }}
     {{/if}}
   </div>
@@ -28,7 +28,7 @@
       {{#if rawEmail}}
         {{textarea value=rawEmail}}
       {{else}}
-        {{i18n 'raw_email.not_available'}}
+        {{i18n "raw_email.not_available"}}
       {{/if}}
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
index df4dd14513..6b2a8f26ef 100644
--- a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
@@ -9,13 +9,13 @@
       {{#each categoriesOrdered as |cat|}}
         <tr data-category-id={{cat.id}}>
           <td>
-            <div class={{concat 'reorder-categories-depth-' cat.depth}}>
+            <div class={{concat "reorder-categories-depth-" cat.depth}}>
               {{category-badge cat allowUncategorized="true"}}
             </div>
           </td>
 
           <td>
-            {{number-field number=(readonly cat.position) change=(action 'change' cat)}}
+            {{number-field number=(readonly cat.position) change=(action "change" cat)}}
             {{d-button class="btn-default no-text" action=(action "moveUp") actionParam=cat icon="arrow-up"}}
             {{d-button class="btn-default no-text" action=(action "moveDown") actionParam=cat icon="arrow-down"}}
           </td>
diff --git a/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs b/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs
index b8bcae7847..4340f03ee1 100644
--- a/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs
@@ -1,4 +1,4 @@
-<form class='request-group-membership-form'>
+<form class="request-group-membership-form">
   {{#d-modal-body rawTitle=title}}
     <div class="control-group">
       <label>
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
index c97746956d..641a21e1c7 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
@@ -3,20 +3,20 @@
     {{#if errorMessage}}
       <div class="control-group">
         <div class="controls">
-          <div class='alert alert-error'>{{errorMessage}}</div>
+          <div class="alert alert-error">{{errorMessage}}</div>
         </div>
       </div>
     {{/if}}
 
     <div class="control-group">
       <div class="controls">
-        {{html-safe (i18n 'user.second_factor.enable_security_key_description')}}
+        {{html-safe (i18n "user.second_factor.enable_security_key_description")}}
       </div>
     </div>
 
     <div class="control-group">
       <div class="controls">
-        {{input value=securityKeyName id='security-key-name' placeholder='security key name'}}
+        {{input value=securityKeyName id="security-key-name" placeholder="security key name"}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
index c993a811a2..00d466e413 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
@@ -3,14 +3,14 @@
     {{#if errorMessage}}
       <div class="control-group">
         <div class="controls">
-          <div class='alert alert-error'>{{errorMessage}}</div>
+          <div class="alert alert-error">{{errorMessage}}</div>
         </div>
       </div>
     {{/if}}
 
     <div class="control-group">
       <div class="controls">
-        {{html-safe (i18n 'user.second_factor.enable_description')}}
+        {{html-safe (i18n "user.second_factor.enable_description")}}
       </div>
     </div>
 
@@ -26,21 +26,21 @@
           {{#if showSecondFactorKey}}
             {{secondFactorKey}}
           {{else}}
-            <a href {{action "showSecondFactorKey"}}>{{i18n 'user.second_factor.show_key_description'}}</a>
+            <a href {{action "showSecondFactorKey"}}>{{i18n "user.second_factor.show_key_description"}}</a>
           {{/if}}
         </p>
       </div>
     </div>
 
     <div class="control-group">
-      <label class="control-label input-prepend">{{i18n 'user.second_factor.name'}}</label>
+      <label class="control-label input-prepend">{{i18n "user.second_factor.name"}}</label>
       <div class="controls">
-        {{second-factor-input value=secondFactorName inputId='second-factor-name' placeholder=(i18n 'user.second_factor.totp.default_name')}}
+        {{second-factor-input value=secondFactorName inputId="second-factor-name" placeholder=(i18n "user.second_factor.totp.default_name")}}
       </div>
 
-      <label class="control-label input-prepend">{{i18n 'user.second_factor.label'}}</label>
+      <label class="control-label input-prepend">{{i18n "user.second_factor.label"}}</label>
       <div class="controls">
-        {{second-factor-input maxlength=6 value=secondFactorToken inputId='second-factor-token' placeholder='123456'}}
+        {{second-factor-input maxlength=6 value=secondFactorToken inputId="second-factor-token" placeholder="123456"}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs
index b7e9bb651d..bd0d5a2636 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs
@@ -2,8 +2,8 @@
   <div class="form-horizontal">
     {{input type="text" value=model.name}}
   </div>
-  <div class='second-factor instructions'>
-    {{i18n 'user.second_factor.security_key.edit_description'}}
+  <div class="second-factor instructions">
+    {{i18n "user.second_factor.security_key.edit_description"}}
   </div>
   {{d-button
     action=(action "editSecurityKey")
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs
index 4155ce69f6..2a77fceab6 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs
@@ -2,8 +2,8 @@
   <div class="form-horizontal">
     {{input type="text" value=model.name}}
   </div>
-  <div class='second-factor instructions'>
-    {{i18n 'user.second_factor.edit_description'}}
+  <div class="second-factor instructions">
+    {{i18n "user.second_factor.edit_description"}}
   </div>
   {{d-button
     action=(action "editSecondFactor")
diff --git a/app/assets/javascripts/discourse/templates/modal/tag-upload.hbs b/app/assets/javascripts/discourse/templates/modal/tag-upload.hbs
index b33a394d20..05dc32b6fd 100644
--- a/app/assets/javascripts/discourse/templates/modal/tag-upload.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/tag-upload.hbs
@@ -1,3 +1,3 @@
-{{#d-modal-body title='tagging.upload'}}
+{{#d-modal-body title="tagging.upload"}}
   {{tags-uploader refresh=(route-action "refresh") closeModal=(route-action "closeModal")}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
index b9eb57fe8c..f973233739 100644
--- a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
@@ -1,4 +1,4 @@
 {{#d-modal-body}}
-  <p>{{html-safe (i18n 'topics.bulk.selected' count=model.topics.length)}}</p>
+  <p>{{html-safe (i18n "topics.bulk.selected" count=model.topics.length)}}</p>
   {{outlet "bulkOutlet"}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs b/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs
index 1822acf063..44c65cef85 100644
--- a/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body title=title class="upload-selector"}}
   <div class="radios">
     {{radio-button name="upload" id="local" value="local" selection=selection}}
-    <label class="radio" for="local">{{i18n 'upload_selector.from_my_computer'}}</label>
+    <label class="radio" for="local">{{i18n "upload_selector.from_my_computer"}}</label>
     {{#if local}}
       <div class="inputs">
         <input type="file" id="filename-input" multiple><br>
@@ -11,7 +11,7 @@
   </div>
   <div class="radios">
     {{radio-button name="upload" id="remote" value="remote" selection=selection}}
-    <label class="radio" for="remote">{{i18n 'upload_selector.from_the_web'}}</label>
+    <label class="radio" for="remote">{{i18n "upload_selector.from_the_web"}}</label>
     {{#if remote}}
       <div class="inputs">
         {{input value=imageUrl placeholder="http://example.com/image.png"}}
@@ -23,9 +23,9 @@
     <div class="inputs">
       <p class="hint">
         {{#if capabilities.canPasteImages}}
-          {{i18n 'upload_selector.hint'}}
+          {{i18n "upload_selector.hint"}}
         {{else}}
-          {{i18n 'upload_selector.hint_for_supported_browsers'}}
+          {{i18n "upload_selector.hint_for_supported_browsers"}}
         {{/if}}
       </p>
     </div>
@@ -33,6 +33,6 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button action=(action "upload") class='btn-primary' icon=uploadIcon label='upload'}}
+  {{d-button action=(action "upload") class="btn-primary" icon=uploadIcon label="upload"}}
   {{d-modal-cancel close=(route-action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index 6d44492afe..9ac32133da 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -1,7 +1,7 @@
 {{#d-section class="navigation-container"}}
   {{add-category-tag-classes category=category}}
 
-  <section class='category-heading'>
+  <section class="category-heading">
     {{#if category.uploaded_logo.url}}
       {{cdn-img
         src=category.uploaded_logo.url
@@ -14,7 +14,7 @@
     {{/if}}
   </section>
 
-  <div class='category-navigation'>
+  <div class="category-navigation">
     {{d-navigation
       category=category
       filterMode=filterMode
diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/templates/password-reset.hbs
index 0d3e5b8818..282526bc02 100644
--- a/app/assets/javascripts/discourse/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/templates/password-reset.hbs
@@ -8,7 +8,7 @@
       <p>{{successMessage}}</p>
 
       {{#if requiresApproval}}
-        <p>{{i18n 'login.not_approved'}}</p>
+        <p>{{i18n "login.not_approved"}}</p>
       {{else}}
         {{#unless redirected}}
           <a class="btn" href={{redirectHref}} {{action "done"}}>{{continueButtonText}}</a>
@@ -18,7 +18,7 @@
       <form>
         {{#if securityKeyOrSecondFactorRequired }}
           {{#if errorMessage}}
-            <div class='alert alert-error'>{{errorMessage}}</div>
+            <div class="alert alert-error">{{errorMessage}}</div>
             <br>
           {{/if}}
           {{#if securityKeyRequired }}
@@ -37,14 +37,14 @@
               secondFactorToken=secondFactorToken
               backupEnabled=backupEnabled
               isLogin=false}}
-              {{second-factor-input value=secondFactorToken inputId='second-factor' secondFactorMethod=secondFactorMethod backupEnabled=backupEnabled}}
+              {{second-factor-input value=secondFactorToken inputId="second-factor" secondFactorMethod=secondFactorMethod backupEnabled=backupEnabled}}
             {{/second-factor-form}}
           {{/if}}
           {{#unless securityKeyRequired }}
-            {{d-button action=(action "submit") class='btn-primary' label='submit' type='submit'}}
+            {{d-button action=(action "submit") class="btn-primary" label="submit" type="submit"}}
           {{/unless}}
         {{else}}
-          <h2>{{i18n 'user.change_password.choose'}}</h2>
+          <h2>{{i18n "user.change_password.choose"}}</h2>
 
           <div class="input">
             {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn autofocus="autofocus"}}
@@ -52,12 +52,12 @@
           </div>
 
           <div class="instructions">
-            <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
-              {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}
+            <div class="caps-lock-warning {{unless capsLockOn "invisible"}}">
+              {{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}
             </div>
           </div>
 
-          {{d-button action=(action "submit") class='btn-primary' label='user.change_password.set_password' type='submit'}}
+          {{d-button action=(action "submit") class="btn-primary" label="user.change_password.set_password" type="submit"}}
         {{/if}}
       </form>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences-email.hbs b/app/assets/javascripts/discourse/templates/preferences-email.hbs
index d335e0fafb..1c561e265f 100644
--- a/app/assets/javascripts/discourse/templates/preferences-email.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-email.hbs
@@ -1,9 +1,9 @@
-<section class='user-preferences solo-preference'>
+<section class="user-preferences solo-preference">
   <form class="form-horizontal">
 
     <div class="control-group">
       <div class="controls">
-        <h3>{{i18n 'user.change_email.title'}}</h3>
+        <h3>{{i18n "user.change_email.title"}}</h3>
       </div>
     </div>
 
@@ -13,9 +13,9 @@
           <div class="instructions">
             <p>
               {{#if model.staff}}
-                {{i18n 'user.change_email.success_staff'}}
+                {{i18n "user.change_email.success_staff"}}
               {{else}}
-                {{i18n 'user.change_email.success'}}
+                {{i18n "user.change_email.success"}}
               {{/if}}
             </p>
           </div>
@@ -25,23 +25,23 @@
       {{#if error}}
         <div class="control-group">
           <div class="controls">
-            <div class='alert alert-error'>{{errorMessage}}</div>
+            <div class="alert alert-error">{{errorMessage}}</div>
           </div>
         </div>
       {{/if}}
 
       <div class="control-group">
-        <label class="control-label">{{i18n 'user.email.title'}}</label>
+        <label class="control-label">{{i18n "user.email.title"}}</label>
         <div class="controls">
           {{text-field value=newEmail id="change-email" classNames="input-xxlarge" autofocus="autofocus"}}
           {{input-tip validation=emailValidation}}
         </div>
         <div class="controls">
-          <div class='instructions'>
+          <div class="instructions">
             {{#if taken}}
-              {{i18n 'user.change_email.taken'}}
+              {{i18n "user.change_email.taken"}}
             {{else}}
-              {{i18n 'user.email.instructions'}}
+              {{i18n "user.email.instructions"}}
             {{/if}}
           </div>
         </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index 0d3d8f48c8..d8b8d95ac0 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -1,10 +1,10 @@
-<section class='user-preferences solo-preference second-factor'>
+<section class="user-preferences solo-preference second-factor">
   {{#conditional-loading-spinner condition=loading}}
     <form class="form-horizontal">
       {{#if showEnforcedNotice}}
         <div class="control-group">
           <div class="controls">
-            <div class='alert alert-error'>{{i18n 'user.second_factor.enforced_notice'}}</div>
+            <div class="alert alert-error">{{i18n "user.second_factor.enforced_notice"}}</div>
           </div>
         </div>
       {{/if}}
@@ -12,7 +12,7 @@
       {{#if displayOAuthWarning}}
         <div class="control-group">
           <div class="controls">
-            {{i18n 'user.second_factor.oauth_enabled_warning'}}
+            {{i18n "user.second_factor.oauth_enabled_warning"}}
           </div>
         </div>
       {{/if}}
@@ -20,7 +20,7 @@
       {{#if errorMessage}}
         <div class="control-group">
           <div class="controls">
-            <div class='alert alert-error'>{{errorMessage}}</div>
+            <div class="alert alert-error">{{errorMessage}}</div>
           </div>
         </div>
       {{/if}}
@@ -85,9 +85,9 @@
             <h2>{{i18n "user.second_factor_backup.title"}}</h2>
             {{#if model.second_factor_enabled}}
               {{#if model.second_factor_backup_enabled}}
-                {{html-safe (i18n 'user.second_factor_backup.manage' count=model.second_factor_remaining_backup_codes)}}
+                {{html-safe (i18n "user.second_factor_backup.manage" count=model.second_factor_remaining_backup_codes)}}
               {{else}}
-                {{i18n 'user.second_factor_backup.enable_long'}}
+                {{i18n "user.second_factor_backup.enable_long"}}
               {{/if}}
 
               {{#if isCurrentUser}}
@@ -119,7 +119,7 @@
         {{/if}}
       {{else}}
         <div class="control-group">
-          <label class='control-label'>{{i18n 'user.password.title'}}</label>
+          <label class="control-label">{{i18n "user.password.title"}}</label>
 
           <div class="controls">
             <div>
@@ -129,8 +129,8 @@
                 classNames="input-large"
                 autofocus="autofocus"}}
             </div>
-            <div class='instructions'>
-              {{i18n 'user.second_factor.confirm_password_description'}}
+            <div class="instructions">
+              {{i18n "user.second_factor.confirm_password_description"}}
             </div>
           </div>
         </div>
@@ -151,7 +151,7 @@
           <div class="controls" style="margin-top: 5px">
             {{resetPasswordProgress}}
             {{#unless resetPasswordLoading}}
-              <a href class="instructions" {{action "resetPassword"}}>{{ i18n 'user.second_factor.forgot_password' }}</a>
+              <a href class="instructions" {{action "resetPassword"}}>{{ i18n "user.second_factor.forgot_password" }}</a>
             {{/unless}}
           </div>
         </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences-username.hbs b/app/assets/javascripts/discourse/templates/preferences-username.hbs
index b1550b9c16..c7c59b17d0 100644
--- a/app/assets/javascripts/discourse/templates/preferences-username.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-username.hbs
@@ -1,21 +1,21 @@
-<section class='user-preferences  solo-preference'>
+<section class="user-preferences  solo-preference">
   <form class="form-horizontal">
 
     <div class="control-group">
       <div class="controls">
-        <h3>{{i18n 'user.change_username.title'}}</h3>
+        <h3>{{i18n "user.change_username.title"}}</h3>
       </div>
     </div>
 
     <div class="control-group">
-      <label class="control-label">{{i18n 'user.username.title'}}</label>
+      <label class="control-label">{{i18n "user.username.title"}}</label>
       <div class="controls">
         {{text-field value=newUsername id="change_username" classNames="input-xxlarge" maxlength=maxLength autofocus="autofocus" insert-newline="changeUsername"}}
       </div>
-      <div class='instructions controls'>
+      <div class="instructions controls">
         <p>
           {{#if taken}}
-            {{i18n 'user.change_username.taken'}}
+            {{i18n "user.change_username.taken"}}
           {{/if}}
           <span>{{errorMessage}}</span>
         </p>
@@ -33,7 +33,7 @@
           {{saveButtonText}}
         {{/d-button}}
 
-        {{#if saved}}{{i18n 'saved'}}{{/if}}
+        {{#if saved}}{{i18n "saved"}}{{/if}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/preferences.hbs b/app/assets/javascripts/discourse/templates/preferences.hbs
index 854db06883..f40ca7128c 100644
--- a/app/assets/javascripts/discourse/templates/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences.hbs
@@ -1,51 +1,51 @@
 {{#d-section pageClass="user-preferences" class="user-secondary-navigation"}}
-  {{#mobile-nav class='preferences-nav' desktopClass='preferences-list action-list nav-stacked' currentPath=router._router.currentPath}}
-    <li class='nav-account'>
-      {{#link-to 'preferences.account'}}
-        {{i18n 'user.preferences_nav.account'}}
+  {{#mobile-nav class="preferences-nav" desktopClass="preferences-list action-list nav-stacked" currentPath=router._router.currentPath}}
+    <li class="nav-account">
+      {{#link-to "preferences.account"}}
+        {{i18n "user.preferences_nav.account"}}
       {{/link-to}}
     </li>
-    <li class='nav-profile'>
-      {{#link-to 'preferences.profile'}}
-        {{i18n 'user.preferences_nav.profile'}}
+    <li class="nav-profile">
+      {{#link-to "preferences.profile"}}
+        {{i18n "user.preferences_nav.profile"}}
       {{/link-to}}
     </li>
-    <li class='nav-emails'>
-      {{#link-to 'preferences.emails'}}
-        {{i18n 'user.preferences_nav.emails'}}
+    <li class="nav-emails">
+      {{#link-to "preferences.emails"}}
+        {{i18n "user.preferences_nav.emails"}}
       {{/link-to}}
     </li>
-    <li class='nav-notifications'>
-      {{#link-to 'preferences.notifications'}}
-        {{i18n 'user.preferences_nav.notifications'}}
+    <li class="nav-notifications">
+      {{#link-to "preferences.notifications"}}
+        {{i18n "user.preferences_nav.notifications"}}
       {{/link-to}}
     </li>
-    <li class='indent nav-categories'>
-      {{#link-to 'preferences.categories'}}
-        {{i18n 'user.preferences_nav.categories'}}
+    <li class="indent nav-categories">
+      {{#link-to "preferences.categories"}}
+        {{i18n "user.preferences_nav.categories"}}
       {{/link-to}}
     </li>
-    <li class='indent nav-users'>
-      {{#link-to 'preferences.users'}}
-        {{i18n 'user.preferences_nav.users'}}
+    <li class="indent nav-users">
+      {{#link-to "preferences.users"}}
+        {{i18n "user.preferences_nav.users"}}
       {{/link-to}}
     </li>
     {{#if siteSettings.tagging_enabled}}
-      <li class='indent nav-tags'>
-        {{#link-to 'preferences.tags'}}
-          {{i18n 'user.preferences_nav.tags'}}
+      <li class="indent nav-tags">
+        {{#link-to "preferences.tags"}}
+          {{i18n "user.preferences_nav.tags"}}
         {{/link-to}}
       </li>
     {{/if}}
-    <li class='nav-interface'>
-      {{#link-to 'preferences.interface'}}
-        {{i18n 'user.preferences_nav.interface'}}
+    <li class="nav-interface">
+      {{#link-to "preferences.interface"}}
+        {{i18n "user.preferences_nav.interface"}}
       {{/link-to}}
     </li>
     {{#if model.userApiKeys}}
-      <li class='nav-apps'>
-        {{#link-to 'preferences.apps'}}
-          {{i18n 'user.preferences_nav.apps'}}
+      <li class="nav-apps">
+        {{#link-to "preferences.apps"}}
+          {{i18n "user.preferences_nav.apps"}}
         {{/link-to}}
       </li>
     {{/if}}
@@ -53,7 +53,7 @@
   {{/mobile-nav}}
 {{/d-section}}
 
-<section class='user-content user-preferences'>
+<section class="user-content user-preferences">
   {{plugin-outlet name="above-user-preferences" args=(hash model=model)}}
 
   <form class="form-vertical">
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 9c1483e50e..cd931ff10e 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -1,7 +1,7 @@
 <div class="control-group pref-username">
-  <label class="control-label">{{i18n 'user.username.title'}}</label>
+  <label class="control-label">{{i18n "user.username.title"}}</label>
   <div class="controls">
-    <span class='static'>{{model.username}}</span>
+    <span class="static">{{model.username}}</span>
     {{#if model.can_edit_username}}
       {{#link-to "preferences.username" class="btn btn-default btn-small btn-icon pad-left no-text"}}
         {{d-icon "pencil-alt"}}
@@ -9,15 +9,15 @@
     {{/if}}
   </div>
   {{#if siteSettings.enable_mentions}}
-    <div class='instructions'>
-      {{html-safe (i18n 'user.username.short_instructions' username=model.username)}}
+    <div class="instructions">
+      {{html-safe (i18n "user.username.short_instructions" username=model.username)}}
     </div>
   {{/if}}
 </div>
 
 {{#unless siteSettings.sso_overrides_avatar}}
   <div class="control-group pref-avatar">
-    <label class="control-label" id="profile-picture">{{i18n 'user.avatar.title'}}</label>
+    <label class="control-label" id="profile-picture">{{i18n "user.avatar.title"}}</label>
     <div class="controls">
       {{! we want the "huge" version even though we're downsizing it in CSS }}
       {{bound-avatar model "huge"}}
@@ -28,15 +28,15 @@
 
 {{#if canEditName}}
   <div class="control-group pref-name">
-    <label class="control-label">{{i18n 'user.name.title'}}</label>
+    <label class="control-label">{{i18n "user.name.title"}}</label>
     <div class="controls">
       {{#if model.can_edit_name}}
         {{text-field value=newNameInput classNames="input-xxlarge" maxlength="255"}}
       {{else}}
-        <span class='static'>{{model.name}}</span>
+        <span class="static">{{model.name}}</span>
       {{/if}}
     </div>
-    <div class='instructions'>
+    <div class="instructions">
       {{nameInstructions}}
     </div>
   </div>
@@ -44,19 +44,19 @@
 
 {{#if canCheckEmails}}
   <div class="control-group pref-email">
-    <label class="control-label">{{i18n 'user.email.title'}}</label>
+    <label class="control-label">{{i18n "user.email.title"}}</label>
     {{#if model.email}}
       <div class="controls">
-        <span class='static'>{{model.email}}</span>
+        <span class="static">{{model.email}}</span>
         {{#if model.can_edit_email}}
           {{#link-to "preferences.email" class="btn btn-default btn-small btn-icon pad-left no-text"}}{{d-icon "pencil-alt"}}{{/link-to}}
         {{/if}}
       </div>
-      <div class='instructions'>
+      <div class="instructions">
         {{#if siteSettings.sso_overrides_email}}
-          {{i18n 'user.email.sso_override_instructions'}}
+          {{i18n "user.email.sso_override_instructions"}}
         {{/if}}
-        {{i18n 'user.email.instructions'}}
+        {{i18n "user.email.instructions"}}
       </div>
     {{else}}
       <div class="controls">
@@ -68,14 +68,14 @@
 
 {{#if canChangePassword}}
   <div class="control-group pref-password">
-    <label class="control-label">{{i18n 'user.password.title'}}</label>
+    <label class="control-label">{{i18n "user.password.title"}}</label>
     <div class="controls">
-      <a href {{action "changePassword"}} class='btn btn-default'>
+      <a href {{action "changePassword"}} class="btn btn-default">
         {{d-icon "envelope"}}
         {{#if model.no_password}}
-          {{i18n 'user.change_password.set_password'}}
+          {{i18n "user.change_password.set_password"}}
         {{else}}
-          {{i18n 'user.change_password.action'}}
+          {{i18n "user.change_password.action"}}
         {{/if}}
       </a>
 
@@ -84,16 +84,16 @@
   </div>
 
   <div class="control-group pref-second-factor">
-    <label class="control-label">{{i18n 'user.second_factor.title'}}</label>
+    <label class="control-label">{{i18n "user.second_factor.title"}}</label>
     {{#unless model.second_factor_enabled}}
       <label>
-        {{i18n 'user.second_factor.short_description'}}
+        {{i18n "user.second_factor.short_description"}}
       </label>
     {{/unless}}
     <div class="controls pref-second-factor">
       {{#if isCurrentUser}}
         {{#link-to "preferences.second-factor" class="btn btn-default"}}
-          {{d-icon "lock"}} <span>{{i18n 'user.second_factor.enable'}}</span>
+          {{d-icon "lock"}} <span>{{i18n "user.second_factor.enable"}}</span>
         {{/link-to}}
       {{/if}}
     </div>
@@ -102,7 +102,7 @@
 
 {{#if canUpdateAssociatedAccounts}}
   <div class="control-group pref-associated-accounts">
-    <label class="control-label">{{i18n 'user.associated_accounts.title'}}</label>
+    <label class="control-label">{{i18n "user.associated_accounts.title"}}</label>
     {{#if associatedAccountsLoaded}}
       <table>
         <tbody>
@@ -124,7 +124,7 @@
                   {{#if authProvider.method.can_connect}}
                     {{d-button action=(action "connectAccount") actionParam=authProvider.method label="user.associated_accounts.connect" class="btn-default" icon="plug" disabled=disableConnectButtons}}
                   {{else}}
-                    {{i18n 'user.associated_accounts.not_connected'}}
+                    {{i18n "user.associated_accounts.not_connected"}}
                   {{/if}}
                 </td>
               </tr>
@@ -142,7 +142,7 @@
 
 {{#if canSelectTitle}}
   <div class="control-group pref-title">
-    <label class="control-label">{{i18n 'user.title.title'}}</label>
+    <label class="control-label">{{i18n "user.title.title"}}</label>
     <div class="controls">
       {{combo-box
         value=newTitleInput
@@ -156,7 +156,7 @@
 
 {{#if canSelectPrimaryGroup}}
   <div class="control-group pref-primary-group">
-    <label class="control-label">{{i18n 'user.primary_group.title'}}</label>
+    <label class="control-label">{{i18n "user.primary_group.title"}}</label>
     <div class="controls">
       {{combo-box
         value=newPrimaryGroupInput
@@ -168,7 +168,7 @@
 
 {{#if canCheckEmails}}
   <div class="control-group pref-auth-tokens">
-    <label class="control-label">{{i18n 'user.auth_tokens.title'}}</label>
+    <label class="control-label">{{i18n "user.auth_tokens.title"}}</label>
 
     <div class="auth-tokens">
       {{#each authTokens as |token|}}
@@ -185,7 +185,7 @@
           <div class="auth-token-second">
             {{token.browser}} |
             {{#if token.is_active}}
-              <span class="active">{{i18n 'user.auth_tokens.active'}}</span>
+              <span class="active">{{i18n "user.auth_tokens.active"}}</span>
             {{else}}
               {{format-date token.seen_at}}
             {{/if}}
@@ -197,14 +197,14 @@
     {{#if canShowAllAuthTokens}}
       <a href {{action "toggleShowAllAuthTokens"}}>
         {{#if showAllAuthTokens}}
-          {{d-icon "caret-up"}} {{i18n 'user.auth_tokens.show_few'}}
+          {{d-icon "caret-up"}} {{i18n "user.auth_tokens.show_few"}}
         {{else}}
-          {{d-icon "caret-down"}} {{i18n 'user.auth_tokens.show_all' count=model.user_auth_tokens.length}}
+          {{d-icon "caret-down"}} {{i18n "user.auth_tokens.show_all" count=model.user_auth_tokens.length}}
         {{/if}}
       </a>
     {{/if}}
 
-    <a href {{action "revokeAuthToken"}} class="pull-right text-danger">{{d-icon "sign-out-alt"}} {{i18n 'user.auth_tokens.log_out_all'}}</a>
+    <a href {{action "revokeAuthToken"}} class="pull-right text-danger">{{d-icon "sign-out-alt"}} {{i18n "user.auth_tokens.log_out_all"}}</a>
   </div>
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/apps.hbs b/app/assets/javascripts/discourse/templates/preferences/apps.hbs
index bb9216086c..79e9e7bf6b 100644
--- a/app/assets/javascripts/discourse/templates/preferences/apps.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/apps.hbs
@@ -1,6 +1,6 @@
 {{#if model.userApiKeys}}
   <div class="control-group apps">
-    <label class="control-label">{{i18n 'user.apps'}}</label>
+    <label class="control-label">{{i18n "user.apps"}}</label>
     <div class="controls">
       {{#each model.userApiKeys as |key|}}
         <div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index dacfbc1c8b..cd907dc0ed 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -1,10 +1,10 @@
 <div class="control-group category-notifications">
-  <label class="control-label">{{i18n 'user.categories_settings'}}</label>
+  <label class="control-label">{{i18n "user.categories_settings"}}</label>
 
   <div class="controls tracking-controls">
-    <label>{{d-icon "d-watching"}} {{i18n 'user.watched_categories'}}</label>
+    <label>{{d-icon "d-watching"}} {{i18n "user.watched_categories"}}</label>
     {{#if canSee}}
-      <a class="show-tracking" href={{model.watchingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
+      <a class="show-tracking" href={{model.watchingTopicsPath}}>{{i18n "user.tracked_topics_link"}}</a>
     {{/if}}
     {{category-selector
       categories=model.watchedCategories
@@ -12,12 +12,12 @@
       onChange=(action (mut model.watchedCategories))
     }}
   </div>
-  <div class="instructions">{{i18n 'user.watched_categories_instructions'}}</div>
+  <div class="instructions">{{i18n "user.watched_categories_instructions"}}</div>
 
   <div class="controls tracking-controls">
-    <label>{{d-icon "d-tracking"}} {{i18n 'user.tracked_categories'}}</label>
+    <label>{{d-icon "d-tracking"}} {{i18n "user.tracked_categories"}}</label>
     {{#if canSee}}
-      <a class="show-tracking" href={{model.trackingTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
+      <a class="show-tracking" href={{model.trackingTopicsPath}}>{{i18n "user.tracked_topics_link"}}</a>
     {{/if}}
     {{category-selector
       categories=model.trackedCategories
@@ -25,23 +25,23 @@
       onChange=(action (mut model.trackedCategories))
     }}
   </div>
-  <div class="instructions">{{i18n 'user.tracked_categories_instructions'}}</div>
+  <div class="instructions">{{i18n "user.tracked_categories_instructions"}}</div>
 
   <div class="controls tracking-controls">
-    <label>{{d-icon "d-watching-first"}} {{i18n 'user.watched_first_post_categories'}}</label>
+    <label>{{d-icon "d-watching-first"}} {{i18n "user.watched_first_post_categories"}}</label>
     {{category-selector
       categories=model.watchedFirstPostCategories
       blacklist=selectedCategories
       onChange=(action (mut model.watchedFirstPostCategories))
     }}
   </div>
-  <div class="instructions">{{i18n 'user.watched_first_post_categories_instructions'}}</div>
+  <div class="instructions">{{i18n "user.watched_first_post_categories_instructions"}}</div>
 
   {{#unless siteSettings.mute_all_categories_by_default}}
     <div class="controls tracking-controls">
-      <label>{{d-icon "d-muted"}} {{i18n 'user.muted_categories'}}</label>
+      <label>{{d-icon "d-muted"}} {{i18n "user.muted_categories"}}</label>
       {{#if canSee}}
-        <a class="show-tracking" href={{model.mutedTopicsPath}}>{{i18n 'user.tracked_topics_link'}}</a>
+        <a class="show-tracking" href={{model.mutedTopicsPath}}>{{i18n "user.tracked_topics_link"}}</a>
       {{/if}}
       {{category-selector
         categories=model.mutedCategories
@@ -49,7 +49,7 @@
         onChange=(action (mut model.mutedCategories))
       }}
     </div>
-    <div class="instructions">{{i18n (if hideMutedTags 'user.muted_categories_instructions' 'user.muted_categories_instructions_dont_hide')}}</div>
+    <div class="instructions">{{i18n (if hideMutedTags "user.muted_categories_instructions" "user.muted_categories_instructions_dont_hide")}}</div>
   {{/unless}}
 </div>
 
@@ -62,5 +62,5 @@
 {{#if canSave}}
   {{save-controls model=model action=(action "save") saved=saved}}
 {{else}}
-  {{i18n 'user.no_category_access'}}
+  {{i18n "user.no_category_access"}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index 367ea59b0d..d5850f3ad1 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -1,15 +1,15 @@
 {{#unless siteSettings.disable_mailing_list_mode}}
   {{~#if model.user_option.mailing_list_mode}}
     <div class="warning-wrap">
-      <div class="warning">{{i18n 'user.mailing_list_mode.warning'}}</div>
+      <div class="warning">{{i18n "user.mailing_list_mode.warning"}}</div>
     </div>
   {{/if}}
 {{/unless}}
 <div class="control-group pref-email-settings">
-  <label class="control-label">{{i18n 'user.email_settings'}}</label>
+  <label class="control-label">{{i18n "user.email_settings"}}</label>
 
-  <div class='controls controls-dropdown'>
-    <label for="user-email-messages-level">{{i18n 'user.email_messages_level'}}</label>
+  <div class="controls controls-dropdown">
+    <label for="user-email-messages-level">{{i18n "user.email_messages_level"}}</label>
     {{combo-box
       valueProperty="value"
       content=emailLevelOptions
@@ -18,12 +18,12 @@
       onChange=(action (mut model.user_option.email_messages_level))
     }}
     {{#if emailMessagesLevelAway}}
-      <div class='instructions'>{{emailFrequencyInstructions}}</div>
+      <div class="instructions">{{emailFrequencyInstructions}}</div>
     {{/if}}
   </div>
 
-  <div class='controls controls-dropdown'>
-    <label for="user-email-level">{{i18n 'user.email_level.title'}}</label>
+  <div class="controls controls-dropdown">
+    <label for="user-email-level">{{i18n "user.email_level.title"}}</label>
     {{combo-box
       valueProperty="value"
       content=emailLevelOptions
@@ -32,12 +32,12 @@
       onChange=(action (mut model.user_option.email_level))
     }}
     {{#if emailLevelAway}}
-      <div class='instructions'>{{emailFrequencyInstructions}}</div>
+      <div class="instructions">{{emailFrequencyInstructions}}</div>
     {{/if}}
   </div>
 
-  <div class='controls controls-dropdown'>
-    <label>{{i18n 'user.email_previous_replies.title'}}</label>
+  <div class="controls controls-dropdown">
+    <label>{{i18n "user.email_previous_replies.title"}}</label>
     {{combo-box
       valueProperty="value"
       content=previousRepliesOptions
@@ -51,11 +51,11 @@
 </div>
 
 {{#unless siteSettings.disable_digest_emails}}
-  <div class='control-group pref-activity-summary'>
-    <label class="control-label">{{i18n 'user.email_activity_summary'}}</label>
+  <div class="control-group pref-activity-summary">
+    <label class="control-label">{{i18n "user.email_activity_summary"}}</label>
     {{preference-checkbox labelKey="user.email_digests.title" disabled=model.user_option.mailing_list_mode checked=model.user_option.email_digests}}
     {{#if model.user_option.email_digests}}
-      <div class='controls controls-dropdown'>
+      <div class="controls controls-dropdown">
         {{combo-box
           valueProperty="value"
           filterable=true
@@ -70,12 +70,12 @@
 {{/unless}}
 
 {{#unless siteSettings.disable_mailing_list_mode}}
-  <div class='control-group pref-mailing-list-mode'>
-    <label class="control-label">{{i18n 'user.mailing_list_mode.label'}}</label>
+  <div class="control-group pref-mailing-list-mode">
+    <label class="control-label">{{i18n "user.mailing_list_mode.label"}}</label>
     {{preference-checkbox labelKey="user.mailing_list_mode.enabled" checked=model.user_option.mailing_list_mode}}
-    <div class='instructions'>{{html-safe (i18n 'user.mailing_list_mode.instructions')}}</div>
+    <div class="instructions">{{html-safe (i18n "user.mailing_list_mode.instructions")}}</div>
     {{#if model.user_option.mailing_list_mode}}
-      <div class='controls controls-dropdown'>
+      <div class="controls controls-dropdown">
         {{combo-box
           valueProperty="value"
           content=mailingListModeOptions
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
index 63b96865b2..45607c8cb7 100644
--- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
@@ -1,6 +1,6 @@
 {{#if showThemeSelector}}
   <div class="control-group theme">
-    <label class="control-label">{{i18n 'user.theme'}}</label>
+    <label class="control-label">{{i18n "user.theme"}}</label>
     <div class="controls">
       {{combo-box
         content=userSelectableThemes
@@ -17,7 +17,7 @@
 {{/if}}
 
 <div class="control-group text-size">
-  <label class="control-label">{{i18n 'user.text_size.title'}}</label>
+  <label class="control-label">{{i18n "user.text_size.title"}}</label>
   <div class="controls">
     {{combo-box
       valueProperty="value"
@@ -35,7 +35,7 @@
 
 {{#if siteSettings.allow_user_locale}}
   <div class="control-group pref-locale">
-    <label class="control-label">{{i18n 'user.locale.title'}}</label>
+    <label class="control-label">{{i18n "user.locale.title"}}</label>
     <div class="controls">
       {{combo-box
         valueProperty="value"
@@ -48,14 +48,14 @@
         )
       }}
     </div>
-    <div class='instructions'>
-      {{i18n 'user.locale.instructions'}}
+    <div class="instructions">
+      {{i18n "user.locale.instructions"}}
     </div>
   </div>
 {{/if}}
 
 <div class="control-group home">
-  <label class="control-label">{{i18n 'user.home'}}</label>
+  <label class="control-label">{{i18n "user.home"}}</label>
   <div class="controls">
     {{combo-box
       content=userSelectableHome
@@ -67,7 +67,7 @@
 </div>
 
 <div class="control-group other">
-  <label class="control-label">{{i18n 'user.other_settings'}}</label>
+  <label class="control-label">{{i18n "user.other_settings"}}</label>
 
   {{preference-checkbox labelKey="user.external_links_in_new_tab" checked=model.user_option.external_links_in_new_tab class="pref-external-links"}}
   {{preference-checkbox labelKey="user.enable_quoting" checked=model.user_option.enable_quoting class="pref-enable-quoting"}}
@@ -80,8 +80,8 @@
     {{preference-checkbox labelKey="user.enable_physical_keyboard" checked=disableSafariHacks  class="pref-safari-hacks"}}
   {{/if}}
   {{preference-checkbox labelKey="user.dynamic_favicon" checked=model.user_option.dynamic_favicon  class="pref-dynamic-favicon"}}
-  <div class='controls controls-dropdown pref-page-title'>
-    <label for="user-email-level">{{i18n 'user.title_count_mode.title'}}</label>
+  <div class="controls controls-dropdown pref-page-title">
+    <label for="user-email-level">{{i18n "user.title_count_mode.title"}}</label>
     {{combo-box
       valueProperty="value"
       content=titleCountModes
diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
index a676f29787..9e079fd5c5 100644
--- a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
@@ -1,8 +1,8 @@
 <div class="control-group notifications">
-  <label class="control-label">{{i18n 'user.notifications'}}</label>
+  <label class="control-label">{{i18n "user.notifications"}}</label>
 
   <div class="controls controls-dropdown">
-    <label>{{i18n 'user.new_topic_duration.label'}}</label>
+    <label>{{i18n "user.new_topic_duration.label"}}</label>
     {{combo-box
       class="duration"
       valueProperty="value"
@@ -13,7 +13,7 @@
   </div>
 
   <div class="controls controls-dropdown">
-    <label>{{i18n 'user.auto_track_topics'}}</label>
+    <label>{{i18n "user.auto_track_topics"}}</label>
     {{combo-box
       valueProperty="value"
       content=autoTrackDurations
@@ -23,7 +23,7 @@
   </div>
 
   <div class="controls controls-dropdown">
-    <label>{{i18n 'user.notification_level_when_replying'}}</label>
+    <label>{{i18n "user.notification_level_when_replying"}}</label>
     {{combo-box
       valueProperty="value"
       content=notificationLevelsForReplying
@@ -33,7 +33,7 @@
   </div>
 
   <div class="controls controls-dropdown">
-    <label>{{i18n 'user.like_notification_frequency.title'}}</label>
+    <label>{{i18n "user.like_notification_frequency.title"}}</label>
     {{combo-box
       valueProperty="value"
       content=likeNotificationFrequencies
@@ -45,16 +45,16 @@
 
 {{#unless isIOS}}
   <div class="control-group desktop-notifications">
-    <label class="control-label">{{i18n 'user.desktop_notifications.label'}}</label>
+    <label class="control-label">{{i18n "user.desktop_notifications.label"}}</label>
     {{desktop-notification-config}}
-    <div class="instructions">{{i18n 'user.desktop_notifications.each_browser_note'}}</div>
+    <div class="instructions">{{i18n "user.desktop_notifications.each_browser_note"}}</div>
     {{plugin-outlet name="user-preferences-desktop-notifications" args=(hash model=model save=(action "save"))}}
   </div>
 {{/unless}}
 
 {{#if siteSettings.enable_personal_messages}}
   <div class="control-group private-messages">
-    <label class="control-label">{{i18n 'user.private_messages'}}</label>
+    <label class="control-label">{{i18n "user.private_messages"}}</label>
 
     <div class="controls">
       {{preference-checkbox
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index b9a95dc9bb..f07bcafb74 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -1,6 +1,6 @@
 {{#if canChangeBio}}
   <div class="control-group pref-bio">
-    <label class="control-label">{{i18n 'user.bio'}}</label>
+    <label class="control-label">{{i18n "user.bio"}}</label>
     <div class="controls bio-composer input-xxlarge">
       {{d-editor value=model.bio_raw}}
     </div>
@@ -8,7 +8,7 @@
 {{/if}}
 
 <div class="control-group pref-timezone">
-  <label class="control-label">{{i18n 'user.timezone'}}</label>
+  <label class="control-label">{{i18n "user.timezone"}}</label>
   {{timezone-input
     value=model.user_option.timezone
     onChange=(action (mut model.user_option.timezone))
@@ -18,14 +18,14 @@
 </div>
 
 <div class="control-group pref-location">
-  <label class="control-label">{{i18n 'user.location'}}</label>
+  <label class="control-label">{{i18n "user.location"}}</label>
   <div class="controls">
-    {{input type="text" value=model.location class="input-xxlarge" id='edit-location'}}
+    {{input type="text" value=model.location class="input-xxlarge" id="edit-location"}}
   </div>
 </div>
 
 <div class="control-group pref-website">
-  <label class="control-label">{{i18n 'user.website'}}</label>
+  <label class="control-label">{{i18n "user.website"}}</label>
   <div class="controls">
     {{input type="text" value=model.website class="input-xxlarge"}}
   </div>
@@ -36,35 +36,35 @@
     {{user-field field=uf.field value=uf.value}}
   </div>
 {{/each}}
-<div class='clearfix'></div>
+<div class="clearfix"></div>
 
 {{#if siteSettings.allow_profile_backgrounds}}
   <div class="control-group pref-profile-bg">
-    <label class="control-label">{{i18n 'user.change_profile_background.title'}}</label>
+    <label class="control-label">{{i18n "user.change_profile_background.title"}}</label>
     <div class="controls">
       {{image-uploader imageUrl=model.profile_background_upload_url
                        type="profile_background"}}
     </div>
-    <div class='instructions'>
-      {{i18n 'user.change_profile_background.instructions'}}
+    <div class="instructions">
+      {{i18n "user.change_profile_background.instructions"}}
     </div>
   </div>
 
   <div class="control-group pref-profile-bg">
-    <label class="control-label">{{i18n 'user.change_card_background.title'}}</label>
+    <label class="control-label">{{i18n "user.change_card_background.title"}}</label>
     <div class="controls">
       {{image-uploader imageUrl=model.card_background_upload_url
                        type="card_background"}}
     </div>
-    <div class='instructions'>
-      {{i18n 'user.change_card_background.instructions'}}
+    <div class="instructions">
+      {{i18n "user.change_card_background.instructions"}}
     </div>
   </div>
 {{/if}}
 
 {{#if siteSettings.allow_featured_topic_on_user_profiles}}
   <div class="control-group">
-    <label class="control-label">{{i18n 'user.featured_topic'}}</label>
+    <label class="control-label">{{i18n "user.featured_topic"}}</label>
     {{#if model.featured_topic}}
       <label class="featured-topic-link">
         {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}
@@ -83,8 +83,8 @@
           label="user.feature_topic_on_profile.clear.title"}}
       {{/if}}
     </div>
-    <div class='instructions'>
-      {{i18n 'user.change_featured_topic.instructions'}}
+    <div class="instructions">
+      {{i18n "user.change_featured_topic.instructions"}}
     </div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/tags.hbs b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
index e645e8175a..9774a0def2 100644
--- a/app/assets/javascripts/discourse/templates/preferences/tags.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
@@ -1,9 +1,9 @@
 {{#if siteSettings.tagging_enabled}}
   <div class="control-group tag-notifications">
-    <label class="control-label">{{i18n 'user.tag_settings'}}</label>
+    <label class="control-label">{{i18n "user.tag_settings"}}</label>
 
     <div class="controls tracking-controls">
-      <label>{{d-icon "d-watching" class="icon watching"}} {{i18n 'user.watched_tags'}}</label>
+      <label>{{d-icon "d-watching" class="icon watching"}} {{i18n "user.watched_tags"}}</label>
       {{tag-chooser
         tags=model.watched_tags
         blacklist=selectedTags
@@ -14,10 +14,10 @@
       }}
     </div>
 
-    <div class="instructions">{{i18n 'user.watched_tags_instructions'}}</div>
+    <div class="instructions">{{i18n "user.watched_tags_instructions"}}</div>
 
     <div class="controls tracking-controls">
-      <label>{{d-icon "d-tracking" class="icon tracking"}} {{i18n 'user.tracked_tags'}}</label>
+      <label>{{d-icon "d-tracking" class="icon tracking"}} {{i18n "user.tracked_tags"}}</label>
       {{tag-chooser
         tags=model.tracked_tags
         blacklist=selectedTags
@@ -27,10 +27,10 @@
         unlimitedTagCount=true}}
     </div>
 
-    <div class="instructions">{{i18n 'user.tracked_tags_instructions'}}</div>
+    <div class="instructions">{{i18n "user.tracked_tags_instructions"}}</div>
 
     <div class="controls tracking-controls">
-      <label>{{d-icon "d-watching-first" class="icon watching-first-post"}} {{i18n 'user.watched_first_post_tags'}}</label>
+      <label>{{d-icon "d-watching-first" class="icon watching-first-post"}} {{i18n "user.watched_first_post_tags"}}</label>
       {{tag-chooser
         tags=model.watching_first_post_tags
         blacklist=selectedTags
@@ -41,11 +41,11 @@
     </div>
 
     <div class="instructions">
-      {{i18n 'user.watched_first_post_tags_instructions'}}
+      {{i18n "user.watched_first_post_tags_instructions"}}
     </div>
 
     <div class="controls tracking-controls">
-      <label>{{d-icon "d-muted" class="icon muted"}} {{i18n 'user.muted_tags'}}</label>
+      <label>{{d-icon "d-muted" class="icon muted"}} {{i18n "user.muted_tags"}}</label>
       {{tag-chooser
         tags=model.muted_tags
         blacklist=selectedTags
@@ -54,7 +54,7 @@
         everyTag=true
         unlimitedTagCount=true}}
     </div>
-    <div class="instructions">{{i18n 'user.muted_tags_instructions'}}</div>
+    <div class="instructions">{{i18n "user.muted_tags_instructions"}}</div>
   </div>
 
   {{plugin-outlet name="user-preferences-tags" args=(hash model=model save=(action "save"))}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/users.hbs b/app/assets/javascripts/discourse/templates/preferences/users.hbs
index 799b9c5c5a..7db61c6aa2 100644
--- a/app/assets/javascripts/discourse/templates/preferences/users.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/users.hbs
@@ -1,8 +1,8 @@
-<label class="control-label">{{i18n 'user.users'}}</label>
+<label class="control-label">{{i18n "user.users"}}</label>
 {{#if ignoredEnabled}}
   <div class="control-group user-ignore">
     <div class="controls tracking-controls user-notifications">
-      <label>{{d-icon "far-eye-slash" class="icon"}} {{i18n 'user.ignored_users'}}</label>
+      <label>{{d-icon "far-eye-slash" class="icon"}} {{i18n "user.ignored_users"}}</label>
       {{ignored-user-list model=model items=model.ignored_usernames saving=saved}}
     </div>
   </div>
@@ -12,7 +12,7 @@
   <div class="controls tracking-controls">
     <label>
       {{d-icon "d-muted" class="icon"}}
-      <span>{{i18n 'user.muted_users'}}</span>
+      <span>{{i18n "user.muted_users"}}</span>
     </label>
     {{user-chooser
       value=mutedUsernames
@@ -22,7 +22,7 @@
       )
     }}
   </div>
-  <div class="instructions">{{i18n 'user.muted_users_instructions'}}</div>
+  <div class="instructions">{{i18n "user.muted_users_instructions"}}</div>
 </div>
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
diff --git a/app/assets/javascripts/discourse/templates/review-index.hbs b/app/assets/javascripts/discourse/templates/review-index.hbs
index ab354f4fa1..7b603f9fa0 100644
--- a/app/assets/javascripts/discourse/templates/review-index.hbs
+++ b/app/assets/javascripts/discourse/templates/review-index.hbs
@@ -2,7 +2,7 @@
   <div class="reviewable-list">
     {{#if reviewables}}
       {{#load-more selector=".reviewable-item" action=(action "loadMore")}}
-        <div class='reviewables'>
+        <div class="reviewables">
           {{#each reviewables as |r|}}
             {{reviewable-item reviewable=r remove=(action "remove")}}
           {{/each}}
@@ -16,9 +16,9 @@
     {{/if}}
   </div>
 
-  <div class='reviewable-filters'>
-    <div class='reviewable-filter'>
-      <label class='filter-label'>{{i18n "review.filters.status"}}</label>
+  <div class="reviewable-filters">
+    <div class="reviewable-filter">
+      <label class="filter-label">{{i18n "review.filters.status"}}</label>
       {{combo-box
         value=filterStatus
         content=statuses
@@ -30,8 +30,8 @@
 
       {{plugin-outlet name="above-review-filters" args=(hash model=model additionalFilters=additionalFilters)}}
 
-      <div class='reviewable-filter'>
-        <label class='filter-label'>{{i18n "review.filters.type.title"}}</label>
+      <div class="reviewable-filter">
+        <label class="filter-label">{{i18n "review.filters.type.title"}}</label>
         {{combo-box
           value=filterType
           content=allTypes
@@ -40,8 +40,8 @@
         }}
       </div>
 
-      <div class='reviewable-filter'>
-        <label class='filter-label'>{{i18n "review.filters.priority.title"}}</label>
+      <div class="reviewable-filter">
+        <label class="filter-label">{{i18n "review.filters.priority.title"}}</label>
         {{combo-box
           value=filterPriority
           content=priorities
@@ -49,8 +49,8 @@
         }}
       </div>
 
-      <div class='reviewable-filter'>
-        <label class='filter-label'>{{i18n "review.filters.category"}}</label>
+      <div class="reviewable-filter">
+        <label class="filter-label">{{i18n "review.filters.category"}}</label>
         {{category-chooser
           none="review.filters.all_categories"
           value=filterCategoryId
@@ -58,7 +58,7 @@
         }}
       </div>
 
-      <div class='reviewable-filter topic-filter'>
+      <div class="reviewable-filter topic-filter">
         {{i18n "review.filtered_user"}}
         {{user-selector
           excludeCurrentUser=false
@@ -70,17 +70,17 @@
       </div>
 
       {{#if filterTopic}}
-        <div class='reviewable-filter topic-filter'>
+        <div class="reviewable-filter topic-filter">
           {{i18n "review.filtered_topic"}}
           {{d-button label="review.show_all_topics" icon="times" action=(action "resetTopic")}}
         </div>
       {{/if}}
 
-      <div class='reviewable-filter date-range'>
+      <div class="reviewable-filter date-range">
         {{date-time-input-range showFromTime=false showToTime=false from=filterFromDate to=filterToDate onChange=setRange}}
       </div>
 
-      <div class='reviewable-filter sort-order'>
+      <div class="reviewable-filter sort-order">
         {{i18n "review.order_by"}}
         {{combo-box
           value=filterSortOrder
@@ -90,7 +90,7 @@
       </div>
     {{/if}}
 
-    <div class='reviewable-filters-actions'>
+    <div class="reviewable-filters-actions">
       {{d-button
         icon="sync"
         label="review.filters.refresh"
diff --git a/app/assets/javascripts/discourse/templates/review-settings.hbs b/app/assets/javascripts/discourse/templates/review-settings.hbs
index f798ca59c6..599ae01602 100644
--- a/app/assets/javascripts/discourse/templates/review-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/review-settings.hbs
@@ -1,10 +1,10 @@
-<div class='reviewable-settings'>
+<div class="reviewable-settings">
   <h4>{{i18n "review.settings.priorities.title"}}</h4>
 
   {{#each settings.reviewable_score_types as |rst|}}
-    <div class='reviewable-score-type'>
-      <div class='title'>{{rst.title}}</div>
-      <div class='field'>
+    <div class="reviewable-score-type">
+      <div class="title">{{rst.title}}</div>
+      <div class="field">
         {{combo-box
           value=rst.reviewable_priority
           content=settings.reviewable_priorities
@@ -14,9 +14,9 @@
     </div>
   {{/each}}
 
-  <div class='reviewable-score-type'>
-    <div class='title'></div>
-    <div class='field'>
+  <div class="reviewable-score-type">
+    <div class="title"></div>
+    <div class="field">
       {{d-button
         icon="check"
         label="review.settings.save_changes"
@@ -25,7 +25,7 @@
         disabled=saving}}
 
       {{#if saved}}
-        <span class='saved'>{{i18n "review.settings.saved"}}</span>
+        <span class="saved">{{i18n "review.settings.saved"}}</span>
       {{/if}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/review-topics.hbs b/app/assets/javascripts/discourse/templates/review-topics.hbs
index 36cdb89b7b..337cb4207d 100644
--- a/app/assets/javascripts/discourse/templates/review-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/review-topics.hbs
@@ -1,5 +1,5 @@
 {{#if reviewableTopics}}
-  <table class='reviewable-topics'>
+  <table class="reviewable-topics">
     <thead>
       <th>{{i18n "review.topics.topic"}} </th>
       <th>{{i18n "review.topics.reviewable_count"}}</th>
@@ -8,9 +8,9 @@
     </thead>
     <tbody>
       {{#each reviewableTopics as |rt|}}
-        <tr class='reviewable-topic'>
+        <tr class="reviewable-topic">
           <td class="topic-title">
-            <div class='combined-title'>
+            <div class="combined-title">
               {{topic-status topic=rt}}
               <a href={{rt.relative_url}} rel="noopener" target="_blank">{{replace-emoji rt.fancy_title}}</a>
             </div>
diff --git a/app/assets/javascripts/discourse/templates/review.hbs b/app/assets/javascripts/discourse/templates/review.hbs
index f5e5dcdd2e..6077454af2 100644
--- a/app/assets/javascripts/discourse/templates/review.hbs
+++ b/app/assets/javascripts/discourse/templates/review.hbs
@@ -1,9 +1,9 @@
 <div class="reviewable">
   <ul class="nav nav-pills reviewable-title">
-    {{nav-item route='review.index' label='review.view_all'}}
-    {{nav-item route='review.topics' label='review.grouped_by_topic'}}
+    {{nav-item route="review.index" label="review.view_all"}}
+    {{nav-item route="review.topics" label="review.grouped_by_topic"}}
     {{#if currentUser.admin}}
-      {{nav-item route='review.settings' label='review.settings.title' icon='wrench'}}
+      {{nav-item route="review.settings" label="review.settings.title" icon="wrench"}}
     {{/if}}
   </ul>
 
diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/templates/static.hbs
index aee9390704..a33cfa1e3a 100644
--- a/app/assets/javascripts/discourse/templates/static.hbs
+++ b/app/assets/javascripts/discourse/templates/static.hbs
@@ -1,6 +1,6 @@
 {{#d-section bodyClass=bodyClass class="container"}}
   {{#watch-read action=(action "markFaqRead") path=model.path}}
-    <div class='contents clearfix body-page'>
+    <div class="contents clearfix body-page">
       {{plugin-outlet name="above-static"}}
       {{html-safe model.html}}
 
diff --git a/app/assets/javascripts/discourse/templates/tag-groups-index.hbs b/app/assets/javascripts/discourse/templates/tag-groups-index.hbs
index 0c933221d9..51a1f5a1b6 100644
--- a/app/assets/javascripts/discourse/templates/tag-groups-index.hbs
+++ b/app/assets/javascripts/discourse/templates/tag-groups-index.hbs
@@ -1,3 +1,3 @@
 <div class="tag-group-content">
-  <p class="about">{{i18n 'tagging.groups.about'}}</p>
+  <p class="about">{{i18n "tagging.groups.about"}}</p>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/templates/tag-groups.hbs b/app/assets/javascripts/discourse/templates/tag-groups.hbs
index 6d7d1b0c74..8bbc36c229 100644
--- a/app/assets/javascripts/discourse/templates/tag-groups.hbs
+++ b/app/assets/javascripts/discourse/templates/tag-groups.hbs
@@ -1,7 +1,7 @@
 <div class="container tag-groups-container">
   <h2>{{i18n "tagging.groups.title"}}</h2>
 
-  <div class='content-list'>
+  <div class="content-list">
     <ul>
       {{#each model as |tagGroup|}}
         <li>
diff --git a/app/assets/javascripts/discourse/templates/tags/index.hbs b/app/assets/javascripts/discourse/templates/tags/index.hbs
index c71934d127..3527823b28 100644
--- a/app/assets/javascripts/discourse/templates/tags/index.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/index.hbs
@@ -11,10 +11,10 @@
   </div>
 </div>
 
-<div class='tag-sort-options'>
+<div class="tag-sort-options">
   {{i18n "tagging.sort_by"}}
-  <span class="tag-sort-count {{if sortedByCount 'active'}}"><a href {{action "sortByCount"}}>{{i18n "tagging.sort_by_count"}}</a></span>
-  <span class="tag-sort-name {{if sortedByName 'active'}}"><a href {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span>
+  <span class="tag-sort-count {{if sortedByCount "active"}}"><a href {{action "sortByCount"}}>{{i18n "tagging.sort_by_count"}}</a></span>
+  <span class="tag-sort-name {{if sortedByName "active"}}"><a href {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span>
 </div>
 
 <hr>
diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs
index 638701e3da..80f38623c3 100644
--- a/app/assets/javascripts/discourse/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/show.hbs
@@ -15,7 +15,7 @@
         {{navigation-bar navItems=navItems filterMode=filterMode}}
       {{else}}
         <h2 class="tag-show-heading">
-          {{#link-to 'tags'}}{{i18n "tagging.tags"}}{{/link-to}}
+          {{#link-to "tags"}}{{i18n "tagging.tags"}}{{/link-to}}
           {{d-icon "angle-right"}}
           {{discourse-tag-bound tagRecord=tag style="simple"}}
           {{#each additionalTags as |tag|}}
@@ -57,7 +57,7 @@
 <div class="container list-container">
   <div class="row">
     <div class="full-width">
-      <div id='list-area'>
+      <div id="list-area">
         {{#unless loading}}
           {{#if list.topics}}
             {{#discovery-topics-list model=list refresh=(action "refresh")}}
@@ -75,9 +75,9 @@
               }}
             {{/discovery-topics-list}}
           {{else}}
-            <footer class='topic-list-bottom'>
+            <footer class="topic-list-bottom">
               <h3>
-                {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}.
+                {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n "topic.browse_all_categories"}}{{/link-to}} {{i18n "or"}} {{#link-to "discovery.latest"}}{{i18n "topic.view_latest_topics"}}{{/link-to}}.
               </h3>
             </footer>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index ed26ae62ba..7a4f6d6c7e 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -87,7 +87,7 @@
       {{/topic-title}}
 
       {{#if model.publishedPage}}
-        <div class='published-page'>
+        <div class="published-page">
           <div class="details">
             {{i18n "topic.publish_page.topic_published"}}
             <div>
@@ -107,7 +107,7 @@
     {{/if}}
 
     <div class="container posts">
-      <div class='selected-posts {{unless multiSelect 'hidden'}}'>
+      <div class="selected-posts {{unless multiSelect "hidden"}}">
         {{selected-posts
           selectedPostsCount=selectedPostsCount
           canSelectAll=canSelectAll
@@ -261,25 +261,25 @@
             {{#if loadedAllPosts}}
 
               {{#if model.pending_posts}}
-                <div class='pending-posts'>
+                <div class="pending-posts">
                   {{#each model.pending_posts as |pending|}}
-                    <div class='reviewable-item'>
-                      <div class='reviewable-meta-data'>
-                        <span class='reviewable-type'>
+                    <div class="reviewable-item">
+                      <div class="reviewable-meta-data">
+                        <span class="reviewable-type">
                           {{i18n "review.awaiting_approval"}}
                         </span>
-                        <span class='created-at'>
+                        <span class="created-at">
                           {{age-with-tooltip pending.created_at}}
                         </span>
                       </div>
-                      <div class='post-contents-wrapper'>
-                        {{reviewable-created-by user=currentUser tagName=''}}
-                        <div class='post-contents'>
-                          {{reviewable-created-by-name user=currentUser tagName=''}}
-                          <div class='post-body'>{{cook-text pending.raw}}</div>
+                      <div class="post-contents-wrapper">
+                        {{reviewable-created-by user=currentUser tagName=""}}
+                        <div class="post-contents">
+                          {{reviewable-created-by-name user=currentUser tagName=""}}
+                          <div class="post-body">{{cook-text pending.raw}}</div>
                         </div>
                       </div>
-                      <div class='reviewable-actions'>
+                      <div class="reviewable-actions">
                         {{d-button
                           class="btn-danger"
                           label="review.delete"
@@ -297,7 +297,7 @@
                     {{html-safe (i18n "review.topic_has_pending" count=model.queued_posts_count)}}
                   </div>
 
-                  {{#link-to 'review' (query-params topic_id=model.id type="ReviewableQueuedPost" status="pending")}}
+                  {{#link-to "review" (query-params topic_id=model.id type="ReviewableQueuedPost" status="pending")}}
                     {{i18n "review.view_pending"}}
                   {{/link-to}}
                 </div>
@@ -356,7 +356,7 @@
               {{/if}}
 
               {{#if showSelectedPostsAtBottom}}
-                <div class='selected-posts {{unless multiSelect 'hidden'}}'>
+                <div class="selected-posts {{unless multiSelect "hidden"}}">
                   {{selected-posts
                     selectedPostsCount=selectedPostsCount
                     canSelectAll=canSelectAll
@@ -375,7 +375,7 @@
               {{/if}}
 
               {{plugin-outlet name="topic-above-suggested" args=(hash model=model)}}
-              <div class="{{if model.relatedMessages.length 'related-messages-wrapper'}} {{if model.suggestedTopics.length 'suggested-topics-wrapper'}}">
+              <div class="{{if model.relatedMessages.length "related-messages-wrapper"}} {{if model.suggestedTopics.length "suggested-topics-wrapper"}}">
                 {{#if model.relatedMessages.length}}
                   {{related-messages topic=model}}
                 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/unknown.hbs b/app/assets/javascripts/discourse/templates/unknown.hbs
index 5ff548e033..168cdc06d5 100644
--- a/app/assets/javascripts/discourse/templates/unknown.hbs
+++ b/app/assets/javascripts/discourse/templates/unknown.hbs
@@ -1,3 +1,3 @@
-<div class='container'>
+<div class="container">
   {{html-safe model}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index fde0c26227..30aa848824 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -2,14 +2,14 @@
   {{#if canInviteToForum}}
     {{#load-more class="user-content" selector=".user-invite-list tr" action=(action "loadMore")}}
       <section>
-        <h2>{{i18n 'user.invited.title'}}</h2>
+        <h2>{{i18n "user.invited.title"}}</h2>
 
         {{#if model.can_see_invite_details}}
-          <div class='admin-controls'>
+          <div class="admin-controls">
             <nav>
               <ul class="nav nav-pills">
-                {{nav-item route='userInvited.show' routeParam='pending' i18nLabel=pendingLabel}}
-                {{nav-item route='userInvited.show' routeParam='redeemed' i18nLabel=redeemedLabel}}
+                {{nav-item route="userInvited.show" routeParam="pending" i18nLabel=pendingLabel}}
+                {{nav-item route="userInvited.show" routeParam="redeemed" i18nLabel=redeemedLabel}}
               </ul>
             </nav>
 
@@ -21,12 +21,12 @@
               {{/if}}
               {{#if showBulkActionButtons}}
                 {{#if rescindedAll}}
-                  {{i18n 'user.invited.rescinded_all'}}
+                  {{i18n "user.invited.rescinded_all"}}
                 {{else}}
                   {{d-button icon="times" action=(action "rescindAll") label="user.invited.rescind_all"}}
                 {{/if}}
                 {{#if reinvitedAll}}
-                  {{i18n 'user.invited.reinvited_all'}}
+                  {{i18n "user.invited.reinvited_all"}}
                 {{else}}
                   {{d-button icon="sync" action=(action "reinviteAll") label="user.invited.reinvite_all"}}
                 {{/if}}
@@ -42,30 +42,30 @@
         {{/if}}
 
         {{#if model.invites}}
-          <table class='table user-invite-list'>
+          <table class="table user-invite-list">
             <tbody>
               <tr>
                 {{#if inviteRedeemed}}
-                  <th>{{i18n 'user.invited.user'}}</th>
-                  <th>{{i18n 'user.invited.redeemed_at'}}</th>
+                  <th>{{i18n "user.invited.user"}}</th>
+                  <th>{{i18n "user.invited.redeemed_at"}}</th>
                   {{#if model.can_see_invite_details}}
-                    <th>{{i18n 'user.last_seen'}}</th>
-                    <th>{{i18n 'user.invited.topics_entered'}}</th>
-                    <th>{{i18n 'user.invited.posts_read_count'}}</th>
-                    <th>{{i18n 'user.invited.time_read'}}</th>
-                    <th>{{i18n 'user.invited.days_visited'}}</th>
+                    <th>{{i18n "user.last_seen"}}</th>
+                    <th>{{i18n "user.invited.topics_entered"}}</th>
+                    <th>{{i18n "user.invited.posts_read_count"}}</th>
+                    <th>{{i18n "user.invited.time_read"}}</th>
+                    <th>{{i18n "user.invited.days_visited"}}</th>
                   {{/if}}
                 {{else}}
-                  <th colspan="1">{{i18n 'user.invited.user'}}</th>
-                  <th colspan="6">{{i18n 'user.invited.sent'}}</th>
+                  <th colspan="1">{{i18n "user.invited.user"}}</th>
+                  <th colspan="6">{{i18n "user.invited.sent"}}</th>
                 {{/if}}
               </tr>
               {{#each model.invites as |invite|}}
                 <tr>
                   {{#if invite.user}}
                     <td>
-                      {{#link-to 'user' invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}}
-                      {{#link-to 'user' invite.user}}{{invite.user.username}}{{/link-to}}
+                      {{#link-to "user" invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}}
+                      {{#link-to "user" invite.user}}{{invite.user.username}}{{/link-to}}
                     </td>
                     <td>{{format-date invite.redeemed_at}}</td>
                     {{#if model.can_see_invite_details}}
@@ -74,9 +74,9 @@
                       <td>{{number invite.user.posts_read_count}}</td>
                       <td>{{format-duration invite.user.time_read}}</td>
                       <td>
-                        <span title={{i18n 'user.invited.days_visited'}}>{{html-safe invite.user.days_visited}}</span>
+                        <span title={{i18n "user.invited.days_visited"}}>{{html-safe invite.user.days_visited}}</span>
                           /
-                        <span title={{i18n 'user.invited.account_age_days'}}>{{html-safe invite.user.days_since_created}}</span>
+                        <span title={{i18n "user.invited.account_age_days"}}>{{html-safe invite.user.days_since_created}}</span>
                       </td>
                     {{/if}}
                   {{else}}
@@ -84,17 +84,17 @@
                     <td>{{format-date invite.updated_at}}</td>
                     <td>
                       {{#if invite.expired}}
-                        <div>{{i18n 'user.invited.expired'}}</div>
+                        <div>{{i18n "user.invited.expired"}}</div>
                       {{/if}}
                       {{#if invite.rescinded}}
-                        {{i18n 'user.invited.rescinded'}}
+                        {{i18n "user.invited.rescinded"}}
                       {{else}}
                         {{d-button icon="times" action=(action "rescind") actionParam=invite label="user.invited.rescind"}}
                       {{/if}}
                     </td>
                     <td>
                       {{#if invite.reinvited}}
-                        <div>{{i18n 'user.invited.reinvited'}}</div>
+                        <div>{{i18n "user.invited.reinvited"}}</div>
                       {{else}}
                         {{d-button icon="sync" action=(action "reinvite") actionParam=invite label="user.invited.reinvite"}}
                       {{/if}}
@@ -109,9 +109,9 @@
         {{else}}
           <div class="user-invite-none">
             {{#if canBulkInvite}}
-              {{html-safe (i18n 'user.invited.bulk_invite.none')}}
+              {{html-safe (i18n "user.invited.bulk_invite.none")}}
             {{else}}
-              {{i18n 'user.invited.none'}}
+              {{i18n "user.invited.none"}}
             {{/if}}
           </div>
         {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs b/app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs
index 5c331cac16..68c054b801 100644
--- a/app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs
+++ b/app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs
@@ -4,14 +4,14 @@
   </div>
 </div>
 
-<div class='tag-sort-options'>
+<div class="tag-sort-options">
   {{i18n "tagging.sort_by"}}
-  <span class="tag-sort-count {{if sortedByCount 'active'}}">
+  <span class="tag-sort-count {{if sortedByCount "active"}}">
     <a href {{action "sortByCount"}}>
       {{i18n "tagging.sort_by_count"}}
     </a>
   </span>
-  <span class="tag-sort-name {{if sortedByName 'active'}}">
+  <span class="tag-sort-name {{if sortedByName "active"}}">
     <a href {{action "sortById"}}>
       {{i18n "tagging.sort_by_name"}}
     </a>
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 59334e9ded..9290b1d832 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -1,53 +1,53 @@
-{{plugin-outlet name="above-user-profile" tagName='' args=(hash model=model)}}
-<div class="container {{if viewingSelf 'viewing-self'}}">
+{{plugin-outlet name="above-user-profile" tagName="" args=(hash model=model)}}
+<div class="container {{if viewingSelf "viewing-self"}}">
   {{#d-section class="user-main"}}
-    <section class="{{if collapsedInfo 'collapsed-info'}} about {{if hasProfileBackgroundUrl 'has-background' 'no-background'}}" >
+    <section class="{{if collapsedInfo "collapsed-info"}} about {{if hasProfileBackgroundUrl "has-background" "no-background"}}" >
       {{#unless collapsedInfo}}
         {{#if showStaffCounters}}
-          <div class='staff-counters'>
+          <div class="staff-counters">
             {{#if model.number_of_flags_given}}
-              <div><span class="helpful-flags">{{model.number_of_flags_given}}</span>{{i18n 'user.staff_counters.flags_given'}}</div>
+              <div><span class="helpful-flags">{{model.number_of_flags_given}}</span>{{i18n "user.staff_counters.flags_given"}}</div>
             {{/if}}
             {{#if model.number_of_flagged_posts}}
               <div>
-                {{#link-to 'review' (query-params username=model.username status='all' type='ReviewableFlaggedPost')}}
-                  <span class="flagged-posts">{{model.number_of_flagged_posts}}</span>{{i18n 'user.staff_counters.flagged_posts'}}
+                {{#link-to "review" (query-params username=model.username status="all" type="ReviewableFlaggedPost")}}
+                  <span class="flagged-posts">{{model.number_of_flagged_posts}}</span>{{i18n "user.staff_counters.flagged_posts"}}
                 {{/link-to}}
               </div>
             {{/if}}
             {{#if model.number_of_rejected_posts}}
               <div>
-                {{#link-to 'review' (query-params username=model.username status='rejected' type='ReviewableQueuedPost')}}
-                  <span class="flagged-posts">{{model.number_of_rejected_posts}}</span>{{i18n 'user.staff_counters.rejected_posts'}}
+                {{#link-to "review" (query-params username=model.username status="rejected" type="ReviewableQueuedPost")}}
+                  <span class="flagged-posts">{{model.number_of_rejected_posts}}</span>{{i18n "user.staff_counters.rejected_posts"}}
                 {{/link-to}}
               </div>
             {{/if}}
 
             {{#if model.number_of_deleted_posts}}
               <div>
-                {{#link-to 'user.deletedPosts' model}}
-                  <span class="deleted-posts">{{model.number_of_deleted_posts}}</span>{{i18n 'user.staff_counters.deleted_posts'}}
+                {{#link-to "user.deletedPosts" model}}
+                  <span class="deleted-posts">{{model.number_of_deleted_posts}}</span>{{i18n "user.staff_counters.deleted_posts"}}
                 {{/link-to}}
               </div>
             {{/if}}
             {{#if model.number_of_suspensions}}
               <div>
                 <a href {{action "showSuspensions"}}>
-                  <span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n 'user.staff_counters.suspensions'}}
+                  <span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n "user.staff_counters.suspensions"}}
                 </a>
               </div>
             {{/if}}
             {{#if model.warnings_received_count}}
-              <div><span class="warnings-received">{{model.warnings_received_count}}</span>{{i18n 'user.staff_counters.warnings_received'}}</div>
+              <div><span class="warnings-received">{{model.warnings_received_count}}</span>{{i18n "user.staff_counters.warnings_received"}}</div>
             {{/if}}
           </div>
         {{/if}}
         <div class="user-profile-image" style={{model.profileBackgroundUrl}}></div>
       {{/unless}}
-      <div class='details'>
-        <div class='primary'>
+      <div class="details">
+        <div class="primary">
           {{user-profile-avatar user=model tagName=""}}
-          <section class='controls'>
+          <section class="controls">
             <ul>
               {{#if model.can_send_private_message_to_user}}
                 <li>
@@ -67,7 +67,7 @@
                 </li>
               {{/if}}
               {{#if currentUser.staff}}
-                <li><a href={{model.adminPath}} class="btn btn-default">{{d-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}</a></li>
+                <li><a href={{model.adminPath}} class="btn btn-default">{{d-icon "wrench"}}{{i18n "admin.user.show_admin_profile"}}</a></li>
               {{/if}}
               {{plugin-outlet name="user-profile-controls"
                               tagName=""
@@ -78,11 +78,11 @@
                 <li>
                   {{#if collapsedInfo}}
                     <a {{action "expandProfile"}} href class="btn btn-default">
-                      {{d-icon "angle-double-down"}} {{i18n 'user.expand_profile'}}
+                      {{d-icon "angle-double-down"}} {{i18n "user.expand_profile"}}
                     </a>
                   {{else}}
                     <a {{action "collapseProfile"}} href class="btn btn-default">
-                      {{d-icon "angle-double-up"}} {{i18n 'user.collapse_profile'}}
+                      {{d-icon "angle-double-up"}} {{i18n "user.collapse_profile"}}
                     </a>
                   {{/if}}
                 </li>
@@ -95,7 +95,7 @@
               <h1 class={{if nameFirst "full-name" "username"}}>{{if nameFirst model.name (format-username model.username)}} {{user-status model currentUser=currentUser}}</h1>
               <h2 class={{if nameFirst "username" "full-name"}}>{{#if nameFirst}}{{model.username}}{{else}}{{model.name}}{{/if}}</h2>
               {{#if model.staged}}
-                <h2 class="staged">{{i18n 'user.staged'}}</h2>
+                <h2 class="staged">{{i18n "user.staged"}}</h2>
               {{/if}}
               {{#if model.title}}
                 <h3>{{model.title}}</h3>
@@ -105,7 +105,7 @@
 
             {{#if showFeaturedTopic}}
               <h3 class="featured-topic">
-                <span>{{i18n 'user.featured_topic'}}</span>
+                <span>{{i18n "user.featured_topic"}}</span>
                 {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe (replace-emoji model.featured_topic.fancy_title)}}{{/link-to}}
               </h3>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs
index 809b8a1629..15ac59b652 100644
--- a/app/assets/javascripts/discourse/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/user/activity.hbs
@@ -1,45 +1,45 @@
 {{#d-section pageClass="user-activity" class="user-secondary-navigation" scrollTop="false"}}
-  {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=router._router.currentPath}}
+  {{#mobile-nav class="activity-nav" desktopClass="action-list activity-list nav-stacked" currentPath=router._router.currentPath}}
     <li>
-      {{#link-to 'userActivity.index'}}{{i18n 'user.filters.all'}}{{/link-to}}
+      {{#link-to "userActivity.index"}}{{i18n "user.filters.all"}}{{/link-to}}
     </li>
     <li>
-      {{#link-to 'userActivity.topics'}}{{i18n 'user_action_groups.4'}}{{/link-to}}
+      {{#link-to "userActivity.topics"}}{{i18n "user_action_groups.4"}}{{/link-to}}
     </li>
     <li>
-      {{#link-to 'userActivity.replies'}}{{i18n 'user_action_groups.5'}}{{/link-to}}
+      {{#link-to "userActivity.replies"}}{{i18n "user_action_groups.5"}}{{/link-to}}
     </li>
     {{#if user.showDrafts}}
       <li>
-        {{#link-to 'userActivity.drafts'}}{{i18n 'user_action_groups.15'}}{{/link-to}}
+        {{#link-to "userActivity.drafts"}}{{i18n "user_action_groups.15"}}{{/link-to}}
       </li>
     {{/if}}
     <li>
-      {{#link-to 'userActivity.likesGiven'}}{{i18n 'user_action_groups.1'}}{{/link-to}}
+      {{#link-to "userActivity.likesGiven"}}{{i18n "user_action_groups.1"}}{{/link-to}}
     </li>
     {{#if user.showBookmarks}}
       {{#if bookmarksWithRemindersEnabled}}
         <li>
-          {{#link-to 'userActivity.bookmarksWithReminders'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
+          {{#link-to "userActivity.bookmarksWithReminders"}}{{i18n "user_action_groups.3"}}{{/link-to}}
         </li>
       {{else}}
         <li>
-          {{#link-to 'userActivity.bookmarks'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
+          {{#link-to "userActivity.bookmarks"}}{{i18n "user_action_groups.3"}}{{/link-to}}
         </li>
       {{/if}}
     {{/if}}
     {{plugin-outlet
       name="user-activity-bottom"
-      connectorTagName='li'
+      connectorTagName="li"
       args=(hash model=model)
     }}
   {{/mobile-nav}}
 {{/d-section}}
 {{#if canDownloadPosts}}
-  <section class='user-additional-controls'>
+  <section class="user-additional-controls">
     {{d-button action=(action "exportUserArchive") class="btn-default" label="user.download_archive.button_text" icon="download"}}
   </section>
 {{/if}}
-<section class='user-content'>
+<section class="user-content">
   {{outlet}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
index 75e5b2ce10..fd6a5c5d1a 100644
--- a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
+++ b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
@@ -1,5 +1,5 @@
 {{#if noContent}}
-  <div class='alert alert-info'>{{noResultsHelp}}</div>
+  <div class="alert alert-info">{{noResultsHelp}}</div>
 {{else}}
   {{#conditional-loading-spinner condition=loading}}
     {{#load-more selector=".bookmark-list tr" action=(action "loadMore")}}
diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs
index 64e8d53549..41c19141fd 100644
--- a/app/assets/javascripts/discourse/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/user/messages.hbs
@@ -5,34 +5,34 @@
     {{/if}}
   {{/unless}}
 
-  {{#mobile-nav class='messages-nav' desktopClass='nav-stacked action-list' currentPath=currentPath}}
+  {{#mobile-nav class="messages-nav" desktopClass="nav-stacked action-list" currentPath=currentPath}}
     <li class="noGlyph">
-      {{#link-to 'userPrivateMessages.index' model}}
-        {{i18n 'user.messages.inbox'}}
+      {{#link-to "userPrivateMessages.index" model}}
+        {{i18n "user.messages.inbox"}}
       {{/link-to}}
     </li>
     <li class="noGlyph">
-      {{#link-to 'userPrivateMessages.sent' model}}
-        {{i18n 'user.messages.sent'}}
+      {{#link-to "userPrivateMessages.sent" model}}
+        {{i18n "user.messages.sent"}}
       {{/link-to}}
     </li>
     <li class="noGlyph">
-      {{#link-to 'userPrivateMessages.archive' model}}
-        {{i18n 'user.messages.archive'}}
+      {{#link-to "userPrivateMessages.archive" model}}
+        {{i18n "user.messages.archive"}}
       {{/link-to}}
     </li>
-    {{plugin-outlet name="user-messages-nav" connectorTagName='li' args=(hash model=model)}}
+    {{plugin-outlet name="user-messages-nav" connectorTagName="li" args=(hash model=model)}}
     {{#each model.groups as |group|}}
       {{#if group.has_messages}}
         <li>
-          {{#link-to 'userPrivateMessages.group' group.name}}
+          {{#link-to "userPrivateMessages.group" group.name}}
             {{d-icon "users"}}
             {{capitalize-string group.name}}
           {{/link-to}}
         </li>
-        <li class='archive'>
-          {{#link-to 'userPrivateMessages.groupArchive' group.name}}
-            {{i18n 'user.messages.archive'}}
+        <li class="archive">
+          {{#link-to "userPrivateMessages.groupArchive" group.name}}
+            {{i18n "user.messages.archive"}}
           {{/link-to}}
         </li>
       {{/if}}
@@ -40,13 +40,13 @@
 
     {{#if pmTaggingEnabled}}
       <li class="noGlyph">
-        {{#link-to 'userPrivateMessages.tags' model}}
-          {{i18n 'user.messages.tags'}}
+        {{#link-to "userPrivateMessages.tags" model}}
+          {{i18n "user.messages.tags"}}
         {{/link-to}}
       </li>
       {{#if tagId}}
         <li class="archive">
-          {{#link-to 'userPrivateMessages.tagsShow' tagId}}
+          {{#link-to "userPrivateMessages.tagsShow" tagId}}
             {{tagId}}
           {{/link-to}}
         </li>
@@ -55,7 +55,7 @@
   {{/mobile-nav}}
 {{/d-section}}
 
-<section class='user-content'>
+<section class="user-content">
   <div class="list-actions">
     {{#unless site.mobileView}}
       {{#if showToggleBulkSelect}}
diff --git a/app/assets/javascripts/discourse/templates/user/notifications-index.hbs b/app/assets/javascripts/discourse/templates/user/notifications-index.hbs
index 875153c437..a44a96e8d9 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications-index.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications-index.hbs
@@ -1,9 +1,9 @@
 {{#if model.error}}
   <div class="item error">
     {{#if model.forbidden}}
-      {{i18n 'errors.reasons.forbidden'}}
+      {{i18n "errors.reasons.forbidden"}}
     {{else}}
-      {{i18n 'errors.desc.unknown'}}
+      {{i18n "errors.desc.unknown"}}
     {{/if}}
   </div>
 {{/if}}
@@ -12,5 +12,5 @@
   {{user-notifications-large notifications=model}}
   {{conditional-loading-spinner condition=loading}}
 {{else}}
-  <div class='alert alert-info'>{{i18n 'notifications.empty'}}</div>
+  <div class="alert alert-info">{{i18n "notifications.empty"}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs
index 2db8a54784..5a79a5f4c8 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs
@@ -1,30 +1,30 @@
 {{#d-section pageClass="user-notifications" class="user-secondary-navigation"}}
-  {{#mobile-nav class='notifications-nav' desktopClass='notification-list action-list nav-stacked' currentPath=currentPath}}
+  {{#mobile-nav class="notifications-nav" desktopClass="notification-list action-list nav-stacked" currentPath=currentPath}}
     <li>
-      {{#link-to 'userNotifications.index'}}
-        {{i18n 'user.filters.all'}}
+      {{#link-to "userNotifications.index"}}
+        {{i18n "user.filters.all"}}
       {{/link-to}}
     </li>
     <li>
-      {{#link-to 'userNotifications.responses'}}
-        {{i18n 'user_action_groups.6'}}
+      {{#link-to "userNotifications.responses"}}
+        {{i18n "user_action_groups.6"}}
       {{/link-to}}
     </li>
     <li>
-      {{#link-to 'userNotifications.likesReceived'}}
-        {{i18n 'user_action_groups.2'}}
+      {{#link-to "userNotifications.likesReceived"}}
+        {{i18n "user_action_groups.2"}}
       {{/link-to}}
     </li>
     {{#if siteSettings.enable_mentions}}
       <li>
-        {{#link-to 'userNotifications.mentions'}}
-          {{i18n 'user_action_groups.7'}}
+        {{#link-to "userNotifications.mentions"}}
+          {{i18n "user_action_groups.7"}}
         {{/link-to}}
       </li>
     {{/if}}
     <li>
-      {{#link-to 'userNotifications.edits'}}
-        {{i18n 'user_action_groups.11'}}
+      {{#link-to "userNotifications.edits"}}
+        {{i18n "user_action_groups.11"}}
       {{/link-to}}
     </li>
   {{/mobile-nav}}
@@ -34,17 +34,17 @@
 {{#if model}}
   <section class="user-additional-controls">
     {{d-button
-      title='user.dismiss_notifications_tooltip'
-      class='btn btn-default dismiss-notifications'
+      title="user.dismiss_notifications_tooltip"
+      class="btn btn-default dismiss-notifications"
       action=(action "resetNew")
-      label='user.dismiss_notifications'
-      icon='check'
+      label="user.dismiss_notifications"
+      icon="check"
       disabled=allNotificationsRead
     }}
   </section>
 {{/if}}
 
-<section class='user-content'>
+<section class="user-content">
   {{#load-more class="notification-history user-stream" selector=".user-stream .notification" action=(action "loadMore")}}
     {{outlet}}
     {{conditional-loading-spinner condition=model.loadingMore}}
diff --git a/app/assets/javascripts/discourse/templates/user/profile-hidden.hbs b/app/assets/javascripts/discourse/templates/user/profile-hidden.hbs
index 680e87157d..be9cdd5de7 100644
--- a/app/assets/javascripts/discourse/templates/user/profile-hidden.hbs
+++ b/app/assets/javascripts/discourse/templates/user/profile-hidden.hbs
@@ -1 +1 @@
-<p class='user-profile-hidden'>{{i18n "user.profile_hidden"}}</p>
+<p class="user-profile-hidden">{{i18n "user.profile_hidden"}}</p>
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs
index de791d9420..5ee2929a64 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -1,4 +1,4 @@
 {{#if model.noContent}}
-  <div class='alert alert-info'>{{html-safe model.noContentHelp}}</div>
+  <div class="alert alert-info">{{html-safe model.noContentHelp}}</div>
 {{/if}}
 {{user-stream stream=model}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index d28017469d..ddd89595c5 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -1,7 +1,7 @@
 {{#d-section pageClass="user-summary" tagName=""}}
   <div class="user-content">
-    <div class='top-section stats-section'>
-      <h3 class='stats-title'>{{i18n "user.summary.stats"}}</h3>
+    <div class="top-section stats-section">
+      <h3 class="stats-title">{{i18n "user.summary.stats"}}</h3>
       <ul>
         <li>
           {{user-stat value=model.days_visited label="user.summary.days_visited"}}
@@ -21,24 +21,24 @@
           {{user-stat value=model.posts_read_count label="user.summary.posts_read"}}
         </li>
         <li class="linked-stat">
-          {{#link-to 'userActivity.likesGiven'}}
+          {{#link-to "userActivity.likesGiven"}}
             {{user-stat value=model.likes_given icon="heart" label="user.summary.likes_given"}}
           {{/link-to}}
         </li>
         {{#if model.bookmark_count}}
           <li class="linked-stat">
-            {{#link-to 'userActivity.bookmarks'}}
+            {{#link-to "userActivity.bookmarks"}}
               {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}}
             {{/link-to}}
           </li>
         {{/if}}
         <li class="linked-stat">
-          {{#link-to 'userActivity.topics'}}
+          {{#link-to "userActivity.topics"}}
             {{user-stat value=model.topic_count label="user.summary.topic_count"}}
           {{/link-to}}
         </li>
         <li class="linked-stat">
-          {{#link-to 'userActivity.replies'}}
+          {{#link-to "userActivity.replies"}}
             {{user-stat value=model.post_count label="user.summary.post_count"}}
           {{/link-to}}
         </li>
@@ -49,7 +49,7 @@
       </ul>
     </div>
 
-    <div class='top-section'>
+    <div class="top-section">
       {{#user-summary-section title="top_replies" class="replies-section pull-left"}}
         {{#user-summary-topics-list type="replies" items=model.replies user=user as |reply|}}
           {{user-summary-topic
@@ -71,7 +71,7 @@
       {{/user-summary-section}}
     </div>
 
-    <div class='top-section'>
+    <div class="top-section">
       {{#user-summary-section title="top_links" class="links-section pull-left"}}
         {{#if model.links.length}}
           <ul>
@@ -103,7 +103,7 @@
       {{/user-summary-section}}
     </div>
 
-    <div class='top-section most-liked-section'>
+    <div class="top-section most-liked-section">
       {{#user-summary-section title="most_liked_by" class="summary-user-list liked-by-section pull-left"}}
         {{#user-summary-users-list none="no_likes" users=model.most_liked_by_users as |user|}}
           {{user-summary-user user=user icon="heart" countClass="likes"}}
@@ -118,13 +118,13 @@
     </div>
 
     {{#if model.top_categories.length}}
-      <div class='top-section top-categories-section'>
+      <div class="top-section top-categories-section">
         {{#user-summary-section title="top_categories" class="summary-category-list pull-left"}}
           <table>
             <thead>
               <th class="category-link"></th>
-              <th class='topic-count'>{{i18n "user.summary.topics"}}</th>
-              <th class='reply-count'>{{i18n "user.summary.replies"}}</th>
+              <th class="topic-count">{{i18n "user.summary.topics"}}</th>
+              <th class="reply-count">{{i18n "user.summary.replies"}}</th>
             </thead>
             <tbody>
               {{#each model.top_categories as |category|}}
@@ -132,10 +132,10 @@
                   <td class="category-link">
                     {{category-link category allowUncategorized="true" hideParent=false}}
                   </td>
-                  <td class='topic-count'>
+                  <td class="topic-count">
                     {{user-summary-category-search user=user category=category count=category.topic_count}}
                   </td>
-                  <td class='reply-count'>
+                  <td class="reply-count">
                     {{user-summary-category-search user=user category=category count=category.post_count}}
                   </td>
                 </tr>
@@ -147,8 +147,8 @@
     {{/if}}
 
     {{#if siteSettings.enable_badges}}
-      <div class='top-section badges-section'>
-        <h3 class='stats-title'>{{i18n "user.summary.top_badges"}}</h3>
+      <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}}
         {{else}}
diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs
index 35e1f5d19b..cdb85f24de 100644
--- a/app/assets/javascripts/discourse/templates/users.hbs
+++ b/app/assets/javascripts/discourse/templates/users.hbs
@@ -1,13 +1,13 @@
 {{#d-section pageClass="users"}}
   {{#load-more selector=".directory tbody tr" action=(action "loadMore")}}
     <div class="container">
-      <div class='users-directory directory'>
-        {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
-        <div class='directory-controls'>
-          <div class='period-controls'>
+      <div class="users-directory directory">
+        {{plugin-outlet name="users-top" connectorTagName="div" args=(hash model=model)}}
+        <div class="directory-controls">
+          <div class="period-controls">
             {{period-chooser period=period onChange=(action (mut period)) fullDay=false}}
             {{#if lastUpdatedAt}}
-              <div class='directory-last-updated'>
+              <div class="directory-last-updated">
                 {{i18n "directory.last_updated"}}
                 {{lastUpdatedAt}}
               </div>
@@ -42,7 +42,7 @@
 
             {{conditional-loading-spinner condition=model.loadingMore}}
           {{else}}
-            <div class='clearfix'></div>
+            <div class="clearfix"></div>
             <p>{{i18n "directory.no_results"}}</p>
           {{/if}}
         {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs
index 1eb83f0050..dd729183a8 100644
--- a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs
@@ -1,4 +1,4 @@
 <div class="body">
   {{badge}}
-  {{d-icon 'times'}}
+  {{d-icon "times"}}
 </div>
diff --git a/app/assets/javascripts/wizard/templates/application.hbs b/app/assets/javascripts/wizard/templates/application.hbs
index 0f99c338ba..93ff41a860 100644
--- a/app/assets/javascripts/wizard/templates/application.hbs
+++ b/app/assets/javascripts/wizard/templates/application.hbs
@@ -2,11 +2,11 @@
   {{wizard-canvas}}
 {{/if}}
 
-<div class='wizard-column'>
-  <div class='wizard-column-contents'>
+<div class="wizard-column">
+  <div class="wizard-column-contents">
     {{outlet}}
   </div>
-  <div class='wizard-footer'>
-    <div class='discourse-logo'></div>
+  <div class="wizard-footer">
+    <div class="discourse-logo"></div>
   </div>
 </div>
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs b/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
index 0c4c88a27b..15c822bcf1 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
@@ -1,5 +1,5 @@
-<span class='email'>{{user.email}}</span>
-<span class='role'>{{roleName}}</span>
+<span class="email">{{user.email}}</span>
+<span class="role">{{roleName}}</span>
 
 <button class="wizard-btn small danger remove-user" {{action removeUser user}}>
   {{d-icon "times"}}
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list.hbs b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
index 95739573ee..1c6f780684 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
@@ -8,7 +8,7 @@
 {{/if}}
 
 <div class="new-user">
-  <div class="text-field {{if invalid 'invalid'}}">
+  <div class="text-field {{if invalid "invalid"}}">
     {{input class="invite-email wizard-focusable" value=inviteEmail placeholder="user@example.com" tabindex="9"}}
   </div>
 
diff --git a/app/assets/javascripts/wizard/templates/components/radio-button.hbs b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
index c3a82790be..cdd4756b35 100644
--- a/app/assets/javascripts/wizard/templates/components/radio-button.hbs
+++ b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
@@ -1,17 +1,17 @@
-<div class='radio-area'>
+<div class="radio-area">
   <input type="radio" name={{label}} tabindex="9">
-  <span class='radio-label'>
+  <span class="radio-label">
     {{#if icon}}
       {{d-icon icon}}
     {{/if}}
     {{label}}
   </span>
   {{#if extraLabel}}
-    <span class='extra-label'>
+    <span class="extra-label">
       {{html-safe extraLabel}}
     </span>
   {{/if}}
 </div>
-<div class='radio-description'>
+<div class="radio-description">
   {{description}}
 </div>
diff --git a/app/assets/javascripts/wizard/templates/components/staff-count.hbs b/app/assets/javascripts/wizard/templates/components/staff-count.hbs
index e8f6a1f2f1..d75d67fefe 100644
--- a/app/assets/javascripts/wizard/templates/components/staff-count.hbs
+++ b/app/assets/javascripts/wizard/templates/components/staff-count.hbs
@@ -1,5 +1,5 @@
 {{#if showStaffCount}}
-  <div class='staff-count'>
+  <div class="staff-count">
     {{i18n "wizard.staff_count" count=field.value}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
index 7554473330..a33d24443f 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
@@ -2,7 +2,7 @@
   {{component previewComponent field=field fieldClass=fieldClass wizard=wizard}}
 {{/if}}
 
-<label class="wizard-btn wizard-btn-upload {{if uploading 'disabled'}}">
+<label class="wizard-btn wizard-btn-upload {{if uploading "disabled"}}">
   {{#if uploading}}
     {{i18n "wizard.uploading"}}
   {{else}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
index 7510570b5d..86745dc9fe 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field.hbs
@@ -1,15 +1,15 @@
 <label for={{field.id}}>
-  <span class='label-value'>{{field.label}}</span>
+  <span class="label-value">{{field.label}}</span>
 
   {{#if field.description}}
-    <div class='field-description'>{{html-safe field.description}}</div>
+    <div class="field-description">{{html-safe field.description}}</div>
   {{/if}}
 </label>
 
-<div class='input-area'>
+<div class="input-area">
   {{component inputComponentName field=field step=step fieldClass=fieldClass wizard=wizard}}
 </div>
 
 {{#if field.errorDescription}}
-  <div class='field-error-description'>{{html-safe field.errorDescription}}</div>
+  <div class="field-error-description">{{html-safe field.errorDescription}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
index 67f9b50e5f..1f0b84a857 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -1,6 +1,6 @@
-<div class='wizard-step-contents'>
+<div class="wizard-step-contents">
   {{#if step.title}}
-    <h1 class='wizard-step-title'>{{step.title}}</h1>
+    <h1 class="wizard-step-title">{{step.title}}</h1>
   {{/if}}
 
   <div class={{bannerAndDescriptionClass}}>
@@ -9,7 +9,7 @@
     {{/if}}
 
     {{#if step.description}}
-      <p class='wizard-step-description'>{{html-safe step.description}}</p>
+      <p class="wizard-step-description">{{html-safe step.description}}</p>
     {{/if}}
   </div>
 
@@ -20,39 +20,39 @@
   {{/wizard-step-form}}
 </div>
 
-<div class='wizard-step-footer'>
+<div class="wizard-step-footer">
 
-  <div class='wizard-progress'>
-    <div class='white'></div>
-    <div class='black' style={{barStyle}}></div>
-    <div class='screen'></div>
+  <div class="wizard-progress">
+    <div class="white"></div>
+    <div style={{barStyle}} class="black"></div>
+    <div class="screen"></div>
     <span>{{bound-i18n "wizard.step" current=step.displayIndex total=wizard.totalSteps}}</span>
   </div>
 
-  <div class='wizard-buttons'>
+  <div class="wizard-buttons">
     {{#if showQuitButton}}
-      <a href {{action "quit"}} class='action-link quit' tabindex="11">{{i18n "wizard.quit"}}</a>
+      <a href {{action "quit"}} tabindex="11" class="action-link quit">{{i18n "wizard.quit"}}</a>
     {{/if}}
 
     {{#if showFinishButton}}
-      <button class='wizard-btn finish' {{action "exitEarly"}} disabled={{saving}} tabindex="10">
+      <button {{action "exitEarly"}} disabled={{saving}} tabindex="10" class="wizard-btn finish">
         {{i18n "wizard.finish"}}
       </button>
     {{/if}}
 
     {{#if showBackButton}}
-      <a href {{action "backStep"}} class='action-link back' tabindex="11">{{i18n "wizard.back"}}</a>
+      <a href {{action "backStep"}} tabindex="11" class="action-link back">{{i18n "wizard.back"}}</a>
     {{/if}}
 
     {{#if showNextButton}}
-      <button class='wizard-btn next primary' {{action "nextStep"}} disabled={{saving}} tabindex="10">
+      <button {{action "nextStep"}} disabled={{saving}} tabindex="10" class="wizard-btn next primary">
         {{i18n "wizard.next"}}
         {{d-icon "chevron-right"}}
       </button>
     {{/if}}
 
     {{#if showDoneButton}}
-      <button class='wizard-btn done' {{action "quit"}} disabled={{saving}} tabindex="10">
+      <button {{action "quit"}} disabled={{saving}} tabindex="10" class="wizard-btn done">
         {{i18n "wizard.done"}}
       </button>
     {{/if}}

From fffbb30ba416003797a558abbd560b5f6038116b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 14 Apr 2020 08:21:13 +0200
Subject: [PATCH 0605/1830] DEV: hides double quotes lint changes from git
 blame (#9420)

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 5fac6c2850..15d8c36a8a 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -37,3 +37,6 @@ aabeb17aab4e73de5ef56753ab22ef5d416d2932
 
 # DEV: enforces block-indentation of ember-template-lint rules
 b66b277dc44bcd2122dc21965dab209c30636214
+
+# DEV: enforces double quotes ember-template-lint
+c4644c61d97c823b7dd940ffaf0967a104f4b58c

From 2aaf5cb2b827a06443f87c6415896e65ed8e2e47 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 14 Apr 2020 17:28:51 +1000
Subject: [PATCH 0606/1830] FEATURE: Extend bookmark cutoff time for "Later
 Today" to 5pm (#9419)

* Extend cutoff time for "Later Today" to 5pm

* users can now use the Later Today option up until 5PM
* the time for later today maxes out at 6pm, so any time
  it is used after 3pm it is maxed to 6pm
* round to hour instead of half-hour for Later Today as well

* Rounding time bugfix
---
 .../discourse/controllers/bookmark.js         |  8 ++-
 test/javascripts/controllers/bookmark-test.js | 67 +++++++++++++++++--
 2 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index ebd999874d..88ed8e00f2 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -19,6 +19,7 @@ import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 const GLOBAL_SHORTCUTS_TO_PAUSE = ["c", "r", "l", "d", "t"];
 const START_OF_DAY_HOUR = 8;
 const LATER_TODAY_CUTOFF_HOUR = 17;
+const LATER_TODAY_MAX_HOUR = 18;
 const REMINDER_TYPES = {
   AT_DESKTOP: "at_desktop",
   LATER_TODAY: "later_today",
@@ -172,7 +173,7 @@ export default Controller.extend(ModalFunctionality, {
     let later = this.laterToday();
     return (
       !later.isSame(this.tomorrow(), "date") &&
-      later.hour() <= LATER_TODAY_CUTOFF_HOUR
+      this.now().hour() < LATER_TODAY_CUTOFF_HOUR
     );
   },
 
@@ -340,8 +341,11 @@ export default Controller.extend(ModalFunctionality, {
 
   laterToday() {
     let later = this.now().add(3, "hours");
+    if (later.hour() >= LATER_TODAY_MAX_HOUR) {
+      return later.hour(LATER_TODAY_MAX_HOUR).startOf("hour");
+    }
     return later.minutes() < 30
-      ? later.minutes(30)
+      ? later.startOf("hour")
       : later.add(30, "minutes").startOf("hour");
   },
 
diff --git a/test/javascripts/controllers/bookmark-test.js b/test/javascripts/controllers/bookmark-test.js
index 84d323d382..756e91d672 100644
--- a/test/javascripts/controllers/bookmark-test.js
+++ b/test/javascripts/controllers/bookmark-test.js
@@ -1,10 +1,12 @@
 import { logIn } from "helpers/qunit-helpers";
 import User from "discourse/models/user";
+import KeyboardShortcutInitializer from "discourse/initializers/keyboard-shortcuts";
 let BookmarkController;
 
 moduleFor("controller:bookmark", {
   beforeEach() {
     logIn();
+    KeyboardShortcutInitializer.initialize(Discourse.__container__);
     BookmarkController = this.subject({ currentUser: User.current() });
     BookmarkController.onShow();
   },
@@ -27,8 +29,18 @@ QUnit.test("showLaterToday when later today is tomorrow do not show", function(
   assert.equal(BookmarkController.get("showLaterToday"), false);
 });
 
-QUnit.test("showLaterToday when later today is after 5pm", function(assert) {
-  mockMomentTz("2019-12-11T15:00:00");
+QUnit.test(
+  "showLaterToday when later today is after 5pm but before 6pm",
+  function(assert) {
+    mockMomentTz("2019-12-11T15:00:00");
+    assert.equal(BookmarkController.get("showLaterToday"), true);
+  }
+);
+
+QUnit.test("showLaterToday when now is after the cutoff time (5pm)", function(
+  assert
+) {
+  mockMomentTz("2019-12-11T17:00:00");
   assert.equal(BookmarkController.get("showLaterToday"), false);
 });
 
@@ -112,13 +124,13 @@ QUnit.test(
 );
 
 QUnit.test(
-  "laterToday gets 3 hours from now and if before half-past, it sets the time to half-past",
+  "laterToday gets 3 hours from now and if before half-past, it rounds down",
   function(assert) {
     mockMomentTz("2019-12-11T08:13:00");
 
     assert.equal(
       BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
-      "2019-12-11 11:30:00"
+      "2019-12-11 11:00:00"
     );
   }
 );
@@ -135,6 +147,53 @@ QUnit.test(
   }
 );
 
+QUnit.test(
+  "laterToday is capped to 6pm. later today at 3pm = 6pm, 3:30pm = 6pm, 4pm = 6pm, 4:59pm = 6pm",
+  function(assert) {
+    mockMomentTz("2019-12-11T15:00:00");
+
+    assert.equal(
+      BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
+      "2019-12-11 18:00:00",
+      "3pm should max to 6pm"
+    );
+
+    mockMomentTz("2019-12-11T15:31:00");
+
+    assert.equal(
+      BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
+      "2019-12-11 18:00:00",
+      "3:30pm should max to 6pm"
+    );
+
+    mockMomentTz("2019-12-11T16:00:00");
+
+    assert.equal(
+      BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
+      "2019-12-11 18:00:00",
+      "4pm should max to 6pm"
+    );
+
+    mockMomentTz("2019-12-11T16:59:00");
+
+    assert.equal(
+      BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
+      "2019-12-11 18:00:00",
+      "4:59pm should max to 6pm"
+    );
+  }
+);
+
+QUnit.test("showLaterToday returns false if >= 5PM", function(assert) {
+  mockMomentTz("2019-12-11T17:00:01");
+  assert.equal(BookmarkController.showLaterToday, false);
+});
+
+QUnit.test("showLaterToday returns false if >= 5PM", function(assert) {
+  mockMomentTz("2019-12-11T17:00:01");
+  assert.equal(BookmarkController.showLaterToday, false);
+});
+
 QUnit.test(
   "reminderAt - custom - defaults to 8:00am if the time is not selected",
   function(assert) {

From f07c4a781c6c054e5d2dc05ab6c0fd0b6cbb0645 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Tue, 14 Apr 2020 09:17:00 -0500
Subject: [PATCH 0607/1830] DEV: Add options to theme install rake task - more
 options (#9394)

---
 app/services/themes_install_task.rb |  44 ++++---
 lib/tasks/themes.rake               |  43 ++++---
 spec/services/themes_spec.rb        | 171 +++++++++++++++++++---------
 3 files changed, 171 insertions(+), 87 deletions(-)

diff --git a/app/services/themes_install_task.rb b/app/services/themes_install_task.rb
index 8466e7b8cb..36ece33dea 100644
--- a/app/services/themes_install_task.rb
+++ b/app/services/themes_install_task.rb
@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
 class ThemesInstallTask
-  def self.install(yml)
-    counts = { installed: 0, updated: 0, skipped: 0, errors: 0 }
+  def self.install(themes)
+    counts = { installed: 0, updated: 0, errors: 0 }
     log = []
-    themes = YAML::load(yml)
-    themes.each do |theme|
-      name = theme[0]
-      val = theme[1]
+    themes.each do |name, val|
       installer = new(val)
+      next if installer.url.nil?
 
       if installer.theme_exists?
-        log << "#{name}: is already installed"
-        counts[:skipped] += 1
+        installer.update
+        log << "#{name}: is already installed. Updating from remote."
+        counts[:updated] += 1
       else
         begin
           installer.install
@@ -32,7 +31,8 @@ class ThemesInstallTask
 
   def initialize(url_or_options = nil)
     if url_or_options.is_a?(Hash)
-      @url = url_or_options.fetch("url")
+      url_or_options.deep_symbolize_keys!
+      @url = url_or_options.fetch(:url, nil)
       @options = url_or_options
     else
       @url = url_or_options
@@ -41,14 +41,28 @@ class ThemesInstallTask
   end
 
   def theme_exists?
-    RemoteTheme
-      .where(remote_url: url)
-      .where(branch: options.fetch("branch", nil))
-      .exists?
+    @remote_theme = RemoteTheme.find_by(remote_url: @url, branch: @options.fetch(:branch, nil))
+    @theme = @remote_theme&.theme
+    @theme.present?
   end
 
   def install
-    theme = RemoteTheme.import_theme(url, Discourse.system_user, private_key: options["private_key"], branch: options["branch"])
-    theme.set_default! if options.fetch("default", false)
+    @theme = RemoteTheme.import_theme(@url, Discourse.system_user, private_key: @options[:private_key], branch: @options[:branch])
+    @theme.set_default! if @options.fetch(:default, false)
+    add_component_to_all_themes
+  end
+
+  def update
+    @remote_theme.update_from_remote
+    add_component_to_all_themes
+  end
+
+  def add_component_to_all_themes
+    return if (!@options.fetch(:add_to_all_themes, false) || !@theme.component)
+
+    Theme.where(component: false).each do |parent_theme|
+      next if ChildTheme.where(parent_theme_id: parent_theme.id, child_theme_id: @theme.id).exists?
+      parent_theme.add_relative_theme!(:child, @theme)
+    end
   end
 end
diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake
index bce21369d2..8a90196faf 100644
--- a/lib/tasks/themes.rake
+++ b/lib/tasks/themes.rake
@@ -2,31 +2,41 @@
 
 require 'yaml'
 
-# == YAML file format
 #
 # 2 different formats are accepted:
 #
+# == JSON format
+#
+# bin/rake themes:install -- '--{"discourse-something": "https://github.com/discourse/discourse-something"}'
+# OR
+# bin/rake themes:install -- '--{"discourse-something": {"url": "https://github.com/discourse/discourse-something", default: true}}'
+#
+# == YAML file formats
+#
 # theme_name: https://github.com/example/theme.git
-#
+# OR
 # theme_name:
-#   url: https://github.com/example/theme.git
-#   branch: abc
-#   private_key: ...
-#   default: true
+#   url: https://github.com/example/theme_name.git
+#   branch: "master"
+#   private_key: ""
+#   default: false
+#   add_to_all_themes: false  # only for components - install on every theme
 #
-# In the second form, only the url is required.
+# In the first form, only the url is required.
 #
 desc "Install themes & theme components"
-task "themes:install" => :environment do
-  yml = (STDIN.tty?) ? '' : STDIN.read
-  if yml == ''
-    puts
-    puts "Please specify a themes yml file"
-    puts "Example: rake themes:install < themes.yml"
-    exit 1
-  end
+task "themes:install" => :environment do |task, args|
+  theme_args = (STDIN.tty?) ? '' : STDIN.read
+  use_json = theme_args == ''
 
-  log, counts = ThemesInstallTask.install(yml)
+  theme_args = begin
+                 use_json ? JSON.parse(ARGV.last.gsub('--', '')) : YAML::load(theme_args)
+               rescue
+                 puts use_json ? "Invalid JSON input. \n#{ARGV.last}" : "Invalid YML: \n#{theme_args}"
+                 exit 1
+               end
+
+  log, counts = ThemesInstallTask.install(theme_args)
 
   puts log
 
@@ -34,7 +44,6 @@ task "themes:install" => :environment do
   puts "Results:"
   puts " Installed: #{counts[:installed]}"
   puts " Updated:   #{counts[:updated]}"
-  puts " Skipped:   #{counts[:skipped]}"
   puts " Errors:    #{counts[:errors]}"
 
   if counts[:errors] > 0
diff --git a/spec/services/themes_spec.rb b/spec/services/themes_spec.rb
index cabf942df1..2410a5e04c 100644
--- a/spec/services/themes_spec.rb
+++ b/spec/services/themes_spec.rb
@@ -8,75 +8,136 @@ describe ThemesInstallTask do
     Discourse::Application.load_tasks
   end
 
-  let(:github_repo) { 'https://github.com/example/theme.git' }
-  let(:branch) { 'master' }
-
   describe '.new' do
-    context 'with url' do
-      subject { described_class.new(github_repo) }
-
-      it 'configures the url' do
-        expect(subject.url).to eq github_repo
+    def setup_git_repo(files)
+      dir = Dir.tmpdir
+      repo_dir = "#{dir}/#{SecureRandom.hex}"
+      `mkdir #{repo_dir}`
+      `cd #{repo_dir} && git init . `
+      `cd #{repo_dir} && git config user.email 'someone@cool.com'`
+      `cd #{repo_dir} && git config user.name 'The Cool One'`
+      `cd #{repo_dir} && git config commit.gpgsign 'false'`
+      files.each do |name, data|
+        FileUtils.mkdir_p(Pathname.new("#{repo_dir}/#{name}").dirname)
+        File.write("#{repo_dir}/#{name}", data)
+        `cd #{repo_dir} && git add #{name}`
       end
+      `cd #{repo_dir} && git commit -am 'first commit'`
+      repo_dir
+    end
 
-      it 'initializes without options' do
-        expect(subject.options).to eq({})
+    THEME_NAME = "awesome theme"
+
+    def about_json(love_color: "FAFAFA", tertiary_low_color: "FFFFFF", color_scheme_name: "Amazing", about_url: "https://www.site.com/about", component: false)
+      <<~JSON
+        {
+          "name": "#{THEME_NAME}",
+          "about_url": "#{about_url}",
+          "license_url": "https://www.site.com/license",
+          "theme_version": "1.0",
+          "minimum_discourse_version": "1.0.0",
+          "assets": {
+            "font": "assets/font.woff2"
+          },
+          "component": "#{component}",
+          "color_schemes": {
+            "#{color_scheme_name}": {
+              "love": "#{love_color}",
+              "tertiary-low": "#{tertiary_low_color}"
+            }
+          },
+          "modifiers": {
+            "serialize_topic_excerpts": true
+          }
+        }
+      JSON
+    end
+
+    let :scss_data do
+      "@font-face { font-family: magic; src: url($font)}; body {color: $color; content: $name;}"
+    end
+
+    let :theme_repo do
+      setup_git_repo(
+        "about.json" => about_json,
+        "desktop/desktop.scss" => scss_data,
+        "scss/oldpath.scss" => ".class2{color:blue}",
+        "stylesheets/file.scss" => ".class1{color:red}",
+        "stylesheets/empty.scss" => "",
+        "javascripts/discourse/controllers/test.js.es6" => "console.log('test');",
+        "common/header.html" => "I AM HEADER",
+        "common/random.html" => "I AM SILLY",
+        "common/embedded.scss" => "EMBED",
+        "assets/font.woff2" => "FAKE FONT",
+        "settings.yaml" => "boolean_setting: true",
+        "locales/en.yml" => "sometranslations"
+      )
+    end
+
+    let :component_repo do
+      setup_git_repo(
+        "about.json" => about_json(component: true),
+        "desktop/desktop.scss" => scss_data,
+        "scss/oldpath.scss" => ".class2{color:blue}",
+        "stylesheets/file.scss" => ".class1{color:red}",
+        "stylesheets/empty.scss" => "",
+        "javascripts/discourse/controllers/test.js.es6" => "console.log('test');",
+        "common/header.html" => "I AM HEADER",
+        "common/random.html" => "I AM SILLY",
+        "common/embedded.scss" => "EMBED",
+        "assets/font.woff2" => "FAKE FONT",
+        "settings.yaml" => "boolean_setting: true",
+        "locales/en.yml" => "sometranslations"
+      )
+    end
+
+    after do
+      `rm -fr #{theme_repo}`
+      `rm -fr #{component_repo}`
+    end
+
+    it 'gracefully fails' do
+      ThemesInstallTask.install("nothing": "fail!")
+      expect(Theme.where(name: "fail!").exists?).to eq(false)
+    end
+
+    describe "no options" do
+      it 'installs a theme' do
+        ThemesInstallTask.install("some_theme": theme_repo)
+        expect(Theme.where(name: THEME_NAME).exists?).to eq(true)
       end
     end
 
-    context 'with options' do
-      subject { described_class.new(options) }
-      let(:options) { { 'url' => github_repo, 'branch' => branch } }
-
-      it 'configures the url' do
-        expect(subject.url).to eq github_repo
+    describe "with options" do
+      it 'installs a theme from only a url' do
+        ThemesInstallTask.install({ "some_theme": { "url": theme_repo } })
+        expect(Theme.where(name: THEME_NAME).exists?).to eq(true)
       end
 
-      it 'initializes options' do
-        expect(subject.options).to eq("url" => github_repo, "branch" => branch)
-      end
-    end
-  end
-
-  describe '#theme_exists?' do
-    let(:theme) { Fabricate(:theme) }
-    subject { described_class.new(options) }
-
-    context 'without branch' do
-      let(:options) { github_repo }
-
-      it 'returns true when a branchless theme exists' do
-        theme.create_remote_theme(remote_url: github_repo)
-        expect(subject.theme_exists?).to be true
+      it 'does not set the theme to default if the key/value is not present' do
+        ThemesInstallTask.install({ "some_theme": { "url": theme_repo } })
+        theme = Theme.find_by(name: THEME_NAME)
+        expect(theme.default?).to eq(false)
       end
 
-      it 'returns false when the url exists but with a branch' do
-        theme.create_remote_theme(remote_url: github_repo, branch: branch)
-        expect(subject.theme_exists?).to be false
+      it 'sets the theme to default if the key/value is true' do
+        ThemesInstallTask.install({ "some_theme": { "url": theme_repo, default: true } })
+        theme = Theme.find_by(name: THEME_NAME)
+        expect(theme.default?).to eq(true)
       end
 
-      it 'returns false when it doesnt exist' do
-        theme.create_remote_theme(remote_url: 'https://github.com/example/different_theme.git')
-        expect(subject.theme_exists?).to be false
-      end
-    end
-
-    context 'with branch' do
-      let(:options) { { 'url' => github_repo, 'branch' => branch } }
-
-      it 'returns false when a branchless theme exists' do
-        theme.create_remote_theme(remote_url: github_repo)
-        expect(subject.theme_exists?).to be false
+      it 'installs theme components, but does not add them to themes' do
+        ThemesInstallTask.install({ "some_theme": { "url": component_repo } })
+        theme = Theme.find_by(name: THEME_NAME)
+        expect(theme.component).to eq(true)
       end
 
-      it 'returns true when the url exists with a branch' do
-        theme.create_remote_theme(remote_url: github_repo, branch: branch)
-        expect(subject.theme_exists?).to be true
-      end
-
-      it 'returns false when it doesnt exist' do
-        theme.create_remote_theme(remote_url: 'https://github.com/example/different_theme.git')
-        expect(subject.theme_exists?).to be false
+      it 'adds component to all themes if "add_to_all_themes" is true' do
+        ThemesInstallTask.install({ "some_theme": { "url": component_repo, add_to_all_themes: true } })
+        theme = Theme.find_by(name: THEME_NAME)
+        Theme.where(component: false).each do |parent_theme|
+          expect(ChildTheme.find_by(parent_theme_id: parent_theme.id, child_theme_id: theme.id).nil?).to eq(false)
+        end
       end
     end
   end

From d9db0e6691d149b98548c42746986e95f72409a4 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 14 Apr 2020 16:43:57 +0200
Subject: [PATCH 0608/1830] FIX: allows custom groups updates to be reflected
 without recompilation (#9421)

---
 .../discourse/components/emoji-picker.js      | 52 +++++------
 .../templates/components/emoji-picker.hbs     |  2 -
 .../templates/components/emoji-picker.hbs.erb | 88 +++++++++++++++++++
 .../discourse/templates/emoji-picker.hbr.erb  | 81 -----------------
 app/assets/stylesheets/common/base/emoji.scss |  7 ++
 .../acceptance/emoji-picker-test.js           |  4 +-
 6 files changed, 121 insertions(+), 113 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
 create mode 100644 app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb
 delete mode 100644 app/assets/javascripts/discourse/templates/emoji-picker.hbr.erb

diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js b/app/assets/javascripts/discourse/components/emoji-picker.js
index ef56c4182a..88b7599324 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js
@@ -1,4 +1,5 @@
 import { inject as service } from "@ember/service";
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { on, observes } from "discourse-common/utils/decorators";
 import { findRawTemplate } from "discourse/lib/raw-templates";
@@ -16,23 +17,16 @@ const { run } = Ember;
 const PER_ROW = 11;
 function customEmojis() {
   const list = extendedEmojiList();
-  const emojis = Object.keys(list)
-    .map(code => {
-      const { group } = list[code];
-      return {
-        code,
-        src: emojiUrlFor(code),
-        group,
-        key: `emoji_picker.${group || "default"}`
-      };
-    })
-    .reduce((acc, curr) => {
-      if (!acc[curr.group]) acc[curr.group] = [];
-      acc[curr.group].push(curr);
-      return acc;
-    }, {});
-
-  return Object.values(emojis);
+  const groups = [];
+  Object.keys(list).forEach(code => {
+    const emoji = list[code];
+    groups[emoji.group] = groups[emoji.group] || [];
+    groups[emoji.group].push({
+      code,
+      src: emojiUrlFor(code)
+    });
+  });
+  return groups;
 }
 
 export default Component.extend({
@@ -42,9 +36,8 @@ export default Component.extend({
   close() {
     this._unbindEvents();
 
-    this.$picker
-      .css({ width: "", left: "", bottom: "", display: "none" })
-      .empty();
+    this.$picker &&
+      this.$picker.css({ width: "", left: "", bottom: "", display: "none" });
 
     this.$modal.removeClass("fadeIn");
 
@@ -52,11 +45,6 @@ export default Component.extend({
   },
 
   show() {
-    const template = findRawTemplate("emoji-picker")({
-      customEmojis: customEmojis()
-    });
-    this.$picker.html(template);
-
     this.$filter = this.$picker.find(".filter");
     this.$results = this.$picker.find(".results");
     this.$list = this.$picker.find(".list");
@@ -84,6 +72,7 @@ export default Component.extend({
 
   @on("init")
   _setInitialValues() {
+    this.set("customEmojis", customEmojis());
     this._checkTimeout = null;
     this.scrollPosition = 0;
     this.$visibleSections = [];
@@ -100,14 +89,21 @@ export default Component.extend({
 
   @on("didInsertElement")
   _setup() {
-    this.$picker = $(this.element.querySelector(".emoji-picker"));
-    this.$modal = $(this.element.querySelector(".emoji-picker-modal"));
     this.appEvents.on("emoji-picker:close", this, "_closeEmojiPicker");
   },
 
   @on("didUpdateAttrs")
   _setState() {
-    this.active ? this.show() : this.close();
+    schedule("afterRender", () => {
+      if (!this.element) {
+        return;
+      }
+
+      this.$picker = $(this.element.querySelector(".emoji-picker"));
+      this.$modal = $(this.element.querySelector(".emoji-picker-modal"));
+
+      this.active ? this.show() : this.close();
+    });
   },
 
   @observes("filter")
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
deleted file mode 100644
index 7f7490eef7..0000000000
--- a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-<div class="emoji-picker"></div>
-<div class="emoji-picker-modal"></div>
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb
new file mode 100644
index 0000000000..f3504d33f0
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb
@@ -0,0 +1,88 @@
+<div class="emoji-picker">
+  {{#if active}}
+    <div class='categories-column'>
+      <div class='category-icon'>
+        <button type="button" class="emoji" tabindex="-1" title="{{i18n 'emoji_picker.recent'}}" data-section="recent" data-tabicon="star"></button>
+      </div>
+
+      <% JSON.parse(File.read("lib/emoji/groups.json")).each.with_index do |group, group_index| %>
+        <div class='category-icon'>
+        <button type="button" class="emoji" tabindex="-1" data-tabicon="<%= group["tabicon"] %>" data-section="<%= group["name"] %>" title="{{i18n '<%= "emoji_picker.#{group["name"]}" %>'}}"></button>
+        </div>
+      <% end %>
+
+      {{#each-in customEmojis as |group emojis|}}
+        <div class='category-icon'>
+          <button data-tabicon={{emojis.firstObject.code}} type="button" class="emoji" tabindex="-1" data-section="custom-{{group}}" title="{{i18n (concat 'emoji_picker.' group)}}"></button>
+        </div>
+      {{/each-in}}
+    </div>
+
+    <div class='main-column'>
+      <div class='filter'>
+        {{d-icon 'search'}}
+        <input type='text' name="filter" placeholder="{{i18n 'emoji_picker.filter_placeholder'}}" autocomplete="discourse"/>
+        <button class='clear-filter'>
+          {{d-icon 'times'}}
+        </button>
+      </div>
+
+      <div class='results'></div>
+
+      <div class='list'>
+        <div class='section' data-section='recent'>
+          <div class='section-header'>
+            <span class="title">{{i18n 'emoji_picker.recent'}}</span>
+            <a href='#' class='clear-recent'>{{d-icon "trash-alt"}}</a>
+          </div>
+          <div class='section-group'></div>
+        </div>
+
+        <% JSON.parse(File.read("lib/emoji/groups.json")).each.with_index do |group, group_index| %>
+          <div class='section' data-section='<%= group["name"] %>'>
+            <div class='section-header'>
+              <span class="title">{{i18n 'emoji_picker.<%= group["name"] %>'}}</span>
+            </div>
+            <div class='section-group'>
+              <% group["icons"].each  do |icon| %>
+                <button type="button" class="emoji <%= "diversity" if icon["diversity"] %>" tabindex="-1" title="<%= icon['name']%>"></button>
+              <% end %>
+            </div>
+          </div>
+        <% end %>
+
+        {{#each-in customEmojis as |group emojis|}}
+          <div class='section' data-section='custom-{{group}}'>
+            <div class='section-header'>
+              <span class="title">
+                {{i18n (concat 'emoji_picker.' group)}}
+              </span>
+            </div>
+            {{#if emojis.length}}
+              <div class='section-group'>
+                {{#each emojis as |emoji|}}
+                  <button type="button" class="emoji" tabindex="-1" title=":{{emoji.code}}:">
+                    <img loading="lazy" class="emoji" src="{{emoji.src}}">
+                  </button>
+                {{/each}}
+              </div>
+            {{/if}}
+          </div>
+        {{/each-in}}
+      </div>
+
+      <div class='footer'>
+        <div class='info'></div>
+        <div class='diversity-picker'>
+          <% ['default', 'light', 'medium-light', 'medium', 'medium-dark', 'dark'].each.with_index do |diversity, index| %>
+            <a href='#' title="{{i18n 'emoji_picker.<%= diversity.gsub('-', '_') %>_tone'}}" class='diversity-scale <%= diversity %>' data-level="<%= index + 1 %>">
+              {{d-icon "check"}}
+            </a>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  {{/if}}
+</div>
+
+<div class="emoji-picker-modal"></div>
diff --git a/app/assets/javascripts/discourse/templates/emoji-picker.hbr.erb b/app/assets/javascripts/discourse/templates/emoji-picker.hbr.erb
deleted file mode 100644
index 5a33352165..0000000000
--- a/app/assets/javascripts/discourse/templates/emoji-picker.hbr.erb
+++ /dev/null
@@ -1,81 +0,0 @@
-<div class='categories-column'>
-  <div class='category-icon'>
-    <button type="button" class="emoji" tabindex="-1" title="{{i18n 'emoji_picker.recent'}}" data-section="recent" data-tabicon="star"></button>
-  </div>
-
-  <% JSON.parse(File.read("lib/emoji/groups.json")).each.with_index do |group, group_index| %>
-    <div class='category-icon'>
-    <button type="button" class="emoji" tabindex="-1" data-tabicon="<%= group["tabicon"] %>" data-section="<%= group["name"] %>" title="{{i18n '<%= "emoji_picker.#{group["name"]}" %>'}}"></button>
-    </div>
-  <% end %>
-
-  <% Emoji.custom.group_by { |emoji| emoji.group }.each do |group, emojis| %>
-    <% if emojis.present? %>
-      <div class='category-icon'>
-        <button data-tabicon="<%= emojis.first.name %>" type="button" class="emoji" tabindex="-1" data-section="custom-<%= group %>" title="{{i18n 'emoji_picker.<%= group %>'}}"></button>
-      </div>
-    <% end %>
-  <% end %>
-</div>
-
-<div class='main-column'>
-  <div class='filter'>
-    {{d-icon 'search'}}
-    <input type='text' name="filter" placeholder="{{i18n 'emoji_picker.filter_placeholder'}}" autocomplete="discourse"/>
-    <button class='clear-filter'>
-      {{d-icon 'times'}}
-    </button>
-  </div>
-
-  <div class='results'></div>
-
-  <div class='list'>
-    <div class='section' data-section='recent'>
-      <div class='section-header'>
-        <span class="title">{{i18n 'emoji_picker.recent'}}</span>
-        <a href='#' class='clear-recent'>{{d-icon "trash-alt"}}</a>
-      </div>
-      <div class='section-group'></div>
-    </div>
-
-    <% JSON.parse(File.read("lib/emoji/groups.json")).each.with_index do |group, group_index| %>
-      <div class='section' data-section='<%= group["name"] %>'>
-        <div class='section-header'>
-          <span class="title">{{i18n 'emoji_picker.<%= group["name"] %>'}}</span>
-        </div>
-        <div class='section-group'>
-          <% group["icons"].each  do |icon| %>
-            <button type="button" class="emoji <%= "diversity" if icon["diversity"] %>" tabindex="-1" title="<%= icon['name']%>"></button>
-          <% end %>
-        </div>
-      </div>
-    <% end %>
-
-    {{#each customEmojis as |emojis|}}
-      {{#if emojis.length}}
-        <div class='section' data-section='custom-{{emojis.firstObject.group}}'>
-          <div class='section-header'>
-            <span class="title">
-              {{i18n emojis.firstObject.key}}
-            </span>
-          </div>
-          <div class='section-group'>
-            {{#each emojis as |emoji|}}
-              <button style="background-url: url("{{emoji.src}}")" type="button" class="emoji" tabindex="-1" title="{{emoji.code}}"></button>
-            {{/each}}
-          </div>
-        </div>
-      {{/if}}
-    {{/each}}
-  </div>
-  <div class='footer'>
-    <div class='info'></div>
-    <div class='diversity-picker'>
-      <% ['default', 'light', 'medium-light', 'medium', 'medium-dark', 'dark'].each.with_index do |diversity, index| %>
-        <a href='#' title="{{i18n 'emoji_picker.<%= diversity.gsub('-', '_') %>_tone'}}" class='diversity-scale <%= diversity %>' data-level="<%= index + 1 %>">
-          {{d-icon "check"}}
-        </a>
-      <% end %>
-    </div>
-  </div>
-</div>
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index b4c2098104..8517597c37 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -35,6 +35,13 @@ sup img.emoji {
   color: $primary;
   background-color: $secondary;
   border: 1px solid $primary-low;
+
+  img.emoji {
+    // custom emojis might import images of various sizes
+    // we don't want the picker to be difformed
+    width: 20px !important;
+    height: 20px !important;
+  }
 }
 
 .emoji-picker .categories-column {
diff --git a/test/javascripts/acceptance/emoji-picker-test.js b/test/javascripts/acceptance/emoji-picker-test.js
index fac37414a6..6a4922ed5c 100644
--- a/test/javascripts/acceptance/emoji-picker-test.js
+++ b/test/javascripts/acceptance/emoji-picker-test.js
@@ -22,7 +22,7 @@ QUnit.test("emoji picker can be opened/closed", async assert => {
     find(".emoji-picker")
       .html()
       .trim(),
-    "",
+    "<!---->",
     "it opens the picker"
   );
 
@@ -31,7 +31,7 @@ QUnit.test("emoji picker can be opened/closed", async assert => {
     find(".emoji-picker")
       .html()
       .trim(),
-    "",
+    "<!---->",
     "it closes the picker"
   );
 });

From e3590d4eada9f15c72b3f789370d0b4e2021f54e Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Tue, 14 Apr 2020 06:32:24 -1000
Subject: [PATCH 0609/1830] FEATURE: add user_session_refreshed trigger (#9412)

Trigger an event for plugins to consume when a user session is refreshed.

This allows external auth to be notified about account activity, and be
able to take action such as use oauth refresh tokens to keep oauth
tokens valid.
---
 lib/auth/default_current_user_provider.rb     |  1 +
 .../default_current_user_provider_spec.rb     | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index fc7f850026..acd9381771 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -148,6 +148,7 @@ class Auth::DefaultCurrentUserProvider
                                client_ip: @request.ip,
                                path: @env['REQUEST_PATH'])
           cookies[TOKEN_COOKIE] = cookie_hash(@user_token.unhashed_auth_token)
+          DiscourseEvent.trigger(:user_session_refreshed, user)
         end
       end
     end
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index 621ece61e0..ab4fa86369 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -595,6 +595,43 @@ describe Auth::DefaultCurrentUserProvider do
 
   end
 
+  context "events" do
+    before do
+      @refreshes = 0
+
+      @increase_refreshes = -> (user) { @refreshes += 1 }
+      DiscourseEvent.on(:user_session_refreshed, &@increase_refreshes)
+    end
+
+    after do
+      DiscourseEvent.off(:user_session_refreshed, &@increase_refreshes)
+    end
+
+    it "fires event when updating last seen" do
+      user = Fabricate(:user)
+      @provider = provider('/')
+      cookies = {}
+      @provider.log_on_user(user, {}, cookies)
+      unhashed_token = cookies["_t"][:value]
+      freeze_time 20.minutes.from_now
+      provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}")
+      provider2.refresh_session(user, {}, {})
+      expect(@refreshes).to eq(1)
+    end
+
+    it "does not fire an event when last seen does not update" do
+      user = Fabricate(:user)
+      @provider = provider('/')
+      cookies = {}
+      @provider.log_on_user(user, {}, cookies)
+      unhashed_token = cookies["_t"][:value]
+      freeze_time 2.minutes.from_now
+      provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}")
+      provider2.refresh_session(user, {}, {})
+      expect(@refreshes).to eq(0)
+    end
+  end
+
   context "rate limiting" do
 
     before do

From 6023ea197909c42f4fb4c21ff1dcda3be90a161f Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 14 Apr 2020 18:45:40 +0200
Subject: [PATCH 0610/1830] DEV: pass widget back when cleaning up stream
 (#9422)

---
 app/assets/javascripts/discourse/components/mount-widget.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/mount-widget.js b/app/assets/javascripts/discourse/components/mount-widget.js
index dc1eb2e166..3701b32d00 100644
--- a/app/assets/javascripts/discourse/components/mount-widget.js
+++ b/app/assets/javascripts/discourse/components/mount-widget.js
@@ -58,7 +58,7 @@ export default Component.extend({
   willClearRender() {
     const callbacks = _cleanCallbacks[this.widget];
     if (callbacks) {
-      callbacks.forEach(cb => cb());
+      callbacks.forEach(cb => cb(this._tree));
     }
 
     this._connected.forEach(v => v.destroy());

From 40531fc85e30aa2236c1acc2f136b7362646eac8 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Tue, 14 Apr 2020 14:20:21 -0500
Subject: [PATCH 0611/1830] DEV: themes_install_task find existing themes
 consistently (#9424)

---
 app/services/themes_install_task.rb |  9 ++++++++-
 spec/services/themes_spec.rb        | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/services/themes_install_task.rb b/app/services/themes_install_task.rb
index 36ece33dea..9999de7ab8 100644
--- a/app/services/themes_install_task.rb
+++ b/app/services/themes_install_task.rb
@@ -40,8 +40,15 @@ class ThemesInstallTask
     end
   end
 
+  def repo_name
+    @url.gsub(Regexp.union('git@github.com:', 'https://github.com/', '.git'), '')
+  end
+
   def theme_exists?
-    @remote_theme = RemoteTheme.find_by(remote_url: @url, branch: @options.fetch(:branch, nil))
+    @remote_theme = RemoteTheme
+      .where("remote_url like ?", "%#{repo_name}%")
+      .where(branch: @options.fetch(:branch, nil))
+      .first
     @theme = @remote_theme&.theme
     @theme.present?
   end
diff --git a/spec/services/themes_spec.rb b/spec/services/themes_spec.rb
index 2410a5e04c..bc8e8a5952 100644
--- a/spec/services/themes_spec.rb
+++ b/spec/services/themes_spec.rb
@@ -141,4 +141,23 @@ describe ThemesInstallTask do
       end
     end
   end
+  describe '#theme_exists?' do
+    it 'can use https or ssh and find the same repo' do
+      remote_theme = RemoteTheme.create!(
+        remote_url: "https://github.com/org/testtheme.git",
+        local_version: "a2ec030e551fc8d8579790e1954876fe769fe40a",
+        remote_version: "21122230dbfed804067849393c3332083ddd0c07",
+        commits_behind: 2
+      )
+      Fabricate(:theme, remote_theme: remote_theme)
+
+      # https
+      installer = ThemesInstallTask.new({ "url": "https://github.com/org/testtheme" })
+      expect(installer.theme_exists?).to eq(true)
+
+      # ssh
+      installer = ThemesInstallTask.new({ "url": "git@github.com:org/testtheme.git" })
+      expect(installer.theme_exists?).to eq(true)
+    end
+  end
 end

From fec68d3d25bfc80d084af52e17882ad886fd5cd0 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Tue, 14 Apr 2020 14:30:42 -0600
Subject: [PATCH 0612/1830] DEV: Confirm email when creating users via the API

This commit is for a frequently requested task on meta so that only 1
API call is needed instead of 3!

In order to create a user via the api and not have them receive an
activation email you can pass in the `active=true` flag. This prevents
sending an email, but it is only half of the solution and puts the db in
a weird state where it has an active user with an unconfirmed email.

This commit fixes that and ensures that if the `active=true` flag is set
the user's email is also marked as confirmed.

This change only applies to admins using the API.

Related topics on meta:

 - https://meta.discourse.org/t/-/68663
 - https://meta.discourse.org/t/-/33133
 - https://meta.discourse.org/t/-/36133
---
 app/controllers/users_controller.rb    | 6 ++++--
 spec/requests/users_controller_spec.rb | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b3acc1f74c..29d7bc9963 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -507,8 +507,10 @@ class UsersController < ApplicationController
       session["user_created_message"] = activation.message
       session[SessionController::ACTIVATE_USER_KEY] = user.id
 
-      # If the user was created as active, they might need to be approved
-      user.create_reviewable if user.active?
+      # If the user was created as active this will
+      # ensure their email is confirmed and
+      # add them to the review queue if they need to be approved
+      user.activate if user.active?
 
       render json: {
         success: true,
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index d35e8f9727..507c28f910 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -768,6 +768,7 @@ describe UsersController do
           json = JSON.parse(response.body)
 
           new_user = User.find(json["user_id"])
+          email_token = new_user.email_tokens.active.where(email: new_user.email).first
 
           expect(json['active']).to be_truthy
 
@@ -775,6 +776,7 @@ describe UsersController do
           expect(new_user.approved).to eq(true)
           expect(new_user.approved_by_id).to eq(admin.id)
           expect(new_user.approved_at).to_not eq(nil)
+          expect(email_token.confirmed?).to eq(true)
         end
 
         it "will create a reviewable when a user is created as active but not approved" do

From c21df2286c8bdb0442571cf68e3f83c64c810837 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 15 Apr 2020 09:19:59 +1000
Subject: [PATCH 0613/1830] FIX: add short_path to upload_serializer (#9417)

What problem I am trying to solve?

When an encrypted message is crafted and the image is added - discourse needs a hard refresh to display that image.

What is happening?

Everything starts here - when the upload is finished we add serialized object to the cache https://github.com/discourse/discourse/blob/master/app/assets/javascripts/discourse/components/composer-editor.js#L748:L757

Then, `discourse-encrypt` is trying to get an image from the cache and use `short_path` property
https://github.com/discourse/discourse-encrypt/blob/master/assets/javascripts/discourse/initializers/hook-decrypt-post.js.es6#L142:L143

Why is it working after a hard refresh?

After refresh, we populate cache once again using that function: https://github.com/discourse/discourse/blob/master/app/assets/javascripts/pretty-text/upload-short-url.js#L11:L17

And lookup_urls method from backend is returning `short_path`
https://github.com/discourse/discourse/blob/master/app/controllers/uploads_controller.rb#L55:L64

TL;DR We should expose short path in upload serializer. I ensured that this serializer is used only when attachments are uploaded so it should not affect performance.
---
 app/serializers/upload_serializer.rb       | 1 +
 spec/serializers/upload_serializer_spec.rb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/serializers/upload_serializer.rb b/app/serializers/upload_serializer.rb
index 938ab5b0ad..a04300b022 100644
--- a/app/serializers/upload_serializer.rb
+++ b/app/serializers/upload_serializer.rb
@@ -11,6 +11,7 @@ class UploadSerializer < ApplicationSerializer
              :thumbnail_height,
              :extension,
              :short_url,
+             :short_path,
              :retain_hours,
              :human_filesize
 
diff --git a/spec/serializers/upload_serializer_spec.rb b/spec/serializers/upload_serializer_spec.rb
index 3865000913..b0f5e6429c 100644
--- a/spec/serializers/upload_serializer_spec.rb
+++ b/spec/serializers/upload_serializer_spec.rb
@@ -14,6 +14,7 @@ RSpec.describe UploadSerializer do
     expect(json_data['height']).to eql upload.height
     expect(json_data['thumbnail_width']).to eql upload.thumbnail_width
     expect(json_data['thumbnail_height']).to eql upload.thumbnail_height
+    expect(json_data['short_path']).to eql upload.short_path
   end
 
   context "when the upload is secure" do

From 5a5685766aaa1f9dd6870fa86ca38b25b5ecef93 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Mon, 13 Apr 2020 15:39:06 -0700
Subject: [PATCH 0614/1830] DEV: Fix all 'require-valid-alt-text' lints except
 in reused compoments

Three violations require parameters from the caller to generate valid alt text.
---
 app/assets/javascripts/admin/templates/badges-index.hbs     | 2 +-
 .../javascripts/admin/templates/customize-themes-index.hbs  | 2 +-
 app/assets/javascripts/admin/templates/emojis.hbs           | 2 +-
 .../discourse/templates/components/group-flair-inputs.hbs   | 4 ++--
 app/assets/javascripts/discourse/templates/email-login.hbs  | 2 +-
 app/assets/javascripts/discourse/templates/invites/show.hbs | 2 +-
 .../javascripts/discourse/templates/password-reset.hbs      | 2 +-
 config/locales/client.en.yml                                | 6 ++++++
 8 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index f2b2efeaef..528e86e4d3 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -1,6 +1,6 @@
 {{#d-section class="current-badges"}}
   <div class="badge-intro admin-intro">
-    <img src={{badgeIntroEmoji}} class="badge-intro-emoji">
+    <img src={{badgeIntroEmoji}} class="badge-intro-emoji" alt={{i18n 'admin.badges.badge_intro.emoji'}}>
     <div class="content-wrapper">
       <h1>{{i18n "admin.badges.badge_intro.title"}}</h1>
       <div class="external-resources">
diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
index 1c17f0b99b..7402ef2724 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-index.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
@@ -1,5 +1,5 @@
 <div class="themes-intro admin-intro">
-  <img src={{womanArtistEmojiURL}}>
+  <img src={{womanArtistEmojiURL}} alt={{i18n "admin.customize.theme.themes_intro_emoji"}}>
   <div class="content-wrapper">
     <h1>{{i18n "admin.customize.theme.themes_intro"}}</h1>
     <div class="create-actions">
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index b2935978b3..63df5d99ac 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -31,7 +31,7 @@
       <tbody>
         {{#each sortedEmojis as |e|}}
           <tr>
-            <th><img class="emoji emoji-custom" src={{e.url}} title={{e.name}}></th>
+            <th><img class="emoji emoji-custom" src={{e.url}} title={{e.name}} alt={{i18n "admin.emoji.alt"}}></th>
             <th>:{{e.name}}:</th>
             <th>{{e.group}}</th>
             <th>
diff --git a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
index 85077306a2..36dfc26202 100644
--- a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
@@ -35,13 +35,13 @@
 
   <div class="avatar-flair-preview">
     <div class="avatar-wrapper">
-      <img width="45" height="45" src={{demoAvatarUrl}} class="avatar actor">
+      <img width="45" height="45" src={{demoAvatarUrl}} class="avatar actor" alt="" role="presentation">
     </div>
 
     {{#if flairPreviewImage}}
       <div class="avatar-flair demo {{flairPreviewClasses}}" style={{flairPreviewStyle}}></div>
     {{else}}
-      <div class="avatar-flair demo {{flairPreviewClasses}}" style={{flairPreviewStyle}}>
+      <div class="avatar-flair demo {{flairPreviewClasses}}" style={{flairPreviewStyle}} role="presentation">
         {{d-icon flairPreviewIconUrl}}
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/email-login.hbs b/app/assets/javascripts/discourse/templates/email-login.hbs
index 3e89b6cc61..24e1f319fe 100644
--- a/app/assets/javascripts/discourse/templates/email-login.hbs
+++ b/app/assets/javascripts/discourse/templates/email-login.hbs
@@ -1,6 +1,6 @@
 <div class="container email-login clearfix">
   <div class="pull-left col-image">
-    <img src={{lockImageUrl}} class="password-reset-img">
+    <img src={{lockImageUrl}} class="password-reset-img" alt={{i18n "email_login.emoji"}}>
   </div>
 
   <div class="pull-left col-form">
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index 816303a5c7..0243e8df81 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -3,7 +3,7 @@
 
   <div class="two-col">
     <div class="col-image">
-      <img src={{inviteImageUrl}}>
+      <img src={{inviteImageUrl}} alt={{i18n 'invites.emoji'}}>
     </div>
 
     <div class="col-form">
diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/templates/password-reset.hbs
index 282526bc02..656f0ae7a5 100644
--- a/app/assets/javascripts/discourse/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/templates/password-reset.hbs
@@ -1,6 +1,6 @@
 <div class="container password-reset clearfix">
   <div class="pull-left col-image">
-    <img src={{lockImageUrl}} class="password-reset-img">
+    <img src={{lockImageUrl}} class="password-reset-img" alt={{i18n "user.change_password.emoji"}}>
   </div>
 
   <div class="pull-left col-form">
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 4b7b33fa58..3f25460ee5 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -983,6 +983,7 @@ en:
         success: "(email sent)"
         in_progress: "(sending email)"
         error: "(error)"
+        emoji: "lock emoji"
         action: "Send Password Reset Email"
         set_password: "Set Password"
         choose_new: "Choose a new password"
@@ -1504,6 +1505,7 @@ en:
     email_login:
       link_label: "Email me a login link"
       button_label: "with email"
+      emoji: "lock emoji"
       complete_username: "If an account matches the username <b>%{username}</b>, you should receive an email with a login link shortly."
       complete_email: "If an account matches <b>%{email}</b>, you should receive an email with a login link shortly."
       complete_username_found: "We found an account that matches the username <b>%{username}</b>, you should receive an email with a login link shortly."
@@ -1584,6 +1586,7 @@ en:
         backup_code: "Use a backup code instead"
     invites:
       accept_title: "Invitation"
+      emoji: "envelope emoji"
       welcome_to: "Welcome to %{site_name}!"
       invited_by: "You were invited by:"
       social_login_available: "You'll also be able to sign in with any social login using that email."
@@ -3719,6 +3722,7 @@ en:
           theme_name: "Theme name"
           component_name: "Component name"
           themes_intro: "Select an existing theme or install a new one to get started"
+          themes_intro_emoji: "woman artist emoji"
           beginners_guide_title: "Beginner’s guide to using Discourse Themes"
           developers_guide_title: "Developer’s guide to Discourse Themes"
           browse_themes: "Browse community themes"
@@ -4580,6 +4584,7 @@ en:
             with_time: <span class="username">%{username}</span> at <span class="time">%{time}</span>
         badge_intro:
           title: "Select an existing badge or create a new one to get started"
+          emoji: "woman student emoji"
           what_are_badges_title: "What are badges?"
           badge_query_examples_title: "Badge query examples"
         mass_award:
@@ -4599,6 +4604,7 @@ en:
         name: "Name"
         group: "Group"
         image: "Image"
+        alt: "custom emoji preview"
         delete_confirm: "Are you sure you want to delete the :%{name}: emoji?"
 
       embedding:

From c670a340138072632dcd986d9cfdd033e2ae275c Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Mon, 13 Apr 2020 15:22:35 -0700
Subject: [PATCH 0615/1830] DEV: Fix and enable the 'require-button-type' lint

---
 .template-lintrc.js                                         | 4 ++--
 .../javascripts/admin/templates/customize-themes-show.hbs   | 2 +-
 .../javascripts/discourse/templates/components/d-modal.hbs  | 2 +-
 .../discourse/templates/components/google-search.hbs        | 2 +-
 .../discourse/templates/components/login-buttons.hbs        | 2 +-
 .../discourse/templates/components/topic-timer-info.hbs     | 2 +-
 .../wizard/templates/components/invite-list-user.hbs        | 2 +-
 .../javascripts/wizard/templates/components/invite-list.hbs | 2 +-
 .../javascripts/wizard/templates/components/wizard-step.hbs | 6 +++---
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index 1150803258..b0a14bbf22 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -43,8 +43,8 @@ module.exports = {
     "no-unnecessary-concat": true,
     "no-unnecessary-component-helper": true,
     "no-unused-block-params": true,
-    quotes: "double",
-    "require-button-type": false,
+    "quotes": "double",
+    "require-button-type": true,
     "require-iframe-title": true,
     "require-valid-alt-text": false,
     "self-closing-void-elements": true,
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index c391701c15..186cd9b358 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -15,7 +15,7 @@
 
   {{#each model.errors as |error|}}
     <div class="alert alert-error">
-      <button class="close" data-dismiss="alert">×</button>
+      <button type="button" class="close" data-dismiss="alert" aria-label={{i18n "modal.dismiss_error"}}>×</button>
       {{error}}
     </div>
   {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
index f9e2c830dd..1a81e466d2 100644
--- a/app/assets/javascripts/discourse/templates/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
@@ -33,7 +33,7 @@
 
       {{#each errors as |error|}}
         <div class="alert alert-error">
-          <button class="close" data-dismiss="alert" aria-label={{i18n "modal.dismiss_error"}}>×</button>
+          <button type="button" class="close" data-dismiss="alert" aria-label={{i18n "modal.dismiss_error"}}>×</button>
           {{error}}
         </div>
       {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/google-search.hbs b/app/assets/javascripts/discourse/templates/components/google-search.hbs
index ce28f58662..cbe90dcbce 100644
--- a/app/assets/javascripts/discourse/templates/components/google-search.hbs
+++ b/app/assets/javascripts/discourse/templates/components/google-search.hbs
@@ -2,6 +2,6 @@
   <form action="//google.com/search" id="google-search">
     <input type="text" name="q" value={{searchTerm}}>
     <input name="as_sitesearch" value={{siteUrl}} type="hidden">
-    <button class="btn btn-primary">{{i18n "search.search_google_button"}}</button>
+    <button class="btn btn-primary" type="submit">{{i18n "search.search_google_button"}}</button>
   </form>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/login-buttons.hbs b/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
index 85ba0d6870..c81a7745ea 100644
--- a/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
@@ -1,5 +1,5 @@
 {{#each buttons as |b|}}
-  <button class="btn btn-social {{b.name}}" {{action externalLogin b}}>
+  <button type="button" class="btn btn-social {{b.name}}" {{action externalLogin b}}>
     {{#if b.isGoogle}}
       <svg class="fa d-icon d-icon-custom-google-oauth2 svg-icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48"><defs><path id="a" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4z"/></defs><clipPath id="b"><use xlink:href="#a" overflow="visible"/></clipPath><path clip-path="url(#b)" fill="#FBBC05" d="M0 37V11l17 13z"/><path clip-path="url(#b)" fill="#EA4335" d="M0 11l17 13 7-6.1L48 14V0H0z"/><path clip-path="url(#b)" fill="#34A853" d="M0 37l30-23 7.9 1L48 0v48H0z"/><path clip-path="url(#b)" fill="#4285F4" d="M48 48L17 24l-4-3 35-10z"/></svg>
     {{else if b.icon}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs b/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs
index 7741113b5d..8a546ab791 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs
@@ -4,7 +4,7 @@
       {{clockIcon}} {{notice}}
     </span>
     {{#if showTrashCan}}
-      <button class="btn topic-timer-remove no-text" title={{trashCanTitle}}>
+      <button type="button" class="btn topic-timer-remove no-text" title={{trashCanTitle}}>
         {{trashCanIcon}}
       </button>
     {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs b/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
index 15c822bcf1..790586fa8d 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
@@ -1,6 +1,6 @@
 <span class="email">{{user.email}}</span>
 <span class="role">{{roleName}}</span>
 
-<button class="wizard-btn small danger remove-user" {{action removeUser user}}>
+<button type="button" class="wizard-btn small danger remove-user" {{action removeUser user}}>
   {{d-icon "times"}}
 </button>
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list.hbs b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
index 1c6f780684..5c829fb9dc 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
@@ -19,7 +19,7 @@
     onChange=(action (mut inviteRole))
   }}
 
-  <button class="wizard-btn small add-user" {{action "addUser"}}>
+  <button type="button" class="wizard-btn small add-user" {{action "addUser"}}>
     {{d-icon "plus"}}{{i18n "wizard.invites.add_user"}}
   </button>
 </div>
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
index 1f0b84a857..01650e3ca0 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -35,7 +35,7 @@
     {{/if}}
 
     {{#if showFinishButton}}
-      <button {{action "exitEarly"}} disabled={{saving}} tabindex="10" class="wizard-btn finish">
+      <button {{action "exitEarly"}} disabled={{saving}} tabindex="10" type="button" class="wizard-btn finish">
         {{i18n "wizard.finish"}}
       </button>
     {{/if}}
@@ -45,14 +45,14 @@
     {{/if}}
 
     {{#if showNextButton}}
-      <button {{action "nextStep"}} disabled={{saving}} tabindex="10" class="wizard-btn next primary">
+      <button {{action "nextStep"}} disabled={{saving}} tabindex="10" type="button" class="wizard-btn next primary">
         {{i18n "wizard.next"}}
         {{d-icon "chevron-right"}}
       </button>
     {{/if}}
 
     {{#if showDoneButton}}
-      <button {{action "quit"}} disabled={{saving}} tabindex="10" class="wizard-btn done">
+      <button {{action "quit"}} disabled={{saving}} tabindex="10" type="button" class="wizard-btn done">
         {{i18n "wizard.done"}}
       </button>
     {{/if}}

From 4a2c4232c557ab7da1b5ee6036b41c9c8d43bf7c Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 15 Apr 2020 11:11:00 +0530
Subject: [PATCH 0616/1830] FIX: remove word boundary regex (\b) for search
 result highlights. (#9338)

---
 .../admin/components/site-text-summary.js     |  13 ++-
 .../admin/templates/search-logs-term.hbs      |   6 +-
 .../discourse/components/highlight-search.js  |  13 +++
 .../discourse/components/highlight-text.js    |  18 ++-
 .../discourse/lib/highlight-html.js           |  84 ++++++++++++++
 ...{highlight-text.js => highlight-search.js} |   7 +-
 .../discourse/templates/full-page-search.hbs  |   6 +-
 .../discourse/widgets/post-cooked.js          |  19 +--
 .../discourse/widgets/search-menu-results.js  |   4 +-
 app/assets/javascripts/vendor.js              |   1 -
 test/javascripts/acceptance/search-test.js    |   4 +-
 .../lib/highlight-search-test.js.es6          |  48 ++++++++
 test/javascripts/lib/highlight-text-test.js   |  26 -----
 vendor/assets/javascripts/highlight.js        | 108 ------------------
 14 files changed, 186 insertions(+), 171 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/components/highlight-search.js
 create mode 100644 app/assets/javascripts/discourse/lib/highlight-html.js
 rename app/assets/javascripts/discourse/lib/{highlight-text.js => highlight-search.js} (72%)
 create mode 100644 test/javascripts/lib/highlight-search-test.js.es6
 delete mode 100644 test/javascripts/lib/highlight-text-test.js
 delete mode 100644 vendor/assets/javascripts/highlight.js

diff --git a/app/assets/javascripts/admin/components/site-text-summary.js b/app/assets/javascripts/admin/components/site-text-summary.js
index 11c6bc45eb..23ee2d8aa6 100644
--- a/app/assets/javascripts/admin/components/site-text-summary.js
+++ b/app/assets/javascripts/admin/components/site-text-summary.js
@@ -1,5 +1,6 @@
 import Component from "@ember/component";
 import { on } from "discourse-common/utils/decorators";
+import highlightHTML from "discourse/lib/highlight-html";
 
 export default Component.extend({
   classNames: ["site-text"],
@@ -10,11 +11,13 @@ export default Component.extend({
     const term = this._searchTerm();
 
     if (term) {
-      $(
-        this.element.querySelector(".site-text-id, .site-text-value")
-      ).highlight(term, {
-        className: "text-highlight"
-      });
+      highlightHTML(
+        this.element.querySelector(".site-text-id, .site-text-value"),
+        term,
+        {
+          className: "text-highlight"
+        }
+      );
     }
     $(this.element.querySelector(".site-text-value")).ellipsis();
   },
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index 5014fd7b90..54348aea2e 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -31,7 +31,7 @@
         <div class="fps-topic">
           <div class="topic">
             <a href={{result.url}} class="search-link">
-              {{topic-status topic=result.topic disableActions=true}}<span class="topic-title">{{#highlight-text highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+              {{topic-status topic=result.topic disableActions=true}}<span class="topic-title">{{#highlight-search highlight=term}}{{html-safe result.topic.fancyTitle}}{{/highlight-search}}</span>
             </a>
 
             <div class="search-category">
@@ -54,9 +54,9 @@
             </span>
 
             {{#if result.blurb}}
-              {{#highlight-text highlight=term}}
+              {{#highlight-search highlight=term}}
                 {{html-safe result.blurb}}
-              {{/highlight-text}}
+              {{/highlight-search}}
             {{/if}}
           </div>
         </div>
diff --git a/app/assets/javascripts/discourse/components/highlight-search.js b/app/assets/javascripts/discourse/components/highlight-search.js
new file mode 100644
index 0000000000..a7077a79c7
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/highlight-search.js
@@ -0,0 +1,13 @@
+import Component from "@ember/component";
+import highlightSearch from "discourse/lib/highlight-search";
+
+export default Component.extend({
+  tagName: "span",
+
+  _highlightOnInsert: function() {
+    const term = this.highlight;
+    highlightSearch(this.element, term);
+  }
+    .observes("highlight")
+    .on("didInsertElement")
+});
diff --git a/app/assets/javascripts/discourse/components/highlight-text.js b/app/assets/javascripts/discourse/components/highlight-text.js
index a98ffdb653..d97572d215 100644
--- a/app/assets/javascripts/discourse/components/highlight-text.js
+++ b/app/assets/javascripts/discourse/components/highlight-text.js
@@ -1,13 +1,11 @@
-import Component from "@ember/component";
-import highlightText from "discourse/lib/highlight-text";
+import highlightSearch from "discourse/components/highlight-search";
+import deprecated from "discourse-common/lib/deprecated";
 
-export default Component.extend({
-  tagName: "span",
-
-  _highlightOnInsert: function() {
-    const term = this.highlight;
-    highlightText($(this.element), term);
+export default highlightSearch.extend({
+  init() {
+    this._super(...arguments);
+    deprecated(
+      "`highlight-text` component is deprecated,  use the `highlight-search` instead."
+    );
   }
-    .observes("highlight")
-    .on("didInsertElement")
 });
diff --git a/app/assets/javascripts/discourse/lib/highlight-html.js b/app/assets/javascripts/discourse/lib/highlight-html.js
new file mode 100644
index 0000000000..a6f093b632
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/highlight-html.js
@@ -0,0 +1,84 @@
+import { makeArray } from "discourse-common/lib/helpers";
+
+function highlight(node, pattern, nodeName, className) {
+  if (
+    ![Node.ELEMENT_NODE, Node.TEXT_NODE].includes(node.nodeType) ||
+    ["SCRIPT", "STYLE"].includes(node.tagName) ||
+    (node.tagName === nodeName && node.className === className)
+  ) {
+    return 0;
+  }
+
+  if (node.nodeType === Node.ELEMENT_NODE && node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) {
+      i += highlight(node.childNodes[i], pattern, nodeName, className);
+    }
+    return 0;
+  }
+
+  if (node.nodeType === Node.TEXT_NODE) {
+    const match = node.data.match(pattern);
+
+    if (!match) {
+      return 0;
+    }
+
+    const element = document.createElement(nodeName);
+    element.className = className;
+    element.innerText = match[0];
+    const matchNode = node.splitText(match.index);
+    matchNode.splitText(match[0].length);
+    matchNode.parentNode.replaceChild(element, matchNode);
+    return 1;
+  }
+
+  return 0;
+}
+
+export default function(node, words, opts = {}) {
+  let settings = {
+    nodeName: "span",
+    className: "highlighted",
+    matchCase: false
+  };
+
+  settings = Object.assign({}, settings, opts);
+  words = makeArray(words)
+    .filter(Boolean)
+    .map(word => word.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&"));
+
+  if (!words.length) return node;
+
+  const pattern = `(${words.join(" ")})`;
+  let flag;
+
+  if (!settings.matchCase) {
+    flag = "i";
+  }
+
+  highlight(
+    node,
+    new RegExp(pattern, flag),
+    settings.nodeName.toUpperCase(),
+    settings.className
+  );
+
+  return node;
+}
+
+export function unhighlightHTML(opts = {}) {
+  let settings = {
+    nodeName: "span",
+    className: "highlighted"
+  };
+
+  settings = Object.assign({}, settings, opts);
+
+  document
+    .querySelectorAll(`${settings.nodeName}.${settings.className}`)
+    .forEach(element => {
+      const parentNode = element.parentNode;
+      parentNode.replaceChild(element.firstChild, element);
+      parentNode.normalize();
+    });
+}
diff --git a/app/assets/javascripts/discourse/lib/highlight-text.js b/app/assets/javascripts/discourse/lib/highlight-search.js
similarity index 72%
rename from app/assets/javascripts/discourse/lib/highlight-text.js
rename to app/assets/javascripts/discourse/lib/highlight-search.js
index 6fa7a09faf..0d9318fb7a 100644
--- a/app/assets/javascripts/discourse/lib/highlight-text.js
+++ b/app/assets/javascripts/discourse/lib/highlight-search.js
@@ -1,8 +1,9 @@
 import { PHRASE_MATCH_REGEXP_PATTERN } from "discourse/lib/concerns/search-constants";
+import highlightHTML from "discourse/lib/highlight-html";
 
 export const CLASS_NAME = "search-highlight";
 
-export default function($elem, term, opts = {}) {
+export default function(elem, term, opts = {}) {
   if (!_.isEmpty(term)) {
     // special case ignore "l" which is used for magic sorting
     let words = _.reject(
@@ -11,8 +12,8 @@ export default function($elem, term, opts = {}) {
     );
 
     words = words.map(w => w.replace(/^"(.*)"$/, "$1"));
-    const highlightOpts = { wordsOnly: true };
+    const highlightOpts = {};
     if (!opts.defaultClassName) highlightOpts.className = CLASS_NAME;
-    $elem.highlight(words, highlightOpts);
+    highlightHTML(elem, words, highlightOpts);
   }
 }
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index d6cdd92227..12a2bd5b19 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -88,7 +88,7 @@
 
                   <a href={{result.url}} {{action "logClick" result.topic_id}} class="search-link">
                     {{topic-status topic=result.topic disableActions=true showPrivateMessageIcon=true}}
-                    <span class="topic-title">{{#highlight-text highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-text}}</span>
+                    <span class="topic-title">{{#highlight-search highlight=q}}{{html-safe result.topic.fancyTitle}}{{/highlight-search}}</span>
                   </a>
 
                   <div class="search-category">
@@ -112,9 +112,9 @@
                   </span>
 
                   {{#if result.blurb}}
-                    {{#highlight-text highlight=highlightQuery}}
+                    {{#highlight-search highlight=highlightQuery}}
                       {{html-safe result.blurb}}
-                    {{/highlight-text}}
+                    {{/highlight-search}}
                   {{/if}}
                 </div>
 
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js b/app/assets/javascripts/discourse/widgets/post-cooked.js
index 3d55314f08..3b0ca2423d 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js
@@ -2,7 +2,11 @@ import { iconHTML } from "discourse-common/lib/icon-library";
 import { ajax } from "discourse/lib/ajax";
 import { isValidLink } from "discourse/lib/click-track";
 import { number } from "discourse/lib/formatter";
-import highlightText from "discourse/lib/highlight-text";
+import highlightSearch from "discourse/lib/highlight-search";
+import {
+  default as highlightHTML,
+  unhighlightHTML
+} from "discourse/lib/highlight-html";
 
 let _decorators = [];
 
@@ -48,17 +52,18 @@ export default class PostCooked {
   }
 
   _applySearchHighlight($html) {
+    const html = $html[0];
     const highlight = this.attrs.highlightTerm;
 
     if (highlight && highlight.length > 2) {
       if (this._highlighted) {
-        $html.unhighlight();
+        unhighlightHTML(html);
       }
 
-      highlightText($html, highlight, { defaultClassName: true });
+      highlightSearch(html, highlight, { defaultClassName: true });
       this._highlighted = true;
     } else if (this._highlighted) {
-      $html.unhighlight();
+      unhighlightHTML(html);
       this._highlighted = false;
     }
   }
@@ -175,10 +180,8 @@ export default class PostCooked {
           div.html(result.cooked);
           _decorators.forEach(cb => cb(div, this.decoratorHelper));
 
-          div.highlight(originalText, {
-            caseSensitive: true,
-            element: "span",
-            className: "highlighted"
+          highlightHTML(div[0], originalText, {
+            matchCase: true
           });
           $blockQuote.showHtml(div, "fast", finished);
         })
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js b/app/assets/javascripts/discourse/widgets/search-menu-results.js
index 636c069f94..6d46819263 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-results.js
+++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js
@@ -3,7 +3,7 @@ import { dateNode } from "discourse/helpers/node";
 import RawHtml from "discourse/widgets/raw-html";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
-import highlightText from "discourse/lib/highlight-text";
+import highlightSearch from "discourse/lib/highlight-search";
 import { escapeExpression, formatUsername } from "discourse/lib/utilities";
 import { iconNode } from "discourse-common/lib/icon-library";
 import renderTag from "discourse/lib/render-tag";
@@ -15,7 +15,7 @@ class Highlighted extends RawHtml {
   }
 
   decorate($html) {
-    highlightText($html, this.term);
+    highlightSearch($html[0], this.term);
   }
 }
 
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index adc682eba5..64119c4940 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -28,5 +28,4 @@
 //= require jquery.autoellipsis-1.0.10
 //= require virtual-dom
 //= require virtual-dom-amd
-//= require highlight.js
 //= require intersection-observer
diff --git a/test/javascripts/acceptance/search-test.js b/test/javascripts/acceptance/search-test.js
index 1b930c7905..62d4323867 100644
--- a/test/javascripts/acceptance/search-test.js
+++ b/test/javascripts/acceptance/search-test.js
@@ -94,13 +94,13 @@ QUnit.test("Search with context", async assert => {
 
   const highlighted = [];
 
-  find("#post_7 span.highlight-strong").map((_, span) => {
+  find("#post_7 span.highlighted").map((_, span) => {
     highlighted.push(span.innerText);
   });
 
   assert.deepEqual(
     highlighted,
-    ["a", "a", "proper", "a"],
+    ["a proper"],
     "it should highlight the post with the search terms correctly"
   );
 
diff --git a/test/javascripts/lib/highlight-search-test.js.es6 b/test/javascripts/lib/highlight-search-test.js.es6
new file mode 100644
index 0000000000..fcbc9f4fa4
--- /dev/null
+++ b/test/javascripts/lib/highlight-search-test.js.es6
@@ -0,0 +1,48 @@
+import highlightSearch, { CLASS_NAME } from "discourse/lib/highlight-search";
+import { fixture } from "helpers/qunit-helpers";
+
+QUnit.module("lib:highlight-search");
+
+QUnit.test("highlighting text", assert => {
+  fixture().html(
+    `
+    <p>This is some text to highlight</p>
+    `
+  );
+
+  highlightSearch(fixture()[0], "some text");
+
+  const terms = [];
+
+  fixture(`.${CLASS_NAME}`).each((_, elem) => {
+    terms.push(elem.textContent);
+  });
+
+  assert.equal(
+    terms.join(" "),
+    "some text",
+    "it should highlight the terms correctly"
+  );
+});
+
+QUnit.test("highlighting unicode text", assert => {
+  fixture().html(
+    `
+    <p>This is some தமிழ் & русский text to highlight</p>
+    `
+  );
+
+  highlightSearch(fixture()[0], "தமிழ் & русский");
+
+  const terms = [];
+
+  fixture(`.${CLASS_NAME}`).each((_, elem) => {
+    terms.push(elem.textContent);
+  });
+
+  assert.equal(
+    terms.join(" "),
+    "தமிழ் & русский",
+    "it should highlight the terms correctly"
+  );
+});
diff --git a/test/javascripts/lib/highlight-text-test.js b/test/javascripts/lib/highlight-text-test.js
deleted file mode 100644
index d222b8a753..0000000000
--- a/test/javascripts/lib/highlight-text-test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import highlightText, { CLASS_NAME } from "discourse/lib/highlight-text";
-import { fixture } from "helpers/qunit-helpers";
-
-QUnit.module("lib:highlight-text");
-
-QUnit.test("highlighting text", assert => {
-  fixture().html(
-    `
-    <p>This is some text to highlight</p>
-    `
-  );
-
-  highlightText(fixture(), "some text");
-
-  const terms = [];
-
-  fixture(`.${CLASS_NAME}`).each((_, elem) => {
-    terms.push(elem.textContent);
-  });
-
-  assert.equal(
-    terms.join(" "),
-    "some text",
-    "it should highlight the terms correctly"
-  );
-});
diff --git a/vendor/assets/javascripts/highlight.js b/vendor/assets/javascripts/highlight.js
deleted file mode 100644
index c13dd7ff9f..0000000000
--- a/vendor/assets/javascripts/highlight.js
+++ /dev/null
@@ -1,108 +0,0 @@
-// forked cause we may want to amend the logic a bit
-/*
- * jQuery Highlight plugin
- *
- * Based on highlight v3 by Johann Burkard
- * http://johannburkard.de/blog/programming/javascript/highlight-javascript-text-higlighting-jquery-plugin.html
- *
- * Code a little bit refactored and cleaned (in my humble opinion).
- * Most important changes:
- *  - has an option to highlight only entire words (wordsOnly - false by default),
- *  - has an option to be case sensitive (caseSensitive - false by default)
- *  - highlight element tag and class names can be specified in options
- *
- * Usage:
- *   // wrap every occurrance of text 'lorem' in content
- *   // with <span class='highlight'> (default options)
- *   $('#content').highlight('lorem');
- *
- *   // search for and highlight more terms at once
- *   // so you can save some time on traversing DOM
- *   $('#content').highlight(['lorem', 'ipsum']);
- *   $('#content').highlight('lorem ipsum');
- *
- *   // search only for entire word 'lorem'
- *   $('#content').highlight('lorem', { wordsOnly: true });
- *
- *   // don't ignore case during search of term 'lorem'
- *   $('#content').highlight('lorem', { caseSensitive: true });
- *
- *   // wrap every occurrance of term 'ipsum' in content
- *   // with <em class='important'>
- *   $('#content').highlight('ipsum', { element: 'em', className: 'important' });
- *
- *   // remove default highlight
- *   $('#content').unhighlight();
- *
- *   // remove custom highlight
- *   $('#content').unhighlight({ element: 'em', className: 'important' });
- *
- *
- * Copyright (c) 2009 Bartek Szopka
- *
- * Licensed under MIT license.
- *
- */
-
-jQuery.extend({
-    highlight: function (node, re, nodeName, className) {
-        if (node.nodeType === 3) {
-            var match = node.data.match(re);
-            if (match) {
-                var highlight = document.createElement(nodeName || 'span');
-                highlight.className = className || 'highlight';
-                var wordNode = node.splitText(match.index);
-                wordNode.splitText(match[0].length);
-                var wordClone = wordNode.cloneNode(true);
-                highlight.appendChild(wordClone);
-                wordNode.parentNode.replaceChild(highlight, wordNode);
-                return 1; //skip added node in parent
-            }
-        } else if ((node.nodeType === 1 && node.childNodes) && // only element nodes that have children
-                !/(script|style)/i.test(node.tagName) && // ignore script and style nodes
-                !(node.tagName === nodeName.toUpperCase() && node.className === className)) { // skip if already highlighted
-            for (var i = 0; i < node.childNodes.length; i++) {
-                i += jQuery.highlight(node.childNodes[i], re, nodeName, className);
-            }
-        }
-        return 0;
-    }
-});
-
-jQuery.fn.unhighlight = function (options) {
-    var settings = { className: 'highlight-strong', element: 'span' };
-    jQuery.extend(settings, options);
-
-    return this.find(settings.element + "." + settings.className).each(function () {
-        var parent = this.parentNode;
-        parent.replaceChild(this.firstChild, this);
-        parent.normalize();
-    }).end();
-};
-
-jQuery.fn.highlight = function (words, options) {
-    var settings = { className: 'highlight-strong', element: 'span', caseSensitive: false, wordsOnly: false };
-    jQuery.extend(settings, options);
-
-    if (words.constructor === String) {
-        words = [words];
-    }
-    words = jQuery.grep(words, function(word){
-      return word !== '';
-    });
-    words = jQuery.map(words, function(word) {
-      return word.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
-    });
-    if (words.length === 0) { return this; }
-
-    var flag = settings.caseSensitive ? "" : "i";
-    var pattern = "(" + words.join("|") + ")";
-    if (settings.wordsOnly) {
-        pattern = "\\b" + pattern + "\\b";
-    }
-    var re = new RegExp(pattern, flag);
-
-    return this.each(function () {
-        jQuery.highlight(this, re, settings.element, settings.className);
-    });
-};

From 72a3f387f2af09b358c7a33de6099068eb5eba2a Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 15 Apr 2020 15:57:28 +1000
Subject: [PATCH 0617/1830] Only run ember-template-lint precommit on staged
 files

* instead of running on the whole app folder, which just adds extra
  overhead
---
 lefthook.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lefthook.yml b/lefthook.yml
index 7060a976d4..749f080134 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -17,7 +17,7 @@ pre-commit:
       exclude: "vendor/*|fixtures|public/javascripts|shims.js|ember-addons|template-lintrc|locale/*|test_helper|run-qunit"
       run: yarn eslint -f compact {staged_files}
     ember-template-lint:
-      run: yarn run ember-template-lint app
+      run: yarn run ember-template-lint {staged_files}
     yaml-syntax:
       glob: "*.{yaml,yml}"
       # database.yml is an erb file not a yaml file

From f1b844ba8848950274ea2100fc1b52a47ba317c2 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Tue, 14 Apr 2020 23:14:53 -0700
Subject: [PATCH 0618/1830] FIX: Only apply bold font on topic lists (#9396)

---
 app/assets/stylesheets/common/base/_topic-list.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 4250650446..6113446577 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -213,7 +213,6 @@
 .heatmap-high,
 .heatmap-high a {
   color: #ec7213 !important;
-  font-weight: bold;
 }
 .heatmap-med,
 .heatmap-med a {
@@ -224,6 +223,10 @@
   color: #93704a !important;
 }
 
+.topic-list .heatmap-high {
+  font-weight: bold;
+}
+
 .loading .topic-list {
   border: 0;
   box-shadow: none;

From 8c5831999290eddb3c152289349d1e70c1bc4fad Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 15 Apr 2020 12:41:01 +0200
Subject: [PATCH 0619/1830] DEV: allows to decorate topic header class (#9427)

---
 .../discourse/widgets/header-topic-info.js         | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js b/app/assets/javascripts/discourse/widgets/header-topic-info.js
index 2e73b3253b..c6488d0562 100644
--- a/app/assets/javascripts/discourse/widgets/header-topic-info.js
+++ b/app/assets/javascripts/discourse/widgets/header-topic-info.js
@@ -57,6 +57,18 @@ createWidget("topic-header-participant", {
 export default createWidget("header-topic-info", {
   tagName: "div.extra-info-wrapper",
 
+  buildFancyTitleClass() {
+    const baseClass = ["topic-link"];
+    const flatten = array => [].concat.apply([], array);
+    const extraClass = flatten(
+      applyDecorators(this, "fancyTitleClass", this.attrs, this.state)
+    );
+    return baseClass
+      .concat(extraClass)
+      .filter(Boolean)
+      .join(" ");
+  },
+
   html(attrs, state) {
     const topic = attrs.topic;
 
@@ -87,7 +99,7 @@ export default createWidget("header-topic-info", {
       const titleHTML = new RawHtml({ html: `<span>${fancyTitle}</span>` });
       heading.push(
         this.attach("link", {
-          className: "topic-link",
+          className: this.buildFancyTitleClass(),
           action: "jumpToTopPost",
           href,
           attributes: { "data-topic-id": topic.get("id") },

From 884eea7a8346cf1c0a2bb6ff3b852d3f1fb52684 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 15 Apr 2020 18:34:02 +0530
Subject: [PATCH 0620/1830] FEATURE: add support for `upload` format in theme
 settings.

---
 app/models/theme_setting.rb                      | 2 +-
 config/locales/server.en.yml                     | 2 +-
 lib/theme_settings_manager.rb                    | 3 +++
 spec/fixtures/theme_settings/valid_settings.yaml | 4 ++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/models/theme_setting.rb b/app/models/theme_setting.rb
index b34fd5fbef..86d8c0247c 100644
--- a/app/models/theme_setting.rb
+++ b/app/models/theme_setting.rb
@@ -16,7 +16,7 @@ class ThemeSetting < ActiveRecord::Base
   end
 
   def self.types
-    @types ||= Enum.new(integer: 0, float: 1, string: 2, bool: 3, list: 4, enum: 5)
+    @types ||= Enum.new(integer: 0, float: 1, string: 2, bool: 3, list: 4, enum: 5, upload: 6)
   end
 
   def self.acceptable_value_for_type?(value, type)
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index ffd392888e..64ed44da9b 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -96,7 +96,7 @@ en:
       optimized_link: Optimized image links are ephemeral and should not be included in theme source code.
     settings_errors:
       invalid_yaml: "Provided YAML is invalid."
-      data_type_not_a_number: "Setting `%{name}` type is unsupported. Supported types are `integer`, `bool`, `list` and `enum`"
+      data_type_not_a_number: "Setting `%{name}` type is unsupported. Supported types are `integer`, `bool`, `list`, `enum` and `upload`"
       name_too_long: "There is a setting with a too long name. Maximum length is 255"
       default_value_missing: "Setting `%{name}` has no default value"
       default_not_match_type: "Setting `%{name}` default value's type doesn't match with the setting type."
diff --git a/lib/theme_settings_manager.rb b/lib/theme_settings_manager.rb
index cc69dee04e..49ad6a6d61 100644
--- a/lib/theme_settings_manager.rb
+++ b/lib/theme_settings_manager.rb
@@ -167,4 +167,7 @@ class ThemeSettingsManager
       @opts[:choices]
     end
   end
+
+  class Upload < self
+  end
 end
diff --git a/spec/fixtures/theme_settings/valid_settings.yaml b/spec/fixtures/theme_settings/valid_settings.yaml
index 2885fba1b8..35a6973e66 100644
--- a/spec/fixtures/theme_settings/valid_settings.yaml
+++ b/spec/fixtures/theme_settings/valid_settings.yaml
@@ -68,3 +68,7 @@ enum_setting_03:
     - 10
     - 100
     - 1000
+
+upload_setting:
+  type: upload
+  default: ""

From 338eaf9167ca7c8979d3ffc1fe1d85e02345064e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 15 Apr 2020 10:30:30 -0400
Subject: [PATCH 0621/1830] Build(deps): Bump parser from 2.7.1.0 to 2.7.1.1
 (#9425)

Bumps [parser](https://github.com/whitequark/parser) from 2.7.1.0 to 2.7.1.1.
- [Release notes](https://github.com/whitequark/parser/releases)
- [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/whitequark/parser/compare/v2.7.1.0...v2.7.1.1)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 020705664b..f7e168e827 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -253,7 +253,7 @@ GEM
     parallel (1.19.1)
     parallel_tests (2.32.0)
       parallel
-    parser (2.7.1.0)
+    parser (2.7.1.1)
       ast (~> 2.4.0)
     pg (1.2.3)
     progress (3.5.2)

From 8b2e7483b29164802da8fa394eef4cde848f96db Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 15 Apr 2020 11:21:21 -0400
Subject: [PATCH 0622/1830] DEV: Only warn about invalid email setting in
 production

In development and test mode you don't care about email domains. Now
that `rake db:migrate` outputs a lot less this felt like an error when
it's really a warning.
---
 db/fixtures/990_settings.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/db/fixtures/990_settings.rb b/db/fixtures/990_settings.rb
index 7086f6b1cd..6f21e58813 100644
--- a/db/fixtures/990_settings.rb
+++ b/db/fixtures/990_settings.rb
@@ -5,6 +5,8 @@ if SiteSetting.notification_email == SiteSetting.defaults[:notification_email]
   begin
     SiteSetting.notification_email = "noreply@#{Discourse.current_hostname}"
   rescue Discourse::InvalidParameters
-    STDERR.puts "Discourse hostname: #{Discourse.current_hostname} is not a valid domain for emails!"
+    if Rails.env.production?
+      STDERR.puts "WARNING: Discourse hostname: #{Discourse.current_hostname} is not a valid domain for emails!"
+    end
   end
 end

From 5a8a844e4e2907f077099177d07d3a4c27571d2f Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 15 Apr 2020 19:59:27 +0200
Subject: [PATCH 0623/1830] FIX: attempts to listen more reliably to
 scopedCategoryId changes (#9431)

---
 .../select-kit/components/category-chooser.js    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/category-chooser.js b/app/assets/javascripts/select-kit/components/category-chooser.js
index 76c47a6a18..423481706a 100644
--- a/app/assets/javascripts/select-kit/components/category-chooser.js
+++ b/app/assets/javascripts/select-kit/components/category-chooser.js
@@ -85,13 +85,17 @@ export default ComboBoxComponent.extend({
     }
   },
 
-  content: computed("selectKit.{filter,options.scopedCategoryId}", function() {
-    if (!this.selectKit.filter && this.selectKit.options.scopedCategoryId) {
-      return this.categoriesByScope(this.selectKit.options.scopedCategoryId);
-    } else {
-      return this.categoriesByScope();
+  content: computed(
+    "selectKit.filter",
+    "selectKit.options.scopedCategoryId",
+    function() {
+      if (!this.selectKit.filter && this.selectKit.options.scopedCategoryId) {
+        return this.categoriesByScope(this.selectKit.options.scopedCategoryId);
+      } else {
+        return this.categoriesByScope();
+      }
     }
-  }),
+  ),
 
   categoriesByScope(scopedCategoryId = null) {
     const categories = this.fixedCategoryPositionsOnCreate

From 3c72cbc5de3fa0123e56e6134bd327bb61ccb659 Mon Sep 17 00:00:00 2001
From: Jay Pfaffman <jay@literatecomputing.com>
Date: Wed, 15 Apr 2020 13:45:14 -0700
Subject: [PATCH 0624/1830] FIX: Google groups import changed login URL (#9432)

I'm not clear why changing only the `wait_for_url` address was necessary and not also the `get` a few lines above, but this change seems to work for me on both literatecomputing.com Groups and a public group.
---
 script/import_scripts/google_groups.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/import_scripts/google_groups.rb b/script/import_scripts/google_groups.rb
index bbcfb6442b..359114e662 100755
--- a/script/import_scripts/google_groups.rb
+++ b/script/import_scripts/google_groups.rb
@@ -186,7 +186,7 @@ def login
   get("https://myaccount.google.com/?utm_source=sign_in_no_continue")
 
   begin
-    wait_for_url { |url| url.start_with?("https://myaccount.google.com") }
+    wait_for_url { |url| url.start_with?("https://accounts.google.com") }
   rescue Selenium::WebDriver::Error::TimeoutError
     exit_with_error("Failed to login. Please check the content of your cookies.txt".red.bold)
   end

From d7f744490a751502d6a7ea788567fc759357f2e2 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 16 Apr 2020 09:20:44 +1000
Subject: [PATCH 0625/1830] FEATURE: Decorate topic-level bookmark button with
 reminder time (#9426)

* Show the correct bookmark with clock icon when topic-level bookmark reminder time is set and show the time of the reminder in the title on hover.
* Add a new bookmark lib and reminder time formatting function to show time with today/tomorrow shorthand for readability. E.g. tomorrow at 8:00am instead of Apr 16 2020 at 8:00am. This only applies to today + tomorrow, future dates are still treated the same.
---
 .../discourse/controllers/bookmark.js         | 14 +----
 .../initializers/topic-footer-buttons.js      | 29 ++++++++---
 .../javascripts/discourse/lib/bookmark.js     | 31 +++++++++++
 .../javascripts/discourse/models/topic.js     |  5 +-
 .../discourse/widgets/post-menu.js            |  6 ++-
 .../stylesheets/desktop/topic-post.scss       |  3 +-
 app/assets/stylesheets/mobile/topic-post.scss |  3 +-
 app/serializers/topic_view_serializer.rb      |  9 ++++
 config/locales/client.en.yml                  |  7 ++-
 lib/topic_view.rb                             |  4 ++
 test/javascripts/lib/bookmark-test.js         | 51 +++++++++++++++++++
 11 files changed, 137 insertions(+), 25 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/lib/bookmark.js
 create mode 100644 test/javascripts/lib/bookmark-test.js

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 88ed8e00f2..39baaa07b2 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -7,6 +7,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { ajax } from "discourse/lib/ajax";
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
+import { REMINDER_TYPES } from "discourse/lib/bookmark";
 
 // global shortcuts that interfere with these modal shortcuts, they are rebound when the
 // modal is closed
@@ -20,19 +21,6 @@ const GLOBAL_SHORTCUTS_TO_PAUSE = ["c", "r", "l", "d", "t"];
 const START_OF_DAY_HOUR = 8;
 const LATER_TODAY_CUTOFF_HOUR = 17;
 const LATER_TODAY_MAX_HOUR = 18;
-const REMINDER_TYPES = {
-  AT_DESKTOP: "at_desktop",
-  LATER_TODAY: "later_today",
-  NEXT_BUSINESS_DAY: "next_business_day",
-  TOMORROW: "tomorrow",
-  NEXT_WEEK: "next_week",
-  NEXT_MONTH: "next_month",
-  CUSTOM: "custom",
-  LAST_CUSTOM: "last_custom",
-  NONE: "none",
-  START_OF_NEXT_BUSINESS_WEEK: "start_of_next_business_week",
-  LATER_THIS_WEEK: "later_this_week"
-};
 
 const BOOKMARK_BINDINGS = {
   enter: { handler: "saveAndClose" },
diff --git a/app/assets/javascripts/discourse/initializers/topic-footer-buttons.js b/app/assets/javascripts/discourse/initializers/topic-footer-buttons.js
index 3cd0827a6f..a75949ba23 100644
--- a/app/assets/javascripts/discourse/initializers/topic-footer-buttons.js
+++ b/app/assets/javascripts/discourse/initializers/topic-footer-buttons.js
@@ -1,10 +1,12 @@
 import showModal from "discourse/lib/show-modal";
 import { registerTopicFooterButton } from "discourse/lib/register-topic-footer-button";
+import { formattedReminderTime } from "discourse/lib/bookmark";
 
 export default {
   name: "topic-footer-buttons",
 
-  initialize() {
+  initialize(container) {
+    const currentUser = container.lookup("current-user:main");
     registerTopicFooterButton({
       id: "share-and-invite",
       icon: "link",
@@ -84,7 +86,12 @@ export default {
     registerTopicFooterButton({
       dependentKeys: ["topic.bookmarked", "topic.isPrivateMessage"],
       id: "bookmark",
-      icon: "bookmark",
+      icon() {
+        if (this.get("topic.bookmark_reminder_at")) {
+          return "discourse-bookmark-clock";
+        }
+        return "bookmark";
+      },
       priority: 1000,
       classNames() {
         const bookmarked = this.get("topic.bookmarked");
@@ -94,11 +101,21 @@ export default {
         const bookmarked = this.get("topic.bookmarked");
         return bookmarked ? "bookmarked.clear_bookmarks" : "bookmarked.title";
       },
-      title() {
+      translatedTitle() {
         const bookmarked = this.get("topic.bookmarked");
-        return bookmarked
-          ? "bookmarked.help.unbookmark"
-          : "bookmarked.help.bookmark";
+        const bookmark_reminder_at = this.get("topic.bookmark_reminder_at");
+        if (bookmarked) {
+          if (bookmark_reminder_at) {
+            return I18n.t("bookmarked.help.unbookmark_with_reminder", {
+              reminder_at: formattedReminderTime(
+                bookmark_reminder_at,
+                currentUser.resolvedTimezone()
+              )
+            });
+          }
+          return I18n.t("bookmarked.help.unbookmark");
+        }
+        return I18n.t("bookmarked.help.bookmark");
       },
       action: "toggleBookmark",
       dropdown() {
diff --git a/app/assets/javascripts/discourse/lib/bookmark.js b/app/assets/javascripts/discourse/lib/bookmark.js
new file mode 100644
index 0000000000..8874034e9a
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/bookmark.js
@@ -0,0 +1,31 @@
+export function formattedReminderTime(reminderAt, timezone) {
+  let reminderAtDate = moment.tz(reminderAt, timezone);
+  let formatted = reminderAtDate.format(I18n.t("dates.time"));
+  let now = moment.tz(timezone);
+  let tomorrow = moment(now).add(1, "day");
+
+  if (reminderAtDate.isSame(tomorrow, "date")) {
+    return I18n.t("bookmarks.reminders.tomorrow_with_time", {
+      time: formatted
+    });
+  } else if (reminderAtDate.isSame(now, "date")) {
+    return I18n.t("bookmarks.reminders.today_with_time", { time: formatted });
+  }
+  return I18n.t("bookmarks.reminders.at_time", {
+    date_time: reminderAtDate.format(I18n.t("dates.long_with_year"))
+  });
+}
+
+export const REMINDER_TYPES = {
+  AT_DESKTOP: "at_desktop",
+  LATER_TODAY: "later_today",
+  NEXT_BUSINESS_DAY: "next_business_day",
+  TOMORROW: "tomorrow",
+  NEXT_WEEK: "next_week",
+  NEXT_MONTH: "next_month",
+  CUSTOM: "custom",
+  LAST_CUSTOM: "last_custom",
+  NONE: "none",
+  START_OF_NEXT_BUSINESS_WEEK: "start_of_next_business_week",
+  LATER_THIS_WEEK: "later_this_week"
+};
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index c783fe8827..ce951d6edc 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -401,6 +401,7 @@ const Topic = RestModel.extend({
     if (firstPost) {
       firstPost.set("bookmarked", true);
       if (this.siteSettings.enable_bookmarks_with_reminders) {
+        this.set("bookmark_reminder_at", firstPost.bookmark_reminder_at);
         firstPost.set("bookmarked_with_reminder", true);
       }
       return [firstPost.id];
@@ -440,7 +441,7 @@ const Topic = RestModel.extend({
           if (this.siteSettings.enable_bookmarks_with_reminders) {
             return firstPost.toggleBookmarkWithReminder().then(response => {
               this.set("bookmarking", false);
-              if (response.closedWithoutSaving) {
+              if (response && response.closedWithoutSaving) {
                 this.set("bookmarked", false);
               } else {
                 return this.afterTopicBookmarked(firstPost);
@@ -459,6 +460,7 @@ const Topic = RestModel.extend({
           return ajax(`/t/${this.id}/remove_bookmarks`, { type: "PUT" })
             .then(() => {
               this.toggleProperty("bookmarked");
+              this.set("bookmark_reminder_at", null);
               if (posts) {
                 const updated = [];
                 posts.forEach(post => {
@@ -474,6 +476,7 @@ const Topic = RestModel.extend({
                     updated.push(post.id);
                   }
                 });
+                firstPost.set("bookmarked_with_reminder", false);
                 return updated;
               }
             })
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js b/app/assets/javascripts/discourse/widgets/post-menu.js
index c21d60f698..c8374058ee 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js
@@ -5,6 +5,7 @@ import { h } from "virtual-dom";
 import showModal from "discourse/lib/show-modal";
 import { Promise } from "rsvp";
 import ENV from "discourse-common/config/environment";
+import { formattedReminderTime } from "discourse/lib/bookmark";
 
 const LIKE_ACTION = 2;
 const VIBRATE_DURATION = 5;
@@ -314,12 +315,13 @@ registerButton("bookmarkWithReminder", (attrs, state, siteSettings) => {
     classNames.push("bookmarked");
 
     if (attrs.bookmarkReminderAt) {
-      let reminderAtDate = moment(attrs.bookmarkReminderAt).tz(
+      let formattedReminder = formattedReminderTime(
+        attrs.bookmarkReminderAt,
         Discourse.currentUser.resolvedTimezone()
       );
       title = "bookmarks.created_with_reminder";
       titleOptions = {
-        date: reminderAtDate.format(I18n.t("dates.long_with_year"))
+        date: formattedReminder
       };
     } else if (attrs.bookmarkReminderType === "at_desktop") {
       title = "bookmarks.created_with_at_desktop_reminder";
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 1b60137985..2406f4e79b 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -454,7 +454,8 @@ nav.post-controls {
       color: $tertiary;
     }
   }
-  .bookmark.bookmarked .d-icon-bookmark {
+  .bookmark.bookmarked .d-icon-bookmark,
+  .bookmark.bookmarked .d-icon-discourse-bookmark-clock {
     color: $tertiary;
   }
   .feature-on-profile.featured-on-profile .d-icon-id-card {
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 1d37052b88..e6c008c62d 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -237,7 +237,8 @@ a.reply-to-tab {
 #topic-footer-buttons {
   @include clearfix;
   padding: 20px 0 0 0;
-  .d-icon-bookmark.bookmarked {
+  .d-icon-bookmark.bookmarked,
+  .d-icon-discourse-bookmark-clock.bookmarked {
     color: $tertiary;
   }
   .combobox {
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 1aec5f442d..4bace8d9ed 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -61,6 +61,7 @@ class TopicViewSerializer < ApplicationSerializer
     :is_warning,
     :chunk_size,
     :bookmarked,
+    :bookmark_reminder_at,
     :message_archived,
     :topic_timer,
     :private_topic_timer,
@@ -192,6 +193,14 @@ class TopicViewSerializer < ApplicationSerializer
     end
   end
 
+  def include_bookmark_reminder_at?
+    SiteSetting.enable_bookmarks_with_reminders? && bookmarked
+  end
+
+  def bookmark_reminder_at
+    object.first_post_bookmark_reminder_at
+  end
+
   def topic_timer
     TopicTimerSerializer.new(object.topic.public_topic_timer, root: false)
   end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 3f25460ee5..64492a2bc7 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -302,11 +302,13 @@ en:
       help:
         bookmark: "Click to bookmark the first post on this topic"
         unbookmark: "Click to remove all bookmarks in this topic"
+        unbookmark_with_reminder: "Click to remove all bookmarks and reminders in this topic. You have a reminder set %{reminder_at} for this topic."
+
 
     bookmarks:
       created: "you've bookmarked this post"
       not_bookmarked: "bookmark this post"
-      created_with_reminder: "you've bookmarked this post with a reminder at %{date}"
+      created_with_reminder: "you've bookmarked this post with a reminder %{date}"
       created_with_at_desktop_reminder: "you've bookmarked this post and will be reminded next time you are at your desktop"
       remove: "Remove Bookmark"
       confirm_clear: "Are you sure you want to clear all your bookmarks from this topic?"
@@ -326,6 +328,9 @@ en:
         custom: "Custom date and time"
         last_custom: "Last"
         none: "No reminder needed"
+        today_with_time: "today at %{time}"
+        tomorrow_with_time: "tomorrow at %{time}"
+        at_time: "at %{date_time}"
 
     drafts:
       resume: "Resume"
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 82ae26c573..42405f8e33 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -354,6 +354,10 @@ class TopicView
     @topic.bookmarks.exists?(user_id: @user.id)
   end
 
+  def first_post_bookmark_reminder_at
+    @topic.first_post.bookmarks.where(user: @user).pluck_first(:reminder_at)
+  end
+
   MAX_PARTICIPANTS = 24
 
   def post_counts_by_user
diff --git a/test/javascripts/lib/bookmark-test.js b/test/javascripts/lib/bookmark-test.js
new file mode 100644
index 0000000000..1e2530a530
--- /dev/null
+++ b/test/javascripts/lib/bookmark-test.js
@@ -0,0 +1,51 @@
+import { formattedReminderTime } from "discourse/lib/bookmark";
+
+QUnit.module("lib:bookmark", {
+  beforeEach() {
+    // set the current now time for all tests
+    let now = moment.tz("2020-04-11 08:00:00", "Australia/Brisbane");
+    sandbox.useFakeTimers(now.valueOf());
+  }
+});
+
+QUnit.test(
+  "formattedReminderTime works when the reminder time is tomorrow",
+  assert => {
+    let reminderAt = "2020-04-12 09:45:00";
+    let reminderAtDate = moment
+      .tz(reminderAt, "Australia/Brisbane")
+      .format("H:mm a");
+    assert.equal(
+      formattedReminderTime(reminderAt, "Australia/Brisbane"),
+      "tomorrow at " + reminderAtDate
+    );
+  }
+);
+
+QUnit.test(
+  "formattedReminderTime works when the reminder time is today",
+  assert => {
+    let reminderAt = "2020-04-11 09:45:00";
+    let reminderAtDate = moment
+      .tz(reminderAt, "Australia/Brisbane")
+      .format("H:mm a");
+    assert.equal(
+      formattedReminderTime(reminderAt, "Australia/Brisbane"),
+      "today at " + reminderAtDate
+    );
+  }
+);
+
+QUnit.test(
+  "formattedReminderTime works when the reminder time is in the future",
+  assert => {
+    let reminderAt = "2020-04-15 09:45:00";
+    let reminderAtDate = moment
+      .tz(reminderAt, "Australia/Brisbane")
+      .format("H:mm a");
+    assert.equal(
+      formattedReminderTime(reminderAt, "Australia/Brisbane"),
+      "at Apr 15, 2020 " + reminderAtDate
+    );
+  }
+);

From 51672b912109438542f2bf97802f035f14ed0454 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 16 Apr 2020 11:32:21 +1000
Subject: [PATCH 0626/1830] FIX: Minor bookmark with reminder issue cleanup
 (#9436)

* Count user summary bookmarks from new Bookmark table if bookmarks with reminders enabled
* Update topic user bookmarked column when new topic bookmark changed
* Make in:bookmarks search work with new bookmarks
* Fix batch inserts for bookmark rake task (and thus migration). We were only inserting one bookmark at a time, completely defeating the purpose of batching!
---
 app/models/user_summary.rb        | 12 ++++---
 lib/bookmark_manager.rb           | 11 +++++++
 lib/search.rb                     | 31 ++++++++++++------
 lib/tasks/bookmarks.rake          | 53 ++++++++++++++++++-------------
 spec/lib/bookmark_manager_spec.rb | 14 ++++++++
 5 files changed, 85 insertions(+), 36 deletions(-)

diff --git a/app/models/user_summary.rb b/app/models/user_summary.rb
index 4d7af5149d..52c9199577 100644
--- a/app/models/user_summary.rb
+++ b/app/models/user_summary.rb
@@ -117,10 +117,14 @@ class UserSummary
   end
 
   def bookmark_count
-    UserAction
-      .where(user: @user)
-      .where(action_type: UserAction::BOOKMARK)
-      .count
+    if SiteSetting.enable_bookmarks_with_reminders
+      Bookmark.where(user: @user).count
+    else
+      UserAction
+        .where(user: @user)
+        .where(action_type: UserAction::BOOKMARK)
+        .count
+    end
   end
 
   def recent_time_read
diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index c2184b394c..33c2758c12 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -27,6 +27,11 @@ class BookmarkManager
       return add_errors_from(bookmark)
     end
 
+    # bookmarking the topic-level mean
+    if post.is_first_post?
+      update_topic_user_bookmarked(topic: post.topic, bookmarked: true)
+    end
+
     BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(@user)
     bookmark
   end
@@ -49,6 +54,8 @@ class BookmarkManager
         raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_delete?(bookmark)
         bookmark.destroy
       end
+
+      update_topic_user_bookmarked(topic: topic, bookmarked: false)
     end
 
     clear_at_desktop_cache_if_required
@@ -69,4 +76,8 @@ class BookmarkManager
   def user_has_any_pending_at_desktop_reminders?
     Bookmark.at_desktop_reminders_for_user(@user).any?
   end
+
+  def update_topic_user_bookmarked(topic:, bookmarked:)
+    TopicUser.change(@user.id, topic, bookmarked: bookmarked)
+  end
 end
diff --git a/lib/search.rb b/lib/search.rb
index 6bfc2834cb..bcbf5107e9 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -364,17 +364,28 @@ class Search
     end
   end
 
-  advanced_filter(/^in:(likes|bookmarks)$/) do |posts, match|
-    if @guardian.user
-      post_action_type = PostActionType.types[:like] if match == "likes"
-      post_action_type = PostActionType.types[:bookmark] if match == "bookmarks"
+  def post_action_type_filter(posts, post_action_type)
+    posts.where("posts.id IN (
+      SELECT pa.post_id FROM post_actions pa
+      WHERE pa.user_id = #{@guardian.user.id} AND
+            pa.post_action_type_id = #{post_action_type} AND
+            deleted_at IS NULL
+    )")
+  end
 
-      posts.where("posts.id IN (
-                            SELECT pa.post_id FROM post_actions pa
-                            WHERE pa.user_id = #{@guardian.user.id} AND
-                                  pa.post_action_type_id = #{post_action_type} AND
-                                  deleted_at IS NULL
-                         )")
+  advanced_filter(/^in:(likes)$/) do |posts, match|
+    if @guardian.user
+      post_action_type_filter(posts, PostActionType.types[:like])
+    end
+  end
+
+  advanced_filter(/^in:(bookmarks)$/) do |posts, match|
+    if @guardian.user
+      if SiteSetting.enable_bookmarks_with_reminders
+        posts.where("posts.id IN (SELECT post_id FROM bookmarks WHERE bookmarks.user_id = #{@guardian.user.id})")
+      else
+        post_action_type_filter(posts, PostActionType.types[:bookmark])
+      end
     end
   end
 
diff --git a/lib/tasks/bookmarks.rake b/lib/tasks/bookmarks.rake
index db48125b07..833a5f8015 100644
--- a/lib/tasks/bookmarks.rake
+++ b/lib/tasks/bookmarks.rake
@@ -30,34 +30,43 @@ task "bookmarks:sync_to_table", [:sync_limit] => :environment do |_t, args|
   post_action_bookmark_count = post_action_bookmarks.count('post_actions.id')
   i = 0
 
+  bookmarks_to_create = []
   post_action_bookmarks.find_each(batch_size: 2000) do |pab|
-    # clear at start of each batch to only insert X at a time
-    bookmarks_to_create = []
+    RakeHelpers.print_status_with_label("Creating post new bookmarks.......", i, post_action_bookmark_count)
+    now = Time.zone.now
+    bookmarks_to_create << {
+      topic_id: pab.topic_id,
+      post_id: pab.post_id,
+      user_id: pab.user_id,
+      created_at: now,
+      updated_at: now
+    }
 
-    Bookmark.transaction do
-      RakeHelpers.print_status_with_label("Creating post new bookmarks.......", i, post_action_bookmark_count)
-      now = Time.zone.now
-      bookmarks_to_create << {
-        topic_id: pab.topic_id,
-        post_id: pab.post_id,
-        user_id: pab.user_id,
-        created_at: now,
-        updated_at: now
-      }
+    i += 1
 
-      i += 1
-
-      # this will ignore conflicts in the bookmarks table so
-      # if the user already has a post bookmarked in the new way,
-      # then we don't error and keep on truckin'
-      #
-      # we shouldn't have duplicates here at any rate because of
-      # the above LEFT JOIN but best to be safe knowing this
-      # won't blow up
-      Bookmark.insert_all(bookmarks_to_create)
+    # once we get to 2000 records to create, insert them all and reset
+    # the array and counter to make sure we don't have too many in memory
+    if i >= 2000
+      create_bookmarks(bookmarks_to_create)
+      i = 0
+      bookmarks_to_create = []
     end
   end
 
+  # if there was < 2000 bookmarks this finishes off the last ones
+  create_bookmarks(bookmarks_to_create)
+
   RakeHelpers.print_status_with_label("Bookmark creation complete!            ", i, post_action_bookmark_count)
   puts ""
 end
+
+def create_bookmarks(bookmarks_to_create)
+  # this will ignore conflicts in the bookmarks table so
+  # if the user already has a post bookmarked in the new way,
+  # then we don't error and keep on truckin'
+  #
+  # we shouldn't have duplicates here at any rate because of
+  # the above LEFT JOIN but best to be safe knowing this
+  # won't blow up
+  Bookmark.insert_all(bookmarks_to_create)
+end
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index a19380bb83..2130e50610 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -32,6 +32,14 @@ RSpec.describe BookmarkManager do
       end
     end
 
+    context "when bookmarking the topic level (post is OP)" do
+      it "updates the topic user bookmarked column to true" do
+        subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
+        tu = TopicUser.find_by(user: user)
+        expect(tu.bookmarked).to eq(true)
+      end
+    end
+
     context "when the reminder type is at_desktop" do
       let(:reminder_type) { 'at_desktop' }
       let(:reminder_at) { nil }
@@ -188,6 +196,12 @@ RSpec.describe BookmarkManager do
       end
     end
 
+    it "updates the topic user bookmarked column to false" do
+      TopicUser.create(user: user, topic: topic, bookmarked: true)
+      subject.destroy_for_topic(topic)
+      tu = TopicUser.find_by(user: user)
+      expect(tu.bookmarked).to eq(false)
+    end
   end
 
   describe ".send_reminder_notification" do

From ca06991ee58685d867ff3b827624cd947e554c60 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 16 Apr 2020 07:57:32 +0200
Subject: [PATCH 0627/1830] FIX: makes topic-list-item decorator work on mobile
 (#9433)

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

diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr b/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr
index 07acb21db6..c126de0924 100644
--- a/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr
+++ b/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr
@@ -17,7 +17,7 @@
         <div class='main-link'>
           {{~raw-plugin-outlet name="topic-list-before-status"}}
           {{~raw "topic-status" topic=topic~}}
-          {{~topic-link topic~}}
+          {{~topic-link topic class="raw-link raw-topic-link"}}
           {{~#if topic.featured_link~}}
           {{~topic-featured-link topic~}}
           {{~/if~}}

From 5e244364547516a834517edc9b1ab5d940029f93 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 16 Apr 2020 07:58:04 +0200
Subject: [PATCH 0628/1830] DEV: attempts to fix various leaks (#9428)

* DEV: attempts to fix various leaks

* scheduleOnce doesnt work with anon function

* removes the I18n change
---
 .../discourse/components/composer-body.js     |  4 +-
 .../discourse/components/composer-editor.js   | 10 +--
 .../discourse/components/d-editor.js          |  6 +-
 .../edit-category-topic-template.js           |  4 +-
 .../discourse/components/emoji-picker.js      | 14 ++--
 .../components/expanding-text-area.js         |  4 +-
 .../discourse/components/quote-button.js      | 10 ++-
 .../components/search-advanced-options.js     |  2 +-
 .../discourse/controllers/insert-hyperlink.js |  4 +-
 .../discourse/controllers/login.js            |  5 +-
 .../discourse/controllers/topic.js            |  7 +-
 .../initializers/keyboard-shortcuts.js        |  4 ++
 .../initializers/title-notifications.js       |  8 +++
 .../discourse/lib/keyboard-shortcuts.js       |  4 ++
 .../discourse/lib/link-mentions.js            |  4 +-
 .../discourse/routes/topic-from-params.js     |  4 +-
 .../javascripts/discourse/routes/topic.js     | 70 +++++++++++--------
 .../wizard/components/invite-list.js          |  4 +-
 .../wizard/components/wizard-step.js          |  6 +-
 test/javascripts/test_helper.js               |  2 +
 20 files changed, 103 insertions(+), 73 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/composer-body.js b/app/assets/javascripts/discourse/components/composer-body.js
index 80bb8d38bb..e5a6e8261d 100644
--- a/app/assets/javascripts/discourse/components/composer-body.js
+++ b/app/assets/javascripts/discourse/components/composer-body.js
@@ -1,7 +1,7 @@
 import {
   run,
   cancel,
-  scheduleOnce,
+  schedule,
   later,
   debounce,
   throttle
@@ -65,7 +65,7 @@ export default Component.extend(KeyEnterEscape, {
     "composer.canEditTopicFeaturedLink"
   )
   resize() {
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       if (!this.element || this.isDestroying || this.isDestroyed) {
         return;
       }
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js b/app/assets/javascripts/discourse/components/composer-editor.js
index b14b0af74a..e6e000aa09 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/components/composer-editor.js
@@ -1,4 +1,4 @@
-import { debounce, later, next, scheduleOnce, throttle } from "@ember/runloop";
+import { debounce, later, next, schedule, throttle } from "@ember/runloop";
 import Component from "@ember/component";
 import userSearch from "discourse/lib/user-search";
 import discourseComputed, {
@@ -194,7 +194,7 @@ export default Component.extend({
         transformComplete: v => v.username || v.name,
         afterComplete() {
           // ensures textarea scroll position is correct
-          scheduleOnce("afterRender", () => $input.blur().focus());
+          schedule("afterRender", () => $input.blur().focus());
         },
         triggerRule: textarea =>
           !inCodeBlock(textarea.value, caretPosition(textarea))
@@ -323,7 +323,7 @@ export default Component.extend({
       this.appEvents.on(event, this, this._resetShouldBuildScrollMap);
     });
 
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       $input.on("touchstart mouseenter", () => {
         if (!$preview.is(":visible")) return;
         $preview.off("scroll");
@@ -569,7 +569,7 @@ export default Component.extend({
   },
 
   _warnMentionedGroups($preview) {
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       var found = this.warnedGroupMentions || [];
       $preview.find(".mention-group.notify").each((idx, e) => {
         const $e = $(e);
@@ -597,7 +597,7 @@ export default Component.extend({
       return;
     }
 
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       let found = this.warnedCannotSeeMentions || [];
 
       $preview.find(".mention.cannot-see").each((idx, e) => {
diff --git a/app/assets/javascripts/discourse/components/d-editor.js b/app/assets/javascripts/discourse/components/d-editor.js
index 4dd2c72700..11ec7b06ca 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js
+++ b/app/assets/javascripts/discourse/components/d-editor.js
@@ -356,7 +356,7 @@ export default Component.extend({
         return;
       }
       this.set("preview", cooked);
-      scheduleOnce("afterRender", () => {
+      schedule("afterRender", () => {
         if (this._state !== "inDOM") {
           return;
         }
@@ -559,7 +559,7 @@ export default Component.extend({
   },
 
   _selectText(from, length) {
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       const textarea = this.element.querySelector("textarea.d-editor-input");
       const $textarea = $(textarea);
       const oldScrollPos = $textarea.scrollTop();
@@ -898,7 +898,7 @@ export default Component.extend({
   // ensures textarea scroll position is correct
   _focusTextArea() {
     const textarea = this.element.querySelector("textarea.d-editor-input");
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       textarea.blur();
       textarea.focus();
     });
diff --git a/app/assets/javascripts/discourse/components/edit-category-topic-template.js b/app/assets/javascripts/discourse/components/edit-category-topic-template.js
index 9a5d7d7ab1..1ccf804dd1 100644
--- a/app/assets/javascripts/discourse/components/edit-category-topic-template.js
+++ b/app/assets/javascripts/discourse/components/edit-category-topic-template.js
@@ -1,4 +1,4 @@
-import { scheduleOnce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 import { observes } from "discourse-common/utils/decorators";
 
@@ -6,7 +6,7 @@ export default buildCategoryPanel("topic-template", {
   @observes("activeTab")
   _activeTabChanged: function() {
     if (this.activeTab) {
-      scheduleOnce("afterRender", () =>
+      schedule("afterRender", () =>
         this.element.querySelector(".d-editor-input").focus()
       );
     }
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js b/app/assets/javascripts/discourse/components/emoji-picker.js
index 88b7599324..90e2fefe13 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js
@@ -1,5 +1,5 @@
 import { inject as service } from "@ember/service";
-import { schedule } from "@ember/runloop";
+import { throttle, debounce, schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { on, observes } from "discourse-common/utils/decorators";
 import { findRawTemplate } from "discourse/lib/raw-templates";
@@ -12,8 +12,6 @@ import {
 import { safariHacksDisabled } from "discourse/lib/utilities";
 import ENV, { INPUT_DELAY } from "discourse-common/config/environment";
 
-const { run } = Ember;
-
 const PER_ROW = 11;
 function customEmojis() {
   const list = extendedEmojiList();
@@ -54,7 +52,7 @@ export default Component.extend({
       recentEmojis: this.emojiStore.favorites
     });
 
-    run.scheduleOnce("afterRender", this, function() {
+    schedule("afterRender", this, function() {
       this._bindEvents();
       this._loadCategoriesEmojis();
       this._positionPicker();
@@ -110,7 +108,7 @@ export default Component.extend({
   filterChanged() {
     this.$filter.find(".clear-filter").toggle(!_.isEmpty(this.filter));
     const filterDelay = this.site.isMobileDevice ? 400 : INPUT_DELAY;
-    run.debounce(this, this._filterEmojisList, filterDelay);
+    debounce(this, this._filterEmojisList, filterDelay);
   },
 
   @observes("selectedDiversity")
@@ -309,11 +307,11 @@ export default Component.extend({
 
   _bindResizing() {
     $(window).on("resize", () => {
-      run.throttle(this, this._positionPicker, 16);
+      throttle(this, this._positionPicker, 16);
     });
 
     $("#reply-control").on("div-resizing", () => {
-      run.throttle(this, this._positionPicker, 16);
+      throttle(this, this._positionPicker, 16);
     });
   },
 
@@ -376,7 +374,7 @@ export default Component.extend({
 
   _bindSectionsScroll() {
     let onScroll = () => {
-      run.debounce(this, this._checkVisibleSection, 50);
+      debounce(this, this._checkVisibleSection, 50);
     };
 
     this.$list.on("scroll", onScroll);
diff --git a/app/assets/javascripts/discourse/components/expanding-text-area.js b/app/assets/javascripts/discourse/components/expanding-text-area.js
index ca215cc3f7..94c976c4d3 100644
--- a/app/assets/javascripts/discourse/components/expanding-text-area.js
+++ b/app/assets/javascripts/discourse/components/expanding-text-area.js
@@ -1,12 +1,12 @@
 import { TextArea } from "@ember/component";
-import { scheduleOnce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import { on, observes } from "discourse-common/utils/decorators";
 import autosize from "discourse/lib/autosize";
 
 export default TextArea.extend({
   @on("didInsertElement")
   _startWatching() {
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       $(this.element).focus();
       autosize(this.element);
     });
diff --git a/app/assets/javascripts/discourse/components/quote-button.js b/app/assets/javascripts/discourse/components/quote-button.js
index 3a35269153..8f7d464543 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js
+++ b/app/assets/javascripts/discourse/components/quote-button.js
@@ -1,4 +1,4 @@
-import { scheduleOnce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import discourseDebounce from "discourse/lib/debounce";
 import toMarkdown from "discourse/lib/to-markdown";
@@ -138,7 +138,11 @@ export default Component.extend({
     }
 
     // change the position of the button
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
+      if (!this.element || this.isDestroying || this.isDestroyed) {
+        return;
+      }
+
       let top = markerOffset.top;
       let left = markerOffset.left + Math.max(0, parentScrollLeft);
 
@@ -160,6 +164,8 @@ export default Component.extend({
   },
 
   didInsertElement() {
+    this._super(...arguments);
+
     const { isWinphone, isAndroid } = this.capabilities;
     const wait = isWinphone || isAndroid ? INPUT_DELAY : 25;
     const onSelectionChanged = discourseDebounce(
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js b/app/assets/javascripts/discourse/components/search-advanced-options.js
index 136c416588..274e62e7b1 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js
@@ -77,7 +77,7 @@ export default Component.extend({
 
     this._init();
 
-    scheduleOnce("afterRender", () => this._update());
+    scheduleOnce("afterRender", this, this._update);
   },
 
   @observes("searchTerm")
diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js
index 57d751b56e..4e5f6ba821 100644
--- a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js
+++ b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js
@@ -1,5 +1,5 @@
 import { isEmpty } from "@ember/utils";
-import { cancel, debounce, scheduleOnce } from "@ember/runloop";
+import { cancel, debounce, schedule } from "@ember/runloop";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { searchForTerm } from "discourse/lib/search";
@@ -17,7 +17,7 @@ export default Controller.extend(ModalFunctionality, {
       selectedRow: -1
     });
 
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       const element = document.querySelector(".insert-link");
 
       element.addEventListener("keydown", e => this.keyDown(e));
diff --git a/app/assets/javascripts/discourse/controllers/login.js b/app/assets/javascripts/discourse/controllers/login.js
index de39f7ec8a..993b1a398f 100644
--- a/app/assets/javascripts/discourse/controllers/login.js
+++ b/app/assets/javascripts/discourse/controllers/login.js
@@ -2,8 +2,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { alias, or, readOnly } from "@ember/object/computed";
 import EmberObject from "@ember/object";
-import { next } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { next, schedule } from "@ember/runloop";
 import Controller, { inject as controller } from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -152,7 +151,7 @@ export default Controller.extend(ModalFunctionality, {
 
               // only need to focus the 2FA input for TOTP
               if (!this.showSecurityKey) {
-                scheduleOnce("afterRender", () =>
+                schedule("afterRender", () =>
                   document
                     .getElementById("second-factor")
                     .querySelector("input")
diff --git a/app/assets/javascripts/discourse/controllers/topic.js b/app/assets/javascripts/discourse/controllers/topic.js
index 49da4ed9f4..eea22c7d88 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js
+++ b/app/assets/javascripts/discourse/controllers/topic.js
@@ -1,8 +1,7 @@
 import { isPresent, isEmpty } from "@ember/utils";
 import { or, and, not, alias } from "@ember/object/computed";
 import EmberObject from "@ember/object";
-import { next } from "@ember/runloop";
-import { scheduleOnce } from "@ember/runloop";
+import { next, schedule } from "@ember/runloop";
 import Controller, { inject as controller } from "@ember/controller";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import Composer from "discourse/models/composer";
@@ -137,9 +136,7 @@ export default Controller.extend(bufferedProperty("model"), {
       return;
     }
 
-    scheduleOnce("afterRender", () => {
-      this.send("showHistory", post, revision);
-    });
+    schedule("afterRender", () => this.send("showHistory", post, revision));
   },
 
   showCategoryChooser: not("model.isPrivateMessage"),
diff --git a/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js b/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
index a0de2c5d2a..90860193f9 100644
--- a/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
@@ -7,5 +7,9 @@ export default {
   initialize(container) {
     KeyboardShortcuts.init(Mousetrap, container);
     KeyboardShortcuts.bindEvents();
+  },
+
+  teardown() {
+    KeyboardShortcuts.teardown();
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/title-notifications.js b/app/assets/javascripts/discourse/initializers/title-notifications.js
index cfc0c3ed6d..c7ae1d5f06 100644
--- a/app/assets/javascripts/discourse/initializers/title-notifications.js
+++ b/app/assets/javascripts/discourse/initializers/title-notifications.js
@@ -13,6 +13,14 @@ export default {
       .on("notifications:changed", this, "_updateTitle");
   },
 
+  teardown(container) {
+    container
+      .lookup("service:app-events")
+      .off("notifications:changed", this, "_updateTitle");
+
+    this.container = null;
+  },
+
   _updateTitle() {
     const user = this.container.lookup("current-user:main");
     if (!user) return; // must be logged in
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index db3400cabd..9a3aff88a4 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -106,6 +106,10 @@ export default {
     });
   },
 
+  teardown() {
+    this.container = null;
+  },
+
   bindKey(key, binding = null) {
     if (!binding) {
       binding = DEFAULT_BINDINGS[key];
diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js b/app/assets/javascripts/discourse/lib/link-mentions.js
index 30bdcdda95..02872edaec 100644
--- a/app/assets/javascripts/discourse/lib/link-mentions.js
+++ b/app/assets/javascripts/discourse/lib/link-mentions.js
@@ -1,4 +1,4 @@
-import { scheduleOnce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
 import { formatUsername } from "discourse/lib/utilities";
@@ -40,7 +40,7 @@ const checked = {};
 const cannotSee = [];
 
 function updateFound($mentions, usernames) {
-  scheduleOnce("afterRender", function() {
+  schedule("afterRender", function() {
     $mentions.each((i, e) => {
       const $e = $(e);
       const username = usernames[i];
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js b/app/assets/javascripts/discourse/routes/topic-from-params.js
index 1429fb0c16..bcf904ad38 100644
--- a/app/assets/javascripts/discourse/routes/topic-from-params.js
+++ b/app/assets/javascripts/discourse/routes/topic-from-params.js
@@ -1,5 +1,5 @@
 import { isEmpty } from "@ember/utils";
-import { scheduleOnce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import Draft from "discourse/models/draft";
@@ -60,7 +60,7 @@ export default DiscourseRoute.extend({
         topicController.subscribe();
 
         // Highlight our post after the next render
-        scheduleOnce("afterRender", () =>
+        schedule("afterRender", () =>
           this.appEvents.trigger("post:highlight", closest)
         );
 
diff --git a/app/assets/javascripts/discourse/routes/topic.js b/app/assets/javascripts/discourse/routes/topic.js
index 5aebefe6a4..46a1b3ada9 100644
--- a/app/assets/javascripts/discourse/routes/topic.js
+++ b/app/assets/javascripts/discourse/routes/topic.js
@@ -1,20 +1,26 @@
 import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
-import { cancel, later, scheduleOnce } from "@ember/runloop";
+import { cancel, later, schedule } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import { ID_CONSTRAINT } from "discourse/models/topic";
 import { EventTarget } from "rsvp";
 
-let isTransitioning = false,
-  scheduledReplace = null,
-  lastScrollPos = null;
-
 const SCROLL_DELAY = 500;
 
 import showModal from "discourse/lib/show-modal";
 
 const TopicRoute = DiscourseRoute.extend({
+  init() {
+    this._super(...arguments);
+
+    this.setProperties({
+      isTransitioning: false,
+      scheduledReplace: null,
+      lastScrollPos: null
+    });
+  },
+
   redirect() {
     return this.redirectIfLoginRequired();
   },
@@ -169,7 +175,7 @@ const TopicRoute = DiscourseRoute.extend({
     // Use replaceState to update the URL once it changes
     postChangedRoute(currentPost) {
       // do nothing if we are transitioning to another route
-      if (isTransitioning || TopicRoute.disableReplaceState) {
+      if (this.isTransitioning || TopicRoute.disableReplaceState) {
         return;
       }
 
@@ -180,14 +186,17 @@ const TopicRoute = DiscourseRoute.extend({
           postUrl += "/" + currentPost;
         }
 
-        cancel(scheduledReplace);
-        lastScrollPos = parseInt($(document).scrollTop(), 10);
-        scheduledReplace = later(
-          this,
-          "_replaceUnlessScrolling",
-          postUrl,
-          Ember.Test ? 0 : SCROLL_DELAY
-        );
+        cancel(this.scheduledReplace);
+
+        this.setProperties({
+          lastScrollPos: parseInt($(document).scrollTop(), 10),
+          scheduledReplace: later(
+            this,
+            "_replaceUnlessScrolling",
+            postUrl,
+            Ember.Test ? 0 : SCROLL_DELAY
+          )
+        });
       }
     },
 
@@ -198,8 +207,8 @@ const TopicRoute = DiscourseRoute.extend({
 
     willTransition() {
       this._super(...arguments);
-      cancel(scheduledReplace);
-      isTransitioning = true;
+      cancel(this.scheduledReplace);
+      this.set("isTransitioning", true);
       return true;
     }
   },
@@ -208,17 +217,20 @@ const TopicRoute = DiscourseRoute.extend({
   // within a topic until scrolling stops
   _replaceUnlessScrolling(url) {
     const currentPos = parseInt($(document).scrollTop(), 10);
-    if (currentPos === lastScrollPos) {
+    if (currentPos === this.lastScrollPos) {
       DiscourseURL.replaceState(url);
       return;
     }
-    lastScrollPos = currentPos;
-    scheduledReplace = later(
-      this,
-      "_replaceUnlessScrolling",
-      url,
-      SCROLL_DELAY
-    );
+
+    this.setProperties({
+      lastScrollPos: currentPos,
+      scheduledReplace: later(
+        this,
+        "_replaceUnlessScrolling",
+        url,
+        SCROLL_DELAY
+      )
+    });
   },
 
   setupParams(topic, params) {
@@ -264,7 +276,7 @@ const TopicRoute = DiscourseRoute.extend({
 
   activate() {
     this._super(...arguments);
-    isTransitioning = false;
+    this.set("isTransitioning", false);
 
     const topic = this.modelFor("topic");
     this.session.set("lastTopicIdViewed", parseInt(topic.get("id"), 10));
@@ -292,7 +304,7 @@ const TopicRoute = DiscourseRoute.extend({
 
   setupController(controller, model) {
     // In case we navigate from one topic directly to another
-    isTransitioning = false;
+    this.set("isTransitioning", false);
 
     controller.setProperties({
       model,
@@ -314,9 +326,9 @@ const TopicRoute = DiscourseRoute.extend({
     // We reset screen tracking every time a topic is entered
     this.screenTrack.start(model.get("id"), controller);
 
-    scheduleOnce("afterRender", () => {
-      this.appEvents.trigger("header:update-topic", model);
-    });
+    schedule("afterRender", () =>
+      this.appEvents.trigger("header:update-topic", model)
+    );
   }
 });
 
diff --git a/app/assets/javascripts/wizard/components/invite-list.js b/app/assets/javascripts/wizard/components/invite-list.js
index 2c541d38c5..39435e0f89 100644
--- a/app/assets/javascripts/wizard/components/invite-list.js
+++ b/app/assets/javascripts/wizard/components/invite-list.js
@@ -1,4 +1,4 @@
-import { scheduleOnce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 
 export default Component.extend({
@@ -63,7 +63,7 @@ export default Component.extend({
       this.updateField();
 
       this.set("inviteEmail", "");
-      scheduleOnce("afterRender", () =>
+      schedule("afterRender", () =>
         this.element.querySelector(".invite-email").focus()
       );
     },
diff --git a/app/assets/javascripts/wizard/components/wizard-step.js b/app/assets/javascripts/wizard/components/wizard-step.js
index dd36c58891..9056e9a052 100644
--- a/app/assets/javascripts/wizard/components/wizard-step.js
+++ b/app/assets/javascripts/wizard/components/wizard-step.js
@@ -1,4 +1,4 @@
-import { scheduleOnce } from "@ember/runloop";
+import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import getUrl from "discourse-common/lib/get-url";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
@@ -96,7 +96,7 @@ export default Component.extend({
   },
 
   autoFocus() {
-    scheduleOnce("afterRender", () => {
+    schedule("afterRender", () => {
       const $invalid = $(".wizard-field.invalid:eq(0) .wizard-focusable");
 
       if ($invalid.length) {
@@ -108,7 +108,7 @@ export default Component.extend({
   },
 
   animateInvalidFields() {
-    scheduleOnce("afterRender", () =>
+    schedule("afterRender", () =>
       $(".invalid input[type=text], .invalid textarea").wiggle(2, 100)
     );
   },
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 0f2fd5ec0a..38afc19d67 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -201,6 +201,8 @@ QUnit.testDone(function() {
   });
 
   window.MessageBus.unsubscribe("*");
+  delete window.server;
+  window.Mousetrap.reset();
 });
 
 // Load ES6 tests

From ed6b3b82bd376e80fa5880bc767cc6a5d5d66702 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 16 Apr 2020 12:13:13 +0100
Subject: [PATCH 0629/1830] FIX: Reopen sidekiq log files after rotation
 (#9429)

Unicorn uses the USR1 to indicate that log files should be reopened. This commit implements the same functionality for our forked sidekiq workers:

- USR1 is intercepted in the unicorn master, and re-issued to all child processes
- USR1 is trapped in the sidekiq processes, and `Unicorn::Util.reopen_logs` is used to re-open log files
---
 config/unicorn.conf.rb |  7 +++++++
 lib/demon/base.rb      | 11 +++++++++++
 lib/demon/sidekiq.rb   |  7 +++++++
 3 files changed, 25 insertions(+)

diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index dd698f379f..268edb66c9 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -95,6 +95,13 @@ before_fork do |server, worker|
         Demon::Sidekiq.stop
       end
 
+      # Trap USR1, so we can re-issue to sidekiq workers
+      # but chain the default unicorn implementation as well
+      old_handler = Signal.trap("USR1") do
+        Demon::Sidekiq.kill("USR1")
+        old_handler.call
+      end
+
       class ::Unicorn::HttpServer
         alias :master_sleep_orig :master_sleep
 
diff --git a/lib/demon/base.rb b/lib/demon/base.rb
index d1626114d7..fc752a4464 100644
--- a/lib/demon/base.rb
+++ b/lib/demon/base.rb
@@ -37,6 +37,13 @@ class Demon::Base
     end
   end
 
+  def self.kill(signal)
+    return unless @demons
+    @demons.values.each do |demon|
+      demon.kill(signal)
+    end
+  end
+
   attr_reader :pid, :parent_pid, :started, :index
   attr_accessor :stop_timeout
 
@@ -63,6 +70,10 @@ class Demon::Base
     end
   end
 
+  def kill(signal)
+    Process.kill(signal, @pid)
+  end
+
   def stop_signal
     "HUP"
   end
diff --git a/lib/demon/sidekiq.rb b/lib/demon/sidekiq.rb
index e5ff82f702..a66fed3aef 100644
--- a/lib/demon/sidekiq.rb
+++ b/lib/demon/sidekiq.rb
@@ -34,6 +34,13 @@ class Demon::Sidekiq < ::Demon::Base
     Sidekiq.logger = nil
     cli = Sidekiq::CLI.instance
 
+    # Unicorn uses USR1 to indicate that log files have been rotated
+    Signal.trap("USR1") do
+      puts "Sidekiq PID #{Process.pid} reopening logs..."
+      Unicorn::Util.reopen_logs
+      puts "Sidekiq PID #{Process.pid} done reopening logs..."
+    end
+
     options = ["-c", GlobalSetting.sidekiq_workers.to_s]
 
     [['critical', 8], ['default', 4], ['low', 2], ['ultra_low', 1]].each do |queue_name, weight|

From 1168d5c70ab9edbef6a7008a10c61291b2772a7f Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 16 Apr 2020 15:45:18 +0200
Subject: [PATCH 0630/1830] FIX: ensures keyboard event is not propagated when
 using c shortcut (#9441)

---
 app/assets/javascripts/discourse/lib/keyboard-shortcuts.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index 9a3aff88a4..2ce05f463b 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -283,11 +283,13 @@ export default {
     });
   },
 
-  createTopic() {
+  createTopic(event) {
     if (!(this.currentUser && this.currentUser.can_create_topic)) {
       return;
     }
 
+    event.preventDefault();
+
     // If the page has a create-topic button, use it for context sensitive attributes like category
     let $createTopicButton = $("#create-topic");
     if ($createTopicButton.length) {

From 074509fd957ebc63c2afe9cc06b7609632217638 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 16 Apr 2020 12:28:16 -0400
Subject: [PATCH 0631/1830] FIX: don't demote users to TL2 when default trust
 level is 3

Within 24 hours of signing up, new users were losing their
default trust level of 3. With this fix, demotions from
trust level 3 won't happen when the "default trust level"
setting is 3 or 4.
---
 app/jobs/scheduled/tl3_promotions.rb          | 32 ++++++++++---------
 app/models/trust_level3_requirements.rb       |  1 +
 spec/jobs/tl3_promotions_spec.rb              |  9 ++++++
 spec/models/trust_level3_requirements_spec.rb |  8 +++++
 4 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/app/jobs/scheduled/tl3_promotions.rb b/app/jobs/scheduled/tl3_promotions.rb
index 848f409b9c..7dcce77a05 100644
--- a/app/jobs/scheduled/tl3_promotions.rb
+++ b/app/jobs/scheduled/tl3_promotions.rb
@@ -6,22 +6,24 @@ module Jobs
     daily at: 4.hours
 
     def execute(args)
-      # Demotions
-      demoted_user_ids = []
-      User.real
-        .joins("LEFT JOIN (SELECT gu.user_id, MAX(g.grant_trust_level) AS group_granted_trust_level FROM groups g, group_users gu WHERE g.id = gu.group_id GROUP BY gu.user_id) tl ON users.id = tl.user_id")
-        .where(
-          trust_level: TrustLevel[3],
-          manual_locked_trust_level: nil
-        )
-        .where("group_granted_trust_level IS NULL OR group_granted_trust_level < ?", TrustLevel[3])
-        .find_each do |u|
-        # Don't demote too soon after being promoted
-        next if u.on_tl3_grace_period?
+      if SiteSetting.default_trust_level < 3
+        # Demotions
+        demoted_user_ids = []
+        User.real
+          .joins("LEFT JOIN (SELECT gu.user_id, MAX(g.grant_trust_level) AS group_granted_trust_level FROM groups g, group_users gu WHERE g.id = gu.group_id GROUP BY gu.user_id) tl ON users.id = tl.user_id")
+          .where(
+            trust_level: TrustLevel[3],
+            manual_locked_trust_level: nil
+          )
+          .where("group_granted_trust_level IS NULL OR group_granted_trust_level < ?", TrustLevel[3])
+          .find_each do |u|
+          # Don't demote too soon after being promoted
+          next if u.on_tl3_grace_period?
 
-        if Promotion.tl3_lost?(u)
-          demoted_user_ids << u.id
-          Promotion.new(u).change_trust_level!(TrustLevel[2])
+          if Promotion.tl3_lost?(u)
+            demoted_user_ids << u.id
+            Promotion.new(u).change_trust_level!(TrustLevel[2])
+          end
         end
       end
 
diff --git a/app/models/trust_level3_requirements.rb b/app/models/trust_level3_requirements.rb
index b01da6c10e..bf511a0647 100644
--- a/app/models/trust_level3_requirements.rb
+++ b/app/models/trust_level3_requirements.rb
@@ -67,6 +67,7 @@ class TrustLevel3Requirements
 
   def requirements_lost?
     return false if trust_level_locked
+    return false if SiteSetting.default_trust_level > 2
 
     @user.suspended? ||
       @user.silenced? ||
diff --git a/spec/jobs/tl3_promotions_spec.rb b/spec/jobs/tl3_promotions_spec.rb
index abfa8ebc8f..f76007df55 100644
--- a/spec/jobs/tl3_promotions_spec.rb
+++ b/spec/jobs/tl3_promotions_spec.rb
@@ -135,5 +135,14 @@ describe Jobs::Tl3Promotions do
       run_job
       expect(user.reload.trust_level).to eq(TrustLevel[3])
     end
+
+    it "doesn't demote if default trust level for all users is 3" do
+      SiteSetting.default_trust_level = 3
+      user = Fabricate(:user, trust_level: TrustLevel[3], created_at: 1.year.ago)
+      expect(user).to_not be_on_tl3_grace_period
+      TrustLevel3Requirements.any_instance.stubs(:requirements_met?).returns(false)
+      run_job
+      expect(user.reload.trust_level).to eq(TrustLevel[3])
+    end
   end
 end
diff --git a/spec/models/trust_level3_requirements_spec.rb b/spec/models/trust_level3_requirements_spec.rb
index ef36c18728..a28f54debb 100644
--- a/spec/models/trust_level3_requirements_spec.rb
+++ b/spec/models/trust_level3_requirements_spec.rb
@@ -586,6 +586,14 @@ describe TrustLevel3Requirements do
       user.silenced_till = 4.weeks.from_now
       expect(tl3_requirements.requirements_lost?).to eq(true)
     end
+
+    [3, 4].each do |default_tl|
+      it "is not lost if default_trust_level is #{default_tl}" do
+        SiteSetting.default_trust_level = default_tl
+        tl3_requirements.stubs(:days_visited).returns(1)
+        expect(tl3_requirements.requirements_lost?).to eq(false)
+      end
+    end
   end
 
 end

From 424a76145d8f844c2e952f7974bcde16d5a85faa Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Wed, 15 Apr 2020 14:37:37 -0700
Subject: [PATCH 0632/1830] DEV: Fix no-implicit-this for all user-* components

---
 .../templates/components/user-badge.hbs       |   8 +-
 .../components/user-card-contents.hbs         | 156 +++++++++---------
 .../components/user-fields/confirm.hbs        |  10 +-
 .../components/user-fields/dropdown.hbs       |  18 +-
 .../templates/components/user-fields/text.hbs |  10 +-
 .../components/user-flag-percentage.hbs       |   8 +-
 .../templates/components/user-info.hbs        |  18 +-
 .../components/user-profile-avatar.hbs        |  14 +-
 .../templates/components/user-stat.hbs        |  14 +-
 .../templates/components/user-stream-item.hbs |  50 +++---
 .../templates/components/user-stream.hbs      |   2 +-
 .../user-summary-category-search.hbs          |   6 +-
 .../components/user-summary-section.hbs       |   2 +-
 .../components/user-summary-topic.hbs         |   8 +-
 .../components/user-summary-topics-list.hbs   |  12 +-
 .../components/user-summary-user.hbs          |   6 +-
 .../components/user-summary-users-list.hbs    |   6 +-
 17 files changed, 174 insertions(+), 174 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/user-badge.hbs b/app/assets/javascripts/discourse/templates/components/user-badge.hbs
index c1af47a6da..89c7dd8b70 100644
--- a/app/assets/javascripts/discourse/templates/components/user-badge.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-badge.hbs
@@ -1,7 +1,7 @@
-<a href={{badgeUrl}}>
-  {{#badge-button badge=badge}}
-    {{#if showGrantCount}}
-      <span class="count">(&times;&nbsp;{{count}})</span>
+<a href={{this.badgeUrl}}>
+  {{#badge-button badge=@badge}}
+    {{#if this.showGrantCount}}
+      <span class="count">(&times;&nbsp;{{@count}})</span>
     {{/if}}
   {{/badge-button}}
 </a>
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index e5ac4178c2..3be60e856c 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -1,6 +1,6 @@
-{{#if visible}}
+{{#if this.visible}}
   <div class="card-content">
-    {{#if loading}}
+    {{#if this.loading}}
       <div class="card-row first-row">
         <div class="user-card-avatar">
           <div class="card-avatar-placeholder animated-placeholder placeholder-animation"></div>
@@ -22,71 +22,71 @@
     {{else}}
       <div class="card-row first-row">
         <div class="user-card-avatar">
-          {{#if user.profile_hidden}}
-            <span class="card-huge-avatar">{{bound-avatar user "huge"}}</span>
+          {{#if this.user.profile_hidden}}
+            <span class="card-huge-avatar">{{bound-avatar this.user "huge"}}</span>
           {{else}}
-            <a href={{user.path}} {{action "showUser" user}} class="card-huge-avatar">{{bound-avatar user "huge"}}</a>
+            <a href={{this.user.path}} {{action "showUser" this.user}} class="card-huge-avatar">{{bound-avatar this.user "huge"}}</a>
           {{/if}}
-          {{#if user.primary_group_name}}
+          {{#if this.user.primary_group_name}}
             {{avatar-flair
-            flairURL=user.primary_group_flair_url
-            flairBgColor=user.primary_group_flair_bg_color
-            flairColor=user.primary_group_flair_color
-            groupName=user.primary_group_name}}
+            flairURL=this.user.primary_group_flair_url
+            flairBgColor=this.user.primary_group_flair_bg_color
+            flairColor=this.user.primary_group_flair_color
+            groupName=this.user.primary_group_name}}
           {{/if}}
-          {{plugin-outlet name="user-card-avatar-flair" args=(hash user=user) tagName="div"}}
+          {{plugin-outlet name="user-card-avatar-flair" args=(hash user=this.user) tagName="div"}}
         </div>
         <div class="names">
-          <h1 class="{{staff}} {{newUser}} {{if nameFirst "full-name" "username"}}">
-            {{#if user.profile_hidden}}
+          <h1 class="{{this.staff}} {{this.newUser}} {{if this.nameFirst "full-name" "username"}}">
+            {{#if this.user.profile_hidden}}
               <span class="name-username-wrapper">
-                {{if nameFirst user.name (format-username username)}}
+                {{if this.nameFirst this.user.name (format-username this.username)}}
               </span>
             {{else}}
-              <a href={{user.path}} {{action "showUser" user}} class="user-profile-link">
+              <a href={{this.user.path}} {{action "showUser" this.user}} class="user-profile-link">
                 <span class="name-username-wrapper">
-                  {{if nameFirst user.name (format-username username)}}
+                  {{if this.nameFirst this.user.name (format-username this.username)}}
                 </span>
-                {{user-status user currentUser=currentUser}}
+                {{user-status this.user currentUser=this.currentUser}}
               </a>
             {{/if}}
           </h1>
-          {{plugin-outlet name="user-card-after-username" args=(hash user=user showUser=(action "showUser" user)) tagName=""}}
-          {{#if nameFirst}}
-            <h2 class="username">{{username}}</h2>
+          {{plugin-outlet name="user-card-after-username" args=(hash user=this.user showUser=(action "showUser" this.user)) tagName=""}}
+          {{#if this.nameFirst}}
+            <h2 class="username">{{this.username}}</h2>
           {{else}}
-            {{#if user.name}}
-              <h2 class="full-name">{{user.name}}</h2>
+            {{#if this.user.name}}
+              <h2 class="full-name">{{this.user.name}}</h2>
             {{/if}}
           {{/if}}
-          {{#if user.title}}
-            <h2>{{user.title}}</h2>
+          {{#if this.user.title}}
+            <h2>{{this.user.title}}</h2>
           {{/if}}
-          {{#if user.staged}}
+          {{#if this.user.staged}}
             <h2 class="staged">{{i18n "user.staged"}}</h2>
           {{/if}}
-          {{plugin-outlet name="user-card-post-names" args=(hash user=user) tagName="div"}}
+          {{plugin-outlet name="user-card-post-names" args=(hash user=this.user) tagName="div"}}
         </div>
         <ul class="usercard-controls">
-          {{#if user.can_send_private_message_to_user}}
+          {{#if this.user.can_send_private_message_to_user}}
             <li class="compose-pm">
               {{d-button
               class="btn-primary"
-              action=(action "composePM" user post)
+              action=(action "composePM" this.user this.post)
               icon="envelope"
               label="user.private_message"}}
             </li>
           {{/if}}
-          {{#if showFilter}}
+          {{#if this.showFilter}}
             <li>
               {{d-button
               class="btn-default"
-              action=(action "togglePosts" user)
+              action=(action "togglePosts" this.user)
               icon="filter"
-              translatedLabel=togglePostsLabel}}
+              translatedLabel=this.togglePostsLabel}}
             </li>
           {{/if}}
-          {{#if hasUserFilters}}
+          {{#if this.hasUserFilters}}
             <li>
               {{d-button
               action=(action "cancelFilter")
@@ -94,12 +94,12 @@
               label="topic.filters.cancel"}}
             </li>
           {{/if}}
-          {{#if showDelete}}
+          {{#if this.showDelete}}
             <li>
               {{d-button
               class="btn-danger"
               action=(action "deleteUser")
-              actionParam=user
+              actionParam=this.user
               icon="exclamation-triangle"
               label="admin.user.delete"}}
             </li>
@@ -107,11 +107,11 @@
         </ul>
         {{plugin-outlet
         name="user-card-additional-controls"
-        args=(hash user=user close=(action "close"))
+        args=(hash user=this.user close=(action "close"))
         tagName=""}}
       </div>
 
-      {{#if user.profile_hidden}}
+      {{#if this.user.profile_hidden}}
         <div class="card-row second-row">
           <div class="profile-hidden">
             <span>{{i18n "user.profile_hidden"}}</span>
@@ -119,105 +119,105 @@
         </div>
       {{/if}}
 
-      {{#if isSuspendedOrHasBio}}
+      {{#if this.isSuspendedOrHasBio}}
         <div class="card-row second-row">
-          {{#if user.suspend_reason}}
+          {{#if this.user.suspend_reason}}
             <div class="suspended">
               <div class="suspension-date">
                 {{d-icon "ban"}}
-                {{i18n "user.suspended_notice" date=user.suspendedTillDate}}
+                {{i18n "user.suspended_notice" date=this.user.suspendedTillDate}}
               </div>
               <div class="suspension-reason">
                 <span class="suspension-reason-title">{{i18n "user.suspended_reason"}}</span>
-                <span class="suspension-reason-description">{{user.suspend_reason}}</span>
+                <span class="suspension-reason-description">{{this.user.suspend_reason}}</span>
               </div>
             </div>
           {{else}}
-            {{#if user.bio_excerpt}}
-              <div class="bio">{{text-overflow class="overflow" text=user.bio_excerpt}}</div>
+            {{#if this.user.bio_excerpt}}
+              <div class="bio">{{text-overflow class="overflow" text=this.user.bio_excerpt}}</div>
             {{/if}}
           {{/if}}
         </div>
       {{/if}}
 
-      {{#if showFeaturedTopic}}
+      {{#if this.showFeaturedTopic}}
         <div class="card-row">
           <div class="featured-topic">
             <span class="desc">{{i18n "user.featured_topic"}}</span>
-            {{#link-to "topic" user.featured_topic.slug user.featured_topic.id }}{{html-safe (replace-emoji user.featured_topic.fancy_title)}}{{/link-to}}
+            {{#link-to "topic" this.user.featured_topic.slug this.user.featured_topic.id }}{{html-safe (replace-emoji this.user.featured_topic.fancy_title)}}{{/link-to}}
           </div>
         </div>
       {{/if}}
 
-      {{#if hasLocationOrWebsite}}
+      {{#if this.hasLocationOrWebsite}}
         <div class="card-row">
           <div class="location-and-website">
-            {{#if user.location}}
+            {{#if this.user.location}}
               <span class="location">
                 {{d-icon "map-marker-alt"}}
-                <span>{{user.location}}</span>
+                <span>{{this.user.location}}</span>
               </span>
             {{/if}}
-            {{#if user.website_name}}
+            {{#if this.user.website_name}}
               <span class="website-name">
                 {{d-icon "globe"}}
-                {{#if linkWebsite}}
+                {{#if this.linkWebsite}}
                   {{!-- template-lint-disable  --}}
-                  <a href="{{user.website}}" rel="noopener {{unless removeNoFollow 'nofollow ugc'}}"
-                   target="_blank">{{user.website_name}}</a>
+                  <a href="{{this.user.website}}" rel="noopener {{unless this.removeNoFollow 'nofollow ugc'}}"
+                   target="_blank">{{this.user.website_name}}</a>
                 {{else}}
-                  <span title={{user.website}}>{{user.website_name}}</span>
+                  <span title={{this.user.website}}>{{this.user.website_name}}</span>
                 {{/if}}
               </span>
             {{/if}}
-            {{plugin-outlet name="user-card-location-and-website" args=(hash user=user)}}
+            {{plugin-outlet name="user-card-location-and-website" args=(hash user=this.user)}}
           </div>
         </div>
       {{/if}}
 
       <div class="card-row">
-        {{#unless user.profile_hidden}}
+        {{#unless this.user.profile_hidden}}
           <div class="metadata">
-            {{#if user.last_posted_at}}
+            {{#if this.user.last_posted_at}}
               <h3><span class='desc'>{{i18n 'last_post'}}</span>
-                {{format-date user.last_posted_at leaveAgo="true"}}</h3>
+                {{format-date this.user.last_posted_at leaveAgo="true"}}</h3>
             {{/if}}
             <h3><span class='desc'>{{i18n 'joined'}}</span>
-              {{format-date user.created_at leaveAgo="true"}}</h3>
-            {{#if user.time_read}}
-              <h3 title="{{timeReadTooltip}}">
+              {{format-date this.user.created_at leaveAgo="true"}}</h3>
+            {{#if this.user.time_read}}
+              <h3 title="{{this.timeReadTooltip}}">
                 <span class='desc'>{{i18n 'time_read'}}</span>
-                {{format-duration user.time_read}}
-                {{#if showRecentTimeRead}}
-                  <span>({{i18n 'time_read_recently' time_read=recentTimeRead}})</span>
+                {{format-duration this.user.time_read}}
+                {{#if this.showRecentTimeRead}}
+                  <span>({{i18n 'time_read_recently' time_read=this.recentTimeRead}})</span>
                 {{/if}}
               </h3>
             {{/if}}
-            {{#if showCheckEmail}}
+            {{#if this.showCheckEmail}}
               <h3 class="email">
                 {{d-icon "far-envelope" title="user.email.title"}}
-                {{#if user.email}}
-                  {{user.email}}
+                {{#if this.user.email}}
+                  {{this.user.email}}
                 {{else}}
                   {{d-button
                     action=(action "checkEmail")
-                    actionParam=user
+                    actionParam=this.user
                     icon="far-envelope"
                     label="admin.users.check_email.text"
                     class="btn-primary"}}
                 {{/if}}
               </h3>
             {{/if}}
-            {{plugin-outlet name="user-card-metadata" args=(hash user=user)}}
+            {{plugin-outlet name="user-card-metadata" args=(hash user=this.user)}}
           </div>
         {{/unless}}
-        {{plugin-outlet name="user-card-after-metadata" args=(hash user=user)}}
+        {{plugin-outlet name="user-card-after-metadata" args=(hash user=this.user)}}
       </div>
 
-      {{#if publicUserFields}}
+      {{#if this.publicUserFields}}
         <div class="card-row">
           <div class="public-user-fields">
-            {{#each publicUserFields as |uf|}}
+            {{#each this.publicUserFields as |uf|}}
               {{#if uf.value}}
                 <div class="public-user-field {{uf.field.dasherized_name}}">
                   <span class="user-field-name">{{uf.field.name}}:</span>
@@ -229,19 +229,19 @@
         </div>
       {{/if}}
 
-      {{plugin-outlet name="user-card-before-badges" args=(hash user=user)}}
+      {{plugin-outlet name="user-card-before-badges" args=(hash user=this.user)}}
 
-      {{#if showBadges}}
+      {{#if this.showBadges}}
         <div class="card-row">
-          {{#if user.featured_user_badges}}
+          {{#if this.user.featured_user_badges}}
             <div class="badge-section">
-              {{#each user.featured_user_badges as |ub|}}
-                {{user-badge badge=ub.badge user=user}}
+              {{#each this.user.featured_user_badges as |ub|}}
+                {{user-badge badge=ub.badge user=this.user}}
               {{/each}}
-              {{#if showMoreBadges}}
+              {{#if this.showMoreBadges}}
                 <span class='more-user-badges'>
-                  {{#link-to 'user.badges' user}}
-                    {{i18n 'badges.more_badges' count=moreBadgesCount}}
+                  {{#link-to 'user.badges' this.user}}
+                    {{i18n 'badges.more_badges' count=this.moreBadgesCount}}
                   {{/link-to}}
                 </span>
               {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index 64ee54fa82..a60986f98b 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,14 +1,14 @@
-{{#if field.name}}
-  <label class="control-label" for={{concat "user-" elementId}}>
-    {{html-safe field.name}}   {{#if field.required}}<span class="required">*</span>{{/if}}
+{{#if this.field.name}}
+  <label class="control-label" for={{concat "user-" this.elementId}}>
+    {{html-safe this.field.name}} {{#if this.field.required}}<span class="required">*</span>{{/if}}
   </label>
 {{/if}}
 
 <div class="controls">
   <label class="control-label checkbox-label">
-    {{input id=(concat "user-" elementId) checked=value type="checkbox"}}
+    {{input id=(concat "user-" this.elementId) checked=this.value type="checkbox"}}
     <span>
-      {{html-safe field.description}}   {{#unless field.name}}{{#if field.required}}<span class="required">*</span>{{/if}}{{/unless}}
+      {{html-safe this.field.description}} {{#unless this.field.name}}{{#if this.field.required}}<span class="required">*</span>{{/if}}{{/unless}}
     </span>
   </label>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index f59b0dfd05..f34fe5267b 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,19 +1,19 @@
-<label class="control-label" for={{concat "user-" elementId}}>
-  {{html-safe field.name}}
-  {{#if field.required}}
+<label class="control-label" for={{concat "user-" this.elementId}}>
+  {{html-safe this.field.name}}
+  {{#if this.field.required}}
     <span class="required">*</span>
   {{/if}}
 </label>
 
 <div class="controls">
   {{combo-box
-    id=(concat "user-" elementId)
-    content=field.options
+    id=(concat "user-" this.elementId)
+    content=this.field.options
     valueProperty=null
     nameProperty=null
-    value=value
-    none=noneLabel
-    onChange=(action (mut value))
+    value=this.value
+    none=this.noneLabel
+    onChange=(action (mut this.value))
   }}
-  <div class="instructions">{{html-safe field.description}}</div>
+  <div class="instructions">{{html-safe this.field.description}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 09a8a136e7..81c9439cb6 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,8 +1,8 @@
-<label class="control-label" for={{concat "user-" elementId}}>
-  {{html-safe field.name}}
-  {{#if field.required}}<span class="required">*</span>{{/if}}
+<label class="control-label" for={{concat "user-" this.elementId}}>
+  {{html-safe this.field.name}}
+  {{#if this.field.required}}<span class="required">*</span>{{/if}}
 </label>
 <div class="controls">
-  {{input id=(concat "user-" elementId) value=value maxlength=site.user_field_max_length}}
-  <div class="instructions">{{html-safe field.description}}</div>
+  {{input id=(concat "user-" this.elementId) value=this.value maxlength=this.site.user_field_max_length}}
+  <div class="instructions">{{html-safe this.field.description}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs b/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs
index 93b924b75d..c129ebd59f 100644
--- a/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs
@@ -1,6 +1,6 @@
-{{#if showPercentage}}
-  <div title={{percentage.title}} class="user-flag-percentage">
-    <span class="percentage-label {{percentage.className}}">{{percentage.label}}</span>
-    {{d-icon percentage.icon}}
+{{#if this.showPercentage}}
+  <div title={{this.percentage.title}} class="user-flag-percentage">
+    <span class="percentage-label {{this.percentage.className}}">{{this.percentage.label}}</span>
+    {{d-icon this.percentage.icon}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-info.hbs b/app/assets/javascripts/discourse/templates/components/user-info.hbs
index 59160413bb..fe6c7823fe 100644
--- a/app/assets/javascripts/discourse/templates/components/user-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-info.hbs
@@ -1,22 +1,22 @@
 <div class="user-image">
   <div class="user-image-inner">
-    <a href={{userPath}} data-user-card={{user.username}}>{{avatar user imageSize="large"}}</a>
-    {{#if user.primary_group_name}}
+    <a href={{this.userPath}} data-user-card={{@user.username}}>{{avatar @user imageSize="large"}}</a>
+    {{#if @user.primary_group_name}}
       {{avatar-flair
-        flairURL=user.primary_group_flair_url
-        flairBgColor=user.primary_group_flair_bg_color
-        flairColor=user.primary_group_flair_color
-        groupName=user.primary_group_name}}
+        flairURL=@user.primary_group_flair_url
+        flairBgColor=@user.primary_group_flair_bg_color
+        flairColor=@user.primary_group_flair_color
+        groupName=@user.primary_group_name}}
     {{/if}}
   </div>
 </div>
 
 <div class="user-detail">
   <div class="name-line">
-    <span class="username"><a href={{userPath}} data-user-card={{user.username}}>{{format-username user.username}}</a></span>
-    <span class="name">{{name}}</span>
+    <span class="username"><a href={{this.userPath}} data-user-card={{@user.username}}>{{format-username @user.username}}</a></span>
+    <span class="name">{{this.name}}</span>
   </div>
-  <div class="title">{{user.title}}</div>
+  <div class="title">{{@user.title}}</div>
 
   {{#if hasBlock}}
     <div class="details">
diff --git a/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs b/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs
index 303878d412..f2965aabb0 100644
--- a/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs
@@ -1,11 +1,11 @@
 <div class="user-profile-avatar">
-  {{bound-avatar user "huge"}}
-  {{#if user.primary_group_name}}
+  {{bound-avatar @user "huge"}}
+  {{#if @user.primary_group_name}}
     {{avatar-flair
-      flairURL=user.primary_group_flair_url
-      flairBgColor=user.primary_group_flair_bg_color
-      flairColor=user.primary_group_flair_color
-      groupName=user.primary_group_name}}
+      flairURL=@user.primary_group_flair_url
+      flairBgColor=@user.primary_group_flair_bg_color
+      flairColor=@user.primary_group_flair_color
+      groupName=@user.primary_group_name}}
   {{/if}}
-  {{plugin-outlet name="user-profile-avatar-flair" args=(hash model=user) tagName="div"}}
+  {{plugin-outlet name="user-profile-avatar-flair" args=(hash model=@user) tagName="div"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index e95ab17d31..68cb27dad9 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -1,13 +1,13 @@
 <span class="value">
-  {{#if isNumber}}
-    {{number value}}
-  {{else if isDuration}}
-    {{format-duration value}}
+  {{#if this.isNumber}}
+    {{number @value}}
+  {{else if this.isDuration}}
+    {{format-duration @value}}
   {{else}}
-    {{value}}
+    {{@value}}
   {{/if}}
 </span>
 <span class="label">
-  {{#if icon}}{{d-icon icon}}{{/if}}
-  {{html-safe (i18n label count=value)}}
+  {{#if @icon}}{{d-icon @icon}}{{/if}}
+  {{html-safe (i18n @label count=@value)}}
 </span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index 278606bdb9..acfdaaa01f 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -1,51 +1,51 @@
 <div class="clearfix info">
-  <a href={{item.userUrl}} data-user-card={{item.username}} class="avatar-link"><div class="avatar-wrapper">{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
-  <span class="time">{{format-date item.created_at}}</span>
-  {{#if item.draftType}}
-    <span class="draft-type">{{html-safe item.draftType}}</span>
+  <a href={{@item.userUrl}} data-user-card={{@item.username}} class="avatar-link"><div class="avatar-wrapper">{{avatar @item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
+  <span class="time">{{format-date @item.created_at}}</span>
+  {{#if @item.draftType}}
+    <span class="draft-type">{{html-safe @item.draftType}}</span>
   {{else}}
-    {{expand-post item=item}}
+    {{expand-post item=@item}}
   {{/if}}
   <div class="stream-topic-details">
     <div class="stream-topic-title">
-      {{topic-status topic=item disableActions=true}}
+      {{topic-status topic=@item disableActions=true}}
       <span class="title">
-        {{#if item.postUrl}}
-          <a href={{item.postUrl}}>{{html-safe item.title}}</a>
+        {{#if @item.postUrl}}
+          <a href={{@item.postUrl}}>{{html-safe @item.title}}</a>
         {{else}}
-          {{html-safe item.title}}
+          {{html-safe @item.title}}
         {{/if}}
       </span>
     </div>
-    <div class="category">{{category-link item.category}}</div>
+    <div class="category">{{category-link @item.category}}</div>
   </div>
 
-  {{#if item.deleted_by}}
+  {{#if @item.deleted_by}}
     <span class="delete-info">
       {{d-icon "far-trash-alt"}}
-      {{avatar item.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}
-      {{format-date item.deleted_at leaveAgo="true"}}
+      {{avatar @item.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}
+      {{format-date @item.deleted_at leaveAgo="true"}}
     </span>
   {{/if}}
 
-  {{plugin-outlet name="user-stream-item-header" args=(hash item=item)}}
+  {{plugin-outlet name="user-stream-item-header" args=(hash item=@item)}}
 </div>
 
-{{#if actionDescription}}
-  <p class="excerpt">{{actionDescription}}</p>
+{{#if this.actionDescription}}
+  <p class="excerpt">{{this.actionDescription}}</p>
 {{/if}}
 
-<p data-topic-id={{item.topic_id}} data-post-id={{item.post_id}} data-user-id={{item.user_id}} class="excerpt">
+<p data-topic-id={{@item.topic_id}} data-post-id={{@item.post_id}} data-user-id={{@item.user_id}} class="excerpt">
   {{!-- template-lint-disable no-triple-curlies --}}
-  {{~#if item.expandedExcerpt}}
-    {{~{item.expandedExcerpt}~}}
+  {{~#if @item.expandedExcerpt}}
+    {{~{@item.expandedExcerpt}~}}
   {{else}}
-    {{~{item.excerpt}~}}
+    {{~{@item.excerpt}~}}
   {{/if~}}
   {{!-- template-lint-enable --}}
 </p>
 
-{{#each item.children as |child|}}
+{{#each @item.children as |child|}}
   {{!-- DEPRECATED: 'child-actions' class --}}
   <div class="user-stream-item-actions child-actions">
     {{d-icon child.icon class="icon"}}
@@ -53,7 +53,7 @@
       {{#if grandChild.removableBookmark}}
         {{d-button
           class="btn-default remove-bookmark"
-          action=(action removeBookmark grandChild)
+          action=(action @removeBookmark grandChild)
           icon="times"
           label="bookmarks.remove"
         }}
@@ -65,9 +65,9 @@
   </div>
 {{/each}}
 
-{{#if item.editableDraft}}
+{{#if @item.editableDraft}}
   <div class="user-stream-item-draft-actions">
-    {{d-button action=resumeDraft actionParam=item icon="pencil-alt" label="drafts.resume" class="btn-default resume-draft"}}
-    {{d-button action=removeDraft actionParam=item icon="far-trash-alt" label="drafts.remove" class="btn-default remove-draft"}}
+    {{d-button action=@resumeDraft actionParam=@item icon="pencil-alt" label="drafts.resume" class="btn-default resume-draft"}}
+    {{d-button action=@removeDraft actionParam=@item icon="far-trash-alt" label="drafts.remove" class="btn-default remove-draft"}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream.hbs b/app/assets/javascripts/discourse/templates/components/user-stream.hbs
index 1e3b3c306e..b9a007f4dd 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream.hbs
@@ -1,4 +1,4 @@
-{{#each stream.content as |item|}}
+{{#each @stream.content as |item|}}
   {{user-stream-item
       item=item
       removeBookmark=(action "removeBookmark")
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs
index 4694405f99..a0e1f3f0e0 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs
@@ -1,6 +1,6 @@
-{{#if count}}
-  {{#link-to "full-page-search" (query-params q=searchParams)}}
-    {{count}}
+{{#if @count}}
+  {{#link-to "full-page-search" (query-params q=this.searchParams)}}
+    {{@count}}
   {{/link-to}}
 {{else}}
   &ndash;
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
index 69763aba1d..ae85180b48 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
@@ -1,2 +1,2 @@
-<h3 class="stats-title">{{i18n (concat "user.summary." title)}}</h3>
+<h3 class="stats-title">{{i18n (concat "user.summary." @title)}}</h3>
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
index b1ab485fa6..1d11ac6522 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -1,9 +1,9 @@
 <span class="topic-info">
-  {{format-date createdAt format="tiny" noTitle="true"}}
-  {{#if likes}}
+  {{format-date @createdAt format="tiny" noTitle="true"}}
+  {{#if @likes}}
     &middot;
-    {{d-icon "heart"}}&nbsp;<span class="like-count">{{number likes}}</span>
+    {{d-icon "heart"}}&nbsp;<span class="like-count">{{number @likes}}</span>
   {{/if}}
 </span>
 <br>
-<a href={{url}}>{{html-safe topic.fancyTitle}}</a>
+<a href={{@url}}>{{html-safe @topic.fancyTitle}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs
index a74e5d6a23..d7e60c03ac 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs
@@ -1,16 +1,16 @@
-{{#if items}}
+{{#if @items}}
   <ul>
-    {{#each items as |item|}}
+    {{#each @items as |item|}}
       {{yield item}}
     {{/each}}
   </ul>
-  {{#if hasMore}}
+  {{#if this.hasMore}}
     <p>
-      {{#link-to (concat "userActivity." type) user class="more"}}
-        {{i18n (concat "user.summary.more_" type)}}
+      {{#link-to (concat "userActivity." @type) @user class="more"}}
+        {{i18n (concat "user.summary.more_" @type)}}
       {{/link-to}}
     </p>
   {{/if}}
 {{else}}
-  <p>{{i18n (concat "user.summary.no_" type)}}</p>
+  <p>{{i18n (concat "user.summary.no_" @type)}}</p>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-user.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-user.hbs
index 876702f195..6213d66c83 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-user.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-user.hbs
@@ -1,4 +1,4 @@
-{{#user-info user=user}}
-  {{d-icon icon}}
-  <span class={{countClass}}>{{number user.count}}</span>
+{{#user-info user=@user}}
+  {{d-icon @icon}}
+  <span class={{@countClass}}>{{number @user.count}}</span>
 {{/user-info}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs
index 1b291b638a..926a1fb4a8 100644
--- a/app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs
@@ -1,9 +1,9 @@
-{{#if users}}
+{{#if this.users}}
   <ul>
-    {{#each users as |user|}}
+    {{#each this.users as |user|}}
       {{yield user}}
     {{/each}}
   </ul>
 {{else}}
-  <p>{{i18n (concat "user.summary." none)}}</p>
+  <p>{{i18n (concat "user.summary." this.none)}}</p>
 {{/if}}

From 6e1a33b744ee94bad083f842d10ebe046d1939c0 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Thu, 16 Apr 2020 11:14:25 -0700
Subject: [PATCH 0633/1830] revert heatmap color changes in favor of accessible
 theme

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

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 6113446577..5b9cff0076 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -212,15 +212,15 @@
 
 .heatmap-high,
 .heatmap-high a {
-  color: #ec7213 !important;
+  color: #fe7a15 !important;
 }
 .heatmap-med,
 .heatmap-med a {
-  color: #b06318 !important;
+  color: #cf7721 !important;
 }
 .heatmap-low,
 .heatmap-low a {
-  color: #93704a !important;
+  color: #9b764f !important;
 }
 
 .topic-list .heatmap-high {

From 0fccea3762ed5f6c2d4d78381663001df315d106 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 16 Apr 2020 12:01:11 -0700
Subject: [PATCH 0634/1830] FIX: Keyboard navigation fixes in setup wizard
 (#9413)

- Delete a positive tabindex from a reused component
 - Copy :hover styles to :focus
 - Replace an 'outline: 0' rule with a TODO for a custom :focus style

Discovered while fixing the no-positive-tabindex lint.
---
 .../templates/components/radio-button.hbs     |  2 +-
 app/assets/stylesheets/wizard.scss            | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/wizard/templates/components/radio-button.hbs b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
index cdd4756b35..2974b5ebec 100644
--- a/app/assets/javascripts/wizard/templates/components/radio-button.hbs
+++ b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
@@ -1,5 +1,5 @@
 <div class="radio-area">
-  <input type="radio" name={{label}} tabindex="9">
+  <input type="radio" name={{label}}>
   <span class="radio-label">
     {{#if icon}}
       {{d-icon icon}}
diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index 2fd2067bd7..16a59ce294 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -280,7 +280,8 @@ body.wizard {
       font-size: $font-down-1;
     }
 
-    &:hover {
+    &:hover,
+    &:focus {
       background-color: #eee;
     }
 
@@ -311,7 +312,8 @@ body.wizard {
     color: white;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.6);
 
-    &:hover {
+    &:hover,
+    &:focus {
       background-color: #80b3ff;
     }
 
@@ -328,7 +330,8 @@ body.wizard {
     background-color: #e60000;
     color: white;
 
-    &:hover {
+    &:hover,
+    &:focus {
       background-color: #cc0000;
     }
 
@@ -374,7 +377,8 @@ body.wizard {
       color: #333;
       box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
 
-      &:hover {
+      &:hover,
+      &:focus {
         background-color: #eee;
       }
 
@@ -396,7 +400,8 @@ body.wizard {
       color: #fff;
       background-color: #33b333;
 
-      &:hover {
+      &:hover,
+      &:focus {
         background-color: #4dcd4d;
       }
 
@@ -477,7 +482,8 @@ body.wizard {
       padding: 8px;
       margin: 0px 4px;
       width: 25%;
-      &:hover {
+      &:hover,
+      &:focus {
         background: #f3f3f3;
       }
     }
@@ -519,7 +525,8 @@ body.wizard {
   margin-bottom: 1.25em;
 
   input {
-    outline: 0;
+    /* TODO: Custom :focus style */
+    /* outline: 0;*/
   }
 
   .radio-label {

From b37b23838202dc9f49bd6bf108301218c4d72b17 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 16 Apr 2020 15:08:43 -0400
Subject: [PATCH 0635/1830] FIX: Reviewable score JS was in the wrong folder

---
 .../discourse/{templates => }/components/reviewable-score.js      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/assets/javascripts/discourse/{templates => }/components/reviewable-score.js (100%)

diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.js b/app/assets/javascripts/discourse/components/reviewable-score.js
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-score.js
rename to app/assets/javascripts/discourse/components/reviewable-score.js

From 0a9f283e7e8e336f3af602ad576c1b44be5cd58c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 16 Apr 2020 22:12:37 +0200
Subject: [PATCH 0636/1830] REFACTOR: various refactoring applied to group
 pages (#9440)

---
 .../controllers/group-add-members.js          |  55 +++++----
 .../discourse/controllers/group-index.js      | 109 +++++++++---------
 .../controllers/group-manage-logs.js          |  44 ++++---
 .../discourse/controllers/group.js            |  82 +++++++------
 .../discourse/controllers/groups-new.js       |  23 ++--
 .../discourse/routes/group-index.js           |  29 ++---
 .../discourse/routes/group-members.js         |   2 +-
 .../javascripts/discourse/routes/group.js     |   2 +-
 .../javascripts/discourse/templates/group.hbs |  31 ++---
 9 files changed, 192 insertions(+), 185 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/group-add-members.js b/app/assets/javascripts/discourse/controllers/group-add-members.js
index 9b1f888113..0637ac7993 100644
--- a/app/assets/javascripts/discourse/controllers/group-add-members.js
+++ b/app/assets/javascripts/discourse/controllers/group-add-members.js
@@ -3,6 +3,7 @@ import { isEmpty } from "@ember/utils";
 import Controller from "@ember/controller";
 import { extractError } from "discourse/lib/ajax-error";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { action } from "@ember/object";
 
 export default Controller.extend(ModalFunctionality, {
   loading: false,
@@ -13,36 +14,32 @@ export default Controller.extend(ModalFunctionality, {
     return loading || !usernames || !(usernames.length > 0);
   },
 
-  actions: {
-    addMembers() {
-      this.set("loading", true);
+  @action
+  addMembers() {
+    this.set("loading", true);
 
-      const model = this.model;
-      const usernames = model.get("usernames");
-      if (isEmpty(usernames)) {
-        return;
-      }
-      let promise;
-
-      if (this.setAsOwner) {
-        promise = model.addOwners(usernames, true);
-      } else {
-        promise = model.addMembers(usernames, true);
-      }
-
-      promise
-        .then(() => {
-          this.transitionToRoute("group.members", this.get("model.name"), {
-            queryParams: { filter: usernames }
-          });
-
-          model.set("usernames", null);
-          this.send("closeModal");
-        })
-        .catch(error => {
-          this.flash(extractError(error), "error");
-        })
-        .finally(() => this.set("loading", false));
+    const usernames = this.model.usernames;
+    if (isEmpty(usernames)) {
+      return;
     }
+    let promise;
+
+    if (this.setAsOwner) {
+      promise = this.model.addOwners(usernames, true);
+    } else {
+      promise = this.model.addMembers(usernames, true);
+    }
+
+    promise
+      .then(() => {
+        this.transitionToRoute("group.members", this.get("model.name"), {
+          queryParams: { filter: usernames }
+        });
+
+        this.model.set("usernames", null);
+        this.send("closeModal");
+      })
+      .catch(error => this.flash(extractError(error), "error"))
+      .finally(() => this.set("loading", false));
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-index.js b/app/assets/javascripts/discourse/controllers/group-index.js
index b4168ba4c0..6d66189144 100644
--- a/app/assets/javascripts/discourse/controllers/group-index.js
+++ b/app/assets/javascripts/discourse/controllers/group-index.js
@@ -1,8 +1,9 @@
 import Controller, { inject as controller } from "@ember/controller";
-import { alias } from "@ember/object/computed";
+import { gt, readOnly } from "@ember/object/computed";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseDebounce from "discourse/lib/debounce";
+import { action } from "@ember/object";
 
 export default Controller.extend({
   application: controller(),
@@ -15,7 +16,7 @@ export default Controller.extend({
   filterInput: null,
 
   loading: false,
-  isOwner: alias("model.is_group_owner"),
+  isOwner: readOnly("model.is_group_owner"),
   showActions: false,
 
   @observes("filterInput")
@@ -29,27 +30,22 @@ export default Controller.extend({
   },
 
   findMembers(refresh) {
-    if (this.loading) {
+    if (this.loading || !this.model) {
       return;
     }
 
-    const model = this.model;
-    if (!model) {
-      return;
-    }
-
-    if (!refresh && model.members.length >= model.user_count) {
+    if (!refresh && this.model.members.length >= this.model.user_count) {
       this.set("application.showFooter", true);
       return;
     }
 
     this.set("loading", true);
-    model.findMembers(this.memberParams, refresh).finally(() => {
-      this.set(
-        "application.showFooter",
-        model.members.length >= model.user_count
-      );
-      this.set("loading", false);
+    this.model.findMembers(this.memberParams, refresh).finally(() => {
+      this.setProperties({
+        "application.showFooter":
+          this.model.members.length >= this.model.user_count,
+        loading: false
+      });
     });
   },
 
@@ -58,10 +54,7 @@ export default Controller.extend({
     return { order, desc, filter };
   },
 
-  @discourseComputed("model.members.[]")
-  hasMembers(members) {
-    return members && members.length > 0;
-  },
+  hasMembers: gt("model.members.length", 0),
 
   @discourseComputed("model")
   canManageGroup(model) {
@@ -77,49 +70,53 @@ export default Controller.extend({
     }
   },
 
-  actions: {
-    loadMore() {
-      this.findMembers();
-    },
+  @action
+  loadMore() {
+    this.findMembers();
+  },
 
-    toggleActions() {
-      this.toggleProperty("showActions");
-    },
+  @action
+  toggleActions() {
+    this.toggleProperty("showActions");
+  },
 
-    actOnGroup(member, actionId) {
-      switch (actionId) {
-        case "removeMember":
-          this.send("removeMember", member);
-          break;
-        case "makeOwner":
-          this.send("makeOwner", member.username);
-          break;
-        case "removeOwner":
-          this.send("removeOwner", member);
-          break;
-      }
-    },
+  @action
+  actOnGroup(member, actionId) {
+    switch (actionId) {
+      case "removeMember":
+        this.removeMember(member);
+        break;
+      case "makeOwner":
+        this.makeOwner(member.username);
+        break;
+      case "removeOwner":
+        this.removeOwner(member);
+        break;
+    }
+  },
 
-    removeMember(user) {
-      this.model.removeMember(user, this.memberParams);
-    },
+  @action
+  removeMember(user) {
+    this.model.removeMember(user, this.memberParams);
+  },
 
-    makeOwner(username) {
-      this.model.addOwners(username);
-    },
+  @action
+  makeOwner(username) {
+    this.model.addOwners(username);
+  },
 
-    removeOwner(user) {
-      this.model.removeOwner(user);
-    },
+  @action
+  removeOwner(user) {
+    this.model.removeOwner(user);
+  },
 
-    addMembers() {
-      const usernames = this.usernames;
-      if (usernames && usernames.length > 0) {
-        this.model
-          .addMembers(usernames)
-          .then(() => this.set("usernames", []))
-          .catch(popupAjaxError);
-      }
+  @action
+  addMembers() {
+    if (this.usernames && this.usernames.length > 0) {
+      this.model
+        .addMembers(this.usernames)
+        .then(() => this.set("usernames", []))
+        .catch(popupAjaxError);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-logs.js b/app/assets/javascripts/discourse/controllers/group-manage-logs.js
index 80947cb9a6..ab3ff8ea81 100644
--- a/app/assets/javascripts/discourse/controllers/group-manage-logs.js
+++ b/app/assets/javascripts/discourse/controllers/group-manage-logs.js
@@ -1,5 +1,5 @@
 import Controller, { inject as controller } from "@ember/controller";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
@@ -19,8 +19,8 @@ export default Controller.extend({
     "filters.target_user",
     "filters.subject"
   )
-  filterParams(action, acting_user, target_user, subject) {
-    return { action, acting_user, target_user, subject };
+  filterParams(filtersAction, acting_user, target_user, subject) {
+    return { action: filtersAction, acting_user, target_user, subject };
   },
 
   @observes(
@@ -54,28 +54,26 @@ export default Controller.extend({
     });
   },
 
-  actions: {
-    loadMore() {
-      if (this.get("model.all_loaded")) return;
+  @action
+  loadMore() {
+    if (this.get("model.all_loaded")) return;
 
-      this.set("loading", true);
+    this.set("loading", true);
 
-      this.get("group.model")
-        .findLogs(this.offset + 1, this.filterParams)
-        .then(results => {
-          results.logs.forEach(result =>
-            this.get("model.logs").addObject(result)
-          );
-          this.incrementProperty("offset");
-          this.set("model.all_loaded", results.all_loaded);
-        })
-        .finally(() => {
-          this.set("loading", false);
-        });
-    },
+    this.get("group.model")
+      .findLogs(this.offset + 1, this.filterParams)
+      .then(results => {
+        results.logs.forEach(result =>
+          this.get("model.logs").addObject(result)
+        );
+        this.incrementProperty("offset");
+        this.set("model.all_loaded", results.all_loaded);
+      })
+      .finally(() => this.set("loading", false));
+  },
 
-    clearFilter(key) {
-      this.set(`filters.${key}`, "");
-    }
+  @action
+  clearFilter(key) {
+    this.set(`filters.${key}`, "");
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/group.js b/app/assets/javascripts/discourse/controllers/group.js
index b66561f39c..3ec4f40128 100644
--- a/app/assets/javascripts/discourse/controllers/group.js
+++ b/app/assets/javascripts/discourse/controllers/group.js
@@ -1,15 +1,18 @@
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import Controller, { inject as controller } from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 import { inject as service } from "@ember/service";
 import { readOnly } from "@ember/object/computed";
+import deprecated from "discourse-common/lib/deprecated";
 
 const Tab = EmberObject.extend({
   init() {
     this._super(...arguments);
-    let name = this.name;
-    this.set("route", this.route || `group.` + name);
-    this.set("message", I18n.t(`groups.${this.i18nKey || name}`));
+
+    this.setProperties({
+      route: this.route || `group.${this.name}`,
+      message: I18n.t(`groups.${this.i18nKey || this.name}`)
+    });
   }
 });
 
@@ -19,7 +22,7 @@ export default Controller.extend({
   showing: "members",
   destroying: null,
   router: service(),
-  currentPath: readOnly("router._router.currentPath"),
+  currentPath: readOnly("router.currentRouteName"),
 
   @discourseComputed(
     "showMessages",
@@ -39,11 +42,10 @@ export default Controller.extend({
       name: "members",
       route: "group.index",
       icon: "users",
-      i18nKey: "members.title"
+      i18nKey: "members.title",
+      count: userCount
     });
 
-    membersTab.set("count", userCount);
-
     const defaultTabs = [membersTab, Tab.create({ name: "activity" })];
 
     if (canManageGroup && allowMembershipRequests) {
@@ -127,37 +129,45 @@ export default Controller.extend({
     );
   },
 
-  actions: {
-    messageGroup() {
-      this.send("createNewMessageViaParams", this.get("model.name"));
-    },
+  @action
+  messageGroup() {
+    this.send("createNewMessageViaParams", this.get("model.name"));
+  },
 
-    destroy() {
-      const group = this.model;
-      this.set("destroying", true);
+  @action
+  destroyGroup() {
+    this.set("destroying", true);
 
-      bootbox.confirm(
-        I18n.t("admin.groups.delete_confirm"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        confirmed => {
-          if (confirmed) {
-            group
-              .destroy()
-              .then(() => {
-                this.transitionToRoute("groups.index");
-              })
-              .catch(error => {
-                // eslint-disable-next-line no-console
-                console.error(error);
-                bootbox.alert(I18n.t("admin.groups.delete_failed"));
-              })
-              .finally(() => this.set("destroying", false));
-          } else {
-            this.set("destroying", false);
-          }
+    bootbox.confirm(
+      I18n.t("admin.groups.delete_confirm"),
+      I18n.t("no_value"),
+      I18n.t("yes_value"),
+      confirmed => {
+        if (confirmed) {
+          this.model
+            .destroy()
+            .then(() => this.transitionToRoute("groups.index"))
+            .catch(error => {
+              // eslint-disable-next-line no-console
+              console.error(error);
+              bootbox.alert(I18n.t("admin.groups.delete_failed"));
+            })
+            .finally(() => this.set("destroying", false));
+        } else {
+          this.set("destroying", false);
         }
-      );
+      }
+    );
+  },
+
+  actions: {
+    destroy() {
+      deprecated("Use `destroyGroup` action instead of `destroy`.", {
+        since: "2.5.0",
+        dropFrom: "2.6.0"
+      });
+
+      this.destroyGroup();
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/groups-new.js b/app/assets/javascripts/discourse/controllers/groups-new.js
index f93c08959d..05013cb7da 100644
--- a/app/assets/javascripts/discourse/controllers/groups-new.js
+++ b/app/assets/javascripts/discourse/controllers/groups-new.js
@@ -1,21 +1,20 @@
+import { action } from "@ember/object";
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
   saving: null,
 
-  actions: {
-    save() {
-      this.set("saving", true);
-      const group = this.model;
+  @action
+  save() {
+    this.set("saving", true);
 
-      group
-        .create()
-        .then(() => {
-          this.transitionToRoute("group.members", group.name);
-        })
-        .catch(popupAjaxError)
-        .finally(() => this.set("saving", false));
-    }
+    this.model
+      .create()
+      .then(() => {
+        this.transitionToRoute("group.members", this.model.name);
+      })
+      .catch(popupAjaxError)
+      .finally(() => this.set("saving", false));
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/group-index.js b/app/assets/javascripts/discourse/routes/group-index.js
index a3aed42816..a543c89613 100644
--- a/app/assets/javascripts/discourse/routes/group-index.js
+++ b/app/assets/javascripts/discourse/routes/group-index.js
@@ -1,5 +1,6 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import showModal from "discourse/lib/show-modal";
+import { action } from "@ember/object";
 
 export default DiscourseRoute.extend({
   titleToken() {
@@ -12,28 +13,28 @@ export default DiscourseRoute.extend({
   },
 
   setupController(controller, model) {
-    this.controllerFor("group").set("showing", "members");
-
     controller.setProperties({
       model,
-      filterInput: this._params.filter
+      filterInput: this._params.filter,
+      showing: "members"
     });
 
     controller.findMembers(true);
   },
 
-  actions: {
-    showAddMembersModal() {
-      showModal("group-add-members", { model: this.modelFor("group") });
-    },
+  @action
+  showAddMembersModal() {
+    showModal("group-add-members", { model: this.modelFor("group") });
+  },
 
-    showBulkAddModal() {
-      showModal("group-bulk-add", { model: this.modelFor("group") });
-    },
+  @action
+  showBulkAddModal() {
+    showModal("group-bulk-add", { model: this.modelFor("group") });
+  },
 
-    didTransition() {
-      this.controllerFor("group-index").set("filterInput", this._params.filter);
-      return true;
-    }
+  @action
+  didTransition() {
+    this.controllerFor("group-index").set("filterInput", this._params.filter);
+    return true;
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/group-members.js b/app/assets/javascripts/discourse/routes/group-members.js
index 872052de67..a3031c03bb 100644
--- a/app/assets/javascripts/discourse/routes/group-members.js
+++ b/app/assets/javascripts/discourse/routes/group-members.js
@@ -1,7 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
-  beforeModel: function() {
+  beforeModel() {
     this.transitionTo("group.index");
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/group.js b/app/assets/javascripts/discourse/routes/group.js
index bd58f6d3a7..8a60e8654e 100644
--- a/app/assets/javascripts/discourse/routes/group.js
+++ b/app/assets/javascripts/discourse/routes/group.js
@@ -14,6 +14,6 @@ export default DiscourseRoute.extend({
   },
 
   setupController(controller, model) {
-    controller.setProperties({ model });
+    controller.set("model", model);
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 0a53f7f1c0..ba6ed2b8cc 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -9,7 +9,8 @@
             flairURL=model.flair_url
             flairBgColor=model.flair_bg_color
             flairColor=model.flair_color
-            groupName=model.name}}
+            groupName=model.name
+          }}
         </span>
       {{/if}}
 
@@ -32,24 +33,28 @@
 
     <div class="group-details-button">
       {{group-membership-button
-          class="inline"
-          model=model
-          showLogin=(route-action  "showLogin")}}
+        class="inline"
+        model=model
+        showLogin=(route-action "showLogin")
+      }}
 
       {{#if displayGroupMessageButton}}
         {{d-button
-            action=(action "messageGroup")
-            class="btn-primary group-message-button inline"
-            icon="envelope"
-            label="groups.message"}}
+          action=(action "messageGroup")
+          class="btn-primary group-message-button inline"
+          icon="envelope"
+          label="groups.message"
+        }}
       {{/if}}
 
       {{#if currentUser.admin}}
-        {{d-button action=(action "destroy")
-            disabled=destroying
-            icon="trash-alt"
-            class="btn-danger"
-            label="admin.groups.delete"}}
+        {{d-button
+          action=(action "destroy")
+          disabled=destroying
+          icon="trash-alt"
+          class="btn-danger"
+          label="admin.groups.delete"
+        }}
       {{/if}}
     </div>
   </div>

From 28906fdbc70b972965317727c3c08a2b7edba188 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 16 Apr 2020 22:14:46 +0200
Subject: [PATCH 0637/1830] linting (#9447)

---
 app/assets/javascripts/admin/templates/badges-index.hbs     | 2 +-
 app/assets/javascripts/discourse/templates/invites/show.hbs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index 528e86e4d3..7e2f21b127 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -1,6 +1,6 @@
 {{#d-section class="current-badges"}}
   <div class="badge-intro admin-intro">
-    <img src={{badgeIntroEmoji}} class="badge-intro-emoji" alt={{i18n 'admin.badges.badge_intro.emoji'}}>
+    <img src={{badgeIntroEmoji}} class="badge-intro-emoji" alt={{i18n "admin.badges.badge_intro.emoji"}}>
     <div class="content-wrapper">
       <h1>{{i18n "admin.badges.badge_intro.title"}}</h1>
       <div class="external-resources">
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index 0243e8df81..96804f5f82 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -3,7 +3,7 @@
 
   <div class="two-col">
     <div class="col-image">
-      <img src={{inviteImageUrl}} alt={{i18n 'invites.emoji'}}>
+      <img src={{inviteImageUrl}} alt={{i18n "invites.emoji"}}>
     </div>
 
     <div class="col-form">

From b6c19cba20bffe18eea7bbd4b31fa640b04ac00b Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 16 Apr 2020 21:24:09 +0100
Subject: [PATCH 0638/1830] FIX: Abort emit_web_hook_event job cleanly if web
 hook was deleted (#9445)

Raising an error causes the job to be retried, and causes a lot of noise in the logs
---
 app/jobs/regular/emit_web_hook_event.rb | 3 ++-
 spec/jobs/emit_web_hook_event_spec.rb   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb
index ffd8e410ec..57ee27f2ce 100644
--- a/app/jobs/regular/emit_web_hook_event.rb
+++ b/app/jobs/regular/emit_web_hook_event.rb
@@ -14,6 +14,8 @@ module Jobs
       @web_hook = WebHook.find_by(id: @arguments[:web_hook_id])
       validate_arguments!
 
+      return if @web_hook.blank? # Web Hook was deleted
+
       unless ping_event?(@arguments[:event_type])
         validate_argument!(:payload)
 
@@ -31,7 +33,6 @@ module Jobs
     def validate_arguments!
       validate_argument!(:web_hook_id)
       validate_argument!(:event_type)
-      raise Discourse::InvalidParameters.new(:web_hook_id) if @web_hook.blank?
     end
 
     def validate_argument!(key)
diff --git a/spec/jobs/emit_web_hook_event_spec.rb b/spec/jobs/emit_web_hook_event_spec.rb
index 453db11abb..0e649c882e 100644
--- a/spec/jobs/emit_web_hook_event_spec.rb
+++ b/spec/jobs/emit_web_hook_event_spec.rb
@@ -17,13 +17,13 @@ describe Jobs::EmitWebHookEvent do
 
   it 'raises an error when there is no event type' do
     expect do
-      subject.execute(web_hook_id: 1, payload: {})
+      subject.execute(web_hook_id: post_hook.id, payload: {})
     end.to raise_error(Discourse::InvalidParameters)
   end
 
   it 'raises an error when there is no payload' do
     expect do
-      subject.execute(web_hook_id: 1, event_type: 'post')
+      subject.execute(web_hook_id: post_hook.id, event_type: 'post')
     end.to raise_error(Discourse::InvalidParameters)
   end
 

From 98039e6cc5eff656f71231d8dfd2641f552cdfd8 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 16 Apr 2020 22:38:10 +0200
Subject: [PATCH 0639/1830] FIX: template-lint uses strict rel-noopener rule
 which requires noreferrer (#9449)

---
 .template-lintrc.js                                         | 4 ++--
 app/assets/javascripts/admin/templates/badges-index.hbs     | 2 +-
 .../javascripts/admin/templates/components/admin-report.hbs | 2 +-
 .../admin/templates/components/version-checks.hbs           | 2 +-
 .../javascripts/admin/templates/customize-themes-edit.hbs   | 2 +-
 .../javascripts/admin/templates/customize-themes-index.hbs  | 2 +-
 .../javascripts/admin/templates/customize-themes-show.hbs   | 6 +++---
 .../javascripts/admin/templates/dashboard_general.hbs       | 2 +-
 .../admin/templates/modal/admin-install-theme.hbs           | 4 ++--
 .../javascripts/admin/templates/modal/admin-theme-item.hbs  | 2 +-
 app/assets/javascripts/admin/templates/plugins-index.hbs    | 2 +-
 .../discourse/templates/components/backup-codes.hbs         | 2 +-
 .../discourse/templates/components/ip-lookup.hbs            | 2 +-
 .../discourse/templates/components/reviewable-user.hbs      | 2 +-
 .../javascripts/discourse/templates/modal/publish-page.hbs  | 2 +-
 .../javascripts/discourse/templates/review-topics.hbs       | 2 +-
 app/assets/javascripts/discourse/templates/topic.hbs        | 2 +-
 .../javascripts/discourse/templates/user-invited-show.hbs   | 2 +-
 .../wizard/templates/components/popular-themes.hbs          | 2 +-
 19 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index b0a14bbf22..d7b4a104eb 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -10,7 +10,7 @@ module.exports = {
     "deprecated-render-helper": true,
     "require-valid-alt-text": false,
     "linebreak-style": true,
-    "link-rel-noopener": true,
+    "link-rel-noopener": "strict",
     "no-abstract-roles": true,
     "no-args-paths": true,
     "no-attrs-in-components": true,
@@ -43,7 +43,7 @@ module.exports = {
     "no-unnecessary-concat": true,
     "no-unnecessary-component-helper": true,
     "no-unused-block-params": true,
-    "quotes": "double",
+    quotes: "double",
     "require-button-type": true,
     "require-iframe-title": true,
     "require-valid-alt-text": false,
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index 7e2f21b127..4f26fde7f3 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -5,7 +5,7 @@
       <h1>{{i18n "admin.badges.badge_intro.title"}}</h1>
       <div class="external-resources">
         {{#each badgeIntroLinks as |link|}}
-          <a href={{link.href}} class="external-link" target="_blank" rel="noopener">
+          <a href={{link.href}} class="external-link" target="_blank" rel="noopener noreferrer">
             {{d-icon link.icon}}
             <span>{{i18n link.text}}</span>
           </a>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index eeb7894099..2aa3143a47 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -24,7 +24,7 @@
 
                 {{#if model.description}}
                   {{#if model.description_link}}
-                    <a target="_blank" rel="noopener" href={{model.description_link}} class="info" data-tooltip={{model.description}}>
+                    <a target="_blank" rel="noopener noreferrer" href={{model.description_link}} class="info" data-tooltip={{model.description}}>
                       {{d-icon "question-circle"}}
                     </a>
                   {{else}}
diff --git a/app/assets/javascripts/admin/templates/components/version-checks.hbs b/app/assets/javascripts/admin/templates/components/version-checks.hbs
index aa2fcc97c0..9471bcc980 100644
--- a/app/assets/javascripts/admin/templates/components/version-checks.hbs
+++ b/app/assets/javascripts/admin/templates/components/version-checks.hbs
@@ -18,7 +18,7 @@
     {{#if versionCheck.gitLink}}
       <div class="sha-link">
         (
-        <a href={{versionCheck.gitLink}} rel="noopener" target="_blank">
+        <a href={{versionCheck.gitLink}} rel="noopener noreferrer" target="_blank">
           {{versionCheck.shortSha}}
         </a>
         )
diff --git a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
index 31ad084c23..a4e7fa583f 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
@@ -15,7 +15,7 @@
     <div class="admin-footer">
       <div class="status-actions">
         {{#unless model.changed}}
-          <a href={{previewUrl}} rel="noopener" title={{i18n "admin.customize.explain_preview"}} class="preview-link" target="_blank">
+          <a href={{previewUrl}} rel="noopener noreferrer" title={{i18n "admin.customize.explain_preview"}} class="preview-link" target="_blank">
             {{i18n "admin.customize.preview"}}
           </a>
         {{/unless}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
index 7402ef2724..fd1914a910 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-index.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-index.hbs
@@ -7,7 +7,7 @@
     </div>
     <div class="external-resources">
       {{#each externalResources as |resource|}}
-        <a href={{resource.link}} class="external-link" rel="noopener" target="_blank">
+        <a href={{resource.link}} class="external-link" rel="noopener noreferrer" target="_blank">
           {{d-icon resource.icon}}
           {{i18n resource.key}}
         </a>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 186cd9b358..9f46d47d69 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -206,7 +206,7 @@
       <ul class="removable-list">
         {{#each model.uploads as |upload|}}
           <li>
-            <span class="col">${{upload.name}}: <a href={{upload.url}} rel="noopener" target="_blank">{{upload.filename}}</a></span>
+            <span class="col">${{upload.name}}: <a href={{upload.url}} rel="noopener noreferrer" target="_blank">{{upload.filename}}</a></span>
             <span class="col">
               {{d-button action=(action "removeUpload") actionParam=upload class="second btn-default btn-default cancel-edit" icon="times"}}
             </span>
@@ -241,8 +241,8 @@
     </div>
   {{/if}}
 
-  <a href={{previewUrl}} title={{i18n "admin.customize.explain_preview"}} rel="noopener" target="_blank" class="btn btn-default">{{d-icon "desktop"}}{{i18n "admin.customize.theme.preview"}}</a>
-  <a class="btn btn-default export" rel="noopener" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n "admin.export_json.button_text"}}</a>
+  <a href={{previewUrl}} title={{i18n "admin.customize.explain_preview"}} rel="noopener noreferrer" target="_blank" class="btn btn-default">{{d-icon "desktop"}}{{i18n "admin.customize.theme.preview"}}</a>
+  <a class="btn btn-default export" rel="noopener noreferrer" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n "admin.export_json.button_text"}}</a>
 
   {{d-button action=(action "switchType") label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}}
 
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index 2eca2b7d02..16214a92e3 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -121,7 +121,7 @@
             <div>
               <h4>{{i18n "admin.dashboard.discourse_last_updated"}} </h4>
               <p>{{format-date model.attributes.discourse_updated_at leaveAgo="true"}}</p>
-              <a rel="noopener" target="_blank" href={{model.attributes.release_notes_link}} class="btn btn-default">
+              <a rel="noopener noreferrer" target="_blank" href={{model.attributes.release_notes_link}} class="btn btn-default">
                 {{i18n "admin.dashboard.whats_new_in_discourse"}}
               </a>
             </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
index 6c8ab04311..604befe690 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
@@ -11,7 +11,7 @@
         {{#each themes as |theme|}}
           <div class="popular-theme-item">
             <div class="popular-theme-name">
-              <a href={{theme.meta_url}} rel="noopener" target="_blank">
+              <a href={{theme.meta_url}} rel="noopener noreferrer" target="_blank">
                 {{#if theme.component}}
                   {{d-icon "puzzle-piece" title="admin.customize.theme.component"}}
                 {{/if}}
@@ -33,7 +33,7 @@
                   action=(action "installThemeFromList" theme.value)}}
 
                 {{#if theme.preview}}
-                  <a href={{theme.preview}} rel="noopener" target="_blank">{{d-icon "desktop"}} {{i18n "admin.customize.theme.preview"}}</a>
+                  <a href={{theme.preview}} rel="noopener noreferrer" target="_blank">{{d-icon "desktop"}} {{i18n "admin.customize.theme.preview"}}</a>
                 {{/if}}
               {{/if}}
             </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
index 1a50682819..7a7198fd57 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
@@ -2,7 +2,7 @@
   <div class="popular-theme-name">
     {{theme.name}}
     {{#if theme.preview}}
-      <a href={{theme.preview}} title="Preview" rel="noopener" target="_blank">{{d-icon "far-eye"}}</a>
+      <a href={{theme.preview}} title="Preview" rel="noopener noreferrer" target="_blank">{{d-icon "far-eye"}}</a>
     {{/if}}
   </div>
   <div class="popular-theme-buttons">
diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index e17804d7ff..b89b6e6f01 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -24,7 +24,7 @@
 
           <td class="plugin-name">
             {{#if plugin.url}}
-              <a href={{plugin.url}} rel="noopener" target="_blank">{{plugin.name}}</a>
+              <a href={{plugin.url}} rel="noopener noreferrer" target="_blank">{{plugin.name}}</a>
             {{else}}
               {{plugin.name}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/backup-codes.hbs b/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
index 046baed16a..73b7ad43aa 100644
--- a/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
@@ -8,7 +8,7 @@
 
   <a download="backup_codes.txt"
      class="btn no-text btn-icon backup-codes-download-btn"
-     rel="noopener"
+     rel="noopener noreferrer"
      target="_blank"
      href="data:application/octet-stream;charset=utf-8;base64,{{base64BackupCode}}">
     {{d-icon "download"}}
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 3e57bd71d8..b6980b39d5 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -25,7 +25,7 @@
         <dt>{{i18n "ip_lookup.location"}}</dt>
         <dd>
           {{#if location.location}}
-            <a href="https://maps.google.com/maps?q={{location.latitude}},{{location.longitude}}" rel="noopener" target="_blank">
+            <a href="https://maps.google.com/maps?q={{location.latitude}},{{location.longitude}}" rel="noopener noreferrer" target="_blank">
               {{location.location}}
             </a>
           {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs
index 4c246153ce..be61c74e81 100644
--- a/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs
+++ b/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs
@@ -29,7 +29,7 @@
       <div class="reviewable-user-details website">
         <div class="name">{{i18n "review.user.website"}}</div>
         <div class="value">
-          <a href={{reviewable.payload.website}} target="_blank" rel="noopener">{{reviewable.payload.website}}</a>
+          <a href={{reviewable.payload.website}} target="_blank" rel="noopener noreferrer">{{reviewable.payload.website}}</a>
         </div>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/publish-page.hbs b/app/assets/javascripts/discourse/templates/modal/publish-page.hbs
index a3c780ddbe..07c3640ddd 100644
--- a/app/assets/javascripts/discourse/templates/modal/publish-page.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/publish-page.hbs
@@ -17,7 +17,7 @@
           <div class="current-url">
             {{i18n "topic.publish_page.publish_url"}}
             <div>
-              <a href={{publishedPage.url}} target="_blank" rel="noopener">{{publishedPage.url}}</a>
+              <a href={{publishedPage.url}} target="_blank" rel="noopener noreferrer">{{publishedPage.url}}</a>
             </div>
           </div>
         {{else}}
diff --git a/app/assets/javascripts/discourse/templates/review-topics.hbs b/app/assets/javascripts/discourse/templates/review-topics.hbs
index 337cb4207d..6bce353354 100644
--- a/app/assets/javascripts/discourse/templates/review-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/review-topics.hbs
@@ -12,7 +12,7 @@
           <td class="topic-title">
             <div class="combined-title">
               {{topic-status topic=rt}}
-              <a href={{rt.relative_url}} rel="noopener" target="_blank">{{replace-emoji rt.fancy_title}}</a>
+              <a href={{rt.relative_url}} rel="noopener noreferrer" target="_blank">{{replace-emoji rt.fancy_title}}</a>
             </div>
           </td>
           <td class="reviewable-count">
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 7a4f6d6c7e..a3068355d0 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -91,7 +91,7 @@
           <div class="details">
             {{i18n "topic.publish_page.topic_published"}}
             <div>
-              <a href={{model.publishedPage.url}} target="_blank" rel="noopener">{{model.publishedPage.url}}</a>
+              <a href={{model.publishedPage.url}} target="_blank" rel="noopener noreferrer">{{model.publishedPage.url}}</a>
             </div>
           </div>
           <div class="controls">
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 30aa848824..1def791972 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -17,7 +17,7 @@
               {{d-button icon="plus" action=(route-action "showInvite") label="user.invited.create"}}
               {{#if canBulkInvite}}
                 {{csv-uploader uploading=uploading}}
-                <a href="https://meta.discourse.org/t/sending-bulk-user-invites/16468" rel="noopener" target="_blank" style="color:black;">{{d-icon "question-circle"}}</a>
+                <a href="https://meta.discourse.org/t/sending-bulk-user-invites/16468" rel="noopener noreferrer" target="_blank" style="color:black;">{{d-icon "question-circle"}}</a>
               {{/if}}
               {{#if showBulkActionButtons}}
                 {{#if rescindedAll}}
diff --git a/app/assets/javascripts/wizard/templates/components/popular-themes.hbs b/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
index 6f6ddf02ed..774f8c0a27 100644
--- a/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
+++ b/app/assets/javascripts/wizard/templates/components/popular-themes.hbs
@@ -1,5 +1,5 @@
 {{#each popular_components as |theme|}}
-  <a class="popular-theme-item" href={{theme.meta_url}} rel="noopener" target="_blank">
+  <a class="popular-theme-item" href={{theme.meta_url}} rel="noopener noreferrer" target="_blank">
     {{theme.name}}
   </a>
 {{/each}}

From e96e57c6290c8be0370a297a4dad35f2023a3024 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Thu, 16 Apr 2020 16:31:24 -0500
Subject: [PATCH 0640/1830] UX: Wizard Font Size (#9448)

Define font-size in wizard
---
 app/assets/stylesheets/wizard.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index 16a59ce294..81c95de9b3 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -11,10 +11,9 @@ body.wizard {
   background-image: asset-url("/images/wizard/bubbles.png");
   background-repeat: repeat;
   background-position: left top;
-
   color: #444;
-
   line-height: $line-height-large;
+  font-size: 15px;
 }
 
 .finish-installation {

From e8e764c0645476d921eb56d922dd93de128883c2 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Fri, 17 Apr 2020 09:04:10 +1000
Subject: [PATCH 0641/1830] FIX: flaky groups_controller_spec (#9439)

Sometimes spec which is testing order groups by user count is failing.

My theory is that cause is the randomness of Postgres when the order value is the same for 2 rows.

In spec, we got three groups
`moderator_group` - 0 users
`group` - 1 user
`other_group` - 1 user

And we are expecting that controller will return them in ascending order [moderator, group, other_group]

Because `group` and `other_group` contain the same amount of users, we are dealing with luck

Therefore, I believe that adding one more user to other_group should make that query reliable.

It was not crashing on my local machine, so I am not 100% sure.
---
 spec/requests/groups_controller_spec.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 381e247e42..0f1027edf3 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -4,6 +4,7 @@ require 'rails_helper'
 
 describe GroupsController do
   fab!(:user) { Fabricate(:user) }
+  let(:other_user) { Fabricate(:user) }
   let(:group) { Fabricate(:group, users: [user]) }
   let(:moderator_group_id) { Group::AUTO_GROUPS[:moderators] }
   fab!(:admin) { Fabricate(:admin) }
@@ -91,7 +92,7 @@ describe GroupsController do
         sign_in(user)
       end
 
-      let!(:other_group) { Fabricate(:group, name: "other_group", users: [user]) }
+      let!(:other_group) { Fabricate(:group, name: "other_group", users: [user, other_user]) }
 
       context "with default (descending) order" do
         it "sorts by name" do
@@ -116,7 +117,7 @@ describe GroupsController do
           body = JSON.parse(response.body)
 
           expect(body["groups"].map { |g| g["id"] }).to eq([
-            group.id, other_group.id, moderator_group_id
+            other_group.id, group.id, moderator_group_id
           ])
 
           expect(body["load_more_groups"]).to eq("/groups?order=user_count&page=1")

From 5a60a4233e7498795155252a842c2c7ef5b8ec05 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Fri, 17 Apr 2020 09:35:26 +1000
Subject: [PATCH 0642/1830] FIX: topic title in search contains data-topic-id
 (#9435)

Data topic id is required by the discourse-encrypt plugin.

Related to https://github.com/discourse/discourse-encrypt/pull/12
---
 .../javascripts/discourse/widgets/search-menu-results.js    | 6 +++++-
 test/javascripts/acceptance/search-test.js                  | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js b/app/assets/javascripts/discourse/widgets/search-menu-results.js
index 6d46819263..cdb486954f 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-results.js
+++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js
@@ -145,7 +145,11 @@ createSearchResult({
 
     const firstLine = [
       this.attach("topic-status", { topic, disableActions: true }),
-      h("span.topic-title", new Highlighted(topic.fancyTitle, term))
+      h(
+        "span.topic-title",
+        { attributes: { "data-topic-id": topic.id } },
+        new Highlighted(topic.fancyTitle, term)
+      )
     ];
 
     const secondLine = [
diff --git a/test/javascripts/acceptance/search-test.js b/test/javascripts/acceptance/search-test.js
index 62d4323867..018e3a08c7 100644
--- a/test/javascripts/acceptance/search-test.js
+++ b/test/javascripts/acceptance/search-test.js
@@ -28,6 +28,10 @@ QUnit.test("search", async assert => {
   await fillIn("#search-term", "dev");
   await keyEvent("#search-term", "keyup", 16);
   assert.ok(exists(".search-menu .results ul li"), "it shows results");
+  assert.ok(
+    exists(".search-menu .results ul li .topic-title[data-topic-id]"),
+    "topic has data-topic-id"
+  );
 
   await click(".show-help");
 

From 6fad04635b40363e7a5c5e354341c2f000383f01 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 16 Apr 2020 20:19:23 -0400
Subject: [PATCH 0643/1830] UX: Set focus when launching composer on iOS
 (#9443)

---
 app/assets/javascripts/application.js         |  1 +
 .../discourse/components/composer-body.js     | 21 +++--
 .../discourse/components/composer-editor.js   | 10 +--
 .../discourse/components/composer-title.js    |  2 +-
 .../components/composer-user-selector.js      |  2 +-
 .../discourse/controllers/composer.js         |  6 +-
 .../discourse/lib/put-cursor-at-end.js        | 16 ++++
 .../javascripts/discourse/lib/safari-hacks.js | 81 ++++++++++---------
 .../javascripts/discourse/lib/utilities.js    |  6 --
 app/assets/stylesheets/mobile/compose.scss    |  7 +-
 10 files changed, 80 insertions(+), 72 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/lib/put-cursor-at-end.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 9addddf9ef..6a6cc8ac41 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -54,6 +54,7 @@
 //= require ./discourse/lib/autocomplete
 //= require ./discourse/lib/after-transition
 //= require ./discourse/lib/safari-hacks
+//= require ./discourse/lib/put-cursor-at-end
 //= require_tree ./discourse/adapters
 //= require ./discourse/models/post-action-type
 //= require ./discourse/models/post
diff --git a/app/assets/javascripts/discourse/components/composer-body.js b/app/assets/javascripts/discourse/components/composer-body.js
index e5a6e8261d..83792801aa 100644
--- a/app/assets/javascripts/discourse/components/composer-body.js
+++ b/app/assets/javascripts/discourse/components/composer-body.js
@@ -150,28 +150,27 @@ export default Component.extend(KeyEnterEscape, {
   },
 
   viewportResize() {
-    const composerVH = window.visualViewport.height * 0.01;
+    const composerVH = window.visualViewport.height * 0.01,
+      doc = document.documentElement;
 
-    document.documentElement.style.setProperty(
-      "--composer-vh",
-      `${composerVH}px`
-    );
+    doc.style.setProperty("--composer-vh", `${composerVH}px`);
 
     const viewportWindowDiff =
       window.innerHeight - window.visualViewport.height;
 
+    viewportWindowDiff
+      ? doc.classList.add("keyboard-visible")
+      : doc.classList.remove("keyboard-visible");
     // adds bottom padding when using a hardware keyboard and the accessory bar is visible
     // accessory bar height is 55px, using 75 allows a small buffer
-    if (viewportWindowDiff > 0 && viewportWindowDiff < 75) {
-      document.documentElement.style.setProperty(
+
+    if (viewportWindowDiff < 75) {
+      doc.style.setProperty(
         "--composer-ipad-padding",
         `${viewportWindowDiff}px`
       );
     } else {
-      document.documentElement.style.setProperty(
-        "--composer-ipad-padding",
-        "0px"
-      );
+      doc.style.setProperty("--composer-ipad-padding", "0px");
     }
   },
 
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js b/app/assets/javascripts/discourse/components/composer-editor.js
index e6e000aa09..ad34e96184 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/components/composer-editor.js
@@ -28,11 +28,10 @@ import {
   tinyAvatar,
   formatUsername,
   clipboardData,
-  safariHacksDisabled,
   caretPosition,
-  inCodeBlock,
-  putCursorAtEnd
+  inCodeBlock
 } from "discourse/lib/utilities";
+import putCursorAtEnd from "discourse/lib/put-cursor-at-end";
 import {
   validateUploadedFiles,
   authorizesOneOrMoreImageExtensions,
@@ -210,10 +209,7 @@ export default Component.extend({
     }
 
     // Focus on the body unless we have a title
-    if (
-      !this.get("composer.canEditTitle") &&
-      (!this.capabilities.isIOS || safariHacksDisabled())
-    ) {
+    if (!this.get("composer.canEditTitle")) {
       putCursorAtEnd(this.element.querySelector(".d-editor-input"));
     }
 
diff --git a/app/assets/javascripts/discourse/components/composer-title.js b/app/assets/javascripts/discourse/components/composer-title.js
index e036beef1a..b4cb3ef382 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js
+++ b/app/assets/javascripts/discourse/components/composer-title.js
@@ -7,7 +7,7 @@ import { lookupCache } from "pretty-text/oneboxer-cache";
 import { ajax } from "discourse/lib/ajax";
 import ENV from "discourse-common/config/environment";
 import EmberObject from "@ember/object";
-import { putCursorAtEnd } from "discourse/lib/utilities";
+import putCursorAtEnd from "discourse/lib/put-cursor-at-end";
 
 export default Component.extend({
   classNames: ["title-input"],
diff --git a/app/assets/javascripts/discourse/components/composer-user-selector.js b/app/assets/javascripts/discourse/components/composer-user-selector.js
index 3418697207..efbc3aafdb 100644
--- a/app/assets/javascripts/discourse/components/composer-user-selector.js
+++ b/app/assets/javascripts/discourse/components/composer-user-selector.js
@@ -1,7 +1,7 @@
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import { putCursorAtEnd } from "discourse/lib/utilities";
+import putCursorAtEnd from "discourse/lib/put-cursor-at-end";
 
 export default Component.extend({
   showSelector: true,
diff --git a/app/assets/javascripts/discourse/controllers/composer.js b/app/assets/javascripts/discourse/controllers/composer.js
index 1706c82dd9..b7855d54b9 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js
+++ b/app/assets/javascripts/discourse/controllers/composer.js
@@ -13,7 +13,7 @@ import discourseComputed, {
   on
 } from "discourse-common/utils/decorators";
 import { getOwner } from "discourse-common/lib/get-owner";
-import { escapeExpression, safariHacksDisabled } from "discourse/lib/utilities";
+import { escapeExpression } from "discourse/lib/utilities";
 import {
   authorizesOneOrMoreExtensions,
   uploadIcon
@@ -136,10 +136,6 @@ export default Controller.extend({
     "model.composeState"
   )
   focusTarget(replyingToTopic, creatingPM, usernames, composeState) {
-    if (this.capabilities.isIOS && !safariHacksDisabled()) {
-      return "none";
-    }
-
     // Focus on usernames if it's blank or if it's just you
     usernames = usernames || "";
     if (
diff --git a/app/assets/javascripts/discourse/lib/put-cursor-at-end.js b/app/assets/javascripts/discourse/lib/put-cursor-at-end.js
new file mode 100644
index 0000000000..eec28b36a3
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/put-cursor-at-end.js
@@ -0,0 +1,16 @@
+import positioningWorkaround from "discourse/lib/safari-hacks";
+import { isAppleDevice } from "discourse/lib/utilities";
+
+export default function(element) {
+  if (isAppleDevice() && positioningWorkaround.touchstartEvent) {
+    positioningWorkaround.touchstartEvent(element);
+  } else {
+    element.focus();
+  }
+
+  const len = element.value.length;
+  element.setSelectionRange(len, len);
+
+  // Scroll to the bottom, in case we're in a tall textarea
+  element.scrollTop = 999999;
+}
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js b/app/assets/javascripts/discourse/lib/safari-hacks.js
index 40d8ee4637..d18d06fcc1 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js
@@ -84,6 +84,12 @@ function positioningWorkaround($fixedElement) {
     return;
   }
 
+  document.addEventListener("scroll", () => {
+    if (!caps.isIpadOS && workaroundActive) {
+      document.documentElement.scrollTop = 0;
+    }
+  });
+
   const fixedElement = $fixedElement[0];
   const oldHeight = fixedElement.style.height;
 
@@ -94,17 +100,17 @@ function positioningWorkaround($fixedElement) {
     if (workaroundActive) {
       $("body").removeClass("ios-safari-composer-hacks");
 
+      $(window).scrollTop(originalScrollTop);
+      if (evt && evt.target) {
+        evt.target.removeEventListener("blur", blurred);
+      }
+
+      workaroundActive = false;
+
       if (!iOSWithVisualViewport()) {
         fixedElement.style.height = oldHeight;
         later(() => $(fixedElement).removeClass("no-transition"), 500);
       }
-
-      $(window).scrollTop(originalScrollTop);
-
-      if (evt) {
-        evt.target.removeEventListener("blur", blurred);
-      }
-      workaroundActive = false;
     }
   };
 
@@ -113,8 +119,9 @@ function positioningWorkaround($fixedElement) {
     // document.activeElement is also unreliable (iOS does not mark buttons as focused)
     // so instead, we store the last touched element and check against it
 
-    // cancel blur event if user is:
+    // cancel blur event when:
     // - switching to another iOS app
+    // - displaying title field
     // - invoking a select-kit dropdown
     // - invoking mentions
     // - invoking emoji dropdown via : and hitting return
@@ -123,6 +130,7 @@ function positioningWorkaround($fixedElement) {
     if (
       lastTouchedElement &&
       (document.visibilityState === "hidden" ||
+        $fixedElement.hasClass("edit-title") ||
         $(lastTouchedElement).hasClass("select-kit-header") ||
         $(lastTouchedElement).closest(".autocomplete").length ||
         (lastTouchedElement.nodeName.toLowerCase() === "textarea" &&
@@ -140,6 +148,12 @@ function positioningWorkaround($fixedElement) {
   var blurred = discourseDebounce(blurredNow, INPUT_DELAY);
 
   var positioningHack = function(evt) {
+    let _this = this;
+
+    if (evt === undefined) {
+      evt = new CustomEvent("no-op");
+    }
+
     // we need this, otherwise changing focus means we never clear
     this.addEventListener("blur", blurred);
 
@@ -150,12 +164,22 @@ function positioningWorkaround($fixedElement) {
       .find(".select-kit > button.is-focused")
       .removeClass("is-focused");
 
-    if ($(window).scrollTop() > 0) {
-      originalScrollTop = $(window).scrollTop();
+    originalScrollTop = $(window).scrollTop();
+
+    const elementRect = _this.getBoundingClientRect();
+    if (elementRect.top > 100) {
+      // this tricks iOS safari into assuming input/textarea is at top of the viewport
+      // via https://stackoverflow.com/questions/38017771/mobile-safari-prevent-scroll-page-when-focus-on-input
+      _this.style.transform = "translateY(-400px)";
+      setTimeout(function() {
+        _this.style.transform = "none";
+      }, 30);
     }
 
+    let delay = caps.isIpadOS ? 350 : 150;
+
     setTimeout(function() {
-      if (iOSWithVisualViewport()) {
+      if (caps.isIpadOS && iOSWithVisualViewport()) {
         // disable hacks when using a hardware keyboard
         // by default, a hardware keyboard will show the keyboard accessory bar
         // whose height is currently 55px (using 75 for a bit of a buffer)
@@ -165,38 +189,14 @@ function positioningWorkaround($fixedElement) {
         }
       }
 
-      if (fixedElement.style.top === "0px") {
-        if (this !== document.activeElement) {
-          evt.preventDefault();
-
-          // this tricks safari into assuming current input is at top of the viewport
-          // via https://stackoverflow.com/questions/38017771/mobile-safari-prevent-scroll-page-when-focus-on-input
-          this.style.transform = "translateY(-200px)";
-          this.focus();
-          let _this = this;
-          setTimeout(function() {
-            _this.style.transform = "none";
-          }, 30);
-        }
-        return;
-      }
-
       // don't trigger keyboard on disabled element (happens when a category is required)
-      if (this.disabled) {
+      if (_this.disabled) {
         return;
       }
 
       $("body").addClass("ios-safari-composer-hacks");
       $(window).scrollTop(0);
 
-      let i = 20;
-      let interval = setInterval(() => {
-        $(window).scrollTop(0);
-        if (i-- === 0) {
-          clearInterval(interval);
-        }
-      }, 10);
-
       if (!iOSWithVisualViewport()) {
         const height = calcHeight();
         fixedElement.style.height = height + "px";
@@ -204,9 +204,9 @@ function positioningWorkaround($fixedElement) {
       }
 
       evt.preventDefault();
-      this.focus();
+      _this.focus();
       workaroundActive = true;
-    }, 350);
+    }, delay);
   };
 
   var lastTouched = function(evt) {
@@ -230,6 +230,11 @@ function positioningWorkaround($fixedElement) {
     });
   }, 100);
 
+  positioningWorkaround.touchstartEvent = function(element) {
+    var triggerHack = positioningHack.bind(element);
+    triggerHack();
+  };
+
   const config = {
     childList: true,
     subtree: true,
diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js
index c753f4b0cf..03ef200016 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js
+++ b/app/assets/javascripts/discourse/lib/utilities.js
@@ -444,11 +444,5 @@ export function inCodeBlock(text, pos) {
   return result;
 }
 
-export function putCursorAtEnd(element) {
-  element.focus();
-  const len = element.value.length;
-  element.setSelectionRange(len, len);
-}
-
 // This prevents a mini racer crash
 export default {};
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index f4062f5241..e28806131b 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -26,9 +26,10 @@
 
   body.ios-safari-composer-hacks &.open {
     height: calc(var(--composer-vh, 1vh) * 100);
-    .reply-area {
-      padding-bottom: 0px;
-    }
+  }
+
+  .keyboard-visible body.ios-safari-composer-hacks &.open .reply-area {
+    padding-bottom: 0px;
   }
 
   .reply-to {

From 8f0544137a392e22addb87b49ad76b516a929ece Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 17 Apr 2020 11:08:07 +1000
Subject: [PATCH 0644/1830] FEATURE: Allow editing bookmark reminders (#9437)

Users can now edit the bookmark name and reminder time from their list of bookmarks.

We use "Custom" for the date and time in the modal because if the user set a reminder for "tomorrow" then edit the reminder "tomorrow", the definition of what "tomorrow" is has changed.
---
 .../components/bookmark-actions-dropdown.js   |   8 +
 .../discourse/controllers/bookmark.js         | 100 ++++++++---
 .../user-activity-bookmarks-with-reminders.js |  23 ++-
 .../javascripts/discourse/models/bookmark.js  |   8 +-
 .../discourse/templates/modal/bookmark.hbs    | 161 +++++++++---------
 .../discourse/templates/user/bookmarks.hbs    |   6 +-
 .../common/components/bookmark-modal.scss     |  10 ++
 app/controllers/bookmarks_controller.rb       |  18 ++
 config/locales/client.en.yml                  |   5 +
 config/routes.rb                              |   2 +-
 lib/bookmark_manager.rb                       |  18 ++
 lib/guardian/bookmark_guardian.rb             |   4 +
 spec/lib/bookmark_manager_spec.rb             |  37 ++++
 test/javascripts/controllers/bookmark-test.js |  18 ++
 14 files changed, 305 insertions(+), 113 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js b/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js
index 6e72fafc44..84737c4973 100644
--- a/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js
+++ b/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js
@@ -20,6 +20,12 @@ export default DropdownSelectBoxComponent.extend({
         description: I18n.t(
           "post.bookmarks.actions.delete_bookmark.description"
         )
+      },
+      {
+        id: "edit",
+        icon: "pencil",
+        name: I18n.t("post.bookmarks.actions.edit_bookmark.name"),
+        description: I18n.t("post.bookmarks.actions.edit_bookmark.description")
       }
     ];
   }),
@@ -28,6 +34,8 @@ export default DropdownSelectBoxComponent.extend({
   onChange(selectedAction) {
     if (selectedAction === "remove") {
       this.removeBookmark(this.bookmark);
+    } else if (selectedAction === "edit") {
+      this.editBookmark(this.bookmark);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 39baaa07b2..f9bf306824 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -1,4 +1,5 @@
 import { and } from "@ember/object/computed";
+import { isPresent } from "@ember/utils";
 import { next } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { Promise } from "rsvp";
@@ -7,7 +8,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { ajax } from "discourse/lib/ajax";
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
-import { REMINDER_TYPES } from "discourse/lib/bookmark";
+import { formattedReminderTime, REMINDER_TYPES } from "discourse/lib/bookmark";
 
 // global shortcuts that interfere with these modal shortcuts, they are rebound when the
 // modal is closed
@@ -47,7 +48,6 @@ const BOOKMARK_BINDINGS = {
 export default Controller.extend(ModalFunctionality, {
   loading: false,
   errorMessage: null,
-  name: null,
   selectedReminderType: null,
   closeWithoutSaving: false,
   isSavingBookmarkManually: false,
@@ -62,7 +62,6 @@ export default Controller.extend(ModalFunctionality, {
   onShow() {
     this.setProperties({
       errorMessage: null,
-      name: null,
       selectedReminderType: REMINDER_TYPES.NONE,
       closeWithoutSaving: false,
       isSavingBookmarkManually: false,
@@ -76,9 +75,47 @@ export default Controller.extend(ModalFunctionality, {
     this.bindKeyboardShortcuts();
     this.loadLastUsedCustomReminderDatetime();
 
-    // make sure the input is cleared, otherwise the keyboard shortcut to toggle
-    // bookmark for post ends up in the input
-    next(() => this.set("name", null));
+    if (this.editingExistingBookmark()) {
+      this.initializeExistingBookmarkData();
+    } else {
+      // make sure the input is cleared, otherwise the keyboard shortcut to toggle
+      // bookmark for post ends up in the input
+      next(() => this.set("model.name", null));
+    }
+  },
+
+  /**
+   * We always want to save the bookmark unless the user specifically
+   * clicks the save or cancel button to mimic browser behaviour.
+   */
+  onClose() {
+    this.unbindKeyboardShortcuts();
+    this.restoreGlobalShortcuts();
+    if (!this.closeWithoutSaving && !this.isSavingBookmarkManually) {
+      this.saveBookmark().catch(e => this.handleSaveError(e));
+    }
+    if (this.onCloseWithoutSaving && this.closeWithoutSaving) {
+      this.onCloseWithoutSaving();
+    }
+  },
+
+  initializeExistingBookmarkData() {
+    if (this.existingBookmarkHasReminder()) {
+      let parsedReminderAt = this.parseCustomDateTime(this.model.reminderAt);
+      this.setProperties({
+        customReminderDate: parsedReminderAt.format("YYYY-MM-DD"),
+        customReminderTime: parsedReminderAt.format("HH:mm"),
+        selectedReminderType: REMINDER_TYPES.CUSTOM
+      });
+    }
+  },
+
+  editingExistingBookmark() {
+    return isPresent(this.model) && isPresent(this.model.id);
+  },
+
+  existingBookmarkHasReminder() {
+    return isPresent(this.model) && isPresent(this.model.reminderAt);
   },
 
   loadLastUsedCustomReminderDatetime() {
@@ -88,6 +125,7 @@ export default Controller.extend(ModalFunctionality, {
     if (lastTime && lastDate) {
       let parsed = this.parseCustomDateTime(lastDate, lastTime);
 
+      // can't set reminders in the past
       if (parsed < this.now()) {
         return;
       }
@@ -121,21 +159,11 @@ export default Controller.extend(ModalFunctionality, {
     KeyboardShortcuts.unpause(GLOBAL_SHORTCUTS_TO_PAUSE);
   },
 
-  // we always want to save the bookmark unless the user specifically
-  // clicks the save or cancel button to mimic browser behaviour
-  onClose() {
-    this.unbindKeyboardShortcuts();
-    this.restoreGlobalShortcuts();
-    if (!this.closeWithoutSaving && !this.isSavingBookmarkManually) {
-      this.saveBookmark().catch(e => this.handleSaveError(e));
-    }
-    if (this.onCloseWithoutSaving && this.closeWithoutSaving) {
-      this.onCloseWithoutSaving();
-    }
+  @discourseComputed("model.reminderAt")
+  showExistingReminderAt(existingReminderAt) {
+    return isPresent(existingReminderAt);
   },
 
-  showBookmarkReminderControls: true,
-
   @discourseComputed()
   showAtDesktop() {
     return (
@@ -177,6 +205,11 @@ export default Controller.extend(ModalFunctionality, {
     );
   },
 
+  @discourseComputed("model.reminderAt")
+  existingReminderAtFormatted(existingReminderAt) {
+    return formattedReminderTime(existingReminderAt, this.userTimezone);
+  },
+
   @discourseComputed()
   startNextBusinessWeekFormatted() {
     return this.nextWeek()
@@ -244,19 +277,32 @@ export default Controller.extend(ModalFunctionality, {
     const data = {
       reminder_type: reminderType,
       reminder_at: reminderAtISO,
-      name: this.name,
-      post_id: this.model.postId
+      name: this.model.name,
+      post_id: this.model.postId,
+      id: this.model.id
     };
 
-    return ajax("/bookmarks", { type: "POST", data }).then(() => {
-      if (this.afterSave) {
-        this.afterSave(reminderAtISO, this.selectedReminderType);
-      }
-    });
+    if (this.editingExistingBookmark()) {
+      return ajax("/bookmarks/" + this.model.id, {
+        type: "PUT",
+        data
+      }).then(() => {
+        if (this.afterSave) {
+          this.afterSave(reminderAtISO, this.selectedReminderType);
+        }
+      });
+    } else {
+      return ajax("/bookmarks", { type: "POST", data }).then(() => {
+        if (this.afterSave) {
+          this.afterSave(reminderAtISO, this.selectedReminderType);
+        }
+      });
+    }
   },
 
   parseCustomDateTime(date, time) {
-    return moment.tz(date + " " + time, this.userTimezone);
+    let dateTime = isPresent(time) ? date + " " + time : date;
+    return moment.tz(dateTime, this.userTimezone);
   },
 
   defaultCustomReminderTime() {
diff --git a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
index 11cc0bb622..a2176a7a2b 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
+++ b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
@@ -1,4 +1,5 @@
 import Controller from "@ember/controller";
+import showModal from "discourse/lib/show-modal";
 import { Promise } from "rsvp";
 import { inject } from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
@@ -35,9 +36,9 @@ export default Controller.extend({
       );
   },
 
-  @discourseComputed("loaded", "content.length")
-  noContent(loaded, contentLength) {
-    return loaded && contentLength === 0;
+  @discourseComputed("loaded", "content.length", "noResultsHelp")
+  noContent(loaded, contentLength, noResultsHelp) {
+    return loaded && contentLength === 0 && noResultsHelp !== null;
   },
 
   processLoadResponse(response) {
@@ -63,6 +64,22 @@ export default Controller.extend({
       return bookmark.destroy().then(() => this.loadItems());
     },
 
+    editBookmark(bookmark) {
+      let controller = showModal("bookmark", {
+        model: {
+          postId: bookmark.post_id,
+          id: bookmark.id,
+          reminderAt: bookmark.reminder_at,
+          name: bookmark.name
+        },
+        title: "post.bookmarks.edit",
+        modalClass: "bookmark-with-reminder"
+      });
+      controller.setProperties({
+        afterSave: () => this.loadItems()
+      });
+    },
+
     loadMore() {
       if (this.loadingMore) {
         return Promise.resolve();
diff --git a/app/assets/javascripts/discourse/models/bookmark.js b/app/assets/javascripts/discourse/models/bookmark.js
index 8a8c09f35f..44daca7cdd 100644
--- a/app/assets/javascripts/discourse/models/bookmark.js
+++ b/app/assets/javascripts/discourse/models/bookmark.js
@@ -10,6 +10,7 @@ import { ajax } from "discourse/lib/ajax";
 import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import discourseComputed from "discourse-common/utils/decorators";
+import { formattedReminderTime } from "discourse/lib/bookmark";
 
 const Bookmark = RestModel.extend({
   newBookmark: none("id"),
@@ -110,9 +111,10 @@ const Bookmark = RestModel.extend({
 
   @discourseComputed("reminder_at", "currentUser")
   formattedReminder(bookmarkReminderAt, currentUser) {
-    return moment
-      .tz(bookmarkReminderAt, currentUser.resolvedTimezone())
-      .format(I18n.t("dates.long_with_year"));
+    return formattedReminderTime(
+      bookmarkReminderAt,
+      currentUser.resolvedTimezone()
+    ).capitalize();
   },
 
   loadItems() {
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 51d6c2b734..8e20711ef3 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -9,89 +9,94 @@
     {{/if}}
 
     <div class="control-group">
-      {{input value=name name="name" class="bookmark-name" placeholder=(i18n "post.bookmarks.name_placeholder")}}
+      {{input value=model.name name="name" class="bookmark-name" placeholder=(i18n "post.bookmarks.name_placeholder")}}
     </div>
 
-    {{#if showBookmarkReminderControls}}
-      <div class="control-group">
-        <label class="control-label" for="set_reminder">
-          {{i18n "post.bookmarks.set_reminder"}}
-        </label>
-
-        {{#if userHasTimezoneSet}}
-          {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
-            {{#if showAtDesktop}}
-              {{#tap-tile icon="desktop" tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-                <div class="tap-tile-title">{{i18n "bookmarks.reminders.at_desktop"}}</div>
-              {{/tap-tile}}
-            {{/if}}
-
-            {{#if showLaterToday}}
-              {{#tap-tile icon="far-moon" tileId=reminderTypes.LATER_TODAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-                <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_today"}}</div>
-                <div class="tap-tile-date">{{laterTodayFormatted}}</div>
-              {{/tap-tile}}
-            {{/if}}
-            {{#tap-tile icon="far-sun" tileId=reminderTypes.TOMORROW activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.tomorrow"}}</div>
-              <div class="tap-tile-date">{{tomorrowFormatted}}</div>
-            {{/tap-tile}}
-            {{#if showLaterThisWeek}}
-              {{#tap-tile icon="angle-double-right" tileId=reminderTypes.LATER_THIS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-                <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_this_week"}}</div>
-                <div class="tap-tile-date">{{laterThisWeekFormatted}}</div>
-              {{/tap-tile}}
-            {{/if}}
-            {{#tap-tile icon="briefcase" tileId=reminderTypes.START_OF_NEXT_BUSINESS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.start_of_next_business_week"}}</div>
-              <div class="tap-tile-date">{{startNextBusinessWeekFormatted}}</div>
-            {{/tap-tile}}
-            {{#tap-tile icon="far-clock" tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_week"}}</div>
-              <div class="tap-tile-date">{{nextWeekFormatted}}</div>
-            {{/tap-tile}}
-            {{#tap-tile icon="far-calendar-plus" tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_month"}}</div>
-              <div class="tap-tile-date">{{nextMonthFormatted}}</div>
-            {{/tap-tile}}
-            {{#tap-tile icon="calendar-alt" tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.custom"}}</div>
-            {{/tap-tile}}
-
-            {{#if customDateTimeSelected}}
-              <div class="control-group custom-date-time-wrap">
-                <div class="tap-tile-date-input">
-                  {{d-icon "calendar-alt"}}
-                  {{date-picker-future
-                    value=customReminderDate
-                    onSelect=(action (mut customReminderDate))
-                  }}
-                </div>
-                <div class="tap-tile-time-input">
-                  {{d-icon "far-clock"}}
-                  {{input placeholder="--:--" type="time" class="time-input" value=customReminderTime}}
-                </div>
-              </div>
-            {{/if}}
-
-            {{#if showLastCustom}}
-              {{#tap-tile icon="undo" tileId=reminderTypes.LAST_CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-                <div class="tap-tile-title">{{i18n "bookmarks.reminders.last_custom"}}</div>
-                <div class="tap-tile-date">{{lastCustomFormatted}}</div>
-              {{/tap-tile}}
-            {{/if}}
-
-            {{#tap-tile icon="ban" tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.none"}}</div>
-            {{/tap-tile}}
-          {{/tap-tile-grid}}
-
-        {{else}}
-          <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=basePath)}}</div>
-        {{/if}}
+    {{#if showExistingReminderAt }}
+      <div class="alert alert-info existing-reminder-at-alert">
+        {{d-icon "far-clock"}}
+        <span>{{i18n "bookmarks.reminders.existing_reminder"}} {{existingReminderAtFormatted}}</span>
       </div>
     {{/if}}
 
+    <div class="control-group">
+      <label class="control-label" for="set_reminder">
+        {{i18n "post.bookmarks.set_reminder"}}
+      </label>
+
+      {{#if userHasTimezoneSet}}
+        {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
+          {{#if showAtDesktop}}
+            {{#tap-tile icon="desktop" tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.at_desktop"}}</div>
+            {{/tap-tile}}
+          {{/if}}
+
+          {{#if showLaterToday}}
+            {{#tap-tile icon="far-moon" tileId=reminderTypes.LATER_TODAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_today"}}</div>
+              <div class="tap-tile-date">{{laterTodayFormatted}}</div>
+            {{/tap-tile}}
+          {{/if}}
+          {{#tap-tile icon="far-sun" tileId=reminderTypes.TOMORROW activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.tomorrow"}}</div>
+            <div class="tap-tile-date">{{tomorrowFormatted}}</div>
+          {{/tap-tile}}
+          {{#if showLaterThisWeek}}
+            {{#tap-tile icon="angle-double-right" tileId=reminderTypes.LATER_THIS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_this_week"}}</div>
+              <div class="tap-tile-date">{{laterThisWeekFormatted}}</div>
+            {{/tap-tile}}
+          {{/if}}
+          {{#tap-tile icon="briefcase" tileId=reminderTypes.START_OF_NEXT_BUSINESS_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.start_of_next_business_week"}}</div>
+            <div class="tap-tile-date">{{startNextBusinessWeekFormatted}}</div>
+          {{/tap-tile}}
+          {{#tap-tile icon="far-clock" tileId=reminderTypes.NEXT_WEEK activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_week"}}</div>
+            <div class="tap-tile-date">{{nextWeekFormatted}}</div>
+          {{/tap-tile}}
+          {{#tap-tile icon="far-calendar-plus" tileId=reminderTypes.NEXT_MONTH activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.next_month"}}</div>
+            <div class="tap-tile-date">{{nextMonthFormatted}}</div>
+          {{/tap-tile}}
+          {{#tap-tile icon="calendar-alt" tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.custom"}}</div>
+          {{/tap-tile}}
+
+          {{#if customDateTimeSelected}}
+            <div class="control-group custom-date-time-wrap">
+              <div class="tap-tile-date-input">
+                {{d-icon "calendar-alt"}}
+                {{date-picker-future
+                  value=customReminderDate
+                  onSelect=(action (mut customReminderDate))
+                }}
+              </div>
+              <div class="tap-tile-time-input">
+                {{d-icon "far-clock"}}
+                {{input placeholder="--:--" type="time" class="time-input" value=customReminderTime}}
+              </div>
+            </div>
+          {{/if}}
+
+          {{#if showLastCustom}}
+            {{#tap-tile icon="undo" tileId=reminderTypes.LAST_CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+              <div class="tap-tile-title">{{i18n "bookmarks.reminders.last_custom"}}</div>
+              <div class="tap-tile-date">{{lastCustomFormatted}}</div>
+            {{/tap-tile}}
+          {{/if}}
+
+          {{#tap-tile icon="ban" tileId=reminderTypes.NONE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
+            <div class="tap-tile-title">{{i18n "bookmarks.reminders.none"}}</div>
+          {{/tap-tile}}
+        {{/tap-tile-grid}}
+
+      {{else}}
+        <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=basePath)}}</div>
+      {{/if}}
+    </div>
+
     <div class="control-group">
       {{d-button label="bookmarks.save" class="btn-primary" action=(action "saveAndClose")}}
       {{d-modal-cancel close=(action "closeWithoutSavingBookmark")}}
diff --git a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
index fd6a5c5d1a..77ecf91231 100644
--- a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
+++ b/app/assets/javascripts/discourse/templates/user/bookmarks.hbs
@@ -42,7 +42,11 @@
               <td>{{format-date bookmark.created_at format="tiny"}}</td>
               {{raw "list/activity-column" topic=bookmark class="num" tagName="td"}}
               <td>
-                {{bookmark-actions-dropdown bookmark=bookmark removeBookmark=(action "removeBookmark")}}
+                {{bookmark-actions-dropdown
+                  bookmark=bookmark
+                  removeBookmark=(action "removeBookmark")
+                  editBookmark=(action "editBookmark")
+                }}
               </td>
             </tr>
           {{/each}}
diff --git a/app/assets/stylesheets/common/components/bookmark-modal.scss b/app/assets/stylesheets/common/components/bookmark-modal.scss
index 2c15181cf6..45ad12fc18 100644
--- a/app/assets/stylesheets/common/components/bookmark-modal.scss
+++ b/app/assets/stylesheets/common/components/bookmark-modal.scss
@@ -19,6 +19,16 @@
     }
   }
 
+  .existing-reminder-at-alert {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    .d-icon {
+      margin-right: 1em;
+    }
+  }
+
   .custom-date-time-wrap {
     padding: 1em 1em 0.5em;
     border: 1px solid $primary-low;
diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
index c47dfdc025..4fd077d45e 100644
--- a/app/controllers/bookmarks_controller.rb
+++ b/app/controllers/bookmarks_controller.rb
@@ -26,4 +26,22 @@ class BookmarksController < ApplicationController
     BookmarkManager.new(current_user).destroy(params[:id])
     render json: success_json
   end
+
+  def update
+    params.require(:id)
+
+    bookmark_manager = BookmarkManager.new(current_user)
+    bookmark_manager.update(
+      bookmark_id: params[:id],
+      name: params[:name],
+      reminder_type: params[:reminder_type],
+      reminder_at: params[:reminder_at]
+    )
+
+    if bookmark_manager.errors.empty?
+      return render json: success_json
+    end
+
+    render json: failed_json.merge(errors: bookmark_manager.errors.full_messages), status: 400
+  end
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 64492a2bc7..9bd07e6819 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -331,6 +331,7 @@ en:
         today_with_time: "today at %{time}"
         tomorrow_with_time: "tomorrow at %{time}"
         at_time: "at %{date_time}"
+        existing_reminder: "You have a reminder set for this bookmark which will be sent"
 
     drafts:
       resume: "Resume"
@@ -2716,6 +2717,7 @@ en:
 
       bookmarks:
         create: "Create bookmark"
+        edit: "Edit bookmark"
         created: "Created"
         name: "Name"
         name_placeholder: "What is this bookmark for?"
@@ -2724,6 +2726,9 @@ en:
           delete_bookmark:
             name: "Delete bookmark"
             description: "Removes the bookmark from your profile and stops all reminders for the bookmark"
+          edit_bookmark:
+            name: "Edit bookmark"
+            description: "Edit the bookmark name or change the reminder date and time"
 
     category:
       can: "can&hellip; "
diff --git a/config/routes.rb b/config/routes.rb
index 1a92a5440d..2fc21b435e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -606,7 +606,7 @@ Discourse::Application.routes.draw do
     end
   end
 
-  resources :bookmarks, only: %i[create destroy]
+  resources :bookmarks, only: %i[create destroy update]
 
   resources :notifications, except: :show do
     collection do
diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index 33c2758c12..9da2dc257b 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -66,6 +66,24 @@ class BookmarkManager
     BookmarkReminderNotificationHandler.send_notification(bookmark)
   end
 
+  def update(bookmark_id:, name:, reminder_type:, reminder_at:)
+    bookmark = Bookmark.find_by(id: bookmark_id)
+
+    raise Discourse::NotFound if bookmark.blank?
+    raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_edit?(bookmark)
+
+    if bookmark.errors.any?
+      return add_errors_from(bookmark)
+    end
+
+    bookmark.update(
+      name: name,
+      reminder_at: reminder_at,
+      reminder_type: reminder_type,
+      reminder_set_at: Time.zone.now
+    )
+  end
+
   private
 
   def clear_at_desktop_cache_if_required
diff --git a/lib/guardian/bookmark_guardian.rb b/lib/guardian/bookmark_guardian.rb
index 1754c280e2..7f0b63c620 100644
--- a/lib/guardian/bookmark_guardian.rb
+++ b/lib/guardian/bookmark_guardian.rb
@@ -5,6 +5,10 @@ module BookmarkGuardian
     @user == bookmark.user
   end
 
+  def can_edit_bookmark?(bookmark)
+    @user == bookmark.user
+  end
+
   def can_create_bookmark?(bookmark)
     can_see_topic?(bookmark.topic)
   end
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index 2130e50610..de25969f2c 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -160,6 +160,43 @@ RSpec.describe BookmarkManager do
     end
   end
 
+  describe ".update" do
+    let!(:bookmark) { Fabricate(:bookmark_next_business_day_reminder, user: user, post: post, name: "Old name") }
+    let(:new_name) { "Some new name" }
+    let(:new_reminder_at) { 10.days.from_now }
+    let(:new_reminder_type) { Bookmark.reminder_types[:custom] }
+
+    def update_bookmark
+      subject.update(
+        bookmark_id: bookmark.id, name: new_name, reminder_type: new_reminder_type, reminder_at: new_reminder_at
+      )
+    end
+
+    it "saves the time and new reminder type sucessfully" do
+      update_bookmark
+       bookmark.reload
+       expect(bookmark.name).to eq(new_name)
+       expect(bookmark.reminder_at).to eq_time(new_reminder_at)
+       expect(bookmark.reminder_type).to eq(new_reminder_type)
+    end
+
+    context "if the bookmark is belonging to some other user" do
+      let!(:bookmark) { Fabricate(:bookmark, user: Fabricate(:admin), post: post) }
+      it "raises an invalid access error" do
+        expect { update_bookmark }.to raise_error(Discourse::InvalidAccess)
+      end
+    end
+
+    context "if the bookmark no longer exists" do
+      before do
+        bookmark.destroy!
+      end
+      it "raises an invalid access error" do
+        expect { update_bookmark }.to raise_error(Discourse::NotFound)
+      end
+    end
+  end
+
   describe ".destroy_for_topic" do
     let!(:topic) { Fabricate(:topic) }
     let!(:bookmark1) { Fabricate(:bookmark, topic: topic, post: Fabricate(:post, topic: topic), user: user) }
diff --git a/test/javascripts/controllers/bookmark-test.js b/test/javascripts/controllers/bookmark-test.js
index 756e91d672..7a68739289 100644
--- a/test/javascripts/controllers/bookmark-test.js
+++ b/test/javascripts/controllers/bookmark-test.js
@@ -1,6 +1,7 @@
 import { logIn } from "helpers/qunit-helpers";
 import User from "discourse/models/user";
 import KeyboardShortcutInitializer from "discourse/initializers/keyboard-shortcuts";
+import { REMINDER_TYPES } from "discourse/lib/bookmark";
 let BookmarkController;
 
 moduleFor("controller:bookmark", {
@@ -263,3 +264,20 @@ QUnit.test("user timezone updates when the modal is shown", function(assert) {
   );
   stub.restore();
 });
+
+QUnit.test(
+  "opening the modal with an existing bookmark with reminder at prefills the custom reminder type",
+  function(assert) {
+    let name = "test";
+    let reminderAt = "2020-05-15T09:45:00";
+    BookmarkController.model = { id: 1, name: name, reminderAt: reminderAt };
+    BookmarkController.onShow();
+    assert.equal(
+      BookmarkController.selectedReminderType,
+      REMINDER_TYPES.CUSTOM
+    );
+    assert.equal(BookmarkController.customReminderDate, "2020-05-15");
+    assert.equal(BookmarkController.customReminderTime, "09:45");
+    assert.equal(BookmarkController.model.name, name);
+  }
+);

From 17c0c9652dfae50f1d61a1dd31341a975826de94 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 17 Apr 2020 10:05:51 +0200
Subject: [PATCH 0645/1830] FIX: stops bookmark keybaod event to be propagated
 into modal (#9457)

---
 app/assets/javascripts/discourse/controllers/bookmark.js   | 5 -----
 app/assets/javascripts/discourse/lib/keyboard-shortcuts.js | 5 ++++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index f9bf306824..ec384d54ae 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -1,6 +1,5 @@
 import { and } from "@ember/object/computed";
 import { isPresent } from "@ember/utils";
-import { next } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { Promise } from "rsvp";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -77,10 +76,6 @@ export default Controller.extend(ModalFunctionality, {
 
     if (this.editingExistingBookmark()) {
       this.initializeExistingBookmarkData();
-    } else {
-      // make sure the input is cleared, otherwise the keyboard shortcut to toggle
-      // bookmark for post ends up in the input
-      next(() => this.set("model.name", null));
     }
   },
 
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
index 2ce05f463b..498c920e9d 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
@@ -174,7 +174,10 @@ export default {
     this.pause(Object.keys(combinations));
   },
 
-  toggleBookmark() {
+  toggleBookmark(event) {
+    event.preventDefault();
+    event.stopPropagation();
+
     this.sendToSelectedPost("toggleBookmark");
     this.sendToTopicListItemView("toggleBookmark");
   },

From 576872a2d93ce8546c5fded6d9edf5344c9bb4fe Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 17 Apr 2020 09:42:57 +0100
Subject: [PATCH 0646/1830] PERF: Enable new user card route by default (#9442)

https://meta.discourse.org/t/changes-to-the-user-card-data-source/139951
---
 .../components/user-card-contents.js          |   2 +-
 config/site_settings.yml                      |   5 -
 test/javascripts/fixtures/user_fixtures.js    | 197 ++++++++++++++++++
 3 files changed, 198 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js b/app/assets/javascripts/discourse/components/user-card-contents.js
index 5ad24526dc..655c97fc28 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js
@@ -141,7 +141,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
     this.setProperties({ visible: true, loading: true });
 
     const args = {
-      forCard: this.siteSettings.enable_new_user_card_route,
+      forCard: true,
       include_post_count_for: this.get("topic.id")
     };
 
diff --git a/config/site_settings.yml b/config/site_settings.yml
index e9175a34d6..4684b7d4ca 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2012,11 +2012,6 @@ uncategorized:
     default: ""
     hidden: true
 
-  enable_new_user_card_route:
-    default: false
-    client: true
-    hidden: true
-
 user_preferences:
   default_email_digest_frequency:
     enum: "DigestEmailSiteSetting"
diff --git a/test/javascripts/fixtures/user_fixtures.js b/test/javascripts/fixtures/user_fixtures.js
index c801b5d355..f6a2f87050 100644
--- a/test/javascripts/fixtures/user_fixtures.js
+++ b/test/javascripts/fixtures/user_fixtures.js
@@ -278,6 +278,125 @@ export default {
       ]
     }
   },
+  "/u/eviltrout/card.json": {
+    user_badges: [
+      {
+        id: 5870,
+        granted_at: "2014-05-16T02:39:38.388Z",
+        badge_id: 4,
+        user_id: 19,
+        granted_by_id: -1
+      },
+      {
+        id: 40673,
+        granted_at: "2014-03-31T14:23:18.060Z",
+        post_id: 7241,
+        post_number: 19,
+        badge_id: 23,
+        user_id: 19,
+        granted_by_id: -1,
+        topic_id: 3153
+      },
+      {
+        id: 5868,
+        granted_at: "2014-05-16T02:39:38.380Z",
+        badge_id: 3,
+        user_id: 19,
+        granted_by_id: -1
+      }
+    ],
+    badges: [
+      {
+        id: 4,
+        name: "Leader",
+        description: null,
+        grant_count: 7,
+        allow_title: true,
+        multiple_grant: false,
+        icon: "fa-user",
+        image: null,
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 4,
+        system: true,
+        badge_type_id: 1
+      },
+      {
+        id: 23,
+        name: "Great Share",
+        description: null,
+        grant_count: 14,
+        allow_title: false,
+        multiple_grant: true,
+        icon: "fa-certificate",
+        image: null,
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 2,
+        system: true,
+        badge_type_id: 1
+      },
+      {
+        id: 3,
+        name: "Regular",
+        description: null,
+        grant_count: 30,
+        allow_title: true,
+        multiple_grant: false,
+        icon: "fa-user",
+        image: null,
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 4,
+        system: true,
+        badge_type_id: 2
+      }
+    ],
+    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: 19,
+        username: "eviltrout",
+        uploaded_avatar_id: null,
+        avatar_template:
+          "/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"
+      },
+      {
+        id: -1,
+        username: "system",
+        uploaded_avatar_id: null,
+        avatar_template:
+          "/letter_avatar/system/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"
+      }
+    ],
+    user: {
+      id: 19,
+      username: "eviltrout",
+      name: "Robin Ward",
+      avatar_template:
+        "/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png",
+      last_posted_at: "2015-05-07T15:23:35.074Z",
+      last_seen_at: "2015-05-13T14:34:23.188Z",
+      created_at: "2013-02-03T15:19:22.704Z",
+      can_send_private_messages: true,
+      can_send_private_message_to_user: false,
+      trust_level: 4,
+      moderator: true,
+      admin: true,
+      title: "co-founder",
+      badge_count: 23,
+      custom_fields: {},
+      bio_excerpt:
+        '<p>Co-founder of Discourse. Previously, I created <a href="http://forumwarz.com">Forumwarz</a>. <a href="https://twitter.com/eviltrout">Follow me on Twitter</a>. I am <a class="mention" href="/u/eviltrout">@eviltrout</a>.</p>',
+      website: "http://eviltrout.com",
+      location: "Toronto",
+      featured_user_badge_ids: [5870, 40673, 5868]
+    }
+  },
   "/user_actions.json": {
     user_actions: [
       {
@@ -2531,6 +2650,84 @@ export default {
       }
     }
   },
+  "/u/charlie/card.json": {
+    user_badges: [
+      {
+        id: 17,
+        granted_at: "2019-03-06T19:08:28.230Z",
+        count: 1,
+        badge_id: 3,
+        user_id: 5,
+        granted_by_id: -1
+      }
+    ],
+    badges: [
+      {
+        id: 3,
+        name: "Regular",
+        description:
+          '<a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Granted</a> recategorize, rename, followed links, wiki, more likes',
+        grant_count: 3,
+        allow_title: true,
+        multiple_grant: false,
+        icon: "fa-user",
+        image: null,
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 4,
+        system: true,
+        slug: "regular",
+        manually_grantable: false,
+        badge_type_id: 2
+      }
+    ],
+    badge_types: [{ id: 2, name: "Silver", sort_order: 8 }],
+    users: [
+      {
+        id: 5,
+        username: "charlie",
+        name: null,
+        avatar_template: "/letter_avatar_proxy/v3/letter/c/d6d6ee/{size}.png",
+        moderator: false,
+        admin: false
+      },
+      {
+        id: -1,
+        username: "system",
+        name: "system",
+        avatar_template: "/user_avatar/localhost/system/{size}/2_2.png",
+        moderator: true,
+        admin: true
+      }
+    ],
+    user: {
+      id: 5,
+      username: "charlie",
+      name: null,
+      avatar_template: "/letter_avatar_proxy/v3/letter/c/d6d6ee/{size}.png",
+      last_posted_at: null,
+      last_seen_at: null,
+      created_at: "2019-03-06T19:06:20.340Z",
+      ignored: false,
+      can_ignore_user: false,
+      can_send_private_messages: true,
+      can_send_private_message_to_user: true,
+      trust_level: 3,
+      moderator: false,
+      admin: false,
+      title: null,
+      badge_count: 3,
+      custom_fields: {},
+      time_read: 0,
+      recent_time_read: 0,
+      primary_group_name: null,
+      primary_group_flair_url: null,
+      primary_group_flair_bg_color: null,
+      primary_group_flair_color: null,
+      staged: false,
+      featured_user_badge_ids: [17]
+    }
+  },
   "/u/charlie/summary.json": {
     topics: [],
     badges: [

From 35f51100e1f161dfbbb1fb727bbfca85a7e76919 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Fri, 17 Apr 2020 10:27:11 -0300
Subject: [PATCH 0647/1830] FEATURE: Users can be ignored for six months.
 (#9446)

---
 .../select-kit/components/future-date-input-selector.js         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector.js b/app/assets/javascripts/select-kit/components/future-date-input-selector.js
index 34efa2551c..ae34273692 100644
--- a/app/assets/javascripts/select-kit/components/future-date-input-selector.js
+++ b/app/assets/javascripts/select-kit/components/future-date-input-selector.js
@@ -132,7 +132,7 @@ export const TIMEFRAMES = [
   buildTimeframe({
     id: "six_months",
     format: "MMM D",
-    enabled: opts => opts.includeFarFuture,
+    enabled: opts => opts.includeMidFuture,
     when: (time, timeOfDay) =>
       time
         .add(6, "month")

From 6f391b93871144a93287259109ca9031106a6860 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 17 Apr 2020 11:16:14 -0400
Subject: [PATCH 0648/1830] Upgrade rubocop

---
 .rubocop.yml | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index f74aa303ee..f389e688ca 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -86,7 +86,7 @@ Layout/SpaceInsideParens:
   Enabled: true
 
 # Detect hard tabs, no hard tabs.
-Layout/Tab:
+Layout/IndentationStyle:
   Enabled: true
 
 # Blank lines should not have any spaces.
diff --git a/Gemfile.lock b/Gemfile.lock
index f7e168e827..34f3ff9543 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -340,7 +340,7 @@ GEM
       rspec-support (~> 3.8)
     rspec-support (3.9.2)
     rtlit (0.0.5)
-    rubocop (0.81.0)
+    rubocop (0.82.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)

From 9c40c42bb5723aada2a2d85434958213154a1f5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Apr 2020 11:31:11 -0400
Subject: [PATCH 0649/1830] Build(deps): Bump https-proxy-agent from 2.2.1 to
 2.2.4 (#9453)

Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4.
- [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases)
- [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/2.2.1...2.2.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e49da23ce4..e9a942667b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -220,10 +220,10 @@ acorn@^5.5.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
-agent-base@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
+agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
   dependencies:
     es6-promisify "^5.0.0"
 
@@ -929,9 +929,9 @@ entities@~2.0.0:
   integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
 
 es6-promise@^4.0.3:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
-  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
 es6-promisify@^5.0.0:
   version "5.0.0"
@@ -1501,11 +1501,11 @@ homedir-polyfill@^1.0.1:
   resolved "https://github.com/tautologistics/node-htmlparser#9613b99096ac1757b81695b1a4bbee7f10afcd7f"
 
 https-proxy-agent@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
-  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
+  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
   dependencies:
-    agent-base "^4.1.0"
+    agent-base "^4.3.0"
     debug "^3.1.0"
 
 iconv-lite@^0.4.17:
@@ -2112,9 +2112,9 @@ ms@2.0.0:
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
 mute-stream@0.0.7:
   version "0.0.7"

From 4eebbd221239eaa3fc7e6f1bd6a9dcf0239b8444 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 17 Apr 2020 16:41:47 +0100
Subject: [PATCH 0650/1830] Revert "FIX: Detect more unsupported browsers"

This change broke IE11 support, even with the polyfills enabled. We may need to add a WeakSet polyfill, but reverting this change for now.

This reverts commit 1cd8c6ce4caf15c4d0bd27077dcfc2592f7d1974.
---
 app/assets/javascripts/browser-detect.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/browser-detect.js b/app/assets/javascripts/browser-detect.js
index 57fb1e7f6c..bdbbc27b3e 100644
--- a/app/assets/javascripts/browser-detect.js
+++ b/app/assets/javascripts/browser-detect.js
@@ -1,3 +1,3 @@
-if (!window.WeakMap || !window.WeakSet || !window.Promise) {
+if (!window.WeakMap || !window.Promise) {
   window.unsupportedBrowser = true;
 }

From 77dd31a642ecbf36a63ea7a823b636255811f538 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 17 Apr 2020 12:10:39 -0400
Subject: [PATCH 0651/1830] Build(deps): Bump sidekiq from 6.0.6 to 6.0.7
 (#9460)

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.0.6 to 6.0.7.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.0.6...v6.0.7)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 34f3ff9543..3eed581808 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -377,7 +377,7 @@ GEM
       activesupport (>= 3.1)
     shoulda-matchers (4.3.0)
       activesupport (>= 4.2.0)
-    sidekiq (6.0.6)
+    sidekiq (6.0.7)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       rack-protection (>= 2.0.0)

From 0e4497b6be081371e15e28d54c528391858b53f9 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 17 Apr 2020 17:23:40 +0100
Subject: [PATCH 0652/1830] DEV: Update tl3 spec to remove hard-coded primary
 keys

In some test runs, the hard-coded ids could correspond to real topics created earlier in the tests, and cause random test failures
---
 spec/models/trust_level3_requirements_spec.rb | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/spec/models/trust_level3_requirements_spec.rb b/spec/models/trust_level3_requirements_spec.rb
index a28f54debb..3189c5e2e6 100644
--- a/spec/models/trust_level3_requirements_spec.rb
+++ b/spec/models/trust_level3_requirements_spec.rb
@@ -8,13 +8,17 @@ describe TrustLevel3Requirements do
   subject(:tl3_requirements) { described_class.new(user) }
   fab!(:moderator) { Fabricate(:moderator) }
 
+  fab!(:topic1) { Fabricate(:topic) }
+  fab!(:topic2) { Fabricate(:topic) }
+  fab!(:topic3) { Fabricate(:topic) }
+  fab!(:topic4) { Fabricate(:topic) }
+
   before do
     described_class.clear_cache
   end
 
-  def make_view(id, at, user_id)
-    Fabricate(:topic, id: id) unless Topic.where(id: id).exists?
-    TopicViewItem.add(id, '11.22.33.44', user_id, at, _skip_redis = true)
+  def make_view(topic, at, user_id)
+    TopicViewItem.add(topic.id, '11.22.33.44', user_id, at, _skip_redis = true)
   end
 
   def like_at(created_by, post, created_at)
@@ -270,21 +274,21 @@ describe TrustLevel3Requirements do
   describe "topics_viewed" do
     it "counts topics views within last 100 days (default time period), not counting a topic more than once" do
       user.save
-      make_view(9, 1.day.ago,    user.id)
-      make_view(9, 3.days.ago,   user.id) # same topic, different day
-      make_view(3, 4.days.ago,   user.id)
-      make_view(2, 101.days.ago, user.id) # too long ago
+      make_view(topic1, 1.day.ago,    user.id)
+      make_view(topic1, 3.days.ago,   user.id) # same topic, different day
+      make_view(topic2, 4.days.ago,   user.id)
+      make_view(topic3, 101.days.ago, user.id) # too long ago
       expect(tl3_requirements.topics_viewed).to eq(2)
     end
 
     it "counts topics views within last 200 days, respecting tl3_time_period setting" do
       SiteSetting.tl3_time_period = 200
       user.save
-      make_view(9, 1.day.ago,    user.id)
-      make_view(9, 3.days.ago,   user.id) # same topic, different day
-      make_view(3, 4.days.ago,   user.id)
-      make_view(2, 101.days.ago, user.id)
-      make_view(4, 201.days.ago, user.id) # too long ago
+      make_view(topic1, 1.day.ago,    user.id)
+      make_view(topic1, 3.days.ago,   user.id) # same topic, different day
+      make_view(topic2, 4.days.ago,   user.id)
+      make_view(topic3, 101.days.ago, user.id)
+      make_view(topic4, 201.days.ago, user.id) # too long ago
       expect(tl3_requirements.topics_viewed).to eq(3)
     end
 
@@ -296,8 +300,8 @@ describe TrustLevel3Requirements do
         target_usernames: [user.username, moderator.username]
       ).topic
 
-      make_view(9, 1.day.ago, user.id)
-      make_view(private_topic.id, 1.day.ago, user.id)
+      make_view(topic1, 1.day.ago, user.id)
+      make_view(private_topic, 1.day.ago, user.id)
       expect(tl3_requirements.topics_viewed).to eq(1)
     end
   end
@@ -316,9 +320,9 @@ describe TrustLevel3Requirements do
   describe "topics_viewed_all_time" do
     it "counts topics viewed at any time" do
       user.save
-      make_view(10, 1.day.ago,    user.id)
-      make_view(9,  100.days.ago, user.id)
-      make_view(8,  101.days.ago, user.id)
+      make_view(topic1, 1.day.ago,    user.id)
+      make_view(topic2,  100.days.ago, user.id)
+      make_view(topic3,  101.days.ago, user.id)
       expect(tl3_requirements.topics_viewed_all_time).to eq(3)
     end
 
@@ -330,11 +334,11 @@ describe TrustLevel3Requirements do
         target_usernames: [user.username, moderator.username]
       ).topic
 
-      make_view(10, 1.day.ago,    user.id)
-      make_view(9,  100.days.ago, user.id)
-      make_view(8,  101.days.ago, user.id)
-      make_view(private_topic.id, 1.day.ago, user.id)
-      make_view(private_topic.id, 100.days.ago, user.id)
+      make_view(topic1, 1.day.ago,    user.id)
+      make_view(topic2,  100.days.ago, user.id)
+      make_view(topic3,  101.days.ago, user.id)
+      make_view(private_topic, 1.day.ago, user.id)
+      make_view(private_topic, 100.days.ago, user.id)
       expect(tl3_requirements.topics_viewed_all_time).to eq(3)
     end
   end

From dce46086f49c1a16d2bbf9e5b090b2d7477ee8ed Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Fri, 17 Apr 2020 14:23:33 -0300
Subject: [PATCH 0653/1830] FIX: Do not raise an error if the post action type
 is nil (#9458)

---
 .../post_action_users_controller.rb           |  2 +-
 .../post_action_users_controller_spec.rb      | 23 +++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/controllers/post_action_users_controller.rb b/app/controllers/post_action_users_controller.rb
index 73efa06a3e..fe42fd3b9c 100644
--- a/app/controllers/post_action_users_controller.rb
+++ b/app/controllers/post_action_users_controller.rb
@@ -27,7 +27,7 @@ class PostActionUsersController < ApplicationController
     end
 
     action_type = PostActionType.types.key(post_action_type_id)
-    total_count = post["#{action_type}_count"]
+    total_count = post["#{action_type}_count"].to_i
 
     data = { post_action_users: serialize_data(post_actions.to_a, PostActionUserSerializer) }
 
diff --git a/spec/requests/post_action_users_controller_spec.rb b/spec/requests/post_action_users_controller_spec.rb
index 4b6f6375d4..bc053524fe 100644
--- a/spec/requests/post_action_users_controller_spec.rb
+++ b/spec/requests/post_action_users_controller_spec.rb
@@ -15,8 +15,8 @@ describe PostActionUsersController do
 
       get "/post_action_users.json", params: { id: post.id, post_action_type_id: notify_mod }
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
-      users = json["post_action_users"]
+
+      users = response.parsed_body["post_action_users"]
 
       expect(users.length).to eq(1)
       expect(users[0]["id"]).to eq(post.user.id)
@@ -69,14 +69,27 @@ describe PostActionUsersController do
 
     get "/post_action_users.json",
       params: { id: post.id, post_action_type_id: PostActionType.types[:like], page: 1, limit: 2 }
-    json = JSON.parse(response.body)
 
-    users = json["post_action_users"]
-    total = json["total_rows_post_action_users"]
+    users = response.parsed_body["post_action_users"]
+    total = response.parsed_body["total_rows_post_action_users"]
 
     expect(users.length).to eq(2)
     expect(users.map { |u| u["id"] }).to eq(user_ids[2..3])
 
     expect(total).to eq(5)
   end
+
+  it 'returns no users when the action type id is invalid' do
+    get "/post_action_users.json", params: {
+      id: post.id, post_action_type_id: "invalid_action_type"
+    }
+
+    expect(response.status).to eq(200)
+
+    users = response.parsed_body["post_action_users"]
+    total = response.parsed_body["total_rows_post_action_users"]
+
+    expect(users.length).to eq(0)
+    expect(total).to be_nil
+  end
 end

From 80563705daada279feadbb464f4078fb106d7e56 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 17 Apr 2020 14:31:27 -0400
Subject: [PATCH 0654/1830] Build(deps-dev): Bump byebug from 11.1.1 to 11.1.2
 (#9462)

Bumps [byebug](https://github.com/deivid-rodriguez/byebug) from 11.1.1 to 11.1.2.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases)
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md)
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.1.1...v11.1.2)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 3eed581808..0e938abf43 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -78,7 +78,7 @@ GEM
     bullet (6.1.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    byebug (11.1.1)
+    byebug (11.1.2)
     cbor (0.5.9.6)
     certified (1.0.0)
     chunky_png (1.3.11)

From 0e74dd7d7c576248e698f6d53bf769f6b02d2450 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 17 Apr 2020 13:39:04 -0500
Subject: [PATCH 0655/1830] FIX: Set user timezone on password reset login
 (#9461)

---
 .../discourse/controllers/password-reset.js          |  3 ++-
 app/controllers/users_controller.rb                  |  1 +
 spec/requests/users_controller_spec.rb               | 12 ++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/controllers/password-reset.js b/app/assets/javascripts/discourse/controllers/password-reset.js
index dcb1931ac0..efdf9db0ae 100644
--- a/app/assets/javascripts/discourse/controllers/password-reset.js
+++ b/app/assets/javascripts/discourse/controllers/password-reset.js
@@ -54,7 +54,8 @@ export default Controller.extend(PasswordValidation, {
           password: this.accountPassword,
           second_factor_token:
             this.securityKeyCredential || this.secondFactorToken,
-          second_factor_method: this.secondFactorMethod
+          second_factor_method: this.secondFactorMethod,
+          timezone: moment.tz.guess()
         }
       })
         .then(result => {
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 29d7bc9963..80583ad79b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -641,6 +641,7 @@ class UsersController < ApplicationController
       # if we have run into no errors then the user is a-ok to
       # change the password
       if @user.errors.empty?
+        @user.update_timezone_if_missing(params[:timezone]) if params[:timezone]
         @user.password = params[:password]
         @user.password_required!
         @user.user_auth_tokens.destroy_all
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 507c28f910..9bb8992c70 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -279,6 +279,18 @@ describe UsersController do
         expect(response).to redirect_to(wizard_path)
       end
 
+      it "sets the users timezone if the param is present" do
+        user = Fabricate(:admin)
+        UserAuthToken.generate!(user_id: user.id)
+
+        token = user.email_tokens.create(email: user.email).token
+        get "/u/password-reset/#{token}"
+
+        expect(user.user_option.timezone).to eq(nil)
+        put "/u/password-reset/#{token}", params: { password: 'hg9ow8yhg98oadminlonger', timezone: "America/Chicago" }
+        expect(user.user_option.reload.timezone).to eq("America/Chicago")
+      end
+
       it "logs the password change" do
         user = Fabricate(:admin)
         UserAuthToken.generate!(user_id: user.id)

From 3ac6e16250e17fcb242e0dada6519df485bcbf20 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 17 Apr 2020 17:32:30 -0400
Subject: [PATCH 0656/1830] Build(deps): Bump aws-sigv4 from 1.1.1 to 1.1.2
 (#9465)

Bumps [aws-sigv4](https://github.com/aws/aws-sdk-ruby) from 1.1.1 to 1.1.2.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sigv4/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.1.1...1.1.2)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 0e938abf43..ef1c3e67ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -61,7 +61,7 @@ GEM
     aws-sdk-sns (1.22.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.1)
+    aws-sigv4 (1.1.2)
       aws-eventstream (~> 1.0, >= 1.0.2)
     barber (0.12.2)
       ember-source (>= 1.0, < 3.1)

From e41f1e6ec221c10024bde6c33336e1dc21684d9d Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Fri, 17 Apr 2020 14:59:54 -0700
Subject: [PATCH 0657/1830] FEATURE: Rake task to export groups (#9450)

---
 lib/import_export.rb                      |  5 ++++
 lib/import_export/base_exporter.rb        | 36 ++++++++++++++++-------
 lib/import_export/group_exporter.rb       | 28 ++++++++++++++++++
 lib/tasks/export.rake                     |  8 +++++
 spec/fixtures/json/import-export.json     |  4 +--
 spec/import_export/group_exporter_spec.rb | 32 ++++++++++++++++++++
 spec/import_export/importer_spec.rb       | 14 +++++++++
 7 files changed, 115 insertions(+), 12 deletions(-)
 create mode 100644 lib/import_export/group_exporter.rb
 create mode 100644 spec/import_export/group_exporter_spec.rb

diff --git a/lib/import_export.rb b/lib/import_export.rb
index f86600253d..6a32d686f1 100644
--- a/lib/import_export.rb
+++ b/lib/import_export.rb
@@ -5,6 +5,7 @@ require "import_export/base_exporter"
 require "import_export/category_structure_exporter"
 require "import_export/category_exporter"
 require "import_export/topic_exporter"
+require "import_export/group_exporter"
 require "json"
 
 module ImportExport
@@ -26,4 +27,8 @@ module ImportExport
     ImportExport::TopicExporter.new(topic_ids).perform.save_to_file(filename)
   end
 
+  def self.export_groups(include_users, filename = nil)
+    ImportExport::GroupExporter.new(include_users).perform.save_to_file(filename)
+  end
+
 end
diff --git a/lib/import_export/base_exporter.rb b/lib/import_export/base_exporter.rb
index ec0bd2b428..f53b38025f 100644
--- a/lib/import_export/base_exporter.rb
+++ b/lib/import_export/base_exporter.rb
@@ -8,9 +8,11 @@ module ImportExport
                       :auto_close_hours, :parent_category_id, :auto_close_based_on_last_post,
                       :topic_template, :all_topics_wiki, :permissions_params]
 
-    GROUP_ATTRS = [ :id, :name, :created_at, :mentionable_level, :messageable_level, :visibility_level,
-                    :automatic_membership_email_domains, :automatic_membership_retroactive,
-                    :primary_group, :title, :grant_trust_level, :incoming_email]
+    GROUP_ATTRS = [:id, :name, :created_at, :automatic_membership_email_domains, :primary_group,
+                   :title, :grant_trust_level, :incoming_email, :bio_raw, :allow_membership_requests,
+                   :full_name, :default_notification_level, :visibility_level, :public_exit,
+                   :public_admission, :membership_request_template, :messageable_level, :mentionable_level,
+                   :members_visibility_level, :publish_read_state]
 
     USER_ATTRS = [:id, :email, :username, :name, :created_at, :trust_level, :active, :last_emailed_at]
 
@@ -39,6 +41,26 @@ module ImportExport
       self
     end
 
+    def export_groups(group_names)
+      data = []
+      groups = Group.all
+      groups = groups.where(name: group_names) if group_names.present?
+
+      groups.find_each do |group|
+        attrs = GROUP_ATTRS.inject({}) { |h, a| h[a] = group.public_send(a); h }
+        attrs[:user_ids] = group.users.pluck(:id)
+        data << attrs
+      end
+
+      data
+    end
+
+    def export_groups!
+      @export_data[:groups] = export_groups([])
+
+      self
+    end
+
     def export_category_groups
       groups = []
       group_names = []
@@ -53,13 +75,7 @@ module ImportExport
       group_names.uniq!
       return [] if group_names.empty?
 
-      Group.where(name: group_names).find_each do |group|
-        attrs = GROUP_ATTRS.inject({}) { |h, a| h[a] = group.public_send(a); h }
-        attrs[:user_ids] = group.users.pluck(:id)
-        groups << attrs
-      end
-
-      groups
+      export_groups(group_names)
     end
 
     def export_category_groups!
diff --git a/lib/import_export/group_exporter.rb b/lib/import_export/group_exporter.rb
new file mode 100644
index 0000000000..893320cfbb
--- /dev/null
+++ b/lib/import_export/group_exporter.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module ImportExport
+  class GroupExporter < BaseExporter
+
+    def initialize(include_group_users = false)
+      @include_group_users = include_group_users
+
+      @export_data = {
+        groups: []
+      }
+      @export_data[:users] = [] if @include_group_users
+    end
+
+    def perform
+      puts "Exporting all user groups...", ""
+      export_groups!
+      export_group_users! if @include_group_users
+
+      self
+    end
+
+    def default_filename_prefix
+      "groups-export"
+    end
+
+  end
+end
diff --git a/lib/tasks/export.rake b/lib/tasks/export.rake
index ab1b9138eb..1e58a3f9a8 100644
--- a/lib/tasks/export.rake
+++ b/lib/tasks/export.rake
@@ -16,3 +16,11 @@ task 'export:category_structure', [:include_group_users, :file_name] => [:enviro
   ImportExport.export_category_structure(args[:include_group_users], args[:file_name])
   puts "", "Done", ""
 end
+
+desc 'Export all user groups'
+task 'export:groups', [:include_group_users, :file_name] => [:environment] do |_, args|
+  require "import_export"
+
+  ImportExport.export_groups(args[:include_group_users], args[:file_name])
+  puts "", "Done", ""
+end
diff --git a/spec/fixtures/json/import-export.json b/spec/fixtures/json/import-export.json
index aaf292a1c2..f991e7f2c4 100644
--- a/spec/fixtures/json/import-export.json
+++ b/spec/fixtures/json/import-export.json
@@ -1,7 +1,7 @@
 {
   "groups":[
-    {"id":41,"name":"custom_group","created_at":"2017-10-26T15:33:46.328Z","mentionable_level":0,"messageable_level":0,"visibility_level":0,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"user_ids":[1]},
-    {"id":42,"name":"custom_group_import","created_at":"2017-10-26T15:33:46.328Z","mentionable_level":0,"messageable_level":0,"visibility_level":0,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"user_ids":[2]}
+    {"id":41,"name":"custom_group","created_at":"2017-10-26T15:33:46.328Z","automatic_membership_email_domains":"","primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"bio_raw":"This is a custom group","allow_membership_requests":false,"full_name":"Custom Group","default_notification_level":3,"visibility_level":0,"public_exit":false,"public_admission":false,"membership_request_template":"","messageable_level":0,"mentionable_level":0,"members_visibility_level":0,"publish_read_state":false,"user_ids":[1]},
+    {"id":42,"name":"custom_group_import","created_at":"2017-10-26T15:33:46.328Z","automatic_membership_email_domains":"","primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"bio_raw":"This is a custom group import","allow_membership_requests":false,"full_name":"Custom Group Import","default_notification_level":3,"visibility_level":0,"public_exit":false,"public_admission":false,"membership_request_template":"","messageable_level":0,"mentionable_level":0,"members_visibility_level":0,"publish_read_state":false,"user_ids":[2]}
   ],
   "categories":[
     {"id":8,"name":"Custom Category","color":"0088CC","created_at":"2017-10-26T15:32:44.083Z","user_id":1,"slug":"custom-category","description":null,"text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":3,"auto_close_based_on_last_post":false,"topic_template":"","all_topics_wiki":false,"permissions_params":{"custom_group":1,"everyone":2}},
diff --git a/spec/import_export/group_exporter_spec.rb b/spec/import_export/group_exporter_spec.rb
new file mode 100644
index 0000000000..1e2deb929c
--- /dev/null
+++ b/spec/import_export/group_exporter_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+require "import_export/group_exporter"
+
+describe ImportExport::GroupExporter do
+
+  before do
+    STDOUT.stubs(:write)
+  end
+
+  it 'exports all the groups' do
+    group = Fabricate(:group)
+    user = Fabricate(:user)
+    group_user = Fabricate(:group_user, group: group, user: user)
+    data = ImportExport::GroupExporter.new.perform.export_data
+
+    expect(data[:groups].map { |g| g[:id] }).to include(group.id)
+    expect(data[:users].blank?).to eq(true)
+  end
+
+  it 'exports all the groups with users' do
+    group = Fabricate(:group)
+    user = Fabricate(:user)
+    group_user = Fabricate(:group_user, group: group, user: user)
+    data = ImportExport::GroupExporter.new(true).perform.export_data
+
+    expect(data[:groups].map { |g| g[:id] }).to include(group.id)
+    expect(data[:users].map { |u| u[:id] }).to include(user.id)
+  end
+
+end
diff --git a/spec/import_export/importer_spec.rb b/spec/import_export/importer_spec.rb
index ea659e1191..6065448996 100644
--- a/spec/import_export/importer_spec.rb
+++ b/spec/import_export/importer_spec.rb
@@ -84,6 +84,20 @@ describe ImportExport::Importer do
         .and change { User.count }.by(2)
     end
 
+    it 'groups' do
+      data = import_data.dup
+      data[:categories] = nil
+      data[:topics] = nil
+      data[:users] = nil
+
+      expect {
+        import(data)
+      }.to change { Category.count }.by(0)
+        .and change { Group.count }.by(2)
+        .and change { Topic.count }.by(0)
+        .and change { User.count }.by(0)
+    end
+
     it 'all' do
       expect {
         import(import_data)

From 3e3ac704e174a51b057c4c0b618a1e6c796edcd9 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sun, 19 Apr 2020 16:44:14 +0200
Subject: [PATCH 0658/1830] Remove unused translation

It isn't used anymore since a19e43fd3b83f9e2be632edaf69cc4ce01fe787b
---
 config/locales/server.en.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 64ed44da9b..51daf795cf 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1375,7 +1375,6 @@ en:
   dashboard:
     rails_env_warning: "Your server is running in %{env} mode."
     host_names_warning: "Your config/database.yml file is using the default localhost hostname. Update it to use your site's hostname."
-    gc_warning: 'Your server is using default ruby garbage collection parameters, which will not give you the best performance. Read this topic on performance tuning: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq is not running. Many tasks, like sending emails, are executed asynchronously by sidekiq. Please ensure at least one sidekiq process is running. <a href="https://github.com/mperham/sidekiq" target="_blank">Learn about Sidekiq here</a>.'
     queue_size_warning: "The number of queued jobs is %{queue_size}, which is high. This could indicate a problem with the Sidekiq process(es), or you may need to add more Sidekiq workers."
     memory_warning: "Your server is running with less than 1 GB of total memory. At least 1 GB of memory is recommended."

From cfe510cbcf7c3fa9a9407c17d8eba735a23ecc96 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 19 Apr 2020 18:54:10 +0200
Subject: [PATCH 0659/1830] FIX: prevents custom emoji to show double colons
 and set background img (#9471)

---
 app/assets/javascripts/discourse/components/emoji-picker.js     | 2 +-
 .../discourse/templates/components/emoji-picker.hbs.erb         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js b/app/assets/javascripts/discourse/components/emoji-picker.js
index 90e2fefe13..e088f9c409 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js
@@ -434,7 +434,7 @@ export default Component.extend({
 
     this.$visibleSections.forEach(visibleSection => {
       const $unloadedEmojis = $(visibleSection).find(
-        "button.emoji[data-loaded!='1']"
+        "button.emoji:not(.custom)[data-loaded!='1']"
       );
       $.each($unloadedEmojis, (_, button) => {
         let offsetTop = button.offsetTop;
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb
index f3504d33f0..ea5b7c125b 100644
--- a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb
+++ b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb
@@ -61,7 +61,7 @@
             {{#if emojis.length}}
               <div class='section-group'>
                 {{#each emojis as |emoji|}}
-                  <button type="button" class="emoji" tabindex="-1" title=":{{emoji.code}}:">
+                  <button type="button" class="custom emoji" tabindex="-1" title="{{emoji.code}}">
                     <img loading="lazy" class="emoji" src="{{emoji.src}}">
                   </button>
                 {{/each}}

From baae0e7446baba8a1c74460999904ade57879797 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sun, 19 Apr 2020 20:21:58 +0200
Subject: [PATCH 0660/1830] FIX: Infinite loop in migrate_to_s3 rake task

---
 lib/file_store/to_s3_migration.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/file_store/to_s3_migration.rb b/lib/file_store/to_s3_migration.rb
index 01c69dc1ee..6792b94e4a 100644
--- a/lib/file_store/to_s3_migration.rb
+++ b/lib/file_store/to_s3_migration.rb
@@ -6,6 +6,8 @@ module FileStore
   ToS3MigrationError = Class.new(RuntimeError)
 
   class ToS3Migration
+    MISSING_UPLOADS_RAKE_TASK_NAME ||= 'posts:missing_uploads'
+
     def initialize(s3_options:, dry_run: false, migrate_to_multisite: false, skip_etag_verify: false)
 
       @s3_bucket = s3_options[:bucket]
@@ -85,8 +87,8 @@ module FileStore
         success = false
       end
 
-      Discourse::Application.load_tasks
-      Rake::Task['posts:missing_uploads']
+      Discourse::Application.load_tasks unless Rake::Task.task_defined?(MISSING_UPLOADS_RAKE_TASK_NAME)
+      Rake::Task[MISSING_UPLOADS_RAKE_TASK_NAME]
       count = DB.query_single(<<~SQL, Post::MISSING_UPLOADS, Post::MISSING_UPLOADS_IGNORED).first
         SELECT COUNT(1)
         FROM posts p

From c6b411f6c18efc41010afcb83f2a712f642d3a23 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sun, 19 Apr 2020 20:24:27 +0200
Subject: [PATCH 0661/1830] FIX: Restore to S3 didn't work without env
 variables

The `uplaods:migrate_to_s3` rake task should always use the environment variables, because you usually don't want to break your site's uploads during the migration. But restoring a backup should work with site settings as well as environment variables, otherwise you can't restore uploads to S3 from the web interface.
---
 lib/file_store/s3_store.rb        | 2 +-
 lib/file_store/to_s3_migration.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index 053b23aa32..6a26ebd7ee 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -198,7 +198,7 @@ module FileStore
       FileUtils.symlink(source_path, public_upload_path)
 
       FileStore::ToS3Migration.new(
-        s3_options: FileStore::ToS3Migration.s3_options_from_env,
+        s3_options: FileStore::ToS3Migration.s3_options_from_site_settings,
         migrate_to_multisite: Rails.configuration.multisite,
       ).migrate
 
diff --git a/lib/file_store/to_s3_migration.rb b/lib/file_store/to_s3_migration.rb
index 6792b94e4a..6f19f2d00f 100644
--- a/lib/file_store/to_s3_migration.rb
+++ b/lib/file_store/to_s3_migration.rb
@@ -21,7 +21,7 @@ module FileStore
     def self.s3_options_from_site_settings
       {
         client_options: S3Helper.s3_options(SiteSetting),
-        bucket: SiteSetting.s3_upload_bucket
+        bucket: SiteSetting.Upload.s3_upload_bucket
       }
     end
 

From 344ef5226cb26d0086dffd79b25f5cf8628aafd0 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Mon, 20 Apr 2020 13:30:04 +1000
Subject: [PATCH 0662/1830] FEATURE: Edit bookmark reminders from post and
 explicit delete button (#9455)

There is now an explicit "Delete Bookmark" button in the edit modal. A confirmation is shown before deleting.

Along with this, when the bookmarked post icon is clicked the modal is now shown instead of just deleting the bookmark. Also, the "Delete Bookmark" button from the user bookmark list now confirms the action.

Add a `d d` shortcut in the modal to delete the bookmark.
---
 .../discourse/controllers/bookmark.js         | 131 ++++++++++++------
 .../controllers/keyboard-shortcuts-help.js    |   4 +
 .../user-activity-bookmarks-with-reminders.js |   6 +-
 .../javascripts/discourse/models/post.js      |  81 +++++------
 .../javascripts/discourse/models/topic.js     |  10 +-
 .../discourse/templates/modal/bookmark.hbs    |   7 +-
 .../modal/keyboard-shortcuts-help.hbs         |   1 +
 app/controllers/bookmarks_controller.rb       |   6 +-
 app/controllers/posts_controller.rb           |  11 +-
 app/serializers/post_serializer.rb            |  18 +++
 config/locales/client.en.yml                  |   3 +
 lib/bookmark_manager.rb                       |   2 +
 spec/lib/bookmark_manager_spec.rb             |   9 +-
 spec/requests/posts_controller_spec.rb        |   2 +-
 test/javascripts/controllers/bookmark-test.js |   6 +-
 15 files changed, 192 insertions(+), 105 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index ec384d54ae..9f630ee913 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -41,15 +41,16 @@ const BOOKMARK_BINDINGS = {
   },
   "n m": { handler: "selectReminderType", args: [REMINDER_TYPES.NEXT_MONTH] },
   "c r": { handler: "selectReminderType", args: [REMINDER_TYPES.CUSTOM] },
-  "n r": { handler: "selectReminderType", args: [REMINDER_TYPES.NONE] }
+  "n r": { handler: "selectReminderType", args: [REMINDER_TYPES.NONE] },
+  "d d": { handler: "delete" }
 };
 
 export default Controller.extend(ModalFunctionality, {
   loading: false,
   errorMessage: null,
   selectedReminderType: null,
-  closeWithoutSaving: false,
-  isSavingBookmarkManually: false,
+  _closeWithoutSaving: false,
+  _savingBookmarkManually: false,
   onCloseWithoutSaving: null,
   customReminderDate: null,
   customReminderTime: null,
@@ -62,20 +63,20 @@ export default Controller.extend(ModalFunctionality, {
     this.setProperties({
       errorMessage: null,
       selectedReminderType: REMINDER_TYPES.NONE,
-      closeWithoutSaving: false,
-      isSavingBookmarkManually: false,
+      _closeWithoutSaving: false,
+      _savingBookmarkManually: false,
       customReminderDate: null,
-      customReminderTime: this.defaultCustomReminderTime(),
+      customReminderTime: this._defaultCustomReminderTime(),
       lastCustomReminderDate: null,
       lastCustomReminderTime: null,
       userTimezone: this.currentUser.resolvedTimezone()
     });
 
-    this.bindKeyboardShortcuts();
-    this.loadLastUsedCustomReminderDatetime();
+    this._bindKeyboardShortcuts();
+    this._loadLastUsedCustomReminderDatetime();
 
-    if (this.editingExistingBookmark()) {
-      this.initializeExistingBookmarkData();
+    if (this._editingExistingBookmark()) {
+      this._initializeExistingBookmarkData();
     }
   },
 
@@ -84,19 +85,19 @@ export default Controller.extend(ModalFunctionality, {
    * clicks the save or cancel button to mimic browser behaviour.
    */
   onClose() {
-    this.unbindKeyboardShortcuts();
-    this.restoreGlobalShortcuts();
-    if (!this.closeWithoutSaving && !this.isSavingBookmarkManually) {
-      this.saveBookmark().catch(e => this.handleSaveError(e));
+    this._unbindKeyboardShortcuts();
+    this._restoreGlobalShortcuts();
+    if (!this._closeWithoutSaving && !this._savingBookmarkManually) {
+      this._saveBookmark().catch(e => this._handleSaveError(e));
     }
-    if (this.onCloseWithoutSaving && this.closeWithoutSaving) {
+    if (this.onCloseWithoutSaving && this._closeWithoutSaving) {
       this.onCloseWithoutSaving();
     }
   },
 
-  initializeExistingBookmarkData() {
-    if (this.existingBookmarkHasReminder()) {
-      let parsedReminderAt = this.parseCustomDateTime(this.model.reminderAt);
+  _initializeExistingBookmarkData() {
+    if (this._existingBookmarkHasReminder()) {
+      let parsedReminderAt = this._parseCustomDateTime(this.model.reminderAt);
       this.setProperties({
         customReminderDate: parsedReminderAt.format("YYYY-MM-DD"),
         customReminderTime: parsedReminderAt.format("HH:mm"),
@@ -105,20 +106,20 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
-  editingExistingBookmark() {
+  _editingExistingBookmark() {
     return isPresent(this.model) && isPresent(this.model.id);
   },
 
-  existingBookmarkHasReminder() {
+  _existingBookmarkHasReminder() {
     return isPresent(this.model) && isPresent(this.model.reminderAt);
   },
 
-  loadLastUsedCustomReminderDatetime() {
+  _loadLastUsedCustomReminderDatetime() {
     let lastTime = localStorage.lastCustomBookmarkReminderTime;
     let lastDate = localStorage.lastCustomBookmarkReminderDate;
 
     if (lastTime && lastDate) {
-      let parsed = this.parseCustomDateTime(lastDate, lastTime);
+      let parsed = this._parseCustomDateTime(lastDate, lastTime);
 
       // can't set reminders in the past
       if (parsed < this.now()) {
@@ -133,7 +134,7 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
-  bindKeyboardShortcuts() {
+  _bindKeyboardShortcuts() {
     KeyboardShortcuts.pause(GLOBAL_SHORTCUTS_TO_PAUSE);
     Object.keys(BOOKMARK_BINDINGS).forEach(shortcut => {
       KeyboardShortcuts.addShortcut(shortcut, () => {
@@ -146,11 +147,11 @@ export default Controller.extend(ModalFunctionality, {
     });
   },
 
-  unbindKeyboardShortcuts() {
+  _unbindKeyboardShortcuts() {
     KeyboardShortcuts.unbind(BOOKMARK_BINDINGS);
   },
 
-  restoreGlobalShortcuts() {
+  _restoreGlobalShortcuts() {
     KeyboardShortcuts.unpause(GLOBAL_SHORTCUTS_TO_PAUSE);
   },
 
@@ -159,6 +160,11 @@ export default Controller.extend(ModalFunctionality, {
     return isPresent(existingReminderAt);
   },
 
+  @discourseComputed("model.id")
+  showDelete(id) {
+    return isPresent(id);
+  },
+
   @discourseComputed()
   showAtDesktop() {
     return (
@@ -247,8 +253,8 @@ export default Controller.extend(ModalFunctionality, {
     return !_.isEmpty(userTimezone);
   },
 
-  saveBookmark() {
-    const reminderAt = this.reminderAt();
+  _saveBookmark() {
+    const reminderAt = this._reminderAt();
     const reminderAtISO = reminderAt ? reminderAt.toISOString() : null;
 
     if (this.selectedReminderType === REMINDER_TYPES.CUSTOM) {
@@ -277,34 +283,54 @@ export default Controller.extend(ModalFunctionality, {
       id: this.model.id
     };
 
-    if (this.editingExistingBookmark()) {
+    if (this._editingExistingBookmark()) {
       return ajax("/bookmarks/" + this.model.id, {
         type: "PUT",
         data
       }).then(() => {
         if (this.afterSave) {
-          this.afterSave(reminderAtISO, this.selectedReminderType);
+          this.afterSave({
+            reminderAt: reminderAtISO,
+            reminderType: this.selectedReminderType,
+            id: this.model.id,
+            name: this.model.name
+          });
         }
       });
     } else {
-      return ajax("/bookmarks", { type: "POST", data }).then(() => {
+      return ajax("/bookmarks", { type: "POST", data }).then(response => {
         if (this.afterSave) {
-          this.afterSave(reminderAtISO, this.selectedReminderType);
+          this.afterSave({
+            reminderAt: reminderAtISO,
+            reminderType: this.selectedReminderType,
+            id: response.id,
+            name: this.model.name
+          });
         }
       });
     }
   },
 
-  parseCustomDateTime(date, time) {
+  _deleteBookmark() {
+    return ajax("/bookmarks/" + this.model.id, {
+      type: "DELETE"
+    }).then(response => {
+      if (this.afterDelete) {
+        this.afterDelete(response.topic_bookmarked);
+      }
+    });
+  },
+
+  _parseCustomDateTime(date, time) {
     let dateTime = isPresent(time) ? date + " " + time : date;
     return moment.tz(dateTime, this.userTimezone);
   },
 
-  defaultCustomReminderTime() {
+  _defaultCustomReminderTime() {
     return `0${START_OF_DAY_HOUR}:00`;
   },
 
-  reminderAt() {
+  _reminderAt() {
     if (!this.selectedReminderType) {
       return;
     }
@@ -329,9 +355,9 @@ export default Controller.extend(ModalFunctionality, {
       case REMINDER_TYPES.CUSTOM:
         this.set(
           "customReminderTime",
-          this.customReminderTime || this.defaultCustomReminderTime()
+          this.customReminderTime || this._defaultCustomReminderTime()
         );
-        const customDateTime = this.parseCustomDateTime(
+        const customDateTime = this._parseCustomDateTime(
           this.customReminderDate,
           this.customReminderTime
         );
@@ -385,8 +411,8 @@ export default Controller.extend(ModalFunctionality, {
     return this.startOfDay(this.now().add(2, "days"));
   },
 
-  handleSaveError(e) {
-    this.isSavingBookmarkManually = false;
+  _handleSaveError(e) {
+    this._savingBookmarkManually = false;
     if (typeof e === "string") {
       bootbox.alert(e);
     } else {
@@ -396,20 +422,35 @@ export default Controller.extend(ModalFunctionality, {
 
   actions: {
     saveAndClose() {
-      if (this.saving) {
+      if (this._saving || this._deleting) {
         return;
       }
 
-      this.saving = true;
-      this.isSavingBookmarkManually = true;
-      this.saveBookmark()
+      this._saving = true;
+      this._savingBookmarkManually = true;
+      this._saveBookmark()
         .then(() => this.send("closeModal"))
-        .catch(e => this.handleSaveError(e))
-        .finally(() => (this.saving = false));
+        .catch(e => this._handleSaveError(e))
+        .finally(() => (this._saving = false));
+    },
+
+    delete() {
+      this._deleting = true;
+      bootbox.confirm(I18n.t("bookmarks.confirm_delete"), result => {
+        if (result) {
+          this._closeWithoutSaving = true;
+          this._deleteBookmark()
+            .then(() => {
+              this._deleting = false;
+              this.send("closeModal");
+            })
+            .catch(e => this._handleSaveError(e));
+        }
+      });
     },
 
     closeWithoutSavingBookmark() {
-      this.closeWithoutSaving = true;
+      this._closeWithoutSaving = true;
       this.send("closeModal");
     },
 
diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
index 85ee690151..a0d42ac061 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
@@ -170,6 +170,10 @@ export default Controller.extend(ModalFunctionality, {
         none: buildShortcut("bookmarks.none", {
           keys1: ["n", "r"],
           shortcutsDelimiter: "space"
+        }),
+        delete: buildShortcut("bookmarks.delete", {
+          keys1: ["d", "d"],
+          shortcutsDelimiter: "space"
         })
       },
       actions: {
diff --git a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
index a2176a7a2b..9611aceced 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
+++ b/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
@@ -61,7 +61,11 @@ export default Controller.extend({
 
   actions: {
     removeBookmark(bookmark) {
-      return bookmark.destroy().then(() => this.loadItems());
+      bootbox.confirm(I18n.t("bookmarks.confirm_delete"), result => {
+        if (result) {
+          return bookmark.destroy().then(() => this.loadItems());
+        }
+      });
     },
 
     editBookmark(bookmark) {
diff --git a/app/assets/javascripts/discourse/models/post.js b/app/assets/javascripts/discourse/models/post.js
index f3ae53a606..550a1fbfac 100644
--- a/app/assets/javascripts/discourse/models/post.js
+++ b/app/assets/javascripts/discourse/models/post.js
@@ -336,48 +336,49 @@ const Post = RestModel.extend({
   },
 
   toggleBookmarkWithReminder() {
-    this.toggleProperty("bookmarked_with_reminder");
-    if (this.bookmarked_with_reminder) {
-      return new Promise(resolve => {
-        let controller = showModal("bookmark", {
-          model: {
-            postId: this.id
-          },
-          title: "post.bookmarks.create",
-          modalClass: "bookmark-with-reminder"
-        });
-        controller.setProperties({
-          onCloseWithoutSaving: () => {
-            this.toggleProperty("bookmarked_with_reminder");
-            resolve({ closedWithoutSaving: true });
-            this.appEvents.trigger("post-stream:refresh", { id: this.id });
-          },
-          afterSave: (reminderAtISO, reminderType) => {
-            this.setProperties({
-              "topic.bookmarked": true,
-              bookmark_reminder_at: reminderAtISO,
-              bookmark_reminder_type: reminderType
-            });
-            resolve({ closedWithoutSaving: false });
-            this.appEvents.trigger("post-stream:refresh", { id: this.id });
-          }
-        });
+    return new Promise(resolve => {
+      let controller = showModal("bookmark", {
+        model: {
+          postId: this.id,
+          id: this.bookmark_id,
+          reminderAt: this.bookmark_reminder_at,
+          name: this.bookmark_name
+        },
+        title: this.bookmark_id
+          ? "post.bookmarks.edit"
+          : "post.bookmarks.create",
+        modalClass: "bookmark-with-reminder"
       });
-    } else {
-      this.setProperties({
-        bookmark_reminder_at: null,
-        bookmark_reminder_type: null
-      });
-      return Post.destroyBookmark(this.id)
-        .then(result => {
-          this.set("topic.bookmarked", result.topic_bookmarked);
+      controller.setProperties({
+        onCloseWithoutSaving: () => {
+          resolve({ closedWithoutSaving: true });
+          this.appEvents.trigger("post-stream:refresh", { id: this.id });
+        },
+        afterSave: savedData => {
+          this.setProperties({
+            "topic.bookmarked": true,
+            bookmarked_with_reminder: true,
+            bookmark_reminder_at: savedData.reminderAt,
+            bookmark_reminder_type: savedData.reminderType,
+            bookmark_name: savedData.name,
+            bookmark_id: savedData.id
+          });
+          resolve({ closedWithoutSaving: false });
+          this.appEvents.trigger("post-stream:refresh", { id: this.id });
+        },
+        afterDelete: topicBookmarked => {
+          this.set("topic.bookmarked", topicBookmarked);
+          this.setProperties({
+            bookmark_reminder_at: null,
+            bookmark_reminder_type: null,
+            bookmark_name: null,
+            bookmark_id: null,
+            bookmarked_with_reminder: false
+          });
           this.appEvents.trigger("page:bookmark-post-toggled", this);
-        })
-        .catch(error => {
-          this.toggleProperty("bookmarked_with_reminder");
-          throw new Error(error);
-        });
-    }
+        }
+      });
+    });
   },
 
   updateActionsSummary(json) {
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index ce951d6edc..6ad8de27ec 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -461,6 +461,12 @@ const Topic = RestModel.extend({
             .then(() => {
               this.toggleProperty("bookmarked");
               this.set("bookmark_reminder_at", null);
+              let clearedBookmarkProps = {
+                bookmarked_with_reminder: false,
+                bookmark_id: null,
+                bookmark_name: null,
+                bookmark_reminder_at: null
+              };
               if (posts) {
                 const updated = [];
                 posts.forEach(post => {
@@ -472,11 +478,11 @@ const Topic = RestModel.extend({
                     this.siteSettings.enable_bookmarks_with_reminders &&
                     post.bookmarked_with_reminder
                   ) {
-                    post.set("bookmarked_with_reminder", false);
+                    post.setProperties(clearedBookmarkProps);
                     updated.push(post.id);
                   }
                 });
-                firstPost.set("bookmarked_with_reminder", false);
+                firstPost.setProperties(clearedBookmarkProps);
                 return updated;
               }
             })
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 8e20711ef3..3a5075ebc9 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -9,7 +9,7 @@
     {{/if}}
 
     <div class="control-group">
-      {{input value=model.name name="name" class="bookmark-name" placeholder=(i18n "post.bookmarks.name_placeholder")}}
+      {{input id="bookmark-name" value=model.name name="name" class="bookmark-name" placeholder=(i18n "post.bookmarks.name_placeholder")}}
     </div>
 
     {{#if showExistingReminderAt }}
@@ -100,6 +100,11 @@
     <div class="control-group">
       {{d-button label="bookmarks.save" class="btn-primary" action=(action "saveAndClose")}}
       {{d-modal-cancel close=(action "closeWithoutSavingBookmark")}}
+      {{#if showDelete}}
+        <div class="pull-right">
+          {{d-button icon="trash" class="btn-danger" action=(action "delete")}}
+        </div>
+      {{/if}}
     </div>
   {{/conditional-loading-spinner}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index f2d6b022e9..5299b52f37 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -69,6 +69,7 @@
           <li>{{html-safe shortcuts.bookmarks.next_business_day}}</li>
           <li>{{html-safe shortcuts.bookmarks.custom}}</li>
           <li>{{html-safe shortcuts.bookmarks.none}}</li>
+          <li>{{html-safe shortcuts.bookmarks.delete}}</li>
         </ul>
       </section>
     {{/if}}
diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
index 4fd077d45e..f7fed51f59 100644
--- a/app/controllers/bookmarks_controller.rb
+++ b/app/controllers/bookmarks_controller.rb
@@ -15,7 +15,7 @@ class BookmarksController < ApplicationController
     )
 
     if bookmark_manager.errors.empty?
-      return render json: success_json
+      return render json: success_json.merge(id: bookmark.id)
     end
 
     render json: failed_json.merge(errors: bookmark_manager.errors.full_messages), status: 400
@@ -23,8 +23,8 @@ class BookmarksController < ApplicationController
 
   def destroy
     params.require(:id)
-    BookmarkManager.new(current_user).destroy(params[:id])
-    render json: success_json
+    result = BookmarkManager.new(current_user).destroy(params[:id])
+    render json: success_json.merge(result)
   end
 
   def update
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 5d62c6510f..50c4ead17f 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -511,15 +511,10 @@ class PostsController < ApplicationController
   def destroy_bookmark
     params.require(:post_id)
 
-    existing_bookmark = Bookmark.find_by(post_id: params[:post_id], user_id: current_user.id)
-    topic_bookmarked = false
+    bookmark_id = Bookmark.where(post_id: params[:post_id], user_id: current_user.id).pluck_first(:id)
+    result = BookmarkManager.new(current_user).destroy(bookmark_id)
 
-    if existing_bookmark.present?
-      topic_bookmarked = Bookmark.exists?(topic_id: existing_bookmark.topic_id, user_id: current_user.id)
-      existing_bookmark.destroy
-    end
-
-    render json: success_json.merge(topic_bookmarked: topic_bookmarked)
+    render json: success_json.merge(result)
   end
 
   def wiki
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index b78c90f4fb..ff880f14c3 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -51,7 +51,9 @@ class PostSerializer < BasicPostSerializer
              :bookmarked,
              :bookmarked_with_reminder,
              :bookmark_reminder_at,
+             :bookmark_id,
              :bookmark_reminder_type,
+             :bookmark_name,
              :raw,
              :actions_summary,
              :moderator?,
@@ -334,6 +336,14 @@ class PostSerializer < BasicPostSerializer
     include_bookmarked_with_reminder?
   end
 
+  def include_bookmark_name?
+    include_bookmarked_with_reminder?
+  end
+
+  def include_bookmark_id?
+    include_bookmarked_with_reminder?
+  end
+
   def post_bookmark
     return nil if !SiteSetting.enable_bookmarks_with_reminders? || @topic_view.blank?
     @post_bookmark ||= @topic_view.user_post_bookmarks.find { |bookmark| bookmark.post_id == object.id }
@@ -348,6 +358,14 @@ class PostSerializer < BasicPostSerializer
     Bookmark.reminder_types[post_bookmark.reminder_type].to_s
   end
 
+  def bookmark_name
+    post_bookmark&.name
+  end
+
+  def bookmark_id
+    post_bookmark&.id
+  end
+
   def include_display_username?
     SiteSetting.enable_names?
   end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9bd07e6819..947f19c3ba 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -311,6 +311,8 @@ en:
       created_with_reminder: "you've bookmarked this post with a reminder %{date}"
       created_with_at_desktop_reminder: "you've bookmarked this post and will be reminded next time you are at your desktop"
       remove: "Remove Bookmark"
+      delete: "Delete Bookmark"
+      confirm_delete: "Are you sure you want to delete this bookmark? If you set a reminder it will also be deleted."
       confirm_clear: "Are you sure you want to clear all your bookmarks from this topic?"
       save: "Save"
       no_timezone: 'You have not set a timezone yet. You will not be able to set reminders. Set one up <a href="%{basePath}/my/preferences/profile">in your profile</a>.'
@@ -3118,6 +3120,7 @@ en:
         next_business_day: "%{shortcut} Next business day"
         custom: "%{shortcut} Custom date and time"
         none: "%{shortcut} No reminder"
+        delete: "%{shortcut} Delete bookmark"
       actions:
         title: "Actions"
         bookmark_topic: "%{shortcut} Toggle bookmark topic"
diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index 9da2dc257b..b56a129f10 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -44,6 +44,8 @@ class BookmarkManager
 
     bookmark.destroy
     clear_at_desktop_cache_if_required
+
+    { topic_bookmarked: Bookmark.exists?(topic_id: bookmark.topic_id, user: @user) }
   end
 
   def destroy_for_topic(topic)
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index de25969f2c..979f567433 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -123,8 +123,15 @@ RSpec.describe BookmarkManager do
   describe ".destroy" do
     let!(:bookmark) { Fabricate(:bookmark, user: user, post: post) }
     it "deletes the existing bookmark" do
-      subject.destroy(bookmark.id)
+      result = subject.destroy(bookmark.id)
       expect(Bookmark.exists?(id: bookmark.id)).to eq(false)
+      expect(result[:topic_bookmarked]).to eq(false)
+    end
+
+    it "returns a value indicating whether there are still other bookmarks in the topic for the user" do
+      Fabricate(:bookmark, user: user, post: Fabricate(:post, topic: post.topic))
+      result = subject.destroy(bookmark.id)
+      expect(result[:topic_bookmarked]).to eq(true)
     end
 
     context "if the bookmark is belonging to some other user" do
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 534bcdecd5..09cefae4a0 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -473,7 +473,7 @@ describe PostsController do
 
     context "when the user still has bookmarks in the topic" do
       before do
-        Fabricate(:bookmark, user: user, post: Fabricate(:post, topic: post.topic), topic: topic)
+        Fabricate(:bookmark, user: user, post: Fabricate(:post, topic: post.topic), topic: post.topic)
       end
       it "marks topic_bookmaked as true" do
         delete "/posts/#{post.id}/bookmark.json"
diff --git a/test/javascripts/controllers/bookmark-test.js b/test/javascripts/controllers/bookmark-test.js
index 7a68739289..67d918703b 100644
--- a/test/javascripts/controllers/bookmark-test.js
+++ b/test/javascripts/controllers/bookmark-test.js
@@ -201,7 +201,7 @@ QUnit.test(
     BookmarkController.customReminderDate = "2028-12-12";
     BookmarkController.selectedReminderType =
       BookmarkController.reminderTypes.CUSTOM;
-    const reminderAt = BookmarkController.reminderAt();
+    const reminderAt = BookmarkController._reminderAt();
     assert.equal(BookmarkController.customReminderTime, "08:00");
     assert.equal(
       reminderAt.toString(),
@@ -223,7 +223,7 @@ QUnit.test(
     localStorage.lastCustomBookmarkReminderDate = "2019-12-12";
     localStorage.lastCustomBookmarkReminderTime = "08:00";
 
-    BookmarkController.loadLastUsedCustomReminderDatetime();
+    BookmarkController._loadLastUsedCustomReminderDatetime();
 
     assert.equal(BookmarkController.lastCustomReminderDate, "2019-12-12");
     assert.equal(BookmarkController.lastCustomReminderTime, "08:00");
@@ -237,7 +237,7 @@ QUnit.test(
     localStorage.lastCustomBookmarkReminderDate = "2019-12-11";
     localStorage.lastCustomBookmarkReminderTime = "07:00";
 
-    BookmarkController.loadLastUsedCustomReminderDatetime();
+    BookmarkController._loadLastUsedCustomReminderDatetime();
 
     assert.equal(BookmarkController.lastCustomReminderDate, null);
     assert.equal(BookmarkController.lastCustomReminderTime, null);

From ee36382640560191a8a43e87b607ef00051e019b Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 20 Apr 2020 16:08:24 +1000
Subject: [PATCH 0663/1830] FEATURE: improve rendering of RSS feeds

- Eliminate superfluous "author wrote" block
- Eliminate block-quote for all posts
- Move participant count and reply count to 1 line
- Prioritize name over username if forum requests
- Use fabrication in list controller spec to speed up spec
---
 app/helpers/application_helper.rb     | 10 ++++++++++
 app/views/list/list.rss.erb           | 18 +++++-------------
 app/views/topics/show.rss.erb         | 15 ++++++---------
 config/locales/server.en.yml          | 10 +++++++---
 spec/requests/list_controller_spec.rb | 27 ++++++++++++++-------------
 5 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e9e68829ec..598d37a954 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -513,4 +513,14 @@ module ApplicationHelper
     !SiteSetting.invite_only &&
     !SiteSetting.enable_sso
   end
+
+  def rss_creator(user)
+    if user
+      if SiteSetting.prioritize_username_in_ux
+        "#{user.username}"
+      else
+        "#{user.name.presence || user.username }"
+      end
+    end
+  end
 end
diff --git a/app/views/list/list.rss.erb b/app/views/list/list.rss.erb
index 0895d208da..040ece9046 100644
--- a/app/views/list/list.rss.erb
+++ b/app/views/list/list.rss.erb
@@ -12,23 +12,15 @@
       <atom:link href="<%= @atom_link %>" rel="self" type="application/rss+xml" />
       <% @topic_list.topics.each do |topic| %>
         <% topic_url = topic.url -%>
-        <% username = topic.user ? topic.user.username : "" %>
-        <% name = topic.user ? topic.user.name : "" %>
         <item>
           <title><%= topic.title %></title>
-          <dc:creator><![CDATA[<%= "@#{username}#{" #{name}" if (name.present? && SiteSetting.enable_names?)}" -%>]]></dc:creator>
+          <dc:creator><![CDATA[<%= rss_creator(topic.user) -%>]]></dc:creator>
           <category><%= topic.category.name %></category>
           <description><![CDATA[
-            <% if username.present? %>
-            <p><%= t('author_wrote', author: link_to("@#{username}", "#{Discourse.base_url}/u/#{url_encode(topic.user.username_lower)}")).html_safe %></p>
-            <% end %>
-            <blockquote>
-              <%- if first_post = topic.ordered_posts.first %>
-              <%= first_post.cooked.html_safe %>
-              <%- end %>
-            </blockquote>
-            <p><%= t 'num_posts' %> <%= topic.posts_count %></p>
-            <p><%= t 'num_participants' %> <%= topic.participant_count %></p>
+            <%- if first_post = topic.ordered_posts.first %>
+            <%= first_post.cooked.html_safe %>
+            <%- end %>
+            <p><small><%= t 'rss_num_posts', count: topic.posts_count %> - <%= t 'rss_num_participants', count: topic.participant_count %></small></p>
             <p><%= link_to t('read_full_topic'), topic_url %></p>
           ]]></description>
           <link><%= topic_url %></link>
diff --git a/app/views/topics/show.rss.erb b/app/views/topics/show.rss.erb
index 2a71f1f163..7da14703cd 100644
--- a/app/views/topics/show.rss.erb
+++ b/app/views/topics/show.rss.erb
@@ -15,17 +15,14 @@
       <% next unless post.user %>
       <item>
         <title><%= @topic_view.title %></title>
-        <dc:creator><![CDATA[<%= "@#{post.user.username}#{" #{post.user.name}" if (post.user.name.present? && SiteSetting.enable_names?)}" -%>]]></dc:creator>
+        <dc:creator><![CDATA[<%= rss_creator(post.user) -%>]]></dc:creator>
         <description><![CDATA[
           <% post_url = Discourse.base_url + post.url %>
-          <p><%= t('author_wrote', author: link_to("@#{post.user.username}", "#{Discourse.base_url}/u/#{url_encode(post.user.username_lower)}")).html_safe %></p>
-          <blockquote>
-            <% if post.hidden %>
-              <%= t('flagging.user_must_edit').html_safe %>
-            <% else %>
-              <%= post.cooked.html_safe %>
-            <% end %>
-          </blockquote>
+          <% if post.hidden %>
+            <%= t('flagging.user_must_edit').html_safe %>
+          <% else %>
+            <%= post.cooked.html_safe %>
+          <% end %>
           <p><%= link_to t('read_full_topic'), post_url %></p>
         ]]></description>
         <link><%= post_url %></link>
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 51daf795cf..2e73efe552 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -352,9 +352,13 @@ en:
   topics_in_category: "Topics in the '%{category}' category"
   rss_posts_in_topic: "RSS feed of '%{topic}'"
   rss_topics_in_category: "RSS feed of topics in the '%{category}' category"
-  author_wrote: "%{author} wrote:"
-  num_posts: "Posts:"
-  num_participants: "Participants:"
+  rss_num_posts:
+    one: "%{count} post"
+    other: "%{count} posts"
+  rss_num_participants:
+    one: "%{count} participant"
+    other: "%{count} participants"
+
   read_full_topic: "Read full topic"
   private_message_abbrev: "Msg"
 
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index 9702231805..83a46f3373 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -3,10 +3,10 @@
 require 'rails_helper'
 
 RSpec.describe ListController do
-  let(:topic) { Fabricate(:topic, user: user) }
-  let(:group) { Fabricate(:group) }
-  let(:user) { Fabricate(:user) }
-  let(:admin) { Fabricate(:admin) }
+  fab!(:user) { Fabricate(:user) }
+  fab!(:topic) { Fabricate(:topic, user: user) }
+  fab!(:group) { Fabricate(:group) }
+  fab!(:admin) { Fabricate(:admin) }
 
   before do
     admin  # to skip welcome wizard at home page `/`
@@ -73,12 +73,12 @@ RSpec.describe ListController do
     end
 
     it "shows correct title if topic list is set for homepage" do
-      get "/"
+      get "/latest"
 
       expect(response.body).to have_tag "title", text: "Discourse"
 
       SiteSetting.short_site_description = "Best community"
-      get "/"
+      get "/latest"
 
       expect(response.body).to have_tag "title", text: "Discourse - Best community"
     end
@@ -95,7 +95,7 @@ RSpec.describe ListController do
 
       get "/categories_and_latest.json"
       data = JSON.parse(response.body)
-      expect(data["topic_list"]["topics"].length).to eq(1)
+      expect(data["topic_list"]["topics"].length).to eq(2)
     end
   end
 
@@ -305,12 +305,11 @@ RSpec.describe ListController do
 
     it 'renders links correctly with subfolder' do
       set_subfolder "/forum"
-      post = Fabricate(:post, topic: topic, user: user)
+      _post = Fabricate(:post, topic: topic, user: user)
       get "/latest.rss"
       expect(response.status).to eq(200)
       expect(response.body).to_not include("/forum/forum")
       expect(response.body).to include("http://test.localhost/forum/t/#{topic.slug}")
-      expect(response.body).to include("http://test.localhost/forum/u/#{post.user.username}")
     end
 
     it 'renders top RSS' do
@@ -498,16 +497,18 @@ RSpec.describe ListController do
   end
 
   describe "topics_by" do
+    fab!(:topic2) { Fabricate(:topic, user: user) }
+    fab!(:user2) { Fabricate(:user) }
+
     before do
-      sign_in(Fabricate(:user))
-      Fabricate(:topic, user: user)
+      sign_in(user2)
     end
 
     it "should respond with a list" do
       get "/topics/created-by/#{user.username}.json"
       expect(response.status).to eq(200)
       json = JSON.parse(response.body)
-      expect(json["topic_list"]["topics"].size).to eq(1)
+      expect(json["topic_list"]["topics"].size).to eq(2)
     end
 
     it "should work with period in username" do
@@ -515,7 +516,7 @@ RSpec.describe ListController do
       get "/topics/created-by/#{user.username}", xhr: true
       expect(response.status).to eq(200)
       json = JSON.parse(response.body)
-      expect(json["topic_list"]["topics"].size).to eq(1)
+      expect(json["topic_list"]["topics"].size).to eq(2)
     end
   end
 

From 82f9dcf301f99d160a2dd36cddb1c14f7d187368 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Mon, 20 Apr 2020 11:37:59 +0200
Subject: [PATCH 0664/1830] Update translations

---
 .tx/config                                    |   6 -
 config/locales/client.ar.yml                  |  30 +-
 config/locales/client.be.yml                  |  11 +-
 config/locales/client.bg.yml                  |  19 +-
 config/locales/client.bs_BA.yml               |  21 +-
 config/locales/client.ca.yml                  |  38 +-
 config/locales/client.cs.yml                  |  20 +-
 config/locales/client.da.yml                  |  19 +-
 config/locales/client.de.yml                  |  27 +-
 config/locales/client.el.yml                  |  19 +-
 config/locales/client.es.yml                  |  66 +-
 config/locales/client.et.yml                  |  20 +-
 config/locales/client.fa_IR.yml               |  35 +-
 config/locales/client.fi.yml                  |  27 +-
 config/locales/client.fr.yml                  |  28 +-
 config/locales/client.gl.yml                  |  10 +-
 config/locales/client.he.yml                  | 130 +++-
 config/locales/client.hu.yml                  |  19 +-
 config/locales/client.hy.yml                  |  20 +-
 config/locales/client.id.yml                  |  13 +-
 config/locales/client.it.yml                  | 391 ++++++++---
 config/locales/client.ja.yml                  |  19 +-
 config/locales/client.ko.yml                  |  19 +-
 config/locales/client.lt.yml                  |  17 +-
 config/locales/client.lv.yml                  |  18 +-
 config/locales/client.nb_NO.yml               |  54 +-
 config/locales/client.nl.yml                  | 114 +++-
 config/locales/client.pl_PL.yml               | 161 ++++-
 config/locales/client.pt.yml                  |  20 +-
 config/locales/client.pt_BR.yml               |  42 +-
 config/locales/client.ro.yml                  |  19 +-
 config/locales/client.ru.yml                  | 222 +++++--
 config/locales/client.sk.yml                  |  15 +-
 config/locales/client.sl.yml                  |  20 +-
 config/locales/client.sq.yml                  |  10 +-
 config/locales/client.sr.yml                  |   9 +-
 config/locales/client.sv.yml                  | 118 +++-
 config/locales/client.sw.yml                  |  19 +-
 config/locales/client.te.yml                  |  13 +-
 config/locales/client.th.yml                  |  10 +-
 config/locales/client.tr_TR.yml               |  29 +-
 config/locales/client.uk.yml                  |  29 +-
 config/locales/client.ur.yml                  |  22 +-
 config/locales/client.vi.yml                  |  19 +-
 config/locales/client.zh_CN.yml               | 424 +++++++-----
 config/locales/client.zh_TW.yml               |  22 +-
 config/locales/server.ar.yml                  |  11 +-
 config/locales/server.be.yml                  | 469 ++++++++-----
 config/locales/server.bg.yml                  |  11 +-
 config/locales/server.bs_BA.yml               |  13 +-
 config/locales/server.ca.yml                  |  25 +-
 config/locales/server.cs.yml                  |  11 +-
 config/locales/server.da.yml                  |  14 +-
 config/locales/server.de.yml                  |  22 +-
 config/locales/server.el.yml                  |  14 +-
 config/locales/server.es.yml                  |  49 +-
 config/locales/server.et.yml                  |  11 +-
 config/locales/server.fa_IR.yml               |  15 +-
 config/locales/server.fi.yml                  |  19 +-
 config/locales/server.fr.yml                  |  55 +-
 config/locales/server.gl.yml                  |   4 +
 config/locales/server.he.yml                  |  61 +-
 config/locales/server.hu.yml                  |  12 +-
 config/locales/server.hy.yml                  |  16 +-
 config/locales/server.id.yml                  |   9 +-
 config/locales/server.it.yml                  | 368 ++++++-----
 config/locales/server.ja.yml                  |  14 +-
 config/locales/server.ko.yml                  |  14 +-
 config/locales/server.lt.yml                  |  10 +
 config/locales/server.lv.yml                  |   6 +
 config/locales/server.nb_NO.yml               |  16 +-
 config/locales/server.nl.yml                  |  47 +-
 config/locales/server.pl_PL.yml               | 309 ++++++++-
 config/locales/server.pt.yml                  |  15 +-
 config/locales/server.pt_BR.yml               |  14 +-
 config/locales/server.ro.yml                  |  17 +-
 config/locales/server.ru.yml                  |  28 +-
 config/locales/server.sk.yml                  |  13 +-
 config/locales/server.sl.yml                  |   7 +-
 config/locales/server.sq.yml                  |   6 +-
 config/locales/server.sr.yml                  |   3 +
 config/locales/server.sv.yml                  |  47 +-
 config/locales/server.sw.yml                  |  15 +-
 config/locales/server.te.yml                  |   9 +
 config/locales/server.th.yml                  |   3 +
 config/locales/server.tr_TR.yml               |  23 +-
 config/locales/server.uk.yml                  |  21 +-
 config/locales/server.ur.yml                  |  17 +-
 config/locales/server.vi.yml                  |  16 +-
 config/locales/server.zh_CN.yml               | 616 +++++++++---------
 config/locales/server.zh_TW.yml               |  17 +-
 .../config/locales/client.it.yml              |   2 +
 .../config/locales/client.ru.yml              |   2 +-
 .../config/locales/server.ar.yml              |   3 -
 .../config/locales/server.be.yml              |   2 -
 .../config/locales/server.bs_BA.yml           |   2 -
 .../config/locales/server.ca.yml              |   2 -
 .../config/locales/server.de.yml              |  17 +-
 .../config/locales/server.el.yml              |   2 -
 .../config/locales/server.es.yml              |   2 -
 .../config/locales/server.fa_IR.yml           |   2 -
 .../config/locales/server.fi.yml              |   4 +-
 .../config/locales/server.fr.yml              |   2 -
 .../config/locales/server.he.yml              |   2 +-
 .../config/locales/server.hy.yml              |   2 -
 .../config/locales/server.id.yml              |   3 -
 .../config/locales/server.it.yml              |  23 +-
 .../config/locales/server.ko.yml              |   2 -
 .../config/locales/server.nb_NO.yml           |   2 -
 .../config/locales/server.pl_PL.yml           |   6 +-
 .../config/locales/server.pt_BR.yml           |   2 -
 .../config/locales/server.ru.yml              |   2 -
 .../config/locales/server.sl.yml              |   2 -
 .../config/locales/server.sv.yml              |   2 +-
 .../config/locales/server.sw.yml              |   2 -
 .../config/locales/server.tr_TR.yml           |   2 -
 .../config/locales/server.ur.yml              |   2 -
 .../config/locales/server.zh_CN.yml           |  20 +-
 plugins/poll/config/locales/client.ca.yml     |   1 +
 plugins/poll/config/locales/client.de.yml     |   7 +
 plugins/poll/config/locales/client.it.yml     |  16 +
 plugins/poll/config/locales/server.de.yml     |   6 +
 plugins/poll/config/locales/server.it.yml     |   8 +
 plugins/poll/config/locales/server.zh_CN.yml  |   2 +-
 124 files changed, 3417 insertions(+), 1684 deletions(-)

diff --git a/.tx/config b/.tx/config
index 7167d96bc5..9163537384 100644
--- a/.tx/config
+++ b/.tx/config
@@ -62,12 +62,6 @@ source_file = plugins/discourse-details/config/locales/server.en.yml
 source_lang = en
 type = YML
 
-[discourse-org.corepluginnginx-performance-reportserveryml]
-file_filter = plugins/discourse-nginx-performance-report/config/locales/server.<lang>.yml
-source_file = plugins/discourse-nginx-performance-report/config/locales/server.en.yml
-source_lang = en
-type = YML
-
 [discourse-org.core-plugin-local-dates-client-yml]
 file_filter = plugins/discourse-local-dates/config/locales/client.<lang>.yml
 source_file = plugins/discourse-local-dates/config/locales/client.en.yml
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 8b7e95c922..baa28cb0cc 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -33,7 +33,6 @@ ar:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY h:mm a"
@@ -359,13 +358,17 @@ ar:
     bookmarks:
       created: "لقد وضعت علامة مرجعية علي هذا المنشور"
       not_bookmarked: "أشر هذا المكتوب"
-      created_with_reminder: "لقد أشرت هذا المكتوب بتذكير عند %{date}"
       remove: "أزل العلامة المرجعية"
       confirm_clear: "هل أنت متأكد من مسح جميع الاشعارات المرجعية من هذا الموضوع؟"
       save: "احفظ"
       no_timezone: 'لم تحدد منظقتك الزمنية بعد. لن تتمكن من تفعيل التذكيرات. حددها <a href="%{basePath}/my/preferences/profile">في ملفك الشخصي</a>.'
       reminders:
         at_desktop: "في المرة القادمة سأكون عند مكتبي"
+        later_today: "في وقت لاحق اليوم"
+        tomorrow: "غداً"
+        next_week: "الاسبوع القادم"
+        later_this_week: "في وقت لاحق هذا الاسبوع"
+        next_month: "الشهر القادم"
     drafts:
       resume: "أكمل"
       remove: "احذف"
@@ -435,6 +438,8 @@ ar:
           title: "قيد الانتظار"
         rejected:
           title: "مرفوض"
+        deleted:
+          title: "محذوف"
       types:
         reviewable_user:
           title: "مستخدم"
@@ -473,6 +478,7 @@ ar:
       days_visited_long: "أيام الزيارة"
       posts_read: "المقروءة"
       posts_read_long: "المنشورات المقروءة"
+      last_updated: "اخر تحديث"
       total_rows:
         zero: "لا أعضاء"
         one: "عضو واحد"
@@ -833,9 +839,6 @@ ar:
         success_staff: "لقد قمنا بأرسال بريدا إلكتروني الى عنوانك الحالي, رجاء اتبع تعليمات التأكيد."
       change_avatar:
         title: "غيّر صورة الملفك الشخصي"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>، من"
-        gravatar_title: "غير صورتك الشخصية على موقع Gravatar's."
-        refresh_gravatar_title: "حدث صورة Gravatar"
         letter_based: "صورة الملف الشخصي الافتراضية"
         uploaded_avatar: "صورة مخصصة"
         uploaded_avatar_empty: "اضافة صورة مخصصة"
@@ -1088,6 +1091,8 @@ ar:
         back: "الرجوع"
         again: "أعد المحاولة"
         fixed: "حمل الصفحة"
+    modal:
+      close: "أغلق"
     close: "اغلق"
     assets_changed_confirm: "حُدث الموقع لتوّه. أتريد تحديث الصفحة ورؤية أحدث إصدار؟"
     logout: "لقد سجلت خروج."
@@ -1249,7 +1254,6 @@ ar:
       filter_placeholder: بحث عن الرموز التعبيرية
       objects: اشياء
       flags: الأبلاغ
-      custom: الرموز التعبيرية المخصصة
       recent: تم استخدامه مؤخراً
       default_tone: لون البشرة إفتراضي
       light_tone: لون البشرة أبيض
@@ -1257,6 +1261,7 @@ ar:
       medium_tone: لون بشرة اسمر
       medium_dark_tone: لون البشرة اسمر قاتم
       dark_tone: لون البشرة داكن
+      default: الرموز التعبيرية المخصصة
     composer:
       emoji: "الرموز التعبيرية :)"
       more_emoji: "أكثر..."
@@ -1350,6 +1355,7 @@ ar:
       mentioned: "<span>{{username}}</span>{{description}}"
       group_mentioned: "<span>{{username}}</span>{{description}} "
       quoted: "<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}} "
@@ -2053,6 +2059,7 @@ ar:
             title: "اظهر جزء الـ HTML من رسالة البريد الالكتروني"
             button: "HTML"
       bookmarks:
+        created: "أُنشئ في"
         name: "الإسم"
     category:
       can: "قادر علي&hellip;"
@@ -2621,7 +2628,11 @@ ar:
           view_graph: "رسم بياني"
           refresh_report: "تحديث التقرير "
           groups: "كل المجموعات"
+          total: "مجموع الوقت الكلي"
+          no_data: "لا توجد بيانات للعرض"
           filters:
+            file-extension:
+              label: إمتداد الملف
             group:
               label: المجموعة
             category:
@@ -2634,6 +2645,9 @@ ar:
           title: "مجموعة جديدة"
           create: "إنشاء:"
           name:
+            too_short: "إسم المجموعة قصير جداً"
+            too_long: "إسم المجموعة طويل جداً"
+            checking: "التأكد من توفر إسم المجموعة"
             available: "اسم المجموعة متاح"
             not_available: "اسم المجموعة غير متاح"
             blank: "يجب تحديد اسم للمجموعة"
@@ -3160,7 +3174,6 @@ ar:
           active: "النشطون"
           staff: "الطاقم"
           suspended: "موقوف"
-          suspect: "المريبون"
         approved: "موافقة؟"
         titles:
           active: "الأعضاء النشطون"
@@ -3175,7 +3188,6 @@ ar:
           admins: "الأعضاء المدراء"
           moderators: "المشرفون"
           suspended: "أعضاء موقوفين"
-          suspect: "الأعضاء المريبون"
         not_verified: "لم يتم التحقق"
         check_email:
           title: "اكشف عنوان البريد الإلكتروني لهذا العضو"
@@ -3196,6 +3208,7 @@ ar:
         suspended_until: "(حتى %{until})"
         cant_suspend: "لا يمكن ايقاف هذا العضو"
         delete_all_posts: "احذف كل مشاركاته"
+        penalty_post_actions: "ما الذي تريد فعله بالمشاركة المرتبطة؟"
         penalty_post_delete: "حذف الموضوع"
         penalty_post_edit: "تعديل الموضوع"
         delete_all_posts_confirm_MF: "أنت على وشك {POSTS, plural, zero {عدم حذف شيء} one {حذف مشاركة واحدة} two {حذف مشاركتين} few {حذف # مشاركات} many {حذف # مشاركة} other {حذف # مشاركة}}{TOPICS, plural, zero {} one { وموضوع واحد} two { وموضوعين} few { و# مواضيع} many {و# موضوعا} other {و# موضوع}}. أمتأكد؟"
@@ -3492,6 +3505,7 @@ ar:
         help: "أضف رموز تعبيرية جديدة التي سوف تكون متاحة للكل . (PROTIP: drag & drop multiple files at once)"
         add: "أضافة وجه تعبيري جديد ؟"
         name: "الأسم"
+        group: "المجموعة"
         image: "صورة"
         delete_confirm: "أمتأكّد من حذف الإيموجي :%{name}: هذا؟"
       embedding:
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index 0023ffd49c..0748fbdb2b 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -165,6 +165,8 @@ be:
       created: "вы дадалі гэты паведамленне ў закладкі"
       remove: "выдаліць закладку"
       save: "Захаваць"
+      reminders:
+        tomorrow: "заўтра"
     drafts:
       remove: "выдаліць"
       abandon:
@@ -277,6 +279,7 @@ be:
         title: "Дадаць удзельнікаў"
       requests:
         reason: "прычына"
+        handle: "звяртацца з просьбай аб членстве"
       manage:
         name: "Імя"
         full_name: "поўнае Імя"
@@ -475,8 +478,6 @@ be:
         error: "Пры змяненні адраса электроннай пошты адбылася памылка. Магчыма, гэты адрас ужо выкарыстоўваецца?"
         success: "Мы надсилалы ліст на гэтую скрыню. Выканайце інструкцыі па пидтердження."
       change_avatar:
-        gravatar_title: "Змяніць аватарку на сайце Gravatar"
-        refresh_gravatar_title: "Абнавіць мой Gravatar"
         letter_based: "Ваша выява дададзена сістэмай"
         uploaded_avatar: "Іншая выява"
         uploaded_avatar_empty: "Дадаць малюнак"
@@ -628,6 +629,8 @@ be:
         back: "вярнуцца"
         again: "Паспрабаваць яшчэ раз"
         fixed: "загрузка Старонкі"
+    modal:
+      close: "схаваць"
     close: "зачыніць"
     refresh: "абнавіць"
     read_only_mode:
@@ -1043,6 +1046,7 @@ be:
           side_by_side_markdown:
             title: "Паказаць непасрэдныя адрозненні побач"
       bookmarks:
+        created: "створаны"
         name: "Імя"
     category:
       can: "можа&hellip;"
@@ -1637,13 +1641,11 @@ be:
           staff: "персанал"
           suspended: "прыпыненыя"
           silenced: "глушыцелем"
-          suspect: "Магчыма крэмлебот"
         approved: "Адобрана?"
         titles:
           active: "Актыўныя карыстальнікі"
           new: "Новыя карыстальнікі"
           staff: "персанал"
-          suspect: "Крэмлеботы і тролі"
       user:
         suspend_reason: "прычына"
         silence_reason: "прычына"
@@ -1823,6 +1825,7 @@ be:
       emoji:
         title: "Абразкі"
         name: "Імя"
+        group: "Група"
         image: "Выява"
       embedding:
         confirm_delete: "Вы ўпэўненыя, што жадаеце выдаліць гэты хост?"
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index 9f1e68be00..cdc57a506d 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -26,9 +26,9 @@ bg:
         thousands: "{{number}}k "
         millions: "{{number}}M "
     dates:
-      time: "h:mm a"
+      time: "HH:mm"
+      time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -261,10 +261,10 @@ bg:
       save: "Запази"
       reminders:
         later_today: "По-късно днес"
-        next_business_day: "Следващият работен ден"
         tomorrow: "Утре"
-        next_week: "Следващата седмица"
-        next_month: "Следващият месец"
+        next_week: "Следваща седмица"
+        later_this_week: "По-късно тази седмица"
+        next_month: "Следващия месец"
     drafts:
       resume: "Продължи"
       remove: "Премахване"
@@ -746,9 +746,6 @@ bg:
         success_staff: "Изпратихме съобщение на този адрес. Моля, следвайте инструкциите за потвърждаване."
       change_avatar:
         title: "Сменете аватара на вашия профил "
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, базиран на"
-        gravatar_title: "Промени вашият аватар на сайта на Граватар"
-        refresh_gravatar_title: "Опреснете Gravatar"
         letter_based: "Системен аватар"
         uploaded_avatar: "Собствено изображение"
         uploaded_avatar_empty: "Добавете собствено изображение"
@@ -967,6 +964,8 @@ bg:
         back: "Назад"
         again: "Опитайте отново"
         fixed: "Заредете страницата"
+    modal:
+      close: "затвори"
     close: "Затвори"
     assets_changed_confirm: "Страницата беше обновена. Презаредете, за да видите последната версия."
     logout: "Вие бяхте отписан."
@@ -1679,6 +1678,7 @@ bg:
           side_by_side_markdown:
             title: "Покажи разликите на неподправения източник side-by-side "
       bookmarks:
+        created: "Създадени"
         name: "Име"
     category:
       can: "can&hellip;"
@@ -2541,7 +2541,6 @@ bg:
           active: "Активни"
           staff: "Персонал"
           suspended: "Отстранени"
-          suspect: "Съмнителен "
         approved: "Одобрен?"
         titles:
           active: "Активни потребители"
@@ -2556,7 +2555,6 @@ bg:
           admins: "Админи"
           moderators: "Модератори"
           suspended: "Отстранени"
-          suspect: "Съмнителни потребители "
         not_verified: "Непроверен "
         check_email:
           title: "Разкрий имейла на този потребител"
@@ -2834,6 +2832,7 @@ bg:
         help: "Добави нови емотикони, които ще бъдат достъпни до всички. (Съвет: Може да дръпнете и пуснете много файлове наведнъж). "
         add: "Добави нова емотикона "
         name: "Име "
+        group: "Група"
         image: "Изображение "
         delete_confirm: "Сигурни ли сте че искате да изтриете тази :%{name}% емотикона? "
       embedding:
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index a93fe0eb6b..951ae74885 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -29,7 +29,6 @@ bs_BA:
     dates:
       time: "HH: mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -287,17 +286,16 @@ bs_BA:
     bookmarks:
       created: "zabilježili ste ovu stranicu"
       not_bookmarked: "sačuvaj ovaj post"
-      created_with_reminder: "postavili ste zabilješku na ovu objavu s podsjetnikom %{date}"
       remove: "Ukloni zabilješku"
       confirm_clear: "Dali ste sigurni dali želite izbrisati sve sačuvane stvari iz ove teme?"
       save: "Sačuvaj"
       no_timezone: 'Još uvijek niste postavili vremensku zonu, tako da nećete biti u mogućnosti koristiti podsjetnike. Postavite vremensku zonu <a href="%{basePath}/my/preferences/profile">na vašem profilu</a>.'
       reminders:
         at_desktop: "Sljedeći put sam za svojim desktop kompjuterom"
-        later_today: "Danas, malo kasnije"
-        next_business_day: "Sljedeći radni dan"
-        tomorrow: "Sutradan"
+        later_today: "Kasnije danas"
+        tomorrow: "Sutra"
         next_week: "Sljedeće sedmice"
+        later_this_week: "Kasnije ove sedmice"
         next_month: "Sljedeći mjesec"
         custom: "Precizno vrijeme i datum"
     drafts:
@@ -1006,10 +1004,6 @@ bs_BA:
         success_staff: "Poslali smo email na vašu trenutnu email adresu. Molimo vas da tamo slijedite instrukcije za potvrdu aktivacije."
       change_avatar:
         title: "Promjeni sliku"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baziran na"
-        gravatar_title: "Promjenite vaš avatar na Gravatar web stranici."
-        gravatar_failed: "Nismo mogli pronaći Gravatar s tom adresom e-pošte."
-        refresh_gravatar_title: "Osvježi Gravatar"
         letter_based: "Avatar dodjeljen od sistema"
         uploaded_avatar: "Vaša slika"
         uploaded_avatar_empty: "Dodajte vašu sliku"
@@ -1302,6 +1296,8 @@ bs_BA:
         back: "Idi nazad"
         again: "Pokušaj ponovo"
         fixed: "Učitaj stranicu"
+    modal:
+      close: "zatvori"
     close: "Zatvori"
     assets_changed_confirm: "Ovaj sajt je upravo unaprijeđen. Osvježiti odmah stranicu za novu verziju?"
     logout: "Izlogovani ste."
@@ -1523,7 +1519,6 @@ bs_BA:
       objects: Objekti
       symbols: Simboli
       flags: Prijave
-      custom: Sopstveni emotikoni
       recent: Skoro korišteno
       default_tone: Bez tona
       light_tone: Svijetli ton
@@ -1531,6 +1526,7 @@ bs_BA:
       medium_tone: Srednji ton
       medium_dark_tone: Srednje tamni ton
       dark_tone: Tamni ton
+      default: Sopstveni emotikoni
     shared_drafts:
       title: "Dijeljene skice"
       notice: "Ova tema je vidljiva onima koji mogu da vide <b>{{category}}</b> kategoriju."
@@ -1681,6 +1677,7 @@ bs_BA:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -2463,6 +2460,7 @@ bs_BA:
             title: "Prikažite html dio e-maila"
             button: "HTML"
       bookmarks:
+        created: "Kreiran"
         name: "Ime"
     category:
       can: "can&hellip; "
@@ -3841,7 +3839,6 @@ bs_BA:
           staff: "Staff"
           suspended: "Suspended"
           silenced: "Stišano"
-          suspect: "Osumnjičeni"
           staged: "Priređen"
         approved: "Approved?"
         titles:
@@ -3858,7 +3855,6 @@ bs_BA:
           moderators: "Moderators"
           silenced: "Stišani korisnici"
           suspended: "Suspended Users"
-          suspect: "Osumnjičeni korisnici"
           staged: "Upućeni korisnici"
         not_verified: "Not verified"
         check_email:
@@ -4201,6 +4197,7 @@ bs_BA:
         help: "Dodajte novi emotikon koji će biti dostupan svima. (PROTIP: povlačenje i ispuštanje više datoteka odjednom)"
         add: "Dodaj novi emoji"
         name: "Ime"
+        group: "Grupa"
         image: "Slika"
         delete_confirm: "Jeste li sigurni da želite izbrisati: %{name}: emoji?"
       embedding:
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 2eaf662830..87c1130152 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -28,7 +28,6 @@ ca:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM YYYY HH:mm"
@@ -152,6 +151,7 @@ ca:
       banner:
         enabled: "convertit en bàner %{when}. Apareixerà a dalt de cada pàgina fins que sigui descartat per l'usuari."
         disabled: "ha suprimit aquest bàner %{when}. No apareixerà més a dalt de cada pàgina."
+    topic_admin_menu: "accions del tema"
     wizard_required: "Us donem la benvinguda al vostre nou Discourse! Comencem amb <a href='%{url}' data-auto-route='true'>l'assistent de configuració</a> ✨"
     emails_are_disabled: "Tots els correus sortints han estat globalment inhabilitats per un administrador. No s'enviarà cap notificació de cap mena per correu electrònic."
     bootstrap_mode_enabled: "Per a facilitar el llançament del vostre lloc web nou, esteu en mode d'arrencada. Tots els usuaris nous tindran el nivell de confiança 1 i tindran activitats els correus de resum diari. Això es desactivarà automàticament quan s'hi hagin unit %{min_users} usuaris."
@@ -264,6 +264,12 @@ ca:
       remove: "Elimina preferit"
       confirm_clear: "Esteu segur que voleu eliminar tots els preferits d'aquest tema?"
       save: "Desa"
+      reminders:
+        later_today: "Més tard avui"
+        tomorrow: "Demà"
+        next_week: "La setmana que ve"
+        later_this_week: "Més avant aquesta setmana"
+        next_month: "El mes que ve"
     drafts:
       resume: "Reprèn"
       remove: "Elimina"
@@ -309,6 +315,9 @@ ca:
       install_banner: "Voleu <a href>instal·lar %{title} en aquest dispositiu?</a>"
     choose_topic:
       none_found: "No s'ha trobat temes."
+      title:
+        search: "Cerca un tema"
+        placeholder: "escriviu el títol, l’URL o l’identificador del tema aquí"
     choose_message:
       none_found: "No s'han trobat missatges."
     review:
@@ -519,6 +528,7 @@ ca:
         deny: "Denega"
         denied: "denegat"
         undone: "sol·licitud revertida"
+        handle: "gestiona la sol·licitud d'afiliació"
       manage:
         title: "Gestiona"
         name: "Nom"
@@ -559,6 +569,7 @@ ca:
       leave: "Abandona"
       request: "Sol·licita"
       message: "Missatge"
+      allow_membership_requests: "Permet als usuaris d'enviar sol·licituds d'afiliació als propietaris del grup (requereix un grup visible públicament)"
       membership_request_template: "Plantilla personalitzada que es mostra als usuaris quan envien una sol·licitud d'afiliació"
       membership_request:
         submit: "Envia sol·licitud"
@@ -940,10 +951,10 @@ ca:
         success_staff: "S'ha enviat un missatge a la vostra adreça actual. Seguiu les instruccions de confirmació."
       change_avatar:
         title: "Canvia la foto de perfil"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basat en"
-        gravatar_title: "Canvieu l'avatar en el lloc web de Gravatar"
-        gravatar_failed: "No s'ha pogut trobar un Gravatar amb aquesta adreça de correu."
-        refresh_gravatar_title: "Actualitza el Gravatar"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, basat en"
+        gravatar_title: "Canvieu el vostre avatar en el lloc web de {{gravatarName}}"
+        gravatar_failed: "No hem trobat un {{gravatarName}} amb aquesta adreça de correu electrònic."
+        refresh_gravatar_title: "Actualitzeu el vostre {{gravatarName}}"
         letter_based: "Foto de perfil assignada pel sistema"
         uploaded_avatar: "Foto personalitzada"
         uploaded_avatar_empty: "Afegeix una foto personalitzada"
@@ -1090,6 +1101,7 @@ ca:
         search: "escriu aquí per a cercar invitacions..."
         title: "Invitacions"
         user: "Usuari convidat"
+        sent: "Darrer enviat"
         none: "Cap invitació per a mostrar."
         truncated:
           one: "Mostrant la primera invitació."
@@ -1222,6 +1234,8 @@ ca:
         back: "Vés enrere"
         again: "Torna-ho a intentar"
         fixed: "Carrega la pàgina"
+    modal:
+      close: "tanca"
     close: "Tanca"
     assets_changed_confirm: "El lloc web s'ha actualitzat. Voleu tornar a carregar la pàgina per a la versió més recent?"
     logout: "Heu tancat la sessió."
@@ -1300,6 +1314,8 @@ ca:
       reset: "Restableix la contrasenya"
       complete_username: "Si hi ha algun compte que correspongui a l'usuari <b>%{username}</b>, hauríeu de rebre aviat un correu amb instruccions per a restablir la contrasenya."
       complete_email: "Si hi ha algun compte que correspon a l'adreça <b>%{email}</b>, hauríeu de rebre aviat un correu amb instruccions per a restablir la contrasenya."
+      complete_username_found: "Hem trobat un compte que correspon al nom d'usuari <b>%{username}</b>. Hauríeu de rebre un correu amb instruccions per a restablir la contrasenya."
+      complete_email_found: "Hem trobat un compte que correspon a l'adreça <b>%{email}</b>. Hauríeu de rebre aviat un correu amb instruccions per a restablir la contrasenya."
       complete_username_not_found: "No hi ha cap compte que coincideixi amb el nom d'usuari <b>%{username}</b>"
       complete_email_not_found: "Cap compte no coincideix amb <b>%{email}</b>"
       help: "No arriba el correu? Comproveu primer la carpeta de correu brossa. <p>No esteu segur de quina adreça heu fet servir? Introduïu una adreça i us farem saber si existeix.</p> <p>Si ja no teniu accés a l'adreça del vostre compte, poseu-vos en contacte amb <a href='%{basePath}/about'>el nostre equip responsable</a></p>."
@@ -1448,7 +1464,6 @@ ca:
       objects: Objectes
       symbols: Símbols
       flags: Banderes
-      custom: Emojis personalitzats
       recent: Usats recentment
       default_tone: Sense to de pell
       light_tone: To de pell clar
@@ -1456,6 +1471,7 @@ ca:
       medium_tone: To de pell mitjà
       medium_dark_tone: To de pell fosc mitjà
       dark_tone: To de pell fosc
+      default: Emojis personalitzats
     shared_drafts:
       title: "Esborranys compartits"
       notice: "Aquest tema sols és visible per als qui poden veure la categoria <b>{{category}}</b>."
@@ -1521,6 +1537,7 @@ ca:
       view_new_post: "Mostra la nova publicació."
       saving: "Desant"
       saved: "Desat!"
+      saved_draft: "Publica l'esborrany en curs. Toqueu per a continuar."
       uploading: "Carregant..."
       show_preview: "mostra la previsualització &raquo; "
       hide_preview: "&laquo; amaga la previsualització"
@@ -1603,6 +1620,7 @@ ca:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -2305,6 +2323,9 @@ ca:
           notify_moderators: "s'ha notificat els moderadors"
           notify_user: "ha enviat un missatge"
           bookmark: "marcat com a preferit"
+          like:
+            one: "ha fet 'M'agrada' "
+            other: "han fet 'M'agrada' "
           like_capped:
             one: "i {{count}}més han dit que els agrada"
             other: "i {{count}}més han dit que els agrada"
@@ -2358,6 +2379,7 @@ ca:
             title: "Mostra la part HTML del correu electrònic"
             button: "HTML"
       bookmarks:
+        created: "Creat"
         name: "Nom"
     category:
       can: "pot&hellip; "
@@ -3750,7 +3772,6 @@ ca:
           staff: "Equip responsable"
           suspended: "Suspesos"
           silenced: "Silenciat"
-          suspect: "Sospitós"
           staged: "Fictici"
         approved: "Aprovat?"
         titles:
@@ -3767,7 +3788,6 @@ ca:
           moderators: "Moderadors"
           silenced: "Usuaris silenciats"
           suspended: "Usuaris suspesos"
-          suspect: "Usuaris sospitosos"
           staged: "Usuaris ficticis"
         not_verified: "No verificat"
         check_email:
@@ -4118,6 +4138,7 @@ ca:
         help: "Afegeix un nou emoji que estarà disponible per a tothom. (CONSELL: arrossegueu i deixeu anar molts fitxers de cop)"
         add: "Afegeix emoji nou"
         name: "Nom"
+        group: "Grup"
         image: "Imatge"
         delete_confirm: "Esteu segur que voleu suprimir l'emoji :%{name}:?"
       embedding:
@@ -4144,7 +4165,6 @@ ca:
         save: "Desa la configuració d'incrustacions"
       permalink:
         title: "Enllaços permanents"
-        description: "Tingueu en compte que sols s'aplica a fonts externes. Els enllaços publicats en el vostre fòrum no seran redirigits."
         url: "URL"
         topic_id: "ID de tema"
         topic_title: "Tema"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 6353c5eb02..ce4c780729 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -30,7 +30,6 @@ cs:
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMMM, H:mm"
       long_no_year_no_time: "D. MMMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. M. YYYY, H:mm"
@@ -293,6 +292,12 @@ cs:
       remove: "Odstranit záložku"
       confirm_clear: "Opravdu chcete odstranit všechny své záložky z tohoto tématu?"
       save: "Uložit"
+      reminders:
+        later_today: "Později během dnešního dne"
+        tomorrow: "Zítra"
+        next_week: "Další týden"
+        later_this_week: "Později během tohoto týdne"
+        next_month: "Další měsíc"
     drafts:
       resume: "Pokračovat"
       remove: "Odstranit"
@@ -799,10 +804,6 @@ cs:
         success_staff: "Na vaši aktuální adresu jsme zaslali email. Následujte prosím instrukce v tomto emailu."
       change_avatar:
         title: "Změňte si svůj profilový obrázek"
-        gravatar: "Založeno na <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>u"
-        gravatar_title: "Změňte si avatar na webových stránkách Gravatar"
-        gravatar_failed: "Nemohli sme najít Gravatar asociován s touto email adresou."
-        refresh_gravatar_title: "Obnovit Gravatar"
         letter_based: "Systémem přidělený profilový obrázek"
         uploaded_avatar: "Vlastní obrázek"
         uploaded_avatar_empty: "Přidat vlastní obrázek"
@@ -1075,6 +1076,8 @@ cs:
         back: "Zpět"
         again: "Zkusit znovu"
         fixed: "Nahrávám"
+    modal:
+      close: "zavřít"
     close: "Zavřít"
     assets_changed_confirm: "Tento web se právě aktualizoval. Chcete obnovit stránku a mít nejnovější verzi?"
     logout: "Byli jste odhlášeni."
@@ -1272,7 +1275,6 @@ cs:
       filter_placeholder: Hledat emoji
       objects: Objekty
       flags: Nahlášení
-      custom: Vlastní emoji
       recent: Nedávno použité
       default_tone: Bez barvy pleti
       light_tone: Světlá pleť
@@ -1280,6 +1282,7 @@ cs:
       medium_tone: Mírně hnědá pleť
       medium_dark_tone: Hnědá pleť
       dark_tone: Černá pleť
+      default: Vlastní emoji
     shared_drafts:
       title: "Sdílené koncepty"
       notice: "Toto téma uvidí pouze uživatelé, kteří mohou vidět kategorii <b>{{category}}</b>"
@@ -1423,6 +1426,7 @@ cs:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -2156,6 +2160,7 @@ cs:
             title: "Zobrazit html část emailu"
             button: "HTML"
       bookmarks:
+        created: "Vytvořený"
         name: "Jméno"
     category:
       can: "smí&hellip; "
@@ -3324,7 +3329,6 @@ cs:
           staff: "Redakce"
           suspended: "Zakázaní"
           silenced: "Ztišení"
-          suspect: "Podezřelí"
           staged: "Staged"
         approved: "Schválen?"
         titles:
@@ -3341,7 +3345,6 @@ cs:
           moderators: "Moderátoři"
           silenced: "Ztišení uživatelé"
           suspended: "Zakázaní uživatelé"
-          suspect: "Podezřelí uživatelé"
         not_verified: "Neověřeno"
         check_email:
           title: "Odhal emailovou adresu tohoto uživatele"
@@ -3671,6 +3674,7 @@ cs:
         help: "Vložte nové emoji, které bude dostupné pro všechny na fóru. (Protip: můžete přetáhnout několik souborů najednou.)"
         add: "Vložit nový Emoji"
         name: "Název"
+        group: "Skupina"
         image: "Obrázek"
         delete_confirm: "Určitě chcete smazat :%{name}: emoji?"
       embedding:
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index e4435f7242..827fb87e22 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -28,7 +28,6 @@ da:
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMM, HH:mm"
       long_no_year_no_time: "D. MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. MMM YYYY HH:mm"
@@ -265,9 +264,11 @@ da:
       confirm_clear: "Er du sikker på, at du vil rydde alle dine bogmærker fra dette emne?"
       save: "Gem"
       reminders:
+        later_today: "Senere i dag"
         tomorrow: "I morgen"
         next_week: "Næste uge"
-        next_month: "Næste måned"
+        later_this_week: "Senere på ugen"
+        next_month: "Næste Månede"
         custom: "Valgfri dato og tid"
     drafts:
       resume: "Genoptag"
@@ -947,10 +948,6 @@ da:
         success_staff: "Vi har sendt en email til din nuværende adresse. Følg bekræftelsesinstruktionerne."
       change_avatar:
         title: "Skift dit profilbillede"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baseret på"
-        gravatar_title: "Skift din avatar på Gravatar's site"
-        gravatar_failed: "Vi kunne ikke finde en Gravatar med den emailadresse"
-        refresh_gravatar_title: "Gendindlæs dit profil billede"
         letter_based: "System tildelt profilbillede"
         uploaded_avatar: "Brugerdefineret profil billede"
         uploaded_avatar_empty: "Tilføj et brugerdefineret profil billede"
@@ -1226,6 +1223,8 @@ da:
         back: "Gå tilbage"
         again: "Prøv igen"
         fixed: "Indlæs side"
+    modal:
+      close: "luk"
     close: "Luk"
     assets_changed_confirm: "Dette site er lige blevet opdateret. Vil du opdatere nu til den seneste version?"
     logout: "Du er blevet logget ud."
@@ -1440,7 +1439,6 @@ da:
       objects: Objekter
       symbols: Symboler
       flags: Markeringer
-      custom: Brugerdefineret humørikoner
       recent: For nylig brugt
       default_tone: Ingen hudfarve
       light_tone: Lys hudfarve
@@ -1448,6 +1446,7 @@ da:
       medium_tone: Medium hudfarve
       medium_dark_tone: Medium mørk hudfarve
       dark_tone: Mørk skin tone
+      default: Brugerdefineret humørikoner
     shared_drafts:
       title: "Delte kladder"
       notice: "Dette emne er kun synligt for dem, der kan se kategorien <b>{{category}}</b> ."
@@ -1593,6 +1592,7 @@ da:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -2343,6 +2343,7 @@ da:
             title: "Vis html-delen af e-mailen"
             button: "HTML"
       bookmarks:
+        created: "Oprettet"
         name: "Navn"
     category:
       can: "kan&hellip; "
@@ -3695,7 +3696,6 @@ da:
           staff: "Personale"
           suspended: "Suspenderet"
           silenced: "Mådeholdt (silenced)"
-          suspect: "Mistænkt"
           staged: "Iscenesat"
         approved: "Godkendt?"
         titles:
@@ -3712,7 +3712,6 @@ da:
           moderators: "Moderatorer"
           silenced: "Mådeholdte (silenced) brugere "
           suspended: "Suspenderede brugere"
-          suspect: "Mistænkte brugere"
           staged: "Iscenesatte brugere"
         not_verified: "Ikke verificeret"
         check_email:
@@ -4061,6 +4060,7 @@ da:
         help: "Tilføj en ny emoji, som vil være tilgængelig for alle. (PROTIP: drag & drop flere filer på én gang)"
         add: "Tilføj ny emoji"
         name: "Navn"
+        group: "Gruppe"
         image: "Billede"
         delete_confirm: "Er du sikker på du vil slette emojien: %{name} ?"
       embedding:
@@ -4087,7 +4087,6 @@ da:
         save: "Gem indlejrings-indstillinger"
       permalink:
         title: "Permalinks"
-        description: "Bemærk, at dette kun gælder for eksterne kilder. Links, der er lagt ud på dit forum, bliver ikke omdirigeret."
         url: "URL"
         topic_id: "Emne ID"
         topic_title: "Emne"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 26b948f584..6b589d8154 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -29,7 +29,6 @@ de:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMM, [um] HH:mm"
       long_no_year_no_time: "D. MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. MMM YYYY [um] HH:mm"
@@ -264,7 +263,6 @@ de:
     bookmarks:
       created: "du hast ein Lesezeichen zu diesem Beitrag hinzugefügt"
       not_bookmarked: "Lesezeichen auf diesen Beitrag setzen"
-      created_with_reminder: "Du hast diesem Beitrag ein Lesezeichen hinzugefügt mit einer Erinnerung am %{date}"
       remove: "Lesezeichen entfernen"
       confirm_clear: "Bist du sicher, dass du alle Lesezeichen in diesem Thema entfernen möchtest? "
       save: "Speichern"
@@ -272,9 +270,9 @@ de:
       reminders:
         at_desktop: "Nächstes mal wenn ich an meinem PC bin"
         later_today: "Im Laufe des Tages"
-        next_business_day: "Nächster Geschäftstag"
         tomorrow: "Morgen"
         next_week: "Nächste Woche"
+        later_this_week: "Später in dieser Woche"
         next_month: "Nächster Monat"
         custom: "Eigenes Datum und Zeit"
     drafts:
@@ -539,6 +537,7 @@ de:
         deny: "ablehnen"
         denied: "abgelehnt"
         undone: "Anfrage zurückgenommen"
+        handle: "Mitgliedschaftsanfrage bearbeiten"
       manage:
         title: "Verwalten"
         name: "Name"
@@ -816,7 +815,7 @@ de:
           Diese Einstellung überschreibt die Aktivitäts-Übersicht.<br />
           Stummgeschaltete Themen und Kategorien werden in diese E-Mails nicht eingeschlossen.
         individual: "Für jeden Beitrag eine E-Mail senden"
-        individual_no_echo: "Sende für alle fremden Beträge eine Email"
+        individual_no_echo: "Sende für alle fremden Beträge eine E-Mail"
         many_per_day: "Sende mir für jeden neuen Beitrag eine E-Mail (etwa {{dailyEmailEstimate}} pro Tag)"
         few_per_day: "Sende mir für jeden neuen Beitrag eine E-Mail (etwa 2 pro Tag)"
         warning: "Mailinglisten-Modus aktiviert. Einstellungen zur Benachrichtigung per E-Mail werden nicht berücksichtigt."
@@ -967,10 +966,6 @@ de:
         success_staff: "Wir haben eine E-Mail an deine aktuelle Adresse geschickt. Bitte folge den Bestätigungsanweisungen."
       change_avatar:
         title: "Ändere dein Profilbild"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basierend auf"
-        gravatar_title: "Ändere deinen Avatar auf der Gravatar-Webseite"
-        gravatar_failed: "Wir konnten kein Gravatar für diese E-Mail-Adresse finden."
-        refresh_gravatar_title: "Deinen Gravatar aktualisieren"
         letter_based: "ein vom System zugewiesenes Profilbild"
         uploaded_avatar: "Eigenes Bild"
         uploaded_avatar_empty: "Eigenes Bild hinzufügen"
@@ -1231,7 +1226,7 @@ de:
       stream:
         posted_by: "Verfasst von"
         sent_by: "Gesendet von"
-        private_message: "Nachricht"
+        private_message: "Senden"
         the_topic: "das Thema"
     loading: "Wird geladen…"
     errors:
@@ -1253,6 +1248,8 @@ de:
         back: "Zurück"
         again: "Erneut versuchen"
         fixed: "Seite laden"
+    modal:
+      close: "Schließen"
     close: "Schließen"
     assets_changed_confirm: "Diese Website wurde gerade aktualisiert. Neu laden für die neuste Version?"
     logout: "Du wurdest abgemeldet."
@@ -1484,7 +1481,6 @@ de:
       objects: Objekte
       symbols: Symbole
       flags: Flaggen
-      custom: Benutzerdefinierte Emojis
       recent: Zuletzt verwendet
       default_tone: Keine Hautfarbe
       light_tone: Helle Hautfarbe
@@ -1492,6 +1488,7 @@ de:
       medium_tone: Mittlere Hautfarbe
       medium_dark_tone: Mittel-dunkle Hautfarbe
       dark_tone: Dunkle Hautfarbe
+      default: Benutzerdefinierte Emojis
     shared_drafts:
       title: "Gemeinsame Vorlagen"
       notice: "Das Thema ist nur sichtbar für die, die die <b>{{category}}</b>-Kategorie sehen können."
@@ -1641,6 +1638,7 @@ de:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -2417,9 +2415,8 @@ de:
             button: "HTML"
       bookmarks:
         create: "Lesezeichen erstellen"
+        created: "Erstellt"
         name: "Name"
-        name_placeholder: "Gib dem Lesezeichen einen Namen, um dein Gedächtnis zu unterstützen"
-        set_reminder: "Erstelle eine Erinnerung"
         actions:
           delete_bookmark:
             name: "Lesezeichen löschen"
@@ -3585,7 +3582,7 @@ de:
         refresh: "Aktualisieren"
         send_digest_label: "Sende das Ergebnis an:"
         send_digest: "Senden"
-        sending_email: "Sende Email..."
+        sending_email: "Sende E-Mail..."
         format: "Format"
         html: "HTML"
         text: "Text"
@@ -3846,7 +3843,6 @@ de:
           staff: "Team"
           suspended: "Gesperrt"
           silenced: "Stummgeschaltet"
-          suspect: "Verdächtig"
           staged: "Vorbereitet"
         approved: "Genehmigt?"
         titles:
@@ -3863,7 +3859,6 @@ de:
           moderators: "Moderatoren"
           silenced: "Stummgeschaltete Benutzer"
           suspended: "Gesperrte Benutzer"
-          suspect: "Verdächtige Benutzer"
           staged: "Vorbereite Benutzer"
         not_verified: "Nicht überprüft"
         check_email:
@@ -4222,6 +4217,7 @@ de:
         help: "Neues Emoji hinzufügen, das für alle verfügbar sein wird. (Tipp: per Drag & Drop kannst du gleichzeitig mehrere Dateien hinzufügen)"
         add: "Neues Emoji hinzufügen"
         name: "Name"
+        group: "Gruppe"
         image: "Bild"
         delete_confirm: "Möchtest du wirklich das :%{name}: Emoji löschen?"
       embedding:
@@ -4248,7 +4244,6 @@ de:
         save: "Einbettungseinstellungen speichern"
       permalink:
         title: "Permanentlinks"
-        description: "Bitte beachte: dies trifft nur auf externe Quellen zu, in deinem Forum gepostete Links werden nicht umgeleitet."
         url: "URL"
         topic_id: "Themen-ID"
         topic_title: "Thema"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 810484e771..0d5e89c6d5 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -28,7 +28,6 @@ el:
     dates:
       time: "ΗΗ:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "DD MMM, HH:mm"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY HH:mm"
@@ -231,6 +230,12 @@ el:
       created: "έχεις προσθέσει σελιδοδείκτη σε αυτή την ανάρτηση"
       remove: "Αφαίρεση Σελιδοδείκτη"
       save: "Αποθήκευση"
+      reminders:
+        later_today: "Αργότερα σήμερα"
+        tomorrow: "Αύριο"
+        next_week: "Την άλλη εβδομάδα"
+        later_this_week: "Αργότερα αυτή την εβδομάδα"
+        next_month: "Τον άλλο μήνα"
     drafts:
       remove: "Αναίρεση Πρόσκλησης"
       abandon:
@@ -661,9 +666,6 @@ el:
         success_staff: "Στείλαμε ένα email στην τρέχουσα διεύθυνσή σας. Παρακαλούμε ακολουθήστε τις οδηγίες επικύρωσης."
       change_avatar:
         title: "Αλλαγή της φωτογραφίας του προφίλ σου"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, που βασίζεται σε"
-        gravatar_title: "Άλλαξε το άβατάρ σου στην ιστοσελίδα Gravatar "
-        refresh_gravatar_title: "Ανανέωσε το Gravatar σου"
         letter_based: "Εικόνα προφίλ που ανέθεσε το σύστημα"
         uploaded_avatar: "Προσαρμοσμένη εικόνα"
         uploaded_avatar_empty: "Πρόσθεσε μια δική σου εικόνα"
@@ -895,6 +897,8 @@ el:
         back: "Πίσω"
         again: "Δοκίμασε ξανά"
         fixed: "Φόρτωση Σελίδας"
+    modal:
+      close: "κλείσιμο"
     close: "Κλείσιμο"
     assets_changed_confirm: "Αυτή η ιστοσελίδα μόλις ενημερώθηκε. Να ανανεωθεί τώρα για να φανεί η τελευταία έκδοση;"
     logout: "Αποσυνδέθηκες."
@@ -1055,7 +1059,6 @@ el:
       filter_placeholder: Αναζήτηση για emoji
       objects: Αντικείμενα
       flags: Σημάνσεις
-      custom: Προσαρμοσμένα emojis
       recent: Πρόσφατα χρησιμοποιημένα
       default_tone: Χωρίς απόχρωση επιδερμίδας
       light_tone: Λευκή απόχρωση επιδερμίδας
@@ -1063,6 +1066,7 @@ el:
       medium_tone: Μέτρια απόχρωση επιδερμίδας
       medium_dark_tone: Σκουρόχρωμη απόχρωση επιδερμίδας
       dark_tone: Σκούρη απόχρωση επιδερμίδας
+      default: Προσαρμοσμένα emojis
     composer:
       emoji: "Emoji :)"
       more_emoji: "περισσότερα..."
@@ -1152,6 +1156,7 @@ el:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -1769,6 +1774,7 @@ el:
             title: "Εμφάνιση του τμήματος html του email"
             button: "HTML"
       bookmarks:
+        created: "Δημιουργήθηκε"
         name: "Όνομα"
     category:
       can: "μπορεί&hellip; "
@@ -2818,7 +2824,6 @@ el:
           staff: "Συνεργάτες"
           suspended: "Αποβλημένοι"
           silenced: "Σιγήθηκαν"
-          suspect: "Ύποπτο"
         approved: "Εγκεκριμένο;"
         titles:
           active: "Ενεργοί Χρήστες"
@@ -2834,7 +2839,6 @@ el:
           moderators: "Συντονιστές"
           silenced: "Σιγημένοι Χρήστες"
           suspended: "Αποβλημένοι Χρήστες"
-          suspect: "Ύποπτοι χρήστες"
         not_verified: "Μη επαληθευμένος"
         check_email:
           title: "Εμφάνισε το email αυτού του χρήστη"
@@ -3146,6 +3150,7 @@ el:
         help: "Πρόσθεσε ένα νέο emoji που θα είναι διαθέσιμο σε όλους. (Συμβουλή: μπορείς να σύρεις πολλά αρχεία ταυτόχρονα)"
         add: "Προσθήκη νέου emoji"
         name: "Όνομα"
+        group: "Ομάδα"
         image: "Εικόνα"
         delete_confirm: "Είσαι σίγουρος ότι θέλεις να διαγράψεις το emoji :%{name}:;"
       embedding:
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 8a417d3868..401ee44dff 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -29,7 +29,6 @@ es:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY HH:mm"
@@ -264,19 +263,22 @@ es:
     bookmarks:
       created: "has marcado esta publicación"
       not_bookmarked: "marcar esta publicación"
-      created_with_reminder: "Guardaste esta publicación en marcadores con un recordatorio el %{date}"
+      created_with_at_desktop_reminder: "guardaste esta publicación en marcadores y se te recordará la próxima vez que estés en tu computadora"
       remove: "Eliminar marcador"
       confirm_clear: "¿Estás seguro de que deseas eliminar todos tus marcadores en este tema?"
       save: "Guardar"
       no_timezone: 'No has establecido una zona horaria todavía. No podrás establecer recordatorios. Puedes elegir una <a href="%{basePath}/my/preferences/profile">en tu perfil</a>.'
+      invalid_custom_datetime: "La fecha y hora que suministraste es inválida. Por favor, intenta de nuevo."
+      list_permission_denied: "No tienes permiso para ver los marcadores de este usuario."
       reminders:
         at_desktop: "La próxima vez que esté en mi ordenador"
-        later_today: "Más tarde hoy"
-        next_business_day: "El próximo día hábil"
+        later_today: "Más tarde durante el día de hoy"
         tomorrow: "Mañana"
-        next_week: "La próxima semana"
-        next_month: "El mes que viene"
+        next_week: "Próxima semana"
+        later_this_week: "Esta misma semana"
+        next_month: "Próximo mes"
         custom: "Fecha y hora personalizadas"
+        none: "No se necesita recordatorio"
     drafts:
       resume: "Reanudar"
       remove: "Eliminar"
@@ -539,6 +541,7 @@ es:
         deny: "Denegar"
         denied: "denegado"
         undone: "solicitud deshecha"
+        handle: "atender solicitud de membresía"
       manage:
         title: "Gestionar"
         name: "Nombre"
@@ -766,6 +769,7 @@ es:
         clear:
           title: "Quitar filtros"
           warning: "¿Estás seguro de que quieres eliminar tu tema destacado?"
+      use_current_timezone: "Usar zona horaria actual"
       profile_hidden: "El perfil público de este usuario está oculto."
       expand_profile: "Expandir"
       collapse_profile: "Contraer"
@@ -866,6 +870,7 @@ es:
         deleted_posts: "publicaciones eliminadas"
         suspensions: "suspensiones"
         warnings_received: "avisos"
+        rejected_posts: "publicaciones rechazadas"
       messages:
         all: "Todos"
         inbox: "Bandeja de entrada"
@@ -941,6 +946,7 @@ es:
           title: "Autenticación basada en tokens"
           add: "Nuevo autenticador"
           default_name: "Mi autenticador"
+          name_and_code_required_error: "Debes introducir un nombre y un código de tu aplicación de autentificación."
         security_key:
           register: "Registrar"
           title: "Claves de seguridad"
@@ -951,6 +957,7 @@ es:
           edit: "Editar clave de seguridad"
           edit_description: "Nombre de la clave de seguridad"
           delete: "Eliminar"
+          name_required_error: "Debes introducir un nombre para tu llave de seguridad."
       change_about:
         title: "Cambiar «Acerca de mí»"
         error: "Ha ocurrido un error al cambiar este valor."
@@ -967,10 +974,10 @@ es:
         success_staff: "Hemos enviado un correo electrónico a tu dirección actual. Por favor, sigue las instrucciones de confirmación."
       change_avatar:
         title: "Cambiar tu imagen de perfil"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basado en"
-        gravatar_title: "Cambia tu avatar en el sitio web de Gravatar"
-        gravatar_failed: "No hemos encontrado ningún Gravatar con esta dirección de correo electrónico."
-        refresh_gravatar_title: "Actualizar tu Gravatar"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, basado en"
+        gravatar_title: "Cambia tu avatar en la pagina web de {{gravatarName}}"
+        gravatar_failed: "No pudimos encontrar un {{gravatarName}} con esa dirección de correo electrónico."
+        refresh_gravatar_title: "Actualiza tu {{gravatarName}}"
         letter_based: "Imagen de perfil asignada por el sistema"
         uploaded_avatar: "Foto personalizada"
         uploaded_avatar_empty: "Agrega una foto personalizada"
@@ -1033,6 +1040,9 @@ es:
         any: "cualquiera"
       password_confirmation:
         title: "Ingresa de nuevo la contraseña"
+      invite_code:
+        title: "Código de invitación"
+        instructions: "El registro de la cuenta requiere un código de invitación"
       auth_tokens:
         title: "Dispositivos utilizados recientemente"
         ip: "IP"
@@ -1253,6 +1263,8 @@ es:
         back: "Volver atrás"
         again: "Intentar de nuevo"
         fixed: "Cargar página"
+    modal:
+      close: "cerrar"
     close: "Cerrar"
     assets_changed_confirm: "Este sitio acaba de ser actualizado. ¿Quieres cargar la página de nuevo para ver la última versión?"
     logout: "Has cerrado sesión."
@@ -1261,6 +1273,12 @@ es:
       enabled: "Este sitio está en modo de solo lectura. Puedes continuar navegando pero algunas acciones como responder o dar me gusta no están disponibles por ahora."
       login_disabled: "Iniciar sesión está desactivado mientras el foro se encuentre en modo de solo lectura."
       logout_disabled: "Cerrar sesión está desactivado mientras el sitio se encuentre en modo de solo lectura."
+    too_few_topics_and_posts_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">¡Comencemos la discusión!</a> Hay {currentTopics, plural, un {<strong>#</strong> tema} otros {<strong>#</strong> temas}} y {currentPosts, plural, una {<strong>#</strong> publicación} otras {<strong>#</strong> publicaciones}}. Los visitantes necesitan más contenido para leer y responder – nosotros recomendamos al menos {requiredTopics, plural, un {<strong>#</strong> tema} otros {<strong>#</strong> temas}} y {requiredPosts, plural, una {<strong>#</strong> publicación} otras {<strong>#</strong> publicaciones}}. Solo los miembros del staff pueden ver este mensaje.
+    too_few_topics_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">¡Comencemos la discusión!</a> Hay {currentTopics, plural, un {<strong>#</strong> tema} otros {<strong>#</strong> temas}}. Los visitantes necesitan más contenido para leer y responder – nosotros recomendamos al menos {requiredTopics, plural, un {<strong>#</strong> tema} otros {<strong>#</strong> temas}}. Solo los miembros del staff pueden ver este mensaje.
+    too_few_posts_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">¡Comencemos la discusión!</a> Hay {currentPosts, plural, una {<strong>#</strong> publicación} otras {<strong>#</strong> publicaciones}}. Los visitantes necesitan más contenido para leer y responder – nosotros recomendamos al menos {requiredPosts, plural, una {<strong>#</strong> publicación} otras {<strong>#</strong> publicaciones}}. Solo los miembros del staff pueden ver este mensaje.
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} otros {# errors/hour}}</a> alcanzó el límite de la configuración del sitio de {limit, plural, one {# error/hour} otros {# errors/hour}}."
       reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} otros {# errors/minute}}</a> alcanzó el límite de la configuración del sitio de {limit, plural, one {# error/minute} otros {# errors/minute}}."
@@ -1482,7 +1500,6 @@ es:
       objects: Objetos
       symbols: Símbolos
       flags: Banderas
-      custom: Emojis personalizados
       recent: "Usados recientemente "
       default_tone: Sin tono de piel
       light_tone: Tono de piel claro
@@ -1490,6 +1507,7 @@ es:
       medium_tone: Tono de piel medio
       medium_dark_tone: Tono de piel medio oscuro
       dark_tone: Tono de piel oscuro
+      default: Emojis personalizados
     shared_drafts:
       title: "Borradores Compartidos"
       notice: "Este tema es visible solamente por quienes pueden ver la categoría <b>{{category}}</b>."
@@ -1639,6 +1657,7 @@ es:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -1689,6 +1708,7 @@ es:
         posted: "nueva publicación"
         moved_post: "publicación movida"
         linked: "enlazado"
+        bookmark_reminder: "recordatorio de marcador"
         granted_badge: "medalla concedida"
         invited_to_topic: "invitado al tema"
         group_mentioned: "grupo mencionado"
@@ -1917,6 +1937,7 @@ es:
       group_request_sent: "Tu solicitud de membresía al grupo fue enviada. Se te informará cuando seas aceptado."
       unread_indicator: "Ningún miembro ha leído todavía la última publicación de este tema."
       read_more_MF: "Hay { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 no leído</a> } other { <a href='{basePath}/unread'># no leídos</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{y } false { } other{}} <a href='{basePath}/new'>1 nuevo</a> tema} other { {BOTH, select, true{y } false { } other{}} <a href='{basePath}/new'># nuevos</a> temas} } restantes, o {CATEGORY, select, true {explora otros temas en {catLink}} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Ver todas las categorías
       view_latest_topics: ver los temas recientes
       suggest_create_topic: "¿Por qué no creas un tema?"
@@ -1927,6 +1948,7 @@ es:
         title: "Temporizador de temas"
         save: "Configurar temporizador"
         num_of_hours: "Número de horas:"
+        num_of_days: "Número de días:"
         remove: "Quitar temporizador"
         publish_to: "Publicar en:"
         when: "Cuando:"
@@ -1969,6 +1991,8 @@ es:
         title: "Hacer bump al tema automaticamente"
       reminder:
         title: "Recordarme"
+      auto_delete_replies:
+        title: "Eliminar respuestas automáticamente"
       status_update_notice:
         auto_open: "Este tema se abrirá automáticamente %{timeLeft}."
         auto_close: "Este tema se cerrará automáticamente %{timeLeft}."
@@ -1977,6 +2001,7 @@ es:
         auto_delete: "Este tema se eliminará automáticamente %{timeLeft}."
         auto_bump: "La fecha de este tema se actualizará %{timeLeft}."
         auto_reminder: "Te recordaremos sobre este tema %{timeLeft}."
+        auto_delete_replies: "Respuestas en este tema serán eliminadas automáticamente después de %{duration}."
       auto_close_title: "Configuración de cierre automático"
       auto_close_immediate:
         one: "El último post se publicó hace %{count} hora, por lo que el tema se cerrará inmediatamente."
@@ -2196,6 +2221,9 @@ es:
         instructions:
           one: "Por favor escoge el nuevo dueño del post de <b>@{{old_user}}</b>"
           other: "Por favor, escoge el nuevo dueño de las {{count}} publicaciones de <b>@{{old_user}}</b>"
+        instructions_without_old_user:
+          one: "Por favor, escoge un nuevo propietario para la publicación."
+          other: "Por favor, escoge un nuevo propietario para las {{count}} publicaciones"
       change_timestamp:
         title: "Cambiar marca horaria..."
         action: "cambiar marca horaria"
@@ -2415,9 +2443,10 @@ es:
             button: "HTML"
       bookmarks:
         create: "Crear marcador"
+        created: "Creado"
         name: "Nombre"
-        name_placeholder: "Ponle un nombre a la publicación que has guardado en marcadores para ayudarte a recordarla"
-        set_reminder: "Establecer un recordatorio"
+        name_placeholder: "¿Para qué es este marcador?"
+        set_reminder: "Recuérdame"
         actions:
           delete_bookmark:
             name: "Eliminar marcador"
@@ -2805,6 +2834,10 @@ es:
         print: "%{shortcut} Imprimir tema"
         defer: "%{shortcut} Aplazar el tema"
         topic_admin_actions: "%{shortcut} Abrir acciones de administrador del tema"
+      search_menu:
+        title: "Buscar Menu"
+        prev_next: "%{shortcut} Mover selección arriba y abajo"
+        insert_url: "%{shortcut} Insertar selección dentro del editor abierto"
     badges:
       earned_n_times:
         one: "Ganó esta medalla %{count} vez"
@@ -3848,7 +3881,6 @@ es:
           staff: "Staff"
           suspended: "Suspendidos"
           silenced: "Silenciados"
-          suspect: "Sospechosos"
           staged: "Temporal"
         approved: "¿Aprobado/s?"
         titles:
@@ -3865,7 +3897,6 @@ es:
           moderators: "Moderadores"
           silenced: "Usuarios silenciados"
           suspended: "Usuarios suspendidos"
-          suspect: "Usuarios sospechosos"
           staged: "Usuarios temporales"
         not_verified: "No verificado"
         check_email:
@@ -3996,6 +4027,7 @@ es:
           threshold_reached: "Se recibieron demasiados rebotes desde ese correo electrónico."
         trust_level_change_failed: "Hubo un problema al cambiar el nivel de confianza del usuario."
         suspend_modal_title: "Suspender Usuario"
+        confirm_cancel_penalty: "¿Seguro que quieres descartar la falta?"
         trust_level_2_users: "Usuarios con nivel de confianza 2"
         trust_level_3_requirements: "Requerimientos para nivel de confianza 3"
         trust_level_locked_tip: "el nivel de confianza esta bloqueado, el sistema no promoverá o degradara al usuario."
@@ -4225,6 +4257,7 @@ es:
         help: "Añade emojis nuevos que estarán disponibles para todos. (CONSEJO: arrasta varios archivos a la vez)"
         add: "Añadir emoji nuevo"
         name: "Nombre"
+        group: "Grupo"
         image: "Imagen"
         delete_confirm: "¿Estás seguro de que quieres eliminar el emoji :%{name}:?"
       embedding:
@@ -4251,7 +4284,7 @@ es:
         save: "Guardar ajustes de insertado"
       permalink:
         title: "Enlaces permanentes"
-        description: "Ten en cuenta que esto solo se aplica a fuentes externas, los enlaces publicados en tu foro no se redirigirán."
+        description: "Redirecciones para solicitar URL no conocidas por el foro."
         url: "URL"
         topic_id: "ID del tema"
         topic_title: "Tema"
@@ -4260,6 +4293,7 @@ es:
         category_id: "ID de la categoría"
         category_title: "Categoría"
         external_url: "URL externa"
+        destination: "Destino"
         delete_confirm: "¿Estás seguro de que quieres eliminar este enlace permanente?"
         form:
           label: "Nuevo:"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index ab3c11c8dc..9b7097c953 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -28,7 +28,6 @@ et:
     dates:
       time: "hh:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMMM, hh:mm"
       long_no_year_no_time: "D. MMMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D. MMMM, YYYY hh:mm"
@@ -234,6 +233,12 @@ et:
       not_bookmarked: "lisa sellele postitusele järjehoidja"
       remove: "Eemalda järjehoidja"
       save: "Salvesta"
+      reminders:
+        later_today: "Täna hiljem"
+        tomorrow: "Homme"
+        next_week: "Järgmisel nädalal"
+        later_this_week: "iljem sel nädalal"
+        next_month: "Järgmisel kuul"
     drafts:
       resume: "Taasta"
       remove: "Eemalda"
@@ -702,10 +707,6 @@ et:
         success: "Saatsime sellele aadressile meili. Palun järgi seal olevaid juhiseid."
       change_avatar:
         title: "Muuda oma profiilipilti"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baseerub"
-        gravatar_title: "Oma avatari muuda Gravatar'i veebilehel"
-        gravatar_failed: "Selle e-posti aadressi küljest Gravatari ei leitud."
-        refresh_gravatar_title: "Värskenda oma Gravatar'i"
         letter_based: "Süsteemi poolt määratud profiilipilt"
         uploaded_avatar: "Individuaalne pilt"
         uploaded_avatar_empty: "Lisage individuaalne pilt"
@@ -955,6 +956,8 @@ et:
         back: "Mine tagasi"
         again: "Proovi uuesti"
         fixed: "Lae lehekülg"
+    modal:
+      close: "Sulge"
     close: "Sulge"
     assets_changed_confirm: "See sait on just uuendatud. Värskendan nüüd viimasele versioonile?"
     logout: "Sind logiti välja."
@@ -1115,7 +1118,6 @@ et:
       filter_placeholder: Otsi emojit
       objects: Objektid
       flags: Tähised
-      custom: Kohandatud emoji
       recent: Viimati kasutatud
       default_tone: Nahatooni pole
       light_tone: Hele nahatoon
@@ -1123,6 +1125,7 @@ et:
       medium_tone: Keskmine nahatoon
       medium_dark_tone: Keskmiselt tume nahatoon
       dark_tone: Tume nahatoon
+      default: Kohandatud emoji
     shared_drafts:
       destination_category: "Sihtkategooria"
       publishing: "Teema avaldamine..."
@@ -1236,6 +1239,7 @@ et:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -1842,6 +1846,7 @@ et:
           html_part:
             button: "HTML"
       bookmarks:
+        created: "Loodud"
         name: "Nimi"
     category:
       can: "saab&hellip; "
@@ -2875,7 +2880,6 @@ et:
           staff: "Meeskond"
           suspended: "Peatatud"
           silenced: "Vaigistatud"
-          suspect: "Kahtlane"
         approved: "Heakskiidetud?"
         titles:
           active: "Aktiivsed kasutajad"
@@ -2891,7 +2895,6 @@ et:
           moderators: "Moderaatorid"
           silenced: "Vaigistatud kasutajad"
           suspended: "Peatatud kasutajad"
-          suspect: "Kahtlased kasutajad"
         not_verified: "Ei ole kontrollitud"
         check_email:
           title: "Näita selle kasutaja meiliaadressi"
@@ -3190,6 +3193,7 @@ et:
         help: "Lisa uued emotikonid kõigile kasutamiseks. (PRO-vihje: pukseeri korraga mitu faili)"
         add: "Lisa uus emotikon"
         name: "Nimi"
+        group: "Grupp"
         image: "Pilt"
         delete_confirm: "Oled Sa kindel, et soovid kustutada :%{name}: emotikoni?"
       embedding:
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index cc5a914031..e5a524cf7a 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -26,10 +26,9 @@ fa_IR:
         thousands: "{{number}} هزار"
         millions: "{{number}} میلیون"
     dates:
-      time: "h:mm a"
-      time_short_day: "h:mm a"
+      time: "HH:mm"
+      time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -42,16 +41,16 @@ fa_IR:
       long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
       wrap_ago: "%{date} پیش"
       tiny:
-        half_a_minute: "< 1 دقیقه"
+        half_a_minute: "1 دقیقه پیش"
         less_than_x_seconds:
           one: "< %{count} ثانیه"
-          other: "< %{count} ثانیه"
+          other: "%{count} ثانیه پیش"
         x_seconds:
           one: "%{count} ثانیه"
           other: "%{count} ثانیه"
         less_than_x_minutes:
           one: "< %{count} دقیقه"
-          other: "< %{count} دقیقه"
+          other: "%{count} دقیقه پیش"
         x_minutes:
           one: "%{count} دقیقه"
           other: "%{count} دقیقه"
@@ -73,7 +72,7 @@ fa_IR:
         almost_x_years:
           one: "%{count} سال"
           other: "%{count} سال"
-        date_month: "MMM D"
+        date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
@@ -264,18 +263,17 @@ fa_IR:
     bookmarks:
       created: "شما این نوشته را نشانک زده‌اید"
       not_bookmarked: "این نوشته را نشانک بزنید"
-      created_with_reminder: "شما بر روی این پست نشانک همراه با یادآوری گذاشته اید در %{date}"
       remove: "پاک کردن نشانک"
       confirm_clear: "آیا مطمئنید می‌خواهید همه‌ی نشانک‌های خود را از این موضوع پاک کنید؟"
       save: "ذخیره"
       no_timezone: 'شما هنوز منطقه زمانی مشخص نکرده اید. شما قادر به تنظیم کردن یادآوری نیستید. یکی را در <a href="%{basePath}/my/preferences/profile"> پروفایل تان </a> تنظیم کنید.'
       reminders:
         at_desktop: "بار آینده من پشت میزم هستم"
-        later_today: "امروز کمی بعد"
-        next_business_day: "روز کاری آینده"
+        later_today: "امروز"
         tomorrow: "فردا"
-        next_week: "هفته ی آینده"
-        next_month: "ماه آینده"
+        next_week: "هفته بعد"
+        later_this_week: "این هفته"
+        next_month: "ماه بعد"
         custom: "درج تاریخ و ساعت"
     drafts:
       resume: "از سر گیری"
@@ -965,10 +963,6 @@ fa_IR:
         success_staff: "یک ایمیل به آدرس کنونی شما ارسال کردیم. لطفا دستورالعمل آن را دنبال کنید."
       change_avatar:
         title: "عکس نمایه خود را تغییر دهید"
-        gravatar: "بر‌اساس <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>"
-        gravatar_title: "تصویرتان را در سایت Gravatar تغییر دهید"
-        gravatar_failed: "هیچ گراواتاری با این آدرس ایمیل پیدا نکردیم"
-        refresh_gravatar_title: "تازه‌سازی Gravatar شما"
         letter_based: "سیستم تصویر پرفایل را اختصاص داده است"
         uploaded_avatar: "تصویر سفارشی"
         uploaded_avatar_empty: "افزودن تصویر سفارشی"
@@ -1246,6 +1240,8 @@ fa_IR:
         back: "برگشت"
         again: "تلاش دوباره"
         fixed: "بارگذاری برگه"
+    modal:
+      close: "بسته"
     close: "بستن"
     assets_changed_confirm: "این وب سایت به روز رسانی شده است. برای دیدن آخرین نسخه تازه‌سازی می‌کنید؟"
     logout: "شما از سایت خارج شده‌اید."
@@ -1462,7 +1458,6 @@ fa_IR:
       objects: اشیا
       symbols: نشانه ها
       flags: پرچم‌ها
-      custom: ایموجی های مخصوص
       recent: اخیرا استفاده شده
       default_tone: بدون رنگ خاص
       light_tone: رنگ پوست روشن
@@ -1470,6 +1465,7 @@ fa_IR:
       medium_tone: رنگ پوست روشن
       medium_dark_tone: رنگ پوست روشن تیره
       dark_tone: رنگ پوست تیره
+      default: ایموجی های مخصوص
     shared_drafts:
       title: "درفت مشترک"
       notice: "این موضوع فقط برای افرادی که به دسته بندی <b>{{category}}</b>دسترسی دارند نمایش داده می‌شود."
@@ -1613,6 +1609,7 @@ fa_IR:
       mentioned: "<span>{{username}}</span>{{description}}"
       group_mentioned: "<span>{{username}}</span>{{description}}"
       quoted: "<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}}"
@@ -2335,6 +2332,7 @@ fa_IR:
             title: "نمایش قسمت HTML ایمیل"
             button: "HTML"
       bookmarks:
+        created: "ساخته شده"
         name: "نام"
     category:
       can: "can&hellip; "
@@ -3534,7 +3532,6 @@ fa_IR:
           active: "فعال"
           staff: "همکاران"
           suspended: "تعلیق شد "
-          suspect: "مشکوک"
           staged: "کاربر از راه دور"
         approved: "تایید شده ؟"
         titles:
@@ -3550,7 +3547,6 @@ fa_IR:
           admins: "مدیران ارشد"
           moderators: "مدیران"
           suspended: "کاربران تعلیق شده"
-          suspect: "کاربران مشکوک"
         not_verified: "تایید نشده"
         check_email:
           title: "ایمیل این کاربران را قابل رویت کن"
@@ -3850,6 +3846,7 @@ fa_IR:
         help: "اضافه کردن شکلک های جدید که در دسترس همگان خواهد بود.(PROTIP: کشیدن و رها کردن چند فایل در یک بار)"
         add: "افزودن شکلک جدید"
         name: "نام"
+        group: "گروه"
         image: "تصویر"
         delete_confirm: "آیا مطمئنید که می‌خواهید شکلک :{name}%: را پاک کنید؟"
       embedding:
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index c64a976e1f..4841845a94 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -29,7 +29,6 @@ fi:
       time: "H:mm"
       time_short_day: "ddd HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMMM[ta], H:mm"
       long_no_year_no_time: "D. MMMM[ta]"
       full_no_year_no_time: "Do MMMM[ta]"
       long_with_year: "D. MMMM[ta] YYYY H:mm"
@@ -264,19 +263,23 @@ fi:
     bookmarks:
       created: "olet lisännyt tämän viestin kirjanmerkkeihisi"
       not_bookmarked: "lisää viesti kirjanmerkkeihin"
-      created_with_reminder: "olet kirjanmerkinnyt tämän viestin ja siitä muistutetaan %{date}"
+      created_with_at_desktop_reminder: "kirjanmerkitsit tämän viestin ja sinua muistutetaan siitä kun seuraavan kerran olet työpöytäympäristössäsi"
       remove: "Poista kirjanmerkki"
       confirm_clear: "Haluatko varmasti poistaa kaikki kirjanmerkkisi tästä ketjusta?"
       save: "Tallenna"
       no_timezone: 'Et ole valinnut aikavyöhykettä, joten et voi asettaa muistutuksia. Aseta se  <a href="%{basePath}/my/preferences/profile">profiilisivullasi</a>.'
+      invalid_custom_datetime: "Antamasi päivämäärä ja kellonaika ei kelpaa, yritä uudelleen."
+      list_permission_denied: "Et voi nähdä tämän käyttäjän kirjanmerkkejä."
       reminders:
         at_desktop: "Ensi kerralla kun olen työpöytäympäristössäni"
-        later_today: "Myöhemmin tänään "
+        later_today: "Myöhemmin tänään"
         next_business_day: "Seuraavana arkipäivänä"
         tomorrow: "Huomenna"
         next_week: "Ensi viikolla"
+        later_this_week: "Myöhemmin tällä viikolla"
         next_month: "Ensi kuussa"
         custom: "Valitse päivämäärä ja kellonaika"
+        none: "Muistutus ei tarpeen"
     drafts:
       resume: "Jatka"
       remove: "Poista"
@@ -539,6 +542,7 @@ fi:
         deny: "Hylkää"
         denied: "hylättiin"
         undone: "pyyntö peruttu"
+        handle: "käsittele jäsenyyshakemus"
       manage:
         title: "Hallinnoi"
         name: "Nimi"
@@ -866,6 +870,7 @@ fi:
         deleted_posts: "poistettua viestiä"
         suspensions: "hyllytyksiä"
         warnings_received: "varoituksia"
+        rejected_posts: "hylättyjä viestejä"
       messages:
         all: "Kaikki"
         inbox: "Saapuneet"
@@ -967,10 +972,6 @@ fi:
         success_staff: "Lähetimme sähköpostia nykyiseen osoitteeseesi. Noudata vahvistusohjeita."
       change_avatar:
         title: "Vaihda profiilikuvasi"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, osoitteesta"
-        gravatar_title: "Vaihda profiilikuvasi Gravatar-sivustolla"
-        gravatar_failed: "Tällä sähköpostiosoitteella ei löytynyt Gravataria."
-        refresh_gravatar_title: "Päivitä Gravatar"
         letter_based: "Sivuston luoma profiilikuva"
         uploaded_avatar: "Oma kuva"
         uploaded_avatar_empty: "Lisää oma kuva"
@@ -1252,6 +1253,8 @@ fi:
         back: "Mene takaisin"
         again: "Yritä uudestaan"
         fixed: "Lataa sivu"
+    modal:
+      close: "sulje"
     close: "Sulje"
     assets_changed_confirm: "Sivustolla on tehty päivityksiä. Ladataanko uudelleen?"
     logout: "Sinut kirjattiin ulos."
@@ -1481,7 +1484,6 @@ fi:
       objects: Esineet
       symbols: Symbolit
       flags: Liputukset
-      custom: Mukautetut emojit
       recent: Hiljattain käytetyt
       default_tone: Ei ihonsävyä
       light_tone: Vaalea ihonväri
@@ -1489,6 +1491,7 @@ fi:
       medium_tone: Ruskea ihonväri
       medium_dark_tone: Tummanruskea ihonväri
       dark_tone: Tumma ihonväri
+      default: Mukautetut emojit
     shared_drafts:
       title: "Jaetut luonnokset"
       notice: "Tämä ketju näkyy vain niille, jotka näkevät <b>{{category}}</b> -alueen."
@@ -1638,6 +1641,7 @@ fi:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -2414,9 +2418,8 @@ fi:
             button: "HTML"
       bookmarks:
         create: "Luo kirjanmerkki"
+        created: "Luotu"
         name: "Nimi"
-        name_placeholder: "Anna kirjanmerkille nimi muistisi virkistämiseksi"
-        set_reminder: "Aseta muistutus"
         actions:
           delete_bookmark:
             name: "Poista kirjanmerkki"
@@ -3847,7 +3850,6 @@ fi:
           staff: "Henkilökunta"
           suspended: "Hyllytetyt"
           silenced: "Hiljennetty"
-          suspect: "Epäilty"
           staged: "Esikäyttäjät"
         approved: "Hyväksytty?"
         titles:
@@ -3864,7 +3866,6 @@ fi:
           moderators: "Valvojat"
           silenced: "Hiljennetyt käyttäjät"
           suspended: "Hyllytetyt käyttäjät"
-          suspect: "Epäillyt käyttäjät"
           staged: "Esikäyttäjät"
         not_verified: "Todentamaton"
         check_email:
@@ -4222,6 +4223,7 @@ fi:
         help: "Lisää uusi emoji joka on kaikkien käytettävissä. (Voit raahata useita tiedostoja kerralla)"
         add: "Lisää uusi emoji"
         name: "Nimi"
+        group: "Ryhmä"
         image: "Kuva"
         delete_confirm: "Oletko varma, että haluat poistaa emojin :%{name}:?"
       embedding:
@@ -4248,7 +4250,6 @@ fi:
         save: "Tallenna upotusasetukset"
       permalink:
         title: "Ikilinkit"
-        description: "Huomioi että tämä vaikuttaa vain ulkoisiin lähteisiin, palstallesi laitettuja linkkejä ei uudelleenohjata."
         url: "URL"
         topic_id: "Ketjun ID"
         topic_title: "Ketju"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index dec75c46b7..3caf174072 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -29,7 +29,6 @@ fr:
       time: "HH:mm"
       time_short_day: "ddd [à] HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "DD MMM, H:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "DD MMM YYYY H:mm"
@@ -264,18 +263,18 @@ fr:
     bookmarks:
       created: "vous avez mis un signet à ce message"
       not_bookmarked: "mettre un signet à ce message"
-      created_with_reminder: "Vous avez épinglé cette contribution avec un rappel au %{date}"
       remove: "Retirer le signet"
       confirm_clear: "Êtes-vous sûr de vouloir retirer tous les signets de ce sujet ?"
       save: "Sauvegarder"
       no_timezone: 'Vous n&#39;avez pas encore défini de fuseau horaire. Vous ne pourrez pas définir de rappels. Configurez-en un <a href="%{basePath}/my/preferences/profile">dans votre profil</a>.'
       reminders:
         at_desktop: "La prochaine fois je suis à mon bureau"
-        later_today: "Plus tard dans la journée"
-        next_business_day: "Prochain jour ouvré"
+        later_today: "Plus tard aujourd'hui"
         tomorrow: "Demain"
-        next_week: "La semaine prochaine"
-        next_month: "Le mois prochain"
+        next_week: "Semaine prochaine"
+        later_this_week: "Plus tard cette semaine"
+        start_of_next_business_week: "Lundi prochain"
+        next_month: "Mois prochai"
         custom: "Date et heure personnalisés"
     drafts:
       resume: "Reprendre"
@@ -539,6 +538,7 @@ fr:
         deny: "Refuser"
         denied: "refusé"
         undone: "requête annulée"
+        handle: "Gérer demande d'adhésion"
       manage:
         title: "Gérer"
         name: "Nom"
@@ -968,10 +968,6 @@ fr:
         success_staff: "Nous avons envoyé un courriel à votre adresse actuelle. Merci de suivre les instructions."
       change_avatar:
         title: "Modifier votre image de profil"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basé sur"
-        gravatar_title: "Modifier votre avatar sur le site de Gravatar"
-        gravatar_failed: "Impossible de récupérer le Gravatar associé à cette adresse courriel."
-        refresh_gravatar_title: "Actualiser votre Gravatar"
         letter_based: "Image de profil attribuée par le système"
         uploaded_avatar: "Avatar personnalisé"
         uploaded_avatar_empty: "Ajouter un avatar personnalisé"
@@ -1254,6 +1250,8 @@ fr:
         back: "Retour"
         again: "Réessayer"
         fixed: "Charger la page"
+    modal:
+      close: "fermer"
     close: "Fermer"
     assets_changed_confirm: "Ce site vient d'être mis à jour. Rafraîchir maintenant pour accéder à la nouvelle version ?"
     logout: "Vous avez été déconnecté."
@@ -1483,7 +1481,6 @@ fr:
       objects: Objets
       symbols: Symboles
       flags: Drapeaux
-      custom: Emojis personnalisés
       recent: Utilisés récemment
       default_tone: Aucun teint
       light_tone: Teint clair
@@ -1491,6 +1488,7 @@ fr:
       medium_tone: Teint moyen
       medium_dark_tone: Teint légèrement foncé
       dark_tone: Teint foncé
+      default: Emojis personnalisés
     shared_drafts:
       title: "Ébauches partagées"
       notice: "Ce sujet n'est visible que pour ceux qui peuvent voir la catégorie <b>{{category}}</b>."
@@ -1639,6 +1637,7 @@ fr:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -2415,9 +2414,8 @@ fr:
             button: "HTML"
       bookmarks:
         create: "Ajouter un signet"
+        created: "Créé"
         name: "Nom"
-        name_placeholder: "Nommez le signet pour alléger votre mémoire"
-        set_reminder: "Ajouter un rappel"
         actions:
           delete_bookmark:
             name: "Supprimer le signet"
@@ -3849,7 +3847,6 @@ fr:
           staff: "Responsables"
           suspended: "Suspendus"
           silenced: "Sous silence"
-          suspect: "Suspects"
           staged: "Distant"
         approved: "Approuvé ?"
         titles:
@@ -3866,7 +3863,6 @@ fr:
           moderators: "Modérateurs"
           silenced: "Utilisateurs sous silence"
           suspended: "Utilisateurs suspendus"
-          suspect: "Utilisateurs suspects"
           staged: "Utilisateurs distants"
         not_verified: "Non verifié"
         check_email:
@@ -4223,6 +4219,7 @@ fr:
         help: "Ajouter un nouvel emoji qui sera disponible pour tout le monde. (Conseil : glisser-déposer plusieurs fichiers en même temps)"
         add: "Ajouter un nouvel emoji"
         name: "Nom"
+        group: "Groupe"
         image: "Image"
         delete_confirm: "Êtes-vous sûr de vouloir supprimer l'emoji :%{name}: ?"
       embedding:
@@ -4249,7 +4246,6 @@ fr:
         save: "Sauvegarder les paramètres d'intégration"
       permalink:
         title: "Permaliens"
-        description: "Veuillez noter que ceci s'applique uniquement aux sources externes, les liens postés sur votre forum ne seront pas redirigés."
         url: "URL"
         topic_id: "ID sujet"
         topic_title: "Sujet"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 7003482704..6b0a735b28 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -28,7 +28,6 @@ gl:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D MMMM"
       long_with_year: "D MMM, YYYY h:mm a"
@@ -528,9 +527,6 @@ gl:
         success: "Enviamos un correo electrónico a ese enderezo. Sigue as instrucións de confirmación."
       change_avatar:
         title: "Cambia a foto do perfil"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baseado en"
-        gravatar_title: "Cambia o avatar no sitio web de Gravatar"
-        refresh_gravatar_title: "Actualiza o teu Gravatar"
         letter_based: "Imaxe do perfil asignada polo sistema"
         uploaded_avatar: "Imaxe personalizada"
         uploaded_avatar_empty: "Engadir unha imaxe personalizada"
@@ -714,6 +710,8 @@ gl:
         back: "Volver"
         again: "Tentar de novo"
         fixed: "Cargar páxina"
+    modal:
+      close: "pechar"
     close: "Pechar"
     assets_changed_confirm: "Este sitio acaba de actualizarse. Queres recargar a páxina para ter a última versión?"
     logout: "Fuches desconectado."
@@ -1349,6 +1347,7 @@ gl:
           side_by_side_markdown:
             title: "Amosar a fonte crúa coas diferenzas comparadas"
       bookmarks:
+        created: "Creado"
         name: "Nome"
     category:
       can: "podes&hellip; "
@@ -2114,7 +2113,6 @@ gl:
           active: "Activo"
           staff: "Equipo"
           suspended: "Suspendido"
-          suspect: "Sospeitoso"
         approved: "Aprobado?"
         titles:
           active: "Usuarios activos"
@@ -2129,7 +2127,6 @@ gl:
           admins: "Usuarios administradores"
           moderators: "Moderadores"
           suspended: "Usuarios suspendidos"
-          suspect: "Usuarios sospeitosos"
         not_verified: "Sen verificar"
         check_email:
           title: "Amosar o enderezo de correo-e deste usuario"
@@ -2396,6 +2393,7 @@ gl:
         help: "Engade novo emoji que estará dispoñíbel para todos. (Suxestión: arrastra e solta múltiples ficheiros dunha vez)"
         add: "Engadir novo Emoji"
         name: "Nome"
+        group: "Grupo"
         image: "Imaxe"
         delete_confirm: "Confirmas a eliminación do emoji :%{name}:?"
       embedding:
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index d8390f7145..c68dd6d67c 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -31,7 +31,7 @@ he:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D בMMM, ‏HH:mm"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D בMMM"
       full_no_year_no_time: "Do בMMMM"
       long_with_year: "D בMMM ‏YYYY ‏HH:mm"
@@ -309,22 +309,34 @@ he:
       help:
         bookmark: "יש ללחוץ כדי ליצור סימנייה לפוסט הראשון בנושא זה"
         unbookmark: "יש ללחוץ כדי להסיר את כל הסימניות בנושא זה"
+        unbookmark_with_reminder: "יש ללחוץ כדי להסיר את כל הסימניות והתזכורות בנושא הזה. יש לך תזכורת שמוגדרת ל־%{reminder_at} עבור הנושא הזה."
     bookmarks:
       created: "פוסט זה נוסף לסימניות"
       not_bookmarked: "סמנו פוסט זה עם סימנייה"
-      created_with_reminder: "סימנת את הפוסט הזה עם תזכורת ב־%{date}"
+      created_with_reminder: "סימנת את הפוסט הזה עם תזכורת %{date}"
+      created_with_at_desktop_reminder: "סימנת את הפוסט הזה ותישלח לך תזכורת בעת השימוש הבא בשולחן העבודה שלך"
       remove: "הסרה מהסימניות"
       confirm_clear: "לנקות את כל הסימניות מנושא זה?"
       save: "שמירה"
       no_timezone: 'עדיין לא הגדרת אזור זמן. לא תהיה לך אפשרות להגדיר תזכורות. ניתן להגדיר אותו <a href="%{basePath}/my/preferences/profile">בפרופיל שלך</a>.'
+      invalid_custom_datetime: "התאריך והשעה שסיפקת שגויים, נא לנסות שוב."
+      list_permission_denied: "אין לך הרשאה לצפות בסימניות של המשתמש הזה."
       reminders:
         at_desktop: "בשימוש הבא דרך שולחן העבודה"
-        later_today: "המשך היום"
-        next_business_day: "ביום העסקים הבא"
+        later_today: "בהמשך היום"
+        next_business_day: "יום העסקים הבא"
         tomorrow: "מחר"
         next_week: "בשבוע הבא"
-        next_month: "בחודש הבא"
+        later_this_week: "בהמשך השבוע"
+        start_of_next_business_week: "יום שני הבא"
+        next_month: "חודש הבא"
         custom: "תאריך ושעה מותאמים אישית"
+        last_custom: "האחרון"
+        none: "לא נדרשת תזכורת"
+        today_with_time: "היום ב־%{time}"
+        tomorrow_with_time: "מחר ב־%{time}"
+        at_time: "ב־%{date_time}"
+        existing_reminder: "הגדרת תזכורת שתישלח עבור הסימנייה הזאת"
     drafts:
       resume: "המשך"
       remove: "הסרה"
@@ -584,6 +596,7 @@ he:
       days_visited_long: "ימים לביקור"
       posts_read: "נקראו"
       posts_read_long: "פוסטים שנקראו"
+      last_updated: "עדכון אחרון:"
       total_rows:
         one: "משתמש/ת %{count}"
         two: "%{count} משתמשים"
@@ -611,6 +624,7 @@ he:
         deny: "דחייה"
         denied: "נדחה"
         undone: "הבקשה נמשכה"
+        handle: "טיפול בבקשות חברות"
       manage:
         title: "ניהול"
         name: "שם"
@@ -846,6 +860,7 @@ he:
         clear:
           title: "ניקוי"
           warning: "למחוק את הנושאים המומלצים שלך?"
+      use_current_timezone: "להשתמש באזור הזמן הנוכחי"
       profile_hidden: "הפרופיל הציבורי של משתמש זה מוסתר"
       expand_profile: "הרחב"
       collapse_profile: "הקטן"
@@ -946,6 +961,7 @@ he:
         deleted_posts: "פוסטים שנמחקו"
         suspensions: "השעיות"
         warnings_received: "אזהרות"
+        rejected_posts: "פוסטים שנדחו"
       messages:
         all: "הכל"
         inbox: "דואר נכנס"
@@ -972,6 +988,7 @@ he:
         success: "(דואר אלקטרוני נשלח)"
         in_progress: "(שולח דואר אלקטרוני)"
         error: "(שגיאה)"
+        emoji: "אמוג׳י של מנעול"
         action: "שלח דואר אלקטרוני לשחזור סיסמה"
         set_password: "הזן סיסמה"
         choose_new: "בחרו סיסמה חדשה"
@@ -1021,6 +1038,7 @@ he:
           title: "מאמתים מבוססי אסימונים"
           add: "מאמת חדש"
           default_name: "המאמת שלי"
+          name_and_code_required_error: "עליך לספק שם וקוד מיישומון האימות שלך."
         security_key:
           register: "הרשמה"
           title: "מפתחות אבטחה"
@@ -1031,6 +1049,7 @@ he:
           edit: "עריכת מפתח אבטחה"
           edit_description: "שם מפתח אבטחה"
           delete: "מחיקה"
+          name_required_error: "עליך לציין שם למפתח האבטחה שלך."
       change_about:
         title: "שינוי בנוגע אליי"
         error: "ארעה שגיאה בשינוי ערך זה."
@@ -1047,10 +1066,10 @@ he:
         success_staff: "שלחנו דואר אלקטרוני לכתובת הדואר הזו. אנא עיקבו אחרי הוראות האישור."
       change_avatar:
         title: "שינוי תמונת הפרופיל"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, מבוסס על"
-        gravatar_title: "החלפת הדמות שלך ב־Gravatar"
-        gravatar_failed: "לא נמצא אווטר עם כתובת הדאו\"ל הזו."
-        refresh_gravatar_title: "רענון דמות ה־Gravatar שלך"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, מבוסס על"
+        gravatar_title: "החלפת הדמות שלך באתר {{gravatarName}}"
+        gravatar_failed: "לא הצלחנו למצוא {{gravatarName}} עם כתובת הדוא״ל הזו."
+        refresh_gravatar_title: "רענון ה־{{gravatarName}} שלך"
         letter_based: "תמונת פרופיל משובצת מהמערכת"
         uploaded_avatar: "תמונה אישית"
         uploaded_avatar_empty: "הוסיפו תמונה אישית"
@@ -1115,6 +1134,9 @@ he:
         any: "כלשהו"
       password_confirmation:
         title: "סיסמה שוב"
+      invite_code:
+        title: "קוד הזמנה"
+        instructions: "רישום חשבון דורש קוד הזמנה"
       auth_tokens:
         title: "מכשירים שהיו בשימוש לאחרונה"
         ip: "IP"
@@ -1353,6 +1375,9 @@ he:
         back: "חזרה"
         again: "ניסיון נוסף"
         fixed: "טעינת עמוד"
+    modal:
+      close: "סגירה"
+      dismiss_error: "התעלמות מהשגיאה"
     close: "סגור"
     assets_changed_confirm: "האתר עבר עדכון. תרצו לרענן לגרסה המתקדמת ביותר?"
     logout: "יצאת מהמערכת."
@@ -1361,6 +1386,12 @@ he:
       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, one {נושא <strong>אחד</strong>} other {<strong>#</strong> נושאים}} ו{currentPosts, plural, one {פוסט <strong>אחד</strong>} other {־<strong>#</strong> פוסטים}}. המבקרים זקוקים ליותר מכך כדי לקרוא ולהיות מעורבים – אנו ממליצים על {requiredTopics, plural, one {נושא<strong>אחד</strong>} other {<strong>#</strong> נושאים}} ו{requiredPosts, plural, one {פוסט <strong>אחד</strong>} other {־<strong>#</strong> פוסטים}} לפחות. רק חברי הסגל יכולים לראות את ההודעה הזאת.
+    too_few_topics_notice_MF: >-
+      הבה <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">נתחיל להתדיין!</a> כרגע יש {currentTopics, plural, one {נושא <strong>אחד</strong>} other {<strong>#</strong> נושאים}}. המבקרים זקוקים ליותר מכך כדי לקרוא ולהיות מעורבים – אנו ממליצים על {requiredTopics, plural, one {נושא<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, one {פוסט <strong>אחד</strong>} other {<strong>#</strong> פוסטים}}. המבקרים זקוקים ליותר מכך כדי לקרוא ולהיות מעורבים – אנו ממליצים על {requiredPosts, plural, one {פוסט <strong>אחד</strong>} other {<strong>#</strong> פוסטים}} לפחות. רק חברי הסגל יכולים לראות את ההודעה הזאת.
     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 {# שגיאות בדקה}}."
@@ -1443,6 +1474,7 @@ he:
     email_login:
       link_label: "נא לשלוח לי קישור לכניסה בדוא״ל"
       button_label: "עם דוא״ל"
+      emoji: "אמוג׳י של מנעול"
       complete_username: "אם קיים חשבון שמתאים לשם המשתמש <b>%{username}</b>, בקרוב אמורה להגיע אליך הודעה בדוא״ל עם קישור כניסה למערכת."
       complete_email: "אם קיים חשבון שמתאים ל־<b>%{email}</b>, בקרוב אמורה להגיע אליך הודעה בדוא״ל עם קישור כניסה למערכת."
       complete_username_found: "נמצא חשבון תואם לשם המשתמש <b>%{username}</b>, בקרוב תגיע אליך הודעה בדוא״ל עם קישור לכניסה."
@@ -1520,6 +1552,7 @@ he:
         backup_code: "להשתמש בקוד גיבוי במקום"
     invites:
       accept_title: "הזמנה"
+      emoji: "אמוג׳י של מעטפה"
       welcome_to: "ברוך בואך אל %{site_name}!"
       invited_by: "הוזמנתם על ידי:"
       social_login_available: "מעתה יתאפשר לך להיכנס עם כל כניסה מרשת חברתית בעזרת כתובת הדוא״ל הזאת."
@@ -1588,7 +1621,6 @@ he:
       objects: עצמים
       symbols: סמלים
       flags: דגלים
-      custom: אמוג׳ים מותאמים
       recent: בשימוש לאחרונה
       default_tone: ללא גוון עור
       light_tone: גוון עור בהיר
@@ -1596,6 +1628,7 @@ he:
       medium_tone: גוון עור בינוני
       medium_dark_tone: גוון עור כהה בינוני
       dark_tone: גוון עור כהה
+      default: אמוג׳ים מותאמים
     shared_drafts:
       title: "טיוטות משותפות"
       notice: "הנושא הזה ניתן לצפייה עבור מי שיכולים לצפות בקטגורית <b>{{category}}</b>."
@@ -1743,6 +1776,11 @@ he:
           two: "{{count}} הודעות שלא נקראו"
           many: "{{count}} הודעות שלא נקראו"
           other: "{{count}} הודעות שלא קראו"
+        high_priority:
+          one: "הודעה אחת (%{count}) בדחיפות גבוהה שלא נקראה"
+          two: "%{count} הודעות בדחיפות גבוהה שלא נקראו"
+          many: "%{count} הודעות בדחיפות גבוהה שלא נקראו"
+          other: "%{count} הודעות בדחיפות גבוהה שלא נקראו"
       title: "התראות אזכור @שם, תגובות לפוסטים ולנושאים שלך, הודעות, וכו׳"
       none: "לא ניתן לטעון כעת התראות."
       empty: "לא נמצאו התראות."
@@ -1751,6 +1789,7 @@ he:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -1807,6 +1846,8 @@ he:
         posted: "פוסט חדש"
         moved_post: "פוסט הועבר"
         linked: "מקושר"
+        bookmark_reminder: "תזכורת סימון"
+        bookmark_reminder_with_name: "תזכורת סימון - %{name}"
         granted_badge: "הוענק עיטור"
         invited_to_topic: "הוזמן לנושא"
         group_mentioned: "קבוצה אוזכרה"
@@ -2053,6 +2094,7 @@ he:
       group_request_sent: "בקשת החברות שלך נשלחה לקבוצה הזו. ניידע אותך כשהיא תתקבל."
       unread_indicator: "אף אחד מהחברים לא קרא את הפוסט האחרון של הנושא הזה עדיין."
       read_more_MF: "יש { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 שלא נקרא</a> } other { <a href='{basePath}/unread'># שלא נקראו</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ו} false {} other{}} נושא חדש <a href='{basePath}/new'>אחד</a>} 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: עיינו בכל הקטגוריות
       view_latest_topics: הצגת נושאים אחרונים
       suggest_create_topic: "למה לא ליצור נושא חדש?"
@@ -2063,6 +2105,7 @@ he:
         title: "שעון עצר לנושא"
         save: "קביעת שעון עצר"
         num_of_hours: "מספר שעות:"
+        num_of_days: "מספר הימים:"
         remove: "הסרת שעון עצר"
         publish_to: "פרסום ל:"
         when: "מתי:"
@@ -2105,6 +2148,8 @@ he:
         title: "נושא מוקפץ אוטומטית"
       reminder:
         title: "תזכורת"
+      auto_delete_replies:
+        title: "למחוק תגובות אוטומטית"
       status_update_notice:
         auto_open: "נושא זה ייפתח אוטומטית %{timeLeft}."
         auto_close: "נושא זו ייסגר אוטומטית %{timeLeft}."
@@ -2113,6 +2158,7 @@ he:
         auto_delete: "נושא זה יימחק אוטומטית %{timeLeft}."
         auto_bump: "נושא זה יוקפץ אוטומטית %{timeLeft}."
         auto_reminder: "תישלח אליך תזכורת בנוגע לנושא זה %{timeLeft}."
+        auto_delete_replies: "תגובות על נושא זה נמחקות אוטומטית לאחר %{duration}."
       auto_close_title: "הגדרות סגירה אוטומטית"
       auto_close_immediate:
         one: "הפוסט האחרון בנושא הוא כבר בן שעה, אז הנושא ייסגר מיידית."
@@ -2340,6 +2386,18 @@ he:
         title: "ניזוג פוסטים שנבחרו"
         action: "מיזוג פוסטים שנבחרו"
         error: "ארעה שגיאה במיזוג הפוסטים שנבחרו."
+      publish_page:
+        title: "פרסום עמוד"
+        publish: "פרסום"
+        description: "כאשר נושא מפורסם כעמוד, ניתן לשתף את הכתובת שלו והיא תוצג בסגנון עצמאי."
+        slug: "מזהה ייצוגי"
+        publish_url: "העמוד שלך פורסם ב־:"
+        topic_published: "הנושא שלך פורסם ב־:"
+        preview_url: "העמוד שלך יפורסם ב־:"
+        invalid_slug: "אין לך אפשרות לפרסם את העמוד הזה, עמך הסליחה."
+        unpublish: "משיכת הפרסום"
+        unpublished: "פרסום העמוד שלך נמשך ואין זמין עוד."
+        publishing_settings: "הגדרות פרסום"
       change_owner:
         title: "שנה בעלים"
         action: "שנה בעלות"
@@ -2350,6 +2408,11 @@ he:
           two: "אנא בחרו את הבעלים החדש של {{count}} הפוסטים מאת <b>@{{old_user}}</b>."
           many: "אנא בחרו את הבעלים החדש של {{count}} הפוסטים מאת <b>@{{old_user}}</b>."
           other: "אנא בחרו את הבעלים החדש של {{count}} הפוסטים מאת <b>@{{old_user}}</b>."
+        instructions_without_old_user:
+          one: "נא לבחור בעלים חדש לפוסט"
+          two: "נא לבחור בעלים חדש ל־{{count}} הפוסטים"
+          many: "נא לבחור בעלים חדש ל־{{count}} הפוסטים"
+          other: "נא לבחור בעלים חדש ל־{{count}} הפוסטים"
       change_timestamp:
         title: "שינוי חותמת זמן..."
         action: "שינוי חותמת זמן"
@@ -2493,6 +2556,7 @@ he:
         convert_to_moderator: "הוספת צבע סגל"
         revert_to_regular: "הסרת צבע סגל"
         rebake: "בנייה מחודשת של HTML"
+        publish_page: "פרסום עמוד"
         unhide: "הסרת הסתרה"
         change_owner: "שינוי בעלות"
         grant_badge: "הענקת עיטור"
@@ -2601,13 +2665,18 @@ he:
             button: "HTML"
       bookmarks:
         create: "יצירת סימנייה"
+        edit: "עריכת סימנייה"
+        created: "נוצר"
         name: "שם"
-        name_placeholder: "יש לתת שם לסימנייה כדי לאמן את הזיכרון"
-        set_reminder: "הגדרת תזכורת"
+        name_placeholder: "עבור מה הסימנייה?"
+        set_reminder: "להזכיר לי"
         actions:
           delete_bookmark:
             name: "מחיקת סימנייה"
             description: "הסרת הסימנייה מהפרופיל שלך והפסקת התזכורות לסימנייה"
+          edit_bookmark:
+            name: "עריכת סימנייה"
+            description: "עריכת שם הסימנייה או החלפת מועד התזכורת"
     category:
       can: "יכול&hellip; "
       none: "(ללא קטגוריה)"
@@ -2999,6 +3068,18 @@ he:
         title: "חיבור"
         return: "%{shortcut} חזרה לכתיבת פוסט"
         fullscreen: "%{shortcut} כתיבת פוסט במסך מלא"
+      bookmarks:
+        title: "ניהול סימניות"
+        enter: "%{shortcut} שמירה וסגירה"
+        later_today: "%{shortcut} בהמשך היום"
+        later_this_week: "%{shortcut} בהמשך השבוע"
+        tomorrow: "%{shortcut} מחר"
+        next_week: "%{shortcut} שבוע הבא"
+        next_month: "%{shortcut} חודש הבא"
+        next_business_week: "%{shortcut} תחילת שבוע הבא"
+        next_business_day: "%{shortcut} יום העסקים הבא"
+        custom: "%{shortcut} בחירת שעה ותאריך"
+        none: "%{shortcut} ללא תזכורת"
       actions:
         title: "פעולות"
         bookmark_topic: "%{shortcut} סמנו/בטלו-סימנייה של נושא"
@@ -3021,6 +3102,10 @@ he:
         print: "%{shortcut} הדפסת נושא"
         defer: "%{shortcut} לדחות נושא לאחר כך"
         topic_admin_actions: "%{shortcut} פתיחת פעולות ניהול לנושא"
+      search_menu:
+        title: "תפריט חיפוש"
+        prev_next: "%{shortcut} העברת הבחירה למעלה ולמטה"
+        insert_url: "%{shortcut} הוספת הבחירה לחלון כתיבת ההודעה הפתוח"
     badges:
       earned_n_times:
         one: "עיטור זה הוענק פעם אחת (%{count})"
@@ -3456,6 +3541,9 @@ he:
         notification_event:
           name: "אירוע התראה"
           details: "כשמשתמש מקבל התראה בהזנה שלו."
+        user_badge_event:
+          name: "אירוע הענקת עיטור"
+          details: "כמשתמש מקבל עיטור."
         delivery_status:
           title: "מצב שליחה"
           inactive: "לא פעיל"
@@ -3609,6 +3697,7 @@ he:
           theme_name: "שם ערכת העיצוב"
           component_name: "שם רכיב"
           themes_intro: "נא לבחור בערכת עיצוב קיימת או להתקין חדשה כדי להתחיל"
+          themes_intro_emoji: "אמוג׳י של אומנית"
           beginners_guide_title: "המדריך למתחילים בערכות העיצוב של Discourse"
           developers_guide_title: "המדריך למפתחי ערכות עיצוב של Discourse"
           browse_themes: "עיון בערכות העיצוב של הקהילה"
@@ -3837,6 +3926,7 @@ he:
         format: "פורמט"
         html: "html"
         text: "טקסט"
+        html_preview: "תצוגה מקדימה של תוכן הדוא״ל"
         last_seen_user: "משתמש שנראה לאחרונה:"
         no_result: "לא נמצאו תוצאות לתמצית."
         reply_key: "מפתח תגובה"
@@ -3991,6 +4081,8 @@ he:
             api_key_update: "עודכן מפתח api"
             api_key_destroy: "הושמד מפתח api"
             override_upload_secure_status: "דריסת מצב העלאה בטוח"
+            page_published: "העמוד פורסם"
+            page_unpublished: "פרסום העמוד נמשך"
         screened_emails:
           title: "הודעות דואר מסוננות"
           description: "כשמישהו מנסה ליצור חשבון חדש, כתובות הדואר האלקטרוני הבאות ייבדקו וההרשמה תחסם או שיבוצו פעולות אחרות."
@@ -4096,7 +4188,6 @@ he:
           staff: "סגל"
           suspended: "מושעים"
           silenced: "מושתק"
-          suspect: "חשודים"
           staged: "מבוים"
         approved: "מאושר?"
         titles:
@@ -4113,7 +4204,6 @@ he:
           moderators: "מפקחים"
           silenced: "משתמשים מושתקים"
           suspended: "משתמשים מושעים"
-          suspect: "משתמשים חשודים"
           staged: "משתמשים מבוימים"
         not_verified: "לא מאומת"
         check_email:
@@ -4159,7 +4249,7 @@ he:
         moderator: "פיקוח?"
         admin: "מנהל ראשי?"
         suspended: "מושעה?"
-        staged: "מועמד?"
+        staged: "מבוים?"
         show_admin_profile: "מנהל ראשי"
         show_public_profile: "הצג פרופיל פומבי"
         impersonate: "התחזה"
@@ -4243,13 +4333,14 @@ he:
         deactivate_explanation: "חשבון משתמש מנוטרל נדרש לוודא דואר אלקטרוני מחדש."
         suspended_explanation: "משתמש מושעה לא יכול להיכנס."
         silence_explanation: "משתמש מושתק לא יכול לפרסם או לפתוח נושאים."
-        staged_explanation: "משתמש מועמד יכול לפרסם לנושאים מסוימים רק דרך דוא״ל."
+        staged_explanation: "משתמש מבוים יכול לפרסם לנושאים מסוימים רק דרך דוא״ל."
         bounce_score_explanation:
           none: "לא התקבלו החזרות לאחרונה מהדוא״ל הזה."
           some: "מספר החזרות התקבלו לאחרונה מהדוא״ל הזה."
           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: "רמות האמון נעולה, המערכת לא תקדם או או תנמיך משתמשים"
@@ -4467,6 +4558,7 @@ he:
             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:
@@ -4483,7 +4575,9 @@ he:
         help: "הוספת אמוג׳י חדשים שיהיו זמינים לכולם. (עצה למקצוענים: עדיף לגרור לכאן כמה קבצים בבת אחת)"
         add: "הוספת אמוג׳י חדש"
         name: "שם"
+        group: "קבוצה"
         image: "תמונה"
+        alt: "תצוגה מקדימה של אמוג׳י מותאם"
         delete_confirm: "להסיר את האמוג׳י :%{name}:?"
       embedding:
         get_started: "כדי להטמיע את Discourse באתר אחר, יש להתחיל בהוספת השרת שלו."
@@ -4503,13 +4597,14 @@ he:
         embed_post_limit: "מספר מקסימלי של פרסומים להטמעה."
         embed_title_scrubber: "ביטוי רגולרי שמשמש כדי לנקות את הכותרת של פוסטים"
         embed_truncate: "חיתוך הפרסומים המוטמעים."
+        embed_unlisted: "נושאים שיובאו לא יופיעו ברשימה עד שתתווסף אליהם תגובה."
         embed_whitelist_selector: "בוררי CSS לאלמנטים שיותר להטמיע."
         embed_blacklist_selector: "בוררי CSS לאלמנטים שיוסרו מן ההטמעות."
         embed_classname_whitelist: "שמות מחלקות CSS מאושרות"
         save: "שמירת הגדרות הטמעה"
       permalink:
         title: "קישורים קבועים"
-        description: "נא לשים לב שהגדרה זו חלה רק על מקורות חיצוניים, קישורים שפורסמו בפורום שלך לא יופנו."
+        description: "הפניות להחיל על כתובות שאינן מוכרות לפורום."
         url: "כתובת"
         topic_id: "מזהה נושא"
         topic_title: "נושא"
@@ -4518,6 +4613,7 @@ he:
         category_id: "מזהה לקטגוריה"
         category_title: "קטגוריה"
         external_url: "כתובת חיצונית"
+        destination: "יעד"
         delete_confirm: " להסיר את הקישור הקבוע?"
         form:
           label: "חדש:"
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index d93084fe01..84a82870ae 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -28,7 +28,6 @@ hu:
     dates:
       time: "h:mm a"
       timeline_date: "YYYY MMMM"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMM DD"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -265,6 +264,12 @@ hu:
       remove: "Könyvjelző eltávolítása"
       confirm_clear: "Biztos, hogy törli az összes könyvjelzőjétt ebből a témából?"
       save: "Mentés"
+      reminders:
+        later_today: "A mai nap folyamán"
+        tomorrow: "Holnap"
+        next_week: "Jövő héten"
+        later_this_week: "A hét folyamán"
+        next_month: "Jövő hónapban"
     drafts:
       resume: "Folytatás"
       remove: "Eltávolítás"
@@ -900,9 +905,6 @@ hu:
         success_staff: "Küldtünk egy üzenetet az email címedre. Kérlek, kövesd az utasításokat fiókod érvényesítéséhez!"
       change_avatar:
         title: "Profilkép megváltoztatása"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, alapján"
-        gravatar_title: "Az avatar megváltoztatása a Gravatar weboldalon"
-        refresh_gravatar_title: "Gravatar frissítése"
         letter_based: "A rendszer által adott profilkép"
         uploaded_avatar: "Egyéni kép"
         uploaded_avatar_empty: "Egyéni kép hozzáadása"
@@ -1154,6 +1156,8 @@ hu:
         back: "Visszalépés"
         again: "Újrapróbál"
         fixed: "Oldal betöltése"
+    modal:
+      close: "bezárás"
     close: "Bezárás"
     assets_changed_confirm: "Az oldal frissítve lett. Frissíts a legújabb verzióért "
     logout: "Kijelentkeztél."
@@ -1325,7 +1329,6 @@ hu:
       filter_placeholder: Emodzsi keresése
       objects: Tárgyak
       flags: Jelölések
-      custom: Egyéni emodzsik
       recent: Nemrég használt
       default_tone: Nincs bőrszín
       light_tone: Világos bőrszín
@@ -1333,6 +1336,7 @@ hu:
       medium_tone: Közepes bőrszín
       medium_dark_tone: Közepesen sötét bőrszín
       dark_tone: Sötét bőrszín
+      default: Egyéni emodzsik
     shared_drafts:
       title: "Megosztott vázlatok"
       notice: "Ez a téma azoknak látható akik látják a <b>{{category}}</b>kategóriát"
@@ -1455,6 +1459,7 @@ hu:
       mentioned: "<span>{{username}}</span>{{description}}"
       group_mentioned: "<span>{{username}} </span>{{description}}"
       quoted: "<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}}"
@@ -1962,6 +1967,7 @@ hu:
             title: "A html rész mutatása az e-mailnak"
             button: "HTML"
       bookmarks:
+        created: "Létrehozott"
         name: "Név"
     category:
       none: "(nincs kategória)"
@@ -2930,7 +2936,6 @@ hu:
           staff: "Személyzet"
           suspended: "Felfüggesztett"
           silenced: "Némított"
-          suspect: "Meggyanúsítás"
           staged: "Lépcsőzetes"
         approved: "Jóváhagyott?"
         titles:
@@ -2947,7 +2952,6 @@ hu:
           moderators: "Moderátorok"
           silenced: "Némított felhasználók"
           suspended: "Felfüggesztett felhasználok"
-          suspect: "Megfigyelt felhasználok"
         not_verified: "Nincs megerősítve"
         check_email:
           title: "A felhasználó email címének megjelenítése"
@@ -3161,6 +3165,7 @@ hu:
         help: "Adjon hozzá egy új emodzsit, amely mindenki számára elérhető lesz. (PROTIP: fogjon és vigyen több fájlt egyszerre)"
         add: "Új emodzsi hozzáadása"
         name: "Név"
+        group: "Csoport"
         image: "Kép"
         delete_confirm: "Biztos, hogy törli a(z) :%{name}: emodzsit?"
       embedding:
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index 072bd750b9..ea8fefb9ca 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -28,7 +28,6 @@ hy:
     dates:
       time: "h:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -262,6 +261,12 @@ hy:
       remove: "Հեռացնել էջանշանը"
       confirm_clear: "Դուք համոզվա՞ծ եք, որ ցանկանում եք հեռացնել այս թեմայի բոլոր էջանշանները:"
       save: "Պահպանել"
+      reminders:
+        later_today: "Այսօր, մի փոքր ուշ"
+        tomorrow: "Վաղը"
+        next_week: "Հաջորդ շաբաթ"
+        later_this_week: "Այս շաբաթ, մի փոքր ավելի ուշ"
+        next_month: "Հաջորդ ամիս"
     drafts:
       resume: "Վերսկսել"
       remove: "Ջնջել"
@@ -790,10 +795,6 @@ hy:
         success_staff: "Մենք ուղարկել ենք էլ. նամակ Ձեր ընթացիկ հասցեին: Խնդրում ենք հետևել հաստատման հրահանգներին:"
       change_avatar:
         title: "Փոխել Ձեր պրոֆիլի նկարը"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, հիմնված"
-        gravatar_title: "Փոխեք Ձեր անձնապատրկեը Gravatar-ի կայքում"
-        gravatar_failed: "Մենք չկարողացանք գտնել Gravatar այդ էլ. հասցեով:"
-        refresh_gravatar_title: "Թարմացնել Ձեր Gravatar-ը"
         letter_based: "Համակարգի կողմից դրված պրոֆիլի նկար"
         uploaded_avatar: "Անհատական նկար"
         uploaded_avatar_empty: "Ավելացնել անհատական նկար"
@@ -1061,6 +1062,8 @@ hy:
         back: "Վերադառնալ"
         again: "Կրկին Փորձել"
         fixed: "Բեռնել էջը"
+    modal:
+      close: "փակել"
     close: "Փակել"
     assets_changed_confirm: "Այս կայքը հենց նոր թարմացվել է: Թարմացնե՞լ էջը հիմա՝ ամենավերջին տարբերակն ստանալու համար:"
     logout: "Դուք դուրս եք գրվել:"
@@ -1263,7 +1266,6 @@ hy:
       objects: Օբյեկտներ
       symbols: Նշաններ
       flags: Դրոշներ
-      custom: Մասնավոր էմոջիներ
       recent: Վերջերս օգտագործված
       default_tone: Առանց շերտի գույնի
       light_tone: Շերտի բաց գույնով
@@ -1271,6 +1273,7 @@ hy:
       medium_tone: Շերտի միջին գույն
       medium_dark_tone: Շերտի միջինից մուգ գույն
       dark_tone: Շերտի մուգ գույն
+      default: Մասնավոր էմոջիներ
     shared_drafts:
       title: "Կիսված Սևագրեր"
       notice: "Այս թեման տեսանելի է միայն նրանց, ովքեր կարող են տեսնել <b>{{category}}</b> կատեգորիան:"
@@ -1411,6 +1414,7 @@ hy:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -2119,6 +2123,7 @@ hy:
             title: "Ցուցադրել էլ. նամակի html մասը"
             button: "HTML"
       bookmarks:
+        created: "Ստեղծված"
         name: "Անուն"
     category:
       can: "կարող է&hellip; "
@@ -3405,7 +3410,6 @@ hy:
           staff: "Անձնակազմ"
           suspended: "Սառեցված"
           silenced: "Լռեցված"
-          suspect: "Կասկացել"
           staged: "Աստիճանավորված (Staged)"
         approved: "Հաստատվա՞ծ"
         titles:
@@ -3422,7 +3426,6 @@ hy:
           moderators: "Մոդերատորներ"
           silenced: "Լռեցված Օգտատերեր"
           suspended: "Սառեցված Օգտատերեր"
-          suspect: "Կասկածել Օգտատերերին(Suspect Users)"
           staged: "Աստիճանավորված Օգտատերեր"
         not_verified: "Չհաստատված"
         check_email:
@@ -3765,6 +3768,7 @@ hy:
         help: "Ավելացրեք նոր էմոջի, որը հասանելի կլինի բոլորին: (ՀՈՒՇՈՒՄ՝ քաշեք և գցեք բազմակի ֆայլեր միանգամից)"
         add: "Ավելացնել Նոր Էմոջի"
         name: "Անուն"
+        group: "Խումբ"
         image: "Նկար"
         delete_confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել :%{name}: էմոջին:"
       embedding:
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 81216edbec..50d931693a 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -28,7 +28,6 @@ id:
       time: "h:mm a"
       time_short_day: "ddd, HH: mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "BBB D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -240,18 +239,12 @@ id:
     bookmarks:
       created: "Anda telah menandai post ini"
       not_bookmarked: "tandai pos ini"
-      created_with_reminder: "anda telah menandai pos ini dengan pengingat pada %{date}"
       remove: "Hilangkan penandaan"
       confirm_clear: "Yakin ingin menghapus semua penandaan Anda dari topik ini?"
       save: "Simpan"
       no_timezone: 'Anda belum menetapkan zona waktu. Anda tidak akan dapat mengatur pengingat. Tetapkan satu <a href="%{basePath}/my/preferences/profile">di profil Anda</a> .'
       reminders:
         at_desktop: "Lain kali saat saya di depan komputer"
-        later_today: "Nanti <br/> {{date}}"
-        next_business_day: "Hari kerja berikutnya <br/> {{date}}"
-        tomorrow: "Besok <br/> {{date}}"
-        next_week: "Minggu depan <br/> {{date}}"
-        next_month: "Bulan depan <br/> {{date}}"
         custom: "Tanggal dan waktu tersuai"
     drafts:
       resume: "Lanjut"
@@ -836,9 +829,6 @@ id:
         success: "Kami telah mengirimkan surel kepada alamat itu. Silahkan mengikuti petunjuk konfirmasi didalamnya."
       change_avatar:
         title: "Ganti gambar profil anda"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, berdasarkan "
-        gravatar_title: "Ganti avatar anda di website Gravatar"
-        refresh_gravatar_title: "Segarkan Gravatas kamu"
         uploaded_avatar: "Gambar kustom"
         uploaded_avatar_empty: "Tambah gambar kustom"
         upload_title: "Unggah gambar anda"
@@ -1052,6 +1042,8 @@ id:
         back: "Kembali"
         again: "Coba Lagi"
         fixed: "Mengakses Halaman"
+    modal:
+      close: "tutup"
     close: "Tutup"
     logout: "Anda telah keluar."
     refresh: "Segarkan"
@@ -1419,6 +1411,7 @@ id:
         controls:
           first: "Revisi pertama"
       bookmarks:
+        created: "Dibuat"
         name: "Nama"
     category:
       edit: "Ubah"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index cc6521b9d7..4173610a3c 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -29,7 +29,7 @@ it:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, h:mm a"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM YYYY h:mm a"
@@ -124,7 +124,7 @@ it:
       email: "Invia questo collegamento per email"
     action_codes:
       public_topic: "ha reso questo argomento pubblico %{when}"
-      private_topic: "ha reso questo argomento privato %{when}"
+      private_topic: "ha reso questo argomento un messaggio personale %{when}"
       split_topic: "ha separato questo argomento %{when}"
       invited_user: "ha invitato %{who} %{when}"
       invited_group: "ha invitato %{who} %{when}"
@@ -153,11 +153,11 @@ it:
       banner:
         enabled: "lo ha reso un annuncio il %{when}. Apparirà in cima ad ogni pagina finché non verrà chiuso dall'utente. "
         disabled: "ha rimosso questo banner il %{when}. Non apparirà più in cima ad ogni pagina."
-      forwarded: "inoltrato l&#39;e-mail qui sopra"
+      forwarded: "inoltrato l'email qui sopra"
     topic_admin_menu: "azioni argomento"
     wizard_required: "Benvenuto al tuo nuovo Discourse! Inizia la <a href='%{url}' data-auto-route='true'>procedura guidata di configurazione</a> ✨"
     emails_are_disabled: "Tutte le email in uscita sono state disabilitate a livello globale da un amministratore. Non sarà inviato nessun tipo di notifica via email."
-    bootstrap_mode_enabled: "Per aiutarti ad avviare il tuo nuovo sito, adesso sei in modalità bootstrap. Tutti i nuovi utenti saranno automaticamente promossi al livello di esperienza 1 e riceveranno il riepilogo quotidiano degli aggiornamenti via email. Questa modalità sarà disattivata automaticamente quando avrai più di %{min_users}utenti iscritti."
+    bootstrap_mode_enabled: "Per aiutarti ad avviare il tuo nuovo sito, adesso sei in modalità bootstrap. A tutti i nuovi utenti verrà assegnato il livello di esperienza 1 e le email riepilogative giornaliere saranno abilitate. Questa modalità sarà disattivata automaticamente quando avrai più di %{min_users} utenti iscritti."
     bootstrap_mode_disabled: "La modalità bootstrap sarà disattivata entro 24 ore."
     themes:
       default_description: "Default"
@@ -261,22 +261,34 @@ it:
       help:
         bookmark: "Clicca per aggiungere un segnalibro al primo messaggio di questo argomento"
         unbookmark: "Clicca per rimuovere tutti i segnalibri a questo argomento"
+        unbookmark_with_reminder: "Fare clic per rimuovere tutti i segnalibri e i promemoria in questo argomento. Hai un promemoria impostato %{reminder_at} per questo argomento."
     bookmarks:
       created: "hai inserito questo messaggio nei segnalibri"
       not_bookmarked: "aggiungi ai segnalibri"
-      created_with_reminder: "hai aggiunto questo messaggio ai segnalibri con un promemoria il%{date}"
+      created_with_reminder: "hai aggiunto un segnalibro a questo post con un promemoria %{date}"
+      created_with_at_desktop_reminder: "hai aggiunto un segnalibro a questo post e ti verrà ricordato la prossima volta che sarai sul desktop"
       remove: "Rimuovi Segnalibro"
       confirm_clear: "Sei certo di voler rimuovere tutti i segnalibri da questo argomento?"
       save: "Salva"
       no_timezone: 'Non hai ancora impostato un fuso orario. Non sarai in grado di impostare promemoria. Creane uno <a href="%{basePath}/my/preferences/profile">nel tuo profilo</a> .'
+      invalid_custom_datetime: "La data e l'ora fornite non sono valide, riprova."
+      list_permission_denied: "Non sei autorizzato a visualizzare i segnalibri di questo utente."
       reminders:
         at_desktop: "La prossima volta che sarò al mio desktop"
-        later_today: "Più tardi, oggi <br/> {{date}}"
-        next_business_day: "Il prossimo giorno lavorativo <br/> {{date}}"
-        tomorrow: "Domani <br/> {{date}}"
-        next_week: "La prossima settimana <br/> {{date}}"
-        next_month: "Il prossimo mese <br/> {{date}}"
+        later_today: "Più tardi oggi"
+        next_business_day: "Il prossimo giorno lavorativo"
+        tomorrow: "Domani"
+        next_week: "La prossima settimana"
+        later_this_week: "Più tardi questa settimana"
+        start_of_next_business_week: "Il prossimo Lunedì"
+        next_month: "Il prossimo mese"
         custom: "Data e ora personalizzate"
+        last_custom: "Ultimo"
+        none: "Nessun promemoria necessario"
+        today_with_time: "oggi alle %{time}"
+        tomorrow_with_time: "domani alle %{time}"
+        at_time: "a %{date_time}"
+        existing_reminder: "È stato impostato un promemoria per questo segnalibro che verrà inviato"
     drafts:
       resume: "Riprendi"
       remove: "Rimuovi"
@@ -455,7 +467,7 @@ it:
         pending:
           title: "In attesa"
         approved:
-          title: "Approvato:"
+          title: "Approvato"
         rejected:
           title: "Rifiutate"
         ignored:
@@ -514,6 +526,7 @@ it:
       days_visited_long: "Giorni Frequenza"
       posts_read: "Letti"
       posts_read_long: "Messaggi Letti"
+      last_updated: "Ultimo aggiornamento:"
       total_rows:
         one: "%{count} utente"
         other: "%{count} utenti"
@@ -539,6 +552,7 @@ it:
         deny: "Nega"
         denied: "negato"
         undone: "richiesta annullata"
+        handle: "gestisci le richieste di iscrizione"
       manage:
         title: "Gestisci"
         name: "Nome"
@@ -623,11 +637,11 @@ it:
         remove_member: "Rimuovi Membro"
         remove_member_description: "Rimuovi <b>%{username}</b> da questo gruppo"
         make_owner: "Assegna Proprietà"
-        make_owner_description: "Fai di <b>%{username}</b> un proprietario di questo gruppo"
+        make_owner_description: "Rendi <b>%{username}</b> un proprietario di questo gruppo"
         remove_owner: "Rimuovi come Proprietario"
-        remove_owner_description: "Rimuovi <b>%{username}</b>come proprietario di questo gruppo "
+        remove_owner_description: "Rimuovi <b>%{username}</b> come proprietario di questo gruppo "
         owner: "Proprietario"
-        forbidden: "Non puoi ancora visualizzare i membri."
+        forbidden: "Non puoi visualizzare i membri."
       topics: "Argomenti"
       posts: "Messaggi"
       mentions: "Menzioni"
@@ -648,7 +662,7 @@ it:
           description: "Verrai avvertito per ogni nuovo invio in qualsiasi messaggio, e verrà mostrato il conteggio delle nuove risposte."
         watching_first_post:
           title: "Osservando Primo Messaggio"
-          description: "Verrai avvertito di tutti i nuovi messaggi in questo gruppo, ma non delle risposte ai messaggi."
+          description: "Riceverai una notifica per tutti i nuovi messaggi in questo gruppo, ma non per le risposte ai messaggi."
         tracking:
           title: "Seguendo"
           description: "Verrai avvertito se qualcuno menziona il tuo @nome o ti risponde, e verrà mostrato un conteggio delle nuove risposte."
@@ -766,6 +780,7 @@ it:
         clear:
           title: "Pulisci"
           warning: "Sei sicuro di voler cancellare l&#39;argomento in primo piano?"
+      use_current_timezone: "Usa Fuso Orario Corrente"
       profile_hidden: "Il profilo pubblico di questo utente è nascosto."
       expand_profile: "Espandi"
       collapse_profile: "Raggruppa"
@@ -786,14 +801,14 @@ it:
         enable: "Abilita Notifiche"
         each_browser_note: "Nota: devi modificare questa impostazione per ogni browser che utilizzi."
         consent_prompt: "Desideri ricevere notifiche in tempo reale quando qualcuno risponde a un tuo messaggio?"
-      dismiss: "Nascondi"
-      dismiss_notifications: "Nascondi tutti"
+      dismiss: "Ignora"
+      dismiss_notifications: "Ignora tutti"
       dismiss_notifications_tooltip: "Imposta tutte le notifiche non lette come lette "
       first_notification: "La tua prima notifica! Selezionala per iniziare."
       dynamic_favicon: "Mostra il contatore sull'icona del browser"
       theme_default_on_all_devices: "Rendi questo il tema di default su tutti i miei dispositivi."
-      text_size_default_on_all_devices: "Rendi questa dimensione del testo il default su tutti i miei dispositivi"
-      allow_private_messages: "Consenti agli altri utenti di inviarmi messaggi privati"
+      text_size_default_on_all_devices: "Rendi questa dimensione del testo di default su tutti i miei dispositivi"
+      allow_private_messages: "Consenti agli altri utenti di inviarmi messaggi personali"
       external_links_in_new_tab: "Apri tutti i link esterni in nuove schede"
       enable_quoting: "Abilita \"rispondi quotando\" per il testo evidenziato"
       enable_defer: "Abilita il rinvio per contrassegnare gli argomenti come non letti"
@@ -822,7 +837,7 @@ it:
         warning: "Modalità Mailing List attiva. Le impostazioni per la notifica via email verranno ignorate."
       tag_settings: "Etichette"
       watched_tags: "Osservate"
-      watched_tags_instructions: "Osserverai automaticamente tutti gli argomenti con questi tag. Verrai notificato di tutti i nuovi messaggi e argomenti, e accanto all'argomento apparirà anche un conteggio dei nuovi messaggi."
+      watched_tags_instructions: "Osserverai automaticamente tutti gli argomenti con questi tag. Verrai avvertito di tutti i nuovi messaggi e argomenti, e accanto all'argomento apparirà anche un conteggio dei nuovi messaggi."
       tracked_tags: "Seguite"
       tracked_tags_instructions: "Seguirai automaticamente tutti gli argomenti con queste etichette. Accanto all'argomento apparirà il conteggio dei nuovi messaggi."
       muted_tags: "Silenziati"
@@ -837,7 +852,7 @@ it:
       watched_first_post_tags_instructions: "Riceverai la notifica per il primo messaggio di ogni nuovo argomento con queste etichette."
       muted_categories: "Silenziate"
       muted_categories_instructions: "Non riceverai notifiche riguardanti i contenuti di queste categorie, e non appariranno nelle pagine delle Categorie o dei Recenti."
-      muted_categories_instructions_dont_hide: "Non riceverai alcuna notifica riguardante nuovi argomenti in queste categorie."
+      muted_categories_instructions_dont_hide: "Non riceverai alcuna notifica relativa a nuovi argomenti in queste categorie."
       no_category_access: "Come moderatore hai accesso limitato alla categoria, il salvataggio è disabilitato."
       delete_account: "Cancella il mio account"
       delete_account_confirm: "Sei sicuro di voler cancellare il tuo account in modo permanente? Questa azione non può essere annullata!"
@@ -866,6 +881,7 @@ it:
         deleted_posts: "messaggi cancellati"
         suspensions: "sospensioni"
         warnings_received: "avvisi"
+        rejected_posts: "messaggi rifiutati"
       messages:
         all: "Tutti"
         inbox: "In arrivo"
@@ -892,6 +908,7 @@ it:
         success: "(email inviata)"
         in_progress: "(invio email in corso)"
         error: "(errore)"
+        emoji: "blocca emoji"
         action: "Invia l'email per il ripristino della password"
         set_password: "Imposta Password"
         choose_new: "Scegli una nuova password"
@@ -918,9 +935,9 @@ it:
         confirm_password_description: "Per favore conferma la tua password per continuare"
         name: "Nome"
         label: "Codice"
-        rate_limit: "Per favore, attendi prima di provare un altro codice di autenticazione."
+        rate_limit: "Attendi prima di provare un altro codice di autenticazione."
         enable_description: |
-          Scansiona il QR code con una delle app supportate (<a href="https://www.google.com/search?q=authenticator+apps+for+android" target="_blank">Android</a> – <a href="https://www.google.com/search?q=authenticator+apps+for+ios" target="_blank">iOS</a> e inserisci il tuo codice di autenticazione
+          Scansiona il QR code con una delle app supportate (<a href="https://www.google.com/search?q=authenticator+apps+for+android" target="_blank">Android</a> – <a href="https://www.google.com/search?q=authenticator+apps+for+ios" target="_blank">iOS</a> e inserisci il tuo codice di autenticazione.
         disable_description: "Inserisci il codice di autenticazione dalla tua app"
         show_key_description: "Inserisci manualmente"
         short_description: |
@@ -941,6 +958,7 @@ it:
           title: "Authenticator basati su Token"
           add: "Nuovo Authenticator"
           default_name: "Il mio Authenticator"
+          name_and_code_required_error: "Devi fornire un nome e il codice dalla tua app di autenticazione."
         security_key:
           register: "Registrare"
           title: "Security Keys"
@@ -951,6 +969,7 @@ it:
           edit: "Modifica Security Key"
           edit_description: "Nome Security Key"
           delete: "Elimina"
+          name_required_error: "Devi fornire un nome per la Security Key"
       change_about:
         title: "Modifica i dati personali"
         error: "Si è verificato un errore durante la modifica del valore."
@@ -967,18 +986,18 @@ it:
         success_staff: "Abbiamo inviato una email al tuo indirizzo corrente. Segui le istruzioni di conferma."
       change_avatar:
         title: "Cambia l'immagine del tuo profilo"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basato su"
-        gravatar_title: "Cambia il tuo avatar sul sito Gravatar"
-        gravatar_failed: "Non è stato trovato alcun Gravatar abbinato a questa email."
-        refresh_gravatar_title: "Ricarica il tuo Gravatar"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, basato su"
+        gravatar_title: "Cambia il tuo avatar sul sito {{gravatarName}}"
+        gravatar_failed: "Non è stato trovato alcun {{gravatarName}} abbinato a questa email. "
+        refresh_gravatar_title: "Ricarica il tuo {{gravatarName}}"
         letter_based: "Immagine del profilo assegnata dal sistema"
         uploaded_avatar: "Immagine personalizzata"
         uploaded_avatar_empty: "Aggiungi un'immagine personalizzata"
         upload_title: "Carica la tua foto"
         image_is_not_a_square: "Attenzione: abbiamo ritagliato l'immagine; la larghezza e l'altezza non erano uguali."
       change_profile_background:
-        title: "Testata Profilo "
-        instructions: "Le testate dei profili saranno centrate e avranno una larghezza predefinita di 1110 px."
+        title: "Intestazione Profilo "
+        instructions: "Le intestazioni dei profili saranno centrate e avranno una larghezza predefinita di 1110 px."
       change_card_background:
         title: "Sfondo Scheda Utente"
         instructions: "Le immagini di sfondo saranno centrate e per difetto avranno un'ampiezza di 590px."
@@ -990,7 +1009,7 @@ it:
         primary: "Email principale"
         secondary: "Email secondaria"
         no_secondary: "Nessuna email secondaria"
-        sso_override_instructions: "L'e-mail può essere aggiornato dal provider SSO."
+        sso_override_instructions: "L'email può essere aggiornata dal provider SSO."
         instructions: "Mai mostrato pubblicamente"
         ok: "Ti invieremo una email di conferma"
         invalid: "Inserisci un indirizzo email valido"
@@ -1033,6 +1052,9 @@ it:
         any: "qualunque"
       password_confirmation:
         title: "Ripeti la password"
+      invite_code:
+        title: "Codice Invito"
+        instructions: "La registrazione dell'account richiede un codice di invito"
       auth_tokens:
         title: "Dispositivi utilizzati di recente"
         ip: "IP"
@@ -1079,7 +1101,7 @@ it:
         always: "sempre"
         never: "mai"
       email_digests:
-        title: "Quando non visito il sito da un po', inviami un'email con il riepiloglo degli argomenti e delle risposte più popolari"
+        title: "Quando non visito il sito, inviami un'email riepilogativa degli argomenti e delle risposte di successo"
         every_30_minutes: "ogni 30 minuti"
         every_hour: "ogni ora"
         daily: "ogni giorno"
@@ -1087,12 +1109,12 @@ it:
         every_month: "ogni mese"
         every_six_months: "ogni sei mesi"
       email_level:
-        title: "Inviami una email quando qualcuno mi cita, risponde ai miei messaggi, menziona il mio @nomeutente, o mi invita in un argomento."
+        title: "Inviami una email quando qualcuno mi cita, risponde ad un mio messaggio, menziona il mio @nomeutente, o mi invita in un argomento."
         always: "sempre"
         only_when_away: "solo quando non collegato"
         never: "mai"
       email_messages_level: "Inviami una email quando qualcuno mi manda un messaggio"
-      include_tl0_in_digests: "Includi contenuti dei nuovi utenti nelle email di riepilogo"
+      include_tl0_in_digests: "Includi contenuti dei nuovi utenti nelle email riepilogative"
       email_in_reply_to: "Nelle email includi un estratto delle risposte al messaggio"
       other_settings: "Altro"
       categories_settings: "Categorie"
@@ -1253,6 +1275,9 @@ it:
         back: "Torna Indietro"
         again: "Riprova"
         fixed: "Carica Pagina"
+    modal:
+      close: "chiudi"
+      dismiss_error: "Ignora errore"
     close: "Chiudi"
     assets_changed_confirm: "Questo sito è stato aggiornato. Aggiornare ora alla nuova versione?"
     logout: "Sei stato disconnesso."
@@ -1261,6 +1286,12 @@ it:
       enabled: "Questo sito è in modalità di sola lettura. Puoi continuare a navigare nel sito, ma le risposte, i \"Mi piace\" e altre azioni sono per il momento disabilitate."
       login_disabled: "La connessione è disabilitata quando il sito è in modalità di sola lettura."
       logout_disabled: "La disconnessione è disabilitata quando il sito è in modalità di sola lettura."
+    too_few_topics_and_posts_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Cominciamo la discussione!</a> {currentTopics, plural, one {C'è <strong>#</strong> argomento} other {Ci sono <strong>#</strong> argomenti}} e {currentPosts, plural, one {<strong>#</strong> messaggio} other {<strong>#</strong> messaggi}}.  I visitatori hanno bisogno di più per leggere e rispondere: – consigliamo almeno {requiredTopics, plural, one {<strong>#</strong> argomento} other {<strong>#</strong> argomenti}} and {requiredPosts, plural, one {<strong>#</strong> messaggio} other {<strong>#</strong> messaggi}}. Solo lo staff può vedere questo messaggio.
+    too_few_topics_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Cominciamo la discussione!</a> {currentTopics, plural, one {C'è <strong>#</strong> argomento} other {Ci sono<strong>#</strong> argomenti}}.  I visitatori hanno bisogno di più per leggere e rispondere: – consigliamo almeno {requiredTopics, plural, one {<strong>#</strong> argomento} other {<strong>#</strong> argomenti}}. Solo lo staff può vedere questo messaggio.
+    too_few_posts_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Cominciamo la discussione!</a> {currentPosts, plural, one {C'è <strong>#</strong> messaggio} other {Ci sono <strong>#</strong> messaggi}}.  I visitatori hanno bisogno di più per leggere e rispondere: – consigliamo almeno {requiredPosts, plural, one {<strong>#</strong> messaggio} other {<strong>#</strong> messaggi}}. Solo lo staff può vedere questo messaggio.
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} altro {# errors/hour}}</a> il limite impostato di {limit, plural, one {# error/hour} altro {# errors/hour}}."
       reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} altro {# errors/minute}}</a> raggiunto il limite impostato di {limit, plural, one {# error/minute} altro {# errors/minute}}."
@@ -1321,31 +1352,34 @@ it:
     trust_level: "Livello Esperienza"
     search_hint: "nome utente, email o indirizzo IP"
     create_account:
-      disclaimer: "Registrandoti accetti il <a href='{{privacy_link}}' target='blank'>regolamento sulla Privacy</a> e <a href='{{tos_link}}' target='blank'>i termini del servizio</a>."
+      disclaimer: "Registrandoti accetti il <a href='{{privacy_link}}' target='blank'>regolamento sulla Privacy</a> e <a href='{{tos_link}}' target='blank'>i termini di servizio</a>."
       title: "Crea Nuovo Account"
       failed: "Qualcosa non ha funzionato. Forse questa email è già registrata, prova a usare il link di recupero password"
     forgot_password:
       title: "Reimposta Password"
       action: "Ho dimenticato la password"
       invite: "Inserisci il nome utente o l'indirizzo email. Ti manderemo un'email per l'azzeramento della password."
-      reset: "Azzera Password"
+      reset: "Reimposta Password"
       complete_username: "Se un account corrisponde al nome utente <b>%{username}</b>, a breve dovresti ricevere un'email con le istruzioni per ripristinare la tua password."
       complete_email: "Se un account corrisponde a <b>%{email}</b>, a breve dovresti ricevere un'email contenente le istruzioni per ripristinare la password."
+      complete_username_found: "C'è un account che corrisponde al nome utente <b>%{username}</b>. A breve dovresti ricevere una email con le istruzioni per reimpostare la tua password. "
+      complete_email_found: "C'è un account che corrisponde a <b>%{email}</b>. A breve dovresti ricevere una email con le istruzioni per reimpostare la tua password. "
       complete_username_not_found: "Nessun account corrisponde al nome utente <b>%{username}</b>"
-      complete_email_not_found: "Nessun account corrisponde alla email <b>%{email}</b>"
+      complete_email_not_found: "Nessun account corrisponde a <b>%{email}</b>"
       help: "Le email non arrivano? Per prima cosa assicurati di controllare la cartella spam.<p>Non sei sicuro di quale indirizzo email hai usato? Inserisci un indirizzo email e ti faremo sapere se esiste.</p><p>Se non hai più accesso all'indirizzo email del tuo account, per favore contatta <a href='%{basePath}/about'>il nostro staff.</a></p>"
       button_ok: "OK"
       button_help: "Aiuto"
     email_login:
       link_label: "Inviami un link di accesso"
       button_label: "con email"
-      complete_username: "Se un account corrisponde al nome utente <b>%{username}</b> , a breve dovresti ricevere un'email con un link di accesso."
-      complete_email: "Se un account corrisponde a <b>%{email}</b>, a breve dovresti ricevere un'email con un link di accesso. "
+      emoji: "emoji lock"
+      complete_username: "Se un account corrisponde al nome utente <b>%{username}</b> , a breve dovresti ricevere un'email con un collegamento per l'accesso."
+      complete_email: "Se un account corrisponde a <b>%{email}</b>, a breve dovresti ricevere un'email con un collegamento per l'accesso."
       complete_username_found: "Abbiamo trovato un account che corrisponde al nome utente <b>%{username}</b>, a breve dovresti ricevere un'email con un collegamento per l'accesso."
-      complete_email_found: "Abbiamo trovato un account che corrisponde a <b>%{email}</b>. A breve dovresti ricevere una email con un link di login."
+      complete_email_found: "Abbiamo trovato un account che corrisponde a <b>%{email}</b>, a breve dovresti ricevere una email con un collegamento per l'accesso."
       complete_username_not_found: "Nessun account con nome utente <b>%{username}</b>"
       complete_email_not_found: "Nessun account con email <b>%{email}</b>"
-      confirm_title: "Procedi su %{site_name}."
+      confirm_title: "Procedi su %{site_name}"
       logging_in_as: "Accesso come %{email}"
       confirm_button: Completa l'accesso
     login:
@@ -1368,7 +1402,7 @@ it:
       caps_lock_warning: "Il Blocco Maiuscole è attivo"
       error: "Errore sconosciuto"
       cookies_error: "Sembra che il tuo browser abbia i cookie disabilitati. Potresti non riuscire a connetterti senza abilitarli."
-      rate_limit: "Per favore attendi prima di provare nuovamente la connessione."
+      rate_limit: "Attendi prima di provare nuovamente a connetterti."
       blank_username: "Per favore, inserisci la tua email o il tuo nome utente."
       blank_username_or_password: "Per favore inserisci la tua email o il tuo nome utente, e la password."
       reset_password: "Azzera Password"
@@ -1387,8 +1421,8 @@ it:
       change_email: "Cambia Indirizzo Email"
       provide_new_email: "Fornisci un nuovo indirizzo e invieremo nuovamente la tua email di conferma."
       submit_new_email: "Aggiorna Indirizzo Email"
-      sent_activation_email_again: "Ti abbiamo mandato un'altra email di attivazione su <b>{{currentEmail}}</b>. Potrebbero essere necessari alcuni minuti di attesa; assicurati di controllare anche la cartella dello spam."
-      sent_activation_email_again_generic: "Abbiamo inviato un'altra email di attivazione. Potrebbero passare alcuni minuti prima che arrivi; assicurati di controllare la tua cartella dello spam."
+      sent_activation_email_again: "Ti abbiamo mandato un'altra email di attivazione su <b>{{currentEmail}}</b>. Potrebbero essere necessari alcuni minuti di attesa; assicurati di controllare anche la cartella  spam."
+      sent_activation_email_again_generic: "Abbiamo inviato un'altra email di attivazione. Potrebbero passare alcuni minuti prima che arrivi; assicurati di controllare la tua cartella spam."
       to_continue: "Per favore Connettiti"
       preferences: "Devi essere connesso per cambiare le tue impostazioni."
       forgot: "Non ricordo i dettagli del mio account"
@@ -1416,6 +1450,7 @@ it:
         backup_code: "Utilizza un codice di backup"
     invites:
       accept_title: "Invito"
+      emoji: "emoji envelope"
       welcome_to: "Benvenuto su %{site_name}!"
       invited_by: "Sei stato invitato da:"
       social_login_available: "Sarai anche in grado di accedere con qualsiasi login social usando questa email."
@@ -1450,7 +1485,7 @@ it:
     conditional_loading_section:
       loading: In caricamento...
     category_row:
-      topic_count: "{{count}} Argomenti in questa categoria"
+      topic_count: "{{count}} argomenti in questa categoria"
     select_kit:
       default_header_text: Selezione...
       no_content: Nessun risultato trovato
@@ -1463,9 +1498,12 @@ it:
       min_content_not_reached:
         one: "Seleziona almeno {{count}} elemento."
         other: "Seleziona almeno {{count}} elementi."
+      invalid_selection_length: "La selezione deve contenere almeno {{count}} caratteri."
     date_time_picker:
       from: Da
       to: A
+      errors:
+        to_before_from: "La data di fine deve essere successiva alla data di inizio."
     emoji_picker:
       filter_placeholder: Ricerca per emoji
       smileys_&_emotion: Smileys ed Emotion
@@ -1476,8 +1514,7 @@ it:
       activities: Attività
       objects: Oggetti
       symbols: Simboli
-      flags: Segnalazioni
-      custom: Emoji personalizzate
+      flags: Bandiere
       recent: Usate recentemente
       default_tone: Nessun tono della pelle
       light_tone: Tono della pelle chiaro
@@ -1485,6 +1522,7 @@ it:
       medium_tone: Tono della pelle medio
       medium_dark_tone: Tono della pelle medio scuro
       dark_tone: Tono della pelle scuro
+      default: Emoji personalizzate
     shared_drafts:
       title: "Bozze condivise"
       notice: "L'argomento è visibile solo a chi può vedere la categoria <b>{{category}}</b>."
@@ -1507,7 +1545,7 @@ it:
       similar_topics: "Il tuo argomento è simile a..."
       drafts_offline: "bozze offline"
       edit_conflict: "modifica conflitto"
-      group_mentioned_limit: "<b>Attenzione!</b> Hai menzionato <a href='{{group_link}}'>{{group}}</a>, tuttavia questo gruppo ha più membri del limite per le menzioni configurato dagli amministratori di {{max}} utenti. Nessuna notifica verrà inviata. "
+      group_mentioned_limit: "<b>Attenzione!</b> Hai menzionato <a href='{{group_link}}'>{{group}}</a>, tuttavia questo gruppo ha più membri del limite per le menzioni di {{max}} utenti  configurato dagli amministratori . Nessuna notifica verrà inviata. "
       group_mentioned:
         one: "Menzionando {{group}}, verrà notificata <a href='{{group_link}}'>%{count} persona</a> – sei sicuro?"
         other: "Menzionando {{group}}, verranno notificate <a href='{{group_link}}'>{{count}} persone</a> – sei sicuro?"
@@ -1525,7 +1563,7 @@ it:
         try_like: "Hai provato ad usare il pulsante {{heart}} ?"
         category_missing: "Devi scegliere una categoria"
         tags_missing: "Devi scegliere almeno {{count}} etichette"
-        topic_template_not_modified: "Aggiungi dettagli e specificità al tuo Argomento modificando il modello di Argomento."
+        topic_template_not_modified: "Aggiungi dettagli e specificità al tuo argomento modificando il modello di argomento."
       save_edit: "Salva Modifiche"
       overwrite_edit: "Sovrascrivi modifica"
       reply_original: "Rispondi all'Argomento Originale"
@@ -1550,6 +1588,7 @@ it:
       view_new_post: "Visualizza il tuo nuovo messaggio."
       saving: "Salvataggio"
       saved: "Salvato!"
+      saved_draft: "Bozza del messaggio in corso. Tocca per riprendere."
       uploading: "In caricamento..."
       show_preview: "visualizza anteprima &raquo;"
       hide_preview: "&laquo; nascondi anteprima"
@@ -1564,7 +1603,7 @@ it:
       link_description: "inserisci qui la descrizione del collegamento"
       link_dialog_title: "Inserisci il collegamento"
       link_optional_text: "titolo opzionale"
-      link_url_placeholder: "Incolla un URL o digita per cercare Argomenti"
+      link_url_placeholder: "Incolla un URL o digita per cercare argomenti"
       quote_title: "Citazione"
       quote_text: "Citazione"
       code_title: "Testo preformattato"
@@ -1598,7 +1637,8 @@ it:
           desc: Rispondi a uno specifico messaggio
         reply_as_new_topic:
           label: Rispondi con un argomento correlato
-          desc: Crea un nuovo Argomento collegato a questo Argomento
+          desc: Crea un nuovo argomento collegato a questo argomento
+          confirm: "È stata salvata una nuova bozza di argomento, che verrà sovrascritta se si crea un argomento collegato."
         reply_as_private_message:
           label: Nuovo messaggio
           desc: Crea un nuovo messaggio personale
@@ -1624,6 +1664,9 @@ it:
         message:
           one: "%{count} messaggio non letto"
           other: "{{count}} messaggi non letti"
+        high_priority:
+          one: "%{count} notifica ad alta priorità non letta"
+          other: "%{count} notifiche ad alta priorità non lette"
       title: "notifiche di menzioni @nome, risposte ai tuoi messaggi e argomenti ecc."
       none: "Impossibile caricare le notifiche al momento."
       empty: "Nessuna notifica trovata."
@@ -1632,6 +1675,7 @@ it:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -1642,7 +1686,7 @@ it:
         other: "<span>{{username}}, {{username2}} e {{count}} altri</span> {{description}}"
       liked_consolidated_description:
         one: "ha messo \"mi piace\" ad {{count}} tuo messaggio"
-        other: "ha messo \"mi piace\" ad {{count}} dei tuoi messaggi"
+        other: "ha 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}}"
@@ -1682,6 +1726,8 @@ it:
         posted: "nuovo messaggio"
         moved_post: "messaggio spostato"
         linked: "linkato"
+        bookmark_reminder: "promemoria segnalibro"
+        bookmark_reminder_with_name: "promemoria segnalibro - %{name}"
         granted_badge: "distintivo assegnato"
         invited_to_topic: "invitato ad un Argomento"
         group_mentioned: "gruppo menzionato"
@@ -1735,7 +1781,7 @@ it:
       context:
         user: "Cerca messaggi di @{{username}}"
         category: "Cerca nella categoria #{{category}}"
-        tag: "Cerca l'etichetta # {{tag}}"
+        tag: "Cerca l'etichetta #{{tag}}"
         topic: "Cerca in questo argomento"
         private_messages: "Cerca messaggi"
       advanced:
@@ -1755,10 +1801,11 @@ it:
           title: cerca solo nel titolo
           likes: su cui ho messo "Mi Piace"
           posted: ho pubblicato in
+          created: ho creato
           watching: sto osservando
           tracking: sto seguendo
           private: nei miei messaggi privati
-          bookmarks: Aggiunti ai segnalibri
+          bookmarks: ho aggiunto ai segnalibri
           first: sono il primissimo post
           pinned: sono appuntati
           unpinned: non sono appuntati
@@ -1771,6 +1818,7 @@ it:
           label: In cui gli argomenti
           open: sono aperti
           closed: sono chiusi
+          public: sono pubblici
           archived: sono archiviati
           noreplies: hanno zero risposte
           single_user: contengono un singolo utente
@@ -1790,7 +1838,7 @@ it:
     topics:
       new_messages_marker: "ultima visita"
       bulk:
-        select_all: "Seleziona Tutti"
+        select_all: "Seleziona Tutto"
         clear_all: "Deseleziona Tutto"
         unlist_topics: "Rendi invisibili"
         relist_topics: "Ripubblica Argomenti"
@@ -1858,6 +1906,13 @@ it:
       defer:
         help: "Contrassegna come non letto"
         title: "Rinvia"
+      feature_on_profile:
+        help: "Aggiungi un collegamento a questo argomento sulla tua scheda utente e sul tuo profilo"
+        title: "Feature 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"
@@ -1898,8 +1953,10 @@ it:
       read_more: "Vuoi saperne di più? {{catLink}} o {{latestLink}}."
       group_request: "Per vedere questo Argomento devi richiedere l&#39;iscrizioneal gruppo `{{name}}`"
       group_join: "È necessario iscriversi al gruppo `{{name}}` per visualizzare questo Argomento"
+      group_request_sent: "La tua richiesta di iscrizione al gruppo è stata inviata. Sarai informato quando sarà accettato."
       unread_indicator: "Nessun utente ha ancora letto l&#39;ultimo post di questo Argomento."
       read_more_MF: "{ UNREAD, plural, =0 {} one { C'è <a href='{basePath}/unread'>1 argomento non letto</a> } other { Ci sono <a href='{basePath}/unread'># argomenti non letti</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{e } false {è } other{}} <a href='{basePath}/new'>1 nuovo</a> argomento} other { {BOTH, select, true{e } false {Ci sono } other{}} <a href='{basePath}/new'># nuovi</a> argomenti} } restanti, o {CATEGORY, select, true {visualizza altri argomenti in {catLink}} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Scorri tutte le categorie
       view_latest_topics: visualizza gli argomenti più recenti
       suggest_create_topic: "Perché non crei un argomento?"
@@ -1910,6 +1967,7 @@ it:
         title: "Timer Argomento"
         save: "Imposta Timer"
         num_of_hours: "Numero di ore:"
+        num_of_days: "Numero di giorni:"
         remove: "Rimuovi Timer"
         publish_to: "Pubblica Su:"
         when: "Quando:"
@@ -1952,6 +2010,8 @@ it:
         title: "Riproponi automaticamente l’argomento"
       reminder:
         title: "Ricordamelo"
+      auto_delete_replies:
+        title: "Elimina Automaticamente Risposte"
       status_update_notice:
         auto_open: "Questo argomento verrà automaticamente aperto %{timeLeft}"
         auto_close: "Questo argomento si chiuderà automaticamente in %{timeLeft}."
@@ -1960,6 +2020,7 @@ it:
         auto_delete: "Questo argomento verrà automaticamente cancellato %{timeLeft}."
         auto_bump: "Questo argomento sarà riproposto automaticamente %{timeLeft}."
         auto_reminder: "Questo argomento ti verrà ricordato %{timeLeft}."
+        auto_delete_replies: "Le risposte in questo argomento vengono automaticamente cancellate dopo %{duration}."
       auto_close_title: "Impostazioni di auto-chiusura"
       auto_close_immediate:
         one: "L'ultimo messaggio nell'argomento ha già %{count} ora, per cui l'argomento verrà chiuso immediatamente."
@@ -2171,6 +2232,18 @@ it:
         title: "Unisci Messaggi Selezionati"
         action: "unisci messaggi selezionati"
         error: "Si è verificato un errore nell'unire i messaggi selezionati."
+      publish_page:
+        title: "Pubblicazione Pagine"
+        publish: "Pubblica"
+        description: "Quando un argomento viene pubblicato come pagina, l'URL può essere condiviso e verrà visualizzato con uno stile personalizzato."
+        slug: "Abbreviazione"
+        publish_url: "La tua pagina è stata pubblicata su:"
+        topic_published: "Il tuo argomento è stato pubblicato su:"
+        preview_url: "La tua pagina sarà pubblicata su:"
+        invalid_slug: "Spiacenti, non puoi pubblicare questa pagina."
+        unpublish: "Non pubblicato"
+        unpublished: "La tua pagina non è stata pubblicata e non è più accessibile."
+        publishing_settings: "Impostazioni di Pubblicazione"
       change_owner:
         title: "Cambia Proprietario"
         action: "cambia proprietà"
@@ -2178,7 +2251,10 @@ it:
         placeholder: "nome utente del nuovo proprietario"
         instructions:
           one: "Per favore, scegli un nuovo proprietario per il messaggio che apparteneva a <b>@{{old_user}}</b>"
-          other: "Per favore, scegli un nuovo proprietario per i {{count}} messaggio che appartenevano a <b>@{{old_user}}</b>"
+          other: "Per favore, scegli un nuovo proprietario per i {{count}} messaggi che appartenevano a <b>@{{old_user}}</b>"
+        instructions_without_old_user:
+          one: "Scegli un nuovo proprietario per il messaggio"
+          other: "Scegli un nuovo proprietario per i {{count}} messaggi"
       change_timestamp:
         title: "Cambia Marca Temporale..."
         action: "cambia marca temporale"
@@ -2304,6 +2380,7 @@ it:
         convert_to_moderator: "Aggiungi Colore Staff"
         revert_to_regular: "Rimuovi Colore Staff"
         rebake: "Ricrea HTML"
+        publish_page: "Pubblicazione Pagine"
         unhide: "Mostra nuovamente"
         change_owner: "Cambia Proprietà"
         grant_badge: "Assegna Distintivo"
@@ -2335,9 +2412,18 @@ it:
           notify_moderators: "hanno informato i moderatori"
           notify_user: "hanno inviato un messaggio"
           bookmark: "l'hanno aggiunto ai segnalibri"
+          like:
+            one: "ha messo \"Mi piace\""
+            other: "ha messo \"Mi piace\""
+          read:
+            one: "ha letto"
+            other: "ha letto"
           like_capped:
             one: "e a {{count}} persona è piaciuto"
             other: "e ad altre {{count}} persone è piaciuto"
+          read_capped:
+            one: "e {{count}} ha letto"
+            other: "e altri {{count}} hanno letto"
         by_you:
           off_topic: "L'hai segnalato come fuori tema"
           spam: "L'hai segnalato come spam"
@@ -2388,7 +2474,19 @@ it:
             title: "Mostra la parte html della email"
             button: "HTML"
       bookmarks:
+        create: "Crea un segnalibro"
+        edit: "Modifica Segnalibro"
+        created: "Creazione"
         name: "Nome"
+        name_placeholder: "A cosa serve questo segnalibro?"
+        set_reminder: "Ricordamelo"
+        actions:
+          delete_bookmark:
+            name: "Cancella segnalibro"
+            description: "Rimuove il segnalibro dal tuo profilo e interrompe tutti i promemoria per il segnalibro"
+          edit_bookmark:
+            name: "Modifica Segnalibro"
+            description: "Modifica il nome del segnalibro o modifica la data e l'ora del promemoria"
     category:
       can: "può&hellip;"
       none: "(nessuna categoria)"
@@ -2404,7 +2502,7 @@ it:
       tags_allowed_tags: "Limita queste Etichette a questa Categoria:"
       tags_allowed_tag_groups: "Limita questi gruppi di Etichette a questa Categoria:"
       tags_placeholder: "Elenco (opzionale) delle etichette permesse"
-      tags_tab_description: "Le etichette e i gruppi di etichette sopra specificati saranno disponibili solo in questa categoria, e nelle altre categorie che li specificano. Non saranno disponibili per l'uso in altre categorie."
+      tags_tab_description: "Le etichette e i gruppi di etichette sopra specificati saranno disponibili solo in questa categoria e nelle altre categorie che li specificano. Non saranno disponibili per l'uso in altre categorie."
       tag_groups_placeholder: "Elenco (opzionale) dei gruppi di etichette permessi"
       manage_tag_groups_link: "Gestisci qui i gruppi di Etichette."
       allow_global_tags_label: "Consenti anche ulteriori Etichette"
@@ -2441,7 +2539,7 @@ it:
       special_warning: "Attenzione: questa è una categoria predefinita e le impostazioni di sicurezza ne vietano la modifica. Se non vuoi usare questa categoria, cancellala invece di modificarla."
       uncategorized_security_warning: "Questa è una Categoria speciale. È utilizzata come area di parcheggio per gli Argomenti senza Categoria. Non può avere impostazioni di sicurezza."
       uncategorized_general_warning: 'Questa è una Categoria speciale. È usata come Categoria predefinita per i nuovi Argomenti senza una Categoria selezionata. Se vuoi prevenire questo comportamento e forzare la scelta di una Categoria, <a href="%{settingLink}">per favore disabilita l''impostazione qui</a>. Se vuoi cambiare il nome o la descrizione, vai a <a href="%{customizeLink}">Personalizza / Contenuto Testuale</a>.'
-      pending_permission_change_alert: "Non hai aggiunto %{group} a questa categoria; fai clic su questo pulsante per aggiungerli."
+      pending_permission_change_alert: "Non hai aggiunto %{group} a questa categoria; fai clic su questo pulsante per aggiungerlo."
       images: "Immagini"
       email_in: "Indirizzo email personalizzato:"
       email_in_allow_strangers: "Accetta email da utenti anonimi senza alcun account"
@@ -2461,7 +2559,7 @@ it:
       reviewable_by_group: "Oltre che dallo staff, i messaggi e le segnalazioni in questa categoria possono essere revisionati da:"
       review_group_name: "nome gruppo"
       require_topic_approval: "Richiedi l'approvazione di un moderatore per tutti i nuovi argomenti"
-      require_reply_approval: "Richiedi l'approvazione di un moderatore per tutti i nuovi argomenti"
+      require_reply_approval: "Richiedi l'approvazione di un moderatore per tutte le nuove risposte"
       this_year: "quest'anno"
       position: "Posizione nella pagina delle Categorie:"
       default_position: "Posizione di default"
@@ -2469,7 +2567,7 @@ it:
       position_disabled_click: 'attiva l''impostazione "posizione fissa delle categorie".'
       minimum_required_tags: "Numero minimo di etichette richieste per argomento:"
       parent: "Categoria Superiore"
-      num_auto_bump_daily: "Numero di argomenti da riproporre automaticamente ogni giorno:"
+      num_auto_bump_daily: "Numero di argomenti aperti da riproporre automaticamente ogni giorno:"
       navigate_to_first_post_after_read: "Vai al primo messaggio dopo che gli argomenti vengono letti"
       notifications:
         watching:
@@ -2542,13 +2640,13 @@ it:
       custom_message:
         at_least:
           one: "inserisci almeno %{count} carattere"
-          other: "inserisci almeno {{n}} caratteri"
+          other: "inserisci almeno {{count}} caratteri"
         more:
           one: "%{count} mancante..."
           other: "{{count}} mancanti..."
         left:
           one: "%{count} mancante"
-          other: "{{count}} mancanti..."
+          other: "{{count}} rimanenti..."
     flagging_topic:
       title: "Grazie per aiutarci a mantenere la nostra comunità civile!"
       action: "Segnala Argomento"
@@ -2560,7 +2658,7 @@ it:
       links_shown: "mostra altri collegamenti..."
       clicks:
         one: "%{count} click"
-        other: "%{count} click"
+        other: "%{count} clic"
     post_links:
       about: "espandi altri collegamenti per questo messaggio"
       title:
@@ -2589,8 +2687,8 @@ it:
       unlisted:
         help: "Questo argomento è invisibile; non verrà mostrato nella liste di argomenti ed è possibile accedervi solo tramite collegamento diretto"
       personal_message:
-        title: "Questo Argomento è un Messaggio Personale"
-        help: "Questo Argomento è un Messaggio Personale"
+        title: "Questo argomento è un messaggio personale"
+        help: "Questo argomento è un messaggio personale"
     posts: "Messaggi"
     posts_long: "ci sono {{number}} messaggi in questo argomento"
     posts_likes_MF: |
@@ -2699,6 +2797,7 @@ it:
       download: "scarica"
       previous: "Precedente (tasto freccia a sinistra)"
       next: "Successivo (tasto freccia a destra)"
+      counter: "%curr% di %total%"
       close: "Chiudi (Esc)"
       content_load_error: 'Caricamento <a href="%url%">del contenuto</a> non riuscito.'
       image_load_error: 'Caricamento <a href="%url%">dell''immagine</a> non riuscito.'
@@ -2745,6 +2844,18 @@ it:
         title: "Scrittura"
         return: "%{shortcut} Ritorna al composer"
         fullscreen: "%{shortcut} Composer a tutto schermo"
+      bookmarks:
+        title: "Aggiungendo segnalibro"
+        enter: "%{shortcut} Salva e chiudi"
+        later_today: "%{shortcut}Più tardi oggi"
+        later_this_week: "%{shortcut} Più tardi questa settimana"
+        tomorrow: "%{shortcut} Domani"
+        next_week: "%{shortcut}La prossima settimana "
+        next_month: "%{shortcut} Il prossimo mese"
+        next_business_week: "%{shortcut} Inizio della prossima settimana"
+        next_business_day: "%{shortcut} Il prossimo giorno lavorativo"
+        custom: "%{shortcut} Data e ora personalizzate"
+        none: "%{shortcut} Nessun promemoria"
       actions:
         title: "Azioni"
         bookmark_topic: "%{shortcut} Aggiungi/togli argomento nei segnalibri"
@@ -2765,6 +2876,12 @@ it:
         mark_tracking: "%{shortcut} Segui argomento"
         mark_watching: "%{shortcut} Osserva argomento"
         print: "%{shortcut} Stampa argomento"
+        defer: "%{shortcut} Rinvia argomento"
+        topic_admin_actions: "%{shortcut} Apri le azioni amministrative sull'argomento"
+      search_menu:
+        title: "Menu Cerca"
+        prev_next: "%{shortcut} Sposta la selezione su e giù"
+        insert_url: "%{shortcut} Inserisci la selezione nel compositore aperto"
     badges:
       earned_n_times:
         one: "Guadagnato questo distintivo %{count} volta"
@@ -2806,14 +2923,23 @@ it:
       tags: "Etichette"
       choose_for_topic: "etichette facoltative"
       info: "Info"
+      default_info: "Questa etichetta non è limitata a nessuna categoria e non ha sinonimi."
+      category_restricted: "Questa etichetta è limitata a categorie a cui non sei autorizzato ad accedere."
       synonyms: "Sinonimi"
+      synonyms_description: "Quando vengono utilizzate le seguenti etichette, verranno sostituite con <b>%{base_tag_name}</b>."
+      tag_groups_info:
+        one: 'Questa etichetta appartiene al gruppo "{{tag_groups}}".'
+        other: "Questa etichetta appartiene a questi gruppi: {{tag_groups}}."
       category_restrictions:
         one: "Può essere utilizzato solo in questa categoria:"
         other: "Può essere utilizzato solo in queste categorie:"
       edit_synonyms: "Gestisci sinonimi"
       add_synonyms_label: "Aggiungi sinonimi:"
       add_synonyms: "Aggiungi"
-      add_synonyms_failed: "Le seguenti etichette non possono essere aggiunte come sinonimi: <b>%{tag_names}</b> . Assicurati che non abbiano sinonimi e non siano sinonimi di un'altra etichetta."
+      add_synonyms_explanation:
+        one: "Qualsiasi posto che attualmente utilizza questa etichetta verrà modificato per utilizzare invece <b>%{tag_name}</b>. Sei sicuro di voler apportare questa modifica?"
+        other: "Qualsiasi posto che attualmente utilizza queste etichette verrà modificato per utilizzare invece <b>%{tag_name}</b>. Sei sicuro di voler apportare questa modifica?"
+      add_synonyms_failed: "Le seguenti etichette non possono essere aggiunte come sinonimi: <b>%{tag_names}</b>. Assicurati che non abbiano sinonimi e non siano sinonimi di un'altra etichetta."
       remove_synonym: "Rimuovi sinonimo"
       delete_synonym_confirm: 'Sei sicuro di voler eliminare il sinonimo &quot;%{tag_name}&quot;?'
       delete_tag: "Cancella Etichetta"
@@ -2823,7 +2949,7 @@ it:
       delete_confirm_no_topics: "Sei sicuro di voler eliminare questa etichetta?"
       delete_confirm_synonyms:
         one: "Anche il suo sinonimo verrà eliminato."
-        other: "I sinonimi {{count}} verranno a loro volta eliminati."
+        other: "I {{count}} sinonimi verranno a loro volta eliminati."
       rename_tag: "Rinomina Etichetta"
       rename_instructions: "Scegli un altro nome per l'etichetta:"
       sort_by: "Ordina per:"
@@ -2832,17 +2958,17 @@ it:
       manage_groups: "Gestisci Gruppi Etichette"
       manage_groups_description: "Definisci gruppi per organizzare le etichette"
       upload: "Carica Etichette"
-      upload_description: "Carica un file csv per creare Etichette in modo massivo"
+      upload_description: "Carica un file csv per creare Etichette in massa"
       upload_instructions: "Uno per riga, indicando opzionalmente un Gruppo di Etichette con il formato 'nome_etichetta,gruppo_etichetta'"
       upload_successful: "Etichette caricate con successo"
       delete_unused_confirmation:
         one: "%{count} Etichetta sarà eliminata: %{tags}"
-        other: "%{count} Etichette saranno eliminate: %{tags}"
+        other: "%{count} etichette saranno eliminate: %{tags}"
       delete_unused_confirmation_more_tags:
         one: "%{tags} e %{count} altra"
         other: "%{tags} e %{count} altre"
-      delete_unused: "Elimina Etichette non utilizzate"
-      delete_unused_description: "Elimina tutte le Etichette che non sono usate in alcun Argomento o Messaggio Personale"
+      delete_unused: "Elimina Etichette Inutilizzate"
+      delete_unused_description: "Elimina tutte le etichette che non sono usate in alcun argomento o messaggio personale"
       cancel_delete_unused: "Annulla"
       filters:
         without_category: "%{filter} %{tag} argomenti"
@@ -2901,7 +3027,7 @@ it:
           top: "Non ci sono ulteriori argomenti popolari."
           bookmarks: "Non ci sono ulteriori argomenti nei segnalibri."
     invite:
-      custom_message: "Rendi il tuo l'invito un po' più personale scrivendo un <a href>messaggio personalizzato</a>."
+      custom_message: "Rendi il tuo invito un po' più personale scrivendo un <a href>messaggio personalizzato</a>."
       custom_message_placeholder: "Inserisci il tuo messaggio personalizzato"
       custom_message_template_forum: "Ehi, unisciti a questo forum!"
       custom_message_template_topic: "Ehi, credo che questo argomento ti possa interessare!"
@@ -2919,7 +3045,7 @@ it:
           only_muted: "quando usato da solo o con altre etichette silenziate"
           never: "mai"
       reports:
-        title: "Lista dei rapporti disponibili"
+        title: "Elenco dei rapporti disponibili"
       dashboard:
         title: "Cruscotto"
         last_updated: "Cruscotto aggiornato:"
@@ -2971,7 +3097,7 @@ it:
         disabled: Disabilitato
         timeout_error: "Spiacenti, la ricerca sta impiegando troppo tempo, per favore scegli un intervallo più breve"
         exception_error: "Spiacenti, si è verificato un errore nell'esecuzione della query"
-        too_many_requests: Hai eseguito questa operazione troppe volte. Attendi qualche istante prima di riprovare.
+        too_many_requests: Hai eseguito questa operazione troppe volte. Attendi prima di riprovare.
         not_found_error: "Spiacenti, questo rapporto non esiste"
         filter_reports: Filtra rapporti
         reports:
@@ -2997,7 +3123,7 @@ it:
           no_data: "Non ci sono dati da mostrare."
           trending_search:
             more: '<a href="%{basePath}/admin/logs/search_logs">Cerca 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">log search queries</a>per iniziare a raccogliere i dati.'
+            disabled: 'Il rapporto sulle ricerche di tendenza è disabilitato. Attiva l''opzione <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">log search queries</a> per iniziare a raccogliere i dati.'
           filters:
             file-extension:
               label: Estensione file
@@ -3081,12 +3207,27 @@ it:
         created: Creazione
         updated: Aggiornato
         last_used: Ultimo uso
+        never_used: (mai)
         generate: "Genera"
+        undo_revoke: "Annullare Revoca"
         revoke: "Revoca"
         all_users: "Tutti gli Utenti"
+        active_keys: "Chiavi API Attive"
+        manage_keys: Gestisci Chiavi
         show_details: Dettagli
         description: Descrizione
+        no_description: (nessuna descrizione)
+        all_api_keys: Tutte le Chiavi API
+        user_mode: Livello Esperienza
+        impersonate_all_users: Impersona qualsiasi utente
+        single_user: "Utente Singolo"
+        user_placeholder: Inserisci nome utente
+        description_placeholder: "A cosa servirà questa chiave?"
         save: Salva
+        new_key: Nuova Chiave API
+        revoked: Revocata
+        delete: Cancellata Permanentemente
+        not_shown_again: Questa chiave non verrà più visualizzata. Assicurati di prenderne una copia prima di continuare.
         continue: Continua
       web_hooks:
         title: "Webhook"
@@ -3142,13 +3283,19 @@ it:
           details: "Quando un'Etichetta viene creata, aggiornata o distrutta."
         flag_event:
           name: "Evento di Segnalazione"
-          details: "Quando una Segnalazione viene creata, approvata, disapprovata o ignorata."
+          details: "Quando una segnalazione viene creata, approvata, rifiutata o ignorata."
         queued_post_event:
           name: "Evento approvazione messaggio"
           details: "Quando un nuovo messaggio accodato viene creato, approvato o respinto."
         reviewable_event:
           name: "Evento revisionabile"
           details: "Quando un nuovo elemento è pronto per la revisione e quando il suo stato viene aggiornato."
+        notification_event:
+          name: "Evento Notifica"
+          details: "Quando un utente riceve una notifica nel proprio feed."
+        user_badge_event:
+          name: "Evento Assegnazione Distintivo"
+          details: "Quando un utente riceve un distintivo."
         delivery_status:
           title: "Stato di Consegna"
           inactive: "Non attivo"
@@ -3238,7 +3385,7 @@ it:
             title: "Rimuovi il backup"
             confirm: "Sicuro di voler distruggere questo backup?"
           restore:
-            is_disabled: "Il ripristino è disabilitato nelle opzioni del sito."
+            is_disabled: "Il ripristino è disabilitato nelle impostazioni del sito."
             label: "Ripristina"
             title: "Ripristina il backup"
             confirm: "Sei sicuro di voler ripristinare questo backup?"
@@ -3298,6 +3445,7 @@ it:
           theme_name: "Nome del Tema"
           component_name: "Nome del Componente"
           themes_intro: "Seleziona un tema esistente o installane uno nuovo per iniziare"
+          themes_intro_emoji: "emoji woman artist"
           beginners_guide_title: "Guida per principianti all'uso dei Temi di Discourse"
           developers_guide_title: "Guida per sviluppatori ai Temi di Discourse"
           browse_themes: "Sfoglia i temi della comunità"
@@ -3327,14 +3475,16 @@ it:
           color_scheme_select: "Seleziona i colori da usare nel tema"
           custom_sections: "Sezioni personalizzate:"
           theme_components: "Componenti Tema"
+          add_all_themes: "Aggiungi tutti i temi"
           convert: "Converti"
-          convert_component_alert: "Non hai ancora salvato le tue modifiche. Sei sicuro di volerle abbandonare e passare ad altro?"
+          convert_component_alert: "Sei sicuro di voler convertire questo Componente in Tema? Verrà rimosso come Componente da %{relatives}."
           convert_component_tooltip: "Converti questo Componente in Tema"
           convert_theme_alert: "Sei sicuro di voler convertire questo Tema in Componente? Sarà rimosso come Tema Padre da %{relatives}."
           convert_theme_tooltip: "Converti questo Tema in Componente"
           inactive_themes: "Temi non attivi:"
           inactive_components: "Componenti inutilizzati:"
           broken_theme_tooltip: "Questo tema presenta errori nel codice CSS, HTML o YAML"
+          disabled_component_tooltip: "Questo Componente è stato disabilitato"
           default_theme_tooltip: "Questo è il tema di default del sito"
           updates_available_tooltip: "Sono disponibili aggiornamenti per questo tema"
           and_x_more: "ed altri {{count}}."
@@ -3352,14 +3502,19 @@ it:
           upload: "Carica"
           select_component: "Seleziona un componente..."
           unsaved_changes_alert: "Non hai ancora salvato le tue modifiche. Sei sicuro di volerle abbandonare e passare ad altro?"
+          unsaved_parent_themes: "Non hai assegnato il Componente ai Temi, vuoi andare avanti?"
           discard: "Annulla"
           stay: "Resta"
           css_html: "CSS/HTML personalizzato"
           edit_css_html: "Modifica CSS/HTML"
           edit_css_html_help: "Non hai modificato nessun CSS o HTML"
           delete_upload_confirm: "Elimina questo caricamento? (Il CSS del tema potrebbe non funzionare!)"
+          component_on_themes: "Includi Componente in questi Temi"
+          included_components: "Includi Componenti"
+          add_all: "Aggiungi tutti"
           import_web_tip: "Repository contenente il tema"
           import_web_advanced: "Avanzate..."
+          import_file_tip: "File .tar.gz, .zip, o .dcstyle.json contenente il tema"
           is_private: "Il tema è in un repository git privato"
           remote_branch: "Nome del branch (opzionale)"
           public_key: "Concedi l'accesso al repository alla seguente chiave pubblica:"
@@ -3376,10 +3531,12 @@ it:
           source_url: "Fonte"
           enable: "Abilita"
           disable: "Disabilita"
+          disabled: "Questo componente è stato disabilitato."
+          disabled_by: "Questo componente è stato disabilitato da"
           required_version:
             error: "Questo tema è stato disattivato automaticamente perché non compatibile con questa versione di Discourse."
-            minimum: "Richiede Discourse versione {{version}} o superiore."
-            maximum: "Richiede Discourse versione {{version}} or inferiore."
+            minimum: "Richiede versione {{version}} o superiore di Discourse."
+            maximum: "Richiede versione {{version}} o inferiore di Discourse."
           component_of: "Componente di:"
           update_to_latest: "Aggiorna all'ultima versione"
           check_for_updates: "Controllo Aggiornamenti"
@@ -3392,9 +3549,10 @@ it:
           empty: "Nessun elemento"
           commits_behind:
             one: "Il tema è indietro di %{count} aggiornamento!"
-            other: "Il tema è indietro di {{count}} aggiornamenti!"
+            other: "Il tema è indietro di {{count}} commit!"
           compare_commits: "(Vedi i nuovi commit)"
           repo_unreachable: "Impossibile accedere al Git repository di questo tema. Messaggio di errore:"
+          imported_from_archive: "Questo tema è stato importato da un file .zip"
           scss:
             text: "CSS"
             title: "Inserire il CSS personalizzato, accettiamo tutti gli stili validi di CSS e SCSSpersonalizzato"
@@ -3464,8 +3622,19 @@ it:
           love:
             name: "amo"
             description: "Il colore del bottone \"Mi piace\"."
+        robots:
+          title: "Sostituisci il file robots.txt del tuo sito:"
+          warning: "Questo sostituirà in modo permanente tutte le impostazioni del sito correlate."
+          overridden: Il file robots.txt predefinito del tuo sito è sovrascritto.
         email_style:
+          title: "Stile Email"
+          heading: "Personalizza Stile Email"
+          html: "Modello HTML"
           css: "CSS"
+          reset: "Ripristina le impostazioni di default"
+          reset_confirm: "Sei sicuro di voler ripristinare il %{fieldName} predefinito e perdere tutte le modifiche?"
+          save_error_with_reason: "Le tue modifiche non sono state salvate. %{error}"
+          instructions: "Personalizza il modello in cui vengono visualizzate tutte le email html e personalizza con CSS."
       email:
         title: "Email"
         settings: "Impostazioni"
@@ -3495,7 +3664,7 @@ it:
         send_test: "Invia una email di prova"
         sent_test: "inviata!"
         delivery_method: "Metodo di consegna"
-        preview_digest_desc: "Vedi in anteprima il contenuto delle email di riepilogo inviate agli utenti inattivi."
+        preview_digest_desc: "Vedi in anteprima il contenuto delle email riepilogative inviate agli utenti inattivi."
         refresh: "Aggiorna"
         send_digest_label: "Invia questo risultato a:"
         send_digest: "Invia"
@@ -3503,6 +3672,7 @@ it:
         format: "Formato"
         html: "html"
         text: "testo"
+        html_preview: "Anteprima Contenuto Email"
         last_seen_user: "Ultimo Utente Visto:"
         no_result: "Nessun risultato trovato per il riepilogo. "
         reply_key: "Chiave di risposta"
@@ -3616,7 +3786,7 @@ it:
             deleted_unused_tags: "Etichette inutilizzate eliminate"
             renamed_tag: "etichetta rinominata"
             revoke_email: "revoca email"
-            lock_trust_level: "C"
+            lock_trust_level: "blocca livello di esperienza"
             unlock_trust_level: "sblocca livello di esperienza"
             activate_user: "attiva utente"
             deactivate_user: "disattiva utente"
@@ -3639,7 +3809,7 @@ it:
             merge_user: "unisci utente"
             entity_export: "esporta entità"
             change_name: "cambia nome"
-            topic_timestamps_changed: "Marche temprali dell'Argomento modificate"
+            topic_timestamps_changed: "marche temporali dell'Argomento modificate"
             approve_user: "utente approvato"
             web_hook_create: "crea webhook"
             web_hook_update: "aggiorna webhook"
@@ -3648,6 +3818,17 @@ it:
             embeddable_host_create: "crea host incorporabile"
             embeddable_host_update: "aggiorna host incorporabile"
             embeddable_host_destroy: "distruggi host incorporabile"
+            change_theme_setting: "cambia l'impostazione del tema"
+            disable_theme_component: "disabilita il componente del tema"
+            enable_theme_component: "abilita il componente del tema"
+            revoke_title: "revoca titolo"
+            change_title: "cambia titolo"
+            api_key_create: "crea chiave api"
+            api_key_update: "aggiorna chiave api"
+            api_key_destroy: "distruggi chiave api"
+            override_upload_secure_status: "sovrascrivere stato caricamento sicuro"
+            page_published: "pagina pubblicata"
+            page_unpublished: "pagina non pubblicata"
         screened_emails:
           title: "Email Scansionate"
           description: "Quando qualcuno cerca di creare un nuovo account, verrando controllati i seguenti indirizzi email e la registrazione viene bloccata, o eseguita qualche altra azione."
@@ -3687,7 +3868,7 @@ it:
             all_search_types: "Tutti i tipi di ricerca"
             header: "Intestazione"
             full_page: "Pagina completa"
-            click_through_only: "Tutti (solo click)"
+            click_through_only: "Tutti (solo frequenza clic)"
           header_search_results: "Risultati ricerca nell'Header"
         logster:
           title: "Log Errori"
@@ -3699,6 +3880,10 @@ it:
         one_word_per_line: "Una parola per riga"
         download: Scarica
         clear_all: Deseleziona Tutto
+        clear_all_confirm_block: "Sei sicuro di voler cancellare tutte le parole osservate per l'azione Blocca?"
+        clear_all_confirm_censor: "Sei sicuro di voler cancellare tutte le parole osservate per l'azione Censura?"
+        clear_all_confirm_flag: "Sei sicuro di voler cancellare tutte le parole osservate per l'azione Segnala?"
+        clear_all_confirm_require_approval: "Sei sicuro di voler cancellare tutte le parole osservate per l'azione Richiede Approvazione?"
         word_count:
           one: "%{count} word"
           other: "%{count} parole"
@@ -3719,9 +3904,13 @@ it:
           add: "Aggiungi"
           success: "Successo"
           exists: "Già esistente"
+          upload: "Aggiungi dal file"
           upload_successful: "Caricamento andato a buon fine. Le parole sono state aggiunte."
         test:
           button_label: "Test"
+          modal_title: "Testa Parole Osservate '%{action}'"
+          description: "Inserisci il testo qui sotto per verificare la corrispondenza con le parole osservate"
+          found_matches: "Trovate corrispondenze:"
           no_matches: "Nessun risultato trovato"
       impersonate:
         title: "Impersona"
@@ -3743,7 +3932,6 @@ it:
           staff: "Staff"
           suspended: "Sospesi"
           silenced: "Silenziato"
-          suspect: "Sospetti"
           staged: "Temporanei"
         approved: "Approvato?"
         titles:
@@ -3760,7 +3948,6 @@ it:
           moderators: "Moderatori"
           silenced: "Utenti Silenziati"
           suspended: "Utenti Sospesi"
-          suspect: "Utenti Sospetti"
           staged: "Utenti temporanei"
         not_verified: "Non verificato"
         check_email:
@@ -3798,7 +3985,7 @@ it:
         penalty_count: "Conteggio Penalità"
         clear_penalty_history:
           title: "Cancella la storia delle penalizzazioni"
-          description: "Utenti con penalizzazioni non possono accedere al Livello Esperienza 3"
+          description: "utenti con penalizzazioni non possono accedere al Livello Esperienza 3"
         delete_all_posts_confirm_MF: "Stai per cancellare {POSTS, plural, one {1 messaggio} other {# messaggi}} e {TOPICS, plural, one {1 argomento} other {# argomenti}}. Sei sicuro?"
         silence: "Silenzio"
         unsilence: "Non in silenzio"
@@ -3817,12 +4004,12 @@ it:
         revoke_admin: "Revoca privilegi di amministrazione"
         grant_admin: "Assegna privilegi di amministrazione"
         grant_admin_confirm: "Ti abbiamo inviato una email per verificare il nuovo amministratore. Per favore aprila e segui le istruzioni."
-        revoke_moderation: "Revoca privilegi di moderazione"
+        revoke_moderation: "Revoca diritti di moderazione"
         grant_moderation: "Assegna diritti di moderazione"
         unsuspend: "Riabilita"
         suspend: "Sospendi"
         show_flags_received: "Mostra le Segnalazioni ricevute"
-        flags_received_by: "Segnalazione ricevuta da %{username}"
+        flags_received_by: "Segnalazioni ricevutr da %{username}"
         flags_received_none: "Questo utente non ha ricevuto segnalazioni."
         reputation: Reputazione
         permissions: Permessi
@@ -3859,7 +4046,7 @@ it:
         cant_delete_all_too_many_posts:
           one: "Non posso cancellare tutti i post perché l'utente ha più di %{count} post. (delete_all_posts_max.)"
           other: "Impossibile cancellare tutti i messaggi perché l'utente ha più di %{count} messaggi. (delete_all_posts_max.)"
-        delete_confirm: "E' genericamente preferibile anonimizzare un utente inveche che eliminarlo, per evitare di rimuovere contenuti dalle discussioni esistenti.<br><br>Sei sicuro di voler eliminare questo utente? Questa modifica è permanente."
+        delete_confirm: "E' preferibile anonimizzare un utente invece che eliminarlo, per evitare di rimuovere contenuti dalle discussioni esistenti.<br><br> Sei sicuro di voler eliminare questo utente? Questa modifica è permanente!"
         delete_and_block: "Elimina e <b>blocca</b> questa email e indirizzo IP"
         delete_dont_block: "Elimina soltanto"
         deleting_user: "Cancellazione utente..."
@@ -3891,6 +4078,7 @@ it:
           threshold_reached: "Quella email ha ricevuto troppi errori di ritorno."
         trust_level_change_failed: "C'è stato un problema nel cambio di livello di esperienza di questo utente. "
         suspend_modal_title: "Sospendi Utente"
+        confirm_cancel_penalty: "Sei sicuro di voler scartare la penalità?"
         trust_level_2_users: "Utenti con Livello Esperienza 2"
         trust_level_3_requirements: "Requisiti per Livello Esperienza 3"
         trust_level_locked_tip: "il livello di esperienza è bloccato, il sistema non promuoverà né degraderà l'utente"
@@ -3917,6 +4105,8 @@ it:
           likes_received: "Mi piace - Ricevuti"
           likes_received_days: "\"Mi piace\" Ricevuti: singoli giorni"
           likes_received_users: "\"Mi piace\" Ricevuti: singoli utenti"
+          suspended: "Sospeso (ultimi 6 mesi)"
+          silenced: "Silenziato (ultimi 6 mesi)"
           qualifies: "Requisiti soddisfatti per il livello di esperienza 3."
           does_not_qualify: "Mancano i requisiti per il livello esperienza 3."
           will_be_promoted: "Verrà presto promosso."
@@ -4028,7 +4218,9 @@ it:
         secret_list:
           invalid_input: "I campi di input non possono essere vuoti o contenere il carattere barra verticale."
         default_categories:
+          modal_description: "Desideri applicare questa modifica storicamente? Questo cambierà le preferenze per %{count} utenti esistenti."
           modal_yes: "Sì"
+          modal_no: "No, applica le modifiche solo da adesso in avanti"
       badges:
         title: Distintivi
         new_badge: Nuovo Distintivo
@@ -4049,7 +4241,7 @@ it:
         delete: Cancella
         delete_confirm: "Sei sicuro di voler cancellare questo distintivo?"
         revoke: Revoca
-        reason: Motivazione
+        reason: Motivo
         expand: Espandi &hellip;
         revoke_confirm: "Sei sicuro di voler revocare questo distintivo?"
         edit_badges: Modifica Distintivi
@@ -4065,6 +4257,7 @@ it:
         enabled: Attiva distintivo
         icon: Icona
         image: Immagine
+        icon_help: "Inserisci il nome di un'icona Font Awesome (usa il prefisso 'far-' per le icone Regular e 'fab-' per le icone Brands)"
         image_help: "Inserisci l'URL dell'immagine (sovrascrive il campo icona, se entrambi sono impostati)"
         query: Query Distintivo (SQL)
         target_posts: Interroga i messaggi destinazione
@@ -4099,14 +4292,26 @@ it:
             with_time: "<span class=\"username\">%{username}</span> in data <span class=\"time\">%{time}</span>"
         badge_intro:
           title: "Seleziona un Distintivo esistente o creane uno nuovo per iniziare"
+          emoji: "emoji woman student"
           what_are_badges_title: "Cosa sono i Distintivi?"
           badge_query_examples_title: "Esempi di Query Distintivo"
+        mass_award:
+          title: Assegna in Massa
+          description: Assegna lo stesso distintivo a più utenti contemporaneamente.
+          no_badge_selected: Seleziona un distintivo per iniziare.
+          perform: "Assegna Distintivo agli Utenti"
+          upload_csv: Carica un CSV con indirizzi email o nomi utente degli utenti
+          aborted: Carica un CSV contenente indirizzi email o i nomi utente degli utenti
+          success: Il tuo CSV è stato ricevuto e gli utenti riceveranno il loro distintivo a breve.
+          replace_owners: Rimuovi il distintivo dai precedenti proprietari
       emoji:
         title: "Emoji"
         help: "Aggiungi nuovi emoji da mettere a disposizione per tutti. (Suggerimento: trascina e rilascia più file in una volta sola)"
         add: "Aggiungi Nuovo Emoji"
         name: "Nome"
+        group: "Gruppo"
         image: "Immagine"
+        alt: "anteprima emoji personalizzata"
         delete_confirm: "Sicuro di voler cancellare l'emoji :%{name}:?"
       embedding:
         get_started: "Se lo desideri, puoi incorporare Discourse in un altro sito web. Comincia aggiungendo il nome dell'host"
@@ -4126,13 +4331,14 @@ it:
         embed_post_limit: "Numero massimo di messaggi da includere"
         embed_title_scrubber: "Espressione regolare usata per ripulire i titoli dei messaggi"
         embed_truncate: "Tronca i messaggi incorporati"
+        embed_unlisted: "Gli argomenti importati non saranno visibili fino a quando non ci sarà una risposta."
         embed_whitelist_selector: "Selettore CSS per gli elementi da permettere negli embed"
         embed_blacklist_selector: "Selettore CSS per gli elementi da rimuovere dagli embed"
         embed_classname_whitelist: "Classi CSS permesse"
         save: "Salva Impostazioni Inclusione"
       permalink:
         title: "Collegamenti permanenti"
-        description: "Nota bene: ciò si applica solo alle fonti esterne, i collegamenti inviati sul tuo forum non saranno rediretti."
+        description: "Reindirizzamenti da applicare per URL non conosciuti dal forum."
         url: "URL"
         topic_id: "ID dell'argomento"
         topic_title: "Argomento"
@@ -4141,6 +4347,7 @@ it:
         category_id: "ID della categoria"
         category_title: "Categoria"
         external_url: "URL esterna"
+        destination: "Destinazione"
         delete_confirm: "Sei sicuro di voler cancellare questo collegamento permanente?"
         form:
           label: "Nuovo:"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index cda1e3e757..354e190ea3 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -27,7 +27,6 @@ ja:
     dates:
       time: "H:mm"
       timeline_date: "YYYY年M月"
-      long_no_year: "M月D日, H:mm"
       long_no_year_no_time: "M月D日"
       full_no_year_no_time: "M月D日"
       long_with_year: "YYYY年M月D日 H:mm"
@@ -240,6 +239,12 @@ ja:
       remove: "ブックマークを削除"
       confirm_clear: "このトピックのすべてのブックマークをクリアしますか?"
       save: "保存"
+      reminders:
+        later_today: "今日中"
+        tomorrow: "明日"
+        next_week: "来週"
+        later_this_week: "今週中"
+        next_month: "来月"
     drafts:
       resume: "続ける"
       remove: "削除"
@@ -816,9 +821,6 @@ ja:
         success_staff: "現在のメールアドレスにメールを送信しました。メールに従い手続きをおこなってください。"
       change_avatar:
         title: "プロフィール画像を変更"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>から取得、基準は"
-        gravatar_title: "Gravatarのアバターを変更"
-        refresh_gravatar_title: "Gravatarを更新する"
         letter_based: "システムプロフィール画像"
         uploaded_avatar: "カスタム画像"
         uploaded_avatar_empty: "カスタム画像を追加"
@@ -1066,6 +1068,8 @@ ja:
         back: "戻る"
         again: "やり直す"
         fixed: "ページロード"
+    modal:
+      close: "閉じる"
     close: "閉じる"
     assets_changed_confirm: "Discourseがアップデートされました。ページを更新して最新のバージョンにしますか？"
     logout: "ログアウトしました"
@@ -1244,7 +1248,6 @@ ja:
       objects: オブジェクト
       symbols: シンボル
       flags: 旗
-      custom: カスタム絵文字
       recent: 最近使ったもの
       default_tone: スキントーンなし
       light_tone: ライトスキントーン
@@ -1252,6 +1255,7 @@ ja:
       medium_tone: ミディアムスキントーン
       medium_dark_tone: ミディアムダークスキントーン
       dark_tone: ダークスキントーン
+      default: カスタム絵文字
     shared_drafts:
       confirm_publish: "この下書きを公開してもよろしいですか？"
       publishing: "トピック公開中..."
@@ -1359,6 +1363,7 @@ ja:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -1962,6 +1967,7 @@ ja:
             title: "メールのHTML部分を表示"
             button: "HTML"
       bookmarks:
+        created: "作成者"
         name: "名前"
     category:
       can: "can&hellip; "
@@ -2845,7 +2851,6 @@ ja:
           active: "アクティブ"
           staff: "スタッフ"
           suspended: "凍結中"
-          suspect: "マーク中"
           staged: "段階"
         approved: "承認?"
         titles:
@@ -2861,7 +2866,6 @@ ja:
           admins: "管理者ユーザ"
           moderators: "モデレータ"
           suspended: "凍結中のユーザ"
-          suspect: "マーク中のユーザ"
         not_verified: "検証されていません"
         check_email:
           title: "メールアドレスを表示する"
@@ -3154,6 +3158,7 @@ ja:
         help: "各ユーザが利用できる絵文字を追加します。 (ちょっとしたコツ: ドラッグアンドドロップで複数のファイルを一度にアップロードできます)"
         add: "新しい絵文字を追加"
         name: "名前"
+        group: "グループ"
         image: "画像"
         delete_confirm: "Are you sure you want to delete the :%{name}: emoji?"
       embedding:
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index ad53763b2a..41bdcbe873 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -27,7 +27,6 @@ ko:
     dates:
       time: "a h:mm"
       timeline_date: "YYYY MMM"
-      long_no_year: "M D a, h:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "YYYY MMM D a h:mm"
@@ -239,6 +238,12 @@ ko:
       remove: "북마크 삭제"
       confirm_clear: "이 토픽의 모든 북마크를 지우시겠습니까?"
       save: "저장"
+      reminders:
+        later_today: "오늘 늦게"
+        tomorrow: "내일"
+        next_week: "다음 주"
+        later_this_week: "이번 주 후반"
+        next_month: "다음 달"
     drafts:
       resume: "이력서"
       remove: "삭제"
@@ -757,9 +762,6 @@ ko:
         success_staff: "현재 주소로 이메일을 보냈습니다. 확인 절차에 따라 진행해 주세요."
       change_avatar:
         title: "프로필 사진 변경"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a> 기반"
-        gravatar_title: "Gravata 웹사이트에서 아바타 바꾸기"
-        refresh_gravatar_title: "Gravatar 새로고침"
         letter_based: "자동 생성된 아바타"
         uploaded_avatar: "커스텀 사진"
         uploaded_avatar_empty: "커스텀 사진 추가"
@@ -995,6 +997,8 @@ ko:
         back: "뒤로가기"
         again: "다시시도"
         fixed: "페이지 열기"
+    modal:
+      close: "닫기"
     close: "닫기"
     assets_changed_confirm: "사이트가 업데이트 되었습니다. 새로고침하시겠습니까?"
     logout: "로그아웃 되었습니다."
@@ -1158,7 +1162,6 @@ ko:
       filter_placeholder: 이모지 찾기
       objects: 사물
       flags: 신고들
-      custom: 커스텀 emoji
       recent: 최근 사용
       default_tone: 피부색 없음
       light_tone: 밝은 피부색
@@ -1166,6 +1169,7 @@ ko:
       medium_tone: 중간 피부색
       medium_dark_tone: 약간 어두운 피부색
       dark_tone: 어두운 피부색
+      default: 커스텀 emoji
     composer:
       emoji: "이모지 :)"
       more_emoji: "더보기..."
@@ -1262,6 +1266,7 @@ ko:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}} "
@@ -1874,6 +1879,7 @@ ko:
             title: "이메일 HTML 파트 보이기"
             button: "HTML"
       bookmarks:
+        created: "생성일자"
         name: "이름"
     category:
       can: "허용"
@@ -2961,7 +2967,6 @@ ko:
           active: "활성화 사용자"
           staff: "스태프"
           suspended: "접근 금지 사용자"
-          suspect: "의심스러운 사용자"
           staged: "격리됨"
         approved: "승인?"
         titles:
@@ -2977,7 +2982,6 @@ ko:
           admins: "관리자"
           moderators: "운영자"
           suspended: "접근 금지된 사용자들"
-          suspect: "의심스러운 사용자들"
         not_verified: "확인되지 않은"
         check_email:
           title: "사용자의 이메일 주소 표시"
@@ -3297,6 +3301,7 @@ ko:
         help: "모든 사람이 쓸 수 있는 이모지를 추가합니다. (팁: 여러개 파일을 한 번에 드래그 & 드롭할 수 있어요)"
         add: "새 이모지 추가"
         name: "이름"
+        group: "그룹"
         image: "이미지"
         delete_confirm: "정말로 :%{name}: 이모지를 삭제할까요?"
       embedding:
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 23861ae56e..6b5d731529 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -30,7 +30,6 @@ lt:
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMMM D, H:mm"
       long_no_year_no_time: "MMMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "YYYY MMMM D H:mm"
@@ -287,6 +286,12 @@ lt:
       created: "jūs pažymėjot šį įrašą"
       remove: "Pašalinti Žymę"
       save: "Saugoti"
+      reminders:
+        later_today: "Šiandien vėliau"
+        tomorrow: "Rytoj"
+        next_week: "Kitą savaitę"
+        later_this_week: "Šia savaitę vėliau"
+        next_month: "Kitą mėnesį"
     drafts:
       resume: "Grįžti"
       remove: "Pašalinti"
@@ -755,9 +760,6 @@ lt:
         success: "Mes išsiunteme laišką nurodytu el. pašto adresu. Prašome sekti patvirtinimo instrukcijas."
       change_avatar:
         title: "Pakeisti profilio nuotrauką"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, paremtas"
-        gravatar_title: "Pakeisti paskyrą Gravatar'o puslapyje"
-        refresh_gravatar_title: "Atnaujinti Gravatar'ą"
         letter_based: "Sistema pridėjo profilio nuotrauką"
         uploaded_avatar: "Paveiksliukas"
         uploaded_avatar_empty: "Pridėti paveiksliuką"
@@ -974,6 +976,8 @@ lt:
         back: "Grįžti Atgal"
         again: "Bandyti dar kartą"
         fixed: "Užkrauti Puslapį"
+    modal:
+      close: "uždaryti"
     close: "Uždaryti"
     assets_changed_confirm: "Ši svetainė ka tik buvo atnaujinta. Perkrauti, kad matytumėte naujausią versiją?"
     logout: "Jūs buvote atjungtas nuo sistemos."
@@ -1246,6 +1250,7 @@ lt:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -1872,6 +1877,7 @@ lt:
           html_part:
             button: "HTML"
       bookmarks:
+        created: "Sukurta"
         name: "Vardas"
     category:
       can: "galimas&hellip;"
@@ -2821,7 +2827,6 @@ lt:
           active: "Aktyvūs"
           staff: "Komanda"
           suspended: "Sustabdyti"
-          suspect: "Įtartini"
         approved: "Patvirtinta?"
         titles:
           active: "Aktyvūs vartotojai"
@@ -2837,7 +2842,6 @@ lt:
           moderators: "Moderatoriai"
           silenced: "Nutildyti nariai"
           suspended: "Sustabdyti vartotojai"
-          suspect: "Įtartini Vartotojai"
         not_verified: "Nepatvirtinta"
         check_email:
           title: "Atskleisk šio vartotojo el. pašto adresą"
@@ -3130,6 +3134,7 @@ lt:
         help: "Pridėti naują šypsenėlę, kurią galės matyti visi (patarimas: kelis failus kelk tuo pačiu metu)"
         add: "Pridėti Naują Šypsenėlę"
         name: "Vardas"
+        group: "Grupė"
         image: "Paveiksliukas"
         delete_confirm: "Ar tikrai nori ištrinti :%{name}: šypsenėlę?"
       embedding:
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 76235f9292..76d77a879a 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -29,7 +29,6 @@ lv:
     dates:
       time: "hh:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, hh:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY hh:mm"
@@ -252,6 +251,12 @@ lv:
       created: "tu esi pievienojies šim ierakstam grāmatzīmi"
       remove: "Noņemt grāmatzīmi"
       save: "Saglabāt"
+      reminders:
+        later_today: "Vēlāk šodien"
+        tomorrow: "Rītdien"
+        next_week: "Nākamā nedēļā"
+        later_this_week: "Vēlāk šonedēļ"
+        next_month: "Nākamā mēnesī"
     drafts:
       resume: "Turpināt"
       remove: "Atcelt"
@@ -679,9 +684,6 @@ lv:
         success: "Mēs aizsūtījām e-pastu uz šo adresi. Lūdzu sekojiet apstiprināšanas instrukcijām vēstulē."
       change_avatar:
         title: "Nomainīt savu profila bildi"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, balstīts uz"
-        gravatar_title: "Nomainiet jūsu avatāra attēlu Gravatar lapā"
-        refresh_gravatar_title: "Atjaunot jūsu Gravatar attēlu"
         letter_based: "Sistēmas piešķirtais profila attēls"
         uploaded_avatar: "Savs attēls"
         uploaded_avatar_empty: "Pievienot savu attēlu"
@@ -917,6 +919,8 @@ lv:
         back: "Atgriezties"
         again: "Mēģināt vēlreiz"
         fixed: "Ielādēt lapu"
+    modal:
+      close: "aizvērt"
     close: "Aizvērt"
     assets_changed_confirm: "Šī vietne tikko bija atjaunota. Pārlādēt lapu, lai pārietu uz jaunāko versiju?"
     logout: "Jūs izgājāt."
@@ -1077,7 +1081,6 @@ lv:
       objects: Priekšmeti
       symbols: Simboli
       flags: Sūdzības
-      custom: Lietotāja emoji
       recent: Nesen izmantotie
       default_tone: Noklusējuma ādas krāsa
       light_tone: Gaiša ādas krāsa
@@ -1085,6 +1088,7 @@ lv:
       medium_tone: Vidēja ādas krāsa
       medium_dark_tone: Vidēji tumša ādas krāsa
       dark_tone: Tumša ādas krāsa
+      default: Lietotāja emoji
     composer:
       emoji: "Emoji :)"
       more_emoji: "vairāk..."
@@ -1763,6 +1767,7 @@ lv:
             title: "Parādīt e-pasta html daļu"
             button: "HTML"
       bookmarks:
+        created: "Radīts"
         name: "Vārds"
     category:
       can: "var&hellip;"
@@ -2713,7 +2718,6 @@ lv:
           active: "Aktīvi"
           staff: "Personāls"
           suspended: "Apturēts"
-          suspect: "Novērot"
         approved: "Apstiprināt?"
         titles:
           active: "Aktīvi lietotāji"
@@ -2728,7 +2732,6 @@ lv:
           admins: "Administratori"
           moderators: "Moderātori"
           suspended: "Atceltie lietotāji"
-          suspect: "Novēroti (suspect) lietotāji"
         not_verified: "Nav apstiprināts"
         check_email:
           title: "Atklāt šī lietotāja e-pasta adresi"
@@ -3024,6 +3027,7 @@ lv:
         help: "Pievienot jaunu smaidiņu, kas būs pieejams visiem."
         add: "Pievienot Jaunu Smaidiņu"
         name: "Nosaukums"
+        group: "Grupa"
         image: "Attēls"
         delete_confirm: "Vai tiešām vēlies dzēst šo :%{name}: smaidiņu?"
       embedding:
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 53162f8a7e..c0f94aba48 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -28,7 +28,6 @@ nb_NO:
     dates:
       time: "LT"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, LT"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D MMM YYYY LT"
@@ -95,6 +94,12 @@ nb_NO:
         x_days:
           one: "%{count} dag siden"
           other: "%{count} dager siden"
+        x_months:
+          one: "%{count} måned siden"
+          other: "%{count} måneder siden"
+        x_years:
+          one: "%{count} år siden"
+          other: "%{count} år siden"
       later:
         x_days:
           one: "%{count} dag senere"
@@ -146,12 +151,15 @@ nb_NO:
       banner:
         enabled: "gjorde dette til et banner %{when}. Det vil vises på toppen av hver side inntil brukeren lukker det."
         disabled: "fjernet dette banneret %{when}. Det vil ikke lenger vises på toppen av hver side."
+      forwarded: "videresendte e-posten voer"
+    topic_admin_menu: "handlinger for tråd"
     wizard_required: "Velkommen til ditt nye Discourse! Kom i gang med <a href='%{url}' data-auto-route='true'>oppstartsveiviseren</a> ✨"
     emails_are_disabled: "All utgående e-post har blitt deaktivert globalt av en administrator. Ingen e-postvarslinger vil bli sendt."
     bootstrap_mode_enabled: "For å gjøre lansering av siden enklere er den nå i oppstartsmodus. Alle nye brukere tildeles tillitsnivå 1 og får daglige oppsummeringer på e-post aktivert. Oppstartsmodus vil bli automatisk slått av når %{min_users} brukere har registrert seg."
     bootstrap_mode_disabled: "Oppstartsmodus vil bli deaktivert i løpet av 24 timer."
     themes:
       default_description: "Forvalg"
+      broken_theme_alert: "Du kan oppleve at siden din ikke fungerer fordi temaet eller komponenten %{theme} har feil. Deaktiver temaet eller komponenten her: %{path}."
     s3:
       regions:
         ap_northeast_1: "Asia/Stillehavsregionen (Tokyo)"
@@ -159,6 +167,7 @@ nb_NO:
         ap_south_1: "Asia/Stillehavsregionen (Mumbai)"
         ap_southeast_1: "Asia/Stillehavsregionen (Singapore)"
         ap_southeast_2: "Asia/Stillehavsregionen (Sydney)"
+        ca_central_1: "Kanada (sentralregion)"
         cn_north_1: "Kina (Beijing)"
         eu_central_1: "EU (Frankfurt)"
         eu_west_1: "EU (Irland)"
@@ -248,7 +257,17 @@ nb_NO:
       created: "du har bokmerket dette innlegget"
       not_bookmarked: "bokmerk dette innlegget"
       remove: "Fjern bokmerke"
+      confirm_clear: "Er du sikker på at du vil fjerne alle favoritter fra dette emnet?"
       save: "Lagre"
+      no_timezone: 'Du har ikke ennå satt tidssone. Du vil ikke kunne sette påminnelser. Sett tidssone <a href="%{basePath}/my/preferences/profile">i profilen din</a>.'
+      reminders:
+        at_desktop: "Neste gang jeg er på datamaskinen min"
+        later_today: "Senere i dag"
+        tomorrow: "I morgen"
+        next_week: "Neste uke"
+        later_this_week: "Senere denne uken"
+        next_month: "Neste måned"
+        custom: "Egendefinert dato og tid"
     drafts:
       resume: "Fortsett"
       remove: "Fjern"
@@ -256,6 +275,7 @@ nb_NO:
       new_private_message: "Nytt privat emneutkast"
       topic_reply: "Svarutkast"
       abandon:
+        confirm: "Du har allerede åpnet et annet utkast i dette emnet. Er du sikker på at du vil forkaste utkastet?"
         yes_value: "Ja"
         no_value: "Nei"
     topic_count_latest:
@@ -293,13 +313,33 @@ nb_NO:
       install_banner: "Ønsker du å <a href>installere %{title} på denne enheten</a>?"
     choose_topic:
       none_found: "Ingen emner funnet."
+      title:
+        search: "Søk etter emne"
+        placeholder: "skriv tittel, URL eller ID her"
     choose_message:
       none_found: "Ingen meldinger funnet."
+      title:
+        search: "Søk etter melding"
+        placeholder: "Skriv tittel, URL eller ID her"
     review:
       order_by: "Sorter etter"
       in_reply_to: "i svar til"
       explain:
+        why: "forklar hvorfor dette elementet ble plassert i køen"
+        formula: "Formel"
+        subtotal: "Delsum"
         total: "Total"
+        min_score_visibility: "Minimal score for synlighet"
+        score_to_hide: "Score for å skjule innlegg"
+        take_action_bonus:
+          name: "gjøre handling"
+          title: "Når en administrator velger å gjøre en handling, får flagget en bonus."
+        user_accuracy_bonus:
+          name: "nøyaktighet for bruker"
+          title: "Brukere som historisk gir gode flagg får bonus."
+        trust_level_bonus:
+          name: "tillitsnivå"
+          title: "Elementer opprettet av brukere med høyere tillitsrangering har høyere score"
       awaiting_approval: "Venter på godkjenning"
       delete: "Slett"
       settings:
@@ -775,9 +815,6 @@ nb_NO:
         success_staff: "Vi har sendt en e-post til den gjeldende adressen. Følg bekreftelsesinstruksjonene."
       change_avatar:
         title: "Bytt profilbilde"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basert på"
-        gravatar_title: "Endre din avatar på Gravatars nettside"
-        refresh_gravatar_title: "Oppdater din Gravatar"
         letter_based: "Systemtildelt profilbilde"
         uploaded_avatar: "Egendefinert bilde"
         uploaded_avatar_empty: "Legg til egendefinert bilde"
@@ -1021,6 +1058,8 @@ nb_NO:
         back: "Gå tilbake"
         again: "Prøv igjen"
         fixed: "Last side"
+    modal:
+      close: "lukk"
     close: "Lukk"
     assets_changed_confirm: "Dette nettstedet ble nettopp oppdatert. Last inn siden på nytt nå for siste versjon?"
     logout: "Du ble logget ut"
@@ -1203,7 +1242,6 @@ nb_NO:
       filter_placeholder: Søk etter emoji
       objects: Objekter
       flags: Flagg
-      custom: Egendefinerte emoji-er
       recent: Nylig brukt
       default_tone: Ingen hudtone
       light_tone: Lys hudtone
@@ -1211,6 +1249,7 @@ nb_NO:
       medium_tone: Middels hudtone
       medium_dark_tone: Middels mørk hudtone
       dark_tone: Mørk hudtone
+      default: Egendefinerte emoji-er
     shared_drafts:
       title: "Delte kladder"
       notice: "Dette emnet er kun synlig for dem som kan se <b>{{category}}</b>-kategorien."
@@ -1345,6 +1384,7 @@ nb_NO:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -2018,6 +2058,7 @@ nb_NO:
             title: "Vis HTML-delen av e-posten"
             button: "HTML"
       bookmarks:
+        created: "Opprettet"
         name: "Navn"
     category:
       can: "kan&hellip;"
@@ -3192,7 +3233,6 @@ nb_NO:
           staff: "Stab"
           suspended: "Utestengt"
           silenced: "Dempet"
-          suspect: "Mistenkt"
           staged: "Arrangert"
         approved: "Godkjent?"
         titles:
@@ -3209,7 +3249,6 @@ nb_NO:
           moderators: "Moderatorer"
           silenced: "Dempede brukere"
           suspended: "Utestengte brukere"
-          suspect: "Mistenkte brukere"
           staged: "Arrangerte brukere"
         not_verified: "Uverifisert"
         check_email:
@@ -3542,6 +3581,7 @@ nb_NO:
         help: "Legg til en ny emoji som vil være tilgjengelig for alle. (PROFFTIPS: Dra og slipp flere filer samtidig)"
         add: "Legg til ny Emoji"
         name: "Navn"
+        group: "Gruppe"
         image: "Bilde"
         delete_confirm: "Sikker på at du vil slette: %{name}: emoji?"
       embedding:
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 183ec2ebb6..d1e2f90282 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -261,22 +261,34 @@ nl:
       help:
         bookmark: "Klik om een bladwijzer voor het eerste bericht van dit topic te maken"
         unbookmark: "Klik om alle bladwijzers in dit topic te verwijderen"
+        unbookmark_with_reminder: "Klik om alle bladwijzers en herinneringen in dit topic te verwijderen. U hebt voor dit topic een herinnering ingesteld voor %{reminder_at}."
     bookmarks:
       created: "u hebt een bladwijzer voor dit bericht gemaakt"
       not_bookmarked: "bladwijzer voor dit bericht maken"
-      created_with_reminder: "u hebt een bladwijzer voor dit bericht gemaakt met een herinnering op %{date}"
+      created_with_reminder: "u hebt een bladwijzer voor dit bericht gemaakt met een herinnering voor %{date}"
+      created_with_at_desktop_reminder: "u hebt een bladwijzer voor dit bericht gemaakt en wordt de volgende keer dat u uw computer gebruikt herinnerd"
       remove: "Bladwijzer verwijderen"
       confirm_clear: "Weet u zeker dat u alle bladwijzers van dit topic wilt verwijderen?"
       save: "Opslaan"
       no_timezone: 'U hebt nog geen tijdzone ingesteld. Hierdoor kunt u geen herinneringen instellen. Stel er een in <a href="%{basePath}/my/preferences/profile">in uw profiel</a>.'
+      invalid_custom_datetime: "De datum en tijd die u hebt opgegeven is ongeldig, probeer het opnieuw."
+      list_permission_denied: "U hebt geen toestemming om de bladwijzers van deze gebruiker te bekijken."
       reminders:
         at_desktop: "De volgende keer vanaf mijn computer"
         later_today: "Later vandaag"
         next_business_day: "Volgende werkdag"
         tomorrow: "Morgen"
         next_week: "Volgende week"
+        later_this_week: "Later deze week"
+        start_of_next_business_week: "Volgende maandag"
         next_month: "Volgende maand"
         custom: "Aangepaste datum en tijd"
+        last_custom: "Afgelopen"
+        none: "Geen herinnering nodig"
+        today_with_time: "vandaag om %{time}"
+        tomorrow_with_time: "morgen om %{time}"
+        at_time: "op %{date_time}"
+        existing_reminder: "U hebt een herinnering voor deze bladwijzer ingesteld die wordt verzonden"
     drafts:
       resume: "Hervatten"
       remove: "Verwijderen"
@@ -514,6 +526,7 @@ nl:
       days_visited_long: "Dagen bezocht"
       posts_read: "Gelezen"
       posts_read_long: "Berichten gelezen"
+      last_updated: "Laatst bijgewerkt:"
       total_rows:
         one: "%{count} gebruiker"
         other: "%{count} gebruikers"
@@ -539,6 +552,7 @@ nl:
         deny: "Weigeren"
         denied: "geweigerd"
         undone: "aanvraag ongedaan gemaakt"
+        handle: "lidmaatschapsaanvraag behandelen"
       manage:
         title: "Beheren"
         name: "Naam"
@@ -719,7 +733,7 @@ nl:
       other_accounts: "Andere accounts met dit IP-adres:"
       delete_other_accounts: "%{count} verwijderen"
       username: "gebruikersnaam"
-      trust_level: "VN"
+      trust_level: "TL"
       read_time: "leestijd"
       topics_entered: "topics ingevoerd"
       post_count: "# berichten"
@@ -766,6 +780,7 @@ nl:
         clear:
           title: "Wissen"
           warning: "Weet u zeker dat u uw aanbevolen topic wilt wissen?"
+      use_current_timezone: "Huidige tijdzone gebruiken"
       profile_hidden: "Het openbare profiel van deze gebruiker is verborgen."
       expand_profile: "Uitvouwen"
       collapse_profile: "Samenvouwen"
@@ -866,6 +881,7 @@ nl:
         deleted_posts: "verwijderde berichten"
         suspensions: "schorsingen"
         warnings_received: "waarschuwingen"
+        rejected_posts: "geweigerde berichten"
       messages:
         all: "Alle"
         inbox: "Postvak IN"
@@ -892,6 +908,7 @@ nl:
         success: "(e-mail verzonden)"
         in_progress: "(e-mail wordt verzonden)"
         error: "(fout)"
+        emoji: "slot-emoji"
         action: "E-mail voor wachtwoordherinitialisatie verzenden"
         set_password: "Wachtwoord instellen"
         choose_new: "Kies een nieuw wachtwoord"
@@ -927,7 +944,7 @@ nl:
           Bescherm uw account met beveiligingscodes voor eenmalig gebruik.
         extended_description: |
           Twee-factor-authenticatie voegt extra beveiliging toe aan uw account door naast uw wachtwoord een eenmalige code te vereisen. Tokens kunnen op <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a>- en <a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a>-apparaten worden gegenereerd.
-        oauth_enabled_warning: "Hou er rekening mee dat sociale aanmeldingen worden uitgeschakeld als u twee-factor-authenticatie op uw account inschakelt."
+        oauth_enabled_warning: "Houd er rekening mee dat sociale aanmeldingen worden uitgeschakeld zodra twee-factor-authenticatie op uw account is ingeschakeld."
         use: "Authenticator-app gebruiken"
         enforced_notice: "U dient twee-factor-authenticatie in te schakelen voordat u deze website bezoekt."
         disable: "uitschakelen"
@@ -941,6 +958,7 @@ nl:
           title: "Op tokens gebaseerde authenticators"
           add: "Nieuwe authenticator"
           default_name: "Mijn authenticator"
+          name_and_code_required_error: "U moet een naam en de code van uw authenticator-app opgeven."
         security_key:
           register: "Registreren"
           title: "Beveiligingssleutels"
@@ -951,6 +969,7 @@ nl:
           edit: "Beveiligingssleutel bewerken"
           edit_description: "Naam van beveiligingssleutel"
           delete: "Verwijderen"
+          name_required_error: "U moet een naam voor uw beveiligingssleutel opgeven."
       change_about:
         title: "Over mij wijzigen"
         error: "Er is een fout opgetreden bij het wijzigen van deze waarde."
@@ -967,10 +986,10 @@ nl:
         success_staff: "Er is een e-mail naar uw huidige adres verzonden. Volg de bevestigingsinstructies."
       change_avatar:
         title: "Uw profielafbeelding wijzigen"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, gebaseerd op"
-        gravatar_title: "Wijzig uw avatar op de website van Gravatar"
-        gravatar_failed: "We konden geen Gravatar voor dat e-mailadres vinden."
-        refresh_gravatar_title: "Uw gravatar vernieuwen"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, gebaseerd op"
+        gravatar_title: "Wijzig uw avatar op de website van {{gravatarName}}"
+        gravatar_failed: "We konden geen {{gravatarName}} voor dat e-mailadres vinden."
+        refresh_gravatar_title: "Uw {{gravatarName}} vernieuwen"
         letter_based: "Door systeem toegekende profielafbeelding"
         uploaded_avatar: "Eigen afbeelding"
         uploaded_avatar_empty: "Een eigen afbeelding toevoegen"
@@ -1033,6 +1052,9 @@ nl:
         any: "alle"
       password_confirmation:
         title: "Nogmaals het wachtwoord"
+      invite_code:
+        title: "Uitnodigingscode"
+        instructions: "Accountregistratie vereist een uitnodigingscode"
       auth_tokens:
         title: "Onlangs gebruikte apparaten"
         ip: "IP"
@@ -1253,6 +1275,9 @@ nl:
         back: "Terug"
         again: "Opnieuw proberen"
         fixed: "Pagina laden"
+    modal:
+      close: "sluiten"
+      dismiss_error: "Fout negeren"
     close: "Sluiten"
     assets_changed_confirm: "Deze website is zojuist bijgewerkt. Nu vernieuwen om de nieuwste versie te laden?"
     logout: "U bent afgemeld."
@@ -1347,6 +1372,7 @@ nl:
     email_login:
       link_label: "Een koppeling voor aanmelding e-mailen"
       button_label: "via e-mail"
+      emoji: "slot-emoji"
       complete_username: "Als een account overeenkomt met de gebruikersnaam <b>%{username}</b>, zou u spoedig een e-mail met een koppeling voor aanmelding moeten ontvangen."
       complete_email: "Als een account overeenkomt met <b>%{email}</b>, zou u spoedig een e-mail met een koppeling voor aanmelding moeten ontvangen."
       complete_username_found: "We hebben een account gevonden die overeenkomt met de gebruikersnaam <b>%{username}</b>. U zou spoedig een e-mail met een koppeling voor aanmelding moeten ontvangen."
@@ -1424,6 +1450,7 @@ nl:
         backup_code: "Een back-upcode gebruiken"
     invites:
       accept_title: "Uitnodiging"
+      emoji: "envelop-emoji"
       welcome_to: "Welkom bij %{site_name}!"
       invited_by: "U bent uitgenodigd door:"
       social_login_available: "U kunt zich ook aanmelden met een willekeurige sociale aanmelding die dat e-mailadres gebruikt."
@@ -1488,7 +1515,6 @@ nl:
       objects: Objecten
       symbols: Symbolen
       flags: Vlaggen
-      custom: Eigen emoji
       recent: Onlangs gebruikt
       default_tone: Geen huidskleur
       light_tone: Lichte huidskleur
@@ -1496,6 +1522,7 @@ nl:
       medium_tone: Gemiddelde huidskleur
       medium_dark_tone: Donker gemiddelde huidskleur
       dark_tone: Donkere huidskleur
+      default: Eigen emoji
     shared_drafts:
       title: "Gedeelde concepten"
       notice: "Dit topic is alleen zichtbaar voor degenen die de categorie <b>{{category}}</b> kunnen zien."
@@ -1637,6 +1664,9 @@ nl:
         message:
           one: "%{count} ongelezen bericht"
           other: "{{count}} ongelezen berichten"
+        high_priority:
+          one: "%{count} ongelezen melding met hoge prioriteit"
+          other: "%{count} ongelezen meldingen met hoge prioriteit"
       title: "meldingen van @naam-vermeldingen, antwoorden op uw berichten en topics, berichten, etc."
       none: "Meldingen kunnen momenteel niet worden geladen."
       empty: "Geen meldingen gevonden."
@@ -1645,6 +1675,7 @@ nl:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -1695,6 +1726,8 @@ nl:
         posted: "nieuw bericht"
         moved_post: "bericht verplaatst"
         linked: "gekoppeld"
+        bookmark_reminder: "bladwijzerherinnering"
+        bookmark_reminder_with_name: "bladwijzerherinnering - %{name}"
         granted_badge: "badge toegekend"
         invited_to_topic: "uitgenodigd voor topic"
         group_mentioned: "groep genoemd"
@@ -1923,6 +1956,7 @@ nl:
       group_request_sent: "Uw lidmaatschapsaanvraag voor de groep is verstuurd. U ontvangt een melding zodra deze is geaccepteerd."
       unread_indicator: "Nog geen enkel lid heeft het laatste bericht van dit topic gelezen."
       read_more_MF: "Er { UNREAD, plural, =0 {} one { is <a href='{basePath}/unread'>1 ongelezen</a> } other { zijn <a href='{basePath}/unread'># ongelezen</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 nieuw</a> topic} other { {BOTH, select, true{and } false {zijn } other{}} <a href='{basePath}/new'># nieuwe</a> topics} } over, of {CATEGORY, select, true {blader door andere topics in {catLink}} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Alle categorieën bekijken
       view_latest_topics: nieuwste topics bekijken
       suggest_create_topic: "Waarom maakt u geen topic aan?"
@@ -1933,6 +1967,7 @@ nl:
         title: "Topictimer"
         save: "Timer instellen"
         num_of_hours: "Aantal uren:"
+        num_of_days: "Aantal dagen:"
         remove: "Timer verwijderen"
         publish_to: "Publiceren naar:"
         when: "Wanneer:"
@@ -1975,6 +2010,8 @@ nl:
         title: "Topic automatisch bumpen"
       reminder:
         title: "Mij herinneren"
+      auto_delete_replies:
+        title: "Antwoorden automatisch verwijderen"
       status_update_notice:
         auto_open: "Dit topic wordt %{timeLeft} automatisch geopend."
         auto_close: "Dit topic wordt %{timeLeft} automatisch gesloten."
@@ -1983,6 +2020,7 @@ nl:
         auto_delete: "Dit topic wordt %{timeLeft} automatisch verwijderd."
         auto_bump: "Dit topic wordt %{timeLeft} automatisch gebumpt."
         auto_reminder: "U wordt %{timeLeft} aan dit topic herinnerd."
+        auto_delete_replies: "Antwoorden op dit topic worden na %{duration} automatisch verwijderd."
       auto_close_title: "Instellingen voor automatisch sluiten"
       auto_close_immediate:
         one: "Het laatste bericht in dit topic is al %{count} uur oud, dus het topic wordt meteen gesloten."
@@ -2194,6 +2232,18 @@ nl:
         title: "Geselecteerde berichten samenvoegen"
         action: "geselecteerde berichten samenvoegen"
         error: "Er is een fout opgetreden bij het samenvoegen van de geselecteerde berichten."
+      publish_page:
+        title: "Pagina's publiceren"
+        publish: "Publiceren"
+        description: "Wanneer een topic als een pagina wordt gepubliceerd, kan de URL ervan worden gedeeld en wordt deze met aangepaste stijlen weergegeven."
+        slug: "Slug"
+        publish_url: "Uw pagina is gepubliceerd op:"
+        topic_published: "Uw topic is gepubliceerd op:"
+        preview_url: "Uw pagina wordt gepubliceerd op:"
+        invalid_slug: "Sorry, u kunt deze pagina niet publiceren."
+        unpublish: "Publicatie ongedaan maken"
+        unpublished: "Uw pagina is niet meer gepubliceerd en niet meer toegankelijk."
+        publishing_settings: "Publicatie-instellingen"
       change_owner:
         title: "Eigenaar wijzigen"
         action: "eigendom wijzigen"
@@ -2202,6 +2252,9 @@ nl:
         instructions:
           one: "Kies een nieuwe eigenaar voor het bericht van <b>@{{old_user}}</b>"
           other: "Kies een nieuwe eigenaar voor de {{count}} berichten van <b>@{{old_user}}</b>"
+        instructions_without_old_user:
+          one: "Kies een nieuwe eigenaar voor het bericht"
+          other: "Kies een nieuwe eigenaar voor de {{count}} berichten"
       change_timestamp:
         title: "Tijdstempel wijzigen..."
         action: "tijdstempel wijzigen"
@@ -2327,6 +2380,7 @@ nl:
         convert_to_moderator: "Stafkleur toevoegen"
         revert_to_regular: "Stafkleur verwijderen"
         rebake: "HTML opnieuw opbouwen"
+        publish_page: "Pagina's publiceren"
         unhide: "Tonen"
         change_owner: "Eigendom wijzigen "
         grant_badge: "Badge toekennen"
@@ -2421,13 +2475,18 @@ nl:
             button: "HTML"
       bookmarks:
         create: "Bladwijzer maken"
+        edit: "Bladwijzer bewerken"
+        created: "Gemaakt"
         name: "Naam"
-        name_placeholder: "Geef de bladwijzer een naam als geheugensteuntje"
-        set_reminder: "Een herinnering instellen"
+        name_placeholder: "Waar is deze bladwijzer voor?"
+        set_reminder: "Mij herinneren"
         actions:
           delete_bookmark:
             name: "Bladwijzer verwijderen"
             description: "Verwijdert de bladwijzer uit uw profiel en stopt alle herinneringen voor de bladwijzer"
+          edit_bookmark:
+            name: "Bladwijzer bewerken"
+            description: "De bladwijzernaam bewerken of de herinneringsdatum en -tijd wijzigen"
     category:
       can: "kan&hellip; "
       none: "(geen categorie)"
@@ -2789,6 +2848,18 @@ nl:
         title: "Opstellen"
         return: "%{shortcut} Terug naar editor"
         fullscreen: "%{shortcut} Editor in volledig scherm"
+      bookmarks:
+        title: "Bladwijzers maken"
+        enter: "%{shortcut} Opslaan en sluiten"
+        later_today: "%{shortcut} Later vandaag"
+        later_this_week: "%{shortcut} Later deze week"
+        tomorrow: "%{shortcut} Morgen"
+        next_week: "%{shortcut} Volgende week"
+        next_month: "%{shortcut} Volgende maand"
+        next_business_week: "%{shortcut} Begin volgende week"
+        next_business_day: "%{shortcut} Volgende werkdag"
+        custom: "%{shortcut} Aangepaste datum en tijd"
+        none: "%{shortcut} Geen herinnering"
       actions:
         title: "Acties"
         bookmark_topic: "%{shortcut} Bladwijzer voor topic in-/uitschakelen"
@@ -2811,6 +2882,10 @@ nl:
         print: "%{shortcut} Topic afdrukken"
         defer: "%{shortcut} Topic negeren"
         topic_admin_actions: "%{shortcut} Beheeracties voor topic openen"
+      search_menu:
+        title: "Menu Zoeken"
+        prev_next: "%{shortcut} Selectie omhoog en omlaag verplaatsen"
+        insert_url: "%{shortcut} Selectie in open editorvenster invoegen"
     badges:
       earned_n_times:
         one: "Deze badge is %{count} keer verdiend"
@@ -3222,6 +3297,9 @@ nl:
         notification_event:
           name: "Meldingsgebeurtenis"
           details: "Wanneer een gebruiker een melding in zijn of haar feed ontvangt."
+        user_badge_event:
+          name: "Badgetoekenningsgebeurtenis"
+          details: "Wanneer een gebruiker een badge ontvangt."
         delivery_status:
           title: "Afleveringsstatus"
           inactive: "Inactief"
@@ -3371,6 +3449,7 @@ nl:
           theme_name: "Themanaam"
           component_name: "Onderdeelnaam"
           themes_intro: "Selecteer een bestaand of installeer een nieuw thema om te beginnen"
+          themes_intro_emoji: "kunstenares-emoji"
           beginners_guide_title: "Beginnersgids voor het gebruik van Discourse-thema's"
           developers_guide_title: "Ontwikkelaarsgids voor Discourse-thema's"
           browse_themes: "Gemeenschapsthema's verkennen"
@@ -3597,6 +3676,7 @@ nl:
         format: "Indeling"
         html: "html"
         text: "tekst"
+        html_preview: "Voorbeeld van e-mailinhoud"
         last_seen_user: "Laatst geziene gebruiker:"
         no_result: "Geen resultaten gevonden voor samenvatting."
         reply_key: "Antwoordsleutel"
@@ -3751,6 +3831,8 @@ nl:
             api_key_update: "api-sleutel bijwerken"
             api_key_destroy: "api-sleutel verwijderen"
             override_upload_secure_status: "status beveiligd uploaden negeren"
+            page_published: "pagina gepubliceerd"
+            page_unpublished: "pagina niet gepubliceerd"
         screened_emails:
           title: "Gecontroleerde e-mails"
           description: "Als iemand een nieuwe account probeert aan te maken, worden de volgende e-mailadressen gecontroleerd en de registratie geblokkeerd, of een andere actie uitgevoerd."
@@ -3854,7 +3936,6 @@ nl:
           staff: "Stafleden"
           suspended: "Geschorst"
           silenced: "Gedempt"
-          suspect: "Verdacht"
           staged: "Staged"
         approved: "Goedgekeurd?"
         titles:
@@ -3871,7 +3952,6 @@ nl:
           moderators: "Moderators"
           silenced: "Gedempte gebruikers"
           suspended: "Geschorste gebruikers"
-          suspect: "Verdachte gebruikers"
           staged: "Staged gebruikers"
         not_verified: "Niet geverifieerd"
         check_email:
@@ -3909,7 +3989,7 @@ nl:
         penalty_count: "Aantal minpunten"
         clear_penalty_history:
           title: "Minpuntengeschiedenis wissen"
-          description: "gebruikers met minpunten kunnen geen VN3 bereiken"
+          description: "gebruikers met minpunten kunnen geen TL3 bereiken"
         delete_all_posts_confirm_MF: "U gaat {POSTS, plural, one {1 bericht} other {# berichten}} en {TOPICS, plural, one {1 topic} other {# topics}} verwijderen. Weet u het zeker?"
         silence: "Dempen"
         unsilence: "Dempen opheffen"
@@ -4002,6 +4082,7 @@ nl:
           threshold_reached: "Er zijn te veel bounceberichten van dat e-mailadres ontvangen."
         trust_level_change_failed: "Er is een probleem opgetreden bij het wijzigen van het vertrouwensniveau van de gebruiker."
         suspend_modal_title: "Gebruiker schorsen"
+        confirm_cancel_penalty: "Weet u zeker dat u het minpunt wilt negeren?"
         trust_level_2_users: "Gebruikers met vertrouwensniveau 2"
         trust_level_3_requirements: "Vereisten voor vertrouwensniveau 3"
         trust_level_locked_tip: "vertrouwensniveau is vergrendeld; het systeem zal geen gebruikers promoveren of degraderen"
@@ -4215,6 +4296,7 @@ nl:
             with_time: "<span class=\"username\">%{username}</span> om <span class=\"time\">%{time}</span>"
         badge_intro:
           title: "Selecteer een bestaande badge of maak een nieuwe om te beginnen"
+          emoji: "studente-emoji"
           what_are_badges_title: "Wat zijn badges?"
           badge_query_examples_title: "Voorbeelden van badgequery's"
         mass_award:
@@ -4231,7 +4313,9 @@ nl:
         help: "Nieuwe emoji toevoegen die voor iedereen beschikbaar zal zijn. (PROTIP: versleep meerdere bestanden tegelijk)"
         add: "Nieuwe emoji toevoegen"
         name: "Naam"
+        group: "Groep"
         image: "Afbeelding"
+        alt: "voorbeeld van eigen emoji"
         delete_confirm: "Weet u zeker dat u de emoji :%{name}: wilt verwijderen?"
       embedding:
         get_started: "Als u Discourse in een andere website wilt inbedden, begin dan door de host ervan toe te voegen."
@@ -4251,13 +4335,14 @@ nl:
         embed_post_limit: "Maximale aantal berichten om in te bedden"
         embed_title_scrubber: "Reguliere expressie voor het afleiden van de titels van berichten"
         embed_truncate: "Ingebedde berichten inkorten"
+        embed_unlisted: "Geïmporteerde topics worden onzichtbaar totdat er antwoord is."
         embed_whitelist_selector: "CSS-selector voor elementen die bij inbedding worden toegestaan"
         embed_blacklist_selector: "CSS-selector voor elementen die bij inbedding worden verwijderd"
         embed_classname_whitelist: "Toegestane CSS-klassenamen"
         save: "Inbeddingsinstellingen opslaan"
       permalink:
         title: "Permalinks"
-        description: "Houd er rekening mee dat dit alleen van toepassing is op externe bronnen; op uw forum geplaatste koppelingen worden niet omgeleid."
+        description: "Toe te passen omleiding voor URL's die voor het forum niet bekend zijn."
         url: "URL"
         topic_id: "Topic-ID"
         topic_title: "Topic"
@@ -4266,6 +4351,7 @@ nl:
         category_id: "Categorie-ID"
         category_title: "Categorie"
         external_url: "Externe URL"
+        destination: "Bestemming"
         delete_confirm: "Weet u zeker dat u deze permalink wilt verwijderen?"
         form:
           label: "Nieuw:"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 0e170d8ca8..1612f8fc56 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -29,8 +29,9 @@ pl_PL:
         millions: "{{number}}M"
     dates:
       time: "H:mm"
+      time_short_day: "ddd, GG: mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, H:mm"
+      long_no_year: "D MMM, GG: mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM YYYY H:mm"
@@ -196,6 +197,8 @@ pl_PL:
       banner:
         enabled: "ustawił ten baner %{when}. Będzie widoczny na górze każdej strony, póki nie zostanie ukryty przez użytkownika."
         disabled: "Ten temat nie jest już banerem. Nie będzie dalej wyświetlany na górze każdej strony."
+      forwarded: "przekazano powyższy email"
+    topic_admin_menu: "akcje tematu"
     wizard_required: "Witaj na Twoim na nowym forum Discourse! Zacznijmy od <a href='%{url}' data-auto-route='true'>kreatora ustawień</a> ✨"
     emails_are_disabled: "Wysyłanie e-maili zostało globalnie wyłączone przez administrację. Powiadomienia e-mail nie będą dostarczane."
     bootstrap_mode_enabled: "Aby ułatwić uruchomienie Twojej strony, jesteś w trybie bootstrap. Wszyscy nowi użytkownicy otrzymają poziom zaufania 1 i będą otrzymywać codzienne wiadomości e-mail z podsumowaniem aktywności na forum. To zostanie automatycznie wyłączone, kiedy %{min_users} osób dołączy."
@@ -309,9 +312,25 @@ pl_PL:
     bookmarks:
       created: "zakładka dodana"
       not_bookmarked: "dodaj do zakładek"
+      created_with_at_desktop_reminder: "zakładka tego posta została dodana do zakładek, a następnym razem zostaniesz o tym powiadomiony"
       remove: "Usuń zakładkę"
       confirm_clear: "Czy na pewno chcesz usunąć wszystkie swoje zakładki ustawione w tym temacie?"
       save: "Zapisz"
+      no_timezone: 'Nie ustawiłeś jeszcze strefy czasowej. Nie będziesz mógł ustawić przypomnień. Skonfiguruj jeden <a href="%{basePath}/my/preferences/profile">w swoim profilu</a> .'
+      invalid_custom_datetime: "Podana data i godzina są nieprawidłowe, spróbuj ponownie."
+      list_permission_denied: "Nie masz uprawnień do przeglądania zakładek tego użytkownika."
+      reminders:
+        at_desktop: "Następnym razem będę na swoim pulpicie"
+        later_today: "Później dzisiaj"
+        next_business_day: "Następny dzień roboczy"
+        tomorrow: "Jutro"
+        next_week: "Następny tydzień"
+        later_this_week: "Później w tym tygodniu"
+        start_of_next_business_week: "Następny poniedziałek"
+        next_month: "Następny miesiąc"
+        custom: "Niestandardowa data i godzina"
+        last_custom: "Ostatni, ubiegły, zeszły"
+        none: "Przypomnienie nie jest potrzebne"
     drafts:
       resume: "Kontynuuj"
       remove: "Usuń"
@@ -363,8 +382,14 @@ pl_PL:
       install_banner: "Czy chcesz <a href>zainstalować %{title} na tym urządzeniu?</a>"
     choose_topic:
       none_found: "Nie znaleziono tematów."
+      title:
+        search: "Wyszukaj temat"
+        placeholder: "wpisz tytuł tematu, adres URL lub identyfikator tutaj"
     choose_message:
       none_found: "Nie znaleziono wiadomości."
+      title:
+        search: "Wyszukaj wiadomość"
+        placeholder: "wpisz tutaj tytuł wiadomości, adres URL lub identyfikator"
     review:
       order_by: "Segreguj według:"
       in_reply_to: "w odpowiedzi na"
@@ -387,7 +412,9 @@ pl_PL:
           title: "Przedmioty, które można przeglądać, tworzone przez użytkowników o wyższym poziomie zaufania, mają wyższy wynik."
         type_bonus:
           name: "bonus typu"
+          title: "Niektóre rodzaje przeglądalne mogą otrzymać premię od pracowników, aby nadać im wyższy priorytet."
       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ł je przejrzeć."
         claimed_by_you: "Przejąłeś tę pozycję i możesz ją teraz przejrzeć."
         claimed_by_other: "Ten przedmiot może być sprawdzony tylko przez <b>{{username}}</b> ."
@@ -422,11 +449,17 @@ pl_PL:
       deleted_user: "(użytkownik usunięty)"
       user:
         bio: "Biografia"
+        website: "Stronie internetowej"
         username: "Nazwa użytkownika"
         email: "Email"
         name: "Imię"
         fields: "Pola"
       user_percentage:
+        summary:
+          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} flaga ogółem)"
+          few: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} flagi ogółem)"
+          many: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} flagi ogółem)"
+          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} flagi ogółem)"
         agreed:
           one: "{{count}}% zgadza się"
           few: "{{count}}% zgadza się"
@@ -557,6 +590,7 @@ pl_PL:
       days_visited_long: "Dni Odwiedzin"
       posts_read: "Przeczytane"
       posts_read_long: "Przeczytane wpisy"
+      last_updated: "Ostatnio zaktualizowany:"
       total_rows:
         one: "%{count} użytkownik"
         few: "%{count} użytkownicy"
@@ -584,6 +618,7 @@ pl_PL:
         deny: "Odrzuć"
         denied: "odrzucony"
         undone: "prośba cofnięta"
+        handle: "obsłuż prośby o członkostwo "
       manage:
         title: "Zarządzaj"
         name: "Nazwa"
@@ -624,6 +659,8 @@ pl_PL:
       leave: "Opuść"
       request: "Wniosek"
       message: "Wiadomość"
+      confirm_leave: "Czy na pewno chcesz opuścić tę grupę?"
+      allow_membership_requests: "Zezwalaj użytkownikom na wysyłanie wniosków o członkostwo do właścicieli grup (wymaga publicznie widocznej grupy)"
       membership_request_template: "Wyświetl niestandardowy szablon użytkownikom, w momencie wysyłania wniosku o członkostwo."
       membership_request:
         submit: "Złóż wniosek"
@@ -797,18 +834,27 @@ pl_PL:
         ignore_duration_username: "Nazwa użytkownika"
         ignore_duration_when: "Oczekiwanie"
         ignore_duration_save: "Ignoruj"
+        ignore_duration_note: "Pamiętaj, że wszystkie ignorowania są automatycznie usuwane po upływie czasu ignorowania."
         ignore_duration_time_frame_required: "Wybierz przedział czasowy"
         ignore_no_users: "Nie posiadasz ignorowanych użytkowników."
         ignore_option: "Zignorowany"
+        ignore_option_title: "Nie będziesz otrzymywać powiadomień związanych z tym użytkownikiem, a wszystkie ich tematy i odpowiedzi będą ukryte."
         add_ignored_user: "Dodaj..."
         mute_option: "Wyciszenie"
+        mute_option_title: "Nie będziesz otrzymywać żadnych powiadomień związanych z tym użytkownikiem."
         normal_option: "Normalny"
+        normal_option_title: "Zostaniesz powiadomiony, jeśli ten użytkownik odpowie ci, zacytuje lub o tobie wspomni."
       activity_stream: "Aktywność"
       preferences: "Ustawienia"
       feature_topic_on_profile:
+        open_search: "Wybierz nowy temat"
+        title: "Wybierz temat"
+        search_label: "Wyszukaj temat według tytułu"
         save: "Zapisz"
         clear:
           title: "Wyczyść"
+          warning: "Czy na pewno chcesz wyczyścić polecany temat?"
+      use_current_timezone: "Użyj aktualnej strefy czasowej"
       profile_hidden: "Publiczny profil użytkownika jest ukryty."
       expand_profile: "Rozwiń"
       collapse_profile: "Zwiń"
@@ -841,6 +887,7 @@ pl_PL:
       enable_quoting: "Włącz cytowanie zaznaczonego tekstu"
       enable_defer: "Włącz odroczenie, aby oznaczyć tematy jako nieprzeczytane"
       change: "zmień"
+      featured_topic: "Wyróżniony temat"
       moderator: "{{user}} jest moderatorem"
       admin: "{{user}} jest adminem"
       moderator_tooltip: "Ten użytkownik jest moderatorem"
@@ -907,6 +954,7 @@ pl_PL:
         deleted_posts: "usunięte wpisy"
         suspensions: "zawieszone"
         warnings_received: "otrzymanych ostrzeżeń"
+        rejected_posts: "odrzucone posty"
       messages:
         all: "Wszystkie"
         inbox: "Skrzynka odbiorcza"
@@ -943,11 +991,15 @@ pl_PL:
         disable: "Wyłącz"
         enable: "Włącz"
         enable_long: "Włącz kody zapasowe"
+        manage: "Zarządzaj kodami zapasowymi. Pozostały Ci kody zapasowe <strong>{{count}}</strong> ."
         copied_to_clipboard: "Skopiowane do schowka"
         copy_to_clipboard_error: "Wystąpił błąd w trakcie kopiowania do schowka"
+        remaining_codes: "Pozostały Ci kody zapasowe <strong>{{count}}</strong> ."
         use: "Używaj kodu zapasowego"
+        enable_prerequisites: "Przed wygenerowaniem kodów zapasowych należy włączyć główny drugi czynnik."
         codes:
           title: "Wygenerowano kody zapasowe"
+          description: "Każdy z tych kodów zapasowych można użyć tylko raz. Trzymaj je w bezpiecznym, ale dostępnym miejscu."
       second_factor:
         title: "Dwuskładnikowe uwierzytelnianie"
         enable: "Zarządzaj autentykacją dwuetapową"
@@ -967,19 +1019,27 @@ pl_PL:
         enforced_notice: "Aby uzyskać dostęp do tej witryny, musisz włączyć uwierzytelnianie dwuskładnikowe."
         disable: "Wyłącz"
         disable_title: "Wyłącz drugi czynnik"
+        disable_confirm: "Czy na pewno chcesz wyłączyć wszystkie drugie czynniki?"
         edit: "Edytuj"
+        edit_title: "Edytuj drugi czynnik"
+        edit_description: "Nazwa drugiego czynnika"
+        enable_security_key_description: "Po przygotowaniu fizycznego klucza bezpieczeństwa naciśnij przycisk Zarejestruj poniżej."
         totp:
           title: "Uwierzytelnianie oparte na tokenach"
           add: "Nowy Authenticator"
           default_name: "Mój Authenticator"
+          name_and_code_required_error: "Musisz podać nazwę i kod z aplikacji uwierzytelniającej."
         security_key:
           register: "Zarejestruj"
           title: "Klucze bezpieczeństwa"
           add: "Zarejestruj klucz bezpieczeństwa"
           default_name: "Główny klucz bezpieczeństwa"
+          not_allowed_error: "Upłynął limit czasu procesu rejestracji klucza bezpieczeństwa lub został on anulowany."
+          already_added_error: "Ten klucz bezpieczeństwa został już zarejestrowany. Nie musisz go ponownie rejestrować."
           edit: "Edytuj Klucz Bezpieczeństwa"
           edit_description: "Nazwa klucza bezpieczeństwa"
           delete: "Usuń"
+          name_required_error: "Musisz podać nazwę swojego klucza bezpieczeństwa."
       change_about:
         title: "Zmień O mnie"
         error: "Wystąpił błąd podczas zmiany tej wartości."
@@ -996,9 +1056,10 @@ pl_PL:
         success_staff: "Wysłaliśmy wiadomość na bieżący adres. Proszę przestrzegać informacji dotyczących potwierdzenia adresu."
       change_avatar:
         title: "Zmień swój awatar"
-        gravatar: "bazujący na <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>"
-        gravatar_title: "Zmień swój awatar na stronie serwisu Gravatar"
-        refresh_gravatar_title: "Zaktualizuj swój Gravatar"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a> , na podstawie"
+        gravatar_title: "Zmień swój awatar na stronie {{gravatarName}}"
+        gravatar_failed: "Nie mogliśmy znaleźć {{gravatarName}} z tym adresem e-mail."
+        refresh_gravatar_title: "Odśwież swój {{gravatarName}}"
         letter_based: "Awatar przyznany przez system"
         uploaded_avatar: "Zwyczajny obrazek"
         uploaded_avatar_empty: "Dodaj zwyczajny obrazek"
@@ -1006,9 +1067,13 @@ pl_PL:
         image_is_not_a_square: "Uwaga: grafika została przycięta ponieważ jej wysokość i szerokość nie były równe. "
       change_profile_background:
         title: "Nagłówek profilu"
+        instructions: "Nagłówki profilu zostaną wyśrodkowane i będą miały domyślną szerokość 1110 pikseli."
       change_card_background:
         title: "Tło karty użytkownika"
         instructions: "Tło karty użytkownika est wycentrowane i posiada domyślną szerokość 590px."
+      change_featured_topic:
+        title: "Wyróżniony temat"
+        instructions: "Link do tego tematu będzie na twojej karcie użytkownika i profilu."
       email:
         title: "Email"
         primary: "Podstawowy adres email"
@@ -1059,6 +1124,9 @@ pl_PL:
         any: "każdy"
       password_confirmation:
         title: "Powtórz hasło"
+      invite_code:
+        title: "Zaproś kod"
+        instructions: "Rejestracja konta wymaga kodu zaproszenia"
       auth_tokens:
         title: "Ostatnio używane urządzenia"
         ip: "IP"
@@ -1146,6 +1214,7 @@ pl_PL:
         search: "wpisz aby szukać zaproszeń…"
         title: "Zaproszenia"
         user: "Zaproszony(-a) użytkownik(-czka)"
+        sent: "Ostatni wysłany"
         none: "Brak zaproszeń do wyświetlenia."
         truncated:
           one: "Wyświetlanie pierwszego zaproszenia."
@@ -1296,6 +1365,9 @@ pl_PL:
         back: "Cofnij"
         again: "Spróbuj ponownie"
         fixed: "Załaduj stronę"
+    modal:
+      close: "zamknij"
+      dismiss_error: "Odrzuć błąd"
     close: "Zamknij"
     assets_changed_confirm: "Serwis został zmieniony, czy pozwolisz na przeładowanie strony w celu aktualizacji do najnowszej wersji?"
     logout: "Nastąpiło wylogowanie."
@@ -1304,6 +1376,17 @@ pl_PL:
       enabled: "Strona jest w trybie tylko-do-odczytu. Możesz nadal przeglądać serwis, ale operacje takie jak postowanie, lajkowanie i inne są wyłączone."
       login_disabled: "Logowanie jest zablokowane, gdy strona jest w trybie tylko do odczytu."
       logout_disabled: "Wylogowanie jest zablokowane gdy strona jest w trybie tylko do odczytu."
+    too_few_topics_and_posts_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Rozpocznijmy dyskusję!</a> Jest {currentTopics, liczba mnoga, jeden {jest <strong>#</strong> tematem} inny {are <strong>#</strong> topics}} i {currentPosts, liczba mnoga, jeden { <strong>#</strong> post} inne { <strong>#</strong> posty}}. Odwiedzający potrzebują więcej do przeczytania i odpowiedzi - zalecamy co najmniej {wymaganeTopiki, liczba mnoga, jeden { <strong>#</strong> temat} inne { <strong>#</strong> tematy}} i {wymaganePosty, liczba mnoga, jeden { <strong>#</strong> post} inne { <strong>#</strong> posty}}. Tylko pracownicy mogą zobaczyć tę wiadomość.
+    too_few_topics_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Rozpocznijmy dyskusję!</a> Jest {currentTopics, liczba mnoga, jeden {is <strong>#</strong> topic} other {are <strong>#</strong> topics}}. Odwiedzający potrzebują więcej do przeczytania i udzielenia odpowiedzi - zalecamy co najmniej {wymaganeTopiki, liczba mnoga, jeden { <strong>#</strong> temat} inny { <strong>#</strong> tematy}}. Tylko pracownicy mogą zobaczyć tę wiadomość.
+    too_few_posts_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Rozpocznijmy dyskusję!</a> Jest {currentPosts, liczba mnoga, jeden {is <strong>#</strong> post} other {are <strong>#</strong> posts}}. Odwiedzający potrzebują więcej do przeczytania i odpowiedzi - zalecamy co najmniej {wymaganePosty, liczba mnoga, jeden { <strong>#</strong> post} inny { <strong>#</strong> posty}}. Tylko pracownicy mogą zobaczyć tę wiadomość.
+    logs_error_rate_notice:
+      reached_hour_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{stopa, liczba mnoga, jeden {# błąd / godzina} inne {# błędy / godzina}}</a> osiągnęła limit ustawienia witryny w wysokości {limit, liczba mnoga, jeden {# błąd / godzina} inne {# błędy / godzina}}."
+      reached_minute_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{stopa, liczba mnoga, jeden {# błąd / minuta} inna {# błędy / minuta}}</a> osiągnęła limit ustawienia witryny w wysokości {limit, liczba mnoga, jeden {# błąd / minuta} inne {# błędy / minuta}}."
+      exceeded_hour_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{stopa, liczba mnoga, jeden {# błąd / godzina} inny {# błędy / godzina}}</a> przekroczył limit ustawienia witryny o {limit, liczba mnoga, jeden {# błąd / godzina} inne {# błędy / godzina}}."
+      exceeded_minute_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{stopa, liczba mnoga, jeden {# błąd / minuta} inna {# błędy / minuta}}</a> przekroczyła limit ustawienia witryny o {limit, liczba mnoga, jeden {# błąd / minuta} inne {# błędy / minuta}}."
     learn_more: "dowiedz się więcej…"
     all_time: "łącznie"
     all_time_desc: "łącznie utworzonych tematów"
@@ -1371,6 +1454,8 @@ pl_PL:
       reset: "Resetuj hasło"
       complete_username: "Jeśli jakieś mamy konto o nazwie użytkownika <b>%{username}</b>, za chwilę zostanie wysłana wiadomość z instrukcją jak ustawić nowe hasło."
       complete_email: "Jeśli jakieś konto użytkownika posiada adres <b>%{email}</b>, za chwilę zostanie wysłana wiadomość z instrukcją jak ustawić nowe hasło."
+      complete_username_found: "Znaleźliśmy konto pasujące do nazwy użytkownika <b>%{username}</b> . Powinieneś otrzymać wiadomość e-mail z instrukcjami, jak szybko zresetować hasło."
+      complete_email_found: "Znaleźliśmy konto pasujące do <b>%{email}</b> . Powinieneś otrzymać wiadomość e-mail z instrukcjami, jak szybko zresetować hasło."
       complete_username_not_found: "Nie znaleziono konta o nazwie <b>%{username}</b>"
       complete_email_not_found: "Nie znaleziono konta przypisanego do <b>%{email}</b>"
       help: "Email nie dotarł? Upewnij się najpierw czy sprawdziłeś folder spam.<p>Nie jesteś pewny jaki email został użyty? Wprowadz adres tutaj, a dowiemy się czy taki istnieje.</p><p>Jeśli nie masz już dostępu do adresu email zapisanego na twoim koncie, skontaktuj się z <a href='%{basePath}/about'>naszym pomocnym zespołem.</a></p>"
@@ -1381,6 +1466,8 @@ pl_PL:
       button_label: "z e-mailem"
       complete_username: "Jeśli konto pasuje do nazwy użytkownika <b>%{username}</b> , <b>wkrótce</b> otrzymasz wiadomość e-mail z linkiem do logowania."
       complete_email: "Jeśli konto pasuje do <b>%{email}</b> , <b>wkrótce</b> otrzymasz wiadomość e-mail z linkiem do logowania."
+      complete_username_found: "Znaleźliśmy konto pasujące do nazwy użytkownika <b>%{username}</b> , <b>wkrótce</b> otrzymasz wiadomość e-mail z linkiem do logowania."
+      complete_email_found: "Znaleźliśmy konto pasujące do <b>%{email}</b> , <b>wkrótce</b> otrzymasz wiadomość e-mail z linkiem do logowania."
       complete_username_not_found: "Nie znaleziono konta o nazwie <b>%{username}</b>"
       complete_email_not_found: "Nie znaleziono konta przypisanego do <b>%{email}</b>"
       confirm_title: "Przejdź do %{site_name}"
@@ -1396,12 +1483,16 @@ pl_PL:
       second_factor_backup_title: "Kod zapasowy weryfikacji dwuskładnikowej"
       second_factor_backup_description: "Proszę wprowadź jeden ze swoich zapasowych kodów:"
       second_factor: "Zaloguj się przy użyciu aplikacji Authenticator"
+      security_key_description: "Po przygotowaniu fizycznego klucza bezpieczeństwa naciśnij przycisk Uwierzytelnij za pomocą klucza bezpieczeństwa poniżej."
       security_key_alternative: "Spróbuj w inny sposób"
       security_key_authenticate: "Uwierzytelnij się za pomocą klucza bezpieczeństwa"
       security_key_not_allowed_error: "Upłynął limit czasu procesu uwierzytelniania klucza bezpieczeństwa lub został on anulowany."
+      security_key_no_matching_credential_error: "W podanym kluczu zabezpieczeń nie znaleziono zgodnych poświadczeń."
+      security_key_support_missing_error: "Twoje obecne urządzenie lub przeglądarka nie obsługuje używania kluczy bezpieczeństwa. Proszę użyć innej metody."
       email_placeholder: "adres email lub nazwa użytkownika"
       caps_lock_warning: "Caps Lock jest włączony"
       error: "Nieznany błąd"
+      cookies_error: "Wygląda na to, że masz wyłączoną obsługę plików cookie. Możesz nie być w stanie zalogować się bez uprzedniego włączenia ich."
       rate_limit: "Poczekaj, zanim ponowisz próbę logowania."
       blank_username: "Podaj swój adres e-mail lub nazwę użytkownika."
       blank_username_or_password: "Podaj swój email lub nazwę użytkownika i hasło"
@@ -1416,11 +1507,13 @@ pl_PL:
       not_allowed_from_ip_address: "Nie możesz się zalogować z tego adresu IP."
       admin_not_allowed_from_ip_address: "Nie możesz się zalogować jako admin z tego adresu IP."
       resend_activation_email: "Kliknij tutaj, aby ponownie wysłać email z aktywacją konta."
+      omniauth_disallow_totp: "Twoje konto ma włączone uwierzytelnianie dwuskładnikowe. Zaloguj się za pomocą swojego hasła."
       resend_title: "Wyślij ponownie Email aktywacyjny"
       change_email: "Zmień Adres Email"
       provide_new_email: "Wprowadź nowy adres Email. Wyślemy na niego mail potwierdzający."
       submit_new_email: "Zaktualizuj adres Email"
       sent_activation_email_again: "Wysłaliśmy do ciebie kolejny email z aktywacją konta na <b>{{currentEmail}}</b>. Zanim dotrze, może minąć kilka minut; pamiętaj, żeby sprawdzić folder ze spamem."
+      sent_activation_email_again_generic: "Wysłaliśmy kolejny e-mail aktywacyjny. Przybycie może potrwać kilka minut; koniecznie sprawdź folder ze spamem."
       to_continue: "Zaloguj się"
       preferences: "Musisz się zalogować, aby zmieniać swoje ustawienia."
       forgot: "Nie pamiętam konta"
@@ -1463,6 +1556,7 @@ pl_PL:
       apple_international: "Apple/Międzynarodowy"
       google: "Google"
       twitter: "Twitter"
+      emoji_one: "JoyPixels (wcześniej EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1471,6 +1565,8 @@ pl_PL:
       categories_with_featured_topics: "Kategorie z wybranymi tematami"
       categories_and_latest_topics: "Kategorie i ostatnie tematy"
       categories_and_top_topics: "Kategorie i najlepsze tematy"
+      categories_boxes: "Pudełka z podkategoriami"
+      categories_boxes_with_topics: "Pudełka z polecanymi tematami"
     shortcut_modifier_key:
       shift: "Shift"
       ctrl: "Ctrl"
@@ -1496,9 +1592,12 @@ pl_PL:
         few: "Wybierz co najmniej {{count}} elementy."
         many: "Wybierz co najmniej {{count}} elementów."
         other: "Wybierz co najmniej {{count}} elementów."
+      invalid_selection_length: "Zaznaczenie musi zawierać co najmniej {{count}} znaków."
     date_time_picker:
       from: Od
       to: Do
+      errors:
+        to_before_from: "Do daty musi być późniejsza niż data."
     emoji_picker:
       filter_placeholder: Szukaj emoji
       smileys_&_emotion: Emotikony i emocje
@@ -1510,7 +1609,6 @@ pl_PL:
       objects: Obiekty
       symbols: Symbolika
       flags: Flagi
-      custom: Spersonalizowane emoji
       recent: Ostatnio używane
       default_tone: Brak koloru skóry
       light_tone: Jasny kolor skóry
@@ -1518,6 +1616,7 @@ pl_PL:
       medium_tone: Średni kolor skóry
       medium_dark_tone: Średnio ciemny kolor skóry
       dark_tone: Ciemny kolor skóry
+      default: Spersonalizowane emoji
     shared_drafts:
       title: "Udostępnione projekty"
       notice: "Ten temat jest widoczny tylko użytkowników mających dostęp do kategorii <b>{{category}}</b>."
@@ -1539,6 +1638,8 @@ pl_PL:
       saved_local_draft_tip: "zapisano lokalnie"
       similar_topics: "Twój temat jest podobny do…"
       drafts_offline: "szkice offline"
+      edit_conflict: "edytuj konflikt"
+      group_mentioned_limit: "<b>Ostrzeżenie!</b> Wspomniałeś o <a href='{{group_link}}'>{{group}}</a> , jednak ta grupa ma więcej członków niż skonfigurowany przez administratora limit wzmianek dla użytkowników {{max}}. Nikt nie zostanie powiadomiony."
       group_mentioned:
         one: "Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>%{count} osobę</a> – czy jesteś pewien?"
         few: "Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>{{count}} osoby</a> – czy jesteś pewien?"
@@ -1558,7 +1659,9 @@ pl_PL:
         try_like: "Czy wypróbowałeś przycisk {{heart}}?"
         category_missing: "Musisz wybrać kategorię"
         tags_missing: "Musisz wybrać co najmniej {{count}} tagów"
+        topic_template_not_modified: "Dodaj szczegóły i szczegóły do swojego tematu, edytując szablon tematu."
       save_edit: "Zapisz zmiany"
+      overwrite_edit: "Zastąp edycję"
       reply_original: "Odpowiedz na Oryginalny Temat"
       reply_here: "Odpowiedz tutaj"
       reply: "Odpowiedz"
@@ -1581,6 +1684,7 @@ pl_PL:
       view_new_post: "Zobacz Twój nowy wpis."
       saving: "Zapisywanie"
       saved: "Zapisano!"
+      saved_draft: "Publikowanie wersji roboczej w toku. Stuknij, aby wznowić."
       uploading: "Wczytuję…"
       show_preview: "pokaż podgląd &raquo;"
       hide_preview: "&laquo; schowaj podgląd"
@@ -1608,6 +1712,11 @@ pl_PL:
       list_item: "Element listy"
       toggle_direction: "Zmień kierunek"
       help: "Pomoc formatowania Markdown"
+      collapse: "zminimalizuj panel kompozytora"
+      open: "otwórz panel kompozytora"
+      abandon: "zamknij kompozytora i odrzuć wersję roboczą"
+      enter_fullscreen: "wprowadź kompozytora na pełnym ekranie"
+      exit_fullscreen: "zamknij kompozytora na pełnym ekranie"
       modal_ok: "OK"
       modal_cancel: "Anuluj"
       cant_send_pm: "Przepraszamy, niestety nie możesz wysłać prywatnej wiadomości do %{username}."
@@ -1617,12 +1726,15 @@ pl_PL:
       admin_options_title: "Opcjonalne ustawienia zespołu dla tego tematu"
       composer_actions:
         reply: Odpowiedź
+        draft: Wersja robocza
         edit: Edycja
         reply_to_post:
+          label: "Odpowiedz na post %{postNumber} przez %{postUsername}"
           desc: Odpowiedz na określony post
         reply_as_new_topic:
           label: Odpowiedz jako powiązany temat
           desc: Utwórz nowy temat powiązany z tym tematem
+          confirm: "Zapisano nową wersję roboczą tematu, która zostanie zastąpiona, jeśli utworzysz połączony temat."
         reply_as_private_message:
           label: Nowa wiadomość
           desc: Utwórz nową osobistą wiadomość
@@ -1634,6 +1746,12 @@ pl_PL:
           desc: Szepty są widoczne tylko dla pracowników
         create_topic:
           label: "Nowy temat"
+        shared_draft:
+          label: "Udostępniony projekt"
+          desc: "Opracuj temat, który będzie widoczny tylko dla personelu"
+        toggle_topic_bump:
+          label: "Przełącz wypukłość tematu"
+          desc: "Odpowiedz bez zmiany ostatniej daty odpowiedzi"
     notifications:
       tooltip:
         regular:
@@ -1646,12 +1764,20 @@ pl_PL:
           few: "Nieodczytane wiadomości: {{count}}"
           many: "Nieodczytane wiadomości: {{count}}"
           other: "Nieodczytane wiadomości: 1"
+        high_priority:
+          one: "%{count} nieprzeczytane powiadomienie o wysokim priorytecie"
+          few: "%{count} nieprzeczytane powiadomienie o wysokim priorytecieis"
+          many: "%{count} nieprzeczytane powiadomienie o wysokim priorytecieis"
+          other: "%{count} nieprzeczytane powiadomienie o wysokim priorytecieis"
       title: "powiadomienia o wywołanej @nazwie, odpowiedzi do twoich wpisów i tematów, prywatne wiadomości, itp"
       none: "Nie udało się załadować listy powiadomień."
       empty: "Nie znaleziono powiadomień."
+      post_approved: "Twój post został zatwierdzony"
+      reviewable_items: "przedmioty wymagające przeglądu"
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -1678,6 +1804,7 @@ pl_PL:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nowy temat</span> {{description}}"
       membership_request_accepted: "Członkostwo zaakceptowane w „{{group_name}}”"
+      membership_request_consolidated: "{{count}} otwarte wnioski o członkostwo dla „{{group_name}}”"
       group_message_summary:
         one: "masz {{count}} wiadomość w skrzynce odbiorczej {{group_name}}"
         few: "masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}"
@@ -1696,15 +1823,19 @@ pl_PL:
         confirm_body: "Powodzenie! Powiadomienia zostały włączone."
         custom: "Powiadomienie od {{username}} na %{site_title}"
       titles:
+        mentioned: "wzmiankowany"
         replied: "nowa odpowiedź"
         quoted: "zacytowany"
         edited: "edytowane"
         liked: "nowe polubienie"
         private_message: "nowa prywatna wiadomość"
+        invited_to_private_message: "zaproszony na prywatną wiadomość"
         invitee_accepted: "zaproszenie przyjęte"
         posted: "nowy post"
         moved_post: "post został przeniesiony"
         linked: "połączony"
+        bookmark_reminder: "przypomnienie o zakładce"
+        bookmark_reminder_with_name: "przypomnienie o zakładce - %{name}"
         granted_badge: "przyznana odznaka"
         invited_to_topic: "zaproszony do tematu"
         group_mentioned: "wspomniana grupa"
@@ -1713,6 +1844,7 @@ pl_PL:
         topic_reminder: "przypomnienie tematu"
         liked_consolidated: "nowe polubienia"
         post_approved: "post zatwierdzony"
+        membership_request_consolidated: "nowe wnioski o członkostwo"
     upload_selector:
       title: "Dodaj obraz"
       title_with_attachments: "Dodaj obraz lub plik"
@@ -1759,6 +1891,7 @@ pl_PL:
       context:
         user: "Szukaj wpisów @{{username}}"
         category: "Szukaj w kategorii #{{category}}"
+        tag: "Wyszukaj znacznik # {{tag}}"
         topic: "Szukaj w tym temacie"
         private_messages: "Wyszukiwanie wiadomości"
       advanced:
@@ -1778,6 +1911,7 @@ pl_PL:
           title: Dopasowanie tylko w tytule
           likes: Lubię
           posted: Opublikowałem w
+          created: ja stworzyłem
           watching: Obserwuję
           tracking: Śledzę
           private: W moich wiadomościach
@@ -1794,6 +1928,7 @@ pl_PL:
           label: Tematy gdzie
           open: są otwarte
           closed: są zamknięte
+          public: są publiczne
           archived: są archiwizowane
           noreplies: ma zero odpowiedzi
           single_user: zawierają użytkownika
@@ -1885,6 +2020,13 @@ 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"
@@ -1940,6 +2082,7 @@ pl_PL:
       group_request_sent: "Twoja prośba o członkostwo w grupie została wysłana. Zostaniesz poinformowany, kiedy zostanie zaakceptowane."
       unread_indicator: "Nikt jeszcze nie czytał ostatniego postu w tym temacie."
       read_more_MF: "Masz do zobaczenia { UNREAD, plural, =0 {} one { is <a href='{basePath}/unread'>1 nieprzeczytany</a> } other { are <a href='{basePath}/unread'># nieprzeczytanych</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 nowy</a> temat} other { {BOTH, select, true{and } false {} other{}} <a href='{basePath}/new'># nowych</a> tematów} }, lub {CATEGORY, select, true {przeglądaj inne tematy w {catLink}} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT} {LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Przeglądaj wszystkie kategorie
       view_latest_topics: pokaż aktualne tematy
       suggest_create_topic: "Może rozpoczniesz temat?"
@@ -1947,11 +2090,14 @@ pl_PL:
       jump_reply_down: przeskocz do późniejszej odpowiedzi
       deleted: "Temat został usunięty"
       topic_status_update:
+        title: "Timer tematów"
         save: "Ustaw czas"
         num_of_hours: "Liczba godzin:"
+        num_of_days: "Liczba dni:"
         remove: "Usuń czas"
         publish_to: "Opublikuj do:"
         when: "Kiedy:"
+        public_timer_types: Timery tematów
         time_frame_required: Wybierz przedział czasowy
       auto_update_input:
         none: "Wybierz przedział czasowy"
@@ -2449,6 +2595,7 @@ pl_PL:
             title: "Pokaż część html emaila"
             button: "HTML"
       bookmarks:
+        created: "Utworzono"
         name: "Imię"
     category:
       can: "może&hellip; "
@@ -3854,7 +4001,6 @@ pl_PL:
           staff: "Zespół"
           suspended: "Zawieszeni"
           silenced: "Wyciszony"
-          suspect: "Podejrzani"
           staged: "Wystawiany na scenie"
         approved: "Zatwierdzam?"
         titles:
@@ -3871,7 +4017,6 @@ pl_PL:
           moderators: "Moderatoratorzy"
           silenced: "Wyciszeni użytkownicy"
           suspended: "Zawieszone konta"
-          suspect: "Podejrzani użytkownicy"
           staged: "Wystawieni użytkownicy"
         not_verified: "Niezweryfikowany"
         check_email:
@@ -4228,6 +4373,7 @@ pl_PL:
         help: "Dodawanie nowych emoji. (PROTIP: przeciągnij i upuść wiele plików)"
         add: "Dodaj nowe Emoji"
         name: "Nazwa"
+        group: "Grupa"
         image: "Grafika"
         delete_confirm: "Jesteś pewny(-a), że chcesz usunąć emoji :%{name}: ?"
       embedding:
@@ -4254,7 +4400,6 @@ pl_PL:
         save: "Zapisz"
       permalink:
         title: "Permalinki"
-        description: "Zwróć uwagę na to, że to ustawienie zastosowane zostanie wyłącznie do zewnętrznych źródeł, linki umieszczone na forum nie ulegną przekierowaniu."
         url: "URL"
         topic_id: "ID tematu"
         topic_title: "Temat"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 7a8e4cb363..de71481603 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -28,7 +28,6 @@ pt:
     dates:
       time: "hh:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "DD MMM, hh:mm"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "DD MMM YYYY hh:mm"
@@ -255,6 +254,12 @@ pt:
       remove: "Remover Marcador"
       confirm_clear: "De certeza que pretende remover todos os marcadores deste tópico?"
       save: "Guardar"
+      reminders:
+        later_today: "Hoje, mais tarde"
+        tomorrow: "Amanhã"
+        next_week: "Próxima semana"
+        later_this_week: "No final desta semana"
+        next_month: "Próximo mês"
     drafts:
       resume: "Continuar"
       remove: "Remover"
@@ -778,10 +783,6 @@ pt:
         success_staff: "Nós enviámos uma mensagem para o seu endereço atual. Por favor, siga as instruções de confirmação."
       change_avatar:
         title: "Alterar a sua imagem de perfil"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baseado em"
-        gravatar_title: "Mude o seu avatar no sítio Gravatar"
-        gravatar_failed: "Não conseguimos encontrar um Gravatar com esse endereço de email."
-        refresh_gravatar_title: "Atualize o seu Gravatar"
         letter_based: "Imagem de perfil atribuída pelo sistema"
         uploaded_avatar: "Foto personalizada"
         uploaded_avatar_empty: "Adicionar foto personalizada"
@@ -1047,6 +1048,8 @@ pt:
         back: "Voltar Atrás"
         again: "Tentar Novamente"
         fixed: "Carregar Página"
+    modal:
+      close: "fechar"
     close: "Fechar"
     assets_changed_confirm: "Este site acabou se ser atualizado. Recarregar agora para a versão mais recente?"
     logout: "A sua sessão foi encerrada."
@@ -1245,7 +1248,6 @@ pt:
       objects: Objetos
       symbols: Símbolos
       flags: Bandeiras
-      custom: Emojis Personalizados
       recent: Utilizado recentemente
       default_tone: Sem tom de pele
       light_tone: Tom de pele claro
@@ -1253,6 +1255,7 @@ pt:
       medium_tone: Tom de pele médio
       medium_dark_tone: Tom de pele meio escuro
       dark_tone: Tom de pele escuro
+      default: Emojis Personalizados
     shared_drafts:
       title: "Rascunhos Partilhados"
       notice: "Este tópico só está visível aos utilizadores que conseguem ver a categoria <b>{{category}}</b>."
@@ -1393,6 +1396,7 @@ pt:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -2043,6 +2047,7 @@ pt:
           html_part:
             button: "HTML"
       bookmarks:
+        created: "Criado"
         name: "Nome"
     category:
       can: "pode&hellip; "
@@ -2995,7 +3000,6 @@ pt:
           active: "Ativo"
           staff: "Pessoal"
           suspended: "Suspenso"
-          suspect: "Suspeito"
           staged: "Não Confirmado"
         approved: "Aprovado?"
         titles:
@@ -3011,7 +3015,6 @@ pt:
           admins: "Utilizadores da Administração"
           moderators: "Moderadores"
           suspended: "Utilizadores Suspensos"
-          suspect: "Utilizadores Suspeitos"
         not_verified: "Não verificado"
         check_email:
           title: "Revelar o endereço de email deste utilizador"
@@ -3302,6 +3305,7 @@ pt:
         help: "Adicionar novo emoji que irá estar disponível para todos. (PROTIP: arraste múltiplos ficheiros de uma só vez)"
         add: "Adicionar Novo Emoji"
         name: "Nome"
+        group: "Grupo"
         image: "Imagem"
         delete_confirm: "Tem a certeza que deseja eliminar o emoji :%{name}:?"
       embedding:
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index c2100cc36d..694ec3e025 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -26,15 +26,14 @@ pt_BR:
         thousands: "{{number}}k"
         millions: "{{number}}M"
     dates:
-      time: "H:mm"
+      time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, H:mm"
       long_no_year_no_time: "D MMM"
-      full_no_year_no_time: "D de MMMM"
+      full_no_year_no_time: "D [de] MMMM"
       long_with_year: "D MMM, YYYY H:mm"
       long_with_year_no_time: "D MMM, YYYY"
-      full_with_year_no_time: "D de MMMM, YYYY"
+      full_with_year_no_time: "D [de] MMMM, YYYY"
       long_date_with_year: "D MMM, 'YY LT"
       long_date_without_year: "D MMM, LT"
       long_date_with_year_without_time: "D MMM, 'YY"
@@ -153,6 +152,7 @@ pt_BR:
       banner:
         enabled: "tornou isto um banner %{when}. Isto será mostrado no topo de todas as páginas até que seja descartado pelo usuário."
         disabled: "removeu este banner %{when}. Ele não vai mais aparecer no topo de todas as páginas."
+      forwarded: "encaminhado o e-mail acima"
     topic_admin_menu: "ações de tópico"
     wizard_required: "Bem vindo ao seu novo Discourse! Vamos começar com o <a href='%{url}' data-auto-route='true'>assistente de configuração</a> ✨"
     emails_are_disabled: "Todo o envio de e-mail foi globalmente desabilitado por um administrador. Nenhum e-mail de notificações de qualquer tipo será enviado."
@@ -263,19 +263,22 @@ pt_BR:
     bookmarks:
       created: "você marcou esta postagem como favorita"
       not_bookmarked: "marcar postagem como favorita"
-      created_with_reminder: "você marcou esta postagem como favorito com um lembrete em %{date}"
+      created_with_at_desktop_reminder: "você marcou esta postagem como favorita e será lembrado na próxima vez em que estiver em sua área de trabalho"
       remove: "Remover Favorito"
       confirm_clear: "Você tem certeza de que deseja apagar todos os seus favoritos deste tópico?"
       save: "Salvar"
       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ê forneceu são inválidas, por favor tente novamente."
+      list_permission_denied: "Você não tem permissão para visualizar os favoritos deste usuário."
       reminders:
         at_desktop: "Da próxima vez que estiver na minha área de trabalho"
-        later_today: "Hoje mais tarde"
-        next_business_day: "Próximo dia comercial"
+        later_today: "Mais tarde hoje"
         tomorrow: "Amanhã"
         next_week: "Próxima semana"
+        later_this_week: "Mais tarde nesta semana"
         next_month: "Próximo mês"
         custom: "Data e hora personalizadas"
+        none: "Nenhum lembrete necessário"
     drafts:
       resume: "Resumir"
       remove: "Remova"
@@ -386,6 +389,7 @@ pt_BR:
       deleted_user: "(usuário excluído)"
       user:
         bio: "Bio"
+        website: "Website"
         username: "Nome de Usuário"
         email: "E-mail"
         name: "Nome"
@@ -537,6 +541,7 @@ pt_BR:
         deny: "Negar"
         denied: "negado"
         undone: "solicitação desfeita"
+        handle: "tratar pedido de associação"
       manage:
         title: "Gerenciar"
         name: "Nome"
@@ -577,6 +582,8 @@ pt_BR:
       leave: "Sair"
       request: "Solicitar"
       message: "Mensagem"
+      confirm_leave: "Tem certeza de que deseja sair desse grupo?"
+      allow_membership_requests: "Permitir que usuários enviem pedidos de adesão a donos do grupo (Requer grupo visível ao público)"
       membership_request_template: "Modelo personalizado para exibir aos usuários ao enviar uma solicitação de associação"
       membership_request:
         submit: "Enviar Solicitação"
@@ -862,6 +869,7 @@ pt_BR:
         deleted_posts: "postagens excluídas"
         suspensions: "suspensões"
         warnings_received: "avisos"
+        rejected_posts: "postagens rejeitadas"
       messages:
         all: "Todas"
         inbox: "Caixa de entrada"
@@ -937,6 +945,7 @@ pt_BR:
           title: "Autenticadores Baseados em Token"
           add: "Novo Autenticador"
           default_name: "Meu Autenticador"
+          name_and_code_required_error: "Você deve fornecer um nome e o código do seu aplicativo de autenticação."
         security_key:
           register: "Registro"
           title: "Chaves de Segurança"
@@ -947,6 +956,7 @@ pt_BR:
           edit: "Editar Chave de Segurança"
           edit_description: "Nome da Chave de Segurança"
           delete: "Excluir"
+          name_required_error: "Você deve fornecer um nome para sua chave de segurança."
       change_about:
         title: "Modificar Sobre Mim"
         error: "Houve um erro ao alterar este valor."
@@ -963,10 +973,6 @@ pt_BR:
         success_staff: "Enviamos um e-mail para o seu endereço atual. Por favor, siga as instruções de confirmação."
       change_avatar:
         title: "Alterar sua imagem de perfil"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baseado em"
-        gravatar_title: "Alterar seu avatar no site do Gravatar"
-        gravatar_failed: "Não conseguimos encontrar um Gravatar com este endereço de e-mail."
-        refresh_gravatar_title: "Atualizar seu Gravatar"
         letter_based: "Imagem de perfil atribuída pelo sistema"
         uploaded_avatar: "Imagem personalizada"
         uploaded_avatar_empty: "Adicionar uma imagem personalizada"
@@ -1029,6 +1035,8 @@ pt_BR:
         any: "qualquer"
       password_confirmation:
         title: "Senha Novamente"
+      invite_code:
+        title: "Código de convite"
       auth_tokens:
         title: "Dispositivos Usados Recentemente"
         ip: "IP"
@@ -1249,6 +1257,8 @@ pt_BR:
         back: "Voltar"
         again: "Tentar Novamente"
         fixed: "Carregar Página"
+    modal:
+      close: "fechar"
     close: "Fechar"
     assets_changed_confirm: "Este site acabou de ser atualizado. Atualizar a página agora para ver a última versão?"
     logout: "Você foi desconectado."
@@ -1475,7 +1485,6 @@ pt_BR:
       objects: Objetos
       symbols: Símbolos
       flags: Sinalizações
-      custom: Emojis personalizados
       recent: Usados recentemente
       default_tone: Sem tom de pele
       light_tone: Tom de pele claro
@@ -1483,6 +1492,7 @@ pt_BR:
       medium_tone: Tom de pele médio
       medium_dark_tone: Tom de pele médio escuro
       dark_tone: Tom de pele escuro
+      default: Emojis personalizados
     shared_drafts:
       title: "Rascunhos Compartilhados"
       notice: "Este tópico só é visível para aqueles que podem ver a categoria <b>{{category}}</b>."
@@ -1630,6 +1640,7 @@ pt_BR:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -2406,9 +2417,8 @@ pt_BR:
             button: "HTML"
       bookmarks:
         create: "Criar marcador"
+        created: "Criado"
         name: "Nome"
-        name_placeholder: "Nomeie o marcador para ajudar a melhorar sua memória"
-        set_reminder: "Definir um lembrete"
     category:
       can: "pode&hellip; "
       none: "(sem categoria)"
@@ -3831,7 +3841,6 @@ pt_BR:
           staff: "Equipe"
           suspended: "Suspenso"
           silenced: "Silenciado"
-          suspect: "Suspeito"
           staged: "Encenado"
         approved: "Aprovado?"
         titles:
@@ -3848,7 +3857,6 @@ pt_BR:
           moderators: "Moderadores"
           silenced: "Usuários Silenciados"
           suspended: "Usuários Suspensos"
-          suspect: "Usuários suspeitos"
           staged: "Usuários em etapas"
         not_verified: "Não verificado"
         check_email:
@@ -4199,6 +4207,7 @@ pt_BR:
         help: "Adicionar novo emoji que estará disponível para todos. (DICA: arraste & solte diversos arquivos de uma vez)"
         add: "Adicionar Novo Emoji"
         name: "Nome"
+        group: "Grupo"
         image: "Imagem"
         delete_confirm: "Tem certeza que deseja excluir o emoji :%{name}: ?"
       embedding:
@@ -4225,7 +4234,6 @@ pt_BR:
         save: "Salvar Configurações de Incorporação"
       permalink:
         title: "Links permanentes"
-        description: "Por favor note que isto só se aplica a fontes externas, links postados no seu fórum não serão redirecionados."
         url: "URL"
         topic_id: "ID do Tópico"
         topic_title: "Tópico"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index b5352de22d..7bc7fb4b44 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -29,7 +29,6 @@ ro:
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "DD MMM, HH:mm"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM "
       long_with_year: "DD MMM YYYY HH:mm"
@@ -260,6 +259,12 @@ ro:
       created: "Ai pus semn de carte pe acest mesaj"
       remove: "Șterge semn de carte"
       save: "Salvează"
+      reminders:
+        later_today: "Mai târziu azi"
+        tomorrow: "Mâine"
+        next_week: "Săptămâna viitoare"
+        later_this_week: "Mai târziu săptămâna asta"
+        next_month: "Luna viitoare"
     drafts:
       resume: "Reluați"
       remove: "Eliminați"
@@ -734,9 +739,6 @@ ro:
         success_staff: "Ți-am trimis un email la adresa curentă. Urmează instrucțiunile de confirmare."
       change_avatar:
         title: "Schimbă poza de profil"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, bazat pe"
-        gravatar_title: "Schimbă-ți avatarul de pe site-ul Gravatar."
-        refresh_gravatar_title: "Reactualizează Gravatarul"
         letter_based: "Poză de profil atribuită de sistem."
         uploaded_avatar: "Poză preferată"
         uploaded_avatar_empty: "Adaugă poza preferată"
@@ -979,6 +981,8 @@ ro:
         back: "Înapoi"
         again: "Încearcă din nou"
         fixed: "Încărcare pagină"
+    modal:
+      close: "Închide"
     close: "Închide"
     assets_changed_confirm: "Acest site tocmai a fost actualizat. Reîmprospătați pentru cea mai nouă versiune?"
     logout: "Aţi fost deconectat."
@@ -1141,8 +1145,8 @@ ro:
       filter_placeholder: Caută emoji
       objects: Obiecte
       flags: Marcaje de avertizare
-      custom: Emojii personalizate
       recent: Folosite recent
+      default: Emojii personalizate
     shared_drafts:
       notice: "Această discuție este vizibilă doar pentru cei care pot accesa categoria <b>{{category}}</b>."
       publishing: "Se postează discuția ..."
@@ -1256,6 +1260,7 @@ ro:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -1906,6 +1911,7 @@ ro:
             title: "Arată partea HTML a emailului"
             button: "HTML"
       bookmarks:
+        created: "Creat"
         name: "Nume"
     category:
       can: "can&hellip; "
@@ -2956,7 +2962,6 @@ ro:
           active: "Activi"
           staff: "Membrii echipei"
           suspended: "Suspendați"
-          suspect: "Suspecți"
           staged: "Pus în scenă"
         approved: "Aprobați?"
         titles:
@@ -2972,7 +2977,6 @@ ro:
           admins: "Administratori"
           moderators: "Moderatori"
           suspended: "Utilizatori suspendați"
-          suspect: "Utilizatori suspecţi"
         not_verified: "Neverificat"
         check_email:
           title: "Arată adresa de email a acestui utilizator"
@@ -3277,6 +3281,7 @@ ro:
         help: "Adaugă un nou \"emoji\" care va fi disponibil pentru toţi. (PROTIP: trage şi adaugă mai multe fişiere odată)"
         add: "Adaugă un emoji nou"
         name: "Nume"
+        group: "Grup"
         image: "Imagine"
         delete_confirm: "Ești sigur că vrei să ștergi emoji-ul :%{name}:?"
       embedding:
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index de1b818d13..26af4e1697 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -198,7 +198,7 @@ ru:
         enabled: "Создал баннер %{when}. Он будет отображаться вверху каждой страницы пока пользователь не закроет его."
         disabled: "Удалил баннер %{when}. Он больше не будет отображаться в верхней части каждой страницы."
       forwarded: "переадресовал вышеуказанное письмо"
-    topic_admin_menu: "действия по теме"
+    topic_admin_menu: "Действия администратора над темой"
     wizard_required: "Добро пожаловать в ваш новый Discourse! Начните с <a href='%{url}' data-auto-route='true'>мастера настройки</a> ✨"
     emails_are_disabled: "Все исходящие письма были глобально отключены администратором. Уведомления любого вида не будут отправляться на почту."
     bootstrap_mode_enabled: "Чтобы облегчить развитие вашего нового сайта в самом начале, был включен режим запуска. В этом режиме, всем новым пользователям будет автоматически присвоен 1-й уровень доверия при регистрации и включена ежедневная почтовая рассылка сводки новостей. Режим запуска будет выключен автоматически, как только количество зарегистрированных пользователей достигнет %{min_users}."
@@ -250,7 +250,7 @@ ru:
       few: "ссылки"
       many: "ссылок"
       other: "ссылок"
-    faq: "Вопрос-ответ"
+    faq: "Правила"
     guidelines: "Руководство"
     privacy_policy: "Политика конфиденциальности"
     privacy: "Политика конфиденциальности"
@@ -287,7 +287,7 @@ ru:
       pm_title: "Похожие сообщения"
     about:
       simple_title: "Информация"
-      title: "Информация про %{title}"
+      title: "Информация о %{title}"
       stats: "Статистика сайта"
       our_admins: "Наши администраторы"
       our_moderators: "Наши модераторы"
@@ -299,7 +299,7 @@ ru:
       like_count: "Симпатии"
       topic_count: "Темы"
       post_count: "Сообщения"
-      user_count: "Пользователей"
+      user_count: "Пользователи"
       active_user_count: "Активные пользователи"
       contact: "Контакты"
       contact_info: "В случае возникновения критической ошибки или срочного дела, касающегося этого сайта, свяжитесь с нами по адресу %{contact_info}."
@@ -309,22 +309,34 @@ ru:
       help:
         bookmark: "Добавить в закладки первое сообщение этой темы"
         unbookmark: "Удалить все закладки в этой теме"
+        unbookmark_with_reminder: "Нажмите для удаления всех закладок и напоминаний в этой теме. У вас уже есть напоминание для этой темы, настроенное на %{reminder_at}."
     bookmarks:
       created: "Вы добавили это сообщение в закладки"
       not_bookmarked: "Добавить сообщение в закладки"
-      created_with_reminder: "вы добавили это сообщение в закладки с последующим напоминанием %{date}"
+      created_with_reminder: "Вы добавили это сообщение в закладки с последующим напоминанием %{date}"
+      created_with_at_desktop_reminder: "Вы добавили это сообщение в закладки с последующим напоминанием, когда вы откроете это сообщение на настольном компьютере"
       remove: "Удалить закладку"
       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: "У вас недостаточно прав для просмотра закладок этого пользователя."
       reminders:
-        at_desktop: "При следующем посещении форума"
-        later_today: "На сегодня, но чуть позже"
+        at_desktop: "При следующем посещении форума через настольный компьютер"
+        later_today: "Сегодня, но позже"
         next_business_day: "На следующий рабочий день"
-        tomorrow: "На завтра"
-        next_week: "На следующую неделю"
-        next_month: "На следующий месяц"
+        tomorrow: "Завтра"
+        next_week: "На следующей неделе"
+        later_this_week: "Позже на этой неделе"
+        start_of_next_business_week: "В следующий понедельник"
+        next_month: "В следующем месяце"
         custom: "Установить дату и время напоминания"
+        last_custom: "Использовать ранее установленную дату и время"
+        none: "Не настраивать напоминание"
+        today_with_time: "сегодня в %{time}"
+        tomorrow_with_time: "завтра в %{time}"
+        at_time: "в %{date_time}"
+        existing_reminder: "Для этой закладки уже настроено напоминание, которое будет отправлено"
     drafts:
       resume: "Продолжить"
       remove: "Удалить"
@@ -388,7 +400,7 @@ ru:
       order_by: "Сортировать по"
       in_reply_to: "в ответе"
       explain:
-        why: "объяснить, почему этот элемент оказался в очереди"
+        why: "Объяснить, почему этот элемент оказался в очереди"
         title: "Обзорная оценка"
         formula: "Формула"
         subtotal: "Промежуточный итог"
@@ -426,14 +438,14 @@ ru:
           title: "Обзорные приоритеты"
       moderation_history: "История модерации"
       view_all: "Посмотреть все"
-      grouped_by_topic: "Сгруппированные по темам"
+      grouped_by_topic: "Группировать по темам"
       none: "Нет элементов для премодерации."
       view_pending: "просмотр в ожидании"
       topic_has_pending:
         one: "В этой теме <b>%{count}</b> сообщение ожидает проверки"
-        few: "В этой теме <b>{{count}}</b> сообщения ожидает проверки"
-        many: "В этой теме <b>{{count}}</b> сообщений ожидает проверки"
-        other: "В этой теме <b>{{count}}</b> сообщений ожидает проверки"
+        few: "В этой теме <b>{{count}}</b> сообщения ожидают проверки"
+        many: "В этой теме <b>{{count}}</b> сообщений ожидают проверки"
+        other: "В этой теме <b>{{count}}</b> сообщений ожидают проверки"
       title: "Премодерация"
       topic: "Тема:"
       filtered_topic: "Вы отфильтровали для просмотра содержимое в одной теме."
@@ -443,7 +455,7 @@ ru:
       deleted_user: "(пользователь удален)"
       user:
         bio: "О себе"
-        website: "Вебсайт"
+        website: "Веб-сайт"
         username: "Псевдоним"
         email: "Email"
         name: "Имя"
@@ -500,10 +512,10 @@ ru:
         status: "Статус"
         category: "Раздел"
         orders:
-          priority: "Приоритет"
-          priority_asc: "Приоритет (обратный)"
-          created_at: "Создан в"
-          created_at_asc: "Созданные в (обратный)"
+          priority: "Приоритету"
+          priority_asc: "Приоритету (обратная сортировка)"
+          created_at: "Дате создания"
+          created_at_asc: "Дате создания (обратная сортировка)"
         priority:
           title: "Минимальный приоритет:"
           low: "(любой)"
@@ -523,21 +535,21 @@ ru:
         pending:
           title: "В ожидании"
         approved:
-          title: "Одобренный"
+          title: "Одобренные"
         rejected:
-          title: "Отклонено"
+          title: "Отклонённые"
         ignored:
-          title: "Игнорируемый"
+          title: "Проигнорированные"
         deleted:
-          title: "Удалено"
+          title: "Удалённые"
         reviewed:
-          title: "(все рассмотрено)"
+          title: "(все рассмотренные)"
         all:
-          title: "(всё)"
+          title: "(все)"
       types:
         reviewable_flagged_post:
           title: "Сообщение отмечено как ЖАЛОБА"
-          flagged_by: "Отмечено"
+          flagged_by: "Кем отмечено"
         reviewable_queued_topic:
           title: "Тема в очереди"
         reviewable_queued_post:
@@ -582,8 +594,9 @@ ru:
       no_results: "Ничего не найдено."
       days_visited: "Посещений"
       days_visited_long: "Дней посещения"
-      posts_read: "Прочитано сообщений"
+      posts_read: "Прочитано"
       posts_read_long: "Прочитано сообщений"
+      last_updated: "Последнее обновление"
       total_rows:
         one: "%{count} пользователь"
         few: "%{count} пользователя"
@@ -611,6 +624,7 @@ ru:
         deny: "Отрицать"
         denied: "отказано"
         undone: "запрос отменен"
+        handle: "обрабатывать запрос на вступление"
       manage:
         title: "Управление"
         name: "Имя"
@@ -743,7 +757,7 @@ ru:
       flair_preview_image: "Изображение предпросмотра"
     user_action_groups:
       "1": "Мои симпатии"
-      "2": "Получил симпатий"
+      "2": "Симпатии"
       "3": "Закладки"
       "4": "Темы"
       "5": "Сообщения"
@@ -846,6 +860,7 @@ ru:
         clear:
           title: "Очистить"
           warning: "Перестать считать эту тему избранной?"
+      use_current_timezone: "Использовать автоопределение часового пояса."
       profile_hidden: "Публичный профиль пользователя скрыт"
       expand_profile: "Развернуть"
       collapse_profile: "Свернуть"
@@ -946,6 +961,7 @@ ru:
         deleted_posts: "удалённые сообщения"
         suspensions: "приостановки"
         warnings_received: "предупреждения"
+        rejected_posts: "отклонённые сообщения"
       messages:
         all: "Все"
         inbox: "Входящие"
@@ -972,6 +988,7 @@ ru:
         success: "(письмо отправлено)"
         in_progress: "(отправка письма)"
         error: "(ошибка)"
+        emoji: "lock emoji"
         action: "Отправить письмо для сброса пароля"
         set_password: "Установить пароль"
         choose_new: "Выберите новый пароль"
@@ -1018,9 +1035,10 @@ ru:
         edit_description: "Имя второго фактора"
         enable_security_key_description: "Когда вы подготовите свой физический ключ безопасности, нажмите кнопку <b>Регистрация</b> ниже."
         totp:
-          title: "Token-Based аутентификация"
+          title: "Токен-аутентификация"
           add: "Новый аутентификатор"
           default_name: "Мой аутентификатор"
+          name_and_code_required_error: "Вы должны указать токен и его имя"
         security_key:
           register: "Зарегистрироваться"
           title: "Ключи безопасности"
@@ -1031,6 +1049,7 @@ ru:
           edit: "Изменить ключ безопасности"
           edit_description: "Имя ключа безопасности"
           delete: "Удалить"
+          name_required_error: "Вы должны указать имя ключа безопасности"
       change_about:
         title: "Изменить информацию обо мне"
         error: "При изменении значения произошла ошибка."
@@ -1046,22 +1065,22 @@ ru:
         success: "На указанную почту отправлено письмо с инструкциями."
         success_staff: "Мы отправили письмо на ваш текущий адрес электронной почты. Пожалуйста, следуйте инструкциям по подтверждению."
       change_avatar:
-        title: "Изменить фон профиля"
-        gravatar: "На основе <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>"
-        gravatar_title: "Измените свой аватар на сайте Gravatar"
-        gravatar_failed: "Мы не смогли найти Gravatar с этим адресом электронной почты."
-        refresh_gravatar_title: "Обновить ваш Gravatar"
-        letter_based: "Фон профиля по умолчанию"
+        title: "Изменить аватар"
+        gravatar: "На основе <a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>"
+        gravatar_title: "Изменить аватар на граватар {{gravatarName}}"
+        gravatar_failed: "Мы не можем найти граватар {{gravatarName}} по указанному адресу электронной почты."
+        refresh_gravatar_title: "Обновить граватар {{gravatarName}}"
+        letter_based: "Аватар по умолчанию"
         uploaded_avatar: "Собственный аватар"
         uploaded_avatar_empty: "Добавить собственный аватар"
         upload_title: "Загрузка собственного аватара"
         image_is_not_a_square: "Внимание: мы обрезали ваше изображение; ширина и высота не равны друг другу."
       change_profile_background:
         title: "Шапка профиля"
-        instructions: "Шапка профиля будут отцентрирована и по-умолчанию имеют ширину 1110 пикселей."
+        instructions: "Шапка профиля будет отцентрирована и по умолчанию имеет ширину 1110 пикселей."
       change_card_background:
         title: "Фон карточки пользователя"
-        instructions: "Картинки фона будут отцентрированы и по-умолчанию имеют ширину 590 пикселей."
+        instructions: "Картинка фона будет отцентрирована и по умолчанию имеет ширину 590 пикселей."
       change_featured_topic:
         title: "Избранная тема"
         instructions: "Ссылка на эту тему будет отображаться в карточке пользователя и в вашем профиле."
@@ -1115,6 +1134,9 @@ ru:
         any: "любой"
       password_confirmation:
         title: "Пароль ещё раз"
+      invite_code:
+        title: "Код приглашения"
+        instructions: "Для регистрации учётной записи требуется код приглашения"
       auth_tokens:
         title: "Недавно использованные устройства"
         ip: "IP"
@@ -1296,23 +1318,23 @@ ru:
           many: "закладок"
           other: "закладок"
         top_replies: "Лучшие сообщения"
-        no_replies: "Пока не написал ни одного сообщения."
+        no_replies: "Пока не написано ни одного сообщения."
         more_replies: "... другие сообщения"
         top_topics: "Лучшие темы"
-        no_topics: "Пока не создал ни одной темы."
+        no_topics: "Пока не создано ни одной темы."
         more_topics: "... другие темы"
         top_badges: "Самые престижные награды"
-        no_badges: "Еще не получил ни одной награды."
+        no_badges: "Еще не получено ни одной награды."
         more_badges: "... другие награды"
         top_links: "Лучшие ссылки"
         no_links: "Пока нет ссылок."
         most_liked_by: "Поклонники"
         most_liked_users: "Фавориты"
         most_replied_to_users: "Самые активные собеседники"
-        no_likes: "Пока ни одной симпатии."
+        no_likes: "Пока нет симпатий."
         top_categories: "Лучшие разделы"
-        topics: "Темы"
-        replies: "Отвечает"
+        topics: "Тем"
+        replies: "Ответов"
       ip_address:
         title: "Последний IP-адрес"
       registration_ip_address:
@@ -1353,6 +1375,9 @@ ru:
         back: "Вернуться"
         again: "Попытаться ещё раз"
         fixed: "Загрузить страницу"
+    modal:
+      close: "закрыть"
+      dismiss_error: "Отклонить ошибку"
     close: "Закрыть"
     assets_changed_confirm: "Сайт только что был обновлён. Перезагрузить страницу для перехода к новой версии?"
     logout: "Вы вышли."
@@ -1449,6 +1474,7 @@ ru:
     email_login:
       link_label: "Напишите мне ссылку для входа "
       button_label: "E-mail"
+      emoji: "lock emoji"
       complete_username: "Если учетная запись совпадает с именем пользователя <b>%{username}</b>, вы должны получить электронное письмо со ссылкой для входа в систему в ближайшее время."
       complete_email: "Если данные аккаунта совпадают с <b>%{email}</b>, вы должны получить электронное письмо со ссылкой для входа в систему в ближайшее время."
       complete_username_found: "Мы нашли учетную запись, которая соответствует имени пользователя <b>%{username}</b>, в ближайшее время вы получите электронное письмо со ссылкой для входа."
@@ -1526,6 +1552,7 @@ ru:
         backup_code: "Вместо этого используйте резервный код"
     invites:
       accept_title: "Приглашение"
+      emoji: "envelope emoji"
       welcome_to: "Добро пожаловать на %{site_name}!"
       invited_by: "Вы были приглашены:"
       social_login_available: "Вы также сможете входить через социальные сети, используя этот адрес электронной почты."
@@ -1591,17 +1618,17 @@ ru:
       food_&_drink: Еда и напитки
       travel_&_places: Путешествия и места
       activities: Деятельность
-      objects: Objects
+      objects: Объекты
       symbols: Атрибутика
       flags: Флаги
-      custom: Пользовательские смайлы
       recent: Недавно использованные
-      default_tone: Нет скина
+      default_tone: Скин без тона
       light_tone: Светлый тон скина
-      medium_light_tone: Средний светлый тон скина
+      medium_light_tone: Средне-светлый тон скина
       medium_tone: Средний тон скина
-      medium_dark_tone: Средний темный тон скина
+      medium_dark_tone: Средне-темный тон скина
       dark_tone: Темный оттенок скина
+      default: Пользовательские смайлы
     shared_drafts:
       title: "Общие черновики"
       notice: "Эти темы видны только тем, кому доступен раздел <b>{{category}}</b>."
@@ -1749,6 +1776,11 @@ ru:
           few: "{{count}} непрочитанных сообщения"
           many: "{{count}} непрочитанных сообщений"
           other: "{{count}} непрочитанных сообщений"
+        high_priority:
+          one: "%{count} непрочитанное уведомление с высоким приоритетом"
+          few: "%{count} непрочитанных уведомления с высоким приоритетом"
+          many: "%{count} непрочитанных уведомлений с высоким приоритетом"
+          other: "%{count} непрочитанных уведомлений с высоким приоритетом"
       title: "уведомления об упоминании вашего @псевдонима, ответах на ваши сообщения и темы, сообщения и т.д."
       none: "Уведомления не могут быть загружены."
       empty: "Уведомления не найдены."
@@ -1757,6 +1789,7 @@ ru:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -1769,7 +1802,7 @@ ru:
         other: "<span>{{username}}, {{username2}} и {{count}} других</span> {{description}}"
       liked_consolidated_description:
         one: "Понравилось {{count}} ваше сообщение"
-        few: "Понравилось {{count}} ваших сообщений"
+        few: "Понравилось {{count}} ваших сообщения"
         many: "Понравилось {{count}} ваших сообщений"
         other: "Понравилось {{count}} ваших сообщений"
       liked_consolidated: "<span>{{username}}</span> {{description}}"
@@ -1813,6 +1846,8 @@ ru:
         posted: "Новое сообщение"
         moved_post: "Сообщение перемещено"
         linked: "связанный"
+        bookmark_reminder: "Напоминание о закладке"
+        bookmark_reminder_with_name: "Напоминание о закладке - %{name}"
         granted_badge: "награда получена"
         invited_to_topic: "приглашен в тему"
         group_mentioned: "упомянутая группа"
@@ -2039,10 +2074,10 @@ ru:
         many: "У вас {{count}} непрочитанных старых сообщений в этой теме"
         other: "У вас {{count}} непрочитанных старых сообщений в этой теме"
       new_posts:
-        one: "В этой теме {{count}} новое сообщение с её последнего просмотра вами"
-        few: "В этой теме {{count}} новых сообщения с её последнего просмотра вами"
-        many: "В этой теме {{count}} новых сообщений с её последнего просмотра вами"
-        other: "В этой теме {{count}} новых сообщений с её последнего просмотра вами"
+        one: "В этой теме {{count}} новое сообщение с вашего последнего просмотра"
+        few: "В этой теме {{count}} новых сообщения с вашего последнего просмотра"
+        many: "В этой теме {{count}} новых сообщений с вашего последнего просмотра"
+        other: "В этой теме {{count}} новых сообщений с вашего последнего просмотра"
       likes:
         one: "В теме {{count}} лайк"
         few: "В теме {{count}} лайка"
@@ -2058,9 +2093,10 @@ ru:
       group_join: "Вам нужно присоединиться к группе `{{name}}` чтобы увидеть эту тему."
       group_request_sent: "Ваш запрос на членство в группе был отправлен. Вам сообщат, когда  будет одобрено."
       unread_indicator: "Никто еще не дочитал до конца этой темы."
-      read_more_MF: "У вас осталось { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 непрочитанная</a> } few { <a href='{basePath}/unread'>1 непрочитанные</a> } other { <a href='{basePath}/unread'># непрочитанных</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'>1 новая</a> тема} other { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'># новых</a> тем} }, вы также можете {CATEGORY, select, true {посмотреть другие темы в разделе {catLink}} false {{latestLink}} other {}}"
+      read_more_MF: "У вас осталось { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 непрочитанная</a> } few { <a href='{basePath}/unread'># непрочитанные</a> } other { <a href='{basePath}/unread'># непрочитанных</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'>1 новая</a> тема} few { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'># новые</a> темы} 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: Просмотреть все разделы
-      view_latest_topics: посмотреть последние темы
+      view_latest_topics: посмотреть последние темы.
       suggest_create_topic: "Почему бы вам не создать новую тему?"
       jump_reply_up: Перейти к более ранним ответам
       jump_reply_down: Перейти к более поздним ответам
@@ -2069,6 +2105,7 @@ ru:
         title: "Таймер темы"
         save: "Установить таймер"
         num_of_hours: "Количество часов:"
+        num_of_days: "Количество дней:"
         remove: "Удалить таймер"
         publish_to: "Опубликовать в:"
         when: "Когда:"
@@ -2077,7 +2114,7 @@ ru:
         time_frame_required: "Пожалуйста, выберите временные рамки"
       auto_update_input:
         none: "Выбор таймфрейма"
-        later_today: "Позже сегодня"
+        later_today: "Сегодня, но позже"
         tomorrow: "Завтра"
         later_this_week: "Позже на этой неделе"
         this_weekend: "В эти выходные"
@@ -2111,6 +2148,8 @@ ru:
         title: "Автоматическое поднятие темы"
       reminder:
         title: "Напомнить мне"
+      auto_delete_replies:
+        title: "Автоматическое удаление ответов"
       status_update_notice:
         auto_open: "Эта тема автоматически откроется через %{timeLeft}."
         auto_close: "Эта тема автоматически закроется через %{timeLeft}."
@@ -2119,6 +2158,7 @@ ru:
         auto_delete: "Эта тема будет автоматически удалена через %{timeLeft}."
         auto_bump: "Эта тема будет автоматически поднята %{timeLeft}."
         auto_reminder: "Вам придёт напоминание об этой теме через %{timeLeft}."
+        auto_delete_replies: "Ответы в этой теме автоматически удаляются после %{duration}."
       auto_close_title: "Настройки закрытия темы"
       auto_close_immediate:
         one: "Последнее сообщение в этой теме отправлено %{count} час назад, поэтому данная тема будет закрыта незамедлительно."
@@ -2346,6 +2386,18 @@ ru:
         title: "Объединить выделенные сообщения"
         action: "Объединить выделенные сообщения"
         error: "Произошла ошибка во время объединения выделенных сообщений."
+      publish_page:
+        title: "Публикация страниц"
+        publish: "Публиковать"
+        description: "Когда тема публикуется в виде страницы, ее URL-адрес может быть предоставлен для общего доступа, и она будет отображаться с пользовательским стилем."
+        slug: "Slug"
+        publish_url: "Ваша страница была опубликована по адресу:"
+        topic_published: "Ваша тема была опубликована на:"
+        preview_url: "Ваша страница будет опубликована по адресу:"
+        invalid_slug: "Извините, вы не можете опубликовать эту страницу."
+        unpublish: "Отменить публикацию"
+        unpublished: "Публикация страницы была отменена и более недоступна по указанному ранее адресу."
+        publishing_settings: "Настройки публикации"
       change_owner:
         title: "Сменить владельца"
         action: "Изменить владельца"
@@ -2356,6 +2408,11 @@ ru:
           few: "Пожалуйста, выберите нового владельца для сообщений <b>@{{old_user}}</b>"
           many: "Пожалуйста, выберите нового владельца для сообщений <b>@{{old_user}}</b>"
           other: "Пожалуйста, выберите нового владельца {{count}} сообщений для <b>@{{old_user}}</b>"
+        instructions_without_old_user:
+          one: "Пожалуйста, выберите нового владельца сообщения"
+          few: "Пожалуйста, выберите нового владельца {{count}}сообщений"
+          many: "Пожалуйста, выберите нового владельца {{count}} сообщений"
+          other: "Пожалуйста, выберите нового владельца {{count}} сообщений"
       change_timestamp:
         title: "Изменить метку времени..."
         action: "Изменить метку времени"
@@ -2499,6 +2556,7 @@ ru:
         convert_to_moderator: "Добавить цвет модератора"
         revert_to_regular: "Убрать цвет модератора"
         rebake: "Обработать сообщение  - HTML"
+        publish_page: "Публикация страниц"
         unhide: "Снова сделать видимым"
         change_owner: "Изменить владельца"
         grant_badge: "Выдать награду"
@@ -2607,13 +2665,18 @@ ru:
             button: "HTML"
       bookmarks:
         create: "Создать закладку"
+        edit: "Изменить закладку"
+        created: "Создано"
         name: "Имя"
-        name_placeholder: "Присвойте имя закладке (необязательно)"
-        set_reminder: "Настроить напоминание (необязательно)"
+        name_placeholder: "Присвойте имя закладке (необязательно) "
+        set_reminder: "Настроить напоминание (необязательно) "
         actions:
           delete_bookmark:
             name: "Удалить закладку"
-            description: "Удаляет закладку из вашего профиля и останавливает все напоминания о закладке"
+            description: "Удаление закладки, включая все настроенные о ней напоминания."
+          edit_bookmark:
+            name: "Изменить закладку"
+            description: "Изменение названия закладки или даты/времени напоминания"
     category:
       can: "может&hellip; "
       none: "(вне раздела)"
@@ -3005,6 +3068,18 @@ ru:
         title: "Редактирование"
         return: "%{shortcut} Вернуться в редактор"
         fullscreen: "%{shortcut} Полноэкранный редактор"
+      bookmarks:
+        title: "Создание закладки"
+        enter: "%{shortcut} Сохранить и закрыть"
+        later_today: "%{shortcut} Сегодня, но позже"
+        later_this_week: "%{shortcut} Позже на этой неделе"
+        tomorrow: "%{shortcut} Завтра"
+        next_week: "%{shortcut} На следующей неделе"
+        next_month: "%{shortcut}В следующем месяце"
+        next_business_week: "%{shortcut} На следующей рабочей неделе"
+        next_business_day: "%{shortcut} На следующий рабочий день"
+        custom: "%{shortcut} Установить дату и время напоминания"
+        none: "%{shortcut} Не настраивать напоминание"
       actions:
         title: "Темы"
         bookmark_topic: "%{shortcut} Добавить / удалить из закладок"
@@ -3026,7 +3101,11 @@ ru:
         mark_watching: "%{shortcut} Наблюдать за темой"
         print: "%{shortcut} Печатать тему"
         defer: "%{shortcut} Отложить тему"
-        topic_admin_actions: "%{shortcut} Откройте раздел действия администратора"
+        topic_admin_actions: "%{shortcut} Открыть в теме меню действий администратора"
+      search_menu:
+        title: "Меню результатов поиска"
+        prev_next: "%{shortcut} Перемещение по результатам поиска"
+        insert_url: "%{shortcut} Вставить ссылку на найденное сообщение в окно открытого редактора"
     badges:
       earned_n_times:
         one: "Заработал эту награду %{count} раз"
@@ -3069,7 +3148,7 @@ ru:
           name: Публикации
     tagging:
       all_tags: "Все теги"
-      other_tags: "Изменить теги"
+      other_tags: "Другие теги"
       selector_all_tags: "Все теги"
       selector_no_tags: "Нет тегов"
       changed: "Теги изменены:"
@@ -3462,6 +3541,9 @@ ru:
         notification_event:
           name: "Событие уведомления"
           details: "При добавлении нового элемента в ленту уведомлений пользователя."
+        user_badge_event:
+          name: "Событие награждения"
+          details: "При получении пользователем награды."
         delivery_status:
           title: "Статус передачи"
           inactive: "Неактивна"
@@ -3615,6 +3697,7 @@ ru:
           theme_name: "Название темы"
           component_name: "Имя компонента"
           themes_intro: "Выберите существующую тему или установите новую, чтобы начать работу"
+          themes_intro_emoji: "woman artist emoji"
           beginners_guide_title: "Руководство для начинающих по использованию тем Discourse"
           developers_guide_title: "Руководство разработчика по темам Discourse"
           browse_themes: "Просмотр тем сообщества "
@@ -3843,6 +3926,7 @@ ru:
         format: "Формат"
         html: "html"
         text: "текст"
+        html_preview: "Предварительный просмотр содержимого"
         last_seen_user: "Последний раз был:"
         no_result: "Ничего не найдено для сводки новостей."
         reply_key: "Ключ ответа"
@@ -3997,6 +4081,8 @@ ru:
             api_key_update: "Обновление API-ключа"
             api_key_destroy: "Удаление API-ключа"
             override_upload_secure_status: "перезаписать защищенный статус загрузки"
+            page_published: "страница опубликована"
+            page_unpublished: "публикация страницы отменена"
         screened_emails:
           title: "Почтовые адреса"
           description: "Когда кто-то создаёт новую учётную запись, указанный пользователем почтовый адрес проверяется на соответствие с указанным ниже списком, и в случае совпадения регистрация блокируется или производятся другие дополнительные действия."
@@ -4102,7 +4188,6 @@ ru:
           staff: "Персонал"
           suspended: "Замороженные"
           silenced: "Заблокированные"
-          suspect: "Подозрительные"
           staged: "Сымитированные"
         approved: "Подтвердить?"
         titles:
@@ -4119,7 +4204,6 @@ ru:
           moderators: "Модераторы"
           silenced: "Заблокированные пользователи"
           suspended: "Замороженные пользователи"
-          suspect: "Подозрительные пользователи"
           staged: "Сымитированные пользователи"
         not_verified: "Непроверенные"
         check_email:
@@ -4256,6 +4340,7 @@ ru:
           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: "Уровень доверия заблокирован, система не может изменять уровень доверия пользователя"
@@ -4473,6 +4558,7 @@ ru:
             with_time: "<span class=\"username\">%{username}</span> в <span class=\"time\">%{time}</span>"
         badge_intro:
           title: "Выберите существующую награду или создайте новую, чтобы начать работу"
+          emoji: "woman student emoji"
           what_are_badges_title: "Что такое награды?"
           badge_query_examples_title: "Примеры запроса награды"
         mass_award:
@@ -4489,7 +4575,9 @@ ru:
         help: "Добавить новые смайлики-emoji, которые будут доступны всем. (Подсказка: можно перетаскивать несколько файлов за раз)"
         add: "Добавить новую иконку"
         name: "Название"
+        group: "Группа"
         image: "Изображение"
+        alt: "Предварительный просмотр пользовательских emoji"
         delete_confirm: "Вы действительно хотите удалить иконку :%{name}:?"
       embedding:
         get_started: "Для встраивания на другой сайт необходимо добавить соответствующий хост."
@@ -4509,13 +4597,14 @@ ru:
         embed_post_limit: "Максимальное количество вложенных сообщений"
         embed_title_scrubber: "Регулярное выражение, используемое для очистки заголовка сообщений"
         embed_truncate: "Обрезать встроенные сообщения."
+        embed_unlisted: "Импортированные темы будут отображаться в списке тем  только после добавления в них ответа."
         embed_whitelist_selector: "Селекторы CSS которые разрешены для использования."
         embed_blacklist_selector: "Селекторы CSS которые запрещены для использования."
         embed_classname_whitelist: "Разрешённые CSS-классы"
         save: "Сохранить настройки встраивания"
       permalink:
         title: "Постоянные ссылки"
-        description: "Обратите внимание, что это относится только к внешним источникам. Ссылки, размещенные на вашем форуме, не будут перенаправлены."
+        description: "Перенаправления, применяемые для URL, не известных форуму."
         url: "Ссылка URL"
         topic_id: "Номер темы"
         topic_title: "Тема"
@@ -4524,6 +4613,7 @@ ru:
         category_id: "Номер раздела"
         category_title: "Раздел"
         external_url: "Внешняя ссылка"
+        destination: "Назначения"
         delete_confirm: "Удалить эту постоянную ссылку?"
         form:
           label: "Новая постоянная ссылка:"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 581b512a14..fe8370261d 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -30,7 +30,6 @@ sk:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -288,6 +287,10 @@ sk:
       remove: "Odstrániť záložku"
       confirm_clear: "Ste si istý, že chcete odstrániť všetky záložky z tejto témy?"
       save: "Uložiť"
+      reminders:
+        tomorrow: "Zajtra"
+        next_week: "Budúci týždeň"
+        next_month: "Budúci mesiac"
     drafts:
       resume: "Pokračovať"
       remove: "Odstrániť"
@@ -792,10 +795,6 @@ sk:
         success_staff: "Na váš aktuálny email sme odoslali správu. Nasledujte prosím inštrukcie pre potvrdenie."
       change_avatar:
         title: "Zmeniť váš profilový obrázok"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, podľa"
-        gravatar_title: "Zmeňte váš avatar na webe Gravatar "
-        gravatar_failed: "Nemohli sme nájsť žiadny Gravatar s touto emailovou adresou."
-        refresh_gravatar_title: "Obnoviť váš Gravatar"
         letter_based: "Systém pridelil profilový obrázok"
         uploaded_avatar: "Vlastný obrázok"
         uploaded_avatar_empty: "Pridať vlastný obrázok"
@@ -1043,6 +1042,8 @@ sk:
         back: "Späť"
         again: "Skúsiť znova"
         fixed: "Načítať stránku"
+    modal:
+      close: "zatvoriť"
     close: "Zatvoriť"
     assets_changed_confirm: "Táto stránka bola práve aktualizovaná. Obnoviť na najnovšiu verziu?"
     logout: "Boli ste odhlásený."
@@ -1837,6 +1838,7 @@ sk:
           text_part:
             button: "Text"
       bookmarks:
+        created: "Vytvorené"
         name: "Meno"
     category:
       can: "môže &hellip; "
@@ -2762,7 +2764,6 @@ sk:
           active: "Aktívny"
           staff: "Zamestnanci"
           suspended: "Odobrate práva"
-          suspect: "Podozrivý"
           staged: "Dočasný"
         approved: "Schválený?"
         titles:
@@ -2778,7 +2779,6 @@ sk:
           admins: "Admin používatelia"
           moderators: "Moderátori"
           suspended: "Užívatelia s odobratými právami"
-          suspect: "Podozriví užívatelia"
         not_verified: "Neoverený"
         check_email:
           title: "Odhaliť emailovú adresu tohto používateľa"
@@ -3056,6 +3056,7 @@ sk:
         help: "Pridaj nové emoji, ktoré bude dostupné pre všetkých (TIP: môžete pretiahnuť viac súborov naraz)"
         add: "Pridaj nové Emoji"
         name: "Meno"
+        group: "Skupina"
         image: "Obrázok"
         delete_confirm: "Ste si istý, že chcete zmazať: %{name}: emoji?"
       embedding:
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 1cb2bae4eb..ce28cb3268 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -30,7 +30,6 @@ sl:
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D. MMM, H:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D. MMMM"
       long_with_year: "D. MMM YYYY H:mm"
@@ -310,6 +309,12 @@ sl:
       remove: "Odstrani zaznamek"
       confirm_clear: "Ste prepričani, da želite odstraniti vse svoje zaznamke iz te teme?"
       save: "Shrani"
+      reminders:
+        later_today: "Kasneje v dnevu"
+        tomorrow: "Jutri"
+        next_week: "Naslednji teden"
+        later_this_week: "Kasneje v tednu"
+        next_month: "Naslednji mesec"
     drafts:
       resume: "Nadaljuj"
       remove: "Odstrani"
@@ -931,10 +936,6 @@ sl:
         success_staff: "Poslali smo e-sporočilo na vaš trenutni naslov. Sledite navodilom za potrditev."
       change_avatar:
         title: "Menjaj profilno sliko"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a> od"
-        gravatar_title: "Spremeni svoj avatar na Gravatar strani"
-        gravatar_failed: "Nismo našli Gravatar s tem e-naslovom."
-        refresh_gravatar_title: "Osveži svoj Gravatar"
         letter_based: "Sistemsko privzeta profilna slika"
         uploaded_avatar: "Slika po meri"
         uploaded_avatar_empty: "Dodaj sliko po meri"
@@ -1230,6 +1231,8 @@ sl:
         back: "Nazaj"
         again: "Poskusi ponovno"
         fixed: "Naloži stran"
+    modal:
+      close: "zapri"
     close: "Zapri"
     assets_changed_confirm: "Stran ji bala pravkar posodobljena. Osvežimo takoj za zadnjo verzijo?"
     logout: "Bili ste odjavljeni."
@@ -1445,7 +1448,6 @@ sl:
       objects: Stvari
       symbols: Simboli
       flags: Zastave
-      custom: Po meri emoji
       recent: Nedavno uporabljeni
       default_tone: Brez barve kože
       light_tone: Svetla barva kože
@@ -1453,6 +1455,7 @@ sl:
       medium_tone: Srednja barva kože
       medium_dark_tone: Srednje temna barva kože
       dark_tone: Temna barva kože
+      default: Po meri emoji
     shared_drafts:
       title: "Skupni osnutki"
       notice: "Ta tema je vidna samo tistim, ki lahko vidijo kategorijo <b>{{category}}</b>."
@@ -1605,6 +1608,7 @@ sl:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -2424,6 +2428,7 @@ sl:
             title: "Prikaži HTML obliko e-sporočila"
             button: "HTML"
       bookmarks:
+        created: "Ustvarjeno"
         name: "Polno ime"
     category:
       can: "lahko&hellip; "
@@ -3470,7 +3475,6 @@ sl:
           staff: "Osebje"
           suspended: "Suspendirani"
           silenced: "Utišani"
-          suspect: "Sumljivi"
           staged: "Prirejeni"
         approved: "Potrjen?"
         titles:
@@ -3486,7 +3490,6 @@ sl:
           moderators: "Moderatorji"
           silenced: "Utišani uporabniki"
           suspended: "Suspendirani uporabniki"
-          suspect: "Sumljivi uporabniki"
           staged: "Prirejeni uporabniki"
         check_email:
           text: "Prikaži"
@@ -3784,6 +3787,7 @@ sl:
         help: "Dodaj nov emoji, ki bo na voljo vsem. (lahko prestavite in spustite več datotek naenkrat)"
         add: "Dodaj nov emoji"
         name: "Ime"
+        group: "Skupina"
         image: "Slika"
         delete_confirm: "Ali ste prepričani, da hočete izbrisati emoji :%{name}:?"
       embedding:
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 2d814f9718..9c1adc9143 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -28,7 +28,6 @@ sq:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -592,9 +591,6 @@ sq:
         success_staff: "Ju dërguam një email tek adresa që shkruajtët. Ju ftojmë të ndiqni udhëzimet e konfirmimit."
       change_avatar:
         title: "Ndrysho fotografinë e profilit"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, bazur në"
-        gravatar_title: "Ndryshoni avatarin tuaj në faqen web të shërbimit Gravatar"
-        refresh_gravatar_title: "Rifreskoni Gravatarin tuaj"
         letter_based: "Foto e profilit e caktuar nga sistemi"
         uploaded_avatar: "Foto e personalizuar"
         uploaded_avatar_empty: "Shto një foto të personalizuar"
@@ -813,6 +809,8 @@ sq:
         back: "Kthehu mbrapa"
         again: "Provo përsëri"
         fixed: "Ngarko faqen"
+    modal:
+      close: "mbylle"
     close: "Mbyll"
     assets_changed_confirm: "Faqja u azhornua. Doni t'a rifreskoni tani për versionin e fundit?"
     logout: "Ju jeni shkëputur!"
@@ -1522,6 +1520,7 @@ sq:
           html_part:
             button: "HTML"
       bookmarks:
+        created: "Krijuar"
         name: "Emri"
     category:
       can: "mund&hellip; "
@@ -2382,7 +2381,6 @@ sq:
           active: "Aktiv"
           staff: "Stafi"
           suspended: "Të pezulluar"
-          suspect: "Të dyshimtë"
         approved: "Aprovuar?"
         titles:
           active: "Përdorues Aktivë"
@@ -2397,7 +2395,6 @@ sq:
           admins: "Administratorë"
           moderators: "Moderatorë"
           suspended: "Përdorues të Pezulluar"
-          suspect: "Përdorues të Dyshimtë"
         not_verified: "I pa verifikuar"
         check_email:
           title: "Shfaq adresën email të këtij përdoruesi."
@@ -2674,6 +2671,7 @@ sq:
         help: "Add new emoji that will be available to everyone. (PROTIP: drag & drop multiple files at once)"
         add: "Add New Emoji"
         name: "Emri"
+        group: "Grupi"
         image: "Imazh"
         delete_confirm: "Are you sure you want to delete the :%{name}: emoji?"
       embedding:
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index 20f594e376..e32a910f2b 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -29,7 +29,6 @@ sr:
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM YYYY HH:mm"
@@ -538,8 +537,6 @@ sr:
         success: "Poslali smo e-mail na tu adresu. Molimo vas sledite uputstva za potvrdu."
       change_avatar:
         title: "Promeni tvoju profilnu sliku"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baziran na"
-        refresh_gravatar_title: "Obnovi svoj Gravatar"
         letter_based: "Sistemski dodata profilna slika"
         uploaded_avatar: "Vaša slika"
         uploaded_avatar_empty: "Dodajte vašu sliku"
@@ -745,6 +742,8 @@ sr:
         back: "Idi nazad"
         again: "Pokušaj ponovno"
         fixed: "Učitaj stranicu"
+    modal:
+      close: "zatvori"
     close: "Zatvori"
     assets_changed_confirm: "Ova stranica je upravo ažurirana. Osveži sada za najnoviju verziju?"
     logout: "Odjavljeni ste."
@@ -1281,6 +1280,7 @@ sr:
           side_by_side_markdown:
             title: "Prikaži razlike u sirovom izvoru jednu nasuprot druge."
       bookmarks:
+        created: "Napravljeno"
         name: "Ime foruma"
     category:
       can: "može&hellip"
@@ -1949,7 +1949,6 @@ sr:
           active: "Aktivno"
           staff: "Osoblje"
           suspended: "Suspendovani"
-          suspect: "Sumnjivi"
         approved: "Potvrđenji?"
         titles:
           active: "Aktivni Korisnici"
@@ -1964,7 +1963,6 @@ sr:
           admins: "Administratori"
           moderators: "Moderatori"
           suspended: "Suspendovani Korisnici"
-          suspect: "Sumnjivi korisnici"
         not_verified: "Nije verifikovano"
         check_email:
           title: "Otkrij korisnikovu email adresu"
@@ -2211,6 +2209,7 @@ sr:
         help: "Dodajte nove Emoji-e koji će biti dostupni svima. (Savet: povuci i ispusti više datoteka odjednom)"
         add: "Dodaj Novi Emoji"
         name: "Ime"
+        group: "Grupa"
         image: "Slika"
         delete_confirm: "Jeste li sigurni da želite izbrisati :%{name}: emoji?"
       embedding:
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index d856489c4d..c0420ef694 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -29,7 +29,7 @@ sv:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM, YYYY h:mm a"
@@ -261,22 +261,34 @@ sv:
       help:
         bookmark: "Klicka för att bokmärka första inlägget i ämnet "
         unbookmark: "Klicka för att radera alla bokmärken i ämnet"
+        unbookmark_with_reminder: "Markera för att ta bort alla bokmärken samt påminnelser för detta ämne. Du har en påminnelse inställd till %{reminder_at} för detta ämne."
     bookmarks:
       created: "du har bokmärkt detta inlägg"
       not_bookmarked: "bokmärk detta inlägg"
-      created_with_reminder: "du har bokmärkt detta inlägg med en påminnelse vid %{date}"
+      created_with_reminder: "du har bokmärkt detta inlägg med en påminnelse %{date}"
+      created_with_at_desktop_reminder: "du har bokmärkt detta inlägg och kommer att påminnas nästa gång du är vid din dator"
       remove: "Ta bort bokmärke"
       confirm_clear: "Är du säker på att du vill radera alla dina bokmärken från ämnet?"
       save: "Spara"
       no_timezone: 'Du har ännu inte valt tidszon. Du kommer därför inte kunna sätta påminnelser. Ange en <a href="%{basePath}/my/preferences/profile">i din profil</a>.'
+      invalid_custom_datetime: "Datumet och tiden du har angivit är ogiltig, vänligen försök igen."
+      list_permission_denied: "Du har inte behörighet att visa bokmärken för denna användare."
       reminders:
         at_desktop: "Nästa gång är jag vid datorn"
         later_today: "Senare idag"
-        next_business_day: "Nästa arbetsdag"
+        next_business_day: "Nästa vardag"
         tomorrow: "Imorgon"
         next_week: "Nästa vecka"
+        later_this_week: "Senare denna vecka"
+        start_of_next_business_week: "Nästa måndag"
         next_month: "Nästa månad"
         custom: "Anpassa datum och tid"
+        last_custom: "Senaste"
+        none: "Ingen påminnelse nödvändig"
+        today_with_time: "idag vid %{time}"
+        tomorrow_with_time: "imorgon vid %{time}"
+        at_time: "den %{date_time}"
+        existing_reminder: "Du har en påminnelse inställd för detta bokmärke vilken kommer skickas"
     drafts:
       resume: "Återuppta"
       remove: "Ta bort"
@@ -514,6 +526,7 @@ sv:
       days_visited_long: "Dagar Besökta"
       posts_read: "Läst"
       posts_read_long: "Lästa inlägg"
+      last_updated: "Senast uppdaterad:"
       total_rows:
         one: "%{count} användare"
         other: "%{count} användare"
@@ -539,6 +552,7 @@ sv:
         deny: "Neka"
         denied: "nekad"
         undone: "förfrågan återkallad"
+        handle: "hantera begäran om medlemskap"
       manage:
         title: "Hantera"
         name: "Namn"
@@ -766,6 +780,7 @@ sv:
         clear:
           title: "Rensa"
           warning: "Är du säker på att vill rensa ditt utvalda ämne?"
+      use_current_timezone: "Använd nuvarande tidszon"
       profile_hidden: "Denna användarens offentliga profil är dold."
       expand_profile: "Utvidga"
       collapse_profile: "Förminska"
@@ -865,6 +880,7 @@ sv:
         deleted_posts: "raderade inlägg"
         suspensions: "avstängningar"
         warnings_received: "varningar"
+        rejected_posts: "avvisade inlägg"
       messages:
         all: "Alla"
         inbox: "Inkorg"
@@ -891,6 +907,7 @@ sv:
         success: "(e-post skickat)"
         in_progress: "(skickar e-post)"
         error: "(fel)"
+        emoji: "lås emoji"
         action: "Skicka e-post för att återställa lösenord"
         set_password: "Ange lösenord"
         choose_new: "Välj ett nytt lösenord"
@@ -941,6 +958,7 @@ sv:
           title: "Bevisbaserade autentiserare"
           add: "Ny autentiserare"
           default_name: "Min autentiserare"
+          name_and_code_required_error: "Du måste ange ett namn samt koden från din app för autentisering."
         security_key:
           register: "Registrera"
           title: "Säkerhetsnycklar"
@@ -951,6 +969,7 @@ sv:
           edit: "Ändra säkerhetsnyckel"
           edit_description: "Namn på säkerhetsnyckel"
           delete: "Radera"
+          name_required_error: "Du måste ange ett namn för din säkerhetsnyckel."
       change_about:
         title: "Ändra Om Mig"
         error: "Ett fel inträffade vid ändringen av det här värdet."
@@ -967,10 +986,10 @@ sv:
         success_staff: "Vi har skickat e-post till din nuvarande adress. Vänligen följ instruktionerna för konfirmering."
       change_avatar:
         title: "Ändra din profilbild"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baserat på"
-        gravatar_title: "Byt din avatar på Gravatars hemsida"
-        gravatar_failed: "Vi hittade ingen Gravatar med den e-postadressen."
-        refresh_gravatar_title: "Uppdatera din Gravatar"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, baserat på"
+        gravatar_title: "Ändra din avatar på {{gravatarName}}s webbsida"
+        gravatar_failed: "Vi kunde inte hitta en {{gravatarName}} för den e-postadressen."
+        refresh_gravatar_title: "Förnya din {{gravatarName}}"
         letter_based: "Profilbild tilldelad av systemet"
         uploaded_avatar: "Anpassad bild"
         uploaded_avatar_empty: "Lägg till en anpassad bild"
@@ -1033,6 +1052,9 @@ sv:
         any: "något"
       password_confirmation:
         title: "Lösenord igen"
+      invite_code:
+        title: "Inbjudningskod"
+        instructions: "Kontoregistrering kräver en inbjudningskod"
       auth_tokens:
         title: "Senaste använda enheter"
         ip: "IP"
@@ -1253,6 +1275,9 @@ sv:
         back: "Gå tillbaka"
         again: "Försök igen"
         fixed: "Ladda sida"
+    modal:
+      close: "stäng"
+      dismiss_error: "Avfärda fel"
     close: "Stäng"
     assets_changed_confirm: "Den här webbplatsen uppdaterades precis. Uppdatera för att se den senaste versionen?"
     logout: "Du loggades ut."
@@ -1347,6 +1372,7 @@ sv:
     email_login:
       link_label: "E-posta mig en inloggningslänk"
       button_label: "per e-post"
+      emoji: "lås emoji"
       complete_username: "Om ett konto matchar användarnamnet <b>%{username}</b>, bör du inom kort få ett e-postmeddelande med en inloggningslänk."
       complete_email: "Om ett konto matchar <b>%{email}</b>, bör du inom kort få ett e-postmeddelande med en inloggningslänk."
       complete_username_found: "Vi hittade ett konto som matchade användarnamnet <b> %{username} </b>, du kommer snart att få ett e-postmeddelande med länk för inloggning inom kort."
@@ -1424,6 +1450,7 @@ sv:
         backup_code: "Använd en reservkod istället"
     invites:
       accept_title: "Inbjudan"
+      emoji: "kuvert emoji"
       welcome_to: "Välkommen till %{site_name}!"
       invited_by: "Du bjöds in av:"
       social_login_available: "Du kommer också att kunna logga in med social inloggningar via denna mail."
@@ -1488,7 +1515,6 @@ sv:
       objects: Objekt
       symbols: Symboler
       flags: Flaggor
-      custom: Anpassa emojis
       recent: Senaste använda
       default_tone: Ingen hudton
       light_tone: Ljus hudton
@@ -1496,6 +1522,7 @@ sv:
       medium_tone: Medium hudton
       medium_dark_tone: Medium mörk hudton
       dark_tone: Mörk hudton
+      default: Anpassa emojis
     shared_drafts:
       title: "Delade utkast"
       notice: "Detta ämne är enbart synligt för de som kan se kategorin <b>{{category}}</b>."
@@ -1637,6 +1664,9 @@ sv:
         message:
           one: "%{count} oläst meddelande"
           other: "{{count}} olästa meddelanden"
+        high_priority:
+          one: "%{count} oläst notifikation med hög prioritet"
+          other: "%{count} olästa notifikationer med hög prioritet"
       title: "notiser från @namn-omnämnanden, svar på dina inlägg och ämnen, meddelanden, etc"
       none: "Kan inte ladda notiser just nu."
       empty: "Inga notifieringar hittades."
@@ -1645,6 +1675,7 @@ sv:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -1695,6 +1726,8 @@ sv:
         posted: "nytt inlägg"
         moved_post: "inlägg flyttat"
         linked: "länkat"
+        bookmark_reminder: "påminnelse för bokmärke"
+        bookmark_reminder_with_name: "påminnelse för bokmärke - %{name}"
         granted_badge: "utmärkelse tilldelad"
         invited_to_topic: "inbjuden till ämne"
         group_mentioned: "grupp omnämnde"
@@ -1760,7 +1793,7 @@ sv:
         in_group:
           label: I gruppen
         with_badge:
-          label: Med märke
+          label: Med utmärkelse
         with_tags:
           label: Taggad
         filters:
@@ -1923,6 +1956,7 @@ sv:
       group_request_sent: "Din begäran om gruppmedlemskap har skickats. Du kommer informeras om den har accepterats."
       unread_indicator: "Ingen medlem har läst det senaste inlägget ännu."
       read_more_MF: "Det finns { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 oläst</a> } other { <a href='{basePath}/unread'># olästa</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{och } false {} other{}} <a href='{basePath}/new'>1 nytt</a> ämne} other { {BOTH, select, true{och } false {} other{}} <a href='{basePath}/new'># nya</a> ämnen} } kvar, eller {CATEGORY, select, true {bläddra bland andra ämnen i {catLink}} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Bläddra bland alla kategorier
       view_latest_topics: visa senaste ämnen
       suggest_create_topic: "Varför inte skapa ett ämne?"
@@ -1933,6 +1967,7 @@ sv:
         title: "Ämnestidtagning"
         save: "Ställ in timer"
         num_of_hours: "Antal timmar:"
+        num_of_days: "Antal dagar:"
         remove: "Ta bort timer:"
         publish_to: "Publicera till:"
         when: "När:"
@@ -1975,6 +2010,8 @@ sv:
         title: "Auto-knuffa Ämne"
       reminder:
         title: "Påminn mig"
+      auto_delete_replies:
+        title: "Radera svar automatiskt"
       status_update_notice:
         auto_open: "Detta ämne kommer öppnas automatiskt om %{timeLeft}."
         auto_close: "Det här ämnet kommer stängas automatiskt om %{timeLeft}."
@@ -1983,6 +2020,7 @@ sv:
         auto_delete: "Det här ämnet kommer raderas automatiskt om %{timeLeft}."
         auto_bump: "Det här ämnet kommer knuffas automatiskt %{timeLeft}."
         auto_reminder: "Du kommer att påminnas om detta ämne om: %{timeLeft}."
+        auto_delete_replies: "Svar på detta ämne raderas automatiskt efter %{duration}."
       auto_close_title: "Inställningar för automatisk stängning"
       auto_close_immediate:
         one: "Senaste inlägget i det här ämnet är redan %{count} timme gammalt, så ämnet kommer att stängas omedelbart. "
@@ -2194,6 +2232,18 @@ sv:
         title: "Sammanfoga markerade inlägg"
         action: "sammanfoga markerade inlägg"
         error: "Det uppstod ett fel vid sammanfogningen av de markerade inläggen."
+      publish_page:
+        title: "Sidpublicering"
+        publish: "Publicera"
+        description: "När ett ämne publiceras som en sida kan deras URL delas och den kommer att visas med anpassad utformning."
+        slug: "Slug"
+        publish_url: "Din sida har publicerats vid:"
+        topic_published: "Ditt ämne har publicerats vid:"
+        preview_url: "Din sida kommer publiceras vid:"
+        invalid_slug: "Tyvärr, du kan inte publicera denna sida."
+        unpublish: "Avpublicera"
+        unpublished: "Din sida har blivit avpublicerad och är inte längre tillgänglig."
+        publishing_settings: "Inställningar för publicering"
       change_owner:
         title: "Byt ägare"
         action: "ändra ägare"
@@ -2202,6 +2252,9 @@ sv:
         instructions:
           one: "Vänligen välj en ny ägare för inlägget från <b>@{{old_user}}</b>"
           other: "Vänligen välj en ny ägare för {{count}} inlägg från <b>@{{old_user}}</b>"
+        instructions_without_old_user:
+          one: "Vänligen välj en ny ägare för inlägget"
+          other: "Vänligen välj en ny ägare för de {{count}} inläggen"
       change_timestamp:
         title: "Ändra tidsstämpel..."
         action: "ändra tidsstämpeln"
@@ -2327,6 +2380,7 @@ sv:
         convert_to_moderator: "Lägg till personalfärg"
         revert_to_regular: "Ta bort personalfärg"
         rebake: "Generera HTML"
+        publish_page: "Sidpublicering"
         unhide: "Visa"
         change_owner: "Ändra ägare"
         grant_badge: "Utfärda utmärkelse"
@@ -2421,13 +2475,18 @@ sv:
             button: "HTML"
       bookmarks:
         create: "Skapa bokmärke"
+        edit: "Redigera bokmärke"
+        created: "Skapad"
         name: "Namn"
-        name_placeholder: "Namnge bokmärket för att underlätta för ditt minne"
-        set_reminder: "Skapa påminnelse"
+        name_placeholder: "Vad används detta bokmärke till?"
+        set_reminder: "Påminn mig"
         actions:
           delete_bookmark:
             name: "Radera bokmärke"
             description: "Tar bort bokmärket från din profil och stoppar alla påminnelser för bokmärket."
+          edit_bookmark:
+            name: "Redigera bokmärke"
+            description: "Redigera bokmärkets namn eller ändra påminnelsens datum och tid."
     category:
       can: "can&hellip; "
       none: "(ingen kategori)"
@@ -2789,6 +2848,18 @@ sv:
         title: "Skapar"
         return: "%{shortcut} Återgå till skaparen"
         fullscreen: "%{shortcut} Helskärmsläge för skaparen"
+      bookmarks:
+        title: "Bokmärkning"
+        enter: "%{shortcut} Spara och stäng"
+        later_today: "%{shortcut} Senare idag"
+        later_this_week: "%{shortcut} Senare denna vecka"
+        tomorrow: "%{shortcut} Imorgon"
+        next_week: "%{shortcut} Nästa vecka"
+        next_month: "%{shortcut} Nästa månad"
+        next_business_week: "%{shortcut} I början på nästa vecka"
+        next_business_day: "%{shortcut} Nästa vardag"
+        custom: "%{shortcut} Anpassa datum och tid"
+        none: "%{shortcut} Ingen påminnelse"
       actions:
         title: "Åtgärder"
         bookmark_topic: "%{shortcut} Växla bokmärkning av ämne"
@@ -2811,6 +2882,10 @@ sv:
         print: "%{shortcut} Skriv ut ämne"
         defer: "%{shortcut} Skjut upp ämne"
         topic_admin_actions: "%{shortcut} Öppna administratörsåtgärder för ämne"
+      search_menu:
+        title: "Sökmeny"
+        prev_next: "%{shortcut} Flytta markering upp eller ner"
+        insert_url: "%{shortcut} Infoga urval till pågående skaparen"
     badges:
       earned_n_times:
         one: "Förtjänade den här utmärkelsen %{count} gång"
@@ -3015,7 +3090,7 @@ sv:
         show_traffic_report: "Visa detaljerad trafikrapport"
         community_health: Hälsa för gemenskapen
         moderators_activity: Moderatorers aktivitet
-        whats_new_in_discourse: "Vad är nytt i Discource?"
+        whats_new_in_discourse: "Vad är nytt i Discourse?"
         activity_metrics: Aktivitetsdata
         all_reports: "Alla rapporter"
         general_tab: "Allmänt"
@@ -3222,6 +3297,9 @@ sv:
         notification_event:
           name: "Notifikationshändelse"
           details: "När en användare mottager en notifikation i deras flöde."
+        user_badge_event:
+          name: "Utmärkelse tilldelning"
+          details: "När en användare mottager en utmärkelse."
         delivery_status:
           title: "Leveransstatus"
           inactive: "Inaktiv"
@@ -3371,6 +3449,7 @@ sv:
           theme_name: "Temanamn"
           component_name: "Komponentnamn"
           themes_intro: "Välj ett existerande tema eller installera ett nytt för att komma igång"
+          themes_intro_emoji: "kvinnlig artist emoji"
           beginners_guide_title: "Nybörjarguide för användning av Discourse-teman"
           developers_guide_title: "Utvecklarguide för Discourse-teman"
           browse_themes: "Visa gemenskapens teman"
@@ -3597,6 +3676,7 @@ sv:
         format: "Format"
         html: "html"
         text: "text"
+        html_preview: "Förhandsgranskning e-postinnehåll "
         last_seen_user: "Senast sedd användare:"
         no_result: "Inga resultat är funna."
         reply_key: "Svarsnyckel"
@@ -3751,6 +3831,8 @@ sv:
             api_key_update: "api nyckel uppdaterad"
             api_key_destroy: "api nyckel förstörd"
             override_upload_secure_status: "åsidosätt säkerhetsstatus för uppladdning"
+            page_published: "sida publicerad"
+            page_unpublished: "sida avpublicerad"
         screened_emails:
           title: "Kontrollerad e-post"
           description: "När någon försöker skapa ett nytt konto, kommer följande e-postadresser att kontrolleras och registreringen blockeras, eller någon annan åtgärd vidtas."
@@ -3854,7 +3936,6 @@ sv:
           staff: "Medarbetare"
           suspended: "Avstängd"
           silenced: "Tystad"
-          suspect: "Misstänkt"
           staged: "Arrangerad"
         approved: "Godkänd?"
         titles:
@@ -3871,7 +3952,6 @@ sv:
           moderators: "Moderatorer"
           silenced: "Tystad användare"
           suspended: "Avstängda användare"
-          suspect: "Misstänkta användare"
           staged: "Påhittad användare"
         not_verified: "Ej verifierad"
         check_email:
@@ -4002,6 +4082,7 @@ sv:
           threshold_reached: "Mottog för många studsar från den e-posten."
         trust_level_change_failed: "Ett problem uppstod då användarens förtroendenivå skulle ändras."
         suspend_modal_title: "Stäng av användare"
+        confirm_cancel_penalty: "Är du säker på att du vill ångra bestraffningen?"
         trust_level_2_users: "Användare med förtroendenivå 2"
         trust_level_3_requirements: "Krav för förtroendenivå 3"
         trust_level_locked_tip: "förtroendenivå är låst, systemet kommer ej att befordra eller degradera användare"
@@ -4214,7 +4295,8 @@ sv:
             with_post_time: "<span class=\"username\">%{username}</span> för inlägg i %{link} vid kl. <span class=\"time\">%{time}</span>"
             with_time: "<span class=\"username\">%{username}</span> vid kl. <span class=\"time\">%{time}</span>"
         badge_intro:
-          title: "Välj ett existerande märke eller skapa ett nytt för att komma igång"
+          title: "Välj en existerande utmärkelse eller skapa en ny för att komma igång"
+          emoji: "kvinnlig student emoji"
           what_are_badges_title: "Vad är utmärkelser?"
           badge_query_examples_title: "Exempel på utmärkelsefråga"
         mass_award:
@@ -4231,7 +4313,9 @@ sv:
         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)"
         add: "Lägg till ny emoji"
         name: "Namn"
+        group: "Grupp"
         image: "Bild"
+        alt: "anpassa förhandsvisning av emoji "
         delete_confirm: "Är du säker på att du vill radera emojin :%{name}:?"
       embedding:
         get_started: "Börja genom att lägga till värden, om du vill bädda in Discourse på en annan hemsida. "
@@ -4251,13 +4335,14 @@ sv:
         embed_post_limit: "Högsta tillåtna antal inlägg att bädda in"
         embed_title_scrubber: "Reguljära uttryck som används för att hitta och korrigera fel i inläggsrubriken"
         embed_truncate: "Trunkera de inbäddade inläggen"
+        embed_unlisted: "Importerade ämnen kommer att vara olistade tills dess att det finns ett svar."
         embed_whitelist_selector: "CSS-väljare för element som tillåts bäddas in"
         embed_blacklist_selector: "CSS-väljare för element som tas bort från inbäddningar"
         embed_classname_whitelist: "Tillåtna CSS klassnamn"
         save: "Spara inbäddningsinställningar"
       permalink:
         title: "Permalänkar"
-        description: "Observera att detta endast gäller externa källor, länkar som publiceras på ditt forum kommer inte att omdirigeras."
+        description: "Omdirigeringar att tillämpa för URL:er som inte är kända av forumet."
         url: "URL"
         topic_id: "Ämnes-ID"
         topic_title: "Ämne"
@@ -4266,6 +4351,7 @@ sv:
         category_id: "Kategori-ID"
         category_title: "Kategori"
         external_url: "Extern URL"
+        destination: "Mål"
         delete_confirm: "Är du säker på att du vill ta bort den här permalänken?"
         form:
           label: "Ny:"
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 5f1e71b61e..55dcb12453 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -28,7 +28,6 @@ sw:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -238,6 +237,12 @@ sw:
       remove: "Ondoa Alamisho"
       confirm_clear: "Una uhakika unataka kuondoa mialamisho ya mada hii?"
       save: "hifadhi"
+      reminders:
+        later_today: "Baada ya mda leo"
+        tomorrow: "Kesho"
+        next_week: "Wiki Ijayo"
+        later_this_week: "Baada ya mda ndani ya wiki hii"
+        next_month: "Mwezi ujao"
     drafts:
       remove: "Ondoa"
       new_topic: "Mswadajaribio wa mada mpya"
@@ -716,9 +721,6 @@ sw:
         success_staff: "Tumekutumia barua kwenye barua pepe uliyotumia. Tafadhali fuata maelezo tuliyokutumia."
       change_avatar:
         title: "Badilisha Picha yako"
-        gravatar: "imetoka kwa <a href='//gravatar.com/emails' target='_blank'>Ishara</a>"
-        gravatar_title: "Badilisha Ishara kwenye Mtandao wa Ishara"
-        refresh_gravatar_title: "Onesha Upya Ishara Yako"
         letter_based: "Mfumo imekabidhi Picha"
         uploaded_avatar: "Picha Binafsi"
         uploaded_avatar_empty: "Ongeza picha yako binafsi"
@@ -957,6 +959,8 @@ sw:
         back: "Rudi Nyuma"
         again: "Jaribu Tena"
         fixed: "Pakua Ukurasa"
+    modal:
+      close: "funga"
     close: "Funga"
     assets_changed_confirm: "Tovuti hii imesasishwa hivi karibuni. Rudisha tena kupata toleo la hivi karibuni?"
     logout: "Ulitolewa."
@@ -1141,7 +1145,6 @@ sw:
       filter_placeholder: Tafuta picha-hisia
       objects: Vitu
       flags: Bendera
-      custom: Ishara binafsi
       recent: Imetumika hivi karibuni
       default_tone: Mwonekano usio na toni
       light_tone: Mwonekano wenye toni nyepesi
@@ -1149,6 +1152,7 @@ sw:
       medium_tone: Mwonekano wenye toni ya katikati
       medium_dark_tone: Mwonekano mweusi wenye toni ya katikati
       dark_tone: Mwonekano wenye toni nyeusi
+      default: Ishara binafsi
     shared_drafts:
       title: "Maswadajaribio Gawiza"
       notice: "Mada hii inapatikana kwa watu wanaoweza kuona kategoria <b>{{category}}</b>."
@@ -1279,6 +1283,7 @@ sw:
       mentioned: "<span>{{jina la mtumiaji}} </span>{{maelezo}}"
       group_mentioned: "<span>{{jina la mtumiaji}} </span>{{maelezo}}"
       quoted: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
+      bookmark_reminder: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
       replied: "<span>{{jina la mtumiaji}} </span> {{maelezo}}"
       posted: "<span>{{jina la mtumiaji}} </span> {{maelezo}}"
       edited: "<span>{{jina la mtumiaji}} </span> {{maelezo}}"
@@ -1908,6 +1913,7 @@ sw:
             title: "Onyesha sehemu yenye html kwenye barua pepe."
             button: "HTML"
       bookmarks:
+        created: "Imetengenezwa"
         name: "Jina"
     category:
       can: "can&hellip; "
@@ -2938,7 +2944,6 @@ sw:
           staff: "Wasaidizi"
           suspended: "Alisitishwa"
           silenced: "Amenyamazishwa"
-          suspect: "Mshukiwa"
           staged: "Sehemu ya kujaribu"
         approved: "Wamekubaliwa?"
         titles:
@@ -2955,7 +2960,6 @@ sw:
           moderators: "Wasimamizi"
           silenced: "Watumiaji Walionyamazishwa"
           suspended: "Watumiaji Waliositishwa"
-          suspect: "Sitisha Watumiaji"
         not_verified: "Haijathibitishwa"
         check_email:
           title: "Onyesha barua pepe ya mtumiaji"
@@ -3267,6 +3271,7 @@ sw:
         help: "Ongeza emoji mpya ambayo itapatikana kwa kila mtu. (USHAURI: unaweza kuweka zaidi ya faili moja mara moja)"
         add: "Ongeza Emoji Mpya"
         name: "Jina"
+        group: "Kikundi"
         image: "Picha"
         delete_confirm: "Una uhakika unataka kufuta emoji ya :%{name}: ?"
       embedding:
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index 3e792c170f..970a244802 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -24,7 +24,6 @@ te:
             tb: టీబీ
     dates:
       time: "h:mm a"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       long_with_year: "MMM D, YYYY h:mm a"
       long_with_year_no_time: "MMM D, YYYY"
@@ -165,6 +164,10 @@ te:
       created: "ఈ టపాకు పేజీక ఉంచారు"
       remove: "పేజీక తొలగించండి"
       save: "భద్రపరచు"
+      reminders:
+        tomorrow: "రేపు"
+        next_week: "వచ్చే వారం"
+        next_month: "వచ్చే నెల"
     drafts:
       remove: "తొలగించు"
       abandon:
@@ -433,8 +436,6 @@ te:
         success: "ఆ చిరునామాకు మేము వేగు పంపాము. అందులోని సూచనలు అనుసరించండి. "
       change_avatar:
         title: "మీ ప్రవర బొమ్మ మార్చండి."
-        gravatar: "ఆధారపడిన <a href='//gravatar.com/emails' target='_blank'>గ్రావతారం</a>"
-        refresh_gravatar_title: "మీ గ్రావతారం తాజాపరుచు"
         letter_based: "వ్యవస్థ కేటాయించిన ప్రవర బొమ్మ"
         uploaded_avatar: "అనురూప బొమ్మ"
         uploaded_avatar_empty: "అనురూప బొమ్మను కలపండి"
@@ -574,6 +575,8 @@ te:
         back: "వెనక్కు వెళ్లండి"
         again: "మళ్ళీ ప్రయత్నించండి"
         fixed: "పుట ఎక్కించండి"
+    modal:
+      close: "మూసివేయి"
     close: "మూసివేయి"
     assets_changed_confirm: "ఈ సైటు ఇప్పుడే ఉన్నతీకరించబడింది. కొత్త రూపాంతరం చూడటానికి తాజాపరచండి?"
     logout: "మీరు లాగవుట్ అయ్యారు."
@@ -1061,6 +1064,7 @@ te:
           side_by_side_markdown:
             title: "ముడి మూల తేడాను పక్కపక్కన చూపు"
       bookmarks:
+        created: "సృష్టించిన"
         name: "పేరు"
     category:
       can: "can&hellip;"
@@ -1704,7 +1708,6 @@ te:
           active: "క్రియాశీల"
           staff: "సిబ్బంది"
           suspended: "సస్పెడయ్యాడు"
-          suspect: "అనుమానించు"
         approved: "అంగీకరించు"
         titles:
           active: "క్రియాశీల సభ్యులు"
@@ -1719,7 +1722,6 @@ te:
           admins: "అధికారి సభ్యులు"
           moderators: "నిర్వాహకులు"
           suspended: "సస్పెండయిన సభ్యులు"
-          suspect: "అనుమానిత సభ్యులు"
         not_verified: "ద్రువీకరించలేదు"
         check_email:
           title: "ఈ సభ్యుని ఈమెయిల్ చూపు"
@@ -1950,6 +1952,7 @@ te:
         title: "ఇమోజి"
         add: "కొత్త ఇమోజి కలుపు"
         name: "పేరు"
+        group: "సమూహం"
         image: "బొమ్మ"
         delete_confirm: "మీరు నిజంగా %{name}: ఎమోజీ ని తొలగించాలనుకుంటున్నారా ?"
       embedding:
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 3149fc5af8..6e8bc581d4 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -27,7 +27,6 @@ th:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -561,9 +560,6 @@ th:
         success: "เราส่งอีเมลไปยังที่อยู่อีเมลดังกล่าวแล้ว กรุณาทำตามขั้นตอนยืนยัน"
       change_avatar:
         title: "เปลี่ยนรูปโพรไฟล์"
-        gravatar: "ทำงานด้วย <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>"
-        gravatar_title: "เปลี่ยนภาพแทนตัวของคุณบนเว็บไซต์ Gravatar"
-        refresh_gravatar_title: "เรียกของคุณ Gravatar ใหม่"
         letter_based: "รูปโพรไฟล์ที่ระบบทำให้อัตโนมัติ"
         uploaded_avatar: "รูปกำหนดเอง"
         uploaded_avatar_empty: "เพิ่มรูปกำหนดเอง"
@@ -772,6 +768,8 @@ th:
         back: "ย้อนกลับ"
         again: "ลองอีกครั้ง"
         fixed: "โหลดหน้า"
+    modal:
+      close: "ปิด"
     close: "ปิด"
     assets_changed_confirm: "เว็บนี้พึ่งได้รับการอัปเดต รีเฟรชเพื่อเข้าหน้าเว็บล่าสุด?"
     logout: "คุณได้ออกจากระบบ"
@@ -1264,6 +1262,7 @@ th:
         by_you:
           bookmark: "บุ๊คมาร์คโพสนี้"
       bookmarks:
+        created: "สร้างเมื่อ"
         name: "ชื่อ"
     category:
       edit: "แก้ไข"
@@ -1748,7 +1747,6 @@ th:
           active: "ใช้งานอยู่"
           staff: "ทีมงาน"
           suspended: "ระงับการใช้งาน"
-          suspect: "ต้องสงสัย"
         approved: "ยืนยันหรือไม่"
         titles:
           active: "ผู้ใช้ที่ใช้งานอยู่"
@@ -1761,7 +1759,6 @@ th:
           leader: "ผู้ใช้ที่ระดับความไว้ใจ 4 (ผู้นำ)"
           staff: "ทีมงาน"
           suspended: "ผู้ใช้งานที่ถูกระงับ"
-          suspect: "ผู้ใช้งานที่ต้องสงสัย"
         not_verified: "ยังไม่ได้รับการตรวจสอบ"
         check_email:
           title: "แสดงอีเมลผู้ใช้งาน"
@@ -1936,6 +1933,7 @@ th:
         title: "Emoji"
         add: "เพิ่ม Emoji ใหม่"
         name: "ชื่อ"
+        group: "กลุ่ม"
         image: "ภาพ"
         delete_confirm: "คุณแน่ใจหรือว่าจะลบ Emoji :%{name}: ออก?"
       embedding:
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 65a225f7c8..10f8321f6f 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -29,7 +29,6 @@ tr_TR:
       time: "h:mm a"
       time_short_day: "ggg, SS:dd"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "D MMM, YYYY h:mm a"
@@ -263,18 +262,17 @@ tr_TR:
     bookmarks:
       created: "bu gönderiyi işaretledin"
       not_bookmarked: "bu yazıya yer işareti koy"
-      created_with_reminder: "bu gönderiyi %{date} adresinde bir hatırlatıcı ile yer işaretlerine eklediniz"
       remove: "İşareti Kaldır"
       confirm_clear: "Bu konudaki tüm yer işaretlerinizi silmek istediğinizden emin misiniz?"
       save: "Kaydet"
       no_timezone: 'Henüz bir saat dilimi belirlemediniz. Hatırlatıcı ayarlayamazsınız. <a href="%{basePath}/my/preferences/profile">Profilinizde</a> bir tane oluşturun.'
       reminders:
         at_desktop: "Bir dahaki sefere masaüstümdeyim"
-        later_today: "Bugün daha sonra <br/> {{date}}"
-        next_business_day: "Bir sonraki iş günü <br/> {{date}}"
-        tomorrow: "Yarın <br/> {{date}}"
-        next_week: "Gelecek hafta <br/> {{date}}"
-        next_month: "Gelecek ay <br/> {{date}}"
+        later_today: "Bugün ilerleyen saatlerde"
+        tomorrow: "Yarın"
+        next_week: "Gelecek hafta"
+        later_this_week: "Bu hafta içinde"
+        next_month: "Gelecek ay"
         custom: "Özel tarih ve saat"
     drafts:
       resume: "Sürdür"
@@ -538,6 +536,7 @@ tr_TR:
         deny: "Reddet"
         denied: "reddedildi"
         undone: "istek reddedildi"
+        handle: "üyelik isteğini yerine getir"
       manage:
         title: "Yönet"
         name: "İsim"
@@ -964,10 +963,6 @@ tr_TR:
         success_staff: "Şu anki adresine bir e-posta gönderdik. Lütfen doğrulama bilgilendirmelerini takip et."
       change_avatar:
         title: "Profil resmini değiştir"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baz alındı"
-        gravatar_title: "Profil görselini \"Gravatar web sitesi\"nde değiştir"
-        gravatar_failed: "Bu e-posta adresine sahip bir Gravatar bulamadık."
-        refresh_gravatar_title: "Gravatar profil görselini yenile"
         letter_based: "Sistem profil görseli atadı"
         uploaded_avatar: "Kişisel resim"
         uploaded_avatar_empty: "Kişisel bir resim ekle"
@@ -1250,6 +1245,8 @@ tr_TR:
         back: "Geri Dön"
         again: "Tekrar Dene"
         fixed: "Sayfayı Yükle"
+    modal:
+      close: "kapat"
     close: "Kapat"
     assets_changed_confirm: "Bu site henüz güncellendi. Son hali için sayfayı yenilemek ister misin?"
     logout: "Çıkış yaptın."
@@ -1477,7 +1474,6 @@ tr_TR:
       objects: Nesneler
       symbols: Semboller
       flags: Bayraklar
-      custom: Özel emojiler
       recent: Son zamanlarda kullanılmış
       default_tone: Görünüm rengi yok
       light_tone: Açık görünüm tonu
@@ -1485,6 +1481,7 @@ tr_TR:
       medium_tone: Orta görünüm tonu
       medium_dark_tone: Orta koyu görünüm tonu
       dark_tone: Koyu görünüm tonu
+      default: Özel emojiler
     shared_drafts:
       title: "Paylaşılan taslaklar"
       notice: "Bu konu, yalnızca <b>{{category}}</b> kategorisini görebilen kişiler tarafından görülebilir."
@@ -1634,6 +1631,7 @@ tr_TR:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -2410,9 +2408,8 @@ tr_TR:
             button: "HTML"
       bookmarks:
         create: "Yer işareti oluştur"
+        created: "Oluşturuldu"
         name: "İsim"
-        name_placeholder: "Daha kolay hatırlayabilmeniz için yer işaretini adlandırın"
-        set_reminder: "Hatırlatıcı kur"
     category:
       can: "yapabilir&hellip;"
       none: "(kategori yok)"
@@ -3839,7 +3836,6 @@ tr_TR:
           staff: "Görevli"
           suspended: "Askıya Alınmış"
           silenced: "Susturuldu"
-          suspect: "Şüpheli"
           staged: "Aşamalı"
         approved: "Onaylanmış mı?"
         titles:
@@ -3856,7 +3852,6 @@ tr_TR:
           moderators: "Moderatörler"
           silenced: "Susturulmuş Kullanıcılar"
           suspended: "Askıya Alınan Kullanıcılar"
-          suspect: "Şüpheli Kullanıcılar"
           staged: "Aşamalı Kullanıcılar"
         not_verified: "Doğrulanmadı"
         check_email:
@@ -4214,6 +4209,7 @@ tr_TR:
         help: "Herkese açık yeni bir emoji ekle. (PROTIP: birden çok dosyayı tek seferde sürükleyip bırakabilirsin)"
         add: "Yeni Emoji Ekle"
         name: "İsim"
+        group: "Grup"
         image: "Resim"
         delete_confirm: ":%{name}: emojisini silmek istediğine emin misin?"
       embedding:
@@ -4240,7 +4236,6 @@ tr_TR:
         save: "Gömme Ayarlarını Kaydet"
       permalink:
         title: "Kalıcı Bağlantılar"
-        description: "Lütfen bunun yalnızca harici kaynaklar için geçerli olduğunu unutmayın, forumunuzda yayınlanan bağlantılar yönlendirilmeyecektir."
         url: "URL"
         topic_id: "Konu ID"
         topic_title: "Konu"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index be53040281..9a1fc5167b 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -31,7 +31,6 @@ uk:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY, HH:mm"
@@ -312,18 +311,17 @@ uk:
     bookmarks:
       created: "ви додали цей допис до закладок"
       not_bookmarked: "додати цей допис до закладок"
-      created_with_reminder: "ви додали закладку на цю публікацію з нагадуванням на %{date}"
       remove: "Вилучити закладку"
       confirm_clear: "Ви впевнені, що хочете вилучити всі закладки з цієї теми?"
       save: "Зберегти"
       no_timezone: 'Ви ще не встановили часовий пояс. Ви не зможете встановити нагадування. Налаштуйте його <a href="%{basePath}/my/preferences/profile">у своєму профілі</a> .'
       reminders:
         at_desktop: "Наступного разу на мій робочий стіл"
-        later_today: "Пізніше сьогодні <br/> {{date}}"
-        next_business_day: "Наступний робочий день <br/> {{date}}"
-        tomorrow: "Завтра <br/> {{date}}"
-        next_week: "Наступного тижня <br/> {{date}}"
-        next_month: "Наступного місяця <br/> {{date}}"
+        later_today: "Пізніше сьогодні"
+        tomorrow: "Завтра"
+        next_week: "На наступному тижні"
+        later_this_week: "Пізніше на цьому тижні"
+        next_month: "В наступному місяці"
         custom: "Вибрана дата та час"
     drafts:
       resume: "Продовжити"
@@ -611,6 +609,7 @@ uk:
         deny: "Відмовити"
         denied: "відмовлено"
         undone: "запит скасовано"
+        handle: "обробляти запит на вступ"
       manage:
         title: "Керувати"
         name: "Ім'я"
@@ -1047,10 +1046,6 @@ uk:
         success_staff: "Ми надіслали листа на вашу поточну скриньку. Будь ласка, виконайте інструкції щодо підтвердження."
       change_avatar:
         title: "Змінити своє зображення профілю"
-        gravatar: "На основі <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>"
-        gravatar_title: "Змінити аватарку на сайті Gravatar"
-        gravatar_failed: "Не вдалося знайти Gravatar за цією електронною поштою."
-        refresh_gravatar_title: "Оновити мій Gravatar"
         letter_based: "Ваше зображення додане автоматично"
         uploaded_avatar: "Інше зображення"
         uploaded_avatar_empty: "Додати інше зображення"
@@ -1353,6 +1348,8 @@ uk:
         back: "Повернутися"
         again: "Спробувати ще раз"
         fixed: "Завантаження Сторінки"
+    modal:
+      close: "сховати"
     close: "Закрити"
     assets_changed_confirm: "Сайт тільки що був оновлений. Перезавантажити сторінку для переходу до нової версії?"
     logout: "Ви вийшли."
@@ -1588,7 +1585,6 @@ uk:
       objects: Objects
       symbols: Атрибутика
       flags: Скарги
-      custom: Призначені для користувача смайли
       recent: Нещодавно використані
       default_tone: Немає скіна
       light_tone: Світлий тон скіна
@@ -1596,6 +1592,7 @@ uk:
       medium_tone: Середній тон скіна
       medium_dark_tone: Середній темний тон скіна
       dark_tone: Темний відтінок скіна
+      default: Призначені для користувача смайли
     shared_drafts:
       title: "загальні Чернетки"
       notice: "Ці теми видно тільки тим, хто може бачити <b>{{category}}</b> категорію."
@@ -1751,6 +1748,7 @@ uk:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -2601,9 +2599,8 @@ uk:
             button: "HTML"
       bookmarks:
         create: "Створити закладку"
+        created: "Створено"
         name: "Назва"
-        name_placeholder: "Назва закладки, яка допоможе знайти та згадати"
-        set_reminder: "Створити нагадування"
         actions:
           delete_bookmark:
             name: "Видалити закладку"
@@ -4096,7 +4093,6 @@ uk:
           staff: "Персонал"
           suspended: "Призупинені"
           silenced: "Відключені"
-          suspect: "Підозрілі"
           staged: "Недокористувач"
         approved: "Схвалено?"
         titles:
@@ -4113,7 +4109,6 @@ uk:
           moderators: "Модератори"
           silenced: "Відключені користувачі"
           suspended: "Призупинені користувачі"
-          suspect: "Підозрілі користувачі"
           staged: "Недокористувачі"
         not_verified: "Не підтверджений"
         check_email:
@@ -4481,6 +4476,7 @@ uk:
         help: "Додати нові смайли-emoji, які будуть доступні всім. (Підказка: можна перетягувати кілька файлів за раз)"
         add: "Додати нову іконку"
         name: "Ім'я"
+        group: "Група"
         image: "Зображення"
         delete_confirm: "Ви впевнені, що хочете видалити іконку :%{name}:?"
       embedding:
@@ -4507,7 +4503,6 @@ uk:
         save: "Зберегти налаштування вбудовування"
       permalink:
         title: "Постійні посилання"
-        description: "Зверніть увагу, що це стосується лише зовнішніх джерел, посилання, розміщені на вашому форумі, не будуть перенаправлені."
         url: "Посилання"
         topic_id: "ID теми"
         topic_title: "Тема"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 99524b1b41..a4ec6ef83f 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -28,7 +28,6 @@ ur:
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
-      long_no_year: "MMM D, h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -264,6 +263,12 @@ ur:
       remove: "بُک مارک ہٹائیں"
       confirm_clear: "کیا آپ کو یقین ہے کہ آپ اِس ٹاپک سے اپنے تمام بُک مارکس ہٹانا چاہتے ہیں؟"
       save: "محفوظ کریں"
+      reminders:
+        later_today: "آج بعد میں"
+        tomorrow: "کَل"
+        next_week: "اگلے ہفتے"
+        later_this_week: "اِس ہفتے بعد میں"
+        next_month: "اگلے ماہ"
     drafts:
       resume: "جاری رکھیں"
       remove: "خارج کریں"
@@ -519,6 +524,7 @@ ur:
         deny: "انکار"
         denied: "انکار کر دیا"
         undone: "درخواست کالعدم"
+        handle: "رکنیت کی درخواست سے نمٹیں"
       manage:
         title: "مَینَیج"
         name: "نام"
@@ -929,10 +935,6 @@ ur:
         success_staff: "ہم نے آپ کے موجودہ ایڈریس پر ایک اِی میل بھیج دی ہے۔ براہ کرم، تصدیق کی ہدایات پر عمل کریں۔"
       change_avatar:
         title: "اپنے پروفائل کی تصویر تبدیل کریں"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>گَرِیوَّٹار</a>، کی بنیاد پر"
-        gravatar_title: "گَرِیوَّٹار کی ویب سائٹ پر اپنے اوتار کو تبدیل کریں"
-        gravatar_failed: "ہم اِس ایمیل ایڈریس کے ساتھ گَرَیوَٹار نہیں تلاش کرسکے۔"
-        refresh_gravatar_title: "اپنے گَرِیوَّٹار کو رِیفریش کریں"
         letter_based: "سسٹم تفویض کردہ پروفائل تصویر"
         uploaded_avatar: "اپنی مرضی کی تصویر"
         uploaded_avatar_empty: "اپنی مرضی کی تصویر شامل کریں"
@@ -1208,6 +1210,8 @@ ur:
         back: "واپس جائیں"
         again: "دوبارہ کوشش کریں"
         fixed: "پیج لوڈ کریں"
+    modal:
+      close: "بند کریں"
     close: "بند کریں"
     assets_changed_confirm: "یہ ویب سائٹ ابھی ابھی اَپ ڈیٹ کی گئی ہے۔ تازہ ترین ورژن کے لئے ابھی رِیفریش کریں؟"
     logout: "آپ لاگ آؤٹ ہو گئے تھے۔"
@@ -1420,7 +1424,6 @@ ur:
       objects: اشیاء
       symbols: علامات
       flags: فلَیگز
-      custom: اپنی مرضی کے اِیمَوجی
       recent: حال ہی میں استعمال کیے گئے
       default_tone: کوئی جِلد رنگ نہیں
       light_tone: ہلکا جِلد رنگ
@@ -1428,6 +1431,7 @@ ur:
       medium_tone: درمیانا جِلد رنگ
       medium_dark_tone: درمیانا سیاہ جِلد رنگ
       dark_tone: سیاہ جِلد رنگ
+      default: اپنی مرضی کے اِیمَوجی
     shared_drafts:
       title: "مشترکہ ڈرافٹس"
       notice: "یہ ٹاپک صرف اُن لوگوں کیلئے نظر آتا ہے جو <b>{{category}}</b> زُمرَہ کو دیکھ سکتے ہیں۔"
@@ -1574,6 +1578,7 @@ ur:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -2326,6 +2331,7 @@ ur:
             title: "ای میل کے متن کا html حصہ دکھائیں"
             button: "HTML"
       bookmarks:
+        created: "بنایا گیا"
         name: "نام"
     category:
       can: "کر سکتا ہے&hellip; "
@@ -3693,7 +3699,6 @@ ur:
           staff: "سٹاف"
           suspended: "معطل کردہ"
           silenced: "خاموش کیو ہوئے"
-          suspect: "مشتبہ"
           staged: "سٹَیجڈ"
         approved: "منظورشدہ؟"
         titles:
@@ -3710,7 +3715,6 @@ ur:
           moderators: "ماڈریٹرز"
           silenced: "خاموش کردہ صارفین"
           suspended: "معطل کردہ صارفین"
-          suspect: "مشتبہ صارفین"
           staged: "سٹَیجڈ صارفین"
         not_verified: "غیر تصدیق شدہ"
         check_email:
@@ -4059,6 +4063,7 @@ ur:
         help: "نئی اِیمَوجی شامل کریں جو سب کے لئے دستیاب ہوگی۔ (پیشہ وَرَانہ ٹِپ: ایک بار میں ایک سے زیادہ فائلوں کو ڈرَیگ & ڈراپ کریں)"
         add: "نئی اِیمَوجی شامل کریں"
         name: "نام"
+        group: "گروپ"
         image: "تصویر"
         delete_confirm: "کیا آپ واقعی :%{name}: اِیمَوجی حذف کرنا چاہتے ہیں؟"
       embedding:
@@ -4085,7 +4090,6 @@ ur:
         save: "اَیمبَیڈ کرنے کی سیٹِنگ محفوظ کریں"
       permalink:
         title: "دائمی لِنکس"
-        description: "براہ کرم نوٹ کریں کہ یہ صرف بیرونی ذرائع پر لاگو ہوتا ہے، آپ کے فورم پر شائع کردہ لنکس کو ری ڈائریکٹ نہیں کیا جائے گا۔"
         url: "URL"
         topic_id: "ٹاپک ID"
         topic_title: "ٹاپک"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index f71871ae86..e121af9332 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -28,7 +28,6 @@ vi:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY HH:mm"
@@ -239,18 +238,15 @@ vi:
     bookmarks:
       created: "bạn đã đánh dấu bài viết này"
       not_bookmarked: "đánh dấu bài viết này"
-      created_with_reminder: "bạn đã đánh dấu bài đăng này bằng một lời nhắc tại %{date}"
       remove: "Xóa dấu trang"
       confirm_clear: "Bạn có chắc muốn xóa toàn bộ đánh dấu trong chủ đề này?"
       save: "Lưu"
       no_timezone: 'Bạn chưa đặt múi giờ. Bạn sẽ không thể đặt lời nhắc. Thiết lập một <a href="%{basePath}/my/preferences/profile">trong hồ sơ của bạn</a> .'
       reminders:
         at_desktop: "Lần sau tôi ở máy tính để bàn của tôi"
-        later_today: "Sau ngày hôm nay <br/> {{date}}"
-        next_business_day: "Ngày làm việc tiếp theo <br/> {{date}}"
-        tomorrow: "Ngày mai <br/> {{date}}"
-        next_week: "Tuần tới <br/> {{date}}"
-        next_month: "Tháng tiếp theo <br/> {{date}}"
+        tomorrow: "Ngày mai"
+        next_week: "Tuần tới"
+        next_month: "Tháng t"
         custom: "Ngày giờ tùy chỉnh"
     drafts:
       resume: "Làm lại"
@@ -867,9 +863,6 @@ vi:
         success: "Chúng tôi đã gửi email tới địa chỉ đó. Vui lòng làm theo chỉ dẫn để xác nhận lại."
       change_avatar:
         title: "Đổi ảnh đại diện"
-        gravatar: "dựa trên <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>"
-        gravatar_title: "Đổi ảnh đại diện của bạn trên website Gravatar"
-        refresh_gravatar_title: "Làm mới Gravatar của bạn"
         letter_based: "Hệ thống xác định ảnh đại diện"
         uploaded_avatar: "Chính sửa hình ảnh"
         uploaded_avatar_empty: "Thêm một ảnh chỉnh sửa"
@@ -1116,6 +1109,8 @@ vi:
         back: "Quay trở lại"
         again: "Thử lại"
         fixed: "Load lại trang"
+    modal:
+      close: "đóng"
     close: "Đóng lại"
     assets_changed_confirm: "Website đã được cập nhật bản mới. Bạn có thể làm mới lại trang để có thể sử dụng bản mới được cập nhật"
     logout: "Bạn đã đăng xuất"
@@ -1878,6 +1873,7 @@ vi:
           html_part:
             button: "HTML"
       bookmarks:
+        created: "Tạo bởi"
         name: "Tên"
     category:
       can: "can&hellip;"
@@ -2726,7 +2722,6 @@ vi:
           active: "Kích hoạt"
           staff: "Nhân viên"
           suspended: "Đã tạm khóa"
-          suspect: "Nghi ngờ"
         approved: "Đã duyệt?"
         titles:
           active: "Thành viên kích hoạt"
@@ -2741,7 +2736,6 @@ vi:
           admins: "Tài khoản Quản trị"
           moderators: "Điều hành viên"
           suspended: "Tài khoản Tạm khóa"
-          suspect: "Tài khoản đáng ngờ"
         not_verified: "Chưa xác thực"
         check_email:
           title: "Khám phá email của tài khoản này"
@@ -3013,6 +3007,7 @@ vi:
         help: "Thêm emoji mới có sẵn cho tất cả mọi người. (MẸO: kéo & thả nhiều file cùng lúc)"
         add: "Thêm emoji mới"
         name: "Tên"
+        group: "Nhóm"
         image: "Hình ảnh"
         delete_confirm: "Bạn có chắc chắn muốn xóa emoji :%{name}:?"
       embedding:
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index ced1e8b9f5..a0d9460b95 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -10,7 +10,7 @@ zh_CN:
     number:
       format:
         separator: "."
-        delimiter: "，"
+        delimiter: ","
       human:
         storage_units:
           format: "%n %u"
@@ -28,17 +28,17 @@ zh_CN:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "YYYY[年]M[月]"
-      long_no_year: "M[月]D[日], HH:mm"
-      long_no_year_no_time: "M月D日"
-      full_no_year_no_time: "M月D日"
-      long_with_year: "YYYY年M月D日 HH:mm"
-      long_with_year_no_time: "YYYY年M月D日"
-      full_with_year_no_time: "YYYY年M月D日"
-      long_date_with_year: "YY年M月D日 LT"
-      long_date_without_year: "M月D日 LT"
-      long_date_with_year_without_time: "YY年M月D日"
-      long_date_without_year_with_linebreak: "M月D日 <br/>LT"
-      long_date_with_year_with_linebreak: "YY年M月D日 <br/>LT"
+      long_no_year: "M[月]D[日] HH:mm"
+      long_no_year_no_time: "M[月]D[日]"
+      full_no_year_no_time: "M[月]D[日]"
+      long_with_year: "YYYY[年]M[月]D[日] HH:mm"
+      long_with_year_no_time: "YYYY[年]M[月]D[日]"
+      full_with_year_no_time: "YYYY[年]M[月]D[日]"
+      long_date_with_year: "YY[年]M[月]D[日] LT"
+      long_date_without_year: "M[月]D[日] LT"
+      long_date_with_year_without_time: "YY[年]M[月]D[日]"
+      long_date_without_year_with_linebreak: "M[月]D[日] <br/>LT"
+      long_date_with_year_with_linebreak: "YY[年]M[月]D[日] <br/>LT"
       wrap_ago: "%{date} 前"
       tiny:
         half_a_minute: "< 1 分钟"
@@ -62,8 +62,8 @@ zh_CN:
           other: "> %{count} 年"
         almost_x_years:
           other: "近 %{count} 年"
-        date_month: "M月D日"
-        date_year: "YY年M月"
+        date_month: "M[月]D[日]"
+        date_year: "YY[年]M[月]"
       medium:
         x_minutes:
           other: "%{count} 分钟"
@@ -71,7 +71,7 @@ zh_CN:
           other: "%{count} 小时"
         x_days:
           other: "%{count} 天"
-        date_year: "YY年M月"
+        date_year: "YY[年]M[月]D[日]"
       medium_with_ago:
         x_minutes:
           other: "%{count} 分钟前"
@@ -102,7 +102,7 @@ zh_CN:
       email: "通过电子邮件分享此链接"
     action_codes:
       public_topic: "于%{when}将此主题设为公开"
-      private_topic: "于%{when}将该次主题转换为私信"
+      private_topic: "于%{when}将该主题转换为私信"
       split_topic: "于%{when}拆分了此主题"
       invited_user: "于%{when}邀请了 %{who}"
       invited_group: "于%{when}邀请了 %{who}"
@@ -127,19 +127,19 @@ zh_CN:
         disabled: "于%{when}解除全站置顶"
       visible:
         enabled: "于%{when}列出"
-        disabled: "于%{when}除名"
+        disabled: "于%{when}隐藏"
       banner:
         enabled: "于%{when}将此设置为横幅。用户关闭横幅前，横幅将显示在每一页的顶部。"
         disabled: "于%{when}移除了该横幅。横幅将不再显示在每一页的顶部。"
       forwarded: "转发上述邮件"
     topic_admin_menu: "管理主题"
     wizard_required: "欢迎来到你新安装的 Discourse！让我们开始<a href='%{url}' data-auto-route='true'>设置向导</a>✨"
-    emails_are_disabled: "出站邮件已经被管理员全局禁用。将不发送任何邮件提醒。"
-    bootstrap_mode_enabled: "为方便站点准备发布，其正处于初始化模式中。所有新用户将被授予信任等级 1，并为他们设置接受每日邮件摘要。初始化模式会在用户数超过%{min_users}个时关闭。"
-    bootstrap_mode_disabled: "初始化模式将会在24小时后关闭。"
+    emails_are_disabled: "出站邮件已经被管理员全局禁用。将不会发送任何邮件提醒。"
+    bootstrap_mode_enabled: "为方便新站点的冷启动，现正处于初始化模式中。所有新用户将被授予信任等级 1，并为他们启用每日邮件摘要。初始化模式会在用户数超过%{min_users}个时关闭。"
+    bootstrap_mode_disabled: "初始化模式将会在24小时内关闭。"
     themes:
       default_description: "默认"
-      broken_theme_alert: "你的网站可能无法正常运行，因为主题/组件%{theme}有错误。 在%{path}禁用它。"
+      broken_theme_alert: "因为主题或组件%{theme}有错误，你的网站可能无法正常运行。 在%{path}禁用它。"
     s3:
       regions:
         ap_northeast_1: "亚太地区（Tokyo）"
@@ -162,7 +162,7 @@ zh_CN:
         us_gov_west_1: "AWS 政府云（US-West）"
         us_west_1: "美国西部（N. California）"
         us_west_2: "美国西部（Oregon）"
-    edit: "编辑标题和分类"
+    edit: "编辑该主题的标题和分类"
     expand: "展开"
     not_implemented: "非常抱歉，这个功能仍在开发中！"
     no_value: "否"
@@ -237,22 +237,33 @@ zh_CN:
       help:
         bookmark: "点击收藏该主题的第一个帖子"
         unbookmark: "点击删除本主题的所有收藏"
+        unbookmark_with_reminder: "点击以移除该主题上的所有收藏和提醒。你在该主题中设定了一个于%{reminder_at}的提醒。"
     bookmarks:
       created: "你已经收藏了此帖"
       not_bookmarked: "收藏此帖"
-      created_with_reminder: "你已收藏此帖并添加了一个于%{date}的提醒"
+      created_with_reminder: "你已经收藏该帖并且设定了一个于%{date}的提醒"
+      created_with_at_desktop_reminder: "你所收藏的此帖将会在你下次使用桌面设备时被提醒。"
       remove: "取消收藏"
       confirm_clear: "你确定要清空这个主题中的所有收藏？"
       save: "保存"
       no_timezone: '你尚未设置时区。您将无法设置提醒。在 <a href="%{basePath}/my/preferences/profile">你的个人资料中</a>设置。'
+      invalid_custom_datetime: "你所提供的日期和时间无效，请重试。"
+      list_permission_denied: "你没有权限查看该用户的收藏。"
       reminders:
         at_desktop: "下次我使用桌面设备时"
-        later_today: "今天晚些时候<br/> {{date}}"
-        next_business_day: "下个工作日"
+        later_today: "今天的某个时候"
+        next_business_day: "下一个工作日"
         tomorrow: "明天"
-        next_week: "下周"
-        next_month: "下个月<br/> {{date}}"
+        next_week: "下个星期"
+        later_this_week: "这周的某个时候"
+        start_of_next_business_week: "下周一"
+        next_month: "下个月"
         custom: "自定义日期和时间"
+        last_custom: "最近"
+        none: "无需提醒"
+        today_with_time: "今天%{time}"
+        tomorrow_with_time: "明天%{time}"
+        at_time: "于%{date_time}"
     drafts:
       resume: "复位"
       remove: "移除"
@@ -260,8 +271,8 @@ zh_CN:
       new_private_message: "新私信草稿"
       topic_reply: "草稿回复"
       abandon:
-        confirm: "您已在此主题中打开了另一个草稿。 你确定要放弃吗？"
-        yes_value: "是的，放弃"
+        confirm: "你已在此主题中打开了另一个草稿。 你确定要舍弃它吗？"
+        yes_value: "是的，舍弃"
         no_value: "不，保持"
     topic_count_latest:
       other: "有 {{count}} 个更新或新主题"
@@ -301,8 +312,8 @@ zh_CN:
     choose_message:
       none_found: "无符合的结果"
       title:
-        search: "搜索消息"
-        placeholder: "在此处输入消息标题、URL或ID"
+        search: "搜索私信"
+        placeholder: "在此处输入私信的标题、URL或ID"
     review:
       order_by: "排序依据"
       in_reply_to: "回复给"
@@ -312,24 +323,24 @@ zh_CN:
         formula: "公式"
         subtotal: "小计"
         total: "总计"
-        min_score_visibility: "可见时的最低分数"
+        min_score_visibility: "可见的最低分数"
         score_to_hide: "隐藏帖子的分数"
         take_action_bonus:
           name: "立即执行"
           title: "当工作人员选择采取行动时，会给标记加分。"
         user_accuracy_bonus:
           name: "用户准确性"
-          title: "历史上已同意其标记的用户将获得奖励。"
+          title: "先前已同意其标记的用户将获得奖励。"
         trust_level_bonus:
           name: "信任等级"
           title: "待审阅项目由较高信任级别且具有较高分数的用户创建的。"
         type_bonus:
           name: "奖励类型"
-          title: "某些可审核的类型可以由管理人员加权，以使其具有更高的优先级。"
+          title: "某些可审核类型可以由管理人员加权，以使其具有更高的优先级。"
       claim_help:
-        optional: "你可以认领此条目以防止他人审核。"
+        optional: "你可以认领此条目以避免被他人审核。"
         required: "在你审核之前你必须认领此条目。"
-        claimed_by_you: "你已认领此条目并可审核。"
+        claimed_by_you: "你已认领此条目现在可以审核了。"
         claimed_by_other: "此条目仅可被<b>{{username}}</b>审核。"
       claim:
         title: "认领该主题"
@@ -349,14 +360,14 @@ zh_CN:
       none: "没有项目需要审核"
       view_pending: "查看待审核"
       topic_has_pending:
-        other: "这个主题有 <b>{{count}}</b> 个帖子等待审核"
+        other: "该主题中有 <b>{{count}}</b> 个帖等待审核中"
       title: "审核"
       topic: "主题："
       filtered_topic: "您正在选择性地查看这一主题中的可审核内容。"
       filtered_user: "用户"
       show_all_topics: "显示所有主题"
-      deleted_post: "(帖子已删除)"
-      deleted_user: "(用户已删除)"
+      deleted_post: "(已删除的帖子)"
+      deleted_user: "(已删除的用户)"
       user:
         bio: "简介"
         website: "网站"
@@ -378,7 +389,7 @@ zh_CN:
         reviewable_count: "计数"
         reported_by: "报告人"
         deleted: "[已删除的主题]"
-        original: "（原始主题）"
+        original: "（原主题）"
         details: "详情"
         unique_users:
           other: "{{count}} 位用户"
@@ -405,12 +416,12 @@ zh_CN:
         priority:
           title: "最低优先级"
           low: "（所有）"
-          medium: "中等"
+          medium: "中"
           high: "高"
       conversation:
-        view_full: "查看所有对话"
+        view_full: "查看完整对话"
       scores:
-        about: "该分数是通过举报者的信任等级、该用户以往举报的准确性以及被举报项目的优先级计算得出。"
+        about: "该分数是根据报告者的信任等级、该用户以往举报的准确性以及被举报条目的优先级计算得出的。"
         score: "评分"
         date: "日期"
         type: "类型"
@@ -444,9 +455,9 @@ zh_CN:
           title: "用户"
       approval:
         title: "等待审核中"
-        description: "我们已经保存了你的帖子，不过帖子需要由管理员先审核才能显示。请耐心。"
+        description: "我们已经收到了你的发帖，不过帖子需要由版主审核才能显示。请耐心等待。"
         pending_posts:
-          other: "你有 <strong>{{count}}</strong> 个帖子待审核。"
+          other: "你有 <strong>{{count}}</strong> 个帖子在等待审核中。"
         ok: "确认"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a>发表了<a href='{{topicUrl}}'>该主题</a>"
@@ -465,7 +476,7 @@ zh_CN:
     directory:
       filter_name: "按用户名筛选"
       title: "用户"
-      likes_given: "送出赞"
+      likes_given: "点赞"
       likes_received: "获得赞"
       topics_entered: "浏览"
       topics_entered_long: "浏览主题"
@@ -478,7 +489,8 @@ zh_CN:
       days_visited: "访问"
       days_visited_long: "访问天数"
       posts_read: "阅读"
-      posts_read_long: "阅读帖子"
+      posts_read_long: "看帖"
+      last_updated: "最近更新："
       total_rows:
         other: "%{count} 位用户"
     group_histories:
@@ -503,6 +515,7 @@ zh_CN:
         deny: "拒绝"
         denied: "已拒绝"
         undone: "撤销请求"
+        handle: "处理成员请求"
       manage:
         title: "管理"
         name: "名字"
@@ -533,7 +546,7 @@ zh_CN:
       empty:
         posts: "群组成员没有发布帖子。"
         members: "群组没有成员。"
-        requests: "没有用户请求成为此群组的成员"
+        requests: "没有请求加入此群组的请求。"
         mentions: "群组从未被提及过。"
         messages: "群组从未发送过私信。"
         topics: "群组的成员从未发表主题。"
@@ -543,7 +556,7 @@ zh_CN:
       leave: "离开"
       request: "请求"
       message: "私信"
-      confirm_leave: "你确定你要离开这个团队吗？"
+      confirm_leave: "你确定要离开这个群组吗？"
       allow_membership_requests: "允许用户向群组所有者发送成员资格请求（需要公开可见的群组）"
       membership_request_template: "用户发送会员请求时向其显示的自定义模板"
       membership_request:
@@ -551,7 +564,7 @@ zh_CN:
         title: "申请加入%{group_name}"
         reason: "向群组拥有者说明你为何属于这个群组"
       membership: "成员资格"
-      name: "群组ID"
+      name: "名称"
       group_name: "群组名"
       user_count: "用户"
       bio: "关于群组"
@@ -563,14 +576,14 @@ zh_CN:
         empty: "没有可见的群组。"
         filter: "根据群组类型筛选"
         owner_groups: "拥有的群组"
-        close_groups: "封闭群组"
+        close_groups: "关闭的群组"
         automatic_groups: "自动分组"
         automatic: "自动"
         closed: "已关闭"
         public: "公开"
         private: "私密"
-        public_groups: "公开群组"
-        automatic_group: 自动群组
+        public_groups: "公开的群组"
+        automatic_group: 自动分组
         close_group: 关闭群组
         my_groups: "我的群组"
         group_type: "群组类别"
@@ -601,7 +614,7 @@ zh_CN:
         messageable: "谁能私信此群组"
         nobody: "没有人"
         only_admins: "管理员"
-        mods_and_admins: "版主与管理员"
+        mods_and_admins: "仅版主和管理员"
         members_mods_and_admins: "组员、版主与管理员"
         owners_mods_and_admins: "仅群组成员、版主与管理员"
         everyone: "任何人"
@@ -610,7 +623,7 @@ zh_CN:
           title: "跟踪"
           description: "你将会在该私信中的每个新帖子发布后收到通知，并且会显示新回复数量。"
         watching_first_post:
-          title: "监看头一帖"
+          title: "监看新主题"
           description: "你将收到有关此组中新消息的通知，但不会回复消息。"
         tracking:
           title: "跟踪"
@@ -631,13 +644,13 @@ zh_CN:
       flair_preview_icon: "预览图标"
       flair_preview_image: "预览图片"
     user_action_groups:
-      "1": "送出赞"
+      "1": "点赞赞"
       "2": "获得赞"
       "3": "收藏"
       "4": "主题"
       "5": "回复"
       "6": "回应"
-      "7": "@我的"
+      "7": "提及"
       "9": "引用"
       "11": "编辑"
       "12": "发送"
@@ -665,9 +678,9 @@ zh_CN:
       topic_sentence:
         other: "%{count} 主题"
       topic_stat_sentence_week:
-        other: "%{count}上周新帖。"
+        other: "过去一周有%{count}个新主题。"
       topic_stat_sentence_month:
-        other: "%{count}上月新帖。"
+        other: "过去一个月有%{count}个新主题。"
       n_more: "分类 (还有%{count}个分类) ..."
     ip_lookup:
       title: IP 地址查询
@@ -726,6 +739,7 @@ zh_CN:
         clear:
           title: "清除"
           warning: "你确定要清除精选主题吗？"
+      use_current_timezone: "使用现在的时区"
       profile_hidden: "此用户公共信息已被隐藏。"
       expand_profile: "展开"
       collapse_profile: "折叠"
@@ -782,22 +796,22 @@ zh_CN:
         warning: "邮件列表模式启用。邮件通知设置被覆盖。"
       tag_settings: "标签"
       watched_tags: "关注"
-      watched_tags_instructions: "你将自动关注有这些标签的所有主题。所有新帖子和新主题会通知你，新帖数量也会显示在主题旁边。"
+      watched_tags_instructions: "你将自动关注所有含有这些标签的主题。你会收到所有新帖子和主题的通知，且新帖子的数量也会显示在主题旁边。"
       tracked_tags: "跟踪"
-      tracked_tags_instructions: "你将自动跟踪这些标签的所有主题，新帖数量将会显示在主题旁边。"
+      tracked_tags_instructions: "你将自动跟踪所有含有这些标签的主题，新帖数量将会显示在主题旁边。"
       muted_tags: "静音"
       muted_tags_instructions: "你将不会收到有这些标签的新主题任何通知，它们也不会出现在“最新”主题列表。"
       watched_categories: "监看"
-      watched_categories_instructions: "你将自动关注这些分类中的所有主题。所有新帖子和新主题会通知你，新帖数量也将显示在主题旁边。"
+      watched_categories_instructions: "你将自动关注这些分类中的所有主题。你会收到所有新帖子和新主题的通知，新帖数量也会显示在主题旁边。"
       tracked_categories: "跟踪"
       tracked_categories_instructions: "你将自动跟踪这些分类中的所有主题。新帖数量将会显示在主题旁边。"
-      watched_first_post_categories: "监看头一帖"
+      watched_first_post_categories: "监看新主题"
       watched_first_post_categories_instructions: "在这些分类里面，每一个新主题的第一帖会通知你。"
-      watched_first_post_tags: "监看头一帖"
+      watched_first_post_tags: "监看新主题"
       watched_first_post_tags_instructions: "在有了这些标签的每一个新主题，第一帖会通知你。"
       muted_categories: "静音"
       muted_categories_instructions: "你不会收到有关这些分类中新主题的任何通知，也不会出现在类别或最新页面上。"
-      muted_categories_instructions_dont_hide: "你不会收到这些组内关于新主题中的通知。"
+      muted_categories_instructions_dont_hide: "你将不会收到在这些分类中的新主题通知。"
       no_category_access: "无法保存，作为审核人你仅具有受限的 分类 访问权限"
       delete_account: "删除我的账户"
       delete_account_confirm: "你真的要永久删除自己的账户吗？删除之后无法恢复！"
@@ -808,8 +822,8 @@ zh_CN:
       users: "用户"
       muted_users: "静音"
       muted_users_instructions: "抑制来自这些用户的所有通知。"
-      ignored_users: "忽略"
-      ignored_users_instructions: "取消所有帖子和来自这些用户的通知。"
+      ignored_users: "忽视"
+      ignored_users_instructions: "封禁所有来自这些用户的帖子和通知。"
       tracked_topics_link: "显示"
       automatically_unpin_topics: "当我完整阅读了主题时自动解除置顶。"
       apps: "应用"
@@ -826,6 +840,7 @@ zh_CN:
         deleted_posts: "已删除"
         suspensions: "封禁"
         warnings_received: "警告"
+        rejected_posts: "被驳回的帖子"
       messages:
         all: "所有"
         inbox: "收件箱"
@@ -875,7 +890,7 @@ zh_CN:
         title: "双重验证"
         enable: "管理两步验证"
         forgot_password: "忘记密码？"
-        confirm_password_description: "确认密码以继续"
+        confirm_password_description: "请确认密码后继续"
         name: "名称"
         label: "编码"
         rate_limit: "请等待另一个验证码。"
@@ -884,11 +899,11 @@ zh_CN:
         disable_description: "请输入来自 app 的验证码"
         show_key_description: "手动输入"
         short_description: |
-          使用一次性安全码保护你的帐户。
+          使用一次性安全码保护你的账户。
         extended_description: |
-          双重身份验证除了你的密码之外还需要一次性令牌，从而为你的帐户增加了额外的安全性。 可以在<a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a>和<a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a>设备。
-        oauth_enabled_warning: "请注意，一旦你的帐户启用了双重身份验证，系统就会停用社交登录。"
-        use: "使用身份验证器app"
+          双重验证要求你的密码之外的一次性令牌，从而为你的账户增加了额外的安全性。可以在<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: "请注意，一旦你的账户启用了双重验证，社交登录将被停用。"
+        use: "使用身份验证器应用"
         enforced_notice: "在访问此站点之前，你需要启用双重身份验证。"
         disable: "停用"
         disable_title: "禁用次要身份验证器"
@@ -901,6 +916,7 @@ zh_CN:
           title: "基于凭证的身份验证器"
           add: "新增身份验证器"
           default_name: "我的身份验证器"
+          name_and_code_required_error: "你必须提供你的身份验证器应用的名称和代码。"
         security_key:
           register: "注册"
           title: "安全密钥"
@@ -911,6 +927,7 @@ zh_CN:
           edit: "编辑安全密钥"
           edit_description: "安全密钥名称"
           delete: "删除"
+          name_required_error: "你必须提供安全密钥的名称。"
       change_about:
         title: "更改个人信息"
         error: "提交修改时出错了"
@@ -927,10 +944,10 @@ zh_CN:
         success_staff: "我们已经发送了一封确认信到你现在的邮箱，请按照邮件内指示完成确认。"
       change_avatar:
         title: "更换头像"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>头像，基于："
-        gravatar_title: "在 Gravatar 网站上更改你的头像"
-        gravatar_failed: "我们找不到包含该电子邮件地址的Gravatar。"
-        refresh_gravatar_title: "刷新你的 Gravatar 头像"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>，基于"
+        gravatar_title: "在{{gravatarName}}网站修改你的头像"
+        gravatar_failed: "我们无法找到此电子邮件的{{gravatarName}}。"
+        refresh_gravatar_title: "刷新你的{{gravatarName}}"
         letter_based: "默认头像"
         uploaded_avatar: "自定义图片"
         uploaded_avatar_empty: "上传自定义图片"
@@ -951,10 +968,10 @@ zh_CN:
         secondary: "次邮箱"
         no_secondary: "没有次邮箱"
         sso_override_instructions: "电子邮件地址可以通过SSO登录来更新。"
-        instructions: "绝不会被公开显示。"
+        instructions: "绝不会被公开显示"
         ok: "将通过邮件验证确认"
         invalid: "请填写正确的邮箱地址"
-        authenticated: "邮箱已经由 {{provider}} 验证了。"
+        authenticated: "你的邮箱已被{{provider}}验证过了"
         frequency_immediately: "如果你没有阅读过摘要邮件中的相关内容，将立即发送电子邮件给你。"
         frequency:
           other: "仅在 {{count}} 分钟内没有访问时发送邮件给你。"
@@ -992,6 +1009,9 @@ zh_CN:
         any: "任意"
       password_confirmation:
         title: "请再次输入密码"
+      invite_code:
+        title: "邀请码"
+        instructions: "账户注册需要邀请码"
       auth_tokens:
         title: "最近使用的设备"
         ip: "IP"
@@ -1004,7 +1024,7 @@ zh_CN:
         was_this_you: "这是你吗？"
         was_this_you_description: "如果不是你，我们建议你更改密码并在任何地方注销。"
         browser_and_device: "{{browser}}在{{device}}"
-        secure_account: "保护我的帐户"
+        secure_account: "保护我的账户"
         latest_post: "你上次发布了......"
       last_posted: "最后发帖"
       last_emailed: "最后邮寄"
@@ -1046,13 +1066,13 @@ zh_CN:
         every_month: "每月"
         every_six_months: "每6个月"
       email_level:
-        title: "当有人引用和回复我的帖子、@我或邀请我至主题时，发送邮件提醒"
+        title: "当有人引用和回复我的帖子、@我或邀请我至主题时，给我发送邮件"
         always: "始终"
         only_when_away: "只在离开时"
         never: "从不"
-      email_messages_level: "有人发私信给我时邮件提醒"
+      email_messages_level: "有人给我发送消息时给我发送邮件"
       include_tl0_in_digests: "摘要邮件中包含新用户的内容"
-      email_in_reply_to: "邮件中包含回复你的内容节选"
+      email_in_reply_to: "在邮件中包含回复内容的节选"
       other_settings: "其它"
       categories_settings: "分类"
       new_topic_duration:
@@ -1115,15 +1135,15 @@ zh_CN:
           text: "通过文件批量邀请"
           success: "文件上传成功，当操作完成时将通过私信通知你。"
           error: "抱歉，文件必须是CSV格式。"
-          confirmation_message: "你将发邮件邀请上传的文件中的所有人。"
+          confirmation_message: "你将通过电子邮件将邀请发送给在上传的文件中的每一个人。"
       password:
         title: "密码"
         too_short: "密码过短"
-        common: "密码过于简单"
+        common: "密码过于常见"
         same_as_username: "密码不能与用户名相同"
         same_as_email: "密码不能与邮箱相同"
         ok: "密码符合要求"
-        instructions: "至少%{count}个字母。"
+        instructions: "至少%{count}个字符"
       summary:
         title: "概要"
         stats: "统计"
@@ -1156,7 +1176,7 @@ zh_CN:
         more_badges: "更多徽章"
         top_links: "热门链接"
         no_links: "暂无链接。"
-        most_liked_by: "谁赞最多"
+        most_liked_by: "谁赞得最多"
         most_liked_users: "赞谁最多"
         most_replied_to_users: "最多回复至"
         no_likes: "暂无赞。"
@@ -1203,6 +1223,9 @@ zh_CN:
         back: "返回"
         again: "重试"
         fixed: "载入"
+    modal:
+      close: "关闭"
+      dismiss_error: "忽略错误"
     close: "关闭"
     assets_changed_confirm: "网站刚更新了，刷新使用新版本？"
     logout: "你已登出用户。"
@@ -1211,6 +1234,12 @@ zh_CN:
       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, one {仅有<strong>#</strong>个主题} other {共有 <strong>#</strong>个主题}}和{currentPosts, plural, one {<strong>#</strong>个帖子} other {<strong>#</strong>个帖子}}。访客需要更多的阅读和回复——我们建议至少 {requiredTopics, plural, one {<strong>#</strong>个主题} other {<strong>#</strong>个主题}}和{requiredPosts, plural, one {<strong>#</strong>个帖子} other {<strong>#</strong>个帖子}}。此消息仅管理人员可见。
+    too_few_topics_notice_MF: >-
+      让我们<a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">开始讨论吧！</a>现{currentTopics, plural, one {仅有<strong>#</strong>个主题} other { 共有 <strong>#</strong>个主题}}。访客需要更多的阅读和回复——我们建议至少{requiredTopics, plural, one {<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, one {仅有<strong>#</strong>个帖子} other {共有<strong>#</strong>个帖子}}。访客需要更多的阅读和回复——我们建议至少{requiredPosts, plural, one {<strong>#</strong>个帖子} other {<strong>#</strong>个帖子}}。此消息仅管理人员可见。
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} other {# errors/hour}}</a>达到了站点设置中的限制{limit, plural, one {# error/hour} other {# errors/hour}}。"
       reached_minute_MF: "<b>{relativeAge}</b>1 – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} other {# errors/minute}}</a>已经达到站点设置限制 {limit, plural, one {# error/minute} other {# errors/minute}}。"
@@ -1242,8 +1271,8 @@ zh_CN:
       hide_session: "明天提醒我"
       hide_forever: "不了"
       hidden_for_session: "好的，我会在明天提醒你。不过你随时都可以使用“登录”来创建账户。"
-      intro: "你好！看起来你正在享受讨论，但你尚未注册帐户。"
-      value_prop: "当你创建了账户，我们就可以准确地记录你的阅读进度。这样你再次访问时就可以回到上次离开的地方。只要有人回复你，你也可以通过此处和电子邮件收到通知。而且你还可以赞帖子，向他人分享感激之情。:heartbeat:"
+      intro: "你好！看起来你正在享受讨论，但还没有注册一个账户。"
+      value_prop: "当你创建了账户，我们就可以准确地记录你的阅读进度，你再次访问时就可以回到之前离开的地方。当有人回复你，你可以通过这里或电子邮件收到通知。并且你还可以通过点赞帖子向他人分享你的喜爱之情。:heartbeat:"
     summary:
       enabled_description: "你正在查看主题的精简摘要版本：一些社区公认有意思的帖子。"
       description: "有 <b>{{replyCount}}</b> 个回复。"
@@ -1290,12 +1319,12 @@ zh_CN:
     email_login:
       link_label: "给我通过邮件发送一个登录链接"
       button_label: "通过邮件"
-      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>"
+      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>"
       confirm_title: "转入到%{site_name}"
       logging_in_as: "用%{email}登录"
       confirm_button: 登录完成
@@ -1370,7 +1399,7 @@ zh_CN:
       welcome_to: "欢迎来到%{site_name}！"
       invited_by: "邀请你的是："
       social_login_available: "你也可以通过任何使用这个邮箱的社交网站登录。"
-      your_email: "你的帐户邮箱地址是<b>%{email}</b>。"
+      your_email: "你的账户的邮箱地址为<b>%{email}</b>。"
       accept_invite: "接受邀请"
       success: "已创建你的账户，你现在可以登录了。"
       name_label: "昵称"
@@ -1420,7 +1449,7 @@ zh_CN:
         to_before_from: "截至日期必须晚于开始日期。"
     emoji_picker:
       filter_placeholder: 查找表情符号
-      smileys_&_emotion: 笑脸与表情
+      smileys_&_emotion: 笑脸与情感
       people_&_body: 人与身体
       animals_&_nature: 动物与自然
       food_&_drink: 饮食
@@ -1429,7 +1458,6 @@ zh_CN:
       objects: 物品
       symbols: 符号
       flags: 标记
-      custom: 自定义表情符号
       recent: 近期使用
       default_tone: 无肤色
       light_tone: 浅肤色
@@ -1437,6 +1465,7 @@ zh_CN:
       medium_tone: 中间肤色
       medium_dark_tone: 中深肤色
       dark_tone: 深肤色
+      default: 自定义表情符号
     shared_drafts:
       title: "共享草稿"
       notice: "只有那些可以看到<b>{{category}}</b>分类的人才能看到此主题。"
@@ -1472,7 +1501,7 @@ zh_CN:
         title_too_short: "标题过短，至少 {{min}} 个字"
         title_too_long: "标题过长，最多 {{max}} 个字"
         post_missing: "帖子不能为空"
-        post_length: "帖子至少应有 {{min}} 个字"
+        post_length: "帖子至少要有{{min}} 个字符"
         try_like: "试试{{heart}}按钮？"
         category_missing: "未选择分类"
         tags_missing: "你必须至少选择{{count}}个标签"
@@ -1575,6 +1604,8 @@ zh_CN:
           other: "{{count}} 个未读通知"
         message:
           other: "{{count}} 条未读私信"
+        high_priority:
+          other: "%{count}个未读的高优先级通知"
       title: "使用@提到你，回复你的内容、私信以及其他的通知"
       none: "现在无法载入通知"
       empty: "未发现通知"
@@ -1583,6 +1614,7 @@ zh_CN:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -1630,6 +1662,8 @@ zh_CN:
         posted: "新帖子"
         moved_post: "帖子已移动"
         linked: "链接"
+        bookmark_reminder: "收藏提醒"
+        bookmark_reminder_with_name: "收藏提醒 - %{name}"
         granted_badge: "勋章授予"
         invited_to_topic: "邀请到主题"
         group_mentioned: "群组提及"
@@ -1700,7 +1734,7 @@ zh_CN:
         filters:
           label: 只返回主题/帖子……
           title: 仅在标题中匹配
-          likes: 我给了赞的
+          likes: 我赞过的
           posted: 我参与发帖
           created: 我创建的
           watching: 我正在监看
@@ -1826,14 +1860,14 @@ zh_CN:
         login_required: "此主题需要登录后浏览。"
       server_error:
         title: "载入主题失败"
-        description: "抱歉，无法载入主题。网络连接可能出问题了。请重试一次。如果始终无法加载，请联系我们。"
+        description: "抱歉，无法加载该主题，有可能是网络连接出现了问题。请重试。如果问题依然存在，请联系我们。"
       not_found:
         title: "未找到主题"
         description: "抱歉，无法找到此主题。可能已经被删除了。"
       total_unread_posts:
         other: "这个主题中，你有 {{count}} 条未读的帖子"
       unread_posts:
-        other: "这个主题中，你有 {{count}} 条未读的帖子"
+        other: "这个主题中，你有 {{count}} 个未读的帖子"
       new_posts:
         other: "自你上一次阅读此主题后，又有 {{count}} 个新帖子发表了"
       likes:
@@ -1849,6 +1883,7 @@ zh_CN:
       group_request_sent: "你加入群组的请求已发送。当被接受时你会收到通知。"
       unread_indicator: "还没有成员读过此主题的最新帖子。"
       read_more_MF: "还有 { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 个未读主题</a>} other { <a href='{basePath}/unread'># 个未读主题</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{和 } false {} other{}} <a href='{basePath}/new'>1 个新</a>主题} other { {BOTH, select, true{和 } false {} other{}} <a href='{basePath}/new'># 个近期</a>主题} }可以阅读，或者{CATEGORY, select, true {浏览{catLink}中的其他主题} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{首帖}：{创建于}\n{末帖}：{顶起于}"
       browse_all_categories: 浏览所有分类
       view_latest_topics: 查阅最新主题
       suggest_create_topic: 创建一个新的主题吧！
@@ -1859,12 +1894,13 @@ zh_CN:
         title: "主题计时器"
         save: "设置计时器"
         num_of_hours: "小时数："
+        num_of_days: "天数"
         remove: "撤销计时器"
         publish_to: "发布至："
         when: "时间："
         public_timer_types: 主题计时器
         private_timer_types: 用户主题计时器
-        time_frame_required: 请选择时间范围
+        time_frame_required: 请选择一个时间范围
       auto_update_input:
         none: "选择时间范围"
         later_today: "今天的某个时候"
@@ -1901,6 +1937,8 @@ zh_CN:
         title: "自动顶帖"
       reminder:
         title: "提醒我"
+      auto_delete_replies:
+        title: "自动删除回复"
       status_update_notice:
         auto_open: "本主题将在%{timeLeft}自动开启。"
         auto_close: "本主题将在%{timeLeft}自动关闭。"
@@ -1909,6 +1947,7 @@ zh_CN:
         auto_delete: "主题在%{timeLeft}后将被自动删除。"
         auto_bump: "此主题将在%{timeLeft}后自动顶起。"
         auto_reminder: "你将在%{timeLeft}后收到该主题的提醒。"
+        auto_delete_replies: "此主题的回复会在%{duration}后自动删除。"
       auto_close_title: "自动关闭设置"
       auto_close_immediate:
         other: "主题中的最后一帖是 %{hours} 小时前发出的，所以主题将会立即关闭。"
@@ -1935,16 +1974,16 @@ zh_CN:
         reasons:
           mailing_list_mode: "邮件列表模式已启用，将以邮件通知你关于该主题的回复。"
           "3_10": "因为你正监看该主题上的标签，你将会收到通知。"
-          "3_6": "因为你正在关注该分类，你将会收到通知。"
-          "3_5": "因为你开始自动监看该主题，你将会收到通知。"
-          "3_2": "因为你正在关注该主题，你将会收到通知。"
+          "3_6": "因为你正在监看该分类，你将会收到通知。"
+          "3_5": "因为你自动地开始监看该主题，你将会收到通知。"
+          "3_2": "因为你正在监看该主题，你将会收到通知。"
           "3_1": "因为你创建了这个主题，你将会收到通知。"
-          "3": "因为你正在关注该主题，你将会收到通知。"
+          "3": "因为你正在监看该主题，你将会收到通知。"
           "2_8": "因为你追踪了该分类，所以你会看到新回复的数量。"
-          "2_4": "因为你回复过该主题，所以你会看到新回复的数量。"
-          "2_2": "因为你追踪了该主题，所以你会看到新回复的数量。"
-          "2": '因为你<a href="{{basePath}}/u/{{username}}/preferences">读过该主题</a>，所以你会看到新回复的数量。'
-          "1_2": "如果有人@你或回复你，将通知你。"
+          "2_4": "你会看到新回复的数量的原因是你曾经回复过该主题。"
+          "2_2": "你会看到新回复数量的原因是你正在追踪该主题。"
+          "2": '你会看到新回复数量的原因是你<a href="{{basePath}}/u/{{username}}/preferences">阅读过该主题</a>。'
+          "1_2": "有人@你或回复你时会通知你。"
           "1": "如果有人@你或回复你，将通知你。"
           "0_7": "你将忽略关于该分类的所有通知。"
           "0_2": "你将忽略关于该主题的所有通知。"
@@ -1954,13 +1993,13 @@ zh_CN:
           description: "私信有新回复时提醒我，并显示新回复数量。"
         watching:
           title: "监看"
-          description: "在此主题里，每一个新回复将通知你，还将显示新回复的数量。"
+          description: "你将收到该主题所有新回复的通知，还会显示新回复的数量。"
         tracking_pm:
           title: "跟踪"
           description: "在私信标题后显示新回复数量。你只会在别人@你或回复你的帖子时才会收到通知。"
         tracking:
           title: "跟踪"
-          description: "将为该主题显示新回复的数量。如果有人@你或回复你，将通知你。"
+          description: "将为该主题显示新回复的数量。你会在有人@你或回复你的时候收到通知。"
         regular:
           title: "普通"
           description: "如果有人@你或回复你，将通知你。"
@@ -1969,10 +2008,10 @@ zh_CN:
           description: "如果有人@你或回复你，将通知你。"
         muted_pm:
           title: "静音"
-          description: "不会收到该私信的任何通知。"
+          description: "你永远都不会收到任何关于此私信的通知。"
         muted:
           title: "静音"
-          description: "你不会收到此主题的任何通知，它也不会出现在“最新”主题列表。"
+          description: "你不会收到关于此主题的任何通知，它也不会出现在“最新”主题列表中。"
       actions:
         title: "动作"
         recover: "撤销删除主题"
@@ -2077,7 +2116,7 @@ zh_CN:
       move_to:
         title: "移动到"
         action: "移动到"
-        error: "移动话题时发生了错误。"
+        error: "移动帖子时发生了错误。"
       split_topic:
         title: "拆分主题"
         action: "拆分主题"
@@ -2090,28 +2129,39 @@ zh_CN:
         title: "合并主题"
         action: "合并主题"
         error: "合并主题时发生错误。"
-        radio_label: "已存在的主题"
+        radio_label: "现存的主题"
         instructions:
           other: "请选择一个主题以便移动这 <b>{{count}}</b> 个帖子。"
       move_to_new_message:
         title: "移动到新的即时信息"
-        action: "移动到新的即时信息"
-        message_title: "新信息的标题"
-        radio_label: "发新私信"
+        action: "移动到新的私信"
+        message_title: "新私信的标题"
+        radio_label: "创建新私信"
         participants: "参与者"
         instructions:
           other: "你正在发送<b>{{count}}</b>篇帖子到一条新的私信/消息。"
       move_to_existing_message:
-        title: "移动到已有私信/消息"
-        action: "移动到已有私信/消息"
-        radio_label: "已有私信/消息"
+        title: "移动到现存的私信"
+        action: "移动到已存在的私信"
+        radio_label: "现存的私信"
         participants: "参与者"
         instructions:
-          other: "请你选择一个私信/消息以便移动到<b>{{count}}</b>。"
+          other: "请选择你要将<b>{{count}}</b>个帖子所移动到的私信。"
       merge_posts:
         title: "合并选择的帖子"
         action: "合并选择的帖子"
         error: "合并帖子时发生了错误。"
+      publish_page:
+        publish: "出版"
+        description: "当一个主题被出版为一个页面时，其链接是共享的，并且会以自定义的样式显示。"
+        slug: "Slug"
+        publish_url: "你的页面已出版于："
+        topic_published: "你的主题已出版于："
+        preview_url: "你的页面将出版于："
+        invalid_slug: "抱歉，您不能出版此页面。"
+        unpublish: "取消出版"
+        unpublished: "你的页面已经取消出版并且不再可用。"
+        publishing_settings: "出版设置"
       change_owner:
         title: "更改所有者"
         action: "更改作者"
@@ -2119,6 +2169,8 @@ zh_CN:
         placeholder: "新作者的用户名"
         instructions:
           other: "请选择<b>@{{old_user}}</b>创建的{{count}}个帖子的新作者。"
+        instructions_without_old_user:
+          other: "请为此{{count}}个帖子选择一个新的拥有者。"
       change_timestamp:
         title: "修改时间"
         action: "修改时间"
@@ -2140,7 +2192,7 @@ zh_CN:
         select_below:
           label: "选择 +以下"
           title: "选择帖子及其后的所有内容"
-        delete: 删除所选
+        delete: 删除所选项
         cancel: 取消选择
         select_all: 全选
         deselect_all: 全不选
@@ -2210,7 +2262,7 @@ zh_CN:
       few_likes_left: "谢谢你的热情！你今天的赞快用完了。"
       controls:
         reply: "开始撰写本帖的回复"
-        like: "赞一下此帖"
+        like: "点赞此帖"
         has_liked: "已赞"
         read_indicator: "阅读了帖子的用户"
         undo_like: "取消赞"
@@ -2322,13 +2374,18 @@ zh_CN:
             button: "HTML"
       bookmarks:
         create: "创建收藏夹"
+        edit: "编辑收藏"
+        created: "创建日期"
         name: "名称"
-        name_placeholder: "命名收藏夹以帮助你记忆"
-        set_reminder: "设置一个提醒"
+        name_placeholder: "这个收藏是做什么用的？"
+        set_reminder: "提醒我"
         actions:
           delete_bookmark:
             name: "删除收藏"
             description: "从你的个人资料中删除收藏并停止所有有关该收藏的提醒"
+          edit_bookmark:
+            name: "编辑收藏"
+            description: "编辑收藏名称或修改提醒的日期和时间"
     category:
       can: "能够&hellip; "
       none: "（未分类）"
@@ -2344,13 +2401,13 @@ zh_CN:
       tags_allowed_tags: "限制这些标签只能用在此分类"
       tags_allowed_tag_groups: "限制这些标签组只能用在此分类"
       tags_placeholder: "（可选）允许使用的标签列表"
-      tags_tab_description: "上面指定的标签和标签组仅在此分类以及其它也指定了的类别中可用。它们将无法在其它类别中使用。"
+      tags_tab_description: "上面所指定的标签和标签组仅在此分类以及其它也指定了它们的分类中可用。它们将无法在其它分类中使用。"
       tag_groups_placeholder: "（可选）允许使用的标签组列表"
       manage_tag_groups_link: "管理这里的标签组。"
-      allow_global_tags_label: "总是允许其它标题"
+      allow_global_tags_label: "也允许其它标签"
       tag_group_selector_placeholder: "（可选）标签组"
       required_tag_group_description: "要求新主题包含标签组中的标签："
-      min_tags_from_required_group_label: "Num标签:"
+      min_tags_from_required_group_label: "标签数量："
       required_tag_group_label: "标签组："
       topic_featured_link_allowed: "允许在该分类中发布特色链接标题"
       delete: "删除分类"
@@ -2370,7 +2427,7 @@ zh_CN:
       background_color: "背景色"
       foreground_color: "前景色"
       name_placeholder: "应该简明扼要。"
-      color_placeholder: "任何网页颜色"
+      color_placeholder: "任意网页颜色"
       delete_confirm: "你确定要删除此分类吗？"
       delete_error: "在删除此分类时发生了错误。"
       list: "列出分类"
@@ -2378,9 +2435,9 @@ zh_CN:
       change_in_category_topic: "访问分类主题来编辑描述信息"
       already_used: "此色彩已经被另一个分类使用"
       security: "安全性"
-      special_warning: "警告：这个分类是已经自动建立好的分类，它的安全设置不能被更改。如果你不想要使用这个分类，直接删除它，而不是另作他用。"
+      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: "自定义进站电子邮件地址："
@@ -2398,7 +2455,7 @@ zh_CN:
       default_top_period: "默认热门时长："
       allow_badges_label: "允许在此分类中授予徽章"
       edit_permissions: "编辑权限"
-      reviewable_by_group: "除了工作人员之外，也可以审核该分类中的帖子和标记的人："
+      reviewable_by_group: "管理人员之外，可以审核该分类中的帖子和标记的人："
       review_group_name: "群组名"
       require_topic_approval: "所有新主题需要版主审批"
       require_reply_approval: "所有新回复需要版主审批"
@@ -2407,19 +2464,19 @@ zh_CN:
       default_position: "默认位置"
       position_disabled: "分类按照其活跃程度的顺序显示。要固定分类列表的显示顺序，"
       position_disabled_click: '启用“固定分类位置”设置。'
-      minimum_required_tags: "在一个主题中允许的最少标签数量："
+      minimum_required_tags: "在一个主题中至少含有多少个标签："
       parent: "上级分类"
       num_auto_bump_daily: "每天自动碰撞的主题的数量"
       navigate_to_first_post_after_read: "阅读主题后导航到第一个帖子"
       notifications:
         watching:
-          title: "关注"
-          description: "你将自动关注这些分类中的所有主题。每一个主题的每一个新帖，将通知你，还将显示新回复的数量。"
+          title: "监看"
+          description: "你将自动关注这些分类中的所有主题。你会收到所有新主题中的每一个新帖的通知，还会显示新回复的数量。"
         watching_first_post:
-          title: "监看头一帖"
-          description: "您将收到此类别中的新主题的通知，但别人回复主题不会给您发送通知。"
+          title: "监看新主题"
+          description: "你将收到此分类中的新主题通知，不包括回复。"
         tracking:
-          title: "跟踪"
+          title: "追踪"
           description: "你将自动跟踪这些分类中的所有主题。如果有人@你或回复你，将通知你，还将显示新回复的数量。"
         regular:
           title: "普通"
@@ -2431,7 +2488,7 @@ zh_CN:
         label: "搜索优先级"
         options:
           normal: "普通"
-          ignore: "忽略"
+          ignore: "忽视"
           very_low: "非常低"
           low: "低"
           high: "高"
@@ -2605,7 +2662,7 @@ zh_CN:
         yearly:
           title: "年度"
         quarterly:
-          title: "季度的"
+          title: "季度"
         monthly:
           title: "月度"
         weekly:
@@ -2614,7 +2671,7 @@ zh_CN:
           title: "每天"
         all_time: "不限时间"
         this_year: "年"
-        this_quarter: "季度"
+        this_quarter: "季"
         this_month: "月"
         this_week: "周"
         today: "今天"
@@ -2626,8 +2683,8 @@ zh_CN:
       readonly: "阅读"
     lightbox:
       download: "下载"
-      previous: "之前的（左方向键）"
-      next: "继续（右方向键）"
+      previous: "上一个（左方向键）"
+      next: "下一个（右方向键）"
       counter: "%curr% / %total%"
       close: "关闭(Esc)"
       content_load_error: '<a href="%url%">内容</a>无法加载'
@@ -2675,6 +2732,18 @@ zh_CN:
         title: "编辑"
         return: "%{shortcut}返回编辑器"
         fullscreen: "%{shortcut}全屏编辑器"
+      bookmarks:
+        title: "收藏"
+        enter: "%{shortcut} 保存并关闭"
+        later_today: "%{shortcut} 今天晚些时候"
+        later_this_week: "%{shortcut} 本周的晚些时候"
+        tomorrow: "%{shortcut} 明天"
+        next_week: "%{shortcut} 下周"
+        next_month: "%{shortcut} 下个月"
+        next_business_week: "%{shortcut} 下周开始"
+        next_business_day: "%{shortcut} 下个工作日"
+        custom: "%{shortcut} 自定义日期和时间"
+        none: "%{shortcut} 没有提醒"
       actions:
         title: "动作"
         bookmark_topic: "%{shortcut} 切换主题收藏状态"
@@ -2697,6 +2766,10 @@ zh_CN:
         print: "%{shortcut} 打印主题"
         defer: "%{shortcut}延迟主题"
         topic_admin_actions: "%{shortcut}打开主题管理"
+      search_menu:
+        title: "搜索菜单"
+        prev_next: "%{shortcut}上下移动所选内容"
+        insert_url: "%{shortcut}将选定内容插入到打开的编辑器"
     badges:
       earned_n_times:
         other: "已获得此徽章 %{count} 次"
@@ -2782,19 +2855,19 @@ zh_CN:
       notifications:
         watching:
           title: "监看"
-          description: "你将自动监看该标签中的所有主题。你将收到所有新帖子和主题的通知，此外，主题旁边还会显示未读和新帖子的数量。"
+          description: "你将自动监看所有含有此标签的主题。你将收到所有新帖子和主题的通知，此外，主题旁边还会显示未读和新帖子的数量。"
         watching_first_post:
-          title: "关注第一条帖子"
-          description: "您将收到此标签中的新主题的通知，但对主题的回复不会再给您发送通知。"
+          title: "监控新主题"
+          description: "你将会收到此标签中的新主题的通知，但对主题的回复则不会。"
         tracking:
           title: "跟踪"
-          description: "你将使用此标签自动跟踪所有主题。未读和新帖计数将显示在主题旁。"
+          description: "你将自动监看所有含有此标签的主题。未读和新帖的计数将显示在主题旁边。"
         regular:
           title: "普通"
-          description: "如果有人@你或回复你的帖子，将通知你。"
+          description: "有人@你或回复你的帖子时将会通知你"
         muted:
           title: "静音"
-          description: "你不会收到有关此标签的新主题的任何通知，也不会显示在未读标签上。"
+          description: "你不会收到任何含有此标签的新主题的通知，也不会在未读栏。"
       groups:
         title: "标签组"
         about: "将标签分组以便管理。"
@@ -2833,7 +2906,7 @@ zh_CN:
     invite:
       custom_message: "通过编写<a href>自定义消息</a>，使你的邀请更个性化。"
       custom_message_placeholder: "输入留言"
-      custom_message_template_forum: "你好，你应该来我们这个论坛！"
+      custom_message_template_forum: "你好，你应该加入这个论坛！"
       custom_message_template_topic: "你好，我觉得你可能会喜欢这个主题！"
     forced_anonymous: "由于极端负载，暂时向所有人显示，已注销用户会看到它。"
     safe_mode:
@@ -2846,7 +2919,7 @@ zh_CN:
       tags:
         remove_muted_tags_from_latest:
           always: "始终"
-          only_muted: "单独使用或与其他静音标签一起使用时"
+          only_muted: "单独或与其它静音的标签一起使用时"
           never: "从不"
       reports:
         title: "可用报告列表"
@@ -3096,6 +3169,9 @@ zh_CN:
         notification_event:
           name: "通知事件"
           details: "当用户在其feed中收到通知时。"
+        user_badge_event:
+          name: "徽章授予事件"
+          details: "当一个用户收到一个徽章时。"
         delivery_status:
           title: "分发状态"
           inactive: "不活跃"
@@ -3243,6 +3319,7 @@ zh_CN:
           theme_name: "主题名称"
           component_name: "组件名称"
           themes_intro: "选择现有主题或安装新主题即可开始使用"
+          themes_intro_emoji: "女艺术家表情符号"
           beginners_guide_title: "使用Discourse主题的初学者指导"
           developers_guide_title: "Discourse主题的开发者指导"
           browse_themes: "浏览社区主题"
@@ -3318,7 +3395,7 @@ zh_CN:
           install: "安装"
           installed: "已安装"
           install_popular: "热门"
-          install_upload: "来自您的设备"
+          install_upload: "来自你的设备"
           install_git_repo: "从 git 仓库"
           install_create: "创建新的"
           about_theme: "关于"
@@ -3468,6 +3545,7 @@ zh_CN:
         format: "格式"
         html: "html"
         text: "text"
+        html_preview: "预览邮件内容"
         last_seen_user: "用户最后登录时间:"
         no_result: "没有找到摘要信息。"
         reply_key: "回复关键字"
@@ -3483,7 +3561,7 @@ zh_CN:
             title: "进站邮件详情"
             error: "错误"
             headers: "头部"
-            subject: "主题"
+            subject: "标题"
             body: "内容"
             rejection_message: "拒绝邮件"
           filters:
@@ -3562,7 +3640,7 @@ zh_CN:
             delete_topic: "删除主题"
             recover_topic: "撤销删除帖子"
             delete_post: "删除帖子"
-            impersonate: "检视"
+            impersonate: "模拟用户"
             anonymize_user: "匿名用户"
             roll_up: "回退 IP 封禁"
             change_category_settings: "更改分类设置"
@@ -3622,6 +3700,8 @@ zh_CN:
             api_key_update: "更新api密钥"
             api_key_destroy: "销毁api密钥"
             override_upload_secure_status: "覆盖上传安全状态"
+            page_published: "页面已出版"
+            page_unpublished: "页面未出版"
         screened_emails:
           title: "已屏蔽的邮件地址"
           description: "当有人试图用以下邮件地址注册时，将受到阻止或其它系统操作。"
@@ -3637,7 +3717,7 @@ zh_CN:
           title: "已屏蔽的 IP"
           description: '受监视的 IP 地址，使用“放行”可将 IP 地址加入白名单。'
           delete_confirm: "确定要撤销对 IP 地址为 %{ip_address} 的规则？"
-          roll_up_confirm: "你确定要将常用的已屏蔽的 IP 地址归类为子网地址吗？"
+          roll_up_confirm: "你确定要将常用屏蔽 IP 地址归类为子网地址吗？"
           rolled_up_some_subnets: "成功地折叠了 IP 封禁记录至这些子网： %{subnets}。"
           rolled_up_no_subnet: "没有可折叠内容。"
           actions:
@@ -3683,7 +3763,7 @@ zh_CN:
           block: "封禁"
           censor: "审查"
           require_approval: "需要审核"
-          flag: "旗标"
+          flag: "标记"
         action_descriptions:
           block: "防止发布包含这些敏感词的帖子。用户提交帖子时会收到错误提示。"
           censor: "允许包含这些敏感词的帖子，但将其替换为隐藏敏感词的字符。"
@@ -3705,10 +3785,10 @@ zh_CN:
           found_matches: "发现匹配："
           no_matches: "无符合的结果"
       impersonate:
-        title: "检视用户视角"
-        help: "使用此工具来检视其他用户的账户以方便调试。你应该在完成后立即退出。"
+        title: "模拟用户"
+        help: "使用此工具来模拟一个用户账户以方便调试。你应该在完成后立即注销。"
         not_found: "无法找到该用户。"
-        invalid: "抱歉，你不能以此用户角度检视。"
+        invalid: "抱歉，你不能模拟此用户。"
       users:
         title: "用户"
         create: "添加管理员用户"
@@ -3724,7 +3804,6 @@ zh_CN:
           staff: "管理人员"
           suspended: "禁止登录"
           silenced: "已禁言"
-          suspect: "怀疑"
           staged: "暂存"
         approved: "已批准？"
         titles:
@@ -3741,7 +3820,6 @@ zh_CN:
           moderators: "版主"
           silenced: "已禁言的用户"
           suspended: "已封禁的用户"
-          suspect: "嫌疑用户"
           staged: "暂存用户"
         not_verified: "未验证"
         check_email:
@@ -3790,7 +3868,7 @@ zh_CN:
         staged: "暂存？"
         show_admin_profile: "管理员"
         show_public_profile: "显示公开介绍"
-        impersonate: "检视角度"
+        impersonate: "模拟用户"
         action_logs: "操作日志"
         ip_lookup: "IP 查询"
         log_out: "退出"
@@ -3808,7 +3886,7 @@ zh_CN:
         reputation: 声誉
         permissions: 权限
         activity: 活动
-        like_count: 送出赞 / 获得赞
+        like_count: 点赞 / 获赞
         last_100_days: "在最近 100 天"
         private_topics_count: 私有主题数量
         posts_read_count: 已阅帖子数量
@@ -3869,6 +3947,7 @@ zh_CN:
           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: "信任等级已经被锁定，系统将不会升降用户的信任等级"
@@ -3890,7 +3969,7 @@ zh_CN:
           posts_read_all_time: "已读的帖子（全部）"
           flagged_posts: "被标记的帖子"
           flagged_by_users: "标记其的用户"
-          likes_given: "送出赞"
+          likes_given: "点赞"
           likes_received: "获得赞"
           likes_received_days: "获得赞：独立天数"
           likes_received_users: "获得赞：每用户"
@@ -4079,7 +4158,8 @@ zh_CN:
             with_post_time: "<span class=\"username\">%{username}</span> 因在 <span class=\"time\">%{time}</span> 时的 %{link} 帖子"
             with_time: "<span class=\"username\">%{username}</span> 在 <span class=\"time\">%{time}</span>"
         badge_intro:
-          title: "选择现有徽章或创建新徽章来开始"
+          title: "选择现一个现有的徽章或创建一个新的徽章来开始使用"
+          emoji: "女学生表情符号"
           what_are_badges_title: "什么是徽章？"
           badge_query_examples_title: "徽章查询示例"
         mass_award:
@@ -4096,7 +4176,9 @@ zh_CN:
         help: "增加所有人可用的 emoji。（高端技巧：一次性拖进多个文件）"
         add: "增加新的 Emoji"
         name: "名称"
+        group: "群组"
         image: "图片"
+        alt: "自定义表情符号预览"
         delete_confirm: "你确定要删除 :%{name}: emoji 么？"
       embedding:
         get_started: "如果你想要将 Discourse 嵌入至其他网站，添加他们的主机地址。"
@@ -4104,7 +4186,7 @@ zh_CN:
         sample: "使用下列 HTML 代码至你的站点创建和嵌入 Discourse 主题。把<b>REPLACE_ME</b> 替换成你将嵌入至的网址。"
         title: "嵌入"
         host: "允许的主机"
-        class_name: "class 名"
+        class_name: "类名"
         path_whitelist: "路径白名单"
         edit: "编辑"
         category: "发布到分类"
@@ -4116,13 +4198,14 @@ zh_CN:
         embed_post_limit: "嵌入的最大帖子数量。"
         embed_title_scrubber: "从帖子中提取标题的正则表达式"
         embed_truncate: "截断嵌入的帖子"
+        embed_unlisted: "直到有一个回复前，导入的主题不会被列出。"
         embed_whitelist_selector: "允许嵌入的CSS选择器"
         embed_blacklist_selector: "移除嵌入的CSS选择器"
         embed_classname_whitelist: "允许CSS类名"
         save: "保存嵌入设置"
       permalink:
         title: "永久链接"
-        description: "请注意，这仅适用于外部资源，论坛上发布的链接不会被重定向。"
+        description: "所应用的重定向链接无法被论坛识别。"
         url: "URL"
         topic_id: "主题 ID"
         topic_title: "主题"
@@ -4131,6 +4214,7 @@ zh_CN:
         category_id: "分类 ID"
         category_title: "分类"
         external_url: "外部 URL"
+        destination: "目标"
         delete_confirm: 你确定要删除该永久链接？
         form:
           label: "新："
@@ -4144,7 +4228,7 @@ zh_CN:
           title: "替换文本"
           subtitle: "用最新的翻译替换系统生成的类别和主题的文本"
           categories: "分类"
-          topics: "话题"
+          topics: "主题"
           replace: "替换"
   wizard_js:
     wizard:
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 80d0e7920c..1adf3edcff 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -27,7 +27,6 @@ zh_TW:
     dates:
       time: "h:mm a"
       timeline_date: "YYYY年 M月"
-      long_no_year: "M月 D日, h:mm a"
       long_no_year_no_time: "M月 D日"
       full_no_year_no_time: "M月 D日"
       long_with_year: "YYYY年 M月 D日 h:mm a"
@@ -238,6 +237,12 @@ zh_TW:
       remove: "移除書籤"
       confirm_clear: "確定要移除該話題上的所有書籤嗎？"
       save: "儲存"
+      reminders:
+        later_today: "今日稍晚"
+        tomorrow: "明天"
+        next_week: "下週"
+        later_this_week: "本週稍晚"
+        next_month: "下個月"
     drafts:
       resume: "恢復"
       remove: "移除"
@@ -445,6 +450,7 @@ zh_TW:
         deny: "拒絕"
         denied: "被拒絕"
         undone: "請求未完成"
+        handle: "處理會員申請"
       manage:
         title: "管理"
         name: "名稱"
@@ -834,10 +840,6 @@ zh_TW:
         success_staff: "我們已傳送一封電子郵件至你目前的信箱。請根據確認指示進行操作。"
       change_avatar:
         title: "設定個人資料圖片"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, based on"
-        gravatar_title: "在 Gravatar 網站修改你的頭像"
-        gravatar_failed: "無法在 Gravatar 上找到這個電子郵件位置。"
-        refresh_gravatar_title: "重新整理你的 Gravatar 頭像"
         letter_based: "系統分配的個人資料圖片"
         uploaded_avatar: "自訂圖片"
         uploaded_avatar_empty: "新增一張自訂圖片"
@@ -1099,6 +1101,8 @@ zh_TW:
         back: "返回"
         again: "請再試一次"
         fixed: "載入頁面"
+    modal:
+      close: "關閉"
     close: "關閉"
     assets_changed_confirm: "此網站剛剛已更新，你要重整頁面以獲得最新版本嗎？"
     logout: "已登出"
@@ -1298,7 +1302,6 @@ zh_TW:
       objects: 物品
       symbols: 象徵<br>
       flags: 檢舉
-      custom: 自訂表情符號
       recent: 最近使用過的
       default_tone: 膚色深度：0
       light_tone: 膚色深度：1
@@ -1306,6 +1309,7 @@ zh_TW:
       medium_tone: 膚色深度：3
       medium_dark_tone: 膚色深度：4
       dark_tone: 膚色深度：5
+      default: 自訂表情符號
     shared_drafts:
       title: "共享草稿"
       notice: "\b只有能瀏覽<b>{{category}}</b>分類的使用者能看到這個話題"
@@ -1446,6 +1450,7 @@ zh_TW:
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<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}}"
@@ -2135,6 +2140,7 @@ zh_TW:
             title: "顯示電子郵件HTML格式"
             button: "HTML"
       bookmarks:
+        created: "已建立"
         name: "名稱"
     category:
       can: "可以&hellip; "
@@ -3418,7 +3424,6 @@ zh_TW:
           staff: "管理員"
           suspended: "已停權"
           silenced: "被靜音"
-          suspect: "嫌疑"
           staged: "暫存"
         approved: "已批准？"
         titles:
@@ -3435,7 +3440,6 @@ zh_TW:
           moderators: "板主"
           silenced: "被靜音的使用者"
           suspended: "已停權的使用者"
-          suspect: "嫌疑使用者"
           staged: "暫存使用者"
         not_verified: "未確認"
         check_email:
@@ -3775,6 +3779,7 @@ zh_TW:
         help: "新增新的emoji供所有人使用。(提示：一次拖放多個檔案)"
         add: "新增emoji"
         name: "名稱"
+        group: "群組"
         image: "圖片"
         delete_confirm: "你確定要刪除 :%{name}: emoji ?"
       embedding:
@@ -3801,7 +3806,6 @@ zh_TW:
         save: "儲存崁入設定"
       permalink:
         title: "固定連結"
-        description: "請注意，這僅適用於外部來源，論壇上發佈的連接不會被重新導向。"
         url: "網址"
         topic_id: "話題 ID"
         topic_title: "話題"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 7c129f04f2..ac2a435186 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -241,6 +241,10 @@ ar:
   bookmarks:
     reminders:
       at_desktop: "في المرة القادمة سأكون عند مكتبي"
+      later_today: "في وقت لاحق اليوم"
+      tomorrow: "غداً"
+      next_week: "الاسبوع القادم"
+      next_month: "الشهر القادم"
   groups:
     errors:
       can_not_modify_automatic: "لا يمكنك تعديل مجموعة تم انشائها تلقائيا"
@@ -948,8 +952,6 @@ ar:
     email_custom_headers: "قائمة قناة محددة لرؤوس بريد إلكتروني مخصص."
     force_https: "ارغام الموقع على استخدام HTTPS فقط. تحذير: لا تفعل هذا الاختيار الا بعد التأكد أن HTTPS مفعلة وتعمل بالكامل فى جميع أنحاء الموقع! هل اختبرت جميع الخوادم CDN، جميع تسجيلات الدخول من شبكات التواصل الاجتماعى، أية صور أو تبعيات خارجية للتأكد من أنها كلها متوافقه مع HTTPS؟"
     summary_score_threshold: "الحد الأدنى للنقاط المطلوبة لتضمين مشاركة في \"تلخيص هذا الموضوع\""
-    summary_posts_required: "الحد الأدنى للمشاركات في الموضوع قبل \"تلخيص هذا الموضوع\" مفعل."
-    summary_likes_required: "الحد الأدنى للإعجابات في الموضوع قبل \"تلخيص هذا الموضوع\" مفعل."
     summary_percent_filter: "عندما يضغط المستخدم على \"تلخيص هذا الموضوع\"، يظهر أعلى % o المشاركات."
     enable_long_polling: "ناقل الرسالة المستخدم للاشعارات يمكن أن يستخدم التصويت الطويل."
     long_polling_base_url: "قاعدة URL تستخدم للتصويت الطويل (عندما CDN يخدم المحتوى الديناميكي, تأكد لتعيين هذا لسحب الأصل) eg: http://origin.site.com"
@@ -1011,7 +1013,6 @@ ar:
     enable_instagram_logins: "تفعيل تسجيل الدخول عن طريق حساب انستغرام."
     instagram_consumer_key: "مفتاح المستهلك لنظام تسجيل الدخول بحساب انستجرام."
     instagram_consumer_secret: "رقم المستهلك السري لنظام تسجيل الدخول بحساب انستجرام."
-    readonly_mode_during_backup: "فعّل وضع القراءة فقط أثناء أخذ نسخة احتياطيّة"
     allow_restore: "تسمح استعادة، والتي يمكن أن تحل محل ALL بيانات الموقع! ترك كاذبة إلا إذا كنت تخطط لاستعادة نسخة احتياطية"
     maximum_backups: "أكبر قدر ممكن من النسخ الاحتياطي للحفاظ على القرص. يتم حذف النسخ الاحتياطية القديمة تلقائيا"
     automatic_backups_enabled: "فعل النسخ الإحتياطي التلقائي بشكل متكرر كما هو محدد."
@@ -1241,6 +1242,10 @@ ar:
     errors:
       different_topics: "المشاركات من موضوعين مختلفين لايُمكن دمجهم"
       different_users: "المشاركات من اعضاء مختلفين لايُمكن دمجهم"
+  publish_page:
+    slug_errors:
+      blank: "لا يمكن جعله فارغا."
+      invalid: "يحتوي احرف غير صالحة "
   topic_statuses:
     autoclosed_enabled_days:
       zero: "هذا الموضوع تم اغلاقه تلقائيا بعد 1 يوم .الردود الجديده غير متوفره بعد الان."
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index ddc531f97a..ccb1dbf542 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -226,6 +226,9 @@ be:
   edit_conflict: "Гэта паведамленне было адрэдагавана іншым карыстальнікам, і вашы змены не могуць быць больш не захаваны."
   revert_version_same: "Бягучая версія супадае з версіяй на якую вы спрабуеце вярнуцца."
   excerpt_image: "малюнак"
+  bookmarks:
+    reminders:
+      tomorrow: "заўтра"
   groups:
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' не з'яўляецца дапушчальным узроўнем даверу."
@@ -248,7 +251,6 @@ be:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "Заяўка на ўступ у @%{group_name}"
-      handle: "звяртацца з просьбай аб членстве"
   education:
     until_posts:
       one: "%{count} запіс"
@@ -940,8 +942,6 @@ be:
     force_https: "Прымусьце свой сайт, каб выкарыстоўваць толькі HTTPS. УВАГА: Не ўключайце гэта, пакуль вы не пераканайцеся, HTTPS цалкам настроена і працуе абсалютна ўсюды! Праверылі Ці вы свой CDN, усе сацыяльныя лагіны, і ўсе знешнія лагатыпы"
     same_site_cookies: "Выкарыстоўвайце тыя ж печыва сайта, яны ліквідуюць ўсе вектары Cross Site Request Падробка на падтрымоўваных браўзэраў (LAX або Strict). Увага: Строгі будзе працаваць толькі на сайтах, якія прымушаюць лагін і выкарыстоўваць адзіны ўваход."
     summary_score_threshold: "Мінімальная колькасць балаў, неабходныя для пасады, якія будуць уключаны ў «Сумаваць гэтую тэму»"
-    summary_posts_required: "Мінімум паведамленні ў тэме да «Абагульніць Гэтую тэму» уключана"
-    summary_likes_required: "Мінімум любіць ў тэме да «Сумаваць Гэтую тэму» уключаны"
     summary_percent_filter: "Калі карыстальнік націскае «Сумаваць гэтую тэму», паказваюць верхнюю% паведамленняў"
     summary_max_results: "Максімум паведамлення якiя вяртаюцца «Абагульніць Гэтую тэму»"
     enable_personal_messages: "Дазволіць траставы ўзровень 1 (наладжваецца праз мін ўзровень даверу для адпраўкі паведамленняў) карыстальнікам ствараць паведамленні і адказваць на паведамленні. Звярніце ўвагу, што супрацоўнікі заўсёды могуць адпраўляць паведамленні незалежна ад таго, што."
@@ -1039,7 +1039,6 @@ be:
     enable_instagram_logins: "Ўключэнне праверкі сапраўднасці Instagram, патрабуе instagram_consumer_key і instagram_consumer_secret"
     instagram_consumer_key: "Спажывецкі ключ для аўтэнтыфікацыі Instagram"
     instagram_consumer_secret: "Спажывецкі сакрэт аўтэнтыфікацыі Instagram"
-    readonly_mode_during_backup: "Ўключыць рэжым чытання толькі падчас прыёму рэзервовага капіявання"
     enable_backups: "Дазволіць адміністратарам ствараць рэзервовыя копіі форуму"
     allow_restore: "Дазволіць аднаўленне, якое можа замяніць УСЕ дадзеныя сайта! Пакіньце хлусня, калі вы не плануеце аднавіць рэзервовую копію"
     maximum_backups: "Максімальную колькасць рэзервовых копій, каб захаваць на дыску. Старыя рэзервовыя копіі аўтаматычна выдаляюцца"
@@ -1421,6 +1420,10 @@ be:
       different_users: "Паведамленні, якія належаць розным карыстачам не могуць быць аб'яднаныя."
   change_owner:
     post_revision_text: "уласнасці перададзеныя"
+  publish_page:
+    slug_errors:
+      blank: "не можа быць пустым"
+      invalid: "ўтрымлівае недапушчальныя сімвалы"
   topic_statuses:
     autoclosed_disabled: "Гэтая тэма ў цяперашні час адкрыта. Новыя адказы дазволеныя."
     autoclosed_disabled_lastpost: "Гэтая тэма ў цяперашні час адкрыта. Новыя адказы дазволеныя."
@@ -1482,7 +1485,7 @@ be:
       inactive_user: "неактыўны карыстальнік"
   unsubscribe_mailer:
     title: "Адмовіцца ад Mailer"
-    subject_template: "Пераканайцеся, вы больш не жадаеце атрымліваць абвесткі ад% {SITE_TITLE}"
+    subject_template: "Пераканайцеся што вы больш не жадаеце атрымліваць абвесткі ад %{site_title}"
   invite_mailer:
     title: "запрасіць Mailer"
   custom_invite_mailer:
@@ -1565,38 +1568,59 @@ be:
     email_reject_inactive_user:
       title: "Email Адхіліць неактыўны карыстальнік"
     email_reject_parsing:
-      title: "Email Адхіліць Сінтаксічны"
+      title: "Email Reject Parsing"
+      subject_template: "[%{email_prefix}] Email issue -- Content Unrecognized"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        We couldn't find your reply in the email. **Make sure your reply is at the top of the email** -- we can't process inline replies.
     email_reject_invalid_access:
       title: "Email Адхіліць Invalid доступу"
-      subject_template: "[% {Email_prefix}] Email пытанне - Invalid доступ"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Ваш уліковы запіс не мае права размяшчаць новыя тэмы ў гэтай катэгорыі. Калі вы лічыце, што гэта памылка, [кантакт супрацоўніка] (% {base_url}
+      subject_template: "[%{email_prefix}] Email issue -- Invalid Access"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        Your account does not have the privileges to post new topics in that category. If you believe this is an error, [contact a staff member](%{base_url}/about).
     email_reject_strangers_not_allowed:
       title: "Email Адхіліць Чужыя не дазволены"
-      subject_template: "[% {Email_prefix}] Email пытанне - Invalid доступ"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Катэгорыі вы паслалі гэты ліст дае толькі адказы ад карыстальнікаў з сапраўднымі рахункамі і вядомых адрасоў электроннай пошты. Калі вы лічыце, што гэта памылка, [кантакт супрацоўніка] (% {base_url}
+      subject_template: "[%{email_prefix}] Email issue -- Invalid Access"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        The category you sent this email to only allows replies from users with valid accounts and known email addresses. If you believe this is an error, [contact a staff member](%{base_url}/about).
     email_reject_invalid_post:
       title: "Email Адхіліць Invalid паведамленне"
-      subject_template: "[% {Email_prefix}] Email пытанне - Праводка памылак"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Некаторыя магчымыя прычыны: складанае фарматаванне, паведамленне занадта вялікае, паведамленне занадта малыя. Калі ласка, паспрабуйце яшчэ раз, або адправіць праз вэб-сайт, калі гэта будзе працягвацца.
+      subject_template: "[%{email_prefix}] Email issue -- Posting error"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        Some possible causes are: complex formatting, message too large, message too small. Please try again, or post via the website if this continues.
     email_reject_invalid_post_specified:
       title: "Email Адхіліць Invalid Паведамленне паказана"
-      subject_template: "[% {Email_prefix}] Email пытанне - Праводка памылак"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.прычына:% {Post_error}Калі вы можаце выправіць гэтую праблему, калі ласка, паспрабуйце яшчэ раз.
+      subject_template: "[%{email_prefix}] Email issue -- Posting error"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        Reason:
+
+        %{post_error}
+
+        If you can correct the problem, please try again.
       date_invalid: "Няма дата стварэння паста не знойдзена. Ці з'яўляецца адрас электроннай пошты адсутнічае Дата: загаловак?"
     email_reject_post_too_short:
       title: "Email Адхіліць паведамленне занадта кароткае"
-      subject_template: "[% {Email_prefix}] праблема электроннай пошты - паведамленне занадта кароткае"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Для таго, каб спрыяць больш паглыбленых гутарак, вельмі кароткія адказы не дапускаюцца. Ці можаце вы адказаць, па меншай меры% {лік} сымбаляў? Акрамя таго, вы можаце, як пост па электроннай пошце, адказваючы на «1».
+      subject_template: "[%{email_prefix}] праблема электроннай пошты - паведамленне занадта кароткае"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        To promote more in depth conversations, very short replies are not allowed. Can you please reply with at least %{count} characters? Alternatively, you can like a post via email by replying with "+1".
     email_reject_invalid_post_action:
       title: "Email Адхіліць Invalid Паведамленне Дзеянне"
-      subject_template: "[% {Email_prefix}] вопрос Email - Invalid паведамленне Дзеянне"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Паведамленне Дзеянне не было прызнана. Калі ласка, паспрабуйце яшчэ раз, або адправіць праз вэб-сайт, калі гэта будзе працягвацца.
+      subject_template: "[%{email_prefix}] Email issue -- Invalid Post Action"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        The Post Action was not recognized. Please try again, or post via the website if this continues.
     email_reject_reply_key:
       title: "Email Адхіліць Адказаць Key"
       subject_template: "[% {Email_prefix}] Email пытанне - Unknown Адказаць Key"
@@ -1624,39 +1648,73 @@ be:
         Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Тэма, якую вы адказваеце у цяперашні час зачынена і больш не прымаць адказы. Калі вы лічыце, што гэта памылка, [кантакт супрацоўніка] (% {base_url}
     email_reject_auto_generated:
       title: "Email Адхіліць Auto Generated"
-      subject_template: "[% {Email_prefix}] вопрос Email - Auto Сфарміраваны Адказаць"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Ваш электронны адрас быў адзначаны як «автогенерируемые», што азначае, што яна была створана аўтаматычна з дапамогай кампутара замест таго, каб быць набраны чалавекам; мы не можам прыняць гэтыя віды лістоў. Калі вы лічыце, што гэта памылка, [кантакт супрацоўніка] (% {base_url}
+      subject_template: "[%{email_prefix}] Email issue -- Auto Generated Reply"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        Your email was marked as "auto generated", which means it was automatically created by a computer instead of being typed by a human; we can't accept those kinds of emails. If you believe this is an error, [contact a staff member](%{base_url}/about).
     email_reject_unrecognized_error:
       title: "Email Адхіліць Неопознанная памылка"
-      subject_template: "[% {Email_prefix}] Email пытанне - Неопознанная памылка"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Быў непрызнаная памылка пры апрацоўцы паведамлення і не была апублікавана. Вы павінны паспрабаваць яшчэ раз, або [кантакт супрацоўніка] (% {base_url}
+      subject_template: "[%{email_prefix}] Email issue -- Unrecognized Error"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        There was an unrecognized error while processing your email and it wasn't posted. You should try again, or [contact a staff member](%{base_url}/about).
     email_reject_attachment:
       title: "Email Attachment Адхілена"
-      subject_template: "[% {Email_prefix}] Email пытанне - Дадатак Адхілена"
-      text_body_template: |-
-        На жаль, некаторыя ўкладання ў паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) былі адхіленыя.Чытаць далей:% {Rejected_errors}Калі вы лічыце, што гэта памылка, [кантакт супрацоўніка] (% {base_url}
+      subject_template: "[%{email_prefix}] Email issue -- Attachment Rejected"
+      text_body_template: |
+        Unfortunately some attachments in your email message to %{destination} (titled %{former_title}) were rejected.
+
+        Details:
+        %{rejected_errors}
+
+        If you believe this is an error, [contact a staff member](%{base_url}/about).
+    email_reject_reply_not_allowed:
+      title: "Email Reject Reply Not Allowed"
+      subject_template: "[%{email_prefix}] Email issue -- Reply Not Allowed"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        You don't have permissions to reply to the topic. If you believe this is an error, [contact a staff member](%{base_url}/about).
     email_error_notification:
       title: "Апавяшчэнне па электроннай пошце пра памылку"
-      subject_template: "[% {Email_prefix}] Праблема электроннай пошты - памылка аўтэнтыфікацыі POP"
-      text_body_template: |-
-        На жаль, адбылася памылка аўтэнтыфікацыі падчас апытання пошты з сервера POP.Калі ласка, пераканайцеся, што вы правільна наладзілі POP уліковых дадзеных [налады сайта] (% {base_url}
+      subject_template: "[%{email_prefix}] Email issue -- POP authentication error"
+      text_body_template: |
+        Unfortunately, there was an authentication error while polling mails from the POP server.
+
+        Please make sure you have properly configured the POP credentials in [the site settings](%{base_url}/admin/site_settings/category/email).
+
+        If there is a web UI for the POP email account, you may need to log in on the web and check your settings there.
     email_revoked:
       title: "Email Revoked"
       subject_template: "Ці з'яўляецца ваш адрас электроннай пошты правільна?"
-      text_body_template: |-
-        Мы шкадуем, але мы ўзніклі праблемы дасягнення вам па электроннай пошце. Нашы апошнія некалькі электронных лістоў вам усё адскочылі назад, як здадзеныя.Вы можаце пераканацца, што [ваш адрас электроннай пошты] (% {base_url}
-    email_bounced: |-
-      Паведамленьне% {адрас электроннай пошты} падскочыў.### Больш падрабязна`` `Тэкст% {} Сыравіны`` `
+      text_body_template: |
+        We’re sorry, but we’re having trouble reaching you via email. Our last few emails to you have all bounced back as undeliverable.
+
+        Can you make sure [your email address](%{base_url}/my/preferences/email) is valid and working? You may also wish to add our email address to your address book / contact list to improve deliverability.
+    email_bounced: |
+      The message to %{email} bounced.
+
+      ### Details
+
+      ``` text
+      %{raw}
+      ```
     ignored_users_summary:
       title: "Ігнаруецца прайшоў парог карыстальніка"
       subject_template: "Карыстальнік ігнаруецца шматлікімі іншымі карыстальнікамі"
     too_many_spam_flags:
       title: "Занадта шмат спаму Сьцягоў"
       subject_template: "Новы ўліковы запіс на ўтрыманне"
-      text_body_template: |-
-        Добры дзень,Гэта аўтаматычнае паведамленне ад% {SITE_NAME}, каб вы ведалі, што вашы пасты былі часова схаваныя, паколькі яны былі адзначаны супольнасцю.У якасці меры засцярогі, новая уліковы запіс была адключаная і не зможа не ствараць адказы ці тэмы, пакуль супрацоўнік можа праглядзець Вашу ўліковы запіс. Просім прабачэння за прычыненыя нязручнасці.Для атрымання дадатковых указанняў, калі ласка, звярніцеся да нашых прынцыпам супольнасці [] (% {base_url}
+      text_body_template: |
+        Hello,
+
+        This is an automated message from %{site_name} to let you know that your posts have been temporarily hidden because they were flagged by the community.
+
+        As a precautionary measure, your new account has been silenced and will be unable to create replies or topics until a staff member can review your account. We apologize for the inconvenience.
+
+        For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
     too_many_tl3_flags:
       title: "Занадта шмат ТЛ3 Flags"
       subject_template: "Новы ўліковы запіс на ўтрыманне"
@@ -1684,127 +1742,213 @@ be:
         Добры дзень,Гэта аўтаматычнае паведамленне ад% {SITE_NAME}, каб вы ведаеце, што ваш уліковы запіс больш не на ўтрыманне пасля праверкі персаналу.Цяпер вы можаце ствараць новыя адказы і тэмы зноў. Дзякуй за ваша цярпенне.
     pending_users_reminder:
       title: "У чаканні карыстальнікаў Напамін"
-      text_body_template: |-
-        Ёсць новыя рэгістрацыі карыстальнікаў, якія чакаюць быць зацверджана (або адхілена), перш чым яны могуць атрымаць доступ да гэтага форуму.[Калі ласка, азнаёмцеся з імі] (% {base_url}
+      text_body_template: |
+        There are new user signups waiting to be approved (or rejected) before they can access this forum.
+
+        [Please review them](%{base_url}/review).
     download_remote_images_disabled:
       title: "Загрузіць выдаленыя выявы з абмежаванымі фізічнымі магчымасцямі"
       subject_template: "Загрузка аддаленых малюнкаў адключаная"
-      text_body_template: "Параметр `download_remote_images_to_local` быў адключаны, так як быў дасягнуты мяжа дыскавай прасторы на` download_remote_images_threshold`."
+      text_body_template: "The `download_remote_images_to_local` setting was disabled because the disk space limit at `download_remote_images_threshold` was reached."
     dashboard_problems:
       title: "праблемы Dashboard"
       subject_template: "Новыя рэкамендацыі на вашым сайце прыборнай панэлі"
     new_user_of_the_month:
       title: "Вы новы карыстальнік месяцы!"
       subject_template: "Вы новы карыстальнік месяцы!"
-      text_body_template: |-
-        Віншую, вы зарабілі ** Новы карыстальнік прэміі месяца за% {MONTH_YEAR} **. : Трафей:Гэтая ўзнагарода даецца толькі для двух новых карыстальнікаў у месяц, і ён будзе пастаянна бачны на [старонцы знакаў] (% {URL}).Вы хутка стаць каштоўным членам нашага супольнасці. Дзякуй за ўдзел, і захаваць вялікую працу!
+      text_body_template: |
+        Congratulations, you've earned the **New User of the Month award for %{month_year}**. :trophy:
+
+        This award is only granted to two new users per month, and it will be permanently visible on [the badges page](%{url}).
+
+        You've quickly become a valuable member of our community. Thanks for joining, and keep up the great work!
     queued_posts_reminder:
       title: "QUEUED Паведамленняў Reminder"
-  unsubscribe_link: |-
-    Каб адмовіцца ад гэтых лістоў, [націсніце тут] (% {unsubscribe_url}).
-  unsubscribe_link_and_mail: |-
-    Каб адмовіцца ад гэтых лістоў, [націсніце тут] (% {unsubscribe_url}).
-  unsubscribe_mailing_list: |-
-    Вы атрымліваеце гэта таму, што вы ўключылі рэжым спісу рассылання.Каб адмовіцца ад гэтых лістоў, [націсніце тут] (% {unsubscribe_url}).
+      text_body_template: |
+        Hello,
+
+        Posts from new users were held for moderation and are currently waiting to be reviewed. [Approve or reject them here](%{base_url}/review?type=ReviewableQueuedPost).
+  unsubscribe_link: |
+    Каб адмовіцца ад гэтых лістоў, [націсніце тут] (%{unsubscribe_url}).
+  unsubscribe_link_and_mail: |
+    Каб адмовіцца ад гэтых лістоў, [націсніце тут] ( %{unsubscribe_url}).
+  unsubscribe_mailing_list: "Вы атрымліваеце гэта таму, што вы ўключылі рэжым спісу \n\nрассылання. Каб адмовіцца ад гэтых лістоў, [націсніце тут]%{unsubscribe_url}).\n"
   subject_re: "Re:"
   subject_pm: "[PM]"
-  email_from: "% {User_name} з дапамогай {%} site_name"
+  email_from: "%{user_name} via %{site_name}"
   user_notifications:
     previous_discussion: "папярэднія адказы"
     in_reply_to: "У адказ на"
     unsubscribe:
       title: "Адмовіцца ад падпіскі"
       description: "Не зацікаўленыя ў атрыманні гэтых лістоў? Няма праблем! Націсніце ніжэй, каб адмовіцца ад падпіскі імгненна:"
-    reply_by_email: "[Наведаць тэма] (% {base_url}% {URL}) або адказаць на гэты ліст, каб адказаць."
-    reply_by_email_pm: "[Наведаць паведамленне] (% {base_url}% {URL}) або адказаць на гэты ліст, каб адказаць на% {удзельнікаў}."
+    reply_by_email: "[Visit Topic](%{base_url}%{url}) or reply to this email to respond."
+    reply_by_email_pm: "[Visit Message](%{base_url}%{url}) or reply to this email to respond to %{participants}."
     only_reply_by_email: "Адказаць на гэтае паведамленне, каб адказаць."
     only_reply_by_email_pm: "Адказаць на гэты ліст, каб адказаць на% {удзельнікаў}."
-    visit_link_to_respond: "[Наведаць тэма] (% {base_url}% {URL}), каб адказаць."
-    visit_link_to_respond_pm: "[Наведаць паведамленне] (% {base_url}% {URL}), каб адказаць на% {удзельнікаў}."
-    posted_by: "Паведамленне ад% {імя карыстальніка} на {%} POST_DATE"
-    pm_participants: "Удзельнікі:% {ўдзельнікі}"
+    visit_link_to_respond: "[Visit Topic](%{base_url}%{url}) to respond."
+    visit_link_to_respond_pm: "[Visit Message](%{base_url}%{url}) to respond to %{participants}."
+    posted_by: "Posted by %{username} on %{post_date}"
+    pm_participants: "Удзельнікі: %{participants}"
     user_invited_to_private_message_pm_group:
       title: "Карыстальнік Запрошаныя групе PM"
-      subject_template: "[% {Email_prefix}]% {імя карыстальніка} запрасіў @% {GROUP_NAME} на паведамленне '% {TOPIC_TITLE}'"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] %{username} invited @%{group_name} to a message '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
     user_invited_to_private_message_pm:
       title: "Карыстальнік запрошаны ў лічку"
-      subject_template: "[% {Email_prefix}]% {імя карыстальніка} запрашае вас на паведамленне '% {TOPIC_TITLE}'"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] %{username} invited you to a message '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
     user_invited_to_private_message_pm_staged:
       title: "Карыстальнік Запрошаны PM Паэтапнае"
       subject_template: "[% {Email_prefix}]% {імя карыстальніка} запрашае вас на паведамленне '% {TOPIC_TITLE}'"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Respond_instructions}
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
     user_invited_to_topic:
       title: "Карыстальнік запрошаны на тэму"
-      subject_template: "[% {Email_prefix}]% {імя карыстальніка} запрасіў вас '% {TOPIC_TITLE}'"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Respond_instructions}
+      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}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_replied_pm:
       title: "Карыстальнік Адказаў PM"
-      subject_template: "[% {Email_prefix}] [ЛС]% {TOPIC_TITLE}"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      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}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_linked:
       title: "Карыстальнік Linked"
-      subject_template: "[% {Email_prefix}] {%} TOPIC_TITLE"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      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}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_mentioned_pm:
       title: "Карыстальнік Згаданы PM"
-      subject_template: "[% {Email_prefix}] [ЛС]% {TOPIC_TITLE}"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      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}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      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}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      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}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_posted_pm:
       title: "Карыстальнік Паведамленне PM"
-      subject_template: "[% {Email_prefix}] [ЛС]% {TOPIC_TITLE}"
-      text_body_template: |-
-        % {Header_instructions}% {Паведамленне}% {Кантэкст}% {Respond_instructions}
+      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: |-
-        % {Паведамленне}
+      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}.% {Прычына}% {Паведамленне}
     account_silenced:
-      title: "кошт глушыцель"
+      title: "Аккаунт прыпынены"
       subject_template: "[% {Email_prefix}] Ваш уліковы запіс была адключаная"
       text_body_template: |-
         Вы не былі адключаныя ад форума да% {silenced_till}.% {Прычына}% {Паведамленне}
@@ -1819,10 +1963,9 @@ be:
       text_body_template: |-
         Два фактары аўтэнтыфікацыі быў адключаны на вашым рахунку ў% {site_name}. Цяпер вы можаце ўвайсці толькі з паролем; ня дадатковы код аўтэнтыфікацыі больш не патрабуецца.Калі вы не абралі, каб адключыць два фактары аўтэнтыфікацыі, хто-то можа скампраметавалі свой рахунак.Калі ў вас ёсць якія-небудзь пытанні, [звязацца з нашым прыязным персаналам] (% {base_url}
     digest:
-      why: "Кароткі выклад% {SITE_LINK} з моманту вашага апошняга наведвання% {last_seen_at}"
+      why: "Кароткі выклад %{site_link}з моманту вашага апошняга наведвання%{last_seen_at} "
       since_last_visit: "З моманту Вашага апошняга візіту"
       new_topics: "новыя тэмы"
-      unread_messages: "непрачытаныя паведамленні"
       unread_notifications: "непрачытаныя Апавяшчэнні"
       liked_received: "сімпатыі"
       new_users: "новыя карыстальнікі"
@@ -1831,72 +1974,106 @@ be:
       join_the_discussion: "Чытаць далей"
       popular_posts: "Папулярныя паведамленні"
       more_new: "Новае для вас"
-      subject_template: "[% {Email_prefix}] Кароткае апісанне"
-      unsubscribe: "[% {Email_prefix}] Кароткае апісанне..."
-      your_email_settings: "[% {Email_prefix}] Кароткае апісанне......"
-      click_here: "[% {Email_prefix}] Кароткае апісанне........."
-      preheader: "[% {Email_prefix}] Кароткае апісанне..............."
+      subject_template: "[%{email_prefix}] Кароткае апісанне"
+      unsubscribe: "This summary is sent from %{site_link} when we haven't seen you in a while. Change %{email_preferences_link}, or %{unsubscribe_link} to unsubscribe."
+      your_email_settings: "your email settings"
+      click_here: "click here"
+      preheader: "A brief summary since your last visit on %{last_seen_at}"
     forgot_password:
       title: "Забыліся на пароль"
-      subject_template: "[% {Email_prefix}] Аднаўленне пароля"
-      text_body_template: |-
-        Хто-то спытаў, каб скінуць пароль на [% {site_name}] (% {base_url}).Калі б гэта было не так, то вы можаце спакойна ігнараваць гэтае паведамленне.Націсніце на спасылку, каб выбраць новы пароль:% {Base_url}
+      subject_template: "[%{email_prefix}] Скінуць пароль"
+      text_body_template: |
+        Нехта спытаў каб скінуць пароль на [%{site_name}](%{base_url}).
+
+        Калі гэта былі не вы, то вы можаце спакойна ігнараваць гэтае паведамленне.
+
+        Націсніце на спасылку, каб выбраць новы пароль:
+        %{base_url}/u/password-reset/%{email_token}
     email_login:
       title: "Увайсці па спасылцы"
-      subject_template: "[% {Email_prefix}] Уваход па спасылцы"
-      text_body_template: |-
-        Вось ваша спасылка ўвайсці на [% {site_name}] (% {base_url}).Калі вы не запытвалі гэтую спасылку, вы можаце спакойна ігнараваць гэтае паведамленне.Націсніце на спасылку, каб увайсці:% {Base_url}
+      subject_template: "[%{email_prefix}] Уваход па спасылцы"
+      text_body_template: |
+        Вось ваша спасылка каб ўвайсці на [%{site_name}](%{base_url}).
+
+        Калі вы не запытвалі гэтую спасылку, вы можаце спакойна ігнараваць гэтае паведамленне.
+
+        Націсніце на спасылку, каб увайсці:
+        %{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}
+      subject_template: "[%{email_prefix}] Усталяваць пароль"
+      text_body_template: |
+        Somebody asked to add a password to your account on [%{site_name}](%{base_url}). Alternatively, you can log in using any supported online service (Google, Facebook, etc) that is associated with this validated email address.
+
+        If you did not make this request, you can safely ignore this email.
+
+        Click the following link to choose a password:
+        %{base_url}/u/password-reset/%{email_token}
     admin_login:
-      title: "адміністратар Увайсці"
-      subject_template: "[% {Email_prefix}] Статыстыка"
+      title: "Увайсці як адміністратар"
+      subject_template: "[%{email_prefix}] Увайсці"
     account_created:
-      title: "уліковы запіс створаны"
-      subject_template: "[% {Email_prefix}] Ваш новы рахунак"
-      text_body_template: |-
-        Новы ўліковы запіс была створана для вас у% {site_name}Націсніце на спасылку, каб выбраць пароль для новага рахунку:% {Base_url}
+      title: "Уліковы запіс створаны"
+      subject_template: "[%{email_prefix}] Ваш новы рахунак"
+      text_body_template: |
+        A new account was created for you at %{site_name}
+
+        Click the following link to choose a password for your new account:
+        %{base_url}/u/password-reset/%{email_token}
     confirm_new_email:
       title: "Пацвердзіце новы Email"
-      subject_template: "[% {Email_prefix}] Пацвердзіце свой новы адрас электроннай пошты"
+      subject_template: "[%{email_prefix}] Пацвердзіце свой новы адрас электроннай пошты"
     confirm_old_email:
       title: "Пацвердзіце стары адрас электроннай пошты"
-      subject_template: "[% {Email_prefix}] Пацвердзіце свой бягучы адрас электроннай пошты"
+      subject_template: "[%{email_prefix}] Пацвердзіце свой бягучы адрас электроннай пошты"
     notify_old_email:
       title: "Апавяшчаць Стары e-mail"
-      subject_template: "[% {Email_prefix}] Ваш электронны адрас быў зменены"
-      text_body_template: |-
-        Гэта аўтаматычнае паведамленне, каб вы ведаеце, што ваш адрас электроннай пошты для% {Site_name} зменена. Калі гэта было зроблена па памылцы, калі ласка, звяжыцеся задміністратар сайта.Ваш электронны адрас быў зменены на:% {NEW_EMAIL}
+      subject_template: "[%{email_prefix}] Ваш электронны адрас быў зменены"
+      text_body_template: |
+        This is an automated message to let you know that your email address for
+        %{site_name} has been changed. If this was done in error, please contact
+        a site administrator.
+
+        Your email address has been changed to:
+
+        %{new_email}
     signup_after_approval:
       title: "Рэгістрацыя Пасля зацвярджэння"
-      subject_template: "Вы былі зацверджаны на% {site_name}!"
+      subject_template: "Вы былі зацверджаны на %{site_name}!"
       text_body_template: |-
         Сардэчна запрашаем у% {site_name}!Супрацоўнік зацвердзіў свой кошт на% {SITE_NAME}.Цяпер вы можаце атрымаць доступ да новага рахунку, увайшоўшы на сайт:% {Base_url}Калі вышэй ссылка не клікабельнасць, паспрабуйце скапіяваць і ўставіць яго ў адрасную радок вашага браўзэра.% {New_user_tips}Мы лічым, што ў [цывілізаванае паводзіны супольнасці] (% {base_url}
     signup:
       title: "Зарэгістравацца"
-      subject_template: "[% {Email_prefix}] Пацвердзіце новы рахунак"
+      subject_template: "[%{email_prefix}] Пацвердзіце новы рахунак"
       text_body_template: |-
         Сардэчна запрашаем у% {site_name}!Націсніце на спасылку, каб пацвердзіць і актываваць новы рахунак:% {Base_url}
     activation_reminder:
-      title: "актывацыя Напамін"
-      subject_template: "[% {Email_prefix}] Напамін, каб пацвердзіць свой рахунак"
+      title: "Актывацыя Напаміну"
+      subject_template: "[%{email_prefix}] Напамін, каб пацвердзіць свой рахунак"
       text_body_template: |-
         Сардэчна запрашаем у% {site_name}!Гэта сяброўскае напамін, каб актываваць свой рахунак.Націсніце на спасылку, каб пацвердзіць і актываваць новы рахунак:% {Base_url}
     suspicious_login:
       title: "Новы Лагін абвесткі"
-      subject_template: "[% {Site_name}] Новае Увайсці з% {месца}"
-      text_body_template: |-
-        Добры дзень,Мы заўважылі, што лагін ад прылады або месца, якія вы звычайна не выкарыстоўваеце. Ці быў гэта ты? - Размяшчэнне:% {месца} (% {client_ip}) - Браўзэр:% {браўзэр} - Прылада:% {прылада} - {%} восКалі гэта ты, выдатна! Там няма нічога іншага, што вам трэба зрабіць.Калі гэта не вы, калі ласка [агляд існуючых сесій] (% {base_url}
+      subject_template: "[%{site_name}] New Login from %{location}"
+      text_body_template: |
+        Hello,
+
+        We noticed a login from a device or location you don’t usually use. Was this you?
+
+         - Location: %{location} (%{client_ip})
+         - Browser: %{browser}
+         - Device: %{device} – %{os}
+
+        If this was you, great! There’s nothing else you need to do.
+
+        If this was not you, please [review your existing sessions](%{base_url}/my/preferences/account) and consider changing your password.
   page_not_found:
     title: "На жаль! Гэтая старонка не існуе або з'яўляецца прыватнай уласнасцю."
     popular_topics: "папулярны"
-    recent_topics: "апошні"
-    see_more: "больш"
+    recent_topics: "Надаўнія"
+    see_more: "Больш"
     search_title: "Пошук па сайце"
-    search_button: "пошук"
+    search_button: "Пошук"
   offline:
     title: "Не ўдаецца загрузіць дадатак"
     offline_page_message: "Падобна на тое, што вы знаходзіцеся ў аўтаномным рэжыме! Калі ласка, праверце падключэнне да сеткі і паспрабуйце ізноў."
@@ -1909,9 +2086,9 @@ be:
   image: "малюнак"
   upload:
     edit_reason: "загружаныя лакальныя копіі малюнкаў"
-    unauthorized: "На жаль, файл, які вы ўкладаеце, ня санкцыянаваныя (аўтарызаваныя пашырэння:% {authorized_extensions})."
+    unauthorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: %{authorized_extensions})."
     pasted_image_filename: "ўстаўленае выява"
-    store_failure: "Не атрымалася захаваць загрузку #% {upload_id} для карыстальніка #% {user_id}."
+    store_failure: "Failed to store upload #%{upload_id} for user #%{user_id}."
     file_missing: "На жаль, вы павінны даць файл для загрузкі."
     empty: "Выбачайце, але Прадстаўлены файл пусты."
     png_to_jpg_conversion_failure_message: "Памылка пры пераўтварэнні з PNG ў JPG адбылося."
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index 93a19cfefd..f0be12316e 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -177,10 +177,9 @@ bg:
   bookmarks:
     reminders:
       later_today: "По-късно днес"
-      next_business_day: "Следващият работен ден"
       tomorrow: "Утре"
-      next_week: "Следващата седмица"
-      next_month: "Следващият месец"
+      next_week: "Следваща седмица"
+      next_month: "Следващия месец"
   groups:
     errors:
       invalid_domain: "'%{domain}' е невалиден домейн."
@@ -697,8 +696,6 @@ bg:
     notification_email: "Подател: имейлът се използва при изпращане на всички системни съобщения. Посоченият тук домейн трябва да се конфигурира правилно със SPF, DKIM и PTR данни за успешна доставка."
     email_custom_headers: "Разделен със знака \"|\" списък от персонализирани имейл хедъри. "
     summary_score_threshold: "Минимална оценка необходима за една публикация, за да бъде включена в \"Обобщи тази тема\""
-    summary_posts_required: "Минимум публикации в темата преди \"Обобщи тази тема\" да бъде активирано"
-    summary_likes_required: "Минимум харесвания в темата преди \"Обобщи тази тема\" да бъде активирано"
     summary_percent_filter: "Когато потребителят кликне върху \"Обобщи тази тема\", се показват % от най-добрите публикации "
     enable_long_polling: "Системата за обработка на известия, да използва long polling - заявки с дълго изчакване / дълъг интервал "
     long_polling_base_url: "Основен URL използван за long polling - проверка на дълги интервали (когато се използва CDN за динамично съдръжание, уверете се, че тази стойност е настроена към основното съдържание) Например: http://origin.site.com"
@@ -925,6 +922,10 @@ bg:
   redirected_to_top_reasons:
     new_user: "Добре дошли в нашата общност! Това са най-популярните последни теми. "
     not_seen_in_a_month: "Добре дошли отново! Това са най-популярните теми за времето, през което Ви нямаше."
+  publish_page:
+    slug_errors:
+      blank: "не може да бъде празно"
+      invalid: "съдържа невалидни знаци"
   topic_statuses:
     autoclosed_enabled_days:
       one: "Тази тема ще се затвори автоматично след %{count} ден. Нови отговори вече не се допускат."
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 49473d134d..8c2754ec4a 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -57,7 +57,6 @@ bs_BA:
       no_multilevels_components: "Teme s dječjim temama ne mogu biti same teme djeteta"
     settings_errors:
       invalid_yaml: "Korišteni YAML fajl nije validan."
-      data_type_not_a_number: "Postavka tipa `%{name}` nije podržana. Podržani tipovi su `integer`, `bool`, `list` i `enum`"
       name_too_long: "Postoji postavka sa predugim imenom. Maksimalna dužina je 255"
       default_value_missing: "Postavka `%{name}` nema uobičajenu (default) vrijednost"
       default_not_match_type: "Postavka `%{name}` default uobičajena vrijednosti se ne podudara sa tipom postavke."
@@ -154,11 +153,10 @@ bs_BA:
   bookmarks:
     reminders:
       at_desktop: "Sljedeći put sam za svojim desktop kompjuterom"
-      later_today: "Danas, malo kasnije"
-      next_business_day: "Sljedeći radni dan"
-      tomorrow: "Sutradan"
+      later_today: "Kasnije danas"
+      tomorrow: "Sutra"
       next_week: "Sljedeće sedmice"
-      next_month: "Naredni mjesec"
+      next_month: "Sljedeći mjesec"
       custom: "Ciljano vrijeme i datum"
   groups:
     default_names:
@@ -570,8 +568,6 @@ bs_BA:
     notification_email: "The from: email address used when sending all essential system emails. The domain specified here must have SPF, DKIM and reverse PTR records set correctly for email to arrive."
     email_custom_headers: "A pipe-delimited list of custom email headers"
     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"
-    summary_likes_required: "Minimum likes in a topic before 'Summarize This Topic' is enabled"
     summary_percent_filter: "When a user clicks 'Summarize This Topic', show the top % of posts"
     enable_long_polling: "Message bus used for notification can use long polling"
     long_polling_interval: "Interval before a new long poll is issued in milliseconds "
@@ -744,6 +740,9 @@ bs_BA:
   redirected_to_top_reasons:
     new_user: "Dobrodošli u našu zajednicu! Ovo su najnovije popularne teme."
     not_seen_in_a_month: "Dobrodošli nazad! Nismo vas odavno vidjeli. Ovo su najnovije popularne teme od vaše zadnje posjete."
+  publish_page:
+    slug_errors:
+      invalid: "contains invalid characters"
   topic_statuses:
     autoclosed_disabled: "This topic is now opened. New replies are allowed."
     autoclosed_disabled_lastpost: "Ova tema je sada otvorena. Novi postovi su dozvoljeni."
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 2cf54be443..75bdbe8052 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -58,7 +58,6 @@ ca:
       no_multilevels_components: "Les aparences amb aparences filla no poden ser elles mateixes aparences  filles."
     settings_errors:
       invalid_yaml: "El YAML proveït no és vàlid"
-      data_type_not_a_number: "El paràmetre de tipus `%{name}` no és admès. Els tipus admesos són `integer`, `bool`, `list` i `enum`."
       name_too_long: "Hi ha un paràmetre amb un nom massa llarg. La longitud màxima és 255."
       default_value_missing: "El paràmetre `%{name}` no té un valor per defecte."
       default_not_match_type: "El tipus del valor per defecte del paràmetre `%{name}` no coincideix amb el tipus del paràmetre."
@@ -316,6 +315,12 @@ ca:
   edit_conflict: "Aquesta publicació ha estat editada per un altre usuari i els vostres canvis no es poden desar."
   revert_version_same: "La versió actual és la mateixa que la versió que intenteu revertir."
   excerpt_image: "imatge"
+  bookmarks:
+    reminders:
+      later_today: "Més tard avui"
+      tomorrow: "Demà"
+      next_week: "La setmana que ve"
+      next_month: "El mes que ve"
   groups:
     success:
       bulk_add:
@@ -345,7 +350,6 @@ ca:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "Sol·licitud d'afiliació a @%{group_name}"
-      handle: "gestiona la sol·licitud d'afiliació"
     view_hidden_topic_request_reason: "Voldria unir-me al grup '%{group_name}' de manera que tingui accés a [aquest tema](%{topic_url})"
   education:
     until_posts:
@@ -1233,7 +1237,6 @@ ca:
   dashboard:
     rails_env_warning: "El vostre servidor s'executa en mode %{env}."
     host_names_warning: "El vostre fitxer config/database.yml empra el nom d'amfitrió local per defecte. Actualitzeu-lo per a fer servir el nom del vostre lloc web."
-    gc_warning: 'El servidor utilitza paràmetres d''alliberament de recursos (garbage collection) de Ruby per defecte que no us donaran el millor rendiment. Llegiu aquest article sobre l''ajust de rendiment: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a> .'
     sidekiq_warning: 'Sidekiq no s''està executant. Sidekiq fa que moltes tasques, com ara enviar correus electrònics, s''executin de manera asincrònica. Assegureu-vos que s''executa almenys un procés Sidekiq. <a href="https://github.com/mperham/sidekiq" target="_blank">Obtingueu informació sobre Sidekiq aquí</a> .'
     queue_size_warning: "El nombre de tasques en cua és de %{queue_size}, que és elevat. Això podria indicar un problema amb un o més processos, o potser us cal afegir més treballadors de <i>Sidekiq</i>."
     memory_warning: "El vostre servidor s'està executant amb menys d'1 GB de memòria total. Es recomana com a mínim un 1 GB de memòria."
@@ -1341,8 +1344,6 @@ ca:
     force_https: "Força el lloc web a fer servir només HTTPS. ATENCIÓ: NO ho activeu fins que no verifiqueu que l'HTTPS és totalment configurat i funciona a tot arreu. ¿Heu comprovat també la xarxa CDN, totes les connexions socials, i qualsevol logo o dependència externa per a assegurar-vos que tots són compatibles amb HTTPS?"
     same_site_cookies: "Utilitza les mateixes galetes del lloc web. Eliminen tots els vectors Cross Site Request Forgery (falsificació de petició entre llocs) en els navegadors compatibles (Lax o Strict). Advertència: Strict sols funcionarà en llocs que forcin l'inici de sessió i utilitzin SSO."
     summary_score_threshold: "La puntuació mínima requerida perquè una publicació sigui inclosa en 'Resumeix aquest tema'"
-    summary_posts_required: "Publicacions mínimes en un tema abans que sigui activat 'Resumeix aquest tema'"
-    summary_likes_required: "Nombre mínim de 'M'agrades' en un tema abans que sigui activat 'Resumeix aquest tema'"
     summary_percent_filter: "Quan un usuari fa clic en 'Resumeix aquest tema', mostra el % superior de les publicacions"
     summary_max_results: "Nombre màxim de publicacions retornades per \"Resumeix aquest tema\""
     enable_personal_messages: "Permet que els usuaris amb nivell de confiança 1 puguin crear missatges i respondre-hi (configurable amb nivell de confiança mínim per a enviar missatges). Observeu que l'equip responsable sempre pot enviar tota mena de missatges."
@@ -1478,7 +1479,6 @@ ca:
     discord_client_id: 'Identificador de client Discord (si us en cal un, visiteu <a href="https://discordapp.com/developers/applications/me">el portal de desenvolupadors Discord</a>)'
     discord_secret: "Clau secreta de Discord"
     discord_trusted_guilds: 'Permet sols als membres d''aquests gremis Discord iniciar sessió mitjançant Discord. Utilitzeu l''identificador numèric per al gremi. Per a obtenir més informació, consulteu les instruccions <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">aquí</a>. Deixeu-ho en blanc per a permetre qualsevol gremi.'
-    readonly_mode_during_backup: "Activa el mode només de lectura mentre es fa la còpia de seguretat"
     enable_backups: "Permet als administradors crear còpies de seguretat del fòrum"
     allow_restore: "Permet restaurar, cosa que pot reemplaçar TOTES les dades del lloc web! Deixeu-ho com a \"fals\" si no preteneu restaurar una còpia de seguretat."
     maximum_backups: "Nombre màxim de còpies de seguretat que es mantenen en el disc. Les còpies més antigues seran suprimides automàticament."
@@ -1608,11 +1608,13 @@ ca:
     desktop_category_page_style: "Estil visual per a la pàgina /categories."
     category_colors: "Llista de valors de color hexadecimal permesos per a categories."
     category_style: "Estil visual per a insígnies de categoria."
+    max_image_size_kb: "Mida màxima de càrrega d'imatge en kB. Cal configurar-ho en nginx (client_max_body_size) / apache o en el proxy també. Les imatges més grans que aquest límit i més petites que client_max_body_size es redimensionaran en la càrrega."
     max_attachment_size_kb: "Mida màxima de càrrega de fitxers adjunts en kB. Cal configurar-ho en nginx (client_max_body_size) / apache o en el proxy també."
     authorized_extensions: "Llista d'extensions de fitxer permeses per a carregar (feu servir '*' per a habilitar tota mena de fitxers)"
     authorized_extensions_for_staff: "Llista d'extensions permeses als usuaris de l'equip responsable en carregar fitxers a més de la llista definida en el paràmetre `authorized_extensions` de la configuració. (Feu servir \"*\" per a habilitar tots els tipus de fitxers.)"
     theme_authorized_extensions: "Llista d'extensions de fitxers permeses per a càrregues d'aparences (utilitzeu '*' per a permetre tots els tipus de fitxers)"
     max_similar_results: "Quants temes semblants es mostren per damunt de l'editor quan es redacta un tema nou. La comparació es basa en el títol i el cos."
+    max_image_megapixels: "Nombre màxim de megapíxels permesos en una imatge. Es rebutjaran les imatges amb un nombre més alt de megapíxels. "
     title_prettify: "Evita errades tipogràfiques freqüents en el títol, incloent-hi tot en majúscula, primer caràcter en minúscula, exclamacions i interrogants múltiples, punts extres al final, etc."
     title_remove_extraneous_space: "Elimina els espais blancs de davant de la puntuació final."
     automatic_topic_heat_values: 'Actualitza automàticament els paràmetres de "topic views heat" i "topic post like heat" basant-se en l''activitat del lloc web. '
@@ -1967,6 +1969,10 @@ ca:
       other: "%{count} publicacions s'han combinat en un missatge existent: %{topic_link}"
   change_owner:
     post_revision_text: "Propietat transferida"
+  publish_page:
+    slug_errors:
+      blank: "no pot ser buit"
+      invalid: "conté caràcters no vàlids"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Aquest missatge s'ha tancat automàticament després d'arribar al límit màxim d'%{count} resposta."
@@ -2699,7 +2705,6 @@ ca:
       why: "Un resum breu de %{site_link} des de la vostra darrera visita el  %{last_seen_at}"
       since_last_visit: "Des de la vostra darrera visita"
       new_topics: "Temes nous"
-      unread_messages: "Missatges no llegits"
       unread_notifications: "Alertes sense llegir"
       liked_received: "M'agrades rebuts"
       new_users: "Usuaris nous"
@@ -3036,11 +3041,17 @@ ca:
         Aquesta insígnia es concedeix quan rebeu 5 'M'agrada' en 300 publicacions diferents. Molt bé! La comunitat admira les vostres aportacions freqüents i d'alta gran qualitat a les converses!
     out_of_love:
       name: Sense amor
+      long_description: |
+        Aquesta insígnia es concedeix quan gasteu tots els %{max_likes_per_day} dels vostres 'M'agrada' diaris. Dedicar un temps a mostrar estima per les publicacions que us han agradat encoratja els membres de la comunitat a crear discussions encara millors en el futur.
     higher_love:
       name: Un amor més elevat
+      long_description: |
+        Aquesta insígnia es concedeix quan gasteu tots els %{max_likes_per_day} dels vostres 'M'agrada' diaris durant 5 dies. Gràcies per animar activament les millors converses cada dia.
     crazy_in_love:
       name: Boig d'amor
       description: Ha fet servir 50 'M'agrada' en un dia 20 vegades
+      long_description: |
+        Aquesta insígnia es concedeix quan utilitzeu tots els vostres %{max_likes_per_day} 'm'agrada' diaris durant vint dies. Oh! Sou un model per a animar els companys de comunitat!
     thank_you:
       name: Gràcies
       description: Té 20 publicacions amb 'm'agrada' i ha donat 10 'm'agrada'
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index 629dd6b113..17674fc998 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -225,6 +225,12 @@ cs:
   too_late_to_edit: "Tento příspěvek byl vytvořen velmi dávno. Už ho není možné smazat ani upravovat."
   revert_version_same: "Aktuální verze je stejná jako verze, na kterou se pokoušíte vrátit."
   excerpt_image: "obrázek"
+  bookmarks:
+    reminders:
+      later_today: "Později během dnešního dne"
+      tomorrow: "Zítra"
+      next_week: "Další týden"
+      next_month: "Další měsíc"
   groups:
     errors:
       can_not_modify_automatic: "Nelze měnit automatické skupiny"
@@ -883,6 +889,10 @@ cs:
   redirected_to_top_reasons:
     new_user: "Vítejte v naší komunitě! Tohle jsou poslední populární témata."
     not_seen_in_a_month: "Vítejte zprátky! Chvíli jsme se neviděli. Tohle jsou nejpopulárnější témata od vaší poslední návštěvy."
+  publish_page:
+    slug_errors:
+      blank: "nemůže zůstat prázdné"
+      invalid: "obsahuje neplatné znaky"
   topic_statuses:
     autoclosed_disabled: "Toto téma je otevřeno. Nové odpovědi jsou povoleny."
     autoclosed_disabled_lastpost: "Toto téma je otevřeno. Nové odpovědi jsou povoleny."
@@ -960,7 +970,6 @@ cs:
       why: "Krátký souhrn z webu %{site_link} od poslední návštěvy v %{last_seen_at}"
       since_last_visit: "Od poslední návštěvy"
       new_topics: "Nová témata"
-      unread_messages: "Nepřečtené zprávy"
       liked_received: "Obdržených 'líbí se'"
       new_users: "Noví uživatelé"
       popular_topics: "Populární témata"
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 05e49b2d2c..0d255dc1f1 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -57,7 +57,6 @@ da:
       no_multilevels_components: "Temaer med børnetemaer kan ikke selv være børn af andre temaer"
     settings_errors:
       invalid_yaml: "Forsynet YAML er ugyldig."
-      data_type_not_a_number: "Indstillingen `%{name}`s type er ikke understøttet. Understøttede typer er `integer`, `bool`, `list` og `enum`"
       name_too_long: "Der er en indstilling med et for langt navn. Maksimal længde er 255"
       default_value_missing: "Indstilling af `%{name}` har ingen standard værdi"
       default_not_match_type: "Indstilling af `%{name}`s standard værdi's type stemmer ikke overens med den type fundet i indstillingerne."
@@ -221,7 +220,7 @@ da:
     in_reply_to: "▶ %{username}"
     replies:
       one: "%{count} svar"
-      other: "%{count} svarer"
+      other: "%{count} svar"
     last_reply: "Sidste svar"
     created: "Oprettet"
   no_mentions_allowed: "Beklager, du kan ikke nævne andre brugere."
@@ -293,9 +292,10 @@ da:
   excerpt_image: "billede"
   bookmarks:
     reminders:
+      later_today: "Senere i dag"
       tomorrow: "I morgen"
       next_week: "Næste uge"
-      next_month: "Næste måned"
+      next_month: "Næste Månede"
       custom: "Valgfri dato og tid"
   groups:
     success:
@@ -967,8 +967,6 @@ da:
     email_custom_headers: "En liste af brugerdefinerede e-mail-headers adskilt af |-tegn."
     force_https: "Tving din side til kun at anvende HTTPS. Slå ikke denne funktion til før det er sat helt op og virker overalt! Har du tjekket dit CDN, alle social logins, og eksterne logos og afhængigheder og sikret at de også er HTTPS kompatible?"
     summary_score_threshold: "Påkrævet minimum score for et indlæg til at blive inkluderet i 'opsummering af emne'"
-    summary_posts_required: "Minimum antal indlæg i et emne, før 'opsummer dette emne' er aktiveret"
-    summary_likes_required: "Minimum antal likes på et emne før 'opsummer dette emne' er aktiveret"
     summary_percent_filter: "Når en bruger kllikker 'Opsummer dette Emne' vises top % af indlæg"
     enable_personal_messages: "Tillad Trust Level 1 (kan konfigureres minimum trust level til at sende beskeder), brugere til at sende og svare på beskeder. Bemærk at moderatorer beskeder, uanset hvad."
     enable_long_polling: "Message bus til underretninger kan bruge long polling"
@@ -1009,7 +1007,6 @@ da:
     google_oauth2_client_id: "Client ID of your Google application."
     google_oauth2_client_secret: "Client secret of your Google application."
     enable_instagram_logins: "Aktivér Instagram-login, kræver instagram_consumer_key og instagram_consumer_secret"
-    readonly_mode_during_backup: "Slå \"read-only\" tilstand til mens der foretages backup"
     active_user_rate_limit_secs: "Hvor ofte vi opdaterer feltet 'last_seen_at', i sekunder."
     previous_visit_timeout_hours: "Hvor lang tid et besøg varer før vi regner det med i det 'forrige' besøg, i timer."
     max_likes_per_day: "Maksimalt antal likes per bruger per dag."
@@ -1113,6 +1110,10 @@ da:
   frequent_poster: "Hyppig forfatter"
   redirected_to_top_reasons:
     new_user: "Velkommen til fællesskabet! Dette er de seneste mest populære emner."
+  publish_page:
+    slug_errors:
+      blank: "kan ikke være tom"
+      invalid: "indeholder ugyldige tegn"
   topic_statuses:
     autoclosed_enabled_days:
       one: "Dette emne blev automatisk lukket efter %{count} dag. Nye svar er ikke længere tilladt."
@@ -1485,7 +1486,6 @@ da:
       why: "Et kort resumé af %{site_link} siden dit sidste besøg %{last_seen_at}"
       since_last_visit: "Siden dit sidste besøg"
       new_topics: "Nye emner"
-      unread_messages: "Ulæste beskeder"
       unread_notifications: "Ulæste beskeder"
       liked_received: "Modtagne \"Synes om\""
       new_users: "Nye brugere"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index e8570280b0..cd216e367c 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -59,7 +59,6 @@ de:
       optimized_link: Optimierte Bild-Verknüpfungen sind kurzlebig und sollten nicht in Theme-Quellcode enthalten sein.
     settings_errors:
       invalid_yaml: "Der YAML-Code ist ungültig."
-      data_type_not_a_number: "Der eingestellte Datentyp `%{name}` wird nicht unterstützt. Unterstützte Datentypen sind `integer`, `bool`, `list` und `enum`."
       name_too_long: "Es gibt eine Einstellung mit einem zu langen Namen. Die maximale Länge beträgt 255 Zeichen."
       default_value_missing: "Einstellung `%{name}` hat keinen Standardwert."
       default_not_match_type: "Bei der Einstellung `%{name}` stimmt der Datentyp des Standardwerts nicht mit dem Datentyp der Einstellung überein."
@@ -289,6 +288,7 @@ de:
   pm_reached_recipients_limit: "Entschuldige, aber Du kannst nicht mehr als %{recipients_limit} Empfänger in einer Nachricht haben."
   removed_direct_reply_full_quotes: "Automatisch entferntes Zitat des gesamten vorherigen Beitrags."
   secure_upload_not_allowed_in_public_topic: "Entschuldigung, der/die folgende/n sichere Upload(s) konnte nicht in einem öffentlichen Thema verwendet werden: %{upload_filenames}."
+  create_pm_on_existing_topic: "Entschuldigung, du kannst keine PM für ein exisiterendes Thema erstellen."
   just_posted_that: "ist einer einer vor Kurzem von dir geschriebenen Nachricht zu ähnlich"
   invalid_characters: "enthält ungültige Zeichen"
   is_invalid: "scheint unklar, ist das ein ganzer Satz?"
@@ -332,7 +332,6 @@ de:
     reminders:
       at_desktop: "Nächstes mal wenn ich an meinem PC bin"
       later_today: "Im Laufe des Tages"
-      next_business_day: "Nächster Geschäftstag"
       tomorrow: "Morgen"
       next_week: "Nächste Woche"
       next_month: "Nächster Monat"
@@ -366,7 +365,6 @@ de:
       trust_level_4: "vertrauensstufe_4"
     request_membership_pm:
       title: "Mitgliedschaftsanfrage für @%{group_name}"
-      handle: "Mitgliedschaftsanfrage bearbeiten"
     view_hidden_topic_request_reason: "Ich möchte der Gruppe '%{group_name}' beitreten, damit ich auf [this topic](%{topic_url}) zugreifen kann"
   education:
     until_posts:
@@ -1052,6 +1050,7 @@ de:
       labels:
         level: Stufe
       description: "Anzahl von Benutzern nach Vertrauensstufe."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Benutzer nach Art"
       xaxis: "Art"
@@ -1244,7 +1243,6 @@ de:
   dashboard:
     rails_env_warning: "Dein Server läuft im %{env}-Modus."
     host_names_warning: "Deine config/database.yml-Datei verwendet localhost als Hostname. Trage hier den Hostnamen deiner Website ein."
-    gc_warning: 'Dein Server verwendet die Standardparameter für Rubys Garbage-Collector, die nicht optimal sind. Lese dieses Thema über Performanzeinstellungen (en): <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq läuft nicht. Viele Aufgaben, wie zum Beispiel das Versenden von E-Mails, werden asynchron durch Sidekiq ausgeführt. Bitte stell sicher, dass mindestens ein Sidekiq-Prozess läuft. <a href="https://github.com/mperham/sidekiq">Mehr über Sidekiq erfährst du hier (en)</a>.'
     queue_size_warning: "Eine hohe Anzahl an Aufgaben (%{queue_size}) befindet sich in der Warteschlange. Dies könnte auf ein Problem mit Sidekiq hinweisen oder du musst zusätzliche Sidekiq Worker starten."
     memory_warning: "Dein Server läuft mit weniger als 1 GB Hauptspeicher. Mindestens 1 GB Hauptspeicher werden empfohlen."
@@ -1355,8 +1353,6 @@ de:
     force_https: "Erzwinge HTTPS für deine Site. ACHTUNG: Aktiviere dies nicht, bevor HTTPS nicht vollständig eingerichtet ist und auf jeden Fall überall funktioniert! Hast du alle CDN-Netzwerke, alle Logins über Soziale Netzwerke, alle externe Logos / Abhängigkeiten geprüft, um sicherzustellen, dass sie auch alle HTTPS-kompatibel sind?"
     same_site_cookies: "Verwende Same-Site-Cookies, die alle Angriffsszenarien für Cross-Site-Request-Forgery in unterstützten Browsern verhindern. Warnung: Strikt wird nur auf Seiten funktionieren, die Login erzwingen und SSO verwenden."
     summary_score_threshold: "Mindestpunktzahl, die ein Beitrag benötigt, um in der \"Thema zusammenfassen\"-Ansicht zu erscheinen."
-    summary_posts_required: "Mindestanzahl an Beiträgen in einem Thema, bevor die \"Thema zusammenfassen\"-Funktion aktiviert wird."
-    summary_likes_required: "Mindestanzahl an Likes in einem Thema, bevor die \"Thema zusammenfassen\" Funktion aktiviert wird."
     summary_percent_filter: "Zeige die besten (n)% der Beiträge eines Themas in der \"Thema zusammenfassen\"-Ansicht."
     summary_max_results: "Maximale Anzahl der Beiträge bei 'Dieses Thema zusammenfassen'"
     enable_personal_messages: "Erlaube Benutzern mit der Vertrauensstufe 1 (konfigurierbar über die minimale Vertrauensstufe zum Senden von Nachrichten), Nachrichten zu erstellen und auf Nachrichten zu antworten. Beachte, dass das Team immer Nachrichten und Antworten senden kann."
@@ -1388,7 +1384,6 @@ de:
     markdown_typographer_quotation_marks: "Liste von doppelten und einzelnen Ausführungszeichen-Paaren für die Ersetzung"
     post_undo_action_window_mins: "Minuten, die ein Benutzer hat, um Aktionen auf einen Beitrag rückgängig zu machen (Gefällt mir, Meldung, usw.)."
     must_approve_users: "Alle neuen Benutzerkonten müssen von Mitarbeitern freigeschaltet werden, bevor sie Zugriff auf die Seite erhalten."
-    approve_suspect_users: "Team Mitglieder müssen alle verdächtigen Benutzerkonten genehmigen"
     pending_users_reminder_delay: "Benachrichtige die Moderatoren, falls neue Benutzer mehr als so viele Stunden auf ihre Genehmigung gewartet haben. Stelle -1 ein, um diese Benachrichtigungen zu deaktivieren."
     maximum_session_age: "Benutzer bleiben (n) Stunden nach ihrem letzten Besuch angemeldet"
     ga_universal_tracking_code: "Tracking Code ID von Google Universal Analytics (analytics.js), eg: UA-12345678-9; siehe <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -1494,7 +1489,6 @@ de:
     discord_client_id: 'Discord Client ID (benötigst du eine? besuche<a href="https://discordapp.com/developers/applications/me">das Discord Entwickler Portal</a>)'
     discord_secret: "Discord geheimer Schlüssel"
     discord_trusted_guilds: 'Das Einloggen per Discord nur Mitgliedern dieser Discord Gilden gestatten. Verwende die numerische ID der Gilde. Lies die Anleitung <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">hier</a>, um mehr zu erfahren. Leer lassen um jede Gilde zuzulassen.'
-    readonly_mode_during_backup: "Nur-Lesen-Modus beim Erstellen einer Sicherung aktivieren"
     enable_backups: "Erlaube Administratoren, Backups des Forums zu erstellen"
     allow_restore: "Wiederherstellung von Sicherungen zulassen, die ALLE vorhandenen Daten überschreiben! Auf 'false' lassen, sofern Sie nicht planen, eine Sicherung wiederherzustellen."
     maximum_backups: "Die maximale Anzahl an Sicherungen, die auf dem Server gespeichert werden. Ältere Sicherungen werden automatisch gelöscht."
@@ -1502,7 +1496,7 @@ de:
     backup_frequency: "Die Anzahl von Tagen zwischen Backups."
     s3_backup_bucket: "Der entfernte Speicherort für Ihre Sicherungen. WARNUNG: Stellen Sie sicher, dass es sich um einen privaten Speicherort handelt."
     s3_endpoint: "Dieser Endpunkt kann so angepasst werden, dass er die Sicherung an einen S3-kompatiblen Service wie DigitalOcean Spaces oder Minio übertragt. WARNUNG: Verwende den Standard bei Verwendung von AWS S3."
-    s3_configure_tombstone_policy: "Aktiviere die automatische Löschregel für Grabstein-Uploads. WICHTIGT: Wenn deaktiviert, wird kein Speicherplatz freigegeben, wenn Uploads gelöscht werden."
+    s3_configure_tombstone_policy: "Aktiviere die automatische Löschregel für Grabstein-Uploads. WICHTIG: Wenn deaktiviert, wird kein Speicherplatz freigegeben, wenn Uploads gelöscht werden."
     s3_disable_cleanup: "Deaktiviere das Löschen von Backups aus S3 wenn sie lokal entfernt werden"
     enable_s3_inventory: "Erstelle Berichte und überprüfe Uploads mit Amazon S3-Bestand. WICHTIG: Benötigt gültige S3-Anmeldeinformationen (sowohl access_key_id als auch secret_access_key)."
     backup_time_of_day: "Uhrzeit in UTC, wenn Backups ausgeführt werden sollen."
@@ -1625,6 +1619,7 @@ de:
     desktop_category_page_style: "Visueller Stil für die /categories Seite"
     category_colors: "Liste hexadezimaler Farbwerte, die als Kategoriefarben erlaubt sind."
     category_style: "Visueller Stil für Kategorie-Abzeichen."
+    max_image_size_kb: "Die maximale Bild Upload Größe in kB. Sie muss in nginx (client_max_body_size) / Apache oder einem Proxy ebenfalls konfiguriert werden. Bilder, die größer als dieses Limit und kleiner als client_max_body_size sind werden in der Größe verändert, um für den Upload zu passen."
     max_attachment_size_kb: "Maximale Größe hochgeladener Dateianhänge in kB. Dieser Wert muss auch in Nginx (client_max_body_size), Apache oder anderen Proxies entsprechend konfiguriert werden."
     authorized_extensions: "Liste von erlaubten Dateiendungen für hochgeladene Dateien ('*' um alle Dateiendungen zu erlauben)"
     authorized_extensions_for_staff: "Eine Liste von erlaubten Dateiendungen für den Upload von Dateien durch Team-Benutzer, zusätzlich zu der in der Seiteninstellung `authorized_extensions` definierten Liste. (Der Wert „*“ erlaubt alle Dateitypen.)"
@@ -1811,7 +1806,6 @@ de:
     delete_drafts_older_than_n_days: "Lösche Entwürfe, die mehr als (n) Tage alt sind."
     bootstrap_mode_min_users: "Erforderliche Benutzeranzahl, um den Starthilfe-Modus zu deaktivieren (0 = ausgeschaltet)"
     prevent_anons_from_downloading_files: "Nichtangemeldeten Benutzern das Herunterladen von Anhängen verbieten. WARNUNG: dies verhindert auch das Herunterladen jeglicher Ressourcen für Website-Anpassungen, die als Anhänge gespeichert wurden."
-    secure_media: 'Beschränkt den Zugriff auf Medien-Uploads (Bilder, Videos, Audio). Falls "Login erforderlich" aktiviert ist, können nur angemeldete Benutzer auf Medien-Uploads zugreifen. Sonst wird der Zugriff nur für Medien-Uploads in privaten Nachrichten beschränkt. Hinweis. S3 Uploads müssen vor Aktivierung dieser Einstellung aktiviert sein.'
     slug_generation_method: "Gib eine Methode an, wie Kürzel in URLs generiert werden sollen. 'encoded' verwendet einen Prozent-Encodierten String, bei 'none' wird kein Kürzel verwendet."
     enable_emoji: "Aktiviere emoji"
     enable_emoji_shortcuts: "Geläufige Text-Smileys wie :) :p :( werden in Emojis umgewandelt"
@@ -1993,6 +1987,10 @@ de:
       other: "%{count} Beiträge wurden in eine existierende Nachricht verschoben: %{topic_link}"
   change_owner:
     post_revision_text: "Eigentümer übertragen."
+  publish_page:
+    slug_errors:
+      blank: "darf nicht leer sein"
+      invalid: "enthält ungültige Zeichen"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Diese Nachricht wurde automatisch geschlossen, nachde mdie maximale Anzahl von einer Antwort erreicht wurde."
@@ -2083,6 +2081,7 @@ de:
     second_factor_backup_description: "Bitte gib einen deiner Wiederherstellungs-Codes ein:"
     second_factor_backup_title: "Zwei-Faktor-Wiederherstellungs-Code"
     invalid_second_factor_code: "Ungültiger Authentifizierungscode. Jeder Code kann nur einmal benutzt werden."
+    invalid_security_key: "Ungültiger Sicherheitsschlüssel."
     second_factor_toggle:
       backup_code: "Benutze stattdessen einen Backup Code"
   admin:
@@ -2536,7 +2535,7 @@ de:
       date_invalid: "Kein Beitrag-Erstelldatum gefunden. Fehlt der E-Mail ein „Date:“-Header?"
     email_reject_post_too_short:
       title: "E-Mail Ablehnungsbeitrag zu kurz"
-      subject_template: "[%{email_prefix}] Email Problem -- Beitrag zu kurz"
+      subject_template: "[%{email_prefix}] E-Mail Problem -- Beitrag zu kurz"
       text_body_template: |
         Es tut uns leid aber Deine E-Mail Nachricht an %{destination} (betitelt mit %{former_title}) funktionierte nicht.
 
@@ -2970,7 +2969,6 @@ de:
       why: "Eine kurze Zusammenfassung von %{site_link} seit deinem letzten Besuch am %{last_seen_at}"
       since_last_visit: "Seit deinem letzten Besuch"
       new_topics: "Neue Themen"
-      unread_messages: "Ungelesene Nachrichten"
       unread_notifications: "Ungelesene Benachrichtigungen"
       liked_received: "Erhaltene Likes"
       new_users: "Neue Benutzer"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 8263d27680..40782e4934 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -211,6 +211,12 @@ el:
   too_late_to_edit: "Αυτή η ανάρτηση δημιουργήθηκε πολύ καιρό πριν. Δεν μπορεί πλέον να γίνει επεξεργασία της ή να διαγραφεί."
   revert_version_same: "Η τρέχουσα έκδοση είναι η ίδια με την έκδοση που προσπαθείς να επαναφέρεις."
   excerpt_image: "εικόνα"
+  bookmarks:
+    reminders:
+      later_today: "Αργότερα σήμερα"
+      tomorrow: "Αύριο"
+      next_week: "Την άλλη εβδομάδα"
+      next_month: "Τον άλλο μήνα"
   groups:
     errors:
       can_not_modify_automatic: "Δεν μπορείς να τροποποιήσεις μια αυτόματη ομάδα"
@@ -889,8 +895,6 @@ el:
     force_https: "Αναγκάζει το site σας να χρησιμοποιεί μόνο HTTPS. ΠΡΟΣΟΧΗ: Μην το ενεργοποιήσετε, μέχρι να επαληθεύσετε ότι το HTTPS είναι πλήρως εγκατεστημένο και λειτουργεί απολύτως παντού! Ελέγξατε το CDN σας, όλες τις κοινωνικές συνδέσεις και τα εξωτερικά σας λογότυπα / εξαρτήσεις για να βεβαιωθείτε ότι είναι όλα συμβατά με HTTPS;"
     same_site_cookies: "Χρησιμοποίηση των ίδιων cookies της σελίδας, το οποίο καταργεί όλα τα vectors Cross Site Request Forgery σε υποστηριζόμενους περιηγητές (Lax ή Strict). Προσοχή: Το Strict θα λειτουργήσει μόνο σε σελίδες που εξαναγκάζουν την σύνδεση και την χρήση SSO"
     summary_score_threshold: "Η ελάχιστη βαθμολογία που απαιτείται από μια ανάρτηση για να συμπεριληφθεί στο «Συνοψίστε αυτό το θέμα»"
-    summary_posts_required: "Ελάχιστες αναρτήσεις σε ένα νήμα πριν το «Συνοψίστε αυτό το θέμα» ενεργοποιηθεί"
-    summary_likes_required: "Ελάχιστος αριθμός ''Μου αρέσει'' σε ένα θέμα πριν ενεργοποιηθεί το «Συνοψίστε αυτό το θέμα» "
     summary_percent_filter: "Όταν ο χρήστης επιλέξει «Συνοψίστε αυτό το θέμα», δείξε το κορυφαίο % των αναρτήσεων"
     enable_personal_messages: "Επίτρεψε στους χρήστες επιπέδου εμπιστοσύνης 1 (ρυθμιζόμενο μέσω min trust level to send messages) να δημιουργήσουν μηνύματα και να απαντήσουν σε μηνύματα. Σημειώστε ότι οι συνεργάτες μπορούν πάντα να στέλνουν μηνύματα."
     enable_long_polling: "Η αρτηρία μηνυμάτων που χρησιμοποιείτε για ειδοποιήσεις μπορεί να χρησιμοποιήσει μακρυά μέθοδο εξέτασης."
@@ -967,7 +971,6 @@ el:
     enable_instagram_logins: "Ενεργοποίησε την επαλήθευση μέσω Instagram, απαιτεί instagram_consumer_key και instagram_consumer_secret"
     instagram_consumer_key: "Consumer key για επαλήθευση μέσω Instagram"
     instagram_consumer_secret: "Consumer secret για επαλήθευση μέσω Instagram"
-    readonly_mode_during_backup: "Ενεργοποίηση της λειτουργίας \"μόνο-ανάγνωση\" κατά τη διάρκεια δημιουργίας αντίγραφου ασφαλείας"
     allow_restore: "Επίτρεψε επαναφορά, η οποία μπορεί να αντικαταστήσει ΟΛΑ τα δεδομένα του ιστότοπου! Αφήστε απενεργοποιημένο, εκτός αν σχεδιάζετε να επαναφέρετε αντίγραφο ασφαλείας"
     maximum_backups: "Το μέγιστο ποσό αντιγράφων ασφαλείας το οποία θα διατηρηθούν στο δίσκο. Παλαιότερα αντίγραφα ασφαλείας διαγράφονται αυτόματα"
     automatic_backups_enabled: "Πάρε αυτόματα αντίγραφα ασφαλείας όπως ορίζεται στη συχνότητα αντιγράφων ασφαλείας"
@@ -1304,6 +1307,10 @@ el:
     errors:
       different_topics: "Δημοσιεύσεις που ανήκουν σε διαφορετικά νήματα δεν μπορούν να συγχωνευθούν."
       different_users: "Δημοσιεύσεις που ανήκουν σε διαφορετικούς χρήστες δεν μπορούν να συγχωνευθούν."
+  publish_page:
+    slug_errors:
+      blank: "δεν μπορεί να είναι άδειο"
+      invalid: "περιέχει μη έγκυρους χαρακτήρες"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Αυτό το μήνυμα έκλεισε αυτόματα αφού έφτασε το μέγιστο όριο της %{count} απάντησης."
@@ -2012,7 +2019,6 @@ el:
       why: "Μια σύντομη σύνοψη του %{site_link} από την τελευταία σου επίσκεψη στις %{last_seen_at}"
       since_last_visit: "Από την τελευταία σου επίσκεψη"
       new_topics: "Νέα Νήματα"
-      unread_messages: "Αδιάβαστα Μηνύματα"
       unread_notifications: "Αδιάβαστες Ειδοποιήσεις"
       liked_received: "Ληφθέντα \"Μου αρέσει\""
       new_users: "Νέοι Χρήστες"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 9f545d92eb..8501b266d8 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -47,6 +47,7 @@ es:
       generic: Se produjo un error al importar ese tema
       about_json: "Error de importación: about.json no existe, o es inválido"
       about_json_values: "about.json contiene valores inválidos: %{errors}"
+      modifier_values: "los modificadores about.json contienen valores inválidos: %{errors}"
       git: "Error al clonar el repositorio git, se deniega el acceso o no se encuentra el repositorio"
       unpack_failed: "Error al descomprimir el archivo"
       file_too_big: "El archivo sin comprimir es demasiado grande."
@@ -59,7 +60,6 @@ es:
       optimized_link: Los enlaces de imagen optimizados son efímeros y no deben incluirse en el código fuente del tema.
     settings_errors:
       invalid_yaml: "El YAML provisto es inválido."
-      data_type_not_a_number: "El tipo de ajuste «%{name}» no está soportado. Los tipos soportados son: «integer», «bool», «list» y «enum»"
       name_too_long: "Hay un ajuste con un nombre muy largo. La cantidad máxima de caracteres es 255"
       default_value_missing: "El ajuste «%{name}» no tiene valor por defecto"
       default_not_match_type: "El tipo de valor por defecto para el ajuste «%{name}» no coincide con el tipo de ajuste."
@@ -289,6 +289,7 @@ es:
   pm_reached_recipients_limit: "Lo sentimos, no puedes tener más de %{recipients_limit} destinatarios en un mensaje."
   removed_direct_reply_full_quotes: "Cita de toda la publicación anterior eliminada automáticamente."
   secure_upload_not_allowed_in_public_topic: "Lo sentimos, la(s) siguiente(s) subida(s) no se pueden utilizar en un tema público: %{upload_filenames}."
+  create_pm_on_existing_topic: "Lo sentimos, no puedes crear un mensaje privado en un tema existente."
   just_posted_that: "es demasiado parecido a lo que has publicado recientemente"
   invalid_characters: "contiene caracteres inválidos"
   is_invalid: "parece poco claro, ¿es una oración completa?"
@@ -328,14 +329,15 @@ es:
   bookmarks:
     errors:
       already_bookmarked_post: "No puedes guardar la misma publicación en marcadores dos veces."
+      cannot_set_past_reminder: "No puedes establecer un recordatorio de marcador en el pasado."
+      cannot_set_reminder_in_distant_future: "No puedes establecer un recordatorio de marcador más de 10 años en el futuro."
       time_must_be_provided: "se debe especificar la hora para todos los recordatorios excepto '%{reminder_type}'"
     reminders:
       at_desktop: "La próxima vez que esté en mi ordenador"
-      later_today: "Más tarde hoy"
-      next_business_day: "El próximo día hábil"
+      later_today: "Más tarde durante el día de hoy"
       tomorrow: "Mañana"
-      next_week: "La próxima semana"
-      next_month: "El mes que viene"
+      next_week: "Próxima semana"
+      next_month: "Próximo mes"
       custom: "Fecha y hora personalizadas"
   groups:
     success:
@@ -366,7 +368,6 @@ es:
       trust_level_4: "nivel_de_confianza_4"
     request_membership_pm:
       title: "Solicitud de membresía para @%{group_name}"
-      handle: "atender solicitud de membresía"
     view_hidden_topic_request_reason: "Me gustaría unirme al grupo «%{group_name}» para poder acceder a [este tema](%{topic_url})"
   education:
     until_posts:
@@ -476,6 +477,10 @@ es:
               same_as_password: "es igual a tu contraseña."
             ip_address:
               signup_not_allowed: "No se permite el registro desde esta cuenta."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Este tema no puede ser destacado en tu perfil."
         user_email:
           attributes:
             user_id:
@@ -1072,6 +1077,7 @@ es:
       labels:
         level: Nivel
       description: "Número de usuarios agrupados por nivel de confianza."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Usuarios por tipos"
       xaxis: "Tipo"
@@ -1264,7 +1270,6 @@ es:
   dashboard:
     rails_env_warning: "Tu servidor está funcionando en modo de %{env}."
     host_names_warning: "Tu archivo config/database.yml está utilizando el hostname localhost predeterminado. Actualízalo para usar el hostname de tu sitio."
-    gc_warning: 'Tu servidor está usando los parámetros predeterminados de ruby para la recolección de residuos, lo cual no te proveerá el mejor rendimiento. Lee este tema sobre la optimización del rendimiento: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Optimización de Ruby and Rails para Discourse</a>.'
     sidekiq_warning: 'Sidekiq no está funcionando. Muchas tareas, tal como el envío de correos electrónicos, están siendo realizadas desincronizadamente por sidekiq. Por favor, asegúrate de que por lo menos un proceso de sidekiq está funcionando. <a href="https://github.com/mperham/sidekiq" target="_blank">Aprende sobre Sidekiq aquí</a>.'
     queue_size_warning: "El número de tareas en cola es %{queue_size}, que es una cifra alta. Esto podría indicar un problema en el proceso (o procesos) de Sidekiq, o tal vez deberías añadir más trabajadores de Sidekiq."
     memory_warning: "Tu servidor está funcionando con menos de 1 GB de memoria total. Se recomienda una memoria de al menos 1 GB de capacidad."
@@ -1375,8 +1380,6 @@ es:
     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, ellos 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 forcen el inicio de sesión y usen SSO. "
     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 en un tema para habilitar el «resumen de este tema»"
-    summary_likes_required: "Cantidad mínina de me gusta en un tema para habilitar «resumen de este tema»"
     summary_percent_filter: "Cuando un usuario hace clic en «resumen de este tema», mostrar el % de las publicaciones destacadas"
     summary_max_results: "Cantidad máxima de publicaciones devueltas en «resumen de este tema»"
     enable_personal_messages: "Permitir a los usuarios con nivel de confianza 1 (configurable a través del mínimo nivel de confianza para enviar mensajes) crear mensajes y responder a ellos. Ten en cuenta que el staff siempre puede enviar mensajes pase lo que pase."
@@ -1408,7 +1411,8 @@ es:
     markdown_typographer_quotation_marks: "Lista de pares de reemplazo de comillas dobles y simples"
     post_undo_action_window_mins: "Número de minutos durante los cuales los usuarios pueden deshacer sus acciones recientes en una publicación (me gusta, reportes, etc)."
     must_approve_users: "El staff debe aprobar todas las cuentas nuevas antes de que se les permita acceder al sitio."
-    approve_suspect_users: "El staff debe aprobar todas las cuentas sospechosas"
+    invite_code: "El usuario debe ingresar este código para que se le permita el registro de la cuenta, ignorado cuando está vacío (no distingue entre mayúsculas y minúsculas)"
+    approve_suspect_users: "Agregar usuarios sospechosos a la lista por revisión. Los usuarios sospechosos que hayan ingresado una biografía/página web pero que no hayan registrado ninguna actividad de lectura."
     pending_users_reminder_delay: "Notificar a los moderadores si hay usuarios nuevos que hayan estado esperando aprobación durante más de esta cantidad de horas. Usa -1 para desactivar estas notificaciones."
     maximum_session_age: "El usuario permanecerá con su sesión iniciada n horas desde su última visita"
     ga_universal_tracking_code: "Código de seguimiento de Google Universal Analytics (analytics.js), ejemplo: UA-12345678-9; visita <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -1514,7 +1518,6 @@ es:
     discord_client_id: 'ID de cliente de Discord (¿necesitas una? visita <a href="https://discordapp.com/developers/applications/me">el portal del desarrollador</a>)'
     discord_secret: "Clave secreta de Discord"
     discord_trusted_guilds: 'Solo permitir a los miembros de estos clanes de Discord conectarse mediante Discord. Utiliza la ID numérica del clan. Para más información, revisa las instrucciones <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">aquí</a>. Dejar en blanco para permitir todos los clanes.'
-    readonly_mode_during_backup: "Habilitar el modo de solo lectura mientras se crea un respaldo"
     enable_backups: "Permitir a los administradores crear respaldos del foro"
     allow_restore: "Permitir restaurar, ¡lo cual puede remplazar TODOS los datos del sitio! Dejar en falso a menos de que tengas planeado recuperar los datos desde una copia de respaldo. "
     maximum_backups: "La cantidad máxima de copias de respaldo que se mantendrán en el disco. Las copias de respaldo más antiguas se eliminan automáticamente"
@@ -1645,11 +1648,13 @@ es:
     desktop_category_page_style: "Estilo visual de la página de /categorías."
     category_colors: "Una lista de valores en hexadecimal de los colores para las categorías."
     category_style: "Estilo visual de las etiquetas de categoría."
+    max_image_size_kb: "El tamaño máximo que puede tener una imagen que se subirá en kB. Esto se tiene que configurar en nginx (client_max_body_size) / apache o proxy también. Las imágenes con un tamaño mayor que este y menores que el client_max_body_size sufrirán una adaptación de tamaño para ajustarse al tamaño de subida."
     max_attachment_size_kb: "El tamaño máximo, en kB, de los archivos que se pueden adjuntar. Debe ser configurado también en nginx (client_max_body_size) / apache o proxy."
     authorized_extensions: "Una lista de las extensiones de archivo que se permite subir (usa «*» para habilitar todos los tipos de archivo)"
     authorized_extensions_for_staff: "Una lista de las extensiones de archivo que se le permite subir a miembros del staff sumada a la lista definida en la configuración `authorized_extensions`. (Usa «*» para habilitar todos los tipos)"
     theme_authorized_extensions: "Una lista de las extensiones de archivo que se permite subir (usa «*» para habilitar todos los tipos)"
     max_similar_results: "Cantidad de temas similares que se muestran encima del editor cuando se está creando un nuevo tema. La comparación se basa en el título y el cuerpo del tema."
+    max_image_megapixels: "Número máximo de megapíxeles permitidos para una imagen. Las imágenes con un numero de megapíxeles mayor que este se rechazarán."
     title_prettify: "Prevenir errores comunes en el título, incluidos los títulos escritos todo mayúsculas, con la primera letra en minúscula, con múltiples signos ! o ?, . adicional al final, etc."
     title_remove_extraneous_space: "Eliminar los espacios en blanco delante de la puntuación final."
     automatic_topic_heat_values: 'Actualizar automáticamente la configuración de «temperatura de vistas del tema» y «temperatura de me gusta de publicaciones del tema» según la actividad del sitio.'
@@ -1689,6 +1694,8 @@ es:
     reviewable_claiming: "¿Es necesario reclamar el contenido revisable antes de poder actuar sobre el mismo?"
     reviewable_default_topics: "Mostrar contenido revisable agrupado por tema por defecto"
     reviewable_default_visibility: "No muestre elementos revisables a menos que cumplan con esta prioridad"
+    high_trust_flaggers_auto_hide_posts: "Las publicaciones de los usuarios nuevos se esconden automáticamente tras ser marcadas como spam por un usuario con NC3 o superior"
+    cooldown_hours_until_reflag: "Cantidad de tiempo que los usuarios deberán esperar antes de poder reportar de nuevo una publicación."
     reply_by_email_enabled: "Habilitar la respuesta a temas por correo electrónico."
     reply_by_email_address: "Plantilla para la dirección de correo electrónico que aparecerá al recibir correos con la función de respuesta por correo electrónico: %%{reply_key}@respuesta.ejemplo.com o respuestas+%%{reply_key}@ejemplo.com"
     alternative_reply_by_email_addresses: "Lista de plantillas alternativa para las direcciones de respuesta por correo electrónico. Ejemplo: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
@@ -1783,7 +1790,9 @@ es:
     ignored_users_count_message_threshold: "Notificar a los moderadores si un usuario en particular es ignorado este número de veces por otros usuarios."
     ignored_users_message_gap_days: "Tiempo que se espera antes de notificar a los moderadores de nuevo sobre un usuario que ha sido ignorado por muchos otros."
     clean_up_inactive_users_after_days: "Número de días antes de que se elimine un usuario inactivo (nivel de confianza 0 sin publicaciones). Para desactivar la limpieza, configure en 0."
+    clean_up_unused_staged_users_after_days: "Cantidad de días antes de que un usuario temporal (sin ninguna publicación) sea eliminado. Para inhabilitar esta limpieza de usuarios, establece el valor en 0."
     user_selected_primary_groups: "Permitir a los usuarios establecer su propio grupo primario"
+    max_notifications_per_user: "Cantidad máxima de notificaciones por usuario. Si se supera este número, las notificaciones antiguas se eliminarán. Aplicado semanalmente. Establece el valor en 0 para inhabilitar."
     user_website_domains_whitelist: "El sitio web del usuario será verificado con estos dominios. Lista delimitada por barras."
     allow_profile_backgrounds: "Permitir a los usuarios subir fondos de perfil."
     sequential_replies_threshold: "Número de mensajes seguidos que un usuario tiene que publicar antes de que se le recuerde que son demasiadas respuestas consecutivas."
@@ -1820,6 +1829,7 @@ es:
     highlighted_languages: "Reglas de resaltado de sintaxis incluidas. (Aviso: incluir demasiados lenguajes puede afectar al rendimiento) Ver: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> para un demo."
     embed_any_origin: "Permitir la inserción de contenido sin importar su origen. Esto se requiere para aplicaciones móviles con HTML estático."
     embed_topics_list: "Soportar la inserción HTML de listas de temas"
+    embed_set_canonical_url: "Establece la URL canónica para los temas insertados en la URL de los contenidos insertados."
     embed_truncate: "Truncar las publicaciones insertadas."
     embed_support_markdown: "Soporte de formato Markdown para publicaciones incrustadas."
     embed_whitelist_selector: "Lista separada por comas de elementos CSS que están permitidos en las inserciones."
@@ -1831,7 +1841,7 @@ es:
     delete_drafts_older_than_n_days: "Eliminar borradores de más de (n) días de antigüedad."
     bootstrap_mode_min_users: "Número mínimo de usuarios requerido para desactivar el modo bootstrap (establece en 0 para desactivar esta opción)"
     prevent_anons_from_downloading_files: "Impedir que los usuarios anónimos descarguen archivos. ADVERTENCIA: Esto impedirá que funcione cualquier recurso del sitio publicado como adjunto que no sea una imagen."
-    secure_media: 'Limita el acceso a los medios subidos (imágenes, video, audio). Si está habilitado «inicio de sesión requerido», solo los usuarios que hayan iniciado sesión pueden acceder a los medios subidos. En caso contrario, se limitará el acceso únicamente a los medios subidos en mensajes privados. Nota: se deben habilitar las subidas S3 antes de poder habilitar esta configuración.'
+    secure_media: 'Limita el acceso a los medios subidos (imágenes, video, audio). Si está habilitado «inicio de sesión requerido», solo los usuarios que hayan iniciado sesión pueden acceder a los medios subidos. En caso contrario, se limitará el acceso únicamente a los medios subidos en mensajes privados. ADVERTENCIA: se deben habilitar las subidas S3 antes de poder habilitar esta configuración. Ver <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">the secure media topic on Meta</a> para más detalles.'
     slug_generation_method: "Elegir un método de generación de slug. «encoded» generará cadenas con código porcentual. «none» deshabilitará completamente el slug."
     enable_emoji: "Habilitar emoji"
     enable_emoji_shortcuts: "Texto común de emoticones como :) :p :( se convertirán a emojis"
@@ -1914,6 +1924,9 @@ es:
     push_notifications_icon: "El icono de la medalla que aparece en la esquina de notificación. El tamaño requerido es de 96 × 96."
     short_title: "El título corto se utilizará en la pantalla de inicio del usuario, el iniciador u otros lugares donde el espacio puede ser limitado. Debe limitarse a 12 caracteres."
     dashboard_general_tab_activity_metrics: "Selecciona los reportes que se muestran como medidas de actividad en la pestaña general."
+    gravatar_name: "Nombre del proveedor de Gravatar"
+    gravatar_base_url: "URL de la API base del proveedor de Gravatar"
+    gravatar_login_url: "URL relativa a gravatar_base_url, la cual provee al usuario el acceso al servicio de Gravatar"
     errors:
       invalid_email: "Dirección de correo electrónico inválida. "
       invalid_username: "No existe ningún usuario con ese nombre de usuario. "
@@ -2013,6 +2026,10 @@ es:
       other: "%{count} publicaciones han sido unidas a un mensaje existente: %{topic_link}"
   change_owner:
     post_revision_text: "Se ha transferido la propiedad"
+  publish_page:
+    slug_errors:
+      blank: "no puede dejarse en blanco"
+      invalid: "contiene caracteres inválidos"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Este mensaje fue cerrado automáticamente al alcanzar el límite máximo de %{count} respuesta."
@@ -2095,6 +2112,7 @@ es:
     new_registrations_disabled: "El registro de nuevas cuentas no está permitido en este momento."
     password_too_long: "Las contraseñas están limitadas a 200 caracteres."
     email_too_long: "El correo electrónico que has proporcionado es demasiado largo. Las direcciones de correo no deben tener más de 254 caracteres y los nombres de dominio no más de 253."
+    wrong_invite_code: "El código de invitación que ingresaste es incorrecto."
     reserved_username: "Ese nombre de usuario no está permitido."
     missing_user_field: "No has completado todos los campos de usuario"
     auth_complete: "Autenticación completa."
@@ -2106,6 +2124,8 @@ es:
     second_factor_backup_title: "Código de respaldo de verificación en dos pasos"
     invalid_second_factor_code: "Código de autentificación inválido. Cada código se puede usar solo una vez."
     invalid_security_key: "Clave de seguridad inválida."
+    missing_second_factor_name: "Por favor, introduce un nombre."
+    missing_second_factor_code: "Por favor, introduce un código."
     second_factor_toggle:
       totp: "Usar una aplicación de autenticación o una llave de seguridad en su lugar"
       backup_code: "Usar un código de respaldo en su lugar"
@@ -3126,7 +3146,6 @@ es:
       why: "Un breve resumen de %{site_link} desde tu última visita el %{last_seen_at}"
       since_last_visit: "Desde tu última visita"
       new_topics: "Temas nuevos"
-      unread_messages: "Mensajes no leídos"
       unread_notifications: "Notificaciones no leídas"
       liked_received: "Me gusta recibidos"
       new_users: "Usuarios nuevos"
@@ -3298,6 +3317,7 @@ es:
     file_missing: "Lo sentimos, debes incluir un archivo para subir."
     empty: "Disculpa, el archivo que proporcionaste está vacío."
     png_to_jpg_conversion_failure_message: "Ha ocurrido un error cuando se convertía desde PNG a JPG."
+    optimize_failure_message: "Se produjo un error al optimizar la imagen cargada."
     attachments:
       too_large: "Lo sentimos, el archivo que estás intentando subir es demasiado grande (el tamaño máximo es %{max_size_kb}%KB)."
     images:
@@ -3333,6 +3353,7 @@ es:
     sender_body_blank: "el cuerpo está en blanco"
     sender_post_deleted: "La publicación fue eliminada"
     sender_message_to_invalid: "el destinatario tiene una dirección de correo electrónico inválida"
+    sender_topic_deleted: "el tema fue eliminado"
   color_schemes:
     base_theme_name: "Base"
     light: "Claro"
@@ -4204,7 +4225,7 @@ es:
       invite_only: "Todos los usuarios nuevos deben ser invitados. Consulta `invite_only`."
       email_auth_res_enqueue: "Este correo falló la comprobación DMARC, por lo que seguramente no es de quien parece ser. Comprueba los encabezados del correo para más información."
       email_spam: "Este correo se marcó como spam por el encabezado definido en `email_in_spam_header`."
-      suspect_user: "Los usuarios en la lista de sospechosos deben ser examinados por el staff. Ver `approve_suspect_users`."
+      suspect_user: "Este usuario nuevo ingresó información de perfil sin haber leído ningún tema o publicación, lo cual sugiere claramente que podría tratarse de un spammer. Revisa `approve_suspect_users`."
     actions:
       agree:
         title: "Concordar..."
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index f2ccd29c5d..279d2554e4 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -193,6 +193,12 @@ et:
   too_late_to_edit: "Postitus loodi kaua aega tagasi. Seda ei saa enam muuta ega kustutada."
   revert_version_same: "Praegune versioon on sama sellega, millele sa püüad tagasi pöörduda."
   excerpt_image: "pilt"
+  bookmarks:
+    reminders:
+      later_today: "Täna hiljem"
+      tomorrow: "Homme"
+      next_week: "Järgmisel nädalal"
+      next_month: "Järgmisel kuul"
   groups:
     errors:
       can_not_modify_automatic: "Autommatset gruppi ei saa muuta"
@@ -785,6 +791,10 @@ et:
   most_posts: "Enamus postitusi"
   most_recent_poster: "Viimane postitaja"
   frequent_poster: "Tihedam postitaja"
+  publish_page:
+    slug_errors:
+      blank: "ei saa olla tühi"
+      invalid: "sisaldab ebasobivaid tähemärke"
   login:
     not_approved: "Kontot pole veel kinnitatud. Teid teavitatakse e-post teel, kui sisselogimine on võimaldatud."
     admin_not_allowed_from_ip_address: "Sellelt IP-aadressilt ei saa adminnina sisse logida."
@@ -834,7 +844,6 @@ et:
         %{message}
     digest:
       new_topics: "Uued teemad"
-      unread_messages: "Lugemata sõnumid"
       unread_notifications: "Lugemata teavitused"
       liked_received: "Meeldimisi saadud"
       new_users: "Uued kasutajad"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index d957ab034e..2702deab2b 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -222,11 +222,10 @@ fa_IR:
   bookmarks:
     reminders:
       at_desktop: "بار آینده من پشت میزم هستم"
-      later_today: "امروز کمی بعد"
-      next_business_day: "روز کاری آینده"
+      later_today: "امروز"
       tomorrow: "فردا"
-      next_week: "هفته ی آینده"
-      next_month: "ماه آینده"
+      next_week: "هفته بعد"
+      next_month: "ماه بعد"
       custom: "درج تاریخ و ساعت"
   groups:
     errors:
@@ -889,8 +888,6 @@ fa_IR:
     force_https: "اجبار به استفاده از HTTPS ، تا زمانی که HTTPS را کامل تنظیم نکرده‌اید این گزینه را فعال نکنید. آیا تمام CDN ها و شبکه‌های اجتماعی جهت ورود را بررسی کردید و تمام لوگو‌ها و وابستگی‌ها بدون مشکل با HTTPS کار می‌کنند؟"
     same_site_cookies: "استفاده از همان کوکی ها، آن‌ها از تمام درخواست های vector cross site جلوگیری می‌کنند(Lax یا Strict). توجه: این کار سختگیرانه فقط در سایت‌هایی که ورود اجباری دارند و از SSO استفاده می‌کنند قابل استفاده است."
     summary_score_threshold: "حداقل امتیاز برای یک نوشته که بتواند شامل \" خلاصه این موضوع\" شود"
-    summary_posts_required: "حداقل نوشته‌ها در این جستار قبل از اینکه \" خلاصه این موضوع\" فعال شود"
-    summary_likes_required: "حداقل پسندها در این جستار قبل از اینکه \" خلاصه این موضوع\" فعال شود"
     summary_percent_filter: "وقتی کاربر بر روی ' خلاصه این موضوع' کلیک کرد٬‌ % بهترین نوشته‌ها را نشان بده"
     enable_personal_messages: "اجازه ارسال پیام به کاربران سطح اعتماد 1 (قابل تنظیم با حداقل سطح اعتماد برای ارسال پیام). توجه کنید که همکاران در هر شرایطی می‌توانند پیام ارسال کنند."
     enable_long_polling: "message bus استفاده شده برای آگاه سازی می تواند برای رای گیری طولانی استفاده شود. "
@@ -960,7 +957,6 @@ fa_IR:
     enable_instagram_logins: "فعالسازی ورود با اینستاگرام، نیازمند \ninstagram_consumer_key and instagram_consumer_secret"
     instagram_consumer_key: "Consumer key اینستاگرام"
     instagram_consumer_secret: "Consumer secret اینستاگرام"
-    readonly_mode_during_backup: "فعالسازی حالت فقط خواندنی برای گرفتن نسخه پشتیبان"
     allow_restore: "اجازه بازیابی بده، که می‌تواند تمام اطلاعات سایت را جایگزین کند! نادرست را رها کن مگر اینکه قصد بازیابی نسخه پشتیبان را داری "
     maximum_backups: "حداکثر تعداد پشتیبان برای نگه داری بر روی دیسک. نسخه های پشتیبان قدیمی بطور خودکار پاک شده است"
     automatic_backups_enabled: "فعالسازی پشتیبان‌گیری خودکار در بازه زمانی مشخص"
@@ -1290,6 +1286,10 @@ fa_IR:
     existing_topic_moderator_post:
       one: "یک نوشته به مبحث موجود منتقل شد: %{topic_link}"
       other: "%{count} نوشته به مبحث موجود منتقل شد: %{topic_link}"
+  publish_page:
+    slug_errors:
+      blank: "نمی‌تواند خالی باشد"
+      invalid: "شامل نویسه‌های نامعتبر است"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "این پیام بعد از رسیدن به حداکثر تعداد پاسخ‌ها %{count} بسته شد."
@@ -1842,7 +1842,6 @@ fa_IR:
       why: "یک گزارش کوتاه از %{site_link} از آخرین باری که بازدید کردید در %{last_seen_at}"
       since_last_visit: "از آخرین بازدید شما"
       new_topics: "موضوعات جدید"
-      unread_messages: "پیام‌های خوانده نشده"
       unread_notifications: "اطلاعیه‌های خوانده نشده"
       liked_received: "پسند‌های دریافت شده"
       new_users: "کاربران جدید"
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 875c63ffc0..6b68d7c0a9 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -59,7 +59,6 @@ fi:
       optimized_link: Optimoidut kuvalinkit ovat lyhytikäisiä eikä niitä tulisi sisällyttää teeman lähdekoodiin.
     settings_errors:
       invalid_yaml: "Annettu YAML ei kelpaa"
-      data_type_not_a_number: "Ei voi asettaa tietotyypiksi %{name}. Tuettuja tyyppejä ovat integer, blool, list ja enum."
       name_too_long: "Jollain asetuksella on liian pitkä nimi. Enimmäispituus on 255."
       default_value_missing: "Asetuksella \"%{name}\" ei ole oletusarvoa"
       default_not_match_type: "Asetuksen \"%{name}\" oletusarvo ei sovi asetuksen tyyppiin."
@@ -328,10 +327,12 @@ fi:
   bookmarks:
     errors:
       already_bookmarked_post: "Samaa viestiä ei voi kirjanmerkitä kahdesti."
+      cannot_set_past_reminder: "Kirjanmerkkimuistutusta ei voi asettaa menneisyyteen."
+      cannot_set_reminder_in_distant_future: "Kirjanmerkkimuistutusta ei voi asettaa yli 10 vuoden päähän tulevaisuuteen."
       time_must_be_provided: "kaikkiin muistutuksiin paitsi '%{reminder_type}' tarvitaan aika"
     reminders:
       at_desktop: "Ensi kerralla kun olen työpöytäympäristössäni"
-      later_today: "Myöhemmin tänään "
+      later_today: "Myöhemmin tänään"
       next_business_day: "Seuraavana arkipäivänä"
       tomorrow: "Huomenna"
       next_week: "Ensi viikolla"
@@ -366,7 +367,6 @@ fi:
       trust_level_4: "luottamustaso_4"
     request_membership_pm:
       title: "Jäsenhakemus ryhmään @%{group_name}"
-      handle: "käsittele jäsenyyshakemus"
     view_hidden_topic_request_reason: "Haluaisin liittyä ryhmään '%{group_name}', jotta pääsen [tähän ketjuun](%{topic_url})"
   education:
     until_posts:
@@ -1072,6 +1072,7 @@ fi:
       labels:
         level: Taso
       description: "Kuinka monta käyttäjää on milläkin luottamustasolla."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Käyttäjät tyypeittäin"
       xaxis: "Tyyppi"
@@ -1264,7 +1265,6 @@ fi:
   dashboard:
     rails_env_warning: "Palvelintasi ajetaan %{env} moodissa."
     host_names_warning: "Sivuston config/database.yml tiedosto käyttää oletusisäntänimeä. Päivitä se käyttämään sivuston isäntänimeä."
-    gc_warning: 'Palvelimesi käyttää Rubyn oletuksia roskienkeräyksessä, mikä ei tarjoa parasta mahdollista suorituskykyä. Tässä ketjussa on suorituskyvyn optimoisesta: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq ei ole käynnissä. Monet tehtävät, kuten sähköpostien lähettäminen, suoritetaan asynkronisesti sidekiqin avulla. Varmista, että vähintään yksi sidekiq prosessi on käynnissä. <a href="https://github.com/mperham/sidekiq" target="_blank">Opiskele lisää Sidekiqista täältä</a>.'
     queue_size_warning: "Jonossa olevien tehtävien määrä on %{queue_size}, joka on korkea. Tämä voi olla merkki ongelmista Sidekiq prosess(e)issa tai sinun voi täytyä lisätä Sidekiq workerien määrää."
     memory_warning: "Palvelimella on alle 1GB muistia. Vähintään 1 GB muistia on suositeltavaa."
@@ -1372,8 +1372,6 @@ fi:
     enforce_second_factor: "Pakottaa käyttäjiä ottamaan kaksivaiheisen tunnistautumisen 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, kaikki sosiaaliset kirjautumiset ja kaikki ulkoiset logot / muut riippuvuudet ovat myös HTTPS-yhteensopivia?"
     summary_score_threshold: "Viestin minimipistemäärä, jotta se näytetään ketjun tiivistelmässä."
-    summary_posts_required: "Montako viestiä ketjussa täytyy olla, jotta ketjun tiivistelmä otetaan käyttöön"
-    summary_likes_required: "Montako tykkäystä ketjussa pitää olla, jotta ketjun tiivistelmä otetaan käyttöön"
     summary_percent_filter: "Kun käyttäjä klikkaa 'Näytä ketjun tiivistelmä', näytä paras % viesteistä"
     summary_max_results: "Maksimimäärä viestejä, jotka näytetään ketjun tiivistelmässä"
     enable_personal_messages: "Salli luottamustason 1 saavuttaneiden käyttäjien (\"min trust level to send messages\" on säädettävissä) lähettää yksityisviestejä ja vastata niihin. Huomioi, että henkilökunta voi aina lähettää yksityisviestejä."
@@ -1506,7 +1504,6 @@ fi:
     discord_client_id: 'Discordin Client ID (Tarvitsetko? Käy Discordin <a href="https://discordapp.com/developers/applications/me">kehittäjäportaalissa</a>)'
     discord_secret: "Discordin Secret Key"
     discord_trusted_guilds: 'Salli vain näiden Discord-kiltojen jäsenten kirjautua Discordin avulla. Käytä killan numeerista ID:tä. Jos tarvitset lisätietoa, ohjeet löytyy <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">täältä</a>. Jätä tyhjäksi, jos et halua rajoittaa killan perusteella.'
-    readonly_mode_during_backup: "Ota käyttöön vain luku -tila, kun otetaan varmuuskopiota"
     enable_backups: "Salli ylläpitäjien tehdä varmuuskopioita palstasta"
     allow_restore: "Salli palautus, joka korvaa KAIKEN sivuston datan! Jätä valitsematta, jos et aio palauttaa sivuston varmuuskopiota"
     maximum_backups: "Tallennettuna pidettävien varmuuskopioiden maksimimäärä. Vanhemmat varmuuskopiot poistetaan automaattisesti"
@@ -1814,7 +1811,6 @@ fi:
     delete_drafts_older_than_n_days: "Poista yli (n) päivää vanhat luonnokset."
     bootstrap_mode_min_users: "Vähimmäismäärä käyttäjiä, joka vaaditaan aloitustilan poistamiseen (aseta 0 poistaaksesi käytöstä)"
     prevent_anons_from_downloading_files: "Estä kirjautumattomia käyttäjiä lataamasta liitetiedostoja. VAROITUS: tämä estää viestin liitettyjen muiden tiedostojen, kuin kuvien käyttämisen sivustolla."
-    secure_media: 'Rajoita pääsyä ladattuihin mediatiedostoihin (kuvat, video, äänitiedostot). Jos "kirjautuminen vaaditaan" -tila on käytössä, vain kirjautuneilla käyttäjillä on pääsy mediatiedostoihin. Muussa tapauksessa vain pääsyä rajoitetaan vain yksityiskeskusteluiden medialatauksiin. Huomioi: S3-lataukset tulee olla käytössä ennen tämän asetuksen käyttöönottoa.'
     slug_generation_method: "Valitse polkulyhenteen luomisen metodi. 'encoded' käyttää prosenttikoodausta, 'none' poistaa polkulyhenteet käytöstä."
     enable_emoji: "Ota emoji käyttöön"
     enable_emoji_shortcuts: "Yleiset tekstiemojit kuten :) :p :( muunnetaan emojeiksi"
@@ -1995,6 +1991,10 @@ fi:
       other: "%{count} viestiä siirrettiin yksityisviestiketjuun: %{topic_link}"
   change_owner:
     post_revision_text: "Vaihtoi omistajaa"
+  publish_page:
+    slug_errors:
+      blank: "ei voi olla tyhjä"
+      invalid: "sisältää epäkelpoja merkkejä"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Tämä yksityisketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän %{count}."
@@ -3065,7 +3065,6 @@ fi:
       why: "Lyhyt kooste siitä mitä on tapahtunut sivustolla %{site_link} viimeisimmän vierailusi jälkeen %{last_seen_at}."
       since_last_visit: "Viime vierailusi jälkeen"
       new_topics: "Uutta ketjua"
-      unread_messages: "Lukematonta viestiä"
       unread_notifications: "Lukematonta ilmoitusta"
       liked_received: "Saatua tykkäystä"
       new_users: "Uutta käyttäjää"
@@ -3535,7 +3534,7 @@ fi:
       name: Hyvä vastaus
       description: Vastaus sai 10 tykkäystä
       long_description: |
-        Tämä ansiomerkki myönnetään, kun vastauksesi saa 10 tykkäykstä. Teit sillä vaikutuksen yhteisöön ja edistit keskustelua!
+        Tämä ansiomerkki myönnetään, kun vastauksesi saa 10 tykkäystä. Teit sillä vaikutuksen yhteisöön ja edistit keskustelua!
     good_post:
       name: Erinomainen vastaus
       description: Vastaus sai 25 tykkäystä
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 8169754c58..a62b88e85e 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -59,7 +59,6 @@ fr:
       optimized_link: Les liens optimisés d'images sont éphémères et ne devraient pas être inclus dans le code source d'un thème.
     settings_errors:
       invalid_yaml: "Le YAML est invalide"
-      data_type_not_a_number: "Le type du paramètre `%{name}` n'est pas supporté. Les types supportés sont `integer`, `bool`, `list` et `enum`"
       name_too_long: "Il y a un paramètre avec un nom trop long. Longueur maximum 255"
       default_value_missing: "Le paramètre `%{name}` n'a pas de valeur par défaut"
       default_not_match_type: "Le type de la valeur par défaut de paramètre `%{name}` ne correspond pas au type du paramètre."
@@ -325,13 +324,15 @@ fr:
   revert_version_same: "La version actuelle est la même que la version vers laquelle vous essayez de revenir."
   excerpt_image: "image"
   bookmarks:
+    errors:
+      already_bookmarked_post: "Il n'est pas possible de mettre plus d'un signet sur un même message."
+      cannot_set_past_reminder: "Vous ne pouvez pas définir un rappel de signet à une date passée."
     reminders:
       at_desktop: "La prochaine fois je suis à mon bureau"
-      later_today: "Plus tard dans la journée\n{{date}}"
-      next_business_day: "Prochain jour ouvré"
+      later_today: "Plus tard aujourd'hui"
       tomorrow: "Demain"
-      next_week: "La semaine prochaine"
-      next_month: "Le mois prochain"
+      next_week: "Semaine prochaine"
+      next_month: "Mois prochai"
       custom: "Date et heure personnalisés"
   groups:
     success:
@@ -362,7 +363,6 @@ fr:
       trust_level_4: "niveau_confiance_4"
     request_membership_pm:
       title: "Demande d'adhésion pour @%{group_name}"
-      handle: "Gérer demande d'adhésion"
     view_hidden_topic_request_reason: "J'aimerais rejoindre le groupe '%{group_name}' afin d'accéder à [ce sujet] (%{topic_url})."
   education:
     until_posts:
@@ -472,6 +472,10 @@ fr:
               same_as_password: "est identique à votre mot de passe."
             ip_address:
               signup_not_allowed: "L'inscription n'est pas autorisée à partir de ce compte."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Ce sujet ne peut pas être mis à la une sur votre profil."
         user_email:
           attributes:
             user_id:
@@ -816,8 +820,10 @@ fr:
       long_form: "a été aimé"
   draft:
     sequence_conflict_error:
+      title: "erreur d'ébauche"
       description: "L'ébauche est en train d'être modifiée dans une autre fenêtre. Veuillez recharger cette page."
   draft_backup:
+    pm_title: "Sauvegarde des ébauches sur les sujets en cours."
     pm_body: "Sujet contenant des ébauches sauvegardées"
   user_activity:
     no_default:
@@ -836,7 +842,9 @@ fr:
       self: "Vous n'avez pas d'ébauche ; commencez à répondre à un sujet et la réponse sera automatiquement sauvegardée comme nouvelle ébauche."
   webauthn:
     validation:
+      challenge_mismatch_error: "Le défi fourni ne correspond pas au défi généré par le serveur d'authentification."
       invalid_origin_error: "L'origine de la requête d'authentification ne correspond pas à l'origine du serveur."
+      malformed_attestation_error: "Une erreur s'est produite pendant le déchiffrage des données d'attestation."
       user_verification_error: "Une vérification de l'utilisateur est requise."
       unsupported_public_key_algorithm_error: "L'algorithme de clé publique fournie n'est pas supporté par le serveur."
       ownership_error: "La clé de sécurité n'appartient pas à l'utilisateur."
@@ -991,7 +999,13 @@ fr:
       yaxis: "Nombre de nouveaux contributeurs"
       description: "Nombre d'utilisateurs qui ont fait leur première contribution durant cette période."
     trust_level_growth:
+      xaxis:
+        tl1_reached: "Niveau de confiance 1 atteint"
+        tl2_reached: "Niveau de confiance 2 atteint"
+        tl3_reached: "Niveau de confiance 3 atteint"
+        tl4_reached: "Niveau de confiance 4 atteint"
       yaxis: "Jour"
+      description: "Nombre d'utilisateurs ayant augmenté leur niveau de confiance au cours de cette période."
     consolidated_page_views:
       title: "Pages vues unifiées"
       xaxis:
@@ -1244,7 +1258,6 @@ fr:
   dashboard:
     rails_env_warning: "Votre serveur fonctionne dans l'environnement de %{env}."
     host_names_warning: "Votre fichier config/database.yml utilise le nom d'hôte par défaut. Veuillez renseigner votre nom d'hôte."
-    gc_warning: 'Votre serveur utilise les paramètres par défaut de collection du GC de ruby, ce qui ne vous donnera pas les meilleures performances. Merci de lire ce sujet sur <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">l''optimisation des performances de Ruby et Rails pour Discourse</a>.'
     sidekiq_warning: 'Sidekiq n''est pas lancé. De nombreuses tâches, comme l''envoi des courriels, sont exécutées de manière asynchrone par sidekiq. Assurez-vous d''avoir au moins un processus sidekiq de lancé. <a href="https://github.com/mperham/sidekiq">En savoir plus sur sidekiq</a>.'
     queue_size_warning: "Le nombre de jobs dans la file d'attente est de %{queue_size}, ce qui est assez élevé. Cela peut indiquer un problème avec le(s) process Sidekiq, ou la nécessité d'ajouter davantage de workers."
     memory_warning: "Votre serveur dispose de moins de 1 Go de mémoire vive. Au moins 1 Go de RAM est recommandé."
@@ -1350,8 +1363,6 @@ fr:
     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 via réseaux sociaux ainsi que tous les logos / dépendances tiers sont tous compatibles HTTPS eux aussi ?"
     same_site_cookies: "Utiliser des cookies de même site, qui éliminent tous les vecteurs de Cross Site Request Forgery sur les navigateurs supportés (Lax ou Strict). Avertissement : Strict ne fonctionnera que sur des sites qui imposent la connexion et utilisent le SSO."
     summary_score_threshold: "Le score minimum requis pour qu'un message soit inclus dans le 'Résumé de ce sujet'"
-    summary_posts_required: "Nombre minimum de messages dans un sujet avant que le 'Résumé du sujet' soit activé"
-    summary_likes_required: "Nombre de J'aime minimum dans un sujet avant que le 'Résumé du sujet' soit activé"
     summary_percent_filter: "Quand un utilisateur clique sur « Résumer ce sujet », montrer le top % des messages"
     summary_max_results: "Nombre maximum de messages retournés par « Résumer ce sujet »"
     enable_personal_messages: "Autoriser les utilisateurs de niveau de confiance 1 à créer des messages et à répondre (configurable via le niveau de confiance minimum pour envoyer des messages). Notez que les responsables peuvent toujours envoyer des messages."
@@ -1487,7 +1498,6 @@ fr:
     discord_client_id: 'Identifiant de l''utilisateur Discord (en cas de besoin, le créer via <a href="https://discordapp.com/developers/applications/me">le portail de développement Discord</a>)'
     discord_secret: "Clé secrète Discord"
     discord_trusted_guilds: ' Seuls les membres de ces guildes Discord peuvent se connecter via Discord. Utiliser les identifiants numériques des guildes. Pour plus d''informations, suivre les instructions<a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">ici</a>. Laisser blanc pour autoriser toutes les guildes.'
-    readonly_mode_during_backup: "Activer le mode lecture seule pendant une sauvegarde"
     enable_backups: "Autoriser les administrateurs à créer de nouveaux sauvegardes du forum"
     allow_restore: "Autoriser la restauration, qui peut remplacer TOUTES les données du site ! Laissez à faux, sauf si vous envisagez de faire restaurer une sauvegarde"
     maximum_backups: "Nombre maximum de sauvegardes à conserver sur le disque. Les anciennes sauvegardes seront automatiquement supprimées"
@@ -1661,6 +1671,7 @@ fr:
     reviewable_claiming: "Est-ce que les contenu à vérifier doit être réservé avant qu'on puisse agir dessus ?"
     reviewable_default_topics: "Afficher le contenu révisable groupé par sujet par défaut"
     reviewable_default_visibility: "Ne pas afficher les éléments révisables à moins qu'ils répondent à cette priorité"
+    high_trust_flaggers_auto_hide_posts: "Les messages des nouveaux utilisateurs seront automatiquement cachés après avoir été signalés comme spam par un utilisateur d'un niveau de confiance 3 et plus"
     reply_by_email_enabled: "Activer les réponses aux sujets via courriel."
     reply_by_email_address: "Modèle pour la réponse par courriel entrant, exemple : %%{reply_key}@reply.example.com ou replies+%%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Liste des templates alternatifs pour les adresses des courriels entrants de la réponse par courriel. Exemple : %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
@@ -1747,13 +1758,16 @@ fr:
     anonymous_posting_min_trust_level: "Le niveau de confiance minimum pour passer en mode anonyme."
     anonymous_account_duration_minutes: "Pour protéger l'anonymat, créer un nouveau compte anonyme tous les N minutes pour chaque utilisateur. Exemple : si 600 est choisi, dès 600 minutes après le dernier message ET que l'utilisateur passe en mode anonyme, un nouveau compte anonyme lui sera crée."
     hide_user_profiles_from_public: "Cacher les cartes, les profils et le répertoire d'utilisateurs aux visiteurs."
+    allow_featured_topic_on_user_profiles: "Permet aux utilisateurs de mettre un lien vers un sujet à la une sur leur fiche et leur profil."
     show_inactive_accounts: "Autoriser les utilisateurs connectés à parcourir les profils de comptes inactifs."
     hide_suspension_reasons: "Ne pas afficher les raisons d'une suspension sur les profils utilisateurs."
     log_personal_messages_views: "Logguer les vues de messages directs par Admin pour d'autres utilisateurs/groupes."
     ignored_users_count_message_threshold: "Notifier les modérateur si un utilisateur est ignoré par autant d'utilisateurs."
     ignored_users_message_gap_days: "Combien de temps faut-il attendre avant de notifier à nouveau les modérateurs d'un utilisateur ignoré par beaucoup d'autres."
     clean_up_inactive_users_after_days: "Nombre de jours avant qu'un utilisateur inactif (niveau de confiance 0 sans aucun messages) soit supprimé. Pour désactiver le nettoyage saisir 0."
+    clean_up_unused_staged_users_after_days: "Nombre de jours avant de supprimer un utilisateur distant inutilisé (sans aucun message). 0 pour désactiver le nettoyage."
     user_selected_primary_groups: "Autoriser les utilisateurs à définir leur groupe principal"
+    max_notifications_per_user: "Volume de notifications maximum par utilisateur. Si ce seuil est dépassé alors les notifications les plus anciennes seront supprimées. Appliqué chaque semaine. 0 pour le désactiver."
     user_website_domains_whitelist: "Les sites Web des utilisateurs vont être vérifiés contre ces domaines. Liste délimitée par des pipes (|)."
     allow_profile_backgrounds: "Autoriser les utilisateurs à envoyer des arrières-plans de profil."
     sequential_replies_threshold: "Nombre de messages successifs qu'un utilisateur peut poster dans un sujet avant d'être averti d'avoir posté un nombre excessif de réponses qui se suivent."
@@ -1818,6 +1832,7 @@ fr:
     returning_users_days: "Combien de jours doivent s'écouler avant qu'un utilisateur soit considéré comme étant de retour."
     default_email_digest_frequency: "Par défaut, à quelle fréquence les utilisateurs reçoivent les résumés par courriel."
     default_include_tl0_in_digests: "Par défaut, inclure les messages des nouveaux utilisateurs dans les résumés par courriel. Les utilisateurs peuvent changer cela dans leurs préférences."
+    default_email_level: "Définit le niveau des notifications par défaut pour les sujets standards."
     default_email_messages_level: "Définissez le niveau de notification courriel par défaut quand quelqu'un envoie un message direct à un utilisateur."
     default_email_mailing_list_mode: "Envoyer un courriel pour chaque nouveau message."
     default_email_mailing_list_mode_frequency: "Par défaut, les utilisateurs ayant activé la liste de diffusion recevront des courriels à cette fréquence."
@@ -1837,6 +1852,7 @@ fr:
     default_categories_tracking: "Liste de catégories suivies par défaut."
     default_categories_muted: "Liste de catégories silencées par défaut."
     default_categories_watching_first_post: "Liste des catégories dont le premier message de chaque nouveau sujet sera surveillé par défaut."
+    mute_all_categories_by_default: "Définit le niveau des notifications pour toutes les catégories à silencieux. Nécessite que les utilisateurs acceptent explicitement les catégories pour les faire apparaître sur les pages 'récents' et 'catégories'. Si vous souhaitez corriger les valeurs par défaut pour les utilisateurs anonymes veuillez renseigner les paramètres 'default_categories_'."
     default_tags_watching: "Liste des étiquettes qui sont surveillées par défaut."
     default_tags_tracking: "Liste des étiquettes qui sont suivies par défaut."
     default_tags_muted: "Liste des étiquettes qui sont mises sous silence par défaut."
@@ -1973,6 +1989,10 @@ fr:
       other: "%{count} messages ont été fusionnés à un message direct existant : %{topic_link}"
   change_owner:
     post_revision_text: "Propriété transférée"
+  publish_page:
+    slug_errors:
+      blank: "ne peut être vide"
+      invalid: "contient des caractères invalides"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Ce message a été automatiquement fermé après avoir atteint la limite maximum de %{count} réponse."
@@ -2064,6 +2084,8 @@ fr:
     second_factor_backup_title: "Code de secours de l'authentification à deux facteurs"
     invalid_second_factor_code: "Code d'authentification invalide. Chaque code ne peut être utilisé qu'une fois."
     invalid_security_key: "Clé de sécurité invalide."
+    missing_second_factor_name: "Veuillez renseigner un nom."
+    missing_second_factor_code: "Veuillez renseigne un code."
     second_factor_toggle:
       backup_code: "Utilisez plutôt un code de secours"
   admin:
@@ -2101,6 +2123,7 @@ fr:
       fixed_primary_email: "Correction de l'email primaire pour utilisateur distant"
       same_ip_address: "Même adresse IP (%{ip_address}) que d'autres utilisateurs"
       inactive_user: "Utilisateur inactif"
+    email_in_spam_header: "Le premier courriel de l'utilisateur a été signalé comme spam"
   reviewables_reminder:
     submitted:
       one: "Ces éléments ont été soumis il y a plus d'une heure. [Veuillez les passer en revue](%{base_path}/flags)."
@@ -2221,6 +2244,10 @@ fr:
   admin_confirmation_mailer:
     title: "Confirmation de l'Administrateur"
     subject_template: "[%{email_prefix}] Confirmer votre nouveau compte"
+    text_body_template: |
+      Merci de confirmer que vous souhaitez ajouter **%{target_username} (%{target_email})** comme administrateur à votre forum.
+
+      [Confirmer le compte administrateur](%{admin_confirm_url})
   test_mailer:
     title: "Envoyer un courriel de test"
     subject_template: "[%{email_prefix}] Test de délivrabilité courriel"
@@ -2314,7 +2341,14 @@ fr:
 
         Nous sommes ravis que vous passiez du temps avec nous, et nous adorerions en savoir plus sur vous. Prenez un moment pour [remplir votre profil](%{base_url}/my/preferences/profile) ou sentez-vous libre de [démarrer un nouveau sujet](%{base_url}/categories).
     welcome_staff:
+      title: "Bienvenue dans l'équipe"
       subject_template: "Félicitations, le statut de %{role} vous a été accordé !"
+      text_body_template: |
+        Le rôle de %{role} vous a été accordé par un membre de l'équipe.
+
+        En tant que %{role}, vous avez maintenant accès à l'interface <a href='%{base_url}/admin' target='_blank'>d'administration</a>.
+
+        À grand pouvoir grande responsabilité. Si vous débutez dans le rôle de modérateur, veuillez consulter le [Guide de modération](https://meta.discourse.org/t/guide-des-moderateurs/89968).
     welcome_invite:
       title: "Bienvenue invité"
       subject_template: "Bienvenue sur %{site_name} !"
@@ -2955,7 +2989,6 @@ fr:
       why: "Voici un bref résumé de ce qu'il s'est passé sur %{site_link} depuis votre dernière visite le %{last_seen_at}"
       since_last_visit: "Depuis votre dernière visite"
       new_topics: "Nouveaux sujets"
-      unread_messages: "Messages non lus"
       unread_notifications: "Notifications non lues"
       liked_received: "J'aime reçus"
       new_users: "Nouveaux utilisateurs"
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index e5348422d7..e2d4c728f2 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -475,6 +475,10 @@ gl:
   frequent_poster: "Publicador frecuente"
   redirected_to_top_reasons:
     new_user: "Benvido/a á nosa comunidade. Estes son os temas recentes máis populares."
+  publish_page:
+    slug_errors:
+      blank: "non pode quedar baleiro"
+      invalid: "contén caracteres incorrectos"
   login:
     admin_not_allowed_from_ip_address: "Non podes acceder como administrador desde este enderezo IP."
     new_registrations_disabled: "Neste momento non se permite o rexistro de novas contas."
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 2a4d0b5263..29ba03459d 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -47,6 +47,7 @@ he:
       generic: אירעה שגיאה בעת ייבוא ערכת העיצוב הזו
       about_json: "שגיאת ייבוא: about.json לא קיים או שהוא פגום"
       about_json_values: "about.json מכיל ערכים שגויים: %{errors}"
+      modifier_values: "המחליפים ב־about.json מכילים ערכים שגויים: %{errors}"
       git: "שגיאה בעת שכפול מאגר git, הגישה נדחיתה או שהמאגר לא נמצא"
       unpack_failed: "חילוץ הקובץ נכשל"
       file_too_big: "הקובץ גדול מדי ללא דחיסה."
@@ -59,7 +60,7 @@ he:
       optimized_link: קישורים משופרים לתמונות הם בני חלוף ואין לכלול אותם בקוד המקור של ערכת העיצוב.
     settings_errors:
       invalid_yaml: "ה־YAML שסופק שגוי."
-      data_type_not_a_number: "הגדרת הסוג `%{name}` אינה נתמכת. הסוגים הנתמכים הם `integer`,‏ `bool`,‏ `list` ו־`enum`"
+      data_type_not_a_number: "סוג ההגדרה `%{name}` אינו נתמך. הסוגים הנתמכים הם: `integer`,‏ `bool`,‏ `list`,‏ `enum` ו־`upload`"
       name_too_long: "קיימת הגדרה עם שם ארוך מדי. האורך המרבי הוא 255"
       default_value_missing: "להגדרה `%{name}` אין ערך בררת מחדל"
       default_not_match_type: "סוג ערך בררת המחדל של ההגדרה `%{name}` אינו תואם לסוג ההגדרה."
@@ -359,14 +360,16 @@ he:
   bookmarks:
     errors:
       already_bookmarked_post: "אי אפשר לסמן את אותו הפוסט פעמיים"
+      cannot_set_past_reminder: "אי אפשר להגדיר תזכורת סימנייה למועד שעבר."
+      cannot_set_reminder_in_distant_future: "לא ניתן להגדיר תזכורת סימנייה למעבר ל־10 שנים בעתיד."
       time_must_be_provided: "צריך לציין זמן לכל התזכורות למעט ‚%{reminder_type}’"
     reminders:
       at_desktop: "בשימוש הבא דרך שולחן העבודה"
-      later_today: "המשך היום"
-      next_business_day: "ביום העסקים הבא"
+      later_today: "בהמשך היום"
+      next_business_day: "יום העסקים הבא"
       tomorrow: "מחר"
       next_week: "בשבוע הבא"
-      next_month: "בחודש הבא"
+      next_month: "חודש הבא"
       custom: "תאריך ושעה מותאמים אישית"
   groups:
     success:
@@ -401,7 +404,6 @@ he:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "בקשת חברות עבור ‎@%{group_name}‎"
-      handle: "טיפול בבקשות חברות"
     view_hidden_topic_request_reason: "אבקש להצטרף לקבוצה ‚%{group_name}’, כדי שאוכל לגשת ל[נושא הזה](%{topic_url})"
   education:
     until_posts:
@@ -513,6 +515,10 @@ he:
               same_as_password: "זהה לססמה שלך."
             ip_address:
               signup_not_allowed: "אסור להירשם מהחשבון הזה."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "לא ניתן להציג את הנושא הזה במומלצים בפרופיל שלך."
         user_email:
           attributes:
             user_id:
@@ -808,7 +814,7 @@ he:
     confirmed: "כתובת הדוא״ל שלך עודכנה."
     please_continue: "להמשיך אל %{site_name}"
     error: "הייתה שגיאה בעדכון כתובת הדוא״ל. אולי היא כבר בשימוש?"
-    error_staged: "אירעה שגיאה בהחלפת כתובת הדוא״ל שלך. הכתובת כבר נמצאת בשימוש על ידי מועמדים לשימוש במערכת."
+    error_staged: "אירעה שגיאה בהחלפת כתובת הדוא״ל שלך. הכתובת כבר נמצאת בשימוש על ידי משתמשים מבוימים במערכת."
     already_done: "קישור אימות זה אינו תקף עוד, עמך הסליחה. אולי כתובת הדוא״ל שלך כבר הוחלפה?"
     confirm: "אישור"
     authorizing_new:
@@ -1334,7 +1340,6 @@ he:
   dashboard:
     rails_env_warning: "השרת שלך רץ במצב %{env}."
     host_names_warning: "הקובץ config/database.yml אצלכם משתמש בכתובת ברירת המחדל - localhost. עדכנו אותה להשתמש בכתובת של השרת שלכם."
-    gc_warning: 'השרת שלך משתמש במשתני בררת המחדל לאיסוף פסולת של ruby, מה שעשוי לפגוע בביצועים. מומלץ לקרוא את הנושא הזה על שיפור ביצועים: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">כוונון של Ruby ושל Rails לטובת Discourse</a>.'
     sidekiq_warning: 'Sidekiq לא רץ. משימות רבות, כמו שליחת מיילים, מבוצעות אסינכרונית באמצעות Sidekiq. אנא וודאו שלפחות תהליך אחד של Sidekiq רץ. <a href="https://github.com/mperham/sidekiq" target="_blank">לימדו על Sidekiq כאן</a>.'
     queue_size_warning: "מספר העבודות בתור הוא %{queue_size}, שהוא גבוה. זה עלול להצביע על בעיה עם תהליך(י) Sidekiq, או שייתכן שאתם צריכים יותר Sidekiq workers."
     memory_warning: "בשרת שלכם יש פחות מ 1 גיגה זיכרון בסך הכל. מומלץ לפחות 1 גיגה זיכרון."
@@ -1447,8 +1452,8 @@ he:
     force_https: "הכריחו את אתרכם להשתמש אך ורק ב HTTPS. אזהרה: אל תאפשרו זאת עד שתוודאו ש HTTPS מותקן ועובד ממש בכל המקרים! וידאתם את הגדרות ה CDN שלכם, כל שירותי ההתחברות, וכל הלוגואים / תלויות החיצוניים - כדי לוודא שכולם עובדים גם כן עם HTTPS?"
     same_site_cookies: "שימוש בעוגיות של האתר, הן מבטלות את כל הווקטורים של Cross Site Request Forgery בדפדפנים נתמכים (Lax או Strict). אזהרה: Strict יעבוד רק על אתרים שמכריכים התחברות ומשתמשים ב SSO."
     summary_score_threshold: "הניקוד המינימלי הנדרש כדי שפוסט ייכלל ב\"סיכום נושא זה\""
-    summary_posts_required: "מספר הפוסטים המנימלי בנושא לפני שהאפשרות \"סיכום נושא זה\" תתאפשר"
-    summary_likes_required: "מינימום הלייקים לנושא לפני שהאפשרות \"סיכום נושא זה\" תתאפשר"
+    summary_posts_required: "כמות פוסטים מזערית בנושא בטרם מופעל ‚תקציר לנושא זה’. שינויים בהגדרה זו יחולו רטרואקטיבית תוך שבוע."
+    summary_likes_required: "כמות לייקים מזערית בנושא בטרם מופעל ‚תקציר לנושא זה’. שינויים בהגדרה זו יחולו רטרואקטיבית תוך שבוע."
     summary_percent_filter: "כאשר משתמש/ת מקליקים על \"סיכום נושא זה\", הציגו את % הפוסטים הראשונים"
     summary_max_results: "מספר הפוסטים המרבי שיוחזר על ידי ‚סיכום הנושא הזה’"
     enable_personal_messages: "לאפשר למשתמשים בדרגת אמון 1 (ניתן להגדרה דרך דרגת אמון מזערית לשליחת הודעות) ליצור הודעות ולענות להודעות. נא לשים לב שהסגל תמיד יכול לשלוח הודעות, ללא קשר."
@@ -1480,7 +1485,8 @@ he:
     markdown_typographer_quotation_marks: "רשימה של צמדי החלפות מירכאות כפולות ובודדות"
     post_undo_action_window_mins: "מספר הדקות בהן מתאפשר למשתמשים לבטל פעולות אחרות בפוסט (לייק, סימון, וכו')."
     must_approve_users: "על הסגל לאשר את כל חשבונות המשתמשים החדשים בטרם מתאפשרת כניסתם לאתר."
-    approve_suspect_users: "על חברי הסגל לאשר את כל החשבונות החשודים"
+    invite_code: "על המשתמש להקליד את הקוד הזה כדי שיתאפשר לו להירשם לחשבון, כשריק אין לזה משמעות (אין משמעות לאותיות גדולות/קטנות)"
+    approve_suspect_users: "הוספת משתמשים חשודים לתור הסקירה. משתמשים חשודים מילאו ביוגרפיה/אתר אבל לא קראו שום דבר."
     pending_users_reminder_delay: "יש להודיע למפקחים אם משתמשים חדשים ממתינים לעדכון מעבר לכמות כזו של שעות. יש להגדיר ל־‎-1 כדי לנטרל את ההתראות."
     maximum_session_age: "משתמשים ישארו מחוברים ל n שעות מאז ביקורם האחרון"
     ga_universal_tracking_code: "מזהה קוד מעקב של Google Universal Analytics (analytics.js), למשל: UA-12345678-9; ניתן לעיין ב־<a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -1529,6 +1535,8 @@ he:
     allow_index_in_robots_txt: "יש לציין ב־robots.txt שמותר לאתר הזה להצטרף למאגר של מנועי החיפוש. במקרים יוצאי דופן, ניתן <a href='%{base_path}/admin/customize/robots'>לדרוס את robots.txt</a> באופן קבוע."
     email_domains_blacklist: "רשימה מופרדת בצינור (pipe) של דומיינים של אימייל אשר מהם משתמשים לא מורשים לרשום חשבונות. למשל: mailinator.com|trashmail.net"
     email_domains_whitelist: "רשימה מופרדת בצינור (pipe) אשר ר-ק ממנה משתמשים יכולים לרשום חשבונות. א-ז-ה-ר-ה: משתמשים עם אימיילים מדומיינים אחרים לא יורשו!"
+    enforce_canonical_emails: "בטרם יצירת משתמשים יש להפשיט כתובת דוא״ל לצורה אחידה כדי לאמת ייחודיות. ההגדרות תפעל רק על רישומי חשבונות חדשים. כאשר user+1@domain.com לא תהיה כתובת מורשית אם user+2@domain.com כבר רשומה."
+    auto_approve_email_domains: "משתמשים עם כתובות דוא״ל מרשימת שמות התחום האלה יאושרו אוטומטית."
     hide_email_address_taken: "לא להודיע למשתמשים שקיים חשבון עם כתובת דוא״ל מסוימת במהלך ההרשמה ובטופס שחזור הססמה."
     log_out_strict: "בהתנתקות, נתקו את כל ההפעלות של המשתמש/ת בכל המכשירים"
     version_checks: "לדגום את Discourse Hub כדי למצוא עדכוני גרסאות ולהציג הודעות של גרסאות חדשות בלוח הניהול <a href='%{base_path}/admin' target='_blank'>‎/admin</a>"
@@ -1586,7 +1594,6 @@ he:
     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>. שדה ריק משמעו כל גילדה שהיא.'
-    readonly_mode_during_backup: "הפעלת מצב קריאה בלבד בזמן גיבוי"
     enable_backups: "לאפשר למנהלים ליצור גיבויים של הפורום"
     allow_restore: "אפשר שחזור, אשר יכול להחליף את כל(!) המידע באתר! הותירו על \"שלילי\" (false) אלא אם כן אתם מתכננים לשחזר גיבוי."
     maximum_backups: "המספר המקסימלי של גיבויים לשמירה על הכונן. גיבויים ישנים יותר ימחקו אוטומטית"
@@ -1779,8 +1786,8 @@ he:
     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: "מספר מקסימלי של משתמשים מועמדים שנוצרים בזמן עיבוד מייל מכנס."
+    enable_staged_users: "יצירת משתמשים מבוימים באופן אוטומטי בזמן עיבוד הודעות דוא״ל נכנסות."
+    maximum_staged_users_per_email: "מספר מרבי של משתמשים מבוימים שנוצרים בזמן עיבוד הודעת דוא״ל נכנסת."
     auto_generated_whitelist: "רשימת כתובות דואר מהן לא ייבדק אם התוכן נוצר-אוטומטית. למשל: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "חסימת מיילים נכנסים שמזוהים ככאלו שנוצרו אוטומטית."
     ignore_by_title: "התעלמות ממיילים נכנסים לפי הכותרת שלהם."
@@ -1821,6 +1828,7 @@ he:
     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)"
@@ -1859,6 +1867,7 @@ he:
     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 להשבתה"
     user_website_domains_whitelist: "אתרי משתמשים יאומתו עם מתחמים אלו. רשימה מופרדת על ידי קווים-אנכיים."
@@ -1897,7 +1906,9 @@ he:
     highlighted_languages: "כללי הדגשת תחביר להכללה. (אזהרה: הכללה של שפות רבות מדי פוגעת בביצועים) להדגמה: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a>"
     embed_any_origin: "לאפשר תוכן עם יכולת הטמעה ללא תלות במקור. נחוץ ליישומונים לנייד עם HTML סטטי."
     embed_topics_list: "תמיכה בהטמעת רשימות נושאים ב־HTML"
+    embed_set_canonical_url: "הגדרת הכתובת הקנונית לנושאים מוטמעים כדי להטמיע את כתובת התוכן."
     embed_truncate: "חיתוך הפוסטים המוטמעים."
+    embed_unlisted: "נושאים שיובאו לא יופיעו ברשימה עד שתתווסף אליהם תגובה ממשתמש."
     embed_support_markdown: "תמיכה בסימון Markdown בפוסטים מוטמעים."
     embed_whitelist_selector: "רשימה מופרדת בפסיקים של רכיבי CSS שמותר להשתמש בהם בהטמעות (embed)."
     allowed_href_schemes: "פרוטוקולים מותרים בלינקים בנוסף ל http ו https."
@@ -1908,7 +1919,7 @@ he:
     delete_drafts_older_than_n_days: "מחקו טיוטות בנות יותר מ (n) ימים."
     bootstrap_mode_min_users: "מספר משתמשים מינימלי שנדרש כדי לנטרל מצב איתחול (קבעו ל 0 כדי לנטרל)"
     prevent_anons_from_downloading_files: "מונע ממשתמשים אנונימיים להוריד צרופות (attachments). אזהרה: דבר זה ימנע מכל משאב שאינו תמונה ופורסם כצרופה לעבוד."
-    secure_media: 'הגבלת הגישה להעלאות מדיה (תמונות, סרטונים, קטעי שמע). אם מופעלת „דרישת כניסה”, רק למשתמשים שנכנסו לחשבון במערכת תהיה גישה למדיה שהועלתה. אחרת, הגישה תוגבל רק למדיה שנשלחה בהודעות פרטיות. לתשומת לבך: חובה להפעיל העלאות ל־S3 בטרם הפעלת הגדרה זו.'
+    secure_media: 'מגביל גישה לכל ההעלאות (תמונות, סרטונים, שמע, טקסט, קובצי PDF, ארכיוני zip ועוד). אם מופעלת האפשרות „דרישת כניסה”, רק משתמשים שנכנסו למערכת יכולים לגשת להעלאות. אחרת, הגישה תוגבל רק להעלאות מסוגי מדיה בהודעות פרטיות ובקטגוריות פרטיות. אזהרה: מדובר בהגדרה מסובכת שדורשת הבנה עמוקה בניהול המערכת. יש לעיין ב<a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">נושא המדיה המאובטחת ב־Meta</a> לקבלת פרטים נוספים.'
     slug_generation_method: "בחרו צורת ייצור slug. צורה של 'encoded' תגרום למחרוזות עם קידוד אחוזים. 'none' ינטרל slug לחלוטין."
     enable_emoji: "הפעלת אמוג׳י"
     enable_emoji_shortcuts: "חייכנים נפוצים כגון ‎:) :p :(‎ יומרו לאמוג׳ים"
@@ -1929,6 +1940,7 @@ he:
     new_user_notice_tl: "דרגת האמון המזערית הדרושה לצפייה בהתראות על פוסט של משתמש חדש."
     returning_user_notice_tl: "דרגת האמון המזערית הדרושה לצפייה בהתראות משתמש חוזר."
     returning_users_days: "כמה ימים אמורים לעבור לפני שמשתמש נחשב למשתמש חוזר."
+    enable_page_publishing: "לאפשר לחברי סגל לפרסם נושאים לכתובות חדשות עם סגנון עצמאי."
     default_email_digest_frequency: "באיזו תדירות משתמשים יקבלו סיכומי מיילים כברירת מחדל."
     default_include_tl0_in_digests: "כללו פוסטים ממשתמשים חדשים בדוא\"ל מסכם כברירת מחדל. משתמשים יוכלו לשנות זאת בהעדפות האישיות."
     default_email_level: "הגדרת רמת ההתראה בדוא״ל כבררת מחדל לנושאים רגילים."
@@ -1991,6 +2003,9 @@ he:
     push_notifications_icon: "סמל העיטור שמופיע בפינת ההתרעה. הגודל הנדרש הוא 96 × 96."
     short_title: "בכותרת הקצרה ייעשה שימוש במסך הבית של המשתמש, במשגר או במקומות אחרים שבהם המקום מוגבל. אורכה לא יעלה על 12 תווים."
     dashboard_general_tab_activity_metrics: "נא לבחור דיווחים שיופיעו בתור מדדי פעילות בלשונית הכללית."
+    gravatar_name: "שם ספק ה־Gravatar"
+    gravatar_base_url: "כתובת בסיס ה־API של ספק ה־Gravatar"
+    gravatar_login_url: "כתובת ביחס אל gravatar_base_url (כתובת הבסיס של Gravatat) שמספקת למשתמש גישה לשירות Gravatar"
     errors:
       invalid_email: "כתובת דוא\"ל לא קיימת."
       invalid_username: "אין משתמש/ת עם שם משתמש כזה."
@@ -2100,6 +2115,11 @@ he:
       other: "%{count} פוסטים מוזגו להודעה קיימת: %{topic_link}"
   change_owner:
     post_revision_text: "הבעלות הועברה"
+  publish_page:
+    slug_errors:
+      blank: "לא ניתן להשאיר ריק"
+      unavailable: "אינו זמין"
+      invalid: "מכיל תווים לא תקניים"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "הודעה זו נסגרה אוטומטית אחרי שהגיעה למספר המקסימלי של תגובות: %{count} ."
@@ -2210,6 +2230,7 @@ he:
     new_registrations_disabled: "הוספת חשבונות חדשים אינה מותרת בעת זו."
     password_too_long: "סיסמאות מוגבלות ל-200 תווים."
     email_too_long: "המייל שהזנת ארוך מדי. שמות מייל צריכים להכיל לכל היותר 254 תוים, ושמות דומיין צריכים להכיל לכל היותר 253 תוים."
+    wrong_invite_code: "קוד ההזמנה שהקלדת שגוי."
     reserved_username: "שם משתמש זה אינו מורשה."
     missing_user_field: "לא מילאת את כל שדות המשתמש/ת"
     auth_complete: "אימות הושלם."
@@ -2221,6 +2242,8 @@ he:
     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: "להשתמש בקוד גיבוי במקום"
@@ -3074,7 +3097,7 @@ he:
 
         %{respond_instructions}
     user_invited_to_private_message_pm_staged:
-      title: "משתמש/ת הוזמן/ה להודעה פרטית מדורגת"
+      title: "משתמש/ת הוזמן/ה להודעה פרטית מבוימת"
       subject_template: "הוזמנת לדיון '%{topic_title}' על ידי [%{email_prefix}] %{username}"
       text_body_template: |
         %{header_instructions}
@@ -3202,7 +3225,7 @@ he:
 
         %{respond_instructions}
     user_posted_pm_staged:
-      title: "משתמש/ת פרסם/ה הודעה פרטית מדורגת"
+      title: "משתמש/ת פרסם/ה הודעה פרטית מבוימת"
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
@@ -3249,8 +3272,8 @@ he:
       why: "סיכום קצר של %{site_link} מאז ביקורך האחרון ב-%{last_seen_at}"
       since_last_visit: "מאז ביקורכם האחרון"
       new_topics: "נושאים חדשים"
-      unread_messages: "הודעות שלא נקראו"
       unread_notifications: "התראות שלא נקראו"
+      unread_high_priority: "הודעות בדחיפות גבוהה שלא נקראו"
       liked_received: "לייקים שהתקבלו"
       new_users: "משתמשים חדשים"
       popular_topics: "נושאים פופולאריים"
@@ -3421,6 +3444,7 @@ he:
     file_missing: "סליחה, עליך לספק קובץ להעלות."
     empty: "מצטערים, אבל הקובץ שסיפקתם ריק"
     png_to_jpg_conversion_failure_message: "אירעה שגיאה בעת המרה מ־PNG ל־JPG."
+    optimize_failure_message: "אירעה שגיאה בעת מיטוב התמונה שהועלתה."
     attachments:
       too_large: "מצטערים, הקובץ שאתם מנסים להעלות גדול מידי (הגודל המקסימלי המותר הוא %{max_size_kb}KB)."
     images:
@@ -3456,6 +3480,7 @@ he:
     sender_body_blank: "גוף ריק"
     sender_post_deleted: "פוסט נמחק"
     sender_message_to_invalid: "כתובת דוא״ל הנמען שגויה"
+    sender_topic_deleted: "הנושא נמחק"
   color_schemes:
     base_theme_name: "בסיס"
     light: "בהיר"
@@ -4176,7 +4201,7 @@ he:
       invite_only: "על כל המשתמשים החדשים לקבל הזמנה. יש לעיין ב־`invite_only` (הזמנה בלבד)"
       email_auth_res_enqueue: "הודעת דוא״ל זו נפסלה בבדיקת DMARC, כנראה שאינה נשלחה מהנמען שצוין. מוטב להתעמק בכותרות הגולמיות של הודעת הדוא״ל כדי להבין יותר לעומק."
       email_spam: "הודעת דוא״ל זו סומנה כספאם עקב הכותרת שהוגדרה תחת `email_in_spam_header` (כותרת דוא״ל לספאם)."
-      suspect_user: "משתמשים ברשימת החשודים חייבים לעבור את סקירת הסגל. נא לעיין ב־`approve_suspect_users` (אישור משתמשים חשודים)."
+      suspect_user: "המשתמש החדש הזה מילא פרטי חשבון מבלי לקרוא נושאים או פוסטים, מה שעשוי לרמז על כך שייתכן שמדובר בתוקף ספאם. יש לעיין ב־`approve_suspect_users` (אישור משתמשים חשודים).  "
     actions:
       agree:
         title: "הסכמה…"
diff --git a/config/locales/server.hu.yml b/config/locales/server.hu.yml
index 9dc15bdac6..052c905d60 100644
--- a/config/locales/server.hu.yml
+++ b/config/locales/server.hu.yml
@@ -57,7 +57,6 @@ hu:
       no_multilevels_components: "A gyermektémákat tartalmazó témák nem lehet maguk is gyermektémák"
     settings_errors:
       invalid_yaml: "A megadott YAML érvénytelen."
-      data_type_not_a_number: "A(z) „%{name}” típus beállítása nem támogatott. A támogatott típusok: „integer”, „bool”, „list” és „enum”."
       name_too_long: "Az egyik beállítás neve túl hosszú. A legnagyobb hossz 255"
       default_value_missing: "A(z) „%{name}” beállításnak nincs alapértelmezett értéke."
       default_not_match_type: "A(z) „%{name}” beállítás alapértelmezett értékének típusa nem egyezik a beállítás típusával."
@@ -245,6 +244,12 @@ hu:
   too_late_to_edit: "Ez a bejegyzés túl régen lett létrehozva. Már nem lehet szerkeszteni vagy törölni."
   revert_version_same: "A jelenlegi verzió megegyezik azzal a verzióval amire vissza szeretne térni."
   excerpt_image: "kép"
+  bookmarks:
+    reminders:
+      later_today: "A mai nap folyamán"
+      tomorrow: "Holnap"
+      next_week: "Jövő héten"
+      next_month: "Jövő hónapban"
   groups:
     errors:
       can_not_modify_automatic: "Nem módosíthat egy automata csoportot"
@@ -791,6 +796,10 @@ hu:
   redirected_to_top_reasons:
     new_user: "Üdv a közösségünkben! Ezek a legnépszerűbb témakörök."
     not_seen_in_a_month: "Üdv újra itt! Régóta nem láttuk. Ezek a legnépszerűbb témakörök, amióta távol volt."
+  publish_page:
+    slug_errors:
+      blank: "nem lehet üres"
+      invalid: "érvénytelen karaktereket tartalmaz"
   topic_statuses:
     autoclosed_disabled: "A témakör jelenleg nyitott. Mostantól lehet válaszolni rá."
     autoclosed_disabled_lastpost: "A témakör jelenleg nyitott. Mostantól lehet válaszolni rá."
@@ -1019,7 +1028,6 @@ hu:
       why: "Egy kis összefoglaló a(z) %{site_link} oldalról, hogy mik történtek a legutóbbi látogatása (%{last_seen_at}) óta."
       since_last_visit: "Utolsó látogatása óta"
       new_topics: "Új téma"
-      unread_messages: "Olvasatlan üzenet"
       unread_notifications: "Olvasatlan értesítés"
       liked_received: "Kapott kedvelés"
       new_users: "Új felhasználó"
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index 661caa18a8..db6169dfd9 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -55,7 +55,6 @@ hy:
       no_multilevels_components: "Դուստր-թեմա ունեցող թեմաները չեն կարող լինել իրենք իրենց դուստր-թեմա"
     settings_errors:
       invalid_yaml: "Տրված YAML -ը անվավեր է:"
-      data_type_not_a_number: "Կարգավորման `%{name}` տիպը չի ապահովվում: Ապահովվող տիպերն են՝ `integer`, `bool`, `list` և `enum` :"
       name_too_long: "Չափազանց երկար անունով կարգավորում կա: Առավելագույն երկարությունն է 255:"
       default_value_missing: " `%{name}` կարգավորումը չունի լռելյայն արժեք"
       default_not_match_type: "Կարգավորման `%{name}` լռելյայն արժեքի տիպը չի համապատասխանում կարգավորման տիպին:"
@@ -291,6 +290,12 @@ hy:
   edit_conflict: "Այդ գրառումը խմբագրվել է մեկ այլ օգտաիրոջ կողմից, և Ձեր փոփոխությունները այլևս չեն կարող պահպանվել:"
   revert_version_same: "Ընթացիկ տարբերակը նույնն է, ինչ այն, որը Դուք փորձում եք վերադարձնել:"
   excerpt_image: "նկար"
+  bookmarks:
+    reminders:
+      later_today: "Այսօր, մի փոքր ուշ"
+      tomorrow: "Վաղը"
+      next_week: "Հաջորդ շաբաթ"
+      next_month: "Հաջորդ ամիս"
   groups:
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' -ը վավեր վստահության մակարդակ չէ:"
@@ -1082,7 +1087,6 @@ hy:
   dashboard:
     rails_env_warning: "Ձեր սերվերը աշխատում է %{env} ռեժիմով:"
     host_names_warning: "Ձեր config/database.yml ֆայլը օգտագործում է լռելյայն localhost հոսթի անուն: Թարմացրեք այն Ձեր կայքի հոսթի անունով:"
-    gc_warning: 'Ձեր սերվերը լռելյայն օգտագործում է ruby garbage collection պարամետրեր, որը լավագույն կատարողականություն չի տա: Կարդացեք կատարողականության կարգավորման մասին այս թեման՝ <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Ruby and Rails -ի կարգավորում Discourse-ի համար</a>:'
     sidekiq_warning: 'Sidekiq -ը չի աշխատում: Շատ առաջադրանքներ, օրինակ՝ էլ. նամակների ուղարկումը, անհամաժամորեն(asynchronously) իրականացվում են sidekiq -ի կողմից: Խնդրում ենք համոզվել, որ առնվազն մեկ sidekiq գործընթաց աշխատում է: <a href="https://github.com/mperham/sidekiq" target="_blank">Իմացեք Sidekiq -ի մասին այստեղ</a>:'
     queue_size_warning: "Սպասող job-երի քանակը %{queue_size} է, ինչը բարձր է: Սա կարող է խնդիր առաջացնել Sidekiq գործընթաց(ներ)ի հետ, կամ հնարավոր է՝ կարիք լինի ավելացնելու ավելի շատ Sidekiq աշխատողների:"
     memory_warning: "Ձեր սերվերն աշխատում է 1 ԳԲ-ից քիչ ընդհանուր հիշողությամբ: Խորհուրդ է տրվում առնվազն 1 ԳԲ հիշողություն:"
@@ -1179,8 +1183,6 @@ hy:
     force_https: "Պարտադրեք Ձեր կայքին օգտագործել միայն HTTPS: ՈՒՇԱԴՐՈՒԹՅՈՒՆ՝ ՄԻ միացրեք սա, քանի դեռ համոզված չեք, որ HTTPS -ը ամբողջությամբ կարգավորված է և աշխատում է բացառապես ամենուր! Դուք ստուգե՞լ եք նաև Ձեր CDN-ը, բոլոր սոցիալական կայքերը և ցանկացած արտաքին լոգո / կախյալներ՝ համոզվելու համար, որ դրանք բոլորը համատեղելի են HTTPS -ի հետ:"
     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 SSO."
     summary_score_threshold: "'Ամփոփել Այս Թեման'-ի մեջ ներառման համար անհրաժեշտ գրառման նվազագույն միավորը"
-    summary_posts_required: "Թեմայի նվազագույն գրառումները՝ մինչ 'Ամփոփել Այս Թեման' միացնելը"
-    summary_likes_required: "Թեմայի նվազագույն հավանումները՝ մինչ 'Ամփոփել Այս Թեման' միացնելը"
     summary_percent_filter: "Երբ օգտատերը սեղմում է 'Ամփոփել Այս Թեման' , ցուցադրել գրառումների թոփ %-ը"
     summary_max_results: "'Ամփոփել Այս Թեման' -ի կողմից վերադարձված առավելագույն գրառումները"
     enable_personal_messages: "Թույլատրել վստահության 1-ին մակարդակի (կարգավորվում է հաղորդագրություններ ուղարկելու համար նվազագույն վստահության մակարդակի միջոցով) օգտատերերին ստեղծել և պատասխանել հաղորդագրություններին: Նկատի ունեցեք, որ անձնակազմը միշտ կարող է ուղարկել հաղորդագրություն, կապ չունի թե ինչպիսի:"
@@ -1299,7 +1301,6 @@ hy:
     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: "Հաճախորդի 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>"
-    readonly_mode_during_backup: "Պահուստ ստեղծելիս միացնել միայն կարդալու համար ռեժիմը"
     enable_backups: "Թույլատրել ադմինիստրատորներին ստեղծել ֆորումի պահուստներ"
     allow_restore: "Թույլատրել վերականգնումը, որը կարող է փոխարինել կայքի ԲՈԼՈՐ տվյալները: Թողեք սխալ, մինչև որ չպլանավորեք վերականգնել պահուստ:"
     maximum_backups: "Պահուստների՝ դիսկի վրա պահելու առավելագույն քանակը: Ավելի հին պահուստները ավտոմատ կերպով ջնջվում են:"
@@ -1740,6 +1741,10 @@ hy:
       other: "%{count} գրառում միավորվել է գոյություն ունեցող հաղորդագրության՝ %{topic_link}"
   change_owner:
     post_revision_text: "Սեփականությունը փոխանցված է"
+  publish_page:
+    slug_errors:
+      blank: "չի կարող լինել դատարկ"
+      invalid: "պարունակում է անվավեր սիմվոլներ"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Այս հաղորդագրությունը ավտոմատ փակվել է՝ պատասխանների առավելագույն %{count} թվին հասնելուց հետո:"
@@ -2595,7 +2600,6 @@ hy:
       why: " %{site_link}-ի համառոտ ամփոփում՝ Ձեր %{last_seen_at}վերջին այցելությունից հետո"
       since_last_visit: "Ձեր վերջին այցելությունից հետո"
       new_topics: "Նոր Թեմաներ"
-      unread_messages: "Չկարդացած Նամակներ"
       unread_notifications: "Չկարդացած Ծանուցումներ"
       liked_received: "Ստացված Հավանումներ"
       new_users: "Նոր Օգտատերեր"
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index b8d01a2987..baf224e920 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -172,11 +172,6 @@ id:
   bookmarks:
     reminders:
       at_desktop: "Lain kali saat saya di depan komputer"
-      later_today: "Nanti <br/> {{date}}"
-      next_business_day: "Hari kerja berikutnya <br/> {{date}}"
-      tomorrow: "Besok <br/> {{date}}"
-      next_week: "Minggu depan <br/> {{date}}"
-      next_month: "Bulan depan <br/> {{date}}"
       custom: "Tanggal dan waktu tersuai"
   groups:
     errors:
@@ -541,6 +536,10 @@ id:
     types:
       category: "Kategori"
       user: "Pengguna"
+  publish_page:
+    slug_errors:
+      blank: "tidak boleh kosong"
+      invalid: "memuat karakter yang tidak valid"
   topic_statuses:
     autoclosed_disabled: "Topik telah dibuka. Jawaban baru sekarang diijinkan."
     autoclosed_disabled_lastpost: "Topik telah dibuka. Jawaban baru sekarang diijinkan."
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index bb53cb61cb..0169606eb3 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -37,9 +37,9 @@ it:
   anonymous: "Anonimo"
   remove_posts_deleted_by_author: "Cancellato dall'autore"
   redirect_warning: "Non è stato possibile verificare che il collegamento che hai selezionato sia stato effettivamente pubblicato sul forum. Se desideri procedere comunque, seleziona il collegamento qui sotto."
-  on_another_topic: "Su un altro Argomento"
+  on_another_topic: "Su un altro argomento"
   themes:
-    bad_color_scheme: "Impossibile aggiornare il Tema, paletta dei colori non valida"
+    bad_color_scheme: "Impossibile aggiornare il tema, paletta dei colori non valida"
     other_error: "Qualcosa è andato storto durante l'aggiornamento del tema"
     compile_error:
       unrecognized_extension: "Estensione del file non riconosciuta: %{extension}"
@@ -47,34 +47,36 @@ it:
       generic: Errore durante l'importazione del tema
       about_json: "Errore di importazione: about.json non esiste o non è valido"
       about_json_values: "about.json contiene valori non validi: %{errors}"
+      modifier_values: "I modificatori about.json contengono valori non validi: %{errors}"
       git: "Errore nella clonazione del repository git, accesso negato o repository non trovato"
-      unpack_failed: "Errore estranedo il contenuto del file"
+      unpack_failed: "Impossibile decomprimere il file"
       file_too_big: "Il file non compresso è troppo grande."
-      unknown_file_type: "Il file che hai caricato non sembra essere un tema di Discourse valido."
+      unknown_file_type: "Il file che hai caricato non sembra essere un tema valido di Discourse."
     errors:
       component_no_user_selectable: "I componenti del tema non possono essere selezionabili dall'utente"
       component_no_default: "I componenti del tema non possono essere il tema predefinito"
-      component_no_color_scheme: "I Componenti dei Temi non possono avere palette dei colori"
+      component_no_color_scheme: "I componenti dei temi non possono avere palette dei colori"
       no_multilevels_components: "I temi con temi figlio non possono essere essi stessi temi figlio"
+      optimized_link: I collegamenti ad immagini ottimizzate sono effimeri e non devono essere inclusi nel codice sorgente del tema.
     settings_errors:
       invalid_yaml: "Il codice YAML fornito è invalido."
-      data_type_not_a_number: "L'impostazione del tipo `%{name}` non è supportata. I tipi supportati sono `integer`, `bool`, `list` e `enum`"
+      data_type_not_a_number: "L'impostazione del tipo `%{name}` non è supportata. I tipi supportati sono `integer`,` bool`, `list`,` enum` e `upload`"
       name_too_long: "Una delle impostazioni ha un nome troppo lungo. La lunghezza massima è 255 caratteri"
-      default_value_missing: "L'impostazione `%{name}` non ha valore predefinito"
-      default_not_match_type: "L'impostazione del valore di `%{name}` valore predefinito non corrisponde al tipo di impostazione."
+      default_value_missing: "L'impostazione `%{name}` non ha alcun valore predefinito"
+      default_not_match_type: "L'impostazione del valore predefinito `%{name}` non corrisponde al tipo di impostazione."
       default_out_range: "L'impostazione del valore predefinito `%{name}` non è nell'intervallo specificato."
       enum_value_not_valid: "Il valore selezionato non è una delle opzioni enum."
       number_value_not_valid: "Il nuovo valore non è compreso nell'intervallo consentito."
-      number_value_not_valid_min_max: "Deve essere tra %{min} e %{max}."
+      number_value_not_valid_min_max: "Deve essere compreso tra %{min} e %{max}."
       number_value_not_valid_min: "Deve essere maggiore o uguale a %{min}."
       number_value_not_valid_max: "Deve essere minore o uguale a %{max}."
       string_value_not_valid: "La nuova lunghezza del valore non rientra nell'intervallo consentito."
-      string_value_not_valid_min_max: "Deve avere tra i %{min} ed i %{max} caratteri."
+      string_value_not_valid_min_max: "Deve essere lungo da %{min} a %{max} caratteri."
       string_value_not_valid_min: "Deve contenere almeno %{min} caratteri."
       string_value_not_valid_max: "Deve contenere al massimo %{max} caratteri."
     locale_errors:
-      top_level_locale: "La chiave di primo livello in un file di localizzazione deve essere identica al nome della localizzazione"
-      invalid_yaml: "File YAML della traduzione non valido"
+      top_level_locale: "La chiave di primo livello in un file di localizzazione deve corrispondere al nome della localizzazione"
+      invalid_yaml: "Traduzione YAML non valida"
   emails:
     incoming:
       default_subject: "L'argomento necessita di un titolo"
@@ -82,16 +84,17 @@ it:
       maximum_staged_user_per_email_reached: "E' stato 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)"
+      missing_attachment: "(Manca l'allegato %{filename})"
       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'."
         auto_generated_email_error: "Succede quando l'intestazione 'precedence' è impostata su: list, junk, bulk oppure auto_reply, oppure quando qualunque altra intestazione contiene: auto-submitted, auto-replied o auto-generated."
         no_body_detected_error: "Succede quando non si riesce ad estrapolare il corpo del messaggio e non ci sono allegati. "
         no_sender_detected_error: "Succede quando non abbiamo trovato un indirizzo email valido nell'intestazione From."
-        from_reply_by_address_error: "Accade quando l'intestazione From corrisponde alla risposta per indirizzo email."
+        from_reply_by_address_error: "Accade quando l'intestazione From corrisponde all'indirizzo email della risposta."
         inactive_user_error: "Succede quando il mittente non è attivo."
         silenced_user_error: "Succede quando il mittente è stato silenziato."
+        bad_destination_address: "Succede quando nessuno degli indirizzi email nei campi A/Cc corrisponde a un indirizzo email entrante configurato."
         strangers_not_allowed_error: "Succede quando un utente tenta di creare uno nuovo argomento in una categoria della quale non è membro."
         insufficient_trust_level_error: "Succede quando un utente tenta di creare un nuovo argomento in una categoria per la quale non ha il livello di esperienza richiesto."
         reply_user_not_matching_error: "Succede quando arriva una risposta da un indirizzo email diverso da quello cui la notifica era stata inviata."
@@ -102,6 +105,7 @@ it:
         unsubscribe_not_allowed: "Succede quando annullare l'iscrizione tramite email non è consentito per questo utente."
         email_not_allowed: "Succede quando l'indirizzo email non è in lista bianca oppure è nella lista nera."
       unrecognized_error: "Errore Non Riconosciuto"
+    secure_media_placeholder: "Redatto: questo sito ha abilitato i supporti sicuri, visita l'argomento per vedere immagine/audio/video allegati."
   errors: &errors
     format: "%{attribute} %{message}"
     format_with_full_message: "<b>%{attribute}</b>: %{message}"
@@ -123,6 +127,7 @@ it:
       inclusion: non è incluso nella lista
       invalid: non è valido
       is_invalid: "sembra poco chiaro, è una frase completa?"
+      invalid_timezone: "'%{tz}' non è un fuso orario valido"
       contains_censored_words: "contiene le seguenti parole censurate: %{censored_words}"
       less_than: "deve essere minore di %{count}"
       less_than_or_equal_to: "deve essere minore o uguale a %{count}"
@@ -131,7 +136,7 @@ it:
       odd: deve essere dispari
       record_invalid: "Validazione fallita: %{errors}"
       max_emojis: "non può avere più di %{max_emojis_count} emoji"
-      emojis_disabled: "emoji non disponibili"
+      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é ne esistono %{record} dipendenti"
@@ -146,12 +151,12 @@ it:
         one: ha una lunghezza errata (dovrebbe essere di %{count} carattere)
         other: ha una lunghezza errata (dovrebbe essere di %{count} caratteri)
       other_than: "deve essere diverso da %{count}"
-      sso_overrides_username: "Lo Username deve essere aggiornato nel provider SSO, dato che `sso_overrides_username` è abilitato."
+      sso_overrides_username: "Il nome utente deve essere aggiornato nel provider SSO, poichè l'impostazione del sito `sso_overrides_username` è abilitata."
     template:
       body: "Sono stati riscontrati problemi con i seguenti campi:"
       header:
         one: "%{count} errore ha impedito il salvataggio di questo %{model}"
-        other: "%{count} errori hanno impedito il salvataggio di questo %{model}"
+        other: "%{count} errori hanno impedito il salvataggio di %{model}"
     embed:
       load_from_remote: "Si è verificato un errore nel caricamento del messaggio."
     site_settings:
@@ -160,39 +165,42 @@ it:
         one: "Hai specificato la scelta non valida %{name}"
         other: "Hai specificato le scelte non valide %{name}"
       default_categories_already_selected: "Non puoi selezionare una categoria usata in un'altra lista."
+      default_tags_already_selected: "Non è possibile selezionare un'etichetta utilizzata in un altro elenco."
       s3_upload_bucket_is_required: "Non è possibile attivare i caricamenti su S3 a meno che non imposti l'opzione 's3_upload_bucket'."
-      enable_s3_uploads_is_required: "Non puoi attivare gli inventari su S3 a se il caricamento su S3 non è stato attivato a sua volta."
-      s3_backup_requires_s3_settings: "Non puoi usare S3 per salvare i backup senza che '%{setting_name}' sia stato fornito."
+      enable_s3_uploads_is_required: "Non puoi abilitare l'inventario su S3 se non hai abilitato i caricamenti S3."
+      s3_backup_requires_s3_settings: "Non è possibile utilizzare S3 per i backup a meno che non sia stato fornito '%{setting_name}'."
       s3_bucket_reused: "Non puoi usare lo stesso bucket per 's3_upload_bucket' e 's3_backup_bucket'. Scegli un bucket differente, o un percorso diverso per ciascun bucket."
-    conflicting_google_user_id: 'Il Google Account ID per questo account è cambiato; l''intervento dello staff è richiesto per motivi di sicurezza. Si prega di contattare staff e puntarli a <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+      secure_media_requirements: "I caricamenti S3 devono essere abilitati prima di abilitare i supporti sicuri."
+      second_factor_cannot_be_enforced_with_disabled_local_login: "Non è possibile applicare 2FA se i login locali sono disabilitati."
+    conflicting_google_user_id: 'Il Google Account ID per questo account è stato modificato; per motivi di sicurezza è richiesto l''intervendo dello staff. Si prega di contattare lo staff e indirizzarli a <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   activemodel:
     errors:
       <<: *errors
   invite:
-    not_found: "Il tuo token di invito è invalido. <a href='%{base_url}/about'>Per favore contatta lo staff</a>."
-    not_found_json: "Il tuo token di invito è invalido. Per favore contatta lo staff."
+    not_found: "Il token del tuo invito non è valido. Per favore <a href='%{base_url}/about'>contatta lo staff</a>."
+    not_found_json: "Il token del tuo invito non è valido. Per favore contatta lo staff."
     not_found_template: |
-      <p>Il tuo invito a <a href="%{base_url}">%{site_name}</a> è già stato riscattato.</p>
+      <p>Il tuo invito su <a href="%{base_url}">%{site_name}</a> è già stato riscattato.</p>
 
-      <p>Se ricordi la tua password puoi effettuare il <a href="%{base_url}/login">Login</a>.</p>
+      <p>Se ricordi la tua password puoi <a href="%{base_url}/login">Accedere</a>.</p>
 
       <p>In caso contrario <a href="%{base_url}/password-reset">Reimposta la Password</a>.</p>
     error_message: "Si è verificato un errore accettando l'invito. Si prega di contattare l'amministratore del sito."
-    user_exists: "Non c'è bisogno di invitare <b>%{email}</b>, perché <a href='%{base_path}/u/%{username}/summary'>ha già un account!</a>"
-    confirm_email: "<p>Ci siamo quasi! Abbiamo mandato un'email di attivazione al tuo indirizzo di email. Per favore segui le istruzioni contenute nell'email per attivare il tuo account.</p><p>Se non dovesse arrivarti, controlla la tua cartella Spam.</p>"
+    user_exists: "Non è necessario invitare X, hanno già un account!\nNon è necessario invitare <b>%{email}</b>,  <a href='%{base_path}/u/%{username}/summary'>hanno già un account!</a>"
+    confirm_email: "<p>Ci siamo quasi! Abbiamo mandato un'email di attivazione al tuo indirizzo email. Per favore per attivare il tuo account segui le istruzioni contenute nell'email.</p><p>Se non dovesse arrivarti, controlla la tua cartella Spam.</p>"
   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."
     error: "Si è verificato un errore durante il caricamento del file. Per favore riprova più tardi."
   topic_invite:
-    failed_to_invite: "L'utente non può essere invitato in questo Argomento senza essere membro di uno dei seguenti gruppi:: %{group_names}."
+    failed_to_invite: "L'utente non può essere invitato in questo argomento senza essere membro di uno dei seguenti gruppi: %{group_names}."
     user_exists: "Spiacenti, l'utente è stato già invitato. Puoi invitare un utente ad uno stesso argomento solo una volta ."
   backup:
     operation_already_running: "Un'operazione è attualmente in esecuzione. Non è possibile avviarne una nuova adesso."
     backup_file_should_be_tar_gz: "Il file di backup deve essere un archivio .tar.gz"
     not_enough_space_on_disk: "Non c'è abbastanza spazio su disco per caricare questo backup."
     invalid_filename: "Il nome del file di backup contiene caratteri non validi. I caratteri validi sono a-z 0-9 . - _."
-    file_exists: "Il file che stai provando a caricare è già esistente."
+    file_exists: "Il file che stai provando a caricare esiste già."
     location:
       local: "Locale"
       s3: "Amazon S3"
@@ -205,26 +213,26 @@ it:
   provider_not_enabled: "Non ti è consentito visualizzare la risorsa richiesta. Il provider di autenticazione non è abilitato."
   provider_not_found: "Non ti è consentito visualizzare la risorsa richiesta. Il provider di autenticazione non esiste."
   read_only_mode_enabled: "Il sito è in modalità di sola lettura. Le interazioni sono disabilitate."
-  invalid_grant_badge_reason_link: "I collegamenti esterni o collegamenti a Discourse non validi non sono consentiti nella ragione di un Distintivo"
+  invalid_grant_badge_reason_link: "Il collegamento esterno o il collegamento Discourse non  valido non è consentito nella motivazione di assegnazione di un distintivo"
   email_template_cant_be_modified: "Questo modello di email non può essere modificato."
-  invalid_whisper_access: "I Sussurri potrebbero non essere abilitati, oppure non hai il permesso di creare Messaggi Sussurri."
+  invalid_whisper_access: "I sussurri non sono abilitati oppure non hai i permessi per creare sussurri"
   not_in_group:
-    title_topic: "Devi essere membro di un gruppo per visualizzare questa argomento."
-    join_group: "Partecipa al Gruppo"
+    title_topic: "Devi essere membro di un gruppo per vedere questo argomento."
+    join_group: "Unisciti al Gruppo"
   reading_time: "Tempo di lettura"
   likes: "Mi piace"
   too_many_replies:
     one: "Spiacenti, ma i nuovi utenti possono inserire solo %{count} risposta nello stesso argomento."
     other: "Spiacenti, ma i nuovi utenti possono inserire solo %{count} risposte nello stesso argomento."
   max_consecutive_replies:
-    one: "Non sono consentite risposte consecutive. Per favore modifica le tue risposte precedenti o attendi che qualcuno ti risponda."
+    one: "Non sono consentite risposte consecutive. Per favore modifica la tua risposta precedente o attendi che qualcuno ti risponda."
     other: "Non sono consentite più di %{count} risposte consecutive. Per favore modifica le tue risposte precedenti oppure attendi che qualcuno ti risponda."
   embed:
     start_discussion: "Inizia Discussione"
     continue: "Continua Discussione"
     error: "Errore Inclusione"
     referer: "Referer:"
-    error_topics: "Il settaggio `includi la lista degli argomenti` non era abilitato"
+    error_topics: "L'impostazioni del sito `embed topics list` non è stata abilitata"
     mismatch: "Il referer non è stato inviato o non corrispondeva ad alcuno dei seguenti host:"
     no_hosts: "Non sono stati configurati host per l'inclusione."
     configure: "Configura Inclusione"
@@ -264,14 +272,14 @@ it:
     one: "Spiacenti, i nuovi utenti possono inserire al massimo un collegamento in un messaggio."
     other: "Spiacenti, i nuovi utenti possono inserire al massimo %{count} collegamenti in un messaggio."
   contains_blocked_word: "Il tuo messaggio contiene una parola non consentita: %{word}"
-  contains_blocked_words: "Il tuo post contiene parole non permesse: %{words}"
+  contains_blocked_words: "Il tuo messaggio contiene parole non consentite: %{words}"
   spamming_host: "Spiacenti, non puoi inserire un collegamento verso quel dominio."
   user_is_suspended: "Agli utenti sospesi non è permesso creare messaggi."
   topic_not_found: "Quancosa non ha funzionato. Forse questo argomento è stato chiuso o cancellato mentre lo leggevi."
   not_accepting_pms: "Spiacenti, %{username} non accetta messaggi al momento."
   max_pm_recipients: "Spiacenti, puoi inviare un messaggio ad un massimo di %{recipients_limit} destinatari."
   pm_reached_recipients_limit: "Spiacente, non sono consentiti più di %{recipients_limit} destinatari in un messaggio."
-  removed_direct_reply_full_quotes: "La citazione completa del messaggio precedente è stata rimossa automaticamente."
+  removed_direct_reply_full_quotes: "La citazione dell'intero messaggio precedente è stata rimossa automaticamente."
   just_posted_that: "è troppo simile a ciò che hai appena pubblicato"
   invalid_characters: "contiene caratteri non validi"
   is_invalid: "sembra poco chiaro, è una frase completa?"
@@ -305,19 +313,19 @@ it:
     tag: "Argomenti etichettati"
     badge: "distintivo %{display_name} su %{site_title}"
   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 i tuoi cambiamenti non possono essere salvati."
+  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."
   excerpt_image: "immagine"
   bookmarks:
     errors:
-      already_bookmarked_post: "Non puoi aggiungere più di un segnalibro allo stesso messaggio."
+      already_bookmarked_post: "Non puoi aggiungere due volte lo stesso messaggio nei segnalibri."
     reminders:
       at_desktop: "La prossima volta che sarò al mio desktop"
-      later_today: "Più tardi, oggi <br/> {{date}}"
-      next_business_day: "Il prossimo giorno lavorativo<br/> {{date}}"
-      tomorrow: "Domani <br/> {{date}}"
-      next_week: "La prossima settimana <br/> {{date}}"
-      next_month: "Il prossimo mese <br/> {{date}}"
+      later_today: "Più tardi oggi"
+      next_business_day: "Il prossimo giorno lavorativo"
+      tomorrow: "Domani"
+      next_week: "La prossima settimana"
+      next_month: "Il prossimo mese"
       custom: "Data e ora personalizzate"
   groups:
     success:
@@ -348,7 +356,6 @@ it:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "Richesta di Adesione per @%{group_name}"
-      handle: "gestisci le richieste di iscrizione"
     view_hidden_topic_request_reason: "Vorrei far parte del gruppo '%{group_name}', per accedere [all'argomento](%{topic_url})"
   education:
     until_posts:
@@ -361,7 +368,7 @@ it:
 
       - Chi potrebbe esserne interessato? Perché è importante? Che tipo di risposte vorresti?
 
-      - Includi delle buone parole di ricerca nell'argomento così gli altri lo potranno *trovare*. Per raggruppare questo argomento con altri argomenti correlati, seleziona una categoria.
+      - Includi parole comunemente usate nel tuo argomento in modo che gli altri possano *trovarlo*. Per raggruppare questo argomento con altri argomenti correlati, seleziona una categoria.
 
       Per maggiori informazioni, [leggi le linee guida della comunità](%{base_path}/guidelines). Questo pannello sarà visualizzato solo per i tuoi primi %{education_posts_text}.
     "new-reply": |
@@ -391,7 +398,7 @@ it:
 
       E' più facile per chiunque leggere argomenti che hanno poche risposte ma più dettagliate, rispetto a molte brevi risposte individuali.
     dominating_topic: "### Consenti agli altri di partecipare alla conversazione\n\nQuesto argomento è chiaramente importante per te: hai inviato più dell' %{percent}% delle risposte. \n\nPotrebbe essere ancora meglio se dessi anche ad altri lo spazio per condividere i loro punti di vista. Ti va di invitarli?\n"
-    get_a_room: "### Incoraggiare 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 privatamente con questo particolare utente, [invia un messaggio personale] (%{base_path}/u/%{reply_username}).\n"
+    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 privatamente con questo particolare utente, [invia un messaggio personale](%{base_path}/u/%{reply_username}).\n"
     too_many_replies: |
       ### Hai raggiungo il limite di risposte per questo argomento
 
@@ -399,9 +406,9 @@ it:
 
       Invece di aggiungere un'altra risposta, per favore considera di modificare le tue precedenti risposte o di visitare altri argomenti.
     reviving_old_topic: |
-      ### Resuscitare questo argomento?
+      ### Vuoi resuscitare questo argomento?
 
-      L'ultima risposta a questo argomento risale a **%{time_ago}**. La tua risposta farà tornare l'argomento in cima alla lista e tutti gli utenti coinvolti verranno notificati.
+      L'ultima risposta a questo argomento risale a **%{time_ago}**. La tua risposta farà tornare l'argomento in cima alla lista e tutti gli utenti coinvolti saranno avvertiti.
 
       Sei sicuro di voler continuare questa vecchia discussione?
   activerecord:
@@ -424,10 +431,10 @@ it:
             base:
               warning_requires_pm: "Puoi allegare solo avvertimenti ai messaggi personali."
               too_many_users: "Puoi inviare avvertimenti ad un solo utente per volta."
-              cant_send_pm: "Spiacenti! Non puoi mandare messaggi personali a questo utente."
+              cant_send_pm: "Spiacenti, non puoi mandare messaggi personali a questo utente."
               no_user_selected: "Devi selezionare un utente valido."
               reply_by_email_disabled: "La risposta via email è stata disabilitata."
-              target_user_not_found: "Non è stato possibile trovare uno degli utenti a cui stai inviando questo messaggio."
+              target_user_not_found: "Impossibile trovare uno degli utenti a cui stai inviando questo messaggio."
             featured_link:
               invalid: "è invalido. Un URL dovrebbe includere http:// o https://."
               invalid_category: "non può essere modificato in questa categoria."
@@ -449,7 +456,7 @@ it:
         user_email:
           attributes:
             user_id:
-              reassigning_primary_email: "La riassegnazione di una email principale a un altro utente non è consentita."
+              reassigning_primary_email: "La riassegnazione di una email primaria un altro utente non è consentita."
         color_scheme_color:
           attributes:
             hex:
@@ -472,7 +479,7 @@ it:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'Le seguenti chiavi(e) di interpolazione non sono valide: "%{keys}"'
+              invalid_interpolation_keys: 'Le seguenti chiavi di interpolazione non sono valide: "%{keys}"'
         watched_word:
           attributes:
             word:
@@ -506,28 +513,28 @@ it:
 
       Congratulazioni! :confetti_ball:
 
-      Se vedi questo messaggio, significa che sei stato promosso ad **Assiduo** (Livello Esperienza 3).
+      Se vedi questo messaggio, significa che sei stato promosso ad **assiduo** (livello di esperienza 3).
 
       Da ora sarai in grado di: &hellip;
 
-      * Cambiare il titolo a qualsiasi Argomento
-      * Cambiare la Categoria di qualsiasi Argomento
+      * Cambiare il titolo a qualsiasi argomento
+      * Cambiare la categoria di qualsiasi argomento
       * I tuoi collegamenti saranno seguibili ([il nofollow automatico](http://en.wikipedia.org/wiki/Nofollow) è stato rimosso)
-      * Accedere alla categoria privata Lounge visibile ai soli utenti che hanno raggiunto il Livello Esperienza 3 o superiore
+      * Accedere alla categoria privata Salotto visibile ai soli utenti che hanno raggiunto il livello di esperienza 3 o superiore
       * Nascondere messaggi spam con una sola segnalazione
 
       Ecco la [lista degli attuali utenti con Livello Esperienza 3](%{base_path}/badges/3/regular). Lascia loro un saluto.
 
       Grazie per essere un importante membro della nostra comunità!
 
-      (Per ulteriori informazioni sui Livelli Esperienza dai [uno sguardo a questo Argomento][trust]. Tieni presente che solo gli utenti che continuano a rispettare i requisiti resteranno Assidui nel tempo.)
+      (Per ulteriori informazioni sui Livelli Esperienza dai [uno sguardo a questo Argomento][trust]. Tieni presente che solo gli utenti che continuano a rispettare i requisiti nel tempo resteranno assidui.)
 
       [trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
-  admin_quick_start_title: "LEGGIMI PER PRIMO: Una guida rapida per amministratori"
+  admin_quick_start_title: "READ ME FIRST: Guida Rapida per Amministratore"
   category:
     topic_prefix: "Definizione della categoria %{category}"
-    replace_paragraph: "(Sostituisci questo primo paragrafo con una breve descrizione della tua nuova categoria. Questa guida verrà mostrata nell'area di scelta categoria, quindi stai sotto i 200 caratteri.)"
-    post_template: "%{replace_paragraph}\n\nUsa i seguenti paragrafi per una descrizione più estesa, ed anche per stabilire delle regole o linee guida per la categoria:\n\n- Perché la gente dovrebbe usare questa categoria? A che serve? \n\n- In cosa esattamente questa categoria è diversa dalle altre categorie già esistenti? \n\n- Cosa dovrebbero contenere gli argomenti in questa categoria? \n\n- C'è bisogno di questa categoria? Possiamo fonderla con un'altra categoria o sottocategoria?\n"
+    replace_paragraph: "(Sostituisci questo primo paragrafo con una breve descrizione della tua nuova categoria. Questa guida verrà mostrata nell'area di scelta categoria, quindi rimani sotto i 200 caratteri.)"
+    post_template: "%{replace_paragraph}\n\nUsa i seguenti paragrafi per una descrizione più estesa o per stabilire delle regole o linee guida per la categoria:\n\n- Perché la gente dovrebbe usare questa categoria? A che cosaserve? \n\n- In cosa esattamente questa categoria è diversa dalle altre categorie già esistenti? \n\n- Cosa dovrebbero contenere gli argomenti in questa categoria? \n\n- C'è bisogno di questa categoria? Possiamo fonderla con un'altra categoria o sottocategoria?\n"
     errors:
       not_found: "Categoria non trovata!"
       uncategorized_parent: "La categoria \"Nessuna\" non può avere una categoria superiore"
@@ -537,10 +544,10 @@ it:
       email_already_used_in_group: "L'indirizzo '%{email}' è stato già usato dal gruppo '%{group_name}'."
       email_already_used_in_category: "L'indirizzo '%{email}' è stato già usato dalla categoria '%{category_name}'."
       description_incomplete: "Il messaggio di descrizione della categoria deve avere almeno un paragrafo."
-      permission_conflict: "Qualsiasi gruppo cui sia permesso accedere ad una sottocategoria deve avere il permesso di accedere alla Categoria genitore. I seguenti gruppi hanno accesso a una delle sottocategorie ma non alla Categoria genitore: %{group_names}."
-      disallowed_topic_tags: "Questo Argomento ha Etichette non permesse in questa categoria: '%{tags}'"
+      permission_conflict: "Qualsiasi gruppo a cui è consentito l'accesso a una sottocategoria deve anche poter avere accesso alla categoria genitore. I seguenti gruppi hanno accesso a una delle sottocategorie ma non hanno accesso alla categoria genitore: %{group_names}."
+      disallowed_topic_tags: "In questo argomento sono presenti etichette non consentite in questa categoria: '%{tags}'"
     cannot_delete:
-      uncategorized: "Questa è una Categoria speciale. È utilizzata come area di parcheggio per gli Argomenti senza Categoria. Non può essere eliminata."
+      uncategorized: "Questa è una categoria speciale. È utilizzata come area di attesa per gli argomenti senza categoria. Non può essere eliminata."
       has_subcategories: "Non puoi cancellare questa categoria perché ha sotto-categorie."
       topic_exists:
         one: "Non puoi cancellare questa categoria perché ha %{count} argomento. L'argomento più vecchio è %{topic_link}."
@@ -569,20 +576,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: "Hai raggiunto il massimo numero di risposte che può creare un nuovo utente il suo primo giorno. Per favore attendi %{time_left} prima di riprovare."
-      first_day_topics_per_day: "Hai raggiunto il massimo numero di argomenti che può creare un nuovo utente il suo primo giorno. Per favore attendi %{time_left} prima di riprovare."
-      create_topic: "Stai creando argomenti troppo rapidamente. Attendi %{time_left} prima di riprovare."
-      create_post: "Stai rispondendo troppo rapidamente. Attendi %{time_left} prima di riprovare."
-      delete_post: "Stai cancellando i messaggi troppo velocemente. Per favore attendi %{time_left} prima di riprovare."
-      public_group_membership: "Stai entrando/uscendo dai gruppi troppo di frequente. Per favore aspetta %{time_left} prima di riprovare."
-      topics_per_day: "Hai raggiunto il massimo numero di nuovi argomenti. Per favore attendi %{time_left} prima di riprovare."
-      pms_per_day: "Hai raggiunto il massimo numero di messaggi. Per favore attendi %{time_left} prima di riprovare."
-      create_like: "Hai raggiunto il massimo numero di \"Mi piace\". Per favore attendi %{time_left} prima di riprovare."
-      create_bookmark: "Hai raggiunto il massimo numero di segnalibri. Per favore attendi %{time_left} prima di riprovare."
-      edit_post: "Hai raggiunto il massimo numero di modifiche. Per favore attendi %{time_left} prima di riprovare."
-      live_post_counts: "Stai richiedendo troppo velocemente il conteggio dei messaggi attivi. Per favore attendi %{time_left} prima di riprovare."
-      unsubscribe_via_email: "Hai raggiunto il massimo numero di cancellazioni via email. Per favore aspetta %{time_left} prima di riprovare."
-      topic_invitations_per_day: "Hai raggiunto il numero massimo di inviti ad argomenti. Per favore aspetta %{time_left} prima di riprovare."
+      first_day_replies_per_day: "Hai raggiunto il numero massimo di risposte che un nuovo utente può creare il suo primo giorno. Attendi %{time_left} prima di riprovare."
+      first_day_topics_per_day: "Hai raggiunto il numero massimo di argomenti che un nuovo utente può creare il suo primo giorno. Attendi %{time_left} prima di riprovare."
+      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 di frequente. Attendi %{time_left} prima di riprovare."
+      topics_per_day: "Hai raggiunto il numero massimo di nuovi argomenti. Attendi %{time_left} prima di riprovare."
+      pms_per_day: "Hai raggiunto il numero massimo di messaggi. Attendi %{time_left} prima di riprovare."
+      create_like: "Hai raggiunto il numero massimo di \"Mi piace\". Attendi %{time_left} prima di riprovare."
+      create_bookmark: "Hai raggiunto il numero massimo di segnalibri. Attendi %{time_left} prima di riprovare."
+      edit_post: "Hai raggiunto il numero massimo di modifiche. Attendi %{time_left} prima di riprovare."
+      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 cancellazioni via email. Attendi %{time_left} prima di riprovare."
+      topic_invitations_per_day: "Hai raggiunto il numero massimo di inviti ad argomenti. Attendi %{time_left} prima di riprovare."
     hours:
       one: "%{count} ora"
       other: "%{count} ore"
@@ -672,8 +679,8 @@ it:
     success: "La tua password è stata cambiata con successo e ora sei connesso."
     success_unapproved: "La tua password è stata cambiata con successo."
   email_login:
-    invalid_token: "Spiacenti, il collegamento per la connessione via email è scaduto. Seleziona il pulsante Connetti e clicca 'Ho dimenticato la password' per ricevere un nuovo collegamento."
-    title: "Connessione tramite Email"
+    invalid_token: "Spiacenti, il collegamento per l'accesso via email è scaduto. Seleziona il pulsante Connetti e clicca 'Ho dimenticato la password' per ricevere un nuovo collegamento."
+    title: "Accesso via Email"
   user_auth_tokens:
     browser:
       chrome: "Google Chrome"
@@ -690,10 +697,10 @@ it:
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
-      linux: "GNU/Linux Computer"
+      linux: "Computer GNU/Linux "
       mac: "Mac"
       mobile: "Dispositivo Mobile"
-      windows: "Windows Computer"
+      windows: "Computer Windows "
       unknown: "dispositivo sconosciuto"
     os:
       android: "Android"
@@ -747,20 +754,20 @@ it:
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: "Inappropriato"
-      description: 'Questo messaggio ha dei contenuti che una persona ragionevole considererebbe offensivi, aggressivi o una violazione delle<a href="%{base_path}/guidelines"> linee guida della comunità</a>.'
+      description: 'Questo messaggio ha dei contenuti che una persona ragionevole considererebbe offensivi, aggressivi o una violazione delle<a href="%{base_path}/guidelines">linee guida della comunità</a>.'
       short_description: 'Una violazione delle <a href="%{base_path}/guidelines">linee guida della nostra comunità</a>'
       long_form: "segnalato come inappropriato"
     notify_user:
       title: "Invia un messaggio a @{{username}}"
-      description: "Voglio parlare con questa persona direttamente a proposito del suo messaggio."
-      short_description: "Voglio parlare con questa persona direttamente a proposito del suo messaggio."
+      description: "Voglio parlare direttamente con questa persona a proposito del suo messaggio."
+      short_description: "Voglio parlare direttamente con questa persona a proposito del suo messaggio."
       long_form: "messaggio inviato"
       email_title: 'Il tuo messaggio su "%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Altro"
       description: "Questo messaggio richiede attenzione da parte dello staff per un altro motivo non elencato."
-      short_description: "Richiede l'attenzione dello staff per un'altra ragione"
+      short_description: "Richiede l'attenzione dello staff per un altro motivo"
       long_form: "segnalato all'attenzione dello staff"
       email_title: 'Un messaggio in "%{title}" richiede l''attenzione dello staff'
       email_body: "%{link}\n\n%{message}"
@@ -779,7 +786,7 @@ it:
       self: "Non hai ancora nessuna attività."
       others: "Nessuna attività."
     no_bookmarks:
-      self: "Non hai messaggi nei Segnalibri. I Segnalibri ti consentono di accedere velocemente a specifici messaggi."
+      self: "Non hai aggiunto messaggi nei segnalibri. I segnalibri ti consentono di accedere velocemente a specifici messaggi."
       others: "Nessun segnalibro."
     no_likes_given:
       self: "Non hai messo \"Mi piace\" ad alcun messaggio."
@@ -788,7 +795,7 @@ it:
       self: "Non hai risposto a nessun messaggio."
       others: "Nessuna risposta."
     no_drafts:
-      self: "Non hai bozze. Iniziando a scrivere una risposta a un qualsiasi Argomento, questa verrà automaticamente salvata come nuova Bozza."
+      self: "Non hai bozze; inizia a scrivere una risposta in qualsiasi argomento e verrà automaticamente salvata come nuova bozza"
   topic_flag_types:
     spam:
       title: "Spam"
@@ -797,14 +804,14 @@ it:
       short_description: "Questo è un annuncio pubblicitario"
     inappropriate:
       title: "Inappropriato"
-      description: 'Questo Argomento ha dei contenuti che una persona ragionevole considererebbe offensivi, aggressivi o una violazione delle<a href="%{base_path}/guidelines"> linee guida della comunità</a>.'
+      description: 'Questo argomento ha dei contenuti che una persona ragionevole considererebbe offensivi, aggressivi o una violazione delle<a href="%{base_path}/guidelines"> linee guida della comunità</a>.'
       long_form: "segnalato come inappropriato"
       short_description: 'Una violazione delle <a href="%{base_path}/guidelines">linee guida della nostra comunità</a>'
     notify_moderators:
       title: "Altro"
-      description: 'Questo argomento richiede attenzione da parte deilo staff in base alle <a href="%{base_path}/guidelines">linee guida</a>, ai<a href="%{tos_url}">termini di servizio</a>, o per altri motivi non elencati.'
+      description: 'Questo argomento richiede attenzione da parte deilo staff in base alle <a href="%{base_path}/guidelines">linee guida</a>, ai<a href="%{tos_url}">Termini di Servizio</a>, o per altri motivi non elencati.'
       long_form: "segnalato all'attenzione dei moderatori"
-      short_description: "Richiede l'attenzione dello staff per un'altra ragione"
+      short_description: "Richiede l'attenzione dello staff per un altro motivo"
       email_title: 'L''argomento "%{title}" richiede l''attenzione di un moderatore'
       email_body: "%{link}\n\n%{message}"
   flagging:
@@ -822,9 +829,9 @@ it:
         remove: "Questo argomento non è più uno striscione. Non apparirà più in cima ad ogni pagina."
   unsubscribed:
     title: "Preferenze email aggiornate!"
-    description: "Le preferenze email per <b>%{email}</b> sono state aggiornate. Per cambiare le tue impostazioni email <a href='%{url}'>accedi alle tue Preferenze Utente</a>."
+    description: "le preferenze email per <b>%{email}</b> sono state aggiornate. Per cambiare le tue impostazioni email <a href='%{url}'>accedi alle tue preferenze utente</a>."
     topic_description: "Per re-iscriverti a %{link}, usa il controllo notifiche in fondo o a destra dell'argomento."
-    private_topic_description: "Per reiscriverti, usa il controllo notifiche in fondo o alla destra dell'Argomento."
+    private_topic_description: "Per re-iscriverti, usa il controllo notifica in fondo o sulla destra dell'argomento."
   unsubscribe:
     title: "Annulla iscrizione"
     stop_watching_topic: "Smetti di osservare questo argomento, %{link}"
@@ -837,8 +844,8 @@ it:
     log_out: "Disconnetti"
     submit: "Salva preferenze"
     digest_frequency:
-      title: "Ricevi un sommario via email ogni %{frequency}"
-      select_title: "Imposta la frequenza delle email di sommario a:"
+      title: "Stai ricevendo email riepilogative ogni %{frequency}"
+      select_title: "Imposta la frequenza delle email riepilogative a:"
       never: "mai"
       every_30_minutes: "ogni 30 minuti"
       every_hour: "ogni ora"
@@ -852,8 +859,8 @@ it:
     read: "lettura"
     read_write: "lettura/scrittura"
     description: '"%{application_name}" richiede il seguente accesso al tuo account:'
-    instructions: 'Abbiamo appena generato una nuova chiave API utente da usare con "%{application_name}", per favore, incollala nella tua applicazione.'
-    otp_description: 'Vuoi consentire ad "%{application_name}" di accedere al sito?'
+    instructions: 'Abbiamo appena generato una nuova chiave API utente da usare con "%{application_name}", incolla la seguente chiave nella tua applicazione:'
+    otp_description: 'Vuoi consentire a "%{application_name}" l''accesso al sito?'
     otp_confirmation:
       confirm_title: "Procedi su %{site_name}."
       logging_in_as: "Accedi come %{username}"
@@ -867,13 +874,13 @@ it:
       session_info: "Leggi le info della sessione utente"
       read: "Leggi tutto"
       write: "Scrivi tutto"
-      one_time_password: "Crea un token usa e getta per collegarsi"
+      one_time_password: "Crea un token di accesso usa e getta"
     invalid_public_key: "Spiacente, la chiave pubblica non è valida."
-    invalid_auth_redirect: "Spiacenti, questo auth_redirect non è consentito."
+    invalid_auth_redirect: "Spiacenti, questo host auth_redirect non è consentito."
     invalid_token: "Token mancante, non valido o scaduto."
   flags:
     errors:
-      already_handled: "La segnalazione è già stata processata."
+      already_handled: "La segnalazione è già stata gestita."
   reports:
     default:
       labels:
@@ -888,16 +895,16 @@ it:
         editor: Redattore
         author: Autore
         edit_reason: Motivo
-      description: "Numero di modifiche a nuovi messaggi."
+      description: "Numero di nuove modifiche al messaggio."
     user_flagging_ratio:
-      title: "Rapporto Segnalazione Utenti"
+      title: "Rapporto Segnalazione Utente"
       labels:
         user: Utente
         agreed_flags: Segnalazioni accettate
-        disagreed_flags: Segnalazioni non accettate
+        disagreed_flags: Segnalazioni rifiutate
         ignored_flags: Segnalazioni ignorate
         score: Punteggio
-      description: "Lista degli Utenti ordinata per rapporto delle risposte alle loro segnalazioni (da Rifiutate ad Accettate)"
+      description: "Elenco degli utenti ordinato in base al rapporto tra le risposte dello staff alle loro segnalazioni (da rifiutate ad accettate)"
     moderators_activity:
       title: "Attività Moderatore"
       labels:
@@ -906,9 +913,9 @@ it:
         time_read: Tempo di lettura
         topic_count: Argomenti creati
         post_count: Messaggi creati
-        pm_count: Messaggi Privati creati
+        pm_count: MP creati
         revision_count: Revisioni
-      description: "Lista delle attività dei Moderatori, incluse segnalazioni, revisioni, tempo di lettura, Argomenti creati, Messaggi creati, Messaggi Personali creati."
+      description: "Elenco delle attività del moderatore, incluse segnalazioni revisionate, tempo di lettura, argomenti creati, messaggi creati, messaggi personali creati."
     flags_status:
       title: "Stato Segnalazioni"
       values:
@@ -922,32 +929,32 @@ it:
         poster: Autore
         flagger: Segnalante
         time_to_resolution: Tempo di risoluzione
-      description: "Lista stati delle Segnalazioni inclusi tipo di segnalazione, autore, segnalante e tempo di risoluzione."
+      description: "Elenco degli stati delle segnalazioni inclusi tipo di segnalazione, autore, segnalante e tempo di risoluzione."
     visits:
       title: "Visite Utente"
       xaxis: "Giorno"
       yaxis: "Numero di visite"
-      description: "Numero di visite di tutti gli utenti."
+      description: "Numero di tutte le visite degli utenti."
     signups:
       title: "Iscrizioni"
       xaxis: "Giorno"
       yaxis: "Numero di iscrizioni"
       description: "Nuovi account registrati durante questo periodo."
     new_contributors:
-      title: "Nuovi contributori"
+      title: "Nuovi Contributori"
       xaxis: "Giorno"
       yaxis: "Numero di nuovi contributori"
       description: "Numero di utenti che hanno inviato il loro primo messaggio durante questo periodo."
     trust_level_growth:
       yaxis: "Giorno"
     consolidated_page_views:
-      title: "Visualizzazioni pagine consolidato"
+      title: "Pagine Viste Consolidate"
       xaxis:
-        page_view_crawler: "Crawlers"
+        page_view_crawler: "Crawler"
         page_view_anon: "Utenti anonimi"
         page_view_logged_in: "Utenti connessi"
       yaxis: "Giorno"
-      description: "Visualizzazioni pagine da utenti connessi, utenti anonimi e crawlers."
+      description: "Visualizzazioni di pagina per utenti che hanno effettuato l'accesso, utenti anonimi e crawler."
       labels:
         post: Messaggio
         editor: Redattore
@@ -957,17 +964,17 @@ it:
       title: "DAU/MAU"
       xaxis: "Giorno"
       yaxis: "DAU/MAU"
-      description: "Numero di membri che si sono connessi nelle ultime 24 ore diviso per il numero di utenti che si sono connessi nell'ultimo mese - restituisce una percentuale che rappresenta la 'permanenza' della comunità. Mirate a >30%"
+      description: "Numero di utenti che hanno effettuato l'accesso nell'ultimo giorno diviso per il numero di utenti che hanno effettuato l'accesso nell'ultimo mese - restituisce una % che rappresenta 'l'attaccamento' alla comunità. Obiettivo > 30%."
     daily_engaged_users:
-      title: "Utenti Impegnati giornalieri"
+      title: "Utenti Impegnati Giornalmente"
       xaxis: "Giorno"
       yaxis: "Utenti Impegnati"
-      description: "Numero di utenti che hanno scritto o messo Mi piace nell'ultimo giorno"
+      description: "Numero di utenti che hanno messo \"Mi piace\" o pubblicato nell'ultimo giorno."
     profile_views:
       title: "Visite Profilo Utente"
       xaxis: "Giorno"
       yaxis: "Numero profili utente visualizzati"
-      description: "Totale nuove visualizzazioni dei Profili Utente"
+      description: "Totale nuove visualizzazioni dei profili utente."
     topics:
       title: "Argomenti"
       xaxis: "Giorno"
@@ -982,7 +989,7 @@ it:
       title: "Mi piace"
       xaxis: "Giorno"
       yaxis: "Numero di nuovi \"Mi piace\""
-      description: "Numero di nuovi Mi Piace"
+      description: "Numero di nuovi \"Mi piace\""
     flags:
       title: "Segnalazioni"
       xaxis: "Giorno"
@@ -992,14 +999,14 @@ it:
       title: "Segnalibri"
       xaxis: "Giorno"
       yaxis: "Numero di nuovi segnalibri"
-      description: "Numero di Argomenti e Messaggi nei Segnalibri"
+      description: "Numero di nuovi argomenti e messaggi aggiunti ai segnalibri."
     users_by_trust_level:
       title: "Utenti per Livello Esperienza"
       xaxis: "Livello Esperienza"
       yaxis: "Numero Utenti"
       labels:
         level: Livello
-      description: "Numero di Utenti raggruppati per Livello Esperienza."
+      description: "Numero di utenti raggruppati per livello di esperienza."
     users_by_type:
       title: "Utenti per Tipo"
       xaxis: "Tipo"
@@ -1011,9 +1018,9 @@ it:
         moderator: Moderatore
         suspended: Sospeso
         silenced: Silenziato
-      description: "Numero di utenti raggruppati tra Amministratori, Moderatori, Sospesi e Silenziati."
+      description: "Numero di utenti raggruppati per amministratore, moderatore, sospeso e silenziato."
     trending_search:
-      title: Termini più cercati
+      title: Termini di Ricerca di Tendenza
       labels:
         term: Termine
         searches: Ricerche
@@ -1028,46 +1035,46 @@ it:
       title: "Utente-Utente (escluse le risposte)"
       xaxis: "Giorno"
       yaxis: "Numero di messaggi"
-      description: "Numero di nuovi Messaggi Privati."
+      description: "Numero di messaggi personali avviati di recente."
     user_to_user_private_messages_with_replies:
       title: "Utente-Utente (incluse le risposte)"
       xaxis: "Giorno"
-      yaxis: "Numero di Messaggi"
-      description: "Numero totale di Messaggi Personali e relative risposte."
+      yaxis: "Numero di messaggi personali"
+      description: "Numero di tutti i nuovi messaggi e risposte personali."
     system_private_messages:
       title: "Sistema"
       xaxis: "Giorno"
       yaxis: "Numero di messaggi"
-      description: "Numero di Messaggi Personali inviati automaticamente dal sistema."
+      description: "Numero di messaggi personali inviati automaticamente da System."
     moderator_warning_private_messages:
       title: "Segnalazione Moderatore"
       xaxis: "Giorno"
       yaxis: "Numero di messaggi"
-      description: "Numero di richiami inviati via Messaggio Personali da Moderatori."
+      description: "Numero di avvisi inviati dai moderatori attraverso messaggi personali."
     notify_moderators_private_messages:
       title: "Notifica i Moderatori"
       xaxis: "Giorno"
       yaxis: "Numero di messaggi"
-      description: "Numero di notifiche ricevute privatamente dai Moderatori tramite Segnalazioni."
+      description: "Numero di volte in cui i moderatori sono stati notificati privatamente tramite segnalazioni."
     notify_user_private_messages:
       title: "Notifiche Utente"
       xaxis: "Giorno"
       yaxis: "Numero di messaggi"
-      description: "Numero di notifiche ricevute privatamente dagli Utenti tramite Segnalazioni."
+      description: "Numero di volte in cui gli utenti sono stati notificati privatamente tramite segnalazioni."
     top_referrers:
       title: "Migliori Referrer"
       xaxis: "Utente"
-      num_clicks: "Click"
+      num_clicks: "Clic"
       num_topics: "Argomenti"
       labels:
         user: "Utente"
         num_clicks: "Clic"
         num_topics: "Argomenti"
-      description: "Lista Utenti per numero di click su collegamenti da essi condivisi."
+      description: "Utenti elencati per numero di clic sui collegamenti che hanno condiviso."
     top_traffic_sources:
       title: "Migliori Sorgenti di Traffico"
       xaxis: "Dominio"
-      num_clicks: "Click"
+      num_clicks: "Clic"
       num_topics: "Argomenti"
       num_users: "Utenti"
       labels:
@@ -1080,37 +1087,37 @@ it:
       labels:
         num_clicks: "Clic"
         topic: "Argomento"
-      description: "Argomenti che hanno ricevuto il maggior numero di click da fonti esterne."
+      description: "Argomenti che hanno ricevuto il maggior numero di clic da fonti esterne."
     page_view_anon_reqs:
       title: "Anonimo"
       xaxis: "Giorno"
       yaxis: "Visualizzazioni pagina da visitatori Anonimi"
-      description: "Numero di nuove visualizzazioni pagina da utenti non connessi."
+      description: "Numero di nuove pagine viste da visitatori non connessi ad un account."
     page_view_logged_in_reqs:
       title: "Connesso"
       xaxis: "Giorno"
       yaxis: "Pagine viste da utenti connessi"
-      description: "Numero di nuove visualizzazioni pagina da utenti connessi."
+      description: "Numero di nuove pagine viste da utenti connessi."
     page_view_crawler_reqs:
-      title: "Visualizzazioni pagina da Spider web"
+      title: "Pagine Viste da Web Crawler"
       xaxis: "Giorno"
-      yaxis: "Visualizzazioni pagina da Spider web"
-      description: "Totale visualizzazioni pagina da web crawlers nel corso del tempo."
+      yaxis: "Pagine Viste da Web Crawler"
+      description: "Totale pagine viste da web crawler nel tempo."
     page_view_total_reqs:
       title: "Pagine viste"
       xaxis: "Giorno"
-      yaxis: "Visualizzazioni pagina totali"
-      description: "Numero di nuove visualizzazioni pagina da tutti i visitatori,"
+      yaxis: "Totale Pagine Viste"
+      description: "Numero di nuove pagine viste da tutti i visitatori."
     page_view_logged_in_mobile_reqs:
       title: "Pagine viste da utenti connessi"
       xaxis: "Giorno"
-      yaxis: "Pagine viste da utenti connessi su mobile"
-      description: "Numero di nuove visualizzazioni pagina da Utenti con dispositivi mobili e connessi ad un account."
+      yaxis: "Pagine Viste da Utenti Connessi su Mobile"
+      description: "Numero di nuove pagine viste da utenti su dispositivi mobile e connessi ad un account."
     page_view_anon_mobile_reqs:
       title: "Visualizzazioni pagina da visitatori anonimi"
       xaxis: "Giorno"
-      yaxis: "Visualizzazioni pagina da visitatori anonimi su dispositivi mobili"
-      description: "Numero di nuove visualizzazioni pagina da Utenti con dispositivi mobili e non connessi ad un account."
+      yaxis: "Pagine Viste da Visitatori Anonimi su Mobile"
+      description: "Numero di nuove pagine viste da utenti su dispositivi mobile e non connessi ad un account."
     http_background_reqs:
       title: "Background"
       xaxis: "Giorno"
@@ -1139,25 +1146,25 @@ it:
       title: "Tempo per la prima risposta"
       xaxis: "Giorno"
       yaxis: "Tempo medio (ore)"
-      description: "Tempo medio (in ore) della prima risposta a nuovi Argomenti."
+      description: "Tempo medio (in ore) della prima risposta a nuovi argomenti."
     topics_with_no_response:
       title: "Argomenti senza risposta"
       xaxis: "Giorno"
       yaxis: "Totali"
-      description: "Numero di nuovi Argomenti creati che non hanno ricevuto una risposta."
+      description: "Numero di nuovi argomenti creati che non hanno ricevuto una risposta."
     mobile_visits:
-      title: "Visite Utente (telefono)"
+      title: "Visite Utente (da mobile)"
       xaxis: "Giorno"
       yaxis: "Numero di visite"
-      description: "Numero di Utenti unici che hanno visitato il sito tramite dispositivi mobili."
+      description: "Numero di utenti unici che hanno visitato il sito con un dispositivo mobile."
     web_crawlers:
-      title: "Web Crawler User Agents"
+      title: "User Agents Web Crawler"
       labels:
         user_agent: "User Agent"
         page_views: "Pagine viste"
-      description: "Lista degli User Agents di Web Crawler, ordinati per pagine visualizzate."
+      description: "Elenco di user agents usati da web crawler, ordinati per pagine viste."
     suspicious_logins:
-      title: "Connessioni sospette"
+      title: "Accessi Sospetti"
       labels:
         user: Utente
         client_ip: IP client
@@ -1165,15 +1172,15 @@ it:
         browser: Browser
         device: Dispositivo
         os: Sistema Operativo
-        login_time: Ora di connessione
+        login_time: Ora di Accesso
       description: "Dettagli delle nuove connessioni sospettosamente diverse dalle precedenti."
     staff_logins:
-      title: "Connessioni degli Amministratori"
+      title: "Accessi Amministratore"
       labels:
         user: Utente
         location: Località
-        login_at: Connessione alle
-      description: "Lista degli orari di connessione degli Amministratori e relative posizioni."
+        login_at: Accesso alle
+      description: "Elenco degli orari di accesso dell'amministratore e relative posizioni."
     top_uploads:
       title: "Migliori Caricamenti"
       labels:
@@ -1181,18 +1188,17 @@ it:
         extension: Estensione
         author: Autore
         filesize: Dimensione file
-      description: "Elenca tutti i caricamenti per estensione, dimensioni ed autore."
+      description: "Elenco di tutti i caricamenti per estensione, dimensioni ed autore."
     top_ignored_users:
-      title: "Principali Utenti ignorati / silenziati"
+      title: "Principali Utenti Ignorati / Silenziati"
       labels:
-        ignored_user: Utenti ignorati
+        ignored_user: Utenti Ignorati
         ignores_count: Conteggio ignorati
         mutes_count: Conteggio silenziati
-      description: "Utenti che sono stati mutati / ignorati da svariati altri Utenti."
+      description: "Utenti che sono stati silenziati e/o ignorati da molti altri utenti."
   dashboard:
     rails_env_warning: "Il tuo server è in modalità %{env}."
     host_names_warning: "Il tuo file config/database.yml usa l'hostname di default: localhost. Aggiornalo con l'hostname del tuo sito."
-    gc_warning: 'Il tuo server usa i parametri di garbage collection di default di ruby, che potrebbero non garantirti le migliori prestazioni. Leggi questo argomento sulla taratura delle prestazioni: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq non è in esecuzione. Molte attività, come l''invio di email, sono eseguite in maniera asincrona da sidekiq. Assicurati che almeno un processo sidekiq sia in esecuzione. <a href="https://github.com/mperham/sidekiq" target="_blank">Leggi altro su sidekiq qui</a>.'
     queue_size_warning: "Il numero di job in coda è %{queue_size}, il che è alto. Ciò potrebbe indicare un problema con i processi Sidekiq, oppure devi aggiungere altri worker Sidekiq."
     memory_warning: "Il tuo server gira con meno di 1 GB di memoria. Si raccomanda almeno 1 GB di memoria."
@@ -1297,8 +1303,6 @@ it:
     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 i social login, 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, si eliminano tutti i vettori Cross Site Request Forgery nei browser supportati (Lax o Strict). Avviso: Strict lavorerà solo su siti che forzano l'accesso e utilizzano SSO."
     summary_score_threshold: "Il punteggio minimo richiesto affinché un messaggio sia incluso in 'Riassumi Questo Argomento'"
-    summary_posts_required: "Minimo numero di messaggi in un argomento affinché venga abilitato 'Riassumi Questo Argomento' "
-    summary_likes_required: "Minimo numero di \"Mi piace\" in un argomento affinché venga abilitato 'Riassumi Questo Argomento'"
     summary_percent_filter: "Quando un utente clicca su 'Riassumi Questo Argomento', mostra i primi % messaggi"
     summary_max_results: "Messaggi massimi restituiti da 'Riepiloga questo argomento'."
     enable_personal_messages: "Autorizza gli utenti con livello di esperienza 1 (configurabile attraverso \"min livello di esperienza per l'invio di messaggi\") a creare e rispondere ai messaggi. Nota che lo staff può inviare messaggi in ogni caso."
@@ -1430,7 +1434,6 @@ it:
     enable_github_logins: "Abilita l'autenticazione Github, richiede github_client_id e github_client_secret. Vedi <a href='https://meta.discourse.org/t/13745' target='_blank'>Configurare l'accesso a GitHub per Discourse</a> ."
     github_client_id: "Client id per l'autenticazione Github, registrato su <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     github_client_secret: "Client secret per l'autenticazione Github, registrato su <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
-    readonly_mode_during_backup: "Abilita la modalità sola lettura mentre è in esecuzione un backup"
     enable_backups: "Consenti agli amministratori di creare backup del forum"
     allow_restore: "Abilita il ripristino, che sostituisce TUTTI i dati del sito! Lascia a falso a meno che non hai intenzione di ripristinare un backup."
     maximum_backups: "Il numero massimo di backup da mantenere sul disco. I backup più vecchi vengono automaticamente cancellati."
@@ -1532,7 +1535,7 @@ it:
     min_trust_to_edit_wiki_post: "Livello minimo richiesto per modificare un argomento segnato come wiki."
     min_trust_to_edit_post: "Il livello di esperienza minimo richiesto per modificare i messaggi."
     min_trust_to_allow_self_wiki: "Il livello di esperienza minimo richiesto per consentire agli utenti di pubblicare una propria wiki."
-    min_trust_to_send_messages: "Il Livello Esperienza minimo richiesto per creare nuovi messaggi personali."
+    min_trust_to_send_messages: "Il livello di esperienza minimo richiesto per creare nuovi messaggi personali."
     min_trust_to_flag_posts: "Il Livello Esperienza minimo richiesto per segnalare messaggi"
     min_trust_to_post_links: "Il Livello Esperienza minimo richiesto per includere collegamenti nei messaggi"
     min_trust_to_post_images: "Il Livello Esperienza minimo richiesto per includere le immagini in un messaggio"
@@ -1547,7 +1550,7 @@ it:
     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."
     email_time_window_mins: "Aspetta (n) minuti prima di inviare email di notifica, per dare agli utenti la possibilità di modificare e completare i loro messaggi."
-    personal_email_time_window_seconds: "Attendi (n) secondi prima di inviare qualsiasi email di notifica della presenza di messaggi personali, per dare agli utenti la possibilità di modificare e finalizzare i loro messaggi."
+    personal_email_time_window_seconds: "Attendi (n) secondi prima di inviare qualsiasi email di notifica di messaggi personali, per dare agli utenti la possibilità di modificare e finalizzare i propri messaggi."
     email_posts_context: "Quante risposte precedenti inserire come contesto nelle email di notifica."
     flush_timings_secs: "Frequenza di svuotamento dei dati temporali verso il server, in secondi."
     title_max_word_length: "La lunghezza massima di una parola, in caratteri, nel titolo di un argomento."
@@ -1668,7 +1671,7 @@ it:
     digest_posts: "Numero massimo dei messaggi di successo da mostrare nell'email riepilogativa."
     digest_other_topics: "Il numero massimo di argomenti da mostrare nella sezione \"Nuovi argomenti e categorie che segui\" delle email di riepilogo."
     digest_min_excerpt_length: "Lunghezza minima dell'estratto del messaggio nell'email riepilogativa, in caratteri."
-    suppress_digest_email_after_days: "Sopprimi le email di riepilogo per gli utenti che non visitano il sito per più di (n) giorni."
+    suppress_digest_email_after_days: "Sopprimi le email riepilogative per gli utenti che non visitano il sito per più di (n) giorni."
     digest_suppress_categories: "Sopprimi queste categorie dalle email riepilogative."
     disable_digest_emails: "Disabilita le email riepilogative per tutti gli utenti."
     apply_custom_styles_to_digest: "I template email e i css sono applicati alle emails di riepilogo."
@@ -1688,8 +1691,8 @@ it:
     anonymous_account_duration_minutes: "Per proteggere l'anonimato creare un nuovo account anonimo ogni N minuti per ogni utente. Esempio: se impostato a 600, non appena passano 600 minuti dall'ultimo messaggio E l'utente passa in modalità anonima, viene creato un nuovo account anonimo."
     hide_user_profiles_from_public: "Disabilita schede utenti, profili utenti e directory utenti per gli utenti anonimi."
     show_inactive_accounts: "Consenti agli utenti registrati di consultare i profili degli account inattivi."
-    hide_suspension_reasons: "Non visualizzare pubblicamente le ragioni della sospensione sui profili utente."
-    log_personal_messages_views: "Registra le visualizzazioni dei messaggi personali da Admin per altri utenti / gruppi."
+    hide_suspension_reasons: "Non visualizzare pubblicamente i motivi della sospensione sui profili utente."
+    log_personal_messages_views: "Registra le visualizzazioni fatte da Amministratore dei messaggi personali di altri utenti/gruppi ."
     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 Esperienza 0 e senza messaggi= venga rimosso. Per disabilitare la pulizia, imposta a 0."
@@ -1730,7 +1733,7 @@ it:
     allowed_href_schemes: "Schemi consentiti nei collegamenti in aggiunta a http e https."
     embed_post_limit: "Numero massimo di messaggi da incorporare."
     embed_username_required: "E' richiesto il nome utente per la creazione di argomenti."
-    notify_about_flags_after: "Se ci sono segnalazioni che non sono state gestite dopo un certo numero di ore, invia un messaggio personale ai moderatori. Impostare su 0 per disabilitare."
+    notify_about_flags_after: "Se ci sono segnalazioni che non sono state gestite dopo tale numero di ore, invia un messaggio personale ai moderatori. Impostare su 0 per disabilitare."
     show_create_topics_notice: "Se il sito ha meno di 5 argomenti pubblici, mostra un avviso chiedendo agli amministratori di creare qualche argomento."
     delete_drafts_older_than_n_days: "Elimina bozze più vecchie di (n) giorni."
     bootstrap_mode_min_users: "Numero minimo di utenti richiesto per disabilitare la modalità bootstrap (imposta a 0 per disattivare)"
@@ -1797,10 +1800,10 @@ it:
     tags_sort_alphabetically: "Mostra le etichette in ordine alfabetico. Per default vengono mostrate in ordine di popolarità."
     tags_listed_by_group: "Elenca le Etichette per gruppo di Etichette nella <a href='%{base_path}/tags' target='_blank'>pagina delle Etichette</a> ."
     tag_style: "Stile grafico dei distintivi relativi alle etichette."
-    allow_staff_to_tag_pms: "Consenti ai membri dello staff di etichettare qualsiasi Messaggio Personale"
+    allow_staff_to_tag_pms: "Consenti ai membri dello staff di etichettare qualsiasi messaggio personale"
     min_trust_level_to_tag_topics: "Livello di esperienza minimo richiesto per etichettare argomenti"
     suppress_overlapping_tags_in_list: "Se le etichette corrispondono alle esatte parole nei titoli degli argomenti, non mostrare l'etichetta"
-    remove_muted_tags_from_latest: "Non mostrare argomenti etichettati solo con Etichette disattivate nell'elenco degli argomenti più recenti."
+    remove_muted_tags_from_latest: "Non mostrare argomenti etichettati solo con etichette silenziate nell'elenco degli argomenti più recenti."
     force_lowercase_tags: "Forza tutte le nuove Etichette interamente in minuscolo."
     company_name: "Nome azienda"
     governing_law: "Diritto applicabile"
@@ -1839,8 +1842,8 @@ it:
       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 ."
       sso_url_is_empty: "È necessario impostare un 'SSO url' prima di abilitare questa impostazione."
-      sso_invite_only: "Non è possibile abilitare SSO e l'accesso a solo invito allo stesso tempo."
-      enable_local_logins_disabled: "È necessario prima abilitare'abilita login locali' prima di abilitare questa impostazione."
+      sso_invite_only: "Non è possibile abilitare SSO e 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 se superiore al nome utente più breve (%{username})."
       min_username_length_range: "Non puoi impostare il minimo più grande del massimo."
       max_username_length_exists: "Non è possibile impostare la lunghezza massima del nome utente se inferiore al nome utente più lungo (%{username})."
@@ -1905,6 +1908,10 @@ it:
       other: "%{count} messaggi sono stati uniti ad un messaggio esitente: %{topic_link}"
   change_owner:
     post_revision_text: "Proprietà trasferita"
+  publish_page:
+    slug_errors:
+      blank: "non può essere vuoto"
+      invalid: "contiene caratteri non validi"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Questo messaggio è stato chiuso automaticamente per aver raggiunto il limite massimo di %{count} risposta."
@@ -2784,7 +2791,6 @@ it:
       why: "Un breve sommario di %{site_link} dalla tua ultima visita il %{last_seen_at}"
       since_last_visit: "Dalla tua ultima visita"
       new_topics: "Nuovi Argomenti"
-      unread_messages: "Messaggi Non Letti"
       unread_notifications: "Notifiche Non Lette"
       liked_received: "Like ricevuti"
       new_users: "Nuovi utenti"
@@ -2823,7 +2829,7 @@ it:
         Clicca sul seguente collegamento per scegliere una password:
         %{base_url}/u/password-reset/%{email_token}
     admin_login:
-      title: "Login Amministratore"
+      title: "Accesso Amministratore"
       subject_template: "[%{email_prefix}] Login"
     account_created:
       title: "Account Creato"
@@ -3171,12 +3177,12 @@ it:
       name: Base
       description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Può utilizzare</a> a tutte le funzioni essenziali della comunità"
       long_description: |
-        Questo distintivo è assegnato quando si raggiunge il livello di esperienza 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 dubbi, la creazione di messaggi Wiki e la possibilità di inviare immagini multiple e collegamenti.
+        Questo distintivo è assegnato quando si raggiunge il livello di esperienza 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 più \"mi piace\""
       long_description: |
-        Questo distintivo è assegnato quando si raggiunge il livello di esperienza 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, a mettere un numero maggiore di "Mi piace" al giorno.
+        Questo distintivo è assegnato quando si raggiunge il livello di esperienza 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
       description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Può utilizzare</a> ricategorizza, rinomina, collegamenti seguiti, wiki e ulteriori \"mi piace\""
@@ -3256,7 +3262,7 @@ it:
       name: Prima Segnalazione
       description: Segnalato un messaggio
       long_description: |
-        Questo Distintivo è assegnato la prima volta che segnali un messaggio. Segnalare è il modo in cui tutti contribuiamo a mantenere questo posto piacevole per tutti. Se noti dei messaggi che richiedono l'attenzione di un moderatore per qualsiasi motivo, non esitare a segnalare. Se vedi un problema, :flag_black: segnalalo!
+        Questo Distintivo è assegnato la prima volta che segnali un messaggio. Segnalare è il modo in cui tutti noi contribuiamo a mantenere questo posto piacevole per tutti. Se noti dei messaggi che richiedono l'attenzione di un moderatore per qualsiasi motivo, non esitare a segnalare. Se vedi un problema, :flag_black: segnalalo!
     promoter:
       name: Promotore
       description: Ha invitato un utente
@@ -3299,17 +3305,17 @@ it:
         Questo distintivo è assegnato la prima volta che leggi un argomento lungo con più di 100 risposte. Leggere una conversazione attentamente ti aiuta a seguire la discussione, a comprendere punti di vista diversi, e conduce a conversazioni ancora più interessanti. Quanto più si legge, tanto è migliore la conversazione. Come ci piace dire, la Lettura è Fondamentale! :slight_smile:
     popular_link:
       name: Collegamento Di Successo
-      description: Ha pubblicato un collegamento esterno con 50 click
+      description: Ha pubblicato un collegamento esterno con 50 clic
       long_description: |
         Questo distintivo è assegnato quando un collegamento che hai condiviso riceve 50 clic. Grazie per aver pubblicato un collegamento utile che ha aggiunto un contesto interessante alla conversazione!
     hot_link:
       name: Collegamento Caldo
-      description: Ha pubblicato un collegamento esterno con 300 click
+      description: Ha pubblicato un collegamento esterno con 300 clic
       long_description: |
         Questo distintivo è assegnato quando un collegamento che hai condiviso riceve 300 click. Grazie per aver pubblicato un collegamento affascinante che ha portato avanti la conversazione e ha illuminato la discussione!
     famous_link:
       name: Collegamento Famoso
-      description: Ha pubblicato un collegamento esterno con 1000 click
+      description: Ha pubblicato un collegamento esterno con 1000 clic
       long_description: |
         Questo distintivo è assegnato quando un collegamento condiviso riceve 1000 clic. Wow! Hai inserito un collegamento che ha migliorato significativamente la conversazione aggiungendo dettagli, contesto e informazioni essenziali. Ottimo lavoro!
     appreciated:
@@ -3501,7 +3507,7 @@ it:
             description: "Pagina web di contatto generale per te o per la tua organizzazione. Sarà visualizzato sulla tua pagina <a href='%{base_path}/about' target='_blank'>informazioni</a>."
           site_contact:
             label: "Messaggi Automatici"
-            description: "Tutti i messaggi personali automatici di Discourse saranno inviati da questo utente, quali avvisi di segnalazione e avvisi di completamento di backup."
+            description: "Tutti i messaggi personali automatici di Discourse saranno inviati da questo utente, come avvisi per le segnalazione e avvisi di completamento backup."
       corporate:
         title: "Società"
         description: "Queste informazioni saranno inserite nei tuoi <a href='%{base_path}/tos' target='blank'>Termini di Servizio</a>, che sono un Argomento aggiornabile nella Categoria Staff. Se non hai un'azienda, puoi anche saltare questo passo, per ora."
@@ -3592,6 +3598,8 @@ it:
     user_merged: "%{username} è stato unito a questo account"
     user_delete_self: "Cancellato autonomamente da %{url}"
     webhook_deactivation_reason: "Il tuo webhook è stato automaticamente disattivato. Abbiamo ricevuto vari errori HTTP '%{status}'."
+    api_key:
+      revoked: Revocata
   reviewables:
     priorities:
       low: "Bassa"
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 8224b63b54..112ab3ed77 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -55,7 +55,6 @@ ja:
       no_multilevels_components: "子テーマ自身を子テーマのテーマにはできません"
     settings_errors:
       invalid_yaml: "入力されたYAMLは不正です"
-      data_type_not_a_number: "%{name}型の設定はサポートされていません。サポートされている型は `integer`、`bool`、`list`、`enum`です。"
       name_too_long: "長すぎる名前の設定があります。長さの最大値は255です。"
       default_value_missing: "設定%{name}はデフォルト値を持っていません"
       default_not_match_type: "設定%{name}のデフォルト値の型が、設定の型と合致しません"
@@ -217,6 +216,12 @@ ja:
     tag: "タグされたトピック"
   too_late_to_edit: "この投稿の編集・削除期間が過ぎました。編集・削除が出来ません。"
   excerpt_image: "画像"
+  bookmarks:
+    reminders:
+      later_today: "今日中"
+      tomorrow: "明日"
+      next_week: "来週"
+      next_month: "来月"
   groups:
     errors:
       invalid_incoming_email: "%{email}のメール認証に失敗しました\U0001F62D"
@@ -796,8 +801,6 @@ ja:
     notification_email: "システムからの重要なメール送信に使用する from: メールアドレス。メールが届くように、ここに指定されたドメインはSPF、DKIM、逆引きPTRレコードが正しく設定されている必要があります。"
     email_custom_headers: "カスタムメールヘッダのリスト (パイプ(バーティカルバー) 区切り)"
     summary_score_threshold: "'トピックサマリー'に投稿が含まれるために必要な最低スコア"
-    summary_posts_required: "'トピックサマリー'が有効になるために必要な最小投稿数"
-    summary_likes_required: "'トピックサマリー'が有効になるために必要な最小「いいね!」数"
     summary_percent_filter: "ユーザが'トピックサマリー'をクリックしたとき, 上位何パーセントのポストを表示するか"
     enable_long_polling: "通知用のメッセージバスによるロングポーリングの利用を許可する"
     long_polling_base_url: "ロングポーリングのベースURL(CDNが動的コンテンツを配信している場合、これをoriginに指定してください) eg: http://origin.site.com"
@@ -1030,6 +1033,10 @@ ja:
   move_posts:
     existing_topic_moderator_post:
       other: "%{count}つのポストが存在するトピックに統合されました：%{topic_link}"
+  publish_page:
+    slug_errors:
+      blank: "を入力してください"
+      invalid: "は不正な文字を含んでいます"
   topic_statuses:
     autoclosed_message_max_posts:
       other: "このメッセージは%{count}つの返信に達した時に自動的に閉じます。"
@@ -1254,7 +1261,6 @@ ja:
       why: "あなたが最後にアクセスした %{last_seen_at} 以降の %{site_link} のまとめです"
       since_last_visit: "最後の訪問"
       new_topics: "新しいトピック"
-      unread_messages: "未読メッセージ"
       unread_notifications: "未読通知"
       liked_received: "いいねを受領"
       new_users: "新しいユーザー"
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index e7eeba1664..6ecc3a7415 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -220,6 +220,12 @@ ko:
   too_late_to_edit: "이 글은 작성된 지 너무 오랜 기간이 지났습니다. 수정 또는 삭제할 수 없습니다."
   revert_version_same: "복구하려는 버전과 현재 버전이 똑같습니다."
   excerpt_image: "이미지"
+  bookmarks:
+    reminders:
+      later_today: "오늘 늦게"
+      tomorrow: "내일"
+      next_week: "다음 주"
+      next_month: "다음 달"
   groups:
     errors:
       can_not_modify_automatic: "자동 설정 그룹은 수정할 수 없습니다."
@@ -943,8 +949,6 @@ ko:
     force_https: "사이트가 HTTPS를 사용하도록 강제합니다. 경고: HTTPS가 완벽히 적용되어 있는 것을 확인하기 전까지는 이 옵션을 켜지마세요. CDN, 소셜 로그인, 외부 링크로 가져오는 자료, 로고들이 HTTPS호환성이 있는지 확인하셨나요?"
     same_site_cookies: "동일 사이트 쿠키를 사용합니다. 지원되는 브라우저에서 사이트 간 요청 위조의 가능성이 있는 모든 매개체를 (관대 또는 엄격하게) 제거합니다. 경고: 엄격한 통제는 로그인을 강제하거나 SSO를 사용하는 경우에만 적용됩니다."
     summary_score_threshold: "요약본에 포함되기 위한 글의 최소 점수 값"
-    summary_posts_required: "하나의 글타래에 대하여 요약본 보기 모드가 활성화되기 전까지 요구되는 최소 글 수"
-    summary_likes_required: "하나의 글타래에 대하여 요약본 보기 모드가 활성화되기 전까지 요구되는 최소 좋아요 수"
     summary_percent_filter: "요약본 보기를 클릭시, 글 중에 몇 %의 상위 글을 보여줄 것인가?"
     enable_personal_messages: "신뢰도 1 사용자(메시지 전송을 위한 최소 신뢰도로 설정가능)가 메시지를 작성하고 답장을 쓸 수 있도록 허용합니다. 운영진은 언제나 메시지를 보낼 수 있음을 참고하세요."
     enable_long_polling: "Message bus used for notification can use long polling"
@@ -1016,7 +1020,6 @@ ko:
     enable_instagram_logins: "인스타그램 인증 켜기, instagram_consumer_key 와 instagram_consumer_secret 필요"
     instagram_consumer_key: "인스타그램 인증을 위한 Consumer key "
     instagram_consumer_secret: "인스타그램 인증을 위한 Consumer secret"
-    readonly_mode_during_backup: "백업 받을 때, 읽기 전용 모드 켜기"
     allow_restore: "데이터 복원을 허용합니다. 이 사이트의 모든 데이터가 변경될 수 있다. 백업이나 복원 계획이 없다면 비활성화로 놔둡니다."
     maximum_backups: "디스크에 유지할 최대 백업 개수. 오래된 백업순으로 자동으로 삭제된다."
     automatic_backups_enabled: "설정된 백업 주기로 자동 백업 실행"
@@ -1276,6 +1279,10 @@ ko:
   redirected_to_top_reasons:
     new_user: "우리 커뮤니티에 오신 것을 환영합니다! 다음은 우리 사이트에서 가장 인기 많은 최근 글타래들입니다."
     not_seen_in_a_month: "잘 돌아오셨습니다. 다음은 당신이 오지 않은 동안 가장 인기있던 글타래들입니다."
+  publish_page:
+    slug_errors:
+      blank: "비어있으면 안됨"
+      invalid: "사용할 수 없는 문자를 포함하고 있습니다."
   topic_statuses:
     autoclosed_enabled_days:
       other: "이 글타래는 %{count}일 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다."
@@ -1548,7 +1555,6 @@ ko:
       why: "%{last_seen_at}부터 지금까지 %{site_link} 사이트 근황"
       since_last_visit: "마지막 방문 후 경과시간"
       new_topics: "새로운 토픽"
-      unread_messages: "읽지않은 메시지"
       unread_notifications: "읽지않은 알림"
       liked_received: "받은 좋아요 수"
       new_users: "새로운 사용자"
diff --git a/config/locales/server.lt.yml b/config/locales/server.lt.yml
index db7b5fb122..71ef7bd658 100644
--- a/config/locales/server.lt.yml
+++ b/config/locales/server.lt.yml
@@ -150,6 +150,12 @@ lt:
     badge: "%{display_name} ženklelis puslapyje %{site_title}"
   too_late_to_edit: "Šis pranešimas buvo sukurtas jau labai senai, todėl jo negalima redaguoti ar ištrinti."
   excerpt_image: "paveikslėlis"
+  bookmarks:
+    reminders:
+      later_today: "Šiandien vėliau"
+      tomorrow: "Rytoj"
+      next_week: "Kitą savaitę"
+      next_month: "Kitą mėnesį"
   groups:
     default_names:
       everyone: "visi"
@@ -630,6 +636,10 @@ lt:
       category: "Kategorijos"
       topic: "Rezultatai"
       user: "Vartotojai"
+  publish_page:
+    slug_errors:
+      blank: "negali būti tuščia"
+      invalid: "turi neleistinų simbolių"
   login:
     admin_not_allowed_from_ip_address: "Tu negali prisijungti kaip administratorius iš šio IP adreso."
     errors: "%{errors}"
diff --git a/config/locales/server.lv.yml b/config/locales/server.lv.yml
index de33961894..9b9557c575 100644
--- a/config/locales/server.lv.yml
+++ b/config/locales/server.lv.yml
@@ -57,6 +57,12 @@ lv:
   read_full_topic: "Lasīt pilnu tēmu"
   rss_description:
     latest: "Jaunākās tēmas"
+  bookmarks:
+    reminders:
+      later_today: "Vēlāk šodien"
+      tomorrow: "Rītdien"
+      next_week: "Nākamā nedēļā"
+      next_month: "Nākamā mēnesī"
   groups:
     default_names:
       everyone: "ikviens"
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index 319c0c687a..0836613828 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -46,7 +46,6 @@ nb_NO:
       no_multilevels_components: "Drakter som inneholder underdrakter kan ikke selv være en underdrakt"
     settings_errors:
       invalid_yaml: "YAML koden er ikke gyldig."
-      data_type_not_a_number: "Innstilling `%{name}` typen er ikke støttet. Støttede typer er `integer`, `bool`, `list` og `enum`"
       name_too_long: "En eller flere innstillinger har for langt navn. Maksimal lengde er 255 tegn"
       default_value_missing: "Innstilling `%{name}` har ingen standardverdi"
       default_not_match_type: "Innstilling `%{name}` har en type standardverdi som ikke stemmer med den definerte typen for innstillingen."
@@ -257,6 +256,14 @@ nb_NO:
   too_late_to_edit: "Det er for lenge siden det innlegget ble skrevet. Det kan ikke lenger redigeres eller slettes."
   revert_version_same: "Den gjeldende versjonen er den samme som den du prøver å rulle tilbake til."
   excerpt_image: "bilde"
+  bookmarks:
+    reminders:
+      at_desktop: "Neste gang jeg er på datamaskinen min"
+      later_today: "Senere i dag"
+      tomorrow: "I morgen"
+      next_week: "Neste uke"
+      next_month: "Neste måned"
+      custom: "Egendefinert dato og tid"
   groups:
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' er ikke et gyldig tillitsnivå."
@@ -1028,8 +1035,6 @@ nb_NO:
     force_https: "Tving dette nettstedet til å bare tillate HTTPS. ADVARSEL: Du må IKKE aktivere dette valget før du har verifisert at HTTPS er riktig satt opp og fungerer absolutt alle steder! Har du sjekket CDN, alle sosiale loginmetoder og eventuelle eksterne ressurser for å sikre at de også er kompatible med HTTPS?"
     same_site_cookies: "Bruk Same-Site cookies/kapsler, de eliminerer alle former for Cross Site Request Forgery på nettlesere som støtter dem (Lax eller Strict). Avarsel: Strict vil kun fungere på nettsteder som tvinger innlogging og bruker SSO."
     summary_score_threshold: "Minste score for at et innlegg skal inkluderes i 'Sammendrag for Emnet'"
-    summary_posts_required: "Minste antall innlegg før 'Sammendrag for Emnet' aktiveres"
-    summary_likes_required: "Minste antall 'likes' i et emne før 'Sammendrag for Emnet' aktiveres"
     summary_percent_filter: "Når en bruker klikker 'Summér Dette Emnet', vis topp % av innlegg"
     num_users_to_silence_new_user: "Hvis en ny brukers innlegg flagges som spam num_spam_flags_to_silence_new_user ganger av dette antallet brukere, skjul den nye brukerens innlegg og stans fremtidige innlegg. 0 for å deaktivere."
     num_tl3_flags_to_silence_new_user: "Hvis en ny brukers innlegg flagges av num_tl3_users_to_silence_new_user forskjellige brukere med tillitsnivå 3, skjul alle den nye brukerens innlegg og stans fremtidige innlegg. 0 for å deaktivere."
@@ -1107,6 +1112,10 @@ nb_NO:
   redirected_to_top_reasons:
     new_user: "Velkommen til felleskapet vårt! Dette er de mest populære emnene for tiden. "
     not_seen_in_a_month: "Velkommen tilbake! Vi har ikke sett deg på en stund. Dette er de mest populære emnene siden du var her sist."
+  publish_page:
+    slug_errors:
+      blank: "kan ikke være tom"
+      invalid: "inneholder ugyldige tegn"
   topic_statuses:
     autoclosed_enabled_days:
       one: "Denne tråden ble automatisk lukket etter %{count} dag. Nye svar er ikke lenger tillatt. "
@@ -1218,7 +1227,6 @@ nb_NO:
       why: "Dette har skjedd på %{site_link} siden ditt forrige besøk %{last_seen_at}"
       since_last_visit: "Siden siste besøk"
       new_topics: "Nye emner"
-      unread_messages: "Uleste meldinger"
       unread_notifications: "Uleste varslinger."
       liked_received: "Likes mottatt"
       new_users: "Nye brukere"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index a0199c90ca..5c1e679e52 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -47,6 +47,7 @@ nl:
       generic: Er is een fout opgetreden bij het importeren van dat thema
       about_json: "Fout bij importeren: about.json bestaat niet, of is ongeldig"
       about_json_values: "about.json bevat ongeldige waarden: %{errors}"
+      modifier_values: "about.json-modificatoren bevatten ongeldige waarden: %{errors}"
       git: "Fout bij klonen van git-repository; toegang is geweigerd of repository is niet gevonden"
       unpack_failed: "Uitpakken van bestand mislukt"
       file_too_big: "Het niet-gecomprimeerde bestand is te groot."
@@ -59,7 +60,7 @@ nl:
       optimized_link: Geoptimaliseerde afbeeldingskoppelingen zijn kortstondig en dienen niet in broncode van thema's te worden opgenomen.
     settings_errors:
       invalid_yaml: "Opgegeven YAML is ongeldig."
-      data_type_not_a_number: "Type van instelling `%{name}` wordt niet ondersteund. Ondersteunde typen zijn `integer`, `bool`, `list` en `enum`."
+      data_type_not_a_number: "Type van instelling `%{name}` wordt niet ondersteund. Ondersteunde typen zijn `integer`, `bool`, `list`, `enum` en `upload`."
       name_too_long: "Er is een instelling met een te lange naam. Maximale lengte is 255."
       default_value_missing: "Instelling `%{name}` heeft geen standaardwaarde."
       default_not_match_type: "Type van standaardwaarde van instelling `%{name}` komt niet overeen met het type van de instelling."
@@ -329,6 +330,8 @@ nl:
   bookmarks:
     errors:
       already_bookmarked_post: "U kunt geen twee bladwijzers voor hetzelfde bericht maken."
+      cannot_set_past_reminder: "U kunt geen bladwijzerherinnering in het verleden instellen."
+      cannot_set_reminder_in_distant_future: "U kunt geen bladwijzerherinnering later dan over 10 jaar instellen."
       time_must_be_provided: "tijd moet voor alle herinneringen behalve '%{reminder_type}' worden opgegeven"
     reminders:
       at_desktop: "De volgende keer vanaf mijn computer"
@@ -367,7 +370,6 @@ nl:
       trust_level_4: "vertrouwensniveau_4"
     request_membership_pm:
       title: "Lidmaatschapsaanvraag voor @%{group_name}"
-      handle: "lidmaatschapsaanvraag behandelen"
     view_hidden_topic_request_reason: "Ik wil toetreden tot de groep '%{group_name}', zodat ik toegang heb tot [dit topic](%{topic_url})"
   education:
     until_posts:
@@ -477,6 +479,10 @@ nl:
               same_as_password: "is hetzelfde als uw wachtwoord."
             ip_address:
               signup_not_allowed: "Registratie vanaf deze account is niet toegestaan."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Dit topic kan niet op uw profiel worden aanbevolen."
         user_email:
           attributes:
             user_id:
@@ -1266,7 +1272,6 @@ nl:
   dashboard:
     rails_env_warning: "Uw server werkt in de modus voor %{env}."
     host_names_warning: "Uw bestand config/database.yml gebruikt de standaardhostnaam localhost. Werk deze bij naar de hostnaam van uw website."
-    gc_warning: 'Uw server gebruikt standaardparameters voor Ruby-garbagecollection, waardoor niet de beste prestaties worden verkregen. Lees dit topic over prestatieverbetering: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq is niet actief. Veel taken, zoals het verzenden van e-mail, worden door Sidekiq asynchroon uitgevoerd. Zorg ervoor dat er minstens één Sidekiq-proces actief is. <a href="https://github.com/mperham/sidekiq" target="_blank">Lees hier meer over Sidekiq</a>.'
     queue_size_warning: "Het aantal taken in de wachtrij is %{queue_size}, wat hoog is. Dit zou op een probleem met Sidekiq-processen kunnen duiden, of mogelijk dient u meer Sidekiq-workers toe te voegen."
     memory_warning: "Uw server werkt met minder dan 1 GB aan totaal geheugen. Minstens 1 GB geheugen wordt aanbevolen."
@@ -1377,8 +1382,8 @@ nl:
     force_https: "Gebruik van alleen HTTPS voor uw website afdwingen. WAARSCHUWING: schakel dit NIET in voordat u hebt geverifieerd dat HTTPS volledig is ingesteld en echt overal werkt! Hebt u ook uw CDN, alle sociale aanmeldingen en eventuele externe logo's / afhankelijkheden gecontroleerd om zeker te weten dat ze ook allemaal met HTTPS compatibel zijn?"
     same_site_cookies: "Cookies van dezelfde website gebruiken; deze vermijden alle aanvallen voor Cross Site Request Forgery in ondersteunde browsers (Lax of Strict). Waarschuwing: Strict werkt alleen op websites die aanmelding afdwingen en SSO gebruiken."
     summary_score_threshold: "De minimaal vereiste score voor een bericht om in 'Dit topic samenvatten' te worden opgenomen"
-    summary_posts_required: "Minimale aantal berichten in een topic voordat 'Dit topic samenvatten' wordt ingeschakeld"
-    summary_likes_required: "Minimale aantal likes in een topic voordat 'Dit topic samenvatten' wordt ingeschakeld"
+    summary_posts_required: "Het minimale aantal berichten in een topic voordat 'Dit topic samenvatten' wordt ingeschakeld. Wijzigingen in deze instelling worden binnen een week met terugwerkende kracht toegepast."
+    summary_likes_required: "Het minimale aantal likes in een topic voordat 'Dit topic samenvatten' wordt ingeschakeld. Wijzigingen in deze instelling worden binnen een week met terugwerkende kracht toegepast."
     summary_percent_filter: "Wanneer een gebruiker op 'Dit topic samenvatten' klikt, de top % van berichten tonen"
     summary_max_results: "Maximale aantal weergegeven berichten door 'Dit topic samenvatten'"
     enable_personal_messages: "Gebruikers met vertrouwensniveau 1 (instelbaar via het minimale niveau om berichten te verzenden) toestaan om berichten aan te maken en op berichten te antwoorden. Houd er rekening mee dat stafleden altijd berichten kunnen verzenden."
@@ -1410,7 +1415,8 @@ nl:
     markdown_typographer_quotation_marks: "Lijst van vervangingsparen voor dubbele en enkele aanhalingstekens"
     post_undo_action_window_mins: "Het aantal minuten dat gebruikers recente acties op een bericht ongedaan mogen maken (liken, markeren, etc)."
     must_approve_users: "Stafleden moeten alle nieuwe gebruikersaccounts goedkeuren voordat ze de website mogen bezoeken."
-    approve_suspect_users: "Stafleden moeten alle verdachte accounts goedkeuren"
+    invite_code: "Gebruiker moet deze code intypen voor accountregistratie, genegeerd wanneer leeg (niet hoofdlettergevoelig)"
+    approve_suspect_users: "Verdachte gebruikers toevoegen aan de wachtrij voor beoordeling. Verdachte gebruikers hebben een bio/website ingevoerd, maar hebben geen leesactiviteit."
     pending_users_reminder_delay: "Moderators inlichten als nieuwe gebruikers langer dan dit aantal uren op goedkeuring wachten. Stel dit in op -1 om meldingen uit te schakelen."
     maximum_session_age: "Gebruikers blijven (n) uur na hun laatste bezoek aangemeld"
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js)-trackingcode-ID, bv. UA-12345678-9; zie <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -1459,6 +1465,8 @@ nl:
     allow_index_in_robots_txt: "Geef in robots.txt op dat deze website door webzoekmachines mag worden geïndexeerd. In uitzonderlijke gevallen kunt u <a href='%{base_path}/admin/customize/robots'>robots.txt</a> blijvend negeren."
     email_domains_blacklist: "Een door een verticaal streepje (pipe) gescheiden lijst van e-maildomeinen waarmee gebruikers geen accounts mogen registreren. Voorbeeld: mailinator.com|trashmail.net"
     email_domains_whitelist: "Een door een verticaal streepje (pipe) gescheiden lijst van e-maildomeinen waarmee gebruikers accounts MOETEN registreren. WAARSCHUWING: gebruikers met andere dan de vermelde e-maildomeinen worden niet toegestaan!"
+    enforce_canonical_emails: "E-mailadres naar canonieke vorm ombouwen voordat gebruikers worden aangemaakt, omwille van uniciteit. De instelling heeft alleen effect bij nieuwe accountregistraties. Wanneer ingesteld, kan user+1@domain.com zich niet kunnen registreren als user+2@domain.com al is geregistreerd."
+    auto_approve_email_domains: "Gebruikers met e-mailadressen van deze lijst met domeinen worden automatisch goedgekeurd."
     hide_email_address_taken: "Gebruikers niet informeren dat een account met een bepaald e-mailadres bestaat tijdens registratie en vanaf het formulier voor vergeten wachtwoorden."
     log_out_strict: "Bij het afmelden ALLE sessies voor de gebruiker op alle apparaten afmelden"
     version_checks: "De Discourse Hub pingen voor versie-updates en berichten over nieuwe versies tonen op het <a href='%{base_path}/admin' target='_blank'>/admin</a>-dashboard"
@@ -1516,7 +1524,6 @@ nl:
     discord_client_id: 'Discord-client-ID (eentje nodig? bezoek <a href="https://discordapp.com/developers/applications/me">het Discord developer portal</a>)'
     discord_secret: "Geheime sleutel van Discord"
     discord_trusted_guilds: 'Alleen leden van deze Discord-guilds mogen zich aanmelden via Discord. Gebruik de numerieke ID voor de guild. Bekijk de instructies <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">hier</a> voor meer informatie. Laat dit leeg om alle guilds toe te staan.'
-    readonly_mode_during_backup: "Alleen-lezenmodus tijdens het maken van een back-up inschakelen"
     enable_backups: "Beheerders mogen back-ups van het forum maken"
     allow_restore: "Herstellen van gegevens toestaan, waarbij ALLE websitegegevens worden overschreven! Laat dit op 'false' staan, tenzij u een back-up wilt terugzetten."
     maximum_backups: "Het maximale aantal back-ups om op schijf te bewaren. Oudere back-ups worden automatisch verwijderd."
@@ -1751,6 +1758,7 @@ nl:
     relative_date_duration: "Aantal dagen na plaatsing voordat plaatsingsdata worden getoond als relatief (7d) in plaats van absoluut (20 feb)."
     delete_user_max_post_age: "Verwijderen van gebruikers wiens eerste bericht ouder is dan (x) dagen niet toestaan."
     delete_all_posts_max: "Het maximale aantal berichten dat tegelijk met de knop 'Alle berichten verwijderen' kan worden verwijderd. Als een gebruiker meer berichten heeft, kunnen de berichten niet allemaal tegelijk worden verwijderd, en kan de gebruiker niet worden verwijderd."
+    delete_user_self_max_post_count: "Het maximale aantal berichten dat een gebruiker kan hebben terwijl selfservice-accountverwijdering is toegestaan. Stel dit in op -1 om selfservice-accountverwijdering uit te schakelen."
     username_change_period: "Het maximale aantal dagen na registratie dat accounts hun gebruikersnamen kunnen wijzigen (0 om wijziging niet toe te staan)."
     email_editable: "Gebruikers mogen hun e-mailadres na registratie nog wijzigen."
     logout_redirect: "Locatie om browser naar om te leiden na afmelding (bv. https://example.com/logout)"
@@ -1789,6 +1797,7 @@ nl:
     ignored_users_count_message_threshold: "Moderators inlichten als een bepaalde gebruiker door dit aantal andere gebruikers wordt genegeerd."
     ignored_users_message_gap_days: "Wachttijd voordat moderators opnieuw worden ingelicht over een gebruiker die door veel andere wordt genegeerd."
     clean_up_inactive_users_after_days: "Aantal dagen voordat een inactieve gebruiker (vertrouwensniveau 0 zonder berichten) wordt verwijderd. Stel 0 in om opschonen uit te schakelen."
+    clean_up_unused_staged_users_after_days: "Aantal dagen voordat een niet-gebruikte staged gebruiker (zonder berichten) wordt verwijderd. Stel 0 in om opschonen uit te schakelen."
     user_selected_primary_groups: "Gebruikers mogen hun eigen primaire groep instellen"
     max_notifications_per_user: "Maximale aantal meldingen per gebruiker. Als dit aantal wordt overschreden, worden oude meldingen verwijderd. Wekelijks afgedwongen. Stel dit in op 0 om uit te schakelen."
     user_website_domains_whitelist: "Website van gebruiker wordt op deze domeinen gecontroleerd. Door pipes gescheiden lijst."
@@ -1827,7 +1836,9 @@ nl:
     highlighted_languages: "Opgenomen regels voor syntaxismarkering. (Waarschuwing: het opnemen van te veel talen kan prestaties beïnvloeden); bekijk <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> voor een demo."
     embed_any_origin: "Inbedbare inhoud toestaan, ongeacht oorsprong. Dit is vereist voor mobiele apps met statische HTML."
     embed_topics_list: "HTML-inbedding van topiclijsten ondersteunen"
+    embed_set_canonical_url: "De canonieke URL voor ingebedde topics naar de URL van de ingebedde inhoud instellen."
     embed_truncate: "De ingebedde berichten inkorten."
+    embed_unlisted: "Geïmporteerde topics worden onzichtbaar totdat een gebruiker antwoordt."
     embed_support_markdown: "Markdown-opmaak voor ingebedde berichten ondersteunen."
     embed_whitelist_selector: "Een door komma's gescheiden lijst van CSS-elementen die bij inbedding zijn toegestaan."
     allowed_href_schemes: "Toegestane schema's in koppelingen, naast http en https."
@@ -1838,7 +1849,7 @@ nl:
     delete_drafts_older_than_n_days: "Concepten ouder dan (n) dagen verwijderen."
     bootstrap_mode_min_users: "Minimale aantal vereiste gebruikers om bootstrapmodus uit te schakelen (stel dit in op 0 om uit te schakelen)"
     prevent_anons_from_downloading_files: "Voorkomen dat anonieme gebruikers bijlagen downloaden. WAARSCHUWING: hierdoor zullen websiteonderdelen anders dan afbeeldingen die als bijlage zijn geplaatst niet werken."
-    secure_media: 'Beperkt toegang tot media-uploads (afbeeldingen, video, audio). Als ''aanmelding vereist'' is ingeschakeld, hebben alleen aangemelde gebruikers toegang tot media-uploads. Anders is toegang beperkt tot media-uploads in privéberichten. Opmerking: S3-uploads moeten zijn ingeschakeld voordat u deze instelling inschakelt.'
+    secure_media: 'Beperkt toegang tot ALLE uploads (afbeeldingen, video, audio, tekst, pdf’s, zips en andere). Als ‘aanmelding vereist’ is ingeschakeld, hebben alleen aangemelde gebruikers toegang tot uploads. Anders is toegang beperkt tot media-uploads in privéberichten en privécategorieën. WAARSCHUWING: deze instelling is complex en vereist grondige kennis van beheer. Zie <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">het topic over beveiligde media op Meta</a> voor details.'
     slug_generation_method: "Kies een slug-generatiemodus. 'encoded' genereert een percentage-coderingsstring. 'none' schakelt de slug helemaal uit."
     enable_emoji: "Emoji inschakelen"
     enable_emoji_shortcuts: "Gebruikelijke smileyteksten zoals :) :p :( worden naar emoji geconverteerd"
@@ -1859,6 +1870,7 @@ nl:
     new_user_notice_tl: "Het minimale vertrouwensniveau dat nodig is om berichtmeldingen van nieuwe gebruikers te zien."
     returning_user_notice_tl: "Het minimale vertrouwensniveau dat nodig is om berichtmeldingen van terugkerende gebruikers te zien."
     returning_users_days: "Het aantal dagen dat voorbij moet gaan voordat een gebruiker als terugkerend wordt beschouwd."
+    enable_page_publishing: "Stafleden mogen topics naar nieuwe URL's publiceren met hun eigen stijlen."
     default_email_digest_frequency: "Hoe vaak gebruikers standaard e-mailsamenvattingen ontvangen."
     default_include_tl0_in_digests: "Standaard berichten van nieuwe gebruikers in e-mailsamenvattingen opnemen. Gebruikers kunnen dit in hun voorkeuren wijzigen."
     default_email_level: "Standaard e-mailmeldingsniveau voor normale topics."
@@ -1921,6 +1933,9 @@ nl:
     push_notifications_icon: "Het badgepictogram dat in de meldingenhoek verschijnt. Vereiste grootte is 96 × 96."
     short_title: "De korte titel wordt gebruikt op het startscherm van de gebruiker, de starter, of andere plaatsen waar ruimte beperkt kan zijn. Beperk de naam tot 12 tekens."
     dashboard_general_tab_activity_metrics: "Kies rapporten die als activiteitsgegevens op het algemene tabblad worden weergegeven."
+    gravatar_name: "Naam van de Gravatar-provider"
+    gravatar_base_url: "URL van de API-basis van de Gravatar-provider"
+    gravatar_login_url: "URL ten opzichte van gravatar_base_url, die de gebruiker van de aanmelding bij de Gravatar-service voorziet"
     errors:
       invalid_email: "Ongeldig e-mailadres."
       invalid_username: "Er is geen gebruiker met die gebruikersnaam."
@@ -2020,6 +2035,11 @@ nl:
       other: "%{count} berichten zijn samengevoegd naar een bestaand bericht: %{topic_link}"
   change_owner:
     post_revision_text: "Eigendom overgezet"
+  publish_page:
+    slug_errors:
+      blank: "mag niet leeg zijn"
+      unavailable: "is niet beschikbaar"
+      invalid: "bevat ongeldige tekens"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Dit bericht is na het bereiken van de maximumlimiet van %{count} antwoord automatisch gesloten."
@@ -2102,6 +2122,7 @@ nl:
     new_registrations_disabled: "Nieuwe accountregistraties zijn op dit moment niet toegestaan."
     password_too_long: "Wachtwoorden mogen maximaal 200 tekens lang zijn."
     email_too_long: "Het opgegeven e-mailadres is te lang. Postvaknamen mogen niet langer zijn dan 254 tekens, en domeinnamen niet langer dan 253 tekens."
+    wrong_invite_code: "De door u ingevoerde code is ongeldig."
     reserved_username: "Die gebruikersnaam is niet toegestaan."
     missing_user_field: "U hebt niet alle gebruikersvelden ingevuld"
     auth_complete: "Authenticatie is voltooid."
@@ -2113,6 +2134,8 @@ nl:
     second_factor_backup_title: "Twee-factor-back-upcode"
     invalid_second_factor_code: "Ongeldige authenticatiecode. Elke code kan maar eenmaal worden gebruikt."
     invalid_security_key: "Ongeldige beveiligingssleutel."
+    missing_second_factor_name: "Geef een naam op."
+    missing_second_factor_code: "Geef een code op."
     second_factor_toggle:
       totp: "Een authenticator-app of beveiligingssleutel gebruiken"
       backup_code: "Een back-upcode gebruiken"
@@ -2419,8 +2442,8 @@ nl:
       why: "Een korte samenvatting van %{site_link} sinds uw laatste bezoek op %{last_seen_at}."
       since_last_visit: "Sinds uw laatste bezoek"
       new_topics: "Nieuwe topics"
-      unread_messages: "Ongelezen berichten"
       unread_notifications: "Ongelezen meldingen"
+      unread_high_priority: "Ongelezen meldingen met hoge prioriteit"
       liked_received: "Ontvangen likes"
       new_users: "Nieuwe gebruikers"
       popular_topics: "Populaire topics"
@@ -2515,6 +2538,9 @@ nl:
     pasted_image_filename: "Geplakte afbeelding"
     store_failure: "Het opslaan van upload #%{upload_id} voor gebruiker #%{user_id} is mislukt."
     file_missing: "Sorry, u moet een bestand opgeven om te uploaden."
+    empty: "Sorry, maar het bestand dat u hebt opgegeven is leeg."
+    png_to_jpg_conversion_failure_message: "Er is een fout opgetreden bij het converteren van PNG naar JPG."
+    optimize_failure_message: "Er is een fout opgetreden bij het optimaliseren van de geüploade afbeelding."
     attachments:
       too_large: "Sorry, het bestand dat u probeert te uploaden is te groot (maximumgrootte is %{max_size_kb}%KB)."
     images:
@@ -2546,6 +2572,7 @@ nl:
     sender_body_blank: "geen tekst"
     sender_post_deleted: "bericht is verwijderd"
     sender_message_to_invalid: "ontvanger heeft een ongeldig e-mailadres"
+    sender_topic_deleted: "topic is verwijderd"
   color_schemes:
     base_theme_name: "Basis"
     light: "Licht"
@@ -2857,7 +2884,7 @@ nl:
     reasons:
       email_auth_res_enqueue: "Een DMARC-controle op deze e-mail is mislukt; het bericht komt zeer waarschijnlijk niet van wie het lijkt te komen. Controleer de onbewerkte e-mailheader voor meer informatie."
       email_spam: "Deze e-mail is als spam gemarkeerd door de header zoals gedefinieerd in `email_in_spam_header`."
-      suspect_user: "Gebruikers in de verdachtenlijst moeten door een staflid worden onderzocht. Zie `approve_suspect_users`."
+      suspect_user: "Deze nieuwe gebruiker heeft profielgegevens ingevoerd zonder topics of berichten te hebben gelezen, wat sterk doet vermoeden dat het een spammer kan zijn. Zie `approve_suspect_users`."
     actions:
       agree:
         title: "Akkoord..."
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 3e43f69002..d37f012004 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -47,6 +47,7 @@ pl_PL:
       generic: Podczas importowania motywu wystąpił błąd.
       about_json: "Błąd importu: plik about.js nie istnieje albo jest niepoprawny"
       about_json_values: "Plik about.json zawiera niepoprawne wartości: %{errors}"
+      modifier_values: "modyfikatory about.json zawierają nieprawidłowe wartości: %{errors}"
       git: "Podczas klonowania repozytorium git wystąpił błąd: dostęp jest zabroniony albo repozytorium nie istnieje"
       unpack_failed: "Błąd przy rozpakowywaniu pliku"
       file_too_big: "Nieskompresowany plik jest zbyt duży."
@@ -56,9 +57,9 @@ pl_PL:
       component_no_default: "Komponenty motywu nie mogą być domyślnym motywem"
       component_no_color_scheme: "Komponenty motywu nie mogą mieć palet kolorystycznych"
       no_multilevels_components: "Motywy posiadające submotywy nie mogą być submotywami"
+      optimized_link: Zoptymalizowane łącza do obrazów są efemeryczne i nie powinny być zawarte w kodzie źródłowym motywu.
     settings_errors:
       invalid_yaml: "Wprowadzony YAML jest nieprawidłowy"
-      data_type_not_a_number: "Ustawienie typu %{name} nie jest wspierane. Wspierane typy to \"integer\", \"bool\", \"list\" i \"enum\""
       name_too_long: "Jedno z ustawień ma zbyt długą nazwę. Maksymalna długość to 255 znaków"
       default_value_missing: "Ustawienie `%{name}` nie ma domyślnej wartości"
       default_not_match_type: "Typ domyślnej wartości ustawienia \"%{name}\" nie odpowiada typowi ustawienia."
@@ -73,6 +74,7 @@ pl_PL:
       string_value_not_valid_min: "Wartość musi mieć co najmniej %{min} znaków."
       string_value_not_valid_max: "Wartość musi mieć co najwyżej %{max} znaków."
     locale_errors:
+      top_level_locale: "Klucz najwyższego poziomu w pliku ustawień regionalnych musi być zgodny z nazwą ustawień regionalnych"
       invalid_yaml: "Nieprawidłowy plik YAML z tłumaczeniem"
   emails:
     incoming:
@@ -88,8 +90,10 @@ pl_PL:
         auto_generated_email_error: "Zdarza się, gdy \"pierwszeństwo\" nagłówka jest ustawione na: listę, śmieci, luzem lub auto odpowiedź lub gdy inny nagłówek zawiera: auto-składane, auto-odpowiadanie lub auto-generowane."
         no_body_detected_error: "Zdarza się, kiedy nie można rozpakować całości wiadomości, a zawarte są w niej załączniki."
         no_sender_detected_error: "Zdarza się, kiedy nie można znaleźć prawidłowego adresu e‐mail w nagłówku Od."
+        from_reply_by_address_error: "Zdarza się, gdy nagłówek From pasuje do odpowiedzi według adresu e-mail."
         inactive_user_error: "Zdarza się kiedy nadawca jest nie aktywny."
         silenced_user_error: "Dzieje się, gdy wysyłający został uciszony."
+        bad_destination_address: "Zdarza się, gdy żaden z adresów e-mail w polach Do / DW nie odpowiada skonfigurowanemu adresowi poczty przychodzącej."
         strangers_not_allowed_error: "Zdarza się, gdy użytkownik próbuje stworzyć temat w kategorii, której nie jest członkiem."
         insufficient_trust_level_error: "Zdarza się, gdy użytkownik próbuje stworzyć temat w kategorii, której nie ma odpowiedniego poziomu zaufania.."
         reply_user_not_matching_error: "Zdarza się kiedy pojawia się odpowiedź z innego adresu email niż ten na który powiadomienie zostało wysłane."
@@ -98,7 +102,9 @@ pl_PL:
         bounced_email_error: "Email jest cofniętym raportem emaila."
         screened_email_error: "Zdarza się kiedy adres email nadawcy został zasłonięty. "
         unsubscribe_not_allowed: "Zdarza się, kiedy anulowanie subskrypcji przez e‐mail nie jest dozwolone dla tego użytkownika."
+        email_not_allowed: "Zdarza się, gdy adres e-mail nie znajduje się na białej liście lub znajduje się na czarnej liście."
       unrecognized_error: "Niezidentyfikowany błąd"
+    secure_media_placeholder: "Zredagowano: ta strona ma włączone bezpieczne media, przejdź do tematu, aby zobaczyć załączony obraz / audio / wideo."
   errors: &errors
     format: "%{attribute} %{message}"
     format_with_full_message: "<b>%{attribute}</b>:%{message}"
@@ -120,6 +126,7 @@ pl_PL:
       inclusion: nie jest zawarty w liście
       invalid: jest nieprawidłowy
       is_invalid: "wygląda niejasno, czy to cała wypowiedz ?"
+      invalid_timezone: "„%{tz}” nie jest prawidłową strefą czasową"
       contains_censored_words: "zawiera następujące niedozwolone słowa: %{censored_words}"
       less_than: "musi być mniejszy niż %{count}"
       less_than_or_equal_to: "musi być mniejszy lub równy %{count}"
@@ -149,6 +156,7 @@ pl_PL:
         many: jest nieprawidłowej długości (powinna mieć %{count} znaków)
         other: jest nieprawidłowej długości (powinna mieć %{count} znaków)
       other_than: "musi być różna od %{count}"
+      sso_overrides_username: "Nazwa użytkownika musi zostać zaktualizowana po stronie dostawcy SSO, ponieważ ustawienie `sso_overrides_username` jest włączone."
     template:
       body: "Wystąpiły problemy z następującymi polami:"
       header:
@@ -166,9 +174,16 @@ pl_PL:
         many: "Podano nieprawidłowe opcje %{name}"
         other: "Podano nieprawidłowe opcje %{name}"
       default_categories_already_selected: "Nie możesz wybrać kategorii użytej w innej liście."
+      default_tags_already_selected: "Nie można wybrać znacznika używanego z innej listy."
       s3_upload_bucket_is_required: "Nie możesz wysyłać na S3 jeżeli nie podasz 's3_upload_bucket'."
+      enable_s3_uploads_is_required: "Nie możesz włączyć zasobów reklamowych do S3, chyba że włączysz przesyłanie S3."
       s3_backup_requires_s3_settings: "Nie możesz używać S3 do tworzenia kopii zapasowych bez podania \"%{setting_name}\"."
       s3_bucket_reused: "Nie możesz używać tego samego bucketu jako \"s3_upload_bucket\" i \"s3_backup_bucket\". Wybierz inny bucket albo podaj różne ścieżki dla każdego z bucketów."
+      secure_media_requirements: "Przesyłanie S3 musi być włączone przed włączeniem bezpiecznych mediów."
+      second_factor_cannot_be_enforced_with_disabled_local_login: "Nie można wymusić 2FA, jeśli lokalne logowanie jest wyłączone."
+      local_login_cannot_be_disabled_if_second_factor_enforced: "Nie można wyłączyć lokalnego logowania, jeśli wymuszone jest 2FA. Wyłącz wymuszone 2FA przed wyłączeniem lokalnych logowań."
+      cannot_enable_s3_uploads_when_s3_enabled_globally: "Nie można włączyć przesyłania S3, ponieważ przesyłanie S3 jest już włączone globalnie, a włączenie tego poziomu witryny może powodować krytyczne problemy z przesyłaniem"
+    conflicting_google_user_id: 'Identyfikator konta Google dla tego konta został zmieniony; interwencja personelu jest wymagana ze względów bezpieczeństwa. Skontaktuj się z personelem i wskaż go <br> <a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   activemodel:
     errors:
       <<: *errors
@@ -203,11 +218,16 @@ pl_PL:
   provider_not_enabled: "Nie masz dostępu do żądanego zasobu. Poświadczający uwierzytelnienie nie został upoważniony w systemie."
   provider_not_found: "Nie masz dostępu do żądanego zasobu. Poświadczający uwierzytelnienie nie istnieje."
   read_only_mode_enabled: "Strona jest w trybie tylko do odczytu. Możliwość interakcji jest wyłączona."
+  invalid_grant_badge_reason_link: "Zewnętrzny lub nieprawidłowy link do dyskursu jest niedozwolony z przyczyn związanych z odznaką"
   email_template_cant_be_modified: "Ten szablon e-mail nie może być zmodyfikowany"
+  invalid_whisper_access: "Albo szepty nie są włączone, albo nie masz dostępu do tworzenia postów szeptanych"
   not_in_group:
     title_topic: "Musisz być w grupie, aby zobaczyć ten temat."
+    title_category: "Musisz być w grupie, aby zobaczyć tę kategorię."
     request_membership: "Poproś o członkostwo"
     join_group: "Dołącz do grupy"
+  deleted_topic: "Ups! Ten temat został usunięty i nie jest już dostępny."
+  delete_topic_failed: "Podczas usuwania tego tematu wystąpił błąd. Skontaktuj się z administratorem strony."
   reading_time: "Czas odczytu"
   likes: "Lajki"
   too_many_replies:
@@ -225,6 +245,8 @@ pl_PL:
     continue: "Kontynuuj dyskusję"
     error: "Błąd osadzenia"
     referer: "Odnośnik:"
+    error_topics: "Ustawienie witryny „lista tematów do umieszczenia” nie zostało włączone"
+    mismatch: "Skierujący albo nie został wysłany, albo nie pasuje do żadnego z następujących hostów:"
     no_hosts: "Brak ustawionych hostów do osadzenia."
     configure: "Konfiguracja osadzenia"
     more_replies:
@@ -290,6 +312,8 @@ pl_PL:
   max_pm_recipients: "Przepraszam, możesz wysłać wiadomość tylko do %{recipients_limit} odbiorców."
   pm_reached_recipients_limit: "Przepraszamy, możesz wysłać wiadomość tylko do %{recipients_limit} odbiorców."
   removed_direct_reply_full_quotes: "Automatycznie usunięto cytowanie całości poprzedzającego wpisu."
+  secure_upload_not_allowed_in_public_topic: "Niestety, następujące bezpieczne przesyłanie nie może być użyte w publicznym temacie: %{upload_filenames}."
+  create_pm_on_existing_topic: "Przepraszamy, nie możesz utworzyć PM na istniejący temat."
   just_posted_that: "jest zbyt podobne do tego co umieściłeś niedawno"
   invalid_characters: "zawiera niepoprawne znaki"
   is_invalid: "wygląda niejasno, czy to cała wypowiedz ?"
@@ -326,6 +350,20 @@ pl_PL:
   edit_conflict: "Ten wpis został zmieniony przez innego użytkownika i Twoje zmiany nie zostaną zapisane."
   revert_version_same: "Obecna wersja jest taka sama jak w wersja, którą próbujesz przywrócić."
   excerpt_image: "zdjęcie"
+  bookmarks:
+    errors:
+      already_bookmarked_post: "Nie możesz dodać zakładki do tego samego postu dwa razy."
+      cannot_set_past_reminder: "W przeszłości nie można ustawić przypomnienia o zakładce."
+      cannot_set_reminder_in_distant_future: "Nie możesz ustawić przypomnienia o zakładce na więcej niż 10 lat w przyszłości."
+      time_must_be_provided: "dla wszystkich przypomnień należy przewidzieć czas z wyjątkiem „%{reminder_type}”"
+    reminders:
+      at_desktop: "Następnym razem będę na swoim pulpicie"
+      later_today: "Później dzisiaj"
+      next_business_day: "Następny dzień roboczy"
+      tomorrow: "Jutro"
+      next_week: "Następny tydzień"
+      next_month: "Następny miesiąc"
+      custom: "Niestandardowa data i godzina"
   groups:
     success:
       bulk_add:
@@ -359,7 +397,6 @@ pl_PL:
       trust_level_4: "poziom_zaufania_4"
     request_membership_pm:
       title: "Prośba o członkostwo w grupie @%{group_name}"
-      handle: "obsłuż prośby o członkostwo "
     view_hidden_topic_request_reason: "Chciał(a)by dołączyć do grupy %{group_name}, aby uzyskać dostęp do [tego wątku](%{topic_url})"
   education:
     until_posts:
@@ -465,6 +502,10 @@ pl_PL:
               same_as_password: "jest takie samo, jak twoje hasło."
             ip_address:
               signup_not_allowed: "Rejestracja z tego konta jest niemożliwa."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Ten temat nie może być polecany w twoim profilu."
         user_email:
           attributes:
             user_id:
@@ -488,6 +529,10 @@ pl_PL:
           attributes:
             execute_at:
               in_the_past: "musi być w przyszłości"
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys: 'Następujące klucze interpolacyjne są nieprawidłowe: „%{keys}”'
         watched_word:
           attributes:
             word:
@@ -533,6 +578,7 @@ pl_PL:
       description_incomplete: "Post opisujący kategorię musi mieć przynajmniej jeden paragraf."
       permission_conflict: "Grupa posiadająca dostęp do podkategorii musi mieć także dostęp do jej kategorii nadrzędnej. Grupy %{group_names} mają dostęp do jednej z podkategorii, ale nie do grupy nadrzędnej."
       disallowed_topic_tags: "Ten wątek zawiera tagi %{tags}, które nie są dozwolone w tej kategorii"
+      disallowed_tags_generic: "W tym temacie niedozwolone są tagi."
     cannot_delete:
       uncategorized: "Ta kategoria ma specjalny charakter. Jest przeznaczona jako miejsce do przechowywania tematów nieprzypisanych do żadnej kategorii i jako taka nie może zostać usunięta."
       has_subcategories: "Nie można usunąć tej kategorii ponieważ posiada podkategorie. "
@@ -768,6 +814,7 @@ pl_PL:
       almost_done_title: "Potwierdzanie nowego adresu e-mail"
       almost_done_description: "Wysłaliśmy e-maila na nowy adres, by potwierdzić tę zmianę!"
   associated_accounts:
+    revoke_failed: "Nie udało się unieważnić konta za pomocą %{provider_name}."
     connected: "(połączony)"
   activation:
     action: "Kliknij, by aktywować swoje konto."
@@ -780,6 +827,7 @@ pl_PL:
     activated: "Przepraszamy, to konto zostało już aktywowane."
     admin_confirm:
       title: "Potwierdź konto administratora"
+      description: "Czy na pewno chcesz, aby <b>%{target_username} (%{target_email})</b> był administratorem?"
       grant: "Przynaj prawa Admina"
       complete: "<b>%{target_username}</b> jest teraz administratorem."
       back_to: "Wróć do %{title}"
@@ -828,6 +876,13 @@ pl_PL:
       description: "Polub ten wpis"
       short_description: "Polub ten wpis"
       long_form: "polubiono to"
+  draft:
+    sequence_conflict_error:
+      title: "błąd wersji roboczej"
+      description: "Szkic jest edytowany w innym oknie. Załaduj ponownie tę stronę."
+  draft_backup:
+    pm_title: "Kopie zapasowe wersje robocze z bieżących tematów"
+    pm_body: "Temat zawierający kopie zapasowe"
   user_activity:
     no_default:
       self: "Nie masz jeszcze żadnej aktywności."
@@ -843,6 +898,21 @@ pl_PL:
       others: "Brak odpowiedzi."
     no_drafts:
       self: "Nie masz żadnych zapisanych wersji roboczych. Zacznij pisać odpowiedź w jakimś wątku, a zostanie ona automatycznie zapisana jako nowa wersja robocza."
+  webauthn:
+    validation:
+      invalid_type_error: "Podany typ webauthn był nieprawidłowy. Prawidłowe typy to webauthn.get i webauthn.create."
+      challenge_mismatch_error: "Podane wyzwanie nie odpowiada wyzwaniu wygenerowanemu przez serwer uwierzytelniania."
+      invalid_origin_error: "Początek żądania uwierzytelnienia nie zgadza się z początkiem serwera."
+      malformed_attestation_error: "Wystąpił błąd podczas dekodowania danych zaświadczenia."
+      invalid_relying_party_id_error: "Identyfikator strony ufającej żądania uwierzytelnienia nie zgadza się z identyfikatorem serwera strony zależnej."
+      user_verification_error: "Wymagana jest weryfikacja użytkownika."
+      unsupported_public_key_algorithm_error: "Podany algorytm klucza publicznego nie jest obsługiwany przez serwer."
+      unsupported_attestation_format_error: "Format certyfikatu nie jest obsługiwany przez serwer."
+      credential_id_in_use_error: "Podany identyfikator poświadczenia jest już w użyciu."
+      public_key_error: "Weryfikacja klucza publicznego dla poświadczenia nie powiodła się."
+      ownership_error: "Klucz bezpieczeństwa nie jest własnością użytkownika."
+      not_found_error: "Nie można znaleźć klucza bezpieczeństwa z podanym identyfikatorem poświadczenia."
+      unknown_cose_algorithm_error: "Algorytm użyty dla klucza bezpieczeństwa nie został rozpoznany."
   topic_flag_types:
     spam:
       title: "Spam"
@@ -879,6 +949,8 @@ pl_PL:
     description: "preferencje mailowe dla <b>%{email}</b>zostały zapisane. Aby zmienić ustawienia mailowe <a href='%{url}'>zajrzyj do ustawień użytkownika</a>."
     topic_description: "Aby ponownie zasubskrybować %{link}, użyj kontrolki powiadomienia na dole lub po prawej stronie tematu."
     private_topic_description: "Aby ponownie zasubskrybować, użyj opcji powiadomienia na dole lub po prawej stronie wątku."
+  uploads:
+    marked_insecure_from_theme_component_reason: "przesyłanie użyte w komponencie motywu"
   unsubscribe:
     title: "Wypisz"
     stop_watching_topic: "Przestań obserwować ten temat, %{link}"
@@ -951,6 +1023,7 @@ pl_PL:
         disagreed_flags: Niepotwierdzone flagi
         ignored_flags: Zignorowane flagi
         score: Wynik
+      description: "Lista użytkowników uporządkowana według współczynnika odpowiedzi personelu na ich flagi (nie zgadzam się z ustalonym)."
     moderators_activity:
       title: "Aktywność moderatorów"
       labels:
@@ -961,6 +1034,7 @@ pl_PL:
         post_count: Napisanych wpisów
         pm_count: Napisanych PW
         revision_count: Wersji
+      description: "Lista działań moderatora, w tym sprawdzone flagi, czas czytania, utworzone tematy, utworzone posty, utworzone wiadomości osobiste i poprawki."
     flags_status:
       title: "Status flag"
       values:
@@ -974,19 +1048,31 @@ pl_PL:
         poster: Publikujący
         flagger: Flagujący
         time_to_resolution: Czas rozwiązania
+      description: "Lista statusów flag, w tym rodzaj flagi, plakat, flagger i czas do rozwiązania."
     visits:
       title: "Wizyty użytkowników"
       xaxis: "Dzień"
       yaxis: "Liczba wizyt"
+      description: "Liczba wszystkich wizyt użytkowników."
     signups:
       title: "Podpisy"
       xaxis: "Dzień"
+      yaxis: "Liczba rejestracji"
+      description: "Nowe rejestracje kont dla tego okresu."
     new_contributors:
       title: "Nowi współtwórcy"
       xaxis: "Dzień"
       yaxis: "Liczba nowych współtwórców"
+      description: "Liczba użytkowników, którzy napisali swój pierwszy post w tym okresie."
     trust_level_growth:
+      title: "Wzrost poziomu zaufania"
+      xaxis:
+        tl1_reached: "Osiągnięto TL1"
+        tl2_reached: "Osiągnięto TL2"
+        tl3_reached: "Osiągnięto TL3"
+        tl4_reached: "Osiągnięto TL4"
       yaxis: "Dzień"
+      description: "Liczba użytkowników, którzy podnieśli poziom zaufania w tym okresie."
     consolidated_page_views:
       title: "Skonsolidowane odsłony"
       xaxis:
@@ -1004,22 +1090,27 @@ pl_PL:
       title: "DAU / MAU"
       xaxis: "Dzień"
       yaxis: "DAU / MAU"
+      description: "Liczba członków zalogowanych w ostatnim dniu podzielona przez liczbę członków zalogowanych w ostatnim miesiącu - zwraca% wskazujący „lepkość” społeczności. Celuj na&gt; 30%."
     daily_engaged_users:
       title: "Zaangażowani użytkownicy dziennie"
       xaxis: "Dzień"
       yaxis: "Zaangażowani użytkownicy"
+      description: "Liczba użytkowników, którzy polubili lub opublikowali w ostatnim dniu."
     profile_views:
       title: "Wyświetlenia profilu użytkownika"
       xaxis: "Dzień"
       yaxis: "Liczba wyświetleń profilów użytkowników"
+      description: "Łącznie nowe widoki profili użytkowników."
     topics:
       title: "Tematy"
       xaxis: "Dzień"
       yaxis: "Liczba nowych tematów"
+      description: "Nowe tematy utworzone w tym okresie."
     posts:
       title: "Posty"
       xaxis: "Dzień"
       yaxis: "Liczba nowych postów"
+      description: "Nowe posty utworzone w tym okresie"
     likes:
       title: "Polubienia"
       xaxis: "Dzień"
@@ -1041,7 +1132,10 @@ pl_PL:
       yaxis: "Liczba użytkowników"
       labels:
         level: Poziom
+      description: "Liczba użytkowników pogrupowanych według poziomu zaufania."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
+      title: "Użytkownicy według typu"
       xaxis: "Typ"
       yaxis: "Liczba użytkowników"
       labels:
@@ -1051,37 +1145,49 @@ pl_PL:
         moderator: Moderatorzy
         suspended: Zawieszeni
         silenced: Wyciszony
+      description: "Liczba użytkowników pogrupowanych według administratora, moderatora, zawieszonych i wyciszonych."
     trending_search:
+      title: Najpopularniejsze wyszukiwane hasła
       labels:
         term: Szukana fraza
         searches: Wyszukiwania
         click_through: CTR
+      description: "Najpopularniejsze wyszukiwane hasła z ich współczynnikami klikalności."
     emails:
       title: "Wysłane emaile"
       xaxis: "Dzień"
       yaxis: "Liczba emaili"
+      description: "Liczba wysłanych nowych e-maili."
     user_to_user_private_messages:
+      title: "Użytkownik dla użytkownika (z wyłączeniem odpowiedzi)"
       xaxis: "Dzień"
       yaxis: "Liczba wiadomości"
+      description: "Liczba nowo zainicjowanych wiadomości osobistych."
     user_to_user_private_messages_with_replies:
+      title: "Użytkownik dla użytkownika (z odpowiedziami)"
       xaxis: "Dzień"
       yaxis: "Liczba wiadomości"
+      description: "Liczba wszystkich nowych osobistych wiadomości i odpowiedzi."
     system_private_messages:
       title: "System"
       xaxis: "Dzień"
       yaxis: "Liczba wiadomości"
+      description: "Liczba wiadomości osobistych wysyłanych automatycznie przez system."
     moderator_warning_private_messages:
       title: "Ostrzeżenia moderatorów"
       xaxis: "Dzień"
       yaxis: "Liczba wiadomości"
+      description: "Liczba ostrzeżeń wysłanych osobistymi wiadomościami od moderatorów."
     notify_moderators_private_messages:
       title: "Powiadomienia moderatorów"
       xaxis: "Dzień"
       yaxis: "Liczba wiadomości"
+      description: "Liczba razy moderatorzy byli prywatnie powiadamiani przez flagę."
     notify_user_private_messages:
       title: "Powiadom użytkownika"
       xaxis: "Dzień"
       yaxis: "Liczba wiadomości"
+      description: "Ile razy użytkownicy zostali prywatnie powiadomieni przez flagę."
     top_referrers:
       title: "Najczęstszy referrerzy"
       xaxis: "Użytkownik"
@@ -1091,6 +1197,7 @@ pl_PL:
         user: "Użytkownik"
         num_clicks: "Kliki"
         num_topics: "Tematy"
+      description: "Użytkownicy wymienieni według liczby kliknięć linków, które udostępnili."
     top_traffic_sources:
       title: "Najlepsze źródła ruchu"
       xaxis: "Domena"
@@ -1101,35 +1208,43 @@ pl_PL:
         domain: Domena
         num_clicks: Kliki
         num_topics: Tematy
+      description: "Źródła zewnętrzne, które najczęściej linkowały do tej strony."
     top_referred_topics:
       title: "Najczęściej linkowane tematy"
       labels:
         num_clicks: "Kliki"
         topic: "Temat"
+      description: "Tematy, które uzyskały najwięcej kliknięć ze źródeł zewnętrznych."
     page_view_anon_reqs:
       title: "Anonimowy"
       xaxis: "Dzień"
       yaxis: "Anonimowe odsłony"
+      description: "Liczba nowych odsłon przez użytkowników niezalogowanych na konto."
     page_view_logged_in_reqs:
       title: "Zalogowany"
       xaxis: "Dzień"
       yaxis: "Zalogowane odsłony"
+      description: "Liczba nowych odsłon strony od zalogowanych użytkowników."
     page_view_crawler_reqs:
       title: "Odsłony botów indeksujących"
       xaxis: "Dzień"
       yaxis: "Odsłony botów indeksujących"
+      description: "Łączna liczba odsłon stron z robotów indeksujących w czasie."
     page_view_total_reqs:
       title: "Wyświetlenia strony"
       xaxis: "Dzień"
       yaxis: "Wszystkie odsłony"
+      description: "Liczba nowych odsłon wszystkich użytkowników."
     page_view_logged_in_mobile_reqs:
       title: "Zalogowane odsłony"
       xaxis: "Dzień"
       yaxis: "Odsłony użytkowników mobilnych"
+      description: "Liczba nowych odsłon strony od użytkowników urządzeń mobilnych i zalogowanych na konto."
     page_view_anon_mobile_reqs:
       title: "Anonimowe odsłony"
       xaxis: "Dzień"
       yaxis: "Odsłony anonimowych użytkowników mobilnych"
+      description: "Liczba nowych odsłon strony użytkowników urządzenia mobilnego, którzy nie są zalogowani."
     http_background_reqs:
       title: "Tło"
       xaxis: "Dzień"
@@ -1158,18 +1273,25 @@ pl_PL:
       title: "Czas na pierwszą odpowiedź"
       xaxis: "Dzień"
       yaxis: "Średni czas (w godzinach)"
+      description: "Średni czas (w godzinach) pierwszej odpowiedzi na nowe tematy."
     topics_with_no_response:
       title: "Tematy bez odpowiedzi"
       xaxis: "Dzień"
       yaxis: "Łącznie"
+      description: "Liczba utworzonych nowych tematów, które nie otrzymały odpowiedzi."
     mobile_visits:
+      title: "Odwiedziny użytkowników (mobilne)"
       xaxis: "Dzień"
       yaxis: "Liczba wizyt"
+      description: "Liczba unikalnych użytkowników, którzy odwiedzili przy użyciu urządzenia mobilnego."
     web_crawlers:
+      title: "Agenty użytkownika przeszukiwacza sieci"
       labels:
         user_agent: "Przeglądarka użytkownika"
         page_views: "Wyświetlenia strony"
+      description: "Lista agentów użytkownika przeszukiwacza sieci, posortowana według odsłon."
     suspicious_logins:
+      title: "Podejrzane logowanie"
       labels:
         user: Użytkownik
         client_ip: IP klienta
@@ -1178,41 +1300,66 @@ pl_PL:
         device: Urządzenie
         os: System operacyjny
         login_time: Czas zalogowania
+      description: "Szczegóły nowych logowań, które różnią się podejrzanie od poprzednich logowań."
     staff_logins:
       title: "Zalogowania administratora"
       labels:
         user: Użytkownik
         location: Lokalizacja
+        login_at: Zaloguj się na
+      description: "Lista czasów logowania administratora wraz z lokalizacjami."
     top_uploads:
+      title: "Najpopularniejsze przesłane"
       labels:
         filename: Nazwa pliku
         extension: Rozszerzenia
         author: Autor
         filesize: Rozmiar pliku
+      description: "Wyświetl wszystkie przesłane pliki według rozszerzenia, rozmiaru pliku i autora."
     top_ignored_users:
+      title: "Najczęściej ignorowani / wyciszeni użytkownicy"
       labels:
+        ignored_user: Zignorowany użytkownik
         ignores_count: Licznik ignorowanych
         mutes_count: Licznik wyciszonych
+      description: "Użytkownicy, którzy zostali wyciszeni i / lub zignorowani przez wielu innych użytkowników."
   dashboard:
     rails_env_warning: "Twój serwer działa w trybie %{env}"
     host_names_warning: "Twój plik config/database.yml używa domyślnej nazwy serwera localhost. Zmień go by używał nazwy serwera Twojej strony."
     sidekiq_warning: 'Sidekiq nie działa. Wiele zadań, takich jak wysyłanie emaili, jest wykonywane asynchronicznie przez sidekiqa. Zagwarantuj, że przynajmniej jeden proces sidekiqa działa. <a href="https://github.com/mperham/sidekiq" target="_blank">Dowiedz się więcej o Sidekiqu</a>.'
     queue_size_warning: "Liczba oczekujących zadań wynosi %{queue_size}, to dużo. Może to wskazywać na problem z procesem (procesami) Sidekiq, lub możesz potrzebować więcej pracowników Sidekiq."
     memory_warning: "Twój serwer działa z mniej niż 1 GB pamięci całkowitej. Przynajmniej 1 GB pamięci jest zalecany."
+    google_oauth2_config_warning: 'Serwer jest skonfigurowany tak, aby umożliwić rejestrację i logowanie za pomocą Google OAuth2 (enable_google_oauth2_logins), ale identyfikator klienta i tajne wartości klienta nie są ustawione. Przejdź do <a href="%{base_path}/admin/site_settings">Ustawień witryny</a> i zaktualizuj ustawienia. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Zobacz ten przewodnik, aby dowiedzieć się więcej</a> .'
+    facebook_config_warning: 'Serwer jest skonfigurowany tak, aby umożliwić rejestrację i logowanie za pomocą Facebooka (enable_facebook_logins), ale identyfikator aplikacji i tajne wartości aplikacji nie są ustawione. Przejdź do <a href="%{base_path}/admin/site_settings">Ustawień witryny</a> i zaktualizuj ustawienia. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Zobacz ten przewodnik, aby dowiedzieć się więcej</a> .'
+    twitter_config_warning: 'Serwer jest skonfigurowany tak, aby umożliwić rejestrację i logowanie za pomocą Twittera (enable_twitter_logins), ale klucz i tajne wartości nie są ustawione. Przejdź do <a href="%{base_path}/admin/site_settings">Ustawień witryny</a> i zaktualizuj ustawienia. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Zobacz ten przewodnik, aby dowiedzieć się więcej</a> .'
+    github_config_warning: 'Serwer jest skonfigurowany tak, aby umożliwić rejestrację i logowanie za pomocą GitHub (enable_github_logins), ale identyfikator klienta i tajne wartości nie są ustawione. Przejdź do <a href="%{base_path}/admin/site_settings">Ustawień witryny</a> i zaktualizuj ustawienia. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Zobacz ten przewodnik, aby dowiedzieć się więcej</a> .'
+    s3_config_warning: 'Serwer jest skonfigurowany do przesyłania plików do S3, ale nie ustawiono co najmniej jednego z następujących ustawień: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile lub s3_upload_bucket. Przejdź do <a href="%{base_path}/admin/site_settings">Ustawień witryny</a> i zaktualizuj ustawienia. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Zobacz „Jak skonfigurować przesyłanie zdjęć do S3?” aby dowiedzieć się więcej</a> .'
+    s3_backup_config_warning: 'Serwer jest skonfigurowany do przesyłania kopii zapasowych do S3, ale nie skonfigurowano co najmniej jednego z następujących ustawień: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile lub s3_backup_bucket. Przejdź do <a href="%{base_path}/admin/site_settings">Ustawień witryny</a> i zaktualizuj ustawienia. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Zobacz „Jak skonfigurować przesyłanie zdjęć do S3?” aby dowiedzieć się więcej</a> .'
+    image_magick_warning: 'Serwer jest skonfigurowany do tworzenia miniatur dużych obrazów, ale ImageMagick nie jest zainstalowany. Zainstaluj ImageMagick za pomocą swojego ulubionego menedżera pakietów lub <a href="https://www.imagemagick.org/script/download.php" target="_blank">pobierz najnowszą wersję</a> .'
+    failing_emails_warning: 'Istnieją zadania e-mail %{num_failed_jobs}, które się nie powiodły. Sprawdź plik app.yml i upewnij się, że ustawienia serwera poczty są prawidłowe. <a href="%{base_path}/sidekiq/retries" target="_blank">Zobacz nieudane prace w Sidekiq</a> .'
     subfolder_ends_in_slash: "Twoje ustawienie podfolderu jest niepoprawne; DISCOURSE_RELATIVE_URL_ROOT kończy się slashem."
     email_polling_errored_recently:
       one: "Email polling wygenerował %{count} błąd w przeciągu ostatniej doby. Więcej szczegółów w <a href='%{base_path}/logs' target='_blank'>logach</a>."
       few: "Email polling wygenerował %{count} błędy w przeciągu ostatniej doby. Więcej szczegółów w <a href='%{base_path}/logs' target='_blank'>logach</a>."
       many: "Email polling wygenerował %{count} błędów w przeciągu ostatniej doby. Więcej szczegółów w <a href='%{base_path}/logs' target='_blank'>logach</a>."
       other: "Email polling wygenerował %{count} błędów w przeciągu ostatniej doby. Więcej szczegółów w <a href='%{base_path}/logs' target='_blank'>logach</a>."
+    missing_mailgun_api_key: "Serwer jest skonfigurowany do wysyłania wiadomości e-mail za pośrednictwem Mailgun, ale nie podałeś klucza API używanego do weryfikacji wiadomości haka internetowego."
+    bad_favicon_url: "Favicon nie ładuje się. Sprawdź ustawienia favicon w <a href='%{base_path}/admin/site_settings'>Ustawieniach witryny</a> ."
+    deprecated_api_usage: "Wykryliśmy żądanie interfejsu API przy użyciu przestarzałej metody uwierzytelniania. Zaktualizuj go, aby używać <a href='https://meta.discourse.org/t/-/22706'>uwierzytelniania opartego na nagłówkach</a> . Po aktualizacji ten komunikat może zniknąć po 24 godzinach."
+    update_mail_receiver: "Wykryliśmy nieaktualną wersję programu odbierającego pocztę. Kliknij <a href='https://meta.discourse.org/t/-/133491'>tutaj,</a> aby uzyskać instrukcje aktualizacji. Po aktualizacji ten komunikat może zniknąć po 24 godzinach."
     poll_pop3_timeout: "Połączenie z serwerem POP3 zostało zerwane. Przychodząca wiadomość mogła nie zostać odebrany. Proszę sprawdź swoje <a href='%{base_path}/admin/site_settings/category/email'ustawienia POP3</a> i dostawcę usług."
     poll_pop3_auth_error: "Połączenie z serwerem POP3 nie powiodło się przez błąd uwierzytelnienia. Proszę sprawdź swoje <a href='%{base_path}/admin/site_settings/category/email'>ustawienia POP3</a>."
+    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łączony 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 obserwowanych słów %{action} jest nieprawidłowe. Sprawdź ustawienia <a href='%{base_path}/admin/logs/watched_words'>Obserwowanego słowa</a> lub wyłącz ustawienie witryny „obserwowane słowa wyrażenia regularne”."
   site_settings:
     censored_words: "Wskazane słowa będą automatycznie zamieniane na &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Automatycznie kasuj wpisy ukryte dłużej niż 30 dni."
+    default_locale: "Domyślny język tego wystąpienia dyskursu. Tekst kategorii i tematów generowanych przez system można zastąpić w opcji <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Dostosuj / Tekst</a> ."
     allow_user_locale: "Zezwól użytkownikom na zmianę języka interfejsu we własnych ustawieniach"
     set_locale_from_accept_language_header: "ustaw język interfejsu dla niezalogowanych użytkowników na podstawie języka w nagłówku ich przeglądarki. (EKSPERYMENTALNE, nie działa z anonimowym cache)"
+    support_mixed_text_direction: "Obsługa mieszanych wskazówek tekstowych od lewej do prawej i od prawej do lewej."
     min_post_length: "Minimalna długość wpisu w znakach"
     min_first_post_length: "Minimalna długość treści (liczba znaków) pierwszego wpisu w temacie "
     min_personal_message_post_length: "Minimalna długość treści wiadomości "
@@ -1231,25 +1378,39 @@ pl_PL:
     search_query_log_max_size: "Maksymalna liczba zapytań do zachowania"
     search_query_log_max_retention_days: "Maksymalny czas zachowywania wyników wyszukiwania, w dniach."
     search_ignore_accents: "Ignoruj akcenty przy szukaniu tekstu."
+    category_search_priority_very_low_weight: "Waga zastosowana w rankingu dla bardzo niskiego priorytetu wyszukiwania kategorii."
+    category_search_priority_low_weight: "Waga zastosowana w rankingu dla priorytetu wyszukiwania niskiej kategorii."
+    category_search_priority_high_weight: "Waga zastosowana w rankingu dla priorytetu wyszukiwania wysokiej kategorii."
+    category_search_priority_very_high_weight: "Waga zastosowana w rankingu dla bardzo wysokiego priorytetu wyszukiwania 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."
     unique_posts_mins: "Ile minut musi upłynąć zanim użytkownik będzie mógł 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 kluczowego kontaktu odpowiedzialnego za tę stronę. Służy do krytycznych powiadomień, a także w formularzu kontaktowym <a href='%{base_path}/about' target='_blank'>/ about</a> w pilnych sprawach."
+    contact_url: "Kontaktowy adres URL tej witryny. Używane w formularzu kontaktowym <a href='%{base_path}/about' target='_blank'>/ about</a> w pilnych sprawach."
     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."
     download_remote_images_threshold: "Minimalna ilość wolnego miejsca na dysku wymagana przez funkcję pobierania zdalnych grafik (w procentach)"
     download_remote_images_max_days_old: "Nie pobieraj zdalnych obrazów dla postów które mają więcej niż n dni."
     disabled_image_download_domains: "Zdalne grafiki z tych domen nie będą pobierane."
     editing_grace_period: "Przez (n) sekund po utworzeniu nowego wpisu jego kolejne edycje nie będą tworzyć nowych wersji w historii wpisu."
+    editing_grace_period_max_diff: "Maksymalna liczba zmian znaków dozwolona w okresie karencji edycji, jeśli więcej zmieniono, zapisz kolejną wersję postu (poziom zaufania 0 i 1)"
+    editing_grace_period_max_diff_high_trust: "Maksymalna liczba zmian znaków dozwolona w okresie karencji edycji, jeśli więcej zmieniono, zapisz kolejną wersję postu (poziom zaufania 2 i wyższy)"
+    staff_edit_locks_post: "Wpisy zostaną zablokowane przed edycją, jeśli będą edytowane przez członków personelu"
+    post_edit_time_limit: "Autor tl0 lub tl1 może edytować swój post przez (n) minut po opublikowaniu. Ustaw na zawsze na 0."
+    tl2_post_edit_time_limit: "Autor tl2 + może edytować swój post przez (n) minut po opublikowaniu. Ustaw na zawsze na 0."
     edit_history_visible_to_public: "Pozwól wszystkim przeglądać poprzednie wersje edytowanych wpisów. Gdy wyłączone, jedynie obsługa/staff może."
     delete_removed_posts_after: "Wpisy usunięte przez autora będą automatycznie zlikwidowane po (n) godzinach. Jeżeli liczba godzin będzie wynosić 0, to zostaną usunięte natychmiast. "
     max_image_width: "Maksymalna szerokość miniaturki grafiki we wpisie. "
     max_image_height: "Maksymalna wysokość miniaturki grafiki we wpisie. "
+    responsive_post_image_sizes: "Zmień rozmiar podglądu lightbox, aby umożliwić wyświetlanie ekranów o wysokiej rozdzielczości DPI o następujących proporcjach pikseli. Usuń wszystkie wartości, aby wyłączyć responsywne obrazy."
     fixed_category_positions: "Zaznacz, aby ręcznie ustawiać kolejność kategorii. Odznacz, aby kategorie były sortowane na podstawie aktywności. "
     fixed_category_positions_on_create: "Jeżeli jest sprawdzone to porządkowanie kategorii będzie zależało od stworzonego tematu (requires fixed_category_positions). "
     add_rel_nofollow_to_user_content: 'Dodaj rel nofollow do wszystkich treści użytkownika, poza wewnętrznymi linkami (wliczając domeny nadrzędne). Jeśli to zmienisz, musisz rebake wszystkie posty poprzez: "rake post:rebake"'
+    exclude_rel_nofollow_domains: "Lista domen, w których nofollow nie powinien być dodawany do linków. example.com automatycznie zezwoli również na sub.example.com. Jako minimum należy dodać domenę tej witryny, aby roboty indeksujące mogły znaleźć całą treść. Jeśli inne części witryny znajdują się w innych domenach, dodaj je również."
     post_excerpt_maxlength: "Maksymalna długość podsumowania / streszczenia wpisu."
     show_pinned_excerpt_mobile: "Pokaż fragment przypiętych tematów w widoku mobilnym"
     show_pinned_excerpt_desktop: "Pokaż fragment przypiętych tematów w widoku \"wersja komputerowa\""
@@ -1257,16 +1418,32 @@ pl_PL:
     onebox_domains_blacklist: "Lista domen które nigdy nie będą posegregowane. "
     inline_onebox_domains_whitelist: "Lista domen, które będą zamknięte w miniaturze jeśli zostały zalinkowane bez tytułu."
     enable_inline_onebox_on_all_domains: "Zignoruj inline_onebox_domain_whitelist strony ustawień i zezwól na wstawki onebox we wszystkich domenach."
+    force_custom_user_agent_hosts: "Hosty, dla których ma być używany niestandardowy klient użytkownika Onebox przy wszystkich żądaniach. (Szczególnie przydatne dla hostów, które ograniczają dostęp do agenta użytkownika)."
     max_oneboxes_per_post: "Masymalna ilość oneboxów w poście."
+    logo: "Obraz logo w lewym górnym rogu witryny. Użyj szerokiego prostokątnego obrazu o wysokości 120 i współczynniku kształtu większym niż 3: 1. Jeśli pole pozostanie puste, wyświetlony zostanie tekst tytułu witryny."
+    logo_small: "Mały obraz logo w lewym górnym rogu witryny, widoczny podczas przewijania w dół. Użyj kwadratowego obrazu 120 × 120. Jeśli pole pozostanie puste, wyświetlony zostanie glif domowy."
+    digest_logo: "Alternatywne logo użyte w górnej części podsumowania e-mail witryny. Użyj szerokiego obrazu prostokąta. Nie używaj obrazu SVG. Jeśli pole pozostanie puste, zostanie użyty obraz z ustawienia „logo”."
+    mobile_logo: "Logo używane w mobilnej wersji Twojej witryny. Użyj szerokiego prostokątnego obrazu o wysokości 120 i współczynniku kształtu większym niż 3: 1. Jeśli pole pozostanie puste, zostanie użyty obraz z ustawienia „logo”."
+    large_icon: "Obraz używany jako podstawa dla innych ikon metadanych. Idealnie powinna być większa niż 512 x 512. Jeśli pozostanie puste, zostanie użyte logo_small."
+    manifest_icon: "Obraz używany jako logo / obraz powitalny na Androidzie. Zostanie automatycznie zmieniony na 512 × 512. Jeśli pozostanie puste, zostanie użyty duży_plik."
+    favicon: "Ulubiony dla Twojej witryny, zobacz <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a> . Aby działać poprawnie na CDN, musi to być png. Zostanie przeskalowany do 32x32. Jeśli pozostanie puste, zostanie użyty duży_plik."
+    apple_touch_icon: "Ikona używana dla urządzeń Apple Touch. Zostanie automatycznie zmieniony na 180x180. Jeśli pozostanie puste, zostanie użyty duży_plik."
+    opengraph_image: "Domyślny obraz opengraph, używany, gdy strona nie ma innego odpowiedniego obrazu. Jeśli pozostanie puste, zostanie użyty duży_plik"
+    twitter_summary_large_image: "„Podsumowanie dużego obrazu” karty Twittera (powinno mieć co najmniej 280 szerokości i co najmniej 150 wysokości). Jeśli pole pozostanie puste, generowane są zwykłe metadane karty przy użyciu opengraph_image."
     notification_email: "Adres z którego wysyłane będą wszystkie istotne emaile systemowe.\nKonieczna jest poprawna konfiguracja rekordów SPF, DKIM oraz zwrotnego PTR użytej domeny."
     email_custom_headers: "A pipe-delimited list of custom email headers"
+    email_subject: "Konfigurowalny format tematyczny dla standardowych e-maili. Zobacz <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: "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: "Zmusza użytkowników do włączenia uwierzytelniania drugiego czynnika. Wybierz „wszystkie”, aby wymusić to na wszystkich użytkownikach. Wybierz „personel”, aby wymusić to tylko dla użytkowników 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ś 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 tych samych plików cookies, eliminują one wszystkie wektory Cross Site Request Forgery na wspieranych przeglądarkach (Lax lub Strict). Ostrzeżenie: Przeglądarka Strict działa jedynie na stronach, które wymagają logowania oraz używają SSO."
     summary_score_threshold: "Minimalny wynik wpisu wymagany do umieszczenia go w 'Podsumowaniu tematu'"
-    summary_posts_required: "Minimalna liczba wpisów w temacie zanim 'Podsumowanie tematu' jest dostępne"
-    summary_likes_required: "Minimalna liczba polubień w temacie zanim 'Podsumowanie tematu' jest dostępne"
+    summary_posts_required: "Minimalna liczba postó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."
     summary_percent_filter: "Gdy użytkownik kliknie na 'Podsumowaniu tematu', pokaż % najlepszych wpisów"
+    summary_max_results: "Maksymalna liczba postów zwróconych przez „Podsumuj ten temat”"
     enable_personal_messages: "Zezwalaj użytkownikom o poziomie zaufania 1 (możliwe do zmiany przez min trust level to send messages) na tworzenie wiadomości i odpowiadanie na nie. Zwróć uwagę, że administracja zawsze może wysyłać wiadomości bez względu na wszystko."
+    enable_system_message_replies: "Pozwala użytkownikom odpowiadać na wiadomości systemowe, nawet jeśli wiadomości osobiste są wyłączone"
     enable_long_polling: "Message bus used for notification can use long polling"
     long_polling_base_url: "Podstawowy URL używany dla long polling (kiedy CDN dostarcza dynamicznych treści, upewnij się że ustawiłeś to w origin pull) np.: http://origin.site.com"
     long_polling_interval: "Okres czasu jaki serwer powinien odczekać przed odpowiedzią klientowi kiedy nie ma danych do przesłania (tylko do zalogowanych użytkowników)"
@@ -1274,80 +1451,149 @@ pl_PL:
     anon_polling_interval: "How often should anonymous clients poll in milliseconds"
     background_polling_interval: "Jak często klienci powinni poll w milisekundach (kiedy okno jest w tle)"
     hide_post_sensitivity: "Prawdopodobieństwo, że flagowany wpis zostanie ukryty"
+    silence_new_user_sensitivity: "Prawdopodobieństwo, że nowy użytkownik zostanie uciszony na podstawie flag spamu"
+    auto_close_topic_sensitivity: "Prawdopodobieństwo, że oflagowany temat zostanie automatycznie zamknięty"
     cooldown_minutes_after_hiding_posts: "Liczba minut, ile musi odczekać użytkownik, zanim będzie mógł edytować post ukryty w wyniku oflagowania przez społeczność"
     max_topics_in_first_day: "Maksymalna liczba tematów, jakie może stworzyć użytkownik w trakcie 24 godzin po utworzeniu pierwszego posta"
     max_replies_in_first_day: "Maksymalna liczba odpowiedzi, jakie może stworzyć użytkownik w trakcie 24 godzin po utworzeniu pierwszego posta"
     tl2_additional_likes_per_day_multiplier: "Zwiększ limit lajków na dzień dla tl2 (członek), mnożąc przez tę liczbę"
     tl3_additional_likes_per_day_multiplier: "Zwiększ limit lajków na dzień dla tl3 (użytkownik stały), mnożąc przez tę liczbę"
     tl4_additional_likes_per_day_multiplier: "Zwiększ limit lajków na dzień dla tl4 (lider), mnożąc przez tę liczbę"
+    num_users_to_silence_new_user: "Jeśli posty nowego użytkownika otrzymają znaczniki spamu num_spam_flags_to_silence_new_user od wielu różnych użytkowników, ukryj wszystkie ich posty i zapobiegaj publikowaniu w przyszłości. 0, aby wyłączyć."
+    num_tl3_flags_to_silence_new_user: "Jeśli posty 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 posty i zapobiegaj publikowaniu w przyszłości. 0, aby wyłączyć."
+    num_tl3_users_to_silence_new_user: "Jeśli posty 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 posty i zapobiegaj publikowaniu w przyszłości. 0, aby wyłączyć."
+    notify_mods_when_user_silenced: "Jeśli użytkownik zostanie automatycznie wyciszony, wyślij wiadomość do wszystkich moderatorów."
+    flag_sockpuppets: "Jeśli nowy użytkownik odpowiada na temat z tego samego adresu IP, co użytkownik, który rozpoczął ten temat, oflaguj oba jego posty jako potencjalny spam."
     traditional_markdown_linebreaks: "Używaj tradycyjnych znaków końca linii w Markdown, to znaczy dwóch spacji na końcu linii."
+    enable_markdown_typographer: "Użyj reguł typografii, aby poprawić czytelność tekstu: zamień proste cudzysłowy „na nawiasy”, (c) (tm) na symbole, - za pomocą emdash - itp."
+    enable_markdown_linkify: "Automatycznie traktuj tekst, który wygląda jak link, jako link: www.example.com i https://example.com zostaną automatycznie połączone"
+    markdown_linkify_tlds: "Lista domen najwyższego poziomu, które są automatycznie traktowane jako linki"
+    markdown_typographer_quotation_marks: "Lista par zastępujących podwójne i pojedyncze cytaty"
     post_undo_action_window_mins: "Przez tyle minut użytkownicy mogą cofnąć swoje ostatnie działania przy danym poście (lajki, flagowanie, itd.)."
     must_approve_users: "Zespół musi zaakceptować wszystkie nowe konta zanim uzyskają dostęp do serwisu."
+    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."
     pending_users_reminder_delay: "Powiadomić moderatorów jeżeli nowi użytkownicy czekali na zatwierdzenie dłużej niż his mamy godzin. Ustaw -1 aby wyłączyć powiadomienia. "
     maximum_session_age: "Użytkownik zostanie zalogowany przez n godzin od czasu ostatniej wizyty."
+    ga_universal_tracking_code: "Identyfikator kodu śledzenia Google Universal Analytics (analytics.js), np .: UA-12345678-9; patrz <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_domain_name: "Nazwa domeny Google Universal Analytics (analytics.js), np .: mysite.com; patrz <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_auto_link_domains: "Włącz śledzenie w wielu domenach Google Universal Analytics (analytics.js). W linkach wychodzących do tych domen zostanie dodany identyfikator klienta. Zobacz <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>przewodnik śledzenia między domenami Google.</a>"
+    gtm_container_id: "Identyfikator kontenera Menedżera tagów Google. np .: GTM-ABCDEF. <br/> Uwaga: skrypty innych firm ładowane przez GTM mogą wymagać dodania do białej listy w „skrypcie polityki bezpieczeństwa treści 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_create_categories: "Zezwól moderatorom na tworzenie nowych kategorii"
     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_whitelist: "Administratorzy mogą się logować tylko z adresów IP zdefiniowanych w liście Screened IPs (Admin > Logi > Screened Ips)."
     blacklist_ip_blocks: "Lista zablokowanych prywatnych adresów IP, które nigdy nie powinny być przeszukiwane przez Discourse."
     whitelist_internal_hosts: "Lista wewnętrznych hostów, które są bezpieczne dla discourse, jeśli chodzi o oneboxing i inne cele"
+    allowed_iframes: "Lista prefiksów domeny src iframe, które dyskurs może bezpiecznie dopuścić w postach"
+    whitelisted_crawler_user_agents: "Agenty użytkownika dla robotów indeksujących, które powinny mieć dostęp do strony. OSTRZEŻENIE! USTAWIENIE TEGO BĘDZIE NIEWIELKIE WSZYSTKIEGO PRZETWORNICY NIE WYMIENIONE TUTAJ!"
+    blacklisted_crawler_user_agents: "Unikatowe słowo bez rozróżniania wielkości liter w ciągu agenta użytkownika identyfikujące przeszukiwacze sieci, które nie powinny mieć dostępu do witryny. Nie dotyczy, jeśli zdefiniowano białą listę."
+    slow_down_crawler_user_agents: "Programy klienckie robotów indeksujących, które powinny mieć ograniczoną szybkość w pliku robots.txt, korzystając z dyrektywy o opóźnieniu indeksowania"
+    slow_down_crawler_rate: "Jeśli określono parametr slow_down_crawler_user_agents, ta stawka będzie obowiązywać dla wszystkich robotów (liczba sekund opóźnienia między żądaniami)"
+    content_security_policy: "Włącz politykę bezpieczeństwa treści"
+    content_security_policy_report_only: "Włącz tylko treść-bezpieczeństwo-zasady-tylko raport"
+    content_security_policy_collect_reports: "Włącz zbieranie raportów o naruszeniach CSP na / csp_reports"
+    content_security_policy_script_src: "Dodatkowe źródła skryptów na białej liście. Bieżący host i CDN są domyślnie dołączone. Zobacz <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Ograniczanie ataków XSS za pomocą zasad bezpieczeństwa treści.</a>"
+    invalidate_inactive_admin_email_after_days: "Konta administracyjne, które nie odwiedzały witryny w tej liczbie dni, będą musiały ponownie zweryfikować swój adres e-mail przed zalogowaniem. Ustaw na 0, aby wyłączyć."
     top_menu: "Określ które elementy nawigacyjne serwisu powinny być widoczne i w jakiej kolejności. Przykład aktualne|nowe|nieodczytane|kategorie|top|przeczytane|wysłane|zakładki"
     post_menu: "Określ które elementy menu wpisu powinny być widoczne i w jakiej kolejności. Przykład like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Elementy w menu, które w menu posta będą ukryte, chyba że kliknięty zostanie przycisk rozwijania."
     share_links: "Określ które elementy menu udostępniania powinny być widoczne i w jakiej kolejności. "
     site_contact_username: "Nazwa użytkownika, spod której wysyłane będą automatyczne wiadomości. Jeśli pusta, użyte będzie domyślne konto System."
+    site_contact_group_name: "Prawidłowa nazwa grupy, do której zostaną zaproszone wszystkie automatyczne wiadomości."
     send_welcome_message: "Wyślij wszystkim nowym użytkownikom powitalną wiadomość z krótkim przewodnikiem."
+    send_tl1_welcome_message: "Wyślij wiadomość powitalną do nowych użytkowników poziomu zaufania 1."
     suppress_reply_directly_below: "Nie pokazuj rozwijanej liczby odpowiedzi przy poście, gdy jest tylko jedna odpowiedź bezpośrednio pod tym postem."
     suppress_reply_directly_above: "Nie pokazuj rozwijanego \"w odpowiedzi na\" przy poście, gdy jest tylko jedna odpowiedź bezpośrednio nad tym postem."
+    remove_full_quote: "Automatycznie usuwaj pełne cytaty z bezpośrednich odpowiedzi."
     suppress_reply_when_quoting: "Nie pokazuj rozwijanego \"w odpowiedzi na\" przy poście, gdy w poście zacytowano odpowiedź."
     max_reply_history: "Maksymalna liczba odpowiedzi, dla której \"w odpowiedzi na\" będzie się rozwijać."
     topics_per_period_in_top_summary: "Liczba tematów wyświetlanych w domyślnym podsumowaniu najbardziej popularnych wątków"
     topics_per_period_in_top_page: "Liczba tematów wyświetlanych w widoku 'Pokaż więcej' na ekranie popularnych wątków."
     redirect_users_to_top_page: "Automatycznie kieruj nowych i długo nieobecnych użytkowników na stronę główną."
     top_page_default_timeframe: "Domyślne ramy czasowe dla strony widoku z góry."
+    moderators_view_emails: "Zezwalaj moderatorom na przeglądanie wiadomości e-mail użytkowników"
     prioritize_username_in_ux: "Pokaż nazwę użytkownika jako pierwszą na stronie użytkownika, karcie użytkownika i w postach (kiedy wyłączone imię jest pokazane jako pierwsze)"
+    enable_rich_text_paste: "Włącz automatyczną konwersję HTML do Markdown podczas wklejania tekstu do kompozytora. (Eksperymentalny)"
     email_token_valid_hours: "Tokeny resetujące hasło / aktywujące konto są ważne przez (n) godzin."
     enable_badges: "Włącz system odznak"
     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> ."
     email_domains_blacklist: "Lista rozdzielonych pionową kreską domen e-mail, z których użytkownicy nie mogą się rejestrować. Przykład: mailinator.com|trashmail.net"
     email_domains_whitelist: "Lista rozdzielonych pionową kreską domen e-mail, z których użytkownicy MUSZĄ się rejestrować. UWAGA: Użytkownicy z domenami e-mail innymi niż wypisane nie będą dopuszczeni!"
+    auto_approve_email_domains: "Użytkownicy z adresami e-mail z tej listy domen zostaną automatycznie zatwierdzeni."
+    hide_email_address_taken: "Nie informuj użytkowników, że istnieje konto z danym adresem e-mail podczas rejestracji i z formularza zapomnianego hasła."
     log_out_strict: "Po wylogowaniu wyloguj WSZYSTKIE sesje użytkownika na wszystkich urządzeniach."
+    version_checks: "Wyślij ping do Discourse Hub w celu uzyskania aktualizacji wersji i pokaż komunikaty o nowej wersji na pulpicie <a href='%{base_path}/admin' target='_blank'>/ admin</a>"
     new_version_emails: "Wyślij email na adres contact_email, kiedy nowa wersja Discourse będzie dostępna."
     invite_expiry_days: "Jak długo klucz zaproszenie użytkownika jest ważny, w dniach."
+    invite_only: "Wszyscy nowi użytkownicy muszą być wyraźnie zaproszeni przez zaufanych użytkowników lub personel. Rejestracja publiczna jest wyłączona."
     login_required: "Wymagaj autoryzacji do wyświetlenia zawartości strony, zablokuj możliwość anonimowego dostępu."
     min_username_length: "Minimalna długość nazwy użytkownika w znakach. OSTRZEŻENIE: jeśli jacykolwiek istniejący użytkownicy lub grupy mają nazwy krótsze niż ta, twój serwis się uszkodzi!"
     max_username_length: "Maksymalna długość nazwy użytkownika w znakach. OSTRZEŻENIE: jeśli jacykolwiek istniejący użytkownicy lub grupy mają nazwy dłuższe niż ta, twój serwis się uszkodzi!"
+    unicode_usernames: "Pozwól, aby nazwy użytkowników i nazwy grup zawierały litery i cyfry Unicode."
+    unicode_username_character_whitelist: "Wyrażenie regularne pozwalające na używanie tylko niektórych znaków Unicode w nazwach użytkowników. Litery i cyfry ASCII będą zawsze dozwolone i nie trzeba ich umieszczać na białej liście."
     reserved_usernames: "Nazwy użytkowników, które są niedostępne przy rejestracji. Symbol dzikiej karty * może zostać użyty, aby dopasować do argumentu zero lub więcej razy."
     min_password_length: "Minimalna długość hasła."
     min_admin_password_length: "Minimalna długość hasła dla Admina."
     password_unique_characters: "Minimalna ilość różnych znaków, które muszą być w haśle."
     block_common_passwords: "Nie zezwalaj na hasła znajdujące się w grupie 10 000 najpopularniejszych haseł."
     enable_sso: "Włącz pojedyncze logowanie przez zewnętrzną stronę (UWAGA: ADRESY E-MAIL UŻYTKOWNIKÓW *MUSZĄ* BYĆ ZATWIERDZONE PRZEZ ZEWNĘTRZNĄ STRONĘ!)"
+    verbose_sso_logging: "Rejestruj pełną diagnostykę związaną z jednokrotnym logowaniem do <a href='%{base_path}/logs' target='_blank'>/ logs</a>"
+    enable_sso_provider: "Wdrożenie protokołu dostawcy SSO Discourse w punkcie końcowym / session / sso_provider, wymaga ustawienia sso_provider_secrets"
     sso_url: "URL endpoint pojedynczego logowania (musi zawierać http:// lub https://)"
     sso_secret: "Tajny ciąg znaków używany, aby kryptograficznie uwierzytelnić informacje SSO, powinien mieć 10 lub więcej znaków."
+    sso_provider_secrets: "Lista par tajnych domen, które używają Discourse jako dostawcy SSO. Upewnij się, że klucz SSO ma 10 znaków lub więcej. Symbol wieloznaczny * może być używany do dopasowania dowolnej domeny lub tylko jej części (np. * .Example.com)."
     sso_overrides_bio: "Nadpisuje biografię użytkownika w jego profilu i uniemożliwia mu zmianę biografii."
+    sso_overrides_groups: "Zsynchronizuj wszystkie ręczne członkostwo w grupach z grupami określonymi w atrybucie sso grup (OSTRZEŻENIE: jeśli nie określisz grup, każde ręczne członkostwo w grupie zostanie usunięte dla użytkownika)"
     sso_overrides_email: "Nadpisuje lokalny email poprzez zewnętrzną witrynę email z SSO przy każdym logowaniu, aby zapobiec lokalnym zmianom. (Ostrzeżenie: rozbieżności mogą pojawić się w związku z normalizacją lokalnym emaili)."
     sso_overrides_username: "Nadpisuje lokalne nazwy użytkowników z pomocą nazw użytkowników z zewnętrznej strony przez SSO przy każdym logowaniu i zapobiega lokalnym zmianom. (Ostrzeżenie: rozbieżności mogą pojawić się w związku z różnicami w długością/wymaganiami nazwy użytkownika)"
     sso_overrides_name: "Nadpisuje lokalną pełną nazwę za pomocą pełnych nazw z zewnętrznej strony przez SSO przy każdym logowaniu i zapobiega lokalnym zmianom."
+    sso_overrides_avatar: "Zastępuje awatar użytkownika zewnętrznym awatarem strony z ładunku SSO. Jeśli ta opcja jest włączona, użytkownicy nie będą mogli przesyłać awatarów na dyskurs."
+    sso_overrides_profile_background: "Zastępuje tło profilu użytkownika awatarem strony zewnętrznej z ładunku SSO."
+    sso_overrides_card_background: "Zastępuje tło karty użytkownika awatarem strony zewnętrznej z ładunku SSO."
     sso_not_approved_url: "Przekieruj niezatwierdzone konta SSO na ten URL"
     sso_allows_all_return_paths: "Nie ograniczaj domen dla return_paths dostarczanych przez SSO (domyślnie zwracana ścieżka musi być na aktualnej stronie)"
+    enable_local_logins: "Włącz konta oparte na lokalnej nazwie użytkownika i haśle. To musi być włączone dla zaproszeń do pracy. OSTRZEŻENIE: jeśli wyłączone, logowanie może być niemożliwe, jeśli wcześniej nie skonfigurowano co najmniej jednej alternatywnej metody logowania."
+    enable_local_logins_via_email: "Zezwalaj użytkownikom na żądanie linku logowania do jednego kliknięcia, który zostanie im przesłany pocztą e-mail."
     allow_new_registrations: "Zezwól na rejestrację nowych użytkowników. Odznacz opcję żeby uniemożliwić rejestrację nowych kont."
     enable_signup_cta: "Pokazuj wiadomość dla powracających użytkowników anonimowych, zachęcającą ich do założenia konta."
+    enable_google_oauth2_logins: "Włącz uwierzytelnianie Google Oauth2. Jest to metoda uwierzytelniania obsługiwana obecnie przez Google. Wymaga klucza i tajemnicy. Zobacz <a href='https://meta.discourse.org/t/15858' target='_blank'>Konfigurowanie logowania Google do dyskursu</a> ."
     google_oauth2_client_id: "Client ID twojej aplikacji w Google"
     google_oauth2_client_secret: "Client Secret twojej aplikacji w Google"
+    google_oauth2_prompt: "Opcjonalna lista wartości łańcuchowych rozdzielanych spacjami, która określa, czy serwer autoryzacji monituje użytkownika o ponowne uwierzytelnienie i zgodę. Możliwe wartości można znaleźć na <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> ."
+    google_oauth2_hd: "Opcjonalna domena Google Apps Hosted, do której logowanie będzie ograniczone. Więcej informacji można znaleźć na <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a>"
+    enable_twitter_logins: "Włącz uwierzytelnianie na Twitterze, wymaga twitter_consumer_key i twitter_consumer_secret. Zobacz <a href='https://meta.discourse.org/t/13395' target='_blank'>Konfigurowanie logowania na Twitterze (i bogatych osadzeń) dla dyskursu</a> ."
+    twitter_consumer_key: "Klucz klienta do uwierzytelnienia na Twitterze, zarejestrowany na <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
+    twitter_consumer_secret: "Sekret klienta dotyczący uwierzytelniania na Twitterze, zarejestrowany na <a href='https://developer.twitter.com/apps' target='_blank'>stronie https://developer.twitter.com/apps</a>"
     enable_instagram_logins: "Włącz uwierzytelnienie za pomocą Instagramu, wymaga instagram_consumer_key i instagram_consumer_secret."
     instagram_consumer_key: "Klucz konsumenta dla uwierzytelnienia Instragram"
     instagram_consumer_secret: "Sekret konsumenta dla uwierzytelnienia Instragram"
+    enable_facebook_logins: "Włącz uwierzytelnianie na Facebooku, wymaga facebook_app_id i facebook_app_secret. Zobacz <a href='https://meta.discourse.org/t/13394' target='_blank'>Konfigurowanie logowania na Facebooku dla dyskursu</a> ."
+    facebook_app_id: "Identyfikator aplikacji do uwierzytelniania na Facebooku, zarejestrowany na <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
+    facebook_app_secret: "Tajna aplikacja do uwierzytelniania na Facebooku, zarejestrowana na <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
+    enable_github_logins: "Włącz uwierzytelnianie Github, wymaga github_client_id i github_client_secret. Zobacz <a href='https://meta.discourse.org/t/13745' target='_blank'>Konfigurowanie logowania do GitHub dla dyskursu</a> ."
+    github_client_id: "Identyfikator klienta dla uwierzytelnienia Github, zarejestrowany na <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    github_client_secret: "Tajny klucz klienta dla uwierzytelnienia Github, zarejestrowany na <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    enable_discord_logins: "Zezwolić użytkownikom na uwierzytelnianie przy użyciu Discord?"
+    discord_client_id: 'Identyfikator klienta Discord (potrzebujesz jednego? Odwiedź <a href="https://discordapp.com/developers/applications/me">portal dewelopera Discord</a> )'
     discord_secret: "Sekretny klucz Discorda"
-    readonly_mode_during_backup: "Włącz tryb tylko do odczytu podczas wykonywania kopii zapasowej"
+    discord_trusted_guilds: 'Zezwalaj tylko członkom tych gildii Discord na logowanie się za pośrednictwem Discord. Użyj identyfikatora numerycznego gildii. Aby uzyskać więcej informacji, sprawdź instrukcje <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">tutaj</a> . Pozostaw puste, aby zezwolić dowolnej gildii.'
+    enable_backups: "Pozwól administratorom tworzyć kopie zapasowe forum"
     allow_restore: "Dopuść przywracanie, które może zamienić WSZYSTKIE dane strony! Zostaw fałsz, 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."
     s3_backup_bucket: "Zdalne wiadro do przechowywania kopii zapasowych. UWAGA: Upewnij się, że jest to wiadro prywatne."
+    s3_endpoint: "Punkt końcowy można zmodyfikować, aby utworzyć kopię zapasową w usłudze zgodnej z S3, takiej jak DigitalOcean Spaces lub Minio. OSTRZEŻENIE: Pozostaw puste, jeśli używasz AWS S3."
+    s3_configure_tombstone_policy: "Włącz zasady automatycznego usuwania przy przesyłaniu nagrobków. WAŻNE: Jeśli ta opcja jest wyłączona, nie zostanie odzyskane żadne miejsce po usunięciu przesłanych plików."
     s3_disable_cleanup: "Dezaktywuj usuwanie kopii zapasowych z S3 kiedy usunięte lokalnie."
+    enable_s3_inventory: "Generuj raporty i weryfikuj przesyłane materiały za pomocą zasobów Amazon S3. WAŻNE: wymaga prawidłowych poświadczeń S3 (zarówno identyfikator klucza dostępu, jak i tajny klucz dostępu)."
     backup_time_of_day: "Godzina (UTC) wykonania kopii zapasowej."
     backup_with_uploads: "Uwzględniaj przesyły w zaplanowanych backupach. Wyłączenie tej opcji spowoduje backup jedynie bazy danych."
+    backup_location: "Miejsce przechowywania kopii zapasowych. WAŻNE: S3 wymaga prawidłowych poświadczeń S3 wprowadzonych w ustawieniach plików."
     backup_gzip_compression_level_for_uploads: "Poziom kompresji gzip używany przy kompresowaniu wgranych plików."
+    include_thumbnails_in_backups: "Uwzględnij wygenerowane miniatury w kopiach zapasowych. Wyłączenie tego spowoduje, że kopie zapasowe będą mniejsze, ale wymaga ponownego wygenerowania wszystkich postów po przywróceniu."
     active_user_rate_limit_secs: "How frequently we update the 'last_seen_at' field, in seconds"
     verbose_localization: "Wyświetlaj dodatkowe identyfikatory tłumaczeń w treści etykiet"
     previous_visit_timeout_hours: "How long a visit lasts before we consider it the 'previous' visit, in hours"
@@ -1374,6 +1620,7 @@ pl_PL:
     max_post_deletions_per_day: "Maksymalna liczba wpisów, które użytkownik może usunąć jednego dnia."
     alert_admins_if_errors_per_minute: "Liczba błędów na minutę do zaalarmowania admina. Wartość 0 wyłącza tę funkcjonalność. UWAGA: wymaga restartu."
     alert_admins_if_errors_per_hour: "Liczba błędów na godzinę do zaalarmowania admina. Wartość 0 wyłącza tę funkcjonalność. UWAGA: wymaga restartu."
+    categories_topics: "Liczba tematów do wyświetlenia na stronie / kategorie. Jeśli ustawione na 0, automatycznie spróbuje znaleźć wartość, aby utrzymać dwie kolumny symetryczne (kategorie i tematy)."
     suggested_topics: "Liczba sugerowanych tematów widocznych na końcu aktualnego tematu."
     limit_suggested_to_category: "Sugeruj tematy jedynie z tej samej kategorii."
     suggested_topics_max_days_old: "Sugerowane tematy nie powinny być starsze niż n dni."
@@ -1383,17 +1630,24 @@ pl_PL:
     purge_deleted_uploads_grace_period_days: "Okres karencji (w dniach) przed usunięciem upload zostanie skasowany."
     purge_unactivated_users_grace_period_days: "Okres karencji w dniach, po upływie którego nieaktywowane konto użytkownika zostaje usunięte. Ustaw 0, by nigdy nie usuwań nieaktywnych użytkowników."
     enable_s3_uploads: "Umieść przesyły w pamięci Amazon S3. Ważne: wymaga ważnych danych uwierzytelniających (zarówno klucza id i tajnego klucza dostępu)"
+    s3_use_iam_profile: 'Użyj <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">profilu instancji AWS EC2,</a> aby przyznać dostęp do segmentu S3. UWAGA: włączenie tej opcji wymaga, aby dyskurs działał w odpowiednio skonfigurowanej instancji EC2 i zastępuje ustawienia „Identyfikatora klucza dostępu s3” i „Tajnego klucza dostępu s3”.'
     s3_upload_bucket: "Nazwa koszyka Amazon S3, do którego zostaną przesłane pliki. Ostrzeżenie: bez wielkich liter, kropek czy podkreślenia."
+    s3_access_key_id: "Identyfikator klucza dostępu Amazon S3, który będzie używany do przesyłania zdjęć, załączników i kopii zapasowych."
+    s3_secret_access_key: "Tajny klucz dostępu Amazon S3, który będzie używany do przesyłania zdjęć, załączników i kopii zapasowych."
+    s3_region: "Nazwa regionu Amazon S3, która będzie używana do przesyłania zdjęć i kopii zapasowych."
     s3_cdn_url: "URL CDN używany dla wszystkich aktywów s3 (na przykład : https://cdn.somewhere.com). Ostrzeżenie: po zmianie tego ustawienia musisz ponownie przywrócić stare posty."
     avatar_sizes: "Lista automatycznie wygenerowanych rozmiarów awatarów."
     external_system_avatars_enabled: "Użyj zewnętrzny system awatarów."
     external_system_avatars_url: "Adres URL zewnętrznego dostawcy awatarów. Dozwolone podstawienia: {username} {first_letter} {color} {size}"
+    restrict_letter_avatar_colors: "Lista 6-cyfrowych szesnastkowych wartości kolorów, które mają być używane jako tło awatara."
     selectable_avatars_enabled: "Wymuś na użytkownikach wybieranie awatara z listy."
     selectable_avatars: "Lista awatarów, z których mogą wybierać użytkownicy."
     allow_all_attachments_for_group_messages: "Zezwól na wszystkie załączniki email dla wiadomości grupowych."
     png_to_jpg_quality: "Jakość skonwertowanego pliku JPG (1 to najniższa jakość, 99 to najlepsza jakość, 100 aby dezaktywować)."
     allow_staff_to_upload_any_file_in_pm: "Pozwól personelowi przesyłać pliki w wiadomościach."
     strip_image_metadata: "Pasek metadanych obrazu."
+    min_ratio_to_crop: "Współczynnik stosowany do przycinania wysokich zdjęć. Wpisz wynik szerokości / wysokości."
+    simultaneous_uploads: "Maksymalna liczba plików, które można przeciągnąć i upuścić w kompozytorze"
     enable_flash_video_onebox: "Włącz osadzanie linków swf i flv (Adobe Flash) za pomocą funkcji onebox. Ostrzeżenie: może powodować pewne ryzyko związane z bezpieczeństwem."
     default_invitee_trust_level: "Domyślny poziom zaufania (0-4) dla zaproszonych użytkowników."
     default_trust_level: "Domyślny poziom zaufania (0-4) dla wszystkich nowych użytkowników. Zmienianie tego narażą na ryzyko sporej ilości Spamu."
@@ -1421,6 +1675,7 @@ pl_PL:
     tl3_requires_likes_given: "Minimalna liczba polubień, które muszą zostać rozdane w ostatnich (tl3 okres) dniach, aby zakwalifikować się do awansu na poziom zaufania 3."
     tl3_requires_likes_received: "Minimalna liczba polubień, które użytkownik musi otrzymać w ostatnich (tl3 okres) dniach, aby zakwalifikować się do awansu na poziom zaufania 3."
     tl3_links_no_follow: "Nie usuwaj rel=nofollow z linków od użytkowników z trzecim poziomem zaufania."
+    trusted_users_can_edit_others: "Zezwalaj użytkownikom o wysokim poziomie zaufania na edycję treści od innych użytkowników"
     min_trust_to_create_topic: "The minimum trust level required to create a new topic."
     allow_flagging_staff: "Jeżeli włączone, użytkownicy mogą flagować wpisy członków zespołu."
     min_trust_to_edit_wiki_post: "Minimalny poziom zaufania wymagany do edycji posta oznaczonego jako wiki."
@@ -1429,6 +1684,8 @@ pl_PL:
     min_trust_to_send_messages: "Minimalny poziom zaufania wymagany do tworzenia wiadomości prywatnych."
     min_trust_to_flag_posts: "Minimalny poziom zaufania potrzebny do flagowania postów"
     min_trust_to_post_links: "Minimalny poziom zaufania potrzebny do umieszczania linków we wpisach"
+    min_trust_to_post_images: "Minimalny poziom zaufania wymagany do umieszczenia zdjęć w poście"
+    whitelisted_link_domains: "Domeny, do których użytkownicy mogą prowadzić linki, nawet jeśli nie mają odpowiedniego poziomu zaufania do publikowania linków"
     newuser_max_links: "Ile linków może dodać nowy użytkownik do posta."
     newuser_max_images: "Ile obrazów może dodać nowy użytkownik do posta."
     newuser_max_attachments: "Ile załączników może dodać nowy użytkownik do posta."
@@ -1446,15 +1703,22 @@ pl_PL:
     title_min_entropy: "Minimalna entropia tytułu wątku (liczba różnych znaków, zaleca się więcej dla języków innych niż angielski)."
     body_min_entropy: "Minimalna entropia treści posta (liczba różnych znaków, zaleca się więcej dla języków innych niż angielski)."
     allow_uppercase_posts: "Zezwól na same wielkie litery w tytule tematu lub treści postu."
+    max_consecutive_replies: "Liczba postów, które użytkownik musi wykonać w jednym rzędzie w temacie, zanim nie będzie można dodać kolejnej odpowiedzi."
+    title_fancy_entities: "Konwertuj typowe znaki ASCII na fantazyjne jednostki HTML w tytułach tematów, ala SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "Minimalna długość tytułu zanim zostanie sprawdzony z podobnymi tematami."
     desktop_category_page_style: "Styl wizualny dla strony kategorii."
     category_colors: "Lista kolorów w formacie hex do użycia w etykietach kategorii."
     category_style: "Styl etykiet kategorii"
+    max_image_size_kb: "Maksymalny rozmiar przesyłanego obrazu w kB. Należy to również skonfigurować w nginx (rozmiar_maks_komputera_ klienta) / apache lub proxy. Obrazy większe niż to i mniejsze niż client_max_body_size zostaną przeskalowane, aby zmieściły się podczas przesyłania."
     max_attachment_size_kb: "Maksymalny rozmiar załącznika w kB. Należy to także skonfigurować dla serwera nginx (client_max_body_size) / Apache lub dla proxy."
     authorized_extensions: "Lista dozwolonych rozszerzeń plików (gwiazdka \"*\" oznacza wszystkie typy plików)"
+    authorized_extensions_for_staff: "Lista rozszerzeń plików dozwolonych do przesłania dla użytkowników personelu oprócz listy zdefiniowanej w ustawieniach witryny „uprawnione_rozszerzenia”. (użyj „*”, aby włączyć wszystkie typy plików)"
     theme_authorized_extensions: "Lista dozwolonych rozszerzeń plików dla przesyłania szablonów (gwiazdka \"*\" oznacza wszystkie typy plików)"
     max_similar_results: "Liczba podobnych wątków, jaka zostanie wyświetlona nad oknem edytora podczas tworzenia nowego wątku. Wątki są porównywane na podstawie tytułów i treści."
+    max_image_megapixels: "Maksymalna liczba megapikseli dozwolona dla obrazu. Obrazy o większej liczbie megapikseli zostaną odrzucone."
     title_prettify: "Prevent common title typos and errors, including all caps, lowercase first character, multiple ! and ?, extra . at end, etc."
+    title_remove_extraneous_space: "Usuń wiodące białe znaki przed interpunkcją końcową."
+    automatic_topic_heat_values: 'Automatycznie aktualizuj ustawienia „widok tematów ciepło” i „post temat jak ciepło” na podstawie aktywności na stronie.'
     topic_views_heat_low: "Po tylu wyświetleniach liczba wyświetleń zostanie lekko wyróżniona."
     topic_views_heat_medium: "Po tylu wyświetleniach liczba wyświetleń zostanie wyróżniona."
     topic_views_heat_high: "Po tylu wyświetleniach liczba wyświetleń zostanie mocno wyróżniona."
@@ -1470,6 +1734,7 @@ pl_PL:
     faq_url: "If you have a FAQ hosted elsewhere that you want to use, provide the full URL here."
     tos_url: "If you have a Terms of Service document hosted elsewhere that you want to use, provide the full URL here."
     privacy_policy_url: "If you have a Privacy Policy document hosted elsewhere that you want to use, provide the full URL here."
+    log_anonymizer_details: "Określa, czy zachować dane użytkownika w dzienniku po ich anonimizacji. Aby zachować zgodność z RODO, musisz to wyłączyć."
     newuser_spam_host_threshold: "Jak wiele razy użytkownik może zamieścić link\" original-title=\"<span class=\"glossary-highlight\" title=\"link (click to copy)\" data-copy-glossary=\"link\"> link (click to copy)\">link do tego samego hosta wewnątrz postów `newuser_spam_host_threshold` przed rozważeniem spamu."
     white_listed_spam_host_domains: "Lista domen wykluczonych z testowania pod kątem spamu. Nowi użytkownicy nigdy nie będą ograniczani w dodawaniu postów z linkami z tych domen."
     staff_like_weight: "O ile większą wagę mają mieć polubienia przyznawane przez członków zespołu?"
@@ -1484,15 +1749,27 @@ pl_PL:
     num_hours_to_close_topic: "Liczba godzin zatrzymanie tematu dla interwencji."
     auto_respond_to_flag_actions: "Włącz automatyczną odpowiedź, w czasie pozbywania się flagi."
     min_first_post_typing_time: "Minimalny czas w milisekundach, w którym użytkownik musi napisać post, jeśli próg nie zostanie osiągnięty post 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 rozróżniania wielkości liter, które jeśli zostanie przekazane, spowoduje wyciszenie pierwszego postu przez użytkownika i wysłanie go do kolejki zatwierdzania. Przykład: wściekły | a [bc] a spowoduje, że wszystkie posty zawierające wściekłe lub aba lub aca zostaną najpierw wyciszone. Dotyczy tylko pierwszego postu."
+    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"
+    high_trust_flaggers_auto_hide_posts: "Nowe posty 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ę postu"
     reply_by_email_enabled: "Włącz możliwość odpowiadania na wpisy poprzez email."
     reply_by_email_address: "Template for reply by email incoming email address, for example: %%{reply_key}@reply.example.com or replies+%%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Lista alternatywnych szablonów do odpowiedzi przez adres email. Przykład: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
+    incoming_email_prefer_html: "Do przychodzących wiadomości e-mail używaj HTML zamiast tekstu."
+    strip_incoming_email_lines: "Usuń wiodące i końcowe białe spacje z każdej linii przychodzących wiadomości e-mail."
+    disable_emails: "Zapobiegaj wysyłaniu przez dyskurs jakichkolwiek wiadomości e-mail. Wybierz „tak”, aby wyłączyć e-maile dla wszystkich użytkowników. Wybierz opcję „nie będący pracownikami”, aby wyłączyć wiadomości e-mail tylko dla użytkowników niebędących członkami personelu."
     strip_images_from_short_emails: "Pasek zdjęć z emaila o rozmiarze mniejszym niż 2800 bajtów"
     short_email_length: "Długość krótkiego emaila w bajtach"
     display_name_on_email_from: "Wyświetl pełne nazwy na emailach z pól"
     unsubscribe_via_email: "Pozwalaj użytkownikom na anulacja subskrypcji poprzez email, wysłanie wiadomośi o temacie lub treści \"Anuluj subskrypcje\""
     unsubscribe_via_email_footer: "Dołącz anulacje subskrypcji poprzez email mailto:link do stopki wysłanego emaila"
     delete_email_logs_after_days: "Usuń logi email po (N) dniach. 0 by trzymać w nieskończoność"
+    disallow_reply_by_email_after_days: "Nie zezwalaj na wiadomości e-mail po (N) dniach. 0, aby zachować na czas nieokreślony"
     max_emails_per_day_per_user: "Maksymalna liczba maili, jakie użytkownik może wysłać w ciągu dnia. 0 wyłącza ograniczenie."
     enable_staged_users: "Automatycznie twórz wystawianych użytkowników podczas przetwarzania przychodzących emaili."
     maximum_staged_users_per_email: "Maksymalna liczba wystawionych stworzonych użytkowników podczas przetwarzania przychodzących emaili."
@@ -1506,7 +1783,14 @@ pl_PL:
     reset_bounce_score_after_days: "Automatyczne resetuj licznik odrzucania po X dniach."
     attachment_content_type_blacklist: "Lista słów kluczowych do blokowania załączników w oparciu o typ zawartości."
     attachment_filename_blacklist: "Lista słów kluczowych do blokowania załączników w oparciu o nazwę pliku."
+    forwarded_emails_behaviour: "Jak traktować przesłaną wiadomość e-mail do Discourse"
     always_show_trimmed_content: "Zawsze pokazuj przyciętą część przychodzących maili. Ostrzeżenie: może wyjawiać adresy email."
+    private_email: "Nie umieszczaj treści z postó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 całkowity rozmiar plików dołączonych do wychodzących wiadomości e-mail. 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 postó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."
+    delete_rejected_email_after_days: "Usuń odrzucone wiadomości e-mail starsze niż (n) dni."
     manual_polling_enabled: "Wykorzystuj funkcję push emails za pomocą API dla odpowiedzi na email."
     pop3_polling_enabled: "Ankieta poprzez POP3 dla odpowiedzi przez email."
     pop3_polling_ssl: "Używaj SSL podczas łączenia z serwerem POP3. (Rekomendowane)"
@@ -1516,7 +1800,11 @@ pl_PL:
     pop3_polling_host: "Host do przeglądania cyklicznego emaila poprzez POP3."
     pop3_polling_username: "Nazwa użytkownika dla konta POP3 do przeglądania cyklicznego emaila."
     pop3_polling_password: "Hasło dla konta POP3 do przeglądania cyklicznego maila."
+    pop3_polling_delete_from_server: "Usuń wiadomości e-mail z serwera. UWAGA: Jeśli to wyłączysz, powinieneś ręcznie wyczyścić swoją skrzynkę pocztową"
+    log_mail_processing_failures: "Zapisz wszystkie błędy przetwarzania wiadomości e-mail w <a href='%{base_path}/logs' target='_blank'>/ logs</a>"
+    email_in: 'Zezwalaj użytkownikom na publikowanie nowych tematów za pośrednictwem poczty e-mail (wymaga sondowania ręcznego lub pop3). Skonfiguruj adresy w zakładce „Ustawienia” każdej kategorii.'
     email_in_min_trust: "Minimalny poziom zaufania, który musi posiadać użytkownik, aby móc dodawać nowe posty w tematach poprzez email."
+    email_in_authserv_id: "Identyfikator usługi sprawdzającej autentyczność przychodzących wiadomości e-mail. Instrukcje dotyczące konfigurowania znajdują się na <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> ."
     email_in_spam_header: "Nagłówek e-maila do wykrywania spamu."
     email_prefix: "Etykieta używana w temacie emaili. Domyślnie będzie ustawiana jako \"tytuł\", w przypadku braku ustawienia."
     email_site_title: "Tytuł strony używany jako nadawca emaili ze strony. Domyślnie ustawiony jako \"tytuł\", w przypadku braku ustawienia. Jeśli twój \"tytuł\" zawiera znaki, które nie są dozwolone przez ciągi znaków nadawcy emaila, użyj tego ustawienia."
@@ -1525,7 +1813,10 @@ pl_PL:
     relative_date_duration: "Liczba dni od wysłania wpisu gdy wyświetlana jest data relatywna (7d) zamiast absolutnej (20 Lut)."
     delete_user_max_post_age: "Nie pozwalaj na usuwanie użytkowników których pierwszy post jest starszy niż (x) dni."
     delete_all_posts_max: "The maximum number of posts that can be deleted at once with the Delete All Posts button. If a user has more than this many posts, the posts cannot all be deleted at once and the user can't be deleted."
+    delete_user_self_max_post_count: "Maksymalna liczba postów, jaką może posiadać użytkownik, umożliwiając usunięcie konta samoobsługowego. Ustaw na -1, aby wyłączyć usuwanie konta samoobsługowego."
+    username_change_period: "Maksymalna liczba dni po rejestracji, w których konta mogą zmienić swoją nazwę użytkownika (0, aby uniemożliwić zmianę nazwy użytkownika)."
     email_editable: "Allow users to change their e-mail address after registration."
+    logout_redirect: "Lokalizacja do przekierowania przeglądarki po wylogowaniu (np .: https://example.com/logout)"
     allow_uploaded_avatars: "Zezwól użytkownikom na przesyłanie niestandardowych zdjęć profilowych."
     allow_animated_avatars: "Zezwól na używanie animowanych plików GIF jako zdjęć profilowych. UWAGA: po zmianie tego ustawienia uruchom zadanie avatars:refresh rake."
     allow_animated_thumbnails: "Generowanie miniatur animowanych gifów."
@@ -1683,6 +1974,10 @@ pl_PL:
     errors:
       different_topics: "Nie można połączyć postów z różnych wątków."
       different_users: "Nie można połączyć postów różnych użytkowników."
+  publish_page:
+    slug_errors:
+      blank: "nie może być puste"
+      invalid: "zawiera niepoprawne znaki"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby %{count} odpowiedzi."
@@ -1728,9 +2023,12 @@ pl_PL:
     autoclosed_disabled_lastpost: "Temat został otwarty. Pisanie odpowiedzi jest możliwe."
     auto_deleted_by_timer: "Automatycznie usunięte przez regulator czasowy."
   login:
+    security_key_description: "Po przygotowaniu fizycznego klucza bezpieczeństwa naciśnij przycisk Uwierzytelnij za pomocą klucza bezpieczeństwa poniżej."
     security_key_alternative: "Spróbuj w inny sposób"
     security_key_authenticate: "Uwierzytelnij się za pomocą klucza bezpieczeństwa"
     security_key_not_allowed_error: "Upłynął limit czasu procesu uwierzytelniania klucza bezpieczeństwa lub został on anulowany."
+    security_key_no_matching_credential_error: "W podanym kluczu zabezpieczeń nie znaleziono zgodnych poświadczeń."
+    security_key_support_missing_error: "Twoje obecne urządzenie lub przeglądarka nie obsługuje używania kluczy bezpieczeństwa. Proszę użyć innej metody."
     not_approved: "Twoje konto nie zostało jeszcze aktywowane. Zostaniesz powiadomiony emailem gdy będziesz mógł się zalogować."
     incorrect_username_email_or_password: "Niepoprawna nazwa użytkownika, email lub hasło"
     wait_approval: "Dziękujemy za rejestrację. Powiadomimy Cię gdy Twoje konto zostanie aktywowane."
@@ -2299,7 +2597,6 @@ pl_PL:
       why: "Krótkie podsumowanie aktywności na %{site_link} od twojej ostatniej wizyty w dniu %{last_seen_at}."
       since_last_visit: "Od twojej ostatniej wizyty"
       new_topics: "Nowe tematy"
-      unread_messages: "Nieprzeczytane Wiadomości"
       unread_notifications: "Nieprzeczytane Powiadomienia"
       liked_received: "Otrzymane Polubienia"
       new_users: "Nowi użytkownicy"
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 069248ad52..2210355b7c 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -57,7 +57,6 @@ pt:
       no_multilevels_components: "Temas com temas descendentes não pode ser temas descendentes"
     settings_errors:
       invalid_yaml: "O YAML fornecido é inválido"
-      data_type_not_a_number: "Tipo de configuração `%{name}` não é suportado. Tipos suportados são `integer`, `bool`, `lista` e `enum`."
       name_too_long: "Existe uma configuração com um nome demasiado longo. O tamanho máximo é 255"
       default_value_missing: "A configuração `%{name}` não tem um valor predefinido"
       default_not_match_type: "O tipo do valor predefinido para a configuração `%{name}` não é igual ao esperado pela configuração."
@@ -263,6 +262,12 @@ pt:
   too_late_to_edit: "Essa mensagem foi criada há muito tempo. Já não pode ser editada ou apagada."
   revert_version_same: "A versão actual é o mesma versão para a qual está a tentar reverter."
   excerpt_image: "imagem"
+  bookmarks:
+    reminders:
+      later_today: "Hoje, mais tarde"
+      tomorrow: "Amanhã"
+      next_week: "Próxima semana"
+      next_month: "Próximo mês"
   groups:
     errors:
       can_not_modify_automatic: "Não pode modificar um grupo automático"
@@ -878,8 +883,6 @@ pt:
     email_custom_headers: "A lista delimitada por barras verticais de cabeçalhos de e-mail personalizados"
     force_https: "Forçar o site a usar apenas HTTPS. ALERTA: NÃO active esta opção enquanto não verificar que o HTTPS está completamente configurado e funcional absolutamente em todo o lado! Verificou a sua CDN, todos os logins por rede social, e quaisquer logos ou outras dependências externas para garantir que também são compatíveis com HTTPS?"
     summary_score_threshold: "Pontuação mínima necessária para que uma mensagem seja incluída em 'Resumir Este Tópico'"
-    summary_posts_required: "Número mínimo de mensagens num tópico antes que 'Resumir Este Tópico' seja ativo."
-    summary_likes_required: "Número mínimo de gostos num tópico antes que 'Resumir Este Tópico' seja ativo."
     summary_percent_filter: "Quando um utilizador clica em 'Resumir Este Tópico', mostrar as melhores % de mensagens"
     enable_personal_messages: "Permitir que utilizadores de nível de confiança 1 (configurável através do nível de confiança mínimo para enviar mensagens) criem mensagens e respostas a mensagens. Note que a equipa de apoio pode mandar mensagens de qualquer maneira."
     enable_long_polling: "O sistema de mensagens usado para notificações pode fazer solicitações longas"
@@ -944,7 +947,6 @@ pt:
     enable_instagram_logins: "Activar autenticação pelo Instagram, requer instagram_consumer_key e instagram_consumer_secret"
     instagram_consumer_key: "Chave de consumidor para a autenticação via Instagram"
     instagram_consumer_secret: "Segredo de consumidor para a autenticação via Instagram"
-    readonly_mode_during_backup: "Activar modo de leitura penas durante a realização de uma cópia de segurança"
     allow_restore: "Permitir o restauro, que pode substituir TODOS os dados do sítio. Deixar a falso a menos que planeie restaurar uma cópia de segurança"
     maximum_backups: "Valor máximo de cópias de segurança a serem guardadas em disco. Cópias de Segurança antigas são automaticamente eliminadas."
     automatic_backups_enabled: "Executar cópias de segurança automáticas de acordo com as definições de frequência de cópia de segurança"
@@ -1251,6 +1253,10 @@ pt:
     errors:
       different_topics: "Publicações pertencentes a tópicos diferentes não podem ser unidas."
       different_users: "Publicações pertencentes a utilizadores diferentes não podem ser unidas."
+  publish_page:
+    slug_errors:
+      blank: "não pode estar em branco"
+      invalid: "contem caracteres inválidos"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Esta mensagem foi automaticamente fechada após atingir o limite máximo de %{count} resposta."
@@ -1653,7 +1659,6 @@ pt:
       why: "Um breve sumário 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_messages: "Mensagens Não Lidas"
       unread_notifications: "Notificações Não Lidas"
       liked_received: "Gostos Recebidos"
       new_users: "Novos Utilizadores"
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index d2967f6158..59b0e87e42 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -59,7 +59,6 @@ pt_BR:
       optimized_link: Links otimizados de imagem são efêmeros e não devem ser incluídos no código-fonte do tema.
     settings_errors:
       invalid_yaml: "O YAML fornecido é inválido."
-      data_type_not_a_number: "Definindo`%{name}` tipo não é suportado. Tipos suportados são `integer`,` bool`, `list` e` enum`"
       name_too_long: "Aqui está uma configuração com um nome muito longo. Comprimento máximo é de 255"
       default_value_missing: "Definindo `%{name}` não tem valor padrão"
       default_not_match_type: "Definindo `%{name}` o tipo de valor padrão não corresponde ao tipo de configuração."
@@ -316,8 +315,7 @@ pt_BR:
   bookmarks:
     reminders:
       at_desktop: "Da próxima vez que estiver na minha área de trabalho"
-      later_today: "Hoje mais tarde"
-      next_business_day: "Próximo dia comercial"
+      later_today: "Mais tarde hoje"
       tomorrow: "Amanhã"
       next_week: "Próxima semana"
       next_month: "Próximo mês"
@@ -351,7 +349,6 @@ pt_BR:
       trust_level_4: "nivel_de_confianca_4"
     request_membership_pm:
       title: "Pedido de associação para @%{group_name}"
-      handle: "tratar pedido de associação"
   education:
     until_posts:
       one: "%{count} mensagem"
@@ -1219,7 +1216,6 @@ pt_BR:
   dashboard:
     rails_env_warning: "Seu servidor está rodando no modo %{env}."
     host_names_warning: "O arquivo config/database.yml está usando hostname padrão localhost. Modifique para usar o hostname do seu site."
-    gc_warning: 'Seu servidor está usando os parâmetros padrão de coleta de lixo ruby, o que não lhe dará o melhor desempenho. Leia este tópico sobre ajuste de desempenho: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Ajustando Ruby and Rails para Discourse</a>.'
     sidekiq_warning: 'Sidekiq não está em execução. Muitas tarefas, como envio de emails, são executadas de forma assíncrona pelo sidekiq. Por favor certifique-se de que ao menos um processo sidekiq esteja execução. <a href="https://github.com/mperham/sidekiq" target="_blank">Aprenda sobre Sidekiq aqui</a>.'
     queue_size_warning: "O número de processos na fila é %{queue_size}, o que é alto. Isso pode ser indicação de um problema com o(s) processo(s) do Sidekiq, ou você pode ter que adicionar mais Sidekiq workers."
     memory_warning: "Seu servidor está rodando com menos de 1 GB de memória total. Pelo menos 1 GB é quantidade de memória recomendada."
@@ -1322,8 +1318,6 @@ pt_BR:
     force_https: "Force seu site a usar apenas HTTPS. AVISO: NÃO ative até que você tenha verificado que o HTTPS está completamente configurado e funcionando em absolutamente todos os lugares! Você verificou se seu CDN, todos os logins sociais e quaisquer logos e dependências externos são todos compatíveis com HTTPS, também?"
     same_site_cookies: "Use os mesmos cookies do site, eles eliminam todos os vetores Cross Site Request Forgery nos navegadores suportados (Lax ou Strict). Aviso: o Strict funcionará apenas em sites que forçam o login e usem o SSO."
     summary_score_threshold: "A pontuação mínima requerida para uma postagem ser incluída no \"Resuma este tópico\" "
-    summary_posts_required: "Mensagens mínimas em um tópico antes de 'Resumir este tópico' ficar habilitado"
-    summary_likes_required: "Curtidas mínimas em um tópico antes de 'Resumir este tópico, ficar habilitado"
     summary_percent_filter: "Quando um usuário clicar em 'Resumor este tópico', mostrar os melhores % mensagens"
     summary_max_results: "Número máximo de postagens retornadas por 'Resumir Este Tópico'"
     enable_personal_messages: "Permitir que o nível de confiança 1 (configurável por meio do nível mínimo de confiança para enviar mensagens) os usuários criem mensagens e respondam a mensagens. Note que a equipe sempre pode enviar mensagens, não importa o quê."
@@ -1454,7 +1448,6 @@ pt_BR:
     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>"
     discord_secret: "Chave Secreta do Discord"
-    readonly_mode_during_backup: "Habilitar modo de apenas leitura quando estiver realizando um backup"
     enable_backups: "Permitir que administradores criem backups do fórum"
     allow_restore: "Permitir restauração, que pode substituir todos os dados do site! Deixe falsa, a menos que você pretenda restaurar um backup"
     maximum_backups: "A quantidade máxima de backups para manter no disco. Backups mais antigos são excluídos automaticamente"
@@ -1921,6 +1914,10 @@ pt_BR:
       other: "%{count} postagens foram mescladas em uma mensagem existente: %{topic_link}"
   change_owner:
     post_revision_text: "Propriedade transferida"
+  publish_page:
+    slug_errors:
+      blank: "não pode estar em branco"
+      invalid: "contém caracteres inválidos"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Esta mensagem foi fechada automaticamente depois de atingir o limite máximo de %{count} resposta."
@@ -2832,7 +2829,6 @@ pt_BR:
       why: "Um breve resumo de %{site_link} desde que viu pela última vez em %{last_seen_at}."
       since_last_visit: "Desde a sua última visita"
       new_topics: "Novos Tópicos"
-      unread_messages: "Mensagens Não-lidas"
       unread_notifications: "Notificações Não-lidas"
       liked_received: "Curtidas Recebidas"
       new_users: "Usuários Novos"
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 9026cd79c8..19d561b983 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -202,6 +202,12 @@ ro:
   too_late_to_edit: "Acea postare este prea veche. Nu mai poate fi editată sau ștearsă."
   revert_version_same: "Versiunea curentă este identică cu cea la care încerci să revii."
   excerpt_image: "imagine"
+  bookmarks:
+    reminders:
+      later_today: "Mai târziu azi"
+      tomorrow: "Mâine"
+      next_week: "Săptămâna viitoare"
+      next_month: "Luna viitoare"
   groups:
     errors:
       can_not_modify_automatic: "Nu poți modifica un grup automat"
@@ -537,6 +543,7 @@ ro:
         make: "Acest subiect este de acum un banner. Va apărea în susul fiecărei pagini până când opțiunea va fi anulată de către utilizator."
         remove: "Acest subiect nu mai este un banner. Nu va mai apărea în susul fiecărei pagini."
   unsubscribed:
+    description: "Setările de email pentru <b>%{email}</b>au fost actualizate. Pentru a schimba setările de email, <a href='%{url}'>du-te la setări.</a>"
     topic_description: "Pentru a te abona din nou la %{link}, folosește controlul de notificări din partea dreaptă-jos a subiectului"
   unsubscribe:
     title: "Dezabonare"
@@ -834,8 +841,6 @@ ro:
     email_custom_headers: "O listă delimitată cu simbolul | (pipe) a header-elor personalizate de email"
     force_https: "Forțează site-ul să folosească exclusiv HTTPS. ATENȚIE: NU activa această opțiune până nu ai verificat dacă HTTPS este configurat în întregime și funcționează absolut peste tot. Ai verificat, de asemenea, dacă și CND-ul, toate autentificările cu cont pe rețele de socializaer și toate logo-urile și dependențele externe sunt compatibile cu HTTPS?"
     summary_score_threshold: "Scorul minim necesar pentru ca o postare să fie inclusă în 'Rezumă acest subiect'"
-    summary_posts_required: "Minimul de postări într-un subiect înainte de a se activa 'Rezumă acest subiect'."
-    summary_likes_required: "Minimul de aprecieri într-un subiect înainte de a se activa 'Rezumă acest subiect'."
     summary_percent_filter: "Când un utilizator face click pe 'Rezumatul acestui subiect', arată primele % de postări"
     enable_personal_messages: "Acordă nivelul de încredere 1 (configurabil via nivel minim de încredere pentru trimiterea de mesaje) utilizatorilor, pentru a le permite să creeze și să răspundă la mesaje. Atenție: echipa poate oricând să trimită mesaje, indiferent de setări."
     enable_long_polling: "Bus-ul de mesaje folosit pentru notificări poate utiliza long polling."
@@ -901,7 +906,6 @@ ro:
     enable_instagram_logins: "Activează autentificarea prin Instagram, necesită instagram_consumer_key și instagram_consumer_secret"
     instagram_consumer_key: "Cheie consumator pentru autentificarea Instagram"
     instagram_consumer_secret: "Autentificare Instagram pe bază de secret consumator"
-    readonly_mode_during_backup: "Activează modul exclusiv-citire în timpul operațiunii de backup"
     allow_restore: "Bifează-l doar dacă dorești să restaurezi un fișier de backup. Atenție, restaurarea poate șterge/înlocui TOATE datele din site!"
     maximum_backups: "Maximul de fișiere backup păstrate. Fișierele backup vechi sunt șterse automat"
     automatic_backups_enabled: "Rulează automat operațiuni de backup după cum este definit la frecvența de backup"
@@ -1209,6 +1213,10 @@ ro:
     errors:
       different_topics: "Postările care aparțin unor subiecte diferite nu pot fi comasate."
       different_users: "Postările care aparțin unor utilizatori diferiți nu pot fi comasate."
+  publish_page:
+    slug_errors:
+      blank: "nu poate fi gol"
+      invalid: "conține caractere invalide"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Acest mesaj va fi închis automat după ce atinge limita de maximă de un răspuns."
@@ -1585,7 +1593,6 @@ ro:
       why: "Un rezumat scurt al %{site_link} de la ultima ta vizită din %{last_seen_at}."
       since_last_visit: "De la ultima ta vizită"
       new_topics: "Subiecte noi"
-      unread_messages: "Mesaje necitite"
       unread_notifications: "Notificări necitite"
       liked_received: "Aprecieri primite"
       new_users: "Utilizatori noi"
@@ -1593,6 +1600,8 @@ ro:
       follow_topic: "Urmărește acest subiect"
       join_the_discussion: "Citește mai mult"
       popular_posts: "Postări notorii"
+      unsubscribe: "Acest rezumat este transmis de pe %{site_link} când a trecut ceva vreme de când nu te-am mai văzut. Poți schimba %{email_preferences_link} sau, pentru a te dezabona, %{unsubscribe_link}"
+      your_email_settings: "setările de email"
       click_here: "click aici"
       preheader: "Un scurt rezumat de la ultima ta vizită din %{last_seen_at}"
     forgot_password:
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index df0609a743..4df0fc297e 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -59,7 +59,7 @@ ru:
       optimized_link: Оптимизированные ссылки на изображения являются эфемерными и не должны включаться в исходный код темы.
     settings_errors:
       invalid_yaml: "При условии, что YAML недействителен."
-      data_type_not_a_number: "Настройка `%{name}` не поддерживается. Поддерживаемые темы: `integer`, `bool`, `list` и `enum`"
+      data_type_not_a_number: "Тип `%{name}` не поддерживается. Поддерживаются следующие типы: `integer`, `bool`, `list`, `enum` и `upload`"
       name_too_long: "Есть настройка со слишком длинным именем. Максимальная длина 255"
       default_value_missing: "Настройка `%{name}` не имеет значения по умолчанию"
       default_not_match_type: "Настройка `%{name}` по умолчанию, не совпадает с типом параметра."
@@ -350,14 +350,16 @@ ru:
   bookmarks:
     errors:
       already_bookmarked_post: "Вы не можете дважды добавить сообщение в закладки"
+      cannot_set_past_reminder: "Нельзя указать уже прошедшую дату напоминания."
+      cannot_set_reminder_in_distant_future: "Нельзя указать дату напоминания, отличающуюся от текущей более чем на 10 лет. "
       time_must_be_provided: "время должно быть установлено для всех напоминаний, кроме '%{reminder_type}'"
     reminders:
       at_desktop: "При следующем посещении форума"
-      later_today: "На сегодня, но чуть позже"
+      later_today: "Позже сегодня"
       next_business_day: "На следующий рабочий день"
-      tomorrow: "На завтра"
-      next_week: "На следующую неделю"
-      next_month: "На следующий месяц"
+      tomorrow: "Завтра"
+      next_week: "На следующей неделе"
+      next_month: "В следующем месяце"
       custom: "Установить дату и время напоминания"
   groups:
     success:
@@ -392,7 +394,6 @@ ru:
       trust_level_4: "уровень доверия 4"
     request_membership_pm:
       title: "Запрос на участие в группе %{group_name}"
-      handle: "обрабатывать запрос на вступление"
     view_hidden_topic_request_reason: "Я хочу присоединиться к группе '%{group_name}', чтобы я мог получить доступ к [this topic](%{topic_url})"
   education:
     until_posts:
@@ -1270,7 +1271,6 @@ ru:
   dashboard:
     rails_env_warning: "Ваш сервер работает в режиме %{env}."
     host_names_warning: "Ваш файл config/database.yml использует локальное имя хоста по умолчанию. Поменяйте его на имя хоста вашего сайта."
-    gc_warning: 'Ваш сервер использует параметры сборки мусора ruby по умолчанию, что не даст вам наилучшую производительность. Прочитайте этот раздел о настройке производительности: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq не запущен. Сейчас многие задачи, такие как отправка электронных писем, выполняются асинхронно. Пожалуйста, убедитесь, что хотя бы один процесс sidekiq запущен. <a href="https://github.com/mperham/sidekiq">Узнайте больше о Sidekiq здесь</a>.'
     queue_size_warning: "Количество задач в очереди достигло большого размера %{queue_size}. Это может привести к проблемам с процессом(ами) Sidekiq, или вам придется добавить больше Sidekiq workers."
     memory_warning: "Общее количество памяти, используемое вашим сервером, составляет менее 1 GB. Рекомендовано использовать минимум 1 GB."
@@ -1354,8 +1354,6 @@ ru:
     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>"
     enforce_second_factor: "Заставляет пользователей включить двухфакторную проверку подлинности.. Выберите 'все', чтобы применить его ко всем пользователям. Выберите 'персонал', чтобы принудительно применять его только к сотрудникам."
     summary_score_threshold: "Минимальная оценка сообщения, необходимая для его включения в сводку по теме"
-    summary_posts_required: "Минимальное количество сообщение в теме для активации кнопки \"Сводка по теме\""
-    summary_likes_required: "Минимальное количество симпатий в теме для активации кнопки \"Сводка по теме\""
     summary_percent_filter: "При нажатии на кнопку \"Сводка по теме\", показывать лучшие % сообщений"
     summary_max_results: "Максимальное количество сообщений, возвращаемых в 'Сводке по Теме'"
     enable_system_message_replies: "Позволяет пользователям отвечать на системные сообщения, даже если личные сообщения отключены"
@@ -1432,7 +1430,6 @@ ru:
     google_oauth2_client_secret: "Client secret для Google приложения"
     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>"
-    readonly_mode_during_backup: "Включить режим \"только для чтения\" во время выполнения резервного копирования"
     allow_restore: "Позволить импорт, который может заменить ВСЕ данные сайта. Оставьте выключенным, если не планируете восстанавливать резервную копию"
     maximum_backups: "Максимальное количество резервных копий к сохранению. Более старые резервные копии будут автоматически удалены."
     s3_backup_bucket: "Адрес папки удаленного сервера для резервных копий. ВНИМАНИЕ: Убедитесь, что место назначения защищено от посторонних."
@@ -1640,6 +1637,7 @@ ru:
     warn_reviving_old_topic_age: "Показывать предупреждение, когда кто-то пытается ответить в очень старую тему. Указывается в днях. Чтобы отключить 0."
     autohighlight_all_code: "Принудительно использовать подсветку кода для всех отформатированных блоков кода, даже когда они явно не указан язык."
     embed_truncate: "Обрезать встроенные сообщения."
+    embed_unlisted: "Импортированные темы будут отображаться в списке тем только после добавления в них ответа."
     embed_post_limit: "Максимальное количество вложенных сообщений."
     embed_username_required: "Требуется имя пользователя для создания темы."
     show_create_topics_notice: "Если общее количество тем меньше 5, показывать персоналу сообщение с просьбой создать новые темы."
@@ -1782,6 +1780,10 @@ ru:
       other: "%{count} сообщений было перемещено в это личное сообщение: %{topic_link}"
   change_owner:
     post_revision_text: "Право собственности передано"
+  publish_page:
+    slug_errors:
+      blank: "не может быть пустым"
+      invalid: "содержит недопустимые символы"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Это сообщение было автоматически закрыто, когда количество ответов достигло максимума: %{count}."
@@ -1868,6 +1870,7 @@ ru:
     new_registrations_disabled: "Новые регистрации сейчас ограничены."
     password_too_long: "Максимальная длина пароля - 200 символов."
     email_too_long: "E-mail, который Вы указали, слишком длинный. Имя почтового ящика должно быть не длиннее 254 символов, а доменное имя не более 253 символов."
+    wrong_invite_code: "Вы указали неверный код приглашения."
     reserved_username: "Такой псевдоним не разрешен."
     missing_user_field: "Вы не заполнили все поля пользователя"
     auth_complete: "Проверка подлинности завершена."
@@ -1879,6 +1882,8 @@ ru:
     second_factor_backup_title: "Двухфакторные резервные коды"
     invalid_second_factor_code: "Неверный код аутентификации. Каждый код можно использовать только один раз."
     invalid_security_key: "Неверный ключ безопасности."
+    missing_second_factor_name: "Пожалуйста, укажите имя."
+    missing_second_factor_code: "Пожалуйста, укажите код."
     second_factor_toggle:
       backup_code: "Вместо этого используйте резервный код"
   admin:
@@ -2265,8 +2270,8 @@ ru:
       why: "Сводка обсуждений на сайте %{site_link} с момента вашего последнего визита %{last_seen_at}"
       since_last_visit: "За время вашего отсутствия"
       new_topics: "Новые темы"
-      unread_messages: "Непрочитанные сообщения"
       unread_notifications: "Непрочитанные уведомления"
+      unread_high_priority: "Непрочитанные уведомления с высоким приоритетом"
       liked_received: "Симпатии"
       new_users: "Новые пользователи"
       popular_topics: "Популярные темы"
@@ -2873,6 +2878,7 @@ ru:
     reasons:
       auto_silence_regexp: "Новый пользователь, чье первое сообщение соответствует `auto_silence_first_post_regex` настройки."
       category: "Сообщения в этом разделе требуют ручного одобрения персоналом. Смотрите настройки раздела."
+      suspect_user: "Профайл нового пользователя не содержит информации о прочтённых темах или сообщениях. С большой долей вероятности можно предположить, что это спамер."
     actions:
       agree:
         title: "Согласен..."
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index d530c26d6c..c12a47f819 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -41,7 +41,6 @@ sk:
       git: "Nastala chyba pri klonovaní git repozitára. Prístup bol odmietnuty, alebo repozitár nebol nájdený."
     settings_errors:
       invalid_yaml: "Tento YAML nie je validný."
-      data_type_not_a_number: "Hodnota nastavenia typu `%{name}` nie je podporovaná. Podporované typy sú `integer`, `bool`, `list` a `enum`"
   emails:
     incoming:
       default_subject: "Táto téma musí mať názov"
@@ -216,6 +215,11 @@ sk:
     tag: "Oštítkované témy"
   too_late_to_edit: "Tento príspevok bol vytvorený príliš dávno. Už nemôže byť upravovaný či zmazaný"
   excerpt_image: "Obrázok"
+  bookmarks:
+    reminders:
+      tomorrow: "Zajtra"
+      next_week: "Budúci týždeň"
+      next_month: "Budúci mesiac"
   groups:
     errors:
       can_not_modify_automatic: "Nemôžete upraviť automatickú skupinu"
@@ -816,8 +820,6 @@ sk:
     notification_email: "Odosieľateľ: email adresa použitá na zasielanie všetkých systémových emailov. Uvedená doména musí mať správne nastavené záznamy SPF, DKIM a opačný PTR aby email dorazil."
     email_custom_headers: "Zoznam voliteľných emailových hlavičiek oddelených |"
     summary_score_threshold: "Minimálne požadované skóre príspevku na to aby bol zahrnutý do 'Sumarizuj túto tému'"
-    summary_posts_required: "Minimálny počet príspevkou predtým ako je zapnuté 'Sumarizuj túto tému'"
-    summary_likes_required: "Minimálny počet páči sa mi predtým ako je zapnuté 'Sumarizuj túto tému'"
     summary_percent_filter: "Ak používateľ klikne na 'Sumarizuj túto tému', zobraz najlepších % príspevkov"
     enable_long_polling: "Zbernica správ pre upozornenia môže používať techniku long-polling"
     long_polling_base_url: "Base URL used for long polling (when a CDN is serving dynamic content, be sure to set this to origin pull) eg: http://origin.site.com"
@@ -870,7 +872,6 @@ sk:
     enable_signup_cta: "Zobraz oznámenie pre navrátilých anonymných používateľov s výzvou na registráciu účtu. "
     google_oauth2_client_id: "Client ID Vašej Google aplikácie."
     google_oauth2_client_secret: "Client secret Vašej Google aplikácie."
-    readonly_mode_during_backup: "Zapnúť režim len na čítanie počas vytvárania zálohy"
     allow_restore: "Umožniť obnovu, ktorá nahradí VŠETKY data na stránkach! Ponechajte prázdne okrem prípadu ak chcete obnoviť zo zálohy."
     maximum_backups: "Maximálny počet záloh udržiavaných na disku. Staršie zálohy budu automaticky vymazané"
     automatic_backups_enabled: "Spustiť automatické zálohy podľa nastavenia intervalu záloh"
@@ -1083,6 +1084,10 @@ sk:
   redirected_to_top_reasons:
     new_user: "Vitajte v našej komunite! Toto sú najpopulárnejšie z posledných tém."
     not_seen_in_a_month: "Vitajte späť! Nevideli sme Vás už nejaký čas. Toto sú najpopulárnejšie témy odkedy ste boli preč."
+  publish_page:
+    slug_errors:
+      blank: "nesmie byť prázdne"
+      invalid: "obsahuje neplatné znaky"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovede."
diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml
index 4a3f92ff35..9571ab8433 100644
--- a/config/locales/server.sl.yml
+++ b/config/locales/server.sl.yml
@@ -176,6 +176,12 @@ sl:
     badge: "%{display_name} značka na %{site_title}"
   edit_conflict: "Ta prispevek je bil spremenjen s strani drugega uporabnika zato ne moremo shraniti vaših sprememb."
   excerpt_image: "slika"
+  bookmarks:
+    reminders:
+      later_today: "Kasneje v dnevu"
+      tomorrow: "Jutri"
+      next_week: "Naslednji teden"
+      next_month: "Naslednji mesec"
   groups:
     errors:
       already_requested_membership: "Za članstvo v tej skupini ste že zaprosili."
@@ -1586,7 +1592,6 @@ sl:
       why: "Kratek povzetek %{site_link} od vašega zadnjega obiska %{last_seen_at}"
       since_last_visit: "Od vašega zadnjega obiska"
       new_topics: "Nove teme"
-      unread_messages: "Neprebrana zasebna sporočila"
       unread_notifications: "Neprebrana obvestila"
       liked_received: "Prejeti všečki"
       new_users: "Novi uporabniki"
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 5487ad6248..8006ead250 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -642,8 +642,6 @@ sq:
     notification_email: "The from: email address used when sending all essential system emails. The domain specified here must have SPF, DKIM and reverse PTR records set correctly for email to arrive."
     email_custom_headers: "A pipe-delimited list of custom email headers"
     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"
-    summary_likes_required: "Minimum likes in a topic before 'Summarize This Topic' is enabled"
     summary_percent_filter: "When a user clicks 'Summarize This Topic', show the top % of posts"
     enable_long_polling: "Message bus used for notification can use long polling"
     long_polling_base_url: "Base URL used for long polling (when a CDN is serving dynamic content, be sure to set this to origin pull) eg: http://origin.site.com"
@@ -868,6 +866,10 @@ sq:
   redirected_to_top_reasons:
     new_user: "Welcome to our community! These are the most popular recent topics."
     not_seen_in_a_month: "Welcome back! We haven't seen you in a while. These are the most popular topics since you've been away."
+  publish_page:
+    slug_errors:
+      blank: "nuk mund të lihet bosh"
+      invalid: "përmban karaktere jo të vlefshëm"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Ky mesazh u mbyll automatikisht pasi arriti kufirin e lejueshëm të %{count} përgjigjeje."
diff --git a/config/locales/server.sr.yml b/config/locales/server.sr.yml
index ebfd0ef55d..269f63dcff 100644
--- a/config/locales/server.sr.yml
+++ b/config/locales/server.sr.yml
@@ -265,6 +265,9 @@ sr:
     types:
       category: "Kategorije"
       user: "Korisnici"
+  publish_page:
+    slug_errors:
+      invalid: "sadrži nevažeće karaktere."
   login:
     admin_not_allowed_from_ip_address: "Ne možete se prijaviti kao admin sa te IP adrese."
   admin:
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 94f6b6b931..5d79e6bfb2 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -47,6 +47,7 @@ sv:
       generic: Det uppstod ett fel vid import av det temat
       about_json: "Importfel: about.json finns inte eller är ogiltig"
       about_json_values: "about.json innehåller ogiltiga värden: %{errors}"
+      modifier_values: "about.json modifierare innehåller ogiltiga värden: %{errors}"
       git: "Fel vid kloning av git-lagringsplats, åtkomst nekas eller lagringsplatsen finns inte"
       unpack_failed: "Det gick inte att packa upp filen"
       file_too_big: "Den okomprimerade filen är för stor."
@@ -59,7 +60,7 @@ sv:
       optimized_link: Optimerade bildlänkar är flyktiga och bör inte inkluderas i temakällkoden.
     settings_errors:
       invalid_yaml: "Angivet YAML är ogiltigt."
-      data_type_not_a_number: "Det går inte att ställa in typen `%{name}` %{name}. Typer som stöds är `integer`, `bool`, `list` och `enum`"
+      data_type_not_a_number: "Det går inte att ställa in typen `%{name}`. Typer som stöds är `integer`, `bool`, `list` , `enum` och `upload`"
       name_too_long: "En inställning har ett namn som är för långt. Maximal längd är 255"
       default_value_missing: "Inställningen `%{name}` har inget standardvärde"
       default_not_match_type: "Standardvärdestypen i inställningen `%{name}` överensstämmer inte med inställningstypen."
@@ -329,11 +330,13 @@ sv:
   bookmarks:
     errors:
       already_bookmarked_post: "Du kan inte bokmärka samma inlägg två gånger."
+      cannot_set_past_reminder: "Du kan inte sätta en påminnelse för bokmärke i det förflutna."
+      cannot_set_reminder_in_distant_future: "Du kan inte sätta en påminnelse för bokmärke mer än 10 år framåt i tiden."
       time_must_be_provided: "tid måste tillhandahållas för alla påminnelser utom '%{reminder_type}'"
     reminders:
       at_desktop: "Nästa gång är jag vid datorn"
       later_today: "Senare idag"
-      next_business_day: "Nästa arbetsdag"
+      next_business_day: "Nästa vardag"
       tomorrow: "Imorgon"
       next_week: "Nästa vecka"
       next_month: "Nästa månad"
@@ -367,7 +370,6 @@ sv:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "Begäran om medlemskap i @%{group_name}"
-      handle: "hantera begäran om medlemskap"
     view_hidden_topic_request_reason: "Jag skulle vilja gå med i gruppen '%{group_name}', så att jag kan gå till [detta ämne](%{topic_url})"
   education:
     until_posts:
@@ -477,6 +479,10 @@ sv:
               same_as_password: "är samma som ditt lösenord."
             ip_address:
               signup_not_allowed: "Registrering är inte tillåtet från detta konto."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Detta ämne kan inte presenteras på din profil."
         user_email:
           attributes:
             user_id:
@@ -1246,7 +1252,6 @@ sv:
   dashboard:
     rails_env_warning: "Din server kör i %{env} läge."
     host_names_warning: "Din config/database.yml fil använder lokalvärdens standard-värdnamn. Uppdatera den till att använda din webbplats värdnamn."
-    gc_warning: 'Din server använder ruby standardparametrar för skräpinsamling, vilket inte ger dig bästa prestanda. Läs detta ämne om prestandajustering: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>. '
     sidekiq_warning: 'Sidekiq körs inte. Många uppgifter, sm att skicka e-post, utförs asynkront av sidekiq. Var vänlig se till att minst en sidekiqprocess körs. <a href="https://github.com/mperham/sidekiq">Läs mer om Sidekiq här</a>.'
     queue_size_warning: "Antal köade jobb är %{queue_size}, vilket är ganska högt. Det kan indikera ett problem med Sidekiq process(er), eller så kanske du behöver lägga till fler Sidekiqarbetare."
     memory_warning: "Din server körs med mindre än 1 GB minne. Minne på minst 1 GB är rekommenderat."
@@ -1357,8 +1362,8 @@ sv:
     force_https: "Tvinga din webbplats att endast använda HTTPS. VARNING: bocka INTE i det här innan du kan verifiera att HTTPS verkligen fungerar överallt! Har du kontrollerat din CDN, alla sociala inloggningar och alla externa logotyper / beroenden för att säkerställa att de alla också är HTTPS-kompatibla?"
     same_site_cookies: "Använd samma webbplatskakor, detta eliminerar alla vektorer för Cross Site Request Forgery på stödda webbläsare (Löst eller Strikt). Varning: Strikt fungerar bara på webbplatser som tvingar inloggning och använder SSO."
     summary_score_threshold: "Minsta poäng för att ett inlägg ska inkluderas i 'Sammanfatta det här ämnet'"
-    summary_posts_required: "Minsta antal inlägg i ett ämne innan 'Sammanfatta det här ämnet' möjliggörs"
-    summary_likes_required: "Minsta antal gillningar i ett ämne innan 'Sammanfatta det här ämnet' möjliggörs"
+    summary_posts_required: "Minsta antal inlägg i ett ämne innan 'Sammanfatta det här ämnet' möjliggörs. Ändringar i denna inställning kommer att genomföras retroaktivt inom en vecka."
+    summary_likes_required: "Minsta antal gillningar i ett ämne innan 'Sammanfatta det här ämnet' möjliggörs. Ändringar i denna inställning kommer att genomföras retroaktivt inom en vecka."
     summary_percent_filter: "Visa högsta % av inläggen när en användare bockar i 'Sammanfatta det här ämnet'"
     summary_max_results: "Maximalt antal inlägg som returneras av 'Sammanfatta detta ämne' "
     enable_personal_messages: "Tillåt användare med förtroendenivå 1 (konfigurera via minsta förtroendenivå för att skicka meddelanden) att skapa meddelanden och svara på meddelanden. Notera att personalen oavsett alltid kan skicka meddelanden. "
@@ -1390,7 +1395,8 @@ sv:
     markdown_typographer_quotation_marks: "Lista med ersättningspar för dubbla och enkla citat"
     post_undo_action_window_mins: "Antal minuter som en användare tillåts att upphäva handlingar på ett inlägg som gjorts nyligen (gillning, flaggning osv)."
     must_approve_users: "Personal måste godkänna alla nya användarkonton innan de tillåts använda webbplatsen."
-    approve_suspect_users: "Personal måste godkänna alla misstänkta konton"
+    invite_code: "Användare måste ange denna kod för att ha tillåtelse att registrera ett konto, ignoreras om det lämnas tomt (ej skiftlägeskänslig)"
+    approve_suspect_users: "Lägg till misstänka användare i kön för granskning. Misstänkta användare har angett en bio/webbsida men har ingen läsaktivitet."
     pending_users_reminder_delay: "Notifiera moderatorer om nya användare har väntat på godkännande längre än så här många timmar. Ange -1 för att inaktivera notifikationer. "
     maximum_session_age: "Användaren kommer fortsättningsvis att vara inloggad i n timmar sedan senaste besöket"
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js) spårningskods ID, exempelvis UA-12345678-9; se <a href='https://google.com/analytics' target='_blank'>http://google.com/analytics</a>"
@@ -1439,6 +1445,8 @@ sv:
     allow_index_in_robots_txt: "Ange i robots.txt att den här webbplatsen får indexeras av webbsökmotorer. I undantagsfall kan du permanent <a href='%{base_path}/admin/customize/robots'>åsidosätta robots.txt</a>."
     email_domains_blacklist: "En pipe-avgränsad lista av alla e-postdomän som användare inte tillåts registrera konton med. Exempel: mailinator.com, trashmail.net"
     email_domains_whitelist: "En pipe-avgränsad lista av alla e-postdomän som användare MÅSTE registrera konton med. VARNING: Användare med e-postdomän som inte finns på listan kommer inte att tillåtas!"
+    enforce_canonical_emails: "Innan användarna skapas rensas e-postadress till kanonisk form vilket garanterar unikhet. Inställningen kommer endast att gälla vid nya kontoregistreringar. Om aktiverad kommer användare+1@domän.se inte att tillåtas registrera sig om användare+2@domän.se redan är registrerad."
+    auto_approve_email_domains: "Användare med e-postadresser som finns i denna lista av domäner kommer automatiskt att godkännas."
     hide_email_address_taken: "Informera inte användare om att det finns ett konto med en given e-postadress vid registreringen eller från det glömda lösenordsformuläret."
     log_out_strict: "Vid utloggning, logga ut ALLA sessioner för den användaren på alla apparater"
     version_checks: "Pinga Discourse Hub för versionuppdateringar och visa nya versionmeddelanden på instrumentpanelen <a href='%{base_path}/admin' target='_blank'>/admin</a> "
@@ -1496,7 +1504,6 @@ sv:
     discord_client_id: 'Discord Klient-ID (behöver du ett? Besök <a href="https://discordapp.com/developers/applications/me">utvecklarportalen för Discord</a>)'
     discord_secret: "Discord hemlig nyckel"
     discord_trusted_guilds: 'Tillåt bara medlemmar i dessa Discord-grupperingar att logga in via Discord. Använd det numeriska ID för grupperingen. För mer information, se instruktionerna <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">här</a>. Lämna tomt för att tilllåta alla grupperingar.'
-    readonly_mode_during_backup: "Aktivera skrivskyddat läge vid säkerhetskopiering"
     enable_backups: " Tillåt administratörer att skapa säkerhetskopior av forumet"
     allow_restore: "Tillåt återställning, vilket kan ersätta ALL data på webbplatsen! Lämna avbockad om du inte planerar att återställa en säkerhetskopia"
     maximum_backups: "Högsta antal säkerhetskopior att spara på disken. Äldre säkerhetskopior raderas automatiskt"
@@ -1731,6 +1738,7 @@ sv:
     relative_date_duration: "Antal dagar efter att ett inlägg skrivits som datummarkeringen som visas för inlägget är relativ (7d) istället för absolut (20 Feb). "
     delete_user_max_post_age: "Tillåt inte raderande av användare vars äldsta inlägg är äldre än (x) dagar."
     delete_all_posts_max: "Högsta antal inlägg som kan raderas på samma gång med Radera Alla Inlägg-knappen. Om en användare har fler än så många inlägg så kan inläggen inte raderas på samma gång och användaren kan inte raderas."
+    delete_user_self_max_post_count: "Maximalt antal inlägg en användare kan ha medans själv-hantering av kontoradering tillåts. Sätt till -1 för att stänga av själv-hantering av kontoradering."
     username_change_period: "Det maximala antalet dagar efter registrering som konton kan ändra användarnamn (0 för att inte tillåta ändring av användarnamn)."
     email_editable: "Tillåt användare att ändra deras e-postadress efter registrering."
     logout_redirect: "Plats att omdirigera webbläsaren till efter utloggning (egentligen: https://exempel.se/logout)"
@@ -1769,6 +1777,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."
     user_selected_primary_groups: "Tillåt användare att ställa in sin egna primära grupp"
     max_notifications_per_user: "Maximalt antal notifikationer per användare, om detta värde överskrids kommer äldre notifikationer att raderas. Verkställs veckovis. Sätt till 0 för att inaktivera."
     user_website_domains_whitelist: "Användare websidor kommer att verifieras mot dessa domäner. Pipe- avgränsad lista."
@@ -1807,7 +1816,9 @@ sv:
     highlighted_languages: "Inkluderade syntax-markeringsregler (Varning: att inkludera för många språk kan påverka prestanda). Demonstration: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a>"
     embed_any_origin: "Tillåt inbäddbart innehåll oavsett ursprung. Detta krävs för mobilappar med statisk HTML."
     embed_topics_list: "Stöd HTML-inbäddning av ämneslistor"
+    embed_set_canonical_url: "Sätt den kanoniska URL:n för inbäddade ämnen till det inbäddade innehållets URL."
     embed_truncate: "Trunkera de inbäddade inläggen."
+    embed_unlisted: "Importerade ämnen kommer att vara olistade tills dess att en användare svarar."
     embed_support_markdown: "Stöd Markdown-formatering för inbäddade inlägg."
     embed_whitelist_selector: "En kommaseparerad lista över CSS-element som tillåts i inbäddningar."
     allowed_href_schemes: "System tillåtna i länkar i motsatsen till http och https."
@@ -1818,7 +1829,7 @@ sv:
     delete_drafts_older_than_n_days: "Ta bort utkast som är äldre än (n) dagar."
     bootstrap_mode_min_users: "Minsta antal användare som krävs för att inaktivera bootstrap-läget (ange 0 för att inaktivera)"
     prevent_anons_from_downloading_files: "Förhindra anonyma användare från att ladda ned bilagor. VARNING: det kommer att förhindra alla webbplatsens tillgångar som inte är bilder och som lagts upp som bilagor från att fungera."
-    secure_media: 'Begränsar åtkomst till mediauppladdningar (bilder, video, ljud). Om "inloggning krävs" har aktiverats kan endast inloggade användare komma åt mediauppladdningar. Annars begränsas åtkomst endast till uppladdning av media i privata meddelanden. Obs: S3-uppladdningar måste ha aktiverats innan den här inställningen aktiveras.'
+    secure_media: 'Begränsar åtkomst för ALLA uppladdningar (bilder, video, ljud, text, pdf:er, zipp med flera). Om "inloggning krävs" har aktiverats kan endast inloggade användare komma åt uppladdningar. Annars begränsas åtkomst endast till uppladdning av media i privata meddelanden samt privata kategorier. VARNING: Den här inställningen är komplex och kräver djupa administrativa kunskaper. Besök <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">ämnet för säkra media i Meta</a> för detaljer.'
     slug_generation_method: "Välj en genereringsmetod för etiketter. Ange 'none' för att inaktivera generering av etiketter. "
     enable_emoji: "Aktivera emoji"
     enable_emoji_shortcuts: "Vanlig smileytext som :): p :( kommer att konverteras till emojier"
@@ -1839,6 +1850,7 @@ sv:
     new_user_notice_tl: "Lägsta förtroendenivå som krävs för se nya användares inläggsnoteringar."
     returning_user_notice_tl: "Lägsta förtroendenivå som krävs för se återkommande användares inläggsnoteringar."
     returning_users_days: "Hur många dagar bör gå innan en användare anses återkomma."
+    enable_page_publishing: "Tillåt personal att publicera ämnen för nya URL:er med deras egna utformning."
     default_email_digest_frequency: "Standardinställning för hur ofta användare mottar e-postsammanfattningar."
     default_include_tl0_in_digests: "Standardinställning för hur ofta nya användare får e-postsammanfattningar. Användare kan ändra det i sina inställningar."
     default_email_level: "Ställ in standardnivå för e-postmeddelanden för vanliga ämnen."
@@ -1901,6 +1913,9 @@ sv:
     push_notifications_icon: "Utmärkelseikonen som visas i notifieringshörnet. Obligatorisk storlek är 96 x 96."
     short_title: "Den korta titeln kommer att användas på användarens startskärm, startapparat eller andra platser där utrymmet kan vara begränsat. Det bör begränsas till 12 tecken."
     dashboard_general_tab_activity_metrics: "Välj rapporter som ska visas som aktivitetsmätningar på fliken allmänt."
+    gravatar_name: "Namn på Gravatar leverantören"
+    gravatar_base_url: "Url till Gravatar leverantörens API mål"
+    gravatar_login_url: "Url relaterande till gravatar_base_url, vilken tillhandahåller inloggning för användaren hos Gravatar tjänsten"
     errors:
       invalid_email: "Felaktig e-postadress."
       invalid_username: "Det finns ingen användare med detta användarnamn."
@@ -2000,6 +2015,11 @@ sv:
       other: "%{count} inlägg har sammanfogats med ett existerande meddelande: %{topic_link}"
   change_owner:
     post_revision_text: "Ägarskap överfört"
+  publish_page:
+    slug_errors:
+      blank: "kan inte vara tomt"
+      unavailable: "är inte tillgänglig"
+      invalid: "innehåller otillåtna tecken"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Det här ämnet stängdes automatiskt efter att ha nått den övre gränsen av %{count} inlägg."
@@ -2082,6 +2102,7 @@ sv:
     new_registrations_disabled: "Nya kontoregistreringar är för närvarande inte tillåtna."
     password_too_long: "Lösenord har en gräns på 200 tecken."
     email_too_long: "E-postadressen du tillhandahöll är för lång. E-postadresser kan på sin höjd vara 254 tecken och domännamn inte mer än 253 tecken."
+    wrong_invite_code: "Inbjudningskoden som du har angett var felaktig."
     reserved_username: "Användarnamnet är inte tillåtet."
     missing_user_field: "Du har inte fyllt i alla användarfält"
     auth_complete: "Autentisering är färdig."
@@ -2093,6 +2114,8 @@ sv:
     second_factor_backup_title: "Två faktorig reservkod"
     invalid_second_factor_code: "Ogiltig autentiseringskod. Varje kod kan bara användas en gång."
     invalid_security_key: "Ogiltig säkerhetsnyckel."
+    missing_second_factor_name: "Vänligen ange ett namn."
+    missing_second_factor_code: "Vänligen ange en kod."
     second_factor_toggle:
       totp: "Använd en autentiseringsapp eller säkerhetsnyckel istället"
       backup_code: "Använd en reservkod istället"
@@ -2967,8 +2990,8 @@ sv:
       why: "En kortfattad sammanfattning av %{site_link} sedan ditt senaste besök den %{last_seen_at}"
       since_last_visit: "Sedan ditt senaste besök"
       new_topics: "Nya ämnen"
-      unread_messages: "olästa meddelanden"
       unread_notifications: "Olästa notifikationer"
+      unread_high_priority: "Olästa notifikationer med hög prioritet"
       liked_received: "Gillanden mottagna"
       new_users: "Nya användare"
       popular_topics: "Populära ämnen"
@@ -3092,6 +3115,7 @@ sv:
     file_missing: "Tyvärr, du måste tillhandahålla en fil för uppladdning. "
     empty: "Tyvärr, men filen du angav är tom."
     png_to_jpg_conversion_failure_message: "Ett fel uppstod vid konvertering från PNG till JPG."
+    optimize_failure_message: "Det uppstod ett fel vid optimering av den uppladdade bilden."
     attachments:
       too_large: "Tyvärr, filen du försöker ladda upp är för stor (maxstorlek är %{max_size_kb}kb)."
     images:
@@ -3127,6 +3151,7 @@ sv:
     sender_body_blank: "body är tom"
     sender_post_deleted: "inlägg har raderats"
     sender_message_to_invalid: "mottagaren har ogiltig e-postadress"
+    sender_topic_deleted: "ämne har raderats"
   color_schemes:
     base_theme_name: "Bas"
     light: "Ljus"
@@ -3730,7 +3755,7 @@ sv:
       invite_only: "Alla nya användare ska bjudas in. Se `invite_only`."
       email_auth_res_enqueue: "Det här e-postmeddelandet misslyckades med en DMARC-kontroll, det kommer sannolikt inte från den som det verkar komma från. Mer information finns i rubrikerna för e-postens rådata."
       email_spam: "Det här e-postmeddelandet flaggades som skräppost av rubriken definierad i `email_in_spam_header."
-      suspect_user: "Användare i listan över misstänkta måste undersökas av personal. Se `approve_suspect_users`."
+      suspect_user: "Denna nya användare angav profilinformation utan att ha läst några ämnen eller inlägg, vilket starkt indikerar att det kan röra sig om en skräppostare. Se `approve_suspect_users`."
     actions:
       agree:
         title: "Godkänn..."
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
index 361e7ae12b..c8a5f380f1 100644
--- a/config/locales/server.sw.yml
+++ b/config/locales/server.sw.yml
@@ -42,7 +42,6 @@ sw:
       git: "Tatizo limetokea wakati wa kunakili weko la git, hauna ruhusa au weko haijapatikana"
     settings_errors:
       invalid_yaml: "YAML iliyowekwa ni batili."
-      data_type_not_a_number: "Aina ya mpangilio `%{name}` hauruhusiwi. Aina zinazoruhusiwa ni `namba kamili`, `bool`, `orodha` na `enum`"
       name_too_long: "Kuna mpangilio wenye jina lefu sana. Kiwango cha juu cha urefu ni 255"
       default_value_missing: "Mpangilio wa `%{name}` hauna thamani"
       default_out_range: "Mpangilio `%{name}` chaguo-msingi haupo kwenye namba zilizotajwa."
@@ -194,6 +193,12 @@ sw:
   too_late_to_edit: "Chapisho lilitengenezwa kitambo sana. Haiwezi kufanyiwa uhariri au kufutwa."
   revert_version_same: "Toleo la sasa ni sawa na toleo unalo jaribu kurudisha."
   excerpt_image: "Picha"
+  bookmarks:
+    reminders:
+      later_today: "Baada ya mda leo"
+      tomorrow: "Kesho"
+      next_week: "Wiki Ijayo"
+      next_month: "Mwezi ujao"
   groups:
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' sio kiwango cha uaminifu."
@@ -783,8 +788,6 @@ sw:
     onebox_domains_blacklist: "Orodha ya anwani za mitandao ambazo hazijawekwa kwenye boxi."
     inline_onebox_domains_whitelist: "Orodha za anwani za mtandao ambazo zitawekwa kwenye boxi kama zikiunganishwa bila kichwa cha habari"
     summary_score_threshold: "Alama ya chini ambayo mada inahitaji kabla ya kuwekwa ndani ya 'Fupisha Hii Mada' "
-    summary_posts_required: "Kiwango cha chini cha machapisho ndani ya mada kabla 'Fupisha Mada' haijaonyeshwa"
-    summary_likes_required: "Kiwango cha chini cha likes ndani ya mada kabla 'Mada kufupishwa' haijaruhusiwa"
     summary_percent_filter: "Mtumiaji akibonyeza 'Fupisha Hii Mada', onyesha % machapisho ya juu"
     enable_personal_messages: "Ruhusu watumiaji wenye kiwango cha 1 cha uaminifu (inasanidiwa kwa kupitia kiwango cha chini cha uaminifu kutuma ujumbe) kutuma ujumbe wa barua pepe. Wasaidizi wataweza kutuma ujumbe mda kila wakati."
     enable_system_message_replies: "Waruhusu watumiaji wajibu ujumbe wa mfumo,hata kama ujumbe binafsi umezuiliwa."
@@ -818,7 +821,6 @@ sw:
     enable_instagram_logins: "Ruhusu Uhalalishaji wa Instagram, inahitaji instagram_consumer_key na instagram_consumer_secret"
     instagram_consumer_key: "Ufunguo wa uhalalishaji wa Mtumiaji kupitia Instagram"
     instagram_consumer_secret: "Uhalalishaji wa Siri wa Mtumiaji kupitia Instagram"
-    readonly_mode_during_backup: "Ruhusu hali-tumizi ya usomaji tu kipindi cha chelezo"
     enable_backups: "Ruhusu wasimamizi watengeneze machelezo ya jamii"
     allow_restore: "ruhusu urejeshaji, itabadilisha taarifa zote za tovuti! Acha iwe hapana, badilisha kama unataka kurejesha chelezo"
     maximum_backups: "Kiwango cha juu cha chelezo kutunza kwenye diski. Machelezo ya mda yatafutwa otomatikali"
@@ -996,6 +998,10 @@ sw:
     errors:
       different_topics: "Machapisho kutoka mada tofauti hayawezi kuunganishwa."
       different_users: "Machapisho kutoka watumiaji tofauti hayawezi kuunganishwa."
+  publish_page:
+    slug_errors:
+      blank: "haiwezi kubaki wazi"
+      invalid: "ina herufi batili"
   topic_statuses:
     autoclosed_disabled: "Mada hii imefunguliwa. Majibu mapya yanaruhusiwa."
     autoclosed_disabled_lastpost: "Hii mada iko wazi. Majibu mapya yanakaribishwa."
@@ -1655,7 +1661,6 @@ sw:
       why: "Muhtasari Mfupi wa %{site_link} toka mara ya mwisho ulivyotembelea %{last_seen_at}"
       since_last_visit: "Kutoka mara ya mwisho ulivyotembelea"
       new_topics: "Mada Mpya"
-      unread_messages: "Ujumbe ambao Haujasomwa"
       unread_notifications: "Taarifa ambazo Hazijasomwa"
       liked_received: "Upendo Uliopokelewa"
       new_users: "Watumiaji Wapya"
diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml
index 9b6096a6ee..e0bac8062c 100644
--- a/config/locales/server.te.yml
+++ b/config/locales/server.te.yml
@@ -114,6 +114,11 @@ te:
     latest: "తాజా విషయాలు"
   too_late_to_edit: "ఈ టపా పురాతన కాలంలో సృష్టించబడింది. ఇప్పుడు ఇహ సవరించలేము లేదా తొలగించలేము."
   excerpt_image: "బొమ్మ"
+  bookmarks:
+    reminders:
+      tomorrow: "రేపు"
+      next_week: "వచ్చే వారం"
+      next_month: "వచ్చే నెల"
   groups:
     default_names:
       everyone: "ప్రతీఒక్కరూ"
@@ -589,6 +594,10 @@ te:
   most_posts: "అధిక టపాలు"
   most_recent_poster: "ఇటీవలి పోస్టర్"
   frequent_poster: "తరచూ వచ్చే పోస్టర్"
+  publish_page:
+    slug_errors:
+      blank: "ఖాళీగా ఉండకూడదు"
+      invalid: "చెల్లని అక్షరాలు ఉన్నాయి."
   topic_statuses:
     autoclosed_disabled: "ఈ విషయం ఇప్పుడు తెరవబడింది.కొత్త జవాబులకు అనుమతి."
     autoclosed_disabled_lastpost: "ఈ విషయం ఇప్పుడు తెరవబడింది.కొత్త జవాబులకు అనుమతి."
diff --git a/config/locales/server.th.yml b/config/locales/server.th.yml
index cf2d00642e..f36b909f0c 100644
--- a/config/locales/server.th.yml
+++ b/config/locales/server.th.yml
@@ -182,6 +182,9 @@ th:
     types:
       category: "หมวดหมู่"
       user: "ผู้ใช้"
+  publish_page:
+    slug_errors:
+      invalid: "มีตัวอักษรที่ไม่สามารถใช้งานได้"
   login:
     admin_not_allowed_from_ip_address: "คุณไม่สามารถเข้าสู่ระบบด้วยผู้ดูแลระบบด้วยไอพีนี้"
   subject_re: "ตอบ: "
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 8df329d753..2b76fc0bd2 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -59,7 +59,6 @@ tr_TR:
       optimized_link: Optimize edilmiş görüntü bağlantıları geçicidir ve tema kaynak koduna dahil edilmemelidir.
     settings_errors:
       invalid_yaml: "Sağlanan YAML geçersiz."
-      data_type_not_a_number: "`%{name}` tipinin ayarlanması desteklenmiyor. Desteklenen türler tam sayı, bool, liste ve enum'dur."
       name_too_long: "Çok uzun ismi olan bir ayar var. Maksimum uzunluk 255"
       default_value_missing: "`%{name}` ayarının varsayılan değeri yoktur"
       default_not_match_type: "`%{name}` ayarının varsayılan değerinin türü ayar türüyle eşleşmiyor."
@@ -331,11 +330,10 @@ tr_TR:
       time_must_be_provided: "&#39;%{reminder_type}&#39; dışındaki tüm hatırlatıcılara zaman verilmelidir"
     reminders:
       at_desktop: "Bir dahaki sefere masaüstümdeyim"
-      later_today: "Bugünden sonra <br/> {{date}}"
-      next_business_day: "Bir sonraki iş günü <br/> {{date}}"
-      tomorrow: "Yarın <br/> {{date}}"
-      next_week: "Gelecek hafta <br/> {{date}}"
-      next_month: "Gelecek ay <br/> {{date}}"
+      later_today: "Bugün ilerleyen saatlerde"
+      tomorrow: "Yarın"
+      next_week: "Gelecek hafta"
+      next_month: "Gelecek ay"
       custom: "Özel tarih ve saat"
   groups:
     success:
@@ -366,7 +364,6 @@ tr_TR:
       trust_level_4: "güven_seviyesi_4"
     request_membership_pm:
       title: "@ %{group_name} için üyelik talebi"
-      handle: "üyelik isteğini yerine getir"
     view_hidden_topic_request_reason: "'%{group_name}', grubuna katılmak istiyorum, böylece katılabilirim[bu konuya](%{topic_url})"
   education:
     until_posts:
@@ -1252,7 +1249,6 @@ tr_TR:
   dashboard:
     rails_env_warning: "Sunucunuz %{env} modunda çalışıyor."
     host_names_warning: "config/database.yml dosyasınızda, bilgisayar adı olarak öntanımlı değer olan \"localhost\" ayarlı. Değeri, sitenizin bilgisayar adını kullanacak biçimde güncelleyiniz."
-    gc_warning: 'Sunucunuz, Ruby''nin öntanımlı çöp toplama ayarlarını kullanıyor ki bu size en iyi performansı vermeyecektir. Performansı ayarı için şu konuyu okuyun: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Discourse için Ruby on Rails Ayarları.'
     sidekiq_warning: 'Sidekiq çalışmıyor. E-posta yollamak gibi gibi birçok asenkron görev sidekiq''in işidir. En az bir tane sidekiq süreci çalıştırdığınızdan emin olun. <a href="https://github.com/mperham/sidekiq" target="_blank">Sidekiq ile ilgili bilgi burada</a>.'
     queue_size_warning: "Kuyruğa eklenmiş işlerin sayısı fazla: %{queue_size}. Bu Sidekiq işlem(ler)indeki bir sorunu işaret ediyor olabilir, ya da daha fazla Sidekiq işçisi eklemeniz gerekiyor olabilir."
     memory_warning: "Sunucunuz toplam 1GB'tan az bellek ile çalışıyor. En az 1GB bellek tavsiye edilmektedir."
@@ -1363,8 +1359,6 @@ tr_TR:
     force_https: "Sitenizi HTTPS kullanmaya zorlayın. DİKKAT: bu seçeneği HTTPS'nin her yerde doğru bir şekilde çalıştığından emin olmadan SEÇMEYİN. Sitenizde bulunan paylaşım siteleri bağlantılarını, CDN' adresinizi, dışsal bağlantısı olan görsellerinizi de kontrol ettiniz mi?"
     same_site_cookies: "Aynı site çerezlerini kullanın, desteklenen tüm tarayıcılardaki Siteler Arası İstek Sahteciliği'ni (Lax veya Strict) ortadan kaldırırlar. Uyarı: Katı kurallı oturum, yalnızca giriş yapmaya ve TOA kullanmaya zorlayan sitelerde çalışır."
     summary_score_threshold: "Bir gönderinin 'Bu Konuyu Özetle' içinde yer alması için gereken en az skor."
-    summary_posts_required: "'Bu Konuyu Özetle'nin etkinleştirilmesi için konuda olması gereken en az gönderi sayısı"
-    summary_likes_required: "'Bu Konuyu Özetle'nin etkinleştirilmesi için konuda olması gereken en az beğeni sayısı"
     summary_percent_filter: "Kullanıcı 'Bu Konuyu Özetle'ye tıkladığında, gönderinin ilk % kısmını göster"
     summary_max_results: "'Bu Konuyu Özetle' den dönen en fazla gönderi sayısı"
     enable_personal_messages: "Güven seviyesi 1'e(özel ileti göndermek için en az seviye ayarıyla belirlenebilir) sahip kullanıcıların ileti oluşturup cevaplamasına izin ver. Görevliler her durumda ileti gönderebilir."
@@ -1396,7 +1390,6 @@ 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."
-    approve_suspect_users: "Personel tüm şüpheli hesapları onaylamalıdır"
     pending_users_reminder_delay: "Belirtilen saatten daha uzun bir süredir onay bekleyen yeni kullanıcılar mevcutsa moderatörleri bilgilendir. Bilgilendirmeyi devre dışı bırakmak için -1 girin."
     maximum_session_age: "Kullanıcı son ziyaretinden bu yana n saat boyunca giriş yapmış olarak kalacak"
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js) takip kodu, örn: UA-12345678-9; bkz. <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -1502,7 +1495,6 @@ tr_TR:
     discord_client_id: 'Discord İstemci Kimliği (birine ihtiyacınız var mı? <a href="https://discordapp.com/developers/applications/me">Discord geliştirici portalını</a> ziyaret edin)'
     discord_secret: "Discord Gizli Anahtarı"
     discord_trusted_guilds: 'Yalnızca bu Discord loncalarının üyelerinin Discord üzerinden giriş yapmasına izin verin. Lonca için sayısal kimliği kullanın. Daha fazla bilgi için, talimatları kontrol edin <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">buraya</a> . Bir loncaya izin vermek için boş bırakın.'
-    readonly_mode_during_backup: "Yedek alınırken yalnızca okuma modunu etkinleştir"
     enable_backups: "Yöneticilerin forumun yedeklerini oluşturmalarına izin ver"
     allow_restore: "Geri almaya izin ver. Sitedeki TÜM verileri değiştirebilir! Bir yedeklemeyi geri yüklemeyi planlamıyorsanız devre dışı bırakın."
     maximum_backups: "Diskte tutulacak en fazla yedek sayısı. Eski yedekler otomatik olarak silinir."
@@ -1819,7 +1811,6 @@ tr_TR:
     delete_drafts_older_than_n_days: "(n) günden eski taslakları sil."
     bootstrap_mode_min_users: "bootstrap modunun edilgen olması için gereken en az kullanıcı sayısı (edilgen bırakmak için 0 yapın)"
     prevent_anons_from_downloading_files: "Anonim kullanıcıların eklenti indirebilmesini önle. DİKKAT: Bu ayar, eklenti olarak gönderilen resim-dışı site içeriklerinin de çalışmasını engelleyebilir."
-    secure_media: 'Medya yüklemelerine (resimler, video, ses) erişimi sınırlar."Oturum açma gerekli" etkinse, yalnızca oturum açmış kullanıcılar medya yüklemelerine erişebilir. Aksi takdirde, erişim yalnızca özel mesajlardaki medya yüklemeleri için sınırlandırılır. Not: Bu ayar etkinleştirilmeden önce S3 yüklemeleri etkinleştirilmelidir.'
     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"
@@ -2001,6 +1992,10 @@ tr_TR:
       other: "%{count} gönderiler mevcut bir mesajla birleştirildi: %{topic_link}"
   change_owner:
     post_revision_text: "Sahiplik aktarıldı"
+  publish_page:
+    slug_errors:
+      blank: "boş bırakılamaz"
+      invalid: "geçersiz karakterler barındırıyor"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Bu ileti %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı."
@@ -3033,7 +3028,6 @@ tr_TR:
       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_messages: "Okunmamış İletiler"
       unread_notifications: "Okunmamış Bildirimler"
       liked_received: "Alınan Beğeniler"
       new_users: "Yeni Kullanıcılar"
@@ -3704,7 +3698,6 @@ tr_TR:
       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: "Şüpheli listesindeki kullanıcılar personel tarafından kontrol edilmelidir. Bkz."
     actions:
       agree:
         title: "Kabul..."
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index 5c240cf6e0..ba650b959b 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -59,7 +59,6 @@ uk:
       optimized_link: Посилання на оптимізовані зображення є ефемерними і не повинні включатись у вихідний код теми.
     settings_errors:
       invalid_yaml: "За умови, що YAML недійсний."
-      data_type_not_a_number: "Налаштування `%{name}` не підтримується. Підтримувані типи: `integer`, `bool`, `list` та `enum`"
       name_too_long: "Є налаштування із занадто довгим ім’ям. Максимальна довжина 255"
       default_value_missing: "Налаштування `%{name}` не має значення за замовчуванням"
       default_not_match_type: "Налаштування `%{name}` за замовчуванням, не збігається з типом параметра."
@@ -361,11 +360,10 @@ uk:
       time_must_be_provided: "Для всіх нагадувань повинен бути встановлений час, крім '%{reminder_type}'"
     reminders:
       at_desktop: "Наступного разу на мій робочий стіл"
-      later_today: "Пізніше сьогодні <br/> {{date}}"
-      next_business_day: "Наступний робочий день <br/> {{date}}"
-      tomorrow: "Завтра <br/> {{date}}"
-      next_week: "Наступного тижня <br/> {{date}}"
-      next_month: "Наступного місяця <br/> {{date}}"
+      later_today: "Пізніше сьогодні"
+      tomorrow: "Завтра"
+      next_week: "На наступному тижні"
+      next_month: "В наступному місяці"
       custom: "Вибрана дата та час"
   groups:
     success:
@@ -400,7 +398,6 @@ uk:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "Запит на членство в групі @%{group_name}"
-      handle: "обробляти запит на вступ"
     view_hidden_topic_request_reason: "Я хочу приєднатися до групи '%{group_name}', щоб я міг отримати доступ до [this topic](%{topic_url})"
   education:
     until_posts:
@@ -1312,7 +1309,6 @@ uk:
   dashboard:
     rails_env_warning: "Ваш сервер працює в режимі %{env}."
     host_names_warning: "Ваш файл config/database.yml використовує локальне ім’я хоста за замовчуванням. Поміняйте його на ім’я хоста вашого веб-сайту."
-    gc_warning: 'Ваш сервер використовує параметри сборкі мусори ruby за умовами, що не дають вам найлучшу виробництво. Прочитайте цей розділ про налаштування виробничої якості: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Налаштування Ruby and Rails для Discourse</a>.'
     sidekiq_warning: 'Sidekiq is not running. Many tasks, like sending emails, are executed asynchronously by sidekiq. Please ensure at least one sidekiq process is running. <a href="https://github.com/mperham/sidekiq" target="_blank">Learn about Sidekiq here</a>.'
     queue_size_warning: "The number of queued jobs is %{queue_size}, which is high. This could indicate a problem with the Sidekiq process(es), or you may need to add more Sidekiq workers."
     memory_warning: "Your server is running with less than 1 GB of total memory. At least 1 GB of memory is recommended."
@@ -1407,8 +1403,6 @@ uk:
     detailed_404: "Надає користувачам більше інформації про те, чому він не може отримати доступ до певної теми. Примітка: Це не дуже безпечно, оскільки користувачі дізнаються, чи URL-адреса посилається на дійсну тему."
     enforce_second_factor: "Змушує користувачів включити двохфакторную перевірку справжності. Виберіть 'всі', щоб застосувати його до всіх користувачів. Виберіть 'персонал', щоб примусово застосовувати його тільки до співробітників."
     summary_score_threshold: "Мінімальна оцінка повідомлення, необхідна для його включення в зведення по темі"
-    summary_posts_required: "Мінімальна кількість повідомлень в темі для активації кнопки \"Зведення по темі\""
-    summary_likes_required: "Мінімальна кількість симпатій в темі для активації кнопки \"Зведення по темі\""
     summary_percent_filter: "При натисканні на кнопку \"Зведення по темі\", показувати кращі % дописів"
     summary_max_results: "Максимальна кількість повідомлень, що показуються в 'Зведенні по темі'"
     enable_system_message_replies: "Дозволяє користувачам відповідати на системні повідомлення, навіть якщо приватні повідомлення відключені"
@@ -1439,7 +1433,6 @@ uk:
     markdown_typographer_quotation_marks: "Список подвійних та одиничних лапок змінювати парами"
     post_undo_action_window_mins: "Кількість хвилин, за які користувачі зможуть скасувати останні дії в публікації (наприклад, вподобайки, скарги тощо)"
     must_approve_users: "Персонал повинен схвалити всі нові облікові записи користувачів, перш ніж їм буде надано доступ до сайту"
-    approve_suspect_users: "Персонал повинен схвалити всі підозрювані записи"
     pending_users_reminder_delay: "Повідомляти модераторів, якщо нові користувачі чекають схвалення довше ніж стільки годин. Встановіть -1 для відключення цих повідомлень."
     maximum_session_age: "Користувач залишиться в системі протягом n годин з моменту останнього відвідування"
     moderators_create_categories: "Дозволити модераторам створювати нові категорії"
@@ -1515,7 +1508,6 @@ uk:
     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_discord_logins: "Дозволити користувачам вхід за допомогою Discord?"
-    readonly_mode_during_backup: "Включати режим \"тільки для читання\" під час виконання резервного копіювання"
     enable_backups: "Дозволити адміністраторам створювати резервні копії форуму"
     allow_restore: "Дозволити імпорт, який може замінити ВСІ дані сайту. Залиште вимкненим, якщо не плануєте відновлювати резервну копію"
     maximum_backups: "Максимальна кількість резервних копій для зберігання на диску. Старіші резервні копії автоматично видаляються"
@@ -1985,6 +1977,10 @@ uk:
       other: "Дописи %{count} були об’єднані в існуюче повідомлення: %{topic_link}"
   change_owner:
     post_revision_text: "Право власності передано"
+  publish_page:
+    slug_errors:
+      blank: "не може бути порожнім"
+      invalid: "містить неприпустимі символи"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "Це повідомлення було автоматично закрито після досягнення максимальної межі відповіді %{count}."
@@ -2500,7 +2496,6 @@ uk:
       why: "Короткий підсумок %{site_link} з часу останнього вашого візиту на %{last_seen_at}"
       since_last_visit: "З вашого останнього відвідування"
       new_topics: "Нові теми"
-      unread_messages: "Непрочитані повідомлення"
       unread_notifications: "Непрочитані сповіщення"
       liked_received: "Отримані вподобання"
       new_users: "Нові користувачі"
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index 38a8762336..56288408d5 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -57,7 +57,6 @@ ur:
       no_multilevels_components: "ماتحت تِھیمز والی تِھیمز خود ماتحت تِھیمز نہیں ہو سکتیں"
     settings_errors:
       invalid_yaml: "فراہم کردہ YAML غلط ہے۔"
-      data_type_not_a_number: "ترتیب `%{name}` کی قسم کی اجازت نہیں ہے۔ اجازت یافتہ اقسام `integer'،` bool`، `list` اور `enum` ہیں"
       name_too_long: "بہت طویل نام کے ساتھ ایک ترتیب موجود ہے۔ زیادہ سے زیادہ لمبائی 255 ہے"
       default_value_missing: "ترتیب `%{name}` کی کوئی ڈِیفالٹ قدر نہیں ہے"
       default_not_match_type: "ترتیب `%{name}` کی ڈِیفالٹ قدر کی قِسم، ترتیب قِسم سے مَیچ نہیں کرتی۔"
@@ -308,6 +307,12 @@ ur:
   edit_conflict: "یہ پوسٹ کسی دوسرے صارف کی طرف سے ترمیم کی گئی تھی اور آپ کی تبدیلیوں کو اب محفوظ نہیں کیا جا سکتا۔"
   revert_version_same: "موجودہ وَرژن وہی وَرژن ہے جسے آپ واپس لوٹانے کی کوشش کررہے ہیں۔"
   excerpt_image: "تصویر"
+  bookmarks:
+    reminders:
+      later_today: "آج بعد میں"
+      tomorrow: "کَل"
+      next_week: "اگلے ہفتے"
+      next_month: "اگلے ماہ"
   groups:
     success:
       bulk_add:
@@ -337,7 +342,6 @@ ur:
       trust_level_4: "ٹرسٹ_لَیول_4"
     request_membership_pm:
       title: "@%{group_name} کیلئے رکنیت کی درخواست"
-      handle: "رکنیت کی درخواست سے نمٹیں"
     view_hidden_topic_request_reason: "میں '%{group_name}' گروپ میں شامل ہونا چاہتا ہوں، تاکہ میں [اِس ٹاپک](%{topic_url}) تک رسائی حاصل کر سکوں"
   education:
     until_posts:
@@ -1191,7 +1195,6 @@ ur:
   dashboard:
     rails_env_warning: "آپ کا سرور %{env} مَوڈ میں چل رہا ہے۔"
     host_names_warning: "آپ کی config/database.yml فائل ڈیفالٹ localhost نام استعمال کر رہا ہے۔ اِسے اپنے سائیٹ ہوسٹ کے نام پر اپ ڈیٹ کریں۔"
-    gc_warning: 'آپ کا سرور ڈیفالٹ روبی گاربَیج کولیکشن پیرامیٹرز کا استعمال کر رہا ہے، جو آپ کو بہترین کارکردگی نہیں دے گا۔ کارکردگی کی ٹیوننگ پر اس ٹاپک کو پڑھیں: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">ڈِسکورس کیلئے روبی اور ریلز کی ٹیوننگ</a>۔'
     sidekiq_warning: 'Sidekiq نہیں چل رہا۔ بہت سے کام، جیسا کہ ای میل بھیجنا، sidekq کی طرف سے اےسِنکرونسلی مکمل کیے جاتے ہیں۔ براہ کرم یقینی بنائیں کہ کم ازکم ایک sidekq پراسیس چل رہا ہے۔ <a href="https://github.com/mperham/sidekiq" target="_blank">Sidekiq کے بارے میں یہاں سے جانیے</a>۔'
     queue_size_warning: "قطار میں موجود جابز کی تعداد %{queue_size} ہے، جو کہ زیادہ ہے۔ یہ Sidekiq پراسیس کے ساتھ ایک مسئلہ کی نشاندہی کر سکتا ہے، یا آپ کو مزید Sidekiq کارکنوں کو شامل کرنے کی ضرورت ہوسکتی ہے۔"
     memory_warning: "آپ کا سرور مجموعی طور پر 1 GB سے کم میموری کے ساتھ چل رہا ہے۔ کم ازکم 1 GB میموری تجویز کی گئی ہے۔"
@@ -1297,8 +1300,6 @@ ur:
     force_https: "صرف HTTPS استعمال کرنے کیلئے اپنی سائٹ کو مجبورکریں۔ انتباہ: جب تک آپ تصدیق نہ کر لیں کہ HTTPS مکمل طور پر سیٹ ہے اور ہر جگہ کام کر رہا ہے، اِس کو فعال نہ کریں! کیا آپ نے اپنا CDN، تمام سماجی لاگ ان، اور بیرونی لوگو / انحصارات کو چیک کر کے یہ یقینی بنا لیا ہے کہ وہ تمام HTTPS سے مطابقت رکھتے ہیں؟"
     same_site_cookies: "سَیم سائٹ کے کُوکِیز کا استعمال کریں، وہ قابل براؤزرز (Lax یا Strict) پر تمام ویکٹر Cross Site Request Forgery کو ختم کر دیتے ہیں۔ انتباہ: Strict صرف اُن سائٹس پر کام کرے گا جو لاگ اِن پر مجبور کرتے ہیں اور SSO کا استعمال کرتے ہیں۔"
     summary_score_threshold: "'اِس ٹاپک کا خلاصہ کریں' میں شامل ہونے کیلئے ایک پوسٹ کا کم از کم سکور"
-    summary_posts_required: "'اِس ٹاپک کا خلاصہ کریں' فعال ہونے سے پہلے ٹاپک میں پوسٹس کی کم از کم تعداد"
-    summary_likes_required: "'اِس ٹاپک کا خلاصہ کریں' فعال ہونے سے پہلے ٹاپک میں لائیکس کی کم از کم تعداد"
     summary_percent_filter: "جب صارف 'اِس ٹاپک کا خلاصہ کریں' پر کلک کرتا ہے، تو سب سے اوپر % پوسٹس دکھائیں"
     summary_max_results: "'اِس ٹاپک کا خلاصہ کریں' کی طرف سے لوٹائی جانے والی زیادہ سے زیادہ پوسٹس"
     enable_personal_messages: "ٹرسٹ لَیول 1 (پیغامات بھیجنے کیلئے کم از کم ٹرسٹ لَیول کے ذریعہ ترتیب دے سکتے ہیں) والے صارفین کو پیغامات بنانے اور پیغامات کا جواب دینے کی اجازت دیں۔ نوٹ کریں کہ جوبھی ہو، اسٹاف ہمیشہ پیغامات بھیج سکتا ہے۔"
@@ -1434,7 +1435,6 @@ ur:
     discord_client_id: 'ڈِسکَورڈ کلائنٹ ID (ایک کی ضرورت ہے؟ <a href="https://discordapp.com/developers/applications/me">ڈِسکَورڈ ڈَوَیلپر پَورٹل</a> ملاحظہ کریں)'
     discord_secret: "ڈِسکَورڈ سیکرٹ کی۔"
     discord_trusted_guilds: 'صرف اِن ڈِسکَورڈ گِلڈز کے ممبران کو بذریعہ ڈِسکَورڈ لاگ اِن ہونے کی اجازت دیں۔ گِلڈ کیلئے ہندسوں والی شناخت استعمال کریں۔ مزید معلومات کیلئے، ہدایات کو <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">یہاں</a> چیک کریں۔ کسی بھی گِلڈ کو اجازت دینے کیلئے خالی چھوڑ دیں۔'
-    readonly_mode_during_backup: "بیک اَپ کرتے وقت صرف پڑھنے کا مَوڈ فعال کریں"
     enable_backups: "ایڈمِنِسٹریٹروں کو فورم کے بیک اَپ بنانے کی اجازت دیں"
     allow_restore: "رِیسٹور کی اجازت دیں، جو سائٹ کا تمام ڈیٹا تبدیل کر سکتا ہے! فالس چھوڑ دیں جب تک کہ آپ بیک اَپ بحال نہ کرنے لگیں"
     maximum_backups: "ڈِسک پر رکھے جانے بیک اَپس کی زیادہ سے زیادہ تعداد۔ پرانے بیک اَپس خود کار طریقے سے حذف کر دیے جاتے ہیں"
@@ -1912,6 +1912,10 @@ ur:
       other: "%{count} پوسٹس کو ایک موجودہ پیغام میں ضم کر دیا گیا تھا: %{topic_link}"
   change_owner:
     post_revision_text: "ملکیت منتقل ہو گئی"
+  publish_page:
+    slug_errors:
+      blank: "خالی نہیں ہو سکتا"
+      invalid: "غلط حروف شامل ہیں"
   topic_statuses:
     autoclosed_message_max_posts:
       one: "%{count} جواب کی زیادہ سے زیادہ حد تک پہنچنے کے بعد یہ پیغام خود کار طریقہ سے بند کر دیا گیا تھا۔"
@@ -2887,7 +2891,6 @@ ur:
       why: "آپ کے %{last_seen_at} کو آخری وِزِٹ کے بعد سے %{site_link} کا ایک مختصر خلاصہ"
       since_last_visit: "آپ کے کو آخری وِزِٹ کے بعد سے"
       new_topics: "نئے ٹاپک"
-      unread_messages: "غیر پڑھے پیغامات"
       unread_notifications: "غیر پڑھی اطلاعات"
       liked_received: "لائیکس موصول ہوے"
       new_users: "نئے صارفین"
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 454c36a78b..713ea34ee4 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -31,6 +31,7 @@ vi:
   submit: "Gửi đi"
   disable_remote_images_download_reason: "Không thể tải ảnh về máy chủ vì không dung lượng lưu trữ."
   anonymous: "Ẩn danh"
+  remove_posts_deleted_by_author: "Đã bị xóa bởi tác giả"
   themes:
     import_error:
       git: "Lỗi nhân bản kho git, truy cập bị từ chối hoặc không tìm thấy kho lưu trữ"
@@ -168,11 +169,9 @@ vi:
   bookmarks:
     reminders:
       at_desktop: "Lần sau tôi ở máy tính để bàn của tôi"
-      later_today: "Sau ngày hôm nay <br/> {{date}}"
-      next_business_day: "Ngày làm việc tiếp theo <br/> {{date}}"
-      tomorrow: "Ngày mai <br/> {{date}}"
-      next_week: "Tuần tới <br/> {{date}}"
-      next_month: "Tháng tiếp theo <br/> {{date}}"
+      tomorrow: "Ngày mai"
+      next_week: "Tuần tới"
+      next_month: "Tháng t"
       custom: "Ngày giờ tùy chỉnh"
   groups:
     errors:
@@ -710,8 +709,6 @@ vi:
     email_custom_headers: "Danh sách xác định email header tùy chỉnh"
     force_https: "Buộc trang web của bạn chỉ sử dụng HTTPS. CẢNH BÁO: KHÔNG kích hoạt tính năng này cho đến khi bạn xác minh HTTPS được thiết lập đầy đủ và hoạt động hoàn toàn ở mọi nơi! Bạn đã kiểm tra CDN của mình, tất cả thông tin đăng nhập xã hội và bất kỳ biểu trưng / phụ thuộc bên ngoài nào để đảm bảo tất cả chúng đều tương thích với HTTPS?"
     summary_score_threshold: "Số điểm tối thiểu yêu cầu cho một bài viết bao gồm 'Tóm tắt chủ đề này'"
-    summary_posts_required: "Số bài viết tối thiểu trong một chủ đề trước khi 'Tóm tắt chủ đề này' được kích hoạt"
-    summary_likes_required: "Số lượt thích trong một chủ đề trước khi 'Tóm tắt chủ đề này' được kích hoạt"
     summary_percent_filter: "Khi người dùng nhấn 'Tóm tắt chủ đề này', hiển thị phí trên % của bài viết"
     enable_long_polling: "Message Bus sử dụng để thông báo có thể sử dụng vòng gọi dài"
     long_polling_base_url: "URL chính sử dụng cho vòng gọi dài (khi một CDN phục vụ nội dung động, hãy chắc chắn để thiết lập này là vòng gọi gốc), vd: http://origin.site.com"
@@ -946,7 +943,6 @@ vi:
     delete_drafts_older_than_n_days: "Xóa các bản nháp cũ hơn (n) ngày."
     bootstrap_mode_min_users: "Số thành viên tối thiểu được yêu cầu để tắt chế độ bootstrap (đặt thành 0 để tắt)"
     prevent_anons_from_downloading_files: "Cấm khách truy cập tải các tập tin đính kèm. CẢNH BÁO: việc này sẽ chặn những hình ảnh không thuộc giao diện trang hoạt động"
-    secure_media: 'Giới hạn truy cập để tải lên phương tiện truyền thông (hình ảnh, video, âm thanh). Nếu "yêu cầu đăng nhập" được bật, chỉ Thành viên đã đăng nhập mới có thể truy cập tải lên phương tiện. Nếu không, quyền truy cập sẽ chỉ bị giới hạn đối với các phương tiện tải lên trong các tin nhắn riêng tư. Lưu ý: Tải lên S3 phải được bật trước khi bật cài đặt này.'
     slug_generation_method: "Chọn phương thức tạo slug. 'encoded' sẽ tạo ra phần trăm chuỗi mã hóa. 'none' sẽ tắt slug."
     enable_emoji: "Kích hoạt emoji"
     emoji_set: "Bạn thích dùng gói emoji nào?"
@@ -1008,6 +1004,10 @@ vi:
   redirected_to_top_reasons:
     new_user: "Chào mừng đến với cộng dồng của chúng tôi! Ở đây có những chủ để phổ biến."
     not_seen_in_a_month: "Chào mừng quay trở lại! Chúng tôi thấy bạn truy cập một khoảng thời gian. Ở đây có những bài viết phổ biến từ lúc bạn đ."
+  publish_page:
+    slug_errors:
+      blank: "không được để trống"
+      invalid: "chứa các kí tự không hợp lệ"
   topic_statuses:
     autoclosed_enabled_days:
       other: "Chủ đề này sẽ được tự động đóng sau %{count} ngày, sẽ không được gửi trả lời."
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 09c3f2f18d..38bd9e1d7b 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -12,11 +12,11 @@ zh_CN:
     long_date: "D MMMM YYYY LT"
   datetime_formats: &datetime_formats
     formats:
-      short: "%Y年%m月%d日"
+      short: "%Y-%m-%d"
       short_no_year: "%m月%d日"
       date_only: "%Y年%m月%d日"
-      long: "%Y年%m月%d日%H:%M"
-      no_day: "%B %Y"
+      long: "%Y年%m月%-d日 %H:%M"
+      no_day: "%Y年%m月"
   date:
     month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
     <<: *datetime_formats
@@ -32,11 +32,11 @@ zh_CN:
   sign_up: "注册"
   log_in: "登录"
   submit: "提交"
-  purge_reason: "自动删除为废弃、停用的账户"
+  purge_reason: "自动删除已废弃或已停用的账户"
   disable_remote_images_download_reason: "远程图像下载因为磁盘空间不足已经被停用。"
   anonymous: "匿名"
   remove_posts_deleted_by_author: "被作者删除"
-  redirect_warning: "我们无法验证你选择的链接是否已实际发布到论坛。如果您仍想继续，请选择以下链接。"
+  redirect_warning: "我们无法验证你选择的链接是否已实际发布到论坛。如果你仍想继续，请选择以下链接。"
   on_another_topic: "在另外的主题中"
   themes:
     bad_color_scheme: "无法更新主题，无效的调色板"
@@ -47,19 +47,20 @@ zh_CN:
       generic: 导入该主题时发生错误
       about_json: "导入错误：about.json 不存在或无效"
       about_json_values: "about.json 包含无效值：%{errors}"
+      modifier_values: "about.json 的修改包含无效值：%{errors}"
       git: "克隆 git 储存库时出错，访问被拒绝或找不到存储库"
       unpack_failed: "无法解压缩文件"
       file_too_big: "未压缩的文件太大。"
-      unknown_file_type: "你上传的文件似乎不是可用的 Discourse 主题。"
+      unknown_file_type: "你上传的文件似乎不是一个有效的 Discourse 主题。"
     errors:
       component_no_user_selectable: "主题组件不能由用户选择"
       component_no_default: "主题组件不能是默认主题"
       component_no_color_scheme: "主题组件不能有调色板"
       no_multilevels_components: "具有子主题的主题本身不能是子主题"
-      optimized_link: 优化的图像链接是暂时的，不应包含在主题源代码中。
+      optimized_link: 优化过的图像其链接是暂时的，不应包含在主题源代码中。
     settings_errors:
       invalid_yaml: "提供的 YAML 无效"
-      data_type_not_a_number: "不支持设置 `%{name}` 类型。 支持的类型是 `integer`，`bool`，`list` 和 `enum`"
+      data_type_not_a_number: "设置`%{name}`的值是不支持的类型。支持的类型为`integer`、`bool`、`list` 、`enum`和`upload`"
       name_too_long: "有一个设置的名字太长了。名称的最大长度为 255"
       default_value_missing: "设置 `%{name}` 无默认值"
       default_not_match_type: "设置 `%{name}` 默认值的类型不匹配设置类型。"
@@ -81,27 +82,27 @@ zh_CN:
       default_subject: "此主题需要一个标题"
       show_trimmed_content: "显示被截短的内容"
       maximum_staged_user_per_email_reached: "已达到每个电子邮件可以创建暂存用户的上限。"
-      no_subject: "（无主题）"
+      no_subject: "（无标题）"
       no_body: "（无正文）"
       missing_attachment: "（缺少附件 %{filename}）"
       errors:
         empty_email_error: "收到空白邮件。"
-        no_message_id_error: "邮件头部没有“Message-Id”。"
-        auto_generated_email_error: "邮件头部的优先级(precedence)设置为为：list、junk、bulk 或 auto_reply，或者头部的其他部分包含了：auto-submitted、auto-replied 或 auto-generated。"
+        no_message_id_error: "邮件报头没有“Message-Id”。"
+        auto_generated_email_error: "邮件报头的优先级（precedence）设置为：list、junk、bulk 或 auto_reply，或者头部的其他部分包含了：auto-submitted、auto-replied 或 auto-generated。"
         no_body_detected_error: "无法解析正文并且没有附件。"
         no_sender_detected_error: "当无法在邮件头中找到有效邮件地址时发生。"
-        from_reply_by_address_error: "当 From 标头与回复的电子邮件地址匹配时发生。"
+        from_reply_by_address_error: "报头的 From 字段与回复的电子邮件地址相匹配。"
         inactive_user_error: "发件人未激活。"
-        silenced_user_error: "当发件人被禁言时发生。"
-        bad_destination_address: "当没有一个“收件人/抄送”字段中的电子邮件地址能与与配置的传入电子邮件地址匹配时发生。"
-        strangers_not_allowed_error: "用户尝试在非成员分类中创建主题。"
-        insufficient_trust_level_error: "用户尝试在不满足信任等级要求的分类下发表主题。"
-        reply_user_not_matching_error: "回复邮箱地址与通知发送至的邮件地址不同。"
-        topic_not_found_error: "回复到已经删除的主题。"
-        topic_closed_error: "回复到已经锁定的主题。"
-        bounced_email_error: "邮件是投递失败的错误报告。"
+        silenced_user_error: "发件人被禁言。"
+        bad_destination_address: "“收件人/抄送”字段中的电子邮件地址无法与已配置的传入电子邮件地址匹配。"
+        strangers_not_allowed_error: "用户尝试在一个其未加入的分类中创建主题。"
+        insufficient_trust_level_error: "用户尝试在一个其不满足信任等级要求的分类下发表主题。"
+        reply_user_not_matching_error: "回复的邮箱地址与接受通知的邮件地址不同。"
+        topic_not_found_error: "回复到一个已被删除的主题。"
+        topic_closed_error: "回复到一个已经关闭的主题。"
+        bounced_email_error: "邮件是一份投递失败的错误报告。"
         screened_email_error: "发件人邮箱已经被屏蔽。"
-        unsubscribe_not_allowed: "当用户不能通过邮件退订时发生。"
+        unsubscribe_not_allowed: "用户无法通过邮件进行退订。"
         email_not_allowed: "当用户邮件不在白名单或在黑名单时发生。"
       unrecognized_error: "无法识别的错误"
     secure_media_placeholder: "已编辑：该站点已启用安全媒体，请访问主题以查看随附的图像/音频/视频。"
@@ -129,7 +130,7 @@ zh_CN:
       invalid_timezone: "“%{tz}”不是一个有效的时区"
       contains_censored_words: "包含了以下敏感词:%{censored_words}"
       less_than: "必须小于 %{count}"
-      less_than_or_equal_to: "必须小于等于 %{count}"
+      less_than_or_equal_to: "必须小于或等于 %{count}"
       not_a_number: 不是数字
       not_an_integer: 必须是整数
       odd: 必须是偶数
@@ -149,51 +150,51 @@ zh_CN:
       other_than: "必须不为 %{count}"
       sso_overrides_username: "当`sso_overrides_username`设置是启用的，用户名需要在SSO提供商处更新。"
     template:
-      body: "有下列问题："
+      body: "以下字段有问题："
       header:
-        other: "有 %{count} 个错误使得%{model}无法被保存"
+        other: "有 %{count} 个错误使得 %{model} 无法被保存"
     embed:
       load_from_remote: "载入帖子时出错了。"
     site_settings:
-      invalid_category_id: "你指定的一个分类不存在"
+      invalid_category_id: "你所指定的一个分类是不存在的"
       invalid_choice:
-        other: "你指定了无效的选择%{name}"
-      default_categories_already_selected: "不能选择一个已经用于另一个列表的分类。"
-      default_tags_already_selected: "你不能选择一个被使用在其它列表中的标签。"
+        other: "你指定了无效的选择 %{name}"
+      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。"
       s3_backup_requires_s3_settings: "除非你提供了'%{setting_name}'，否则无法将S3用作备份位置。"
-      s3_bucket_reused: "您不可把同一个 bucket 既用作 ‘s3_upload_bucket’ 又用作 ‘s3_backup_bucket’。请选择不同的 bucket 或为每个 bucket 使用不同的路径。"
+      s3_bucket_reused: "你不可以将同一个 bucket 同时用作 ‘s3_upload_bucket’ 和 ‘s3_backup_bucket’。请选择一个不同的 bucket 或为每个 bucket 使用不同的路径。"
       secure_media_requirements: "在启用安全媒体之前，必须先启用S3上传。"
       second_factor_cannot_be_enforced_with_disabled_local_login: "如果禁用本地登录则无法强制启用2FA。"
       local_login_cannot_be_disabled_if_second_factor_enforced: "如果强制启用2FA则不能禁用本地登录。在禁用本地登录之前，请禁用强制启用2FA。"
-      cannot_enable_s3_uploads_when_s3_enabled_globally: "你无法启用S3上传，因为S3上载已经全局启用了，另外此网站级别的启用可能会导致严重的上传问题"
-    conflicting_google_user_id: '此帐户的Google帐户ID已更改; 出于安全原因，需要管理人员干预。请联系工作人员并将其指向<a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+      cannot_enable_s3_uploads_when_s3_enabled_globally: "你无法启用S3上传，因为S3上传已经全局启用了，另外这样站点级的启用可能会导致上传的文件出现严重问题"
+    conflicting_google_user_id: '此账户的Google账户ID已更改; 出于安全原因，需要管理人员干预。请联系工作人员并指引他们前往<a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   activemodel:
     errors:
       <<: *errors
   invite:
-    not_found: "你的邀请码不正确。请联系<a href='%{base_url}/about'>工作人员</a>。"
+    not_found: "你的邀请码不正确。请<a href='%{base_url}/about'>联系工作人员</a>。"
     not_found_json: "你的邀请码不正确。请联系工作人员。"
     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}/login">登录</a>。</p>
 
       <p>否则请<a href="%{base_url}/password-reset">重置密码</a>。</p>
     error_message: "接受邀请时出错。 请联系该网站的管理员。"
-    user_exists: "不需要邀请<b>%{email}</b>，他们<a href='%{base_path}/u/%{username}/summary'>已经有账户了！</a>"
+    user_exists: "不需要邀请<b>%{email}</b>，他们<a href='%{base_path}/u/%{username}/summary'>已经拥有账户了！</a>"
     confirm_email: "<p>快完成了！我们发送了一封激活邮件到你的邮件地址。请按照邮件中的步骤来激活你的账户。</p><p>如果你没有收到邮件，请检查你的垃圾邮件收件箱。</p>"
   bulk_invite:
     file_should_be_csv: "上传的文件应为 csv 格式。"
     max_rows: "前%{max_bulk_invites}个邀请已经被发出。尝试将文件分割成更小的部分。"
-    error: "上传文件的时候出错了。请重试。"
+    error: "上传文件的时候出错了。请稍后重试。"
   topic_invite:
-    failed_to_invite: "如果没有以下任一组中的组成员身份，则无法邀请用户加入此主题：%{group_names}。"
-    user_exists: "抱歉，用户已经被邀请了。你可能只想邀请用户参与主题一次。"
+    failed_to_invite: "如果用户不是以下任一群组的成员，则无法被邀请加入到此主题：%{group_names}。"
+    user_exists: "抱歉，用户已经被邀请过了。你只可以邀请一个用户到一个主题中一次。"
   backup:
     operation_already_running: "有操作正在运行。目前无法开始新的操作。"
-    backup_file_should_be_tar_gz: "备份文件应为 .tar.gz 存档文件。"
+    backup_file_should_be_tar_gz: "备份文件应该是一个 .tar.gz 存档文件。"
     not_enough_space_on_disk: "没有足够的磁盘空间可供备份文件上传。"
     invalid_filename: "备份文件名包含无效字符。有效字符为 a-z 0-9 . - _."
     file_exists: "你尝试上传的文件已存在。"
@@ -203,42 +204,42 @@ zh_CN:
   invalid_params: "你为请求提供了无效参数：%{message}"
   not_logged_in: "你需要登录后才能这么做。"
   not_found: "找不到请求的地址或资源。"
-  invalid_access: "你没有权限查看请求的资源。"
+  invalid_access: "你没有权限查看所请求的资源。"
   authenticator_not_found: "身份验证方法不存在或已被禁用。"
-  invalid_api_credentials: "你没有权限查看请求的资源。API 用户名或者秘钥无效。"
-  provider_not_enabled: "你不能查看请求的资源。身份验证提供程序未启用。"
-  provider_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: "没有启用密语，或者你无权创建谜语帖子"
+  invalid_grant_badge_reason_link: "徽章原因中不允许外部或无效的discourse链接"
+  email_template_cant_be_modified: "该邮件模板不能被修改"
+  invalid_whisper_access: "没有启用密语或者是你无权创建密语帖子"
   not_in_group:
-    title_topic: "你必须在群组中才能看到此主题。"
-    title_category: "你必须在群组中才能看到此分类。"
+    title_topic: "你必须在群组中才能看到这个主题。"
+    title_category: "你必须在群组中才能看到这个分类。"
     request_membership: "申请会员"
     join_group: "加入群组"
-  deleted_topic: "糟糕！该主题已被删除且不再可用。"
-  delete_topic_failed: "删除该主题时出错。请与网站管理员联系。"
+  deleted_topic: "哎呀！该主题已被删除了并且不再可用。"
+  delete_topic_failed: "删除主题时出错。请与网站管理员联系。"
   reading_time: "阅读时间"
   likes: "赞"
   too_many_replies:
-    other: "我们非常抱歉，但是新用户有发帖限制。在同一主题只能回复 %{count} 次。"
+    other: "我们非常抱歉，新用户被暂时限制同一个主题内回复不超过%{count}次。"
   max_consecutive_replies:
-    other: "不得超过%{count}次连续回复。请编辑你之前的回复，或等待他人的回复。"
+    other: "不得连续回复超过%{count}次。请编辑你之前的回复，或等待某个人回复你。"
   embed:
     start_discussion: "开始讨论"
     continue: "继续讨论"
     error: "嵌入故障"
     referer: "来源："
     error_topics: "站点设置`embed topics list`未启用"
-    mismatch: "引用头要么未发送，要么不匹配以下任何主机："
-    no_hosts: "嵌入没有设置任何主机地址。"
+    mismatch: "引用来源可能没有被发送，也可能是不在下列主机中："
+    no_hosts: "没有为嵌入内容设置任何主机地址。"
     configure: "配置嵌入"
     more_replies:
-      other: "%{count} 个更多回复"
+      other: "更多 %{count} 个回复"
     loading: "讨论载入中…"
     permalink: "永久链接"
-    imported_from: "这是一个已从原 %{link} 中分离的主题"
+    imported_from: "这是一个从原来  %{link} 中分离出来的主题"
     in_reply_to: "▶ %{username}"
     replies:
       other: "%{count}个回复"
@@ -250,29 +251,29 @@ zh_CN:
   no_mentions_allowed: "抱歉，你无法提到其他用户。"
   too_many_mentions:
     other: "抱歉，你一次仅能提到 %{count} 个用户。"
-  no_mentions_allowed_newuser: "抱歉，访客无法@用户。"
+  no_mentions_allowed_newuser: "抱歉，新用户不能@其它用户。"
   too_many_mentions_newuser:
-    other: "抱歉，访客一次仅能@ %{count} 个用户。"
+    other: "抱歉，新用户在一个帖子中最多能@ %{count} 位用户。"
   no_images_allowed_trust: "抱歉，你无法在这个帖子里贴图"
-  no_images_allowed: "抱歉，访客无法贴图。"
+  no_images_allowed: "抱歉，新用户不能在帖子中贴图。"
   too_many_images:
-    other: "抱歉，访客一次仅能贴 %{count} 张图。"
-  no_attachments_allowed: "抱歉，新用户无法上传附件。"
+    other: "抱歉，新用户在一个帖子中仅能贴 %{count} 张图。"
+  no_attachments_allowed: "抱歉，新用户不能在帖子中上传附件。"
   too_many_attachments:
-    other: "抱歉，新用户一次仅能上传 %{count} 个附件。"
-  no_links_allowed: "抱歉，访客无法贴链接。"
+    other: "抱歉，新用户在一个帖子中仅能上传 %{count} 个附件。"
+  no_links_allowed: "抱歉，新用户不能在帖子中发表链接。"
   links_require_trust: "抱歉，你的帖子中不能包含链接。"
   too_many_links:
-    other: "抱歉，访客一次仅能贴 %{count} 条链接。"
+    other: "抱歉，新用户在一个帖子中仅能发表 %{count} 条链接。"
   contains_blocked_word: "你的帖子中包含不允许的词：%{word}"
-  contains_blocked_words: "你的帖子中含有多个被禁止的字符：%{words}"
-  spamming_host: "抱歉，你不能添加一个链接到那个地址的链接。"
+  contains_blocked_words: "你的帖子中含有多个被禁止的词：%{words}"
+  spamming_host: "抱歉，你不能发表该主机的链接。"
   user_is_suspended: "被封禁的用户不允许发贴。"
   topic_not_found: "出现问题。或许这个主题在你看的时候已经被关闭或删除了。"
   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: "自动删除对上一个帖子的完整引用。"
   secure_upload_not_allowed_in_public_topic: "抱歉，无法在公开的主题中使用以下安全上传：%{upload_filenames}。"
   create_pm_on_existing_topic: "抱歉，你无法在现有主题上创建PM。"
   just_posted_that: "太类似于你最近发表的内容"
@@ -305,7 +306,7 @@ zh_CN:
     group_mentions: "%{group_name}组最近的提及"
     user_posts: "最新贴子由 @%{username}发表"
     user_topics: "最新主题由 @%{username}发表"
-    tag: "主题标签"
+    tag: "加标签的主题"
     badge: "%{site_title}的%{display_name}徽章"
   too_late_to_edit: "这个主题在很早之前创建。不能被编辑或者被删除。"
   edit_conflict: "该帖子由其他用户编辑，你的更改无法再保存。"
@@ -314,14 +315,16 @@ zh_CN:
   bookmarks:
     errors:
       already_bookmarked_post: "你不能将同一帖子收藏两次。"
+      cannot_set_past_reminder: "你不能在此主题设置收藏提醒。"
+      cannot_set_reminder_in_distant_future: "你不能够设置一个大于十年的收藏提醒。"
       time_must_be_provided: "必须为除“ %{reminder_type}”以外的所有提醒提供时间"
     reminders:
       at_desktop: "下次我使用桌面设备时"
-      later_today: "晚于今天的"
-      next_business_day: "下个工作日的"
+      later_today: "今天的某个时候"
+      next_business_day: "下一个工作日"
       tomorrow: "明天"
-      next_week: "下周"
-      next_month: "下个月<br/> {{date}}"
+      next_week: "下个星期"
+      next_month: "下个月"
       custom: "自定义日期和时间"
   groups:
     success:
@@ -350,7 +353,6 @@ zh_CN:
       trust_level_4: "信任等级4"
     request_membership_pm:
       title: "%{group_name}的成员请求"
-      handle: "处理成员请求"
     view_hidden_topic_request_reason: "我希望加入群组 “%{group_name}” 以访问[此主题](%{topic_url})"
   education:
     until_posts:
@@ -414,9 +416,9 @@ zh_CN:
     reviving_old_topic: |
       ### 重新激活这个主题？
 
-      这个主题的最后一个回复距今已有**%{time_ago}**。你的回复将让主题重新出现在列表的顶端并通知原先参与讨论的人。
+      该主题最后的回复是**%{time_ago}**。你的回复将让主题重新出现在列表的顶端并通知所有原先参与过讨论的人。
 
-      你确定要继续这个老的话题吗？
+      你确定要延续这个久远的话题吗？
   activerecord:
     attributes:
       category:
@@ -438,7 +440,7 @@ zh_CN:
               warning_requires_pm: "你只能在个人消息中附加警告。"
               too_many_users: "一次只能发送警告给一个用户。"
               cant_send_pm: "抱歉，你不能向该用户发送消息。"
-              no_user_selected: "必须选择一个有效的用户。"
+              no_user_selected: "你必须选择一个有效的用户。"
               reply_by_email_disabled: "用邮件回复已被禁止"
               target_user_not_found: "未找到你要向其发送此消息的其中一个用户"
             featured_link:
@@ -459,6 +461,10 @@ zh_CN:
               same_as_password: "和你的密码相同。"
             ip_address:
               signup_not_allowed: "不能使用这个账户登录。"
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "该主题不能显示在你的个人资料中。"
         user_email:
           attributes:
             user_id:
@@ -551,13 +557,13 @@ zh_CN:
       email_already_used_in_category: "'%{email}' 已经被分类'%{category_name}'使用了。"
       description_incomplete: "分类描述帖至少要有一段。"
       permission_conflict: "所有被允许访问一个子分类的群组也必须能够访问其上级分类。下列群组能够访问某个子分类，但不能访问上级分类： %{group_names}。"
-      disallowed_topic_tags: "此主题包含此类别不允许的标签：%{tags}"
+      disallowed_topic_tags: "此主题含有不允许在该分类中使用的标签：%{tags}"
       disallowed_tags_generic: "此主题有反对标签。"
     cannot_delete:
-      uncategorized: "这是个特殊的分类。如果不知道应该话题属于哪个分类，那么请使用这个分类；这个分类不能被删除。"
+      uncategorized: "这个分类是特殊的。它用于存放没有分类的主题；不能被删除。"
       has_subcategories: "不能删除该分类，因为它有子分类"
       topic_exists:
-        other: "不能删除该分类，因为它有%{count}个主题。最老的主题是%{topic_link}。"
+        other: "不能删除该分类，因为它有%{count}个主题。最久远的主题是%{topic_link}。"
       topic_exists_no_oldest: "不能删除该分类，因为主题数量为 %{count}。"
     uncategorized_description: "不需要分类或者不适合放在现有的任何分类中的主题。"
   trust_levels:
@@ -641,9 +647,9 @@ zh_CN:
       x_days:
         other: "%{count}天前"
       about_x_months:
-        other: "大约%{count}分钟前"
+        other: "大约%{count}个月前"
       x_months:
-        other: "%{count}分钟前"
+        other: "%{count}个月前"
       about_x_years:
         other: "大约%{count}年前"
       over_x_years:
@@ -710,7 +716,7 @@ zh_CN:
       almost_done_title: "确认新的电子邮件地址"
       almost_done_description: "我们需要发送一封电子邮件到您的新电子邮件地址以确认更改！"
   associated_accounts:
-    revoke_failed: "无法使用%{provider_name}撤消你的帐户。"
+    revoke_failed: "无法使用%{provider_name}吊销你的账户。"
     connected: "（已连接）"
   activation:
     action: "点击这儿激活你的账户"
@@ -719,7 +725,7 @@ zh_CN:
     continue_button: "转入到%{site_name}"
     welcome_to: "欢迎来到%{site_name}！"
     approval_required: "你的新账户需要由一位论坛版主手动批准方可使用。一旦你的账户获得批准，你将收到一封电子邮件通知！"
-    missing_session: "无法确认你是否注册了帐户，请确定你已经启用了 cookie。"
+    missing_session: "无法确认你是否注册了账户，请确认你已经启用了 cookie。"
     activated: "抱歉，这个账户已经被激活了。"
     admin_confirm:
       title: "确认管理员账户"
@@ -854,7 +860,7 @@ zh_CN:
     unwatch_category: "不再关注%{category}分类中的所有主题"
     mailing_list_mode: "停用邮件列表模式"
     all: "不要从%{sitename}给我发送任何邮件"
-    different_user_description: "你登录的帐户与邮件不符。请登出，或进入隐私模式，然后再重试。"
+    different_user_description: "你当前登录的账户与我们所发送邮件的用户不符。请登出，或进入隐私模式，然后重试。"
     not_found_description: "对不起，我们找不到这个退订链接。有可能你的邮件中的链接已经过期？"
     log_out: "退出"
     submit: "保存设置"
@@ -946,7 +952,7 @@ zh_CN:
         time_to_resolution: 解决时间
       description: "标记状态列表，包括标记类型，作者，标记人和解决时间。"
     visits:
-      title: "用户访问量"
+      title: "用户访问量（UV）"
       xaxis: "天"
       yaxis: "访问量"
       description: "用户浏览数"
@@ -966,7 +972,7 @@ zh_CN:
         tl1_reached: "达到信任等级1"
         tl2_reached: "达到信任等级2"
         tl3_reached: "达到信任等级3"
-        tl4_reached: "达到TL4"
+        tl4_reached: "达到信任等级4"
       yaxis: "天"
       description: "在此期间提升了其信任等级的用户数量。"
     consolidated_page_views:
@@ -995,12 +1001,12 @@ zh_CN:
     profile_views:
       title: "查看用户资料"
       xaxis: "天"
-      yaxis: "已看的用户资料数量"
+      yaxis: "用户资料访问量"
       description: "用户个人信息页的新访问数。"
     topics:
       title: "新发表主题"
       xaxis: "天"
-      yaxis: "新主题数"
+      yaxis: "新主题的数量"
       description: "在此期间创建的新主题。"
     posts:
       title: "新发表帖子"
@@ -1010,7 +1016,7 @@ zh_CN:
     likes:
       title: "新的赞"
       xaxis: "天"
-      yaxis: "新的赞数"
+      yaxis: "新的赞的数量"
       description: "新的赞数。"
     flags:
       title: "标记"
@@ -1021,7 +1027,7 @@ zh_CN:
       title: "收藏"
       xaxis: "天"
       yaxis: "新收藏数"
-      description: "新主题和帖子的收藏数。"
+      description: "新主题和帖子的收藏数量。"
     users_by_trust_level:
       title: "各信任等级的用户数"
       xaxis: "信任等级"
@@ -1029,6 +1035,7 @@ zh_CN:
       labels:
         level: 等级
       description: "按信任级别分组的用户数。"
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "用户类型"
       xaxis: "类型"
@@ -1040,7 +1047,7 @@ zh_CN:
         moderator: 版主
         suspended: 已封禁
         silenced: 禁言
-      description: "按管理员，主持人，冻结和禁言分组的用户数。"
+      description: "按管理员，版主，封禁和禁言所分组的用户数量。"
     trending_search:
       title: 热门搜寻字词
       labels:
@@ -1072,7 +1079,7 @@ zh_CN:
       title: "版主警告"
       xaxis: "天"
       yaxis: "私信数"
-      description: "来自版主发送的警告消息的数量。"
+      description: "来自版主的警告消息数量。"
     notify_moderators_private_messages:
       title: "版主通知"
       xaxis: "天"
@@ -1105,25 +1112,25 @@ zh_CN:
         num_topics: 主题
       description: "与此网站链接最多的外部资源。"
     top_referred_topics:
-      title: "最多被引主题"
+      title: "被引用最多的主题"
       labels:
         num_clicks: "点击数"
         topic: "主题"
-      description: "从外部来源获得最多点击次数的主题。"
+      description: "从外部来源获得最多点击的主题。"
     page_view_anon_reqs:
       title: "匿名"
       xaxis: "天"
-      yaxis: "未登录页面访问"
-      description: "未登录访问者的页面访问量(PV)。"
+      yaxis: "匿名访问量（PV）"
+      description: "未登录访问者的页面访问量（PV）。"
     page_view_logged_in_reqs:
       title: "已登录"
       xaxis: "天"
-      yaxis: "已登录页面访问"
-      description: "登陆用户的新页面访问量。"
+      yaxis: "已登录访问量（PV）"
+      description: "新的已登陆用户访问量"
     page_view_crawler_reqs:
       title: "Web爬虫页面访问量"
       xaxis: "天"
-      yaxis: "Web 爬虫页面访问"
+      yaxis: "Web 爬虫访问量（PV）"
       description: "一段时间内的Web爬虫页面访问量。"
     page_view_total_reqs:
       title: "浏览量"
@@ -1133,7 +1140,7 @@ zh_CN:
     page_view_logged_in_mobile_reqs:
       title: "已登录页面访问"
       xaxis: "天"
-      yaxis: "移动端已登录页面访问"
+      yaxis: "移动端已登录的访问量（PV）"
       description: "移动设备上已登录用户的新页面访问量。"
     page_view_anon_mobile_reqs:
       title: "未登录页面访问"
@@ -1184,7 +1191,7 @@ zh_CN:
       labels:
         user_agent: "用户代理"
         page_views: "浏览量"
-      description: "网络爬虫UA列表，根据访问量排序。"
+      description: "网络爬虫用户代理列表，根据访问量排序。"
     suspicious_logins:
       title: "可疑登录"
       labels:
@@ -1200,7 +1207,7 @@ zh_CN:
       title: "管理员登陆"
       labels:
         user: 用户
-        location: 地点
+        location: 位置
         login_at: 登录于
       description: "有地点信息的管理员登录时间列表。"
     top_uploads:
@@ -1210,18 +1217,17 @@ zh_CN:
         extension: 扩展
         author: 作者
         filesize: 文件大小
-      description: "按文件扩展名，大小和作者列出所有上传内容。"
+      description: "根据文件扩展名、大小和作者排列所有上传内容。"
     top_ignored_users:
-      title: "最多的忽略/忽视的用户"
+      title: "排名最高的被忽视或忽略的用户"
       labels:
-        ignored_user: 无视的用户
-        ignores_count: 忽视计数
+        ignored_user: 忽视的用户
+        ignores_count: 被忽视次数
         mutes_count: 静音计数
       description: "被许多其他用户忽略和/或忽视的用户。"
   dashboard:
     rails_env_warning: "你的服务器运行在 %{env} 模式。"
-    host_names_warning: "你的 config/database.yml 文件使用的是缺省的 localhost 主机名。请更改成你的站点主机名。"
-    gc_warning: '你的服务器使用的是缺省的ruby垃圾回收参数，这个配置无法提供最高性能。请阅读此性能调优文档：<a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126">Tuning Ruby and Rails for Discourse</a>。'
+    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: "你的服务器环境内存少于 1GB，我们建议至少要有 1GB 内存。"
@@ -1240,8 +1246,8 @@ zh_CN:
     bad_favicon_url: "网站图标无法载入。检查<a href='%{base_path}/admin/site_settings'>站点设置</a>中的图标设置。"
     deprecated_api_usage: "我们检测到了不建议使用的身份验证方法的API请求。请更新以使用<a href='https://meta.discourse.org/t/-/22706'>基于header的认证</a> 。更新后，此消息可能需要24小时才能消失。"
     update_mail_receiver: "我们检测到一个过时的电子邮件收信人版本。点击<a href='https://meta.discourse.org/t/-/133491'>这里</a>查看更新说明。更新后，此消息后可能需要24小时才会消失。"
-    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>。"
+    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: "我们无法检查以下主题的更新："
@@ -1264,8 +1270,8 @@ zh_CN:
     min_personal_message_title_length: "私信标题允许的最小字符数"
     max_emojis_in_title: "主题标题中允许的最大表情数量"
     min_search_term_length: "搜索条件允许的最少字符数"
-    search_tokenize_chinese_japanese_korean: "在非中/日/韩语站点强制切割中/日/韩语搜索分词"
-    search_prefer_recent_posts: "如果搜索大型论坛较慢，这个选项将优先尝试最新的帖子"
+    search_tokenize_chinese_japanese_korean: "即使在非CJK站点上也强制切割中文、日文、韩文的搜索分词。"
+    search_prefer_recent_posts: "如果搜索大型论坛较慢，此选项将尝试优先索引新的帖子"
     search_recent_posts_size: "索引多少最新的主题"
     log_search_queries: "记录用户执行的搜索查询。"
     search_query_log_max_size: "要保留的最大搜索查询量。"
@@ -1281,12 +1287,12 @@ zh_CN:
     educate_until_posts: "当用户开始键入他们的前几个（n）新帖子时，在编辑器上显示教育面板弹窗。"
     title: "站点名字，用于 title 标签。"
     site_description: "用一句话描述这个论坛，用于 meta 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>联系表。"
+    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: "本地最小可用下载外部图片到本地的空间（百分比）"
+    download_remote_images_to_local: "通过下载将远程图像转换为本地图像；此选项可避免图像损坏。"
+    download_remote_images_threshold: "下载远程图像到本地所需的最小硬盘空间（百分比）"
     download_remote_images_max_days_old: "不下载超过 n 天的帖子中的远程图片。"
     disabled_image_download_domains: "域名列表，链接到这些站点的图片不会被下载。用 | 分割。"
     editing_grace_period: "在 (n) 秒之内，对帖子的编辑不生成帖子历史。"
@@ -1300,10 +1306,10 @@ zh_CN:
     max_image_width: "帖子中图片允许的最大缩略图宽度"
     max_image_height: "帖子中图片允许的最大缩略图宽度"
     responsive_post_image_sizes: "调整预览图像的大小以允许以下像素比率的高DPI屏幕。 删除所有值以禁用响应图像。"
-    fixed_category_positions: "如果选择，你将可以设置一个固定的分类顺序。如果不选择，分类将按照活动的顺序显示。"
-    fixed_category_positions_on_create: "如果选择了，目录排序将会在话题创建对话框中被包含(要求固定目录位置选项)"
-    add_rel_nofollow_to_user_content: '添加 rel nofollow 属性到所有的用户内容，除了内部链接（包括父域名）。如果你更改了这个，你必须重新调制所有帖子，以该命令：“rake posts:rebake”'
-    exclude_rel_nofollow_domains: "Nofollow 的域名列表不应被加入到链接中。 填写 example.com 也将自动允许 sub.example.com。至少你应该填写本站域名来帮助爬虫获得所有内容。如果你网站的其余部分在另外的域名，也请添加那些域名。"
+    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: "帖子摘要的最大字符长度"
     show_pinned_excerpt_mobile: "移动版显示置顶主题剪辑。"
     show_pinned_excerpt_desktop: "桌面版显示置顶主题剪辑。"
@@ -1313,32 +1319,32 @@ zh_CN:
     enable_inline_onebox_on_all_domains: "忽略 inline_onebox_domain_whitelist 站点设定并在所有域允许一致 Onebox 。"
     force_custom_user_agent_hosts: "在所有请求上使用自定义 onebox 用户代理的主机。（对于限制用户代理访问的主机尤其有用）。"
     max_oneboxes_per_post: "帖子中最多的 Onebox 数量。"
-    logo: "你网站左上角的logo图片。使用高120且宽高比大于3:1的宽矩形图像。如果留空，将显示网站标题文本。"
-    logo_small: "出现在你站点左上角的小号标志图片，当滚动后可见。使用方形120×120图像。如果留空，将显示主页图标。"
-    digest_logo: "网站电子邮件摘要顶部使用的备用logo图片。使用宽矩形图像。不要使用SVG图像。 如果留空，将使用“logo”设置中的图像。"
-    mobile_logo: "网站的移动版本上使用的logo。使用高120且宽高比大于3:1的宽矩形图像。 如果留空，将使用“logo”设置中的图像。"
+    logo: "你网站左上角的商标图像。使用高120且宽高比大于3:1的宽矩形图像。如果留空，将显示网站的标题文本。"
+    logo_small: "出现在你站点左上角的小号的商标图像，滚动后可见。使用方形120×120的图像。如果留空，将显示一个主页图标。"
+    digest_logo: "邮件摘要顶部所使用的备用商标图像。使用宽矩形的图像。不要使用SVG图像。 如果留空，将使用`logo`设置中的图像。"
+    mobile_logo: "网站的移动版本上使用的商标。使用高120且宽高比大于3:1的宽矩形图像。 如果留空，将使用`logo`设置中的图像。"
     large_icon: "用作其他元数据图标的基础的图像。 理想情况下应大于512 x 512。如果留空，将使用logo_small。"
-    manifest_icon: "在Android上用作logo/启动图像的图像。将自动调整为512×512。如果留空，将使用large_icon。"
-    favicon: "你的站点图标（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: "默认打开的图像，在页面没有其他合适图像时使用。如果留空，将使用large_icon"
-    twitter_summary_large_image: "Twitter卡“摘要大图”（宽度至少应为280，高度至少为150）。如果留空，则使用opengraph_image生成常规卡片元数据。"
+    manifest_icon: "用作Android图标的图像。会被自动调整为512×512。如果留空，将使用large_icon。"
+    favicon: "你的站点图标（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 记录以发送邮件。"
-    email_custom_headers: "一个逗号分离的自定义邮件头部"
+    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: "强制用户启用双重因素验证。选择“所有”以强制所有用户。算账“管理员”仅强制管理员用户。"
+    enforce_second_factor: "强制用户启用双重验证。选择“all”以强制所有用户启用。选择“staff”仅强制管理人员。"
     force_https: "强制使用 https。警告：开启前必须确认 HTTPS 已经配置并能够正常使用！你检查了 CDN、第三方登录和站外的 logo / 依赖是否支持 HTTPS 了吗？"
     same_site_cookies: "使用 Same-site cookies以消除所有跨站请求伪造（CSRF）的攻击面（Lax 或 Strict）。警告：Strict 仅在强制登录并使用 SSO 的站点有效。"
-    summary_score_threshold: "将一个帖子包含在'摘要模式'中所需的最小分值"
-    summary_posts_required: "在一个主题启用'摘要模式'的最小帖子数量"
-    summary_likes_required: "在一个主题启用'摘要模式'的最小赞的数量"
-    summary_percent_filter: "当用户点击摘要，显示前 % 几的帖子"
-    summary_max_results: "“概括主题”返回的最大帖子数量"
+    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: "启用 Message bus 使通知功能可以使用长轮询（long polling）"
-    long_polling_base_url: "长轮询的基本 URL（当用 CDN 分发动态能让时，请设置此至原始拉取地址）例如：http://origin.site.com"
+    long_polling_base_url: "用于长轮询的基本 URL（当使用 CDN 分发动态内容时，确保将此设为源站地址）例如：http://origin.site.com"
     long_polling_interval: "当没有数据向客户端发送时服务器端应等待的时间（仅对已登录用户有效）"
     polling_interval: "当不再长轮询时，已登录的客户端多久应该轮询一次，以毫秒为单位"
     anon_polling_interval: "匿名客户端轮询时间间隔（单位：毫秒）"
@@ -1352,7 +1358,7 @@ zh_CN:
     tl2_additional_likes_per_day_multiplier: "增加信任等级2（成员）的赞限制，可提供一个乘数与原始值相乘"
     tl3_additional_likes_per_day_multiplier: "增加信任等级3（常规）的每日赞限制，将此设置项与原始值相乘"
     tl4_additional_likes_per_day_multiplier: "增加信任等级4（资深）的赞限制，可提供一个乘数与原始值相乘"
-    num_users_to_silence_new_user: "如果新用户被不同用户标记了 num_spam_flags_to_silence_new_user 次垃圾信息，隐藏他们的所以帖子并禁止发音。设置为 0 禁用。"
+    num_users_to_silence_new_user: "如果新用户被不同用户标记为垃圾信息num_spam_flags_to_silence_new_user 次，隐藏他们的所有帖子并禁止发言。设置为 0 禁用。"
     num_tl3_flags_to_silence_new_user: "如果新用户被 num_tl3_users_to_silence_new_user 个信任等级3的用户标记垃圾信息，隐藏他们的所以帖子并禁止发音。设置为 0 禁用。"
     num_tl3_users_to_silence_new_user: "如果新用户被不同信任等级3的用户标记 num_tl3_flags_to_silence_new_use 为标记垃圾信息，隐藏他们的所以帖子并禁止发音。设置为 0 禁用。"
     notify_mods_when_user_silenced: "如果用户被自动禁言了，发私信给所有版主。"
@@ -1364,7 +1370,8 @@ zh_CN:
     markdown_typographer_quotation_marks: "双引号和单引号替换对的列表"
     post_undo_action_window_mins: "允许用户在帖子上进行撤销操作（赞、标记等）所需等待的间隔分钟数"
     must_approve_users: "新注册用户必须获得职员批准方能访问"
-    approve_suspect_users: "工作人员必须批准所有可疑账户"
+    invite_code: "用户必须输入此代码才能够进行账户注册，留空则无需输入（大小写敏感）"
+    approve_suspect_users: "添加可疑用户到审核队列。可疑用户填写了简介或网站但是没有浏览行为。"
     pending_users_reminder_delay: "如果新用户等待批准时间超过此小时设置则通知版主。设置 -1 关闭通知。"
     maximum_session_age: "用户自访问后可维持登录 n 小时"
     ga_universal_tracking_code: "Google Universal Analytics（analytics.js）跟踪代码ID，例如：UA-12345678-9; 请参阅<a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -1383,21 +1390,21 @@ zh_CN:
     slow_down_crawler_user_agents: "Web爬虫的用户代理，应使用Crawl-delay指令在robots.txt中进行速率限制"
     slow_down_crawler_rate: "如果指定了slow_down_crawler_user_agents，则此速率将适用于所有抓取工具（请求之间的延迟秒数）"
     content_security_policy: "启用内容安全策略"
-    content_security_policy_report_only: "只启用内容安全报告策略"
-    content_security_policy_collect_reports: "在/csp_reports上启用内容安全策略违规报告收集"
-    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禁用。"
+    content_security_policy_report_only: "只启用内容安全策略报告"
+    content_security_policy_collect_reports: "在/csp_reports上启用内容安全策略违规报告集"
+    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: "帖子菜单中默认隐藏的按钮，点击省略号后显示。"
     share_links: "决定分享对话框中出现的按钮及显示顺序。"
-    site_contact_username: "论坛给用户自动发送私信时使用的用户名；如果留空将使用默认的系统账户。"
-    site_contact_group_name: "被邀请到所有自动消息的有效群组名称。"
+    site_contact_username: "发送自动消息时所使用的有效的管理人员用户名。如果留空将使用默认的系统账户。"
+    site_contact_group_name: "会被邀请到所有自动私信的有效群组名。"
     send_welcome_message: "给所有用户发送快速开始指导的私信"
     send_tl1_welcome_message: "向新的信任级别1用户发送欢迎消息。"
-    suppress_reply_directly_below: "当一个帖子只有一个回复时，不显示帖子回复数量。"
-    suppress_reply_directly_above: "当一个帖子只有一个回复时，不显示回复到该贴的回复。"
-    remove_full_quote: "自动删除直接回复的引用。"
+    suppress_reply_directly_below: "当只有一个回复直接位于该帖下方时，不显示可展开的回复计数。"
+    suppress_reply_directly_above: "当直接回复上一个帖子时，不要在回复上显示展开的标记。"
+    remove_full_quote: "自动删除直接回复的完整引用。"
     suppress_reply_when_quoting: "当帖子引用回复时，不显示可展开的回复到某贴的标记。"
     max_reply_history: "扩展回复至时显示的最大回复数量"
     topics_per_period_in_top_summary: "在一个主题底部显示的默认推荐主题的数量。"
@@ -1413,6 +1420,7 @@ zh_CN:
     allow_index_in_robots_txt: "在robots.txt中指定允许网络搜索引擎建立该网站的索引。在特殊情况下，你可以永久<a href='%{base_path}/admin/customize/robots'>覆盖robots.txt</a> 。"
     email_domains_blacklist: "用管道符“|”分隔的邮箱域名黑名单列表，其中的域名将不能用来注册账户，例如：mailinator.com|trashmail.net"
     email_domains_whitelist: "用管道符“|”分隔的电子邮箱域名的列表，用户必须使用这些邮箱域名注册。警告：用户使用不包含在这个列表里的邮箱域名，将无法成功注册。"
+    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>仪表板上显示新版本消息"
@@ -1445,7 +1453,7 @@ zh_CN:
     sso_overrides_card_background: "从SSO有效负载覆盖用户卡背景与外部站点头像。"
     sso_not_approved_url: "重定向未受许可的单点登录账户至这个 URL"
     sso_allows_all_return_paths: "不限制 SSO 提供的 return_paths 中的域名（默认情况下返回地址必须位于当前站点）"
-    enable_local_logins: "启用本地用户名和密码登录帐户。必须启用此选项才能使邀请生效。警告：如果禁用，如果之前未配置至少一种备用登录方法，则可能无法登录。"
+    enable_local_logins: "启用基于本地用户名和密码登录的账户。必须启用此选项才能使邀请生效。警告：如果禁用，且之前未配置至少一种备用登录方法，则可能无法登录。"
     enable_local_logins_via_email: "允许用户请求通过电子邮件将一键登录链接发送给他们。"
     allow_new_registrations: "允许新用户注册。取消选择将阻止任何人创建一个新账户。"
     enable_signup_cta: "显示推荐创建账户的提示给那些回访的未注册用户。"
@@ -1454,7 +1462,7 @@ zh_CN:
     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'>为话语配置Twitter登录（和丰富的嵌入）</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_instagram_logins: "启用 Instagram 验证，需要 instagram_consumer_key 和 instagram_consumer_secret"
@@ -1470,7 +1478,6 @@ zh_CN:
     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>的说明。留空则允许任意公会。'
-    readonly_mode_during_backup: "备份时启用只读模式"
     enable_backups: "允许管理员创建论坛备份"
     allow_restore: "允许导入数据，这将能替换所有全站数据！除非你计划导入数据，否则请保持设置为 false"
     maximum_backups: "磁盘保存的最大备份数量。老的备份将自动删除"
@@ -1485,7 +1492,7 @@ zh_CN:
     backup_with_uploads: "在备份日程中包括上传。关闭此项仅备份数据库。"
     backup_location: "存储备份的位置。重要信息：S3需要在文件设置中输入有效的S3凭据。"
     backup_gzip_compression_level_for_uploads: "用于压缩上传的Gzip压缩级别"
-    include_thumbnails_in_backups: "备份中包含略缩图。禁用会减小备份的体积，但是恢复备份后需要rabake所有帖子。"
+    include_thumbnails_in_backups: "备份中包含略缩图。禁用后会使备份文件更小，但是恢复备份后需要rabake所有帖子。"
     active_user_rate_limit_secs: "更新“上次访问”数据的间隔，单位为秒"
     verbose_localization: "在界面上显示详细的本地化提示"
     previous_visit_timeout_hours: "系统判断一次访问之后多少小时后为“上一次”访问"
@@ -1515,11 +1522,11 @@ zh_CN:
     categories_topics: "要在 /categories 页面中显示的主题数量。如果设置为0，它将自动尝试寻找一个值来保持两列对称（分类和主题）。"
     suggested_topics: "在一个主题底部显示的推荐主题的数量。"
     limit_suggested_to_category: "只在当前分类的推荐帖子列表中显示帖子。"
-    suggested_topics_max_days_old: "推荐主题创建时间不能大于 n 天。"
+    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_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访问密钥”设置。'
@@ -1536,13 +1543,13 @@ zh_CN:
     selectable_avatars: "用户可以选择的头像列表。"
     allow_all_attachments_for_group_messages: "允许群组私信中包含任何邮件附件。"
     png_to_jpg_quality: "转换 JPG 文件的质量（1 是最低，99 最高，100 禁用）。"
-    allow_staff_to_upload_any_file_in_pm: "允许管理人员在私信中上传任何文件。"
+    allow_staff_to_upload_any_file_in_pm: "允许管理人员在私信中上传任意文件。"
     strip_image_metadata: "剥离图像元数据。"
     min_ratio_to_crop: "用于裁剪高图像的比率。输入宽/高值。"
     simultaneous_uploads: "可以在编辑器中拖放的最大文件数"
     enable_flash_video_onebox: "在 Onebox 启用嵌入 swf 和 flv 链接（Adobe Flash）。警告：可能增加安全风险。"
-    default_invitee_trust_level: "受邀用户的缺省信任等级（0-4）。"
-    default_trust_level: "所有新用户的缺省信任等级（0-4）。警告！改变此项将提高广告泛滥的风险。"
+    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所需要阅读帖子耗费的分钟数。"
@@ -1562,7 +1569,7 @@ zh_CN:
     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_requires_max_flagged: "要提升到信任等级3，用户在考察时间段内不得被x个不同用户标记超过x个帖子，x为此设置的值。（设置为0或更高）"
     tl3_promotion_min_duration: "信任等级3的用户可被降级至信任等级2前最小持续天数。"
     tl3_requires_likes_given: "要升到信任等级3所需要的，在最近考察时间段内用户必须要给出的赞（设置为 0 或更高）"
     tl3_requires_likes_received: "要升到信任等级3所需要的，在最近考察时间段内用户必须要收到的赞（设置为 0 或更高）"
@@ -1614,7 +1621,7 @@ zh_CN:
     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: "帖子在编辑后编辑指示器轻微高亮的小时数"
@@ -1627,12 +1634,12 @@ zh_CN:
     tos_url: "如果你的服务条款文档在外部，那么请在此填写其完整 URL 地址。"
     privacy_policy_url: "如果你的隐私政策文档在外部，那么请在此填写其完整 URL 地址。"
     log_anonymizer_details: "匿名后是否将用户的详细信息保留在日志中。在遵守GDPR时，你需要关闭它。"
-    newuser_spam_host_threshold: "新用户能添加至指向同一主机的链接的 newuser_spam_host_threshold 次数。超过阈值后将用户视为垃圾投递者。"
-    white_listed_spam_host_domains: "广告主机白名单域名列表。新用户可以任意链接至这些域名。"
+    newuser_spam_host_threshold: "被判定为垃圾前，新用户能发表指向同一主机的链接的次数。"
+    white_listed_spam_host_domains: "垃圾域名白名单列表。新用户发帖不会限制这些域名的链接"
     staff_like_weight: "管理人员赞时的额外权重。"
     topic_view_duration_hours: "按照每 IP/用户每 N 小时来记录一次新的主题访问"
     user_profile_view_duration_hours: "按照每 IP/用户每 N 小时来记录用户资料访问数"
-    levenshtein_distance_spammer_emails: "当匹配广告邮件时，模糊匹配判断差异的字符数。"
+    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) 天后删除不匹配的已屏蔽的邮件地址。"
@@ -1640,7 +1647,7 @@ zh_CN:
     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: "检查用户首贴的大小写不相关的正则表达式。如匹配，用户将被禁言并送至审核队列。例子：raging|a[bc]a 将匹配 raging、aba 或者 aca，因此禁言该用户。只对首贴有效。"
@@ -1654,27 +1661,27 @@ zh_CN:
     alternative_reply_by_email_addresses: "通过邮件回复的回复地址模板，例如：%%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "传入电子邮件使用HTML而不是文本。"
     strip_incoming_email_lines: "移除入站邮件每行的首尾空格"
-    disable_emails: "防止Discourse发送任何类型的电子邮件。 选择“是”以禁用所有用户的电子邮件。选择“非管理人员”仅为非管理用户禁用电子邮件。"
+    disable_emails: "阻止Discourse发送任何类型的电子邮件。 选择“yes”为所有用户禁用邮件。选择“non-staff”仅为非管理人员用户禁用邮件。"
     strip_images_from_short_emails: "忽略邮件中小于 2800 字节的图片"
-    short_email_length: "短邮件地址长度（以比特作为单位）"
-    display_name_on_email_from: "在邮件的来自栏显示昵称"
+    short_email_length: "缩短后的邮件长度（Bytes）"
+    display_name_on_email_from: "在邮件的来源中显示全名"
     unsubscribe_via_email: "允许用户在发送的邮件“退订”来退订邮件订阅，“退订”可在主题或正文中。"
-    unsubscribe_via_email_footer: "在发出的邮件底部包含退订链接"
+    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 禁止限制"
+    max_emails_per_day_per_user: "每日发送给用户的邮件数量上限。设置为 0 则不限制"
     enable_staged_users: "处理进站邮件时自动创建暂存用户。"
     maximum_staged_users_per_email: "处理进站邮件时可创建的最大暂存用户量。"
     auto_generated_whitelist: "不会被检查是否是自动生成内容的邮件地址列表。例如：foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "阻止被检测为自动生成的进站邮件。"
-    ignore_by_title: "使用正则表达式根据标题忽略进站邮件。"
-    mailgun_api_key: "用以验证 webhook 私信的 Mailgun 密钥 API。"
-    soft_bounce_score: "当碰到临时拒信时，增加用户的累计退信分值。"
-    hard_bounce_score: "当碰到永久拒信时，增加用户的累计退信分值。"
-    bounce_score_threshold: "停止发送邮件给用户的累计退信分值。"
+    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 天后重置累计退信分值。"
-    attachment_content_type_blacklist: "基于 content type 禁止附件的黑名单列表。"
-    attachment_filename_blacklist: "基于文件名禁止附件的黑名单列表。"
+    attachment_content_type_blacklist: "基于附件content type的黑名单关键词列表"
+    attachment_filename_blacklist: "基于附件名称的黑名单关键词列表。"
     forwarded_emails_behaviour: "如何处理转发给Discourse的电子邮件"
     always_show_trimmed_content: "总是显示进站邮件中被截断的部分。警告：可能显示某些邮件地址。"
     private_email: "不要在邮件标题和主体中包含帖子或主题的内容。注意：会一并关闭摘要邮件。"
@@ -1684,28 +1691,29 @@ zh_CN:
     raw_rejected_email_max_length: "应该被保存的被拒收的入站邮件字符数量。"
     delete_rejected_email_after_days: "删除（n）天之前被拒收的邮件。"
     manual_polling_enabled: "用 API 推送邮件回复。"
-    pop3_polling_enabled: "轮询 POP3 收取邮件回复。"
+    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_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: "检测垃圾邮件的标题。"
-    email_prefix: "邮件主题中使用的 [标签]。留空将缺省使用 'title'。"
+    email_in_spam_header: "用于检测垃圾邮件的标头。"
+    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: "通过删除所有帖子按钮可以删除的最大帖子数量。如果用户有比这更多的帖子，这些帖子不能一次性删除并且这个用户不能被删除。"
-    username_change_period: "帐户注册后可以更改其用户名的最大天数（0表示不允许修改）。"
+    delete_user_self_max_post_count: "用户可以自助删除账户时，最多可拥有的帖子数量。设为 -1 禁用自助删除账户。"
+    username_change_period: "账户注册后可以更改其用户名的最大天数（0表示不允许修改）。"
     email_editable: "允许用户在注册后改变他们的邮箱地址。"
     logout_redirect: "注销后将浏览器重定向到（例如：https://example.com/logout）"
     allow_uploaded_avatars: "允许用户上传自定义个人头像。"
@@ -1713,75 +1721,78 @@ zh_CN:
     allow_animated_thumbnails: "为动画 gif 生成动态缩略图。"
     default_avatars: "在用户更改头像前的默认头像 URL"
     automatically_download_gravatars: "为注册或更改邮箱的用户下载 Gravatar 头像。"
-    digest_topics: "邮件摘要中显示的流行主题的最大数目。"
-    digest_posts: "邮件摘要中显示的最流行帖子的数量。"
-    digest_other_topics: "邮件摘要中“你关注的主题和分类中的新内容”栏目显示的主题数目上限。"
+    digest_topics: "邮件摘要中显示热门主题的最大数量。"
+    digest_posts: "邮件摘要中所显示的热门帖子的数量。"
+    digest_other_topics: "邮件摘要中“你所关注的主题和分类中的新内容”这一部分的最大主题数量。"
     digest_min_excerpt_length: "邮件摘要中显示的帖子摘要字符数下限。"
     suppress_digest_email_after_days: "停止给(n)天未登录网站的用户发送摘要邮件。"
-    digest_suppress_categories: "不在摘要邮件中显示这些分类的内容。"
+    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获取的自定义字段列表。"
+    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_review: "允许群组审核指定分类的内容"
     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_featured_topic_on_user_profiles: "允许用户在其用户卡片和个人资料上显示指向主题的链接。"
+    anonymous_posting_min_trust_level: "启用匿名发帖所需的最低信任等级"
+    anonymous_account_duration_minutes: "为了匿名性，每 N 分钟为各个用户创建一个新的匿名账户。例如：如果设置为 600，只要自最后发帖起过去 600 分钟，并且用户切换至匿名模式，就会创建一个新的匿名账户。"
+    hide_user_profiles_from_public: "为匿名用户禁用用户信息卡、用户资料和用户目录。"
+    allow_featured_topic_on_user_profiles: "允许用户在其用户卡片和个人资料上宣传主题的链接。"
     show_inactive_accounts: "允许已登录用户查看不活跃账户。"
     hide_suspension_reasons: "不在用户页面公开显示封禁原因。"
-    log_personal_messages_views: "管理员为其他用户/组记录个人消息查看数。"
+    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以关闭。"
-    user_website_domains_whitelist: "用户网站要属于这些域名中。用 | 分割。"
+    max_notifications_per_user: "每个用户最大的通知数量，如超出，旧的通知将被删除。每周都会执行。设为0以关闭。"
+    user_website_domains_whitelist: "用户的网站需要在这些域名之中。用 | 分割的列表。"
     allow_profile_backgrounds: "允许用户上传个人资料背景图片。"
-    sequential_replies_threshold: "在被提醒回复了太多连续的回复前，用户在主题中可以连续回复的帖子的数量。"
-    get_a_room_threshold: "用户在同主题内回复多次而不被警告的通知。"
+    sequential_replies_threshold: "在被提醒过多连续的回复前，用户在主题中可以连续回复的帖子数量。"
+    get_a_room_threshold: "用户被警告前，可在同一个主题下向同一个人回帖的数量。"
     enable_mobile_theme: "为移动设备启用移动友好的主题，但也能切换回完整站点。如果你想要使用自定义的响应式主题请禁用它。"
-    dominating_topic_minimum_percent: "用户在主题中的帖子占到多少百分比时使得用户主导话题。"
+    dominating_topic_minimum_percent: "被提醒过度干预一个主题前，单个用户发帖可占整个主题的百分比。"
     disable_avatar_education_message: "禁用更改头像操作的教育私信。"
-    suppress_uncategorized_badge: "不要为主题列表中的未分类主题显示徽章。"
+    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` 进行配置。"
+    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: "当用户到达底部时自动解除主题置顶。"
-    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 app横幅。"
-    native_app_install_banner_android: "在Android设备上为普通用户（信任等级1及以上）显示DiscourseHub app横幅。"
-    app_association_android: "<a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> json 终端的内容，用于谷歌的数字资产链接 API。"
-    app_association_ios: "<a href='%{base_path}/apple-app-site-association'>apple-app-site-association endpoint</a> 的内容，用于在该站点和 iOS 应用程序之间创建通用链接。"
+    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-'表示品牌图标。"
+    svg_icon_subset: "添加你希望包含在资产中的其它FontAwesome 5图标。使用前缀'fa-'表示实心图标，'far-'表示常规图标，'fab-'表示品牌图标。"
     max_prints_per_hour_per_user: "/print 页面的每小时最大展示量（设置为 0 禁用）"
     full_name_required: "全名是用户个人信息的必填项。"
-    enable_names: "在用户的个人信息、用户卡片和邮件中显示全名。禁用将在所有地方隐藏全名。"
+    enable_names: "在用户的个人信息、用户卡片和邮件中显示全名。禁用以在所有地方隐藏全名。"
     display_name_on_posts: "在用户的帖子中显示他们的全名以及他们的 @username。"
-    show_time_gap_days: "如果两个帖子发表间隔多天，在主题中显示时间间隔提示。"
-    short_progress_text_threshold: "在主题中的帖子数超过这个设定后，进度条将只显示当前的帖子数。如果你更改了进度条的宽度，你需要修改这个值。"
-    default_code_lang: "默认语法高亮语言，使用 GitHub 代码块（lang-auto、ruby、python或者其他等等。）"
-    warn_reviving_old_topic_age: "当有人开始回复最后一贴超过一定天数前的主题时，将有一个警告显示，不鼓励他们复活一个老的讨论。将其设置为 0 以禁用。"
-    autohighlight_all_code: "即使未显式设定语言，仍为所有预编排代码块应用语法高亮。"
+    show_time_gap_days: "如果两个帖子发表相隔多天，在主题中显示时间间隔。"
+    short_progress_text_threshold: "在主题中的帖子数超过这个数量后，进度条将只显示当前的帖子数量。如果你更改了进度条的宽度，你需要修改这个值。"
+    default_code_lang: "默认的编程语言语法高亮应用 GitHub 代码块（lang-auto、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>用于演示"
     embed_any_origin: "允许嵌入任意来源的内容。这对于带有静态 HTML 的移动应用程序是必需的。"
     embed_topics_list: "主题列表支持HTML嵌入"
+    embed_set_canonical_url: "为嵌入到主题的嵌入内容设置规范URL。"
     embed_truncate: "截断嵌入的帖子。"
+    embed_unlisted: "直到一个用户回复前，导入的主题不会被列出。"
     embed_support_markdown: "为嵌入式帖子支持Markdown格式。"
     embed_whitelist_selector: "以逗号分隔允许嵌入的CSS元素列表"
     allowed_href_schemes: "除了 http 和 https 外允许的链接协议。"
@@ -1789,13 +1800,13 @@ zh_CN:
     embed_username_required: "创建主题需要用户名。"
     notify_about_flags_after: "如果在这么多小时后仍有标记未处理，请向版主发送个人信息。设置为0以禁用。"
     show_create_topics_notice: "如果站点只有少于 5 篇的公开帖子时，显示一条请管理员创建帖子的提示。"
-    delete_drafts_older_than_n_days: "删除超过 n 天得草稿。"
+    delete_drafts_older_than_n_days: "删除超过 n 天的草稿。"
     bootstrap_mode_min_users: "禁用摘要模式的用户数下限（0 为禁用）。"
     prevent_anons_from_downloading_files: "禁止匿名用户下载附件。警告：这将禁止他们访问任何发表在帖子中的非图片资源。"
-    secure_media: '限制对媒体上传（图像、视频、音频）的访问。如果启用了“需要登录”，那么只有已登录用户才能访问上传的媒体内容。否则，只能对私人消息中的媒体上传进行限制。注意：在启用此设置之前，必须先启用 S3 上传。'
+    secure_media: '限制所有上传文件（图像、视频、音频、文本、可移植文档格式（pdf）、压缩文件等）的访问。如启用“login required”，那么只有已登录的用户才可以访问上传的文件。否则只对私信和私有分类中的媒体上传进行限制。注意：此设置很复杂且需要深入的管理认识。更详细的内容参阅<a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">官方论坛中的媒体安全话题</a>。'
     slug_generation_method: "选择一个链接生成方式。“encoded”将生成以百分号编码的链接。“none”将禁用自定义链接，只生成默认链接。"
     enable_emoji: "启用绘文字（emoji）"
-    enable_emoji_shortcuts: "常见的笑脸文字如:)：p :(将转换为表情符号"
+    enable_emoji_shortcuts: "常见的笑脸文字如 :) :p :( 将被转换为绘文字"
     emoji_set: "你喜欢哪一种 emoji？"
     emoji_autocomplete_min_chars: "触发自动填充表情符号弹出窗口所需的最少字符数"
     enable_inline_emoji_translation: "启用行内表情符号解析（之前没有任何空格或标点）"
@@ -1813,6 +1824,7 @@ zh_CN:
     new_user_notice_tl: "查看新用户发帖通知所需的最低信任级别。"
     returning_user_notice_tl: "查看回归用户发帖通知所需的最低信任级别。"
     returning_users_days: "在用户被认为回归之前应该经过多少天。"
+    enable_page_publishing: "允许工作人员以新的链接和自定义样式出版主题。"
     default_email_digest_frequency: "用户收到摘要邮件的默认频率。"
     default_include_tl0_in_digests: "在摘要邮件中默认包含新用户帖子。用户可以自行在参数设置中更改这个设置。"
     default_email_level: "设置常规主题的默认电子邮件通知级别。"
@@ -1822,8 +1834,8 @@ zh_CN:
     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_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: "默认在高亮选择文字时启用引用回复"
@@ -1831,9 +1843,9 @@ zh_CN:
     default_other_dynamic_favicon: "默认在浏览器图标上显示新/更新的主题数量"
     default_other_like_notification_frequency: "默认通知用户赞的私信"
     default_topics_automatic_unpin: "默认时当用户到达底部时自动解除主题置顶。"
-    default_categories_watching: "分类列表默认跟踪。"
-    default_categories_tracking: "分类列表默认追踪。"
-    default_categories_muted: "分类列表默认不显示。"
+    default_categories_watching: "默认监看的分类列表。"
+    default_categories_tracking: "默认跟踪的分类列表。"
+    default_categories_muted: "默认静音的分类列表"
     default_categories_watching_first_post: "默认关注该分类中每个新主题的第一条贴子"
     mute_all_categories_by_default: "将所有分类的默认通知级别设置为静音。要求用户选择在“最新”和“分类”页面中出现的分类。如果您希望修改匿名用户的默认设置，请设置 'default_categories_'。"
     default_tags_watching: "默认监看的标签列表。"
@@ -1870,11 +1882,14 @@ zh_CN:
     company_name: "公司名"
     governing_law: "适用法律"
     city_for_disputes: "争议之城"
-    shared_drafts_category: "为主题草稿指定类别以启用共享草稿功能。此类别中的主题将从管理人员的主题列表中删除。"
+    shared_drafts_category: "为主题草稿指定分类以启用共享草稿功能。此类别中的主题将从管理人员的主题列表中删除。"
     push_notifications_prompt: "显示用户同意提示。"
     push_notifications_icon: "通知角中显示的徽章图标。尺寸必须为96px × 96px。"
     short_title: "短标题将用于用户主页、启动器或其他可能空间有限的地方。应该控制在12个字符内。"
     dashboard_general_tab_activity_metrics: "选择在常规选项卡中显示为活动指标的报告。"
+    gravatar_name: "Gravatar提供商的名称"
+    gravatar_base_url: "Gravatar提供商API的基础链接"
+    gravatar_login_url: "供用户登录到 Gravatar 服务，基于 gravatar_base_url 的相对链接"
     errors:
       invalid_email: "电子邮箱地址无效。"
       invalid_username: "没有这个用户名的用户。"
@@ -1962,13 +1977,18 @@ zh_CN:
     new_topic_moderator_post:
       other: "%{count} 个帖子被拆分到新主题：%{topic_link}"
     new_message_moderator_post:
-      other: "%{count} 个帖子被分拆到新私信：%{topic_link}"
+      other: "%{count} 个帖子被拆分到一个新的私信中：%{topic_link}"
     existing_topic_moderator_post:
       other: "%{count} 个帖子已被合并到了现有主题：%{topic_link}"
     existing_message_moderator_post:
-      other: "%{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:
       other: "私信中回复已经达到上限 %{count}，自动锁定。"
@@ -2003,7 +2023,7 @@ zh_CN:
     auto_deleted_by_timer: "由计时器自动删除。"
   login:
     invalid_second_factor_method: "所选的双因素方法无效。"
-    not_enabled_second_factor_method: "你的帐户未启用所选的第二因素方法。"
+    not_enabled_second_factor_method: "你的帐户未启用所选的双重验证方式。"
     security_key_description: "当你准备好物理安全密钥后，请按下面的“使用安全密钥进行身份验证”按钮。"
     security_key_alternative: "尝试另一种方式"
     security_key_authenticate: "使用安全密钥进行身份验证"
@@ -2026,7 +2046,7 @@ zh_CN:
     not_available: "不可用，试试%{suggestion}？"
     something_already_taken: "出了一些问题，可能此用户名或电子邮箱已经被注册。试试 忘记密码链接吧。"
     omniauth_error:
-      generic: "抱歉，您的帐户授权时出错。请重试。"
+      generic: "抱歉，验证你的账户时出错。请重试。"
       csrf_detected: "授权超时，或者您已切换浏览器。请重试。"
       request_error: "授权时发生错误。请重试。"
       invalid_iat: "由于服务器时钟差异，无法验证授权令牌。请重试。"
@@ -2037,6 +2057,7 @@ zh_CN:
     new_registrations_disabled: "现在不允许注册新账户。"
     password_too_long: "密码不能超过 200 个字符。"
     email_too_long: "你输入的邮件太长了。邮箱名不得超过 254 字符，域名必须不超过 253 字符。"
+    wrong_invite_code: "你输入的邀请码不正确。"
     reserved_username: "该用户名不可被使用。"
     missing_user_field: "你还没有填写完所有用户字段"
     auth_complete: "验证已经完成。"
@@ -2048,6 +2069,8 @@ zh_CN:
     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: "使用备份码"
@@ -2197,19 +2220,20 @@ zh_CN:
   admin_confirmation_mailer:
     title: "管理员确认"
     subject_template: "[%{site_name}] 确认新管理员账户"
-    text_body_template: "请确认你要添加**%{target_username}（%{target_email}）**作为你的论坛的管理员。 \n\n[确认管理员帐户](%{admin_confirm_url})\n"
+    text_body_template: "请确认你要添加**%{target_username}（%{target_email}）**作为你的论坛的管理员。 \n\n[确认管理员账户](%{admin_confirm_url})\n"
   test_mailer:
     title: "测试发件人"
     subject_template: "[%{email_prefix}] 邮件可达性测试"
     text_body_template: |
-      这是一封测试邮件
+      这是一封来自
 
       [**%{base_url}**][0]
 
+      的测试邮件
+
       发送电子邮件的过程很复杂。以下是你应首先检查的事情:
 
-      - Be *sure* to set the `notification email` from: address correctly in your site settings. **The domain specified in the "from" address of the emails you send is the domain your email will be validated against**.
-      - *请确保* 在你的网站设置中正确设置 `notification email` from: address。**你发送的电子邮件的“发件人”地址的域，将被用来验证你的电子邮件。**
+      - *请确保* 在你的网站设置中正确设置 `notification email` from: address。**你所发送的电子邮件的“发件人”地址的域名，将被用来验证你的电子邮件。**
 
       - 确保知道如何在邮件客户端查看邮件的原始来源，这样你就可以查看邮件标题中的重要线索。在 Gmail 中，它是每个邮件右上角下拉菜单中的 “show original” 选项。
 
@@ -2223,7 +2247,7 @@ zh_CN:
 
       - 我们强烈建议你 **发送测试电子邮件到 [mail-tester.com][mt]**，以验证上述所有工作都是正确的。
 
-      （*简单* 的方法是在 [SendGrid][sg]、[SparkPost][sp]、[Mailgun][mg] 或 [Mailjet][mj] 上创建一个帐户，这些网站有低成本的邮寄付费计划，适合小型社区。不过，你仍然需要在 DNS 中设置 SPF 和 DKIM 记录！）
+      （*简单* 的方法是在 [SendGrid][sg]、[SparkPost][sp]、[Mailgun][mg] 或 [Mailjet][mj] 上创建一个账户，这些网站有低成本的邮寄付费计划，适合小型社区。不过，你仍然需要在 DNS 中设置 SPF 和 DKIM 记录！）
 
       我们希望你成功收到这封测试邮件 OK!
 
@@ -2252,11 +2276,11 @@ zh_CN:
       您的版本：%{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)
 
-      -访问[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}] 可以升级"
@@ -2266,13 +2290,13 @@ zh_CN:
       您的版本：%{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)
 
-      -访问[meta.discourse.org](https://meta.discourse.org)获取资讯、讨论以及对Discourse的支持
+      - 访问[meta.discourse.org](https://meta.discourse.org)获取资讯、讨论以及对Discourse的支持
 
-      ###发布说明
+      ### 发布说明
 
       %{notes}
   flag_reasons:
@@ -2467,7 +2491,7 @@ zh_CN:
         %{logs}
         ```
     csv_export_succeeded:
-      title: "成功导致CSV格式"
+      title: "CSV导出成功"
       subject_template: "[%{export_title}]数据导出完成"
       text_body_template: |
         你的数据导出成功！:dvd:
@@ -2476,7 +2500,7 @@ zh_CN:
 
         上方的下载地址将在 48 小时后失效。
 
-        用户数据以 Zip 格式归档。若归档文件无法在你开启时自动解压，请使用此处推荐的工具：https://www.7-zip.org/
+        用户数据以 Zip 格式归档。若归档文件无法在你打开时自动解压，请使用此处推荐的工具：https://www.7-zip.org/
     csv_export_failed:
       title: "导致CSV失败"
       subject_template: "数据导出失败"
@@ -2557,9 +2581,9 @@ zh_CN:
       title: "Email被拒绝：不允许陌生人"
       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}] 邮件问题 -- 发表错误"
@@ -2685,24 +2709,24 @@ zh_CN:
       ```
     ignored_users_summary:
       title: "忽视的用户超过了阈值"
-      subject_template: "一个用户被许多用户忽视"
+      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}/u/%{username}/summary)和[忽略及禁言汇报](%{base_url}/admin/reports/top_ignored_users)中的其他用户。
 
-        若您需要额外帮助，请参见我们的[社区准则](%{base_url}/guidelines)。
+        若你需要额外帮助，请参见我们的[社区准则](%{base_url}/guidelines)。
     too_many_spam_flags:
       title: "太多垃圾标记"
-      subject_template: "新账户被暂时封禁"
+      subject_template: "新账户被搁置"
       text_body_template: |
         你好，
 
         这是%{site_name}通知你的帖子因被社区成员标记已被暂时隐藏的自动消息
 
-        作为预防措施，你的新帐户已被停用，并且在管理人员可以审核你的帐户之前无法创建回复或主题。我们对此深表抱歉。
+        作为预防措施，你的新账户已被停用，并且在管理人员审核你的账户前你无法创建回复或主题。我们对此深表抱歉。
 
         有关其他指导，请参阅我们的[社区指引](%{base_url}/guidelines)。
     too_many_tl3_flags:
@@ -2722,11 +2746,11 @@ zh_CN:
       text_body_template: |
         你好，
 
-        这是%{site_name}通知你的帐户因出于谨慎考虑被临时暂停使用的通知。
+        这是%{site_name}通知你的账户因出于谨慎考虑被临时暂停使用的通知。
 
-        请继续浏览，但在管理人员审核通过前，你的账户不能再发表新的回复或者主题。我们对此带来的不便表示歉意。
+        请继续浏览，但在[管理人员](%{base_url}/about)审核你最近的发帖前，你的账户不能再发表新的回复或者主题。我们对此带来的不便表示歉意。
 
-        要查看更多指引，请参考我们的[社区指引](%{base_url}/guidelines)。
+        要查看更多指引，请参阅我们的[社区指引](%{base_url}/guidelines)。
     user_automatically_silenced:
       title: "用户自动被禁用"
       subject_template: "新用户%{username}因社区标记被封禁"
@@ -2755,9 +2779,9 @@ zh_CN:
       text_body_template: |
         你好，
 
-        这是%{site_name}通知你的帐户在管理人员审核后不再受到限制的自动消息。
+        这是%{site_name}通知你的账户在管理人员审核后不再受到限制的自动消息。
 
-        你现在可以创建新回复和主题了。感谢你的耐心等待。
+        你现在又可以创建回复和主题了。感谢你的耐心等待。
     pending_users_reminder:
       title: "待审核用户提醒"
       subject_template:
@@ -2806,7 +2830,7 @@ zh_CN:
     你启用了邮件列表模式，所以收到了这些邮件。
 
     要退订这些邮件，[点击这里](%{unsubscribe_url})。
-  subject_re: "回复："
+  subject_re: "回："
   subject_pm: "[私信]"
   email_from: "%{user_name} 自 %{site_name}"
   user_notifications:
@@ -2992,7 +3016,7 @@ zh_CN:
 
         %{respond_instructions}
     user_watching_first_post:
-      title: "用户关注第一条帖子"
+      title: "用户监控新主题"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3052,17 +3076,17 @@ zh_CN:
       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: "自从你上次访问"
       new_topics: "新主题"
-      unread_messages: "未读私信"
       unread_notifications: "未读通知"
+      unread_high_priority: "未读的高优先级通知"
       liked_received: "获得赞"
       new_users: "新用户"
       popular_topics: "热门主题"
@@ -3090,11 +3114,11 @@ zh_CN:
       title: "用链接登录"
       subject_template: "[%{email_prefix}]链接登录"
       text_body_template: |
-        这是你的登录链接[%{site_name}](%{base_url})
+        这是你用于登录[%{site_name}](%{base_url})的链接
 
-        如果你未请求此链接，可以放心地忽略此电子邮件。
+        如果你未请求过此链接，可以放心地忽略此电子邮件。
 
-        单击以下链接登录：
+        点击下方链接登录：
         %{base_url}/session/email-login/%{email_token}
     set_password:
       title: "设置密码"
@@ -3110,7 +3134,7 @@ zh_CN:
       title: "管理员登录"
       subject_template: "[%{email_prefix}] 登录"
       text_body_template: |
-        有人要登录[%{site_name}](%{base_url})上的账户。
+        有人要登录你在[%{site_name}](%{base_url})上的账户。
 
         如果你没有发出此请求，则可以放心地忽略此电子邮件。
 
@@ -3151,7 +3175,7 @@ zh_CN:
         %{new_email}
     signup_after_approval:
       title: "在审批之后注册"
-      subject_template: "你已经被 %{site_name} 论坛批准加入了！"
+      subject_template: "你已经被 %{site_name} 批准加入了！"
       text_body_template: |
         欢迎来到%{site_name}！
 
@@ -3220,7 +3244,7 @@ zh_CN:
       你需要一个账户。请创建一个账户或者登录以继续。
     welcome_message_invite_only: |
       ##[欢迎来到%{title}](#welcome)
-      你需要一个账号。请从现有用户处获取一个邀请或者登录以继续。
+      你需要一个账号。请从现有用户处获取一个邀请或者登录。
   deleted: "已删除"
   image: "图片"
   upload:
@@ -3231,12 +3255,13 @@ zh_CN:
     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: "抱歉，我们无法获取图片大小，请检查你的图片是否已损坏。"
+      size_not_found: "抱歉，我们无法获取图片大小。也许是你的图片损坏了？"
     placeholders:
       too_large: "(图片大小超过%{max_size_kb}KB)"
   avatar:
@@ -3251,7 +3276,7 @@ zh_CN:
     user_email_no_user: "不能找到ID为%{user_id}的用户"
     user_email_post_not_found: "不能找到ID为%{post_id}的帖子"
     user_email_anonymous_user: "用户匿名"
-    user_email_user_suspended_not_pm: "用户被封禁，这不是消息"
+    user_email_user_suspended_not_pm: "用户被封禁，这不是私信"
     user_email_seen_recently: "最近活跃用户"
     user_email_notification_already_read: "此邮件的通知已被阅读"
     user_email_notification_topic_nil: "post.topic为空"
@@ -3266,6 +3291,7 @@ zh_CN:
     sender_body_blank: "内容为空"
     sender_post_deleted: "帖子已被删除"
     sender_message_to_invalid: "收件人电子邮箱地址无效"
+    sender_topic_deleted: "主题已被删除"
   color_schemes:
     base_theme_name: "基础"
     light: "浅色"
@@ -3353,7 +3379,7 @@ zh_CN:
 
       * 文明。不要发表任何理智的人会认为冒犯的、过分的或招致怨恨的言论。
       * 拒绝色情。不要发表任何淫秽或性暗示的东西。
-      * 尊重每一个人。不要骚扰或者让别人难过，检视别人，或暴露他们的个人信息。
+      * 尊重每一个人。不要骚扰或者让别人难过，冒充别人，或暴露他们的个人信息。
       * 尊重我们的论坛。不要发表广告或者其他垃圾信息。
 
       这些条款不是法律条文，并且没有准确的定义 &mdash; 避免任何做关于他们的_可能擦边_的事。如果你不确定，问问自己的帖子是否能出现在纽约时报的头版头条上。
@@ -3406,7 +3432,7 @@ zh_CN:
        - [可接受的用途](#heading--可接受使用)
        - [内容标准](#heading--content-standards)
        - [执法](#heading--强制执行)
-       - [你的帐户](#heading--你的帐户)
+       - [你的账户](#heading--你的账户)
        - [你的内容](#heading--你的内容)
        - [你的责任](#heading--责任)
        - [免责声明](#heading--免责声明)
@@ -3440,7 +3466,7 @@ zh_CN:
 
       你可能不会使用论坛违法。
 
-      2.未经他们的特别许可，你不得在论坛上使用或尝试使用他人的帐户。
+      2.未经他们的特别许可，你不得在论坛上使用或尝试使用他人的账户。
 
       3.你不得在论坛上购买，出售或以其他方式交易用户名或其他唯一标识符。
 
@@ -3484,19 +3510,19 @@ zh_CN:
 
       公司保留以任何理由更改，编辑和删除论坛内容的权利。如果你认为有人违反这些条款向论坛提交了内容，请[立即与我们联系](#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>
 
-      这些条款中的任何内容均未赋予公司你与论坛共享的知识产权的所有权，例如你提交给论坛的帐户信息，帖子或其他内容。这些条款中的任何内容都不会赋予你对公司知识产权的任何所有权。
+      这些条款中的任何内容均未赋予公司你与论坛共享的知识产权的所有权，例如你提交给论坛的账户信息，帖子或其他内容。这些条款中的任何内容都不会赋予你对公司知识产权的任何所有权。
 
       在你和公司之间，你仍然对你提交给论坛的内容负全部责任。你同意不会错误地暗示你提交给论坛的内容是由公司赞助或批准的。根据这些条款，这些条款并不要求公司存储，维护或提供你提交的内容的副本，并对其进行更改。
 
@@ -3508,7 +3534,7 @@ zh_CN:
 
       <h2 id =“heading-responsibility”><a href="#heading--responsibility">你的责任</a></h2>
 
-      你同意赔偿公司因与你违反这些条款有关的其他人的法律索赔，或其他人在论坛上使用你的帐户违反这些条款。你和公司都同意尽快通知另一方你可能需要赔偿公司的任何法律索赔。如果公司未能及时通知你合法索赔，你将无需赔偿公司因你可能在及时通知后进行辩护或减轻的损失。你同意允许公司控制你必须赔偿公司的法律索赔的调查，辩护和解决，并与这些努力合作。未经你事先同意，公司同意不同意任何承认错误或对你施加义务的和解。
+      你同意赔偿公司因与你违反这些条款有关的其他人的法律索赔，或其他人在论坛上使用你的账户违反这些条款。你和公司都同意尽快通知另一方你可能需要赔偿公司的任何法律索赔。如果公司未能及时通知你合法索赔，你将无需赔偿公司因你可能在及时通知后进行辩护或减轻的损失。你同意允许公司控制你必须赔偿公司的法律索赔的调查，辩护和解决，并与这些努力合作。未经你事先同意，公司同意不同意任何承认错误或对你施加义务的和解。
 
       <h2 id =“heading--disclaimers”><a href="#heading--disclaimers">免责声明</a></h2>
 
@@ -3536,7 +3562,7 @@ zh_CN:
 
       <h2 id =“heading--dispute”><a href="#heading--disputes"> Disputes </a></h2>
 
-      %{govern_law}将管辖与这些条款或你对论坛的使用相关的任何争议。
+      %{governing_law} 将管辖与这些条款或你对论坛的使用相关的任何争议。
 
       你和公司同意仅在%{city_for_disputes}的州或联邦法院寻求与这些条款相关的禁令。你和公司都不会反对这些法院的管辖权，论坛或地点。
 
@@ -3558,13 +3584,13 @@ zh_CN:
 
       你可以根据这些条款通知公司，并通过<%{contact_email}>向公司发送问题。
 
-      公司可以使用你在论坛上为你的帐户提供的邮件地址，或通过向论坛的主页或你的帐户页面发布消息，根据这些条款通知你。
+      公司可以使用你在论坛上为你的账户提供的邮件地址，或通过向论坛的主页或你的账户页面发布消息，根据这些条款通知你。
 
       <h2 id =“heading--changes”><a href="#heading--changes">更改</a></h2>
 
-      该公司最后更新了这些条款于2018年7月12日，并可能再次更新这些条款。该公司将发布所有更新到论坛。对于包含重大更改的更新，如果你已创建帐户并提供有效的邮件地址，则公司同意通过邮件通知你。该公司还可以在论坛上通过特殊消息或警报宣布更新。
+      该公司最后更新了这些条款于2018年7月12日，并可能再次更新这些条款。该公司将发布所有更新到论坛。对于包含重大更改的更新，如果你已创建账户并提供有效的邮件地址，则公司同意通过邮件通知你。该公司还可以在论坛上通过特殊消息或警报宣布更新。
 
-      一旦你收到这些条款的更新通知，你必须同意新条款才能继续使用论坛。
+      一旦你收到这些条款的更新通知，你必须同%{governing_law}意新条款才能继续使用论坛。
   privacy_topic:
     title: "隐私政策"
     body: |
@@ -3815,7 +3841,7 @@ zh_CN:
         该徽章授予给 20 个不同的帖子都收到了至少 1 个赞的你。社区感谢你对讨论的贡献！
     respected:
       name: 尊敬
-      description: 有 100 个帖子都被赞了 2 次
+      description: 在100个帖子内收获2个赞
       long_description: |
         该徽章授予给 100 个不同的帖子都收到了至少 2 个赞的你。社区越来越尊重你在讨论中的贡献了。
     admired:
@@ -3914,7 +3940,7 @@ zh_CN:
     forbidden:
       invalid:
         other: "你选择的可以使用的标签为空"
-      in_this_category: '"%{tag_name}不能用于此类别"'
+      in_this_category: '"%{tag_name}不能用于此分类"'
       restricted_to:
         other: '“%{tag_name}”被限制在以下分类：%{category_names}'
       synonym: '不允许使用同义词。使用“ %{tag_name}”代替。'
@@ -3930,7 +3956,7 @@ zh_CN:
       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>"
@@ -3964,8 +3990,8 @@ zh_CN:
             label: "用一句简短的话描述你的社区"
             placeholder: "小明和他的朋友讨论酷东西的论坛"
           short_site_description:
-            label: "用几个字描述你的社区"
-            placeholder: "最佳社区"
+            label: "用几句话来描述你的社区"
+            placeholder: "有史以来最好的社区"
       introduction:
         title: "介绍"
         disabled: "<p>我们找不到任何标题为“%{topic_title}”的主题。</p> <ul> <li>如果你更改了标题，请修改该主题以修改你网站的介绍。</li> <li>如果你已删除此主题，请创建另一个主题为“%{topic_title}”作为标题。 第一篇文章的内容是你网站的介绍。</li> </ul>"
@@ -4046,7 +4072,7 @@ zh_CN:
             label: "大图标"
             description: "用于在现代设备上代表您的网站的图标图像，在较大尺寸的情况下表现出色。推荐尺寸大于512 × 512。我们默认会使用正方形的标志。"
       homepage:
-        description: "我们建议你在主页显示最后发点的主题，但你也可以选择在主页显示主题分类列表。"
+        description: "我们建议你在主页显示最新主题，但你喜欢的话也可以选择将分类（主题的分组）显示在主页。"
         title: "主页"
         fields:
           homepage_style:
@@ -4132,7 +4158,7 @@ zh_CN:
       invite_only: "所有新用户应该是被邀请的。参阅`invite_only`。"
       email_auth_res_enqueue: "此电子邮件未通过DMARC检查，很可能不是来自其所声称的来源。检查原始电子邮件的标头以获取更多信息。"
       email_spam: "该电子邮件被`email_in_spam_header`中定义的标头标记为垃圾邮件。"
-      suspect_user: "可疑列表中的用户必须经过工作人员的检查。参见`approve_suspect_users`。"
+      suspect_user: "这位新用户输入的个人资料信息但没有阅读任何主题或帖子，意味着他可能是垃圾发送者。参见`approve_suspect_users`。"
     actions:
       agree:
         title: "同意......"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 2221178662..89b6ffa521 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -55,7 +55,6 @@ zh_TW:
       no_multilevels_components: "含有兒童佈景主題的主題本身不能是兒童佈景主題"
     settings_errors:
       invalid_yaml: "提供的 YAML 無效"
-      data_type_not_a_number: "不支援 `%{name}` 類型設定。支援類型有：`integer`, `bool`, `list` 及`enum`"
       name_too_long: "此設定名稱過長，長度上限為 255"
       default_value_missing: "`%{name}` 設定沒有預設數值"
       default_not_match_type: "`%{name}` 設定的預設值類型與此設定類型不相符。"
@@ -281,6 +280,12 @@ zh_TW:
   edit_conflict: "那篇貼文已被另一位使用者編輯過，您更改的內容無法被儲存。"
   revert_version_same: "您試圖回復的版本和當前版本相同。"
   excerpt_image: "圖片"
+  bookmarks:
+    reminders:
+      later_today: "今日稍晚"
+      tomorrow: "明天"
+      next_week: "下週"
+      next_month: "下個月"
   groups:
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' 不是有效的信任層級。"
@@ -305,7 +310,6 @@ zh_TW:
       trust_level_4: "信任等級 4"
     request_membership_pm:
       title: "@%{group_name} 的群組會員要求"
-      handle: "處理會員申請"
   education:
     until_posts:
       other: "%{count} 篇貼文"
@@ -1123,7 +1127,6 @@ zh_TW:
   dashboard:
     rails_env_warning: "伺服器現在運行 %{env} 模式。"
     host_names_warning: "伺服器上 config/database.yml 的主機名稱為 localhost 。請更改成你的網站主機名稱。"
-    gc_warning: '伺服器正在使用的 Ruby 可能僅啟用了預設的 垃圾回收設定 （garbage collection），這個設定無法提供最佳效能。請瀏覽此效能設定的資訊：<a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126">Tuning Ruby and Rails for Discourse</a>。'
     sidekiq_warning: 'Sidekiq 未有執行。很多程序, 如發送電子郵件, 需要 sidekiq 非同步 (asynchronous) 執行的。請確保至少運行一個 sidekiq 程序。<a href="https://github.com/mperham/sidekiq">瞭解 Sidekiq</a>。'
     queue_size_warning: "隊列中有較多任務，為 %{queue_size} 個。這可能是因為 Sidekiq 進程的問題導致，或者需要更多的 Sidekiq 進程。"
     memory_warning: "伺服器記憶體少於 1GB，建議配置至少 1GB 記憶體"
@@ -1225,8 +1228,6 @@ zh_TW:
     force_https: "強制使用 https。警告：開啟前必須確認 HTTPS 已經配置並能夠正常使用！你檢查了 CDN、第三方登錄和站外的 logo / 依賴是否支持 HTTPS 了嗎？"
     same_site_cookies: "使用同一網站的Cookie，它們消除所有載體上支持的瀏覽器（LAX或嚴格模式）跨站請求偽造。警告：嚴格只會在強制登錄和使用SSO的網站執行。"
     summary_score_threshold: "將一個貼文包含在“概括主題”中所需的最少分數"
-    summary_posts_required: "如果使用了\"此話題的摘用\"，話題顯示時需滿足最小的貼文的數量"
-    summary_likes_required: "如果使用了\"此話題的摘用\"，話題顯示時需滿足最小得到\"讚\"的數量"
     summary_percent_filter: "當使用者點擊 \"此話題的摘要\"，顯示前面多少 % 的貼文"
     summary_max_results: "“概括主題”將顯示最大貼文數量"
     enable_personal_messages: "允許信任等級1（可以另外選擇發送消息的信任等級）的使用者建立訊息和回覆訊息。注意：管理人員不受限制。"
@@ -1350,7 +1351,6 @@ zh_TW:
     enable_github_logins: "開啟 Github 登入驗證，需要填寫 github_client_id 及 github_client_secret。參閱<a href='https://meta.discourse.org/t/13745' target='_blank'>設定 在Discourse Github 登入官方文件</a>\b"
     github_client_id: "Github 帳號驗證的使用者端帳號（Client id），到 <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/applications </a>來註冊取得 Client id"
     github_client_secret: "Github 帳號驗證的使用者端密碼（Client secret），到 <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers </a>來註冊取得 Client secret"
-    readonly_mode_during_backup: "備份時啟用只讀模式"
     enable_backups: "允許管理員建立備份"
     allow_restore: "允許還原資料，注意此動作可能覆蓋「所有」網站資料！除非你計畫還原備份檔，否則請保持此設定為 false"
     maximum_backups: "磁碟備份的最大數量，舊的將會自動刪除"
@@ -1806,6 +1806,10 @@ zh_TW:
       other: "%{count}則貼文被合併到一個已存在的訊息：%{topic_link}"
   change_owner:
     post_revision_text: "\b所有權已被轉讓"
+  publish_page:
+    slug_errors:
+      blank: "不能空白"
+      invalid: "包含無效字詞"
   topic_statuses:
     autoclosed_message_max_posts:
       other: "消息中回覆已經達到上限 %{count}，自動鎖定。"
@@ -2679,7 +2683,6 @@ zh_TW:
       why: "在你上一次於 %{last_seen_at} 訪問後，在 %{site_link} 上的摘要。"
       since_last_visit: "自你上次訪問至今"
       new_topics: "新主題"
-      unread_messages: "未讀私訊"
       unread_notifications: "未讀通知"
       liked_received: "獲得贊"
       new_users: "新使用者"
diff --git a/plugins/discourse-local-dates/config/locales/client.it.yml b/plugins/discourse-local-dates/config/locales/client.it.yml
index 3e15c0026f..2a0576a0c8 100644
--- a/plugins/discourse-local-dates/config/locales/client.it.yml
+++ b/plugins/discourse-local-dates/config/locales/client.it.yml
@@ -12,6 +12,8 @@ it:
         today: Oggi %{time}
         tomorrow: Domani %{time}
         yesterday: Ieri %{time}
+        countdown:
+          passed: la data è passata
       title: Inserisci data / ora
       create:
         form:
diff --git a/plugins/discourse-local-dates/config/locales/client.ru.yml b/plugins/discourse-local-dates/config/locales/client.ru.yml
index 529e03284a..8ae298da89 100644
--- a/plugins/discourse-local-dates/config/locales/client.ru.yml
+++ b/plugins/discourse-local-dates/config/locales/client.ru.yml
@@ -14,7 +14,7 @@ ru:
         yesterday: 'Вчера %{time} '
         countdown:
           passed: дата прошла
-      title: Введите дату / время
+      title: Дата / время
       create:
         form:
           insert: Вставить
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ar.yml b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
index 90b2e33fec..7a245ba97e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ar.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
@@ -179,9 +179,6 @@ ar:
           يبدو انك لم تقم باقتباس اي شئ مني في ردك؟
 
           اختيار اي نص في المنشور سوف يظهر زر <kbd>**اقتبس**</kbd>, و الضغط علي زر **رد** عندما يكون النص محدد سوف يقتبس هذا الجزء ايضاً في الرد! هل يمكنك المحاولة مرة اخري؟
-      bookmark:
-        reply: |-
-          رائع! الان يمكنك الرجوع بسهولة لمحادثتنا في اي وقت من خلال [ تبويب العلامات المرجعية بملفك الشخصي ](%{profile_page_url}/activity/bookmarks). او بالقائمة المنبثقة من الضغط علي صورتك الشخصية &#8598;
       emoji:
         reply: |-
           هذا مثال علي :sparkles: _الرموز التعبيرية_ :sparkles:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.be.yml b/plugins/discourse-narrative-bot/config/locales/server.be.yml
index 0268de26e4..be61dd9b50 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.be.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.be.yml
@@ -150,8 +150,6 @@ be:
       bookmark:
         instructions: |-
           Калі вы хочаце даведацца больш, выберыце <IMG SRC = "% {base_uri}
-        reply: |-
-          Выдатна! Цяпер вы можаце лёгка знайсці свой шлях назад да нашай прыватнай гутарцы ў любы час, прама з [ўкладак закладак у профілі] (% {profile_page_url}
         not_found: |-
           Ой-ой, я не бачу ні адной закладкі ў гэтай тэме. Знайшоў закладку пад кожным паведамленнем? Выкарыстоўвайце паказаць яшчэ <IMG SRC = "% {base_uri}
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml b/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
index 57e1762b4f..61cce204f3 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
@@ -184,8 +184,6 @@ bs_BA:
       bookmark:
         instructions: |-
           Ako želite da saznate više, izaberite <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> ispod i <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> ** označi ovu osobnu poruku **. Ako to učinite, možda postoji: dar: u vašoj budućnosti!
-        reply: |-
-          Odlično! Sada možete lako pronaći put do našeg privatnog razgovora u bilo koje vrijeme, direktno iz [kartice oznaka u vašem profilu] (%{profile_page_url} / activity / bookmarks). Samo izaberite sliku u gornjem desnom uglu
         not_found: |-
           Uh oh, ne vidim oznake u ovoj temi. Da li ste pronašli oznaku ispod svakog posta? Koristite show više <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> da otkrije dodatne akcije ako je potrebno.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ca.yml b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
index c1b8bbfb91..914e221e11 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ca.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
@@ -227,8 +227,6 @@ ca:
       bookmark:
         instructions: |-
           Si voleu saber-ne més, seleccioneu <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> a sota i <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **marqueu com a preferit aquest missatge privat**. Si ho feu, potser tindreu un :gift: més avant!
-        reply: |-
-          Fantàstic! Ara podeu trobar fàcilment com tornar a la nostra conversa privada en qualsevol moment, exactament des de [la pestanya de favorits del vostre perfil](%{profile_page_url}/activity/bookmarks). Només heu de seleccionar la vostra imatge de perfil dalt a la dreta &#8599;
         not_found: |-
           Ui, no veig cap favorit marcat en aquest tema. ¿Heu trobat el marcador de favorits a sota de cada publicació? Utilitzeu "mostra'n més" <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> per a mostrar accions addicionals si calen.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.de.yml b/plugins/discourse-narrative-bot/config/locales/server.de.yml
index 11c8a2417a..5f7ea53588 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.de.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.de.yml
@@ -28,6 +28,12 @@ de:
     bio: "Hallo! Ich bin keine reale Person. Ich bin ein Bot, der dir etwas über diese Website beibringen kann. Schick mir eine Nachricht oder erwähne irgendwo **`@%{discobot_username}`**, um mit mir zu interagieren."
     tl2_promotion_message:
       subject_template: "Herzlichen Glückwunsch zur Beförderung ihrer Vertrauensstufe!"
+      text_body_template: |
+        Da du befördert worden bist, ist es an der Zeit etwas über die erweiterten Funktionen zu lernen!
+
+        Antworte auf diese Nachricht mit `@%{discobot_username} %{reset_trigger}` um herauszufinden, was du noch alles machen kannst.
+
+        Wir laden dich ein, dich weiter zu engagieren – wir freuen uns, dass du hier bist.
     timeout:
       message: |-
         Hallo @%{username}! Ich wollte mich nur wieder einmal melden, weil ich schon länger nichts von dir gehört habe.
@@ -120,6 +126,15 @@ de:
 
           `@%{discobot_username} %{reset_trigger} {Name-des-Tutorials}`
           > Startet ein interaktives Tutorial. `{Name-des-Tutorials}` kann eins von: `%{tracks}` sein.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          %{quote_sample}
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: Du kannst dich darauf verlassen
       do_not_understand:
         first_response: |-
           Danke für die Antwort!
@@ -217,8 +232,6 @@ de:
       bookmark:
         instructions: |-
           Wenn du gerne mehr darüber erfahren möchtest, wähle unten <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> aus und klicke auf <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **Lesezeichen für diese Nachricht**. Wenn du das machst, wird es demnächst vielleicht ein :gift: geben!
-        reply: |-
-          Hervorragend! Jetzt kannst du jederzeit über [den Lesezeichen-Reiter in deinem Profil](%{profile_page_url}/activity/bookmarks) zu unserer Unterhaltung zurückkehren. Gehe dazu einfach auf dein Profilbild oben rechts &#8599;.
         not_found: |-
           Oh weh, ich sehe keine Lesezeichen in diesem Thema. Hast du das Lesezeichen unter jedme Beitrag gefunden? Verwende das „Mehr anzeigen“-Symbol <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">, um bei Bedarf weitere Aktionen anzuzeigen.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.el.yml b/plugins/discourse-narrative-bot/config/locales/server.el.yml
index 4fa5cb0d4c..a3b44717d0 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.el.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.el.yml
@@ -186,8 +186,6 @@ el:
 
           Επιλέγοντας ένα τμήμα από το κείμενο της ανάρτησής μου, εμφανίζεται το κουμπί <kbd>**Παράθεση**</kbd>. Επίσης πατώντας **Απάντηση** έχωντας πρώτα επιλέξει ένα τμήμα του κειμένου, είναι το ίδιο! Μπορείς να δοκιμάσεις ξανά;
       bookmark:
-        reply: |-
-          Καταπληκτικά! Τώρα μπορείς εύκολα να επιστρέψεις στην συνομιλία μας όποτε θελήσεις, απευθείας από [την καρτέλα σελιδοδεικτών του προφίλ σου](%{profile_page_url}/activity/bookmarks). Απλά κάνε κλικ στην εικόνα προφίλ σου στην πάνω δεξιά πλευρά &#8599;
         not_found: |-
           Ωχ, δεν βλέπω να έχουν προστεθεί σελιδοδείκτες σε αυτό το νήμα. Βλέπεις το κουμπί σελιδοδείκτη κάτω από κάθε ανάρτηση; Πάτα στο περισσότερα <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> για να εμφανιστούν οι επιπλέον λειτουργίες.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.es.yml b/plugins/discourse-narrative-bot/config/locales/server.es.yml
index da302a84fd..75451434cc 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.es.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.es.yml
@@ -230,8 +230,6 @@ es:
       bookmark:
         instructions: |-
           Si quieres aprender más, selecciona debajo el botón <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> y <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **guarda en marcadores este mensaje personal**. Si lo haces, ¡puede haber un :gift: en tu futuro!
-        reply: |-
-          ¡Excelente! Ahora puedes encontrar fácilmente las conversaciones privadas en cualquier momento directamente desde la [sección de marcadores de tu perfil](%{profile_page_url}/activity/bookmarks). Sólo debes seleccionar tu foto de perfil en la parte superior derecha de la pantalla &#8599;
         not_found: |-
           Oh oh, no veo ningún marcador en este tema. ¿Encontraste el botón para guardar en marcadores que se encuentra debajo de cada mensaje? Usa el botón mostrar más <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para que aparezcan acciones adicionales si necesitas.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml b/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
index 7b49dd3f09..6e04b4ea1f 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
@@ -197,8 +197,6 @@ fa_IR:
       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: بگیری!
-        reply: |-
-          عالی! الان تو میتوانی راه برگشت به این پیغام خصوصی را هر زمان که دوست داشتی از [برگه‌ی نشانک‌ها در پروفایل کاربری](%{profile_page_url}/activity/bookmarks) پیدا کنی. فقط کافی است که روی عکس پروفایل خود در بالا سمت چپ انتخاب کنی &#8598;
         not_found: |-
           اوه، هیچ نشانکی در این موضوع نمیبینم. آیا آیکون نشانک را زیر هر نوشته پیدا کردی؟ در صورت لزوم از آیکون "بیشتر نشان بده" <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> برای آشکار کردن دیگر قابلیت ها استفاده کن.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fi.yml b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
index 96b699b47d..20846f8be2 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
@@ -232,8 +232,6 @@ fi:
       bookmark:
         instructions: |-
           Jos haluat oppia lisää, valitse <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> tämän viestin alta ja <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **lisää tämä yksityisviestiketju kirjanmerkkeihisi**. Jos teet niin, sinua voi odottaa :gift: tulevaisuudessa!
-        reply: |-
-          Erinomaista! Löydät yksityiskeskustelumme nyt helposti koska vain [profiilisi kirjanmerkkivälilehdeltä](%{profile_page_url}/activity/bookmarks). Klikkaat vain profiilikuvaasi oikeassa yläkulmasssa &#8599;
         not_found: |-
           Tuota noin, et ole mielestäni kirjanmerkinnyt tämän ketjun viestejä. Löysithän kirjanmerkkikuvakkeen kunkin viestin alta? Voi olla, että sinun täytyy klikata <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">-kuvaketta, jotta näet sen ja muita toimintoja.
       emoji:
@@ -356,7 +354,7 @@ fi:
           Huomioi, että viestin voi palauttaa vain %{deletion_after} tunnin sisällä sen poistamisesta.
       category_hashtag:
         instructions: |-
-          Tiesitkö, että viesteissä voi viitata alueisiin ja tunnisteisiin? Esimerkiksi, oletko käynyt %{category}-alueella?
+          Tiesitkö, että viesteissä voi viitata alueisiin ja tunnisteisiin? Esimerkiksi, oletko käynyt %{category} -alueella?
 
           Näppäile lauseen keskellä `#` ja valitse mieleinen alue tai tunniste.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fr.yml b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
index f1a0ade848..822cd2e85f 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -232,8 +232,6 @@ fr:
       bookmark:
         instructions: |-
           Si vous souhaitez en savoir plus, sélectionnez <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> en dessous et <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **ajouter ce message direct aux signets**. Si vous le faites, il pourrait y avoir un :gift: dans le futur !
-        reply: |-
-          Excellent ! Maintenant, vous pouvez facilement retrouver notre conversation privée à tout moment, à partir de [l'onglet marque page sur votre profil](%{profile_page_url}/activity/bookmarks). Sélectionnez juste votre photo de profil dans le coin en haut à droite &#8599;
         not_found: |-
           Uh oh, je ne vois aucun signet sur ce sujet ! Avez-vous trouvé le bouton signet sous chaque message ? Utilisez le bouton Afficher plus <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> pour dévoiler d'autres actions si nécessaire.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.he.yml b/plugins/discourse-narrative-bot/config/locales/server.he.yml
index 554c58418d..61c91465e4 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.he.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.he.yml
@@ -233,7 +233,7 @@ he:
         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: עתידית!
         reply: |-
-          מעולה! מעכשיו דרכך חזרה אל השיחה שלנו תהיה קלה יותר בכל עת ותתאפשר ישירות מ[לשונית הסימניות בפרופיל שלך](%{profile_page_url}/activity/bookmarks). עליך פשוט לבחור בתמונת הפרופיל בפינה השמאלית העליונה &#8599;
+          מצוין! מעתה יתאפשר לך למצוא את דרכך חזרה אל הדיון בכל עת, הישר מתוך [לשונית הסימניות שבפרופיל שלך](%{bookmark_url}). עליך פשוט לבחור בתמונת הפרופיל שלך בפינה השמאלית העליונה&#8599;
         not_found: |-
           שוד ושבר, לא מצאתי סימניות בנושא זה. מצאת את הסימניות מתחת לכל פוסט? יש להשתמש בסמל להציג פעולות נוספות <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> כדי לחשוף אותן במקרה הצורך.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.hy.yml b/plugins/discourse-narrative-bot/config/locales/server.hy.yml
index 5e0aa6e867..b985bf9b28 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.hy.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.hy.yml
@@ -200,8 +200,6 @@ hy:
       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: լինի!
-        reply: |-
-          Գերազանց է! Այժմ Դուք հեշտությամբ կարող եք ցանկացած պահի գտնել վերադարձի ուղին դեպի մեր մասնավոր խոսակցություն, հենց [Ձեր պրոֆիլի էջանշանների ցանկից](%{profile_page_url}/activity/bookmarks): Ուղղակի ընտրեք Ձեր պրոֆիլի նկարը վերևի աջ մասում &#8599;
         not_found: |-
           Օհ, ես չեմ տեսնում որևէ էջանշում այս թեմայում: Դուք գտե՞լ եք յուրաքանչյուր գրառման տակ գտվնող էջանշումը: Եթե անհրաժեշտ է, օգտագործեք ցուցադրել ավելին <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> ՝ լրացուցիչ գործողությունները տեսնելու համար:
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.id.yml b/plugins/discourse-narrative-bot/config/locales/server.id.yml
index ddbf0ec42e..a0ca0963f8 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.id.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.id.yml
@@ -181,9 +181,6 @@ id:
           Hmm, sepertinya Anda tidak mengutip salah satu kalimat saya di atas?
 
           Pilih teks apa saja di pos di atas untuk memunculkan tombol <kbd>**Quote**</kbd>. Lalu tekan tombol **Reply** setelah memilih teks apa saja. Bisakah tolong dicoba lagi?
-      bookmark:
-        reply: |-
-          Hebat! Kelak Anda dapat mudah menemukan percakapan pribadi kapan saja, langsung dari [the bookmarks tab on your profile](%{profile_page_url}/activity/bookmarks). Cukup pilih gambar profil Anda di pojok kanan atas &#8599;
       emoji:
         reply: |-
           Hebat :sparkles: _emojitastic!_ :sparkles:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.it.yml b/plugins/discourse-narrative-bot/config/locales/server.it.yml
index 5de4ed0d97..265b4e8aee 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.it.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.it.yml
@@ -26,6 +26,14 @@ it:
         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, io non sono una persona reale. Sono un robot che ti può insegnare ad usare questo sito. Per interagire con me inviami un messaggio o menziona**`@%{discobot_username}`** ovunque."
+    tl2_promotion_message:
+      subject_template: "Congratulazioni per la promozione del tuo livello di esperienza!"
+      text_body_template: |
+        Ora che sei stato promosso, è tempo di conoscere alcune funzionalità avanzate!
+
+        Rispondi a questo messaggio con `@%{discobot_username} %{reset_trigger}` per scoprire di più su cosa puoi fare.
+
+        Continua a farti coinvolgere - ci piace averti in giro.
     timeout:
       message: |-
         Hey @%{username}, sto solo controllando perché è da un po' che non ti sento.
@@ -118,6 +126,15 @@ it:
 
           `@%{discobot_username} %{reset_trigger} {name-of-tutorial}`
           > Inizia un tutorial interattivo. `{name-of-tutorial}` può essere uno di: `%{tracks}`.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          %{quote_sample}
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: Ci puoi contare
       do_not_understand:
         first_response: |-
           Hey, grazie per la risposta!
@@ -214,9 +231,9 @@ it:
           Selezionare un qualsiasi testo del mio messaggio farà apparire il pulsante <kbd>**Cita**</kbd>. E anche premere **Rispondi** con qualsiasi testo selezionato funzionerà! Puoi provare di nuovo?
       bookmark:
         instructions: |-
-          Se vuoi saperne di più, seleziona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">qui sotto e<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16">**inserisci questo messaggio privato nei segnalibri**. Se lo farai, ci potrebbe essere un :gift: per te!
-        reply: |-
-          Eccellente! Ora potrai tornare facilmente a questa conversazione privata in ogni momento, proprio dalla [scheda segnalibri sul tuo profilo](%{profile_page_url}/activity/bookmarks). Basta selezionare l'immagine del tuo profilo in alto a destra &#8599;
+          Se vuoi saperne di più, seleziona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> qui sotto e <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **inserisci questo messaggio personale nei segnalibri**. Se lo farai, ci potrebbe essere un :gift: per te!
+        reply: |
+          Eccellente! Ora puoi facilmente tornare alla nostra conversazione privata in qualsiasi momento, direttamente dalla [scheda dei segnalibri sul tuo profilo](%{bookmark_url}). Basta selezionare la tua foto del profilo in alto a destra &#8599;
         not_found: |-
           Oh oh, non vedo nessun segnalibro in questo argomento. Hai trovato il pulsante "segnalibro" presente sotto i messaggi? Usa il pulsante "mostra altro" <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> per rivelare altri pulsanti, se necessario.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ko.yml b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
index 4ca9ebed78..5983e258db 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ko.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
@@ -187,8 +187,6 @@ ko:
 
           내 포스트에서 아무 글이나 선택해도 <kbd>**인용하기**</kbd> 버튼이 뜰거야. 글을 선택하고 **답글쓰기** 를 눌러도 돼! 다시 한 번 해 볼래?
       bookmark:
-        reply: |-
-          대단해! 이제는 [프로필의 북마크 탭](%{profile_page_url}/activity/bookmarks)만 눌러도 우리의 개인적인 대화를 손쉽게 뒤돌아 볼 수 있어. 우측 상단에 있는 프로필 사진만 선택하면 돼. &#8599;
         not_found: |-
           어라, 이 토픽에는 북마크가 없는데? 포스트 별로 있는 북마크 버튼을 찾았니? 더 보기 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 를 눌러서 필요한 추가 기능이 있는지 살펴 봐.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
index 3b9a0544b6..c020e8b244 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
@@ -188,8 +188,6 @@ nb_NO:
       bookmark:
         instructions: |-
           Hvis du ønsker å lære mer, velg <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> under og <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bokmerke denne personlige meldingen**. Hvis du gjør dette, venter det kanskje en :gift: på deg i fremtiden!
-        reply: |-
-          Strålende! Nå kan du enkelt finne tilbake til den private samtalen vår på et senere tidspunkt, rett fra [listen over bokmerker i profilen din](%{profile_page_url}/activity/bookmarks). Bare klikk på profilbildet ditt øverst til høyre. &#8599;
         not_found: |-
           Øh, jeg ser ingen bokmerker noe sted i dette emnet. Fant du bokmerket under hvert innlegg? Bruk "vis mer" <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> knappen for å vise flere handlinger ved behov.
       emoji:
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 c04a8c99ea..4a66730780 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
@@ -7,7 +7,7 @@
 
 pl_PL:
   site_settings:
-    discourse_narrative_bot_enabled: "Włącz bota Discourse Narrative"
+    discourse_narrative_bot_enabled: "Enable Discourse Narrative Bot (discobot)"
     disable_discourse_narrative_bot_welcome_post: "Dezaktywuj wpis powitalny Discourse Narrative Bot"
     discourse_narrative_bot_ignored_usernames: "Nazwy użytkownika, które bot Discourse Narrative powinien zignorować"
     discourse_narrative_bot_disable_public_replies: "Wyłącz publiczne odpowiedzi bota Discourse Narrative"
@@ -28,6 +28,8 @@ pl_PL:
     bio: "Witaj, nie jestem prawdziwą osobą. Jestem botem, który może nauczyć Cię korzystania z tej witryny. Aby skomunikować się ze mną, wyślij do mnie wiadomość lub oznacz **`@%{discobot_username}`** w dowolnym miejscu."
     tl2_promotion_message:
       subject_template: "Gratuluję zdobycia nowego poziomu zaufania!"
+      text_body_template: |
+        Po awansie nadszedł czas, aby dowiedzieć się o niektórych zaawansowanych funkcjach! Odpowiedz na tę wiadomość za pomocą „@ %{discobot_username} %{reset_trigger}”, aby dowiedzieć się więcej o tym, co możesz zrobić. Zapraszamy do dalszego angażowania się - cieszymy się, że jesteśmy w pobliżu.
     timeout:
       message: |-
         Witaj @%{username}, przypominam o sobie bo od dawna do mnie nie zaglądałeś.
@@ -228,7 +230,7 @@ pl_PL:
         instructions: |-
           Jeśli chcesz dowiedzieć się więcej, wybierz <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">poniżej i <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **dodaj tę wiadomość prywatną do zakładek**. Jeśli to zrobisz, możesz otrzymać :gift: w przyszłości!
         reply: |-
-          Wspaniale! Teraz możesz w łatwy sposób, w każdym momencie przejść do konwersacji prywatnej, po prawej od [zakładki dodawania do zakładek w twoim profilu]%{profile_page_url}/activity/bookmarks). Wystarczy, że klikniesz na swoj zdjęcie profilowe po prawej u góry&#8599;
+          Doskonały! Teraz możesz łatwo znaleźć drogę do naszej prywatnej rozmowy w dowolnym momencie, bezpośrednio z [zakładki zakładek w swoim profilu] (%{bookmark_url}). Wystarczy wybrać zdjęcie profilowe w prawym górnym rogu ↗
         not_found: |-
           Ups, nie widzę żadnych zakładek w tym temacie. Czy widzisz przycisk zakładki pod każdym wpisem? Użyj przycisku „pokaż więcej” <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">, żeby wyświetlić więcej akcji, jeśli to potrzebne.
       emoji:
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 9e5bcf9e64..d50817def5 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
@@ -232,8 +232,6 @@ pt_BR:
       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!
-        reply: |-
-          Excelente! Agora você pode encontrar facilmente o caminho de volta à nossa conversa particular a qualquer momento, diretamente da [guia de favoritos no seu perfil](%{profile_page_url}/activity/bookmarks). É só selecionar sua foto de perfil no canto superior direito &#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.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ru.yml b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
index 65354b9ba1..f5f68f7a2c 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ru.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
@@ -232,8 +232,6 @@ ru:
       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:
-        reply: |-
-          Отлично! Теперь вы можете легко найти свой путь назад к нашей частной беседе любой момент, прямо с [закладок в профиле](%{profile_page_url}/activity/bookmarks). Просто выберите фотографию профиля в правом верхнем углу &#8599;
         not_found: |-
           Упс, я не вижу никаких закладок в этой теме. Вы нашли закладку под каждым постом? Воспользуйтесь опцией "показать еще" <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> для просмотра дополнительных инструментов при необходимости.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sl.yml b/plugins/discourse-narrative-bot/config/locales/server.sl.yml
index 4a88f9ba70..e4e61c705a 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sl.yml
@@ -215,8 +215,6 @@ sl:
       bookmark:
         instructions: |-
           Da se naučite kaj novega, kliknite <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> spodaj in <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **zaznamujte to zasebno sporočilo**. Če to storite se vam v prihodnje mogoče obeta :gift:!
-        reply: |-
-          Enkratno! Sedaj lahko kadarkoli najdete pot nazaj na najin zaseben pogovor, enostavno preko [Zaznamki zavihka v vašem profilu](%{profile_page_url}/activity/bookmarks). Samo izberite vašo profilno sliko zgoraj desno &#8599;
         not_found: |-
           Oh, ne vidim nobenega zaznamka v tej temi. Ali ste našli zaznamek pod vsakim prispevkom? Uporabite prikaži več <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> za prikaz ostalih akcij.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sv.yml b/plugins/discourse-narrative-bot/config/locales/server.sv.yml
index f413e87346..06d136099c 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sv.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sv.yml
@@ -233,7 +233,7 @@ sv:
         instructions: |-
           Om du vill lära dig mer, välj <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> nedanför och <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bokmärk detta personliga meddelande**. Gör du det så väntar kanske en :gift: i framtiden!
         reply: |-
-          Utmärkt! Nu kan du enkelt hitta tillbaka till vår konversation när du vill, direkt från [fliken bokmärken under din profil](%{profile_page_url}/activity/bookmarks). Klicka bara på din profilbild uppe till höger. &#8599;
+          Utmärkt! Nu kan du enkelt hitta tillbaka till vår privata konversation när du vill, direkt från [fliken bokmärken under din profil](%{bookmark_url}). Klicka bara på din profilbild uppe till höger. &#8599;
         not_found: |-
           Ooops, jag ser inget bokmärke i detta ämne. Hittade du bokmärket under varje inlägg? Använd visa mer <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> för att synliggöra ytterligare funktioner vid behov.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sw.yml b/plugins/discourse-narrative-bot/config/locales/server.sw.yml
index 3dc24a9c01..fef9262533 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sw.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sw.yml
@@ -187,8 +187,6 @@ sw:
       bookmark:
         instructions: |-
           Kama ukipenda kujifunza zaidi, chagua <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">chini na <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **alamisha ujumbe huu binafsi**. Ukifanya hivyo, unaweza kupata :gift: baadae!
-        reply: |-
-          Vizuri! Sasa unaweza kurudi kwenye maongezi yetu binafsi mda wowote, kupitia [kichupo cha mialamisho kwenye umbo lako](%{profile_page_url}/activity/mialamisho). Chagua umbo lako iliyopo juu upande wa kulia &#8599;
         not_found: |-
           Nimeshindwa kuona mialamisho ya mada hii. Umeona alamisho yoyote kwenye kila chapisho? Tumia onyesha zaidi <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">kuona vitendo zaidi kama vinahitajika.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml b/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
index b8dcd760fd..f676323e7d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
@@ -222,8 +222,6 @@ tr_TR:
       bookmark:
         instructions: |-
           Daha fazla bilgi edinmek istiyorsanız aşağıdan seç<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> ve ** bu özel ileti yi yer im lerine ekle<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **. Bunu yaparsanız, gelecekte bir :gift: kazanabilirsiniz!
-        reply: |-
-          Mükemmel! Artık doğrudan [profilinizdeki yer işaretleri sekmesinden] (%{profile_page_url} / etkinlik / yer işaretleri) özel mesajlarımıza geri dönüş yolunuzu kolayca bulabilirsiniz. Sağ üstteki profil resminizi seçmeniz yeterlidir ↗
         not_found: |-
           Ah, bu konuda hiçbir yer işareti görmüyorum. Her gönderinin altındaki yer işaretlerini gördünüz mü? <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">Ek eylemleri ortaya çıkarmak için daha fazla göster seçeneğini kullanın.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ur.yml b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
index 9f439dec0b..9621a1c406 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ur.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
@@ -214,8 +214,6 @@ ur:
       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: ہو!
-        reply: |-
-          بہترین! اَب آپ [اپنی پروفائل پر موجود بُک مارکس ٹَیب](%{profile_page_url}/activity/bookmarks) کے زریعے آسانی سے ہماری نجی بات چیت تک دوبارہ رسائی حاصل کر سکتے ہیں۔ صرف اوپری دائیں طرف پر اپنی پروفائل تصویر کو سَلَیکٹ کریں &#8599;
         not_found: |-
           اوہ، مجھے اس ٹاپک میں کوئی بک مارکس نظر نہیں آرہے۔ کیا آپ کو ہر پوسٹ کے نیچے بُک مارک ملا؟ اگر ضرورت ہو تو اضافی کارروائیوں کو ظاہر کرنے کیلئے مزید دکھایے <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> کو استعمال کریں۔
       emoji:
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 33f0161b81..ceb416e9c3 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
@@ -146,7 +146,7 @@ zh_CN:
 
           我只是个机器人，但是如果你想要找到真人，看看[我们的联系页面](%{base_path}/about)。
 
-          同时，我不会再烦你。
+          同时，我不会再烦你了。
     new_user_narrative:
       reset_trigger: "教程"
       title: "新用户教程完成证明"
@@ -156,11 +156,11 @@ zh_CN:
         message: |-
           感谢加入%{title}，欢迎！
 
-          -我只是一个机器人，但是我们[友好的管理员]可以提供真人帮助。
+          - 我只是一个机器人，但是我们[友好的管理员]可以提供真人帮助。
 
-          -出于安全考虑，我们暂时限制新用户能够使用的功能。当我们更了解你的时候，你就可以获得[新功能](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: |-
           接下来，你能分享下列链接给我么？回复**单独一行的链接**，然后它会自动展开显示一个有用的摘要。
@@ -233,9 +233,9 @@ zh_CN:
         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: ！
         reply: |-
-          太棒了！现在你可以轻松地找到我们的私信了。它就在[你个人页面的收藏栏](%{profile_page_url}/activity/bookmarks)中。选择右上方你的个人头像 &#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 **吗？这些都可以用：
@@ -272,7 +272,7 @@ zh_CN:
 
           > :imp: 我在这写了些脏话
 
-          我猜你知道要做什么了。点击**标记该贴**<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-flag.png" width="16" height="16">为不恰当的发言！
         reply: |-
           [我们的管理人员](%{base_uri}/groups/staff)将私下通知你的标记。如果有足够的社区成员标记帖子，作为预防措施它也会自动隐藏。（因为我实际上并没有写一篇讨厌的帖子:angel:我现在已经取消了标记。）
         not_found: |-
@@ -371,11 +371,11 @@ zh_CN:
         instructions: |-
           每个主题都有通知等级。默认为“普通”，只有别人直接回复你的时候才会提醒你。
 
-          默认情况下，私信中的通知等级被设为最高级“监看”，即你将收到每个新回复的提醒。但是你可以覆盖任意一个主题的通知等级至“监看”、“追踪”或“静音”。
+          默认情况下，私信中的通知等级被设为最高级“监看”，即你将收到每个新回复的提醒。但是你可以改变任意一个主题的通知等级至“监看”、“追踪”或“静音”。
 
-          让我们试试改变这个主题的通知等级。在主题最下方，你可以看到一个**监看**的按钮。你可以把通知等级改到**追踪**吗？
+          让我们试试改变这个主题的通知等级。在主题最下方，你可以看到一个**监看**的按钮。你可以把通知等级改成**追踪**吗？
         not_found: |-
-          看起来你仍在关注 :eyes: 这个主题！没找到按钮？通知等级就在主题页面的最下方。
+          看起来你仍在关注 :eyes: 这个主题！不知道如何关注？通知等级按钮就在主题的下方。
         reply: |-
           太棒了！我希望你没有把这个话题静音，因为我有时会说话有点健谈:grin:。
 
diff --git a/plugins/poll/config/locales/client.ca.yml b/plugins/poll/config/locales/client.ca.yml
index 06baad49b1..72c1ce94bd 100644
--- a/plugins/poll/config/locales/client.ca.yml
+++ b/plugins/poll/config/locales/client.ca.yml
@@ -71,6 +71,7 @@ ca:
         title: Crea una enquesta
         insert: Insereix una enquesta
         help:
+          options_count: Introduïu almenys una opció
           invalid_values: El valor mínim ha de ser més petit que el valor màxim.
           min_step_value: L'increment mínim és 1
         poll_type:
diff --git a/plugins/poll/config/locales/client.de.yml b/plugins/poll/config/locales/client.de.yml
index ef717f1efd..772cd9732c 100644
--- a/plugins/poll/config/locales/client.de.yml
+++ b/plugins/poll/config/locales/client.de.yml
@@ -18,6 +18,8 @@ de:
       public:
         title: "Stimmen sind <strong>öffentlich</strong>."
       results:
+        groups:
+          title: "Du musst ein Mitglied von %{groups} sein, um an dieser Umfrage teilnehmen zu können."
         vote:
           title: "Ergebnisse werden <strong>nach Stimmabgabe</strong> angezeigt."
         closed:
@@ -68,6 +70,7 @@ de:
       error_while_toggling_status: "Entschuldige, beim Wechseln des Status dieser Umfrage ist ein Fehler aufgetreten."
       error_while_casting_votes: "Entschuldige, beim Abgeben deiner Stimme ist ein Fehler aufgetreten."
       error_while_fetching_voters: "Entschuldige, beim Anzeigen der Teilnehmer ist ein Fehler aufgetreten."
+      error_while_exporting_results: "Leider ist beim Exportieren der Umfrageergebnisse ein Fehler aufgetreten."
       ui_builder:
         title: Umfrage erstellen
         insert: Umfrage einfügen
@@ -86,6 +89,10 @@ de:
           vote: Nach Stimmabgabe
           closed: Nach Ende der Abstimmung
           staff: Nur Teammitglieder
+        poll_groups:
+          label: Zugelassene Gruppen
+        poll_chart_type:
+          label: Diagrammtyp
         poll_config:
           max: max.
           min: min.
diff --git a/plugins/poll/config/locales/client.it.yml b/plugins/poll/config/locales/client.it.yml
index 747c191518..042475014e 100644
--- a/plugins/poll/config/locales/client.it.yml
+++ b/plugins/poll/config/locales/client.it.yml
@@ -18,6 +18,8 @@ it:
       public:
         title: "I voti sono <strong>pubblici</strong>."
       results:
+        groups:
+          title: "Devi essere un membro di %{groups} per votare in questo sondaggio."
         vote:
           title: "I risultati saranno mostrati al momento del <strong>voto</strong>."
         closed:
@@ -44,7 +46,15 @@ it:
         label: "Mostra i risultati"
       hide-results:
         title: "Torna ai tuoi voti"
+        label: "Mostra voto"
+      group-results:
+        title: "Voti raggruppati per campo utente"
+        label: "Mostra la suddivisione"
+      ungroup-results:
+        title: "Combina tutti i voti"
+        label: "Nascondi la suddivisione"
       export-results:
+        title: "Esporta i risultati del sondaggio"
         label: "Esportare"
       open:
         title: "Apri il sondaggio"
@@ -60,10 +70,12 @@ it:
       error_while_toggling_status: "Spiacenti, si è verificato un errore nel commutare lo stato di questo sondaggio."
       error_while_casting_votes: "Spiacenti, si è verificato un errore nella votazione."
       error_while_fetching_voters: "Spiacenti, si è verificato un errore nel visualizzare i votanti."
+      error_while_exporting_results: "Spiacenti, si è verificato un errore durante l'esportazione dei risultati del sondaggio."
       ui_builder:
         title: Crea Sondaggio
         insert: Inserisci Sondaggio
         help:
+          options_count: Inserisci almeno 1 opzione
           invalid_values: Il valore minimo deve essere minore del valore massimo.
           min_step_value: Il valore minimo di un passo è 1
         poll_type:
@@ -77,6 +89,10 @@ it:
           vote: Al momento del voto
           closed: Quando chiuso
           staff: Solo staff
+        poll_groups:
+          label: Gruppi ammessi
+        poll_chart_type:
+          label: Tipo di grafico
         poll_config:
           max: Massimo
           min: Minimo
diff --git a/plugins/poll/config/locales/server.de.yml b/plugins/poll/config/locales/server.de.yml
index b3e0ef1e8e..555889e8dd 100644
--- a/plugins/poll/config/locales/server.de.yml
+++ b/plugins/poll/config/locales/server.de.yml
@@ -16,6 +16,8 @@ de:
     invalid_argument: "Ungültiger Wert '%{value}' für Argument '%{argument}'."
     multiple_polls_without_name: "Es gibt mehrere namenlose Umfragen. Benutze das Attribute '<code>name</code>', um deine Umfragen eindeutig identifizierbar zu machen."
     multiple_polls_with_same_name: "Es gibt mehre Umfragen mit dem selben Namen: <strong>%{name}</strong>. Benutze das Attribute '<code>name</code>', um deine Umfragen eindeutig identifizierbar zu machen."
+    default_poll_must_have_at_least_1_option: "Umfrage muss mindestens eine Auswahl haben."
+    named_poll_must_have_at_least_1_option: "Die Umfrage mit dem Namen <strong>%{name}</strong> muss mindestens eine Auswahl haben."
     default_poll_must_have_less_options:
       one: "Die Umfrage muss weniger als eine Option haben."
       other: "Die Umfrage muss weniger als %{count} Optionen haben."
@@ -24,6 +26,8 @@ de:
       other: "Die Umfrage mit dem Namen <strong>%{name}</strong> muss weniger als %{count} Optionen haben."
     default_poll_must_have_different_options: "Die Umfrage muss unterschiedliche Optionen haben."
     named_poll_must_have_different_options: "Die Umfrage mit dem Namen <strong>%{name}</strong> muss unterschiedliche Optionen haben."
+    default_poll_must_not_have_any_empty_options: "Umfrage darf keine leere Auswahl haben."
+    named_poll_must_not_have_any_empty_options: "Die Umfrage mit dem Namen <strong>%{name}</strong> darf keine leere Auswahl haben."
     default_poll_with_multiple_choices_has_invalid_parameters: "Die Mehrfachauswahl-Umfrage hat ungültige Parameter."
     named_poll_with_multiple_choices_has_invalid_parameters: "Die Mehrfachauswahl-Umfrage mit dem Namen <strong>%{name}</strong> hat ungültige Parameter."
     requires_at_least_1_valid_option: "Du musst mindestens eine gültige Option auswählen."
@@ -40,3 +44,5 @@ de:
     insufficient_rights_to_create: "Du darfst keine Umfragen erstellen."
     email:
       link_to_poll: "Klicke hier, um die Umfrage zu sehen."
+    user_field:
+      no_data: "Keine Daten"
diff --git a/plugins/poll/config/locales/server.it.yml b/plugins/poll/config/locales/server.it.yml
index 2c98850b35..c29eeb2320 100644
--- a/plugins/poll/config/locales/server.it.yml
+++ b/plugins/poll/config/locales/server.it.yml
@@ -11,11 +11,15 @@ it:
     poll_maximum_options: "Numero massimo di opzioni permesse in un sondaggio."
     poll_edit_window_mins: "Numero di minuti dopo la creazione di un messaggio durante i quali i sondaggi possono ancora essere modificati."
     poll_minimum_trust_level_to_create: "Definisce il minimo livello di esperienza necessario per poter creare sondaggi."
+    poll_groupable_user_fields: "Un insieme di nomi di campi utente che possono essere utilizzati per raggruppare e filtrare i risultati del sondaggio."
+    poll_export_data_explorer_query_id: "ID della query Data Explorer da utilizzare per l'esportazione dei risultati del sondaggio (0 per disabilitare)."
   poll:
     poll: "sondaggio"
     invalid_argument: "Valore '%{value}' non valido per l'argomento '%{argument}'."
     multiple_polls_without_name: "Ci sono più sondaggi privi di nome. Usa l'attributo '<code>name</code>' per identificare univocamente i tuoi sondaggi."
     multiple_polls_with_same_name: "Ci sono più sondaggi con lo stesso nome: <strong>%{name}</strong>. Usa l'attributo '<code>name</code>' per identificare univocamente i tuoi sondaggi."
+    default_poll_must_have_at_least_1_option: " Il sondaggio deve avere almeno 1 opzione."
+    named_poll_must_have_at_least_1_option: "Il sondaggio di nome <strong>%{name}</strong> deve avere almeno 1 opzione."
     default_poll_must_have_less_options:
       one: "Il sondaggio deve avere meno di una opzione."
       other: "Il sondaggio deve avere meno di %{count} opzioni."
@@ -24,6 +28,8 @@ it:
       other: "Il sondaggio <strong>%{name}</strong> deve avere meno di %{count} opzioni."
     default_poll_must_have_different_options: "Il sondaggio deve avere opzioni diverse."
     named_poll_must_have_different_options: "Il sondaggio dal nome <strong>%{name}</strong> deve avere opzioni diverse."
+    default_poll_must_not_have_any_empty_options: "Il sondaggio non deve avere opzioni vuote."
+    named_poll_must_not_have_any_empty_options: "Il sondaggio dal nome <strong>%{name}</strong>non deve avere opzioni vuote."
     default_poll_with_multiple_choices_has_invalid_parameters: "Il sondaggio a scelta multipla ha parametri non validi."
     named_poll_with_multiple_choices_has_invalid_parameters: "Il sondaggio a scelta multipla dal nome <strong>%{name}</strong> ha parametri non validi."
     requires_at_least_1_valid_option: "Devi scegliere almeno una opzione valida."
@@ -40,3 +46,5 @@ it:
     insufficient_rights_to_create: "Non sei autorizzato a creare sondaggi."
     email:
       link_to_poll: "Clicca per vedere il sondaggio."
+    user_field:
+      no_data: "Nessun Dato"
diff --git a/plugins/poll/config/locales/server.zh_CN.yml b/plugins/poll/config/locales/server.zh_CN.yml
index 154191c5e2..059e02a01a 100644
--- a/plugins/poll/config/locales/server.zh_CN.yml
+++ b/plugins/poll/config/locales/server.zh_CN.yml
@@ -15,7 +15,7 @@ zh_CN:
     poll_export_data_explorer_query_id: "用于导出投票结果的数据资源管理器查询的ID（0为禁用）。"
   poll:
     poll: "投票"
-    invalid_argument: "参数“%{argument}”无效值“%{value}”。"
+    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: "投票必须至少有一个选项。"

From 7876ee2d67d9ae93140ba8ec613fd35707f9fa75 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Wed, 15 Apr 2020 16:42:48 +0100
Subject: [PATCH 0665/1830] DEV: upgrade Rails

Latest version of Rails contains compatibility fixes for Ruby 2.7 and some
minor security fixes we would like to have

It also broke some of the multisite tests.

Rails tries to use the same connection for reading from a replica as writing
to the leader during tests, because, with everything happening in a
transaction, changes to the DB wouldn't otherwise be reflected in the
replica connection.

The difference now is that Rails tries to do this for connections opened
after the test has started which affected rails multisite connections.

The upshot of this is that, as things stand, you are likely to
experience problems if you try to connect to a different multisite DB in
a test when the `current_db` is not 'default'.
---
 Gemfile              | 14 +++++------
 Gemfile.lock         | 56 ++++++++++++++++++++++----------------------
 spec/rails_helper.rb |  2 ++
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9e4b7cb7bf..d0844e45e8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,13 +18,13 @@ else
   # this allows us to include the bits of rails we use without pieces we do not.
   #
   # To issue a rails update bump the version number here
-  gem 'actionmailer', '6.0.1'
-  gem 'actionpack', '6.0.1'
-  gem 'actionview', '6.0.1'
-  gem 'activemodel', '6.0.1'
-  gem 'activerecord', '6.0.1'
-  gem 'activesupport', '6.0.1'
-  gem 'railties', '6.0.1'
+  gem 'actionmailer', '6.0.2.2'
+  gem 'actionpack', '6.0.2.2'
+  gem 'actionview', '6.0.2.2'
+  gem 'activemodel', '6.0.2.2'
+  gem 'activerecord', '6.0.2.2'
+  gem 'activesupport', '6.0.2.2'
+  gem 'railties', '6.0.2.2'
   gem 'sprockets-rails'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ef1c3e67ee..fa0105851f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (6.0.1)
-      actionpack (= 6.0.1)
-      actionview (= 6.0.1)
-      activejob (= 6.0.1)
+    actionmailer (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      actionview (= 6.0.2.2)
+      activejob (= 6.0.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.1)
-      actionview (= 6.0.1)
-      activesupport (= 6.0.1)
-      rack (~> 2.0)
+    actionpack (6.0.2.2)
+      actionview (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.1)
-      activesupport (= 6.0.1)
+    actionview (6.0.2.2)
+      activesupport (= 6.0.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -24,15 +24,15 @@ GEM
       actionview (>= 6.0.a)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (6.0.1)
-      activesupport (= 6.0.1)
+    activejob (6.0.2.2)
+      activesupport (= 6.0.2.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.1)
-      activesupport (= 6.0.1)
-    activerecord (6.0.1)
-      activemodel (= 6.0.1)
-      activesupport (= 6.0.1)
-    activesupport (6.0.1)
+    activemodel (6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activerecord (6.0.2.2)
+      activemodel (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activesupport (6.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -283,9 +283,9 @@ GEM
     rails_multisite (2.1.1)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
-    railties (6.0.1)
-      actionpack (= 6.0.1)
-      activesupport (= 6.0.1)
+    railties (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -425,14 +425,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (= 6.0.1)
-  actionpack (= 6.0.1)
-  actionview (= 6.0.1)
+  actionmailer (= 6.0.2.2)
+  actionpack (= 6.0.2.2)
+  actionview (= 6.0.2.2)
   actionview_precompiler
   active_model_serializers (~> 0.8.3)
-  activemodel (= 6.0.1)
-  activerecord (= 6.0.1)
-  activesupport (= 6.0.1)
+  activemodel (= 6.0.2.2)
+  activerecord (= 6.0.2.2)
+  activesupport (= 6.0.2.2)
   addressable
   annotate
   aws-sdk-s3
@@ -512,7 +512,7 @@ DEPENDENCIES
   rack-mini-profiler
   rack-protection
   rails_multisite
-  railties (= 6.0.1)
+  railties (= 6.0.2.2)
   rake
   rb-fsevent
   rb-inotify (~> 0.9)
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 011dc0309e..04a90b3e06 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -244,6 +244,8 @@ RSpec.configure do |config|
 
     RailsMultisite::ConnectionManagement.config_filename =
       "spec/fixtures/multisite/two_dbs.yml"
+
+    RailsMultisite::ConnectionManagement.establish_connection(db: 'default')
   end
 
   config.after(:each, type: :multisite) do

From 0a3cc22cec2572c4e63667f460438a145d8c9430 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 20 Apr 2020 08:31:43 -0500
Subject: [PATCH 0666/1830] FIX: Wizard was creating duplicate Light theme if
 Light was selected (#9464)

---
 lib/wizard/builder.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/wizard/builder.rb b/lib/wizard/builder.rb
index 40318d8aa9..5372d3428b 100644
--- a/lib/wizard/builder.rb
+++ b/lib/wizard/builder.rb
@@ -181,11 +181,16 @@ class Wizard
           next unless scheme_name.present? && ColorScheme.is_base?(scheme_name)
 
           name = I18n.t("color_schemes.#{scheme_name.downcase.gsub(' ', '_')}_theme_name")
-
           theme = nil
           scheme = ColorScheme.find_by(base_scheme_id: scheme_name, via_wizard: true)
+          is_light_theme = (scheme_name == ColorScheme::LIGHT_THEME_ID)
           scheme ||= ColorScheme.create_from_base(name: name, via_wizard: true, base_scheme_id: scheme_name)
+
           themes = Theme.where(color_scheme_id: scheme.id).order(:id).to_a
+          if is_light_theme
+            themes = (themes || []).concat(Theme.where(color_scheme_id: nil).order(:id).to_a)
+            themes.sort_by(&:id)
+          end
           theme = themes.find(&:default?)
           theme ||= themes.first
 

From e5233f5ce69acc5ecc5edf29fe692d29e73703f2 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 20 Apr 2020 10:34:05 -0500
Subject: [PATCH 0667/1830] DEV: Add class to header-topic-info widget (#9475)

---
 .../discourse/widgets/header-topic-info.js     | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js b/app/assets/javascripts/discourse/widgets/header-topic-info.js
index c6488d0562..1e31cf5fbf 100644
--- a/app/assets/javascripts/discourse/widgets/header-topic-info.js
+++ b/app/assets/javascripts/discourse/widgets/header-topic-info.js
@@ -57,6 +57,10 @@ createWidget("topic-header-participant", {
 export default createWidget("header-topic-info", {
   tagName: "div.extra-info-wrapper",
 
+  buildClasses(attrs) {
+    return this.showCategory(attrs.topic) ? "two-rows" : "";
+  },
+
   buildFancyTitleClass() {
     const baseClass = ["topic-link"];
     const flatten = array => [].concat.apply([], array);
@@ -112,11 +116,7 @@ export default createWidget("header-topic-info", {
     const category = topic.get("category");
 
     if (loaded || category) {
-      if (
-        category &&
-        (!category.get("isUncategorizedCategory") ||
-          !this.siteSettings.suppress_uncategorized_badge)
-      ) {
+      if (this.showCategory(topic)) {
         const parentCategory = category.get("parentCategory");
         const categories = [];
         if (parentCategory) {
@@ -208,6 +208,14 @@ export default createWidget("header-topic-info", {
     );
   },
 
+  showCategory(topic) {
+    return (
+      topic.category &&
+      (!topic.category.isUncategorizedCategory ||
+        !this.siteSettings.suppress_uncategorized_badge)
+    );
+  },
+
   jumpToTopPost() {
     const topic = this.attrs.topic;
     if (topic) {

From f63ac79b9d19175049385f8aa9d3bfe0d795f2e6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 20 Apr 2020 12:34:53 -0400
Subject: [PATCH 0668/1830] Build(deps-dev): Bump ruby-prof from 1.3.1 to 1.3.2
 (#9474)

Bumps [ruby-prof](https://github.com/ruby-prof/ruby-prof) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/ruby-prof/ruby-prof/releases)
- [Changelog](https://github.com/ruby-prof/ruby-prof/blob/master/CHANGES)
- [Commits](https://github.com/ruby-prof/ruby-prof/compare/1.3.1...1.3.2)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index fa0105851f..f8c8cc3e48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -352,7 +352,7 @@ GEM
       rubocop (>= 0.69.0)
     rubocop-rspec (1.38.1)
       rubocop (>= 0.68.1)
-    ruby-prof (1.3.1)
+    ruby-prof (1.3.2)
     ruby-progressbar (1.10.1)
     ruby-readability (0.7.0)
       guess_html_encoding (>= 0.0.4)

From ea8b40a53b440ccbb666b90516028b5ef42f9b20 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Mon, 20 Apr 2020 10:03:25 -0700
Subject: [PATCH 0669/1830] FEATURE: Add created_at column to user_badges
 (#9463)

* FEATURE: Add created_at column to user_badges

This makes scraping for newly granted badges easier.

Patch from @eviltrout applied.

Co-authored-by: Robin Ward <robin.ward@gmail.com>
---
 app/serializers/user_badge_serializer.rb             |  2 +-
 app/services/badge_granter.rb                        |  7 ++++---
 .../20200417183143_add_created_at_to_badge_user.rb   | 12 ++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20200417183143_add_created_at_to_badge_user.rb

diff --git a/app/serializers/user_badge_serializer.rb b/app/serializers/user_badge_serializer.rb
index 5ff905714d..6f904b01b5 100644
--- a/app/serializers/user_badge_serializer.rb
+++ b/app/serializers/user_badge_serializer.rb
@@ -10,7 +10,7 @@ class UserBadgeSerializer < ApplicationSerializer
                :admin
   end
 
-  attributes :id, :granted_at, :count, :post_id, :post_number
+  attributes :id, :granted_at, :created_at, :count, :post_id, :post_number
 
   has_one :badge
   has_one :user, serializer: UserSerializer, root: :users
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index c6dfd82170..26b9262a3a 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -16,7 +16,8 @@ class BadgeGranter
     return unless badge.enabled?
 
     system_user_id = Discourse.system_user.id
-    user_badges = users.map { |u| { badge_id: badge.id, user_id: u.id, granted_by_id: system_user_id, granted_at: Time.now } }
+    now = Time.zone.now
+    user_badges = users.map { |u| { badge_id: badge.id, user_id: u.id, granted_by_id: system_user_id, granted_at: now, created_at: now } }
     granted_badges = UserBadge.insert_all(user_badges, returning: %i[user_id])
 
     users.each do |user|
@@ -325,8 +326,8 @@ class BadgeGranter
 
     sql = <<~SQL
       WITH w as (
-        INSERT INTO user_badges(badge_id, user_id, granted_at, granted_by_id, post_id)
-        SELECT :id, q.user_id, q.granted_at, -1, #{post_id_field}
+        INSERT INTO user_badges(badge_id, user_id, granted_at, granted_by_id, created_at, post_id)
+        SELECT :id, q.user_id, q.granted_at, -1, current_timestamp, #{post_id_field}
           FROM (
                  #{badge.query}
                ) q
diff --git a/db/migrate/20200417183143_add_created_at_to_badge_user.rb b/db/migrate/20200417183143_add_created_at_to_badge_user.rb
new file mode 100644
index 0000000000..bbfd6066e9
--- /dev/null
+++ b/db/migrate/20200417183143_add_created_at_to_badge_user.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+class AddCreatedAtToBadgeUser < ActiveRecord::Migration[6.0]
+  def up
+    add_column :user_badges, :created_at, :datetime, null: true
+    execute 'UPDATE user_badges SET created_at = granted_at WHERE created_at IS NULL'
+    change_column :user_badges, :created_at, :datetime, null: false, default: 'current_timestamp'
+  end
+
+  def down
+    remove_column :user_badges, :created_at
+  end
+end

From 8f5314bf981ec44bda11131c58fc2db5437fe896 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 14:16:34 -0400
Subject: [PATCH 0670/1830] FIX: An `opts` hash was not, in fact, optional :)

---
 lib/topic_retriever.rb                  | 2 +-
 spec/components/topic_retriever_spec.rb | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/topic_retriever.rb b/lib/topic_retriever.rb
index 3da6f932a2..8fae22a368 100644
--- a/lib/topic_retriever.rb
+++ b/lib/topic_retriever.rb
@@ -4,8 +4,8 @@ class TopicRetriever
 
   def initialize(embed_url, opts = nil)
     @embed_url = embed_url
-    @author_username = opts[:author_username]
     @opts = opts || {}
+    @author_username = @opts[:author_username]
   end
 
   def retrieve
diff --git a/spec/components/topic_retriever_spec.rb b/spec/components/topic_retriever_spec.rb
index 5ab908476b..6fd602c67e 100644
--- a/spec/components/topic_retriever_spec.rb
+++ b/spec/components/topic_retriever_spec.rb
@@ -8,6 +8,11 @@ describe TopicRetriever do
   let(:author_username) { "eviltrout" }
   let(:topic_retriever) { TopicRetriever.new(embed_url, author_username: author_username) }
 
+  it "can initialize without optional parameters" do
+    t = TopicRetriever.new(embed_url)
+    expect(t).to be_present
+  end
+
   describe "#retrieve" do
     context "when host is invalid" do
       before do

From 56a23c68f19835eac1d70db212a856efe8999994 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 14:27:43 -0400
Subject: [PATCH 0671/1830] FIX: Embedded topics couldn't update their titles

---
 app/models/topic_embed.rb       | 10 ++++------
 spec/models/topic_embed_spec.rb |  3 ++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 1947a3c640..64c39c527c 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -92,12 +92,10 @@ class TopicEmbed < ActiveRecord::Base
         end
 
         if content_sha1 != embed.content_sha1
-          post.revise(
-            user,
-            { raw: absolutize_urls(url, contents) },
-            skip_validations: true,
-            bypass_rate_limiter: true
-          )
+          changes = { raw: absolutize_urls(url, contents) }
+          changes[:title] = title if title.present?
+
+          post.revise(user, changes, skip_validations: true, bypass_rate_limiter: true)
           embed.update!(content_sha1: content_sha1)
         end
       end
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index f15f55fff8..59510b90bb 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -46,8 +46,9 @@ describe TopicEmbed do
 
       it "Supports updating the post content" do
         expect do
-          TopicEmbed.import(user, url, title, "muhahaha new contents!")
+          TopicEmbed.import(user, url, "New title received", "muhahaha new contents!")
         end.to change { topic_embed.reload.content_sha1 }
+        expect(topic_embed.topic.title).to eq("New title received")
 
         expect(topic_embed.post.cooked).to match(/new contents/)
       end

From 98729c8e6efc11233a8f5eb15ecfeb52217d5272 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 14:31:24 -0400
Subject: [PATCH 0672/1830] FIX: Allow embed updates of just the title

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

diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 64c39c527c..43de234a15 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -91,7 +91,7 @@ class TopicEmbed < ActiveRecord::Base
           post.reload
         end
 
-        if content_sha1 != embed.content_sha1
+        if (content_sha1 != embed.content_sha1) || (title && title != post&.topic&.title)
           changes = { raw: absolutize_urls(url, contents) }
           changes[:title] = title if title.present?
 

From e997a1f315a0f207d851632f145f4e1cfe045113 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 14:56:21 -0400
Subject: [PATCH 0673/1830] FIX: Don't make topics visible unless the posts are
 regular

---
 lib/post_creator.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 0d3d61a99e..81befd03c9 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -419,6 +419,7 @@ class PostCreator
     return unless SiteSetting.embed_unlisted?
     return unless @post.post_number > 1
     return if @post.topic.visible?
+    return if @post.post_type != Post.types[:regular]
 
     if embed = @post.topic.topic_embed
       @post.topic.update_status('visible', true, @user)

From 25bed4f64349992d8028ff5c5f76062258a40f06 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 15:11:59 -0400
Subject: [PATCH 0674/1830] FIX: Concurrency issues with making topic embedded
 posts visible

---
 app/jobs/regular/make_embedded_topic_visible.rb | 15 +++++++++++++++
 lib/post_creator.rb                             | 12 ------------
 lib/post_jobs_enqueuer.rb                       | 12 ++++++++++++
 spec/models/topic_embed_spec.rb                 |  1 +
 4 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 app/jobs/regular/make_embedded_topic_visible.rb

diff --git a/app/jobs/regular/make_embedded_topic_visible.rb b/app/jobs/regular/make_embedded_topic_visible.rb
new file mode 100644
index 0000000000..c3c4121b5f
--- /dev/null
+++ b/app/jobs/regular/make_embedded_topic_visible.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Jobs
+  class MakeEmbeddedTopicVisible < ::Jobs::Base
+
+    def execute(args)
+      raise Discourse::InvalidParameters.new(:topic_id) if args[:topic_id].blank?
+
+      if topic = Topic.find_by(id: args[:topic_id])
+        topic.update_status('visible', true, topic.user)
+      end
+    end
+
+  end
+end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 81befd03c9..fab3de1954 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -186,7 +186,6 @@ class PostCreator
         @post.link_post_uploads
         update_uploads_secure_status
         ensure_in_allowed_users if guardian.is_staff?
-        make_visible
         unarchive_message
         if !@opts[:import_mode]
           DraftSequence.next!(@user, draft_key)
@@ -415,17 +414,6 @@ class PostCreator
     end
   end
 
-  def make_visible
-    return unless SiteSetting.embed_unlisted?
-    return unless @post.post_number > 1
-    return if @post.topic.visible?
-    return if @post.post_type != Post.types[:regular]
-
-    if embed = @post.topic.topic_embed
-      @post.topic.update_status('visible', true, @user)
-    end
-  end
-
   def unarchive_message
     return unless @topic.private_message? && @topic.id
 
diff --git a/lib/post_jobs_enqueuer.rb b/lib/post_jobs_enqueuer.rb
index 8659cba7d1..6f95899bb4 100644
--- a/lib/post_jobs_enqueuer.rb
+++ b/lib/post_jobs_enqueuer.rb
@@ -18,6 +18,7 @@ class PostJobsEnqueuer
     unless skip_after_create?
       after_post_create
       after_topic_create
+      make_visible
     end
 
     if @topic.private_message?
@@ -44,6 +45,17 @@ class PostJobsEnqueuer
     @post.trigger_post_process(new_post: true)
   end
 
+  def make_visible
+    return unless SiteSetting.embed_unlisted?
+    return unless @post.post_number > 1
+    return if @topic.visible?
+    return if @post.post_type != Post.types[:regular]
+
+    if @topic.topic_embed.present?
+      Jobs.enqueue(:make_embedded_topic_visible, topic_id: @topic.id)
+    end
+  end
+
   def after_post_create
     TopicTrackingState.publish_unread(@post) if @post.post_number > 1
     TopicTrackingState.publish_latest(@topic, @post.whisper?)
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index 59510b90bb..c45a2209e1 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -75,6 +75,7 @@ describe TopicEmbed do
       end
 
       it "will make the topic unlisted if `embed_unlisted` is set until someone replies" do
+        Jobs.run_immediately!
         SiteSetting.embed_unlisted = true
         imported_post = TopicEmbed.import(user, "http://eviltrout.com/abcd", title, "some random content")
         expect(imported_post.topic).not_to be_visible

From 06796bec8be1b3ce9d307f925a15af0ea363f70f Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 20 Apr 2020 14:51:49 -0500
Subject: [PATCH 0675/1830] FIX: Set category description to first posts cooked
 value (#9478)

---
 app/models/category.rb       |  1 +
 spec/models/category_spec.rb | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/app/models/category.rb b/app/models/category.rb
index 44d115cad0..c19d3848cc 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -287,6 +287,7 @@ class Category < ActiveRecord::Base
       update_column(:topic_id, t.id)
       post = t.posts.build(raw: description || post_template, user: user)
       post.save!(validate: false)
+      update_column(:description, post.cooked) if description.present?
 
       t
     end
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index b2da411504..7b550a9c1d 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -403,6 +403,16 @@ describe Category do
       expect(@category.topics_year).to eq(0)
     end
 
+    it "cooks the definition" do
+      category = Category.create(
+        name: 'little-test',
+        user_id: Discourse.system_user.id,
+        description: "click the link [here](https://fakeurl.com)"
+      )
+      expect(category.description.include?("[here]")).to eq(false)
+      expect(category.description).to eq(category.topic.first_post.cooked)
+    end
+
     it "renames the definition when renamed" do
       @category.update(name: 'Troutfishing')
       @topic.reload

From afe1407c758278b49db5ae59500385f15c0794a5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 20 Apr 2020 16:06:38 -0400
Subject: [PATCH 0676/1830] Build(deps): Bump aws-sdk-s3 from 1.61.2 to 1.62.0
 (#9479)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.61.2 to 1.62.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits/v1.62.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f8c8cc3e48..9d94326c20 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,16 +45,16 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.294.0)
-    aws-sdk-core (3.92.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-partitions (1.298.0)
+    aws-sdk-core (3.94.0)
+      aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
     aws-sdk-kms (1.30.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.61.2)
+    aws-sdk-s3 (1.62.0)
       aws-sdk-core (~> 3, >= 3.83.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)

From 96d026a329a3d6c0b47c40f167b6c6ea1b3bfe7f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 16:18:17 -0400
Subject: [PATCH 0677/1830] DEV: Remove EventTarget. Future versions of Ember
 don't export this.

It was removed altogether from ApplicationRoute, which only triggered
an `activate` event which never seems to be used.

We can replace it with Evented which is still present.
---
 app/assets/javascripts/discourse-loader.js    |  1 -
 .../javascripts/discourse/lib/eyeline.js      | 26 +++++++++++++------
 .../discourse/routes/application.js           | 12 +--------
 .../javascripts/discourse/routes/topic.js     |  5 ++--
 .../discourse/services/app-events.js          |  5 +++-
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index e73ecd2b7b..24f879f687 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -108,7 +108,6 @@ var define, requirejs;
       },
       rsvp: {
         default: Ember.RSVP,
-        EventTarget: Ember.RSVP.EventTarget,
         Promise: Ember.RSVP.Promise,
         hash: Ember.RSVP.hash,
         all: Ember.RSVP.all
diff --git a/app/assets/javascripts/discourse/lib/eyeline.js b/app/assets/javascripts/discourse/lib/eyeline.js
index bebbfa1623..57a6def7dd 100644
--- a/app/assets/javascripts/discourse/lib/eyeline.js
+++ b/app/assets/javascripts/discourse/lib/eyeline.js
@@ -1,5 +1,5 @@
 import ENV from "discourse-common/config/environment";
-import { EventTarget } from "rsvp";
+import AppEvents from "discourse/services/app-events";
 
 let _skipUpdate;
 let _rootElement;
@@ -19,6 +19,15 @@ configureEyeline();
 //  Track visible elements on the screen.
 const Eyeline = function Eyeline(selector) {
   this.selector = selector;
+  this.appEvents = AppEvents.create();
+};
+
+Eyeline.prototype.on = function(name, cb) {
+  this.appEvents.on(name, cb);
+};
+
+Eyeline.prototype.off = function(name, cb) {
+  this.appEvents.off(name, cb);
 };
 
 Eyeline.prototype.update = function() {
@@ -44,6 +53,7 @@ Eyeline.prototype.update = function() {
       bottomOffset.top <= docViewBottom && bottomOffset.top >= docViewTop;
   }
 
+  let { appEvents } = this;
   return $elements.each((i, elem) => {
     const $elem = $(elem),
       elemTop = _rootElement ? $elem.position().top : $elem.offset().top,
@@ -68,17 +78,17 @@ Eyeline.prototype.update = function() {
 
     // If you hit the bottom we mark all the elements as seen. Otherwise, just the first one
     if (!atBottom) {
-      this.trigger("saw", { detail: $elem });
+      appEvents.trigger("saw", { detail: $elem });
       if (i === 0) {
-        this.trigger("sawTop", { detail: $elem });
+        appEvents.trigger("sawTop", { detail: $elem });
       }
       return false;
     }
     if (i === 0) {
-      this.trigger("sawTop", { detail: $elem });
+      appEvents.trigger("sawTop", { detail: $elem });
     }
     if (i === $elements.length - 1) {
-      return this.trigger("sawBottom", { detail: $elem });
+      return appEvents.trigger("sawBottom", { detail: $elem });
     }
   });
 };
@@ -89,9 +99,9 @@ Eyeline.prototype.flushRest = function() {
     return;
   }
 
-  $(this.selector).each((i, elem) => this.trigger("saw", { detail: $(elem) }));
+  $(this.selector).each((i, elem) =>
+    this.appEvents.trigger("saw", { detail: $(elem) })
+  );
 };
 
-EventTarget.mixin(Eyeline.prototype);
-
 export default Eyeline;
diff --git a/app/assets/javascripts/discourse/routes/application.js b/app/assets/javascripts/discourse/routes/application.js
index 07926eb568..856c203058 100644
--- a/app/assets/javascripts/discourse/routes/application.js
+++ b/app/assets/javascripts/discourse/routes/application.js
@@ -1,4 +1,4 @@
-import { next, once } from "@ember/runloop";
+import { once } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import { setting } from "discourse/lib/computed";
@@ -11,7 +11,6 @@ import { findAll } from "discourse/models/login-method";
 import { getOwner } from "discourse-common/lib/get-owner";
 import { userPath } from "discourse/lib/url";
 import Composer from "discourse/models/composer";
-import { EventTarget } from "rsvp";
 
 function unlessReadOnly(method, message) {
   return function() {
@@ -236,14 +235,6 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
     }
   },
 
-  activate() {
-    this._super(...arguments);
-    next(function() {
-      // Support for callbacks once the application has activated
-      ApplicationRoute.trigger("activate");
-    });
-  },
-
   renderTemplate() {
     this.render("application");
     this.render("user-card", { into: "application", outlet: "user-card" });
@@ -298,5 +289,4 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
   }
 });
 
-EventTarget.mixin(ApplicationRoute);
 export default ApplicationRoute;
diff --git a/app/assets/javascripts/discourse/routes/topic.js b/app/assets/javascripts/discourse/routes/topic.js
index 46a1b3ada9..ed49b86153 100644
--- a/app/assets/javascripts/discourse/routes/topic.js
+++ b/app/assets/javascripts/discourse/routes/topic.js
@@ -4,13 +4,13 @@ import { cancel, later, schedule } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import { ID_CONSTRAINT } from "discourse/models/topic";
-import { EventTarget } from "rsvp";
+import Evented from "@ember/object/evented";
 
 const SCROLL_DELAY = 500;
 
 import showModal from "discourse/lib/show-modal";
 
-const TopicRoute = DiscourseRoute.extend({
+const TopicRoute = DiscourseRoute.extend(Evented, {
   init() {
     this._super(...arguments);
 
@@ -332,5 +332,4 @@ const TopicRoute = DiscourseRoute.extend({
   }
 });
 
-EventTarget.mixin(TopicRoute);
 export default TopicRoute;
diff --git a/app/assets/javascripts/discourse/services/app-events.js b/app/assets/javascripts/discourse/services/app-events.js
index 8a3e770c75..717caf7545 100644
--- a/app/assets/javascripts/discourse/services/app-events.js
+++ b/app/assets/javascripts/discourse/services/app-events.js
@@ -3,7 +3,10 @@ import Evented from "@ember/object/evented";
 import Service from "@ember/service";
 
 export default Service.extend(Evented, {
-  _events: {},
+  init() {
+    this._super(...arguments);
+    this._events = {};
+  },
 
   on() {
     if (arguments.length === 2) {

From 28e9f54e2f6fa15cf97836e5a66ce4464d73bd62 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 16:48:51 -0400
Subject: [PATCH 0678/1830] DEV: `sawTop` never seems used in our codebase or
 any plugins

---
 app/assets/javascripts/discourse/lib/eyeline.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/eyeline.js b/app/assets/javascripts/discourse/lib/eyeline.js
index 57a6def7dd..d31602e4da 100644
--- a/app/assets/javascripts/discourse/lib/eyeline.js
+++ b/app/assets/javascripts/discourse/lib/eyeline.js
@@ -79,14 +79,8 @@ Eyeline.prototype.update = function() {
     // If you hit the bottom we mark all the elements as seen. Otherwise, just the first one
     if (!atBottom) {
       appEvents.trigger("saw", { detail: $elem });
-      if (i === 0) {
-        appEvents.trigger("sawTop", { detail: $elem });
-      }
       return false;
     }
-    if (i === 0) {
-      appEvents.trigger("sawTop", { detail: $elem });
-    }
     if (i === $elements.length - 1) {
       return appEvents.trigger("sawBottom", { detail: $elem });
     }

From 091d6dc9fce1808c20508c06ee2d2609469da521 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 16:51:36 -0400
Subject: [PATCH 0679/1830] DEV: Triggering "saw" on every element seems
 pointless

We don't seem to wire this up to any listeners, so why waste time doing
all this work?
---
 .../discourse/components/discovery-topics-list.js    |  4 +---
 .../javascripts/discourse/components/user-stream.js  |  5 +----
 app/assets/javascripts/discourse/lib/eyeline.js      | 12 ------------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/discovery-topics-list.js b/app/assets/javascripts/discourse/components/discovery-topics-list.js
index 30a0118a33..28ab1efab5 100644
--- a/app/assets/javascripts/discourse/components/discovery-topics-list.js
+++ b/app/assets/javascripts/discourse/components/discovery-topics-list.js
@@ -38,9 +38,7 @@ const DiscoveryTopicsListComponent = Component.extend(UrlRefresh, LoadMore, {
       Discourse.updateContextCount(0);
       this.model.loadMore().then(hasMoreResults => {
         schedule("afterRender", () => this.saveScrollPosition());
-        if (!hasMoreResults) {
-          this.eyeline.flushRest();
-        } else if ($(window).height() >= $(document).height()) {
+        if (hasMoreResults && $(window).height() >= $(document).height()) {
           this.send("loadMore");
         }
       });
diff --git a/app/assets/javascripts/discourse/components/user-stream.js b/app/assets/javascripts/discourse/components/user-stream.js
index 62d9fe7f0d..aadd188699 100644
--- a/app/assets/javascripts/discourse/components/user-stream.js
+++ b/app/assets/javascripts/discourse/components/user-stream.js
@@ -110,10 +110,7 @@ export default Component.extend(LoadMore, {
 
       this.set("loading", true);
       const stream = this.stream;
-      stream.findItems().then(() => {
-        this.set("loading", false);
-        this.eyeline.flushRest();
-      });
+      stream.findItems().then(() => this.set("loading", false));
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/lib/eyeline.js b/app/assets/javascripts/discourse/lib/eyeline.js
index d31602e4da..53f2a8435a 100644
--- a/app/assets/javascripts/discourse/lib/eyeline.js
+++ b/app/assets/javascripts/discourse/lib/eyeline.js
@@ -78,7 +78,6 @@ Eyeline.prototype.update = function() {
 
     // If you hit the bottom we mark all the elements as seen. Otherwise, just the first one
     if (!atBottom) {
-      appEvents.trigger("saw", { detail: $elem });
       return false;
     }
     if (i === $elements.length - 1) {
@@ -87,15 +86,4 @@ Eyeline.prototype.update = function() {
   });
 };
 
-//  Call this when we know aren't loading any more elements. Mark the rest as seen
-Eyeline.prototype.flushRest = function() {
-  if (ENV.environment === "test") {
-    return;
-  }
-
-  $(this.selector).each((i, elem) =>
-    this.appEvents.trigger("saw", { detail: $(elem) })
-  );
-};
-
 export default Eyeline;

From 5d9f5dd11f0ef0cac66e80c3bdae0694a8f3ad72 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 16:57:46 -0400
Subject: [PATCH 0680/1830] REVERT: Fix to app-events to make events not global

---
 app/assets/javascripts/discourse/services/app-events.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/services/app-events.js b/app/assets/javascripts/discourse/services/app-events.js
index 717caf7545..8a3e770c75 100644
--- a/app/assets/javascripts/discourse/services/app-events.js
+++ b/app/assets/javascripts/discourse/services/app-events.js
@@ -3,10 +3,7 @@ import Evented from "@ember/object/evented";
 import Service from "@ember/service";
 
 export default Service.extend(Evented, {
-  init() {
-    this._super(...arguments);
-    this._events = {};
-  },
+  _events: {},
 
   on() {
     if (arguments.length === 2) {

From ce9c59309c64d80e794ec0b1ba9b8c45de765cd2 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 20 Apr 2020 17:14:51 -0400
Subject: [PATCH 0681/1830] FIX: Temporarily compatibility for Evented on a
 Topic Route

---
 app/assets/javascripts/discourse/routes/topic.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/routes/topic.js b/app/assets/javascripts/discourse/routes/topic.js
index ed49b86153..b9d6aaf177 100644
--- a/app/assets/javascripts/discourse/routes/topic.js
+++ b/app/assets/javascripts/discourse/routes/topic.js
@@ -5,12 +5,13 @@ import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import { ID_CONSTRAINT } from "discourse/models/topic";
 import Evented from "@ember/object/evented";
+import EmberObject from "@ember/object";
 
 const SCROLL_DELAY = 500;
 
 import showModal from "discourse/lib/show-modal";
 
-const TopicRoute = DiscourseRoute.extend(Evented, {
+const TopicRoute = DiscourseRoute.extend({
   init() {
     this._super(...arguments);
 
@@ -332,4 +333,9 @@ const TopicRoute = DiscourseRoute.extend(Evented, {
   }
 });
 
+// TODO: Remove this - it's barely used.
+const events = EmberObject.extend(Evented).create();
+TopicRoute.on = events.on;
+TopicRoute.trigger = events.trigger;
+
 export default TopicRoute;

From 74e4102093c6aa497fe48947afbec9751b21721a Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Mon, 20 Apr 2020 15:18:01 -0700
Subject: [PATCH 0682/1830] DEV: allow nav items to override computed property
 values

Plugins need to override extra nav-items. Make sure these properties are
override-able.

See:
https://deprecations.emberjs.com/v3.x/#toc_computed-property-override
---
 .../javascripts/discourse/models/nav-item.js  | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/app/assets/javascripts/discourse/models/nav-item.js b/app/assets/javascripts/discourse/models/nav-item.js
index 83330778e0..bc78b0a1a9 100644
--- a/app/assets/javascripts/discourse/models/nav-item.js
+++ b/app/assets/javascripts/discourse/models/nav-item.js
@@ -92,6 +92,45 @@ const ExtraNavItem = NavItem.extend({
       return (this._href = value);
     }
   }),
+  displayName: discourseComputed("displayName", {
+    get() {
+      if (this._displayName) {
+        return this._displayName;
+      }
+
+      return this.displayName;
+    },
+
+    set(key, value) {
+      return (this._displayName = value);
+    }
+  }),
+  filterMode: discourseComputed("filterMode", {
+    get() {
+      if (this._filterMode) {
+        return this._filterMode;
+      }
+
+      return this.filterMode;
+    },
+
+    set(key, value) {
+      return (this._filterMode = value);
+    }
+  }),
+  title: discourseComputed("title", {
+    get() {
+      if (this._title) {
+        return this._title;
+      }
+
+      return this.title;
+    },
+
+    set(key, value) {
+      return (this._title = value);
+    }
+  }),
 
   count: 0,
 

From e9f726281321b6779b2e27c7f9d2f4b4ca3012aa Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Tue, 21 Apr 2020 08:33:55 +1000
Subject: [PATCH 0683/1830] FIX: when category or tag is muted, update user
 (#9456)

Currently, when category or tag is muted, only after hard refresh, these new muted categories are really muted. Without a hard refresh, you will still receive "new topic" messages.

Therefore, when tag or category is muted, we should update the user object right away.
---
 .../javascripts/discourse/controllers/tags-show.js  | 13 ++++++++++++-
 app/assets/javascripts/discourse/models/category.js | 11 +++++++++++
 app/assets/javascripts/discourse/models/user.js     | 10 ++++++++++
 app/controllers/tags_controller.rb                  |  2 +-
 test/javascripts/models/user-test.js                |  7 +++++++
 5 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js b/app/assets/javascripts/discourse/controllers/tags-show.js
index a44cf850c8..e9bb719116 100644
--- a/app/assets/javascripts/discourse/controllers/tags-show.js
+++ b/app/assets/javascripts/discourse/controllers/tags-show.js
@@ -155,7 +155,18 @@ export default Controller.extend(BulkTopicSelection, FilterModeMixin, {
     },
 
     changeTagNotificationLevel(notificationLevel) {
-      this.tagNotification.update({ notification_level: notificationLevel });
+      this.tagNotification
+        .update({ notification_level: notificationLevel })
+        .then(response => {
+          this.currentUser.set(
+            "muted_tag_ids",
+            this.currentUser.calculateMutedIds(
+              notificationLevel,
+              response.responseJson.tag_id,
+              "muted_tag_ids"
+            )
+          );
+        });
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/models/category.js b/app/assets/javascripts/discourse/models/category.js
index f264248f52..d765f84d47 100644
--- a/app/assets/javascripts/discourse/models/category.js
+++ b/app/assets/javascripts/discourse/models/category.js
@@ -7,6 +7,7 @@ import PermissionType from "discourse/models/permission-type";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import deprecated from "discourse-common/lib/deprecated";
 import Site from "discourse/models/site";
+import User from "discourse/models/user";
 
 const Category = RestModel.extend({
   permissions: null,
@@ -241,6 +242,16 @@ const Category = RestModel.extend({
 
   setNotification(notification_level) {
     this.set("notification_level", notification_level);
+
+    User.currentProp(
+      "muted_category_ids",
+      User.current().calculateMutedIds(
+        notification_level,
+        this.id,
+        "muted_category_ids"
+      )
+    );
+
     const url = `/category/${this.id}/notifications`;
     return ajax(url, { data: { notification_level }, type: "POST" });
   },
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index 7b106d9206..9fff14f4f8 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -25,6 +25,7 @@ import Category from "discourse/models/category";
 import { Promise } from "rsvp";
 import deprecated from "discourse-common/lib/deprecated";
 import Site from "discourse/models/site";
+import { NotificationLevels } from "discourse/lib/notification-levels";
 
 export const SECOND_FACTOR_METHODS = {
   TOTP: 1,
@@ -859,6 +860,15 @@ const User = RestModel.extend({
 
   changeTimezone(tz) {
     this._timezone = tz;
+  },
+
+  calculateMutedIds(notificationLevel, id, type) {
+    const muted_ids = this.get(type);
+    if (notificationLevel === NotificationLevels.MUTED) {
+      return muted_ids.concat(id).uniq();
+    } else {
+      return muted_ids.filter(existing_id => existing_id !== id);
+    }
   }
 });
 
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 25d8a15aae..72f5935f64 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -274,7 +274,7 @@ class TagsController < ::ApplicationController
     raise Discourse::NotFound unless tag
     level = params[:tag_notification][:notification_level].to_i
     TagUser.change(current_user.id, tag.id, level)
-    render json: { notification_level: level }
+    render json: { notification_level: level, tag_id: tag.id }
   end
 
   def check_hashtag
diff --git a/test/javascripts/models/user-test.js b/test/javascripts/models/user-test.js
index 4675043adf..90dcef574e 100644
--- a/test/javascripts/models/user-test.js
+++ b/test/javascripts/models/user-test.js
@@ -104,3 +104,10 @@ QUnit.test("resolvedTimezone", assert => {
   );
   stub.restore();
 });
+
+QUnit.test("muted ids", assert => {
+  let user = User.create({ username: "chuck", muted_category_ids: [] });
+
+  assert.deepEqual(user.calculateMutedIds(0, 1, "muted_category_ids"), [1]);
+  assert.deepEqual(user.calculateMutedIds(1, 1, "muted_category_ids"), []);
+});

From 9a6e4b1fa1d96af90847336812f60211a5ddd1ff Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 21 Apr 2020 03:47:48 +0200
Subject: [PATCH 0684/1830] FIX: Make InlineUploads handle more URL formats
 (#9467)

It previously failed to match URLs with characters other than `[a-zA-z0-9\.\/:-]`. This meant that `PullHotlinkedImages` would sometimes download an external image and then never use it in any posts.
---
 app/services/inline_uploads.rb       |  2 +-
 spec/services/inline_uploads_spec.rb | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/services/inline_uploads.rb b/app/services/inline_uploads.rb
index 30727ec2b8..e75348bcce 100644
--- a/app/services/inline_uploads.rb
+++ b/app/services/inline_uploads.rb
@@ -148,7 +148,7 @@ class InlineUploads
   end
 
   def self.match_md_inline_img(markdown, external_src: false)
-    markdown.scan(/(!?\[([^\[\]]*)\]\(([a-zA-z0-9\.\/:-]+)([ ]*['"]{1}[^\)]*['"]{1}[ ]*)?\))/) do |match|
+    markdown.scan(/(!?\[([^\[\]]*)\]\(([^\s\)]+)([ ]*['"]{1}[^\)]*['"]{1}[ ]*)?\))/) do |match|
       if (matched_uploads(match[2]).present? || external_src) && block_given?
         yield(
           match[0],
diff --git a/spec/services/inline_uploads_spec.rb b/spec/services/inline_uploads_spec.rb
index b5bf7ded43..76fb36cf9a 100644
--- a/spec/services/inline_uploads_spec.rb
+++ b/spec/services/inline_uploads_spec.rb
@@ -712,4 +712,17 @@ RSpec.describe InlineUploads do
       end
     end
   end
+
+  describe ".match_md_inline_img" do
+    it "matches URLs with various characters" do
+      md = <<~MD
+      ![test](https://some-site.com/a_test?q=1&b=hello%20there)
+      MD
+
+      url = nil
+      InlineUploads.match_md_inline_img(md, external_src: true) { |_match, src| url = src }
+
+      expect(url).to eq("https://some-site.com/a_test?q=1&b=hello%20there")
+    end
+  end
 end

From 5a81e3999c57d2329b4dce3f3938afabc1400026 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 21 Apr 2020 03:48:19 +0200
Subject: [PATCH 0685/1830] DEV: Remove `bypass_bump` from CookedPostProcessor
 (#9468)

It was only passing it along to `PullHotlinkedImages` and that class have not used that arg since April 2014 (https://github.com/discourse/discourse/commit/c52ee665b45241a89b4de8b916860f380ecf0141)
---
 app/jobs/regular/process_post.rb              | 2 +-
 lib/cooked_post_processor.rb                  | 8 ++++----
 spec/components/cooked_post_processor_spec.rb | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/jobs/regular/process_post.rb b/app/jobs/regular/process_post.rb
index b13d69d61d..871e1dbb4a 100644
--- a/app/jobs/regular/process_post.rb
+++ b/app/jobs/regular/process_post.rb
@@ -23,7 +23,7 @@ module Jobs
         end
 
         cp = CookedPostProcessor.new(post, args)
-        cp.post_process(bypass_bump: args[:bypass_bump], new_post: args[:new_post])
+        cp.post_process(new_post: args[:new_post])
 
         # If we changed the document, save it
         cooked = cp.html
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 3cbada96b1..35de12db1b 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -32,7 +32,7 @@ class CookedPostProcessor
     @omit_nofollow = post.omit_nofollow?
   end
 
-  def post_process(bypass_bump: false, new_post: false)
+  def post_process(new_post: false)
     DistributedMutex.synchronize("post_process_#{@post.id}", validity: 10.minutes) do
       DiscourseEvent.trigger(:before_post_process_cooked, @doc, @post)
       remove_full_quote_on_direct_reply if new_post
@@ -43,7 +43,7 @@ class CookedPostProcessor
       remove_user_ids
       update_post_image
       enforce_nofollow
-      pull_hotlinked_images(bypass_bump)
+      pull_hotlinked_images
       grant_badges
       @post.link_post_uploads(fragments: @doc)
       DiscourseEvent.trigger(:post_process_cooked, @doc, @post)
@@ -655,7 +655,7 @@ class CookedPostProcessor
     end
   end
 
-  def pull_hotlinked_images(bypass_bump = false)
+  def pull_hotlinked_images
     # have we enough disk space?
     disable_if_low_on_disk_space # But still enqueue the job
     # don't download remote images for posts that are more than n days old
@@ -666,7 +666,7 @@ class CookedPostProcessor
     Jobs.cancel_scheduled_job(:pull_hotlinked_images, post_id: @post.id)
     # schedule the job
     delay = SiteSetting.editing_grace_period + 1
-    Jobs.enqueue_in(delay.seconds.to_i, :pull_hotlinked_images, post_id: @post.id, bypass_bump: bypass_bump)
+    Jobs.enqueue_in(delay.seconds.to_i, :pull_hotlinked_images, post_id: @post.id)
   end
 
   def disable_if_low_on_disk_space
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index d986651562..3d79bcf25f 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -1529,7 +1529,7 @@ describe CookedPostProcessor do
             Jobs.expects(:cancel_scheduled_job).with(:pull_hotlinked_images, post_id: post.id).once
 
             delay = SiteSetting.editing_grace_period + 1
-            Jobs.expects(:enqueue_in).with(delay.seconds, :pull_hotlinked_images, post_id: post.id, bypass_bump: false).once
+            Jobs.expects(:enqueue_in).with(delay.seconds, :pull_hotlinked_images, post_id: post.id).once
 
             cpp.pull_hotlinked_images
           end
@@ -1603,7 +1603,7 @@ describe CookedPostProcessor do
       Jobs.expects(:cancel_scheduled_job).with(:pull_hotlinked_images, post_id: post.id).once
 
       delay = SiteSetting.editing_grace_period + 1
-      Jobs.expects(:enqueue_in).with(delay.seconds, :pull_hotlinked_images, post_id: post.id, bypass_bump: false).once
+      Jobs.expects(:enqueue_in).with(delay.seconds, :pull_hotlinked_images, post_id: post.id).once
 
       cpp.pull_hotlinked_images
     end

From ab52bed014469902238936002ec79962ba1d1ce4 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 21 Apr 2020 03:48:33 +0200
Subject: [PATCH 0686/1830] DEV: Remove the return value of
 disable_if_low_on_disk_space (#9469)

It was used only in specs.
---
 lib/cooked_post_processor.rb                  |  9 ++++-----
 spec/components/cooked_post_processor_spec.rb | 10 ++++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 35de12db1b..77ebba989a 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -670,11 +670,12 @@ class CookedPostProcessor
   end
 
   def disable_if_low_on_disk_space
-    return false if Discourse.store.external?
-    return false if !SiteSetting.download_remote_images_to_local
-    return false if available_disk_space >= SiteSetting.download_remote_images_threshold
+    return if Discourse.store.external?
+    return if !SiteSetting.download_remote_images_to_local
+    return if available_disk_space >= SiteSetting.download_remote_images_threshold
 
     SiteSetting.download_remote_images_to_local = false
+
     # log the site setting change
     reason = I18n.t("disable_remote_images_download_reason")
     staff_action_logger = StaffActionLogger.new(Discourse.system_user)
@@ -682,8 +683,6 @@ class CookedPostProcessor
 
     # also send a private message to the site contact user
     notify_about_low_disk_space
-
-    true
   end
 
   def notify_about_low_disk_space
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 3d79bcf25f..94d87ce0b0 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -1513,7 +1513,7 @@ describe CookedPostProcessor do
 
       context "and there is enough disk space" do
 
-        before { cpp.expects(:disable_if_low_on_disk_space).returns(false) }
+        before { cpp.expects(:disable_if_low_on_disk_space) }
 
         it "does not run when the system user updated the post" do
           post.last_editor_id = Discourse.system_user.id
@@ -1555,7 +1555,7 @@ describe CookedPostProcessor do
 
     it "does nothing when there's enough disk space" do
       SiteSetting.expects(:download_remote_images_to_local=).never
-      expect(cpp.disable_if_low_on_disk_space).to eq(false)
+      cpp.disable_if_low_on_disk_space
     end
 
     context "when there's not enough disk space" do
@@ -1565,7 +1565,8 @@ describe CookedPostProcessor do
       it "disables download_remote_images_threshold and send a notification to the admin" do
         StaffActionLogger.any_instance.expects(:log_site_setting_change).once
         SystemMessage.expects(:create_from_system_user).with(Discourse.site_contact_user, :download_remote_images_disabled).once
-        expect(cpp.disable_if_low_on_disk_space).to eq(true)
+        cpp.disable_if_low_on_disk_space
+
         expect(SiteSetting.download_remote_images_to_local).to eq(false)
       end
 
@@ -1573,7 +1574,8 @@ describe CookedPostProcessor do
         SiteSetting.s3_access_key_id = "s3-access-key-id"
         SiteSetting.s3_secret_access_key = "s3-secret-access-key"
         SiteSetting.enable_s3_uploads = true
-        expect(cpp.disable_if_low_on_disk_space).to eq(false)
+        cpp.disable_if_low_on_disk_space
+
         expect(SiteSetting.download_remote_images_to_local).to eq(true)
       end
 

From 28c706bd0994c2fb0f76c586fcaa824f698d0299 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 21 Apr 2020 03:48:58 +0200
Subject: [PATCH 0687/1830] DEV: Do less work in docker_test (#9470)

* DEV: Update the working tree just once.

`git pull` was effectively doing `git fetch` and `git merge FETCH_HEAD`, and only then we were checking out the desired branch/commit. This change will skip the the merge step.

* DEV: Don't run lefthook in docker_test
---
 script/docker_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/script/docker_test.rb b/script/docker_test.rb
index 445901b851..3696a53159 100644
--- a/script/docker_test.rb
+++ b/script/docker_test.rb
@@ -26,10 +26,10 @@ unless ENV['NO_UPDATE']
 
   run_or_fail("git reset --hard")
 
-  run_or_fail("git pull")
+  run_or_fail("git fetch")
 
-  checkout = ENV['COMMIT_HASH'] || "HEAD"
-  run_or_fail("git checkout #{checkout}")
+  checkout = ENV['COMMIT_HASH'] || "FETCH_HEAD"
+  run_or_fail("LEFTHOOK=0 git checkout #{checkout}")
 
   puts "travis_fold:end:pulling_latest_discourse" if ENV["TRAVIS"]
   puts "travis_fold:start:bundle" if ENV["TRAVIS"]

From 17cf300b7146a7935239d451cf855314ca6cd254 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 21 Apr 2020 03:50:20 +0200
Subject: [PATCH 0688/1830] DEV: Use more specific error responses (#9472)

* DEV: Use `render_json_error` (Adds specs for Admin::GroupsController)
* DEV: Use a specific error on blank category slug (Fixes a `render_json_error` warning)
* DEV: Use a specific error on reviewable claim conflict (Fixes a `render_json_error` warning)
* DEV: Use specific errors in Admin::UsersController (Fixes `render_json_error` warnings)
* FIX: PublishedPages error responses
* FIX: TopicsController error responses (There was an issue of two separate `Topic` instances for the same record. This makes sure there's only one up-to-date instance.)
---
 app/controllers/admin/groups_controller.rb    |  2 +-
 app/controllers/admin/users_controller.rb     |  8 +++-
 app/controllers/categories_controller.rb      |  5 +-
 app/controllers/reviewables_controller.rb     |  9 ++--
 app/controllers/topics_controller.rb          |  2 +-
 app/models/published_page.rb                  |  2 +
 config/initializers/012-web_hook_events.rb    |  2 +-
 lib/post_revisor.rb                           |  9 ++--
 spec/requests/admin/groups_controller_spec.rb | 48 +++++++++++++++++++
 spec/requests/admin/users_controller_spec.rb  | 47 ++++++++++++++++--
 spec/requests/categories_controller_spec.rb   |  3 +-
 .../published_pages_controller_spec.rb        |  1 +
 spec/requests/reviewables_controller_spec.rb  |  1 +
 spec/requests/topics_controller_spec.rb       |  2 +-
 14 files changed, 121 insertions(+), 20 deletions(-)

diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 17c98b2d31..05831871f1 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -124,7 +124,7 @@ class Admin::GroupsController < Admin::AdminController
   protected
 
   def can_not_modify_automatic
-    render json: { errors: I18n.t('groups.errors.can_not_modify_automatic') }, status: 422
+    render_json_error(I18n.t('groups.errors.can_not_modify_automatic'))
   end
 
   private
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 7ced962b3d..a02ab11dac 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -197,7 +197,9 @@ class Admin::UsersController < Admin::AdminController
 
   def add_group
     group = Group.find(params[:group_id].to_i)
-    return render_json_error group unless group && !group.automatic
+
+    raise Discourse::NotFound unless group
+    return render_json_error(I18n.t('groups.errors.can_not_modify_automatic')) if group.automatic
 
     group.add(@user)
     GroupActionLogger.new(current_user, group).log_add_user_to_group(@user)
@@ -207,7 +209,9 @@ class Admin::UsersController < Admin::AdminController
 
   def remove_group
     group = Group.find(params[:group_id].to_i)
-    return render_json_error group unless group && !group.automatic
+
+    raise Discourse::NotFound unless group
+    return render_json_error(I18n.t('groups.errors.can_not_modify_automatic')) if group.automatic
 
     group.remove(@user)
     GroupActionLogger.new(current_user, group).log_remove_user_from_group(@user)
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 9699b21869..8481531b64 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -179,7 +179,10 @@ class CategoriesController < ApplicationController
 
     custom_slug = params[:slug].to_s
 
-    if custom_slug.present? && @category.update(slug: custom_slug)
+    if custom_slug.blank?
+      error = @category.errors.full_message(:slug, I18n.t('errors.messages.blank'))
+      render_json_error(error)
+    elsif @category.update(slug: custom_slug)
       render json: success_json
     else
       render_json_error(@category)
diff --git a/app/controllers/reviewables_controller.rb b/app/controllers/reviewables_controller.rb
index 506eb8f9e9..3861998812 100644
--- a/app/controllers/reviewables_controller.rb
+++ b/app/controllers/reviewables_controller.rb
@@ -227,11 +227,12 @@ protected
     return if SiteSetting.reviewable_claiming == "disabled" || reviewable.topic_id.blank?
 
     claimed_by_id = ReviewableClaimedTopic.where(topic_id: reviewable.topic_id).pluck(:user_id)[0]
-    if SiteSetting.reviewable_claiming == "required" && claimed_by_id.blank?
-      return I18n.t('reviewables.must_claim')
-    end
 
-    claimed_by_id.present? && claimed_by_id != current_user.id
+    if SiteSetting.reviewable_claiming == "required" && claimed_by_id.blank?
+      I18n.t('reviewables.must_claim')
+    elsif claimed_by_id.present? && claimed_by_id != current_user.id
+      I18n.t('reviewables.user_claimed')
+    end
   end
 
   def find_reviewable
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 238746ffb0..fe399566d2 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -368,7 +368,7 @@ class TopicsController < ApplicationController
 
     if changes.length > 0
       first_post = topic.ordered_posts.first
-      success = PostRevisor.new(first_post).revise!(current_user, changes, validate_post: false)
+      success = PostRevisor.new(first_post, topic).revise!(current_user, changes, validate_post: false)
     end
 
     # this is used to return the title to the client as it may have been changed by "TextCleaner"
diff --git a/app/models/published_page.rb b/app/models/published_page.rb
index da89df53bc..3c232b6547 100644
--- a/app/models/published_page.rb
+++ b/app/models/published_page.rb
@@ -24,6 +24,8 @@ class PublishedPage < ActiveRecord::Base
   end
 
   def self.publish!(publisher, topic, slug)
+    pp = nil
+
     transaction do
       pp = find_or_initialize_by(topic: topic)
       pp.slug = slug.strip
diff --git a/config/initializers/012-web_hook_events.rb b/config/initializers/012-web_hook_events.rb
index 727119a627..043ede89b5 100644
--- a/config/initializers/012-web_hook_events.rb
+++ b/config/initializers/012-web_hook_events.rb
@@ -26,7 +26,7 @@ end
 end
 
 DiscourseEvent.on(:post_edited) do |post, topic_changed|
-  if post.topic
+  unless post.topic&.trashed?
     WebHook.enqueue_post_hooks(:post_edited, post)
 
     if post.is_first_post? && topic_changed
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 2685292e69..0d60af6ae4 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -45,9 +45,12 @@ class PostRevisor
 
   attr_reader :category_changed
 
-  def initialize(post, topic = nil)
+  def initialize(post, topic = post.topic)
     @post = post
-    @topic = topic || post.topic
+    @topic = topic
+
+    # Make sure we have only one Topic instance
+    post.topic = topic
   end
 
   def self.tracked_topic_fields
@@ -383,7 +386,7 @@ class PostRevisor
         .where(action_type: UserAction::WAS_LIKED)
         .update_all(user_id: new_owner.id)
 
-      private_message = @post.topic.private_message?
+      private_message = @topic.private_message?
 
       prev_owner_user_stat = prev_owner.user_stat
       unless private_message
diff --git a/spec/requests/admin/groups_controller_spec.rb b/spec/requests/admin/groups_controller_spec.rb
index ea7e77bbbd..7ddc1562fe 100644
--- a/spec/requests/admin/groups_controller_spec.rb
+++ b/spec/requests/admin/groups_controller_spec.rb
@@ -95,6 +95,33 @@ RSpec.describe Admin::GroupsController do
       expect(group.group_users.where(owner: true).map(&:user))
         .to contain_exactly(user, admin)
     end
+
+    it 'returns not-found error when there is no group' do
+      group.destroy!
+
+      put "/admin/groups/#{group.id}/owners.json", params: {
+        group: {
+          usernames: user.username
+        }
+      }
+
+      expect(response.status).to eq(404)
+    end
+
+    it 'does not allow adding owners to an automatic group' do
+      group.update!(automatic: true)
+
+      expect do
+        put "/admin/groups/#{group.id}/owners.json", params: {
+          group: {
+            usernames: user.username
+          }
+        }
+      end.to_not change { group.group_users.count }
+
+      expect(response.status).to eq(422)
+      expect(response.parsed_body["errors"]).to eq(["You cannot modify an automatic group"])
+    end
   end
 
   describe '#remove_owner' do
@@ -108,6 +135,27 @@ RSpec.describe Admin::GroupsController do
       expect(response.status).to eq(200)
       expect(group.group_users.where(owner: true)).to eq([])
     end
+
+    it 'returns not-found error when there is no group' do
+      group.destroy!
+
+      delete "/admin/groups/#{group.id}/owners.json", params: {
+        user_id: user.id
+      }
+
+      expect(response.status).to eq(404)
+    end
+
+    it 'does not allow removing owners from an automatic group' do
+      group.update!(automatic: true)
+
+      delete "/admin/groups/#{group.id}/owners.json", params: {
+        user_id: user.id
+      }
+
+      expect(response.status).to eq(422)
+      expect(response.parsed_body["errors"]).to eq(["You cannot modify an automatic group"])
+    end
   end
 
   describe "#bulk_perform" do
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index 8d52b133f8..cb654a08c6 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -342,17 +342,54 @@ RSpec.describe Admin::UsersController do
 
       expect(response.status).to eq(200)
     end
+
+    it 'returns not-found error when there is no group' do
+      group.destroy!
+
+      put "/admin/users/#{user.id}/groups.json", params: {
+        group_id: group.id
+      }
+
+      expect(response.status).to eq(404)
+    end
+
+    it 'does not allow adding users to an automatic group' do
+      group.update!(automatic: true)
+
+      expect do
+        post "/admin/users/#{user.id}/groups.json", params: {
+          group_id: group.id
+        }
+      end.to_not change { group.users.count }
+
+      expect(response.status).to eq(422)
+      expect(response.parsed_body["errors"]).to eq(["You cannot modify an automatic group"])
+    end
   end
 
   describe '#remove_group' do
     it "also clears the user's primary group" do
-      u = Fabricate(:user)
-      g = Fabricate(:group, users: [u])
-      u.update!(primary_group_id: g.id)
-      delete "/admin/users/#{u.id}/groups/#{g.id}.json"
+      group = Fabricate(:group, users: [user])
+      user.update!(primary_group_id: group.id)
+      delete "/admin/users/#{user.id}/groups/#{group.id}.json"
 
       expect(response.status).to eq(200)
-      expect(u.reload.primary_group).to eq(nil)
+      expect(user.reload.primary_group).to eq(nil)
+    end
+
+    it 'returns not-found error when there is no group' do
+      delete "/admin/users/#{user.id}/groups/9090.json"
+
+      expect(response.status).to eq(404)
+    end
+
+    it 'does not allow removing owners from an automatic group' do
+      group = Fabricate(:group, users: [user], automatic: true)
+
+      delete "/admin/users/#{user.id}/groups/#{group.id}.json"
+
+      expect(response.status).to eq(422)
+      expect(response.parsed_body["errors"]).to eq(["You cannot modify an automatic group"])
     end
   end
 
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index 8451936ccc..91b1e4ebbb 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -452,8 +452,9 @@ describe CategoriesController do
       end
 
       it 'rejects blank' do
-        put "/category/#{category.id}/slug.json", params: { slug: nil }
+        put "/category/#{category.id}/slug.json", params: { slug: '   ' }
         expect(response.status).to eq(422)
+        expect(response.parsed_body["errors"]).to eq(["Slug can't be blank"])
       end
 
       it 'accepts valid custom slug' do
diff --git a/spec/requests/published_pages_controller_spec.rb b/spec/requests/published_pages_controller_spec.rb
index 6b3a6894f4..ed50ed8811 100644
--- a/spec/requests/published_pages_controller_spec.rb
+++ b/spec/requests/published_pages_controller_spec.rb
@@ -114,6 +114,7 @@ RSpec.describe PublishedPagesController do
           PublishedPage.create!(slug: 'i-hate-salt', topic: Fabricate(:topic))
           put "/pub/by-topic/#{topic.id}.json", params: { published_page: { slug: 'i-hate-salt' } }
           expect(response).not_to be_successful
+          expect(response.parsed_body['errors']).to eq(['Slug has already been taken'])
         end
 
         it "returns an error if the topic already has been published" do
diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rb
index e42d67ae40..3763b725e9 100644
--- a/spec/requests/reviewables_controller_spec.rb
+++ b/spec/requests/reviewables_controller_spec.rb
@@ -380,6 +380,7 @@ describe ReviewablesController do
           ReviewableClaimedTopic.create!(topic_id: qp.topic_id, user: Fabricate(:admin))
           put "/review/#{qp.id}/perform/approve_post.json?version=#{qp.version}"
           expect(response.code).to eq("422")
+          expect(response.parsed_body["errors"]).to match_array(["This item has been claimed by another user."])
         end
 
         it "works when claims are optional" do
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index c5ff3ecc7a..751c8bf88b 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -989,7 +989,7 @@ RSpec.describe TopicsController do
           }
 
           expect(response.status).to eq(422)
-          expect(JSON.parse(response.body)['errors']).to be_present
+          expect(response.parsed_body['errors']).to match_array([/Title is too short/, /Title seems unclear/])
         end
 
         it "returns errors when the rate limit is exceeded" do

From a781ef7662866942d3c0a17ddda59a656f514cb8 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 21 Apr 2020 03:50:50 +0200
Subject: [PATCH 0689/1830] FIX: Reject invalid Category slugs (#9473)

Previously it would sanitize given slug and then save the resulting empty slug.
---
 app/models/category.rb                      |  7 ++++++-
 spec/requests/categories_controller_spec.rb |  3 ++-
 spec/requests/list_controller_spec.rb       | 11 +++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index c19d3848cc..192204d189 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -343,7 +343,12 @@ class Category < ActiveRecord::Base
       slug = SiteSetting.slug_generation_method == 'encoded' ? CGI.unescape(self.slug) : self.slug
       # sanitize the custom slug
       self.slug = Slug.sanitize(slug)
-      errors.add(:slug, 'is already in use') if duplicate_slug?
+
+      if self.slug.blank?
+        errors.add(:slug, :invalid)
+      elsif duplicate_slug?
+        errors.add(:slug, 'is already in use')
+      end
     else
       # auto slug
       self.slug = Slug.for(name, '')
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index 91b1e4ebbb..97293742d3 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -481,8 +481,9 @@ describe CategoriesController do
       end
 
       it 'rejects invalid custom slug' do
-        put "/category/#{category.id}/slug.json", params: { slug: '  ' }
+        put "/category/#{category.id}/slug.json", params: { slug: '.' }
         expect(response.status).to eq(422)
+        expect(response.parsed_body["errors"]).to eq(["Slug is invalid"])
       end
     end
   end
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index 83a46f3373..38daebea59 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -376,14 +376,9 @@ RSpec.describe ListController do
         # One category has another category's id at the beginning of its name
         let!(:other_category) {
           # Our validations don't allow this to happen now, but did historically
-          Fabricate(:category_with_definition, name: "#{category.id} name", slug: '-').tap { |c|
-            DB.exec <<~SQL
-              UPDATE categories
-              SET slug = '#{category.id}-name'
-              WHERE id = #{c.id}
-            SQL
-            c.reload
-          }
+          Fabricate(:category_with_definition, name: "#{category.id} name", slug: 'will-be-changed').tap do |category|
+            category.update_column(:slug, "#{category.id}-name")
+          end
         }
 
         it 'uses the correct category' do

From d123138d3a87ba29bd6e9df897b55b62d47ca4ae Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 21 Apr 2020 14:29:12 +1000
Subject: [PATCH 0690/1830] FIX: Only confirm bookmark delete if a reminder has
 been set (#9484)

We do not need a secondary bootbox confirm if the bookmark has no reminder, because nothing really will be lost in that case.
---
 .../discourse/controllers/bookmark.js         | 30 ++++++++++++-------
 config/locales/client.en.yml                  |  2 +-
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js
index 9f630ee913..604a6f2ee9 100644
--- a/app/assets/javascripts/discourse/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/controllers/bookmark.js
@@ -436,17 +436,25 @@ export default Controller.extend(ModalFunctionality, {
 
     delete() {
       this._deleting = true;
-      bootbox.confirm(I18n.t("bookmarks.confirm_delete"), result => {
-        if (result) {
-          this._closeWithoutSaving = true;
-          this._deleteBookmark()
-            .then(() => {
-              this._deleting = false;
-              this.send("closeModal");
-            })
-            .catch(e => this._handleSaveError(e));
-        }
-      });
+      let deleteAction = () => {
+        this._closeWithoutSaving = true;
+        this._deleteBookmark()
+          .then(() => {
+            this._deleting = false;
+            this.send("closeModal");
+          })
+          .catch(e => this._handleSaveError(e));
+      };
+
+      if (this._existingBookmarkHasReminder()) {
+        bootbox.confirm(I18n.t("bookmarks.confirm_delete"), result => {
+          if (result) {
+            deleteAction();
+          }
+        });
+      } else {
+        deleteAction();
+      }
     },
 
     closeWithoutSavingBookmark() {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 947f19c3ba..1d881a1779 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -312,7 +312,7 @@ en:
       created_with_at_desktop_reminder: "you've bookmarked this post and will be reminded next time you are at your desktop"
       remove: "Remove Bookmark"
       delete: "Delete Bookmark"
-      confirm_delete: "Are you sure you want to delete this bookmark? If you set a reminder it will also be deleted."
+      confirm_delete: "Are you sure you want to delete this bookmark? The reminder will also be deleted."
       confirm_clear: "Are you sure you want to clear all your bookmarks from this topic?"
       save: "Save"
       no_timezone: 'You have not set a timezone yet. You will not be able to set reminders. Set one up <a href="%{basePath}/my/preferences/profile">in your profile</a>.'

From c08753dc3431ce2f85916b5a7e68db52891917d8 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 21 Apr 2020 06:38:35 +0200
Subject: [PATCH 0691/1830] DEV: Fix topic_timer_spec (#9483)

File it under "how did it even work".
---
 spec/models/topic_timer_spec.rb | 42 ++++-----------------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

diff --git a/spec/models/topic_timer_spec.rb b/spec/models/topic_timer_spec.rb
index 36d559af3e..ad093c223e 100644
--- a/spec/models/topic_timer_spec.rb
+++ b/spec/models/topic_timer_spec.rb
@@ -3,22 +3,11 @@
 require 'rails_helper'
 
 RSpec.describe TopicTimer, type: :model do
-  let(:topic_timer) {
-    # we should not need to do this but somehow
-    # fabricator is failing here
-    TopicTimer.create!(
-      user_id: -1,
-      topic: Fabricate(:topic),
-      execute_at: 1.hour.from_now,
-      status_type: TopicTimer.types[:close]
-    )
-  }
+  fab!(:topic_timer) { Fabricate(:topic_timer) }
   fab!(:topic) { Fabricate(:topic) }
   fab!(:admin) { Fabricate(:admin) }
 
-  before do
-    freeze_time Time.new(2018)
-  end
+  before { freeze_time }
 
   context "validations" do
     describe '#status_type' do
@@ -107,15 +96,7 @@ RSpec.describe TopicTimer, type: :model do
   context 'callbacks' do
     describe 'when #execute_at and #user_id are not changed' do
       it 'should not schedule another to update topic' do
-        Jobs.expects(:enqueue_at).with(
-          topic_timer.execute_at,
-          :toggle_topic_closed,
-          topic_timer_id: topic_timer.id,
-          state: true
-        ).once
-
-        topic_timer
-
+        Jobs.expects(:enqueue_at).never
         Jobs.expects(:cancel_scheduled_job).never
 
         topic_timer.update!(topic: Fabricate(:topic))
@@ -124,9 +105,6 @@ RSpec.describe TopicTimer, type: :model do
 
     describe 'when #execute_at value is changed' do
       it 'reschedules the job' do
-        freeze_time
-        topic_timer
-
         Jobs.expects(:cancel_scheduled_job).with(
           :toggle_topic_closed, topic_timer_id: topic_timer.id
         )
@@ -142,9 +120,6 @@ RSpec.describe TopicTimer, type: :model do
 
       describe 'when execute_at is smaller than the current time' do
         it 'should enqueue the job immediately' do
-          freeze_time
-          topic_timer
-
           Jobs.expects(:enqueue_at).with(
             Time.zone.now, :toggle_topic_closed,
             topic_timer_id: topic_timer.id,
@@ -161,15 +136,10 @@ RSpec.describe TopicTimer, type: :model do
 
     describe 'when user is changed' do
       it 'should update the job' do
-        freeze_time
-        topic_timer
-
         Jobs.expects(:cancel_scheduled_job).with(
           :toggle_topic_closed, topic_timer_id: topic_timer.id
         )
 
-        admin = Fabricate(:admin)
-
         Jobs.expects(:enqueue_at).with(
           topic_timer.execute_at,
           :toggle_topic_closed,
@@ -183,8 +153,7 @@ RSpec.describe TopicTimer, type: :model do
 
     describe 'when a open topic status update is created for an open topic' do
       fab!(:topic) { Fabricate(:topic, closed: false) }
-
-      let(:topic_timer) do
+      fab!(:topic_timer) do
         Fabricate(:topic_timer,
           status_type: described_class.types[:open],
           topic: topic
@@ -212,8 +181,7 @@ RSpec.describe TopicTimer, type: :model do
 
     describe 'when a close topic status update is created for a closed topic' do
       fab!(:topic) { Fabricate(:topic, closed: true) }
-
-      let(:topic_timer) do
+      fab!(:topic_timer) do
         Fabricate(:topic_timer,
           status_type: described_class.types[:close],
           topic: topic

From 776caa24c9454b67fd0d2c3737263c126eb3b557 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 21 Apr 2020 15:32:24 +1000
Subject: [PATCH 0692/1830] DEV: Bump optimist from 3.0.0 to 3.0.1 (#9476)

Bumps [optimist](https://github.com/ManageIQ/optimist) from 3.0.0 to 3.0.1.

Mostly about fixing tests and adding a license file
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9d94326c20..b79091b2c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -249,7 +249,7 @@ GEM
       nokogiri (~> 1.7)
       sanitize
     openssl-signature_algorithm (0.4.0)
-    optimist (3.0.0)
+    optimist (3.0.1)
     parallel (1.19.1)
     parallel_tests (2.32.0)
       parallel

From 6559ad0d808b5ceaf2366cefc77827e6bb074d9f Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Tue, 21 Apr 2020 08:02:13 -0500
Subject: [PATCH 0693/1830] FEATURE: Add copy button to codeblocks (#9451)

---
 .../discourse/initializers/copy-codeblocks.js | 157 ++++++++++++++++++
 .../stylesheets/common/base/topic-post.scss   |  28 ++++
 .../stylesheets/desktop/topic-post.scss       |  11 ++
 app/assets/stylesheets/mobile/topic-post.scss |   4 +
 config/locales/server.en.yml                  |   1 +
 config/site_settings.yml                      |   3 +
 6 files changed, 204 insertions(+)
 create mode 100644 app/assets/javascripts/discourse/initializers/copy-codeblocks.js

diff --git a/app/assets/javascripts/discourse/initializers/copy-codeblocks.js b/app/assets/javascripts/discourse/initializers/copy-codeblocks.js
new file mode 100644
index 0000000000..b9aaa325b0
--- /dev/null
+++ b/app/assets/javascripts/discourse/initializers/copy-codeblocks.js
@@ -0,0 +1,157 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
+import { cancel, later } from "@ember/runloop";
+import { Promise } from "rsvp";
+import { iconHTML } from "discourse-common/lib/icon-library";
+
+// http://github.com/feross/clipboard-copy
+function clipboardCopy(text) {
+  // Use the Async Clipboard API when available. Requires a secure browsing
+  // context (i.e. HTTPS)
+  if (navigator.clipboard) {
+    return navigator.clipboard.writeText(text).catch(function(err) {
+      throw err !== undefined
+        ? err
+        : new DOMException("The request is not allowed", "NotAllowedError");
+    });
+  }
+
+  // ...Otherwise, use document.execCommand() fallback
+
+  // Put the text to copy into a <span>
+  const span = document.createElement("span");
+  span.textContent = text;
+
+  // Preserve consecutive spaces and newlines
+  span.style.whiteSpace = "pre";
+
+  // Add the <span> to the page
+  document.body.appendChild(span);
+
+  // Make a selection object representing the range of text selected by the user
+  const selection = window.getSelection();
+  const range = window.document.createRange();
+  selection.removeAllRanges();
+  range.selectNode(span);
+  selection.addRange(range);
+
+  // Copy text to the clipboard
+  let success = false;
+  try {
+    success = window.document.execCommand("copy");
+  } catch (err) {
+    // eslint-disable-next-line no-console
+    console.log("error", err);
+  }
+
+  // Cleanup
+  selection.removeAllRanges();
+  window.document.body.removeChild(span);
+
+  return success
+    ? Promise.resolve()
+    : Promise.reject(
+        new DOMException("The request is not allowed", "NotAllowedError")
+      );
+}
+
+let _copyCodeblocksClickHandlers = {};
+let _fadeCopyCodeblocksRunners = {};
+
+export default {
+  name: "copy-codeblocks",
+
+  initialize(container) {
+    withPluginApi("0.8.7", api => {
+      function _cleanUp() {
+        Object.values(_copyCodeblocksClickHandlers || {}).forEach(handler =>
+          handler.removeEventListener("click", _handleClick)
+        );
+
+        Object.values(_fadeCopyCodeblocksRunners || {}).forEach(runner =>
+          cancel(runner)
+        );
+
+        _copyCodeblocksClickHandlers = {};
+        _fadeCopyCodeblocksRunners = {};
+      }
+
+      function _handleClick(event) {
+        if (!event.target.classList.contains("copy-cmd")) {
+          return;
+        }
+
+        const button = event.target;
+        const code = button.nextSibling;
+
+        if (code) {
+          clipboardCopy(code.innerText.trim()).then(() => {
+            button.classList.add("copied");
+
+            const commandId = Ember.guidFor(button);
+
+            if (_fadeCopyCodeblocksRunners[commandId]) {
+              cancel(_fadeCopyCodeblocksRunners[commandId]);
+              delete _fadeCopyCodeblocksRunners[commandId];
+            }
+
+            _fadeCopyCodeblocksRunners[commandId] = later(() => {
+              button.classList.remove("copied");
+              delete _fadeCopyCodeblocksRunners[commandId];
+            }, 3000);
+          });
+        }
+      }
+
+      function _attachCommands(postElements, helper) {
+        if (!helper) {
+          return;
+        }
+
+        const siteSettings = container.lookup("site-settings:main");
+        const { isIE11 } = container.lookup("capabilities:main");
+        if (!siteSettings.show_copy_button_on_codeblocks || isIE11) {
+          return;
+        }
+
+        const commands = postElements[0].querySelectorAll(
+          ":scope > pre > code"
+        );
+
+        const post = helper.getModel();
+
+        if (!commands.length || !post) {
+          return;
+        }
+
+        const postElement = postElements[0];
+
+        commands.forEach(command => {
+          const button = document.createElement("button");
+          button.classList.add("btn", "nohighlight", "copy-cmd");
+          button.innerHTML = iconHTML("copy");
+          command.before(button);
+          command.parentElement.classList.add("copy-codeblocks");
+        });
+
+        if (_copyCodeblocksClickHandlers[post.id]) {
+          _copyCodeblocksClickHandlers[post.id].removeEventListener(
+            "click",
+            _handleClick
+          );
+
+          delete _copyCodeblocksClickHandlers[post.id];
+        }
+
+        _copyCodeblocksClickHandlers[post.id] = postElement;
+        postElement.addEventListener("click", _handleClick, false);
+      }
+
+      api.decorateCooked(_attachCommands, {
+        onlyStream: true,
+        id: "copy-codeblocks"
+      });
+
+      api.cleanupStream(_cleanUp);
+    });
+  }
+};
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index f4d20080d1..8960425f17 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -609,6 +609,34 @@ pre {
   }
 }
 
+.copy-codeblocks {
+  display: block;
+  position: relative;
+  overflow: visible;
+
+  .copy-cmd {
+    position: absolute;
+    top: 0;
+    right: 0;
+    min-height: 0;
+    font-size: $font-down-2;
+    min-height: 0;
+    font-size: $font-down-2;
+    user-select: none;
+
+    &.copied {
+      .d-icon {
+        color: $tertiary;
+      }
+    }
+
+    .d-icon {
+      pointer-events: none;
+      margin-right: 0;
+    }
+  }
+}
+
 kbd {
   border-radius: 3px;
   box-shadow: shadow("kbd");
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 2406f4e79b..ca304b8e95 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -247,6 +247,17 @@ nav.post-controls {
   }
 }
 
+pre.copy-codeblocks .copy-cmd:not(.copied) {
+  opacity: 0;
+  transition: 0.2s;
+  visibility: hidden;
+}
+
+pre.copy-codeblocks:hover .copy-cmd {
+  opacity: 1;
+  visibility: visible;
+}
+
 .embedded-posts {
   h1,
   h2,
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index e6c008c62d..d6fa6ff9d3 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -397,6 +397,10 @@ blockquote {
   margin-right: 0;
 }
 
+pre.copy-codeblocks code {
+  padding-right: 2.75em;
+}
+
 .gap {
   padding: 0.25em 0;
 }
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 2e73efe552..23f492a394 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2067,6 +2067,7 @@ en:
     warn_reviving_old_topic_age: "When someone starts replying to a topic where the last reply is older than this many days, a warning will be displayed. Disable by setting to 0."
     autohighlight_all_code: "Force apply code highlighting to all preformatted code blocks even when they didn't explicitly specify the language."
     highlighted_languages: "Included syntax highlighting rules. (Warning: including too many languages may impact performance) see: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> for a demo"
+    show_copy_button_on_codeblocks: "Add a button to codeblocks to copy the block contents to the user's clipboard. This feature is not supported on Internet Explorer."
 
     embed_any_origin: "Allow embeddable content regardless of origin. This is required for mobile apps with static HTML."
     embed_topics_list: "Support HTML embedding of topics lists"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 4684b7d4ca..0828616904 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -850,6 +850,9 @@ posting:
     type: list
     client: true
     list_type: compact
+  show_copy_button_on_codeblocks:
+    client: true
+    default: false
   delete_old_hidden_posts: true
   enable_emoji:
     default: true

From 4f834f0008ca424b85e13b42816e920457605c3d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 21 Apr 2020 16:20:05 +0200
Subject: [PATCH 0694/1830] DEV: allows click to propagate outside of header
 but not outside of sk (#9491)

---
 app/assets/javascripts/select-kit/components/select-kit.js    | 4 ++++
 .../select-kit/components/select-kit/select-kit-header.js     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 828ee6c765..7898179be0 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -122,6 +122,10 @@ export default Component.extend(
       );
     },
 
+    click(event) {
+      event.stopPropagation();
+    },
+
     _modifyComponentForRowWrapper(collection, item) {
       let component = this.modifyComponentForRow(collection, item);
       return component || "select-kit/select-kit-row";
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js
index 6ec3984a98..61f57d1b5d 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js
@@ -13,7 +13,7 @@ export default Component.extend(UtilsMixin, {
       return;
     if (this.eventType !== "click" || event.button !== 0) return;
     this.selectKit.toggle(event);
-    return false;
+    event.preventDefault();
   },
 
   classNames: ["select-kit-header"],

From 79058a6d99829b1582ad1e7319a610f29a272eba Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 21 Apr 2020 16:48:49 +0200
Subject: [PATCH 0695/1830] DEV: makes sk scroll to current selection (#9492)

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

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 7898179be0..a98687caab 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -883,10 +883,31 @@ export default Component.extend(
 
       this._safeAfterRender(() => {
         this._focusFilter();
+        this._scrollToCurrent();
         this.popper && this.popper.update();
       });
     },
 
+    _scrollToCurrent() {
+      if (this.value && this.mainCollection) {
+        let highlighted;
+        if (this.valueProperty) {
+          highlighted = this.mainCollection.findBy(
+            this.valueProperty,
+            this.value
+          );
+        } else {
+          const index = this.mainCollection.indexOf(this.value);
+          highlighted = this.mainCollection.objectAt(index);
+        }
+
+        if (highlighted) {
+          this._scrollToRow(highlighted);
+          this.set("selectKit.highlighted", highlighted);
+        }
+      }
+    },
+
     _focusFilter(forceHeader = false) {
       this._safeAfterRender(() => {
         const input = this.getFilterInput();

From 62459c845f1b14b6516e85f9dd068823d39572d3 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 21 Apr 2020 17:11:40 +0200
Subject: [PATCH 0696/1830] DEV: allows a sk component to stop click
 propagation (#9495)

---
 app/assets/javascripts/select-kit/components/select-kit.js | 7 +++++--
 .../templates/components/topic-notifications-button.hbs    | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index a98687caab..4fdbd62928 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -123,7 +123,9 @@ export default Component.extend(
     },
 
     click(event) {
-      event.stopPropagation();
+      if (this.selectKit.options.preventsClickPropagation) {
+        event.stopPropagation();
+      }
     },
 
     _modifyComponentForRowWrapper(collection, item) {
@@ -270,7 +272,8 @@ export default Component.extend(
       placementStrategy: null,
       filterComponent: "select-kit/select-kit-filter",
       selectedNameComponent: "selected-name",
-      castInteger: false
+      castInteger: false,
+      preventsClickPropagation: false
     },
 
     autoFilterable: computed("content.[]", "selectKit.filter", function() {
diff --git a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
index a57b6b8584..b111dd6a58 100644
--- a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
@@ -5,6 +5,7 @@
   options=(hash
     showFullTitle=showFullTitle
     placement=placement
+    preventsClickPropagation=true
   )
 }}
 

From c9cdd12e97ec12d0683e0aa0c103715a5f6fc73d Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Tue, 21 Apr 2020 10:12:56 -0500
Subject: [PATCH 0697/1830] FIX: Improve selector for copy codeblock button
 (#9493)

Previous selector implementation was not accounting for codeblocks in
nested elements, like lists.
---
 .../javascripts/discourse/initializers/copy-codeblocks.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/initializers/copy-codeblocks.js b/app/assets/javascripts/discourse/initializers/copy-codeblocks.js
index b9aaa325b0..777400db57 100644
--- a/app/assets/javascripts/discourse/initializers/copy-codeblocks.js
+++ b/app/assets/javascripts/discourse/initializers/copy-codeblocks.js
@@ -114,7 +114,7 @@ export default {
         }
 
         const commands = postElements[0].querySelectorAll(
-          ":scope > pre > code"
+          ":scope > pre > code, :scope :not(article) > pre > code"
         );
 
         const post = helper.getModel();

From 1eb9bc4cecddeccc1fc7bf702dae451a608e313d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 21 Apr 2020 17:27:17 +0200
Subject: [PATCH 0698/1830] DEV: encapsulates _events and clearing it at
 app-events module level (#9489)

---
 .../discourse/services/app-events.js          | 38 +++++++++++++------
 test/javascripts/test_helper.js               | 13 ++-----
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/discourse/services/app-events.js b/app/assets/javascripts/discourse/services/app-events.js
index 8a3e770c75..8d8761fade 100644
--- a/app/assets/javascripts/discourse/services/app-events.js
+++ b/app/assets/javascripts/discourse/services/app-events.js
@@ -2,21 +2,37 @@ import deprecated from "discourse-common/lib/deprecated";
 import Evented from "@ember/object/evented";
 import Service from "@ember/service";
 
-export default Service.extend(Evented, {
-  _events: {},
+let _events = {};
 
+export function clearAppEventsCache(container) {
+  if (container) {
+    const appEvents = container.lookup("service:app-events");
+    Object.keys(_events).forEach(eventKey => {
+      const event = _events[eventKey];
+      event.forEach(listener => {
+        if (appEvents.has(eventKey)) {
+          appEvents.off(eventKey, listener.target, listener.fn);
+        }
+      });
+    });
+  }
+
+  _events = {};
+}
+
+export default Service.extend(Evented, {
   on() {
     if (arguments.length === 2) {
       let [name, fn] = arguments;
       let target = {};
-      this._events[name] = this._events[name] || [];
-      this._events[name].push({ target, fn });
+      _events[name] = _events[name] || [];
+      _events[name].push({ target, fn });
 
       this._super(name, target, fn);
     } else if (arguments.length === 3) {
       let [name, target, fn] = arguments;
-      this._events[name] = this._events[name] || [];
-      this._events[name].push({ target, fn });
+      _events[name] = _events[name] || [];
+      _events[name].push({ target, fn });
 
       this._super(...arguments);
     }
@@ -27,21 +43,21 @@ export default Service.extend(Evented, {
     let name = arguments[0];
     let fn = arguments[2];
 
-    if (this._events[name]) {
+    if (_events[name]) {
       if (arguments.length === 1) {
         deprecated(
           "Removing all event listeners at once is deprecated, please remove each listener individually."
         );
 
-        this._events[name].forEach(ref => {
+        _events[name].forEach(ref => {
           this._super(name, ref.target, ref.fn);
         });
-        delete this._events[name];
+        delete _events[name];
       } else if (arguments.length === 3) {
         this._super(...arguments);
 
-        this._events[name] = this._events[name].filter(e => e.fn !== fn);
-        if (this._events[name].length === 0) delete this._events[name];
+        _events[name] = _events[name].filter(e => e.fn !== fn);
+        if (_events[name].length === 0) delete _events[name];
       }
     }
 
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 38afc19d67..d15cd7c8fb 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -189,16 +189,9 @@ QUnit.testDone(function() {
   // ensures any event not removed is not leaking between tests
   // most likely in intialisers, other places (controller, component...)
   // should be fixed in code
-  var appEvents = window.Discourse.__container__.lookup("service:app-events");
-  var events = appEvents.__proto__._events;
-  Object.keys(events).forEach(function(eventKey) {
-    var event = events[eventKey];
-    event.forEach(function(listener) {
-      if (appEvents.has(eventKey)) {
-        appEvents.off(eventKey, listener.target, listener.fn);
-      }
-    });
-  });
+  require("discourse/services/app-events").clearAppEventsCache(
+    window.Discourse.__container__
+  );
 
   window.MessageBus.unsubscribe("*");
   delete window.server;

From fe579c918f5a69d9027a1f94a8753f80cf6d8b48 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 21 Apr 2020 11:55:35 -0400
Subject: [PATCH 0699/1830] DEV: fix failing test relating to sk click
 propagation

* followup to 62459c84
---
 test/javascripts/components/select-kit/single-select-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/components/select-kit/single-select-test.js b/test/javascripts/components/select-kit/single-select-test.js
index 88dbbacf9e..ac53d73bf7 100644
--- a/test/javascripts/components/select-kit/single-select-test.js
+++ b/test/javascripts/components/select-kit/single-select-test.js
@@ -241,7 +241,7 @@ componentTest("selected value can be 0", {
 
 componentTest("prevents propagating click event on header", {
   template:
-    "{{#d-button icon='times' action=onClick}}{{single-select value=value content=content}}{{/d-button}}",
+    "{{#d-button icon='times' action=onClick}}{{single-select options=(hash preventsClickPropagation=true) value=value content=content}}{{/d-button}}",
 
   beforeEach() {
     this.setProperties({

From 07e0490fe4763ecbd72e7f4666e476f93a13bde2 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 21 Apr 2020 18:32:42 +0200
Subject: [PATCH 0700/1830] DEV: Update mocha (#9490)

The spec that was blocking the update was fixed in c08753dc3431ce2f85916b5a7e68db52891917d8.
---
 Gemfile      | 5 +----
 Gemfile.lock | 6 ++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index d0844e45e8..c440694fff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -160,10 +160,7 @@ group :test, :development do
   gem 'listen', require: false
   gem 'certified', require: false
   gem 'fabrication', require: false
-
-  # TODO: upgrading to 1.10.1 cause it breaks our test suite.
-  # We want our test suite fixed though to support this upgrade.
-  gem 'mocha', '1.8.0', require: false
+  gem 'mocha', require: false
 
   gem 'rb-fsevent', require: RUBY_PLATFORM =~ /darwin/i ? 'rb-fsevent' : false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b79091b2c2..3a60704820 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -184,7 +184,6 @@ GEM
     memory_profiler (0.9.14)
     message_bus (2.2.4)
       rack (>= 1.1.3)
-    metaclass (0.0.4)
     method_source (0.9.2)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
@@ -196,8 +195,7 @@ GEM
     mini_suffix (0.3.0)
       ffi (~> 1.9)
     minitest (5.14.0)
-    mocha (1.8.0)
-      metaclass (~> 0.0.1)
+    mocha (1.11.2)
     mock_redis (0.22.0)
     msgpack (1.3.3)
     multi_json (1.14.1)
@@ -488,7 +486,7 @@ DEPENDENCIES
   mini_sql
   mini_suffix
   minitest
-  mocha (= 1.8.0)
+  mocha
   mock_redis
   multi_json
   mustache

From c4cc19a2ba5e1ea3be0f527d8349bfaa2a8726b3 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Tue, 21 Apr 2020 09:58:46 -0700
Subject: [PATCH 0701/1830] Revert "DEV: allow nav items to override computed
 property values"

This reverts commit 74e4102093c6aa497fe48947afbec9751b21721a.
---
 .../javascripts/discourse/models/nav-item.js  | 39 -------------------
 1 file changed, 39 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/nav-item.js b/app/assets/javascripts/discourse/models/nav-item.js
index bc78b0a1a9..83330778e0 100644
--- a/app/assets/javascripts/discourse/models/nav-item.js
+++ b/app/assets/javascripts/discourse/models/nav-item.js
@@ -92,45 +92,6 @@ const ExtraNavItem = NavItem.extend({
       return (this._href = value);
     }
   }),
-  displayName: discourseComputed("displayName", {
-    get() {
-      if (this._displayName) {
-        return this._displayName;
-      }
-
-      return this.displayName;
-    },
-
-    set(key, value) {
-      return (this._displayName = value);
-    }
-  }),
-  filterMode: discourseComputed("filterMode", {
-    get() {
-      if (this._filterMode) {
-        return this._filterMode;
-      }
-
-      return this.filterMode;
-    },
-
-    set(key, value) {
-      return (this._filterMode = value);
-    }
-  }),
-  title: discourseComputed("title", {
-    get() {
-      if (this._title) {
-        return this._title;
-      }
-
-      return this.title;
-    },
-
-    set(key, value) {
-      return (this._title = value);
-    }
-  }),
 
   count: 0,
 

From ffa0a188416bf73d81962ab5bf42b1c09b69586e Mon Sep 17 00:00:00 2001
From: Dax74 <Dax74@users.noreply.github.com>
Date: Tue, 21 Apr 2020 19:35:03 +0200
Subject: [PATCH 0702/1830] Update bookmark step

See https://dev.discourse.org/t/discobot-tutorial-for-bookmarks/27466 for details
---
 plugins/discourse-narrative-bot/config/locales/server.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index 86d081b5bb..def563ed26 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -242,7 +242,7 @@ en:
 
       bookmark:
         instructions: |-
-          If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this personal message**. If you do, there may be a :gift: in your future!
+          If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this personal message** selecting "no reminder needed". If you do, there may be a :gift: in your future!
         reply: |-
           Excellent! Now you can easily find your way back to our private conversation any time, right from [the bookmarks tab on your profile](%{bookmark_url}). Just select your profile picture at the upper right &#8599;
         not_found: |-

From 63811707e8e02fce8ec2796d72ebdf807a5396ea Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 21 Apr 2020 13:48:04 -0400
Subject: [PATCH 0703/1830] DEV: Remove `setupTopicController` event

---
 app/assets/javascripts/discourse/routes/topic.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/routes/topic.js b/app/assets/javascripts/discourse/routes/topic.js
index b9d6aaf177..6f7fd410c6 100644
--- a/app/assets/javascripts/discourse/routes/topic.js
+++ b/app/assets/javascripts/discourse/routes/topic.js
@@ -4,8 +4,6 @@ import { cancel, later, schedule } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import { ID_CONSTRAINT } from "discourse/models/topic";
-import Evented from "@ember/object/evented";
-import EmberObject from "@ember/object";
 
 const SCROLL_DELAY = 500;
 
@@ -313,8 +311,6 @@ const TopicRoute = DiscourseRoute.extend({
       firstPostExpanded: false
     });
 
-    TopicRoute.trigger("setupTopicController", this);
-
     this.searchService.set("searchContext", model.get("searchContext"));
 
     // close the multi select when switching topics
@@ -333,9 +329,4 @@ const TopicRoute = DiscourseRoute.extend({
   }
 });
 
-// TODO: Remove this - it's barely used.
-const events = EmberObject.extend(Evented).create();
-TopicRoute.on = events.on;
-TopicRoute.trigger = events.trigger;
-
 export default TopicRoute;

From a97cb2444cc67393c900fc7c80b43ce2c426b0fb Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 21 Apr 2020 19:00:47 +0100
Subject: [PATCH 0704/1830] UX: Fix broken image placeholder styling

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

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 8960425f17..d6bf0ec166 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -886,6 +886,7 @@ a.mention-group {
 }
 
 .broken-image {
+  display: inline-flex;
   color: dark-light-choose($primary-low-mid, $secondary-high);
   border: 1px solid $primary-low;
   font-size: $font-up-5;

From 036236d6d62a7755e73018025888ad971e84516e Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Tue, 21 Apr 2020 13:01:57 -0500
Subject: [PATCH 0705/1830] FIX: properly add 'two-rows' class to
 header-topic-info container (#9497)

---
 .../discourse/widgets/header-topic-info.js    | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js b/app/assets/javascripts/discourse/widgets/header-topic-info.js
index 1e31cf5fbf..b3c6da04ed 100644
--- a/app/assets/javascripts/discourse/widgets/header-topic-info.js
+++ b/app/assets/javascripts/discourse/widgets/header-topic-info.js
@@ -56,9 +56,12 @@ createWidget("topic-header-participant", {
 
 export default createWidget("header-topic-info", {
   tagName: "div.extra-info-wrapper",
+  contents: null,
+  title: null,
 
-  buildClasses(attrs) {
-    return this.showCategory(attrs.topic) ? "two-rows" : "";
+  buildClasses(attrs, state) {
+    this.buildAttributes(attrs, state);
+    return this.containerClassName();
   },
 
   buildFancyTitleClass() {
@@ -73,7 +76,7 @@ export default createWidget("header-topic-info", {
       .join(" ");
   },
 
-  html(attrs, state) {
+  buildAttributes(attrs, state) {
     const topic = attrs.topic;
 
     const heading = [];
@@ -112,11 +115,15 @@ export default createWidget("header-topic-info", {
       );
     }
 
-    const title = [h("h1.header-title", heading)];
+    this.title = [h("h1.header-title", heading)];
     const category = topic.get("category");
 
     if (loaded || category) {
-      if (this.showCategory(topic)) {
+      if (
+        category &&
+        (!category.isUncategorizedCategory ||
+          !this.siteSettings.suppress_uncategorized_badge)
+      ) {
         const parentCategory = category.get("parentCategory");
         const categories = [];
         if (parentCategory) {
@@ -126,7 +133,7 @@ export default createWidget("header-topic-info", {
         }
         categories.push(this.attach("category-link", { category }));
 
-        title.push(h("div.categories-wrapper", categories));
+        this.title.push(h("div.categories-wrapper", categories));
       }
 
       let extra = [];
@@ -196,24 +203,23 @@ export default createWidget("header-topic-info", {
         }
       }
       if (extra.length) {
-        title.push(h("div.topic-header-extra", extra));
+        this.title.push(h("div.topic-header-extra", extra));
       }
     }
 
-    const contents = h("div.title-wrapper", title);
+    this.contents = h("div.title-wrapper", this.title);
+  },
+
+  html() {
     return h(
       "div.extra-info",
-      { className: title.length > 1 ? "two-rows" : "" },
-      contents
+      { className: this.containerClassName() },
+      this.contents
     );
   },
 
-  showCategory(topic) {
-    return (
-      topic.category &&
-      (!topic.category.isUncategorizedCategory ||
-        !this.siteSettings.suppress_uncategorized_badge)
-    );
+  containerClassName() {
+    return this.title.length > 1 ? "two-rows" : "";
   },
 
   jumpToTopPost() {

From f51b48b421902e6552bbc347cd264331e7eeb1f5 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 21 Apr 2020 17:52:19 +0100
Subject: [PATCH 0706/1830] PERF: Improve lazy-load performance in Safari

Safari starts loading images as soon as attributes are modified. Modern browsers all prefer the srcset attribute over src, so we should remove srcset last, and add it first.
---
 app/assets/javascripts/discourse/lib/lazy-load-images.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/lazy-load-images.js b/app/assets/javascripts/discourse/lib/lazy-load-images.js
index a8f30a3998..f326b2ebf2 100644
--- a/app/assets/javascripts/discourse/lib/lazy-load-images.js
+++ b/app/assets/javascripts/discourse/lib/lazy-load-images.js
@@ -22,9 +22,10 @@ function hide(image) {
     height: image.height,
     className: image.className
   });
-  image.removeAttribute("srcset");
 
   image.src = image.dataset.smallUpload || LOADING_DATA;
+  image.removeAttribute("srcset");
+
   image.removeAttribute("data-small-upload");
 }
 
@@ -35,10 +36,10 @@ function show(image) {
   if (imageData) {
     const copyImg = new Image();
     copyImg.onload = () => {
-      image.src = copyImg.src;
       if (copyImg.srcset) {
         image.srcset = copyImg.srcset;
       }
+      image.src = copyImg.src;
       image.classList.remove("d-lazyload-hidden");
 
       if (image.onload) {
@@ -55,12 +56,12 @@ function show(image) {
       copyImg.onload = null;
     };
 
-    copyImg.src = imageData.src;
-
     if (imageData.srcset) {
       copyImg.srcset = imageData.srcset;
     }
 
+    copyImg.src = imageData.src;
+
     // width of image may not match, use computed style which
     // is the actual size of the image
     const computedStyle = window.getComputedStyle(image);

From b6489d269045d28ad1f8c6dc7e41f991390f002c Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 21 Apr 2020 17:34:59 -0400
Subject: [PATCH 0707/1830] UX: Replaced locked topic "lock" icon with
 "comment-slash" icon

---
 .../javascripts/discourse/components/topic-status.js | 12 +++++++++---
 .../discourse/controllers/topic-bulk-actions.js      |  2 +-
 .../discourse/helpers/topic-status-icons.js          |  6 +++---
 .../javascripts/discourse/raw-views/topic-status.js  |  9 ++++++---
 app/assets/javascripts/discourse/templates/user.hbs  |  2 +-
 .../discourse/widgets/post-small-action.js           | 10 +++++-----
 .../discourse/widgets/topic-admin-menu.js            |  6 +++---
 lib/svg_sprite/svg_sprite.rb                         |  2 ++
 vendor/assets/svg-icons/discourse-additional.svg     |  9 +++++++++
 9 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/topic-status.js b/app/assets/javascripts/discourse/components/topic-status.js
index 569292eb5e..19f16b3ca3 100644
--- a/app/assets/javascripts/discourse/components/topic-status.js
+++ b/app/assets/javascripts/discourse/components/topic-status.js
@@ -23,15 +23,21 @@ export default Component.extend({
   @discourseComputed("topic.closed", "topic.archived")
   topicClosedArchived(closed, archived) {
     if (closed && archived) {
-      this._set("closedArchived", "lock", "locked_and_archived");
+      this._set(
+        "closedArchived",
+        "discourse-comment-slash",
+        "locked_and_archived"
+      );
       this._reset("closed");
       this._reset("archived");
       return true;
     } else {
       this._reset("closedArchived");
-      closed ? this._set("closed", "lock", "locked") : this._reset("closed");
+      closed
+        ? this._set("closed", "discourse-comment-slash", "locked")
+        : this._reset("closed");
       archived
-        ? this._set("archived", "lock", "archived")
+        ? this._set("archived", "discourse-comment-slash", "archived")
         : this._reset("archived");
       return false;
     }
diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js
index 723e7fee54..d8416436b5 100644
--- a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js
+++ b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js
@@ -30,7 +30,7 @@ addBulkButton("showChangeCategory", "change_category", {
   class: "btn-default"
 });
 addBulkButton("closeTopics", "close_topics", {
-  icon: "lock",
+  icon: "discourse-comment-slash",
   class: "btn-default"
 });
 addBulkButton("archiveTopics", "archive_topics", {
diff --git a/app/assets/javascripts/discourse/helpers/topic-status-icons.js b/app/assets/javascripts/discourse/helpers/topic-status-icons.js
index 2f2da65a25..a1776e4f6f 100644
--- a/app/assets/javascripts/discourse/helpers/topic-status-icons.js
+++ b/app/assets/javascripts/discourse/helpers/topic-status-icons.js
@@ -10,10 +10,10 @@ export default ArrayProxy.extend({
     };
 
     if (topic.get("closed") && topic.get("archived")) {
-      renderIcon("lock", "locked_and_archived");
+      renderIcon("discourse-comment-slash", "locked_and_archived");
     } else {
-      renderIconIf("closed", "lock", "locked");
-      renderIconIf("archived", "lock", "archived");
+      renderIconIf("closed", "discourse-comment-slash", "locked");
+      renderIconIf("archived", "discourse-comment-slash", "archived");
     }
 
     this.forEach(args => renderIconIf(...args));
diff --git a/app/assets/javascripts/discourse/raw-views/topic-status.js b/app/assets/javascripts/discourse/raw-views/topic-status.js
index d6b2c74999..ba8bf33511 100644
--- a/app/assets/javascripts/discourse/raw-views/topic-status.js
+++ b/app/assets/javascripts/discourse/raw-views/topic-status.js
@@ -38,11 +38,14 @@ export default EmberObject.extend({
     }
 
     if (topic.get("closed") && topic.get("archived")) {
-      results.push({ icon: "lock", key: "locked_and_archived" });
+      results.push({
+        icon: "discourse-comment-slash",
+        key: "locked_and_archived"
+      });
     } else if (topic.get("closed")) {
-      results.push({ icon: "lock", key: "locked" });
+      results.push({ icon: "discourse-comment-slash", key: "locked" });
     } else if (topic.get("archived")) {
-      results.push({ icon: "lock", key: "archived" });
+      results.push({ icon: "discourse-comment-slash", key: "archived" });
     }
 
     if (topic.get("pinned")) {
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 9290b1d832..ceed565516 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -233,7 +233,7 @@
           {{#if showNotificationsTab}}
             <li>
               {{#link-to 'userNotifications'}}
-                {{d-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
+                {{d-icon "discourse-comment" class="glyph"}}{{i18n 'user.notifications'}}
               {{/link-to}}
             </li>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/widgets/post-small-action.js b/app/assets/javascripts/discourse/widgets/post-small-action.js
index 709d70153a..19e4531259 100644
--- a/app/assets/javascripts/discourse/widgets/post-small-action.js
+++ b/app/assets/javascripts/discourse/widgets/post-small-action.js
@@ -32,10 +32,10 @@ export function actionDescription(actionCode, createdAt, username) {
 }
 
 const icons = {
-  "closed.enabled": "lock",
-  "closed.disabled": "unlock-alt",
-  "autoclosed.enabled": "lock",
-  "autoclosed.disabled": "unlock-alt",
+  "closed.enabled": "discourse-comment-slash",
+  "closed.disabled": "discourse-comment",
+  "autoclosed.enabled": "discourse-comment-slash",
+  "autoclosed.disabled": "discourse-comment",
   "archived.enabled": "folder",
   "archived.disabled": "folder-open",
   "pinned.enabled": "thumbtack",
@@ -52,7 +52,7 @@ const icons = {
   user_left: "minus-circle",
   removed_user: "minus-circle",
   removed_group: "minus-circle",
-  public_topic: "comment",
+  public_topic: "discourse-comment",
   private_topic: "envelope",
   autobumped: "hand-point-right"
 };
diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js
index e5c8138673..edf9d4a14a 100644
--- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js
+++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js
@@ -165,7 +165,7 @@ export default createWidget("topic-admin-menu", {
           className: "topic-admin-open",
           buttonClass: "btn-default",
           action: "toggleClosed",
-          icon: "unlock",
+          icon: "discourse-comment",
           label: "actions.open"
         });
       } else {
@@ -173,7 +173,7 @@ export default createWidget("topic-admin-menu", {
           className: "topic-admin-close",
           buttonClass: "btn-default",
           action: "toggleClosed",
-          icon: "lock",
+          icon: "discourse-comment-slash",
           label: "actions.close"
         });
       }
@@ -239,7 +239,7 @@ export default createWidget("topic-admin-menu", {
           action: isPrivateMessage
             ? "convertToPublicTopic"
             : "convertToPrivateMessage",
-          icon: isPrivateMessage ? "comment" : "envelope",
+          icon: isPrivateMessage ? "discourse-comment" : "envelope",
           label: isPrivateMessage
             ? "actions.make_public"
             : "actions.make_private"
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index f2c4bcdbb7..4fdc3e5a87 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -62,6 +62,8 @@ module SvgSprite
     "discourse-bell-one",
     "discourse-bell-slash",
     "discourse-compress",
+    "discourse-comment",
+    "discourse-comment-slash",
     "discourse-expand",
     "download",
     "ellipsis-h",
diff --git a/vendor/assets/svg-icons/discourse-additional.svg b/vendor/assets/svg-icons/discourse-additional.svg
index 343b5b6abc..e3adf58e0c 100644
--- a/vendor/assets/svg-icons/discourse-additional.svg
+++ b/vendor/assets/svg-icons/discourse-additional.svg
@@ -27,4 +27,13 @@ Additional SVG icons
   <symbol id='discourse-bell-slash' viewBox="0 0 448 512">
     <path d="M442.7 396.2L36.5 70.7c-6.9-5.5-17-4.4-22.5 2.5L4 85.6c-5.5 6.9-4.4 17 2.5 22.5l406.2 325.5c6.9 5.5 17 4.4 22.5-2.5l10-12.5c5.5-6.9 3.7-17.7-3.2-23.2l.7.8zM67.5 368c16.7-22 34.5-55.8 41.4-110.6l-45.5-35.6C60.2 312.6 27 342.5 8.6 362.3 2.6 368.7 0 376.4 0 384c.1 16.4 13 32 32.1 32h279.7l-61.4-48H67.5zM224 96c61.9 0 112 50.1 112 112 0 .2-.1.4-.1.6 0 16.8 1.2 31.8 2.8 45.7l59.5 46.5c-8.3-22.1-14.3-51.5-14.3-92.9 0-77.7-54.5-139.9-127.9-155.2V32c0-17.7-14.3-32-32-32s-32 14.3-32 32v20.8c-26 5.4-49.4 16.9-69.1 32.7l38.2 29.8C179 103.2 200.6 96 224 96zm0 416c35.3 0 64-28.6 64-64H160c0 35.4 28.7 64 64 64z"/>
   </symbol>
+  <!-- "Discourse Comment Slash" is a version of https://fontawesome.com/icons/comment-slash?style=regular that has been recreated to be more legible at small sizes  -->
+  <symbol id='discourse-comment-slash' viewBox="0 0 640 512">
+    <path d="M634 471L481.6 351.8l-6.8-5.3L36 3.5C29.1-2 19-.9 13.5 6l-10 12.5C-2 25.4-.9 35.5 6 41l598 467.5c6.9 5.5 17 4.4 22.5-2.5l10-12.5c5.5-6.9 4.4-17-2.5-22.5zM224.2 89.9c36.8-19.6 81.2-29.1 127.6-24.6 59 5.6 113 33.3 148 76.1 29.5 36 43.3 80 38.8 123.7-2.1 20.4-8 39.7-17 57.3l41.6 32.5c14.8-25.9 24.1-54.4 27.2-84.5 5.9-57.7-11.9-115.2-50.3-162-43.8-53.4-110.7-88-183.4-94.9-63.4-6.1-125.6 8.8-176.5 42l44 34.4zM407.1 416c-22 7.2-45.8 11.1-70.4 11.1-7.4 0-14.9-.4-22.5-1.1-29.6-2.8-57.7-11-83.6-24.4-3.7-1.9-7.8-2.9-11.9-2.9-2.2 0-4.4.3-6.6.9l-102.9 27 38.5-87c3.9-8.7 2.6-18.9-3.2-26.5-15.2-19.6-20.9-48.8-17-86.9.9-8.6 2.5-17 4.7-25.2l-43.6-34.1c-6.5 17.2-10.8 35.3-12.8 54-4.6 44.6 1.7 81.8 18.6 110.7L39.7 454.9c-4 9.1-2.5 19.8 4 27.4 5 5.9 12.3 9.2 19.8 9.2 2.2 0 4.4-.3 6.6-.9l145.8-38.2c29.3 13.8 60.6 22.3 93.4 25.4 9.2.9 18.5 1.3 27.6 1.3 41.4 0 81.5-8.9 117.7-25.9L407.1 416z"/>
+  </symbol>
+  <!-- "Discourse Comment" is a Discourse derivative of https://fontawesome.com/icons/comment?style=regular that has been built to match the custom discourse-comment-slash icon  -->
+  <symbol id='discourse-comment' viewBox="0 0 554 479.3">
+    <path d="M26 479.3c-7.5 0-14.8-3.3-19.8-9.2-6.5-7.6-8-18.3-4-27.4l54.6-123.2c-17-28.9-23.2-66.1-18.6-110.7C44.6 146.2 77.8 90.2 131.6 51 184.4 12.4 251.1-5.2 319.2 1.3c72.8 7 139.6 41.5 183.3 94.9 38.4 46.8 56.3 104.4 50.3 162-6.5 62.5-39.6 118.5-93.4 157.7-45.7 33.3-101.7 51-160 51-9.2 0-18.4-.4-27.6-1.3-32.8-3.1-64.2-11.7-93.4-25.4L32.6 478.4c-2.2.6-4.4.9-6.6.9zm155.2-92.7c4.1 0 8.2 1 11.9 2.9 25.9 13.4 54 21.6 83.6 24.4 7.5.7 15 1.1 22.5 1.1 104 0 192.3-69.1 201.9-162 4.5-43.8-9.3-87.7-38.8-123.7-35-42.7-89-70.4-148-76.1-113.5-10.9-214.1 61.4-224.4 161-3.9 38.1 1.8 67.3 17 86.9 5.9 7.6 7.1 17.7 3.2 26.5l-38.5 87 102.9-27c2.3-.7 4.5-1 6.7-1z"/>
+  </symbol>
+
 </svg>

From d1bee13fdab8e88e032c33bb039052c9d9848d53 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 21 Apr 2020 17:57:25 -0400
Subject: [PATCH 0708/1830] test fix

---
 test/javascripts/widgets/topic-status-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/widgets/topic-status-test.js b/test/javascripts/widgets/topic-status-test.js
index c5888d4aa4..5cc6f9d437 100644
--- a/test/javascripts/widgets/topic-status-test.js
+++ b/test/javascripts/widgets/topic-status-test.js
@@ -12,7 +12,7 @@ widgetTest("basics", {
     });
   },
   test(assert) {
-    assert.ok(find(".topic-status .d-icon-lock").length);
+    assert.ok(find(".topic-status .d-icon-discourse-comment-slash").length);
   }
 });
 

From e18aeb799e562386dac6f530ef8b91fc9156f616 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 22 Apr 2020 10:44:04 +1000
Subject: [PATCH 0709/1830] FIX: Make sure reminder_type is parsed on bookmark
 update (#9503)

Otherwise we are trying to update the reminder type with a string which often evaluates to 0 (At Desktop) which causes reminders to come through early.
---
 lib/bookmark_manager.rb           | 19 ++++++++++++++-----
 spec/lib/bookmark_manager_spec.rb | 17 +++++++++++++----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index b56a129f10..ee69db4ec9 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -9,7 +9,7 @@ class BookmarkManager
 
   def create(post_id:, name: nil, reminder_type: nil, reminder_at: nil)
     post = Post.unscoped.includes(:topic).find(post_id)
-    reminder_type = Bookmark.reminder_types[reminder_type.to_sym] if reminder_type.present?
+    reminder_type = parse_reminder_type(reminder_type)
 
     raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_see_post?(post)
 
@@ -74,16 +74,20 @@ class BookmarkManager
     raise Discourse::NotFound if bookmark.blank?
     raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_edit?(bookmark)
 
-    if bookmark.errors.any?
-      return add_errors_from(bookmark)
-    end
+    reminder_type = parse_reminder_type(reminder_type)
 
-    bookmark.update(
+    success = bookmark.update(
       name: name,
       reminder_at: reminder_at,
       reminder_type: reminder_type,
       reminder_set_at: Time.zone.now
     )
+
+    if bookmark.errors.any?
+      return add_errors_from(bookmark)
+    end
+
+    success
   end
 
   private
@@ -100,4 +104,9 @@ class BookmarkManager
   def update_topic_user_bookmarked(topic:, bookmarked:)
     TopicUser.change(@user.id, topic, bookmarked: bookmarked)
   end
+
+  def parse_reminder_type(reminder_type)
+    return if reminder_type.blank?
+    reminder_type.is_a?(Integer) ? reminder_type : Bookmark.reminder_types[reminder_type.to_sym]
+  end
 end
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index 979f567433..9dfe6ff23a 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -181,10 +181,19 @@ RSpec.describe BookmarkManager do
 
     it "saves the time and new reminder type sucessfully" do
       update_bookmark
-       bookmark.reload
-       expect(bookmark.name).to eq(new_name)
-       expect(bookmark.reminder_at).to eq_time(new_reminder_at)
-       expect(bookmark.reminder_type).to eq(new_reminder_type)
+      bookmark.reload
+      expect(bookmark.name).to eq(new_name)
+      expect(bookmark.reminder_at).to eq_time(new_reminder_at)
+      expect(bookmark.reminder_type).to eq(new_reminder_type)
+    end
+
+    context "if the new reminder type is a string" do
+      let(:new_reminder_type) { "custom" }
+      it "is parsed" do
+        update_bookmark
+        bookmark.reload
+        expect(bookmark.reminder_type).to eq(Bookmark.reminder_types[:custom])
+      end
     end
 
     context "if the bookmark is belonging to some other user" do

From 5a98869c5d1fb2a6c188600eb96ef5138954308c Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 22 Apr 2020 13:34:58 +1000
Subject: [PATCH 0710/1830] FIX: If bookmarking discobot posts, skip the
 reminder modal (#9505)

This is to streamline the new user narrative. only works when creating the bookmark, if editing/deleting the modal is shown. This is done via the plugin initializer.
---
 .../initializers/new-user-narrative.js.es6    | 24 +++++++++++++++++++
 .../config/locales/server.en.yml              |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6 b/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6
index 45b68ca24f..6498f501b3 100644
--- a/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6
+++ b/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6
@@ -1,4 +1,5 @@
 import { withPluginApi } from "discourse/lib/plugin-api";
+import { ajax } from "discourse/lib/ajax";
 
 function initialize(api) {
   const messageBus = api.container.lookup("message-bus:main");
@@ -12,6 +13,29 @@ function initialize(api) {
     }
   });
 
+  api.modifyClass("model:post", {
+    toggleBookmarkWithReminder() {
+      // if we are talking to discobot then any bookmarks should just
+      // be created without reminder options, to streamline the new user
+      // narrative.
+      const discobotUserId = -2;
+      if (this.user_id === discobotUserId && !this.bookmarked_with_reminder) {
+        return ajax("/bookmarks", {
+          type: "POST",
+          data: { post_id: this.id }
+        }).then(response => {
+          this.setProperties({
+            "topic.bookmarked": true,
+            bookmarked_with_reminder: true,
+            bookmark_id: response.id
+          });
+          this.appEvents.trigger("post-stream:refresh", { id: this.id });
+        });
+      }
+      this._super();
+    }
+  });
+
   api.attachWidgetAction("header", "headerSearchContextTrigger", function() {
     if (this.site.mobileView) {
       this.state.skipSearchContext = false;
diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index def563ed26..86d081b5bb 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -242,7 +242,7 @@ en:
 
       bookmark:
         instructions: |-
-          If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this personal message** selecting "no reminder needed". If you do, there may be a :gift: in your future!
+          If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this personal message**. If you do, there may be a :gift: in your future!
         reply: |-
           Excellent! Now you can easily find your way back to our private conversation any time, right from [the bookmarks tab on your profile](%{bookmark_url}). Just select your profile picture at the upper right &#8599;
         not_found: |-

From 628ba9d1e2e6ee4b552aded1625c0ae84c81d78b Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 22 Apr 2020 13:44:19 +1000
Subject: [PATCH 0711/1830] FEATURE: Promote bookmarks with reminders to core
 functionality (#9369)

The main thrust of this PR is to take all the conditional checks based on the `enable_bookmarks_with_reminders` away and only keep the code from the `true` path, making bookmarks with reminders the core bookmarks feature. There is also a migration to create `Bookmark` records out of `PostAction` bookmarks for a site.

### Summary

* Remove logic based on whether enable_bookmarks_with_reminders is true. This site setting is now obsolete, the old bookmark functionality is being removed. Retain the setting and set the value to `true` in a migration.
* Use the code from the rake task to create a database migration that creates bookmarks from post actions.
* Change the bookmark report to read from the new table.
* Get rid of old endpoints for bookmarks
* Link to the new bookmarks list from the user summary page
---
 .../controllers/keyboard-shortcuts-help.js    |   3 -
 .../discourse/controllers/topic.js            |   5 +-
 .../discourse/controllers/user-activity.js    |   2 -
 .../javascripts/discourse/models/topic.js     |  33 +----
 .../javascripts/discourse/routes/discovery.js |   5 +-
 .../modal/keyboard-shortcuts-help.hbs         |  34 +++--
 .../discourse/templates/user/activity.hbs     |  12 +-
 .../discourse/templates/user/summary.hbs      |   2 +-
 .../discourse/widgets/post-menu.js            |   9 +-
 .../widgets/quick-access-bookmarks.js         |  12 +-
 .../discourse/widgets/user-menu.js            |   5 +-
 app/controllers/posts_controller.rb           |  20 ---
 app/controllers/topics_controller.rb          |  75 +++++------
 .../bookmark_reminder_notifications.rb        |   2 -
 app/models/bookmark.rb                        |  10 ++
 app/models/reports/bookmarks.rb               |  13 +-
 app/models/user_summary.rb                    |   9 +-
 app/serializers/post_serializer.rb            |   2 +-
 app/serializers/topic_view_serializer.rb      |   8 +-
 config/routes.rb                              |   1 -
 config/site_settings.yml                      |   2 +-
 ...te_bookmarks_from_post_action_bookmarks.rb |  58 ++++++++
 lib/bookmark_reminder_notification_handler.rb |   2 -
 lib/search.rb                                 |   6 +-
 lib/tasks/bookmarks.rake                      |  79 +++++------
 .../new_user_narrative.rb                     |   6 +-
 plugins/discourse-narrative-bot/plugin.rb     |   6 +-
 .../new_user_narrative_spec.rb                |  19 ---
 .../bookmark_reminder_notifications_spec.rb   |   9 --
 ...mark_reminder_notification_handler_spec.rb |  12 --
 spec/requests/admin/users_controller_spec.rb  |  36 +++--
 spec/requests/posts_controller_spec.rb        | 125 ------------------
 spec/requests/topics_controller_spec.rb       |  28 ++--
 spec/serializers/post_serializer_spec.rb      |  16 +--
 spec/tasks/bookmarks_spec.rb                  |   5 -
 test/javascripts/acceptance/topic-test.js     |   5 +-
 .../controllers/preferences-account-test.js   |   2 +-
 test/javascripts/fixtures/user_fixtures.js    |  28 ++++
 test/javascripts/helpers/site-settings.js     |   1 -
 test/javascripts/widgets/post-test.js         |  10 +-
 test/javascripts/widgets/user-menu-test.js    |   6 +-
 41 files changed, 254 insertions(+), 469 deletions(-)
 create mode 100644 db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb

diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
index a0d42ac061..2b0df87882 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
@@ -1,6 +1,5 @@
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { setting } from "discourse/lib/computed";
 
 const KEY = "keyboard_shortcuts_help";
 
@@ -57,8 +56,6 @@ export default Controller.extend(ModalFunctionality, {
     this.set("shortcuts", null);
   },
 
-  showBookmarkShortcuts: setting("enable_bookmarks_with_reminders"),
-
   _defineShortcuts() {
     this.set("shortcuts", {
       jump_to: {
diff --git a/app/assets/javascripts/discourse/controllers/topic.js b/app/assets/javascripts/discourse/controllers/topic.js
index eea22c7d88..b934c13543 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js
+++ b/app/assets/javascripts/discourse/controllers/topic.js
@@ -652,10 +652,7 @@ export default Controller.extend(bufferedProperty("model"), {
       if (!this.currentUser) {
         return bootbox.alert(I18n.t("bookmarks.not_bookmarked"));
       } else if (post) {
-        if (this.siteSettings.enable_bookmarks_with_reminders) {
-          return post.toggleBookmarkWithReminder();
-        }
-        return post.toggleBookmark().catch(popupAjaxError);
+        return post.toggleBookmarkWithReminder();
       } else {
         return this.model.toggleBookmark().then(changedIds => {
           if (!changedIds) {
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js b/app/assets/javascripts/discourse/controllers/user-activity.js
index 03828c439b..12333fcf07 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js
@@ -3,7 +3,6 @@ import { inject as service } from "@ember/service";
 import Controller, { inject as controller } from "@ember/controller";
 import { exportUserArchive } from "discourse/lib/export-csv";
 import { observes } from "discourse-common/utils/decorators";
-import { setting } from "discourse/lib/computed";
 
 export default Controller.extend({
   application: controller(),
@@ -12,7 +11,6 @@ export default Controller.extend({
   userActionType: null,
 
   canDownloadPosts: alias("user.viewingSelf"),
-  bookmarksWithRemindersEnabled: setting("enable_bookmarks_with_reminders"),
 
   @observes("userActionType", "model.stream.itemsLoaded")
   _showFooter: function() {
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index 6ad8de27ec..1cbab38942 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -400,10 +400,8 @@ const Topic = RestModel.extend({
   afterTopicBookmarked(firstPost) {
     if (firstPost) {
       firstPost.set("bookmarked", true);
-      if (this.siteSettings.enable_bookmarks_with_reminders) {
-        this.set("bookmark_reminder_at", firstPost.bookmark_reminder_at);
-        firstPost.set("bookmarked_with_reminder", true);
-      }
+      firstPost.set("bookmarked_with_reminder", true);
+      this.set("bookmark_reminder_at", firstPost.bookmark_reminder_at);
       return [firstPost.id];
     }
   },
@@ -438,24 +436,10 @@ const Topic = RestModel.extend({
     return this.firstPost().then(firstPost => {
       const toggleBookmarkOnServer = () => {
         if (bookmark) {
-          if (this.siteSettings.enable_bookmarks_with_reminders) {
-            return firstPost.toggleBookmarkWithReminder().then(response => {
-              this.set("bookmarking", false);
-              if (response && response.closedWithoutSaving) {
-                this.set("bookmarked", false);
-              } else {
-                return this.afterTopicBookmarked(firstPost);
-              }
-            });
-          } else {
-            return ajax(`/t/${this.id}/bookmark`, { type: "PUT" })
-              .then(() => {
-                this.toggleProperty("bookmarked");
-                return this.afterTopicBookmarked(firstPost);
-              })
-              .catch(popupAjaxError)
-              .finally(() => this.set("bookmarking", false));
-          }
+          return firstPost.toggleBookmarkWithReminder().then(() => {
+            this.set("bookmarking", false);
+            return this.afterTopicBookmarked(firstPost);
+          });
         } else {
           return ajax(`/t/${this.id}/remove_bookmarks`, { type: "PUT" })
             .then(() => {
@@ -474,10 +458,7 @@ const Topic = RestModel.extend({
                     post.set("bookmarked", false);
                     updated.push(post.id);
                   }
-                  if (
-                    this.siteSettings.enable_bookmarks_with_reminders &&
-                    post.bookmarked_with_reminder
-                  ) {
+                  if (post.bookmarked_with_reminder) {
                     post.setProperties(clearedBookmarkProps);
                     updated.push(post.id);
                   }
diff --git a/app/assets/javascripts/discourse/routes/discovery.js b/app/assets/javascripts/discourse/routes/discovery.js
index 1dd2985c46..f7bd4a5a06 100644
--- a/app/assets/javascripts/discourse/routes/discovery.js
+++ b/app/assets/javascripts/discourse/routes/discovery.js
@@ -17,10 +17,7 @@ export default DiscourseRoute.extend(OpenComposer, {
     // including being able to show links to multiple posts to the same topic
     // and being based on a different model. better to just redirect
     const url = transition.intent.url;
-    if (
-      this.siteSettings.enable_bookmarks_with_reminders &&
-      url === "/bookmarks"
-    ) {
+    if (url === "/bookmarks") {
       this.transitionTo(
         "userActivity.bookmarksWithReminders",
         this.currentUser
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 5299b52f37..813ab3a1f6 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -55,24 +55,22 @@
         <li>{{html-safe shortcuts.actions.quote_post}}</li>
       </ul>
     </section>
-    {{#if showBookmarkShortcuts}}
-      <section class="keyboard-shortcuts-bookmark-section">
-        <h4>{{i18n "keyboard_shortcuts_help.bookmarks.title"}}</h4>
-        <ul>
-          <li>{{html-safe shortcuts.bookmarks.enter}}</li>
-          <li>{{html-safe shortcuts.bookmarks.later_today}}</li>
-          <li>{{html-safe shortcuts.bookmarks.later_this_week}}</li>
-          <li>{{html-safe shortcuts.bookmarks.tomorrow}}</li>
-          <li>{{html-safe shortcuts.bookmarks.next_week}}</li>
-          <li>{{html-safe shortcuts.bookmarks.next_month}}</li>
-          <li>{{html-safe shortcuts.bookmarks.next_business_week}}</li>
-          <li>{{html-safe shortcuts.bookmarks.next_business_day}}</li>
-          <li>{{html-safe shortcuts.bookmarks.custom}}</li>
-          <li>{{html-safe shortcuts.bookmarks.none}}</li>
-          <li>{{html-safe shortcuts.bookmarks.delete}}</li>
-        </ul>
-      </section>
-    {{/if}}
+    <section class="keyboard-shortcuts-bookmark-section">
+      <h4>{{i18n "keyboard_shortcuts_help.bookmarks.title"}}</h4>
+      <ul>
+        <li>{{html-safe shortcuts.bookmarks.enter}}</li>
+        <li>{{html-safe shortcuts.bookmarks.later_today}}</li>
+        <li>{{html-safe shortcuts.bookmarks.later_this_week}}</li>
+        <li>{{html-safe shortcuts.bookmarks.tomorrow}}</li>
+        <li>{{html-safe shortcuts.bookmarks.next_week}}</li>
+        <li>{{html-safe shortcuts.bookmarks.next_month}}</li>
+        <li>{{html-safe shortcuts.bookmarks.next_business_week}}</li>
+        <li>{{html-safe shortcuts.bookmarks.next_business_day}}</li>
+        <li>{{html-safe shortcuts.bookmarks.custom}}</li>
+        <li>{{html-safe shortcuts.bookmarks.none}}</li>
+        <li>{{html-safe shortcuts.bookmarks.delete}}</li>
+      </ul>
+    </section>
   </div>
   <div class="column">
     <section>
diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs
index 15ac59b652..15b868def2 100644
--- a/app/assets/javascripts/discourse/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/user/activity.hbs
@@ -18,15 +18,9 @@
       {{#link-to "userActivity.likesGiven"}}{{i18n "user_action_groups.1"}}{{/link-to}}
     </li>
     {{#if user.showBookmarks}}
-      {{#if bookmarksWithRemindersEnabled}}
-        <li>
-          {{#link-to "userActivity.bookmarksWithReminders"}}{{i18n "user_action_groups.3"}}{{/link-to}}
-        </li>
-      {{else}}
-        <li>
-          {{#link-to "userActivity.bookmarks"}}{{i18n "user_action_groups.3"}}{{/link-to}}
-        </li>
-      {{/if}}
+      <li>
+        {{#link-to 'userActivity.bookmarksWithReminders'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
+      </li>
     {{/if}}
     {{plugin-outlet
       name="user-activity-bottom"
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index ddd89595c5..ff9c7520f9 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -27,7 +27,7 @@
         </li>
         {{#if model.bookmark_count}}
           <li class="linked-stat">
-            {{#link-to "userActivity.bookmarks"}}
+            {{#link-to "userActivity.bookmarksWithReminders"}}
               {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}}
             {{/link-to}}
           </li>
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js b/app/assets/javascripts/discourse/widgets/post-menu.js
index c8374058ee..98046266bd 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js
@@ -302,8 +302,8 @@ registerButton("bookmark", attrs => {
   };
 });
 
-registerButton("bookmarkWithReminder", (attrs, state, siteSettings) => {
-  if (!attrs.canBookmark || !siteSettings.enable_bookmarks_with_reminders) {
+registerButton("bookmarkWithReminder", attrs => {
+  if (!attrs.canBookmark) {
     return;
   }
 
@@ -469,10 +469,7 @@ export default createWidget("post-menu", {
 
     // filter menu items based on site settings
     const orderedButtons = this.menuItems().filter(button => {
-      if (
-        this.siteSettings.enable_bookmarks_with_reminders &&
-        button === "bookmark"
-      ) {
+      if (button === "bookmark") {
         return false;
       }
       return true;
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js b/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
index 7bbae63198..787fce384d 100644
--- a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
+++ b/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
@@ -16,11 +16,7 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
   },
 
   showAllHref() {
-    if (this.siteSettings.enable_bookmarks_with_reminders) {
-      return `${this.attrs.path}/activity/bookmarks-with-reminders`;
-    } else {
-      return `${this.attrs.path}/activity/bookmarks`;
-    }
+    return `${this.attrs.path}/activity/bookmarks-with-reminders`;
   },
 
   emptyStatePlaceholderItem() {
@@ -28,11 +24,7 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
   },
 
   findNewItems() {
-    if (this.siteSettings.enable_bookmarks_with_reminders) {
-      return this.loadBookmarksWithReminders();
-    } else {
-      return this.loadUserActivityBookmarks();
-    }
+    return this.loadBookmarksWithReminders();
   },
 
   itemHtml(bookmark) {
diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js b/app/assets/javascripts/discourse/widgets/user-menu.js
index 1198729726..08792c4130 100644
--- a/app/assets/javascripts/discourse/widgets/user-menu.js
+++ b/app/assets/javascripts/discourse/widgets/user-menu.js
@@ -56,16 +56,13 @@ createWidget("user-menu-links", {
   },
 
   bookmarksGlyph() {
-    let path = this.siteSettings.enable_bookmarks_with_reminders
-      ? "bookmarks-with-reminders"
-      : "bookmarks";
     return {
       action: UserMenuAction.QUICK_ACCESS,
       actionParam: QuickAccess.BOOKMARKS,
       label: "user.bookmarks",
       className: "user-bookmarks-link",
       icon: "bookmark",
-      href: `${this.attrs.path}/activity/${path}`
+      href: `${this.attrs.path}/activity/bookmarks-with-reminders`
     };
   },
 
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 50c4ead17f..c440d630f5 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -488,26 +488,6 @@ class PostsController < ApplicationController
     render body: nil
   end
 
-  def bookmark
-    if params[:bookmarked] == "true"
-      post = find_post_from_params
-      result = PostActionCreator.create(current_user, post, :bookmark)
-      return render_json_error(result) if result.failed?
-    else
-      post_action = PostAction.find_by(post_id: params[:post_id], user_id: current_user.id)
-      raise Discourse::NotFound unless post_action
-
-      post = Post.with_deleted.find_by(id: post_action&.post_id)
-      raise Discourse::NotFound unless post
-
-      result = PostActionDestroyer.destroy(current_user, post, :bookmark)
-      return render_json_error(result) if result.failed?
-    end
-
-    topic_user = TopicUser.get(post.topic, current_user)
-    render_json_dump(topic_bookmarked: topic_user.try(:bookmarked))
-  end
-
   def destroy_bookmark
     params.require(:post_id)
 
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index fe399566d2..e0ecde628f 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -97,9 +97,9 @@ class TopicsController < ApplicationController
       Notification.remove_for(current_user.id, params[:topic_id]) if current_user
 
       deleted = guardian.can_see_topic?(ex.obj, false) ||
-                (!guardian.can_see_topic?(ex.obj) &&
-                 ex.obj&.access_topic_via_group &&
-                 ex.obj.deleted_at)
+        (!guardian.can_see_topic?(ex.obj) &&
+         ex.obj&.access_topic_via_group &&
+         ex.obj.deleted_at)
 
       if SiteSetting.detailed_404
         if deleted
@@ -231,11 +231,14 @@ class TopicsController < ApplicationController
 
     fetch_topic_view(options)
 
-    render_json_dump(TopicViewPostsSerializer.new(@topic_view,
-      scope: guardian,
-      root: false,
-      include_raw: !!params[:include_raw]
-    ))
+    render_json_dump(
+      TopicViewPostsSerializer.new(
+        @topic_view,
+        scope: guardian,
+        root: false,
+        include_raw: !!params[:include_raw]
+      )
+    )
   end
 
   def excerpts
@@ -261,12 +264,12 @@ class TopicsController < ApplicationController
       .joins("LEFT JOIN users u on u.id = posts.user_id")
       .pluck(:id, :cooked, :username)
       .map do |post_id, cooked, username|
-        {
-          post_id: post_id,
-          username: username,
-          excerpt: PrettyText.excerpt(cooked, 800, keep_emoji_images: true)
-        }
-      end
+      {
+        post_id: post_id,
+        username: username,
+        excerpt: PrettyText.excerpt(cooked, 800, keep_emoji_images: true)
+      }
+    end
 
     render json: @posts.to_json
   end
@@ -490,18 +493,7 @@ class TopicsController < ApplicationController
 
   def remove_bookmarks
     topic = Topic.find(params[:topic_id].to_i)
-
-    if SiteSetting.enable_bookmarks_with_reminders?
-      BookmarkManager.new(current_user).destroy_for_topic(topic)
-    else
-      PostAction.joins(:post)
-        .where(user_id: current_user.id)
-        .where('topic_id = ?', topic.id).each do |pa|
-
-        PostActionDestroyer.destroy(current_user, pa.post, :bookmark)
-      end
-    end
-
+    BookmarkManager.new(current_user).destroy_for_topic(topic)
     render body: nil
   end
 
@@ -552,16 +544,11 @@ class TopicsController < ApplicationController
     topic = Topic.find(params[:topic_id].to_i)
     first_post = topic.ordered_posts.first
 
-    if SiteSetting.enable_bookmarks_with_reminders?
-      bookmark_manager = BookmarkManager.new(current_user)
-      bookmark_manager.create(post_id: first_post.id)
+    bookmark_manager = BookmarkManager.new(current_user)
+    bookmark_manager.create(post_id: first_post.id)
 
-      if bookmark_manager.errors.any?
-        return render_json_error(bookmark_manager, status: 400)
-      end
-    else
-      result = PostActionCreator.create(current_user, first_post, :bookmark)
-      return render_json_error(result) if result.failed?
+    if bookmark_manager.errors.any?
+      return render_json_error(bookmark_manager, status: 400)
     end
 
     render body: nil
@@ -628,9 +615,9 @@ class TopicsController < ApplicationController
     topic = Topic.find_by(id: params[:topic_id])
 
     unless pm_has_slots?(topic)
-      return render_json_error(I18n.t("pm_reached_recipients_limit",
-        recipients_limit: SiteSetting.max_allowed_message_recipients
-      ))
+      return render_json_error(
+        I18n.t("pm_reached_recipients_limit", recipients_limit: SiteSetting.max_allowed_message_recipients)
+      )
     end
 
     if topic.private_message?
@@ -654,9 +641,9 @@ class TopicsController < ApplicationController
     )
 
     unless pm_has_slots?(topic)
-      return render_json_error(I18n.t("pm_reached_recipients_limit",
-        recipients_limit: SiteSetting.max_allowed_message_recipients
-      ))
+      return render_json_error(
+        I18n.t("pm_reached_recipients_limit", recipients_limit: SiteSetting.max_allowed_message_recipients)
+      )
     end
 
     guardian.ensure_can_invite_to!(topic)
@@ -683,7 +670,8 @@ class TopicsController < ApplicationController
 
           if group_names.present?
             json.merge!(errors: [
-              I18n.t("topic_invite.failed_to_invite",
+              I18n.t(
+                "topic_invite.failed_to_invite",
                 group_names: group_names
               )
             ])
@@ -1011,7 +999,8 @@ class TopicsController < ApplicationController
       return
     end
 
-    topic_view_serializer = TopicViewSerializer.new(@topic_view,
+    topic_view_serializer = TopicViewSerializer.new(
+      @topic_view,
       scope: guardian,
       root: false,
       include_raw: !!params[:include_raw]
diff --git a/app/jobs/scheduled/bookmark_reminder_notifications.rb b/app/jobs/scheduled/bookmark_reminder_notifications.rb
index 20ce9cb8a8..991e0d23c1 100644
--- a/app/jobs/scheduled/bookmark_reminder_notifications.rb
+++ b/app/jobs/scheduled/bookmark_reminder_notifications.rb
@@ -21,8 +21,6 @@ module Jobs
     end
 
     def execute(args = nil)
-      return if !SiteSetting.enable_bookmarks_with_reminders?
-
       bookmarks = Bookmark.pending_reminders
         .where.not(reminder_type: Bookmark.reminder_types[:at_desktop])
         .includes(:user).order('reminder_at ASC')
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index f34e58c695..2dc9733e6c 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -72,6 +72,16 @@ class Bookmark < ActiveRecord::Base
       later_this_week: 8
     )
   end
+
+  def self.count_per_day(opts = nil)
+    opts ||= {}
+    result = where('bookmarks.created_at >= ?', opts[:start_date] || (opts[:since_days_ago] || 30).days.ago)
+    result = result.where('bookmarks.created_at <= ?', opts[:end_date]) if opts[:end_date]
+    result = result.joins(:topic).merge(Topic.in_category_and_subcategories(opts[:category_id])) if opts[:category_id]
+    result.group('date(bookmarks.created_at)')
+      .order('date(bookmarks.created_at)')
+      .count
+  end
 end
 
 # == Schema Information
diff --git a/app/models/reports/bookmarks.rb b/app/models/reports/bookmarks.rb
index f4728e1f58..0844efb33d 100644
--- a/app/models/reports/bookmarks.rb
+++ b/app/models/reports/bookmarks.rb
@@ -3,5 +3,16 @@
 Report.add_report('bookmarks') do |report|
   report.icon = 'bookmark'
 
-  post_action_report report, PostActionType.types[:bookmark]
+  category_filter = report.filters.dig(:category)
+  report.add_filter('category', default: category_filter)
+
+  report.data = []
+  Bookmark.count_per_day(
+    category_id: category_filter,
+    start_date: report.start_date,
+    end_date: report.end_date
+  ).each do |date, count|
+    report.data << { x: date, y: count }
+  end
+  add_counts report, Bookmark, 'bookmarks.created_at'
 end
diff --git a/app/models/user_summary.rb b/app/models/user_summary.rb
index 52c9199577..435702d67b 100644
--- a/app/models/user_summary.rb
+++ b/app/models/user_summary.rb
@@ -117,14 +117,7 @@ class UserSummary
   end
 
   def bookmark_count
-    if SiteSetting.enable_bookmarks_with_reminders
-      Bookmark.where(user: @user).count
-    else
-      UserAction
-        .where(user: @user)
-        .where(action_type: UserAction::BOOKMARK)
-        .count
-    end
+    Bookmark.where(user: @user).count
   end
 
   def recent_time_read
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index ff880f14c3..7bf90b98eb 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -345,7 +345,7 @@ class PostSerializer < BasicPostSerializer
   end
 
   def post_bookmark
-    return nil if !SiteSetting.enable_bookmarks_with_reminders? || @topic_view.blank?
+    return nil if @topic_view.blank?
     @post_bookmark ||= @topic_view.user_post_bookmarks.find { |bookmark| bookmark.post_id == object.id }
   end
 
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 4bace8d9ed..e40dca1d9f 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -186,15 +186,11 @@ class TopicViewSerializer < ApplicationSerializer
   end
 
   def bookmarked
-    if SiteSetting.enable_bookmarks_with_reminders?
-      object.has_bookmarks?
-    else
-      object.topic_user&.bookmarked
-    end
+    object.has_bookmarks?
   end
 
   def include_bookmark_reminder_at?
-    SiteSetting.enable_bookmarks_with_reminders? && bookmarked
+    bookmarked
   end
 
   def bookmark_reminder_at
diff --git a/config/routes.rb b/config/routes.rb
index 2fc21b435e..9be2b3f44d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -585,7 +585,6 @@ Discourse::Application.routes.draw do
   put "admin/groups/:id/members" => "groups#add_members", constraints: AdminConstraint.new
 
   resources :posts do
-    put "bookmark"
     delete "bookmark", to: "posts#destroy_bookmark"
     put "wiki"
     put "post_type"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 0828616904..986fc3ba38 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -291,7 +291,7 @@ basic:
     default: false
   enable_bookmarks_with_reminders:
     client: true
-    default: false
+    default: true
     hidden: true
   enable_bookmark_at_desktop_reminders:
     client: true
diff --git a/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb b/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb
new file mode 100644
index 0000000000..092a0e7b99
--- /dev/null
+++ b/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+class CreateBookmarksFromPostActionBookmarks < ActiveRecord::Migration[6.0]
+  def up
+    SiteSetting.enable_bookmarks_with_reminders = true
+
+    bookmarks_to_create = []
+    loop do
+      # post action type id 1 is :bookmark. we do not need to OFFSET here for
+      # paging because the WHERE bookmarks.id IS NULL clause handles this effectively,
+      # because we do not get bookmarks back that have already been inserted
+      post_action_bookmarks = DB.query(
+        <<~SQL, type_id: 1
+        SELECT post_actions.id, post_actions.post_id, posts.topic_id, post_actions.user_id
+        FROM post_actions
+        INNER JOIN posts ON posts.id = post_actions.post_id
+        LEFT JOIN bookmarks ON bookmarks.post_id = post_actions.post_id AND bookmarks.user_id = post_actions.user_id
+        INNER JOIN topics ON topics.id = posts.topic_id
+        WHERE bookmarks.id IS NULL AND post_action_type_id = :type_id AND post_actions.deleted_at IS NULL AND posts.deleted_at IS NULL
+        LIMIT 2000
+        SQL
+      )
+      break if post_action_bookmarks.count.zero?
+
+      post_action_bookmarks.each do |pab|
+        now = Time.zone.now
+        bookmarks_to_create << "(#{pab.topic_id}, #{pab.post_id}, #{pab.user_id}, '#{now}', '#{now}')"
+      end
+
+      create_bookmarks(bookmarks_to_create)
+      bookmarks_to_create = []
+    end # loop
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+
+  def create_bookmarks(bookmarks_to_create)
+    return if bookmarks_to_create.empty?
+
+    # this will ignore conflicts in the bookmarks table so
+    # if the user already has a post bookmarked in the new way,
+    # then we don't error and keep on truckin'
+    #
+    # we shouldn't have duplicates here at any rate because of
+    # the above LEFT JOIN but best to be safe knowing this
+    # won't blow up
+    #
+    DB.exec(
+      <<~SQL
+      INSERT INTO bookmarks (topic_id, post_id, user_id, created_at, updated_at)
+      VALUES #{bookmarks_to_create.join(",\n")}
+      ON CONFLICT DO NOTHING
+      SQL
+    )
+  end
+end
diff --git a/lib/bookmark_reminder_notification_handler.rb b/lib/bookmark_reminder_notification_handler.rb
index 4591719fdc..3354be3949 100644
--- a/lib/bookmark_reminder_notification_handler.rb
+++ b/lib/bookmark_reminder_notification_handler.rb
@@ -52,8 +52,6 @@ class BookmarkReminderNotificationHandler
   end
 
   def self.send_at_desktop_reminder(user:, request_user_agent:)
-    return if !SiteSetting.enable_bookmarks_with_reminders
-
     return if MobileDetection.mobile_device?(request_user_agent)
 
     return if !user_has_pending_at_desktop_reminders?(user)
diff --git a/lib/search.rb b/lib/search.rb
index bcbf5107e9..ead773d097 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -381,11 +381,7 @@ class Search
 
   advanced_filter(/^in:(bookmarks)$/) do |posts, match|
     if @guardian.user
-      if SiteSetting.enable_bookmarks_with_reminders
-        posts.where("posts.id IN (SELECT post_id FROM bookmarks WHERE bookmarks.user_id = #{@guardian.user.id})")
-      else
-        post_action_type_filter(posts, PostActionType.types[:bookmark])
-      end
+      posts.where("posts.id IN (SELECT post_id FROM bookmarks WHERE bookmarks.user_id = #{@guardian.user.id})")
     end
   end
 
diff --git a/lib/tasks/bookmarks.rake b/lib/tasks/bookmarks.rake
index 833a5f8015..d3cf545d2d 100644
--- a/lib/tasks/bookmarks.rake
+++ b/lib/tasks/bookmarks.rake
@@ -9,58 +9,40 @@ require_dependency "rake_helpers"
 # You can provide a sync_limit for a smaller batch run.
 #
 desc "migrates old PostAction bookmarks to the new Bookmark model & table"
-task "bookmarks:sync_to_table", [:sync_limit] => :environment do |_t, args|
-  sync_limit = args[:sync_limit] || 0
-  post_action_bookmarks = PostAction
-    .select('post_actions.id', 'post_actions.post_id', 'posts.topic_id', 'post_actions.user_id')
-    .where(post_action_type_id: PostActionType.types[:bookmark])
-    .joins(:post)
-    .where(deleted_at: nil)
-    .joins('LEFT JOIN bookmarks ON bookmarks.post_id = post_actions.post_id AND bookmarks.user_id = post_actions.user_id')
-    .joins('INNER JOIN topics ON topics.id = posts.topic_id')
-    .where('bookmarks.id IS NULL')
-
-  # if sync_limit is provided as an argument this will cap
-  # the number of bookmarks that will be created in a run of
-  # this task (for huge bookmark count communities)
-  if sync_limit > 0
-    post_action_bookmarks = post_action_bookmarks.limit(sync_limit)
-  end
-
-  post_action_bookmark_count = post_action_bookmarks.count('post_actions.id')
-  i = 0
-
+task "bookmarks:sync_to_table" => :environment do |_t, args|
   bookmarks_to_create = []
-  post_action_bookmarks.find_each(batch_size: 2000) do |pab|
-    RakeHelpers.print_status_with_label("Creating post new bookmarks.......", i, post_action_bookmark_count)
-    now = Time.zone.now
-    bookmarks_to_create << {
-      topic_id: pab.topic_id,
-      post_id: pab.post_id,
-      user_id: pab.user_id,
-      created_at: now,
-      updated_at: now
-    }
+  loop do
+    # post action type id 1 is :bookmark. we do not need to OFFSET here for
+    # paging because the WHERE bookmarks.id IS NULL clause handles this effectively,
+    # because we do not get bookmarks back that have already been inserted
+    post_action_bookmarks = DB.query(
+      <<~SQL, type_id: 1
+        SELECT post_actions.id, post_actions.post_id, posts.topic_id, post_actions.user_id
+        FROM post_actions
+        INNER JOIN posts ON posts.id = post_actions.post_id
+        LEFT JOIN bookmarks ON bookmarks.post_id = post_actions.post_id AND bookmarks.user_id = post_actions.user_id
+        INNER JOIN topics ON topics.id = posts.topic_id
+        WHERE bookmarks.id IS NULL AND post_action_type_id = :type_id AND post_actions.deleted_at IS NULL AND posts.deleted_at IS NULL
+        LIMIT 2000
+      SQL
+    )
+    break if post_action_bookmarks.count.zero?
 
-    i += 1
-
-    # once we get to 2000 records to create, insert them all and reset
-    # the array and counter to make sure we don't have too many in memory
-    if i >= 2000
-      create_bookmarks(bookmarks_to_create)
-      i = 0
-      bookmarks_to_create = []
+    post_action_bookmarks.each do |pab|
+      now = Time.zone.now
+      bookmarks_to_create << "(#{pab.topic_id}, #{pab.post_id}, #{pab.user_id}, '#{now}', '#{now}')"
     end
-  end
 
-  # if there was < 2000 bookmarks this finishes off the last ones
-  create_bookmarks(bookmarks_to_create)
+    create_bookmarks(bookmarks_to_create)
+    bookmarks_to_create = []
+  end # loop
 
-  RakeHelpers.print_status_with_label("Bookmark creation complete!            ", i, post_action_bookmark_count)
-  puts ""
+  puts "Bookmark creation complete!"
 end
 
 def create_bookmarks(bookmarks_to_create)
+  return if bookmarks_to_create.empty?
+
   # this will ignore conflicts in the bookmarks table so
   # if the user already has a post bookmarked in the new way,
   # then we don't error and keep on truckin'
@@ -68,5 +50,12 @@ def create_bookmarks(bookmarks_to_create)
   # we shouldn't have duplicates here at any rate because of
   # the above LEFT JOIN but best to be safe knowing this
   # won't blow up
-  Bookmark.insert_all(bookmarks_to_create)
+  #
+  DB.exec(
+    <<~SQL
+      INSERT INTO bookmarks (topic_id, post_id, user_id, created_at, updated_at)
+      VALUES #{bookmarks_to_create.join(",\n")}
+      ON CONFLICT DO NOTHING
+    SQL
+  )
 end
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
index 89afd4eb87..072c54beaf 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
@@ -238,11 +238,7 @@ module DiscourseNarrativeBot
       return unless @post.user_id == self.discobot_user.id
 
       profile_page_url = url_helpers(:user_url, username: @user.username)
-      bookmark_url = if SiteSetting.enable_bookmarks_with_reminders?
-        "#{profile_page_url}/activity/bookmarks-with-reminders"
-      else
-        "#{profile_page_url}/activity/bookmarks"
-      end
+      bookmark_url = "#{profile_page_url}/activity/bookmarks-with-reminders"
       raw = <<~RAW
         #{I18n.t("#{I18N_KEY}.bookmark.reply", i18n_post_args(bookmark_url: bookmark_url))}
 
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index 3acbcc7a92..29766f640e 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -241,10 +241,8 @@ after_initialize do
   end
 
   self.add_model_callback(Bookmark, :after_commit, on: :create) do
-    if SiteSetting.enable_bookmarks_with_reminders?
-      if self.post && self.user.enqueue_narrative_bot_job?
-        Jobs.enqueue(:bot_input, user_id: self.user_id, post_id: self.post_id, input: :bookmark)
-      end
+    if self.post && self.user.enqueue_narrative_bot_job?
+      Jobs.enqueue(:bot_input, user_id: self.user_id, post_id: self.post_id, input: :bookmark)
     end
   end
 
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
index 43ff1ac52a..d875de3b10 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
@@ -247,26 +247,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
         end
       end
 
-      it 'should create the right reply' do
-        post.update!(user: discobot_user)
-        narrative.expects(:enqueue_timeout_job).with(user)
-
-        narrative.input(:bookmark, user, post: post)
-        new_post = Post.last
-        profile_page_url = "#{Discourse.base_url}/u/#{user.username}"
-
-        expected_raw = <<~RAW
-          #{I18n.t('discourse_narrative_bot.new_user_narrative.bookmark.reply', bookmark_url: "#{profile_page_url}/activity/bookmarks", base_uri: '')}
-
-          #{I18n.t('discourse_narrative_bot.new_user_narrative.onebox.instructions', base_uri: '')}
-        RAW
-
-        expect(new_post.raw).to eq(expected_raw.chomp)
-        expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_onebox)
-      end
-
       it 'should create the right reply when bookmarks with reminders are enabled' do
-        SiteSetting.enable_bookmarks_with_reminders = true
         post.update!(user: discobot_user)
         narrative.expects(:enqueue_timeout_job).with(user)
 
diff --git a/spec/jobs/bookmark_reminder_notifications_spec.rb b/spec/jobs/bookmark_reminder_notifications_spec.rb
index 92ae100020..58f7262503 100644
--- a/spec/jobs/bookmark_reminder_notifications_spec.rb
+++ b/spec/jobs/bookmark_reminder_notifications_spec.rb
@@ -18,7 +18,6 @@ RSpec.describe Jobs::BookmarkReminderNotifications do
   end
 
   before do
-    SiteSetting.enable_bookmarks_with_reminders = true
     # this is done to avoid model validations on Bookmark
     bookmark1.update_column(:reminder_at, five_minutes_ago - 10.minutes)
     bookmark2.update_column(:reminder_at, five_minutes_ago - 5.minutes)
@@ -63,14 +62,6 @@ RSpec.describe Jobs::BookmarkReminderNotifications do
     expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq('1')
   end
 
-  context "when the bookmark with reminder site setting is disabled" do
-    it "does nothing" do
-      Bookmark.expects(:where).never
-      SiteSetting.enable_bookmarks_with_reminders = false
-      subject.execute
-    end
-  end
-
   context "when one of the bookmark reminder types is at_desktop" do
     let(:bookmark1) { Fabricate(:bookmark, reminder_type: :at_desktop) }
     it "is not included in the run, because it is not time-based" do
diff --git a/spec/lib/bookmark_reminder_notification_handler_spec.rb b/spec/lib/bookmark_reminder_notification_handler_spec.rb
index 8cc1c4b637..318a52429a 100644
--- a/spec/lib/bookmark_reminder_notification_handler_spec.rb
+++ b/spec/lib/bookmark_reminder_notification_handler_spec.rb
@@ -8,7 +8,6 @@ RSpec.describe BookmarkReminderNotificationHandler do
   fab!(:user) { Fabricate(:user) }
 
   before do
-    SiteSetting.enable_bookmarks_with_reminders = true
     Discourse.redis.flushall
   end
 
@@ -89,17 +88,6 @@ RSpec.describe BookmarkReminderNotificationHandler do
       end
     end
 
-    context "when enable bookmarks with reminders is disabled" do
-      before do
-        SiteSetting.enable_bookmarks_with_reminders = false
-      end
-
-      it "does nothing" do
-        BrowserDetection.expects(:device).never
-        send_reminder
-      end
-    end
-
     def send_reminder
       subject.send_at_desktop_reminder(user: user, request_user_agent: user_agent)
     end
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index cb654a08c6..984297dadb 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -124,11 +124,11 @@ RSpec.describe Admin::UsersController do
   end
 
   describe '#suspend' do
-    fab!(:post) { Fabricate(:post) }
+    fab!(:created_post) { Fabricate(:post) }
     let(:suspend_params) do
       { suspend_until: 5.hours.from_now,
         reason: "because of this post",
-        post_id: post.id }
+        post_id: created_post.id }
     end
 
     it "works properly" do
@@ -156,13 +156,13 @@ RSpec.describe Admin::UsersController do
         expect(response.status).to eq(200)
 
         log = UserHistory.where(target_user_id: user.id).order('id desc').first
-        expect(log.post_id).to eq(post.id)
+        expect(log.post_id).to eq(created_post.id)
       end
 
       it "can delete an associated post" do
         put "/admin/users/#{user.id}/suspend.json", params: suspend_params.merge(post_action: 'delete')
-        post.reload
-        expect(post.deleted_at).to be_present
+        created_post.reload
+        expect(created_post.deleted_at).to be_present
         expect(response.status).to eq(200)
       end
 
@@ -200,17 +200,17 @@ RSpec.describe Admin::UsersController do
         reply = PostCreator.create(
           Fabricate(:user),
           raw: 'this is the reply text',
-          reply_to_post_number: post.post_number,
-          topic_id: post.topic_id
+          reply_to_post_number: created_post.post_number,
+          topic_id: created_post.topic_id
         )
         nested_reply = PostCreator.create(
           Fabricate(:user),
           raw: 'this is the reply text2',
           reply_to_post_number: reply.post_number,
-          topic_id: post.topic_id
+          topic_id: created_post.topic_id
         )
         put "/admin/users/#{user.id}/suspend.json", params: suspend_params.merge(post_action: 'delete_replies')
-        expect(post.reload.deleted_at).to be_present
+        expect(created_post.reload.deleted_at).to be_present
         expect(reply.reload.deleted_at).to be_present
         expect(nested_reply.reload.deleted_at).to be_present
         expect(response.status).to eq(200)
@@ -223,9 +223,9 @@ RSpec.describe Admin::UsersController do
         )
 
         expect(response.status).to eq(200)
-        post.reload
-        expect(post.deleted_at).to be_blank
-        expect(post.raw).to eq("this is the edited content")
+        created_post.reload
+        expect(created_post.deleted_at).to be_blank
+        expect(created_post.raw).to eq("this is the edited content")
         expect(response.status).to eq(200)
       end
     end
@@ -252,9 +252,8 @@ RSpec.describe Admin::UsersController do
 
     it "also prevents use of any api keys" do
       api_key = Fabricate(:api_key, user: user)
-
-      put "/posts/#{Fabricate(:post).id}/bookmark.json", params: {
-        bookmarked: "true"
+      post "/bookmarks.json", params: {
+        post_id: Fabricate(:post).id
       }, headers: { HTTP_API_KEY: api_key.key }
       expect(response.status).to eq(200)
 
@@ -264,10 +263,9 @@ RSpec.describe Admin::UsersController do
       user.reload
       expect(user).to be_suspended
 
-      put "/posts/#{Fabricate(:post).id}/bookmark.json", params: {
-        bookmarked: "true",
-        api_key: api_key.key
-      }
+      post "/bookmarks.json", params: {
+        post_id: Fabricate(:post).id
+      }, headers: { HTTP_API_KEY: api_key.key }
       expect(response.status).to eq(403)
     end
   end
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 09cefae4a0..af25d9c000 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -482,131 +482,6 @@ describe PostsController do
     end
   end
 
-  describe '#bookmark' do
-    include_examples 'action requires login', :put, "/posts/2/bookmark.json"
-    let!(:post) { post_by_user }
-
-    describe 'when logged in' do
-      before do
-        sign_in(user)
-      end
-
-      fab!(:private_message) { Fabricate(:private_message_post) }
-
-      it "raises an error if the user doesn't have permission to see the post" do
-        put "/posts/#{private_message.id}/bookmark.json", params: { bookmarked: "true" }
-        expect(response).to be_forbidden
-      end
-
-      it 'creates a bookmark' do
-        put "/posts/#{post.id}/bookmark.json", params: { bookmarked: "true" }
-        expect(response.status).to eq(200)
-
-        post_action = PostAction.find_by(user: user, post: post)
-        expect(post_action.post_action_type_id).to eq(PostActionType.types[:bookmark])
-      end
-
-      context "removing a bookmark" do
-        let(:post_action) { PostActionCreator.create(user, post, :bookmark).post_action }
-
-        it "returns the right response when post is not bookmarked" do
-          put "/posts/#{post_by_user.id}/bookmark.json"
-          expect(response.status).to eq(404)
-        end
-
-        it "should be able to remove a bookmark" do
-          post_action
-          put "/posts/#{post.id}/bookmark.json"
-
-          expect(PostAction.find_by(id: post_action.id)).to eq(nil)
-        end
-
-        describe "when user doesn't have permission to see bookmarked post" do
-          it "should still be able to remove a bookmark" do
-            post_action
-            post = post_action.post
-            topic = post.topic
-            topic.convert_to_private_message(admin)
-            topic.remove_allowed_user(admin, user.username)
-
-            expect(Guardian.new(user).can_see_post?(post.reload)).to eq(false)
-
-            put "/posts/#{post.id}/bookmark.json"
-
-            expect(PostAction.find_by(id: post_action.id)).to eq(nil)
-          end
-        end
-
-        describe "when post has been deleted" do
-          it "should still be able to remove a bookmark" do
-            post = post_action.post
-            post.trash!
-
-            put "/posts/#{post.id}/bookmark.json"
-
-            expect(PostAction.find_by(id: post_action.id)).to eq(nil)
-          end
-        end
-      end
-    end
-
-    context "api" do
-      let(:api_key) { Fabricate(:api_key, user: user) }
-      let(:master_key) { Fabricate(:api_key, user: nil) }
-
-      # choosing an arbitrarily easy to mock trusted activity
-      it 'allows users with api key to bookmark posts' do
-        put "/posts/#{post.id}/bookmark.json",
-          params: { bookmarked: "true" },
-          headers: { HTTP_API_KEY: api_key.key }
-
-        expect(response.status).to eq(200)
-        expect(PostAction.where(
-          post: post,
-          user: user,
-          post_action_type_id: PostActionType.types[:bookmark]
-        ).count).to eq(1)
-      end
-
-      it 'raises an error with a user key that does not match an optionally specified username' do
-        put "/posts/#{post.id}/bookmark.json",
-          params: { bookmarked: "true" },
-          headers: { HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: 'made_up' }
-
-        expect(response.status).to eq(403)
-      end
-
-      it 'allows users with a master api key to bookmark posts' do
-        put "/posts/#{post.id}/bookmark.json",
-          params: { bookmarked: "true" },
-          headers: { HTTP_API_KEY: master_key.key, HTTP_API_USERNAME: user.username }
-
-        expect(response.status).to eq(200)
-        expect(PostAction.where(
-          post: post,
-          user: user,
-          post_action_type_id: PostActionType.types[:bookmark]
-        ).count).to eq(1)
-      end
-
-      it 'disallows phonies to bookmark posts' do
-        put "/posts/#{post.id}/bookmark.json",
-          params: { bookmarked: "true" },
-          headers: { HTTP_API_KEY: SecureRandom.hex(32), HTTP_API_USERNAME: user.username }
-
-        expect(response.status).to eq(403)
-      end
-
-      it 'disallows blank api' do
-        put "/posts/#{post.id}/bookmark.json",
-          params: { bookmarked: "true" },
-          headers: { HTTP_API_KEY: "", HTTP_API_USERNAME: user.username }
-
-        expect(response.status).to eq(403)
-      end
-    end
-  end
-
   describe '#wiki' do
     include_examples "action requires login", :put, "/posts/2/wiki.json"
 
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 751c8bf88b..e48a2f9483 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -2346,19 +2346,15 @@ RSpec.describe TopicsController do
 
   describe '#remove_bookmarks' do
     it "should remove bookmarks properly from non first post" do
-      bookmark = PostActionType.types[:bookmark]
       sign_in(user)
 
       post = create_post
       post2 = create_post(topic_id: post.topic_id)
-
-      PostActionCreator.new(user, post2, bookmark).perform
-
-      put "/t/#{post.topic_id}/bookmark.json"
-      expect(PostAction.where(user_id: user.id, post_action_type: bookmark).count).to eq(2)
+      Fabricate(:bookmark, user: user, post: post)
+      Fabricate(:bookmark, user: user, post: post2)
 
       put "/t/#{post.topic_id}/remove_bookmarks.json"
-      expect(PostAction.where(user_id: user.id, post_action_type: bookmark).count).to eq(0)
+      expect(Bookmark.where(user: user).count).to eq(0)
     end
 
     it "should disallow bookmarks on posts you have no access to" do
@@ -2369,10 +2365,7 @@ RSpec.describe TopicsController do
       expect(response).to be_forbidden
     end
 
-    context "when SiteSetting.enable_bookmarks_with_reminders is true" do
-      before do
-        SiteSetting.enable_bookmarks_with_reminders = true
-      end
+    context "bookmarks with reminders" do
       it "deletes all the bookmarks for the user in the topic" do
         sign_in(user)
         post = create_post
@@ -2388,26 +2381,23 @@ RSpec.describe TopicsController do
       sign_in(user)
     end
 
-    it "should create a new post action for the bookmark on the first post of the topic" do
+    it "should create a new bookmark on the first post of the topic" do
       post = create_post
       post2 = create_post(topic_id: post.topic_id)
       put "/t/#{post.topic_id}/bookmark.json"
 
-      expect(PostAction.find_by(user_id: user.id, post_action_type: PostActionType.types[:bookmark]).post_id).to eq(post.id)
+      expect(Bookmark.find_by(user_id: user.id).post_id).to eq(post.id)
     end
 
     it "errors if the topic is already bookmarked for the user" do
       post = create_post
-      PostActionCreator.new(user, post, PostActionType.types[:bookmark]).perform
+      Bookmark.create(post: post, user: user, topic: post.topic)
 
       put "/t/#{post.topic_id}/bookmark.json"
-      expect(response).to be_forbidden
+      expect(response.status).to eq(400)
     end
 
-    context "when SiteSetting.enable_bookmarks_with_reminders is true" do
-      before do
-        SiteSetting.enable_bookmarks_with_reminders = true
-      end
+    context "bookmarks with reminders" do
       it "should create a new bookmark on the first post of the topic" do
         post = create_post
         post2 = create_post(topic_id: post.topic_id)
diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb
index a438a06ea9..8791db56c6 100644
--- a/spec/serializers/post_serializer_spec.rb
+++ b/spec/serializers/post_serializer_spec.rb
@@ -254,11 +254,7 @@ describe PostSerializer do
     context "when a Bookmark record exists for the user on the post" do
       let!(:bookmark) { Fabricate(:bookmark_next_business_day_reminder, user: current_user, post: post) }
 
-      context "when the site setting for bookmarks with reminders is enabled" do
-        before do
-          SiteSetting.enable_bookmarks_with_reminders = true
-        end
-
+      context "bookmarks with reminders" do
         it "returns true" do
           expect(serialized.as_json[:bookmarked_with_reminder]).to eq(true)
         end
@@ -275,16 +271,6 @@ describe PostSerializer do
           end
         end
       end
-
-      context "when the site setting for bookmarks with reminders is disabled" do
-        it "does not return the bookmarked_with_reminder attribute" do
-          expect(serialized.as_json.key?(:bookmarked_with_reminder)).to eq(false)
-        end
-
-        it "does not return the bookmark_reminder_at attribute" do
-          expect(serialized.as_json.key?(:bookmark_reminder_at)).to eq(false)
-        end
-      end
     end
   end
 
diff --git a/spec/tasks/bookmarks_spec.rb b/spec/tasks/bookmarks_spec.rb
index 91249c59f8..c7b2c65bf6 100644
--- a/spec/tasks/bookmarks_spec.rb
+++ b/spec/tasks/bookmarks_spec.rb
@@ -38,11 +38,6 @@ RSpec.describe "bookmarks tasks" do
     expect(Bookmark.where(post: post1, user: user1).count).to eq(1)
   end
 
-  it "respects the sync_limit if provided and stops creating bookmarks at the limit (so this can be run progrssively" do
-    invoke_task(1)
-    expect(Bookmark.all.count).to eq(1)
-  end
-
   it "skips post actions where the post topic no longer exists and does not error" do
     post1.topic.delete
     post1.reload
diff --git a/test/javascripts/acceptance/topic-test.js b/test/javascripts/acceptance/topic-test.js
index b5e2684e6f..b7edc5cc95 100644
--- a/test/javascripts/acceptance/topic-test.js
+++ b/test/javascripts/acceptance/topic-test.js
@@ -397,10 +397,7 @@ QUnit.test(
 );
 
 acceptance("Topic + Post Bookmarks with Reminders", {
-  loggedIn: true,
-  settings: {
-    enable_bookmarks_with_reminders: true
-  }
+  loggedIn: true
 });
 
 QUnit.test("Bookmarks Modal", async assert => {
diff --git a/test/javascripts/controllers/preferences-account-test.js b/test/javascripts/controllers/preferences-account-test.js
index f953fb0332..f79642e2bd 100644
--- a/test/javascripts/controllers/preferences-account-test.js
+++ b/test/javascripts/controllers/preferences-account-test.js
@@ -12,7 +12,7 @@ QUnit.test("updating of associated accounts", function(assert) {
       is_anonymous: true
     }),
     currentUser: EmberObject.create({
-      id: 1234,
+      id: 1234
     }),
     site: EmberObject.create({
       isMobileDevice: false
diff --git a/test/javascripts/fixtures/user_fixtures.js b/test/javascripts/fixtures/user_fixtures.js
index f6a2f87050..b22180109d 100644
--- a/test/javascripts/fixtures/user_fixtures.js
+++ b/test/javascripts/fixtures/user_fixtures.js
@@ -397,6 +397,34 @@ export default {
       featured_user_badge_ids: [5870, 40673, 5868]
     }
   },
+  "/u/eviltrout/bookmarks.json": {
+    user_bookmark_list: {
+      bookmarks: [
+        {
+          excerpt: "Here this is my new topic where I yell.",
+          tags: [],
+          id: 576,
+          created_at: "2020-04-07T05:30:40.446Z",
+          topic_id: 119,
+          linked_post_number: 1,
+          post_id: 281,
+          name: "test",
+          reminder_at: null,
+          title: "Yelling topic title :/",
+          deleted: false,
+          hidden: false,
+          category_id: 1,
+          closed: false,
+          archived: false,
+          archetype: "regular",
+          highest_post_number: 5,
+          bumped_at: "2020-04-06T05:20:00.172Z",
+          slug: "yelling-topic-title",
+          username: "someguy"
+        }
+      ]
+    }
+  },
   "/user_actions.json": {
     user_actions: [
       {
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index c39424b0df..bf55374eb8 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -31,7 +31,6 @@ Discourse.SiteSettingsOriginal = {
   allow_new_registrations: true,
   enable_google_logins: true,
   enable_google_oauth2_logins: false,
-  enable_bookmarks_with_reminders: false,
   enable_twitter_logins: true,
   enable_facebook_logins: true,
   enable_github_logins: true,
diff --git a/test/javascripts/widgets/post-test.js b/test/javascripts/widgets/post-test.js
index 7c19c715e6..b7131fc2a5 100644
--- a/test/javascripts/widgets/post-test.js
+++ b/test/javascripts/widgets/post-test.js
@@ -532,19 +532,19 @@ widgetTest("can't bookmark", {
 
 widgetTest("bookmark", {
   template:
-    '{{mount-widget widget="post" args=args toggleBookmark=(action "toggleBookmark")}}',
+    '{{mount-widget widget="post" args=args toggleBookmarkWithReminder=(action "toggleBookmarkWithReminder")}}',
   beforeEach() {
     const args = { canBookmark: true };
 
     this.set("args", args);
-    this.on("toggleBookmark", () => (args.bookmarked = true));
+    this.on(
+      "toggleBookmarkWithReminder",
+      () => (args.bookmarked_with_reminder = true)
+    );
   },
   async test(assert) {
     assert.equal(find(".post-menu-area .bookmark").length, 1);
     assert.equal(find("button.bookmarked").length, 0);
-
-    await click("button.bookmark");
-    assert.equal(find("button.bookmarked").length, 1);
   }
 });
 
diff --git a/test/javascripts/widgets/user-menu-test.js b/test/javascripts/widgets/user-menu-test.js
index 35d73a8542..39f2a33722 100644
--- a/test/javascripts/widgets/user-menu-test.js
+++ b/test/javascripts/widgets/user-menu-test.js
@@ -145,11 +145,9 @@ widgetTest("bookmarks", {
     const bookmark = find(".quick-access-panel li a")[0];
     assert.ok(bookmark);
 
+    assert.ok(bookmark.href.includes("/t/yelling-topic-title/119"));
     assert.ok(
-      bookmark.href.includes("/t/how-to-check-the-user-level-via-ajax/11993")
-    );
-    assert.ok(
-      bookmark.innerHTML.includes("Abhishek_Gupta"),
+      bookmark.innerHTML.includes("someguy"),
       "should include the last poster's username"
     );
     assert.ok(

From c028e1aca73500298da7c3503c1c726b43c52776 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 22 Apr 2020 12:08:59 +0530
Subject: [PATCH 0712/1830] FIX: use absolute url for `/user_avatar/` links

---
 app/helpers/application_helper.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 598d37a954..baee16fc8e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -502,6 +502,8 @@ module ApplicationHelper
       absolute_url = "#{Discourse.base_url}#{link}"
     elsif link.start_with?("/images/")
       absolute_url = "#{Discourse.base_url}#{link}"
+    elsif link.start_with?("/user_avatar/")
+      absolute_url = "#{Discourse.base_url}#{link}"
     elsif GlobalSetting.relative_url_root && link.start_with?(GlobalSetting.relative_url_root)
       absolute_url = "#{Discourse.base_url_no_prefix}#{link}"
     end

From ee63c35c357c6bea8764ea59e7784dbc996f5f5a Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 22 Apr 2020 12:25:59 +0530
Subject: [PATCH 0713/1830] DEV: use array for matching multiple values

---
 app/helpers/application_helper.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index baee16fc8e..00422273bb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -495,14 +495,10 @@ module ApplicationHelper
 
   def get_absolute_image_url(link)
     absolute_url = link
-    if link.start_with?("//")
+    if link.start_with?('//')
       uri = URI(Discourse.base_url)
       absolute_url = "#{uri.scheme}:#{link}"
-    elsif link.start_with?("/uploads/")
-      absolute_url = "#{Discourse.base_url}#{link}"
-    elsif link.start_with?("/images/")
-      absolute_url = "#{Discourse.base_url}#{link}"
-    elsif link.start_with?("/user_avatar/")
+    elsif link.start_with?('/uploads/', '/images/', '/user_avatar/')
       absolute_url = "#{Discourse.base_url}#{link}"
     elsif GlobalSetting.relative_url_root && link.start_with?(GlobalSetting.relative_url_root)
       absolute_url = "#{Discourse.base_url_no_prefix}#{link}"

From 13956017dac3bd22b8ad2f14add6dc294b29621b Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Wed, 22 Apr 2020 14:57:29 +0800
Subject: [PATCH 0714/1830] Update lefthook.

Support for `LEFTHOOK=0` was broken in the old version. See commit 3a6522ed6307e995a86179488b01dab22146502d of lefthook.
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e9a942667b..978b1d5d15 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,9 +3,9 @@
 
 
 "@arkweid/lefthook@^0.6.3":
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/@arkweid/lefthook/-/lefthook-0.6.3.tgz#59ed1e2861ec924181b40c4edd8f60c720df42f6"
-  integrity sha512-mKtMBRAs2YgH9J49KogVSAJWI9WJQdJkoH8LfMfHNs+foDOgLqFLEngPI8XiekHupHDH6YF5ZInbvm2ndc2uug==
+  version "0.6.7"
+  resolved "https://registry.yarnpkg.com/@arkweid/lefthook/-/lefthook-0.6.7.tgz#a3509532830c58319f88ec9264c49190b56bb8fb"
+  integrity sha512-UAsXrRpiRRlOC5B2E6Lfg8QpvPouBrtOsLGlUXRHkJNkrDX69ouh+rUwj+o1N/Nf0lCgvOlj04NFayQyu3u4ew==
 
 "@babel/code-frame@7.0.0-beta.44":
   version "7.0.0-beta.44"

From a511bea4cc3f50bd1e067a46bdbf5cd19eb335a3 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 22 Apr 2020 14:07:51 +0530
Subject: [PATCH 0715/1830] FEATURE: admin UI to merge two users. (#9509)

---
 .../admin/controllers/admin-user-index.js     | 22 +++++++++++
 .../modals/admin-merge-users-confirmation.js  | 35 ++++++++++++++++++
 .../modals/admin-merge-users-prompt.js        | 29 +++++++++++++++
 .../javascripts/admin/models/admin-user.js    | 37 +++++++++++++++++++
 .../modal/admin-merge-users-confirmation.hbs  | 21 +++++++++++
 .../modal/admin-merge-users-prompt.hbs        | 24 ++++++++++++
 .../admin/templates/user-index.hbs            |  6 ++-
 app/controllers/admin/users_controller.rb     | 14 +++++++
 app/services/user_merger.rb                   |  2 +
 config/locales/client.en.yml                  | 26 +++++++++++++
 config/routes.rb                              |  1 +
 lib/guardian/user_guardian.rb                 |  4 ++
 spec/requests/admin/users_controller_spec.rb  | 18 +++++++++
 13 files changed, 238 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js
 create mode 100644 app/assets/javascripts/admin/controllers/modals/admin-merge-users-prompt.js
 create mode 100644 app/assets/javascripts/admin/templates/modal/admin-merge-users-confirmation.hbs
 create mode 100644 app/assets/javascripts/admin/templates/modal/admin-merge-users-prompt.hbs

diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js b/app/assets/javascripts/admin/controllers/admin-user-index.js
index 7bd7abe341..f69993c185 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js
@@ -9,6 +9,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
 import { htmlSafe } from "@ember/template";
+import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend(CanCheckEmails, {
   adminTools: service(),
@@ -207,6 +208,27 @@ export default Controller.extend(CanCheckEmails, {
       }
     },
 
+    promptTargetUser() {
+      showModal("admin-merge-users-prompt", {
+        admin: true,
+        model: this.model
+      });
+    },
+
+    showMergeConfirmation(targetUsername) {
+      showModal("admin-merge-users-confirmation", {
+        admin: true,
+        model: {
+          username: this.model.username,
+          targetUsername: targetUsername
+        }
+      });
+    },
+
+    merge(targetUsername) {
+      return this.model.merge({ targetUsername: targetUsername });
+    },
+
     viewActionLogs() {
       this.adminTools.showActionLogs(this, {
         target_user: this.get("model.username")
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js b/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js
new file mode 100644
index 0000000000..2195c29631
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js
@@ -0,0 +1,35 @@
+import Controller, { inject as controller } from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import discourseComputed from "discourse-common/utils/decorators";
+import { alias } from "@ember/object/computed";
+
+export default Controller.extend(ModalFunctionality, {
+  adminUserIndex: controller(),
+  username: alias("model.username"),
+  targetUsername: alias("model.targetUsername"),
+
+  onShow() {
+    this.set("value", null);
+  },
+
+  @discourseComputed("username", "targetUsername")
+  text(username, targetUsername) {
+    return `transfer @${username} to @${targetUsername}`;
+  },
+
+  @discourseComputed("value", "text")
+  mergeDisabled(value, text) {
+    return !value || text !== value;
+  },
+
+  actions: {
+    merge() {
+      this.adminUserIndex.send("merge", this.targetUsername);
+      this.send("closeModal");
+    },
+
+    cancel() {
+      this.send("closeModal");
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-merge-users-prompt.js b/app/assets/javascripts/admin/controllers/modals/admin-merge-users-prompt.js
new file mode 100644
index 0000000000..535870cd6f
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/modals/admin-merge-users-prompt.js
@@ -0,0 +1,29 @@
+import Controller, { inject as controller } from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import discourseComputed from "discourse-common/utils/decorators";
+import { alias } from "@ember/object/computed";
+
+export default Controller.extend(ModalFunctionality, {
+  adminUserIndex: controller(),
+  username: alias("model.username"),
+
+  onShow() {
+    this.set("targetUsername", null);
+  },
+
+  @discourseComputed("username", "targetUsername")
+  mergeDisabled(username, targetUsername) {
+    return !targetUsername || username === targetUsername;
+  },
+
+  actions: {
+    merge() {
+      this.send("closeModal");
+      this.adminUserIndex.send("showMergeConfirmation", this.targetUsername);
+    },
+
+    cancel() {
+      this.send("closeModal");
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/models/admin-user.js b/app/assets/javascripts/admin/models/admin-user.js
index 25a822f388..454daf4b19 100644
--- a/app/assets/javascripts/admin/models/admin-user.js
+++ b/app/assets/javascripts/admin/models/admin-user.js
@@ -503,6 +503,43 @@ const AdminUser = User.extend({
     bootbox.dialog(message, buttons, { classes: "delete-user-modal" });
   },
 
+  merge(opts) {
+    const user = this;
+    const location = document.location.pathname;
+
+    bootbox.dialog(I18n.t("admin.user.merging_user"));
+    let formData = { context: location };
+
+    if (opts && opts.targetUsername) {
+      formData["target_username"] = opts.targetUsername;
+    }
+
+    return ajax(`/admin/users/${user.get("id")}/merge.json`, {
+      type: "POST",
+      data: formData
+    })
+      .then(function(data) {
+        if (data.merged) {
+          if (/^\/admin\/users\/list\//.test(location)) {
+            document.location = location;
+          } else {
+            document.location = Discourse.getURL(
+              `/admin/users/${data.user.id}/${data.user.username}`
+            );
+          }
+        } else {
+          bootbox.alert(I18n.t("admin.user.merge_failed"));
+          if (data.user) {
+            user.setProperties(data.user);
+          }
+        }
+      })
+      .catch(function() {
+        AdminUser.find(user.get("id")).then(u => user.setProperties(u));
+        bootbox.alert(I18n.t("admin.user.merge_failed"));
+      });
+  },
+
   loadDetails() {
     if (this.loadedDetails) {
       return Promise.resolve(this);
diff --git a/app/assets/javascripts/admin/templates/modal/admin-merge-users-confirmation.hbs b/app/assets/javascripts/admin/templates/modal/admin-merge-users-confirmation.hbs
new file mode 100644
index 0000000000..119cd3ad08
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/modal/admin-merge-users-confirmation.hbs
@@ -0,0 +1,21 @@
+<div>
+  {{#d-modal-body rawTitle=(i18n "admin.user.merge.confirmation.title" username=username)}}
+    <p>{{html-safe (i18n "admin.user.merge.confirmation.description" username=username targetUsername=targetUsername text=text)}}</p>
+    {{input type="text" value=value}}
+  {{/d-modal-body}}
+
+  <div class="modal-footer">
+    {{#d-button
+      class="btn-danger"
+      action=(action "merge")
+      icon="trash-alt"
+      disabled=mergeDisabled
+    }}
+      {{i18n "admin.user.merge.confirmation.transfer_and_delete" username=username}}
+    {{/d-button}}
+    {{d-button
+      action=(action "cancel")
+      label="admin.user.merge.confirmation.cancel"
+    }}
+  </div>
+</div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-merge-users-prompt.hbs b/app/assets/javascripts/admin/templates/modal/admin-merge-users-prompt.hbs
new file mode 100644
index 0000000000..69bdd69403
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/modal/admin-merge-users-prompt.hbs
@@ -0,0 +1,24 @@
+<div>
+  {{#d-modal-body rawTitle=(i18n "admin.user.merge.prompt.title" username=username)}}
+    <p>{{html-safe (i18n "admin.user.merge.prompt.description" username=username)}}</p>
+    {{user-selector single=true
+                    placeholderKey="admin.user.merge.prompt.target_username_placeholder"
+                    usernames=targetUsername
+                    autocomplete="discourse"}}
+  {{/d-modal-body}}
+
+  <div class="modal-footer">
+    {{#d-button
+      class="btn-primary"
+      action=(action "merge")
+      icon="trash-alt"
+      disabled=mergeDisabled
+    }}
+      {{i18n "admin.user.merge.prompt.transfer_and_delete" username=username}}
+    {{/d-button}}
+    {{d-button
+      action=(action "cancel")
+      label="admin.user.merge.prompt.cancel"
+    }}
+  </div>
+</div>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index c23c88a3d6..76aee47271 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -680,9 +680,13 @@
 
     {{#if model.canBeDeleted}}
       {{d-button label="admin.user.delete"
-                 icon="exclamation-triangle"
+                 icon="trash-alt"
                  class="btn-danger"
                  action=(action "destroy")}}
+      {{d-button label="admin.user.merge.transfer_and_delete"
+                 icon="trash-alt"
+                 class="btn-danger"
+                 action=(action "promptTargetUser")}}
     {{/if}}
   </div>
 
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index a02ab11dac..4ed8a10a0f 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -20,6 +20,7 @@ class Admin::UsersController < Admin::AdminController
                                     :remove_group,
                                     :primary_group,
                                     :anonymize,
+                                    :merge,
                                     :reset_bounce_score,
                                     :disable_second_factor,
                                     :delete_posts_batch]
@@ -471,6 +472,19 @@ class Admin::UsersController < Admin::AdminController
     end
   end
 
+  def merge
+    target_username = params.require(:target_username)
+    target_user = User.find_by_username(target_username)
+
+    guardian.ensure_can_merge_user!(@user, target_user)
+
+    if user = UserMerger.new(@user, target_user, current_user).merge!
+      render json: success_json.merge(merged: true, user: user)
+    else
+      render json: failed_json.merge(user: AdminDetailedUserSerializer.new(@user, root: false).as_json)
+    end
+  end
+
   def reset_bounce_score
     guardian.ensure_can_reset_bounce_score!(@user)
     @user.user_stat&.reset_bounce_score!
diff --git a/app/services/user_merger.rb b/app/services/user_merger.rb
index 25bf412625..b576eea853 100644
--- a/app/services/user_merger.rb
+++ b/app/services/user_merger.rb
@@ -24,6 +24,8 @@ class UserMerger
     delete_source_user
     delete_source_user_references
     log_merge
+
+    @target_user.reload
   end
 
   protected
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 1d881a1779..39951e2b84 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4334,6 +4334,32 @@ en:
         anonymize_yes: "Yes, anonymize this account"
         anonymize_failed: "There was a problem anonymizing the account."
         delete: "Delete User"
+        merge:
+          transfer_and_delete: "Transfer & Delete"
+          prompt:
+            title: "Transfer & Delete @%{username}"
+            description: |
+              <p>Please choose a new owner for <b>@%{username}'s</b> content.</p>
+
+              <p>All topics, posts, messages and other content created by <b>@%{username}</b> will be transferred.</p>
+
+            target_username_placeholder: "Username of new owner"
+            transfer_and_delete: "Transfer & Delete @%{username}"
+            cancel: "Cancel"
+          confirmation:
+            title: "Transfer & Delete @%{username}"
+            description: |
+              <p>All of <b>@%{username}'s</b> content will be transferred and attributed to <b>@%{targetUsername}</b>. After the content is transferred, <b>@%{username}'s</b> account will be deleted.</p>
+
+              <p><b>This can not be undone!</b></p>
+
+              <p>To continue type: <code>%{text}</code></p>
+
+            transfer_and_delete: "Transfer & Delete @%{username}"
+            cancel: "Cancel"
+
+        merging_user: "Merging user..."
+        merge_failed: "There was an error while merging the users."
         delete_forbidden_because_staff: "Admins and moderators can't be deleted."
         delete_posts_forbidden_because_staff: "Can't delete all posts of admins and moderators."
         delete_forbidden:
diff --git a/config/routes.rb b/config/routes.rb
index 9be2b3f44d..c98b6b3edb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -137,6 +137,7 @@ Discourse::Application.routes.draw do
       get "leader_requirements" => "users#tl3_requirements"
       get "tl3_requirements"
       put "anonymize"
+      post "merge"
       post "reset_bounce_score"
       put "disable_second_factor"
     end
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index ecdff65838..1461c69d69 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -76,6 +76,10 @@ module UserGuardian
     is_staff? && !user.nil? && !user.staff?
   end
 
+  def can_merge_user?(source_user, target_user)
+    is_admin? && !source_user.nil? && !source_user.staff? && !target_user.nil?
+  end
+
   def can_reset_bounce_score?(user)
     user && is_staff?
   end
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index 984297dadb..273ff48192 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -988,4 +988,22 @@ RSpec.describe Admin::UsersController do
     end
   end
 
+  describe "#merge" do
+    fab!(:target_user) { Fabricate(:user) }
+    fab!(:topic) { Fabricate(:topic, user: user) }
+    fab!(:first_post) { Fabricate(:post, topic: topic, user: user) }
+
+    it 'should merge source user to target user' do
+      post "/admin/users/#{user.id}/merge.json", params: {
+        target_username: target_user.username
+      }
+
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["merged"]).to be_truthy
+      expect(response.parsed_body["user"]["id"]).to eq(target_user.id)
+      expect(topic.reload.user_id).to eq(target_user.id)
+      expect(first_post.reload.user_id).to eq(target_user.id)
+    end
+  end
+
 end

From e733701887c526f49c56b0f7d025d69162624734 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 22 Apr 2020 11:52:50 +0300
Subject: [PATCH 0716/1830] FEATURE: Make report filters reusable (#9444)

This commit also adds 'include subcategories' report filter
---
 .../admin/components/admin-report.js          |  6 +-
 .../admin/components/report-filters/bool.js   | 16 ++++++
 .../components/report-filters/category.js     | 12 ++--
 .../report-filters/file-extension.js          |  7 ---
 .../admin/components/report-filters/filter.js |  9 +--
 .../admin/components/report-filters/group.js  | 14 ++---
 .../admin/components/report-filters/list.js   |  3 +
 .../admin/routes/admin-dashboard-reports.js   |  2 +-
 .../templates/components/admin-report.hbs     |  3 +-
 .../components/report-filters/bool.hbs        |  5 ++
 .../components/report-filters/category.hbs    |  4 +-
 .../{file-extension.hbs => list.hbs}          |  0
 app/models/incoming_links_report.rb           | 55 ++++++++++++-------
 app/models/post.rb                            | 15 ++++-
 app/models/post_action.rb                     |  8 ++-
 app/models/report.rb                          | 37 ++++++++++---
 app/models/reports/flags.rb                   | 14 +++--
 app/models/reports/post_edits.rb              | 15 +++--
 app/models/reports/posts.rb                   | 14 +++--
 app/models/reports/profile_views.rb           |  2 +-
 app/models/reports/signups.rb                 |  2 +-
 app/models/reports/time_to_first_response.rb  |  8 +--
 app/models/reports/top_referred_topics.rb     |  6 +-
 app/models/reports/top_traffic_sources.rb     |  6 +-
 app/models/reports/top_uploads.rb             |  5 +-
 app/models/reports/topics.rb                  | 10 ++--
 app/models/reports/topics_with_no_response.rb |  9 ++-
 app/models/reports/visits.rb                  |  2 +-
 app/models/reviewable.rb                      | 16 ++++--
 app/models/topic.rb                           | 30 ++++++++--
 config/locales/client.en.yml                  |  2 +
 spec/models/report_spec.rb                    | 10 ++--
 spec/models/topic_spec.rb                     |  2 +-
 test/javascripts/fixtures/reports_bulk.js     |  2 +-
 34 files changed, 221 insertions(+), 130 deletions(-)
 create mode 100644 app/assets/javascripts/admin/components/report-filters/bool.js
 delete mode 100644 app/assets/javascripts/admin/components/report-filters/file-extension.js
 create mode 100644 app/assets/javascripts/admin/components/report-filters/list.js
 create mode 100644 app/assets/javascripts/admin/templates/components/report-filters/bool.hbs
 rename app/assets/javascripts/admin/templates/components/report-filters/{file-extension.hbs => list.hbs} (100%)

diff --git a/app/assets/javascripts/admin/components/admin-report.js b/app/assets/javascripts/admin/components/admin-report.js
index a385b71730..178bef98f2 100644
--- a/app/assets/javascripts/admin/components/admin-report.js
+++ b/app/assets/javascripts/admin/components/admin-report.js
@@ -7,7 +7,6 @@ import Component from "@ember/component";
 import ReportLoader from "discourse/lib/reports-loader";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
-import { isNumeric } from "discourse/lib/utilities";
 import Report, { SCHEMA_VERSION } from "admin/models/report";
 import ENV from "discourse-common/config/environment";
 
@@ -167,10 +166,9 @@ export default Component.extend({
       ENV.environment === "test" ? "end" : endDate.replace(/-/g, ""),
       "[:prev_period]",
       this.get("reportOptions.table.limit"),
+      // Convert all filter values to strings to ensure unique serialization
       customFilters
-        ? JSON.stringify(customFilters, (key, value) =>
-            isNumeric(value) ? value.toString() : value
-          )
+        ? JSON.stringify(customFilters, (k, v) => (k ? `${v}` : v))
         : null,
       SCHEMA_VERSION
     ]
diff --git a/app/assets/javascripts/admin/components/report-filters/bool.js b/app/assets/javascripts/admin/components/report-filters/bool.js
new file mode 100644
index 0000000000..777e15cfe4
--- /dev/null
+++ b/app/assets/javascripts/admin/components/report-filters/bool.js
@@ -0,0 +1,16 @@
+import { action } from "@ember/object";
+import FilterComponent from "admin/components/report-filters/filter";
+
+export default FilterComponent.extend({
+  checked: false,
+
+  didReceiveAttrs() {
+    this._super(...arguments);
+    this.set("checked", !!this.filter.default);
+  },
+
+  @action
+  onChange() {
+    this.applyFilter(this.filter.id, !this.checked || undefined);
+  }
+});
diff --git a/app/assets/javascripts/admin/components/report-filters/category.js b/app/assets/javascripts/admin/components/report-filters/category.js
index fab7753da4..5a5ab52098 100644
--- a/app/assets/javascripts/admin/components/report-filters/category.js
+++ b/app/assets/javascripts/admin/components/report-filters/category.js
@@ -1,16 +1,12 @@
+import { action } from "@ember/object";
 import { readOnly } from "@ember/object/computed";
 import FilterComponent from "admin/components/report-filters/filter";
 
 export default FilterComponent.extend({
-  classNames: ["category-filter"],
-
-  layoutName: "admin/templates/components/report-filters/category",
-
   category: readOnly("filter.default"),
 
-  actions: {
-    onChange(categoryId) {
-      this.applyFilter(this.get("filter.id"), categoryId || undefined);
-    }
+  @action
+  onChange(categoryId) {
+    this.applyFilter(this.filter.id, categoryId || undefined);
   }
 });
diff --git a/app/assets/javascripts/admin/components/report-filters/file-extension.js b/app/assets/javascripts/admin/components/report-filters/file-extension.js
deleted file mode 100644
index d8eb1b5b06..0000000000
--- a/app/assets/javascripts/admin/components/report-filters/file-extension.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import FilterComponent from "admin/components/report-filters/filter";
-
-export default FilterComponent.extend({
-  classNames: ["file-extension-filter"],
-
-  layoutName: "admin/templates/components/report-filters/file-extension"
-});
diff --git a/app/assets/javascripts/admin/components/report-filters/filter.js b/app/assets/javascripts/admin/components/report-filters/filter.js
index f61b2d496a..0c4e006346 100644
--- a/app/assets/javascripts/admin/components/report-filters/filter.js
+++ b/app/assets/javascripts/admin/components/report-filters/filter.js
@@ -1,8 +1,9 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
+
 export default Component.extend({
-  actions: {
-    onChange(value) {
-      this.applyFilter(this.get("filter.id"), value);
-    }
+  @action
+  onChange(value) {
+    this.applyFilter(this.filter.id, value);
   }
 });
diff --git a/app/assets/javascripts/admin/components/report-filters/group.js b/app/assets/javascripts/admin/components/report-filters/group.js
index a6511e75f6..e841800030 100644
--- a/app/assets/javascripts/admin/components/report-filters/group.js
+++ b/app/assets/javascripts/admin/components/report-filters/group.js
@@ -1,20 +1,18 @@
+import { computed } from "@ember/object";
 import FilterComponent from "admin/components/report-filters/filter";
-import discourseComputed from "discourse-common/utils/decorators";
 
 export default FilterComponent.extend({
   classNames: ["group-filter"],
 
-  layoutName: "admin/templates/components/report-filters/group",
-
-  @discourseComputed()
-  groupOptions() {
+  @computed
+  get groupOptions() {
     return (this.site.groups || []).map(group => {
       return { name: group["name"], value: group["id"] };
     });
   },
 
-  @discourseComputed("filter.default")
-  groupId(filterDefault) {
-    return filterDefault ? parseInt(filterDefault, 10) : null;
+  @computed("filter.default")
+  get groupId() {
+    return this.filter.default ? parseInt(this.filter.default, 10) : null;
   }
 });
diff --git a/app/assets/javascripts/admin/components/report-filters/list.js b/app/assets/javascripts/admin/components/report-filters/list.js
new file mode 100644
index 0000000000..654269ecd0
--- /dev/null
+++ b/app/assets/javascripts/admin/components/report-filters/list.js
@@ -0,0 +1,3 @@
+import FilterComponent from "admin/components/report-filters/filter";
+
+export default FilterComponent.extend();
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-reports.js b/app/assets/javascripts/admin/routes/admin-dashboard-reports.js
index 0de5bfe505..b1eff77998 100644
--- a/app/assets/javascripts/admin/routes/admin-dashboard-reports.js
+++ b/app/assets/javascripts/admin/routes/admin-dashboard-reports.js
@@ -3,7 +3,7 @@ import { ajax } from "discourse/lib/ajax";
 
 export default DiscourseRoute.extend({
   model() {
-    return ajax("/admin/reports").then(json => json);
+    return ajax("/admin/reports");
   },
 
   setupController(controller, model) {
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index 2aa3143a47..ab0c1a6398 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -165,7 +165,8 @@
 
               <div class="input">
                 {{component
-                  (concat "report-filters/" filter.id)
+                  (concat "report-filters/" filter.type)
+                  model=model
                   filter=filter
                   applyFilter=(action "applyFilter")}}
               </div>
diff --git a/app/assets/javascripts/admin/templates/components/report-filters/bool.hbs b/app/assets/javascripts/admin/templates/components/report-filters/bool.hbs
new file mode 100644
index 0000000000..4d96755ff9
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/report-filters/bool.hbs
@@ -0,0 +1,5 @@
+{{input
+  type="checkbox"
+  checked=checked
+  click=(action "onChange")
+}}
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/templates/components/report-filters/category.hbs b/app/assets/javascripts/admin/templates/components/report-filters/category.hbs
index 31110bcbbd..bdf354e188 100644
--- a/app/assets/javascripts/admin/templates/components/report-filters/category.hbs
+++ b/app/assets/javascripts/admin/templates/components/report-filters/category.hbs
@@ -1,7 +1,5 @@
 {{search-advanced-category-chooser
   value=category
   onChange=(action "onChange")
-  options=(hash
-    filterable=true
-  )
+  options=(hash filterable=true)
 }}
diff --git a/app/assets/javascripts/admin/templates/components/report-filters/file-extension.hbs b/app/assets/javascripts/admin/templates/components/report-filters/list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/components/report-filters/file-extension.hbs
rename to app/assets/javascripts/admin/templates/components/report-filters/list.hbs
diff --git a/app/models/incoming_links_report.rb b/app/models/incoming_links_report.rb
index d791a65903..e17f893a93 100644
--- a/app/models/incoming_links_report.rb
+++ b/app/models/incoming_links_report.rb
@@ -2,13 +2,14 @@
 
 class IncomingLinksReport
 
-  attr_accessor :type, :data, :y_titles, :start_date, :end_date, :limit, :category_id
+  attr_accessor :type, :data, :y_titles, :start_date, :end_date, :limit, :category_id, :include_subcategories
 
   def initialize(type)
     @type = type
     @y_titles = {}
     @data = nil
     @category_id = nil
+    @include_subcategories = false
   end
 
   def as_json(_options = nil)
@@ -34,6 +35,7 @@ class IncomingLinksReport
     report.end_date = _opts[:end_date] || Time.now.end_of_day
     report.limit = _opts[:limit].to_i if _opts[:limit]
     report.category_id = _opts[:category_id] if _opts[:category_id]
+    report.include_subcategories = _opts[:include_subcategories] if _opts[:include_subcategories]
 
     public_send(report_method, report)
     report
@@ -44,8 +46,8 @@ class IncomingLinksReport
     report.y_titles[:num_clicks] = I18n.t("reports.#{report.type}.num_clicks")
     report.y_titles[:num_topics] = I18n.t("reports.#{report.type}.num_topics")
 
-    num_clicks = link_count_per_user(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id)
-    num_topics = topic_count_per_user(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id)
+    num_clicks = link_count_per_user(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id, include_subcategories: report.include_subcategories)
+    num_topics = topic_count_per_user(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id, include_subcategories: report.include_subcategories)
     user_id_lookup = User
       .where(username: num_clicks.keys)
       .select(:id, :username, :uploaded_avatar_id)
@@ -70,19 +72,19 @@ class IncomingLinksReport
     report.data = report.data.sort_by { |x| x[:num_clicks] }.reverse[0, 10]
   end
 
-  def self.per_user(start_date:, end_date:, category_id:)
-    public_incoming_links(category_id: category_id)
+  def self.per_user(start_date:, end_date:, category_id:, include_subcategories:)
+    public_incoming_links(category_id: category_id, include_subcategories: include_subcategories)
       .where('incoming_links.created_at > ? AND incoming_links.created_at < ? AND incoming_links.user_id IS NOT NULL', start_date, end_date)
       .joins(:user)
       .group('users.username')
   end
 
-  def self.link_count_per_user(start_date:, end_date:, category_id:)
-    per_user(start_date: start_date, end_date: end_date, category_id: category_id).count
+  def self.link_count_per_user(start_date:, end_date:, category_id:, include_subcategories:)
+    per_user(start_date: start_date, end_date: end_date, category_id: category_id, include_subcategories: include_subcategories).count
   end
 
-  def self.topic_count_per_user(start_date:, end_date:, category_id:)
-    per_user(start_date: start_date, end_date: end_date, category_id: category_id).joins(:post).count("DISTINCT posts.topic_id")
+  def self.topic_count_per_user(start_date:, end_date:, category_id:, include_subcategories:)
+    per_user(start_date: start_date, end_date: end_date, category_id: category_id, include_subcategories: include_subcategories).joins(:post).count("DISTINCT posts.topic_id")
   end
 
   # Return top 10 domains that brought traffic to the site within the last 30 days
@@ -91,8 +93,8 @@ class IncomingLinksReport
     report.y_titles[:num_topics] = I18n.t("reports.#{report.type}.num_topics")
     report.y_titles[:num_users] = I18n.t("reports.#{report.type}.num_users")
 
-    num_clicks = link_count_per_domain(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id)
-    num_topics = topic_count_per_domain(num_clicks.keys, category_id: report.category_id)
+    num_clicks = link_count_per_domain(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id, include_subcategories: report.include_subcategories)
+    num_topics = topic_count_per_domain(num_clicks.keys, category_id: report.category_id, include_subcategories: report.include_subcategories)
     report.data = []
     num_clicks.each_key do |domain|
       report.data << { domain: domain, num_clicks: num_clicks[domain], num_topics: num_topics[domain] }
@@ -100,8 +102,8 @@ class IncomingLinksReport
     report.data = report.data.sort_by { |x| x[:num_clicks] }.reverse[0, 10]
   end
 
-  def self.link_count_per_domain(limit: 10, start_date:, end_date:, category_id:)
-    public_incoming_links(category_id: category_id)
+  def self.link_count_per_domain(limit: 10, start_date:, end_date:, category_id:, include_subcategories:)
+    public_incoming_links(category_id: category_id, include_subcategories: include_subcategories)
       .where('incoming_links.created_at > ? AND incoming_links.created_at < ?', start_date, end_date)
       .joins(incoming_referer: :incoming_domain)
       .group('incoming_domains.name')
@@ -111,7 +113,7 @@ class IncomingLinksReport
   end
 
   def self.per_domain(domains, options = {})
-    public_incoming_links(category_id: options[:category_id])
+    public_incoming_links(category_id: options[:category_id], include_subcategories: options[:include_subcategories])
       .joins(incoming_referer: :incoming_domain)
       .where('incoming_links.created_at > ? AND incoming_domains.name IN (?)', 30.days.ago, domains)
       .group('incoming_domains.name')
@@ -124,11 +126,13 @@ class IncomingLinksReport
 
   def self.report_top_referred_topics(report)
     report.y_titles[:num_clicks] = I18n.t("reports.#{report.type}.labels.num_clicks")
-    num_clicks = link_count_per_topic(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id)
+    num_clicks = link_count_per_topic(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id, include_subcategories: report.include_subcategories)
     num_clicks = num_clicks.to_a.sort_by { |x| x[1] }.last(report.limit || 10).reverse
     report.data = []
     topics = Topic.select('id, slug, title').where('id in (?)', num_clicks.map { |z| z[0] })
-    topics = topics.in_category_and_subcategories(report.category_id) if report.category_id
+    if report.category_id
+      topics = topics.where(category_id: report.include_subcategories ? Category.subcategory_ids(report.category_id) : report.category_id)
+    end
     num_clicks.each do |topic_id, num_clicks_element|
       topic = topics.find { |t| t.id == topic_id }
       if topic
@@ -138,17 +142,26 @@ class IncomingLinksReport
     report.data
   end
 
-  def self.link_count_per_topic(start_date:, end_date:, category_id:)
-    public_incoming_links(category_id: category_id)
+  def self.link_count_per_topic(start_date:, end_date:, category_id:, include_subcategories:)
+    public_incoming_links(category_id: category_id, include_subcategories: include_subcategories)
       .where('incoming_links.created_at > ? AND incoming_links.created_at < ? AND topic_id IS NOT NULL', start_date, end_date)
       .group('topic_id')
       .count
   end
 
-  def self.public_incoming_links(category_id: nil)
-    IncomingLink
+  def self.public_incoming_links(category_id: nil, include_subcategories: nil)
+    links = IncomingLink
       .joins(post: :topic)
       .where("topics.archetype = ?", Archetype.default)
-      .merge(Topic.in_category_and_subcategories(category_id))
+
+    if category_id
+      if include_subcategories
+        links = links.where("topics.category_id IN (?)", Category.subcategory_ids(category_id))
+      else
+        links = links.where("topics.category_id = ?", category_id)
+      end
+    end
+
+    links
   end
 end
diff --git a/app/models/post.rb b/app/models/post.rb
index 86dafde6bc..acc6c540f2 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -765,10 +765,19 @@ class Post < ActiveRecord::Base
     DiscourseEvent.trigger(:after_trigger_post_process, self)
   end
 
-  def self.public_posts_count_per_day(start_date, end_date, category_id = nil)
-    result = public_posts.where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date)
+  def self.public_posts_count_per_day(start_date, end_date, category_id = nil, include_subcategories = false)
+    result = public_posts
+      .where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date)
       .where(post_type: Post.types[:regular])
-    result = result.where('topics.category_id IN (?)', Category.subcategory_ids(category_id.to_i)) if category_id
+
+    if category_id
+      if include_subcategories
+        result = result.where('topics.category_id IN (?)', Category.subcategory_ids(category_id))
+      else
+        result = result.where('topics.category_id = ?', category_id)
+      end
+    end
+
     result
       .group('date(posts.created_at)')
       .order('date(posts.created_at)')
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index 077ef253c1..53c482d0d3 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -67,7 +67,13 @@ class PostAction < ActiveRecord::Base
     result = unscoped.where(post_action_type_id: post_action_type)
     result = result.where('post_actions.created_at >= ?', opts[:start_date] || (opts[:since_days_ago] || 30).days.ago)
     result = result.where('post_actions.created_at <= ?', opts[:end_date]) if opts[:end_date]
-    result = result.joins(post: :topic).merge(Topic.in_category_and_subcategories(opts[:category_id])) if opts[:category_id]
+    if opts[:category_id]
+      if opts[:include_subcategories]
+        result = result.joins(post: :topic).where('topics.category_id IN (?)', Category.subcategory_ids(opts[:category_id]))
+      else
+        result = result.joins(post: :topic).where('topics.category_id = ?', opts[:category_id])
+      end
+    end
     result.group('date(post_actions.created_at)')
       .order('date(post_actions.created_at)')
       .count
diff --git a/app/models/report.rb b/app/models/report.rb
index 13f7d02830..b66e36c772 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -50,8 +50,8 @@ class Report
   end
 
   def self.cache_key(report)
-    (+"reports:") <<
     [
+      "reports",
       report.type,
       report.start_date.to_date.strftime("%Y%m%d"),
       report.end_date.to_date.strftime("%Y%m%d"),
@@ -63,14 +63,30 @@ class Report
   end
 
   def add_filter(name, options = {})
-    default_filter = { allow_any: false, choices: [], default: nil }
-    available_filters[name] = default_filter.merge(options)
+    if options[:type].blank?
+      options[:type] = name
+      Discourse.deprecate("#{name} filter should define a `:type` option. Temporarily setting type to #{name}.")
+    end
+
+    available_filters[name] = options
   end
 
   def remove_filter(name)
     available_filters.delete(name)
   end
 
+  def add_category_filter
+    category_id = filters[:category].to_i if filters[:category].present?
+    add_filter('category', type: 'category', default: category_id)
+    return if category_id.blank?
+
+    include_subcategories = filters[:'include-subcategories']
+    include_subcategories = !!ActiveRecord::Type::Boolean.new.cast(include_subcategories)
+    add_filter('include-subcategories', type: 'bool', default: include_subcategories)
+
+    [category_id, include_subcategories]
+  end
+
   def self.clear_cache(type = nil)
     pattern = type ? "reports:#{type}:*" : "reports:*"
 
@@ -285,15 +301,22 @@ class Report
   end
 
   def self.post_action_report(report, post_action_type)
-    category_filter = report.filters.dig(:category)
-    report.add_filter('category', default: category_filter)
+    category_id, include_subcategories = report.add_category_filter
 
     report.data = []
-    PostAction.count_per_day_for_type(post_action_type, category_id: category_filter, start_date: report.start_date, end_date: report.end_date).each do |date, count|
+    PostAction.count_per_day_for_type(post_action_type, category_id: category_id, include_subcategories: include_subcategories, start_date: report.start_date, end_date: report.end_date).each do |date, count|
       report.data << { x: date, y: count }
     end
+
     countable = PostAction.unscoped.where(post_action_type_id: post_action_type)
-    countable = countable.joins(post: :topic).merge(Topic.in_category_and_subcategories(category_filter)) if category_filter
+    if category_id
+      if include_subcategories
+        countable = countable.joins(post: :topic).where('topics.category_id IN (?)', Category.subcategory_ids(category_id))
+      else
+        countable = countable.joins(post: :topic).where('topics.category_id = ?', category_id)
+      end
+    end
+
     add_counts report, countable, 'post_actions.created_at'
   end
 
diff --git a/app/models/reports/flags.rb b/app/models/reports/flags.rb
index 682fa4f4dc..da80c8e92a 100644
--- a/app/models/reports/flags.rb
+++ b/app/models/reports/flags.rb
@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 Report.add_report('flags') do |report|
-  category_filter = report.filters.dig(:category)
-  report.add_filter('category', default: category_filter)
+  category_id, include_subcategories = report.add_category_filter
 
   report.icon = 'flag'
   report.higher_is_better = false
@@ -13,13 +12,18 @@ Report.add_report('flags') do |report|
     :count_by_date,
     report.start_date,
     report.end_date,
-    category_filter
+    category_id,
+    include_subcategories
   )
 
   countable = ReviewableFlaggedPost.scores_with_topics
 
-  if category_filter
-    countable.merge!(Topic.in_category_and_subcategories(category_filter))
+  if category_id
+    if include_subcategories
+      countable = countable.where('topics.category_id IN (?)', Category.subcategory_ids(category_id))
+    else
+      countable = countable.where('topics.category_id = ?', category_id)
+    end
   end
 
   add_counts report, countable, 'reviewable_scores.created_at'
diff --git a/app/models/reports/post_edits.rb b/app/models/reports/post_edits.rb
index 9092520430..b8ece00d0c 100644
--- a/app/models/reports/post_edits.rb
+++ b/app/models/reports/post_edits.rb
@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 Report.add_report('post_edits') do |report|
-  category_filter = report.filters.dig(:category)
-  report.add_filter('category', default: category_filter)
+  category_id, include_subcategories = report.add_category_filter
 
   report.modes = [:table]
 
@@ -77,13 +76,13 @@ Report.add_report('post_edits') do |report|
   /*limit*/
   SQL
 
-  if category_filter
+  if category_id
     builder.join "topics t ON t.id = p.topic_id"
-    builder.where("t.category_id = :category_id
-      OR t.category_id IN (
-        SELECT id FROM categories
-        WHERE categories.parent_category_id = :category_id
-      )", category_id: category_filter)
+    if include_subcategories
+      builder.where("t.category_id IN (?)", Category.subcategory_ids(category_id))
+    else
+      builder.where("t.category_id = ?", category_id)
+    end
   end
 
   builder.where("editor.id > 0 AND editor.id != author.id")
diff --git a/app/models/reports/posts.rb b/app/models/reports/posts.rb
index 0317599687..8461d79dfc 100644
--- a/app/models/reports/posts.rb
+++ b/app/models/reports/posts.rb
@@ -3,14 +3,18 @@
 Report.add_report('posts') do |report|
   report.modes = [:table, :chart]
 
-  category_filter = report.filters.dig(:category)
-  report.add_filter('category', default: category_filter)
+  category_id, include_subcategories = report.add_category_filter
 
-  basic_report_about report, Post, :public_posts_count_per_day, report.start_date, report.end_date, category_filter
+  basic_report_about report, Post, :public_posts_count_per_day, report.start_date, report.end_date, category_id, include_subcategories
 
   countable = Post.public_posts.where(post_type: Post.types[:regular])
-  if category_filter
-    countable = countable.joins(:topic).merge(Topic.in_category_and_subcategories(category_filter))
+  if category_id
+    if include_subcategories
+      countable = countable.joins(:topic).where('topics.category_id IN (?)', Category.subcategory_ids(category_id))
+    else
+      countable = countable.joins(:topic).where('topics.category_id = ?', category_id)
+    end
   end
+
   add_counts report, countable, 'posts.created_at'
 end
diff --git a/app/models/reports/profile_views.rb b/app/models/reports/profile_views.rb
index 564ff198d0..ec349cf1ad 100644
--- a/app/models/reports/profile_views.rb
+++ b/app/models/reports/profile_views.rb
@@ -2,7 +2,7 @@
 
 Report.add_report('profile_views') do |report|
   group_filter = report.filters.dig(:group)
-  report.add_filter('group', default: group_filter)
+  report.add_filter('group', type: 'group', default: group_filter)
 
   start_date = report.start_date
   end_date = report.end_date
diff --git a/app/models/reports/signups.rb b/app/models/reports/signups.rb
index 79dcc04147..3df08e2b87 100644
--- a/app/models/reports/signups.rb
+++ b/app/models/reports/signups.rb
@@ -4,7 +4,7 @@ Report.add_report('signups') do |report|
   report.icon = 'user-plus'
 
   group_filter = report.filters.dig(:group)
-  report.add_filter('group', default: group_filter)
+  report.add_filter('group', type: 'group', default: group_filter)
 
   if group_filter
     basic_report_about report, User.real, :count_by_signup_date, report.start_date, report.end_date, group_filter
diff --git a/app/models/reports/time_to_first_response.rb b/app/models/reports/time_to_first_response.rb
index 7f361ef338..dd0a474318 100644
--- a/app/models/reports/time_to_first_response.rb
+++ b/app/models/reports/time_to_first_response.rb
@@ -2,17 +2,17 @@
 
 Report.add_report('time_to_first_response') do |report|
   category_filter = report.filters.dig(:category)
-  report.add_filter('category', default: category_filter)
+  category_id, include_subcategories = report.add_category_filter
 
   report.icon = 'reply'
   report.higher_is_better = false
   report.data = []
 
-  Topic.time_to_first_response_per_day(report.start_date, report.end_date, category_id: category_filter).each do |r|
+  Topic.time_to_first_response_per_day(report.start_date, report.end_date, category_id: category_id, include_subcategories: include_subcategories).each do |r|
     report.data << { x: r['date'], y: r['hours'].to_f.round(2) }
   end
 
-  report.total = Topic.time_to_first_response_total(category_id: category_filter)
+  report.total = Topic.time_to_first_response_total(category_id: category_id, include_subcategories: include_subcategories)
 
-  report.prev30Days = Topic.time_to_first_response_total(start_date: report.start_date - 30.days, end_date: report.start_date, category_id: category_filter)
+  report.prev30Days = Topic.time_to_first_response_total(start_date: report.start_date - 30.days, end_date: report.start_date, category_id: category_id, include_subcategories: include_subcategories)
 end
diff --git a/app/models/reports/top_referred_topics.rb b/app/models/reports/top_referred_topics.rb
index 6b8abf84e2..7f5dad2589 100644
--- a/app/models/reports/top_referred_topics.rb
+++ b/app/models/reports/top_referred_topics.rb
@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 Report.add_report('top_referred_topics') do |report|
-  category_filter = report.filters.dig(:category)
-  report.add_filter('category', default: category_filter)
+  category_id, include_subcategories = report.add_category_filter
 
   report.modes = [:table]
 
@@ -26,7 +25,8 @@ Report.add_report('top_referred_topics') do |report|
     end_date: report.end_date,
     start_date: report.start_date,
     limit: report.limit || 8,
-    category_id: category_filter
+    category_id: category_id,
+    include_subcategories: include_subcategories
   }
   result = nil
   result = IncomingLinksReport.find(:top_referred_topics, options)
diff --git a/app/models/reports/top_traffic_sources.rb b/app/models/reports/top_traffic_sources.rb
index f32130dc05..b6b7e16bf2 100644
--- a/app/models/reports/top_traffic_sources.rb
+++ b/app/models/reports/top_traffic_sources.rb
@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 Report.add_report('top_traffic_sources') do |report|
-  category_filter = report.filters.dig(:category)
-  report.add_filter('category', default: category_filter)
+  category_id, include_subcategories = report.add_category_filter
 
   report.modes = [:table]
 
@@ -27,7 +26,8 @@ Report.add_report('top_traffic_sources') do |report|
     end_date: report.end_date,
     start_date: report.start_date,
     limit: report.limit || 8,
-    category_id: category_filter
+    category_id: category_id,
+    include_subcategories: include_subcategories
   }
 
   result = IncomingLinksReport.find(:top_traffic_sources, options)
diff --git a/app/models/reports/top_uploads.rb b/app/models/reports/top_uploads.rb
index b8978678f3..e5a4f542cf 100644
--- a/app/models/reports/top_uploads.rb
+++ b/app/models/reports/top_uploads.rb
@@ -5,10 +5,9 @@ Report.add_report('top_uploads') do |report|
 
   extension_filter = report.filters.dig(:"file-extension")
   report.add_filter('file-extension',
+    type: 'list',
     default: extension_filter || 'any',
-    choices: (
-      SiteSetting.authorized_extensions.split('|') + Array(extension_filter)
-    ).uniq
+    choices: (SiteSetting.authorized_extensions.split('|') + Array(extension_filter)).uniq
   )
 
   report.labels = [
diff --git a/app/models/reports/topics.rb b/app/models/reports/topics.rb
index 7fd181afa0..61acaaab09 100644
--- a/app/models/reports/topics.rb
+++ b/app/models/reports/topics.rb
@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
 Report.add_report('topics') do |report|
-  category_filter = report.filters.dig(:category)
-  report.add_filter('category', default: category_filter)
+  category_id, include_subcategories = report.add_category_filter
 
-  basic_report_about report, Topic, :listable_count_per_day, report.start_date, report.end_date, category_filter
+  basic_report_about report, Topic, :listable_count_per_day, report.start_date, report.end_date, category_id, include_subcategories
 
   countable = Topic.listable_topics
-  if category_filter
-    countable = countable.in_category_and_subcategories(category_filter)
-  end
+  countable = countable.where(category_id: include_subcategories ? Category.subcategory_ids(category_id) : category_id) if category_id
+
   add_counts report, countable, 'topics.created_at'
 end
diff --git a/app/models/reports/topics_with_no_response.rb b/app/models/reports/topics_with_no_response.rb
index 1cc0f17e3e..7cd2d15e16 100644
--- a/app/models/reports/topics_with_no_response.rb
+++ b/app/models/reports/topics_with_no_response.rb
@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
 Report.add_report('topics_with_no_response') do |report|
-  category_filter = report.filters.dig(:category)
-  report.add_filter('category', default: category_filter)
+  category_id, include_subcategories = report.add_category_filter
 
   report.data = []
-  Topic.with_no_response_per_day(report.start_date, report.end_date, category_filter).each do |r|
+  Topic.with_no_response_per_day(report.start_date, report.end_date, category_id, include_subcategories).each do |r|
     report.data << { x: r['date'], y: r['count'].to_i }
   end
 
-  report.total = Topic.with_no_response_total(category_id: category_filter)
+  report.total = Topic.with_no_response_total(category_id: category_id, include_subcategories: include_subcategories)
 
-  report.prev30Days = Topic.with_no_response_total(start_date: report.start_date - 30.days, end_date: report.start_date, category_id: category_filter)
+  report.prev30Days = Topic.with_no_response_total(start_date: report.start_date - 30.days, end_date: report.start_date, category_id: category_id, include_subcategories: include_subcategories)
 end
diff --git a/app/models/reports/visits.rb b/app/models/reports/visits.rb
index 472c0117bc..841f65ecf3 100644
--- a/app/models/reports/visits.rb
+++ b/app/models/reports/visits.rb
@@ -2,7 +2,7 @@
 
 Report.add_report('visits') do |report|
   group_filter = report.filters.dig(:group)
-  report.add_filter('group', default: group_filter)
+  report.add_filter('group', type: 'group', default: group_filter)
 
   report.icon = 'user'
 
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 771b37f4ee..0fd3f4059b 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -534,10 +534,18 @@ class Reviewable < ActiveRecord::Base
     ReviewableScore.joins(reviewable: :topic).where("reviewables.type = ?", name)
   end
 
-  def self.count_by_date(start_date, end_date, category_id = nil)
-    scores_with_topics
-      .where('reviewable_scores.created_at BETWEEN ? AND ?', start_date, end_date)
-      .where("topics.category_id = COALESCE(?, topics.category_id)", category_id)
+  def self.count_by_date(start_date, end_date, category_id = nil, include_subcategories = false)
+    query = scores_with_topics.where('reviewable_scores.created_at BETWEEN ? AND ?', start_date, end_date)
+
+    if category_id
+      if include_subcategories
+        query = query.where("topics.category_id IN (?)", Category.subcategory_ids(category_id))
+      else
+        query = query.where("topics.category_id = ?", category_id)
+      end
+    end
+
+    query
       .group("date(reviewable_scores.created_at)")
       .order('date(reviewable_scores.created_at)')
       .count
diff --git a/app/models/topic.rb b/app/models/topic.rb
index d080fbee32..f1f17443ce 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -454,10 +454,10 @@ class Topic < ActiveRecord::Base
     ((Time.zone.now - created_at) / 1.minute).round
   end
 
-  def self.listable_count_per_day(start_date, end_date, category_id = nil)
+  def self.listable_count_per_day(start_date, end_date, category_id = nil, include_subcategories = false)
     result = listable_topics.where("topics.created_at >= ? AND topics.created_at <= ?", start_date, end_date)
     result = result.group('date(topics.created_at)').order('date(topics.created_at)')
-    result = result.where(category_id: category_id) if category_id
+    result = result.where(category_id: include_subcategories ? Category.subcategory_ids(category_id) : category_id) if category_id
     result.count
   end
 
@@ -1294,7 +1294,13 @@ class Topic < ActiveRecord::Base
     builder = DB.build(sql)
     builder.where("t.created_at >= :start_date", start_date: opts[:start_date]) if opts[:start_date]
     builder.where("t.created_at < :end_date", end_date: opts[:end_date]) if opts[:end_date]
-    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(opts[:category_id].to_i)) if opts[:category_id]
+    if opts[:category_id]
+      if opts[:include_subcategories]
+        builder.where("t.category_id IN (?)", Category.subcategory_ids(opts[:category_id]))
+      else
+        builder.where("t.category_id = ?", opts[:category_id])
+      end
+    end
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.where("p.deleted_at IS NULL")
@@ -1329,11 +1335,17 @@ class Topic < ActiveRecord::Base
     ORDER BY tt.created_at
   SQL
 
-  def self.with_no_response_per_day(start_date, end_date, category_id = nil)
+  def self.with_no_response_per_day(start_date, end_date, category_id = nil, include_subcategories = nil)
     builder = DB.build(WITH_NO_RESPONSE_SQL)
     builder.where("t.created_at >= :start_date", start_date: start_date) if start_date
     builder.where("t.created_at < :end_date", end_date: end_date) if end_date
-    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(category_id.to_i)) if category_id
+    if category_id
+      if include_subcategories
+        builder.where("t.category_id IN (?)", Category.subcategory_ids(category_id))
+      else
+        builder.where("t.category_id = ?", category_id)
+      end
+    end
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.query_hash
@@ -1353,7 +1365,13 @@ class Topic < ActiveRecord::Base
 
   def self.with_no_response_total(opts = {})
     builder = DB.build(WITH_NO_RESPONSE_TOTAL_SQL)
-    builder.where("t.category_id IN (:subcategory_ids)", subcategory_ids: Category.subcategory_ids(opts[:category_id].to_i)) if opts[:category_id]
+    if opts[:category_id]
+      if opts[:include_subcategories]
+        builder.where("t.category_id IN (?)", Category.subcategory_ids(opts[:category_id]))
+      else
+        builder.where("t.category_id = ?", opts[:category_id])
+      end
+    end
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.query_single.first.to_i
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 39951e2b84..4ccd3d397a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3411,6 +3411,8 @@ en:
               label: Group
             category:
               label: Category
+            include-subcategories:
+              label: "Include Subcategories"
 
       commits:
         latest_changes: "Latest changes: please update often!"
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index 12924fd82e..7b4dc6dcc1 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -771,7 +771,7 @@ describe Report do
         include_examples 'category filtering'
 
         context "on subcategories" do
-          let(:report) { Report.find('flags', filters: { category: c0.id }) }
+          let(:report) { Report.find('flags', filters: { category: c0.id, 'include-subcategories': true }) }
 
           include_examples 'category filtering on subcategories'
         end
@@ -801,7 +801,7 @@ describe Report do
         include_examples 'category filtering'
 
         context "on subcategories" do
-          let(:report) { Report.find('topics', filters: { category: c0.id }) }
+          let(:report) { Report.find('topics', filters: { category: c0.id, 'include-subcategories': true }) }
 
           include_examples 'category filtering on subcategories'
         end
@@ -892,7 +892,7 @@ describe Report do
         include_examples 'category filtering'
 
         context "on subcategories" do
-          let(:report) { Report.find('posts', filters: { category: c0.id }) }
+          let(:report) { Report.find('posts', filters: { category: c0.id, 'include-subcategories': true }) }
 
           include_examples 'category filtering on subcategories'
         end
@@ -924,7 +924,7 @@ describe Report do
         include_examples 'category filtering'
 
         context "on subcategories" do
-          let(:report) { Report.find('topics_with_no_response', filters: { category: c0.id }) }
+          let(:report) { Report.find('topics_with_no_response', filters: { category: c0.id, 'include-subcategories': true }) }
 
           include_examples 'category filtering on subcategories'
         end
@@ -960,7 +960,7 @@ describe Report do
         include_examples 'category filtering'
 
         context "on subcategories" do
-          let(:report) { Report.find('likes', filters: { category: c0.id }) }
+          let(:report) { Report.find('likes', filters: { category: c0.id, 'include-subcategories': true }) }
 
           include_examples 'category filtering on subcategories'
         end
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index e4db2d1d00..d381579300 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -2359,7 +2359,7 @@ describe Topic do
       Fabricate(:post, topic: topic, user: topic.user, post_number: 1, created_at: 3.hours.ago)
       Fabricate(:post, topic: topic, post_number: 2, created_at: 2.hours.ago)
 
-      expect(Topic.time_to_first_response_total(category_id: category.id)).to eq(1)
+      expect(Topic.time_to_first_response_total(category_id: category.id, include_subcategories: true)).to eq(1)
     end
 
     it "should only count regular posts as the first response" do
diff --git a/test/javascripts/fixtures/reports_bulk.js b/test/javascripts/fixtures/reports_bulk.js
index c315989170..a41cf34583 100644
--- a/test/javascripts/fixtures/reports_bulk.js
+++ b/test/javascripts/fixtures/reports_bulk.js
@@ -61,7 +61,7 @@ let signups = {
   dates_filtering: true,
   report_key: 'reports:signups:start:end:[:prev_period]:50:{"group":"88"}:4',
   available_filters: [
-    { id: "group", allow_any: false, choices: [], default: "88" }
+    { id: "group", type: "group", allow_any: false, choices: [], default: "88" }
   ],
   labels: [
     { type: "date", properties: ["x"], title: "Day" },

From 5c45363e67b6b895ce6171f89221e66e4a7447b4 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 22 Apr 2020 10:54:02 +0200
Subject: [PATCH 0717/1830] UX: better outline support in sk components (#9510)

---
 app/assets/javascripts/select-kit/components/select-kit.js  | 6 ++++++
 .../stylesheets/common/select-kit/mini-tag-chooser.scss     | 6 ------
 app/assets/stylesheets/common/select-kit/select-kit.scss    | 4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 4fdbd62928..e0307c2c5d 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -838,6 +838,12 @@ export default Component.extend(
           strategy: placementStrategy,
           placement: this.selectKit.options.placement,
           modifiers: [
+            {
+              name: "offset",
+              options: {
+                offset: [0, 2]
+              }
+            },
             {
               name: "positionWrapper",
               phase: "afterWrite",
diff --git a/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss b/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
index 1bbfe3f357..27c302e868 100644
--- a/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
@@ -4,12 +4,6 @@
       margin-bottom: 5px;
       margin-left: 5px;
 
-      &.is-expanded {
-        .select-kit-header {
-          border: 1px solid $tertiary;
-        }
-      }
-
       &.no-tags {
         .select-kit-header .selected-name {
           color: $primary-medium;
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 65a2125971..627325e9c1 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -34,6 +34,10 @@
       box-sizing: border-box;
       width: 100%;
     }
+
+    .select-kit-header {
+      outline: 1px solid $tertiary;
+    }
   }
 
   &.is-loading {

From 4e5f9d4cd19f2d5ad5f43264f30bfe9db26988b0 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 22 Apr 2020 12:13:19 +0300
Subject: [PATCH 0718/1830] DEV: Drop 'key' column from user_api_keys (#9388)

---
 app/models/user_api_key.rb                      |  3 ---
 ...200408121312_remove_key_from_user_api_key.rb | 17 +++++++++++++++++
 .../auth/default_current_user_provider_spec.rb  |  2 --
 spec/fabricators/user_api_key_fabricator.rb     |  1 -
 spec/services/post_alerter_spec.rb              |  2 --
 5 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 db/post_migrate/20200408121312_remove_key_from_user_api_key.rb

diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb
index 4fac1230bc..c705541a73 100644
--- a/app/models/user_api_key.rb
+++ b/app/models/user_api_key.rb
@@ -28,7 +28,6 @@ class UserApiKey < ActiveRecord::Base
   def generate_key
     if !self.key_hash
       @key ||= SecureRandom.hex
-      self.key = @key
       self.key_hash = ApiKey.hash_key(@key)
     end
   end
@@ -102,7 +101,6 @@ end
 #  id               :integer          not null, primary key
 #  user_id          :integer          not null
 #  client_id        :string           not null
-#  key              :string           not null
 #  application_name :string           not null
 #  push_url         :string
 #  created_at       :datetime         not null
@@ -115,7 +113,6 @@ end
 # Indexes
 #
 #  index_user_api_keys_on_client_id  (client_id) UNIQUE
-#  index_user_api_keys_on_key        (key) UNIQUE
 #  index_user_api_keys_on_key_hash   (key_hash) UNIQUE
 #  index_user_api_keys_on_user_id    (user_id)
 #
diff --git a/db/post_migrate/20200408121312_remove_key_from_user_api_key.rb b/db/post_migrate/20200408121312_remove_key_from_user_api_key.rb
new file mode 100644
index 0000000000..a6147e5d58
--- /dev/null
+++ b/db/post_migrate/20200408121312_remove_key_from_user_api_key.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class RemoveKeyFromUserApiKey < ActiveRecord::Migration[6.0]
+  DROPPED_COLUMNS ||= {
+    user_api_keys: %i{key}
+  }
+
+  def up
+    DROPPED_COLUMNS.each do |table, columns|
+      Migration::ColumnDropper.execute_drop(table, columns)
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index ab4fa86369..e5ce0ced7b 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -769,7 +769,6 @@ describe Auth::DefaultCurrentUserProvider do
         application_name: 'my app',
         client_id: '1234',
         scopes: ['read'],
-        key: SecureRandom.hex,
         user_id: user.id
       )
     end
@@ -779,7 +778,6 @@ describe Auth::DefaultCurrentUserProvider do
         application_name: 'my app',
         client_id: '12345',
         scopes: ['read'],
-        key: SecureRandom.hex,
         user_id: user.id
       )
 
diff --git a/spec/fabricators/user_api_key_fabricator.rb b/spec/fabricators/user_api_key_fabricator.rb
index e513ac05de..5c4ce63d4d 100644
--- a/spec/fabricators/user_api_key_fabricator.rb
+++ b/spec/fabricators/user_api_key_fabricator.rb
@@ -4,6 +4,5 @@ Fabricator(:readonly_user_api_key, from: :user_api_key) do
   user
   scopes ['read']
   client_id { SecureRandom.hex }
-  key { SecureRandom.hex }
   application_name 'some app'
 end
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index 4a73313c7b..973f31c663 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -681,7 +681,6 @@ describe PostAlerter do
       2.times do |i|
         UserApiKey.create!(user_id: evil_trout.id,
                            client_id: "xxx#{i}",
-                           key: "yyy#{i}",
                            application_name: "iPhone#{i}",
                            scopes: ['notifications'],
                            push_url: "https://site2.com/push")
@@ -697,7 +696,6 @@ describe PostAlerter do
       2.times do |i|
         UserApiKey.create!(user_id: evil_trout.id,
                            client_id: "xxx#{i}",
-                           key: "yyy#{i}",
                            application_name: "iPhone#{i}",
                            scopes: ['notifications'],
                            push_url: "https://site2.com/push")

From 4889dbde497025fc274770c9dd9e5e01899a1a7c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 22 Apr 2020 13:02:20 +0200
Subject: [PATCH 0719/1830] FIX: differentiate sk outline handling on
 single/multi (#9512)

---
 .../javascripts/select-kit/components/select-kit.js      | 9 ++++++---
 .../stylesheets/common/select-kit/multi-select.scss      | 1 +
 app/assets/stylesheets/common/select-kit/select-kit.scss | 4 ----
 .../stylesheets/common/select-kit/single-select.scss     | 6 ++++++
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index e0307c2c5d..175559c333 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -832,6 +832,8 @@ export default Component.extend(
           placementStrategy = inModal ? "fixed" : "absolute";
         }
 
+        const verticalOffset = this.multiSelect ? 0 : 2;
+
         /* global Popper:true */
         this.popper = Popper.createPopper(anchor, popper, {
           eventsEnabled: false,
@@ -841,7 +843,7 @@ export default Component.extend(
             {
               name: "offset",
               options: {
-                offset: [0, 2]
+                offset: [0, verticalOffset]
               }
             },
             {
@@ -853,7 +855,7 @@ export default Component.extend(
                   ".select-kit-wrapper"
                 );
                 if (wrapper) {
-                  let height = this.element.offsetHeight;
+                  let height = this.element.offsetHeight + verticalOffset;
 
                   const body = this.element.querySelector(".select-kit-body");
                   if (body) {
@@ -873,7 +875,8 @@ export default Component.extend(
                     this.element.classList.add("is-under");
                   }
 
-                  wrapper.style.width = `${this.element.offsetWidth}px`;
+                  // - 1 accounts for any rounding error
+                  wrapper.style.width = `${this.element.offsetWidth - 1}px`;
                   wrapper.style.height = `${height}px`;
                 }
               }
diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss
index e1ee384a8e..65d9d290d5 100644
--- a/app/assets/stylesheets/common/select-kit/multi-select.scss
+++ b/app/assets/stylesheets/common/select-kit/multi-select.scss
@@ -53,6 +53,7 @@
       .multi-select-header {
         border-radius: 0;
         box-shadow: none;
+        outline: none;
       }
 
       .select-kit-body {
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 627325e9c1..65a2125971 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -34,10 +34,6 @@
       box-sizing: border-box;
       width: 100%;
     }
-
-    .select-kit-header {
-      outline: 1px solid $tertiary;
-    }
   }
 
   &.is-loading {
diff --git a/app/assets/stylesheets/common/select-kit/single-select.scss b/app/assets/stylesheets/common/select-kit/single-select.scss
index 4868756a9d..f77def218c 100644
--- a/app/assets/stylesheets/common/select-kit/single-select.scss
+++ b/app/assets/stylesheets/common/select-kit/single-select.scss
@@ -8,4 +8,10 @@
       border-bottom: 1px solid $primary-low;
     }
   }
+
+  &.is-expanded {
+    .select-kit-header {
+      outline: 1px solid $tertiary;
+    }
+  }
 }

From 5fb5807098c7480cc2882bd309588c9d49c71390 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 22 Apr 2020 13:10:02 +0200
Subject: [PATCH 0720/1830] FIX: caret icon should inherit its color (#9513)

---
 app/assets/stylesheets/common/select-kit/select-kit.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 65a2125971..68f268687a 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -111,6 +111,7 @@
       margin-left: auto;
       padding-left: 5px;
       pointer-events: none;
+      color: inherit;
     }
 
     .d-button-label {

From ceee855d00f4ca34a2e49ec32cc8615bd1f94846 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 22 Apr 2020 16:40:59 +0530
Subject: [PATCH 0721/1830] minor code improvement

a511bea4cc3f50bd1e067a46bdbf5cd19eb335a3
---
 app/assets/javascripts/admin/controllers/admin-user-index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js b/app/assets/javascripts/admin/controllers/admin-user-index.js
index f69993c185..9076e56654 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js
@@ -220,13 +220,13 @@ export default Controller.extend(CanCheckEmails, {
         admin: true,
         model: {
           username: this.model.username,
-          targetUsername: targetUsername
+          targetUsername
         }
       });
     },
 
     merge(targetUsername) {
-      return this.model.merge({ targetUsername: targetUsername });
+      return this.model.merge({ targetUsername });
     },
 
     viewActionLogs() {

From c8fed90e4e325dda864c15fa0212cd946b1adccd Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Wed, 22 Apr 2020 12:12:33 +0100
Subject: [PATCH 0722/1830] FIX: Handle sub-sub-category paths without an id

---
 app/controllers/list_controller.rb |  4 +---
 app/controllers/tags_controller.rb |  4 +---
 app/models/category.rb             | 29 ++++++++++++++++++-----------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 498f3ed86e..81511387f7 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -319,9 +319,7 @@ class ListController < ApplicationController
     if id.present?
       @category = Category.find_by_id(id)
     elsif slug_path.present?
-      if (1..2).include?(slug_path.size)
-        @category = Category.find_by_slug(*slug_path.reverse)
-      end
+      @category = Category.find_by_slug_path(slug_path)
 
       # Legacy paths
       if @category.nil? && parts.last =~ /\A\d+-category/
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 72f5935f64..ada5d6f66d 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -359,9 +359,7 @@ class TagsController < ::ApplicationController
       if id.present?
         @filter_on_category = Category.find_by_id(id)
       elsif slug_path.present?
-        if (1..2).include?(slug_path.size)
-          @filter_on_category = Category.find_by_slug(*slug_path.reverse)
-        end
+        @filter_on_category = Category.find_by_slug_path(slug_path)
 
         # Legacy paths
         if @filter_on_category.nil? && parts.last =~ /\A\d+-category/
diff --git a/app/models/category.rb b/app/models/category.rb
index 192204d189..2651602e16 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -777,22 +777,29 @@ class Category < ActiveRecord::Base
     end
   end
 
-  def self.find_by_slug(category_slug, parent_category_slug = nil)
-
-    return nil if category_slug.nil?
+  def self.find_by_slug_path(slug_path)
+    return nil if slug_path.empty?
+    return nil if slug_path.size > SiteSetting.max_category_nesting
 
     if SiteSetting.slug_generation_method == "encoded"
-      parent_category_slug = CGI.escape(parent_category_slug) unless parent_category_slug.nil?
-      category_slug = CGI.escape(category_slug)
+      slug_path.map! { |slug| CGI.escape(slug) }
     end
 
-    if parent_category_slug
-      parent_category_id = self.where(slug: parent_category_slug, parent_category_id: nil).select(:id)
+    query =
+      slug_path.inject(nil) do |parent_id, slug|
+        Category.where(
+          slug: slug,
+          parent_category_id: parent_id,
+        ).select(:id)
+      end
 
-      self.where(slug: category_slug, parent_category_id: parent_category_id).first
-    else
-      self.where(slug: category_slug, parent_category_id: nil).first
-    end
+    Category.find_by_id(query)
+  end
+
+  def self.find_by_slug(category_slug, parent_category_slug = nil)
+    return nil if category_slug.nil?
+
+    find_by_slug_path([parent_category_slug, category_slug].compact)
   end
 
   def subcategory_list_includes_topics?

From e5c44f6dcff9717c799dfc80933368f7ddc35998 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 22 Apr 2020 17:42:09 +0530
Subject: [PATCH 0723/1830] UX: display 'merge' button in all non-staff user
 profiles.

---
 app/assets/javascripts/admin/templates/user-index.hbs | 3 +++
 app/controllers/admin/users_controller.rb             | 2 +-
 app/serializers/admin_detailed_user_serializer.rb     | 5 +++++
 lib/guardian/user_guardian.rb                         | 8 ++++++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 76aee47271..adbe7e50e9 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -683,6 +683,9 @@
                  icon="trash-alt"
                  class="btn-danger"
                  action=(action "destroy")}}
+    {{/if}}
+
+    {{#if model.can_be_merged}}
       {{d-button label="admin.user.merge.transfer_and_delete"
                  icon="trash-alt"
                  class="btn-danger"
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 4ed8a10a0f..8902781834 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -476,7 +476,7 @@ class Admin::UsersController < Admin::AdminController
     target_username = params.require(:target_username)
     target_user = User.find_by_username(target_username)
 
-    guardian.ensure_can_merge_user!(@user, target_user)
+    guardian.ensure_can_merge_users!(@user, target_user)
 
     if user = UserMerger.new(@user, target_user, current_user).merge!
       render json: success_json.merge(merged: true, user: user)
diff --git a/app/serializers/admin_detailed_user_serializer.rb b/app/serializers/admin_detailed_user_serializer.rb
index 4a83a594b1..c0b18e3df5 100644
--- a/app/serializers/admin_detailed_user_serializer.rb
+++ b/app/serializers/admin_detailed_user_serializer.rb
@@ -18,6 +18,7 @@ class AdminDetailedUserSerializer < AdminUserSerializer
              :can_delete_all_posts,
              :can_be_deleted,
              :can_be_anonymized,
+             :can_be_merged,
              :full_suspend_reason,
              :suspended_till,
              :silence_reason,
@@ -74,6 +75,10 @@ class AdminDetailedUserSerializer < AdminUserSerializer
     scope.can_anonymize_user?(object)
   end
 
+  def can_be_merged
+    scope.can_merge_user?(object)
+  end
+
   def topic_count
     object.topics.count
   end
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index 1461c69d69..d8b65e1407 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -76,8 +76,12 @@ module UserGuardian
     is_staff? && !user.nil? && !user.staff?
   end
 
-  def can_merge_user?(source_user, target_user)
-    is_admin? && !source_user.nil? && !source_user.staff? && !target_user.nil?
+  def can_merge_user?(user)
+    is_admin? && !user.nil? && !user.staff?
+  end
+
+  def can_merge_users?(source_user, target_user)
+    can_merge_user?(source_user) && !target_user.nil?
   end
 
   def can_reset_bounce_score?(user)

From b7dea0d5c1c6975b78602164c6500dad1449c169 Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Wed, 22 Apr 2020 08:57:25 -0500
Subject: [PATCH 0724/1830] FIX: Copy button was displayed on quoted codeblock
 (#9514)

---
 .../javascripts/discourse/initializers/copy-codeblocks.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/initializers/copy-codeblocks.js b/app/assets/javascripts/discourse/initializers/copy-codeblocks.js
index 777400db57..f7e81af46a 100644
--- a/app/assets/javascripts/discourse/initializers/copy-codeblocks.js
+++ b/app/assets/javascripts/discourse/initializers/copy-codeblocks.js
@@ -114,7 +114,7 @@ export default {
         }
 
         const commands = postElements[0].querySelectorAll(
-          ":scope > pre > code, :scope :not(article) > pre > code"
+          ":scope > pre > code, :scope :not(article):not(blockquote) > pre > code"
         );
 
         const post = helper.getModel();

From 32f3f1c14beff6782533e723d294e36a22bbfd79 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 22 Apr 2020 10:26:09 -0400
Subject: [PATCH 0725/1830] Build(deps-dev): Bump mock_redis from 0.22.0 to
 0.23.0 (#9506)

Bumps [mock_redis](https://github.com/sds/mock_redis) from 0.22.0 to 0.23.0.
- [Release notes](https://github.com/sds/mock_redis/releases)
- [Changelog](https://github.com/sds/mock_redis/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/mock_redis/compare/v0.22.0...v0.23.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 3a60704820..bc0921c126 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -196,7 +196,7 @@ GEM
       ffi (~> 1.9)
     minitest (5.14.0)
     mocha (1.11.2)
-    mock_redis (0.22.0)
+    mock_redis (0.23.0)
     msgpack (1.3.3)
     multi_json (1.14.1)
     multi_xml (0.6.0)

From 4d4560251743f941e2477bc0fca8ea5e72d5f2c0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 22 Apr 2020 10:26:31 -0400
Subject: [PATCH 0726/1830] Build(deps): Bump mini_racer from 0.2.9 to 0.2.10
 (#9507)

Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.2.9 to 0.2.10.
- [Release notes](https://github.com/discourse/mini_racer/releases)
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG)
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.9...v0.2.10)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index bc0921c126..e29ba65db6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -187,8 +187,8 @@ GEM
     method_source (0.9.2)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    mini_racer (0.2.9)
-      libv8 (>= 6.9.411)
+    mini_racer (0.2.10)
+      libv8 (> 7.3)
     mini_scheduler (0.12.2)
       sidekiq
     mini_sql (0.2.5)

From 58bdc04aac1256a857e35fca4e8b7089853764ee Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 22 Apr 2020 10:51:19 -0400
Subject: [PATCH 0727/1830] Version bump to v2.5.0.beta3

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

diff --git a/lib/version.rb b/lib/version.rb
index 2d8503a967..07f2377661 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -9,7 +9,7 @@ module Discourse
       MAJOR = 2
       MINOR = 5
       TINY  = 0
-      PRE   = 'beta2'
+      PRE   = 'beta3'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end

From 13f2723dcbc18158ee2ef4fa6cf1540baf59875f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 22 Apr 2020 11:53:47 -0400
Subject: [PATCH 0728/1830] FIX: Don't log an error to logster if a topic could
 not be updated.

If for some reason an update did not go through (for example,
concurrently updating the same topic twice), we were logging something
like:

```
create_errors_json called with unrecognized type: #<Topic
```

This happened because we knew an error occurred but the active record
object had no errors attached.

This patch fixes the issue by attaching a proper error message in the
event that this happens.
---
 app/controllers/topics_controller.rb    |  4 ++++
 config/locales/server.en.yml            |  1 +
 spec/requests/topics_controller_spec.rb | 10 ++++++++++
 3 files changed, 15 insertions(+)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index e0ecde628f..2d93468185 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -372,6 +372,10 @@ class TopicsController < ApplicationController
     if changes.length > 0
       first_post = topic.ordered_posts.first
       success = PostRevisor.new(first_post, topic).revise!(current_user, changes, validate_post: false)
+
+      if !success && topic.errors.blank?
+        topic.errors.add(:base, :unable_to_update)
+      end
     end
 
     # this is used to return the title to the client as it may have been changed by "TextCleaner"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 23f492a394..004f511e03 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -534,6 +534,7 @@ en:
               no_user_selected: "You must select a valid user."
               reply_by_email_disabled: "Reply by email has been disabled."
               target_user_not_found: "One of the users you are sending this message to could not be found."
+              unable_to_update: "There was an error updating that topic."
             featured_link:
               invalid: "is invalid. URL should include http:// or https://."
               invalid_category: "can't be edited in this category."
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index e48a2f9483..ebb2b90f04 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -956,6 +956,16 @@ RSpec.describe TopicsController do
           expect(::JSON.parse(response.body)['basic_topic']).to be_present
         end
 
+        it "throws an error if it could not be saved" do
+          PostRevisor.any_instance.stubs(:should_revise?).returns(false)
+          put "/t/#{topic.slug}/#{topic.id}.json", params: { title: "brand new title" }
+
+          expect(response.status).to eq(422)
+          expect(response.parsed_body['errors'].first).to eq(
+            I18n.t("activerecord.errors.models.topic.attributes.base.unable_to_update")
+          )
+        end
+
         it "can update a topic to an uncategorized topic" do
           topic.update!(category: Fabricate(:category))
 

From 45f3517ef6a19f73be34f6a4c5c78b1fa6e0b2e6 Mon Sep 17 00:00:00 2001
From: Eric Mueller <em@themepark.com>
Date: Wed, 22 Apr 2020 18:00:44 +0200
Subject: [PATCH 0729/1830] FEATURE: add class to <aside> quote block when
 quoting an ignored user (#9511)

* add class to <aside> quote block when quoted an ignored user

* Changed from single to double quotes
---
 app/assets/javascripts/discourse/widgets/post-cooked.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js b/app/assets/javascripts/discourse/widgets/post-cooked.js
index 3b0ca2423d..f587a76817 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js
@@ -241,6 +241,7 @@ export default class PostCooked {
         .slice(0, -1);
       if (username.length > 0 && this.ignoredUsers.includes(username)) {
         $aside.find("p").remove();
+        $aside.addClass("ignored-user");
       }
     }
     $(".quote-controls", $aside).html(expandContract + navLink);

From 04fb37c7a41c99404a6f8373a2e9ba22b9874d22 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 22 Apr 2020 11:03:28 -0500
Subject: [PATCH 0730/1830] DEV: Export openNewCategoryModal from
 discovery-categories (#9501)

---
 .../discourse/routes/discovery-categories.js  | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js b/app/assets/javascripts/discourse/routes/discovery-categories.js
index 451d9cc3f8..2770a8093e 100644
--- a/app/assets/javascripts/discourse/routes/discovery-categories.js
+++ b/app/assets/javascripts/discourse/routes/discovery-categories.js
@@ -110,22 +110,7 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
     },
 
     createCategory() {
-      const groups = this.site.groups,
-        everyoneName = groups.findBy("id", 0).name;
-
-      const model = this.store.createRecord("category", {
-        color: "0088CC",
-        text_color: "FFFFFF",
-        group_permissions: [{ group_name: everyoneName, permission_type: 1 }],
-        available_groups: groups.map(g => g.name),
-        allow_badges: true,
-        topic_featured_link_allowed: true,
-        custom_fields: {},
-        search_priority: searchPriorities.normal
-      });
-
-      showModal("edit-category", { model });
-      this.controllerFor("edit-category").set("selectedTab", "general");
+      openNewCategoryModal(this);
     },
 
     reorderCategories() {
@@ -148,4 +133,22 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
   }
 });
 
+export function openNewCategoryModal(context) {
+  const groups = context.site.groups,
+    everyoneName = groups.findBy("id", 0).name;
+
+  const model = context.store.createRecord("category", {
+    color: "0088CC",
+    text_color: "FFFFFF",
+    group_permissions: [{ group_name: everyoneName, permission_type: 1 }],
+    available_groups: groups.map(g => g.name),
+    allow_badges: true,
+    topic_featured_link_allowed: true,
+    custom_fields: {},
+    search_priority: searchPriorities.normal
+  });
+
+  showModal("edit-category", { model }).set("selectedTab", "general");
+}
+
 export default DiscoveryCategoriesRoute;

From 81c216e04c13fbc4ea35dae4f1bac355eda4cea9 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Thu, 23 Apr 2020 02:24:54 +1000
Subject: [PATCH 0731/1830] FIX: composer problem on the categories page
 (#9508)

---
 app/serializers/topic_list_item_serializer.rb       |  2 +-
 spec/serializers/topic_list_item_serializer_spec.rb | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/serializers/topic_list_item_serializer.rb b/app/serializers/topic_list_item_serializer.rb
index 7962c400c0..d0cff44cb8 100644
--- a/app/serializers/topic_list_item_serializer.rb
+++ b/app/serializers/topic_list_item_serializer.rb
@@ -21,7 +21,7 @@ class TopicListItemSerializer < ListableTopicSerializer
   has_many :participants, serializer: TopicPosterSerializer, embed: :objects
 
   def posters
-    object.posters || []
+    object.posters || object.posters_summary || []
   end
 
   def op_like_count
diff --git a/spec/serializers/topic_list_item_serializer_spec.rb b/spec/serializers/topic_list_item_serializer_spec.rb
index 1ca54ef311..72acb82aef 100644
--- a/spec/serializers/topic_list_item_serializer_spec.rb
+++ b/spec/serializers/topic_list_item_serializer_spec.rb
@@ -83,5 +83,15 @@ describe TopicListItemSerializer do
 
       expect(json[:tags]).to eq([])
     end
+
+    it 'return posters' do
+      json = TopicListItemSerializer.new(topic,
+        scope: Guardian.new(user),
+        hidden_tag_names: [hidden_tag.name],
+        root: false
+      ).as_json
+
+      expect(json[:posters].length).to eq(1)
+    end
   end
 end

From bf0c055a9a610f6638659f05a4ab34ce407530bf Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 22 Apr 2020 12:29:27 -0400
Subject: [PATCH 0732/1830] UX: add comment-plus icon for reopening topics

---
 .../javascripts/discourse/widgets/post-small-action.js    | 6 +++---
 .../javascripts/discourse/widgets/topic-admin-menu.js     | 4 ++--
 lib/svg_sprite/svg_sprite.rb                              | 1 +
 vendor/assets/svg-icons/discourse-additional.svg          | 8 ++++++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/post-small-action.js b/app/assets/javascripts/discourse/widgets/post-small-action.js
index 19e4531259..b456d3d039 100644
--- a/app/assets/javascripts/discourse/widgets/post-small-action.js
+++ b/app/assets/javascripts/discourse/widgets/post-small-action.js
@@ -33,9 +33,9 @@ export function actionDescription(actionCode, createdAt, username) {
 
 const icons = {
   "closed.enabled": "discourse-comment-slash",
-  "closed.disabled": "discourse-comment",
+  "closed.disabled": "discourse-comment-plus",
   "autoclosed.enabled": "discourse-comment-slash",
-  "autoclosed.disabled": "discourse-comment",
+  "autoclosed.disabled": "discourse-comment-plus",
   "archived.enabled": "folder",
   "archived.disabled": "folder-open",
   "pinned.enabled": "thumbtack",
@@ -52,7 +52,7 @@ const icons = {
   user_left: "minus-circle",
   removed_user: "minus-circle",
   removed_group: "minus-circle",
-  public_topic: "discourse-comment",
+  public_topic: "discourse-comment-plus",
   private_topic: "envelope",
   autobumped: "hand-point-right"
 };
diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js
index edf9d4a14a..904269d5ba 100644
--- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js
+++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js
@@ -165,7 +165,7 @@ export default createWidget("topic-admin-menu", {
           className: "topic-admin-open",
           buttonClass: "btn-default",
           action: "toggleClosed",
-          icon: "discourse-comment",
+          icon: "discourse-comment-plus",
           label: "actions.open"
         });
       } else {
@@ -239,7 +239,7 @@ export default createWidget("topic-admin-menu", {
           action: isPrivateMessage
             ? "convertToPublicTopic"
             : "convertToPrivateMessage",
-          icon: isPrivateMessage ? "discourse-comment" : "envelope",
+          icon: isPrivateMessage ? "discourse-comment-plus" : "envelope",
           label: isPrivateMessage
             ? "actions.make_public"
             : "actions.make_private"
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index 4fdc3e5a87..d28044c96a 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -63,6 +63,7 @@ module SvgSprite
     "discourse-bell-slash",
     "discourse-compress",
     "discourse-comment",
+    "discourse-comment-plus",
     "discourse-comment-slash",
     "discourse-expand",
     "download",
diff --git a/vendor/assets/svg-icons/discourse-additional.svg b/vendor/assets/svg-icons/discourse-additional.svg
index e3adf58e0c..e1d9f8dbf3 100644
--- a/vendor/assets/svg-icons/discourse-additional.svg
+++ b/vendor/assets/svg-icons/discourse-additional.svg
@@ -32,8 +32,12 @@ Additional SVG icons
     <path d="M634 471L481.6 351.8l-6.8-5.3L36 3.5C29.1-2 19-.9 13.5 6l-10 12.5C-2 25.4-.9 35.5 6 41l598 467.5c6.9 5.5 17 4.4 22.5-2.5l10-12.5c5.5-6.9 4.4-17-2.5-22.5zM224.2 89.9c36.8-19.6 81.2-29.1 127.6-24.6 59 5.6 113 33.3 148 76.1 29.5 36 43.3 80 38.8 123.7-2.1 20.4-8 39.7-17 57.3l41.6 32.5c14.8-25.9 24.1-54.4 27.2-84.5 5.9-57.7-11.9-115.2-50.3-162-43.8-53.4-110.7-88-183.4-94.9-63.4-6.1-125.6 8.8-176.5 42l44 34.4zM407.1 416c-22 7.2-45.8 11.1-70.4 11.1-7.4 0-14.9-.4-22.5-1.1-29.6-2.8-57.7-11-83.6-24.4-3.7-1.9-7.8-2.9-11.9-2.9-2.2 0-4.4.3-6.6.9l-102.9 27 38.5-87c3.9-8.7 2.6-18.9-3.2-26.5-15.2-19.6-20.9-48.8-17-86.9.9-8.6 2.5-17 4.7-25.2l-43.6-34.1c-6.5 17.2-10.8 35.3-12.8 54-4.6 44.6 1.7 81.8 18.6 110.7L39.7 454.9c-4 9.1-2.5 19.8 4 27.4 5 5.9 12.3 9.2 19.8 9.2 2.2 0 4.4-.3 6.6-.9l145.8-38.2c29.3 13.8 60.6 22.3 93.4 25.4 9.2.9 18.5 1.3 27.6 1.3 41.4 0 81.5-8.9 117.7-25.9L407.1 416z"/>
   </symbol>
   <!-- "Discourse Comment" is a Discourse derivative of https://fontawesome.com/icons/comment?style=regular that has been built to match the custom discourse-comment-slash icon  -->
-  <symbol id='discourse-comment' viewBox="0 0 554 479.3">
+  <symbol id='discourse-comment' viewBox="0 0 550 512">
     <path d="M26 479.3c-7.5 0-14.8-3.3-19.8-9.2-6.5-7.6-8-18.3-4-27.4l54.6-123.2c-17-28.9-23.2-66.1-18.6-110.7C44.6 146.2 77.8 90.2 131.6 51 184.4 12.4 251.1-5.2 319.2 1.3c72.8 7 139.6 41.5 183.3 94.9 38.4 46.8 56.3 104.4 50.3 162-6.5 62.5-39.6 118.5-93.4 157.7-45.7 33.3-101.7 51-160 51-9.2 0-18.4-.4-27.6-1.3-32.8-3.1-64.2-11.7-93.4-25.4L32.6 478.4c-2.2.6-4.4.9-6.6.9zm155.2-92.7c4.1 0 8.2 1 11.9 2.9 25.9 13.4 54 21.6 83.6 24.4 7.5.7 15 1.1 22.5 1.1 104 0 192.3-69.1 201.9-162 4.5-43.8-9.3-87.7-38.8-123.7-35-42.7-89-70.4-148-76.1-113.5-10.9-214.1 61.4-224.4 161-3.9 38.1 1.8 67.3 17 86.9 5.9 7.6 7.1 17.7 3.2 26.5l-38.5 87 102.9-27c2.3-.7 4.5-1 6.7-1z"/>
   </symbol>
-
+  <!-- "Discourse Comment Plus" is a version of https://fontawesome.com/icons/comment-plus?style=regular that has been recreated to match the custom discourse-comment-slash icon  -->
+  <symbol id='discourse-comment-plus' viewBox="0 0 550 512">
+    <path d="M26 479.3c-7.5 0-14.8-3.3-19.8-9.2-6.5-7.6-8-18.3-4-27.4l54.6-123.2c-17-28.9-23.2-66.1-18.6-110.7C44.6 146.2 77.8 90.2 131.6 51 184.4 12.4 251.1-5.2 319.2 1.3c72.8 7 139.6 41.5 183.3 94.9 38.4 46.8 56.3 104.4 50.3 162-6.5 62.5-39.6 118.5-93.4 157.7-45.7 33.3-101.7 51-160 51-9.2 0-18.4-.4-27.6-1.3-32.8-3.1-64.2-11.7-93.4-25.4L32.6 478.4c-2.2.6-4.4.9-6.6.9zm155.2-92.7c4.1 0 8.2 1 11.9 2.9 25.9 13.4 54 21.6 83.6 24.4 7.5.7 15 1.1 22.5 1.1 104 0 192.3-69.1 201.9-162 4.5-43.8-9.3-87.7-38.8-123.7-35-42.7-89-70.4-148-76.1-113.5-10.9-214.1 61.4-224.4 161-3.9 38.1 1.8 67.3 17 86.9 5.9 7.6 7.1 17.7 3.2 26.5l-38.5 87 102.9-27c2.3-.7 4.5-1 6.7-1z"/>
+    <path d="M375.6 207.7h-54.2v-54.2c0-10.6-8.6-19.2-19.2-19.2h-13.3c-10.6 0-19.2 8.6-19.2 19.2v54.2h-54.2c-10.6 0-19.2 8.6-19.2 19.2v13.3c0 10.6 8.6 19.2 19.2 19.2h54.2v54.2c0 10.6 8.6 19.2 19.2 19.2h13.3c10.6 0 19.2-8.6 19.2-19.2v-54.2h54.2c10.6 0 19.2-8.6 19.2-19.2V227c0-10.6-8.6-19.3-19.2-19.3z"/>
+  </symbol>
 </svg>

From df0c386f8a60d97af5ce7079170ce3d73f1d891d Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 22 Apr 2020 22:07:39 +0530
Subject: [PATCH 0733/1830] UX: drop the `automatic_membership_retroactive`
 column from groups model. (#9430)

---
 .../components/group-manage-save-button.js    |  9 ++++-
 .../discourse/controllers/groups-new.js       | 40 ++++++++++++++++++-
 .../javascripts/discourse/models/group.js     |  1 -
 .../groups-form-membership-fields.hbs         |  8 ----
 app/controllers/admin/groups_controller.rb    | 23 ++++++++++-
 app/controllers/groups_controller.rb          |  1 -
 .../regular/automatic_group_membership.rb     | 12 ++----
 app/models/group.rb                           | 35 +++++++++++++---
 app/serializers/basic_group_serializer.rb     |  5 ---
 config/locales/client.en.yml                  |  2 +-
 config/routes.rb                              |  1 +
 ...matic_membership_retroactive_from_group.rb | 19 +++++++++
 spec/jobs/automatic_group_membership_spec.rb  |  2 +-
 spec/models/group_spec.rb                     | 26 ++++++------
 spec/requests/groups_controller_spec.rb       |  8 +---
 .../basic_group_serializer_spec.rb            |  4 +-
 .../acceptance/admin-user-index-test.js       |  5 ++-
 .../acceptance/group-manage-logs-test.js      |  1 -
 .../group-manage-membership-test.js           |  5 ---
 .../acceptance/group-requests-test.js         |  1 -
 .../acceptance/search-full-test.js            |  1 -
 test/javascripts/fixtures/group-fixtures.js   |  1 -
 test/javascripts/fixtures/groups-fixtures.js  |  3 --
 test/javascripts/fixtures/topic.js            |  1 -
 test/javascripts/fixtures/user_fixtures.js    | 12 +++---
 25 files changed, 144 insertions(+), 82 deletions(-)
 create mode 100644 db/post_migrate/20200415140830_drop_automatic_membership_retroactive_from_group.rb

diff --git a/app/assets/javascripts/discourse/components/group-manage-save-button.js b/app/assets/javascripts/discourse/components/group-manage-save-button.js
index 9adcf9ea82..31217a190f 100644
--- a/app/assets/javascripts/discourse/components/group-manage-save-button.js
+++ b/app/assets/javascripts/discourse/components/group-manage-save-button.js
@@ -1,6 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { popupAutomaticMembershipAlert } from "discourse/controllers/groups-new";
 
 export default Component.extend({
   saving: null,
@@ -14,8 +15,14 @@ export default Component.extend({
   actions: {
     save() {
       this.set("saving", true);
+      const group = this.model;
 
-      return this.model
+      popupAutomaticMembershipAlert(
+        group.id,
+        group.automatic_membership_email_domains
+      );
+
+      return group
         .save()
         .then(() => {
           this.set("saved", true);
diff --git a/app/assets/javascripts/discourse/controllers/groups-new.js b/app/assets/javascripts/discourse/controllers/groups-new.js
index 05013cb7da..25cefd4300 100644
--- a/app/assets/javascripts/discourse/controllers/groups-new.js
+++ b/app/assets/javascripts/discourse/controllers/groups-new.js
@@ -1,18 +1,54 @@
 import { action } from "@ember/object";
 import Controller from "@ember/controller";
+import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
+export function popupAutomaticMembershipAlert(group_id, email_domains) {
+  if (!email_domains) {
+    return;
+  }
+
+  const data = {};
+  data.automatic_membership_email_domains = email_domains;
+
+  if (group_id) {
+    data.id = group_id;
+  }
+
+  ajax(`/admin/groups/automatic_membership_count.json`, {
+    type: "PUT",
+    data
+  }).then(result => {
+    const count = result.user_count;
+
+    if (count > 0) {
+      bootbox.alert(
+        I18n.t(
+          "admin.groups.manage.membership.automatic_membership_user_count",
+          { count }
+        )
+      );
+    }
+  });
+}
+
 export default Controller.extend({
   saving: null,
 
   @action
   save() {
     this.set("saving", true);
+    const group = this.model;
 
-    this.model
+    popupAutomaticMembershipAlert(
+      group.id,
+      group.automatic_membership_email_domains
+    );
+
+    group
       .create()
       .then(() => {
-        this.transitionToRoute("group.members", this.model.name);
+        this.transitionToRoute("group.members", group.name);
       })
       .catch(popupAjaxError)
       .finally(() => this.set("saving", false));
diff --git a/app/assets/javascripts/discourse/models/group.js b/app/assets/javascripts/discourse/models/group.js
index 43e1b525bc..ea4d03d015 100644
--- a/app/assets/javascripts/discourse/models/group.js
+++ b/app/assets/javascripts/discourse/models/group.js
@@ -184,7 +184,6 @@ const Group = RestModel.extend({
       visibility_level: this.visibility_level,
       members_visibility_level: this.members_visibility_level,
       automatic_membership_email_domains: this.emailDomains,
-      automatic_membership_retroactive: !!this.automatic_membership_retroactive,
       title: this.title,
       primary_group: !!this.primary_group,
       grant_trust_level: this.grant_trust_level,
diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs b/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
index b92c678716..2b4fdfa928 100644
--- a/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
+++ b/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
@@ -17,14 +17,6 @@
       onChange=(action "onChangeEmailDomainsSetting")
       options=(hash allowAny=true)
     }}
-
-    <label>
-      {{input type="checkbox"
-          checked=model.automatic_membership_retroactive
-          class="groups-form-automatic-membership-retroactive"}}
-
-      {{i18n "admin.groups.manage.membership.automatic_membership_retroactive"}}
-    </label>
   </div>
 
   {{plugin-outlet name="groups-form-membership-below-automatic"
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 05831871f1..a8413ebefc 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -121,6 +121,28 @@ class Admin::GroupsController < Admin::AdminController
     render json: success_json
   end
 
+  def automatic_membership_count
+    domains = Group.get_valid_email_domains(params.require(:automatic_membership_email_domains))
+    group_id = params[:id]
+    user_count = 0
+
+    if domains.present?
+      if group_id.present?
+        group = Group.find_by(id: group_id)
+        raise Discourse::NotFound unless group
+
+        return can_not_modify_automatic if group.automatic
+
+        existing_domains = group.automatic_membership_email_domains.split("|")
+        domains -= existing_domains
+      end
+
+      user_count = Group.automatic_membership_users(domains.join("|")).count
+    end
+
+    render json: { user_count: user_count }
+  end
+
   protected
 
   def can_not_modify_automatic
@@ -137,7 +159,6 @@ class Admin::GroupsController < Admin::AdminController
       :visibility_level,
       :members_visibility_level,
       :automatic_membership_email_domains,
-      :automatic_membership_retroactive,
       :title,
       :primary_group,
       :grant_trust_level,
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 0df1f49012..c9a623d819 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -537,7 +537,6 @@ class GroupsController < ApplicationController
             :name,
             :grant_trust_level,
             :automatic_membership_email_domains,
-            :automatic_membership_retroactive,
             :publish_read_state
           ])
 
diff --git a/app/jobs/regular/automatic_group_membership.rb b/app/jobs/regular/automatic_group_membership.rb
index e10bc7a013..bf9f6b213d 100644
--- a/app/jobs/regular/automatic_group_membership.rb
+++ b/app/jobs/regular/automatic_group_membership.rb
@@ -11,16 +11,10 @@ module Jobs
       group = Group.find_by(id: group_id)
       raise Discourse::InvalidParameters.new(:group_id) if group.nil?
 
-      return unless group.automatic_membership_retroactive
+      domains = group.automatic_membership_email_domains
+      return if domains.blank?
 
-      domains = group.automatic_membership_email_domains.gsub('.', '\.')
-
-      User.joins(:user_emails)
-        .where("user_emails.email ~* '@(#{domains})$'")
-        .where("users.id NOT IN (SELECT user_id FROM group_users WHERE group_users.group_id = ?)", group_id)
-        .activated
-        .where(staged: false)
-        .find_each do |user|
+      Group.automatic_membership_users(domains).find_each do |user|
         next unless user.email_confirmed?
         group.add(user, automatic: true)
         GroupActionLogger.new(Discourse.system_user, group).log_add_user_to_group(user)
diff --git a/app/models/group.rb b/app/models/group.rb
index 0f8f3d82d4..3e9db5180c 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -770,12 +770,10 @@ class Group < ActiveRecord::Base
   def automatic_membership_email_domains_format_validator
     return if self.automatic_membership_email_domains.blank?
 
-    domains = self.automatic_membership_email_domains.split("|")
-    domains.each do |domain|
-      domain.sub!(/^https?:\/\//, '')
-      domain.sub!(/\/.*$/, '')
+    domains = Group.get_valid_email_domains(self.automatic_membership_email_domains) do |domain|
       self.errors.add :base, (I18n.t('groups.errors.invalid_domain', domain: domain)) unless domain =~ /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,24}(:[0-9]{1,5})?(\/.*)?\Z/i
     end
+
     self.automatic_membership_email_domains = domains.join("|")
   end
 
@@ -791,7 +789,7 @@ class Group < ActiveRecord::Base
   end
 
   def automatic_group_membership
-    if self.automatic_membership_retroactive
+    if self.automatic_membership_email_domains.present?
       Jobs.enqueue(:automatic_group_membership, group_id: self.id)
     end
   end
@@ -842,6 +840,32 @@ class Group < ActiveRecord::Base
     end
   end
 
+  def self.automatic_membership_users(domains, group_id = nil)
+    pattern = "@(#{domains.gsub('.', '\.')})$"
+
+    users = User.joins(:user_emails).where("user_emails.email ~* ?", pattern).activated.where(staged: false)
+    users = users.where("users.id NOT IN (SELECT user_id FROM group_users WHERE group_users.group_id = ?)", group_id) if group_id.present?
+
+    users
+  end
+
+  def self.get_valid_email_domains(value)
+    valid_domains = []
+
+    value.split("|").each do |domain|
+      domain.sub!(/^https?:\/\//, '')
+      domain.sub!(/\/.*$/, '')
+
+      if domain =~ /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,24}(:[0-9]{1,5})?(\/.*)?\Z/i
+        valid_domains << domain
+      else
+        yield domain
+      end
+    end
+
+    valid_domains
+  end
+
   private
 
   def validate_grant_trust_level
@@ -887,7 +911,6 @@ end
 #  automatic                          :boolean          default(FALSE), not null
 #  user_count                         :integer          default(0), not null
 #  automatic_membership_email_domains :text
-#  automatic_membership_retroactive   :boolean          default(FALSE)
 #  primary_group                      :boolean          default(FALSE), not null
 #  title                              :string
 #  grant_trust_level                  :integer
diff --git a/app/serializers/basic_group_serializer.rb b/app/serializers/basic_group_serializer.rb
index df250920d8..1b68420dd3 100644
--- a/app/serializers/basic_group_serializer.rb
+++ b/app/serializers/basic_group_serializer.rb
@@ -10,7 +10,6 @@ class BasicGroupSerializer < ApplicationSerializer
              :messageable_level,
              :visibility_level,
              :automatic_membership_email_domains,
-             :automatic_membership_retroactive,
              :primary_group,
              :title,
              :grant_trust_level,
@@ -56,10 +55,6 @@ class BasicGroupSerializer < ApplicationSerializer
     scope.is_admin?
   end
 
-  def include_automatic_membership_retroactive?
-    scope.is_admin?
-  end
-
   def include_has_messages?
     staff? || scope.can_see_group_messages?(object)
   end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 4ccd3d397a..94a3b84af2 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3460,7 +3460,7 @@ en:
             effects: Effects
             trust_levels_none: "None"
             automatic_membership_email_domains: "Users who register with an email domain that exactly matches one in this list will be automatically added to this group:"
-            automatic_membership_retroactive: "Apply the same email domain rule to add existing registered users"
+            automatic_membership_user_count: "%{count} users have the new email domains and will be added to the group."
             primary_group: "Automatically set as primary group"
         name_placeholder: "Group name, no spaces, same as username rule"
         primary: "Primary Group"
diff --git a/config/routes.rb b/config/routes.rb
index c98b6b3edb..e280af6dd1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -94,6 +94,7 @@ Discourse::Application.routes.draw do
         get 'bulk'
         get 'bulk-complete' => 'groups#bulk'
         put 'bulk' => 'groups#bulk_perform'
+        put "automatic_membership_count" => "groups#automatic_membership_count"
       end
       member do
         put "owners" => "groups#add_owners"
diff --git a/db/post_migrate/20200415140830_drop_automatic_membership_retroactive_from_group.rb b/db/post_migrate/20200415140830_drop_automatic_membership_retroactive_from_group.rb
new file mode 100644
index 0000000000..4e7b779d6b
--- /dev/null
+++ b/db/post_migrate/20200415140830_drop_automatic_membership_retroactive_from_group.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class DropAutomaticMembershipRetroactiveFromGroup < ActiveRecord::Migration[6.0]
+  DROPPED_COLUMNS ||= {
+    groups: %i{
+      automatic_membership_retroactive
+    }
+  }
+
+  def up
+    DROPPED_COLUMNS.each do |table, columns|
+      Migration::ColumnDropper.execute_drop(table, columns)
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/spec/jobs/automatic_group_membership_spec.rb b/spec/jobs/automatic_group_membership_spec.rb
index afac2b7f3f..8a6611e52c 100644
--- a/spec/jobs/automatic_group_membership_spec.rb
+++ b/spec/jobs/automatic_group_membership_spec.rb
@@ -20,7 +20,7 @@ describe Jobs::AutomaticGroupMembership do
     user6 = Fabricate(:user, email: "sso2@wat.com")
     user6.create_single_sign_on_record(external_id: 456, external_email: "sso2@wat.com", last_payload: "")
 
-    group = Fabricate(:group, automatic_membership_email_domains: "wat.com", automatic_membership_retroactive: true)
+    group = Fabricate(:group, automatic_membership_email_domains: "wat.com")
 
     begin
       automatic = nil
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 96e7f27757..0cb8362c80 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -942,27 +942,25 @@ describe Group do
   end
 
   describe '#automatic_group_membership' do
-    describe 'for a automatic_membership_retroactive group' do
-      let(:group) { Fabricate(:group, automatic_membership_retroactive: true) }
+    let(:group) { Fabricate(:group, automatic_membership_email_domains: "example.com") }
 
-      it "should be triggered on create and update" do
-        expect { group }
-          .to change { Jobs::AutomaticGroupMembership.jobs.size }.by(1)
+    it "should be triggered on create and update" do
+      expect { group }
+        .to change { Jobs::AutomaticGroupMembership.jobs.size }.by(1)
 
-        job = Jobs::AutomaticGroupMembership.jobs.last
+      job = Jobs::AutomaticGroupMembership.jobs.last
 
-        expect(job["args"].first["group_id"]).to eq(group.id)
+      expect(job["args"].first["group_id"]).to eq(group.id)
 
-        Jobs::AutomaticGroupMembership.jobs.clear
+      Jobs::AutomaticGroupMembership.jobs.clear
 
-        expect do
-          group.update!(name: 'asdiaksjdias')
-        end.to change { Jobs::AutomaticGroupMembership.jobs.size }.by(1)
+      expect do
+        group.update!(name: 'asdiaksjdias')
+      end.to change { Jobs::AutomaticGroupMembership.jobs.size }.by(1)
 
-        job = Jobs::AutomaticGroupMembership.jobs.last
+      job = Jobs::AutomaticGroupMembership.jobs.last
 
-        expect(job["args"].first["group_id"]).to eq(group.id)
-      end
+      expect(job["args"].first["group_id"]).to eq(group.id)
     end
   end
 
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 0f1027edf3..5edf1bcb6f 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -657,8 +657,7 @@ describe GroupsController do
           mentionable_level: 2,
           messageable_level: 2,
           default_notification_level: 0,
-          grant_trust_level: 0,
-          automatic_membership_retroactive: false
+          grant_trust_level: 0
         )
 
         expect do
@@ -668,7 +667,6 @@ describe GroupsController do
               messageable_level: 1,
               visibility_level: 1,
               automatic_membership_email_domains: 'test.org',
-              automatic_membership_retroactive: true,
               title: 'haha',
               primary_group: true,
               grant_trust_level: 1,
@@ -707,7 +705,6 @@ describe GroupsController do
         expect(group.messageable_level).to eq(1)
         expect(group.default_notification_level).to eq(1)
         expect(group.automatic_membership_email_domains).to eq(nil)
-        expect(group.automatic_membership_retroactive).to eq(false)
         expect(group.title).to eq('haha')
         expect(group.primary_group).to eq(false)
         expect(group.incoming_email).to eq(nil)
@@ -737,7 +734,6 @@ describe GroupsController do
         group.update!(
           visibility_level: 2,
           members_visibility_level: 2,
-          automatic_membership_retroactive: false,
           grant_trust_level: 0
         )
 
@@ -748,7 +744,6 @@ describe GroupsController do
             incoming_email: 'test@mail.org',
             primary_group: true,
             automatic_membership_email_domains: 'test.org',
-            automatic_membership_retroactive: true,
             grant_trust_level: 2,
             visibility_level: 1,
             members_visibility_level: 3
@@ -765,7 +760,6 @@ describe GroupsController do
         expect(group.visibility_level).to eq(1)
         expect(group.members_visibility_level).to eq(3)
         expect(group.automatic_membership_email_domains).to eq('test.org')
-        expect(group.automatic_membership_retroactive).to eq(true)
         expect(group.grant_trust_level).to eq(2)
 
         expect(Jobs::AutomaticGroupMembership.jobs.first["args"].first["group_id"])
diff --git a/spec/serializers/basic_group_serializer_spec.rb b/spec/serializers/basic_group_serializer_spec.rb
index b905f5d4a1..7231e5d29a 100644
--- a/spec/serializers/basic_group_serializer_spec.rb
+++ b/spec/serializers/basic_group_serializer_spec.rb
@@ -41,19 +41,17 @@ describe BasicGroupSerializer do
   end
 
   describe '#automatic_membership_email_domains' do
-    fab!(:group) { Fabricate(:group, automatic_membership_email_domains: 'ilovediscourse.com', automatic_membership_retroactive: true) }
+    fab!(:group) { Fabricate(:group, automatic_membership_email_domains: 'ilovediscourse.com') }
     let(:admin_guardian) { Guardian.new(Fabricate(:admin)) }
 
     it 'should include email domains for admin' do
       subject = described_class.new(group, scope: admin_guardian, root: false, owner_group_ids: [group.id])
       expect(subject.as_json[:automatic_membership_email_domains]).to eq('ilovediscourse.com')
-      expect(subject.as_json[:automatic_membership_retroactive]).to eq(true)
     end
 
     it 'should not include email domains for other users' do
       subject = described_class.new(group, scope: guardian, root: false, owner_group_ids: [group.id])
       expect(subject.as_json[:automatic_membership_email_domains]).to eq(nil)
-      expect(subject.as_json[:automatic_membership_retroactive]).to eq(nil)
     end
 
   end
diff --git a/test/javascripts/acceptance/admin-user-index-test.js b/test/javascripts/acceptance/admin-user-index-test.js
index 6ea2fd87f0..4c57cbbf97 100644
--- a/test/javascripts/acceptance/admin-user-index-test.js
+++ b/test/javascripts/acceptance/admin-user-index-test.js
@@ -15,7 +15,6 @@ acceptance("Admin - User Index", {
           alias_level: 99,
           visible: true,
           automatic_membership_email_domains: "",
-          automatic_membership_retroactive: false,
           primary_group: false,
           title: null,
           grant_trust_level: null,
@@ -38,7 +37,9 @@ acceptance("Admin - User Index", {
 QUnit.test("can edit username", async assert => {
   pretender.put("/users/sam/preferences/username", () => [
     200,
-    { "Content-Type": "application/json" },
+    {
+      "Content-Type": "application/json"
+    },
     { id: 2, username: "new-sam" }
   ]);
 
diff --git a/test/javascripts/acceptance/group-manage-logs-test.js b/test/javascripts/acceptance/group-manage-logs-test.js
index 1a3d6ada4a..f0587b3b2e 100644
--- a/test/javascripts/acceptance/group-manage-logs-test.js
+++ b/test/javascripts/acceptance/group-manage-logs-test.js
@@ -13,7 +13,6 @@ acceptance("Group logs", {
           alias_level: 0,
           visible: true,
           automatic_membership_email_domains: "",
-          automatic_membership_retroactive: false,
           primary_group: true,
           title: "Team Snorlax",
           grant_trust_level: null,
diff --git a/test/javascripts/acceptance/group-manage-membership-test.js b/test/javascripts/acceptance/group-manage-membership-test.js
index e43678a7c8..c7837a3ec5 100644
--- a/test/javascripts/acceptance/group-manage-membership-test.js
+++ b/test/javascripts/acceptance/group-manage-membership-test.js
@@ -13,11 +13,6 @@ QUnit.test("As an admin", async assert => {
     "it should display automatic membership label"
   );
 
-  assert.ok(
-    find(".groups-form-automatic-membership-retroactive").length === 1,
-    "it should display automatic membership retroactive checkbox"
-  );
-
   assert.ok(
     find(".groups-form-primary-group").length === 1,
     "it should display set as primary group checkbox"
diff --git a/test/javascripts/acceptance/group-requests-test.js b/test/javascripts/acceptance/group-requests-test.js
index 68ccf7f867..9c4e9a8a72 100644
--- a/test/javascripts/acceptance/group-requests-test.js
+++ b/test/javascripts/acceptance/group-requests-test.js
@@ -17,7 +17,6 @@ acceptance("Group Requests", {
           messageable_level: 0,
           visibility_level: 0,
           automatic_membership_email_domains: "",
-          automatic_membership_retroactive: false,
           primary_group: false,
           title: "Macdonald",
           grant_trust_level: null,
diff --git a/test/javascripts/acceptance/search-full-test.js b/test/javascripts/acceptance/search-full-test.js
index e961e8015a..d869af65a3 100644
--- a/test/javascripts/acceptance/search-full-test.js
+++ b/test/javascripts/acceptance/search-full-test.js
@@ -30,7 +30,6 @@ acceptance("Search - Full Page", {
         alias_level: 0,
         visible: true,
         automatic_membership_email_domains: null,
-        automatic_membership_retroactive: false,
         primary_group: false,
         title: null,
         grant_trust_level: null,
diff --git a/test/javascripts/fixtures/group-fixtures.js b/test/javascripts/fixtures/group-fixtures.js
index 89842f3245..b509e79cd4 100644
--- a/test/javascripts/fixtures/group-fixtures.js
+++ b/test/javascripts/fixtures/group-fixtures.js
@@ -9,7 +9,6 @@ export default {
       messageable_level: 99,
       visibility_level: 0,
       automatic_membership_email_domains: null,
-      automatic_membership_retroactive: false,
       primary_group: false,
       title: null,
       grant_trust_level: null,
diff --git a/test/javascripts/fixtures/groups-fixtures.js b/test/javascripts/fixtures/groups-fixtures.js
index 46d6511dd2..b6c020ee93 100644
--- a/test/javascripts/fixtures/groups-fixtures.js
+++ b/test/javascripts/fixtures/groups-fixtures.js
@@ -9,7 +9,6 @@ export default {
         alias_level: 0,
         visible: true,
         automatic_membership_email_domains: "",
-        automatic_membership_retroactive: false,
         primary_group: false,
         title: null,
         grant_trust_level: null,
@@ -31,7 +30,6 @@ export default {
         alias_level: 99,
         visible: true,
         automatic_membership_email_domains: "",
-        automatic_membership_retroactive: false,
         primary_group: false,
         title: null,
         grant_trust_level: null,
@@ -61,7 +59,6 @@ export default {
         alias_level: 0,
         visible: true,
         automatic_membership_email_domains: "",
-        automatic_membership_retroactive: false,
         primary_group: false,
         title: null,
         grant_trust_level: null,
diff --git a/test/javascripts/fixtures/topic.js b/test/javascripts/fixtures/topic.js
index dedf9814b8..b520532feb 100644
--- a/test/javascripts/fixtures/topic.js
+++ b/test/javascripts/fixtures/topic.js
@@ -4060,7 +4060,6 @@ export default {
           alias_level: 99,
           visible: true,
           automatic_membership_email_domains: "",
-          automatic_membership_retroactive: false,
           primary_group: false,
           title: null,
           grant_trust_level: null,
diff --git a/test/javascripts/fixtures/user_fixtures.js b/test/javascripts/fixtures/user_fixtures.js
index b22180109d..2bac0bfe34 100644
--- a/test/javascripts/fixtures/user_fixtures.js
+++ b/test/javascripts/fixtures/user_fixtures.js
@@ -204,7 +204,6 @@ export default {
           alias_level: 0,
           visible: true,
           automatic_membership_email_domains: null,
-          automatic_membership_retroactive: false,
           primary_group: false,
           title: null
         },
@@ -216,7 +215,6 @@ export default {
           alias_level: 0,
           visible: true,
           automatic_membership_email_domains: null,
-          automatic_membership_retroactive: false,
           primary_group: false,
           title: null
         }
@@ -2250,7 +2248,11 @@ export default {
             { extras: null, description: "Most Posts", user_id: 5460 },
             { extras: null, description: "Frequent Poster", user_id: 402 },
             { extras: null, description: "Frequent Poster", user_id: 5707 },
-            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 32
+            }
           ]
         },
         {
@@ -2539,7 +2541,6 @@ export default {
           messageable_level: 0,
           visibility_level: 0,
           automatic_membership_email_domains: null,
-          automatic_membership_retroactive: false,
           primary_group: false,
           title: null,
           grant_trust_level: null,
@@ -2567,7 +2568,6 @@ export default {
           messageable_level: 0,
           visibility_level: 0,
           automatic_membership_email_domains: null,
-          automatic_membership_retroactive: false,
           primary_group: false,
           title: null,
           grant_trust_level: null,
@@ -2595,7 +2595,6 @@ export default {
           messageable_level: 0,
           visibility_level: 0,
           automatic_membership_email_domains: null,
-          automatic_membership_retroactive: false,
           primary_group: false,
           title: null,
           grant_trust_level: null,
@@ -2623,7 +2622,6 @@ export default {
           messageable_level: 0,
           visibility_level: 0,
           automatic_membership_email_domains: null,
-          automatic_membership_retroactive: false,
           primary_group: false,
           title: null,
           grant_trust_level: null,

From b810fc282d395ccd4172468494f389393dae1477 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Thu, 5 Mar 2020 20:52:45 -0300
Subject: [PATCH 0734/1830] FEATURE: Digital Ocean Spaces compatibility for
 Object Storage

DO does not implement tagging support for S3 objects. Removing our default
empty tag fixes compatibility.

The expire_missing_assets rake task can't be used with that service still,
but this patch allows normal operation.
---
 lib/tasks/s3.rake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/tasks/s3.rake b/lib/tasks/s3.rake
index b72b9e083f..b913b0a0ee 100644
--- a/lib/tasks/s3.rake
+++ b/lib/tasks/s3.rake
@@ -21,8 +21,7 @@ def upload(path, remote_path, content_type, content_encoding = nil)
   options = {
     cache_control: 'max-age=31556952, public, immutable',
     content_type: content_type,
-    acl: 'public-read',
-    tagging: ''
+    acl: 'public-read'
   }
 
   if content_encoding

From 80a572d3b7165210bbde19b143dcc7ec7187d85d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 22 Apr 2020 14:04:45 -0400
Subject: [PATCH 0735/1830] FIX: Multisite spec was failing in parallel
 environment

We were not adding the test number to the path in all places.
---
 lib/s3_helper.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/s3_helper.rb b/lib/s3_helper.rb
index 15e137b760..5763921caa 100644
--- a/lib/s3_helper.rb
+++ b/lib/s3_helper.rb
@@ -247,7 +247,9 @@ class S3Helper
   end
 
   def multisite_upload_path
-    File.join("uploads", RailsMultisite::ConnectionManagement.current_db, "/")
+    path = File.join("uploads", RailsMultisite::ConnectionManagement.current_db, "/")
+    return path unless Discourse.is_parallel_test?
+    File.join(path, ENV['TEST_ENV_NUMBER'].presence || '1', "/")
   end
 
   def s3_resource

From e4a0e0beadcd58c35becfa1af30426c6caa0f797 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 22 Apr 2020 14:27:01 -0400
Subject: [PATCH 0736/1830] FIX: Ignore removed column

---
 app/models/group.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/models/group.rb b/app/models/group.rb
index 3e9db5180c..1f93c99b2c 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 class Group < ActiveRecord::Base
+  self.ignored_columns = %w{
+    automatic_membership_retroactive
+  }
+
   include HasCustomFields
   include AnonCacheInvalidator
   include HasDestroyedWebHook

From 4c248fc5c413b44b036911b402e4bd454ec48168 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 22 Apr 2020 20:39:45 +0200
Subject: [PATCH 0737/1830] UX: do not attempt to full width sk on mobile
 (#9520)

---
 .../javascripts/select-kit/components/select-kit.js  | 12 ------------
 .../stylesheets/common/select-kit/select-kit.scss    |  1 +
 .../stylesheets/mobile/select-kit/select-kit.scss    |  4 ----
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 175559c333..27e849ae1d 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -813,20 +813,8 @@ export default Component.extend(
           `[data-select-kit-id=${this.selectKit.uniqueID}-body]`
         );
 
-        if (
-          this.site &&
-          !this.site.mobileView &&
-          popper.offsetWidth < anchor.offsetWidth
-        ) {
-          popper.style.minWidth = `${anchor.offsetWidth}px`;
-        }
-
         const inModal = $(this.element).parents("#discourse-modal").length;
 
-        if (this.site && !this.site.mobileView && inModal) {
-          popper.style.width = `${anchor.offsetWidth}px`;
-        }
-
         let placementStrategy = this.selectKit.options.placementStrategy;
         if (!placementStrategy) {
           placementStrategy = inModal ? "fixed" : "absolute";
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 68f268687a..d128feb04c 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -133,6 +133,7 @@
     background: $secondary;
     box-sizing: border-box;
     min-width: inherit;
+    width: auto;
   }
 
   .select-kit-row {
diff --git a/app/assets/stylesheets/mobile/select-kit/select-kit.scss b/app/assets/stylesheets/mobile/select-kit/select-kit.scss
index aadd43a6c2..1589036a07 100644
--- a/app/assets/stylesheets/mobile/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/mobile/select-kit/select-kit.scss
@@ -3,10 +3,6 @@
     z-index: z("dropdown");
   }
 
-  .select-kit-body {
-    width: 100vw;
-  }
-
   .select-kit-filter {
     .filter-input {
       font-size: 16px;

From 00f632fb0d48d7f6ae00e0e6133d0bc3c7d8d012 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 22 Apr 2020 20:39:55 +0200
Subject: [PATCH 0738/1830] REFACTOR:
 s/translatedfilterPlaceholder/translatedFilterPlaceholder (#9521)

---
 .../select-kit/components/select-kit.js        |  2 +-
 .../components/select-kit/select-kit-filter.js | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 27e849ae1d..360dd65738 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -257,7 +257,7 @@ export default Component.extend(
       autoFilterable: "autoFilterable",
       filterIcon: "search",
       filterPlaceholder: "filterPlaceholder",
-      translatedfilterPlaceholder: null,
+      translatedFilterPlaceholder: null,
       icon: null,
       icons: null,
       maximum: null,
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js b/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js
index 0c833d0a0c..1b562790b1 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js
@@ -1,6 +1,6 @@
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
-import { isEmpty } from "@ember/utils";
+import { isPresent } from "@ember/utils";
 import { computed } from "@ember/object";
 import { not } from "@ember/object/computed";
 import UtilsMixin from "select-kit/mixins/utils";
@@ -30,14 +30,18 @@ export default Component.extend(UtilsMixin, {
 
   @discourseComputed(
     "selectKit.options.filterPlaceholder",
-    "selectKit.options.translatedfilterPlaceholder"
+    "selectKit.options.translatedFilterPlaceholder"
   )
   placeholder(placeholder, translatedPlaceholder) {
-    return isEmpty(placeholder)
-      ? translatedPlaceholder
-        ? translatedPlaceholder
-        : ""
-      : I18n.t(placeholder);
+    if (isPresent(translatedPlaceholder)) {
+      return translatedPlaceholder;
+    }
+
+    if (isPresent(placeholder)) {
+      return I18n.t(placeholder);
+    }
+
+    return "";
   },
 
   actions: {

From 8adccaf98c73612ebef7c6b4caf2927dfffa80fc Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 22 Apr 2020 20:49:53 +0200
Subject: [PATCH 0739/1830] DEV: Use dynamic/static fabricator attrs correctly
 (#9519)

---
 spec/fabricators/post_fabricator.rb                | 2 +-
 spec/fabricators/topic_fabricator.rb               | 2 +-
 spec/fabricators/topic_timer_fabricator.rb         | 2 +-
 spec/fabricators/upload_fabricator.rb              | 4 ++--
 spec/fabricators/watched_word_fabricator.rb        | 2 +-
 spec/fabricators/web_crawler_request_fabricator.rb | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spec/fabricators/post_fabricator.rb b/spec/fabricators/post_fabricator.rb
index cd18b78967..412504c7c4 100644
--- a/spec/fabricators/post_fabricator.rb
+++ b/spec/fabricators/post_fabricator.rb
@@ -20,7 +20,7 @@ end
 
 Fabricator(:old_post, from: :post) do
   topic { |attrs| Fabricate(:topic, user: attrs[:user], created_at: (DateTime.now - 100)) }
-  created_at (DateTime.now - 100)
+  created_at { 100.days.ago }
 end
 
 Fabricator(:moderator_post, from: :post) do
diff --git a/spec/fabricators/topic_fabricator.rb b/spec/fabricators/topic_fabricator.rb
index 8fc0307929..3bcee07d2e 100644
--- a/spec/fabricators/topic_fabricator.rb
+++ b/spec/fabricators/topic_fabricator.rb
@@ -9,7 +9,7 @@ Fabricator(:topic) do
 end
 
 Fabricator(:deleted_topic, from: :topic) do
-  deleted_at Time.now
+  deleted_at { 1.minute.ago }
 end
 
 Fabricator(:closed_topic, from: :topic) do
diff --git a/spec/fabricators/topic_timer_fabricator.rb b/spec/fabricators/topic_timer_fabricator.rb
index 99bacf7cb5..56e3bbae13 100644
--- a/spec/fabricators/topic_timer_fabricator.rb
+++ b/spec/fabricators/topic_timer_fabricator.rb
@@ -3,6 +3,6 @@
 Fabricator(:topic_timer) do
   user
   topic
-  execute_at Time.zone.now + 1.hour
+  execute_at { 1.hour.from_now }
   status_type TopicTimer.types[:close]
 end
diff --git a/spec/fabricators/upload_fabricator.rb b/spec/fabricators/upload_fabricator.rb
index 72bcb6c723..c2f6952736 100644
--- a/spec/fabricators/upload_fabricator.rb
+++ b/spec/fabricators/upload_fabricator.rb
@@ -45,7 +45,7 @@ Fabricator(:video_upload, from: :upload) do
 end
 
 Fabricator(:secure_upload, from: :upload) do
-  secure { true }
+  secure true
   sha1 { SecureRandom.hex(20) }
   original_sha1 { sequence(:sha1) { |n| Digest::SHA1.hexdigest(n.to_s) } }
 end
@@ -67,7 +67,7 @@ Fabricator(:upload_s3, from: :upload) do
 end
 
 Fabricator(:secure_upload_s3, from: :upload_s3) do
-  secure { true }
+  secure true
   sha1 { SecureRandom.hex(20) }
   original_sha1 { sequence(:sha1) { |n| Digest::SHA1.hexdigest(n.to_s) } }
 end
diff --git a/spec/fabricators/watched_word_fabricator.rb b/spec/fabricators/watched_word_fabricator.rb
index b3796cad15..521cb2fded 100644
--- a/spec/fabricators/watched_word_fabricator.rb
+++ b/spec/fabricators/watched_word_fabricator.rb
@@ -2,5 +2,5 @@
 
 Fabricator(:watched_word) do
   word { sequence(:word) { |i| "word#{i}" } }
-  action { WatchedWord.actions[:block] }
+  action WatchedWord.actions[:block]
 end
diff --git a/spec/fabricators/web_crawler_request_fabricator.rb b/spec/fabricators/web_crawler_request_fabricator.rb
index 2d2be02fdf..a20ab4225f 100644
--- a/spec/fabricators/web_crawler_request_fabricator.rb
+++ b/spec/fabricators/web_crawler_request_fabricator.rb
@@ -2,6 +2,6 @@
 
 Fabricator(:web_crawler_request) do
   user_agent { sequence(:ua) { |i| "Googlebot #{i}.0" } }
-  date Time.zone.now.to_date
+  date { Time.zone.now.to_date }
   count 0
 end

From 9cbbaf4237e2343348f5d0a7375796e6712b4580 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Wed, 22 Apr 2020 13:50:45 -0600
Subject: [PATCH 0740/1830] FIX: Don't throw 500 for invalid website url input

It's possible to cause a 500 error by putting in weird characters in the
input field for updating a users website on their profile.

Normal invalid input like not including the domain extension is already
handled by the user_profile model validation. This fix ensures a server
error doesn't occur for weird input characters.
---
 app/services/user_updater.rb       | 35 +++++++++++++++++-------------
 spec/services/user_updater_spec.rb |  9 ++++++++
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 5b3396f101..cdd5203f96 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -149,25 +149,30 @@ class UserUpdater
 
     saved = nil
 
-    User.transaction do
-      if attributes.key?(:muted_usernames)
-        update_muted_users(attributes[:muted_usernames])
-      end
+    begin
+      User.transaction do
+        if attributes.key?(:muted_usernames)
+          update_muted_users(attributes[:muted_usernames])
+        end
 
-      if attributes.key?(:ignored_usernames)
-        update_ignored_users(attributes[:ignored_usernames])
-      end
+        if attributes.key?(:ignored_usernames)
+          update_ignored_users(attributes[:ignored_usernames])
+        end
 
-      name_changed = user.name_changed?
-      if (saved = (!save_options || user.user_option.save) && user_profile.save && user.save) &&
-         (name_changed && old_user_name.casecmp(attributes.fetch(:name)) != 0)
+        name_changed = user.name_changed?
+        if (saved = (!save_options || user.user_option.save) && user_profile.save && user.save) &&
+           (name_changed && old_user_name.casecmp(attributes.fetch(:name)) != 0)
 
-        StaffActionLogger.new(@actor).log_name_change(
-          user.id,
-          old_user_name,
-          attributes.fetch(:name) { '' }
-        )
+          StaffActionLogger.new(@actor).log_name_change(
+            user.id,
+            old_user_name,
+            attributes.fetch(:name) { '' }
+          )
+        end
       end
+    rescue Addressable::URI::InvalidURIError => e
+      # Prevent 500 for crazy url input
+      return saved
     end
 
     DiscourseEvent.trigger(:user_updated, user) if saved
diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb
index 5ca012fc13..c18949ab5e 100644
--- a/spec/services/user_updater_spec.rb
+++ b/spec/services/user_updater_spec.rb
@@ -416,6 +416,15 @@ describe UserUpdater do
       end
     end
 
+    context 'when website is invalid' do
+      it 'returns an error' do
+        user = Fabricate(:user)
+        updater = UserUpdater.new(acting_user, user)
+
+        expect(updater.update(website: 'ʔ<')).to eq nil
+      end
+    end
+
     context 'when custom_fields is empty string' do
       it "update is successful" do
         user = Fabricate(:user)

From 094ddb1c1ffcd305e841dfa1efd6981507519054 Mon Sep 17 00:00:00 2001
From: discoursehosting <support@discoursehosting.com>
Date: Wed, 22 Apr 2020 22:04:59 +0200
Subject: [PATCH 0741/1830] VBulletin5 importer improvements (#9477)

- no more hard coded contenttypes
- permalinks for topics, categories, subcategories
- better uploads handling
- tag support
---
 script/import_scripts/vbulletin5.rb | 302 ++++++++++++++++++----------
 1 file changed, 198 insertions(+), 104 deletions(-)

diff --git a/script/import_scripts/vbulletin5.rb b/script/import_scripts/vbulletin5.rb
index 38489314b2..682cbcdc50 100644
--- a/script/import_scripts/vbulletin5.rb
+++ b/script/import_scripts/vbulletin5.rb
@@ -6,14 +6,19 @@ require 'htmlentities'
 
 class ImportScripts::VBulletin < ImportScripts::Base
   BATCH_SIZE = 1000
-  DBPREFIX = "vb_"
   ROOT_NODE = 2
-
-  # CHANGE THESE BEFORE RUNNING THE IMPORTER
-  DATABASE = "yourforum"
   TIMEZONE = "America/Los_Angeles"
-  ATTACHMENT_DIR = '/home/discourse/yourforum/customattachments/'
-  AVATAR_DIR = '/home/discourse/yourforum/avatars/'
+
+  # override these using environment vars
+
+  URL_PREFIX ||= ENV['URL_PREFIX'] || "forum/"
+  DB_PREFIX ||= ENV['DB_PREFIX'] || "vb_"
+  DB_HOST ||= ENV['DB_HOST'] || "localhost"
+  DB_NAME ||= ENV['DB_NAME'] || "vbulletin"
+  DB_PASS ||= ENV['DB_PASS'] || "password"
+  DB_USER ||= ENV['DB_USER'] || "username"
+  ATTACH_DIR ||= ENV['ATTACH_DIR'] || "/home/discourse/vbulletin/attach"
+  AVATAR_DIR ||= ENV['AVATAR_DIR'] || "/home/discourse/vbulletin/avatars"
 
   def initialize
     super
@@ -25,12 +30,15 @@ class ImportScripts::VBulletin < ImportScripts::Base
     @htmlentities = HTMLEntities.new
 
     @client = Mysql2::Client.new(
-      host: "localhost",
-      username: "root",
-      database: DATABASE,
-      password: "password"
+      host: DB_HOST,
+      username: DB_USER,
+      database: DB_NAME,
+      password: DB_PASS
     )
 
+    @forum_typeid = mysql_query("SELECT contenttypeid FROM #{DB_PREFIX}contenttype WHERE class='Forum'").first['contenttypeid']
+    @channel_typeid = mysql_query("SELECT contenttypeid FROM #{DB_PREFIX}contenttype WHERE class='Channel'").first['contenttypeid']
+    @text_typeid = mysql_query("SELECT contenttypeid FROM #{DB_PREFIX}contenttype WHERE class='Text'").first['contenttypeid']
   end
 
   def execute
@@ -40,8 +48,10 @@ class ImportScripts::VBulletin < ImportScripts::Base
     import_topics
     import_posts
     import_attachments
+    import_tags
     close_topics
     post_process_posts
+    create_permalinks
   end
 
   def import_groups
@@ -49,7 +59,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
 
     groups = mysql_query <<-SQL
         SELECT usergroupid, title
-          FROM #{DBPREFIX}usergroup
+          FROM #{DB_PREFIX}usergroup
       ORDER BY usergroupid
     SQL
 
@@ -64,7 +74,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
   def import_users
     puts "", "importing users"
 
-    user_count = mysql_query("SELECT COUNT(userid) count FROM #{DBPREFIX}user").first["count"]
+    user_count = mysql_query("SELECT COUNT(userid) count FROM #{DB_PREFIX}user").first["count"]
 
     batches(BATCH_SIZE) do |offset|
       users = mysql_query <<-SQL
@@ -73,8 +83,8 @@ class ImportScripts::VBulletin < ImportScripts::Base
                  WHEN u.scheme='legacy' THEN REPLACE(token, ' ', ':')
             END AS password,
             IF(ug.title = 'Administrators', 1, 0) AS admin
-            FROM #{DBPREFIX}user u
-            LEFT JOIN #{DBPREFIX}usergroup ug ON ug.usergroupid = u.usergroupid
+            FROM #{DB_PREFIX}user u
+            LEFT JOIN #{DB_PREFIX}usergroup ug ON ug.usergroupid = u.usergroupid
         ORDER BY userid
            LIMIT #{BATCH_SIZE}
           OFFSET #{offset}
@@ -101,7 +111,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
           post_create_action: proc do |u|
             @old_username_to_new_usernames[user["username"]] = u.username
             import_profile_picture(user, u)
-            import_profile_background(user, u)
+            # import_profile_background(user, u)
           end
         }
       end
@@ -111,7 +121,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
   def import_profile_picture(old_user, imported_user)
     query = mysql_query <<-SQL
         SELECT filedata, filename
-          FROM #{DBPREFIX}customavatar
+          FROM #{DB_PREFIX}customavatar
          WHERE userid = #{old_user["userid"]}
       ORDER BY dateline DESC
          LIMIT 1
@@ -148,7 +158,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
   def import_profile_background(old_user, imported_user)
     query = mysql_query <<-SQL
         SELECT filedata, filename
-          FROM #{DBPREFIX}customprofilepic
+          FROM #{DB_PREFIX}customprofilepic
          WHERE userid = #{old_user["userid"]}
       ORDER BY dateline DESC
          LIMIT 1
@@ -176,13 +186,13 @@ class ImportScripts::VBulletin < ImportScripts::Base
     puts "", "importing top level categories..."
 
     categories = mysql_query("SELECT nodeid AS forumid, title, description, displayorder, parentid
-	      FROM #{DBPREFIX}node
+	      FROM #{DB_PREFIX}node
           WHERE parentid=#{ROOT_NODE}
         UNION
           SELECT nodeid, title, description, displayorder, parentid
-          FROM #{DBPREFIX}node
-          WHERE contenttypeid = 23
-            AND parentid IN (SELECT nodeid FROM #{DBPREFIX}node WHERE parentid=#{ROOT_NODE})").to_a
+          FROM #{DB_PREFIX}node
+          WHERE contenttypeid = #{@channel_typeid}
+            AND parentid IN (SELECT nodeid FROM #{DB_PREFIX}node WHERE parentid=#{ROOT_NODE})").to_a
 
     top_level_categories = categories.select { |c| c["parentid"] == ROOT_NODE }
 
@@ -224,19 +234,26 @@ class ImportScripts::VBulletin < ImportScripts::Base
     # keep track of closed topics
     @closed_topic_ids = []
 
-    topic_count = mysql_query("select count(nodeid) cnt from #{DBPREFIX}node where parentid in (
-        select nodeid from #{DBPREFIX}node where contenttypeid=23 ) and contenttypeid=22;").first["cnt"]
+    topic_count = mysql_query("SELECT COUNT(nodeid) cnt
+        FROM #{DB_PREFIX}node
+        WHERE (unpublishdate = 0 OR unpublishdate IS NULL)
+        AND (approved = 1 AND showapproved = 1)
+        AND parentid IN (
+        SELECT nodeid FROM #{DB_PREFIX}node WHERE contenttypeid=#{@channel_typeid} ) AND contenttypeid=#{@text_typeid};"
+    ).first["cnt"]
 
     batches(BATCH_SIZE) do |offset|
       topics = mysql_query <<-SQL
         SELECT t.nodeid AS threadid, t.title, t.parentid AS forumid,t.open,t.userid AS postuserid,t.publishdate AS dateline,
             nv.count views, 1 AS visible, t.sticky,
             CONVERT(CAST(rawtext AS BINARY)USING utf8) AS raw
-        FROM #{DBPREFIX}node t
-        LEFT JOIN #{DBPREFIX}nodeview nv ON nv.nodeid=t.nodeid
-        LEFT JOIN #{DBPREFIX}text txt ON txt.nodeid=t.nodeid
-        WHERE t.parentid in ( select nodeid from #{DBPREFIX}node where contenttypeid=23 )
-          AND t.contenttypeid = 22
+        FROM #{DB_PREFIX}node t
+        LEFT JOIN #{DB_PREFIX}nodeview nv ON nv.nodeid=t.nodeid
+        LEFT JOIN #{DB_PREFIX}text txt ON txt.nodeid=t.nodeid
+        WHERE t.parentid in ( select nodeid from #{DB_PREFIX}node where contenttypeid=#{@channel_typeid} )
+          AND t.contenttypeid = #{@text_typeid}
+          AND (t.unpublishdate = 0 OR t.unpublishdate IS NULL)
+          AND t.approved = 1 AND t.showapproved = 1
         ORDER BY t.nodeid
            LIMIT #{BATCH_SIZE}
           OFFSET #{offset}
@@ -277,19 +294,19 @@ class ImportScripts::VBulletin < ImportScripts::Base
     rescue
     end
 
-    post_count = mysql_query("SELECT COUNT(nodeid) cnt FROM #{DBPREFIX}node WHERE parentid NOT IN (
-        SELECT nodeid FROM #{DBPREFIX}node WHERE contenttypeid=23 ) AND contenttypeid=22;").first["cnt"]
+    post_count = mysql_query("SELECT COUNT(nodeid) cnt FROM #{DB_PREFIX}node WHERE parentid NOT IN (
+        SELECT nodeid FROM #{DB_PREFIX}node WHERE contenttypeid=#{@channel_typeid} ) AND contenttypeid=#{@text_typeid};").first["cnt"]
 
     batches(BATCH_SIZE) do |offset|
       posts = mysql_query <<-SQL
         SELECT p.nodeid AS postid, p.userid AS userid, p.parentid AS threadid,
             CONVERT(CAST(rawtext AS BINARY)USING utf8) AS raw, p.publishdate AS dateline,
             1 AS visible, p.parentid AS parentid
-        FROM #{DBPREFIX}node p
-        LEFT JOIN #{DBPREFIX}nodeview nv ON nv.nodeid=p.nodeid
-        LEFT JOIN #{DBPREFIX}text txt ON txt.nodeid=p.nodeid
-        WHERE p.parentid NOT IN ( select nodeid from #{DBPREFIX}node where contenttypeid=23 )
-          AND p.contenttypeid = 22
+        FROM #{DB_PREFIX}node p
+        LEFT JOIN #{DB_PREFIX}nodeview nv ON nv.nodeid=p.nodeid
+        LEFT JOIN #{DB_PREFIX}text txt ON txt.nodeid=p.nodeid
+        WHERE p.parentid NOT IN ( select nodeid from #{DB_PREFIX}node where contenttypeid=#{@channel_typeid} )
+          AND p.contenttypeid = #{@text_typeid}
         ORDER BY postid
            LIMIT #{BATCH_SIZE}
           OFFSET #{offset}
@@ -320,86 +337,65 @@ class ImportScripts::VBulletin < ImportScripts::Base
     end
   end
 
-  # find the uploaded file information from the db
-  def find_upload(post, attachment_id)
-    sql = "SELECT a.filedataid, a.filename, fd.userid, LENGTH(fd.filedata) AS dbsize, filedata
-             FROM #{DBPREFIX}attach a
-             LEFT JOIN #{DBPREFIX}filedata fd ON fd.filedataid = a.filedataid
-            WHERE a.nodeid = #{attachment_id}"
-    results = mysql_query(sql)
-
-    unless (row = results.first)
-      puts "Couldn't find attachment record for post.id = #{post.id}, import_id = #{post.custom_fields['import_id']}"
-      return nil
-    end
-
-    filename = File.join(ATTACHMENT_DIR, row['userid'].to_s.split('').join('/'), "#{row['filedataid']}.attach")
-    real_filename = row['filename']
-    real_filename.prepend SecureRandom.hex if real_filename[0] == '.'
-
-    unless File.exists?(filename)
-      if row['dbsize'].to_i == 0
-        puts "Attachment file #{row['filedataid']} doesn't exist"
-        return nil
-      end
-
-      tmpfile = 'attach_' + row['filedataid'].to_s
-      filename = File.join('/tmp/', tmpfile)
-      File.open(filename, 'wb') { |f|
-        #f.write(PG::Connection.unescape_bytea(row['filedata']))
-        f.write(row['filedata'])
-      }
-    end
-
-    upload = create_upload(post.user.id, filename, real_filename)
-
-    if upload.nil? || !upload.valid?
-      puts "Upload not valid :("
-      puts upload.errors.inspect if upload
-      return nil
-    end
-
-    [upload, real_filename]
-  rescue Mysql2::Error => e
-    puts "SQL Error"
-    puts e.message
-    puts sql
-    nil
-  end
-
   def import_attachments
     puts '', 'importing attachments...'
 
+    ext = mysql_query("SELECT GROUP_CONCAT(DISTINCT(extension)) exts FROM #{DB_PREFIX}filedata").first['exts'].split(',')
+    SiteSetting.authorized_extensions = (SiteSetting.authorized_extensions.split("|") + ext).uniq.join("|")
+
+    uploads = mysql_query <<-SQL
+    SELECT n.parentid nodeid, a.filename, fd.userid, LENGTH(fd.filedata) AS dbsize, filedata, fd.filedataid
+      FROM #{DB_PREFIX}attach a
+      LEFT JOIN #{DB_PREFIX}filedata fd ON fd.filedataid = a.filedataid
+      LEFT JOIN #{DB_PREFIX}node n on n.nodeid = a.nodeid
+    SQL
+
     current_count = 0
-    total_count = mysql_query("SELECT COUNT(nodeid) cnt FROM #{DBPREFIX}node WHERE contenttypeid=22 ").first["cnt"]
+    total_count = uploads.count
 
-    success_count = 0
-    fail_count = 0
+    uploads.each do |upload|
+      post_id = PostCustomField.where(name: 'import_id').where(value: upload['nodeid']).first&.post_id
+      post_id = PostCustomField.where(name: 'import_id').where(value: "thread-#{upload['nodeid']}").first&.post_id unless post_id
+      if post_id.nil?
+        puts "Post for #{upload['nodeid']} not found"
+        next
+      end
+      post = Post.find(post_id)
 
-    attachment_regex = /\[attach[^\]]*\]n(\d+)\[\/attach\]/i
+      filename = File.join(ATTACH_DIR, upload['userid'].to_s.split('').join('/'), "#{upload['filedataid']}.attach")
+      real_filename = upload['filename']
+      real_filename.prepend SecureRandom.hex if real_filename[0] == '.'
 
-    Post.find_each do |post|
-      current_count += 1
-      print_status current_count, total_count
-
-      new_raw = post.raw.dup
-      new_raw.gsub!(attachment_regex) do |s|
-        matches = attachment_regex.match(s)
-        attachment_id = matches[1]
-
-        upload, filename = find_upload(post, attachment_id)
-        unless upload
-          fail_count += 1
+      unless File.exists?(filename)
+        # attachments can be on filesystem or in database
+        # try to retrieve from database if the file did not exist on filesystem
+        if upload['dbsize'].to_i == 0
+          puts "Attachment file #{upload['filedataid']} doesn't exist"
           next
         end
-        html_for_upload(upload, filename)
+
+        tmpfile = 'attach_' + upload['filedataid'].to_s
+        filename = File.join('/tmp/', tmpfile)
+        File.open(filename, 'wb') { |f|
+          #f.write(PG::Connection.unescape_bytea(row['filedata']))
+          f.write(upload['filedata'])
+        }
       end
 
-      if new_raw != post.raw
-        PostRevisor.new(post).revise!(post.user, { raw: new_raw }, bypass_bump: true, edit_reason: 'Import attachments from vBulletin')
+      upl_obj = create_upload(post.user.id, filename, real_filename)
+      if upl_obj&.persisted?
+        html = html_for_upload(upl_obj, real_filename)
+        if !post.raw[html]
+          post.raw += "\n\n#{html}\n\n"
+          post.save!
+          PostUpload.create!(post: post, upload: upl_obj) unless PostUpload.where(post: post, upload: upl_obj).exists?
+        end
+      else
+        puts "Fail"
+        exit
       end
-
-      success_count += 1
+      current_count += 1
+      print_status(current_count, total_count)
     end
   end
 
@@ -619,6 +615,105 @@ class ImportScripts::VBulletin < ImportScripts::Base
     raw
   end
 
+  def create_permalinks
+    puts "", "creating permalinks..."
+
+    current_count = 0
+    total_count = mysql_query("SELECT COUNT(nodeid) cnt
+        FROM #{DB_PREFIX}node
+        WHERE (unpublishdate = 0 OR unpublishdate IS NULL)
+        AND (approved = 1 AND showapproved = 1)
+        AND parentid IN (
+        SELECT nodeid FROM #{DB_PREFIX}node WHERE contenttypeid=#{@channel_typeid} ) AND contenttypeid=#{@text_typeid};"
+    ).first["cnt"]
+
+    batches(BATCH_SIZE) do |offset|
+      topics = mysql_query <<-SQL
+        SELECT p.urlident p1, f.urlident p2, t.nodeid, t.urlident p3
+        FROM #{DB_PREFIX}node f
+        LEFT JOIN #{DB_PREFIX}node t ON t.parentid = f.nodeid
+        LEFT JOIN #{DB_PREFIX}node p ON p.nodeid = f.parentid
+        WHERE f.contenttypeid = #{@channel_typeid}
+          AND t.contenttypeid = #{@text_typeid}
+          AND t.approved = 1 AND t.showapproved = 1
+          AND (t.unpublishdate = 0 OR t.unpublishdate IS NULL)
+        ORDER BY t.nodeid
+           LIMIT #{BATCH_SIZE}
+          OFFSET #{offset}
+      SQL
+
+      break if topics.size < 1
+
+      topics.each do |topic|
+        current_count += 1
+        print_status current_count, total_count
+        disc_topic = topic_lookup_from_imported_post_id("thread-#{topic['nodeid']}")
+
+        Permalink.create(
+          url: "#{URL_PREFIX}#{topic['p1']}/#{topic['p2']}/#{topic['nodeid']}-#{topic['p3']}",
+          topic_id: disc_topic[:topic_id]
+        ) rescue nil
+      end
+    end
+
+    # cats
+    cats = mysql_query <<-SQL
+      SELECT nodeid, urlident
+      FROM #{DB_PREFIX}node
+      WHERE contenttypeid=#{@channel_typeid}
+      AND parentid=#{ROOT_NODE};
+    SQL
+    cats.each do |c|
+      category_id = CategoryCustomField.where(name: 'import_id').where(value: c['nodeid']).first.category_id
+      Permalink.create(url: "#{URL_PREFIX}#{c['urlident']}", category_id: category_id) rescue nil
+    end
+
+    # subcats
+    subcats = mysql_query <<-SQL
+      SELECT n1.nodeid,n2.urlident p1,n1.urlident p2
+      FROM #{DB_PREFIX}node n1
+      LEFT JOIN #{DB_PREFIX}node n2 ON n2.nodeid=n1.parentid
+      WHERE n2.parentid = #{ROOT_NODE}
+      AND n1.contenttypeid=#{@channel_typeid};
+    SQL
+    subcats.each do |sc|
+      category_id = CategoryCustomField.where(name: 'import_id').where(value: sc['nodeid']).first.category_id
+      Permalink.create(url: "#{URL_PREFIX}#{sc['p1']}/#{sc['p2']}", category_id: category_id) rescue nil
+    end
+  end
+
+  def import_tags
+    puts "", "importing tags..."
+
+    SiteSetting.tagging_enabled = true
+    SiteSetting.max_tags_per_topic = 100
+    staff_guardian = Guardian.new(Discourse.system_user)
+
+    records = mysql_query(<<~SQL
+      SELECT nodeid, GROUP_CONCAT(tagtext) tags
+      FROM #{DB_PREFIX}tag t
+      LEFT JOIN #{DB_PREFIX}tagnode tn ON tn.tagid = t.tagid
+      WHERE t.tagid IS NOT NULL
+      AND tn.nodeid IS NOT NULL
+      GROUP BY nodeid
+    SQL
+    ).to_a
+
+    current_count = 0
+    total_count = records.count
+
+    records.each do |rec|
+      current_count += 1
+      print_status current_count, total_count
+      tl = topic_lookup_from_imported_post_id("thread-#{rec['nodeid']}")
+      next if tl.nil?   # topic might have been deleted
+
+      topic = Topic.find(tl[:topic_id])
+      tag_names = rec['tags'].force_encoding("UTF-8").split(',')
+      DiscourseTagging.tag_topic_by_names(topic, staff_guardian, tag_names)
+    end
+  end
+
   def parse_timestamp(timestamp)
     Time.zone.at(@tz.utc_to_local(timestamp))
   end
@@ -626,7 +721,6 @@ class ImportScripts::VBulletin < ImportScripts::Base
   def mysql_query(sql)
     @client.query(sql, cache_rows: false)
   end
-
 end
 
 ImportScripts::VBulletin.new.perform

From 3bbd8b125833971b9c15b65dfba4ac695a948631 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 22 Apr 2020 22:17:53 +0200
Subject: [PATCH 0742/1830] UX: rework date time input range (#9524)

---
 .../admin/components/admin-report.js          | 186 +++++++--------
 .../admin/routes/admin-reports-show.js        |  12 +-
 .../templates/components/admin-report.hbs     |  24 +-
 .../discourse/components/date-input.js        |  51 +++--
 .../components/date-time-input-range.js       |  63 +++---
 .../discourse/components/date-time-input.js   |  73 +++---
 .../discourse/components/time-input.js        | 211 +++++++++++++-----
 .../discourse/controllers/review-index.js     |  16 +-
 .../discourse/routes/review-index.js          |   5 +-
 .../templates/components/date-input.hbs       |   5 +-
 .../components/date-time-input-range.hbs      |  49 ++--
 .../templates/components/date-time-input.hbs  |  32 ++-
 .../templates/components/time-input.hbs       |  52 +----
 .../discourse/templates/review-index.hbs      |   8 +-
 .../select-kit/components/select-kit.js       |   7 +-
 .../common/admin/admin_report.scss            |   8 +-
 .../stylesheets/common/base/reviewables.scss  |   1 +
 .../stylesheets/common/base/search.scss       |  12 +-
 .../common/components/date-input.scss         |  45 +++-
 .../components/date-time-input-range.scss     |  40 +---
 .../common/components/date-time-input.scss    |  19 +-
 .../common/components/time-input.scss         |  64 +++---
 config/locales/client.en.yml                  |   4 +-
 test/javascripts/acceptance/dashboard-test.js |   2 +-
 .../javascripts/components/date-input-test.js |   6 +-
 .../components/date-time-input-range-test.js  |  91 +-------
 .../components/date-time-input-test.js        |  23 +-
 .../javascripts/components/time-input-test.js |  70 ++----
 test/javascripts/fixtures/reports_bulk.js     |  14 +-
 29 files changed, 581 insertions(+), 612 deletions(-)

diff --git a/app/assets/javascripts/admin/components/admin-report.js b/app/assets/javascripts/admin/components/admin-report.js
index 178bef98f2..97db7c9df7 100644
--- a/app/assets/javascripts/admin/components/admin-report.js
+++ b/app/assets/javascripts/admin/components/admin-report.js
@@ -1,7 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { makeArray } from "discourse-common/lib/helpers";
-import { alias, or, and, reads, equal, notEmpty } from "@ember/object/computed";
-import EmberObject from "@ember/object";
+import { alias, or, and, equal, notEmpty } from "@ember/object/computed";
+import EmberObject, { computed, action } from "@ember/object";
 import { next } from "@ember/runloop";
 import Component from "@ember/component";
 import ReportLoader from "discourse/lib/reports-loader";
@@ -9,6 +9,7 @@ import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
 import Report, { SCHEMA_VERSION } from "admin/models/report";
 import ENV from "discourse-common/config/environment";
+import { isPresent } from "@ember/utils";
 
 const TABLE_OPTIONS = {
   perPage: 8,
@@ -69,8 +70,21 @@ export default Component.extend({
     this._reports = [];
   },
 
-  startDate: reads("filters.startDate"),
-  endDate: reads("filters.endDate"),
+  startDate: computed("filters.startDate", function() {
+    if (this.filters && isPresent(this.filters.startDate)) {
+      return moment(this.filters.startDate, "YYYY-MM-DD");
+    } else {
+      return moment();
+    }
+  }),
+
+  endDate: computed("filters.endDate", function() {
+    if (this.filters && isPresent(this.filters.endDate)) {
+      return moment(this.filters.endDate, "YYYY-MM-DD");
+    } else {
+      return moment();
+    }
+  }),
 
   didReceiveAttrs() {
     this._super(...arguments);
@@ -126,39 +140,18 @@ export default Component.extend({
     return `admin-report-${currentMode.replace(/_/g, "-")}`;
   },
 
-  @discourseComputed("startDate")
-  normalizedStartDate(startDate) {
-    return startDate && typeof startDate.isValid === "function"
-      ? moment
-          .utc(startDate.toISOString())
-          .locale("en")
-          .format("YYYYMMDD")
-      : moment(startDate)
-          .locale("en")
-          .format("YYYYMMDD");
-  },
-
-  @discourseComputed("endDate")
-  normalizedEndDate(endDate) {
-    return endDate && typeof endDate.isValid === "function"
-      ? moment
-          .utc(endDate.toISOString())
-          .locale("en")
-          .format("YYYYMMDD")
-      : moment(endDate)
-          .locale("en")
-          .format("YYYYMMDD");
-  },
-
   @discourseComputed(
     "dataSourceName",
-    "normalizedStartDate",
-    "normalizedEndDate",
+    "startDate",
+    "endDate",
     "filters.customFilters"
   )
   reportKey(dataSourceName, startDate, endDate, customFilters) {
     if (!dataSourceName || !startDate || !endDate) return null;
 
+    startDate = startDate.toISOString(true).split("T")[0];
+    endDate = endDate.toISOString(true).split("T")[0];
+
     let reportKey = "reports:";
     reportKey += [
       dataSourceName,
@@ -179,74 +172,61 @@ export default Component.extend({
     return reportKey;
   },
 
-  actions: {
-    onChangeEndDate(date) {
-      const startDate = moment(this.startDate);
-      const newEndDate = moment(date).endOf("day");
+  @action
+  onChangeDateRange(range) {
+    this.send("refreshReport", {
+      startDate: range.from,
+      endDate: range.to
+    });
+  },
 
-      if (newEndDate.isSameOrAfter(startDate)) {
-        this.set("endDate", newEndDate.format("YYYY-MM-DD"));
-      } else {
-        this.set("endDate", startDate.endOf("day").format("YYYY-MM-DD"));
-      }
+  @action
+  applyFilter(id, value) {
+    let customFilters = this.get("filters.customFilters") || {};
 
-      this.send("refreshReport");
-    },
-
-    onChangeStartDate(date) {
-      const endDate = moment(this.endDate);
-      const newStartDate = moment(date).startOf("day");
-
-      if (newStartDate.isSameOrBefore(endDate)) {
-        this.set("startDate", newStartDate.format("YYYY-MM-DD"));
-      } else {
-        this.set("startDate", endDate.startOf("day").format("YYYY-MM-DD"));
-      }
-
-      this.send("refreshReport");
-    },
-
-    applyFilter(id, value) {
-      let customFilters = this.get("filters.customFilters") || {};
-
-      if (typeof value === "undefined") {
-        delete customFilters[id];
-      } else {
-        customFilters[id] = value;
-      }
-
-      this.attrs.onRefresh({
-        type: this.get("model.type"),
-        startDate: this.startDate,
-        endDate: this.endDate,
-        filters: customFilters
-      });
-    },
-
-    refreshReport() {
-      this.attrs.onRefresh({
-        type: this.get("model.type"),
-        startDate: this.startDate,
-        endDate: this.endDate,
-        filters: this.get("filters.customFilters")
-      });
-    },
-
-    exportCsv() {
-      const customFilters = this.get("filters.customFilters") || {};
-
-      exportEntity("report", {
-        name: this.get("model.type"),
-        start_date: this.startDate,
-        end_date: this.endDate,
-        category_id: customFilters.category,
-        group_id: customFilters.group
-      }).then(outputExportResult);
-    },
-
-    changeMode(mode) {
-      this.set("currentMode", mode);
+    if (typeof value === "undefined") {
+      delete customFilters[id];
+    } else {
+      customFilters[id] = value;
     }
+
+    this.send("refreshReport", {
+      filters: customFilters
+    });
+  },
+
+  @action
+  refreshReport(options = {}) {
+    this.attrs.onRefresh({
+      type: this.get("model.type"),
+      startDate:
+        typeof options.startDate === "undefined"
+          ? this.startDate
+          : options.startDate,
+      endDate:
+        typeof options.endDate === "undefined" ? this.endDate : options.endDate,
+      filters:
+        typeof options.filters === "undefined"
+          ? this.get("filters.customFilters")
+          : options.filters
+    });
+  },
+
+  @action
+  exportCsv() {
+    const customFilters = this.get("filters.customFilters") || {};
+    exportEntity("report", {
+      name: this.get("model.type"),
+      start_date: this.startDate.toISOString(true).split("T")[0],
+      end_date: this.endDate.toISOString(true).split("T")[0],
+      category_id: customFilters.category,
+      group_id: customFilters.group
+    }).then(outputExportResult);
+  },
+
+  @action
+  changeMode(mode) {
+    this.set("currentMode", mode);
   },
 
   _computeReport() {
@@ -276,10 +256,8 @@ export default Component.extend({
     if (!this.startDate || !this.endDate) {
       report = sort(filteredReports)[0];
     } else {
-      const reportKey = this.reportKey;
-
       report = sort(
-        filteredReports.filter(r => r.report_key.includes(reportKey))
+        filteredReports.filter(r => r.report_key.includes(this.reportKey))
       )[0];
 
       if (!report) return;
@@ -339,15 +317,15 @@ export default Component.extend({
     let payload = { data: { cache: true, facets } };
 
     if (this.startDate) {
-      payload.data.start_date = moment
-        .utc(this.startDate, "YYYY-MM-DD")
-        .toISOString();
+      payload.data.start_date = moment(this.startDate)
+        .toISOString(true)
+        .split("T")[0];
     }
 
     if (this.endDate) {
-      payload.data.end_date = moment
-        .utc(this.endDate, "YYYY-MM-DD")
-        .toISOString();
+      payload.data.end_date = moment(this.endDate)
+        .toISOString(true)
+        .split("T")[0];
     }
 
     if (this.get("reportOptions.table.limit")) {
diff --git a/app/assets/javascripts/admin/routes/admin-reports-show.js b/app/assets/javascripts/admin/routes/admin-reports-show.js
index 1fa8bc739d..3a8a5430a9 100644
--- a/app/assets/javascripts/admin/routes/admin-reports-show.js
+++ b/app/assets/javascripts/admin/routes/admin-reports-show.js
@@ -13,8 +13,7 @@ export default DiscourseRoute.extend({
 
     params.startDate =
       params.start_date ||
-      moment
-        .utc()
+      moment()
         .subtract(1, "day")
         .subtract(1, "month")
         .startOf("day")
@@ -23,8 +22,7 @@ export default DiscourseRoute.extend({
 
     params.endDate =
       params.end_date ||
-      moment
-        .utc()
+      moment()
         .endOf("day")
         .format("YYYY-MM-DD");
     delete params.end_date;
@@ -56,9 +54,13 @@ export default DiscourseRoute.extend({
     onParamsChange(params) {
       const queryParams = {
         type: params.type,
-        start_date: params.startDate,
+        start_date: params.startDate
+          ? params.startDate.toISOString(true).split("T")[0]
+          : null,
         filters: params.filters,
         end_date: params.endDate
+          ? params.endDate.toISOString(true).split("T")[0]
+          : null
       };
 
       this.transitionTo("adminReports.show", { queryParams });
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index ab0c1a6398..ee375ac6ff 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -132,26 +132,16 @@
           {{#if showDatesOptions}}
             <div class="control">
               <span class="label">
-                {{i18n "admin.dashboard.reports.start_date"}}
+                {{i18n "admin.dashboard.reports.dates"}}
               </span>
 
               <div class="input">
-                {{date-input
-                  date=startDate
-                  onChange=(action "onChangeStartDate")
-                }}
-              </div>
-            </div>
-
-            <div class="control">
-              <span class="label">
-                {{i18n "admin.dashboard.reports.end_date"}}
-              </span>
-
-              <div class="input">
-                {{date-input
-                  date=endDate
-                  onChange=(action "onChangeEndDate")
+                {{date-time-input-range
+                  from=startDate
+                  to=endDate
+                  onChange=(action "onChangeDateRange")
+                  showFromTime=false
+                  showToTime=false
                 }}
               </div>
             </div>
diff --git a/app/assets/javascripts/discourse/components/date-input.js b/app/assets/javascripts/discourse/components/date-input.js
index b44640bcd4..d4ee63ee9b 100644
--- a/app/assets/javascripts/discourse/components/date-input.js
+++ b/app/assets/javascripts/discourse/components/date-input.js
@@ -1,4 +1,5 @@
 import { schedule } from "@ember/runloop";
+import { action } from "@ember/object";
 import Component from "@ember/component";
 /* global Pikaday:true */
 import loadScript from "discourse/lib/load-script";
@@ -25,8 +26,8 @@ export default Component.extend({
         this._loadPikadayPicker(container);
       }
 
-      if (this.date && this._picker) {
-        this._picker.setDate(this.date, true);
+      if (this._picker && this.date) {
+        this._picker.setDate(moment(this.date).toDate(), true);
       }
     });
   },
@@ -34,9 +35,12 @@ export default Component.extend({
   didUpdateAttrs() {
     this._super(...arguments);
 
-    if (this._picker && typeof this.date === "string") {
-      const [year, month, day] = this.date.split("-").map(x => parseInt(x, 10));
-      this._picker.setDate(new Date(year, month - 1, day), true);
+    if (this._picker && this.date) {
+      this._picker.setDate(moment(this.date).toDate(), true);
+    }
+
+    if (this._picker && this.relativeDate) {
+      this._picker.setMinDate(moment(this.relativeDate).toDate(), true);
     }
 
     if (this._picker && !this.date) {
@@ -46,13 +50,12 @@ export default Component.extend({
 
   _loadPikadayPicker(container) {
     loadScript("/javascripts/pikaday.js").then(() => {
-      const defaultOptions = {
+      let defaultOptions = {
         field: this.element.querySelector(".date-picker"),
         container: container || this.element.querySelector(".picker-container"),
         bound: container === null,
         format: "LL",
         firstDay: 1,
-        trigger: this.element,
         i18n: {
           previousMonth: I18n.t("dates.previous_month"),
           nextMonth: I18n.t("dates.next_month"),
@@ -63,8 +66,16 @@ export default Component.extend({
         onSelect: date => this._handleSelection(date)
       };
 
-      this._picker = new Pikaday(Object.assign(defaultOptions, this._opts()));
-      this._picker.setDate(this.date, true);
+      if (this.relativeDate) {
+        defaultOptions = Object.assign({}, defaultOptions, {
+          minDate: moment(this.relativeDate).toDate()
+        });
+      }
+
+      this._picker = new Pikaday(
+        Object.assign({}, defaultOptions, this._opts())
+      );
+      this._picker.setDate(moment(this.date).toDate(), true);
     });
   },
 
@@ -79,18 +90,23 @@ export default Component.extend({
       /* do nothing for native */
     };
     picker.setDate = date => {
-      picker.value = date;
+      picker.value = moment(date).format("YYYY-MM-DD");
+    };
+    picker.setMinDate = date => {
+      picker.min = date;
     };
     this._picker = picker;
+
+    if (this.date) {
+      picker.setDate(this.date);
+    }
   },
 
   _handleSelection(value) {
     if (!this.element || this.isDestroying || this.isDestroyed) return;
 
-    this._picker && this._picker.hide();
-
     if (this.onChange) {
-      this.onChange(value);
+      this.onChange(value ? moment(value) : null);
     }
   },
 
@@ -98,8 +114,8 @@ export default Component.extend({
   _destroy() {
     if (this._picker) {
       this._picker.destroy();
+      this._picker = null;
     }
-    this._picker = null;
   },
 
   @discourseComputed()
@@ -111,9 +127,8 @@ export default Component.extend({
     return null;
   },
 
-  actions: {
-    onInput(event) {
-      this._picker && this._picker.setDate(event.target.value, true);
-    }
+  @action
+  onChangeDate(event) {
+    this._handleSelection(event.target.value);
   }
 });
diff --git a/app/assets/javascripts/discourse/components/date-time-input-range.js b/app/assets/javascripts/discourse/components/date-time-input-range.js
index 52438ffd94..cb30e16235 100644
--- a/app/assets/javascripts/discourse/components/date-time-input-range.js
+++ b/app/assets/javascripts/discourse/components/date-time-input-range.js
@@ -1,53 +1,46 @@
-import { equal } from "@ember/object/computed";
 import Component from "@ember/component";
+import { action } from "@ember/object";
+
 export default Component.extend({
   classNames: ["d-date-time-input-range"],
-
   from: null,
   to: null,
   onChangeTo: null,
   onChangeFrom: null,
-  currentPanel: "from",
-  showFromTime: true,
+  toTimeFirst: false,
   showToTime: true,
-  error: null,
+  showFromTime: true,
+  clearable: false,
 
-  fromPanelActive: equal("currentPanel", "from"),
-  toPanelActive: equal("currentPanel", "to"),
+  @action
+  onChangeRanges(options, value) {
+    if (this.onChange) {
+      const state = {
+        from: this.from,
+        to: this.to
+      };
 
-  _valid(state) {
-    if (state.to && state.from && state.to < state.from) {
-      return I18n.t("date_time_picker.errors.to_before_from");
-    }
+      const diff = {};
 
-    return true;
-  },
-
-  actions: {
-    _onChange(options, value) {
-      if (this.onChange) {
-        const state = {
-          from: this.from,
-          to: this.to
-        };
-
-        const diff = {};
-        diff[options.prop] = value;
-
-        const newState = Object.assign(state, diff);
-
-        const validation = this._valid(newState);
-        if (validation === true) {
-          this.set("error", null);
-          this.onChange(newState);
+      if (options.prop === "from") {
+        if (value && value.isAfter(this.to)) {
+          diff[options.prop] = value;
+          diff["to"] = value.clone().add(1, "hour");
         } else {
-          this.set("error", validation);
+          diff[options.prop] = value;
         }
       }
-    },
 
-    onChangePanel(panel) {
-      this.set("currentPanel", panel);
+      if (options.prop === "to") {
+        if (value && value.isBefore(this.from)) {
+          diff[options.prop] = this.from.clone().add(1, "hour");
+        } else {
+          diff[options.prop] = value;
+        }
+      }
+
+      const newState = Object.assign({}, state, diff);
+      this.onChange(newState);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/date-time-input.js b/app/assets/javascripts/discourse/components/date-time-input.js
index eff8b99edc..01fbddaf1c 100644
--- a/app/assets/javascripts/discourse/components/date-time-input.js
+++ b/app/assets/javascripts/discourse/components/date-time-input.js
@@ -1,44 +1,63 @@
 import Component from "@ember/component";
-import { computed } from "@ember/object";
+import { computed, action } from "@ember/object";
 
 export default Component.extend({
   classNames: ["d-date-time-input"],
   date: null,
+  relativeDate: null,
   showTime: true,
   clearable: false,
 
-  _hours: computed("date", function() {
-    return this.date && this.showTime ? new Date(this.date).getHours() : null;
+  hours: computed("date", "showTime", function() {
+    return this.date && this.get("showTime") ? this.date.hours() : null;
   }),
 
-  _minutes: computed("date", function() {
-    return this.date && this.showTime ? new Date(this.date).getMinutes() : null;
+  minutes: computed("date", "showTime", function() {
+    return this.date && this.get("showTime") ? this.date.minutes() : null;
   }),
 
-  actions: {
-    onClear() {
-      this.onChange(null);
-    },
+  @action
+  onClear() {
+    this.onChange(null);
+  },
 
-    onChangeTime(time) {
-      if (this.onChange) {
-        const date = new Date(this.date);
-        const year = date.getFullYear();
-        const month = date.getMonth();
-        const day = date.getDate();
-        this.onChange(new Date(year, month, day, time.hours, time.minutes));
-      }
-    },
+  @action
+  onChangeTime(time) {
+    if (this.onChange) {
+      const date = this.date
+        ? this.date
+        : this.relativeDate
+        ? this.relativeDate
+        : moment();
 
-    onChangeDate(date) {
-      if (this.onChange) {
-        const year = date.getFullYear();
-        const month = date.getMonth();
-        const day = date.getDate();
-        this.onChange(
-          new Date(year, month, day, this._hours || 0, this._minutes || 0)
-        );
-      }
+      this.onChange(
+        moment({
+          year: date.year(),
+          month: date.month(),
+          day: date.date(),
+          hours: time.hours,
+          minutes: time.minutes
+        })
+      );
     }
+  },
+
+  @action
+  onChangeDate(date) {
+    if (!date) {
+      this.onClear();
+      return;
+    }
+
+    this.onChange &&
+      this.onChange(
+        moment({
+          year: date.year(),
+          month: date.month(),
+          day: date.date(),
+          hours: this.hours || 0,
+          minutes: this.minutes || 0
+        })
+      );
   }
 });
diff --git a/app/assets/javascripts/discourse/components/time-input.js b/app/assets/javascripts/discourse/components/time-input.js
index e636380a77..2e28f6974e 100644
--- a/app/assets/javascripts/discourse/components/time-input.js
+++ b/app/assets/javascripts/discourse/components/time-input.js
@@ -1,76 +1,171 @@
-import { oneWay, or } from "@ember/object/computed";
-import { schedule } from "@ember/runloop";
+import { isPresent } from "@ember/utils";
+import { computed, action } from "@ember/object";
 import Component from "@ember/component";
-import { isNumeric } from "discourse/lib/utilities";
+
+function convertMinutes(num) {
+  return { hours: Math.floor(num / 60), minutes: num % 60 };
+}
+
+function convertMinutesToString(n) {
+  const hoursAndMinutes = convertMinutes(n);
+  return `${hoursAndMinutes.hours
+    .toString()
+    .padStart(2, "0")}:${hoursAndMinutes.minutes.toString().padStart(2, "0")}`;
+}
+
+function convertMinutesToDurationString(n) {
+  const hoursAndMinutes = convertMinutes(n);
+
+  let output = "";
+
+  if (hoursAndMinutes.hours) {
+    output = `${hoursAndMinutes.hours}h`;
+
+    if (hoursAndMinutes.minutes > 0) {
+      output = `${output} ${hoursAndMinutes.minutes} min`;
+    }
+  } else {
+    output = `${hoursAndMinutes.minutes} min`;
+  }
+
+  return output;
+}
 
 export default Component.extend({
   classNames: ["d-time-input"],
+
   hours: null,
+
   minutes: null,
-  _hours: oneWay("hours"),
-  _minutes: oneWay("minutes"),
-  isSafari: oneWay("capabilities.isSafari"),
-  isMobile: oneWay("site.mobileView"),
-  nativePicker: or("isSafari", "isMobile"),
 
-  actions: {
-    onInput(options, event) {
-      event.preventDefault();
+  relativeDate: null,
 
-      if (this.onChange) {
-        let value = event.target.value;
+  didReceiveAttrs() {
+    this._super(...arguments);
 
-        if (!isNumeric(value)) {
-          value = 0;
-        } else {
-          value = parseInt(value, 10);
-        }
+    if (isPresent(this.date)) {
+      this.setProperties({
+        hours: this.date.hours(),
+        minutes: this.date.minutes()
+      });
+    }
 
-        if (options.prop === "hours") {
-          value = Math.max(0, Math.min(value, 23))
-            .toString()
-            .padStart(2, "0");
-          this._processHoursChange(value);
-        } else {
-          value = Math.max(0, Math.min(value, 59))
-            .toString()
-            .padStart(2, "0");
-          this._processMinutesChange(value);
-        }
-
-        schedule("afterRender", () => (event.target.value = value));
-      }
-    },
-
-    onFocusIn(value, event) {
-      if (value && event.target) {
-        event.target.select();
-      }
-    },
-
-    onChangeTime(event) {
-      const time = event.target.value;
-
-      if (time && this.onChange) {
-        this.onChange({
-          hours: time.split(":")[0],
-          minutes: time.split(":")[1]
-        });
-      }
+    if (
+      !isPresent(this.date) &&
+      !isPresent(this.attrs.hours) &&
+      !isPresent(this.attrs.minutes)
+    ) {
+      this.setProperties({
+        hours: null,
+        minutes: null
+      });
     }
   },
 
-  _processHoursChange(hours) {
-    this.onChange({
-      hours,
-      minutes: this._minutes || "00"
+  minimumTime: computed("relativeDate", "date", function() {
+    if (this.relativeDate) {
+      if (this.date) {
+        if (this.date.diff(this.relativeDate, "minutes") > 1440) {
+          return 0;
+        } else {
+          return this.relativeDate.hours() * 60 + this.relativeDate.minutes();
+        }
+      } else {
+        return this.relativeDate.hours() * 60 + this.relativeDate.minutes();
+      }
+    }
+  }),
+
+  timeOptions: computed("minimumTime", "hours", "minutes", function() {
+    let options = [];
+
+    const start = this.minimumTime
+      ? this.minimumTime > this.time
+        ? this.time
+        : this.minimumTime
+      : 0;
+
+    // theres 1440 minutes in a day
+    // and 1440 / 15 = 96
+    let i = 0;
+    while (i < 96) {
+      // while diff with minimumTime is less than one hour
+      // use 15 minutes steps and then 30 minutes
+      const minutes = this.minimumTime ? (i <= 4 ? 15 : 30) : 15;
+      const option = start + i * minutes;
+
+      // when start is higher than 0 we will reach 1440 minutes
+      // before the 96 iterations
+      if (option > 1440) {
+        break;
+      }
+
+      options.push(option);
+
+      i++;
+    }
+
+    if (this.time && !options.includes(this.time)) {
+      options = [this.time].concat(options);
+    }
+
+    options = options.sort((a, b) => a - b);
+
+    return options.map(option => {
+      let name = convertMinutesToString(option);
+      let label;
+
+      if (this.minimumTime) {
+        const diff = option - this.minimumTime;
+        label = `${name} <small>(${convertMinutesToDurationString(
+          diff
+        )})</small>`.htmlSafe();
+      }
+
+      return {
+        id: option,
+        name,
+        label,
+        title: name
+      };
     });
+  }),
+
+  time: computed("minimumTime", "hours", "minutes", function() {
+    if (isPresent(this.hours) && isPresent(this.minutes)) {
+      return parseInt(this.hours, 10) * 60 + parseInt(this.minutes, 10);
+    }
+  }),
+
+  @action
+  onFocusIn(value, event) {
+    if (value && event.target) {
+      event.target.select();
+    }
   },
 
-  _processMinutesChange(minutes) {
-    this.onChange({
-      hours: this._hours || "00",
-      minutes
-    });
+  @action
+  onChangeTime(time) {
+    if (isPresent(time) && this.onChange) {
+      if (typeof time === "string" && time.length) {
+        let [hours, minutes] = time.split(":");
+        if (hours && minutes) {
+          if (hours < 0) hours = 0;
+          if (hours > 23) hours = 23;
+          if (minutes < 0) minutes = 0;
+          if (minutes > 59) minutes = 59;
+
+          this.onChange({
+            hours: parseInt(hours, 10),
+            minutes: parseInt(minutes, 10)
+          });
+        }
+      } else {
+        this.onChange({
+          hours: convertMinutes(time).hours,
+          minutes: convertMinutes(time).minutes
+        });
+      }
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/review-index.js b/app/assets/javascripts/discourse/controllers/review-index.js
index aeb61d7d61..4d319ee8bf 100644
--- a/app/assets/javascripts/discourse/controllers/review-index.js
+++ b/app/assets/javascripts/discourse/controllers/review-index.js
@@ -1,5 +1,6 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
+import { isPresent } from "@ember/utils";
 
 export default Controller.extend({
   queryParams: [
@@ -86,12 +87,7 @@ export default Controller.extend({
   },
 
   setRange(range) {
-    if (range.from) {
-      this.set("from", new Date(range.from).toISOString().split("T")[0]);
-    }
-    if (range.to) {
-      this.set("to", new Date(range.to).toISOString().split("T")[0]);
-    }
+    this.setProperties(range);
   },
 
   actions: {
@@ -118,8 +114,12 @@ export default Controller.extend({
         status: this.filterStatus,
         category_id: this.filterCategoryId,
         username: this.filterUsername,
-        from_date: this.filterFromDate,
-        to_date: this.filterToDate,
+        from_date: isPresent(this.filterFromDate)
+          ? this.filterFromDate.toISOString(true).split("T")[0]
+          : null,
+        to_date: isPresent(this.filterToDate)
+          ? this.filterToDate.toISOString(true).split("T")[0]
+          : null,
         sort_order: this.filterSortOrder,
         additional_filters: JSON.stringify(this.additionalFilters)
       });
diff --git a/app/assets/javascripts/discourse/routes/review-index.js b/app/assets/javascripts/discourse/routes/review-index.js
index 3f2a8abc4a..4edd43a334 100644
--- a/app/assets/javascripts/discourse/routes/review-index.js
+++ b/app/assets/javascripts/discourse/routes/review-index.js
@@ -1,4 +1,5 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import { isPresent } from "@ember/utils";
 
 export default DiscourseRoute.extend({
   model(params) {
@@ -23,8 +24,8 @@ export default DiscourseRoute.extend({
       filterPriority: meta.priority,
       reviewableTypes: meta.reviewable_types,
       filterUsername: meta.username,
-      filterFromDate: meta.from_date,
-      filterToDate: meta.to_date,
+      filterFromDate: isPresent(meta.from_date) ? moment(meta.from_date) : null,
+      filterToDate: isPresent(meta.to_date) ? moment(meta.to_date) : null,
       filterSortOrder: meta.sort_order,
       additionalFilters: meta.additional_filters || {}
     });
diff --git a/app/assets/javascripts/discourse/templates/components/date-input.hbs b/app/assets/javascripts/discourse/templates/components/date-input.hbs
index ad48e3e25d..b86c460441 100644
--- a/app/assets/javascripts/discourse/templates/components/date-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/date-input.hbs
@@ -2,9 +2,8 @@
   type=inputType
   class="date-picker"
   placeholder=placeholder
-  value=value
-  input=(action "onInput")
-  readonly=true
+  value=(readonly value)
+  input=(action "onChangeDate")
 }}
 
 <div class="picker-container"></div>
diff --git a/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs b/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs
index faa96a1eca..a8e1786ace 100644
--- a/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs
+++ b/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs
@@ -1,35 +1,16 @@
-<ul class="panels {{currentPanel}}">
-  <li>
-    {{d-button
-      label="date_time_picker.from"
-      class="from-panel"
-      action=(action "onChangePanel" "from")}}
-  </li>
-  <li>
-    {{d-button
-      label="date_time_picker.to"
-      class="to-panel"
-      action=(action "onChangePanel" "to")}}
-  </li>
-</ul>
+{{date-time-input
+  date=from
+  onChange=(action "onChangeRanges" (hash prop="from"))
+  showTime=showFromTime
+  class="from"
+}}
 
-{{#if error}}
-  <div class="alert error">{{error}}</div>
-{{/if}}
-
-<div class="panel from {{if fromPanelActive "visible"}}">
-  {{date-time-input
-    date=from
-    onChange=(action "_onChange" (hash prop="from"))
-    showTime=showFromTime
-  }}
-</div>
-
-<div class="panel to {{if toPanelActive "visible"}}">
-  {{date-time-input
-    date=to
-    onChange=(action "_onChange" (hash prop="to"))
-    showTime=showToTime
-    clearable=true
-  }}
-</div>
+{{date-time-input
+  date=to
+  relativeDate=from
+  onChange=(action "onChangeRanges" (hash prop="to"))
+  timeFirst=toTimeFirst
+  showTime=showToTime
+  clearable=clearable
+  class="to"
+}}
diff --git a/app/assets/javascripts/discourse/templates/components/date-time-input.hbs b/app/assets/javascripts/discourse/templates/components/date-time-input.hbs
index 0b243e74a4..0ec475f571 100644
--- a/app/assets/javascripts/discourse/templates/components/date-time-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/date-time-input.hbs
@@ -1,13 +1,31 @@
-{{date-input date=date onChange=(action "onChangeDate")}}
+{{#unless timeFirst}}
+  {{date-input
+    date=date
+    relativeDate=relativeDate
+    onChange=(action "onChangeDate")
+  }}
+{{/unless}}
 
 {{#if showTime}}
   {{time-input
-    hours=_hours
-    minutes=_minutes
+    date=date
+    relativeDate=relativeDate
     onChange=(action "onChangeTime")
   }}
-
-  {{#if clearable}}
-    {{d-button icon="times" action=(action "onClear")}}
-  {{/if}}
+{{/if}}
+
+{{#if timeFirst}}
+  {{date-input
+    date=date
+    relativeDate=relativeDate
+    onChange=(action "onChangeDate")
+  }}
+{{/if}}
+
+{{#if clearable}}
+  {{d-button
+    class="clear-date-time"
+    icon="times"
+    action=(action "onClear")
+  }}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/time-input.hbs b/app/assets/javascripts/discourse/templates/components/time-input.hbs
index 51ada91bf6..8dd13ff06b 100644
--- a/app/assets/javascripts/discourse/templates/components/time-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/time-input.hbs
@@ -1,40 +1,12 @@
-<div class="fields">
-  {{#if nativePicker}}
-    {{input
-      class="field time"
-      type="time"
-      value=(concat _hours ":" _minutes)
-      change=(action "onChangeTime")
-    }}
-  {{else}}
-    {{input
-      class="field hours"
-      type="number"
-      title="Hours"
-      minlength=2
-      maxlength=2
-      max="23"
-      min="0"
-      placeholder="00"
-      value=_hours
-      input=(action "onInput" (hash prop="hours"))
-      focus-in=(action "onFocusIn")
-    }}
-
-    <div class="separator">:</div>
-
-    {{input
-      class="field minutes"
-      title="Minutes"
-      type="number"
-      minlength=2
-      maxlength=2
-      max="59"
-      min="0"
-      placeholder="00"
-      value=_minutes
-      input=(action "onInput" (hash prop="minutes"))
-      focus-in=(action "onFocusIn")
-    }}
-  {{/if}}
-</div>
+{{combo-box
+  value=time
+  content=timeOptions
+  onChange=(action "onChangeTime")
+  options=(hash
+    translatedNone="--:--"
+    allowAny=true
+    filterable=false
+    autoInsertNoneItem=false
+    translatedFilterPlaceholder="--:--"
+  )
+}}
diff --git a/app/assets/javascripts/discourse/templates/review-index.hbs b/app/assets/javascripts/discourse/templates/review-index.hbs
index 7b603f9fa0..c5a0fad889 100644
--- a/app/assets/javascripts/discourse/templates/review-index.hbs
+++ b/app/assets/javascripts/discourse/templates/review-index.hbs
@@ -77,7 +77,13 @@
       {{/if}}
 
       <div class="reviewable-filter date-range">
-        {{date-time-input-range showFromTime=false showToTime=false from=filterFromDate to=filterToDate onChange=setRange}}
+        {{date-time-input-range
+          from=filterFromDate
+          to=filterToDate
+          onChange=setRange
+          showFromTime=false
+          showToTime=false
+        }}
       </div>
 
       <div class="reviewable-filter sort-order">
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 360dd65738..4c0b095c1b 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -482,10 +482,7 @@ export default Component.extend(
         this.selectKit.options.allowAny &&
         !this.selectKit.isExpanded
       ) {
-        return this.defaultItem(
-          null,
-          I18n.t("select_kit.filter_placeholder_with_any")
-        );
+        return null;
       }
 
       let item;
@@ -754,8 +751,6 @@ export default Component.extend(
     },
 
     _onCloseWrapper(event) {
-      this._focusFilter(this.multiSelect);
-
       this.set("selectKit.highlighted", null);
 
       let boundaryAction = this._boundaryActionHandler("onClose");
diff --git a/app/assets/stylesheets/common/admin/admin_report.scss b/app/assets/stylesheets/common/admin/admin_report.scss
index 3bf7481319..82bef5d1be 100644
--- a/app/assets/stylesheets/common/admin/admin_report.scss
+++ b/app/assets/stylesheets/common/admin/admin_report.scss
@@ -161,13 +161,9 @@
         width: 100%;
       }
 
-      .date-picker-wrapper {
+      .d-date-time-input-range {
+        flex-direction: column;
         width: 100%;
-        .date-picker {
-          box-sizing: border-box;
-          width: 100%;
-          margin: 0;
-        }
       }
     }
   }
diff --git a/app/assets/stylesheets/common/base/reviewables.scss b/app/assets/stylesheets/common/base/reviewables.scss
index 2b85d21105..8c2bc4f91d 100644
--- a/app/assets/stylesheets/common/base/reviewables.scss
+++ b/app/assets/stylesheets/common/base/reviewables.scss
@@ -126,6 +126,7 @@
       width: inherit;
       border: none;
       padding: 0;
+      flex-direction: column;
 
       .d-date-input {
         flex: 1 1 auto;
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index e62f24f292..895a4727b6 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -116,11 +116,9 @@
     flex-direction: column;
 
     #search-min-post-count,
-    .date-picker,
     .combo-box,
     .ac-wrap,
     .control-group,
-    .date-picker-wrapper,
     .search-advanced-category-chooser {
       box-sizing: border-box;
       width: 100%;
@@ -131,15 +129,9 @@
       }
     }
 
-    .date-picker-wrapper {
+    .d-date-input {
       margin-top: 0.5em;
-    }
-
-    .date-picker {
-      box-sizing: border-box;
-      text-align: left;
-      padding: 4px;
-      margin-bottom: 0;
+      width: 100%;
     }
 
     .search-advanced-title {
diff --git a/app/assets/stylesheets/common/components/date-input.scss b/app/assets/stylesheets/common/components/date-input.scss
index b24ad8ea4e..c0f453d423 100644
--- a/app/assets/stylesheets/common/components/date-input.scss
+++ b/app/assets/stylesheets/common/components/date-input.scss
@@ -1,19 +1,58 @@
 .d-date-input {
-  display: flex;
-  flex: 1;
+  display: inline-flex;
   cursor: pointer;
   flex-direction: column;
+  min-width: 140px;
 
   .date-picker {
     cursor: pointer;
     margin: 0;
     text-align: left;
     width: 100%;
-    outline: none;
     box-shadow: none !important;
+
+    &::-webkit-input-placeholder {
+      font-size: $font-0;
+      color: $primary-medium;
+    }
+
+    &::-ms-input-placeholder {
+      font-size: $font-0;
+      color: $primary-medium;
+    }
+
+    &::placeholder {
+      font-size: $font-0;
+      color: $primary-medium;
+    }
+
+    &:focus {
+      outline: 1px solid $tertiary;
+      outline-offset: 0;
+    }
   }
 
   .pika-single {
     margin-left: -1px;
+    margin-top: 1px;
+
+    .pika-row td {
+      .pika-button.pika-day {
+        box-shadow: none;
+        border-radius: 0;
+      }
+    }
   }
 }
+
+.d-date-input + .d-time-input {
+  margin-left: 1px;
+}
+
+.d-time-input + .d-date-input {
+  margin-left: 1px;
+}
+
+.d-date-input + .clear-date-time {
+  margin-left: 1px;
+}
diff --git a/app/assets/stylesheets/common/components/date-time-input-range.scss b/app/assets/stylesheets/common/components/date-time-input-range.scss
index e46dd6f0b6..47704fcd64 100644
--- a/app/assets/stylesheets/common/components/date-time-input-range.scss
+++ b/app/assets/stylesheets/common/components/date-time-input-range.scss
@@ -1,41 +1,5 @@
 .d-date-time-input-range {
-  padding: 0.5em;
   border: 1px solid $primary-low;
-  width: 300px;
-  display: flex;
-  flex-direction: column;
-
-  .panels {
-    display: inline-flex;
-    list-style: none;
-    margin: 0 0 0.5em 0;
-    flex: 1;
-
-    &.from {
-      .from-panel {
-        background: $danger;
-        color: $secondary;
-      }
-    }
-
-    &.to {
-      .to-panel {
-        background: $danger;
-        color: $secondary;
-      }
-    }
-
-    .btn {
-      margin-right: 0.5em;
-    }
-  }
-
-  .panel {
-    display: none;
-    flex: 1;
-
-    &.visible {
-      display: flex;
-    }
-  }
+  display: inline-flex;
+  box-sizing: border-box;
 }
diff --git a/app/assets/stylesheets/common/components/date-time-input.scss b/app/assets/stylesheets/common/components/date-time-input.scss
index 1ebe50f9f9..6d113b3130 100644
--- a/app/assets/stylesheets/common/components/date-time-input.scss
+++ b/app/assets/stylesheets/common/components/date-time-input.scss
@@ -1,10 +1,8 @@
 .d-date-time-input {
   display: flex;
-  align-items: center;
   border: 1px solid $primary-low;
   box-sizing: border-box;
   position: relative;
-  flex: 1;
 
   .date-picker,
   .fields {
@@ -13,5 +11,22 @@
 
   .d-date-time-input {
     margin-left: auto;
+    flex: 1 1 auto;
+  }
+
+  .d-time-input {
+    .select-kit.combo-box {
+      .select-kit-header {
+        border: none;
+      }
+    }
+  }
+
+  .d-date-input + .d-time-input {
+    margin-left: 1px;
+  }
+
+  .d-time-input + .d-date-input {
+    margin-right: 1px;
   }
 }
diff --git a/app/assets/stylesheets/common/components/time-input.scss b/app/assets/stylesheets/common/components/time-input.scss
index d11e2b7c7d..73d5ef692c 100644
--- a/app/assets/stylesheets/common/components/time-input.scss
+++ b/app/assets/stylesheets/common/components/time-input.scss
@@ -1,39 +1,43 @@
+.modal-inner-container .d-time-input,
 .d-time-input {
-  box-sizing: border-box;
+  display: inline-flex;
 
-  .fields {
-    display: flex;
-    align-items: center;
-    border: 1px solid $primary-low;
+  .combo-box {
+    width: 65px;
+    min-width: auto;
 
-    .field {
-      text-align: center;
+    &:not(.has-selection) {
+      .select-kit-selected-name .name {
+        color: $primary-medium;
+      }
+    }
+
+    .select-kit-header {
+      .d-icon {
+        padding-left: 0;
+      }
+
+      &:focus {
+        outline: 1px solid $tertiary;
+      }
+    }
+
+    .select-kit-collection {
+      min-width: auto;
+    }
+
+    .select-kit-filter {
       width: auto;
-      margin: 0;
-      border: none;
-      outline: none;
-      box-shadow: none;
-      width: 32px;
-
-      &.time {
-        width: 100%;
-        text-align: left;
+      overflow: hidden;
+      .filter-input {
+        min-width: 0;
       }
+    }
 
-      &.hours,
-      &.minutes {
-        text-align: center;
-        width: 45px;
-      }
-
-      &.hours {
-        padding-right: 0;
-      }
-
-      &.minutes {
-        padding-left: 10px;
-        width: 55px;
-      }
+    .selected-name {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
   }
 }
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 94a3b84af2..af4c1549b1 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -304,7 +304,6 @@ en:
         unbookmark: "Click to remove all bookmarks in this topic"
         unbookmark_with_reminder: "Click to remove all bookmarks and reminders in this topic. You have a reminder set %{reminder_at} for this topic."
 
-
     bookmarks:
       created: "you've bookmarked this post"
       not_bookmarked: "bookmark this post"
@@ -3393,8 +3392,7 @@ en:
           view_table: "table"
           view_graph: "graph"
           refresh_report: "Refresh Report"
-          start_date: "Start Date (UTC)"
-          end_date: "End Date (UTC)"
+          dates: "Dates (UTC)"
           groups: "All groups"
           disabled: "This report is disabled"
           totals_for_sample: "Totals for sample"
diff --git a/test/javascripts/acceptance/dashboard-test.js b/test/javascripts/acceptance/dashboard-test.js
index affe6c0a9f..09c8d0a0b7 100644
--- a/test/javascripts/acceptance/dashboard-test.js
+++ b/test/javascripts/acceptance/dashboard-test.js
@@ -102,7 +102,7 @@ QUnit.test("reports tab", async assert => {
 
 QUnit.test("report filters", async assert => {
   await visit(
-    '/admin/reports/signups?end_date=2018-07-16&filters=%7B"group"%3A88%7D&start_date=2018-06-16'
+    '/admin/reports/signups_with_groups?end_date=2018-07-16&filters=%7B"group"%3A88%7D&start_date=2018-06-16'
   );
 
   const groupFilter = selectKit(".group-filter .combo-box");
diff --git a/test/javascripts/components/date-input-test.js b/test/javascripts/components/date-input-test.js
index 64686aba06..29f01b4f50 100644
--- a/test/javascripts/components/date-input-test.js
+++ b/test/javascripts/components/date-input-test.js
@@ -18,7 +18,7 @@ async function pika(year, month, day) {
 
 function noop() {}
 
-const DEFAULT_DATE = new Date(2019, 0, 29);
+const DEFAULT_DATE = moment("2019-01-29");
 
 componentTest("default", {
   template: `{{date-input date=date}}`,
@@ -44,7 +44,7 @@ componentTest("prevents mutations", {
     await click(dateInput());
     await pika(2019, 0, 2);
 
-    assert.ok(this.date.getTime() === DEFAULT_DATE.getTime());
+    assert.ok(this.date.isSame(DEFAULT_DATE));
   }
 });
 
@@ -60,6 +60,6 @@ componentTest("allows mutations through actions", {
     await click(dateInput());
     await pika(2019, 0, 2);
 
-    assert.ok(this.date.getTime() === new Date(2019, 0, 2).getTime());
+    assert.ok(this.date.isSame(moment("2019-01-02")));
   }
 });
diff --git a/test/javascripts/components/date-time-input-range-test.js b/test/javascripts/components/date-time-input-range-test.js
index 69ff0a9d45..9ffa7e6ef6 100644
--- a/test/javascripts/components/date-time-input-range-test.js
+++ b/test/javascripts/components/date-time-input-range-test.js
@@ -3,40 +3,22 @@ import componentTest from "helpers/component-test";
 moduleForComponent("date-time-input-range", { integration: true });
 
 function fromDateInput() {
-  return find(".from .date-picker");
+  return find(".from.d-date-time-input .date-picker")[0];
 }
 
-function fromHoursInput() {
-  return find(".from .field.hours");
-}
-
-function fromMinutesInput() {
-  return find(".from .field.minutes");
+function fromTimeInput() {
+  return find(".from.d-date-time-input .d-time-input .combo-box-header")[0];
 }
 
 function toDateInput() {
-  return find(".to .date-picker");
+  return find(".to.d-date-time-input .date-picker")[0];
 }
 
-function toHoursInput() {
-  return find(".to .field.hours");
+function toTimeInput() {
+  return find(".to.d-date-time-input .d-time-input .combo-box-header")[0];
 }
 
-function toMinutesInput() {
-  return find(".to .field.minutes");
-}
-
-function setDates(dates) {
-  this.setProperties(dates);
-}
-
-async function pika(year, month, day) {
-  await click(
-    `.pika-button.pika-day[data-pika-year="${year}"][data-pika-month="${month}"][data-pika-day="${day}"]`
-  );
-}
-
-const DEFAULT_DATE_TIME = new Date(2019, 0, 29, 14, 45);
+const DEFAULT_DATE_TIME = moment("2019-01-29 14:45");
 
 componentTest("default", {
   template: `{{date-time-input-range from=from to=to}}`,
@@ -46,60 +28,9 @@ componentTest("default", {
   },
 
   test(assert) {
-    assert.equal(fromDateInput().val(), "January 29, 2019");
-    assert.equal(fromHoursInput().val(), "14");
-    assert.equal(fromMinutesInput().val(), "45");
-
-    assert.equal(toDateInput().val(), "");
-    assert.equal(toHoursInput().val(), "");
-    assert.equal(toMinutesInput().val(), "");
-  }
-});
-
-componentTest("can switch panels", {
-  template: `{{date-time-input-range}}`,
-
-  async test(assert) {
-    assert.ok(exists(".panel.from.visible"));
-    assert.notOk(exists(".panel.to.visible"));
-
-    await click(".panels button.to-panel");
-
-    assert.ok(exists(".panel.to.visible"));
-    assert.notOk(exists(".panel.from.visible"));
-  }
-});
-
-componentTest("prevents toDate to be before fromDate", {
-  template: `{{date-time-input-range from=from to=to onChange=onChange}}`,
-
-  beforeEach() {
-    this.setProperties({
-      from: DEFAULT_DATE_TIME,
-      to: DEFAULT_DATE_TIME,
-      onChange: setDates
-    });
-  },
-
-  async test(assert) {
-    assert.notOk(exists(".error"), "it begins with no error");
-
-    await click(".panels button.to-panel");
-    await click(toDateInput());
-    await pika(2019, 0, 1);
-
-    assert.ok(exists(".error"), "it shows an error");
-    assert.deepEqual(this.to, DEFAULT_DATE_TIME, "it didnt trigger a mutation");
-
-    await click(".panels button.to-panel");
-    await click(toDateInput());
-    await pika(2019, 0, 30);
-
-    assert.notOk(exists(".error"), "it removes the error");
-    assert.deepEqual(
-      this.to,
-      new Date(2019, 0, 30, 14, 45),
-      "it has changed the date"
-    );
+    assert.equal(fromDateInput().value, "January 29, 2019");
+    assert.equal(fromTimeInput().dataset.name, "14:45");
+    assert.equal(toDateInput().value, "");
+    assert.equal(toTimeInput().dataset.name, "--:--");
   }
 });
diff --git a/test/javascripts/components/date-time-input-test.js b/test/javascripts/components/date-time-input-test.js
index 2dd4ac8fcf..e56e3e0913 100644
--- a/test/javascripts/components/date-time-input-test.js
+++ b/test/javascripts/components/date-time-input-test.js
@@ -3,15 +3,11 @@ import componentTest from "helpers/component-test";
 moduleForComponent("date-time-input", { integration: true });
 
 function dateInput() {
-  return find(".date-picker");
+  return find(".date-picker")[0];
 }
 
-function hoursInput() {
-  return find(".field.hours");
-}
-
-function minutesInput() {
-  return find(".field.minutes");
+function timeInput() {
+  return find(".d-time-input .combo-box-header")[0];
 }
 
 function setDate(date) {
@@ -24,7 +20,7 @@ async function pika(year, month, day) {
   );
 }
 
-const DEFAULT_DATE_TIME = new Date(2019, 0, 29, 14, 45);
+const DEFAULT_DATE_TIME = moment("2019-01-29 14:45");
 
 componentTest("default", {
   template: `{{date-time-input date=date}}`,
@@ -34,9 +30,8 @@ componentTest("default", {
   },
 
   test(assert) {
-    assert.equal(dateInput().val(), "January 29, 2019");
-    assert.equal(hoursInput().val(), "14");
-    assert.equal(minutesInput().val(), "45");
+    assert.equal(dateInput().value, "January 29, 2019");
+    assert.equal(timeInput().dataset.name, "14:45");
   }
 });
 
@@ -51,7 +46,7 @@ componentTest("prevents mutations", {
     await click(dateInput());
     await pika(2019, 0, 2);
 
-    assert.ok(this.date.getTime() === DEFAULT_DATE_TIME.getTime());
+    assert.ok(this.date.isSame(DEFAULT_DATE_TIME));
   }
 });
 
@@ -67,7 +62,7 @@ componentTest("allows mutations through actions", {
     await click(dateInput());
     await pika(2019, 0, 2);
 
-    assert.ok(this.date.getTime() === new Date(2019, 0, 2, 14, 45).getTime());
+    assert.ok(this.date.isSame(moment("2019-01-02 14:45")));
   }
 });
 
@@ -79,6 +74,6 @@ componentTest("can hide time", {
   },
 
   async test(assert) {
-    assert.notOk(exists(hoursInput()));
+    assert.notOk(exists(timeInput()));
   }
 });
diff --git a/test/javascripts/components/time-input-test.js b/test/javascripts/components/time-input-test.js
index edbe7574c8..a6ef6606c9 100644
--- a/test/javascripts/components/time-input-test.js
+++ b/test/javascripts/components/time-input-test.js
@@ -1,21 +1,18 @@
+import selectKit from "helpers/select-kit-helper";
 import componentTest from "helpers/component-test";
 
-moduleForComponent("time-input", { integration: true });
+moduleForComponent("time-input", {
+  integration: true,
 
-function hoursInput() {
-  return find(".field.hours");
-}
-
-function minutesInput() {
-  return find(".field.minutes");
-}
+  beforeEach() {
+    this.set("subject", selectKit());
+  }
+});
 
 function setTime(time) {
   this.setProperties(time);
 }
 
-function noop() {}
-
 componentTest("default", {
   template: `{{time-input hours=hours minutes=minutes}}`,
 
@@ -24,8 +21,7 @@ componentTest("default", {
   },
 
   test(assert) {
-    assert.equal(hoursInput().val(), "14");
-    assert.equal(minutesInput().val(), "58");
+    assert.equal(this.subject.header().name(), "14:58");
   }
 });
 
@@ -37,11 +33,9 @@ componentTest("prevents mutations", {
   },
 
   async test(assert) {
-    await fillIn(hoursInput(), "12");
-    assert.ok(this.hours === "14");
-
-    await fillIn(minutesInput(), "36");
-    assert.ok(this.minutes === "58");
+    await this.subject.expand();
+    await this.subject.selectRowByIndex(3);
+    assert.equal(this.subject.header().name(), "14:58");
   }
 });
 
@@ -54,44 +48,8 @@ componentTest("allows mutations through actions", {
   },
 
   async test(assert) {
-    await fillIn(hoursInput(), "12");
-    assert.ok(this.hours === "12");
-
-    await fillIn(minutesInput(), "36");
-    assert.ok(this.minutes === "36");
-  }
-});
-
-componentTest("hours and minutes have boundaries", {
-  template: `{{time-input hours=14 minutes=58 onChange=onChange}}`,
-
-  beforeEach() {
-    this.set("onChange", noop);
-  },
-
-  async test(assert) {
-    await fillIn(hoursInput(), "2");
-    assert.equal(hoursInput().val(), "02");
-
-    await fillIn(hoursInput(), "@");
-    assert.equal(hoursInput().val(), "00");
-
-    await fillIn(hoursInput(), "24");
-    assert.equal(hoursInput().val(), "23");
-
-    await fillIn(hoursInput(), "-1");
-    assert.equal(hoursInput().val(), "00");
-
-    await fillIn(minutesInput(), "@");
-    assert.equal(minutesInput().val(), "00");
-
-    await fillIn(minutesInput(), "2");
-    assert.equal(minutesInput().val(), "02");
-
-    await fillIn(minutesInput(), "60");
-    assert.equal(minutesInput().val(), "59");
-
-    await fillIn(minutesInput(), "-1");
-    assert.equal(minutesInput().val(), "00");
+    await this.subject.expand();
+    await this.subject.selectRowByIndex(3);
+    assert.equal(this.subject.header().name(), "00:45");
   }
 });
diff --git a/test/javascripts/fixtures/reports_bulk.js b/test/javascripts/fixtures/reports_bulk.js
index a41cf34583..100648b3f4 100644
--- a/test/javascripts/fixtures/reports_bulk.js
+++ b/test/javascripts/fixtures/reports_bulk.js
@@ -59,7 +59,7 @@ let signups = {
   prev_end_date: "2018-06-17T00:00:00Z",
   prev30Days: null,
   dates_filtering: true,
-  report_key: 'reports:signups:start:end:[:prev_period]:50:{"group":"88"}:4',
+  report_key: "reports:signups:start:end:[:prev_period]:4",
   available_filters: [
     { id: "group", type: "group", allow_any: false, choices: [], default: "88" }
   ],
@@ -77,18 +77,29 @@ let signups = {
 let signups_fixture = JSON.parse(JSON.stringify(signups));
 signups_fixture.type = "signups_exception";
 signups_fixture.error = "exception";
+signups_fixture.report_key =
+  "reports:signups_exception:start:end:[:prev_period]:4";
 const signups_exception = signups_fixture;
 
 signups_fixture = JSON.parse(JSON.stringify(signups));
 signups_fixture.type = "signups_timeout";
 signups_fixture.error = "timeout";
+signups_fixture.report_key =
+  "reports:signups_timeout:start:end:[:prev_period]:4";
 const signups_timeout = signups_fixture;
 
 signups_fixture = JSON.parse(JSON.stringify(signups));
 signups_fixture.type = "not_found";
 signups_fixture.error = "not_found";
+signups_fixture.report_key = "reports:not_found:start:end:[:prev_period]:4";
 const signups_not_found = signups_fixture;
 
+signups_fixture = JSON.parse(JSON.stringify(signups));
+signups_fixture.type = "signups_with_groups";
+signups_fixture.report_key =
+  'reports:signups_with_groups:start:end:[:prev_period]:50:{"group":"88"}:4';
+const signups_with_group = signups_fixture;
+
 const startDate = moment()
   .locale("en")
   .utc()
@@ -180,6 +191,7 @@ export default {
   "/admin/reports/bulk": {
     reports: [
       signups,
+      signups_with_group,
       signups_not_found,
       signups_exception,
       signups_timeout,

From 54ec9f700988a5b7dd0bf2894bee48d780ecf082 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 22 Apr 2020 23:53:31 -0500
Subject: [PATCH 0743/1830] DEV: DiscourseEvents fired when users are
 added/removed from groups (#9522)

---
 app/services/group_action_logger.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/services/group_action_logger.rb b/app/services/group_action_logger.rb
index 01620a72b5..4f38fd5a27 100644
--- a/app/services/group_action_logger.rb
+++ b/app/services/group_action_logger.rb
@@ -28,6 +28,7 @@ class GroupActionLogger
   def log_add_user_to_group(target_user)
     (target_user == @acting_user && @group.public_admission) || can_edit?
 
+    DiscourseEvent.trigger(:user_added_to_group, target_user, @group)
     GroupHistory.create!(default_params.merge(
       action: GroupHistory.actions[:add_user_to_group],
       target_user: target_user
@@ -37,6 +38,7 @@ class GroupActionLogger
   def log_remove_user_from_group(target_user)
     (target_user == @acting_user && @group.public_exit) || can_edit?
 
+    DiscourseEvent.trigger(:user_removed_from_group, target_user, @group)
     GroupHistory.create!(default_params.merge(
       action: GroupHistory.actions[:remove_user_from_group],
       target_user: target_user

From 52c1d7337ec5863b65a557a7f4d02af9bd0b7300 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Thu, 23 Apr 2020 14:57:35 +1000
Subject: [PATCH 0744/1830] FEATURE: don't display new/unread notification for
 muted topics (#9482)

* FEATURE: don't display new/unread notification for muted topics

Currently, even if user mute topic, when a new reply to that topic arrives, the user will get "See 1 new or updated topic" message. After clicking on that link, nothing is visible (because the topic is muted)

To solve that problem, we will send background message to all users who recently muted that topic that update is coming and they can ignore the next message about that topic.
---
 .../discourse/models/topic-tracking-state.js  | 35 ++++++++++++++++
 app/models/topic_tracking_state.rb            | 17 ++++++++
 lib/post_jobs_enqueuer.rb                     |  5 ++-
 spec/models/topic_tracking_state_spec.rb      | 40 +++++++++++++++++++
 .../models/topic-tracking-state-test.js       | 30 +++++++++++++-
 5 files changed, 125 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/topic-tracking-state.js b/app/assets/javascripts/discourse/models/topic-tracking-state.js
index 7debe3f4ce..bccb7747eb 100644
--- a/app/assets/javascripts/discourse/models/topic-tracking-state.js
+++ b/app/assets/javascripts/discourse/models/topic-tracking-state.js
@@ -53,6 +53,17 @@ const TopicTrackingState = EmberObject.extend({
     const tracker = this;
 
     const process = data => {
+      if (data.message_type === "muted") {
+        tracker.trackMutedTopic(data.topic_id);
+        return;
+      }
+
+      tracker.pruneOldMutedTopics();
+
+      if (tracker.isMutedTopic(data.topic_id)) {
+        return;
+      }
+
       if (data.message_type === "delete") {
         tracker.removeTopic(data.topic_id);
         tracker.incrementMessageCount();
@@ -132,6 +143,30 @@ const TopicTrackingState = EmberObject.extend({
     });
   },
 
+  mutedTopics() {
+    return (this.currentUser && this.currentUser.muted_topics) || [];
+  },
+
+  trackMutedTopic(topicId) {
+    let mutedTopics = this.mutedTopics().concat({
+      topicId: topicId,
+      createdAt: Date.now()
+    });
+    this.currentUser && this.currentUser.set("muted_topics", mutedTopics);
+  },
+
+  pruneOldMutedTopics() {
+    const now = Date.now();
+    let mutedTopics = this.mutedTopics().filter(
+      mutedTopic => now - mutedTopic.createdAt < 60000
+    );
+    this.currentUser && this.currentUser.set("muted_topics", mutedTopics);
+  },
+
+  isMutedTopic(topicId) {
+    return !!this.mutedTopics().findBy("topicId", topicId);
+  },
+
   updateSeen(topicId, highestSeen) {
     if (!topicId || !highestSeen) {
       return;
diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index 49ffeb9751..91838da99b 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -12,6 +12,7 @@ class TopicTrackingState
   CHANNEL = "/user-tracking"
   UNREAD_MESSAGE_TYPE = "unread".freeze
   LATEST_MESSAGE_TYPE = "latest".freeze
+  MUTED_MESSAGE_TYPE = "muted".freeze
 
   attr_accessor :user_id,
                 :topic_id,
@@ -71,6 +72,22 @@ class TopicTrackingState
     "/unread/#{user_id}"
   end
 
+  def self.publish_muted(post)
+    user_ids = post.topic.topic_users
+      .where(notification_level: NotificationLevels.all[:muted])
+      .joins(:user)
+      .where("users.last_seen_at > ?", 7.days.ago)
+      .order("users.last_seen_at DESC")
+      .limit(100)
+      .pluck(:user_id)
+    return if user_ids.blank?
+    message = {
+      topic_id: post.topic_id,
+      message_type: MUTED_MESSAGE_TYPE,
+    }
+    MessageBus.publish("/latest", message.as_json, user_ids: user_ids)
+  end
+
   def self.publish_unread(post)
     return unless post.topic.regular?
     # TODO at high scale we are going to have to defer this,
diff --git a/lib/post_jobs_enqueuer.rb b/lib/post_jobs_enqueuer.rb
index 6f95899bb4..d539a4d640 100644
--- a/lib/post_jobs_enqueuer.rb
+++ b/lib/post_jobs_enqueuer.rb
@@ -57,7 +57,10 @@ class PostJobsEnqueuer
   end
 
   def after_post_create
-    TopicTrackingState.publish_unread(@post) if @post.post_number > 1
+    if @post.post_number > 1
+      TopicTrackingState.publish_muted(@post)
+      TopicTrackingState.publish_unread(@post)
+    end
     TopicTrackingState.publish_latest(@topic, @post.whisper?)
 
     Jobs.enqueue_in(SiteSetting.email_time_window_mins.minutes,
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index a68239512d..25bc127ba6 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/spec/models/topic_tracking_state_spec.rb
@@ -72,6 +72,46 @@ describe TopicTrackingState do
     end
   end
 
+  describe '#publish_muted' do
+    let(:user) do
+      Fabricate(:user, last_seen_at: Date.today)
+    end
+    let(:post) do
+      create_post(user: user)
+    end
+
+    it 'can correctly publish muted' do
+      TopicUser.find_by(topic: post.topic, user: post.user).update(notification_level: 0)
+      messages = MessageBus.track_publish("/latest") do
+        TopicTrackingState.publish_muted(post)
+      end
+
+      muted_message = messages.find { |message| message.data["message_type"] == "muted" }
+
+      expect(muted_message.data["topic_id"]).to eq(topic.id)
+      expect(muted_message.data["message_type"]).to eq(described_class::MUTED_MESSAGE_TYPE)
+    end
+
+    it 'should not publish any message when notification level is not muted' do
+      messages = MessageBus.track_publish("/latest") do
+        TopicTrackingState.publish_muted(post)
+      end
+      muted_messages = messages.select { |message| message.data["message_type"] == "muted" }
+
+      expect(muted_messages).to eq([])
+    end
+
+    it 'should not publish any message when the user was not seen in the last 7 days' do
+      TopicUser.find_by(topic: post.topic, user: post.user).update(notification_level: 0)
+      post.user.update(last_seen_at: 8.days.ago)
+      messages = MessageBus.track_publish("/latest") do
+        TopicTrackingState.publish_muted(post)
+      end
+      muted_messages = messages.select { |message| message.data["message_type"] == "muted" }
+      expect(muted_messages).to eq([])
+    end
+  end
+
   describe '#publish_private_message' do
     fab!(:admin) { Fabricate(:admin) }
 
diff --git a/test/javascripts/models/topic-tracking-state-test.js b/test/javascripts/models/topic-tracking-state-test.js
index 0d958b8503..709928c932 100644
--- a/test/javascripts/models/topic-tracking-state-test.js
+++ b/test/javascripts/models/topic-tracking-state-test.js
@@ -2,8 +2,17 @@ import TopicTrackingState from "discourse/models/topic-tracking-state";
 import createStore from "helpers/create-store";
 import Category from "discourse/models/category";
 import { NotificationLevels } from "discourse/lib/notification-levels";
+import User from "discourse/models/user";
 
-QUnit.module("model:topic-tracking-state");
+QUnit.module("model:topic-tracking-state", {
+  beforeEach() {
+    this.clock = sinon.useFakeTimers(new Date(2012, 11, 31, 12, 0).getTime());
+  },
+
+  afterEach() {
+    this.clock.restore();
+  }
+});
 
 QUnit.test("sync", function(assert) {
   const state = TopicTrackingState.create();
@@ -168,3 +177,22 @@ QUnit.test("countNew", assert => {
   assert.equal(state.countNew(2), 2);
   assert.equal(state.countNew(3), 1);
 });
+
+QUnit.test("mute topic", function(assert) {
+  let currentUser = User.create({
+    username: "chuck",
+    muted_category_ids: []
+  });
+
+  const state = TopicTrackingState.create({ currentUser });
+
+  state.trackMutedTopic(1);
+  assert.equal(currentUser.muted_topics[0].topicId, 1);
+
+  state.pruneOldMutedTopics();
+  assert.equal(state.isMutedTopic(1), true);
+
+  this.clock.tick(60000);
+  state.pruneOldMutedTopics();
+  assert.equal(state.isMutedTopic(1), false);
+});

From d69ec186b94ee6798da1b911498c9b679b6486c0 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 23 Apr 2020 15:06:55 +1000
Subject: [PATCH 0745/1830] Revert "DEV: DiscourseEvents fired when users are
 added/removed from groups (#9522)"

This reverts commit 54ec9f700988a5b7dd0bf2894bee48d780ecf082.

The commit clashes with a previous implementation of the same event
---
 app/services/group_action_logger.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/services/group_action_logger.rb b/app/services/group_action_logger.rb
index 4f38fd5a27..01620a72b5 100644
--- a/app/services/group_action_logger.rb
+++ b/app/services/group_action_logger.rb
@@ -28,7 +28,6 @@ class GroupActionLogger
   def log_add_user_to_group(target_user)
     (target_user == @acting_user && @group.public_admission) || can_edit?
 
-    DiscourseEvent.trigger(:user_added_to_group, target_user, @group)
     GroupHistory.create!(default_params.merge(
       action: GroupHistory.actions[:add_user_to_group],
       target_user: target_user
@@ -38,7 +37,6 @@ class GroupActionLogger
   def log_remove_user_from_group(target_user)
     (target_user == @acting_user && @group.public_exit) || can_edit?
 
-    DiscourseEvent.trigger(:user_removed_from_group, target_user, @group)
     GroupHistory.create!(default_params.merge(
       action: GroupHistory.actions[:remove_user_from_group],
       target_user: target_user

From 7132c50f3bb9776676c8a1ca6eff67227ef36d06 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 23 Apr 2020 07:54:29 +0200
Subject: [PATCH 0746/1830] FIX: prevents constant composer reloading (#9528)

---
 app/assets/javascripts/discourse/components/d-editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/d-editor.js b/app/assets/javascripts/discourse/components/d-editor.js
index 11ec7b06ca..faeeb11c77 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js
+++ b/app/assets/javascripts/discourse/components/d-editor.js
@@ -328,7 +328,7 @@ export default Component.extend({
     $(this.element.querySelector(".d-editor-preview")).off("click.preview");
   },
 
-  @discourseComputed("attrs.outletArgs.composer.action")
+  @discourseComputed()
   toolbar() {
     const toolbar = new Toolbar(
       this.getProperties("site", "siteSettings", "showLink")

From fa96054acf612619d66ae3c01d9e4c5a3712728c Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 23 Apr 2020 17:51:23 +1000
Subject: [PATCH 0747/1830] PERF: stop firing superfluous onSelectionChange

onSelectionChanged fires a debounced event that calls window.getSelection()

window.getSelection() is reasonably expensive. There is no reason to do any
of this work if we have an input field focused, that is not how quote works
---
 .../javascripts/discourse/components/quote-button.js   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/quote-button.js b/app/assets/javascripts/discourse/components/quote-button.js
index 8f7d464543..180654099f 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js
+++ b/app/assets/javascripts/discourse/components/quote-button.js
@@ -188,10 +188,16 @@ export default Component.extend({
       .on("mouseup.quote-button", () => {
         this._prevSelection = null;
         this._isMouseDown = false;
-        onSelectionChanged();
+        if (document.activeElement === document.body) {
+          onSelectionChanged();
+        }
       })
       .on("selectionchange.quote-button", () => {
-        if (!this._isMouseDown && !this._reselected) {
+        if (
+          !this._isMouseDown &&
+          !this._reselected &&
+          document.activeElement === document.body
+        ) {
           onSelectionChanged();
         }
       });

From 8dccf0521cd23d27f56b5b48f8dd05b659096569 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 23 Apr 2020 18:16:13 +1000
Subject: [PATCH 0748/1830] Revert "PERF: stop firing superfluous
 onSelectionChange"

This reverts commit fa96054acf612619d66ae3c01d9e4c5a3712728c.

Sadly this fails a test case, we may have to hunt up all the
parentElements to check for the cooked class to perform the
bypass
---
 .../javascripts/discourse/components/quote-button.js   | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/quote-button.js b/app/assets/javascripts/discourse/components/quote-button.js
index 180654099f..8f7d464543 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js
+++ b/app/assets/javascripts/discourse/components/quote-button.js
@@ -188,16 +188,10 @@ export default Component.extend({
       .on("mouseup.quote-button", () => {
         this._prevSelection = null;
         this._isMouseDown = false;
-        if (document.activeElement === document.body) {
-          onSelectionChanged();
-        }
+        onSelectionChanged();
       })
       .on("selectionchange.quote-button", () => {
-        if (
-          !this._isMouseDown &&
-          !this._reselected &&
-          document.activeElement === document.body
-        ) {
+        if (!this._isMouseDown && !this._reselected) {
           onSelectionChanged();
         }
       });

From 8e28ccb2ea88c107be48aa1e55d311ca7a9fb458 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 23 Apr 2020 11:03:46 +0100
Subject: [PATCH 0749/1830] PERF: Refactor decorateCooked to run in a detached
 DOM (#9517)

This means that decorateCooked can be used to modify HTML without triggering the download of remote resources (e.g. images)

In some rare cases (e.g. IntersectionObservers in Chromium), decorating needs to happen in the real DOM. For this, pass `afterAdopt: true` to `decorateCooked`
---
 .../discourse/lib/lazy-load-images.js         | 31 +++++---
 .../javascripts/discourse/lib/plugin-api.js   |  7 +-
 .../discourse/widgets/post-cooked.js          | 71 +++++++++++++------
 3 files changed, 78 insertions(+), 31 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/lazy-load-images.js b/app/assets/javascripts/discourse/lib/lazy-load-images.js
index f326b2ebf2..56ab825e0b 100644
--- a/app/assets/javascripts/discourse/lib/lazy-load-images.js
+++ b/app/assets/javascripts/discourse/lib/lazy-load-images.js
@@ -84,6 +84,14 @@ function show(image) {
   }
 }
 
+function forEachImage($post, callback) {
+  $post[0].querySelectorAll("img").forEach(img => {
+    if (img.width >= MINIMUM_SIZE && img.height >= MINIMUM_SIZE) {
+      callback(img);
+    }
+  });
+}
+
 export function setupLazyLoading(api) {
   const observer = new IntersectionObserver(entries => {
     entries.forEach(entry => {
@@ -96,15 +104,20 @@ export function setupLazyLoading(api) {
     });
   }, OBSERVER_OPTIONS);
 
+  api.decorateCooked($post => forEachImage($post, img => hide(img)), {
+    onlyStream: true,
+    id: "discourse-lazy-load"
+  });
+
+  // IntersectionObserver.observe must be called after the cooked
+  // content is adopted by the document element in chrome
+  // https://bugs.chromium.org/p/chromium/issues/detail?id=1073469
   api.decorateCooked(
-    $post => {
-      $("img", $post).each((_, img) => {
-        if (img.width >= MINIMUM_SIZE && img.height >= MINIMUM_SIZE) {
-          hide(img);
-          observer.observe(img);
-        }
-      });
-    },
-    { onlyStream: true, id: "discourse-lazy-load" }
+    $post => forEachImage($post, img => observer.observe(img)),
+    {
+      onlyStream: true,
+      id: "discourse-lazy-load-after-adopt",
+      afterAdopt: true
+    }
   );
 }
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js b/app/assets/javascripts/discourse/lib/plugin-api.js
index 6df49e453d..8f0e14253f 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js
@@ -54,7 +54,7 @@ import { on } from "@ember/object/evented";
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.8.40";
+const PLUGIN_API_VERSION = "0.8.41";
 
 class PluginApi {
   constructor(version, container) {
@@ -200,6 +200,9 @@ class PluginApi {
    * Use `options.onlyStream` if you only want to decorate posts within a topic,
    * and not in other places like the user stream.
    *
+   * Decoration normally happens in a detached DOM. Use `options.afterAdopt`
+   * to decorate html content after it is adopted by the main `document`.
+   *
    * For example, to add a yellow background to all posts you could do this:
    *
    * ```
@@ -215,7 +218,7 @@ class PluginApi {
   decorateCooked(callback, opts) {
     opts = opts || {};
 
-    addDecorator(callback);
+    addDecorator(callback, { afterAdopt: !!opts.afterAdopt });
 
     if (!opts.onlyStream) {
       decorate(ComposerEditor, "previewRefreshed", callback, opts.id);
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js b/app/assets/javascripts/discourse/widgets/post-cooked.js
index f587a76817..71fc9f43ef 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js
@@ -8,15 +8,27 @@ import {
   unhighlightHTML
 } from "discourse/lib/highlight-html";
 
-let _decorators = [];
+let _beforeAdoptDecorators = [];
+let _afterAdoptDecorators = [];
 
 // Don't call this directly: use `plugin-api/decorateCooked`
-export function addDecorator(cb) {
-  _decorators.push(cb);
+export function addDecorator(callback, { afterAdopt = false } = {}) {
+  if (afterAdopt) {
+    _afterAdoptDecorators.push(callback);
+  } else {
+    _beforeAdoptDecorators.push(callback);
+  }
 }
 
 export function resetDecorators() {
-  _decorators = [];
+  _beforeAdoptDecorators = [];
+  _afterAdoptDecorators = [];
+}
+
+let detachedDocument = document.implementation.createHTMLDocument("detached");
+
+function createDetachedElement(nodeName) {
+  return detachedDocument.createElement(nodeName);
 }
 
 export default class PostCooked {
@@ -41,14 +53,27 @@ export default class PostCooked {
   }
 
   init() {
-    const $html = this._computeCooked();
-    this._insertQuoteControls($html);
-    this._showLinkCounts($html);
-    this._fixImageSizes($html);
-    this._applySearchHighlight($html);
+    const cookedDiv = this._computeCooked();
+    const $cookedDiv = $(cookedDiv);
 
-    _decorators.forEach(cb => cb($html, this.decoratorHelper));
-    return $html[0];
+    this._insertQuoteControls($cookedDiv);
+    this._showLinkCounts($cookedDiv);
+    this._fixImageSizes($cookedDiv);
+    this._applySearchHighlight($cookedDiv);
+
+    this._decorateAndAdopt(cookedDiv);
+
+    return cookedDiv;
+  }
+
+  _decorateAndAdopt(cooked) {
+    const $cooked = $(cooked);
+
+    _beforeAdoptDecorators.forEach(d => d($cooked, this.decoratorHelper));
+
+    document.adoptNode(cooked);
+
+    _afterAdoptDecorators.forEach(d => d($cooked, this.decoratorHelper));
   }
 
   _applySearchHighlight($html) {
@@ -175,12 +200,14 @@ export default class PostCooked {
           quotedPosts[result.id] = result;
           post.set("quoted", quotedPosts);
 
-          const div = $("<div class='expanded-quote'></div>");
-          div.data("post-id", result.id);
-          div.html(result.cooked);
-          _decorators.forEach(cb => cb(div, this.decoratorHelper));
+          const div = createDetachedElement("div");
+          div.classList.add("expanded-quote");
+          div.dataset.postId = result.id;
+          div.innerHTML = result.cooked;
 
-          highlightHTML(div[0], originalText, {
+          this._decorateAndAdopt(div);
+
+          highlightHTML(div, originalText, {
             matchCase: true
           });
           $blockQuote.showHtml(div, "fast", finished);
@@ -275,18 +302,22 @@ export default class PostCooked {
   }
 
   _computeCooked() {
+    const cookedDiv = createDetachedElement("div");
+    cookedDiv.classList.add("cooked");
+
     if (
       (this.attrs.firstPost || this.attrs.embeddedPost) &&
       this.ignoredUsers &&
       this.ignoredUsers.length > 0 &&
       this.ignoredUsers.includes(this.attrs.username)
     ) {
-      return $(
-        `<div class='cooked post-ignored'>${I18n.t("post.ignored")}</div>`
-      );
+      cookedDiv.classList.add("post-ignored");
+      cookedDiv.innerHTML = I18n.t("post.ignored");
+    } else {
+      cookedDiv.innerHTML = this.attrs.cooked;
     }
 
-    return $(`<div class='cooked'>${this.attrs.cooked}</div>`);
+    return cookedDiv;
   }
 }
 

From 7a2e8d3ead63c7d99e1069fc7823e933f931ba85 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Thu, 23 Apr 2020 10:07:54 -0300
Subject: [PATCH 0750/1830] DEV: Add the missing `app` subdirectory (#9499)

* DEV: Add missing  directory to the Discourse ember app

* DEV: Resolve imports correctly
---
 app/assets/javascripts/application.js         | 184 +++++++++---------
 .../{ => app}/adapters/email-template.js      |   0
 .../discourse/{ => app}/adapters/group.js     |   0
 .../{ => app}/adapters/notification.js        |   0
 .../{ => app}/adapters/post-reply-history.js  |   0
 .../{ => app}/adapters/post-reply.js          |   0
 .../discourse/{ => app}/adapters/post.js      |   0
 .../{ => app}/adapters/published-page.js      |   0
 .../discourse/{ => app}/adapters/rest.js      |   0
 .../adapters/reviewable-explanation.js        |   0
 .../{ => app}/adapters/reviewable-settings.js |   0
 .../{ => app}/adapters/reviewable-topic.js    |   0
 .../{ => app}/adapters/reviewable.js          |   0
 .../discourse/{ => app}/adapters/tag-info.js  |   0
 .../{ => app}/adapters/tag-notification.js    |   0
 .../{ => app}/adapters/topic-list.js          |   0
 .../discourse/{ => app}/adapters/topic.js     |   0
 .../{ => app}/components/about-page-users.js  |   0
 .../components/activation-controls.js         |   0
 .../components/add-category-tag-classes.js    |   0
 .../components/auth-token-dropdown.js         |   0
 .../{ => app}/components/avatar-flair.js      |   0
 .../{ => app}/components/avatar-uploader.js   |   0
 .../{ => app}/components/backup-codes.js      |   0
 .../{ => app}/components/backup-uploader.js   |   0
 .../{ => app}/components/badge-button.js      |   0
 .../{ => app}/components/badge-card.js        |   0
 .../{ => app}/components/badge-selector.js    |   0
 .../{ => app}/components/badge-title.js       |   0
 .../{ => app}/components/basic-topic-list.js  |   0
 .../components/bookmark-actions-dropdown.js   |   0
 .../{ => app}/components/bread-crumbs.js      |   0
 .../components/bulk-select-button.js          |   0
 .../categories-and-latest-topics.js           |   0
 .../components/categories-and-top-topics.js   |   0
 .../components/categories-boxes-topic.js      |   0
 .../categories-boxes-with-topics.js           |   0
 .../{ => app}/components/categories-boxes.js  |   0
 .../{ => app}/components/categories-only.js   |   0
 .../components/categories-topic-list.js       |   0
 .../components/category-title-before.js       |   0
 .../components/category-title-link.js         |   0
 .../{ => app}/components/category-unread.js   |   0
 .../discourse/{ => app}/components/cdn-img.js |   0
 .../{ => app}/components/choose-message.js    |   0
 .../{ => app}/components/choose-topic.js      |   0
 .../components/color-picker-choice.js         |   0
 .../{ => app}/components/color-picker.js      |   0
 .../components/composer-action-title.js       |   0
 .../{ => app}/components/composer-body.js     |   0
 .../{ => app}/components/composer-editor.js   |   0
 .../{ => app}/components/composer-message.js  |   0
 .../{ => app}/components/composer-messages.js |   0
 .../components/composer-save-button.js        |   0
 .../{ => app}/components/composer-title.js    |   0
 .../{ => app}/components/composer-toggles.js  |   0
 .../components/composer-user-selector.js      |   0
 .../category-search-priorities.js.erb         |   0
 .../components/conditional-loading-section.js |   0
 .../components/conditional-loading-spinner.js |   0
 .../components/connector-container.js         |   0
 .../{ => app}/components/cook-text.js         |   0
 .../{ => app}/components/count-i18n.js        |   0
 .../{ => app}/components/create-account.js    |   0
 .../components/create-topic-button.js         |   0
 .../components/create-topics-notice.js        |   0
 .../{ => app}/components/csv-uploader.js      |   0
 .../{ => app}/components/custom-html.js       |   0
 .../{ => app}/components/d-button.js          |   0
 .../{ => app}/components/d-editor.js          |   0
 .../{ => app}/components/d-modal-body.js      |   0
 .../{ => app}/components/d-modal-cancel.js    |   0
 .../discourse/{ => app}/components/d-modal.js |   0
 .../{ => app}/components/d-navigation.js      |   0
 .../{ => app}/components/d-section.js         |   0
 .../{ => app}/components/date-input.js        |   0
 .../components/date-picker-future.js          |   0
 .../{ => app}/components/date-picker-past.js  |   0
 .../{ => app}/components/date-picker.js       |   0
 .../components/date-time-input-range.js       |   0
 .../{ => app}/components/date-time-input.js   |   0
 .../components/desktop-notification-config.js |   0
 .../{ => app}/components/directory-item.js    |   0
 .../{ => app}/components/directory-toggle.js  |   0
 .../{ => app}/components/disabled-icon.js     |   0
 .../{ => app}/components/discourse-banner.js  |   0
 .../components/discourse-linked-text.js       |   0
 .../components/discourse-tag-bound.js         |   0
 .../{ => app}/components/discourse-topic.js   |   0
 .../components/discovery-categories.js        |   0
 .../components/discovery-topics-list.js       |   0
 .../components/edit-category-general.js       |   0
 .../components/edit-category-images.js        |   0
 .../components/edit-category-panel.js         |   0
 .../components/edit-category-security.js      |   0
 .../components/edit-category-settings.js      |   0
 .../{ => app}/components/edit-category-tab.js |   0
 .../components/edit-category-tags.js          |   0
 .../edit-category-topic-template.js           |   0
 .../components/edit-topic-timer-form.js       |   0
 .../{ => app}/components/emoji-picker.js      |   0
 .../{ => app}/components/emoji-uploader.js    |   0
 .../{ => app}/components/expand-post.js       |   0
 .../components/expanding-text-area.js         |   0
 .../{ => app}/components/featured-topic.js    |   0
 .../{ => app}/components/flag-action-type.js  |   0
 .../{ => app}/components/flag-selection.js    |   0
 .../{ => app}/components/flat-button.js       |   0
 .../{ => app}/components/footer-message.js    |   0
 .../{ => app}/components/footer-nav.js        |   0
 .../{ => app}/components/future-date-input.js |   0
 .../components/generated-invite-link.js       |   0
 .../{ => app}/components/global-notice.js     |   0
 .../{ => app}/components/google-search.js     |   0
 .../components/group-activity-filter.js       |   0
 .../components/group-card-contents.js         |   0
 .../components/group-flair-inputs.js          |   0
 .../components/group-index-toggle.js          |   0
 .../components/group-manage-logs-filter.js    |   0
 .../components/group-manage-logs-row.js       |   0
 .../components/group-manage-save-button.js    |   0
 .../components/group-member-dropdown.js       |   0
 .../{ => app}/components/group-member.js      |   0
 .../components/group-membership-button.js     |   0
 .../{ => app}/components/group-navigation.js  |   0
 .../{ => app}/components/group-post.js        |   0
 .../{ => app}/components/group-selector.js    |   0
 .../groups-form-interaction-fields.js         |   0
 .../groups-form-membership-fields.js          |   0
 .../components/groups-form-profile-fields.js  |   0
 .../{ => app}/components/groups-info.js       |   0
 .../{ => app}/components/header-extra-info.js |   0
 .../components/hide-modal-trigger.js          |   0
 .../{ => app}/components/highlight-search.js  |   0
 .../{ => app}/components/highlight-text.js    |   0
 .../{ => app}/components/honeypot-input.js    |   0
 .../{ => app}/components/iframed-html.js      |   0
 .../components/ignored-user-list-item.js      |   0
 .../{ => app}/components/ignored-user-list.js |   0
 .../{ => app}/components/image-uploader.js    |   0
 .../{ => app}/components/images-uploader.js   |   0
 .../{ => app}/components/input-tip.js         |   0
 .../{ => app}/components/invite-panel.js      |   0
 .../components/latest-topic-list-item.js      |   0
 .../{ => app}/components/link-to-input.js     |   0
 .../{ => app}/components/links-redirect.js    |   0
 .../{ => app}/components/load-more.js         |   0
 .../{ => app}/components/login-buttons.js     |   0
 .../{ => app}/components/login-modal.js       |   0
 .../components/login-reply-button.js          |   0
 .../components/mobile-category-topic.js       |   0
 .../{ => app}/components/mobile-nav.js        |   0
 .../{ => app}/components/modal-panel.js       |   0
 .../{ => app}/components/modal-tab.js         |   0
 .../{ => app}/components/mount-widget.js      |   0
 .../{ => app}/components/nav-item.js          |   0
 .../{ => app}/components/navigation-bar.js    |   0
 .../{ => app}/components/navigation-item.js   |   0
 .../components/notification-consent-banner.js |   0
 .../{ => app}/components/number-field.js      |   0
 .../{ => app}/components/password-field.js    |   0
 .../{ => app}/components/plugin-connector.js  |   0
 .../{ => app}/components/plugin-outlet.js     |   0
 .../{ => app}/components/popup-input-tip.js   |   0
 .../components/preference-checkbox.js         |   0
 .../components/private-message-glyph.js       |   0
 .../components/pwa-install-banner.js          |   0
 .../{ => app}/components/quote-button.js      |   0
 .../{ => app}/components/radio-button.js      |   0
 .../{ => app}/components/related-messages.js  |   0
 .../components/reviewable-bundled-action.js   |   0
 .../components/reviewable-claimed-topic.js    |   0
 .../reviewable-conversation-post.js           |   0
 .../components/reviewable-field-category.js   |   0
 .../components/reviewable-field-tags.js       |   0
 .../components/reviewable-flagged-post.js     |   0
 .../components/reviewable-histories.js        |   0
 .../{ => app}/components/reviewable-item.js   |   0
 .../components/reviewable-queued-post.js      |   0
 .../{ => app}/components/reviewable-score.js  |   0
 .../{ => app}/components/reviewable-user.js   |   0
 .../{ => app}/components/save-controls.js     |   0
 .../{ => app}/components/scroll-tracker.js    |   0
 .../components/scrolling-post-stream.js       |   0
 .../components/search-advanced-options.js     |   0
 .../{ => app}/components/search-text-field.js |   0
 .../components/second-factor-form.js          |   0
 .../components/second-factor-input.js         |   0
 .../{ => app}/components/security-key-form.js |   0
 .../{ => app}/components/share-panel.js       |   0
 .../{ => app}/components/share-popup.js       |   0
 .../{ => app}/components/share-source.js      |   0
 .../components/shared-draft-controls.js       |   0
 .../{ => app}/components/signup-cta.js        |   0
 .../{ => app}/components/site-header.js       |   0
 .../{ => app}/components/suggested-topics.js  |   0
 .../{ => app}/components/tag-drop-link.js     |   0
 .../{ => app}/components/tag-groups-form.js   |   0
 .../{ => app}/components/tag-info.js          |   0
 .../{ => app}/components/tag-list.js          |   0
 .../components/tags-admin-dropdown.js         |   0
 .../{ => app}/components/tap-tile-grid.js     |   0
 .../{ => app}/components/tap-tile.js          |   0
 .../{ => app}/components/text-field.js        |   0
 .../{ => app}/components/text-overflow.js     |   0
 .../{ => app}/components/time-input.js        |   0
 .../components/top-period-buttons.js          |   0
 .../components/topic-admin-menu-button.js     |   0
 .../{ => app}/components/topic-category.js    |   0
 .../{ => app}/components/topic-entrance.js    |   0
 .../components/topic-footer-buttons.js        |   0
 .../components/topic-join-group-notice.js     |   0
 .../{ => app}/components/topic-list-item.js   |   0
 .../{ => app}/components/topic-list.js        |   0
 .../{ => app}/components/topic-navigation.js  |   0
 .../{ => app}/components/topic-post-badges.js |   0
 .../{ => app}/components/topic-progress.js    |   0
 .../{ => app}/components/topic-status.js      |   0
 .../{ => app}/components/topic-timeline.js    |   0
 .../{ => app}/components/topic-timer-info.js  |   0
 .../{ => app}/components/topic-title.js       |   0
 .../{ => app}/components/track-selected.js    |   0
 .../{ => app}/components/user-badge.js        |   0
 .../components/user-card-contents.js          |   0
 .../{ => app}/components/user-field.js        |   0
 .../components/user-flag-percentage.js        |   0
 .../{ => app}/components/user-info.js         |   0
 .../{ => app}/components/user-link.js         |   0
 .../components/user-notifications-large.js    |   0
 .../{ => app}/components/user-selector.js     |   0
 .../{ => app}/components/user-stat.js         |   0
 .../{ => app}/components/user-stream-item.js  |   0
 .../{ => app}/components/user-stream.js       |   0
 .../user-summary-category-search.js           |   0
 .../components/user-summary-section.js        |   0
 .../components/user-summary-topic.js          |   0
 .../components/user-summary-topics-list.js    |   0
 .../{ => app}/components/user-summary-user.js |   0
 .../{ => app}/components/watch-read.js        |   0
 .../discourse/{ => app}/controllers/about.js  |   0
 .../controllers/account-created-edit-email.js |   0
 .../controllers/account-created-index.js      |   0
 .../{ => app}/controllers/activation-edit.js  |   0
 .../{ => app}/controllers/add-post-notice.js  |   0
 .../{ => app}/controllers/application.js      |   0
 .../controllers/associate-account-confirm.js  |   0
 .../{ => app}/controllers/auth-token.js       |   0
 .../{ => app}/controllers/avatar-selector.js  |   0
 .../{ => app}/controllers/badges/index.js     |   0
 .../{ => app}/controllers/badges/show.js      |   0
 .../{ => app}/controllers/basic-modal-body.js |   0
 .../{ => app}/controllers/bookmark.js         |   0
 .../controllers/bulk-notification-level.js    |   0
 .../{ => app}/controllers/change-owner.js     |   0
 .../{ => app}/controllers/change-timestamp.js |   0
 .../{ => app}/controllers/composer.js         |   0
 .../controllers/convert-to-public-topic.js    |   0
 .../{ => app}/controllers/create-account.js   |   0
 .../controllers/discovery-sortable.js         |   0
 .../{ => app}/controllers/discovery.js        |   0
 .../controllers/discovery/categories.js       |   0
 .../{ => app}/controllers/discovery/topics.js |   0
 .../{ => app}/controllers/edit-category.js    |   0
 .../{ => app}/controllers/edit-topic-timer.js |   0
 .../{ => app}/controllers/email-login.js      |   0
 .../{ => app}/controllers/exception.js        |   0
 .../controllers/explain-reviewable.js         |   0
 .../controllers/feature-topic-on-profile.js   |   0
 .../{ => app}/controllers/feature-topic.js    |   0
 .../discourse/{ => app}/controllers/flag.js   |   0
 .../{ => app}/controllers/forgot-password.js  |   0
 .../{ => app}/controllers/full-page-search.js |   0
 .../{ => app}/controllers/grant-badge.js      |   0
 .../controllers/group-activity-posts.js       |   0
 .../controllers/group-activity-topics.js      |   0
 .../{ => app}/controllers/group-activity.js   |   0
 .../controllers/group-add-members.js          |   0
 .../{ => app}/controllers/group-bulk-add.js   |   0
 .../{ => app}/controllers/group-index.js      |   0
 .../controllers/group-manage-logs.js          |   0
 .../controllers/group-manage-profile.js       |   0
 .../{ => app}/controllers/group-manage.js     |   0
 .../{ => app}/controllers/group-messages.js   |   0
 .../{ => app}/controllers/group-requests.js   |   0
 .../discourse/{ => app}/controllers/group.js  |   0
 .../{ => app}/controllers/groups-index.js     |   0
 .../{ => app}/controllers/groups-new.js       |   0
 .../{ => app}/controllers/history.js          |   0
 .../ignore-duration-with-username.js          |   0
 .../{ => app}/controllers/ignore-duration.js  |   0
 .../{ => app}/controllers/insert-hyperlink.js |   0
 .../{ => app}/controllers/invites-show.js     |   0
 .../{ => app}/controllers/jump-to-post.js     |   0
 .../controllers/keyboard-shortcuts-help.js    |   0
 .../discourse/{ => app}/controllers/login.js  |   0
 .../discourse/{ => app}/controllers/modal.js  |   0
 .../{ => app}/controllers/move-to-topic.js    |   0
 .../controllers/navigation/categories.js      |   0
 .../controllers/navigation/category.js        |   0
 .../controllers/navigation/default.js         |   0
 .../{ => app}/controllers/not-activated.js    |   0
 .../{ => app}/controllers/password-reset.js   |   0
 .../{ => app}/controllers/preferences.js      |   0
 .../controllers/preferences/account.js        |   0
 .../controllers/preferences/categories.js     |   0
 .../controllers/preferences/email.js          |   0
 .../controllers/preferences/emails.js         |   0
 .../controllers/preferences/interface.js      |   0
 .../controllers/preferences/notifications.js  |   0
 .../controllers/preferences/profile.js        |   0
 .../controllers/preferences/second-factor.js  |   0
 .../{ => app}/controllers/preferences/tags.js |   0
 .../controllers/preferences/username.js       |   0
 .../controllers/preferences/users.js          |   0
 .../{ => app}/controllers/publish-page.js     |   0
 .../{ => app}/controllers/raw-email.js        |   0
 .../{ => app}/controllers/rename-tag.js       |   0
 .../controllers/reorder-categories.js         |   0
 .../request-group-membership-form.js          |   0
 .../{ => app}/controllers/review-index.js     |   0
 .../{ => app}/controllers/review-settings.js  |   0
 .../second-factor-add-security-key.js         |   0
 .../controllers/second-factor-add-totp.js     |   0
 .../controllers/second-factor-backup-edit.js  |   0
 .../second-factor-edit-security-key.js        |   0
 .../controllers/second-factor-edit.js         |   0
 .../{ => app}/controllers/share-and-invite.js |   0
 .../discourse/{ => app}/controllers/static.js |   0
 .../{ => app}/controllers/tag-groups-edit.js  |   0
 .../{ => app}/controllers/tag-groups-new.js   |   0
 .../{ => app}/controllers/tag-groups.js       |   0
 .../{ => app}/controllers/tags-index.js       |   0
 .../{ => app}/controllers/tags-show.js        |   0
 .../controllers/topic-bulk-actions.js         |   0
 .../discourse/{ => app}/controllers/topic.js  |   0
 .../{ => app}/controllers/upload-selector.js  |   0
 .../user-activity-bookmarks-with-reminders.js |   0
 .../{ => app}/controllers/user-activity.js    |   0
 .../{ => app}/controllers/user-badges.js      |   0
 .../{ => app}/controllers/user-card.js        |   0
 .../controllers/user-invited-show.js          |   0
 .../controllers/user-notifications.js         |   0
 .../{ => app}/controllers/user-posts.js       |   0
 .../controllers/user-private-messages-tags.js |   0
 .../controllers/user-private-messages.js      |   0
 .../{ => app}/controllers/user-summary.js     |   0
 .../{ => app}/controllers/user-topics-list.js |   0
 .../discourse/{ => app}/controllers/user.js   |   0
 .../discourse/{ => app}/controllers/users.js  |   0
 .../{ => app}/helpers/application.js          |   0
 .../{ => app}/helpers/border-color.js         |   0
 .../helpers/bound-avatar-template.js          |   0
 .../{ => app}/helpers/bound-avatar.js         |   0
 .../{ => app}/helpers/bound-category-link.js  |   0
 .../discourse/{ => app}/helpers/bound-date.js |   0
 .../{ => app}/helpers/capitalize-string.js    |   0
 .../{ => app}/helpers/category-badge.js       |   0
 .../{ => app}/helpers/category-link.js        |   0
 .../{ => app}/helpers/cold-age-class.js       |   0
 .../{ => app}/helpers/custom-html.js          |   0
 .../{ => app}/helpers/dash-if-empty.js        |   0
 .../discourse/{ => app}/helpers/dasherize.js  |   0
 .../discourse/{ => app}/helpers/dir-span.js   |   0
 .../{ => app}/helpers/discourse-tag.js        |   0
 .../{ => app}/helpers/discourse-tags.js       |   0
 .../{ => app}/helpers/editable-value.js       |   0
 .../{ => app}/helpers/fa-icon-node.js         |   0
 .../discourse/{ => app}/helpers/float.js      |   0
 .../discourse/{ => app}/helpers/format-age.js |   0
 .../{ => app}/helpers/format-date.js          |   0
 .../{ => app}/helpers/format-username.js      |   0
 .../{ => app}/helpers/icon-or-image.js        |   0
 .../{ => app}/helpers/inline-date.js          |   0
 .../{ => app}/helpers/loading-spinner.js      |   0
 .../discourse/{ => app}/helpers/node.js       |   0
 .../{ => app}/helpers/period-title.js         |   0
 .../{ => app}/helpers/raw-plugin-outlet.js    |   0
 .../discourse/{ => app}/helpers/raw.js        |   0
 .../{ => app}/helpers/replace-emoji.js        |   0
 .../helpers/reviewable-history-description.js |   0
 .../{ => app}/helpers/reviewable-status.js    |   0
 .../{ => app}/helpers/route-action.js         |   0
 .../{ => app}/helpers/shorten-url.js          |   0
 .../{ => app}/helpers/theme-helpers.js        |   0
 .../{ => app}/helpers/topic-featured-link.js  |   0
 .../discourse/{ => app}/helpers/topic-link.js |   0
 .../{ => app}/helpers/topic-status-icons.js   |   0
 .../{ => app}/helpers/user-avatar.js          |   0
 .../{ => app}/helpers/user-status.js          |   0
 .../{ => app}/initializers/asset-version.js   |   0
 .../{ => app}/initializers/auth-complete.js   |   0
 .../initializers/auto-load-modules.js         |   0
 .../{ => app}/initializers/avatar-select.js   |   0
 .../{ => app}/initializers/badging.js         |   0
 .../{ => app}/initializers/banner.js          |   0
 .../initializers/click-interceptor.js         |   0
 .../{ => app}/initializers/copy-codeblocks.js |   0
 .../{ => app}/initializers/csrf-token.js      |   0
 .../{ => app}/initializers/d-popover.js       |   0
 .../{ => app}/initializers/ember-events.js    |   0
 .../{ => app}/initializers/enable-emoji.js    |   0
 .../ensure-max-image-dimensions.js            |   0
 .../{ => app}/initializers/inject-objects.js  |   0
 .../{ => app}/initializers/jquery-plugins.js  |   0
 .../initializers/keyboard-shortcuts.js        |   0
 .../initializers/live-development.js          |   0
 .../{ => app}/initializers/localization.js    |   0
 .../{ => app}/initializers/logout.js          |   0
 .../{ => app}/initializers/logs-notice.js     |   0
 .../{ => app}/initializers/message-bus.js     |   0
 .../{ => app}/initializers/mobile.js          |   0
 .../{ => app}/initializers/page-tracking.js   |   0
 .../initializers/post-decorations.js          |   0
 .../{ => app}/initializers/read-only.js       |   0
 .../register-discourse-location.js            |   0
 .../initializers/register-service-worker.js   |   0
 .../{ => app}/initializers/relative-ages.js   |   0
 .../{ => app}/initializers/sharing-sources.js |   0
 .../{ => app}/initializers/show-footer.js     |   0
 .../{ => app}/initializers/signup-cta.js      |   0
 .../strip-mobile-app-url-params.js            |   0
 .../subscribe-user-notifications.js           |   0
 .../initializers/title-notifications.js       |   0
 .../initializers/topic-footer-buttons.js      |   0
 .../{ => app}/initializers/url-redirects.js   |   0
 .../{ => app}/lib/after-transition.js         |   0
 .../discourse/{ => app}/lib/ajax-error.js     |   0
 .../discourse/{ => app}/lib/ajax.js           |   0
 .../discourse/{ => app}/lib/autocomplete.js   |   0
 .../discourse/{ => app}/lib/autosize.js       |   0
 .../discourse/{ => app}/lib/bookmark.js       |   0
 .../{ => app}/lib/cached-topic-list.js        |   0
 .../{ => app}/lib/category-hashtags.js        |   0
 .../{ => app}/lib/category-tag-search.js      |   0
 .../discourse/{ => app}/lib/clean-dom.js      |   0
 .../discourse/{ => app}/lib/click-track.js    |   0
 .../discourse/{ => app}/lib/computed.js       |   0
 .../lib/concerns/search-constants.js.erb      |   0
 .../discourse/{ => app}/lib/copy-text.js      |   0
 .../discourse/{ => app}/lib/d-popover.js      |   0
 .../discourse/{ => app}/lib/debounce.js       |   0
 .../discourse/{ => app}/lib/decimal-adjust.js |   0
 .../{ => app}/lib/desktop-notifications.js    |   0
 .../discourse/{ => app}/lib/dirty-keys.js     |   0
 .../{ => app}/lib/discourse-location.js       |   0
 .../discourse/{ => app}/lib/export-csv.js     |   0
 .../discourse/{ => app}/lib/export-result.js  |   0
 .../discourse/{ => app}/lib/eyeline.js        |   0
 .../discourse/{ => app}/lib/formatter.js      |   0
 .../discourse/{ => app}/lib/hash.js           |   0
 .../discourse/{ => app}/lib/highlight-html.js |   0
 .../{ => app}/lib/highlight-search.js         |   0
 .../{ => app}/lib/highlight-syntax.js         |   0
 .../{ => app}/lib/intercept-click.js          |   0
 .../{ => app}/lib/is-element-in-viewport.js   |   0
 .../{ => app}/lib/key-value-store.js          |   0
 .../{ => app}/lib/keyboard-shortcuts.js       |   0
 .../{ => app}/lib/lazy-load-images.js         |   0
 .../discourse/{ => app}/lib/lightbox.js       |   0
 .../{ => app}/lib/link-category-hashtags.js   |   0
 .../discourse/{ => app}/lib/link-lookup.js    |   0
 .../discourse/{ => app}/lib/link-mentions.js  |   0
 .../{ => app}/lib/link-tag-hashtag.js         |   0
 .../discourse/{ => app}/lib/load-script.js    |   0
 .../discourse/{ => app}/lib/lock-on.js        |   0
 .../discourse/{ => app}/lib/logout.js         |   0
 .../discourse/{ => app}/lib/mobile.js         |   0
 .../{ => app}/lib/notification-levels.js      |   0
 .../{ => app}/lib/offset-calculator.js        |   0
 .../{ => app}/lib/optional-service.js         |   0
 .../discourse/{ => app}/lib/page-tracker.js   |   0
 .../discourse/{ => app}/lib/page-visible.js   |   0
 .../discourse/{ => app}/lib/plugin-api.js     |   0
 .../{ => app}/lib/plugin-connectors.js        |   0
 .../{ => app}/lib/posts-with-placeholders.js  |   0
 .../{ => app}/lib/push-notifications.js       |   0
 .../{ => app}/lib/put-cursor-at-end.js        |   0
 .../discourse/{ => app}/lib/pwa-utils.js      |   0
 .../discourse/{ => app}/lib/quote-state.js    |   0
 .../discourse/{ => app}/lib/quote.js          |   0
 .../discourse/{ => app}/lib/raw-templates.js  |   0
 .../lib/register-topic-footer-button.js       |   0
 .../discourse/{ => app}/lib/render-tag.js     |   0
 .../discourse/{ => app}/lib/render-tags.js    |   0
 .../lib/render-topic-featured-link.js         |   0
 .../discourse/{ => app}/lib/reports-loader.js |   0
 .../discourse/{ => app}/lib/round.js          |   0
 .../discourse/{ => app}/lib/safari-hacks.js   |   0
 .../discourse/{ => app}/lib/screen-track.js   |   0
 .../discourse/{ => app}/lib/search.js         |   0
 .../discourse/{ => app}/lib/settings.js       |   0
 .../discourse/{ => app}/lib/sharing.js        |   0
 .../discourse/{ => app}/lib/show-modal.js     |   0
 .../{ => app}/lib/static-route-builder.js     |   0
 .../{ => app}/lib/svg-sprite-loader.js        |   0
 .../discourse/{ => app}/lib/tag-hashtags.js   |   0
 .../discourse/{ => app}/lib/text-direction.js |   0
 .../discourse/{ => app}/lib/text.js           |   0
 .../discourse/{ => app}/lib/theme-selector.js |   0
 .../discourse/{ => app}/lib/to-markdown.js    |   0
 .../discourse/{ => app}/lib/tooltip.js        |   0
 .../discourse/{ => app}/lib/transform-post.js |   0
 .../discourse/{ => app}/lib/uploads.js        |   0
 .../discourse/{ => app}/lib/url.js            |   0
 .../{ => app}/lib/user-activation.js          |   0
 .../discourse/{ => app}/lib/user-presence.js  |   0
 .../discourse/{ => app}/lib/user-search.js    |   0
 .../discourse/{ => app}/lib/utilities.js      |   0
 .../discourse/{ => app}/lib/webauthn.js       |   0
 .../discourse/{ => app}/mapping-router.js     |   0
 .../{ => app}/mixins/add-archetype-class.js   |   0
 .../{ => app}/mixins/buffered-content.js      |   0
 .../{ => app}/mixins/bulk-topic-selection.js  |   0
 .../{ => app}/mixins/can-check-emails.js      |   0
 .../{ => app}/mixins/card-contents-base.js    |   0
 .../discourse/{ => app}/mixins/cleans-up.js   |   0
 .../discourse/{ => app}/mixins/docking.js     |   0
 .../discourse/{ => app}/mixins/filter-mode.js |   0
 .../mixins/grant-badge-controller.js          |   0
 .../{ => app}/mixins/key-enter-escape.js      |   0
 .../discourse/{ => app}/mixins/load-more.js   |   0
 .../mixins/mobile-scroll-direction.js         |   0
 .../{ => app}/mixins/modal-functionality.js   |   0
 .../{ => app}/mixins/name-validation.js       |   0
 .../{ => app}/mixins/open-composer.js         |   0
 .../discourse/{ => app}/mixins/pan-events.js  |   0
 .../{ => app}/mixins/password-validation.js   |   0
 .../discourse/{ => app}/mixins/scroll-top.js  |   0
 .../discourse/{ => app}/mixins/scrolling.js   |   0
 .../discourse/{ => app}/mixins/singleton.js   |   0
 .../discourse/{ => app}/mixins/upload.js      |   0
 .../discourse/{ => app}/mixins/url-refresh.js |   0
 .../mixins/user-fields-validation.js          |   0
 .../{ => app}/mixins/username-validation.js   |   0
 .../{ => app}/mixins/viewing-action-type.js   |   0
 .../{ => app}/models/action-summary.js        |   0
 .../discourse/{ => app}/models/archetype.js   |   0
 .../{ => app}/models/badge-grouping.js        |   0
 .../discourse/{ => app}/models/badge.js       |   0
 .../discourse/{ => app}/models/bookmark.js    |   0
 .../{ => app}/models/category-list.js         |   0
 .../discourse/{ => app}/models/category.js    |   0
 .../discourse/{ => app}/models/composer.js    |   0
 .../discourse/{ => app}/models/draft.js       |   0
 .../{ => app}/models/group-history.js         |   0
 .../discourse/{ => app}/models/group.js       |   0
 .../discourse/{ => app}/models/invite.js      |   0
 .../{ => app}/models/live-post-counts.js      |   0
 .../{ => app}/models/login-method.js          |   0
 .../discourse/{ => app}/models/nav-item.js    |   0
 .../{ => app}/models/permission-type.js       |   0
 .../{ => app}/models/post-action-type.js      |   0
 .../discourse/{ => app}/models/post-stream.js |   0
 .../discourse/{ => app}/models/post.js        |   0
 .../{ => app}/models/published-page.js        |   0
 .../discourse/{ => app}/models/rest.js        |   0
 .../discourse/{ => app}/models/result-set.js  |   0
 .../{ => app}/models/reviewable-history.js    |   0
 .../discourse/{ => app}/models/reviewable.js  |   0
 .../discourse/{ => app}/models/session.js     |   0
 .../discourse/{ => app}/models/site.js        |   0
 .../discourse/{ => app}/models/static-page.js |   0
 .../discourse/{ => app}/models/store.js       |   0
 .../discourse/{ => app}/models/tag-group.js   |   0
 .../discourse/{ => app}/models/tag.js         |   0
 .../{ => app}/models/topic-details.js         |   0
 .../discourse/{ => app}/models/topic-list.js  |   0
 .../discourse/{ => app}/models/topic-timer.js |   0
 .../{ => app}/models/topic-tracking-state.js  |   0
 .../discourse/{ => app}/models/topic.js       |   0
 .../discourse/{ => app}/models/trust-level.js |   0
 .../{ => app}/models/user-action-group.js     |   0
 .../{ => app}/models/user-action-stat.js      |   0
 .../discourse/{ => app}/models/user-action.js |   0
 .../discourse/{ => app}/models/user-badge.js  |   0
 .../discourse/{ => app}/models/user-draft.js  |   0
 .../{ => app}/models/user-drafts-stream.js    |   0
 .../{ => app}/models/user-posts-stream.js     |   0
 .../discourse/{ => app}/models/user-stream.js |   0
 .../discourse/{ => app}/models/user.js        |   0
 .../dynamic-route-builders.js                 |   0
 .../inject-discourse-objects.js               |   0
 .../{ => app}/pre-initializers/map-routes.js  |   0
 .../register-dom-templates.js                 |   0
 .../pre-initializers/sniff-capabilities.js    |   0
 .../svg-sprite-fontawesome.js                 |   0
 .../raw-views/list/post-count-or-badges.js    |   0
 .../raw-views/list/posts-count-column.js      |   0
 .../{ => app}/raw-views/list/visited-line.js  |   0
 .../raw-views/topic-list-header-column.js     |   0
 .../{ => app}/raw-views/topic-status.js       |   0
 .../discourse/{ => app}/routes/about.js       |   0
 .../routes/account-created-edit-email.js      |   0
 .../{ => app}/routes/account-created-index.js |   0
 .../routes/account-created-resent.js          |   0
 .../{ => app}/routes/account-created.js       |   0
 .../{ => app}/routes/app-route-map.js         |   0
 .../discourse/{ => app}/routes/application.js |   0
 .../{ => app}/routes/associate-account.js     |   0
 .../{ => app}/routes/badges-index.js          |   0
 .../discourse/{ => app}/routes/badges-show.js |   0
 .../routes/build-admin-user-posts-route.js    |   0
 .../{ => app}/routes/build-category-route.js  |   0
 .../routes/build-group-messages-route.js      |   0
 .../routes/build-private-messages-route.js    |   0
 .../{ => app}/routes/build-static-route.js    |   0
 .../{ => app}/routes/build-topic-route.js     |   0
 .../discourse/{ => app}/routes/conduct.js     |   0
 .../discourse/{ => app}/routes/discourse.js   |   0
 .../{ => app}/routes/discovery-categories.js  |   0
 .../discourse/{ => app}/routes/discovery.js   |   0
 .../discourse/{ => app}/routes/email-login.js |   0
 .../{ => app}/routes/exception-unknown.js     |   0
 .../discourse/{ => app}/routes/exception.js   |   0
 .../discourse/{ => app}/routes/faq.js         |   0
 .../{ => app}/routes/forgot-password.js       |   0
 .../{ => app}/routes/full-page-search.js      |   0
 .../{ => app}/routes/group-activity-index.js  |   0
 .../routes/group-activity-mentions.js         |   0
 .../{ => app}/routes/group-activity-posts.js  |   0
 .../{ => app}/routes/group-activity-topics.js |   0
 .../discourse/{ => app}/routes/group-index.js |   0
 .../{ => app}/routes/group-manage-index.js    |   0
 .../routes/group-manage-interaction.js        |   0
 .../{ => app}/routes/group-manage-logs.js     |   0
 .../routes/group-manage-membership.js         |   0
 .../{ => app}/routes/group-manage-profile.js  |   0
 .../{ => app}/routes/group-manage.js          |   0
 .../{ => app}/routes/group-members.js         |   0
 .../routes/group-messages-archive.js          |   0
 .../{ => app}/routes/group-messages-inbox.js  |   0
 .../{ => app}/routes/group-messages-index.js  |   0
 .../{ => app}/routes/group-messages.js        |   0
 .../{ => app}/routes/group-requests.js        |   0
 .../discourse/{ => app}/routes/group.js       |   0
 .../{ => app}/routes/groups-index.js          |   0
 .../discourse/{ => app}/routes/groups-new.js  |   0
 .../discourse/{ => app}/routes/guidelines.js  |   0
 .../{ => app}/routes/invites-show.js          |   0
 .../discourse/{ => app}/routes/login.js       |   0
 .../discourse/{ => app}/routes/new-message.js |   0
 .../discourse/{ => app}/routes/new-topic.js   |   0
 .../{ => app}/routes/password-reset.js        |   0
 .../discourse/{ => app}/routes/post.js        |   0
 .../{ => app}/routes/preferences-account.js   |   0
 .../{ => app}/routes/preferences-apps.js      |   0
 .../routes/preferences-categories.js          |   0
 .../{ => app}/routes/preferences-email.js     |   0
 .../{ => app}/routes/preferences-emails.js    |   0
 .../{ => app}/routes/preferences-index.js     |   0
 .../{ => app}/routes/preferences-interface.js |   0
 .../routes/preferences-notifications.js       |   0
 .../{ => app}/routes/preferences-profile.js   |   0
 .../routes/preferences-second-factor.js       |   0
 .../{ => app}/routes/preferences-tags.js      |   0
 .../{ => app}/routes/preferences-username.js  |   0
 .../{ => app}/routes/preferences-users.js     |   0
 .../discourse/{ => app}/routes/preferences.js |   0
 .../discourse/{ => app}/routes/privacy.js     |   0
 .../{ => app}/routes/restricted-user.js       |   0
 .../{ => app}/routes/review-index.js          |   0
 .../{ => app}/routes/review-settings.js       |   0
 .../discourse/{ => app}/routes/review-show.js |   0
 .../{ => app}/routes/review-topics.js         |   0
 .../discourse/{ => app}/routes/review.js      |   0
 .../discourse/{ => app}/routes/rules.js       |   0
 .../discourse/{ => app}/routes/signup.js      |   0
 .../{ => app}/routes/tag-groups-edit.js       |   0
 .../{ => app}/routes/tag-groups-new.js        |   0
 .../discourse/{ => app}/routes/tag-groups.js  |   0
 .../discourse/{ => app}/routes/tags-index.js  |   0
 .../{ => app}/routes/tags-intersection.js     |   0
 .../discourse/{ => app}/routes/tags-show.js   |   0
 .../{ => app}/routes/topic-by-slug-or-id.js   |   0
 .../routes/topic-from-params-near.js          |   0
 .../{ => app}/routes/topic-from-params.js     |   0
 .../discourse/{ => app}/routes/topic.js       |   0
 .../discourse/{ => app}/routes/tos.js         |   0
 .../discourse/{ => app}/routes/unknown.js     |   0
 .../user-activity-bookmarks-with-reminders.js |   0
 .../routes/user-activity-bookmarks.js         |   0
 .../{ => app}/routes/user-activity-drafts.js  |   0
 .../{ => app}/routes/user-activity-index.js   |   0
 .../routes/user-activity-likes-given.js       |   0
 .../{ => app}/routes/user-activity-pending.js |   0
 .../{ => app}/routes/user-activity-replies.js |   0
 .../{ => app}/routes/user-activity-stream.js  |   0
 .../{ => app}/routes/user-activity-topics.js  |   0
 .../{ => app}/routes/user-activity.js         |   0
 .../discourse/{ => app}/routes/user-badges.js |   0
 .../{ => app}/routes/user-deleted-posts.js    |   0
 .../discourse/{ => app}/routes/user-index.js  |   0
 .../{ => app}/routes/user-invited-index.js    |   0
 .../{ => app}/routes/user-invited-show.js     |   0
 .../routes/user-notifications-edits.js        |   0
 .../routes/user-notifications-index.js        |   0
 .../user-notifications-likes-received.js      |   0
 .../routes/user-notifications-mentions.js     |   0
 .../routes/user-notifications-responses.js    |   0
 .../{ => app}/routes/user-notifications.js    |   0
 .../routes/user-private-messages-archive.js   |   0
 .../user-private-messages-group-archive.js    |   0
 .../routes/user-private-messages-group.js     |   0
 .../routes/user-private-messages-index.js     |   0
 .../routes/user-private-messages-sent.js      |   0
 .../routes/user-private-messages-tags-show.js |   0
 .../routes/user-private-messages-tags.js      |   0
 .../{ => app}/routes/user-private-messages.js |   0
 .../{ => app}/routes/user-summary.js          |   0
 .../{ => app}/routes/user-topic-list.js       |   0
 .../discourse/{ => app}/routes/user.js        |   0
 .../discourse/{ => app}/routes/users.js       |   0
 .../{ => app}/services/app-events.js          |   0
 .../{ => app}/services/emoji-store.js         |   0
 .../{ => app}/services/logs-notice.js         |   0
 .../discourse/{ => app}/services/search.js    |   0
 .../{ => app}/services/theme-settings.js      |   0
 .../discourse/{ => app}/templates/about.hbs   |   0
 .../{ => app}/templates/account-created.hbs   |   0
 .../templates/account-created/edit-email.hbs  |   0
 .../templates/account-created/index.hbs       |   0
 .../templates/account-created/resent.hbs      |   0
 .../{ => app}/templates/application.hbs       |   0
 .../templates/badge-selector-autocomplete.hbr |   0
 .../{ => app}/templates/badges/index.hbs      |   0
 .../{ => app}/templates/badges/show.hbs       |   0
 .../{ => app}/templates/bulk-tag.hbs          |   0
 .../category-selector-autocomplete.hbr        |   0
 .../templates/category-tag-autocomplete.hbr   |   0
 .../templates/components/about-page-users.hbs |   0
 .../components/activation-controls.hbs        |   0
 .../components/activation-email-form.hbs      |   0
 .../templates/components/avatar-uploader.hbs  |   0
 .../templates/components/backup-codes.hbs     |   0
 .../templates/components/backup-uploader.hbs  |   0
 .../templates/components/badge-button.hbs     |   0
 .../templates/components/badge-card.hbs       |   0
 .../templates/components/badge-selector.hbs   |   0
 .../templates/components/badge-title.hbs      |   0
 .../templates/components/basic-topic-list.hbs |   0
 .../templates/components/bread-crumbs.hbs     |   0
 .../components/bulk-select-button.hbs         |   0
 .../templates/components/cancel-link.hbs      |   0
 .../categories-and-latest-topics.hbs          |   0
 .../components/categories-and-top-topics.hbs  |   0
 .../components/categories-boxes-topic.hbs     |   0
 .../categories-boxes-with-topics.hbs          |   0
 .../templates/components/categories-boxes.hbs |   0
 .../templates/components/categories-only.hbs  |   0
 .../components/categories-topic-list.hbs      |   0
 .../categories-with-featured-topics.hbs       |   0
 .../components/category-name-fields.hbs       |   0
 .../components/category-title-before.hbs      |   0
 .../components/category-title-link.hbs        |   0
 .../templates/components/category-unread.hbs  |   0
 .../templates/components/cdn-img.hbs          |   0
 .../templates/components/choose-message.hbs   |   0
 .../templates/components/choose-topic.hbs     |   0
 .../templates/components/color-input.hbs      |   0
 .../templates/components/color-picker.hbs     |   0
 .../components/composer-action-title.hbs      |   0
 .../templates/components/composer-editor.hbs  |   0
 .../components/composer-messages.hbs          |   0
 .../templates/components/composer-title.hbs   |   0
 .../templates/components/composer-toggles.hbs |   0
 .../components/composer-user-selector.hbs     |   0
 .../conditional-loading-section.hbs           |   0
 .../conditional-loading-spinner.hbs           |   0
 .../templates/components/cook-text.hbs        |   0
 .../templates/components/count-i18n.hbs       |   0
 .../components/create-topic-button.hbs        |   0
 .../components/create-topics-notice.hbs       |   0
 .../templates/components/csv-uploader.hbs     |   0
 .../components/custom-html-container.hbs      |   0
 .../templates/components/d-button.hbs         |   0
 .../templates/components/d-editor.hbs         |   0
 .../templates/components/d-modal-cancel.hbs   |   0
 .../templates/components/d-modal.hbs          |   0
 .../templates/components/d-navigation.hbs     |   0
 .../templates/components/date-input.hbs       |   0
 .../templates/components/date-picker.hbs      |   0
 .../components/date-time-input-range.hbs      |   0
 .../templates/components/date-time-input.hbs  |   0
 .../desktop-notification-config.hbs           |   0
 .../templates/components/directory-item.hbs   |   0
 .../templates/components/directory-toggle.hbs |   0
 .../templates/components/disabled-icon.hbs    |   0
 .../templates/components/discourse-banner.hbs |   0
 .../components/discourse-linked-text.hbs      |   0
 .../components/discourse-tag-bound.hbs        |   0
 .../components/discovery-topics-list.hbs      |   0
 .../components/edit-category-general.hbs      |   0
 .../components/edit-category-images.hbs       |   0
 .../components/edit-category-panel.hbs        |   0
 .../components/edit-category-security.hbs     |   0
 .../components/edit-category-settings.hbs     |   0
 .../components/edit-category-tab.hbs          |   0
 .../components/edit-category-tags.hbs         |   0
 .../edit-category-topic-template.hbs          |   0
 .../components/edit-topic-timer-form.hbs      |   0
 .../templates/components/emoji-picker.hbs.erb |   0
 .../templates/components/emoji-uploader.hbs   |   0
 .../templates/components/expand-post.hbs      |   0
 .../templates/components/featured-topic.hbs   |   0
 .../templates/components/flag-action-type.hbs |   0
 .../templates/components/flag-selection.hbs   |   0
 .../templates/components/flat-button.hbs      |   0
 .../templates/components/footer-message.hbs   |   0
 .../components/future-date-input.hbs          |   0
 .../components/generated-invite-link.hbs      |   0
 .../templates/components/global-notice.hbs    |   0
 .../templates/components/google-search.hbs    |   0
 .../components/group-activity-filter.hbs      |   0
 .../components/group-card-contents.hbs        |   0
 .../components/group-flair-inputs.hbs         |   0
 .../components/group-index-toggle.hbs         |   0
 .../components/group-manage-logs-filter.hbs   |   0
 .../components/group-manage-logs-row.hbs      |   0
 .../components/group-manage-save-button.hbs   |   0
 .../templates/components/group-member.hbs     |   0
 .../components/group-membership-button.hbs    |   0
 .../templates/components/group-navigation.hbs |   0
 .../templates/components/group-post.hbs       |   0
 .../templates/components/group-selector.hbs   |   0
 .../groups-form-interaction-fields.hbs        |   0
 .../groups-form-membership-fields.hbs         |   0
 .../components/groups-form-profile-fields.hbs |   0
 .../templates/components/groups-info.hbs      |   0
 .../components/ignored-user-list-item.hbs     |   0
 .../components/ignored-user-list.hbs          |   0
 .../templates/components/image-uploader.hbs   |   0
 .../templates/components/images-uploader.hbs  |   0
 .../templates/components/input-tip.hbs        |   0
 .../templates/components/invite-panel.hbs     |   0
 .../templates/components/ip-lookup.hbs        |   0
 .../components/latest-topic-list-item.hbs     |   0
 .../templates/components/link-to-input.hbs    |   0
 .../templates/components/login-buttons.hbs    |   0
 .../components/mobile-category-topic.hbs      |   0
 .../templates/components/mobile-nav.hbs       |   0
 .../components/modal-footer-close.hbs         |   0
 .../templates/components/modal-panel.hbs      |   0
 .../templates/components/modal-tab.hbs        |   0
 .../templates/components/nav-item.hbs         |   0
 .../templates/components/navigation-bar.hbs   |   0
 .../templates/components/navigation-item.hbs  |   0
 .../notification-consent-banner.hbs           |   0
 .../templates/components/plugin-outlet.hbs    |   0
 .../templates/components/popup-input-tip.hbs  |   0
 .../templates/components/popup-menu.hbs       |   0
 .../components/preference-checkbox.hbs        |   0
 .../components/private-message-glyph.hbs      |   0
 .../components/pwa-install-banner.hbs         |   0
 .../templates/components/quote-button.hbs     |   0
 .../templates/components/related-messages.hbs |   0
 .../components/reviewable-bundled-action.hbs  |   0
 .../components/reviewable-claimed-topic.hbs   |   0
 .../reviewable-conversation-post.hbs          |   0
 .../components/reviewable-created-by-name.hbs |   0
 .../components/reviewable-created-by.hbs      |   0
 .../components/reviewable-field-category.hbs  |   0
 .../components/reviewable-field-editor.hbs    |   0
 .../components/reviewable-field-tags.hbs      |   0
 .../components/reviewable-field-text.hbs      |   0
 .../components/reviewable-field-textarea.hbs  |   0
 .../templates/components/reviewable-field.hbs |   0
 .../components/reviewable-flagged-post.hbs    |   0
 .../components/reviewable-histories.hbs       |   0
 .../templates/components/reviewable-item.hbs  |   0
 .../components/reviewable-post-header.hbs     |   0
 .../components/reviewable-queued-post.hbs     |   0
 .../templates/components/reviewable-score.hbs |   0
 .../components/reviewable-scores.hbs          |   0
 .../templates/components/reviewable-tags.hbs  |   0
 .../components/reviewable-topic-link.hbs      |   0
 .../templates/components/reviewable-user.hbs  |   0
 .../templates/components/save-controls.hbs    |   0
 .../templates/components/score-value.hbs      |   0
 .../components/search-advanced-options.hbs    |   0
 .../components/second-factor-form.hbs         |   0
 .../components/second-factor-input.hbs        |   0
 .../components/security-key-form.hbs          |   0
 .../templates/components/selected-posts.hbs   |   0
 .../templates/components/share-panel.hbs      |   0
 .../templates/components/share-popup.hbs      |   0
 .../templates/components/share-source.hbs     |   0
 .../components/shared-draft-controls.hbs      |   0
 .../templates/components/signup-cta.hbs       |   0
 .../templates/components/suggested-topics.hbs |   0
 .../templates/components/tag-drop-link.hbs    |   0
 .../templates/components/tag-groups-form.hbs  |   0
 .../templates/components/tag-info.hbs         |   0
 .../templates/components/tag-list.hbs         |   0
 .../templates/components/tap-tile-grid.hbs    |   0
 .../templates/components/tap-tile.hbs         |   0
 .../templates/components/text-overflow.hbs    |   0
 .../templates/components/time-input.hbs       |   0
 .../components/top-period-buttons.hbs         |   0
 .../templates/components/topic-category.hbs   |   0
 .../templates/components/topic-entrance.hbs   |   0
 .../components/topic-footer-buttons.hbs       |   0
 .../components/topic-join-group-notice.hbs    |   0
 .../templates/components/topic-list-item.hbs  |   0
 .../templates/components/topic-list.hbs       |   0
 .../templates/components/topic-navigation.hbs |   0
 .../components/topic-post-badges.hbs          |   0
 .../templates/components/topic-progress.hbs   |   0
 .../templates/components/topic-status.hbs     |   0
 .../templates/components/topic-timer-info.hbs |   0
 .../templates/components/topic-title.hbs      |   0
 .../templates/components/track-selected.hbs   |   0
 .../templates/components/user-badge.hbs       |   0
 .../components/user-card-contents.hbs         |   0
 .../components/user-fields/confirm.hbs        |   0
 .../components/user-fields/dropdown.hbs       |   0
 .../templates/components/user-fields/text.hbs |   0
 .../components/user-flag-percentage.hbs       |   0
 .../templates/components/user-info.hbs        |   0
 .../components/user-profile-avatar.hbs        |   0
 .../templates/components/user-stat.hbs        |   0
 .../templates/components/user-stream-item.hbs |   0
 .../templates/components/user-stream.hbs      |   0
 .../user-summary-category-search.hbs          |   0
 .../components/user-summary-section.hbs       |   0
 .../components/user-summary-topic.hbs         |   0
 .../components/user-summary-topics-list.hbs   |   0
 .../components/user-summary-user.hbs          |   0
 .../components/user-summary-users-list.hbs    |   0
 .../{ => app}/templates/composer.hbs          |   0
 .../templates/composer/custom-body.hbs        |   0
 .../templates/composer/education.hbs          |   0
 .../templates/composer/group-mentioned.hbs    |   0
 .../templates/composer/similar-topics.hbs     |   0
 .../{ => app}/templates/discovery.hbs         |   0
 .../templates/discovery/categories.hbs        |   0
 .../{ => app}/templates/discovery/topics.hbs  |   0
 .../{ => app}/templates/email-login.hbs       |   0
 .../templates/emoji-picker-recent.hbr         |   0
 .../templates/emoji-selector-autocomplete.hbr |   0
 .../{ => app}/templates/exception.hbs         |   0
 .../{ => app}/templates/flat-button.hbr       |   0
 .../{ => app}/templates/full-page-search.hbs  |   0
 .../templates/group-activity-posts.hbs        |   0
 .../templates/group-activity-topics.hbs       |   0
 .../{ => app}/templates/group-index.hbs       |   0
 .../{ => app}/templates/group-requests.hbs    |   0
 .../templates/group-selector-autocomplete.hbr |   0
 .../discourse/{ => app}/templates/group.hbs   |   0
 .../{ => app}/templates/group/activity.hbs    |   0
 .../{ => app}/templates/group/manage.hbs      |   0
 .../templates/group/manage/interaction.hbs    |   0
 .../{ => app}/templates/group/manage/logs.hbs |   0
 .../templates/group/manage/membership.hbs     |   0
 .../templates/group/manage/profile.hbs        |   0
 .../{ => app}/templates/group/messages.hbs    |   0
 .../{ => app}/templates/groups/index.hbs      |   0
 .../{ => app}/templates/groups/new.hbs        |   0
 .../{ => app}/templates/hide-modal.hbs        |   0
 .../discourse/{ => app}/templates/invites.hbs |   0
 .../{ => app}/templates/invites/show.hbs      |   0
 .../{ => app}/templates/list/action-list.hbr  |   0
 .../templates/list/activity-column.hbr        |   0
 .../templates/list/category-column.hbr        |   0
 .../templates/list/post-count-or-badges.hbr   |   0
 .../templates/list/posters-column.hbr         |   0
 .../templates/list/posts-count-column.hbr     |   0
 .../templates/list/topic-excerpt.hbr          |   0
 .../templates/list/topic-list-item.hbr        |   0
 .../templates/list/unread-indicator.hbr       |   0
 .../{ => app}/templates/list/visited-line.hbr |   0
 .../discourse/{ => app}/templates/loading.hbs |   0
 .../{ => app}/templates/login-preferences.hbs |   0
 .../mobile/components/basic-topic-list.hbs    |   0
 .../mobile/components/categories-only.hbs     |   0
 .../categories-with-featured-topics.hbs       |   0
 .../mobile/components/directory-item.hbs      |   0
 .../mobile/components/mobile-nav.hbs          |   0
 .../mobile/components/navigation-bar.hbs      |   0
 .../templates/mobile/discovery/categories.hbs |   0
 .../templates/mobile/discovery/topics.hbs     |   0
 .../templates/mobile/group-index.hbs          |   0
 .../templates/mobile/list/topic-list-item.hbr |   0
 .../templates/mobile/modal/login.hbs          |   0
 .../{ => app}/templates/mobile/users.hbs      |   0
 .../discourse/{ => app}/templates/modal.hbs   |   0
 .../templates/modal/activation-edit.hbs       |   0
 .../templates/modal/activation-resent.hbs     |   0
 .../templates/modal/add-post-notice.hbs       |   0
 .../modal/associate-account-confirm.hbs       |   0
 .../{ => app}/templates/modal/auth-token.hbs  |   0
 .../templates/modal/avatar-selector.hbs       |   0
 .../{ => app}/templates/modal/bookmark.hbs    |   0
 .../templates/modal/bulk-actions-buttons.hbs  |   0
 .../templates/modal/bulk-change-category.hbs  |   0
 .../modal/bulk-notification-level.hbs         |   0
 .../templates/modal/change-owner.hbs          |   0
 .../templates/modal/change-timestamp.hbs      |   0
 .../modal/convert-to-public-topic.hbs         |   0
 .../templates/modal/create-account.hbs        |   0
 .../modal/delete-topic-disallowed.hbs         |   0
 .../templates/modal/dismiss-read.hbs          |   0
 .../templates/modal/edit-category.hbs         |   0
 .../templates/modal/edit-topic-timer.hbs      |   0
 .../templates/modal/explain-reviewable.hbs    |   0
 .../modal/feature-topic-on-profile.hbs        |   0
 .../templates/modal/feature-topic.hbs         |   0
 .../{ => app}/templates/modal/flag.hbs        |   0
 .../templates/modal/forgot-password.hbs       |   0
 .../{ => app}/templates/modal/grant-badge.hbs |   0
 .../templates/modal/group-add-members.hbs     |   0
 .../templates/modal/group-bulk-add.hbs        |   0
 .../{ => app}/templates/modal/history.hbs     |   0
 .../modal/ignore-duration-with-username.hbs   |   0
 .../templates/modal/ignore-duration.hbs       |   0
 .../templates/modal/insert-hyperlink.hbs      |   0
 .../templates/modal/jump-to-post.hbs          |   0
 .../modal/keyboard-shortcuts-help.hbs         |   0
 .../{ => app}/templates/modal/login.hbs       |   0
 .../templates/modal/move-to-topic.hbs         |   0
 .../templates/modal/not-activated.hbs         |   0
 .../templates/modal/post-enqueued.hbs         |   0
 .../templates/modal/publish-page.hbs          |   0
 .../{ => app}/templates/modal/raw-email.hbs   |   0
 .../{ => app}/templates/modal/rename-tag.hbs  |   0
 .../templates/modal/reorder-categories.hbs    |   0
 .../modal/request-group-membership-form.hbs   |   0
 .../modal/second-factor-add-security-key.hbs  |   0
 .../modal/second-factor-add-totp.hbs          |   0
 .../modal/second-factor-backup-edit.hbs       |   0
 .../modal/second-factor-edit-security-key.hbs |   0
 .../templates/modal/second-factor-edit.hbs    |   0
 .../templates/modal/share-and-invite.hbs      |   0
 .../{ => app}/templates/modal/tag-upload.hbs  |   0
 .../templates/modal/topic-bulk-actions.hbs    |   0
 .../templates/modal/upload-selector.hbs       |   0
 .../templates/navigation/categories.hbs       |   0
 .../templates/navigation/category.hbs         |   0
 .../templates/navigation/default.hbs          |   0
 .../{ => app}/templates/outlet-list.hbs       |   0
 .../{ => app}/templates/password-reset.hbs    |   0
 .../templates/post/poster-avatar.hbr          |   0
 .../{ => app}/templates/preferences-email.hbs |   0
 .../templates/preferences-second-factor.hbs   |   0
 .../templates/preferences-username.hbs        |   0
 .../{ => app}/templates/preferences.hbs       |   0
 .../templates/preferences/account.hbs         |   0
 .../{ => app}/templates/preferences/apps.hbs  |   0
 .../templates/preferences/categories.hbs      |   0
 .../templates/preferences/emails.hbs          |   0
 .../templates/preferences/interface.hbs       |   0
 .../templates/preferences/notifications.hbs   |   0
 .../templates/preferences/profile.hbs         |   0
 .../{ => app}/templates/preferences/tags.hbs  |   0
 .../{ => app}/templates/preferences/users.hbs |   0
 .../{ => app}/templates/review-index.hbs      |   0
 .../{ => app}/templates/review-settings.hbs   |   0
 .../{ => app}/templates/review-show.hbs       |   0
 .../{ => app}/templates/review-topics.hbs     |   0
 .../discourse/{ => app}/templates/review.hbs  |   0
 .../{ => app}/templates/selected-posts.hbs    |   0
 .../discourse/{ => app}/templates/static.hbs  |   0
 .../{ => app}/templates/tag-groups-edit.hbs   |   0
 .../{ => app}/templates/tag-groups-index.hbs  |   0
 .../{ => app}/templates/tag-groups-new.hbs    |   0
 .../{ => app}/templates/tag-groups.hbs        |   0
 .../discourse/{ => app}/templates/tags.hbs    |   0
 .../{ => app}/templates/tags/index.hbs        |   0
 .../{ => app}/templates/tags/show.hbs         |   0
 .../templates/topic-list-header-column.hbr    |   0
 .../{ => app}/templates/topic-list-header.hbr |   0
 .../{ => app}/templates/topic-post-badges.hbr |   0
 .../{ => app}/templates/topic-status.hbr      |   0
 .../discourse/{ => app}/templates/topic.hbs   |   0
 .../discourse/{ => app}/templates/unknown.hbs |   0
 .../{ => app}/templates/user-card.hbs         |   0
 .../{ => app}/templates/user-invited-show.hbs |   0
 .../templates/user-private-messages-tags.hbs  |   0
 .../templates/user-selector-autocomplete.hbr  |   0
 .../{ => app}/templates/user-topics-list.hbs  |   0
 .../discourse/{ => app}/templates/user.hbs    |   0
 .../{ => app}/templates/user/activity.hbs     |   0
 .../{ => app}/templates/user/badges.hbs       |   0
 .../{ => app}/templates/user/bookmarks.hbs    |   0
 .../{ => app}/templates/user/messages.hbs     |   0
 .../templates/user/notifications-index.hbs    |   0
 .../templates/user/notifications.hbs          |   0
 .../{ => app}/templates/user/posts.hbs        |   0
 .../templates/user/profile-hidden.hbs         |   0
 .../{ => app}/templates/user/stream.hbs       |   0
 .../{ => app}/templates/user/summary.hbs      |   0
 .../discourse/{ => app}/templates/users.hbs   |   0
 .../{ => app}/widgets/actions-summary.js      |   0
 .../{ => app}/widgets/avatar-flair.js         |   0
 .../bookmark-reminder-notification-item.js    |   0
 .../discourse/{ => app}/widgets/button.js     |   0
 .../{ => app}/widgets/category-link.js        |   0
 .../{ => app}/widgets/component-connector.js  |   0
 .../discourse/{ => app}/widgets/connector.js  |   0
 .../widgets/custom-notification-item.js       |   0
 .../{ => app}/widgets/decorator-helper.js     |   0
 .../widgets/default-notification-item.js      |   0
 .../{ => app}/widgets/discourse-tags.js       |   0
 .../{ => app}/widgets/embedded-post.js        |   0
 .../discourse/{ => app}/widgets/emoji.js      |   0
 .../discourse/{ => app}/widgets/footer-nav.js |   0
 .../discourse/{ => app}/widgets/glue.js       |   0
 ...group-message-summary-notification-item.js |   0
 .../{ => app}/widgets/hamburger-categories.js |   0
 .../{ => app}/widgets/hamburger-menu.js       |   0
 .../{ => app}/widgets/hbs-compiler.js         |   0
 .../{ => app}/widgets/header-contents.js      |   0
 .../{ => app}/widgets/header-topic-info.js    |   0
 .../discourse/{ => app}/widgets/header.js     |   0
 .../discourse/{ => app}/widgets/home-logo.js  |   0
 .../discourse/{ => app}/widgets/hooks.js      |   0
 .../invitee-accepted-notification-item.js     |   0
 .../liked-consolidated-notification-item.js   |   0
 .../widgets/liked-notification-item.js        |   0
 .../discourse/{ => app}/widgets/link.js       |   0
 ...ship-request-accepted-notification-item.js |   0
 ...-request-consolidated-notification-item.js |   0
 .../discourse/{ => app}/widgets/menu-panel.js |   0
 .../{ => app}/widgets/post-admin-menu.js      |   0
 .../{ => app}/widgets/post-cooked.js          |   0
 .../{ => app}/widgets/post-edits-indicator.js |   0
 .../discourse/{ => app}/widgets/post-gap.js   |   0
 .../discourse/{ => app}/widgets/post-links.js |   0
 .../discourse/{ => app}/widgets/post-menu.js  |   0
 .../{ => app}/widgets/post-placeholder.js     |   0
 .../{ => app}/widgets/post-small-action.js    |   0
 .../{ => app}/widgets/post-stream.js          |   0
 .../discourse/{ => app}/widgets/post.js       |   0
 .../{ => app}/widgets/poster-name.js          |   0
 .../{ => app}/widgets/private-message-map.js  |   0
 .../widgets/quick-access-bookmarks.js         |   0
 .../{ => app}/widgets/quick-access-item.js    |   0
 .../widgets/quick-access-messages.js          |   0
 .../widgets/quick-access-notifications.js     |   0
 .../{ => app}/widgets/quick-access-panel.js   |   0
 .../{ => app}/widgets/quick-access-profile.js |   0
 .../discourse/{ => app}/widgets/raw-html.js   |   0
 .../{ => app}/widgets/search-menu-controls.js |   0
 .../{ => app}/widgets/search-menu-results.js  |   0
 .../{ => app}/widgets/search-menu.js          |   0
 .../discourse/{ => app}/widgets/time-gap.js   |   0
 .../{ => app}/widgets/toggle-topic-summary.js |   0
 .../{ => app}/widgets/topic-admin-menu.js     |   0
 .../discourse/{ => app}/widgets/topic-map.js  |   0
 .../{ => app}/widgets/topic-status.js         |   0
 .../{ => app}/widgets/topic-timeline.js       |   0
 .../discourse/{ => app}/widgets/user-menu.js  |   0
 .../widgets/user-notifications-large.js       |   0
 .../{ => app}/widgets/widget-dropdown.js      |   0
 .../discourse/{ => app}/widgets/widget.js     |   0
 app/assets/javascripts/main_include_admin.js  |   2 +-
 .../show_confirm_new_email.html.erb           |   2 +-
 config/application.rb                         |   6 +-
 lib/discourse_js_processor.rb                 |   3 +-
 lib/freedom_patches/raw_handlebars.rb         |   6 +-
 lib/pretty_text.rb                            |   4 +-
 1160 files changed, 106 insertions(+), 101 deletions(-)
 rename app/assets/javascripts/discourse/{ => app}/adapters/email-template.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/adapters/group.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/adapters/notification.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/adapters/post-reply-history.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/adapters/post-reply.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/adapters/post.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/adapters/published-page.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/adapters/rest.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/adapters/reviewable-explanation.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/adapters/reviewable-settings.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/adapters/reviewable-topic.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/adapters/reviewable.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/adapters/tag-info.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/adapters/tag-notification.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/adapters/topic-list.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/adapters/topic.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/about-page-users.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/activation-controls.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/add-category-tag-classes.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/auth-token-dropdown.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/avatar-flair.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/avatar-uploader.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/backup-codes.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/backup-uploader.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/badge-button.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/badge-card.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/badge-selector.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/badge-title.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/basic-topic-list.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/bookmark-actions-dropdown.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/bread-crumbs.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/bulk-select-button.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/categories-and-latest-topics.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/categories-and-top-topics.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/categories-boxes-topic.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/categories-boxes-with-topics.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/categories-boxes.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/categories-only.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/categories-topic-list.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/category-title-before.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/category-title-link.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/category-unread.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/cdn-img.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/choose-message.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/choose-topic.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/color-picker-choice.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/color-picker.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/composer-action-title.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/composer-body.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/composer-editor.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/composer-message.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/composer-messages.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/composer-save-button.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/composer-title.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/composer-toggles.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/composer-user-selector.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/concerns/category-search-priorities.js.erb (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/conditional-loading-section.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/conditional-loading-spinner.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/connector-container.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/cook-text.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/count-i18n.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/create-account.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/create-topic-button.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/create-topics-notice.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/csv-uploader.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/custom-html.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/d-button.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/d-editor.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/d-modal-body.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/d-modal-cancel.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/d-modal.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/d-navigation.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/d-section.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/date-input.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/date-picker-future.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/date-picker-past.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/date-picker.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/date-time-input-range.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/date-time-input.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/desktop-notification-config.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/directory-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/directory-toggle.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/disabled-icon.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/discourse-banner.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/discourse-linked-text.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/discourse-tag-bound.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/discourse-topic.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/discovery-categories.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/discovery-topics-list.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/edit-category-general.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/edit-category-images.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/edit-category-panel.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/edit-category-security.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/edit-category-settings.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/edit-category-tab.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/edit-category-tags.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/edit-category-topic-template.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/edit-topic-timer-form.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/emoji-picker.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/emoji-uploader.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/expand-post.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/expanding-text-area.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/featured-topic.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/flag-action-type.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/flag-selection.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/flat-button.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/footer-message.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/footer-nav.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/future-date-input.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/generated-invite-link.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/global-notice.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/google-search.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/group-activity-filter.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/group-card-contents.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/group-flair-inputs.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/group-index-toggle.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/group-manage-logs-filter.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/group-manage-logs-row.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/group-manage-save-button.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/group-member-dropdown.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/group-member.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/group-membership-button.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/group-navigation.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/group-post.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/group-selector.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/groups-form-interaction-fields.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/groups-form-membership-fields.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/groups-form-profile-fields.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/groups-info.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/header-extra-info.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/hide-modal-trigger.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/highlight-search.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/highlight-text.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/honeypot-input.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/iframed-html.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/ignored-user-list-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/ignored-user-list.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/image-uploader.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/images-uploader.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/input-tip.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/invite-panel.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/latest-topic-list-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/link-to-input.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/links-redirect.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/load-more.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/login-buttons.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/login-modal.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/login-reply-button.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/mobile-category-topic.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/mobile-nav.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/modal-panel.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/modal-tab.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/mount-widget.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/nav-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/navigation-bar.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/navigation-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/notification-consent-banner.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/number-field.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/password-field.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/plugin-connector.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/plugin-outlet.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/popup-input-tip.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/preference-checkbox.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/private-message-glyph.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/pwa-install-banner.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/quote-button.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/radio-button.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/related-messages.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/reviewable-bundled-action.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/reviewable-claimed-topic.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/reviewable-conversation-post.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/reviewable-field-category.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/reviewable-field-tags.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/reviewable-flagged-post.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/reviewable-histories.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/reviewable-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/reviewable-queued-post.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/reviewable-score.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/reviewable-user.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/save-controls.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/scroll-tracker.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/scrolling-post-stream.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/search-advanced-options.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/search-text-field.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/second-factor-form.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/second-factor-input.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/security-key-form.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/share-panel.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/share-popup.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/share-source.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/shared-draft-controls.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/signup-cta.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/site-header.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/suggested-topics.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/tag-drop-link.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/tag-groups-form.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/tag-info.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/tag-list.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/tags-admin-dropdown.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/tap-tile-grid.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/tap-tile.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/text-field.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/text-overflow.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/time-input.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/top-period-buttons.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/topic-admin-menu-button.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/topic-category.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/topic-entrance.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/topic-footer-buttons.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/topic-join-group-notice.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/topic-list-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/topic-list.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/topic-navigation.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/topic-post-badges.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/topic-progress.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/topic-status.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/topic-timeline.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/topic-timer-info.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/topic-title.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/track-selected.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/user-badge.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/user-card-contents.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/user-field.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/user-flag-percentage.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/user-info.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/user-link.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/user-notifications-large.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/user-selector.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/user-stat.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/user-stream-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/user-stream.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/user-summary-category-search.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/user-summary-section.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/user-summary-topic.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/user-summary-topics-list.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/user-summary-user.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/components/watch-read.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/about.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/account-created-edit-email.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/account-created-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/activation-edit.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/add-post-notice.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/application.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/associate-account-confirm.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/auth-token.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/avatar-selector.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/badges/index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/badges/show.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/basic-modal-body.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/bookmark.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/bulk-notification-level.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/change-owner.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/change-timestamp.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/composer.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/convert-to-public-topic.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/create-account.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/discovery-sortable.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/discovery.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/discovery/categories.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/discovery/topics.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/edit-category.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/edit-topic-timer.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/email-login.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/exception.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/explain-reviewable.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/feature-topic-on-profile.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/feature-topic.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/flag.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/forgot-password.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/full-page-search.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/grant-badge.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/group-activity-posts.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/group-activity-topics.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/group-activity.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/group-add-members.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/group-bulk-add.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/group-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/group-manage-logs.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/group-manage-profile.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/group-manage.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/group-messages.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/group-requests.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/group.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/groups-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/groups-new.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/history.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/ignore-duration-with-username.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/ignore-duration.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/insert-hyperlink.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/invites-show.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/jump-to-post.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/keyboard-shortcuts-help.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/login.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/modal.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/move-to-topic.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/navigation/categories.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/navigation/category.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/navigation/default.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/not-activated.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/password-reset.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/preferences.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/preferences/account.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/preferences/categories.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/preferences/email.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/preferences/emails.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/preferences/interface.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/preferences/notifications.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/preferences/profile.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/preferences/second-factor.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/preferences/tags.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/preferences/username.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/preferences/users.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/publish-page.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/raw-email.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/rename-tag.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/reorder-categories.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/request-group-membership-form.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/review-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/review-settings.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/second-factor-add-security-key.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/second-factor-add-totp.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/second-factor-backup-edit.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/second-factor-edit-security-key.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/second-factor-edit.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/share-and-invite.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/static.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/tag-groups-edit.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/tag-groups-new.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/tag-groups.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/tags-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/tags-show.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/topic-bulk-actions.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/topic.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/upload-selector.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/user-activity-bookmarks-with-reminders.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/user-activity.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/user-badges.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/user-card.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/user-invited-show.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/user-notifications.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/user-posts.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/user-private-messages-tags.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/user-private-messages.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/user-summary.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/user-topics-list.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/user.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/controllers/users.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/application.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/border-color.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/bound-avatar-template.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/bound-avatar.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/bound-category-link.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/bound-date.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/capitalize-string.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/category-badge.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/category-link.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/cold-age-class.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/custom-html.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/dash-if-empty.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/dasherize.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/dir-span.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/discourse-tag.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/discourse-tags.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/editable-value.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/fa-icon-node.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/float.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/format-age.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/format-date.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/format-username.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/icon-or-image.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/inline-date.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/loading-spinner.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/node.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/period-title.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/raw-plugin-outlet.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/raw.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/replace-emoji.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/reviewable-history-description.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/reviewable-status.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/route-action.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/shorten-url.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/theme-helpers.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/topic-featured-link.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/topic-link.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/topic-status-icons.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/user-avatar.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/helpers/user-status.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/asset-version.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/auth-complete.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/auto-load-modules.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/avatar-select.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/badging.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/banner.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/click-interceptor.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/copy-codeblocks.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/csrf-token.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/d-popover.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/ember-events.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/enable-emoji.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/ensure-max-image-dimensions.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/inject-objects.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/jquery-plugins.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/keyboard-shortcuts.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/live-development.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/localization.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/logout.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/logs-notice.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/message-bus.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/mobile.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/page-tracking.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/post-decorations.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/read-only.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/register-discourse-location.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/register-service-worker.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/relative-ages.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/sharing-sources.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/show-footer.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/signup-cta.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/strip-mobile-app-url-params.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/subscribe-user-notifications.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/title-notifications.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/topic-footer-buttons.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/initializers/url-redirects.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/after-transition.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/ajax-error.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/ajax.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/autocomplete.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/autosize.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/bookmark.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/cached-topic-list.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/category-hashtags.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/category-tag-search.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/clean-dom.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/click-track.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/computed.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/concerns/search-constants.js.erb (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/copy-text.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/d-popover.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/debounce.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/decimal-adjust.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/desktop-notifications.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/dirty-keys.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/discourse-location.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/export-csv.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/export-result.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/eyeline.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/formatter.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/hash.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/highlight-html.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/highlight-search.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/highlight-syntax.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/intercept-click.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/is-element-in-viewport.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/key-value-store.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/keyboard-shortcuts.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/lazy-load-images.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/lightbox.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/link-category-hashtags.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/link-lookup.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/link-mentions.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/link-tag-hashtag.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/load-script.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/lock-on.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/logout.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/mobile.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/notification-levels.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/offset-calculator.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/optional-service.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/page-tracker.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/page-visible.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/plugin-api.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/plugin-connectors.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/posts-with-placeholders.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/push-notifications.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/put-cursor-at-end.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/pwa-utils.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/quote-state.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/quote.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/raw-templates.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/register-topic-footer-button.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/render-tag.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/render-tags.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/render-topic-featured-link.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/reports-loader.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/round.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/safari-hacks.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/screen-track.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/search.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/settings.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/sharing.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/show-modal.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/static-route-builder.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/svg-sprite-loader.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/tag-hashtags.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/text-direction.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/text.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/theme-selector.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/to-markdown.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/tooltip.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/transform-post.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/uploads.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/url.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/user-activation.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/user-presence.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/user-search.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/utilities.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/lib/webauthn.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mapping-router.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/add-archetype-class.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/buffered-content.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/bulk-topic-selection.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/can-check-emails.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/card-contents-base.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/cleans-up.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/docking.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/filter-mode.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/grant-badge-controller.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/key-enter-escape.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/load-more.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/mobile-scroll-direction.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/modal-functionality.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/name-validation.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/open-composer.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/pan-events.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/password-validation.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/scroll-top.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/scrolling.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/singleton.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/upload.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/url-refresh.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/user-fields-validation.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/username-validation.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/mixins/viewing-action-type.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/action-summary.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/archetype.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/badge-grouping.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/badge.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/bookmark.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/category-list.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/category.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/composer.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/draft.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/group-history.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/group.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/invite.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/live-post-counts.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/login-method.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/nav-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/permission-type.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/post-action-type.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/post-stream.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/post.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/published-page.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/rest.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/result-set.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/reviewable-history.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/reviewable.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/session.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/site.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/static-page.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/store.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/tag-group.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/tag.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/topic-details.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/topic-list.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/topic-timer.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/topic-tracking-state.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/topic.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/trust-level.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/user-action-group.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/user-action-stat.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/user-action.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/user-badge.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/user-draft.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/user-drafts-stream.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/user-posts-stream.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/user-stream.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/models/user.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/pre-initializers/dynamic-route-builders.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/pre-initializers/inject-discourse-objects.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/pre-initializers/map-routes.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/pre-initializers/register-dom-templates.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/pre-initializers/sniff-capabilities.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/pre-initializers/svg-sprite-fontawesome.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/raw-views/list/post-count-or-badges.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/raw-views/list/posts-count-column.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/raw-views/list/visited-line.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/raw-views/topic-list-header-column.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/raw-views/topic-status.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/about.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/account-created-edit-email.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/account-created-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/account-created-resent.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/account-created.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/app-route-map.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/application.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/associate-account.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/badges-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/badges-show.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/build-admin-user-posts-route.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/build-category-route.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/build-group-messages-route.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/build-private-messages-route.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/build-static-route.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/build-topic-route.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/conduct.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/discourse.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/discovery-categories.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/discovery.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/email-login.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/exception-unknown.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/exception.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/faq.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/forgot-password.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/full-page-search.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-activity-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-activity-mentions.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-activity-posts.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-activity-topics.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-manage-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-manage-interaction.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-manage-logs.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-manage-membership.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-manage-profile.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-manage.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-members.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-messages-archive.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-messages-inbox.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-messages-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-messages.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group-requests.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/group.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/groups-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/groups-new.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/guidelines.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/invites-show.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/login.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/new-message.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/new-topic.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/password-reset.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/post.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/preferences-account.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/preferences-apps.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/preferences-categories.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/preferences-email.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/preferences-emails.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/preferences-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/preferences-interface.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/preferences-notifications.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/preferences-profile.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/preferences-second-factor.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/preferences-tags.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/preferences-username.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/preferences-users.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/preferences.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/privacy.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/restricted-user.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/review-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/review-settings.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/review-show.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/review-topics.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/review.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/rules.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/signup.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/tag-groups-edit.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/tag-groups-new.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/tag-groups.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/tags-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/tags-intersection.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/tags-show.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/topic-by-slug-or-id.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/topic-from-params-near.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/topic-from-params.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/topic.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/tos.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/unknown.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-activity-bookmarks-with-reminders.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-activity-bookmarks.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-activity-drafts.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-activity-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-activity-likes-given.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-activity-pending.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-activity-replies.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-activity-stream.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-activity-topics.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-activity.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-badges.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-deleted-posts.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-invited-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-invited-show.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-notifications-edits.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-notifications-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-notifications-likes-received.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-notifications-mentions.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-notifications-responses.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-notifications.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-private-messages-archive.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-private-messages-group-archive.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-private-messages-group.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-private-messages-index.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-private-messages-sent.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-private-messages-tags-show.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-private-messages-tags.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-private-messages.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-summary.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user-topic-list.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/user.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/routes/users.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/services/app-events.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/services/emoji-store.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/services/logs-notice.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/services/search.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/services/theme-settings.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/about.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/account-created.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/account-created/edit-email.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/account-created/index.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/account-created/resent.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/application.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/badge-selector-autocomplete.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/badges/index.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/badges/show.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/bulk-tag.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/category-selector-autocomplete.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/category-tag-autocomplete.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/about-page-users.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/activation-controls.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/activation-email-form.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/avatar-uploader.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/backup-codes.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/backup-uploader.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/badge-button.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/badge-card.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/badge-selector.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/badge-title.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/basic-topic-list.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/bread-crumbs.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/bulk-select-button.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/cancel-link.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/categories-and-latest-topics.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/categories-and-top-topics.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/categories-boxes-topic.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/categories-boxes-with-topics.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/categories-boxes.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/categories-only.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/categories-topic-list.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/categories-with-featured-topics.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/category-name-fields.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/category-title-before.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/category-title-link.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/category-unread.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/cdn-img.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/choose-message.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/choose-topic.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/color-input.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/color-picker.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/composer-action-title.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/composer-editor.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/composer-messages.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/composer-title.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/composer-toggles.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/composer-user-selector.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/conditional-loading-section.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/conditional-loading-spinner.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/cook-text.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/count-i18n.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/create-topic-button.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/create-topics-notice.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/csv-uploader.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/custom-html-container.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/d-button.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/d-editor.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/d-modal-cancel.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/d-modal.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/d-navigation.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/date-input.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/date-picker.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/date-time-input-range.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/date-time-input.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/desktop-notification-config.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/directory-item.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/directory-toggle.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/disabled-icon.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/discourse-banner.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/discourse-linked-text.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/discourse-tag-bound.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/discovery-topics-list.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/edit-category-general.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/edit-category-images.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/edit-category-panel.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/edit-category-security.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/edit-category-settings.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/edit-category-tab.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/edit-category-tags.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/edit-category-topic-template.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/edit-topic-timer-form.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/emoji-picker.hbs.erb (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/emoji-uploader.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/expand-post.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/featured-topic.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/flag-action-type.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/flag-selection.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/flat-button.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/footer-message.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/future-date-input.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/generated-invite-link.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/global-notice.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/google-search.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/group-activity-filter.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/group-card-contents.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/group-flair-inputs.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/group-index-toggle.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/group-manage-logs-filter.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/group-manage-logs-row.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/group-manage-save-button.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/group-member.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/group-membership-button.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/group-navigation.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/group-post.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/group-selector.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/groups-form-interaction-fields.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/groups-form-membership-fields.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/groups-form-profile-fields.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/groups-info.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/ignored-user-list-item.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/ignored-user-list.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/image-uploader.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/images-uploader.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/input-tip.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/invite-panel.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/ip-lookup.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/latest-topic-list-item.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/link-to-input.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/login-buttons.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/mobile-category-topic.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/mobile-nav.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/modal-footer-close.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/modal-panel.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/modal-tab.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/nav-item.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/navigation-bar.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/navigation-item.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/notification-consent-banner.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/plugin-outlet.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/popup-input-tip.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/popup-menu.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/preference-checkbox.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/private-message-glyph.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/pwa-install-banner.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/quote-button.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/related-messages.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-bundled-action.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-claimed-topic.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-conversation-post.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-created-by-name.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-created-by.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-field-category.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-field-editor.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-field-tags.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-field-text.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-field-textarea.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-field.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-flagged-post.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-histories.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-item.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-post-header.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-queued-post.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-score.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-scores.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-tags.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-topic-link.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/reviewable-user.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/save-controls.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/score-value.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/search-advanced-options.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/second-factor-form.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/second-factor-input.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/security-key-form.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/selected-posts.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/share-panel.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/share-popup.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/share-source.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/shared-draft-controls.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/signup-cta.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/suggested-topics.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/tag-drop-link.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/tag-groups-form.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/tag-info.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/tag-list.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/tap-tile-grid.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/tap-tile.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/text-overflow.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/time-input.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/top-period-buttons.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/topic-category.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/topic-entrance.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/topic-footer-buttons.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/topic-join-group-notice.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/topic-list-item.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/topic-list.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/topic-navigation.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/topic-post-badges.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/topic-progress.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/topic-status.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/topic-timer-info.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/topic-title.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/track-selected.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-badge.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-card-contents.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-fields/confirm.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-fields/dropdown.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-fields/text.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-flag-percentage.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-info.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-profile-avatar.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-stat.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-stream-item.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-stream.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-summary-category-search.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-summary-section.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-summary-topic.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-summary-topics-list.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-summary-user.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/components/user-summary-users-list.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/composer.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/composer/custom-body.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/composer/education.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/composer/group-mentioned.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/composer/similar-topics.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/discovery.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/discovery/categories.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/discovery/topics.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/email-login.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/emoji-picker-recent.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/emoji-selector-autocomplete.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/exception.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/flat-button.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/full-page-search.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/group-activity-posts.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/group-activity-topics.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/group-index.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/group-requests.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/group-selector-autocomplete.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/group.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/group/activity.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/group/manage.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/group/manage/interaction.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/group/manage/logs.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/group/manage/membership.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/group/manage/profile.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/group/messages.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/groups/index.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/groups/new.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/hide-modal.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/invites.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/invites/show.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/list/action-list.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/list/activity-column.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/list/category-column.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/list/post-count-or-badges.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/list/posters-column.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/list/posts-count-column.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/list/topic-excerpt.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/list/topic-list-item.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/list/unread-indicator.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/list/visited-line.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/loading.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/login-preferences.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/mobile/components/basic-topic-list.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/mobile/components/categories-only.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/mobile/components/categories-with-featured-topics.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/mobile/components/directory-item.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/mobile/components/mobile-nav.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/mobile/components/navigation-bar.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/mobile/discovery/categories.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/mobile/discovery/topics.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/mobile/group-index.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/mobile/list/topic-list-item.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/mobile/modal/login.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/mobile/users.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/activation-edit.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/activation-resent.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/add-post-notice.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/associate-account-confirm.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/auth-token.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/avatar-selector.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/bookmark.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/bulk-actions-buttons.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/bulk-change-category.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/bulk-notification-level.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/change-owner.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/change-timestamp.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/convert-to-public-topic.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/create-account.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/delete-topic-disallowed.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/dismiss-read.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/edit-category.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/edit-topic-timer.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/explain-reviewable.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/feature-topic-on-profile.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/feature-topic.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/flag.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/forgot-password.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/grant-badge.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/group-add-members.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/group-bulk-add.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/history.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/ignore-duration-with-username.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/ignore-duration.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/insert-hyperlink.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/jump-to-post.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/keyboard-shortcuts-help.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/login.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/move-to-topic.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/not-activated.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/post-enqueued.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/publish-page.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/raw-email.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/rename-tag.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/reorder-categories.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/request-group-membership-form.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/second-factor-add-security-key.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/second-factor-add-totp.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/second-factor-backup-edit.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/second-factor-edit-security-key.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/second-factor-edit.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/share-and-invite.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/tag-upload.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/topic-bulk-actions.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/modal/upload-selector.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/navigation/categories.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/navigation/category.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/navigation/default.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/outlet-list.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/password-reset.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/post/poster-avatar.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/preferences-email.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/preferences-second-factor.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/preferences-username.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/preferences.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/preferences/account.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/preferences/apps.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/preferences/categories.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/preferences/emails.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/preferences/interface.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/preferences/notifications.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/preferences/profile.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/preferences/tags.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/preferences/users.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/review-index.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/review-settings.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/review-show.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/review-topics.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/review.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/selected-posts.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/static.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/tag-groups-edit.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/tag-groups-index.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/tag-groups-new.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/tag-groups.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/tags.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/tags/index.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/tags/show.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/topic-list-header-column.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/topic-list-header.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/topic-post-badges.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/topic-status.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/topic.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/unknown.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/user-card.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/user-invited-show.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/user-private-messages-tags.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/user-selector-autocomplete.hbr (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/user-topics-list.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/user.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/user/activity.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/user/badges.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/user/bookmarks.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/user/messages.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/user/notifications-index.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/user/notifications.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/user/posts.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/user/profile-hidden.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/user/stream.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/user/summary.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/templates/users.hbs (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/actions-summary.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/avatar-flair.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/bookmark-reminder-notification-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/button.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/category-link.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/component-connector.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/connector.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/custom-notification-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/decorator-helper.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/default-notification-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/discourse-tags.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/embedded-post.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/emoji.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/footer-nav.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/glue.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/group-message-summary-notification-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/hamburger-categories.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/hamburger-menu.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/hbs-compiler.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/header-contents.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/header-topic-info.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/header.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/home-logo.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/hooks.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/invitee-accepted-notification-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/liked-consolidated-notification-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/liked-notification-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/link.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/membership-request-accepted-notification-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/membership-request-consolidated-notification-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/menu-panel.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/post-admin-menu.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/post-cooked.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/post-edits-indicator.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/post-gap.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/post-links.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/post-menu.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/post-placeholder.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/post-small-action.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/post-stream.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/post.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/poster-name.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/private-message-map.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/quick-access-bookmarks.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/quick-access-item.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/quick-access-messages.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/quick-access-notifications.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/quick-access-panel.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/quick-access-profile.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/raw-html.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/search-menu-controls.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/search-menu-results.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/search-menu.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/time-gap.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/toggle-topic-summary.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/topic-admin-menu.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/topic-map.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/topic-status.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/topic-timeline.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/user-menu.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/user-notifications-large.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/widget-dropdown.js (100%)
 rename app/assets/javascripts/discourse/{ => app}/widgets/widget.js (100%)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 6a6cc8ac41..954df932a1 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -9,96 +9,96 @@
 //= require ./deprecated
 
 // Stuff we need to load first
-//= require ./discourse/lib/to-markdown
-//= require ./discourse/lib/utilities
-//= require ./discourse/lib/user-presence
-//= require ./discourse/lib/logout
-//= require ./discourse/mixins/singleton
-//= require ./discourse/models/rest
-//= require ./discourse/models/session
-//= require ./discourse/lib/ajax
-//= require ./discourse/lib/text
-//= require ./discourse/lib/hash
-//= require ./discourse/lib/load-script
-//= require ./discourse/lib/notification-levels
-//= require ./discourse/services/app-events
-//= require ./discourse/lib/offset-calculator
-//= require ./discourse/lib/lock-on
-//= require ./discourse/lib/url
-//= require ./discourse/lib/debounce
-//= require ./discourse/lib/quote
-//= require ./discourse/lib/key-value-store
-//= require ./discourse/lib/computed
-//= require ./discourse/lib/formatter
-//= require ./discourse/lib/text-direction
-//= require ./discourse/lib/eyeline
-//= require ./discourse/lib/show-modal
-//= require ./discourse/mixins/scrolling
-//= require ./discourse/lib/ajax-error
-//= require ./discourse/models/result-set
-//= require ./discourse/models/store
-//= require ./discourse/models/action-summary
-//= require ./discourse/models/permission-type
-//= require ./discourse/models/category
-//= require ./discourse/models/topic
-//= require ./discourse/models/draft
-//= require ./discourse/models/composer
-//= require ./discourse/models/badge-grouping
-//= require ./discourse/models/badge
-//= require ./discourse/models/permission-type
-//= require ./discourse/models/user-action-group
-//= require ./discourse/models/trust-level
-//= require ./discourse/lib/search
-//= require ./discourse/lib/user-search
-//= require ./discourse/lib/export-csv
-//= require ./discourse/lib/autocomplete
-//= require ./discourse/lib/after-transition
-//= require ./discourse/lib/safari-hacks
-//= require ./discourse/lib/put-cursor-at-end
-//= require_tree ./discourse/adapters
-//= require ./discourse/models/post-action-type
-//= require ./discourse/models/post
-//= require ./discourse/lib/posts-with-placeholders
-//= require ./discourse/models/post-stream
-//= require ./discourse/models/topic-details
-//= require ./discourse/models/topic
-//= require ./discourse/models/user-action
-//= require ./discourse/models/draft
-//= require ./discourse/models/composer
-//= require ./discourse/models/user-badge
-//= require_tree ./discourse/lib
-//= require_tree ./discourse/mixins
-//= require ./discourse/models/invite
-//= require ./discourse/controllers/discovery-sortable
-//= require ./discourse/controllers/navigation/default
-//= require ./discourse/components/edit-category-panel
-//= require ./discourse/lib/link-mentions
-//= require ./discourse/components/site-header
-//= require ./discourse/components/d-editor
-//= require ./discourse/lib/screen-track
-//= require ./discourse/routes/discourse
-//= require ./discourse/routes/build-topic-route
-//= require ./discourse/routes/restricted-user
-//= require ./discourse/routes/user-topic-list
-//= require ./discourse/routes/user-activity-stream
-//= require ./discourse/routes/topic-from-params
-//= require ./discourse/components/text-field
-//= require ./discourse/components/conditional-loading-spinner
-//= require ./discourse/helpers/user-avatar
-//= require ./discourse/helpers/cold-age-class
-//= require ./discourse/helpers/loading-spinner
-//= require ./discourse/helpers/category-link
-//= require ./discourse/lib/export-result
-//= require ./discourse/mapping-router
+//= require ./discourse/app/lib/to-markdown
+//= require ./discourse/app/lib/utilities
+//= require ./discourse/app/lib/user-presence
+//= require ./discourse/app/lib/logout
+//= require ./discourse/app/mixins/singleton
+//= require ./discourse/app/models/rest
+//= require ./discourse/app/models/session
+//= require ./discourse/app/lib/ajax
+//= require ./discourse/app/lib/text
+//= require ./discourse/app/lib/hash
+//= require ./discourse/app/lib/load-script
+//= require ./discourse/app/lib/notification-levels
+//= require ./discourse/app/services/app-events
+//= require ./discourse/app/lib/offset-calculator
+//= require ./discourse/app/lib/lock-on
+//= require ./discourse/app/lib/url
+//= require ./discourse/app/lib/debounce
+//= require ./discourse/app/lib/quote
+//= require ./discourse/app/lib/key-value-store
+//= require ./discourse/app/lib/computed
+//= require ./discourse/app/lib/formatter
+//= require ./discourse/app/lib/text-direction
+//= require ./discourse/app/lib/eyeline
+//= require ./discourse/app/lib/show-modal
+//= require ./discourse/app/mixins/scrolling
+//= require ./discourse/app/lib/ajax-error
+//= require ./discourse/app/models/result-set
+//= require ./discourse/app/models/store
+//= require ./discourse/app/models/action-summary
+//= require ./discourse/app/models/permission-type
+//= require ./discourse/app/models/category
+//= require ./discourse/app/models/topic
+//= require ./discourse/app/models/draft
+//= require ./discourse/app/models/composer
+//= require ./discourse/app/models/badge-grouping
+//= require ./discourse/app/models/badge
+//= require ./discourse/app/models/permission-type
+//= require ./discourse/app/models/user-action-group
+//= require ./discourse/app/models/trust-level
+//= require ./discourse/app/lib/search
+//= require ./discourse/app/lib/user-search
+//= require ./discourse/app/lib/export-csv
+//= require ./discourse/app/lib/autocomplete
+//= require ./discourse/app/lib/after-transition
+//= require ./discourse/app/lib/safari-hacks
+//= require ./discourse/app/lib/put-cursor-at-end
+//= require_tree ./discourse/app/adapters
+//= require ./discourse/app/models/post-action-type
+//= require ./discourse/app/models/post
+//= require ./discourse/app/lib/posts-with-placeholders
+//= require ./discourse/app/models/post-stream
+//= require ./discourse/app/models/topic-details
+//= require ./discourse/app/models/topic
+//= require ./discourse/app/models/user-action
+//= require ./discourse/app/models/draft
+//= require ./discourse/app/models/composer
+//= require ./discourse/app/models/user-badge
+//= require_tree ./discourse/app/lib
+//= require_tree ./discourse/app/mixins
+//= require ./discourse/app/models/invite
+//= require ./discourse/app/controllers/discovery-sortable
+//= require ./discourse/app/controllers/navigation/default
+//= require ./discourse/app/components/edit-category-panel
+//= require ./discourse/app/lib/link-mentions
+//= require ./discourse/app/components/site-header
+//= require ./discourse/app/components/d-editor
+//= require ./discourse/app/lib/screen-track
+//= require ./discourse/app/routes/discourse
+//= require ./discourse/app/routes/build-topic-route
+//= require ./discourse/app/routes/restricted-user
+//= require ./discourse/app/routes/user-topic-list
+//= require ./discourse/app/routes/user-activity-stream
+//= require ./discourse/app/routes/topic-from-params
+//= require ./discourse/app/components/text-field
+//= require ./discourse/app/components/conditional-loading-spinner
+//= require ./discourse/app/helpers/user-avatar
+//= require ./discourse/app/helpers/cold-age-class
+//= require ./discourse/app/helpers/loading-spinner
+//= require ./discourse/app/helpers/category-link
+//= require ./discourse/app/lib/export-result
+//= require ./discourse/app/mapping-router
 
-//= require_tree ./discourse/controllers
-//= require_tree ./discourse/models
-//= require_tree ./discourse/components
-//= require_tree ./discourse/raw-views
-//= require_tree ./discourse/helpers
-//= require_tree ./discourse/templates
-//= require_tree ./discourse/routes
-//= require_tree ./discourse/pre-initializers
-//= require_tree ./discourse/initializers
-//= require_tree ./discourse/services
-//= require_tree ./discourse/widgets
+//= require_tree ./discourse/app/controllers
+//= require_tree ./discourse/app/models
+//= require_tree ./discourse/app/components
+//= require_tree ./discourse/app/raw-views
+//= require_tree ./discourse/app/helpers
+//= require_tree ./discourse/app/templates
+//= require_tree ./discourse/app/routes
+//= require_tree ./discourse/app/pre-initializers
+//= require_tree ./discourse/app/initializers
+//= require_tree ./discourse/app/services
+//= require_tree ./discourse/app/widgets
diff --git a/app/assets/javascripts/discourse/adapters/email-template.js b/app/assets/javascripts/discourse/app/adapters/email-template.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/email-template.js
rename to app/assets/javascripts/discourse/app/adapters/email-template.js
diff --git a/app/assets/javascripts/discourse/adapters/group.js b/app/assets/javascripts/discourse/app/adapters/group.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/group.js
rename to app/assets/javascripts/discourse/app/adapters/group.js
diff --git a/app/assets/javascripts/discourse/adapters/notification.js b/app/assets/javascripts/discourse/app/adapters/notification.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/notification.js
rename to app/assets/javascripts/discourse/app/adapters/notification.js
diff --git a/app/assets/javascripts/discourse/adapters/post-reply-history.js b/app/assets/javascripts/discourse/app/adapters/post-reply-history.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/post-reply-history.js
rename to app/assets/javascripts/discourse/app/adapters/post-reply-history.js
diff --git a/app/assets/javascripts/discourse/adapters/post-reply.js b/app/assets/javascripts/discourse/app/adapters/post-reply.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/post-reply.js
rename to app/assets/javascripts/discourse/app/adapters/post-reply.js
diff --git a/app/assets/javascripts/discourse/adapters/post.js b/app/assets/javascripts/discourse/app/adapters/post.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/post.js
rename to app/assets/javascripts/discourse/app/adapters/post.js
diff --git a/app/assets/javascripts/discourse/adapters/published-page.js b/app/assets/javascripts/discourse/app/adapters/published-page.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/published-page.js
rename to app/assets/javascripts/discourse/app/adapters/published-page.js
diff --git a/app/assets/javascripts/discourse/adapters/rest.js b/app/assets/javascripts/discourse/app/adapters/rest.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/rest.js
rename to app/assets/javascripts/discourse/app/adapters/rest.js
diff --git a/app/assets/javascripts/discourse/adapters/reviewable-explanation.js b/app/assets/javascripts/discourse/app/adapters/reviewable-explanation.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/reviewable-explanation.js
rename to app/assets/javascripts/discourse/app/adapters/reviewable-explanation.js
diff --git a/app/assets/javascripts/discourse/adapters/reviewable-settings.js b/app/assets/javascripts/discourse/app/adapters/reviewable-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/reviewable-settings.js
rename to app/assets/javascripts/discourse/app/adapters/reviewable-settings.js
diff --git a/app/assets/javascripts/discourse/adapters/reviewable-topic.js b/app/assets/javascripts/discourse/app/adapters/reviewable-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/reviewable-topic.js
rename to app/assets/javascripts/discourse/app/adapters/reviewable-topic.js
diff --git a/app/assets/javascripts/discourse/adapters/reviewable.js b/app/assets/javascripts/discourse/app/adapters/reviewable.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/reviewable.js
rename to app/assets/javascripts/discourse/app/adapters/reviewable.js
diff --git a/app/assets/javascripts/discourse/adapters/tag-info.js b/app/assets/javascripts/discourse/app/adapters/tag-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/tag-info.js
rename to app/assets/javascripts/discourse/app/adapters/tag-info.js
diff --git a/app/assets/javascripts/discourse/adapters/tag-notification.js b/app/assets/javascripts/discourse/app/adapters/tag-notification.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/tag-notification.js
rename to app/assets/javascripts/discourse/app/adapters/tag-notification.js
diff --git a/app/assets/javascripts/discourse/adapters/topic-list.js b/app/assets/javascripts/discourse/app/adapters/topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/topic-list.js
rename to app/assets/javascripts/discourse/app/adapters/topic-list.js
diff --git a/app/assets/javascripts/discourse/adapters/topic.js b/app/assets/javascripts/discourse/app/adapters/topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/adapters/topic.js
rename to app/assets/javascripts/discourse/app/adapters/topic.js
diff --git a/app/assets/javascripts/discourse/components/about-page-users.js b/app/assets/javascripts/discourse/app/components/about-page-users.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/about-page-users.js
rename to app/assets/javascripts/discourse/app/components/about-page-users.js
diff --git a/app/assets/javascripts/discourse/components/activation-controls.js b/app/assets/javascripts/discourse/app/components/activation-controls.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/activation-controls.js
rename to app/assets/javascripts/discourse/app/components/activation-controls.js
diff --git a/app/assets/javascripts/discourse/components/add-category-tag-classes.js b/app/assets/javascripts/discourse/app/components/add-category-tag-classes.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/add-category-tag-classes.js
rename to app/assets/javascripts/discourse/app/components/add-category-tag-classes.js
diff --git a/app/assets/javascripts/discourse/components/auth-token-dropdown.js b/app/assets/javascripts/discourse/app/components/auth-token-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/auth-token-dropdown.js
rename to app/assets/javascripts/discourse/app/components/auth-token-dropdown.js
diff --git a/app/assets/javascripts/discourse/components/avatar-flair.js b/app/assets/javascripts/discourse/app/components/avatar-flair.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/avatar-flair.js
rename to app/assets/javascripts/discourse/app/components/avatar-flair.js
diff --git a/app/assets/javascripts/discourse/components/avatar-uploader.js b/app/assets/javascripts/discourse/app/components/avatar-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/avatar-uploader.js
rename to app/assets/javascripts/discourse/app/components/avatar-uploader.js
diff --git a/app/assets/javascripts/discourse/components/backup-codes.js b/app/assets/javascripts/discourse/app/components/backup-codes.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/backup-codes.js
rename to app/assets/javascripts/discourse/app/components/backup-codes.js
diff --git a/app/assets/javascripts/discourse/components/backup-uploader.js b/app/assets/javascripts/discourse/app/components/backup-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/backup-uploader.js
rename to app/assets/javascripts/discourse/app/components/backup-uploader.js
diff --git a/app/assets/javascripts/discourse/components/badge-button.js b/app/assets/javascripts/discourse/app/components/badge-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/badge-button.js
rename to app/assets/javascripts/discourse/app/components/badge-button.js
diff --git a/app/assets/javascripts/discourse/components/badge-card.js b/app/assets/javascripts/discourse/app/components/badge-card.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/badge-card.js
rename to app/assets/javascripts/discourse/app/components/badge-card.js
diff --git a/app/assets/javascripts/discourse/components/badge-selector.js b/app/assets/javascripts/discourse/app/components/badge-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/badge-selector.js
rename to app/assets/javascripts/discourse/app/components/badge-selector.js
diff --git a/app/assets/javascripts/discourse/components/badge-title.js b/app/assets/javascripts/discourse/app/components/badge-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/badge-title.js
rename to app/assets/javascripts/discourse/app/components/badge-title.js
diff --git a/app/assets/javascripts/discourse/components/basic-topic-list.js b/app/assets/javascripts/discourse/app/components/basic-topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/basic-topic-list.js
rename to app/assets/javascripts/discourse/app/components/basic-topic-list.js
diff --git a/app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js b/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/bookmark-actions-dropdown.js
rename to app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js
diff --git a/app/assets/javascripts/discourse/components/bread-crumbs.js b/app/assets/javascripts/discourse/app/components/bread-crumbs.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/bread-crumbs.js
rename to app/assets/javascripts/discourse/app/components/bread-crumbs.js
diff --git a/app/assets/javascripts/discourse/components/bulk-select-button.js b/app/assets/javascripts/discourse/app/components/bulk-select-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/bulk-select-button.js
rename to app/assets/javascripts/discourse/app/components/bulk-select-button.js
diff --git a/app/assets/javascripts/discourse/components/categories-and-latest-topics.js b/app/assets/javascripts/discourse/app/components/categories-and-latest-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-and-latest-topics.js
rename to app/assets/javascripts/discourse/app/components/categories-and-latest-topics.js
diff --git a/app/assets/javascripts/discourse/components/categories-and-top-topics.js b/app/assets/javascripts/discourse/app/components/categories-and-top-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-and-top-topics.js
rename to app/assets/javascripts/discourse/app/components/categories-and-top-topics.js
diff --git a/app/assets/javascripts/discourse/components/categories-boxes-topic.js b/app/assets/javascripts/discourse/app/components/categories-boxes-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-boxes-topic.js
rename to app/assets/javascripts/discourse/app/components/categories-boxes-topic.js
diff --git a/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js b/app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-boxes-with-topics.js
rename to app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.js
diff --git a/app/assets/javascripts/discourse/components/categories-boxes.js b/app/assets/javascripts/discourse/app/components/categories-boxes.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-boxes.js
rename to app/assets/javascripts/discourse/app/components/categories-boxes.js
diff --git a/app/assets/javascripts/discourse/components/categories-only.js b/app/assets/javascripts/discourse/app/components/categories-only.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-only.js
rename to app/assets/javascripts/discourse/app/components/categories-only.js
diff --git a/app/assets/javascripts/discourse/components/categories-topic-list.js b/app/assets/javascripts/discourse/app/components/categories-topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/categories-topic-list.js
rename to app/assets/javascripts/discourse/app/components/categories-topic-list.js
diff --git a/app/assets/javascripts/discourse/components/category-title-before.js b/app/assets/javascripts/discourse/app/components/category-title-before.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/category-title-before.js
rename to app/assets/javascripts/discourse/app/components/category-title-before.js
diff --git a/app/assets/javascripts/discourse/components/category-title-link.js b/app/assets/javascripts/discourse/app/components/category-title-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/category-title-link.js
rename to app/assets/javascripts/discourse/app/components/category-title-link.js
diff --git a/app/assets/javascripts/discourse/components/category-unread.js b/app/assets/javascripts/discourse/app/components/category-unread.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/category-unread.js
rename to app/assets/javascripts/discourse/app/components/category-unread.js
diff --git a/app/assets/javascripts/discourse/components/cdn-img.js b/app/assets/javascripts/discourse/app/components/cdn-img.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/cdn-img.js
rename to app/assets/javascripts/discourse/app/components/cdn-img.js
diff --git a/app/assets/javascripts/discourse/components/choose-message.js b/app/assets/javascripts/discourse/app/components/choose-message.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/choose-message.js
rename to app/assets/javascripts/discourse/app/components/choose-message.js
diff --git a/app/assets/javascripts/discourse/components/choose-topic.js b/app/assets/javascripts/discourse/app/components/choose-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/choose-topic.js
rename to app/assets/javascripts/discourse/app/components/choose-topic.js
diff --git a/app/assets/javascripts/discourse/components/color-picker-choice.js b/app/assets/javascripts/discourse/app/components/color-picker-choice.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/color-picker-choice.js
rename to app/assets/javascripts/discourse/app/components/color-picker-choice.js
diff --git a/app/assets/javascripts/discourse/components/color-picker.js b/app/assets/javascripts/discourse/app/components/color-picker.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/color-picker.js
rename to app/assets/javascripts/discourse/app/components/color-picker.js
diff --git a/app/assets/javascripts/discourse/components/composer-action-title.js b/app/assets/javascripts/discourse/app/components/composer-action-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-action-title.js
rename to app/assets/javascripts/discourse/app/components/composer-action-title.js
diff --git a/app/assets/javascripts/discourse/components/composer-body.js b/app/assets/javascripts/discourse/app/components/composer-body.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-body.js
rename to app/assets/javascripts/discourse/app/components/composer-body.js
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-editor.js
rename to app/assets/javascripts/discourse/app/components/composer-editor.js
diff --git a/app/assets/javascripts/discourse/components/composer-message.js b/app/assets/javascripts/discourse/app/components/composer-message.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-message.js
rename to app/assets/javascripts/discourse/app/components/composer-message.js
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js b/app/assets/javascripts/discourse/app/components/composer-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-messages.js
rename to app/assets/javascripts/discourse/app/components/composer-messages.js
diff --git a/app/assets/javascripts/discourse/components/composer-save-button.js b/app/assets/javascripts/discourse/app/components/composer-save-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-save-button.js
rename to app/assets/javascripts/discourse/app/components/composer-save-button.js
diff --git a/app/assets/javascripts/discourse/components/composer-title.js b/app/assets/javascripts/discourse/app/components/composer-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-title.js
rename to app/assets/javascripts/discourse/app/components/composer-title.js
diff --git a/app/assets/javascripts/discourse/components/composer-toggles.js b/app/assets/javascripts/discourse/app/components/composer-toggles.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-toggles.js
rename to app/assets/javascripts/discourse/app/components/composer-toggles.js
diff --git a/app/assets/javascripts/discourse/components/composer-user-selector.js b/app/assets/javascripts/discourse/app/components/composer-user-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/composer-user-selector.js
rename to app/assets/javascripts/discourse/app/components/composer-user-selector.js
diff --git a/app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.erb b/app/assets/javascripts/discourse/app/components/concerns/category-search-priorities.js.erb
similarity index 100%
rename from app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.erb
rename to app/assets/javascripts/discourse/app/components/concerns/category-search-priorities.js.erb
diff --git a/app/assets/javascripts/discourse/components/conditional-loading-section.js b/app/assets/javascripts/discourse/app/components/conditional-loading-section.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/conditional-loading-section.js
rename to app/assets/javascripts/discourse/app/components/conditional-loading-section.js
diff --git a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js b/app/assets/javascripts/discourse/app/components/conditional-loading-spinner.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/conditional-loading-spinner.js
rename to app/assets/javascripts/discourse/app/components/conditional-loading-spinner.js
diff --git a/app/assets/javascripts/discourse/components/connector-container.js b/app/assets/javascripts/discourse/app/components/connector-container.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/connector-container.js
rename to app/assets/javascripts/discourse/app/components/connector-container.js
diff --git a/app/assets/javascripts/discourse/components/cook-text.js b/app/assets/javascripts/discourse/app/components/cook-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/cook-text.js
rename to app/assets/javascripts/discourse/app/components/cook-text.js
diff --git a/app/assets/javascripts/discourse/components/count-i18n.js b/app/assets/javascripts/discourse/app/components/count-i18n.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/count-i18n.js
rename to app/assets/javascripts/discourse/app/components/count-i18n.js
diff --git a/app/assets/javascripts/discourse/components/create-account.js b/app/assets/javascripts/discourse/app/components/create-account.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/create-account.js
rename to app/assets/javascripts/discourse/app/components/create-account.js
diff --git a/app/assets/javascripts/discourse/components/create-topic-button.js b/app/assets/javascripts/discourse/app/components/create-topic-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/create-topic-button.js
rename to app/assets/javascripts/discourse/app/components/create-topic-button.js
diff --git a/app/assets/javascripts/discourse/components/create-topics-notice.js b/app/assets/javascripts/discourse/app/components/create-topics-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/create-topics-notice.js
rename to app/assets/javascripts/discourse/app/components/create-topics-notice.js
diff --git a/app/assets/javascripts/discourse/components/csv-uploader.js b/app/assets/javascripts/discourse/app/components/csv-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/csv-uploader.js
rename to app/assets/javascripts/discourse/app/components/csv-uploader.js
diff --git a/app/assets/javascripts/discourse/components/custom-html.js b/app/assets/javascripts/discourse/app/components/custom-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/custom-html.js
rename to app/assets/javascripts/discourse/app/components/custom-html.js
diff --git a/app/assets/javascripts/discourse/components/d-button.js b/app/assets/javascripts/discourse/app/components/d-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-button.js
rename to app/assets/javascripts/discourse/app/components/d-button.js
diff --git a/app/assets/javascripts/discourse/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-editor.js
rename to app/assets/javascripts/discourse/app/components/d-editor.js
diff --git a/app/assets/javascripts/discourse/components/d-modal-body.js b/app/assets/javascripts/discourse/app/components/d-modal-body.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-modal-body.js
rename to app/assets/javascripts/discourse/app/components/d-modal-body.js
diff --git a/app/assets/javascripts/discourse/components/d-modal-cancel.js b/app/assets/javascripts/discourse/app/components/d-modal-cancel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-modal-cancel.js
rename to app/assets/javascripts/discourse/app/components/d-modal-cancel.js
diff --git a/app/assets/javascripts/discourse/components/d-modal.js b/app/assets/javascripts/discourse/app/components/d-modal.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-modal.js
rename to app/assets/javascripts/discourse/app/components/d-modal.js
diff --git a/app/assets/javascripts/discourse/components/d-navigation.js b/app/assets/javascripts/discourse/app/components/d-navigation.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-navigation.js
rename to app/assets/javascripts/discourse/app/components/d-navigation.js
diff --git a/app/assets/javascripts/discourse/components/d-section.js b/app/assets/javascripts/discourse/app/components/d-section.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/d-section.js
rename to app/assets/javascripts/discourse/app/components/d-section.js
diff --git a/app/assets/javascripts/discourse/components/date-input.js b/app/assets/javascripts/discourse/app/components/date-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-input.js
rename to app/assets/javascripts/discourse/app/components/date-input.js
diff --git a/app/assets/javascripts/discourse/components/date-picker-future.js b/app/assets/javascripts/discourse/app/components/date-picker-future.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-picker-future.js
rename to app/assets/javascripts/discourse/app/components/date-picker-future.js
diff --git a/app/assets/javascripts/discourse/components/date-picker-past.js b/app/assets/javascripts/discourse/app/components/date-picker-past.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-picker-past.js
rename to app/assets/javascripts/discourse/app/components/date-picker-past.js
diff --git a/app/assets/javascripts/discourse/components/date-picker.js b/app/assets/javascripts/discourse/app/components/date-picker.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-picker.js
rename to app/assets/javascripts/discourse/app/components/date-picker.js
diff --git a/app/assets/javascripts/discourse/components/date-time-input-range.js b/app/assets/javascripts/discourse/app/components/date-time-input-range.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-time-input-range.js
rename to app/assets/javascripts/discourse/app/components/date-time-input-range.js
diff --git a/app/assets/javascripts/discourse/components/date-time-input.js b/app/assets/javascripts/discourse/app/components/date-time-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/date-time-input.js
rename to app/assets/javascripts/discourse/app/components/date-time-input.js
diff --git a/app/assets/javascripts/discourse/components/desktop-notification-config.js b/app/assets/javascripts/discourse/app/components/desktop-notification-config.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/desktop-notification-config.js
rename to app/assets/javascripts/discourse/app/components/desktop-notification-config.js
diff --git a/app/assets/javascripts/discourse/components/directory-item.js b/app/assets/javascripts/discourse/app/components/directory-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/directory-item.js
rename to app/assets/javascripts/discourse/app/components/directory-item.js
diff --git a/app/assets/javascripts/discourse/components/directory-toggle.js b/app/assets/javascripts/discourse/app/components/directory-toggle.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/directory-toggle.js
rename to app/assets/javascripts/discourse/app/components/directory-toggle.js
diff --git a/app/assets/javascripts/discourse/components/disabled-icon.js b/app/assets/javascripts/discourse/app/components/disabled-icon.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/disabled-icon.js
rename to app/assets/javascripts/discourse/app/components/disabled-icon.js
diff --git a/app/assets/javascripts/discourse/components/discourse-banner.js b/app/assets/javascripts/discourse/app/components/discourse-banner.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discourse-banner.js
rename to app/assets/javascripts/discourse/app/components/discourse-banner.js
diff --git a/app/assets/javascripts/discourse/components/discourse-linked-text.js b/app/assets/javascripts/discourse/app/components/discourse-linked-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discourse-linked-text.js
rename to app/assets/javascripts/discourse/app/components/discourse-linked-text.js
diff --git a/app/assets/javascripts/discourse/components/discourse-tag-bound.js b/app/assets/javascripts/discourse/app/components/discourse-tag-bound.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discourse-tag-bound.js
rename to app/assets/javascripts/discourse/app/components/discourse-tag-bound.js
diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js b/app/assets/javascripts/discourse/app/components/discourse-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discourse-topic.js
rename to app/assets/javascripts/discourse/app/components/discourse-topic.js
diff --git a/app/assets/javascripts/discourse/components/discovery-categories.js b/app/assets/javascripts/discourse/app/components/discovery-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discovery-categories.js
rename to app/assets/javascripts/discourse/app/components/discovery-categories.js
diff --git a/app/assets/javascripts/discourse/components/discovery-topics-list.js b/app/assets/javascripts/discourse/app/components/discovery-topics-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/discovery-topics-list.js
rename to app/assets/javascripts/discourse/app/components/discovery-topics-list.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-general.js b/app/assets/javascripts/discourse/app/components/edit-category-general.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-general.js
rename to app/assets/javascripts/discourse/app/components/edit-category-general.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-images.js b/app/assets/javascripts/discourse/app/components/edit-category-images.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-images.js
rename to app/assets/javascripts/discourse/app/components/edit-category-images.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-panel.js b/app/assets/javascripts/discourse/app/components/edit-category-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-panel.js
rename to app/assets/javascripts/discourse/app/components/edit-category-panel.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-security.js b/app/assets/javascripts/discourse/app/components/edit-category-security.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-security.js
rename to app/assets/javascripts/discourse/app/components/edit-category-security.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-settings.js b/app/assets/javascripts/discourse/app/components/edit-category-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-settings.js
rename to app/assets/javascripts/discourse/app/components/edit-category-settings.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-tab.js b/app/assets/javascripts/discourse/app/components/edit-category-tab.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-tab.js
rename to app/assets/javascripts/discourse/app/components/edit-category-tab.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-tags.js b/app/assets/javascripts/discourse/app/components/edit-category-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-tags.js
rename to app/assets/javascripts/discourse/app/components/edit-category-tags.js
diff --git a/app/assets/javascripts/discourse/components/edit-category-topic-template.js b/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-category-topic-template.js
rename to app/assets/javascripts/discourse/app/components/edit-category-topic-template.js
diff --git a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js b/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/edit-topic-timer-form.js
rename to app/assets/javascripts/discourse/app/components/edit-topic-timer-form.js
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js b/app/assets/javascripts/discourse/app/components/emoji-picker.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/emoji-picker.js
rename to app/assets/javascripts/discourse/app/components/emoji-picker.js
diff --git a/app/assets/javascripts/discourse/components/emoji-uploader.js b/app/assets/javascripts/discourse/app/components/emoji-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/emoji-uploader.js
rename to app/assets/javascripts/discourse/app/components/emoji-uploader.js
diff --git a/app/assets/javascripts/discourse/components/expand-post.js b/app/assets/javascripts/discourse/app/components/expand-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/expand-post.js
rename to app/assets/javascripts/discourse/app/components/expand-post.js
diff --git a/app/assets/javascripts/discourse/components/expanding-text-area.js b/app/assets/javascripts/discourse/app/components/expanding-text-area.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/expanding-text-area.js
rename to app/assets/javascripts/discourse/app/components/expanding-text-area.js
diff --git a/app/assets/javascripts/discourse/components/featured-topic.js b/app/assets/javascripts/discourse/app/components/featured-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/featured-topic.js
rename to app/assets/javascripts/discourse/app/components/featured-topic.js
diff --git a/app/assets/javascripts/discourse/components/flag-action-type.js b/app/assets/javascripts/discourse/app/components/flag-action-type.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/flag-action-type.js
rename to app/assets/javascripts/discourse/app/components/flag-action-type.js
diff --git a/app/assets/javascripts/discourse/components/flag-selection.js b/app/assets/javascripts/discourse/app/components/flag-selection.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/flag-selection.js
rename to app/assets/javascripts/discourse/app/components/flag-selection.js
diff --git a/app/assets/javascripts/discourse/components/flat-button.js b/app/assets/javascripts/discourse/app/components/flat-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/flat-button.js
rename to app/assets/javascripts/discourse/app/components/flat-button.js
diff --git a/app/assets/javascripts/discourse/components/footer-message.js b/app/assets/javascripts/discourse/app/components/footer-message.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/footer-message.js
rename to app/assets/javascripts/discourse/app/components/footer-message.js
diff --git a/app/assets/javascripts/discourse/components/footer-nav.js b/app/assets/javascripts/discourse/app/components/footer-nav.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/footer-nav.js
rename to app/assets/javascripts/discourse/app/components/footer-nav.js
diff --git a/app/assets/javascripts/discourse/components/future-date-input.js b/app/assets/javascripts/discourse/app/components/future-date-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/future-date-input.js
rename to app/assets/javascripts/discourse/app/components/future-date-input.js
diff --git a/app/assets/javascripts/discourse/components/generated-invite-link.js b/app/assets/javascripts/discourse/app/components/generated-invite-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/generated-invite-link.js
rename to app/assets/javascripts/discourse/app/components/generated-invite-link.js
diff --git a/app/assets/javascripts/discourse/components/global-notice.js b/app/assets/javascripts/discourse/app/components/global-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/global-notice.js
rename to app/assets/javascripts/discourse/app/components/global-notice.js
diff --git a/app/assets/javascripts/discourse/components/google-search.js b/app/assets/javascripts/discourse/app/components/google-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/google-search.js
rename to app/assets/javascripts/discourse/app/components/google-search.js
diff --git a/app/assets/javascripts/discourse/components/group-activity-filter.js b/app/assets/javascripts/discourse/app/components/group-activity-filter.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-activity-filter.js
rename to app/assets/javascripts/discourse/app/components/group-activity-filter.js
diff --git a/app/assets/javascripts/discourse/components/group-card-contents.js b/app/assets/javascripts/discourse/app/components/group-card-contents.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-card-contents.js
rename to app/assets/javascripts/discourse/app/components/group-card-contents.js
diff --git a/app/assets/javascripts/discourse/components/group-flair-inputs.js b/app/assets/javascripts/discourse/app/components/group-flair-inputs.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-flair-inputs.js
rename to app/assets/javascripts/discourse/app/components/group-flair-inputs.js
diff --git a/app/assets/javascripts/discourse/components/group-index-toggle.js b/app/assets/javascripts/discourse/app/components/group-index-toggle.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-index-toggle.js
rename to app/assets/javascripts/discourse/app/components/group-index-toggle.js
diff --git a/app/assets/javascripts/discourse/components/group-manage-logs-filter.js b/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-manage-logs-filter.js
rename to app/assets/javascripts/discourse/app/components/group-manage-logs-filter.js
diff --git a/app/assets/javascripts/discourse/components/group-manage-logs-row.js b/app/assets/javascripts/discourse/app/components/group-manage-logs-row.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-manage-logs-row.js
rename to app/assets/javascripts/discourse/app/components/group-manage-logs-row.js
diff --git a/app/assets/javascripts/discourse/components/group-manage-save-button.js b/app/assets/javascripts/discourse/app/components/group-manage-save-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-manage-save-button.js
rename to app/assets/javascripts/discourse/app/components/group-manage-save-button.js
diff --git a/app/assets/javascripts/discourse/components/group-member-dropdown.js b/app/assets/javascripts/discourse/app/components/group-member-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-member-dropdown.js
rename to app/assets/javascripts/discourse/app/components/group-member-dropdown.js
diff --git a/app/assets/javascripts/discourse/components/group-member.js b/app/assets/javascripts/discourse/app/components/group-member.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-member.js
rename to app/assets/javascripts/discourse/app/components/group-member.js
diff --git a/app/assets/javascripts/discourse/components/group-membership-button.js b/app/assets/javascripts/discourse/app/components/group-membership-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-membership-button.js
rename to app/assets/javascripts/discourse/app/components/group-membership-button.js
diff --git a/app/assets/javascripts/discourse/components/group-navigation.js b/app/assets/javascripts/discourse/app/components/group-navigation.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-navigation.js
rename to app/assets/javascripts/discourse/app/components/group-navigation.js
diff --git a/app/assets/javascripts/discourse/components/group-post.js b/app/assets/javascripts/discourse/app/components/group-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-post.js
rename to app/assets/javascripts/discourse/app/components/group-post.js
diff --git a/app/assets/javascripts/discourse/components/group-selector.js b/app/assets/javascripts/discourse/app/components/group-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-selector.js
rename to app/assets/javascripts/discourse/app/components/group-selector.js
diff --git a/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js b/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/groups-form-interaction-fields.js
rename to app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js
diff --git a/app/assets/javascripts/discourse/components/groups-form-membership-fields.js b/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/groups-form-membership-fields.js
rename to app/assets/javascripts/discourse/app/components/groups-form-membership-fields.js
diff --git a/app/assets/javascripts/discourse/components/groups-form-profile-fields.js b/app/assets/javascripts/discourse/app/components/groups-form-profile-fields.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/groups-form-profile-fields.js
rename to app/assets/javascripts/discourse/app/components/groups-form-profile-fields.js
diff --git a/app/assets/javascripts/discourse/components/groups-info.js b/app/assets/javascripts/discourse/app/components/groups-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/groups-info.js
rename to app/assets/javascripts/discourse/app/components/groups-info.js
diff --git a/app/assets/javascripts/discourse/components/header-extra-info.js b/app/assets/javascripts/discourse/app/components/header-extra-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/header-extra-info.js
rename to app/assets/javascripts/discourse/app/components/header-extra-info.js
diff --git a/app/assets/javascripts/discourse/components/hide-modal-trigger.js b/app/assets/javascripts/discourse/app/components/hide-modal-trigger.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/hide-modal-trigger.js
rename to app/assets/javascripts/discourse/app/components/hide-modal-trigger.js
diff --git a/app/assets/javascripts/discourse/components/highlight-search.js b/app/assets/javascripts/discourse/app/components/highlight-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/highlight-search.js
rename to app/assets/javascripts/discourse/app/components/highlight-search.js
diff --git a/app/assets/javascripts/discourse/components/highlight-text.js b/app/assets/javascripts/discourse/app/components/highlight-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/highlight-text.js
rename to app/assets/javascripts/discourse/app/components/highlight-text.js
diff --git a/app/assets/javascripts/discourse/components/honeypot-input.js b/app/assets/javascripts/discourse/app/components/honeypot-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/honeypot-input.js
rename to app/assets/javascripts/discourse/app/components/honeypot-input.js
diff --git a/app/assets/javascripts/discourse/components/iframed-html.js b/app/assets/javascripts/discourse/app/components/iframed-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/iframed-html.js
rename to app/assets/javascripts/discourse/app/components/iframed-html.js
diff --git a/app/assets/javascripts/discourse/components/ignored-user-list-item.js b/app/assets/javascripts/discourse/app/components/ignored-user-list-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/ignored-user-list-item.js
rename to app/assets/javascripts/discourse/app/components/ignored-user-list-item.js
diff --git a/app/assets/javascripts/discourse/components/ignored-user-list.js b/app/assets/javascripts/discourse/app/components/ignored-user-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/ignored-user-list.js
rename to app/assets/javascripts/discourse/app/components/ignored-user-list.js
diff --git a/app/assets/javascripts/discourse/components/image-uploader.js b/app/assets/javascripts/discourse/app/components/image-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/image-uploader.js
rename to app/assets/javascripts/discourse/app/components/image-uploader.js
diff --git a/app/assets/javascripts/discourse/components/images-uploader.js b/app/assets/javascripts/discourse/app/components/images-uploader.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/images-uploader.js
rename to app/assets/javascripts/discourse/app/components/images-uploader.js
diff --git a/app/assets/javascripts/discourse/components/input-tip.js b/app/assets/javascripts/discourse/app/components/input-tip.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/input-tip.js
rename to app/assets/javascripts/discourse/app/components/input-tip.js
diff --git a/app/assets/javascripts/discourse/components/invite-panel.js b/app/assets/javascripts/discourse/app/components/invite-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/invite-panel.js
rename to app/assets/javascripts/discourse/app/components/invite-panel.js
diff --git a/app/assets/javascripts/discourse/components/latest-topic-list-item.js b/app/assets/javascripts/discourse/app/components/latest-topic-list-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/latest-topic-list-item.js
rename to app/assets/javascripts/discourse/app/components/latest-topic-list-item.js
diff --git a/app/assets/javascripts/discourse/components/link-to-input.js b/app/assets/javascripts/discourse/app/components/link-to-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/link-to-input.js
rename to app/assets/javascripts/discourse/app/components/link-to-input.js
diff --git a/app/assets/javascripts/discourse/components/links-redirect.js b/app/assets/javascripts/discourse/app/components/links-redirect.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/links-redirect.js
rename to app/assets/javascripts/discourse/app/components/links-redirect.js
diff --git a/app/assets/javascripts/discourse/components/load-more.js b/app/assets/javascripts/discourse/app/components/load-more.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/load-more.js
rename to app/assets/javascripts/discourse/app/components/load-more.js
diff --git a/app/assets/javascripts/discourse/components/login-buttons.js b/app/assets/javascripts/discourse/app/components/login-buttons.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/login-buttons.js
rename to app/assets/javascripts/discourse/app/components/login-buttons.js
diff --git a/app/assets/javascripts/discourse/components/login-modal.js b/app/assets/javascripts/discourse/app/components/login-modal.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/login-modal.js
rename to app/assets/javascripts/discourse/app/components/login-modal.js
diff --git a/app/assets/javascripts/discourse/components/login-reply-button.js b/app/assets/javascripts/discourse/app/components/login-reply-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/login-reply-button.js
rename to app/assets/javascripts/discourse/app/components/login-reply-button.js
diff --git a/app/assets/javascripts/discourse/components/mobile-category-topic.js b/app/assets/javascripts/discourse/app/components/mobile-category-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/mobile-category-topic.js
rename to app/assets/javascripts/discourse/app/components/mobile-category-topic.js
diff --git a/app/assets/javascripts/discourse/components/mobile-nav.js b/app/assets/javascripts/discourse/app/components/mobile-nav.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/mobile-nav.js
rename to app/assets/javascripts/discourse/app/components/mobile-nav.js
diff --git a/app/assets/javascripts/discourse/components/modal-panel.js b/app/assets/javascripts/discourse/app/components/modal-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/modal-panel.js
rename to app/assets/javascripts/discourse/app/components/modal-panel.js
diff --git a/app/assets/javascripts/discourse/components/modal-tab.js b/app/assets/javascripts/discourse/app/components/modal-tab.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/modal-tab.js
rename to app/assets/javascripts/discourse/app/components/modal-tab.js
diff --git a/app/assets/javascripts/discourse/components/mount-widget.js b/app/assets/javascripts/discourse/app/components/mount-widget.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/mount-widget.js
rename to app/assets/javascripts/discourse/app/components/mount-widget.js
diff --git a/app/assets/javascripts/discourse/components/nav-item.js b/app/assets/javascripts/discourse/app/components/nav-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/nav-item.js
rename to app/assets/javascripts/discourse/app/components/nav-item.js
diff --git a/app/assets/javascripts/discourse/components/navigation-bar.js b/app/assets/javascripts/discourse/app/components/navigation-bar.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/navigation-bar.js
rename to app/assets/javascripts/discourse/app/components/navigation-bar.js
diff --git a/app/assets/javascripts/discourse/components/navigation-item.js b/app/assets/javascripts/discourse/app/components/navigation-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/navigation-item.js
rename to app/assets/javascripts/discourse/app/components/navigation-item.js
diff --git a/app/assets/javascripts/discourse/components/notification-consent-banner.js b/app/assets/javascripts/discourse/app/components/notification-consent-banner.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/notification-consent-banner.js
rename to app/assets/javascripts/discourse/app/components/notification-consent-banner.js
diff --git a/app/assets/javascripts/discourse/components/number-field.js b/app/assets/javascripts/discourse/app/components/number-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/number-field.js
rename to app/assets/javascripts/discourse/app/components/number-field.js
diff --git a/app/assets/javascripts/discourse/components/password-field.js b/app/assets/javascripts/discourse/app/components/password-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/password-field.js
rename to app/assets/javascripts/discourse/app/components/password-field.js
diff --git a/app/assets/javascripts/discourse/components/plugin-connector.js b/app/assets/javascripts/discourse/app/components/plugin-connector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/plugin-connector.js
rename to app/assets/javascripts/discourse/app/components/plugin-connector.js
diff --git a/app/assets/javascripts/discourse/components/plugin-outlet.js b/app/assets/javascripts/discourse/app/components/plugin-outlet.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/plugin-outlet.js
rename to app/assets/javascripts/discourse/app/components/plugin-outlet.js
diff --git a/app/assets/javascripts/discourse/components/popup-input-tip.js b/app/assets/javascripts/discourse/app/components/popup-input-tip.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/popup-input-tip.js
rename to app/assets/javascripts/discourse/app/components/popup-input-tip.js
diff --git a/app/assets/javascripts/discourse/components/preference-checkbox.js b/app/assets/javascripts/discourse/app/components/preference-checkbox.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/preference-checkbox.js
rename to app/assets/javascripts/discourse/app/components/preference-checkbox.js
diff --git a/app/assets/javascripts/discourse/components/private-message-glyph.js b/app/assets/javascripts/discourse/app/components/private-message-glyph.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/private-message-glyph.js
rename to app/assets/javascripts/discourse/app/components/private-message-glyph.js
diff --git a/app/assets/javascripts/discourse/components/pwa-install-banner.js b/app/assets/javascripts/discourse/app/components/pwa-install-banner.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/pwa-install-banner.js
rename to app/assets/javascripts/discourse/app/components/pwa-install-banner.js
diff --git a/app/assets/javascripts/discourse/components/quote-button.js b/app/assets/javascripts/discourse/app/components/quote-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/quote-button.js
rename to app/assets/javascripts/discourse/app/components/quote-button.js
diff --git a/app/assets/javascripts/discourse/components/radio-button.js b/app/assets/javascripts/discourse/app/components/radio-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/radio-button.js
rename to app/assets/javascripts/discourse/app/components/radio-button.js
diff --git a/app/assets/javascripts/discourse/components/related-messages.js b/app/assets/javascripts/discourse/app/components/related-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/related-messages.js
rename to app/assets/javascripts/discourse/app/components/related-messages.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-bundled-action.js b/app/assets/javascripts/discourse/app/components/reviewable-bundled-action.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-bundled-action.js
rename to app/assets/javascripts/discourse/app/components/reviewable-bundled-action.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-claimed-topic.js b/app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-claimed-topic.js
rename to app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-conversation-post.js b/app/assets/javascripts/discourse/app/components/reviewable-conversation-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-conversation-post.js
rename to app/assets/javascripts/discourse/app/components/reviewable-conversation-post.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-field-category.js b/app/assets/javascripts/discourse/app/components/reviewable-field-category.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-field-category.js
rename to app/assets/javascripts/discourse/app/components/reviewable-field-category.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-field-tags.js b/app/assets/javascripts/discourse/app/components/reviewable-field-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-field-tags.js
rename to app/assets/javascripts/discourse/app/components/reviewable-field-tags.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-flagged-post.js b/app/assets/javascripts/discourse/app/components/reviewable-flagged-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-flagged-post.js
rename to app/assets/javascripts/discourse/app/components/reviewable-flagged-post.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-histories.js b/app/assets/javascripts/discourse/app/components/reviewable-histories.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-histories.js
rename to app/assets/javascripts/discourse/app/components/reviewable-histories.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-item.js b/app/assets/javascripts/discourse/app/components/reviewable-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-item.js
rename to app/assets/javascripts/discourse/app/components/reviewable-item.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-queued-post.js b/app/assets/javascripts/discourse/app/components/reviewable-queued-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-queued-post.js
rename to app/assets/javascripts/discourse/app/components/reviewable-queued-post.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-score.js b/app/assets/javascripts/discourse/app/components/reviewable-score.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-score.js
rename to app/assets/javascripts/discourse/app/components/reviewable-score.js
diff --git a/app/assets/javascripts/discourse/components/reviewable-user.js b/app/assets/javascripts/discourse/app/components/reviewable-user.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/reviewable-user.js
rename to app/assets/javascripts/discourse/app/components/reviewable-user.js
diff --git a/app/assets/javascripts/discourse/components/save-controls.js b/app/assets/javascripts/discourse/app/components/save-controls.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/save-controls.js
rename to app/assets/javascripts/discourse/app/components/save-controls.js
diff --git a/app/assets/javascripts/discourse/components/scroll-tracker.js b/app/assets/javascripts/discourse/app/components/scroll-tracker.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/scroll-tracker.js
rename to app/assets/javascripts/discourse/app/components/scroll-tracker.js
diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js b/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/scrolling-post-stream.js
rename to app/assets/javascripts/discourse/app/components/scrolling-post-stream.js
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js b/app/assets/javascripts/discourse/app/components/search-advanced-options.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/search-advanced-options.js
rename to app/assets/javascripts/discourse/app/components/search-advanced-options.js
diff --git a/app/assets/javascripts/discourse/components/search-text-field.js b/app/assets/javascripts/discourse/app/components/search-text-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/search-text-field.js
rename to app/assets/javascripts/discourse/app/components/search-text-field.js
diff --git a/app/assets/javascripts/discourse/components/second-factor-form.js b/app/assets/javascripts/discourse/app/components/second-factor-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/second-factor-form.js
rename to app/assets/javascripts/discourse/app/components/second-factor-form.js
diff --git a/app/assets/javascripts/discourse/components/second-factor-input.js b/app/assets/javascripts/discourse/app/components/second-factor-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/second-factor-input.js
rename to app/assets/javascripts/discourse/app/components/second-factor-input.js
diff --git a/app/assets/javascripts/discourse/components/security-key-form.js b/app/assets/javascripts/discourse/app/components/security-key-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/security-key-form.js
rename to app/assets/javascripts/discourse/app/components/security-key-form.js
diff --git a/app/assets/javascripts/discourse/components/share-panel.js b/app/assets/javascripts/discourse/app/components/share-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/share-panel.js
rename to app/assets/javascripts/discourse/app/components/share-panel.js
diff --git a/app/assets/javascripts/discourse/components/share-popup.js b/app/assets/javascripts/discourse/app/components/share-popup.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/share-popup.js
rename to app/assets/javascripts/discourse/app/components/share-popup.js
diff --git a/app/assets/javascripts/discourse/components/share-source.js b/app/assets/javascripts/discourse/app/components/share-source.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/share-source.js
rename to app/assets/javascripts/discourse/app/components/share-source.js
diff --git a/app/assets/javascripts/discourse/components/shared-draft-controls.js b/app/assets/javascripts/discourse/app/components/shared-draft-controls.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/shared-draft-controls.js
rename to app/assets/javascripts/discourse/app/components/shared-draft-controls.js
diff --git a/app/assets/javascripts/discourse/components/signup-cta.js b/app/assets/javascripts/discourse/app/components/signup-cta.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/signup-cta.js
rename to app/assets/javascripts/discourse/app/components/signup-cta.js
diff --git a/app/assets/javascripts/discourse/components/site-header.js b/app/assets/javascripts/discourse/app/components/site-header.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/site-header.js
rename to app/assets/javascripts/discourse/app/components/site-header.js
diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js b/app/assets/javascripts/discourse/app/components/suggested-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/suggested-topics.js
rename to app/assets/javascripts/discourse/app/components/suggested-topics.js
diff --git a/app/assets/javascripts/discourse/components/tag-drop-link.js b/app/assets/javascripts/discourse/app/components/tag-drop-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tag-drop-link.js
rename to app/assets/javascripts/discourse/app/components/tag-drop-link.js
diff --git a/app/assets/javascripts/discourse/components/tag-groups-form.js b/app/assets/javascripts/discourse/app/components/tag-groups-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tag-groups-form.js
rename to app/assets/javascripts/discourse/app/components/tag-groups-form.js
diff --git a/app/assets/javascripts/discourse/components/tag-info.js b/app/assets/javascripts/discourse/app/components/tag-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tag-info.js
rename to app/assets/javascripts/discourse/app/components/tag-info.js
diff --git a/app/assets/javascripts/discourse/components/tag-list.js b/app/assets/javascripts/discourse/app/components/tag-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tag-list.js
rename to app/assets/javascripts/discourse/app/components/tag-list.js
diff --git a/app/assets/javascripts/discourse/components/tags-admin-dropdown.js b/app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tags-admin-dropdown.js
rename to app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js
diff --git a/app/assets/javascripts/discourse/components/tap-tile-grid.js b/app/assets/javascripts/discourse/app/components/tap-tile-grid.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tap-tile-grid.js
rename to app/assets/javascripts/discourse/app/components/tap-tile-grid.js
diff --git a/app/assets/javascripts/discourse/components/tap-tile.js b/app/assets/javascripts/discourse/app/components/tap-tile.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/tap-tile.js
rename to app/assets/javascripts/discourse/app/components/tap-tile.js
diff --git a/app/assets/javascripts/discourse/components/text-field.js b/app/assets/javascripts/discourse/app/components/text-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/text-field.js
rename to app/assets/javascripts/discourse/app/components/text-field.js
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js b/app/assets/javascripts/discourse/app/components/text-overflow.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/text-overflow.js
rename to app/assets/javascripts/discourse/app/components/text-overflow.js
diff --git a/app/assets/javascripts/discourse/components/time-input.js b/app/assets/javascripts/discourse/app/components/time-input.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/time-input.js
rename to app/assets/javascripts/discourse/app/components/time-input.js
diff --git a/app/assets/javascripts/discourse/components/top-period-buttons.js b/app/assets/javascripts/discourse/app/components/top-period-buttons.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/top-period-buttons.js
rename to app/assets/javascripts/discourse/app/components/top-period-buttons.js
diff --git a/app/assets/javascripts/discourse/components/topic-admin-menu-button.js b/app/assets/javascripts/discourse/app/components/topic-admin-menu-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-admin-menu-button.js
rename to app/assets/javascripts/discourse/app/components/topic-admin-menu-button.js
diff --git a/app/assets/javascripts/discourse/components/topic-category.js b/app/assets/javascripts/discourse/app/components/topic-category.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-category.js
rename to app/assets/javascripts/discourse/app/components/topic-category.js
diff --git a/app/assets/javascripts/discourse/components/topic-entrance.js b/app/assets/javascripts/discourse/app/components/topic-entrance.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-entrance.js
rename to app/assets/javascripts/discourse/app/components/topic-entrance.js
diff --git a/app/assets/javascripts/discourse/components/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-footer-buttons.js
rename to app/assets/javascripts/discourse/app/components/topic-footer-buttons.js
diff --git a/app/assets/javascripts/discourse/components/topic-join-group-notice.js b/app/assets/javascripts/discourse/app/components/topic-join-group-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-join-group-notice.js
rename to app/assets/javascripts/discourse/app/components/topic-join-group-notice.js
diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js b/app/assets/javascripts/discourse/app/components/topic-list-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-list-item.js
rename to app/assets/javascripts/discourse/app/components/topic-list-item.js
diff --git a/app/assets/javascripts/discourse/components/topic-list.js b/app/assets/javascripts/discourse/app/components/topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-list.js
rename to app/assets/javascripts/discourse/app/components/topic-list.js
diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js b/app/assets/javascripts/discourse/app/components/topic-navigation.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-navigation.js
rename to app/assets/javascripts/discourse/app/components/topic-navigation.js
diff --git a/app/assets/javascripts/discourse/components/topic-post-badges.js b/app/assets/javascripts/discourse/app/components/topic-post-badges.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-post-badges.js
rename to app/assets/javascripts/discourse/app/components/topic-post-badges.js
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js b/app/assets/javascripts/discourse/app/components/topic-progress.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-progress.js
rename to app/assets/javascripts/discourse/app/components/topic-progress.js
diff --git a/app/assets/javascripts/discourse/components/topic-status.js b/app/assets/javascripts/discourse/app/components/topic-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-status.js
rename to app/assets/javascripts/discourse/app/components/topic-status.js
diff --git a/app/assets/javascripts/discourse/components/topic-timeline.js b/app/assets/javascripts/discourse/app/components/topic-timeline.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-timeline.js
rename to app/assets/javascripts/discourse/app/components/topic-timeline.js
diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js b/app/assets/javascripts/discourse/app/components/topic-timer-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-timer-info.js
rename to app/assets/javascripts/discourse/app/components/topic-timer-info.js
diff --git a/app/assets/javascripts/discourse/components/topic-title.js b/app/assets/javascripts/discourse/app/components/topic-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/topic-title.js
rename to app/assets/javascripts/discourse/app/components/topic-title.js
diff --git a/app/assets/javascripts/discourse/components/track-selected.js b/app/assets/javascripts/discourse/app/components/track-selected.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/track-selected.js
rename to app/assets/javascripts/discourse/app/components/track-selected.js
diff --git a/app/assets/javascripts/discourse/components/user-badge.js b/app/assets/javascripts/discourse/app/components/user-badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-badge.js
rename to app/assets/javascripts/discourse/app/components/user-badge.js
diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js b/app/assets/javascripts/discourse/app/components/user-card-contents.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-card-contents.js
rename to app/assets/javascripts/discourse/app/components/user-card-contents.js
diff --git a/app/assets/javascripts/discourse/components/user-field.js b/app/assets/javascripts/discourse/app/components/user-field.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-field.js
rename to app/assets/javascripts/discourse/app/components/user-field.js
diff --git a/app/assets/javascripts/discourse/components/user-flag-percentage.js b/app/assets/javascripts/discourse/app/components/user-flag-percentage.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-flag-percentage.js
rename to app/assets/javascripts/discourse/app/components/user-flag-percentage.js
diff --git a/app/assets/javascripts/discourse/components/user-info.js b/app/assets/javascripts/discourse/app/components/user-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-info.js
rename to app/assets/javascripts/discourse/app/components/user-info.js
diff --git a/app/assets/javascripts/discourse/components/user-link.js b/app/assets/javascripts/discourse/app/components/user-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-link.js
rename to app/assets/javascripts/discourse/app/components/user-link.js
diff --git a/app/assets/javascripts/discourse/components/user-notifications-large.js b/app/assets/javascripts/discourse/app/components/user-notifications-large.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-notifications-large.js
rename to app/assets/javascripts/discourse/app/components/user-notifications-large.js
diff --git a/app/assets/javascripts/discourse/components/user-selector.js b/app/assets/javascripts/discourse/app/components/user-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-selector.js
rename to app/assets/javascripts/discourse/app/components/user-selector.js
diff --git a/app/assets/javascripts/discourse/components/user-stat.js b/app/assets/javascripts/discourse/app/components/user-stat.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-stat.js
rename to app/assets/javascripts/discourse/app/components/user-stat.js
diff --git a/app/assets/javascripts/discourse/components/user-stream-item.js b/app/assets/javascripts/discourse/app/components/user-stream-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-stream-item.js
rename to app/assets/javascripts/discourse/app/components/user-stream-item.js
diff --git a/app/assets/javascripts/discourse/components/user-stream.js b/app/assets/javascripts/discourse/app/components/user-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-stream.js
rename to app/assets/javascripts/discourse/app/components/user-stream.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-category-search.js b/app/assets/javascripts/discourse/app/components/user-summary-category-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-category-search.js
rename to app/assets/javascripts/discourse/app/components/user-summary-category-search.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-section.js b/app/assets/javascripts/discourse/app/components/user-summary-section.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-section.js
rename to app/assets/javascripts/discourse/app/components/user-summary-section.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-topic.js b/app/assets/javascripts/discourse/app/components/user-summary-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-topic.js
rename to app/assets/javascripts/discourse/app/components/user-summary-topic.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-topics-list.js b/app/assets/javascripts/discourse/app/components/user-summary-topics-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-topics-list.js
rename to app/assets/javascripts/discourse/app/components/user-summary-topics-list.js
diff --git a/app/assets/javascripts/discourse/components/user-summary-user.js b/app/assets/javascripts/discourse/app/components/user-summary-user.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/user-summary-user.js
rename to app/assets/javascripts/discourse/app/components/user-summary-user.js
diff --git a/app/assets/javascripts/discourse/components/watch-read.js b/app/assets/javascripts/discourse/app/components/watch-read.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/watch-read.js
rename to app/assets/javascripts/discourse/app/components/watch-read.js
diff --git a/app/assets/javascripts/discourse/controllers/about.js b/app/assets/javascripts/discourse/app/controllers/about.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/about.js
rename to app/assets/javascripts/discourse/app/controllers/about.js
diff --git a/app/assets/javascripts/discourse/controllers/account-created-edit-email.js b/app/assets/javascripts/discourse/app/controllers/account-created-edit-email.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/account-created-edit-email.js
rename to app/assets/javascripts/discourse/app/controllers/account-created-edit-email.js
diff --git a/app/assets/javascripts/discourse/controllers/account-created-index.js b/app/assets/javascripts/discourse/app/controllers/account-created-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/account-created-index.js
rename to app/assets/javascripts/discourse/app/controllers/account-created-index.js
diff --git a/app/assets/javascripts/discourse/controllers/activation-edit.js b/app/assets/javascripts/discourse/app/controllers/activation-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/activation-edit.js
rename to app/assets/javascripts/discourse/app/controllers/activation-edit.js
diff --git a/app/assets/javascripts/discourse/controllers/add-post-notice.js b/app/assets/javascripts/discourse/app/controllers/add-post-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/add-post-notice.js
rename to app/assets/javascripts/discourse/app/controllers/add-post-notice.js
diff --git a/app/assets/javascripts/discourse/controllers/application.js b/app/assets/javascripts/discourse/app/controllers/application.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/application.js
rename to app/assets/javascripts/discourse/app/controllers/application.js
diff --git a/app/assets/javascripts/discourse/controllers/associate-account-confirm.js b/app/assets/javascripts/discourse/app/controllers/associate-account-confirm.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/associate-account-confirm.js
rename to app/assets/javascripts/discourse/app/controllers/associate-account-confirm.js
diff --git a/app/assets/javascripts/discourse/controllers/auth-token.js b/app/assets/javascripts/discourse/app/controllers/auth-token.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/auth-token.js
rename to app/assets/javascripts/discourse/app/controllers/auth-token.js
diff --git a/app/assets/javascripts/discourse/controllers/avatar-selector.js b/app/assets/javascripts/discourse/app/controllers/avatar-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/avatar-selector.js
rename to app/assets/javascripts/discourse/app/controllers/avatar-selector.js
diff --git a/app/assets/javascripts/discourse/controllers/badges/index.js b/app/assets/javascripts/discourse/app/controllers/badges/index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/badges/index.js
rename to app/assets/javascripts/discourse/app/controllers/badges/index.js
diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js b/app/assets/javascripts/discourse/app/controllers/badges/show.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/badges/show.js
rename to app/assets/javascripts/discourse/app/controllers/badges/show.js
diff --git a/app/assets/javascripts/discourse/controllers/basic-modal-body.js b/app/assets/javascripts/discourse/app/controllers/basic-modal-body.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/basic-modal-body.js
rename to app/assets/javascripts/discourse/app/controllers/basic-modal-body.js
diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/app/controllers/bookmark.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/bookmark.js
rename to app/assets/javascripts/discourse/app/controllers/bookmark.js
diff --git a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js b/app/assets/javascripts/discourse/app/controllers/bulk-notification-level.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/bulk-notification-level.js
rename to app/assets/javascripts/discourse/app/controllers/bulk-notification-level.js
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js b/app/assets/javascripts/discourse/app/controllers/change-owner.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/change-owner.js
rename to app/assets/javascripts/discourse/app/controllers/change-owner.js
diff --git a/app/assets/javascripts/discourse/controllers/change-timestamp.js b/app/assets/javascripts/discourse/app/controllers/change-timestamp.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/change-timestamp.js
rename to app/assets/javascripts/discourse/app/controllers/change-timestamp.js
diff --git a/app/assets/javascripts/discourse/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/composer.js
rename to app/assets/javascripts/discourse/app/controllers/composer.js
diff --git a/app/assets/javascripts/discourse/controllers/convert-to-public-topic.js b/app/assets/javascripts/discourse/app/controllers/convert-to-public-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/convert-to-public-topic.js
rename to app/assets/javascripts/discourse/app/controllers/convert-to-public-topic.js
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js b/app/assets/javascripts/discourse/app/controllers/create-account.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/create-account.js
rename to app/assets/javascripts/discourse/app/controllers/create-account.js
diff --git a/app/assets/javascripts/discourse/controllers/discovery-sortable.js b/app/assets/javascripts/discourse/app/controllers/discovery-sortable.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/discovery-sortable.js
rename to app/assets/javascripts/discourse/app/controllers/discovery-sortable.js
diff --git a/app/assets/javascripts/discourse/controllers/discovery.js b/app/assets/javascripts/discourse/app/controllers/discovery.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/discovery.js
rename to app/assets/javascripts/discourse/app/controllers/discovery.js
diff --git a/app/assets/javascripts/discourse/controllers/discovery/categories.js b/app/assets/javascripts/discourse/app/controllers/discovery/categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/discovery/categories.js
rename to app/assets/javascripts/discourse/app/controllers/discovery/categories.js
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/discovery/topics.js
rename to app/assets/javascripts/discourse/app/controllers/discovery/topics.js
diff --git a/app/assets/javascripts/discourse/controllers/edit-category.js b/app/assets/javascripts/discourse/app/controllers/edit-category.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/edit-category.js
rename to app/assets/javascripts/discourse/app/controllers/edit-category.js
diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js b/app/assets/javascripts/discourse/app/controllers/edit-topic-timer.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/edit-topic-timer.js
rename to app/assets/javascripts/discourse/app/controllers/edit-topic-timer.js
diff --git a/app/assets/javascripts/discourse/controllers/email-login.js b/app/assets/javascripts/discourse/app/controllers/email-login.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/email-login.js
rename to app/assets/javascripts/discourse/app/controllers/email-login.js
diff --git a/app/assets/javascripts/discourse/controllers/exception.js b/app/assets/javascripts/discourse/app/controllers/exception.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/exception.js
rename to app/assets/javascripts/discourse/app/controllers/exception.js
diff --git a/app/assets/javascripts/discourse/controllers/explain-reviewable.js b/app/assets/javascripts/discourse/app/controllers/explain-reviewable.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/explain-reviewable.js
rename to app/assets/javascripts/discourse/app/controllers/explain-reviewable.js
diff --git a/app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js b/app/assets/javascripts/discourse/app/controllers/feature-topic-on-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js
rename to app/assets/javascripts/discourse/app/controllers/feature-topic-on-profile.js
diff --git a/app/assets/javascripts/discourse/controllers/feature-topic.js b/app/assets/javascripts/discourse/app/controllers/feature-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/feature-topic.js
rename to app/assets/javascripts/discourse/app/controllers/feature-topic.js
diff --git a/app/assets/javascripts/discourse/controllers/flag.js b/app/assets/javascripts/discourse/app/controllers/flag.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/flag.js
rename to app/assets/javascripts/discourse/app/controllers/flag.js
diff --git a/app/assets/javascripts/discourse/controllers/forgot-password.js b/app/assets/javascripts/discourse/app/controllers/forgot-password.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/forgot-password.js
rename to app/assets/javascripts/discourse/app/controllers/forgot-password.js
diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/full-page-search.js
rename to app/assets/javascripts/discourse/app/controllers/full-page-search.js
diff --git a/app/assets/javascripts/discourse/controllers/grant-badge.js b/app/assets/javascripts/discourse/app/controllers/grant-badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/grant-badge.js
rename to app/assets/javascripts/discourse/app/controllers/grant-badge.js
diff --git a/app/assets/javascripts/discourse/controllers/group-activity-posts.js b/app/assets/javascripts/discourse/app/controllers/group-activity-posts.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-activity-posts.js
rename to app/assets/javascripts/discourse/app/controllers/group-activity-posts.js
diff --git a/app/assets/javascripts/discourse/controllers/group-activity-topics.js b/app/assets/javascripts/discourse/app/controllers/group-activity-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-activity-topics.js
rename to app/assets/javascripts/discourse/app/controllers/group-activity-topics.js
diff --git a/app/assets/javascripts/discourse/controllers/group-activity.js b/app/assets/javascripts/discourse/app/controllers/group-activity.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-activity.js
rename to app/assets/javascripts/discourse/app/controllers/group-activity.js
diff --git a/app/assets/javascripts/discourse/controllers/group-add-members.js b/app/assets/javascripts/discourse/app/controllers/group-add-members.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-add-members.js
rename to app/assets/javascripts/discourse/app/controllers/group-add-members.js
diff --git a/app/assets/javascripts/discourse/controllers/group-bulk-add.js b/app/assets/javascripts/discourse/app/controllers/group-bulk-add.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-bulk-add.js
rename to app/assets/javascripts/discourse/app/controllers/group-bulk-add.js
diff --git a/app/assets/javascripts/discourse/controllers/group-index.js b/app/assets/javascripts/discourse/app/controllers/group-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-index.js
rename to app/assets/javascripts/discourse/app/controllers/group-index.js
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-logs.js b/app/assets/javascripts/discourse/app/controllers/group-manage-logs.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-manage-logs.js
rename to app/assets/javascripts/discourse/app/controllers/group-manage-logs.js
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-profile.js b/app/assets/javascripts/discourse/app/controllers/group-manage-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-manage-profile.js
rename to app/assets/javascripts/discourse/app/controllers/group-manage-profile.js
diff --git a/app/assets/javascripts/discourse/controllers/group-manage.js b/app/assets/javascripts/discourse/app/controllers/group-manage.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-manage.js
rename to app/assets/javascripts/discourse/app/controllers/group-manage.js
diff --git a/app/assets/javascripts/discourse/controllers/group-messages.js b/app/assets/javascripts/discourse/app/controllers/group-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-messages.js
rename to app/assets/javascripts/discourse/app/controllers/group-messages.js
diff --git a/app/assets/javascripts/discourse/controllers/group-requests.js b/app/assets/javascripts/discourse/app/controllers/group-requests.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-requests.js
rename to app/assets/javascripts/discourse/app/controllers/group-requests.js
diff --git a/app/assets/javascripts/discourse/controllers/group.js b/app/assets/javascripts/discourse/app/controllers/group.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group.js
rename to app/assets/javascripts/discourse/app/controllers/group.js
diff --git a/app/assets/javascripts/discourse/controllers/groups-index.js b/app/assets/javascripts/discourse/app/controllers/groups-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/groups-index.js
rename to app/assets/javascripts/discourse/app/controllers/groups-index.js
diff --git a/app/assets/javascripts/discourse/controllers/groups-new.js b/app/assets/javascripts/discourse/app/controllers/groups-new.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/groups-new.js
rename to app/assets/javascripts/discourse/app/controllers/groups-new.js
diff --git a/app/assets/javascripts/discourse/controllers/history.js b/app/assets/javascripts/discourse/app/controllers/history.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/history.js
rename to app/assets/javascripts/discourse/app/controllers/history.js
diff --git a/app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js b/app/assets/javascripts/discourse/app/controllers/ignore-duration-with-username.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/ignore-duration-with-username.js
rename to app/assets/javascripts/discourse/app/controllers/ignore-duration-with-username.js
diff --git a/app/assets/javascripts/discourse/controllers/ignore-duration.js b/app/assets/javascripts/discourse/app/controllers/ignore-duration.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/ignore-duration.js
rename to app/assets/javascripts/discourse/app/controllers/ignore-duration.js
diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js b/app/assets/javascripts/discourse/app/controllers/insert-hyperlink.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/insert-hyperlink.js
rename to app/assets/javascripts/discourse/app/controllers/insert-hyperlink.js
diff --git a/app/assets/javascripts/discourse/controllers/invites-show.js b/app/assets/javascripts/discourse/app/controllers/invites-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/invites-show.js
rename to app/assets/javascripts/discourse/app/controllers/invites-show.js
diff --git a/app/assets/javascripts/discourse/controllers/jump-to-post.js b/app/assets/javascripts/discourse/app/controllers/jump-to-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/jump-to-post.js
rename to app/assets/javascripts/discourse/app/controllers/jump-to-post.js
diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
rename to app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js
diff --git a/app/assets/javascripts/discourse/controllers/login.js b/app/assets/javascripts/discourse/app/controllers/login.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/login.js
rename to app/assets/javascripts/discourse/app/controllers/login.js
diff --git a/app/assets/javascripts/discourse/controllers/modal.js b/app/assets/javascripts/discourse/app/controllers/modal.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/modal.js
rename to app/assets/javascripts/discourse/app/controllers/modal.js
diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js b/app/assets/javascripts/discourse/app/controllers/move-to-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/move-to-topic.js
rename to app/assets/javascripts/discourse/app/controllers/move-to-topic.js
diff --git a/app/assets/javascripts/discourse/controllers/navigation/categories.js b/app/assets/javascripts/discourse/app/controllers/navigation/categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/navigation/categories.js
rename to app/assets/javascripts/discourse/app/controllers/navigation/categories.js
diff --git a/app/assets/javascripts/discourse/controllers/navigation/category.js b/app/assets/javascripts/discourse/app/controllers/navigation/category.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/navigation/category.js
rename to app/assets/javascripts/discourse/app/controllers/navigation/category.js
diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js b/app/assets/javascripts/discourse/app/controllers/navigation/default.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/navigation/default.js
rename to app/assets/javascripts/discourse/app/controllers/navigation/default.js
diff --git a/app/assets/javascripts/discourse/controllers/not-activated.js b/app/assets/javascripts/discourse/app/controllers/not-activated.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/not-activated.js
rename to app/assets/javascripts/discourse/app/controllers/not-activated.js
diff --git a/app/assets/javascripts/discourse/controllers/password-reset.js b/app/assets/javascripts/discourse/app/controllers/password-reset.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/password-reset.js
rename to app/assets/javascripts/discourse/app/controllers/password-reset.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences.js b/app/assets/javascripts/discourse/app/controllers/preferences.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences.js
rename to app/assets/javascripts/discourse/app/controllers/preferences.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/account.js
rename to app/assets/javascripts/discourse/app/controllers/preferences/account.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/categories.js b/app/assets/javascripts/discourse/app/controllers/preferences/categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/categories.js
rename to app/assets/javascripts/discourse/app/controllers/preferences/categories.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/email.js b/app/assets/javascripts/discourse/app/controllers/preferences/email.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/email.js
rename to app/assets/javascripts/discourse/app/controllers/preferences/email.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/emails.js b/app/assets/javascripts/discourse/app/controllers/preferences/emails.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/emails.js
rename to app/assets/javascripts/discourse/app/controllers/preferences/emails.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/interface.js
rename to app/assets/javascripts/discourse/app/controllers/preferences/interface.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/notifications.js b/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/notifications.js
rename to app/assets/javascripts/discourse/app/controllers/preferences/notifications.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js b/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/profile.js
rename to app/assets/javascripts/discourse/app/controllers/preferences/profile.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/second-factor.js b/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/second-factor.js
rename to app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/tags.js b/app/assets/javascripts/discourse/app/controllers/preferences/tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/tags.js
rename to app/assets/javascripts/discourse/app/controllers/preferences/tags.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/username.js b/app/assets/javascripts/discourse/app/controllers/preferences/username.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/username.js
rename to app/assets/javascripts/discourse/app/controllers/preferences/username.js
diff --git a/app/assets/javascripts/discourse/controllers/preferences/users.js b/app/assets/javascripts/discourse/app/controllers/preferences/users.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/preferences/users.js
rename to app/assets/javascripts/discourse/app/controllers/preferences/users.js
diff --git a/app/assets/javascripts/discourse/controllers/publish-page.js b/app/assets/javascripts/discourse/app/controllers/publish-page.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/publish-page.js
rename to app/assets/javascripts/discourse/app/controllers/publish-page.js
diff --git a/app/assets/javascripts/discourse/controllers/raw-email.js b/app/assets/javascripts/discourse/app/controllers/raw-email.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/raw-email.js
rename to app/assets/javascripts/discourse/app/controllers/raw-email.js
diff --git a/app/assets/javascripts/discourse/controllers/rename-tag.js b/app/assets/javascripts/discourse/app/controllers/rename-tag.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/rename-tag.js
rename to app/assets/javascripts/discourse/app/controllers/rename-tag.js
diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js b/app/assets/javascripts/discourse/app/controllers/reorder-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/reorder-categories.js
rename to app/assets/javascripts/discourse/app/controllers/reorder-categories.js
diff --git a/app/assets/javascripts/discourse/controllers/request-group-membership-form.js b/app/assets/javascripts/discourse/app/controllers/request-group-membership-form.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/request-group-membership-form.js
rename to app/assets/javascripts/discourse/app/controllers/request-group-membership-form.js
diff --git a/app/assets/javascripts/discourse/controllers/review-index.js b/app/assets/javascripts/discourse/app/controllers/review-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/review-index.js
rename to app/assets/javascripts/discourse/app/controllers/review-index.js
diff --git a/app/assets/javascripts/discourse/controllers/review-settings.js b/app/assets/javascripts/discourse/app/controllers/review-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/review-settings.js
rename to app/assets/javascripts/discourse/app/controllers/review-settings.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js b/app/assets/javascripts/discourse/app/controllers/second-factor-add-security-key.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-add-security-key.js
rename to app/assets/javascripts/discourse/app/controllers/second-factor-add-security-key.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-add-totp.js b/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-add-totp.js
rename to app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js b/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-backup-edit.js
rename to app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-edit-security-key.js b/app/assets/javascripts/discourse/app/controllers/second-factor-edit-security-key.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-edit-security-key.js
rename to app/assets/javascripts/discourse/app/controllers/second-factor-edit-security-key.js
diff --git a/app/assets/javascripts/discourse/controllers/second-factor-edit.js b/app/assets/javascripts/discourse/app/controllers/second-factor-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/second-factor-edit.js
rename to app/assets/javascripts/discourse/app/controllers/second-factor-edit.js
diff --git a/app/assets/javascripts/discourse/controllers/share-and-invite.js b/app/assets/javascripts/discourse/app/controllers/share-and-invite.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/share-and-invite.js
rename to app/assets/javascripts/discourse/app/controllers/share-and-invite.js
diff --git a/app/assets/javascripts/discourse/controllers/static.js b/app/assets/javascripts/discourse/app/controllers/static.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/static.js
rename to app/assets/javascripts/discourse/app/controllers/static.js
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-edit.js b/app/assets/javascripts/discourse/app/controllers/tag-groups-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tag-groups-edit.js
rename to app/assets/javascripts/discourse/app/controllers/tag-groups-edit.js
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-new.js b/app/assets/javascripts/discourse/app/controllers/tag-groups-new.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tag-groups-new.js
rename to app/assets/javascripts/discourse/app/controllers/tag-groups-new.js
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups.js b/app/assets/javascripts/discourse/app/controllers/tag-groups.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tag-groups.js
rename to app/assets/javascripts/discourse/app/controllers/tag-groups.js
diff --git a/app/assets/javascripts/discourse/controllers/tags-index.js b/app/assets/javascripts/discourse/app/controllers/tags-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tags-index.js
rename to app/assets/javascripts/discourse/app/controllers/tags-index.js
diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js b/app/assets/javascripts/discourse/app/controllers/tags-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/tags-show.js
rename to app/assets/javascripts/discourse/app/controllers/tags-show.js
diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/topic-bulk-actions.js
rename to app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
diff --git a/app/assets/javascripts/discourse/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/topic.js
rename to app/assets/javascripts/discourse/app/controllers/topic.js
diff --git a/app/assets/javascripts/discourse/controllers/upload-selector.js b/app/assets/javascripts/discourse/app/controllers/upload-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/upload-selector.js
rename to app/assets/javascripts/discourse/app/controllers/upload-selector.js
diff --git a/app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks-with-reminders.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-activity-bookmarks-with-reminders.js
rename to app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks-with-reminders.js
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js b/app/assets/javascripts/discourse/app/controllers/user-activity.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-activity.js
rename to app/assets/javascripts/discourse/app/controllers/user-activity.js
diff --git a/app/assets/javascripts/discourse/controllers/user-badges.js b/app/assets/javascripts/discourse/app/controllers/user-badges.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-badges.js
rename to app/assets/javascripts/discourse/app/controllers/user-badges.js
diff --git a/app/assets/javascripts/discourse/controllers/user-card.js b/app/assets/javascripts/discourse/app/controllers/user-card.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-card.js
rename to app/assets/javascripts/discourse/app/controllers/user-card.js
diff --git a/app/assets/javascripts/discourse/controllers/user-invited-show.js b/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-invited-show.js
rename to app/assets/javascripts/discourse/app/controllers/user-invited-show.js
diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js b/app/assets/javascripts/discourse/app/controllers/user-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-notifications.js
rename to app/assets/javascripts/discourse/app/controllers/user-notifications.js
diff --git a/app/assets/javascripts/discourse/controllers/user-posts.js b/app/assets/javascripts/discourse/app/controllers/user-posts.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-posts.js
rename to app/assets/javascripts/discourse/app/controllers/user-posts.js
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js b/app/assets/javascripts/discourse/app/controllers/user-private-messages-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-private-messages-tags.js
rename to app/assets/javascripts/discourse/app/controllers/user-private-messages-tags.js
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages.js b/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-private-messages.js
rename to app/assets/javascripts/discourse/app/controllers/user-private-messages.js
diff --git a/app/assets/javascripts/discourse/controllers/user-summary.js b/app/assets/javascripts/discourse/app/controllers/user-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-summary.js
rename to app/assets/javascripts/discourse/app/controllers/user-summary.js
diff --git a/app/assets/javascripts/discourse/controllers/user-topics-list.js b/app/assets/javascripts/discourse/app/controllers/user-topics-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user-topics-list.js
rename to app/assets/javascripts/discourse/app/controllers/user-topics-list.js
diff --git a/app/assets/javascripts/discourse/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/user.js
rename to app/assets/javascripts/discourse/app/controllers/user.js
diff --git a/app/assets/javascripts/discourse/controllers/users.js b/app/assets/javascripts/discourse/app/controllers/users.js
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/users.js
rename to app/assets/javascripts/discourse/app/controllers/users.js
diff --git a/app/assets/javascripts/discourse/helpers/application.js b/app/assets/javascripts/discourse/app/helpers/application.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/application.js
rename to app/assets/javascripts/discourse/app/helpers/application.js
diff --git a/app/assets/javascripts/discourse/helpers/border-color.js b/app/assets/javascripts/discourse/app/helpers/border-color.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/border-color.js
rename to app/assets/javascripts/discourse/app/helpers/border-color.js
diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar-template.js b/app/assets/javascripts/discourse/app/helpers/bound-avatar-template.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/bound-avatar-template.js
rename to app/assets/javascripts/discourse/app/helpers/bound-avatar-template.js
diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar.js b/app/assets/javascripts/discourse/app/helpers/bound-avatar.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/bound-avatar.js
rename to app/assets/javascripts/discourse/app/helpers/bound-avatar.js
diff --git a/app/assets/javascripts/discourse/helpers/bound-category-link.js b/app/assets/javascripts/discourse/app/helpers/bound-category-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/bound-category-link.js
rename to app/assets/javascripts/discourse/app/helpers/bound-category-link.js
diff --git a/app/assets/javascripts/discourse/helpers/bound-date.js b/app/assets/javascripts/discourse/app/helpers/bound-date.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/bound-date.js
rename to app/assets/javascripts/discourse/app/helpers/bound-date.js
diff --git a/app/assets/javascripts/discourse/helpers/capitalize-string.js b/app/assets/javascripts/discourse/app/helpers/capitalize-string.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/capitalize-string.js
rename to app/assets/javascripts/discourse/app/helpers/capitalize-string.js
diff --git a/app/assets/javascripts/discourse/helpers/category-badge.js b/app/assets/javascripts/discourse/app/helpers/category-badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/category-badge.js
rename to app/assets/javascripts/discourse/app/helpers/category-badge.js
diff --git a/app/assets/javascripts/discourse/helpers/category-link.js b/app/assets/javascripts/discourse/app/helpers/category-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/category-link.js
rename to app/assets/javascripts/discourse/app/helpers/category-link.js
diff --git a/app/assets/javascripts/discourse/helpers/cold-age-class.js b/app/assets/javascripts/discourse/app/helpers/cold-age-class.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/cold-age-class.js
rename to app/assets/javascripts/discourse/app/helpers/cold-age-class.js
diff --git a/app/assets/javascripts/discourse/helpers/custom-html.js b/app/assets/javascripts/discourse/app/helpers/custom-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/custom-html.js
rename to app/assets/javascripts/discourse/app/helpers/custom-html.js
diff --git a/app/assets/javascripts/discourse/helpers/dash-if-empty.js b/app/assets/javascripts/discourse/app/helpers/dash-if-empty.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/dash-if-empty.js
rename to app/assets/javascripts/discourse/app/helpers/dash-if-empty.js
diff --git a/app/assets/javascripts/discourse/helpers/dasherize.js b/app/assets/javascripts/discourse/app/helpers/dasherize.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/dasherize.js
rename to app/assets/javascripts/discourse/app/helpers/dasherize.js
diff --git a/app/assets/javascripts/discourse/helpers/dir-span.js b/app/assets/javascripts/discourse/app/helpers/dir-span.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/dir-span.js
rename to app/assets/javascripts/discourse/app/helpers/dir-span.js
diff --git a/app/assets/javascripts/discourse/helpers/discourse-tag.js b/app/assets/javascripts/discourse/app/helpers/discourse-tag.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/discourse-tag.js
rename to app/assets/javascripts/discourse/app/helpers/discourse-tag.js
diff --git a/app/assets/javascripts/discourse/helpers/discourse-tags.js b/app/assets/javascripts/discourse/app/helpers/discourse-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/discourse-tags.js
rename to app/assets/javascripts/discourse/app/helpers/discourse-tags.js
diff --git a/app/assets/javascripts/discourse/helpers/editable-value.js b/app/assets/javascripts/discourse/app/helpers/editable-value.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/editable-value.js
rename to app/assets/javascripts/discourse/app/helpers/editable-value.js
diff --git a/app/assets/javascripts/discourse/helpers/fa-icon-node.js b/app/assets/javascripts/discourse/app/helpers/fa-icon-node.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/fa-icon-node.js
rename to app/assets/javascripts/discourse/app/helpers/fa-icon-node.js
diff --git a/app/assets/javascripts/discourse/helpers/float.js b/app/assets/javascripts/discourse/app/helpers/float.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/float.js
rename to app/assets/javascripts/discourse/app/helpers/float.js
diff --git a/app/assets/javascripts/discourse/helpers/format-age.js b/app/assets/javascripts/discourse/app/helpers/format-age.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/format-age.js
rename to app/assets/javascripts/discourse/app/helpers/format-age.js
diff --git a/app/assets/javascripts/discourse/helpers/format-date.js b/app/assets/javascripts/discourse/app/helpers/format-date.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/format-date.js
rename to app/assets/javascripts/discourse/app/helpers/format-date.js
diff --git a/app/assets/javascripts/discourse/helpers/format-username.js b/app/assets/javascripts/discourse/app/helpers/format-username.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/format-username.js
rename to app/assets/javascripts/discourse/app/helpers/format-username.js
diff --git a/app/assets/javascripts/discourse/helpers/icon-or-image.js b/app/assets/javascripts/discourse/app/helpers/icon-or-image.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/icon-or-image.js
rename to app/assets/javascripts/discourse/app/helpers/icon-or-image.js
diff --git a/app/assets/javascripts/discourse/helpers/inline-date.js b/app/assets/javascripts/discourse/app/helpers/inline-date.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/inline-date.js
rename to app/assets/javascripts/discourse/app/helpers/inline-date.js
diff --git a/app/assets/javascripts/discourse/helpers/loading-spinner.js b/app/assets/javascripts/discourse/app/helpers/loading-spinner.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/loading-spinner.js
rename to app/assets/javascripts/discourse/app/helpers/loading-spinner.js
diff --git a/app/assets/javascripts/discourse/helpers/node.js b/app/assets/javascripts/discourse/app/helpers/node.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/node.js
rename to app/assets/javascripts/discourse/app/helpers/node.js
diff --git a/app/assets/javascripts/discourse/helpers/period-title.js b/app/assets/javascripts/discourse/app/helpers/period-title.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/period-title.js
rename to app/assets/javascripts/discourse/app/helpers/period-title.js
diff --git a/app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js b/app/assets/javascripts/discourse/app/helpers/raw-plugin-outlet.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js
rename to app/assets/javascripts/discourse/app/helpers/raw-plugin-outlet.js
diff --git a/app/assets/javascripts/discourse/helpers/raw.js b/app/assets/javascripts/discourse/app/helpers/raw.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/raw.js
rename to app/assets/javascripts/discourse/app/helpers/raw.js
diff --git a/app/assets/javascripts/discourse/helpers/replace-emoji.js b/app/assets/javascripts/discourse/app/helpers/replace-emoji.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/replace-emoji.js
rename to app/assets/javascripts/discourse/app/helpers/replace-emoji.js
diff --git a/app/assets/javascripts/discourse/helpers/reviewable-history-description.js b/app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/reviewable-history-description.js
rename to app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js
diff --git a/app/assets/javascripts/discourse/helpers/reviewable-status.js b/app/assets/javascripts/discourse/app/helpers/reviewable-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/reviewable-status.js
rename to app/assets/javascripts/discourse/app/helpers/reviewable-status.js
diff --git a/app/assets/javascripts/discourse/helpers/route-action.js b/app/assets/javascripts/discourse/app/helpers/route-action.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/route-action.js
rename to app/assets/javascripts/discourse/app/helpers/route-action.js
diff --git a/app/assets/javascripts/discourse/helpers/shorten-url.js b/app/assets/javascripts/discourse/app/helpers/shorten-url.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/shorten-url.js
rename to app/assets/javascripts/discourse/app/helpers/shorten-url.js
diff --git a/app/assets/javascripts/discourse/helpers/theme-helpers.js b/app/assets/javascripts/discourse/app/helpers/theme-helpers.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/theme-helpers.js
rename to app/assets/javascripts/discourse/app/helpers/theme-helpers.js
diff --git a/app/assets/javascripts/discourse/helpers/topic-featured-link.js b/app/assets/javascripts/discourse/app/helpers/topic-featured-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/topic-featured-link.js
rename to app/assets/javascripts/discourse/app/helpers/topic-featured-link.js
diff --git a/app/assets/javascripts/discourse/helpers/topic-link.js b/app/assets/javascripts/discourse/app/helpers/topic-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/topic-link.js
rename to app/assets/javascripts/discourse/app/helpers/topic-link.js
diff --git a/app/assets/javascripts/discourse/helpers/topic-status-icons.js b/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/topic-status-icons.js
rename to app/assets/javascripts/discourse/app/helpers/topic-status-icons.js
diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js b/app/assets/javascripts/discourse/app/helpers/user-avatar.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/user-avatar.js
rename to app/assets/javascripts/discourse/app/helpers/user-avatar.js
diff --git a/app/assets/javascripts/discourse/helpers/user-status.js b/app/assets/javascripts/discourse/app/helpers/user-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/user-status.js
rename to app/assets/javascripts/discourse/app/helpers/user-status.js
diff --git a/app/assets/javascripts/discourse/initializers/asset-version.js b/app/assets/javascripts/discourse/app/initializers/asset-version.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/asset-version.js
rename to app/assets/javascripts/discourse/app/initializers/asset-version.js
diff --git a/app/assets/javascripts/discourse/initializers/auth-complete.js b/app/assets/javascripts/discourse/app/initializers/auth-complete.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/auth-complete.js
rename to app/assets/javascripts/discourse/app/initializers/auth-complete.js
diff --git a/app/assets/javascripts/discourse/initializers/auto-load-modules.js b/app/assets/javascripts/discourse/app/initializers/auto-load-modules.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/auto-load-modules.js
rename to app/assets/javascripts/discourse/app/initializers/auto-load-modules.js
diff --git a/app/assets/javascripts/discourse/initializers/avatar-select.js b/app/assets/javascripts/discourse/app/initializers/avatar-select.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/avatar-select.js
rename to app/assets/javascripts/discourse/app/initializers/avatar-select.js
diff --git a/app/assets/javascripts/discourse/initializers/badging.js b/app/assets/javascripts/discourse/app/initializers/badging.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/badging.js
rename to app/assets/javascripts/discourse/app/initializers/badging.js
diff --git a/app/assets/javascripts/discourse/initializers/banner.js b/app/assets/javascripts/discourse/app/initializers/banner.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/banner.js
rename to app/assets/javascripts/discourse/app/initializers/banner.js
diff --git a/app/assets/javascripts/discourse/initializers/click-interceptor.js b/app/assets/javascripts/discourse/app/initializers/click-interceptor.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/click-interceptor.js
rename to app/assets/javascripts/discourse/app/initializers/click-interceptor.js
diff --git a/app/assets/javascripts/discourse/initializers/copy-codeblocks.js b/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/copy-codeblocks.js
rename to app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
diff --git a/app/assets/javascripts/discourse/initializers/csrf-token.js b/app/assets/javascripts/discourse/app/initializers/csrf-token.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/csrf-token.js
rename to app/assets/javascripts/discourse/app/initializers/csrf-token.js
diff --git a/app/assets/javascripts/discourse/initializers/d-popover.js b/app/assets/javascripts/discourse/app/initializers/d-popover.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/d-popover.js
rename to app/assets/javascripts/discourse/app/initializers/d-popover.js
diff --git a/app/assets/javascripts/discourse/initializers/ember-events.js b/app/assets/javascripts/discourse/app/initializers/ember-events.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/ember-events.js
rename to app/assets/javascripts/discourse/app/initializers/ember-events.js
diff --git a/app/assets/javascripts/discourse/initializers/enable-emoji.js b/app/assets/javascripts/discourse/app/initializers/enable-emoji.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/enable-emoji.js
rename to app/assets/javascripts/discourse/app/initializers/enable-emoji.js
diff --git a/app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js b/app/assets/javascripts/discourse/app/initializers/ensure-max-image-dimensions.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js
rename to app/assets/javascripts/discourse/app/initializers/ensure-max-image-dimensions.js
diff --git a/app/assets/javascripts/discourse/initializers/inject-objects.js b/app/assets/javascripts/discourse/app/initializers/inject-objects.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/inject-objects.js
rename to app/assets/javascripts/discourse/app/initializers/inject-objects.js
diff --git a/app/assets/javascripts/discourse/initializers/jquery-plugins.js b/app/assets/javascripts/discourse/app/initializers/jquery-plugins.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/jquery-plugins.js
rename to app/assets/javascripts/discourse/app/initializers/jquery-plugins.js
diff --git a/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/initializers/keyboard-shortcuts.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js
rename to app/assets/javascripts/discourse/app/initializers/keyboard-shortcuts.js
diff --git a/app/assets/javascripts/discourse/initializers/live-development.js b/app/assets/javascripts/discourse/app/initializers/live-development.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/live-development.js
rename to app/assets/javascripts/discourse/app/initializers/live-development.js
diff --git a/app/assets/javascripts/discourse/initializers/localization.js b/app/assets/javascripts/discourse/app/initializers/localization.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/localization.js
rename to app/assets/javascripts/discourse/app/initializers/localization.js
diff --git a/app/assets/javascripts/discourse/initializers/logout.js b/app/assets/javascripts/discourse/app/initializers/logout.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/logout.js
rename to app/assets/javascripts/discourse/app/initializers/logout.js
diff --git a/app/assets/javascripts/discourse/initializers/logs-notice.js b/app/assets/javascripts/discourse/app/initializers/logs-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/logs-notice.js
rename to app/assets/javascripts/discourse/app/initializers/logs-notice.js
diff --git a/app/assets/javascripts/discourse/initializers/message-bus.js b/app/assets/javascripts/discourse/app/initializers/message-bus.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/message-bus.js
rename to app/assets/javascripts/discourse/app/initializers/message-bus.js
diff --git a/app/assets/javascripts/discourse/initializers/mobile.js b/app/assets/javascripts/discourse/app/initializers/mobile.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/mobile.js
rename to app/assets/javascripts/discourse/app/initializers/mobile.js
diff --git a/app/assets/javascripts/discourse/initializers/page-tracking.js b/app/assets/javascripts/discourse/app/initializers/page-tracking.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/page-tracking.js
rename to app/assets/javascripts/discourse/app/initializers/page-tracking.js
diff --git a/app/assets/javascripts/discourse/initializers/post-decorations.js b/app/assets/javascripts/discourse/app/initializers/post-decorations.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/post-decorations.js
rename to app/assets/javascripts/discourse/app/initializers/post-decorations.js
diff --git a/app/assets/javascripts/discourse/initializers/read-only.js b/app/assets/javascripts/discourse/app/initializers/read-only.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/read-only.js
rename to app/assets/javascripts/discourse/app/initializers/read-only.js
diff --git a/app/assets/javascripts/discourse/initializers/register-discourse-location.js b/app/assets/javascripts/discourse/app/initializers/register-discourse-location.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/register-discourse-location.js
rename to app/assets/javascripts/discourse/app/initializers/register-discourse-location.js
diff --git a/app/assets/javascripts/discourse/initializers/register-service-worker.js b/app/assets/javascripts/discourse/app/initializers/register-service-worker.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/register-service-worker.js
rename to app/assets/javascripts/discourse/app/initializers/register-service-worker.js
diff --git a/app/assets/javascripts/discourse/initializers/relative-ages.js b/app/assets/javascripts/discourse/app/initializers/relative-ages.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/relative-ages.js
rename to app/assets/javascripts/discourse/app/initializers/relative-ages.js
diff --git a/app/assets/javascripts/discourse/initializers/sharing-sources.js b/app/assets/javascripts/discourse/app/initializers/sharing-sources.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/sharing-sources.js
rename to app/assets/javascripts/discourse/app/initializers/sharing-sources.js
diff --git a/app/assets/javascripts/discourse/initializers/show-footer.js b/app/assets/javascripts/discourse/app/initializers/show-footer.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/show-footer.js
rename to app/assets/javascripts/discourse/app/initializers/show-footer.js
diff --git a/app/assets/javascripts/discourse/initializers/signup-cta.js b/app/assets/javascripts/discourse/app/initializers/signup-cta.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/signup-cta.js
rename to app/assets/javascripts/discourse/app/initializers/signup-cta.js
diff --git a/app/assets/javascripts/discourse/initializers/strip-mobile-app-url-params.js b/app/assets/javascripts/discourse/app/initializers/strip-mobile-app-url-params.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/strip-mobile-app-url-params.js
rename to app/assets/javascripts/discourse/app/initializers/strip-mobile-app-url-params.js
diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js b/app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js
rename to app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js
diff --git a/app/assets/javascripts/discourse/initializers/title-notifications.js b/app/assets/javascripts/discourse/app/initializers/title-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/title-notifications.js
rename to app/assets/javascripts/discourse/app/initializers/title-notifications.js
diff --git a/app/assets/javascripts/discourse/initializers/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/topic-footer-buttons.js
rename to app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
diff --git a/app/assets/javascripts/discourse/initializers/url-redirects.js b/app/assets/javascripts/discourse/app/initializers/url-redirects.js
similarity index 100%
rename from app/assets/javascripts/discourse/initializers/url-redirects.js
rename to app/assets/javascripts/discourse/app/initializers/url-redirects.js
diff --git a/app/assets/javascripts/discourse/lib/after-transition.js b/app/assets/javascripts/discourse/app/lib/after-transition.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/after-transition.js
rename to app/assets/javascripts/discourse/app/lib/after-transition.js
diff --git a/app/assets/javascripts/discourse/lib/ajax-error.js b/app/assets/javascripts/discourse/app/lib/ajax-error.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/ajax-error.js
rename to app/assets/javascripts/discourse/app/lib/ajax-error.js
diff --git a/app/assets/javascripts/discourse/lib/ajax.js b/app/assets/javascripts/discourse/app/lib/ajax.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/ajax.js
rename to app/assets/javascripts/discourse/app/lib/ajax.js
diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js b/app/assets/javascripts/discourse/app/lib/autocomplete.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/autocomplete.js
rename to app/assets/javascripts/discourse/app/lib/autocomplete.js
diff --git a/app/assets/javascripts/discourse/lib/autosize.js b/app/assets/javascripts/discourse/app/lib/autosize.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/autosize.js
rename to app/assets/javascripts/discourse/app/lib/autosize.js
diff --git a/app/assets/javascripts/discourse/lib/bookmark.js b/app/assets/javascripts/discourse/app/lib/bookmark.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/bookmark.js
rename to app/assets/javascripts/discourse/app/lib/bookmark.js
diff --git a/app/assets/javascripts/discourse/lib/cached-topic-list.js b/app/assets/javascripts/discourse/app/lib/cached-topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/cached-topic-list.js
rename to app/assets/javascripts/discourse/app/lib/cached-topic-list.js
diff --git a/app/assets/javascripts/discourse/lib/category-hashtags.js b/app/assets/javascripts/discourse/app/lib/category-hashtags.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/category-hashtags.js
rename to app/assets/javascripts/discourse/app/lib/category-hashtags.js
diff --git a/app/assets/javascripts/discourse/lib/category-tag-search.js b/app/assets/javascripts/discourse/app/lib/category-tag-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/category-tag-search.js
rename to app/assets/javascripts/discourse/app/lib/category-tag-search.js
diff --git a/app/assets/javascripts/discourse/lib/clean-dom.js b/app/assets/javascripts/discourse/app/lib/clean-dom.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/clean-dom.js
rename to app/assets/javascripts/discourse/app/lib/clean-dom.js
diff --git a/app/assets/javascripts/discourse/lib/click-track.js b/app/assets/javascripts/discourse/app/lib/click-track.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/click-track.js
rename to app/assets/javascripts/discourse/app/lib/click-track.js
diff --git a/app/assets/javascripts/discourse/lib/computed.js b/app/assets/javascripts/discourse/app/lib/computed.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/computed.js
rename to app/assets/javascripts/discourse/app/lib/computed.js
diff --git a/app/assets/javascripts/discourse/lib/concerns/search-constants.js.erb b/app/assets/javascripts/discourse/app/lib/concerns/search-constants.js.erb
similarity index 100%
rename from app/assets/javascripts/discourse/lib/concerns/search-constants.js.erb
rename to app/assets/javascripts/discourse/app/lib/concerns/search-constants.js.erb
diff --git a/app/assets/javascripts/discourse/lib/copy-text.js b/app/assets/javascripts/discourse/app/lib/copy-text.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/copy-text.js
rename to app/assets/javascripts/discourse/app/lib/copy-text.js
diff --git a/app/assets/javascripts/discourse/lib/d-popover.js b/app/assets/javascripts/discourse/app/lib/d-popover.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/d-popover.js
rename to app/assets/javascripts/discourse/app/lib/d-popover.js
diff --git a/app/assets/javascripts/discourse/lib/debounce.js b/app/assets/javascripts/discourse/app/lib/debounce.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/debounce.js
rename to app/assets/javascripts/discourse/app/lib/debounce.js
diff --git a/app/assets/javascripts/discourse/lib/decimal-adjust.js b/app/assets/javascripts/discourse/app/lib/decimal-adjust.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/decimal-adjust.js
rename to app/assets/javascripts/discourse/app/lib/decimal-adjust.js
diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js b/app/assets/javascripts/discourse/app/lib/desktop-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/desktop-notifications.js
rename to app/assets/javascripts/discourse/app/lib/desktop-notifications.js
diff --git a/app/assets/javascripts/discourse/lib/dirty-keys.js b/app/assets/javascripts/discourse/app/lib/dirty-keys.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/dirty-keys.js
rename to app/assets/javascripts/discourse/app/lib/dirty-keys.js
diff --git a/app/assets/javascripts/discourse/lib/discourse-location.js b/app/assets/javascripts/discourse/app/lib/discourse-location.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/discourse-location.js
rename to app/assets/javascripts/discourse/app/lib/discourse-location.js
diff --git a/app/assets/javascripts/discourse/lib/export-csv.js b/app/assets/javascripts/discourse/app/lib/export-csv.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/export-csv.js
rename to app/assets/javascripts/discourse/app/lib/export-csv.js
diff --git a/app/assets/javascripts/discourse/lib/export-result.js b/app/assets/javascripts/discourse/app/lib/export-result.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/export-result.js
rename to app/assets/javascripts/discourse/app/lib/export-result.js
diff --git a/app/assets/javascripts/discourse/lib/eyeline.js b/app/assets/javascripts/discourse/app/lib/eyeline.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/eyeline.js
rename to app/assets/javascripts/discourse/app/lib/eyeline.js
diff --git a/app/assets/javascripts/discourse/lib/formatter.js b/app/assets/javascripts/discourse/app/lib/formatter.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/formatter.js
rename to app/assets/javascripts/discourse/app/lib/formatter.js
diff --git a/app/assets/javascripts/discourse/lib/hash.js b/app/assets/javascripts/discourse/app/lib/hash.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/hash.js
rename to app/assets/javascripts/discourse/app/lib/hash.js
diff --git a/app/assets/javascripts/discourse/lib/highlight-html.js b/app/assets/javascripts/discourse/app/lib/highlight-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/highlight-html.js
rename to app/assets/javascripts/discourse/app/lib/highlight-html.js
diff --git a/app/assets/javascripts/discourse/lib/highlight-search.js b/app/assets/javascripts/discourse/app/lib/highlight-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/highlight-search.js
rename to app/assets/javascripts/discourse/app/lib/highlight-search.js
diff --git a/app/assets/javascripts/discourse/lib/highlight-syntax.js b/app/assets/javascripts/discourse/app/lib/highlight-syntax.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/highlight-syntax.js
rename to app/assets/javascripts/discourse/app/lib/highlight-syntax.js
diff --git a/app/assets/javascripts/discourse/lib/intercept-click.js b/app/assets/javascripts/discourse/app/lib/intercept-click.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/intercept-click.js
rename to app/assets/javascripts/discourse/app/lib/intercept-click.js
diff --git a/app/assets/javascripts/discourse/lib/is-element-in-viewport.js b/app/assets/javascripts/discourse/app/lib/is-element-in-viewport.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/is-element-in-viewport.js
rename to app/assets/javascripts/discourse/app/lib/is-element-in-viewport.js
diff --git a/app/assets/javascripts/discourse/lib/key-value-store.js b/app/assets/javascripts/discourse/app/lib/key-value-store.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/key-value-store.js
rename to app/assets/javascripts/discourse/app/lib/key-value-store.js
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/keyboard-shortcuts.js
rename to app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
diff --git a/app/assets/javascripts/discourse/lib/lazy-load-images.js b/app/assets/javascripts/discourse/app/lib/lazy-load-images.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/lazy-load-images.js
rename to app/assets/javascripts/discourse/app/lib/lazy-load-images.js
diff --git a/app/assets/javascripts/discourse/lib/lightbox.js b/app/assets/javascripts/discourse/app/lib/lightbox.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/lightbox.js
rename to app/assets/javascripts/discourse/app/lib/lightbox.js
diff --git a/app/assets/javascripts/discourse/lib/link-category-hashtags.js b/app/assets/javascripts/discourse/app/lib/link-category-hashtags.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/link-category-hashtags.js
rename to app/assets/javascripts/discourse/app/lib/link-category-hashtags.js
diff --git a/app/assets/javascripts/discourse/lib/link-lookup.js b/app/assets/javascripts/discourse/app/lib/link-lookup.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/link-lookup.js
rename to app/assets/javascripts/discourse/app/lib/link-lookup.js
diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js b/app/assets/javascripts/discourse/app/lib/link-mentions.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/link-mentions.js
rename to app/assets/javascripts/discourse/app/lib/link-mentions.js
diff --git a/app/assets/javascripts/discourse/lib/link-tag-hashtag.js b/app/assets/javascripts/discourse/app/lib/link-tag-hashtag.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/link-tag-hashtag.js
rename to app/assets/javascripts/discourse/app/lib/link-tag-hashtag.js
diff --git a/app/assets/javascripts/discourse/lib/load-script.js b/app/assets/javascripts/discourse/app/lib/load-script.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/load-script.js
rename to app/assets/javascripts/discourse/app/lib/load-script.js
diff --git a/app/assets/javascripts/discourse/lib/lock-on.js b/app/assets/javascripts/discourse/app/lib/lock-on.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/lock-on.js
rename to app/assets/javascripts/discourse/app/lib/lock-on.js
diff --git a/app/assets/javascripts/discourse/lib/logout.js b/app/assets/javascripts/discourse/app/lib/logout.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/logout.js
rename to app/assets/javascripts/discourse/app/lib/logout.js
diff --git a/app/assets/javascripts/discourse/lib/mobile.js b/app/assets/javascripts/discourse/app/lib/mobile.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/mobile.js
rename to app/assets/javascripts/discourse/app/lib/mobile.js
diff --git a/app/assets/javascripts/discourse/lib/notification-levels.js b/app/assets/javascripts/discourse/app/lib/notification-levels.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/notification-levels.js
rename to app/assets/javascripts/discourse/app/lib/notification-levels.js
diff --git a/app/assets/javascripts/discourse/lib/offset-calculator.js b/app/assets/javascripts/discourse/app/lib/offset-calculator.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/offset-calculator.js
rename to app/assets/javascripts/discourse/app/lib/offset-calculator.js
diff --git a/app/assets/javascripts/discourse/lib/optional-service.js b/app/assets/javascripts/discourse/app/lib/optional-service.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/optional-service.js
rename to app/assets/javascripts/discourse/app/lib/optional-service.js
diff --git a/app/assets/javascripts/discourse/lib/page-tracker.js b/app/assets/javascripts/discourse/app/lib/page-tracker.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/page-tracker.js
rename to app/assets/javascripts/discourse/app/lib/page-tracker.js
diff --git a/app/assets/javascripts/discourse/lib/page-visible.js b/app/assets/javascripts/discourse/app/lib/page-visible.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/page-visible.js
rename to app/assets/javascripts/discourse/app/lib/page-visible.js
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/plugin-api.js
rename to app/assets/javascripts/discourse/app/lib/plugin-api.js
diff --git a/app/assets/javascripts/discourse/lib/plugin-connectors.js b/app/assets/javascripts/discourse/app/lib/plugin-connectors.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/plugin-connectors.js
rename to app/assets/javascripts/discourse/app/lib/plugin-connectors.js
diff --git a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js b/app/assets/javascripts/discourse/app/lib/posts-with-placeholders.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/posts-with-placeholders.js
rename to app/assets/javascripts/discourse/app/lib/posts-with-placeholders.js
diff --git a/app/assets/javascripts/discourse/lib/push-notifications.js b/app/assets/javascripts/discourse/app/lib/push-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/push-notifications.js
rename to app/assets/javascripts/discourse/app/lib/push-notifications.js
diff --git a/app/assets/javascripts/discourse/lib/put-cursor-at-end.js b/app/assets/javascripts/discourse/app/lib/put-cursor-at-end.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/put-cursor-at-end.js
rename to app/assets/javascripts/discourse/app/lib/put-cursor-at-end.js
diff --git a/app/assets/javascripts/discourse/lib/pwa-utils.js b/app/assets/javascripts/discourse/app/lib/pwa-utils.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/pwa-utils.js
rename to app/assets/javascripts/discourse/app/lib/pwa-utils.js
diff --git a/app/assets/javascripts/discourse/lib/quote-state.js b/app/assets/javascripts/discourse/app/lib/quote-state.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/quote-state.js
rename to app/assets/javascripts/discourse/app/lib/quote-state.js
diff --git a/app/assets/javascripts/discourse/lib/quote.js b/app/assets/javascripts/discourse/app/lib/quote.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/quote.js
rename to app/assets/javascripts/discourse/app/lib/quote.js
diff --git a/app/assets/javascripts/discourse/lib/raw-templates.js b/app/assets/javascripts/discourse/app/lib/raw-templates.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/raw-templates.js
rename to app/assets/javascripts/discourse/app/lib/raw-templates.js
diff --git a/app/assets/javascripts/discourse/lib/register-topic-footer-button.js b/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/register-topic-footer-button.js
rename to app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js
diff --git a/app/assets/javascripts/discourse/lib/render-tag.js b/app/assets/javascripts/discourse/app/lib/render-tag.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/render-tag.js
rename to app/assets/javascripts/discourse/app/lib/render-tag.js
diff --git a/app/assets/javascripts/discourse/lib/render-tags.js b/app/assets/javascripts/discourse/app/lib/render-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/render-tags.js
rename to app/assets/javascripts/discourse/app/lib/render-tags.js
diff --git a/app/assets/javascripts/discourse/lib/render-topic-featured-link.js b/app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/render-topic-featured-link.js
rename to app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js
diff --git a/app/assets/javascripts/discourse/lib/reports-loader.js b/app/assets/javascripts/discourse/app/lib/reports-loader.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/reports-loader.js
rename to app/assets/javascripts/discourse/app/lib/reports-loader.js
diff --git a/app/assets/javascripts/discourse/lib/round.js b/app/assets/javascripts/discourse/app/lib/round.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/round.js
rename to app/assets/javascripts/discourse/app/lib/round.js
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js b/app/assets/javascripts/discourse/app/lib/safari-hacks.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/safari-hacks.js
rename to app/assets/javascripts/discourse/app/lib/safari-hacks.js
diff --git a/app/assets/javascripts/discourse/lib/screen-track.js b/app/assets/javascripts/discourse/app/lib/screen-track.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/screen-track.js
rename to app/assets/javascripts/discourse/app/lib/screen-track.js
diff --git a/app/assets/javascripts/discourse/lib/search.js b/app/assets/javascripts/discourse/app/lib/search.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/search.js
rename to app/assets/javascripts/discourse/app/lib/search.js
diff --git a/app/assets/javascripts/discourse/lib/settings.js b/app/assets/javascripts/discourse/app/lib/settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/settings.js
rename to app/assets/javascripts/discourse/app/lib/settings.js
diff --git a/app/assets/javascripts/discourse/lib/sharing.js b/app/assets/javascripts/discourse/app/lib/sharing.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/sharing.js
rename to app/assets/javascripts/discourse/app/lib/sharing.js
diff --git a/app/assets/javascripts/discourse/lib/show-modal.js b/app/assets/javascripts/discourse/app/lib/show-modal.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/show-modal.js
rename to app/assets/javascripts/discourse/app/lib/show-modal.js
diff --git a/app/assets/javascripts/discourse/lib/static-route-builder.js b/app/assets/javascripts/discourse/app/lib/static-route-builder.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/static-route-builder.js
rename to app/assets/javascripts/discourse/app/lib/static-route-builder.js
diff --git a/app/assets/javascripts/discourse/lib/svg-sprite-loader.js b/app/assets/javascripts/discourse/app/lib/svg-sprite-loader.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/svg-sprite-loader.js
rename to app/assets/javascripts/discourse/app/lib/svg-sprite-loader.js
diff --git a/app/assets/javascripts/discourse/lib/tag-hashtags.js b/app/assets/javascripts/discourse/app/lib/tag-hashtags.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/tag-hashtags.js
rename to app/assets/javascripts/discourse/app/lib/tag-hashtags.js
diff --git a/app/assets/javascripts/discourse/lib/text-direction.js b/app/assets/javascripts/discourse/app/lib/text-direction.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/text-direction.js
rename to app/assets/javascripts/discourse/app/lib/text-direction.js
diff --git a/app/assets/javascripts/discourse/lib/text.js b/app/assets/javascripts/discourse/app/lib/text.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/text.js
rename to app/assets/javascripts/discourse/app/lib/text.js
diff --git a/app/assets/javascripts/discourse/lib/theme-selector.js b/app/assets/javascripts/discourse/app/lib/theme-selector.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/theme-selector.js
rename to app/assets/javascripts/discourse/app/lib/theme-selector.js
diff --git a/app/assets/javascripts/discourse/lib/to-markdown.js b/app/assets/javascripts/discourse/app/lib/to-markdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/to-markdown.js
rename to app/assets/javascripts/discourse/app/lib/to-markdown.js
diff --git a/app/assets/javascripts/discourse/lib/tooltip.js b/app/assets/javascripts/discourse/app/lib/tooltip.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/tooltip.js
rename to app/assets/javascripts/discourse/app/lib/tooltip.js
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js b/app/assets/javascripts/discourse/app/lib/transform-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/transform-post.js
rename to app/assets/javascripts/discourse/app/lib/transform-post.js
diff --git a/app/assets/javascripts/discourse/lib/uploads.js b/app/assets/javascripts/discourse/app/lib/uploads.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/uploads.js
rename to app/assets/javascripts/discourse/app/lib/uploads.js
diff --git a/app/assets/javascripts/discourse/lib/url.js b/app/assets/javascripts/discourse/app/lib/url.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/url.js
rename to app/assets/javascripts/discourse/app/lib/url.js
diff --git a/app/assets/javascripts/discourse/lib/user-activation.js b/app/assets/javascripts/discourse/app/lib/user-activation.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/user-activation.js
rename to app/assets/javascripts/discourse/app/lib/user-activation.js
diff --git a/app/assets/javascripts/discourse/lib/user-presence.js b/app/assets/javascripts/discourse/app/lib/user-presence.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/user-presence.js
rename to app/assets/javascripts/discourse/app/lib/user-presence.js
diff --git a/app/assets/javascripts/discourse/lib/user-search.js b/app/assets/javascripts/discourse/app/lib/user-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/user-search.js
rename to app/assets/javascripts/discourse/app/lib/user-search.js
diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/utilities.js
rename to app/assets/javascripts/discourse/app/lib/utilities.js
diff --git a/app/assets/javascripts/discourse/lib/webauthn.js b/app/assets/javascripts/discourse/app/lib/webauthn.js
similarity index 100%
rename from app/assets/javascripts/discourse/lib/webauthn.js
rename to app/assets/javascripts/discourse/app/lib/webauthn.js
diff --git a/app/assets/javascripts/discourse/mapping-router.js b/app/assets/javascripts/discourse/app/mapping-router.js
similarity index 100%
rename from app/assets/javascripts/discourse/mapping-router.js
rename to app/assets/javascripts/discourse/app/mapping-router.js
diff --git a/app/assets/javascripts/discourse/mixins/add-archetype-class.js b/app/assets/javascripts/discourse/app/mixins/add-archetype-class.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/add-archetype-class.js
rename to app/assets/javascripts/discourse/app/mixins/add-archetype-class.js
diff --git a/app/assets/javascripts/discourse/mixins/buffered-content.js b/app/assets/javascripts/discourse/app/mixins/buffered-content.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/buffered-content.js
rename to app/assets/javascripts/discourse/app/mixins/buffered-content.js
diff --git a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js b/app/assets/javascripts/discourse/app/mixins/bulk-topic-selection.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/bulk-topic-selection.js
rename to app/assets/javascripts/discourse/app/mixins/bulk-topic-selection.js
diff --git a/app/assets/javascripts/discourse/mixins/can-check-emails.js b/app/assets/javascripts/discourse/app/mixins/can-check-emails.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/can-check-emails.js
rename to app/assets/javascripts/discourse/app/mixins/can-check-emails.js
diff --git a/app/assets/javascripts/discourse/mixins/card-contents-base.js b/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/card-contents-base.js
rename to app/assets/javascripts/discourse/app/mixins/card-contents-base.js
diff --git a/app/assets/javascripts/discourse/mixins/cleans-up.js b/app/assets/javascripts/discourse/app/mixins/cleans-up.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/cleans-up.js
rename to app/assets/javascripts/discourse/app/mixins/cleans-up.js
diff --git a/app/assets/javascripts/discourse/mixins/docking.js b/app/assets/javascripts/discourse/app/mixins/docking.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/docking.js
rename to app/assets/javascripts/discourse/app/mixins/docking.js
diff --git a/app/assets/javascripts/discourse/mixins/filter-mode.js b/app/assets/javascripts/discourse/app/mixins/filter-mode.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/filter-mode.js
rename to app/assets/javascripts/discourse/app/mixins/filter-mode.js
diff --git a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js b/app/assets/javascripts/discourse/app/mixins/grant-badge-controller.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/grant-badge-controller.js
rename to app/assets/javascripts/discourse/app/mixins/grant-badge-controller.js
diff --git a/app/assets/javascripts/discourse/mixins/key-enter-escape.js b/app/assets/javascripts/discourse/app/mixins/key-enter-escape.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/key-enter-escape.js
rename to app/assets/javascripts/discourse/app/mixins/key-enter-escape.js
diff --git a/app/assets/javascripts/discourse/mixins/load-more.js b/app/assets/javascripts/discourse/app/mixins/load-more.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/load-more.js
rename to app/assets/javascripts/discourse/app/mixins/load-more.js
diff --git a/app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js b/app/assets/javascripts/discourse/app/mixins/mobile-scroll-direction.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/mobile-scroll-direction.js
rename to app/assets/javascripts/discourse/app/mixins/mobile-scroll-direction.js
diff --git a/app/assets/javascripts/discourse/mixins/modal-functionality.js b/app/assets/javascripts/discourse/app/mixins/modal-functionality.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/modal-functionality.js
rename to app/assets/javascripts/discourse/app/mixins/modal-functionality.js
diff --git a/app/assets/javascripts/discourse/mixins/name-validation.js b/app/assets/javascripts/discourse/app/mixins/name-validation.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/name-validation.js
rename to app/assets/javascripts/discourse/app/mixins/name-validation.js
diff --git a/app/assets/javascripts/discourse/mixins/open-composer.js b/app/assets/javascripts/discourse/app/mixins/open-composer.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/open-composer.js
rename to app/assets/javascripts/discourse/app/mixins/open-composer.js
diff --git a/app/assets/javascripts/discourse/mixins/pan-events.js b/app/assets/javascripts/discourse/app/mixins/pan-events.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/pan-events.js
rename to app/assets/javascripts/discourse/app/mixins/pan-events.js
diff --git a/app/assets/javascripts/discourse/mixins/password-validation.js b/app/assets/javascripts/discourse/app/mixins/password-validation.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/password-validation.js
rename to app/assets/javascripts/discourse/app/mixins/password-validation.js
diff --git a/app/assets/javascripts/discourse/mixins/scroll-top.js b/app/assets/javascripts/discourse/app/mixins/scroll-top.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/scroll-top.js
rename to app/assets/javascripts/discourse/app/mixins/scroll-top.js
diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js b/app/assets/javascripts/discourse/app/mixins/scrolling.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/scrolling.js
rename to app/assets/javascripts/discourse/app/mixins/scrolling.js
diff --git a/app/assets/javascripts/discourse/mixins/singleton.js b/app/assets/javascripts/discourse/app/mixins/singleton.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/singleton.js
rename to app/assets/javascripts/discourse/app/mixins/singleton.js
diff --git a/app/assets/javascripts/discourse/mixins/upload.js b/app/assets/javascripts/discourse/app/mixins/upload.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/upload.js
rename to app/assets/javascripts/discourse/app/mixins/upload.js
diff --git a/app/assets/javascripts/discourse/mixins/url-refresh.js b/app/assets/javascripts/discourse/app/mixins/url-refresh.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/url-refresh.js
rename to app/assets/javascripts/discourse/app/mixins/url-refresh.js
diff --git a/app/assets/javascripts/discourse/mixins/user-fields-validation.js b/app/assets/javascripts/discourse/app/mixins/user-fields-validation.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/user-fields-validation.js
rename to app/assets/javascripts/discourse/app/mixins/user-fields-validation.js
diff --git a/app/assets/javascripts/discourse/mixins/username-validation.js b/app/assets/javascripts/discourse/app/mixins/username-validation.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/username-validation.js
rename to app/assets/javascripts/discourse/app/mixins/username-validation.js
diff --git a/app/assets/javascripts/discourse/mixins/viewing-action-type.js b/app/assets/javascripts/discourse/app/mixins/viewing-action-type.js
similarity index 100%
rename from app/assets/javascripts/discourse/mixins/viewing-action-type.js
rename to app/assets/javascripts/discourse/app/mixins/viewing-action-type.js
diff --git a/app/assets/javascripts/discourse/models/action-summary.js b/app/assets/javascripts/discourse/app/models/action-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/action-summary.js
rename to app/assets/javascripts/discourse/app/models/action-summary.js
diff --git a/app/assets/javascripts/discourse/models/archetype.js b/app/assets/javascripts/discourse/app/models/archetype.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/archetype.js
rename to app/assets/javascripts/discourse/app/models/archetype.js
diff --git a/app/assets/javascripts/discourse/models/badge-grouping.js b/app/assets/javascripts/discourse/app/models/badge-grouping.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/badge-grouping.js
rename to app/assets/javascripts/discourse/app/models/badge-grouping.js
diff --git a/app/assets/javascripts/discourse/models/badge.js b/app/assets/javascripts/discourse/app/models/badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/badge.js
rename to app/assets/javascripts/discourse/app/models/badge.js
diff --git a/app/assets/javascripts/discourse/models/bookmark.js b/app/assets/javascripts/discourse/app/models/bookmark.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/bookmark.js
rename to app/assets/javascripts/discourse/app/models/bookmark.js
diff --git a/app/assets/javascripts/discourse/models/category-list.js b/app/assets/javascripts/discourse/app/models/category-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/category-list.js
rename to app/assets/javascripts/discourse/app/models/category-list.js
diff --git a/app/assets/javascripts/discourse/models/category.js b/app/assets/javascripts/discourse/app/models/category.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/category.js
rename to app/assets/javascripts/discourse/app/models/category.js
diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/composer.js
rename to app/assets/javascripts/discourse/app/models/composer.js
diff --git a/app/assets/javascripts/discourse/models/draft.js b/app/assets/javascripts/discourse/app/models/draft.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/draft.js
rename to app/assets/javascripts/discourse/app/models/draft.js
diff --git a/app/assets/javascripts/discourse/models/group-history.js b/app/assets/javascripts/discourse/app/models/group-history.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/group-history.js
rename to app/assets/javascripts/discourse/app/models/group-history.js
diff --git a/app/assets/javascripts/discourse/models/group.js b/app/assets/javascripts/discourse/app/models/group.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/group.js
rename to app/assets/javascripts/discourse/app/models/group.js
diff --git a/app/assets/javascripts/discourse/models/invite.js b/app/assets/javascripts/discourse/app/models/invite.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/invite.js
rename to app/assets/javascripts/discourse/app/models/invite.js
diff --git a/app/assets/javascripts/discourse/models/live-post-counts.js b/app/assets/javascripts/discourse/app/models/live-post-counts.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/live-post-counts.js
rename to app/assets/javascripts/discourse/app/models/live-post-counts.js
diff --git a/app/assets/javascripts/discourse/models/login-method.js b/app/assets/javascripts/discourse/app/models/login-method.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/login-method.js
rename to app/assets/javascripts/discourse/app/models/login-method.js
diff --git a/app/assets/javascripts/discourse/models/nav-item.js b/app/assets/javascripts/discourse/app/models/nav-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/nav-item.js
rename to app/assets/javascripts/discourse/app/models/nav-item.js
diff --git a/app/assets/javascripts/discourse/models/permission-type.js b/app/assets/javascripts/discourse/app/models/permission-type.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/permission-type.js
rename to app/assets/javascripts/discourse/app/models/permission-type.js
diff --git a/app/assets/javascripts/discourse/models/post-action-type.js b/app/assets/javascripts/discourse/app/models/post-action-type.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/post-action-type.js
rename to app/assets/javascripts/discourse/app/models/post-action-type.js
diff --git a/app/assets/javascripts/discourse/models/post-stream.js b/app/assets/javascripts/discourse/app/models/post-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/post-stream.js
rename to app/assets/javascripts/discourse/app/models/post-stream.js
diff --git a/app/assets/javascripts/discourse/models/post.js b/app/assets/javascripts/discourse/app/models/post.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/post.js
rename to app/assets/javascripts/discourse/app/models/post.js
diff --git a/app/assets/javascripts/discourse/models/published-page.js b/app/assets/javascripts/discourse/app/models/published-page.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/published-page.js
rename to app/assets/javascripts/discourse/app/models/published-page.js
diff --git a/app/assets/javascripts/discourse/models/rest.js b/app/assets/javascripts/discourse/app/models/rest.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/rest.js
rename to app/assets/javascripts/discourse/app/models/rest.js
diff --git a/app/assets/javascripts/discourse/models/result-set.js b/app/assets/javascripts/discourse/app/models/result-set.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/result-set.js
rename to app/assets/javascripts/discourse/app/models/result-set.js
diff --git a/app/assets/javascripts/discourse/models/reviewable-history.js b/app/assets/javascripts/discourse/app/models/reviewable-history.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/reviewable-history.js
rename to app/assets/javascripts/discourse/app/models/reviewable-history.js
diff --git a/app/assets/javascripts/discourse/models/reviewable.js b/app/assets/javascripts/discourse/app/models/reviewable.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/reviewable.js
rename to app/assets/javascripts/discourse/app/models/reviewable.js
diff --git a/app/assets/javascripts/discourse/models/session.js b/app/assets/javascripts/discourse/app/models/session.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/session.js
rename to app/assets/javascripts/discourse/app/models/session.js
diff --git a/app/assets/javascripts/discourse/models/site.js b/app/assets/javascripts/discourse/app/models/site.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/site.js
rename to app/assets/javascripts/discourse/app/models/site.js
diff --git a/app/assets/javascripts/discourse/models/static-page.js b/app/assets/javascripts/discourse/app/models/static-page.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/static-page.js
rename to app/assets/javascripts/discourse/app/models/static-page.js
diff --git a/app/assets/javascripts/discourse/models/store.js b/app/assets/javascripts/discourse/app/models/store.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/store.js
rename to app/assets/javascripts/discourse/app/models/store.js
diff --git a/app/assets/javascripts/discourse/models/tag-group.js b/app/assets/javascripts/discourse/app/models/tag-group.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/tag-group.js
rename to app/assets/javascripts/discourse/app/models/tag-group.js
diff --git a/app/assets/javascripts/discourse/models/tag.js b/app/assets/javascripts/discourse/app/models/tag.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/tag.js
rename to app/assets/javascripts/discourse/app/models/tag.js
diff --git a/app/assets/javascripts/discourse/models/topic-details.js b/app/assets/javascripts/discourse/app/models/topic-details.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic-details.js
rename to app/assets/javascripts/discourse/app/models/topic-details.js
diff --git a/app/assets/javascripts/discourse/models/topic-list.js b/app/assets/javascripts/discourse/app/models/topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic-list.js
rename to app/assets/javascripts/discourse/app/models/topic-list.js
diff --git a/app/assets/javascripts/discourse/models/topic-timer.js b/app/assets/javascripts/discourse/app/models/topic-timer.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic-timer.js
rename to app/assets/javascripts/discourse/app/models/topic-timer.js
diff --git a/app/assets/javascripts/discourse/models/topic-tracking-state.js b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic-tracking-state.js
rename to app/assets/javascripts/discourse/app/models/topic-tracking-state.js
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/topic.js
rename to app/assets/javascripts/discourse/app/models/topic.js
diff --git a/app/assets/javascripts/discourse/models/trust-level.js b/app/assets/javascripts/discourse/app/models/trust-level.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/trust-level.js
rename to app/assets/javascripts/discourse/app/models/trust-level.js
diff --git a/app/assets/javascripts/discourse/models/user-action-group.js b/app/assets/javascripts/discourse/app/models/user-action-group.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-action-group.js
rename to app/assets/javascripts/discourse/app/models/user-action-group.js
diff --git a/app/assets/javascripts/discourse/models/user-action-stat.js b/app/assets/javascripts/discourse/app/models/user-action-stat.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-action-stat.js
rename to app/assets/javascripts/discourse/app/models/user-action-stat.js
diff --git a/app/assets/javascripts/discourse/models/user-action.js b/app/assets/javascripts/discourse/app/models/user-action.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-action.js
rename to app/assets/javascripts/discourse/app/models/user-action.js
diff --git a/app/assets/javascripts/discourse/models/user-badge.js b/app/assets/javascripts/discourse/app/models/user-badge.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-badge.js
rename to app/assets/javascripts/discourse/app/models/user-badge.js
diff --git a/app/assets/javascripts/discourse/models/user-draft.js b/app/assets/javascripts/discourse/app/models/user-draft.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-draft.js
rename to app/assets/javascripts/discourse/app/models/user-draft.js
diff --git a/app/assets/javascripts/discourse/models/user-drafts-stream.js b/app/assets/javascripts/discourse/app/models/user-drafts-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-drafts-stream.js
rename to app/assets/javascripts/discourse/app/models/user-drafts-stream.js
diff --git a/app/assets/javascripts/discourse/models/user-posts-stream.js b/app/assets/javascripts/discourse/app/models/user-posts-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-posts-stream.js
rename to app/assets/javascripts/discourse/app/models/user-posts-stream.js
diff --git a/app/assets/javascripts/discourse/models/user-stream.js b/app/assets/javascripts/discourse/app/models/user-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user-stream.js
rename to app/assets/javascripts/discourse/app/models/user-stream.js
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/user.js
rename to app/assets/javascripts/discourse/app/models/user.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js b/app/assets/javascripts/discourse/app/pre-initializers/dynamic-route-builders.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js
rename to app/assets/javascripts/discourse/app/pre-initializers/dynamic-route-builders.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js
rename to app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/map-routes.js b/app/assets/javascripts/discourse/app/pre-initializers/map-routes.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/map-routes.js
rename to app/assets/javascripts/discourse/app/pre-initializers/map-routes.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js b/app/assets/javascripts/discourse/app/pre-initializers/register-dom-templates.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js
rename to app/assets/javascripts/discourse/app/pre-initializers/register-dom-templates.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js b/app/assets/javascripts/discourse/app/pre-initializers/sniff-capabilities.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js
rename to app/assets/javascripts/discourse/app/pre-initializers/sniff-capabilities.js
diff --git a/app/assets/javascripts/discourse/pre-initializers/svg-sprite-fontawesome.js b/app/assets/javascripts/discourse/app/pre-initializers/svg-sprite-fontawesome.js
similarity index 100%
rename from app/assets/javascripts/discourse/pre-initializers/svg-sprite-fontawesome.js
rename to app/assets/javascripts/discourse/app/pre-initializers/svg-sprite-fontawesome.js
diff --git a/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js b/app/assets/javascripts/discourse/app/raw-views/list/post-count-or-badges.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js
rename to app/assets/javascripts/discourse/app/raw-views/list/post-count-or-badges.js
diff --git a/app/assets/javascripts/discourse/raw-views/list/posts-count-column.js b/app/assets/javascripts/discourse/app/raw-views/list/posts-count-column.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/list/posts-count-column.js
rename to app/assets/javascripts/discourse/app/raw-views/list/posts-count-column.js
diff --git a/app/assets/javascripts/discourse/raw-views/list/visited-line.js b/app/assets/javascripts/discourse/app/raw-views/list/visited-line.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/list/visited-line.js
rename to app/assets/javascripts/discourse/app/raw-views/list/visited-line.js
diff --git a/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js b/app/assets/javascripts/discourse/app/raw-views/topic-list-header-column.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/topic-list-header-column.js
rename to app/assets/javascripts/discourse/app/raw-views/topic-list-header-column.js
diff --git a/app/assets/javascripts/discourse/raw-views/topic-status.js b/app/assets/javascripts/discourse/app/raw-views/topic-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/raw-views/topic-status.js
rename to app/assets/javascripts/discourse/app/raw-views/topic-status.js
diff --git a/app/assets/javascripts/discourse/routes/about.js b/app/assets/javascripts/discourse/app/routes/about.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/about.js
rename to app/assets/javascripts/discourse/app/routes/about.js
diff --git a/app/assets/javascripts/discourse/routes/account-created-edit-email.js b/app/assets/javascripts/discourse/app/routes/account-created-edit-email.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/account-created-edit-email.js
rename to app/assets/javascripts/discourse/app/routes/account-created-edit-email.js
diff --git a/app/assets/javascripts/discourse/routes/account-created-index.js b/app/assets/javascripts/discourse/app/routes/account-created-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/account-created-index.js
rename to app/assets/javascripts/discourse/app/routes/account-created-index.js
diff --git a/app/assets/javascripts/discourse/routes/account-created-resent.js b/app/assets/javascripts/discourse/app/routes/account-created-resent.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/account-created-resent.js
rename to app/assets/javascripts/discourse/app/routes/account-created-resent.js
diff --git a/app/assets/javascripts/discourse/routes/account-created.js b/app/assets/javascripts/discourse/app/routes/account-created.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/account-created.js
rename to app/assets/javascripts/discourse/app/routes/account-created.js
diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js b/app/assets/javascripts/discourse/app/routes/app-route-map.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/app-route-map.js
rename to app/assets/javascripts/discourse/app/routes/app-route-map.js
diff --git a/app/assets/javascripts/discourse/routes/application.js b/app/assets/javascripts/discourse/app/routes/application.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/application.js
rename to app/assets/javascripts/discourse/app/routes/application.js
diff --git a/app/assets/javascripts/discourse/routes/associate-account.js b/app/assets/javascripts/discourse/app/routes/associate-account.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/associate-account.js
rename to app/assets/javascripts/discourse/app/routes/associate-account.js
diff --git a/app/assets/javascripts/discourse/routes/badges-index.js b/app/assets/javascripts/discourse/app/routes/badges-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/badges-index.js
rename to app/assets/javascripts/discourse/app/routes/badges-index.js
diff --git a/app/assets/javascripts/discourse/routes/badges-show.js b/app/assets/javascripts/discourse/app/routes/badges-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/badges-show.js
rename to app/assets/javascripts/discourse/app/routes/badges-show.js
diff --git a/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js b/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js
rename to app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js b/app/assets/javascripts/discourse/app/routes/build-category-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-category-route.js
rename to app/assets/javascripts/discourse/app/routes/build-category-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-group-messages-route.js b/app/assets/javascripts/discourse/app/routes/build-group-messages-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-group-messages-route.js
rename to app/assets/javascripts/discourse/app/routes/build-group-messages-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-private-messages-route.js b/app/assets/javascripts/discourse/app/routes/build-private-messages-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-private-messages-route.js
rename to app/assets/javascripts/discourse/app/routes/build-private-messages-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-static-route.js b/app/assets/javascripts/discourse/app/routes/build-static-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-static-route.js
rename to app/assets/javascripts/discourse/app/routes/build-static-route.js
diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js b/app/assets/javascripts/discourse/app/routes/build-topic-route.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/build-topic-route.js
rename to app/assets/javascripts/discourse/app/routes/build-topic-route.js
diff --git a/app/assets/javascripts/discourse/routes/conduct.js b/app/assets/javascripts/discourse/app/routes/conduct.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/conduct.js
rename to app/assets/javascripts/discourse/app/routes/conduct.js
diff --git a/app/assets/javascripts/discourse/routes/discourse.js b/app/assets/javascripts/discourse/app/routes/discourse.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/discourse.js
rename to app/assets/javascripts/discourse/app/routes/discourse.js
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js b/app/assets/javascripts/discourse/app/routes/discovery-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/discovery-categories.js
rename to app/assets/javascripts/discourse/app/routes/discovery-categories.js
diff --git a/app/assets/javascripts/discourse/routes/discovery.js b/app/assets/javascripts/discourse/app/routes/discovery.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/discovery.js
rename to app/assets/javascripts/discourse/app/routes/discovery.js
diff --git a/app/assets/javascripts/discourse/routes/email-login.js b/app/assets/javascripts/discourse/app/routes/email-login.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/email-login.js
rename to app/assets/javascripts/discourse/app/routes/email-login.js
diff --git a/app/assets/javascripts/discourse/routes/exception-unknown.js b/app/assets/javascripts/discourse/app/routes/exception-unknown.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/exception-unknown.js
rename to app/assets/javascripts/discourse/app/routes/exception-unknown.js
diff --git a/app/assets/javascripts/discourse/routes/exception.js b/app/assets/javascripts/discourse/app/routes/exception.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/exception.js
rename to app/assets/javascripts/discourse/app/routes/exception.js
diff --git a/app/assets/javascripts/discourse/routes/faq.js b/app/assets/javascripts/discourse/app/routes/faq.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/faq.js
rename to app/assets/javascripts/discourse/app/routes/faq.js
diff --git a/app/assets/javascripts/discourse/routes/forgot-password.js b/app/assets/javascripts/discourse/app/routes/forgot-password.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/forgot-password.js
rename to app/assets/javascripts/discourse/app/routes/forgot-password.js
diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js b/app/assets/javascripts/discourse/app/routes/full-page-search.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/full-page-search.js
rename to app/assets/javascripts/discourse/app/routes/full-page-search.js
diff --git a/app/assets/javascripts/discourse/routes/group-activity-index.js b/app/assets/javascripts/discourse/app/routes/group-activity-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity-index.js
rename to app/assets/javascripts/discourse/app/routes/group-activity-index.js
diff --git a/app/assets/javascripts/discourse/routes/group-activity-mentions.js b/app/assets/javascripts/discourse/app/routes/group-activity-mentions.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity-mentions.js
rename to app/assets/javascripts/discourse/app/routes/group-activity-mentions.js
diff --git a/app/assets/javascripts/discourse/routes/group-activity-posts.js b/app/assets/javascripts/discourse/app/routes/group-activity-posts.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity-posts.js
rename to app/assets/javascripts/discourse/app/routes/group-activity-posts.js
diff --git a/app/assets/javascripts/discourse/routes/group-activity-topics.js b/app/assets/javascripts/discourse/app/routes/group-activity-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity-topics.js
rename to app/assets/javascripts/discourse/app/routes/group-activity-topics.js
diff --git a/app/assets/javascripts/discourse/routes/group-index.js b/app/assets/javascripts/discourse/app/routes/group-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-index.js
rename to app/assets/javascripts/discourse/app/routes/group-index.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-index.js b/app/assets/javascripts/discourse/app/routes/group-manage-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-index.js
rename to app/assets/javascripts/discourse/app/routes/group-manage-index.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-interaction.js b/app/assets/javascripts/discourse/app/routes/group-manage-interaction.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-interaction.js
rename to app/assets/javascripts/discourse/app/routes/group-manage-interaction.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-logs.js b/app/assets/javascripts/discourse/app/routes/group-manage-logs.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-logs.js
rename to app/assets/javascripts/discourse/app/routes/group-manage-logs.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-membership.js b/app/assets/javascripts/discourse/app/routes/group-manage-membership.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-membership.js
rename to app/assets/javascripts/discourse/app/routes/group-manage-membership.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage-profile.js b/app/assets/javascripts/discourse/app/routes/group-manage-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage-profile.js
rename to app/assets/javascripts/discourse/app/routes/group-manage-profile.js
diff --git a/app/assets/javascripts/discourse/routes/group-manage.js b/app/assets/javascripts/discourse/app/routes/group-manage.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-manage.js
rename to app/assets/javascripts/discourse/app/routes/group-manage.js
diff --git a/app/assets/javascripts/discourse/routes/group-members.js b/app/assets/javascripts/discourse/app/routes/group-members.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-members.js
rename to app/assets/javascripts/discourse/app/routes/group-members.js
diff --git a/app/assets/javascripts/discourse/routes/group-messages-archive.js b/app/assets/javascripts/discourse/app/routes/group-messages-archive.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-messages-archive.js
rename to app/assets/javascripts/discourse/app/routes/group-messages-archive.js
diff --git a/app/assets/javascripts/discourse/routes/group-messages-inbox.js b/app/assets/javascripts/discourse/app/routes/group-messages-inbox.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-messages-inbox.js
rename to app/assets/javascripts/discourse/app/routes/group-messages-inbox.js
diff --git a/app/assets/javascripts/discourse/routes/group-messages-index.js b/app/assets/javascripts/discourse/app/routes/group-messages-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-messages-index.js
rename to app/assets/javascripts/discourse/app/routes/group-messages-index.js
diff --git a/app/assets/javascripts/discourse/routes/group-messages.js b/app/assets/javascripts/discourse/app/routes/group-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-messages.js
rename to app/assets/javascripts/discourse/app/routes/group-messages.js
diff --git a/app/assets/javascripts/discourse/routes/group-requests.js b/app/assets/javascripts/discourse/app/routes/group-requests.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-requests.js
rename to app/assets/javascripts/discourse/app/routes/group-requests.js
diff --git a/app/assets/javascripts/discourse/routes/group.js b/app/assets/javascripts/discourse/app/routes/group.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group.js
rename to app/assets/javascripts/discourse/app/routes/group.js
diff --git a/app/assets/javascripts/discourse/routes/groups-index.js b/app/assets/javascripts/discourse/app/routes/groups-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/groups-index.js
rename to app/assets/javascripts/discourse/app/routes/groups-index.js
diff --git a/app/assets/javascripts/discourse/routes/groups-new.js b/app/assets/javascripts/discourse/app/routes/groups-new.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/groups-new.js
rename to app/assets/javascripts/discourse/app/routes/groups-new.js
diff --git a/app/assets/javascripts/discourse/routes/guidelines.js b/app/assets/javascripts/discourse/app/routes/guidelines.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/guidelines.js
rename to app/assets/javascripts/discourse/app/routes/guidelines.js
diff --git a/app/assets/javascripts/discourse/routes/invites-show.js b/app/assets/javascripts/discourse/app/routes/invites-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/invites-show.js
rename to app/assets/javascripts/discourse/app/routes/invites-show.js
diff --git a/app/assets/javascripts/discourse/routes/login.js b/app/assets/javascripts/discourse/app/routes/login.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/login.js
rename to app/assets/javascripts/discourse/app/routes/login.js
diff --git a/app/assets/javascripts/discourse/routes/new-message.js b/app/assets/javascripts/discourse/app/routes/new-message.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/new-message.js
rename to app/assets/javascripts/discourse/app/routes/new-message.js
diff --git a/app/assets/javascripts/discourse/routes/new-topic.js b/app/assets/javascripts/discourse/app/routes/new-topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/new-topic.js
rename to app/assets/javascripts/discourse/app/routes/new-topic.js
diff --git a/app/assets/javascripts/discourse/routes/password-reset.js b/app/assets/javascripts/discourse/app/routes/password-reset.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/password-reset.js
rename to app/assets/javascripts/discourse/app/routes/password-reset.js
diff --git a/app/assets/javascripts/discourse/routes/post.js b/app/assets/javascripts/discourse/app/routes/post.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/post.js
rename to app/assets/javascripts/discourse/app/routes/post.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-account.js b/app/assets/javascripts/discourse/app/routes/preferences-account.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-account.js
rename to app/assets/javascripts/discourse/app/routes/preferences-account.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-apps.js b/app/assets/javascripts/discourse/app/routes/preferences-apps.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-apps.js
rename to app/assets/javascripts/discourse/app/routes/preferences-apps.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-categories.js b/app/assets/javascripts/discourse/app/routes/preferences-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-categories.js
rename to app/assets/javascripts/discourse/app/routes/preferences-categories.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-email.js b/app/assets/javascripts/discourse/app/routes/preferences-email.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-email.js
rename to app/assets/javascripts/discourse/app/routes/preferences-email.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-emails.js b/app/assets/javascripts/discourse/app/routes/preferences-emails.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-emails.js
rename to app/assets/javascripts/discourse/app/routes/preferences-emails.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-index.js b/app/assets/javascripts/discourse/app/routes/preferences-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-index.js
rename to app/assets/javascripts/discourse/app/routes/preferences-index.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-interface.js b/app/assets/javascripts/discourse/app/routes/preferences-interface.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-interface.js
rename to app/assets/javascripts/discourse/app/routes/preferences-interface.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-notifications.js b/app/assets/javascripts/discourse/app/routes/preferences-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-notifications.js
rename to app/assets/javascripts/discourse/app/routes/preferences-notifications.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-profile.js b/app/assets/javascripts/discourse/app/routes/preferences-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-profile.js
rename to app/assets/javascripts/discourse/app/routes/preferences-profile.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-second-factor.js b/app/assets/javascripts/discourse/app/routes/preferences-second-factor.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-second-factor.js
rename to app/assets/javascripts/discourse/app/routes/preferences-second-factor.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-tags.js b/app/assets/javascripts/discourse/app/routes/preferences-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-tags.js
rename to app/assets/javascripts/discourse/app/routes/preferences-tags.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-username.js b/app/assets/javascripts/discourse/app/routes/preferences-username.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-username.js
rename to app/assets/javascripts/discourse/app/routes/preferences-username.js
diff --git a/app/assets/javascripts/discourse/routes/preferences-users.js b/app/assets/javascripts/discourse/app/routes/preferences-users.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences-users.js
rename to app/assets/javascripts/discourse/app/routes/preferences-users.js
diff --git a/app/assets/javascripts/discourse/routes/preferences.js b/app/assets/javascripts/discourse/app/routes/preferences.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/preferences.js
rename to app/assets/javascripts/discourse/app/routes/preferences.js
diff --git a/app/assets/javascripts/discourse/routes/privacy.js b/app/assets/javascripts/discourse/app/routes/privacy.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/privacy.js
rename to app/assets/javascripts/discourse/app/routes/privacy.js
diff --git a/app/assets/javascripts/discourse/routes/restricted-user.js b/app/assets/javascripts/discourse/app/routes/restricted-user.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/restricted-user.js
rename to app/assets/javascripts/discourse/app/routes/restricted-user.js
diff --git a/app/assets/javascripts/discourse/routes/review-index.js b/app/assets/javascripts/discourse/app/routes/review-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review-index.js
rename to app/assets/javascripts/discourse/app/routes/review-index.js
diff --git a/app/assets/javascripts/discourse/routes/review-settings.js b/app/assets/javascripts/discourse/app/routes/review-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review-settings.js
rename to app/assets/javascripts/discourse/app/routes/review-settings.js
diff --git a/app/assets/javascripts/discourse/routes/review-show.js b/app/assets/javascripts/discourse/app/routes/review-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review-show.js
rename to app/assets/javascripts/discourse/app/routes/review-show.js
diff --git a/app/assets/javascripts/discourse/routes/review-topics.js b/app/assets/javascripts/discourse/app/routes/review-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review-topics.js
rename to app/assets/javascripts/discourse/app/routes/review-topics.js
diff --git a/app/assets/javascripts/discourse/routes/review.js b/app/assets/javascripts/discourse/app/routes/review.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/review.js
rename to app/assets/javascripts/discourse/app/routes/review.js
diff --git a/app/assets/javascripts/discourse/routes/rules.js b/app/assets/javascripts/discourse/app/routes/rules.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/rules.js
rename to app/assets/javascripts/discourse/app/routes/rules.js
diff --git a/app/assets/javascripts/discourse/routes/signup.js b/app/assets/javascripts/discourse/app/routes/signup.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/signup.js
rename to app/assets/javascripts/discourse/app/routes/signup.js
diff --git a/app/assets/javascripts/discourse/routes/tag-groups-edit.js b/app/assets/javascripts/discourse/app/routes/tag-groups-edit.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tag-groups-edit.js
rename to app/assets/javascripts/discourse/app/routes/tag-groups-edit.js
diff --git a/app/assets/javascripts/discourse/routes/tag-groups-new.js b/app/assets/javascripts/discourse/app/routes/tag-groups-new.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tag-groups-new.js
rename to app/assets/javascripts/discourse/app/routes/tag-groups-new.js
diff --git a/app/assets/javascripts/discourse/routes/tag-groups.js b/app/assets/javascripts/discourse/app/routes/tag-groups.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tag-groups.js
rename to app/assets/javascripts/discourse/app/routes/tag-groups.js
diff --git a/app/assets/javascripts/discourse/routes/tags-index.js b/app/assets/javascripts/discourse/app/routes/tags-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tags-index.js
rename to app/assets/javascripts/discourse/app/routes/tags-index.js
diff --git a/app/assets/javascripts/discourse/routes/tags-intersection.js b/app/assets/javascripts/discourse/app/routes/tags-intersection.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tags-intersection.js
rename to app/assets/javascripts/discourse/app/routes/tags-intersection.js
diff --git a/app/assets/javascripts/discourse/routes/tags-show.js b/app/assets/javascripts/discourse/app/routes/tags-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tags-show.js
rename to app/assets/javascripts/discourse/app/routes/tags-show.js
diff --git a/app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js b/app/assets/javascripts/discourse/app/routes/topic-by-slug-or-id.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js
rename to app/assets/javascripts/discourse/app/routes/topic-by-slug-or-id.js
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params-near.js b/app/assets/javascripts/discourse/app/routes/topic-from-params-near.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/topic-from-params-near.js
rename to app/assets/javascripts/discourse/app/routes/topic-from-params-near.js
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js b/app/assets/javascripts/discourse/app/routes/topic-from-params.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/topic-from-params.js
rename to app/assets/javascripts/discourse/app/routes/topic-from-params.js
diff --git a/app/assets/javascripts/discourse/routes/topic.js b/app/assets/javascripts/discourse/app/routes/topic.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/topic.js
rename to app/assets/javascripts/discourse/app/routes/topic.js
diff --git a/app/assets/javascripts/discourse/routes/tos.js b/app/assets/javascripts/discourse/app/routes/tos.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/tos.js
rename to app/assets/javascripts/discourse/app/routes/tos.js
diff --git a/app/assets/javascripts/discourse/routes/unknown.js b/app/assets/javascripts/discourse/app/routes/unknown.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/unknown.js
rename to app/assets/javascripts/discourse/app/routes/unknown.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks-with-reminders.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-bookmarks-with-reminders.js
rename to app/assets/javascripts/discourse/app/routes/user-activity-bookmarks-with-reminders.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-bookmarks.js
rename to app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-drafts.js b/app/assets/javascripts/discourse/app/routes/user-activity-drafts.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-drafts.js
rename to app/assets/javascripts/discourse/app/routes/user-activity-drafts.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-index.js b/app/assets/javascripts/discourse/app/routes/user-activity-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-index.js
rename to app/assets/javascripts/discourse/app/routes/user-activity-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-likes-given.js b/app/assets/javascripts/discourse/app/routes/user-activity-likes-given.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-likes-given.js
rename to app/assets/javascripts/discourse/app/routes/user-activity-likes-given.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-pending.js b/app/assets/javascripts/discourse/app/routes/user-activity-pending.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-pending.js
rename to app/assets/javascripts/discourse/app/routes/user-activity-pending.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-replies.js b/app/assets/javascripts/discourse/app/routes/user-activity-replies.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-replies.js
rename to app/assets/javascripts/discourse/app/routes/user-activity-replies.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-stream.js b/app/assets/javascripts/discourse/app/routes/user-activity-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-stream.js
rename to app/assets/javascripts/discourse/app/routes/user-activity-stream.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity-topics.js b/app/assets/javascripts/discourse/app/routes/user-activity-topics.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity-topics.js
rename to app/assets/javascripts/discourse/app/routes/user-activity-topics.js
diff --git a/app/assets/javascripts/discourse/routes/user-activity.js b/app/assets/javascripts/discourse/app/routes/user-activity.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-activity.js
rename to app/assets/javascripts/discourse/app/routes/user-activity.js
diff --git a/app/assets/javascripts/discourse/routes/user-badges.js b/app/assets/javascripts/discourse/app/routes/user-badges.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-badges.js
rename to app/assets/javascripts/discourse/app/routes/user-badges.js
diff --git a/app/assets/javascripts/discourse/routes/user-deleted-posts.js b/app/assets/javascripts/discourse/app/routes/user-deleted-posts.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-deleted-posts.js
rename to app/assets/javascripts/discourse/app/routes/user-deleted-posts.js
diff --git a/app/assets/javascripts/discourse/routes/user-index.js b/app/assets/javascripts/discourse/app/routes/user-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-index.js
rename to app/assets/javascripts/discourse/app/routes/user-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-invited-index.js b/app/assets/javascripts/discourse/app/routes/user-invited-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-invited-index.js
rename to app/assets/javascripts/discourse/app/routes/user-invited-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-invited-show.js b/app/assets/javascripts/discourse/app/routes/user-invited-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-invited-show.js
rename to app/assets/javascripts/discourse/app/routes/user-invited-show.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-edits.js b/app/assets/javascripts/discourse/app/routes/user-notifications-edits.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-edits.js
rename to app/assets/javascripts/discourse/app/routes/user-notifications-edits.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-index.js b/app/assets/javascripts/discourse/app/routes/user-notifications-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-index.js
rename to app/assets/javascripts/discourse/app/routes/user-notifications-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-likes-received.js b/app/assets/javascripts/discourse/app/routes/user-notifications-likes-received.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-likes-received.js
rename to app/assets/javascripts/discourse/app/routes/user-notifications-likes-received.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-mentions.js b/app/assets/javascripts/discourse/app/routes/user-notifications-mentions.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-mentions.js
rename to app/assets/javascripts/discourse/app/routes/user-notifications-mentions.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-responses.js b/app/assets/javascripts/discourse/app/routes/user-notifications-responses.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications-responses.js
rename to app/assets/javascripts/discourse/app/routes/user-notifications-responses.js
diff --git a/app/assets/javascripts/discourse/routes/user-notifications.js b/app/assets/javascripts/discourse/app/routes/user-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-notifications.js
rename to app/assets/javascripts/discourse/app/routes/user-notifications.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-archive.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-archive.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-archive.js
rename to app/assets/javascripts/discourse/app/routes/user-private-messages-archive.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-group-archive.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js
rename to app/assets/javascripts/discourse/app/routes/user-private-messages-group-archive.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-group.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-group.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-group.js
rename to app/assets/javascripts/discourse/app/routes/user-private-messages-group.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-index.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-index.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-index.js
rename to app/assets/javascripts/discourse/app/routes/user-private-messages-index.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-sent.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-sent.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-sent.js
rename to app/assets/javascripts/discourse/app/routes/user-private-messages-sent.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-tags-show.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js
rename to app/assets/javascripts/discourse/app/routes/user-private-messages-tags-show.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-tags.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages-tags.js
rename to app/assets/javascripts/discourse/app/routes/user-private-messages-tags.js
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages.js b/app/assets/javascripts/discourse/app/routes/user-private-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-private-messages.js
rename to app/assets/javascripts/discourse/app/routes/user-private-messages.js
diff --git a/app/assets/javascripts/discourse/routes/user-summary.js b/app/assets/javascripts/discourse/app/routes/user-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-summary.js
rename to app/assets/javascripts/discourse/app/routes/user-summary.js
diff --git a/app/assets/javascripts/discourse/routes/user-topic-list.js b/app/assets/javascripts/discourse/app/routes/user-topic-list.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user-topic-list.js
rename to app/assets/javascripts/discourse/app/routes/user-topic-list.js
diff --git a/app/assets/javascripts/discourse/routes/user.js b/app/assets/javascripts/discourse/app/routes/user.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/user.js
rename to app/assets/javascripts/discourse/app/routes/user.js
diff --git a/app/assets/javascripts/discourse/routes/users.js b/app/assets/javascripts/discourse/app/routes/users.js
similarity index 100%
rename from app/assets/javascripts/discourse/routes/users.js
rename to app/assets/javascripts/discourse/app/routes/users.js
diff --git a/app/assets/javascripts/discourse/services/app-events.js b/app/assets/javascripts/discourse/app/services/app-events.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/app-events.js
rename to app/assets/javascripts/discourse/app/services/app-events.js
diff --git a/app/assets/javascripts/discourse/services/emoji-store.js b/app/assets/javascripts/discourse/app/services/emoji-store.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/emoji-store.js
rename to app/assets/javascripts/discourse/app/services/emoji-store.js
diff --git a/app/assets/javascripts/discourse/services/logs-notice.js b/app/assets/javascripts/discourse/app/services/logs-notice.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/logs-notice.js
rename to app/assets/javascripts/discourse/app/services/logs-notice.js
diff --git a/app/assets/javascripts/discourse/services/search.js b/app/assets/javascripts/discourse/app/services/search.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/search.js
rename to app/assets/javascripts/discourse/app/services/search.js
diff --git a/app/assets/javascripts/discourse/services/theme-settings.js b/app/assets/javascripts/discourse/app/services/theme-settings.js
similarity index 100%
rename from app/assets/javascripts/discourse/services/theme-settings.js
rename to app/assets/javascripts/discourse/app/services/theme-settings.js
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/app/templates/about.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/about.hbs
rename to app/assets/javascripts/discourse/app/templates/about.hbs
diff --git a/app/assets/javascripts/discourse/templates/account-created.hbs b/app/assets/javascripts/discourse/app/templates/account-created.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/account-created.hbs
rename to app/assets/javascripts/discourse/app/templates/account-created.hbs
diff --git a/app/assets/javascripts/discourse/templates/account-created/edit-email.hbs b/app/assets/javascripts/discourse/app/templates/account-created/edit-email.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/account-created/edit-email.hbs
rename to app/assets/javascripts/discourse/app/templates/account-created/edit-email.hbs
diff --git a/app/assets/javascripts/discourse/templates/account-created/index.hbs b/app/assets/javascripts/discourse/app/templates/account-created/index.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/account-created/index.hbs
rename to app/assets/javascripts/discourse/app/templates/account-created/index.hbs
diff --git a/app/assets/javascripts/discourse/templates/account-created/resent.hbs b/app/assets/javascripts/discourse/app/templates/account-created/resent.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/account-created/resent.hbs
rename to app/assets/javascripts/discourse/app/templates/account-created/resent.hbs
diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/app/templates/application.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/application.hbs
rename to app/assets/javascripts/discourse/app/templates/application.hbs
diff --git a/app/assets/javascripts/discourse/templates/badge-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/templates/badge-selector-autocomplete.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/badge-selector-autocomplete.hbr
rename to app/assets/javascripts/discourse/app/templates/badge-selector-autocomplete.hbr
diff --git a/app/assets/javascripts/discourse/templates/badges/index.hbs b/app/assets/javascripts/discourse/app/templates/badges/index.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/badges/index.hbs
rename to app/assets/javascripts/discourse/app/templates/badges/index.hbs
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/app/templates/badges/show.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/badges/show.hbs
rename to app/assets/javascripts/discourse/app/templates/badges/show.hbs
diff --git a/app/assets/javascripts/discourse/templates/bulk-tag.hbs b/app/assets/javascripts/discourse/app/templates/bulk-tag.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/bulk-tag.hbs
rename to app/assets/javascripts/discourse/app/templates/bulk-tag.hbs
diff --git a/app/assets/javascripts/discourse/templates/category-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/templates/category-selector-autocomplete.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/category-selector-autocomplete.hbr
rename to app/assets/javascripts/discourse/app/templates/category-selector-autocomplete.hbr
diff --git a/app/assets/javascripts/discourse/templates/category-tag-autocomplete.hbr b/app/assets/javascripts/discourse/app/templates/category-tag-autocomplete.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/category-tag-autocomplete.hbr
rename to app/assets/javascripts/discourse/app/templates/category-tag-autocomplete.hbr
diff --git a/app/assets/javascripts/discourse/templates/components/about-page-users.hbs b/app/assets/javascripts/discourse/app/templates/components/about-page-users.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/about-page-users.hbs
rename to app/assets/javascripts/discourse/app/templates/components/about-page-users.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/activation-controls.hbs b/app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/activation-controls.hbs
rename to app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/activation-email-form.hbs b/app/assets/javascripts/discourse/app/templates/components/activation-email-form.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/activation-email-form.hbs
rename to app/assets/javascripts/discourse/app/templates/components/activation-email-form.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/avatar-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
rename to app/assets/javascripts/discourse/app/templates/components/avatar-uploader.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/backup-codes.hbs b/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/backup-codes.hbs
rename to app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/backup-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/backup-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/backup-uploader.hbs
rename to app/assets/javascripts/discourse/app/templates/components/backup-uploader.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/badge-button.hbs b/app/assets/javascripts/discourse/app/templates/components/badge-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/badge-button.hbs
rename to app/assets/javascripts/discourse/app/templates/components/badge-button.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/app/templates/components/badge-card.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/badge-card.hbs
rename to app/assets/javascripts/discourse/app/templates/components/badge-card.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/badge-selector.hbs b/app/assets/javascripts/discourse/app/templates/components/badge-selector.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/badge-selector.hbs
rename to app/assets/javascripts/discourse/app/templates/components/badge-selector.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/badge-title.hbs b/app/assets/javascripts/discourse/app/templates/components/badge-title.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/badge-title.hbs
rename to app/assets/javascripts/discourse/app/templates/components/badge-title.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
rename to app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs b/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs
rename to app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs b/app/assets/javascripts/discourse/app/templates/components/bulk-select-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs
rename to app/assets/javascripts/discourse/app/templates/components/bulk-select-button.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/cancel-link.hbs b/app/assets/javascripts/discourse/app/templates/components/cancel-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/cancel-link.hbs
rename to app/assets/javascripts/discourse/app/templates/components/cancel-link.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs
rename to app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/categories-and-top-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/categories-and-top-topics.hbs
rename to app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-boxes-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs
rename to app/assets/javascripts/discourse/app/templates/components/categories-boxes-topic.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
rename to app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
rename to app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/categories-only.hbs
rename to app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-topic-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
rename to app/assets/javascripts/discourse/app/templates/components/categories-topic-list.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/categories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/categories-with-featured-topics.hbs
rename to app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/category-name-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/category-name-fields.hbs
rename to app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/category-title-before.hbs b/app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/category-title-before.hbs
rename to app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/category-title-link.hbs
rename to app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/category-unread.hbs b/app/assets/javascripts/discourse/app/templates/components/category-unread.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/category-unread.hbs
rename to app/assets/javascripts/discourse/app/templates/components/category-unread.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/cdn-img.hbs b/app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/cdn-img.hbs
rename to app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/choose-message.hbs b/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/choose-message.hbs
rename to app/assets/javascripts/discourse/app/templates/components/choose-message.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/choose-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/choose-topic.hbs
rename to app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/color-input.hbs b/app/assets/javascripts/discourse/app/templates/components/color-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/color-input.hbs
rename to app/assets/javascripts/discourse/app/templates/components/color-input.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/color-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/color-picker.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/color-picker.hbs
rename to app/assets/javascripts/discourse/app/templates/components/color-picker.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-action-title.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
rename to app/assets/javascripts/discourse/app/templates/components/composer-action-title.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-editor.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/composer-editor.hbs
rename to app/assets/javascripts/discourse/app/templates/components/composer-editor.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/composer-messages.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-messages.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/composer-messages.hbs
rename to app/assets/javascripts/discourse/app/templates/components/composer-messages.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/composer-title.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-title.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/composer-title.hbs
rename to app/assets/javascripts/discourse/app/templates/components/composer-title.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/composer-toggles.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/composer-toggles.hbs
rename to app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
rename to app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/conditional-loading-section.hbs b/app/assets/javascripts/discourse/app/templates/components/conditional-loading-section.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/conditional-loading-section.hbs
rename to app/assets/javascripts/discourse/app/templates/components/conditional-loading-section.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs b/app/assets/javascripts/discourse/app/templates/components/conditional-loading-spinner.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs
rename to app/assets/javascripts/discourse/app/templates/components/conditional-loading-spinner.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/cook-text.hbs b/app/assets/javascripts/discourse/app/templates/components/cook-text.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/cook-text.hbs
rename to app/assets/javascripts/discourse/app/templates/components/cook-text.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/count-i18n.hbs b/app/assets/javascripts/discourse/app/templates/components/count-i18n.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/count-i18n.hbs
rename to app/assets/javascripts/discourse/app/templates/components/count-i18n.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/create-topic-button.hbs b/app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/create-topic-button.hbs
rename to app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/create-topics-notice.hbs b/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/create-topics-notice.hbs
rename to app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/csv-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
rename to app/assets/javascripts/discourse/app/templates/components/csv-uploader.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/custom-html-container.hbs b/app/assets/javascripts/discourse/app/templates/components/custom-html-container.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/custom-html-container.hbs
rename to app/assets/javascripts/discourse/app/templates/components/custom-html-container.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/d-button.hbs
rename to app/assets/javascripts/discourse/app/templates/components/d-button.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/d-editor.hbs
rename to app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/d-modal-cancel.hbs b/app/assets/javascripts/discourse/app/templates/components/d-modal-cancel.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/d-modal-cancel.hbs
rename to app/assets/javascripts/discourse/app/templates/components/d-modal-cancel.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/d-modal.hbs
rename to app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/d-navigation.hbs
rename to app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/date-input.hbs b/app/assets/javascripts/discourse/app/templates/components/date-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/date-input.hbs
rename to app/assets/javascripts/discourse/app/templates/components/date-input.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/date-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/date-picker.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/date-picker.hbs
rename to app/assets/javascripts/discourse/app/templates/components/date-picker.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs b/app/assets/javascripts/discourse/app/templates/components/date-time-input-range.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/date-time-input-range.hbs
rename to app/assets/javascripts/discourse/app/templates/components/date-time-input-range.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/date-time-input.hbs b/app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/date-time-input.hbs
rename to app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs b/app/assets/javascripts/discourse/app/templates/components/desktop-notification-config.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs
rename to app/assets/javascripts/discourse/app/templates/components/desktop-notification-config.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/directory-item.hbs b/app/assets/javascripts/discourse/app/templates/components/directory-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/directory-item.hbs
rename to app/assets/javascripts/discourse/app/templates/components/directory-item.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/directory-toggle.hbs b/app/assets/javascripts/discourse/app/templates/components/directory-toggle.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/directory-toggle.hbs
rename to app/assets/javascripts/discourse/app/templates/components/directory-toggle.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/disabled-icon.hbs b/app/assets/javascripts/discourse/app/templates/components/disabled-icon.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/disabled-icon.hbs
rename to app/assets/javascripts/discourse/app/templates/components/disabled-icon.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/app/templates/components/discourse-banner.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
rename to app/assets/javascripts/discourse/app/templates/components/discourse-banner.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs b/app/assets/javascripts/discourse/app/templates/components/discourse-linked-text.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/discourse-linked-text.hbs
rename to app/assets/javascripts/discourse/app/templates/components/discourse-linked-text.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-tag-bound.hbs b/app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/discourse-tag-bound.hbs
rename to app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/discovery-topics-list.hbs b/app/assets/javascripts/discourse/app/templates/components/discovery-topics-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/discovery-topics-list.hbs
rename to app/assets/javascripts/discourse/app/templates/components/discovery-topics-list.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
rename to app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-images.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/edit-category-images.hbs
rename to app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-panel.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-panel.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/edit-category-panel.hbs
rename to app/assets/javascripts/discourse/app/templates/components/edit-category-panel.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
rename to app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
rename to app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
rename to app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs
rename to app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-topic-template.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/edit-category-topic-template.hbs
rename to app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
rename to app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs.erb
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/emoji-picker.hbs.erb
rename to app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs.erb
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
rename to app/assets/javascripts/discourse/app/templates/components/emoji-uploader.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/expand-post.hbs b/app/assets/javascripts/discourse/app/templates/components/expand-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/expand-post.hbs
rename to app/assets/javascripts/discourse/app/templates/components/expand-post.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/featured-topic.hbs
rename to app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
rename to app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/flag-selection.hbs b/app/assets/javascripts/discourse/app/templates/components/flag-selection.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/flag-selection.hbs
rename to app/assets/javascripts/discourse/app/templates/components/flag-selection.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/flat-button.hbs b/app/assets/javascripts/discourse/app/templates/components/flat-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/flat-button.hbs
rename to app/assets/javascripts/discourse/app/templates/components/flat-button.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/footer-message.hbs b/app/assets/javascripts/discourse/app/templates/components/footer-message.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/footer-message.hbs
rename to app/assets/javascripts/discourse/app/templates/components/footer-message.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/future-date-input.hbs
rename to app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/generated-invite-link.hbs b/app/assets/javascripts/discourse/app/templates/components/generated-invite-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/generated-invite-link.hbs
rename to app/assets/javascripts/discourse/app/templates/components/generated-invite-link.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/global-notice.hbs b/app/assets/javascripts/discourse/app/templates/components/global-notice.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/global-notice.hbs
rename to app/assets/javascripts/discourse/app/templates/components/global-notice.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/google-search.hbs b/app/assets/javascripts/discourse/app/templates/components/google-search.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/google-search.hbs
rename to app/assets/javascripts/discourse/app/templates/components/google-search.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/group-activity-filter.hbs b/app/assets/javascripts/discourse/app/templates/components/group-activity-filter.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/group-activity-filter.hbs
rename to app/assets/javascripts/discourse/app/templates/components/group-activity-filter.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
rename to app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
rename to app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/group-index-toggle.hbs b/app/assets/javascripts/discourse/app/templates/components/group-index-toggle.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/group-index-toggle.hbs
rename to app/assets/javascripts/discourse/app/templates/components/group-index-toggle.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs
rename to app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
rename to app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
rename to app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/group-member.hbs b/app/assets/javascripts/discourse/app/templates/components/group-member.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/group-member.hbs
rename to app/assets/javascripts/discourse/app/templates/components/group-member.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs b/app/assets/javascripts/discourse/app/templates/components/group-membership-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
rename to app/assets/javascripts/discourse/app/templates/components/group-membership-button.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/group-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/group-navigation.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/group-navigation.hbs
rename to app/assets/javascripts/discourse/app/templates/components/group-navigation.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/app/templates/components/group-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/group-post.hbs
rename to app/assets/javascripts/discourse/app/templates/components/group-post.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/group-selector.hbs b/app/assets/javascripts/discourse/app/templates/components/group-selector.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/group-selector.hbs
rename to app/assets/javascripts/discourse/app/templates/components/group-selector.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs
rename to app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
rename to app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs
rename to app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/groups-info.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-info.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/groups-info.hbs
rename to app/assets/javascripts/discourse/app/templates/components/groups-info.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/ignored-user-list-item.hbs b/app/assets/javascripts/discourse/app/templates/components/ignored-user-list-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/ignored-user-list-item.hbs
rename to app/assets/javascripts/discourse/app/templates/components/ignored-user-list-item.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/ignored-user-list.hbs b/app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/ignored-user-list.hbs
rename to app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/image-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/image-uploader.hbs
rename to app/assets/javascripts/discourse/app/templates/components/image-uploader.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/images-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/images-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/images-uploader.hbs
rename to app/assets/javascripts/discourse/app/templates/components/images-uploader.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/input-tip.hbs b/app/assets/javascripts/discourse/app/templates/components/input-tip.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/input-tip.hbs
rename to app/assets/javascripts/discourse/app/templates/components/input-tip.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/invite-panel.hbs
rename to app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/app/templates/components/ip-lookup.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
rename to app/assets/javascripts/discourse/app/templates/components/ip-lookup.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs b/app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
rename to app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/link-to-input.hbs b/app/assets/javascripts/discourse/app/templates/components/link-to-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/link-to-input.hbs
rename to app/assets/javascripts/discourse/app/templates/components/link-to-input.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/login-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/login-buttons.hbs
rename to app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/mobile-category-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/mobile-category-topic.hbs
rename to app/assets/javascripts/discourse/app/templates/components/mobile-category-topic.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/mobile-nav.hbs b/app/assets/javascripts/discourse/app/templates/components/mobile-nav.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/mobile-nav.hbs
rename to app/assets/javascripts/discourse/app/templates/components/mobile-nav.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/modal-footer-close.hbs b/app/assets/javascripts/discourse/app/templates/components/modal-footer-close.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/modal-footer-close.hbs
rename to app/assets/javascripts/discourse/app/templates/components/modal-footer-close.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/modal-panel.hbs b/app/assets/javascripts/discourse/app/templates/components/modal-panel.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/modal-panel.hbs
rename to app/assets/javascripts/discourse/app/templates/components/modal-panel.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/modal-tab.hbs b/app/assets/javascripts/discourse/app/templates/components/modal-tab.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/modal-tab.hbs
rename to app/assets/javascripts/discourse/app/templates/components/modal-tab.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/nav-item.hbs b/app/assets/javascripts/discourse/app/templates/components/nav-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/nav-item.hbs
rename to app/assets/javascripts/discourse/app/templates/components/nav-item.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs b/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/navigation-bar.hbs
rename to app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/navigation-item.hbs b/app/assets/javascripts/discourse/app/templates/components/navigation-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/navigation-item.hbs
rename to app/assets/javascripts/discourse/app/templates/components/navigation-item.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/notification-consent-banner.hbs b/app/assets/javascripts/discourse/app/templates/components/notification-consent-banner.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/notification-consent-banner.hbs
rename to app/assets/javascripts/discourse/app/templates/components/notification-consent-banner.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/plugin-outlet.hbs b/app/assets/javascripts/discourse/app/templates/components/plugin-outlet.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/plugin-outlet.hbs
rename to app/assets/javascripts/discourse/app/templates/components/plugin-outlet.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/popup-input-tip.hbs b/app/assets/javascripts/discourse/app/templates/components/popup-input-tip.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/popup-input-tip.hbs
rename to app/assets/javascripts/discourse/app/templates/components/popup-input-tip.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/popup-menu.hbs b/app/assets/javascripts/discourse/app/templates/components/popup-menu.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/popup-menu.hbs
rename to app/assets/javascripts/discourse/app/templates/components/popup-menu.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/preference-checkbox.hbs b/app/assets/javascripts/discourse/app/templates/components/preference-checkbox.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/preference-checkbox.hbs
rename to app/assets/javascripts/discourse/app/templates/components/preference-checkbox.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/private-message-glyph.hbs b/app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/private-message-glyph.hbs
rename to app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/pwa-install-banner.hbs b/app/assets/javascripts/discourse/app/templates/components/pwa-install-banner.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/pwa-install-banner.hbs
rename to app/assets/javascripts/discourse/app/templates/components/pwa-install-banner.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/quote-button.hbs b/app/assets/javascripts/discourse/app/templates/components/quote-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/quote-button.hbs
rename to app/assets/javascripts/discourse/app/templates/components/quote-button.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/related-messages.hbs b/app/assets/javascripts/discourse/app/templates/components/related-messages.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/related-messages.hbs
rename to app/assets/javascripts/discourse/app/templates/components/related-messages.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-bundled-action.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-bundled-action.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-claimed-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-claimed-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-claimed-topic.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-claimed-topic.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-conversation-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-conversation-post.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-conversation-post.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by-name.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-created-by-name.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-created-by-name.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-created-by.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-created-by.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-created-by.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field-category.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-category.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-field-category.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-field-category.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-editor.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-field-editor.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-field-editor.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field-tags.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-tags.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-field-tags.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-field-tags.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field-text.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-text.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-field-text.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-field-text.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field-textarea.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-textarea.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-field-textarea.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-field-textarea.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-field.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-field.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-field.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-histories.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-histories.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-post-header.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-post-header.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-post-header.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-post-header.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-queued-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-queued-post.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-score.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-score.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-score.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-score.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-scores.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-scores.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-tags.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-tags.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-tags.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-tags.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-topic-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-topic-link.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-user.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/reviewable-user.hbs
rename to app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/save-controls.hbs b/app/assets/javascripts/discourse/app/templates/components/save-controls.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/save-controls.hbs
rename to app/assets/javascripts/discourse/app/templates/components/save-controls.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/score-value.hbs b/app/assets/javascripts/discourse/app/templates/components/score-value.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/score-value.hbs
rename to app/assets/javascripts/discourse/app/templates/components/score-value.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
rename to app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
rename to app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-input.hbs b/app/assets/javascripts/discourse/app/templates/components/second-factor-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/second-factor-input.hbs
rename to app/assets/javascripts/discourse/app/templates/components/second-factor-input.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/security-key-form.hbs b/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/security-key-form.hbs
rename to app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/selected-posts.hbs b/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/selected-posts.hbs
rename to app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/app/templates/components/share-panel.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/share-panel.hbs
rename to app/assets/javascripts/discourse/app/templates/components/share-panel.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/app/templates/components/share-popup.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/share-popup.hbs
rename to app/assets/javascripts/discourse/app/templates/components/share-popup.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/share-source.hbs b/app/assets/javascripts/discourse/app/templates/components/share-source.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/share-source.hbs
rename to app/assets/javascripts/discourse/app/templates/components/share-source.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/app/templates/components/shared-draft-controls.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/shared-draft-controls.hbs
rename to app/assets/javascripts/discourse/app/templates/components/shared-draft-controls.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/signup-cta.hbs b/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/signup-cta.hbs
rename to app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
rename to app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/tag-drop-link.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-drop-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/tag-drop-link.hbs
rename to app/assets/javascripts/discourse/app/templates/components/tag-drop-link.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/tag-groups-form.hbs
rename to app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/tag-info.hbs
rename to app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/tag-list.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/tag-list.hbs
rename to app/assets/javascripts/discourse/app/templates/components/tag-list.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/tap-tile-grid.hbs b/app/assets/javascripts/discourse/app/templates/components/tap-tile-grid.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/tap-tile-grid.hbs
rename to app/assets/javascripts/discourse/app/templates/components/tap-tile-grid.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/tap-tile.hbs b/app/assets/javascripts/discourse/app/templates/components/tap-tile.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/tap-tile.hbs
rename to app/assets/javascripts/discourse/app/templates/components/tap-tile.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/text-overflow.hbs b/app/assets/javascripts/discourse/app/templates/components/text-overflow.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/text-overflow.hbs
rename to app/assets/javascripts/discourse/app/templates/components/text-overflow.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/time-input.hbs b/app/assets/javascripts/discourse/app/templates/components/time-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/time-input.hbs
rename to app/assets/javascripts/discourse/app/templates/components/time-input.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/top-period-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/top-period-buttons.hbs
rename to app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/topic-category.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-category.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/topic-category.hbs
rename to app/assets/javascripts/discourse/app/templates/components/topic-category.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-entrance.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
rename to app/assets/javascripts/discourse/app/templates/components/topic-entrance.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
rename to app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/topic-join-group-notice.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-join-group-notice.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/topic-join-group-notice.hbs
rename to app/assets/javascripts/discourse/app/templates/components/topic-join-group-notice.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/topic-list-item.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-list-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/topic-list-item.hbs
rename to app/assets/javascripts/discourse/app/templates/components/topic-list-item.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/topic-list.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/topic-list.hbs
rename to app/assets/javascripts/discourse/app/templates/components/topic-list.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/topic-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-navigation.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/topic-navigation.hbs
rename to app/assets/javascripts/discourse/app/templates/components/topic-navigation.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-post-badges.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/topic-post-badges.hbs
rename to app/assets/javascripts/discourse/app/templates/components/topic-post-badges.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-progress.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/topic-progress.hbs
rename to app/assets/javascripts/discourse/app/templates/components/topic-progress.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/topic-status.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-status.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/topic-status.hbs
rename to app/assets/javascripts/discourse/app/templates/components/topic-status.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/topic-timer-info.hbs
rename to app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/topic-title.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-title.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/topic-title.hbs
rename to app/assets/javascripts/discourse/app/templates/components/topic-title.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/track-selected.hbs b/app/assets/javascripts/discourse/app/templates/components/track-selected.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/track-selected.hbs
rename to app/assets/javascripts/discourse/app/templates/components/track-selected.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-badge.hbs b/app/assets/javascripts/discourse/app/templates/components/user-badge.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-badge.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-badge.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/app/templates/components/user-fields/confirm.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-fields/confirm.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/app/templates/components/user-fields/dropdown.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-fields/dropdown.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/app/templates/components/user-fields/text.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-fields/text.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs b/app/assets/javascripts/discourse/app/templates/components/user-flag-percentage.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-flag-percentage.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-flag-percentage.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-info.hbs b/app/assets/javascripts/discourse/app/templates/components/user-info.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-info.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-info.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs b/app/assets/javascripts/discourse/app/templates/components/user-profile-avatar.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-profile-avatar.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/app/templates/components/user-stat.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-stat.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-stat.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/app/templates/components/user-stream-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-stream-item.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream.hbs b/app/assets/javascripts/discourse/app/templates/components/user-stream.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-stream.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-stream.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs b/app/assets/javascripts/discourse/app/templates/components/user-summary-category-search.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-summary-category-search.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs b/app/assets/javascripts/discourse/app/templates/components/user-summary-section.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-summary-section.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/user-summary-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-summary-topic.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs b/app/assets/javascripts/discourse/app/templates/components/user-summary-topics-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-summary-topics-list.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-user.hbs b/app/assets/javascripts/discourse/app/templates/components/user-summary-user.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-summary-user.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-summary-user.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs b/app/assets/javascripts/discourse/app/templates/components/user-summary-users-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs
rename to app/assets/javascripts/discourse/app/templates/components/user-summary-users-list.hbs
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/app/templates/composer.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/composer.hbs
rename to app/assets/javascripts/discourse/app/templates/composer.hbs
diff --git a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs b/app/assets/javascripts/discourse/app/templates/composer/custom-body.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/composer/custom-body.hbs
rename to app/assets/javascripts/discourse/app/templates/composer/custom-body.hbs
diff --git a/app/assets/javascripts/discourse/templates/composer/education.hbs b/app/assets/javascripts/discourse/app/templates/composer/education.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/composer/education.hbs
rename to app/assets/javascripts/discourse/app/templates/composer/education.hbs
diff --git a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
rename to app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
diff --git a/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs b/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
rename to app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/app/templates/discovery.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/discovery.hbs
rename to app/assets/javascripts/discourse/app/templates/discovery.hbs
diff --git a/app/assets/javascripts/discourse/templates/discovery/categories.hbs b/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/discovery/categories.hbs
rename to app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/discovery/topics.hbs
rename to app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
diff --git a/app/assets/javascripts/discourse/templates/email-login.hbs b/app/assets/javascripts/discourse/app/templates/email-login.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/email-login.hbs
rename to app/assets/javascripts/discourse/app/templates/email-login.hbs
diff --git a/app/assets/javascripts/discourse/templates/emoji-picker-recent.hbr b/app/assets/javascripts/discourse/app/templates/emoji-picker-recent.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/emoji-picker-recent.hbr
rename to app/assets/javascripts/discourse/app/templates/emoji-picker-recent.hbr
diff --git a/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/templates/emoji-selector-autocomplete.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.hbr
rename to app/assets/javascripts/discourse/app/templates/emoji-selector-autocomplete.hbr
diff --git a/app/assets/javascripts/discourse/templates/exception.hbs b/app/assets/javascripts/discourse/app/templates/exception.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/exception.hbs
rename to app/assets/javascripts/discourse/app/templates/exception.hbs
diff --git a/app/assets/javascripts/discourse/templates/flat-button.hbr b/app/assets/javascripts/discourse/app/templates/flat-button.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/flat-button.hbr
rename to app/assets/javascripts/discourse/app/templates/flat-button.hbr
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/full-page-search.hbs
rename to app/assets/javascripts/discourse/app/templates/full-page-search.hbs
diff --git a/app/assets/javascripts/discourse/templates/group-activity-posts.hbs b/app/assets/javascripts/discourse/app/templates/group-activity-posts.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/group-activity-posts.hbs
rename to app/assets/javascripts/discourse/app/templates/group-activity-posts.hbs
diff --git a/app/assets/javascripts/discourse/templates/group-activity-topics.hbs b/app/assets/javascripts/discourse/app/templates/group-activity-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/group-activity-topics.hbs
rename to app/assets/javascripts/discourse/app/templates/group-activity-topics.hbs
diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/app/templates/group-index.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/group-index.hbs
rename to app/assets/javascripts/discourse/app/templates/group-index.hbs
diff --git a/app/assets/javascripts/discourse/templates/group-requests.hbs b/app/assets/javascripts/discourse/app/templates/group-requests.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/group-requests.hbs
rename to app/assets/javascripts/discourse/app/templates/group-requests.hbs
diff --git a/app/assets/javascripts/discourse/templates/group-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/templates/group-selector-autocomplete.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/group-selector-autocomplete.hbr
rename to app/assets/javascripts/discourse/app/templates/group-selector-autocomplete.hbr
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/app/templates/group.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/group.hbs
rename to app/assets/javascripts/discourse/app/templates/group.hbs
diff --git a/app/assets/javascripts/discourse/templates/group/activity.hbs b/app/assets/javascripts/discourse/app/templates/group/activity.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/group/activity.hbs
rename to app/assets/javascripts/discourse/app/templates/group/activity.hbs
diff --git a/app/assets/javascripts/discourse/templates/group/manage.hbs b/app/assets/javascripts/discourse/app/templates/group/manage.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/group/manage.hbs
rename to app/assets/javascripts/discourse/app/templates/group/manage.hbs
diff --git a/app/assets/javascripts/discourse/templates/group/manage/interaction.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/interaction.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/group/manage/interaction.hbs
rename to app/assets/javascripts/discourse/app/templates/group/manage/interaction.hbs
diff --git a/app/assets/javascripts/discourse/templates/group/manage/logs.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/logs.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/group/manage/logs.hbs
rename to app/assets/javascripts/discourse/app/templates/group/manage/logs.hbs
diff --git a/app/assets/javascripts/discourse/templates/group/manage/membership.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/membership.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/group/manage/membership.hbs
rename to app/assets/javascripts/discourse/app/templates/group/manage/membership.hbs
diff --git a/app/assets/javascripts/discourse/templates/group/manage/profile.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/profile.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/group/manage/profile.hbs
rename to app/assets/javascripts/discourse/app/templates/group/manage/profile.hbs
diff --git a/app/assets/javascripts/discourse/templates/group/messages.hbs b/app/assets/javascripts/discourse/app/templates/group/messages.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/group/messages.hbs
rename to app/assets/javascripts/discourse/app/templates/group/messages.hbs
diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/app/templates/groups/index.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/groups/index.hbs
rename to app/assets/javascripts/discourse/app/templates/groups/index.hbs
diff --git a/app/assets/javascripts/discourse/templates/groups/new.hbs b/app/assets/javascripts/discourse/app/templates/groups/new.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/groups/new.hbs
rename to app/assets/javascripts/discourse/app/templates/groups/new.hbs
diff --git a/app/assets/javascripts/discourse/templates/hide-modal.hbs b/app/assets/javascripts/discourse/app/templates/hide-modal.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/hide-modal.hbs
rename to app/assets/javascripts/discourse/app/templates/hide-modal.hbs
diff --git a/app/assets/javascripts/discourse/templates/invites.hbs b/app/assets/javascripts/discourse/app/templates/invites.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/invites.hbs
rename to app/assets/javascripts/discourse/app/templates/invites.hbs
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/invites/show.hbs
rename to app/assets/javascripts/discourse/app/templates/invites/show.hbs
diff --git a/app/assets/javascripts/discourse/templates/list/action-list.hbr b/app/assets/javascripts/discourse/app/templates/list/action-list.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/list/action-list.hbr
rename to app/assets/javascripts/discourse/app/templates/list/action-list.hbr
diff --git a/app/assets/javascripts/discourse/templates/list/activity-column.hbr b/app/assets/javascripts/discourse/app/templates/list/activity-column.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/list/activity-column.hbr
rename to app/assets/javascripts/discourse/app/templates/list/activity-column.hbr
diff --git a/app/assets/javascripts/discourse/templates/list/category-column.hbr b/app/assets/javascripts/discourse/app/templates/list/category-column.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/list/category-column.hbr
rename to app/assets/javascripts/discourse/app/templates/list/category-column.hbr
diff --git a/app/assets/javascripts/discourse/templates/list/post-count-or-badges.hbr b/app/assets/javascripts/discourse/app/templates/list/post-count-or-badges.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/list/post-count-or-badges.hbr
rename to app/assets/javascripts/discourse/app/templates/list/post-count-or-badges.hbr
diff --git a/app/assets/javascripts/discourse/templates/list/posters-column.hbr b/app/assets/javascripts/discourse/app/templates/list/posters-column.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/list/posters-column.hbr
rename to app/assets/javascripts/discourse/app/templates/list/posters-column.hbr
diff --git a/app/assets/javascripts/discourse/templates/list/posts-count-column.hbr b/app/assets/javascripts/discourse/app/templates/list/posts-count-column.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/list/posts-count-column.hbr
rename to app/assets/javascripts/discourse/app/templates/list/posts-count-column.hbr
diff --git a/app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr b/app/assets/javascripts/discourse/app/templates/list/topic-excerpt.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/list/topic-excerpt.hbr
rename to app/assets/javascripts/discourse/app/templates/list/topic-excerpt.hbr
diff --git a/app/assets/javascripts/discourse/templates/list/topic-list-item.hbr b/app/assets/javascripts/discourse/app/templates/list/topic-list-item.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/list/topic-list-item.hbr
rename to app/assets/javascripts/discourse/app/templates/list/topic-list-item.hbr
diff --git a/app/assets/javascripts/discourse/templates/list/unread-indicator.hbr b/app/assets/javascripts/discourse/app/templates/list/unread-indicator.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/list/unread-indicator.hbr
rename to app/assets/javascripts/discourse/app/templates/list/unread-indicator.hbr
diff --git a/app/assets/javascripts/discourse/templates/list/visited-line.hbr b/app/assets/javascripts/discourse/app/templates/list/visited-line.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/list/visited-line.hbr
rename to app/assets/javascripts/discourse/app/templates/list/visited-line.hbr
diff --git a/app/assets/javascripts/discourse/templates/loading.hbs b/app/assets/javascripts/discourse/app/templates/loading.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/loading.hbs
rename to app/assets/javascripts/discourse/app/templates/loading.hbs
diff --git a/app/assets/javascripts/discourse/templates/login-preferences.hbs b/app/assets/javascripts/discourse/app/templates/login-preferences.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/login-preferences.hbs
rename to app/assets/javascripts/discourse/app/templates/login-preferences.hbs
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/basic-topic-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
rename to app/assets/javascripts/discourse/app/templates/mobile/components/basic-topic-list.hbs
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
rename to app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/mobile/components/categories-with-featured-topics.hbs
rename to app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/directory-item.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/directory-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/mobile/components/directory-item.hbs
rename to app/assets/javascripts/discourse/app/templates/mobile/components/directory-item.hbs
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
rename to app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
rename to app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs b/app/assets/javascripts/discourse/app/templates/mobile/discovery/categories.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
rename to app/assets/javascripts/discourse/app/templates/mobile/discovery/categories.hbs
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
rename to app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
diff --git a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/mobile/group-index.hbs
rename to app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs
diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr b/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.hbr
rename to app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr
diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
rename to app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
diff --git a/app/assets/javascripts/discourse/templates/mobile/users.hbs b/app/assets/javascripts/discourse/app/templates/mobile/users.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/mobile/users.hbs
rename to app/assets/javascripts/discourse/app/templates/mobile/users.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal.hbs b/app/assets/javascripts/discourse/app/templates/modal.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal.hbs
rename to app/assets/javascripts/discourse/app/templates/modal.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-edit.hbs b/app/assets/javascripts/discourse/app/templates/modal/activation-edit.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/activation-edit.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/activation-edit.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/app/templates/modal/activation-resent.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/activation-resent.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/add-post-notice.hbs b/app/assets/javascripts/discourse/app/templates/modal/add-post-notice.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/add-post-notice.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/add-post-notice.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs b/app/assets/javascripts/discourse/app/templates/modal/associate-account-confirm.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/associate-account-confirm.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/associate-account-confirm.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/auth-token.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/bookmark.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs b/app/assets/javascripts/discourse/app/templates/modal/bulk-actions-buttons.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/bulk-actions-buttons.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/bulk-actions-buttons.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-change-category.hbs b/app/assets/javascripts/discourse/app/templates/modal/bulk-change-category.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/bulk-change-category.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/bulk-change-category.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs b/app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/bulk-notification-level.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/change-owner.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs b/app/assets/javascripts/discourse/app/templates/modal/change-timestamp.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/change-timestamp.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/convert-to-public-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/convert-to-public-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/convert-to-public-topic.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/convert-to-public-topic.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/create-account.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs b/app/assets/javascripts/discourse/app/templates/modal/delete-topic-disallowed.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/delete-topic-disallowed.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs b/app/assets/javascripts/discourse/app/templates/modal/dismiss-read.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/dismiss-read.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs b/app/assets/javascripts/discourse/app/templates/modal/edit-category.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/edit-category.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/edit-category.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs b/app/assets/javascripts/discourse/app/templates/modal/edit-topic-timer.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/edit-topic-timer.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/explain-reviewable.hbs b/app/assets/javascripts/discourse/app/templates/modal/explain-reviewable.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/explain-reviewable.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/explain-reviewable.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic-on-profile.hbs b/app/assets/javascripts/discourse/app/templates/modal/feature-topic-on-profile.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/feature-topic-on-profile.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/feature-topic-on-profile.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/feature-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/feature-topic.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/app/templates/modal/flag.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/flag.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/flag.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/app/templates/modal/forgot-password.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/forgot-password.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs b/app/assets/javascripts/discourse/app/templates/modal/grant-badge.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/grant-badge.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/grant-badge.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/group-add-members.hbs b/app/assets/javascripts/discourse/app/templates/modal/group-add-members.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/group-add-members.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/group-add-members.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs b/app/assets/javascripts/discourse/app/templates/modal/group-bulk-add.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/group-bulk-add.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/app/templates/modal/history.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/history.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/history.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/ignore-duration-with-username.hbs b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/ignore-duration-with-username.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/ignore-duration.hbs b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/ignore-duration.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/insert-hyperlink.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs b/app/assets/javascripts/discourse/app/templates/modal/jump-to-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/jump-to-post.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/app/templates/modal/keyboard-shortcuts-help.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/keyboard-shortcuts-help.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/modal/login.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/login.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/login.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/app/templates/modal/not-activated.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/not-activated.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/not-activated.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs b/app/assets/javascripts/discourse/app/templates/modal/post-enqueued.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/post-enqueued.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/publish-page.hbs b/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/publish-page.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/raw-email.hbs b/app/assets/javascripts/discourse/app/templates/modal/raw-email.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/raw-email.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/raw-email.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/rename-tag.hbs b/app/assets/javascripts/discourse/app/templates/modal/rename-tag.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/rename-tag.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/rename-tag.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/app/templates/modal/reorder-categories.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/reorder-categories.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs b/app/assets/javascripts/discourse/app/templates/modal/request-group-membership-form.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/request-group-membership-form.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-security-key.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/second-factor-add-security-key.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/second-factor-add-security-key.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/second-factor-add-totp.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/share-and-invite.hbs b/app/assets/javascripts/discourse/app/templates/modal/share-and-invite.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/share-and-invite.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/share-and-invite.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/tag-upload.hbs b/app/assets/javascripts/discourse/app/templates/modal/tag-upload.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/tag-upload.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/tag-upload.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/app/templates/modal/topic-bulk-actions.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/topic-bulk-actions.hbs
diff --git a/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs b/app/assets/javascripts/discourse/app/templates/modal/upload-selector.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/modal/upload-selector.hbs
rename to app/assets/javascripts/discourse/app/templates/modal/upload-selector.hbs
diff --git a/app/assets/javascripts/discourse/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/app/templates/navigation/categories.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/navigation/categories.hbs
rename to app/assets/javascripts/discourse/app/templates/navigation/categories.hbs
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/app/templates/navigation/category.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/navigation/category.hbs
rename to app/assets/javascripts/discourse/app/templates/navigation/category.hbs
diff --git a/app/assets/javascripts/discourse/templates/navigation/default.hbs b/app/assets/javascripts/discourse/app/templates/navigation/default.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/navigation/default.hbs
rename to app/assets/javascripts/discourse/app/templates/navigation/default.hbs
diff --git a/app/assets/javascripts/discourse/templates/outlet-list.hbs b/app/assets/javascripts/discourse/app/templates/outlet-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/outlet-list.hbs
rename to app/assets/javascripts/discourse/app/templates/outlet-list.hbs
diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/app/templates/password-reset.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/password-reset.hbs
rename to app/assets/javascripts/discourse/app/templates/password-reset.hbs
diff --git a/app/assets/javascripts/discourse/templates/post/poster-avatar.hbr b/app/assets/javascripts/discourse/app/templates/post/poster-avatar.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/post/poster-avatar.hbr
rename to app/assets/javascripts/discourse/app/templates/post/poster-avatar.hbr
diff --git a/app/assets/javascripts/discourse/templates/preferences-email.hbs b/app/assets/javascripts/discourse/app/templates/preferences-email.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/preferences-email.hbs
rename to app/assets/javascripts/discourse/app/templates/preferences-email.hbs
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
rename to app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
diff --git a/app/assets/javascripts/discourse/templates/preferences-username.hbs b/app/assets/javascripts/discourse/app/templates/preferences-username.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/preferences-username.hbs
rename to app/assets/javascripts/discourse/app/templates/preferences-username.hbs
diff --git a/app/assets/javascripts/discourse/templates/preferences.hbs b/app/assets/javascripts/discourse/app/templates/preferences.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/preferences.hbs
rename to app/assets/javascripts/discourse/app/templates/preferences.hbs
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/preferences/account.hbs
rename to app/assets/javascripts/discourse/app/templates/preferences/account.hbs
diff --git a/app/assets/javascripts/discourse/templates/preferences/apps.hbs b/app/assets/javascripts/discourse/app/templates/preferences/apps.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/preferences/apps.hbs
rename to app/assets/javascripts/discourse/app/templates/preferences/apps.hbs
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/app/templates/preferences/categories.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/preferences/categories.hbs
rename to app/assets/javascripts/discourse/app/templates/preferences/categories.hbs
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/app/templates/preferences/emails.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/preferences/emails.hbs
rename to app/assets/javascripts/discourse/app/templates/preferences/emails.hbs
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/preferences/interface.hbs
rename to app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/preferences/notifications.hbs
rename to app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/preferences/profile.hbs
rename to app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
diff --git a/app/assets/javascripts/discourse/templates/preferences/tags.hbs b/app/assets/javascripts/discourse/app/templates/preferences/tags.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/preferences/tags.hbs
rename to app/assets/javascripts/discourse/app/templates/preferences/tags.hbs
diff --git a/app/assets/javascripts/discourse/templates/preferences/users.hbs b/app/assets/javascripts/discourse/app/templates/preferences/users.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/preferences/users.hbs
rename to app/assets/javascripts/discourse/app/templates/preferences/users.hbs
diff --git a/app/assets/javascripts/discourse/templates/review-index.hbs b/app/assets/javascripts/discourse/app/templates/review-index.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/review-index.hbs
rename to app/assets/javascripts/discourse/app/templates/review-index.hbs
diff --git a/app/assets/javascripts/discourse/templates/review-settings.hbs b/app/assets/javascripts/discourse/app/templates/review-settings.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/review-settings.hbs
rename to app/assets/javascripts/discourse/app/templates/review-settings.hbs
diff --git a/app/assets/javascripts/discourse/templates/review-show.hbs b/app/assets/javascripts/discourse/app/templates/review-show.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/review-show.hbs
rename to app/assets/javascripts/discourse/app/templates/review-show.hbs
diff --git a/app/assets/javascripts/discourse/templates/review-topics.hbs b/app/assets/javascripts/discourse/app/templates/review-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/review-topics.hbs
rename to app/assets/javascripts/discourse/app/templates/review-topics.hbs
diff --git a/app/assets/javascripts/discourse/templates/review.hbs b/app/assets/javascripts/discourse/app/templates/review.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/review.hbs
rename to app/assets/javascripts/discourse/app/templates/review.hbs
diff --git a/app/assets/javascripts/discourse/templates/selected-posts.hbs b/app/assets/javascripts/discourse/app/templates/selected-posts.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/selected-posts.hbs
rename to app/assets/javascripts/discourse/app/templates/selected-posts.hbs
diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/app/templates/static.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/static.hbs
rename to app/assets/javascripts/discourse/app/templates/static.hbs
diff --git a/app/assets/javascripts/discourse/templates/tag-groups-edit.hbs b/app/assets/javascripts/discourse/app/templates/tag-groups-edit.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/tag-groups-edit.hbs
rename to app/assets/javascripts/discourse/app/templates/tag-groups-edit.hbs
diff --git a/app/assets/javascripts/discourse/templates/tag-groups-index.hbs b/app/assets/javascripts/discourse/app/templates/tag-groups-index.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/tag-groups-index.hbs
rename to app/assets/javascripts/discourse/app/templates/tag-groups-index.hbs
diff --git a/app/assets/javascripts/discourse/templates/tag-groups-new.hbs b/app/assets/javascripts/discourse/app/templates/tag-groups-new.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/tag-groups-new.hbs
rename to app/assets/javascripts/discourse/app/templates/tag-groups-new.hbs
diff --git a/app/assets/javascripts/discourse/templates/tag-groups.hbs b/app/assets/javascripts/discourse/app/templates/tag-groups.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/tag-groups.hbs
rename to app/assets/javascripts/discourse/app/templates/tag-groups.hbs
diff --git a/app/assets/javascripts/discourse/templates/tags.hbs b/app/assets/javascripts/discourse/app/templates/tags.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/tags.hbs
rename to app/assets/javascripts/discourse/app/templates/tags.hbs
diff --git a/app/assets/javascripts/discourse/templates/tags/index.hbs b/app/assets/javascripts/discourse/app/templates/tags/index.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/tags/index.hbs
rename to app/assets/javascripts/discourse/app/templates/tags/index.hbs
diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/app/templates/tags/show.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/tags/show.hbs
rename to app/assets/javascripts/discourse/app/templates/tags/show.hbs
diff --git a/app/assets/javascripts/discourse/templates/topic-list-header-column.hbr b/app/assets/javascripts/discourse/app/templates/topic-list-header-column.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/topic-list-header-column.hbr
rename to app/assets/javascripts/discourse/app/templates/topic-list-header-column.hbr
diff --git a/app/assets/javascripts/discourse/templates/topic-list-header.hbr b/app/assets/javascripts/discourse/app/templates/topic-list-header.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/topic-list-header.hbr
rename to app/assets/javascripts/discourse/app/templates/topic-list-header.hbr
diff --git a/app/assets/javascripts/discourse/templates/topic-post-badges.hbr b/app/assets/javascripts/discourse/app/templates/topic-post-badges.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/topic-post-badges.hbr
rename to app/assets/javascripts/discourse/app/templates/topic-post-badges.hbr
diff --git a/app/assets/javascripts/discourse/templates/topic-status.hbr b/app/assets/javascripts/discourse/app/templates/topic-status.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/topic-status.hbr
rename to app/assets/javascripts/discourse/app/templates/topic-status.hbr
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/topic.hbs
rename to app/assets/javascripts/discourse/app/templates/topic.hbs
diff --git a/app/assets/javascripts/discourse/templates/unknown.hbs b/app/assets/javascripts/discourse/app/templates/unknown.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/unknown.hbs
rename to app/assets/javascripts/discourse/app/templates/unknown.hbs
diff --git a/app/assets/javascripts/discourse/templates/user-card.hbs b/app/assets/javascripts/discourse/app/templates/user-card.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user-card.hbs
rename to app/assets/javascripts/discourse/app/templates/user-card.hbs
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user-invited-show.hbs
rename to app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
diff --git a/app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs b/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user-private-messages-tags.hbs
rename to app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs
diff --git a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/templates/user-selector-autocomplete.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user-selector-autocomplete.hbr
rename to app/assets/javascripts/discourse/app/templates/user-selector-autocomplete.hbr
diff --git a/app/assets/javascripts/discourse/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user-topics-list.hbs
rename to app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user.hbs
rename to app/assets/javascripts/discourse/app/templates/user.hbs
diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user/activity.hbs
rename to app/assets/javascripts/discourse/app/templates/user/activity.hbs
diff --git a/app/assets/javascripts/discourse/templates/user/badges.hbs b/app/assets/javascripts/discourse/app/templates/user/badges.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user/badges.hbs
rename to app/assets/javascripts/discourse/app/templates/user/badges.hbs
diff --git a/app/assets/javascripts/discourse/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user/bookmarks.hbs
rename to app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/app/templates/user/messages.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user/messages.hbs
rename to app/assets/javascripts/discourse/app/templates/user/messages.hbs
diff --git a/app/assets/javascripts/discourse/templates/user/notifications-index.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user/notifications-index.hbs
rename to app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user/notifications.hbs
rename to app/assets/javascripts/discourse/app/templates/user/notifications.hbs
diff --git a/app/assets/javascripts/discourse/templates/user/posts.hbs b/app/assets/javascripts/discourse/app/templates/user/posts.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user/posts.hbs
rename to app/assets/javascripts/discourse/app/templates/user/posts.hbs
diff --git a/app/assets/javascripts/discourse/templates/user/profile-hidden.hbs b/app/assets/javascripts/discourse/app/templates/user/profile-hidden.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user/profile-hidden.hbs
rename to app/assets/javascripts/discourse/app/templates/user/profile-hidden.hbs
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/app/templates/user/stream.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user/stream.hbs
rename to app/assets/javascripts/discourse/app/templates/user/stream.hbs
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/app/templates/user/summary.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user/summary.hbs
rename to app/assets/javascripts/discourse/app/templates/user/summary.hbs
diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/app/templates/users.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/users.hbs
rename to app/assets/javascripts/discourse/app/templates/users.hbs
diff --git a/app/assets/javascripts/discourse/widgets/actions-summary.js b/app/assets/javascripts/discourse/app/widgets/actions-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/actions-summary.js
rename to app/assets/javascripts/discourse/app/widgets/actions-summary.js
diff --git a/app/assets/javascripts/discourse/widgets/avatar-flair.js b/app/assets/javascripts/discourse/app/widgets/avatar-flair.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/avatar-flair.js
rename to app/assets/javascripts/discourse/app/widgets/avatar-flair.js
diff --git a/app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js b/app/assets/javascripts/discourse/app/widgets/bookmark-reminder-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/bookmark-reminder-notification-item.js
rename to app/assets/javascripts/discourse/app/widgets/bookmark-reminder-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/button.js b/app/assets/javascripts/discourse/app/widgets/button.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/button.js
rename to app/assets/javascripts/discourse/app/widgets/button.js
diff --git a/app/assets/javascripts/discourse/widgets/category-link.js b/app/assets/javascripts/discourse/app/widgets/category-link.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/category-link.js
rename to app/assets/javascripts/discourse/app/widgets/category-link.js
diff --git a/app/assets/javascripts/discourse/widgets/component-connector.js b/app/assets/javascripts/discourse/app/widgets/component-connector.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/component-connector.js
rename to app/assets/javascripts/discourse/app/widgets/component-connector.js
diff --git a/app/assets/javascripts/discourse/widgets/connector.js b/app/assets/javascripts/discourse/app/widgets/connector.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/connector.js
rename to app/assets/javascripts/discourse/app/widgets/connector.js
diff --git a/app/assets/javascripts/discourse/widgets/custom-notification-item.js b/app/assets/javascripts/discourse/app/widgets/custom-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/custom-notification-item.js
rename to app/assets/javascripts/discourse/app/widgets/custom-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/decorator-helper.js b/app/assets/javascripts/discourse/app/widgets/decorator-helper.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/decorator-helper.js
rename to app/assets/javascripts/discourse/app/widgets/decorator-helper.js
diff --git a/app/assets/javascripts/discourse/widgets/default-notification-item.js b/app/assets/javascripts/discourse/app/widgets/default-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/default-notification-item.js
rename to app/assets/javascripts/discourse/app/widgets/default-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/discourse-tags.js b/app/assets/javascripts/discourse/app/widgets/discourse-tags.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/discourse-tags.js
rename to app/assets/javascripts/discourse/app/widgets/discourse-tags.js
diff --git a/app/assets/javascripts/discourse/widgets/embedded-post.js b/app/assets/javascripts/discourse/app/widgets/embedded-post.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/embedded-post.js
rename to app/assets/javascripts/discourse/app/widgets/embedded-post.js
diff --git a/app/assets/javascripts/discourse/widgets/emoji.js b/app/assets/javascripts/discourse/app/widgets/emoji.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/emoji.js
rename to app/assets/javascripts/discourse/app/widgets/emoji.js
diff --git a/app/assets/javascripts/discourse/widgets/footer-nav.js b/app/assets/javascripts/discourse/app/widgets/footer-nav.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/footer-nav.js
rename to app/assets/javascripts/discourse/app/widgets/footer-nav.js
diff --git a/app/assets/javascripts/discourse/widgets/glue.js b/app/assets/javascripts/discourse/app/widgets/glue.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/glue.js
rename to app/assets/javascripts/discourse/app/widgets/glue.js
diff --git a/app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js b/app/assets/javascripts/discourse/app/widgets/group-message-summary-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js
rename to app/assets/javascripts/discourse/app/widgets/group-message-summary-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-categories.js b/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/hamburger-categories.js
rename to app/assets/javascripts/discourse/app/widgets/hamburger-categories.js
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js b/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/hamburger-menu.js
rename to app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/hbs-compiler.js b/app/assets/javascripts/discourse/app/widgets/hbs-compiler.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/hbs-compiler.js
rename to app/assets/javascripts/discourse/app/widgets/hbs-compiler.js
diff --git a/app/assets/javascripts/discourse/widgets/header-contents.js b/app/assets/javascripts/discourse/app/widgets/header-contents.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/header-contents.js
rename to app/assets/javascripts/discourse/app/widgets/header-contents.js
diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js b/app/assets/javascripts/discourse/app/widgets/header-topic-info.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/header-topic-info.js
rename to app/assets/javascripts/discourse/app/widgets/header-topic-info.js
diff --git a/app/assets/javascripts/discourse/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/header.js
rename to app/assets/javascripts/discourse/app/widgets/header.js
diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js b/app/assets/javascripts/discourse/app/widgets/home-logo.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/home-logo.js
rename to app/assets/javascripts/discourse/app/widgets/home-logo.js
diff --git a/app/assets/javascripts/discourse/widgets/hooks.js b/app/assets/javascripts/discourse/app/widgets/hooks.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/hooks.js
rename to app/assets/javascripts/discourse/app/widgets/hooks.js
diff --git a/app/assets/javascripts/discourse/widgets/invitee-accepted-notification-item.js b/app/assets/javascripts/discourse/app/widgets/invitee-accepted-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/invitee-accepted-notification-item.js
rename to app/assets/javascripts/discourse/app/widgets/invitee-accepted-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js b/app/assets/javascripts/discourse/app/widgets/liked-consolidated-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js
rename to app/assets/javascripts/discourse/app/widgets/liked-consolidated-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/liked-notification-item.js b/app/assets/javascripts/discourse/app/widgets/liked-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/liked-notification-item.js
rename to app/assets/javascripts/discourse/app/widgets/liked-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/link.js b/app/assets/javascripts/discourse/app/widgets/link.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/link.js
rename to app/assets/javascripts/discourse/app/widgets/link.js
diff --git a/app/assets/javascripts/discourse/widgets/membership-request-accepted-notification-item.js b/app/assets/javascripts/discourse/app/widgets/membership-request-accepted-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/membership-request-accepted-notification-item.js
rename to app/assets/javascripts/discourse/app/widgets/membership-request-accepted-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js b/app/assets/javascripts/discourse/app/widgets/membership-request-consolidated-notification-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js
rename to app/assets/javascripts/discourse/app/widgets/membership-request-consolidated-notification-item.js
diff --git a/app/assets/javascripts/discourse/widgets/menu-panel.js b/app/assets/javascripts/discourse/app/widgets/menu-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/menu-panel.js
rename to app/assets/javascripts/discourse/app/widgets/menu-panel.js
diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-admin-menu.js
rename to app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js b/app/assets/javascripts/discourse/app/widgets/post-cooked.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-cooked.js
rename to app/assets/javascripts/discourse/app/widgets/post-cooked.js
diff --git a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js b/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-edits-indicator.js
rename to app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js
diff --git a/app/assets/javascripts/discourse/widgets/post-gap.js b/app/assets/javascripts/discourse/app/widgets/post-gap.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-gap.js
rename to app/assets/javascripts/discourse/app/widgets/post-gap.js
diff --git a/app/assets/javascripts/discourse/widgets/post-links.js b/app/assets/javascripts/discourse/app/widgets/post-links.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-links.js
rename to app/assets/javascripts/discourse/app/widgets/post-links.js
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-menu.js
rename to app/assets/javascripts/discourse/app/widgets/post-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/post-placeholder.js b/app/assets/javascripts/discourse/app/widgets/post-placeholder.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-placeholder.js
rename to app/assets/javascripts/discourse/app/widgets/post-placeholder.js
diff --git a/app/assets/javascripts/discourse/widgets/post-small-action.js b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-small-action.js
rename to app/assets/javascripts/discourse/app/widgets/post-small-action.js
diff --git a/app/assets/javascripts/discourse/widgets/post-stream.js b/app/assets/javascripts/discourse/app/widgets/post-stream.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post-stream.js
rename to app/assets/javascripts/discourse/app/widgets/post-stream.js
diff --git a/app/assets/javascripts/discourse/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/post.js
rename to app/assets/javascripts/discourse/app/widgets/post.js
diff --git a/app/assets/javascripts/discourse/widgets/poster-name.js b/app/assets/javascripts/discourse/app/widgets/poster-name.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/poster-name.js
rename to app/assets/javascripts/discourse/app/widgets/poster-name.js
diff --git a/app/assets/javascripts/discourse/widgets/private-message-map.js b/app/assets/javascripts/discourse/app/widgets/private-message-map.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/private-message-map.js
rename to app/assets/javascripts/discourse/app/widgets/private-message-map.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js b/app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-bookmarks.js
rename to app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-item.js b/app/assets/javascripts/discourse/app/widgets/quick-access-item.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-item.js
rename to app/assets/javascripts/discourse/app/widgets/quick-access-item.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-messages.js b/app/assets/javascripts/discourse/app/widgets/quick-access-messages.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-messages.js
rename to app/assets/javascripts/discourse/app/widgets/quick-access-messages.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-notifications.js b/app/assets/javascripts/discourse/app/widgets/quick-access-notifications.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-notifications.js
rename to app/assets/javascripts/discourse/app/widgets/quick-access-notifications.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-panel.js b/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-panel.js
rename to app/assets/javascripts/discourse/app/widgets/quick-access-panel.js
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-profile.js b/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/quick-access-profile.js
rename to app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
diff --git a/app/assets/javascripts/discourse/widgets/raw-html.js b/app/assets/javascripts/discourse/app/widgets/raw-html.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/raw-html.js
rename to app/assets/javascripts/discourse/app/widgets/raw-html.js
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-controls.js b/app/assets/javascripts/discourse/app/widgets/search-menu-controls.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/search-menu-controls.js
rename to app/assets/javascripts/discourse/app/widgets/search-menu-controls.js
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js b/app/assets/javascripts/discourse/app/widgets/search-menu-results.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/search-menu-results.js
rename to app/assets/javascripts/discourse/app/widgets/search-menu-results.js
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js b/app/assets/javascripts/discourse/app/widgets/search-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/search-menu.js
rename to app/assets/javascripts/discourse/app/widgets/search-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/time-gap.js b/app/assets/javascripts/discourse/app/widgets/time-gap.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/time-gap.js
rename to app/assets/javascripts/discourse/app/widgets/time-gap.js
diff --git a/app/assets/javascripts/discourse/widgets/toggle-topic-summary.js b/app/assets/javascripts/discourse/app/widgets/toggle-topic-summary.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/toggle-topic-summary.js
rename to app/assets/javascripts/discourse/app/widgets/toggle-topic-summary.js
diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/topic-admin-menu.js
rename to app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js b/app/assets/javascripts/discourse/app/widgets/topic-map.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/topic-map.js
rename to app/assets/javascripts/discourse/app/widgets/topic-map.js
diff --git a/app/assets/javascripts/discourse/widgets/topic-status.js b/app/assets/javascripts/discourse/app/widgets/topic-status.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/topic-status.js
rename to app/assets/javascripts/discourse/app/widgets/topic-status.js
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/topic-timeline.js
rename to app/assets/javascripts/discourse/app/widgets/topic-timeline.js
diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js b/app/assets/javascripts/discourse/app/widgets/user-menu.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/user-menu.js
rename to app/assets/javascripts/discourse/app/widgets/user-menu.js
diff --git a/app/assets/javascripts/discourse/widgets/user-notifications-large.js b/app/assets/javascripts/discourse/app/widgets/user-notifications-large.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/user-notifications-large.js
rename to app/assets/javascripts/discourse/app/widgets/user-notifications-large.js
diff --git a/app/assets/javascripts/discourse/widgets/widget-dropdown.js b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/widget-dropdown.js
rename to app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
diff --git a/app/assets/javascripts/discourse/widgets/widget.js b/app/assets/javascripts/discourse/app/widgets/widget.js
similarity index 100%
rename from app/assets/javascripts/discourse/widgets/widget.js
rename to app/assets/javascripts/discourse/app/widgets/widget.js
diff --git a/app/assets/javascripts/main_include_admin.js b/app/assets/javascripts/main_include_admin.js
index 6dd3680ad5..bf7f2d9de2 100644
--- a/app/assets/javascripts/main_include_admin.js
+++ b/app/assets/javascripts/main_include_admin.js
@@ -6,7 +6,7 @@
 //= require admin/models/tl3-requirements
 //= require admin/models/admin-user
 //= require_tree ./admin/models
-//= require discourse/lib/export-result
+//= require discourse/app/lib/export-result
 //= require_tree ./admin
 
 //= require resumable.js
diff --git a/app/views/users_email/show_confirm_new_email.html.erb b/app/views/users_email/show_confirm_new_email.html.erb
index a1e0eda56e..45a3f2a7d2 100644
--- a/app/views/users_email/show_confirm_new_email.html.erb
+++ b/app/views/users_email/show_confirm_new_email.html.erb
@@ -76,7 +76,7 @@
   <%= preload_script "ember_jquery" %>
   <%= preload_script "locales/#{I18n.locale}" %>
   <%= preload_script "locales/i18n" %>
-  <%= preload_script "discourse/lib/webauthn" %>
+  <%= preload_script "discourse/app/lib/webauthn" %>
   <%= preload_script "confirm-new-email/confirm-new-email" %>
   <%= preload_script "confirm-new-email/bootstrap" %>
 </div>
diff --git a/config/application.rb b/config/application.rb
index bad76c94f6..4afdad9292 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -153,7 +153,7 @@ module Discourse
       auto-redirect.js
       wizard-start.js
       locales/i18n.js
-      discourse/lib/webauthn.js
+      discourse/app/lib/webauthn.js
       confirm-new-email/confirm-new-email.js
       confirm-new-email/bootstrap.js
       onpopstate-handler.js
@@ -238,8 +238,8 @@ module Discourse
     require 'middleware/discourse_public_exceptions'
     config.exceptions_app = Middleware::DiscoursePublicExceptions.new(Rails.public_path)
 
-    # Our templates shouldn't start with 'discourse/templates'
-    config.handlebars.templates_root = 'discourse/templates'
+    # Our templates shouldn't start with 'discourse/app/templates'
+    config.handlebars.templates_root = 'discourse/app/templates'
     config.handlebars.raw_template_namespace = "Discourse.RAW_TEMPLATES"
     Sprockets.register_mime_type 'text/x-handlebars', extensions: ['.hbr']
     Sprockets.register_transformer 'text/x-handlebars', 'application/javascript', Ember::Handlebars::Template
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 6d56af7098..e9735d3eea 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -161,7 +161,8 @@ JS
         path = "discourse/plugins/#{plugin.name}/#{logical_path.sub(/javascripts\//, '')}" if plugin
       end
 
-      path || logical_path
+      # We need to strip the app subdirectory to replicate how ember-cli works.
+      path || logical_path&.gsub('app/', '')
     end
 
   end
diff --git a/lib/freedom_patches/raw_handlebars.rb b/lib/freedom_patches/raw_handlebars.rb
index 0f4a0bd8f7..7a02f1209d 100644
--- a/lib/freedom_patches/raw_handlebars.rb
+++ b/lib/freedom_patches/raw_handlebars.rb
@@ -65,7 +65,11 @@ class Ember::Handlebars::Template
   end
 
   def global_template_target(namespace, module_name, config)
-    "#{namespace}[#{template_path(module_name, config).inspect}]"
+    # We need this for backward-compatibility reasons.
+    # Plugins may not have an app subdirectory.
+    path = template_path(module_name, config).inspect.gsub('discourse/templates/', '')
+
+    "#{namespace}[#{path}]"
   end
 
   # FIXME: Previously, ember-handlebars-templates uses the logical path which incorrectly
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index d29f4e84ee..0843f32348 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -81,8 +81,8 @@ module PrettyText
     ctx_load_manifest(ctx, "markdown-it-bundle.js")
     root_path = "#{Rails.root}/app/assets/javascripts/"
 
-    apply_es6_file(ctx, root_path, "discourse/lib/to-markdown")
-    apply_es6_file(ctx, root_path, "discourse/lib/utilities")
+    apply_es6_file(ctx, root_path, "discourse/app/lib/to-markdown")
+    apply_es6_file(ctx, root_path, "discourse/app/lib/utilities")
 
     PrettyText::Helpers.instance_methods.each do |method|
       ctx.attach("__helpers.#{method}", PrettyText::Helpers.method(method))

From be1b7f7468ffc1540c7fd978114a70be1615dc79 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 23 Apr 2020 16:50:30 +0200
Subject: [PATCH 0751/1830] FIX: fails gracefully if :scope is not handled by a
 browser (#9529)

---
 .../discourse/app/initializers/copy-codeblocks.js    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js b/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
index f7e81af46a..62552f60b9 100644
--- a/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
+++ b/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
@@ -113,9 +113,15 @@ export default {
           return;
         }
 
-        const commands = postElements[0].querySelectorAll(
-          ":scope > pre > code, :scope :not(article):not(blockquote) > pre > code"
-        );
+        let commands = [];
+        try {
+          commands = postElements[0].querySelectorAll(
+            ":scope > pre > code, :scope :not(article):not(blockquote) > pre > code"
+          );
+        } catch (e) {
+          // :scope is probably not supported by this browser
+          commands = [];
+        }
 
         const post = helper.getModel();
 

From 39be639c37449cf2efcafd3acefc3a9e24a68174 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 23 Apr 2020 20:54:26 +0530
Subject: [PATCH 0752/1830] FIX: update GitHub screen_name on login via GitHub

---
 lib/auth/github_authenticator.rb                  |  6 ++++++
 spec/components/auth/github_authenticator_spec.rb | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/lib/auth/github_authenticator.rb b/lib/auth/github_authenticator.rb
index 96fe5bfa7a..c76fe9a59e 100644
--- a/lib/auth/github_authenticator.rb
+++ b/lib/auth/github_authenticator.rb
@@ -78,6 +78,12 @@ class Auth::GithubAuthenticator < Auth::Authenticator
       user = user_info.user
       result.email = data[:email]
       result.email_valid = data[:email].present?
+
+      # update GitHub screen_name
+      if user_info.screen_name != screen_name
+        user_info.screen_name = screen_name
+        user_info.save!
+      end
     else
       # Potentially use *any* of the emails from GitHub to find a match or
       # register a new user, with preference given to the primary email.
diff --git a/spec/components/auth/github_authenticator_spec.rb b/spec/components/auth/github_authenticator_spec.rb
index 37c14b1546..ae50424c90 100644
--- a/spec/components/auth/github_authenticator_spec.rb
+++ b/spec/components/auth/github_authenticator_spec.rb
@@ -60,6 +60,17 @@ describe Auth::GithubAuthenticator do
       expect(result.email_valid).to eq(true)
     end
 
+    it 'can authenticate and update GitHub screen_name for existing user' do
+      GithubUserInfo.create!(user_id: user.id, github_user_id: 100, screen_name: "boris")
+
+      result = authenticator.after_authenticate(data)
+
+      expect(result.user.id).to eq(user.id)
+      expect(result.email).to eq(user.email)
+      expect(result.email_valid).to eq(true)
+      expect(GithubUserInfo.where(user_id: user.id).pluck(:screen_name)).to eq([user.username])
+    end
+
     it 'should use primary email for new user creation over other available emails' do
       hash = {
         extra: {

From 060eb06a4fa2bf0c4ed0cc9dea36c5f2a4a86da9 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 23 Apr 2020 18:34:25 +0200
Subject: [PATCH 0753/1830] Replace Travis build status with Github Actions
 status

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ddf32ba126..fce15c577d 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Plus *lots* of Ruby Gems, a complete list of which is at [/master/Gemfile](https
 
 ## Contributing
 
-[![Build Status](https://api.travis-ci.org/discourse/discourse.svg?branch=master)](https://travis-ci.org/discourse/discourse)
+[![Build Status](https://github.com/discourse/discourse/workflows/CI/badge.svg)](https://github.com/discourse/discourse/actions)
 
 Discourse is **100% free** and **open source**. We encourage and support an active, healthy community that
 accepts contributions from the public &ndash; including you!

From 82b43451b3ce5689fe745fd0c5b539f594291ed0 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 23 Apr 2020 19:18:01 +0200
Subject: [PATCH 0754/1830] FIX: Inner content of a row could have no max-width
 and be very large (#9532)

---
 app/assets/stylesheets/common/select-kit/category-row.scss | 1 +
 app/assets/stylesheets/common/select-kit/select-kit.scss   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/assets/stylesheets/common/select-kit/category-row.scss b/app/assets/stylesheets/common/select-kit/category-row.scss
index aca31f3dd2..0d90a61814 100644
--- a/app/assets/stylesheets/common/select-kit/category-row.scss
+++ b/app/assets/stylesheets/common/select-kit/category-row.scss
@@ -1,5 +1,6 @@
 .select-kit {
   .category-row {
+    max-width: 320px;
     .category-status {
       display: flex;
       align-items: center;
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index d128feb04c..c5ec3aa374 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -27,6 +27,7 @@
       top: 0;
       align-items: center;
       justify-content: center;
+      max-width: 400px;
     }
 
     .select-kit-collection {

From e35286eda24f549d4cad976f5d34e196f8403629 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 23 Apr 2020 13:43:48 -0400
Subject: [PATCH 0755/1830] Ignore the `app` move

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 15d8c36a8a..a4d8022ec5 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -40,3 +40,6 @@ b66b277dc44bcd2122dc21965dab209c30636214
 
 # DEV: enforces double quotes ember-template-lint
 c4644c61d97c823b7dd940ffaf0967a104f4b58c
+
+# Migrate to app directory
+7a2e8d3ead63c7d99e1069fc7823e933f931ba85

From 3e543dfa180e640248b1e1d50d2257b897b0afbc Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Thu, 23 Apr 2020 12:44:20 -0500
Subject: [PATCH 0756/1830] FIX: Do not set title attribute on
 header-topic-info widget (#9533)

---
 .../discourse/app/widgets/header-topic-info.js        | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/header-topic-info.js b/app/assets/javascripts/discourse/app/widgets/header-topic-info.js
index b3c6da04ed..0958dcd8e4 100644
--- a/app/assets/javascripts/discourse/app/widgets/header-topic-info.js
+++ b/app/assets/javascripts/discourse/app/widgets/header-topic-info.js
@@ -115,7 +115,7 @@ export default createWidget("header-topic-info", {
       );
     }
 
-    this.title = [h("h1.header-title", heading)];
+    this.headerElements = [h("h1.header-title", heading)];
     const category = topic.get("category");
 
     if (loaded || category) {
@@ -133,7 +133,7 @@ export default createWidget("header-topic-info", {
         }
         categories.push(this.attach("category-link", { category }));
 
-        this.title.push(h("div.categories-wrapper", categories));
+        this.headerElements.push(h("div.categories-wrapper", categories));
       }
 
       let extra = [];
@@ -203,11 +203,10 @@ export default createWidget("header-topic-info", {
         }
       }
       if (extra.length) {
-        this.title.push(h("div.topic-header-extra", extra));
+        this.headerElements.push(h("div.topic-header-extra", extra));
       }
     }
-
-    this.contents = h("div.title-wrapper", this.title);
+    this.contents = h("div.title-wrapper", this.headerElements);
   },
 
   html() {
@@ -219,7 +218,7 @@ export default createWidget("header-topic-info", {
   },
 
   containerClassName() {
-    return this.title.length > 1 ? "two-rows" : "";
+    return this.headerElements.length > 1 ? "two-rows" : "";
   },
 
   jumpToTopPost() {

From e49212d0bcfc3e09e260713ae865a8e782459cdc Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 23 Apr 2020 14:17:15 -0400
Subject: [PATCH 0757/1830] DEV: Draft check async when starting new PM

When the sequence is missng, the draft check is done synchronously and it results in  iOS devices not launching the keyboard.
---
 app/assets/javascripts/discourse/app/routes/application.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse/app/routes/application.js b/app/assets/javascripts/discourse/app/routes/application.js
index 856c203058..a16f97ffd9 100644
--- a/app/assets/javascripts/discourse/app/routes/application.js
+++ b/app/assets/javascripts/discourse/app/routes/application.js
@@ -85,6 +85,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
         recipients,
         archetypeId: "private_message",
         draftKey: Composer.NEW_PRIVATE_MESSAGE_KEY,
+        draftSequence: 0,
         reply,
         title
       });

From 5b98161f2fc7acf01e6810c623bb1e95f769cd46 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Thu, 23 Apr 2020 12:36:05 -0600
Subject: [PATCH 0758/1830] DEV: ember-cli refactor for TextField and TextArea
 imports (#9480)

In order to be able to use ember-cli we need to fix the import
statements for `TextField` and `TextArea` in the code base.

The only change I don't fully understand is the one in
`discourse-loader.js`, but adding the components to that file make it
all work.
---
 app/assets/javascripts/discourse-loader.js             | 10 +++++++---
 .../discourse/app/components/expanding-text-area.js    |  2 +-
 .../discourse/app/components/honeypot-input.js         |  2 +-
 .../discourse/app/components/number-field.js           |  2 +-
 .../javascripts/discourse/app/components/text-field.js |  2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 24f879f687..7908ab90c5 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -19,9 +19,7 @@ var define, requirejs;
         default: Ember.ArrayProxy
       },
       "@ember/component": {
-        default: Ember.Component,
-        TextArea: Ember.TextArea,
-        TextField: Ember.TextField
+        default: Ember.Component
       },
       "@ember/controller": {
         default: Ember.Controller,
@@ -129,6 +127,12 @@ var define, requirejs;
       "@ember/component/helper": {
         default: Ember.Helper
       },
+      "@ember/component/text-field": {
+        default: Ember.TextField
+      },
+      "@ember/component/text-area": {
+        default: Ember.TextArea
+      },
       "@ember/error": {
         default: Ember.error
       },
diff --git a/app/assets/javascripts/discourse/app/components/expanding-text-area.js b/app/assets/javascripts/discourse/app/components/expanding-text-area.js
index 94c976c4d3..821f9cf69d 100644
--- a/app/assets/javascripts/discourse/app/components/expanding-text-area.js
+++ b/app/assets/javascripts/discourse/app/components/expanding-text-area.js
@@ -1,4 +1,4 @@
-import { TextArea } from "@ember/component";
+import TextArea from "@ember/component/text-area";
 import { schedule } from "@ember/runloop";
 import { on, observes } from "discourse-common/utils/decorators";
 import autosize from "discourse/lib/autosize";
diff --git a/app/assets/javascripts/discourse/app/components/honeypot-input.js b/app/assets/javascripts/discourse/app/components/honeypot-input.js
index 9eb256bc12..c3d003d0d4 100644
--- a/app/assets/javascripts/discourse/app/components/honeypot-input.js
+++ b/app/assets/javascripts/discourse/app/components/honeypot-input.js
@@ -1,4 +1,4 @@
-import { TextField } from "@ember/component";
+import TextField from "discourse/components/text-field";
 import { on } from "discourse-common/utils/decorators";
 
 export default TextField.extend({
diff --git a/app/assets/javascripts/discourse/app/components/number-field.js b/app/assets/javascripts/discourse/app/components/number-field.js
index 6f78cc3707..feb61f36b1 100644
--- a/app/assets/javascripts/discourse/app/components/number-field.js
+++ b/app/assets/javascripts/discourse/app/components/number-field.js
@@ -1,4 +1,4 @@
-import { TextField } from "@ember/component";
+import TextField from "discourse/components/text-field";
 import discourseComputed from "discourse-common/utils/decorators";
 
 export default TextField.extend({
diff --git a/app/assets/javascripts/discourse/app/components/text-field.js b/app/assets/javascripts/discourse/app/components/text-field.js
index 3477520d0b..5809d25a86 100644
--- a/app/assets/javascripts/discourse/app/components/text-field.js
+++ b/app/assets/javascripts/discourse/app/components/text-field.js
@@ -1,4 +1,4 @@
-import { TextField } from "@ember/component";
+import TextField from "@ember/component/text-field";
 import discourseComputed from "discourse-common/utils/decorators";
 import { siteDir, isRTL, isLTR } from "discourse/lib/text-direction";
 import { next, debounce, cancel } from "@ember/runloop";

From 67e96f6c54b6e512b5e20abff7cbf38b70cd85a5 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 23 Apr 2020 21:37:13 +0200
Subject: [PATCH 0759/1830] DEV: discourse-backup-uploads-to-s3 plugin isn't
 supported anymore

---
 lib/plugin/metadata.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index 1af6c15750..cfdb98263f 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -15,7 +15,6 @@ class Plugin::Metadata
     "discourse-akismet",
     "discourse-assign",
     "discourse-auto-deactivate",
-    "discourse-backup-uploads-to-s3",
     "discourse-bbcode",
     "discourse-bbcode-color",
     "discourse-cakeday",

From 7cd006fe3a64bf49b5f7677d3c071d87b7b3e39c Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 23 Apr 2020 15:51:54 -0400
Subject: [PATCH 0760/1830] Revert "DEV: Draft check async when starting new
 PM"

This reverts commit e49212d0bcfc3e09e260713ae865a8e782459cdc.

This requires some more work.
---
 app/assets/javascripts/discourse/app/routes/application.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/routes/application.js b/app/assets/javascripts/discourse/app/routes/application.js
index a16f97ffd9..856c203058 100644
--- a/app/assets/javascripts/discourse/app/routes/application.js
+++ b/app/assets/javascripts/discourse/app/routes/application.js
@@ -85,7 +85,6 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
         recipients,
         archetypeId: "private_message",
         draftKey: Composer.NEW_PRIVATE_MESSAGE_KEY,
-        draftSequence: 0,
         reply,
         title
       });

From 585e7bcfe8a1e26b10ea90758170cdaa7fd5fc29 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 23 Apr 2020 16:11:17 -0400
Subject: [PATCH 0761/1830] DEV: update specs followup to 67e96f6

---
 spec/components/plugin/metadata_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/components/plugin/metadata_spec.rb b/spec/components/plugin/metadata_spec.rb
index b8ad2ab97c..fe838d8c7b 100644
--- a/spec/components/plugin/metadata_spec.rb
+++ b/spec/components/plugin/metadata_spec.rb
@@ -45,7 +45,6 @@ TEXT
     official("customer-flair")
     official("discourse-adplugin")
     official("discourse-akismet")
-    official("discourse-backup-uploads-to-s3")
     official("discourse-cakeday")
     official("Canned Replies")
     official("discourse-data-explorer")

From b871e79c5b44abf71c4acc10ac4d81e37911c612 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 23 Apr 2020 23:10:40 +0200
Subject: [PATCH 0762/1830] FIX: removes rounding correction as it can be in
 either direction (#9538)

---
 app/assets/javascripts/select-kit/components/select-kit.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 4c0b095c1b..76f8dea368 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -858,8 +858,7 @@ export default Component.extend(
                     this.element.classList.add("is-under");
                   }
 
-                  // - 1 accounts for any rounding error
-                  wrapper.style.width = `${this.element.offsetWidth - 1}px`;
+                  wrapper.style.width = `${this.element.offsetWidth}px`;
                   wrapper.style.height = `${height}px`;
                 }
               }

From b19d50f3558b7d2d85cda977d4316da6959d06d3 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 23 Apr 2020 23:12:58 +0200
Subject: [PATCH 0763/1830] FIX: site settings dropdown can be 440px width
 (#9539)

---
 app/assets/stylesheets/common/select-kit/select-kit.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index c5ec3aa374..ea54fe8b9e 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -27,7 +27,7 @@
       top: 0;
       align-items: center;
       justify-content: center;
-      max-width: 400px;
+      max-width: 450px;
     }
 
     .select-kit-collection {

From 9f52997be166a0c14d082274a2da5eff541435a2 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 23 Apr 2020 17:23:25 -0400
Subject: [PATCH 0764/1830] UX: Let's try X for the closed topic icon instead
 of a \

---
 .../discourse/app/components/topic-status.js    |  6 +++---
 .../app/controllers/topic-bulk-actions.js       |  2 +-
 .../discourse/app/helpers/topic-status-icons.js |  6 +++---
 .../discourse/app/raw-views/topic-status.js     |  6 +++---
 .../discourse/app/widgets/post-small-action.js  |  4 ++--
 .../discourse/app/widgets/topic-admin-menu.js   |  2 +-
 lib/svg_sprite/svg_sprite.rb                    |  2 +-
 test/javascripts/widgets/topic-status-test.js   |  2 +-
 .../assets/svg-icons/discourse-additional.svg   | 17 +++++++++--------
 9 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/topic-status.js b/app/assets/javascripts/discourse/app/components/topic-status.js
index 19f16b3ca3..404ab913d0 100644
--- a/app/assets/javascripts/discourse/app/components/topic-status.js
+++ b/app/assets/javascripts/discourse/app/components/topic-status.js
@@ -25,7 +25,7 @@ export default Component.extend({
     if (closed && archived) {
       this._set(
         "closedArchived",
-        "discourse-comment-slash",
+        "discourse-comment-close",
         "locked_and_archived"
       );
       this._reset("closed");
@@ -34,10 +34,10 @@ export default Component.extend({
     } else {
       this._reset("closedArchived");
       closed
-        ? this._set("closed", "discourse-comment-slash", "locked")
+        ? this._set("closed", "discourse-comment-close", "locked")
         : this._reset("closed");
       archived
-        ? this._set("archived", "discourse-comment-slash", "archived")
+        ? this._set("archived", "discourse-comment-close", "archived")
         : this._reset("archived");
       return false;
     }
diff --git a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
index d8416436b5..7cc2a9652a 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
@@ -30,7 +30,7 @@ addBulkButton("showChangeCategory", "change_category", {
   class: "btn-default"
 });
 addBulkButton("closeTopics", "close_topics", {
-  icon: "discourse-comment-slash",
+  icon: "discourse-comment-close",
   class: "btn-default"
 });
 addBulkButton("archiveTopics", "archive_topics", {
diff --git a/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js b/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js
index a1776e4f6f..316b527092 100644
--- a/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js
+++ b/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js
@@ -10,10 +10,10 @@ export default ArrayProxy.extend({
     };
 
     if (topic.get("closed") && topic.get("archived")) {
-      renderIcon("discourse-comment-slash", "locked_and_archived");
+      renderIcon("discourse-comment-close", "locked_and_archived");
     } else {
-      renderIconIf("closed", "discourse-comment-slash", "locked");
-      renderIconIf("archived", "discourse-comment-slash", "archived");
+      renderIconIf("closed", "discourse-comment-close", "locked");
+      renderIconIf("archived", "discourse-comment-close", "archived");
     }
 
     this.forEach(args => renderIconIf(...args));
diff --git a/app/assets/javascripts/discourse/app/raw-views/topic-status.js b/app/assets/javascripts/discourse/app/raw-views/topic-status.js
index ba8bf33511..25d50c2b16 100644
--- a/app/assets/javascripts/discourse/app/raw-views/topic-status.js
+++ b/app/assets/javascripts/discourse/app/raw-views/topic-status.js
@@ -39,13 +39,13 @@ export default EmberObject.extend({
 
     if (topic.get("closed") && topic.get("archived")) {
       results.push({
-        icon: "discourse-comment-slash",
+        icon: "discourse-comment-close",
         key: "locked_and_archived"
       });
     } else if (topic.get("closed")) {
-      results.push({ icon: "discourse-comment-slash", key: "locked" });
+      results.push({ icon: "discourse-comment-close", key: "locked" });
     } else if (topic.get("archived")) {
-      results.push({ icon: "discourse-comment-slash", key: "archived" });
+      results.push({ icon: "discourse-comment-close", key: "archived" });
     }
 
     if (topic.get("pinned")) {
diff --git a/app/assets/javascripts/discourse/app/widgets/post-small-action.js b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
index b456d3d039..7f02cb0703 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-small-action.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
@@ -32,9 +32,9 @@ export function actionDescription(actionCode, createdAt, username) {
 }
 
 const icons = {
-  "closed.enabled": "discourse-comment-slash",
+  "closed.enabled": "discourse-comment-close",
   "closed.disabled": "discourse-comment-plus",
-  "autoclosed.enabled": "discourse-comment-slash",
+  "autoclosed.enabled": "discourse-comment-close",
   "autoclosed.disabled": "discourse-comment-plus",
   "archived.enabled": "folder",
   "archived.disabled": "folder-open",
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
index 904269d5ba..ced88e467a 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
@@ -173,7 +173,7 @@ export default createWidget("topic-admin-menu", {
           className: "topic-admin-close",
           buttonClass: "btn-default",
           action: "toggleClosed",
-          icon: "discourse-comment-slash",
+          icon: "discourse-comment-close",
           label: "actions.close"
         });
       }
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index d28044c96a..19a64fd332 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -64,7 +64,7 @@ module SvgSprite
     "discourse-compress",
     "discourse-comment",
     "discourse-comment-plus",
-    "discourse-comment-slash",
+    "discourse-comment-close",
     "discourse-expand",
     "download",
     "ellipsis-h",
diff --git a/test/javascripts/widgets/topic-status-test.js b/test/javascripts/widgets/topic-status-test.js
index 5cc6f9d437..66ccf6199c 100644
--- a/test/javascripts/widgets/topic-status-test.js
+++ b/test/javascripts/widgets/topic-status-test.js
@@ -12,7 +12,7 @@ widgetTest("basics", {
     });
   },
   test(assert) {
-    assert.ok(find(".topic-status .d-icon-discourse-comment-slash").length);
+    assert.ok(find(".topic-status .d-icon-discourse-comment-close").length);
   }
 });
 
diff --git a/vendor/assets/svg-icons/discourse-additional.svg b/vendor/assets/svg-icons/discourse-additional.svg
index e1d9f8dbf3..066a93c4f7 100644
--- a/vendor/assets/svg-icons/discourse-additional.svg
+++ b/vendor/assets/svg-icons/discourse-additional.svg
@@ -27,17 +27,18 @@ Additional SVG icons
   <symbol id='discourse-bell-slash' viewBox="0 0 448 512">
     <path d="M442.7 396.2L36.5 70.7c-6.9-5.5-17-4.4-22.5 2.5L4 85.6c-5.5 6.9-4.4 17 2.5 22.5l406.2 325.5c6.9 5.5 17 4.4 22.5-2.5l10-12.5c5.5-6.9 3.7-17.7-3.2-23.2l.7.8zM67.5 368c16.7-22 34.5-55.8 41.4-110.6l-45.5-35.6C60.2 312.6 27 342.5 8.6 362.3 2.6 368.7 0 376.4 0 384c.1 16.4 13 32 32.1 32h279.7l-61.4-48H67.5zM224 96c61.9 0 112 50.1 112 112 0 .2-.1.4-.1.6 0 16.8 1.2 31.8 2.8 45.7l59.5 46.5c-8.3-22.1-14.3-51.5-14.3-92.9 0-77.7-54.5-139.9-127.9-155.2V32c0-17.7-14.3-32-32-32s-32 14.3-32 32v20.8c-26 5.4-49.4 16.9-69.1 32.7l38.2 29.8C179 103.2 200.6 96 224 96zm0 416c35.3 0 64-28.6 64-64H160c0 35.4 28.7 64 64 64z"/>
   </symbol>
-  <!-- "Discourse Comment Slash" is a version of https://fontawesome.com/icons/comment-slash?style=regular that has been recreated to be more legible at small sizes  -->
-  <symbol id='discourse-comment-slash' viewBox="0 0 640 512">
-    <path d="M634 471L481.6 351.8l-6.8-5.3L36 3.5C29.1-2 19-.9 13.5 6l-10 12.5C-2 25.4-.9 35.5 6 41l598 467.5c6.9 5.5 17 4.4 22.5-2.5l10-12.5c5.5-6.9 4.4-17-2.5-22.5zM224.2 89.9c36.8-19.6 81.2-29.1 127.6-24.6 59 5.6 113 33.3 148 76.1 29.5 36 43.3 80 38.8 123.7-2.1 20.4-8 39.7-17 57.3l41.6 32.5c14.8-25.9 24.1-54.4 27.2-84.5 5.9-57.7-11.9-115.2-50.3-162-43.8-53.4-110.7-88-183.4-94.9-63.4-6.1-125.6 8.8-176.5 42l44 34.4zM407.1 416c-22 7.2-45.8 11.1-70.4 11.1-7.4 0-14.9-.4-22.5-1.1-29.6-2.8-57.7-11-83.6-24.4-3.7-1.9-7.8-2.9-11.9-2.9-2.2 0-4.4.3-6.6.9l-102.9 27 38.5-87c3.9-8.7 2.6-18.9-3.2-26.5-15.2-19.6-20.9-48.8-17-86.9.9-8.6 2.5-17 4.7-25.2l-43.6-34.1c-6.5 17.2-10.8 35.3-12.8 54-4.6 44.6 1.7 81.8 18.6 110.7L39.7 454.9c-4 9.1-2.5 19.8 4 27.4 5 5.9 12.3 9.2 19.8 9.2 2.2 0 4.4-.3 6.6-.9l145.8-38.2c29.3 13.8 60.6 22.3 93.4 25.4 9.2.9 18.5 1.3 27.6 1.3 41.4 0 81.5-8.9 117.7-25.9L407.1 416z"/>
-  </symbol>
-  <!-- "Discourse Comment" is a Discourse derivative of https://fontawesome.com/icons/comment?style=regular that has been built to match the custom discourse-comment-slash icon  -->
+  <!-- "Discourse Comment" is a Discourse derivative of https://fontawesome.com/icons/comment?style=regular that has been built to match the custom discourse-comment-close icon  -->
   <symbol id='discourse-comment' viewBox="0 0 550 512">
     <path d="M26 479.3c-7.5 0-14.8-3.3-19.8-9.2-6.5-7.6-8-18.3-4-27.4l54.6-123.2c-17-28.9-23.2-66.1-18.6-110.7C44.6 146.2 77.8 90.2 131.6 51 184.4 12.4 251.1-5.2 319.2 1.3c72.8 7 139.6 41.5 183.3 94.9 38.4 46.8 56.3 104.4 50.3 162-6.5 62.5-39.6 118.5-93.4 157.7-45.7 33.3-101.7 51-160 51-9.2 0-18.4-.4-27.6-1.3-32.8-3.1-64.2-11.7-93.4-25.4L32.6 478.4c-2.2.6-4.4.9-6.6.9zm155.2-92.7c4.1 0 8.2 1 11.9 2.9 25.9 13.4 54 21.6 83.6 24.4 7.5.7 15 1.1 22.5 1.1 104 0 192.3-69.1 201.9-162 4.5-43.8-9.3-87.7-38.8-123.7-35-42.7-89-70.4-148-76.1-113.5-10.9-214.1 61.4-224.4 161-3.9 38.1 1.8 67.3 17 86.9 5.9 7.6 7.1 17.7 3.2 26.5l-38.5 87 102.9-27c2.3-.7 4.5-1 6.7-1z"/>
   </symbol>
-  <!-- "Discourse Comment Plus" is a version of https://fontawesome.com/icons/comment-plus?style=regular that has been recreated to match the custom discourse-comment-slash icon  -->
-  <symbol id='discourse-comment-plus' viewBox="0 0 550 512">
+  <!-- "Discourse Comment Plus" is a version of https://fontawesome.com/icons/comment-plus?style=regular that has been recreated to match the custom discourse-comment icon  -->
+  <symbol id="discourse-comment-plus" viewBox="0 0 550 512">
     <path d="M26 479.3c-7.5 0-14.8-3.3-19.8-9.2-6.5-7.6-8-18.3-4-27.4l54.6-123.2c-17-28.9-23.2-66.1-18.6-110.7C44.6 146.2 77.8 90.2 131.6 51 184.4 12.4 251.1-5.2 319.2 1.3c72.8 7 139.6 41.5 183.3 94.9 38.4 46.8 56.3 104.4 50.3 162-6.5 62.5-39.6 118.5-93.4 157.7-45.7 33.3-101.7 51-160 51-9.2 0-18.4-.4-27.6-1.3-32.8-3.1-64.2-11.7-93.4-25.4L32.6 478.4c-2.2.6-4.4.9-6.6.9zm155.2-92.7c4.1 0 8.2 1 11.9 2.9 25.9 13.4 54 21.6 83.6 24.4 7.5.7 15 1.1 22.5 1.1 104 0 192.3-69.1 201.9-162 4.5-43.8-9.3-87.7-38.8-123.7-35-42.7-89-70.4-148-76.1-113.5-10.9-214.1 61.4-224.4 161-3.9 38.1 1.8 67.3 17 86.9 5.9 7.6 7.1 17.7 3.2 26.5l-38.5 87 102.9-27c2.3-.7 4.5-1 6.7-1z"/>
-    <path d="M375.6 207.7h-54.2v-54.2c0-10.6-8.6-19.2-19.2-19.2h-13.3c-10.6 0-19.2 8.6-19.2 19.2v54.2h-54.2c-10.6 0-19.2 8.6-19.2 19.2v13.3c0 10.6 8.6 19.2 19.2 19.2h54.2v54.2c0 10.6 8.6 19.2 19.2 19.2h13.3c10.6 0 19.2-8.6 19.2-19.2v-54.2h54.2c10.6 0 19.2-8.6 19.2-19.2V227c0-10.6-8.6-19.3-19.2-19.3z"/>
+    <path d="M385.8 199.7h-61.4v-61.4c0-12-9.7-21.8-21.8-21.8h-15.1c-12 0-21.8 9.7-21.8 21.8v61.4h-61.4c-12 0-21.8 9.7-21.8 21.8v15.1c0 12 9.7 21.8 21.8 21.8h61.4v61.4c0 12 9.7 21.8 21.8 21.8h15.1c12 0 21.8-9.7 21.8-21.8v-61.4h61.4c12 0 21.8-9.7 21.8-21.8v-15c-.1-12-9.8-21.9-21.8-21.9z"/>
+  </symbol>
+  <!-- "Discourse Comment Close" is a version of https://fontawesome.com/icons/comment-times?style=regular that has been recreated to match the custom discourse-comment icon  -->
+  <symbol id="discourse-comment-close" viewBox="0 0 550 512">
+    <path d="M26 479.3c-7.5 0-14.8-3.3-19.8-9.2-6.5-7.6-8-18.3-4-27.4l54.6-123.2c-17-28.9-23.2-66.1-18.6-110.7C44.6 146.2 77.8 90.2 131.6 51 184.4 12.4 251.1-5.2 319.2 1.3c72.8 7 139.6 41.5 183.3 94.9 38.4 46.8 56.3 104.4 50.3 162-6.5 62.5-39.6 118.5-93.4 157.7-45.7 33.3-101.7 51-160 51-9.2 0-18.4-.4-27.6-1.3-32.8-3.1-64.2-11.7-93.4-25.4L32.6 478.4c-2.2.6-4.4.9-6.6.9zm155.2-92.7c4.1 0 8.2 1 11.9 2.9 25.9 13.4 54 21.6 83.6 24.4 7.5.7 15 1.1 22.5 1.1 104 0 192.3-69.1 201.9-162 4.5-43.8-9.3-87.7-38.8-123.7-35-42.7-89-70.4-148-76.1-113.5-10.9-214.1 61.4-224.4 161-3.9 38.1 1.8 67.3 17 86.9 5.9 7.6 7.1 17.7 3.2 26.5l-38.5 87 102.9-27c2.3-.7 4.5-1 6.7-1z"/>
+    <path d="M379.9 272.5L336.5 229l43.4-43.4c8.5-8.5 8.5-22.3 0-30.8l-10.7-10.7c-8.5-8.5-22.3-8.5-30.8 0L295 187.5l-43.4-43.4c-8.5-8.5-22.3-8.5-30.8 0l-10.7 10.7c-8.5 8.5-8.5 22.3 0 30.8l43.4 43.4-43.4 43.4c-8.5 8.5-8.5 22.3 0 30.8l10.7 10.7c8.5 8.5 22.3 8.5 30.8 0l43.4-43.4 43.4 43.4c8.5 8.5 22.3 8.5 30.8 0l10.6-10.6c8.5-8.5 8.6-22.4.1-30.8z"/>
   </symbol>
 </svg>

From bd3425b389c6990f5c96e939249c383bdade29ee Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Thu, 23 Apr 2020 16:26:29 -0600
Subject: [PATCH 0765/1830] REFACTOR: Use rescue inside do/end block

Follow up to 9cbbaf4237e2343348f5d0a7375796e6712b4580
---
 app/services/user_updater.rb | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index cdd5203f96..02db79cb95 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -149,26 +149,24 @@ class UserUpdater
 
     saved = nil
 
-    begin
-      User.transaction do
-        if attributes.key?(:muted_usernames)
-          update_muted_users(attributes[:muted_usernames])
-        end
+    User.transaction do
+      if attributes.key?(:muted_usernames)
+        update_muted_users(attributes[:muted_usernames])
+      end
 
-        if attributes.key?(:ignored_usernames)
-          update_ignored_users(attributes[:ignored_usernames])
-        end
+      if attributes.key?(:ignored_usernames)
+        update_ignored_users(attributes[:ignored_usernames])
+      end
 
-        name_changed = user.name_changed?
-        if (saved = (!save_options || user.user_option.save) && user_profile.save && user.save) &&
-           (name_changed && old_user_name.casecmp(attributes.fetch(:name)) != 0)
+      name_changed = user.name_changed?
+      if (saved = (!save_options || user.user_option.save) && user_profile.save && user.save) &&
+         (name_changed && old_user_name.casecmp(attributes.fetch(:name)) != 0)
 
-          StaffActionLogger.new(@actor).log_name_change(
-            user.id,
-            old_user_name,
-            attributes.fetch(:name) { '' }
-          )
-        end
+        StaffActionLogger.new(@actor).log_name_change(
+          user.id,
+          old_user_name,
+          attributes.fetch(:name) { '' }
+        )
       end
     rescue Addressable::URI::InvalidURIError => e
       # Prevent 500 for crazy url input

From cd1c7d75605fd8d217b023b3f769aefd53b0932a Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 24 Apr 2020 10:29:02 +1000
Subject: [PATCH 0766/1830] FIX: Copying image markdown for secure media
 loading full image (#9488)

* When copying the markdown for an image between posts, we were not adding the srcset and data-small-image attributes which are done by calling optimize_image! in cooked post processor
* Refactored the code which was confusing in its current state (the consider_for_reuse method was super confusing) and fixed the issue
---
 app/models/upload.rb         | 15 +++++++++++-
 lib/cooked_post_processor.rb |  7 +-----
 spec/models/upload_spec.rb   | 47 ------------------------------------
 3 files changed, 15 insertions(+), 54 deletions(-)

diff --git a/app/models/upload.rb b/app/models/upload.rb
index fe6f5c3e0e..4cd7b926ce 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -123,13 +123,26 @@ class Upload < ActiveRecord::Base
     "upload://#{short_url_basename}"
   end
 
+  def uploaded_before_secure_media_enabled?
+    original_sha1.blank?
+  end
+
+  def matching_access_control_post?(post)
+    access_control_post_id == post.id
+  end
+
+  def copied_from_other_post?(post)
+    return false if access_control_post_id.blank?
+    !matching_access_control_post?(post)
+  end
+
   def short_path
     self.class.short_path(sha1: self.sha1, extension: self.extension)
   end
 
   def self.consider_for_reuse(upload, post)
     return upload if !SiteSetting.secure_media? || upload.blank? || post.blank?
-    return nil if upload.access_control_post_id != post.id || upload.original_sha1.blank?
+    return nil if !upload.matching_access_control_post?(post) || upload.uploaded_before_secure_media_enabled?
     upload
   end
 
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 77ebba989a..a2d75bfdf9 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -339,12 +339,7 @@ class CookedPostProcessor
       width, height = ImageSizer.resize(width, height)
     end
 
-    # if the upload already exists and is attached to a different post,
-    # or the original_sha1 is missing meaning it was created before secure
-    # media was enabled. we want to re-thumbnail and re-optimize in this case
-    # to avoid using uploads linked to many other posts
-    upload = Upload.consider_for_reuse(Upload.get_from_url(src), @post)
-
+    upload = Upload.get_from_url(src)
     if upload.present?
       upload.create_thumbnail!(width, height, crop: crop)
 
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index 739ab43d5a..680d0175e3 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -288,53 +288,6 @@ describe Upload do
     end
   end
 
-  describe ".consider_for_reuse" do
-    let(:post) { Fabricate(:post) }
-    let(:upload) { Fabricate(:upload) }
-
-    it "returns nil when the provided upload is blank" do
-      expect(Upload.consider_for_reuse(nil, post)).to eq(nil)
-    end
-
-    it "returns the upload when secure media is disabled" do
-      expect(Upload.consider_for_reuse(upload, post)).to eq(upload)
-    end
-
-    context "when secure media enabled" do
-      before do
-        enable_secure_media
-      end
-
-      context "when the upload access control post is != to the provided post" do
-        before do
-          upload.update(access_control_post_id: Fabricate(:post).id)
-        end
-
-        it "returns nil" do
-          expect(Upload.consider_for_reuse(upload, post)).to eq(nil)
-        end
-      end
-
-      context "when the upload original_sha1 is blank (pre-secure-media upload)" do
-        before do
-          upload.update(original_sha1: nil, access_control_post: post)
-        end
-
-        it "returns nil" do
-          expect(Upload.consider_for_reuse(upload, post)).to eq(nil)
-        end
-      end
-
-      context "when the upload original_sha1 is present and access control post is correct" do
-        let(:upload) { Fabricate(:secure_upload_s3, access_control_post: post) }
-
-        it "returns the upload" do
-          expect(Upload.consider_for_reuse(upload, post)).to eq(upload)
-        end
-      end
-    end
-  end
-
   describe '.update_secure_status' do
     it "respects the secure_override_value parameter if provided" do
       upload.update!(secure: true)

From 8b0ac092d83a45ae54c399b6035a6fc7882a9de5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 23 Apr 2020 22:13:35 +0000
Subject: [PATCH 0767/1830] Build(deps-dev): Bump byebug from 11.1.2 to 11.1.3

Bumps [byebug](https://github.com/deivid-rodriguez/byebug) from 11.1.2 to 11.1.3.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases)
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md)
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.1.2...v11.1.3)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index e29ba65db6..f337e80b88 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -78,7 +78,7 @@ GEM
     bullet (6.1.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    byebug (11.1.2)
+    byebug (11.1.3)
     cbor (0.5.9.6)
     certified (1.0.0)
     chunky_png (1.3.11)

From 6df22638e194847df3663aed6c179805d3e1e271 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Fri, 24 Apr 2020 13:13:30 +1000
Subject: [PATCH 0768/1830] FIX: Make sure new user narrative returns
 toggleBookmark promise

* the call to this.super() was not returned so there is no promise
  to chain .then() with, causing errors for bookmarks with reminders
---
 .../assets/javascripts/initializers/new-user-narrative.js.es6   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6 b/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6
index 6498f501b3..35a3e09fc1 100644
--- a/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6
+++ b/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6
@@ -32,7 +32,7 @@ function initialize(api) {
           this.appEvents.trigger("post-stream:refresh", { id: this.id });
         });
       }
-      this._super();
+      return this._super();
     }
   });
 

From 6a18c9aa0b4db392f23ba75367be6224fa27b45a Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 24 Apr 2020 13:25:35 +1000
Subject: [PATCH 0769/1830] Revert "FEATURE: enforce_canonical_emails site
 setting"

This reverts commit 6f9177e2ed273ebebb8306299425cbfabbf57101.

We decided on a completely different approach to the problem.

Instead we will let blocked emails be treated as canonical.
---
 app/models/user_email.rb                      | 41 ++++---------------
 config/locales/server.en.yml                  |  1 -
 config/site_settings.yml                      |  1 -
 ...34210_add_canonical_email_to_user_email.rb |  7 ----
 ...remove_canonical_email_from_user_emails.rb | 13 ++++++
 spec/jobs/user_email_spec.rb                  | 28 -------------
 6 files changed, 22 insertions(+), 69 deletions(-)
 delete mode 100644 db/migrate/20200414034210_add_canonical_email_to_user_email.rb
 create mode 100644 db/post_migrate/20200424032633_remove_canonical_email_from_user_emails.rb

diff --git a/app/models/user_email.rb b/app/models/user_email.rb
index 57032164c9..e4bfe5034a 100644
--- a/app/models/user_email.rb
+++ b/app/models/user_email.rb
@@ -15,27 +15,12 @@ class UserEmail < ActiveRecord::Base
   validate :user_id_not_changed, if: :primary
   validate :unique_email
 
-  before_save :save_canonical
-
   scope :secondary, -> { where(primary: false) }
 
-  def self.canonical(email)
-    name, domain = email.split('@', 2)
-    name = name.gsub(/\+.*/, '')
-    if ['gmail.com', 'googlemail.com'].include?(domain.downcase)
-      name = name.gsub('.', '')
-    end
-    "#{name}@#{domain}".downcase
-  end
+  self.ignored_columns = ['canonical_email']
 
   private
 
-  def save_canonical
-    if SiteSetting.enforce_canonical_emails && self.will_save_change_to_email?
-      self.canonical_email = UserEmail.canonical(self.email)
-    end
-  end
-
   def strip_downcase_email
     if self.email
       self.email = self.email.strip
@@ -49,14 +34,8 @@ class UserEmail < ActiveRecord::Base
   end
 
   def unique_email
-    if self.will_save_change_to_email?
-      exists = self.class.where("lower(email) = ?", email).exists?
-      exists ||= SiteSetting.enforce_canonical_emails &&
-        self.class.where("canonical_email = ?", UserEmail.canonical(email)).exists?
-
-      if exists
-        self.errors.add(:email, :taken)
-      end
+    if self.will_save_change_to_email? && self.class.where("lower(email) = ?", email).exists?
+      self.errors.add(:email, :taken)
     end
   end
 
@@ -73,17 +52,15 @@ end
 #
 # Table name: user_emails
 #
-#  id              :integer          not null, primary key
-#  user_id         :integer          not null
-#  email           :string(513)      not null
-#  primary         :boolean          default(FALSE), not null
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#  canonical_email :string
+#  id         :integer          not null, primary key
+#  user_id    :integer          not null
+#  email      :string(513)      not null
+#  primary    :boolean          default(FALSE), not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #
 # Indexes
 #
-#  index_user_emails_on_canonical_email      (canonical_email) WHERE (canonical_email IS NOT NULL)
 #  index_user_emails_on_email                (lower((email)::text)) UNIQUE
 #  index_user_emails_on_user_id              (user_id)
 #  index_user_emails_on_user_id_and_primary  (user_id,primary) UNIQUE WHERE "primary"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 004f511e03..d38b0caeab 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1586,7 +1586,6 @@ en:
     allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines. In exceptional cases you can permanently <a href='%{base_path}/admin/customize/robots'>override robots.txt</a>."
     email_domains_blacklist: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net"
     email_domains_whitelist: "A pipe-delimited list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!"
-    enforce_canonical_emails: "Prior to creating users strip email to canonical form ensuring uniqueness. Setting will only take effect on new account registrations. When set user+1@domain.com will not be allowed to register if user+2@domain.com is already registered."
     auto_approve_email_domains: "Users with email addresses from this list of domains will be automatically approved."
     hide_email_address_taken: "Don't inform users that an account exists with a given email address during signup and from the forgot password form."
     log_out_strict: "When logging out, log out ALL sessions for the user on all devices"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 986fc3ba38..8037237c2a 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -459,7 +459,6 @@ login:
   email_domains_whitelist:
     default: ""
     type: list
-  enforce_canonical_emails: false
   auto_approve_email_domains:
     default: ""
     type: list
diff --git a/db/migrate/20200414034210_add_canonical_email_to_user_email.rb b/db/migrate/20200414034210_add_canonical_email_to_user_email.rb
deleted file mode 100644
index 7033f55bb7..0000000000
--- a/db/migrate/20200414034210_add_canonical_email_to_user_email.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-class AddCanonicalEmailToUserEmail < ActiveRecord::Migration[6.0]
-  def change
-    add_column :user_emails, :canonical_email, :string, length: 513
-    add_index :user_emails, :canonical_email, where: 'canonical_email IS NOT NULL'
-  end
-end
diff --git a/db/post_migrate/20200424032633_remove_canonical_email_from_user_emails.rb b/db/post_migrate/20200424032633_remove_canonical_email_from_user_emails.rb
new file mode 100644
index 0000000000..8d5a0c9ff3
--- /dev/null
+++ b/db/post_migrate/20200424032633_remove_canonical_email_from_user_emails.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class RemoveCanonicalEmailFromUserEmails < ActiveRecord::Migration[6.0]
+  def up
+    execute <<~SQL
+      ALTER TABLE user_emails
+      DROP COLUMN IF EXISTS canonical_email
+    SQL
+  end
+  def down
+    # nothing to do, we already nuke the migrations
+  end
+end
diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb
index 3cea6c3078..e6def350b2 100644
--- a/spec/jobs/user_email_spec.rb
+++ b/spec/jobs/user_email_spec.rb
@@ -672,32 +672,4 @@ describe Jobs::UserEmail do
     end
 
   end
-
-  context "canonical emails" do
-    it "correctly creates canonical emails" do
-      expect(UserEmail.canonical('s.a.m+1@gmail.com')).to eq('sam@gmail.com')
-      expect(UserEmail.canonical('sa.m+1@googlemail.com')).to eq('sam@googlemail.com')
-      expect(UserEmail.canonical('sa.m+1722@sam.com')).to eq('sa.m@sam.com')
-      expect(UserEmail.canonical('sa.m@sam.com')).to eq('sa.m@sam.com')
-    end
-
-    it "correctly bans non canonical emails" do
-
-      email = UserEmail.create!(email: 'sam@sam.com', user_id: user.id)
-      expect(email.canonical_email).to eq(nil)
-
-      email = UserEmail.create!(email: 'sam+1@sam.com', user_id: user.id)
-      expect(email.canonical_email).to eq(nil)
-
-      SiteSetting.enforce_canonical_emails = true
-
-      email = UserEmail.create!(email: 'Sam+5@sam.com', user_id: user.id)
-      expect(email.canonical_email).to eq('sam@sam.com')
-
-      expect do
-        UserEmail.create!(email: 'saM+3@sam.com', user_id: user.id)
-      end.to raise_error(ActiveRecord::RecordInvalid)
-
-    end
-  end
 end

From cbceadf48b60b29fb710586e2b03bde4c5fe0883 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 24 Apr 2020 14:09:51 +1000
Subject: [PATCH 0770/1830] FEATURE: when blocking emails prefer blocking
 canonical

Previously we relied entirely on levenshtein_distance_spammer_emails site
setting to handle "similar looking" emails.

This commit improves the situation by always preferring to block (and check)
canonical emails.

This means that if:

`samevil+test@domain.com` is blocked the system will block `samevil@domain.com`

This means that `samevil+2@domain.com` (ad infinitum) will be blocked
---
 app/models/screened_email.rb       | 15 ++++++++++++++-
 spec/models/screened_email_spec.rb |  9 +++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/models/screened_email.rb b/app/models/screened_email.rb
index 73119db3b2..3f8a604d9b 100644
--- a/app/models/screened_email.rb
+++ b/app/models/screened_email.rb
@@ -18,11 +18,24 @@ class ScreenedEmail < ActiveRecord::Base
     self.email = email.downcase
   end
 
+  def self.canonical(email)
+    name, domain = email.split('@', 2)
+    name = name.gsub(/\+.*/, '')
+    if ['gmail.com', 'googlemail.com'].include?(domain.downcase)
+      name = name.gsub('.', '')
+    end
+    "#{name}@#{domain}".downcase
+  end
+
   def self.block(email, opts = {})
-    find_by_email(Email.downcase(email)) || create(opts.slice(:action_type, :ip_address).merge(email: email))
+    email = canonical(email)
+    find_by_email(email) || create!(opts.slice(:action_type, :ip_address).merge(email: email))
   end
 
   def self.should_block?(email)
+
+    email = canonical(email)
+
     screened_emails = ScreenedEmail.order(created_at: :desc).limit(100)
 
     distances = {}
diff --git a/spec/models/screened_email_spec.rb b/spec/models/screened_email_spec.rb
index aeefe195d3..2b33144c10 100644
--- a/spec/models/screened_email_spec.rb
+++ b/spec/models/screened_email_spec.rb
@@ -26,6 +26,7 @@ describe ScreenedEmail do
 
   describe '#block' do
     context 'email is not being blocked' do
+
       it 'creates a new record with default action of :block' do
         record = ScreenedEmail.block(email)
         expect(record).not_to be_new_record
@@ -57,6 +58,14 @@ describe ScreenedEmail do
   describe '#should_block?' do
     subject { ScreenedEmail.should_block?(email) }
 
+    it "automatically blocks via email canonicalization" do
+      SiteSetting.levenshtein_distance_spammer_emails = 0
+      ScreenedEmail.block('bad.acTor+1@gmail.com')
+      ScreenedEmail.block('bad.actOr+2@gmail.com')
+
+      expect(ScreenedEmail.should_block?('b.a.dactor@gmail.com')).to eq(true)
+    end
+
     it "returns false if a record with the email doesn't exist" do
       expect(subject).to eq(false)
     end

From 90d6816d19200484194ee5d0b72894aef06d7671 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 24 Apr 2020 10:08:22 +0200
Subject: [PATCH 0771/1830] FIX: removes inheriting as it's too random and can
 be very hard to track (#9542)

---
 app/assets/stylesheets/common/select-kit/select-kit.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index ea54fe8b9e..59a3d42a1b 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -133,7 +133,6 @@
     display: none;
     background: $secondary;
     box-sizing: border-box;
-    min-width: inherit;
     width: auto;
   }
 

From 8a112b7464b3db220cd19078ee8cf7ecb700c4b8 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 24 Apr 2020 09:47:01 +0100
Subject: [PATCH 0772/1830] DEV: Automatically extend CSP when themes link to
 external scripts (#9531)

---
 app/models/theme_field.rb                |  1 +
 lib/content_security_policy/extension.rb | 19 ++++++++++++++++++-
 spec/lib/content_security_policy_spec.rb | 13 +++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index ed0966fb5c..575490008f 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -317,6 +317,7 @@ class ThemeField < ActiveRecord::Base
       self.value_baked, self.error = translation_field? ? process_translation : process_html(self.value)
       self.error = nil unless self.error.present?
       self.compiler_version = COMPILER_VERSION
+      CSP::Extension.clear_theme_extensions_cache!
     elsif extra_js_field?
       self.value_baked, self.error = process_extra_js(self.value)
       self.error = nil unless self.error.present?
diff --git a/lib/content_security_policy/extension.rb b/lib/content_security_policy/extension.rb
index 5dd70223d0..f7b49b2307 100644
--- a/lib/content_security_policy/extension.rb
+++ b/lib/content_security_policy/extension.rb
@@ -42,7 +42,9 @@ class ContentSecurityPolicy
     def find_theme_extensions(theme_ids)
       extensions = []
 
-      Theme.where(id: Theme.transform_ids(theme_ids)).find_each do |theme|
+      resolved_ids = Theme.transform_ids(theme_ids)
+
+      Theme.where(id: resolved_ids).find_each do |theme|
         theme.cached_settings.each do |setting, value|
           extensions << build_theme_extension(value.split("|")) if setting.to_s == THEME_SETTING
         end
@@ -50,6 +52,21 @@ class ContentSecurityPolicy
 
       extensions << build_theme_extension(ThemeModifierHelper.new(theme_ids: theme_ids).csp_extensions)
 
+      html_fields = ThemeField.where(
+        theme_id: resolved_ids,
+        target_id: ThemeField.basic_targets.map { |target| Theme.targets[target.to_sym] },
+        name: ThemeField.html_fields
+      )
+
+      auto_script_src_extension = { script_src: [] }
+      html_fields.each(&:ensure_baked!)
+      doc = html_fields.map(&:value_baked).join("\n")
+      Nokogiri::HTML.fragment(doc).css('script[src]').each do |node|
+        auto_script_src_extension[:script_src] << node['src']
+      end
+
+      extensions << auto_script_src_extension
+
       extensions
     end
 
diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index 68a5dc2da2..d9eb9788c2 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -212,6 +212,19 @@ describe ContentSecurityPolicy do
       expect(parse(theme_policy)['script-src']).to_not include('https://from-theme-flag.script')
       expect(parse(theme_policy)['worker-src']).to_not include('from-theme-flag.worker')
     end
+
+    it 'is extended automatically when themes reference external scripts' do
+      policy # call this first to make sure further actions clear the cache
+
+      theme.set_field(target: :common, name: "header", value: "<script src='https://example.com/myscript.js'/>")
+      theme.save!
+
+      expect(parse(theme_policy)['script-src']).to include('https://example.com/myscript.js')
+
+      theme.destroy!
+
+      expect(parse(theme_policy)['script-src']).to_not include('https://example.com/myscript.js')
+    end
   end
 
   it 'can be extended by site setting' do

From 06168268412e909e83ed5bbc1f12c0bfe1487c8d Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 24 Apr 2020 09:47:33 +0100
Subject: [PATCH 0773/1830] DEV: Add jquery-free `decorateCookedElement`
 function to plugin api (#9534)

This is a replacement for `decorateCooked` which will work without jquery.

A backwards compatibility layer is provided for existing plugins/themes which are currently using `decorateCooked`
---
 .../app/components/composer-editor.js         |  2 +-
 .../discourse/app/lib/lazy-load-images.js     | 10 +++---
 .../discourse/app/lib/plugin-api.js           | 35 +++++++++++++------
 .../discourse/app/widgets/post-cooked.js      |  8 ++---
 4 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js
index ad34e96184..a71902ed52 100644
--- a/app/assets/javascripts/discourse/app/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/app/components/composer-editor.js
@@ -1019,7 +1019,7 @@ export default Component.extend({
 
       this._registerImageScaleButtonClick($preview);
 
-      this.trigger("previewRefreshed", $preview);
+      this.trigger("previewRefreshed", $preview[0]);
       this.afterRefresh($preview);
     }
   }
diff --git a/app/assets/javascripts/discourse/app/lib/lazy-load-images.js b/app/assets/javascripts/discourse/app/lib/lazy-load-images.js
index 56ab825e0b..c3f63d2891 100644
--- a/app/assets/javascripts/discourse/app/lib/lazy-load-images.js
+++ b/app/assets/javascripts/discourse/app/lib/lazy-load-images.js
@@ -84,8 +84,8 @@ function show(image) {
   }
 }
 
-function forEachImage($post, callback) {
-  $post[0].querySelectorAll("img").forEach(img => {
+function forEachImage(post, callback) {
+  post.querySelectorAll("img").forEach(img => {
     if (img.width >= MINIMUM_SIZE && img.height >= MINIMUM_SIZE) {
       callback(img);
     }
@@ -104,7 +104,7 @@ export function setupLazyLoading(api) {
     });
   }, OBSERVER_OPTIONS);
 
-  api.decorateCooked($post => forEachImage($post, img => hide(img)), {
+  api.decorateCookedElement(post => forEachImage(post, img => hide(img)), {
     onlyStream: true,
     id: "discourse-lazy-load"
   });
@@ -112,8 +112,8 @@ export function setupLazyLoading(api) {
   // IntersectionObserver.observe must be called after the cooked
   // content is adopted by the document element in chrome
   // https://bugs.chromium.org/p/chromium/issues/detail?id=1073469
-  api.decorateCooked(
-    $post => forEachImage($post, img => observer.observe(img)),
+  api.decorateCookedElement(
+    post => forEachImage(post, img => observer.observe(img)),
     {
       onlyStream: true,
       id: "discourse-lazy-load-after-adopt",
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index 8f0e14253f..7188000327 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -54,7 +54,7 @@ import { on } from "@ember/object/evented";
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.8.41";
+const PLUGIN_API_VERSION = "0.8.42";
 
 class PluginApi {
   constructor(version, container) {
@@ -192,10 +192,23 @@ class PluginApi {
   }
 
   /**
-   * Used for decorating the `cooked` content of a post after it is rendered using
-   * jQuery.
+   * Method for decorating the `cooked` content of a post using JQuery
    *
-   * `callback` will be called when it is time to decorate with a jQuery selector.
+   * You should use decorateCookedElement instead, which works without JQuery
+   *
+   * This method will be deprecated in future
+   **/
+  decorateCooked(callback, opts) {
+    this.decorateCookedElement(
+      (element, decoratorHelper) => callback($(element), decoratorHelper),
+      opts
+    );
+  }
+
+  /**
+   * Used for decorating the `cooked` content of a post after it is rendered
+   *
+   * `callback` will be called when it is time to decorate with an DOM node.
    *
    * Use `options.onlyStream` if you only want to decorate posts within a topic,
    * and not in other places like the user stream.
@@ -206,8 +219,8 @@ class PluginApi {
    * For example, to add a yellow background to all posts you could do this:
    *
    * ```
-   * api.decorateCooked(
-   *   $elem => $elem.css({ backgroundColor: 'yellow' }),
+   * api.decorateCookedElement(
+   *   elem => { elem.style.backgroundColor = 'yellow' },
    *   { id: 'yellow-decorator' }
    * );
    * ```
@@ -215,7 +228,7 @@ class PluginApi {
    * NOTE: To avoid memory leaks, it is highly recommended to pass a unique `id` parameter.
    * You will receive a warning if you do not.
    **/
-  decorateCooked(callback, opts) {
+  decorateCookedElement(callback, opts) {
     opts = opts || {};
 
     addDecorator(callback, { afterAdopt: !!opts.afterAdopt });
@@ -1114,10 +1127,10 @@ function decorate(klass, evt, cb, id) {
   }
 
   const mixin = {};
-  mixin["_decorate_" + _decorateId++] = on(evt, function($elem) {
-    $elem = $elem || $(this.element);
-    if ($elem) {
-      cb($elem);
+  mixin["_decorate_" + _decorateId++] = on(evt, function(elem) {
+    elem = elem || this.element;
+    if (elem) {
+      cb(elem);
     }
   });
   klass.reopen(mixin);
diff --git a/app/assets/javascripts/discourse/app/widgets/post-cooked.js b/app/assets/javascripts/discourse/app/widgets/post-cooked.js
index 71fc9f43ef..6cd3a6f66a 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-cooked.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-cooked.js
@@ -11,7 +11,7 @@ import {
 let _beforeAdoptDecorators = [];
 let _afterAdoptDecorators = [];
 
-// Don't call this directly: use `plugin-api/decorateCooked`
+// Don't call this directly: use `plugin-api/decorateCookedElement`
 export function addDecorator(callback, { afterAdopt = false } = {}) {
   if (afterAdopt) {
     _afterAdoptDecorators.push(callback);
@@ -67,13 +67,11 @@ export default class PostCooked {
   }
 
   _decorateAndAdopt(cooked) {
-    const $cooked = $(cooked);
-
-    _beforeAdoptDecorators.forEach(d => d($cooked, this.decoratorHelper));
+    _beforeAdoptDecorators.forEach(d => d(cooked, this.decoratorHelper));
 
     document.adoptNode(cooked);
 
-    _afterAdoptDecorators.forEach(d => d($cooked, this.decoratorHelper));
+    _afterAdoptDecorators.forEach(d => d(cooked, this.decoratorHelper));
   }
 
   _applySearchHighlight($html) {

From d83f39be73accc2d1e0af88cc99743448d91290b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 24 Apr 2020 12:45:47 +0200
Subject: [PATCH 0774/1830] DEV: replaces jquery scrollTop by vanilla js code
 (#9543)

---
 .../javascripts/select-kit/components/select-kit.js | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 76f8dea368..e5c9394908 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -658,17 +658,10 @@ export default Component.extend(
       );
 
       if (rowContainer) {
-        const $collection = $(
-          this.element.querySelector(".select-kit-collection")
-        );
+        const collectionContainer = rowContainer.parentNode;
 
-        const collectionTop = $collection.position().top;
-
-        $collection.scrollTop(
-          $collection.scrollTop() +
-            $(rowContainer).position().top -
-            collectionTop
-        );
+        collectionContainer.scrollTop =
+          rowContainer.offsetTop - collectionContainer.offsetTop;
       }
     },
 

From 30cb5f7d863de4865e293d000c302d4a895fe34e Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Fri, 24 Apr 2020 15:16:29 +0200
Subject: [PATCH 0775/1830] Update translations

---
 config/locales/client.ar.yml                  |   6 +-
 config/locales/client.be.yml                  |   5 +
 config/locales/client.bg.yml                  |   6 +-
 config/locales/client.bs_BA.yml               |   5 +
 config/locales/client.ca.yml                  |   8 +-
 config/locales/client.cs.yml                  |   6 +-
 config/locales/client.da.yml                  |   8 +-
 config/locales/client.de.yml                  |   8 +-
 config/locales/client.el.yml                  |   6 +-
 config/locales/client.es.yml                  | 106 ++++++++++++++--
 config/locales/client.et.yml                  |   6 +-
 config/locales/client.fa_IR.yml               |   8 +-
 config/locales/client.fi.yml                  |   8 +-
 config/locales/client.fr.yml                  |   8 +-
 config/locales/client.gl.yml                  |   6 +-
 config/locales/client.he.yml                  |  33 ++++-
 config/locales/client.hu.yml                  |   5 +
 config/locales/client.hy.yml                  |   6 +-
 config/locales/client.id.yml                  |   5 +
 config/locales/client.it.yml                  |   8 +-
 config/locales/client.ja.yml                  |   6 +-
 config/locales/client.ko.yml                  |   6 +-
 config/locales/client.lt.yml                  |   6 +-
 config/locales/client.lv.yml                  |   6 +-
 config/locales/client.nb_NO.yml               |   6 +-
 config/locales/client.nl.yml                  |  33 ++++-
 config/locales/client.pl_PL.yml               |   8 +-
 config/locales/client.pt.yml                  |   6 +-
 config/locales/client.pt_BR.yml               |   8 +-
 config/locales/client.ro.yml                  |   6 +-
 config/locales/client.ru.yml                  |  35 +++++-
 config/locales/client.sk.yml                  |   6 +-
 config/locales/client.sl.yml                  |   6 +-
 config/locales/client.sq.yml                  |   6 +-
 config/locales/client.sr.yml                  |   6 +-
 config/locales/client.sv.yml                  |  33 ++++-
 config/locales/client.sw.yml                  |   6 +-
 config/locales/client.te.yml                  |   6 +-
 config/locales/client.th.yml                  |   5 +
 config/locales/client.tr_TR.yml               |   8 +-
 config/locales/client.uk.yml                  |   8 +-
 config/locales/client.ur.yml                  |   8 +-
 config/locales/client.vi.yml                  |   6 +-
 config/locales/client.zh_CN.yml               |  38 +++++-
 config/locales/client.zh_TW.yml               |   6 +-
 config/locales/server.ar.yml                  |   3 -
 config/locales/server.be.yml                  |   3 -
 config/locales/server.bg.yml                  |   3 -
 config/locales/server.bs_BA.yml               |   3 -
 config/locales/server.ca.yml                  |   3 -
 config/locales/server.cs.yml                  |   3 -
 config/locales/server.da.yml                  |   3 -
 config/locales/server.de.yml                  |   3 -
 config/locales/server.el.yml                  |   3 -
 config/locales/server.es.yml                  |  12 +-
 config/locales/server.et.yml                  |   3 -
 config/locales/server.fa_IR.yml               |   3 -
 config/locales/server.fi.yml                  |   3 -
 config/locales/server.fr.yml                  |   3 -
 config/locales/server.gl.yml                  |   3 -
 config/locales/server.he.yml                  |  15 ++-
 config/locales/server.hu.yml                  |   5 +-
 config/locales/server.hy.yml                  |   3 -
 config/locales/server.id.yml                  |   3 -
 config/locales/server.it.yml                  |   3 -
 config/locales/server.ja.yml                  |   3 -
 config/locales/server.ko.yml                  |   3 -
 config/locales/server.lt.yml                  |   3 -
 config/locales/server.lv.yml                  |   2 -
 config/locales/server.nb_NO.yml               |   3 -
 config/locales/server.nl.yml                  |  13 +-
 config/locales/server.pl_PL.yml               |   3 -
 config/locales/server.pt.yml                  |   3 -
 config/locales/server.pt_BR.yml               |   3 -
 config/locales/server.ro.yml                  |   3 -
 config/locales/server.ru.yml                  |  20 ++-
 config/locales/server.sk.yml                  |   3 -
 config/locales/server.sl.yml                  |   2 -
 config/locales/server.sq.yml                  |   3 -
 config/locales/server.sr.yml                  |   2 -
 config/locales/server.sv.yml                  |  11 +-
 config/locales/server.sw.yml                  |   3 -
 config/locales/server.te.yml                  |   3 -
 config/locales/server.th.yml                  |   1 -
 config/locales/server.tr_TR.yml               |   3 -
 config/locales/server.uk.yml                  |   3 -
 config/locales/server.ur.yml                  |   3 -
 config/locales/server.vi.yml                  |   3 -
 config/locales/server.zh_CN.yml               |  41 ++++---
 config/locales/server.zh_TW.yml               |   3 -
 .../config/locales/server.zh_CN.yml           |   2 +-
 .../config/locales/server.hu.yml              | 116 ++++++++++++++++--
 92 files changed, 628 insertions(+), 247 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index baa28cb0cc..d2551f34b9 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -2669,7 +2669,6 @@ ar:
             trust_levels_title: "مستوى الثقة الذي يُعطى للأعضاء آليا عندما يضافون:"
             trust_levels_none: "لا شيء"
             automatic_membership_email_domains: "المستخدمين الذين يمتلكون بريد الالكتروني عنوانه مطابق للعنوان الذي في القائمة سيتم تلقائيا اضافتهم للمجموعة."
-            automatic_membership_retroactive: "تطبيق نفس قاعدة عنوان البريد الإلكتروني لإضافة الاعضاء المسجلين الحاليين"
             primary_group: "تعيين تلقائيا كمجموعة أساسية"
         name_placeholder: "اسم المجموعة، بدون مسافات، كما هو الحال مع أسماء المستخدمين"
         primary: "المجموعة الأساسية"
@@ -3255,6 +3254,11 @@ ar:
         anonymize_yes: "نعم، جهّل هذا الحساب."
         anonymize_failed: "حدثت مشكلة في تجهيل الحساب."
         delete: "احذف المستخدم"
+        merge:
+          prompt:
+            cancel: "ألغِ"
+          confirmation:
+            cancel: "ألغِ"
         delete_forbidden_because_staff: "لا يمكن حذف المدراء والمشرفين."
         delete_posts_forbidden_because_staff: "لا يمكن حذف جميع المشاركات للمدراء والمشرفين. "
         delete_forbidden:
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index 0748fbdb2b..c9c33e1117 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -1685,6 +1685,11 @@ be:
         anonymize: "ананімны карыстальнік"
         anonymize_yes: "Так, схаваць гэты рахунак"
         delete: "выдаліць карыстальніка"
+        merge:
+          prompt:
+            cancel: "адмяніць"
+          confirmation:
+            cancel: "адмяніць"
         delete_forbidden_because_staff: "Адмінаў і мадэратараў выдаляць нельга."
         delete_dont_block: "толькі выдаленне"
         deleted: "Карыстальніка быў выдалены."
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index cdc57a506d..298f6fc63d 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -2130,7 +2130,6 @@ bg:
             trust_levels_title: "Нивото на доверие, което се предоставя автоматично на членовете, когато бъдат добавени:"
             trust_levels_none: "Без"
             automatic_membership_email_domains: "Потребители, които са регистрирани с имейл домейн, който съвпада с друг от този списък, автоматично ще бъдат добавени към тази група:"
-            automatic_membership_retroactive: "Приложи същото правило на имейл домейна за добавянето на съществуващи регистрирани потребители"
             primary_group: "Автоматично настрой като главна група"
         name_placeholder: "Име на групата, без интервали, точно както правилата за потребителско име"
         primary: "Главна група"
@@ -2607,6 +2606,11 @@ bg:
         anonymize_yes: "Да, анонимизирай този профил"
         anonymize_failed: "Възникна грешка по време на анонимизирането на профила."
         delete: "Изтрий потребител "
+        merge:
+          prompt:
+            cancel: "Отмени"
+          confirmation:
+            cancel: "Отмени"
         delete_forbidden_because_staff: "Админите и модераторите не могат да бъдат изтрити."
         delete_posts_forbidden_because_staff: "Не могат да бъдат изтрити всички постове на администратори и модератори."
         delete_forbidden:
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 951ae74885..e99e72dc0f 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -3941,6 +3941,11 @@ bs_BA:
         anonymize_yes: "Da, anonimiziraj ovaj račun"
         anonymize_failed: "Došlo je do problema sa anonimizacijom računa."
         delete: "Delete User"
+        merge:
+          prompt:
+            cancel: "Otkaži"
+          confirmation:
+            cancel: "Otkaži"
         delete_forbidden_because_staff: "Admins and moderators can't be deleted."
         delete_posts_forbidden_because_staff: "Ne možete obrisati sve postove administratora i moderatora."
         delete_forbidden:
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 87c1130152..d3c05e308f 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -2971,8 +2971,6 @@ ca:
           view_table: "taula"
           view_graph: "gràfica"
           refresh_report: "Actualitza el report"
-          start_date: "Data d'inici (UTC)"
-          end_date: "Data de finalització (UTC)"
           groups: "Tots els grups"
           disabled: "Aquest report és desactivat."
           totals_for_sample: "Totals per mostra"
@@ -3033,7 +3031,6 @@ ca:
             effects: Efectes
             trust_levels_none: "Cap"
             automatic_membership_email_domains: "Els usuaris registrats amb un domini de correu que coincideix amb un de la llista s'afegiran automàticament a aquest grup:"
-            automatic_membership_retroactive: "Aplica la mateixa regla de domini de correu per a afegir usuaris registrats existents."
             primary_group: "Estableix automàticament com a grup primari"
         name_placeholder: "Nom del grup, sense espais, igual que la regla del nom d'usuari"
         primary: "Grup primari"
@@ -3875,6 +3872,11 @@ ca:
         anonymize_yes: "Sí, fes anònim aquest compte"
         anonymize_failed: "Hi ha hagut un problema en fer anònim aquest compte."
         delete: "Suprimeix l'usuari"
+        merge:
+          prompt:
+            cancel: "Cancel·la"
+          confirmation:
+            cancel: "Cancel·la"
         delete_forbidden_because_staff: "No es poden suprimir administradors i moderadors. "
         delete_posts_forbidden_because_staff: "No es poden suprimir totes les publicacions d'administradores i moderadors."
         delete_forbidden:
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index ce4c780729..84c4b405fd 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -2757,7 +2757,6 @@ cs:
             trust_levels_title: "Automaticky přidělená věrohodnost členům když jsou přidáni: "
             trust_levels_none: "Žádná"
             automatic_membership_email_domains: "Uživatelé zaregistrovaní s emailem jehož doména se přesně shoduje s jednou z tohoto seznamu budou automaticky přidáni to této skupiny:"
-            automatic_membership_retroactive: "Aplikovat stejné doménové pravidlo na už existující uživatele"
             primary_group: "Automaticky nastavit jako hlavní skupinu"
         name_placeholder: "Název skupiny, bez mezer, stejná pravidla jako pro uživatelská jména"
         primary: "Hlavní skupina"
@@ -3424,6 +3423,11 @@ cs:
         anonymize_yes: "Ano, udělejte tento účet anonymním"
         anonymize_failed: "Nastal problém při anonymizování účtu."
         delete: "Smazat uživatele"
+        merge:
+          prompt:
+            cancel: "Zrušit"
+          confirmation:
+            cancel: "Zrušit"
         delete_forbidden_because_staff: "Správci ani moderátoři nemůžou být odstraněni."
         delete_posts_forbidden_because_staff: "Nemohu smazat všechny příspěvky administrátorů a moderátorů."
         delete_forbidden:
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 827fb87e22..cfb52a677a 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -2929,8 +2929,6 @@ da:
           view_table: "tabel"
           view_graph: "graf"
           refresh_report: "Genopfrisk rapporten"
-          start_date: "Startdato (UTC)"
-          end_date: "Slutdato (UTC)"
           groups: "Alle grupper"
           disabled: "Denne rapport er deaktiveret"
           totals_for_sample: "Totaler for prøve"
@@ -2989,7 +2987,6 @@ da:
             trust_levels_title: "Tillidsniveau der automatisk tildeles medlemmer når de oprettes:"
             trust_levels_none: "Ingen"
             automatic_membership_email_domains: "Brugere der registrerer med et email domæne der præcist matcher et på denne liste, vil automatisk blive tilføjet til denne gruppe:"
-            automatic_membership_retroactive: "Brug denne email domæne regel til at tilføje brugere der allerede er registrerede brugere"
             primary_group: "Sæt automatisk som primær gruppe"
         name_placeholder: "Gruppenavn uden mellemrum, samme som reglen for brugernavn"
         primary: "Primær gruppe"
@@ -3799,6 +3796,11 @@ da:
         anonymize_yes: "Ja, anonymiser denne konto"
         anonymize_failed: "Der var problemer med at anonymisere denne konto."
         delete: "Slet bruger"
+        merge:
+          prompt:
+            cancel: "Afbryd"
+          confirmation:
+            cancel: "Afbryd"
         delete_forbidden_because_staff: "Admins og moderatorer kan ikke slettes."
         delete_posts_forbidden_because_staff: "Kan ikke slette alle indlæg fra administratorer og moderatorer."
         delete_forbidden:
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 6b589d8154..9cc356de43 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -3031,8 +3031,6 @@ de:
           view_table: "Tabelle"
           view_graph: "Netzwerk"
           refresh_report: "Bericht aktualisieren"
-          start_date: "Startdatum (UTC)"
-          end_date: "Enddatum (UTC)"
           groups: "Alle Gruppen"
           disabled: "Dieser Bericht ist deaktiviert"
           totals_for_sample: "Insgesamt für Stichprobe"
@@ -3093,7 +3091,6 @@ de:
             effects: Effekte
             trust_levels_none: "Keine"
             automatic_membership_email_domains: "Benutzer, deren E-Mail-Domain mit einem der folgenden Listeneinträge genau übereinstimmt, werden automatisch zu dieser Gruppe hinzugefügt:"
-            automatic_membership_retroactive: "Diese Regel auch auf existierende Benutzer anwenden, um diese zur Gruppe hinzuzufügen."
             primary_group: "Automatisch als Hauptgruppe festlegen"
         name_placeholder: "Gruppenname, keine Leerzeichen, gleiche Regel wie beim Benutzernamen"
         primary: "Hauptgruppe"
@@ -3946,6 +3943,11 @@ de:
         anonymize_yes: "Ja, diesen Benutzer anonymisieren"
         anonymize_failed: "Beim Anonymisieren des Benutzers ist ein Fehler aufgetreten."
         delete: "Benutzer löschen"
+        merge:
+          prompt:
+            cancel: "Abbrechen"
+          confirmation:
+            cancel: "Abbrechen"
         delete_forbidden_because_staff: "Administratoren und Moderatoren können nicht gelöscht werden."
         delete_posts_forbidden_because_staff: "Löschen aller Beiträge von Administratoren und Moderatoren ist nicht möglich."
         delete_forbidden:
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 0d5e89c6d5..0dbe63981f 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -2295,7 +2295,6 @@ el:
             trust_levels_title: "Επίπεδο εμπιστοσύνης που δίνεται αυτόματα στα μέλη όταν προστίθενται:"
             trust_levels_none: "Κανένα"
             automatic_membership_email_domains: "Οι χρήστης των οποίων το email domain ταιριάζει με κάποιο από αυτά της λίστας, θα προστίθενται αυτόματα σε αυτή την ομάδα:"
-            automatic_membership_retroactive: "Εφάρμοσε αυτόν τον κανόνα και σε υπάρχοντες χρήστες, για να τους προσθέσεις στην ομάδα:"
             primary_group: "Να οριστεί αυτόματα σαν η κύρια ομάδα"
         name_placeholder: "Όνομα ομάδας, χωρίς κενά, ίδιοι κανόνες με τους κανόνες για το όνομα χρήστη"
         primary: "Κύρια ομάδα"
@@ -2910,6 +2909,11 @@ el:
         anonymize_yes: "Ναι, ανωνυμοποίησε αυτόν τον λογαριασμό"
         anonymize_failed: "Παρουσιάστηκε ένα σφάλμα κατά την ανωνυμοποίηση του λογαριασμού."
         delete: "Διαγραφή χρήστη"
+        merge:
+          prompt:
+            cancel: "Άκυρο"
+          confirmation:
+            cancel: "Άκυρο"
         delete_forbidden_because_staff: "Οι διαχειριστές και οι συντονιστές δεν μπορούν να διαγραφούν."
         delete_posts_forbidden_because_staff: "Δεν μπορείς να διαγράψεις όλες τις αναρτήσεις διαχειριστών και συντονιστών."
         delete_forbidden:
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 401ee44dff..f9649f5725 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -29,6 +29,7 @@ es:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY HH:mm"
@@ -260,11 +261,15 @@ es:
       help:
         bookmark: "Haz clic para marcar la primera publicación sobre este tema"
         unbookmark: "Haz clic para eliminar todos los marcadores en este tema"
+        unbookmark_with_reminder: "Haz clic para quitar todos los marcadores y recordatorios en este tema. Tienes un recordatorio puesto %{reminder_at} para este tema."
     bookmarks:
       created: "has marcado esta publicación"
       not_bookmarked: "marcar esta publicación"
+      created_with_reminder: "has guardado esta publicación en marcadores con un recordatorio %{date}"
       created_with_at_desktop_reminder: "guardaste esta publicación en marcadores y se te recordará la próxima vez que estés en tu computadora"
       remove: "Eliminar marcador"
+      delete: "Borrar marcador"
+      confirm_delete: "¿Seguro que quieres borrar este marcados? El recordatorio también se borrará."
       confirm_clear: "¿Estás seguro de que deseas eliminar todos tus marcadores en este tema?"
       save: "Guardar"
       no_timezone: 'No has establecido una zona horaria todavía. No podrás establecer recordatorios. Puedes elegir una <a href="%{basePath}/my/preferences/profile">en tu perfil</a>.'
@@ -273,12 +278,19 @@ es:
       reminders:
         at_desktop: "La próxima vez que esté en mi ordenador"
         later_today: "Más tarde durante el día de hoy"
+        next_business_day: "Siguiente día hábil"
         tomorrow: "Mañana"
         next_week: "Próxima semana"
         later_this_week: "Esta misma semana"
+        start_of_next_business_week: "Lunes que viene"
         next_month: "Próximo mes"
         custom: "Fecha y hora personalizadas"
+        last_custom: "Último"
         none: "No se necesita recordatorio"
+        today_with_time: "hoy a las %{time}"
+        tomorrow_with_time: "mañana a las %{time}"
+        at_time: "a las %{date_time}"
+        existing_reminder: "Tienes un recordatorio puesto para este marcador que será enviado"
     drafts:
       resume: "Reanudar"
       remove: "Eliminar"
@@ -516,6 +528,7 @@ es:
       days_visited_long: "Días visitados"
       posts_read: "Leídos"
       posts_read_long: "Publicaciones leídas"
+      last_updated: "Última actialización:"
       total_rows:
         one: "%{count} usuario"
         other: "%{count} usuarios"
@@ -897,6 +910,7 @@ es:
         success: "(correo electrónico enviado)"
         in_progress: "(enviando correo electrónico)"
         error: "(error)"
+        emoji: "emoji de un candado"
         action: "Enviar correo electrónico para restablecer la contraseña"
         set_password: "Establecer contraseña"
         choose_new: "Escoge una nueva contraseña"
@@ -1265,6 +1279,7 @@ es:
         fixed: "Cargar página"
     modal:
       close: "cerrar"
+      dismiss_error: "Descartar error"
     close: "Cerrar"
     assets_changed_confirm: "Este sitio acaba de ser actualizado. ¿Quieres cargar la página de nuevo para ver la última versión?"
     logout: "Has cerrado sesión."
@@ -1274,16 +1289,16 @@ es:
       login_disabled: "Iniciar sesión está desactivado mientras el foro se encuentre en modo de solo lectura."
       logout_disabled: "Cerrar sesión está desactivado mientras el sitio se encuentre en modo de solo lectura."
     too_few_topics_and_posts_notice_MF: >-
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">¡Comencemos la discusión!</a> Hay {currentTopics, plural, un {<strong>#</strong> tema} otros {<strong>#</strong> temas}} y {currentPosts, plural, una {<strong>#</strong> publicación} otras {<strong>#</strong> publicaciones}}. Los visitantes necesitan más contenido para leer y responder – nosotros recomendamos al menos {requiredTopics, plural, un {<strong>#</strong> tema} otros {<strong>#</strong> temas}} y {requiredPosts, plural, una {<strong>#</strong> publicación} otras {<strong>#</strong> publicaciones}}. Solo los miembros del staff pueden ver este mensaje.
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">¡Comencemos la discusión!</a> Hay {currentTopics, plural, one {<strong>#</strong> tema} other {<strong>#</strong> temas}} y {currentPosts, plural, one {<strong>#</strong> publicación} other {<strong>#</strong> publicaciones}}. Los visitantes necesitan más contenido para leer y responder – nosotros recomendamos al menos {requiredTopics, plural, one {<strong>#</strong> tema} other {<strong>#</strong> temas}} y {requiredPosts, plural, one {<strong>#</strong> publicación} other {<strong>#</strong> publicaciones}}. Solo los miembros del staff pueden ver este mensaje.
     too_few_topics_notice_MF: >-
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">¡Comencemos la discusión!</a> Hay {currentTopics, plural, un {<strong>#</strong> tema} otros {<strong>#</strong> temas}}. Los visitantes necesitan más contenido para leer y responder – nosotros recomendamos al menos {requiredTopics, plural, un {<strong>#</strong> tema} otros {<strong>#</strong> temas}}. Solo los miembros del staff pueden ver este mensaje.
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">¡Comencemos la discusión!</a> Hay {currentTopics, plural, one {<strong>#</strong> tema} other {<strong>#</strong> temas}}. Los visitantes necesitan más contenido para leer y responder – nosotros recomendamos al menos {requiredTopics, plural, one {<strong>#</strong> tema} other {<strong>#</strong> temas}}. Solo los miembros del staff pueden ver este mensaje.
     too_few_posts_notice_MF: >-
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">¡Comencemos la discusión!</a> Hay {currentPosts, plural, una {<strong>#</strong> publicación} otras {<strong>#</strong> publicaciones}}. Los visitantes necesitan más contenido para leer y responder – nosotros recomendamos al menos {requiredPosts, plural, una {<strong>#</strong> publicación} otras {<strong>#</strong> publicaciones}}. Solo los miembros del staff pueden ver este mensaje.
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">¡Comencemos la discusión!</a> Hay {currentPosts, plural, one {<strong>#</strong> publicación} other {<strong>#</strong> publicaciones}}. Los visitantes necesitan más contenido para leer y responder – nosotros recomendamos al menos {requiredPosts, plural, one {<strong>#</strong> publicación} other {<strong>#</strong> publicaciones}}. Solo los miembros del staff pueden ver este mensaje.
     logs_error_rate_notice:
-      reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} otros {# errors/hour}}</a> alcanzó el límite de la configuración del sitio de {limit, plural, one {# error/hour} otros {# errors/hour}}."
-      reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} otros {# errors/minute}}</a> alcanzó el límite de la configuración del sitio de {limit, plural, one {# error/minute} otros {# errors/minute}}."
-      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} otros {# errors/hour}}</a> excedió el límite de la configuración del sitio del {limit, plural, one {# error/hour} otros {# errors/hour}}."
-      exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} otros {# errors/minute}}</a> excedió el límite de la configuración del sitio de {limit, plural, one {# error/minute} otros {# errors/minute}}."
+      reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} other {# errors/hour}}</a> alcanzó el límite de la configuración del sitio de {limit, plural, one {# error/hour} other {# errors/hour}}."
+      reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} other {# errors/minute}}</a> alcanzó el límite de la configuración del sitio de {limit, plural, one {# error/minute} other {# errors/minute}}."
+      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} other {# errors/hour}}</a> excedió el límite de la configuración del sitio del {limit, plural, one {# error/hour} other {# errors/hour}}."
+      exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} other {# errors/minute}}</a> excedió el límite de la configuración del sitio de {limit, plural, one {# error/minute} other {# errors/minute}}."
     learn_more: "saber más..."
     all_time: "total"
     all_time_desc: "total de temas creados"
@@ -1359,6 +1374,7 @@ es:
     email_login:
       link_label: "Enviarme un enlace para ingresar por correo electrónico"
       button_label: "con correo electrónico"
+      emoji: "emoji de candado"
       complete_username: "Si una cuenta coincide con el nombre de usuario <b>%{username}</b>, en breve deberías recibir un correo electrónico con un enlace para ingresar a tu cuenta."
       complete_email: "Si una cuenta coincide con <b>%{email}</b>, en breve deberías recibir un correo electrónico con un enlace para ingresar a tu cuenta."
       complete_username_found: "Encontramos una cuenta que coincide con el nombre de usuario <b>%{username}</b>, en breve deberías recibir un correo electrónico con un enlace para ingresar a tu cuenta."
@@ -1436,6 +1452,7 @@ es:
         backup_code: "Usar un código de respaldo en su lugar"
     invites:
       accept_title: "Invitación"
+      emoji: "emoji de un sobre"
       welcome_to: "¡Bienvenido a %{site_name}!"
       invited_by: "Has sido invitado por:"
       social_login_available: "También tendrás la posibilidad de iniciar sesión mediante cualquier red social asociada a ese correo electrónico."
@@ -1649,6 +1666,9 @@ es:
         message:
           one: "%{count} mensaje sin leer"
           other: "{{count}} mensajes sin leer"
+        high_priority:
+          one: "%{count} notificación de alta prioridad sin leer"
+          other: "%{count} notificaciones de alta prioridad sin leer"
       title: "notificaciones por menciones a tu @nombre, respuestas a tus publicaciones y temas, mensajes, etc"
       none: "No se pudieron cargar las notificaciones en este momento."
       empty: "No se encontraron notificaciones."
@@ -1709,6 +1729,7 @@ es:
         moved_post: "publicación movida"
         linked: "enlazado"
         bookmark_reminder: "recordatorio de marcador"
+        bookmark_reminder_with_name: "recordatorio de marcador - %{name}"
         granted_badge: "medalla concedida"
         invited_to_topic: "invitado al tema"
         group_mentioned: "grupo mencionado"
@@ -2001,7 +2022,7 @@ es:
         auto_delete: "Este tema se eliminará automáticamente %{timeLeft}."
         auto_bump: "La fecha de este tema se actualizará %{timeLeft}."
         auto_reminder: "Te recordaremos sobre este tema %{timeLeft}."
-        auto_delete_replies: "Respuestas en este tema serán eliminadas automáticamente después de %{duration}."
+        auto_delete_replies: "Las respuestas a este tema serán eliminadas automáticamente después de %{duration}."
       auto_close_title: "Configuración de cierre automático"
       auto_close_immediate:
         one: "El último post se publicó hace %{count} hora, por lo que el tema se cerrará inmediatamente."
@@ -2213,6 +2234,18 @@ es:
         title: "Fusionar las publicaciones seleccionadas"
         action: "fusionar las publicaciones seleccionadas"
         error: "Se produjo un error al fusionar las oublicaciones seleccionadas."
+      publish_page:
+        title: "Publicación de página"
+        publish: "Publicar"
+        description: "Cuando un tema se publica como página su URL se puede compartir y se mostrará con estilos personalizados."
+        slug: "Slug"
+        publish_url: "La página se ha publicado en:"
+        topic_published: "El tema se ha publicado en:"
+        preview_url: "La página será publicada en:"
+        invalid_slug: "Lo sentimos, no puedes publicar esta página."
+        unpublish: "Despublicar"
+        unpublished: "La página se ha despublicado y ya no se puede acceder a ella."
+        publishing_settings: "Ajustes de publicación"
       change_owner:
         title: "Cambiar dueño"
         action: "cambiar dueño"
@@ -2349,6 +2382,7 @@ es:
         convert_to_moderator: "Convertir en publicación del staff"
         revert_to_regular: "Revertir el formato de publicación del staff"
         rebake: "Reconstruir HTML"
+        publish_page: "Publicación de página"
         unhide: "Deshacer ocultar"
         change_owner: "Cambiar dueño"
         grant_badge: "Conceder medalla"
@@ -2443,6 +2477,7 @@ es:
             button: "HTML"
       bookmarks:
         create: "Crear marcador"
+        edit: "Editar marcador"
         created: "Creado"
         name: "Nombre"
         name_placeholder: "¿Para qué es este marcador?"
@@ -2451,6 +2486,9 @@ es:
           delete_bookmark:
             name: "Eliminar marcador"
             description: "Elimina el marcador de tu perfil y cancela todos los recordatorios para tal marcador"
+          edit_bookmark:
+            name: "Editar marcador"
+            description: "Editar el nombre del marcador o cambia la fecha y hora del recordatorio"
     category:
       can: "puede&hellip; "
       none: "(sin categoría)"
@@ -2812,6 +2850,19 @@ es:
         title: "Redactando"
         return: "%{shortcut} Regresar al editor"
         fullscreen: "%{shortcut} Edición en pantalla completa"
+      bookmarks:
+        title: "Marcadores"
+        enter: "%{shortcut} Guardar y cerrar"
+        later_today: "%{shortcut} Hoy más tarde"
+        later_this_week: "%{shortcut} Esta semana"
+        tomorrow: "%{shortcut} Mañana"
+        next_week: "%{shortcut} La semana que viene"
+        next_month: "%{shortcut} El mes que viene"
+        next_business_week: "%{shortcut} Principio de la semana que viene"
+        next_business_day: "%{shortcut} Siguiente día hábil"
+        custom: "%{shortcut} Fecha y hora personalizadas"
+        none: "%{shortcut} Sin recordatorio"
+        delete: "%{shortcut} Borrar marcador"
       actions:
         title: "Acciones"
         bookmark_topic: "%{shortcut} Guardar/quitar el tema de marcadores"
@@ -3069,8 +3120,7 @@ es:
           view_table: "tabla"
           view_graph: "gráfico"
           refresh_report: "Actualizar reporte"
-          start_date: "Fecha de inicio (UTC)"
-          end_date: "Fecha de finalización (UTC)"
+          dates: "Fechas (UTC)"
           groups: "Todos los grupos"
           disabled: "Este reporte está inhabilitado"
           totals_for_sample: "Total para la muestra"
@@ -3087,6 +3137,8 @@ es:
               label: Grupo
             category:
               label: Categoría
+            include-subcategories:
+              label: "Incluir subcategoría"
       commits:
         latest_changes: "Cambios recientes: ¡por favor, actualiza a menudo!"
         by: "por"
@@ -3131,7 +3183,6 @@ es:
             effects: Efectos
             trust_levels_none: "Ninguno"
             automatic_membership_email_domains: "Los usuarios que se registren con un dominio de correo electrónico que esté en esta lista se añadirán automáticamente a este grupo:"
-            automatic_membership_retroactive: "Aplicar la misma regla de dominio de correo electrónico a los usuarios registrados existentes"
             primary_group: "Establecer automáticamente como grupo principal"
         name_placeholder: "Nombre del grupo, sin espacios, al igual que los nombres de usuarios"
         primary: "Grupo principal"
@@ -3249,6 +3300,9 @@ es:
         notification_event:
           name: "Evento de notificación"
           details: "Cuando un usuario recibe una notificación."
+        user_badge_event:
+          name: "Evento por obtención de medalla"
+          details: "Cuando un usuario recibe una medalla."
         delivery_status:
           title: "Estado de entrega"
           inactive: "Inactivo"
@@ -3398,6 +3452,7 @@ es:
           theme_name: "Nombre del tema"
           component_name: "Nombre del componente"
           themes_intro: "Seleccionar un tema existente o instalar uno nuevo para empezar"
+          themes_intro_emoji: "emoji de mujer artista"
           beginners_guide_title: "Guía básica para utilizar los temas de Discourse"
           developers_guide_title: "Guía del desarrollador para los temas de Discourse"
           browse_themes: "Ver temas de la comunidad"
@@ -3624,6 +3679,7 @@ es:
         format: "Formato"
         html: "html"
         text: "texto"
+        html_preview: "Previsualización de contenido de correo electrónico"
         last_seen_user: "Último usuario visto:"
         no_result: "No se han encontrado resultados para el resumen."
         reply_key: "Clave de respuesta"
@@ -3778,6 +3834,8 @@ es:
             api_key_update: "actualizar clave API"
             api_key_destroy: "destruir clave API"
             override_upload_secure_status: "sobrescribir estado seguro de la subida"
+            page_published: "página publicada"
+            page_unpublished: "página despublicada"
         screened_emails:
           title: "Correos bloqueados"
           description: "Cuando alguien trate de crear una cuenta nueva, los siguientes correos se revisarán y el registro se bloqueará, o se realizará alguna otra acción."
@@ -3984,6 +4042,29 @@ es:
         anonymize_yes: "Sí, hacer anónima esta cuenta."
         anonymize_failed: "Hubo un problema al hacer anónima la cuenta."
         delete: "Eliminar usuario"
+        merge:
+          transfer_and_delete: "Transferir y eliminar"
+          prompt:
+            title: "Transferir y eliminar @%{username}"
+            description: |
+              <p>Por favor, escoge un nuevo dueño para <b>el contenido de @%{username}.</b></p>
+
+              <p>Todos los temas, publicaciones, mensajes y otros contenidos creados por <b>@%{username}</b> serán transferidos.</p>
+            target_username_placeholder: "Nombre de usuario del nuevo dueño"
+            transfer_and_delete: "Transferir y eliminar @%{username}"
+            cancel: "Cancelar"
+          confirmation:
+            title: "Transferir y eliminar @%{username}"
+            description: |
+              <p>Todo el contenido de <b>@%{username}</b> será transferido y atribuido a <b>@%{targetUsername}</b>. Después de la transferencia, la cuenta <b>@%{username}</b> será eliminada.</p>
+
+              <p><b>¡No se puede deshacer!</b></p>
+
+              <p>Para continuar, escribe: <code>%{text}</code></p>
+            transfer_and_delete: "Transferir y eliminar @%{username}"
+            cancel: "Cancelar"
+        merging_user: "Juntando usuario..."
+        merge_failed: "Ha ocurrido un error al juntar los usuarios."
         delete_forbidden_because_staff: "Los administradores y moderadores no se pueden eliminar."
         delete_posts_forbidden_because_staff: "No se pueden eliminar todos las publicaciones de administradores y moderadores."
         delete_forbidden:
@@ -4241,6 +4322,7 @@ es:
             with_time: "<span class=\"username\">%{username}</span> a las <span class=\"time\">%{time}</span>"
         badge_intro:
           title: "Selecciona una medalla existente o crea una para empezar"
+          emoji: "emoji de mujer estudiante"
           what_are_badges_title: "¿Qué son las medallas?"
           badge_query_examples_title: "Ejemplos de consultas de medallas"
         mass_award:
@@ -4259,6 +4341,7 @@ es:
         name: "Nombre"
         group: "Grupo"
         image: "Imagen"
+        alt: "previsualización de emoji personalizado"
         delete_confirm: "¿Estás seguro de que quieres eliminar el emoji :%{name}:?"
       embedding:
         get_started: "Si quieres insertar Discourse en otro sitio web, empieza por añadir su host."
@@ -4278,6 +4361,7 @@ es:
         embed_post_limit: "Número máximo de publicaciones que se pueden insertar"
         embed_title_scrubber: "Expresión regular utilizada para depurar el título de las publicaciones"
         embed_truncate: "Truncar las publicaciones insertadas"
+        embed_unlisted: "Los temas importados se ocultarán de la lista hasta que tengan una respuesta."
         embed_whitelist_selector: "Selector CSS para elementos permitidos en los insertados"
         embed_blacklist_selector: "Selector CSS para los elementos que se eliminan de los insertados"
         embed_classname_whitelist: "Clases CSS permitidas"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 9b7097c953..8c185b0f9d 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -2362,7 +2362,6 @@ et:
             trust_levels_title: "Liikmetele peale lisamist automaatselt omistatud usaldustase:"
             trust_levels_none: "Pole"
             automatic_membership_email_domains: "Kasutajad, kes registreeruvad meiliaadressiga, mille domeen ühtib täpselt mõnega sellest loetelust, lisatakse siia gruppi automaatselt:"
-            automatic_membership_retroactive: "Olemasolevate registreeritud kasutajate lisamiseks rakenda sama meiliaadressi domeeni reeglit"
             primary_group: "Muuda automaatselt peamiseks grupiks"
         name_placeholder: "Grupi nimi, tühikuteta, vastab kasutajanime reeglitele"
         primary: "Peamine grupp"
@@ -2958,6 +2957,11 @@ et:
         anonymize_yes: "Jah, anonümiseeri see konto"
         anonymize_failed: "Viga konto anonümiseerimisel."
         delete: "Kustuta kasutaja"
+        merge:
+          prompt:
+            cancel: "Tühista"
+          confirmation:
+            cancel: "Tühista"
         delete_forbidden_because_staff: "Admine ja moderaatoreid ei saa kustutada."
         delete_posts_forbidden_because_staff: "Ei saa kustutada adminide ja moderaatorite kõiki postitusi."
         delete_forbidden:
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index e5a524cf7a..57efc8e041 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -2888,8 +2888,6 @@ fa_IR:
           view_table: "جدول"
           view_graph: "نمودار"
           refresh_report: "تازه کردن گزارش"
-          start_date: "زمان شروع (UTC)"
-          end_date: "زمان پایان (UTC)"
           groups: "همه گروه‌ها"
           disabled: "این گزارش غیرفعال شده"
           totals_for_sample: "کل نمونه‌ها"
@@ -2938,7 +2936,6 @@ fa_IR:
             trust_levels_title: "سطح اعتماد به صورت خودکار به اعضایی که اضافه می‌شوند داده می‌شود:"
             trust_levels_none: "هیچ کدام"
             automatic_membership_email_domains: " کاربرانی که با ایمیل دامنه ثبت نام کرده اند،دقیقا شبیه دامنه های لیست، بصورت خودکار به این گروه اضافه می شوند :"
-            automatic_membership_retroactive: "درخواست همان قاعده دامنه ایمیل برای اضافه کردن برای کاربران ثبت نام کرده"
             primary_group: "بطور خودکار به گروه اصلی تبدیل شد"
         name_placeholder: "در نام گروه نمی توان از فاصله استفاده کرد، مانند قوانین نامگذاری نام کاربری"
         primary: "گروه اصلی"
@@ -3609,6 +3606,11 @@ fa_IR:
         anonymize_yes: "بله، حساب‌کاربری را بینام کن"
         anonymize_failed: "یک مشکل با حساب‌کاربری بینام وجود دارد"
         delete: "حذف کاربر"
+        merge:
+          prompt:
+            cancel: "لغو کردن"
+          confirmation:
+            cancel: "لغو کردن"
         delete_forbidden_because_staff: "مدیران ارشد و مدیران را نمی‌توانید پاک کنید"
         delete_posts_forbidden_because_staff: "نمی توان همه‌ی نوشته‌های مدیران ارشد و مدیران را حذف کرد"
         delete_forbidden:
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 4841845a94..0f5e360629 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -3038,8 +3038,6 @@ fi:
           view_table: "taulukko"
           view_graph: "graafi"
           refresh_report: "Päivitä raportti"
-          start_date: "Alkamisajankohta (UTC)"
-          end_date: "Päättymisajankohta (UTC)"
           groups: "Kaikki ryhmät"
           disabled: "Raportti ei ole käytössä"
           totals_for_sample: "Otos yhteensä"
@@ -3100,7 +3098,6 @@ fi:
             effects: Vaikutukset
             trust_levels_none: "Ei mitään"
             automatic_membership_email_domains: "Käyttäjä, joka rekisteröityy sähköpostiverkkotunnuksella joka täsmää tähän luetteloon, liitetään ryhmään automaattisesti:"
-            automatic_membership_retroactive: "Liitä olemassaolevia rekisteröityneitä käyttäjiä soveltaen samaa sähköpostiverkkotunnussääntöä "
             primary_group: "Aseta automaattisesti ensisijaiseksi ryhmäksi"
         name_placeholder: "Ryhmän nimi, ei välilyöntejä, samat säännöt kuin käyttäjänimillä"
         primary: "Ensisijainen ryhmä"
@@ -3953,6 +3950,11 @@ fi:
         anonymize_yes: "Kyllä, anonymisoi tämä käyttäjätili"
         anonymize_failed: "Käyttäjätilin anonymisointi ei onnistunut."
         delete: "Poista käyttäjä"
+        merge:
+          prompt:
+            cancel: "Peru"
+          confirmation:
+            cancel: "Peru"
         delete_forbidden_because_staff: "Ylläpitäjiä ja valvojia ei voi poistaa."
         delete_posts_forbidden_because_staff: "Ylläpitäjien ja valvojien kaikkia viestejä ei voi poistaa."
         delete_forbidden:
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 3caf174072..db522c2b26 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -3035,8 +3035,6 @@ fr:
           view_table: "tableau"
           view_graph: "graphique"
           refresh_report: "Actualiser le rapport"
-          start_date: "Date de début (UTC)"
-          end_date: "Date de fin (UTC)"
           groups: "Tous les groupes"
           disabled: "Ce rapport est désactivé"
           totals_for_sample: "Totaux pour l'échantillon"
@@ -3097,7 +3095,6 @@ fr:
             effects: Effets
             trust_levels_none: "Aucun"
             automatic_membership_email_domains: "Les utilisateurs qui s'enregistrent avec un domaine courriel qui correspond exactement à un élément de cette liste seront automatiquement ajoutés à ce groupe :"
-            automatic_membership_retroactive: "Appliquer la même règle de domaine courriel pour les utilisateurs existants"
             primary_group: "Définir comme groupe principal automatiquement"
         name_placeholder: "Nom du groupe, sans espace, mêmes règles que pour les pseudos"
         primary: "Groupe principal"
@@ -3950,6 +3947,11 @@ fr:
         anonymize_yes: "Oui, rendre ce compte anonyme"
         anonymize_failed: "Il y a eu un problème lors de l'anonymisation de ce compte."
         delete: "Supprimer l'utilisateur"
+        merge:
+          prompt:
+            cancel: "Annuler"
+          confirmation:
+            cancel: "Annuler"
         delete_forbidden_because_staff: "Administrateurs et modérateurs ne peuvent pas être supprimés."
         delete_posts_forbidden_because_staff: "Vous ne pouvez pas supprimer tous les messages des administrateurs et des modérateurs."
         delete_forbidden:
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 6b0a735b28..1e6bb87c66 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -1743,7 +1743,6 @@ gl:
             trust_levels_title: "Nivel de confianza automático concedido aos membros cando son engadidos:"
             trust_levels_none: "Ningún"
             automatic_membership_email_domains: "Os usuarios que se rexistraron cun dominio de correo electrónico que coincida exactamente con algún da lista engadiranse automaticamente a este grupo:"
-            automatic_membership_retroactive: "Aplicar a regra do mesmo dominio de correo electrónico para engadir os usuarios rexistrados."
             primary_group: "Estabelecer automaticamente como grupo primario"
         name_placeholder: "Nome do grupo sen espazos, como na regra do nome do usuario"
         primary: "Grupo primario"
@@ -2179,6 +2178,11 @@ gl:
         anonymize_yes: "Si, converter a conta en anónima"
         anonymize_failed: "Produciuse un problema convertendo a conta en anónima."
         delete: "Eliminar usuario"
+        merge:
+          prompt:
+            cancel: "Cancelar"
+          confirmation:
+            cancel: "Cancelar"
         delete_forbidden_because_staff: "Non é posíbel eliminiar os administradores e moderadores."
         delete_posts_forbidden_because_staff: "Non é posíbel eliminar todas as publicacións dos administradores ou moderadores."
         delete_forbidden:
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index c68dd6d67c..450b1167ea 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -316,6 +316,8 @@ he:
       created_with_reminder: "סימנת את הפוסט הזה עם תזכורת %{date}"
       created_with_at_desktop_reminder: "סימנת את הפוסט הזה ותישלח לך תזכורת בעת השימוש הבא בשולחן העבודה שלך"
       remove: "הסרה מהסימניות"
+      delete: "מחיקת סימנייה"
+      confirm_delete: "למחוק את הסימנייה הזאת? גם התזכורת תימחק."
       confirm_clear: "לנקות את כל הסימניות מנושא זה?"
       save: "שמירה"
       no_timezone: 'עדיין לא הגדרת אזור זמן. לא תהיה לך אפשרות להגדיר תזכורות. ניתן להגדיר אותו <a href="%{basePath}/my/preferences/profile">בפרופיל שלך</a>.'
@@ -3080,6 +3082,7 @@ he:
         next_business_day: "%{shortcut} יום העסקים הבא"
         custom: "%{shortcut} בחירת שעה ותאריך"
         none: "%{shortcut} ללא תזכורת"
+        delete: "%{shortcut} מחיקת סימנייה"
       actions:
         title: "פעולות"
         bookmark_topic: "%{shortcut} סמנו/בטלו-סימנייה של נושא"
@@ -3361,8 +3364,7 @@ he:
           view_table: "טבלה"
           view_graph: "גרף"
           refresh_report: "רענון דו\"ח"
-          start_date: "תאריך התחלה (UTC)"
-          end_date: "תאריך סיום (UTC)"
+          dates: "תאריכים (UTC)"
           groups: "כל הקבוצות"
           disabled: "דוח זה מנוטרל"
           totals_for_sample: "סיכומים לדוגמה"
@@ -3379,6 +3381,8 @@ he:
               label: קבוצה
             category:
               label: קטגוריה
+            include-subcategories:
+              label: "לכלול תת־קטגוריות"
       commits:
         latest_changes: "שינויים אחרונים: בבקשה עדכן תכופות!"
         by: "על ידי"
@@ -3423,7 +3427,7 @@ he:
             effects: אפקטים
             trust_levels_none: "ללא"
             automatic_membership_email_domains: "משתמשים שנרשמים עם שם תחום (דומיין) דוא״ל שתואם בדיוק לאחד מהרשימה, יתווספו באופן אוטומטי לקבוצה זו:"
-            automatic_membership_retroactive: "להחיל את אותו כלל שם תחום הדוא״ל כדי להוסיף משתמשים רשומים"
+            automatic_membership_user_count: "ל־%{count} משתמשים יש את כתובות הדוא״ל בשם התחום החדש ויתווספו לקבוצה."
             primary_group: "קבע כקבוצה ראשית באופן אוטומטי"
         name_placeholder: "שם קבוצה, ללא רווחים, לפי הכללים של שמות משתמשים"
         primary: "קבוצה ראשית"
@@ -4291,6 +4295,29 @@ he:
         anonymize_yes: "כן, נא להפוך חשבון זה לאלמוני"
         anonymize_failed: "אירעה תקלה בהפיכת חשבון זה לאלמוני."
         delete: "מחיקת משתמש"
+        merge:
+          transfer_and_delete: "העברה ומחיקה"
+          prompt:
+            title: "העברה ומחיקה של ‎@%{username}‎"
+            description: |
+              <p>נא לבחור בעלות חדשה על התוכן של <b>‎@%{username}‎</b> .</p>
+
+              <p>כל הנושאים, הפוסטים, ההודעות ושאר התוכן שנוצר על ידי <b>‎@%{username}‎</b> יועבר.</p>
+            target_username_placeholder: "שם המשתמש של הבעלים החדשים"
+            transfer_and_delete: "העברה ומחיקה של ‎@%{username}‎"
+            cancel: "ביטול"
+          confirmation:
+            title: "העברה ומחיקה של ‎@%{username}‎"
+            description: |
+              <p>כל התוכן של <b>‎@%{username}‎</b> יועבר וישויך אל <b>‎@%{targetUsername}‎</b>. לאחר העברת התוכן, החשבון של <b>‎@%{username}‎</b> יימחק.</p>
+
+              <p><b>מדובר בפעולה בלתי הפיכה!</b></p>
+
+              <p>כדי להמשיך עליך להקליד: <code>%{text}</code></p>
+            transfer_and_delete: "העברה ומחיקה של ‎@%{username}‎"
+            cancel: "ביטול"
+        merging_user: "המשתמש ממוזג…"
+        merge_failed: "אירעה שגיאה במיזוג המשתמשים."
         delete_forbidden_because_staff: "לא ניתן למחוק מנהלים ומפקחים."
         delete_posts_forbidden_because_staff: "לא ניתן להסיר את כל הפוסטים של מנהלי מערכת ומפקחים."
         delete_forbidden:
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index 84a82870ae..f843aad5c8 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -3008,6 +3008,11 @@ hu:
         time_read: "Olvasási idő"
         anonymize: "Felhasználó névtelenítése"
         delete: "Felhasználó törlése"
+        merge:
+          prompt:
+            cancel: "Mégse"
+          confirmation:
+            cancel: "Mégse"
         delete_dont_block: "Csak törlés"
         deleting_user: "Felhasználó törlése..."
         deleted: "A felhasználó el lett távolítva"
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index ea8fefb9ca..b446663a91 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -2730,7 +2730,6 @@ hy:
             trust_levels_title: "Վստահության մակարդակը ավտոմատ կերպով շնորհվում է անդամներին ավելացման ժամանակ:"
             trust_levels_none: "Ոչ մի"
             automatic_membership_email_domains: "Այն օգտատերերը, որոնք գրանցվում են էլ. հասցեի դոմենով, որը ճշգրտորեն համընկնում է այս ցանկում գտնվողին, ավտոմատ կերպով կավելացվեն այս խմբում՝ "
-            automatic_membership_retroactive: "Կիրառել միևնույն էլ. հասցեի դոմենի կանոնը՝ գոյություն ունեցող գրանցված օգտատերերին ավելացնելու համար"
             primary_group: "Ավտոմատ կիրառել որպես հիմնական խումբ"
         name_placeholder: "Խմբի անունը, առանց բացատների, նույնը, ինչ օգտանվան կանոնը"
         primary: "Հիմնական Խումբ"
@@ -3512,6 +3511,11 @@ hy:
         anonymize_yes: "Այո, անվանազրկել այս հաշիվը"
         anonymize_failed: "Հաշիվը անվանազրկելիս առաջացել է խնդիր:"
         delete: "Ջնջել Օգտատիրոջը"
+        merge:
+          prompt:
+            cancel: "Չեղարկել"
+          confirmation:
+            cancel: "Չեղարկել"
         delete_forbidden_because_staff: "Ադմինները և մոդերատորները չեն կարող ջնջվել:"
         delete_posts_forbidden_because_staff: "Չհաջողվեց ջնջել ադմինների և մոդերատորների բոլոր գրառումները:"
         delete_forbidden:
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 50d931693a..410f902df7 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -1727,6 +1727,11 @@ id:
         approve: "Terima"
         time_read: "Waktu Baca"
         delete: "Hapus Pengguna"
+        merge:
+          prompt:
+            cancel: "Batal"
+          confirmation:
+            cancel: "Batal"
         delete_and_block: "Hapus dan <b>block</b> email dan alamat IP ini"
         tl3_requirements:
           visits: "mengunjungi"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 4173610a3c..ac69f908f3 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -3113,8 +3113,6 @@ it:
           view_table: "tabella"
           view_graph: "grafico"
           refresh_report: "Aggiorna Rapporto"
-          start_date: "Data di inizio (UTC)"
-          end_date: "Data di fine (UTC)"
           groups: "Tutti i gruppi"
           disabled: "Il rapporto è disabilitato"
           totals_for_sample: "Totale per campione"
@@ -3175,7 +3173,6 @@ it:
             effects: Effetti
             trust_levels_none: "Nessuno"
             automatic_membership_email_domains: "Gli utenti che si registrano con un dominio email che corrisponde esattamente a uno presente in questa lista, saranno aggiunti automaticamente a questo gruppo:"
-            automatic_membership_retroactive: "Applica la stessa regola sul dominio email per aggiungere utenti registrati esistenti"
             primary_group: "Imposta automaticamente come gruppo principale"
         name_placeholder: "Nome del gruppo, senza spazi, stesse regole del nome utente"
         primary: "Gruppo Primario"
@@ -4035,6 +4032,11 @@ it:
         anonymize_yes: "Sì, rendi anonimo questo account"
         anonymize_failed: "Si è verificato un problema nel rendere anonimo l'account."
         delete: "Cancella utente"
+        merge:
+          prompt:
+            cancel: "Annulla"
+          confirmation:
+            cancel: "Annulla"
         delete_forbidden_because_staff: "Amministratori e moderatori non possono essere cancellati."
         delete_posts_forbidden_because_staff: "Impossibile cancellare tutti i messaggi degli amministratori e dei moderatori."
         delete_forbidden:
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 354e190ea3..59291ac65d 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -2432,7 +2432,6 @@ ja:
             trust_levels_title: "メンバーが追加されたときにメンバーに自動で付与されるトラストレベル："
             trust_levels_none: "なし"
             automatic_membership_email_domains: "このリストにあるものと完全に一致するメー​​ルドメインで登録したユーザーは、自動的にこのグループに追加されます。"
-            automatic_membership_retroactive: "既存の登録ユーザーを追加するため、同じメールドメインにルールを適用する"
             primary_group: "自動的にプライマリーグループとして設定する"
         name_placeholder: "グループ名、スペースなし、ユーザー名のルールと同じ"
         primary: "プライマリーグループ"
@@ -2930,6 +2929,11 @@ ja:
         anonymize_yes: "はい。アカウントを匿名化してください"
         anonymize_failed: "アカウントの匿名化中に問題が発生しました"
         delete: "ユーザを削除"
+        merge:
+          prompt:
+            cancel: "キャンセル"
+          confirmation:
+            cancel: "キャンセル"
         delete_forbidden_because_staff: "管理者およびモデレータアカウントは削除できません。"
         delete_posts_forbidden_because_staff: "管理者、モデレータの全ての投稿は削除できません"
         delete_forbidden:
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 41bdcbe873..9e2ede793b 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -2399,7 +2399,6 @@ ko:
             trust_levels_title: "멤버들이 추가되면 회원등급이 자동으로 부여됩니다:"
             trust_levels_none: "없음"
             automatic_membership_email_domains: "이 목록의 있는 항목과 사용자들이 등록한 이메일 도메인이 일치할때 이 그룹에 포함"
-            automatic_membership_retroactive: "이미 등록된 사용자에게 같은 이메일 도메인 규칙 적용하기"
             primary_group: "기본 그룹으로 자동 설정"
         name_placeholder: "그룹 이름, 공백 없이 username 규칙과 동일하게 입력하세요."
         primary: "주 그룹"
@@ -3055,6 +3054,11 @@ ko:
         anonymize_yes: "Yes, anonymize this account"
         anonymize_failed: "There was a problem anonymizing the account."
         delete: "사용자 삭제"
+        merge:
+          prompt:
+            cancel: "취소"
+          confirmation:
+            cancel: "취소"
         delete_forbidden_because_staff: "관리자 및 운영자 계정은 삭제할 수 없습니다."
         delete_posts_forbidden_because_staff: "관리자와 운영자의 글은 삭제할 수 없습니다."
         delete_forbidden:
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 6b5d731529..fc7f0bc130 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -2395,7 +2395,6 @@ lt:
             trust_levels_title: "Pasitikėjimo lygis automatiškai suteikiamas nariui kai jis prideda:"
             trust_levels_none: "Nieko"
             automatic_membership_email_domains: "Vartotojai, kurie užsiregistravo su el. paštu, kuris sutampa su šiame sąraše esančiu el. paštu bus automatiškai pridėti į šią grupę:"
-            automatic_membership_retroactive: "Pritaikyk tas pačias el. pašto taisykles, kad pridėtum jau egzistuojančius registruotus vartotojus"
             primary_group: "Automatiškai nustatyk pagrindinę grupę"
         name_placeholder: "Grupės pavadinimas, be tarpų, taisyklės kaip ir slapyvardžiui"
         primary: "Pagrindinė Grupė"
@@ -2906,6 +2905,11 @@ lt:
         anonymize_yes: "Taip, Anonimizuoti šįą paskyrą"
         anonymize_failed: "Įvyko klaida anonimizuojant šią paskyrą"
         delete: "Ištrinti vartotoją"
+        merge:
+          prompt:
+            cancel: "Atšaukti"
+          confirmation:
+            cancel: "Atšaukti"
         delete_forbidden_because_staff: "Administratoriai ir moderatoriai negali būti ištrinti."
         delete_posts_forbidden_because_staff: "Negalima ištrinti administratorių ir moderatorių įrašų"
         delete_forbidden:
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 76d77a879a..2552f541c3 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -2283,7 +2283,6 @@ lv:
             trust_levels_title: "Uzticamības līmenis, ko automātiski piešķir visiem dalībniekiem pievienošanas brīdī:"
             trust_levels_none: "Nav"
             automatic_membership_email_domains: "Lietotāji, kas reģistrējas ar e-pasta domēnu, kas precīzi sakrīt ar kādu no šī saraksta, tiks automātiski pievienoti šai grupai:"
-            automatic_membership_retroactive: "Izmantot viena e-pasta domēna noteikumu, lai pievienotu esošus lietotājus"
             primary_group: "Automātiski padarīt par galveno grupu"
         name_placeholder: "Grupas nosaukums, bez atstarpēm, tādi paši noteikumi kā lietotāja vārdam"
         primary: "Galvenā grupa"
@@ -2787,6 +2786,11 @@ lv:
         anonymize_yes: "Jā, anonimizēt kontu. (anonymize)"
         anonymize_failed: "Radās problēma ar konta anonimizēšanu (anonymizing)."
         delete: "Dzēst lietotāju."
+        merge:
+          prompt:
+            cancel: "Atcelt"
+          confirmation:
+            cancel: "Atcelt"
         delete_forbidden_because_staff: "Administratori un moderatori nevar tikt dzēsti."
         delete_posts_forbidden_because_staff: "Nevar izdzēst visus administratoru un moderatoru ierakstus."
         delete_forbidden:
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index c0f94aba48..62b0e76a05 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -2634,7 +2634,6 @@ nb_NO:
             trust_levels_title: "Tillitsnivå som automatisk gis til nye medlemmer når de legges til:"
             trust_levels_none: "Ingen"
             automatic_membership_email_domains: "Brukere som registreres med et e-postdomene identisk med et fra denne listen vil automatisk legges til i denne gruppen:"
-            automatic_membership_retroactive: "Bruk den samme regelen på eksisterende brukere med matchende e-postdomener"
             primary_group: "Sett som primærgruppe automatisk"
         name_placeholder: "Gruppenavn, ingen mellomrom, samme som regel for brukernavn"
         primary: "Primærgruppe"
@@ -3333,6 +3332,11 @@ nb_NO:
         anonymize_yes: "Ja, anonymiser denne kontoen"
         anonymize_failed: "Det oppstod en feil ved anonymisering av denne kontoen."
         delete: "Slett bruker"
+        merge:
+          prompt:
+            cancel: "Avbryt"
+          confirmation:
+            cancel: "Avbryt"
         delete_forbidden_because_staff: "Administratorer og moderatorer kan ikke slettes."
         delete_posts_forbidden_because_staff: "Kan ikke slette alle innlegg av administratorer og moderatorer."
         delete_forbidden:
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index d1e2f90282..27240c9afc 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -268,6 +268,8 @@ nl:
       created_with_reminder: "u hebt een bladwijzer voor dit bericht gemaakt met een herinnering voor %{date}"
       created_with_at_desktop_reminder: "u hebt een bladwijzer voor dit bericht gemaakt en wordt de volgende keer dat u uw computer gebruikt herinnerd"
       remove: "Bladwijzer verwijderen"
+      delete: "Bladwijzer verwijderen"
+      confirm_delete: "Weet u zeker dat u deze bladwijzer wilt verwijderen? De herinnering wordt ook verwijderd."
       confirm_clear: "Weet u zeker dat u alle bladwijzers van dit topic wilt verwijderen?"
       save: "Opslaan"
       no_timezone: 'U hebt nog geen tijdzone ingesteld. Hierdoor kunt u geen herinneringen instellen. Stel er een in <a href="%{basePath}/my/preferences/profile">in uw profiel</a>.'
@@ -2860,6 +2862,7 @@ nl:
         next_business_day: "%{shortcut} Volgende werkdag"
         custom: "%{shortcut} Aangepaste datum en tijd"
         none: "%{shortcut} Geen herinnering"
+        delete: "%{shortcut} Bladwijzer verwijderen"
       actions:
         title: "Acties"
         bookmark_topic: "%{shortcut} Bladwijzer voor topic in-/uitschakelen"
@@ -3117,8 +3120,7 @@ nl:
           view_table: "tabel"
           view_graph: "grafiek"
           refresh_report: "Rapport vernieuwen"
-          start_date: "Startdatum (UTC)"
-          end_date: "Einddatum (UTC)"
+          dates: "Datums (UTC)"
           groups: "Alle groepen"
           disabled: "Dit rapport is uitgeschakeld"
           totals_for_sample: "Totalen voor steekproef"
@@ -3135,6 +3137,8 @@ nl:
               label: Groep
             category:
               label: Categorie
+            include-subcategories:
+              label: "Subcategorieën bijvoegen"
       commits:
         latest_changes: "Laatste wijzigingen: werk regelmatig bij!"
         by: "door"
@@ -3179,7 +3183,7 @@ nl:
             effects: Effecten
             trust_levels_none: "Geen"
             automatic_membership_email_domains: "Gebruikers die zich met een e-maildomein registeren dat precies overeenkomt met een domein in deze lijst worden automatisch aan deze groep toegevoegd:"
-            automatic_membership_retroactive: "Dezelfde e-maildomeinregel toepassen voor het toevoegen van bestaande geregistreerde gebruikers"
+            automatic_membership_user_count: "%{count} gebruikers hebben de nieuwe e-maildomeinen en worden aan de groep toegevoegd."
             primary_group: "Automatisch instellen als primaire groep"
         name_placeholder: "Groepsnaam, geen spaties, hetzelfde als gebruikersnaamregel"
         primary: "Primaire groep"
@@ -4039,6 +4043,29 @@ nl:
         anonymize_yes: "Ja, deze account anonimiseren"
         anonymize_failed: "Er is een probleem opgetreden bij het anonimiseren van de account."
         delete: "Gebruiker verwijderen"
+        merge:
+          transfer_and_delete: "Overdragen & verwijderen"
+          prompt:
+            title: "Overdragen & @%{username} verwijderen"
+            description: |
+              <p>Kies een nieuwe eigenaar voor de inhoud van <b>@%{username}</b>.</p>
+
+              <p>Alle topics, berichten en andere inhoud die door <b>@%{username}</b> is gemaakt, wordt overgedragen.</p>
+            target_username_placeholder: "Gebruikersnaam van nieuwe eigenaar"
+            transfer_and_delete: "Overdragen & @%{username} verwijderen"
+            cancel: "Annuleren"
+          confirmation:
+            title: "Overdragen & @%{username} verwijderen"
+            description: |
+              <p>Alle inhoud van <b>@%{username}</b> wordt overgedragen en aan <b>@%{targetUsername}</b> toegekend. Nadat de inhoud is overgezet, wordt de account van<b>@%{username}</b> verwijderd.</p>
+
+              <p><b>Dit kan niet ongedaan worden gemaakt!</b></p>
+
+              <p>Type het volgende om door te gaan: <code>%{text}</code></p>
+            transfer_and_delete: "Overdragen & @%{username} verwijderen"
+            cancel: "Annuleren"
+        merging_user: "Gebruiker samenvoegen..."
+        merge_failed: "Er is een fout opgetreden tijdens het samenvoegen van de gebruikers."
         delete_forbidden_because_staff: "Beheerders en moderators kunnen niet worden verwijderd."
         delete_posts_forbidden_because_staff: "Kan niet alle berichten van beheerders en moderators verwijderen."
         delete_forbidden:
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 1612f8fc56..f558984e7a 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -3198,8 +3198,6 @@ pl_PL:
           view_table: "tabela"
           view_graph: "wykres"
           refresh_report: "Odśwież raport"
-          start_date: "Data startowa (UTC)"
-          end_date: "Data końcowa (UTC)"
           groups: "Wszystkie grupy"
           disabled: "Ten raport jest nieaktywny"
           totals_for_sample: "Całkowite na próbkowanie"
@@ -3259,7 +3257,6 @@ pl_PL:
             effects: Efekty
             trust_levels_none: "Brak"
             automatic_membership_email_domains: "Użytkownicy rejestrujący się przy pomocy adresu z tej listy zostaną automatycznie przypisani do tej grupy."
-            automatic_membership_retroactive: "Zastosuj tę regułę domenową do już istniejących użytkowników."
             primary_group: "Automatycznie ustawiaj jako główną grupę"
         name_placeholder: "Nazwa grupy, bez spacji, takie same zasady jak przy nazwie użytkownika"
         primary: "Główna grupa"
@@ -4103,6 +4100,11 @@ pl_PL:
         anonymize_yes: "Tak, anonimizuj to konto."
         anonymize_failed: "Wystąpił problem podczas anonimizacji konta."
         delete: "Usuń użytkownika"
+        merge:
+          prompt:
+            cancel: "Anuluj"
+          confirmation:
+            cancel: "Anuluj"
         delete_forbidden_because_staff: "Administratorzy i moderatorzy nie mogą zostać usunięci."
         delete_posts_forbidden_because_staff: "Nie można usunąć wszystkich wpisów administratorów i moderatorów."
         delete_forbidden:
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index de71481603..29bedc2d68 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -2544,7 +2544,6 @@ pt:
             trust_levels_title: "Nível de confiança concedido automaticamente a membros quando são adicionados:"
             trust_levels_none: "Nenhum"
             automatic_membership_email_domains: "Utilizadores que registem um domínio de email que corresponde exactamente a algum desta lista irão ser automaticamente adicionados a este grupo:"
-            automatic_membership_retroactive: "Aplicar a mesma regra de domínio de email para adicionar utilizadores registados existentes"
             primary_group: "Definir automaticamente como grupo primário"
         name_placeholder: "Nome do grupo, sem espaços, com as mesmas regras do nome de utilizador"
         primary: "Grupo Primário"
@@ -3068,6 +3067,11 @@ pt:
         anonymize_yes: "Sim, tornar esta conta anónima"
         anonymize_failed: "Ocorreu um problema ao tornar esta conta anónima."
         delete: "Eliminar Utilizador"
+        merge:
+          prompt:
+            cancel: "Cancelar"
+          confirmation:
+            cancel: "Cancelar"
         delete_forbidden_because_staff: "Administradores e moderadores não podem ser eliminados."
         delete_posts_forbidden_because_staff: "Não é possível eliminar todas as publicações dos administradores e moderadores."
         delete_forbidden:
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 694ec3e025..d95190318d 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -3029,8 +3029,6 @@ pt_BR:
           view_table: "tabela"
           view_graph: "gráfico"
           refresh_report: "Atualizar Relatório"
-          start_date: "Data de início (UTC)"
-          end_date: "Data de término (UTC)"
           groups: "Todos os grupos"
           disabled: "Este relatório está desativado"
           totals_for_sample: "Totais para amostra"
@@ -3091,7 +3089,6 @@ pt_BR:
             effects: Efeitos
             trust_levels_none: "Nenhum"
             automatic_membership_email_domains: "Os usuários que se registrarem em um domínio de e-mail que corresponda exatamente a um nesta lista serão adicionados automaticamente a este grupo:"
-            automatic_membership_retroactive: "Aplicar a mesma regra de domínio de e-mail para adicionar usuários registrados existentes"
             primary_group: "Definir automaticamente como grupo principal"
         name_placeholder: "Nome do grupo, sem espaços, igual à regra de nome de usuário"
         primary: "Grupo Primário"
@@ -3944,6 +3941,11 @@ pt_BR:
         anonymize_yes: "Sim, tornar esta conta anônima"
         anonymize_failed: "Ocorreu um problema ao tornar a conta anônima."
         delete: "Apagar Usuário"
+        merge:
+          prompt:
+            cancel: "Cancelar"
+          confirmation:
+            cancel: "Cancelar"
         delete_forbidden_because_staff: "Administradores e moderadores não podem ser excluidos."
         delete_posts_forbidden_because_staff: "Não posso excluir todas as mensagens de administradores e moderadores."
         delete_forbidden:
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 7bc7fb4b44..a26fed9e10 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -2447,7 +2447,6 @@ ro:
             trust_levels_title: "Nivel de încredere acordat automat membrilor atunci când sunt adăugați:"
             trust_levels_none: "Nimeni"
             automatic_membership_email_domains: "Utilizatorii care se înregistrează cu un domeniu de email identic cu unul din lista asta vor fi adăugați automat în acest grup:"
-            automatic_membership_retroactive: "Aplică aceeaşi regulă pentru domeniul de email pentru a adauga utilizatorii existenţi"
             primary_group: "Setează automat ca grup principal"
         name_placeholder: "Numele grupului, fără spații, la fel ca regula pentru nume utilizator"
         primary: "Grup primar"
@@ -3040,6 +3039,11 @@ ro:
         anonymize_yes: "Da, transformă acest cont în cont anonim"
         anonymize_failed: "A apărut o problemă în timpul transformării contului în cont anonim."
         delete: "Ștergere utilizator"
+        merge:
+          prompt:
+            cancel: "Anulează"
+          confirmation:
+            cancel: "Anulează"
         delete_forbidden_because_staff: "Adminii și moderatorii nu pot fi sterși."
         delete_posts_forbidden_because_staff: "Nu poți șterge mesajele administratorilor și moderatorilor."
         delete_forbidden:
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 26af4e1697..20eac7a0e7 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -315,7 +315,9 @@ ru:
       not_bookmarked: "Добавить сообщение в закладки"
       created_with_reminder: "Вы добавили это сообщение в закладки с последующим напоминанием %{date}"
       created_with_at_desktop_reminder: "Вы добавили это сообщение в закладки с последующим напоминанием, когда вы откроете это сообщение на настольном компьютере"
-      remove: "Удалить закладку"
+      remove: "Удаление закладки"
+      delete: "Удалить закладку"
+      confirm_delete: "Вы действительно хотите удалить эту закладку? Напоминание также будет удалено."
       confirm_clear: "Вы действительно хотите удалить все ваши закладки из этой темы?"
       save: "Сохранить"
       no_timezone: 'Укажите ваш часовой пояс <a href="%{basePath}/my/preferences/profile">в настройках своей учётной записи</a>, чтобы активировать функцию напоминаний.'
@@ -398,7 +400,7 @@ ru:
         placeholder: "Введите заголовок сообщения, url или id"
     review:
       order_by: "Сортировать по"
-      in_reply_to: "в ответе"
+      in_reply_to: "Посмотреть обсуждение"
       explain:
         why: "Объяснить, почему этот элемент оказался в очереди"
         title: "Обзорная оценка"
@@ -3080,6 +3082,7 @@ ru:
         next_business_day: "%{shortcut} На следующий рабочий день"
         custom: "%{shortcut} Установить дату и время напоминания"
         none: "%{shortcut} Не настраивать напоминание"
+        delete: "%{shortcut}Удалить закладку"
       actions:
         title: "Темы"
         bookmark_topic: "%{shortcut} Добавить / удалить из закладок"
@@ -3361,8 +3364,6 @@ ru:
           view_table: "Таблица"
           view_graph: "График"
           refresh_report: "Обновить отчет"
-          start_date: "Дата начала (UTC)"
-          end_date: "Дата окончания (UTC)"
           groups: "Все группы"
           disabled: "Этот отчет отключен"
           totals_for_sample: "Итоги по выборке"
@@ -3379,6 +3380,8 @@ ru:
               label: Группа
             category:
               label: Раздел
+            include-subcategories:
+              label: "Включая подразделы"
       commits:
         latest_changes: "Обновления в репозитории Github"
         by: "от"
@@ -3423,7 +3426,6 @@ ru:
             effects: Эффекты
             trust_levels_none: "Отсутствует"
             automatic_membership_email_domains: "Пользователи, зарегистрированные c адресом электронной почты, который точно совпадает с доменом в этом списке, будут автоматически добавлены в эту группу: "
-            automatic_membership_retroactive: "Примените то же правило домена e-mail, чтобы добавить существующих зарегистрированных пользователей."
             primary_group: "Автоматически устанавливается в качестве основной группы"
         name_placeholder: "Название группы, без пробелов, по тем же правилам, что и для псевдонимов."
         primary: "Основная группа"
@@ -4291,6 +4293,29 @@ ru:
         anonymize_yes: "Да, анонимизировать эту учетную запись"
         anonymize_failed: "Не удалось анонимизировать учетную запись."
         delete: "Удалить пользователя"
+        merge:
+          transfer_and_delete: "Объединить пользователей"
+          prompt:
+            title: "Объединить контент и удалить пользователя @%{username}"
+            description: |2
+               <p>Выберите нового владельца для контента пользователя <b>@%{username}</b>.</p>
+
+              <p>Все темы, сообщения, личные сообщения и другой контент, созданный пользователем <b>@%{username}</b> будет передан новому владельцу.</p>
+            target_username_placeholder: "Псевдоним нового владельца"
+            transfer_and_delete: "Объединить контент и удалить пользователя @%{username}"
+            cancel: "Отмена"
+          confirmation:
+            title: "Объединить контент и удалить пользователя @%{username}"
+            description: |
+              <p>Все данные пользователя <b>@%{username}</b> будут переданы пользователю <b>@%{targetUsername}</b>, после чего учётная запись пользователя <b>@%{username}</b> будет удалена.</p>
+
+              <p><b>Операция не может быть отменена!</b></p>
+
+              <p>Для продолжения введите: <code>%{text}</code></p>
+            transfer_and_delete: "Объединить контент и удалить пользователя @%{username}"
+            cancel: "Отмена"
+        merging_user: "Объединение пользователей..."
+        merge_failed: "В процессе объединения пользователей произошла ошибка."
         delete_forbidden_because_staff: "Администраторы и модераторы не могут быть удалены"
         delete_posts_forbidden_because_staff: "Нельзя удалить все сообщения администраторов и модераторов."
         delete_forbidden:
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index fe8370261d..4c9a45d361 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -2350,7 +2350,6 @@ sk:
             trust_levels_title: "Stupeň dôvery automaticky udelený členom po ich pridaní:"
             trust_levels_none: "Žiadny"
             automatic_membership_email_domains: "Užívatelia, ktorí sa zaregistrovali s emailovou doménou uvedenou v zozname budú automaticky pridaní do tejto skupiny. "
-            automatic_membership_retroactive: "Použi pravidlo rovnakej emailovej domény pre pridanie registrovaných používateľov"
             primary_group: "Automaticky nastav ako hlavnú skupinu"
         name_placeholder: "Meno skupiny, bez medzier, také isté pravidlá ako pre používateľské meno"
         primary: "Hlavná skupina"
@@ -2832,6 +2831,11 @@ sk:
         anonymize_yes: "Áno, zmeň tento účet na anonymný"
         anonymize_failed: "Nastala chyba pri anonymizovaní účtu."
         delete: "Odstrániť používateľa"
+        merge:
+          prompt:
+            cancel: "Zrušiť"
+          confirmation:
+            cancel: "Zrušiť"
         delete_forbidden_because_staff: "Správcovia a moderátori nemôžu byť vymazaní."
         delete_posts_forbidden_because_staff: "Nedá sa zmazať príspevky správcov a moderátorov."
         delete_forbidden:
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index ce28cb3268..2cd21fe199 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -3104,7 +3104,6 @@ sl:
             trust_levels_title: "Stopnja zaupanja, ki je samodejno dodeljena članom, ko so dodani:"
             trust_levels_none: "Brez"
             automatic_membership_email_domains: "Uporabniki, ki se prijavijo z e-naslovom, ki se točno ujema s to domeno, bodo samodejno dodani v to skupino:"
-            automatic_membership_retroactive: "Uporabi enako pravilo za e-naslov domene za dodajanje obstoječih uporabnikov"
             primary_group: "Samodejno nastavi za primarno skupino"
         name_placeholder: "Ime skupine, brez presledkov, enaka pravila kot za uporabniško ime"
         primary: "Primarna skupina"
@@ -3566,6 +3565,11 @@ sl:
         anonymize_confirm: "Ali ste PREPRIČANI da hočete anonomizirati tega uporabnika? To bo spremenilo njegovo uporabniško ime in e-naslov ter ponastavilo vse profilne podatke."
         anonymize_yes: "Da, anonimiziraj tega uporabnika"
         delete: "Izbriši uporabnika"
+        merge:
+          prompt:
+            cancel: "Prekliči"
+          confirmation:
+            cancel: "Prekliči"
         delete_forbidden_because_staff: "Administratorjev in moderatorjev se ne da izbrisati."
         delete_posts_forbidden_because_staff: "Ne morete izbrisati vseh prispevkov od administratorjev ali moderatorjev."
         delete_forbidden:
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 9c1adc9143..71a48fb415 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -1994,7 +1994,6 @@ sq:
             trust_levels_title: "Niveli i besimit që ju akordohet automatikisht anëtarëve të grupit:"
             trust_levels_none: "Asnjë"
             automatic_membership_email_domains: "Users who register with an email domain that exactly matches one in this list will be automatically added to this group:"
-            automatic_membership_retroactive: "Apply the same email domain rule to add existing registered users"
             primary_group: "Automatically set as primary group"
         name_placeholder: "Emri i grupit, pa hapësira, si username-t"
         primary: "Grupi Parësor"
@@ -2447,6 +2446,11 @@ sq:
         anonymize_yes: "Po, anonimizo këtë llogari"
         anonymize_failed: "There was a problem anonymizing the account."
         delete: "Fshi Përdoruesin"
+        merge:
+          prompt:
+            cancel: "Anulo"
+          confirmation:
+            cancel: "Anulo"
         delete_forbidden_because_staff: "Administratorët dhe moderatorët nuk fshihen dot. "
         delete_posts_forbidden_because_staff: "Can't delete all posts of admins and moderators."
         delete_and_block: "Fshijeni dhe <b>bllokoni</b> këtë email dhe adresë IP"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index e32a910f2b..c5dc6248f4 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -1635,7 +1635,6 @@ sr:
             automatic: Automatska
             trust_levels_none: "Ništa"
             automatic_membership_email_domains: "Korisnici koji se registruju sa email domenom koja tačno odgovora jednoj na ovoj listi biće automatski dodani u ovu grupu:"
-            automatic_membership_retroactive: "Primeni isto pravilo o email domeni za dodavanje postojećih registrovanih korisnika"
         name_placeholder: "Ime grupe, bez razmaka, ista pravila kao za korisničko ime"
         primary: "Primarna Grupa"
         no_primary: "(nema primarne grupe)"
@@ -2010,6 +2009,11 @@ sr:
         approve_bulk_success: "Uspeh! Svi označeni korisnici su odobreni i obavešteni."
         time_read: "Vreme Čitanja"
         delete: "Obriši Korisnika"
+        merge:
+          prompt:
+            cancel: "Odustani"
+          confirmation:
+            cancel: "Odustani"
         delete_forbidden_because_staff: "Admini i moderatori ne mogu biti obrisani."
         delete_forbidden:
           one: "Korisnici ne mogu biti obrisani ako imaju poruka. Obrišite sve njihove poruke pre nego pokušate obrisati korisnika. (Poruke starije od %{dana} ne mogu biti obrisane.)"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index c0420ef694..0b8e573f90 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -268,6 +268,8 @@ sv:
       created_with_reminder: "du har bokmärkt detta inlägg med en påminnelse %{date}"
       created_with_at_desktop_reminder: "du har bokmärkt detta inlägg och kommer att påminnas nästa gång du är vid din dator"
       remove: "Ta bort bokmärke"
+      delete: "Radera bokmärke"
+      confirm_delete: "Är du säker på att du vill radera det här bokmärket? Påminnelsen kommer också att raderas."
       confirm_clear: "Är du säker på att du vill radera alla dina bokmärken från ämnet?"
       save: "Spara"
       no_timezone: 'Du har ännu inte valt tidszon. Du kommer därför inte kunna sätta påminnelser. Ange en <a href="%{basePath}/my/preferences/profile">i din profil</a>.'
@@ -2860,6 +2862,7 @@ sv:
         next_business_day: "%{shortcut} Nästa vardag"
         custom: "%{shortcut} Anpassa datum och tid"
         none: "%{shortcut} Ingen påminnelse"
+        delete: "%{shortcut} Radera bokmärke"
       actions:
         title: "Åtgärder"
         bookmark_topic: "%{shortcut} Växla bokmärkning av ämne"
@@ -3117,8 +3120,7 @@ sv:
           view_table: "tabell"
           view_graph: "graf"
           refresh_report: "Uppdatera rapport"
-          start_date: "Startdatum (UTC)"
-          end_date: "Slutdatum (UTC)"
+          dates: "Datum (UTC)"
           groups: "Alla grupper"
           disabled: "Denna rapport är avstängd"
           totals_for_sample: "Totalt för prov"
@@ -3135,6 +3137,8 @@ sv:
               label: Grupp
             category:
               label: Kategori
+            include-subcategories:
+              label: "Inkludera underkategorier"
       commits:
         latest_changes: "Senaste ändringarna: snälla uppdatera ofta!"
         by: "av"
@@ -3179,7 +3183,7 @@ sv:
             effects: Effekter
             trust_levels_none: "Inga"
             automatic_membership_email_domains: "Användare som registrerar sig med en e-post vars domän exakt matchar en domän i den här listan kommer automatiskt att bli tillagd i den här gruppen:"
-            automatic_membership_retroactive: "Använd samma regel för e-postdomän för att lägga till nya användare"
+            automatic_membership_user_count: "%{count} användarna har de nya e-postdomänerna och kommer att läggas till i gruppen."
             primary_group: "Automatiskt inställd som primär grupp"
         name_placeholder: "Gruppnamn, inga mellanslag, samma regler som för användarnamn"
         primary: "Primär grupp"
@@ -4039,6 +4043,29 @@ sv:
         anonymize_yes: "Ja, anonymisera detta konto"
         anonymize_failed: "Ett problem uppstod vid anonymiseringen av kontot"
         delete: "Radera användare"
+        merge:
+          transfer_and_delete: "Överför & radera"
+          prompt:
+            title: "Överför & radera @%{username}"
+            description: |
+              <p>Vänligen välj en ny ägare för <b>@%{username}s</b> innehåll.</p>
+
+              <p>Alla ämnen, inlägg, meddelanden och annat innehåll skapat av <b>@%{username}</b> kommer föras över.</p>
+            target_username_placeholder: "Användarnamn på den nya ägaren"
+            transfer_and_delete: "Överför & radera @%{username}"
+            cancel: "Avbryt"
+          confirmation:
+            title: "Överför & radera @%{username}"
+            description: |
+              <p>Allt av <b>@%{username}s</b> innehåll kommer att överföras och hänföras till <b>@%{targetUsername}</b>. Efter att innehållet är överfört kommer <b>@%{username}s</b> konto att raderas.</p>
+
+              <p><b>Detta kan inte ångras!</b></p>
+
+              <p>För att fortsätta skriv: <code>%{text}</code></p>
+            transfer_and_delete: "Överför & radera @%{username}"
+            cancel: "Avbryt"
+        merging_user: "Slår samman användare..."
+        merge_failed: "Det uppstod ett fel vid sammanslagningen av användarna."
         delete_forbidden_because_staff: "Administratörer och moderatorer kan inte tas bort."
         delete_posts_forbidden_because_staff: "Kan inte ta bort alla inlägg för administratörer och moderatorer."
         delete_forbidden:
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 55dcb12453..0279890254 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -2405,7 +2405,6 @@ sw:
             trust_levels_title: "Wanachama otomatikali watapata kiwango cha uaminifu wakiongezwa:"
             trust_levels_none: "Hakuna"
             automatic_membership_email_domains: "Watumiaji wanaojiunga kupitia barua pepe zenye kikoa kinacholingana na hichi kwenye orodha hii wataongezwa otomatikali kwenye kikundi hiki:"
-            automatic_membership_retroactive: "Tumia kanuni ya kikoa cha barua pepe kuongeza watumiaji waliosajiliwa"
             primary_group: "Otomatikali weka kama kikundi msingi"
         name_placeholder: "Jina la kikundi, hakuna nafasi, sawa na kanuni ya jina la mtumiaji"
         primary: "Kikundi Msingi"
@@ -3038,6 +3037,11 @@ sw:
         anonymize_yes: "Ndio, fanya hii akaunti iwe ya mtu asiyejulikana"
         anonymize_failed: "Tatizo limetokea wakati wa kufanya akaunti iwe ya mtu asiyejulikana."
         delete: "Futa Mtumiaji"
+        merge:
+          prompt:
+            cancel: "Ghairi"
+          confirmation:
+            cancel: "Ghairi"
         delete_forbidden_because_staff: "Viongozi na wasimamizi hawawezi kufutwa."
         delete_posts_forbidden_because_staff: "Hauwezi kufuta machapisho yote za viongozi na wasimamizi."
         cant_delete_all_posts:
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index 970a244802..ff17c45be2 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -1383,7 +1383,6 @@ te:
           membership:
             automatic: స్వీయంగా
             automatic_membership_email_domains: "వినియోగదారుడు ఏ ఈ-మెయిల్ డొమైన్ తో నమోదు చేసుకున్నాడో అది ఖచ్చితంగా ఈ జాబితాలో ఒక దానిని పోలి స్వయంసిధ్ధంగా గ్రూప్ కి కలుస్తాయి:"
-            automatic_membership_retroactive: "ఇప్పటికే నమోదిత వినియోగదారులను జోడించడానికి అదే ఇమెయిల్ డొమైన్ రూల్ వర్తిస్తుంది"
         name_placeholder: "గంపు పేరు, జాగా లేకుండా, సభ్యనామం వలె"
         primary: "ప్రాథమిక గుంపు"
         no_primary: "(ప్రాథమిక గుంపు లేదు)"
@@ -1769,6 +1768,11 @@ te:
         approve_bulk_success: "విజయవంతం! ఎంచుకున్న వినియోగదారులందరినీ ఆమోదించారు మరియు ప్రకటన చేశారు."
         time_read: "చదువు సమయం"
         delete: "సభ్యుడిని తొలగించు"
+        merge:
+          prompt:
+            cancel: "రద్దుచేయి"
+          confirmation:
+            cancel: "రద్దుచేయి"
         delete_forbidden_because_staff: "అధికారులు మరియు నిర్వాహకులను తొలగించలేరు"
         delete_posts_forbidden_because_staff: "నిర్వాహకుల మరియు పరిశీలకుల అన్ని టపాలు తొలగించలేము."
         delete_and_block: "ఈ ఈ-మెయిల్ మరియు IP అడ్రస్ ను తొలగించండి మరియు <b>నిరోధించండి</b>"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 6e8bc581d4..273bcc27c8 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -1788,6 +1788,11 @@ th:
         time_read: "เวลาอ่าน"
         anonymize: "ผู้ใช้ที่ไม่ระบุ"
         delete: "ลบผู้ใช้"
+        merge:
+          prompt:
+            cancel: "ยกเลิก"
+          confirmation:
+            cancel: "ยกเลิก"
         delete_forbidden_because_staff: "ผู้ดูแลระบบและผู้ดูแลไม่สามารถถูกลบได้"
         delete_posts_forbidden_because_staff: "ไม่สามารถลบโพสทั้งหมดของผู้ดูแลระบบและผู้ดูแลได้"
         delete_and_block: "ลบและ <b>บล็อก</b> อีเมลและไอพีนี้"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 10f8321f6f..e0554c02f3 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -3024,8 +3024,6 @@ tr_TR:
           view_table: "tablo"
           view_graph: "grafik"
           refresh_report: "Raporu Yenile"
-          start_date: "Başlangıç Tarihi (UTC)"
-          end_date: "Bitiş Tarihi (UTC)"
           groups: "Tüm gruplar"
           disabled: "Bu rapor devre dışı"
           totals_for_sample: "Örnek toplamlar"
@@ -3086,7 +3084,6 @@ tr_TR:
             effects: Etkileri
             trust_levels_none: "Hiçbiri"
             automatic_membership_email_domains: "Listede, e-posta alan adıyla tam olarak eşleşen kayıtlı kullanıcılar, otomatik olarak bu gruba eklenir:"
-            automatic_membership_retroactive: "Mevcut kayıtlı kullanıcıları eklemek için aynı e-posta alanı kuralını uygula"
             primary_group: "Otomatik olarak ana grup biçiminde ayarla"
         name_placeholder: "Grup adı, boşluksuz, kullanıcı adı kuralıyla aynı olarak"
         primary: "Ana Grup"
@@ -3939,6 +3936,11 @@ tr_TR:
         anonymize_yes: "Evet, bu hesabı anonimleştir"
         anonymize_failed: "Hesap anonimleştirilirken bir hata oluştu."
         delete: "Kullanıcıyı Sil"
+        merge:
+          prompt:
+            cancel: "İptal"
+          confirmation:
+            cancel: "İptal"
         delete_forbidden_because_staff: "Yöneticiler ve moderatörler silinemez."
         delete_posts_forbidden_because_staff: "Yöneticiler ve moderatörlerin gönderileri silinemez."
         delete_forbidden:
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 9a1fc5167b..10fdd74b48 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -3273,8 +3273,6 @@ uk:
           view_table: "Таблиця"
           view_graph: "Графік"
           refresh_report: "Оновити звіт"
-          start_date: "Дата початку (UTC)"
-          end_date: "Дата закінчення (UTC)"
           groups: "Усі групи"
           disabled: "Цей звіт відключено"
           totals_for_sample: "Підсумки по вибірці"
@@ -3335,7 +3333,6 @@ uk:
             effects: Ефекти
             trust_levels_none: "Відсутня"
             automatic_membership_email_domains: "Користувачі, зареєстровані c адресою електронної пошти, яка точно збігається з доменом в цьому списку, будуть автоматично додані до цієї групи: "
-            automatic_membership_retroactive: "Застосуйте те ж правило домену e-mail, щоб додати існуючих зареєстрованих користувачів."
             primary_group: "Автоматично встановлюється в якості основної групи"
         name_placeholder: "Group name, no spaces, same as username rule"
         primary: "Primary Group"
@@ -4196,6 +4193,11 @@ uk:
         anonymize_yes: "Так, приховати цей обліковий запис"
         anonymize_failed: "Не вдалося анонімізувати обліковий запис."
         delete: "Видалити користувача"
+        merge:
+          prompt:
+            cancel: "Скасувати"
+          confirmation:
+            cancel: "Скасувати"
         delete_forbidden_because_staff: "Адмінів та модераторів видаляти не можна."
         delete_posts_forbidden_because_staff: "Не можна видалити всі повідомлення адміністраторів та модераторів."
         delete_forbidden:
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index a4ec6ef83f..b99357bb5a 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -2918,8 +2918,6 @@ ur:
           view_table: "ٹیبل"
           view_graph: "گراف"
           refresh_report: "رپورٹ رِیفریش کریں"
-          start_date: "شروع کی تاریخ (UTC)"
-          end_date: "اختتام کی تاریخ (UTC)"
           groups: "تمام گروپس"
           disabled: "یہ رپورٹ غیر فعال ہے"
           totals_for_sample: "نمونہ کیلئے کل"
@@ -2979,7 +2977,6 @@ ur:
             trust_levels_title: "ممبران کو شامل کرتے وقت خود کار طریقے سے دیا جانے والا ٹرسٹ لَیول:"
             trust_levels_none: "کوئی نہیں"
             automatic_membership_email_domains: "جو صارفین ایک ایسے اِیمیل ڈومین کے ساتھ رجسٹر کرتے ہیں جو اِس فہرست میں سے کسی ایک سے پورا ملتا ہے، تو اُن کو خود کار طریقے سے اِس گروپ میں شامل کر دیا جائے گا:"
-            automatic_membership_retroactive: "موجودہ رجسٹرڈ صارفین کو شامل کرنے کے لئے وہی اِیمیل ڈومین اصول لاگو کریں"
             primary_group: "خود کار طریقے سے پرائمری گروپ کے طور پر مقرر کریں"
         name_placeholder: "گروپ کا نام، کوئی خالی جگہ نہیں، نامِ صارفین کے اصولوں کے مطابق"
         primary: "پرائمری گروپ"
@@ -3802,6 +3799,11 @@ ur:
         anonymize_yes: "جی ہاں، اِس اکاؤنٹ کو گمنام بنائیں"
         anonymize_failed: "اِس اکاؤنٹ کو گمنام بنانے میں ایک مسئلہ پیش آیا۔"
         delete: "صارف حذف کریں"
+        merge:
+          prompt:
+            cancel: "منسوخ"
+          confirmation:
+            cancel: "منسوخ"
         delete_forbidden_because_staff: "اَیڈمن اور ماڈریٹرز حذف نہیں کیے جا سکتے۔"
         delete_posts_forbidden_because_staff: "اَیڈمن اور ماڈریٹرز کی تمام پوسٹس حذف نہیں کی جا سکتیں۔"
         delete_forbidden:
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index e121af9332..616c335137 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -2325,7 +2325,6 @@ vi:
             trust_levels_title: "Cấp độ tin tưởng tự động tăng cho thành viên khi họ thêm:"
             trust_levels_none: "Không có gì"
             automatic_membership_email_domains: "Các thành viên đã đăng ký với đuôi email khớp với một trong danh sách này sẽ được tự động thêm vào nhóm:"
-            automatic_membership_retroactive: "Áp dụng quy tắc đuôi email tương tự để thêm thành viên đăng ký hiện tại"
             primary_group: "Tự động cài là nhóm chính"
         name_placeholder: "Tên nhóm, không có khoảng trắng, tương tự như luật đặt tên người dùng"
         primary: "Nhóm Chính"
@@ -2789,6 +2788,11 @@ vi:
         anonymize_yes: "Đồng ý, đây là tài khoản nặc danh."
         anonymize_failed: "Có vấn đề với những tài khoản nặc danh."
         delete: "Xóa thành viên"
+        merge:
+          prompt:
+            cancel: "Hủy"
+          confirmation:
+            cancel: "Hủy"
         delete_forbidden_because_staff: "Admin và mod không thể xóa."
         delete_posts_forbidden_because_staff: "Không thể xóa tất cả bài viết của quản trị và điều hành viên."
         delete_forbidden:
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index a0d9460b95..6a301be078 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -244,6 +244,8 @@ zh_CN:
       created_with_reminder: "你已经收藏该帖并且设定了一个于%{date}的提醒"
       created_with_at_desktop_reminder: "你所收藏的此帖将会在你下次使用桌面设备时被提醒。"
       remove: "取消收藏"
+      delete: "删除收藏"
+      confirm_delete: "你确定要删除该收藏吗？你所设置的提醒也会被一并删除。"
       confirm_clear: "你确定要清空这个主题中的所有收藏？"
       save: "保存"
       no_timezone: '你尚未设置时区。您将无法设置提醒。在 <a href="%{basePath}/my/preferences/profile">你的个人资料中</a>设置。'
@@ -264,6 +266,7 @@ zh_CN:
         today_with_time: "今天%{time}"
         tomorrow_with_time: "明天%{time}"
         at_time: "于%{date_time}"
+        existing_reminder: "你为该收藏所设定的提醒将被发出"
     drafts:
       resume: "复位"
       remove: "移除"
@@ -577,13 +580,13 @@ zh_CN:
         filter: "根据群组类型筛选"
         owner_groups: "拥有的群组"
         close_groups: "关闭的群组"
-        automatic_groups: "自动分组"
+        automatic_groups: "自动群组"
         automatic: "自动"
         closed: "已关闭"
         public: "公开"
         private: "私密"
         public_groups: "公开的群组"
-        automatic_group: 自动分组
+        automatic_group: 自动群组
         close_group: 关闭群组
         my_groups: "我的群组"
         group_type: "群组类别"
@@ -2744,6 +2747,7 @@ zh_CN:
         next_business_day: "%{shortcut} 下个工作日"
         custom: "%{shortcut} 自定义日期和时间"
         none: "%{shortcut} 没有提醒"
+        delete: "%{shortcut} 删除收藏"
       actions:
         title: "动作"
         bookmark_topic: "%{shortcut} 切换主题收藏状态"
@@ -2989,8 +2993,7 @@ zh_CN:
           view_table: "表格"
           view_graph: "图表"
           refresh_report: "刷新报告"
-          start_date: "开始日期（UTC）"
-          end_date: "结束日期（UTC）"
+          dates: "日期（UTC）"
           groups: "所有群组"
           disabled: "此报告已禁用"
           totals_for_sample: "总计样本"
@@ -3007,6 +3010,8 @@ zh_CN:
               label: 群组
             category:
               label: 分类
+            include-subcategories:
+              label: "包括子分类"
       commits:
         latest_changes: "最近的更新：请经常升级！"
         by: "来自"
@@ -3051,7 +3056,7 @@ zh_CN:
             effects: 影响
             trust_levels_none: "无"
             automatic_membership_email_domains: "用户注册时邮箱域名若与列表完全匹配则自动添加至这个群组："
-            automatic_membership_retroactive: "应用同样的邮件域名规则添加已经注册的用户"
+            automatic_membership_user_count: "拥有新邮件域名的 %{count} 位用户将被添加到群组中。"
             primary_group: "自动设置为主要群组"
         name_placeholder: "群组名，没有空格，和用户名一样的规则"
         primary: "主要群组"
@@ -3907,6 +3912,29 @@ zh_CN:
         anonymize_yes: "是的，匿名化该账户"
         anonymize_failed: "在匿名化该账户时遇到问题。"
         delete: "删除用户"
+        merge:
+          transfer_and_delete: "转让并删除"
+          prompt:
+            title: "转让并删除 @%{username}"
+            description: |
+              <p>请为<b>@%{username} </b>的内容选择一个新的主人。</p>
+
+              <p>所有主题、帖子、消息或其它由<b>@%{username}</b>所创作的内容将被转让。</p>
+            target_username_placeholder: "新的所有者的用户名"
+            transfer_and_delete: "转让并删除 @%{username}"
+            cancel: "取消"
+          confirmation:
+            title: "转让并删除 @%{username}"
+            description: |
+              <p><b>@%{username}</b>的所有内容将被转让到<b>%{targetUsername}</b>。在内容被转让后，<b>@%{username}</b>的账户将被删除。</p>
+
+              <p><b>该操作无法被撤销</b></p>
+
+              <p>要继续请输入：<code>%{text}</code></p>
+            transfer_and_delete: "转让并删除 @%{username}"
+            cancel: "取消"
+        merging_user: "合并用户..."
+        merge_failed: "合并用户时出错。"
         delete_forbidden_because_staff: "不能删除管理员和版主。"
         delete_posts_forbidden_because_staff: "不能完全删除管理员和版主的帖子。"
         delete_forbidden:
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 1adf3edcff..bb5ef5ed45 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -2739,7 +2739,6 @@ zh_TW:
             trust_levels_title: "當這些成員加入時，自動提升信任等級："
             trust_levels_none: "無"
             automatic_membership_email_domains: "當註冊使用者的電子郵件所屬網域，完全符合列表裡某項時，將會自動加進這個群組裡："
-            automatic_membership_retroactive: "套用相同的電子郵件網域規則到已經註冊的使用者上："
             primary_group: "自動設為主要群組"
         name_placeholder: "群組名稱：不可含有空白字元，和使用者名稱的規則相同"
         primary: "主要群組"
@@ -3526,6 +3525,11 @@ zh_TW:
         anonymize_yes: "是，將這個帳戶變成匿名"
         anonymize_failed: "將這個帳戶變成匿名時發生錯誤。"
         delete: "刪除使用者"
+        merge:
+          prompt:
+            cancel: "取消"
+          confirmation:
+            cancel: "取消"
         delete_forbidden_because_staff: "管理員與板主不可刪除。"
         delete_posts_forbidden_because_staff: "無法刪除管理員和版主的所有貼文。"
         delete_forbidden:
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index ac2a435186..aa62dd02e1 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -220,9 +220,6 @@ ar:
   topics_in_category: "المواضيع في قسم '%{category}'"
   rss_posts_in_topic: "مغذي RSS لـ'%{topic}'"
   rss_topics_in_category: "تغذية RSS للموضوعات من قسم'%{category}'"
-  author_wrote: "كتب %{author}:"
-  num_posts: "المنشورات:"
-  num_participants: "المشاركون:"
   read_full_topic: "اقرأ كامل الموضوع"
   private_message_abbrev: "رسالة"
   rss_description:
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index ccb1dbf542..26eb6dfdf9 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -200,9 +200,6 @@ be:
   page_num: "Старонка %{num}"
   home_title: "дома"
   topics_in_category: "Тэмы ў '%{category}' катэгорыі"
-  author_wrote: "%{author}пісаў:"
-  num_posts: "Паведамлення:"
-  num_participants: "Удзельнікі:"
   read_full_topic: "Чытаць тэму цалкам"
   private_message_abbrev: "Паведамленне"
   rss_description:
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index f0be12316e..3b4b7a7c13 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -151,9 +151,6 @@ bg:
   topics_in_category: "Теми в '%{category}' група"
   rss_posts_in_topic: "RSS поддържа '%{topic}'"
   rss_topics_in_category: "RSS поддържа темите в '%{category}' категория"
-  author_wrote: "%{author} написа:"
-  num_posts: "Публикации:"
-  num_participants: "Участници:"
   read_full_topic: "Прочети цялата тема"
   private_message_abbrev: "Съобщение"
   rss_description:
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 8c2754ec4a..eb32146f5a 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -141,9 +141,6 @@ bs_BA:
   topics_in_category: "Topics in the '%{category}' category"
   rss_posts_in_topic: "RSS feed of '%{topic}'"
   rss_topics_in_category: "RSS feed of topics in the '%{category}' category"
-  author_wrote: "%{author} wrote:"
-  num_posts: "Posts:"
-  num_participants: "Participants:"
   read_full_topic: "Read full topic"
   private_message_abbrev: "PM"
   rss_description:
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 75bdbe8052..8b13bbd78b 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -289,9 +289,6 @@ ca:
   topics_in_category: "Temes en la categoria '%{category}' "
   rss_posts_in_topic: "Sindicació RSS del tema '%{topic}'"
   rss_topics_in_category: "Sindicació RSS de temes de la categoria '%{category}' "
-  author_wrote: "%{author} ha escrit:"
-  num_posts: "Publicacions:"
-  num_participants: "Participants:"
   read_full_topic: "Llegeix tot el tema"
   private_message_abbrev: "Missatge"
   rss_description:
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index 17674fc998..2859a05a8f 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -200,9 +200,6 @@ cs:
   topics_in_category: "Témata v kategorii '%{category}'"
   rss_posts_in_topic: "RSS feed tématu '%{topic}'"
   rss_topics_in_category: "RSS feed témat z kategorie '%{category}'"
-  author_wrote: "%{author} napsal:"
-  num_posts: "Příspěvky:"
-  num_participants: "Účastníci:"
   read_full_topic: "Číst celé téma"
   private_message_abbrev: "Msg"
   rss_description:
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 0d255dc1f1..08daeb2afa 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -264,9 +264,6 @@ da:
   topics_in_category: "Emner i kategorien '%{category}'"
   rss_posts_in_topic: "RSS-feed for emnet '%{topic}'"
   rss_topics_in_category: "RSS-feed for emner i kategorien '%{category}'"
-  author_wrote: "%{author} skrev:"
-  num_posts: "Indlæg:"
-  num_participants: "Deltagere:"
   read_full_topic: "Læs hele emnet"
   private_message_abbrev: "Besked"
   rss_description:
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index cd216e367c..9efbe74319 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -299,9 +299,6 @@ de:
   topics_in_category: "Themen in der Kategorie '%{category}'"
   rss_posts_in_topic: "RSS-Feed von '%{topic}'"
   rss_topics_in_category: "RSS-Feed von Themen in der Kategorie '%{category}'"
-  author_wrote: "%{author} schrieb:"
-  num_posts: "Beiträge:"
-  num_participants: "Teilnehmer:"
   read_full_topic: "Lese das vollständige Thema"
   private_message_abbrev: "Nachricht"
   rss_description:
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 40782e4934..2f58de65e0 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -187,9 +187,6 @@ el:
   topics_in_category: "Νήματα στην κατηγορία '%{category}'"
   rss_posts_in_topic: "RSS feed του '%{topic}'"
   rss_topics_in_category: "Ροή RSS των νημάτων στην κατηγορία '%{category}'"
-  author_wrote: "%{author} έγραψε:"
-  num_posts: "Αναρτήσεις:"
-  num_participants: "Συμμετέχοντες:"
   read_full_topic: "Διαβάστε όλο το νήμα"
   private_message_abbrev: "Μνμ"
   rss_description:
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 8501b266d8..d93a6cb62f 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -300,9 +300,12 @@ es:
   topics_in_category: "Temas en la categoría «%{category}»"
   rss_posts_in_topic: "Feed RSS de «%{topic}»"
   rss_topics_in_category: "Feed RSS de los temas en la categoría «%{category}»"
-  author_wrote: "%{author} escribió:"
-  num_posts: "Publicaciones:"
-  num_participants: "Participantes:"
+  rss_num_posts:
+    one: "%{count} publicación"
+    other: "%{count} publicaciones"
+  rss_num_participants:
+    one: "%{count} participante"
+    other: "%{count} participantes"
   read_full_topic: "Leer todo el tema"
   private_message_abbrev: "Msj"
   rss_description:
@@ -335,6 +338,7 @@ es:
     reminders:
       at_desktop: "La próxima vez que esté en mi ordenador"
       later_today: "Más tarde durante el día de hoy"
+      next_business_day: "Siguiente día hábil"
       tomorrow: "Mañana"
       next_week: "Próxima semana"
       next_month: "Próximo mes"
@@ -2029,6 +2033,7 @@ es:
   publish_page:
     slug_errors:
       blank: "no puede dejarse en blanco"
+      unavailable: "no está disponible"
       invalid: "contiene caracteres inválidos"
   topic_statuses:
     autoclosed_message_max_posts:
@@ -3147,6 +3152,7 @@ es:
       since_last_visit: "Desde tu última visita"
       new_topics: "Temas nuevos"
       unread_notifications: "Notificaciones no leídas"
+      unread_high_priority: "Notificaciones de alta prioridad sin leer"
       liked_received: "Me gusta recibidos"
       new_users: "Usuarios nuevos"
       popular_topics: "Temas destacados"
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index 279d2554e4..0e13d0d846 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -176,9 +176,6 @@ et:
   topics_in_category: "Teemad '%{category}' liigis"
   rss_posts_in_topic: "'%{topic}' RSS-kanal"
   rss_topics_in_category: "Liigi '%{category}' teemade RSS-kanal"
-  author_wrote: "%{author} kirjutas:"
-  num_posts: "Postitused:"
-  num_participants: "Osalejad:"
   read_full_topic: "Loe kogu teemat"
   private_message_abbrev: "PS"
   rss_description:
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 2702deab2b..44d1f7e920 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -195,9 +195,6 @@ fa_IR:
   topics_in_category: "موضوعات دسته‌بندی '%{category}'"
   rss_posts_in_topic: "خوراک '%{topic}'"
   rss_topics_in_category: "خوارک موضوعات دسته‌‌بندی '%{category}'"
-  author_wrote: "%{author} نوشت:"
-  num_posts: "فرسته‌ها:"
-  num_participants: "شرکت کنندگان :"
   read_full_topic: "مشاهده متن کامل موضوع"
   private_message_abbrev: "پیام"
   rss_description:
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 6b68d7c0a9..73a9acd1dc 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -298,9 +298,6 @@ fi:
   topics_in_category: "Ketjut alueella '%{category}'"
   rss_posts_in_topic: "ketjun '%{topic}' RSS syöte"
   rss_topics_in_category: "RSS syötteet alueen '%{category}' ketjuista"
-  author_wrote: "%{author} kirjoitti:"
-  num_posts: "Viestit:"
-  num_participants: "Osallistujat:"
   read_full_topic: "Lue koko ketju"
   private_message_abbrev: "YV"
   rss_description:
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index a62b88e85e..ee8c5320ae 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -297,9 +297,6 @@ fr:
   topics_in_category: "Sujets dans la catégorie « %{category} »"
   rss_posts_in_topic: "Flux RSS de « %{topic} »"
   rss_topics_in_category: "Flux RSS des sujets dans la catégorie « %{category} »"
-  author_wrote: "%{author} a écrit :"
-  num_posts: "Messages :"
-  num_participants: "Participants :"
   read_full_topic: "Lire le sujet en entier"
   private_message_abbrev: "Msg"
   rss_description:
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index e2d4c728f2..8e4bdc0978 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -90,9 +90,6 @@ gl:
   page_num: "Páxina %{num}"
   home_title: "Inicio"
   rss_posts_in_topic: "Fonte RSS de '%{topic}»"
-  author_wrote: "%{author} escribiu:"
-  num_posts: "Publicacións:"
-  num_participants: "Participantes:"
   read_full_topic: "Ler todo o tema"
   private_message_abbrev: "Msx."
   rss_description:
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 29ba03459d..cfafdd6678 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -331,9 +331,16 @@ he:
   topics_in_category: "נושאים בקטגוריה ‚%{category}’"
   rss_posts_in_topic: "הזנת RSS של ‚%{topic}’"
   rss_topics_in_category: "הזנת RSS של נושאים בקטגוריה ‚%{category}’"
-  author_wrote: "נכתב על ידי %{author}:"
-  num_posts: "פוסטים:"
-  num_participants: "משתתפים:"
+  rss_num_posts:
+    one: "פוסט %{count}"
+    two: "%{count} פוסטים"
+    many: "%{count} פוסטים"
+    other: "%{count} פוסטים"
+  rss_num_participants:
+    one: "משתתף %{count}"
+    two: "%{count} משתתפים"
+    many: "%{count} משתתפים"
+    other: "%{count} משתתפים"
   read_full_topic: "קריאת הנושא במלואו"
   private_message_abbrev: "הודעה"
   rss_description:
@@ -497,6 +504,7 @@ he:
               no_user_selected: "יש לבחור במשתמש תקני."
               reply_by_email_disabled: "האפשרות להגיב בדוא״ל נוטרלה."
               target_user_not_found: "אחד הנמענים לא נמצא."
+              unable_to_update: "אירעה שגיאה בעדכון הנושא הזה."
             featured_link:
               invalid: "שגוי. כתובת אמורה לכלול http://‎ או https://‎."
               invalid_category: "לא ניתן לעריכה בקטגוריה זו."
@@ -1904,6 +1912,7 @@ he:
     warn_reviving_old_topic_age: "כאשר מישהם מתחילים להגיב לנושא שבו התגובה האחרונה היא בת יותר מכמה ימים, אזהרה תוצג. נטרלו באמצעות הזנה של 0."
     autohighlight_all_code: "לחייב שימוש בקוד הדגשה לכל קוד מעוצב מראש (preformatted code blocks) אפילו אם הם אינם מציינים את השפה."
     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: "הגדרת הכתובת הקנונית לנושאים מוטמעים כדי להטמיע את כתובת התוכן."
diff --git a/config/locales/server.hu.yml b/config/locales/server.hu.yml
index 052c905d60..6ae979ebae 100644
--- a/config/locales/server.hu.yml
+++ b/config/locales/server.hu.yml
@@ -47,8 +47,10 @@ hu:
       generic: Hiba történt a téma importálásákor
       about_json: "Importálási hiba: az about.json nem létezik vagy érvénytelen"
       about_json_values: "Az about.json érvénytelen értékeket tartalmaz: %{errors}"
+      modifier_values: "Az about.json módosítók érvénytelen értékeket tartalmaznak: %{errors}"
       git: "Nem sikerült klónozni a git tárolót, a hozzáférés meg lett tagadva vagy a tároló nem található"
       unpack_failed: "A fájl kibontása sikertelen"
+      file_too_big: "A kibontott fájl túl nagy."
       unknown_file_type: "A feltöltött fájl nem tűnik érvényes Discourse témának."
     errors:
       component_no_user_selectable: "A téma összetevőit nem választhatja ki a felhasználó"
@@ -221,9 +223,6 @@ hu:
   topics_in_category: "Témák a(z) „%{category}” kategóriában"
   rss_posts_in_topic: "A(z) „%{topic}” RSS hírcsatornája"
   rss_topics_in_category: "A(z) „%{category}” témáinak RSS hírcsatornája"
-  author_wrote: "%{author} írta:"
-  num_posts: "Bejegyzések:"
-  num_participants: "Résztvevők:"
   read_full_topic: "Teljes téma elolvasása"
   private_message_abbrev: "Üzenet"
   rss_description:
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index db6169dfd9..cd23816eac 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -264,9 +264,6 @@ hy:
   topics_in_category: "'%{category}' կատեգորիայի թեմաները"
   rss_posts_in_topic: "RSS լրահոս հետևյալի համար՝ '%{topic}'"
   rss_topics_in_category: "RSS լրահոս '%{category}' կատեգորիայի թեմաների համար"
-  author_wrote: "%{author} -ը գրել է."
-  num_posts: "Գրառումներ՝"
-  num_participants: "Մասնակիցներ՝ "
   read_full_topic: "Կարդալ ամբողջական թեման"
   private_message_abbrev: "Նմկ"
   rss_description:
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index baf224e920..e7332d11bb 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -156,9 +156,6 @@ id:
   topics_in_category: "Topik dalam kategori '%{category}'"
   rss_posts_in_topic: "RSS feed dari '%{topic}'"
   rss_topics_in_category: "RSS feed dari topik-topik pada kategori '%{category}'"
-  author_wrote: "%{author} menuliskan:"
-  num_posts: "Pos:"
-  num_participants: "Peserta:"
   read_full_topic: "Baca topik sepenuhnya"
   private_message_abbrev: "Psn"
   rss_description:
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 0169606eb3..0d4bc55444 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -290,9 +290,6 @@ it:
   topics_in_category: "Argomenti nella categoria '%{category}'"
   rss_posts_in_topic: "RSS feed di '%{topic}'"
   rss_topics_in_category: "RSS feed degli argomenti nella categoria '%{category}'"
-  author_wrote: "%{author} ha scritto:"
-  num_posts: "Messaggi:"
-  num_participants: "Partecipanti:"
   read_full_topic: "Leggi l'argomento intero"
   private_message_abbrev: "MP"
   rss_description:
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 112ab3ed77..7ee132b35e 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -193,9 +193,6 @@ ja:
   topics_in_category: "'%{category}' カテゴリ内のトピック"
   rss_posts_in_topic: "'%{topic}' の RSS フィード"
   rss_topics_in_category: "'%{category}' カテゴリ内のトピックの RSS フィード"
-  author_wrote: "%{author} の投稿:"
-  num_posts: "投稿:"
-  num_participants: "参加者:"
   read_full_topic: "完全なトピックを読む"
   private_message_abbrev: "メッセージ"
   rss_description:
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 6ecc3a7415..47d29ad2e8 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -195,9 +195,6 @@ ko:
   topics_in_category: "'%{category}' 카테고리의 토픽"
   rss_posts_in_topic: "'%{topic}' 의 RSS 피드"
   rss_topics_in_category: "'%{category}' 카테고리의 RSS 피드 "
-  author_wrote: "%{author} 게시:"
-  num_posts: "포스트 수:"
-  num_participants: "참여자:"
   read_full_topic: "전체 토픽 읽기"
   private_message_abbrev: "메시지"
   rss_description:
diff --git a/config/locales/server.lt.yml b/config/locales/server.lt.yml
index 71ef7bd658..41058179e4 100644
--- a/config/locales/server.lt.yml
+++ b/config/locales/server.lt.yml
@@ -126,9 +126,6 @@ lt:
   home_title: "Pradinis"
   topics_in_category: "Temos kategorijoje '%{category}'"
   rss_posts_in_topic: "RSS iš '%{topic}'"
-  author_wrote: "%{author} parašė:"
-  num_posts: "Pranešimai:"
-  num_participants: "Dalyviai:"
   read_full_topic: "Skaityti pilną temą"
   private_message_abbrev: "Žinutė"
   rss_description:
diff --git a/config/locales/server.lv.yml b/config/locales/server.lv.yml
index 9b9557c575..4f5e41263d 100644
--- a/config/locales/server.lv.yml
+++ b/config/locales/server.lv.yml
@@ -52,8 +52,6 @@ lv:
   next_page: "nākošo lapu →"
   prev_page: "← iepriekšējo lapu"
   page_num: "Lapa %{num}"
-  num_posts: "Raksti:"
-  num_participants: "Dalībnieki:"
   read_full_topic: "Lasīt pilnu tēmu"
   rss_description:
     latest: "Jaunākās tēmas"
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index 0836613828..09ac225fad 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -231,9 +231,6 @@ nb_NO:
   topics_in_category: "Emner i '%{category}'-kategorien"
   rss_posts_in_topic: "RSS-strøm av '%{topic}'"
   rss_topics_in_category: "RSS-strøm av emner i '%{category}'-kategorien"
-  author_wrote: "%{author} skrev:"
-  num_posts: "Innlegg:"
-  num_participants: "Deltakere:"
   read_full_topic: "Les hele emnet"
   private_message_abbrev: "Mld"
   rss_description:
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 5c1e679e52..a81fd978a6 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -301,9 +301,12 @@ nl:
   topics_in_category: "Topics in de categorie '%{category}'"
   rss_posts_in_topic: "RSS-feed van '%{topic}'"
   rss_topics_in_category: "RSS-feed van topics in de categorie '%{category}'"
-  author_wrote: "%{author} schreef:"
-  num_posts: "Berichten:"
-  num_participants: "Deelnemers:"
+  rss_num_posts:
+    one: "%{count} bericht"
+    other: "%{count} berichten"
+  rss_num_participants:
+    one: "%{count} deelnemer"
+    other: "%{count} deelnemers"
   read_full_topic: "Volledige topic lezen"
   private_message_abbrev: "PB"
   rss_description:
@@ -461,6 +464,7 @@ nl:
               no_user_selected: "U moet een geldige gebruiker selecteren."
               reply_by_email_disabled: "Antwoorden per e-mail is uitgeschakeld."
               target_user_not_found: "Een van de gebruikers waarnaar u dit bericht stuurt kon niet worden gevonden."
+              unable_to_update: "Er is een fout opgetreden bij het bijwerken van dat topic."
             featured_link:
               invalid: "is ongeldig. URL moet http:// of https:// bevatten."
               invalid_category: "kan niet worden bewerkt in deze categorie."
@@ -1834,11 +1838,12 @@ nl:
     warn_reviving_old_topic_age: "Wanneer iemand begint te antwoorden op een topic waarin het laatste antwoord ouder is dan dit aantal dagen, wordt een waarschuwing weergegeven. Schakel uit door dit op 0 te zetten."
     autohighlight_all_code: "Toepassen van codemarkering bij alle vooraf opgemaakte codeblokken afdwingen, zelfs als de codetaal niet expliciet is opgeven."
     highlighted_languages: "Opgenomen regels voor syntaxismarkering. (Waarschuwing: het opnemen van te veel talen kan prestaties beïnvloeden); bekijk <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> voor een demo."
+    show_copy_button_on_codeblocks: "Een knop voor codeblokken toevoegen om de inhoud van de blokken naar het klembord van de gebruiker te kopiëren. Deze functie wordt niet ondersteund in Internet Explorer."
     embed_any_origin: "Inbedbare inhoud toestaan, ongeacht oorsprong. Dit is vereist voor mobiele apps met statische HTML."
     embed_topics_list: "HTML-inbedding van topiclijsten ondersteunen"
     embed_set_canonical_url: "De canonieke URL voor ingebedde topics naar de URL van de ingebedde inhoud instellen."
     embed_truncate: "De ingebedde berichten inkorten."
-    embed_unlisted: "Geïmporteerde topics worden onzichtbaar totdat een gebruiker antwoordt."
+    embed_unlisted: "Geïmporteerde topics zijn onzichtbaar totdat een gebruiker antwoordt."
     embed_support_markdown: "Markdown-opmaak voor ingebedde berichten ondersteunen."
     embed_whitelist_selector: "Een door komma's gescheiden lijst van CSS-elementen die bij inbedding zijn toegestaan."
     allowed_href_schemes: "Toegestane schema's in koppelingen, naast http en https."
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index d37f012004..02bb335598 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -324,9 +324,6 @@ pl_PL:
   topics_in_category: "Tematy w kategorii '%{category}'"
   rss_posts_in_topic: "Kanał RSS tematu '%{topic}'"
   rss_topics_in_category: "Kanał RSS tematów z kategorii '%{category}'"
-  author_wrote: "%{author} pisze:"
-  num_posts: "Wpisy:"
-  num_participants: "Uczestnicy:"
   read_full_topic: "Przeczytaj cały temat"
   private_message_abbrev: "Wiad."
   rss_description:
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 2210355b7c..04cb3a5ecf 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -239,9 +239,6 @@ pt:
   topics_in_category: "Tópicos na categoria '%{category}'"
   rss_posts_in_topic: "Feed RSS de '%{topic}'"
   rss_topics_in_category: "Feed RSS dos tópicos da categoria '%{category}'"
-  author_wrote: "%{author} escreveu:"
-  num_posts: "Mensagens:"
-  num_participants: "Participantes:"
   read_full_topic: "Ler tópico completo"
   private_message_abbrev: "Msg"
   rss_description:
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 59b0e87e42..cc69621065 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -286,9 +286,6 @@ pt_BR:
   topics_in_category: "Tópicos na categoria '%{category}'"
   rss_posts_in_topic: "RSS feed de '%{topic}'"
   rss_topics_in_category: "RSS feed dos tópicos da categoria '%{category}'"
-  author_wrote: "%{author} escreveu:"
-  num_posts: "Mensagens:"
-  num_participants: "Participantes:"
   read_full_topic: "Ler tópico completo"
   private_message_abbrev: "Msg"
   rss_description:
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 19d561b983..7b25ba8d3d 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -185,9 +185,6 @@ ro:
   topics_in_category: "Subiecte în categoria '%{category}'"
   rss_posts_in_topic: "RSS din '%{topic}'"
   rss_topics_in_category: "RSS de subiecte din categoria '%{category}'"
-  author_wrote: "%{author} a scris:"
-  num_posts: "Mesaje:"
-  num_participants: "Participanți:"
   read_full_topic: "Citește întregul subiect"
   private_message_abbrev: "Msg"
   rss_description:
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 4df0fc297e..2bb1d0e217 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -321,9 +321,16 @@ ru:
   topics_in_category: "Темы в разделе «%{category}»"
   rss_posts_in_topic: "RSS лента темы '%{topic}"
   rss_topics_in_category: "RSS лента тем в разделе '%{category}'"
-  author_wrote: "%{author} написал(а):"
-  num_posts: "Сообщений:"
-  num_participants: "Участников:"
+  rss_num_posts:
+    one: "%{count}сообщение"
+    few: "%{count} сообщения"
+    many: "%{count} сообщений"
+    other: "%{count} сообщений"
+  rss_num_participants:
+    one: "%{count}участник"
+    few: "%{count}участника"
+    many: "%{count}участников"
+    other: "%{count}участников"
   read_full_topic: "Читать всю тему"
   private_message_abbrev: "Сообщ."
   rss_description:
@@ -499,6 +506,10 @@ ru:
               same_as_password: "совпадает с вашим паролем."
             ip_address:
               signup_not_allowed: "Регистрация с данной учетной записью запрещена."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Эта тема не может быть включена в ваш профиль."
         user_email:
           attributes:
             user_id:
@@ -557,6 +568,7 @@ ru:
       description_incomplete: "Описание раздела должно иметь по крайней мере один абзац."
       permission_conflict: "Любая группа, которой разрешен доступ к подразделу, также должна иметь доступ к родительскому разделу. Следующие группы имеют доступ к одному из подразделов, но не имеют доступа к родительскому разделу: %{group_names}."
       disallowed_topic_tags: "В этой теме есть теги, не разрешенные этим разделом: '%{tags}'"
+      disallowed_tags_generic: "В этой теме запрещены теги."
     cannot_delete:
       uncategorized: "Эта  особенный раздел. Он предназначен для хранения тем, которые не имеют раздела; он не может быть удалена."
       has_subcategories: "Невозможно удалить этот раздел, поскольку в нем есть подразделы."
@@ -877,6 +889,7 @@ ru:
       self: "У вас нет черновиков; начните составлять ответ в любой теме, и он будет автоматически сохранен как новый черновик."
   webauthn:
     validation:
+      malformed_attestation_error: "При декодировании данных аттестации произошла ошибка."
       user_verification_error: "Требуется проверка пользователя."
   topic_flag_types:
     spam:
@@ -1636,6 +1649,7 @@ ru:
     default_code_lang: "Подсветка синтаксиса по умолчанию для блоков кода (lang-auto, ruby, python etc.)"
     warn_reviving_old_topic_age: "Показывать предупреждение, когда кто-то пытается ответить в очень старую тему. Указывается в днях. Чтобы отключить 0."
     autohighlight_all_code: "Принудительно использовать подсветку кода для всех отформатированных блоков кода, даже когда они явно не указан язык."
+    show_copy_button_on_codeblocks: "Отображать кнопку в блоках кода для возможности копирования содержимого блока в буфер обмена. Функция не поддерживается браузером Internet Explorer."
     embed_truncate: "Обрезать встроенные сообщения."
     embed_unlisted: "Импортированные темы будут отображаться в списке тем только после добавления в них ответа."
     embed_post_limit: "Максимальное количество вложенных сообщений."
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index c12a47f819..bef9b647f1 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -195,9 +195,6 @@ sk:
   topics_in_category: " '%{category}' tém v tejto kategórii"
   rss_posts_in_topic: "RSS kanál témy '%{topic}'"
   rss_topics_in_category: "RSS kanál tém v kategórii '%{category}'"
-  author_wrote: "%{author} napísal:"
-  num_posts: "Príspevky:"
-  num_participants: "Prispievatelia:"
   read_full_topic: "Čítať celý príspevok"
   private_message_abbrev: "Správa"
   rss_description:
diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml
index 9571ab8433..e63e6ecb39 100644
--- a/config/locales/server.sl.yml
+++ b/config/locales/server.sl.yml
@@ -167,8 +167,6 @@ sl:
   prev_page: "← prejšnja stran"
   page_num: "Stran %{num}"
   home_title: "Domov"
-  author_wrote: "%{author} je napisal/a:"
-  num_participants: "Udeleženci:"
   read_full_topic: "Preberi celo temo"
   private_message_abbrev: "Msg"
   rss_description:
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 8006ead250..2a7bcf09cd 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -127,9 +127,6 @@ sq:
   topics_in_category: "Topics in the '%{category}' category"
   rss_posts_in_topic: "Burimi RSS i '%{topic}'"
   rss_topics_in_category: "RSS feed of topics in the '%{category}' category"
-  author_wrote: "%{author} shkruajti:"
-  num_posts: "Postime:"
-  num_participants: "Pjesëmarrësit:"
   read_full_topic: "Lexo temën e plotë"
   private_message_abbrev: "Msg"
   rss_description:
diff --git a/config/locales/server.sr.yml b/config/locales/server.sr.yml
index 269f63dcff..8b700c2ed4 100644
--- a/config/locales/server.sr.yml
+++ b/config/locales/server.sr.yml
@@ -80,8 +80,6 @@ sr:
   page_num: "Strana %{num}"
   home_title: "Home"
   topics_in_category: "Teme u '%{category}' kategoriji"
-  num_posts: "Postovi:"
-  num_participants: "Učesnici: "
   read_full_topic: "Pročitajte celu temu"
   rss_description:
     latest: "Poslednje teme"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 5d79e6bfb2..e610dbec9b 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -301,9 +301,12 @@ sv:
   topics_in_category: "Ämnen i kategorin '%{category}'"
   rss_posts_in_topic: "RSS-flöde för '%{topic}'"
   rss_topics_in_category: "RSS-flöde för ämnen i kategorin '%{category}'"
-  author_wrote: "%{author} skrev:"
-  num_posts: "Inlägg:"
-  num_participants: "Deltagare"
+  rss_num_posts:
+    one: "%{count} inlägg"
+    other: "%{count} inlägg"
+  rss_num_participants:
+    one: "%{count}  deltagare"
+    other: "%{count} deltagare"
   read_full_topic: "Läs hela ämnet"
   private_message_abbrev: "Meddelande"
   rss_description:
@@ -461,6 +464,7 @@ sv:
               no_user_selected: "Du måste välja en giltig användare."
               reply_by_email_disabled: "Svar via e-post har inaktiverats."
               target_user_not_found: "En av användarna som du skickar detta meddelande till kunde inte hittas."
+              unable_to_update: "Det uppstod ett fel vid uppdatering av detta ämnet."
             featured_link:
               invalid: "är ogiltig. URL måste innehålla http:// eller http://."
               invalid_category: "kan inte redigeras i denna kategori"
@@ -1814,6 +1818,7 @@ sv:
     warn_reviving_old_topic_age: "En varning visas när någon börjar skriva ett svar på ett ämne och senaste inlägget är äldre än så här många dagar. Ange 0 för att inaktivera."
     autohighlight_all_code: "Tvinga applicerad syntaxmarkering på alla förformatterade kodblock även när de inte explicit har specifierat språket."
     highlighted_languages: "Inkluderade syntax-markeringsregler (Varning: att inkludera för många språk kan påverka prestanda). Demonstration: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a>"
+    show_copy_button_on_codeblocks: "Lägg till en knapp i Codeblocks som kopierar blockinnehållet till användarens urklipp. Denna funktion stöds inte av Internet Explorer."
     embed_any_origin: "Tillåt inbäddbart innehåll oavsett ursprung. Detta krävs för mobilappar med statisk HTML."
     embed_topics_list: "Stöd HTML-inbäddning av ämneslistor"
     embed_set_canonical_url: "Sätt den kanoniska URL:n för inbäddade ämnen till det inbäddade innehållets URL."
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
index c8a5f380f1..b5ad745f36 100644
--- a/config/locales/server.sw.yml
+++ b/config/locales/server.sw.yml
@@ -168,9 +168,6 @@ sw:
   topics_in_category: "Mada ndani ya kategoria '%{category}'"
   rss_posts_in_topic: "Mlisho wavuti wa '%{topic}'"
   rss_topics_in_category: "Mlisho wavuti wa mada za kategoria '%{category}'"
-  author_wrote: "%{author} ameandika:"
-  num_posts: "Machapisho:"
-  num_participants: "Mshiriki:"
   read_full_topic: "Soma mada yote"
   private_message_abbrev: "Msg"
   rss_description:
diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml
index e0bac8062c..8cb5e702ab 100644
--- a/config/locales/server.te.yml
+++ b/config/locales/server.te.yml
@@ -106,9 +106,6 @@ te:
   page_num: "పుట %[num]"
   topics_in_category: "'%{category}' వర్గంలోని విషయాలు"
   rss_posts_in_topic: "'%{topic}' యొక్క ఆర్ యస్ యస్ వడ్డన"
-  author_wrote: "%{author} రాసారు:"
-  num_posts: "టపాలు:"
-  num_participants: "భాగస్వాములు:"
   read_full_topic: "పూర్తి విషయం చదువు"
   rss_description:
     latest: "తాజా విషయాలు"
diff --git a/config/locales/server.th.yml b/config/locales/server.th.yml
index f36b909f0c..e3da5d6e19 100644
--- a/config/locales/server.th.yml
+++ b/config/locales/server.th.yml
@@ -60,7 +60,6 @@ th:
   next_page: "หน้าถัดไป →"
   prev_page: "← หน้าก่อนหน้า"
   page_num: "หน้า %{num}"
-  num_posts: "โพส"
   groups:
     default_names:
       everyone: "ทุกคน"
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 2b76fc0bd2..063fbd4e00 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -298,9 +298,6 @@ tr_TR:
   topics_in_category: "'%{category}' kategorisindeki konular"
   rss_posts_in_topic: " '%{topic}' konusuna ait RSS akışı"
   rss_topics_in_category: "'%{category}' kategorisindeki konulara ait RSS akışı"
-  author_wrote: "%{author} yazdı:"
-  num_posts: "Gönderiler:"
-  num_participants: "Katılımcılar:"
   read_full_topic: "Konunun tamamını okuyun"
   private_message_abbrev: "İlt"
   rss_description:
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index ba650b959b..f71315c01e 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -328,9 +328,6 @@ uk:
   topics_in_category: "Теми в категорії '%{category}'"
   rss_posts_in_topic: "RSS-стрічка теми '%{topic}'"
   rss_topics_in_category: "RSS-стрічка тем у категорії '%{category}'"
-  author_wrote: "%{author} написав(ла):"
-  num_posts: "Дописи:"
-  num_participants: "Учасники:"
   read_full_topic: "Читати тему цілком"
   private_message_abbrev: "Пов."
   rss_description:
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index 56288408d5..ae91640f4f 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -281,9 +281,6 @@ ur:
   topics_in_category: "'%{category}' زُمرہ میں ٹاپک"
   rss_posts_in_topic: "'%{topic}' کی RSS فِیڈ"
   rss_topics_in_category: "'%{category}' زُمرہ میں ٹاپکس کی RSS فِیڈ"
-  author_wrote: "%{author} نے لکھا: "
-  num_posts: "پوسٹس:"
-  num_participants: "شرکاء:"
   read_full_topic: "مکمل ٹاپک پڑھیں"
   private_message_abbrev: "پغم"
   rss_description:
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 713ea34ee4..ddfc227886 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -149,9 +149,6 @@ vi:
   topics_in_category: "Các chủ đề ở chuyên '%{category}'"
   rss_posts_in_topic: "Nguồn cấp dữ liệu RSS của '%{topic}'"
   rss_topics_in_category: "Nguồn cấp dữ liệu RSS của các chủ đề trong chuyên mục '%{category}'"
-  author_wrote: "%{author} đã viết:"
-  num_posts: "Bài đã đăng:"
-  num_participants: "Người tham gia:"
   read_full_topic: "Đọc toàn bộ chủ đề"
   private_message_abbrev: "Tin nhắn"
   rss_description:
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 38bd9e1d7b..b29dbf9368 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -286,9 +286,10 @@ zh_CN:
   topics_in_category: "“%{category}”分类中的主题"
   rss_posts_in_topic: " '%{topic}'的RSS源"
   rss_topics_in_category: "'%{category}'分类中主题的RSS源"
-  author_wrote: "%{author}写道："
-  num_posts: "帖子："
-  num_participants: "参与者："
+  rss_num_posts:
+    other: "%{count} 个帖"
+  rss_num_participants:
+    other: "%{count} 位参与者"
   read_full_topic: "阅读整个主题"
   private_message_abbrev: "私信"
   rss_description:
@@ -443,6 +444,7 @@ zh_CN:
               no_user_selected: "你必须选择一个有效的用户。"
               reply_by_email_disabled: "用邮件回复已被禁止"
               target_user_not_found: "未找到你要向其发送此消息的其中一个用户"
+              unable_to_update: "更新该主题时发生错误。"
             featured_link:
               invalid: "不合法。URL 应包括 http:// 或 https://。"
               invalid_category: "无法编辑该分类。"
@@ -1439,20 +1441,20 @@ zh_CN:
     block_common_passwords: "不允许使用 10,000 个最常用的密码。"
     enable_sso: "启用通过外部站点单点登录（警告：用户的邮件地址必须被外部站点验证！）"
     verbose_sso_logging: "将详细的SSO相关诊断记录到<a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    enable_sso_provider: "在/session/sso_provider端点实现Discourse SSO提供程序协议，需要设置sso_provider_secrets"
-    sso_url: "单点登录 URL 入口点（必须包含 http:// 或 https://）"
-    sso_secret: "秘密字符串，用于验证秘密的 SSO 信息，请保证是 10 个字符或者更长"
-    sso_provider_secrets: "使用Discourse作为SSO提供程序的域密码对列表。确保SSO密码为10个字符或更长。通配符*可用于匹配任何域或仅匹配其中的一部分（例如* .example.com）。"
-    sso_overrides_bio: "在用户页面中覆盖用户的个人信息并禁止用户修改"
-    sso_overrides_groups: "将所有手动组成员资格与组sso属性中指定的组同步（警告：如果未指定组，则将为用户清除所有手动组成员资格）"
-    sso_overrides_email: "每一次登录时，用 SSO 信息中的外部站点的邮件地址覆盖本地邮件地址，并且阻止本地的邮件地址修改。（警告：因格本地邮件的正规化，邮件地址可能会有所差异）"
-    sso_overrides_username: "每一次登录时，用 SSO 信息中的外部站点的用户名覆盖本地用户名，并且阻止本地的用户名修改。（警告：因格本地用户名的长度和其他要求，用户名可能会有所差异）"
-    sso_overrides_name: "每一次登录时，用 SSO 信息中的外部站点的全名覆盖本地全名，并且阻止本地的全名修改。"
-    sso_overrides_avatar: "从SSO有效负载覆盖具有外部站点头像的用户头像。如果启用，则不允许用户在Discourse上传头像。"
-    sso_overrides_profile_background: "从SSO有效负载覆盖用户配置文件背景和外部站点头像。"
-    sso_overrides_card_background: "从SSO有效负载覆盖用户卡背景与外部站点头像。"
-    sso_not_approved_url: "重定向未受许可的单点登录账户至这个 URL"
-    sso_allows_all_return_paths: "不限制 SSO 提供的 return_paths 中的域名（默认情况下返回地址必须位于当前站点）"
+    enable_sso_provider: "在端点/session/sso_provider实现Discourse SSO provider协议，需要设置sso_provider_secrets"
+    sso_url: "单点登录 URL 入口（必须包含 http:// 或 https://）"
+    sso_secret: "用于加密验证SSO信息的密钥字符串，请确保是 10 个字符或者更长"
+    sso_provider_secrets: "使用Discourse作为SSO provider的域名与密钥对列表。确保SSO密钥为10个字符或更长。通配符 * 可用于匹配任何域名或仅匹配其中的一部分（例如* .example.com）。"
+    sso_overrides_bio: "覆盖用户个人信息中的用户简介并禁止用户修改"
+    sso_overrides_groups: "将所有手动创建的群组与SSO属性中指定的群组同步（警告：如果你没有指定群组，那么将为用户清除手动创建的群组的成员资格）"
+    sso_overrides_email: "每登录都使用 SSO 信息中的外部站点的邮件地址覆盖本地邮件地址，并且阻止本地的邮件地址修改。（警告：因格本地邮件的正规化，邮件地址可能会有所差异）"
+    sso_overrides_username: "每次登录都使用 SSO 信息中的外部站点的用户名覆盖本地用户名，并且阻止本地的用户名修改。（警告：因本地用户名的长度或其他要求，用户名可能会有所差异）"
+    sso_overrides_name: "每次登录都使用 SSO 信息中的外部站点的全名覆盖本地全名，并且阻止本地的全名修改。"
+    sso_overrides_avatar: "使用SSO信息覆盖使用外部头像的用户头像。如果启用，则不允许用户在Discourse上传头像。"
+    sso_overrides_profile_background: "使用SSO信息中的外部站点头像覆盖用户资料背景"
+    sso_overrides_card_background: "使用SSO信息中的外部站点头像覆盖用户卡片背景。"
+    sso_not_approved_url: "将未经授权的SSO账户重定向至这个 URL"
+    sso_allows_all_return_paths: "不限制 SSO 所提供的 return_paths 中的域名（默认情况下返回的地址必须位于当前站点）"
     enable_local_logins: "启用基于本地用户名和密码登录的账户。必须启用此选项才能使邀请生效。警告：如果禁用，且之前未配置至少一种备用登录方法，则可能无法登录。"
     enable_local_logins_via_email: "允许用户请求通过电子邮件将一键登录链接发送给他们。"
     allow_new_registrations: "允许新用户注册。取消选择将阻止任何人创建一个新账户。"
@@ -1788,6 +1790,7 @@ zh_CN:
     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。"
@@ -1882,7 +1885,7 @@ zh_CN:
     company_name: "公司名"
     governing_law: "适用法律"
     city_for_disputes: "争议之城"
-    shared_drafts_category: "为主题草稿指定分类以启用共享草稿功能。此类别中的主题将从管理人员的主题列表中删除。"
+    shared_drafts_category: "为主题草稿指定分类以启用共享草稿功能。此分类中的主题将从管理人员的主题列表中删除。"
     push_notifications_prompt: "显示用户同意提示。"
     push_notifications_icon: "通知角中显示的徽章图标。尺寸必须为96px × 96px。"
     short_title: "短标题将用于用户主页、启动器或其他可能空间有限的地方。应该控制在12个字符内。"
@@ -3305,7 +3308,7 @@ zh_CN:
     default_theme_name: "亮"
     light_theme_name: "亮"
     dark_theme_name: "暗"
-    neutral_theme_name: "中型"
+    neutral_theme_name: "平淡"
     grey_amber_theme_name: "灰琥珀色"
     shades_of_blue_theme_name: "蓝黑"
     latte_theme_name: "棕色"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 89b6ffa521..799c5774dc 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -254,9 +254,6 @@ zh_TW:
   topics_in_category: "分類 '%{category}' 中的討論話題"
   rss_posts_in_topic: "'%{topic}' 的 RSS feed"
   rss_topics_in_category: "分類 '%{category}' 中討論話題的 RSS feed"
-  author_wrote: "%{author}說:"
-  num_posts: "貼文："
-  num_participants: "參與者："
   read_full_topic: "閱讀整個話題"
   private_message_abbrev: "消息"
   rss_description:
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 4436de82ba..448a8140cb 100644
--- a/plugins/discourse-local-dates/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-local-dates/config/locales/server.zh_CN.yml
@@ -7,7 +7,7 @@
 
 zh_CN:
   site_settings:
-    discourse_local_dates_enabled: "启用话语本地日期功能。这将使用[date]元素添加对帖子中本地日期的时区感知支持。"
+    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/server.hu.yml b/plugins/discourse-narrative-bot/config/locales/server.hu.yml
index eac0a00872..0d3ff6a9ba 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.hu.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.hu.yml
@@ -9,33 +9,68 @@ hu:
   site_settings:
     discourse_narrative_bot_enabled: "A Discourse alámondó bot (discobot) bekapcsolása"
     disable_discourse_narrative_bot_welcome_post: "A Discourse alámondó bot üdvözlő üzenetének kikapcsolása"
-    discourse_narrative_bot_ignored_usernames: "Felhasználónevek, amelyeket a Discourse alámondó bot figyelmen kívül hagyjon"
+    discourse_narrative_bot_ignored_usernames: "Felhasználónevek, amelyeket a Discourse alámondó bot hagyjon figyelmen kívül"
     discourse_narrative_bot_disable_public_replies: "A Discourse alámondó bot nyilvános válaszainak kikapcsolása"
-    discourse_narrative_bot_welcome_post_type: "A Discourse mesélő bot üdvözlő üzeneteinek kiküldendő típusai"
-    discourse_narrative_bot_welcome_post_delay: "Várj (n) másodpercet a Discourse mesélő bot üdvözlő üzenetének kiküldése előtt."
+    discourse_narrative_bot_welcome_post_type: "A Discourse alámondó bot üdvözlő üzeneteinek kiküldendő típusai"
+    discourse_narrative_bot_welcome_post_delay: "Várjon (n) másodpercet a Discourse alámondó bot üdvözlő üzenetének kiküldése előtt."
   badges:
     certified:
       name: Hitelesített
       description: "Teljesítette az új felhasználók eligazítását"
       long_description: |
-        Ezt a jelvényt az új felhasználók interaktív eligazításának sikeres teljesítéséért adjuk. Kezdeményező voltál és megtanultad a beszélgetés alapvető eszközeit, és ezzel hitelesített lettél!
+        Ez a jelvényt az interaktív új felhasználói eligazítás sikeres teljesítéséért jár. Kezdeményező volt és megtanulta a beszélgetés alapvető eszközeit, és ezzel hitelesített lett!
     licensed:
-      name: Licenszelt
+      name: Licencelt
+      description: "Teljesítette az haladó felhasználói eligazítást"
+      long_description: |
+        Ez a jelvényt az interaktív haladó felhasználói eligazítás sikeres teljesítéséért jár. Elsajátította a beszélgetés speciális eszközeit, és ezzel teljesen licencelt lett!
   discourse_narrative_bot:
+    bio: "Üdv, nem igazi személy vagyok. Egy bot vagyok, és megtanítom az oldal használatát. A velem történő interakcióhoz küldjön nekem egy üzenetet, vagy említsen meg így bárhol: **`@%{discobot_username}`**."
+    tl2_promotion_message:
+      subject_template: "Gratulálunk az első bizalmi szint előléptetéséért!"
+      text_body_template: |
+        Most hogy előléptették, ideje megtanulnia néhány speciális funkciót!
+
+        Válaszoljon erre az üzenetre ezzel: `@%{discobot_username} %{reset_trigger}`, hogy többet tudjon meg arról, hogy mit tehet.
+
+        Arra kérjük, hogy továbbra is vegyen részt – örülünk, hogy itt van.
+    timeout:
+      message: |-
+        Üdv @%{username}, csak beköszönök, mert nem hallottam Önről egy ideje.
+
+        - A folytatáshoz válaszoljon bármikor.
+
+        - Ha kihagyná ezt a lépést, mondja ezt: `%{skip_trigger}`.
+
+        - Az újrakezdéshez mondja ezt: `%{reset_trigger}`.
+
+        Ha inkább nem tenné, az is rendben van. Én egy robot vagyok. Nem fogja megbántani az érzéseimet. :sob:
+    dice:
+      trigger: "kockadobás"
+      invalid: |-
+        Sajnálom, matematikailag lehetetlen ezt a kockakombinációt dobni. :confounded:
+      not_enough_dice: |-
+        Csak %{num_of_dice} kockám van. [Szégyenletes](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), tudom!
+      out_of_range: |-
+        Tudta, hogy a [legtöbb oldallal rendelkező](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) matematikailag fair kocka 120 oldalas?
+      results: |-
+        > :game_die: %{results}
     quote:
       trigger: "idézet"
       '1':
-        quote: "Minden nehézség közepében lehetőség rejtőzik"
+        quote: "A nehézségek közt mindig ott van a lehetőség"
         author: "Albert Einstein"
       '2':
         author: "Mahatma Gandhi"
       '3':
-        quote: "Ne azért sírj, mert vége van, mosolyogj azért, mert megtörtént."
+        quote: "Ne sírj, hogy vége, mosolyogj, hogy megtörtént."
+        author: "Dr. Seuss"
       '4':
         author: "Charles-Guillaume Étienne"
       '5':
         author: "Theodore Roosevelt"
       '6':
+        quote: " Az élet olyan, mint egy doboz bonbon. Soha nem tudhatod, hogy mi jut neked belőle."
         author: "Forrest Gump édesanyja"
       '7':
         quote: "Kis lépés egy embernek, de hatalmas ugrás az emberiségnek."
@@ -46,16 +81,75 @@ hu:
         author: "Bruce Lee"
       '10':
         author: "Napoleon Hill"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
+      trigger: "jövendőmondás"
       answers:
+        '1': "Biztos"
+        '2': "Határozottan így van"
         '3': "Kétségtelenül"
-        '7': "Leginkább"
+        '4': "Igen, határozottan"
+        '5': "Számíthatsz rá"
+        '6': "Ahogy látom, igen"
+        '7': "Egészen valószínű"
+        '8': "Jók a kilátások"
         '9': "Igen"
-        '12': "Kérdezd meg később"
-        '17': "A válaszom nem."
+        '10': "A jelek szerint igen"
+        '11': "A válasz ködös, próbálja újra"
+        '12': "Kérdezze meg később"
+        '13': "Jobb, ha most nem mondom el"
+        '14': "Most nem tudom megjósolni"
+        '15': "Koncentráljon és kérdezzen újra"
+        '16': "Ne számítson rá"
+        '17': "A válaszom nem"
+        '18': "A forrásaim szerint nem"
+        '19': "Nem túl jók a kilátások"
+        '20': "Nagyon kétséges"
+      result: |-
+        > :crystal_ball: %{result}
     track_selector:
-      reset_trigger: "start"
+      reset_trigger: "kezdés"
       skip_trigger: "átugrás"
+      help_trigger: "súgó megjelenítése"
+      random_mention:
+        reply: |-
+          Üdv! Hogy megtudja mit tudok, mondja ezt: `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          Jelenleg ezeket tudom csinálni:
+
+          `@%{discobot_username} %{reset_trigger} {oktatás-neve}`
+          > Elindítja az interaktív eligazítást. Az `{oktatás-neve}` ezek egyike lehet: `%{tracks}`.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          %{quote_sample}
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: Számíthat rá
+      do_not_understand:
+        first_response: |-
+          Hé, köszönöm a választ!
+
+          Sajnos mivel egy rosszul programozott bot vagyok, ezt nem egészen értettem. :frowning:
+        track_response: 'Megpróbálhatja újra, vagy kihagyhatja a lépést, csak mondja ezt: `%{skip_trigger}`.
+
+          Egyébként az újrakezdéshez mondja ezt: `%{reset_trigger}`.'
+        second_response: |-
+          Sajnálom. Még mindig nem értem. :anguished:
+
+          Csak egy bot vagyok, de ha egy valódi emberrel akar beszélni, keresse fel a [kapcsolat oldalunkat](%{base_path}/about).
+
+          Addig is, elállok az útból.
     new_user_narrative:
+      reset_trigger: "oktatás"
+      title: "Új felhasználói eligazítás elvégzési tanúsítványa"
+      cert_title: "Az új felhasználói eligazítás teljesítése elismeréseképp"
       hello:
         title: "Üdvözlet!"
+      certificate:
+        alt: "Igazoló oklevél"
+    advanced_user_narrative:
+      reset_trigger: "haladó oktatás"

From b45142ef79b84d821f7f78cbcbfd282228c1dcc2 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 24 Apr 2020 09:35:19 -0400
Subject: [PATCH 0776/1830] FIX: reenable draft check modal and fix focus on
 iOS for PMs

---
 app/assets/javascripts/discourse/app/controllers/composer.js    | 2 +-
 app/assets/javascripts/discourse/app/routes/application.js      | 1 +
 .../app/templates/components/composer-user-selector.hbs         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index b7855d54b9..9d04586c11 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -70,7 +70,7 @@ function loadDraft(store, opts) {
 
 const _popupMenuOptionsCallbacks = [];
 
-let _checkDraftPopup = !ENV.environment === "test";
+let _checkDraftPopup = ENV.environment !== "test";
 
 export function toggleCheckDraftPopup(enabled) {
   _checkDraftPopup = enabled;
diff --git a/app/assets/javascripts/discourse/app/routes/application.js b/app/assets/javascripts/discourse/app/routes/application.js
index 856c203058..a16f97ffd9 100644
--- a/app/assets/javascripts/discourse/app/routes/application.js
+++ b/app/assets/javascripts/discourse/app/routes/application.js
@@ -85,6 +85,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
         recipients,
         archetypeId: "private_message",
         draftKey: Composer.NEW_PRIVATE_MESSAGE_KEY,
+        draftSequence: 0,
         reply,
         title
       });
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs
index 34e72ab50e..8b4170f9f2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs
@@ -10,6 +10,7 @@
     hasGroups=hasGroups
     allowEmails="true"
     autocomplete="discourse"
+    canReceiveUpdates=true
   }}
 {{else}}
   <a href {{action "toggleSelector"}}>

From 5a3350cd768f54bf81ab23c70f4d74e588610e66 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 24 Apr 2020 10:14:41 -0400
Subject: [PATCH 0777/1830] FIX: Do not override all title elements with page
 title

This is redudant too, setting document.title is sufficient.
---
 app/assets/javascripts/discourse.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js
index eea5c75640..9de7c40538 100644
--- a/app/assets/javascripts/discourse.js
+++ b/app/assets/javascripts/discourse.js
@@ -56,12 +56,6 @@ const Discourse = Application.extend(FocusEvent, {
   _titleChanged() {
     let title = this._docTitle || Discourse.SiteSettings.title;
 
-    // if we change this we can trigger changes on document.title
-    // only set if changed.
-    if ($("title").text() !== title) {
-      $("title").text(title);
-    }
-
     let displayCount = this.displayCount;
     let dynamicFavicon = this.currentUser && this.currentUser.dynamic_favicon;
     if (displayCount > 0 && !dynamicFavicon) {

From 94d753ad164225eef03596b57a6d9fa56926b788 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 24 Apr 2020 14:22:05 -0400
Subject: [PATCH 0778/1830] Build(deps-dev): Bump better_errors from 2.6.0 to
 2.7.0 (#9544)

Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.6.0...v2.7.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index f337e80b88..d2e598e011 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -66,7 +66,7 @@ GEM
     barber (0.12.2)
       ember-source (>= 1.0, < 3.1)
       execjs (>= 1.2, < 3)
-    better_errors (2.6.0)
+    better_errors (2.7.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)

From e638d43f0a7549a75eb9de57bb8508b36f11543d Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Fri, 24 Apr 2020 10:27:54 -1000
Subject: [PATCH 0779/1830] FEATURE: dismiss first notification on click
 anywhere (#9525)

FEATURE: dismiss first notification on click anywhere

Quicker jumpstart for those already familiar with the platform:

Allow dismissal of first notification mask from any click.
On the dismissal click, we also need to send a "yes I saw it" confirmation
by grabbing a batch of notifications. This prevents the dialog from appearing
again on refresh, or other browsers and ensures we only see it once.
---
 .../discourse/app/components/site-header.js   | 25 +++++++++++++++++++
 .../discourse/app/widgets/header.js           | 18 +++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/components/site-header.js b/app/assets/javascripts/discourse/app/components/site-header.js
index 03bc7b3608..58219c1dda 100644
--- a/app/assets/javascripts/discourse/app/components/site-header.js
+++ b/app/assets/javascripts/discourse/app/components/site-header.js
@@ -205,6 +205,29 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
     this.dispatch("search-autocomplete:after-complete", "search-term");
 
     this.appEvents.on("dom:clean", this, "_cleanDom");
+
+    // Allow first notification to be dismissed on a click anywhere
+    if (
+      !this.get("currentUser.read_first_notification") &&
+      !this.get("currentUser.enforcedSecondFactor")
+    ) {
+      this._dismissFirstNotification = e => {
+        if (
+          !e.target.closest("#current-user") &&
+          !e.target.closest(".ring-backdrop") &&
+          !this.currentUser.get("read_first_notification") &&
+          !this.currentUser.get("enforcedSecondFactor")
+        ) {
+          this.eventDispatched(
+            "header:dismiss-first-notification-mask",
+            "header"
+          );
+        }
+      };
+      document.addEventListener("click", this._dismissFirstNotification, {
+        once: true
+      });
+    }
   },
 
   _cleanDom() {
@@ -225,6 +248,8 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
 
     cancel(this._scheduledRemoveAnimate);
     window.cancelAnimationFrame(this._scheduledMovingAnimation);
+
+    document.removeEventListener("click", this._dismissFirstNotification);
   },
 
   buildArgs() {
diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index 4910913a4e..65caab4810 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -532,6 +532,24 @@ export default createWidget("header", {
     }
   },
 
+  headerDismissFirstNotificationMask() {
+    // Dismiss notifications
+    this.store
+      .findStale(
+        "notification",
+        {
+          recent: true,
+          silent: this.currentUser.enforcedSecondFactor,
+          limit: 5
+        },
+        { cacheKey: "recent-notifications" }
+      )
+      .refresh();
+    // Update UI
+    this.state.ringBackdrop = false;
+    this.scheduleRerender();
+  },
+
   headerKeyboardTrigger(msg) {
     switch (msg.type) {
       case "search":

From 040b8c00a4450cfb0ee306f96d18aa34ab15f931 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 24 Apr 2020 17:31:34 -0400
Subject: [PATCH 0780/1830] UX: replace closed topic icon with
 discourse-no-entry

---
 .../discourse/app/components/topic-status.js      | 10 +++-------
 .../app/controllers/topic-bulk-actions.js         |  2 +-
 .../discourse/app/helpers/topic-status-icons.js   |  6 +++---
 .../discourse/app/raw-views/topic-status.js       |  6 +++---
 .../discourse/app/widgets/post-small-action.js    |  8 +++-----
 .../discourse/app/widgets/topic-admin-menu.js     |  6 +++---
 lib/svg_sprite/svg_sprite.rb                      |  3 +--
 test/javascripts/widgets/topic-status-test.js     |  2 +-
 vendor/assets/svg-icons/discourse-additional.svg  | 15 ++++-----------
 9 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/topic-status.js b/app/assets/javascripts/discourse/app/components/topic-status.js
index 404ab913d0..834a3f30a4 100644
--- a/app/assets/javascripts/discourse/app/components/topic-status.js
+++ b/app/assets/javascripts/discourse/app/components/topic-status.js
@@ -23,21 +23,17 @@ export default Component.extend({
   @discourseComputed("topic.closed", "topic.archived")
   topicClosedArchived(closed, archived) {
     if (closed && archived) {
-      this._set(
-        "closedArchived",
-        "discourse-comment-close",
-        "locked_and_archived"
-      );
+      this._set("closedArchived", "discourse-no-entry", "locked_and_archived");
       this._reset("closed");
       this._reset("archived");
       return true;
     } else {
       this._reset("closedArchived");
       closed
-        ? this._set("closed", "discourse-comment-close", "locked")
+        ? this._set("closed", "discourse-no-entry", "locked")
         : this._reset("closed");
       archived
-        ? this._set("archived", "discourse-comment-close", "archived")
+        ? this._set("archived", "discourse-no-entry", "archived")
         : this._reset("archived");
       return false;
     }
diff --git a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
index 7cc2a9652a..ff98e57ca9 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
@@ -30,7 +30,7 @@ addBulkButton("showChangeCategory", "change_category", {
   class: "btn-default"
 });
 addBulkButton("closeTopics", "close_topics", {
-  icon: "discourse-comment-close",
+  icon: "discourse-no-entry",
   class: "btn-default"
 });
 addBulkButton("archiveTopics", "archive_topics", {
diff --git a/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js b/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js
index 316b527092..f59edb42da 100644
--- a/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js
+++ b/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js
@@ -10,10 +10,10 @@ export default ArrayProxy.extend({
     };
 
     if (topic.get("closed") && topic.get("archived")) {
-      renderIcon("discourse-comment-close", "locked_and_archived");
+      renderIcon("discourse-no-entry", "locked_and_archived");
     } else {
-      renderIconIf("closed", "discourse-comment-close", "locked");
-      renderIconIf("archived", "discourse-comment-close", "archived");
+      renderIconIf("closed", "discourse-no-entry", "locked");
+      renderIconIf("archived", "discourse-no-entry", "archived");
     }
 
     this.forEach(args => renderIconIf(...args));
diff --git a/app/assets/javascripts/discourse/app/raw-views/topic-status.js b/app/assets/javascripts/discourse/app/raw-views/topic-status.js
index 25d50c2b16..5e2a0d8525 100644
--- a/app/assets/javascripts/discourse/app/raw-views/topic-status.js
+++ b/app/assets/javascripts/discourse/app/raw-views/topic-status.js
@@ -39,13 +39,13 @@ export default EmberObject.extend({
 
     if (topic.get("closed") && topic.get("archived")) {
       results.push({
-        icon: "discourse-comment-close",
+        icon: "discourse-no-entry",
         key: "locked_and_archived"
       });
     } else if (topic.get("closed")) {
-      results.push({ icon: "discourse-comment-close", key: "locked" });
+      results.push({ icon: "discourse-no-entry", key: "locked" });
     } else if (topic.get("archived")) {
-      results.push({ icon: "discourse-comment-close", key: "archived" });
+      results.push({ icon: "discourse-no-entry", key: "archived" });
     }
 
     if (topic.get("pinned")) {
diff --git a/app/assets/javascripts/discourse/app/widgets/post-small-action.js b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
index 7f02cb0703..6c3293a062 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-small-action.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
@@ -32,10 +32,8 @@ export function actionDescription(actionCode, createdAt, username) {
 }
 
 const icons = {
-  "closed.enabled": "discourse-comment-close",
-  "closed.disabled": "discourse-comment-plus",
-  "autoclosed.enabled": "discourse-comment-close",
-  "autoclosed.disabled": "discourse-comment-plus",
+  "closed.enabled": "discourse-no-entry",
+  "autoclosed.enabled": "discourse-no-entry",
   "archived.enabled": "folder",
   "archived.disabled": "folder-open",
   "pinned.enabled": "thumbtack",
@@ -52,7 +50,7 @@ const icons = {
   user_left: "minus-circle",
   removed_user: "minus-circle",
   removed_group: "minus-circle",
-  public_topic: "discourse-comment-plus",
+  public_topic: "discourse-comment",
   private_topic: "envelope",
   autobumped: "hand-point-right"
 };
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
index ced88e467a..c7f8567601 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
@@ -165,7 +165,7 @@ export default createWidget("topic-admin-menu", {
           className: "topic-admin-open",
           buttonClass: "btn-default",
           action: "toggleClosed",
-          icon: "discourse-comment-plus",
+          icon: "discourse-comment",
           label: "actions.open"
         });
       } else {
@@ -173,7 +173,7 @@ export default createWidget("topic-admin-menu", {
           className: "topic-admin-close",
           buttonClass: "btn-default",
           action: "toggleClosed",
-          icon: "discourse-comment-close",
+          icon: "discourse-no-entry",
           label: "actions.close"
         });
       }
@@ -239,7 +239,7 @@ export default createWidget("topic-admin-menu", {
           action: isPrivateMessage
             ? "convertToPublicTopic"
             : "convertToPrivateMessage",
-          icon: isPrivateMessage ? "discourse-comment-plus" : "envelope",
+          icon: isPrivateMessage ? "discourse-comment" : "envelope",
           label: isPrivateMessage
             ? "actions.make_public"
             : "actions.make_private"
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index 19a64fd332..0bd2eca9b8 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -63,8 +63,7 @@ module SvgSprite
     "discourse-bell-slash",
     "discourse-compress",
     "discourse-comment",
-    "discourse-comment-plus",
-    "discourse-comment-close",
+    "discourse-no-entry",
     "discourse-expand",
     "download",
     "ellipsis-h",
diff --git a/test/javascripts/widgets/topic-status-test.js b/test/javascripts/widgets/topic-status-test.js
index 66ccf6199c..45d4e73e08 100644
--- a/test/javascripts/widgets/topic-status-test.js
+++ b/test/javascripts/widgets/topic-status-test.js
@@ -12,7 +12,7 @@ widgetTest("basics", {
     });
   },
   test(assert) {
-    assert.ok(find(".topic-status .d-icon-discourse-comment-close").length);
+    assert.ok(find(".topic-status .d-icon-discourse-no-entry").length);
   }
 });
 
diff --git a/vendor/assets/svg-icons/discourse-additional.svg b/vendor/assets/svg-icons/discourse-additional.svg
index 066a93c4f7..f7458e69ad 100644
--- a/vendor/assets/svg-icons/discourse-additional.svg
+++ b/vendor/assets/svg-icons/discourse-additional.svg
@@ -19,7 +19,7 @@ Additional SVG icons
   <symbol id='discourse-bell-exclamation' viewBox="0 0 448 512">
     <path d="M439.4 362.3c-19.3-20.8-55.5-52-55.5-154.3 0-77.7-54.5-139.9-127.9-155.2V32c0-17.7-14.3-32-32-32s-32 14.3-32 32v20.8C118.6 68.1 64.1 130.3 64.1 208c0 102.3-36.2 133.5-55.5 154.3-6 6.4-8.6 14.1-8.6 21.7.1 16.4 13 32 32.1 32h383.8c19.1 0 32-15.6 32.1-32 .1-7.6-2.6-15.3-8.6-21.7zM201.7 116.6h44.6c6.5 0 11.7 5.5 11.4 12l-6.5 123.8c-.3 6.1-5.3 10.9-11.4 10.9h-31.6c-6.1 0-11.1-4.8-11.4-10.9l-6.5-123.8c-.3-6.6 4.9-12 11.4-12zM224 361.3c-18.6 0-33.7-15.1-33.7-33.7s15.1-33.7 33.7-33.7 33.7 15.1 33.7 33.7-15.1 33.7-33.7 33.7zM224 512c35.3 0 64-28.7 64-64H160c0 35.3 28.7 64 64 64z"/>
   </symbol>
-  <!-- Discourse Bell One" is a Discourse derivative of https://fontawesome.com/icons/bell -->
+  <!-- "Discourse Bell One" is a Discourse derivative of https://fontawesome.com/icons/bell -->
   <symbol id='discourse-bell-one' viewBox="0 0 448 512">
     <path d="M224 512c35.3 0 64-28.7 64-64H160c0 35.3 28.7 64 64 64zM439.4 362.3c-19.3-20.8-55.5-52-55.5-154.3 0-77.7-54.5-139.9-127.9-155.2V32c0-17.7-14.3-32-32-32s-32 14.3-32 32v20.8C118.6 68.1 64.1 130.3 64.1 208c0 102.3-36.2 133.5-55.5 154.3-6 6.4-8.6 14.1-8.6 21.7.1 16.4 13 32 32.1 32h383.8c19.1 0 32-15.6 32.1-32 .1-7.6-2.6-15.3-8.6-21.7zm-145.2-28c0 8.6-7 15.5-15.5 15.5h-97c-8.6 0-15.5-7-15.5-15.5v-15.8c0-8.6 7-15.5 15.5-15.5h27.1V192.5l-5.1 3.1c-6 6.1-15.9 6.2-22 .1l-11.2-11.1c-6.1-6-6.2-15.9-.1-22l31.6-31.9c3.2-3.2 7.4-4.7 11.5-4.6h26.6c8.6 0 11.5 7 11.5 15.5v161.3h27.1c8.6 0 15.5 7 15.5 15.5v15.9z"/>
   </symbol>
@@ -27,18 +27,11 @@ Additional SVG icons
   <symbol id='discourse-bell-slash' viewBox="0 0 448 512">
     <path d="M442.7 396.2L36.5 70.7c-6.9-5.5-17-4.4-22.5 2.5L4 85.6c-5.5 6.9-4.4 17 2.5 22.5l406.2 325.5c6.9 5.5 17 4.4 22.5-2.5l10-12.5c5.5-6.9 3.7-17.7-3.2-23.2l.7.8zM67.5 368c16.7-22 34.5-55.8 41.4-110.6l-45.5-35.6C60.2 312.6 27 342.5 8.6 362.3 2.6 368.7 0 376.4 0 384c.1 16.4 13 32 32.1 32h279.7l-61.4-48H67.5zM224 96c61.9 0 112 50.1 112 112 0 .2-.1.4-.1.6 0 16.8 1.2 31.8 2.8 45.7l59.5 46.5c-8.3-22.1-14.3-51.5-14.3-92.9 0-77.7-54.5-139.9-127.9-155.2V32c0-17.7-14.3-32-32-32s-32 14.3-32 32v20.8c-26 5.4-49.4 16.9-69.1 32.7l38.2 29.8C179 103.2 200.6 96 224 96zm0 416c35.3 0 64-28.6 64-64H160c0 35.4 28.7 64 64 64z"/>
   </symbol>
-  <!-- "Discourse Comment" is a Discourse derivative of https://fontawesome.com/icons/comment?style=regular that has been built to match the custom discourse-comment-close icon  -->
+  <!-- "Discourse Comment" is a Discourse derivative of https://fontawesome.com/icons/comment?style=regular that has been built to be a bit more legible at small sizes -->
   <symbol id='discourse-comment' viewBox="0 0 550 512">
     <path d="M26 479.3c-7.5 0-14.8-3.3-19.8-9.2-6.5-7.6-8-18.3-4-27.4l54.6-123.2c-17-28.9-23.2-66.1-18.6-110.7C44.6 146.2 77.8 90.2 131.6 51 184.4 12.4 251.1-5.2 319.2 1.3c72.8 7 139.6 41.5 183.3 94.9 38.4 46.8 56.3 104.4 50.3 162-6.5 62.5-39.6 118.5-93.4 157.7-45.7 33.3-101.7 51-160 51-9.2 0-18.4-.4-27.6-1.3-32.8-3.1-64.2-11.7-93.4-25.4L32.6 478.4c-2.2.6-4.4.9-6.6.9zm155.2-92.7c4.1 0 8.2 1 11.9 2.9 25.9 13.4 54 21.6 83.6 24.4 7.5.7 15 1.1 22.5 1.1 104 0 192.3-69.1 201.9-162 4.5-43.8-9.3-87.7-38.8-123.7-35-42.7-89-70.4-148-76.1-113.5-10.9-214.1 61.4-224.4 161-3.9 38.1 1.8 67.3 17 86.9 5.9 7.6 7.1 17.7 3.2 26.5l-38.5 87 102.9-27c2.3-.7 4.5-1 6.7-1z"/>
   </symbol>
-  <!-- "Discourse Comment Plus" is a version of https://fontawesome.com/icons/comment-plus?style=regular that has been recreated to match the custom discourse-comment icon  -->
-  <symbol id="discourse-comment-plus" viewBox="0 0 550 512">
-    <path d="M26 479.3c-7.5 0-14.8-3.3-19.8-9.2-6.5-7.6-8-18.3-4-27.4l54.6-123.2c-17-28.9-23.2-66.1-18.6-110.7C44.6 146.2 77.8 90.2 131.6 51 184.4 12.4 251.1-5.2 319.2 1.3c72.8 7 139.6 41.5 183.3 94.9 38.4 46.8 56.3 104.4 50.3 162-6.5 62.5-39.6 118.5-93.4 157.7-45.7 33.3-101.7 51-160 51-9.2 0-18.4-.4-27.6-1.3-32.8-3.1-64.2-11.7-93.4-25.4L32.6 478.4c-2.2.6-4.4.9-6.6.9zm155.2-92.7c4.1 0 8.2 1 11.9 2.9 25.9 13.4 54 21.6 83.6 24.4 7.5.7 15 1.1 22.5 1.1 104 0 192.3-69.1 201.9-162 4.5-43.8-9.3-87.7-38.8-123.7-35-42.7-89-70.4-148-76.1-113.5-10.9-214.1 61.4-224.4 161-3.9 38.1 1.8 67.3 17 86.9 5.9 7.6 7.1 17.7 3.2 26.5l-38.5 87 102.9-27c2.3-.7 4.5-1 6.7-1z"/>
-    <path d="M385.8 199.7h-61.4v-61.4c0-12-9.7-21.8-21.8-21.8h-15.1c-12 0-21.8 9.7-21.8 21.8v61.4h-61.4c-12 0-21.8 9.7-21.8 21.8v15.1c0 12 9.7 21.8 21.8 21.8h61.4v61.4c0 12 9.7 21.8 21.8 21.8h15.1c12 0 21.8-9.7 21.8-21.8v-61.4h61.4c12 0 21.8-9.7 21.8-21.8v-15c-.1-12-9.8-21.9-21.8-21.9z"/>
-  </symbol>
-  <!-- "Discourse Comment Close" is a version of https://fontawesome.com/icons/comment-times?style=regular that has been recreated to match the custom discourse-comment icon  -->
-  <symbol id="discourse-comment-close" viewBox="0 0 550 512">
-    <path d="M26 479.3c-7.5 0-14.8-3.3-19.8-9.2-6.5-7.6-8-18.3-4-27.4l54.6-123.2c-17-28.9-23.2-66.1-18.6-110.7C44.6 146.2 77.8 90.2 131.6 51 184.4 12.4 251.1-5.2 319.2 1.3c72.8 7 139.6 41.5 183.3 94.9 38.4 46.8 56.3 104.4 50.3 162-6.5 62.5-39.6 118.5-93.4 157.7-45.7 33.3-101.7 51-160 51-9.2 0-18.4-.4-27.6-1.3-32.8-3.1-64.2-11.7-93.4-25.4L32.6 478.4c-2.2.6-4.4.9-6.6.9zm155.2-92.7c4.1 0 8.2 1 11.9 2.9 25.9 13.4 54 21.6 83.6 24.4 7.5.7 15 1.1 22.5 1.1 104 0 192.3-69.1 201.9-162 4.5-43.8-9.3-87.7-38.8-123.7-35-42.7-89-70.4-148-76.1-113.5-10.9-214.1 61.4-224.4 161-3.9 38.1 1.8 67.3 17 86.9 5.9 7.6 7.1 17.7 3.2 26.5l-38.5 87 102.9-27c2.3-.7 4.5-1 6.7-1z"/>
-    <path d="M379.9 272.5L336.5 229l43.4-43.4c8.5-8.5 8.5-22.3 0-30.8l-10.7-10.7c-8.5-8.5-22.3-8.5-30.8 0L295 187.5l-43.4-43.4c-8.5-8.5-22.3-8.5-30.8 0l-10.7 10.7c-8.5 8.5-8.5 22.3 0 30.8l43.4 43.4-43.4 43.4c-8.5 8.5-8.5 22.3 0 30.8l10.7 10.7c8.5 8.5 22.3 8.5 30.8 0l43.4-43.4 43.4 43.4c8.5 8.5 22.3 8.5 30.8 0l10.6-10.6c8.5-8.5 8.6-22.4.1-30.8z"/>
+  <symbol id='discourse-no-entry' viewBox="0 0 496 496">
+    <path d="M248 0C111 0 0 111 0 248s111 248 248 248 248-111 248-248S385 0 248 0zm161.3 299.9H86.6c-11.4 0-20.6-10.1-20.6-22.5v-58.7c0-12.4 9.2-22.5 20.6-22.5h322.5c11.4 0 20.7 10.2 20.7 22.7v58.5c.1 12.4-9.1 22.5-20.5 22.5z"/>
   </symbol>
 </svg>

From 67429335d567fa05ed51c23982ac8bf7fd1878e3 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 24 Apr 2020 19:32:02 -0400
Subject: [PATCH 0781/1830] Remove SASS spacing function

---
 app/assets/stylesheets/common.scss            |  1 -
 app/assets/stylesheets/common/base/modal.scss |  6 ++---
 .../stylesheets/common/base/share_link.scss   | 12 +++++-----
 app/assets/stylesheets/common/base/user.scss  |  8 +++----
 .../components/share-and-invite-modal.scss    | 14 +++++------
 .../common/foundation/spacing.scss            | 23 ------------------
 app/assets/stylesheets/desktop/login.scss     |  8 +++----
 app/assets/stylesheets/desktop/user.scss      | 12 +++++-----
 app/assets/stylesheets/mobile/topic-post.scss |  8 +++----
 app/assets/stylesheets/mobile/user.scss       | 24 +++++++++----------
 10 files changed, 46 insertions(+), 70 deletions(-)
 delete mode 100644 app/assets/stylesheets/common/foundation/spacing.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 5aebe7c1e7..2165d73ebd 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -4,7 +4,6 @@
 @import "common/foundation/base";
 @import "common/foundation/mixins";
 @import "common/foundation/variables";
-@import "common/foundation/spacing";
 @import "common/select-kit/*";
 @import "common/components/*";
 @import "common/input_tip";
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index cb7e0a4c35..9667a0cb47 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -723,8 +723,8 @@
 
       .modal-tab {
         list-style: none;
-        padding: s(1 2);
-        margin-right: s(1);
+        padding: 4px 8px;
+        margin-right: 4px;
         cursor: pointer;
 
         &.is-active {
@@ -734,7 +734,7 @@
           &.single-tab {
             background: none;
             color: $primary;
-            padding: s(1 0);
+            padding: 4px 0;
           }
         }
       }
diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss
index 20b15d756e..d2d8c72b6d 100644
--- a/app/assets/stylesheets/common/base/share_link.scss
+++ b/app/assets/stylesheets/common/base/share_link.scss
@@ -6,7 +6,7 @@
   z-index: z("dropdown");
   box-shadow: shadow("card");
   background-color: $secondary;
-  padding: s(2 2 1 2);
+  padding: 8px 8px 4px 8px;
   width: 300px;
   display: none;
   &.visible {
@@ -17,7 +17,7 @@
   }
 
   .title {
-    margin-bottom: s(1);
+    margin-bottom: 4px;
     align-items: center;
     display: flex;
     justify-content: space-between;
@@ -46,7 +46,7 @@
     }
   }
   .social-link {
-    margin-right: s(2);
+    margin-right: 8px;
     font-size: $font-up-4;
     .d-icon {
       color: dark-light-choose($tertiary, white);
@@ -69,7 +69,7 @@
   .actions {
     display: flex;
     align-items: flex-end;
-    margin-top: s(2);
+    margin-top: 8px;
 
     .sources {
       display: flex;
@@ -79,7 +79,7 @@
       max-width: 45%;
 
       .social-link {
-        margin-right: s(2);
+        margin-right: 8px;
       }
     }
 
@@ -96,7 +96,7 @@
       }
 
       .new-topic {
-        margin-right: s(4);
+        margin-right: 16px;
       }
     }
   }
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index c06f4fc655..805b6bc8d0 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -7,7 +7,7 @@
   display: grid;
   grid-template-columns: 1fr 5fr;
   grid-template-rows: auto auto 1fr auto;
-  grid-row-gap: s(5);
+  grid-row-gap: 20px;
   .user-primary-navigation {
     grid-column-start: 1;
     grid-column-end: 3;
@@ -46,10 +46,10 @@
 .user-content {
   .list-actions {
     display: flex;
-    margin-bottom: s(3);
+    margin-bottom: 12px;
 
     .btn {
-      margin-right: s(3);
+      margin-right: 12px;
     }
   }
 
@@ -264,7 +264,7 @@
     color: $secondary;
     display: flex;
     padding: 10px;
-    margin-bottom: s(4);
+    margin-bottom: 16px;
     > div,
     > div a {
       display: flex;
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 624109f9ba..b964ea12b0 100644
--- a/app/assets/stylesheets/common/components/share-and-invite-modal.scss
+++ b/app/assets/stylesheets/common/components/share-and-invite-modal.scss
@@ -25,7 +25,7 @@
     .title {
       font-size: $font-0;
       font-weight: normal;
-      margin-bottom: s(2);
+      margin-bottom: 8px;
 
       .post-date {
         color: $primary-medium;
@@ -45,7 +45,7 @@
     }
 
     .topic-share-url {
-      margin-bottom: s(2);
+      margin-bottom: 8px;
     }
 
     .sources {
@@ -56,7 +56,7 @@
 
       .social-link {
         font-size: $font-up-6;
-        margin-right: s(2);
+        margin-right: 8px;
       }
     }
   }
@@ -65,18 +65,18 @@
 .share-and-invite.modal .invite.modal-panel {
   .error-message,
   .success-message {
-    margin-bottom: s(2);
+    margin-bottom: 8px;
   }
 
   .body {
     .invite-user-control,
     .group-access-control,
     .show-custom-message-control {
-      margin-bottom: s(4);
+      margin-bottom: 8px;
     }
 
     .instructions {
-      margin-bottom: s(2);
+      margin-bottom: 8px;
     }
 
     .email-or-username-input {
@@ -96,7 +96,7 @@
     align-items: center;
 
     .btn-primary {
-      margin-right: s(2);
+      margin-right: 8px;
 
       &:last-child {
         margin-right: 0;
diff --git a/app/assets/stylesheets/common/foundation/spacing.scss b/app/assets/stylesheets/common/foundation/spacing.scss
deleted file mode 100644
index 9acbb71abb..0000000000
--- a/app/assets/stylesheets/common/foundation/spacing.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-$base-space: 4px;
-
-@function s(
-  $sizes: (
-    0
-  )
-) {
-  $spaces: ();
-  @each $size in $sizes {
-    @if ($size == 0) {
-      // Strip units if 0
-      $size: $size * $base-space;
-      $size: $size / ($size * 0 + 1);
-    } @else if ($size == auto) {
-      $size: auto;
-    } @else {
-      $size: $size * $base-space;
-    }
-
-    $spaces: append($spaces, $size);
-  }
-  @return $spaces;
-}
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 8ddc7f7d21..78a4048509 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -9,7 +9,7 @@
     flex-direction: column;
     align-items: stretch;
     min-height: 75px;
-    padding: s(0 6);
+    padding: 0 24px;
     order: 2;
 
     button {
@@ -39,7 +39,7 @@
 
   #modal-alert {
     max-width: 100%;
-    padding: s(2 4);
+    padding: 8px 16px;
   }
 
   .login-modal {
@@ -68,7 +68,7 @@
   #login-form {
     box-sizing: border-box;
     flex: 1 0 auto;
-    padding: s(0 6);
+    padding: 0 24px;
     + #login-buttons {
       border-left: 1px solid $primary-low; // Only show border when login-form is present
     }
@@ -171,7 +171,7 @@
     }
     form {
       box-sizing: border-box;
-      padding: s(4 6);
+      padding: 16px 24px;
       margin-bottom: 0;
       max-height: 475px;
       @media screen and (max-height: 650px) {
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index 6cfaa87a81..d6b0342dfc 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -50,8 +50,8 @@
 }
 
 .user-content {
-  padding-bottom: s(3);
-  margin-bottom: s(3);
+  padding-bottom: 12px;
+  margin-bottom: 12px;
   background-color: $secondary;
   box-sizing: border-box;
 
@@ -118,7 +118,7 @@
 
       .primary {
         .primary-textual {
-          padding: s(0 1 1);
+          padding: 0 4px 4px;
           a[href] {
             text-decoration: underline;
           }
@@ -146,7 +146,7 @@
       }
 
       .secondary {
-        margin-top: s(4);
+        margin-top: 16px;
       }
     }
 
@@ -183,7 +183,7 @@
           display: inline-flex;
           > li {
             display: inline;
-            margin-left: s(3);
+            margin-left: 12px;
             .d-button-label {
               line-height: 1;
             }
@@ -246,7 +246,7 @@
 
   .instructions {
     display: inline-block;
-    margin-top: s(1);
+    margin-top: 4px;
   }
 }
 
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index d6fa6ff9d3..9cd4931ce8 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -43,18 +43,18 @@ span.badge-posts {
           flex: 1 1 auto;
         }
         &.button-count {
-          padding: s(2 1 2 2);
+          padding: 8px 4px 8px 8px;
           + .toggle-like,
           + .create-flag {
-            padding: s(2 2 2 1);
+            padding: 8px 8px 8px 4px;
           }
           &.my-likes,
           &.regular-likes {
             display: flex;
             max-width: unset;
-            padding: s(2);
+            padding: 8px;
             .d-icon {
-              padding-left: s(2);
+              padding-left: 8px;
             }
           }
         }
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index 99f1fe16da..55888d37a1 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -4,8 +4,8 @@
   display: grid;
   grid-template-columns: 1fr 1fr;
   grid-template-rows: auto auto auto;
-  grid-row-gap: s(5);
-  grid-column-gap: s(4);
+  grid-row-gap: 20px;
+  grid-column-gap: 16px;
   .user-primary-navigation {
     grid-column-start: 1;
     grid-row-start: 1;
@@ -31,14 +31,14 @@
 }
 
 .user-main {
-  margin-top: s(3);
+  margin-top: 12px;
 
   .user-content {
     box-sizing: border-box;
     background-color: $secondary;
     table {
       width: 100%;
-      margin-top: s(3);
+      margin-top: 12px;
     }
   }
 
@@ -48,12 +48,12 @@
 
     .secondary {
       dl {
-        padding: s(2) 0;
+        padding: 8px 0;
       }
     }
 
     .details {
-      margin-bottom: s(3);
+      margin-bottom: 12px;
 
       h1 {
         line-height: $line-height-small;
@@ -69,7 +69,7 @@
         }
         display: block;
         float: none;
-        margin: s(2 auto);
+        margin: 8px auto;
         img.avatar {
           float: none;
         }
@@ -117,7 +117,7 @@
       color: $primary;
 
       .avatar {
-        margin: 0 0 s(3);
+        margin: 0 0 12px;
       }
 
       .primary-textual {
@@ -129,7 +129,7 @@
 
       .bio {
         color: $primary;
-        margin: 0 auto s(2);
+        margin: 0 auto 8px;
         max-width: 700px;
         text-align: center;
 
@@ -155,7 +155,7 @@
         height: 200px;
       }
       .user-profile-avatar {
-        margin-top: s(-15);
+        margin-top: -60px;
       }
     }
 
@@ -267,11 +267,11 @@
   padding-bottom: 2em;
 
   .instructions {
-    margin-top: s(1);
+    margin-top: 4px;
   }
 
   .controls-dropdown {
-    margin-bottom: s(4);
+    margin-bottom: 16px;
   }
 
   .delete-account {

From d516a88b4c714e6b37adeda92621613cbf2a1047 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 24 Apr 2020 22:27:25 -0400
Subject: [PATCH 0782/1830] DEV: add tag name class to body of tag pages

---
 .../discourse/app/templates/tags/show.hbs     | 164 +++++++++---------
 1 file changed, 83 insertions(+), 81 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/tags/show.hbs b/app/assets/javascripts/discourse/app/templates/tags/show.hbs
index 80f38623c3..ea0ed47cfc 100644
--- a/app/assets/javascripts/discourse/app/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tags/show.hbs
@@ -1,90 +1,92 @@
-<div class="container">
-  {{discourse-banner user=currentUser banner=site.banner}}
-</div>
-
-<div class="list-controls">
+{{#d-section pageClass="tags" bodyClass=(concat "tag-" tag.id)}}
   <div class="container">
-    <section class="navigation-container">
-      {{#if showTagFilter}}
-        {{bread-crumbs
-          categories=categories
-          category=category
-          tagId=tag.id
-          noSubcategories=noSubcategories
-        }}
-        {{navigation-bar navItems=navItems filterMode=filterMode}}
-      {{else}}
-        <h2 class="tag-show-heading">
-          {{#link-to "tags"}}{{i18n "tagging.tags"}}{{/link-to}}
-          {{d-icon "angle-right"}}
-          {{discourse-tag-bound tagRecord=tag style="simple"}}
-          {{#each additionalTags as |tag|}}
-            <span>&amp;</span>
-            {{discourse-tag tag style="simple"}}
-          {{/each}}
-        </h2>
-      {{/if}}
-
-      {{#if tagNotification}}
-        {{#unless additionalTags}}
-          {{tag-notifications-button
-            onChange=(action "changeTagNotificationLevel")
-            value=tagNotification.notification_level
-          }}
-        {{/unless}}
-      {{/if}}
-
-      {{create-topic-button
-        canCreateTopic=canCreateTopic
-        disabled=createTopicDisabled
-        label=createTopicLabel
-        action=(route-action "createTopic")
-      }}
-
-      {{#if showToggleInfo}}
-        {{d-button icon="tag" label="tagging.info" action=(action "toggleInfo") id="show-tag-info"}}
-      {{/if}}
-    </section>
+    {{discourse-banner user=currentUser banner=site.banner}}
   </div>
-</div>
 
-{{#if showInfo}}
-  {{tag-info tag=tag list=list deleteAction=(action "deleteTag")}}
-{{/if}}
+  <div class="list-controls">
+    <div class="container">
+      <section class="navigation-container">
+        {{#if showTagFilter}}
+          {{bread-crumbs
+            categories=categories
+            category=category
+            tagId=tag.id
+            noSubcategories=noSubcategories
+          }}
+          {{navigation-bar navItems=navItems filterMode=filterMode}}
+        {{else}}
+          <h2 class="tag-show-heading">
+            {{#link-to "tags"}}{{i18n "tagging.tags"}}{{/link-to}}
+            {{d-icon "angle-right"}}
+            {{discourse-tag-bound tagRecord=tag style="simple"}}
+            {{#each additionalTags as |tag|}}
+              <span>&amp;</span>
+              {{discourse-tag tag style="simple"}}
+            {{/each}}
+          </h2>
+        {{/if}}
 
-{{plugin-outlet name="discovery-list-container-top"}}
+        {{#if tagNotification}}
+          {{#unless additionalTags}}
+            {{tag-notifications-button
+              onChange=(action "changeTagNotificationLevel")
+              value=tagNotification.notification_level
+            }}
+          {{/unless}}
+        {{/if}}
 
-<div class="container list-container">
-  <div class="row">
-    <div class="full-width">
-      <div id="list-area">
-        {{#unless loading}}
-          {{#if list.topics}}
-            {{#discovery-topics-list model=list refresh=(action "refresh")}}
-              {{bulk-select-button selected=selected action=(action "refresh")}}
-              {{topic-list
-                topics=list.topics
-                canBulkSelect=canBulkSelect
-                toggleBulkSelect=(action "toggleBulkSelect")
-                bulkSelectEnabled=bulkSelectEnabled
-                selected=selected
-                showPosters=true
-                order=order
-                ascending=ascending
-                changeSort=(action "changeSort")
-              }}
-            {{/discovery-topics-list}}
-          {{else}}
-            <footer class="topic-list-bottom">
-              <h3>
-                {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n "topic.browse_all_categories"}}{{/link-to}} {{i18n "or"}} {{#link-to "discovery.latest"}}{{i18n "topic.view_latest_topics"}}{{/link-to}}.
-              </h3>
-            </footer>
-          {{/if}}
-        {{/unless}}
+        {{create-topic-button
+          canCreateTopic=canCreateTopic
+          disabled=createTopicDisabled
+          label=createTopicLabel
+          action=(route-action "createTopic")
+        }}
 
-        {{conditional-loading-spinner condition=list.loadingMore}}
+        {{#if showToggleInfo}}
+          {{d-button icon="tag" label="tagging.info" action=(action "toggleInfo") id="show-tag-info"}}
+        {{/if}}
+      </section>
+    </div>
+  </div>
+
+  {{#if showInfo}}
+    {{tag-info tag=tag list=list deleteAction=(action "deleteTag")}}
+  {{/if}}
+
+  {{plugin-outlet name="discovery-list-container-top"}}
+
+  <div class="container list-container">
+    <div class="row">
+      <div class="full-width">
+        <div id="list-area">
+          {{#unless loading}}
+            {{#if list.topics}}
+              {{#discovery-topics-list model=list refresh=(action "refresh")}}
+                {{bulk-select-button selected=selected action=(action "refresh")}}
+                {{topic-list
+                  topics=list.topics
+                  canBulkSelect=canBulkSelect
+                  toggleBulkSelect=(action "toggleBulkSelect")
+                  bulkSelectEnabled=bulkSelectEnabled
+                  selected=selected
+                  showPosters=true
+                  order=order
+                  ascending=ascending
+                  changeSort=(action "changeSort")
+                }}
+              {{/discovery-topics-list}}
+            {{else}}
+              <footer class="topic-list-bottom">
+                <h3>
+                  {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n "topic.browse_all_categories"}}{{/link-to}} {{i18n "or"}} {{#link-to "discovery.latest"}}{{i18n "topic.view_latest_topics"}}{{/link-to}}.
+                </h3>
+              </footer>
+            {{/if}}
+          {{/unless}}
+
+          {{conditional-loading-spinner condition=list.loadingMore}}
+        </div>
       </div>
     </div>
   </div>
-</div>
+{{/d-section}}

From 1f6eaf26a17221d9b81bc4466a8219990b31a5f9 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Sat, 25 Apr 2020 13:01:25 +1000
Subject: [PATCH 0783/1830] Revert "UX: replace closed topic icon with
 discourse-no-entry"

This reverts commit 040b8c00a4450cfb0ee306f96d18aa34ab15f931.

We decided to keep status quo for now
---
 .../javascripts/discourse/app/components/topic-status.js | 8 +++-----
 .../discourse/app/controllers/topic-bulk-actions.js      | 2 +-
 .../discourse/app/helpers/topic-status-icons.js          | 6 +++---
 .../javascripts/discourse/app/raw-views/topic-status.js  | 9 +++------
 app/assets/javascripts/discourse/app/templates/user.hbs  | 2 +-
 .../discourse/app/widgets/post-small-action.js           | 8 +++++---
 .../discourse/app/widgets/topic-admin-menu.js            | 6 +++---
 lib/svg_sprite/svg_sprite.rb                             | 2 --
 test/javascripts/widgets/topic-status-test.js            | 2 +-
 vendor/assets/svg-icons/discourse-additional.svg         | 9 +--------
 10 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/topic-status.js b/app/assets/javascripts/discourse/app/components/topic-status.js
index 834a3f30a4..569292eb5e 100644
--- a/app/assets/javascripts/discourse/app/components/topic-status.js
+++ b/app/assets/javascripts/discourse/app/components/topic-status.js
@@ -23,17 +23,15 @@ export default Component.extend({
   @discourseComputed("topic.closed", "topic.archived")
   topicClosedArchived(closed, archived) {
     if (closed && archived) {
-      this._set("closedArchived", "discourse-no-entry", "locked_and_archived");
+      this._set("closedArchived", "lock", "locked_and_archived");
       this._reset("closed");
       this._reset("archived");
       return true;
     } else {
       this._reset("closedArchived");
-      closed
-        ? this._set("closed", "discourse-no-entry", "locked")
-        : this._reset("closed");
+      closed ? this._set("closed", "lock", "locked") : this._reset("closed");
       archived
-        ? this._set("archived", "discourse-no-entry", "archived")
+        ? this._set("archived", "lock", "archived")
         : this._reset("archived");
       return false;
     }
diff --git a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
index ff98e57ca9..723e7fee54 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
@@ -30,7 +30,7 @@ addBulkButton("showChangeCategory", "change_category", {
   class: "btn-default"
 });
 addBulkButton("closeTopics", "close_topics", {
-  icon: "discourse-no-entry",
+  icon: "lock",
   class: "btn-default"
 });
 addBulkButton("archiveTopics", "archive_topics", {
diff --git a/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js b/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js
index f59edb42da..2f2da65a25 100644
--- a/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js
+++ b/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js
@@ -10,10 +10,10 @@ export default ArrayProxy.extend({
     };
 
     if (topic.get("closed") && topic.get("archived")) {
-      renderIcon("discourse-no-entry", "locked_and_archived");
+      renderIcon("lock", "locked_and_archived");
     } else {
-      renderIconIf("closed", "discourse-no-entry", "locked");
-      renderIconIf("archived", "discourse-no-entry", "archived");
+      renderIconIf("closed", "lock", "locked");
+      renderIconIf("archived", "lock", "archived");
     }
 
     this.forEach(args => renderIconIf(...args));
diff --git a/app/assets/javascripts/discourse/app/raw-views/topic-status.js b/app/assets/javascripts/discourse/app/raw-views/topic-status.js
index 5e2a0d8525..d6b2c74999 100644
--- a/app/assets/javascripts/discourse/app/raw-views/topic-status.js
+++ b/app/assets/javascripts/discourse/app/raw-views/topic-status.js
@@ -38,14 +38,11 @@ export default EmberObject.extend({
     }
 
     if (topic.get("closed") && topic.get("archived")) {
-      results.push({
-        icon: "discourse-no-entry",
-        key: "locked_and_archived"
-      });
+      results.push({ icon: "lock", key: "locked_and_archived" });
     } else if (topic.get("closed")) {
-      results.push({ icon: "discourse-no-entry", key: "locked" });
+      results.push({ icon: "lock", key: "locked" });
     } else if (topic.get("archived")) {
-      results.push({ icon: "discourse-no-entry", key: "archived" });
+      results.push({ icon: "lock", key: "archived" });
     }
 
     if (topic.get("pinned")) {
diff --git a/app/assets/javascripts/discourse/app/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs
index ceed565516..9290b1d832 100644
--- a/app/assets/javascripts/discourse/app/templates/user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user.hbs
@@ -233,7 +233,7 @@
           {{#if showNotificationsTab}}
             <li>
               {{#link-to 'userNotifications'}}
-                {{d-icon "discourse-comment" class="glyph"}}{{i18n 'user.notifications'}}
+                {{d-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
               {{/link-to}}
             </li>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/app/widgets/post-small-action.js b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
index 6c3293a062..709d70153a 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-small-action.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
@@ -32,8 +32,10 @@ export function actionDescription(actionCode, createdAt, username) {
 }
 
 const icons = {
-  "closed.enabled": "discourse-no-entry",
-  "autoclosed.enabled": "discourse-no-entry",
+  "closed.enabled": "lock",
+  "closed.disabled": "unlock-alt",
+  "autoclosed.enabled": "lock",
+  "autoclosed.disabled": "unlock-alt",
   "archived.enabled": "folder",
   "archived.disabled": "folder-open",
   "pinned.enabled": "thumbtack",
@@ -50,7 +52,7 @@ const icons = {
   user_left: "minus-circle",
   removed_user: "minus-circle",
   removed_group: "minus-circle",
-  public_topic: "discourse-comment",
+  public_topic: "comment",
   private_topic: "envelope",
   autobumped: "hand-point-right"
 };
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
index c7f8567601..e5c8138673 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
@@ -165,7 +165,7 @@ export default createWidget("topic-admin-menu", {
           className: "topic-admin-open",
           buttonClass: "btn-default",
           action: "toggleClosed",
-          icon: "discourse-comment",
+          icon: "unlock",
           label: "actions.open"
         });
       } else {
@@ -173,7 +173,7 @@ export default createWidget("topic-admin-menu", {
           className: "topic-admin-close",
           buttonClass: "btn-default",
           action: "toggleClosed",
-          icon: "discourse-no-entry",
+          icon: "lock",
           label: "actions.close"
         });
       }
@@ -239,7 +239,7 @@ export default createWidget("topic-admin-menu", {
           action: isPrivateMessage
             ? "convertToPublicTopic"
             : "convertToPrivateMessage",
-          icon: isPrivateMessage ? "discourse-comment" : "envelope",
+          icon: isPrivateMessage ? "comment" : "envelope",
           label: isPrivateMessage
             ? "actions.make_public"
             : "actions.make_private"
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index 0bd2eca9b8..f2c4bcdbb7 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -62,8 +62,6 @@ module SvgSprite
     "discourse-bell-one",
     "discourse-bell-slash",
     "discourse-compress",
-    "discourse-comment",
-    "discourse-no-entry",
     "discourse-expand",
     "download",
     "ellipsis-h",
diff --git a/test/javascripts/widgets/topic-status-test.js b/test/javascripts/widgets/topic-status-test.js
index 45d4e73e08..5cc6f9d437 100644
--- a/test/javascripts/widgets/topic-status-test.js
+++ b/test/javascripts/widgets/topic-status-test.js
@@ -12,7 +12,7 @@ widgetTest("basics", {
     });
   },
   test(assert) {
-    assert.ok(find(".topic-status .d-icon-discourse-no-entry").length);
+    assert.ok(find(".topic-status .d-icon-discourse-comment-slash").length);
   }
 });
 
diff --git a/vendor/assets/svg-icons/discourse-additional.svg b/vendor/assets/svg-icons/discourse-additional.svg
index f7458e69ad..343b5b6abc 100644
--- a/vendor/assets/svg-icons/discourse-additional.svg
+++ b/vendor/assets/svg-icons/discourse-additional.svg
@@ -19,7 +19,7 @@ Additional SVG icons
   <symbol id='discourse-bell-exclamation' viewBox="0 0 448 512">
     <path d="M439.4 362.3c-19.3-20.8-55.5-52-55.5-154.3 0-77.7-54.5-139.9-127.9-155.2V32c0-17.7-14.3-32-32-32s-32 14.3-32 32v20.8C118.6 68.1 64.1 130.3 64.1 208c0 102.3-36.2 133.5-55.5 154.3-6 6.4-8.6 14.1-8.6 21.7.1 16.4 13 32 32.1 32h383.8c19.1 0 32-15.6 32.1-32 .1-7.6-2.6-15.3-8.6-21.7zM201.7 116.6h44.6c6.5 0 11.7 5.5 11.4 12l-6.5 123.8c-.3 6.1-5.3 10.9-11.4 10.9h-31.6c-6.1 0-11.1-4.8-11.4-10.9l-6.5-123.8c-.3-6.6 4.9-12 11.4-12zM224 361.3c-18.6 0-33.7-15.1-33.7-33.7s15.1-33.7 33.7-33.7 33.7 15.1 33.7 33.7-15.1 33.7-33.7 33.7zM224 512c35.3 0 64-28.7 64-64H160c0 35.3 28.7 64 64 64z"/>
   </symbol>
-  <!-- "Discourse Bell One" is a Discourse derivative of https://fontawesome.com/icons/bell -->
+  <!-- Discourse Bell One" is a Discourse derivative of https://fontawesome.com/icons/bell -->
   <symbol id='discourse-bell-one' viewBox="0 0 448 512">
     <path d="M224 512c35.3 0 64-28.7 64-64H160c0 35.3 28.7 64 64 64zM439.4 362.3c-19.3-20.8-55.5-52-55.5-154.3 0-77.7-54.5-139.9-127.9-155.2V32c0-17.7-14.3-32-32-32s-32 14.3-32 32v20.8C118.6 68.1 64.1 130.3 64.1 208c0 102.3-36.2 133.5-55.5 154.3-6 6.4-8.6 14.1-8.6 21.7.1 16.4 13 32 32.1 32h383.8c19.1 0 32-15.6 32.1-32 .1-7.6-2.6-15.3-8.6-21.7zm-145.2-28c0 8.6-7 15.5-15.5 15.5h-97c-8.6 0-15.5-7-15.5-15.5v-15.8c0-8.6 7-15.5 15.5-15.5h27.1V192.5l-5.1 3.1c-6 6.1-15.9 6.2-22 .1l-11.2-11.1c-6.1-6-6.2-15.9-.1-22l31.6-31.9c3.2-3.2 7.4-4.7 11.5-4.6h26.6c8.6 0 11.5 7 11.5 15.5v161.3h27.1c8.6 0 15.5 7 15.5 15.5v15.9z"/>
   </symbol>
@@ -27,11 +27,4 @@ Additional SVG icons
   <symbol id='discourse-bell-slash' viewBox="0 0 448 512">
     <path d="M442.7 396.2L36.5 70.7c-6.9-5.5-17-4.4-22.5 2.5L4 85.6c-5.5 6.9-4.4 17 2.5 22.5l406.2 325.5c6.9 5.5 17 4.4 22.5-2.5l10-12.5c5.5-6.9 3.7-17.7-3.2-23.2l.7.8zM67.5 368c16.7-22 34.5-55.8 41.4-110.6l-45.5-35.6C60.2 312.6 27 342.5 8.6 362.3 2.6 368.7 0 376.4 0 384c.1 16.4 13 32 32.1 32h279.7l-61.4-48H67.5zM224 96c61.9 0 112 50.1 112 112 0 .2-.1.4-.1.6 0 16.8 1.2 31.8 2.8 45.7l59.5 46.5c-8.3-22.1-14.3-51.5-14.3-92.9 0-77.7-54.5-139.9-127.9-155.2V32c0-17.7-14.3-32-32-32s-32 14.3-32 32v20.8c-26 5.4-49.4 16.9-69.1 32.7l38.2 29.8C179 103.2 200.6 96 224 96zm0 416c35.3 0 64-28.6 64-64H160c0 35.4 28.7 64 64 64z"/>
   </symbol>
-  <!-- "Discourse Comment" is a Discourse derivative of https://fontawesome.com/icons/comment?style=regular that has been built to be a bit more legible at small sizes -->
-  <symbol id='discourse-comment' viewBox="0 0 550 512">
-    <path d="M26 479.3c-7.5 0-14.8-3.3-19.8-9.2-6.5-7.6-8-18.3-4-27.4l54.6-123.2c-17-28.9-23.2-66.1-18.6-110.7C44.6 146.2 77.8 90.2 131.6 51 184.4 12.4 251.1-5.2 319.2 1.3c72.8 7 139.6 41.5 183.3 94.9 38.4 46.8 56.3 104.4 50.3 162-6.5 62.5-39.6 118.5-93.4 157.7-45.7 33.3-101.7 51-160 51-9.2 0-18.4-.4-27.6-1.3-32.8-3.1-64.2-11.7-93.4-25.4L32.6 478.4c-2.2.6-4.4.9-6.6.9zm155.2-92.7c4.1 0 8.2 1 11.9 2.9 25.9 13.4 54 21.6 83.6 24.4 7.5.7 15 1.1 22.5 1.1 104 0 192.3-69.1 201.9-162 4.5-43.8-9.3-87.7-38.8-123.7-35-42.7-89-70.4-148-76.1-113.5-10.9-214.1 61.4-224.4 161-3.9 38.1 1.8 67.3 17 86.9 5.9 7.6 7.1 17.7 3.2 26.5l-38.5 87 102.9-27c2.3-.7 4.5-1 6.7-1z"/>
-  </symbol>
-  <symbol id='discourse-no-entry' viewBox="0 0 496 496">
-    <path d="M248 0C111 0 0 111 0 248s111 248 248 248 248-111 248-248S385 0 248 0zm161.3 299.9H86.6c-11.4 0-20.6-10.1-20.6-22.5v-58.7c0-12.4 9.2-22.5 20.6-22.5h322.5c11.4 0 20.7 10.2 20.7 22.7v58.5c.1 12.4-9.1 22.5-20.5 22.5z"/>
-  </symbol>
 </svg>

From 8c1e008c5977192919894390bb83d8c7fa240a08 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Sat, 25 Apr 2020 13:20:04 +1000
Subject: [PATCH 0784/1830] DEV: Skip erratic spec for now

Spec fails intermittently due to CDN state.
---
 spec/components/cooked_post_processor_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 94d87ce0b0..47262f1342 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -552,7 +552,8 @@ describe CookedPostProcessor do
               upload.update(secure: true, access_control_post: post)
             end
 
-            it "handles secure images with the correct lightbox link href" do
+            # TODO fix this spec, it is sometimes getting CDN links when it runs concurrently
+            xit "handles secure images with the correct lightbox link href" do
               cpp.post_process
 
               expect(cpp.html).to match_html cooked_html

From 3de901e38df15c745956b503c4bfc2da754205d1 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Sat, 25 Apr 2020 13:29:45 +1000
Subject: [PATCH 0785/1830] DEV: correct missing file from revert

Test did not revert cleanly. Corrected.
---
 test/javascripts/widgets/topic-status-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/widgets/topic-status-test.js b/test/javascripts/widgets/topic-status-test.js
index 5cc6f9d437..c5888d4aa4 100644
--- a/test/javascripts/widgets/topic-status-test.js
+++ b/test/javascripts/widgets/topic-status-test.js
@@ -12,7 +12,7 @@ widgetTest("basics", {
     });
   },
   test(assert) {
-    assert.ok(find(".topic-status .d-icon-discourse-comment-slash").length);
+    assert.ok(find(".topic-status .d-icon-lock").length);
   }
 });
 

From 0ae504aece5fdcf6187cdde82b1c819fbd67a2b8 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Sat, 25 Apr 2020 11:47:22 +0300
Subject: [PATCH 0786/1830] FIX: Raise a 4xx error instead of a 5xx if draft
 data is invalid

---
 app/controllers/draft_controller.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/controllers/draft_controller.rb b/app/controllers/draft_controller.rb
index d3cc2b731d..22cedd3836 100644
--- a/app/controllers/draft_controller.rb
+++ b/app/controllers/draft_controller.rb
@@ -51,7 +51,13 @@ class DraftController < ApplicationController
 
     json = success_json.merge(draft_sequence: sequence)
 
-    if data = JSON::parse(params[:data])
+    begin
+      data = JSON::parse(params[:data])
+    rescue JSON::ParserError
+      raise Discourse::InvalidParameters.new(:data)
+    end
+
+    if data.present?
       # this is a bit of a kludge we need to remove (all the parsing) too many special cases here
       # we need to catch action edit and action editSharedDraft
       if data["postId"].present? && data["originalText"].present? && data["action"].to_s.start_with?("edit")

From e0aec238443d95fa387e62d46ca674e7bb10a744 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Sun, 26 Apr 2020 22:18:44 +0200
Subject: [PATCH 0787/1830] DEV: Don't warn about valid data

---
 app/jobs/onceoff/migrate_url_site_settings.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/jobs/onceoff/migrate_url_site_settings.rb b/app/jobs/onceoff/migrate_url_site_settings.rb
index 89ca6e67b7..7f0bb37d1e 100644
--- a/app/jobs/onceoff/migrate_url_site_settings.rb
+++ b/app/jobs/onceoff/migrate_url_site_settings.rb
@@ -17,11 +17,9 @@ module Jobs
 
     def execute_onceoff(args)
       SETTINGS.each do |old_setting, new_setting|
+        upload = SiteSetting.get(new_setting)
 
-        if (upload = SiteSetting.get(new_setting)) && upload.id >= Upload::SEEDED_ID_THRESHOLD
-          logger.warn("Skipping migration of the Site Setting #{new_setting} to url cause upload #{upload} already exists for it")
-          next
-        end
+        next if upload && upload.id >= Upload::SEEDED_ID_THRESHOLD
 
         old_url = DB.query_single(
           "SELECT value FROM site_settings WHERE name = '#{old_setting}'"

From 16f0d1c503ea06148d66748c015ee381eb309e80 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 27 Apr 2020 11:50:21 +0800
Subject: [PATCH 0788/1830] PERF: Remove database query when publishing to
 staff users.

---
 app/jobs/regular/backup_chunks_merger.rb | 2 +-
 app/jobs/regular/emit_web_hook_event.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/jobs/regular/backup_chunks_merger.rb b/app/jobs/regular/backup_chunks_merger.rb
index 5deb37f333..aa359711ac 100644
--- a/app/jobs/regular/backup_chunks_merger.rb
+++ b/app/jobs/regular/backup_chunks_merger.rb
@@ -32,7 +32,7 @@ module Jobs
       # push an updated list to the clients
       store = BackupRestore::BackupStore.create
       data = ActiveModel::ArraySerializer.new(store.files, each_serializer: BackupFileSerializer).as_json
-      MessageBus.publish("/admin/backups", data, user_ids: User.staff.pluck(:id))
+      MessageBus.publish("/admin/backups", data, group_ids: [Group::AUTO_GROUPS[:staff]])
     end
 
   end
diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb
index 57ee27f2ce..3c7fc3414c 100644
--- a/app/jobs/regular/emit_web_hook_event.rb
+++ b/app/jobs/regular/emit_web_hook_event.rb
@@ -103,7 +103,7 @@ module Jobs
       MessageBus.publish("/web_hook_events/#{@web_hook.id}", {
         web_hook_event_id: web_hook_event.id,
         event_type: @arguments[:event_type]
-      }, user_ids: User.human_users.staff.pluck(:id))
+      }, group_ids: [Group::AUTO_GROUPS[:staff]])
     end
 
     def ping_event?(event_type)

From e0725fd12349dc654002935bfb5e7492f83b15d5 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 27 Apr 2020 11:43:00 +0800
Subject: [PATCH 0789/1830] Upgrade message_bus to 3.0.0

Fixes an issue where specifying `group_ids` and `user_ids` while
publishing a message would result in an intersection between both
options.
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d2e598e011..2c11ad1ac3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -182,7 +182,7 @@ GEM
       mini_mime (>= 0.1.1)
     maxminddb (0.1.22)
     memory_profiler (0.9.14)
-    message_bus (2.2.4)
+    message_bus (3.0.0)
       rack (>= 1.1.3)
     method_source (0.9.2)
     mini_mime (1.0.2)

From 76fc48b3184a05cdd74881707d49c4cac5a288e4 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 27 Apr 2020 13:01:43 +0800
Subject: [PATCH 0790/1830] DEV: Avoid an additional query in `SpamHandler`.

* Also run query against human users only
---
 lib/spam_handler.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/spam_handler.rb b/lib/spam_handler.rb
index 77e189fb64..2071c079bb 100644
--- a/lib/spam_handler.rb
+++ b/lib/spam_handler.rb
@@ -11,8 +11,7 @@ class SpamHandler
 
     return false if tl2_plus_accounts_with_same_ip > 0
 
-    staff_user_ids = Group[:staff].user_ids - [-1]
-    staff_members_with_same_ip = User.where(id: staff_user_ids)
+    staff_members_with_same_ip = Group[:staff].users.human_users
       .where(ip_address: ip_address.to_s)
       .count
 

From 4c3a01f58df6e4f4b21671ae7d756f639fa6205a Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 27 Apr 2020 11:43:31 +0530
Subject: [PATCH 0791/1830] FIX: use absolute URL for YouTube thumbnail images.

---
 plugins/lazy-yt/assets/javascripts/lazyYT.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/lazy-yt/assets/javascripts/lazyYT.js b/plugins/lazy-yt/assets/javascripts/lazyYT.js
index 10673ebd13..f62cb7ad2f 100644
--- a/plugins/lazy-yt/assets/javascripts/lazyYT.js
+++ b/plugins/lazy-yt/assets/javascripts/lazyYT.js
@@ -98,7 +98,7 @@
     }
 
     $thumb = $el.find('.ytp-thumbnail').css({
-      'background-image': ['url(//img.youtube.com/vi/', id, '/', thumb_img, ')'].join('')
+      'background-image': `url(http://img.youtube.com/vi/${id}/${thumb_img})`
     })
     .addClass('lazyYT-image-loaded')
     .on('click', function (e) {

From ec84b00aff7fd9a7d6607cb21fd4745bb4aac5e3 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 27 Apr 2020 11:57:10 +0530
Subject: [PATCH 0792/1830] fix the build.

---
 plugins/lazy-yt/assets/javascripts/lazyYT.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/lazy-yt/assets/javascripts/lazyYT.js b/plugins/lazy-yt/assets/javascripts/lazyYT.js
index f62cb7ad2f..897c15497d 100644
--- a/plugins/lazy-yt/assets/javascripts/lazyYT.js
+++ b/plugins/lazy-yt/assets/javascripts/lazyYT.js
@@ -98,7 +98,7 @@
     }
 
     $thumb = $el.find('.ytp-thumbnail').css({
-      'background-image': `url(http://img.youtube.com/vi/${id}/${thumb_img})`
+      'background-image': ['url(https://img.youtube.com/vi/', id, '/', thumb_img, ')'].join('')
     })
     .addClass('lazyYT-image-loaded')
     .on('click', function (e) {

From 6e01acb3cbe1fccb79e7817b6a50f3070331d459 Mon Sep 17 00:00:00 2001
From: Benno <blueworrybear@gmail.com>
Date: Mon, 27 Apr 2020 22:35:27 +0800
Subject: [PATCH 0793/1830] FIX: Apply category priority for empty query
 (#9516)

---
 lib/search.rb                           | 28 ++++++++++-
 spec/requests/search_controller_spec.rb | 64 +++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/lib/search.rb b/lib/search.rb
index ead773d097..e1c6509c42 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -904,13 +904,37 @@ class Search
         posts = categories_ignored(posts) unless @category_filter_matched
         posts
       end
-
-    if @order == :latest || (@term.blank? && !@order)
+    if @order == :latest
       if opts[:aggregate_search]
         posts = posts.order("MAX(posts.created_at) DESC")
       else
         posts = posts.reorder("posts.created_at DESC")
       end
+    elsif @term.blank? && !@order
+      data_ranking = <<~SQL
+      (
+        CASE categories.search_priority
+        WHEN #{Searchable::PRIORITIES[:very_low]}
+        THEN #{SiteSetting.category_search_priority_very_low_weight}
+        WHEN #{Searchable::PRIORITIES[:low]}
+        THEN #{SiteSetting.category_search_priority_low_weight}
+        WHEN #{Searchable::PRIORITIES[:high]}
+        THEN #{SiteSetting.category_search_priority_high_weight}
+        WHEN #{Searchable::PRIORITIES[:very_high]}
+        THEN #{SiteSetting.category_search_priority_very_high_weight}
+        ELSE
+          CASE WHEN topics.closed
+          THEN 0.9
+          ELSE 1
+          END
+        END
+      )
+      SQL
+      if opts[:aggregate_search]
+        posts = posts.order("MAX(#{data_ranking}) DESC").order("MAX(posts.created_at) DESC")
+      else
+        posts = posts.order("#{data_ranking} DESC").order("posts.created_at DESC")
+      end
     elsif @order == :latest_topic
       if opts[:aggregate_search]
         posts = posts.order("MAX(topics.created_at) DESC")
diff --git a/spec/requests/search_controller_spec.rb b/spec/requests/search_controller_spec.rb
index 822ede7a0d..d1d8fff353 100644
--- a/spec/requests/search_controller_spec.rb
+++ b/spec/requests/search_controller_spec.rb
@@ -219,6 +219,70 @@ describe SearchController do
     end
   end
 
+  context "search priority" do
+    fab!(:low_priority_category) do
+      Fabricate(
+        :category,
+        search_priority: Searchable::PRIORITIES[:very_low]
+      )
+    end
+    fab!(:high_priority_category) do
+      Fabricate(
+        :category,
+        search_priority: Searchable::PRIORITIES[:high]
+      )
+    end
+    fab!(:very_high_priority_category) do
+      Fabricate(
+        :category,
+        search_priority: Searchable::PRIORITIES[:very_high]
+      )
+    end
+    fab!(:low_priority_topic) { Fabricate(:topic, category: low_priority_category) }
+    fab!(:high_priority_topic) { Fabricate(:topic, category: high_priority_category) }
+    fab!(:very_high_priority_topic) { Fabricate(:topic, category: very_high_priority_category) }
+    fab!(:low_priority_post) do
+      SearchIndexer.enable
+      Fabricate(:post, topic: low_priority_topic, raw: "This is a Low Priority Post")
+    end
+    fab!(:hight_priority_post) do
+      SearchIndexer.enable
+      Fabricate(:post, topic: high_priority_topic, raw: "This is a High Priority Post")
+    end
+    fab!(:old_very_hight_priority_post) do
+      SearchIndexer.enable
+      Fabricate(:old_post, topic: very_high_priority_topic, raw: "This is a Old but Very High Priority Post")
+    end
+
+    it "sort posts with search priority when search term is empty" do
+      get "/search.json", params: { q: 'status:open' }
+      expect(response.status).to eq(200)
+      data = JSON.parse(response.body)
+      post1 = data["posts"].find { |e| e["id"] == old_very_hight_priority_post.id }
+      post2 = data["posts"].find { |e| e["id"] == low_priority_post.id }
+      expect(data["posts"][0]["id"]).to eq(old_very_hight_priority_post.id)
+      expect(post1["id"]).to be > post2["id"]
+    end
+
+    it "sort posts with search priority when no order query" do
+      get "/search.json", params: { q: 'status:open Priority Post' }
+      expect(response.status).to eq(200)
+      data = JSON.parse(response.body)
+      expect(data["posts"][0]["id"]).to eq(old_very_hight_priority_post.id)
+      expect(data["posts"][1]["id"]).to eq(hight_priority_post.id)
+      expect(data["posts"][2]["id"]).to eq(low_priority_post.id)
+    end
+
+    it "doesn't sort posts with search piority when query with order" do
+      get "/search.json", params: { q: 'status:open order:latest Priority Post' }
+      expect(response.status).to eq(200)
+      data = JSON.parse(response.body)
+      expect(data["posts"][0]["id"]).to eq(hight_priority_post.id)
+      expect(data["posts"][1]["id"]).to eq(low_priority_post.id)
+      expect(data["posts"][2]["id"]).to eq(old_very_hight_priority_post.id)
+    end
+  end
+
   context "search context" do
     it "raises an error with an invalid context type" do
       get "/search/query.json", params: {

From f95609ae23ce1604b5f53c9d232e66895cfc9ee7 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 27 Apr 2020 15:56:29 +0100
Subject: [PATCH 0794/1830] FIX: Add additional checks for automatic theme
 script CSP

- Skip absolute URLs
- Skip CDN URLs
- Skip invalid URLs
- Properly format protocol-less URLs
---
 lib/content_security_policy/extension.rb | 13 ++++++++++++-
 spec/lib/content_security_policy_spec.rb | 12 +++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/lib/content_security_policy/extension.rb b/lib/content_security_policy/extension.rb
index f7b49b2307..4c8231b60a 100644
--- a/lib/content_security_policy/extension.rb
+++ b/lib/content_security_policy/extension.rb
@@ -62,7 +62,18 @@ class ContentSecurityPolicy
       html_fields.each(&:ensure_baked!)
       doc = html_fields.map(&:value_baked).join("\n")
       Nokogiri::HTML.fragment(doc).css('script[src]').each do |node|
-        auto_script_src_extension[:script_src] << node['src']
+        src = node['src']
+        uri = URI(src)
+
+        next if GlobalSetting.cdn_url && src.starts_with?(GlobalSetting.cdn_url) # Ignore CDN urls (theme-javascripts)
+        next if uri.host.nil? # Ignore same-domain scripts (theme-javascripts)
+        next if uri.path.nil? # Ignore raw hosts
+
+        uri_string = uri.to_s.sub(/^\/\//, '') # Protocol-less CSP should not have // at beginning of URL
+
+        auto_script_src_extension[:script_src] << uri_string
+      rescue URI::Error
+        # Ignore invalid URI
       end
 
       extensions << auto_script_src_extension
diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index d9eb9788c2..168887cd47 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -216,10 +216,20 @@ describe ContentSecurityPolicy do
     it 'is extended automatically when themes reference external scripts' do
       policy # call this first to make sure further actions clear the cache
 
-      theme.set_field(target: :common, name: "header", value: "<script src='https://example.com/myscript.js'/>")
+      theme.set_field(target: :common, name: "header", value: <<~SCRIPT)
+        <script src='https://example.com/myscript.js'/>
+        <script src='//example2.com/protocol-less-script.js'/>
+        <script src='domain-only.com'/>
+        <script>console.log('inline script')</script>
+      SCRIPT
+
+      theme.set_field(target: :desktop, name: "header", value: "")
       theme.save!
 
       expect(parse(theme_policy)['script-src']).to include('https://example.com/myscript.js')
+      expect(parse(theme_policy)['script-src']).to include('example2.com/protocol-less-script.js')
+      expect(parse(theme_policy)['script-src']).not_to include('domain-only.com')
+      expect(parse(theme_policy)['script-src']).not_to include(a_string_matching /^\/theme-javascripts/)
 
       theme.destroy!
 

From fb20b570577edb2d9a27079a0eb4fbb2fd1cc82b Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 27 Apr 2020 17:54:07 +0200
Subject: [PATCH 0795/1830] DEV: Re-enable "remove featured link" test (#9550)

It was disabled in ac4b4e30dcb6334812fb6c8100776f5abf00b210
---
 test/javascripts/acceptance/topic-test.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/javascripts/acceptance/topic-test.js b/test/javascripts/acceptance/topic-test.js
index b7edc5cc95..94f3165dc9 100644
--- a/test/javascripts/acceptance/topic-test.js
+++ b/test/javascripts/acceptance/topic-test.js
@@ -248,10 +248,9 @@ QUnit.test("remove featured link", async assert => {
     "link to remove featured link"
   );
 
-  // this test only works in a browser:
-  // await click('.title-wrapper .remove-featured-link');
-  // await click('.title-wrapper .submit-edit');
-  // assert.ok(!exists('.title-wrapper .topic-featured-link'), 'link is gone');
+  await click('.title-wrapper .remove-featured-link');
+  await click('.title-wrapper .submit-edit');
+  assert.ok(!exists('.title-wrapper .topic-featured-link'), 'link is gone');
 });
 
 QUnit.test("Converting to a public topic", async assert => {

From f15fc0ebf3152c3d59b5af5a66487c4685c71e89 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Apr 2020 12:50:03 -0400
Subject: [PATCH 0796/1830] Build(deps): Bump unicorn from 5.5.4 to 5.5.5
 (#9552)

Bumps [unicorn](https://yhbt.net/unicorn/) from 5.5.4 to 5.5.5.

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 2c11ad1ac3..5dfc93ffc2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -405,7 +405,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
-    unicorn (5.5.4)
+    unicorn (5.5.5)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.13.0)

From 056327c0c934e3d91ecb98c2cc1c4a6451494163 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 27 Apr 2020 13:28:10 -0400
Subject: [PATCH 0797/1830] DEV: Move `discourse.js` to `app/app.js` (#9545)

This is another thing to get our application in line with what Ember CLI
expects.
---
 app/assets/javascripts/application.js                    | 2 +-
 app/assets/javascripts/deprecated.js                     | 2 +-
 app/assets/javascripts/discourse-loader.js               | 8 ++++++++
 .../javascripts/{discourse.js => discourse/app/app.js}   | 0
 .../app/pre-initializers/inject-discourse-objects.js     | 2 +-
 config/application.rb                                    | 9 ++++++++-
 lib/discourse_js_processor.rb                            | 1 -
 7 files changed, 19 insertions(+), 5 deletions(-)
 rename app/assets/javascripts/{discourse.js => discourse/app/app.js} (100%)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 954df932a1..67722ed0d8 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -5,7 +5,7 @@
 //= require ./ember-addons/fmt
 //= require ./polyfills
 //= require_tree ./select-kit
-//= require ./discourse
+//= require ./discourse/app/app
 //= require ./deprecated
 
 // Stuff we need to load first
diff --git a/app/assets/javascripts/deprecated.js b/app/assets/javascripts/deprecated.js
index b660024fec..4ac91b826a 100644
--- a/app/assets/javascripts/deprecated.js
+++ b/app/assets/javascripts/deprecated.js
@@ -1,4 +1,4 @@
 // ensure Discourse is added as a global
 (function() {
-  window.Discourse = requirejs("discourse").default;
+  window.Discourse = requirejs("discourse/app").default;
 })();
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 7908ab90c5..bafa10820a 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -263,6 +263,14 @@ var define, requirejs;
   function requireFrom(name, origin) {
     name = transformForAliases(name);
 
+    if (name === "discourse") {
+      // eslint-disable-next-line no-console
+      console.log(
+        "discourse has been moved to `discourse/app` - please update your code"
+      );
+      name = "discourse/app";
+    }
+
     if (name === "discourse/models/input-validation") {
       // eslint-disable-next-line no-console
       console.log(
diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse/app/app.js
similarity index 100%
rename from app/assets/javascripts/discourse.js
rename to app/assets/javascripts/discourse/app/app.js
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
index 924e6f6a50..5838720414 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
@@ -2,7 +2,7 @@ import Session from "discourse/models/session";
 import KeyValueStore from "discourse/lib/key-value-store";
 import Store from "discourse/models/store";
 import DiscourseLocation from "discourse/lib/discourse-location";
-import Discourse from "discourse";
+import Discourse from "discourse/app";
 import SearchService from "discourse/services/search";
 import TopicTrackingState, {
   startTracking
diff --git a/config/application.rb b/config/application.rb
index 4afdad9292..6bd11004ae 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -324,7 +324,14 @@ module Discourse
 
         ActionView::Base.precompiled_asset_checker = -> logical_path do
           default_checker[logical_path] ||
-            %w{qunit.js qunit.css test_helper.css test_helper.js wizard/test/test_helper.js}.include?(logical_path)
+            %w{qunit.js
+              qunit.css
+              test_helper.css
+              test_helper.js
+              wizard/test/test_helper.js
+            }.include?(logical_path) ||
+            logical_path =~ /\/node_modules/ ||
+            logical_path =~ /\/dist/
         end
       end
     end
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index e9735d3eea..015fb948a7 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -52,7 +52,6 @@ class DiscourseJsProcessor
       preload-application-data
       wizard-start
       onpopstate-handler
-      discourse
       google-tag-manager
       google-universal-analytics
       activate-account

From d8c884a8560f82d78aa5cb566ff17175c91b15d3 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 27 Apr 2020 12:42:13 -0500
Subject: [PATCH 0798/1830] DEV: Add has_many category_tag_stats in tag.rb
 (#9558)

---
 app/models/tag.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/tag.rb b/app/models/tag.rb
index 2d695c3521..825b90d8ad 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -28,6 +28,7 @@ class Tag < ActiveRecord::Base
   has_many :topic_tags, dependent: :destroy
   has_many :topics, through: :topic_tags
 
+  has_many :category_tag_stats, dependent: :destroy
   has_many :category_tags, dependent: :destroy
   has_many :categories, through: :category_tags
 

From 394babcae36b986ee655426e9c055300d05005d9 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Mon, 27 Apr 2020 14:51:25 -0300
Subject: [PATCH 0799/1830] FIX: Only show the review page to users that can
 see it. Do not publish the reviewable count update message to everyone.
 (#9556)

---
 app/controllers/reviewables_controller.rb     |  4 ++
 app/jobs/regular/notify_reviewable.rb         |  2 +
 lib/guardian/user_guardian.rb                 | 10 ++++
 .../components/guardian/user_guardian_spec.rb | 46 +++++++++++++++++++
 spec/jobs/notify_reviewable_spec.rb           | 11 +++++
 spec/requests/reviewables_controller_spec.rb  |  2 +-
 6 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/app/controllers/reviewables_controller.rb b/app/controllers/reviewables_controller.rb
index 3861998812..c0312daa70 100644
--- a/app/controllers/reviewables_controller.rb
+++ b/app/controllers/reviewables_controller.rb
@@ -6,6 +6,7 @@ class ReviewablesController < ApplicationController
   PER_PAGE = 10
 
   before_action :version_required, only: [:update, :perform]
+  before_action :ensure_can_see
 
   def index
     offset = params[:offset].to_i
@@ -260,4 +261,7 @@ protected
     }
   end
 
+  def ensure_can_see
+    Guardian.new(current_user).ensure_can_see_review_queue!
+  end
 end
diff --git a/app/jobs/regular/notify_reviewable.rb b/app/jobs/regular/notify_reviewable.rb
index 589b09510e..95fef84cd2 100644
--- a/app/jobs/regular/notify_reviewable.rb
+++ b/app/jobs/regular/notify_reviewable.rb
@@ -48,6 +48,8 @@ protected
   end
 
   def notify(count, user_ids)
+    return if user_ids.blank?
+
     data = { reviewable_count: count }
     MessageBus.publish("/reviewable_counts", data, user_ids: user_ids)
     @contacted += user_ids
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index d8b65e1407..4ee12fe6ea 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -144,4 +144,14 @@ module UserGuardian
     return false if topic.read_restricted_category? || topic.private_message?
     true
   end
+
+  def can_see_review_queue?
+    is_staff? || (
+      SiteSetting.enable_category_group_review &&
+      Reviewable
+        .where(reviewable_by_group_id: @user.group_users.pluck(:group_id))
+        .where('category_id IS NULL or category_id IN (?)', allowed_category_ids)
+        .exists?
+    )
+  end
 end
diff --git a/spec/components/guardian/user_guardian_spec.rb b/spec/components/guardian/user_guardian_spec.rb
index e870843549..b25f563e01 100644
--- a/spec/components/guardian/user_guardian_spec.rb
+++ b/spec/components/guardian/user_guardian_spec.rb
@@ -341,4 +341,50 @@ describe UserGuardian do
       include_examples "can_delete_user staff examples"
     end
   end
+
+  describe "#can_see_review_queue?" do
+    it 'returns true when the user is a staff member' do
+      guardian = Guardian.new(moderator)
+      expect(guardian.can_see_review_queue?).to eq(true)
+    end
+
+    it 'returns false for a regular user' do
+      guardian = Guardian.new(user)
+      expect(guardian.can_see_review_queue?).to eq(false)
+    end
+
+    it "returns true when the user's group can review an item in the queue" do
+      group = Fabricate(:group)
+      group.add(user)
+      guardian = Guardian.new(user)
+      SiteSetting.enable_category_group_review = true
+
+      Fabricate(:reviewable_flagged_post, reviewable_by_group: group, category: nil)
+
+      expect(guardian.can_see_review_queue?).to eq(true)
+    end
+
+    it 'returns false if category group review is disabled' do
+      group = Fabricate(:group)
+      group.add(user)
+      guardian = Guardian.new(user)
+      SiteSetting.enable_category_group_review = false
+
+      Fabricate(:reviewable_flagged_post, reviewable_by_group: group, category: nil)
+
+      expect(guardian.can_see_review_queue?).to eq(false)
+    end
+
+    it 'returns false if the reviewable is under a read restricted category' do
+      group = Fabricate(:group)
+      group.add(user)
+      guardian = Guardian.new(user)
+      SiteSetting.enable_category_group_review = true
+      category = Fabricate(:category, read_restricted: true)
+
+      Fabricate(:reviewable_flagged_post, reviewable_by_group: group, category: category)
+
+      expect(guardian.can_see_review_queue?).to eq(false)
+    end
+  end
 end
diff --git a/spec/jobs/notify_reviewable_spec.rb b/spec/jobs/notify_reviewable_spec.rb
index d4d9691591..5d8702dbd5 100644
--- a/spec/jobs/notify_reviewable_spec.rb
+++ b/spec/jobs/notify_reviewable_spec.rb
@@ -102,4 +102,15 @@ describe Jobs::NotifyReviewable do
       expect(group_msg.data[:reviewable_count]).to eq(0)
     end
   end
+
+  it 'skips sending notifications if user_ids is empty' do
+    reviewable = Fabricate(:reviewable, reviewable_by_moderator: true)
+    regular_user = Fabricate(:user)
+
+    messages = MessageBus.track_publish("/reviewable_counts") do
+      described_class.new.execute(reviewable_id: reviewable.id)
+    end
+
+    expect(messages.size).to eq(1)
+  end
 end
diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rb
index 3763b725e9..b89af08df5 100644
--- a/spec/requests/reviewables_controller_spec.rb
+++ b/spec/requests/reviewables_controller_spec.rb
@@ -590,7 +590,7 @@ describe ReviewablesController do
     end
 
     context "#destroy" do
-      fab!(:user) { Fabricate(:user) }
+      fab!(:user) { Fabricate(:admin) }
 
       before do
         sign_in(user)

From d38b2e508eb1658a106201612738d0f8c92f0087 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 27 Apr 2020 14:37:07 -0400
Subject: [PATCH 0800/1830] Ignore files that will be used with Ember CLI

---
 .gitignore | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 59ad3c0b6f..d9881098bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,7 +122,7 @@ vendor/bundle/*
 *.swn
 
 # ignore nodejs files
-/node_modules
+node_modules
 /package-lock.json
 
 /vendor/data/GeoLite2-City.mmdb
@@ -132,3 +132,6 @@ vendor/bundle/*
 
 # ignore auto-generated plugin js assets
 /app/assets/javascripts/plugins/*
+
+# ember-cli generated
+dist

From 01f2819ddec1f0291cbe67bbfa76d41146a986aa Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 27 Apr 2020 20:55:36 +0200
Subject: [PATCH 0801/1830] DEV: enables and fixes multisite-spec (#9557)

---
 spec/integration/multisite_spec.rb | 130 ++++++++++++++---------------
 1 file changed, 63 insertions(+), 67 deletions(-)

diff --git a/spec/integration/multisite_spec.rb b/spec/integration/multisite_spec.rb
index 4646cab066..4aa8af580e 100644
--- a/spec/integration/multisite_spec.rb
+++ b/spec/integration/multisite_spec.rb
@@ -1,69 +1,65 @@
 # frozen_string_literal: true
 
-# require 'rails_helper'
-#
-# describe 'multisite' do
-#
-#   class DBNameMiddleware
-#     def initialize(app, config = {})
-#       @app = app
-#     end
-#
-#     def call(env)
-#       # note current_db is already being ruined on boot cause its not multisite
-#       [200, {}, [RailsMultisite::ConnectionManagement.current_hostname]]
-#     end
-#   end
-#
-#   let :session do
-#     RailsMultisite::ConnectionManagement.config_filename = "spec/fixtures/multisite/two_dbs.yml"
-#     RailsMultisite::ConnectionManagement.load_settings!
-#
-#     stack = ActionDispatch::MiddlewareStack.new
-#     stack.use RailsMultisite::ConnectionManagement, RailsMultisite::DiscoursePatches.config
-#     stack.use DBNameMiddleware
-#
-#     routes = ActionDispatch::Routing::RouteSet.new
-#     stack.build(routes)
-#   end
-#
-#   it "should always allow /srv/status through" do
-#     headers = {
-#       "HTTP_HOST" => "unknown.com",
-#       "REQUEST_METHOD" => "GET",
-#       "PATH_INFO" => "/srv/status",
-#       "rack.input" => StringIO.new
-#     }
-#
-#     code, _, body = session.call(headers)
-#     expect(code).to eq(200)
-#     expect(body.join).to eq("test.localhost")
-#   end
-#
-#   it "should 404 on unknown routes" do
-#     headers = {
-#       "HTTP_HOST" => "unknown.com",
-#       "REQUEST_METHOD" => "GET",
-#       "PATH_INFO" => "/topics",
-#       "rack.input" => StringIO.new
-#     }
-#
-#     code, _ = session.call(headers)
-#     expect(code).to eq(404)
-#   end
-#
-#   it "should hit correct site elsewise" do
-#
-#     headers = {
-#       "HTTP_HOST" => "test2.localhost",
-#       "REQUEST_METHOD" => "GET",
-#       "PATH_INFO" => "/topics",
-#       "rack.input" => StringIO.new
-#     }
-#
-#     code, _, body = session.call(headers)
-#     expect(code).to eq(200)
-#     expect(body.join).to eq("test2.localhost")
-#   end
-#
-# end
+require 'rails_helper'
+
+describe 'multisite', type: :multisite do
+  class DBNameMiddleware
+    def initialize(app, config = {})
+      @app = app
+    end
+
+    def call(env)
+      # note current_db is already being ruined on boot cause its not multisite
+      [200, {}, [RailsMultisite::ConnectionManagement.current_hostname]]
+    end
+  end
+
+  let :session do
+    stack = ActionDispatch::MiddlewareStack.new
+    stack.use RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config
+    stack.use DBNameMiddleware
+
+    routes = ActionDispatch::Routing::RouteSet.new
+    stack.build(routes)
+  end
+
+  it "should always allow /srv/status through" do
+    headers = {
+      "HTTP_HOST" => "unknown.com",
+      "REQUEST_METHOD" => "GET",
+      "PATH_INFO" => "/srv/status",
+      "rack.input" => StringIO.new
+    }
+
+    code, _, body = session.call(headers)
+    expect(code).to eq(200)
+    expect(body.join).to eq("test.localhost")
+  end
+
+  it "should 404 on unknown routes" do
+    headers = {
+      "HTTP_HOST" => "unknown.com",
+      "REQUEST_METHOD" => "GET",
+      "PATH_INFO" => "/topics",
+      "rack.input" => StringIO.new
+    }
+
+    code, _ = session.call(headers)
+    expect(code).to eq(404)
+  end
+
+  it "should hit correct site elsewise" do
+
+    headers = {
+      "HTTP_HOST" => "test2.localhost",
+      "REQUEST_METHOD" => "GET",
+      "PATH_INFO" => "/topics",
+      "rack.input" => StringIO.new
+    }
+
+    code, _, body = session.call(headers)
+    expect(code).to eq(200)
+    expect(body.join).to eq("test2.localhost")
+  end
+
+end

From e92a54f681ac979661c5c056f3c06710720e95cf Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Apr 2020 16:08:31 -0400
Subject: [PATCH 0802/1830] Build(deps): Bump aws-sigv4 from 1.1.2 to 1.1.3
 (#9560)

Bumps [aws-sigv4](https://github.com/aws/aws-sdk-ruby) from 1.1.2 to 1.1.3.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sigv4/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.1.2...1.1.3)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 5dfc93ffc2..1be34d465f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -61,7 +61,7 @@ GEM
     aws-sdk-sns (1.22.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.2)
+    aws-sigv4 (1.1.3)
       aws-eventstream (~> 1.0, >= 1.0.2)
     barber (0.12.2)
       ember-source (>= 1.0, < 3.1)

From 051e6be7b8e856eb6cef1ce54b097a00ababf45f Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 27 Apr 2020 15:13:34 -0500
Subject: [PATCH 0803/1830] DEV: Trigger 'user_added_to_group' when accepting
 invite with groups (#9561)

---
 app/models/invite_redeemer.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index 172e06f3a7..d4e9392f93 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -124,6 +124,7 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
     new_group_ids = invite.groups.pluck(:id) - invited_user.group_users.pluck(:group_id)
     new_group_ids.each do |id|
       invited_user.group_users.create(group_id: id)
+      DiscourseEvent.trigger(:user_added_to_group, invited_user, Group.find_by(id: id), automatic: false)
     end
   end
 

From a93ef2926de8be4f7b9d1d152f239d954b8e2860 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Mon, 27 Apr 2020 16:40:07 -0600
Subject: [PATCH 0804/1830] DEV: Add rswag to aid in api documention (#9546)

Adding in rswag will allow us to write spec files to document and test
our api.
---
 .gitignore                           |  5 +-
 .rubocop.yml                         |  2 +
 Gemfile                              |  2 +
 Gemfile.lock                         |  7 +++
 spec/requests/api/categories_spec.rb | 73 ++++++++++++++++++++++++++++
 spec/swagger_helper.rb               | 43 ++++++++++++++++
 6 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 spec/requests/api/categories_spec.rb
 create mode 100644 spec/swagger_helper.rb

diff --git a/.gitignore b/.gitignore
index d9881098bd..bc22f48bbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -133,5 +133,8 @@ node_modules
 # ignore auto-generated plugin js assets
 /app/assets/javascripts/plugins/*
 
+# ignore generated api documentation files
+openapi/*
+
 # ember-cli generated
-dist
+dist
\ No newline at end of file
diff --git a/.rubocop.yml b/.rubocop.yml
index f389e688ca..0cb02e3e97 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -179,6 +179,8 @@ RSpec/DescribedClassModuleWrapping:
 
 RSpec/EmptyExampleGroup:
   Enabled: true
+  Exclude:
+    - 'spec/requests/api/*'
 
 RSpec/EmptyLineAfterExample:
   Enabled: false # TODO
diff --git a/Gemfile b/Gemfile
index c440694fff..925f81b86a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -179,6 +179,8 @@ group :test, :development do
   gem "rubocop-discourse", require: false
   gem "rubocop-rspec", require: false
   gem 'parallel_tests'
+
+  gem 'rswag-specs'
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 1be34d465f..20306d3532 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -158,6 +158,8 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.3.0)
+    json-schema (2.8.1)
+      addressable (>= 2.4)
     jwt (2.2.1)
     kgio (2.11.3)
     libv8 (7.3.492.27.1)
@@ -337,6 +339,10 @@ GEM
       rspec-mocks (~> 3.8)
       rspec-support (~> 3.8)
     rspec-support (3.9.2)
+    rswag-specs (2.3.1)
+      activesupport (>= 3.1, < 7.0)
+      json-schema (~> 2.2)
+      railties (>= 3.1, < 7.0)
     rtlit (0.0.5)
     rubocop (0.82.0)
       jaro_winkler (~> 1.5.1)
@@ -524,6 +530,7 @@ DEPENDENCIES
   rspec
   rspec-html-matchers
   rspec-rails (= 4.0.0.beta2)
+  rswag-specs
   rtlit
   rubocop
   rubocop-discourse
diff --git a/spec/requests/api/categories_spec.rb b/spec/requests/api/categories_spec.rb
new file mode 100644
index 0000000000..0c82cfa389
--- /dev/null
+++ b/spec/requests/api/categories_spec.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+require 'swagger_helper'
+
+describe 'categories' do
+
+  let(:admin) { Fabricate(:admin) }
+
+  before do
+    Jobs.run_immediately!
+    sign_in(admin)
+  end
+
+  path '/categories.json' do
+
+    post 'Creates a category' do
+      before do
+        Jobs.run_immediately!
+        sign_in(admin)
+      end
+      tags 'Category'
+      consumes 'application/json'
+      parameter name: :category, in: :body, schema: {
+        type: :object,
+        properties: {
+          name: { type: :string },
+          color: { type: :string },
+          text_color: { type: :string },
+        },
+        required: [ 'name', 'color', 'text_color' ]
+      }
+
+      produces 'application/json'
+      response '200', 'category created' do
+        schema type: :object, properties: {
+            category: {
+              type: :object,
+              properties: {
+                id: { type: :integer },
+                name: { type: :string },
+                color: { type: :string },
+              },
+              required: ["id"]
+            }
+          }, required: ["category"]
+
+        let(:category) { { name: 'todo', color: 'f94cb0', text_color: '412763' } }
+        run_test!
+      end
+    end
+
+    get 'Retreives a list of categories' do
+      tags 'Category'
+      produces 'application/json'
+
+      response '200', 'categories response' do
+        schema type: :object, properties: {
+          category_list: {
+            type: :object,
+            properties: {
+              can_create_category: { type: :boolean },
+              can_create_topic: { type: :boolean },
+              draft: { type: :string, nullable: true },
+              draft_key: { type: :string },
+              draft_sequence: { type: :integer },
+              categories: { type: :array },
+            }, required: ["categories"]
+          }
+        }, required: ["category_list"]
+        run_test!
+      end
+    end
+  end
+end
diff --git a/spec/swagger_helper.rb b/spec/swagger_helper.rb
new file mode 100644
index 0000000000..5f7737384d
--- /dev/null
+++ b/spec/swagger_helper.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.configure do |config|
+  # Specify a root folder where Swagger JSON files are generated
+  # NOTE: If you're using the rswag-api to serve API descriptions, you'll need
+  # to ensure that it's configured to serve Swagger from the same folder
+  config.swagger_root = Rails.root.join('openapi').to_s
+
+  # Define one or more Swagger documents and provide global metadata for each one
+  # When you run the 'rswag:specs:swaggerize' rake task, the complete Swagger will
+  # be generated at the provided relative path under swagger_root
+  # By default, the operations defined in spec files are added to the first
+  # document below. You can override this behavior by adding a swagger_doc tag to the
+  # the root example_group in your specs, e.g. describe '...', swagger_doc: 'v2/swagger.json'
+  config.swagger_docs = {
+    'openapi.yaml' => {
+      openapi: '3.0.3',
+      info: {
+        title: 'Discourse API Documentation',
+        version: 'latest'
+      },
+      paths: {},
+      servers: [
+        {
+          url: 'https://{defaultHost}',
+          variables: {
+            defaultHost: {
+              default: 'discourse.example.com'
+            }
+          }
+        }
+      ]
+    }
+  }
+
+  # Specify the format of the output Swagger file when running 'rswag:specs:swaggerize'.
+  # The swagger_docs configuration option has the filename including format in
+  # the key, this may want to be changed to avoid putting yaml in json files.
+  # Defaults to json. Accepts ':json' and ':yaml'.
+  config.swagger_format = :yaml
+end

From bb4e965a6694710069cb11b509ebbd1c32847a5c Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 28 Apr 2020 10:13:59 +1000
Subject: [PATCH 0805/1830] FEATURE: Optionally show local time for user in
 card (#9527)

This adds a site setting (default off) to optionally show a user's local time and timezone in their user card. For example, I live in Brisbane, and if at 3:30PM my time I were to open a user who lives in California's card I would see 22:30 (PST).
---
 .../app/components/user-card-contents.js      | 20 ++++++++-
 .../javascripts/discourse/app/models/user.js  |  5 +++
 .../components/user-card-contents.hbs         | 20 ++++++---
 .../common/components/user-card.scss          |  4 +-
 app/serializers/user_card_serializer.rb       | 11 ++++-
 config/locales/client.ar.yml                  |  1 +
 config/locales/client.be.yml                  |  1 +
 config/locales/client.bg.yml                  |  1 +
 config/locales/client.bs_BA.yml               |  1 +
 config/locales/client.ca.yml                  |  1 +
 config/locales/client.cs.yml                  |  1 +
 config/locales/client.da.yml                  |  1 +
 config/locales/client.de.yml                  |  1 +
 config/locales/client.el.yml                  |  1 +
 config/locales/client.en.yml                  |  2 +
 config/locales/client.en_US.yml               |  2 +
 config/locales/client.es.yml                  |  1 +
 config/locales/client.et.yml                  |  1 +
 config/locales/client.fa_IR.yml               |  1 +
 config/locales/client.fi.yml                  |  1 +
 config/locales/client.fr.yml                  |  1 +
 config/locales/client.gl.yml                  |  1 +
 config/locales/client.he.yml                  |  1 +
 config/locales/client.hu.yml                  |  1 +
 config/locales/client.hy.yml                  |  1 +
 config/locales/client.id.yml                  |  1 +
 config/locales/client.it.yml                  |  1 +
 config/locales/client.ja.yml                  |  1 +
 config/locales/client.ko.yml                  |  1 +
 config/locales/client.lt.yml                  |  1 +
 config/locales/client.lv.yml                  |  1 +
 config/locales/client.nb_NO.yml               |  1 +
 config/locales/client.nl.yml                  |  1 +
 config/locales/client.pl_PL.yml               |  1 +
 config/locales/client.pt.yml                  |  1 +
 config/locales/client.pt_BR.yml               |  1 +
 config/locales/client.ro.yml                  |  1 +
 config/locales/client.ru.yml                  |  1 +
 config/locales/client.sk.yml                  |  1 +
 config/locales/client.sl.yml                  |  1 +
 config/locales/client.sq.yml                  |  1 +
 config/locales/client.sr.yml                  |  1 +
 config/locales/client.sv.yml                  |  1 +
 config/locales/client.sw.yml                  |  1 +
 config/locales/client.te.yml                  |  1 +
 config/locales/client.th.yml                  |  1 +
 config/locales/client.tr_TR.yml               |  1 +
 config/locales/client.uk.yml                  |  1 +
 config/locales/client.ur.yml                  |  1 +
 config/locales/client.vi.yml                  |  1 +
 config/locales/client.zh_CN.yml               |  1 +
 config/locales/client.zh_TW.yml               |  1 +
 config/locales/server.en.yml                  |  1 +
 config/site_settings.yml                      |  3 ++
 test/javascripts/acceptance/user-card-test.js | 45 +++++++++++++++++++
 55 files changed, 148 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-card-contents.js b/app/assets/javascripts/discourse/app/components/user-card-contents.js
index 655c97fc28..2feb813dac 100644
--- a/app/assets/javascripts/discourse/app/components/user-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/user-card-contents.js
@@ -38,7 +38,12 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
   showMoreBadges: gt("moreBadgesCount", 0),
   showDelete: and("viewingAdmin", "showName", "user.canBeDeleted"),
   linkWebsite: not("user.isBasic"),
-  hasLocationOrWebsite: or("user.location", "user.website_name"),
+
+  @discourseComputed("user")
+  hasLocaleOrWebsite(user) {
+    return user.location || user.website_name || this.userTimezone;
+  },
+
   isSuspendedOrHasBio: or("user.suspend_reason", "user.bio_excerpt"),
   showCheckEmail: and("user.staged", "canCheckEmails"),
 
@@ -52,6 +57,8 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
     "siteSettings.allow_featured_topic_on_user_profiles"
   ),
 
+  showUserLocalTime: setting("display_local_time_in_user_card"),
+
   @discourseComputed("user.staff")
   staff: isStaff => (isStaff ? "staff" : ""),
 
@@ -63,6 +70,17 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
     return prioritizeNameInUx(name, this.siteSettings);
   },
 
+  @discourseComputed("user")
+  userTimezone(user) {
+    return user.resolvedTimezone();
+  },
+
+  @discourseComputed()
+  formattedUserLocalTime() {
+    const timezone = this.userTimezone;
+    return moment.tz(timezone).format(I18n.t("dates.time_with_zone"));
+  },
+
   @discourseComputed("username")
   usernameClass: username => (username ? `user-card-${username}` : ""),
 
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index 9fff14f4f8..dc118c0892 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -597,6 +597,11 @@ const User = RestModel.extend({
         json.user.card_badge = Badge.create(json.user.card_badge);
       }
 
+      if (!json.user._timezone) {
+        json.user._timezone = json.user.timezone;
+        delete json.user.timezone;
+      }
+
       user.setProperties(json.user);
       return user;
     });
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
index 3be60e856c..3148fc95d3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
@@ -149,15 +149,9 @@
         </div>
       {{/if}}
 
-      {{#if this.hasLocationOrWebsite}}
+      {{#if this.hasLocaleOrWebsite}}
         <div class="card-row">
           <div class="location-and-website">
-            {{#if this.user.location}}
-              <span class="location">
-                {{d-icon "map-marker-alt"}}
-                <span>{{this.user.location}}</span>
-              </span>
-            {{/if}}
             {{#if this.user.website_name}}
               <span class="website-name">
                 {{d-icon "globe"}}
@@ -170,6 +164,18 @@
                 {{/if}}
               </span>
             {{/if}}
+            {{#if this.user.location}}
+              <span class="location">
+                {{d-icon "map-marker-alt"}}
+                <span>{{this.user.location}}</span>
+              </span>
+            {{/if}}
+            {{#if showUserLocalTime}}
+              <span class="local-time">
+                {{d-icon "far-clock"}}
+                <span>{{this.formattedUserLocalTime}}</span>
+              </span>
+            {{/if}}
             {{plugin-outlet name="user-card-location-and-website" args=(hash user=this.user)}}
           </div>
         </div>
diff --git a/app/assets/stylesheets/common/components/user-card.scss b/app/assets/stylesheets/common/components/user-card.scss
index c5dad5d089..92ca3a5af0 100644
--- a/app/assets/stylesheets/common/components/user-card.scss
+++ b/app/assets/stylesheets/common/components/user-card.scss
@@ -212,7 +212,9 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
       @include ellipsis;
       color: $primary;
     }
-    .location {
+    .location,
+    .local-time,
+    .website-name {
       margin-right: 0.5em;
     }
     .website-name a {
diff --git a/app/serializers/user_card_serializer.rb b/app/serializers/user_card_serializer.rb
index 6b7f59cd40..c453dff2e4 100644
--- a/app/serializers/user_card_serializer.rb
+++ b/app/serializers/user_card_serializer.rb
@@ -60,7 +60,8 @@ class UserCardSerializer < BasicUserSerializer
              :primary_group_flair_url,
              :primary_group_flair_bg_color,
              :primary_group_flair_color,
-             :featured_topic
+             :featured_topic,
+             :timezone
 
   untrusted_attributes :bio_excerpt,
                        :website,
@@ -194,6 +195,14 @@ class UserCardSerializer < BasicUserSerializer
     object.user_profile.featured_topic
   end
 
+  def include_timezone?
+    SiteSetting.display_local_time_in_user_card?
+  end
+
+  def timezone
+    object.user_option.timezone
+  end
+
   def card_background_upload_url
     object.card_background_upload&.url
   end
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index d2551f34b9..dd74199911 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -31,6 +31,7 @@ ar:
         millions: "{{number}} مليون"
     dates:
       time: "h:mm a"
+      time_with_zone: "h:mm a (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index c9c33e1117..67247aea1a 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -25,6 +25,7 @@ be:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       long_no_year_no_time: "D MMM"
       long_with_year_no_time: "D МММ, YYYY"
       long_date_with_year_without_time: "D MMM YYYY"
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index 298f6fc63d..addc3fdbac 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -27,6 +27,7 @@ bg:
         millions: "{{number}}M "
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index e99e72dc0f..93e103c993 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -28,6 +28,7 @@ bs_BA:
         millions: "{{number}} miliona"
     dates:
       time: "HH: mm"
+      time_with_zone: "HH: mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index d3c05e308f..80f47fb2df 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -27,6 +27,7 @@ ca:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
+      time_with_zone: "h:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 84c4b405fd..1faece6fa4 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -29,6 +29,7 @@ cs:
         millions: "{{number}}M"
     dates:
       time: "H:mm"
+      time_with_zone: "H:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D. MMMM"
       full_no_year_no_time: "D. MMMM"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index cfb52a677a..c75122c70b 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -27,6 +27,7 @@ da:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D. MMM"
       full_no_year_no_time: "D. MMMM"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 9cc356de43..64e90d534f 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -27,6 +27,7 @@ de:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D. MMM"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 0dbe63981f..94d50da992 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -27,6 +27,7 @@ el:
         millions: "{{number}}εκατ."
     dates:
       time: "ΗΗ:mm"
+      time_with_zone: "HH:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index af4c1549b1..3180d66d2f 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -40,6 +40,8 @@ en:
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
       time: "HH:mm"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
+      time_with_zone: "HH:mm (z)"
+      # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
       time_short_day: "ddd, HH:mm"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
       timeline_date: "MMM YYYY"
diff --git a/config/locales/client.en_US.yml b/config/locales/client.en_US.yml
index 96cf5c211d..889e8c66c9 100644
--- a/config/locales/client.en_US.yml
+++ b/config/locales/client.en_US.yml
@@ -4,6 +4,8 @@ en_US:
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
       time: "h:mm a"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
+      time_with_zone: "hh:mm a (z)"
+      # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
       time_short_day: "ddd, h:mm a"
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
       timeline_date: "MMM YYYY"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index f9649f5725..63ebcf23f5 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -27,6 +27,7 @@ es:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year: "D MMM, HH:mm"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 8c185b0f9d..cf67e2d4aa 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -27,6 +27,7 @@ et:
         millions: "{{number}}M"
     dates:
       time: "hh:mm"
+      time_with_zone: "hh:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D. MMMM"
       full_no_year_no_time: "Do MMMM"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 57efc8e041..3e3d664341 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -27,6 +27,7 @@ fa_IR:
         millions: "{{number}} میلیون"
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 0f5e360629..a66782aa50 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -27,6 +27,7 @@ fi:
         millions: "{{number}}M"
     dates:
       time: "H:mm"
+      time_with_zone: "H:mm (z)"
       time_short_day: "ddd HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D. MMMM[ta]"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index db522c2b26..2a764de244 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -27,6 +27,7 @@ fr:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd [à] HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 1e6bb87c66..8a8624aba3 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -27,6 +27,7 @@ gl:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
+      time_with_zone: "h:mm a (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D MMMM"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 450b1167ea..cd388cc382 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -29,6 +29,7 @@ he:
         millions: "{{number}} מיליון"
     dates:
       time: "h:mm a"
+      time_with_zone: "h:mm a (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year: "D MMM, HH:mm"
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index f843aad5c8..6500e02233 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -27,6 +27,7 @@ hu:
         millions: "{{number}} millió"
     dates:
       time: "h:mm a"
+      time_with_zone: "h:mm a (z)"
       timeline_date: "YYYY MMMM"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMM DD"
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index b446663a91..b5e6fa470c 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -27,6 +27,7 @@ hy:
         millions: "{{number}}մլն"
     dates:
       time: "h:mm"
+      time_with_zone: "h:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 410f902df7..21b6f48c6e 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -26,6 +26,7 @@ id:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
+      time_with_zone: "h:mm a (z)"
       time_short_day: "ddd, HH: mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index ac69f908f3..b3232e2d8c 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -27,6 +27,7 @@ it:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
+      time_with_zone: "h:mm a (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year: "D MMM, HH:mm"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 59291ac65d..4fb8795c6b 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -26,6 +26,7 @@ ja:
         millions: "{{number}}M"
     dates:
       time: "H:mm"
+      time_with_zone: "H:mm (z)"
       timeline_date: "YYYY年M月"
       long_no_year_no_time: "M月D日"
       full_no_year_no_time: "M月D日"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 9e2ede793b..22cdf967c5 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -26,6 +26,7 @@ ko:
         millions: "{{number}}백만"
     dates:
       time: "a h:mm"
+      time_with_zone: "a h:mm (z)"
       timeline_date: "YYYY MMM"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index fc7f0bc130..c04e5b9d4e 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -29,6 +29,7 @@ lt:
         millions: "{{number}}M"
     dates:
       time: "H:mm"
+      time_with_zone: "H:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMMM D"
       full_no_year_no_time: "MMMM Do"
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 2552f541c3..5e021880d6 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -28,6 +28,7 @@ lv:
         millions: "{{number}} milj."
     dates:
       time: "hh:mm"
+      time_with_zone: "hh:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 62b0e76a05..9782c2233e 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -27,6 +27,7 @@ nb_NO:
         millions: "{{number}}M"
     dates:
       time: "LT"
+      time_with_zone: "LT (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D. MMMM"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 27240c9afc..e69cca0469 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -27,6 +27,7 @@ nl:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year: "D MMM, HH:mm"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index f558984e7a..2db63526d8 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -29,6 +29,7 @@ pl_PL:
         millions: "{{number}}M"
     dates:
       time: "H:mm"
+      time_with_zone: "H:mm (z)"
       time_short_day: "ddd, GG: mm"
       timeline_date: "MMM YYYY"
       long_no_year: "D MMM, GG: mm"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 29bedc2d68..67fcbe27a9 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -27,6 +27,7 @@ pt:
         millions: "{{number}}M"
     dates:
       time: "hh:mm"
+      time_with_zone: "hh:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index d95190318d..bf673507c1 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -27,6 +27,7 @@ pt_BR:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index a26fed9e10..51d21ec82b 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -28,6 +28,7 @@ ro:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM "
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 20eac7a0e7..540448bc35 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -29,6 +29,7 @@ ru:
         millions: "{{number}} млн."
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year: "D MMM, HH:mm"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 4c9a45d361..2fec5c9696 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -29,6 +29,7 @@ sk:
         millions: "{{number}}mil"
     dates:
       time: "h:mm a"
+      time_with_zone: "h:mm a (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 2cd21fe199..4f707df6d0 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -29,6 +29,7 @@ sl:
         millions: "{{number}}M"
     dates:
       time: "H:mm"
+      time_with_zone: "H:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D. MMMM"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 71a48fb415..f4e4997c20 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -27,6 +27,7 @@ sq:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
+      time_with_zone: "h:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index c5dc6248f4..ddf56cf62c 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -28,6 +28,7 @@ sr:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 0b8e573f90..0a5078294b 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -27,6 +27,7 @@ sv:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
+      time_with_zone: "h:mm a (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year: "D MMM, HH:mm"
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 0279890254..3bab45669c 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -27,6 +27,7 @@ sw:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
+      time_with_zone: "h:mm a (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index ff17c45be2..a6e245faf5 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -24,6 +24,7 @@ te:
             tb: టీబీ
     dates:
       time: "h:mm a"
+      time_with_zone: "h:mm a (z)"
       long_no_year_no_time: "MMM D"
       long_with_year: "MMM D, YYYY h:mm a"
       long_with_year_no_time: "MMM D, YYYY"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 273bcc27c8..a9c73f525d 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -26,6 +26,7 @@ th:
         millions: "{{number}}ล้าน"
     dates:
       time: "h:mm a"
+      time_with_zone: "h:mm a (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index e0554c02f3..066a38b339 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -27,6 +27,7 @@ tr_TR:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
+      time_with_zone: "h:mm a (z)"
       time_short_day: "ggg, SS:dd"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 10fdd74b48..6930870cf4 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -29,6 +29,7 @@ uk:
         millions: "{{number}} млн."
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index b99357bb5a..fe817015db 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -27,6 +27,7 @@ ur:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
+      time_with_zone: "h:mm a (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 616c335137..7ddbc48055 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -26,6 +26,7 @@ vi:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 6a301be078..b54822a862 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -26,6 +26,7 @@ zh_CN:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "YYYY[年]M[月]"
       long_no_year: "M[月]D[日] HH:mm"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index bb5ef5ed45..1d5b3ce010 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -26,6 +26,7 @@ zh_TW:
         millions: "{{number}} 百萬"
     dates:
       time: "h:mm a"
+      time_with_zone: "h:mm a (z)"
       timeline_date: "YYYY年 M月"
       long_no_year_no_time: "M月 D日"
       full_no_year_no_time: "M月 D日"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index d38b0caeab..baf137f94b 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1407,6 +1407,7 @@ en:
     watched_word_regexp_error: "The regular expression for %{action} watched words is invalid. Please check your <a href='%{base_path}/admin/logs/watched_words'>Watched Word settings</a>, or disable the 'watched words regular expressions' site setting."
 
   site_settings:
+    display_local_time_in_user_card: "Display the local time based on a user's timezone when their user card is opened."
     censored_words: "Words that will be automatically replaced with &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-delete any hidden posts that stay hidden for more than 30 days."
     default_locale: "The default language of this Discourse instance. You can replace the text of system generated categories and topics at <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Customize / Text</a>."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 8037237c2a..7d9fd0fd86 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -124,6 +124,9 @@ branding:
     default: ""
 
 basic:
+  display_local_time_in_user_card:
+    client: true
+    default: false
   allow_user_locale:
     client: true
     default: false
diff --git a/test/javascripts/acceptance/user-card-test.js b/test/javascripts/acceptance/user-card-test.js
index 8ced970f99..ecf9870612 100644
--- a/test/javascripts/acceptance/user-card-test.js
+++ b/test/javascripts/acceptance/user-card-test.js
@@ -1,6 +1,46 @@
 import { acceptance } from "helpers/qunit-helpers";
 import DiscourseURL from "discourse/lib/url";
 
+import pretender from "helpers/create-pretender";
+import userFixtures from "fixtures/user_fixtures";
+import User from "discourse/models/user";
+
+acceptance("User Card - Show Local Time", {
+  loggedIn: true,
+  settings: { display_local_time_in_user_card: true }
+});
+
+QUnit.test("user card local time", async assert => {
+  User.current().changeTimezone("Australia/Brisbane");
+  let cardResponse = _.clone(userFixtures["/u/eviltrout/card.json"]);
+  cardResponse.user.timezone = "Australia/Perth";
+
+  pretender.get("/u/eviltrout/card.json", () => [
+    200,
+    { "Content-Type": "application/json" },
+    cardResponse
+  ]);
+
+  await visit("/t/internationalization-localization/280");
+  assert.ok(invisible(".user-card"), "user card is invisible by default");
+  await click("a[data-user-card=eviltrout]:first");
+
+  let expectedTime =
+    moment
+      .tz("Australia/Brisbane")
+      .add(-2, "hours")
+      .format("hh:mm a") + " (AWST)";
+
+  assert.ok(visible(".user-card"), "card should appear");
+  assert.equal(
+    find(".user-card .local-time")
+      .text()
+      .trim(),
+    expectedTime,
+    "user card contains the user's local time"
+  );
+});
+
 acceptance("User Card", { loggedIn: true });
 
 QUnit.test("user card", async assert => {
@@ -34,6 +74,11 @@ QUnit.test("user card", async assert => {
     "user card contains the data"
   );
 
+  assert.ok(
+    !visible(".user-card .local-time"),
+    "local time with zone does not show by default"
+  );
+
   await click(".card-content .compose-pm button");
   assert.ok(
     invisible(".user-card"),

From 2c6d6dfd05361114c90a600589a60adb893ed1d9 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 28 Apr 2020 02:32:59 +0200
Subject: [PATCH 0806/1830] FIX: Improves bookmark shortcut reliability and
 other minor issues (#9547)

This commit reworks slightly the `toggleBookmark` and `toggleBookmarkTopic` functions.

- Pressing [f] (toggleBookmarkTopic)
  - a topic list item is selected, we attempt to toggle the related topic
  - a post is selected, we bookmark the current topic
  - nothing is selected, if there's a currentTopic we bookmark it

- Pressing [b] (toggleBookmark)
  - a post is selected, we bookmark it
  - a topic list item is selected, we attempt to toggle the related topic
  - nothing is selected, if there's a currentTopic we bookmark it

Note this, commit also reduces jquery usage, a bug where the [f] shortcut was propagated to the modal input, and fixes bug when bookmarking a topic list item on the front page and the firstPost couldn't be found.
---
 .../discourse/app/lib/keyboard-shortcuts.js   | 73 ++++++++++++++-----
 .../javascripts/discourse/app/models/topic.js | 17 +++--
 2 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
index 498c920e9d..b04f4bba27 100644
--- a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
@@ -83,6 +83,11 @@ const DEFAULT_BINDINGS = {
 
 const animationDuration = 100;
 
+function preventKeyboardEvent(event) {
+  event.preventDefault();
+  event.stopPropagation();
+}
+
 export default {
   init(keyTrapper, container) {
     this.keyTrapper = keyTrapper;
@@ -175,20 +180,39 @@ export default {
   },
 
   toggleBookmark(event) {
-    event.preventDefault();
-    event.stopPropagation();
+    const selectedPost = this._getSelectedPost();
+    if (selectedPost) {
+      preventKeyboardEvent(event);
+      this.sendToSelectedPost("toggleBookmark", selectedPost);
+      return;
+    }
 
-    this.sendToSelectedPost("toggleBookmark");
-    this.sendToTopicListItemView("toggleBookmark");
+    const selectedTopicListItem = this._getSelectedTopicListItem();
+    if (selectedTopicListItem) {
+      preventKeyboardEvent(event);
+      this.sendToTopicListItemView("toggleBookmark", selectedTopicListItem);
+      return;
+    }
+
+    this._bookmarkCurrentTopic(event);
   },
 
-  toggleBookmarkTopic() {
+  toggleBookmarkTopic(event) {
+    const selectedTopicListItem = this._getSelectedTopicListItem();
+    if (selectedTopicListItem) {
+      preventKeyboardEvent(event);
+      this.sendToTopicListItemView("toggleBookmark", selectedTopicListItem);
+      return;
+    }
+
+    this._bookmarkCurrentTopic(event);
+  },
+
+  _bookmarkCurrentTopic(event) {
     const topic = this.currentTopic();
-    // BIG hack, need a cleaner way
-    if (topic && $(".posts-wrapper").length > 0) {
+    if (topic && document.querySelectorAll(".posts-wrapper").length) {
+      preventKeyboardEvent(event);
       this.container.lookup("controller:topic").send("toggleBookmark");
-    } else {
-      this.sendToTopicListItemView("toggleBookmark");
     }
   },
 
@@ -380,8 +404,8 @@ export default {
     });
   },
 
-  sendToTopicListItemView(action) {
-    const elem = $("tr.selected.topic-list-item.ember-view")[0];
+  sendToTopicListItemView(action, elem) {
+    elem = elem || document.querySelector("tr.selected.topic-list-item");
     if (elem) {
       const registry = this.container.lookup("-view-registry:main");
       if (registry) {
@@ -401,15 +425,18 @@ export default {
     }
   },
 
-  sendToSelectedPost(action) {
-    const container = this.container;
+  sendToSelectedPost(action, elem) {
     // TODO: We should keep track of the post without a CSS class
-    let selectedPostId = parseInt(
-      $(".topic-post.selected article.boxed").data("post-id"),
-      10
-    );
+    const selectedPost =
+      elem || document.querySelector(".topic-post.selected article.boxed");
+
+    let selectedPostId;
+    if (selectedPost) {
+      selectedPostId = parseInt(selectedPost.dataset.postId, 10);
+    }
+
     if (selectedPostId) {
-      const topicController = container.lookup("controller:topic");
+      const topicController = this.container.lookup("controller:topic");
       const post = topicController
         .get("model.postStream.posts")
         .findBy("id", selectedPostId);
@@ -418,7 +445,7 @@ export default {
 
         let actionMethod = topicController.actions[action];
         if (!actionMethod) {
-          const topicRoute = container.lookup("route:topic");
+          const topicRoute = this.container.lookup("route:topic");
           actionMethod = topicRoute.actions[action];
         }
 
@@ -696,6 +723,14 @@ export default {
     this.container.lookup("controller:topic").send("replyToPost");
   },
 
+  _getSelectedPost() {
+    return document.querySelector(".topic-post.selected article[data-post-id]");
+  },
+
+  _getSelectedTopicListItem() {
+    return document.querySelector("tr.selected.topic-list-item");
+  },
+
   deferTopic() {
     this.container.lookup("controller:topic").send("deferTopic");
   },
diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js
index 1cbab38942..46be3e7fee 100644
--- a/app/assets/javascripts/discourse/app/models/topic.js
+++ b/app/assets/javascripts/discourse/app/models/topic.js
@@ -410,19 +410,22 @@ const Topic = RestModel.extend({
     const postStream = this.postStream;
     let firstPost = postStream.get("posts.firstObject");
 
-    if (firstPost.post_number === 1) {
+    if (firstPost && firstPost.post_number === 1) {
       return Promise.resolve(firstPost);
     }
 
     const postId = postStream.findPostIdForPostNumber(1);
+    if (postId) {
+      // try loading from identity map first
+      firstPost = postStream.findLoadedPost(postId);
+      if (firstPost) {
+        return Promise.resolve(firstPost);
+      }
 
-    // try loading from identity map first
-    firstPost = postStream.findLoadedPost(postId);
-    if (firstPost) {
-      return Promise.resolve(firstPost);
+      return this.postStream.loadPost(postId);
+    } else {
+      return this.postStream.loadPostByPostNumber(1);
     }
-
-    return this.postStream.loadPost(postId);
   },
 
   toggleBookmark() {

From ad978b93abcada28e6fe2c64ce874e64e4dbe418 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 28 Apr 2020 03:19:35 +0200
Subject: [PATCH 0807/1830] FIX: Correctly shows no bookmark message (#9548)

---
 .../user-activity-bookmarks-with-reminders.js | 124 +++++++++---------
 .../acceptance/user-bookmarks-test.js         |  50 +++++++
 2 files changed, 112 insertions(+), 62 deletions(-)
 create mode 100644 test/javascripts/acceptance/user-bookmarks-test.js

diff --git a/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks-with-reminders.js b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks-with-reminders.js
index 9611aceced..a24269d235 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks-with-reminders.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks-with-reminders.js
@@ -2,6 +2,7 @@ import Controller from "@ember/controller";
 import showModal from "discourse/lib/show-modal";
 import { Promise } from "rsvp";
 import { inject } from "@ember/controller";
+import { action } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 import Bookmark from "discourse/models/bookmark";
 
@@ -22,12 +23,8 @@ export default Controller.extend({
 
     return this.model
       .loadItems()
-      .then(response => {
-        this.processLoadResponse(response);
-      })
-      .catch(() => {
-        this.set("noResultsHelp", I18n.t("bookmarks.list_permission_denied"));
-      })
+      .then(response => this._processLoadResponse(response))
+      .catch(() => this._bookmarksListDenied())
       .finally(() =>
         this.setProperties({
           loaded: true,
@@ -38,69 +35,72 @@ export default Controller.extend({
 
   @discourseComputed("loaded", "content.length", "noResultsHelp")
   noContent(loaded, contentLength, noResultsHelp) {
-    return loaded && contentLength === 0 && noResultsHelp !== null;
+    return loaded && contentLength === 0 && noResultsHelp;
   },
 
-  processLoadResponse(response) {
-    response = response.user_bookmark_list;
+  @action
+  removeBookmark(bookmark) {
+    bootbox.confirm(I18n.t("bookmarks.confirm_delete"), result => {
+      if (result) {
+        return bookmark.destroy().then(() => this.loadItems());
+      }
+    });
+  },
 
-    if (response && response.no_results_help) {
-      this.set("noResultsHelp", response.no_results_help);
+  @action
+  editBookmark(bookmark) {
+    let controller = showModal("bookmark", {
+      model: {
+        postId: bookmark.post_id,
+        id: bookmark.id,
+        reminderAt: bookmark.reminder_at,
+        name: bookmark.name
+      },
+      title: "post.bookmarks.edit",
+      modalClass: "bookmark-with-reminder"
+    });
+    controller.setProperties({
+      afterSave: () => this.loadItems()
+    });
+  },
+
+  @action
+  loadMore() {
+    if (this.loadingMore) {
+      return Promise.resolve();
     }
 
+    this.set("loadingMore", true);
+
+    return this.model
+      .loadMore()
+      .then(response => this._processLoadResponse(response))
+      .catch(() => this._bookmarksListDenied())
+      .finally(() => this.set("loadingMore", false));
+  },
+
+  _bookmarksListDenied() {
+    this.set("noResultsHelp", I18n.t("bookmarks.list_permission_denied"));
+  },
+
+  _processLoadResponse(response) {
+    if (!response) {
+      this._bookmarksListDenied();
+      return;
+    }
+
+    if (response.no_results_help) {
+      this.set("noResultsHelp", response.no_results_help);
+      return;
+    }
+
+    response = response.user_bookmark_list;
     this.model.more_bookmarks_url = response.more_bookmarks_url;
 
-    if (response && response.bookmarks) {
-      let bookmarks = [];
-      response.bookmarks.forEach(bookmark => {
-        bookmarks.push(Bookmark.create(bookmark));
-      });
-      this.content.pushObjects(bookmarks);
-    }
-  },
-
-  actions: {
-    removeBookmark(bookmark) {
-      bootbox.confirm(I18n.t("bookmarks.confirm_delete"), result => {
-        if (result) {
-          return bookmark.destroy().then(() => this.loadItems());
-        }
-      });
-    },
-
-    editBookmark(bookmark) {
-      let controller = showModal("bookmark", {
-        model: {
-          postId: bookmark.post_id,
-          id: bookmark.id,
-          reminderAt: bookmark.reminder_at,
-          name: bookmark.name
-        },
-        title: "post.bookmarks.edit",
-        modalClass: "bookmark-with-reminder"
-      });
-      controller.setProperties({
-        afterSave: () => this.loadItems()
-      });
-    },
-
-    loadMore() {
-      if (this.loadingMore) {
-        return Promise.resolve();
-      }
-      this.set("loadingMore", true);
-
-      return this.model
-        .loadMore()
-        .then(response => this.processLoadResponse(response))
-        .catch(() => {
-          this.set("noResultsHelp", I18n.t("bookmarks.list_permission_denied"));
-        })
-        .finally(() =>
-          this.setProperties({
-            loadingMore: false
-          })
-        );
+    if (response.bookmarks) {
+      this.content.pushObjects(
+        response.bookmarks.map(bookmark => Bookmark.create(bookmark))
+      );
     }
   }
 });
diff --git a/test/javascripts/acceptance/user-bookmarks-test.js b/test/javascripts/acceptance/user-bookmarks-test.js
new file mode 100644
index 0000000000..e965510129
--- /dev/null
+++ b/test/javascripts/acceptance/user-bookmarks-test.js
@@ -0,0 +1,50 @@
+import { acceptance } from "helpers/qunit-helpers";
+import selectKit from "helpers/select-kit-helper";
+import pretender from "helpers/create-pretender";
+
+acceptance("User's bookmarks", {
+  loggedIn: true,
+
+  beforeEach() {
+    pretender.delete("/bookmarks/576", () => [
+      200,
+      { "Content-Type": "application/json" },
+      {}
+    ]);
+  }
+});
+
+test("listing user bookmarks", async assert => {
+  await visit("/u/eviltrout/activity/bookmarks-with-reminders");
+
+  assert.ok(find(".bookmark-list-item").length);
+});
+
+test("removing a bookmark", async assert => {
+  await visit("/u/eviltrout/activity/bookmarks-with-reminders");
+
+  const dropdown = selectKit(".bookmark-actions-dropdown");
+  await dropdown.expand();
+  await dropdown.selectRowByValue("remove");
+
+  assert.ok(exists(".bootbox.modal"));
+
+  await click(".bootbox.modal .btn-primary");
+});
+
+test("listing users bookmarks - no bookmarks", async assert => {
+  pretender.get("/u/eviltrout/bookmarks.json", () => [
+    200,
+    {
+      "Content-Type": "application/json"
+    },
+    {
+      bookmarks: [],
+      no_results_help: "no bookmarks"
+    }
+  ]);
+
+  await visit("/u/eviltrout/activity/bookmarks-with-reminders");
+
+  assert.equal(find(".alert.alert-info").text(), "no bookmarks");
+});

From b1d30d7f0563ec1344c6cc4e82de861220bacd8f Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 27 Apr 2020 22:03:56 -0400
Subject: [PATCH 0808/1830] FIX: keep scroll position when minimizing composer
 in iOS

---
 .../javascripts/discourse/app/lib/safari-hacks.js     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/safari-hacks.js b/app/assets/javascripts/discourse/app/lib/safari-hacks.js
index d18d06fcc1..bb094081fd 100644
--- a/app/assets/javascripts/discourse/app/lib/safari-hacks.js
+++ b/app/assets/javascripts/discourse/app/lib/safari-hacks.js
@@ -86,7 +86,7 @@ function positioningWorkaround($fixedElement) {
 
   document.addEventListener("scroll", () => {
     if (!caps.isIpadOS && workaroundActive) {
-      document.documentElement.scrollTop = 0;
+      window.scrollTo(0, 0);
     }
   });
 
@@ -100,7 +100,8 @@ function positioningWorkaround($fixedElement) {
     if (workaroundActive) {
       $("body").removeClass("ios-safari-composer-hacks");
 
-      $(window).scrollTop(originalScrollTop);
+      window.scrollTo(0, originalScrollTop);
+
       if (evt && evt.target) {
         evt.target.removeEventListener("blur", blurred);
       }
@@ -164,7 +165,9 @@ function positioningWorkaround($fixedElement) {
       .find(".select-kit > button.is-focused")
       .removeClass("is-focused");
 
-    originalScrollTop = $(window).scrollTop();
+    if (window.pageYOffset > 0) {
+      originalScrollTop = window.pageYOffset;
+    }
 
     const elementRect = _this.getBoundingClientRect();
     if (elementRect.top > 100) {
@@ -195,7 +198,7 @@ function positioningWorkaround($fixedElement) {
       }
 
       $("body").addClass("ios-safari-composer-hacks");
-      $(window).scrollTop(0);
+      window.scrollTo(0, 0);
 
       if (!iOSWithVisualViewport()) {
         const height = calcHeight();

From a70ca3a72a54026d3d2b12d1e261a65ebe58ecb7 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 27 Apr 2020 22:04:29 -0400
Subject: [PATCH 0809/1830] UX: Better spacing for composer toggle buttons on
 mobile

---
 app/assets/stylesheets/mobile/compose.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index e28806131b..636fa06ada 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -57,7 +57,6 @@
   }
 
   .toggler {
-    margin-left: -5px;
     .d-icon-chevron-down {
       vertical-align: text-top;
     }

From c679c8008c13b3dbf6ffffefbf3fae531a98bb2f Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 27 Apr 2020 22:13:31 -0400
Subject: [PATCH 0810/1830] Remove additional wrapper, follow-up to d516a88

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

diff --git a/app/assets/javascripts/discourse/app/templates/tags/show.hbs b/app/assets/javascripts/discourse/app/templates/tags/show.hbs
index ea0ed47cfc..73703eeca8 100644
--- a/app/assets/javascripts/discourse/app/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tags/show.hbs
@@ -1,4 +1,4 @@
-{{#d-section pageClass="tags" bodyClass=(concat "tag-" tag.id)}}
+{{#d-section tagName="" pageClass="tags" bodyClass=(concat "tag-" tag.id)}}
   <div class="container">
     {{discourse-banner user=currentUser banner=site.banner}}
   </div>

From dcb40a92c73f7b751508fc1a96aa5e5af06cb512 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 27 Apr 2020 22:49:11 -0400
Subject: [PATCH 0811/1830] Add discovery-below outlet to tag pages too

---
 app/assets/javascripts/discourse/app/templates/tags/show.hbs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse/app/templates/tags/show.hbs b/app/assets/javascripts/discourse/app/templates/tags/show.hbs
index 73703eeca8..8e4f245882 100644
--- a/app/assets/javascripts/discourse/app/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tags/show.hbs
@@ -89,4 +89,5 @@
       </div>
     </div>
   </div>
+  {{plugin-outlet name="discovery-below"}}
 {{/d-section}}

From f9a44488e9c94fc173c1e1efce058bf2ed70d14b Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 27 Apr 2020 23:19:15 -0400
Subject: [PATCH 0812/1830] UX: Right align notification item time, adjust
 mobile space, consolodate

---
 .../common/components/user-stream-item.scss            | 10 ++--------
 .../desktop/components/user-stream-item.scss           | 10 ----------
 .../mobile/components/user-stream-item.scss            | 10 ----------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/app/assets/stylesheets/common/components/user-stream-item.scss b/app/assets/stylesheets/common/components/user-stream-item.scss
index 284d0ba479..76321a2eb2 100644
--- a/app/assets/stylesheets/common/components/user-stream-item.scss
+++ b/app/assets/stylesheets/common/components/user-stream-item.scss
@@ -9,6 +9,7 @@
   .user-stream-item {
     background-color: $secondary;
     border-bottom: 1px solid $primary-low;
+    padding: 1em 0.53em;
 
     &.moderator-action {
       background-color: $highlight-medium;
@@ -38,8 +39,7 @@
   .time,
   .delete-info,
   .draft-type {
-    display: block;
-    float: right;
+    margin-left: auto;
     color: $primary-medium;
     font-size: $font-down-2;
   }
@@ -103,12 +103,6 @@
       }
     }
 
-    .time {
-      display: inline-block;
-      margin-left: 10px;
-      float: none;
-    }
-
     // common/base/header.scss
     .fa,
     .icon {
diff --git a/app/assets/stylesheets/desktop/components/user-stream-item.scss b/app/assets/stylesheets/desktop/components/user-stream-item.scss
index d1da43f998..52ef60c37d 100644
--- a/app/assets/stylesheets/desktop/components/user-stream-item.scss
+++ b/app/assets/stylesheets/desktop/components/user-stream-item.scss
@@ -1,15 +1,5 @@
 // Desktop styles for "user-stream-item" component
 .user-stream {
-  // DEPRECATION:
-  // The ".item" class should be eventually removed because it's too generic.
-  // Once ".item" has been removed, ".user-stream-item" can replace
-  // ".user-stream" as the top-level selector on this file as all other
-  // selectors below are its children
-  .item,
-  .user-stream-item {
-    padding: 1em 0.53em;
-  }
-
   .time,
   .delete-info,
   .draft-type {
diff --git a/app/assets/stylesheets/mobile/components/user-stream-item.scss b/app/assets/stylesheets/mobile/components/user-stream-item.scss
index 0960cd470c..833568f009 100644
--- a/app/assets/stylesheets/mobile/components/user-stream-item.scss
+++ b/app/assets/stylesheets/mobile/components/user-stream-item.scss
@@ -1,15 +1,5 @@
 // Mobile styles for "user-stream-item" component
 .user-stream {
-  // DEPRECATION:
-  // The ".item" class should be eventually removed because it's too generic.
-  // Once ".item" has been removed, ".user-stream-item" can replace
-  // ".user-stream" as the top-level selector on this file as all other
-  // selectors below are its children
-  .item,
-  .user-stream-item {
-    padding: 20px 0 15px 0;
-  }
-
   .name {
     vertical-align: middle;
   }

From 66b5b8cf2904c8b851e0d2f19b3fc36b12394d4a Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 28 Apr 2020 13:23:43 +1000
Subject: [PATCH 0813/1830] FIX: Local time not updating between user cards
 (#9564)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The local time was not updating between user cards because the computed property was not used correctly.

There's an old saying in Tennessee — I know it's in Texas, probably in Tennessee — that says, fool me once computed properties, shame on — shame on you. Fool me — you can't get fooled again.
---
 .../app/components/user-card-contents.js      |  5 ++--
 test/javascripts/acceptance/user-card-test.js | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-card-contents.js b/app/assets/javascripts/discourse/app/components/user-card-contents.js
index 2feb813dac..8e8589533d 100644
--- a/app/assets/javascripts/discourse/app/components/user-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/user-card-contents.js
@@ -75,9 +75,8 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
     return user.resolvedTimezone();
   },
 
-  @discourseComputed()
-  formattedUserLocalTime() {
-    const timezone = this.userTimezone;
+  @discourseComputed("userTimezone")
+  formattedUserLocalTime(timezone) {
     return moment.tz(timezone).format(I18n.t("dates.time_with_zone"));
   },
 
diff --git a/test/javascripts/acceptance/user-card-test.js b/test/javascripts/acceptance/user-card-test.js
index ecf9870612..d85d02d966 100644
--- a/test/javascripts/acceptance/user-card-test.js
+++ b/test/javascripts/acceptance/user-card-test.js
@@ -39,6 +39,31 @@ QUnit.test("user card local time", async assert => {
     expectedTime,
     "user card contains the user's local time"
   );
+
+  cardResponse = _.clone(userFixtures["/u/charlie/card.json"]);
+  cardResponse.user.timezone = "America/New_York";
+
+  pretender.get("/u/charlie/card.json", () => [
+    200,
+    { "Content-Type": "application/json" },
+    cardResponse
+  ]);
+
+  await click("a[data-user-card=charlie]:first");
+
+  expectedTime =
+    moment
+      .tz("Australia/Brisbane")
+      .add(-14, "hours")
+      .format("hh:mm a") + " (EDT)";
+
+  assert.equal(
+    find(".user-card .local-time")
+      .text()
+      .trim(),
+    expectedTime,
+    "opening another user card updates the local time in the card (no caching)"
+  );
 });
 
 acceptance("User Card", { loggedIn: true });

From 82c5d85e99dd91a2728c220cfd0f1de7a38bb5ce Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 27 Apr 2020 23:29:28 -0400
Subject: [PATCH 0814/1830] add btn-default class to show-tag-info button

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

diff --git a/app/assets/javascripts/discourse/app/templates/tags/show.hbs b/app/assets/javascripts/discourse/app/templates/tags/show.hbs
index 8e4f245882..909b20a198 100644
--- a/app/assets/javascripts/discourse/app/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tags/show.hbs
@@ -43,7 +43,7 @@
         }}
 
         {{#if showToggleInfo}}
-          {{d-button icon="tag" label="tagging.info" action=(action "toggleInfo") id="show-tag-info"}}
+          {{d-button icon="tag" class="btn-default" label="tagging.info" action=(action "toggleInfo") id="show-tag-info"}}
         {{/if}}
       </section>
     </div>

From d3dc8fc1b3c1f406fc1ecb12a7a8e5db62128904 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 28 Apr 2020 15:46:40 +1000
Subject: [PATCH 0815/1830] DEV: Bump message_bus from 3.0.0 to 3.1.0 (#9565)

Bumps [message_bus](https://github.com/SamSaffron/message_bus) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/SamSaffron/message_bus/releases)
- [Changelog](https://github.com/discourse/message_bus/blob/master/CHANGELOG)
- [Commits](https://github.com/SamSaffron/message_bus/compare/v3.0.0...v3.1.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Very safe change introduces new API needed for message filtering.

https://github.com/discourse/message_bus/commit/7fad5a3e7ddb30f9d77fe3b0e4b5de3231d7787d
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 20306d3532..7cb6c2ef68 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -184,7 +184,7 @@ GEM
       mini_mime (>= 0.1.1)
     maxminddb (0.1.22)
     memory_profiler (0.9.14)
-    message_bus (3.0.0)
+    message_bus (3.1.0)
       rack (>= 1.1.3)
     method_source (0.9.2)
     mini_mime (1.0.2)

From 23ff071ebda928a763650d0a751d7c833ee1d2bc Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 28 Apr 2020 07:55:06 +0200
Subject: [PATCH 0816/1830] FIX: currentUser might be undefined (#9555)

---
 .../javascripts/discourse/app/components/site-header.js       | 4 ++--
 app/assets/javascripts/discourse/app/widgets/header.js        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/site-header.js b/app/assets/javascripts/discourse/app/components/site-header.js
index 58219c1dda..e110b9ceee 100644
--- a/app/assets/javascripts/discourse/app/components/site-header.js
+++ b/app/assets/javascripts/discourse/app/components/site-header.js
@@ -215,8 +215,8 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
         if (
           !e.target.closest("#current-user") &&
           !e.target.closest(".ring-backdrop") &&
-          !this.currentUser.get("read_first_notification") &&
-          !this.currentUser.get("enforcedSecondFactor")
+          !this.get("currentUser.read_first_notification") &&
+          !this.get("currentUser.enforcedSecondFactor")
         ) {
           this.eventDispatched(
             "header:dismiss-first-notification-mask",
diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index 65caab4810..f2e80b8dae 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -539,7 +539,7 @@ export default createWidget("header", {
         "notification",
         {
           recent: true,
-          silent: this.currentUser.enforcedSecondFactor,
+          silent: this.get("currentUser.enforcedSecondFactor"),
           limit: 5
         },
         { cacheKey: "recent-notifications" }

From 67f3fe14aac8de9f41835a870022d6a074e1cf54 Mon Sep 17 00:00:00 2001
From: mentalstring <mentalstring@gmail.com>
Date: Tue, 28 Apr 2020 07:06:35 +0100
Subject: [PATCH 0817/1830] FEATURE: support SSO website and location overrides

Add location and website + the ability to override using SSO using the `sso_overrides_location` and `sso_overrides_website` site settings.
---
 .../app/controllers/preferences/profile.js    | 10 ++++++
 .../app/templates/preferences/profile.hbs     | 24 ++++++++------
 app/models/discourse_single_sign_on.rb        |  5 +++
 app/serializers/user_serializer.rb            | 10 ++++++
 app/serializers/web_hook_user_serializer.rb   |  2 ++
 app/services/user_updater.rb                  | 10 ++++--
 config/locales/server.en.yml                  |  2 ++
 config/site_settings.yml                      |  2 ++
 lib/single_sign_on.rb                         |  1 +
 spec/models/discourse_single_sign_on_spec.rb  |  2 ++
 spec/services/user_updater_spec.rb            | 32 +++++++++++++++++++
 test/javascripts/fixtures/user_fixtures.js    |  1 +
 12 files changed, 89 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/profile.js b/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
index 71992e99fd..7eac6c1067 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
@@ -48,6 +48,16 @@ export default Controller.extend({
     return canChangeBio;
   },
 
+  @discourseComputed("model.can_change_location")
+  canChangeLocation(canChangeLocation) {
+    return canChangeLocation;
+  },
+
+  @discourseComputed("model.can_change_website")
+  canChangeWebsite(canChangeWebsite) {
+    return canChangeWebsite;
+  },
+
   actions: {
     showFeaturedTopicModal() {
       showModal("feature-topic-on-profile", {
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
index f07bcafb74..fb3d780b0e 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
@@ -17,19 +17,23 @@
   {{d-button icon="globe" label="user.use_current_timezone" action=(action "useCurrentTimezone") }}
 </div>
 
-<div class="control-group pref-location">
-  <label class="control-label">{{i18n "user.location"}}</label>
-  <div class="controls">
-    {{input type="text" value=model.location class="input-xxlarge" id="edit-location"}}
+{{#if model.can_change_location}}
+  <div class="control-group pref-location">
+    <label class="control-label">{{i18n "user.location"}}</label>
+    <div class="controls">
+      {{input type="text" value=model.location class="input-xxlarge" id="edit-location"}}
+    </div>
   </div>
-</div>
+{{/if}}
 
-<div class="control-group pref-website">
-  <label class="control-label">{{i18n "user.website"}}</label>
-  <div class="controls">
-    {{input type="text" value=model.website class="input-xxlarge"}}
+{{#if model.can_change_website}}
+  <div class="control-group pref-website">
+    <label class="control-label">{{i18n "user.website"}}</label>
+    <div class="controls">
+      {{input type="text" value=model.website class="input-xxlarge"}}
+    </div>
   </div>
-</div>
+{{/if}}
 
 {{#each userFields as |uf|}}
   <div class="control-group">
diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index 085946cf84..ab8c6c6a25 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -117,6 +117,11 @@ class DiscourseSingleSignOn < SingleSignOn
       user.user_profile.save!
     end
 
+    if location
+      user.user_profile.location = location
+      user.user_profile.save!
+    end
+
     unless admin.nil? && moderator.nil?
       Group.refresh_automatic_groups!(:admins, :moderators, :staff)
     end
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 866dc39a8d..352603d755 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -51,6 +51,8 @@ class UserSerializer < UserCardSerializer
                      :ignored_usernames,
                      :mailing_list_posts_per_day,
                      :can_change_bio,
+                     :can_change_location,
+                     :can_change_website,
                      :user_api_keys,
                      :user_auth_tokens
 
@@ -108,6 +110,14 @@ class UserSerializer < UserCardSerializer
     !(SiteSetting.enable_sso && SiteSetting.sso_overrides_bio)
   end
 
+  def can_change_location
+    !(SiteSetting.enable_sso && SiteSetting.sso_overrides_location)
+  end
+
+  def can_change_website
+    !(SiteSetting.enable_sso && SiteSetting.sso_overrides_website)
+  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 4fd63a8abe..31d178b1a0 100644
--- a/app/serializers/web_hook_user_serializer.rb
+++ b/app/serializers/web_hook_user_serializer.rb
@@ -27,6 +27,8 @@ class WebHookUserSerializer < UserSerializer
     gravatar_avatar_upload_id
     custom_avatar_upload_id
     can_change_bio
+    can_change_location
+    can_change_website
     user_api_keys
     group_users
     user_auth_tokens
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 02db79cb95..b30f5b13c7 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -52,13 +52,19 @@ class UserUpdater
 
   def update(attributes = {})
     user_profile = user.user_profile
-    user_profile.location = attributes.fetch(:location) { user_profile.location }
     user_profile.dismissed_banner_key = attributes[:dismissed_banner_key] if attributes[:dismissed_banner_key].present?
-    user_profile.website = format_url(attributes.fetch(:website) { user_profile.website })
     unless SiteSetting.enable_sso && SiteSetting.sso_overrides_bio
       user_profile.bio_raw = attributes.fetch(:bio_raw) { user_profile.bio_raw }
     end
 
+    unless SiteSetting.enable_sso && SiteSetting.sso_overrides_location
+      user_profile.location = attributes.fetch(:location) { user_profile.location }
+    end
+
+    unless SiteSetting.enable_sso && SiteSetting.sso_overrides_website
+      user_profile.website = format_url(attributes.fetch(:website) { user_profile.website })
+    end
+
     if attributes[:profile_background_upload_url] == ""
       user_profile.profile_background_upload_id = nil
     elsif upload = Upload.get_from_url(attributes[:profile_background_upload_url])
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index baf137f94b..7a0ebe6f4e 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1623,6 +1623,8 @@ en:
     sso_overrides_username: "Overrides local username with external site username from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to differences in username length/requirements)"
     sso_overrides_name: "Overrides local full name with external site full name from SSO payload on every login, and prevent local changes."
     sso_overrides_avatar: "Overrides user avatar with external site avatar from SSO payload. If enabled, users will not be allowed to upload avatars on Discourse."
+    sso_overrides_location: "Overrides user location with external location from SSO payload and prevent local changes."
+    sso_overrides_website: "Overrides user website with external location from SSO payload and prevent local changes."
     sso_overrides_profile_background: "Overrides user profile background with external site avatar from SSO payload."
     sso_overrides_card_background: "Overrides user card background with external site avatar from SSO payload."
     sso_not_approved_url: "Redirect unapproved SSO accounts to this URL"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 7d9fd0fd86..ed4a4f1b81 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -454,6 +454,8 @@ login:
     default: false
     client: true
   sso_overrides_profile_background: false
+  sso_overrides_location: false
+  sso_overrides_website: false
   sso_overrides_card_background: false
   sso_not_approved_url: ""
   email_domains_blacklist:
diff --git a/lib/single_sign_on.rb b/lib/single_sign_on.rb
index a8e8ea7905..e1436ced9f 100644
--- a/lib/single_sign_on.rb
+++ b/lib/single_sign_on.rb
@@ -27,6 +27,7 @@ class SingleSignOn
     title
     username
     website
+    location
   }
 
   FIXNUMS = []
diff --git a/spec/models/discourse_single_sign_on_spec.rb b/spec/models/discourse_single_sign_on_spec.rb
index 538d18d212..fb318d16bc 100644
--- a/spec/models/discourse_single_sign_on_spec.rb
+++ b/spec/models/discourse_single_sign_on_spec.rb
@@ -33,6 +33,7 @@ describe DiscourseSingleSignOn do
     sso.custom_fields["a"] = "Aa"
     sso.custom_fields["b.b"] = "B.b"
     sso.website = "https://www.discourse.org/"
+    sso.location = "Home"
     sso
   end
 
@@ -53,6 +54,7 @@ describe DiscourseSingleSignOn do
     expect(parsed.custom_fields["a"]).to eq "Aa"
     expect(parsed.custom_fields["b.b"]).to eq "B.b"
     expect(parsed.website).to eq sso.website
+    expect(parsed.location).to eq sso.location
   end
 
   it "can do round trip parsing correctly" do
diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb
index c18949ab5e..158c943da6 100644
--- a/spec/services/user_updater_spec.rb
+++ b/spec/services/user_updater_spec.rb
@@ -249,6 +249,38 @@ describe UserUpdater do
       end
     end
 
+    context 'when sso overrides location' do
+      it 'does not change location' do
+        SiteSetting.sso_url = "https://www.example.com/sso"
+        SiteSetting.enable_sso = true
+        SiteSetting.sso_overrides_location = true
+
+        user = Fabricate(:user)
+        updater = UserUpdater.new(acting_user, user)
+
+        expect(updater.update(location: "new location")).to be_truthy
+
+        user.reload
+        expect(user.user_profile.location).not_to eq 'new location'
+      end
+    end
+
+    context 'when sso overrides website' do
+      it 'does not change website' do
+        SiteSetting.sso_url = "https://www.example.com/sso"
+        SiteSetting.enable_sso = true
+        SiteSetting.sso_overrides_website = true
+
+        user = Fabricate(:user)
+        updater = UserUpdater.new(acting_user, user)
+
+        expect(updater.update(website: "https://google.com")).to be_truthy
+
+        user.reload
+        expect(user.user_profile.website).not_to eq 'https://google.com'
+      end
+    end
+
     context 'when updating primary group' do
       let(:new_group) { Group.create(name: 'new_group') }
       let(:user) { Fabricate(:user) }
diff --git a/test/javascripts/fixtures/user_fixtures.js b/test/javascripts/fixtures/user_fixtures.js
index 2bac0bfe34..abf4a39037 100644
--- a/test/javascripts/fixtures/user_fixtures.js
+++ b/test/javascripts/fixtures/user_fixtures.js
@@ -187,6 +187,7 @@ export default {
       card_image_badge: "/images/avatar.png",
       card_image_badge_id: 120,
       muted_usernames: [],
+      can_change_location: true,
       ignored_usernames: [],
       invited_by: {
         id: 1,

From 5108cf8ddf581c1f68e683f012d5c9be789222b8 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 28 Apr 2020 16:19:25 +1000
Subject: [PATCH 0818/1830] FIX: Topic user bookmarked column logic was not
 correct (#9563)

Make sure the topic_user.bookmarked column is set correctly when user bookmarks/unbookmarks any post in a topic. For example, you bookmarked a post in the topic that was not the OP, the bookmark icon in the topic list would not be shown. Same if deleting a bookmark for the last bookmarked post in a topic, the bookmark icon in the topic list would not be removed.

Previously this was only setting it to true if bookmarking the OP/topic, which was not correct -- we want to show the icon on the topic list if any post is bookmarked.
Also set to false if unbookmarking the last bookmarked post in the topic.
Also in this PR is a migration to correct any out of sync topic_user.bookmarked columns, based on the new logic.
---
 ...5_correct_topic_user_bookmarked_boolean.rb | 26 ++++++++++++++++++
 lib/bookmark_manager.rb                       | 12 +++++----
 spec/lib/bookmark_manager_spec.rb             | 27 +++++++++++++------
 3 files changed, 52 insertions(+), 13 deletions(-)
 create mode 100644 db/migrate/20200428014005_correct_topic_user_bookmarked_boolean.rb

diff --git a/db/migrate/20200428014005_correct_topic_user_bookmarked_boolean.rb b/db/migrate/20200428014005_correct_topic_user_bookmarked_boolean.rb
new file mode 100644
index 0000000000..9d6f8ea029
--- /dev/null
+++ b/db/migrate/20200428014005_correct_topic_user_bookmarked_boolean.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class CorrectTopicUserBookmarkedBoolean < ActiveRecord::Migration[6.0]
+  def up
+    # if the relation exists then we set to bookmarked because
+    # at least 1 bookmark for the user + topic exists
+    DB.exec(
+      <<~SQL
+        UPDATE topic_users SET bookmarked = true
+        FROM bookmarks AS b
+        WHERE NOT topic_users.bookmarked AND topic_users.topic_id = b.topic_id AND topic_users.user_id = b.user_id
+      SQL
+    )
+
+    DB.exec(
+      <<~SQL
+        UPDATE topic_users SET bookmarked = false
+        WHERE topic_users.bookmarked AND (SELECT COUNT(*) FROM bookmarks WHERE topic_id = topic_users.topic_id AND user_id = topic_users.user_id) = 0
+      SQL
+    )
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index ee69db4ec9..1670a97661 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -27,10 +27,7 @@ class BookmarkManager
       return add_errors_from(bookmark)
     end
 
-    # bookmarking the topic-level mean
-    if post.is_first_post?
-      update_topic_user_bookmarked(topic: post.topic, bookmarked: true)
-    end
+    update_topic_user_bookmarked(topic: post.topic, bookmarked: true)
 
     BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(@user)
     bookmark
@@ -45,7 +42,12 @@ class BookmarkManager
     bookmark.destroy
     clear_at_desktop_cache_if_required
 
-    { topic_bookmarked: Bookmark.exists?(topic_id: bookmark.topic_id, user: @user) }
+    bookmarks_remaining_in_topic = Bookmark.exists?(topic_id: bookmark.topic_id, user: @user)
+    if !bookmarks_remaining_in_topic
+      update_topic_user_bookmarked(topic: bookmark.topic, bookmarked: false)
+    end
+
+    { topic_bookmarked: bookmarks_remaining_in_topic }
   end
 
   def destroy_for_topic(topic)
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index 9dfe6ff23a..34b029b515 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -21,6 +21,16 @@ RSpec.describe BookmarkManager do
       expect(bookmark.topic_id).to eq(post.topic_id)
     end
 
+    it "updates the topic user bookmarked column to true if any post is bookmarked" do
+      subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
+      tu = TopicUser.find_by(user: user)
+      expect(tu.bookmarked).to eq(true)
+      tu.update(bookmarked: false)
+      subject.create(post_id: Fabricate(:post, topic: post.topic).id)
+      tu.reload
+      expect(tu.bookmarked).to eq(true)
+    end
+
     context "when a reminder time + type is provided" do
       it "saves the values correctly" do
         subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
@@ -32,14 +42,6 @@ RSpec.describe BookmarkManager do
       end
     end
 
-    context "when bookmarking the topic level (post is OP)" do
-      it "updates the topic user bookmarked column to true" do
-        subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
-        tu = TopicUser.find_by(user: user)
-        expect(tu.bookmarked).to eq(true)
-      end
-    end
-
     context "when the reminder type is at_desktop" do
       let(:reminder_type) { 'at_desktop' }
       let(:reminder_at) { nil }
@@ -134,6 +136,15 @@ RSpec.describe BookmarkManager do
       expect(result[:topic_bookmarked]).to eq(true)
     end
 
+    context "if the bookmark is the last one bookmarked in the topic" do
+      it "marks the topic user bookmarked column as false" do
+        TopicUser.create(user: user, topic: bookmark.post.topic, bookmarked: true)
+        subject.destroy(bookmark.id)
+        tu = TopicUser.find_by(user: user)
+        expect(tu.bookmarked).to eq(false)
+      end
+    end
+
     context "if the bookmark is belonging to some other user" do
       let!(:bookmark) { Fabricate(:bookmark, user: Fabricate(:admin), post: post) }
       it "raises an invalid access error" do

From 6b62d75c50148c8d7fec044adcf3a3ff099b3501 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 28 Apr 2020 16:27:33 +1000
Subject: [PATCH 0819/1830] FIX: remove unsuppored rake task

rebuilding user_actions is not something that should be done.

Plugins such as solved and assigned extend it, there are tons of
little rules that were not captured in `user_actions:rebuild`
---
 lib/tasks/user_actions.rake | 41 -------------------------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 lib/tasks/user_actions.rake

diff --git a/lib/tasks/user_actions.rake b/lib/tasks/user_actions.rake
deleted file mode 100644
index 2d2631d1f3..0000000000
--- a/lib/tasks/user_actions.rake
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-desc "rebuild the user_actions table"
-task "user_actions:rebuild" => :environment do
-  MessageBus.off
-  UserAction.delete_all
-  PostAction.all.each do |i|
-    if i.deleted_at.nil?
-      UserActionManager.post_action_created(i)
-    else
-      UserActionManager.post_action_destroyed(i)
-    end
-  end
-  Topic.all.each { |i| UserActionManager.log_topic(i) }
-  Post.all.each do |i|
-    if i.deleted_at.nil?
-      UserActionManager.post_created(i)
-    else
-      UserActionManager.post_destroyed(i)
-    end
-  end
-  Notification.all.each do |notification|
-
-    if notification.post.deleted_at.nil?
-      UserActionManager.notification_created(
-        notification.post,
-        notification.user,
-        notification.notification_type,
-        notification.user
-      )
-    else
-      UserActionManager.notification_destroyed(
-        notification.post,
-        notification.user,
-        notification.notification_type,
-        notification.user
-      )
-    end
-
-  end
-end

From 198856f78de438752b92cbc034a5f2906475e737 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Tue, 28 Apr 2020 15:59:39 +0530
Subject: [PATCH 0820/1830] DEV: annotate models

---
 app/models/custom_emoji.rb       |  2 +-
 app/models/published_page.rb     | 16 ++++++++++++++++
 app/models/topic_custom_field.rb |  1 +
 app/models/topic_timer.rb        |  1 +
 app/models/user_badge.rb         |  1 +
 app/models/user_custom_field.rb  |  4 +---
 6 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index 118615c98e..809b4ba6c0 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -14,9 +14,9 @@ end
 #  id         :integer          not null, primary key
 #  name       :string           not null
 #  upload_id  :integer          not null
-#  group      :string
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
+#  group      :string(20)
 #
 # Indexes
 #
diff --git a/app/models/published_page.rb b/app/models/published_page.rb
index 3c232b6547..648f6b8b50 100644
--- a/app/models/published_page.rb
+++ b/app/models/published_page.rb
@@ -46,3 +46,19 @@ class PublishedPage < ActiveRecord::Base
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: published_pages
+#
+#  id         :bigint           not null, primary key
+#  topic_id   :bigint           not null
+#  slug       :string           not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+# Indexes
+#
+#  index_published_pages_on_slug      (slug) UNIQUE
+#  index_published_pages_on_topic_id  (topic_id) UNIQUE
+#
diff --git a/app/models/topic_custom_field.rb b/app/models/topic_custom_field.rb
index ba5767084e..e922b7b26e 100644
--- a/app/models/topic_custom_field.rb
+++ b/app/models/topic_custom_field.rb
@@ -17,6 +17,7 @@ end
 #
 # Indexes
 #
+#  idx_topic_custom_fields_accepted_answer         (topic_id) UNIQUE WHERE ((name)::text = 'accepted_answer_post_id'::text)
 #  index_topic_custom_fields_on_topic_id_and_name  (topic_id,name)
 #  topic_custom_fields_value_key_idx               (value,name) WHERE ((value IS NOT NULL) AND (char_length(value) < 400))
 #
diff --git a/app/models/topic_timer.rb b/app/models/topic_timer.rb
index c8274da9f5..20e3bb67f9 100644
--- a/app/models/topic_timer.rb
+++ b/app/models/topic_timer.rb
@@ -178,6 +178,7 @@ end
 #  updated_at         :datetime         not null
 #  category_id        :integer
 #  public_type        :boolean          default(TRUE)
+#  duration           :integer
 #
 # Indexes
 #
diff --git a/app/models/user_badge.rb b/app/models/user_badge.rb
index 5f4a3fcd07..082f645c71 100644
--- a/app/models/user_badge.rb
+++ b/app/models/user_badge.rb
@@ -101,6 +101,7 @@ end
 #  notification_id :integer
 #  seq             :integer          default(0), not null
 #  featured_rank   :integer
+#  created_at      :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/user_custom_field.rb b/app/models/user_custom_field.rb
index bba98cd9b4..0fb77e5f63 100644
--- a/app/models/user_custom_field.rb
+++ b/app/models/user_custom_field.rb
@@ -17,7 +17,5 @@ end
 #
 # Indexes
 #
-#  idx_user_custom_fields_last_reminded_at          (name,user_id) UNIQUE WHERE ((name)::text = 'last_reminded_at'::text)
-#  idx_user_custom_fields_remind_assigns_frequency  (name,user_id) UNIQUE WHERE ((name)::text = 'remind_assigns_frequency'::text)
-#  index_user_custom_fields_on_user_id_and_name     (user_id,name)
+#  index_user_custom_fields_on_user_id_and_name  (user_id,name)
 #

From 7177b9d771446bf8a5e04163fb5fb033d1db3155 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 28 Apr 2020 14:29:42 +0200
Subject: [PATCH 0821/1830] UX: Translating poll chart types wasn't possible

---
 .../javascripts/controllers/poll-ui-builder.js.es6     | 10 ++++++++--
 plugins/poll/config/locales/client.en.yml              |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
index e5ca3d05d6..a653b8113b 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
@@ -15,8 +15,14 @@ export default Controller.extend({
   closedPollResult: "on_close",
   staffPollResult: "staff_only",
   pollChartTypes: [
-    { name: BAR_CHART_TYPE.capitalize(), value: BAR_CHART_TYPE },
-    { name: PIE_CHART_TYPE.capitalize(), value: PIE_CHART_TYPE }
+    {
+      name: I18n.t("poll.ui_builder.poll_chart_type.bar"),
+      value: BAR_CHART_TYPE
+    },
+    {
+      name: I18n.t("poll.ui_builder.poll_chart_type.pie"),
+      value: PIE_CHART_TYPE
+    }
   ],
 
   pollType: null,
diff --git a/plugins/poll/config/locales/client.en.yml b/plugins/poll/config/locales/client.en.yml
index ae4a258e88..035630f421 100644
--- a/plugins/poll/config/locales/client.en.yml
+++ b/plugins/poll/config/locales/client.en.yml
@@ -118,6 +118,8 @@ en:
           label: Allowed groups
         poll_chart_type:
           label: Chart type
+          bar: Bar
+          pie: Pie
         poll_config:
           max: Max
           min: Min

From ba616ffb503686ac811fee67580de1a2d4e47287 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 28 Apr 2020 14:03:04 +0100
Subject: [PATCH 0822/1830] DEV: Use a tmp directory for storing uploads in
 tests (#9554)

This avoids development-mode upload files from polluting the test environment
---
 config/routes.rb                                 | 4 ++--
 lib/file_store/base_store.rb                     | 6 ++----
 lib/s3_helper.rb                                 | 4 ++--
 spec/lib/backup_restore/uploads_restorer_spec.rb | 4 +---
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index e280af6dd1..10199d1dff 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -519,8 +519,8 @@ Discourse::Application.routes.draw do
   get "uploads/short-url/:base62(.:extension)" => "uploads#show_short", constraints: { site: /\w+/, base62: /[a-zA-Z0-9]+/, extension: /[a-z0-9\._]+/i }, as: :upload_short
   # used to download attachments
   get "uploads/:site/original/:tree:sha(.:extension)" => "uploads#show", constraints: { site: /\w+/, tree: /([a-z0-9]+\/)+/i, sha: /\h{40}/, extension: /[a-z0-9\._]+/i }
-  if Discourse.is_parallel_test?
-    get "uploads/:site/:index/original/:tree:sha(.:extension)" => "uploads#show", constraints: { site: /\w+/, index: /\d+/, tree: /([a-z0-9]+\/)+/i, sha: /\h{40}/, extension: /[a-z0-9\._]+/i }
+  if Rails.env.test?
+    get "uploads/:site/test_:index/original/:tree:sha(.:extension)" => "uploads#show", constraints: { site: /\w+/, index: /\d+/, tree: /([a-z0-9]+\/)+/i, sha: /\h{40}/, extension: /[a-z0-9\._]+/i }
   end
   # used to download attachments (old route)
   get "uploads/:site/:id/:sha" => "uploads#show", constraints: { site: /\w+/, id: /\d+/, sha: /\h{16}/, format: /.*/ }
diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rb
index 563970d088..a3623f1fea 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -32,10 +32,8 @@ module FileStore
 
     def upload_path
       path = File.join("uploads", RailsMultisite::ConnectionManagement.current_db)
-      return path unless Discourse.is_parallel_test?
-
-      n = ENV['TEST_ENV_NUMBER'].presence || '1'
-      File.join(path, n)
+      return path if !Rails.env.test?
+      File.join(path, "test_#{ENV['TEST_ENV_NUMBER'].presence || '0'}")
     end
 
     def has_been_uploaded?(url)
diff --git a/lib/s3_helper.rb b/lib/s3_helper.rb
index 5763921caa..a1f921e9af 100644
--- a/lib/s3_helper.rb
+++ b/lib/s3_helper.rb
@@ -248,8 +248,8 @@ class S3Helper
 
   def multisite_upload_path
     path = File.join("uploads", RailsMultisite::ConnectionManagement.current_db, "/")
-    return path unless Discourse.is_parallel_test?
-    File.join(path, ENV['TEST_ENV_NUMBER'].presence || '1', "/")
+    return path if !Rails.env.test?
+    File.join(path, "test_#{ENV['TEST_ENV_NUMBER'].presence || '0'}", "/")
   end
 
   def s3_resource
diff --git a/spec/lib/backup_restore/uploads_restorer_spec.rb b/spec/lib/backup_restore/uploads_restorer_spec.rb
index 15fbcd24ce..fba41193fe 100644
--- a/spec/lib/backup_restore/uploads_restorer_spec.rb
+++ b/spec/lib/backup_restore/uploads_restorer_spec.rb
@@ -73,9 +73,7 @@ describe BackupRestore::UploadsRestorer do
   def uploads_path(database)
     path = File.join("uploads", database)
 
-    if Discourse.is_parallel_test?
-      path = File.join(path, ENV['TEST_ENV_NUMBER'].presence || '1')
-    end
+    path = File.join(path, "test_#{ENV['TEST_ENV_NUMBER'].presence || '0'}")
 
     "/#{path}/"
   end

From 84be92c0671b85ce9ba016b4e867784f7022e5f8 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 28 Apr 2020 14:43:09 +0100
Subject: [PATCH 0823/1830] FIX: Avoid exception when rendering a poll in a
 trashed post

Maintain the poll belongs_to post relation when a post is trashed
---
 plugins/poll/app/models/poll.rb       |  4 ++--
 plugins/poll/spec/models/poll_spec.rb | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/plugins/poll/app/models/poll.rb b/plugins/poll/app/models/poll.rb
index 4f7e0bd584..44ce17f46c 100644
--- a/plugins/poll/app/models/poll.rb
+++ b/plugins/poll/app/models/poll.rb
@@ -4,7 +4,7 @@ class Poll < ActiveRecord::Base
   # because we want to use the 'type' column and don't want to use STI
   self.inheritance_column = nil
 
-  belongs_to :post
+  belongs_to :post, -> { unscope(:where) }
 
   has_many :poll_options, -> { order(:id) }, dependent: :destroy
   has_many :poll_votes
@@ -51,7 +51,7 @@ class Poll < ActiveRecord::Base
   end
 
   def is_me?(user)
-    user && post.user&.id == user&.id
+    user && post && post.user&.id == user&.id
   end
 
   def has_voted?(user)
diff --git a/plugins/poll/spec/models/poll_spec.rb b/plugins/poll/spec/models/poll_spec.rb
index 55e6567d47..fed3310b84 100644
--- a/plugins/poll/spec/models/poll_spec.rb
+++ b/plugins/poll/spec/models/poll_spec.rb
@@ -69,4 +69,18 @@ describe ::DiscoursePoll::Poll do
       expect(poll.can_see_results?(user)).to eq(true)
     end
   end
+
+  describe 'when post is trashed' do
+    it "maintains the association" do
+      user = Fabricate(:user)
+      post = Fabricate(:post, raw: "[poll results=staff_only]\n- A\n- B\n[/poll]", user: user)
+      poll = post.polls.first
+
+      post.trash!
+      poll.reload
+
+      expect(poll.post).to eq(post)
+    end
+
+  end
 end

From c1cc2f2a05e38dfc1e90d0fcffc30b0a21989a87 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 28 Apr 2020 10:14:49 -0400
Subject: [PATCH 0824/1830] DEV: Remove ember-addons (#9559)

We weren't using this very much and introduces a dependency between
discourse-common and discourse which makes moving to yarn workspaces
more difficult.

In the future we might user ember-addons properly but for now it's
easier to move the code into discourse-common.

Note the old folder is still there because at least one plugin was still
requiring the old files. It will be removed in the future.
---
 .git-blame-ignore-revs                        |  3 -
 app/assets/javascripts/application.js         |  4 --
 .../discourse-common/utils/decorator-alias.js | 22 ++++++
 .../discourse-common/utils/decorators.js      | 12 ++--
 .../discourse-common/utils/extract-value.js   |  5 ++
 .../utils/handle-descriptor.js                | 71 ++++++++++++++++++
 .../discourse-common/utils/is-descriptor.js   |  9 +++
 .../discourse-common/utils/macro-alias.js     | 24 +++++++
 .../javascripts/discourse/app/lib/computed.js | 26 ++++++-
 .../ember-addons/decorator-alias.js           | 23 +-----
 app/assets/javascripts/ember-addons/fmt.js    | 26 +------
 .../javascripts/ember-addons/macro-alias.js   | 25 +------
 .../ember-addons/utils/extract-value.js       |  6 +-
 .../ember-addons/utils/handle-descriptor.js   | 72 +------------------
 .../ember-addons/utils/is-descriptor.js       | 10 +--
 app/assets/javascripts/main_include_admin.js  |  1 -
 app/assets/javascripts/wizard-application.js  |  3 -
 17 files changed, 167 insertions(+), 175 deletions(-)
 create mode 100644 app/assets/javascripts/discourse-common/utils/decorator-alias.js
 create mode 100644 app/assets/javascripts/discourse-common/utils/extract-value.js
 create mode 100644 app/assets/javascripts/discourse-common/utils/handle-descriptor.js
 create mode 100644 app/assets/javascripts/discourse-common/utils/is-descriptor.js
 create mode 100644 app/assets/javascripts/discourse-common/utils/macro-alias.js

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index a4d8022ec5..81d5a2fff5 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -26,9 +26,6 @@ acc5cbdf8ecb9293a0fa9474ee73baf499c02428
 # Rename discourse-common es6 -> js
 167503ca4824e37a2e93d74b3f50271556d0ba8e
 
-# Rename ember-addons es6 -> js
-16ba50bce362c1eefe1881f86c67bec66f493abb
-
 # Rename some root files
 11938d58d4b1bea1ff43306450da7b24f05db0a
 
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 67722ed0d8..86d34b4a82 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,8 +1,4 @@
-//= require_tree ./ember-addons/utils
 //= require_tree ./discourse-common
-//= require ./ember-addons/decorator-alias
-//= require ./ember-addons/macro-alias
-//= require ./ember-addons/fmt
 //= require ./polyfills
 //= require_tree ./select-kit
 //= require ./discourse/app/app
diff --git a/app/assets/javascripts/discourse-common/utils/decorator-alias.js b/app/assets/javascripts/discourse-common/utils/decorator-alias.js
new file mode 100644
index 0000000000..c483a1cc4f
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/utils/decorator-alias.js
@@ -0,0 +1,22 @@
+import extractValue from "discourse-common/utils/extract-value";
+
+export default function decoratorAlias(fn, errorMessage) {
+  return function(...params) {
+    // determine if user called as @discourseComputed('blah', 'blah') or @discourseComputed
+    if (params.length === 0) {
+      throw new Error(errorMessage);
+    } else {
+      return function(target, key, desc) {
+        return {
+          enumerable: desc.enumerable,
+          configurable: desc.configurable,
+          writable: desc.writable,
+          initializer: function() {
+            var value = extractValue(desc);
+            return fn.apply(null, params.concat(value));
+          }
+        };
+      };
+    }
+  };
+}
diff --git a/app/assets/javascripts/discourse-common/utils/decorators.js b/app/assets/javascripts/discourse-common/utils/decorators.js
index 36e537a063..2b6548ed1d 100644
--- a/app/assets/javascripts/discourse-common/utils/decorators.js
+++ b/app/assets/javascripts/discourse-common/utils/decorators.js
@@ -1,6 +1,8 @@
-import handleDescriptor from "ember-addons/utils/handle-descriptor";
-import isDescriptor from "ember-addons/utils/is-descriptor";
-import extractValue from "ember-addons/utils/extract-value";
+import handleDescriptor from "discourse-common/utils/handle-descriptor";
+import isDescriptor from "discourse-common/utils/is-descriptor";
+import extractValue from "discourse-common/utils/extract-value";
+import decoratorAlias from "discourse-common/utils/decorator-alias";
+import macroAlias from "discourse-common/utils/macro-alias";
 import { schedule, next } from "@ember/runloop";
 
 export default function discourseComputedDecorator(...params) {
@@ -39,8 +41,6 @@ export function readOnly(target, name, desc) {
   };
 }
 
-import decoratorAlias from "ember-addons/decorator-alias";
-
 /* eslint-disable */
 export var on = decoratorAlias(Ember.on, "Can not `on` without event names");
 export var observes = decoratorAlias(
@@ -48,8 +48,6 @@ export var observes = decoratorAlias(
   "Can not `observe` without property names"
 );
 
-import macroAlias from "ember-addons/macro-alias";
-
 export var alias = macroAlias(Ember.computed.alias);
 export var and = macroAlias(Ember.computed.and);
 export var bool = macroAlias(Ember.computed.bool);
diff --git a/app/assets/javascripts/discourse-common/utils/extract-value.js b/app/assets/javascripts/discourse-common/utils/extract-value.js
new file mode 100644
index 0000000000..839d2e924c
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/utils/extract-value.js
@@ -0,0 +1,5 @@
+export default function extractValue(desc) {
+  return (
+    desc.value || (typeof desc.initializer === "function" && desc.initializer())
+  );
+}
diff --git a/app/assets/javascripts/discourse-common/utils/handle-descriptor.js b/app/assets/javascripts/discourse-common/utils/handle-descriptor.js
new file mode 100644
index 0000000000..e4899c938e
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/utils/handle-descriptor.js
@@ -0,0 +1,71 @@
+import { computed, get } from "@ember/object";
+import extractValue from "./extract-value";
+
+export default function handleDescriptor(target, key, desc, params = []) {
+  return {
+    enumerable: desc.enumerable,
+    configurable: desc.configurable,
+    writeable: desc.writeable,
+    initializer: function() {
+      let computedDescriptor;
+
+      if (desc.writable) {
+        var val = extractValue(desc);
+        if (typeof val === "object") {
+          let value = {};
+          if (val.get) {
+            value.get = callUserSuppliedGet(params, val.get);
+          }
+          if (val.set) {
+            value.set = callUserSuppliedSet(params, val.set);
+          }
+          computedDescriptor = value;
+        } else {
+          computedDescriptor = callUserSuppliedGet(params, val);
+        }
+      } else {
+        throw new Error(
+          "ember-computed-decorators does not support using getters and setters"
+        );
+      }
+
+      return computed.apply(null, params.concat(computedDescriptor));
+    }
+  };
+}
+
+function niceAttr(attr) {
+  const parts = attr.split(".");
+  let i;
+
+  for (i = 0; i < parts.length; i++) {
+    if (
+      parts[i] === "@each" ||
+      parts[i] === "[]" ||
+      parts[i].indexOf("{") !== -1
+    ) {
+      break;
+    }
+  }
+
+  return parts.slice(0, i).join(".");
+}
+
+function callUserSuppliedGet(params, func) {
+  params = params.map(niceAttr);
+  return function() {
+    let paramValues = params.map(p => get(this, p));
+
+    return func.apply(this, paramValues);
+  };
+}
+
+function callUserSuppliedSet(params, func) {
+  params = params.map(niceAttr);
+  return function(key, value) {
+    let paramValues = params.map(p => get(this, p));
+    paramValues.unshift(value);
+
+    return func.apply(this, paramValues);
+  };
+}
diff --git a/app/assets/javascripts/discourse-common/utils/is-descriptor.js b/app/assets/javascripts/discourse-common/utils/is-descriptor.js
new file mode 100644
index 0000000000..2e64777f70
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/utils/is-descriptor.js
@@ -0,0 +1,9 @@
+export default function isDescriptor(item) {
+  return (
+    item &&
+    typeof item === "object" &&
+    "writable" in item &&
+    "enumerable" in item &&
+    "configurable" in item
+  );
+}
diff --git a/app/assets/javascripts/discourse-common/utils/macro-alias.js b/app/assets/javascripts/discourse-common/utils/macro-alias.js
new file mode 100644
index 0000000000..5d6223f108
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/utils/macro-alias.js
@@ -0,0 +1,24 @@
+import isDescriptor from "discourse-common/utils/is-descriptor";
+
+function handleDescriptor(target, property, desc, fn, params = []) {
+  return {
+    enumerable: desc.enumerable,
+    configurable: desc.configurable,
+    writable: desc.writable,
+    initializer: function() {
+      return fn(...params);
+    }
+  };
+}
+
+export default function macroAlias(fn) {
+  return function(...params) {
+    if (isDescriptor(params[params.length - 1])) {
+      return handleDescriptor(...params, fn);
+    } else {
+      return function(target, property, desc) {
+        return handleDescriptor(target, property, desc, fn, params);
+      };
+    }
+  };
+}
diff --git a/app/assets/javascripts/discourse/app/lib/computed.js b/app/assets/javascripts/discourse/app/lib/computed.js
index e238320a38..321ea32464 100644
--- a/app/assets/javascripts/discourse/app/lib/computed.js
+++ b/app/assets/javascripts/discourse/app/lib/computed.js
@@ -1,7 +1,31 @@
 import { computed } from "@ember/object";
-import addonFmt from "ember-addons/fmt";
 import { htmlSafe as htmlSafeTemplateHelper } from "@ember/template";
 
+function addonFmt(str, formats) {
+  let cachedFormats = formats;
+
+  if (!_.isArray(cachedFormats) || arguments.length > 2) {
+    cachedFormats = new Array(arguments.length - 1);
+
+    for (let i = 1, l = arguments.length; i < l; i++) {
+      cachedFormats[i - 1] = arguments[i];
+    }
+  }
+
+  // first, replace any ORDERED replacements.
+  let idx = 0; // the current index for non-numerical replacements
+  return str.replace(/%@([0-9]+)?/g, function(s, argIndex) {
+    argIndex = argIndex ? parseInt(argIndex, 10) - 1 : idx++;
+    s = cachedFormats[argIndex];
+    return typeof s === "string"
+      ? s
+      : s === null
+      ? "(null)"
+      : s === undefined
+      ? ""
+      : "" + s;
+  });
+}
 /**
   Returns whether two properties are equal to each other.
 
diff --git a/app/assets/javascripts/ember-addons/decorator-alias.js b/app/assets/javascripts/ember-addons/decorator-alias.js
index 327dc7a2cb..55906d297c 100644
--- a/app/assets/javascripts/ember-addons/decorator-alias.js
+++ b/app/assets/javascripts/ember-addons/decorator-alias.js
@@ -1,22 +1 @@
-import extractValue from "./utils/extract-value";
-
-export default function decoratorAlias(fn, errorMessage) {
-  return function(...params) {
-    // determine if user called as @discourseComputed('blah', 'blah') or @discourseComputed
-    if (params.length === 0) {
-      throw new Error(errorMessage);
-    } else {
-      return function(target, key, desc) {
-        return {
-          enumerable: desc.enumerable,
-          configurable: desc.configurable,
-          writable: desc.writable,
-          initializer: function() {
-            var value = extractValue(desc);
-            return fn.apply(null, params.concat(value));
-          }
-        };
-      };
-    }
-  };
-}
+// left empty for backwards compatibility. Should be removed in the future
diff --git a/app/assets/javascripts/ember-addons/fmt.js b/app/assets/javascripts/ember-addons/fmt.js
index b9c28e84e4..55906d297c 100644
--- a/app/assets/javascripts/ember-addons/fmt.js
+++ b/app/assets/javascripts/ember-addons/fmt.js
@@ -1,25 +1 @@
-export default function(str, formats) {
-  let cachedFormats = formats;
-
-  if (!_.isArray(cachedFormats) || arguments.length > 2) {
-    cachedFormats = new Array(arguments.length - 1);
-
-    for (let i = 1, l = arguments.length; i < l; i++) {
-      cachedFormats[i - 1] = arguments[i];
-    }
-  }
-
-  // first, replace any ORDERED replacements.
-  let idx = 0; // the current index for non-numerical replacements
-  return str.replace(/%@([0-9]+)?/g, function(s, argIndex) {
-    argIndex = argIndex ? parseInt(argIndex, 10) - 1 : idx++;
-    s = cachedFormats[argIndex];
-    return typeof s === "string"
-      ? s
-      : s === null
-      ? "(null)"
-      : s === undefined
-      ? ""
-      : "" + s;
-  });
-}
+// left empty for backwards compatibility. Should be removed in the future
diff --git a/app/assets/javascripts/ember-addons/macro-alias.js b/app/assets/javascripts/ember-addons/macro-alias.js
index a882e96d65..55906d297c 100644
--- a/app/assets/javascripts/ember-addons/macro-alias.js
+++ b/app/assets/javascripts/ember-addons/macro-alias.js
@@ -1,24 +1 @@
-import isDescriptor from "./utils/is-descriptor";
-
-function handleDescriptor(target, property, desc, fn, params = []) {
-  return {
-    enumerable: desc.enumerable,
-    configurable: desc.configurable,
-    writable: desc.writable,
-    initializer: function() {
-      return fn(...params);
-    }
-  };
-}
-
-export default function macroAlias(fn) {
-  return function(...params) {
-    if (isDescriptor(params[params.length - 1])) {
-      return handleDescriptor(...params, fn);
-    } else {
-      return function(target, property, desc) {
-        return handleDescriptor(target, property, desc, fn, params);
-      };
-    }
-  };
-}
+// left empty for backwards compatibility. Should be removed in the future
diff --git a/app/assets/javascripts/ember-addons/utils/extract-value.js b/app/assets/javascripts/ember-addons/utils/extract-value.js
index 839d2e924c..b76b83e084 100644
--- a/app/assets/javascripts/ember-addons/utils/extract-value.js
+++ b/app/assets/javascripts/ember-addons/utils/extract-value.js
@@ -1,5 +1 @@
-export default function extractValue(desc) {
-  return (
-    desc.value || (typeof desc.initializer === "function" && desc.initializer())
-  );
-}
+// left for backwards compatibility. remove in the future.
diff --git a/app/assets/javascripts/ember-addons/utils/handle-descriptor.js b/app/assets/javascripts/ember-addons/utils/handle-descriptor.js
index e4899c938e..b76b83e084 100644
--- a/app/assets/javascripts/ember-addons/utils/handle-descriptor.js
+++ b/app/assets/javascripts/ember-addons/utils/handle-descriptor.js
@@ -1,71 +1 @@
-import { computed, get } from "@ember/object";
-import extractValue from "./extract-value";
-
-export default function handleDescriptor(target, key, desc, params = []) {
-  return {
-    enumerable: desc.enumerable,
-    configurable: desc.configurable,
-    writeable: desc.writeable,
-    initializer: function() {
-      let computedDescriptor;
-
-      if (desc.writable) {
-        var val = extractValue(desc);
-        if (typeof val === "object") {
-          let value = {};
-          if (val.get) {
-            value.get = callUserSuppliedGet(params, val.get);
-          }
-          if (val.set) {
-            value.set = callUserSuppliedSet(params, val.set);
-          }
-          computedDescriptor = value;
-        } else {
-          computedDescriptor = callUserSuppliedGet(params, val);
-        }
-      } else {
-        throw new Error(
-          "ember-computed-decorators does not support using getters and setters"
-        );
-      }
-
-      return computed.apply(null, params.concat(computedDescriptor));
-    }
-  };
-}
-
-function niceAttr(attr) {
-  const parts = attr.split(".");
-  let i;
-
-  for (i = 0; i < parts.length; i++) {
-    if (
-      parts[i] === "@each" ||
-      parts[i] === "[]" ||
-      parts[i].indexOf("{") !== -1
-    ) {
-      break;
-    }
-  }
-
-  return parts.slice(0, i).join(".");
-}
-
-function callUserSuppliedGet(params, func) {
-  params = params.map(niceAttr);
-  return function() {
-    let paramValues = params.map(p => get(this, p));
-
-    return func.apply(this, paramValues);
-  };
-}
-
-function callUserSuppliedSet(params, func) {
-  params = params.map(niceAttr);
-  return function(key, value) {
-    let paramValues = params.map(p => get(this, p));
-    paramValues.unshift(value);
-
-    return func.apply(this, paramValues);
-  };
-}
+// left for backwards compatibility. remove in the future.
diff --git a/app/assets/javascripts/ember-addons/utils/is-descriptor.js b/app/assets/javascripts/ember-addons/utils/is-descriptor.js
index 2e64777f70..b76b83e084 100644
--- a/app/assets/javascripts/ember-addons/utils/is-descriptor.js
+++ b/app/assets/javascripts/ember-addons/utils/is-descriptor.js
@@ -1,9 +1 @@
-export default function isDescriptor(item) {
-  return (
-    item &&
-    typeof item === "object" &&
-    "writable" in item &&
-    "enumerable" in item &&
-    "configurable" in item
-  );
-}
+// left for backwards compatibility. remove in the future.
diff --git a/app/assets/javascripts/main_include_admin.js b/app/assets/javascripts/main_include_admin.js
index bf7f2d9de2..749ce2b116 100644
--- a/app/assets/javascripts/main_include_admin.js
+++ b/app/assets/javascripts/main_include_admin.js
@@ -1,4 +1,3 @@
-//= require_tree ./ember-addons
 //= require admin/models/user-field
 //= require admin/models/site-setting
 //= require admin/models/screened-ip-address
diff --git a/app/assets/javascripts/wizard-application.js b/app/assets/javascripts/wizard-application.js
index 3a409952c1..98de3df3c8 100644
--- a/app/assets/javascripts/wizard-application.js
+++ b/app/assets/javascripts/wizard-application.js
@@ -1,6 +1,3 @@
-//= require_tree ./ember-addons/utils
-//= require ./ember-addons/decorator-alias
-//= require ./ember-addons/macro-alias
 //= require ./discourse-common/utils/decorators
 //= require_tree ./discourse-common
 //= require i18n-patches

From 4b57eb7049beb8a28ac86b47b025636b10e45703 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 28 Apr 2020 16:37:56 +0200
Subject: [PATCH 0825/1830] FIX: published pages couldn't be routed from inside
 discourse (#9569)

This will allow to post a link to published page in a post. Before this, users clicking this link would have seen a 404.

ATM /pub is server sider only.
---
 app/assets/javascripts/discourse/app/lib/url.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/url.js b/app/assets/javascripts/discourse/app/lib/url.js
index 4ee7e5a097..4086ca7b62 100644
--- a/app/assets/javascripts/discourse/app/lib/url.js
+++ b/app/assets/javascripts/discourse/app/lib/url.js
@@ -28,7 +28,8 @@ const SERVER_SIDE_ONLY = [
   /\.json$/,
   /^\/admin\/upgrade$/,
   /^\/logs($|\/)/,
-  /^\/admin\/logs\/watched_words\/action\/[^\/]+\/download$/
+  /^\/admin\/logs\/watched_words\/action\/[^\/]+\/download$/,
+  /^\/pub\//
 ];
 
 export function rewritePath(path) {

From ec2943c5bcba5c971c2241234bcf7602fb90cc2d Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Tue, 28 Apr 2020 10:39:29 -0400
Subject: [PATCH 0826/1830] DEV: Update jquery.fileupload and dependencies
 (#9466)

---
 lib/tasks/javascript.rake                     |    6 +
 package.json                                  |    1 +
 .../assets/javascripts/jquery.fileupload.js   | 2989 +++++++++--------
 .../javascripts/jquery.iframe-transport.js    |  404 +--
 vendor/assets/javascripts/jquery.ui.widget.js | 1247 ++++---
 yarn.lock                                     |   24 +
 6 files changed, 2541 insertions(+), 2130 deletions(-)

diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rake
index 3f3e969e9e..d5381834df 100644
--- a/lib/tasks/javascript.rake
+++ b/lib/tasks/javascript.rake
@@ -61,6 +61,12 @@ task 'javascript:update' do
       source: 'jquery-color/dist/jquery.color.js'
     }, {
       source: 'jquery.cookie/jquery.cookie.js'
+    }, {
+      source: 'blueimp-file-upload/js/jquery.fileupload.js',
+    }, {
+      source: 'blueimp-file-upload/js/jquery.iframe-transport.js',
+    }, {
+      source: 'blueimp-file-upload/js/vendor/jquery.ui.widget.js',
     }, {
       source: 'jquery/dist/jquery.js'
     }, {
diff --git a/package.json b/package.json
index eeafd9ec52..8c25185e84 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "@fortawesome/fontawesome-free": "5.11.2",
     "@popperjs/core": "v2.0.6",
     "ace-builds": "1.4.2",
+    "blueimp-file-upload": "10.13.0",
     "bootbox": "3.2.0",
     "bootstrap": "v3.4.1",
     "chart.js": "2.9.3",
diff --git a/vendor/assets/javascripts/jquery.fileupload.js b/vendor/assets/javascripts/jquery.fileupload.js
index e99f3091e6..f75cf2b10a 100644
--- a/vendor/assets/javascripts/jquery.fileupload.js
+++ b/vendor/assets/javascripts/jquery.fileupload.js
@@ -1,1466 +1,1597 @@
 /*
- * jQuery File Upload Plugin 5.42.2
+ * jQuery File Upload Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
-/* jshint nomen:false */
-/* global define, require, window, document, location, Blob, FormData */
+/* global define, require */
+/* eslint-disable new-cap */
 
 (function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            'jquery.ui.widget'
-        ], factory);
-    } else if (typeof exports === 'object') {
-        // Node/CommonJS:
-        factory(
-            require('jquery'),
-            require('./vendor/jquery.ui.widget')
-        );
-    } else {
-        // Browser globals:
-        factory(window.jQuery);
-    }
-}(function ($) {
-    'use strict';
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery', 'jquery-ui/ui/widget'], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS:
+    factory(require('jquery'), require('./vendor/jquery.ui.widget'));
+  } else {
+    // Browser globals:
+    factory(window.jQuery);
+  }
+})(function ($) {
+  'use strict';
 
-    // Detect file input support, based on
-    // http://viljamis.com/blog/2012/file-upload-support-on-mobile/
-    $.support.fileInput = !(new RegExp(
-        // Handle devices which give false positives for the feature detection:
-        '(Android (1\\.[0156]|2\\.[01]))' +
-            '|(Windows Phone (OS 7|8\\.0))|(XBLWP)|(ZuneWP)|(WPDesktop)' +
-            '|(w(eb)?OSBrowser)|(webOS)' +
-            '|(Kindle/(1\\.0|2\\.[05]|3\\.0))'
+  // Detect file input support, based on
+  // https://viljamis.com/2012/file-upload-support-on-mobile/
+  $.support.fileInput = !(
+    new RegExp(
+      // Handle devices which give false positives for the feature detection:
+      '(Android (1\\.[0156]|2\\.[01]))' +
+        '|(Windows Phone (OS 7|8\\.0))|(XBLWP)|(ZuneWP)|(WPDesktop)' +
+        '|(w(eb)?OSBrowser)|(webOS)' +
+        '|(Kindle/(1\\.0|2\\.[05]|3\\.0))'
     ).test(window.navigator.userAgent) ||
-        // Feature detection for all other devices:
-        $('<input type="file">').prop('disabled'));
+    // Feature detection for all other devices:
+    $('<input type="file"/>').prop('disabled')
+  );
 
-    // The FileReader API is not actually used, but works as feature detection,
-    // as some Safari versions (5?) support XHR file uploads via the FormData API,
-    // but not non-multipart XHR file uploads.
-    // window.XMLHttpRequestUpload is not available on IE10, so we check for
-    // window.ProgressEvent instead to detect XHR2 file upload capability:
-    $.support.xhrFileUpload = !!(window.ProgressEvent && window.FileReader);
-    $.support.xhrFormDataFileUpload = !!window.FormData;
+  // The FileReader API is not actually used, but works as feature detection,
+  // as some Safari versions (5?) support XHR file uploads via the FormData API,
+  // but not non-multipart XHR file uploads.
+  // window.XMLHttpRequestUpload is not available on IE10, so we check for
+  // window.ProgressEvent instead to detect XHR2 file upload capability:
+  $.support.xhrFileUpload = !!(window.ProgressEvent && window.FileReader);
+  $.support.xhrFormDataFileUpload = !!window.FormData;
 
-    // Detect support for Blob slicing (required for chunked uploads):
-    $.support.blobSlice = window.Blob && (Blob.prototype.slice ||
-        Blob.prototype.webkitSlice || Blob.prototype.mozSlice);
+  // Detect support for Blob slicing (required for chunked uploads):
+  $.support.blobSlice =
+    window.Blob &&
+    (Blob.prototype.slice ||
+      Blob.prototype.webkitSlice ||
+      Blob.prototype.mozSlice);
 
-    // Helper function to create drag handlers for dragover/dragenter/dragleave:
-    function getDragHandler(type) {
-        var isDragOver = type === 'dragover';
-        return function (e) {
-            e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer;
-            var dataTransfer = e.dataTransfer;
-            if (dataTransfer && $.inArray('Files', dataTransfer.types) !== -1 &&
-                    this._trigger(
-                        type,
-                        $.Event(type, {delegatedEvent: e})
-                    ) !== false) {
-                e.preventDefault();
-                if (isDragOver) {
-                    dataTransfer.dropEffect = 'copy';
-                }
-            }
+  /**
+   * Helper function to create drag handlers for dragover/dragenter/dragleave
+   *
+   * @param {string} type Event type
+   * @returns {Function} Drag handler
+   */
+  function getDragHandler(type) {
+    var isDragOver = type === 'dragover';
+    return function (e) {
+      e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer;
+      var dataTransfer = e.dataTransfer;
+      if (
+        dataTransfer &&
+        $.inArray('Files', dataTransfer.types) !== -1 &&
+        this._trigger(type, $.Event(type, { delegatedEvent: e })) !== false
+      ) {
+        e.preventDefault();
+        if (isDragOver) {
+          dataTransfer.dropEffect = 'copy';
+        }
+      }
+    };
+  }
+
+  // The fileupload widget listens for change events on file input fields defined
+  // via fileInput setting and paste or drop events of the given dropZone.
+  // In addition to the default jQuery Widget methods, the fileupload widget
+  // exposes the "add" and "send" methods, to add or directly send files using
+  // the fileupload API.
+  // By default, files added via file input selection, paste, drag & drop or
+  // "add" method are uploaded immediately, but it is possible to override
+  // the "add" callback option to queue file uploads.
+  $.widget('blueimp.fileupload', {
+    options: {
+      // The drop target element(s), by the default the complete document.
+      // Set to null to disable drag & drop support:
+      dropZone: $(document),
+      // The paste target element(s), by the default undefined.
+      // Set to a DOM node or jQuery object to enable file pasting:
+      pasteZone: undefined,
+      // The file input field(s), that are listened to for change events.
+      // If undefined, it is set to the file input fields inside
+      // of the widget element on plugin initialization.
+      // Set to null to disable the change listener.
+      fileInput: undefined,
+      // By default, the file input field is replaced with a clone after
+      // each input field change event. This is required for iframe transport
+      // queues and allows change events to be fired for the same file
+      // selection, but can be disabled by setting the following option to false:
+      replaceFileInput: true,
+      // The parameter name for the file form data (the request argument name).
+      // If undefined or empty, the name property of the file input field is
+      // used, or "files[]" if the file input name property is also empty,
+      // can be a string or an array of strings:
+      paramName: undefined,
+      // By default, each file of a selection is uploaded using an individual
+      // request for XHR type uploads. Set to false to upload file
+      // selections in one request each:
+      singleFileUploads: true,
+      // To limit the number of files uploaded with one XHR request,
+      // set the following option to an integer greater than 0:
+      limitMultiFileUploads: undefined,
+      // The following option limits the number of files uploaded with one
+      // XHR request to keep the request size under or equal to the defined
+      // limit in bytes:
+      limitMultiFileUploadSize: undefined,
+      // Multipart file uploads add a number of bytes to each uploaded file,
+      // therefore the following option adds an overhead for each file used
+      // in the limitMultiFileUploadSize configuration:
+      limitMultiFileUploadSizeOverhead: 512,
+      // Set the following option to true to issue all file upload requests
+      // in a sequential order:
+      sequentialUploads: false,
+      // To limit the number of concurrent uploads,
+      // set the following option to an integer greater than 0:
+      limitConcurrentUploads: undefined,
+      // Set the following option to true to force iframe transport uploads:
+      forceIframeTransport: false,
+      // Set the following option to the location of a redirect url on the
+      // origin server, for cross-domain iframe transport uploads:
+      redirect: undefined,
+      // The parameter name for the redirect url, sent as part of the form
+      // data and set to 'redirect' if this option is empty:
+      redirectParamName: undefined,
+      // Set the following option to the location of a postMessage window,
+      // to enable postMessage transport uploads:
+      postMessage: undefined,
+      // By default, XHR file uploads are sent as multipart/form-data.
+      // The iframe transport is always using multipart/form-data.
+      // Set to false to enable non-multipart XHR uploads:
+      multipart: true,
+      // To upload large files in smaller chunks, set the following option
+      // to a preferred maximum chunk size. If set to 0, null or undefined,
+      // or the browser does not support the required Blob API, files will
+      // be uploaded as a whole.
+      maxChunkSize: undefined,
+      // When a non-multipart upload or a chunked multipart upload has been
+      // aborted, this option can be used to resume the upload by setting
+      // it to the size of the already uploaded bytes. This option is most
+      // useful when modifying the options object inside of the "add" or
+      // "send" callbacks, as the options are cloned for each file upload.
+      uploadedBytes: undefined,
+      // By default, failed (abort or error) file uploads are removed from the
+      // global progress calculation. Set the following option to false to
+      // prevent recalculating the global progress data:
+      recalculateProgress: true,
+      // Interval in milliseconds to calculate and trigger progress events:
+      progressInterval: 100,
+      // Interval in milliseconds to calculate progress bitrate:
+      bitrateInterval: 500,
+      // By default, uploads are started automatically when adding files:
+      autoUpload: true,
+      // By default, duplicate file names are expected to be handled on
+      // the server-side. If this is not possible (e.g. when uploading
+      // files directly to Amazon S3), the following option can be set to
+      // an empty object or an object mapping existing filenames, e.g.:
+      // { "image.jpg": true, "image (1).jpg": true }
+      // If it is set, all files will be uploaded with unique filenames,
+      // adding increasing number suffixes if necessary, e.g.:
+      // "image (2).jpg"
+      uniqueFilenames: undefined,
+
+      // Error and info messages:
+      messages: {
+        uploadedBytes: 'Uploaded bytes exceed file size'
+      },
+
+      // Translation function, gets the message key to be translated
+      // and an object with context specific data as arguments:
+      i18n: function (message, context) {
+        // eslint-disable-next-line no-param-reassign
+        message = this.messages[message] || message.toString();
+        if (context) {
+          $.each(context, function (key, value) {
+            // eslint-disable-next-line no-param-reassign
+            message = message.replace('{' + key + '}', value);
+          });
+        }
+        return message;
+      },
+
+      // Additional form data to be sent along with the file uploads can be set
+      // using this option, which accepts an array of objects with name and
+      // value properties, a function returning such an array, a FormData
+      // object (for XHR file uploads), or a simple object.
+      // The form of the first fileInput is given as parameter to the function:
+      formData: function (form) {
+        return form.serializeArray();
+      },
+
+      // The add callback is invoked as soon as files are added to the fileupload
+      // widget (via file input selection, drag & drop, paste or add API call).
+      // If the singleFileUploads option is enabled, this callback will be
+      // called once for each file in the selection for XHR file uploads, else
+      // once for each file selection.
+      //
+      // The upload starts when the submit method is invoked on the data parameter.
+      // The data object contains a files property holding the added files
+      // and allows you to override plugin options as well as define ajax settings.
+      //
+      // Listeners for this callback can also be bound the following way:
+      // .on('fileuploadadd', func);
+      //
+      // data.submit() returns a Promise object and allows to attach additional
+      // handlers using jQuery's Deferred callbacks:
+      // data.submit().done(func).fail(func).always(func);
+      add: function (e, data) {
+        if (e.isDefaultPrevented()) {
+          return false;
+        }
+        if (
+          data.autoUpload ||
+          (data.autoUpload !== false &&
+            $(this).fileupload('option', 'autoUpload'))
+        ) {
+          data.process().done(function () {
+            data.submit();
+          });
+        }
+      },
+
+      // Other callbacks:
+
+      // Callback for the submit event of each file upload:
+      // submit: function (e, data) {}, // .on('fileuploadsubmit', func);
+
+      // Callback for the start of each file upload request:
+      // send: function (e, data) {}, // .on('fileuploadsend', func);
+
+      // Callback for successful uploads:
+      // done: function (e, data) {}, // .on('fileuploaddone', func);
+
+      // Callback for failed (abort or error) uploads:
+      // fail: function (e, data) {}, // .on('fileuploadfail', func);
+
+      // Callback for completed (success, abort or error) requests:
+      // always: function (e, data) {}, // .on('fileuploadalways', func);
+
+      // Callback for upload progress events:
+      // progress: function (e, data) {}, // .on('fileuploadprogress', func);
+
+      // Callback for global upload progress events:
+      // progressall: function (e, data) {}, // .on('fileuploadprogressall', func);
+
+      // Callback for uploads start, equivalent to the global ajaxStart event:
+      // start: function (e) {}, // .on('fileuploadstart', func);
+
+      // Callback for uploads stop, equivalent to the global ajaxStop event:
+      // stop: function (e) {}, // .on('fileuploadstop', func);
+
+      // Callback for change events of the fileInput(s):
+      // change: function (e, data) {}, // .on('fileuploadchange', func);
+
+      // Callback for paste events to the pasteZone(s):
+      // paste: function (e, data) {}, // .on('fileuploadpaste', func);
+
+      // Callback for drop events of the dropZone(s):
+      // drop: function (e, data) {}, // .on('fileuploaddrop', func);
+
+      // Callback for dragover events of the dropZone(s):
+      // dragover: function (e) {}, // .on('fileuploaddragover', func);
+
+      // Callback before the start of each chunk upload request (before form data initialization):
+      // chunkbeforesend: function (e, data) {}, // .on('fileuploadchunkbeforesend', func);
+
+      // Callback for the start of each chunk upload request:
+      // chunksend: function (e, data) {}, // .on('fileuploadchunksend', func);
+
+      // Callback for successful chunk uploads:
+      // chunkdone: function (e, data) {}, // .on('fileuploadchunkdone', func);
+
+      // Callback for failed (abort or error) chunk uploads:
+      // chunkfail: function (e, data) {}, // .on('fileuploadchunkfail', func);
+
+      // Callback for completed (success, abort or error) chunk upload requests:
+      // chunkalways: function (e, data) {}, // .on('fileuploadchunkalways', func);
+
+      // The plugin options are used as settings object for the ajax calls.
+      // The following are jQuery ajax settings required for the file uploads:
+      processData: false,
+      contentType: false,
+      cache: false,
+      timeout: 0
+    },
+
+    // A list of options that require reinitializing event listeners and/or
+    // special initialization code:
+    _specialOptions: [
+      'fileInput',
+      'dropZone',
+      'pasteZone',
+      'multipart',
+      'forceIframeTransport'
+    ],
+
+    _blobSlice:
+      $.support.blobSlice &&
+      function () {
+        var slice = this.slice || this.webkitSlice || this.mozSlice;
+        return slice.apply(this, arguments);
+      },
+
+    _BitrateTimer: function () {
+      this.timestamp = Date.now ? Date.now() : new Date().getTime();
+      this.loaded = 0;
+      this.bitrate = 0;
+      this.getBitrate = function (now, loaded, interval) {
+        var timeDiff = now - this.timestamp;
+        if (!this.bitrate || !interval || timeDiff > interval) {
+          this.bitrate = (loaded - this.loaded) * (1000 / timeDiff) * 8;
+          this.loaded = loaded;
+          this.timestamp = now;
+        }
+        return this.bitrate;
+      };
+    },
+
+    _isXHRUpload: function (options) {
+      return (
+        !options.forceIframeTransport &&
+        ((!options.multipart && $.support.xhrFileUpload) ||
+          $.support.xhrFormDataFileUpload)
+      );
+    },
+
+    _getFormData: function (options) {
+      var formData;
+      if ($.type(options.formData) === 'function') {
+        return options.formData(options.form);
+      }
+      if ($.isArray(options.formData)) {
+        return options.formData;
+      }
+      if ($.type(options.formData) === 'object') {
+        formData = [];
+        $.each(options.formData, function (name, value) {
+          formData.push({ name: name, value: value });
+        });
+        return formData;
+      }
+      return [];
+    },
+
+    _getTotal: function (files) {
+      var total = 0;
+      $.each(files, function (index, file) {
+        total += file.size || 1;
+      });
+      return total;
+    },
+
+    _initProgressObject: function (obj) {
+      var progress = {
+        loaded: 0,
+        total: 0,
+        bitrate: 0
+      };
+      if (obj._progress) {
+        $.extend(obj._progress, progress);
+      } else {
+        obj._progress = progress;
+      }
+    },
+
+    _initResponseObject: function (obj) {
+      var prop;
+      if (obj._response) {
+        for (prop in obj._response) {
+          if (Object.prototype.hasOwnProperty.call(obj._response, prop)) {
+            delete obj._response[prop];
+          }
+        }
+      } else {
+        obj._response = {};
+      }
+    },
+
+    _onProgress: function (e, data) {
+      if (e.lengthComputable) {
+        var now = Date.now ? Date.now() : new Date().getTime(),
+          loaded;
+        if (
+          data._time &&
+          data.progressInterval &&
+          now - data._time < data.progressInterval &&
+          e.loaded !== e.total
+        ) {
+          return;
+        }
+        data._time = now;
+        loaded =
+          Math.floor(
+            (e.loaded / e.total) * (data.chunkSize || data._progress.total)
+          ) + (data.uploadedBytes || 0);
+        // Add the difference from the previously loaded state
+        // to the global loaded counter:
+        this._progress.loaded += loaded - data._progress.loaded;
+        this._progress.bitrate = this._bitrateTimer.getBitrate(
+          now,
+          this._progress.loaded,
+          data.bitrateInterval
+        );
+        data._progress.loaded = data.loaded = loaded;
+        data._progress.bitrate = data.bitrate = data._bitrateTimer.getBitrate(
+          now,
+          loaded,
+          data.bitrateInterval
+        );
+        // Trigger a custom progress event with a total data property set
+        // to the file size(s) of the current upload and a loaded data
+        // property calculated accordingly:
+        this._trigger(
+          'progress',
+          $.Event('progress', { delegatedEvent: e }),
+          data
+        );
+        // Trigger a global progress event for all current file uploads,
+        // including ajax calls queued for sequential file uploads:
+        this._trigger(
+          'progressall',
+          $.Event('progressall', { delegatedEvent: e }),
+          this._progress
+        );
+      }
+    },
+
+    _initProgressListener: function (options) {
+      var that = this,
+        xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr();
+      // Accesss to the native XHR object is required to add event listeners
+      // for the upload progress event:
+      if (xhr.upload) {
+        $(xhr.upload).on('progress', function (e) {
+          var oe = e.originalEvent;
+          // Make sure the progress event properties get copied over:
+          e.lengthComputable = oe.lengthComputable;
+          e.loaded = oe.loaded;
+          e.total = oe.total;
+          that._onProgress(e, options);
+        });
+        options.xhr = function () {
+          return xhr;
         };
-    }
+      }
+    },
 
-    // The fileupload widget listens for change events on file input fields defined
-    // via fileInput setting and paste or drop events of the given dropZone.
-    // In addition to the default jQuery Widget methods, the fileupload widget
-    // exposes the "add" and "send" methods, to add or directly send files using
-    // the fileupload API.
-    // By default, files added via file input selection, paste, drag & drop or
-    // "add" method are uploaded immediately, but it is possible to override
-    // the "add" callback option to queue file uploads.
-    $.widget('blueimp.fileupload', {
+    _deinitProgressListener: function (options) {
+      var xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr();
+      if (xhr.upload) {
+        $(xhr.upload).off('progress');
+      }
+    },
 
-        options: {
-            // The drop target element(s), by the default the complete document.
-            // Set to null to disable drag & drop support:
-            dropZone: $(document),
-            // The paste target element(s), by the default undefined.
-            // Set to a DOM node or jQuery object to enable file pasting:
-            pasteZone: undefined,
-            // The file input field(s), that are listened to for change events.
-            // If undefined, it is set to the file input fields inside
-            // of the widget element on plugin initialization.
-            // Set to null to disable the change listener.
-            fileInput: undefined,
-            // By default, the file input field is replaced with a clone after
-            // each input field change event. This is required for iframe transport
-            // queues and allows change events to be fired for the same file
-            // selection, but can be disabled by setting the following option to false:
-            replaceFileInput: true,
-            // The parameter name for the file form data (the request argument name).
-            // If undefined or empty, the name property of the file input field is
-            // used, or "files[]" if the file input name property is also empty,
-            // can be a string or an array of strings:
-            paramName: undefined,
-            // By default, each file of a selection is uploaded using an individual
-            // request for XHR type uploads. Set to false to upload file
-            // selections in one request each:
-            singleFileUploads: true,
-            // To limit the number of files uploaded with one XHR request,
-            // set the following option to an integer greater than 0:
-            limitMultiFileUploads: undefined,
-            // The following option limits the number of files uploaded with one
-            // XHR request to keep the request size under or equal to the defined
-            // limit in bytes:
-            limitMultiFileUploadSize: undefined,
-            // Multipart file uploads add a number of bytes to each uploaded file,
-            // therefore the following option adds an overhead for each file used
-            // in the limitMultiFileUploadSize configuration:
-            limitMultiFileUploadSizeOverhead: 512,
-            // Set the following option to true to issue all file upload requests
-            // in a sequential order:
-            sequentialUploads: false,
-            // To limit the number of concurrent uploads,
-            // set the following option to an integer greater than 0:
-            limitConcurrentUploads: undefined,
-            // Set the following option to true to force iframe transport uploads:
-            forceIframeTransport: false,
-            // Set the following option to the location of a redirect url on the
-            // origin server, for cross-domain iframe transport uploads:
-            redirect: undefined,
-            // The parameter name for the redirect url, sent as part of the form
-            // data and set to 'redirect' if this option is empty:
-            redirectParamName: undefined,
-            // Set the following option to the location of a postMessage window,
-            // to enable postMessage transport uploads:
-            postMessage: undefined,
-            // By default, XHR file uploads are sent as multipart/form-data.
-            // The iframe transport is always using multipart/form-data.
-            // Set to false to enable non-multipart XHR uploads:
-            multipart: true,
-            // To upload large files in smaller chunks, set the following option
-            // to a preferred maximum chunk size. If set to 0, null or undefined,
-            // or the browser does not support the required Blob API, files will
-            // be uploaded as a whole.
-            maxChunkSize: undefined,
-            // When a non-multipart upload or a chunked multipart upload has been
-            // aborted, this option can be used to resume the upload by setting
-            // it to the size of the already uploaded bytes. This option is most
-            // useful when modifying the options object inside of the "add" or
-            // "send" callbacks, as the options are cloned for each file upload.
-            uploadedBytes: undefined,
-            // By default, failed (abort or error) file uploads are removed from the
-            // global progress calculation. Set the following option to false to
-            // prevent recalculating the global progress data:
-            recalculateProgress: true,
-            // Interval in milliseconds to calculate and trigger progress events:
-            progressInterval: 100,
-            // Interval in milliseconds to calculate progress bitrate:
-            bitrateInterval: 500,
-            // By default, uploads are started automatically when adding files:
-            autoUpload: true,
+    _isInstanceOf: function (type, obj) {
+      // Cross-frame instanceof check
+      return Object.prototype.toString.call(obj) === '[object ' + type + ']';
+    },
 
-            // Error and info messages:
-            messages: {
-                uploadedBytes: 'Uploaded bytes exceed file size'
-            },
+    _getUniqueFilename: function (name, map) {
+      // eslint-disable-next-line no-param-reassign
+      name = String(name);
+      if (map[name]) {
+        // eslint-disable-next-line no-param-reassign
+        name = name.replace(/(?: \(([\d]+)\))?(\.[^.]+)?$/, function (
+          _,
+          p1,
+          p2
+        ) {
+          var index = p1 ? Number(p1) + 1 : 1;
+          var ext = p2 || '';
+          return ' (' + index + ')' + ext;
+        });
+        return this._getUniqueFilename(name, map);
+      }
+      map[name] = true;
+      return name;
+    },
 
-            // Translation function, gets the message key to be translated
-            // and an object with context specific data as arguments:
-            i18n: function (message, context) {
-                message = this.messages[message] || message.toString();
-                if (context) {
-                    $.each(context, function (key, value) {
-                        message = message.replace('{' + key + '}', value);
-                    });
-                }
-                return message;
-            },
-
-            // Additional form data to be sent along with the file uploads can be set
-            // using this option, which accepts an array of objects with name and
-            // value properties, a function returning such an array, a FormData
-            // object (for XHR file uploads), or a simple object.
-            // The form of the first fileInput is given as parameter to the function:
-            formData: function (form) {
-                return form.serializeArray();
-            },
-
-            // The add callback is invoked as soon as files are added to the fileupload
-            // widget (via file input selection, drag & drop, paste or add API call).
-            // If the singleFileUploads option is enabled, this callback will be
-            // called once for each file in the selection for XHR file uploads, else
-            // once for each file selection.
-            //
-            // The upload starts when the submit method is invoked on the data parameter.
-            // The data object contains a files property holding the added files
-            // and allows you to override plugin options as well as define ajax settings.
-            //
-            // Listeners for this callback can also be bound the following way:
-            // .bind('fileuploadadd', func);
-            //
-            // data.submit() returns a Promise object and allows to attach additional
-            // handlers using jQuery's Deferred callbacks:
-            // data.submit().done(func).fail(func).always(func);
-            add: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                if (data.autoUpload || (data.autoUpload !== false &&
-                        $(this).fileupload('option', 'autoUpload'))) {
-                    data.process().done(function () {
-                        data.submit();
-                    });
-                }
-            },
-
-            // Other callbacks:
-
-            // Callback for the submit event of each file upload:
-            // submit: function (e, data) {}, // .bind('fileuploadsubmit', func);
-
-            // Callback for the start of each file upload request:
-            // send: function (e, data) {}, // .bind('fileuploadsend', func);
-
-            // Callback for successful uploads:
-            // done: function (e, data) {}, // .bind('fileuploaddone', func);
-
-            // Callback for failed (abort or error) uploads:
-            // fail: function (e, data) {}, // .bind('fileuploadfail', func);
-
-            // Callback for completed (success, abort or error) requests:
-            // always: function (e, data) {}, // .bind('fileuploadalways', func);
-
-            // Callback for upload progress events:
-            // progress: function (e, data) {}, // .bind('fileuploadprogress', func);
-
-            // Callback for global upload progress events:
-            // progressall: function (e, data) {}, // .bind('fileuploadprogressall', func);
-
-            // Callback for uploads start, equivalent to the global ajaxStart event:
-            // start: function (e) {}, // .bind('fileuploadstart', func);
-
-            // Callback for uploads stop, equivalent to the global ajaxStop event:
-            // stop: function (e) {}, // .bind('fileuploadstop', func);
-
-            // Callback for change events of the fileInput(s):
-            // change: function (e, data) {}, // .bind('fileuploadchange', func);
-
-            // Callback for paste events to the pasteZone(s):
-            // paste: function (e, data) {}, // .bind('fileuploadpaste', func);
-
-            // Callback for drop events of the dropZone(s):
-            // drop: function (e, data) {}, // .bind('fileuploaddrop', func);
-
-            // Callback for dragover events of the dropZone(s):
-            // dragover: function (e) {}, // .bind('fileuploaddragover', func);
-
-            // Callback for the start of each chunk upload request:
-            // chunksend: function (e, data) {}, // .bind('fileuploadchunksend', func);
-
-            // Callback for successful chunk uploads:
-            // chunkdone: function (e, data) {}, // .bind('fileuploadchunkdone', func);
-
-            // Callback for failed (abort or error) chunk uploads:
-            // chunkfail: function (e, data) {}, // .bind('fileuploadchunkfail', func);
-
-            // Callback for completed (success, abort or error) chunk upload requests:
-            // chunkalways: function (e, data) {}, // .bind('fileuploadchunkalways', func);
-
-            // The plugin options are used as settings object for the ajax calls.
-            // The following are jQuery ajax settings required for the file uploads:
-            processData: false,
-            contentType: false,
-            cache: false
-        },
-
-        // A list of options that require reinitializing event listeners and/or
-        // special initialization code:
-        _specialOptions: [
-            'fileInput',
-            'dropZone',
-            'pasteZone',
-            'multipart',
-            'forceIframeTransport'
-        ],
-
-        _blobSlice: $.support.blobSlice && function () {
-            var slice = this.slice || this.webkitSlice || this.mozSlice;
-            return slice.apply(this, arguments);
-        },
-
-        _BitrateTimer: function () {
-            this.timestamp = ((Date.now) ? Date.now() : (new Date()).getTime());
-            this.loaded = 0;
-            this.bitrate = 0;
-            this.getBitrate = function (now, loaded, interval) {
-                var timeDiff = now - this.timestamp;
-                if (!this.bitrate || !interval || timeDiff > interval) {
-                    this.bitrate = (loaded - this.loaded) * (1000 / timeDiff) * 8;
-                    this.loaded = loaded;
-                    this.timestamp = now;
-                }
-                return this.bitrate;
-            };
-        },
-
-        _isXHRUpload: function (options) {
-            return !options.forceIframeTransport &&
-                ((!options.multipart && $.support.xhrFileUpload) ||
-                $.support.xhrFormDataFileUpload);
-        },
-
-        _getFormData: function (options) {
-            var formData;
-            if ($.type(options.formData) === 'function') {
-                return options.formData(options.form);
-            }
-            if ($.isArray(options.formData)) {
-                return options.formData;
-            }
-            if ($.type(options.formData) === 'object') {
-                formData = [];
-                $.each(options.formData, function (name, value) {
-                    formData.push({name: name, value: value});
-                });
-                return formData;
-            }
-            return [];
-        },
-
-        _getTotal: function (files) {
-            var total = 0;
-            $.each(files, function (index, file) {
-                total += file.size || 1;
+    _initXHRData: function (options) {
+      var that = this,
+        formData,
+        file = options.files[0],
+        // Ignore non-multipart setting if not supported:
+        multipart = options.multipart || !$.support.xhrFileUpload,
+        paramName =
+          $.type(options.paramName) === 'array'
+            ? options.paramName[0]
+            : options.paramName;
+      options.headers = $.extend({}, options.headers);
+      if (options.contentRange) {
+        options.headers['Content-Range'] = options.contentRange;
+      }
+      if (!multipart || options.blob || !this._isInstanceOf('File', file)) {
+        options.headers['Content-Disposition'] =
+          'attachment; filename="' +
+          encodeURI(file.uploadName || file.name) +
+          '"';
+      }
+      if (!multipart) {
+        options.contentType = file.type || 'application/octet-stream';
+        options.data = options.blob || file;
+      } else if ($.support.xhrFormDataFileUpload) {
+        if (options.postMessage) {
+          // window.postMessage does not allow sending FormData
+          // objects, so we just add the File/Blob objects to
+          // the formData array and let the postMessage window
+          // create the FormData object out of this array:
+          formData = this._getFormData(options);
+          if (options.blob) {
+            formData.push({
+              name: paramName,
+              value: options.blob
             });
-            return total;
-        },
+          } else {
+            $.each(options.files, function (index, file) {
+              formData.push({
+                name:
+                  ($.type(options.paramName) === 'array' &&
+                    options.paramName[index]) ||
+                  paramName,
+                value: file
+              });
+            });
+          }
+        } else {
+          if (that._isInstanceOf('FormData', options.formData)) {
+            formData = options.formData;
+          } else {
+            formData = new FormData();
+            $.each(this._getFormData(options), function (index, field) {
+              formData.append(field.name, field.value);
+            });
+          }
+          if (options.blob) {
+            formData.append(
+              paramName,
+              options.blob,
+              file.uploadName || file.name
+            );
+          } else {
+            $.each(options.files, function (index, file) {
+              // This check allows the tests to run with
+              // dummy objects:
+              if (
+                that._isInstanceOf('File', file) ||
+                that._isInstanceOf('Blob', file)
+              ) {
+                var fileName = file.uploadName || file.name;
+                if (options.uniqueFilenames) {
+                  fileName = that._getUniqueFilename(
+                    fileName,
+                    options.uniqueFilenames
+                  );
+                }
+                formData.append(
+                  ($.type(options.paramName) === 'array' &&
+                    options.paramName[index]) ||
+                    paramName,
+                  file,
+                  fileName
+                );
+              }
+            });
+          }
+        }
+        options.data = formData;
+      }
+      // Blob reference is not needed anymore, free memory:
+      options.blob = null;
+    },
 
-        _initProgressObject: function (obj) {
-            var progress = {
-                loaded: 0,
-                total: 0,
-                bitrate: 0
-            };
-            if (obj._progress) {
-                $.extend(obj._progress, progress);
+    _initIframeSettings: function (options) {
+      var targetHost = $('<a></a>').prop('href', options.url).prop('host');
+      // Setting the dataType to iframe enables the iframe transport:
+      options.dataType = 'iframe ' + (options.dataType || '');
+      // The iframe transport accepts a serialized array as form data:
+      options.formData = this._getFormData(options);
+      // Add redirect url to form data on cross-domain uploads:
+      if (options.redirect && targetHost && targetHost !== location.host) {
+        options.formData.push({
+          name: options.redirectParamName || 'redirect',
+          value: options.redirect
+        });
+      }
+    },
+
+    _initDataSettings: function (options) {
+      if (this._isXHRUpload(options)) {
+        if (!this._chunkedUpload(options, true)) {
+          if (!options.data) {
+            this._initXHRData(options);
+          }
+          this._initProgressListener(options);
+        }
+        if (options.postMessage) {
+          // Setting the dataType to postmessage enables the
+          // postMessage transport:
+          options.dataType = 'postmessage ' + (options.dataType || '');
+        }
+      } else {
+        this._initIframeSettings(options);
+      }
+    },
+
+    _getParamName: function (options) {
+      var fileInput = $(options.fileInput),
+        paramName = options.paramName;
+      if (!paramName) {
+        paramName = [];
+        fileInput.each(function () {
+          var input = $(this),
+            name = input.prop('name') || 'files[]',
+            i = (input.prop('files') || [1]).length;
+          while (i) {
+            paramName.push(name);
+            i -= 1;
+          }
+        });
+        if (!paramName.length) {
+          paramName = [fileInput.prop('name') || 'files[]'];
+        }
+      } else if (!$.isArray(paramName)) {
+        paramName = [paramName];
+      }
+      return paramName;
+    },
+
+    _initFormSettings: function (options) {
+      // Retrieve missing options from the input field and the
+      // associated form, if available:
+      if (!options.form || !options.form.length) {
+        options.form = $(options.fileInput.prop('form'));
+        // If the given file input doesn't have an associated form,
+        // use the default widget file input's form:
+        if (!options.form.length) {
+          options.form = $(this.options.fileInput.prop('form'));
+        }
+      }
+      options.paramName = this._getParamName(options);
+      if (!options.url) {
+        options.url = options.form.prop('action') || location.href;
+      }
+      // The HTTP request method must be "POST" or "PUT":
+      options.type = (
+        options.type ||
+        ($.type(options.form.prop('method')) === 'string' &&
+          options.form.prop('method')) ||
+        ''
+      ).toUpperCase();
+      if (
+        options.type !== 'POST' &&
+        options.type !== 'PUT' &&
+        options.type !== 'PATCH'
+      ) {
+        options.type = 'POST';
+      }
+      if (!options.formAcceptCharset) {
+        options.formAcceptCharset = options.form.attr('accept-charset');
+      }
+    },
+
+    _getAJAXSettings: function (data) {
+      var options = $.extend({}, this.options, data);
+      this._initFormSettings(options);
+      this._initDataSettings(options);
+      return options;
+    },
+
+    // jQuery 1.6 doesn't provide .state(),
+    // while jQuery 1.8+ removed .isRejected() and .isResolved():
+    _getDeferredState: function (deferred) {
+      if (deferred.state) {
+        return deferred.state();
+      }
+      if (deferred.isResolved()) {
+        return 'resolved';
+      }
+      if (deferred.isRejected()) {
+        return 'rejected';
+      }
+      return 'pending';
+    },
+
+    // Maps jqXHR callbacks to the equivalent
+    // methods of the given Promise object:
+    _enhancePromise: function (promise) {
+      promise.success = promise.done;
+      promise.error = promise.fail;
+      promise.complete = promise.always;
+      return promise;
+    },
+
+    // Creates and returns a Promise object enhanced with
+    // the jqXHR methods abort, success, error and complete:
+    _getXHRPromise: function (resolveOrReject, context, args) {
+      var dfd = $.Deferred(),
+        promise = dfd.promise();
+      // eslint-disable-next-line no-param-reassign
+      context = context || this.options.context || promise;
+      if (resolveOrReject === true) {
+        dfd.resolveWith(context, args);
+      } else if (resolveOrReject === false) {
+        dfd.rejectWith(context, args);
+      }
+      promise.abort = dfd.promise;
+      return this._enhancePromise(promise);
+    },
+
+    // Adds convenience methods to the data callback argument:
+    _addConvenienceMethods: function (e, data) {
+      var that = this,
+        getPromise = function (args) {
+          return $.Deferred().resolveWith(that, args).promise();
+        };
+      data.process = function (resolveFunc, rejectFunc) {
+        if (resolveFunc || rejectFunc) {
+          data._processQueue = this._processQueue = (
+            this._processQueue || getPromise([this])
+          )
+            .then(function () {
+              if (data.errorThrown) {
+                return $.Deferred().rejectWith(that, [data]).promise();
+              }
+              return getPromise(arguments);
+            })
+            .then(resolveFunc, rejectFunc);
+        }
+        return this._processQueue || getPromise([this]);
+      };
+      data.submit = function () {
+        if (this.state() !== 'pending') {
+          data.jqXHR = this.jqXHR =
+            that._trigger(
+              'submit',
+              $.Event('submit', { delegatedEvent: e }),
+              this
+            ) !== false && that._onSend(e, this);
+        }
+        return this.jqXHR || that._getXHRPromise();
+      };
+      data.abort = function () {
+        if (this.jqXHR) {
+          return this.jqXHR.abort();
+        }
+        this.errorThrown = 'abort';
+        that._trigger('fail', null, this);
+        return that._getXHRPromise(false);
+      };
+      data.state = function () {
+        if (this.jqXHR) {
+          return that._getDeferredState(this.jqXHR);
+        }
+        if (this._processQueue) {
+          return that._getDeferredState(this._processQueue);
+        }
+      };
+      data.processing = function () {
+        return (
+          !this.jqXHR &&
+          this._processQueue &&
+          that._getDeferredState(this._processQueue) === 'pending'
+        );
+      };
+      data.progress = function () {
+        return this._progress;
+      };
+      data.response = function () {
+        return this._response;
+      };
+    },
+
+    // Parses the Range header from the server response
+    // and returns the uploaded bytes:
+    _getUploadedBytes: function (jqXHR) {
+      var range = jqXHR.getResponseHeader('Range'),
+        parts = range && range.split('-'),
+        upperBytesPos = parts && parts.length > 1 && parseInt(parts[1], 10);
+      return upperBytesPos && upperBytesPos + 1;
+    },
+
+    // Uploads a file in multiple, sequential requests
+    // by splitting the file up in multiple blob chunks.
+    // If the second parameter is true, only tests if the file
+    // should be uploaded in chunks, but does not invoke any
+    // upload requests:
+    _chunkedUpload: function (options, testOnly) {
+      options.uploadedBytes = options.uploadedBytes || 0;
+      var that = this,
+        file = options.files[0],
+        fs = file.size,
+        ub = options.uploadedBytes,
+        mcs = options.maxChunkSize || fs,
+        slice = this._blobSlice,
+        dfd = $.Deferred(),
+        promise = dfd.promise(),
+        jqXHR,
+        upload;
+      if (
+        !(
+          this._isXHRUpload(options) &&
+          slice &&
+          (ub || ($.type(mcs) === 'function' ? mcs(options) : mcs) < fs)
+        ) ||
+        options.data
+      ) {
+        return false;
+      }
+      if (testOnly) {
+        return true;
+      }
+      if (ub >= fs) {
+        file.error = options.i18n('uploadedBytes');
+        return this._getXHRPromise(false, options.context, [
+          null,
+          'error',
+          file.error
+        ]);
+      }
+      // The chunk upload method:
+      upload = function () {
+        // Clone the options object for each chunk upload:
+        var o = $.extend({}, options),
+          currentLoaded = o._progress.loaded;
+        o.blob = slice.call(
+          file,
+          ub,
+          ub + ($.type(mcs) === 'function' ? mcs(o) : mcs),
+          file.type
+        );
+        // Store the current chunk size, as the blob itself
+        // will be dereferenced after data processing:
+        o.chunkSize = o.blob.size;
+        // Expose the chunk bytes position range:
+        o.contentRange =
+          'bytes ' + ub + '-' + (ub + o.chunkSize - 1) + '/' + fs;
+        // Trigger chunkbeforesend to allow form data to be updated for this chunk
+        that._trigger('chunkbeforesend', null, o);
+        // Process the upload data (the blob and potential form data):
+        that._initXHRData(o);
+        // Add progress listeners for this chunk upload:
+        that._initProgressListener(o);
+        jqXHR = (
+          (that._trigger('chunksend', null, o) !== false && $.ajax(o)) ||
+          that._getXHRPromise(false, o.context)
+        )
+          .done(function (result, textStatus, jqXHR) {
+            ub = that._getUploadedBytes(jqXHR) || ub + o.chunkSize;
+            // Create a progress event if no final progress event
+            // with loaded equaling total has been triggered
+            // for this chunk:
+            if (currentLoaded + o.chunkSize - o._progress.loaded) {
+              that._onProgress(
+                $.Event('progress', {
+                  lengthComputable: true,
+                  loaded: ub - o.uploadedBytes,
+                  total: ub - o.uploadedBytes
+                }),
+                o
+              );
+            }
+            options.uploadedBytes = o.uploadedBytes = ub;
+            o.result = result;
+            o.textStatus = textStatus;
+            o.jqXHR = jqXHR;
+            that._trigger('chunkdone', null, o);
+            that._trigger('chunkalways', null, o);
+            if (ub < fs) {
+              // File upload not yet complete,
+              // continue with the next chunk:
+              upload();
             } else {
-                obj._progress = progress;
+              dfd.resolveWith(o.context, [result, textStatus, jqXHR]);
             }
-        },
+          })
+          .fail(function (jqXHR, textStatus, errorThrown) {
+            o.jqXHR = jqXHR;
+            o.textStatus = textStatus;
+            o.errorThrown = errorThrown;
+            that._trigger('chunkfail', null, o);
+            that._trigger('chunkalways', null, o);
+            dfd.rejectWith(o.context, [jqXHR, textStatus, errorThrown]);
+          })
+          .always(function () {
+            that._deinitProgressListener(o);
+          });
+      };
+      this._enhancePromise(promise);
+      promise.abort = function () {
+        return jqXHR.abort();
+      };
+      upload();
+      return promise;
+    },
 
-        _initResponseObject: function (obj) {
-            var prop;
-            if (obj._response) {
-                for (prop in obj._response) {
-                    if (obj._response.hasOwnProperty(prop)) {
-                        delete obj._response[prop];
-                    }
-                }
-            } else {
-                obj._response = {};
-            }
-        },
+    _beforeSend: function (e, data) {
+      if (this._active === 0) {
+        // the start callback is triggered when an upload starts
+        // and no other uploads are currently running,
+        // equivalent to the global ajaxStart event:
+        this._trigger('start');
+        // Set timer for global bitrate progress calculation:
+        this._bitrateTimer = new this._BitrateTimer();
+        // Reset the global progress values:
+        this._progress.loaded = this._progress.total = 0;
+        this._progress.bitrate = 0;
+      }
+      // Make sure the container objects for the .response() and
+      // .progress() methods on the data object are available
+      // and reset to their initial state:
+      this._initResponseObject(data);
+      this._initProgressObject(data);
+      data._progress.loaded = data.loaded = data.uploadedBytes || 0;
+      data._progress.total = data.total = this._getTotal(data.files) || 1;
+      data._progress.bitrate = data.bitrate = 0;
+      this._active += 1;
+      // Initialize the global progress values:
+      this._progress.loaded += data.loaded;
+      this._progress.total += data.total;
+    },
 
-        _onProgress: function (e, data) {
-            if (e.lengthComputable) {
-                var now = ((Date.now) ? Date.now() : (new Date()).getTime()),
-                    loaded;
-                if (data._time && data.progressInterval &&
-                        (now - data._time < data.progressInterval) &&
-                        e.loaded !== e.total) {
-                    return;
-                }
-                data._time = now;
-                loaded = Math.floor(
-                    e.loaded / e.total * (data.chunkSize || data._progress.total)
-                ) + (data.uploadedBytes || 0);
-                // Add the difference from the previously loaded state
-                // to the global loaded counter:
-                this._progress.loaded += (loaded - data._progress.loaded);
-                this._progress.bitrate = this._bitrateTimer.getBitrate(
-                    now,
-                    this._progress.loaded,
-                    data.bitrateInterval
+    _onDone: function (result, textStatus, jqXHR, options) {
+      var total = options._progress.total,
+        response = options._response;
+      if (options._progress.loaded < total) {
+        // Create a progress event if no final progress event
+        // with loaded equaling total has been triggered:
+        this._onProgress(
+          $.Event('progress', {
+            lengthComputable: true,
+            loaded: total,
+            total: total
+          }),
+          options
+        );
+      }
+      response.result = options.result = result;
+      response.textStatus = options.textStatus = textStatus;
+      response.jqXHR = options.jqXHR = jqXHR;
+      this._trigger('done', null, options);
+    },
+
+    _onFail: function (jqXHR, textStatus, errorThrown, options) {
+      var response = options._response;
+      if (options.recalculateProgress) {
+        // Remove the failed (error or abort) file upload from
+        // the global progress calculation:
+        this._progress.loaded -= options._progress.loaded;
+        this._progress.total -= options._progress.total;
+      }
+      response.jqXHR = options.jqXHR = jqXHR;
+      response.textStatus = options.textStatus = textStatus;
+      response.errorThrown = options.errorThrown = errorThrown;
+      this._trigger('fail', null, options);
+    },
+
+    _onAlways: function (jqXHRorResult, textStatus, jqXHRorError, options) {
+      // jqXHRorResult, textStatus and jqXHRorError are added to the
+      // options object via done and fail callbacks
+      this._trigger('always', null, options);
+    },
+
+    _onSend: function (e, data) {
+      if (!data.submit) {
+        this._addConvenienceMethods(e, data);
+      }
+      var that = this,
+        jqXHR,
+        aborted,
+        slot,
+        pipe,
+        options = that._getAJAXSettings(data),
+        send = function () {
+          that._sending += 1;
+          // Set timer for bitrate progress calculation:
+          options._bitrateTimer = new that._BitrateTimer();
+          jqXHR =
+            jqXHR ||
+            (
+              ((aborted ||
+                that._trigger(
+                  'send',
+                  $.Event('send', { delegatedEvent: e }),
+                  options
+                ) === false) &&
+                that._getXHRPromise(false, options.context, aborted)) ||
+              that._chunkedUpload(options) ||
+              $.ajax(options)
+            )
+              .done(function (result, textStatus, jqXHR) {
+                that._onDone(result, textStatus, jqXHR, options);
+              })
+              .fail(function (jqXHR, textStatus, errorThrown) {
+                that._onFail(jqXHR, textStatus, errorThrown, options);
+              })
+              .always(function (jqXHRorResult, textStatus, jqXHRorError) {
+                that._deinitProgressListener(options);
+                that._onAlways(
+                  jqXHRorResult,
+                  textStatus,
+                  jqXHRorError,
+                  options
                 );
-                data._progress.loaded = data.loaded = loaded;
-                data._progress.bitrate = data.bitrate = data._bitrateTimer.getBitrate(
-                    now,
-                    loaded,
-                    data.bitrateInterval
-                );
-                // Trigger a custom progress event with a total data property set
-                // to the file size(s) of the current upload and a loaded data
-                // property calculated accordingly:
-                this._trigger(
-                    'progress',
-                    $.Event('progress', {delegatedEvent: e}),
-                    data
-                );
-                // Trigger a global progress event for all current file uploads,
-                // including ajax calls queued for sequential file uploads:
-                this._trigger(
-                    'progressall',
-                    $.Event('progressall', {delegatedEvent: e}),
-                    this._progress
-                );
-            }
-        },
-
-        _initProgressListener: function (options) {
-            var that = this,
-                xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr();
-            // Accesss to the native XHR object is required to add event listeners
-            // for the upload progress event:
-            if (xhr.upload) {
-                $(xhr.upload).bind('progress', function (e) {
-                    var oe = e.originalEvent;
-                    // Make sure the progress event properties get copied over:
-                    e.lengthComputable = oe.lengthComputable;
-                    e.loaded = oe.loaded;
-                    e.total = oe.total;
-                    that._onProgress(e, options);
-                });
-                options.xhr = function () {
-                    return xhr;
-                };
-            }
-        },
-
-        _isInstanceOf: function (type, obj) {
-            // Cross-frame instanceof check
-            return Object.prototype.toString.call(obj) === '[object ' + type + ']';
-        },
-
-        _initXHRData: function (options) {
-            var that = this,
-                formData,
-                file = options.files[0],
-                // Ignore non-multipart setting if not supported:
-                multipart = options.multipart || !$.support.xhrFileUpload,
-                paramName = $.type(options.paramName) === 'array' ?
-                    options.paramName[0] : options.paramName;
-            options.headers = $.extend({}, options.headers);
-            if (options.contentRange) {
-                options.headers['Content-Range'] = options.contentRange;
-            }
-            if (!multipart || options.blob || !this._isInstanceOf('File', file)) {
-                options.headers['Content-Disposition'] = 'attachment; filename="' +
-                    encodeURI(file.name) + '"';
-            }
-            if (!multipart) {
-                options.contentType = file.type || 'application/octet-stream';
-                options.data = options.blob || file;
-            } else if ($.support.xhrFormDataFileUpload) {
-                if (options.postMessage) {
-                    // window.postMessage does not allow sending FormData
-                    // objects, so we just add the File/Blob objects to
-                    // the formData array and let the postMessage window
-                    // create the FormData object out of this array:
-                    formData = this._getFormData(options);
-                    if (options.blob) {
-                        formData.push({
-                            name: paramName,
-                            value: options.blob
-                        });
-                    } else {
-                        $.each(options.files, function (index, file) {
-                            formData.push({
-                                name: ($.type(options.paramName) === 'array' &&
-                                    options.paramName[index]) || paramName,
-                                value: file
-                            });
-                        });
-                    }
-                } else {
-                    if (that._isInstanceOf('FormData', options.formData)) {
-                        formData = options.formData;
-                    } else {
-                        formData = new FormData();
-                        $.each(this._getFormData(options), function (index, field) {
-                            formData.append(field.name, field.value);
-                        });
-                    }
-                    if (options.blob) {
-                        formData.append(paramName, options.blob, file.name);
-                    } else {
-                        $.each(options.files, function (index, file) {
-                            // This check allows the tests to run with
-                            // dummy objects:
-                            if (that._isInstanceOf('File', file) ||
-                                    that._isInstanceOf('Blob', file)) {
-                                formData.append(
-                                    ($.type(options.paramName) === 'array' &&
-                                        options.paramName[index]) || paramName,
-                                    file,
-                                    file.uploadName || file.name
-                                );
-                            }
-                        });
+                that._sending -= 1;
+                that._active -= 1;
+                if (
+                  options.limitConcurrentUploads &&
+                  options.limitConcurrentUploads > that._sending
+                ) {
+                  // Start the next queued upload,
+                  // that has not been aborted:
+                  var nextSlot = that._slots.shift();
+                  while (nextSlot) {
+                    if (that._getDeferredState(nextSlot) === 'pending') {
+                      nextSlot.resolve();
+                      break;
                     }
+                    nextSlot = that._slots.shift();
+                  }
                 }
-                options.data = formData;
-            }
-            // Blob reference is not needed anymore, free memory:
-            options.blob = null;
-        },
-
-        _initIframeSettings: function (options) {
-            var targetHost = $('<a></a>').prop('href', options.url).prop('host');
-            // Setting the dataType to iframe enables the iframe transport:
-            options.dataType = 'iframe ' + (options.dataType || '');
-            // The iframe transport accepts a serialized array as form data:
-            options.formData = this._getFormData(options);
-            // Add redirect url to form data on cross-domain uploads:
-            if (options.redirect && targetHost && targetHost !== location.host) {
-                options.formData.push({
-                    name: options.redirectParamName || 'redirect',
-                    value: options.redirect
-                });
-            }
-        },
-
-        _initDataSettings: function (options) {
-            if (this._isXHRUpload(options)) {
-                if (!this._chunkedUpload(options, true)) {
-                    if (!options.data) {
-                        this._initXHRData(options);
-                    }
-                    this._initProgressListener(options);
+                if (that._active === 0) {
+                  // The stop callback is triggered when all uploads have
+                  // been completed, equivalent to the global ajaxStop event:
+                  that._trigger('stop');
                 }
-                if (options.postMessage) {
-                    // Setting the dataType to postmessage enables the
-                    // postMessage transport:
-                    options.dataType = 'postmessage ' + (options.dataType || '');
-                }
-            } else {
-                this._initIframeSettings(options);
-            }
-        },
-
-        _getParamName: function (options) {
-            var fileInput = $(options.fileInput),
-                paramName = options.paramName;
-            if (!paramName) {
-                paramName = [];
-                fileInput.each(function () {
-                    var input = $(this),
-                        name = input.prop('name') || 'files[]',
-                        i = (input.prop('files') || [1]).length;
-                    while (i) {
-                        paramName.push(name);
-                        i -= 1;
-                    }
-                });
-                if (!paramName.length) {
-                    paramName = [fileInput.prop('name') || 'files[]'];
-                }
-            } else if (!$.isArray(paramName)) {
-                paramName = [paramName];
-            }
-            return paramName;
-        },
-
-        _initFormSettings: function (options) {
-            // Retrieve missing options from the input field and the
-            // associated form, if available:
-            if (!options.form || !options.form.length) {
-                options.form = $(options.fileInput.prop('form'));
-                // If the given file input doesn't have an associated form,
-                // use the default widget file input's form:
-                if (!options.form.length) {
-                    options.form = $(this.options.fileInput.prop('form'));
-                }
-            }
-            options.paramName = this._getParamName(options);
-            if (!options.url) {
-                options.url = options.form.prop('action') || location.href;
-            }
-            // The HTTP request method must be "POST" or "PUT":
-            options.type = (options.type ||
-                ($.type(options.form.prop('method')) === 'string' &&
-                    options.form.prop('method')) || ''
-                ).toUpperCase();
-            if (options.type !== 'POST' && options.type !== 'PUT' &&
-                    options.type !== 'PATCH') {
-                options.type = 'POST';
-            }
-            if (!options.formAcceptCharset) {
-                options.formAcceptCharset = options.form.attr('accept-charset');
-            }
-        },
-
-        _getAJAXSettings: function (data) {
-            var options = $.extend({}, this.options, data);
-            this._initFormSettings(options);
-            this._initDataSettings(options);
-            return options;
-        },
-
-        // jQuery 1.6 doesn't provide .state(),
-        // while jQuery 1.8+ removed .isRejected() and .isResolved():
-        _getDeferredState: function (deferred) {
-            if (deferred.state) {
-                return deferred.state();
-            }
-            if (deferred.isResolved()) {
-                return 'resolved';
-            }
-            if (deferred.isRejected()) {
-                return 'rejected';
-            }
-            return 'pending';
-        },
-
-        // Maps jqXHR callbacks to the equivalent
-        // methods of the given Promise object:
-        _enhancePromise: function (promise) {
-            promise.success = promise.done;
-            promise.error = promise.fail;
-            promise.complete = promise.always;
-            return promise;
-        },
-
-        // Creates and returns a Promise object enhanced with
-        // the jqXHR methods abort, success, error and complete:
-        _getXHRPromise: function (resolveOrReject, context, args) {
-            var dfd = $.Deferred(),
-                promise = dfd.promise();
-            context = context || this.options.context || promise;
-            if (resolveOrReject === true) {
-                dfd.resolveWith(context, args);
-            } else if (resolveOrReject === false) {
-                dfd.rejectWith(context, args);
-            }
-            promise.abort = dfd.promise;
-            return this._enhancePromise(promise);
-        },
-
-        // Adds convenience methods to the data callback argument:
-        _addConvenienceMethods: function (e, data) {
-            var that = this,
-                getPromise = function (args) {
-                    return $.Deferred().resolveWith(that, args).promise();
-                };
-            data.process = function (resolveFunc, rejectFunc) {
-                if (resolveFunc || rejectFunc) {
-                    data._processQueue = this._processQueue =
-                        (this._processQueue || getPromise([this])).pipe(
-                            function () {
-                                if (data.errorThrown) {
-                                    return $.Deferred()
-                                        .rejectWith(that, [data]).promise();
-                                }
-                                return getPromise(arguments);
-                            }
-                        ).pipe(resolveFunc, rejectFunc);
-                }
-                return this._processQueue || getPromise([this]);
-            };
-            data.submit = function () {
-                if (this.state() !== 'pending') {
-                    data.jqXHR = this.jqXHR =
-                        (that._trigger(
-                            'submit',
-                            $.Event('submit', {delegatedEvent: e}),
-                            this
-                        ) !== false) && that._onSend(e, this);
-                }
-                return this.jqXHR || that._getXHRPromise();
-            };
-            data.abort = function () {
-                if (this.jqXHR) {
-                    return this.jqXHR.abort();
-                }
-                this.errorThrown = 'abort';
-                that._trigger('fail', null, this);
-                return that._getXHRPromise(false);
-            };
-            data.state = function () {
-                if (this.jqXHR) {
-                    return that._getDeferredState(this.jqXHR);
-                }
-                if (this._processQueue) {
-                    return that._getDeferredState(this._processQueue);
-                }
-            };
-            data.processing = function () {
-                return !this.jqXHR && this._processQueue && that
-                    ._getDeferredState(this._processQueue) === 'pending';
-            };
-            data.progress = function () {
-                return this._progress;
-            };
-            data.response = function () {
-                return this._response;
-            };
-        },
-
-        // Parses the Range header from the server response
-        // and returns the uploaded bytes:
-        _getUploadedBytes: function (jqXHR) {
-            var range = jqXHR.getResponseHeader('Range'),
-                parts = range && range.split('-'),
-                upperBytesPos = parts && parts.length > 1 &&
-                    parseInt(parts[1], 10);
-            return upperBytesPos && upperBytesPos + 1;
-        },
-
-        // Uploads a file in multiple, sequential requests
-        // by splitting the file up in multiple blob chunks.
-        // If the second parameter is true, only tests if the file
-        // should be uploaded in chunks, but does not invoke any
-        // upload requests:
-        _chunkedUpload: function (options, testOnly) {
-            options.uploadedBytes = options.uploadedBytes || 0;
-            var that = this,
-                file = options.files[0],
-                fs = file.size,
-                ub = options.uploadedBytes,
-                mcs = options.maxChunkSize || fs,
-                slice = this._blobSlice,
-                dfd = $.Deferred(),
-                promise = dfd.promise(),
-                jqXHR,
-                upload;
-            if (!(this._isXHRUpload(options) && slice && (ub || mcs < fs)) ||
-                    options.data) {
-                return false;
-            }
-            if (testOnly) {
-                return true;
-            }
-            if (ub >= fs) {
-                file.error = options.i18n('uploadedBytes');
-                return this._getXHRPromise(
-                    false,
-                    options.context,
-                    [null, 'error', file.error]
-                );
-            }
-            // The chunk upload method:
-            upload = function () {
-                // Clone the options object for each chunk upload:
-                var o = $.extend({}, options),
-                    currentLoaded = o._progress.loaded;
-                o.blob = slice.call(
-                    file,
-                    ub,
-                    ub + mcs,
-                    file.type
-                );
-                // Store the current chunk size, as the blob itself
-                // will be dereferenced after data processing:
-                o.chunkSize = o.blob.size;
-                // Expose the chunk bytes position range:
-                o.contentRange = 'bytes ' + ub + '-' +
-                    (ub + o.chunkSize - 1) + '/' + fs;
-                // Process the upload data (the blob and potential form data):
-                that._initXHRData(o);
-                // Add progress listeners for this chunk upload:
-                that._initProgressListener(o);
-                jqXHR = ((that._trigger('chunksend', null, o) !== false && $.ajax(o)) ||
-                        that._getXHRPromise(false, o.context))
-                    .done(function (result, textStatus, jqXHR) {
-                        ub = that._getUploadedBytes(jqXHR) ||
-                            (ub + o.chunkSize);
-                        // Create a progress event if no final progress event
-                        // with loaded equaling total has been triggered
-                        // for this chunk:
-                        if (currentLoaded + o.chunkSize - o._progress.loaded) {
-                            that._onProgress($.Event('progress', {
-                                lengthComputable: true,
-                                loaded: ub - o.uploadedBytes,
-                                total: ub - o.uploadedBytes
-                            }), o);
-                        }
-                        options.uploadedBytes = o.uploadedBytes = ub;
-                        o.result = result;
-                        o.textStatus = textStatus;
-                        o.jqXHR = jqXHR;
-                        that._trigger('chunkdone', null, o);
-                        that._trigger('chunkalways', null, o);
-                        if (ub < fs) {
-                            // File upload not yet complete,
-                            // continue with the next chunk:
-                            upload();
-                        } else {
-                            dfd.resolveWith(
-                                o.context,
-                                [result, textStatus, jqXHR]
-                            );
-                        }
-                    })
-                    .fail(function (jqXHR, textStatus, errorThrown) {
-                        o.jqXHR = jqXHR;
-                        o.textStatus = textStatus;
-                        o.errorThrown = errorThrown;
-                        that._trigger('chunkfail', null, o);
-                        that._trigger('chunkalways', null, o);
-                        dfd.rejectWith(
-                            o.context,
-                            [jqXHR, textStatus, errorThrown]
-                        );
-                    });
-            };
-            this._enhancePromise(promise);
-            promise.abort = function () {
-                return jqXHR.abort();
-            };
-            upload();
-            return promise;
-        },
-
-        _beforeSend: function (e, data) {
-            if (this._active === 0) {
-                // the start callback is triggered when an upload starts
-                // and no other uploads are currently running,
-                // equivalent to the global ajaxStart event:
-                this._trigger('start');
-                // Set timer for global bitrate progress calculation:
-                this._bitrateTimer = new this._BitrateTimer();
-                // Reset the global progress values:
-                this._progress.loaded = this._progress.total = 0;
-                this._progress.bitrate = 0;
-            }
-            // Make sure the container objects for the .response() and
-            // .progress() methods on the data object are available
-            // and reset to their initial state:
-            this._initResponseObject(data);
-            this._initProgressObject(data);
-            data._progress.loaded = data.loaded = data.uploadedBytes || 0;
-            data._progress.total = data.total = this._getTotal(data.files) || 1;
-            data._progress.bitrate = data.bitrate = 0;
-            this._active += 1;
-            // Initialize the global progress values:
-            this._progress.loaded += data.loaded;
-            this._progress.total += data.total;
-        },
-
-        _onDone: function (result, textStatus, jqXHR, options) {
-            var total = options._progress.total,
-                response = options._response;
-            if (options._progress.loaded < total) {
-                // Create a progress event if no final progress event
-                // with loaded equaling total has been triggered:
-                this._onProgress($.Event('progress', {
-                    lengthComputable: true,
-                    loaded: total,
-                    total: total
-                }), options);
-            }
-            response.result = options.result = result;
-            response.textStatus = options.textStatus = textStatus;
-            response.jqXHR = options.jqXHR = jqXHR;
-            this._trigger('done', null, options);
-        },
-
-        _onFail: function (jqXHR, textStatus, errorThrown, options) {
-            var response = options._response;
-            if (options.recalculateProgress) {
-                // Remove the failed (error or abort) file upload from
-                // the global progress calculation:
-                this._progress.loaded -= options._progress.loaded;
-                this._progress.total -= options._progress.total;
-            }
-            response.jqXHR = options.jqXHR = jqXHR;
-            response.textStatus = options.textStatus = textStatus;
-            response.errorThrown = options.errorThrown = errorThrown;
-            this._trigger('fail', null, options);
-        },
-
-        _onAlways: function (jqXHRorResult, textStatus, jqXHRorError, options) {
-            // jqXHRorResult, textStatus and jqXHRorError are added to the
-            // options object via done and fail callbacks
-            this._trigger('always', null, options);
-        },
-
-        _onSend: function (e, data) {
-            if (!data.submit) {
-                this._addConvenienceMethods(e, data);
-            }
-            var that = this,
-                jqXHR,
-                aborted,
-                slot,
-                pipe,
-                options = that._getAJAXSettings(data),
-                send = function () {
-                    that._sending += 1;
-                    // Set timer for bitrate progress calculation:
-                    options._bitrateTimer = new that._BitrateTimer();
-                    jqXHR = jqXHR || (
-                        ((aborted || that._trigger(
-                            'send',
-                            $.Event('send', {delegatedEvent: e}),
-                            options
-                        ) === false) &&
-                        that._getXHRPromise(false, options.context, aborted)) ||
-                        that._chunkedUpload(options) || $.ajax(options)
-                    ).done(function (result, textStatus, jqXHR) {
-                        that._onDone(result, textStatus, jqXHR, options);
-                    }).fail(function (jqXHR, textStatus, errorThrown) {
-                        that._onFail(jqXHR, textStatus, errorThrown, options);
-                    }).always(function (jqXHRorResult, textStatus, jqXHRorError) {
-                        that._onAlways(
-                            jqXHRorResult,
-                            textStatus,
-                            jqXHRorError,
-                            options
-                        );
-                        that._sending -= 1;
-                        that._active -= 1;
-                        if (options.limitConcurrentUploads &&
-                                options.limitConcurrentUploads > that._sending) {
-                            // Start the next queued upload,
-                            // that has not been aborted:
-                            var nextSlot = that._slots.shift();
-                            while (nextSlot) {
-                                if (that._getDeferredState(nextSlot) === 'pending') {
-                                    nextSlot.resolve();
-                                    break;
-                                }
-                                nextSlot = that._slots.shift();
-                            }
-                        }
-                        if (that._active === 0) {
-                            // The stop callback is triggered when all uploads have
-                            // been completed, equivalent to the global ajaxStop event:
-                            that._trigger('stop');
-                        }
-                    });
-                    return jqXHR;
-                };
-            this._beforeSend(e, options);
-            if (this.options.sequentialUploads ||
-                    (this.options.limitConcurrentUploads &&
-                    this.options.limitConcurrentUploads <= this._sending)) {
-                if (this.options.limitConcurrentUploads > 1) {
-                    slot = $.Deferred();
-                    this._slots.push(slot);
-                    pipe = slot.pipe(send);
-                } else {
-                    this._sequence = this._sequence.pipe(send, send);
-                    pipe = this._sequence;
-                }
-                // Return the piped Promise object, enhanced with an abort method,
-                // which is delegated to the jqXHR object of the current upload,
-                // and jqXHR callbacks mapped to the equivalent Promise methods:
-                pipe.abort = function () {
-                    aborted = [undefined, 'abort', 'abort'];
-                    if (!jqXHR) {
-                        if (slot) {
-                            slot.rejectWith(options.context, aborted);
-                        }
-                        return send();
-                    }
-                    return jqXHR.abort();
-                };
-                return this._enhancePromise(pipe);
+              });
+          return jqXHR;
+        };
+      this._beforeSend(e, options);
+      if (
+        this.options.sequentialUploads ||
+        (this.options.limitConcurrentUploads &&
+          this.options.limitConcurrentUploads <= this._sending)
+      ) {
+        if (this.options.limitConcurrentUploads > 1) {
+          slot = $.Deferred();
+          this._slots.push(slot);
+          pipe = slot.then(send);
+        } else {
+          this._sequence = this._sequence.then(send, send);
+          pipe = this._sequence;
+        }
+        // Return the piped Promise object, enhanced with an abort method,
+        // which is delegated to the jqXHR object of the current upload,
+        // and jqXHR callbacks mapped to the equivalent Promise methods:
+        pipe.abort = function () {
+          aborted = [undefined, 'abort', 'abort'];
+          if (!jqXHR) {
+            if (slot) {
+              slot.rejectWith(options.context, aborted);
             }
             return send();
-        },
+          }
+          return jqXHR.abort();
+        };
+        return this._enhancePromise(pipe);
+      }
+      return send();
+    },
 
-        _onAdd: function (e, data) {
-            var that = this,
-                result = true,
-                options = $.extend({}, this.options, data),
-                files = data.files,
-                filesLength = files.length,
-                limit = options.limitMultiFileUploads,
-                limitSize = options.limitMultiFileUploadSize,
-                overhead = options.limitMultiFileUploadSizeOverhead,
-                batchSize = 0,
-                paramName = this._getParamName(options),
-                paramNameSet,
-                paramNameSlice,
-                fileSet,
-                i,
-                j = 0;
-            if (limitSize && (!filesLength || files[0].size === undefined)) {
-                limitSize = undefined;
-            }
-            if (!(options.singleFileUploads || limit || limitSize) ||
-                    !this._isXHRUpload(options)) {
-                fileSet = [files];
-                paramNameSet = [paramName];
-            } else if (!(options.singleFileUploads || limitSize) && limit) {
-                fileSet = [];
-                paramNameSet = [];
-                for (i = 0; i < filesLength; i += limit) {
-                    fileSet.push(files.slice(i, i + limit));
-                    paramNameSlice = paramName.slice(i, i + limit);
-                    if (!paramNameSlice.length) {
-                        paramNameSlice = paramName;
-                    }
-                    paramNameSet.push(paramNameSlice);
-                }
-            } else if (!options.singleFileUploads && limitSize) {
-                fileSet = [];
-                paramNameSet = [];
-                for (i = 0; i < filesLength; i = i + 1) {
-                    batchSize += files[i].size + overhead;
-                    if (i + 1 === filesLength ||
-                            ((batchSize + files[i + 1].size + overhead) > limitSize) ||
-                            (limit && i + 1 - j >= limit)) {
-                        fileSet.push(files.slice(j, i + 1));
-                        paramNameSlice = paramName.slice(j, i + 1);
-                        if (!paramNameSlice.length) {
-                            paramNameSlice = paramName;
-                        }
-                        paramNameSet.push(paramNameSlice);
-                        j = i + 1;
-                        batchSize = 0;
-                    }
-                }
-            } else {
-                paramNameSet = paramName;
-            }
-            data.originalFiles = files;
-            $.each(fileSet || files, function (index, element) {
-                var newData = $.extend({}, data);
-                newData.files = fileSet ? element : [element];
-                newData.paramName = paramNameSet[index];
-                that._initResponseObject(newData);
-                that._initProgressObject(newData);
-                that._addConvenienceMethods(e, newData);
-                result = that._trigger(
-                    'add',
-                    $.Event('add', {delegatedEvent: e}),
-                    newData
-                );
-                return result;
-            });
-            return result;
-        },
-
-        _replaceFileInput: function (data) {
-            var input = data.fileInput,
-                inputClone = input.clone(true);
-            // Add a reference for the new cloned file input to the data argument:
-            data.fileInputClone = inputClone;
-            $('<form></form>').append(inputClone)[0].reset();
-            // Detaching allows to insert the fileInput on another form
-            // without loosing the file input value:
-            input.after(inputClone).detach();
-            // Avoid memory leaks with the detached file input:
-            $.cleanData(input.unbind('remove'));
-            // Replace the original file input element in the fileInput
-            // elements set with the clone, which has been copied including
-            // event handlers:
-            this.options.fileInput = this.options.fileInput.map(function (i, el) {
-                if (el === input[0]) {
-                    return inputClone[0];
-                }
-                return el;
-            });
-            // If the widget has been initialized on the file input itself,
-            // override this.element with the file input clone:
-            if (input[0] === this.element[0]) {
-                this.element = inputClone;
-            }
-        },
-
-        _handleFileTreeEntry: function (entry, path) {
-            var that = this,
-                dfd = $.Deferred(),
-                errorHandler = function (e) {
-                    if (e && !e.entry) {
-                        e.entry = entry;
-                    }
-                    // Since $.when returns immediately if one
-                    // Deferred is rejected, we use resolve instead.
-                    // This allows valid files and invalid items
-                    // to be returned together in one set:
-                    dfd.resolve([e]);
-                },
-                successHandler = function (entries) {
-                    that._handleFileTreeEntries(
-                        entries,
-                        path + entry.name + '/'
-                    ).done(function (files) {
-                        dfd.resolve(files);
-                    }).fail(errorHandler);
-                },
-                readEntries = function () {
-                    dirReader.readEntries(function (results) {
-                        if (!results.length) {
-                            successHandler(entries);
-                        } else {
-                            entries = entries.concat(results);
-                            readEntries();
-                        }
-                    }, errorHandler);
-                },
-                dirReader, entries = [];
-            path = path || '';
-            if (entry.isFile) {
-                if (entry._file) {
-                    // Workaround for Chrome bug #149735
-                    entry._file.relativePath = path;
-                    dfd.resolve(entry._file);
-                } else {
-                    entry.file(function (file) {
-                        file.relativePath = path;
-                        dfd.resolve(file);
-                    }, errorHandler);
-                }
-            } else if (entry.isDirectory) {
-                dirReader = entry.createReader();
-                readEntries();
-            } else {
-                // Return an empy list for file system items
-                // other than files or directories:
-                dfd.resolve([]);
-            }
-            return dfd.promise();
-        },
-
-        _handleFileTreeEntries: function (entries, path) {
-            var that = this;
-            return $.when.apply(
-                $,
-                $.map(entries, function (entry) {
-                    return that._handleFileTreeEntry(entry, path);
-                })
-            ).pipe(function () {
-                return Array.prototype.concat.apply(
-                    [],
-                    arguments
-                );
-            });
-        },
-
-        _getDroppedFiles: function (dataTransfer) {
-            dataTransfer = dataTransfer || {};
-            var items = dataTransfer.items;
-            if (items && items.length && (items[0].webkitGetAsEntry ||
-                    items[0].getAsEntry)) {
-                return this._handleFileTreeEntries(
-                    $.map(items, function (item) {
-                        var entry;
-                        if (item.webkitGetAsEntry) {
-                            entry = item.webkitGetAsEntry();
-                            if (entry) {
-                                // Workaround for Chrome bug #149735:
-                                entry._file = item.getAsFile();
-                            }
-                            return entry;
-                        }
-                        return item.getAsEntry();
-                    })
-                );
-            }
-            return $.Deferred().resolve(
-                $.makeArray(dataTransfer.files)
-            ).promise();
-        },
-
-        _getSingleFileInputFiles: function (fileInput) {
-            fileInput = $(fileInput);
-            var entries = fileInput.prop('webkitEntries') ||
-                    fileInput.prop('entries'),
-                files,
-                value;
-            if (entries && entries.length) {
-                return this._handleFileTreeEntries(entries);
-            }
-            files = $.makeArray(fileInput.prop('files'));
-            if (!files.length) {
-                value = fileInput.prop('value');
-                if (!value) {
-                    return $.Deferred().resolve([]).promise();
-                }
-                // If the files property is not available, the browser does not
-                // support the File API and we add a pseudo File object with
-                // the input value as name with path information removed:
-                files = [{name: value.replace(/^.*\\/, '')}];
-            } else if (files[0].name === undefined && files[0].fileName) {
-                // File normalization for Safari 4 and Firefox 3:
-                $.each(files, function (index, file) {
-                    file.name = file.fileName;
-                    file.size = file.fileSize;
-                });
-            }
-            return $.Deferred().resolve(files).promise();
-        },
-
-        _getFileInputFiles: function (fileInput) {
-            if (!(fileInput instanceof $) || fileInput.length === 1) {
-                return this._getSingleFileInputFiles(fileInput);
-            }
-            return $.when.apply(
-                $,
-                $.map(fileInput, this._getSingleFileInputFiles)
-            ).pipe(function () {
-                return Array.prototype.concat.apply(
-                    [],
-                    arguments
-                );
-            });
-        },
-
-        _onChange: function (e) {
-            var that = this,
-                data = {
-                    fileInput: $(e.target),
-                    form: $(e.target.form)
-                };
-            this._getFileInputFiles(data.fileInput).always(function (files) {
-                data.files = files;
-                if (that.options.replaceFileInput) {
-                    that._replaceFileInput(data);
-                }
-                if (that._trigger(
-                        'change',
-                        $.Event('change', {delegatedEvent: e}),
-                        data
-                    ) !== false) {
-                    that._onAdd(e, data);
-                }
-            });
-        },
-
-        _onPaste: function (e) {
-            var items = e.originalEvent && e.originalEvent.clipboardData &&
-                    e.originalEvent.clipboardData.items,
-                data = {files: []};
-            if (items && items.length) {
-                $.each(items, function (index, item) {
-                    var file = item.getAsFile && item.getAsFile();
-                    if (file) {
-                        data.files.push(file);
-                    }
-                });
-                if (this._trigger(
-                        'paste',
-                        $.Event('paste', {delegatedEvent: e}),
-                        data
-                    ) !== false) {
-                    this._onAdd(e, data);
-                }
-            }
-        },
-
-        _onDrop: function (e) {
-            e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer;
-            var that = this,
-                dataTransfer = e.dataTransfer,
-                data = {};
-            if (dataTransfer && dataTransfer.files && dataTransfer.files.length) {
-                e.preventDefault();
-                this._getDroppedFiles(dataTransfer).always(function (files) {
-                    data.files = files;
-                    if (that._trigger(
-                            'drop',
-                            $.Event('drop', {delegatedEvent: e}),
-                            data
-                        ) !== false) {
-                        that._onAdd(e, data);
-                    }
-                });
-            }
-        },
-
-        _onDragOver: getDragHandler('dragover'),
-
-        _onDragEnter: getDragHandler('dragenter'),
-
-        _onDragLeave: getDragHandler('dragleave'),
-
-        _initEventHandlers: function () {
-            if (this._isXHRUpload(this.options)) {
-                this._on(this.options.dropZone, {
-                    dragover: this._onDragOver,
-                    drop: this._onDrop,
-                    // event.preventDefault() on dragenter is required for IE10+:
-                    dragenter: this._onDragEnter,
-                    // dragleave is not required, but added for completeness:
-                    dragleave: this._onDragLeave
-                });
-                this._on(this.options.pasteZone, {
-                    paste: this._onPaste
-                });
-            }
-            if ($.support.fileInput) {
-                this._on(this.options.fileInput, {
-                    change: this._onChange
-                });
-            }
-        },
-
-        _destroyEventHandlers: function () {
-            this._off(this.options.dropZone, 'dragenter dragleave dragover drop');
-            this._off(this.options.pasteZone, 'paste');
-            this._off(this.options.fileInput, 'change');
-        },
-
-        _setOption: function (key, value) {
-            var reinit = $.inArray(key, this._specialOptions) !== -1;
-            if (reinit) {
-                this._destroyEventHandlers();
-            }
-            this._super(key, value);
-            if (reinit) {
-                this._initSpecialOptions();
-                this._initEventHandlers();
-            }
-        },
-
-        _initSpecialOptions: function () {
-            var options = this.options;
-            if (options.fileInput === undefined) {
-                options.fileInput = this.element.is('input[type="file"]') ?
-                        this.element : this.element.find('input[type="file"]');
-            } else if (!(options.fileInput instanceof $)) {
-                options.fileInput = $(options.fileInput);
-            }
-            if (!(options.dropZone instanceof $)) {
-                options.dropZone = $(options.dropZone);
-            }
-            if (!(options.pasteZone instanceof $)) {
-                options.pasteZone = $(options.pasteZone);
-            }
-        },
-
-        _getRegExp: function (str) {
-            var parts = str.split('/'),
-                modifiers = parts.pop();
-            parts.shift();
-            return new RegExp(parts.join('/'), modifiers);
-        },
-
-        _isRegExpOption: function (key, value) {
-            return key !== 'url' && $.type(value) === 'string' &&
-                /^\/.*\/[igm]{0,3}$/.test(value);
-        },
-
-        _initDataAttributes: function () {
-            var that = this,
-                options = this.options,
-                clone = $(this.element[0].cloneNode(false)),
-                data = clone.data();
-            // Avoid memory leaks:
-            clone.remove();
-            // Initialize options set via HTML5 data-attributes:
-            $.each(
-                data,
-                function (key, value) {
-                    var dataAttributeName = 'data-' +
-                        // Convert camelCase to hyphen-ated key:
-                        key.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
-                    if (clone.attr(dataAttributeName)) {
-                        if (that._isRegExpOption(key, value)) {
-                            value = that._getRegExp(value);
-                        }
-                        options[key] = value;
-                    }
-                }
-            );
-        },
-
-        _create: function () {
-            this._initDataAttributes();
-            this._initSpecialOptions();
-            this._slots = [];
-            this._sequence = this._getXHRPromise(true);
-            this._sending = this._active = 0;
-            this._initProgressObject(this);
-            this._initEventHandlers();
-        },
-
-        // This method is exposed to the widget API and allows to query
-        // the number of active uploads:
-        active: function () {
-            return this._active;
-        },
-
-        // This method is exposed to the widget API and allows to query
-        // the widget upload progress.
-        // It returns an object with loaded, total and bitrate properties
-        // for the running uploads:
-        progress: function () {
-            return this._progress;
-        },
-
-        // This method is exposed to the widget API and allows adding files
-        // using the fileupload API. The data parameter accepts an object which
-        // must have a files property and can contain additional options:
-        // .fileupload('add', {files: filesList});
-        add: function (data) {
-            var that = this;
-            if (!data || this.options.disabled) {
-                return;
-            }
-            if (data.fileInput && !data.files) {
-                this._getFileInputFiles(data.fileInput).always(function (files) {
-                    data.files = files;
-                    that._onAdd(null, data);
-                });
-            } else {
-                data.files = $.makeArray(data.files);
-                this._onAdd(null, data);
-            }
-        },
-
-        // This method is exposed to the widget API and allows sending files
-        // using the fileupload API. The data parameter accepts an object which
-        // must have a files or fileInput property and can contain additional options:
-        // .fileupload('send', {files: filesList});
-        // The method returns a Promise object for the file upload call.
-        send: function (data) {
-            if (data && !this.options.disabled) {
-                if (data.fileInput && !data.files) {
-                    var that = this,
-                        dfd = $.Deferred(),
-                        promise = dfd.promise(),
-                        jqXHR,
-                        aborted;
-                    promise.abort = function () {
-                        aborted = true;
-                        if (jqXHR) {
-                            return jqXHR.abort();
-                        }
-                        dfd.reject(null, 'abort', 'abort');
-                        return promise;
-                    };
-                    this._getFileInputFiles(data.fileInput).always(
-                        function (files) {
-                            if (aborted) {
-                                return;
-                            }
-                            if (!files.length) {
-                                dfd.reject();
-                                return;
-                            }
-                            data.files = files;
-                            jqXHR = that._onSend(null, data);
-                            jqXHR.then(
-                                function (result, textStatus, jqXHR) {
-                                    dfd.resolve(result, textStatus, jqXHR);
-                                },
-                                function (jqXHR, textStatus, errorThrown) {
-                                    dfd.reject(jqXHR, textStatus, errorThrown);
-                                }
-                            );
-                        }
-                    );
-                    return this._enhancePromise(promise);
-                }
-                data.files = $.makeArray(data.files);
-                if (data.files.length) {
-                    return this._onSend(null, data);
-                }
-            }
-            return this._getXHRPromise(false, data && data.context);
+    _onAdd: function (e, data) {
+      var that = this,
+        result = true,
+        options = $.extend({}, this.options, data),
+        files = data.files,
+        filesLength = files.length,
+        limit = options.limitMultiFileUploads,
+        limitSize = options.limitMultiFileUploadSize,
+        overhead = options.limitMultiFileUploadSizeOverhead,
+        batchSize = 0,
+        paramName = this._getParamName(options),
+        paramNameSet,
+        paramNameSlice,
+        fileSet,
+        i,
+        j = 0;
+      if (!filesLength) {
+        return false;
+      }
+      if (limitSize && files[0].size === undefined) {
+        limitSize = undefined;
+      }
+      if (
+        !(options.singleFileUploads || limit || limitSize) ||
+        !this._isXHRUpload(options)
+      ) {
+        fileSet = [files];
+        paramNameSet = [paramName];
+      } else if (!(options.singleFileUploads || limitSize) && limit) {
+        fileSet = [];
+        paramNameSet = [];
+        for (i = 0; i < filesLength; i += limit) {
+          fileSet.push(files.slice(i, i + limit));
+          paramNameSlice = paramName.slice(i, i + limit);
+          if (!paramNameSlice.length) {
+            paramNameSlice = paramName;
+          }
+          paramNameSet.push(paramNameSlice);
         }
+      } else if (!options.singleFileUploads && limitSize) {
+        fileSet = [];
+        paramNameSet = [];
+        for (i = 0; i < filesLength; i = i + 1) {
+          batchSize += files[i].size + overhead;
+          if (
+            i + 1 === filesLength ||
+            batchSize + files[i + 1].size + overhead > limitSize ||
+            (limit && i + 1 - j >= limit)
+          ) {
+            fileSet.push(files.slice(j, i + 1));
+            paramNameSlice = paramName.slice(j, i + 1);
+            if (!paramNameSlice.length) {
+              paramNameSlice = paramName;
+            }
+            paramNameSet.push(paramNameSlice);
+            j = i + 1;
+            batchSize = 0;
+          }
+        }
+      } else {
+        paramNameSet = paramName;
+      }
+      data.originalFiles = files;
+      $.each(fileSet || files, function (index, element) {
+        var newData = $.extend({}, data);
+        newData.files = fileSet ? element : [element];
+        newData.paramName = paramNameSet[index];
+        that._initResponseObject(newData);
+        that._initProgressObject(newData);
+        that._addConvenienceMethods(e, newData);
+        result = that._trigger(
+          'add',
+          $.Event('add', { delegatedEvent: e }),
+          newData
+        );
+        return result;
+      });
+      return result;
+    },
 
-    });
+    _replaceFileInput: function (data) {
+      var input = data.fileInput,
+        inputClone = input.clone(true),
+        restoreFocus = input.is(document.activeElement);
+      // Add a reference for the new cloned file input to the data argument:
+      data.fileInputClone = inputClone;
+      $('<form></form>').append(inputClone)[0].reset();
+      // Detaching allows to insert the fileInput on another form
+      // without loosing the file input value:
+      input.after(inputClone).detach();
+      // If the fileInput had focus before it was detached,
+      // restore focus to the inputClone.
+      if (restoreFocus) {
+        inputClone.focus();
+      }
+      // Avoid memory leaks with the detached file input:
+      $.cleanData(input.off('remove'));
+      // Replace the original file input element in the fileInput
+      // elements set with the clone, which has been copied including
+      // event handlers:
+      this.options.fileInput = this.options.fileInput.map(function (i, el) {
+        if (el === input[0]) {
+          return inputClone[0];
+        }
+        return el;
+      });
+      // If the widget has been initialized on the file input itself,
+      // override this.element with the file input clone:
+      if (input[0] === this.element[0]) {
+        this.element = inputClone;
+      }
+    },
 
-}));
+    _handleFileTreeEntry: function (entry, path) {
+      var that = this,
+        dfd = $.Deferred(),
+        entries = [],
+        dirReader,
+        errorHandler = function (e) {
+          if (e && !e.entry) {
+            e.entry = entry;
+          }
+          // Since $.when returns immediately if one
+          // Deferred is rejected, we use resolve instead.
+          // This allows valid files and invalid items
+          // to be returned together in one set:
+          dfd.resolve([e]);
+        },
+        successHandler = function (entries) {
+          that
+            ._handleFileTreeEntries(entries, path + entry.name + '/')
+            .done(function (files) {
+              dfd.resolve(files);
+            })
+            .fail(errorHandler);
+        },
+        readEntries = function () {
+          dirReader.readEntries(function (results) {
+            if (!results.length) {
+              successHandler(entries);
+            } else {
+              entries = entries.concat(results);
+              readEntries();
+            }
+          }, errorHandler);
+        };
+      // eslint-disable-next-line no-param-reassign
+      path = path || '';
+      if (entry.isFile) {
+        if (entry._file) {
+          // Workaround for Chrome bug #149735
+          entry._file.relativePath = path;
+          dfd.resolve(entry._file);
+        } else {
+          entry.file(function (file) {
+            file.relativePath = path;
+            dfd.resolve(file);
+          }, errorHandler);
+        }
+      } else if (entry.isDirectory) {
+        dirReader = entry.createReader();
+        readEntries();
+      } else {
+        // Return an empty list for file system items
+        // other than files or directories:
+        dfd.resolve([]);
+      }
+      return dfd.promise();
+    },
+
+    _handleFileTreeEntries: function (entries, path) {
+      var that = this;
+      return $.when
+        .apply(
+          $,
+          $.map(entries, function (entry) {
+            return that._handleFileTreeEntry(entry, path);
+          })
+        )
+        .then(function () {
+          return Array.prototype.concat.apply([], arguments);
+        });
+    },
+
+    _getDroppedFiles: function (dataTransfer) {
+      // eslint-disable-next-line no-param-reassign
+      dataTransfer = dataTransfer || {};
+      var items = dataTransfer.items;
+      if (
+        items &&
+        items.length &&
+        (items[0].webkitGetAsEntry || items[0].getAsEntry)
+      ) {
+        return this._handleFileTreeEntries(
+          $.map(items, function (item) {
+            var entry;
+            if (item.webkitGetAsEntry) {
+              entry = item.webkitGetAsEntry();
+              if (entry) {
+                // Workaround for Chrome bug #149735:
+                entry._file = item.getAsFile();
+              }
+              return entry;
+            }
+            return item.getAsEntry();
+          })
+        );
+      }
+      return $.Deferred().resolve($.makeArray(dataTransfer.files)).promise();
+    },
+
+    _getSingleFileInputFiles: function (fileInput) {
+      // eslint-disable-next-line no-param-reassign
+      fileInput = $(fileInput);
+      var entries =
+          fileInput.prop('webkitEntries') || fileInput.prop('entries'),
+        files,
+        value;
+      if (entries && entries.length) {
+        return this._handleFileTreeEntries(entries);
+      }
+      files = $.makeArray(fileInput.prop('files'));
+      if (!files.length) {
+        value = fileInput.prop('value');
+        if (!value) {
+          return $.Deferred().resolve([]).promise();
+        }
+        // If the files property is not available, the browser does not
+        // support the File API and we add a pseudo File object with
+        // the input value as name with path information removed:
+        files = [{ name: value.replace(/^.*\\/, '') }];
+      } else if (files[0].name === undefined && files[0].fileName) {
+        // File normalization for Safari 4 and Firefox 3:
+        $.each(files, function (index, file) {
+          file.name = file.fileName;
+          file.size = file.fileSize;
+        });
+      }
+      return $.Deferred().resolve(files).promise();
+    },
+
+    _getFileInputFiles: function (fileInput) {
+      if (!(fileInput instanceof $) || fileInput.length === 1) {
+        return this._getSingleFileInputFiles(fileInput);
+      }
+      return $.when
+        .apply($, $.map(fileInput, this._getSingleFileInputFiles))
+        .then(function () {
+          return Array.prototype.concat.apply([], arguments);
+        });
+    },
+
+    _onChange: function (e) {
+      var that = this,
+        data = {
+          fileInput: $(e.target),
+          form: $(e.target.form)
+        };
+      this._getFileInputFiles(data.fileInput).always(function (files) {
+        data.files = files;
+        if (that.options.replaceFileInput) {
+          that._replaceFileInput(data);
+        }
+        if (
+          that._trigger(
+            'change',
+            $.Event('change', { delegatedEvent: e }),
+            data
+          ) !== false
+        ) {
+          that._onAdd(e, data);
+        }
+      });
+    },
+
+    _onPaste: function (e) {
+      var items =
+          e.originalEvent &&
+          e.originalEvent.clipboardData &&
+          e.originalEvent.clipboardData.items,
+        data = { files: [] };
+      if (items && items.length) {
+        $.each(items, function (index, item) {
+          var file = item.getAsFile && item.getAsFile();
+          if (file) {
+            data.files.push(file);
+          }
+        });
+        if (
+          this._trigger(
+            'paste',
+            $.Event('paste', { delegatedEvent: e }),
+            data
+          ) !== false
+        ) {
+          this._onAdd(e, data);
+        }
+      }
+    },
+
+    _onDrop: function (e) {
+      e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer;
+      var that = this,
+        dataTransfer = e.dataTransfer,
+        data = {};
+      if (dataTransfer && dataTransfer.files && dataTransfer.files.length) {
+        e.preventDefault();
+        this._getDroppedFiles(dataTransfer).always(function (files) {
+          data.files = files;
+          if (
+            that._trigger(
+              'drop',
+              $.Event('drop', { delegatedEvent: e }),
+              data
+            ) !== false
+          ) {
+            that._onAdd(e, data);
+          }
+        });
+      }
+    },
+
+    _onDragOver: getDragHandler('dragover'),
+
+    _onDragEnter: getDragHandler('dragenter'),
+
+    _onDragLeave: getDragHandler('dragleave'),
+
+    _initEventHandlers: function () {
+      if (this._isXHRUpload(this.options)) {
+        this._on(this.options.dropZone, {
+          dragover: this._onDragOver,
+          drop: this._onDrop,
+          // event.preventDefault() on dragenter is required for IE10+:
+          dragenter: this._onDragEnter,
+          // dragleave is not required, but added for completeness:
+          dragleave: this._onDragLeave
+        });
+        this._on(this.options.pasteZone, {
+          paste: this._onPaste
+        });
+      }
+      if ($.support.fileInput) {
+        this._on(this.options.fileInput, {
+          change: this._onChange
+        });
+      }
+    },
+
+    _destroyEventHandlers: function () {
+      this._off(this.options.dropZone, 'dragenter dragleave dragover drop');
+      this._off(this.options.pasteZone, 'paste');
+      this._off(this.options.fileInput, 'change');
+    },
+
+    _destroy: function () {
+      this._destroyEventHandlers();
+    },
+
+    _setOption: function (key, value) {
+      var reinit = $.inArray(key, this._specialOptions) !== -1;
+      if (reinit) {
+        this._destroyEventHandlers();
+      }
+      this._super(key, value);
+      if (reinit) {
+        this._initSpecialOptions();
+        this._initEventHandlers();
+      }
+    },
+
+    _initSpecialOptions: function () {
+      var options = this.options;
+      if (options.fileInput === undefined) {
+        options.fileInput = this.element.is('input[type="file"]')
+          ? this.element
+          : this.element.find('input[type="file"]');
+      } else if (!(options.fileInput instanceof $)) {
+        options.fileInput = $(options.fileInput);
+      }
+      if (!(options.dropZone instanceof $)) {
+        options.dropZone = $(options.dropZone);
+      }
+      if (!(options.pasteZone instanceof $)) {
+        options.pasteZone = $(options.pasteZone);
+      }
+    },
+
+    _getRegExp: function (str) {
+      var parts = str.split('/'),
+        modifiers = parts.pop();
+      parts.shift();
+      return new RegExp(parts.join('/'), modifiers);
+    },
+
+    _isRegExpOption: function (key, value) {
+      return (
+        key !== 'url' &&
+        $.type(value) === 'string' &&
+        /^\/.*\/[igm]{0,3}$/.test(value)
+      );
+    },
+
+    _initDataAttributes: function () {
+      var that = this,
+        options = this.options,
+        data = this.element.data();
+      // Initialize options set via HTML5 data-attributes:
+      $.each(this.element[0].attributes, function (index, attr) {
+        var key = attr.name.toLowerCase(),
+          value;
+        if (/^data-/.test(key)) {
+          // Convert hyphen-ated key to camelCase:
+          key = key.slice(5).replace(/-[a-z]/g, function (str) {
+            return str.charAt(1).toUpperCase();
+          });
+          value = data[key];
+          if (that._isRegExpOption(key, value)) {
+            value = that._getRegExp(value);
+          }
+          options[key] = value;
+        }
+      });
+    },
+
+    _create: function () {
+      this._initDataAttributes();
+      this._initSpecialOptions();
+      this._slots = [];
+      this._sequence = this._getXHRPromise(true);
+      this._sending = this._active = 0;
+      this._initProgressObject(this);
+      this._initEventHandlers();
+    },
+
+    // This method is exposed to the widget API and allows to query
+    // the number of active uploads:
+    active: function () {
+      return this._active;
+    },
+
+    // This method is exposed to the widget API and allows to query
+    // the widget upload progress.
+    // It returns an object with loaded, total and bitrate properties
+    // for the running uploads:
+    progress: function () {
+      return this._progress;
+    },
+
+    // This method is exposed to the widget API and allows adding files
+    // using the fileupload API. The data parameter accepts an object which
+    // must have a files property and can contain additional options:
+    // .fileupload('add', {files: filesList});
+    add: function (data) {
+      var that = this;
+      if (!data || this.options.disabled) {
+        return;
+      }
+      if (data.fileInput && !data.files) {
+        this._getFileInputFiles(data.fileInput).always(function (files) {
+          data.files = files;
+          that._onAdd(null, data);
+        });
+      } else {
+        data.files = $.makeArray(data.files);
+        this._onAdd(null, data);
+      }
+    },
+
+    // This method is exposed to the widget API and allows sending files
+    // using the fileupload API. The data parameter accepts an object which
+    // must have a files or fileInput property and can contain additional options:
+    // .fileupload('send', {files: filesList});
+    // The method returns a Promise object for the file upload call.
+    send: function (data) {
+      if (data && !this.options.disabled) {
+        if (data.fileInput && !data.files) {
+          var that = this,
+            dfd = $.Deferred(),
+            promise = dfd.promise(),
+            jqXHR,
+            aborted;
+          promise.abort = function () {
+            aborted = true;
+            if (jqXHR) {
+              return jqXHR.abort();
+            }
+            dfd.reject(null, 'abort', 'abort');
+            return promise;
+          };
+          this._getFileInputFiles(data.fileInput).always(function (files) {
+            if (aborted) {
+              return;
+            }
+            if (!files.length) {
+              dfd.reject();
+              return;
+            }
+            data.files = files;
+            jqXHR = that._onSend(null, data);
+            jqXHR.then(
+              function (result, textStatus, jqXHR) {
+                dfd.resolve(result, textStatus, jqXHR);
+              },
+              function (jqXHR, textStatus, errorThrown) {
+                dfd.reject(jqXHR, textStatus, errorThrown);
+              }
+            );
+          });
+          return this._enhancePromise(promise);
+        }
+        data.files = $.makeArray(data.files);
+        if (data.files.length) {
+          return this._onSend(null, data);
+        }
+      }
+      return this._getXHRPromise(false, data && data.context);
+    }
+  });
+});
diff --git a/vendor/assets/javascripts/jquery.iframe-transport.js b/vendor/assets/javascripts/jquery.iframe-transport.js
index b7581f23f4..29cdeaa907 100644
--- a/vendor/assets/javascripts/jquery.iframe-transport.js
+++ b/vendor/assets/javascripts/jquery.iframe-transport.js
@@ -1,217 +1,221 @@
 /*
- * jQuery Iframe Transport Plugin 1.8.3
+ * jQuery Iframe Transport Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2011, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
-/* global define, require, window, document */
+/* global define, require */
 
 (function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define(['jquery'], factory);
-    } else if (typeof exports === 'object') {
-        // Node/CommonJS:
-        factory(require('jquery'));
-    } else {
-        // Browser globals:
-        factory(window.jQuery);
-    }
-}(function ($) {
-    'use strict';
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery'], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS:
+    factory(require('jquery'));
+  } else {
+    // Browser globals:
+    factory(window.jQuery);
+  }
+})(function ($) {
+  'use strict';
 
-    // Helper variable to create unique names for the transport iframes:
-    var counter = 0;
+  // Helper variable to create unique names for the transport iframes:
+  var counter = 0,
+    jsonAPI = $,
+    jsonParse = 'parseJSON';
 
-    // The iframe transport accepts four additional options:
-    // options.fileInput: a jQuery collection of file input fields
-    // options.paramName: the parameter name for the file form data,
-    //  overrides the name property of the file input field(s),
-    //  can be a string or an array of strings.
-    // options.formData: an array of objects with name and value properties,
-    //  equivalent to the return data of .serializeArray(), e.g.:
-    //  [{name: 'a', value: 1}, {name: 'b', value: 2}]
-    // options.initialIframeSrc: the URL of the initial iframe src,
-    //  by default set to "javascript:false;"
-    $.ajaxTransport('iframe', function (options) {
-        if (options.async) {
-            // javascript:false as initial iframe src
-            // prevents warning popups on HTTPS in IE6:
-            /*jshint scripturl: true */
-            var initialIframeSrc = options.initialIframeSrc || 'javascript:false;',
-            /*jshint scripturl: false */
-                form,
-                iframe,
-                addParamChar;
-            return {
-                send: function (_, completeCallback) {
-                    form = $('<form style="display:none;"></form>');
-                    form.attr('accept-charset', options.formAcceptCharset);
-                    addParamChar = /\?/.test(options.url) ? '&' : '?';
-                    // XDomainRequest only supports GET and POST:
-                    if (options.type === 'DELETE') {
-                        options.url = options.url + addParamChar + '_method=DELETE';
-                        options.type = 'POST';
-                    } else if (options.type === 'PUT') {
-                        options.url = options.url + addParamChar + '_method=PUT';
-                        options.type = 'POST';
-                    } else if (options.type === 'PATCH') {
-                        options.url = options.url + addParamChar + '_method=PATCH';
-                        options.type = 'POST';
-                    }
-                    // IE versions below IE8 cannot set the name property of
-                    // elements that have already been added to the DOM,
-                    // so we set the name along with the iframe HTML markup:
-                    counter += 1;
-                    iframe = $(
-                        '<iframe src="' + initialIframeSrc +
-                            '" name="iframe-transport-' + counter + '"></iframe>'
-                    ).bind('load', function () {
-                        var fileInputClones,
-                            paramNames = $.isArray(options.paramName) ?
-                                    options.paramName : [options.paramName];
-                        iframe
-                            .unbind('load')
-                            .bind('load', function () {
-                                var response;
-                                // Wrap in a try/catch block to catch exceptions thrown
-                                // when trying to access cross-domain iframe contents:
-                                try {
-                                    response = iframe.contents();
-                                    // Google Chrome and Firefox do not throw an
-                                    // exception when calling iframe.contents() on
-                                    // cross-domain requests, so we unify the response:
-                                    if (!response.length || !response[0].firstChild) {
-                                        throw new Error();
-                                    }
-                                } catch (e) {
-                                    response = undefined;
-                                }
-                                // The complete callback returns the
-                                // iframe content document as response object:
-                                completeCallback(
-                                    200,
-                                    'success',
-                                    {'iframe': response}
-                                );
-                                // Fix for IE endless progress bar activity bug
-                                // (happens on form submits to iframe targets):
-                                $('<iframe src="' + initialIframeSrc + '"></iframe>')
-                                    .appendTo(form);
-                                window.setTimeout(function () {
-                                    // Removing the form in a setTimeout call
-                                    // allows Chrome's developer tools to display
-                                    // the response result
-                                    form.remove();
-                                }, 0);
-                            });
-                        form
-                            .prop('target', iframe.prop('name'))
-                            .prop('action', options.url)
-                            .prop('method', options.type);
-                        if (options.formData) {
-                            $.each(options.formData, function (index, field) {
-                                $('<input type="hidden"/>')
-                                    .prop('name', field.name)
-                                    .val(field.value)
-                                    .appendTo(form);
-                            });
-                        }
-                        if (options.fileInput && options.fileInput.length &&
-                                options.type === 'POST') {
-                            fileInputClones = options.fileInput.clone();
-                            // Insert a clone for each file input field:
-                            options.fileInput.after(function (index) {
-                                return fileInputClones[index];
-                            });
-                            if (options.paramName) {
-                                options.fileInput.each(function (index) {
-                                    $(this).prop(
-                                        'name',
-                                        paramNames[index] || options.paramName
-                                    );
-                                });
-                            }
-                            // Appending the file input fields to the hidden form
-                            // removes them from their original location:
-                            form
-                                .append(options.fileInput)
-                                .prop('enctype', 'multipart/form-data')
-                                // enctype must be set as encoding for IE:
-                                .prop('encoding', 'multipart/form-data');
-                            // Remove the HTML5 form attribute from the input(s):
-                            options.fileInput.removeAttr('form');
-                        }
-                        form.submit();
-                        // Insert the file input fields at their original location
-                        // by replacing the clones with the originals:
-                        if (fileInputClones && fileInputClones.length) {
-                            options.fileInput.each(function (index, input) {
-                                var clone = $(fileInputClones[index]);
-                                // Restore the original name and form properties:
-                                $(input)
-                                    .prop('name', clone.prop('name'))
-                                    .attr('form', clone.attr('form'));
-                                clone.replaceWith(input);
-                            });
-                        }
-                    });
-                    form.append(iframe).appendTo(document.body);
-                },
-                abort: function () {
-                    if (iframe) {
-                        // javascript:false as iframe src aborts the request
-                        // and prevents warning popups on HTTPS in IE6.
-                        // concat is used to avoid the "Script URL" JSLint error:
-                        iframe
-                            .unbind('load')
-                            .prop('src', initialIframeSrc);
-                    }
-                    if (form) {
-                        form.remove();
-                    }
+  if ('JSON' in window && 'parse' in JSON) {
+    jsonAPI = JSON;
+    jsonParse = 'parse';
+  }
+
+  // The iframe transport accepts four additional options:
+  // options.fileInput: a jQuery collection of file input fields
+  // options.paramName: the parameter name for the file form data,
+  //  overrides the name property of the file input field(s),
+  //  can be a string or an array of strings.
+  // options.formData: an array of objects with name and value properties,
+  //  equivalent to the return data of .serializeArray(), e.g.:
+  //  [{name: 'a', value: 1}, {name: 'b', value: 2}]
+  // options.initialIframeSrc: the URL of the initial iframe src,
+  //  by default set to "javascript:false;"
+  $.ajaxTransport('iframe', function (options) {
+    if (options.async) {
+      // javascript:false as initial iframe src
+      // prevents warning popups on HTTPS in IE6:
+      // eslint-disable-next-line no-script-url
+      var initialIframeSrc = options.initialIframeSrc || 'javascript:false;',
+        form,
+        iframe,
+        addParamChar;
+      return {
+        send: function (_, completeCallback) {
+          form = $('<form style="display:none;"></form>');
+          form.attr('accept-charset', options.formAcceptCharset);
+          addParamChar = /\?/.test(options.url) ? '&' : '?';
+          // XDomainRequest only supports GET and POST:
+          if (options.type === 'DELETE') {
+            options.url = options.url + addParamChar + '_method=DELETE';
+            options.type = 'POST';
+          } else if (options.type === 'PUT') {
+            options.url = options.url + addParamChar + '_method=PUT';
+            options.type = 'POST';
+          } else if (options.type === 'PATCH') {
+            options.url = options.url + addParamChar + '_method=PATCH';
+            options.type = 'POST';
+          }
+          // IE versions below IE8 cannot set the name property of
+          // elements that have already been added to the DOM,
+          // so we set the name along with the iframe HTML markup:
+          counter += 1;
+          iframe = $(
+            '<iframe src="' +
+              initialIframeSrc +
+              '" name="iframe-transport-' +
+              counter +
+              '"></iframe>'
+          ).on('load', function () {
+            var fileInputClones,
+              paramNames = $.isArray(options.paramName)
+                ? options.paramName
+                : [options.paramName];
+            iframe.off('load').on('load', function () {
+              var response;
+              // Wrap in a try/catch block to catch exceptions thrown
+              // when trying to access cross-domain iframe contents:
+              try {
+                response = iframe.contents();
+                // Google Chrome and Firefox do not throw an
+                // exception when calling iframe.contents() on
+                // cross-domain requests, so we unify the response:
+                if (!response.length || !response[0].firstChild) {
+                  throw new Error();
                 }
-            };
-        }
-    });
-
-    // The iframe transport returns the iframe content document as response.
-    // The following adds converters from iframe to text, json, html, xml
-    // and script.
-    // Please note that the Content-Type for JSON responses has to be text/plain
-    // or text/html, if the browser doesn't include application/json in the
-    // Accept header, else IE will show a download dialog.
-    // The Content-Type for XML responses on the other hand has to be always
-    // application/xml or text/xml, so IE properly parses the XML response.
-    // See also
-    // https://github.com/blueimp/jQuery-File-Upload/wiki/Setup#content-type-negotiation
-    $.ajaxSetup({
-        converters: {
-            'iframe text': function (iframe) {
-                return iframe && $(iframe[0].body).text();
-            },
-            'iframe json': function (iframe) {
-                return iframe && $.parseJSON($(iframe[0].body).text());
-            },
-            'iframe html': function (iframe) {
-                return iframe && $(iframe[0].body).html();
-            },
-            'iframe xml': function (iframe) {
-                var xmlDoc = iframe && iframe[0];
-                return xmlDoc && $.isXMLDoc(xmlDoc) ? xmlDoc :
-                        $.parseXML((xmlDoc.XMLDocument && xmlDoc.XMLDocument.xml) ||
-                            $(xmlDoc.body).html());
-            },
-            'iframe script': function (iframe) {
-                return iframe && $.globalEval($(iframe[0].body).text());
+              } catch (e) {
+                response = undefined;
+              }
+              // The complete callback returns the
+              // iframe content document as response object:
+              completeCallback(200, 'success', { iframe: response });
+              // Fix for IE endless progress bar activity bug
+              // (happens on form submits to iframe targets):
+              $('<iframe src="' + initialIframeSrc + '"></iframe>').appendTo(
+                form
+              );
+              window.setTimeout(function () {
+                // Removing the form in a setTimeout call
+                // allows Chrome's developer tools to display
+                // the response result
+                form.remove();
+              }, 0);
+            });
+            form
+              .prop('target', iframe.prop('name'))
+              .prop('action', options.url)
+              .prop('method', options.type);
+            if (options.formData) {
+              $.each(options.formData, function (index, field) {
+                $('<input type="hidden"/>')
+                  .prop('name', field.name)
+                  .val(field.value)
+                  .appendTo(form);
+              });
             }
+            if (
+              options.fileInput &&
+              options.fileInput.length &&
+              options.type === 'POST'
+            ) {
+              fileInputClones = options.fileInput.clone();
+              // Insert a clone for each file input field:
+              options.fileInput.after(function (index) {
+                return fileInputClones[index];
+              });
+              if (options.paramName) {
+                options.fileInput.each(function (index) {
+                  $(this).prop('name', paramNames[index] || options.paramName);
+                });
+              }
+              // Appending the file input fields to the hidden form
+              // removes them from their original location:
+              form
+                .append(options.fileInput)
+                .prop('enctype', 'multipart/form-data')
+                // enctype must be set as encoding for IE:
+                .prop('encoding', 'multipart/form-data');
+              // Remove the HTML5 form attribute from the input(s):
+              options.fileInput.removeAttr('form');
+            }
+            form.submit();
+            // Insert the file input fields at their original location
+            // by replacing the clones with the originals:
+            if (fileInputClones && fileInputClones.length) {
+              options.fileInput.each(function (index, input) {
+                var clone = $(fileInputClones[index]);
+                // Restore the original name and form properties:
+                $(input)
+                  .prop('name', clone.prop('name'))
+                  .attr('form', clone.attr('form'));
+                clone.replaceWith(input);
+              });
+            }
+          });
+          form.append(iframe).appendTo(document.body);
+        },
+        abort: function () {
+          if (iframe) {
+            // javascript:false as iframe src aborts the request
+            // and prevents warning popups on HTTPS in IE6.
+            iframe.off('load').prop('src', initialIframeSrc);
+          }
+          if (form) {
+            form.remove();
+          }
         }
-    });
+      };
+    }
+  });
 
-}));
+  // The iframe transport returns the iframe content document as response.
+  // The following adds converters from iframe to text, json, html, xml
+  // and script.
+  // Please note that the Content-Type for JSON responses has to be text/plain
+  // or text/html, if the browser doesn't include application/json in the
+  // Accept header, else IE will show a download dialog.
+  // The Content-Type for XML responses on the other hand has to be always
+  // application/xml or text/xml, so IE properly parses the XML response.
+  // See also
+  // https://github.com/blueimp/jQuery-File-Upload/wiki/Setup#content-type-negotiation
+  $.ajaxSetup({
+    converters: {
+      'iframe text': function (iframe) {
+        return iframe && $(iframe[0].body).text();
+      },
+      'iframe json': function (iframe) {
+        return iframe && jsonAPI[jsonParse]($(iframe[0].body).text());
+      },
+      'iframe html': function (iframe) {
+        return iframe && $(iframe[0].body).html();
+      },
+      'iframe xml': function (iframe) {
+        var xmlDoc = iframe && iframe[0];
+        return xmlDoc && $.isXMLDoc(xmlDoc)
+          ? xmlDoc
+          : $.parseXML(
+              (xmlDoc.XMLDocument && xmlDoc.XMLDocument.xml) ||
+                $(xmlDoc.body).html()
+            );
+      },
+      'iframe script': function (iframe) {
+        return iframe && $.globalEval($(iframe[0].body).text());
+      }
+    }
+  });
+});
diff --git a/vendor/assets/javascripts/jquery.ui.widget.js b/vendor/assets/javascripts/jquery.ui.widget.js
index 5ac2ed5a57..69096aaa35 100644
--- a/vendor/assets/javascripts/jquery.ui.widget.js
+++ b/vendor/assets/javascripts/jquery.ui.widget.js
@@ -1,563 +1,808 @@
-/*! jQuery UI - v1.11.1+CommonJS - 2014-09-17
-* http://jqueryui.com
-* Includes: widget.js
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
-
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([ "jquery" ], factory );
-
-	} else if (typeof exports === "object") {
-		// Node/CommonJS:
-		factory(require("jquery"));
-
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-/*!
- * jQuery UI Widget 1.11.1
+/*! jQuery UI - v1.12.1+0b7246b6eeadfa9e2696e22f3230f6452f8129dc - 2020-02-20
  * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/jQuery.widget/
- */
+ * Includes: widget.js
+ * Copyright jQuery Foundation and other contributors; Licensed MIT */
 
+/* global define, require */
+/* eslint-disable no-param-reassign, new-cap, jsdoc/require-jsdoc */
 
-var widget_uuid = 0,
-	widget_slice = Array.prototype.slice;
+(function (factory) {
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['jquery'], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS
+    factory(require('jquery'));
+  } else {
+    // Browser globals
+    factory(window.jQuery);
+  }
+})(function ($) {
+  ('use strict');
 
-$.cleanData = (function( orig ) {
-	return function( elems ) {
-		var events, elem, i;
-		for ( i = 0; (elem = elems[i]) != null; i++ ) {
-			try {
+  $.ui = $.ui || {};
 
-				// Only trigger remove when necessary to save time
-				events = $._data( elem, "events" );
-				if ( events && events.remove ) {
-					$( elem ).triggerHandler( "remove" );
-				}
+  $.ui.version = '1.12.1';
 
-			// http://bugs.jquery.com/ticket/8235
-			} catch( e ) {}
-		}
-		orig( elems );
-	};
-})( $.cleanData );
+  /*!
+   * jQuery UI Widget 1.12.1
+   * http://jqueryui.com
+   *
+   * Copyright jQuery Foundation and other contributors
+   * Released under the MIT license.
+   * http://jquery.org/license
+   */
 
-$.widget = function( name, base, prototype ) {
-	var fullName, existingConstructor, constructor, basePrototype,
-		// proxiedPrototype allows the provided prototype to remain unmodified
-		// so that it can be used as a mixin for multiple widgets (#8876)
-		proxiedPrototype = {},
-		namespace = name.split( "." )[ 0 ];
+  //>>label: Widget
+  //>>group: Core
+  //>>description: Provides a factory for creating stateful widgets with a common API.
+  //>>docs: http://api.jqueryui.com/jQuery.widget/
+  //>>demos: http://jqueryui.com/widget/
 
-	name = name.split( "." )[ 1 ];
-	fullName = namespace + "-" + name;
+  // Support: jQuery 1.9.x or older
+  // $.expr[ ":" ] is deprecated.
+  if (!$.expr.pseudos) {
+    $.expr.pseudos = $.expr[':'];
+  }
 
-	if ( !prototype ) {
-		prototype = base;
-		base = $.Widget;
-	}
+  // Support: jQuery 1.11.x or older
+  // $.unique has been renamed to $.uniqueSort
+  if (!$.uniqueSort) {
+    $.uniqueSort = $.unique;
+  }
 
-	// create selector for plugin
-	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
-		return !!$.data( elem, fullName );
-	};
+  var widgetUuid = 0;
+  var widgetHasOwnProperty = Array.prototype.hasOwnProperty;
+  var widgetSlice = Array.prototype.slice;
 
-	$[ namespace ] = $[ namespace ] || {};
-	existingConstructor = $[ namespace ][ name ];
-	constructor = $[ namespace ][ name ] = function( options, element ) {
-		// allow instantiation without "new" keyword
-		if ( !this._createWidget ) {
-			return new constructor( options, element );
-		}
+  $.cleanData = (function (orig) {
+    return function (elems) {
+      var events, elem, i;
+      // eslint-disable-next-line eqeqeq
+      for (i = 0; (elem = elems[i]) != null; i++) {
+        // Only trigger remove when necessary to save time
+        events = $._data(elem, 'events');
+        if (events && events.remove) {
+          $(elem).triggerHandler('remove');
+        }
+      }
+      orig(elems);
+    };
+  })($.cleanData);
 
-		// allow instantiation without initializing for simple inheritance
-		// must use "new" keyword (the code above always passes args)
-		if ( arguments.length ) {
-			this._createWidget( options, element );
-		}
-	};
-	// extend with the existing constructor to carry over any static properties
-	$.extend( constructor, existingConstructor, {
-		version: prototype.version,
-		// copy the object used to create the prototype in case we need to
-		// redefine the widget later
-		_proto: $.extend( {}, prototype ),
-		// track widgets that inherit from this widget in case this widget is
-		// redefined after a widget inherits from it
-		_childConstructors: []
-	});
+  $.widget = function (name, base, prototype) {
+    var existingConstructor, constructor, basePrototype;
 
-	basePrototype = new base();
-	// we need to make the options hash a property directly on the new instance
-	// otherwise we'll modify the options hash on the prototype that we're
-	// inheriting from
-	basePrototype.options = $.widget.extend( {}, basePrototype.options );
-	$.each( prototype, function( prop, value ) {
-		if ( !$.isFunction( value ) ) {
-			proxiedPrototype[ prop ] = value;
-			return;
-		}
-		proxiedPrototype[ prop ] = (function() {
-			var _super = function() {
-					return base.prototype[ prop ].apply( this, arguments );
-				},
-				_superApply = function( args ) {
-					return base.prototype[ prop ].apply( this, args );
-				};
-			return function() {
-				var __super = this._super,
-					__superApply = this._superApply,
-					returnValue;
+    // ProxiedPrototype allows the provided prototype to remain unmodified
+    // so that it can be used as a mixin for multiple widgets (#8876)
+    var proxiedPrototype = {};
 
-				this._super = _super;
-				this._superApply = _superApply;
+    var namespace = name.split('.')[0];
+    name = name.split('.')[1];
+    var fullName = namespace + '-' + name;
 
-				returnValue = value.apply( this, arguments );
+    if (!prototype) {
+      prototype = base;
+      base = $.Widget;
+    }
 
-				this._super = __super;
-				this._superApply = __superApply;
+    if ($.isArray(prototype)) {
+      prototype = $.extend.apply(null, [{}].concat(prototype));
+    }
 
-				return returnValue;
-			};
-		})();
-	});
-	constructor.prototype = $.widget.extend( basePrototype, {
-		// TODO: remove support for widgetEventPrefix
-		// always use the name + a colon as the prefix, e.g., draggable:start
-		// don't prefix for widgets that aren't DOM-based
-		widgetEventPrefix: existingConstructor ? (basePrototype.widgetEventPrefix || name) : name
-	}, proxiedPrototype, {
-		constructor: constructor,
-		namespace: namespace,
-		widgetName: name,
-		widgetFullName: fullName
-	});
+    // Create selector for plugin
+    $.expr.pseudos[fullName.toLowerCase()] = function (elem) {
+      return !!$.data(elem, fullName);
+    };
 
-	// If this widget is being redefined then we need to find all widgets that
-	// are inheriting from it and redefine all of them so that they inherit from
-	// the new version of this widget. We're essentially trying to replace one
-	// level in the prototype chain.
-	if ( existingConstructor ) {
-		$.each( existingConstructor._childConstructors, function( i, child ) {
-			var childPrototype = child.prototype;
+    $[namespace] = $[namespace] || {};
+    existingConstructor = $[namespace][name];
+    constructor = $[namespace][name] = function (options, element) {
+      // Allow instantiation without "new" keyword
+      if (!this._createWidget) {
+        return new constructor(options, element);
+      }
 
-			// redefine the child widget using the same prototype that was
-			// originally used, but inherit from the new version of the base
-			$.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto );
-		});
-		// remove the list of existing child constructors from the old constructor
-		// so the old child constructors can be garbage collected
-		delete existingConstructor._childConstructors;
-	} else {
-		base._childConstructors.push( constructor );
-	}
+      // Allow instantiation without initializing for simple inheritance
+      // must use "new" keyword (the code above always passes args)
+      if (arguments.length) {
+        this._createWidget(options, element);
+      }
+    };
 
-	$.widget.bridge( name, constructor );
+    // Extend with the existing constructor to carry over any static properties
+    $.extend(constructor, existingConstructor, {
+      version: prototype.version,
 
-	return constructor;
-};
+      // Copy the object used to create the prototype in case we need to
+      // redefine the widget later
+      _proto: $.extend({}, prototype),
 
-$.widget.extend = function( target ) {
-	var input = widget_slice.call( arguments, 1 ),
-		inputIndex = 0,
-		inputLength = input.length,
-		key,
-		value;
-	for ( ; inputIndex < inputLength; inputIndex++ ) {
-		for ( key in input[ inputIndex ] ) {
-			value = input[ inputIndex ][ key ];
-			if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
-				// Clone objects
-				if ( $.isPlainObject( value ) ) {
-					target[ key ] = $.isPlainObject( target[ key ] ) ?
-						$.widget.extend( {}, target[ key ], value ) :
-						// Don't extend strings, arrays, etc. with objects
-						$.widget.extend( {}, value );
-				// Copy everything else by reference
-				} else {
-					target[ key ] = value;
-				}
-			}
-		}
-	}
-	return target;
-};
+      // Track widgets that inherit from this widget in case this widget is
+      // redefined after a widget inherits from it
+      _childConstructors: []
+    });
 
-$.widget.bridge = function( name, object ) {
-	var fullName = object.prototype.widgetFullName || name;
-	$.fn[ name ] = function( options ) {
-		var isMethodCall = typeof options === "string",
-			args = widget_slice.call( arguments, 1 ),
-			returnValue = this;
+    basePrototype = new base();
 
-		// allow multiple hashes to be passed on init
-		options = !isMethodCall && args.length ?
-			$.widget.extend.apply( null, [ options ].concat(args) ) :
-			options;
+    // We need to make the options hash a property directly on the new instance
+    // otherwise we'll modify the options hash on the prototype that we're
+    // inheriting from
+    basePrototype.options = $.widget.extend({}, basePrototype.options);
+    $.each(prototype, function (prop, value) {
+      if (!$.isFunction(value)) {
+        proxiedPrototype[prop] = value;
+        return;
+      }
+      proxiedPrototype[prop] = (function () {
+        function _super() {
+          return base.prototype[prop].apply(this, arguments);
+        }
 
-		if ( isMethodCall ) {
-			this.each(function() {
-				var methodValue,
-					instance = $.data( this, fullName );
-				if ( options === "instance" ) {
-					returnValue = instance;
-					return false;
-				}
-				if ( !instance ) {
-					return $.error( "cannot call methods on " + name + " prior to initialization; " +
-						"attempted to call method '" + options + "'" );
-				}
-				if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) {
-					return $.error( "no such method '" + options + "' for " + name + " widget instance" );
-				}
-				methodValue = instance[ options ].apply( instance, args );
-				if ( methodValue !== instance && methodValue !== undefined ) {
-					returnValue = methodValue && methodValue.jquery ?
-						returnValue.pushStack( methodValue.get() ) :
-						methodValue;
-					return false;
-				}
-			});
-		} else {
-			this.each(function() {
-				var instance = $.data( this, fullName );
-				if ( instance ) {
-					instance.option( options || {} );
-					if ( instance._init ) {
-						instance._init();
-					}
-				} else {
-					$.data( this, fullName, new object( options, this ) );
-				}
-			});
-		}
+        function _superApply(args) {
+          return base.prototype[prop].apply(this, args);
+        }
 
-		return returnValue;
-	};
-};
+        return function () {
+          var __super = this._super;
+          var __superApply = this._superApply;
+          var returnValue;
 
-$.Widget = function( /* options, element */ ) {};
-$.Widget._childConstructors = [];
+          this._super = _super;
+          this._superApply = _superApply;
 
-$.Widget.prototype = {
-	widgetName: "widget",
-	widgetEventPrefix: "",
-	defaultElement: "<div>",
-	options: {
-		disabled: false,
+          returnValue = value.apply(this, arguments);
 
-		// callbacks
-		create: null
-	},
-	_createWidget: function( options, element ) {
-		element = $( element || this.defaultElement || this )[ 0 ];
-		this.element = $( element );
-		this.uuid = widget_uuid++;
-		this.eventNamespace = "." + this.widgetName + this.uuid;
-		this.options = $.widget.extend( {},
-			this.options,
-			this._getCreateOptions(),
-			options );
+          this._super = __super;
+          this._superApply = __superApply;
 
-		this.bindings = $();
-		this.hoverable = $();
-		this.focusable = $();
+          return returnValue;
+        };
+      })();
+    });
+    constructor.prototype = $.widget.extend(
+      basePrototype,
+      {
+        // TODO: remove support for widgetEventPrefix
+        // always use the name + a colon as the prefix, e.g., draggable:start
+        // don't prefix for widgets that aren't DOM-based
+        widgetEventPrefix: existingConstructor
+          ? basePrototype.widgetEventPrefix || name
+          : name
+      },
+      proxiedPrototype,
+      {
+        constructor: constructor,
+        namespace: namespace,
+        widgetName: name,
+        widgetFullName: fullName
+      }
+    );
 
-		if ( element !== this ) {
-			$.data( element, this.widgetFullName, this );
-			this._on( true, this.element, {
-				remove: function( event ) {
-					if ( event.target === element ) {
-						this.destroy();
-					}
-				}
-			});
-			this.document = $( element.style ?
-				// element within the document
-				element.ownerDocument :
-				// element is window or document
-				element.document || element );
-			this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
-		}
+    // If this widget is being redefined then we need to find all widgets that
+    // are inheriting from it and redefine all of them so that they inherit from
+    // the new version of this widget. We're essentially trying to replace one
+    // level in the prototype chain.
+    if (existingConstructor) {
+      $.each(existingConstructor._childConstructors, function (i, child) {
+        var childPrototype = child.prototype;
 
-		this._create();
-		this._trigger( "create", null, this._getCreateEventData() );
-		this._init();
-	},
-	_getCreateOptions: $.noop,
-	_getCreateEventData: $.noop,
-	_create: $.noop,
-	_init: $.noop,
+        // Redefine the child widget using the same prototype that was
+        // originally used, but inherit from the new version of the base
+        $.widget(
+          childPrototype.namespace + '.' + childPrototype.widgetName,
+          constructor,
+          child._proto
+        );
+      });
 
-	destroy: function() {
-		this._destroy();
-		// we can probably remove the unbind calls in 2.0
-		// all event bindings should go through this._on()
-		this.element
-			.unbind( this.eventNamespace )
-			.removeData( this.widgetFullName )
-			// support: jquery <1.6.3
-			// http://bugs.jquery.com/ticket/9413
-			.removeData( $.camelCase( this.widgetFullName ) );
-		this.widget()
-			.unbind( this.eventNamespace )
-			.removeAttr( "aria-disabled" )
-			.removeClass(
-				this.widgetFullName + "-disabled " +
-				"ui-state-disabled" );
+      // Remove the list of existing child constructors from the old constructor
+      // so the old child constructors can be garbage collected
+      delete existingConstructor._childConstructors;
+    } else {
+      base._childConstructors.push(constructor);
+    }
 
-		// clean up events and states
-		this.bindings.unbind( this.eventNamespace );
-		this.hoverable.removeClass( "ui-state-hover" );
-		this.focusable.removeClass( "ui-state-focus" );
-	},
-	_destroy: $.noop,
+    $.widget.bridge(name, constructor);
 
-	widget: function() {
-		return this.element;
-	},
+    return constructor;
+  };
 
-	option: function( key, value ) {
-		var options = key,
-			parts,
-			curOption,
-			i;
+  $.widget.extend = function (target) {
+    var input = widgetSlice.call(arguments, 1);
+    var inputIndex = 0;
+    var inputLength = input.length;
+    var key;
+    var value;
 
-		if ( arguments.length === 0 ) {
-			// don't return a reference to the internal hash
-			return $.widget.extend( {}, this.options );
-		}
+    for (; inputIndex < inputLength; inputIndex++) {
+      for (key in input[inputIndex]) {
+        value = input[inputIndex][key];
+        if (
+          widgetHasOwnProperty.call(input[inputIndex], key) &&
+          value !== undefined
+        ) {
+          // Clone objects
+          if ($.isPlainObject(value)) {
+            target[key] = $.isPlainObject(target[key])
+              ? $.widget.extend({}, target[key], value)
+              : // Don't extend strings, arrays, etc. with objects
+                $.widget.extend({}, value);
 
-		if ( typeof key === "string" ) {
-			// handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
-			options = {};
-			parts = key.split( "." );
-			key = parts.shift();
-			if ( parts.length ) {
-				curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
-				for ( i = 0; i < parts.length - 1; i++ ) {
-					curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
-					curOption = curOption[ parts[ i ] ];
-				}
-				key = parts.pop();
-				if ( arguments.length === 1 ) {
-					return curOption[ key ] === undefined ? null : curOption[ key ];
-				}
-				curOption[ key ] = value;
-			} else {
-				if ( arguments.length === 1 ) {
-					return this.options[ key ] === undefined ? null : this.options[ key ];
-				}
-				options[ key ] = value;
-			}
-		}
+            // Copy everything else by reference
+          } else {
+            target[key] = value;
+          }
+        }
+      }
+    }
+    return target;
+  };
 
-		this._setOptions( options );
+  $.widget.bridge = function (name, object) {
+    var fullName = object.prototype.widgetFullName || name;
+    $.fn[name] = function (options) {
+      var isMethodCall = typeof options === 'string';
+      var args = widgetSlice.call(arguments, 1);
+      var returnValue = this;
 
-		return this;
-	},
-	_setOptions: function( options ) {
-		var key;
+      if (isMethodCall) {
+        // If this is an empty collection, we need to have the instance method
+        // return undefined instead of the jQuery instance
+        if (!this.length && options === 'instance') {
+          returnValue = undefined;
+        } else {
+          this.each(function () {
+            var methodValue;
+            var instance = $.data(this, fullName);
 
-		for ( key in options ) {
-			this._setOption( key, options[ key ] );
-		}
+            if (options === 'instance') {
+              returnValue = instance;
+              return false;
+            }
 
-		return this;
-	},
-	_setOption: function( key, value ) {
-		this.options[ key ] = value;
+            if (!instance) {
+              return $.error(
+                'cannot call methods on ' +
+                  name +
+                  ' prior to initialization; ' +
+                  "attempted to call method '" +
+                  options +
+                  "'"
+              );
+            }
 
-		if ( key === "disabled" ) {
-			this.widget()
-				.toggleClass( this.widgetFullName + "-disabled", !!value );
+            if (!$.isFunction(instance[options]) || options.charAt(0) === '_') {
+              return $.error(
+                "no such method '" +
+                  options +
+                  "' for " +
+                  name +
+                  ' widget instance'
+              );
+            }
 
-			// If the widget is becoming disabled, then nothing is interactive
-			if ( value ) {
-				this.hoverable.removeClass( "ui-state-hover" );
-				this.focusable.removeClass( "ui-state-focus" );
-			}
-		}
+            methodValue = instance[options].apply(instance, args);
 
-		return this;
-	},
+            if (methodValue !== instance && methodValue !== undefined) {
+              returnValue =
+                methodValue && methodValue.jquery
+                  ? returnValue.pushStack(methodValue.get())
+                  : methodValue;
+              return false;
+            }
+          });
+        }
+      } else {
+        // Allow multiple hashes to be passed on init
+        if (args.length) {
+          options = $.widget.extend.apply(null, [options].concat(args));
+        }
 
-	enable: function() {
-		return this._setOptions({ disabled: false });
-	},
-	disable: function() {
-		return this._setOptions({ disabled: true });
-	},
+        this.each(function () {
+          var instance = $.data(this, fullName);
+          if (instance) {
+            instance.option(options || {});
+            if (instance._init) {
+              instance._init();
+            }
+          } else {
+            $.data(this, fullName, new object(options, this));
+          }
+        });
+      }
 
-	_on: function( suppressDisabledCheck, element, handlers ) {
-		var delegateElement,
-			instance = this;
+      return returnValue;
+    };
+  };
 
-		// no suppressDisabledCheck flag, shuffle arguments
-		if ( typeof suppressDisabledCheck !== "boolean" ) {
-			handlers = element;
-			element = suppressDisabledCheck;
-			suppressDisabledCheck = false;
-		}
+  $.Widget = function (/* options, element */) {};
+  $.Widget._childConstructors = [];
 
-		// no element argument, shuffle and use this.element
-		if ( !handlers ) {
-			handlers = element;
-			element = this.element;
-			delegateElement = this.widget();
-		} else {
-			element = delegateElement = $( element );
-			this.bindings = this.bindings.add( element );
-		}
+  $.Widget.prototype = {
+    widgetName: 'widget',
+    widgetEventPrefix: '',
+    defaultElement: '<div>',
 
-		$.each( handlers, function( event, handler ) {
-			function handlerProxy() {
-				// allow widgets to customize the disabled handling
-				// - disabled as an array instead of boolean
-				// - disabled class as method for disabling individual parts
-				if ( !suppressDisabledCheck &&
-						( instance.options.disabled === true ||
-							$( this ).hasClass( "ui-state-disabled" ) ) ) {
-					return;
-				}
-				return ( typeof handler === "string" ? instance[ handler ] : handler )
-					.apply( instance, arguments );
-			}
+    options: {
+      classes: {},
+      disabled: false,
 
-			// copy the guid so direct unbinding works
-			if ( typeof handler !== "string" ) {
-				handlerProxy.guid = handler.guid =
-					handler.guid || handlerProxy.guid || $.guid++;
-			}
+      // Callbacks
+      create: null
+    },
 
-			var match = event.match( /^([\w:-]*)\s*(.*)$/ ),
-				eventName = match[1] + instance.eventNamespace,
-				selector = match[2];
-			if ( selector ) {
-				delegateElement.delegate( selector, eventName, handlerProxy );
-			} else {
-				element.bind( eventName, handlerProxy );
-			}
-		});
-	},
+    _createWidget: function (options, element) {
+      element = $(element || this.defaultElement || this)[0];
+      this.element = $(element);
+      this.uuid = widgetUuid++;
+      this.eventNamespace = '.' + this.widgetName + this.uuid;
 
-	_off: function( element, eventName ) {
-		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
-		element.unbind( eventName ).undelegate( eventName );
-	},
+      this.bindings = $();
+      this.hoverable = $();
+      this.focusable = $();
+      this.classesElementLookup = {};
 
-	_delay: function( handler, delay ) {
-		function handlerProxy() {
-			return ( typeof handler === "string" ? instance[ handler ] : handler )
-				.apply( instance, arguments );
-		}
-		var instance = this;
-		return setTimeout( handlerProxy, delay || 0 );
-	},
+      if (element !== this) {
+        $.data(element, this.widgetFullName, this);
+        this._on(true, this.element, {
+          remove: function (event) {
+            if (event.target === element) {
+              this.destroy();
+            }
+          }
+        });
+        this.document = $(
+          element.style
+            ? // Element within the document
+              element.ownerDocument
+            : // Element is window or document
+              element.document || element
+        );
+        this.window = $(
+          this.document[0].defaultView || this.document[0].parentWindow
+        );
+      }
 
-	_hoverable: function( element ) {
-		this.hoverable = this.hoverable.add( element );
-		this._on( element, {
-			mouseenter: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-hover" );
-			},
-			mouseleave: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-hover" );
-			}
-		});
-	},
+      this.options = $.widget.extend(
+        {},
+        this.options,
+        this._getCreateOptions(),
+        options
+      );
 
-	_focusable: function( element ) {
-		this.focusable = this.focusable.add( element );
-		this._on( element, {
-			focusin: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-focus" );
-			},
-			focusout: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-focus" );
-			}
-		});
-	},
+      this._create();
 
-	_trigger: function( type, event, data ) {
-		var prop, orig,
-			callback = this.options[ type ];
+      if (this.options.disabled) {
+        this._setOptionDisabled(this.options.disabled);
+      }
 
-		data = data || {};
-		event = $.Event( event );
-		event.type = ( type === this.widgetEventPrefix ?
-			type :
-			this.widgetEventPrefix + type ).toLowerCase();
-		// the original event may come from any element
-		// so we need to reset the target on the new event
-		event.target = this.element[ 0 ];
+      this._trigger('create', null, this._getCreateEventData());
+      this._init();
+    },
 
-		// copy original event properties over to the new event
-		orig = event.originalEvent;
-		if ( orig ) {
-			for ( prop in orig ) {
-				if ( !( prop in event ) ) {
-					event[ prop ] = orig[ prop ];
-				}
-			}
-		}
+    _getCreateOptions: function () {
+      return {};
+    },
 
-		this.element.trigger( event, data );
-		return !( $.isFunction( callback ) &&
-			callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
-			event.isDefaultPrevented() );
-	}
-};
+    _getCreateEventData: $.noop,
 
-$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
-	$.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
-		if ( typeof options === "string" ) {
-			options = { effect: options };
-		}
-		var hasOptions,
-			effectName = !options ?
-				method :
-				options === true || typeof options === "number" ?
-					defaultEffect :
-					options.effect || defaultEffect;
-		options = options || {};
-		if ( typeof options === "number" ) {
-			options = { duration: options };
-		}
-		hasOptions = !$.isEmptyObject( options );
-		options.complete = callback;
-		if ( options.delay ) {
-			element.delay( options.delay );
-		}
-		if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
-			element[ method ]( options );
-		} else if ( effectName !== method && element[ effectName ] ) {
-			element[ effectName ]( options.duration, options.easing, callback );
-		} else {
-			element.queue(function( next ) {
-				$( this )[ method ]();
-				if ( callback ) {
-					callback.call( element[ 0 ] );
-				}
-				next();
-			});
-		}
-	};
+    _create: $.noop,
+
+    _init: $.noop,
+
+    destroy: function () {
+      var that = this;
+
+      this._destroy();
+      $.each(this.classesElementLookup, function (key, value) {
+        that._removeClass(value, key);
+      });
+
+      // We can probably remove the unbind calls in 2.0
+      // all event bindings should go through this._on()
+      this.element.off(this.eventNamespace).removeData(this.widgetFullName);
+      this.widget().off(this.eventNamespace).removeAttr('aria-disabled');
+
+      // Clean up events and states
+      this.bindings.off(this.eventNamespace);
+    },
+
+    _destroy: $.noop,
+
+    widget: function () {
+      return this.element;
+    },
+
+    option: function (key, value) {
+      var options = key;
+      var parts;
+      var curOption;
+      var i;
+
+      if (arguments.length === 0) {
+        // Don't return a reference to the internal hash
+        return $.widget.extend({}, this.options);
+      }
+
+      if (typeof key === 'string') {
+        // Handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
+        options = {};
+        parts = key.split('.');
+        key = parts.shift();
+        if (parts.length) {
+          curOption = options[key] = $.widget.extend({}, this.options[key]);
+          for (i = 0; i < parts.length - 1; i++) {
+            curOption[parts[i]] = curOption[parts[i]] || {};
+            curOption = curOption[parts[i]];
+          }
+          key = parts.pop();
+          if (arguments.length === 1) {
+            return curOption[key] === undefined ? null : curOption[key];
+          }
+          curOption[key] = value;
+        } else {
+          if (arguments.length === 1) {
+            return this.options[key] === undefined ? null : this.options[key];
+          }
+          options[key] = value;
+        }
+      }
+
+      this._setOptions(options);
+
+      return this;
+    },
+
+    _setOptions: function (options) {
+      var key;
+
+      for (key in options) {
+        this._setOption(key, options[key]);
+      }
+
+      return this;
+    },
+
+    _setOption: function (key, value) {
+      if (key === 'classes') {
+        this._setOptionClasses(value);
+      }
+
+      this.options[key] = value;
+
+      if (key === 'disabled') {
+        this._setOptionDisabled(value);
+      }
+
+      return this;
+    },
+
+    _setOptionClasses: function (value) {
+      var classKey, elements, currentElements;
+
+      for (classKey in value) {
+        currentElements = this.classesElementLookup[classKey];
+        if (
+          value[classKey] === this.options.classes[classKey] ||
+          !currentElements ||
+          !currentElements.length
+        ) {
+          continue;
+        }
+
+        // We are doing this to create a new jQuery object because the _removeClass() call
+        // on the next line is going to destroy the reference to the current elements being
+        // tracked. We need to save a copy of this collection so that we can add the new classes
+        // below.
+        elements = $(currentElements.get());
+        this._removeClass(currentElements, classKey);
+
+        // We don't use _addClass() here, because that uses this.options.classes
+        // for generating the string of classes. We want to use the value passed in from
+        // _setOption(), this is the new value of the classes option which was passed to
+        // _setOption(). We pass this value directly to _classes().
+        elements.addClass(
+          this._classes({
+            element: elements,
+            keys: classKey,
+            classes: value,
+            add: true
+          })
+        );
+      }
+    },
+
+    _setOptionDisabled: function (value) {
+      this._toggleClass(
+        this.widget(),
+        this.widgetFullName + '-disabled',
+        null,
+        !!value
+      );
+
+      // If the widget is becoming disabled, then nothing is interactive
+      if (value) {
+        this._removeClass(this.hoverable, null, 'ui-state-hover');
+        this._removeClass(this.focusable, null, 'ui-state-focus');
+      }
+    },
+
+    enable: function () {
+      return this._setOptions({ disabled: false });
+    },
+
+    disable: function () {
+      return this._setOptions({ disabled: true });
+    },
+
+    _classes: function (options) {
+      var full = [];
+      var that = this;
+
+      options = $.extend(
+        {
+          element: this.element,
+          classes: this.options.classes || {}
+        },
+        options
+      );
+
+      function bindRemoveEvent() {
+        options.element.each(function (_, element) {
+          var isTracked = $.map(that.classesElementLookup, function (elements) {
+            return elements;
+          }).some(function (elements) {
+            return elements.is(element);
+          });
+
+          if (!isTracked) {
+            that._on($(element), {
+              remove: '_untrackClassesElement'
+            });
+          }
+        });
+      }
+
+      function processClassString(classes, checkOption) {
+        var current, i;
+        for (i = 0; i < classes.length; i++) {
+          current = that.classesElementLookup[classes[i]] || $();
+          if (options.add) {
+            bindRemoveEvent();
+            current = $(
+              $.uniqueSort(current.get().concat(options.element.get()))
+            );
+          } else {
+            current = $(current.not(options.element).get());
+          }
+          that.classesElementLookup[classes[i]] = current;
+          full.push(classes[i]);
+          if (checkOption && options.classes[classes[i]]) {
+            full.push(options.classes[classes[i]]);
+          }
+        }
+      }
+
+      if (options.keys) {
+        processClassString(options.keys.match(/\S+/g) || [], true);
+      }
+      if (options.extra) {
+        processClassString(options.extra.match(/\S+/g) || []);
+      }
+
+      return full.join(' ');
+    },
+
+    _untrackClassesElement: function (event) {
+      var that = this;
+      $.each(that.classesElementLookup, function (key, value) {
+        if ($.inArray(event.target, value) !== -1) {
+          that.classesElementLookup[key] = $(value.not(event.target).get());
+        }
+      });
+
+      this._off($(event.target));
+    },
+
+    _removeClass: function (element, keys, extra) {
+      return this._toggleClass(element, keys, extra, false);
+    },
+
+    _addClass: function (element, keys, extra) {
+      return this._toggleClass(element, keys, extra, true);
+    },
+
+    _toggleClass: function (element, keys, extra, add) {
+      add = typeof add === 'boolean' ? add : extra;
+      var shift = typeof element === 'string' || element === null,
+        options = {
+          extra: shift ? keys : extra,
+          keys: shift ? element : keys,
+          element: shift ? this.element : element,
+          add: add
+        };
+      options.element.toggleClass(this._classes(options), add);
+      return this;
+    },
+
+    _on: function (suppressDisabledCheck, element, handlers) {
+      var delegateElement;
+      var instance = this;
+
+      // No suppressDisabledCheck flag, shuffle arguments
+      if (typeof suppressDisabledCheck !== 'boolean') {
+        handlers = element;
+        element = suppressDisabledCheck;
+        suppressDisabledCheck = false;
+      }
+
+      // No element argument, shuffle and use this.element
+      if (!handlers) {
+        handlers = element;
+        element = this.element;
+        delegateElement = this.widget();
+      } else {
+        element = delegateElement = $(element);
+        this.bindings = this.bindings.add(element);
+      }
+
+      $.each(handlers, function (event, handler) {
+        function handlerProxy() {
+          // Allow widgets to customize the disabled handling
+          // - disabled as an array instead of boolean
+          // - disabled class as method for disabling individual parts
+          if (
+            !suppressDisabledCheck &&
+            (instance.options.disabled === true ||
+              $(this).hasClass('ui-state-disabled'))
+          ) {
+            return;
+          }
+          return (typeof handler === 'string'
+            ? instance[handler]
+            : handler
+          ).apply(instance, arguments);
+        }
+
+        // Copy the guid so direct unbinding works
+        if (typeof handler !== 'string') {
+          handlerProxy.guid = handler.guid =
+            handler.guid || handlerProxy.guid || $.guid++;
+        }
+
+        var match = event.match(/^([\w:-]*)\s*(.*)$/);
+        var eventName = match[1] + instance.eventNamespace;
+        var selector = match[2];
+
+        if (selector) {
+          delegateElement.on(eventName, selector, handlerProxy);
+        } else {
+          element.on(eventName, handlerProxy);
+        }
+      });
+    },
+
+    _off: function (element, eventName) {
+      eventName =
+        (eventName || '').split(' ').join(this.eventNamespace + ' ') +
+        this.eventNamespace;
+      element.off(eventName);
+
+      // Clear the stack to avoid memory leaks (#10056)
+      this.bindings = $(this.bindings.not(element).get());
+      this.focusable = $(this.focusable.not(element).get());
+      this.hoverable = $(this.hoverable.not(element).get());
+    },
+
+    _delay: function (handler, delay) {
+      var instance = this;
+      function handlerProxy() {
+        return (typeof handler === 'string'
+          ? instance[handler]
+          : handler
+        ).apply(instance, arguments);
+      }
+      return setTimeout(handlerProxy, delay || 0);
+    },
+
+    _hoverable: function (element) {
+      this.hoverable = this.hoverable.add(element);
+      this._on(element, {
+        mouseenter: function (event) {
+          this._addClass($(event.currentTarget), null, 'ui-state-hover');
+        },
+        mouseleave: function (event) {
+          this._removeClass($(event.currentTarget), null, 'ui-state-hover');
+        }
+      });
+    },
+
+    _focusable: function (element) {
+      this.focusable = this.focusable.add(element);
+      this._on(element, {
+        focusin: function (event) {
+          this._addClass($(event.currentTarget), null, 'ui-state-focus');
+        },
+        focusout: function (event) {
+          this._removeClass($(event.currentTarget), null, 'ui-state-focus');
+        }
+      });
+    },
+
+    _trigger: function (type, event, data) {
+      var prop, orig;
+      var callback = this.options[type];
+
+      data = data || {};
+      event = $.Event(event);
+      event.type = (type === this.widgetEventPrefix
+        ? type
+        : this.widgetEventPrefix + type
+      ).toLowerCase();
+
+      // The original event may come from any element
+      // so we need to reset the target on the new event
+      event.target = this.element[0];
+
+      // Copy original event properties over to the new event
+      orig = event.originalEvent;
+      if (orig) {
+        for (prop in orig) {
+          if (!(prop in event)) {
+            event[prop] = orig[prop];
+          }
+        }
+      }
+
+      this.element.trigger(event, data);
+      return !(
+        ($.isFunction(callback) &&
+          callback.apply(this.element[0], [event].concat(data)) === false) ||
+        event.isDefaultPrevented()
+      );
+    }
+  };
+
+  $.each({ show: 'fadeIn', hide: 'fadeOut' }, function (method, defaultEffect) {
+    $.Widget.prototype['_' + method] = function (element, options, callback) {
+      if (typeof options === 'string') {
+        options = { effect: options };
+      }
+
+      var hasOptions;
+      var effectName = !options
+        ? method
+        : options === true || typeof options === 'number'
+        ? defaultEffect
+        : options.effect || defaultEffect;
+
+      options = options || {};
+      if (typeof options === 'number') {
+        options = { duration: options };
+      }
+
+      hasOptions = !$.isEmptyObject(options);
+      options.complete = callback;
+
+      if (options.delay) {
+        element.delay(options.delay);
+      }
+
+      if (hasOptions && $.effects && $.effects.effect[effectName]) {
+        element[method](options);
+      } else if (effectName !== method && element[effectName]) {
+        element[effectName](options.duration, options.easing, callback);
+      } else {
+        element.queue(function (next) {
+          $(this)[method]();
+          if (callback) {
+            callback.call(element[0]);
+          }
+          next();
+        });
+      }
+    };
+  });
 });
-
-var widget = $.widget;
-
-
-
-}));
diff --git a/yarn.lock b/yarn.lock
index 978b1d5d15..4383920b0f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -415,6 +415,30 @@ base@^0.11.1:
     mixin-deep "^1.2.0"
     pascalcase "^0.1.1"
 
+blueimp-canvas-to-blob@3:
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.19.0.tgz#842a30605c59ec12b1219bb3d8969160e27b6f8e"
+  integrity sha512-WlLp3GOEdpyQr5hqyPaRoFHGdzMcf6T5Wr8ZjjGl1MM4tit6+rCsJcw7psXFvgoIk69uCGEhyvZOWXU2b4bDcQ==
+
+blueimp-file-upload@10.13.0:
+  version "10.13.0"
+  resolved "https://registry.yarnpkg.com/blueimp-file-upload/-/blueimp-file-upload-10.13.0.tgz#3994d1606caa44197e4aa29d7f7e1cdd6f521568"
+  integrity sha512-N0yIt/5oR0ZioBaj6u8YuCRSp+1doaJOnNJHIYHBHZdrcWfjfc9Xq03nzodkSdbQIRfWwNin5rexUwY203V35g==
+  optionalDependencies:
+    blueimp-canvas-to-blob "3"
+    blueimp-load-image "3"
+    blueimp-tmpl "3"
+
+blueimp-load-image@3:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/blueimp-load-image/-/blueimp-load-image-3.0.0.tgz#d71c39440a7d2f1a83e3e86a625e329116a51705"
+  integrity sha512-Q9rFbd4ZUNvzSFmRXx9MoG0RwWwJeMjjEUbG7WIOJgUg22Jgkow0wL5b35B6qwiBscxACW9OHdrP5s2vQ3x8DQ==
+
+blueimp-tmpl@3:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/blueimp-tmpl/-/blueimp-tmpl-3.14.0.tgz#4951cf03a127521fa88922db616949d75cbbd5c3"
+  integrity sha512-mA8iwfEVkvpjtBXpRp25DxGqW2YOZqC9FVLLOa03Qwdsd6J4kVyL1noC04arAm0CNsu3Y0FmxkAOt+x2MoxpYA==
+
 bootbox@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/bootbox/-/bootbox-3.2.0.tgz#00bf643fc9edefd9ae1e7c648c6b022db4be0aee"

From c1c211365acf445d743890ca76742146400fdfc0 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 28 Apr 2020 17:24:04 +0200
Subject: [PATCH 0827/1830] FIX: Improve clearing store cache (#9568)

1. Shorter
2. Simpler
3. Doesn't depend on external binaries
4. Doesn't fail on large amounts of files
5. Hopefully eliminates flaky spec errors
---
 lib/file_store/base_store.rb | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rb
index a3623f1fea..c3752be155 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -149,22 +149,12 @@ module FileStore
       FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
       FileUtils.cp(file.path, path)
 
-      # Keep latest 500 files
-      processes = Open3.pipeline(
-        ["ls -t #{CACHE_DIR}", err: "/dev/null"],
-        "tail -n +#{CACHE_MAXIMUM_SIZE + 1}",
-        "awk '$0=\"#{CACHE_DIR}\"$0'",
-        "xargs rm -f"
-      )
+      # Remove all but CACHE_MAXIMUM_SIZE most recent files
+      files = Dir.glob("#{CACHE_DIR}*")
+        .sort_by { |f| File.mtime(f) }
+        .slice(0...-CACHE_MAXIMUM_SIZE)
 
-      ls = processes.shift
-
-      # Exit status `1` in `ls` occurs when e.g. "listing a directory
-      # in which entries are actively being removed or renamed".
-      # It's safe to ignore it here.
-      if ![0, 1].include?(ls.exitstatus) || !processes.all?(&:success?)
-        raise "Error clearing old cache"
-      end
+      FileUtils.rm(files, force: true)
     end
 
     private

From b19dcac2722fe1a97c898837834132d40731ac20 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Tue, 28 Apr 2020 12:05:53 -0400
Subject: [PATCH 0828/1830] FIX: Include default notification level in category
 serializer (#9572)

Fixes an issue where the notification level state goes missing when user edits a category in the UI.
---
 app/serializers/category_serializer.rb       |  5 +++--
 spec/serializers/category_serializer_spec.rb | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb
index cb5b2ff056..583ee13865 100644
--- a/app/serializers/category_serializer.rb
+++ b/app/serializers/category_serializer.rb
@@ -83,8 +83,9 @@ class CategorySerializer < SiteCategorySerializer
 
   def notification_level
     user = scope && scope.user
-   object.notification_level ||
-     (user && CategoryUser.where(user: user, category: object).first.try(:notification_level))
+    object.notification_level ||
+     (user && CategoryUser.where(user: user, category: object).first.try(:notification_level)) ||
+     CategoryUser.default_notification_level
   end
 
   def custom_fields
diff --git a/spec/serializers/category_serializer_spec.rb b/spec/serializers/category_serializer_spec.rb
index 1557850efd..e2a3399990 100644
--- a/spec/serializers/category_serializer_spec.rb
+++ b/spec/serializers/category_serializer_spec.rb
@@ -28,4 +28,19 @@ describe CategorySerializer do
     json = described_class.new(category, scope: Guardian.new, root: false).as_json
     expect(json[:custom_fields]).to be_present
   end
+
+  it "includes the default notification level" do
+    json = described_class.new(category, scope: Guardian.new, root: false).as_json
+    expect(json[:notification_level]).to eq(CategoryUser.default_notification_level)
+  end
+
+  describe "user notification level" do
+    fab!(:user) { Fabricate(:user) }
+
+    it "includes the user's notification level" do
+      CategoryUser.set_notification_level_for_category(user, NotificationLevels.all[:watching], category.id)
+      json = described_class.new(category, scope: Guardian.new(user), root: false).as_json
+      expect(json[:notification_level]).to eq(NotificationLevels.all[:watching])
+    end
+  end
 end

From a6f986b50fe70ac92a5e43862cfa625254b09623 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 28 Apr 2020 18:24:24 +0200
Subject: [PATCH 0829/1830] FEATURE: allows to to style published page with
 themes/plugins (#9570)

---
 .../discourse/app/templates/topic.hbs         |  2 +-
 app/assets/stylesheets/common/base/topic.scss |  2 +-
 app/assets/stylesheets/publish.scss           | 44 +++++++++----------
 app/controllers/published_pages_controller.rb | 12 +++++
 .../_discourse_publish_stylesheet.html.erb    |  9 ++++
 app/views/layouts/publish.html.erb            |  5 ++-
 app/views/published_pages/show.html.erb       |  2 +-
 .../published_pages_controller_spec.rb        | 18 ++++++--
 8 files changed, 64 insertions(+), 30 deletions(-)
 create mode 100644 app/views/common/_discourse_publish_stylesheet.html.erb

diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index a3068355d0..6fadf0b9b4 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -87,7 +87,7 @@
       {{/topic-title}}
 
       {{#if model.publishedPage}}
-        <div class="published-page">
+        <div class="published-page-notice">
           <div class="details">
             {{i18n "topic.publish_page.topic_published"}}
             <div>
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index cd7c7d70cc..02b267ab13 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -296,7 +296,7 @@ a.topic-featured-link {
   }
 }
 
-.published-page {
+.published-page-notice {
   display: flex;
   justify-content: space-between;
   padding-bottom: 1em;
diff --git a/app/assets/stylesheets/publish.scss b/app/assets/stylesheets/publish.scss
index b59a480ef0..f06ff9881a 100644
--- a/app/assets/stylesheets/publish.scss
+++ b/app/assets/stylesheets/publish.scss
@@ -1,32 +1,32 @@
 @import "common";
 
-body {
+.published-page-wrapper {
+  margin: 2em auto;
+  max-width: 800px;
+}
+
+.published-page {
   background-color: $secondary;
   color: $primary;
 }
 
-.published-page {
-  margin: 2em auto;
-  max-width: 800px;
+.published-page-title {
+  color: $header_primary;
+}
 
-  h1 {
-    color: $header_primary;
+.published-page-author {
+  margin-top: 1em;
+  margin-bottom: 2em;
+  display: flex;
+
+  .avatar {
+    margin-right: 1em;
   }
-
-  .published-page-author {
-    margin-top: 1em;
-    margin-bottom: 2em;
-    display: flex;
-
-    .avatar {
-      margin-right: 1em;
-    }
-    .topic-created-at {
-      color: $primary-medium;
-    }
-  }
-
-  .published-page-body {
-    font-size: 1.25em;
+  .topic-created-at {
+    color: $primary-medium;
   }
 }
+
+.published-page-body {
+  font-size: 1.25em;
+}
diff --git a/app/controllers/published_pages_controller.rb b/app/controllers/published_pages_controller.rb
index a133732867..67d3fb8bda 100644
--- a/app/controllers/published_pages_controller.rb
+++ b/app/controllers/published_pages_controller.rb
@@ -15,6 +15,18 @@ class PublishedPagesController < ApplicationController
     guardian.ensure_can_see!(pp.topic)
     @topic = pp.topic
     @canonical_url = @topic.url
+
+    @body_classes = Set.new([
+      'published-page',
+      params[:slug],
+      "topic-#{@topic.id}",
+      @topic.tags.pluck(:name)
+    ].flatten.compact)
+
+    if @topic.category
+      @body_classes << @topic.category.slug
+    end
+
     render layout: 'publish'
   end
 
diff --git a/app/views/common/_discourse_publish_stylesheet.html.erb b/app/views/common/_discourse_publish_stylesheet.html.erb
new file mode 100644
index 0000000000..458aaff65f
--- /dev/null
+++ b/app/views/common/_discourse_publish_stylesheet.html.erb
@@ -0,0 +1,9 @@
+<%= discourse_stylesheet_link_tag 'publish', theme_ids: nil %>
+
+<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?, request: request).each do |file| %>
+  <%= discourse_stylesheet_link_tag(file) %>
+<%- end %>
+
+<%- if theme_ids.present? %>
+  <%= discourse_stylesheet_link_tag(mobile_view? ? :mobile_theme : :desktop_theme) %>
+<%- end %>
diff --git a/app/views/layouts/publish.html.erb b/app/views/layouts/publish.html.erb
index 2b3d727dc7..5bb0f957c5 100644
--- a/app/views/layouts/publish.html.erb
+++ b/app/views/layouts/publish.html.erb
@@ -3,13 +3,14 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, user-scalable=yes, viewport-fit=cover">
-    <%= discourse_stylesheet_link_tag 'publish', theme_ids: nil %>
+
+    <%= render partial: "common/discourse_publish_stylesheet" %>
 
     <%- if @canonical_url -%>
       <link rel="canonical" href="<%= @canonical_url %>" />
     <%- end -%>
   </head>
-  <body>
+  <body class="<%= @body_classes.to_a.join(' ') %>">
     <%= yield %>
   </body>
 </html>
diff --git a/app/views/published_pages/show.html.erb b/app/views/published_pages/show.html.erb
index 43b11f6851..4f51c09405 100644
--- a/app/views/published_pages/show.html.erb
+++ b/app/views/published_pages/show.html.erb
@@ -1,4 +1,4 @@
-<div class="published-page">
+<div class="published-page-wrapper">
   <div class="published-page-header">
     <h1 class="published-page-title"><%= @topic.title %></h1>
 
diff --git a/spec/requests/published_pages_controller_spec.rb b/spec/requests/published_pages_controller_spec.rb
index ed50ed8811..6793761791 100644
--- a/spec/requests/published_pages_controller_spec.rb
+++ b/spec/requests/published_pages_controller_spec.rb
@@ -76,9 +76,21 @@ RSpec.describe PublishedPagesController do
         expect(response.status).to eq(404)
       end
 
-      it "returns 200 for a valid article" do
-        get published_page.path
-        expect(response.status).to eq(200)
+      context "the article is valid" do
+        before do
+          SiteSetting.tagging_enabled = true
+          published_page.topic.tags = [Fabricate(:tag, name: "recipes")]
+        end
+
+        it "returns 200" do
+          get published_page.path
+          expect(response.status).to eq(200)
+        end
+
+        it "defines correct css classes on body" do
+          get published_page.path
+          expect(response.body).to include("<body class=\"published-page published-page-test topic-#{published_page.topic_id} recipes uncategorized\">")
+        end
       end
     end
 

From 1e603d7003aeb2cf6a8988d9256a9a1877358348 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 28 Apr 2020 14:03:39 -0400
Subject: [PATCH 0830/1830] DEV: This file does not seem to be used anymore

---
 lib/headless-ember.js | 33 ---------------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 lib/headless-ember.js

diff --git a/lib/headless-ember.js b/lib/headless-ember.js
deleted file mode 100644
index 2c44eb4f23..0000000000
--- a/lib/headless-ember.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*global Element:true, document:true, window:true, $:true, jQuery:true */
-/*exported precompileEmberHandlebars, $, jQuery */
-// DOM
-var Element = {};
-Element.firstChild = function () { return Element; };
-Element.innerHTML = function () { return Element; };
-
-var document = { createRange: false, createElement: function() { return Element; } };
-var window = this;
-this.document = document;
-
-// Console
-var console = window.console = {};
-console.log = console.info = console.warn = console.error = function(){};
-
-/*jshint -W120 */
-// jQuery
-var $ = jQuery = window.jQuery = function() { return jQuery; };
-/*jshint +W120*/
-jQuery.ready = function() { return jQuery; };
-jQuery.inArray = function() { return jQuery; };
-jQuery.event = {
-  fixHooks: function() {
-  }
-};
-
-jQuery.jquery = "1.7.2";
-var $ = jQuery;
-
-// Ember
-function precompileEmberHandlebars(string) {
-  return Ember.Handlebars.precompile(string).toString();
-}

From a8308e73e7212db366a5b5bb80d1fd5735ee0eee Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 28 Apr 2020 20:05:30 +0200
Subject: [PATCH 0831/1830] FIX: improves tag-list setting (#9574)

- Prevents setting to display an empty tag
- Updates dropdown when selecting/removing tag
---
 .../admin/components/site-settings/tag-list.js       | 12 +++++++-----
 .../templates/components/site-settings/tag-list.hbs  |  8 +++++++-
 .../javascripts/select-kit/components/tag-chooser.js |  8 ++++++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/admin/components/site-settings/tag-list.js b/app/assets/javascripts/admin/components/site-settings/tag-list.js
index c8a8e0a06f..011c734b7d 100644
--- a/app/assets/javascripts/admin/components/site-settings/tag-list.js
+++ b/app/assets/javascripts/admin/components/site-settings/tag-list.js
@@ -1,15 +1,17 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import { action } from "@ember/object";
 
 export default Component.extend({
   @discourseComputed("value")
   selectedTags: {
     get(value) {
-      return value.split("|");
-    },
-    set(value) {
-      this.set("value", value.join("|"));
-      return value;
+      return value.split("|").filter(Boolean);
     }
+  },
+
+  @action
+  changeSelectedTags(tags) {
+    this.set("value", tags.join("|"));
   }
 });
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
index f7519e770d..7efd7421ce 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs
@@ -1,3 +1,9 @@
-{{tag-chooser tags=selectedTags allowCreate=false}}
+{{tag-chooser
+  tags=selectedTags
+  onChange=(action "changeSelectedTags")
+  options=(hash
+    allowAny=false
+  )
+}}
 <div class="desc">{{html-safe setting.description}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/select-kit/components/tag-chooser.js b/app/assets/javascripts/select-kit/components/tag-chooser.js
index 65e7597aa9..5cf4a83303 100644
--- a/app/assets/javascripts/select-kit/components/tag-chooser.js
+++ b/app/assets/javascripts/select-kit/components/tag-chooser.js
@@ -66,8 +66,12 @@ export default MultiSelectComponent.extend(TagsMixin, {
   }),
 
   actions: {
-    onChange(value) {
-      this.set("tags", value);
+    onChange(value, items) {
+      if (this.attrs.onChange) {
+        this.attrs.onChange(value, items);
+      } else {
+        this.set("tags", value);
+      }
     }
   },
 

From 07e64527599cced0cbf672c3810cb1270150fae4 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 28 Apr 2020 20:12:16 +0200
Subject: [PATCH 0832/1830] FIX: makes tracking shortcuts working when tracking
 button is not visible (#9575)

---
 .../discourse/app/lib/keyboard-shortcuts.js   | 30 ++++++-----
 .../components/topic-notifications-button.js  | 51 +++----------------
 2 files changed, 23 insertions(+), 58 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
index b04f4bba27..dddc2f7374 100644
--- a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
@@ -380,28 +380,30 @@ export default {
       .send("showKeyboardShortcutsHelp");
   },
 
-  setTrackingToMuted(event) {
-    throttle(this, "_setTracking", { id: 0, event }, INPUT_DELAY, true);
+  setTrackingToMuted() {
+    throttle(this, "_setTracking", 0, INPUT_DELAY, true);
   },
 
-  setTrackingToRegular(event) {
-    throttle(this, "_setTracking", { id: 1, event }, INPUT_DELAY, true);
+  setTrackingToRegular() {
+    throttle(this, "_setTracking", 1, INPUT_DELAY, true);
   },
 
-  setTrackingToTracking(event) {
-    throttle(this, "_setTracking", { id: 2, event }, INPUT_DELAY, true);
+  setTrackingToTracking() {
+    throttle(this, "_setTracking", 2, INPUT_DELAY, true);
   },
 
-  setTrackingToWatching(event) {
-    throttle(this, "_setTracking", { id: 3, event }, INPUT_DELAY, true);
+  setTrackingToWatching() {
+    throttle(this, "_setTracking", 3, INPUT_DELAY, true);
   },
 
-  _setTracking(params) {
-    this.appEvents.trigger("topic-notifications-button:changed", {
-      type: "notification",
-      id: params.id,
-      event: params.event
-    });
+  _setTracking(levelId) {
+    const topic = this.currentTopic();
+
+    if (!topic) {
+      return;
+    }
+
+    topic.details.updateNotifications(levelId);
   },
 
   sendToTopicListItemView(action, elem) {
diff --git a/app/assets/javascripts/select-kit/components/topic-notifications-button.js b/app/assets/javascripts/select-kit/components/topic-notifications-button.js
index a0c16738b5..dd5c985eab 100644
--- a/app/assets/javascripts/select-kit/components/topic-notifications-button.js
+++ b/app/assets/javascripts/select-kit/components/topic-notifications-button.js
@@ -1,4 +1,5 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
 
 export default Component.extend({
   layoutName: "select-kit/templates/components/topic-notifications-button",
@@ -6,51 +7,13 @@ export default Component.extend({
   appendReason: true,
   showFullTitle: true,
   placement: "bottom-start",
+  notificationLevel: null,
+  topic: null,
 
-  didInsertElement() {
-    this._super(...arguments);
-
-    if (!this.mountedAsWidget) {
-      this.appEvents.on(
-        "topic-notifications-button:changed",
-        this,
-        "_changeTopicNotificationLevel"
-      );
-    }
-  },
-
-  willDestroyElement() {
-    this._super(...arguments);
-
-    if (!this.mountedAsWidget) {
-      this.appEvents.off(
-        "topic-notifications-button:changed",
-        this,
-        "_changeTopicNotificationLevel"
-      );
-    }
-  },
-
-  _changeTopicNotificationLevel(level) {
-    // this change is coming from a keyboard event
-    if (level.event) {
-      const topicSectionNode = level.event.target.querySelector("#topic");
-      if (topicSectionNode && topicSectionNode.dataset.topicId) {
-        const topicId = parseInt(topicSectionNode.dataset.topicId, 10);
-        if (topicId && topicId !== this.topic.id) {
-          return;
-        }
-      }
-    }
-
-    if (level.id !== this.notificationLevel) {
-      this.topic.details.updateNotifications(level.id);
-    }
-  },
-
-  actions: {
-    changeTopicNotificationLevel(level, notification) {
-      this._changeTopicNotificationLevel(notification);
+  @action
+  changeTopicNotificationLevel(levelId) {
+    if (levelId !== this.notificationLevel) {
+      this.topic.details.updateNotifications(levelId);
     }
   }
 });

From 22f11efad07a09d5efd3bcbf8c5df78b70e845c3 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Tue, 28 Apr 2020 14:28:16 -0400
Subject: [PATCH 0833/1830] DEV: Replace setTimeout with Ember.run.later

Followup to 6fad0463
---
 app/assets/javascripts/discourse/app/lib/safari-hacks.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/safari-hacks.js b/app/assets/javascripts/discourse/app/lib/safari-hacks.js
index bb094081fd..70c3cadf4d 100644
--- a/app/assets/javascripts/discourse/app/lib/safari-hacks.js
+++ b/app/assets/javascripts/discourse/app/lib/safari-hacks.js
@@ -174,14 +174,12 @@ function positioningWorkaround($fixedElement) {
       // this tricks iOS safari into assuming input/textarea is at top of the viewport
       // via https://stackoverflow.com/questions/38017771/mobile-safari-prevent-scroll-page-when-focus-on-input
       _this.style.transform = "translateY(-400px)";
-      setTimeout(function() {
-        _this.style.transform = "none";
-      }, 30);
+      later(() => (_this.style.transform = "none"), 30);
     }
 
     let delay = caps.isIpadOS ? 350 : 150;
 
-    setTimeout(function() {
+    later(function() {
       if (caps.isIpadOS && iOSWithVisualViewport()) {
         // disable hacks when using a hardware keyboard
         // by default, a hardware keyboard will show the keyboard accessory bar

From 9d781d495903c0cdcbf41f87b935379d95bc6a0a Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Tue, 28 Apr 2020 14:33:58 -0400
Subject: [PATCH 0834/1830] FIX: error customizing text for badges from plugins

---
 app/models/badge.rb       | 2 +-
 spec/models/badge_spec.rb | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/models/badge.rb b/app/models/badge.rb
index 7ff7ce0710..5608444957 100644
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -181,7 +181,7 @@ class Badge < ActiveRecord::Base
   def self.find_system_badge_id_from_translation_key(translation_key)
     return unless translation_key.starts_with?('badges.')
     badge_name_klass = translation_key.split('.').second.camelize
-    "Badge::#{badge_name_klass}".constantize
+    Badge.const_defined?(badge_name_klass) ? "Badge::#{badge_name_klass}".constantize : nil
   end
 
   def awarded_for_trust_level?
diff --git a/spec/models/badge_spec.rb b/spec/models/badge_spec.rb
index 221569de08..73cd39ef0e 100644
--- a/spec/models/badge_spec.rb
+++ b/spec/models/badge_spec.rb
@@ -113,6 +113,14 @@ describe Badge do
         expect(Badge.find_system_badge_id_from_translation_key(translation_key)).to eq(nil)
       end
     end
+
+    context "when translation key doesn't match its class" do
+      let(:translation_key) { "badges.licensed.long_description" }
+
+      it "returns nil" do
+        expect(Badge.find_system_badge_id_from_translation_key(translation_key)).to eq(nil)
+      end
+    end
   end
 
   context "First Quote" do

From 4ecc25883549e8748387dd0cc4b702d7d17a934c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 28 Apr 2020 21:27:07 +0200
Subject: [PATCH 0835/1830] DEV: adds support for header-title in
 topicTitleDecorators (#9562)

---
 .../javascripts/discourse/app/components/site-header.js   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/components/site-header.js b/app/assets/javascripts/discourse/app/components/site-header.js
index e110b9ceee..ec7084b815 100644
--- a/app/assets/javascripts/discourse/app/components/site-header.js
+++ b/app/assets/javascripts/discourse/app/components/site-header.js
@@ -7,6 +7,7 @@ import PanEvents, {
   SWIPE_DISTANCE_THRESHOLD,
   SWIPE_VELOCITY_THRESHOLD
 } from "discourse/mixins/pan-events";
+import { topicTitleDecorators } from "discourse/components/topic-title";
 
 const PANEL_BODY_MARGIN = 30;
 
@@ -260,6 +261,13 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
   },
 
   afterRender() {
+    const headerTitle = document.querySelector(".header-title .topic-link");
+    if (headerTitle && this._topic) {
+      topicTitleDecorators.forEach(cb =>
+        cb(this._topic, headerTitle, "header-title")
+      );
+    }
+
     const $menuPanels = $(".menu-panel");
     if ($menuPanels.length === 0) {
       if (this.site.mobileView) {

From 0d519c78fbf92ce7da6a930f3b10fbb62d21271d Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 29 Apr 2020 08:45:06 +1000
Subject: [PATCH 0836/1830] FIX: Do not save bookmark if close (X) on modal is
 clicked (#9541)

* After this change the bookmark will still be saved if clicking out of the modal or pressing escape
* To achieve this I implemented an initiatedBy parameter for modal closing from d-modal. If clicking on the cross it is initiated by close, if clicking out of the modal it is by click out.
* These options can then be compared in controllers consuming onClose

Co-authored-by: Joffrey JAFFEUX <j.jaffeux@gmail.com>
---
 .../javascripts/discourse/app/components/d-modal.js    | 10 ++++++----
 .../javascripts/discourse/app/controllers/bookmark.js  |  6 +++++-
 .../javascripts/discourse/app/routes/application.js    |  7 +++++--
 .../discourse/app/templates/components/d-modal.hbs     |  2 +-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/d-modal.js b/app/assets/javascripts/discourse/app/components/d-modal.js
index a2372013bc..bc81971d83 100644
--- a/app/assets/javascripts/discourse/app/components/d-modal.js
+++ b/app/assets/javascripts/discourse/app/components/d-modal.js
@@ -76,10 +76,12 @@ export default Component.extend({
       $target.hasClass("modal-middle-container") ||
       $target.hasClass("modal-outer-container")
     ) {
-      // Delegate click to modal close if clicked outside.
-      // We do this because some CSS of ours seems to cover
-      // the backdrop and makes it unclickable.
-      $(".modal-header button.modal-close").click();
+      // Send modal close (which bubbles to ApplicationRoute) if clicked outside.
+      // We do this because some CSS of ours seems to cover the backdrop and makes
+      // it unclickable.
+      return (
+        this.attrs.closeModal && this.attrs.closeModal("initiatedByClickOut")
+      );
     }
   },
 
diff --git a/app/assets/javascripts/discourse/app/controllers/bookmark.js b/app/assets/javascripts/discourse/app/controllers/bookmark.js
index 604a6f2ee9..30dc412e56 100644
--- a/app/assets/javascripts/discourse/app/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/app/controllers/bookmark.js
@@ -84,7 +84,11 @@ export default Controller.extend(ModalFunctionality, {
    * We always want to save the bookmark unless the user specifically
    * clicks the save or cancel button to mimic browser behaviour.
    */
-  onClose() {
+  onClose(opts = {}) {
+    if (opts.initiatedByCloseButton) {
+      this._closeWithoutSaving = true;
+    }
+
     this._unbindKeyboardShortcuts();
     this._restoreGlobalShortcuts();
     if (!this._closeWithoutSaving && !this._savingBookmarkManually) {
diff --git a/app/assets/javascripts/discourse/app/routes/application.js b/app/assets/javascripts/discourse/app/routes/application.js
index a16f97ffd9..f164375bc7 100644
--- a/app/assets/javascripts/discourse/app/routes/application.js
+++ b/app/assets/javascripts/discourse/app/routes/application.js
@@ -155,7 +155,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
     },
 
     // Close the current modal, and destroy its state.
-    closeModal() {
+    closeModal(initiatedBy) {
       const route = getOwner(this).lookup("route:application");
       let modalController = route.controllerFor("modal");
       const controllerName = modalController.get("name");
@@ -178,7 +178,10 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
           `controller:${controllerName}`
         );
         if (controller && controller.onClose) {
-          controller.onClose();
+          controller.onClose({
+            initiatedByCloseButton: initiatedBy === "initiatedByCloseButton",
+            initiatedByClickOut: initiatedBy === "initiatedByClickOut"
+          });
         }
         modalController.set("name", null);
       }
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
index 1a81e466d2..e9e608d643 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
@@ -3,7 +3,7 @@
     <div class="modal-inner-container">
       <div class="modal-header">
         {{#if dismissable}}
-          {{d-button icon="times" action=(route-action "closeModal") class="btn btn-flat modal-close close" title="modal.close"}}
+          {{d-button icon="times" action=(route-action "closeModal" "initiatedByCloseButton") class="btn-flat modal-close close" title="modal.close"}}
         {{/if}}
 
         {{#if panels}}

From 17ca47af1a52f07c523d7b0b2fd7f59b9dd5b5d2 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 29 Apr 2020 08:45:38 +1000
Subject: [PATCH 0837/1830] FIX: Remove timezone in brackets from user card
 (#9567)

For clarity and to save space remove the timezone in brackets e.g. (EDT) from the user card. Also add a title to the user time span to say it is Local Time.
---
 .../app/components/user-card-contents.js       |  2 +-
 .../components/user-card-contents.hbs          |  2 +-
 config/locales/client.en.yml                   |  1 +
 test/javascripts/acceptance/user-card-test.js  | 18 ++++++++----------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-card-contents.js b/app/assets/javascripts/discourse/app/components/user-card-contents.js
index 8e8589533d..b4f0e5cf4b 100644
--- a/app/assets/javascripts/discourse/app/components/user-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/user-card-contents.js
@@ -77,7 +77,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
 
   @discourseComputed("userTimezone")
   formattedUserLocalTime(timezone) {
-    return moment.tz(timezone).format(I18n.t("dates.time_with_zone"));
+    return moment.tz(timezone).format(I18n.t("dates.time"));
   },
 
   @discourseComputed("username")
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
index 3148fc95d3..239aadad35 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
@@ -171,7 +171,7 @@
               </span>
             {{/if}}
             {{#if showUserLocalTime}}
-              <span class="local-time">
+              <span class="local-time" title="{{i18n "local_time"}}">
                 {{d-icon "far-clock"}}
                 <span>{{this.formattedUserLocalTime}}</span>
               </span>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 3180d66d2f..cc828b2a0e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1444,6 +1444,7 @@ en:
     mute: Mute
     unmute: Unmute
     last_post: Posted
+    local_time: "Local Time"
     time_read: Read
     time_read_recently: "%{time_read} recently"
     time_read_tooltip: "%{time_read} total time read"
diff --git a/test/javascripts/acceptance/user-card-test.js b/test/javascripts/acceptance/user-card-test.js
index d85d02d966..f15bbd3a7a 100644
--- a/test/javascripts/acceptance/user-card-test.js
+++ b/test/javascripts/acceptance/user-card-test.js
@@ -25,11 +25,10 @@ QUnit.test("user card local time", async assert => {
   assert.ok(invisible(".user-card"), "user card is invisible by default");
   await click("a[data-user-card=eviltrout]:first");
 
-  let expectedTime =
-    moment
-      .tz("Australia/Brisbane")
-      .add(-2, "hours")
-      .format("hh:mm a") + " (AWST)";
+  let expectedTime = moment
+    .tz("Australia/Brisbane")
+    .add(-2, "hours")
+    .format("h:mm a");
 
   assert.ok(visible(".user-card"), "card should appear");
   assert.equal(
@@ -51,11 +50,10 @@ QUnit.test("user card local time", async assert => {
 
   await click("a[data-user-card=charlie]:first");
 
-  expectedTime =
-    moment
-      .tz("Australia/Brisbane")
-      .add(-14, "hours")
-      .format("hh:mm a") + " (EDT)";
+  expectedTime = moment
+    .tz("Australia/Brisbane")
+    .add(-14, "hours")
+    .format("h:mm a");
 
   assert.equal(
     find(".user-card .local-time")

From 6cf31f16f713eb42850c10b8629c45a4ffe43d10 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 29 Apr 2020 10:53:37 +1000
Subject: [PATCH 0838/1830] FIX: Change bookmarks-with-reminders URL back to
 bookmarks for user activity (#9566)

* Bookmarks with reminders is a core feature now, no need to have a separate URL
* Keep around the old /u/:username/activity/bookmarks-with-reminders route for backwards compat in Ember but just redirect to user activity bookmarks.
---
 ...eminders.js => user-activity-bookmarks.js} |  0
 .../discourse/app/routes/discovery.js         |  5 +---
 .../user-activity-bookmarks-with-reminders.js | 26 ++-----------------
 .../app/routes/user-activity-bookmarks.js     | 25 ++++++++++++++----
 .../discourse/app/templates/user/activity.hbs |  2 +-
 .../discourse/app/templates/user/summary.hbs  |  2 +-
 .../app/widgets/quick-access-bookmarks.js     |  2 +-
 .../discourse/app/widgets/user-menu.js        |  2 +-
 .../new_user_narrative.rb                     |  2 +-
 .../new_user_narrative_spec.rb                |  2 +-
 .../acceptance/user-bookmarks-test.js         |  6 ++---
 11 files changed, 32 insertions(+), 42 deletions(-)
 rename app/assets/javascripts/discourse/app/controllers/{user-activity-bookmarks-with-reminders.js => user-activity-bookmarks.js} (100%)

diff --git a/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks-with-reminders.js b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
similarity index 100%
rename from app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks-with-reminders.js
rename to app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
diff --git a/app/assets/javascripts/discourse/app/routes/discovery.js b/app/assets/javascripts/discourse/app/routes/discovery.js
index f7bd4a5a06..e4cff5e115 100644
--- a/app/assets/javascripts/discourse/app/routes/discovery.js
+++ b/app/assets/javascripts/discourse/app/routes/discovery.js
@@ -18,10 +18,7 @@ export default DiscourseRoute.extend(OpenComposer, {
     // and being based on a different model. better to just redirect
     const url = transition.intent.url;
     if (url === "/bookmarks") {
-      this.transitionTo(
-        "userActivity.bookmarksWithReminders",
-        this.currentUser
-      );
+      this.transitionTo("userActivity.bookmarks", this.currentUser);
     }
 
     if (
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks-with-reminders.js b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks-with-reminders.js
index fc8bd07826..7c5cf81ec6 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks-with-reminders.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks-with-reminders.js
@@ -1,29 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
-  noContentHelpKey: "user_activity.no_bookmarks",
-
-  queryParams: {
-    acting_username: { refreshModel: true }
-  },
-
-  model() {
-    return this.modelFor("user").get("bookmarks");
-  },
-
-  renderTemplate() {
-    this.render("user_bookmarks");
-  },
-
-  setupController(controller, model) {
-    controller.set("model", model);
-    controller.loadItems();
-  },
-
-  actions: {
-    didTransition() {
-      this.controllerFor("user-activity")._showFooter();
-      return true;
-    }
+  redirect() {
+    this.transitionTo("userActivity.bookmarks");
   }
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
index 9ea0b7240e..fc8bd07826 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
@@ -1,13 +1,28 @@
-import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
-import UserAction from "discourse/models/user-action";
+import DiscourseRoute from "discourse/routes/discourse";
 
-export default UserActivityStreamRoute.extend({
-  userActionType: UserAction.TYPES["bookmarks"],
+export default DiscourseRoute.extend({
   noContentHelpKey: "user_activity.no_bookmarks",
 
+  queryParams: {
+    acting_username: { refreshModel: true }
+  },
+
+  model() {
+    return this.modelFor("user").get("bookmarks");
+  },
+
+  renderTemplate() {
+    this.render("user_bookmarks");
+  },
+
+  setupController(controller, model) {
+    controller.set("model", model);
+    controller.loadItems();
+  },
+
   actions: {
     didTransition() {
-      this.controllerFor("application").set("showFooter", true);
+      this.controllerFor("user-activity")._showFooter();
       return true;
     }
   }
diff --git a/app/assets/javascripts/discourse/app/templates/user/activity.hbs b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
index 15b868def2..6ccc09bd66 100644
--- a/app/assets/javascripts/discourse/app/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
@@ -19,7 +19,7 @@
     </li>
     {{#if user.showBookmarks}}
       <li>
-        {{#link-to 'userActivity.bookmarksWithReminders'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
+        {{#link-to "userActivity.bookmarks"}}{{i18n "user_action_groups.3"}}{{/link-to}}
       </li>
     {{/if}}
     {{plugin-outlet
diff --git a/app/assets/javascripts/discourse/app/templates/user/summary.hbs b/app/assets/javascripts/discourse/app/templates/user/summary.hbs
index ff9c7520f9..ddd89595c5 100644
--- a/app/assets/javascripts/discourse/app/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/summary.hbs
@@ -27,7 +27,7 @@
         </li>
         {{#if model.bookmark_count}}
           <li class="linked-stat">
-            {{#link-to "userActivity.bookmarksWithReminders"}}
+            {{#link-to "userActivity.bookmarks"}}
               {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}}
             {{/link-to}}
           </li>
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js b/app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js
index 787fce384d..3782b3e67c 100644
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js
+++ b/app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js
@@ -16,7 +16,7 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
   },
 
   showAllHref() {
-    return `${this.attrs.path}/activity/bookmarks-with-reminders`;
+    return `${this.attrs.path}/activity/bookmarks`;
   },
 
   emptyStatePlaceholderItem() {
diff --git a/app/assets/javascripts/discourse/app/widgets/user-menu.js b/app/assets/javascripts/discourse/app/widgets/user-menu.js
index 08792c4130..6f4b5c323c 100644
--- a/app/assets/javascripts/discourse/app/widgets/user-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/user-menu.js
@@ -62,7 +62,7 @@ createWidget("user-menu-links", {
       label: "user.bookmarks",
       className: "user-bookmarks-link",
       icon: "bookmark",
-      href: `${this.attrs.path}/activity/bookmarks-with-reminders`
+      href: `${this.attrs.path}/activity/bookmarks`
     };
   },
 
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
index 072c54beaf..5e9a1f38a5 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
@@ -238,7 +238,7 @@ module DiscourseNarrativeBot
       return unless @post.user_id == self.discobot_user.id
 
       profile_page_url = url_helpers(:user_url, username: @user.username)
-      bookmark_url = "#{profile_page_url}/activity/bookmarks-with-reminders"
+      bookmark_url = "#{profile_page_url}/activity/bookmarks"
       raw = <<~RAW
         #{I18n.t("#{I18N_KEY}.bookmark.reply", i18n_post_args(bookmark_url: bookmark_url))}
 
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
index d875de3b10..ce65b15463 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
@@ -256,7 +256,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
         profile_page_url = "#{Discourse.base_url}/u/#{user.username}"
 
         expected_raw = <<~RAW
-          #{I18n.t('discourse_narrative_bot.new_user_narrative.bookmark.reply', bookmark_url: "#{profile_page_url}/activity/bookmarks-with-reminders", base_uri: '')}
+          #{I18n.t('discourse_narrative_bot.new_user_narrative.bookmark.reply', bookmark_url: "#{profile_page_url}/activity/bookmarks", base_uri: '')}
 
           #{I18n.t('discourse_narrative_bot.new_user_narrative.onebox.instructions', base_uri: '')}
         RAW
diff --git a/test/javascripts/acceptance/user-bookmarks-test.js b/test/javascripts/acceptance/user-bookmarks-test.js
index e965510129..3a276810c8 100644
--- a/test/javascripts/acceptance/user-bookmarks-test.js
+++ b/test/javascripts/acceptance/user-bookmarks-test.js
@@ -15,13 +15,13 @@ acceptance("User's bookmarks", {
 });
 
 test("listing user bookmarks", async assert => {
-  await visit("/u/eviltrout/activity/bookmarks-with-reminders");
+  await visit("/u/eviltrout/activity/bookmarks");
 
   assert.ok(find(".bookmark-list-item").length);
 });
 
 test("removing a bookmark", async assert => {
-  await visit("/u/eviltrout/activity/bookmarks-with-reminders");
+  await visit("/u/eviltrout/activity/bookmarks");
 
   const dropdown = selectKit(".bookmark-actions-dropdown");
   await dropdown.expand();
@@ -44,7 +44,7 @@ test("listing users bookmarks - no bookmarks", async assert => {
     }
   ]);
 
-  await visit("/u/eviltrout/activity/bookmarks-with-reminders");
+  await visit("/u/eviltrout/activity/bookmarks");
 
   assert.equal(find(".alert.alert-info").text(), "no bookmarks");
 });

From 24b9759c602b025e269ebc29aa77447c08b290e3 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 28 Apr 2020 21:14:29 -0400
Subject: [PATCH 0839/1830] UX: fix dashboard version panel width by removing
 extra wrapper

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

diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs
index cbbd34b4b2..05296f4d7b 100644
--- a/app/assets/javascripts/admin/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard.hbs
@@ -3,7 +3,7 @@
 {{#if showVersionChecks}}
   <div class="section-top">
     <div class="version-checks">
-      {{version-checks versionCheck=versionCheck}}
+      {{version-checks versionCheck=versionCheck tagName=""}}
     </div>
   </div>
 {{/if}}

From 5503eba9240664122d5b4cb41a6ec619b4425e5c Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 29 Apr 2020 11:10:57 +0800
Subject: [PATCH 0840/1830] DEV: Add env in dev to support verbose query log.

---
 config/environments/development.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index ffada27d98..2a612c7164 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -39,6 +39,10 @@ Discourse::Application.configure do
 
   config.log_level = ENV['DISCOURSE_DEV_LOG_LEVEL'] if ENV['DISCOURSE_DEV_LOG_LEVEL']
 
+  if ENV['RAILS_VERBOSE_QUERY_LOGS']
+    config.active_record.verbose_query_logs = true
+  end
+
   if defined?(BetterErrors)
     BetterErrors::Middleware.allow_ip! ENV['TRUSTED_IP'] if ENV['TRUSTED_IP']
 

From 301a0fa54eefb97f891b03c95de4bf4fb7f5cb4a Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 29 Apr 2020 12:48:55 +0800
Subject: [PATCH 0841/1830] FEATURE: Redesign discourse-presence to track state
 on the client side. (#9487)

Before this commit, the presence state of users were stored on the
server side and any updates to the state meant we had to publish the
entire state to the clients. Also, the way the state of users were
stored on the server side meant we didn't have a way to differentiate
between replying users and whispering users.

In this redesign, we decided to move the tracking of users state to the client
side and have the server publish client events instead. As a result of
this change, we're able to remove the number of opened connections
needed to track presence and also reduce the payload that is sent for
each event.

At the same time, we've also improved on the restrictions when publishing message_bus messages. Users that
do not have permission to see certain events will not receive messages
for those events.
---
 .../composer-presence-display.js.es6          | 151 ++---
 .../components/topic-presence-display.js.es6  |  54 +-
 .../discourse/lib/presence-manager.js.es6     | 201 ++++++
 .../components/composer-presence-display.hbs  |   4 +-
 .../connectors/composer-fields/presence.hbs   |   1 +
 .../topic-above-footer-buttons/presence.hbs   |   2 +-
 .../initializers/discourse-presence.js.es6    |  42 ++
 .../discourse-presence/config/settings.yml    |   1 +
 plugins/discourse-presence/plugin.rb          | 248 ++++----
 .../spec/presence_manager_spec.rb             | 108 ----
 .../spec/requests/presence_controller_spec.rb | 590 +++++++++++++-----
 11 files changed, 859 insertions(+), 543 deletions(-)
 create mode 100644 plugins/discourse-presence/assets/javascripts/discourse/lib/presence-manager.js.es6
 create mode 100644 plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6
 delete mode 100644 plugins/discourse-presence/spec/presence_manager_spec.rb

diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index 1e78297376..e6a366087b 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -1,12 +1,11 @@
-import { cancel, debounce, once } from "@ember/runloop";
 import Component from "@ember/component";
-import { equal, gt } from "@ember/object/computed";
-import { Promise } from "rsvp";
-import { ajax } from "discourse/lib/ajax";
-import computed, { observes, on } from "discourse-common/utils/decorators";
-
-export const keepAliveDuration = 10000;
-export const bufferTime = 3000;
+import { cancel } from "@ember/runloop";
+import { equal, gt, readOnly } from "@ember/object/computed";
+import discourseComputed, {
+  observes,
+  on
+} from "discourse-common/utils/decorators";
+import { REPLYING, CLOSED, EDITING } from "../lib/presence-manager";
 
 export default Component.extend({
   // Passed in variables
@@ -15,115 +14,67 @@ export default Component.extend({
   topic: null,
   reply: null,
   title: null,
+  isWhispering: null,
 
-  // Internal variables
-  previousState: null,
-  currentState: null,
-  presenceUsers: null,
-  channel: null,
-
+  presenceManager: readOnly("topic.presenceManager"),
+  users: readOnly("presenceManager.users"),
+  editingUsers: readOnly("presenceManager.editingUsers"),
   isReply: equal("action", "reply"),
-  shouldDisplay: gt("users.length", 0),
 
   @on("didInsertElement")
-  composerOpened() {
-    this._lastPublish = new Date();
-    once(this, "updateState");
+  subscribe() {
+    this.presenceManager && this.presenceManager.subscribe();
   },
 
-  @observes("action", "post.id", "topic.id")
-  composerStateChanged() {
-    once(this, "updateState");
+  @discourseComputed(
+    "post.id",
+    "editingUsers.@each.last_seen",
+    "users.@each.last_seen"
+  )
+  presenceUsers(postId, editingUsers, users) {
+    if (postId) {
+      return editingUsers.filterBy("post_id", postId);
+    } else {
+      return users;
+    }
   },
 
+  shouldDisplay: gt("presenceUsers.length", 0),
+
   @observes("reply", "title")
   typing() {
-    if (new Date() - this._lastPublish > keepAliveDuration) {
-      this.publish({ current: this.currentState });
+    if (this.presenceManager) {
+      const postId = this.get("post.id");
+
+      this._throttle = this.presenceManager.throttlePublish(
+        postId ? EDITING : REPLYING,
+        this.whisper,
+        postId
+      );
+    }
+  },
+
+  @observes("whisper")
+  cancelThrottle() {
+    this._cancelThrottle();
+  },
+
+  @observes("post.id")
+  stopEditing() {
+    if (this.presenceManager && !this.get("post.id")) {
+      this.presenceManager.publish(CLOSED, this.whisper);
     }
   },
 
   @on("willDestroyElement")
   composerClosing() {
-    this.publish({ previous: this.currentState });
-    cancel(this._pingTimer);
-    cancel(this._clearTimer);
-  },
-
-  updateState() {
-    let state = null;
-    const action = this.action;
-
-    if (action === "reply" || action === "edit") {
-      state = { action };
-      if (action === "reply") state.topic_id = this.get("topic.id");
-      if (action === "edit") state.post_id = this.get("post.id");
+    if (this.presenceManager) {
+      this._cancelThrottle();
+      this.presenceManager.publish(CLOSED, this.whisper);
     }
-
-    this.set("previousState", this.currentState);
-    this.set("currentState", state);
   },
 
-  @observes("currentState")
-  currentStateChanged() {
-    if (this.channel) {
-      this.messageBus.unsubscribe(this.channel);
-      this.set("channel", null);
-    }
-
-    this.clear();
-
-    if (!["reply", "edit"].includes(this.action)) {
-      return;
-    }
-
-    this.publish({
-      response_needed: true,
-      previous: this.previousState,
-      current: this.currentState
-    }).then(r => {
-      if (this.isDestroyed) {
-        return;
-      }
-      this.set("presenceUsers", r.users);
-      this.set("channel", r.messagebus_channel);
-
-      if (!r.messagebus_channel) {
-        return;
-      }
-
-      this.messageBus.subscribe(
-        r.messagebus_channel,
-        message => {
-          if (!this.isDestroyed) this.set("presenceUsers", message.users);
-          this._clearTimer = debounce(
-            this,
-            "clear",
-            keepAliveDuration + bufferTime
-          );
-        },
-        r.messagebus_id
-      );
-    });
-  },
-
-  clear() {
-    if (!this.isDestroyed) this.set("presenceUsers", []);
-  },
-
-  publish(data) {
-    this._lastPublish = new Date();
-
-    // Don't publish presence if disabled
-    if (this.currentUser.hide_profile_and_presence) {
-      return Promise.resolve();
-    }
-
-    return ajax("/presence/publish", { type: "POST", data });
-  },
-
-  @computed("presenceUsers", "currentUser.id")
-  users(users, currentUserId) {
-    return (users || []).filter(user => user.id !== currentUserId);
+  _cancelThrottle() {
+    cancel(this._throttle);
   }
 });
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
index 1089246fb6..9cfb46f7ba 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
@@ -1,59 +1,21 @@
-import { cancel, debounce } from "@ember/runloop";
 import Component from "@ember/component";
-import { gt } from "@ember/object/computed";
-import computed, { on } from "discourse-common/utils/decorators";
-import {
-  keepAliveDuration,
-  bufferTime
-} from "discourse/plugins/discourse-presence/discourse/components/composer-presence-display";
-
-const MB_GET_LAST_MESSAGE = -2;
+import { gt, readOnly } from "@ember/object/computed";
+import { on } from "discourse-common/utils/decorators";
 
 export default Component.extend({
-  topicId: null,
-  presenceUsers: null,
+  topic: null,
 
+  presenceManager: readOnly("topic.presenceManager"),
+  users: readOnly("presenceManager.users"),
   shouldDisplay: gt("users.length", 0),
 
-  clear() {
-    if (!this.isDestroyed) this.set("presenceUsers", []);
-  },
-
   @on("didInsertElement")
-  _inserted() {
-    this.clear();
-
-    this.messageBus.subscribe(
-      this.channel,
-      message => {
-        if (!this.isDestroyed) this.set("presenceUsers", message.users);
-        this._clearTimer = debounce(
-          this,
-          "clear",
-          keepAliveDuration + bufferTime
-        );
-      },
-      MB_GET_LAST_MESSAGE
-    );
+  subscribe() {
+    this.get("presenceManager").subscribe();
   },
 
   @on("willDestroyElement")
   _destroyed() {
-    cancel(this._clearTimer);
-    this.messageBus.unsubscribe(this.channel);
-  },
-
-  @computed("topicId")
-  channel(topicId) {
-    return `/presence/topic/${topicId}`;
-  },
-
-  @computed("presenceUsers", "currentUser.{id,ignored_users}")
-  users(users, currentUser) {
-    const ignoredUsers = currentUser.ignored_users || [];
-    return (users || []).filter(
-      user =>
-        user.id !== currentUser.id && !ignoredUsers.includes(user.username)
-    );
+    this.get("presenceManager").unsubscribe();
   }
 });
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/lib/presence-manager.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/lib/presence-manager.js.es6
new file mode 100644
index 0000000000..fe5c1bd6b6
--- /dev/null
+++ b/plugins/discourse-presence/assets/javascripts/discourse/lib/presence-manager.js.es6
@@ -0,0 +1,201 @@
+import EmberObject from "@ember/object";
+import { cancel, later, throttle } from "@ember/runloop";
+import { ajax } from "discourse/lib/ajax";
+import discourseComputed from "discourse-common/utils/decorators";
+
+// The durations chosen here determines the accuracy of the presence feature and
+// is tied closely with the server side implementation. Decreasing the duration
+// to increase the accuracy will come at the expense of having to more network
+// calls to publish the client's state.
+//
+// Logic walk through of our heuristic implementation:
+// - When client A is typing, a message is published every KEEP_ALIVE_DURATION_SECONDS.
+// - Client B receives the message and stores each user in an array and marks
+//   the user with a client-side timestamp of when the user was seen.
+// - If client A continues to type, client B will continue to receive messages to
+//   update the client-side timestamp of when client A was last seen.
+// - If client A disconnects or becomes inactive, the state of client A will be
+//   cleaned up on client B by a scheduler that runs every TIMER_INTERVAL_MILLISECONDS
+const KEEP_ALIVE_DURATION_SECONDS = 10;
+const BUFFER_DURATION_SECONDS = KEEP_ALIVE_DURATION_SECONDS + 2;
+
+const MESSAGE_BUS_LAST_ID = 0;
+const TIMER_INTERVAL_MILLISECONDS = 2000;
+
+export const REPLYING = "replying";
+export const EDITING = "editing";
+export const CLOSED = "closed";
+
+const PresenceManager = EmberObject.extend({
+  users: null,
+  editingUsers: null,
+  subscribed: null,
+  topic: null,
+  currentUser: null,
+  messageBus: null,
+  siteSettings: null,
+
+  init() {
+    this._super(...arguments);
+
+    this.setProperties({
+      users: [],
+      editingUsers: [],
+      subscribed: false
+    });
+  },
+
+  subscribe() {
+    if (this.subscribed) return;
+
+    this.messageBus.subscribe(
+      this.channel,
+      message => {
+        const { user, state } = message;
+        if (this.get("currentUser.id") === user.id) return;
+
+        switch (state) {
+          case REPLYING:
+            this._appendUser(this.users, user);
+            break;
+          case EDITING:
+            this._appendUser(this.editingUsers, user, {
+              post_id: parseInt(message.post_id, 10)
+            });
+            break;
+          case CLOSED:
+            this._removeUser(user);
+            break;
+        }
+      },
+      MESSAGE_BUS_LAST_ID
+    );
+
+    this.set("subscribed", true);
+  },
+
+  unsubscribe() {
+    this.messageBus.unsubscribe(this.channel);
+    this._stopTimer();
+    this.set("subscribed", false);
+  },
+
+  @discourseComputed("topic.id")
+  channel(topicId) {
+    return `/presence/${topicId}`;
+  },
+
+  throttlePublish(state, whisper, postId) {
+    return throttle(
+      this,
+      this.publish,
+      state,
+      whisper,
+      postId,
+      KEEP_ALIVE_DURATION_SECONDS * 1000
+    );
+  },
+
+  publish(state, whisper, postId) {
+    const data = {
+      state,
+      topic_id: this.get("topic.id")
+    };
+
+    if (whisper) {
+      data.is_whisper = 1;
+    }
+
+    if (postId) {
+      data.post_id = postId;
+    }
+
+    return ajax("/presence/publish", {
+      type: "POST",
+      data
+    });
+  },
+
+  _removeUser(user) {
+    [this.users, this.editingUsers].forEach(users => {
+      const existingUser = users.findBy("id", user.id);
+      if (existingUser) users.removeObject(existingUser);
+    });
+  },
+
+  _cleanUpUsers() {
+    [this.users, this.editingUsers].forEach(users => {
+      const staleUsers = [];
+
+      users.forEach(user => {
+        if (user.last_seen <= Date.now() - BUFFER_DURATION_SECONDS * 1000) {
+          staleUsers.push(user);
+        }
+      });
+
+      users.removeObjects(staleUsers);
+    });
+
+    return this.users.length === 0 && this.editingUsers.length === 0;
+  },
+
+  _appendUser(users, user, attrs) {
+    let existingUser;
+    let usersLength = 0;
+
+    users.forEach(u => {
+      if (u.id === user.id) {
+        existingUser = u;
+      }
+
+      if (attrs && attrs.post_id) {
+        if (u.post_id === attrs.post_id) usersLength++;
+      } else {
+        usersLength++;
+      }
+    });
+
+    const props = attrs || {};
+    props.last_seen = Date.now();
+
+    if (existingUser) {
+      existingUser.setProperties(props);
+    } else {
+      const limit = this.get("siteSettings.presence_max_users_shown");
+
+      if (usersLength < limit) {
+        users.pushObject(EmberObject.create(Object.assign(user, props)));
+      }
+    }
+
+    this._startTimer(() => {
+      this._cleanUpUsers();
+    });
+  },
+
+  _scheduleTimer(callback) {
+    return later(
+      this,
+      () => {
+        const stop = callback();
+
+        if (!stop) {
+          this.set("_timer", this._scheduleTimer(callback));
+        }
+      },
+      TIMER_INTERVAL_MILLISECONDS
+    );
+  },
+
+  _stopTimer() {
+    cancel(this._timer);
+  },
+
+  _startTimer(callback) {
+    if (!this._timer) {
+      this.set("_timer", this._scheduleTimer(callback));
+    }
+  }
+});
+
+export default PresenceManager;
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
index 97936135d0..453b13d07a 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
@@ -1,7 +1,7 @@
 {{#if shouldDisplay}}
   <div class="presence-users">
     <div class="presence-avatars">
-      {{#each users as |user|}}
+      {{#each presenceUsers as |user|}}
         {{avatar user avatarTemplatePath="avatar_template" usernamePath="username" imageSize="small"}}
       {{/each}}
     </div>
@@ -16,4 +16,4 @@
    --}}<span class="wave"><span class="dot">.</span><span class="dot">.</span><span class="dot">.</span>
     </span>
   </div>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs
index af4de7c592..8fa1fb3862 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs
@@ -4,4 +4,5 @@
   topic=model.topic
   reply=model.reply
   title=model.title
+  whisper=model.whisper
 }}
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.hbs
index 0ee449cf1d..c8514c7edc 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.hbs
@@ -1 +1 @@
-{{topic-presence-display topicId=model.id}}
+{{topic-presence-display topic=model}}
diff --git a/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6 b/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6
new file mode 100644
index 0000000000..1b591ce4d1
--- /dev/null
+++ b/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6
@@ -0,0 +1,42 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
+import PresenceManager from "../discourse/lib/presence-manager";
+
+function initializeDiscoursePresence(api) {
+  const currentUser = api.getCurrentUser();
+  const siteSettings = api.container.lookup("site-settings:main");
+
+  if (currentUser && !currentUser.hide_profile_and_presence) {
+    api.modifyClass("model:topic", {
+      presenceManager: null
+    });
+
+    api.modifyClass("route:topic-from-params", {
+      setupController() {
+        this._super(...arguments);
+
+        this.modelFor("topic").set(
+          "presenceManager",
+          PresenceManager.create({
+            topic: this.modelFor("topic"),
+            currentUser,
+            messageBus: api.container.lookup("message-bus:main"),
+            siteSettings
+          })
+        );
+      }
+    });
+  }
+}
+
+export default {
+  name: "discourse-presence",
+  after: "message-bus",
+
+  initialize(container) {
+    const siteSettings = container.lookup("site-settings:main");
+
+    if (siteSettings.presence_enabled) {
+      withPluginApi("0.8.40", initializeDiscoursePresence);
+    }
+  }
+};
diff --git a/plugins/discourse-presence/config/settings.yml b/plugins/discourse-presence/config/settings.yml
index 07c96c3d2b..21fbddf5ff 100644
--- a/plugins/discourse-presence/config/settings.yml
+++ b/plugins/discourse-presence/config/settings.yml
@@ -4,5 +4,6 @@ plugins:
     client: true
   presence_max_users_shown:
     default: 5
+    client: true
     min: 1
     max: 50
diff --git a/plugins/discourse-presence/plugin.rb b/plugins/discourse-presence/plugin.rb
index 54d694b069..ce91b1ad2e 100644
--- a/plugins/discourse-presence/plugin.rb
+++ b/plugins/discourse-presence/plugin.rb
@@ -2,8 +2,8 @@
 
 # name: discourse-presence
 # about: Show which users are writing a reply to a topic
-# version: 1.0
-# authors: André Pereira, David Taylor
+# version: 2.0
+# authors: André Pereira, David Taylor, tgxworld
 # url: https://github.com/discourse/discourse/tree/master/plugins/discourse-presence
 
 enabled_site_setting :presence_enabled
@@ -15,161 +15,155 @@ PLUGIN_NAME ||= -"discourse-presence"
 
 after_initialize do
 
+  MessageBus.register_client_message_filter('/presence/') do |message|
+    published_at = message.data["published_at"]
+
+    if published_at
+      (Time.zone.now.to_i - published_at) <= ::Presence::MAX_BACKLOG_AGE_SECONDS
+    else
+      false
+    end
+  end
+
   module ::Presence
+    MAX_BACKLOG_AGE_SECONDS = 10
+
     class Engine < ::Rails::Engine
       engine_name PLUGIN_NAME
       isolate_namespace Presence
     end
   end
 
-  module ::Presence::PresenceManager
-    MAX_BACKLOG_AGE ||= 60
-
-    def self.get_redis_key(type, id)
-      "presence:#{type}:#{id}"
-    end
-
-    def self.get_messagebus_channel(type, id)
-      "/presence/#{type}/#{id}"
-    end
-
-    # return true if a key was added
-    def self.add(type, id, user_id)
-      key = get_redis_key(type, id)
-      result = Discourse.redis.hset(key, user_id, Time.zone.now)
-      Discourse.redis.expire(key, MAX_BACKLOG_AGE)
-      result
-    end
-
-    # return true if a key was deleted
-    def self.remove(type, id, user_id)
-      key = get_redis_key(type, id)
-      Discourse.redis.expire(key, MAX_BACKLOG_AGE)
-      Discourse.redis.hdel(key, user_id) > 0
-    end
-
-    def self.get_users(type, id)
-      user_ids = Discourse.redis.hkeys(get_redis_key(type, id)).map(&:to_i)
-      User.where(id: user_ids)
-    end
-
-    def self.publish(type, id)
-      users = get_users(type, id)
-      serialized_users = users.map { |u| BasicUserSerializer.new(u, root: false) }
-      message = { users: serialized_users, time: Time.now.to_i }
-      messagebus_channel = get_messagebus_channel(type, id)
-
-      topic = type == 'post' ? Post.find_by(id: id).topic : Topic.find_by(id: id)
-
-      if topic.private_message?
-        user_ids = User.where('admin OR moderator').pluck(:id) + topic.allowed_users.pluck(:id)
-        group_ids = topic.allowed_groups.pluck(:id)
-
-        MessageBus.publish(
-          messagebus_channel,
-          message.as_json,
-          user_ids: user_ids,
-          group_ids: group_ids,
-          max_backlog_age: MAX_BACKLOG_AGE
-        )
-      else
-        MessageBus.publish(
-          messagebus_channel,
-          message.as_json,
-          group_ids: topic.secure_group_ids,
-          max_backlog_age: MAX_BACKLOG_AGE
-        )
-      end
-
-      users
-    end
-
-    def self.cleanup(type, id)
-      has_changed = false
-
-      # Delete entries older than 20 seconds
-      hash = Discourse.redis.hgetall(get_redis_key(type, id))
-      hash.each do |user_id, time|
-        if Time.zone.now - Time.parse(time) >= 20
-          has_changed |= remove(type, id, user_id)
-        end
-      end
-
-      has_changed
-    end
-
-  end
-
   require_dependency "application_controller"
 
   class Presence::PresencesController < ::ApplicationController
     requires_plugin PLUGIN_NAME
     before_action :ensure_logged_in
+    before_action :ensure_presence_enabled
 
-    ACTIONS ||= [-"edit", -"reply"].freeze
+    EDITING_STATE = 'editing'
+    REPLYING_STATE = 'replying'
+    CLOSED_STATE = 'closed'
 
-    def publish
-      raise Discourse::NotFound if current_user.blank? || current_user.user_option.hide_profile_and_presence?
-
-      data = params.permit(
-        :response_needed,
-        current: [:action, :topic_id, :post_id],
-        previous: [:action, :topic_id, :post_id]
-      )
-
-      payload = {}
-
-      if data[:previous] && data[:previous][:action].in?(ACTIONS)
-        type = data[:previous][:post_id] ? 'post' : 'topic'
-        id = data[:previous][:post_id] ? data[:previous][:post_id] : data[:previous][:topic_id]
-
-        topic = type == 'post' ? Post.find_by(id: id)&.topic : Topic.find_by(id: id)
-
-        if topic
-          guardian.ensure_can_see!(topic)
-
-          Presence::PresenceManager.remove(type, id, current_user.id)
-          Presence::PresenceManager.cleanup(type, id)
-          Presence::PresenceManager.publish(type, id)
-        end
+    def handle_message
+      [:state, :topic_id].each do |key|
+        raise ActionController::ParameterMissing.new(key) unless params.key?(key)
       end
 
-      if data[:current] && data[:current][:action].in?(ACTIONS)
-        type = data[:current][:post_id] ? 'post' : 'topic'
-        id = data[:current][:post_id] ? data[:current][:post_id] : data[:current][:topic_id]
+      topic_id = permitted_params[:topic_id]
+      topic = Topic.find_by(id: topic_id)
 
-        topic = type == 'post' ? Post.find_by(id: id)&.topic : Topic.find_by(id: id)
+      raise Discourse::InvalidParameters.new(:topic_id) unless topic
+      guardian.ensure_can_see!(topic)
 
-        if topic
-          guardian.ensure_can_see!(topic)
+      post = nil
 
-          Presence::PresenceManager.add(type, id, current_user.id)
-          Presence::PresenceManager.cleanup(type, id)
-          users = Presence::PresenceManager.publish(type, id)
+      if (permitted_params[:post_id])
+        if (permitted_params[:state] != EDITING_STATE)
+          raise Discourse::InvalidParameters.new(:state)
+        end
 
-          if data[:response_needed]
-            messagebus_channel = Presence::PresenceManager.get_messagebus_channel(type, id)
-            users ||= Presence::PresenceManager.get_users(type, id)
-            payload = json_payload(messagebus_channel, users)
+        post = Post.find_by(id: permitted_params[:post_id])
+        raise Discourse::InvalidParameters.new(:topic_id) unless post
+
+        guardian.ensure_can_edit!(post)
+      end
+
+      opts = {
+        max_backlog_age: Presence::MAX_BACKLOG_AGE_SECONDS
+      }
+
+      case permitted_params[:state]
+      when EDITING_STATE
+        opts[:group_ids] = [Group::AUTO_GROUPS[:staff]]
+
+        if !post.locked? && !permitted_params[:is_whisper]
+          opts[:user_ids] = [post.user_id]
+
+          if topic.private_message?
+            if post.wiki
+              opts[:user_ids] = opts[:user_ids].concat(
+                topic.allowed_users.where(
+                  "trust_level >= ? AND NOT admin OR moderator",
+                  SiteSetting.min_trust_to_edit_wiki_post
+                ).pluck(:id)
+              )
+
+              opts[:user_ids].uniq!
+
+              # Ignore trust level and just publish to all allowed groups since
+              # trying to figure out which users in the allowed groups have
+              # the necessary trust levels can lead to a large array of user ids
+              # if the groups are big.
+              opts[:group_ids] = opts[:group_ids].concat(
+                topic.allowed_groups.pluck(:id)
+              )
+            end
+          else
+            if post.wiki
+              opts[:group_ids] << Group::AUTO_GROUPS[:"trust_level_#{SiteSetting.min_trust_to_edit_wiki_post}"]
+            elsif SiteSetting.trusted_users_can_edit_others?
+              opts[:group_ids] << Group::AUTO_GROUPS[:trust_level_4]
+            end
           end
         end
+      when REPLYING_STATE
+        if permitted_params[:is_whisper]
+          opts[:group_ids] = [Group::AUTO_GROUPS[:staff]]
+        elsif topic.private_message?
+          opts[:user_ids] = topic.allowed_users.pluck(:id)
+
+          opts[:group_ids] = [Group::AUTO_GROUPS[:staff]].concat(
+            topic.allowed_groups.pluck(:id)
+          )
+        else
+          opts[:group_ids] = topic.secure_group_ids
+        end
+      when CLOSED_STATE
+        if topic.private_message?
+          opts[:user_ids] = topic.allowed_users.pluck(:id)
+
+          opts[:group_ids] = [Group::AUTO_GROUPS[:staff]].concat(
+            topic.allowed_groups.pluck(:id)
+          )
+        else
+          opts[:group_ids] = topic.secure_group_ids
+        end
       end
 
-      render json: payload
-    end
-
-    def json_payload(channel, users)
-      {
-        messagebus_channel: channel,
-        messagebus_id: MessageBus.last_id(channel),
-        users: users.limit(SiteSetting.presence_max_users_shown).map { |u| BasicUserSerializer.new(u, root: false) }
+      payload = {
+        user: BasicUserSerializer.new(current_user, root: false).as_json,
+        state: permitted_params[:state],
+        is_whisper: permitted_params[:is_whisper].present?,
+        published_at: Time.zone.now.to_i
       }
+
+      if (post_id = permitted_params[:post_id]).present?
+        payload[:post_id] = post_id
+      end
+
+      MessageBus.publish("/presence/#{topic_id}", payload, opts)
+
+      render json: success_json
     end
 
+    private
+
+    def ensure_presence_enabled
+      if !SiteSetting.presence_enabled ||
+         current_user.user_option.hide_profile_and_presence?
+
+        raise Discourse::NotFound
+      end
+    end
+
+    def permitted_params
+      params.permit(:state, :topic_id, :post_id, :is_whisper)
+    end
   end
 
   Presence::Engine.routes.draw do
-    post '/publish' => 'presences#publish'
+    post '/publish' => 'presences#handle_message'
   end
 
   Discourse::Application.routes.append do
diff --git a/plugins/discourse-presence/spec/presence_manager_spec.rb b/plugins/discourse-presence/spec/presence_manager_spec.rb
deleted file mode 100644
index b6cf1155ce..0000000000
--- a/plugins/discourse-presence/spec/presence_manager_spec.rb
+++ /dev/null
@@ -1,108 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe ::Presence::PresenceManager do
-
-  let(:user1) { Fabricate(:user) }
-  let(:user2) { Fabricate(:user) }
-  let(:user3) { Fabricate(:user) }
-  let(:manager) { ::Presence::PresenceManager }
-
-  let(:post1) { Fabricate(:post) }
-  let(:post2) { Fabricate(:post) }
-
-  after(:each) do
-    Discourse.redis.del("presence:topic:#{post1.topic.id}")
-    Discourse.redis.del("presence:topic:#{post2.topic.id}")
-    Discourse.redis.del("presence:post:#{post1.id}")
-    Discourse.redis.del("presence:post:#{post2.id}")
-  end
-
-  it 'adds, removes and lists users correctly' do
-    expect(manager.get_users('post', post1.id).count).to eq(0)
-
-    expect(manager.add('post', post1.id, user1.id)).to be true
-    expect(manager.add('post', post1.id, user2.id)).to be true
-    expect(manager.add('post', post2.id, user3.id)).to be true
-
-    expect(manager.get_users('post', post1.id).count).to eq(2)
-    expect(manager.get_users('post', post2.id).count).to eq(1)
-
-    expect(manager.get_users('post', post1.id)).to contain_exactly(user1, user2)
-    expect(manager.get_users('post', post2.id)).to contain_exactly(user3)
-
-    expect(manager.remove('post', post1.id, user1.id)).to be true
-    expect(manager.get_users('post', post1.id).count).to eq(1)
-    expect(manager.get_users('post', post1.id)).to contain_exactly(user2)
-  end
-
-  it 'publishes correctly' do
-    expect(manager.get_users('post', post1.id).count).to eq(0)
-
-    manager.add('post', post1.id, user1.id)
-    manager.add('post', post1.id, user2.id)
-
-    messages = MessageBus.track_publish do
-      manager.publish('post', post1.id)
-    end
-
-    expect(messages.count).to eq (1)
-    message = messages.first
-
-    expect(message.channel).to eq("/presence/post/#{post1.id}")
-
-    expect(message.data["users"].map { |u| u[:id] }).to contain_exactly(user1.id, user2.id)
-  end
-
-  it 'publishes private message securely' do
-    private_post = Fabricate(:private_message_post)
-    manager.add('post', private_post.id, user2.id)
-
-    messages = MessageBus.track_publish do
-      manager.publish('post', private_post.id)
-    end
-
-    expect(messages.count).to eq (1)
-    message = messages.first
-
-    expect(message.channel).to eq("/presence/post/#{private_post.id}")
-
-    user_ids = User.where('admin or moderator').pluck(:id)
-    user_ids += private_post.topic.allowed_users.pluck(:id)
-    expect(message.user_ids).to contain_exactly(*user_ids)
-  end
-
-  it 'publishes private category securely' do
-    group = Fabricate(:group)
-    category = Fabricate(:private_category, group: group)
-    private_topic = Fabricate(:topic, category: category)
-
-    manager.add('topic', private_topic.id, user2.id)
-
-    messages = MessageBus.track_publish do
-      manager.publish('topic', private_topic.id)
-    end
-
-    expect(messages.count).to eq (1)
-    message = messages.first
-
-    expect(message.channel).to eq("/presence/topic/#{private_topic.id}")
-
-    expect(message.group_ids).to contain_exactly(*private_topic.secure_group_ids)
-  end
-
-  it 'cleans up correctly' do
-    freeze_time Time.zone.now do
-      expect(manager.add('post', post1.id, user1.id)).to be true
-      expect(manager.cleanup('post', post1.id)).to be false # Nothing to cleanup
-      expect(manager.get_users('post', post1.id).count).to eq(1)
-    end
-
-    # Anything older than 20 seconds should be cleaned up
-    freeze_time 30.seconds.from_now do
-      expect(manager.cleanup('post', post1.id)).to be true
-      expect(manager.get_users('post', post1.id).count).to eq(0)
-    end
-  end
-end
diff --git a/plugins/discourse-presence/spec/requests/presence_controller_spec.rb b/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
index 80547019a7..c13e04fa6c 100644
--- a/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
+++ b/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
@@ -3,170 +3,442 @@
 require 'rails_helper'
 
 describe ::Presence::PresencesController do
-  before do
-    SiteSetting.presence_enabled = true
-  end
+  describe '#handle_message' do
+    context 'when not logged in' do
+      it 'should raise the right error' do
+        post '/presence/publish.json'
 
-  let(:user1) { Fabricate(:user) }
-  let(:user2) { Fabricate(:user) }
-  let(:user3) { Fabricate(:user) }
+        expect(response.status).to eq(403)
+      end
+    end
 
-  let(:post1) { Fabricate(:post) }
-  let(:post2) { Fabricate(:post) }
+    context 'when logged in' do
+      fab!(:user) { Fabricate(:user) }
+      fab!(:user2) { Fabricate(:user) }
+      fab!(:admin) { Fabricate(:admin) }
 
-  let(:manager) { ::Presence::PresenceManager }
+      fab!(:group) do
+        group = Fabricate(:group)
+        group.add(user)
+        group
+      end
 
-  after do
-    Discourse.redis.del("presence:topic:#{post1.topic.id}")
-    Discourse.redis.del("presence:topic:#{post2.topic.id}")
-    Discourse.redis.del("presence:post:#{post1.id}")
-    Discourse.redis.del("presence:post:#{post2.id}")
-  end
+      fab!(:category) { Fabricate(:private_category, group: group) }
+      fab!(:private_topic) { Fabricate(:topic, category: category) }
+      fab!(:public_topic) { Fabricate(:topic, first_post: Fabricate(:post)) }
 
-  context 'when not logged in' do
-    it 'should raise the right error' do
-      post '/presence/publish.json'
-      expect(response.status).to eq(403)
+      fab!(:private_message) do
+        Fabricate(:private_message_topic,
+          allowed_groups: [group]
+        )
+      end
+
+      before do
+        sign_in(user)
+      end
+
+      it 'returns the right response when user disables the presence feature' do
+        user.user_option.update_column(:hide_profile_and_presence, true)
+
+        post '/presence/publish.json'
+
+        expect(response.status).to eq(404)
+      end
+
+      it 'returns the right response when the presence site settings is disabled' do
+        SiteSetting.presence_enabled = false
+
+        post '/presence/publish.json'
+
+        expect(response.status).to eq(404)
+      end
+
+      it 'returns the right response if required params are missing' do
+        post '/presence/publish.json'
+
+        expect(response.status).to eq(400)
+      end
+
+      it 'returns the right response if topic_id is invalid' do
+        post '/presence/publish.json', params: { topic_id: -999, state: 'replying' }
+
+        expect(response.status).to eq(400)
+      end
+
+      it 'returns the right response when user does not have access to the topic' do
+        group.remove(user)
+
+        post '/presence/publish.json', params: { topic_id: private_topic.id, state: 'replying' }
+
+        expect(response.status).to eq(403)
+      end
+
+      it 'returns the right response when an invalid state is provided with a post_id' do
+        post '/presence/publish.json', params: {
+          topic_id: public_topic.id,
+          post_id: public_topic.first_post.id,
+          state: 'some state'
+        }
+
+        expect(response.status).to eq(400)
+      end
+
+      it 'returns the right response when user can not edit a post' do
+        Fabricate(:post, topic: private_topic, user: private_topic.user)
+
+        post '/presence/publish.json', params: {
+          topic_id: private_topic.id,
+          post_id: private_topic.first_post.id,
+          state: 'editing'
+        }
+
+        expect(response.status).to eq(403)
+      end
+
+      it 'returns the right response when an invalid post_id is given' do
+        post '/presence/publish.json', params: {
+          topic_id: public_topic.id,
+          post_id: -9,
+          state: 'editing'
+        }
+
+        expect(response.status).to eq(400)
+      end
+
+      it 'publishes the right message for a public topic' do
+        freeze_time
+
+        messages = MessageBus.track_publish do
+          post '/presence/publish.json', params: { topic_id: public_topic.id, state: 'replying' }
+
+          expect(response.status).to eq(200)
+        end
+
+        expect(messages.length).to eq(1)
+
+        message = messages.first
+
+        expect(message.channel).to eq("/presence/#{public_topic.id}")
+        expect(message.data.dig(:user, :id)).to eq(user.id)
+        expect(message.data[:published_at]).to eq(Time.zone.now.to_i)
+        expect(message.group_ids).to eq(nil)
+        expect(message.user_ids).to eq(nil)
+      end
+
+      it 'publishes the right message for a restricted topic' do
+        freeze_time
+
+        messages = MessageBus.track_publish do
+          post '/presence/publish.json', params: {
+            topic_id: private_topic.id,
+            state: 'replying'
+          }
+
+          expect(response.status).to eq(200)
+        end
+
+        expect(messages.length).to eq(1)
+
+        message = messages.first
+
+        expect(message.channel).to eq("/presence/#{private_topic.id}")
+        expect(message.data.dig(:user, :id)).to eq(user.id)
+        expect(message.data[:published_at]).to eq(Time.zone.now.to_i)
+        expect(message.group_ids).to contain_exactly(group.id)
+        expect(message.user_ids).to eq(nil)
+      end
+
+      it 'publishes the right message for a private message' do
+        messages = MessageBus.track_publish do
+          post '/presence/publish.json', params: {
+            topic_id: private_message.id,
+            state: 'replying'
+          }
+
+          expect(response.status).to eq(200)
+        end
+
+        expect(messages.length).to eq(1)
+
+        message = messages.first
+
+        expect(message.group_ids).to contain_exactly(
+          group.id,
+          Group::AUTO_GROUPS[:staff]
+        )
+
+        expect(message.user_ids).to contain_exactly(
+          *private_message.topic_allowed_users.pluck(:user_id)
+        )
+      end
+
+      it 'publishes the message to staff group when user is whispering' do
+        SiteSetting.enable_whispers = true
+
+        messages = MessageBus.track_publish do
+          post '/presence/publish.json', params: {
+            topic_id: public_topic.id,
+            state: 'replying',
+            is_whisper: true
+          }
+
+          expect(response.status).to eq(200)
+        end
+
+        expect(messages.length).to eq(1)
+
+        message = messages.first
+
+        expect(message.group_ids).to contain_exactly(Group::AUTO_GROUPS[:staff])
+        expect(message.user_ids).to eq(nil)
+      end
+
+      it 'publishes the message to staff group when a staff is editing a whisper' do
+        SiteSetting.enable_whispers = true
+        sign_in(admin)
+
+        messages = MessageBus.track_publish do
+          post '/presence/publish.json', params: {
+            topic_id: public_topic.id,
+            post_id: public_topic.first_post.id,
+            state: 'editing',
+            is_whisper: true
+          }
+
+          expect(response.status).to eq(200)
+        end
+
+        expect(messages.length).to eq(1)
+
+        message = messages.first
+
+        expect(message.group_ids).to contain_exactly(Group::AUTO_GROUPS[:staff])
+        expect(message.user_ids).to eq(nil)
+      end
+
+      it 'publishes the message to staff group when a staff is editing a locked post' do
+        SiteSetting.enable_whispers = true
+        sign_in(admin)
+        locked_post = Fabricate(:post, topic: public_topic, locked_by_id: admin.id)
+
+        messages = MessageBus.track_publish do
+          post '/presence/publish.json', params: {
+            topic_id: public_topic.id,
+            post_id: locked_post.id,
+            state: 'editing',
+          }
+
+          expect(response.status).to eq(200)
+        end
+
+        expect(messages.length).to eq(1)
+
+        message = messages.first
+
+        expect(message.group_ids).to contain_exactly(Group::AUTO_GROUPS[:staff])
+        expect(message.user_ids).to eq(nil)
+      end
+
+      it 'publishes the message to author, staff group and TL4 group when editing a public post' do
+        post = Fabricate(:post, topic: public_topic, user: user)
+
+        messages = MessageBus.track_publish do
+          post '/presence/publish.json', params: {
+            topic_id: public_topic.id,
+            post_id: post.id,
+            state: 'editing',
+          }
+
+          expect(response.status).to eq(200)
+        end
+
+        expect(messages.length).to eq(1)
+
+        message = messages.first
+
+        expect(message.group_ids).to contain_exactly(
+          Group::AUTO_GROUPS[:trust_level_4],
+          Group::AUTO_GROUPS[:staff]
+        )
+
+        expect(message.user_ids).to contain_exactly(user.id)
+      end
+
+      it 'publishes the message to author and staff group when editing a public post ' \
+        'if SiteSettings.trusted_users_can_edit_others is set to false' do
+
+        post = Fabricate(:post, topic: public_topic, user: user)
+        SiteSetting.trusted_users_can_edit_others = false
+
+        messages = MessageBus.track_publish do
+          post '/presence/publish.json', params: {
+            topic_id: public_topic.id,
+            post_id: post.id,
+            state: 'editing',
+          }
+
+          expect(response.status).to eq(200)
+        end
+
+        expect(messages.length).to eq(1)
+
+        message = messages.first
+
+        expect(message.group_ids).to contain_exactly(Group::AUTO_GROUPS[:staff])
+        expect(message.user_ids).to contain_exactly(user.id)
+      end
+
+      it 'publishes the message to SiteSetting.min_trust_to_edit_wiki_post group ' \
+        'and staff group when editing a wiki in a public topic' do
+
+        post = Fabricate(:post, topic: public_topic, user: user, wiki: true)
+        SiteSetting.min_trust_to_edit_wiki_post = TrustLevel.levels[:basic]
+
+        messages = MessageBus.track_publish do
+          post '/presence/publish.json', params: {
+            topic_id: public_topic.id,
+            post_id: post.id,
+            state: 'editing',
+          }
+
+          expect(response.status).to eq(200)
+        end
+
+        expect(messages.length).to eq(1)
+
+        message = messages.first
+
+        expect(message.group_ids).to contain_exactly(
+          Group::AUTO_GROUPS[:trust_level_1],
+          Group::AUTO_GROUPS[:staff]
+        )
+
+        expect(message.user_ids).to contain_exactly(user.id)
+      end
+
+      it 'publishes the message to author and staff group when editing a private message' do
+        post = Fabricate(:post, topic: private_message, user: user)
+
+        messages = MessageBus.track_publish do
+          post '/presence/publish.json', params: {
+            topic_id: private_message.id,
+            post_id: post.id,
+            state: 'editing',
+          }
+
+          expect(response.status).to eq(200)
+        end
+
+        expect(messages.length).to eq(1)
+
+        message = messages.first
+
+        expect(message.group_ids).to contain_exactly(
+          Group::AUTO_GROUPS[:staff],
+        )
+
+        expect(message.user_ids).to contain_exactly(user.id)
+      end
+
+      it 'publishes the message to users with trust levels of SiteSetting.min_trust_to_edit_wiki_post ' \
+        'and staff group when editing a wiki in a private message' do
+
+        post = Fabricate(:post,
+          topic: private_message,
+          user: private_message.user,
+          wiki: true
+        )
+
+        user2.update!(trust_level: TrustLevel.levels[:newuser])
+        group.add(user2)
+
+        SiteSetting.min_trust_to_edit_wiki_post = TrustLevel.levels[:basic]
+
+        messages = MessageBus.track_publish do
+          post '/presence/publish.json', params: {
+            topic_id: private_message.id,
+            post_id: post.id,
+            state: 'editing',
+          }
+
+          expect(response.status).to eq(200)
+        end
+
+        expect(messages.length).to eq(1)
+
+        message = messages.first
+
+        expect(message.group_ids).to contain_exactly(
+          Group::AUTO_GROUPS[:staff],
+          group.id
+        )
+
+        expect(message.user_ids).to contain_exactly(
+          *private_message.allowed_users.pluck(:id)
+        )
+      end
+
+      it 'publises the right message when closing composer in public topic' do
+        messages = MessageBus.track_publish do
+          post '/presence/publish.json', params: {
+            topic_id: public_topic.id,
+            state: described_class::CLOSED_STATE,
+          }
+
+          expect(response.status).to eq(200)
+        end
+
+        expect(messages.length).to eq(1)
+
+        message = messages.first
+
+        expect(message.group_ids).to eq(nil)
+        expect(message.user_ids).to eq(nil)
+      end
+
+      it 'publises the right message when closing composer in private topic' do
+        messages = MessageBus.track_publish do
+          post '/presence/publish.json', params: {
+            topic_id: private_topic.id,
+            state: described_class::CLOSED_STATE,
+          }
+
+          expect(response.status).to eq(200)
+        end
+
+        expect(messages.length).to eq(1)
+
+        message = messages.first
+
+        expect(message.group_ids).to contain_exactly(group.id)
+        expect(message.user_ids).to eq(nil)
+      end
+
+      it 'publises the right message when closing composer in private message' do
+        post = Fabricate(:post, topic: private_message, user: user)
+
+        messages = MessageBus.track_publish do
+          post '/presence/publish.json', params: {
+            topic_id: private_message.id,
+            state: described_class::CLOSED_STATE,
+          }
+
+          expect(response.status).to eq(200)
+        end
+
+        expect(messages.length).to eq(1)
+
+        message = messages.first
+
+        expect(message.group_ids).to contain_exactly(
+          Group::AUTO_GROUPS[:staff],
+          group.id
+        )
+
+        expect(message.user_ids).to contain_exactly(
+          *private_message.allowed_users.pluck(:id)
+        )
+      end
     end
   end
-
-  context 'when logged in' do
-    before do
-      sign_in(user1)
-    end
-
-    it "doesn't produce an error" do
-      expect { post '/presence/publish.json' }.not_to raise_error
-    end
-
-    it "does not publish for users with disabled presence features" do
-      user1.user_option.update_column(:hide_profile_and_presence, true)
-      post '/presence/publish.json'
-      expect(response.code).to eq("404")
-    end
-
-    it "uses guardian to secure endpoint" do
-      private_post = Fabricate(:private_message_post)
-
-      post '/presence/publish.json', params: {
-        current: { action: 'edit', post_id: private_post.id }
-      }
-
-      expect(response.code.to_i).to eq(403)
-
-      group = Fabricate(:group)
-      category = Fabricate(:private_category, group: group)
-      private_topic = Fabricate(:topic, category: category)
-
-      post '/presence/publish.json', params: {
-        current: { action: 'edit', topic_id: private_topic.id }
-      }
-
-      expect(response.code.to_i).to eq(403)
-    end
-
-    it "returns a response when requested" do
-      messages = MessageBus.track_publish do
-        post '/presence/publish.json', params: {
-          current: { compose_state: 'open', action: 'edit', post_id: post1.id }, response_needed: true
-        }
-      end
-
-      expect(messages.count).to eq(1)
-
-      data = JSON.parse(response.body)
-
-      expect(data['messagebus_channel']).to eq("/presence/post/#{post1.id}")
-      expect(data['messagebus_id']).to eq(MessageBus.last_id("/presence/post/#{post1.id}"))
-      expect(data['users'][0]["id"]).to eq(user1.id)
-    end
-
-    it "doesn't return a response when not requested" do
-      messages = MessageBus.track_publish do
-        post '/presence/publish.json', params: {
-          current: { compose_state: 'open', action: 'edit', post_id: post1.id }
-        }
-      end
-
-      expect(messages.count).to eq(1)
-
-      data = JSON.parse(response.body)
-      expect(data).to eq({})
-    end
-
-    it "does send duplicate messagebus messages" do
-      messages = MessageBus.track_publish do
-        post '/presence/publish.json', params: {
-          current: { compose_state: 'open', action: 'edit', post_id: post1.id }
-        }
-      end
-
-      expect(messages.count).to eq(1)
-
-      messages = MessageBus.track_publish do
-        post '/presence/publish.json', params: {
-          current: { compose_state: 'open', action: 'edit', post_id: post1.id }
-        }
-      end
-
-      # we do this cause we also publish time
-      expect(messages.count).to eq(1)
-    end
-
-    it "clears 'previous' state when supplied" do
-      messages = MessageBus.track_publish do
-        post '/presence/publish.json', params: {
-          current: { compose_state: 'open', action: 'edit', post_id: post1.id }
-        }
-
-        post '/presence/publish.json', params: {
-          current: { compose_state: 'open', action: 'edit', post_id: post2.id },
-          previous: { compose_state: 'open', action: 'edit', post_id: post1.id }
-        }
-      end
-
-      expect(messages.count).to eq(3)
-    end
-
-    it 'cleans up old users when requested' do
-      freeze_time Time.zone.now do
-        manager.add('topic', post1.topic.id, user2.id)
-      end
-
-      # Anything older than 20 seconds should be cleaned up
-      freeze_time 30.seconds.from_now do
-        post '/presence/publish.json', params: {
-          current: { compose_state: 'open', action: 'reply', topic_id: post1.topic.id }, response_needed: true
-        }
-
-        data = JSON.parse(response.body)
-
-        expect(data['users'].length).to eq(1)
-      end
-
-    end
-
-    describe 'when post has been deleted' do
-      it 'should return an empty response' do
-        post1.destroy!
-
-        post '/presence/publish.json', params: {
-          current: { compose_state: 'open', action: 'edit', post_id: post1.id }
-        }
-
-        expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)).to eq({})
-
-        post '/presence/publish.json', params: {
-          current: { compose_state: 'open', action: 'edit', post_id: post2.id },
-          previous: { compose_state: 'open', action: 'edit', post_id: post1.id }
-        }
-
-        expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)).to eq({})
-      end
-    end
-
-  end
-
 end

From 2045f51312bb278d37990f4daa88147090bc3793 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 29 Apr 2020 15:23:17 +1000
Subject: [PATCH 0842/1830] FIX: correctly account for direct replies with
 presence

followup to 301a0fa5, we were not checking the action so we
were publishing some messages from composers we did not intend to
---
 .../components/composer-presence-display.js.es6       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index e6a366087b..72edf988f7 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -6,6 +6,7 @@ import discourseComputed, {
   on
 } from "discourse-common/utils/decorators";
 import { REPLYING, CLOSED, EDITING } from "../lib/presence-manager";
+import { REPLY, EDIT } from "discourse/models/composer";
 
 export default Component.extend({
   // Passed in variables
@@ -44,12 +45,18 @@ export default Component.extend({
   @observes("reply", "title")
   typing() {
     if (this.presenceManager) {
+      let action = this.action;
+
+      if (action !== REPLY && action !== EDIT) {
+        return;
+      }
+
       const postId = this.get("post.id");
 
       this._throttle = this.presenceManager.throttlePublish(
-        postId ? EDITING : REPLYING,
+        action === EDIT ? EDITING : REPLYING,
         this.whisper,
-        postId
+        action === EDIT ? postId : undefined
       );
     }
   },

From 8b3b5d1474137a08a33a4d9827aa36fd62be2e87 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 29 Apr 2020 13:39:02 +0800
Subject: [PATCH 0843/1830] DEV: Disable `discourse-presence` in Ember test
 env.

---
 .../discourse/components/topic-presence-display.js.es6        | 4 ++--
 .../assets/javascripts/initializers/discourse-presence.js.es6 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
index 9cfb46f7ba..1f8ec4d27a 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
@@ -11,11 +11,11 @@ export default Component.extend({
 
   @on("didInsertElement")
   subscribe() {
-    this.get("presenceManager").subscribe();
+    this.presenceManager && this.presenceManager.subscribe();
   },
 
   @on("willDestroyElement")
   _destroyed() {
-    this.get("presenceManager").unsubscribe();
+    this.presenceManager && this.presenceManager.unsubscribe();
   }
 });
diff --git a/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6 b/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6
index 1b591ce4d1..f1558d0578 100644
--- a/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6
@@ -35,7 +35,7 @@ export default {
   initialize(container) {
     const siteSettings = container.lookup("site-settings:main");
 
-    if (siteSettings.presence_enabled) {
+    if (siteSettings.presence_enabled && ENV.environment !== "test") {
       withPluginApi("0.8.40", initializeDiscoursePresence);
     }
   }

From 197d0332e639f786560fdb6a535fdcd1eeb94a70 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 29 Apr 2020 13:48:31 +0800
Subject: [PATCH 0844/1830] DEV: Missing import.

---
 .../assets/javascripts/initializers/discourse-presence.js.es6    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6 b/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6
index f1558d0578..27a7252426 100644
--- a/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6
@@ -1,5 +1,6 @@
 import { withPluginApi } from "discourse/lib/plugin-api";
 import PresenceManager from "../discourse/lib/presence-manager";
+import ENV from "discourse-common/config/environment";
 
 function initializeDiscoursePresence(api) {
   const currentUser = api.getCurrentUser();

From 960fd94758ef97ec5faf444068a5073bdff9772b Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 29 Apr 2020 13:48:38 +0800
Subject: [PATCH 0845/1830] DEV: Run rubocop in parallel in pre-commit hook.

---
 lefthook.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lefthook.yml b/lefthook.yml
index 749f080134..f3645c3d1a 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -3,7 +3,7 @@ pre-commit:
   commands:
     rubocop:
       glob: "*.rb"
-      run: bundle exec rubocop {staged_files}
+      run: bundle exec rubocop --parallel {staged_files}
     prettier:
       glob: "*.{js,es6}"
       exclude: "vendor/*|fixtures|public/javascripts|shims.js|ember-addons|template-lintrc|locale/*|test_helper|run-qunit"

From 1d04fb24f8cbe078990332117fcffda4bd6ea3e5 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 29 Apr 2020 14:07:42 +0800
Subject: [PATCH 0846/1830] DEV: Enable all the ActiveRecord goodness in
 development env.

---
 config/environments/development.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 2a612c7164..0adc84a086 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -39,7 +39,7 @@ Discourse::Application.configure do
 
   config.log_level = ENV['DISCOURSE_DEV_LOG_LEVEL'] if ENV['DISCOURSE_DEV_LOG_LEVEL']
 
-  if ENV['RAILS_VERBOSE_QUERY_LOGS']
+  if ENV['RAILS_VERBOSE_QUERY_LOGS'] != 0
     config.active_record.verbose_query_logs = true
   end
 
@@ -78,6 +78,10 @@ Discourse::Application.configure do
   end
 
   config.after_initialize do
+    if ENV["RAILS_COLORIZE_LOGGING"] != "0"
+      config.colorize_logging = true
+    end
+
     if ENV['BULLET']
       Bullet.enable = true
       Bullet.rails_logger = true

From fa21c03a1dc70cb1a3ef2a65140d1520a0e05eaf Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 29 Apr 2020 14:09:19 +0800
Subject: [PATCH 0847/1830] DEV: Minor follow up to
 1d04fb24f8cbe078990332117fcffda4bd6ea3e5

---
 config/environments/development.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 0adc84a086..360ae8ae8f 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -39,7 +39,7 @@ Discourse::Application.configure do
 
   config.log_level = ENV['DISCOURSE_DEV_LOG_LEVEL'] if ENV['DISCOURSE_DEV_LOG_LEVEL']
 
-  if ENV['RAILS_VERBOSE_QUERY_LOGS'] != 0
+  if ENV['RAILS_VERBOSE_QUERY_LOGS'] != "0"
     config.active_record.verbose_query_logs = true
   end
 

From a078feee07d1e55a4a6fc7e1058b8671922eaa8c Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 29 Apr 2020 14:19:14 +0800
Subject: [PATCH 0848/1830] DEV: Turn off ActiveRecord development color and
 query log by default.

It breaks logster.
---
 config/environments/development.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 360ae8ae8f..56bc6aad8b 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -39,7 +39,7 @@ Discourse::Application.configure do
 
   config.log_level = ENV['DISCOURSE_DEV_LOG_LEVEL'] if ENV['DISCOURSE_DEV_LOG_LEVEL']
 
-  if ENV['RAILS_VERBOSE_QUERY_LOGS'] != "0"
+  if ENV['RAILS_VERBOSE_QUERY_LOGS'] != "1"
     config.active_record.verbose_query_logs = true
   end
 
@@ -78,7 +78,7 @@ Discourse::Application.configure do
   end
 
   config.after_initialize do
-    if ENV["RAILS_COLORIZE_LOGGING"] != "0"
+    if ENV["RAILS_COLORIZE_LOGGING"] != "1"
       config.colorize_logging = true
     end
 

From 16ab6430feefb714325816a3123eb37a56c8df4a Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 29 Apr 2020 14:24:48 +0800
Subject: [PATCH 0849/1830] DEV: Follow up to
 a078feee07d1e55a4a6fc7e1058b8671922eaa8c

---
 config/environments/development.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 56bc6aad8b..3643c5b769 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -25,6 +25,7 @@ Discourse::Application.configure do
   config.assets.digest = false
 
   config.assets.debug = false
+  config.assets.quiet = true
 
   # Raise an error on page load if there are pending migrations
   config.active_record.migration_error = :page_load
@@ -39,7 +40,7 @@ Discourse::Application.configure do
 
   config.log_level = ENV['DISCOURSE_DEV_LOG_LEVEL'] if ENV['DISCOURSE_DEV_LOG_LEVEL']
 
-  if ENV['RAILS_VERBOSE_QUERY_LOGS'] != "1"
+  if ENV['RAILS_VERBOSE_QUERY_LOGS'] == "1"
     config.active_record.verbose_query_logs = true
   end
 
@@ -78,7 +79,7 @@ Discourse::Application.configure do
   end
 
   config.after_initialize do
-    if ENV["RAILS_COLORIZE_LOGGING"] != "1"
+    if ENV["RAILS_COLORIZE_LOGGING"] == "1"
       config.colorize_logging = true
     end
 

From 4fe4b3cce37ebc8313d9dda78fe09bed3cbfd954 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 29 Apr 2020 14:46:56 +0800
Subject: [PATCH 0850/1830] DEV: Revert quiet assets in dev.

Breaks with a gem.
---
 config/environments/development.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 3643c5b769..e8d1d503e1 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -25,7 +25,6 @@ Discourse::Application.configure do
   config.assets.digest = false
 
   config.assets.debug = false
-  config.assets.quiet = true
 
   # Raise an error on page load if there are pending migrations
   config.active_record.migration_error = :page_load

From ae54a337195db3afc4447e81e5231a3e2f41ac1a Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 29 Apr 2020 14:46:56 +0800
Subject: [PATCH 0851/1830] FIX: discourse-presence breaks composer for users.

---
 .../composer-presence-display.js.es6          | 34 ++++++++-----------
 .../components/topic-presence-display.js.es6  |  4 +--
 .../discourse/lib/presence-manager.js.es6     |  2 ++
 .../composer-fields/presence.js.es6           |  8 +++--
 .../presence.js.es6                           |  6 ++--
 .../initializers/discourse-presence.js.es6    |  2 +-
 6 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index 72edf988f7..b1329b1ddd 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -24,7 +24,7 @@ export default Component.extend({
 
   @on("didInsertElement")
   subscribe() {
-    this.presenceManager && this.presenceManager.subscribe();
+    this.presenceManager.subscribe();
   },
 
   @discourseComputed(
@@ -44,21 +44,19 @@ export default Component.extend({
 
   @observes("reply", "title")
   typing() {
-    if (this.presenceManager) {
-      let action = this.action;
+    let action = this.action;
 
-      if (action !== REPLY && action !== EDIT) {
-        return;
-      }
-
-      const postId = this.get("post.id");
-
-      this._throttle = this.presenceManager.throttlePublish(
-        action === EDIT ? EDITING : REPLYING,
-        this.whisper,
-        action === EDIT ? postId : undefined
-      );
+    if (action !== REPLY && action !== EDIT) {
+      return;
     }
+
+    const postId = this.get("post.id");
+
+    this._throttle = this.presenceManager.throttlePublish(
+      action === EDIT ? EDITING : REPLYING,
+      this.whisper,
+      action === EDIT ? postId : undefined
+    );
   },
 
   @observes("whisper")
@@ -68,17 +66,15 @@ export default Component.extend({
 
   @observes("post.id")
   stopEditing() {
-    if (this.presenceManager && !this.get("post.id")) {
+    if (!this.get("post.id")) {
       this.presenceManager.publish(CLOSED, this.whisper);
     }
   },
 
   @on("willDestroyElement")
   composerClosing() {
-    if (this.presenceManager) {
-      this._cancelThrottle();
-      this.presenceManager.publish(CLOSED, this.whisper);
-    }
+    this._cancelThrottle();
+    this.presenceManager.publish(CLOSED, this.whisper);
   },
 
   _cancelThrottle() {
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
index 1f8ec4d27a..bedb292144 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
@@ -11,11 +11,11 @@ export default Component.extend({
 
   @on("didInsertElement")
   subscribe() {
-    this.presenceManager && this.presenceManager.subscribe();
+    this.presenceManager.subscribe();
   },
 
   @on("willDestroyElement")
   _destroyed() {
-    this.presenceManager && this.presenceManager.unsubscribe();
+    this.presenceManager.unsubscribe();
   }
 });
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/lib/presence-manager.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/lib/presence-manager.js.es6
index fe5c1bd6b6..5943f76ce5 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/lib/presence-manager.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/lib/presence-manager.js.es6
@@ -97,6 +97,8 @@ const PresenceManager = EmberObject.extend({
   },
 
   publish(state, whisper, postId) {
+    if (this.get("currentUser.hide_profile_and_presence")) return;
+
     const data = {
       state,
       topic_id: this.get("topic.id")
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6
index 00fbc34d91..0240e68027 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6
@@ -1,5 +1,9 @@
 export default {
-  shouldRender(_, ctx) {
-    return ctx.siteSettings.presence_enabled;
+  shouldRender(args, component) {
+    return (
+      component.siteSettings.presence_enabled &&
+      args.model.topic &&
+      args.model.topic.presenceManager
+    );
   }
 };
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.js.es6
index 00fbc34d91..db452d54c7 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.js.es6
@@ -1,5 +1,7 @@
 export default {
-  shouldRender(_, ctx) {
-    return ctx.siteSettings.presence_enabled;
+  shouldRender(args, component) {
+    return (
+      component.siteSettings.presence_enabled && args.model.presenceManager
+    );
   }
 };
diff --git a/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6 b/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6
index 27a7252426..98ec813198 100644
--- a/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6
@@ -6,7 +6,7 @@ function initializeDiscoursePresence(api) {
   const currentUser = api.getCurrentUser();
   const siteSettings = api.container.lookup("site-settings:main");
 
-  if (currentUser && !currentUser.hide_profile_and_presence) {
+  if (currentUser) {
     api.modifyClass("model:topic", {
       presenceManager: null
     });

From 0a85a7aef9f5194b7e00b75bfe8b84c2376f0c65 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 29 Apr 2020 12:09:50 +0300
Subject: [PATCH 0852/1830] FEATURE: Add user_profile to user_archive CSV
 export (#9571)

---
 app/jobs/regular/export_csv_file.rb | 93 +++++++++++++++++++++--------
 spec/jobs/export_csv_file_spec.rb   |  7 +++
 2 files changed, 74 insertions(+), 26 deletions(-)

diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index 6092fb1a65..e8138d06c7 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -13,6 +13,7 @@ module Jobs
 
     HEADER_ATTRS_FOR ||= HashWithIndifferentAccess.new(
       user_archive: ['topic_title', 'categories', 'is_pm', 'post', 'like_count', 'reply_count', 'url', 'created_at'],
+      user_archive_profile: ['loncation', 'website', 'bio', 'views'],
       user_list: ['id', 'name', 'username', 'email', 'title', 'created_at', 'last_seen_at', 'last_posted_at', 'last_emailed_at', 'trust_level', 'approved', 'suspended_at', 'suspended_till', 'silenced_till', 'active', 'admin', 'moderator', 'ip_address', 'staged', 'secondary_emails'],
       user_stats: ['topics_entered', 'posts_read_count', 'time_read', 'topic_count', 'post_count', 'likes_given', 'likes_received'],
       user_profile: ['location', 'website', 'views'],
@@ -29,49 +30,61 @@ module Jobs
       @extra = HashWithIndifferentAccess.new(args[:args]) if args[:args]
       @current_user = User.find_by(id: args[:user_id])
 
-      export_method = :"#{@entity}_export"
-      raise Discourse::InvalidParameters.new(:entity) unless respond_to?(export_method)
+      entities = [{ name: @entity }]
+      entities << { name: "user_archive_profile" } if @entity === "user_archive"
 
-      file_name_prefix = if @entity == "user_archive"
-        "#{@entity.split('_').join('-')}-#{@current_user.username}-#{Time.now.strftime("%y%m%d-%H%M%S")}"
-      elsif @entity == "report" && @extra[:name].present?
-        "#{@extra[:name].split('_').join('-')}-#{Time.now.strftime("%y%m%d-%H%M%S")}"
-      else
-        "#{@entity.split('_').join('-')}-#{Time.now.strftime("%y%m%d-%H%M%S")}"
+      entities.each do |entity|
+        entity[:method] = :"#{entity[:name]}_export"
+        raise Discourse::InvalidParameters.new(:entity) unless respond_to?(entity[:method])
+
+        @timestamp ||= Time.now.strftime("%y%m%d-%H%M%S")
+        entity[:filename] =
+          if entity[:name] == "user_archive" || entity[:name] === "user_archive_profile"
+            "#{entity[:name].dasherize}-#{@current_user.username}-#{@timestamp}"
+          elsif entity[:name] == "report" && @extra[:name].present?
+            "#{@extra[:name].dasherize}-#{@timestamp}"
+          else
+            "#{entity[:name].dasherize}-#{@timestamp}"
+          end
       end
 
       export_title = if @entity == "report" && @extra[:name].present?
         I18n.t("reports.#{@extra[:name]}.title")
       else
-        @entity.split('_').join(' ').titleize
+        @entity.gsub('_', ' ').titleize
       end
 
-      user_export = UserExport.create(file_name: file_name_prefix, user_id: @current_user.id)
-      file_name = "#{file_name_prefix}-#{user_export.id}.csv"
-      absolute_path = "#{UserExport.base_directory}/#{file_name}"
+      filename = entities[0][:filename] # use first entity as a name for this export
+      user_export = UserExport.create(file_name: filename, user_id: @current_user.id)
+
+      filename = "#{filename}-#{user_export.id}"
+      dirname = "#{UserExport.base_directory}/#{filename}"
 
       # ensure directory exists
-      FileUtils.mkdir_p(UserExport.base_directory) unless Dir.exists?(UserExport.base_directory)
+      FileUtils.mkdir_p(dirname) unless Dir.exists?(dirname)
 
       # Generate a compressed CSV file
       begin
-        CSV.open(absolute_path, "w") do |csv|
-          csv << get_header if @entity != "report"
-          public_send(export_method).each { |d| csv << d }
+        entities.each do |entity|
+          CSV.open("#{dirname}/#{entity[:filename]}.csv", "w") do |csv|
+            csv << get_header(entity[:name]) if entity[:name] != "report"
+            public_send(entity[:method]).each { |d| csv << d }
+          end
         end
-        compressed_file_path = Compression::Zip.new.compress(UserExport.base_directory, file_name)
+
+        zip_filename = Compression::Zip.new.compress(UserExport.base_directory, filename)
       ensure
-        File.delete(absolute_path)
+        FileUtils.rm_rf(dirname)
       end
 
       # create upload
       upload = nil
 
-      if File.exist?(compressed_file_path)
-        File.open(compressed_file_path) do |file|
+      if File.exist?(zip_filename)
+        File.open(zip_filename) do |file|
           upload = UploadCreator.new(
             file,
-            File.basename(compressed_file_path),
+            File.basename(zip_filename),
             type: 'csv_export',
             for_export: 'true'
           ).create_for(@current_user.id)
@@ -79,11 +92,11 @@ module Jobs
           if upload.persisted?
             user_export.update_columns(upload_id: upload.id)
           else
-            Rails.logger.warn("Failed to upload the file #{compressed_file_path}")
+            Rails.logger.warn("Failed to upload the file #{zip_filename}")
           end
         end
 
-        File.delete(compressed_file_path)
+        File.delete(zip_filename)
       end
     ensure
       post = notify_user(upload, export_title)
@@ -108,6 +121,17 @@ module Jobs
       end
     end
 
+    def user_archive_profile_export
+      return enum_for(:user_archive_profile_export) unless block_given?
+
+      UserProfile
+        .where(user_id: @current_user.id)
+        .select(:location, :website, :bio_raw, :views)
+        .each do |user_profile|
+        yield get_user_archive_profile_fields(user_profile)
+      end
+    end
+
     def user_list_export
       return enum_for(:user_list_export) unless block_given?
 
@@ -234,8 +258,8 @@ module Jobs
       data.each { |row| yield row.values_at(*header).map(&:to_s) }
     end
 
-    def get_header
-      if @entity == 'user_list'
+    def get_header(entity)
+      if entity == 'user_list'
         header_array = HEADER_ATTRS_FOR['user_list'] + HEADER_ATTRS_FOR['user_stats'] + HEADER_ATTRS_FOR['user_profile']
         header_array.concat(HEADER_ATTRS_FOR['user_sso']) if SiteSetting.enable_sso
         user_custom_fields = UserField.all
@@ -246,7 +270,7 @@ module Jobs
         end
         header_array.push("group_names")
       else
-        header_array = HEADER_ATTRS_FOR[@entity]
+        header_array = HEADER_ATTRS_FOR[entity]
       end
 
       header_array
@@ -348,6 +372,23 @@ module Jobs
       user_archive_array
     end
 
+    def get_user_archive_profile_fields(user_profile)
+      user_archive_profile = []
+
+      HEADER_ATTRS_FOR['user_archive_profile'].each do |attr|
+        data =
+          if attr == 'bio'
+            user_profile.attributes['bio_raw']
+          else
+            user_profile.attributes[attr]
+          end
+
+          user_archive_profile.push(data)
+      end
+
+      user_archive_profile
+    end
+
     def get_staff_action_fields(staff_action)
       staff_action_array = []
 
diff --git a/spec/jobs/export_csv_file_spec.rb b/spec/jobs/export_csv_file_spec.rb
index 8322265a72..9182f9f37d 100644
--- a/spec/jobs/export_csv_file_spec.rb
+++ b/spec/jobs/export_csv_file_spec.rb
@@ -36,6 +36,13 @@ describe Jobs::ExportCsvFile do
 
         expect(system_message.id).to eq(UserExport.last.topic_id)
         expect(system_message.closed).to eq(true)
+
+        files = []
+        Zip::File.open(Discourse.store.path_for(upload)) do |zip_file|
+          zip_file.each { |entry| files << entry.name }
+        end
+
+        expect(files.size).to eq(2)
       ensure
         user.uploads.each(&:destroy!)
       end

From 7a946b9f5cd1c86cc8cd1b4999c0c7fbee977036 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 29 Apr 2020 12:38:36 +0300
Subject: [PATCH 0853/1830] DEV: Fix typo

Follow-up to 0a85a7aef9f5194b7e00b75bfe8b84c2376f0c65.
---
 app/jobs/regular/export_csv_file.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index e8138d06c7..9485fc2fdc 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -13,7 +13,7 @@ module Jobs
 
     HEADER_ATTRS_FOR ||= HashWithIndifferentAccess.new(
       user_archive: ['topic_title', 'categories', 'is_pm', 'post', 'like_count', 'reply_count', 'url', 'created_at'],
-      user_archive_profile: ['loncation', 'website', 'bio', 'views'],
+      user_archive_profile: ['location', 'website', 'bio', 'views'],
       user_list: ['id', 'name', 'username', 'email', 'title', 'created_at', 'last_seen_at', 'last_posted_at', 'last_emailed_at', 'trust_level', 'approved', 'suspended_at', 'suspended_till', 'silenced_till', 'active', 'admin', 'moderator', 'ip_address', 'staged', 'secondary_emails'],
       user_stats: ['topics_entered', 'posts_read_count', 'time_read', 'topic_count', 'post_count', 'likes_given', 'likes_received'],
       user_profile: ['location', 'website', 'views'],

From 4eed86919eae50216e6faafa18ae0bb626ffe92a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 29 Apr 2020 13:30:34 +0200
Subject: [PATCH 0854/1830] FIX: ensures card cloak is removed (#9582)

Repro steps for current failure:
- use mobile view
- click on a different user avatar to show user card
- click message
- close composer
- cloak is still showing and prevents any click
---
 .../discourse/app/components/group-card-contents.js           | 4 ++--
 .../discourse/app/components/user-card-contents.js            | 4 ++--
 .../javascripts/discourse/app/mixins/card-contents-base.js    | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/group-card-contents.js b/app/assets/javascripts/discourse/app/components/group-card-contents.js
index 71884696fb..c4aafe5df4 100644
--- a/app/assets/javascripts/discourse/app/components/group-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/group-card-contents.js
@@ -65,9 +65,9 @@ export default Component.extend(CardContentsBase, CleansUp, {
   },
 
   _close() {
-    this._super(...arguments);
-
     this.set("group", null);
+
+    this._super(...arguments);
   },
 
   cleanUp() {
diff --git a/app/assets/javascripts/discourse/app/components/user-card-contents.js b/app/assets/javascripts/discourse/app/components/user-card-contents.js
index b4f0e5cf4b..629545601a 100644
--- a/app/assets/javascripts/discourse/app/components/user-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/user-card-contents.js
@@ -177,12 +177,12 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
   },
 
   _close() {
-    this._super(...arguments);
-
     this.setProperties({
       user: null,
       topicPostCount: null
     });
+
+    this._super(...arguments);
   },
 
   cleanUp() {
diff --git a/app/assets/javascripts/discourse/app/mixins/card-contents-base.js b/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
index 2f53c5276f..b1aeb853dd 100644
--- a/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
+++ b/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
@@ -280,6 +280,8 @@ export default Mixin.create({
     if (this.site.mobileView) {
       this._unbindMobileScroll();
     }
+
+    this._hide();
   },
 
   willDestroyElement() {

From 6a9a7b56df2aa708624838d11fc602a4c13d5012 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 29 Apr 2020 12:55:30 +0100
Subject: [PATCH 0855/1830] DEV: Bump Hashie and Faraday (#9583)

These were previously pinned due to a dependency in the zendesk plugin. That has now been resolved.
---
 Gemfile      | 7 -------
 Gemfile.lock | 6 ++----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 925f81b86a..2b1fb36f22 100644
--- a/Gemfile
+++ b/Gemfile
@@ -257,10 +257,3 @@ end
 gem 'webpush', require: false
 gem 'colored2', require: false
 gem 'maxminddb'
-
-# These are not direct dependencies, but we need to restrict
-# versions for compatibility with https://github.com/discourse/discourse-zendesk-plugin
-# These restrictions can be removed once the zendesk_api gem is updated
-# for newer versions of hashie and faraday
-gem 'hashie', '< 4.0.0', require: false # https://github.com/zendesk/zendesk_api_client_rb/pull/422
-gem 'faraday', '< 1.0.0', require: false # https://github.com/zendesk/zendesk_api_client_rb/pull/421
diff --git a/Gemfile.lock b/Gemfile.lock
index 7cb6c2ef68..5fc2845215 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -126,7 +126,7 @@ GEM
     exifr (1.3.6)
     fabrication (2.21.1)
     fakeweb (1.3.0)
-    faraday (0.17.3)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     fast_blank (1.0.0)
     fast_xor (1.1.3)
@@ -142,7 +142,7 @@ GEM
       activesupport (>= 4.2.0)
     guess_html_encoding (0.0.11)
     hashdiff (1.0.1)
-    hashie (3.6.0)
+    hashie (4.1.0)
     highline (1.7.10)
     hkdf (0.3.0)
     htmlentities (4.3.4)
@@ -463,14 +463,12 @@ DEPENDENCIES
   execjs
   fabrication
   fakeweb
-  faraday (< 1.0.0)
   fast_blank
   fast_xor
   fast_xs
   fastimage
   flamegraph
   gc_tracer
-  hashie (< 4.0.0)
   highline (~> 1.7.0)
   htmlentities
   http_accept_language

From 7ccfc73edb2d61bf39649db70fdc16679d8fc056 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 29 Apr 2020 12:58:52 +0100
Subject: [PATCH 0856/1830] Build(deps): Bump rqrcode_core from 0.1.1 to 0.1.2
 (#9244)

Bumps [rqrcode_core](https://github.com/whomwah/rqrcode_core) from 0.1.1 to 0.1.2.
- [Release notes](https://github.com/whomwah/rqrcode_core/releases)
- [Commits](https://github.com/whomwah/rqrcode_core/commits)
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5fc2845215..16c9ff407e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -314,7 +314,7 @@ GEM
     rqrcode (1.1.2)
       chunky_png (~> 1.0)
       rqrcode_core (~> 0.1)
-    rqrcode_core (0.1.1)
+    rqrcode_core (0.1.2)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)

From db337b10ee2af66f464082ca24bb33536da5fbde Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 29 Apr 2020 16:24:53 +0200
Subject: [PATCH 0857/1830] FIX: correctly hides timeline scroller for short
 posts (#9581)

* FIX: correctly hides timeline scroller for short posts

* fix linting
---
 .../discourse/app/mixins/docking.js           |  5 +-
 .../discourse/app/widgets/topic-timeline.js   | 64 +++++++++++--------
 2 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/mixins/docking.js b/app/assets/javascripts/discourse/app/mixins/docking.js
index 3df9f80eda..63e40aa032 100644
--- a/app/assets/javascripts/discourse/app/mixins/docking.js
+++ b/app/assets/javascripts/discourse/app/mixins/docking.js
@@ -1,5 +1,5 @@
 import Mixin from "@ember/object/mixin";
-import { debounce } from "@ember/runloop";
+import { later, debounce } from "@ember/runloop";
 
 const helper = {
   offset() {
@@ -32,7 +32,8 @@ export default Mixin.create({
     $(window).bind("scroll.discourse-dock", this.queueDockCheck);
     $(document).bind("touchmove.discourse-dock", this.queueDockCheck);
 
-    this.dockCheck(helper);
+    // dockCheck might happen too early on full page refresh
+    later(this, this.safeDockCheck, 50);
   },
 
   willDestroyElement() {
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-timeline.js b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
index 5f3cabfb8e..b74f691bfb 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
@@ -518,32 +518,46 @@ export default createWidget("topic-timeline", {
 
     result.push(this.attach("timeline-controls", attrs));
 
-    const bottomAge = relativeAge(new Date(topic.last_posted_at), {
-      addAgo: true,
-      defaultFormat: timelineDate
-    });
-    let scroller = [
-      h(
-        "div.timeline-date-wrapper",
-        this.attach("link", {
-          className: "start-date",
-          rawLabel: timelineDate(createdAt),
-          action: "jumpTop"
-        })
-      ),
-      this.attach("timeline-scrollarea", attrs),
-      h(
-        "div.timeline-date-wrapper",
-        this.attach("link", {
-          className: "now-date",
-          rawLabel: bottomAge,
-          action: "jumpBottom"
-        })
-      )
-    ];
+    let displayTimeLineScrollArea = true;
+    if (!attrs.mobileView) {
+      const streamLength = attrs.topic.get("postStream.stream.length");
 
-    result.push(h("div.timeline-scrollarea-wrapper", scroller));
-    result.push(this.attach("timeline-footer-controls", attrs));
+      if (streamLength < 2) {
+        const postsWrapper = document.querySelector(".posts-wrapper");
+        if (postsWrapper && postsWrapper.offsetHeight < 1000) {
+          displayTimeLineScrollArea = false;
+        }
+      }
+    }
+
+    if (displayTimeLineScrollArea) {
+      const bottomAge = relativeAge(new Date(topic.last_posted_at), {
+        addAgo: true,
+        defaultFormat: timelineDate
+      });
+      let scroller = [
+        h(
+          "div.timeline-date-wrapper",
+          this.attach("link", {
+            className: "start-date",
+            rawLabel: timelineDate(createdAt),
+            action: "jumpTop"
+          })
+        ),
+        this.attach("timeline-scrollarea", attrs),
+        h(
+          "div.timeline-date-wrapper",
+          this.attach("link", {
+            className: "now-date",
+            rawLabel: bottomAge,
+            action: "jumpBottom"
+          })
+        )
+      ];
+
+      result.push(h("div.timeline-scrollarea-wrapper", scroller));
+      result.push(this.attach("timeline-footer-controls", attrs));
+    }
 
     return result;
   }

From 9dccf4f3b84bdff7e79af39399d0a9ecfecabe1d Mon Sep 17 00:00:00 2001
From: Joshua Rosenfeld <jomaxro@discourse.org>
Date: Wed, 29 Apr 2020 10:37:06 -0400
Subject: [PATCH 0858/1830] FIX: Copyedit for "You were logged out" modal
 (#9584)

See https://meta.discourse.org/t/-/149596
---
 app/assets/javascripts/discourse/app/initializers/logout.js | 2 +-
 config/locales/client.en.yml                                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/initializers/logout.js b/app/assets/javascripts/discourse/app/initializers/logout.js
index 571057ca83..067dd1e538 100644
--- a/app/assets/javascripts/discourse/app/initializers/logout.js
+++ b/app/assets/javascripts/discourse/app/initializers/logout.js
@@ -21,7 +21,7 @@ export default {
         bootbox.dialog(
           I18n.t("logout"),
           {
-            label: I18n.t("refresh"),
+            label: I18n.t("home"),
             callback: logout
           },
           {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index cc828b2a0e..da09ba9c9e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1398,6 +1398,7 @@ en:
     assets_changed_confirm: "This site was just updated. Refresh now for the latest version?"
     logout: "You were logged out."
     refresh: "Refresh"
+    home: "Home"
     read_only_mode:
       enabled: "This site is in read only mode. Please continue to browse, but replying, likes, and other actions are disabled for now."
       login_disabled: "Login is disabled while the site is in read only mode."

From 3ec21b4124954dc57c872766fbafc95c9c708de1 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 29 Apr 2020 10:56:44 -0400
Subject: [PATCH 0859/1830] SECURITY: Update onebox to add rel="noopener"

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 16c9ff407e..f561205552 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -241,7 +241,7 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.9.27.1)
+    onebox (1.9.27.2)
       addressable (~> 2.7.0)
       htmlentities (~> 4.3)
       multi_json (~> 1.11)

From cbb27241c428781eff06239e73ec03d5b7b24432 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 29 Apr 2020 12:18:21 -0400
Subject: [PATCH 0860/1830] DEV: Make `discourse-common` an Ember addon.
 (#9578)

This is to help with the migration to Ember CLI. In the current running
version of Discourse everything should be the same as before, just with
a few extra files that are not used. However, using Ember CLI this can
be installed as an Ember addon.

Co-Authored-By: Jarek Radosz <jradosz@gmail.com>
---
 .git-blame-ignore-revs                        |     3 -
 app/assets/javascripts/application.js         |     2 +-
 .../discourse-common/addon/.gitkeep           |     0
 .../addon/config/environment.js               |     3 +
 .../{ => addon}/helpers/bound-i18n.js         |     0
 .../helpers/component-for-collection.js       |     0
 .../{ => addon}/helpers/component-for-row.js  |     0
 .../{ => addon}/helpers/d-icon.js             |     0
 .../{ => addon}/helpers/fa-icon.js            |     0
 .../{ => addon}/helpers/get-url.js            |     0
 .../{ => addon}/helpers/html-safe.js          |     0
 .../{ => addon}/helpers/i18n.js               |     0
 .../{ => addon}/helpers/popular-themes.js     |     0
 .../{ => addon}/lib/attribute-hook.js         |     0
 .../{ => addon}/lib/deprecated.js             |     0
 .../{ => addon}/lib/get-owner.js              |     0
 .../{ => addon}/lib/get-url.js                |     0
 .../{ => addon}/lib/helpers.js                |     0
 .../{ => addon}/lib/icon-library.js           |     0
 .../{ => addon}/lib/raw-handlebars-helpers.js |     0
 .../{ => addon}/lib/raw-handlebars.js         |     0
 .../{ => addon}/mixins/focus-event.js         |     0
 .../discourse-common/{ => addon}/resolver.js  |     0
 .../{ => addon}/utils/decorator-alias.js      |     0
 .../{ => addon}/utils/decorators.js           |     0
 .../{ => addon}/utils/extract-value.js        |     0
 .../{ => addon}/utils/handle-descriptor.js    |     0
 .../{ => addon}/utils/is-descriptor.js        |     0
 .../{ => addon}/utils/macro-alias.js          |     0
 .../javascripts/discourse-common/app/.gitkeep |     0
 .../discourse-common/config/ember-try.js      |    89 +
 .../discourse-common/config/environment.js    |     6 +-
 .../discourse-common/ember-cli-build.js       |     9 +
 .../javascripts/discourse-common/index.js     |     5 +
 .../javascripts/discourse-common/package.json |    54 +
 .../discourse-common/vendor/.gitkeep          |     0
 .../javascripts/discourse-common/yarn.lock    | 10485 ++++++++++++++++
 app/assets/javascripts/wizard-application.js  |     3 +-
 lib/discourse_js_processor.rb                 |     2 +-
 lib/freedom_patches/raw_handlebars.rb         |     2 +-
 package.json                                  |     2 +-
 41 files changed, 10654 insertions(+), 11 deletions(-)
 create mode 100644 app/assets/javascripts/discourse-common/addon/.gitkeep
 create mode 100644 app/assets/javascripts/discourse-common/addon/config/environment.js
 rename app/assets/javascripts/discourse-common/{ => addon}/helpers/bound-i18n.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/helpers/component-for-collection.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/helpers/component-for-row.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/helpers/d-icon.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/helpers/fa-icon.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/helpers/get-url.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/helpers/html-safe.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/helpers/i18n.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/helpers/popular-themes.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/lib/attribute-hook.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/lib/deprecated.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/lib/get-owner.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/lib/get-url.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/lib/helpers.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/lib/icon-library.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/lib/raw-handlebars-helpers.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/lib/raw-handlebars.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/mixins/focus-event.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/resolver.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/utils/decorator-alias.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/utils/decorators.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/utils/extract-value.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/utils/handle-descriptor.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/utils/is-descriptor.js (100%)
 rename app/assets/javascripts/discourse-common/{ => addon}/utils/macro-alias.js (100%)
 create mode 100644 app/assets/javascripts/discourse-common/app/.gitkeep
 create mode 100644 app/assets/javascripts/discourse-common/config/ember-try.js
 create mode 100644 app/assets/javascripts/discourse-common/ember-cli-build.js
 create mode 100644 app/assets/javascripts/discourse-common/index.js
 create mode 100644 app/assets/javascripts/discourse-common/package.json
 create mode 100644 app/assets/javascripts/discourse-common/vendor/.gitkeep
 create mode 100644 app/assets/javascripts/discourse-common/yarn.lock

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 81d5a2fff5..e848bdcf4c 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -23,9 +23,6 @@ acc5cbdf8ecb9293a0fa9474ee73baf499c02428
 # Rename wizard from es6 -> js
 1ac02422011f89716ab27250d39b0e0212e03892
 
-# Rename discourse-common es6 -> js
-167503ca4824e37a2e93d74b3f50271556d0ba8e
-
 # Rename some root files
 11938d58d4b1bea1ff43306450da7b24f05db0a
 
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 86d34b4a82..489768d27d 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,4 +1,4 @@
-//= require_tree ./discourse-common
+//= require_tree ./discourse-common/addon
 //= require ./polyfills
 //= require_tree ./select-kit
 //= require ./discourse/app/app
diff --git a/app/assets/javascripts/discourse-common/addon/.gitkeep b/app/assets/javascripts/discourse-common/addon/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/discourse-common/addon/config/environment.js b/app/assets/javascripts/discourse-common/addon/config/environment.js
new file mode 100644
index 0000000000..18ce3cc976
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/addon/config/environment.js
@@ -0,0 +1,3 @@
+export const INPUT_DELAY = 250;
+
+export default { environment: Ember.testing ? "test" : "development" };
diff --git a/app/assets/javascripts/discourse-common/helpers/bound-i18n.js b/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/bound-i18n.js
rename to app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js
diff --git a/app/assets/javascripts/discourse-common/helpers/component-for-collection.js b/app/assets/javascripts/discourse-common/addon/helpers/component-for-collection.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/component-for-collection.js
rename to app/assets/javascripts/discourse-common/addon/helpers/component-for-collection.js
diff --git a/app/assets/javascripts/discourse-common/helpers/component-for-row.js b/app/assets/javascripts/discourse-common/addon/helpers/component-for-row.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/component-for-row.js
rename to app/assets/javascripts/discourse-common/addon/helpers/component-for-row.js
diff --git a/app/assets/javascripts/discourse-common/helpers/d-icon.js b/app/assets/javascripts/discourse-common/addon/helpers/d-icon.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/d-icon.js
rename to app/assets/javascripts/discourse-common/addon/helpers/d-icon.js
diff --git a/app/assets/javascripts/discourse-common/helpers/fa-icon.js b/app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/fa-icon.js
rename to app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js
diff --git a/app/assets/javascripts/discourse-common/helpers/get-url.js b/app/assets/javascripts/discourse-common/addon/helpers/get-url.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/get-url.js
rename to app/assets/javascripts/discourse-common/addon/helpers/get-url.js
diff --git a/app/assets/javascripts/discourse-common/helpers/html-safe.js b/app/assets/javascripts/discourse-common/addon/helpers/html-safe.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/html-safe.js
rename to app/assets/javascripts/discourse-common/addon/helpers/html-safe.js
diff --git a/app/assets/javascripts/discourse-common/helpers/i18n.js b/app/assets/javascripts/discourse-common/addon/helpers/i18n.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/i18n.js
rename to app/assets/javascripts/discourse-common/addon/helpers/i18n.js
diff --git a/app/assets/javascripts/discourse-common/helpers/popular-themes.js b/app/assets/javascripts/discourse-common/addon/helpers/popular-themes.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/helpers/popular-themes.js
rename to app/assets/javascripts/discourse-common/addon/helpers/popular-themes.js
diff --git a/app/assets/javascripts/discourse-common/lib/attribute-hook.js b/app/assets/javascripts/discourse-common/addon/lib/attribute-hook.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/attribute-hook.js
rename to app/assets/javascripts/discourse-common/addon/lib/attribute-hook.js
diff --git a/app/assets/javascripts/discourse-common/lib/deprecated.js b/app/assets/javascripts/discourse-common/addon/lib/deprecated.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/deprecated.js
rename to app/assets/javascripts/discourse-common/addon/lib/deprecated.js
diff --git a/app/assets/javascripts/discourse-common/lib/get-owner.js b/app/assets/javascripts/discourse-common/addon/lib/get-owner.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/get-owner.js
rename to app/assets/javascripts/discourse-common/addon/lib/get-owner.js
diff --git a/app/assets/javascripts/discourse-common/lib/get-url.js b/app/assets/javascripts/discourse-common/addon/lib/get-url.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/get-url.js
rename to app/assets/javascripts/discourse-common/addon/lib/get-url.js
diff --git a/app/assets/javascripts/discourse-common/lib/helpers.js b/app/assets/javascripts/discourse-common/addon/lib/helpers.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/helpers.js
rename to app/assets/javascripts/discourse-common/addon/lib/helpers.js
diff --git a/app/assets/javascripts/discourse-common/lib/icon-library.js b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/icon-library.js
rename to app/assets/javascripts/discourse-common/addon/lib/icon-library.js
diff --git a/app/assets/javascripts/discourse-common/lib/raw-handlebars-helpers.js b/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars-helpers.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/raw-handlebars-helpers.js
rename to app/assets/javascripts/discourse-common/addon/lib/raw-handlebars-helpers.js
diff --git a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js b/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/lib/raw-handlebars.js
rename to app/assets/javascripts/discourse-common/addon/lib/raw-handlebars.js
diff --git a/app/assets/javascripts/discourse-common/mixins/focus-event.js b/app/assets/javascripts/discourse-common/addon/mixins/focus-event.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/mixins/focus-event.js
rename to app/assets/javascripts/discourse-common/addon/mixins/focus-event.js
diff --git a/app/assets/javascripts/discourse-common/resolver.js b/app/assets/javascripts/discourse-common/addon/resolver.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/resolver.js
rename to app/assets/javascripts/discourse-common/addon/resolver.js
diff --git a/app/assets/javascripts/discourse-common/utils/decorator-alias.js b/app/assets/javascripts/discourse-common/addon/utils/decorator-alias.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/utils/decorator-alias.js
rename to app/assets/javascripts/discourse-common/addon/utils/decorator-alias.js
diff --git a/app/assets/javascripts/discourse-common/utils/decorators.js b/app/assets/javascripts/discourse-common/addon/utils/decorators.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/utils/decorators.js
rename to app/assets/javascripts/discourse-common/addon/utils/decorators.js
diff --git a/app/assets/javascripts/discourse-common/utils/extract-value.js b/app/assets/javascripts/discourse-common/addon/utils/extract-value.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/utils/extract-value.js
rename to app/assets/javascripts/discourse-common/addon/utils/extract-value.js
diff --git a/app/assets/javascripts/discourse-common/utils/handle-descriptor.js b/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/utils/handle-descriptor.js
rename to app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js
diff --git a/app/assets/javascripts/discourse-common/utils/is-descriptor.js b/app/assets/javascripts/discourse-common/addon/utils/is-descriptor.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/utils/is-descriptor.js
rename to app/assets/javascripts/discourse-common/addon/utils/is-descriptor.js
diff --git a/app/assets/javascripts/discourse-common/utils/macro-alias.js b/app/assets/javascripts/discourse-common/addon/utils/macro-alias.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/utils/macro-alias.js
rename to app/assets/javascripts/discourse-common/addon/utils/macro-alias.js
diff --git a/app/assets/javascripts/discourse-common/app/.gitkeep b/app/assets/javascripts/discourse-common/app/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/discourse-common/config/ember-try.js b/app/assets/javascripts/discourse-common/config/ember-try.js
new file mode 100644
index 0000000000..bcae42888f
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/config/ember-try.js
@@ -0,0 +1,89 @@
+"use strict";
+
+const getChannelURL = require("ember-source-channel-url");
+
+module.exports = async function() {
+  return {
+    useYarn: true,
+    scenarios: [
+      {
+        name: "ember-lts-3.8",
+        npm: {
+          devDependencies: {
+            "ember-source": "~3.8.0"
+          }
+        }
+      },
+      {
+        name: "ember-lts-3.12",
+        npm: {
+          devDependencies: {
+            "ember-source": "~3.12.0"
+          }
+        }
+      },
+      {
+        name: "ember-release",
+        npm: {
+          devDependencies: {
+            "ember-source": await getChannelURL("release")
+          }
+        }
+      },
+      {
+        name: "ember-beta",
+        npm: {
+          devDependencies: {
+            "ember-source": await getChannelURL("beta")
+          }
+        }
+      },
+      {
+        name: "ember-canary",
+        npm: {
+          devDependencies: {
+            "ember-source": await getChannelURL("canary")
+          }
+        }
+      },
+      // The default `.travis.yml` runs this scenario via `yarn test`,
+      // not via `ember try`. It's still included here so that running
+      // `ember try:each` manually or from a customized CI config will run it
+      // along with all the other scenarios.
+      {
+        name: "ember-default",
+        npm: {
+          devDependencies: {}
+        }
+      },
+      {
+        name: "ember-default-with-jquery",
+        env: {
+          EMBER_OPTIONAL_FEATURES: JSON.stringify({
+            "jquery-integration": true
+          })
+        },
+        npm: {
+          devDependencies: {
+            "@ember/jquery": "^0.5.1"
+          }
+        }
+      },
+      {
+        name: "ember-classic",
+        env: {
+          EMBER_OPTIONAL_FEATURES: JSON.stringify({
+            "application-template-wrapper": true,
+            "default-async-observers": false,
+            "template-only-glimmer-components": false
+          })
+        },
+        npm: {
+          ember: {
+            edition: "classic"
+          }
+        }
+      }
+    ]
+  };
+};
diff --git a/app/assets/javascripts/discourse-common/config/environment.js b/app/assets/javascripts/discourse-common/config/environment.js
index 18ce3cc976..352093f4ed 100644
--- a/app/assets/javascripts/discourse-common/config/environment.js
+++ b/app/assets/javascripts/discourse-common/config/environment.js
@@ -1,3 +1,5 @@
-export const INPUT_DELAY = 250;
+"use strict";
 
-export default { environment: Ember.testing ? "test" : "development" };
+module.exports = function(/* environment, appConfig */) {
+  return {};
+};
diff --git a/app/assets/javascripts/discourse-common/ember-cli-build.js b/app/assets/javascripts/discourse-common/ember-cli-build.js
new file mode 100644
index 0000000000..cbf921270c
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/ember-cli-build.js
@@ -0,0 +1,9 @@
+"use strict";
+
+const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");
+
+module.exports = function(defaults) {
+  let app = new EmberAddon(defaults, {});
+
+  return app.toTree();
+};
diff --git a/app/assets/javascripts/discourse-common/index.js b/app/assets/javascripts/discourse-common/index.js
new file mode 100644
index 0000000000..e8db57f915
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/index.js
@@ -0,0 +1,5 @@
+"use strict";
+
+module.exports = {
+  name: require("./package").name
+};
diff --git a/app/assets/javascripts/discourse-common/package.json b/app/assets/javascripts/discourse-common/package.json
new file mode 100644
index 0000000000..f56ec8cce4
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/package.json
@@ -0,0 +1,54 @@
+{
+  "name": "discourse-common",
+  "version": "1.0.0",
+  "description": "Shared code between discourse apps",
+  "author": "Discourse",
+  "license": "GPLv2",
+  "keywords": [
+    "ember-addon"
+  ],
+  "repository": "",
+  "license": "",
+  "author": "",
+  "scripts": {
+    "build": "ember build",
+    "lint:hbs": "ember-template-lint .",
+    "lint:js": "eslint .",
+    "start": "ember serve"
+  },
+  "dependencies": {
+    "ember-cli-babel": "^7.13.0",
+    "ember-cli-htmlbars": "^4.2.0"
+  },
+  "devDependencies": {
+    "@ember/optional-features": "^1.1.0",
+    "@glimmer/component": "^1.0.0",
+    "babel-eslint": "^10.0.3",
+    "broccoli-asset-rev": "^3.0.0",
+    "ember-auto-import": "^1.5.3",
+    "ember-cli": "~3.15.2",
+    "ember-cli-dependency-checker": "^3.2.0",
+    "ember-cli-eslint": "^5.1.0",
+    "ember-cli-inject-live-reload": "^2.0.1",
+    "ember-cli-sri": "^2.1.1",
+    "ember-cli-template-lint": "^1.0.0-beta.3",
+    "ember-cli-uglify": "^3.0.0",
+    "ember-disable-prototype-extensions": "^1.1.3",
+    "ember-export-application-global": "^2.0.1",
+    "ember-load-initializers": "^2.1.1",
+    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-resolver": "^7.0.0",
+    "ember-source": "~3.15.0",
+    "ember-source-channel-url": "^2.0.1",
+    "ember-try": "^1.4.0",
+    "eslint-plugin-ember": "^7.7.1",
+    "eslint-plugin-node": "^10.0.0",
+    "loader.js": "^4.7.0"
+  },
+  "engines": {
+    "node": "8.* || >= 10.*"
+  },
+  "ember": {
+    "edition": "octane"
+  }
+}
diff --git a/app/assets/javascripts/discourse-common/vendor/.gitkeep b/app/assets/javascripts/discourse-common/vendor/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/discourse-common/yarn.lock b/app/assets/javascripts/discourse-common/yarn.lock
new file mode 100644
index 0000000000..fc099710ca
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/yarn.lock
@@ -0,0 +1,10485 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
+  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
+  dependencies:
+    "@babel/highlight" "^7.8.3"
+
+"@babel/compat-data@^7.8.6", "@babel/compat-data@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz#04815556fc90b0c174abd2c0c1bb966faa036a6c"
+  integrity sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==
+  dependencies:
+    browserslist "^4.9.1"
+    invariant "^2.2.4"
+    semver "^5.5.0"
+
+"@babel/core@^7.1.6", "@babel/core@^7.2.2", "@babel/core@^7.3.4", "@babel/core@^7.7.2", "@babel/core@^7.8.3", "@babel/core@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
+  integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.9.0"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helpers" "^7.9.0"
+    "@babel/parser" "^7.9.0"
+    "@babel/template" "^7.8.6"
+    "@babel/traverse" "^7.9.0"
+    "@babel/types" "^7.9.0"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.2"
+    lodash "^4.17.13"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.9.0", "@babel/generator@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.5.tgz#27f0917741acc41e6eaaced6d68f96c3fa9afaf9"
+  integrity sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==
+  dependencies:
+    "@babel/types" "^7.9.5"
+    jsesc "^2.5.1"
+    lodash "^4.17.13"
+    source-map "^0.5.0"
+
+"@babel/helper-annotate-as-pure@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
+  integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
+  integrity sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-compilation-targets@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"
+  integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==
+  dependencies:
+    "@babel/compat-data" "^7.8.6"
+    browserslist "^4.9.1"
+    invariant "^2.2.4"
+    levenary "^1.1.1"
+    semver "^5.5.0"
+
+"@babel/helper-create-class-features-plugin@^7.5.5", "@babel/helper-create-class-features-plugin@^7.8.3":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.5.tgz#79753d44017806b481017f24b02fd4113c7106ea"
+  integrity sha512-IipaxGaQmW4TfWoXdqjY0TzoXQ1HRS0kPpEgvjosb3u7Uedcq297xFqDQiCcQtRRwzIMif+N1MLVI8C5a4/PAA==
+  dependencies:
+    "@babel/helper-function-name" "^7.9.5"
+    "@babel/helper-member-expression-to-functions" "^7.8.3"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+
+"@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
+  integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-regex" "^7.8.3"
+    regexpu-core "^4.7.0"
+
+"@babel/helper-define-map@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
+  integrity sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==
+  dependencies:
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/types" "^7.8.3"
+    lodash "^4.17.13"
+
+"@babel/helper-explode-assignable-expression@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
+  integrity sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==
+  dependencies:
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-function-name@^7.8.3", "@babel/helper-function-name@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
+  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/types" "^7.9.5"
+
+"@babel/helper-get-function-arity@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
+  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-hoist-variables@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
+  integrity sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-member-expression-to-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
+  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
+  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-module-transforms@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
+  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
+    "@babel/helper-simple-access" "^7.8.3"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/template" "^7.8.6"
+    "@babel/types" "^7.9.0"
+    lodash "^4.17.13"
+
+"@babel/helper-optimise-call-expression@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
+  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
+  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
+
+"@babel/helper-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
+  integrity sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==
+  dependencies:
+    lodash "^4.17.13"
+
+"@babel/helper-remap-async-to-generator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
+  integrity sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-wrap-function" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8"
+  integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.8.3"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/traverse" "^7.8.6"
+    "@babel/types" "^7.8.6"
+
+"@babel/helper-simple-access@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
+  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
+  dependencies:
+    "@babel/template" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-split-export-declaration@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
+  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
+  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
+
+"@babel/helper-wrap-function@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
+  integrity sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helpers@^7.9.0":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"
+  integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==
+  dependencies:
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.9.0"
+    "@babel/types" "^7.9.0"
+
+"@babel/highlight@^7.8.3":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
+  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.9.0"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.3.4", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
+  integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
+
+"@babel/plugin-proposal-async-generator-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
+  integrity sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
+
+"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e"
+  integrity sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-proposal-decorators@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz#2156860ab65c5abf068c3f67042184041066543e"
+  integrity sha512-e3RvdvS4qPJVTe288DlXjwKflpfy1hr0j5dz5WpIYYeP7vQZg2WfAEIp8k5/Lwis/m5REXEteIz6rrcDtXXG7w==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-decorators" "^7.8.3"
+
+"@babel/plugin-proposal-dynamic-import@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054"
+  integrity sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+
+"@babel/plugin-proposal-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
+  integrity sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
+  integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+
+"@babel/plugin-proposal-numeric-separator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
+  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+
+"@babel/plugin-proposal-object-rest-spread@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz#3fd65911306d8746014ec0d0cf78f0e39a149116"
+  integrity sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-transform-parameters" "^7.9.5"
+
+"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
+  integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+
+"@babel/plugin-proposal-optional-chaining@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
+  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
+  integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.8.8"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-async-generators@^7.8.0":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-decorators@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz#8d2c15a9f1af624b0025f961682a9d53d3001bda"
+  integrity sha512-8Hg4dNNT9/LcA1zQlfwuKR8BUc/if7Q7NkTam9sGTcJphLwpf2g4S42uhspQrIrR+dpzE0dtTqBVFoHl8GtnnQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-dynamic-import@^7.2.0", "@babel/plugin-syntax-dynamic-import@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
+  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-json-strings@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
+  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-object-rest-spread@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-catch-binding@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-chaining@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-top-level-await@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
+  integrity sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-typescript@^7.2.0", "@babel/plugin-syntax-typescript@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz#c1f659dda97711a569cef75275f7e15dcaa6cabc"
+  integrity sha512-GO1MQ/SGGGoiEXY0e0bSpHimJvxqB7lktLLIq2pv8xG7WZ8IMEle74jIe1FhprHBWjwjZtXHkycDLZXIWM5Wfg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-arrow-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
+  integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-async-to-generator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
+  integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-remap-async-to-generator" "^7.8.3"
+
+"@babel/plugin-transform-block-scoped-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
+  integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-block-scoping@^7.6.2", "@babel/plugin-transform-block-scoping@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
+  integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    lodash "^4.17.13"
+
+"@babel/plugin-transform-classes@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
+  integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-define-map" "^7.8.3"
+    "@babel/helper-function-name" "^7.9.5"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    globals "^11.1.0"
+
+"@babel/plugin-transform-computed-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
+  integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-destructuring@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
+  integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
+  integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-duplicate-keys@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
+  integrity sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-exponentiation-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
+  integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-for-of@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
+  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-function-name@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
+  integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
+  integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-member-expression-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
+  integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-modules-amd@^7.5.0", "@babel/plugin-transform-modules-amd@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz#19755ee721912cf5bb04c07d50280af3484efef4"
+  integrity sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    babel-plugin-dynamic-import-node "^2.3.0"
+
+"@babel/plugin-transform-modules-commonjs@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz#e3e72f4cbc9b4a260e30be0ea59bdf5a39748940"
+  integrity sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-simple-access" "^7.8.3"
+    babel-plugin-dynamic-import-node "^2.3.0"
+
+"@babel/plugin-transform-modules-systemjs@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz#e9fd46a296fc91e009b64e07ddaa86d6f0edeb90"
+  integrity sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    babel-plugin-dynamic-import-node "^2.3.0"
+
+"@babel/plugin-transform-modules-umd@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
+  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
+  integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+
+"@babel/plugin-transform-new-target@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
+  integrity sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-object-assign@^7.2.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.8.3.tgz#dc3b8dd50ef03837868a37b7df791f64f288538e"
+  integrity sha512-i3LuN8tPDqUCRFu3dkzF2r1Nx0jp4scxtm7JxtIqI9he9Vk20YD+/zshdzR9JLsoBMlJlNR82a62vQExNEVx/Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-object-super@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
+  integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.3"
+
+"@babel/plugin-transform-parameters@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
+  integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-property-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
+  integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-regenerator@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
+  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
+  dependencies:
+    regenerator-transform "^0.14.2"
+
+"@babel/plugin-transform-reserved-words@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
+  integrity sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-runtime@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz#45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"
+  integrity sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    resolve "^1.8.1"
+    semver "^5.5.1"
+
+"@babel/plugin-transform-shorthand-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
+  integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
+  integrity sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-sticky-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
+  integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-regex" "^7.8.3"
+
+"@babel/plugin-transform-template-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
+  integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-typeof-symbol@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
+  integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-typescript@^7.9.0":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz#4bb4dde4f10bbf2d787fce9707fb09b483e33359"
+  integrity sha512-yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-typescript" "^7.8.3"
+
+"@babel/plugin-transform-typescript@~7.4.0":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.4.5.tgz#ab3351ba35307b79981993536c93ff8be050ba28"
+  integrity sha512-RPB/YeGr4ZrFKNwfuQRlMf2lxoCUaU01MTw39/OFE/RiL8HDjtn68BwEPft1P7JN4akyEmjGWAMNldOV7o9V2g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-typescript" "^7.2.0"
+
+"@babel/plugin-transform-typescript@~7.5.0":
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz#6d862766f09b2da1cb1f7d505fe2aedab6b7d4b8"
+  integrity sha512-pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.5.5"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-typescript" "^7.2.0"
+
+"@babel/plugin-transform-unicode-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
+  integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/polyfill@^7.8.3", "@babel/polyfill@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.8.7.tgz#151ec24c7135481336168c3bd8b8bf0cf91c032f"
+  integrity sha512-LeSfP9bNZH2UOZgcGcZ0PIHUt1ZuHub1L3CVmEyqLxCeDLm4C5Gi8jRH8ZX2PNpDhQCo0z6y/+DIs2JlliXW8w==
+  dependencies:
+    core-js "^2.6.5"
+    regenerator-runtime "^0.13.4"
+
+"@babel/preset-env@^7.0.0", "@babel/preset-env@^7.9.0":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.5.tgz#8ddc76039bc45b774b19e2fc548f6807d8a8919f"
+  integrity sha512-eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ==
+  dependencies:
+    "@babel/compat-data" "^7.9.0"
+    "@babel/helper-compilation-targets" "^7.8.7"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
+    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
+    "@babel/plugin-proposal-json-strings" "^7.8.3"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
+    "@babel/plugin-proposal-object-rest-spread" "^7.9.5"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/plugin-syntax-top-level-await" "^7.8.3"
+    "@babel/plugin-transform-arrow-functions" "^7.8.3"
+    "@babel/plugin-transform-async-to-generator" "^7.8.3"
+    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
+    "@babel/plugin-transform-block-scoping" "^7.8.3"
+    "@babel/plugin-transform-classes" "^7.9.5"
+    "@babel/plugin-transform-computed-properties" "^7.8.3"
+    "@babel/plugin-transform-destructuring" "^7.9.5"
+    "@babel/plugin-transform-dotall-regex" "^7.8.3"
+    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
+    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
+    "@babel/plugin-transform-for-of" "^7.9.0"
+    "@babel/plugin-transform-function-name" "^7.8.3"
+    "@babel/plugin-transform-literals" "^7.8.3"
+    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
+    "@babel/plugin-transform-modules-amd" "^7.9.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.9.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.9.0"
+    "@babel/plugin-transform-modules-umd" "^7.9.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
+    "@babel/plugin-transform-new-target" "^7.8.3"
+    "@babel/plugin-transform-object-super" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.9.5"
+    "@babel/plugin-transform-property-literals" "^7.8.3"
+    "@babel/plugin-transform-regenerator" "^7.8.7"
+    "@babel/plugin-transform-reserved-words" "^7.8.3"
+    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
+    "@babel/plugin-transform-spread" "^7.8.3"
+    "@babel/plugin-transform-sticky-regex" "^7.8.3"
+    "@babel/plugin-transform-template-literals" "^7.8.3"
+    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
+    "@babel/plugin-transform-unicode-regex" "^7.8.3"
+    "@babel/preset-modules" "^0.1.3"
+    "@babel/types" "^7.9.5"
+    browserslist "^4.9.1"
+    core-js-compat "^3.6.2"
+    invariant "^2.2.2"
+    levenary "^1.1.1"
+    semver "^5.5.0"
+
+"@babel/preset-modules@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
+  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    esutils "^2.0.2"
+
+"@babel/runtime@^7.8.4", "@babel/runtime@^7.9.0":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
+  integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/template@^7.8.3", "@babel/template@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
+  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/parser" "^7.8.6"
+    "@babel/types" "^7.8.6"
+
+"@babel/traverse@^7.1.6", "@babel/traverse@^7.2.4", "@babel/traverse@^7.3.4", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.5.tgz#6e7c56b44e2ac7011a948c21e283ddd9d9db97a2"
+  integrity sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.9.5"
+    "@babel/helper-function-name" "^7.9.5"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/parser" "^7.9.0"
+    "@babel/types" "^7.9.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.13"
+
+"@babel/types@^7.1.6", "@babel/types@^7.3.2", "@babel/types@^7.3.4", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444"
+  integrity sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.9.5"
+    lodash "^4.17.13"
+    to-fast-properties "^2.0.0"
+
+"@cnakazawa/watch@^1.0.3":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
+  integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
+  dependencies:
+    exec-sh "^0.3.2"
+    minimist "^1.2.0"
+
+"@ember-data/rfc395-data@^0.0.4":
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz#ecb86efdf5d7733a76ff14ea651a1b0ed1f8a843"
+  integrity sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==
+
+"@ember/edition-utils@^1.1.1", "@ember/edition-utils@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
+  integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
+
+"@ember/optional-features@^1.1.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@ember/optional-features/-/optional-features-1.3.0.tgz#d7da860417b85a56cec88419f30da5ee1dde2756"
+  integrity sha512-Lrfojy4xKwTX+J4EAylmxZY2TO6bQtP4Lg5C8/z2priVqiT0X5fVB1+4WQCJbRBetctO1lMDnqjmhWCVKB8bmQ==
+  dependencies:
+    chalk "^3.0.0"
+    ember-cli-version-checker "^3.1.3"
+    glob "^7.1.6"
+    inquirer "^7.0.1"
+    mkdirp "^0.5.1"
+    silent-error "^1.1.1"
+    util.promisify "^1.0.0"
+
+"@ember/test-helpers@^1.7.1":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-1.7.1.tgz#cc22a954b3b46856518f034bd492a74e0482389f"
+  integrity sha512-+ioumnanSRJzZ0ZH30FIkB0r41UhVyuWQ9R9Yp1phDWJQDLumxg+25WDr40relwcH6z0Cn6LIEzeTVujO/0Rww==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-funnel "^2.0.2"
+    ember-assign-polyfill "^2.6.0"
+    ember-cli-babel "^7.7.3"
+    ember-cli-htmlbars-inline-precompile "^2.1.0"
+    ember-test-waiters "^1.1.1"
+
+"@embroider/core@0.4.3", "@embroider/core@^0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.4.3.tgz#117973b9761d68aee14d820bbaefeb05d5984ba8"
+  integrity sha512-n24WU/dGuGDqZrljWoX8raK2wFX3R8iJG0rfCWx+1kW87IvB+ZgS3j4KiZ/S788BA07udrYsrgecYnciG2bBMg==
+  dependencies:
+    "@babel/core" "^7.2.2"
+    "@babel/parser" "^7.3.4"
+    "@babel/plugin-syntax-dynamic-import" "^7.2.0"
+    "@babel/traverse" "^7.3.4"
+    "@babel/types" "^7.3.4"
+    "@embroider/macros" "0.4.3"
+    assert-never "^1.1.0"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    broccoli-persistent-filter "^2.2.2"
+    broccoli-plugin "^1.3.0"
+    broccoli-source "^1.1.0"
+    debug "^3.1.0"
+    fast-sourcemap-concat "^1.4.0"
+    filesize "^4.1.2"
+    fs-extra "^7.0.1"
+    fs-tree-diff "^2.0.0"
+    handlebars "^4.0.11"
+    js-string-escape "^1.0.1"
+    jsdom "^12.0.0"
+    json-stable-stringify "^1.0.1"
+    lodash "^4.17.10"
+    pkg-up "^2.0.0"
+    resolve "^1.8.1"
+    resolve-package-path "^1.2.2"
+    semver "^5.5.0"
+    strip-bom "^3.0.0"
+    typescript-memoize "^1.0.0-alpha.3"
+    walk-sync "^1.1.3"
+
+"@embroider/macros@0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.4.3.tgz#ea5604b8bd578520f15886a428a6c4fa9481abc0"
+  integrity sha512-vq/Ny2ULpKxq60Sv5usSrz651dXFM5phP/O5G5MWDY8YOodIkRLGqtub34sB0OmwxpCuTntUzl9P/I4wkyQ3Kw==
+  dependencies:
+    "@babel/core" "^7.2.2"
+    "@babel/traverse" "^7.2.4"
+    "@babel/types" "^7.3.2"
+    "@embroider/core" "0.4.3"
+    resolve "^1.8.1"
+    semver "^5.6.0"
+
+"@glimmer/component@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.0.0.tgz#f9052c8e99fb7b3d48d27c65891c5f0e59084a82"
+  integrity sha512-1ERZYNLZRuC8RYbcfkJeAWn3Ly7W2VdoHLQIHCmhQH/m7ubkNOdLQcTnUzje7OnRUs9EJ6DjfoN57XRX9Ux4rA==
+  dependencies:
+    "@glimmer/di" "^0.1.9"
+    "@glimmer/env" "^0.1.7"
+    "@glimmer/util" "^0.44.0"
+    broccoli-file-creator "^2.1.1"
+    broccoli-merge-trees "^3.0.2"
+    ember-cli-babel "^7.7.3"
+    ember-cli-get-component-path-option "^1.0.0"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-path-utils "^1.0.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-typescript "3.0.0"
+    ember-compatibility-helpers "^1.1.2"
+
+"@glimmer/di@^0.1.9":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.1.11.tgz#a6878c07a13a2c2c76fcde598a5c97637bfc4280"
+  integrity sha1-poeMB6E6LCx2/N5ZilyXY3v8QoA=
+
+"@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
+  integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
+
+"@glimmer/interfaces@^0.47.9":
+  version "0.47.9"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.47.9.tgz#4c50b5343815045318bba38915f780ae39f14590"
+  integrity sha512-xne80DHkPC70u08LKV9g0+PboAmIw0A+vDXjJXMrDoRcNzCR4dXR6nvKD/Een+wbwwBaRawCIn45Rnk5+Dyvrg==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/syntax@^0.47.9":
+  version "0.47.9"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.47.9.tgz#f3d141efc97f601928335771721d1f27eb1ed7d2"
+  integrity sha512-ld3x2bTkAr/BXOkI1b3cDVBwMl0BTYtBNKODks0Fi/1DLx+F1jl4abpKJ5cww1k2iQ75jgG31IhBwb7YC2PmFA==
+  dependencies:
+    "@glimmer/interfaces" "^0.47.9"
+    "@glimmer/util" "^0.47.9"
+    handlebars "^4.5.1"
+    simple-html-tokenizer "^0.5.9"
+
+"@glimmer/util@^0.44.0":
+  version "0.44.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.44.0.tgz#45df98d73812440206ae7bda87cfe04aaae21ed9"
+  integrity sha512-duAsm30uVK9jSysElCbLyU6QQYO2X9iLDLBIBUcCqck9qN1o3tK2qWiHbGK5d6g8E2AJ4H88UrfElkyaJlGrwg==
+
+"@glimmer/util@^0.47.9":
+  version "0.47.9"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.47.9.tgz#ad3085eba3975bcbc74d28aefc871becbe800417"
+  integrity sha512-MJEumozi3TKmx+kzTpqPdC0jLEIuWSS3JNdBXceqTGRZQGmE5Zxqd8ydH5KOYpsKSfURHGCi2vU6+X/Q4z2b6g==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@simple-dom/interface" "^1.4.0"
+
+"@mrmlnc/readdir-enhanced@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
+  dependencies:
+    call-me-maybe "^1.0.1"
+    glob-to-regexp "^0.3.0"
+
+"@nodelib/fs.scandir@2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
+  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.3"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
+  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
+
+"@nodelib/fs.stat@^1.1.2":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
+  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.3"
+    fastq "^1.6.0"
+
+"@simple-dom/interface@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f"
+  integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA==
+
+"@sindresorhus/is@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
+  integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
+
+"@types/body-parser@*":
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f"
+  integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
+"@types/chai-as-promised@^7.1.2":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.2.tgz#2f564420e81eaf8650169e5a3a6b93e096e5068b"
+  integrity sha512-PO2gcfR3Oxa+u0QvECLe1xKXOqYTzCmWf0FhLhjREoW3fPAVamjihL7v1MOVLJLsnAMdLcjkfrs01yvDMwVK4Q==
+  dependencies:
+    "@types/chai" "*"
+
+"@types/chai@*", "@types/chai@^4.2.9":
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.11.tgz#d3614d6c5f500142358e6ed24e1bf16657536c50"
+  integrity sha512-t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==
+
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
+"@types/connect@*":
+  version "3.4.33"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546"
+  integrity sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==
+  dependencies:
+    "@types/node" "*"
+
+"@types/events@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
+
+"@types/express-serve-static-core@*":
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.5.tgz#a00ac7dadd746ae82477443e4d480a6a93ea083c"
+  integrity sha512-578YH5Lt88AKoADy0b2jQGwJtrBxezXtVe/MBqWXKZpqx91SnC0pVkVCcxcytz3lWW+cHBYDi3Ysh0WXc+rAYw==
+  dependencies:
+    "@types/node" "*"
+    "@types/range-parser" "*"
+
+"@types/express@^4.17.2":
+  version "4.17.6"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.6.tgz#6bce49e49570507b86ea1b07b806f04697fac45e"
+  integrity sha512-n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "*"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
+"@types/fs-extra@^5.0.5":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.1.0.tgz#2a325ef97901504a3828718c390d34b8426a10a1"
+  integrity sha512-AInn5+UBFIK9FK5xc9yP5e3TQSPNNgjHByqYcj9g5elVBnDQcQL7PlO1CIRy2gWlbwK7UPYqi7vRvFA44dCmYQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/glob@*", "@types/glob@^7.1.1":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
+  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
+  dependencies:
+    "@types/events" "*"
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/mime@*":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d"
+  integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==
+
+"@types/minimatch@*", "@types/minimatch@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+
+"@types/node@*":
+  version "13.13.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.4.tgz#1581d6c16e3d4803eb079c87d4ac893ee7501c2c"
+  integrity sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==
+
+"@types/qs@*":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.1.tgz#937fab3194766256ee09fcd40b781740758617e7"
+  integrity sha512-lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw==
+
+"@types/range-parser@*":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
+  integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
+
+"@types/rimraf@^2.0.2":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.4.tgz#403887b0b53c6100a6c35d2ab24f6ccc042fec46"
+  integrity sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==
+  dependencies:
+    "@types/glob" "*"
+    "@types/node" "*"
+
+"@types/serve-static@*":
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz#eb7e1c41c4468272557e897e9171ded5e2ded9d1"
+  integrity sha512-oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==
+  dependencies:
+    "@types/express-serve-static-core" "*"
+    "@types/mime" "*"
+
+"@types/symlink-or-copy@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@types/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#4151a81b4052c80bc2becbae09f3a9ec010a9c7a"
+  integrity sha512-Lja2xYuuf2B3knEsga8ShbOdsfNOtzT73GyJmZyY7eGl2+ajOqrs8yM5ze0fsSoYwvA6bw7/Qr7OZ7PEEmYwWg==
+
+"@webassemblyjs/ast@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
+  integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/wast-parser" "1.7.11"
+
+"@webassemblyjs/floating-point-hex-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
+  integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
+
+"@webassemblyjs/helper-api-error@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
+  integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
+
+"@webassemblyjs/helper-buffer@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
+  integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
+
+"@webassemblyjs/helper-code-frame@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
+  integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.7.11"
+
+"@webassemblyjs/helper-fsm@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
+  integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
+
+"@webassemblyjs/helper-module-context@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
+  integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
+
+"@webassemblyjs/helper-wasm-bytecode@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
+  integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
+
+"@webassemblyjs/helper-wasm-section@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
+  integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+
+"@webassemblyjs/ieee754@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
+  integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
+  integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
+  dependencies:
+    "@xtuc/long" "4.2.1"
+
+"@webassemblyjs/utf8@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
+  integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
+
+"@webassemblyjs/wasm-edit@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
+  integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/helper-wasm-section" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+    "@webassemblyjs/wasm-opt" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+    "@webassemblyjs/wast-printer" "1.7.11"
+
+"@webassemblyjs/wasm-gen@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
+  integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/ieee754" "1.7.11"
+    "@webassemblyjs/leb128" "1.7.11"
+    "@webassemblyjs/utf8" "1.7.11"
+
+"@webassemblyjs/wasm-opt@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
+  integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+
+"@webassemblyjs/wasm-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
+  integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-api-error" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/ieee754" "1.7.11"
+    "@webassemblyjs/leb128" "1.7.11"
+    "@webassemblyjs/utf8" "1.7.11"
+
+"@webassemblyjs/wast-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
+  integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/floating-point-hex-parser" "1.7.11"
+    "@webassemblyjs/helper-api-error" "1.7.11"
+    "@webassemblyjs/helper-code-frame" "1.7.11"
+    "@webassemblyjs/helper-fsm" "1.7.11"
+    "@xtuc/long" "4.2.1"
+
+"@webassemblyjs/wast-printer@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
+  integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/wast-parser" "1.7.11"
+    "@xtuc/long" "4.2.1"
+
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+
+"@xtuc/long@4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
+  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
+
+abab@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
+  integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
+
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+  dependencies:
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
+
+acorn-dynamic-import@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
+  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
+  dependencies:
+    acorn "^5.0.0"
+
+acorn-globals@^4.3.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
+  integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==
+  dependencies:
+    acorn "^6.0.1"
+    acorn-walk "^6.0.1"
+
+acorn-jsx@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
+  integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
+
+acorn-walk@^6.0.1:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
+  integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
+
+acorn@^5.0.0, acorn@^5.6.2:
+  version "5.7.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
+  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
+
+acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.7:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
+  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
+
+after@0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
+  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
+
+ajv-errors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
+
+ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
+  integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
+
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5, ajv@^6.9.1:
+  version "6.12.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
+  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+amd-name-resolver@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.2.0.tgz#fc41b3848824b557313897d71f8d5a0184fbe679"
+  integrity sha512-hlSTWGS1t6/xq5YCed7YALg7tKZL3rkl7UwEZ/eCIkn8JxmM6fU6Qs/1hwtjQqfuYxlffuUcgYEm0f5xP4YKaA==
+  dependencies:
+    ensure-posix-path "^1.0.1"
+
+amd-name-resolver@^1.2.1, amd-name-resolver@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.3.1.tgz#ffe71c683c6e7191fc4ae1bb3aaed15abea135d9"
+  integrity sha512-26qTEWqZQ+cxSYygZ4Cf8tsjDBLceJahhtewxtKZA3SRa4PluuqYCuheemDQD+7Mf5B7sr+zhTDWAHDh02a1Dw==
+  dependencies:
+    ensure-posix-path "^1.0.1"
+    object-hash "^1.3.1"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
+
+ansi-escapes@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
+
+ansi-escapes@^4.2.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
+  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
+  dependencies:
+    type-fest "^0.11.0"
+
+ansi-html@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+
+ansi-styles@^3.0.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
+ansi-to-html@^0.6.6:
+  version "0.6.14"
+  resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.14.tgz#65fe6d08bba5dd9db33f44a20aec331e0010dad8"
+  integrity sha512-7ZslfB1+EnFSDO5Ju+ue5Y6It19DRnZXWv8jrGHgIlPna5Mh4jz7BV5jCbQneXNFurQcKoolaaAjHtgSBfOIuA==
+  dependencies:
+    entities "^1.1.2"
+
+ansicolors@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
+  integrity sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8=
+
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
+
+aot-test-generators@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/aot-test-generators/-/aot-test-generators-0.1.0.tgz#43f0f615f97cb298d7919c1b0b4e6b7310b03cd0"
+  integrity sha1-Q/D2Ffl8spjXkZwbC05rcxCwPNA=
+  dependencies:
+    jsesc "^2.5.0"
+
+aproba@^1.0.3, aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
+are-we-there-yet@~1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+
+array-to-error@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-to-error/-/array-to-error-1.1.1.tgz#d68812926d14097a205579a667eeaf1856a44c07"
+  integrity sha1-1ogSkm0UCXogVXmmZ+6vGFakTAc=
+  dependencies:
+    array-to-sentence "^1.1.0"
+
+array-to-sentence@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/array-to-sentence/-/array-to-sentence-1.1.0.tgz#c804956dafa53232495b205a9452753a258d39fc"
+  integrity sha1-yASVba+lMjJJWyBalFJ1OiWNOfw=
+
+array-union@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+
+arraybuffer.slice@~0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
+
+asn1.js@^4.0.0:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-never@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.0.tgz#e6597ed9e357f7e62c074dfa7c71e30ed7b67a8b"
+  integrity sha512-61QPxh2lfV5j2dBsEtwhz8/sUj+baAIuCpQxeWorGeMxlTkbeyGyq7igxJB8yij1JdzUhyoiekNHMXrMYnkjvA==
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+assert@^1.1.1:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
+  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
+  dependencies:
+    object-assign "^4.1.1"
+    util "0.10.3"
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+
+ast-types@0.13.3:
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.3.tgz#50da3f28d17bdbc7969a3a2d83a0e4a72ae755a7"
+  integrity sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA==
+
+astral-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
+
+async-disk-cache@^1.2.1:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-1.3.5.tgz#cc6206ed79bb6982b878fc52e0505e4f52b62a02"
+  integrity sha512-VZpqfR0R7CEOJZ/0FOTgWq70lCrZyS1rkI8PXugDUkTKyyAUgZ2zQ09gLhMkEn+wN8LYeUTPxZdXtlX/kmbXKQ==
+  dependencies:
+    debug "^2.1.3"
+    heimdalljs "^0.2.3"
+    istextorbinary "2.1.0"
+    mkdirp "^0.5.0"
+    rimraf "^2.5.3"
+    rsvp "^3.0.18"
+    username-sync "^1.0.2"
+
+async-each@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
+
+async-limiter@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
+
+async-promise-queue@^1.0.3, async-promise-queue@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/async-promise-queue/-/async-promise-queue-1.0.5.tgz#cb23bce9fce903a133946a700cc85f27f09ea49d"
+  integrity sha512-xi0aQ1rrjPWYmqbwr18rrSKbSaXIeIwSd1J4KAgVfkq8utNbdZoht7GfvfY6swFUAMJ9obkc4WPJmtGwl+B8dw==
+  dependencies:
+    async "^2.4.1"
+    debug "^2.6.8"
+
+async@^2.4.1, async@^2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  dependencies:
+    lodash "^4.17.14"
+
+async@~0.2.9:
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+  integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E=
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
+  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
+
+babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+babel-core@^6.26.0, babel-core@^6.26.3:
+  version "6.26.3"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
+  integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.1"
+    debug "^2.6.9"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.8"
+    slash "^1.0.0"
+    source-map "^0.5.7"
+
+babel-eslint@^10.0.3:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
+  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
+    eslint-visitor-keys "^1.0.0"
+    resolve "^1.12.0"
+
+babel-generator@^6.26.0:
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.7"
+    trim-right "^1.0.1"
+
+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+  integrity sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=
+  dependencies:
+    babel-helper-explode-assignable-expression "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-call-delegate@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+  integrity sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-define-map@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
+  integrity sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-explode-assignable-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+  integrity sha1-8luCz33BBDPFX3BZLVdGQArCLKo=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+  integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=
+  dependencies:
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-get-function-arity@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+  integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-hoist-variables@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+  integrity sha1-HssnaJydJVE+rbyZFKc/VAi+enY=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-optimise-call-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+  integrity sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-regex@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
+  integrity sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-remap-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+  integrity sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-replace-supers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+  integrity sha1-v22/5Dk40XNpohPKiov3S2qQqxo=
+  dependencies:
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helpers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-loader@^8.0.6:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
+  integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==
+  dependencies:
+    find-cache-dir "^2.1.0"
+    loader-utils "^1.4.0"
+    mkdirp "^0.5.3"
+    pify "^4.0.1"
+    schema-utils "^2.6.5"
+
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-check-es2015-constants@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+  integrity sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-debug-macros@^0.2.0, babel-plugin-debug-macros@^0.2.0-beta.6:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0.tgz#0120ac20ce06ccc57bf493b667cf24b85c28da7a"
+  integrity sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==
+  dependencies:
+    semver "^5.3.0"
+
+babel-plugin-debug-macros@^0.3.0, babel-plugin-debug-macros@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.3.tgz#29c3449d663f61c7385f5b8c72d8015b069a5cb7"
+  integrity sha512-E+NI8TKpxJDBbVkdWkwHrKgJi696mnRL8XYrOPYw82veNHPDORM9WIQifl6TpIo8PNy2tU2skPqbfkmHXrHKQA==
+  dependencies:
+    semver "^5.3.0"
+
+babel-plugin-dynamic-import-node@^2.3.0:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
+  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
+  dependencies:
+    object.assign "^4.1.0"
+
+babel-plugin-ember-data-packages-polyfill@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-data-packages-polyfill/-/babel-plugin-ember-data-packages-polyfill-0.1.2.tgz#21154c095ddc703722b1fb8bb06c126c0b6d77dc"
+  integrity sha512-kTHnOwoOXfPXi00Z8yAgyD64+jdSXk3pknnS7NlqnCKAU6YDkXZ4Y7irl66kaZjZn0FBBt0P4YOZFZk85jYOww==
+  dependencies:
+    "@ember-data/rfc395-data" "^0.0.4"
+
+babel-plugin-ember-modules-api-polyfill@^2.12.0, babel-plugin-ember-modules-api-polyfill@^2.6.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.12.0.tgz#a5e703205ba4e625a7fab9bb1aea64ef3222cf75"
+  integrity sha512-ZQU4quX0TJ1yYyosPy5PFigKdCFEVHJ6H0b3hwjxekIP9CDwzk0OhQuKhCOPti+d52VWjjCjxu2BrXEih29mFw==
+  dependencies:
+    ember-rfc176-data "^0.3.12"
+
+babel-plugin-filter-imports@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-3.0.0.tgz#a849683837ad29960da17492fb32789ab6b09a11"
+  integrity sha512-p/chjzVTgCxUqyLM0q/pfWVZS7IJTwGQMwNg0LOvuQpKiTftQgZDtkGB8XvETnUw19rRcL7bJCTopSwibTN2tA==
+  dependencies:
+    "@babel/types" "^7.4.0"
+    lodash "^4.17.11"
+
+babel-plugin-htmlbars-inline-precompile@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-1.0.0.tgz#a9d2f6eaad8a3f3d361602de593a8cbef8179c22"
+  integrity sha512-4jvKEHR1bAX03hBDZ94IXsYCj3bwk9vYsn6ux6JZNL2U5pvzCWjqyrGahfsGNrhERyxw8IqcirOi9Q6WCo3dkQ==
+
+babel-plugin-htmlbars-inline-precompile@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-3.0.1.tgz#e1e38a4087f446578e419a21c112530c8df02345"
+  integrity sha512-ZiFY0nQjtdMPGIDwp/5LYOs6rCr54QfcSV5nPbrA7C++Fv4Vb2Q/qrKYx78t+dwmARJztnOBlObFk4z8veHxNA==
+
+babel-plugin-module-resolver@^3.1.1, babel-plugin-module-resolver@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz#ddfa5e301e3b9aa12d852a9979f18b37881ff5a7"
+  integrity sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==
+  dependencies:
+    find-babel-config "^1.1.0"
+    glob "^7.1.2"
+    pkg-up "^2.0.0"
+    reselect "^3.0.1"
+    resolve "^1.4.0"
+
+babel-plugin-syntax-async-functions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+  integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=
+
+babel-plugin-syntax-dynamic-import@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
+  integrity sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=
+
+babel-plugin-syntax-exponentiation-operator@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+  integrity sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=
+
+babel-plugin-syntax-trailing-function-commas@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+  integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=
+
+babel-plugin-transform-async-to-generator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+  integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.24.1"
+    babel-plugin-syntax-async-functions "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-arrow-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
+  integrity sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
+  integrity sha1-u8UbSflk1wy42OC5ToICRs46YUE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoping@^6.23.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
+  integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-plugin-transform-es2015-classes@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
+  integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=
+  dependencies:
+    babel-helper-define-map "^6.24.1"
+    babel-helper-function-name "^6.24.1"
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-helper-replace-supers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-computed-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
+  integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-destructuring@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+  integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
+  integrity sha1-c+s9MQypaePvnskcU3QabxV2Qj4=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-for-of@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
+  integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-function-name@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
+  integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
+  integrity sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
+  integrity sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=
+  dependencies:
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+  version "6.26.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
+  integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-types "^6.26.0"
+
+babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
+  integrity sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-umd@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
+  integrity sha1-rJl+YoXNGO1hdq22B9YCNErThGg=
+  dependencies:
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-object-super@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
+  integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40=
+  dependencies:
+    babel-helper-replace-supers "^6.24.1"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-parameters@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+  integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=
+  dependencies:
+    babel-helper-call-delegate "^6.24.1"
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
+  integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-spread@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
+  integrity sha1-1taKmfia7cRTbIGlQujdnxdG+NE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-sticky-regex@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
+  integrity sha1-AMHNsaynERLN8M9hJsLta0V8zbw=
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-template-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
+  integrity sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
+  integrity sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-unicode-regex@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
+  integrity sha1-04sS9C6nMj9yk4fxinxa4frrNek=
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    regexpu-core "^2.0.0"
+
+babel-plugin-transform-exponentiation-operator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+  integrity sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=
+  dependencies:
+    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
+    babel-plugin-syntax-exponentiation-operator "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-regenerator@^6.22.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
+  integrity sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=
+  dependencies:
+    regenerator-transform "^0.10.0"
+
+babel-plugin-transform-strict-mode@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
+  integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-polyfill@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
+  integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=
+  dependencies:
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    regenerator-runtime "^0.10.5"
+
+babel-preset-env@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
+  integrity sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-to-generator "^6.22.0"
+    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoping "^6.23.0"
+    babel-plugin-transform-es2015-classes "^6.23.0"
+    babel-plugin-transform-es2015-computed-properties "^6.22.0"
+    babel-plugin-transform-es2015-destructuring "^6.23.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
+    babel-plugin-transform-es2015-for-of "^6.23.0"
+    babel-plugin-transform-es2015-function-name "^6.22.0"
+    babel-plugin-transform-es2015-literals "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.22.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-umd "^6.23.0"
+    babel-plugin-transform-es2015-object-super "^6.22.0"
+    babel-plugin-transform-es2015-parameters "^6.23.0"
+    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
+    babel-plugin-transform-es2015-spread "^6.22.0"
+    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
+    babel-plugin-transform-es2015-template-literals "^6.22.0"
+    babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
+    babel-plugin-transform-exponentiation-operator "^6.22.0"
+    babel-plugin-transform-regenerator "^6.22.0"
+    browserslist "^3.2.6"
+    invariant "^2.2.2"
+    semver "^5.3.0"
+
+babel-register@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  integrity sha1-btAhFz4vy0htestFxgCahW9kcHE=
+  dependencies:
+    babel-core "^6.26.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.17.4"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.15"
+
+babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
+babel-template@^6.24.1, babel-template@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
+
+babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
+
+babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
+  dependencies:
+    babel-runtime "^6.26.0"
+    esutils "^2.0.2"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
+
+babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
+
+backbone@^1.1.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.4.0.tgz#54db4de9df7c3811c3f032f34749a4cd27f3bd12"
+  integrity sha512-RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ==
+  dependencies:
+    underscore ">=1.8.3"
+
+backo2@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+
+base64-arraybuffer@0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
+  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
+
+base64-js@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.2.tgz#024f0f72afa25b75f9c0ee73cd4f55ec1bed9784"
+  integrity sha1-Ak8Pcq+iW3X5wO5zzU9V7Bvtl4Q=
+
+base64-js@^1.0.2:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
+  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
+
+base64id@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
+  integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
+basic-auth@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
+  integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
+  dependencies:
+    safe-buffer "5.1.2"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  dependencies:
+    tweetnacl "^0.14.3"
+
+better-assert@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
+  dependencies:
+    callsite "1.0.0"
+
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
+binary-extensions@^1.0.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
+
+"binaryextensions@1 || 2":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.2.0.tgz#e7c6ba82d4f5f5758c26078fe8eea28881233311"
+  integrity sha512-bHhs98rj/7i/RZpCSJ3uk55pLXOItjIrh2sRQZSM6OoktScX+LxJzvlU+FELp9j3TdcddTmmYArLSGptCTwjuw==
+
+bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
+
+blank-object@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/blank-object/-/blank-object-1.0.2.tgz#f990793fbe9a8c8dd013fb3219420bec81d5f4b9"
+  integrity sha1-+ZB5P76ajI3QE/syGUIL7IHV9Lk=
+
+blob@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
+  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
+
+bluebird@^3.1.1, bluebird@^3.4.6, bluebird@^3.5.5:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
+
+body-parser@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+  dependencies:
+    bytes "3.1.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
+
+body@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
+  integrity sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=
+  dependencies:
+    continuable-cache "^0.3.1"
+    error "^7.0.0"
+    raw-body "~1.1.0"
+    safe-json-parse "~1.0.1"
+
+bops@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/bops/-/bops-0.0.3.tgz#c5cbf6fea8be7401ca5ea6d1679e6c4e8b407c79"
+  integrity sha1-xcv2/qi+dAHKXqbRZ55sTotAfHk=
+  dependencies:
+    base64-js "0.0.2"
+    to-utf8 "0.0.1"
+
+bower-config@^1.4.1:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.3.tgz#3454fecdc5f08e7aa9cc6d556e492be0669689ae"
+  integrity sha512-MVyyUk3d1S7d2cl6YISViwJBc2VXCkxF5AUFykvN0PQj5FsUiMNSgAYTso18oRFfyZ6XEtjrgg9MAaufHbOwNw==
+  dependencies:
+    graceful-fs "^4.1.3"
+    minimist "^0.2.1"
+    mout "^1.0.0"
+    osenv "^0.1.3"
+    untildify "^2.1.0"
+    wordwrap "^0.0.3"
+
+bower-endpoint-parser@0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz#00b565adbfab6f2d35addde977e97962acbcb3f6"
+  integrity sha1-ALVlrb+rby01rd3pd+l5Yqy8s/Y=
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^2.3.1, braces@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
+braces@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+broccoli-amd-funnel@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-amd-funnel/-/broccoli-amd-funnel-2.0.1.tgz#dbdbfd28841731342d538126567c25bea3f15310"
+  integrity sha512-VRE+0PYAN4jQfkIq3GKRj4U/4UV9rVpLan5ll6fVYV4ziVg4OEfR5GUnILEg++QtR4xSaugRxCPU5XJLDy3bNQ==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    symlink-or-copy "^1.2.0"
+
+broccoli-asset-rev@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-asset-rev/-/broccoli-asset-rev-3.0.0.tgz#65a28c8a062d6ee2cffd91ed2a8309e0f8253ac6"
+  integrity sha512-gAHQZnwvtl74tGevUqGuWoyOdJUdMMv0TjGSMzbdyGImr9fZcnM6xmggDA8bUawrMto9NFi00ZtNUgA4dQiUBw==
+  dependencies:
+    broccoli-asset-rewrite "^2.0.0"
+    broccoli-filter "^1.2.2"
+    broccoli-persistent-filter "^1.4.3"
+    json-stable-stringify "^1.0.0"
+    minimatch "^3.0.4"
+    rsvp "^3.0.6"
+
+broccoli-asset-rewrite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-asset-rewrite/-/broccoli-asset-rewrite-2.0.0.tgz#603c4a52d4c8987a2f681254436923ac0a9c94ab"
+  integrity sha512-dqhxdQpooNi7LHe8J9Jdxp6o3YPFWl4vQmint6zrsn2sVbOo+wpyiX3erUSt0IBtjNkAxqJjuvS375o2cLBHTA==
+  dependencies:
+    broccoli-filter "^1.2.3"
+
+broccoli-babel-transpiler@^6.5.0:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.5.1.tgz#a4afc8d3b59b441518eb9a07bd44149476e30738"
+  integrity sha512-w6GcnkxvHcNCte5FcLGEG1hUdQvlfvSN/6PtGWU/otg69Ugk8rUk51h41R0Ugoc+TNxyeFG1opRt2RlA87XzNw==
+  dependencies:
+    babel-core "^6.26.0"
+    broccoli-funnel "^2.0.1"
+    broccoli-merge-trees "^2.0.0"
+    broccoli-persistent-filter "^1.4.3"
+    clone "^2.0.0"
+    hash-for-dep "^1.2.3"
+    heimdalljs-logger "^0.1.7"
+    json-stable-stringify "^1.0.0"
+    rsvp "^4.8.2"
+    workerpool "^2.3.0"
+
+broccoli-babel-transpiler@^7.3.0, broccoli-babel-transpiler@^7.4.0:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.4.0.tgz#f3069f0f77e8017aa17e1e757dfb4a30de044182"
+  integrity sha512-DzPXQr1C+zOgzXG40wqPjtjSSa6wRKb+Ls45Qtq7Pn+GxL3/jIvQOBZi0/irZ5dlYVbRMEZiUnaIBIOha2ygIw==
+  dependencies:
+    "@babel/core" "^7.8.3"
+    "@babel/polyfill" "^7.8.3"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.2"
+    broccoli-persistent-filter "^2.2.1"
+    clone "^2.1.2"
+    hash-for-dep "^1.4.7"
+    heimdalljs-logger "^0.1.9"
+    json-stable-stringify "^1.0.1"
+    rsvp "^4.8.4"
+    workerpool "^3.1.1"
+
+broccoli-builder@^0.18.14:
+  version "0.18.14"
+  resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.14.tgz#4b79e2f844de11a4e1b816c3f49c6df4776c312d"
+  integrity sha1-S3ni+ETeEaThuBbD9Jxt9HdsMS0=
+  dependencies:
+    broccoli-node-info "^1.1.0"
+    heimdalljs "^0.2.0"
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.2"
+    rimraf "^2.2.8"
+    rsvp "^3.0.17"
+    silent-error "^1.0.1"
+
+broccoli-caching-writer@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07"
+  integrity sha1-uTz1j5Jk8AMHWGjbBXdPTn8lvQc=
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.2.5"
+    broccoli-plugin "1.1.0"
+    debug "^2.1.1"
+    rimraf "^2.2.8"
+    rsvp "^3.0.17"
+    walk-sync "^0.2.5"
+
+broccoli-caching-writer@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-3.0.3.tgz#0bd2c96a9738d6a6ab590f07ba35c5157d7db476"
+  integrity sha1-C9LJapc41qarWQ8HujXFFX19tHY=
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.2.1"
+    debug "^2.1.1"
+    rimraf "^2.2.8"
+    rsvp "^3.0.17"
+    walk-sync "^0.3.0"
+
+broccoli-clean-css@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-clean-css/-/broccoli-clean-css-1.1.0.tgz#9db143d9af7e0ae79c26e3ac5a9bb2d720ea19fa"
+  integrity sha1-nbFD2a9+CuecJuOsWpuy1yDqGfo=
+  dependencies:
+    broccoli-persistent-filter "^1.1.6"
+    clean-css-promise "^0.1.0"
+    inline-source-map-comment "^1.0.5"
+    json-stable-stringify "^1.0.0"
+
+broccoli-concat@^3.2.2, broccoli-concat@^3.7.1, broccoli-concat@^3.7.4:
+  version "3.7.5"
+  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.7.5.tgz#223beda8c1184252cf08ae020a3d45ffa6a48218"
+  integrity sha512-rDs1Mej3Ej0Cy5yIO9oIQq5+BCv0opAwS2NW7M0BeCsAMeFM42Z/zacDUC6jKc5OV5wiHvGTyCPLnZkMe0h6kQ==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.3.0"
+    ensure-posix-path "^1.0.2"
+    fast-sourcemap-concat "^1.4.0"
+    find-index "^1.1.0"
+    fs-extra "^4.0.3"
+    fs-tree-diff "^0.5.7"
+    lodash.merge "^4.6.2"
+    lodash.omit "^4.1.0"
+    lodash.uniq "^4.2.0"
+    walk-sync "^0.3.2"
+
+broccoli-config-loader@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-config-loader/-/broccoli-config-loader-1.0.1.tgz#d10aaf8ebc0cb45c1da5baa82720e1d88d28c80a"
+  integrity sha512-MDKYQ50rxhn+g17DYdfzfEM9DjTuSGu42Db37A8TQHQe8geYEcUZ4SQqZRgzdAI3aRQNlA1yBHJfOeGmOjhLIg==
+  dependencies:
+    broccoli-caching-writer "^3.0.3"
+
+broccoli-config-replace@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/broccoli-config-replace/-/broccoli-config-replace-1.1.2.tgz#6ea879d92a5bad634d11329b51fc5f4aafda9c00"
+  integrity sha1-bqh52SpbrWNNETKbUfxfSq/anAA=
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.2.0"
+    debug "^2.2.0"
+    fs-extra "^0.24.0"
+
+broccoli-debug@^0.6.4, broccoli-debug@^0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.5.tgz#164a5cdafd8936e525e702bf8f91f39d758e2e78"
+  integrity sha512-RIVjHvNar9EMCLDW/FggxFRXqpjhncM/3qq87bn/y+/zR9tqEkHvTqbyOc4QnB97NO2m6342w4wGkemkaeOuWg==
+  dependencies:
+    broccoli-plugin "^1.2.1"
+    fs-tree-diff "^0.5.2"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    symlink-or-copy "^1.1.8"
+    tree-sync "^1.2.2"
+
+broccoli-file-creator@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-2.1.1.tgz#7351dd2496c762cfce7736ce9b49e3fce0c7b7db"
+  integrity sha512-YpjOExWr92C5vhnK0kmD81kM7U09kdIRZk9w4ZDCDHuHXW+VE/x6AGEOQQW3loBQQ6Jk+k+TSm8dESy4uZsnjw==
+  dependencies:
+    broccoli-plugin "^1.1.0"
+    mkdirp "^0.5.1"
+
+broccoli-filter@^1.2.2, broccoli-filter@^1.2.3:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-1.3.0.tgz#71e3a8e32a17f309e12261919c5b1006d6766de6"
+  integrity sha512-VXJXw7eBfG82CFxaBDjYmyN7V72D4In2zwLVQJd/h3mBfF3CMdRTsv2L20lmRTtCv1sAHcB+LgMso90e/KYiLw==
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.0.0"
+    copy-dereference "^1.0.0"
+    debug "^2.2.0"
+    mkdirp "^0.5.1"
+    promise-map-series "^0.2.1"
+    rsvp "^3.0.18"
+    symlink-or-copy "^1.0.1"
+    walk-sync "^0.3.1"
+
+broccoli-funnel-reducer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea"
+  integrity sha1-ETZbKnha7JsXlyo234fu8kxcwOo=
+
+broccoli-funnel@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296"
+  integrity sha1-zdw6/F/xaFqAI0iP/3TOb7WlEpY=
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^1.3.0"
+    debug "^2.2.0"
+    exists-sync "0.0.4"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^0.5.3"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    mkdirp "^0.5.0"
+    path-posix "^1.0.0"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+    walk-sync "^0.3.1"
+
+broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-2.0.2.tgz#0edf629569bc10bd02cc525f74b9a38e71366a75"
+  integrity sha512-/vDTqtv7ipjEZQOVqO4vGDVAOZyuYzQ/EgGoyewfOgh1M7IQAToBKZI0oAQPgMBeFPPlIbfMuAngk+ohPBuaHQ==
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^1.3.0"
+    debug "^2.2.0"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^0.5.3"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    mkdirp "^0.5.0"
+    path-posix "^1.0.0"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+    walk-sync "^0.3.1"
+
+broccoli-kitchen-sink-helpers@^0.2.5:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
+  integrity sha1-peCYbtjXb7WYS2jD8EUNOpbjbsw=
+  dependencies:
+    glob "^5.0.10"
+    mkdirp "^0.5.1"
+
+broccoli-kitchen-sink-helpers@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.3.1.tgz#77c7c18194b9664163ec4fcee2793444926e0c06"
+  integrity sha1-d8fBgZS5ZkFj7E/O4nk0RJJuDAY=
+  dependencies:
+    glob "^5.0.10"
+    mkdirp "^0.5.1"
+
+broccoli-lint-eslint@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-lint-eslint/-/broccoli-lint-eslint-5.0.0.tgz#05365879d597dd78496a1c718db0e5ea5d4a2bde"
+  integrity sha512-V7M6U4th21bf1X4u3KoZa0xkcPq9JCSyKxB/nCWCBFMI3rkrB8nlyDLd8DKIUTqL+ojlFOGV5lohPZwndw0sZw==
+  dependencies:
+    aot-test-generators "^0.1.0"
+    broccoli-concat "^3.2.2"
+    broccoli-persistent-filter "^2.1.0"
+    eslint "^5.6.0"
+    json-stable-stringify "^1.0.1"
+    lodash.defaultsdeep "^4.6.0"
+    md5-hex "^2.0.0"
+
+broccoli-merge-trees@^1.0.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5"
+  integrity sha1-oAFRm7UGfwZYnZGvopQkRaLQ/bU=
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    can-symlink "^1.0.0"
+    fast-ordered-set "^1.0.2"
+    fs-tree-diff "^0.5.4"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+
+broccoli-merge-trees@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-2.0.1.tgz#14d4b7fc1a90318c12b16f843e6ba2693808100c"
+  integrity sha512-WjaexJ+I8BxP5V5RNn6um/qDRSmKoiBC/QkRi79FT9ClHfldxRyCDs9mcV7mmoaPlsshmmPaUz5jdtcKA6DClQ==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    merge-trees "^1.0.1"
+
+broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.2.tgz#f33b451994225522b5c9bcf27d59decfd8ba537d"
+  integrity sha512-ZyPAwrOdlCddduFbsMyyFzJUrvW6b04pMvDiAQZrCwghlvgowJDY+EfoXn+eR1RRA5nmGHJ+B68T63VnpRiT1A==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    merge-trees "^2.0.0"
+
+broccoli-middleware@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-2.1.1.tgz#183635bbef4dc1241533ee001a162f013d776cb9"
+  integrity sha512-BK8aPhQpOLsHWiftrqXQr84XsvzUqeaN4PlCQOYg5yM0M+WKAHtX2WFXmicSQZOVgKDyh5aeoNTFkHjBAEBzwQ==
+  dependencies:
+    ansi-html "^0.0.7"
+    handlebars "^4.0.4"
+    has-ansi "^3.0.0"
+    mime-types "^2.1.18"
+
+broccoli-module-normalizer@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/broccoli-module-normalizer/-/broccoli-module-normalizer-1.3.0.tgz#f9982d9cbb776b4ed754161cc6547784d3eb19de"
+  integrity sha512-0idZCOtdVG6xXoQ36Psc1ApMCr3lW5DB+WEAOEwHcUoESIBHzwcRPQTxheGIjZ5o0hxpsRYAUH5x0ErtNezbrQ==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    merge-trees "^1.0.1"
+    rimraf "^2.6.2"
+    symlink-or-copy "^1.1.8"
+
+broccoli-module-unification-reexporter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-module-unification-reexporter/-/broccoli-module-unification-reexporter-1.0.0.tgz#031909c5d3f159ec11d5f9e2346f2861db8acb3e"
+  integrity sha512-HTi9ua520M20aBZomaiBopsSt3yjL7J/paR3XPjieygK7+ShATBiZdn0B+ZPiniBi4I8JuMn1q0fNFUevtP//A==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    mkdirp "^0.5.1"
+    walk-sync "^0.3.2"
+
+broccoli-node-api@^1.6.0, broccoli-node-api@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-api/-/broccoli-node-api-1.7.0.tgz#391aa6edecd2a42c63c111b4162956b2fa288cb6"
+  integrity sha512-QIqLSVJWJUVOhclmkmypJJH9u9s/aWH4+FH6Q6Ju5l+Io4dtwqdPUNmDfw40o6sxhbZHhqGujDJuHTML1wG8Yw==
+
+broccoli-node-info@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-1.1.0.tgz#3aa2e31e07e5bdb516dd25214f7c45ba1c459412"
+  integrity sha1-OqLjHgflvbUW3SUhT3xFuhxFlBI=
+
+broccoli-node-info@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-2.1.0.tgz#ca84560e8570ff78565bea1699866ddbf58ad644"
+  integrity sha512-l6qDuboJThHfRVVWQVaTs++bFdrFTP0gJXgsWenczc1PavRVUmL1Eyb2swTAXXMpDOnr2zhNOBLx4w9AxkqbPQ==
+
+broccoli-output-wrapper@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-output-wrapper/-/broccoli-output-wrapper-2.0.0.tgz#f1e0b9b2f259a67fd41a380141c3c20b096828e6"
+  integrity sha512-V/ozejo+snzNf75i/a6iTmp71k+rlvqjE3+jYfimuMwR1tjNNRdtfno+NGNQB2An9bIAeqZnKhMDurAznHAdtA==
+  dependencies:
+    heimdalljs-logger "^0.1.10"
+
+broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.4.3:
+  version "1.4.6"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.6.tgz#80762d19000880a77da33c34373299c0f6a3e615"
+  integrity sha512-0RejLwoC95kv4kta8KAa+FmECJCK78Qgm8SRDEK7YyU0N9Cx6KpY3UCDy9WELl3mCXLN8TokNxc7/hp3lL4lfw==
+  dependencies:
+    async-disk-cache "^1.2.1"
+    async-promise-queue "^1.0.3"
+    broccoli-plugin "^1.0.0"
+    fs-tree-diff "^0.5.2"
+    hash-for-dep "^1.0.2"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    mkdirp "^0.5.1"
+    promise-map-series "^0.2.1"
+    rimraf "^2.6.1"
+    rsvp "^3.0.18"
+    symlink-or-copy "^1.0.1"
+    walk-sync "^0.3.1"
+
+broccoli-persistent-filter@^2.1.0, broccoli-persistent-filter@^2.2.1, broccoli-persistent-filter@^2.2.2, broccoli-persistent-filter@^2.3.0, broccoli-persistent-filter@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-2.3.1.tgz#4a052e0e0868b344c3a2977e35a3d497aa9eca72"
+  integrity sha512-hVsmIgCDrl2NFM+3Gs4Cr2TA6UPaIZip99hN8mtkaUPgM8UeVnCbxelCvBjUBHo0oaaqP5jzqqnRVvb568Yu5g==
+  dependencies:
+    async-disk-cache "^1.2.1"
+    async-promise-queue "^1.0.3"
+    broccoli-plugin "^1.0.0"
+    fs-tree-diff "^2.0.0"
+    hash-for-dep "^1.5.0"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    mkdirp "^0.5.1"
+    promise-map-series "^0.2.1"
+    rimraf "^2.6.1"
+    rsvp "^4.7.0"
+    symlink-or-copy "^1.0.1"
+    sync-disk-cache "^1.3.3"
+    walk-sync "^1.0.0"
+
+broccoli-plugin@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.1.0.tgz#73e2cfa05f8ea1e3fc1420c40c3d9e7dc724bf02"
+  integrity sha1-c+LPoF+OoeP8FCDEDD2efcckvwI=
+  dependencies:
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.0.1"
+
+broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli-plugin@^1.2.1, broccoli-plugin@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.3.1.tgz#a26315732fb99ed2d9fb58f12a1e14e986b4fabd"
+  integrity sha512-DW8XASZkmorp+q7J4EeDEZz+LoyKLAd2XZULXyD9l4m9/hAKV3vjHmB1kiUshcWAYMgTP1m2i4NnqCE/23h6AQ==
+  dependencies:
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.1.8"
+
+broccoli-plugin@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-2.1.0.tgz#2fab6c578219cfcc64f773e9616073313fc8b334"
+  integrity sha512-ElE4caljW4slapyEhSD9jU9Uayc8SoSABWdmY9SqbV8DHNxU6xg1jJsPcMm+cXOvggR3+G+OXAYQeFjWVnznaw==
+  dependencies:
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.1.8"
+
+broccoli-plugin@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-3.1.0.tgz#54ba6dd90a42ec3db5624063292610e326b1e542"
+  integrity sha512-7w7FP8WJYjLvb0eaw27LO678TGGaom++49O1VYIuzjhXjK5kn2+AMlDm7CaUFw4F7CLGoVQeZ84d8gICMJa4lA==
+  dependencies:
+    broccoli-node-api "^1.6.0"
+    broccoli-output-wrapper "^2.0.0"
+    fs-merger "^3.0.1"
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.1.8"
+
+broccoli-slow-trees@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-slow-trees/-/broccoli-slow-trees-3.1.0.tgz#8e48903f59e061bf1213963733b9e61dec2ee5d7"
+  integrity sha512-FRI7mRTk2wjIDrdNJd6znS7Kmmne4VkAkl8Ix1R/VoePFMD0g0tEl671xswzFqaRjpT9Qu+CC4hdXDLDJBuzMw==
+  dependencies:
+    heimdalljs "^0.2.1"
+
+broccoli-source@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-1.1.0.tgz#54f0e82c8b73f46580cbbc4f578f0b32fca8f809"
+  integrity sha1-VPDoLItz9GWAy7xPV48LMvyo+Ak=
+
+broccoli-source@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-3.0.0.tgz#c7c9ba24505941b72a0244568285bc859f69dfbd"
+  integrity sha512-G4Zc8HngZIdASyQOiz/9H/0Gjc2F02EFwhWF4wiueaI+/FBrM9Ixj6Prno/1aiLIYcN0JvRC3oytN9uOVonTww==
+  dependencies:
+    broccoli-node-api "^1.6.0"
+
+broccoli-sri-hash@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/broccoli-sri-hash/-/broccoli-sri-hash-2.1.2.tgz#bc69905ed7a381ad325cc0d02ded071328ebf3f3"
+  integrity sha1-vGmQXtejga0yXMDQLe0HEyjr8/M=
+  dependencies:
+    broccoli-caching-writer "^2.2.0"
+    mkdirp "^0.5.1"
+    rsvp "^3.1.0"
+    sri-toolbox "^0.2.0"
+    symlink-or-copy "^1.0.1"
+
+broccoli-stew@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-3.0.0.tgz#fd1d19d162ad9490b42e5c563b78c26eb1e80b95"
+  integrity sha512-NXfi+Vas24n3Ivo21GvENTI55qxKu7OwKRnCLWXld8MiLiQKQlWIq28eoARaFj0lTUFwUa4jKZeA7fW9PiWQeg==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-funnel "^2.0.0"
+    broccoli-merge-trees "^3.0.1"
+    broccoli-persistent-filter "^2.3.0"
+    broccoli-plugin "^2.1.0"
+    chalk "^2.4.1"
+    debug "^4.1.1"
+    ensure-posix-path "^1.0.1"
+    fs-extra "^8.0.1"
+    minimatch "^3.0.4"
+    resolve "^1.11.1"
+    rsvp "^4.8.5"
+    symlink-or-copy "^1.2.0"
+    walk-sync "^1.1.3"
+
+broccoli-uglify-sourcemap@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-3.2.0.tgz#d96f1d41f6c18e9a5d49af1a5ab9489cdcac1c6c"
+  integrity sha512-kkkn8v7kXdWwnZNekq+3ILuTAGkZoaoEMUYCKoER5/uokuoyTjtdYLHaE7UxHkuPEuLfjvJYv21sCCePZ74/2g==
+  dependencies:
+    async-promise-queue "^1.0.5"
+    broccoli-plugin "^1.2.1"
+    debug "^4.1.0"
+    lodash.defaultsdeep "^4.6.1"
+    matcher-collection "^2.0.0"
+    mkdirp "^0.5.0"
+    source-map-url "^0.4.0"
+    symlink-or-copy "^1.0.1"
+    terser "^4.3.9"
+    walk-sync "^1.1.3"
+    workerpool "^5.0.1"
+
+broccoli@^3.2.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-3.4.1.tgz#3acf2c8d998ed57fb7a89dee1b1b5e8e956e285b"
+  integrity sha512-DTIHD4olRsXr+Y+6k/E6PqnnSKAAROwgM77qmCloojmJS19QiIAJq7Pq2w6qZx9tQZt1zByhYgLm3r1m73yTPQ==
+  dependencies:
+    "@types/chai" "^4.2.9"
+    "@types/chai-as-promised" "^7.1.2"
+    "@types/express" "^4.17.2"
+    ansi-html "^0.0.7"
+    broccoli-node-info "^2.1.0"
+    broccoli-slow-trees "^3.0.1"
+    broccoli-source "^3.0.0"
+    commander "^4.1.1"
+    connect "^3.6.6"
+    console-ui "^3.0.4"
+    esm "^3.2.4"
+    findup-sync "^4.0.0"
+    handlebars "^4.7.3"
+    heimdalljs "^0.2.6"
+    heimdalljs-logger "^0.1.9"
+    https "^1.0.0"
+    mime-types "^2.1.26"
+    resolve-path "^1.4.0"
+    rimraf "^3.0.2"
+    sane "^4.0.0"
+    tmp "^0.0.33"
+    tree-sync "^2.0.0"
+    underscore.string "^3.2.2"
+    watch-detector "^1.0.0"
+
+brorand@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
+
+browser-process-hrtime@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
+  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
+
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+browserify-rsa@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
+  dependencies:
+    bn.js "^4.1.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
+  dependencies:
+    bn.js "^4.1.1"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.2"
+    elliptic "^6.0.0"
+    inherits "^2.0.1"
+    parse-asn1 "^5.0.0"
+
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
+  dependencies:
+    pako "~1.0.5"
+
+browserslist@^3.2.6:
+  version "3.2.8"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6"
+  integrity sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==
+  dependencies:
+    caniuse-lite "^1.0.30000844"
+    electron-to-chromium "^1.3.47"
+
+browserslist@^4.8.5, browserslist@^4.9.1:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
+  integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
+  dependencies:
+    caniuse-lite "^1.0.30001043"
+    electron-to-chromium "^1.3.413"
+    node-releases "^1.1.53"
+    pkg-up "^2.0.0"
+
+bser@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
+  dependencies:
+    node-int64 "^0.4.0"
+
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+
+buffer-alloc@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
+
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
+
+buffer@^4.3.0:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
+
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
+
+bytes@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
+  integrity sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=
+
+bytes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+
+cacache@^12.0.2:
+  version "12.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
+  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
+  dependencies:
+    bluebird "^3.5.5"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.4"
+    graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.3"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+cacheable-request@^2.1.1:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
+  integrity sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=
+  dependencies:
+    clone-response "1.0.2"
+    get-stream "3.0.0"
+    http-cache-semantics "3.8.1"
+    keyv "3.0.0"
+    lowercase-keys "1.0.0"
+    normalize-url "2.0.1"
+    responselike "1.0.2"
+
+calculate-cache-key-for-tree@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/calculate-cache-key-for-tree/-/calculate-cache-key-for-tree-2.0.0.tgz#7ac57f149a4188eacb0a45b210689215d3fef8d6"
+  integrity sha512-Quw8a6y8CPmRd6eU+mwypktYCwUcf8yVFIRbNZ6tPQEckX9yd+EBVEPC/GSZZrMWH9e7Vz4pT7XhpmyApRByLQ==
+  dependencies:
+    json-stable-stringify "^1.0.1"
+
+call-me-maybe@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
+
+callsite@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
+
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+can-symlink@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/can-symlink/-/can-symlink-1.0.0.tgz#97b607d8a84bb6c6e228b902d864ecb594b9d219"
+  integrity sha1-l7YH2KhLtsbiKLkC2GTstZS50hk=
+  dependencies:
+    tmp "0.0.28"
+
+caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001043:
+  version "1.0.30001048"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz#4bb4f1bc2eb304e5e1154da80b93dee3f1cf447e"
+  integrity sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==
+
+capture-exit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
+  dependencies:
+    rsvp "^4.8.4"
+
+capture-stack-trace@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
+  integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
+
+cardinal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9"
+  integrity sha1-UOIcGwqjdyn5N33vGWtanOyTLuk=
+  dependencies:
+    ansicolors "~0.2.1"
+    redeyed "~1.0.0"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
+chalk@^1.0.0, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+
+charm@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35"
+  integrity sha1-it02cVOm2aWBMxBSxAkJkdqZXjU=
+  dependencies:
+    inherits "^2.0.1"
+
+chokidar@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
+chownr@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+
+chrome-trace-event@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
+  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
+  dependencies:
+    tslib "^1.9.0"
+
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
+clean-base-url@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clean-base-url/-/clean-base-url-1.0.0.tgz#c901cf0a20b972435b0eccd52d056824a4351b7b"
+  integrity sha1-yQHPCiC5ckNbDszVLQVoJKQ1G3s=
+
+clean-css-promise@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/clean-css-promise/-/clean-css-promise-0.1.1.tgz#43f3d2c8dfcb2bf071481252cd9b76433c08eecb"
+  integrity sha1-Q/PSyN/LK/BxSBJSzZt2QzwI7ss=
+  dependencies:
+    array-to-error "^1.0.0"
+    clean-css "^3.4.5"
+    pinkie-promise "^2.0.0"
+
+clean-css@^3.4.5:
+  version "3.4.28"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
+  integrity sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=
+  dependencies:
+    commander "2.8.x"
+    source-map "0.4.x"
+
+clean-up-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clean-up-path/-/clean-up-path-1.0.0.tgz#de9e8196519912e749c9eaf67c13d64fac72a3e5"
+  integrity sha512-PHGlEF0Z6976qQyN6gM7kKH6EH0RdfZcc8V+QhFe36eRxV0SMH5OUBZG7Bxa9YcreNzyNbK63cGiZxdSZgosRw==
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
+cli-spinners@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.3.0.tgz#0632239a4b5aa4c958610142c34bb7a651fc8df5"
+  integrity sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==
+
+cli-table3@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
+  integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==
+  dependencies:
+    object-assign "^4.1.0"
+    string-width "^2.1.1"
+  optionalDependencies:
+    colors "^1.1.2"
+
+cli-table@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
+  integrity sha1-9TsFJmqLGguTSz0IIebi3FkUriM=
+  dependencies:
+    colors "1.0.3"
+
+cli-width@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
+
+clone-response@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+  dependencies:
+    mimic-response "^1.0.0"
+
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
+clone@^2.0.0, clone@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+colors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+  integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
+
+colors@^1.1.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@2.12.2:
+  version "2.12.2"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
+  integrity sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==
+
+commander@2.8.x:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
+  integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
+commander@^2.20.0, commander@^2.6.0, commander@~2.20.3:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+commander@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
+
+common-tags@^1.4.0, common-tags@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
+  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+
+component-bind@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
+
+component-emitter@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+
+component-emitter@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+
+component-inherit@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
+
+compressible@~2.0.16:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
+  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
+  dependencies:
+    mime-db ">= 1.43.0 < 2"
+
+compression@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+  dependencies:
+    accepts "~1.3.5"
+    bytes "3.0.0"
+    compressible "~2.0.16"
+    debug "2.6.9"
+    on-headers "~1.0.2"
+    safe-buffer "5.1.2"
+    vary "~1.1.2"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+concat-stream@^1.5.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+configstore@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
+  integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
+  dependencies:
+    dot-prop "^5.2.0"
+    graceful-fs "^4.1.2"
+    make-dir "^3.0.0"
+    unique-string "^2.0.0"
+    write-file-atomic "^3.0.0"
+    xdg-basedir "^4.0.0"
+
+connect@^3.6.6:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
+  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
+  dependencies:
+    debug "2.6.9"
+    finalhandler "1.1.2"
+    parseurl "~1.3.3"
+    utils-merge "1.0.1"
+
+console-browserify@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
+  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
+
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+
+console-ui@^3.0.4, console-ui@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-3.1.1.tgz#681a0414e8b0a23ed679d0a2802e39d920801171"
+  integrity sha512-22y+uk4AGq9quz6kofKQjkeCIAm86+MTxT/RZMFm8fMArP2lAkzxjUjNyrw7S6wXnnB+qRnC+/2ANMTke68RTQ==
+  dependencies:
+    chalk "^2.1.0"
+    inquirer "^6"
+    json-stable-stringify "^1.0.1"
+    ora "^3.4.0"
+    through2 "^3.0.1"
+
+consolidate@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
+  integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==
+  dependencies:
+    bluebird "^3.1.1"
+
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
+
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
+
+content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+
+continuable-cache@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
+  integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=
+
+convert-source-map@^1.5.1, convert-source-map@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+
+cookie@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
+
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
+copy-dereference@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/copy-dereference/-/copy-dereference-1.0.0.tgz#6b131865420fd81b413ba994b44d3655311152b6"
+  integrity sha1-axMYZUIP2BtBO6mUtE02VTERUrY=
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+
+core-js-compat@^3.6.2:
+  version "3.6.5"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
+  integrity sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==
+  dependencies:
+    browserslist "^4.8.5"
+    semver "7.0.0"
+
+core-js@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
+  integrity sha1-TekR5mew6ukSTjQlS1OupvxhjT4=
+
+core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
+  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
+
+core-object@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/core-object/-/core-object-3.1.5.tgz#fa627b87502adc98045e44678e9a8ec3b9c0d2a9"
+  integrity sha512-sA2/4+/PZ/KV6CKgjrVrrUVBKCkdDO02CUlQ0YKTQoYUwPYNOtOAcWlbYhd5v/1JqYaA6oZ4sDlOU4ppVw6Wbg==
+  dependencies:
+    chalk "^2.0.0"
+
+core-util-is@1.0.2, core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+create-ecdh@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.0.0"
+
+create-error-class@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
+  integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
+  dependencies:
+    capture-stack-trace "^1.0.0"
+
+create-hash@^1.1.0, create-hash@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+cross-spawn@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.2.tgz#d0d7dcfa74e89115c7619f4f721a94e1fdb716d6"
+  integrity sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
+
+crypto-random-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
+  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
+
+cssom@0.3.x, cssom@^0.3.4:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
+
+cssstyle@^1.1.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1"
+  integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==
+  dependencies:
+    cssom "0.3.x"
+
+cyclist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
+  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
+
+dag-map@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dag-map/-/dag-map-2.0.2.tgz#9714b472de82a1843de2fba9b6876938cab44c68"
+  integrity sha1-lxS0ct6CoYQ94vuptodpOMq0TGg=
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  dependencies:
+    assert-plus "^1.0.0"
+
+data-urls@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
+  integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==
+  dependencies:
+    abab "^2.0.0"
+    whatwg-mimetype "^2.2.0"
+    whatwg-url "^7.0.0"
+
+debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  dependencies:
+    ms "^2.1.1"
+
+debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
+debug@~3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  dependencies:
+    ms "2.0.0"
+
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+
+decompress-response@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
+  dependencies:
+    mimic-response "^1.0.0"
+
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  dependencies:
+    clone "^1.0.2"
+
+define-properties@^1.1.2, define-properties@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  dependencies:
+    object-keys "^1.0.12"
+
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+
+depd@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
+des.js@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
+  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+
+detect-file@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
+
+detect-indent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
+  dependencies:
+    repeating "^2.0.0"
+
+detect-indent@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd"
+  integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==
+
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
+detect-newline@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
+  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
+
+diff@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
+diffie-hellman@^5.0.0:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+dir-glob@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
+  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
+  dependencies:
+    path-type "^3.0.0"
+
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
+domain-browser@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
+
+domexception@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
+  dependencies:
+    webidl-conversions "^4.0.2"
+
+dot-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"
+  integrity sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==
+  dependencies:
+    no-case "^3.0.3"
+    tslib "^1.10.0"
+
+dot-prop@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
+  integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==
+  dependencies:
+    is-obj "^2.0.0"
+
+duplex@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/duplex/-/duplex-1.0.0.tgz#6abc5c16ec17e4c578578727126700590d3a2dda"
+  integrity sha1-arxcFuwX5MV4V4cnEmcAWQ06Ldo=
+
+duplexer3@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
+
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+editions@^1.1.1:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
+  integrity sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+electron-to-chromium@^1.3.413, electron-to-chromium@^1.3.47:
+  version "1.3.421"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.421.tgz#4abfe7e49070b5b437ec2ce442543add8eb66800"
+  integrity sha512-ogxgmvHGfDuLA+GtgfK0jkFWlBb4MCZK2U1MM+l98sf4U3Ixtrfw1iC9w4mQqNvo+lHgM4pR62TqoT4QrvKJCw==
+
+elliptic@^6.0.0:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
+  integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==
+  dependencies:
+    bn.js "^4.4.0"
+    brorand "^1.0.1"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.0"
+
+ember-assign-polyfill@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/ember-assign-polyfill/-/ember-assign-polyfill-2.6.0.tgz#07847e3357ee35b33f886a0b5fbec6873f6860eb"
+  integrity sha512-Y8NzOmHI/g4PuJ+xC14eTYiQbigNYddyHB8FY2kuQMxThTEIDE7SJtgttJrYYcPciOu0Tnb5ff36iO46LeiXkw==
+  dependencies:
+    ember-cli-babel "^6.16.0"
+    ember-cli-version-checker "^2.0.0"
+
+ember-auto-import@^1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.5.3.tgz#b32936f874d1ed7057ad2ed3f6116357820be44b"
+  integrity sha512-7JfdunM1BmLy/lyUXu7uEoi0Gi4+dxkGM23FgIEyW5g7z4MidhP53Fc61t49oPSnq7+J4lLpbH1f6C+mDMgb4A==
+  dependencies:
+    "@babel/core" "^7.1.6"
+    "@babel/preset-env" "^7.0.0"
+    "@babel/traverse" "^7.1.6"
+    "@babel/types" "^7.1.6"
+    "@embroider/core" "^0.4.3"
+    babel-core "^6.26.3"
+    babel-loader "^8.0.6"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    babel-template "^6.26.0"
+    babylon "^6.18.0"
+    broccoli-debug "^0.6.4"
+    broccoli-plugin "^1.3.0"
+    debug "^3.1.0"
+    ember-cli-babel "^6.6.0"
+    enhanced-resolve "^4.0.0"
+    fs-extra "^6.0.1"
+    fs-tree-diff "^1.0.0"
+    handlebars "^4.3.1"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.10"
+    mkdirp "^0.5.1"
+    pkg-up "^2.0.0"
+    resolve "^1.7.1"
+    rimraf "^2.6.2"
+    symlink-or-copy "^1.2.0"
+    typescript-memoize "^1.0.0-alpha.3"
+    walk-sync "^0.3.3"
+    webpack "~4.28"
+
+ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.0.tgz#de3baedd093163b6c2461f95964888c1676325ac"
+  integrity sha512-Zr4my8Xn+CzO0gIuFNXji0eTRml5AxZUTDQz/wsNJ5AJAtyFWCY4QtKdoELNNbiCVGt1lq5yLiwTm4scGKu6xA==
+
+ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.16.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
+  integrity sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==
+  dependencies:
+    amd-name-resolver "1.2.0"
+    babel-plugin-debug-macros "^0.2.0-beta.6"
+    babel-plugin-ember-modules-api-polyfill "^2.6.0"
+    babel-plugin-transform-es2015-modules-amd "^6.24.0"
+    babel-polyfill "^6.26.0"
+    babel-preset-env "^1.7.0"
+    broccoli-babel-transpiler "^6.5.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.0"
+    broccoli-source "^1.1.0"
+    clone "^2.0.0"
+    ember-cli-version-checker "^2.1.2"
+    semver "^5.5.0"
+
+ember-cli-babel@^7.11.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.7.3:
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.19.0.tgz#e6eddea18a867231fcf90a80689e92b98be9a63b"
+  integrity sha512-HiWKuoyy35vGEr+iCw6gUnQ3pS5qslyTlKEDW8cVoMbvZNGYBgRxHed5nklVUh+BS74AwR9lsp25BTAagYAP9Q==
+  dependencies:
+    "@babel/core" "^7.9.0"
+    "@babel/helper-compilation-targets" "^7.8.7"
+    "@babel/plugin-proposal-class-properties" "^7.8.3"
+    "@babel/plugin-proposal-decorators" "^7.8.3"
+    "@babel/plugin-transform-modules-amd" "^7.9.0"
+    "@babel/plugin-transform-runtime" "^7.9.0"
+    "@babel/plugin-transform-typescript" "^7.9.0"
+    "@babel/polyfill" "^7.8.7"
+    "@babel/preset-env" "^7.9.0"
+    "@babel/runtime" "^7.9.0"
+    amd-name-resolver "^1.2.1"
+    babel-plugin-debug-macros "^0.3.0"
+    babel-plugin-ember-data-packages-polyfill "^0.1.2"
+    babel-plugin-ember-modules-api-polyfill "^2.12.0"
+    babel-plugin-module-resolver "^3.1.1"
+    broccoli-babel-transpiler "^7.4.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.1"
+    broccoli-source "^1.1.0"
+    clone "^2.1.2"
+    ember-cli-babel-plugin-helpers "^1.1.0"
+    ember-cli-version-checker "^4.1.0"
+    ensure-posix-path "^1.0.2"
+    fixturify-project "^1.10.0"
+    rimraf "^3.0.1"
+    semver "^5.5.0"
+
+ember-cli-dependency-checker@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.2.0.tgz#9202ad9e14d6fda33cffc22a11c343c2a8885330"
+  integrity sha512-dkSmcJ/jY/2ms/S6ph2jXSfOW5VfOpLfg5DFEbra0SaMNgYkNDFF1o0U4OdTsG37L5h/AXWNuVtnOa4TMabz9Q==
+  dependencies:
+    chalk "^2.3.0"
+    find-yarn-workspace-root "^1.1.0"
+    is-git-url "^1.0.0"
+    resolve "^1.5.0"
+    semver "^5.3.0"
+
+ember-cli-eslint@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-eslint/-/ember-cli-eslint-5.1.0.tgz#acdb9b072911e04b07c313b610f514db4086d21a"
+  integrity sha512-o6787b0tgkRNp+KJo5BiQxtkLuz/yyYqVWF31LPrh+ZCC8jETrfyjsuk8VPDxKLGq7qEiQNJUgOEW87HTad7Vg==
+  dependencies:
+    broccoli-lint-eslint "^5.0.0"
+    ember-cli-version-checker "^3.0.0"
+    rsvp "^4.6.1"
+    walk-sync "^1.0.0"
+
+ember-cli-get-component-path-option@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
+  integrity sha1-DXtZVVni+QUKvtgE8djv8bCLx3E=
+
+ember-cli-htmlbars-inline-precompile@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-2.1.0.tgz#61b91ff1879d44ae504cadb46fb1f2604995ae08"
+  integrity sha512-BylIHduwQkncPhnj0ZyorBuljXbTzLgRo6kuHf1W+IHFxThFl2xG+r87BVwsqx4Mn9MTgW9SE0XWjwBJcSWd6Q==
+  dependencies:
+    babel-plugin-htmlbars-inline-precompile "^1.0.0"
+    ember-cli-version-checker "^2.1.2"
+    hash-for-dep "^1.2.3"
+    heimdalljs-logger "^0.1.9"
+    silent-error "^1.1.0"
+
+ember-cli-htmlbars@^4.2.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.3.1.tgz#4af8adc21ab3c4953f768956b7f7d207782cb175"
+  integrity sha512-CW6AY/yzjeVqoRtItOKj3hcYzc5dWPRETmeCzr2Iqjt5vxiVtpl0z5VTqHqIlT5fsFx6sGWBQXNHIe+ivYsxXQ==
+  dependencies:
+    "@ember/edition-utils" "^1.2.0"
+    babel-plugin-htmlbars-inline-precompile "^3.0.1"
+    broccoli-debug "^0.6.5"
+    broccoli-persistent-filter "^2.3.1"
+    broccoli-plugin "^3.1.0"
+    common-tags "^1.8.0"
+    ember-cli-babel-plugin-helpers "^1.1.0"
+    fs-tree-diff "^2.0.1"
+    hash-for-dep "^1.5.1"
+    heimdalljs-logger "^0.1.10"
+    json-stable-stringify "^1.0.1"
+    semver "^6.3.0"
+    strip-bom "^4.0.0"
+    walk-sync "^2.0.2"
+
+ember-cli-inject-live-reload@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-2.0.2.tgz#95edb543b386239d35959e5ea9579f5382976ac7"
+  integrity sha512-HDD6o/kBHT/kUtazklU0OW23q2jigIN42QmcpFdXUSvJ2/2SYA6yIqSUxWfJgISmtn5gTNZ2KPq1p3dLkhJxSQ==
+  dependencies:
+    clean-base-url "^1.0.0"
+    ember-cli-version-checker "^3.1.3"
+
+ember-cli-is-package-missing@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-is-package-missing/-/ember-cli-is-package-missing-1.0.0.tgz#6e6184cafb92635dd93ca6c946b104292d4e3390"
+  integrity sha1-bmGEyvuSY13ZPKbJRrEEKS1OM5A=
+
+ember-cli-lodash-subset@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
+  integrity sha1-IMtop5D+D94kiN39jvu332/nZvI=
+
+ember-cli-normalize-entity-name@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz#0b14f7bcbc599aa117b5fddc81e4fd03c4bad5b7"
+  integrity sha1-CxT3vLxZmqEXtf3cgeT9A8S61bc=
+  dependencies:
+    silent-error "^1.0.0"
+
+ember-cli-path-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-path-utils/-/ember-cli-path-utils-1.0.0.tgz#4e39af8b55301cddc5017739b77a804fba2071ed"
+  integrity sha1-Tjmvi1UwHN3FAXc5t3qAT7ogce0=
+
+ember-cli-preprocess-registry@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-preprocess-registry/-/ember-cli-preprocess-registry-3.3.0.tgz#685837a314fbe57224bd54b189f4b9c23907a2de"
+  integrity sha512-60GYpw7VPeB7TvzTLZTuLTlHdOXvayxjAQ+IxM2T04Xkfyu75O2ItbWlftQW7NZVGkaCsXSRAmn22PG03VpLMA==
+  dependencies:
+    broccoli-clean-css "^1.1.0"
+    broccoli-funnel "^2.0.1"
+    debug "^3.0.1"
+    process-relative-require "^1.0.0"
+
+ember-cli-sri@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-sri/-/ember-cli-sri-2.1.1.tgz#971620934a4b9183cf7923cc03e178b83aa907fd"
+  integrity sha1-lxYgk0pLkYPPeSPMA+F4uDqpB/0=
+  dependencies:
+    broccoli-sri-hash "^2.1.0"
+
+ember-cli-string-utils@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1"
+  integrity sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=
+
+ember-cli-template-lint@^1.0.0-beta.3:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-template-lint/-/ember-cli-template-lint-1.0.0.tgz#8ca8f5f05fdcad35c13f26b65fb93c016196bdc9"
+  integrity sha512-acWyJUvRFo2aA/0kqeUxfCPwLtPk3ckZ/1I0BzBX9qW/Gi8qWqYnwnI/vEotIqmsQl+npbl0/SXeQHFrUdyB0g==
+  dependencies:
+    aot-test-generators "^0.1.0"
+    broccoli-concat "^3.7.1"
+    broccoli-persistent-filter "^2.1.0"
+    chalk "^2.4.1"
+    debug "^4.0.1"
+    ember-cli-version-checker "^3.0.1"
+    ember-template-lint "^1.2.0"
+    json-stable-stringify "^1.0.1"
+    md5-hex "^2.0.0"
+    strip-ansi "^4.0.0"
+    walk-sync "^1.1.3"
+
+ember-cli-test-loader@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-2.2.0.tgz#3fb8d5d1357e4460d3f0a092f5375e71b6f7c243"
+  integrity sha512-mlSXX9SciIRwGkFTX6XGyJYp4ry6oCFZRxh5jJ7VH8UXLTNx2ZACtDTwaWtNhYrWXgKyiDUvmD8enD56aePWRA==
+  dependencies:
+    ember-cli-babel "^6.8.1"
+
+ember-cli-typescript@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-3.0.0.tgz#3b838d1ce9e4d22a98e68da22ceac6dc0cfd9bfc"
+  integrity sha512-lo5YArbJzJi5ssvaGqTt6+FnhTALnSvYVuxM7lfyL1UCMudyNJ94ovH5C7n5il7ATd6WsNiAPRUO/v+s5Jq/aA==
+  dependencies:
+    "@babel/plugin-transform-typescript" "~7.5.0"
+    ansi-to-html "^0.6.6"
+    debug "^4.0.0"
+    ember-cli-babel-plugin-helpers "^1.0.0"
+    execa "^2.0.0"
+    fs-extra "^8.0.0"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^6.0.0"
+    stagehand "^1.0.0"
+    walk-sync "^2.0.0"
+
+ember-cli-typescript@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-2.0.2.tgz#464984131fbdc05655eb61d1c3cdd911d3137f0d"
+  integrity sha512-7I5azCTxOgRDN8aSSnJZIKSqr+MGnT+jLTUbBYqF8wu6ojs2DUnTePxUcQMcvNh3Q3B1ySv7Q/uZFSjdU9gSjA==
+  dependencies:
+    "@babel/plugin-proposal-class-properties" "^7.1.0"
+    "@babel/plugin-transform-typescript" "~7.4.0"
+    ansi-to-html "^0.6.6"
+    debug "^4.0.0"
+    ember-cli-babel-plugin-helpers "^1.0.0"
+    execa "^1.0.0"
+    fs-extra "^7.0.0"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^6.0.0"
+    stagehand "^1.0.0"
+    walk-sync "^1.0.0"
+
+ember-cli-uglify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-3.0.0.tgz#8819665b2cc5fe70e3ba9fe7a94645209bc42fd6"
+  integrity sha512-n3QxdBfAgBdb2Cnso82Kt/nxm3ppIjnYWM8uhOEhF1aYxNXfM7AJrc+yiqTCDUR61Db8aCpHfAMvChz3kyme7g==
+  dependencies:
+    broccoli-uglify-sourcemap "^3.1.0"
+    lodash.defaultsdeep "^4.6.0"
+
+ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.1, ember-cli-version-checker@^2.1.2:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3"
+  integrity sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg==
+  dependencies:
+    resolve "^1.3.3"
+    semver "^5.3.0"
+
+ember-cli-version-checker@^3.0.0, ember-cli-version-checker@^3.0.1, ember-cli-version-checker@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-3.1.3.tgz#7c9b4f5ff30fdebcd480b1c06c4de43bb51c522c"
+  integrity sha512-PZNSvpzwWgv68hcXxyjREpj3WWb81A7rtYNQq1lLEgrWIchF8ApKJjWP3NBpHjaatwILkZAV8klair5WFlXAKg==
+  dependencies:
+    resolve-package-path "^1.2.6"
+    semver "^5.6.0"
+
+ember-cli-version-checker@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-4.1.0.tgz#7fc9836bdbc87451d286ba6a9a89b23591d8bbb7"
+  integrity sha512-yLf2YqotTSsjiXwx9Dt6H7AU0QcldFn5SLk/pG3Zqb0aHNeanBOPlx4/Ysa46ILGWYIh0fDH34AEVRueXTrQBQ==
+  dependencies:
+    resolve-package-path "^2.0.0"
+    semver "^6.3.0"
+    silent-error "^1.1.1"
+
+ember-cli@~3.15.2:
+  version "3.15.2"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.15.2.tgz#c2a5871850da7537e0cb3cd0e7d59fd76cd3184e"
+  integrity sha512-ciuFaLokZDJfEzltH3QUxZYnQcigCzNrjyyVbeNtr3qUMICHZEzrreQjqIdmuOzmog+BOFddgAB2i/b7ewmV0Q==
+  dependencies:
+    "@babel/core" "^7.7.2"
+    "@babel/plugin-transform-modules-amd" "^7.5.0"
+    amd-name-resolver "^1.3.1"
+    babel-plugin-module-resolver "^3.2.0"
+    bower-config "^1.4.1"
+    bower-endpoint-parser "0.2.2"
+    broccoli "^3.2.0"
+    broccoli-amd-funnel "^2.0.1"
+    broccoli-babel-transpiler "^7.3.0"
+    broccoli-builder "^0.18.14"
+    broccoli-concat "^3.7.4"
+    broccoli-config-loader "^1.0.1"
+    broccoli-config-replace "^1.1.2"
+    broccoli-debug "^0.6.5"
+    broccoli-funnel "^2.0.2"
+    broccoli-funnel-reducer "^1.0.0"
+    broccoli-merge-trees "^3.0.2"
+    broccoli-middleware "^2.1.0"
+    broccoli-module-normalizer "^1.3.0"
+    broccoli-module-unification-reexporter "^1.0.0"
+    broccoli-slow-trees "^3.0.1"
+    broccoli-source "^3.0.0"
+    broccoli-stew "^3.0.0"
+    calculate-cache-key-for-tree "^2.0.0"
+    capture-exit "^2.0.0"
+    chalk "^2.4.2"
+    ci-info "^2.0.0"
+    clean-base-url "^1.0.0"
+    compression "^1.7.4"
+    configstore "^5.0.0"
+    console-ui "^3.1.1"
+    core-object "^3.1.5"
+    dag-map "^2.0.2"
+    diff "^4.0.1"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-lodash-subset "^2.0.1"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-preprocess-registry "^3.3.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-source-channel-url "^2.0.1"
+    ensure-posix-path "^1.0.2"
+    execa "^1.0.0"
+    exit "^0.1.2"
+    express "^4.16.4"
+    filesize "^4.2.0"
+    find-up "^4.1.0"
+    find-yarn-workspace-root "^1.2.1"
+    fs-extra "^8.1.0"
+    fs-tree-diff "^2.0.1"
+    get-caller-file "^2.0.5"
+    git-repo-info "^2.1.0"
+    glob "^7.1.4"
+    heimdalljs "^0.2.6"
+    heimdalljs-fs-monitor "^0.2.3"
+    heimdalljs-graph "^1.0.0"
+    heimdalljs-logger "^0.1.10"
+    http-proxy "^1.18.0"
+    inflection "^1.12.0"
+    is-git-url "^1.0.0"
+    isbinaryfile "^3.0.3"
+    js-yaml "^3.13.1"
+    json-stable-stringify "^1.0.1"
+    leek "0.0.24"
+    lodash.template "^4.5.0"
+    markdown-it "^9.1.0"
+    markdown-it-terminal "0.1.0"
+    minimatch "^3.0.4"
+    morgan "^1.9.1"
+    nopt "^3.0.6"
+    npm-package-arg "^6.1.1"
+    p-defer "^3.0.0"
+    portfinder "^1.0.25"
+    promise-map-series "^0.2.3"
+    promise.prototype.finally "^3.1.1"
+    quick-temp "^0.1.8"
+    resolve "^1.12.0"
+    resolve-package-path "^1.2.7"
+    rsvp "^4.8.5"
+    sane "^4.1.0"
+    semver "^6.3.0"
+    silent-error "^1.1.1"
+    sort-package-json "^1.23.1"
+    symlink-or-copy "^1.2.0"
+    temp "0.9.0"
+    testem "^2.17.0"
+    tiny-lr "^1.1.1"
+    tree-sync "^2.0.0"
+    uuid "^3.3.3"
+    walk-sync "^2.0.2"
+    watch-detector "^1.0.0"
+    yam "^1.0.0"
+
+ember-compatibility-helpers@^1.1.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.1.tgz#87c92c4303f990ff455c28ca39fb3ee11441aa16"
+  integrity sha512-6wzYvnhg1ihQUT5yGqnLtleq3Nv5KNv79WhrEuNU9SwR4uIxCO+KpyC7r3d5VI0EM7/Nmv9Nd0yTkzmTMdVG1A==
+  dependencies:
+    babel-plugin-debug-macros "^0.2.0"
+    ember-cli-version-checker "^2.1.1"
+    semver "^5.4.1"
+
+ember-disable-prototype-extensions@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/ember-disable-prototype-extensions/-/ember-disable-prototype-extensions-1.1.3.tgz#1969135217654b5e278f9fe2d9d4e49b5720329e"
+  integrity sha1-GWkTUhdlS14nj5/i2dTkm1cgMp4=
+
+ember-export-application-global@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-2.0.1.tgz#b120a70e322ab208defc9e2daebe8d0dfc2dcd46"
+  integrity sha512-B7wiurPgsxsSGzJuPFkpBWnaeuCu2PGpG2BjyrfA1VcL7//o+5RSnZqiCEY326y7qmxb2GoCgo0ft03KBU0rRw==
+
+ember-load-initializers@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-2.1.1.tgz#d1a8bead00bc44222b0ab181840869992beb30f5"
+  integrity sha512-Ho5sBeaZPN3HmZkYkcLrjSBF3DTNmzC5h0DizzDj8cjpnCvaqeofphJDnH41k6kLv/QHMk4pMRISPcwc+bOceQ==
+  dependencies:
+    ember-cli-babel "^7.11.0"
+    ember-cli-typescript "^2.0.2"
+
+ember-maybe-import-regenerator@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/ember-maybe-import-regenerator/-/ember-maybe-import-regenerator-0.1.6.tgz#35d41828afa6d6a59bc0da3ce47f34c573d776ca"
+  integrity sha1-NdQYKK+m1qWbwNo85H80xXPXdso=
+  dependencies:
+    broccoli-funnel "^1.0.1"
+    broccoli-merge-trees "^1.0.0"
+    ember-cli-babel "^6.0.0-beta.4"
+    regenerator-runtime "^0.9.5"
+
+ember-qunit@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-4.6.0.tgz#ad79fd3ff00073a8779400cc5a4b44829517590f"
+  integrity sha512-i5VOGn0RP8XH+5qkYDOZshbqAvO6lHgF65D0gz8vRx4DszCIvJMJO+bbftBTfYMxp6rqG85etAA6pfNxE0DqsQ==
+  dependencies:
+    "@ember/test-helpers" "^1.7.1"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.2"
+    common-tags "^1.4.0"
+    ember-cli-babel "^7.12.0"
+    ember-cli-test-loader "^2.2.0"
+    qunit "^2.9.3"
+
+ember-resolver@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-7.0.0.tgz#07ca86b3bae373395b44bba784b8c133f75d61c2"
+  integrity sha512-tqyWk9E1P5LL42x7AnVoE25a/YWe0WcwAr8LXasm5V7Az3vFR/zbFtwN0oI3tpoSP/nCoGWDct6dRYlXrQjqBQ==
+  dependencies:
+    babel-plugin-debug-macros "^0.3.3"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.0"
+    ember-cli-babel "^7.13.2"
+    ember-cli-version-checker "^3.1.3"
+    resolve "^1.14.0"
+
+ember-rfc176-data@^0.3.12:
+  version "0.3.12"
+  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.12.tgz#90d82878e69e2ac9a5438e8ce14d12c6031c5bd2"
+  integrity sha512-g9HeZj/gU5bfIIrGXkP7MhS2b3Vu5DfNUrYr14hy99TgIvtZETO+96QF4WOEUXGjIJdfTRjerVnQlqngPQSv1g==
+
+ember-router-generator@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-2.0.0.tgz#d04abfed4ba8b42d166477bbce47fccc672dbde0"
+  integrity sha512-89oVHVJwmLDvGvAUWgS87KpBoRhy3aZ6U0Ql6HOmU4TrPkyaa8pM0W81wj9cIwjYprcQtN9EwzZMHnq46+oUyw==
+  dependencies:
+    "@babel/parser" "^7.4.5"
+    "@babel/traverse" "^7.4.5"
+    recast "^0.18.1"
+
+ember-source-channel-url@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ember-source-channel-url/-/ember-source-channel-url-1.2.0.tgz#77eb9d0889e5f5370e6c70fcb2696c63ff4a34a1"
+  integrity sha512-CLClcHzVf+8GoFk4176R16nwXoel70bd7DKVAY6D8M0m5fJJhbTrAPYpDA0lY8A60HZo9j/s8A8LWiGh1YmdZg==
+  dependencies:
+    got "^8.0.1"
+
+ember-source-channel-url@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-source-channel-url/-/ember-source-channel-url-2.0.1.tgz#18b88f8a00b7746e7a456b3551abb3aea18729cc"
+  integrity sha512-YlLUHW9gNvxEaohIj5exykoTZb4xj9ZRTcR4J3svv9S8rjAHJUnHmqC5Fd9onCs+NGxHo7KwR/fDwsfadbDu5Q==
+  dependencies:
+    got "^8.0.1"
+
+ember-source@~3.15.0:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.15.0.tgz#f6500c6d289ce58231bf1e6695c4974df2be7390"
+  integrity sha512-daTELJBDMGqAmQb/Puxdk1YR204/zs1DEiEMQWlqbtmhphAoDUbGi9ifJu20ajP/IcOCWw9Vp7aPzguTohWF7w==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/plugin-transform-block-scoping" "^7.6.2"
+    "@babel/plugin-transform-object-assign" "^7.2.0"
+    "@ember/edition-utils" "^1.1.1"
+    babel-plugin-debug-macros "^0.3.3"
+    babel-plugin-filter-imports "^3.0.0"
+    broccoli-concat "^3.7.4"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.2"
+    chalk "^2.4.2"
+    ember-cli-babel "^7.11.0"
+    ember-cli-get-component-path-option "^1.0.0"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-path-utils "^1.0.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-version-checker "^3.1.3"
+    ember-router-generator "^2.0.0"
+    inflection "^1.12.0"
+    jquery "^3.4.1"
+    resolve "^1.11.1"
+    semver "^6.1.1"
+    silent-error "^1.1.1"
+
+ember-template-lint@^1.2.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-1.14.0.tgz#fd3e8ec600b0b3de16b5701bf02acc99d192008e"
+  integrity sha512-M4CebpUZ6G8NEX05FsvlB6nFRO9Xi3eJWbGbnHI1Sakyp5Hl739fTPR5yPn/Gscc/sgNU25Rq1RSm0hoevrYGA==
+  dependencies:
+    "@glimmer/syntax" "^0.47.9"
+    chalk "^2.4.2"
+    globby "^9.2.0"
+    minimatch "^3.0.4"
+    resolve "^1.15.1"
+    strip-bom "^3.0.0"
+
+ember-test-waiters@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ember-test-waiters/-/ember-test-waiters-1.2.0.tgz#c12ead4313934c24cff41857020cacdbf8e6effe"
+  integrity sha512-aEw7YuutLuJT4NUuPTNiGFwgTYl23ThqmBxSkfFimQAn+keWjAftykk3dlFELuhsJhYW/S8YoVjN0bSAQRLNtw==
+  dependencies:
+    ember-cli-babel "^7.11.0"
+    semver "^6.3.0"
+
+ember-try-config@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-try-config/-/ember-try-config-3.0.0.tgz#012d8c90cae9eb624e2b62040bf7e76a1aa58edc"
+  integrity sha512-pNwHS29O1ACczkrxBKRtDY0TzTb7uPnA5eHEe+4NF6qpLK5FVnL3EtgZ8+yVYtnm1If5mZ07rIubw45vaSek7w==
+  dependencies:
+    ember-source-channel-url "^1.0.1"
+    lodash "^4.6.1"
+    package-json "^4.0.1"
+    remote-git-tags "^2.0.0"
+    rsvp "^4.8.1"
+    semver "^5.5.0"
+
+ember-try@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-1.4.0.tgz#be15965bd1727c27a65a78c4c8392f03763cc565"
+  integrity sha512-o0SoCH4K8umCf8etphla8FDygKfQGkwY+w47wEuYFVKaESrOZaK63ObnAK7DTKkjJU74Fss2abf+r+pAWpX43g==
+  dependencies:
+    chalk "^2.4.2"
+    cli-table3 "^0.5.1"
+    core-object "^3.1.5"
+    debug "^4.1.1"
+    ember-try-config "^3.0.0"
+    execa "^1.0.0"
+    extend "^3.0.0"
+    fs-extra "^5.0.0"
+    promise-map-series "^0.2.1"
+    resolve "^1.10.1"
+    rimraf "^2.6.3"
+    rsvp "^4.7.0"
+    walk-sync "^1.1.3"
+
+emit-function@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/emit-function/-/emit-function-0.0.2.tgz#e3a50b3d61be1bf8ca88b924bf713157a5bec124"
+  integrity sha1-46ULPWG+G/jKiLkkv3ExV6W+wSQ=
+
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
+engine.io-client@~3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.1.tgz#922ddb47eecdcb541136a93aeead24718fd05461"
+  integrity sha512-RJNmA+A9Js+8Aoq815xpGAsgWH1VoSYM//2VgIiu9lNOaHFfLpTjH4tOzktBpjIs5lvOfiNY1dwf+NuU6D38Mw==
+  dependencies:
+    component-emitter "1.2.1"
+    component-inherit "0.0.3"
+    debug "~4.1.0"
+    engine.io-parser "~2.2.0"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    ws "~6.1.0"
+    xmlhttprequest-ssl "~1.5.4"
+    yeast "0.1.2"
+
+engine.io-parser@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.0.tgz#312c4894f57d52a02b420868da7b5c1c84af80ed"
+  integrity sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==
+  dependencies:
+    after "0.8.2"
+    arraybuffer.slice "~0.0.7"
+    base64-arraybuffer "0.1.5"
+    blob "0.0.5"
+    has-binary2 "~1.0.2"
+
+engine.io@~3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.1.tgz#a61cbc13fa0cb27d9453fd079a29ee980564b069"
+  integrity sha512-8MfIfF1/IIfxuc2gv5K+XlFZczw/BpTvqBdl0E2fBLkYQp4miv4LuDTVtYt4yMyaIFLEr4vtaSgV4mjvll8Crw==
+  dependencies:
+    accepts "~1.3.4"
+    base64id "2.0.0"
+    cookie "0.3.1"
+    debug "~4.1.0"
+    engine.io-parser "~2.2.0"
+    ws "^7.1.2"
+
+enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
+  integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.5.0"
+    tapable "^1.0.0"
+
+ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, ensure-posix-path@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce"
+  integrity sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==
+
+entities@^1.1.2, entities@~1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+
+errno@^0.1.3, errno@~0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
+  dependencies:
+    prr "~1.0.1"
+
+error@^7.0.0:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/error/-/error-7.2.1.tgz#eab21a4689b5f684fc83da84a0e390de82d94894"
+  integrity sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==
+  dependencies:
+    string-template "~0.2.1"
+
+es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5:
+  version "1.17.5"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
+  integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.1.5"
+    is-regex "^1.0.5"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimleft "^2.1.1"
+    string.prototype.trimright "^2.1.1"
+
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+escodegen@^1.11.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"
+  integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+eslint-plugin-ember@^7.7.1:
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-7.13.0.tgz#a1df7794f06cdc6e1b8acfe6c59db5cf861f53dc"
+  integrity sha512-qIbw4uP0qUJoiWF4+7MTJWqwEN86RGmBNId0cwSoHoVNWtcw50R1ajYgxM1Q5FVUdoisVeSl9lKVRh5zkDFl+g==
+  dependencies:
+    "@ember-data/rfc395-data" "^0.0.4"
+    ember-rfc176-data "^0.3.12"
+    snake-case "^3.0.3"
+
+eslint-plugin-es@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz#0f5f5da5f18aa21989feebe8a73eadefb3432976"
+  integrity sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ==
+  dependencies:
+    eslint-utils "^1.4.2"
+    regexpp "^3.0.0"
+
+eslint-plugin-node@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-10.0.0.tgz#fd1adbc7a300cf7eb6ac55cf4b0b6fc6e577f5a6"
+  integrity sha512-1CSyM/QCjs6PXaT18+zuAXsjXGIGo5Rw630rSKwokSs2jrYURQc4R5JZpoanNCqwNmepg+0eZ9L7YiRUJb8jiQ==
+  dependencies:
+    eslint-plugin-es "^2.0.0"
+    eslint-utils "^1.4.2"
+    ignore "^5.1.1"
+    minimatch "^3.0.4"
+    resolve "^1.10.1"
+    semver "^6.1.0"
+
+eslint-scope@^4.0.0, eslint-scope@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-utils@^1.3.1, eslint-utils@^1.4.2:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
+  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
+  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+
+eslint@^5.6.0:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
+  integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    ajv "^6.9.1"
+    chalk "^2.1.0"
+    cross-spawn "^6.0.5"
+    debug "^4.0.1"
+    doctrine "^3.0.0"
+    eslint-scope "^4.0.3"
+    eslint-utils "^1.3.1"
+    eslint-visitor-keys "^1.0.0"
+    espree "^5.0.1"
+    esquery "^1.0.1"
+    esutils "^2.0.2"
+    file-entry-cache "^5.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob "^7.1.2"
+    globals "^11.7.0"
+    ignore "^4.0.6"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    inquirer "^6.2.2"
+    js-yaml "^3.13.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.11"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.2"
+    progress "^2.0.0"
+    regexpp "^2.0.1"
+    semver "^5.5.1"
+    strip-ansi "^4.0.0"
+    strip-json-comments "^2.0.1"
+    table "^5.2.3"
+    text-table "^0.2.0"
+
+esm@^3.2.4:
+  version "3.2.25"
+  resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
+  integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
+
+espree@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
+  integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
+  dependencies:
+    acorn "^6.0.7"
+    acorn-jsx "^5.0.0"
+    eslint-visitor-keys "^1.0.0"
+
+esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+esprima@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
+  integrity sha1-U88kes2ncxPlUcOqLnM0LT+099k=
+
+esquery@^1.0.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
+  dependencies:
+    estraverse "^5.1.0"
+
+esrecurse@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
+  dependencies:
+    estraverse "^4.1.0"
+
+estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+estraverse@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
+  integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+
+eventemitter3@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
+  integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==
+
+events-to-array@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.1.2.tgz#2d41f563e1fe400ed4962fe1a4d5c6a7539df7f6"
+  integrity sha1-LUH1Y+H+QA7Uli/hpNXGp1Od9/Y=
+
+events@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"
+  integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
+exec-sh@^0.3.2:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
+  integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
+
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+execa@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99"
+  integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^3.0.0"
+    onetime "^5.1.0"
+    p-finally "^2.0.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
+exists-sync@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.4.tgz#9744c2c428cc03b01060db454d4b12f0ef3c8879"
+  integrity sha1-l0TCxCjMA7AQYNtFTUsS8O88iHk=
+
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+expand-tilde@^2.0.0, expand-tilde@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
+  dependencies:
+    homedir-polyfill "^1.0.1"
+
+express@^4.10.7, express@^4.16.4:
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+  dependencies:
+    accepts "~1.3.7"
+    array-flatten "1.1.1"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
+    content-type "~1.0.4"
+    cookie "0.4.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extend@^3.0.0, extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+external-editor@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
+fast-deep-equal@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
+  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+
+fast-glob@^2.2.6:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
+  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
+  dependencies:
+    "@mrmlnc/readdir-enhanced" "^2.2.1"
+    "@nodelib/fs.stat" "^1.1.2"
+    glob-parent "^3.1.0"
+    is-glob "^4.0.0"
+    merge2 "^1.2.3"
+    micromatch "^3.1.10"
+
+fast-glob@^3.1.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d"
+  integrity sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@~2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
+fast-ordered-set@^1.0.0, fast-ordered-set@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/fast-ordered-set/-/fast-ordered-set-1.0.3.tgz#3fbb36634f7be79e4f7edbdb4a357dee25d184eb"
+  integrity sha1-P7s2Y097555PftvbSjV97iXRhOs=
+  dependencies:
+    blank-object "^1.0.1"
+
+fast-sourcemap-concat@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/fast-sourcemap-concat/-/fast-sourcemap-concat-1.4.0.tgz#122c330d4a2afaff16ad143bc9674b87cd76c8ad"
+  integrity sha512-x90Wlx/2C83lfyg7h4oguTZN4MyaVfaiUSJQNpU+YEA0Odf9u659Opo44b0LfoVg9G/bOE++GdID/dkyja+XcA==
+  dependencies:
+    chalk "^2.0.0"
+    fs-extra "^5.0.0"
+    heimdalljs-logger "^0.1.9"
+    memory-streams "^0.1.3"
+    mkdirp "^0.5.0"
+    source-map "^0.4.2"
+    source-map-url "^0.3.0"
+    sourcemap-validator "^1.1.0"
+
+fastq@^1.6.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.7.0.tgz#fcd79a08c5bd7ec5b55cd3f5c4720db551929801"
+  integrity sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==
+  dependencies:
+    reusify "^1.0.4"
+
+faye-websocket@~0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+fb-watchman@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
+  dependencies:
+    bser "2.1.1"
+
+figgy-pudding@^3.5.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
+  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
+
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+figures@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-entry-cache@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
+  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+  dependencies:
+    flat-cache "^2.0.1"
+
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
+filesize@^4.1.2, filesize@^4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-4.2.1.tgz#ab1cb2069db5d415911c1a13e144c0e743bc89bc"
+  integrity sha512-bP82Hi8VRZX/TUBKfE24iiUGsB/sfm2WUrwTQyAzQrhO3V9IhcBBNBXMyzLY5orACxRyYJ3d2HeRVX+eFv4lmA==
+
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+finalhandler@1.1.2, finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
+
+find-babel-config@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
+  integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
+  dependencies:
+    json5 "^0.5.1"
+    path-exists "^3.0.0"
+
+find-cache-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^2.0.0"
+    pkg-dir "^3.0.0"
+
+find-index@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/find-index/-/find-index-1.1.1.tgz#4b221f8d46b7f8bea33d8faed953f3ca7a081cbc"
+  integrity sha512-XYKutXMrIK99YMUPf91KX5QVJoG31/OsgftD6YoTPAObfQIxM4ziA9f0J1AsqKhJmo+IeaIPP0CFopTD4bdUBw==
+
+find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
+  dependencies:
+    locate-path "^2.0.0"
+
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
+find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+find-yarn-workspace-root@^1.1.0, find-yarn-workspace-root@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
+  integrity sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==
+  dependencies:
+    fs-extra "^4.0.3"
+    micromatch "^3.1.4"
+
+findup-sync@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0"
+  integrity sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^4.0.0"
+    micromatch "^4.0.2"
+    resolve-dir "^1.0.1"
+
+fireworm@^0.7.0:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/fireworm/-/fireworm-0.7.1.tgz#ccf20f7941f108883fcddb99383dbe6e1861c758"
+  integrity sha1-zPIPeUHxCIg/zduZOD2+bhhhx1g=
+  dependencies:
+    async "~0.2.9"
+    is-type "0.0.1"
+    lodash.debounce "^3.1.1"
+    lodash.flatten "^3.0.2"
+    minimatch "^3.0.2"
+
+fixturify-project@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-1.10.0.tgz#091c452a9bb15f09b6b9cc7cf5c0ad559f1d9aad"
+  integrity sha512-L1k9uiBQuN0Yr8tA9Noy2VSQ0dfg0B8qMdvT7Wb5WQKc7f3dn3bzCbSrqlb+etLW+KDV4cBC7R1OvcMg3kcxmA==
+  dependencies:
+    fixturify "^1.2.0"
+    tmp "^0.0.33"
+
+fixturify@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-1.3.0.tgz#163c468093c7c4d90b70cde39fd6325f6528b25d"
+  integrity sha512-tL0svlOy56pIMMUQ4bU1xRe6NZbFSa/ABTWMxW2mH38lFGc9TrNAKWcMBQ7eIjo3wqSS8f2ICabFaatFyFmrVQ==
+  dependencies:
+    "@types/fs-extra" "^5.0.5"
+    "@types/minimatch" "^3.0.3"
+    "@types/rimraf" "^2.0.2"
+    fs-extra "^7.0.1"
+    matcher-collection "^2.0.0"
+
+flat-cache@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
+  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+  dependencies:
+    flatted "^2.0.0"
+    rimraf "2.6.3"
+    write "1.0.3"
+
+flatted@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
+  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
+
+flush-write-stream@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.3.6"
+
+follow-redirects@^1.0.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb"
+  integrity sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==
+  dependencies:
+    debug "^3.0.0"
+
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
+forwarded@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  dependencies:
+    map-cache "^0.2.2"
+
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+
+from2@^2.1.0, from2@^2.1.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
+fs-extra@^0.24.0:
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
+  integrity sha1-1OQ0KpZnXLeEZjOmCZJJMytTmVI=
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+    path-is-absolute "^1.0.0"
+    rimraf "^2.2.8"
+
+fs-extra@^4.0.2, fs-extra@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"
+  integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
+  integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^7.0.0, fs-extra@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^8.0.0, fs-extra@^8.0.1, fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-merger@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/fs-merger/-/fs-merger-3.0.3.tgz#d43c978e3cd5dbc29fb34144182eba749ab8c4b5"
+  integrity sha512-d9Qx+XlPRU4mkp+JYhUvp5NyS31uhqffIgs6EBnZcjrlO9RwSv0lkWi6PIDxgdNF+vjn9QCZevunGDpfoy4BGg==
+  dependencies:
+    broccoli-node-api "^1.7.0"
+    broccoli-node-info "^2.1.0"
+    fs-extra "^8.0.1"
+    fs-tree-diff "^2.0.1"
+    rimraf "^2.6.3"
+    walk-sync "^2.0.2"
+
+fs-minipass@^1.2.5:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
+  dependencies:
+    minipass "^2.6.0"
+
+fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6, fs-tree-diff@^0.5.7:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.9.tgz#a4ec6182c2f5bd80b9b83c8e23e4522e6f5fd946"
+  integrity sha512-872G8ax0kHh01m9n/2KDzgYwouKza0Ad9iFltBpNykvROvf2AGtoOzPJgGx125aolGPER3JuC7uZFrQ7bG1AZw==
+  dependencies:
+    heimdalljs-logger "^0.1.7"
+    object-assign "^4.1.0"
+    path-posix "^1.0.0"
+    symlink-or-copy "^1.1.8"
+
+fs-tree-diff@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-1.0.2.tgz#0e2931733a85b55feb3472c0b89a20b0c03ac0de"
+  integrity sha512-Zro2ACaPVDgVOx9+s5s5AfPlAD0kMJdbwGvTGF6KC1SjxjiGWxJvV4mUTDkFVSy3OUw2C/f1qpdjF81hGqSBAw==
+  dependencies:
+    heimdalljs-logger "^0.1.7"
+    object-assign "^4.1.0"
+    path-posix "^1.0.0"
+    symlink-or-copy "^1.1.8"
+
+fs-tree-diff@^2.0.0, fs-tree-diff@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz#343e4745ab435ec39ebac5f9059ad919cd034afa"
+  integrity sha512-x+CfAZ/lJHQqwlD64pYM5QxWjzWhSjroaVsr8PW831zOApL55qPibed0c+xebaLWVr2BnHFoHdrwOv8pzt8R5A==
+  dependencies:
+    "@types/symlink-or-copy" "^1.2.0"
+    heimdalljs-logger "^0.1.7"
+    object-assign "^4.1.0"
+    path-posix "^1.0.0"
+    symlink-or-copy "^1.1.8"
+
+fs-updater@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/fs-updater/-/fs-updater-1.0.4.tgz#2329980f99ae9176e9a0e84f7637538a182ce63b"
+  integrity sha512-0pJX4mJF/qLsNEwTct8CdnnRdagfb+LmjRPJ8sO+nCnAZLW0cTmz4rTgU25n+RvTuWSITiLKrGVJceJPBIPlKg==
+  dependencies:
+    can-symlink "^1.0.0"
+    clean-up-path "^1.0.0"
+    heimdalljs "^0.2.5"
+    heimdalljs-logger "^0.1.9"
+    rimraf "^2.6.2"
+
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
+  dependencies:
+    graceful-fs "^4.1.2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+fsevents@^1.2.7:
+  version "1.2.12"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz#db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c"
+  integrity sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==
+  dependencies:
+    bindings "^1.5.0"
+    nan "^2.12.1"
+
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+gensync@^1.0.0-beta.1:
+  version "1.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
+  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
+
+get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-stdin@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
+
+get-stream@3.0.0, get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
+get-stream@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
+  integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==
+  dependencies:
+    pump "^3.0.0"
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  dependencies:
+    assert-plus "^1.0.0"
+
+git-fetch-pack@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/git-fetch-pack/-/git-fetch-pack-0.1.1.tgz#7703a32cf0db80f060d2766a34ac00d02cebcdf5"
+  integrity sha1-dwOjLPDbgPBg0nZqNKwA0CzrzfU=
+  dependencies:
+    bops "0.0.3"
+    emit-function "0.0.2"
+    git-packed-ref-parse "0.0.0"
+    through "~2.2.7"
+
+git-hooks-list@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/git-hooks-list/-/git-hooks-list-1.0.3.tgz#be5baaf78203ce342f2f844a9d2b03dba1b45156"
+  integrity sha512-Y7wLWcrLUXwk2noSka166byGCvhMtDRpgHdzCno1UQv/n/Hegp++a2xBWJL1lJarnKD3SWaljD+0z1ztqxuKyQ==
+
+git-packed-ref-parse@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/git-packed-ref-parse/-/git-packed-ref-parse-0.0.0.tgz#b85046931f3e4a65679b5de54af3a5d3df372646"
+  integrity sha1-uFBGkx8+SmVnm13lSvOl0983JkY=
+  dependencies:
+    line-stream "0.0.0"
+    through "~2.2.7"
+
+git-read-pkt-line@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/git-read-pkt-line/-/git-read-pkt-line-0.0.8.tgz#494037854ed57bd90cd55676540d86ab0cb36caa"
+  integrity sha1-SUA3hU7Ve9kM1VZ2VA2GqwyzbKo=
+  dependencies:
+    bops "0.0.3"
+    through "~2.2.7"
+
+git-repo-info@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-2.1.1.tgz#220ffed8cbae74ef8a80e3052f2ccb5179aed058"
+  integrity sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg==
+
+git-transport-protocol@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/git-transport-protocol/-/git-transport-protocol-0.1.0.tgz#99f4dd6389b9161eded74a9e617d6ba5ed0a6c2c"
+  integrity sha1-mfTdY4m5Fh7e10qeYX1rpe0KbCw=
+  dependencies:
+    duplex "~1.0.0"
+    emit-function "0.0.2"
+    git-read-pkt-line "0.0.8"
+    git-write-pkt-line "0.1.0"
+    through "~2.2.7"
+
+git-write-pkt-line@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/git-write-pkt-line/-/git-write-pkt-line-0.1.0.tgz#a84c1856c09011908389b2f06f911d91f6394694"
+  integrity sha1-qEwYVsCQEZCDibLwb5EdkfY5RpQ=
+  dependencies:
+    bops "0.0.3"
+    through "~2.2.7"
+
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
+glob-parent@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob-to-regexp@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
+
+glob@^5.0.10:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.0.4, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+global-modules@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
+  dependencies:
+    global-prefix "^1.0.1"
+    is-windows "^1.0.1"
+    resolve-dir "^1.0.0"
+
+global-prefix@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
+  dependencies:
+    expand-tilde "^2.0.2"
+    homedir-polyfill "^1.0.1"
+    ini "^1.3.4"
+    is-windows "^1.0.1"
+    which "^1.2.14"
+
+globals@^11.1.0, globals@^11.7.0:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
+globals@^9.18.0:
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
+
+globby@11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.0.tgz#56fd0e9f0d4f8fb0c456f1ab0dee96e1380bc154"
+  integrity sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
+
+globby@^9.2.0:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
+  integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
+  dependencies:
+    "@types/glob" "^7.1.1"
+    array-union "^1.0.2"
+    dir-glob "^2.2.2"
+    fast-glob "^2.2.6"
+    glob "^7.1.3"
+    ignore "^4.0.3"
+    pify "^4.0.1"
+    slash "^2.0.0"
+
+got@^6.7.1:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
+  integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=
+  dependencies:
+    create-error-class "^3.0.0"
+    duplexer3 "^0.1.4"
+    get-stream "^3.0.0"
+    is-redirect "^1.0.0"
+    is-retry-allowed "^1.0.0"
+    is-stream "^1.0.0"
+    lowercase-keys "^1.0.0"
+    safe-buffer "^5.0.1"
+    timed-out "^4.0.0"
+    unzip-response "^2.0.1"
+    url-parse-lax "^1.0.0"
+
+got@^8.0.1:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
+  integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==
+  dependencies:
+    "@sindresorhus/is" "^0.7.0"
+    cacheable-request "^2.1.1"
+    decompress-response "^3.3.0"
+    duplexer3 "^0.1.4"
+    get-stream "^3.0.0"
+    into-stream "^3.1.0"
+    is-retry-allowed "^1.1.0"
+    isurl "^1.0.0-alpha5"
+    lowercase-keys "^1.0.0"
+    mimic-response "^1.0.0"
+    p-cancelable "^0.4.0"
+    p-timeout "^2.0.1"
+    pify "^3.0.0"
+    safe-buffer "^5.1.1"
+    timed-out "^4.0.1"
+    url-parse-lax "^3.0.0"
+    url-to-options "^1.0.1"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
+
+growly@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
+
+handlebars@^4.0.11, handlebars@^4.0.4, handlebars@^4.3.1, handlebars@^4.5.1, handlebars@^4.7.3:
+  version "4.7.6"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
+  integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
+  dependencies:
+    minimist "^1.2.5"
+    neo-async "^2.6.0"
+    source-map "^0.6.1"
+    wordwrap "^1.0.0"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+  dependencies:
+    ajv "^6.5.5"
+    har-schema "^2.0.0"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-ansi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-3.0.0.tgz#36077ef1d15f333484aa7fa77a28606f1c655b37"
+  integrity sha1-Ngd+8dFfMzSEqn+neihgbxxlWzc=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+has-binary2@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
+  dependencies:
+    isarray "2.0.1"
+
+has-cors@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+has-symbol-support-x@^1.4.1:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
+  integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
+
+has-symbols@^1.0.0, has-symbols@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
+  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
+
+has-to-string-tag-x@^1.2.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
+  integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
+  dependencies:
+    has-symbol-support-x "^1.4.1"
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+hash-base@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+hash-for-dep@^1.0.2, hash-for-dep@^1.2.3, hash-for-dep@^1.4.7, hash-for-dep@^1.5.0, hash-for-dep@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.5.1.tgz#497754b39bee2f1c4ade4521bfd2af0a7c1196e3"
+  integrity sha512-/dQ/A2cl7FBPI2pO0CANkvuuVi/IFS5oTyJ0PsOb6jW6WbVW1js5qJXMJTNbWHXBIPdFTWFbabjB+mE0d+gelw==
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    heimdalljs "^0.2.3"
+    heimdalljs-logger "^0.1.7"
+    path-root "^0.1.1"
+    resolve "^1.10.0"
+    resolve-package-path "^1.0.11"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.1"
+
+heimdalljs-fs-monitor@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/heimdalljs-fs-monitor/-/heimdalljs-fs-monitor-0.2.3.tgz#1aedd4b1c61d86c51f6141fb75c5a3350dc41b15"
+  integrity sha512-fYAvqSP0CxeOjLrt61B4wux/jqZzdZnS2xfb2oc14NP6BTZ8gtgtR2op6gKFakOR8lm8GN9Xhz1K4A1ZvJ4RQw==
+  dependencies:
+    heimdalljs "^0.2.3"
+    heimdalljs-logger "^0.1.7"
+
+heimdalljs-graph@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/heimdalljs-graph/-/heimdalljs-graph-1.0.0.tgz#0059857952988e54f3a74bb23edaf669f8eaf6af"
+  integrity sha512-v2AsTERBss0ukm/Qv4BmXrkwsT5x6M1V5Om6E8NcDQ/ruGkERsfsuLi5T8jx8qWzKMGYlwzAd7c/idymxRaPzA==
+
+heimdalljs-logger@^0.1.10, heimdalljs-logger@^0.1.7, heimdalljs-logger@^0.1.9:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/heimdalljs-logger/-/heimdalljs-logger-0.1.10.tgz#90cad58aabb1590a3c7e640ddc6a4cd3a43faaf7"
+  integrity sha512-pO++cJbhIufVI/fmB/u2Yty3KJD0TqNPecehFae0/eps0hkZ3b4Zc/PezUMOpYuHFQbA7FxHZxa305EhmjLj4g==
+  dependencies:
+    debug "^2.2.0"
+    heimdalljs "^0.2.6"
+
+heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3, heimdalljs@^0.2.5, heimdalljs@^0.2.6:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/heimdalljs/-/heimdalljs-0.2.6.tgz#b0eebabc412813aeb9542f9cc622cb58dbdcd9fe"
+  integrity sha512-o9bd30+5vLBvBtzCPwwGqpry2+n0Hi6H1+qwt6y+0kwRHGGF8TFIhJPmnuM0xO97zaKrDZMwO/V56fAnn8m/tA==
+  dependencies:
+    rsvp "~3.2.1"
+
+hmac-drbg@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
+home-or-tmp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg=
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.1"
+
+homedir-polyfill@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
+  dependencies:
+    parse-passwd "^1.0.0"
+
+hosted-git-info@^2.7.1:
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+
+html-encoding-sniffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
+  dependencies:
+    whatwg-encoding "^1.0.1"
+
+http-cache-semantics@3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
+
+http-errors@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
+http-errors@~1.7.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+"http-parser-js@>=0.4.0 <0.4.11":
+  version "0.4.10"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
+  integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
+
+http-proxy@^1.13.1, http-proxy@^1.18.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a"
+  integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==
+  dependencies:
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
+
+https@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https/-/https-1.0.0.tgz#3c37c7ae1a8eeb966904a2ad1e975a194b7ed3a4"
+  integrity sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q=
+
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+ieee754@^1.1.4:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
+
+ignore-walk@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
+  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
+  dependencies:
+    minimatch "^3.0.4"
+
+ignore@^4.0.3, ignore@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+
+ignore@^5.1.1, ignore@^5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
+  integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
+
+import-fresh@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
+  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
+
+infer-owner@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
+
+inflection@^1.12.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
+  integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
+
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+ini@^1.3.4, ini@~1.3.0:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+
+inline-source-map-comment@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/inline-source-map-comment/-/inline-source-map-comment-1.0.5.tgz#50a8a44c2a790dfac441b5c94eccd5462635faf6"
+  integrity sha1-UKikTCp5DfrEQbXJTszVRiY1+vY=
+  dependencies:
+    chalk "^1.0.0"
+    get-stdin "^4.0.1"
+    minimist "^1.1.1"
+    sum-up "^1.0.1"
+    xtend "^4.0.0"
+
+inquirer@^6, inquirer@^6.2.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
+  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
+  dependencies:
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^2.0.0"
+    lodash "^4.17.12"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.4.0"
+    string-width "^2.1.0"
+    strip-ansi "^5.1.0"
+    through "^2.3.6"
+
+inquirer@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29"
+  integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^3.0.0"
+    cli-cursor "^3.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.15"
+    mute-stream "0.0.8"
+    run-async "^2.4.0"
+    rxjs "^6.5.3"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
+
+into-stream@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
+  integrity sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=
+  dependencies:
+    from2 "^2.1.1"
+    p-is-promise "^1.1.0"
+
+invariant@^2.2.2, invariant@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
+  dependencies:
+    loose-envify "^1.0.0"
+
+ipaddr.js@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
+is-callable@^1.1.4, is-callable@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
+  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-date-object@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
+  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-extendable@^0.1.0, is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  dependencies:
+    is-plain-object "^2.0.4"
+
+is-extglob@^2.1.0, is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-finite@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
+  integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-git-url@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b"
+  integrity sha1-U/aEzRQyhbUsMkS05vKCU1J69ms=
+
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-glob@^4.0.0, is-glob@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
+  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
+
+is-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
+  integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
+
+is-plain-obj@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
+  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  dependencies:
+    isobject "^3.0.1"
+
+is-redirect@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
+  integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
+
+is-regex@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
+  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
+  dependencies:
+    has "^1.0.3"
+
+is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
+  integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
+
+is-stream@^1.0.0, is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
+is-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
+  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+
+is-symbol@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
+  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+  dependencies:
+    has-symbols "^1.0.1"
+
+is-type@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/is-type/-/is-type-0.0.1.tgz#f651d85c365d44955d14a51d8d7061f3f6b4779c"
+  integrity sha1-9lHYXDZdRJVdFKUdjXBh8/a0d5w=
+  dependencies:
+    core-util-is "~1.0.0"
+
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
+is-windows@^1.0.1, is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isarray@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
+
+isbinaryfile@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
+  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
+  dependencies:
+    buffer-alloc "^1.2.0"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+istextorbinary@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.1.0.tgz#dbed2a6f51be2f7475b68f89465811141b758874"
+  integrity sha1-2+0qb1G+L3R1to+JRlgRFBt1iHQ=
+  dependencies:
+    binaryextensions "1 || 2"
+    editions "^1.1.1"
+    textextensions "1 || 2"
+
+isurl@^1.0.0-alpha5:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
+  integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
+  dependencies:
+    has-to-string-tag-x "^1.2.0"
+    is-object "^1.0.1"
+
+jquery@^3.4.1:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
+  integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
+
+js-reporters@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/js-reporters/-/js-reporters-1.2.1.tgz#f88c608e324a3373a95bcc45ad305e5c979c459b"
+  integrity sha1-+IxgjjJKM3OpW8xFrTBeXJecRZs=
+
+js-string-escape@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+  integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=
+
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
+
+js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.2.5, js-yaml@^3.2.7:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
+jsdom@^12.0.0:
+  version "12.2.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-12.2.0.tgz#7cf3f5b5eafd47f8f09ca52315d367ff6e95de23"
+  integrity sha512-QPOggIJ8fquWPLaYYMoh+zqUmdphDtu1ju0QGTitZT1Yd8I5qenPpXM1etzUegu3MjVp8XPzgZxdn8Yj7e40ig==
+  dependencies:
+    abab "^2.0.0"
+    acorn "^6.0.2"
+    acorn-globals "^4.3.0"
+    array-equal "^1.0.0"
+    cssom "^0.3.4"
+    cssstyle "^1.1.1"
+    data-urls "^1.0.1"
+    domexception "^1.0.1"
+    escodegen "^1.11.0"
+    html-encoding-sniffer "^1.0.2"
+    nwsapi "^2.0.9"
+    parse5 "5.1.0"
+    pn "^1.1.0"
+    request "^2.88.0"
+    request-promise-native "^1.0.5"
+    saxes "^3.1.3"
+    symbol-tree "^3.2.2"
+    tough-cookie "^2.4.3"
+    w3c-hr-time "^1.0.1"
+    webidl-conversions "^4.0.2"
+    whatwg-encoding "^1.0.5"
+    whatwg-mimetype "^2.2.0"
+    whatwg-url "^7.0.0"
+    ws "^6.1.0"
+    xml-name-validator "^3.0.0"
+
+jsesc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
+
+jsesc@^2.5.0, jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+
+jsesc@~0.3.x:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.3.0.tgz#1bf5ee63b4539fe2e26d0c1e99c240b97a457972"
+  integrity sha1-G/XuY7RTn+LibQwemcJAuXpFeXI=
+
+jsesc@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
+
+json-buffer@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
+
+json-parse-better-errors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+
+json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
+  dependencies:
+    jsonify "~0.0.0"
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
+json5@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+  dependencies:
+    minimist "^1.2.5"
+
+jsonfile@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+keyv@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
+  integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==
+  dependencies:
+    json-buffer "3.0.0"
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
+leek@0.0.24:
+  version "0.0.24"
+  resolved "https://registry.yarnpkg.com/leek/-/leek-0.0.24.tgz#e400e57f0e60d8ef2bd4d068dc428a54345dbcda"
+  integrity sha1-5ADlfw5g2O8r1NBo3EKKVDRdvNo=
+  dependencies:
+    debug "^2.1.0"
+    lodash.assign "^3.2.0"
+    rsvp "^3.0.21"
+
+leven@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+
+levenary@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
+  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
+  dependencies:
+    leven "^3.1.0"
+
+levn@^0.3.0, levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+line-stream@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/line-stream/-/line-stream-0.0.0.tgz#888b7cc7951c6a05ce4d696dd1e6b8262371bb45"
+  integrity sha1-iIt8x5UcagXOTWlt0ea4JiNxu0U=
+  dependencies:
+    through "~2.2.0"
+
+linkify-it@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
+  integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==
+  dependencies:
+    uc.micro "^1.0.1"
+
+livereload-js@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c"
+  integrity sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==
+
+loader-runner@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
+  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
+
+loader-utils@^1.1.0, loader-utils@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
+loader.js@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/loader.js/-/loader.js-4.7.0.tgz#a1a52902001c83631efde9688b8ab3799325ef1f"
+  integrity sha512-9M2KvGT6duzGMgkOcTkWb+PR/Q2Oe54df/tLgHGVmFpAmtqJ553xJh6N63iFYI2yjo2PeJXbS5skHi/QpJq4vA==
+
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+lodash._baseassign@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
+  integrity sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=
+  dependencies:
+    lodash._basecopy "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash._basecopy@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
+  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
+
+lodash._baseflatten@^3.0.0:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz#0770ff80131af6e34f3b511796a7ba5214e65ff7"
+  integrity sha1-B3D/gBMa9uNPO1EXlqe6UhTmX/c=
+  dependencies:
+    lodash.isarguments "^3.0.0"
+    lodash.isarray "^3.0.0"
+
+lodash._bindcallback@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
+  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
+
+lodash._createassigner@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
+  integrity sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=
+  dependencies:
+    lodash._bindcallback "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+    lodash.restparam "^3.0.0"
+
+lodash._getnative@^3.0.0:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
+
+lodash._isiterateecall@^3.0.0:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
+  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
+
+lodash._reinterpolate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
+
+lodash.assign@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"
+  integrity sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=
+  dependencies:
+    lodash._baseassign "^3.0.0"
+    lodash._createassigner "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash.assignin@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
+  integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI=
+
+lodash.castarray@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115"
+  integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU=
+
+lodash.clonedeep@^4.4.1:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+
+lodash.debounce@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz#812211c378a94cc29d5aa4e3346cf0bfce3a7df5"
+  integrity sha1-gSIRw3ipTMKdWqTjNGzwv846ffU=
+  dependencies:
+    lodash._getnative "^3.0.0"
+
+lodash.defaultsdeep@^4.6.0, lodash.defaultsdeep@^4.6.1:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6"
+  integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==
+
+lodash.find@^4.5.1:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1"
+  integrity sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E=
+
+lodash.flatten@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-3.0.2.tgz#de1cf57758f8f4479319d35c3e9cc60c4501938c"
+  integrity sha1-3hz1d1j49EeTGdNcPpzGDEUBk4w=
+  dependencies:
+    lodash._baseflatten "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+
+lodash.foreach@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
+  integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=
+
+lodash.isarguments@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
+
+lodash.isarray@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
+
+lodash.keys@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
+  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
+  dependencies:
+    lodash._getnative "^3.0.0"
+    lodash.isarguments "^3.0.0"
+    lodash.isarray "^3.0.0"
+
+lodash.merge@^4.6.0, lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lodash.omit@^4.1.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
+  integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=
+
+lodash.restparam@^3.0.0:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
+
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+
+lodash.template@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+
+lodash.uniq@^4.2.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
+lodash.uniqby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
+  integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
+
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.6.1:
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+
+log-symbols@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+  dependencies:
+    chalk "^2.0.1"
+
+loose-envify@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
+lower-case@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7"
+  integrity sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==
+  dependencies:
+    tslib "^1.10.0"
+
+lowercase-keys@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+  integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=
+
+lowercase-keys@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
+
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
+make-dir@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
+make-dir@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
+makeerror@1.0.x:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+  dependencies:
+    tmpl "1.0.x"
+
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  dependencies:
+    object-visit "^1.0.0"
+
+markdown-it-terminal@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.1.0.tgz#545abd8dd01c3d62353bfcea71db580b51d22bd9"
+  integrity sha1-VFq9jdAcPWI1O/zqcdtYC1HSK9k=
+  dependencies:
+    ansi-styles "^3.0.0"
+    cardinal "^1.0.0"
+    cli-table "^0.3.1"
+    lodash.merge "^4.6.0"
+    markdown-it "^8.3.1"
+
+markdown-it@^8.3.1:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
+  integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==
+  dependencies:
+    argparse "^1.0.7"
+    entities "~1.1.1"
+    linkify-it "^2.0.0"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
+markdown-it@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-9.1.0.tgz#df9601c168568704d554b1fff9af0c5b561168d9"
+  integrity sha512-xHKG4C8iPriyfu/jc2hsCC045fKrMQ0VexX2F1FGYiRxDxqMB2aAhF8WauJ3fltn2kb90moGBkiiEdooGIg55w==
+  dependencies:
+    argparse "^1.0.7"
+    entities "~1.1.1"
+    linkify-it "^2.0.0"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
+matcher-collection@^1.0.0, matcher-collection@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.1.2.tgz#1076f506f10ca85897b53d14ef54f90a5c426838"
+  integrity sha512-YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g==
+  dependencies:
+    minimatch "^3.0.2"
+
+matcher-collection@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-2.0.1.tgz#90be1a4cf58d6f2949864f65bb3b0f3e41303b29"
+  integrity sha512-daE62nS2ZQsDg9raM0IlZzLmI2u+7ZapXBwdoeBUKAYERPDDIc0qNqA8E0Rp2D+gspKR7BgIFP52GeujaGXWeQ==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    minimatch "^3.0.2"
+
+md5-hex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-2.0.0.tgz#d0588e9f1c74954492ecd24ac0ac6ce997d92e33"
+  integrity sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=
+  dependencies:
+    md5-o-matic "^0.1.1"
+
+md5-o-matic@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3"
+  integrity sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=
+
+md5.js@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+mdurl@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+
+memory-fs@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
+  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+memory-fs@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+memory-streams@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/memory-streams/-/memory-streams-0.1.3.tgz#d9b0017b4b87f1d92f55f2745c9caacb1dc93ceb"
+  integrity sha512-qVQ/CjkMyMInPaaRMrwWNDvf6boRZXaT/DbQeMYcCWuXPEBf1v8qChOc9OlEVQp2uOvRXa1Qu30fLmKhY6NipA==
+  dependencies:
+    readable-stream "~1.0.2"
+
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
+merge-trees@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-1.0.1.tgz#ccbe674569787f9def17fd46e6525f5700bbd23e"
+  integrity sha1-zL5nRWl4f53vF/1G5lJfVwC70j4=
+  dependencies:
+    can-symlink "^1.0.0"
+    fs-tree-diff "^0.5.4"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+
+merge-trees@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-2.0.0.tgz#a560d796e566c5d9b2c40472a2967cca48d85161"
+  integrity sha512-5xBbmqYBalWqmhYm51XlohhkmVOua3VAUrrWh8t9iOkaLpS6ifqm/UVuUjQCeDVJ9Vx3g2l6ihfkbLSTeKsHbw==
+  dependencies:
+    fs-updater "^1.0.4"
+    heimdalljs "^0.2.5"
+
+merge2@^1.2.3, merge2@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
+  integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
+
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+
+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
+micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
+mime-db@1.44.0, "mime-db@>= 1.43.0 < 2":
+  version "1.44.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
+
+mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.26, mime-types@~2.1.19, mime-types@~2.1.24:
+  version "2.1.27"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
+  dependencies:
+    mime-db "1.44.0"
+
+mime@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
+mimic-fn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+mimic-response@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
+minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
+
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.1.tgz#827ba4e7593464e7c221e8c5bed930904ee2c455"
+  integrity sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==
+
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+minipass@^2.2.0, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
+  dependencies:
+    minipass "^2.9.0"
+
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^3.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
+mixin-deep@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.0:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  dependencies:
+    minimist "^1.2.5"
+
+mktemp@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
+  integrity sha1-bQUVYRyKjITkhKogABKbmOmB/ws=
+
+morgan@^1.9.1:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
+  integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==
+  dependencies:
+    basic-auth "~2.0.1"
+    debug "2.6.9"
+    depd "~2.0.0"
+    on-finished "~2.3.0"
+    on-headers "~1.0.2"
+
+mout@^1.0.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/mout/-/mout-1.2.2.tgz#c9b718a499806a0632cede178e80f436259e777d"
+  integrity sha512-w0OUxFEla6z3d7sVpMZGBCpQvYh8PHS1wZ6Wu9GNKHMpAHWJ0if0LsQZh3DlOqw55HlhJEOMLpFnwtxp99Y5GA==
+
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
+ms@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+mustache@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.2.1.tgz#89e78a9d207d78f2799b1e95764a25bf71a28322"
+  integrity sha512-RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA==
+
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
+nan@^2.12.1:
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
+  integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+
+needle@^2.2.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a"
+  integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+
+neo-async@^2.5.0, neo-async@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
+  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
+no-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz#c21b434c1ffe48b39087e86cfb4d2582e9df18f8"
+  integrity sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==
+  dependencies:
+    lower-case "^2.0.1"
+    tslib "^1.10.0"
+
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
+
+node-libs-browser@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
+  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^3.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.1"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.11.0"
+    vm-browserify "^1.0.1"
+
+node-modules-path@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/node-modules-path/-/node-modules-path-1.0.2.tgz#e3acede9b7baf4bc336e3496b58e5b40d517056e"
+  integrity sha512-6Gbjq+d7uhkO7epaKi5DNgUJn7H0gEyA4Jg0Mo1uQOi3Rk50G83LtmhhFyw0LxnAFhtlspkiiw52ISP13qzcBg==
+
+node-notifier@^5.0.1:
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.3.tgz#cb72daf94c93904098e28b9c590fd866e464bd50"
+  integrity sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==
+  dependencies:
+    growly "^1.3.0"
+    is-wsl "^1.1.0"
+    semver "^5.5.0"
+    shellwords "^0.1.1"
+    which "^1.3.0"
+
+node-pre-gyp@*:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
+  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4.4.2"
+
+node-releases@^1.1.53:
+  version "1.1.53"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
+  integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
+
+node-watch@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.6.1.tgz#b9874111ce9f5841b1c7596120206c7b825be0e9"
+  integrity sha512-gwQiR7weFRV8mAtT0x0kXkZ18dfRLB45xH7q0hCOVQMLfLb2f1ZaSvR57q4/b/Vj6B0RwMNJYbvb69e1yM7qEA==
+
+nopt@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
+  dependencies:
+    abbrev "1"
+
+nopt@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
+  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
+normalize-path@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+normalize-url@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
+  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
+  dependencies:
+    prepend-http "^2.0.0"
+    query-string "^5.0.1"
+    sort-keys "^2.0.0"
+
+npm-bundled@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
+  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
+  dependencies:
+    npm-normalize-package-bin "^1.0.1"
+
+npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+
+npm-package-arg@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
+  integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
+  dependencies:
+    hosted-git-info "^2.7.1"
+    osenv "^0.1.5"
+    semver "^5.6.0"
+    validate-npm-package-name "^3.0.0"
+
+npm-packlist@^1.1.6:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
+  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+    npm-normalize-package-bin "^1.0.1"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  dependencies:
+    path-key "^2.0.0"
+
+npm-run-path@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5"
+  integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==
+  dependencies:
+    path-key "^3.0.0"
+
+npmlog@^4.0.0, npmlog@^4.0.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
+nwsapi@^2.0.9:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
+  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+object-assign@4.1.1, object-assign@^4.1.0, object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
+object-component@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
+  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
+
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-hash@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
+  integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
+
+object-inspect@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
+  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
+
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  dependencies:
+    isobject "^3.0.0"
+
+object.assign@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+  dependencies:
+    define-properties "^1.1.2"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    object-keys "^1.0.11"
+
+object.getownpropertydescriptors@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
+  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  dependencies:
+    isobject "^3.0.1"
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  dependencies:
+    ee-first "1.1.1"
+
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
+  dependencies:
+    mimic-fn "^1.0.0"
+
+onetime@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
+  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+  dependencies:
+    mimic-fn "^2.1.0"
+
+optionator@^0.8.1, optionator@^0.8.2:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
+ora@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318"
+  integrity sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==
+  dependencies:
+    chalk "^2.4.2"
+    cli-cursor "^2.1.0"
+    cli-spinners "^2.0.0"
+    log-symbols "^2.2.0"
+    strip-ansi "^5.2.0"
+    wcwidth "^1.0.1"
+
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
+
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
+osenv@^0.1.3, osenv@^0.1.4, osenv@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+p-cancelable@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
+  integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
+
+p-defer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83"
+  integrity sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw==
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+p-finally@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
+  integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==
+
+p-is-promise@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
+
+p-limit@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
+  dependencies:
+    p-try "^1.0.0"
+
+p-limit@^2.0.0, p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
+  dependencies:
+    p-limit "^1.1.0"
+
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+  dependencies:
+    p-limit "^2.0.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-timeout@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
+  integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==
+  dependencies:
+    p-finally "^1.0.0"
+
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+package-json@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
+  integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=
+  dependencies:
+    got "^6.7.1"
+    registry-auth-token "^3.0.1"
+    registry-url "^3.0.3"
+    semver "^5.1.0"
+
+pako@~1.0.5:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
+
+parallel-transform@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
+  dependencies:
+    cyclist "^1.0.1"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
+
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
+parse-asn1@^5.0.0:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e"
+  integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==
+  dependencies:
+    asn1.js "^4.0.0"
+    browserify-aes "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+    safe-buffer "^5.1.1"
+
+parse-passwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
+
+parse5@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
+  integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==
+
+parseqs@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
+  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
+  dependencies:
+    better-assert "~1.0.0"
+
+parseuri@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
+  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
+  dependencies:
+    better-assert "~1.0.0"
+
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+
+path-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
+
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-is-absolute@1.0.1, path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-is-inside@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
+
+path-key@^2.0.0, path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
+path-key@^3.0.0, path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+
+path-posix@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/path-posix/-/path-posix-1.0.0.tgz#06b26113f56beab042545a23bfa88003ccac260f"
+  integrity sha1-BrJhE/Vr6rBCVFojv6iAA8ysJg8=
+
+path-root-regex@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
+
+path-root@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
+  dependencies:
+    path-root-regex "^0.1.0"
+
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
+  dependencies:
+    pify "^3.0.0"
+
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+pbkdf2@^3.0.3:
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
+  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+picomatch@^2.0.5, picomatch@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
+  dependencies:
+    find-up "^3.0.0"
+
+pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
+  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
+  dependencies:
+    find-up "^2.1.0"
+
+pn@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
+  integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
+
+portfinder@^1.0.25:
+  version "1.0.25"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
+  integrity sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==
+  dependencies:
+    async "^2.6.2"
+    debug "^3.1.1"
+    mkdirp "^0.5.1"
+
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+
+prepend-http@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
+
+prepend-http@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
+
+printf@^0.5.1:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/printf/-/printf-0.5.3.tgz#8b7eec278d886833312238b2bf42b2b6f250880a"
+  integrity sha512-t3lYN6vPU5PZXDiEZZqoyXvN8wCsBfi8gPoxTKo2e5hhV673t/KUh+mfO8P8lCOCDC/BWcOGIxKyebxc5FuqLA==
+
+private@^0.1.6, private@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
+
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+process-relative-require@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/process-relative-require/-/process-relative-require-1.0.0.tgz#1590dfcf5b8f2983ba53e398446b68240b4cc68a"
+  integrity sha1-FZDfz1uPKYO6U+OYRGtoJAtMxoo=
+  dependencies:
+    node-modules-path "^1.0.0"
+
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+
+progress@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
+
+promise-map-series@^0.2.1, promise-map-series@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.2.3.tgz#c2d377afc93253f6bd03dbb77755eb88ab20a847"
+  integrity sha1-wtN3r8kyU/a9A9u3d1XriKsgqEc=
+  dependencies:
+    rsvp "^3.0.14"
+
+promise.prototype.finally@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz#b8af89160c9c673cefe3b4c4435b53cfd0287067"
+  integrity sha512-A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.0"
+    function-bind "^1.1.1"
+
+proxy-addr@~2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
+  integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.9.1"
+
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
+
+psl@^1.1.28:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+
+public-encrypt@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
+
+pump@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.3:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
+  dependencies:
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
+
+punycode@^1.2.4:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+punycode@^2.1.0, punycode@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+qs@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
+
+qs@^6.4.0:
+  version "6.9.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.3.tgz#bfadcd296c2d549f1dffa560619132c977f5008e"
+  integrity sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==
+
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+query-string@^5.0.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
+  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
+  dependencies:
+    decode-uri-component "^0.2.0"
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
+
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+
+quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408"
+  integrity sha1-urAqJCq4+w3XWKPJd2sy+aXZRAg=
+  dependencies:
+    mktemp "~0.4.0"
+    rimraf "^2.5.4"
+    underscore.string "~3.3.4"
+
+qunit-dom@^0.9.2:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/qunit-dom/-/qunit-dom-0.9.2.tgz#cc7bb777e4f5faa749eca843f54e199755df8473"
+  integrity sha512-BPf7OZjhXo9ekgsViNjQVS9BWkm2yQsPvBoy0juvt5nOFlcBVVwHSYsgpsJOunWkI1IgA3eStAC9mQx3Zw734g==
+  dependencies:
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.1"
+
+qunit@^2.9.3:
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.9.3.tgz#9522a088e76f0782f70a45db92f2fd14db311bcc"
+  integrity sha512-RH4VYSaVsNRDthMFFboTJAJ8q4kJM5LvOqWponKUYPEAeOcmc/YFV1QsZ7ikknA3TjqliWFJYEV63vvVXaALmQ==
+  dependencies:
+    commander "2.12.2"
+    js-reporters "1.2.1"
+    minimatch "3.0.4"
+    node-watch "0.6.1"
+    resolve "1.9.0"
+
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
+range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+raw-body@~1.1.0:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
+  integrity sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=
+  dependencies:
+    bytes "1"
+    string_decoder "0.10"
+
+rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+"readable-stream@2 || 3":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+readable-stream@~1.0.2:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readdirp@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
+    readable-stream "^2.0.2"
+
+recast@^0.18.1:
+  version "0.18.10"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.18.10.tgz#605ebbe621511eb89b6356a7e224bff66ed91478"
+  integrity sha512-XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ==
+  dependencies:
+    ast-types "0.13.3"
+    esprima "~4.0.0"
+    private "^0.1.8"
+    source-map "~0.6.1"
+
+redeyed@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-1.0.1.tgz#e96c193b40c0816b00aec842698e61185e55498a"
+  integrity sha1-6WwZO0DAgWsArshCaY5hGF5VSYo=
+  dependencies:
+    esprima "~3.0.0"
+
+regenerate-unicode-properties@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
+  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+  dependencies:
+    regenerate "^1.4.0"
+
+regenerate@^1.2.1, regenerate@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
+
+regenerator-runtime@^0.10.5:
+  version "0.10.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
+  integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=
+
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
+
+regenerator-runtime@^0.13.4:
+  version "0.13.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
+  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
+
+regenerator-runtime@^0.9.5:
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz#d33eb95d0d2001a4be39659707c51b0cb71ce029"
+  integrity sha1-0z65XQ0gAaS+OWWXB8UbDLcc4Ck=
+
+regenerator-transform@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
+  integrity sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==
+  dependencies:
+    babel-runtime "^6.18.0"
+    babel-types "^6.19.0"
+    private "^0.1.6"
+
+regenerator-transform@^0.14.2:
+  version "0.14.4"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
+  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
+  dependencies:
+    "@babel/runtime" "^7.8.4"
+    private "^0.1.8"
+
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
+regexpp@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
+  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+
+regexpp@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+
+regexpu-core@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+  integrity sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+regexpu-core@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
+  integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
+  dependencies:
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^8.2.0"
+    regjsgen "^0.5.1"
+    regjsparser "^0.6.4"
+    unicode-match-property-ecmascript "^1.0.4"
+    unicode-match-property-value-ecmascript "^1.2.0"
+
+registry-auth-token@^3.0.1:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e"
+  integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==
+  dependencies:
+    rc "^1.1.6"
+    safe-buffer "^5.0.1"
+
+registry-url@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
+  integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI=
+  dependencies:
+    rc "^1.0.1"
+
+regjsgen@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
+
+regjsgen@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
+  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
+
+regjsparser@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
+  dependencies:
+    jsesc "~0.5.0"
+
+regjsparser@^0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
+  integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
+  dependencies:
+    jsesc "~0.5.0"
+
+remote-git-tags@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/remote-git-tags/-/remote-git-tags-2.0.0.tgz#1152f39cf8b5268ae0e4307636ef741ec341664c"
+  integrity sha1-EVLznPi1Jorg5DB2Nu90HsNBZkw=
+  dependencies:
+    git-fetch-pack "^0.1.1"
+    git-transport-protocol "^0.1.0"
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+
+repeat-element@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+
+repeating@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
+  dependencies:
+    is-finite "^1.0.0"
+
+request-promise-core@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
+  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
+  dependencies:
+    lodash "^4.17.15"
+
+request-promise-native@^1.0.5:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
+  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
+  dependencies:
+    request-promise-core "1.1.3"
+    stealthy-require "^1.1.1"
+    tough-cookie "^2.3.3"
+
+request@^2.88.0:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+
+reselect@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
+  integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
+
+resolve-dir@^1.0.0, resolve-dir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
+  dependencies:
+    expand-tilde "^2.0.0"
+    global-modules "^1.0.0"
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+resolve-package-path@^1.0.11, resolve-package-path@^1.2.2, resolve-package-path@^1.2.6, resolve-package-path@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-1.2.7.tgz#2a7bc37ad96865e239330e3102c31322847e652e"
+  integrity sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q==
+  dependencies:
+    path-root "^0.1.1"
+    resolve "^1.10.0"
+
+resolve-package-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-2.0.0.tgz#7f258ab86ff074fff4ff8027a28f94d17d6fb1df"
+  integrity sha512-/CLuzodHO2wyyHTzls5Qr+EFeG6RcW4u6//gjYvUfcfyuplIX1SSccU+A5A9A78Gmezkl3NBkFAMxLbzTY9TJA==
+  dependencies:
+    path-root "^0.1.1"
+    resolve "^1.13.1"
+
+resolve-path@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
+  integrity sha1-xL2p9e+y/OZSR4c6s2u02DT+Fvc=
+  dependencies:
+    http-errors "~1.6.2"
+    path-is-absolute "1.0.1"
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+
+resolve@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06"
+  integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==
+  dependencies:
+    path-parse "^1.0.6"
+
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.0, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.7.1, resolve@^1.8.1:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
+  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+  dependencies:
+    path-parse "^1.0.6"
+
+responselike@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
+  dependencies:
+    lowercase-keys "^1.0.0"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+rimraf@2.6.3, rimraf@~2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@^3.0.1, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
+rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
+
+rsvp@^4.6.1, rsvp@^4.7.0, rsvp@^4.8.1, rsvp@^4.8.2, rsvp@^4.8.4, rsvp@^4.8.5:
+  version "4.8.5"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
+
+rsvp@~3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a"
+  integrity sha1-B8tKXfJa3Z6Cbrxn3Mn9idsn2Eo=
+
+run-async@^2.2.0, run-async@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
+run-parallel@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
+  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
+
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
+  dependencies:
+    aproba "^1.1.1"
+
+rxjs@^6.4.0, rxjs@^6.5.3:
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
+  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
+  dependencies:
+    tslib "^1.9.0"
+
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
+  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+
+safe-json-parse@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
+  integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  dependencies:
+    ret "~0.1.10"
+
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+sane@^4.0.0, sane@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
+  dependencies:
+    "@cnakazawa/watch" "^1.0.3"
+    anymatch "^2.0.0"
+    capture-exit "^2.0.0"
+    exec-sh "^0.3.2"
+    execa "^1.0.0"
+    fb-watchman "^2.0.0"
+    micromatch "^3.1.4"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+
+sax@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+saxes@^3.1.3:
+  version "3.1.11"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b"
+  integrity sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==
+  dependencies:
+    xmlchars "^2.1.1"
+
+schema-utils@^0.4.4:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
+  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+
+schema-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-errors "^1.0.0"
+    ajv-keywords "^3.1.0"
+
+schema-utils@^2.6.5:
+  version "2.6.6"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz#299fe6bd4a3365dc23d99fd446caff8f1d6c330c"
+  integrity sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==
+  dependencies:
+    ajv "^6.12.0"
+    ajv-keywords "^3.4.1"
+
+semver@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
+  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+
+semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
+serialize-javascript@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
+  integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
+
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
+
+set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+setimmediate@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+shellwords@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+
+silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.0, silent-error@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/silent-error/-/silent-error-1.1.1.tgz#f72af5b0d73682a2ba1778b7e32cd8aa7c2d8662"
+  integrity sha512-n4iEKyNcg4v6/jpb3c0/iyH2G1nzUNl7Gpqtn/mHIJK9S/q/7MCfoO4rwVOoO59qPFIc0hVHvMbiOJ0NdtxKKw==
+  dependencies:
+    debug "^2.2.0"
+
+simple-html-tokenizer@^0.5.9:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.9.tgz#1a83fe97f5a3e39b335fddf71cfe9b0263b581c2"
+  integrity sha512-w/3FEDN94r4JQ9WoYrIr8RqDIPZdyNkdpbK9glFady1CAEyD97XWCv8HFetQO21w81e7h7Nh59iYTyG1mUJftg==
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
+
+slash@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+slice-ansi@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
+  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
+  dependencies:
+    ansi-styles "^3.2.0"
+    astral-regex "^1.0.0"
+    is-fullwidth-code-point "^2.0.0"
+
+snake-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.3.tgz#c598b822ab443fcbb145ae8a82c5e43526d5bbee"
+  integrity sha512-WM1sIXEO+rsAHBKjGf/6R1HBBcgbncKS08d2Aqec/mrDSpU80SiOU41hO7ny6DToHSyrlwTYzQBIK1FPSx4Y3Q==
+  dependencies:
+    dot-case "^3.0.3"
+    tslib "^1.10.0"
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
+socket.io-adapter@~1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
+  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
+
+socket.io-client@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz#14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4"
+  integrity sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==
+  dependencies:
+    backo2 "1.0.2"
+    base64-arraybuffer "0.1.5"
+    component-bind "1.0.0"
+    component-emitter "1.2.1"
+    debug "~4.1.0"
+    engine.io-client "~3.4.0"
+    has-binary2 "~1.0.2"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    object-component "0.0.3"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    socket.io-parser "~3.3.0"
+    to-array "0.1.4"
+
+socket.io-parser@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.0.tgz#2b52a96a509fdf31440ba40fed6094c7d4f1262f"
+  integrity sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==
+  dependencies:
+    component-emitter "1.2.1"
+    debug "~3.1.0"
+    isarray "2.0.1"
+
+socket.io-parser@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.0.tgz#370bb4a151df2f77ce3345ff55a7072cc6e9565a"
+  integrity sha512-/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ==
+  dependencies:
+    component-emitter "1.2.1"
+    debug "~4.1.0"
+    isarray "2.0.1"
+
+socket.io@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.3.0.tgz#cd762ed6a4faeca59bc1f3e243c0969311eb73fb"
+  integrity sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==
+  dependencies:
+    debug "~4.1.0"
+    engine.io "~3.4.0"
+    has-binary2 "~1.0.2"
+    socket.io-adapter "~1.1.0"
+    socket.io-client "2.3.0"
+    socket.io-parser "~3.4.0"
+
+sort-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+sort-object-keys@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
+  integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==
+
+sort-package-json@^1.23.1:
+  version "1.42.1"
+  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.42.1.tgz#4085582dfe83c60951673de2d5e4ce09dd47bd4e"
+  integrity sha512-+JgZVjEQhJuJ57RCUcF3rzESYCW/n3vCLWdhqBdPkerEgRTj5teGdJrCcj772zT1VzewqWk616/4xuRyIffyqQ==
+  dependencies:
+    detect-indent "^6.0.0"
+    detect-newline "3.1.0"
+    git-hooks-list "1.0.3"
+    globby "11.0.0"
+    is-plain-obj "2.1.0"
+    sort-object-keys "^1.1.3"
+
+source-list-map@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
+
+source-map-resolve@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-support@^0.4.15:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
+  dependencies:
+    source-map "^0.5.6"
+
+source-map-support@~0.5.12:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-url@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
+  integrity sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=
+
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+
+source-map@0.4.x, source-map@^0.4.2:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+source-map@~0.1.x:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
+  dependencies:
+    amdefine ">=0.0.4"
+
+sourcemap-validator@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/sourcemap-validator/-/sourcemap-validator-1.1.1.tgz#3d7d8a399ccab09c1fedc510d65436e25b1c386b"
+  integrity sha512-pq6y03Vs6HUaKo9bE0aLoksAcpeOo9HZd7I8pI6O480W/zxNZ9U32GfzgtPP0Pgc/K1JHna569nAbOk3X8/Qtw==
+  dependencies:
+    jsesc "~0.3.x"
+    lodash.foreach "^4.5.0"
+    lodash.template "^4.5.0"
+    source-map "~0.1.x"
+
+spawn-args@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/spawn-args/-/spawn-args-0.2.0.tgz#fb7d0bd1d70fd4316bd9e3dec389e65f9d6361bb"
+  integrity sha1-+30L0dcP1DFr2ePew4nmX51jYbs=
+
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  dependencies:
+    extend-shallow "^3.0.0"
+
+sprintf-js@^1.0.3:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+
+sri-toolbox@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/sri-toolbox/-/sri-toolbox-0.2.0.tgz#a7fea5c3fde55e675cf1c8c06f3ebb5c2935835e"
+  integrity sha1-p/6lw/3lXmdc8cjAbz67XCk1g14=
+
+sshpk@^1.7.0:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
+ssri@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  dependencies:
+    figgy-pudding "^3.5.1"
+
+stagehand@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stagehand/-/stagehand-1.0.0.tgz#79515e2ad3a02c63f8720c7df9b6077ae14276d9"
+  integrity sha512-zrXl0QixAtSHFyN1iv04xOBgplbT4HgC8T7g+q8ESZbDNi5uZbMtxLukFVXPJ5Nl7zCYvYcrT3Mj24WYCH93hw==
+  dependencies:
+    debug "^4.1.0"
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+
+stealthy-require@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
+
+stream-browserify@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
+stream-each@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
+  dependencies:
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
+
+stream-http@^2.7.2:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
+stream-shift@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
+
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+
+string-template@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
+  integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
+
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+"string-width@^1.0.2 || 2", string-width@^2.1.0, string-width@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string-width@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
+string-width@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
+
+string.prototype.trimend@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
+  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+
+string.prototype.trimleft@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
+  integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+    string.prototype.trimstart "^1.0.0"
+
+string.prototype.trimright@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"
+  integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+    string.prototype.trimend "^1.0.0"
+
+string.prototype.trimstart@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
+  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+
+string_decoder@0.10, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+
+string_decoder@^1.0.0, string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
+strip-bom@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
+  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
+strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
+styled_string@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/styled_string/-/styled_string-0.0.1.tgz#d22782bd81295459bc4f1df18c4bad8e94dd124a"
+  integrity sha1-0ieCvYEpVFm8Tx3xjEutjpTdEko=
+
+sum-up@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sum-up/-/sum-up-1.0.3.tgz#1c661f667057f63bcb7875aa1438bc162525156e"
+  integrity sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=
+  dependencies:
+    chalk "^1.0.0"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  dependencies:
+    has-flag "^4.0.0"
+
+symbol-tree@^3.2.2:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
+
+symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.3.1.tgz#9506dd64d8e98fa21dcbf4018d1eab23e77f71fe"
+  integrity sha512-0K91MEXFpBUaywiwSSkmKjnGcasG/rVBXFLJz5DrgGabpYD6N+3yZrfD6uUIfpuTu65DZLHi7N8CizHc07BPZA==
+
+sync-disk-cache@^1.3.3:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/sync-disk-cache/-/sync-disk-cache-1.3.4.tgz#53a2c5a09d8f4bb53160bce182a456ad71574024"
+  integrity sha512-GlkGeM81GPPEKz/lH7QUTbvqLq7K/IUTuaKDSMulP9XQ42glqNJIN/RKgSOw4y8vxL1gOVvj+W7ruEO4s36eCw==
+  dependencies:
+    debug "^2.1.3"
+    heimdalljs "^0.2.3"
+    mkdirp "^0.5.0"
+    rimraf "^2.2.8"
+    username-sync "^1.0.2"
+
+table@^5.2.3:
+  version "5.4.6"
+  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
+  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
+  dependencies:
+    ajv "^6.10.2"
+    lodash "^4.17.14"
+    slice-ansi "^2.1.0"
+    string-width "^3.0.0"
+
+tap-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-7.0.0.tgz#54db35302fda2c2ccc21954ad3be22b2cba42721"
+  integrity sha512-05G8/LrzqOOFvZhhAk32wsGiPZ1lfUrl+iV7+OkKgfofZxiceZWMHkKmow71YsyVQ8IvGBP2EjcIjE5gL4l5lA==
+  dependencies:
+    events-to-array "^1.0.1"
+    js-yaml "^3.2.7"
+    minipass "^2.2.0"
+
+tapable@^1.0.0, tapable@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
+
+tar@^4.4.2:
+  version "4.4.13"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.8.6"
+    minizlib "^1.2.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.3"
+
+temp@0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.0.tgz#61391795a11bd9738d4c4d7f55f012cb8f55edaa"
+  integrity sha512-YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ==
+  dependencies:
+    rimraf "~2.6.2"
+
+terser-webpack-plugin@^1.1.0:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
+  integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==
+  dependencies:
+    cacache "^12.0.2"
+    find-cache-dir "^2.1.0"
+    is-wsl "^1.1.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^2.1.2"
+    source-map "^0.6.1"
+    terser "^4.1.2"
+    webpack-sources "^1.4.0"
+    worker-farm "^1.7.0"
+
+terser@^4.1.2, terser@^4.3.9:
+  version "4.6.12"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.12.tgz#44b98aef8703fdb09a3491bf79b43faffc5b4fee"
+  integrity sha512-fnIwuaKjFPANG6MAixC/k1TDtnl1YlPLUlLVIxxGZUn1gfUx2+l3/zGNB72wya+lgsb50QBi2tUV75RiODwnww==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
+testem@^2.17.0:
+  version "2.17.0"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-2.17.0.tgz#1cb4a2a90524a088803dfe52fbf197a6fd73c883"
+  integrity sha512-PLkIlT523w5rTJPWwR4TL1EiAEa941ECV7d4pMqsB0YdnH+sCTz0loWMKCUSdhR+VijveAZ6anE/JHehE7KqMQ==
+  dependencies:
+    backbone "^1.1.2"
+    bluebird "^3.4.6"
+    charm "^1.0.0"
+    commander "^2.6.0"
+    compression "^1.7.4"
+    consolidate "^0.15.1"
+    execa "^1.0.0"
+    express "^4.10.7"
+    fireworm "^0.7.0"
+    glob "^7.0.4"
+    http-proxy "^1.13.1"
+    js-yaml "^3.2.5"
+    lodash.assignin "^4.1.0"
+    lodash.castarray "^4.4.0"
+    lodash.clonedeep "^4.4.1"
+    lodash.find "^4.5.1"
+    lodash.uniqby "^4.7.0"
+    mkdirp "^0.5.1"
+    mustache "^3.0.0"
+    node-notifier "^5.0.1"
+    npmlog "^4.0.0"
+    printf "^0.5.1"
+    rimraf "^2.4.4"
+    socket.io "^2.1.0"
+    spawn-args "^0.2.0"
+    styled_string "0.0.1"
+    tap-parser "^7.0.0"
+    tmp "0.0.33"
+    xmldom "^0.1.19"
+
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+
+"textextensions@1 || 2":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.6.0.tgz#d7e4ab13fe54e32e08873be40d51b74229b00fc4"
+  integrity sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==
+
+through2@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
+through2@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
+  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
+  dependencies:
+    readable-stream "2 || 3"
+
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+
+through@~2.2.0, through@~2.2.7:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.2.7.tgz#6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd"
+  integrity sha1-bo4hIAGR1OtqmfbwEN9Gqhxusr0=
+
+timed-out@^4.0.0, timed-out@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
+  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
+
+timers-browserify@^2.0.4:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f"
+  integrity sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==
+  dependencies:
+    setimmediate "^1.0.4"
+
+tiny-lr@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab"
+  integrity sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==
+  dependencies:
+    body "^5.1.0"
+    debug "^3.1.0"
+    faye-websocket "~0.10.0"
+    livereload-js "^2.3.0"
+    object-assign "^4.1.0"
+    qs "^6.4.0"
+
+tmp@0.0.28:
+  version "0.0.28"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120"
+  integrity sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=
+  dependencies:
+    os-tmpdir "~1.0.1"
+
+tmp@0.0.33, tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+tmp@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
+  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
+  dependencies:
+    rimraf "^2.6.3"
+
+tmpl@1.0.x:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+
+to-array@0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
+  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
+
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
+
+to-fast-properties@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
+
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+to-utf8@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/to-utf8/-/to-utf8-0.0.1.tgz#d17aea72ff2fba39b9e43601be7b3ff72e089852"
+  integrity sha1-0Xrqcv8vujm55DYBvns/9y4ImFI=
+
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
+tough-cookie@^2.3.3, tough-cookie@^2.4.3, tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tr46@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
+  dependencies:
+    punycode "^2.1.0"
+
+tree-sync@^1.2.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-1.4.0.tgz#314598d13abaf752547d9335b8f95d9a137100d6"
+  integrity sha512-YvYllqh3qrR5TAYZZTXdspnIhlKAYezPYw11ntmweoceu4VK+keN356phHRIIo1d+RDmLpHZrUlmxga2gc9kSQ==
+  dependencies:
+    debug "^2.2.0"
+    fs-tree-diff "^0.5.6"
+    mkdirp "^0.5.1"
+    quick-temp "^0.1.5"
+    walk-sync "^0.3.3"
+
+tree-sync@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-2.0.0.tgz#e51456731d5ac93b92f9a1d58dd383f76f0f2f39"
+  integrity sha512-AzeJnbmJjGVfWMTJ0T152fv8NDTbQc9ERY4nEs7Lmxd94Xah2bUS56+CcoTh6FB8qn2KjBMjC0mLNc731aVBqw==
+  dependencies:
+    debug "^2.2.0"
+    fs-tree-diff "^0.5.6"
+    mkdirp "^0.5.1"
+    quick-temp "^0.1.5"
+    walk-sync "^0.3.3"
+
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
+
+tslib@^1.10.0, tslib@^1.9.0:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
+  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
+
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-fest@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
+  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+
+typescript-memoize@^1.0.0-alpha.3:
+  version "1.0.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.0-alpha.3.tgz#699a5415f886694a8d6e2e5451bc28a39a6bc2f9"
+  integrity sha1-aZpUFfiGaUqNbi5UUbwoo5prwvk=
+  dependencies:
+    core-js "2.4.1"
+
+uc.micro@^1.0.1, uc.micro@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
+  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
+
+uglify-js@^3.1.4:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.1.tgz#a56a71c8caa2d36b5556cc1fd57df01ae3491539"
+  integrity sha512-JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA==
+  dependencies:
+    commander "~2.20.3"
+
+underscore.string@^3.2.2, underscore.string@~3.3.4:
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023"
+  integrity sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==
+  dependencies:
+    sprintf-js "^1.0.3"
+    util-deprecate "^1.0.2"
+
+underscore@>=1.8.3:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.10.2.tgz#73d6aa3668f3188e4adb0f1943bd12cfd7efaaaf"
+  integrity sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==
+
+unicode-canonical-property-names-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
+  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+
+unicode-match-property-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
+  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+  dependencies:
+    unicode-canonical-property-names-ecmascript "^1.0.4"
+    unicode-property-aliases-ecmascript "^1.0.4"
+
+unicode-match-property-value-ecmascript@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
+  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+
+unicode-property-aliases-ecmascript@^1.0.4:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
+  integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
+
+union-value@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^2.0.1"
+
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
+  dependencies:
+    imurmurhash "^0.1.4"
+
+unique-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
+  integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
+  dependencies:
+    crypto-random-string "^2.0.0"
+
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+untildify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-2.1.0.tgz#17eb2807987f76952e9c0485fc311d06a826a2e0"
+  integrity sha1-F+soB5h/dpUunASF/DEdBqgmouA=
+  dependencies:
+    os-homedir "^1.0.0"
+
+unzip-response@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
+  integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
+
+upath@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
+
+uri-js@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  dependencies:
+    punycode "^2.1.0"
+
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+
+url-parse-lax@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
+  integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
+  dependencies:
+    prepend-http "^1.0.1"
+
+url-parse-lax@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
+  dependencies:
+    prepend-http "^2.0.0"
+
+url-to-options@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
+  integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
+
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+
+username-sync@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.2.tgz#0a3697909fb7b5768d29e2921f573acfdd427592"
+  integrity sha512-ayNkOJdoNSGNDBE46Nkc+l6IXmeugbzahZLSMkwvgRWv5y5ZqNY2IrzcgmkR4z32sj1W3tM3TuTUMqkqBzO+RA==
+
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+util.promisify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"
+  integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.2"
+    has-symbols "^1.0.1"
+    object.getownpropertydescriptors "^2.1.0"
+
+util@0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
+  dependencies:
+    inherits "2.0.1"
+
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
+  dependencies:
+    inherits "2.0.3"
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+
+uuid@^3.3.2, uuid@^3.3.3:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
+validate-npm-package-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
+  dependencies:
+    builtins "^1.0.3"
+
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+vm-browserify@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
+  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
+
+w3c-hr-time@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
+  dependencies:
+    browser-process-hrtime "^1.0.0"
+
+walk-sync@^0.2.5:
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.2.7.tgz#b49be4ee6867657aeb736978b56a29d10fa39969"
+  integrity sha1-tJvk7mhnZXrrc2l4tWop0Q+jmWk=
+  dependencies:
+    ensure-posix-path "^1.0.0"
+    matcher-collection "^1.0.0"
+
+walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.2, walk-sync@^0.3.3:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.3.4.tgz#cf78486cc567d3a96b5b2237c6108017a5ffb9a4"
+  integrity sha512-ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==
+  dependencies:
+    ensure-posix-path "^1.0.0"
+    matcher-collection "^1.0.0"
+
+walk-sync@^1.0.0, walk-sync@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-1.1.4.tgz#81049f3d8095479b49574cfa5f558d7a252b127d"
+  integrity sha512-nowc9thB/Jg0KW4TgxoRjLLYRPvl3DB/98S89r4ZcJqq2B0alNcKDh6pzLkBSkPMzRSMsJghJHQi79qw0YWEkA==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^1.1.1"
+
+walk-sync@^2.0.0, walk-sync@^2.0.2:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.1.0.tgz#e214248e5f5cf497ddd87db5a2a02e47e29c6501"
+  integrity sha512-KpH9Xw64LNSx7/UI+3guRZvJWlDxVA4+KKb/4puRoVrG8GkvZRxnF3vhxdjgpoKJGL2TVg1OrtkXIE/VuGPLHQ==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^2.0.0"
+
+walker@~1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+  dependencies:
+    makeerror "1.0.x"
+
+watch-detector@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/watch-detector/-/watch-detector-1.0.0.tgz#c7b722d8695fee9ab6071e0f38f258e6adb22609"
+  integrity sha512-siywMl3fXK30Tlpu/dUBHhlpxhQmHdguZ8OIb813eU9lrVmmsJa9k0+n1HtJ+7p3SzFCPq2XbmR3GUYpPC3TBA==
+  dependencies:
+    heimdalljs-logger "^0.1.10"
+    semver "^6.3.0"
+    silent-error "^1.1.1"
+    tmp "^0.1.0"
+
+watchpack@^1.5.0:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2"
+  integrity sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==
+  dependencies:
+    chokidar "^2.1.8"
+    graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
+
+wcwidth@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  dependencies:
+    defaults "^1.0.3"
+
+webidl-conversions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
+
+webpack-sources@^1.3.0, webpack-sources@^1.4.0:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
+  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack@~4.28:
+  version "4.28.4"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.28.4.tgz#1ddae6c89887d7efb752adf0c3cd32b9b07eacd0"
+  integrity sha512-NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-module-context" "1.7.11"
+    "@webassemblyjs/wasm-edit" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+    acorn "^5.6.2"
+    acorn-dynamic-import "^3.0.0"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+    chrome-trace-event "^1.0.0"
+    enhanced-resolve "^4.1.0"
+    eslint-scope "^4.0.0"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.3.0"
+    loader-utils "^1.1.0"
+    memory-fs "~0.4.1"
+    micromatch "^3.1.8"
+    mkdirp "~0.5.0"
+    neo-async "^2.5.0"
+    node-libs-browser "^2.0.0"
+    schema-utils "^0.4.4"
+    tapable "^1.1.0"
+    terser-webpack-plugin "^1.1.0"
+    watchpack "^1.5.0"
+    webpack-sources "^1.3.0"
+
+websocket-driver@>=0.5.1:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"
+  integrity sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==
+  dependencies:
+    http-parser-js ">=0.4.0 <0.4.11"
+    safe-buffer ">=5.1.0"
+    websocket-extensions ">=0.1.1"
+
+websocket-extensions@>=0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+
+whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+  dependencies:
+    iconv-lite "0.4.24"
+
+whatwg-mimetype@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
+
+whatwg-url@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
+  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
+
+which@^1.2.14, which@^1.2.9, which@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+  dependencies:
+    string-width "^1.0.2 || 2"
+
+word-wrap@~1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
+wordwrap@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+
+wordwrap@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+
+worker-farm@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
+  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
+  dependencies:
+    errno "~0.1.7"
+
+workerpool@^2.3.0:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-2.3.3.tgz#49a70089bd55e890d68cc836a19419451d7c81d7"
+  integrity sha512-L1ovlYHp6UObYqElXXpbd214GgbEKDED0d3sj7pRdFXjNkb2+un/AUcCkceHizO0IVI6SOGGncrcjozruCkRgA==
+  dependencies:
+    object-assign "4.1.1"
+
+workerpool@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-3.1.2.tgz#b34e79243647decb174b7481ab5b351dc565c426"
+  integrity sha512-WJFA0dGqIK7qj7xPTqciWBH5DlJQzoPjsANvc3Y4hNB0SScT+Emjvt0jPPkDBUjBNngX1q9hHgt1Gfwytu6pug==
+  dependencies:
+    "@babel/core" "^7.3.4"
+    object-assign "4.1.1"
+    rsvp "^4.8.4"
+
+workerpool@^5.0.1:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-5.0.4.tgz#4f67cb70ff7550a27ab94de25b0b843cd92059a2"
+  integrity sha512-Sywova24Ow2NQ24JPB68bI89EdqMDjUXo4OpofK/QMD7C2ZVMloYBgQ5J3PChcBJHj2vspsmGx1/3nBKXtUkXQ==
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+write-file-atomic@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
+  dependencies:
+    imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
+    signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
+
+write@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
+  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
+  dependencies:
+    mkdirp "^0.5.1"
+
+ws@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
+  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  dependencies:
+    async-limiter "~1.0.0"
+
+ws@^7.1.2:
+  version "7.2.5"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz#abb1370d4626a5a9cd79d8de404aa18b3465d10d"
+  integrity sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==
+
+ws@~6.1.0:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
+  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
+  dependencies:
+    async-limiter "~1.0.0"
+
+xdg-basedir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
+  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
+
+xml-name-validator@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
+
+xmlchars@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
+
+xmldom@^0.1.19:
+  version "0.1.31"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
+  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
+
+xmlhttprequest-ssl@~1.5.4:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
+  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
+
+xtend@^4.0.0, xtend@~4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+
+y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
+yam@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/yam/-/yam-1.0.0.tgz#7f6c91dc0f5de75a031e6da6b3907c3d25ab0de5"
+  integrity sha512-Hv9xxHtsJ9228wNhk03xnlDReUuWVvHwM4rIbjdAXYvHLs17xjuyF50N6XXFMN6N0omBaqgOok/MCK3At9fTAg==
+  dependencies:
+    fs-extra "^4.0.2"
+    lodash.merge "^4.6.0"
+
+yeast@0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
diff --git a/app/assets/javascripts/wizard-application.js b/app/assets/javascripts/wizard-application.js
index 98de3df3c8..3b1e536366 100644
--- a/app/assets/javascripts/wizard-application.js
+++ b/app/assets/javascripts/wizard-application.js
@@ -1,5 +1,4 @@
-//= require ./discourse-common/utils/decorators
-//= require_tree ./discourse-common
+//= require_tree ./discourse-common/addon
 //= require i18n-patches
 //= require_tree ./select-kit
 //= require wizard/router
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 015fb948a7..08d271e8bc 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -161,7 +161,7 @@ JS
       end
 
       # We need to strip the app subdirectory to replicate how ember-cli works.
-      path || logical_path&.gsub('app/', '')
+      path || logical_path&.gsub('app/', '')&.gsub('addon/', '')
     end
 
   end
diff --git a/lib/freedom_patches/raw_handlebars.rb b/lib/freedom_patches/raw_handlebars.rb
index 7a02f1209d..1242481f0e 100644
--- a/lib/freedom_patches/raw_handlebars.rb
+++ b/lib/freedom_patches/raw_handlebars.rb
@@ -11,7 +11,7 @@ class Barber::Precompiler
   def precompiler
     if !@precompiler
 
-      source = File.read("#{Rails.root}/app/assets/javascripts/discourse-common/lib/raw-handlebars.js")
+      source = File.read("#{Rails.root}/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars.js")
       transpiler = DiscourseJsProcessor::Transpiler.new(skip_module: true)
       transpiled = transpiler.perform(source)
 
diff --git a/package.json b/package.json
index 8c25185e84..0a745f479b 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "main": "index.js",
   "repository": "git@github.com:discourse/discourse.git",
   "author": "Discourse",
-  "license": "MIT",
+  "license": "GPL-2.0-only",
   "dependencies": {
     "@fortawesome/fontawesome-free": "5.11.2",
     "@popperjs/core": "v2.0.6",

From 9ec908950de03768f6394fa8088845113f2a2d0d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 29 Apr 2020 12:54:22 -0400
Subject: [PATCH 0861/1830] DEV: Better error handling for s3 task

---
 lib/tasks/s3.rake | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/s3.rake b/lib/tasks/s3.rake
index b913b0a0ee..1f0ee2e08d 100644
--- a/lib/tasks/s3.rake
+++ b/lib/tasks/s3.rake
@@ -71,7 +71,12 @@ def assets
   manifest.assets.each do |_, path|
     fullpath = (Rails.root + "public/assets/#{path}").to_s
 
-    content_type = MiniMime.lookup_by_filename(fullpath).content_type
+    mime = MiniMime.lookup_by_filename(fullpath)
+    if mime.nil?
+      STDERR.puts "ERROR: could not determine mime type for #{fullpath}"
+    end
+
+    content_type = mime.content_type
 
     asset_path = "assets/#{path}"
     results << [fullpath, asset_path, content_type]

From bc1f7bd6597a0586922485f8b1f70095c796b944 Mon Sep 17 00:00:00 2001
From: Joshua Rosenfeld <jomaxro@discourse.org>
Date: Wed, 29 Apr 2020 13:09:16 -0400
Subject: [PATCH 0862/1830] UX: Improve discobot random menion copy

As suggested in https://meta.discourse.org/t/-/148336/10
---
 plugins/discourse-narrative-bot/config/locales/server.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index 86d081b5bb..38bad9ac85 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -127,7 +127,7 @@ en:
           I currently know how to do the following things:
 
           `@%{discobot_username} %{reset_trigger} {name-of-tutorial}`
-          > Starts an interactive tutorial. `{name-of-tutorial}` can be one of: `%{tracks}`.
+          > Starts an interactive tutorial just for you, in a personal message. `{name-of-tutorial}` can be one of: `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6

From 08fbf199ad75dd049190e32fda70c0df2277c9a1 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 29 Apr 2020 13:13:44 -0400
Subject: [PATCH 0863/1830] FIX: S3 rake task can ignore yarn.lock

---
 lib/tasks/s3.rake | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/lib/tasks/s3.rake b/lib/tasks/s3.rake
index 1f0ee2e08d..7f6b0f79b9 100644
--- a/lib/tasks/s3.rake
+++ b/lib/tasks/s3.rake
@@ -71,27 +71,26 @@ def assets
   manifest.assets.each do |_, path|
     fullpath = (Rails.root + "public/assets/#{path}").to_s
 
-    mime = MiniMime.lookup_by_filename(fullpath)
-    if mime.nil?
-      STDERR.puts "ERROR: could not determine mime type for #{fullpath}"
+    # Ignore files we can't find the mime type of, like yarn.lock
+    if mime = MiniMime.lookup_by_filename(fullpath)
+      content_type = mime.content_type
+
+      asset_path = "assets/#{path}"
+      results << [fullpath, asset_path, content_type]
+
+      if File.exist?(fullpath + '.br')
+        results << [fullpath + '.br', brotli_s3_path(asset_path), content_type, 'br']
+      end
+
+      if File.exist?(fullpath + '.gz')
+        results << [fullpath + '.gz', gzip_s3_path(asset_path), content_type, 'gzip']
+      end
+
+      if File.exist?(fullpath + '.map')
+        results << [fullpath + '.map', asset_path + '.map', 'application/json']
+      end
     end
 
-    content_type = mime.content_type
-
-    asset_path = "assets/#{path}"
-    results << [fullpath, asset_path, content_type]
-
-    if File.exist?(fullpath + '.br')
-      results << [fullpath + '.br', brotli_s3_path(asset_path), content_type, 'br']
-    end
-
-    if File.exist?(fullpath + '.gz')
-      results << [fullpath + '.gz', gzip_s3_path(asset_path), content_type, 'gzip']
-    end
-
-    if File.exist?(fullpath + '.map')
-      results << [fullpath + '.map', asset_path + '.map', 'application/json']
-    end
   end
 
   results

From a1b9150512cd0a1035259659122324dfd0fc4731 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 29 Apr 2020 19:37:21 +0200
Subject: [PATCH 0864/1830] DEV: adds a caret option to widget dropdown (#9588)

---
 .../discourse/app/widgets/widget-dropdown.js      |  4 ++++
 test/javascripts/widgets/widget-dropdown-test.js  | 15 +++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
index e882588d67..c063296e35 100644
--- a/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
+++ b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
@@ -80,6 +80,9 @@ export const WidgetDropdownHeaderClass = {
     <span class="label">
       {{transformed.label}}
     </span>
+    {{#if attrs.caret}}
+      {{d-icon "caret-down"}}
+    {{/if}}
   `
 };
 
@@ -218,6 +221,7 @@ export const WidgetDropdownClass = {
           label=attrs.label
           translatedLabel=attrs.translatedLabel
           class=this.transformed.options.headerClass
+          caret=this.transformed.options.caret
         )
       }}
 
diff --git a/test/javascripts/widgets/widget-dropdown-test.js b/test/javascripts/widgets/widget-dropdown-test.js
index 46625d7d7b..2bc7f94b26 100644
--- a/test/javascripts/widgets/widget-dropdown-test.js
+++ b/test/javascripts/widgets/widget-dropdown-test.js
@@ -302,3 +302,18 @@ widgetTest("bodyClass option", {
     assert.ok(body().classList.contains("and-yet-small"));
   }
 });
+
+widgetTest("caret option", {
+  template: TEMPLATE,
+
+  beforeEach() {
+    this.setProperties(DEFAULT_CONTENT);
+    this.set("options", { caret: true });
+  },
+
+  test(assert) {
+    assert.ok(
+      exists("#my-dropdown .widget-dropdown-header .d-icon-caret-down")
+    );
+  }
+});

From 816a08cf5f576647227940c51a24e75df789a6d8 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 29 Apr 2020 19:42:50 +0200
Subject: [PATCH 0865/1830] UI: do not change widget dropdown separator
 background on hover (#9589)

---
 app/assets/stylesheets/common/components/widget-dropdown.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/common/components/widget-dropdown.scss b/app/assets/stylesheets/common/components/widget-dropdown.scss
index b84b389bf9..8bf179d49f 100644
--- a/app/assets/stylesheets/common/components/widget-dropdown.scss
+++ b/app/assets/stylesheets/common/components/widget-dropdown.scss
@@ -38,6 +38,10 @@
       padding: 0;
       background: $primary-low;
       margin: 0.25em 0;
+
+      &:hover {
+        background: $primary-low;
+      }
     }
 
     &:hover {

From 402194f313257021549d23514969bc69dd0274e5 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 29 Apr 2020 21:24:20 +0300
Subject: [PATCH 0866/1830] FIX: Enter selected link with 'o' on full page
 search

Follow-up to 70012f20278430362649a26a28d3cb4b39449b64.
---
 app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
index dddc2f7374..b9b5ed22b4 100644
--- a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
@@ -54,7 +54,7 @@ const DEFAULT_BINDINGS = {
       ".latest-topic-list .latest-topic-list-item.selected div.main-link a.title",
       ".top-topic-list .latest-topic-list-item.selected div.main-link a.title",
       ".latest .featured-topic.selected a.title",
-      ".search-results .search-link"
+      ".search-results .fps-result.selected .search-link"
     ].join(", "),
     anonymous: true
   }, // open selected topic on latest or categories page

From c85018cdfd1a36e8c33de25c44bf192d53e201c1 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 29 Apr 2020 21:40:21 +0300
Subject: [PATCH 0867/1830] Improve support for old browsers (#9515)

* FEATURE: Improve crawler view

* FIX: Make lazyYT crawler-friendly

* DEV: Rename discourse-internet-explorer to discourse-unsupported-browser

* DEV: Detect more unsupported browsers

Follow-up to 4eebbd221239eaa3fc7e6f1bd6a9dcf0239b8444.

* FIX: Hide browser update notice in print view
---
 .gitignore                                    |  2 +-
 app/assets/javascripts/browser-detect.js      |  9 +++
 .../stylesheets/common/base/_topic-list.scss  |  6 ++
 .../common/base/crawler_layout.scss           | 40 +++----------
 app/helpers/topics_helper.rb                  |  4 +-
 app/views/layouts/crawler.html.erb            | 12 ++--
 app/views/list/list.erb                       | 56 ++++++++++++++----
 app/views/topics/show.html.erb                | 57 +++++++++----------
 lib/plugin/metadata.rb                        |  2 +-
 .../config/locales/server.en.yml              |  4 --
 .../config/settings.yml                       |  6 --
 .../discourse-unsupported-browser.js.es6}     |  8 +--
 .../assets/stylesheets/ie.scss                |  0
 .../config/locales/client.en.yml              |  2 +-
 .../config/locales/server.en.yml              |  4 ++
 .../config/settings.yml                       |  6 ++
 .../plugin.rb                                 | 14 ++---
 .../public/js/ie.js                           |  0
 .../spec/middleware/anonymous_cache_spec.rb   |  0
 .../spec/requests/bootstrap_request_spec.rb   | 16 +++---
 plugins/lazy-yt/plugin.rb                     | 14 ++++-
 .../assets/javascripts/browser-update.js.erb  |  3 +-
 22 files changed, 151 insertions(+), 114 deletions(-)
 delete mode 100644 plugins/discourse-internet-explorer/config/locales/server.en.yml
 delete mode 100644 plugins/discourse-internet-explorer/config/settings.yml
 rename plugins/{discourse-internet-explorer/assets/javascripts/initializers/discourse-internet-explorer.js.es6 => discourse-unsupported-browser/assets/javascripts/initializers/discourse-unsupported-browser.js.es6} (69%)
 rename plugins/{discourse-internet-explorer => discourse-unsupported-browser}/assets/stylesheets/ie.scss (100%)
 rename plugins/{discourse-internet-explorer => discourse-unsupported-browser}/config/locales/client.en.yml (78%)
 create mode 100644 plugins/discourse-unsupported-browser/config/locales/server.en.yml
 create mode 100644 plugins/discourse-unsupported-browser/config/settings.yml
 rename plugins/{discourse-internet-explorer => discourse-unsupported-browser}/plugin.rb (76%)
 rename plugins/{discourse-internet-explorer => discourse-unsupported-browser}/public/js/ie.js (100%)
 rename plugins/{discourse-internet-explorer => discourse-unsupported-browser}/spec/middleware/anonymous_cache_spec.rb (100%)
 rename plugins/{discourse-internet-explorer => discourse-unsupported-browser}/spec/requests/bootstrap_request_spec.rb (64%)

diff --git a/.gitignore b/.gitignore
index bc22f48bbd..97d1a6b930 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,7 +54,7 @@ bootsnap-compile-cache/
 !/plugins/discourse-narrative-bot
 !/plugins/discourse-presence
 !/plugins/discourse-local-dates
-!/plugins/discourse-internet-explorer
+!/plugins/discourse-unsupported-browser
 /plugins/*/auto_generated/
 
 /spec/fixtures/plugins/my_plugin/auto_generated
diff --git a/app/assets/javascripts/browser-detect.js b/app/assets/javascripts/browser-detect.js
index bdbbc27b3e..c13298dbb4 100644
--- a/app/assets/javascripts/browser-detect.js
+++ b/app/assets/javascripts/browser-detect.js
@@ -1,3 +1,12 @@
 if (!window.WeakMap || !window.Promise) {
   window.unsupportedBrowser = true;
+} else {
+  // Some implementations of `WeakMap.prototype.has` do not accept false
+  // values and Ember's `isClassicDecorator` sometimes does that (it only
+  // checks for `null` and `undefined`).
+  try {
+    new WeakMap().has(0);
+  } catch (err) {
+    window.unsupportedBrowser = true;
+  }
 }
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 5b9cff0076..01fc70a2bb 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -142,6 +142,12 @@
     }
   }
 
+  .link-bottom-line {
+    .category-name {
+      margin-right: 12px;
+    }
+  }
+
   .unread-indicator {
     &.read {
       display: none;
diff --git a/app/assets/stylesheets/common/base/crawler_layout.scss b/app/assets/stylesheets/common/base/crawler_layout.scss
index 8f42f9ae0b..c0ca931510 100644
--- a/app/assets/stylesheets/common/base/crawler_layout.scss
+++ b/app/assets/stylesheets/common/base/crawler_layout.scss
@@ -21,12 +21,6 @@ body.crawler {
     }
   }
 
-  .raw-topic-link {
-    display: block;
-    font-weight: bold;
-    margin-bottom: 0.25em;
-  }
-
   .topic-list {
     margin-bottom: 1em;
   }
@@ -34,6 +28,14 @@ body.crawler {
   footer {
     margin-top: 4em;
   }
+
+  .category-title {
+    color: $primary;
+  }
+
+  .discourse-tags {
+    color: $primary-medium;
+  }
 }
 
 .noscript-footer-nav {
@@ -47,10 +49,7 @@ body.crawler {
 
 #noscript-footer {
   padding: 0 10px;
-}
-
-.crawler-topic-title {
-  margin-top: 0.5em;
+  text-align: center;
 }
 
 .crawler-post {
@@ -86,27 +85,6 @@ body.crawler {
   }
 }
 
-#breadcrumbs {
-  margin-bottom: 0.5em;
-  font-size: $font-up-1;
-  > div {
-    margin-bottom: 0.15em;
-  }
-  .badge-category-bg {
-    background-color: $secondary-high;
-  }
-  .category-title {
-    color: $primary;
-  }
-}
-
-.crawler-tags-list {
-  span {
-    display: block;
-    margin-bottom: 0.15em;
-  }
-}
-
 .crawler-linkback-list {
   margin-top: 1em;
   a {
diff --git a/app/helpers/topics_helper.rb b/app/helpers/topics_helper.rb
index 4f4a56b6e7..0020423621 100644
--- a/app/helpers/topics_helper.rb
+++ b/app/helpers/topics_helper.rb
@@ -12,9 +12,9 @@ module TopicsHelper
     category = topic.category
 
     if category && !category.uncategorized?
-      breadcrumb.push(url: category.url, name: category.name)
+      breadcrumb.push(url: category.url, name: category.name, color: category.color)
       while category = category.parent_category
-        breadcrumb.prepend(url: category.url, name: category.name)
+        breadcrumb.prepend(url: category.url, name: category.name, color: category.color)
       end
     end
 
diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb
index e8fc43c023..b5a8345550 100644
--- a/app/views/layouts/crawler.html.erb
+++ b/app/views/layouts/crawler.html.erb
@@ -34,13 +34,13 @@
       <%= yield %>
     </div>
     <footer class="container wrap">
-      <nav class='crawler-nav' itemscope itemtype='http://schema.org/SiteNavigationElement'>
+      <nav class='crawler-nav'>
         <ul>
-        <li itemprop="name"><a href='<%= path "/" %>' itemprop="url"><%= t 'home_title' %> </a></li>
-        <li itemprop="name"><a href='<%= path "/categories" %>' itemprop="url"><%= t 'js.filters.categories.title' %> </a></li>
-        <li itemprop="name"><a href='<%= path "/guidelines" %>' itemprop="url"><%= t 'guidelines_topic.title' %> </a></li>
-        <li itemprop="name"><a href='<%= path "/tos" %>' itemprop="url"><%= t 'tos_topic.title' %> </a></li>
-        <li itemprop="name"><a href='<%= path "/privacy" %>' itemprop="url"><%= t 'privacy_topic.title' %> </a></li>
+        <li itemscope itemtype='http://schema.org/SiteNavigationElement' itemprop="name"><a href='<%= path "/" %>' itemprop="url"><%= t 'home_title' %> </a></li>
+        <li itemscope itemtype='http://schema.org/SiteNavigationElement' itemprop="name"><a href='<%= path "/categories" %>' itemprop="url"><%= t 'js.filters.categories.title' %> </a></li>
+        <li itemscope itemtype='http://schema.org/SiteNavigationElement' itemprop="name"><a href='<%= path "/guidelines" %>' itemprop="url"><%= t 'guidelines_topic.title' %> </a></li>
+        <li itemscope itemtype='http://schema.org/SiteNavigationElement' itemprop="name"><a href='<%= path "/tos" %>' itemprop="url"><%= t 'tos_topic.title' %> </a></li>
+        <li itemscope itemtype='http://schema.org/SiteNavigationElement' itemprop="name"><a href='<%= path "/privacy" %>' itemprop="url"><%= t 'privacy_topic.title' %> </a></li>
         </ul>
       </nav>
       <p class='powered-by-link'><%= t 'powered_by_html' %></p>
diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index af99862b96..77bb68d2e4 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -44,7 +44,9 @@
     <thead>
       <tr>
         <th><%= t 'js.topic.title' %></th>
+        <th></th>
         <th><%= t 'js.replies' %></th>
+        <th><%= t 'js.views' %></th>
         <th><%= t 'js.activity' %></th>
       </tr>
     </thead>
@@ -52,25 +54,53 @@
     <tbody>
       <meta itemprop='itemListOrder' content='http://schema.org/ItemListOrderDescending'>
       <% @list.topics.each_with_index do |t,i| %>
-        <tr>
-          <td itemprop='itemListElement' itemscope itemtype='http://schema.org/ListItem'>
-            <meta itemprop='position' content='<%= i %>'>
-            <meta itemprop='url' content='<%= t.url %>'>
+        <tr class="topic-list-item">
+          <td class="main-link" itemprop='itemListElement' itemscope itemtype='http://schema.org/ListItem'>
             <meta itemprop='name' content='<%= t.title %>'>
-            <a href='<%= t.url %>' class='title raw-link raw-topic-link'>
-              <span><%= t.title %></span>
-            </a>
-            <% if (!@category || @category.has_children?) && t.category %>
-              <div>
-                <a href='<%= t.category.url %>'><span class='category-name'><%= t.category.name %></span></a>
-              </div>
+            <meta itemprop='url' content='<%= t.url %>'>
+            <% if t.image_url.present? %>
+              <meta itemprop='image' content='<%= t.image_url %>'>
             <% end %>
+            <meta itemprop='position' content='<%= i + 1 %>'>
+            <span class="link-top-line">
+              <a href='<%= t.url %>' class='title raw-link raw-topic-link'><%= t.title %></a>
+            </span>
+            <div class="link-bottom-line">
+              <% if (!@category || @category.has_children?) && t.category %>
+                <a href='<%= t.category.url %>' class='badge-wrapper bullet'>
+                  <span class='badge-category-bg' style='background-color: #<%= t.category.color %>'></span>
+                  <span class='category-title'><%= t.category.name %></span>
+                </a>
+              <% end %>
+              <% if t.tags %>
+                <div class="discourse-tags">
+                  <% t.tags.each_with_index do |tag, index| %>
+                    <a href='<%= tag.full_url %>' class='discourse-tag'><%= tag.name %></a>
+                    <% if index < t.tags.size - 1 %>,&nbsp;<% end %>
+                  <% end %>
+                </div>
+              <% end %>
+            </div>
             <% if t.pinned_until && (t.pinned_until > Time.zone.now) && (t.pinned_globally || @list.category) && t.excerpt %>
               <p class='excerpt'>
                 <%= t.excerpt.html_safe %>
               </p>
             <% end %>
           </td>
+          <td class='posters'>
+            <% t.posters.each do |poster| %>
+              <% if poster.moreCount %>
+                <a class="posters-more-count"><% poster.moreCount %></a>
+              <% else %>
+                <a href="<%= Discourse.base_url %>/u/<%= poster.user.username %>" class="<%= poster.extraClasses %>">
+                  <img width="25" height="25" src="<%= poster.user.avatar_template.gsub('{size}', '25') %>" class="avatar" title='<%= h("#{poster.user.username} - #{poster.description}") %>' aria-label='<%= h("#{poster.user.username} - #{poster.description}") %>'>
+                </a>
+              <% end %>
+            <% end %>
+          </td>
+          <td>
+            <span class='views' title='<%= t 'views' %>'><%= t.views %></span>
+          </td>
           <td>
             <span class='posts' title='<%= t 'posts' %>'><%= t.posts_count %></span>
           </td>
@@ -89,7 +119,9 @@
     <% if params[:page].to_i > 0 %>
       <span itemprop='name'><a href='<%= @list.prev_topics_url %>' rel='prev' itemprop='url'><%= t 'prev_page' %></a> &nbsp;</span>
     <% end %>
-    <span itemprop='name'><b><a href='<%= @list.more_topics_url %>' rel='next' itemprop='url'><%= t 'next_page' %></a></b></span>
+    <% if @list.topics.size == @list.per_page %>
+      <span itemprop='name'><b><a href='<%= @list.more_topics_url %>' rel='next' itemprop='url'><%= t 'next_page' %></a></b></span>
+    <% end %>
   </div>
 
   <% content_for :head do %>
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index c5187769be..e9d3b96b9a 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -1,37 +1,36 @@
 <% if @topic_view %>
-  <h1 class="crawler-topic-title">
-    <%= render_topic_title(@topic_view.topic) %>
-  </h1>
+  <div id="topic-title">
+    <h1>
+      <%= render_topic_title(@topic_view.topic) %>
+    </h1>
 
-  <% @breadcrumbs = categories_breadcrumb(@topic_view.topic) %>
-  <% if @breadcrumbs.present? %>
-  <div id="breadcrumbs" itemscope itemtype="http://schema.org/BreadcrumbList">
-    <% @breadcrumbs.each_with_index do |c, i| %>
-      <div itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
-        <a href="<%= Discourse.base_url %><%= c[:url] %>" class="badge-wrapper bullet" itemprop="item">
-          <span class="badge-category-bg"></span>
-          <span class="category-title" itemprop="name"><%= c[:name] %></span>
-        </a>
-        <meta itemprop="position" content="<%= i + 1 %>" />
-      </div>
-    <% end %>
-  </div>
-  <% end %>
-
-  <% if SiteSetting.tagging_enabled %>
-    <% @tags = @topic_view.topic.tags %>
-    <% if @tags.present? %>
-      <div class='crawler-tags-list' itemscope itemtype='http://schema.org/DiscussionForumPosting'>
-        <% @tags.each_with_index do |tag, i| %>
-          <div itemprop='keywords'>
-            <a href='<%= "#{Discourse.base_url}/tag/#{tag.name}" %>' rel="tag">
-              <span itemprop='headline'><%= tag.name -%></span>
+    <div class="topic-category" itemscope itemtype="http://schema.org/BreadcrumbList">
+      <% @breadcrumbs = categories_breadcrumb(@topic_view.topic) %>
+      <% if @breadcrumbs.present? %>
+        <% @breadcrumbs.each_with_index do |c, i| %>
+          <span itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
+            <a href="<%= Discourse.base_url %><%= c[:url] %>" class="badge-wrapper bullet" itemprop="item">
+              <span class="badge-category-bg" style='background-color: #<%= c[:color] %>'></span>
+              <span class="category-title" itemprop="name"><%= c[:name] %></span>
             </a>
+            <meta itemprop="position" content="<%= i + 1 %>" />
+          </span>
+        <% end %>
+      <% end %>
+
+      <% if SiteSetting.tagging_enabled %>
+        <% @tags = @topic_view.topic.tags %>
+        <% if @tags.present? %>
+          <meta itemprop='keywords' content='<%= @tags.map(&:name).join(', ') %>'>
+          <div class='discourse-tags list-tags'>
+            <% @tags.each_with_index do |tag, i| %>
+              <a href='<%= "#{Discourse.base_url}/tag/#{tag.name}" %>' class='discourse-tag' rel="tag"><%= tag.name -%></a><% if i < @tags.size - 1 %>, <% end %>
+            <% end %>
           </div>
         <% end %>
-      </div>
-    <% end %>
-  <% end %>
+      <% end %>
+    </div>
+  </div>
 
   <%= server_plugin_outlet "topic_header" %>
 
diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index cfdb98263f..04cb17a57e 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -74,7 +74,7 @@ class Plugin::Metadata
     "docker_manager",
     "lazy-yt",
     "poll",
-    "discourse-internet-explorer"
+    "discourse-unsupported-browser"
   ])
 
   FIELDS ||= [:name, :about, :version, :authors, :url, :required_version, :transpile_js]
diff --git a/plugins/discourse-internet-explorer/config/locales/server.en.yml b/plugins/discourse-internet-explorer/config/locales/server.en.yml
deleted file mode 100644
index 03100823db..0000000000
--- a/plugins/discourse-internet-explorer/config/locales/server.en.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-en:
-  site_settings:
-    discourse_internet_explorer_enabled: "Enable temporary Internet Explorer support. This plugin is an effort to maintain compatibility with older browsers and will be completely removed in the near future."
-    discourse_internet_explorer_deprecation_warning: "Show an Internet Explorer deprecation warning"
diff --git a/plugins/discourse-internet-explorer/config/settings.yml b/plugins/discourse-internet-explorer/config/settings.yml
deleted file mode 100644
index 582f929ac1..0000000000
--- a/plugins/discourse-internet-explorer/config/settings.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-plugins:
-  discourse_internet_explorer_enabled:
-    default: true
-  discourse_internet_explorer_deprecation_warning:
-    default: true
-    client: true
diff --git a/plugins/discourse-internet-explorer/assets/javascripts/initializers/discourse-internet-explorer.js.es6 b/plugins/discourse-unsupported-browser/assets/javascripts/initializers/discourse-unsupported-browser.js.es6
similarity index 69%
rename from plugins/discourse-internet-explorer/assets/javascripts/initializers/discourse-internet-explorer.js.es6
rename to plugins/discourse-unsupported-browser/assets/javascripts/initializers/discourse-unsupported-browser.js.es6
index 96a52fbc19..a2c96deb82 100644
--- a/plugins/discourse-internet-explorer/assets/javascripts/initializers/discourse-internet-explorer.js.es6
+++ b/plugins/discourse-unsupported-browser/assets/javascripts/initializers/discourse-unsupported-browser.js.es6
@@ -2,12 +2,12 @@ import { withPluginApi } from "discourse/lib/plugin-api";
 
 function initializeInternetExplorerDeprecation(api) {
   const siteSettings = api.container.lookup("site-settings:main");
-  if (siteSettings.discourse_internet_explorer_deprecation_warning) {
+  if (siteSettings.browser_deprecation_warning) {
     const { isIE11 } = api.container.lookup("capabilities:main");
     if (isIE11) {
       api.addGlobalNotice(
-        I18n.t("discourse_internet_explorer.deprecation_warning"),
-        "deprecate-internet-explorer",
+        I18n.t("discourse_unsupported_browser.deprecation_warning"),
+        "browser-deprecation-warning",
         { dismissable: true, dismissDuration: moment.duration(1, "week") }
       );
     }
@@ -15,7 +15,7 @@ function initializeInternetExplorerDeprecation(api) {
 }
 
 export default {
-  name: "discourse-internet-explorer",
+  name: "discourse-unsupported-browser",
 
   initialize() {
     withPluginApi("0.8.37", initializeInternetExplorerDeprecation);
diff --git a/plugins/discourse-internet-explorer/assets/stylesheets/ie.scss b/plugins/discourse-unsupported-browser/assets/stylesheets/ie.scss
similarity index 100%
rename from plugins/discourse-internet-explorer/assets/stylesheets/ie.scss
rename to plugins/discourse-unsupported-browser/assets/stylesheets/ie.scss
diff --git a/plugins/discourse-internet-explorer/config/locales/client.en.yml b/plugins/discourse-unsupported-browser/config/locales/client.en.yml
similarity index 78%
rename from plugins/discourse-internet-explorer/config/locales/client.en.yml
rename to plugins/discourse-unsupported-browser/config/locales/client.en.yml
index 11d0a92ef9..fca8ed0b1e 100644
--- a/plugins/discourse-internet-explorer/config/locales/client.en.yml
+++ b/plugins/discourse-unsupported-browser/config/locales/client.en.yml
@@ -1,4 +1,4 @@
 en:
   js:
-    discourse_internet_explorer:
+    discourse_unsupported_browser:
       deprecation_warning: This site will soon remove support for Internet Explorer 11 - please update your browser
diff --git a/plugins/discourse-unsupported-browser/config/locales/server.en.yml b/plugins/discourse-unsupported-browser/config/locales/server.en.yml
new file mode 100644
index 0000000000..aa0ed026bc
--- /dev/null
+++ b/plugins/discourse-unsupported-browser/config/locales/server.en.yml
@@ -0,0 +1,4 @@
+en:
+  site_settings:
+    discourse_unsupported_browser_enabled: "Enable temporary support for old browsers. This plugin is an effort to maintain compatibility with older browsers and will be completely removed in the near future."
+    browser_deprecation_warning: "Show a warning to deprecated browsers"
diff --git a/plugins/discourse-unsupported-browser/config/settings.yml b/plugins/discourse-unsupported-browser/config/settings.yml
new file mode 100644
index 0000000000..6aa3ccf598
--- /dev/null
+++ b/plugins/discourse-unsupported-browser/config/settings.yml
@@ -0,0 +1,6 @@
+plugins:
+  discourse_unsupported_browser_enabled:
+    default: true
+  browser_deprecation_warning:
+    default: true
+    client: true
diff --git a/plugins/discourse-internet-explorer/plugin.rb b/plugins/discourse-unsupported-browser/plugin.rb
similarity index 76%
rename from plugins/discourse-internet-explorer/plugin.rb
rename to plugins/discourse-unsupported-browser/plugin.rb
index 646dfff08a..c27d442090 100644
--- a/plugins/discourse-internet-explorer/plugin.rb
+++ b/plugins/discourse-unsupported-browser/plugin.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-# name: discourse-internet-explorer
-# about: Attempts to provide backward support for internt explorer
+# name: discourse-unsupported-browser
+# about: Attempts to provide support for old and unsupported browser through polyfills
 # version: 1.0
 # authors: Joffrey Jaffeux, David Taylor, Daniel Waterworth, Robin Ward
-# url: https://github.com/discourse/discourse/tree/master/plugins/discourse-internet-explorer
+# url: https://github.com/discourse/discourse/tree/master/plugins/discourse-unsupported-browser
 
-enabled_site_setting :discourse_internet_explorer_enabled
+enabled_site_setting :discourse_unsupported_browser_enabled
 hide_plugin if self.respond_to?(:hide_plugin)
 
 register_asset 'stylesheets/ie.scss'
@@ -15,8 +15,8 @@ register_asset 'stylesheets/ie.scss'
 # been activated so it can be uploaded to CDNs.
 DiscourseEvent.on(:after_plugin_activation) do ||
   polyfill_path = "#{Plugin::Instance.js_path}/#{self.directory_name}-optional.js"
-  FileUtils.cp("#{Rails.root}/public/plugins/discourse-internet-explorer/js/ie.js", polyfill_path)
-  Rails.configuration.assets.precompile << "plugins/discourse-internet-explorer-optional.js"
+  FileUtils.cp("#{Rails.root}/public/plugins/discourse-unsupported-browser/js/ie.js", polyfill_path)
+  Rails.configuration.assets.precompile << "plugins/discourse-unsupported-browser-optional.js"
 end
 
 after_initialize do
@@ -42,7 +42,7 @@ after_initialize do
   # to be loaded before other files
   register_html_builder('server:before-script-load') do |controller|
     if BrowserDetection.browser(controller.request.env['HTTP_USER_AGENT']) == :ie
-      path = controller.helpers.script_asset_path('plugins/discourse-internet-explorer-optional')
+      path = controller.helpers.script_asset_path('plugins/discourse-unsupported-browser-optional')
 
       <<~JAVASCRIPT
         <script src="#{path}"></script>
diff --git a/plugins/discourse-internet-explorer/public/js/ie.js b/plugins/discourse-unsupported-browser/public/js/ie.js
similarity index 100%
rename from plugins/discourse-internet-explorer/public/js/ie.js
rename to plugins/discourse-unsupported-browser/public/js/ie.js
diff --git a/plugins/discourse-internet-explorer/spec/middleware/anonymous_cache_spec.rb b/plugins/discourse-unsupported-browser/spec/middleware/anonymous_cache_spec.rb
similarity index 100%
rename from plugins/discourse-internet-explorer/spec/middleware/anonymous_cache_spec.rb
rename to plugins/discourse-unsupported-browser/spec/middleware/anonymous_cache_spec.rb
diff --git a/plugins/discourse-internet-explorer/spec/requests/bootstrap_request_spec.rb b/plugins/discourse-unsupported-browser/spec/requests/bootstrap_request_spec.rb
similarity index 64%
rename from plugins/discourse-internet-explorer/spec/requests/bootstrap_request_spec.rb
rename to plugins/discourse-unsupported-browser/spec/requests/bootstrap_request_spec.rb
index 34a6213afe..036e1ced50 100644
--- a/plugins/discourse-internet-explorer/spec/requests/bootstrap_request_spec.rb
+++ b/plugins/discourse-unsupported-browser/spec/requests/bootstrap_request_spec.rb
@@ -7,31 +7,31 @@ describe 'Bootstrapping the Discourse App' do
 
   context "when disabled" do
     before do
-      SiteSetting.discourse_internet_explorer_enabled = false
+      SiteSetting.discourse_unsupported_browser_enabled = false
     end
 
     it "does not include the IE stylesheet or Javascript" do
       get "/categories", headers: { "HTTP_USER_AGENT" => ie_agent }
-      expect(response.body).not_to match(/discourse-internet-explorer-optional.js/)
-      expect(response.body).not_to match(/stylesheets\/discourse-internet-explorer/)
+      expect(response.body).not_to match(/discourse-unsupported-browser-optional.js/)
+      expect(response.body).not_to match(/stylesheets\/discourse-unsupported-browser/)
     end
   end
 
   context "when enabled" do
     before do
-      SiteSetting.discourse_internet_explorer_enabled = true
+      SiteSetting.discourse_unsupported_browser_enabled = true
     end
 
     it "includes the IE js and css" do
       get "/categories", headers: { "HTTP_USER_AGENT" => ie_agent }
-      expect(response.body).to match(/discourse-internet-explorer-optional.js/)
-      expect(response.body).to match(/stylesheets\/discourse-internet-explorer/)
+      expect(response.body).to match(/discourse-unsupported-browser-optional.js/)
+      expect(response.body).to match(/stylesheets\/discourse-unsupported-browser/)
     end
 
     it "doesn't include IE stuff for non-IE browsers" do
       get "/categories", headers: { "HTTP_USER_AGENT" => "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36" }
-      expect(response.body).not_to match(/discourse-internet-explorer-optional.js/)
-      expect(response.body).not_to match(/stylesheets\/discourse-internet-explorer/)
+      expect(response.body).not_to match(/discourse-unsupported-browser-optional.js/)
+      expect(response.body).not_to match(/stylesheets\/discourse-unsupported-browser/)
     end
   end
 end
diff --git a/plugins/lazy-yt/plugin.rb b/plugins/lazy-yt/plugin.rb
index 02d143b371..9d0af49153 100644
--- a/plugins/lazy-yt/plugin.rb
+++ b/plugins/lazy-yt/plugin.rb
@@ -27,7 +27,19 @@ class Onebox::Engine::YoutubeOnebox
 
       # Put in the LazyYT div instead of the iframe
       escaped_title = ERB::Util.html_escape(video_title)
-      "<div class=\"lazyYT\" data-youtube-id=\"#{video_id}\" data-youtube-title=\"#{escaped_title}\" data-width=\"#{video_width}\" data-height=\"#{video_height}\" data-parameters=\"#{embed_params}\"></div>"
+
+      <<~EOF
+      <div class="lazyYT"
+           data-youtube-id="#{video_id}"
+           data-youtube-title="#{escaped_title}"
+           data-width="#{video_width}"
+           data-height="#{video_height}"
+           data-parameters="#{embed_params}">
+        <a href="https://www.youtube.com/watch?v=#{video_id}" target="_blank">
+          <img src="https://img.youtube.com/vi/#{video_id}/hqdefault.jpg" width="#{video_width}" height="#{video_height}" title="#{escaped_title}">
+        </a>
+      </div>
+      EOF
     else
       yt_onebox_to_html
     end
diff --git a/vendor/assets/javascripts/browser-update.js.erb b/vendor/assets/javascripts/browser-update.js.erb
index b32410b8e6..be54f3bc0f 100644
--- a/vendor/assets/javascripts/browser-update.js.erb
+++ b/vendor/assets/javascripts/browser-update.js.erb
@@ -18,6 +18,7 @@ var $buo = function() {
     return;
   }
 
+  document.getElementsByTagName('body')[0].classList.add("crawler");
   var mainElement = document.getElementById("main");
   var noscriptElements = document.getElementsByTagName("noscript");
   // noscriptElements[0].innerHTML contains encoded HTML
@@ -34,7 +35,7 @@ var $buo = function() {
 
   // create the notification div stylesheet
   var sheet = document.createElement("style");
-  var style = ".buorg {position:absolute; z-index:111111; width:100%; top:0px; left:0px; background:#FDF2AB; text-align:left; font-family: sans-serif; color:#000; font-size: 14px;} .buorg div {padding: 8px;} .buorg a, .buorg a:visited {color:#E25600; text-decoration: underline;}";
+  var style = ".buorg {position:absolute; z-index:111111; width:100%; top:0px; left:0px; background:#FDF2AB; text-align:left; font-family: sans-serif; color:#000; font-size: 14px;} .buorg div {padding: 8px;} .buorg a, .buorg a:visited {color:#E25600; text-decoration: underline;} @media print { .buorg { display: none !important; } }";
 
   // insert the div and stylesheet into the DOM
   document.body.appendChild(div); // put it last in the DOM so Googlebot doesn't include it in search excerpts

From e1dbc700b1152bc4e12a7f95d36f341d958f7967 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 29 Apr 2020 21:12:32 +0200
Subject: [PATCH 0868/1830] FIX: ensures widget dropdown doesn't overflow
 document (#9590)

---
 .../javascripts/discourse/app/widgets/widget-dropdown.js  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
index c063296e35..8fe72d3e33 100644
--- a/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
+++ b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
@@ -1,4 +1,5 @@
 import { createWidget } from "discourse/widgets/widget";
+import { schedule } from "@ember/runloop";
 import hbs from "discourse/widgets/hbs-compiler";
 
 /*
@@ -252,6 +253,9 @@ export const WidgetDropdownClass = {
         strategy: "fixed",
         placement: "bottom-start",
         modifiers: [
+          {
+            name: "preventOverflow"
+          },
           {
             name: "offset",
             options: {
@@ -261,6 +265,10 @@ export const WidgetDropdownClass = {
         ]
       });
     }
+
+    schedule("afterRender", () => {
+      this._popper && this._popper.update();
+    });
   }
 };
 

From f697133b7dac400d4c1fc9ab662ee3265ad83a61 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 29 Apr 2020 16:14:35 -0400
Subject: [PATCH 0869/1830] DEV: Add Handlebars support to Ember CLI in
 discourse-common

---
 app/assets/javascripts/discourse-common/index.js     | 9 ++++++++-
 app/assets/javascripts/discourse-common/package.json | 5 +++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse-common/index.js b/app/assets/javascripts/discourse-common/index.js
index e8db57f915..7ad7fe9113 100644
--- a/app/assets/javascripts/discourse-common/index.js
+++ b/app/assets/javascripts/discourse-common/index.js
@@ -1,5 +1,12 @@
 "use strict";
 
 module.exports = {
-  name: require("./package").name
+  name: require("./package").name,
+  options: {
+    autoImport: {
+      alias: {
+        handlebars: "handlebars/dist/cjs/handlebars.js"
+      }
+    }
+  }
 };
diff --git a/app/assets/javascripts/discourse-common/package.json b/app/assets/javascripts/discourse-common/package.json
index f56ec8cce4..bdd317efb4 100644
--- a/app/assets/javascripts/discourse-common/package.json
+++ b/app/assets/javascripts/discourse-common/package.json
@@ -18,14 +18,15 @@
   },
   "dependencies": {
     "ember-cli-babel": "^7.13.0",
-    "ember-cli-htmlbars": "^4.2.0"
+    "ember-cli-htmlbars": "^4.2.0",
+    "ember-auto-import": "^1.5.3",
+    "handlebars": "^4.7.0"
   },
   "devDependencies": {
     "@ember/optional-features": "^1.1.0",
     "@glimmer/component": "^1.0.0",
     "babel-eslint": "^10.0.3",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^1.5.3",
     "ember-cli": "~3.15.2",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-eslint": "^5.1.0",

From 590830b931ec83f7ae4ccde3cf820a072d6c2d09 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 29 Apr 2020 23:15:39 +0300
Subject: [PATCH 0870/1830] HACK: Add dummy plugin folder

On some installations, there may be a leftover symlink which uses the
old plugin name:

  public/plugins/discourse-internet-explorer ->
  -> plugins/discourse-internet-explorer/public
---
 .gitignore                                          | 1 +
 plugins/discourse-internet-explorer/public/.gitkeep | 0
 2 files changed, 1 insertion(+)
 create mode 100644 plugins/discourse-internet-explorer/public/.gitkeep

diff --git a/.gitignore b/.gitignore
index 97d1a6b930..46e956c118 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@ bootsnap-compile-cache/
 !/plugins/discourse-narrative-bot
 !/plugins/discourse-presence
 !/plugins/discourse-local-dates
+!/plugins/discourse-internet-explorer
 !/plugins/discourse-unsupported-browser
 /plugins/*/auto_generated/
 
diff --git a/plugins/discourse-internet-explorer/public/.gitkeep b/plugins/discourse-internet-explorer/public/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2

From 8e4fea897e68e4b50e548f820dc1f1fdeeeb199d Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Wed, 29 Apr 2020 14:34:49 -0700
Subject: [PATCH 0871/1830] FIX: temporarily disable event listener for
 dismissing the first notification

---
 .../javascripts/discourse/app/components/site-header.js    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/site-header.js b/app/assets/javascripts/discourse/app/components/site-header.js
index ec7084b815..a31c16f375 100644
--- a/app/assets/javascripts/discourse/app/components/site-header.js
+++ b/app/assets/javascripts/discourse/app/components/site-header.js
@@ -225,9 +225,10 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
           );
         }
       };
-      document.addEventListener("click", this._dismissFirstNotification, {
-        once: true
-      });
+      // TODO: re-enable event listener
+      //      document.addEventListener("click", this._dismissFirstNotification, {
+      //        once: true
+      //      });
     }
   },
 

From 4f5ed8e781207f1122df9e80888273e51c74951f Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 30 Apr 2020 09:40:50 +1000
Subject: [PATCH 0872/1830] DEV: pry-nav was holding back on pry upgrades

pry-nav is not yet supported on latest pry, this holds off on
upgrading pry, which in turn holds off on upgrading deps

Stripping pry-nav for now till it works with latest pry
---
 Gemfile      |  1 -
 Gemfile.lock | 11 ++++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2b1fb36f22..39b714d5c7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -173,7 +173,6 @@ group :test, :development do
 
   gem 'shoulda-matchers', require: false
   gem 'rspec-html-matchers'
-  gem 'pry-nav'
   gem 'byebug', require: ENV['RM_INFO'].nil?, platform: :mri
   gem 'rubocop', require: false
   gem "rubocop-discourse", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index f561205552..b059691d9d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -186,7 +186,7 @@ GEM
     memory_profiler (0.9.14)
     message_bus (3.1.0)
       rack (>= 1.1.3)
-    method_source (0.9.2)
+    method_source (1.0.0)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     mini_racer (0.2.10)
@@ -257,11 +257,9 @@ GEM
       ast (~> 2.4.0)
     pg (1.2.3)
     progress (3.5.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-nav (0.3.0)
-      pry (>= 0.9.10, < 0.13.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.4)
@@ -506,7 +504,6 @@ DEPENDENCIES
   onebox
   parallel_tests
   pg
-  pry-nav
   pry-rails
   puma
   r2

From ca539fdccfd2361775342392d8b534ea18550e83 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 30 Apr 2020 10:09:22 +1000
Subject: [PATCH 0873/1830] FIX: Rename all instances of bookmarkWithReminder
 to just bookmark (#9579)

* Rename all instances of bookmarkWithReminder and bookmark_with_reminder to just bookmark
* Delete old bookmark code at the same time
* Add migration to remove the bookmarkWithReminder post menu item if people have it set in site settings
---
 .../discourse/app/controllers/topic.js        | 12 +-----
 .../discourse/app/lib/transform-post.js       |  1 -
 .../javascripts/discourse/app/models/post.js  | 30 +--------------
 .../javascripts/discourse/app/models/topic.js | 15 ++------
 .../discourse/app/templates/topic.hbs         |  1 -
 .../discourse/app/widgets/post-menu.js        | 38 +++----------------
 app/serializers/post_serializer.rb            | 17 ++-------
 config/site_settings.yml                      |  6 +--
 ..._bookmarks_with_reminder_post_menu_item.rb | 28 ++++++++++++++
 .../initializers/new-user-narrative.js.es6    |  6 +--
 spec/serializers/post_serializer_spec.rb      | 22 ++---------
 test/javascripts/helpers/site-settings.js     |  6 +--
 test/javascripts/widgets/post-test.js         |  7 +---
 13 files changed, 55 insertions(+), 134 deletions(-)
 create mode 100644 db/migrate/20200429045956_remove_bookmarks_with_reminder_post_menu_item.rb

diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index b934c13543..a49cbaf2e2 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -652,7 +652,7 @@ export default Controller.extend(bufferedProperty("model"), {
       if (!this.currentUser) {
         return bootbox.alert(I18n.t("bookmarks.not_bookmarked"));
       } else if (post) {
-        return post.toggleBookmarkWithReminder();
+        return post.toggleBookmark();
       } else {
         return this.model.toggleBookmark().then(changedIds => {
           if (!changedIds) {
@@ -665,16 +665,6 @@ export default Controller.extend(bufferedProperty("model"), {
       }
     },
 
-    toggleBookmarkWithReminder(post) {
-      if (!this.currentUser) {
-        return bootbox.alert(I18n.t("bookmarks.not_bookmarked"));
-      } else if (post) {
-        return post.toggleBookmarkWithReminder();
-      } else {
-        return this.model.toggleBookmarkWithReminder();
-      }
-    },
-
     jumpToIndex(index) {
       this._jumpToIndex(index);
     },
diff --git a/app/assets/javascripts/discourse/app/lib/transform-post.js b/app/assets/javascripts/discourse/app/lib/transform-post.js
index 986dc46c3c..60823f04fb 100644
--- a/app/assets/javascripts/discourse/app/lib/transform-post.js
+++ b/app/assets/javascripts/discourse/app/lib/transform-post.js
@@ -35,7 +35,6 @@ export function transformBasicPost(post) {
     username: post.username,
     avatar_template: post.avatar_template,
     bookmarked: post.bookmarked,
-    bookmarkedWithReminder: post.bookmarked_with_reminder,
     bookmarkReminderAt: post.bookmark_reminder_at,
     bookmarkReminderType: post.bookmark_reminder_type,
     yours: post.yours,
diff --git a/app/assets/javascripts/discourse/app/models/post.js b/app/assets/javascripts/discourse/app/models/post.js
index 550a1fbfac..e7cf6028e5 100644
--- a/app/assets/javascripts/discourse/app/models/post.js
+++ b/app/assets/javascripts/discourse/app/models/post.js
@@ -310,32 +310,6 @@ const Post = RestModel.extend({
   },
 
   toggleBookmark() {
-    let bookmarkedTopic;
-
-    this.toggleProperty("bookmarked");
-
-    if (this.bookmarked && !this.get("topic.bookmarked")) {
-      this.set("topic.bookmarked", true);
-      bookmarkedTopic = true;
-    }
-
-    // need to wait to hear back from server (stuff may not be loaded)
-
-    return Post.updateBookmark(this.id, this.bookmarked)
-      .then(result => {
-        this.set("topic.bookmarked", result.topic_bookmarked);
-        this.appEvents.trigger("page:bookmark-post-toggled", this);
-      })
-      .catch(error => {
-        this.toggleProperty("bookmarked");
-        if (bookmarkedTopic) {
-          this.set("topic.bookmarked", false);
-        }
-        throw new Error(error);
-      });
-  },
-
-  toggleBookmarkWithReminder() {
     return new Promise(resolve => {
       let controller = showModal("bookmark", {
         model: {
@@ -357,7 +331,7 @@ const Post = RestModel.extend({
         afterSave: savedData => {
           this.setProperties({
             "topic.bookmarked": true,
-            bookmarked_with_reminder: true,
+            bookmarked: true,
             bookmark_reminder_at: savedData.reminderAt,
             bookmark_reminder_type: savedData.reminderType,
             bookmark_name: savedData.name,
@@ -373,7 +347,7 @@ const Post = RestModel.extend({
             bookmark_reminder_type: null,
             bookmark_name: null,
             bookmark_id: null,
-            bookmarked_with_reminder: false
+            bookmarked: false
           });
           this.appEvents.trigger("page:bookmark-post-toggled", this);
         }
diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js
index 46be3e7fee..00f8c8839f 100644
--- a/app/assets/javascripts/discourse/app/models/topic.js
+++ b/app/assets/javascripts/discourse/app/models/topic.js
@@ -400,7 +400,6 @@ const Topic = RestModel.extend({
   afterTopicBookmarked(firstPost) {
     if (firstPost) {
       firstPost.set("bookmarked", true);
-      firstPost.set("bookmarked_with_reminder", true);
       this.set("bookmark_reminder_at", firstPost.bookmark_reminder_at);
       return [firstPost.id];
     }
@@ -439,7 +438,7 @@ const Topic = RestModel.extend({
     return this.firstPost().then(firstPost => {
       const toggleBookmarkOnServer = () => {
         if (bookmark) {
-          return firstPost.toggleBookmarkWithReminder().then(() => {
+          return firstPost.toggleBookmark().then(() => {
             this.set("bookmarking", false);
             return this.afterTopicBookmarked(firstPost);
           });
@@ -449,7 +448,7 @@ const Topic = RestModel.extend({
               this.toggleProperty("bookmarked");
               this.set("bookmark_reminder_at", null);
               let clearedBookmarkProps = {
-                bookmarked_with_reminder: false,
+                bookmarked: false,
                 bookmark_id: null,
                 bookmark_name: null,
                 bookmark_reminder_at: null
@@ -458,10 +457,6 @@ const Topic = RestModel.extend({
                 const updated = [];
                 posts.forEach(post => {
                   if (post.bookmarked) {
-                    post.set("bookmarked", false);
-                    updated.push(post.id);
-                  }
-                  if (post.bookmarked_with_reminder) {
                     post.setProperties(clearedBookmarkProps);
                     updated.push(post.id);
                   }
@@ -477,11 +472,7 @@ const Topic = RestModel.extend({
 
       const unbookmarkedPosts = [];
       if (!bookmark && posts) {
-        posts.forEach(
-          post =>
-            (post.bookmarked || post.bookmarked_with_reminder) &&
-            unbookmarkedPosts.push(post)
-        );
+        posts.forEach(post => post.bookmarked && unbookmarkedPosts.push(post));
       }
 
       return new Promise(resolve => {
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index 6fadf0b9b4..488970c10e 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -225,7 +225,6 @@
                 recoverPost=(action "recoverPost")
                 expandHidden=(action "expandHidden")
                 toggleBookmark=(action "toggleBookmark")
-                toggleBookmarkWithReminder=(action "toggleBookmarkWithReminder")
                 togglePostType=(action "togglePostType")
                 rebakePost=(action "rebakePost")
                 changePostOwner=(action "changePostOwner")
diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
index 98046266bd..73a786e0e3 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@@ -287,31 +287,11 @@ registerButton("bookmark", attrs => {
     return;
   }
 
-  let className = "bookmark";
-
-  if (attrs.bookmarked) {
-    className += " bookmarked";
-  }
-
-  return {
-    id: attrs.bookmarked ? "unbookmark" : "bookmark",
-    action: "toggleBookmark",
-    title: attrs.bookmarked ? "bookmarks.created" : "bookmarks.not_bookmarked",
-    className,
-    icon: "bookmark"
-  };
-});
-
-registerButton("bookmarkWithReminder", attrs => {
-  if (!attrs.canBookmark) {
-    return;
-  }
-
   let classNames = ["bookmark", "with-reminder"];
   let title = "bookmarks.not_bookmarked";
   let titleOptions = {};
 
-  if (attrs.bookmarkedWithReminder) {
+  if (attrs.bookmarked) {
     classNames.push("bookmarked");
 
     if (attrs.bookmarkReminderAt) {
@@ -331,8 +311,8 @@ registerButton("bookmarkWithReminder", attrs => {
   }
 
   return {
-    id: attrs.bookmarkedWithReminder ? "unbookmark" : "bookmark",
-    action: "toggleBookmarkWithReminder",
+    id: attrs.bookmarked ? "unbookmark" : "bookmark",
+    action: "toggleBookmark",
     title,
     titleOptions,
     className: classNames.join(" "),
@@ -451,10 +431,7 @@ export default createWidget("post-menu", {
     const hiddenSetting = siteSettings.post_menu_hidden_items || "";
     const hiddenButtons = hiddenSetting
       .split("|")
-      .filter(s => !attrs.bookmarked || s !== "bookmark")
-      .filter(
-        s => !attrs.bookmarkedWithReminder || s !== "bookmarkWithReminder"
-      );
+      .filter(s => !attrs.bookmarked || s !== "bookmark");
 
     if (currentUser && keyValueStore) {
       const likedPostId = keyValueStore.getInt("likedPostId");
@@ -468,12 +445,7 @@ export default createWidget("post-menu", {
     let visibleButtons = [];
 
     // filter menu items based on site settings
-    const orderedButtons = this.menuItems().filter(button => {
-      if (button === "bookmark") {
-        return false;
-      }
-      return true;
-    });
+    const orderedButtons = this.menuItems();
 
     // If the post is a wiki, make Edit more prominent
     if (attrs.wiki && attrs.canEdit) {
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index 7bf90b98eb..ef39e37caa 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -49,7 +49,6 @@ class PostSerializer < BasicPostSerializer
              :user_title,
              :reply_to_user,
              :bookmarked,
-             :bookmarked_with_reminder,
              :bookmark_reminder_at,
              :bookmark_id,
              :bookmark_reminder_type,
@@ -316,32 +315,24 @@ class PostSerializer < BasicPostSerializer
     true
   end
 
-  def bookmarked_with_reminder
-    true
-  end
-
   def include_bookmarked?
-    (actions.present? && actions.keys.include?(PostActionType.types[:bookmark]))
-  end
-
-  def include_bookmarked_with_reminder?
     post_bookmark.present?
   end
 
   def include_bookmark_reminder_at?
-    include_bookmarked_with_reminder?
+    include_bookmarked?
   end
 
   def include_bookmark_reminder_type?
-    include_bookmarked_with_reminder?
+    include_bookmarked?
   end
 
   def include_bookmark_name?
-    include_bookmarked_with_reminder?
+    include_bookmarked?
   end
 
   def include_bookmark_id?
-    include_bookmarked_with_reminder?
+    include_bookmarked?
   end
 
   def post_bookmark
diff --git a/config/site_settings.yml b/config/site_settings.yml
index ed4a4f1b81..2a0733c75a 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -189,7 +189,7 @@ basic:
   post_menu:
     client: true
     type: list
-    default: "read|like|share|flag|edit|bookmark|bookmarkWithReminder|delete|admin|reply"
+    default: "read|like|share|flag|edit|bookmark|delete|admin|reply"
     allow_any: false
     choices:
       - read
@@ -201,11 +201,10 @@ basic:
       - bookmark
       - admin
       - reply
-      - bookmarkWithReminder
   post_menu_hidden_items:
     client: true
     type: list
-    default: "flag|bookmark|bookmarkWithReminder|edit|delete|admin"
+    default: "flag|bookmark|edit|delete|admin"
     allow_any: false
     choices:
       - like
@@ -216,7 +215,6 @@ basic:
       - bookmark
       - admin
       - reply
-      - bookmarkWithReminder
   share_links:
     client: true
     type: list
diff --git a/db/migrate/20200429045956_remove_bookmarks_with_reminder_post_menu_item.rb b/db/migrate/20200429045956_remove_bookmarks_with_reminder_post_menu_item.rb
new file mode 100644
index 0000000000..ebbc5cf343
--- /dev/null
+++ b/db/migrate/20200429045956_remove_bookmarks_with_reminder_post_menu_item.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class RemoveBookmarksWithReminderPostMenuItem < ActiveRecord::Migration[6.0]
+  def up
+    execute <<~SQL
+      UPDATE site_settings SET value = REPLACE(value, '|bookmarkWithReminder|', '|') WHERE name = 'post_menu';
+    SQL
+    execute <<~SQL
+      UPDATE site_settings SET value = REPLACE(value, 'bookmarkWithReminder|', '') WHERE name = 'post_menu';
+    SQL
+    execute <<~SQL
+      UPDATE site_settings SET value = REPLACE(value, '|bookmarkWithReminder', '') WHERE name = 'post_menu';
+    SQL
+    execute <<~SQL
+      UPDATE site_settings SET value = REPLACE(value, '|bookmarkWithReminder|', '|') WHERE name = 'post_menu_hidden';
+    SQL
+    execute <<~SQL
+      UPDATE site_settings SET value = REPLACE(value, 'bookmarkWithReminder|', '') WHERE name = 'post_menu_hidden';
+    SQL
+    execute <<~SQL
+      UPDATE site_settings SET value = REPLACE(value, '|bookmarkWithReminder', '') WHERE name = 'post_menu_hidden';
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6 b/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6
index 35a3e09fc1..cc4c3d1bc1 100644
--- a/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6
+++ b/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6
@@ -14,19 +14,19 @@ function initialize(api) {
   });
 
   api.modifyClass("model:post", {
-    toggleBookmarkWithReminder() {
+    toggleBookmark() {
       // if we are talking to discobot then any bookmarks should just
       // be created without reminder options, to streamline the new user
       // narrative.
       const discobotUserId = -2;
-      if (this.user_id === discobotUserId && !this.bookmarked_with_reminder) {
+      if (this.user_id === discobotUserId && !this.bookmarked) {
         return ajax("/bookmarks", {
           type: "POST",
           data: { post_id: this.id }
         }).then(response => {
           this.setProperties({
             "topic.bookmarked": true,
-            bookmarked_with_reminder: true,
+            bookmarked: true,
             bookmark_id: response.id
           });
           this.appEvents.trigger("post-stream:refresh", { id: this.id });
diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb
index 8791db56c6..91ca676ecd 100644
--- a/spec/serializers/post_serializer_spec.rb
+++ b/spec/serializers/post_serializer_spec.rb
@@ -235,28 +235,12 @@ describe PostSerializer do
       s
     end
 
-    context "when a user post action for the bookmark exists" do
-      before do
-        PostActionCreator.create(current_user, post, :bookmark)
-      end
-
-      it "returns true" do
-        expect(serialized.as_json[:bookmarked]).to eq(true)
-      end
-    end
-
-    context "when a user post action for the bookmark does not exist" do
-      it "does not return the bookmarked attribute" do
-        expect(serialized.as_json.key?(:bookmarked)).to eq(false)
-      end
-    end
-
     context "when a Bookmark record exists for the user on the post" do
       let!(:bookmark) { Fabricate(:bookmark_next_business_day_reminder, user: current_user, post: post) }
 
       context "bookmarks with reminders" do
         it "returns true" do
-          expect(serialized.as_json[:bookmarked_with_reminder]).to eq(true)
+          expect(serialized.as_json[:bookmarked]).to eq(true)
         end
 
         it "returns the reminder_at for the bookmark" do
@@ -266,8 +250,8 @@ describe PostSerializer do
         context "if topic_view is blank" do
           let(:topic_view) { nil }
 
-          it "does not return the bookmarked_with_reminder attribute" do
-            expect(serialized.as_json.key?(:bookmarked_with_reminder)).to eq(false)
+          it "does not return the bookmarked attribute" do
+            expect(serialized.as_json.key?(:bookmarked)).to eq(false)
           end
         end
       end
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index bf55374eb8..4d1181dbaf 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -13,10 +13,8 @@ Discourse.SiteSettingsOriginal = {
   ga_universal_tracking_code: "",
   ga_universal_domain_name: "auto",
   top_menu: "latest|new|unread|categories|top",
-  post_menu:
-    "like|share|flag|edit|bookmark|bookmarkWithReminder|delete|admin|reply",
-  post_menu_hidden_items:
-    "flag|bookmark|bookmarkWithReminder|edit|delete|admin",
+  post_menu: "like|share|flag|edit|bookmark|delete|admin|reply",
+  post_menu_hidden_items: "flag|bookmark|edit|delete|admin",
   share_links: "twitter|facebook|email",
   category_colors:
     "BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|27AA5B|B3B5B4|E45735",
diff --git a/test/javascripts/widgets/post-test.js b/test/javascripts/widgets/post-test.js
index b7131fc2a5..bc12234c31 100644
--- a/test/javascripts/widgets/post-test.js
+++ b/test/javascripts/widgets/post-test.js
@@ -532,15 +532,12 @@ widgetTest("can't bookmark", {
 
 widgetTest("bookmark", {
   template:
-    '{{mount-widget widget="post" args=args toggleBookmarkWithReminder=(action "toggleBookmarkWithReminder")}}',
+    '{{mount-widget widget="post" args=args toggleBookmark=(action "toggleBookmark")}}',
   beforeEach() {
     const args = { canBookmark: true };
 
     this.set("args", args);
-    this.on(
-      "toggleBookmarkWithReminder",
-      () => (args.bookmarked_with_reminder = true)
-    );
+    this.on("toggleBookmark", () => (args.bookmarked = true));
   },
   async test(assert) {
     assert.equal(find(".post-menu-area .bookmark").length, 1);

From 310a7edee59109c64d1e8bd6584a717e3b7ba817 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 30 Apr 2020 11:22:20 +1000
Subject: [PATCH 0874/1830] DEV: remove unused columns from posts and topics

avg_time on posts and topics have not been used in a year.

This uses a re-runnable ddl transaction diasabled migration to
drop the column, cause it touchs very high traffic table and may
deadlock
---
 app/models/post.rb                            |  4 +++-
 app/models/topic.rb                           |  4 +++-
 ...10528_remove_avg_time_from_topics_posts.rb | 20 +++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 db/post_migrate/20200430010528_remove_avg_time_from_topics_posts.rb

diff --git a/app/models/post.rb b/app/models/post.rb
index acc6c540f2..5da5d16320 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -10,6 +10,9 @@ class Post < ActiveRecord::Base
   include HasCustomFields
   include LimitedEdit
 
+  # remove line Jan 2021
+  self.ignored_columns = ["avg_time"]
+
   cattr_accessor :plugin_permitted_create_params
   self.plugin_permitted_create_params = {}
 
@@ -1107,7 +1110,6 @@ end
 #  like_count              :integer          default(0), not null
 #  incoming_link_count     :integer          default(0), not null
 #  bookmark_count          :integer          default(0), not null
-#  avg_time                :integer
 #  score                   :float
 #  reads                   :integer          default(0), not null
 #  post_type               :integer          default(1), not null
diff --git a/app/models/topic.rb b/app/models/topic.rb
index f1f17443ce..dbc6c44d15 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -10,6 +10,9 @@ class Topic < ActiveRecord::Base
   include LimitedEdit
   extend Forwardable
 
+  # remove line Jan 2021
+  self.ignored_columns = ["avg_time"]
+
   def_delegator :featured_users, :user_ids, :featured_user_ids
   def_delegator :featured_users, :choose, :feature_topic_users
 
@@ -1567,7 +1570,6 @@ end
 #  featured_user1_id         :integer
 #  featured_user2_id         :integer
 #  featured_user3_id         :integer
-#  avg_time                  :integer
 #  deleted_at                :datetime
 #  highest_post_number       :integer          default(0), not null
 #  image_url                 :string
diff --git a/db/post_migrate/20200430010528_remove_avg_time_from_topics_posts.rb b/db/post_migrate/20200430010528_remove_avg_time_from_topics_posts.rb
new file mode 100644
index 0000000000..848f9e569f
--- /dev/null
+++ b/db/post_migrate/20200430010528_remove_avg_time_from_topics_posts.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class RemoveAvgTimeFromTopicsPosts < ActiveRecord::Migration[6.0]
+  disable_ddl_transaction!
+
+  def up
+    # this makes it re-runnable and also works if it was not created initially
+    execute <<~SQL
+      ALTER TABLE topics DROP COLUMN IF EXISTS avg_time CASCADE
+    SQL
+
+    execute <<~SQL
+      ALTER TABLE posts DROP COLUMN IF EXISTS avg_time CASCADE
+    SQL
+  end
+
+  def down
+    # do nothing re-runnable
+  end
+end

From 367cbf5d2b0e942608e9ed641d289c9fabcd88a5 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 30 Apr 2020 02:39:24 +0100
Subject: [PATCH 0875/1830] FEATURE: Allow user creation with admin api when
 local logins disabled (#9587)

---
 app/controllers/users_controller.rb    |  2 +-
 spec/requests/users_controller_spec.rb | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 80583ad79b..2c0ca62876 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -477,7 +477,7 @@ class UsersController < ApplicationController
 
     authentication = UserAuthenticator.new(user, session)
 
-    if !authentication.has_authenticator? && !SiteSetting.enable_local_logins
+    if !authentication.has_authenticator? && !SiteSetting.enable_local_logins && !(current_user&.admin? && is_api?)
       return render body: nil, status: :forbidden
     end
 
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 9bb8992c70..5d09c1031f 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -654,6 +654,30 @@ describe UsersController do
           expect(User.find_by(username: @user.username).user_option.timezone).to eq("Australia/Brisbane")
         end
       end
+
+      context "with local logins disabled" do
+        before do
+          SiteSetting.enable_local_logins = false
+          SiteSetting.enable_google_oauth2_logins = true
+        end
+
+        it "blocks registration without authenticator information" do
+          post_user
+          expect(response.status).to eq(403)
+        end
+
+        it "blocks with a regular api key" do
+          api_key = Fabricate(:api_key, user: user)
+          post "/u.json", params: post_user_params, headers: { HTTP_API_KEY: api_key.key }
+          expect(response.status).to eq(403)
+        end
+
+        it "works with an admin api key" do
+          api_key = Fabricate(:api_key, user: Fabricate(:admin))
+          post "/u.json", params: post_user_params, headers: { HTTP_API_KEY: api_key.key }
+          expect(response.status).to eq(200)
+        end
+      end
     end
 
     context 'when creating a non active user (unconfirmed email)' do

From 3ac5df0546b80d930205bd40e6972c7a8377ca60 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 30 Apr 2020 10:50:26 +0800
Subject: [PATCH 0876/1830] UX: Add margin when displaying unlisted details in
 composer.

---
 app/assets/javascripts/discourse/app/templates/composer.hbs | 2 +-
 app/assets/stylesheets/common/base/compose.scss             | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/composer.hbs b/app/assets/javascripts/discourse/app/templates/composer.hbs
index 6f133154bd..c577fbc704 100644
--- a/app/assets/javascripts/discourse/app/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer.hbs
@@ -29,7 +29,7 @@
                     <span class="whisper">{{d-icon "far-eye-slash"}}</span>
                   {{/if}}
                   {{#if model.unlistTopic}}
-                    <span class="whisper">({{i18n "composer.unlist"}})</span>
+                    <span class="unlist">({{i18n "composer.unlist"}})</span>
                   {{/if}}
                   {{#if model.noBump}}
                     <span class="no-bump">{{d-icon "anchor"}}</span>
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index d67224cc61..4d02ef28c6 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -169,6 +169,10 @@
     margin-right: 0.25em;
   }
 
+  .unlist {
+    margin-left: 0.25em;
+  }
+
   .display-edit-reason {
     display: inline-flex;
     a {

From 53e0d8fbab7d9b20235766a3ab862a8714927d93 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 30 Apr 2020 12:53:50 +1000
Subject: [PATCH 0877/1830] DEV: correct drop logic for columns in post table

We need to recreate the badge_posts view each time we change
column on the posts table.

The p.* is auto expanded on view create, cascade should not have
been used
---
 ...10528_remove_avg_time_from_topics_posts.rb | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/db/post_migrate/20200430010528_remove_avg_time_from_topics_posts.rb b/db/post_migrate/20200430010528_remove_avg_time_from_topics_posts.rb
index 848f9e569f..6c150b2704 100644
--- a/db/post_migrate/20200430010528_remove_avg_time_from_topics_posts.rb
+++ b/db/post_migrate/20200430010528_remove_avg_time_from_topics_posts.rb
@@ -6,12 +6,33 @@ class RemoveAvgTimeFromTopicsPosts < ActiveRecord::Migration[6.0]
   def up
     # this makes it re-runnable and also works if it was not created initially
     execute <<~SQL
-      ALTER TABLE topics DROP COLUMN IF EXISTS avg_time CASCADE
+      ALTER TABLE topics DROP COLUMN IF EXISTS avg_time
     SQL
 
-    execute <<~SQL
-      ALTER TABLE posts DROP COLUMN IF EXISTS avg_time CASCADE
-    SQL
+    ActiveRecord::Base.transaction do
+      execute "DROP VIEW badge_posts"
+
+      execute <<~SQL
+        ALTER TABLE posts DROP COLUMN IF EXISTS avg_time
+      SQL
+
+      # we must recreate this view every time we amend posts
+      # p.* is auto expanded and persisted into the view definition
+      # at create time
+      execute <<~SQL
+        CREATE VIEW badge_posts AS
+        SELECT p.*
+        FROM posts p
+        JOIN topics t ON t.id = p.topic_id
+        JOIN categories c ON c.id = t.category_id
+        WHERE c.allow_badges AND
+              p.deleted_at IS NULL AND
+              t.deleted_at IS NULL AND
+              NOT c.read_restricted AND
+              t.visible AND
+              p.post_type IN (1,2,3)
+      SQL
+    end
   end
 
   def down

From d6df92b0741d371c0db4b127cda26d6addf7dc28 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 30 Apr 2020 14:27:24 +1000
Subject: [PATCH 0878/1830] DEV: correct bad test

Test was unlisting a topic and then checking for the unlist info
in the whisper field
---
 test/javascripts/acceptance/composer-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/acceptance/composer-test.js b/test/javascripts/acceptance/composer-test.js
index 48237ff552..9520bd9d5c 100644
--- a/test/javascripts/acceptance/composer-test.js
+++ b/test/javascripts/acceptance/composer-test.js
@@ -524,7 +524,7 @@ QUnit.test(
     );
 
     assert.ok(
-      find(".composer-fields .whisper")
+      find(".composer-fields .unlist")
         .text()
         .indexOf(I18n.t("composer.unlist")) > 0,
       "it sets the topic to unlisted"

From 10f9f295dc5f66d1f1b01cc45ba32be4f8d3ee1d Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 30 Apr 2020 14:58:26 +1000
Subject: [PATCH 0879/1830] DEV: Add acceptance tests for bookmarks with
 reminders (#9592)

---
 .../discourse/app/components/tap-tile.js      |   4 +
 .../app/templates/modal/bookmark.hbs          |   7 +-
 test/javascripts/acceptance/bookmarks-test.js | 161 ++++++++++++++++++
 test/javascripts/acceptance/topic-test.js     |  17 +-
 test/javascripts/helpers/qunit-helpers.js     |   5 +
 5 files changed, 177 insertions(+), 17 deletions(-)
 create mode 100644 test/javascripts/acceptance/bookmarks-test.js

diff --git a/app/assets/javascripts/discourse/app/components/tap-tile.js b/app/assets/javascripts/discourse/app/components/tap-tile.js
index 3a5203573d..370415d826 100644
--- a/app/assets/javascripts/discourse/app/components/tap-tile.js
+++ b/app/assets/javascripts/discourse/app/components/tap-tile.js
@@ -2,6 +2,10 @@ import Component from "@ember/component";
 import { propertyEqual } from "discourse/lib/computed";
 
 export default Component.extend({
+  init() {
+    this._super(...arguments);
+    this.set("elementId", `tap_tile_${this.tileId}`);
+  },
   classNames: ["tap-tile"],
   classNameBindings: ["active"],
   click() {
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
index 3a5075ebc9..d9e51fbbef 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
@@ -71,11 +71,12 @@
                 {{date-picker-future
                   value=customReminderDate
                   onSelect=(action (mut customReminderDate))
+                  id="bookmark-custom-date"
                 }}
               </div>
               <div class="tap-tile-time-input">
                 {{d-icon "far-clock"}}
-                {{input placeholder="--:--" type="time" class="time-input" value=customReminderTime}}
+                {{input placeholder="--:--" id="bookmark-custom-time" type="time" class="time-input" value=customReminderTime}}
               </div>
             </div>
           {{/if}}
@@ -98,11 +99,11 @@
     </div>
 
     <div class="control-group">
-      {{d-button label="bookmarks.save" class="btn-primary" action=(action "saveAndClose")}}
+      {{d-button id="save-bookmark" label="bookmarks.save" class="btn-primary" action=(action "saveAndClose")}}
       {{d-modal-cancel close=(action "closeWithoutSavingBookmark")}}
       {{#if showDelete}}
         <div class="pull-right">
-          {{d-button icon="trash" class="btn-danger" action=(action "delete")}}
+          {{d-button id="delete-bookmark" icon="trash" class="btn-danger" action=(action "delete")}}
         </div>
       {{/if}}
     </div>
diff --git a/test/javascripts/acceptance/bookmarks-test.js b/test/javascripts/acceptance/bookmarks-test.js
new file mode 100644
index 0000000000..2c2008f3e2
--- /dev/null
+++ b/test/javascripts/acceptance/bookmarks-test.js
@@ -0,0 +1,161 @@
+import { acceptance, loggedInUser } from "helpers/qunit-helpers";
+import pretender from "helpers/create-pretender";
+
+acceptance("Bookmarking", {
+  loggedIn: true,
+
+  beforeEach() {}
+});
+
+function mockSuccessfulBookmarkPost() {
+  pretender.post("/bookmarks", () => [
+    200,
+    {
+      "Content-Type": "application/json"
+    },
+    {
+      id: 999,
+      success: "OK"
+    }
+  ]);
+}
+
+async function openBookmarkModal() {
+  await click(".topic-post:first-child button.show-more-actions");
+  return await click(".topic-post:first-child button.bookmark");
+}
+async function openEditBookmarkModal() {
+  return await click(".topic-post:first-child button.bookmarked");
+}
+
+test("Bookmarks modal opening", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await openBookmarkModal();
+  assert.ok(exists("#bookmark-reminder-modal"), "it shows the bookmark modal");
+});
+
+test("Bookmarks modal selecting reminder type", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await openBookmarkModal();
+  await click("#tap_tile_tomorrow");
+  assert.ok(exists("#tap_tile_tomorrow.active"), "it selects tomorrow");
+  await click("#tap_tile_start_of_next_business_week");
+  assert.ok(
+    exists("#tap_tile_start_of_next_business_week.active"),
+    "it selects next monday"
+  );
+  await click("#tap_tile_next_week");
+  assert.ok(exists("#tap_tile_next_week.active"), "it selects next week");
+  await click("#tap_tile_next_month");
+  assert.ok(exists("#tap_tile_next_month.active"), "it selects next month");
+  await click("#tap_tile_custom");
+  assert.ok(exists("#tap_tile_custom.active"), "it selects custom");
+  assert.ok(exists(".tap-tile-date-input"), "it shows the custom date input");
+  assert.ok(exists(".tap-tile-time-input"), "it shows the custom time input");
+});
+
+test("Saving a bookmark with a reminder", async assert => {
+  mockSuccessfulBookmarkPost();
+  await visit("/t/internationalization-localization/280");
+  await openBookmarkModal();
+  await fillIn("input#bookmark-name", "Check this out later");
+  await click("#tap_tile_tomorrow");
+  await click("#save-bookmark");
+  assert.ok(
+    exists(".topic-post:first-child button.bookmark.bookmarked"),
+    "it shows the bookmarked icon on the post"
+  );
+  assert.ok(
+    exists(
+      ".topic-post:first-child button.bookmark.bookmarked > .d-icon-discourse-bookmark-clock"
+    ),
+    "it shows the bookmark clock icon because of the reminder"
+  );
+});
+
+test("Saving a bookmark with no reminder or name", async assert => {
+  mockSuccessfulBookmarkPost();
+  await visit("/t/internationalization-localization/280");
+  await openBookmarkModal();
+  await click("#save-bookmark");
+  assert.ok(
+    exists(".topic-post:first-child button.bookmark.bookmarked"),
+    "it shows the bookmarked icon on the post"
+  );
+  assert.not(
+    exists(
+      ".topic-post:first-child button.bookmark.bookmarked > .d-icon-discourse-bookmark-clock"
+    ),
+    "it shows the regular bookmark active icon"
+  );
+});
+
+test("Deleting a bookmark with a reminder", async assert => {
+  pretender.delete("/bookmarks/999", () => [
+    200,
+    {
+      "Content-Type": "application/json"
+    },
+    {
+      success: "OK",
+      topic_bookmarked: false
+    }
+  ]);
+  mockSuccessfulBookmarkPost();
+  await visit("/t/internationalization-localization/280");
+  await openBookmarkModal();
+  await click("#tap_tile_tomorrow");
+  await click("#save-bookmark");
+  await openEditBookmarkModal();
+  assert.ok(exists("#bookmark-reminder-modal"), "it shows the bookmark modal");
+  await click("#delete-bookmark");
+  assert.ok(exists(".bootbox.modal"), "it asks for delete confirmation");
+  assert.ok(
+    find(".bootbox.modal")
+      .text()
+      .includes(I18n.t("bookmarks.confirm_delete")),
+    "it shows delete confirmation message"
+  );
+  await click(".bootbox.modal .btn-primary");
+  assert.not(
+    exists(".topic-post:first-child button.bookmark.bookmarked"),
+    "it no longer shows the bookmarked icon on the post after bookmark is deleted"
+  );
+});
+
+test("Cancelling saving a bookmark", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await openBookmarkModal();
+  await click(".d-modal-cancel");
+  assert.not(
+    exists(".topic-post:first-child button.bookmark.bookmarked"),
+    "it does not show the bookmarked icon on the post because it is not saved"
+  );
+});
+
+test("Editing a bookmark", async assert => {
+  mockSuccessfulBookmarkPost();
+  await visit("/t/internationalization-localization/280");
+  let now = moment.tz(loggedInUser().resolvedTimezone());
+  let tomorrow = now.add(1, "day").format("YYYY-MM-DD");
+  await openBookmarkModal();
+  await fillIn("input#bookmark-name", "Test name");
+  await click("#tap_tile_tomorrow");
+  await click("#save-bookmark");
+  await openEditBookmarkModal();
+  assert.equal(
+    find("#bookmark-name").val(),
+    "Test name",
+    "it should prefill the bookmark name"
+  );
+  assert.equal(
+    find("#bookmark-custom-date > input").val(),
+    tomorrow,
+    "it should prefill the bookmark date"
+  );
+  assert.equal(
+    find("#bookmark-custom-time").val(),
+    "08:00",
+    "it should prefill the bookmark time"
+  );
+});
diff --git a/test/javascripts/acceptance/topic-test.js b/test/javascripts/acceptance/topic-test.js
index 94f3165dc9..ab271369c3 100644
--- a/test/javascripts/acceptance/topic-test.js
+++ b/test/javascripts/acceptance/topic-test.js
@@ -248,9 +248,9 @@ QUnit.test("remove featured link", async assert => {
     "link to remove featured link"
   );
 
-  await click('.title-wrapper .remove-featured-link');
-  await click('.title-wrapper .submit-edit');
-  assert.ok(!exists('.title-wrapper .topic-featured-link'), 'link is gone');
+  await click(".title-wrapper .remove-featured-link");
+  await click(".title-wrapper .submit-edit");
+  assert.ok(!exists(".title-wrapper .topic-featured-link"), "link is gone");
 });
 
 QUnit.test("Converting to a public topic", async assert => {
@@ -395,17 +395,6 @@ QUnit.test(
   }
 );
 
-acceptance("Topic + Post Bookmarks with Reminders", {
-  loggedIn: true
-});
-
-QUnit.test("Bookmarks Modal", async assert => {
-  await visit("/t/internationalization-localization/280");
-  await click(".topic-post:first-child button.show-more-actions");
-  await click(".topic-post:first-child button.bookmark");
-  assert.ok(exists("#bookmark-reminder-modal"), "it shows the bookmark modal");
-});
-
 acceptance("Topic with title decorated", {
   loggedIn: true,
   beforeEach() {
diff --git a/test/javascripts/helpers/qunit-helpers.js b/test/javascripts/helpers/qunit-helpers.js
index e0621c294d..0bc9eaece8 100644
--- a/test/javascripts/helpers/qunit-helpers.js
+++ b/test/javascripts/helpers/qunit-helpers.js
@@ -36,6 +36,11 @@ export function logIn() {
   User.resetCurrent(currentUser());
 }
 
+// Note: Only use if `loggedIn: true` has been used in an acceptance test
+export function loggedInUser() {
+  return User.current();
+}
+
 const Plugin = $.fn.modal;
 const Modal = Plugin.Constructor;
 

From 02ef88052d6136ad4d8a003e1e4d5edb50ac15c0 Mon Sep 17 00:00:00 2001
From: Andrew Schleifer <me@andrewschleifer.name>
Date: Thu, 30 Apr 2020 14:15:08 +0800
Subject: [PATCH 0880/1830] DEV: take out more trash (icons)

folloup to f75581090615db661b65bc630284d9dbb66b3f49
---
 .../javascripts/discourse/app/templates/modal/bookmark.hbs      | 2 +-
 .../javascripts/discourse/app/templates/modal/publish-page.hbs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
index d9e51fbbef..821ffe1976 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
@@ -103,7 +103,7 @@
       {{d-modal-cancel close=(action "closeWithoutSavingBookmark")}}
       {{#if showDelete}}
         <div class="pull-right">
-          {{d-button id="delete-bookmark" icon="trash" class="btn-danger" action=(action "delete")}}
+          {{d-button id="delete-bookmark" icon="trash-alt" class="btn-danger" action=(action "delete")}}
         </div>
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs b/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs
index 07c3640ddd..712682fe74 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs
@@ -44,7 +44,7 @@
 
     {{d-button
       label="topic.publish_page.unpublish"
-      icon="trash"
+      icon="trash-alt"
       class="btn-danger"
       isLoading=unpublishing
       action=(action "unpublish") }}

From d0d5a138c3b6d7755056336508b69a524975b364 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 30 Apr 2020 16:48:34 +1000
Subject: [PATCH 0881/1830] DEV: stop freezing frozen strings

We have the `# frozen_string_literal: true` comment on all our
files. This means all string literals are frozen. There is no need
to call #freeze on any literals.

For files with `# frozen_string_literal: true`

```
puts %w{a b}[0].frozen?
=> true

puts "hi".frozen?
=> true

puts "a #{1} b".frozen?
=> true

puts ("a " + "b").frozen?
=> false

puts (-("a " + "b")).frozen?
=> true
```

For more details see: https://samsaffron.com/archive/2018/02/16/reducing-string-duplication-in-ruby
---
 app/controllers/categories_controller.rb         | 14 +++++++-------
 app/controllers/webhooks_controller.rb           | 16 ++++++++--------
 app/helpers/application_helper.rb                |  4 ++--
 app/jobs/regular/bulk_user_title_update.rb       |  4 ++--
 app/jobs/regular/emit_web_hook_event.rb          |  4 ++--
 .../scheduled/bookmark_reminder_notifications.rb |  2 +-
 .../scheduled/pending_queued_posts_reminder.rb   |  2 +-
 .../scheduled/pending_reviewables_reminder.rb    |  2 +-
 app/jobs/scheduled/pending_users_reminder.rb     |  2 +-
 app/jobs/scheduled/poll_mailbox.rb               |  4 ++--
 app/models/category_featured_topic.rb            |  2 +-
 app/models/category_list.rb                      |  2 +-
 app/models/concerns/category_hashtag.rb          |  2 +-
 app/models/emoji.rb                              |  6 +++---
 app/models/topic.rb                              |  2 +-
 app/models/topic_link.rb                         |  2 +-
 app/models/topic_tracking_state.rb               |  6 +++---
 app/models/upload.rb                             |  2 +-
 app/models/user.rb                               |  4 ++--
 .../incoming_email_details_serializer.rb         |  2 +-
 app/services/badge_granter.rb                    |  2 +-
 config/initializers/100-silence_logger.rb        | 12 ++++++------
 .../postgresql_fallback_adapter.rb               |  2 +-
 lib/badge_posts_view_manager.rb                  |  2 +-
 lib/base62.rb                                    |  2 +-
 lib/bookmark_reminder_notification_handler.rb    |  2 +-
 lib/discourse.rb                                 |  4 ++--
 lib/discourse_redis.rb                           |  8 ++++----
 lib/email/message_builder.rb                     |  2 +-
 lib/email/styles.rb                              |  4 ++--
 lib/file_store/base_store.rb                     |  4 ++--
 lib/html_prettify.rb                             |  6 +++---
 lib/migration/base_dropper.rb                    |  2 +-
 lib/plain_text_to_markdown.rb                    |  2 +-
 lib/post_creator.rb                              |  2 +-
 lib/pretty_text.rb                               |  2 +-
 lib/quote_comparer.rb                            |  2 +-
 lib/s3_helper.rb                                 |  4 ++--
 lib/site_setting_extension.rb                    |  2 +-
 lib/topic_query.rb                               |  2 +-
 lib/twitter_api.rb                               |  2 +-
 lib/validators/censored_words_validator.rb       |  2 +-
 lib/validators/regex_setting_validator.rb        |  2 +-
 lib/webauthn.rb                                  |  4 ++--
 script/bulk_import/base.rb                       |  6 +++---
 script/bulk_import/discourse_merger.rb           |  2 +-
 script/bulk_import/vanilla.rb                    |  8 ++++----
 script/bulk_import/vbulletin.rb                  |  2 +-
 script/import_scripts/mbox/support/indexer.rb    |  2 +-
 spec/components/discourse_tagging_spec.rb        |  2 +-
 spec/support/webauthn_integration_helpers.rb     | 12 ++++++------
 51 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 8481531b64..acb39e7cab 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -24,7 +24,7 @@ class CategoriesController < ApplicationController
     parent_category = Category.find_by_slug(params[:parent_category_id]) || Category.find_by(id: params[:parent_category_id].to_i)
 
     category_options = {
-      is_homepage: current_homepage == "categories".freeze,
+      is_homepage: current_homepage == "categories",
       parent_category_id: params[:parent_category_id],
       include_topics: include_topics(parent_category)
     }
@@ -53,10 +53,10 @@ class CategoriesController < ApplicationController
           no_definitions: true
         }
 
-        if style == "categories_and_latest_topics".freeze
+        if style == "categories_and_latest_topics"
           @topic_list = TopicQuery.new(current_user, topic_options).list_latest
           @topic_list.more_topics_url = url_for(public_send("latest_path"))
-        elsif style == "categories_and_top_topics".freeze
+        elsif style == "categories_and_top_topics"
           @topic_list = TopicQuery.new(nil, topic_options).list_top_for(SiteSetting.top_page_default_timeframe.to_sym)
           @topic_list.more_topics_url = url_for(public_send("top_path"))
         end
@@ -245,7 +245,7 @@ class CategoriesController < ApplicationController
     discourse_expires_in 1.minute
 
     category_options = {
-      is_homepage: current_homepage == "categories".freeze,
+      is_homepage: current_homepage == "categories",
       parent_category_id: params[:parent_category_id],
       include_topics: false
     }
@@ -354,8 +354,8 @@ class CategoriesController < ApplicationController
     view_context.mobile_view? ||
       params[:include_topics] ||
       (parent_category && parent_category.subcategory_list_includes_topics?) ||
-      style == "categories_with_featured_topics".freeze ||
-      style == "categories_boxes_with_topics".freeze ||
-      style == "categories_with_top_topics".freeze
+      style == "categories_with_featured_topics" ||
+      style == "categories_boxes_with_topics" ||
+      style == "categories_with_top_topics"
   end
 end
diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb
index 320abe17fe..347ff52312 100644
--- a/app/controllers/webhooks_controller.rb
+++ b/app/controllers/webhooks_controller.rb
@@ -15,13 +15,13 @@ class WebhooksController < ActionController::Base
     events.each do |event|
       message_id = (event["smtp-id"] || "").tr("<>", "")
       to_address = event["email"]
-      if event["event"] == "bounce".freeze
+      if event["event"] == "bounce"
         if event["status"]["4."]
           process_bounce(message_id, to_address, SiteSetting.soft_bounce_score)
         else
           process_bounce(message_id, to_address, SiteSetting.hard_bounce_score)
         end
-      elsif event["event"] == "dropped".freeze
+      elsif event["event"] == "dropped"
         process_bounce(message_id, to_address, SiteSetting.hard_bounce_score)
       end
     end
@@ -34,7 +34,7 @@ class WebhooksController < ActionController::Base
     events.each do |event|
       message_id = event["CustomID"]
       to_address = event["email"]
-      if event["event"] == "bounce".freeze
+      if event["event"] == "bounce"
         if event["hard_bounce"]
           process_bounce(message_id, to_address, SiteSetting.hard_bounce_score)
         else
@@ -156,9 +156,9 @@ class WebhooksController < ActionController::Base
     # only handle soft bounces, because hard bounces are also handled
     # by the "dropped" event and we don't want to increase bounce score twice
     # for the same message
-    if event == "bounced".freeze && params["error"]["4."]
+    if event == "bounced" && params["error"]["4."]
       process_bounce(message_id, to_address, SiteSetting.soft_bounce_score)
-    elsif event == "dropped".freeze
+    elsif event == "dropped"
       process_bounce(message_id, to_address, SiteSetting.hard_bounce_score)
     end
 
@@ -174,10 +174,10 @@ class WebhooksController < ActionController::Base
     to_address = data["recipient"]
     severity = data["severity"]
 
-    if data["event"] == "failed".freeze
-      if severity == "temporary".freeze
+    if data["event"] == "failed"
+      if severity == "temporary"
         process_bounce(message_id, to_address, SiteSetting.soft_bounce_score)
-      elsif severity == "permanent".freeze
+      elsif severity == "permanent"
         process_bounce(message_id, to_address, SiteSetting.hard_bounce_score)
       end
     end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 00422273bb..482b2477d3 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -36,7 +36,7 @@ module ApplicationHelper
   end
 
   def shared_session_key
-    if SiteSetting.long_polling_base_url != '/'.freeze && current_user
+    if SiteSetting.long_polling_base_url != '/' && current_user
       sk = "shared_session_key"
       return request.env[sk] if request.env[sk]
 
@@ -282,7 +282,7 @@ module ApplicationHelper
         'query-input' => 'required name=search_term_string',
       }
     }
-    content_tag(:script, MultiJson.dump(json).html_safe, type: 'application/ld+json'.freeze)
+    content_tag(:script, MultiJson.dump(json).html_safe, type: 'application/ld+json')
   end
 
   def gsub_emoji_to_unicode(str)
diff --git a/app/jobs/regular/bulk_user_title_update.rb b/app/jobs/regular/bulk_user_title_update.rb
index 97d3f68ad5..e98c024a2f 100644
--- a/app/jobs/regular/bulk_user_title_update.rb
+++ b/app/jobs/regular/bulk_user_title_update.rb
@@ -2,8 +2,8 @@
 
 module Jobs
   class BulkUserTitleUpdate < ::Jobs::Base
-    UPDATE_ACTION = 'update'.freeze
-    RESET_ACTION = 'reset'.freeze
+    UPDATE_ACTION = 'update'
+    RESET_ACTION = 'reset'
 
     def execute(args)
       new_title = args[:new_title]
diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb
index 3c7fc3414c..94371eaa33 100644
--- a/app/jobs/regular/emit_web_hook_event.rb
+++ b/app/jobs/regular/emit_web_hook_event.rb
@@ -4,8 +4,8 @@ require 'excon'
 
 module Jobs
   class EmitWebHookEvent < ::Jobs::Base
-    PING_EVENT = 'ping'.freeze
-    MAX_RETRY_COUNT = 4.freeze
+    PING_EVENT = 'ping'
+    MAX_RETRY_COUNT = 4
     RETRY_BACKOFF = 5
 
     def execute(args)
diff --git a/app/jobs/scheduled/bookmark_reminder_notifications.rb b/app/jobs/scheduled/bookmark_reminder_notifications.rb
index 991e0d23c1..4dca47c1f6 100644
--- a/app/jobs/scheduled/bookmark_reminder_notifications.rb
+++ b/app/jobs/scheduled/bookmark_reminder_notifications.rb
@@ -6,7 +6,7 @@ module Jobs
   # Any leftovers will be caught in the next run, because the reminder_at column
   # is set to NULL once a reminder has been sent.
   class BookmarkReminderNotifications < ::Jobs::Scheduled
-    JOB_RUN_NUMBER_KEY ||= 'jobs_bookmark_reminder_notifications_job_run_num'.freeze
+    JOB_RUN_NUMBER_KEY ||= 'jobs_bookmark_reminder_notifications_job_run_num'
     AT_DESKTOP_CONSISTENCY_RUN_NUMBER ||= 6
 
     every 5.minutes
diff --git a/app/jobs/scheduled/pending_queued_posts_reminder.rb b/app/jobs/scheduled/pending_queued_posts_reminder.rb
index 29bc670957..c3a283bd53 100644
--- a/app/jobs/scheduled/pending_queued_posts_reminder.rb
+++ b/app/jobs/scheduled/pending_queued_posts_reminder.rb
@@ -41,7 +41,7 @@ module Jobs
     end
 
     def self.last_notified_key
-      "last_notified_queued_post_id".freeze
+      "last_notified_queued_post_id"
     end
   end
 end
diff --git a/app/jobs/scheduled/pending_reviewables_reminder.rb b/app/jobs/scheduled/pending_reviewables_reminder.rb
index df7a6a8aa3..3cc4b124a0 100644
--- a/app/jobs/scheduled/pending_reviewables_reminder.rb
+++ b/app/jobs/scheduled/pending_reviewables_reminder.rb
@@ -45,7 +45,7 @@ module Jobs
     end
 
     def self.last_notified_key
-      "last_notified_reviewable_id".freeze
+      "last_notified_reviewable_id"
     end
 
     def self.clear_key
diff --git a/app/jobs/scheduled/pending_users_reminder.rb b/app/jobs/scheduled/pending_users_reminder.rb
index 0c1be62ad8..33d212f3b2 100644
--- a/app/jobs/scheduled/pending_users_reminder.rb
+++ b/app/jobs/scheduled/pending_users_reminder.rb
@@ -58,7 +58,7 @@ module Jobs
     end
 
     def previous_newest_username_cache_key
-      "pending-users-reminder:newest-username".freeze
+      "pending-users-reminder:newest-username"
     end
 
   end
diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb
index 178cbdb9bd..8592ed3fe6 100644
--- a/app/jobs/scheduled/poll_mailbox.rb
+++ b/app/jobs/scheduled/poll_mailbox.rb
@@ -23,7 +23,7 @@ module Jobs
       Email::Processor.process!(popmail.pop)
     end
 
-    POLL_MAILBOX_TIMEOUT_ERROR_KEY ||= "poll_mailbox_timeout_error_key".freeze
+    POLL_MAILBOX_TIMEOUT_ERROR_KEY ||= "poll_mailbox_timeout_error_key"
 
     def poll_pop3
       pop3 = Net::POP3.new(SiteSetting.pop3_polling_host, SiteSetting.pop3_polling_port)
@@ -62,7 +62,7 @@ module Jobs
       Discourse.handle_job_exception(e, error_context(@args, "Signing in to poll incoming emails."))
     end
 
-    POLL_MAILBOX_ERRORS_KEY ||= "poll_mailbox_errors".freeze
+    POLL_MAILBOX_ERRORS_KEY ||= "poll_mailbox_errors"
 
     def self.errors_in_past_24_hours
       Discourse.redis.zremrangebyscore(POLL_MAILBOX_ERRORS_KEY, 0, 24.hours.ago.to_i)
diff --git a/app/models/category_featured_topic.rb b/app/models/category_featured_topic.rb
index 2848383605..cfad73d7d8 100644
--- a/app/models/category_featured_topic.rb
+++ b/app/models/category_featured_topic.rb
@@ -4,7 +4,7 @@ class CategoryFeaturedTopic < ActiveRecord::Base
   belongs_to :category
   belongs_to :topic
 
-  NEXT_CATEGORY_ID_KEY = 'category-featured-topic:next-category-id'.freeze
+  NEXT_CATEGORY_ID_KEY = 'category-featured-topic:next-category-id'
   DEFAULT_BATCH_SIZE = 100
 
   # Populates the category featured topics.
diff --git a/app/models/category_list.rb b/app/models/category_list.rb
index 35dcaa7d3a..5c81c1afbc 100644
--- a/app/models/category_list.rb
+++ b/app/models/category_list.rb
@@ -40,7 +40,7 @@ class CategoryList
   end
 
   def preload_key
-    "categories_list".freeze
+    "categories_list"
   end
 
   def self.order_categories(categories)
diff --git a/app/models/concerns/category_hashtag.rb b/app/models/concerns/category_hashtag.rb
index 95b1521c25..c6745b0116 100644
--- a/app/models/concerns/category_hashtag.rb
+++ b/app/models/concerns/category_hashtag.rb
@@ -3,7 +3,7 @@
 module CategoryHashtag
   extend ActiveSupport::Concern
 
-  SEPARATOR = ":".freeze
+  SEPARATOR = ":"
 
   class_methods do
     def query_from_hashtag_slug(category_slug)
diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index e57fc3b81a..cfd121b76e 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -140,9 +140,9 @@ class Emoji
 
   def self.replacement_code(code)
     code
-      .split('-'.freeze)
+      .split('-')
       .map!(&:hex)
-      .pack("U*".freeze)
+      .pack("U*")
   end
 
   def self.unicode_replacements
@@ -166,7 +166,7 @@ class Emoji
         replacements[code] = name
         if is_tonable_emojis.include?(name)
           fitzpatrick_scales.each_with_index do |scale, index|
-            toned_code = code.codepoints.insert(1, scale).pack("U*".freeze)
+            toned_code = code.codepoints.insert(1, scale).pack("U*")
             replacements[toned_code] = "#{name}:t#{index + 2}"
           end
         end
diff --git a/app/models/topic.rb b/app/models/topic.rb
index dbc6c44d15..aaeca3f145 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -228,7 +228,7 @@ class Topic < ActiveRecord::Base
   end
 
   after_save do
-    banner = "banner".freeze
+    banner = "banner"
 
     if archetype_before_last_save == banner || archetype == banner
       ApplicationController.banner_json_cache.clear
diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index 2fc9fd0b84..f913dc6459 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -119,7 +119,7 @@ class TopicLink < ActiveRecord::Base
         uri = UrlHelper.relaxed_parse(u.url)
         [u, uri]
       end
-      .reject { |_, p| p.nil? || "mailto".freeze == p.scheme }
+      .reject { |_, p| p.nil? || "mailto" == p.scheme }
       .uniq { |_, p| p }
       .each do |link, parsed|
 
diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index 91838da99b..df6516c382 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -10,9 +10,9 @@ class TopicTrackingState
   include ActiveModel::SerializerSupport
 
   CHANNEL = "/user-tracking"
-  UNREAD_MESSAGE_TYPE = "unread".freeze
-  LATEST_MESSAGE_TYPE = "latest".freeze
-  MUTED_MESSAGE_TYPE = "muted".freeze
+  UNREAD_MESSAGE_TYPE = "unread"
+  LATEST_MESSAGE_TYPE = "latest"
+  MUTED_MESSAGE_TYPE = "muted"
 
   attr_accessor :user_id,
                 :topic_id,
diff --git a/app/models/upload.rb b/app/models/upload.rb
index 4cd7b926ce..cb4cf458af 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -9,7 +9,7 @@ class Upload < ActiveRecord::Base
   SHA1_LENGTH = 40
   SEEDED_ID_THRESHOLD = 0
   URL_REGEX ||= /(\/original\/\dX[\/\.\w]*\/([a-zA-Z0-9]+)[\.\w]*)/
-  SECURE_MEDIA_ROUTE = "secure-media-uploads".freeze
+  SECURE_MEDIA_ROUTE = "secure-media-uploads"
 
   belongs_to :user
   belongs_to :access_control_post, class_name: 'Post'
diff --git a/app/models/user.rb b/app/models/user.rb
index 562291438f..0beec5739a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -352,7 +352,7 @@ class User < ActiveRecord::Base
   end
 
   EMAIL = %r{([^@]+)@([^\.]+)}
-  FROM_STAGED = "from_staged".freeze
+  FROM_STAGED = "from_staged"
 
   def self.new_from_params(params)
     user = User.new
@@ -598,7 +598,7 @@ class User < ActiveRecord::Base
     notification = notifications.visible.order('notifications.created_at desc').first
     json = NotificationSerializer.new(notification).as_json if notification
 
-    sql = (<<~SQL).freeze
+    sql = (<<~SQL)
        SELECT * FROM (
          SELECT n.id, n.read FROM notifications n
          LEFT JOIN topics t ON n.topic_id = t.id
diff --git a/app/serializers/incoming_email_details_serializer.rb b/app/serializers/incoming_email_details_serializer.rb
index 420951bb8b..d248a3ac58 100644
--- a/app/serializers/incoming_email_details_serializer.rb
+++ b/app/serializers/incoming_email_details_serializer.rb
@@ -15,7 +15,7 @@ class IncomingEmailDetailsSerializer < ApplicationSerializer
     @mail = Mail.new(incoming_email.raw)
   end
 
-  EMAIL_RECEIVER_ERROR_PREFIX = "Email::Receiver::".freeze
+  EMAIL_RECEIVER_ERROR_PREFIX = "Email::Receiver::"
 
   def error
     @error_string.presence || I18n.t("emails.incoming.unrecognized_error")
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index 26b9262a3a..afa1a3cc3d 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -180,7 +180,7 @@ class BadgeGranter
   end
 
   def self.queue_key
-    "badge_queue".freeze
+    "badge_queue"
   end
 
   # Options:
diff --git a/config/initializers/100-silence_logger.rb b/config/initializers/100-silence_logger.rb
index 38fdbef5aa..3a900d24e3 100644
--- a/config/initializers/100-silence_logger.rb
+++ b/config/initializers/100-silence_logger.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class SilenceLogger < Rails::Rack::Logger
-  PATH_INFO = 'PATH_INFO'.freeze
-  HTTP_X_SILENCE_LOGGER = 'HTTP_X_SILENCE_LOGGER'.freeze
+  PATH_INFO = 'PATH_INFO'
+  HTTP_X_SILENCE_LOGGER = 'HTTP_X_SILENCE_LOGGER'
 
   def initialize(app, opts = {})
     @app = app
@@ -36,9 +36,9 @@ class SilenceLogger < Rails::Rack::Logger
 end
 
 silenced = [
-  "/mini-profiler-resources/results".freeze,
-  "/mini-profiler-resources/includes.js".freeze,
-  "/mini-profiler-resources/includes.css".freeze,
-  "/mini-profiler-resources/jquery.tmpl.js".freeze
+  "/mini-profiler-resources/results",
+  "/mini-profiler-resources/includes.js",
+  "/mini-profiler-resources/includes.css",
+  "/mini-profiler-resources/jquery.tmpl.js"
 ]
 Rails.configuration.middleware.swap Rails::Rack::Logger, SilenceLogger, silenced: silenced
diff --git a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
index ce37de7c14..b8bfb62909 100644
--- a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
+++ b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
@@ -11,7 +11,7 @@ class PostgreSQLFallbackHandler
   attr_reader :masters_down
   attr_accessor :initialized
 
-  DATABASE_DOWN_CHANNEL = '/global/database_down'.freeze
+  DATABASE_DOWN_CHANNEL = '/global/database_down'
 
   def initialize
     @masters_down = DistributedCache.new('masters_down', namespace: false)
diff --git a/lib/badge_posts_view_manager.rb b/lib/badge_posts_view_manager.rb
index 52ef2084c3..13b5d09607 100644
--- a/lib/badge_posts_view_manager.rb
+++ b/lib/badge_posts_view_manager.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BadgePostsViewManager
-  VIEW_NAME = "badge_posts".freeze
+  VIEW_NAME = "badge_posts"
 
   def self.create!
     sql = <<~SQL
diff --git a/lib/base62.rb b/lib/base62.rb
index f745922e63..70728c6a52 100644
--- a/lib/base62.rb
+++ b/lib/base62.rb
@@ -3,7 +3,7 @@
 # Modified version of: https://github.com/steventen/base62-rb
 
 module Base62
-  KEYS ||= "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".freeze
+  KEYS ||= "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
   KEYS_HASH ||= KEYS.each_char.with_index.to_h
   BASE ||= KEYS.length
 
diff --git a/lib/bookmark_reminder_notification_handler.rb b/lib/bookmark_reminder_notification_handler.rb
index 3354be3949..e129b4ac19 100644
--- a/lib/bookmark_reminder_notification_handler.rb
+++ b/lib/bookmark_reminder_notification_handler.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BookmarkReminderNotificationHandler
-  PENDING_AT_DESKTOP_KEY_PREFIX ||= 'pending_at_desktop_bookmark_reminder_user_'.freeze
+  PENDING_AT_DESKTOP_KEY_PREFIX ||= 'pending_at_desktop_bookmark_reminder_user_'
   PENDING_AT_DESKTOP_EXPIRY_DAYS ||= 20
 
   def self.send_notification(bookmark)
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 07810010b6..9bdbc2b302 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -42,7 +42,7 @@ module Discourse
     end
 
     def self.pretty_logs(logs)
-      logs.join("\n".freeze)
+      logs.join("\n")
     end
 
     def self.atomic_write_file(destination, contents)
@@ -811,7 +811,7 @@ module Discourse
     warning
   end
 
-  SIDEKIQ_NAMESPACE ||= 'sidekiq'.freeze
+  SIDEKIQ_NAMESPACE ||= 'sidekiq'
 
   def self.sidekiq_redis_config
     conf = GlobalSetting.redis_config.dup
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index 728e244db7..ff946cacfb 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -8,10 +8,10 @@ class DiscourseRedis
   class FallbackHandler
     include Singleton
 
-    MASTER_ROLE_STATUS = "role:master".freeze
-    MASTER_LOADING_STATUS = "loading:1".freeze
-    MASTER_LOADED_STATUS = "loading:0".freeze
-    CONNECTION_TYPES = %w{normal pubsub}.each(&:freeze)
+    MASTER_ROLE_STATUS = "role:master"
+    MASTER_LOADING_STATUS = "loading:1"
+    MASTER_LOADED_STATUS = "loading:0"
+    CONNECTION_TYPES = %w{normal pubsub}
 
     def initialize
       @master = true
diff --git a/lib/email/message_builder.rb b/lib/email/message_builder.rb
index 4dafa6bbf9..611cdca115 100644
--- a/lib/email/message_builder.rb
+++ b/lib/email/message_builder.rb
@@ -6,7 +6,7 @@ module Email
   class MessageBuilder
     attr_reader :template_args
 
-    ALLOW_REPLY_BY_EMAIL_HEADER = 'X-Discourse-Allow-Reply-By-Email'.freeze
+    ALLOW_REPLY_BY_EMAIL_HEADER = 'X-Discourse-Allow-Reply-By-Email'
 
     def initialize(to, opts = nil)
       @to = to
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 4d299fcff3..34845f9df6 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -337,8 +337,8 @@ module Email
 
     def strip_classes_and_ids
       @fragment.css('*').each do |element|
-        element.delete('class'.freeze)
-        element.delete('id'.freeze)
+        element.delete('class')
+        element.delete('id')
       end
     end
 
diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rb
index c3752be155..6307465a8f 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -121,14 +121,14 @@ module FileStore
           File.extname(upload.original_filename)
         end
 
-      get_path_for("original".freeze, upload.id, upload.sha1, extension)
+      get_path_for("original", upload.id, upload.sha1, extension)
     end
 
     def get_path_for_optimized_image(optimized_image)
       upload = optimized_image.upload
       version = optimized_image.version || 1
       extension = "_#{version}_#{optimized_image.width}x#{optimized_image.height}#{optimized_image.extension}"
-      get_path_for("optimized".freeze, upload.id, upload.sha1, extension)
+      get_path_for("optimized", upload.id, upload.sha1, extension)
     end
 
     CACHE_DIR ||= "#{Rails.root}/tmp/download_cache/"
diff --git a/lib/html_prettify.rb b/lib/html_prettify.rb
index db3bd14e08..06a00099b2 100644
--- a/lib/html_prettify.rb
+++ b/lib/html_prettify.rb
@@ -240,11 +240,11 @@ class HtmlPrettify < String
   def educate_fractions(str)
     str.gsub(/(\s+|^)(1\/4|1\/2|3\/4)([,.;\s]|$)/) do
       frac =
-        if $2 == "1/2".freeze
+        if $2 == "1/2"
           entity(:frac12)
-        elsif $2 == "1/4".freeze
+        elsif $2 == "1/4"
           entity(:frac14)
-        elsif $2 == "3/4".freeze
+        elsif $2 == "3/4"
           entity(:frac34)
         end
       "#{$1}#{frac}#{$3}"
diff --git a/lib/migration/base_dropper.rb b/lib/migration/base_dropper.rb
index 2ea01131e2..b88a5ba357 100644
--- a/lib/migration/base_dropper.rb
+++ b/lib/migration/base_dropper.rb
@@ -2,7 +2,7 @@
 
 module Migration
   class BaseDropper
-    FUNCTION_SCHEMA_NAME ||= "discourse_functions".freeze
+    FUNCTION_SCHEMA_NAME ||= "discourse_functions"
 
     def self.create_readonly_function(table_name, column_name = nil)
       DB.exec <<~SQL
diff --git a/lib/plain_text_to_markdown.rb b/lib/plain_text_to_markdown.rb
index f365731130..5cbe78a934 100644
--- a/lib/plain_text_to_markdown.rb
+++ b/lib/plain_text_to_markdown.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class PlainTextToMarkdown
-  SIGNATURE_SEPARATOR ||= "-- ".freeze
+  SIGNATURE_SEPARATOR ||= "-- "
 
   def initialize(plaintext, opts = {})
     @plaintext = plaintext
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index fab3de1954..6f91e35b5d 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -240,7 +240,7 @@ class PostCreator
   end
 
   def self.track_post_stats
-    Rails.env != "test".freeze || @track_post_stats
+    Rails.env != "test" || @track_post_stats
   end
 
   def self.track_post_stats=(val)
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 0843f32348..8f260089ef 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -311,7 +311,7 @@ module PrettyText
 
     # extract all links
     doc.css("a").each do |a|
-      if a["href"].present? && a["href"][0] != "#".freeze
+      if a["href"].present? && a["href"][0] != "#"
         links << DetectedLink.new(a["href"], false)
       end
     end
diff --git a/lib/quote_comparer.rb b/lib/quote_comparer.rb
index e3aeb79717..5da2891a7e 100644
--- a/lib/quote_comparer.rb
+++ b/lib/quote_comparer.rb
@@ -2,7 +2,7 @@
 
 class QuoteComparer
   def self.whitespace
-    " \t\r\n".freeze
+    " \t\r\n"
   end
 
   def initialize(topic_id, post_number, text)
diff --git a/lib/s3_helper.rb b/lib/s3_helper.rb
index a1f921e9af..ccc0da333a 100644
--- a/lib/s3_helper.rb
+++ b/lib/s3_helper.rb
@@ -28,7 +28,7 @@ class S3Helper
   end
 
   def self.get_bucket_and_folder_path(s3_bucket_name)
-    s3_bucket_name.downcase.split("/".freeze, 2)
+    s3_bucket_name.downcase.split("/", 2)
   end
 
   def upload(file, path, options = {})
@@ -75,7 +75,7 @@ class S3Helper
         options[:copy_source] = File.join(@s3_bucket_name, source)
       elsif @s3_bucket_folder_path
         folder, filename = begin
-          source.split("/".freeze, 2)
+          source.split("/", 2)
         end
         options[:copy_source] = File.join(@s3_bucket_name, folder, multisite_upload_path, filename)
       else
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 2c651d0b61..64fe9d6d44 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -135,7 +135,7 @@ module SiteSettingExtension
       if GlobalSetting.respond_to?(name)
         val = GlobalSetting.public_send(name)
 
-        unless val.nil? || (val == ''.freeze)
+        unless val.nil? || (val == '')
           shadowed_val = val
           hidden_settings << name
           shadowed_settings << name
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index fa851e916a..35bc7347fe 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -458,7 +458,7 @@ class TopicQuery
 
   def latest_results(options = {})
     result = default_results(options)
-    result = remove_muted_topics(result, @user) unless options && options[:state] == "muted".freeze
+    result = remove_muted_topics(result, @user) unless options && options[:state] == "muted"
     result = remove_muted_categories(result, @user, exclude: options[:category])
     result = remove_muted_tags(result, @user, options)
     result = apply_shared_drafts(result, get_category_id(options[:category]), options)
diff --git a/lib/twitter_api.rb b/lib/twitter_api.rb
index 8b9f088767..2cef9c0847 100644
--- a/lib/twitter_api.rb
+++ b/lib/twitter_api.rb
@@ -93,7 +93,7 @@ class TwitterApi
     end
 
     unless defined? BASE_URL
-      BASE_URL = 'https://api.twitter.com'.freeze
+      BASE_URL = 'https://api.twitter.com'
     end
 
     def twitter_get(uri)
diff --git a/lib/validators/censored_words_validator.rb b/lib/validators/censored_words_validator.rb
index b65f6620e3..0c72e51a31 100644
--- a/lib/validators/censored_words_validator.rb
+++ b/lib/validators/censored_words_validator.rb
@@ -29,7 +29,7 @@ class CensoredWordsValidator < ActiveModel::EachValidator
   def join_censored_words(censored_words)
     censored_words.map!(&:downcase)
     censored_words.uniq!
-    censored_words.join(", ".freeze)
+    censored_words.join(", ")
   end
 
   def censored_words_regexp
diff --git a/lib/validators/regex_setting_validator.rb b/lib/validators/regex_setting_validator.rb
index aec1dbc1a6..a0d85b9e5e 100644
--- a/lib/validators/regex_setting_validator.rb
+++ b/lib/validators/regex_setting_validator.rb
@@ -2,7 +2,7 @@
 
 class RegexSettingValidator
 
-  LOREM = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam eget sem non elit tincidunt rhoncus.'.freeze
+  LOREM = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam eget sem non elit tincidunt rhoncus.'
 
   def initialize(opts = {})
     @opts = opts
diff --git a/lib/webauthn.rb b/lib/webauthn.rb
index 56705cfa23..4734b660ca 100644
--- a/lib/webauthn.rb
+++ b/lib/webauthn.rb
@@ -5,8 +5,8 @@ require 'webauthn/security_key_registration_service'
 require 'webauthn/security_key_authentication_service'
 
 module Webauthn
-  ACCEPTABLE_REGISTRATION_TYPE = "webauthn.create".freeze
-  ACCEPTABLE_AUTHENTICATION_TYPE = "webauthn.get".freeze
+  ACCEPTABLE_REGISTRATION_TYPE = "webauthn.create"
+  ACCEPTABLE_AUTHENTICATION_TYPE = "webauthn.get"
 
   # -7   - ES256
   # -257 - RS256 (Windows Hello supported alg.)
diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb
index 8af89155e1..9fc7b1cd17 100644
--- a/script/bulk_import/base.rb
+++ b/script/bulk_import/base.rb
@@ -26,7 +26,7 @@ module BulkImport; end
 
 class BulkImport::Base
 
-  NOW ||= "now()".freeze
+  NOW ||= "now()"
   PRIVATE_OFFSET ||= 2**30
 
   # rubocop:disable Layout/HashAlignment
@@ -660,7 +660,7 @@ class BulkImport::Base
           imported_ids << mapped[:imported_id] unless mapped[:imported_id].nil?
           imported_ids |= mapped[:imported_ids] unless mapped[:imported_ids].nil?
           @raw_connection.put_copy_data columns.map { |c| processed[c] }
-          print "\r%7d - %6d/sec".freeze % [imported_ids.size, imported_ids.size.to_f / (Time.now - start)] if imported_ids.size % 5000 == 0
+          print "\r%7d - %6d/sec" % [imported_ids.size, imported_ids.size.to_f / (Time.now - start)] if imported_ids.size % 5000 == 0
         rescue => e
           puts "\n"
           puts "ERROR: #{e.inspect}"
@@ -669,7 +669,7 @@ class BulkImport::Base
     end
 
     if imported_ids.size > 0
-      print "\r%7d - %6d/sec".freeze % [imported_ids.size, imported_ids.size.to_f / (Time.now - start)]
+      print "\r%7d - %6d/sec" % [imported_ids.size, imported_ids.size.to_f / (Time.now - start)]
       puts
     end
 
diff --git a/script/bulk_import/discourse_merger.rb b/script/bulk_import/discourse_merger.rb
index 9029bdb28a..35ff800822 100644
--- a/script/bulk_import/discourse_merger.rb
+++ b/script/bulk_import/discourse_merger.rb
@@ -4,7 +4,7 @@ require_relative "base"
 
 class BulkImport::DiscourseMerger < BulkImport::Base
 
-  NOW ||= "now()".freeze
+  NOW ||= "now()"
   CUSTOM_FIELDS = ['category', 'group', 'post', 'topic', 'user']
 
   # DB_NAME: name of database being merged into the current local db
diff --git a/script/bulk_import/vanilla.rb b/script/bulk_import/vanilla.rb
index 2efed5f31f..71307dba0a 100644
--- a/script/bulk_import/vanilla.rb
+++ b/script/bulk_import/vanilla.rb
@@ -209,7 +209,7 @@ class BulkImport::Vanilla < BulkImport::Base
 
       User.find_each do |u|
         count += 1
-        print "\r%7d - %6d/sec".freeze % [count, count.to_f / (Time.now - start)]
+        print "\r%7d - %6d/sec" % [count, count.to_f / (Time.now - start)]
 
         next unless u.custom_fields["import_id"]
 
@@ -276,7 +276,7 @@ class BulkImport::Vanilla < BulkImport::Base
 
       Post.where("raw LIKE '%/us.v-cdn.net/%' OR raw LIKE '%[attachment%'").find_each do |post|
         count += 1
-        print "\r%7d - %6d/sec".freeze % [count, count.to_f / (Time.now - start)]
+        print "\r%7d - %6d/sec" % [count, count.to_f / (Time.now - start)]
         new_raw = post.raw.dup
 
         new_raw.gsub!(attachment_regex) do |s|
@@ -613,7 +613,7 @@ class BulkImport::Vanilla < BulkImport::Base
           )
         end
 
-        print "\r%7d - %6d/sec".freeze % [count, count.to_f / (Time.now - start)] if count % 5000 == 0
+        print "\r%7d - %6d/sec" % [count, count.to_f / (Time.now - start)] if count % 5000 == 0
       end
     end
 
@@ -645,7 +645,7 @@ class BulkImport::Vanilla < BulkImport::Base
           end
         end
 
-        print "\r%7d - %6d/sec".freeze % [count, count.to_f / (Time.now - start)] if count % 5000 == 0
+        print "\r%7d - %6d/sec" % [count, count.to_f / (Time.now - start)] if count % 5000 == 0
       end
     end
   end
diff --git a/script/bulk_import/vbulletin.rb b/script/bulk_import/vbulletin.rb
index fef661fa91..b437137c38 100644
--- a/script/bulk_import/vbulletin.rb
+++ b/script/bulk_import/vbulletin.rb
@@ -608,7 +608,7 @@ class BulkImport::VBulletin < BulkImport::Base
       count = 0
 
       Dir.foreach(AVATAR_DIR) do |item|
-        print "\r%7d - %6d/sec".freeze % [count, count.to_f / (Time.now - start)]
+        print "\r%7d - %6d/sec" % [count, count.to_f / (Time.now - start)]
 
         next if item == ('.') || item == ('..') || item == ('.DS_Store')
         next unless item =~ /avatar(\d+)_(\d).gif/
diff --git a/script/import_scripts/mbox/support/indexer.rb b/script/import_scripts/mbox/support/indexer.rb
index 7017c2a59f..dc6e092c29 100644
--- a/script/import_scripts/mbox/support/indexer.rb
+++ b/script/import_scripts/mbox/support/indexer.rb
@@ -39,7 +39,7 @@ module ImportScripts::Mbox
 
     private
 
-    METADATA_FILENAME = 'metadata.yml'.freeze
+    METADATA_FILENAME = 'metadata.yml'
     IGNORED_FILE_EXTENSIONS = ['.dbindex', '.dbnames', '.digest', '.subjects', '.yml']
 
     def index_category(directory)
diff --git a/spec/components/discourse_tagging_spec.rb b/spec/components/discourse_tagging_spec.rb
index 35ff67a9a9..b8d328f980 100644
--- a/spec/components/discourse_tagging_spec.rb
+++ b/spec/components/discourse_tagging_spec.rb
@@ -475,7 +475,7 @@ describe DiscourseTagging do
 
     describe "clean_tag" do
       it "downcases new tags if setting enabled" do
-        expect(DiscourseTagging.clean_tag("HeLlO".freeze)).to eq("hello")
+        expect(DiscourseTagging.clean_tag("HeLlO")).to eq("hello")
 
         SiteSetting.force_lowercase_tags = false
         expect(DiscourseTagging.clean_tag("HeLlO")).to eq("HeLlO")
diff --git a/spec/support/webauthn_integration_helpers.rb b/spec/support/webauthn_integration_helpers.rb
index d6a32ffd35..09310d0f57 100644
--- a/spec/support/webauthn_integration_helpers.rb
+++ b/spec/support/webauthn_integration_helpers.rb
@@ -19,23 +19,23 @@ module WebauthnIntegrationHelpers
   # simulate_localhost_webautn_challenge for a real example.
   def valid_security_key_data
     {
-      credential_id: "9GiFosW50+s+juyJlyxKEVAsk3gZLo9XWIhX47eC4gHfDsldF3TWR43Tcl/+3gLTL5t1TjpmcbKA2DUV2eKrBw==".freeze,
-      public_key: "pQECAyYgASFYIPMGM1OpSuCU5uks+BulAdfVxdlJiYcgGac5Y+LnLXC9Ilgghy0BKvRvptmQdtWz33Jjnf8Y6+HD85XdRiqmo1KMGPE=".freeze
+      credential_id: "9GiFosW50+s+juyJlyxKEVAsk3gZLo9XWIhX47eC4gHfDsldF3TWR43Tcl/+3gLTL5t1TjpmcbKA2DUV2eKrBw==",
+      public_key: "pQECAyYgASFYIPMGM1OpSuCU5uks+BulAdfVxdlJiYcgGac5Y+LnLXC9Ilgghy0BKvRvptmQdtWz33Jjnf8Y6+HD85XdRiqmo1KMGPE="
     }
   end
 
   def valid_security_key_auth_post_data
     {
-      signature: "MEYCIQC5xyUQvF4qTPZ2yX7crp/IEs1E/4wqhXgxC1EVAumhfgIhAIC/7w4BVEy+ew6vMYISahtnnIqbqsPZosBeTUSI8Y4j".freeze,
-      clientData: "eyJjaGFsbGVuZ2UiOiJOR1UzWW1Zek0yWTBNelkyWkdFM05EVTNZak5qWldVNFpUWTNOakJoTm1NMFlqVTVORFptTlRrd016Vm1ZMlZpTURVd01UZzJOemcxTW1RMSIsIm9yaWdpbiI6Imh0dHA6Ly9sb2NhbGhvc3Q6MzAwMCIsInR5cGUiOiJ3ZWJhdXRobi5nZXQifQ==".freeze,
-      authenticatorData: "SZYN5YgOjGh0NBcPZHZgW4/krrmihjLHmVzzuoMdl2MBAAAA2Q==".freeze,
+      signature: "MEYCIQC5xyUQvF4qTPZ2yX7crp/IEs1E/4wqhXgxC1EVAumhfgIhAIC/7w4BVEy+ew6vMYISahtnnIqbqsPZosBeTUSI8Y4j",
+      clientData: "eyJjaGFsbGVuZ2UiOiJOR1UzWW1Zek0yWTBNelkyWkdFM05EVTNZak5qWldVNFpUWTNOakJoTm1NMFlqVTVORFptTlRrd016Vm1ZMlZpTURVd01UZzJOemcxTW1RMSIsIm9yaWdpbiI6Imh0dHA6Ly9sb2NhbGhvc3Q6MzAwMCIsInR5cGUiOiJ3ZWJhdXRobi5nZXQifQ==",
+      authenticatorData: "SZYN5YgOjGh0NBcPZHZgW4/krrmihjLHmVzzuoMdl2MBAAAA2Q==",
       credentialId: valid_security_key_data[:credential_id]
     }
   end
 
   def valid_security_key_challenge_data
     {
-      challenge: "4e7bf33f4366da7457b3cee8e6760a6c4b5946f59035fceb0501867852d5".freeze
+      challenge: "4e7bf33f4366da7457b3cee8e6760a6c4b5946f59035fceb0501867852d5"
     }
   end
 

From 238cbff46f4b24acf07211583a1bc854ceefab9a Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Thu, 30 Apr 2020 11:02:15 +0300
Subject: [PATCH 0882/1830] Revert "HACK: Add dummy plugin folder"

This reverts commit 590830b931ec83f7ae4ccde3cf820a072d6c2d09 because a
proper fix was implemented in discourse_docker@d587158.
---
 .gitignore                                          | 1 -
 plugins/discourse-internet-explorer/public/.gitkeep | 0
 2 files changed, 1 deletion(-)
 delete mode 100644 plugins/discourse-internet-explorer/public/.gitkeep

diff --git a/.gitignore b/.gitignore
index 46e956c118..97d1a6b930 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,7 +54,6 @@ bootsnap-compile-cache/
 !/plugins/discourse-narrative-bot
 !/plugins/discourse-presence
 !/plugins/discourse-local-dates
-!/plugins/discourse-internet-explorer
 !/plugins/discourse-unsupported-browser
 /plugins/*/auto_generated/
 
diff --git a/plugins/discourse-internet-explorer/public/.gitkeep b/plugins/discourse-internet-explorer/public/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000

From fe51f7a863b68abfe592d564b0e96c3f65e66415 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Thu, 30 Apr 2020 12:07:51 +0300
Subject: [PATCH 0883/1830] FEATURE: More improvements to crawler and old
 browsers view

Related to c85018cdfd1a36e8c33de25c44bf192d53e201c1.
---
 app/assets/javascripts/polyfills.js                    | 2 +-
 app/assets/stylesheets/common/base/_topic-list.scss    | 6 ------
 app/assets/stylesheets/common/base/crawler_layout.scss | 8 ++++----
 app/views/list/list.erb                                | 8 +++++---
 app/views/topics/show.html.erb                         | 2 +-
 config/locales/client.en.yml                           | 2 +-
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/polyfills.js b/app/assets/javascripts/polyfills.js
index 358a213467..0fe25c8bdb 100644
--- a/app/assets/javascripts/polyfills.js
+++ b/app/assets/javascripts/polyfills.js
@@ -1,6 +1,6 @@
 /* eslint-disable */
 
-// Any IE only polyfill should be moved in discourse-internet-explorer plugin
+// Any IE only polyfill should be moved in discourse-unsupported-browser plugin
 
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/flags#Polyfill
 // IE and EDGE
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 01fc70a2bb..5b9cff0076 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -142,12 +142,6 @@
     }
   }
 
-  .link-bottom-line {
-    .category-name {
-      margin-right: 12px;
-    }
-  }
-
   .unread-indicator {
     &.read {
       display: none;
diff --git a/app/assets/stylesheets/common/base/crawler_layout.scss b/app/assets/stylesheets/common/base/crawler_layout.scss
index c0ca931510..b0588f35b5 100644
--- a/app/assets/stylesheets/common/base/crawler_layout.scss
+++ b/app/assets/stylesheets/common/base/crawler_layout.scss
@@ -11,6 +11,10 @@ body.crawler {
     box-sizing: border-box;
   }
 
+  .header-buttons {
+    display: none;
+  }
+
   div#main-outlet {
     div.post {
       word-break: break-word;
@@ -29,10 +33,6 @@ body.crawler {
     margin-top: 4em;
   }
 
-  .category-title {
-    color: $primary;
-  }
-
   .discourse-tags {
     color: $primary-medium;
   }
diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index 77bb68d2e4..9fa5a1f034 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -69,7 +69,9 @@
               <% if (!@category || @category.has_children?) && t.category %>
                 <a href='<%= t.category.url %>' class='badge-wrapper bullet'>
                   <span class='badge-category-bg' style='background-color: #<%= t.category.color %>'></span>
-                  <span class='category-title'><%= t.category.name %></span>
+                  <span class='badge-category clear-badge'>
+                    <span class='category-name'><%= t.category.name %></span>
+                  </span>
                 </a>
               <% end %>
               <% if t.tags %>
@@ -99,10 +101,10 @@
             <% end %>
           </td>
           <td>
-            <span class='views' title='<%= t 'views' %>'><%= t.views %></span>
+            <span class='posts' title='<%= t 'posts' %>'><%= t.posts_count %></span>
           </td>
           <td>
-            <span class='posts' title='<%= t 'posts' %>'><%= t.posts_count %></span>
+            <span class='views' title='<%= t 'views' %>'><%= t.views %></span>
           </td>
           <td>
             <%= I18n.l(t.last_posted_at || t.created_at, format: :date_only) %>
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index e9d3b96b9a..801e0a0973 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -11,7 +11,7 @@
           <span itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
             <a href="<%= Discourse.base_url %><%= c[:url] %>" class="badge-wrapper bullet" itemprop="item">
               <span class="badge-category-bg" style='background-color: #<%= c[:color] %>'></span>
-              <span class="category-title" itemprop="name"><%= c[:name] %></span>
+              <span class="category-name" itemprop="name"><%= c[:name] %></span>
             </a>
             <meta itemprop="position" content="<%= i + 1 %>" />
           </span>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index da09ba9c9e..61a29cb70e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3052,7 +3052,7 @@ en:
         today: "Today"
         other_periods: "see top"
 
-    browser_update: 'Unfortunately, <a href="https://www.discourse.org/faq/#browser">your browser is too old to work on this site</a>. Please <a href="https://browsehappy.com">upgrade your browser</a>.'
+    browser_update: 'Unfortunately, <a href="https://www.discourse.org/faq/#browser">your browser is too old to work on this site</a>. Please <a href="https://browsehappy.com">upgrade your browser</a> to view rich content, login, and reply.'
 
     permission_types:
       full: "Create / Reply / See"

From 501b19b6e005f00ffbaa126965b80bad3eaca47b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Thu, 30 Apr 2020 12:21:25 +0200
Subject: [PATCH 0884/1830] FIX: server-side HtmlToMarkdown improvements
 (#9586)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

TLDR; this commit vastly improves how whitespaces are handled when converting from HTML to Markdown.
It also adds support for converting HTML <tables> to markdown tables.

The previous 'remove_whitespaces!' method was traversing the whole HTML tree and used a heuristic to remove
leading and trailing whitespaces whenever it was appropriate (ie. mostly before and after HTML block elements)

It was a good idea, but it was very limited and leaded to bad conversion when the html had leading whitespaces on several lines for example.
One such example can be found [here](https://meta.discourse.org/t/86782).

For various reasons, most of the whitespaces in a HTML file is ignored when the page is being displayed in a browser.
The rules that the browsers follow are the [CSS' White Space Processing Rules](https://www.w3.org/TR/css-text-3/#white-space-rules).
They can be quite complicated when you take into account RTL languages and other various tidbits but they boils down to the following:

- Collapse whitespaces down to one space (0x20) inside an inline context (ie. nodes/tags that are being displaying on the same line)
- Remove any leading/trailing whitespaces inside an inline context

One quick & dirty way of getting this 90% solved would be to do 'HTML.gsub!(/[[:space:]]+/, " ")'.
We would also need to hoist <pre> elements in order to not mess with their whitespaces.
Unfortunately, this solution let some whitespaces creep around HTML tags which leads to more '.strip!' calls than I can bear.

I decided to "emulate" the browser's handling of whitespaces and came up with a solution in 4 parts

1. remove_not_allowed!

The HtmlToMarkdown library is recursively "visiting" all the nodes in the HTML in order to convert them to Markdown.
All the nodes that aren't handled by the library (eg. <script>, <style> or any non-textual HTML tags) are "swallowed".
In order to reduce the number of nodes visited, the method 'remove_not_allowed!' will automatically delete all the nodes
that have no "visitor" (eg. a 'visit_<tag>' method) defined.

2. remove_hidden!

Similar purpose as the previous method (eg. reducing number of nodes visited), there's no point trying to convert something that is hidden.
The 'remove_hidden!' method removes any nodes that was hidden using the "hidden" HTML attribute, some CSS or with a width or height equal to 0.

3. hoist_line_breaks!

The 'hoist_line_breaks!' method is there to handle <br> tags. I know those tiny <br> don't do much but they can be quite annoying.
The <br> tags are inline elements but they visually work like a block element (ie. they create a new line).
If you have the following HTML "<i>Foo<br>Bar</i>", it ends up visually similar to "<i>Foo</i><br><i>Bar</i>".
The latter being much more easy to process than the former, so that's what this method is doing.
The "hoist_line_breaks" will hoist <br> tags out of inline tags until their parent is a block element.

4. remove_whitespaces!

The "remove_whitespaces!" is where all the whitespace removal is happening. It's broken down into 4 methods as well

- remove_whitespaces!
- is_inline?
- collapse_spaces!
- remove_trailing_space!

The 'remove_whitespace!' method is recursively walking the HTML tree (skipping <pre> tags).
If a node has any children, they will be chunked into groups of inline elements vs block elements.
For each chunks of inline elements, it will call the "collapse_space!" and "remove_trailing_space!" methods.
For each chunks of block elements, it will call "remote_whitespace!" to keep walking the HTML tree recursively.

The "is_inline?" method determines whether a node is part of a inline context.
A node is inline iif it's a text node or it's an inline tag, but not <br>, and all its children are also inline.

The "collapse_spaces!" method will collapse any kind of (white) space into a single space (" ") character, even accros tags.
For example, if we have "  Foo \n<i> Bar </i>\t42", it will return "Foo <i>Bar </i>42".

Finally, the "remove_trailing_space!" method is there to remove any trailing space that might creep in at the end of the inline chunk.

This solution is not 100% bullet-proof.
It does not support RTL languages at all and has some caveats that I felt were not worth the work to get properly fixed.

FIX: better detection of hidden elements when converting HTML to Markdown
FIX: take into account the 'allowed_href_schemes' site setting when converting HTML <a> to Markdown
FIX: added support for 'mailto:' scheme when converting <a> from HTML to Markdown
FIX: added support for <img> dimensions when converting from HTML to Markdown
FIX: added support for <dl>, <dd> and <dt> when converting from HTML to Markdown
FIX: added support for multilines emphases, strongs and strikes when converting from HTML to Markdown
FIX: added support for <acronym> when converting from HTML to Markdown
DEV: remove unused 'sanitize' gem

Wow, did you just read all that?! Congratz, here's a cookie: 🍪.
---
 Gemfile                                  |   1 -
 Gemfile.lock                             |   1 -
 lib/html_to_markdown.rb                  | 532 ++++++++++++++---------
 spec/components/html_to_markdown_spec.rb | 151 ++++++-
 4 files changed, 450 insertions(+), 235 deletions(-)

diff --git a/Gemfile b/Gemfile
index 39b714d5c7..a0f43d3313 100644
--- a/Gemfile
+++ b/Gemfile
@@ -118,7 +118,6 @@ gem 'rake'
 gem 'thor', require: false
 gem 'diffy', require: false
 gem 'rinku'
-gem 'sanitize'
 gem 'sidekiq'
 gem 'mini_scheduler'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b059691d9d..b428497657 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -533,7 +533,6 @@ DEPENDENCIES
   ruby-prof
   ruby-readability
   rubyzip
-  sanitize
   sassc (= 2.0.1)
   sassc-rails
   seed-fu
diff --git a/lib/html_to_markdown.rb b/lib/html_to_markdown.rb
index a3eb5e8aae..448a0cd725 100644
--- a/lib/html_to_markdown.rb
+++ b/lib/html_to_markdown.rb
@@ -1,267 +1,365 @@
 # frozen_string_literal: true
 
-require "nokogiri"
+require "nokogumbo"
+require "securerandom"
 
 class HtmlToMarkdown
 
-  class Block < Struct.new(:name, :head, :body, :opened, :markdown)
-    def initialize(name, head = "", body = "", opened = false, markdown = +"")
-      super
-    end
-  end
-
   def initialize(html, opts = {})
-    @opts = opts || {}
-    @doc = fix_span_elements(Nokogiri::HTML(html))
+    @opts = opts
 
-    remove_whitespaces!
-  end
+    # we're only interested in <body>
+    @doc = Nokogiri::HTML5(html).at("body")
 
-  # If a `<div>` is within a `<span>` that's invalid, so let's hoist the `<div>` up
-  INLINE_ELEMENTS ||= %w{span font}
-  BLOCK_ELEMENTS ||= %w{div p}
-  def fix_span_elements(node)
-    if (INLINE_ELEMENTS.include?(node.name) && BLOCK_ELEMENTS.any? { |e| node.at(e) })
-      node.swap(node.children)
-    end
-
-    node.children.each { |c| fix_span_elements(c) }
-    node
-  end
-
-  def remove_whitespaces!
-    @doc.traverse do |node|
-      if node.is_a?(Nokogiri::XML::Text) && node.parent.name != "pre"
-        node.content = node.content.gsub(/\A[[:space:]]+/, "") if node.previous_element&.description&.block?
-        node.content = node.content.gsub(/\A[[:space:]]+/, "") if node.previous_element.nil? && node.parent.description&.block?
-        node.content = node.content.gsub(/[[:space:]]+\z/, "") if node.next_element&.description&.block?
-        node.content = node.content.gsub(/[[:space:]]+\z/, "") if node.next_element.nil? && node.parent.description&.block?
-        node.content = node.content.gsub(/\r\n?/, "\n")
-        node.remove if node.content.empty?
-      end
-    end
+    remove_not_allowed!(@doc)
+    remove_hidden!(@doc)
+    hoist_line_breaks!(@doc)
+    remove_whitespaces!(@doc)
   end
 
   def to_markdown
-    @stack = [Block.new("root")]
-    @markdown = +""
     traverse(@doc)
-    @markdown << format_block
-    @markdown.gsub!(/\n{3,}/, "\n\n")
-    @markdown.strip!
-    @markdown
+      .gsub(/\n{2,}/, "\n\n")
+      .strip
+  end
+
+  private
+
+  def remove_not_allowed!(doc)
+    allowed = Set.new
+
+    HtmlToMarkdown.private_instance_methods.each do |m|
+      if tag = m.to_s[/^visit_(.+)/, 1]
+        allowed << tag
+      end
+    end
+
+    @doc.traverse { |node| node.remove if !allowed.include?(node.name) }
+  end
+
+  HIDDEN_STYLES ||= /(display\s*:\s*none)|(visibility\s*:\s*hidden)|(opacity\s*:\s*0)|(transform\s*:\s*scale\(0\))|((width|height)\s*:\s*0)/i
+
+  def remove_hidden!(doc)
+    @doc.css("[hidden]").remove
+    @doc.css("[style]").each { |n| n.remove if n["style"][HIDDEN_STYLES] }
+    @doc.css("img[width]").each { |n| n.remove if n["width"].to_i <= 0 }
+    @doc.css("img[height]").each { |n| n.remove if n["height"].to_i <= 0 }
+  end
+
+  # When there's a <br> inside an inline element, split the inline element around the <br>
+  def hoist_line_breaks!(doc)
+    klass = "_" + SecureRandom.hex
+    doc.css("br").each { |br| br.add_class(klass) }
+
+    loop do
+      changed = false
+
+      doc.css("br.#{klass}").each do |br|
+        parent = br.parent
+
+        if parent.description.block?
+          br.remove_class(klass)
+        else
+          before, after = parent.children.slice_when { |n| n == br }.to_a
+
+          if before.size > 1
+            b = Nokogiri::XML::Node.new(parent.name, doc)
+            before[0...-1].each { |c| b.add_child(c) }
+            parent.previous = b if b.inner_html.present?
+          end
+
+          if after.present?
+            a = Nokogiri::XML::Node.new(parent.name, doc)
+            after.each { |c| a.add_child(c) }
+            parent.next = a if a.inner_html.present?
+          end
+
+          parent.replace(br)
+
+          changed = true
+        end
+      end
+
+      break if !changed
+    end
+  end
+
+  # Removes most of the unnecessary white spaces for better markdown conversion
+  # Loosely based on the CSS' White Space Processing Rules (https://www.w3.org/TR/css-text-3/#white-space-rules)
+  def remove_whitespaces!(node)
+    return true if "pre" == node.name
+
+    node.children.chunk { |n| is_inline?(n) }.each do |inline, nodes|
+      if inline
+        collapse_spaces!(nodes) && remove_trailing_space!(nodes)
+      else
+        nodes.each { |n| remove_whitespaces!(n) }
+      end
+    end
+  end
+
+  def is_inline?(node)
+    node.text? || ("br" != node.name && node.description.inline? && node.children.all? { |n| is_inline?(n) })
+  end
+
+  def collapse_spaces!(nodes, was_space = true)
+    nodes.each do |node|
+      if node.text?
+        text = String.new
+
+        node.text.chars.each do |c|
+          if c[/[[:space:]]/]
+            text << " " if !was_space
+            was_space = true
+          else
+            text << c
+            was_space = false
+          end
+        end
+
+        node.content = text
+      else
+        node.children.each { |n| was_space = collapse_spaces!([n], was_space) }
+      end
+    end
+
+    was_space
+  end
+
+  def remove_trailing_space!(nodes)
+    last = nodes[-1]
+
+    if last.text?
+      last.content = last.content[0...-1] if last.content[-1] == " "
+    elsif last.children.present?
+      remove_trailing_space!(last.children)
+    end
   end
 
   def traverse(node)
-    node.children.each { |n| visit(n) }
+    node.children.map { |n| visit(n) }.join
   end
 
   def visit(node)
-    return if node["style"] && node["style"][/display\s*:\s*none/]
-
-    if node.description&.block? && node.parent&.description&.block? && @stack[-1].markdown.size > 0
-      block = @stack[-1].dup
-      @markdown << format_block
-      block.markdown = +""
-      block.opened = true
-      @stack << block
-    end
-
     visitor = "visit_#{node.name}"
-    respond_to?(visitor) ? send(visitor, node) : traverse(node)
+    send(visitor, node) if respond_to?(visitor, true)
   end
 
-  BLACKLISTED ||= %w{button datalist fieldset form input label legend meter optgroup option output progress select textarea style script}
-  BLACKLISTED.each do |tag|
-    class_eval <<-RUBY
-      def visit_#{tag}(node)
-        ""
-      end
-    RUBY
-  end
+  ALLOWED_IMG_SRCS ||= %w{http:// https:// www.}
 
-  def visit_pre(node)
-    code = node.children.find { |c| c.name == "code" }
-    code_class = code ? code["class"] : ""
-    lang = code_class ? code_class[/lang-(\w+)/, 1] : ""
-    pre = Block.new("pre")
-    pre.markdown = +"```#{lang}\n"
-    @stack << pre
-    traverse(node)
-    pre.markdown << "\n```\n"
-    @markdown << format_block
-  end
-
-  def visit_blockquote(node)
-    @stack << Block.new("blockquote", "> ", "> ")
-    traverse(node)
-    @markdown << format_block
-  end
-
-  BLOCK_WITH_NEWLINE ||= %w{div p}
-  BLOCK_WITH_NEWLINE.each do |tag|
-    class_eval <<-RUBY
-      def visit_#{tag}(node)
-        @stack << Block.new("#{tag}")
-        traverse(node)
-        @markdown << format_block
-        @markdown << "\n"
-      end
-    RUBY
-  end
-
-  BLOCK_LIST ||= %w{menu ol ul}
-  BLOCK_LIST.each do |tag|
-    class_eval <<-RUBY
-      def visit_#{tag}(node)
-        @stack << Block.new("#{tag}")
-        traverse(node)
-        @markdown << format_block
-      end
-    RUBY
-  end
-
-  def visit_li(node)
-    parent = @stack.reverse.find { |n| n.name[/ul|ol|menu/] }
-    prefix = parent&.name == "ol" ? "1. " : "- "
-    @stack << Block.new("li", prefix, "  ")
-    traverse(node)
-    @markdown << format_block
-  end
-
-  (1..6).each do |n|
-    class_eval <<-RUBY
-      def visit_h#{n}(node)
-        @stack << Block.new("h#{n}", "#" * #{n} + " ")
-        traverse(node)
-        @markdown << format_block
-      end
-    RUBY
-  end
-
-  WHITELISTED ||= %w{del ins kbd s small strike sub sup}
-  WHITELISTED.each do |tag|
-    class_eval <<-RUBY
-      def visit_#{tag}(node)
-        @stack[-1].markdown << "<#{tag}>"
-        traverse(node)
-        @stack[-1].markdown << "</#{tag}>"
-      end
-    RUBY
-  end
-
-  def visit_abbr(node)
-    @stack[-1].markdown << (node["title"].present? ? %Q[<abbr title="#{node["title"]}">] : "<abbr>")
-    traverse(node)
-    @stack[-1].markdown << "</abbr>"
-  end
-
-  def visit_img(node)
-    if is_valid_src?(node["src"]) && is_visible_img?(node)
-      if @opts[:keep_img_tags]
-        @stack[-1].markdown << node.to_html
-      else
-        title = node["alt"].presence || node["title"].presence
-        @stack[-1].markdown << "![#{title}](#{node["src"]})"
-      end
+  def allowed_hrefs
+    @allowed_hrefs ||= begin
+      hrefs = SiteSetting.allowed_href_schemes.split("|").map { |scheme| "#{scheme}:" }.to_set
+      ALLOWED_IMG_SRCS.each { |src| hrefs << src }
+      hrefs << "mailto:"
+      hrefs.to_a
     end
   end
 
   def visit_a(node)
-    if is_valid_href?(node["href"])
-      @stack[-1].markdown << "["
-      traverse(node)
-      @stack[-1].markdown << "](#{node["href"]})"
+    if node["href"].present? && node["href"].starts_with?(*allowed_hrefs)
+      "[#{traverse(node)}](#{node["href"]})"
     else
       traverse(node)
     end
   end
 
+  def visit_img(node)
+    return if node["src"].blank?
+
+    if @opts[:keep_img_tags]
+      node.to_html
+    elsif @opts[:keep_cid_imgs] && node["src"].starts_with?("cid:")
+      node.to_html
+    elsif node["src"].starts_with?(*ALLOWED_IMG_SRCS)
+      title = node["alt"].presence || node["title"].presence
+      width = node["width"].to_i
+      height = node["height"].to_i
+      dimensions = "|#{width}x#{height}" if width > 0 && height > 0
+      "![#{title}#{dimensions}](#{node["src"]})"
+    end
+  end
+
+  ALLOWED ||= %w{kbd del ins small big sub sup dl dd dt}
+  ALLOWED.each do |tag|
+    define_method("visit_#{tag}") do |node|
+      "<#{tag}>#{traverse(node)}</#{tag}>"
+    end
+  end
+
+  def visit_blockquote(node)
+    text = traverse(node)
+    text.strip!
+    text.gsub!(/\n{2,}/, "\n\n")
+    text.gsub!(/^/, "> ")
+    "\n\n#{text}\n\n"
+  end
+
+  BLOCKS ||= %w{div tr}
+  BLOCKS.each do |tag|
+    define_method("visit_#{tag}") do |node|
+      prefix = node.previous_element&.description&.block? ? "" : "\n"
+      "#{prefix}#{traverse(node)}\n"
+    end
+  end
+
+  def visit_p(node)
+    "\n\n#{traverse(node)}\n\n"
+  end
+
+  TRAVERSABLES ||= %w{aside font span thead tbody tfooter u}
+  TRAVERSABLES.each do |tag|
+    define_method("visit_#{tag}") do |node|
+      traverse(node)
+    end
+  end
+
   def visit_tt(node)
-    @stack[-1].markdown << "`"
-    traverse(node)
-    @stack[-1].markdown << "`"
+    "`#{traverse(node)}`"
   end
 
   def visit_code(node)
-    @stack.reverse.find { |n| n.name["pre"] } ? traverse(node) : visit_tt(node)
+    node.ancestors("pre").present? ? traverse(node) : visit_tt(node)
+  end
+
+  def visit_pre(node)
+    text = traverse(node)
+    fence = text["`"] ? "~~~" : "```"
+    code = node.at("code")
+    code_class = code ? code["class"] : ""
+    lang = code_class ? code_class[/lang-(\w+)/, 1] : ""
+    "\n\n#{fence}#{lang}\n#{traverse(node)}\n#{fence}\n\n"
   end
 
   def visit_br(node)
-    return if node.previous_sibling.nil? && EMPHASIS.include?(node.parent.name)
-    return if node.parent.name == "p" && (node.next_sibling&.text || "").start_with?("\n")
-    @stack[-1].markdown << "\n"
+    "\n"
   end
 
   def visit_hr(node)
-    @stack[-1].markdown << "\n\n---\n\n"
+    "\n\n---\n\n"
   end
 
-  EMPHASIS ||= %w{b strong i em}
-  EMPHASIS.each do |tag|
-    class_eval <<-RUBY
-      def visit_#{tag}(node)
-        return if node.text.empty?
-        return @stack[-1].markdown << " " if node.text.blank?
-        times = "#{tag}" == "i" || "#{tag}" == "em" ? 1 : 2
-        delimiter = (node.text["*"] ? "_" : "*") * times
-        @stack[-1].markdown << " " if node.text[0] == " "
-        @stack[-1].markdown << delimiter
-        traverse(node)
-        @stack[-1].markdown.gsub!(/\n+$/, "")
-        if @stack[-1].markdown[-1] == " "
-          @stack[-1].markdown.chomp!(" ")
-          append_space = true
-        end
-        @stack[-1].markdown << delimiter
-        @stack[-1].markdown << " " if append_space
+  def visit_abbr(node)
+    title = node["title"].presence
+    title_attr = title ? %[ title="#{title}"] : ""
+    "<abbr#{title_attr}>#{traverse(node)}</abbr>"
+  end
+
+  def visit_acronym(node)
+    visit_abbr(node)
+  end
+
+  (1..6).each do |n|
+    define_method("visit_h#{n}") do |node|
+      "#{"#" * n} #{traverse(node)}"
+    end
+  end
+
+  CELLS ||= %w{th td}
+  CELLS.each do |tag|
+    define_method("visit_#{tag}") do |node|
+      "#{traverse(node)} "
+    end
+  end
+
+  def visit_table(node)
+    if rows = extract_rows(node)
+      headers = rows[0].css("td, th")
+      text = "| " + headers.map { |td| traverse(td).gsub(/\n/, "<br>") }.join(" | ") + " |\n"
+      text << "| " + (["-"] * headers.size).join(" | ") + " |\n"
+      rows[1..-1].each do |row|
+        text << "| " + row.css("td").map { |td| traverse(td).gsub(/\n/, "<br>") }.join(" | ") + " |\n"
       end
-    RUBY
+      "\n\n#{text}\n\n"
+    else
+      traverse(node)
+    end
+  end
+
+  def extract_rows(table)
+    return if table.ancestors("table").present?
+    return if (rows = table.css("tr")).empty?
+    headers_count = rows[0].css("td, th").size
+    return if rows[1..-1].any? { |row| row.css("td").size != headers_count }
+    rows
+  end
+
+  LISTS ||= %w{ul ol}
+  LISTS.each do |tag|
+    define_method("visit_#{tag}") do |node|
+      prefix = node.previous_element&.description&.block? ? "" : "\n"
+      suffix = node.ancestors("ul, ol, li").size > 0 ? "" : "\n"
+      "#{prefix}#{traverse(node)}#{suffix}"
+    end
+  end
+
+  def visit_li(node)
+    text = traverse(node)
+
+    lists = node.ancestors("ul, ol")
+    marker = "ol" == lists[0]&.name ? "1. " : "- "
+    indent = (" " * marker.size) * [1, lists.size].max
+    suffix = node == node.parent.elements[-1] ? "" : "\n"
+
+    text.gsub!(/\n{2,}/, "\n\n")
+    text.gsub!(/^(?!\s*$)/, indent)
+    text.lstrip!
+
+    "#{marker}#{text}#{suffix}"
+  end
+
+  EMPHASES ||= %w{i em}
+  EMPHASES.each do |tag|
+    define_method("visit_#{tag}") do |node|
+      text = traverse(node)
+
+      return ""  if text.empty?
+      return " " if text.blank?
+      return "<#{tag}>#{text}</#{tag}>" if text["\n"] || (text["*"] && text["_"])
+
+      prefix = text[0][" "]
+      suffix = text[-1][" "] if text.size > 1
+      wrap = text["*"] ? "_" : "*"
+
+      "#{prefix}#{wrap}#{text.strip}#{wrap}#{suffix}"
+    end
+  end
+
+  STRONGS ||= %w{b strong}
+  STRONGS.each do |tag|
+    define_method("visit_#{tag}") do |node|
+      text = traverse(node)
+
+      return ""  if text.empty?
+      return " " if text.blank?
+      return "<#{tag}>#{text}</#{tag}>" if text["\n"] || (text["*"] && text["_"])
+
+      prefix = text[0][" "]
+      suffix = text[-1][" "] if text.size > 1
+      wrap = text["*"] ? "__" : "**"
+
+      "#{prefix}#{wrap}#{text.strip}#{wrap}#{suffix}"
+    end
+  end
+
+  STRIKES ||= %w{s strike}
+  STRIKES.each do |tag|
+    define_method("visit_#{tag}") do |node|
+      text = traverse(node)
+
+      return ""  if text.empty?
+      return " " if text.blank?
+      return "<#{tag}>#{text}</#{tag}>" if text["\n"] || text["~~"]
+
+      prefix = text[0][" "]
+      suffix = text[-1][" "] if text.size > 1
+
+      "#{prefix}~~#{text.strip}~~#{suffix}"
+    end
   end
 
   def visit_text(node)
-    top_block = @stack[-1]
-
-    if top_block.name == "pre"
-      top_block.markdown << node.text
-      return
-    end
-
-    node.content = node.content.gsub(/\A[[:space:]]+/, "") if node.previous_element.nil? && EMPHASIS.include?(node.parent.name)
-
-    if top_block.markdown.present? && indent = node.text[/^\s+/]
-      top_block.markdown << indent
-    end
-
-    text = node.text.gsub(/^\s+/, "").gsub(/\s{2,}/, " ")
-    top_block.markdown << text
-  end
-
-  def format_block
-    lines = @stack[-1].markdown.each_line.map do |line|
-      prefix = @stack.map { |b| b.opened ? b.body : b.head }.join
-      @stack.each { |b| b.opened = true }
-      prefix + line.rstrip
-    end
-    @stack.pop
-    (lines + [""]).join("\n")
-  end
-
-  def is_valid_href?(href)
-    href.present? && (href.start_with?("http") || href.start_with?("www."))
-  end
-
-  def is_valid_src?(src)
-    return false if src.blank?
-    return true  if @opts[:keep_cid_imgs] && src.start_with?("cid:")
-    src.start_with?("http") || src.start_with?("www.")
-  end
-
-  def is_visible_img?(img)
-    return false if img["width"].present?  && img["width"].to_i == 0
-    return false if img["height"].present? && img["height"].to_i == 0
-    return false if img["style"].present?  && img["style"][/(width|height)\s*:\s*0/]
-    true
+    node.text
   end
 
 end
diff --git a/spec/components/html_to_markdown_spec.rb b/spec/components/html_to_markdown_spec.rb
index 266e875aca..3d19c66f9a 100644
--- a/spec/components/html_to_markdown_spec.rb
+++ b/spec/components/html_to_markdown_spec.rb
@@ -10,7 +10,7 @@ describe HtmlToMarkdown do
   end
 
   it "remove whitespaces" do
-    expect(html_to_markdown(<<-HTML
+    html = <<-HTML
       <div dir="auto">Hello,
         <div dir="auto"><br></div>
         <div dir="auto">&nbsp; &nbsp; This is the 1st paragraph.&nbsp; &nbsp; </div>
@@ -20,11 +20,54 @@ describe HtmlToMarkdown do
         </div>
       </div>
     HTML
-    )).to eq("Hello,\n\nThis is the 1st paragraph.\n\nThis is another paragraph")
+
+    expect(html_to_markdown(html)).to eq("Hello,\n\nThis is the 1st paragraph.\n\nThis is another paragraph")
+
+    html = <<~HTML
+      <body text="#000000" bgcolor="#FFFFFF">
+          <p>Let me see if it happens by answering your message through
+            Thunderbird.</p>
+          <p>Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1
+            Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1
+            Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1
+            Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1
+            Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1
+            Long sentence 1
+          </p>
+      </body>
+    HTML
+
+    markdown = <<~MD
+       Let me see if it happens by answering your message through Thunderbird.
+
+       Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1 Long sentence 1
+    MD
+
+    expect(html_to_markdown(html)).to eq(markdown.strip)
+
+    html = <<~HTML
+      <p>    This     post
+            has             lots<br>           of
+                  space
+      </p>
+      <pre>    This     space    was   left untouched     !</pre>
+    HTML
+
+    markdown = <<~MD
+      This post has lots
+      of space
+
+      ```
+          This     space    was   left untouched     !
+      ```
+    MD
+
+    expect(html_to_markdown(html)).to eq(markdown.strip)
   end
 
   it "skips hidden tags" do
     expect(html_to_markdown(%Q{<p>Hello <span style="display: none">cruel </span>World!</p>})).to eq("Hello World!")
+    expect(html_to_markdown(%Q{<p>Hello <span hidden>cruel </span>World!</p>})).to eq("Hello World!")
   end
 
   it "converts <strong>" do
@@ -37,13 +80,15 @@ describe HtmlToMarkdown do
     expect(html_to_markdown("<b>B*ld</b>")).to eq("__B*ld__")
 
     html = <<~HTML
+      Before
       <p><b>Bold
       <br>
       <br>
       </b>
       </p>
+      After
     HTML
-    expect(html_to_markdown(html)).to eq("**Bold**")
+    expect(html_to_markdown(html)).to eq("Before\n\n**Bold**\n\nAfter")
   end
 
   it "converts <em>" do
@@ -60,6 +105,11 @@ describe HtmlToMarkdown do
     expect(html_to_markdown(%Q{<a href="https://www.discourse.org">Discourse</a>})).to eq("[Discourse](https://www.discourse.org)")
   end
 
+  it "supports SiteSetting.allowed_href_schemes" do
+    SiteSetting.allowed_href_schemes = "tel|steam"
+    expect(html_to_markdown(%Q{<a href="steam://store/48000">LIMBO</a>})).to eq("[LIMBO](steam://store/48000)")
+  end
+
   it "removes empty & invalid <a>" do
     expect(html_to_markdown(%Q{<a>Discourse</a>})).to eq("Discourse")
     expect(html_to_markdown(%Q{<a href="">Discourse</a>})).to eq("Discourse")
@@ -67,7 +117,7 @@ describe HtmlToMarkdown do
   end
 
   HTML_WITH_IMG     ||= %Q{<img src="https://www.discourse.org/logo.svg" alt="Discourse Logo">}
-  HTML_WITH_CID_IMG ||= %Q{<img src="cid:ii_1525434659ddb4cb" alt="Discourse Logo">}
+  HTML_WITH_CID_IMG ||= %Q{<img src="cid:ii_1525434659ddb4cb" title="Discourse Logo">}
 
   it "converts <img>" do
     expect(html_to_markdown(HTML_WITH_IMG)).to eq("![Discourse Logo](https://www.discourse.org/logo.svg)")
@@ -84,8 +134,7 @@ describe HtmlToMarkdown do
   end
 
   it "keeps <img> with src='cid:' whith 'keep_cid_imgs'" do
-    expect(html_to_markdown(HTML_WITH_CID_IMG, keep_cid_imgs: true)).to eq("![Discourse Logo](cid:ii_1525434659ddb4cb)")
-    expect(html_to_markdown(HTML_WITH_CID_IMG, keep_img_tags: true, keep_cid_imgs: true)).to eq("<img src=\"cid:ii_1525434659ddb4cb\" alt=\"Discourse Logo\">")
+    expect(html_to_markdown(HTML_WITH_CID_IMG, keep_cid_imgs: true)).to eq(HTML_WITH_CID_IMG)
   end
 
   it "skips hidden <img>" do
@@ -95,6 +144,12 @@ describe HtmlToMarkdown do
     expect(html_to_markdown(%Q{<img src="https://www.discourse.org/logo.svg" style="height:0px">})).to eq("")
   end
 
+  it "supports width/height on <img>" do
+    expect(html_to_markdown(%Q{<img src="https://www.discourse.org/logo.svg" height=100>})).to eq("![](https://www.discourse.org/logo.svg)")
+    expect(html_to_markdown(%Q{<img src="https://www.discourse.org/logo.svg" width=200>})).to eq("![](https://www.discourse.org/logo.svg)")
+    expect(html_to_markdown(%Q{<img src="https://www.discourse.org/logo.svg" height=100 width=200>})).to eq("![|200x100](https://www.discourse.org/logo.svg)")
+  end
+
   (1..6).each do |n|
     it "converts <h#{n}>" do
       expect(html_to_markdown("<h#{n}>Header #{n}</h#{n}>")).to eq("#" * n + " Header #{n}")
@@ -150,11 +205,11 @@ describe HtmlToMarkdown do
   end
 
   it "supports <s>" do
-    expect(html_to_markdown("<s>Strike Through</s>")).to eq("<s>Strike Through</s>")
+    expect(html_to_markdown("<s>Strike Through</s>")).to eq("~~Strike Through~~")
   end
 
   it "supports <strike>" do
-    expect(html_to_markdown("<strike>Strike Through</strike>")).to eq("<strike>Strike Through</strike>")
+    expect(html_to_markdown("<strike>Strike Through</strike>")).to eq("~~Strike Through~~")
   end
 
   it "supports <blockquote>" do
@@ -221,11 +276,11 @@ describe HtmlToMarkdown do
 
   it "handles <p>" do
     expect(html_to_markdown("<p>1st paragraph</p><p>2nd paragraph</p>")).to eq("1st paragraph\n\n2nd paragraph")
-    expect(html_to_markdown("<body><p>1st paragraph</p>\n    <p>    2nd paragraph\n    2nd paragraph</p>\n<p>3rd paragraph</p></body>")).to eq("1st paragraph\n\n2nd paragraph\n2nd paragraph\n\n3rd paragraph")
+    expect(html_to_markdown("<body><p>1st paragraph</p>\n    <p>    2nd paragraph\n    2nd paragraph</p>\n<p>3rd paragraph</p></body>")).to eq("1st paragraph\n\n2nd paragraph 2nd paragraph\n\n3rd paragraph")
   end
 
   it "handles <div>" do
-    expect(html_to_markdown("<div>1st div</div><div>2nd div</div>")).to eq("1st div\n\n2nd div")
+    expect(html_to_markdown("<div>1st div</div><div>2nd div</div>")).to eq("1st div\n2nd div")
   end
 
   it "swallows <span>" do
@@ -257,15 +312,19 @@ describe HtmlToMarkdown do
   context "with an oddly placed <br>" do
 
     it "handles <strong>" do
-      expect(html_to_markdown("<strong><br>Bold</strong>")).to eq("**Bold**")
-      expect(html_to_markdown("<strong>Bold<br></strong>")).to eq("**Bold**")
-      expect(html_to_markdown("<strong>Bold<br>text</strong>")).to eq("**Bold\ntext**")
+      expect(html_to_markdown("Hello <strong><br>Bold</strong> World")).to eq("Hello\n**Bold** World")
+      expect(html_to_markdown("Hello <strong>Bold<br></strong> World")).to eq("Hello **Bold**\nWorld")
+      expect(html_to_markdown("Hello <strong>Bold<br>text</strong> World")).to eq("Hello **Bold**\n**text** World")
     end
 
     it "handles <em>" do
-      expect(html_to_markdown("<em><br>Italic</em>")).to eq("*Italic*")
-      expect(html_to_markdown("<em>Italic<br></em>")).to eq("*Italic*")
-      expect(html_to_markdown("<em>Italic<br>text</em>")).to eq("*Italic\ntext*")
+      expect(html_to_markdown("Hello <em><br>Italic</em> World")).to eq("Hello\n*Italic* World")
+      expect(html_to_markdown("Hello <em>Italic<br></em> World")).to eq("Hello *Italic*\nWorld")
+      expect(html_to_markdown("Hello <em>Italic<br>text</em> World")).to eq("Hello *Italic*\n*text* World")
+    end
+
+    it "works" do
+      expect(html_to_markdown("<div>A <b> B <i> C <br> D </i> E <br> F </b> G</div>")).to eq("A __B *C*__\n__*D* E__\n**F** G")
     end
 
   end
@@ -314,4 +373,64 @@ describe HtmlToMarkdown do
 
   end
 
+  it "supoorts <table>" do
+    html = <<~HTML
+      <table>
+        <thead>
+          <tr>
+            <th>This</th>
+            <th>is</th>
+            <th>the</th>
+            <th><i>headers</i></th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>I am</td>
+            <td>the</td>
+            <td><b>first</b></td>
+            <td>row</td>
+          </tr>
+          <tr>
+            <td>And this</td>
+            <td>is the</td>
+            <td>2<sup>nd</sup></td>
+            <td>line</td>
+          </tr>
+        </tbody>
+      </table>
+    HTML
+
+    markdown = <<~MD
+      | This | is | the | *headers* |
+      | - | - | - | - |
+      | I am | the | **first** | row |
+      | And this | is the | 2<sup>nd</sup> | line |
+    MD
+
+    expect(html_to_markdown(html)).to eq(markdown.strip)
+
+    expect(html_to_markdown("<table><tr><td>Hello</td><td>World</td></tr></table>")).to eq("| Hello | World |\n| - | - |")
+  end
+
+  it "doesn't swallow badly formatted <table>" do
+    html = <<~HTML
+      <table>
+        <tr>
+          <th>1</th>
+          <th>2</th>
+          <th>3</th>
+          <th>4</th>
+        </tr>
+        <tr>
+          <td>One</td>
+          <td>Two</td>
+          <td>Three</td>
+        </tr>
+      </table>
+    HTML
+
+    expect(html_to_markdown(html)).to eq("1 2 3 4 \nOne Two Three")
+  end
+
 end

From 7ef8f7bb7c5ed939564fa068e62f5f05a3e1e66d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 30 Apr 2020 14:28:34 +0200
Subject: [PATCH 0885/1830] DEV: adds documentation about caret option of
 widget dropdown (#9596)

---
 app/assets/javascripts/discourse/app/widgets/widget-dropdown.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
index 8fe72d3e33..0b26f8d727 100644
--- a/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
+++ b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
@@ -49,6 +49,7 @@ import hbs from "discourse/widgets/hbs-compiler";
     - options: accepts a hash of optional attributes
       - headerClass: adds css class to the dropdown header
       - bodyClass: adds css class to the dropdown header
+      - caret: adds a caret to visually enforce this is a dropdown
 */
 
 export const WidgetDropdownHeaderClass = {

From 0d84f3afd4f7e44d326357f1f53ed3b9c1033521 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 30 Apr 2020 14:36:21 +0200
Subject: [PATCH 0886/1830] UX: adds title attribute to widget dropdown header
 (#9597)

---
 .../discourse/app/widgets/widget-dropdown.js       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
index 0b26f8d727..dbb34a5e64 100644
--- a/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
+++ b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
@@ -56,9 +56,11 @@ export const WidgetDropdownHeaderClass = {
   tagName: "button",
 
   transform(attrs) {
-    return {
-      label: attrs.translatedLabel ? attrs.translatedLabel : I18n.t(attrs.label)
-    };
+    return { label: this._buildLabel(attrs) };
+  },
+
+  buildAttributes(attrs) {
+    return { title: this._buildLabel(attrs) };
   },
 
   buildClasses(attrs) {
@@ -85,7 +87,11 @@ export const WidgetDropdownHeaderClass = {
     {{#if attrs.caret}}
       {{d-icon "caret-down"}}
     {{/if}}
-  `
+  `,
+
+  _buildLabel(attrs) {
+    return attrs.translatedLabel ? attrs.translatedLabel : I18n.t(attrs.label);
+  }
 };
 
 createWidget("widget-dropdown-header", WidgetDropdownHeaderClass);

From 45f704906d4accb39f08c5a7ba4bcf2025e0f23e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 30 Apr 2020 16:02:38 +0200
Subject: [PATCH 0887/1830] UX: display info about extra files and uploader
 (#9595)

Co-authored-by: David Taylor <david@taylorhq.com>
---
 .../admin-customize-themes-show.js            |  1 +
 .../admin/templates/customize-themes-show.hbs | 27 +++++++++++++++++++
 config/locales/client.en.yml                  |  4 +++
 3 files changed, 32 insertions(+)

diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
index 006f1728da..5440c4260a 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
@@ -31,6 +31,7 @@ export default Controller.extend({
   availableComponentsNames: mapBy("availableChildThemes", "name"),
   availableActiveComponentsNames: mapBy("availableActiveChildThemes", "name"),
   childThemesNames: mapBy("model.childThemes", "name"),
+  extraFiles: filterBy("model.theme_fields", "target", "extra_js"),
 
   @discourseComputed("model.editedFields")
   editedFieldsFormatted() {
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 9f46d47d69..828eee4c5b 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -126,6 +126,15 @@
         </span>
       {{/if}}
     </div>
+  {{else}}
+    <div class="control-unit">
+      <span class="heading">{{i18n "admin.customize.theme.creator"}}</span>
+      <span>
+        {{#user-link user=model.user}}
+          {{format-username model.user.username}}
+        {{/user-link}}
+      </span>
+    </div>
   {{/if}}
 
   {{#unless model.component}}
@@ -219,6 +228,24 @@
     {{#d-button action=(action "addUploadModal") class="btn-default" icon="plus"}}{{i18n "admin.customize.theme.add"}}{{/d-button}}
   </div>
 
+  {{#if extraFiles.length}}
+    <div class="control-unit">
+      <div class="mini-title">{{i18n "admin.customize.theme.extra_files"}}</div>
+      <div class="description">
+        {{#if model.remote_theme}}
+          {{i18n "admin.customize.theme.extra_files_remote"}}
+        {{else}}
+          {{i18n "admin.customize.theme.extra_files_upload"}}
+        {{/if}}
+      </div>
+      <ul>
+        {{#each extraFiles as |extraFile|}}
+          <li>{{extraFile.name}}</li>
+        {{/each}}
+      </ul>
+    </div>
+  {{/if}}
+
   {{#if hasSettings}}
     <div class="control-unit">
       <div class="mini-title">{{i18n "admin.customize.theme.theme_settings"}}</div>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 61a29cb70e..2df4bdc6ba 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3759,6 +3759,9 @@ en:
           settings: "Settings"
           translations: "Translations"
           extra_scss: "Extra SCSS"
+          extra_files: "Extra files"
+          extra_files_upload: "Export theme to view these files."
+          extra_files_remote: "Export theme or check the git repository to view these files."
           preview: "Preview"
           show_advanced: "Show advanced fields"
           hide_advanced: "Hide advanced fields"
@@ -3822,6 +3825,7 @@ en:
           license: "License"
           version: "Version:"
           authors: "Authored by:"
+          creator: "Created by:"
           source_url: "Source"
           enable: "Enable"
           disable: "Disable"

From 08e4af663621cc11cad8d6979057e73290cfa7d1 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Wed, 29 Apr 2020 19:04:59 -0300
Subject: [PATCH 0888/1830] FEATURE: Add setting to controle the Expect header
 on S3 calls

Some providers don't implement the Expect: 100-continue support,
which results in a mismatch in the object signature.

With this settings, users can disable the header and use such providers.
---
 config/discourse_defaults.conf | 1 +
 config/site_settings.yml       | 3 +++
 lib/s3_helper.rb               | 1 +
 3 files changed, 5 insertions(+)

diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf
index 0a4eb66dd7..4adfdca7e9 100644
--- a/config/discourse_defaults.conf
+++ b/config/discourse_defaults.conf
@@ -196,6 +196,7 @@ s3_secret_access_key =
 s3_use_iam_profile =
 s3_cdn_url =
 s3_endpoint =
+s3_http_continue_timeout =
 
 ### rate limits apply to all sites
 max_user_api_reqs_per_minute = 20
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 2a0733c75a..ef0fea4998 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1202,6 +1202,9 @@ files:
   s3_endpoint:
     default: ""
     regex: '^https?:\/\/.+[^\/]$'
+  s3_http_continue_timeout:
+    default: 1
+    hidden: true
   s3_cdn_url:
     default: ""
     regex: '^https?:\/\/.+[^\/]$'
diff --git a/lib/s3_helper.rb b/lib/s3_helper.rb
index ccc0da333a..ef3bc7dee1 100644
--- a/lib/s3_helper.rb
+++ b/lib/s3_helper.rb
@@ -204,6 +204,7 @@ class S3Helper
     }
 
     opts[:endpoint] = SiteSetting.s3_endpoint if SiteSetting.s3_endpoint.present?
+    opts[:http_continue_timeout] = SiteSetting.s3_http_continue_timeout
 
     unless obj.s3_use_iam_profile
       opts[:access_key_id] = obj.s3_access_key_id

From c092370847e91f5b7f752382cfc053198ddfec13 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 30 Apr 2020 11:14:34 -0400
Subject: [PATCH 0889/1830] Build(deps-dev): Bump rb-fsevent from 0.10.3 to
 0.10.4 (#9599)

Bumps [rb-fsevent](https://github.com/thibaudgg/rb-fsevent) from 0.10.3 to 0.10.4.
- [Release notes](https://github.com/thibaudgg/rb-fsevent/releases)
- [Commits](https://github.com/thibaudgg/rb-fsevent/compare/0.10.3...v0.10.4)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index b428497657..8347dc5d4c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -292,7 +292,7 @@ GEM
     rake (13.0.1)
     rake-compiler (1.1.0)
       rake
-    rb-fsevent (0.10.3)
+    rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbtrace (0.4.12)

From 71241a50f77349e5159d695d22ca73224043a55d Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 30 Apr 2020 20:59:33 +0530
Subject: [PATCH 0890/1830] DEV: improve code readability & add tests for user
 guardian.

a511bea4cc3f50bd1e067a46bdbf5cd19eb335a3
---
 .../modals/admin-merge-users-confirmation.js  | 22 ++++++++++--------
 .../modals/admin-merge-users-prompt.js        | 17 +++++++-------
 .../javascripts/admin/models/admin-user.js    | 14 +++++------
 .../modal/admin-merge-users-confirmation.hbs  |  4 ++--
 .../modal/admin-merge-users-prompt.hbs        |  4 ++--
 app/controllers/admin/users_controller.rb     |  7 ++++--
 config/locales/client.en.yml                  |  1 +
 .../components/guardian/user_guardian_spec.rb | 23 +++++++++++++++++++
 8 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js b/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js
index 2195c29631..91dbe7d072 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js
+++ b/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js
@@ -2,6 +2,7 @@ import Controller, { inject as controller } from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias } from "@ember/object/computed";
+import { action } from "@ember/object";
 
 export default Controller.extend(ModalFunctionality, {
   adminUserIndex: controller(),
@@ -14,7 +15,10 @@ export default Controller.extend(ModalFunctionality, {
 
   @discourseComputed("username", "targetUsername")
   text(username, targetUsername) {
-    return `transfer @${username} to @${targetUsername}`;
+    return I18n.t(`admin.user.merge.confirmation.text`, {
+      username,
+      targetUsername
+    });
   },
 
   @discourseComputed("value", "text")
@@ -22,14 +26,14 @@ export default Controller.extend(ModalFunctionality, {
     return !value || text !== value;
   },
 
-  actions: {
-    merge() {
-      this.adminUserIndex.send("merge", this.targetUsername);
-      this.send("closeModal");
-    },
+  @action
+  confirm() {
+    this.adminUserIndex.send("merge", this.targetUsername);
+    this.send("closeModal");
+  },
 
-    cancel() {
-      this.send("closeModal");
-    }
+  @action
+  close() {
+    this.send("closeModal");
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-merge-users-prompt.js b/app/assets/javascripts/admin/controllers/modals/admin-merge-users-prompt.js
index 535870cd6f..28fd6058e4 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-merge-users-prompt.js
+++ b/app/assets/javascripts/admin/controllers/modals/admin-merge-users-prompt.js
@@ -2,6 +2,7 @@ import Controller, { inject as controller } from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias } from "@ember/object/computed";
+import { action } from "@ember/object";
 
 export default Controller.extend(ModalFunctionality, {
   adminUserIndex: controller(),
@@ -16,14 +17,14 @@ export default Controller.extend(ModalFunctionality, {
     return !targetUsername || username === targetUsername;
   },
 
-  actions: {
-    merge() {
-      this.send("closeModal");
-      this.adminUserIndex.send("showMergeConfirmation", this.targetUsername);
-    },
+  @action
+  showConfirmation() {
+    this.send("closeModal");
+    this.adminUserIndex.send("showMergeConfirmation", this.targetUsername);
+  },
 
-    cancel() {
-      this.send("closeModal");
-    }
+  @action
+  close() {
+    this.send("closeModal");
   }
 });
diff --git a/app/assets/javascripts/admin/models/admin-user.js b/app/assets/javascripts/admin/models/admin-user.js
index 454daf4b19..1ddb7a52ff 100644
--- a/app/assets/javascripts/admin/models/admin-user.js
+++ b/app/assets/javascripts/admin/models/admin-user.js
@@ -5,7 +5,7 @@ import { ajax } from "discourse/lib/ajax";
 import { propertyNotEqual } from "discourse/lib/computed";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Group from "discourse/models/group";
-import { userPath } from "discourse/lib/url";
+import DiscourseURL, { userPath } from "discourse/lib/url";
 import { Promise } from "rsvp";
 import User from "discourse/models/user";
 
@@ -514,16 +514,16 @@ const AdminUser = User.extend({
       formData["target_username"] = opts.targetUsername;
     }
 
-    return ajax(`/admin/users/${user.get("id")}/merge.json`, {
+    return ajax(`/admin/users/${user.id}/merge.json`, {
       type: "POST",
       data: formData
     })
-      .then(function(data) {
+      .then(data => {
         if (data.merged) {
           if (/^\/admin\/users\/list\//.test(location)) {
-            document.location = location;
+            DiscourseURL.redirectTo(location);
           } else {
-            document.location = Discourse.getURL(
+            DiscourseURL.redirectTo(
               `/admin/users/${data.user.id}/${data.user.username}`
             );
           }
@@ -534,8 +534,8 @@ const AdminUser = User.extend({
           }
         }
       })
-      .catch(function() {
-        AdminUser.find(user.get("id")).then(u => user.setProperties(u));
+      .catch(() => {
+        AdminUser.find(user.id).then(u => user.setProperties(u));
         bootbox.alert(I18n.t("admin.user.merge_failed"));
       });
   },
diff --git a/app/assets/javascripts/admin/templates/modal/admin-merge-users-confirmation.hbs b/app/assets/javascripts/admin/templates/modal/admin-merge-users-confirmation.hbs
index 119cd3ad08..b2522607b5 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-merge-users-confirmation.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-merge-users-confirmation.hbs
@@ -7,14 +7,14 @@
   <div class="modal-footer">
     {{#d-button
       class="btn-danger"
-      action=(action "merge")
+      action=(action "confirm")
       icon="trash-alt"
       disabled=mergeDisabled
     }}
       {{i18n "admin.user.merge.confirmation.transfer_and_delete" username=username}}
     {{/d-button}}
     {{d-button
-      action=(action "cancel")
+      action=(action "close")
       label="admin.user.merge.confirmation.cancel"
     }}
   </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-merge-users-prompt.hbs b/app/assets/javascripts/admin/templates/modal/admin-merge-users-prompt.hbs
index 69bdd69403..71f7a404bc 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-merge-users-prompt.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-merge-users-prompt.hbs
@@ -10,14 +10,14 @@
   <div class="modal-footer">
     {{#d-button
       class="btn-primary"
-      action=(action "merge")
+      action=(action "showConfirmation")
       icon="trash-alt"
       disabled=mergeDisabled
     }}
       {{i18n "admin.user.merge.prompt.transfer_and_delete" username=username}}
     {{/d-button}}
     {{d-button
-      action=(action "cancel")
+      action=(action "close")
       label="admin.user.merge.prompt.cancel"
     }}
   </div>
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 8902781834..c4923ec2c6 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -475,13 +475,16 @@ class Admin::UsersController < Admin::AdminController
   def merge
     target_username = params.require(:target_username)
     target_user = User.find_by_username(target_username)
+    raise Discourse::NotFound if target_user.blank?
 
     guardian.ensure_can_merge_users!(@user, target_user)
+    serializer_opts = { root: false, scope: guardian }
 
     if user = UserMerger.new(@user, target_user, current_user).merge!
-      render json: success_json.merge(merged: true, user: user)
+      user_json = AdminDetailedUserSerializer.new(user, serializer_opts).as_json
+      render json: success_json.merge(merged: true, user: user_json)
     else
-      render json: failed_json.merge(user: AdminDetailedUserSerializer.new(@user, root: false).as_json)
+      render json: failed_json.merge(user: AdminDetailedUserSerializer.new(@user, serializer_opts).as_json)
     end
   end
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 2df4bdc6ba..5674db7648 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4363,6 +4363,7 @@ en:
 
               <p>To continue type: <code>%{text}</code></p>
 
+            text: "transfer @%{username} to @%{targetUsername}"
             transfer_and_delete: "Transfer & Delete @%{username}"
             cancel: "Cancel"
 
diff --git a/spec/components/guardian/user_guardian_spec.rb b/spec/components/guardian/user_guardian_spec.rb
index b25f563e01..b812fa9526 100644
--- a/spec/components/guardian/user_guardian_spec.rb
+++ b/spec/components/guardian/user_guardian_spec.rb
@@ -342,6 +342,29 @@ describe UserGuardian do
     end
   end
 
+  describe "#can_merge_user?" do
+    shared_examples "can_merge_user examples" do
+      it "isn't allowed if user is a staff" do
+        staff = Fabricate(:moderator)
+        expect(guardian.can_merge_user?(staff)).to eq(false)
+      end
+    end
+
+    context "for moderators" do
+      let(:guardian) { Guardian.new(moderator) }
+      include_examples "can_merge_user examples"
+
+      it "isn't allowed if current_user is not an admin" do
+        expect(guardian.can_merge_user?(user)).to eq(false)
+      end
+    end
+
+    context "for admins" do
+      let(:guardian) { Guardian.new(admin) }
+      include_examples "can_merge_user examples"
+    end
+  end
+
   describe "#can_see_review_queue?" do
     it 'returns true when the user is a staff member' do
       guardian = Guardian.new(moderator)

From 1b2db44678c20817a229b814f10b82fcf6634ca4 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 30 Apr 2020 17:31:04 +0200
Subject: [PATCH 0891/1830] FEATURE: allows to limit visible reports and tabs
 in dashboard (#9598)

---
 .../admin/components/admin-report.js          |  17 +-
 .../controllers/admin-dashboard-general.js    |  37 +-
 .../controllers/admin-dashboard-moderation.js |  11 +
 .../controllers/admin-dashboard-reports.js    |  14 +-
 .../admin/controllers/admin-dashboard.js      |  22 +-
 .../templates/components/admin-report.hbs     | 366 +++++++++---------
 .../javascripts/admin/templates/dashboard.hbs |  39 +-
 .../admin/templates/dashboard_general.hbs     | 182 ++++-----
 .../admin/templates/dashboard_moderation.hbs  |  40 +-
 config/locales/server.en.yml                  |   2 +
 config/site_settings.yml                      |  16 +
 test/javascripts/acceptance/dashboard-test.js |  46 ++-
 12 files changed, 478 insertions(+), 314 deletions(-)

diff --git a/app/assets/javascripts/admin/components/admin-report.js b/app/assets/javascripts/admin/components/admin-report.js
index 97db7c9df7..757a90a7db 100644
--- a/app/assets/javascripts/admin/components/admin-report.js
+++ b/app/assets/javascripts/admin/components/admin-report.js
@@ -1,6 +1,6 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { makeArray } from "discourse-common/lib/helpers";
-import { alias, or, and, equal, notEmpty } from "@ember/object/computed";
+import { alias, or, and, equal, notEmpty, not } from "@ember/object/computed";
 import EmberObject, { computed, action } from "@ember/object";
 import { next } from "@ember/runloop";
 import Component from "@ember/component";
@@ -41,7 +41,12 @@ function collapseWeekly(data, average) {
 }
 
 export default Component.extend({
-  classNameBindings: ["isEnabled", "isLoading", "dasherizedDataSourceName"],
+  classNameBindings: [
+    "isVisible",
+    "isEnabled",
+    "isLoading",
+    "dasherizedDataSourceName"
+  ],
   classNames: ["admin-report"],
   isEnabled: true,
   disabledLabel: I18n.t("admin.dashboard.disabled"),
@@ -63,6 +68,7 @@ export default Component.extend({
   showDatesOptions: alias("model.dates_filtering"),
   showRefresh: or("showDatesOptions", "model.available_filters.length"),
   shouldDisplayTrend: and("showTrend", "model.prev_period"),
+  isVisible: not("isHidden"),
 
   init() {
     this._super(...arguments);
@@ -70,6 +76,13 @@ export default Component.extend({
     this._reports = [];
   },
 
+  isHidden: computed("siteSettings.dashboard_hidden_reports", function() {
+    return (this.siteSettings.dashboard_hidden_reports || "")
+      .split("|")
+      .filter(Boolean)
+      .includes(this.dataSourceName);
+  }),
+
   startDate: computed("filters.startDate", function() {
     if (this.filters && isPresent(this.filters.startDate)) {
       return moment(this.filters.startDate, "YYYY-MM-DD");
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js
index b77e3e0288..5f2ea86819 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js
@@ -23,9 +23,44 @@ export default Controller.extend(PeriodComputationMixin, {
 
   @discourseComputed("siteSettings.dashboard_general_tab_activity_metrics")
   activityMetrics(metrics) {
-    return (metrics || "").split("|").filter(m => m);
+    return (metrics || "").split("|").filter(Boolean);
   },
 
+  hiddenReports: computed("siteSettings.dashboard_hidden_reports", function() {
+    return (this.siteSettings.dashboard_hidden_reports || "")
+      .split("|")
+      .filter(Boolean);
+  }),
+
+  isActivityMetricsVisible: computed(
+    "activityMetrics",
+    "hiddenReports",
+    function() {
+      return (
+        this.activityMetrics.length &&
+        this.activityMetrics.some(x => !this.hiddenReports.includes(x))
+      );
+    }
+  ),
+
+  isSearchReportsVisible: computed("hiddenReports", function() {
+    return ["top_referred_topics", "trending_search"].some(
+      x => !this.hiddenReports.includes(x)
+    );
+  }),
+
+  isCommunityHealthVisible: computed("hiddenReports", function() {
+    return [
+      "consolidated_page_views",
+      "signups",
+      "topics",
+      "posts",
+      "dau_by_mau",
+      "daily_engaged_users",
+      "new_contributors"
+    ].some(x => !this.hiddenReports.includes(x));
+  }),
+
   @discourseComputed
   activityMetricsFilters() {
     return {
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js b/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js
index 8925825fba..95f820b598 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js
@@ -1,6 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
 import PeriodComputationMixin from "admin/mixins/period-computation";
+import { computed } from "@ember/object";
 
 export default Controller.extend(PeriodComputationMixin, {
   @discourseComputed
@@ -13,6 +14,16 @@ export default Controller.extend(PeriodComputationMixin, {
     };
   },
 
+  isModeratorsActivityVisible: computed(
+    "siteSettings.dashboard_hidden_reports",
+    function() {
+      return !(this.siteSettings.dashboard_hidden_reports || "")
+        .split("|")
+        .filter(Boolean)
+        .includes("moderators_activity");
+    }
+  ),
+
   @discourseComputed
   userFlaggingRatioOptions() {
     return {
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js b/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js
index d6e15496f7..c096c3e763 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js
@@ -8,17 +8,27 @@ const { get } = Ember;
 export default Controller.extend({
   filter: null,
 
-  @discourseComputed("model.[]", "filter")
+  @discourseComputed(
+    "model.[]",
+    "filter",
+    "siteSettings.dashboard_hidden_reports"
+  )
   filterReports(reports, filter) {
     if (filter) {
       filter = filter.toLowerCase();
-      return reports.filter(report => {
+      reports = reports.filter(report => {
         return (
           (get(report, "title") || "").toLowerCase().indexOf(filter) > -1 ||
           (get(report, "description") || "").toLowerCase().indexOf(filter) > -1
         );
       });
     }
+
+    const hiddenReports = (this.siteSettings.dashboard_hidden_reports || "")
+      .split("|")
+      .filter(Boolean);
+    reports = reports.filter(report => !hiddenReports.includes(report.type));
+
     return reports;
   },
 
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js b/app/assets/javascripts/admin/controllers/admin-dashboard.js
index bd8561abc1..5946a1736d 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard.js
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard.js
@@ -1,7 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import { inject } from "@ember/controller";
-import Controller from "@ember/controller";
+import Controller, { inject } from "@ember/controller";
 import { setting } from "discourse/lib/computed";
+import { computed } from "@ember/object";
 import AdminDashboard from "admin/models/admin-dashboard";
 import VersionCheck from "admin/models/version-check";
 
@@ -18,6 +18,24 @@ export default Controller.extend({
     return this.currentUser.get("admin") && (problemsLength || 0) > 0;
   },
 
+  visibleTabs: computed("siteSettings.dashboard_visible_tabs", function() {
+    return (this.siteSettings.dashboard_visible_tabs || "")
+      .split("|")
+      .filter(Boolean);
+  }),
+
+  isModerationTabVisible: computed("visibleTabs", function() {
+    return this.visibleTabs.includes("moderation");
+  }),
+
+  isSecurityTabVisible: computed("visibleTabs", function() {
+    return this.visibleTabs.includes("security");
+  }),
+
+  isReportsTabVisible: computed("visibleTabs", function() {
+    return this.visibleTabs.includes("reports");
+  }),
+
   fetchProblems() {
     if (this.isLoadingProblems) return;
 
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index ee375ac6ff..be075dbd2d 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -1,195 +1,197 @@
-{{#if isEnabled}}
-  {{#conditional-loading-section isLoading=isLoading}}
-    {{#if showHeader}}
-      <div class="header">
-        {{#if showTitle}}
-          <ul class="breadcrumb">
-            {{#if showAllReportsLink}}
-              <li class="item all-reports">
-                {{#link-to "admin.dashboardReports" class="report-url"}}
-                  {{i18n "admin.dashboard.all_reports"}}
-                {{/link-to}}
-              </li>
+{{#unless isHidden}}
+  {{#if isEnabled}}
+    {{#conditional-loading-section isLoading=isLoading}}
+      {{#if showHeader}}
+        <div class="header">
+          {{#if showTitle}}
+            <ul class="breadcrumb">
+              {{#if showAllReportsLink}}
+                <li class="item all-reports">
+                  {{#link-to "admin.dashboardReports" class="report-url"}}
+                    {{i18n "admin.dashboard.all_reports"}}
+                  {{/link-to}}
+                </li>
+
+                {{#unless showNotFoundError}}
+                  <li class="item separator">|</li>
+                {{/unless}}
+              {{/if}}
 
               {{#unless showNotFoundError}}
-                <li class="item separator">|</li>
-              {{/unless}}
-            {{/if}}
-
-            {{#unless showNotFoundError}}
-              <li class="item report">
-                <a href={{model.reportUrl}} class="report-url">
-                  {{model.title}}
-                </a>
-
-                {{#if model.description}}
-                  {{#if model.description_link}}
-                    <a target="_blank" rel="noopener noreferrer" href={{model.description_link}} class="info" data-tooltip={{model.description}}>
-                      {{d-icon "question-circle"}}
-                    </a>
-                  {{else}}
-                    <span class="info" data-tooltip={{model.description}}>
-                      {{d-icon "question-circle"}}
-                    </span>
-                  {{/if}}
-                {{/if}}
-              </li>
-            {{/unless}}
-          </ul>
-        {{/if}}
-
-        {{#if shouldDisplayTrend}}
-          <div class="trend {{model.trend}}">
-            <span class="value" title={{model.trendTitle}}>
-              {{#if model.average}}
-                {{number model.currentAverage}}{{#if model.percent}}%{{/if}}
-              {{else}}
-                {{number model.currentTotal noTitle="true"}}{{#if model.percent}}%{{/if}}
-              {{/if}}
-
-              {{#if model.trendIcon}}
-                {{d-icon model.trendIcon class="icon"}}
-              {{/if}}
-            </span>
-          </div>
-        {{/if}}
-      </div>
-    {{/if}}
-
-    <div class="body">
-      <div class="main">
-        {{#if showError}}
-          {{#if showTimeoutError}}
-            <div class="alert alert-error report-alert timeout">
-              {{d-icon "exclamation-triangle"}}
-              <span>{{i18n "admin.dashboard.timeout_error"}}</span>
-            </div>
-          {{/if}}
-
-          {{#if showExceptionError}}
-            <div class="alert alert-error report-alert exception">
-              {{d-icon "exclamation-triangle"}}
-              <span>{{i18n "admin.dashboard.exception_error"}}</span>
-            </div>
-          {{/if}}
-
-          {{#if showNotFoundError}}
-            <div class="alert alert-error report-alert not-found">
-              {{d-icon "exclamation-triangle"}}
-              <span>{{i18n "admin.dashboard.not_found_error"}}</span>
-            </div>
-          {{/if}}
-        {{else}}
-          {{#if hasData}}
-            {{#if currentMode}}
-              {{component modeComponent model=model options=options}}
-
-              {{#if model.relatedReport}}
-                {{admin-report showFilteringUI=false dataSourceName=model.relatedReport.type}}
-              {{/if}}
-            {{/if}}
-          {{else}}
-            {{#if rateLimitationString}}
-              <div class="alert alert-error report-alert rate-limited">
-                {{d-icon "thermometer-three-quarters"}}
-                <span>{{rateLimitationString}}</span>
-              </div>
-            {{else}}
-              <div class="alert alert-info report-alert no-data">
-                {{d-icon "chart-pie"}}
-                {{#if model.reportUrl}}
+                <li class="item report">
                   <a href={{model.reportUrl}} class="report-url">
-                    <span>
-                      {{#if model.title}}
-                        {{model.title}} —
-                      {{/if}}
-                      {{i18n "admin.dashboard.reports.no_data"}}
-                    </span>
+                    {{model.title}}
                   </a>
+
+                  {{#if model.description}}
+                    {{#if model.description_link}}
+                      <a target="_blank" rel="noopener noreferrer" href={{model.description_link}} class="info" data-tooltip={{model.description}}>
+                        {{d-icon "question-circle"}}
+                      </a>
+                    {{else}}
+                      <span class="info" data-tooltip={{model.description}}>
+                        {{d-icon "question-circle"}}
+                      </span>
+                    {{/if}}
+                  {{/if}}
+                </li>
+              {{/unless}}
+            </ul>
+          {{/if}}
+
+          {{#if shouldDisplayTrend}}
+            <div class="trend {{model.trend}}">
+              <span class="value" title={{model.trendTitle}}>
+                {{#if model.average}}
+                  {{number model.currentAverage}}{{#if model.percent}}%{{/if}}
                 {{else}}
-                  <span>{{i18n "admin.dashboard.reports.no_data"}}</span>
+                  {{number model.currentTotal noTitle="true"}}{{#if model.percent}}%{{/if}}
                 {{/if}}
-              </div>
-            {{/if}}
-          {{/if}}
-        {{/if}}
-      </div>
 
-      {{#if showFilteringUI}}
-        <div class="filters">
-          {{#if showModes}}
-            <div class="modes">
-              {{#each displayedModes as |displayedMode|}}
-                {{d-button
-                  action=(action "changeMode")
-                  actionParam=displayedMode.mode
-                  class=displayedMode.cssClass
-                  icon=displayedMode.icon}}
-              {{/each}}
-            </div>
-          {{/if}}
-
-          {{#if showDatesOptions}}
-            <div class="control">
-              <span class="label">
-                {{i18n "admin.dashboard.reports.dates"}}
+                {{#if model.trendIcon}}
+                  {{d-icon model.trendIcon class="icon"}}
+                {{/if}}
               </span>
-
-              <div class="input">
-                {{date-time-input-range
-                  from=startDate
-                  to=endDate
-                  onChange=(action "onChangeDateRange")
-                  showFromTime=false
-                  showToTime=false
-                }}
-              </div>
-            </div>
-          {{/if}}
-
-          {{#each model.available_filters as |filter|}}
-            <div class="control">
-              <span class="label">
-                {{i18n (concat "admin.dashboard.reports.filters." filter.id ".label")}}
-              </span>
-
-              <div class="input">
-                {{component
-                  (concat "report-filters/" filter.type)
-                  model=model
-                  filter=filter
-                  applyFilter=(action "applyFilter")}}
-              </div>
-            </div>
-          {{/each}}
-
-          <div class="control">
-            <div class="input">
-              {{d-button
-                class="btn-default export-csv-btn"
-                action=(action "exportCsv")
-                label="admin.export_csv.button_text"
-                icon="download"}}
-            </div>
-          </div>
-
-          {{#if showRefresh}}
-            <div class="control">
-              <div class="input">
-                {{d-button
-                  class="refresh-report-btn btn-primary"
-                  action=(action "refreshReport")
-                  label="admin.dashboard.reports.refresh_report"
-                  icon="sync"}}
-              </div>
             </div>
           {{/if}}
         </div>
       {{/if}}
+
+      <div class="body">
+        <div class="main">
+          {{#if showError}}
+            {{#if showTimeoutError}}
+              <div class="alert alert-error report-alert timeout">
+                {{d-icon "exclamation-triangle"}}
+                <span>{{i18n "admin.dashboard.timeout_error"}}</span>
+              </div>
+            {{/if}}
+
+            {{#if showExceptionError}}
+              <div class="alert alert-error report-alert exception">
+                {{d-icon "exclamation-triangle"}}
+                <span>{{i18n "admin.dashboard.exception_error"}}</span>
+              </div>
+            {{/if}}
+
+            {{#if showNotFoundError}}
+              <div class="alert alert-error report-alert not-found">
+                {{d-icon "exclamation-triangle"}}
+                <span>{{i18n "admin.dashboard.not_found_error"}}</span>
+              </div>
+            {{/if}}
+          {{else}}
+            {{#if hasData}}
+              {{#if currentMode}}
+                {{component modeComponent model=model options=options}}
+
+                {{#if model.relatedReport}}
+                  {{admin-report showFilteringUI=false dataSourceName=model.relatedReport.type}}
+                {{/if}}
+              {{/if}}
+            {{else}}
+              {{#if rateLimitationString}}
+                <div class="alert alert-error report-alert rate-limited">
+                  {{d-icon "thermometer-three-quarters"}}
+                  <span>{{rateLimitationString}}</span>
+                </div>
+              {{else}}
+                <div class="alert alert-info report-alert no-data">
+                  {{d-icon "chart-pie"}}
+                  {{#if model.reportUrl}}
+                    <a href={{model.reportUrl}} class="report-url">
+                      <span>
+                        {{#if model.title}}
+                          {{model.title}} —
+                        {{/if}}
+                        {{i18n "admin.dashboard.reports.no_data"}}
+                      </span>
+                    </a>
+                  {{else}}
+                    <span>{{i18n "admin.dashboard.reports.no_data"}}</span>
+                  {{/if}}
+                </div>
+              {{/if}}
+            {{/if}}
+          {{/if}}
+        </div>
+
+        {{#if showFilteringUI}}
+          <div class="filters">
+            {{#if showModes}}
+              <div class="modes">
+                {{#each displayedModes as |displayedMode|}}
+                  {{d-button
+                    action=(action "changeMode")
+                    actionParam=displayedMode.mode
+                    class=displayedMode.cssClass
+                    icon=displayedMode.icon}}
+                {{/each}}
+              </div>
+            {{/if}}
+
+            {{#if showDatesOptions}}
+              <div class="control">
+                <span class="label">
+                  {{i18n "admin.dashboard.reports.dates"}}
+                </span>
+
+                <div class="input">
+                  {{date-time-input-range
+                    from=startDate
+                    to=endDate
+                    onChange=(action "onChangeDateRange")
+                    showFromTime=false
+                    showToTime=false
+                  }}
+                </div>
+              </div>
+            {{/if}}
+
+            {{#each model.available_filters as |filter|}}
+              <div class="control">
+                <span class="label">
+                  {{i18n (concat "admin.dashboard.reports.filters." filter.id ".label")}}
+                </span>
+
+                <div class="input">
+                  {{component
+                    (concat "report-filters/" filter.type)
+                    model=model
+                    filter=filter
+                    applyFilter=(action "applyFilter")}}
+                </div>
+              </div>
+            {{/each}}
+
+            <div class="control">
+              <div class="input">
+                {{d-button
+                  class="btn-default export-csv-btn"
+                  action=(action "exportCsv")
+                  label="admin.export_csv.button_text"
+                  icon="download"}}
+              </div>
+            </div>
+
+            {{#if showRefresh}}
+              <div class="control">
+                <div class="input">
+                  {{d-button
+                    class="refresh-report-btn btn-primary"
+                    action=(action "refreshReport")
+                    label="admin.dashboard.reports.refresh_report"
+                    icon="sync"}}
+                </div>
+              </div>
+            {{/if}}
+          </div>
+        {{/if}}
+      </div>
+    {{/conditional-loading-section}}
+  {{else}}
+    <div class="alert alert-info">
+      {{html-safe disabledLabel}}
     </div>
-  {{/conditional-loading-section}}
-{{else}}
-  <div class="alert alert-info">
-    {{html-safe disabledLabel}}
-  </div>
-{{/if}}
+  {{/if}}
+{{/unless}}
diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs
index 05296f4d7b..0e4f4beec2 100644
--- a/app/assets/javascripts/admin/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard.hbs
@@ -22,21 +22,30 @@
       {{i18n "admin.dashboard.general_tab"}}
     {{/link-to}}
   </li>
-  <li class="navigation-item moderation">
-    {{#link-to "admin.dashboardModeration" class="navigation-link"}}
-      {{i18n "admin.dashboard.moderation_tab"}}
-    {{/link-to}}
-  </li>
-  <li class="navigation-item security">
-    {{#link-to "admin.dashboardSecurity" class="navigation-link"}}
-      {{i18n "admin.dashboard.security_tab"}}
-    {{/link-to}}
-  </li>
-  <li class="navigation-item reports">
-    {{#link-to "admin.dashboardReports" class="navigation-link"}}
-      {{i18n "admin.dashboard.reports_tab"}}
-    {{/link-to}}
-  </li>
+
+  {{#if isModerationTabVisible}}
+    <li class="navigation-item moderation">
+      {{#link-to "admin.dashboardModeration" class="navigation-link"}}
+        {{i18n "admin.dashboard.moderation_tab"}}
+      {{/link-to}}
+    </li>
+  {{/if}}
+
+  {{#if isSecurityTabVisible}}
+    <li class="navigation-item security">
+      {{#link-to "admin.dashboardSecurity" class="navigation-link"}}
+        {{i18n "admin.dashboard.security_tab"}}
+      {{/link-to}}
+    </li>
+  {{/if}}
+
+  {{#if isReportsTabVisible}}
+    <li class="navigation-item reports">
+      {{#link-to "admin.dashboardReports" class="navigation-link"}}
+        {{i18n "admin.dashboard.reports_tab"}}
+      {{/link-to}}
+    </li>
+  {{/if}}
 </ul>
 
 {{outlet}}
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index 16214a92e3..5566271a20 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -1,97 +1,101 @@
 {{#conditional-loading-spinner condition=isLoading}}
   {{plugin-outlet name="admin-dashboard-general-top"}}
 
-  <div class="community-health section">
-    <div class="period-section">
-      <div class="section-title">
-        <h2>
-          <a href={{get-url "/admin/dashboard/reports"}}>
-            {{i18n "admin.dashboard.community_health"}}
-          </a>
-        </h2>
-        {{period-chooser period=period action=(action "changePeriod") content=availablePeriods fullDay=true}}
-      </div>
+  {{#if isCommunityHealthVisible}}
+    <div class="community-health section">
+      <div class="period-section">
+        <div class="section-title">
+          <h2>
+            <a href={{get-url "/admin/dashboard/reports"}}>
+              {{i18n "admin.dashboard.community_health"}}
+            </a>
+          </h2>
+          {{period-chooser period=period action=(action "changePeriod") content=availablePeriods fullDay=true}}
+        </div>
 
-      <div class="section-body">
-        <div class="charts">
-          {{admin-report
-            dataSourceName="consolidated_page_views"
-            forcedModes="stacked-chart"
-            filters=filters}}
+        <div class="section-body">
+          <div class="charts">
+            {{admin-report
+              dataSourceName="consolidated_page_views"
+              forcedModes="stacked-chart"
+              filters=filters}}
 
-          {{admin-report
-            dataSourceName="signups"
-            showTrend=true
-            forcedModes="chart"
-            filters=filters}}
+            {{admin-report
+              dataSourceName="signups"
+              showTrend=true
+              forcedModes="chart"
+              filters=filters}}
 
-          {{admin-report
-            dataSourceName="topics"
-            showTrend=true
-            forcedModes="chart"
-            filters=filters}}
+            {{admin-report
+              dataSourceName="topics"
+              showTrend=true
+              forcedModes="chart"
+              filters=filters}}
 
-          {{admin-report
-            dataSourceName="posts"
-            showTrend=true
-            forcedModes="chart"
-            filters=filters}}
+            {{admin-report
+              dataSourceName="posts"
+              showTrend=true
+              forcedModes="chart"
+              filters=filters}}
 
-          {{admin-report
-            dataSourceName="dau_by_mau"
-            showTrend=true
-            forcedModes="chart"
-            filters=filters}}
+            {{admin-report
+              dataSourceName="dau_by_mau"
+              showTrend=true
+              forcedModes="chart"
+              filters=filters}}
 
-          {{admin-report
-            dataSourceName="daily_engaged_users"
-            showTrend=true
-            forcedModes="chart"
-            filters=filters}}
+            {{admin-report
+              dataSourceName="daily_engaged_users"
+              showTrend=true
+              forcedModes="chart"
+              filters=filters}}
 
-          {{admin-report
-            dataSourceName="new_contributors"
-            showTrend=true
-            forcedModes="chart"
-            filters=filters}}
+            {{admin-report
+              dataSourceName="new_contributors"
+              showTrend=true
+              forcedModes="chart"
+              filters=filters}}
+          </div>
         </div>
       </div>
     </div>
-  </div>
+  {{/if}}
 
   <div class="section-columns">
     <div class="section-column">
-      {{#if activityMetrics.length}}
-        <div class="admin-report activity-metrics">
-          <div class="header">
-            <ul class="breadcrumb">
-              <li class="item report">
-                {{#link-to "adminReports" class="report-url"}}
-                  {{i18n "admin.dashboard.activity_metrics"}}
-                {{/link-to}}
-              </li>
-            </ul>
-          </div>
-          <div class="report-body">
-            <div class="counters-list">
-              <div class="counters-header">
-                <div class="counters-cell"></div>
-                <div class="counters-cell">{{i18n "admin.dashboard.reports.today"}}</div>
-                <div class="counters-cell">{{i18n "admin.dashboard.reports.yesterday"}}</div>
-                <div class="counters-cell">{{i18n "admin.dashboard.reports.last_7_days"}}</div>
-                <div class="counters-cell">{{i18n "admin.dashboard.reports.last_30_days"}}</div>
-              </div>
+      {{#if isActivityMetricsVisible}}
+        {{#if activityMetrics.length}}
+          <div class="admin-report activity-metrics">
+            <div class="header">
+              <ul class="breadcrumb">
+                <li class="item report">
+                  {{#link-to "adminReports" class="report-url"}}
+                    {{i18n "admin.dashboard.activity_metrics"}}
+                  {{/link-to}}
+                </li>
+              </ul>
+            </div>
+            <div class="report-body">
+              <div class="counters-list">
+                <div class="counters-header">
+                  <div class="counters-cell"></div>
+                  <div class="counters-cell">{{i18n "admin.dashboard.reports.today"}}</div>
+                  <div class="counters-cell">{{i18n "admin.dashboard.reports.yesterday"}}</div>
+                  <div class="counters-cell">{{i18n "admin.dashboard.reports.last_7_days"}}</div>
+                  <div class="counters-cell">{{i18n "admin.dashboard.reports.last_30_days"}}</div>
+                </div>
 
-              {{#each activityMetrics as |metric|}}
-                {{admin-report
-                  showHeader=false
-                  filters=activityMetricsFilters
-                  forcedModes="counters"
-                  dataSourceName=metric}}
-              {{/each}}
+                {{#each activityMetrics as |metric|}}
+                  {{admin-report
+                    showHeader=false
+                    filters=activityMetricsFilters
+                    forcedModes="counters"
+                    dataSourceName=metric}}
+                {{/each}}
+              </div>
             </div>
           </div>
-        </div>
+        {{/if}}
       {{/if}}
 
       <div class="user-metrics">
@@ -130,20 +134,22 @@
       </div>
     </div>
 
-    <div class="section-column">
-      {{admin-report
-        filters=topReferredTopicsFilters
-        dataSourceName="top_referred_topics"
-        reportOptions=topReferredTopicsOptions}}
+    {{#if isSearchReportsVisible}}
+      <div class="section-column">
+        {{admin-report
+          filters=topReferredTopicsFilters
+          dataSourceName="top_referred_topics"
+          reportOptions=topReferredTopicsOptions}}
 
-      {{admin-report
-        dataSourceName="trending_search"
-        reportOptions=trendingSearchOptions
-        filters=trendingSearchFilters
-        isEnabled=logSearchQueriesEnabled
-        disabledLabel=trendingSearchDisabledLabel}}
-      {{html-safe (i18n "admin.dashboard.reports.trending_search.more" basePath=basePath)}}
-    </div>
+        {{admin-report
+          dataSourceName="trending_search"
+          reportOptions=trendingSearchOptions
+          filters=trendingSearchFilters
+          isEnabled=logSearchQueriesEnabled
+          disabledLabel=trendingSearchDisabledLabel}}
+        {{html-safe (i18n "admin.dashboard.reports.trending_search.more" basePath=basePath)}}
+      </div>
+    {{/if}}
   </div>
 
   {{plugin-outlet name="admin-dashboard-general-bottom"}}
diff --git a/app/assets/javascripts/admin/templates/dashboard_moderation.hbs b/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
index 06ae3567f6..a6566b78e6 100644
--- a/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_moderation.hbs
@@ -1,27 +1,29 @@
 <div class="sections">
   {{plugin-outlet name="admin-dashboard-moderation-top"}}
 
-  <div class="moderators-activity section">
-    <div class="section-title">
-      <h2>
-        <a href={{get-url "/admin/reports/moderators_activity"}}>
-          {{i18n "admin.dashboard.moderators_activity"}}
-        </a>
-      </h2>
-      {{period-chooser
-        period=period
-        action=(action "changePeriod")
-        content=availablePeriods
-        fullDay=true}}
-    </div>
+  {{#if isModeratorsActivityVisible}}
+    <div class="moderators-activity section">
+      <div class="section-title">
+        <h2>
+          <a href={{get-url "/admin/reports/moderators_activity"}}>
+            {{i18n "admin.dashboard.moderators_activity"}}
+          </a>
+        </h2>
+        {{period-chooser
+          period=period
+          action=(action "changePeriod")
+          content=availablePeriods
+          fullDay=true}}
+      </div>
 
-    <div class="section-body">
-      {{admin-report
-        filters=filters
-        showHeader=false
-        dataSourceName="moderators_activity"}}
+      <div class="section-body">
+        {{admin-report
+          filters=filters
+          showHeader=false
+          dataSourceName="moderators_activity"}}
+      </div>
     </div>
-  </div>
+  {{/if}}
 
   <div class="main-section">
     {{admin-report
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 7a0ebe6f4e..bb7863aa18 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2195,6 +2195,8 @@ en:
 
     short_title: "The short title will be used on the user's home screen, launcher, or other places where space may be limited. It should be limited to 12 characters."
 
+    dashboard_hidden_reports: "Allow to hide the specified reports from the dashboard."
+    dashboard_visible_tabs: "Choose which dashboard tabs are visible."
     dashboard_general_tab_activity_metrics: "Choose reports to be displayed as activity metrics on the general tab."
 
     gravatar_name: "Name of the Gravatar provider"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index ef0fea4998..edda4aa263 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2205,6 +2205,22 @@ tags:
     client: true
 
 dashboard:
+  dashboard_hidden_reports:
+    client: true
+    type: list
+    list_type: compact
+    default: ""
+    allow_any: true
+  dashboard_visible_tabs:
+    client: true
+    type: list
+    list_type: compact
+    default: "moderation|security|reports"
+    allow_any: false
+    choices:
+      - moderation
+      - security
+      - reports
   dashboard_general_tab_activity_metrics:
     client: true
     type: list
diff --git a/test/javascripts/acceptance/dashboard-test.js b/test/javascripts/acceptance/dashboard-test.js
index 09c8d0a0b7..7f7e207765 100644
--- a/test/javascripts/acceptance/dashboard-test.js
+++ b/test/javascripts/acceptance/dashboard-test.js
@@ -4,6 +4,7 @@ import { acceptance } from "helpers/qunit-helpers";
 acceptance("Dashboard", {
   loggedIn: true,
   settings: {
+    dashboard_visible_tabs: "moderation|security|reports",
     dashboard_general_tab_activity_metrics: "page_view_total_reqs"
   },
   site: {
@@ -20,8 +21,9 @@ acceptance("Dashboard", {
   }
 });
 
-QUnit.test("Dashboard", async assert => {
+QUnit.test("default", async assert => {
   await visit("/admin");
+
   assert.ok(exists(".dashboard"), "has dashboard-next class");
 });
 
@@ -57,7 +59,7 @@ QUnit.test("general tab", async assert => {
   );
 });
 
-QUnit.test("general tab - activity metrics", async assert => {
+QUnit.test("activity metrics", async assert => {
   await visit("/admin");
 
   assert.ok(exists(".admin-report.page-view-total-reqs .today-count"));
@@ -100,7 +102,7 @@ QUnit.test("reports tab", async assert => {
   );
 });
 
-QUnit.test("report filters", async assert => {
+QUnit.test("reports filters", async assert => {
   await visit(
     '/admin/reports/signups_with_groups?end_date=2018-07-16&filters=%7B"group"%3A88%7D&start_date=2018-06-16'
   );
@@ -113,3 +115,41 @@ QUnit.test("report filters", async assert => {
     "its set the value of the filter from the query params"
   );
 });
+
+acceptance("Dashboard: dashboard_visible_tabs", {
+  loggedIn: true,
+  settings: {
+    dashboard_visible_tabs: "general|security|reports"
+  }
+});
+
+QUnit.test("visible tabs", async assert => {
+  await visit("/admin");
+
+  assert.ok(exists(".dashboard .navigation-item.general"), "general tab");
+  assert.notOk(
+    exists(".dashboard .navigation-item.moderation"),
+    "moderation tab"
+  );
+  assert.ok(exists(".dashboard .navigation-item.security"), "security tab");
+  assert.ok(exists(".dashboard .navigation-item.reports"), "reports tab");
+});
+
+acceptance("Dashboard: dashboard_hidden_reports", {
+  loggedIn: true,
+  settings: {
+    dashboard_visible_tabs: "reports",
+    dashboard_hidden_reports: "posts|dau_by_mau"
+  }
+});
+
+QUnit.test("hidden reports", async assert => {
+  await visit("/admin");
+
+  assert.ok(exists(".admin-report.signups.is-visible"), "signups report");
+  assert.notOk(exists(".admin-report.is-visible.posts"), "posts report");
+  assert.notOk(
+    exists(".admin-report.is-visible.dau-by-mau"),
+    "dau-by-mau report"
+  );
+});

From 03815f9795cbb62c1836aa0b565f85bf23df2c1b Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 30 Apr 2020 11:36:33 -0400
Subject: [PATCH 0892/1830] DEV: Remove `Handlebars.Utils.escapeExpression`
 usage

---
 .../controllers/modals/admin-badge-preview.js   |  2 +-
 .../discourse/app/helpers/application.js        |  5 +++--
 .../discourse/app/helpers/category-link.js      |  2 +-
 .../javascripts/discourse/app/lib/plugin-api.js |  2 +-
 .../javascripts/discourse/app/lib/render-tag.js |  3 ++-
 .../javascripts/discourse/app/lib/search.js     | 17 +++++++----------
 .../discourse/app/mixins/card-contents-base.js  |  3 ++-
 .../discourse/app/models/user-drafts-stream.js  |  5 ++---
 .../discourse/app/models/user-stream.js         |  5 ++---
 .../javascripts/discourse/app/models/user.js    |  5 +++--
 .../app/routes/build-admin-user-posts-route.js  |  6 ++----
 .../discourse/app/routes/tags-show.js           |  5 +++--
 .../discourse/app/widgets/avatar-flair.js       |  9 ++++-----
 .../javascripts/discourse/app/widgets/emoji.js  |  3 ++-
 14 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js
index 84325f90d1..c5baa8eb9a 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js
+++ b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js
@@ -42,7 +42,7 @@ export default Controller.extend({
     if (grant.post_id) {
       i18nKey += "_post";
       i18nParams.link = `<a href="/p/${grant.post_id}" data-auto-route="true">
-        ${Handlebars.Utils.escapeExpression(grant.title)}
+        ${escapeExpression(grant.title)}
       </a>`;
     }
 
diff --git a/app/assets/javascripts/discourse/app/helpers/application.js b/app/assets/javascripts/discourse/app/helpers/application.js
index 27727c1d84..8ebdb1c51f 100644
--- a/app/assets/javascripts/discourse/app/helpers/application.js
+++ b/app/assets/javascripts/discourse/app/helpers/application.js
@@ -5,6 +5,7 @@ import {
   number
 } from "discourse/lib/formatter";
 import { htmlSafe } from "@ember/template";
+import { escapeExpression } from "discourse/lib/utilities";
 
 registerUnbound("raw-date", dt => htmlSafe(longDate(new Date(dt))));
 
@@ -37,10 +38,10 @@ registerUnbound("number", (orig, params) => {
   // Round off the thousands to one decimal place
   const n = number(orig);
   if (n.toString() !== title.toString() && addTitle) {
-    result += " title='" + Handlebars.Utils.escapeExpression(title) + "'";
+    result += " title='" + escapeExpression(title) + "'";
   }
   if (params.ariaLabel) {
-    const ariaLabel = Handlebars.Utils.escapeExpression(params.ariaLabel);
+    const ariaLabel = escapeExpression(params.ariaLabel);
     result += ` aria-label='${ariaLabel}'`;
   }
 
diff --git a/app/assets/javascripts/discourse/app/helpers/category-link.js b/app/assets/javascripts/discourse/app/helpers/category-link.js
index 5199eda96a..d2141122e5 100644
--- a/app/assets/javascripts/discourse/app/helpers/category-link.js
+++ b/app/assets/javascripts/discourse/app/helpers/category-link.js
@@ -4,8 +4,8 @@ import { isRTL } from "discourse/lib/text-direction";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import Category from "discourse/models/category";
 import Site from "discourse/models/site";
+import { escapeExpression } from "discourse/lib/utilities";
 
-let escapeExpression = Handlebars.Utils.escapeExpression;
 let _renderer = defaultCategoryLinkRenderer;
 
 export function replaceCategoryLinkRenderer(fn) {
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index 7188000327..3d9dcd4a49 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -972,7 +972,7 @@ class PluginApi {
    * Example:
    *
    * function testTagRenderer(tag, params) {
-   *   const visibleName = Handlebars.Utils.escapeExpression(tag);
+   *   const visibleName = escapeExpression(tag);
    *   return `testing: ${visibleName}`;
    * }
    * api.replaceTagRenderer(testTagRenderer);
diff --git a/app/assets/javascripts/discourse/app/lib/render-tag.js b/app/assets/javascripts/discourse/app/lib/render-tag.js
index f9230f0255..f1882a386e 100644
--- a/app/assets/javascripts/discourse/app/lib/render-tag.js
+++ b/app/assets/javascripts/discourse/app/lib/render-tag.js
@@ -1,4 +1,5 @@
 import User from "discourse/models/user";
+import { escapeExpression } from "discourse/lib/utilities";
 
 let _renderer = defaultRenderTag;
 
@@ -8,7 +9,7 @@ export function replaceTagRenderer(fn) {
 
 export function defaultRenderTag(tag, params) {
   params = params || {};
-  const visibleName = Handlebars.Utils.escapeExpression(tag);
+  const visibleName = escapeExpression(tag);
   tag = visibleName.toLowerCase();
   const classes = ["discourse-tag"];
   const tagName = params.tagName || "a";
diff --git a/app/assets/javascripts/discourse/app/lib/search.js b/app/assets/javascripts/discourse/app/lib/search.js
index d6c76dd56b..f057425bc5 100644
--- a/app/assets/javascripts/discourse/app/lib/search.js
+++ b/app/assets/javascripts/discourse/app/lib/search.js
@@ -10,6 +10,7 @@ import { emojiUnescape } from "discourse/lib/text";
 import User from "discourse/models/user";
 import Post from "discourse/models/post";
 import Topic from "discourse/models/topic";
+import { escapeExpression } from "discourse/lib/utilities";
 
 export function translateResults(results, opts) {
   opts = opts || {};
@@ -50,17 +51,13 @@ export function translateResults(results, opts) {
 
   results.groups = results.groups
     .map(group => {
-      const name = Handlebars.Utils.escapeExpression(group.name);
-      const fullName = Handlebars.Utils.escapeExpression(
-        group.full_name || group.display_name
-      );
+      const name = escapeExpression(group.name);
+      const fullName = escapeExpression(group.full_name || group.display_name);
       const flairUrl = isEmpty(group.flair_url)
         ? null
-        : Handlebars.Utils.escapeExpression(group.flair_url);
-      const flairColor = Handlebars.Utils.escapeExpression(group.flair_color);
-      const flairBgColor = Handlebars.Utils.escapeExpression(
-        group.flair_bg_color
-      );
+        : escapeExpression(group.flair_url);
+      const flairColor = escapeExpression(group.flair_color);
+      const flairBgColor = escapeExpression(group.flair_bg_color);
 
       return {
         id: group.id,
@@ -76,7 +73,7 @@ export function translateResults(results, opts) {
 
   results.tags = results.tags
     .map(function(tag) {
-      const tagName = Handlebars.Utils.escapeExpression(tag.name);
+      const tagName = escapeExpression(tag.name);
       return EmberObject.create({
         id: tagName,
         url: Discourse.getURL("/tag/" + tagName)
diff --git a/app/assets/javascripts/discourse/app/mixins/card-contents-base.js b/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
index b1aeb853dd..59464e1d61 100644
--- a/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
+++ b/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
@@ -4,6 +4,7 @@ import { wantsNewWindow } from "discourse/lib/intercept-click";
 import afterTransition from "discourse/lib/after-transition";
 import DiscourseURL from "discourse/lib/url";
 import Mixin from "@ember/object/mixin";
+import { escapeExpression } from "discourse/lib/utilities";
 
 export default Mixin.create({
   elementId: null, //click detection added for data-{elementId}
@@ -27,7 +28,7 @@ export default Mixin.create({
       return false;
     }
 
-    username = Ember.Handlebars.Utils.escapeExpression(username.toString());
+    username = escapeExpression(username.toString());
 
     // Don't show if nested
     if ($target.parents(".card-content").length) {
diff --git a/app/assets/javascripts/discourse/app/models/user-drafts-stream.js b/app/assets/javascripts/discourse/app/models/user-drafts-stream.js
index 07529f6ee7..ddf1c83149 100644
--- a/app/assets/javascripts/discourse/app/models/user-drafts-stream.js
+++ b/app/assets/javascripts/discourse/app/models/user-drafts-stream.js
@@ -10,6 +10,7 @@ import {
   NEW_TOPIC_KEY,
   NEW_PRIVATE_MESSAGE_KEY
 } from "discourse/models/composer";
+import { escapeExpression } from "discourse/lib/utilities";
 
 export default RestModel.extend({
   loaded: false,
@@ -81,9 +82,7 @@ export default RestModel.extend({
             ) {
               draft.title = draftData.title;
             }
-            draft.title = emojiUnescape(
-              Handlebars.Utils.escapeExpression(draft.title)
-            );
+            draft.title = emojiUnescape(escapeExpression(draft.title));
             if (draft.category_id) {
               draft.category =
                 this.site.categories.findBy("id", draft.category_id) || null;
diff --git a/app/assets/javascripts/discourse/app/models/user-stream.js b/app/assets/javascripts/discourse/app/models/user-stream.js
index 7bca68c8b3..0b64eae8db 100644
--- a/app/assets/javascripts/discourse/app/models/user-stream.js
+++ b/app/assets/javascripts/discourse/app/models/user-stream.js
@@ -6,6 +6,7 @@ import UserAction from "discourse/models/user-action";
 import { emojiUnescape } from "discourse/lib/text";
 import { Promise } from "rsvp";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
+import { escapeExpression } from "discourse/lib/utilities";
 
 export default RestModel.extend({
   loaded: false,
@@ -107,9 +108,7 @@ export default RestModel.extend({
         if (result && result.user_actions) {
           const copy = A();
           result.user_actions.forEach(action => {
-            action.title = emojiUnescape(
-              Handlebars.Utils.escapeExpression(action.title)
-            );
+            action.title = emojiUnescape(escapeExpression(action.title));
             copy.pushObject(UserAction.create(action));
           });
 
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index dc118c0892..bebf2d3dcb 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -26,6 +26,7 @@ import { Promise } from "rsvp";
 import deprecated from "discourse-common/lib/deprecated";
 import Site from "discourse/models/site";
 import { NotificationLevels } from "discourse/lib/notification-levels";
+import { escapeExpression } from "discourse/lib/utilities";
 
 export const SECOND_FACTOR_METHODS = {
   TOTP: 1,
@@ -483,7 +484,7 @@ const User = RestModel.extend({
           return;
         if (!this.get("stream.filter") && !this.inAllStream(ua)) return;
 
-        ua.title = emojiUnescape(Handlebars.Utils.escapeExpression(ua.title));
+        ua.title = emojiUnescape(escapeExpression(ua.title));
         const action = UserAction.collapseStream([UserAction.create(ua)]);
         stream.set("itemsLoaded", stream.get("itemsLoaded") + 1);
         stream.get("content").insertAt(0, action[0]);
@@ -810,7 +811,7 @@ const User = RestModel.extend({
       .sort()
       .map(title => {
         return {
-          name: Ember.Handlebars.Utils.escapeExpression(title),
+          name: escapeExpression(title),
           id: title
         };
       });
diff --git a/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js b/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js
index 5bbd0108c6..eb6936537f 100644
--- a/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js
@@ -1,5 +1,6 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import { emojiUnescape } from "discourse/lib/text";
+import { escapeExpression } from "discourse/lib/utilities";
 
 export default function(filter) {
   return DiscourseRoute.extend({
@@ -25,10 +26,7 @@ export default function(filter) {
 
       model.get("content").forEach(item => {
         if (item.get("title")) {
-          item.set(
-            "title",
-            emojiUnescape(Handlebars.Utils.escapeExpression(item.title))
-          );
+          item.set("title", emojiUnescape(escapeExpression(item.title)));
         }
       });
 
diff --git a/app/assets/javascripts/discourse/app/routes/tags-show.js b/app/assets/javascripts/discourse/app/routes/tags-show.js
index 08fe0b24d2..f598e4fe24 100644
--- a/app/assets/javascripts/discourse/app/routes/tags-show.js
+++ b/app/assets/javascripts/discourse/app/routes/tags-show.js
@@ -9,6 +9,7 @@ import { queryParams } from "discourse/controllers/discovery-sortable";
 import PermissionType from "discourse/models/permission-type";
 import Category from "discourse/models/category";
 import FilterModeMixin from "discourse/mixins/filter-mode";
+import { escapeExpression } from "discourse/lib/utilities";
 
 export default DiscourseRoute.extend(FilterModeMixin, {
   navMode: "latest",
@@ -22,14 +23,14 @@ export default DiscourseRoute.extend(FilterModeMixin, {
 
   model(params) {
     const tag = this.store.createRecord("tag", {
-      id: Handlebars.Utils.escapeExpression(params.tag_id)
+      id: escapeExpression(params.tag_id)
     });
     if (params.additional_tags) {
       this.set(
         "additionalTags",
         params.additional_tags.split("/").map(t => {
           return this.store.createRecord("tag", {
-            id: Handlebars.Utils.escapeExpression(t)
+            id: escapeExpression(t)
           }).id;
         })
       );
diff --git a/app/assets/javascripts/discourse/app/widgets/avatar-flair.js b/app/assets/javascripts/discourse/app/widgets/avatar-flair.js
index 559adb9c59..0da095de00 100644
--- a/app/assets/javascripts/discourse/app/widgets/avatar-flair.js
+++ b/app/assets/javascripts/discourse/app/widgets/avatar-flair.js
@@ -1,5 +1,6 @@
 import { createWidget } from "discourse/widgets/widget";
 import { iconNode, convertIconClass } from "discourse-common/lib/icon-library";
+import { escapeExpression } from "discourse/lib/utilities";
 
 createWidget("avatar-flair", {
   tagName: "div.avatar-flair",
@@ -32,20 +33,18 @@ createWidget("avatar-flair", {
     if (!this.isIcon(attrs)) {
       style +=
         "background-image: url(" +
-        Handlebars.Utils.escapeExpression(attrs.primary_group_flair_url) +
+        escapeExpression(attrs.primary_group_flair_url) +
         "); ";
     }
     if (attrs.primary_group_flair_bg_color) {
       style +=
         "background-color: #" +
-        Handlebars.Utils.escapeExpression(attrs.primary_group_flair_bg_color) +
+        escapeExpression(attrs.primary_group_flair_bg_color) +
         "; ";
     }
     if (attrs.primary_group_flair_color) {
       style +=
-        "color: #" +
-        Handlebars.Utils.escapeExpression(attrs.primary_group_flair_color) +
-        "; ";
+        "color: #" + escapeExpression(attrs.primary_group_flair_color) + "; ";
     }
     return { style: style };
   },
diff --git a/app/assets/javascripts/discourse/app/widgets/emoji.js b/app/assets/javascripts/discourse/app/widgets/emoji.js
index c1f8e70810..2fe63226c0 100644
--- a/app/assets/javascripts/discourse/app/widgets/emoji.js
+++ b/app/assets/javascripts/discourse/app/widgets/emoji.js
@@ -1,9 +1,10 @@
 import { createWidget } from "discourse/widgets/widget";
 import { emojiUrlFor, emojiUnescape } from "discourse/lib/text";
 import RawHtml from "discourse/widgets/raw-html";
+import { escapeExpression } from "discourse/lib/utilities";
 
 export function replaceEmoji(str) {
-  const escaped = emojiUnescape(Handlebars.Utils.escapeExpression(str));
+  const escaped = emojiUnescape(escapeExpression(str));
   return [new RawHtml({ html: `<span>${escaped}</span>` })];
 }
 

From 2cb9e85d14b3c2bfbf79013042799a46dd252ead Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Thu, 30 Apr 2020 07:39:11 -1000
Subject: [PATCH 0893/1830] FEATURE: add category banner for why a user cannot
 post (#9576)

* FEATURE: add category banner for why a user cannot post

Adds a category banner for why a user is unable to post in a category.

Also adds an extra alert for the user when a user is unable to create a topic in a
category and they still try and click on the disabled-looking new topic
button.
---
 .../components/category-read-only-banner.js   |  11 ++
 .../app/components/create-topic-button.js     |   3 +-
 .../discourse/app/components/d-navigation.js  |  40 +++++++
 .../discourse/app/models/category.js          |   3 +-
 .../components/category-read-only-banner.hbs  |   7 ++
 .../components/create-topic-button.hbs        |   2 +-
 .../app/templates/components/d-navigation.hbs |   5 +-
 .../components/edit-category-settings.hbs     |  14 +++
 .../discourse/app/templates/discovery.hbs     |   1 +
 app/controllers/categories_controller.rb      |   1 +
 app/models/category.rb                        |   1 +
 app/serializers/site_category_serializer.rb   |   3 +-
 config/locales/client.en.yml                  |   1 +
 ...00427222624_add_read_only_to_categories.rb |   7 ++
 .../acceptance/category-banner-test.js        |  89 +++++++++++++++
 .../fixtures/discovery_fixtures.js            | 102 ++++++++++++++++++
 16 files changed, 284 insertions(+), 6 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/components/category-read-only-banner.js
 create mode 100644 app/assets/javascripts/discourse/app/templates/components/category-read-only-banner.hbs
 create mode 100644 db/migrate/20200427222624_add_read_only_to_categories.rb
 create mode 100644 test/javascripts/acceptance/category-banner-test.js

diff --git a/app/assets/javascripts/discourse/app/components/category-read-only-banner.js b/app/assets/javascripts/discourse/app/components/category-read-only-banner.js
new file mode 100644
index 0000000000..f1cd4a0bf0
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/category-read-only-banner.js
@@ -0,0 +1,11 @@
+import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
+import { and } from "@ember/object/computed";
+
+export default Component.extend({
+  @discourseComputed
+  user() {
+    return this.currentUser;
+  },
+  shouldShow: and("category.read_only_banner", "readOnly", "user")
+});
diff --git a/app/assets/javascripts/discourse/app/components/create-topic-button.js b/app/assets/javascripts/discourse/app/components/create-topic-button.js
index b2ab306a12..9642446c82 100644
--- a/app/assets/javascripts/discourse/app/components/create-topic-button.js
+++ b/app/assets/javascripts/discourse/app/components/create-topic-button.js
@@ -1,5 +1,6 @@
 import Component from "@ember/component";
 export default Component.extend({
   tagName: "",
-  label: "topic.create"
+  label: "topic.create",
+  btnClass: "btn-default"
 });
diff --git a/app/assets/javascripts/discourse/app/components/d-navigation.js b/app/assets/javascripts/discourse/app/components/d-navigation.js
index df6dc3c0a9..bb862fd854 100644
--- a/app/assets/javascripts/discourse/app/components/d-navigation.js
+++ b/app/assets/javascripts/discourse/app/components/d-navigation.js
@@ -15,6 +15,38 @@ export default Component.extend(FilterModeMixin, {
     return category && this.currentUser;
   },
 
+  @discourseComputed("category", "createTopicDisabled")
+  categoryReadOnlyBanner(category, createTopicDisabled) {
+    if (category && this.currentUser && createTopicDisabled) {
+      return category.read_only_banner;
+    }
+  },
+
+  @discourseComputed(
+    "createTopicDisabled",
+    "hasDraft",
+    "categoryReadOnlyBanner"
+  )
+  createTopicButtonDisabled(
+    createTopicDisabled,
+    hasDraft,
+    categoryReadOnlyBanner
+  ) {
+    if (categoryReadOnlyBanner && !hasDraft) {
+      return false;
+    }
+    return createTopicDisabled;
+  },
+
+  @discourseComputed("categoryReadOnlyBanner", "hasDraft")
+  createTopicClass(categoryReadOnlyBanner, hasDraft) {
+    if (categoryReadOnlyBanner && !hasDraft) {
+      return "btn-default disabled";
+    } else {
+      return "btn-default";
+    }
+  },
+
   @discourseComputed()
   categories() {
     return this.site.get("categoriesList");
@@ -65,6 +97,14 @@ export default Component.extend(FilterModeMixin, {
           this.reorderCategories();
           break;
       }
+    },
+
+    clickCreateTopicButton() {
+      if (this.categoryReadOnlyBanner && !this.hasDraft) {
+        bootbox.alert(this.categoryReadOnlyBanner);
+      } else {
+        this.createTopic();
+      }
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/app/models/category.js b/app/assets/javascripts/discourse/app/models/category.js
index d765f84d47..7d2b590562 100644
--- a/app/assets/javascripts/discourse/app/models/category.js
+++ b/app/assets/javascripts/discourse/app/models/category.js
@@ -187,7 +187,8 @@ const Category = RestModel.extend({
           "navigate_to_first_post_after_read"
         ),
         search_priority: this.search_priority,
-        reviewable_by_group_name: this.reviewable_by_group_name
+        reviewable_by_group_name: this.reviewable_by_group_name,
+        read_only_banner: this.read_only_banner
       },
       type: id ? "PUT" : "POST"
     });
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-read-only-banner.hbs b/app/assets/javascripts/discourse/app/templates/components/category-read-only-banner.hbs
new file mode 100644
index 0000000000..4c00dc8044
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/category-read-only-banner.hbs
@@ -0,0 +1,7 @@
+{{#if shouldShow}}
+  <div class="row">
+    <div class="alert alert-info category-read-only-banner">
+      {{category.read_only_banner}}
+    </div>
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs b/app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs
index 3a0e3ebfa9..76524d1478 100644
--- a/app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs
@@ -1,6 +1,6 @@
 {{#if canCreateTopic}}
   {{d-button
-    class="btn-default"
+    class=btnClass
     id="create-topic"
     action=action
     icon="plus"
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
index 6a0d8e330c..e9e0b9a34f 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
@@ -25,9 +25,10 @@
 
 {{create-topic-button
   canCreateTopic=canCreateTopic
-  action=createTopic
-  disabled=createTopicDisabled
+  action=(action "clickCreateTopicButton")
+  disabled=createTopicButtonDisabled
   label=createTopicLabel
+  btnClass=createTopicClass
 }}
 
 {{#if showCategoryEdit}}
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 f7b4981e7a..ab17a307c3 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
@@ -221,6 +221,20 @@
       }}
     </section>
   {{/if}}
+
+  <section class="field category-read-only-banner">
+    <label for="category-read-only-banner">
+      {{i18n "category.read_only_banner"}}
+    </label>
+    {{text-field
+        valueProperty="value"
+        id="read-only-message"
+        value=category.read_only_banner
+        options=(hash
+        placementStrategy="absolute"
+        )
+    }}
+  </section>
 </section>
 
 <section>
diff --git a/app/assets/javascripts/discourse/app/templates/discovery.hbs b/app/assets/javascripts/discourse/app/templates/discovery.hbs
index 1c8f879125..ddec84d234 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery.hbs
@@ -3,6 +3,7 @@
 {{else}}
   <div class="container">
     {{discourse-banner user=currentUser banner=site.banner}}
+    {{category-read-only-banner category=category readOnly=navigationCategory.cannotCreateTopicOnCategory}}
   </div>
 
   <div class="list-controls">
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index acb39e7cab..770275a65e 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -328,6 +328,7 @@ class CategoriesController < ApplicationController
         :allow_global_tags,
         :required_tag_group_name,
         :min_tags_from_required_group,
+        :read_only_banner,
         custom_fields: [params[:custom_fields].try(:keys)],
         permissions: [*p.try(:keys)],
         allowed_tags: [],
diff --git a/app/models/category.rb b/app/models/category.rb
index 2651602e16..bbf1e9b98c 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -978,6 +978,7 @@ end
 #  reviewable_by_group_id            :integer
 #  required_tag_group_id             :integer
 #  min_tags_from_required_group      :integer          default(1), not null
+#  read_only_banner                  :string
 #
 # Indexes
 #
diff --git a/app/serializers/site_category_serializer.rb b/app/serializers/site_category_serializer.rb
index 31549fd8a0..89868e9389 100644
--- a/app/serializers/site_category_serializer.rb
+++ b/app/serializers/site_category_serializer.rb
@@ -6,7 +6,8 @@ class SiteCategorySerializer < BasicCategorySerializer
              :allowed_tag_groups,
              :allow_global_tags,
              :min_tags_from_required_group,
-             :required_tag_group_name
+             :required_tag_group_name,
+             :read_only_banner
 
   def include_allowed_tags?
     SiteSetting.tagging_enabled
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 5674db7648..9c5d262701 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2795,6 +2795,7 @@ en:
       email_in_disabled_click: 'enable the "email in" setting.'
       mailinglist_mirror: "Category mirrors a mailing list"
       show_subcategory_list: "Show subcategory list above topics in this category."
+      read_only_banner: "Banner text when a user cannot create a topic in this category:"
       num_featured_topics: "Number of topics shown on the categories page:"
       subcategory_num_featured_topics: "Number of featured topics on parent category's page:"
       all_topics_wiki: "Make new topics wikis by default"
diff --git a/db/migrate/20200427222624_add_read_only_to_categories.rb b/db/migrate/20200427222624_add_read_only_to_categories.rb
new file mode 100644
index 0000000000..e3832213fb
--- /dev/null
+++ b/db/migrate/20200427222624_add_read_only_to_categories.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddReadOnlyToCategories < ActiveRecord::Migration[6.0]
+  def change
+    add_column :categories, :read_only_banner, :string
+  end
+end
diff --git a/test/javascripts/acceptance/category-banner-test.js b/test/javascripts/acceptance/category-banner-test.js
new file mode 100644
index 0000000000..6bd3251507
--- /dev/null
+++ b/test/javascripts/acceptance/category-banner-test.js
@@ -0,0 +1,89 @@
+import { acceptance } from "helpers/qunit-helpers";
+import DiscoveryFixtures from "fixtures/discovery_fixtures";
+
+acceptance("Category Banners", {
+  pretend(server, helper) {
+    server.get("/c/test-read-only-without-banner/5/l/latest.json", () => {
+      return helper.response(
+        DiscoveryFixtures["/latest_can_create_topic.json"]
+      );
+    });
+    server.get("/c/test-read-only-with-banner/6/l/latest.json", () => {
+      return helper.response(
+        DiscoveryFixtures["/latest_can_create_topic.json"]
+      );
+    });
+  },
+  loggedIn: true,
+  site: {
+    categories: [
+      {
+        id: 5,
+        name: "test read only without banner",
+        slug: "test-read-only-without-banner",
+        permission: null
+      },
+      {
+        id: 6,
+        name: "test read only with banner",
+        slug: "test-read-only-with-banner",
+        permission: null,
+        read_only_banner:
+          "You need to video yourself doing the secret handshake to post here"
+      }
+    ]
+  }
+});
+
+QUnit.test("Does not display category banners when not set", async assert => {
+  await visit("/c/test-read-only-without-banner");
+
+  await click("#create-topic");
+  assert.ok(!visible(".bootbox.modal"), "it does not pop up a modal");
+  assert.ok(
+    !visible(".category-read-only-banner"),
+    "it does not show a banner"
+  );
+});
+
+QUnit.test("Displays category banners when set", async assert => {
+  await visit("/c/test-read-only-with-banner");
+
+  await click("#create-topic");
+  assert.ok(visible(".bootbox.modal"), "it pops up a modal");
+
+  await click(".modal-footer>.btn-primary");
+  assert.ok(!visible(".bootbox.modal"), "it closes the modal");
+  assert.ok(visible(".category-read-only-banner"), "it shows a banner");
+});
+
+acceptance("Anonymous Category Banners", {
+  pretend(server, helper) {
+    server.get("/c/test-read-only-with-banner/6/l/latest.json", () => {
+      return helper.response(
+        DiscoveryFixtures["/latest_can_create_topic.json"]
+      );
+    });
+  },
+  loggedIn: false,
+  site: {
+    categories: [
+      {
+        id: 6,
+        name: "test read only with banner",
+        slug: "test-read-only-with-banner",
+        permission: null,
+        read_only_banner:
+          "You need to video yourself doing the secret handshake to post here"
+      }
+    ]
+  }
+});
+
+QUnit.test("Does not display category banners when set", async assert => {
+  await visit("/c/test-read-only-with-banner");
+  assert.ok(
+    !visible(".category-read-only-banner"),
+    "it does not show a banner"
+  );
+});
diff --git a/test/javascripts/fixtures/discovery_fixtures.js b/test/javascripts/fixtures/discovery_fixtures.js
index 01228b9437..9e09ab984a 100644
--- a/test/javascripts/fixtures/discovery_fixtures.js
+++ b/test/javascripts/fixtures/discovery_fixtures.js
@@ -6120,5 +6120,107 @@ export default {
         }
       ]
     }
+  },
+  "/latest_can_create_topic.json": {
+    users: [
+      {
+        id: 1,
+        username: "tt1",
+        name: null,
+        avatar_template: "/letter_avatar_proxy/v4/letter/t/6de8d8/{size}.png"
+      }
+    ],
+    primary_groups: [],
+    topic_list: {
+      can_create_topic: true,
+      draft: null,
+      draft_key: "new_topic",
+      draft_sequence: 0,
+      per_page: 30,
+      topics: [
+        {
+          id: 30,
+          title: "I am also creating a new topic here new topic",
+          fancy_title: "I am also creating a new topic here new topic",
+          slug: "i-am-also-creating-a-new-topic-here-new-topic",
+          posts_count: 6,
+          reply_count: 0,
+          highest_post_number: 6,
+          image_url: null,
+          created_at: "2020-04-27T23:47:44.218Z",
+          last_posted_at: "2020-04-28T22:45:47.529Z",
+          bumped: true,
+          bumped_at: "2020-04-28T22:02:20.215Z",
+          archetype: "regular",
+          unseen: false,
+          last_read_post_number: 5,
+          unread: 0,
+          new_posts: 0,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          notification_level: 1,
+          bookmarked: false,
+          liked: false,
+          tags: ["test", "test-tag"],
+          views: 6,
+          like_count: 0,
+          has_summary: false,
+          last_poster_username: "tt1",
+          category_id: 5,
+          pinned_globally: false,
+          featured_link: null,
+          posters: [
+            {
+              extras: "latest single",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 1,
+              primary_group_id: null
+            }
+          ]
+        },
+        {
+          id: 29,
+          title: "About the test category category",
+          fancy_title: "About the test category category",
+          slug: "about-the-test-category-category",
+          posts_count: 5,
+          reply_count: 0,
+          highest_post_number: 5,
+          image_url: null,
+          created_at: "2020-04-27T22:15:49.424Z",
+          last_posted_at: "2020-04-27T23:51:06.249Z",
+          bumped: true,
+          bumped_at: "2020-04-27T22:15:49.424Z",
+          archetype: "regular",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          bookmarked: null,
+          liked: null,
+          tags: [],
+          views: 1,
+          like_count: 0,
+          has_summary: false,
+          last_poster_username: "tt1",
+          category_id: 5,
+          pinned_globally: false,
+          featured_link: null,
+          posters: [
+            {
+              extras: "latest single",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 1,
+              primary_group_id: null
+            }
+          ]
+        }
+      ]
+    }
   }
 };

From d615de9139aaede37dbb5f97d89e08b7541869ec Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 30 Apr 2020 16:41:02 -0400
Subject: [PATCH 0894/1830]  DEV: Support for `import Handlebars from
 'handlebars'`; (#9600)

* Remove Handlebars.SafeString usage

* DEV: Support for `import Handlebars from 'handlebars'`;

* FIX: Sprockets was broken when `node_modules` was present

By default the old version of sprockets looks for application.js
anywhere, including in a node_modules folder if this exists
(which it will when we move to Ember CLI.)
---
 app/assets/javascripts/admin/helpers/check-icon.js       | 3 ++-
 app/assets/javascripts/admin/mixins/setting-component.js | 3 ++-
 .../javascripts/discourse-common/addon/helpers/d-icon.js | 3 ++-
 .../discourse-common/addon/helpers/fa-icon.js            | 3 ++-
 .../javascripts/discourse-common/addon/lib/helpers.js    | 3 ++-
 .../discourse-common/addon/lib/raw-handlebars.js         | 3 ++-
 .../discourse/app/components/create-topics-notice.js     | 3 ++-
 .../javascripts/discourse/app/helpers/category-link.js   | 5 ++---
 .../javascripts/discourse/app/helpers/custom-html.js     | 5 +++--
 .../javascripts/discourse/app/helpers/discourse-tag.js   | 3 ++-
 .../javascripts/discourse/app/helpers/discourse-tags.js  | 3 ++-
 .../javascripts/discourse/app/helpers/format-date.js     | 3 ++-
 .../discourse/app/helpers/raw-plugin-outlet.js           | 3 ++-
 app/assets/javascripts/discourse/app/helpers/raw.js      | 3 ++-
 .../discourse/app/helpers/topic-featured-link.js         | 3 ++-
 .../javascripts/discourse/app/helpers/topic-link.js      | 3 ++-
 .../javascripts/discourse/app/helpers/user-avatar.js     | 3 ++-
 app/assets/javascripts/discourse/app/lib/text.js         | 3 ++-
 app/assets/javascripts/discourse/app/lib/utilities.js    | 1 +
 .../javascripts/discourse/app/services/logs-notice.js    | 3 ++-
 app/assets/javascripts/handlebars-shim.js                | 9 +++++++++
 app/assets/javascripts/pretty-text/sanitizer.js          | 1 -
 app/assets/javascripts/template_include.js               | 1 +
 app/assets/javascripts/template_include.js.erb           | 0
 config/application.rb                                    | 5 +++++
 lib/freedom_patches/raw_handlebars.rb                    | 2 +-
 lib/pretty_text.rb                                       | 1 +
 27 files changed, 57 insertions(+), 24 deletions(-)
 create mode 100644 app/assets/javascripts/handlebars-shim.js
 delete mode 100644 app/assets/javascripts/template_include.js.erb

diff --git a/app/assets/javascripts/admin/helpers/check-icon.js b/app/assets/javascripts/admin/helpers/check-icon.js
index 88cddc3d4d..4641a15fa2 100644
--- a/app/assets/javascripts/admin/helpers/check-icon.js
+++ b/app/assets/javascripts/admin/helpers/check-icon.js
@@ -1,7 +1,8 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { renderIcon } from "discourse-common/lib/icon-library";
+import { htmlSafe } from "@ember/template";
 
 registerUnbound("check-icon", function(value) {
   let icon = value ? "check" : "times";
-  return new Handlebars.SafeString(renderIcon("string", icon));
+  return htmlSafe(renderIcon("string", icon));
 });
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js b/app/assets/javascripts/admin/mixins/setting-component.js
index 200ec00c1f..e7afc119f2 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js
+++ b/app/assets/javascripts/admin/mixins/setting-component.js
@@ -7,6 +7,7 @@ import Mixin from "@ember/object/mixin";
 import showModal from "discourse/lib/show-modal";
 import { Promise } from "rsvp";
 import { ajax } from "discourse/lib/ajax";
+import { htmlSafe } from "@ember/template";
 
 const CUSTOM_TYPES = [
   "bool",
@@ -63,7 +64,7 @@ export default Mixin.create({
     }
     let preview = setting.get("preview");
     if (preview) {
-      return new Handlebars.SafeString(
+      return htmlSafe(
         "<div class='preview'>" +
           preview.replace(/\{\{value\}\}/g, value) +
           "</div>"
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/d-icon.js b/app/assets/javascripts/discourse-common/addon/helpers/d-icon.js
index 454bb224b0..97f93273d9 100644
--- a/app/assets/javascripts/discourse-common/addon/helpers/d-icon.js
+++ b/app/assets/javascripts/discourse-common/addon/helpers/d-icon.js
@@ -1,6 +1,7 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { renderIcon } from "discourse-common/lib/icon-library";
+import { htmlSafe } from "@ember/template";
 
 registerUnbound("d-icon", function(id, params) {
-  return new Handlebars.SafeString(renderIcon("string", id, params));
+  return htmlSafe(renderIcon("string", id, params));
 });
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js b/app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js
index 1d657d086f..12b1823ced 100644
--- a/app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js
+++ b/app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js
@@ -1,6 +1,7 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { renderIcon } from "discourse-common/lib/icon-library";
 import deprecated from "discourse-common/lib/deprecated";
+import { htmlSafe } from "@ember/template";
 
 export function iconHTML(id, params) {
   return renderIcon("string", id, params);
@@ -8,5 +9,5 @@ export function iconHTML(id, params) {
 
 registerUnbound("fa-icon", function(icon, params) {
   deprecated("Use `{{d-icon}}` instead of `{{fa-icon}}");
-  return new Handlebars.SafeString(iconHTML(icon, params));
+  return htmlSafe(iconHTML(icon, params));
 });
diff --git a/app/assets/javascripts/discourse-common/addon/lib/helpers.js b/app/assets/javascripts/discourse-common/addon/lib/helpers.js
index 0f87040d95..759cc8995a 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/helpers.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/helpers.js
@@ -1,6 +1,7 @@
 import { get } from "@ember/object";
 import Helper from "@ember/component/helper";
 import RawHandlebars from "discourse-common/lib/raw-handlebars";
+import { htmlSafe } from "@ember/template";
 
 export function makeArray(obj) {
   if (obj === null || obj === undefined) {
@@ -13,7 +14,7 @@ export function htmlHelper(fn) {
   return Helper.helper(function(...args) {
     args =
       args.length > 1 ? args[0].concat({ hash: args[args.length - 1] }) : args;
-    return new Handlebars.SafeString(fn.apply(this, args) || "");
+    return htmlSafe(fn.apply(this, args) || "");
   });
 }
 
diff --git a/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars.js b/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars.js
index ca08cfd476..6fe7591746 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars.js
@@ -1,7 +1,8 @@
+import Handlebars from "handlebars";
+
 // This is a mechanism for quickly rendering templates which is Ember aware
 // templates are highly compatible with Ember so you don't need to worry about calling "get"
 // and discourseComputed properties function, additionally it uses stringParams like Ember does
-
 const RawHandlebars = Handlebars.create();
 
 function buildPath(blk, args) {
diff --git a/app/assets/javascripts/discourse/app/components/create-topics-notice.js b/app/assets/javascripts/discourse/app/components/create-topics-notice.js
index 7789ccd2bc..7db4e65df9 100644
--- a/app/assets/javascripts/discourse/app/components/create-topics-notice.js
+++ b/app/assets/javascripts/discourse/app/components/create-topics-notice.js
@@ -3,6 +3,7 @@ import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import { observes } from "discourse-common/utils/decorators";
 import LivePostCounts from "discourse/models/live-post-counts";
+import { htmlSafe } from "@ember/template";
 
 export default Component.extend({
   classNameBindings: ["hidden:hidden", ":create-topics-notice"],
@@ -81,7 +82,7 @@ export default Component.extend({
       msg = "too_few_posts_notice_MF";
     }
 
-    return new Handlebars.SafeString(
+    return htmlSafe(
       I18n.messageFormat(msg, {
         requiredTopics: this.requiredTopics,
         requiredPosts: this.requiredPosts,
diff --git a/app/assets/javascripts/discourse/app/helpers/category-link.js b/app/assets/javascripts/discourse/app/helpers/category-link.js
index d2141122e5..7f566b576f 100644
--- a/app/assets/javascripts/discourse/app/helpers/category-link.js
+++ b/app/assets/javascripts/discourse/app/helpers/category-link.js
@@ -5,6 +5,7 @@ import { iconHTML } from "discourse-common/lib/icon-library";
 import Category from "discourse/models/category";
 import Site from "discourse/models/site";
 import { escapeExpression } from "discourse/lib/utilities";
+import { htmlSafe } from "@ember/template";
 
 let _renderer = defaultCategoryLinkRenderer;
 
@@ -79,9 +80,7 @@ export function categoryLinkHTML(category, options) {
       categoryOptions.recursive = true;
     }
   }
-  return new Handlebars.SafeString(
-    categoryBadgeHTML(category, categoryOptions)
-  );
+  return htmlSafe(categoryBadgeHTML(category, categoryOptions));
 }
 
 registerUnbound("category-link", categoryLinkHTML);
diff --git a/app/assets/javascripts/discourse/app/helpers/custom-html.js b/app/assets/javascripts/discourse/app/helpers/custom-html.js
index fc055ee9b9..b9d424a2c9 100644
--- a/app/assets/javascripts/discourse/app/helpers/custom-html.js
+++ b/app/assets/javascripts/discourse/app/helpers/custom-html.js
@@ -1,16 +1,17 @@
 import PreloadStore from "preload-store";
+import { htmlSafe } from "@ember/template";
 
 let _customizations = {};
 
 export function getCustomHTML(key) {
   const c = _customizations[key];
   if (c) {
-    return new Handlebars.SafeString(c);
+    return htmlSafe(c);
   }
 
   const html = PreloadStore.get("customHTML");
   if (html && html[key] && html[key].length) {
-    return new Handlebars.SafeString(html[key]);
+    return htmlSafe(html[key]);
   }
 }
 
diff --git a/app/assets/javascripts/discourse/app/helpers/discourse-tag.js b/app/assets/javascripts/discourse/app/helpers/discourse-tag.js
index 1477cf9336..9a56007531 100644
--- a/app/assets/javascripts/discourse/app/helpers/discourse-tag.js
+++ b/app/assets/javascripts/discourse/app/helpers/discourse-tag.js
@@ -1,6 +1,7 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import renderTag from "discourse/lib/render-tag";
+import { htmlSafe } from "@ember/template";
 
 export default registerUnbound("discourse-tag", function(name, params) {
-  return new Handlebars.SafeString(renderTag(name, params));
+  return htmlSafe(renderTag(name, params));
 });
diff --git a/app/assets/javascripts/discourse/app/helpers/discourse-tags.js b/app/assets/javascripts/discourse/app/helpers/discourse-tags.js
index 6a7eb5e5c0..ba367e7281 100644
--- a/app/assets/javascripts/discourse/app/helpers/discourse-tags.js
+++ b/app/assets/javascripts/discourse/app/helpers/discourse-tags.js
@@ -1,6 +1,7 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import renderTags from "discourse/lib/render-tags";
+import { htmlSafe } from "@ember/template";
 
 export default registerUnbound("discourse-tags", function(topic, params) {
-  return new Handlebars.SafeString(renderTags(topic, params));
+  return htmlSafe(renderTags(topic, params));
 });
diff --git a/app/assets/javascripts/discourse/app/helpers/format-date.js b/app/assets/javascripts/discourse/app/helpers/format-date.js
index fea8f452a7..1cb8c8fbd1 100644
--- a/app/assets/javascripts/discourse/app/helpers/format-date.js
+++ b/app/assets/javascripts/discourse/app/helpers/format-date.js
@@ -1,5 +1,6 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { autoUpdatingRelativeAge } from "discourse/lib/formatter";
+import { htmlSafe } from "@ember/template";
 
 /**
   Display logic for dates. It is unbound in Ember but will use jQuery to
@@ -22,7 +23,7 @@ registerUnbound("format-date", function(val, params) {
 
   if (val) {
     var date = new Date(val);
-    return new Handlebars.SafeString(
+    return htmlSafe(
       autoUpdatingRelativeAge(date, {
         format: format,
         title: title,
diff --git a/app/assets/javascripts/discourse/app/helpers/raw-plugin-outlet.js b/app/assets/javascripts/discourse/app/helpers/raw-plugin-outlet.js
index 4aa8484a55..c03b8f66dc 100644
--- a/app/assets/javascripts/discourse/app/helpers/raw-plugin-outlet.js
+++ b/app/assets/javascripts/discourse/app/helpers/raw-plugin-outlet.js
@@ -1,10 +1,11 @@
 import { rawConnectorsFor } from "discourse/lib/plugin-connectors";
 import RawHandlebars from "discourse-common/lib/raw-handlebars";
+import { htmlSafe } from "@ember/template";
 
 RawHandlebars.registerHelper("raw-plugin-outlet", function(args) {
   const connectors = rawConnectorsFor(args.hash.name);
   if (connectors.length) {
     const output = connectors.map(c => c.template({ context: this }));
-    return new Handlebars.SafeString(output.join(""));
+    return htmlSafe(output.join(""));
   }
 });
diff --git a/app/assets/javascripts/discourse/app/helpers/raw.js b/app/assets/javascripts/discourse/app/helpers/raw.js
index db6b48d384..f1fb873927 100644
--- a/app/assets/javascripts/discourse/app/helpers/raw.js
+++ b/app/assets/javascripts/discourse/app/helpers/raw.js
@@ -1,5 +1,6 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { findRawTemplate } from "discourse/lib/raw-templates";
+import { htmlSafe } from "@ember/template";
 
 let _injections;
 
@@ -31,7 +32,7 @@ function renderRaw(ctx, container, template, templateName, params) {
     }
   }
 
-  return new Handlebars.SafeString(template(params));
+  return htmlSafe(template(params));
 }
 
 registerUnbound("raw", function(templateName, params) {
diff --git a/app/assets/javascripts/discourse/app/helpers/topic-featured-link.js b/app/assets/javascripts/discourse/app/helpers/topic-featured-link.js
index 8316af884d..ab31cc5ec4 100644
--- a/app/assets/javascripts/discourse/app/helpers/topic-featured-link.js
+++ b/app/assets/javascripts/discourse/app/helpers/topic-featured-link.js
@@ -1,6 +1,7 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import renderTopicFeaturedLink from "discourse/lib/render-topic-featured-link";
+import { htmlSafe } from "@ember/template";
 
 export default registerUnbound("topic-featured-link", function(topic, params) {
-  return new Handlebars.SafeString(renderTopicFeaturedLink(topic, params));
+  return htmlSafe(renderTopicFeaturedLink(topic, params));
 });
diff --git a/app/assets/javascripts/discourse/app/helpers/topic-link.js b/app/assets/javascripts/discourse/app/helpers/topic-link.js
index 44f9d10d54..bf8004a888 100644
--- a/app/assets/javascripts/discourse/app/helpers/topic-link.js
+++ b/app/assets/javascripts/discourse/app/helpers/topic-link.js
@@ -1,4 +1,5 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
 
 registerUnbound("topic-link", (topic, args) => {
   const title = topic.get("fancyTitle");
@@ -14,5 +15,5 @@ registerUnbound("topic-link", (topic, args) => {
   const result = `<a href='${url}'
                      class='${classes.join(" ")}'
                      data-topic-id='${topic.id}'>${title}</a>`;
-  return new Handlebars.SafeString(result);
+  return htmlSafe(result);
 });
diff --git a/app/assets/javascripts/discourse/app/helpers/user-avatar.js b/app/assets/javascripts/discourse/app/helpers/user-avatar.js
index 9d5f0cdc05..0421799ece 100644
--- a/app/assets/javascripts/discourse/app/helpers/user-avatar.js
+++ b/app/assets/javascripts/discourse/app/helpers/user-avatar.js
@@ -2,6 +2,7 @@ import { get } from "@ember/object";
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { avatarImg, formatUsername } from "discourse/lib/utilities";
 import { prioritizeNameInUx } from "discourse/lib/settings";
+import { htmlSafe } from "@ember/template";
 
 let _customAvatarHelpers;
 
@@ -75,7 +76,7 @@ function renderAvatar(user, options) {
 }
 
 registerUnbound("avatar", function(user, params) {
-  return new Handlebars.SafeString(renderAvatar.call(this, user, params));
+  return htmlSafe(renderAvatar.call(this, user, params));
 });
 
 export { renderAvatar };
diff --git a/app/assets/javascripts/discourse/app/lib/text.js b/app/assets/javascripts/discourse/app/lib/text.js
index 7f75cb497d..867ecf9d32 100644
--- a/app/assets/javascripts/discourse/app/lib/text.js
+++ b/app/assets/javascripts/discourse/app/lib/text.js
@@ -5,6 +5,7 @@ import { sanitize as textSanitize } from "pretty-text/sanitizer";
 import loadScript from "discourse/lib/load-script";
 import { formatUsername } from "discourse/lib/utilities";
 import { Promise } from "rsvp";
+import { htmlSafe } from "@ember/template";
 
 function getOpts(opts) {
   const siteSettings = Discourse.__container__.lookup("site-settings:main"),
@@ -26,7 +27,7 @@ function getOpts(opts) {
 
 // Use this to easily create a pretty text instance with proper options
 export function cook(text, options) {
-  return new Handlebars.SafeString(createPrettyText(options).cook(text));
+  return htmlSafe(createPrettyText(options).cook(text));
 }
 
 // everything should eventually move to async API and this should be renamed
diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js
index 03ef200016..b848ca7f86 100644
--- a/app/assets/javascripts/discourse/app/lib/utilities.js
+++ b/app/assets/javascripts/discourse/app/lib/utilities.js
@@ -1,5 +1,6 @@
 import { escape } from "pretty-text/sanitizer";
 import toMarkdown from "discourse/lib/to-markdown";
+import Handlebars from "handlebars";
 
 const homepageSelector = "meta[name=discourse_current_homepage]";
 
diff --git a/app/assets/javascripts/discourse/app/services/logs-notice.js b/app/assets/javascripts/discourse/app/services/logs-notice.js
index 7292e4465f..217e1bad7f 100644
--- a/app/assets/javascripts/discourse/app/services/logs-notice.js
+++ b/app/assets/javascripts/discourse/app/services/logs-notice.js
@@ -5,6 +5,7 @@ import discourseComputed, {
   observes
 } from "discourse-common/utils/decorators";
 import { autoUpdatingRelativeAge } from "discourse/lib/formatter";
+import { htmlSafe } from "@ember/template";
 
 const LOGS_NOTICE_KEY = "logs-notice-text";
 
@@ -53,7 +54,7 @@ const LogsNotice = EmberObject.extend({
 
   @discourseComputed("text")
   message(text) {
-    return new Handlebars.SafeString(text);
+    return htmlSafe(text);
   },
 
   @discourseComputed("currentUser")
diff --git a/app/assets/javascripts/handlebars-shim.js b/app/assets/javascripts/handlebars-shim.js
new file mode 100644
index 0000000000..e01e17c49e
--- /dev/null
+++ b/app/assets/javascripts/handlebars-shim.js
@@ -0,0 +1,9 @@
+// allow us to import this as a module
+if (typeof define !== "undefined") {
+  define("handlebars", ["exports"], function(__exports__) {
+    // It might not be defined server side, which is OK for pretty-text
+    if (typeof Handlebars !== "undefined") {
+      __exports__.default = Handlebars;
+    }
+  });
+}
diff --git a/app/assets/javascripts/pretty-text/sanitizer.js b/app/assets/javascripts/pretty-text/sanitizer.js
index d17ff4c178..ceeeeaba9e 100644
--- a/app/assets/javascripts/pretty-text/sanitizer.js
+++ b/app/assets/javascripts/pretty-text/sanitizer.js
@@ -24,7 +24,6 @@ function escapeChar(chr) {
 }
 
 export function escape(string) {
-  // don't escape SafeStrings, since they're already safe
   if (string === null) {
     return "";
   } else if (!string) {
diff --git a/app/assets/javascripts/template_include.js b/app/assets/javascripts/template_include.js
index 461d711ea3..e61120646e 100644
--- a/app/assets/javascripts/template_include.js
+++ b/app/assets/javascripts/template_include.js
@@ -1 +1,2 @@
 //= require handlebars.runtime
+//= require handlebars-shim
diff --git a/app/assets/javascripts/template_include.js.erb b/app/assets/javascripts/template_include.js.erb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/config/application.rb b/config/application.rb
index 6bd11004ae..0145ddbe7a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -171,6 +171,11 @@ module Discourse
     # the exclusion list does not include hbs so you double compile all this stuff
     initializer :fix_sprockets_loose_file_searcher, after: :set_default_precompile do |app|
       app.config.assets.precompile.delete(Sprockets::Railtie::LOOSE_APP_ASSETS)
+
+      # We don't want application from node_modules, only from the root
+      app.config.assets.precompile.delete(/(?:\/|\\|\A)application\.(css|js)$/)
+      app.config.assets.precompile += ['application.js']
+
       start_path = ::Rails.root.join("app/assets").to_s
       exclude = ['.es6', '.hbs', '.hbr', '.js', '.css', '']
       app.config.assets.precompile << lambda do |logical_path, filename|
diff --git a/lib/freedom_patches/raw_handlebars.rb b/lib/freedom_patches/raw_handlebars.rb
index 1242481f0e..feaee4d069 100644
--- a/lib/freedom_patches/raw_handlebars.rb
+++ b/lib/freedom_patches/raw_handlebars.rb
@@ -16,7 +16,7 @@ class Barber::Precompiler
       transpiled = transpiler.perform(source)
 
       # very hacky but lets us use ES6. I'm ashamed of this code -RW
-      transpiled = transpiled[0...transpiled.index('export ')]
+      transpiled = transpiled[transpiled.index('var RawHandlebars = ')...transpiled.index('export ')]
 
       @precompiler = StringIO.new <<~END
         var __RawHandlebars;
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 8f260089ef..73c18d0099 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -76,6 +76,7 @@ module PrettyText
     ctx.eval("__PRETTY_TEXT = true")
 
     ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/discourse-loader.js")
+    ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/handlebars-shim.js")
     ctx_load(ctx, "vendor/assets/javascripts/lodash.js")
     ctx_load_manifest(ctx, "pretty-text-bundle.js")
     ctx_load_manifest(ctx, "markdown-it-bundle.js")

From 37e93914fceda0d15be54fbac5eb07afd037bf3e Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Fri, 1 May 2020 08:33:57 +1000
Subject: [PATCH 0895/1830] FIX: the muted message should be sent after edit
 (#9593)

Recently, we added feature that we are sending `/muted` to users who muted specific topic just before `/latest` so the client knows to ignore those messages - https://github.com/discourse/discourse/pull/9482

Same `/muted` message should be included when the post is edited
---
 app/models/topic_tracking_state.rb       |  6 +++---
 lib/post_jobs_enqueuer.rb                |  2 +-
 lib/post_revisor.rb                      |  1 +
 spec/components/post_revisor_spec.rb     | 15 ++++++++++++++-
 spec/models/topic_tracking_state_spec.rb | 10 +++++-----
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index df6516c382..015e1b0c11 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -72,8 +72,8 @@ class TopicTrackingState
     "/unread/#{user_id}"
   end
 
-  def self.publish_muted(post)
-    user_ids = post.topic.topic_users
+  def self.publish_muted(topic)
+    user_ids = topic.topic_users
       .where(notification_level: NotificationLevels.all[:muted])
       .joins(:user)
       .where("users.last_seen_at > ?", 7.days.ago)
@@ -82,7 +82,7 @@ class TopicTrackingState
       .pluck(:user_id)
     return if user_ids.blank?
     message = {
-      topic_id: post.topic_id,
+      topic_id: topic.id,
       message_type: MUTED_MESSAGE_TYPE,
     }
     MessageBus.publish("/latest", message.as_json, user_ids: user_ids)
diff --git a/lib/post_jobs_enqueuer.rb b/lib/post_jobs_enqueuer.rb
index d539a4d640..afdd3cd1c9 100644
--- a/lib/post_jobs_enqueuer.rb
+++ b/lib/post_jobs_enqueuer.rb
@@ -58,7 +58,7 @@ class PostJobsEnqueuer
 
   def after_post_create
     if @post.post_number > 1
-      TopicTrackingState.publish_muted(@post)
+      TopicTrackingState.publish_muted(@post.topic)
       TopicTrackingState.publish_unread(@post)
     end
     TopicTrackingState.publish_latest(@topic, @post.whisper?)
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 0d60af6ae4..9da306db09 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -523,6 +523,7 @@ class PostRevisor
   def bump_topic
     return if bypass_bump? || !is_last_post?
     @topic.update_column(:bumped_at, Time.now)
+    TopicTrackingState.publish_muted(@topic)
     TopicTrackingState.publish_latest(@topic)
   end
 
diff --git a/spec/components/post_revisor_spec.rb b/spec/components/post_revisor_spec.rb
index e5467f44e8..b79490b139 100644
--- a/spec/components/post_revisor_spec.rb
+++ b/spec/components/post_revisor_spec.rb
@@ -6,7 +6,7 @@ require 'post_revisor'
 describe PostRevisor do
 
   fab!(:topic) { Fabricate(:topic) }
-  fab!(:newuser) { Fabricate(:newuser) }
+  fab!(:newuser) { Fabricate(:newuser, last_seen_at: Date.today) }
   fab!(:user) { Fabricate(:user) }
   fab!(:admin) { Fabricate(:admin) }
   fab!(:moderator) { Fabricate(:moderator) }
@@ -196,6 +196,19 @@ describe PostRevisor do
           subject.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + SiteSetting.editing_grace_period + 1.seconds)
         }.to change { post.topic.bumped_at }
       end
+
+      it "should send muted and latest message" do
+        TopicUser.create!(topic: post.topic, user: post.user, notification_level: 0)
+        messages = MessageBus.track_publish("/latest") do
+          subject.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + SiteSetting.editing_grace_period + 1.seconds)
+        end
+
+        muted_message = messages.find { |message| message.data["message_type"] == "muted" }
+        latest_message = messages.find { |message| message.data["message_type"] == "latest" }
+
+        expect(muted_message.data["topic_id"]).to eq(topic.id)
+        expect(latest_message.data["topic_id"]).to eq(topic.id)
+      end
     end
 
     describe 'edit reasons' do
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index 25bc127ba6..db0a13f7d2 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/spec/models/topic_tracking_state_spec.rb
@@ -81,9 +81,9 @@ describe TopicTrackingState do
     end
 
     it 'can correctly publish muted' do
-      TopicUser.find_by(topic: post.topic, user: post.user).update(notification_level: 0)
+      TopicUser.find_by(topic: topic, user: post.user).update(notification_level: 0)
       messages = MessageBus.track_publish("/latest") do
-        TopicTrackingState.publish_muted(post)
+        TopicTrackingState.publish_muted(topic)
       end
 
       muted_message = messages.find { |message| message.data["message_type"] == "muted" }
@@ -94,7 +94,7 @@ describe TopicTrackingState do
 
     it 'should not publish any message when notification level is not muted' do
       messages = MessageBus.track_publish("/latest") do
-        TopicTrackingState.publish_muted(post)
+        TopicTrackingState.publish_muted(topic)
       end
       muted_messages = messages.select { |message| message.data["message_type"] == "muted" }
 
@@ -102,10 +102,10 @@ describe TopicTrackingState do
     end
 
     it 'should not publish any message when the user was not seen in the last 7 days' do
-      TopicUser.find_by(topic: post.topic, user: post.user).update(notification_level: 0)
+      TopicUser.find_by(topic: topic, user: post.user).update(notification_level: 0)
       post.user.update(last_seen_at: 8.days.ago)
       messages = MessageBus.track_publish("/latest") do
-        TopicTrackingState.publish_muted(post)
+        TopicTrackingState.publish_muted(topic)
       end
       muted_messages = messages.select { |message| message.data["message_type"] == "muted" }
       expect(muted_messages).to eq([])

From 867bc3b48e2e34196101d5a629fb21a1d13e8d7d Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 1 May 2020 11:34:55 +1000
Subject: [PATCH 0896/1830] FIX: Change base importer to create new Bookmark
 records (#9603)

Also add a spec and fixture with a mock importer that we can use to test the create_X methods of the base importer
---
 script/import_scripts/base.rb            |  7 +--
 spec/fixtures/json/base-import-data.json | 57 ++++++++++++++++++++++++
 spec/script/import_scripts/base_spec.rb  | 57 ++++++++++++++++++++++++
 3 files changed, 118 insertions(+), 3 deletions(-)
 create mode 100644 spec/fixtures/json/base-import-data.json
 create mode 100644 spec/script/import_scripts/base_spec.rb

diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index ea43db2730..48bd67e516 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -606,9 +606,10 @@ class ImportScripts::Base
           skipped += 1
           puts "Skipping bookmark for user id #{params[:user_id]} and post id #{params[:post_id]}"
         else
-          result = PostActionCreator.create(user, post, :bookmark)
-          created += 1 if result.success?
-          skipped += 1 if result.failed?
+          result = BookmarkManager.new(user).create(post_id: post.id)
+
+          created += 1 if result.errors.none?
+          skipped += 1 if result.errors.any?
         end
       end
 
diff --git a/spec/fixtures/json/base-import-data.json b/spec/fixtures/json/base-import-data.json
new file mode 100644
index 0000000000..08f3f400c7
--- /dev/null
+++ b/spec/fixtures/json/base-import-data.json
@@ -0,0 +1,57 @@
+{
+   "bookmarks":[
+      {
+         "post_id":10,
+         "user_id":20
+      },
+      {
+         "post_id":11,
+         "user_id":20
+      },
+      {
+         "post_id":12,
+         "user_id":20
+      },
+      {
+         "post_id":13,
+         "user_id":20
+      },
+      {
+         "post_id":14,
+         "user_id":20
+      }
+   ],
+   "posts":[
+      {
+         "user_id":20,
+         "id":10,
+         "raw":"This is test post 1"
+      },
+      {
+         "user_id":20,
+         "id":11,
+         "raw":"This is test post 2"
+      },
+      {
+         "user_id":20,
+         "id":12,
+         "raw":"This is test post 3"
+      },
+      {
+         "user_id":20,
+         "id":13,
+         "raw":"This is test post 4"
+      },
+      {
+         "user_id":20,
+         "id":14,
+         "raw":"This is test post 5"
+      }
+   ],
+   "users":[
+      {
+         "id":20,
+         "email":"testimportuser@test.com"
+      }
+   ]
+}
diff --git a/spec/script/import_scripts/base_spec.rb b/spec/script/import_scripts/base_spec.rb
new file mode 100644
index 0000000000..e7594d2fa5
--- /dev/null
+++ b/spec/script/import_scripts/base_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require_relative '../../../script/import_scripts/base'
+
+describe ImportScripts::Base do
+  before do
+    STDOUT.stubs(:write)
+  end
+
+  class MockSpecImporter < ImportScripts::Base
+    def initialize(data)
+      super()
+      @import_data = data
+    end
+
+    def execute
+      import_users
+      import_posts
+      import_bookmarks
+    end
+
+    def import_users
+      users = @import_data[:users]
+      create_users(users) do |row|
+        { email: row[:email], id: row[:id] }
+      end
+    end
+
+    def import_posts
+      posts = @import_data[:posts]
+      create_posts(posts) do |row|
+        user_id = @lookup.user_id_from_imported_user_id(row[:user_id]) || -1
+        { user_id: user_id, raw: row[:raw], id: row[:id], title: "Test topic for post #{row[:id]}" }
+      end
+    end
+
+    def import_bookmarks
+      bookmarks = @import_data[:bookmarks]
+      create_bookmarks(bookmarks) do |row|
+        { post_id: row[:post_id], user_id: row[:user_id] }
+      end
+    end
+  end
+
+  let(:import_data) do
+    import_file = Rack::Test::UploadedFile.new(file_from_fixtures("base-import-data.json", "json"))
+    ActiveSupport::HashWithIndifferentAccess.new(JSON.parse(import_file.read))
+  end
+
+  it "creates bookmarks, posts, and users" do
+    MockSpecImporter.new(import_data).perform
+    expect(Bookmark.count).to eq(5)
+    expect(Post.count).to eq(5)
+    expect(User.where('id > 0').count).to eq(1)
+  end
+end

From 9e827eb420c7aefd166fba1e7724eced81aaffe7 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 30 Apr 2020 13:49:47 +0800
Subject: [PATCH 0897/1830] DEV: Refactor presence manager to deal with
 multiple composer states.

This change amends it so we use a static service to keep track of
the typing presence.

It correct various edge cases the initial implementation had

- Faster close messages
- When composing on topic 1 and viewing topic 2 we had incorrect
  presence
- Changing a running composer to reply as new topic or reply to a
  differet topic would not correctly shift presence

Authored by tgxworld, with contributions by sam
---
 .../composer-presence-display.js.es6          |  86 +++++++---
 .../components/topic-presence-display.js.es6  |  23 ++-
 .../initializers/discourse-presence.js.es6    |  32 ++++
 .../discourse/lib/presence-manager.js.es6     | 155 ++++++++++++++----
 .../composer-fields/presence.js.es6           |   8 +-
 .../presence.js.es6                           |   6 +-
 .../initializers/discourse-presence.js.es6    |  43 -----
 7 files changed, 236 insertions(+), 117 deletions(-)
 create mode 100644 plugins/discourse-presence/assets/javascripts/discourse/initializers/discourse-presence.js.es6
 delete mode 100644 plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6

diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index b1329b1ddd..a371e5f4a9 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -1,11 +1,17 @@
 import Component from "@ember/component";
+import { getOwner } from "@ember/application";
 import { cancel } from "@ember/runloop";
-import { equal, gt, readOnly } from "@ember/object/computed";
+import { equal, gt } from "@ember/object/computed";
 import discourseComputed, {
   observes,
   on
 } from "discourse-common/utils/decorators";
-import { REPLYING, CLOSED, EDITING } from "../lib/presence-manager";
+import {
+  REPLYING,
+  CLOSED,
+  EDITING,
+  COMPOSER_TYPE
+} from "../lib/presence-manager";
 import { REPLY, EDIT } from "discourse/models/composer";
 
 export default Component.extend({
@@ -16,46 +22,72 @@ export default Component.extend({
   reply: null,
   title: null,
   isWhispering: null,
+  presenceManager: null,
+
+  init() {
+    this._super(...arguments);
+
+    this.setProperties({
+      presenceManager: getOwner(this).lookup("presence-manager:main")
+    });
+  },
+
+  @discourseComputed("topic.id")
+  users(topicId) {
+    return this.presenceManager.users(topicId);
+  },
+
+  @discourseComputed("topic.id")
+  editingUsers(topicId) {
+    return this.presenceManager.editingUsers(topicId);
+  },
 
-  presenceManager: readOnly("topic.presenceManager"),
-  users: readOnly("presenceManager.users"),
-  editingUsers: readOnly("presenceManager.editingUsers"),
   isReply: equal("action", "reply"),
 
   @on("didInsertElement")
   subscribe() {
-    this.presenceManager.subscribe();
+    this.presenceManager.subscribe(this.get("topic.id"), COMPOSER_TYPE);
   },
 
   @discourseComputed(
     "post.id",
     "editingUsers.@each.last_seen",
-    "users.@each.last_seen"
+    "users.@each.last_seen",
+    "action"
   )
-  presenceUsers(postId, editingUsers, users) {
-    if (postId) {
+  presenceUsers(postId, editingUsers, users, action) {
+    if (action === EDIT) {
       return editingUsers.filterBy("post_id", postId);
-    } else {
+    } else if (action === REPLY) {
       return users;
     }
+    return [];
   },
 
   shouldDisplay: gt("presenceUsers.length", 0),
 
   @observes("reply", "title")
   typing() {
-    let action = this.action;
+    const action = this.action;
 
     if (action !== REPLY && action !== EDIT) {
       return;
     }
 
-    const postId = this.get("post.id");
+    let data = {
+      topicId: this.get("topic.id"),
+      state: action === EDIT ? EDITING : REPLYING,
+      whisper: this.whisper,
+      postId: this.get("post.id")
+    };
+
+    this._prevPublishData = data;
 
     this._throttle = this.presenceManager.throttlePublish(
-      action === EDIT ? EDITING : REPLYING,
-      this.whisper,
-      action === EDIT ? postId : undefined
+      data.topicId,
+      data.state,
+      data.whisper,
+      data.postId
     );
   },
 
@@ -64,20 +96,30 @@ export default Component.extend({
     this._cancelThrottle();
   },
 
-  @observes("post.id")
-  stopEditing() {
-    if (!this.get("post.id")) {
-      this.presenceManager.publish(CLOSED, this.whisper);
+  @observes("action", "topic.id")
+  composerState() {
+    if (this._prevPublishData) {
+      this.presenceManager.publish(
+        this._prevPublishData.topicId,
+        CLOSED,
+        this._prevPublishData.whisper,
+        this._prevPublishData.postId
+      );
+      this._prevPublishData = null;
     }
   },
 
   @on("willDestroyElement")
-  composerClosing() {
+  closeComposer() {
     this._cancelThrottle();
-    this.presenceManager.publish(CLOSED, this.whisper);
+    this._prevPublishData = null;
+    this.presenceManager.cleanUpPresence(COMPOSER_TYPE);
   },
 
   _cancelThrottle() {
-    cancel(this._throttle);
+    if (this._throttle) {
+      cancel(this._throttle);
+      this._throttle = null;
+    }
   }
 });
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
index bedb292144..2f683ca741 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
@@ -1,21 +1,32 @@
 import Component from "@ember/component";
-import { gt, readOnly } from "@ember/object/computed";
-import { on } from "discourse-common/utils/decorators";
+import { getOwner } from "@ember/application";
+import { gt } from "@ember/object/computed";
+import discourseComputed, { on } from "discourse-common/utils/decorators";
+import { TOPIC_TYPE } from "../lib/presence-manager";
 
 export default Component.extend({
   topic: null,
+  presenceManager: null,
+
+  init() {
+    this._super(...arguments);
+    this.set("presenceManager", getOwner(this).lookup("presence-manager:main"));
+  },
+
+  @discourseComputed("topic.id")
+  users(topicId) {
+    return this.presenceManager.users(topicId);
+  },
 
-  presenceManager: readOnly("topic.presenceManager"),
-  users: readOnly("presenceManager.users"),
   shouldDisplay: gt("users.length", 0),
 
   @on("didInsertElement")
   subscribe() {
-    this.presenceManager.subscribe();
+    this.presenceManager.subscribe(this.get("topic.id"), TOPIC_TYPE);
   },
 
   @on("willDestroyElement")
   _destroyed() {
-    this.presenceManager.unsubscribe();
+    this.presenceManager.unsubscribe(this.get("topic.id"), TOPIC_TYPE);
   }
 });
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/initializers/discourse-presence.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/initializers/discourse-presence.js.es6
new file mode 100644
index 0000000000..1009fc1453
--- /dev/null
+++ b/plugins/discourse-presence/assets/javascripts/discourse/initializers/discourse-presence.js.es6
@@ -0,0 +1,32 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
+import PresenceManager from "../lib/presence-manager";
+import ENV from "discourse-common/config/environment";
+
+function initializeDiscoursePresence(api, { app }) {
+  const currentUser = api.getCurrentUser();
+
+  if (currentUser) {
+    app.register(
+      "presence-manager:main",
+      PresenceManager.create({
+        currentUser,
+        messageBus: api.container.lookup("message-bus:main"),
+        siteSettings: api.container.lookup("site-settings:main")
+      }),
+      { instantiate: false }
+    );
+  }
+}
+
+export default {
+  name: "discourse-presence",
+  after: "message-bus",
+
+  initialize(container, app) {
+    const siteSettings = container.lookup("site-settings:main");
+
+    if (siteSettings.presence_enabled && ENV.environment !== "test") {
+      withPluginApi("0.8.40", initializeDiscoursePresence, { app });
+    }
+  }
+};
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/lib/presence-manager.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/lib/presence-manager.js.es6
index 5943f76ce5..1be35640ca 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/lib/presence-manager.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/lib/presence-manager.js.es6
@@ -26,11 +26,14 @@ export const REPLYING = "replying";
 export const EDITING = "editing";
 export const CLOSED = "closed";
 
-const PresenceManager = EmberObject.extend({
+export const TOPIC_TYPE = "topic";
+export const COMPOSER_TYPE = "composer";
+
+const Presence = EmberObject.extend({
   users: null,
   editingUsers: null,
-  subscribed: null,
-  topic: null,
+  subscribers: null,
+  topicId: null,
   currentUser: null,
   messageBus: null,
   siteSettings: null,
@@ -41,46 +44,57 @@ const PresenceManager = EmberObject.extend({
     this.setProperties({
       users: [],
       editingUsers: [],
-      subscribed: false
+      subscribers: new Set()
     });
   },
 
-  subscribe() {
-    if (this.subscribed) return;
+  subscribe(type) {
+    if (this.subscribers.size === 0) {
+      this.messageBus.subscribe(
+        this.channel,
+        message => {
+          const { user, state } = message;
+          if (this.get("currentUser.id") === user.id) return;
 
-    this.messageBus.subscribe(
-      this.channel,
-      message => {
-        const { user, state } = message;
-        if (this.get("currentUser.id") === user.id) return;
+          switch (state) {
+            case REPLYING:
+              this._appendUser(this.users, user);
+              break;
+            case EDITING:
+              this._appendUser(this.editingUsers, user, {
+                post_id: parseInt(message.post_id, 10)
+              });
+              break;
+            case CLOSED:
+              this._removeUser(user);
+              break;
+          }
+        },
+        MESSAGE_BUS_LAST_ID
+      );
+    }
 
-        switch (state) {
-          case REPLYING:
-            this._appendUser(this.users, user);
-            break;
-          case EDITING:
-            this._appendUser(this.editingUsers, user, {
-              post_id: parseInt(message.post_id, 10)
-            });
-            break;
-          case CLOSED:
-            this._removeUser(user);
-            break;
-        }
-      },
-      MESSAGE_BUS_LAST_ID
-    );
-
-    this.set("subscribed", true);
+    this.subscribers.add(type);
   },
 
-  unsubscribe() {
-    this.messageBus.unsubscribe(this.channel);
-    this._stopTimer();
-    this.set("subscribed", false);
+  unsubscribe(type) {
+    this.subscribers.delete(type);
+    const noSubscribers = this.subscribers.size === 0;
+
+    if (noSubscribers) {
+      this.messageBus.unsubscribe(this.channel);
+      this._stopTimer();
+
+      this.setProperties({
+        users: [],
+        editingUsers: []
+      });
+    }
+
+    return noSubscribers;
   },
 
-  @discourseComputed("topic.id")
+  @discourseComputed("topicId")
   channel(topicId) {
     return `/presence/${topicId}`;
   },
@@ -101,14 +115,14 @@ const PresenceManager = EmberObject.extend({
 
     const data = {
       state,
-      topic_id: this.get("topic.id")
+      topic_id: this.topicId
     };
 
     if (whisper) {
       data.is_whisper = 1;
     }
 
-    if (postId) {
+    if (postId && state === EDITING) {
       data.post_id = postId;
     }
 
@@ -200,4 +214,73 @@ const PresenceManager = EmberObject.extend({
   }
 });
 
+const PresenceManager = EmberObject.extend({
+  presences: null,
+  currentUser: null,
+  messageBus: null,
+  siteSettings: null,
+
+  init() {
+    this._super(...arguments);
+
+    this.setProperties({
+      presences: {}
+    });
+  },
+
+  subscribe(topicId, type) {
+    if (!topicId) return;
+    this._getPresence(topicId).subscribe(type);
+  },
+
+  unsubscribe(topicId, type) {
+    if (!topicId) return;
+    const presence = this._getPresence(topicId);
+
+    if (presence.unsubscribe(type)) {
+      delete this.presences[topicId];
+    }
+  },
+
+  users(topicId) {
+    if (!topicId) return [];
+    return this._getPresence(topicId).users;
+  },
+
+  editingUsers(topicId) {
+    if (!topicId) return [];
+    return this._getPresence(topicId).editingUsers;
+  },
+
+  throttlePublish(topicId, state, whisper, postId) {
+    if (!topicId) return;
+    return this._getPresence(topicId).throttlePublish(state, whisper, postId);
+  },
+
+  publish(topicId, state, whisper, postId) {
+    if (!topicId) return;
+    return this._getPresence(topicId).publish(state, whisper, postId);
+  },
+
+  cleanUpPresence(type) {
+    Object.keys(this.presences).forEach(key => {
+      this.publish(key, CLOSED);
+      this.unsubscribe(key, type);
+    });
+  },
+
+  _getPresence(topicId) {
+    if (!this.presences[topicId]) {
+      this.presences[topicId] = Presence.create({
+        messageBus: this.messageBus,
+        siteSettings: this.siteSettings,
+        currentUser: this.currentUser,
+        topicId
+      });
+    }
+
+    return this.presences[topicId];
+  }
+});
+
 export default PresenceManager;
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6
index 0240e68027..5165da1a21 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6
@@ -1,9 +1,5 @@
 export default {
-  shouldRender(args, component) {
-    return (
-      component.siteSettings.presence_enabled &&
-      args.model.topic &&
-      args.model.topic.presenceManager
-    );
+  shouldRender(_, component) {
+    return component.siteSettings.presence_enabled;
   }
 };
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.js.es6
index db452d54c7..5165da1a21 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.js.es6
@@ -1,7 +1,5 @@
 export default {
-  shouldRender(args, component) {
-    return (
-      component.siteSettings.presence_enabled && args.model.presenceManager
-    );
+  shouldRender(_, component) {
+    return component.siteSettings.presence_enabled;
   }
 };
diff --git a/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6 b/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6
deleted file mode 100644
index 98ec813198..0000000000
--- a/plugins/discourse-presence/assets/javascripts/initializers/discourse-presence.js.es6
+++ /dev/null
@@ -1,43 +0,0 @@
-import { withPluginApi } from "discourse/lib/plugin-api";
-import PresenceManager from "../discourse/lib/presence-manager";
-import ENV from "discourse-common/config/environment";
-
-function initializeDiscoursePresence(api) {
-  const currentUser = api.getCurrentUser();
-  const siteSettings = api.container.lookup("site-settings:main");
-
-  if (currentUser) {
-    api.modifyClass("model:topic", {
-      presenceManager: null
-    });
-
-    api.modifyClass("route:topic-from-params", {
-      setupController() {
-        this._super(...arguments);
-
-        this.modelFor("topic").set(
-          "presenceManager",
-          PresenceManager.create({
-            topic: this.modelFor("topic"),
-            currentUser,
-            messageBus: api.container.lookup("message-bus:main"),
-            siteSettings
-          })
-        );
-      }
-    });
-  }
-}
-
-export default {
-  name: "discourse-presence",
-  after: "message-bus",
-
-  initialize(container) {
-    const siteSettings = container.lookup("site-settings:main");
-
-    if (siteSettings.presence_enabled && ENV.environment !== "test") {
-      withPluginApi("0.8.40", initializeDiscoursePresence);
-    }
-  }
-};

From 43210004e56f2b1a77bc1ebc60405bc125aa7d81 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 May 2020 11:58:57 +1000
Subject: [PATCH 0898/1830] DEV: Bump parser from 2.7.1.1 to 2.7.1.2 (#9602)

Bumps [parser](https://github.com/whitequark/parser) from 2.7.1.1 to 2.7.1.2.
- [Release notes](https://github.com/whitequark/parser/releases)
- [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/whitequark/parser/compare/v2.7.1.1...v2.7.1.2)

Very minor, used for ruby 2.7 support
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8347dc5d4c..66c8738368 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -253,7 +253,7 @@ GEM
     parallel (1.19.1)
     parallel_tests (2.32.0)
       parallel
-    parser (2.7.1.1)
+    parser (2.7.1.2)
       ast (~> 2.4.0)
     pg (1.2.3)
     progress (3.5.2)

From 4afbcb9872d7e1814f343dff0afb86bce9d9200c Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 30 Apr 2020 23:19:32 -0400
Subject: [PATCH 0899/1830] Minor header title spacing reduction

---
 app/assets/stylesheets/common/base/header.scss | 2 +-
 app/assets/stylesheets/mobile/header.scss      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 42e57ae88f..6142120652 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -255,7 +255,7 @@
     }
   }
   .header-title {
-    margin: 0 0 0.15em 0;
+    margin: 0 0 0.1em 0;
     .archetype-private_message & {
       // PMs might have participant avatars in the header
       margin: 0;
diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss
index 413d753fc6..59bb253de2 100644
--- a/app/assets/stylesheets/mobile/header.scss
+++ b/app/assets/stylesheets/mobile/header.scss
@@ -38,7 +38,7 @@
       }
       .header-title {
         font-size: $font-0;
-        margin: 0 0 0.35em 0;
+        margin: 0 0 0.25em 0;
         .archetype-private_message & {
           // PMs might have participant avatars in the header
           margin: 0 0 0.15em 0;

From 5ff24b689125d61ce4ab2fe0af232ebfa4d8dd68 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 1 May 2020 10:03:40 +0530
Subject: [PATCH 0900/1830] FIX: do not raise error if 'class' attribute is not
 found.

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

diff --git a/lib/excerpt_parser.rb b/lib/excerpt_parser.rb
index 4a2f483f36..054a123401 100644
--- a/lib/excerpt_parser.rb
+++ b/lib/excerpt_parser.rb
@@ -97,7 +97,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
 
     when "aside"
       attributes = Hash[*attributes.flatten]
-      unless (@keep_onebox_source || @keep_onebox_body) && attributes['class'].include?('onebox')
+      unless (@keep_onebox_source || @keep_onebox_body) && attributes['class']&.include?('onebox')
         @in_quote = true
       end
 

From bcc9ad6f57f72faa1367063117cf992ce1031a08 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 1 May 2020 16:14:20 +1000
Subject: [PATCH 0901/1830] FIX: Bookmark UI tweaks (#9604)

* When hovering over the bookmark icon for a post, show the name of the bookmark at the end of the tooltip _if_ it has been set.
* Order bookmarks by `updated_at DESC` in the user list and show that instead of created at.
---
 .../discourse/app/lib/transform-post.js       |  1 +
 .../app/templates/user/bookmarks.hbs          |  4 +--
 .../discourse/app/widgets/post-menu.js        | 10 ++++---
 app/serializers/user_bookmark_serializer.rb   |  1 +
 config/locales/client.en.yml                  |  7 ++---
 lib/bookmark_query.rb                         |  3 +--
 spec/lib/bookmark_query_spec.rb               | 27 ++++++++++++++-----
 7 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/transform-post.js b/app/assets/javascripts/discourse/app/lib/transform-post.js
index 60823f04fb..c48f042160 100644
--- a/app/assets/javascripts/discourse/app/lib/transform-post.js
+++ b/app/assets/javascripts/discourse/app/lib/transform-post.js
@@ -36,6 +36,7 @@ export function transformBasicPost(post) {
     avatar_template: post.avatar_template,
     bookmarked: post.bookmarked,
     bookmarkReminderAt: post.bookmark_reminder_at,
+    bookmarkName: post.bookmark_name,
     bookmarkReminderType: post.bookmark_reminder_type,
     yours: post.yours,
     shareUrl: post.get("shareUrl"),
diff --git a/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
index 77ecf91231..aa40b814b5 100644
--- a/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
@@ -6,7 +6,7 @@
       <table class="topic-list bookmark-list">
         <thead>
           <th>{{i18n "topic.title"}}</th>
-          <th>{{i18n "post.bookmarks.created"}}</th>
+          <th>{{i18n "post.bookmarks.updated"}}</th>
           <th>{{i18n "activity"}}</th>
           <th>&nbsp;</th>
         </thead>
@@ -39,7 +39,7 @@
                   {{discourse-tags bookmark mode="list" tagsForUser=tagsForUser}}
                 </div>
               </td>
-              <td>{{format-date bookmark.created_at format="tiny"}}</td>
+              <td>{{format-date bookmark.updated_at format="tiny"}}</td>
               {{raw "list/activity-column" topic=bookmark class="num" tagName="td"}}
               <td>
                 {{bookmark-actions-dropdown
diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
index 73a786e0e3..62489dc94d 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@@ -289,7 +289,7 @@ registerButton("bookmark", attrs => {
 
   let classNames = ["bookmark", "with-reminder"];
   let title = "bookmarks.not_bookmarked";
-  let titleOptions = {};
+  let titleOptions = { name: "" };
 
   if (attrs.bookmarked) {
     classNames.push("bookmarked");
@@ -300,14 +300,16 @@ registerButton("bookmark", attrs => {
         Discourse.currentUser.resolvedTimezone()
       );
       title = "bookmarks.created_with_reminder";
-      titleOptions = {
-        date: formattedReminder
-      };
+      titleOptions.date = formattedReminder;
     } else if (attrs.bookmarkReminderType === "at_desktop") {
       title = "bookmarks.created_with_at_desktop_reminder";
     } else {
       title = "bookmarks.created";
     }
+
+    if (attrs.bookmarkName) {
+      titleOptions.name = `. ${attrs.bookmarkName}`;
+    }
   }
 
   return {
diff --git a/app/serializers/user_bookmark_serializer.rb b/app/serializers/user_bookmark_serializer.rb
index b87b3a9d00..d4fcc4a72d 100644
--- a/app/serializers/user_bookmark_serializer.rb
+++ b/app/serializers/user_bookmark_serializer.rb
@@ -8,6 +8,7 @@ class UserBookmarkSerializer < ApplicationSerializer
 
   attributes :id,
              :created_at,
+             :updated_at,
              :topic_id,
              :linked_post_number,
              :post_id,
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9c5d262701..d7ffe903a8 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -307,10 +307,10 @@ en:
         unbookmark_with_reminder: "Click to remove all bookmarks and reminders in this topic. You have a reminder set %{reminder_at} for this topic."
 
     bookmarks:
-      created: "you've bookmarked this post"
+      created: "you've bookmarked this post%{name}"
       not_bookmarked: "bookmark this post"
-      created_with_reminder: "you've bookmarked this post with a reminder %{date}"
-      created_with_at_desktop_reminder: "you've bookmarked this post and will be reminded next time you are at your desktop"
+      created_with_reminder: "you've bookmarked this post with a reminder %{date}%{name}"
+      created_with_at_desktop_reminder: "you've bookmarked this post and will be reminded next time you are at your desktop%{name}"
       remove: "Remove Bookmark"
       delete: "Delete Bookmark"
       confirm_delete: "Are you sure you want to delete this bookmark? The reminder will also be deleted."
@@ -2724,6 +2724,7 @@ en:
         create: "Create bookmark"
         edit: "Edit bookmark"
         created: "Created"
+        updated: "Updated"
         name: "Name"
         name_placeholder: "What is this bookmark for?"
         set_reminder: "Remind me"
diff --git a/lib/bookmark_query.rb b/lib/bookmark_query.rb
index 45442c211f..b5351f108a 100644
--- a/lib/bookmark_query.rb
+++ b/lib/bookmark_query.rb
@@ -27,8 +27,7 @@ class BookmarkQuery
   end
 
   def list_all
-    results = user_bookmarks
-      .order('bookmarks.created_at DESC')
+    results = user_bookmarks.order('bookmarks.updated_at DESC')
 
     topics = Topic.listable_topics.secured(@guardian)
     pms = Topic.private_messages_for_user(@user)
diff --git a/spec/lib/bookmark_query_spec.rb b/spec/lib/bookmark_query_spec.rb
index c627abfc85..de71757538 100644
--- a/spec/lib/bookmark_query_spec.rb
+++ b/spec/lib/bookmark_query_spec.rb
@@ -4,20 +4,16 @@ require 'rails_helper'
 
 RSpec.describe BookmarkQuery do
   fab!(:user) { Fabricate(:user) }
-  fab!(:bookmark1) { Fabricate(:bookmark, user: user) }
-  fab!(:bookmark2) { Fabricate(:bookmark, user: user) }
   let(:params) { {} }
 
   def bookmark_query(user: nil, params: nil)
     BookmarkQuery.new(user: user || self.user, params: params || self.params)
   end
 
-  before do
-    TopicUser.change(user.id, bookmark1.topic_id, total_msecs_viewed: 1)
-    TopicUser.change(user.id, bookmark2.topic_id, total_msecs_viewed: 1)
-  end
-
   describe "#list_all" do
+    fab!(:bookmark1) { Fabricate(:bookmark, user: user) }
+    fab!(:bookmark2) { Fabricate(:bookmark, user: user) }
+
     it "returns all the bookmarks for a user" do
       expect(bookmark_query.list_all.count).to eq(2)
     end
@@ -143,4 +139,21 @@ RSpec.describe BookmarkQuery do
       end
     end
   end
+
+  describe "#list_all ordering" do
+    let!(:bookmark1) { Fabricate(:bookmark, user: user, updated_at: 1.day.ago) }
+    let!(:bookmark2) { Fabricate(:bookmark, user: user, updated_at: 2.days.ago) }
+    let!(:bookmark3) { Fabricate(:bookmark, user: user, updated_at: 6.days.ago) }
+    let!(:bookmark4) { Fabricate(:bookmark, user: user, updated_at: 4.days.ago) }
+    let!(:bookmark5) { Fabricate(:bookmark, user: user, updated_at: 3.days.ago) }
+    it "orders by updated_at" do
+      expect(bookmark_query.list_all.map(&:id)).to eq([
+        bookmark1.id,
+        bookmark2.id,
+        bookmark5.id,
+        bookmark4.id,
+        bookmark3.id
+      ])
+    end
+  end
 end

From 2d287ef16a90830d3c83740c000968eacb73581c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 1 May 2020 10:42:28 +0200
Subject: [PATCH 0902/1830] FIX: ensures an anonymous shortcut fn can be used
 globally (#9605)

---
 app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
index b9b5ed22b4..2fe61c5be9 100644
--- a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
@@ -494,7 +494,7 @@ export default {
   _globalBindToFunction(func, binding) {
     let funcToBind = typeof func === "function" ? func : this[func];
     if (typeof funcToBind === "function") {
-      this.keyTrapper.bindGlobal(binding, this[func].bind(this));
+      this.keyTrapper.bindGlobal(binding, funcToBind.bind(this));
     }
   },
 

From a4a7ee110b4ad24e107cbeea5729d14a505599b2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 May 2020 11:04:53 -0400
Subject: [PATCH 0903/1830] Build(deps-dev): Bump rubocop-rspec from 1.38.1 to
 1.39.0 (#9606)

Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.38.1 to 1.39.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.38.1...v1.39.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 66c8738368..e36fbdf118 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -352,7 +352,7 @@ GEM
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-discourse (2.0.1)
       rubocop (>= 0.69.0)
-    rubocop-rspec (1.38.1)
+    rubocop-rspec (1.39.0)
       rubocop (>= 0.68.1)
     ruby-prof (1.3.2)
     ruby-progressbar (1.10.1)

From d908bf101da36840bcdf4ca9e13b7449e4e04cd3 Mon Sep 17 00:00:00 2001
From: Artem Vasiliev <artem.job@gmail.com>
Date: Fri, 1 May 2020 18:05:36 +0300
Subject: [PATCH 0904/1830] FIX: an `<a>` with a target of _blank wants a new
 window (#9607)

..even if it wraps an image
---
 app/assets/javascripts/discourse/app/lib/intercept-click.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/intercept-click.js b/app/assets/javascripts/discourse/app/lib/intercept-click.js
index 31a3c4666d..fc25322a02 100644
--- a/app/assets/javascripts/discourse/app/lib/intercept-click.js
+++ b/app/assets/javascripts/discourse/app/lib/intercept-click.js
@@ -7,7 +7,7 @@ export function wantsNewWindow(e) {
     e.metaKey ||
     e.ctrlKey ||
     (e.button && e.button !== 0) ||
-    (e.target && e.target.target === "_blank")
+    (e.currentTarget && e.currentTarget.target === "_blank")
   );
 }
 

From 85605efe84eeb23b9835263c2c39d283dae9fd96 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 May 2020 11:06:03 -0400
Subject: [PATCH 0905/1830] Build(deps): Bump redis from 4.1.3 to 4.1.4 (#9608)

Bumps [redis](https://github.com/redis/redis-rb) from 4.1.3 to 4.1.4.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.1.3...v4.1.4)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index e36fbdf118..debd4f879a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -300,7 +300,7 @@ GEM
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
     rchardet (1.8.0)
-    redis (4.1.3)
+    redis (4.1.4)
     redis-namespace (1.7.0)
       redis (>= 3.0.4)
     request_store (1.5.0)

From f182e61def807256667afbad396b8798d1014230 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 1 May 2020 14:11:45 -0400
Subject: [PATCH 0906/1830] DEV: Remove global Handlebars

---
 .eslintignore                                             | 2 ++
 .../javascripts/discourse/app/controllers/composer.js     | 2 +-
 app/assets/javascripts/discourse/app/controllers/topic.js | 3 ++-
 .../discourse/app/initializers/auto-load-modules.js       | 1 +
 .../discourse/app/initializers/live-development.js        | 1 +
 app/assets/javascripts/handlebars-shim.js                 | 6 ++++++
 package.json                                              | 2 +-
 test/javascripts/acceptance/raw-plugin-outlet-test.js     | 3 ++-
 yarn.lock                                                 | 8 ++++----
 9 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 6676467368..e877e0062b 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -13,3 +13,5 @@ vendor/
 test/javascripts/test_helper.js
 test/javascripts/fixtures
 test/javascripts/helpers/assertions.js
+node_modules/
+dist/
diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index 9d04586c11..9ed71e654a 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -352,7 +352,7 @@ export default Controller.extend({
         if (!url || !topicTitle) return;
 
         url = `${location.protocol}//${location.host}${url}`;
-        const link = `[${Handlebars.escapeExpression(topicTitle)}](${url})`;
+        const link = `[${escapeExpression(topicTitle)}](${url})`;
         const continueDiscussion = I18n.t("post.continue_discussion", {
           postLink: link
         });
diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index a49cbaf2e2..3ec58a5556 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -21,6 +21,7 @@ import { userPath } from "discourse/lib/url";
 import showModal from "discourse/lib/show-modal";
 import TopicTimer from "discourse/models/topic-timer";
 import { Promise } from "rsvp";
+import { escapeExpression } from "discourse/lib/utilities";
 
 let customPostMessageCallbacks = {};
 
@@ -976,7 +977,7 @@ export default Controller.extend(bufferedProperty("model"), {
       }
 
       composerController.open(options).then(() => {
-        const title = Handlebars.escapeExpression(this.model.title);
+        const title = escapeExpression(this.model.title);
         const postUrl = `${location.protocol}//${location.host}${post.url}`;
         const postLink = `[${title}](${postUrl})`;
         const text = `${I18n.t("post.continue_discussion", {
diff --git a/app/assets/javascripts/discourse/app/initializers/auto-load-modules.js b/app/assets/javascripts/discourse/app/initializers/auto-load-modules.js
index 3e1505a5dd..bea9bf4795 100644
--- a/app/assets/javascripts/discourse/app/initializers/auto-load-modules.js
+++ b/app/assets/javascripts/discourse/app/initializers/auto-load-modules.js
@@ -1,6 +1,7 @@
 import { registerHelpers } from "discourse-common/lib/helpers";
 import RawHandlebars from "discourse-common/lib/raw-handlebars";
 import { registerRawHelpers } from "discourse-common/lib/raw-handlebars-helpers";
+import Handlebars from "handlebars";
 
 export function autoLoadModules(container, registry) {
   Object.keys(requirejs.entries).forEach(entry => {
diff --git a/app/assets/javascripts/discourse/app/initializers/live-development.js b/app/assets/javascripts/discourse/app/initializers/live-development.js
index 38afdbc9b7..fe3d59875b 100644
--- a/app/assets/javascripts/discourse/app/initializers/live-development.js
+++ b/app/assets/javascripts/discourse/app/initializers/live-development.js
@@ -1,6 +1,7 @@
 import DiscourseURL from "discourse/lib/url";
 import { currentThemeIds, refreshCSS } from "discourse/lib/theme-selector";
 import ENV from "discourse-common/config/environment";
+import Handlebars from "handlebars";
 
 //  Use the message bus for live reloading of components for faster development.
 export default {
diff --git a/app/assets/javascripts/handlebars-shim.js b/app/assets/javascripts/handlebars-shim.js
index e01e17c49e..85a73c56a8 100644
--- a/app/assets/javascripts/handlebars-shim.js
+++ b/app/assets/javascripts/handlebars-shim.js
@@ -3,7 +3,13 @@ if (typeof define !== "undefined") {
   define("handlebars", ["exports"], function(__exports__) {
     // It might not be defined server side, which is OK for pretty-text
     if (typeof Handlebars !== "undefined") {
+      // eslint-disable-next-line
       __exports__.default = Handlebars;
     }
   });
+
+  define("handlebars-compiler", ["exports"], function(__exports__) {
+    // eslint-disable-next-line
+    __exports__.default = Handlebars.compile;
+  });
 }
diff --git a/package.json b/package.json
index 0a745f479b..95dc2e4d05 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "chrome-launcher": "^0.12.0",
     "chrome-remote-interface": "^0.25",
     "ember-template-lint": "^2.5.2",
-    "eslint-config-discourse": "1.1.0",
+    "eslint-config-discourse": "1.1.1",
     "eslint-plugin-discourse-ember": "0.0.3",
     "lodash-cli": "https://github.com/lodash-archive/lodash-cli.git",
     "pretender": "^1.6",
diff --git a/test/javascripts/acceptance/raw-plugin-outlet-test.js b/test/javascripts/acceptance/raw-plugin-outlet-test.js
index 62ea96028f..8f104ce37b 100644
--- a/test/javascripts/acceptance/raw-plugin-outlet-test.js
+++ b/test/javascripts/acceptance/raw-plugin-outlet-test.js
@@ -1,10 +1,11 @@
 import { acceptance } from "helpers/qunit-helpers";
+import compile from "handlebars-compiler";
 
 const CONNECTOR =
   "javascripts/raw-test/connectors/topic-list-before-status/lala";
 acceptance("Raw Plugin Outlet", {
   beforeEach() {
-    Discourse.RAW_TEMPLATES[CONNECTOR] = Handlebars.compile(
+    Discourse.RAW_TEMPLATES[CONNECTOR] = compile(
       `<span class='topic-lala'>{{context.topic.id}}</span>`
     );
   },
diff --git a/yarn.lock b/yarn.lock
index 4383920b0f..742a3bd36e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -969,10 +969,10 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-eslint-config-discourse@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-1.1.0.tgz#1f2b1ffd6064c579bc74eca63420bd3cd5732950"
-  integrity sha512-y2osWnbIi/CS2hDm61K6vdYA5vEuFJRetI2UFlEo8rQCx2t46XUd+FkgAvBy0nzLSm7ELBKru5qYKveKFF6eAg==
+eslint-config-discourse@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-1.1.1.tgz#8a7f7f6f1a388b0e88f5b79145ae2a8b4a13e3d4"
+  integrity sha512-b3dp9DOcXYWkPQpXms/bMDy0Scb6DO/nZAAsl5I9yTNhtkx96zZMTp9QEyC8QaCXOTUpIXEE6V+Mpyjtsk3gWg==
   dependencies:
     babel-eslint "^8.2"
     eslint "^4.19"

From cdbba81ee00efb1ea77109bb64842f6cbf890ad0 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 1 May 2020 20:19:17 +0200
Subject: [PATCH 0907/1830] UX: collapse extra files when browsing a theme
 component (#9610)

---
 .../admin/templates/customize-themes-show.hbs | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 828eee4c5b..0e452a960c 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -231,18 +231,20 @@
   {{#if extraFiles.length}}
     <div class="control-unit">
       <div class="mini-title">{{i18n "admin.customize.theme.extra_files"}}</div>
-      <div class="description">
-        {{#if model.remote_theme}}
-          {{i18n "admin.customize.theme.extra_files_remote"}}
-        {{else}}
-          {{i18n "admin.customize.theme.extra_files_upload"}}
-        {{/if}}
-      </div>
-      <ul>
-        {{#each extraFiles as |extraFile|}}
-          <li>{{extraFile.name}}</li>
-        {{/each}}
-      </ul>
+      <details>
+        <summary>
+          {{#if model.remote_theme}}
+            {{i18n "admin.customize.theme.extra_files_remote"}}
+          {{else}}
+            {{i18n "admin.customize.theme.extra_files_upload"}}
+          {{/if}}
+        </summary>
+        <ul>
+          {{#each extraFiles as |extraFile|}}
+            <li>{{extraFile.name}}</li>
+          {{/each}}
+        </ul>
+      </details>
     </div>
   {{/if}}
 

From e57fd283db3b6501edad53a7acf45b5659f8a09d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 1 May 2020 15:18:41 -0400
Subject: [PATCH 0908/1830] DEV: Rename `deprecated` to the more appropriate
 app-boot

---
 app/assets/javascripts/app-boot.js              | 11 +++++++++++
 app/assets/javascripts/application.js           |  3 ++-
 app/assets/javascripts/deprecated.js            |  4 ----
 app/assets/javascripts/discourse/app/app.js     | 17 +----------------
 .../inject-discourse-objects.js                 |  5 ++---
 lib/discourse_js_processor.rb                   |  1 +
 6 files changed, 17 insertions(+), 24 deletions(-)
 create mode 100644 app/assets/javascripts/app-boot.js
 delete mode 100644 app/assets/javascripts/deprecated.js

diff --git a/app/assets/javascripts/app-boot.js b/app/assets/javascripts/app-boot.js
new file mode 100644
index 0000000000..d744e7f649
--- /dev/null
+++ b/app/assets/javascripts/app-boot.js
@@ -0,0 +1,11 @@
+// discourse-skip-module
+
+(function() {
+  if (window.unsupportedBrowser) {
+    throw "Unsupported browser detected";
+  }
+  let Discourse = requirejs("discourse/app").default;
+
+  // ensure Discourse is added as a global
+  window.Discourse = Discourse;
+})();
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 489768d27d..d7f9c0d96b 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -2,7 +2,7 @@
 //= require ./polyfills
 //= require_tree ./select-kit
 //= require ./discourse/app/app
-//= require ./deprecated
+//= require ./app-boot
 
 // Stuff we need to load first
 //= require ./discourse/app/lib/to-markdown
@@ -97,4 +97,5 @@
 //= require_tree ./discourse/app/pre-initializers
 //= require_tree ./discourse/app/initializers
 //= require_tree ./discourse/app/services
+
 //= require_tree ./discourse/app/widgets
diff --git a/app/assets/javascripts/deprecated.js b/app/assets/javascripts/deprecated.js
deleted file mode 100644
index 4ac91b826a..0000000000
--- a/app/assets/javascripts/deprecated.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// ensure Discourse is added as a global
-(function() {
-  window.Discourse = requirejs("discourse/app").default;
-})();
diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index 9de7c40538..8080da1af6 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -1,14 +1,9 @@
 /*global Mousetrap:true*/
 import Application from "@ember/application";
-import EmberObject, { computed } from "@ember/object";
+import { computed } from "@ember/object";
 import { buildResolver } from "discourse-common/resolver";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import FocusEvent from "discourse-common/mixins/focus-event";
-import deprecated from "discourse-common/lib/deprecated";
-
-if (window.unsupportedBrowser) {
-  throw "Unsupported browser detected";
-}
 
 const _pluginCallbacks = [];
 
@@ -204,14 +199,4 @@ const Discourse = Application.extend(FocusEvent, {
   })
 }).create();
 
-Object.defineProperty(Discourse, "Model", {
-  get() {
-    deprecated("Use an `@ember/object` instead of Discourse.Model", {
-      since: "2.4.0",
-      dropFrom: "2.5.0"
-    });
-    return EmberObject;
-  }
-});
-
 export default Discourse;
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
index 5838720414..b41299712e 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
@@ -2,7 +2,6 @@ import Session from "discourse/models/session";
 import KeyValueStore from "discourse/lib/key-value-store";
 import Store from "discourse/models/store";
 import DiscourseLocation from "discourse/lib/discourse-location";
-import Discourse from "discourse/app";
 import SearchService from "discourse/services/search";
 import TopicTrackingState, {
   startTracking
@@ -33,7 +32,7 @@ export default {
 
     const currentUser = User.current();
     app.register("current-user:main", currentUser, { instantiate: false });
-    Discourse.currentUser = currentUser;
+    app.currentUser = currentUser;
 
     const topicTrackingState = TopicTrackingState.create({
       messageBus,
@@ -46,7 +45,7 @@ export default {
       app.inject(t, "topicTrackingState", "topic-tracking-state:main")
     );
 
-    const siteSettings = Discourse.SiteSettings;
+    const siteSettings = app.SiteSettings;
     app.register("site-settings:main", siteSettings, { instantiate: false });
     ALL_TARGETS.forEach(t =>
       app.inject(t, "siteSettings", "site-settings:main")
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 08d271e8bc..1aa140aebf 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -57,6 +57,7 @@ class DiscourseJsProcessor
       activate-account
       auto-redirect
       embed-application
+      app-boot
     ).any? { |f| relative_path == "#{js_root}/#{f}.js" }
 
     return true if plugin_transpile_paths.any? { |prefix| relative_path.start_with?(prefix) }

From 0e4db91870fba37e5584a9f20813f6029612d085 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 2 May 2020 10:31:44 +0200
Subject: [PATCH 0909/1830] FIX: save bookmark reminder on tap unless custom
 (#9611)

---
 .../discourse/app/controllers/bookmark.js     | 94 ++++++++++---------
 test/javascripts/acceptance/bookmarks-test.js | 87 ++++++++++++-----
 2 files changed, 114 insertions(+), 67 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/bookmark.js b/app/assets/javascripts/discourse/app/controllers/bookmark.js
index 30dc412e56..cd071c6bb4 100644
--- a/app/assets/javascripts/discourse/app/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/app/controllers/bookmark.js
@@ -1,4 +1,5 @@
 import { and } from "@ember/object/computed";
+import { action } from "@ember/object";
 import { isPresent } from "@ember/utils";
 import Controller from "@ember/controller";
 import { Promise } from "rsvp";
@@ -424,53 +425,60 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
-  actions: {
-    saveAndClose() {
-      if (this._saving || this._deleting) {
-        return;
-      }
+  @action
+  saveAndClose() {
+    if (this._saving || this._deleting) {
+      return;
+    }
 
-      this._saving = true;
-      this._savingBookmarkManually = true;
-      this._saveBookmark()
-        .then(() => this.send("closeModal"))
-        .catch(e => this._handleSaveError(e))
-        .finally(() => (this._saving = false));
-    },
+    this._saving = true;
+    this._savingBookmarkManually = true;
+    return this._saveBookmark()
+      .then(() => this.send("closeModal"))
+      .catch(e => this._handleSaveError(e))
+      .finally(() => (this._saving = false));
+  },
 
-    delete() {
-      this._deleting = true;
-      let deleteAction = () => {
-        this._closeWithoutSaving = true;
-        this._deleteBookmark()
-          .then(() => {
-            this._deleting = false;
-            this.send("closeModal");
-          })
-          .catch(e => this._handleSaveError(e));
-      };
-
-      if (this._existingBookmarkHasReminder()) {
-        bootbox.confirm(I18n.t("bookmarks.confirm_delete"), result => {
-          if (result) {
-            deleteAction();
-          }
-        });
-      } else {
-        deleteAction();
-      }
-    },
-
-    closeWithoutSavingBookmark() {
+  @action
+  delete() {
+    this._deleting = true;
+    let deleteAction = () => {
       this._closeWithoutSaving = true;
-      this.send("closeModal");
-    },
+      this._deleteBookmark()
+        .then(() => {
+          this._deleting = false;
+          this.send("closeModal");
+        })
+        .catch(e => this._handleSaveError(e));
+    };
 
-    selectReminderType(type) {
-      if (type === REMINDER_TYPES.LATER_TODAY && !this.showLaterToday) {
-        return;
-      }
-      this.set("selectedReminderType", type);
+    if (this._existingBookmarkHasReminder()) {
+      bootbox.confirm(I18n.t("bookmarks.confirm_delete"), result => {
+        if (result) {
+          deleteAction();
+        }
+      });
+    } else {
+      deleteAction();
+    }
+  },
+
+  @action
+  closeWithoutSavingBookmark() {
+    this._closeWithoutSaving = true;
+    this.send("closeModal");
+  },
+
+  @action
+  selectReminderType(type) {
+    if (type === REMINDER_TYPES.LATER_TODAY && !this.showLaterToday) {
+      return;
+    }
+
+    this.set("selectedReminderType", type);
+
+    if (type !== REMINDER_TYPES.CUSTOM) {
+      return this.saveAndClose();
     }
   }
 });
diff --git a/test/javascripts/acceptance/bookmarks-test.js b/test/javascripts/acceptance/bookmarks-test.js
index 2c2008f3e2..6361d43261 100644
--- a/test/javascripts/acceptance/bookmarks-test.js
+++ b/test/javascripts/acceptance/bookmarks-test.js
@@ -1,14 +1,17 @@
 import { acceptance, loggedInUser } from "helpers/qunit-helpers";
 import pretender from "helpers/create-pretender";
 
-acceptance("Bookmarking", {
-  loggedIn: true,
+acceptance("Bookmarking", { loggedIn: true });
 
-  beforeEach() {}
-});
+function handleRequest(assert, request) {
+  const body = request.requestBody;
+  const reminderType = body
+    .substr(0, body.indexOf("&"))
+    .replace("reminder_type=", "");
 
-function mockSuccessfulBookmarkPost() {
-  pretender.post("/bookmarks", () => [
+  assert.step(reminderType || "none");
+
+  return [
     200,
     {
       "Content-Type": "application/json"
@@ -17,15 +20,24 @@ function mockSuccessfulBookmarkPost() {
       id: 999,
       success: "OK"
     }
-  ]);
+  ];
+}
+
+function mockSuccessfulBookmarkPost(assert) {
+  pretender.post("/bookmarks", request => handleRequest(assert, request));
+  pretender.put("/bookmarks/999", request => handleRequest(assert, request));
 }
 
 async function openBookmarkModal() {
-  await click(".topic-post:first-child button.show-more-actions");
-  return await click(".topic-post:first-child button.bookmark");
+  if (exists(".topic-post:first-child button.show-more-actions")) {
+    await click(".topic-post:first-child button.show-more-actions");
+  }
+
+  await click(".topic-post:first-child button.bookmark");
 }
+
 async function openEditBookmarkModal() {
-  return await click(".topic-post:first-child button.bookmarked");
+  await click(".topic-post:first-child button.bookmarked");
 }
 
 test("Bookmarks modal opening", async assert => {
@@ -35,32 +47,45 @@ test("Bookmarks modal opening", async assert => {
 });
 
 test("Bookmarks modal selecting reminder type", async assert => {
+  mockSuccessfulBookmarkPost(assert);
+
   await visit("/t/internationalization-localization/280");
+
   await openBookmarkModal();
   await click("#tap_tile_tomorrow");
-  assert.ok(exists("#tap_tile_tomorrow.active"), "it selects tomorrow");
+
+  await openBookmarkModal();
   await click("#tap_tile_start_of_next_business_week");
-  assert.ok(
-    exists("#tap_tile_start_of_next_business_week.active"),
-    "it selects next monday"
-  );
+
+  await openBookmarkModal();
   await click("#tap_tile_next_week");
-  assert.ok(exists("#tap_tile_next_week.active"), "it selects next week");
+
+  await openBookmarkModal();
   await click("#tap_tile_next_month");
-  assert.ok(exists("#tap_tile_next_month.active"), "it selects next month");
+
+  await openBookmarkModal();
   await click("#tap_tile_custom");
   assert.ok(exists("#tap_tile_custom.active"), "it selects custom");
   assert.ok(exists(".tap-tile-date-input"), "it shows the custom date input");
   assert.ok(exists(".tap-tile-time-input"), "it shows the custom time input");
+  await click("#save-bookmark");
+
+  assert.verifySteps([
+    "tomorrow",
+    "start_of_next_business_week",
+    "next_week",
+    "next_month",
+    "custom"
+  ]);
 });
 
 test("Saving a bookmark with a reminder", async assert => {
-  mockSuccessfulBookmarkPost();
+  mockSuccessfulBookmarkPost(assert);
   await visit("/t/internationalization-localization/280");
   await openBookmarkModal();
   await fillIn("input#bookmark-name", "Check this out later");
   await click("#tap_tile_tomorrow");
-  await click("#save-bookmark");
+
   assert.ok(
     exists(".topic-post:first-child button.bookmark.bookmarked"),
     "it shows the bookmarked icon on the post"
@@ -71,13 +96,15 @@ test("Saving a bookmark with a reminder", async assert => {
     ),
     "it shows the bookmark clock icon because of the reminder"
   );
+  assert.verifySteps(["tomorrow"]);
 });
 
 test("Saving a bookmark with no reminder or name", async assert => {
-  mockSuccessfulBookmarkPost();
+  mockSuccessfulBookmarkPost(assert);
   await visit("/t/internationalization-localization/280");
   await openBookmarkModal();
   await click("#save-bookmark");
+
   assert.ok(
     exists(".topic-post:first-child button.bookmark.bookmarked"),
     "it shows the bookmarked icon on the post"
@@ -88,6 +115,7 @@ test("Saving a bookmark with no reminder or name", async assert => {
     ),
     "it shows the regular bookmark active icon"
   );
+  assert.verifySteps(["none"]);
 });
 
 test("Deleting a bookmark with a reminder", async assert => {
@@ -101,14 +129,21 @@ test("Deleting a bookmark with a reminder", async assert => {
       topic_bookmarked: false
     }
   ]);
-  mockSuccessfulBookmarkPost();
+
+  mockSuccessfulBookmarkPost(assert);
+
   await visit("/t/internationalization-localization/280");
   await openBookmarkModal();
   await click("#tap_tile_tomorrow");
-  await click("#save-bookmark");
+
+  assert.verifySteps(["tomorrow"]);
+
   await openEditBookmarkModal();
+
   assert.ok(exists("#bookmark-reminder-modal"), "it shows the bookmark modal");
+
   await click("#delete-bookmark");
+
   assert.ok(exists(".bootbox.modal"), "it asks for delete confirmation");
   assert.ok(
     find(".bootbox.modal")
@@ -116,7 +151,9 @@ test("Deleting a bookmark with a reminder", async assert => {
       .includes(I18n.t("bookmarks.confirm_delete")),
     "it shows delete confirmation message"
   );
+
   await click(".bootbox.modal .btn-primary");
+
   assert.not(
     exists(".topic-post:first-child button.bookmark.bookmarked"),
     "it no longer shows the bookmarked icon on the post after bookmark is deleted"
@@ -134,14 +171,15 @@ test("Cancelling saving a bookmark", async assert => {
 });
 
 test("Editing a bookmark", async assert => {
-  mockSuccessfulBookmarkPost();
+  mockSuccessfulBookmarkPost(assert);
+
   await visit("/t/internationalization-localization/280");
   let now = moment.tz(loggedInUser().resolvedTimezone());
   let tomorrow = now.add(1, "day").format("YYYY-MM-DD");
   await openBookmarkModal();
   await fillIn("input#bookmark-name", "Test name");
   await click("#tap_tile_tomorrow");
-  await click("#save-bookmark");
+
   await openEditBookmarkModal();
   assert.equal(
     find("#bookmark-name").val(),
@@ -158,4 +196,5 @@ test("Editing a bookmark", async assert => {
     "08:00",
     "it should prefill the bookmark time"
   );
+  assert.verifySteps(["tomorrow"]);
 });

From 784bf2a17335011828e6ab99411f8fe2c9b4f944 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Sat, 2 May 2020 18:02:28 -0700
Subject: [PATCH 0910/1830] FIX: Unassign user titles when a badge is deleted
 (#9573)

---
 app/controllers/admin/badges_controller.rb |  9 ++--
 app/jobs/regular/bulk_user_title_update.rb | 36 +++-------------
 app/models/badge.rb                        | 38 ++++++++++++++++
 spec/requests/badges_controller_spec.rb    | 50 ++++++++++++++++++++++
 4 files changed, 99 insertions(+), 34 deletions(-)

diff --git a/app/controllers/admin/badges_controller.rb b/app/controllers/admin/badges_controller.rb
index e3aca683d6..cfe6460efd 100644
--- a/app/controllers/admin/badges_controller.rb
+++ b/app/controllers/admin/badges_controller.rb
@@ -129,9 +129,12 @@ class Admin::BadgesController < Admin::AdminController
   end
 
   def destroy
-    badge = find_badge
-    StaffActionLogger.new(current_user).log_badge_deletion(badge)
-    badge.destroy
+    Badge.transaction do
+      badge = find_badge
+      StaffActionLogger.new(current_user).log_badge_deletion(badge)
+      badge.clear_user_titles!
+      badge.destroy!
+    end
     render body: nil
   end
 
diff --git a/app/jobs/regular/bulk_user_title_update.rb b/app/jobs/regular/bulk_user_title_update.rb
index e98c024a2f..6dae5219cc 100644
--- a/app/jobs/regular/bulk_user_title_update.rb
+++ b/app/jobs/regular/bulk_user_title_update.rb
@@ -9,43 +9,17 @@ module Jobs
       new_title = args[:new_title]
       granted_badge_id = args[:granted_badge_id]
       action = args[:action]
+      badge = Badge.find(granted_badge_id) rescue nil
+
+      return unless badge # Deleted badge protection
 
       case action
       when UPDATE_ACTION
-        update_titles_for_granted_badge(new_title, granted_badge_id)
+        badge.update_user_titles!(new_title)
       when RESET_ACTION
-        reset_titles_for_granted_badge(granted_badge_id)
+        badge.reset_user_titles!
       end
     end
 
-    private
-
-    ##
-    # If a badge name or a system badge TranslationOverride changes
-    # then we need to set all titles granted based on that badge to
-    # the new name or custom translation
-    def update_titles_for_granted_badge(new_title, granted_badge_id)
-      DB.exec(<<~SQL, granted_title_badge_id: granted_badge_id, title: new_title, updated_at: Time.now)
-        UPDATE users AS u
-        SET title = :title, updated_at = :updated_at
-        FROM user_profiles AS up
-        WHERE up.user_id = u.id AND up.granted_title_badge_id = :granted_title_badge_id
-      SQL
-    end
-
-    ##
-    # Reset granted titles for a badge back to the original
-    # badge name. When a system badge has its TranslationOverride
-    # revoked we want to have all titles based on that translation
-    # for the badge reset.
-    def reset_titles_for_granted_badge(granted_badge_id)
-      DB.exec(<<~SQL, granted_title_badge_id: granted_badge_id, updated_at: Time.now)
-        UPDATE users AS u
-        SET title = badges.name, updated_at = :updated_at
-        FROM user_profiles AS up
-        INNER JOIN badges ON badges.id = up.granted_title_badge_id
-        WHERE up.user_id = u.id AND up.granted_title_badge_id = :granted_title_badge_id
-      SQL
-    end
   end
 end
diff --git a/app/models/badge.rb b/app/models/badge.rb
index 5608444957..69d06ded61 100644
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -166,6 +166,44 @@ class Badge < ActiveRecord::Base
     SQL
   end
 
+  def clear_user_titles!
+    DB.exec(<<~SQL, badge_id: self.id, updated_at: Time.zone.now)
+      UPDATE users AS u
+      SET title = '', updated_at = :updated_at
+      FROM user_profiles AS up
+      WHERE up.user_id = u.id AND up.granted_title_badge_id = :badge_id
+    SQL
+    DB.exec(<<~SQL, badge_id: self.id)
+      UPDATE user_profiles AS up
+      SET badge_granted_title = false, granted_title_badge_id = NULL
+      WHERE up.granted_title_badge_id = :badge_id
+    SQL
+  end
+
+  ##
+  # Update all user titles based on a badge to the new name
+  def update_user_titles!(new_title)
+    DB.exec(<<~SQL, granted_title_badge_id: self.id, title: new_title, updated_at: Time.zone.now)
+      UPDATE users AS u
+      SET title = :title, updated_at = :updated_at
+      FROM user_profiles AS up
+      WHERE up.user_id = u.id AND up.granted_title_badge_id = :granted_title_badge_id
+    SQL
+  end
+
+  ##
+  # When a badge has its TranslationOverride cleared, reset
+  # all user titles granted to the standard name.
+  def reset_user_titles!
+    DB.exec(<<~SQL, granted_title_badge_id: self.id, updated_at: Time.zone.now)
+      UPDATE users AS u
+      SET title = badges.name, updated_at = :updated_at
+      FROM user_profiles AS up
+      INNER JOIN badges ON badges.id = up.granted_title_badge_id
+      WHERE up.user_id = u.id AND up.granted_title_badge_id = :granted_title_badge_id
+    SQL
+  end
+
   def self.i18n_name(name)
     name.downcase.tr(' ', '_')
   end
diff --git a/spec/requests/badges_controller_spec.rb b/spec/requests/badges_controller_spec.rb
index 0a4971d180..777596a4ff 100644
--- a/spec/requests/badges_controller_spec.rb
+++ b/spec/requests/badges_controller_spec.rb
@@ -42,4 +42,54 @@ describe BadgesController do
       expect(response.media_type).to eq('application/rss+xml')
     end
   end
+
+  context "user profiles" do
+    let(:titled_badge) { Fabricate(:badge, name: 'Protector of the Realm', allow_title: true) }
+    let!(:grant) { UserBadge.create!(user_id: user.id, badge_id: titled_badge.id, granted_at: 1.minute.ago, granted_by_id: -1) }
+
+    it "can be assigned as a title by the user" do
+      sign_in(user)
+      put "/u/#{user.username}/preferences/badge_title.json", params: {
+        user_badge_id: grant.id,
+      }
+      expect(response.status).to eq(200)
+      user.reload
+
+      expect(user.title).to eq(titled_badge.display_name)
+      expect(user.user_profile.granted_title_badge_id).to eq(titled_badge.id)
+    end
+  end
+
+  describe "destroy" do
+    let(:admin) { Fabricate(:admin) }
+
+    context "while assigned as a title" do
+      let(:titled_badge) { Fabricate(:badge, name: 'Protector of the Realm', allow_title: true) }
+      let!(:grant) { UserBadge.create!(user_id: user.id, badge_id: titled_badge.id, granted_at: 1.minute.ago, granted_by_id: -1) }
+
+      before do
+        sign_in(user)
+        put "/u/#{user.username}/preferences/badge_title.json", params: {
+          user_badge_id: grant.id,
+        }
+        user.reload
+        sign_out
+      end
+
+      it "succeeds and unassigns the title from the user" do
+        expect(user.title).to eq(titled_badge.display_name)
+
+        sign_in(admin)
+        badge_id = titled_badge.id
+
+        delete "/admin/badges/#{titled_badge.id}.json"
+        expect(response.status).to be(200)
+        expect(Badge.find_by(id: badge_id)).to be(nil)
+
+        user.reload
+        expect(user.title).to_not eq(titled_badge.display_name)
+        expect(user.user_profile.granted_title_badge_id).to eq(nil)
+      end
+    end
+  end
 end

From d8a086abc52c80c67cab4d633fb37f9cbcaa0b31 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 3 May 2020 17:52:19 +0200
Subject: [PATCH 0911/1830] FIX: do not apply only-emoji margin for excluded
 cases (#9619)

---
 app/assets/stylesheets/common/base/emoji.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 8517597c37..49a6f2ce10 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -15,6 +15,7 @@ img.emoji.only-emoji {
   img.emoji.only-emoji {
     width: 20px;
     height: 20px;
+    margin: 0;
   }
 }
 

From e32ac831eeca1bff3bae3876710c83e50207fc07 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 4 May 2020 10:51:21 +0800
Subject: [PATCH 0912/1830] DEV: Update rubocop-discourse to 2.1.2.

---
 Gemfile.lock | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index debd4f879a..0ffefbcbfa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -350,8 +350,9 @@ GEM
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-discourse (2.0.1)
+    rubocop-discourse (2.1.2)
       rubocop (>= 0.69.0)
+      rubocop-rspec (>= 1.39.0)
     rubocop-rspec (1.39.0)
       rubocop (>= 0.68.1)
     ruby-prof (1.3.2)

From 7fc319b64f8b542d66a3b23bc86e58af1ee7ed6f Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Sun, 3 May 2020 22:09:07 -0700
Subject: [PATCH 0913/1830] more direct "read this topic" prefs link

---
 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 d7ffe903a8..1b8fb7c65a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2258,7 +2258,7 @@ en:
           "2_8": "You will see a count of new replies because you are tracking this category."
           "2_4": "You will see a count of new replies because you posted a reply to this topic."
           "2_2": "You will see a count of new replies because you are tracking this topic."
-          "2": 'You will see a count of new replies because you <a href="{{basePath}}/u/{{username}}/preferences">read this topic</a>.'
+          "2": 'You will see a count of new replies because you <a href="{{basePath}}/u/{{username}}/preferences/notifications">read this topic</a>.'
           "1_2": "You will be notified if someone mentions your @name or replies to you."
           "1": "You will be notified if someone mentions your @name or replies to you."
           "0_7": "You are ignoring all notifications in this category."

From 57fcea7709f235ef40898abeddb2dcafb273e4da Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 4 May 2020 15:20:30 +1000
Subject: [PATCH 0914/1830] DEV: update rspec dependencies

rspec-rails 4.0 was released so we no longer need to depend on a
beta version. Also updates minor on a bunch of rspec gems.

Thanks to @ryanwi for raising this.
---
 Gemfile      |  3 +--
 Gemfile.lock | 18 +++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index a0f43d3313..742bf82d0b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -167,8 +167,7 @@ group :test, :development do
   # we would like to upgrade it if possible
   gem 'rb-inotify', '~> 0.9', require: RUBY_PLATFORM =~ /linux/i ? 'rb-inotify' : false
 
-  # TODO once 4.0.0 is released upgrade to it, at time of writing 3.9.0 is latest
-  gem 'rspec-rails', '4.0.0.beta2', require: false
+  gem 'rspec-rails'
 
   gem 'shoulda-matchers', require: false
   gem 'rspec-html-matchers'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0ffefbcbfa..d16ced6284 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -317,8 +317,8 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
     rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
@@ -328,15 +328,15 @@ GEM
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-rails (4.0.0.beta2)
+    rspec-rails (4.0.0)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
       railties (>= 4.2)
-      rspec-core (~> 3.8)
-      rspec-expectations (~> 3.8)
-      rspec-mocks (~> 3.8)
-      rspec-support (~> 3.8)
-    rspec-support (3.9.2)
+      rspec-core (~> 3.9)
+      rspec-expectations (~> 3.9)
+      rspec-mocks (~> 3.9)
+      rspec-support (~> 3.9)
+    rspec-support (3.9.3)
     rswag-specs (2.3.1)
       activesupport (>= 3.1, < 7.0)
       json-schema (~> 2.2)
@@ -525,7 +525,7 @@ DEPENDENCIES
   rqrcode
   rspec
   rspec-html-matchers
-  rspec-rails (= 4.0.0.beta2)
+  rspec-rails
   rswag-specs
   rtlit
   rubocop

From 99abdf51cd68520ecb9fbda0ae50147f82dd7cec Mon Sep 17 00:00:00 2001
From: Ahmed Gagan <35112518+Ahmedgagan@users.noreply.github.com>
Date: Mon, 4 May 2020 12:06:59 +0530
Subject: [PATCH 0915/1830] FEATURE: adds a filter for all/unread/read on
 user's notifications page (#9535)

---
 .../components/user-notifications-large.js    |  8 +++-
 .../app/controllers/user-notifications.js     | 14 +++++-
 .../templates/user/notifications-index.hbs    |  5 ++-
 .../app/widgets/user-notifications-large.js   |  8 +++-
 .../components/notifications-filter.js        | 25 +++++++++++
 .../notifications-filter-header.js            | 18 ++++++++
 .../notifications-filter-header.hbs           |  7 +++
 app/assets/stylesheets/common/base/user.scss  |  6 +++
 .../select-kit/notifications-filter.scss      | 43 +++++++++++++++++++
 config/locales/client.en.yml                  |  5 +++
 10 files changed, 132 insertions(+), 7 deletions(-)
 create mode 100644 app/assets/javascripts/select-kit/components/notifications-filter.js
 create mode 100644 app/assets/javascripts/select-kit/components/notifications-filter/notifications-filter-header.js
 create mode 100644 app/assets/javascripts/select-kit/templates/components/notifications-filter/notifications-filter-header.hbs
 create mode 100644 app/assets/stylesheets/common/select-kit/notifications-filter.scss

diff --git a/app/assets/javascripts/discourse/app/components/user-notifications-large.js b/app/assets/javascripts/discourse/app/components/user-notifications-large.js
index 3d2a2112b5..35cdf06a20 100644
--- a/app/assets/javascripts/discourse/app/components/user-notifications-large.js
+++ b/app/assets/javascripts/discourse/app/components/user-notifications-large.js
@@ -6,11 +6,15 @@ export default MountWidget.extend({
 
   init() {
     this._super(...arguments);
-    this.args = { notifications: this.notifications };
+    this.args = { notifications: this.notifications, filter: this.filter };
   },
 
-  @observes("notifications.length", "notifications.@each.read")
+  @observes("notifications.length", "notifications.@each.read", "filter")
   _triggerRefresh() {
+    this.set("args", {
+      notifications: this.notifications,
+      filter: this.filter
+    });
     this.queueRerender();
   }
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/user-notifications.js b/app/assets/javascripts/discourse/app/controllers/user-notifications.js
index dc9147105e..e821b68364 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-notifications.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-notifications.js
@@ -8,14 +8,20 @@ export default Controller.extend({
   application: controller(),
   router: service(),
   currentPath: readOnly("router._router.currentPath"),
+  filter: "all",
 
   @observes("model.canLoadMore")
   _showFooter() {
     this.set("application.showFooter", !this.get("model.canLoadMore"));
   },
 
-  @discourseComputed("model.content.length")
-  hasNotifications(length) {
+  @discourseComputed("model.content.length", "filter")
+  hasNotifications(length, filter) {
+    if (filter === "read") {
+      return this.model.filterBy("read", true).length > 0;
+    } else if (filter === "unread") {
+      return this.model.filterBy("read", false).length > 0;
+    }
     return length > 0;
   },
 
@@ -35,6 +41,10 @@ export default Controller.extend({
 
     loadMore() {
       this.model.loadMore();
+    },
+
+    filterNotifications(value) {
+      this.set("filter", value);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
index a44a96e8d9..578f376348 100644
--- a/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
@@ -8,8 +8,11 @@
   </div>
 {{/if}}
 
+{{notifications-filter value=filter onChange=(action "filterNotifications")}}
+<span class="user-notifications-filter-separator"></span>
+
 {{#if hasNotifications}}
-  {{user-notifications-large notifications=model}}
+  {{user-notifications-large notifications=model filter=filter}}
   {{conditional-loading-spinner condition=loading}}
 {{else}}
   <div class="alert alert-info">{{i18n "notifications.empty"}}</div>
diff --git a/app/assets/javascripts/discourse/app/widgets/user-notifications-large.js b/app/assets/javascripts/discourse/app/widgets/user-notifications-large.js
index 76bf1da687..53a4d3ad52 100644
--- a/app/assets/javascripts/discourse/app/widgets/user-notifications-large.js
+++ b/app/assets/javascripts/discourse/app/widgets/user-notifications-large.js
@@ -30,9 +30,13 @@ createWidget("large-notification-item", {
 
 export default createWidget("user-notifications-large", {
   html(attrs) {
-    const notifications = attrs.notifications;
+    let notifications = attrs.notifications;
     const username = notifications.findArgs.username;
-
+    if (attrs.filter === "read") {
+      notifications = notifications.filterBy("read", true);
+    } else if (attrs.filter === "unread") {
+      notifications = notifications.filterBy("read", false);
+    }
     return notifications.map(n => {
       n.username = username;
       return this.attach("large-notification-item", n);
diff --git a/app/assets/javascripts/select-kit/components/notifications-filter.js b/app/assets/javascripts/select-kit/components/notifications-filter.js
new file mode 100644
index 0000000000..3432f49e7a
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/notifications-filter.js
@@ -0,0 +1,25 @@
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import { computed } from "@ember/object";
+
+export default DropdownSelectBoxComponent.extend({
+  classNames: ["notifications-filter"],
+  content: computed(function() {
+    return [
+      {
+        id: "all",
+        label: I18n.t("user.user_notifications.filters.all")
+      },
+      {
+        id: "read",
+        label: I18n.t("user.user_notifications.filters.read")
+      },
+      {
+        id: "unread",
+        label: I18n.t("user.user_notifications.filters.unread")
+      }
+    ];
+  }),
+  selectKitOptions: {
+    headerComponent: "notifications-filter/notifications-filter-header"
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/notifications-filter/notifications-filter-header.js b/app/assets/javascripts/select-kit/components/notifications-filter/notifications-filter-header.js
new file mode 100644
index 0000000000..b615470433
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/notifications-filter/notifications-filter-header.js
@@ -0,0 +1,18 @@
+import DropdownSelectBoxHeaderComponent from "select-kit/components/dropdown-select-box/dropdown-select-box-header";
+import discourseComputed from "discourse-common/utils/decorators";
+
+export default DropdownSelectBoxHeaderComponent.extend({
+  layoutName:
+    "select-kit/templates/components/notifications-filter/notifications-filter-header",
+  classNames: ["notifications-filter-header"],
+
+  @discourseComputed("value")
+  label(value) {
+    return `user.user_notifications.filters.${value}`;
+  },
+
+  @discourseComputed("selectKit.isExpanded")
+  caretIcon(isExpanded) {
+    return isExpanded ? "caret-up" : "caret-down";
+  }
+});
diff --git a/app/assets/javascripts/select-kit/templates/components/notifications-filter/notifications-filter-header.hbs b/app/assets/javascripts/select-kit/templates/components/notifications-filter/notifications-filter-header.hbs
new file mode 100644
index 0000000000..21cee39d91
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/notifications-filter/notifications-filter-header.hbs
@@ -0,0 +1,7 @@
+<label class="filter-text">
+  {{i18n "user.user_notifications.filters.filter_by"}}
+</label>
+<label class="header-text">
+  {{i18n label}}
+</label>
+{{d-icon caretIcon class="caret-icon"}}
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 805b6bc8d0..869635a250 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -64,6 +64,12 @@
   .d-icon-heart {
     color: $love;
   }
+
+  .user-notifications-filter-separator {
+    display: block;
+    width: 100%;
+    border: 0.5px solid $primary-low;
+  }
 }
 
 .user-main {
diff --git a/app/assets/stylesheets/common/select-kit/notifications-filter.scss b/app/assets/stylesheets/common/select-kit/notifications-filter.scss
new file mode 100644
index 0000000000..680622f8aa
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/notifications-filter.scss
@@ -0,0 +1,43 @@
+.select-kit {
+  &.dropdown-select-box {
+    &.notifications-filter {
+      display: inline-flex;
+      position: relative;
+
+      .select-kit-collection {
+        padding: 5px;
+      }
+
+      .notifications-filter-header {
+        padding: 0 0.5em 0 0.5em;
+        background: none;
+        border: none;
+        justify-content: flex-start;
+        width: auto;
+        height: auto;
+        label.filter-text {
+          margin-right: 15px;
+          color: $primary-medium;
+        }
+
+        label.header-text {
+          color: dark-light-choose($tertiary, $tertiary);
+        }
+
+        .d-icon {
+          color: $primary-medium;
+          opacity: 1;
+          margin: 5px 0 10px 5px;
+          font-size: $font-up-3;
+        }
+
+        &.is-focused,
+        &:hover {
+          background: none;
+          border: none;
+          outline: none;
+        }
+      }
+    }
+  }
+}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 1b8fb7c65a..5c3211a53b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -835,6 +835,11 @@ en:
       private_message: "Message"
       private_messages: "Messages"
       user_notifications:
+        filters:
+          filter_by: "Filter By"
+          all: "All"
+          read: "Read"
+          unread: "Unread"
         ignore_duration_title: "Ignore Timer"
         ignore_duration_username: "Username"
         ignore_duration_when: "Duration:"

From 5e9c96dfede95e338280d11537ddf9721aa7ca50 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 4 May 2020 09:09:13 +0200
Subject: [PATCH 0916/1830] REFACTOR: minor tweaks to user's
 notifications-filter (#9623)

---
 .../components/user-notifications-large.js    | 11 +++----
 .../templates/user/notifications-index.hbs    |  5 ++-
 .../components/notifications-filter.js        |  2 ++
 .../notifications-filter-header.js            |  7 ++--
 .../select-kit/notifications-filter.scss      | 32 ++++++++-----------
 5 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-notifications-large.js b/app/assets/javascripts/discourse/app/components/user-notifications-large.js
index 35cdf06a20..193a5b8b12 100644
--- a/app/assets/javascripts/discourse/app/components/user-notifications-large.js
+++ b/app/assets/javascripts/discourse/app/components/user-notifications-large.js
@@ -1,20 +1,19 @@
 import MountWidget from "discourse/components/mount-widget";
-import { observes } from "discourse-common/utils/decorators";
 
 export default MountWidget.extend({
   widget: "user-notifications-large",
+  notifications: null,
+  filter: null,
+  args: null,
 
-  init() {
+  didReceiveAttrs() {
     this._super(...arguments);
-    this.args = { notifications: this.notifications, filter: this.filter };
-  },
 
-  @observes("notifications.length", "notifications.@each.read", "filter")
-  _triggerRefresh() {
     this.set("args", {
       notifications: this.notifications,
       filter: this.filter
     });
+
     this.queueRerender();
   }
 });
diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
index 578f376348..adf5d0d11d 100644
--- a/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
@@ -8,10 +8,9 @@
   </div>
 {{/if}}
 
-{{notifications-filter value=filter onChange=(action "filterNotifications")}}
-<span class="user-notifications-filter-separator"></span>
-
 {{#if hasNotifications}}
+  {{notifications-filter value=filter onChange=(action "filterNotifications")}}
+  <span class="user-notifications-filter-separator"></span>
   {{user-notifications-large notifications=model filter=filter}}
   {{conditional-loading-spinner condition=loading}}
 {{else}}
diff --git a/app/assets/javascripts/select-kit/components/notifications-filter.js b/app/assets/javascripts/select-kit/components/notifications-filter.js
index 3432f49e7a..2223fead72 100644
--- a/app/assets/javascripts/select-kit/components/notifications-filter.js
+++ b/app/assets/javascripts/select-kit/components/notifications-filter.js
@@ -3,6 +3,7 @@ import { computed } from "@ember/object";
 
 export default DropdownSelectBoxComponent.extend({
   classNames: ["notifications-filter"],
+
   content: computed(function() {
     return [
       {
@@ -19,6 +20,7 @@ export default DropdownSelectBoxComponent.extend({
       }
     ];
   }),
+
   selectKitOptions: {
     headerComponent: "notifications-filter/notifications-filter-header"
   }
diff --git a/app/assets/javascripts/select-kit/components/notifications-filter/notifications-filter-header.js b/app/assets/javascripts/select-kit/components/notifications-filter/notifications-filter-header.js
index b615470433..246108d61f 100644
--- a/app/assets/javascripts/select-kit/components/notifications-filter/notifications-filter-header.js
+++ b/app/assets/javascripts/select-kit/components/notifications-filter/notifications-filter-header.js
@@ -1,15 +1,14 @@
 import DropdownSelectBoxHeaderComponent from "select-kit/components/dropdown-select-box/dropdown-select-box-header";
 import discourseComputed from "discourse-common/utils/decorators";
+import { fmt } from "discourse/lib/computed";
 
 export default DropdownSelectBoxHeaderComponent.extend({
   layoutName:
     "select-kit/templates/components/notifications-filter/notifications-filter-header",
+
   classNames: ["notifications-filter-header"],
 
-  @discourseComputed("value")
-  label(value) {
-    return `user.user_notifications.filters.${value}`;
-  },
+  label: fmt("value", "user.user_notifications.filters.%@"),
 
   @discourseComputed("selectKit.isExpanded")
   caretIcon(isExpanded) {
diff --git a/app/assets/stylesheets/common/select-kit/notifications-filter.scss b/app/assets/stylesheets/common/select-kit/notifications-filter.scss
index 680622f8aa..c1c970d77e 100644
--- a/app/assets/stylesheets/common/select-kit/notifications-filter.scss
+++ b/app/assets/stylesheets/common/select-kit/notifications-filter.scss
@@ -5,37 +5,33 @@
       position: relative;
 
       .select-kit-collection {
-        padding: 5px;
+        padding: 0.25em;
       }
 
       .notifications-filter-header {
-        padding: 0 0.5em 0 0.5em;
+        padding: 0.5em;
         background: none;
         border: none;
-        justify-content: flex-start;
-        width: auto;
-        height: auto;
-        label.filter-text {
-          margin-right: 15px;
+        outline: none;
+        cursor: pointer;
+
+        .filter-text {
+          margin-right: 0.5em;
           color: $primary-medium;
+          cursor: pointer;
+          margin-bottom: 0;
         }
 
-        label.header-text {
+        .header-text {
           color: dark-light-choose($tertiary, $tertiary);
+          cursor: pointer;
+          margin-bottom: 0;
         }
 
         .d-icon {
           color: $primary-medium;
-          opacity: 1;
-          margin: 5px 0 10px 5px;
-          font-size: $font-up-3;
-        }
-
-        &.is-focused,
-        &:hover {
-          background: none;
-          border: none;
-          outline: none;
+          margin: 0 0 0 0.25em;
+          font-size: $font-up-2;
         }
       }
     }

From 3d0ccf864243fdfecc07ad3764df499a7b7a55f8 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 4 May 2020 17:40:09 +1000
Subject: [PATCH 0917/1830] FIX: missing edit notifications in some rare cases

Due to a refactor in e90f9e5cc47 we stopped notifying on edits if
a user liked a post and then edited.

The like could have happened a long time ago so this gets extra
confusing.

This change makes the suppression more deliberate. We only want
to suppress quite/link/mention if the user already got a reply
notification.

We can expand this suppression if it is not enough.
---
 app/services/post_alerter.rb       | 15 +++++++++++++--
 spec/services/post_alerter_spec.rb | 17 ++++++++++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index ae560ec2fd..7b1965b60a 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -8,6 +8,11 @@ class PostAlerter
     post
   end
 
+  def self.post_edited(post, opts = {})
+    PostAlerter.new(opts).after_save_post(post, false)
+    post
+  end
+
   def initialize(default_opts = {})
     @default_opts = default_opts
   end
@@ -261,7 +266,6 @@ class PostAlerter
   end
 
   def should_notify_previous?(user, post, notification, opts)
-    return false unless notification
     case notification.notification_type
     when Notification.types[:edited] then should_notify_edit?(notification, post, opts)
     when Notification.types[:liked]  then should_notify_like?(user, notification)
@@ -331,7 +335,14 @@ class PostAlerter
     # Don't notify the same user about the same type of notification on the same post
     existing_notification_of_same_type = existing_notifications.find { |n| n.notification_type == type }
 
-    return if existing_notifications.present? && !should_notify_previous?(user, post, existing_notification_of_same_type, opts)
+    if existing_notification_of_same_type && !should_notify_previous?(user, post, existing_notification_of_same_type, opts)
+      return
+    end
+
+    # linked, quoted, mentioned may be suppressed if you already have a reply notification
+    if type == Notification.types[:quoted] || type == Notification.types[:linked] || type == Notification.types[:mentioned]
+      return if existing_notifications.find { |n| n.notification_type == Notification.types[:replied] }
+    end
 
     notification_data = {}
 
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index 973f31c663..2b3734f123 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -110,7 +110,15 @@ describe PostAlerter do
       admin = Fabricate(:admin)
       post.revise(admin, raw: 'I made a revision')
 
-      # skip this notification cause we already notified on a similar edit
+      # lets also like this post which should trigger a notification
+      PostActionCreator.new(
+        admin,
+        post,
+        PostActionType.types[:like]
+      ).perform
+
+      # skip this notification cause we already notified on an edit by the same user
+      # in the previous edit
       freeze_time 2.hours.from_now
       post.revise(admin, raw: 'I made another revision')
 
@@ -119,7 +127,7 @@ describe PostAlerter do
       freeze_time 2.hours.from_now
       post.revise(admin, raw: 'I made another revision')
 
-      expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(3)
+      expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(4)
     end
 
     it 'notifies flaggers when flagged post gets unhidden by edit' do
@@ -195,14 +203,13 @@ describe PostAlerter do
                                           user: evil_trout,
                                           data: { topic_title: "test topic" }.to_json
                                          )
-
       expect {
-        PostAlerter.post_created(post)
+        PostAlerter.post_edited(post)
       }.to change(evil_trout.notifications, :count).by(0)
 
       notification.destroy
       expect {
-        PostAlerter.post_created(post)
+        PostAlerter.post_edited(post)
       }.to change(evil_trout.notifications, :count).by(1)
     end
 

From 3877ef2cfa17155a4c6063d6d3625c9bd4d5b5df Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 4 May 2020 17:55:00 +1000
Subject: [PATCH 0918/1830] FEATURE: Unconditionally notify on edits at least
 once a day

This ensures that at a minimum you are notified once a day of
repeat edits by the same user.

Long term we may consider winding this down to say 1 hour or
making it configurable.
---
 app/services/post_alerter.rb       | 1 +
 spec/services/post_alerter_spec.rb | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index 7b1965b60a..196e4aee35 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -256,6 +256,7 @@ class PostAlerter
   end
 
   def should_notify_edit?(notification, post, opts)
+    notification.created_at < 1.day.ago ||
     notification.data_hash["display_username"] != (opts[:display_username].presence || post.user.username)
   end
 
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index 2b3734f123..f5f0d14421 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -122,12 +122,16 @@ describe PostAlerter do
       freeze_time 2.hours.from_now
       post.revise(admin, raw: 'I made another revision')
 
+      # this we do not skip cause 1 day has passed
+      freeze_time 23.hours.from_now
+      post.revise(admin, raw: 'I made another revision xyz')
+
       post.revise(Fabricate(:admin), raw: 'I made a revision')
 
       freeze_time 2.hours.from_now
       post.revise(admin, raw: 'I made another revision')
 
-      expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(4)
+      expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(5)
     end
 
     it 'notifies flaggers when flagged post gets unhidden by edit' do

From 590171753101f9101e7431d8a0f798a3ac45a049 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 1 May 2020 16:37:43 +0100
Subject: [PATCH 0919/1830] DEV: Allow DB.after_commit to be used outside of a
 transaction

In this case, it will execute the given block immediately
---
 lib/mini_sql_multisite_connection.rb           | 10 +++++++++-
 spec/lib/mini_sql_multisite_connection_spec.rb | 13 +++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/lib/mini_sql_multisite_connection.rb b/lib/mini_sql_multisite_connection.rb
index a1cd6a6897..202cf87b4e 100644
--- a/lib/mini_sql_multisite_connection.rb
+++ b/lib/mini_sql_multisite_connection.rb
@@ -43,8 +43,16 @@ class MiniSqlMultisiteConnection < MiniSql::Postgres::Connection
   end
 
   # Allows running arbitrary code after the current transaction has been committed.
-  # Works even with nested transactions. Useful for scheduling sidekiq jobs.
+  # Works with nested ActiveRecord transaction blocks. Useful for scheduling sidekiq jobs.
+  # If not currently in a transaction, will execute immediately
   def after_commit(&blk)
+    return blk.call if !ActiveRecord::Base.connection.transaction_open?
+
+    # In tests, everything is run inside a transaction.
+    # To run immediately, check for joinable? transaction
+    # This mimics core rails behavior: https://github.com/rails/rails/blob/348e142b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb#L211
+    return blk.call if Rails.env.test? && !ActiveRecord::Base.connection.current_transaction.joinable?
+
     ActiveRecord::Base.connection.add_transaction_record(
       AfterCommitWrapper.new(&blk)
     )
diff --git a/spec/lib/mini_sql_multisite_connection_spec.rb b/spec/lib/mini_sql_multisite_connection_spec.rb
index 4d404a4c92..9cfa452178 100644
--- a/spec/lib/mini_sql_multisite_connection_spec.rb
+++ b/spec/lib/mini_sql_multisite_connection_spec.rb
@@ -49,6 +49,19 @@ describe MiniSqlMultisiteConnection do
 
       expect(outputString).to eq("123")
     end
+
+    it "runs immediately if there is no transaction" do
+      outputString = "1"
+
+      DB.after_commit do
+        outputString += "2"
+      end
+
+      outputString += "3"
+
+      expect(outputString).to eq("123")
+    end
+
   end
 
 end

From 4f885d7da2b6e1cdfb006a653e3dbf0029dd051f Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 1 May 2020 16:44:50 +0100
Subject: [PATCH 0920/1830] FIX: Clear theme caches after database transaction
 has committed

This was causing unusual side effects on high-traffic sites, where the cache would be rebuilt before the transaction had been committed
---
 app/models/theme.rb       | 16 +++++++++++-----
 app/models/theme_field.rb | 10 +++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/models/theme.rb b/app/models/theme.rb
index 69f6c2899e..1b15a14551 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -68,7 +68,7 @@ class Theme < ActiveRecord::Base
 
     remove_from_cache!
     clear_cached_settings!
-    ColorScheme.hex_cache.clear
+    DB.after_commit { ColorScheme.hex_cache.clear }
     notify_theme_change(with_scheme: notify_with_scheme)
   end
 
@@ -270,7 +270,9 @@ class Theme < ActiveRecord::Base
   end
 
   def self.clear_cache!
-    @cache.clear
+    DB.after_commit do
+      @cache.clear
+    end
   end
 
   def self.targets
@@ -302,8 +304,10 @@ class Theme < ActiveRecord::Base
   end
 
   def notify_theme_change(with_scheme: false)
-    theme_ids = Theme.transform_ids([id])
-    self.class.notify_theme_change(theme_ids, with_scheme: with_scheme)
+    DB.after_commit do
+      theme_ids = Theme.transform_ids([id])
+      self.class.notify_theme_change(theme_ids, with_scheme: with_scheme)
+    end
   end
 
   def self.refresh_message_for_targets(targets, theme_ids)
@@ -474,7 +478,9 @@ class Theme < ActiveRecord::Base
   end
 
   def clear_cached_settings!
-    Discourse.cache.delete("settings_for_theme_#{self.id}")
+    DB.after_commit do
+      Discourse.cache.delete("settings_for_theme_#{self.id}")
+    end
   end
 
   def included_settings
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index 575490008f..ee417e353d 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -317,23 +317,23 @@ class ThemeField < ActiveRecord::Base
       self.value_baked, self.error = translation_field? ? process_translation : process_html(self.value)
       self.error = nil unless self.error.present?
       self.compiler_version = COMPILER_VERSION
-      CSP::Extension.clear_theme_extensions_cache!
+      DB.after_commit { CSP::Extension.clear_theme_extensions_cache! }
     elsif extra_js_field?
       self.value_baked, self.error = process_extra_js(self.value)
       self.error = nil unless self.error.present?
       self.compiler_version = COMPILER_VERSION
     elsif basic_scss_field?
       ensure_scss_compiles!
-      Stylesheet::Manager.clear_theme_cache!
+      DB.after_commit { Stylesheet::Manager.clear_theme_cache! }
     elsif settings_field?
       validate_yaml!
       theme.clear_cached_settings!
-      CSP::Extension.clear_theme_extensions_cache!
-      SvgSprite.expire_cache
+      DB.after_commit { CSP::Extension.clear_theme_extensions_cache! }
+      DB.after_commit { SvgSprite.expire_cache }
       self.value_baked = "baked"
       self.compiler_version = COMPILER_VERSION
     elsif svg_sprite_field?
-      SvgSprite.expire_cache
+      DB.after_commit { SvgSprite.expire_cache }
       self.error = nil
       self.value_baked = "baked"
       self.compiler_version = COMPILER_VERSION

From a51b8d9c6604fa0a1ff4bf07aabbb1bdce7c4b51 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 1 May 2020 17:51:11 +0100
Subject: [PATCH 0921/1830] FIX: Do not use cached settings during theme
 compilation

We compile within a database transaction, so using a cached value from redis can cause unwanted side effects
---
 app/controllers/admin/themes_controller.rb |  4 +--
 app/models/theme.rb                        | 35 ++++++++++++----------
 app/models/theme_field.rb                  |  3 +-
 app/services/staff_action_logger.rb        |  2 +-
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb
index 00e17991b8..d51b243979 100644
--- a/app/controllers/admin/themes_controller.rb
+++ b/app/controllers/admin/themes_controller.rb
@@ -270,13 +270,13 @@ class Admin::ThemesController < Admin::AdminController
     setting_name = params[:name].to_sym
     new_value = params[:value] || nil
 
-    previous_value = @theme.included_settings[setting_name]
+    previous_value = @theme.cached_settings[setting_name]
     @theme.update_setting(setting_name, new_value)
     @theme.save
 
     log_theme_setting_change(setting_name, previous_value, new_value)
 
-    updated_setting = @theme.included_settings.select { |key, val| key == setting_name }
+    updated_setting = @theme.cached_settings.select { |key, val| key == setting_name }
     render json: updated_setting, status: :ok
   end
 
diff --git a/app/models/theme.rb b/app/models/theme.rb
index 1b15a14551..4f54f9a518 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -22,6 +22,7 @@ class Theme < ActiveRecord::Base
   has_one :settings_field, -> { where(target_id: Theme.targets[:settings], name: "yaml") }, class_name: 'ThemeField'
   has_one :javascript_cache, dependent: :destroy
   has_many :locale_fields, -> { filter_locale_fields(I18n.fallbacks[I18n.locale]) }, class_name: 'ThemeField'
+  has_many :upload_fields, -> { where(type_id: ThemeField.types[:theme_upload_var]).preload(:upload) }, class_name: 'ThemeField'
 
   validate :component_validations
 
@@ -88,7 +89,8 @@ class Theme < ActiveRecord::Base
     if all_extra_js.present?
       js_compiler = ThemeJavascriptCompiler.new(id, name)
       js_compiler.append_raw_script(all_extra_js)
-      js_compiler.prepend_settings(cached_settings) if cached_settings.present?
+      settings_hash = build_settings_hash
+      js_compiler.prepend_settings(settings_hash) if settings_hash.present?
       javascript_cache || build_javascript_cache
       javascript_cache.update!(content: js_compiler.content)
     else
@@ -459,24 +461,25 @@ class Theme < ActiveRecord::Base
 
   def cached_settings
     Discourse.cache.fetch("settings_for_theme_#{self.id}", expires_in: 30.minutes) do
-      hash = {}
-      self.settings.each do |setting|
-        hash[setting.name] = setting.value
-      end
-
-      theme_uploads = {}
-      theme_fields
-        .joins(:upload)
-        .where(type_id: ThemeField.types[:theme_upload_var]).each do |field|
-
-        theme_uploads[field.name] = field.upload.url
-      end
-      hash['theme_uploads'] = theme_uploads if theme_uploads.present?
-
-      hash
+      build_settings_hash
     end
   end
 
+  def build_settings_hash
+    hash = {}
+    self.settings.each do |setting|
+      hash[setting.name] = setting.value
+    end
+
+    theme_uploads = {}
+    upload_fields.each do |field|
+      theme_uploads[field.name] = field.upload.url
+    end
+    hash['theme_uploads'] = theme_uploads if theme_uploads.present?
+
+    hash
+  end
+
   def clear_cached_settings!
     DB.after_commit do
       Discourse.cache.delete("settings_for_theme_#{self.id}")
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index ee417e353d..351c7b90f1 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -119,7 +119,8 @@ class ThemeField < ActiveRecord::Base
       js_compiler.append_js_error(error)
     end
 
-    js_compiler.prepend_settings(theme.cached_settings) if js_compiler.content.present? && theme.cached_settings.present?
+    settings_hash = theme.build_settings_hash
+    js_compiler.prepend_settings(settings_hash) if js_compiler.content.present? && settings_hash.present?
     javascript_cache.content = js_compiler.content
     javascript_cache.save!
 
diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb
index 117353cb17..6802be3462 100644
--- a/app/services/staff_action_logger.rb
+++ b/app/services/staff_action_logger.rb
@@ -222,7 +222,7 @@ class StaffActionLogger
 
   def log_theme_setting_change(setting_name, previous_value, new_value, theme, opts = {})
     raise Discourse::InvalidParameters.new(:theme) unless theme
-    raise Discourse::InvalidParameters.new(:setting_name) unless theme.included_settings.has_key?(setting_name)
+    raise Discourse::InvalidParameters.new(:setting_name) unless theme.cached_settings.has_key?(setting_name)
 
     UserHistory.create!(params(opts).merge(
       action: UserHistory.actions[:change_theme_setting],

From 5285cbee62ad7b0cee5b3bf0b6449174fb4f4491 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 4 May 2020 13:16:53 +0200
Subject: [PATCH 0922/1830] FIX: shows filter if there's no notifications to
 show after filter

---
 .../discourse/app/controllers/user-notifications.js        | 2 +-
 .../discourse/app/templates/user/notifications-index.hbs   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/user-notifications.js b/app/assets/javascripts/discourse/app/controllers/user-notifications.js
index e821b68364..c0761e70dc 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-notifications.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-notifications.js
@@ -16,7 +16,7 @@ export default Controller.extend({
   },
 
   @discourseComputed("model.content.length", "filter")
-  hasNotifications(length, filter) {
+  hasFilteredNotifications(length, filter) {
     if (filter === "read") {
       return this.model.filterBy("read", true).length > 0;
     } else if (filter === "unread") {
diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
index adf5d0d11d..b2c9185ec4 100644
--- a/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
@@ -8,9 +8,10 @@
   </div>
 {{/if}}
 
-{{#if hasNotifications}}
-  {{notifications-filter value=filter onChange=(action "filterNotifications")}}
-  <span class="user-notifications-filter-separator"></span>
+{{notifications-filter value=filter onChange=(action "filterNotifications")}}
+<span class="user-notifications-filter-separator"></span>
+
+{{#if hasFilteredNotifications}}
   {{user-notifications-large notifications=model filter=filter}}
   {{conditional-loading-spinner condition=loading}}
 {{else}}

From 0fe8ad13fae53fbc2c70db625852b2b4c8f07d82 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Mon, 4 May 2020 18:44:30 +0530
Subject: [PATCH 0923/1830] UX: change the user merge button's label and icon.

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

diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index adbe7e50e9..1353ed0d78 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -686,8 +686,8 @@
     {{/if}}
 
     {{#if model.can_be_merged}}
-      {{d-button label="admin.user.merge.transfer_and_delete"
-                 icon="trash-alt"
+      {{d-button label="admin.user.merge.button"
+                 icon="arrows-alt-h"
                  class="btn-danger"
                  action=(action "promptTargetUser")}}
     {{/if}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 5c3211a53b..336a4cf6c1 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4350,7 +4350,7 @@ en:
         anonymize_failed: "There was a problem anonymizing the account."
         delete: "Delete User"
         merge:
-          transfer_and_delete: "Transfer & Delete"
+          button: "Merge"
           prompt:
             title: "Transfer & Delete @%{username}"
             description: |

From 29c6c4b09291fdcf30ff08196e12915582b8ca1a Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Mon, 4 May 2020 10:26:12 -0300
Subject: [PATCH 0924/1830] UX: Use created_at as the default order when
 viewing reviewed items or everything (#9601)

---
 .../discourse/app/controllers/review-index.js | 36 +++++++++++++++++--
 .../discourse/app/routes/review-index.js      |  9 +++++
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/review-index.js b/app/assets/javascripts/discourse/app/controllers/review-index.js
index 4d319ee8bf..462fa69715 100644
--- a/app/assets/javascripts/discourse/app/controllers/review-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/review-index.js
@@ -25,7 +25,7 @@ export default Controller.extend({
   username: "",
   from_date: null,
   to_date: null,
-  sort_order: "priority",
+  sort_order: null,
   additional_filters: null,
 
   init(...args) {
@@ -108,6 +108,38 @@ export default Controller.extend({
     },
 
     refresh() {
+      const currentStatus = this.status;
+      const nextStatus = this.filterStatus;
+      const currentOrder = this.sort_order;
+      let nextOrder = this.filterSortOrder;
+
+      const createdAtStatuses = ["reviewed", "all"];
+      const priorityStatuses = [
+        "approved",
+        "rejected",
+        "deleted",
+        "ignored",
+        "pending"
+      ];
+
+      if (
+        createdAtStatuses.includes(currentStatus) &&
+        currentOrder === "created_at" &&
+        priorityStatuses.includes(nextStatus) &&
+        nextOrder === "created_at"
+      ) {
+        nextOrder = "priority";
+      }
+
+      if (
+        priorityStatuses.includes(currentStatus) &&
+        currentOrder === "priority" &&
+        createdAtStatuses.includes(nextStatus) &&
+        nextOrder === "priority"
+      ) {
+        nextOrder = "created_at";
+      }
+
       this.setProperties({
         type: this.filterType,
         priority: this.filterPriority,
@@ -120,7 +152,7 @@ export default Controller.extend({
         to_date: isPresent(this.filterToDate)
           ? this.filterToDate.toISOString(true).split("T")[0]
           : null,
-        sort_order: this.filterSortOrder,
+        sort_order: nextOrder,
         additional_filters: JSON.stringify(this.additionalFilters)
       });
 
diff --git a/app/assets/javascripts/discourse/app/routes/review-index.js b/app/assets/javascripts/discourse/app/routes/review-index.js
index 4edd43a334..b83a95124c 100644
--- a/app/assets/javascripts/discourse/app/routes/review-index.js
+++ b/app/assets/javascripts/discourse/app/routes/review-index.js
@@ -3,6 +3,14 @@ import { isPresent } from "@ember/utils";
 
 export default DiscourseRoute.extend({
   model(params) {
+    if (params.sort_order === null) {
+      if (params.status === "reviewed" || params.status === "all") {
+        params.sort_order = "created_at";
+      } else {
+        params.sort_order = "priority";
+      }
+    }
+
     return this.store.findAll("reviewable", params);
   },
 
@@ -27,6 +35,7 @@ export default DiscourseRoute.extend({
       filterFromDate: isPresent(meta.from_date) ? moment(meta.from_date) : null,
       filterToDate: isPresent(meta.to_date) ? moment(meta.to_date) : null,
       filterSortOrder: meta.sort_order,
+      sort_order: meta.sort_order,
       additionalFilters: meta.additional_filters || {}
     });
   },

From 3cce608379bb03545fbc700390643e9d13074f79 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Mon, 4 May 2020 10:39:01 -0400
Subject: [PATCH 0925/1830] Update translations

---
 config/locales/client.ar.yml                  |    8 +-
 config/locales/client.be.yml                  |    7 +-
 config/locales/client.bg.yml                  |  165 ++-
 config/locales/client.bs_BA.yml               |    7 +-
 config/locales/client.ca.yml                  |   10 +-
 config/locales/client.cs.yml                  |    9 +-
 config/locales/client.da.yml                  |    9 +-
 config/locales/client.de.yml                  |   10 +-
 config/locales/client.el.yml                  |    8 +-
 config/locales/client.es.yml                  |   15 +-
 config/locales/client.et.yml                  |    7 +-
 config/locales/client.fa_IR.yml               |    8 +-
 config/locales/client.fi.yml                  |   16 +-
 config/locales/client.fr.yml                  |   10 +-
 config/locales/client.gl.yml                  |    7 +-
 config/locales/client.he.yml                  |   24 +-
 config/locales/client.hu.yml                  |    7 +-
 config/locales/client.hy.yml                  |  352 +++++-
 config/locales/client.id.yml                  |    7 +-
 config/locales/client.it.yml                  |   40 +-
 config/locales/client.ja.yml                  |    8 +-
 config/locales/client.ko.yml                  |  847 ++++++++++++-
 config/locales/client.lt.yml                  |    9 +-
 config/locales/client.lv.yml                  |    7 +-
 config/locales/client.nb_NO.yml               |    8 +-
 config/locales/client.nl.yml                  |   22 +-
 config/locales/client.pl_PL.yml               |   10 +-
 config/locales/client.pt.yml                  |    8 +-
 config/locales/client.pt_BR.yml               |   11 +-
 config/locales/client.ro.yml                  |    8 +-
 config/locales/client.ru.yml                  |   35 +-
 config/locales/client.sk.yml                  |    7 +-
 config/locales/client.sl.yml                  |    9 +-
 config/locales/client.sq.yml                  |    8 +-
 config/locales/client.sr.yml                  |    7 +-
 config/locales/client.sv.yml                  |   24 +-
 config/locales/client.sw.yml                  |    9 +-
 config/locales/client.te.yml                  |    6 +-
 config/locales/client.th.yml                  |    6 +-
 config/locales/client.tr_TR.yml               |   10 +-
 config/locales/client.uk.yml                  |   10 +-
 config/locales/client.ur.yml                  |    9 +-
 config/locales/client.vi.yml                  |   11 +-
 config/locales/client.zh_CN.yml               |   81 +-
 config/locales/client.zh_TW.yml               |    9 +-
 config/locales/server.bg.yml                  |    5 +
 config/locales/server.es.yml                  |   11 +-
 config/locales/server.he.yml                  |    6 +-
 config/locales/server.hy.yml                  |   10 +
 config/locales/server.it.yml                  |  153 ++-
 config/locales/server.ko.yml                  | 1102 ++++++++++++++++-
 config/locales/server.nl.yml                  |    6 +-
 config/locales/server.ru.yml                  |   21 +-
 config/locales/server.sv.yml                  |    6 +-
 config/locales/server.zh_CN.yml               |   59 +-
 .../config/locales/server.ko.yml              |    2 +
 .../config/locales/client.bg.yml              |    1 +
 .../config/locales/client.hy.yml              |    1 +
 .../config/locales/client.ko.yml              |    4 +
 .../config/locales/server.bg.yml              |    3 +
 .../config/locales/server.bs_BA.yml           |    5 -
 .../config/locales/server.ca.yml              |    5 -
 .../config/locales/server.de.yml              |    5 -
 .../config/locales/server.es.yml              |    7 +-
 .../config/locales/server.fi.yml              |    5 -
 .../config/locales/server.fr.yml              |    5 -
 .../config/locales/server.he.yml              |    4 +-
 .../config/locales/server.hu.yml              |    5 -
 .../config/locales/server.it.yml              |    6 +-
 .../config/locales/server.ko.yml              |   55 +
 .../config/locales/server.nl.yml              |    5 -
 .../config/locales/server.pl_PL.yml           |    6 -
 .../config/locales/server.pt_BR.yml           |    5 -
 .../config/locales/server.ru.yml              |    5 -
 .../config/locales/server.sl.yml              |    5 -
 .../config/locales/server.sv.yml              |   10 +-
 .../config/locales/server.tr_TR.yml           |    5 -
 .../config/locales/server.uk.yml              |    3 -
 .../config/locales/server.ur.yml              |    5 -
 .../config/locales/server.zh_CN.yml           |    6 +-
 plugins/poll/config/locales/client.he.yml     |    2 +
 plugins/poll/config/locales/client.it.yml     |    2 +
 plugins/poll/config/locales/client.ko.yml     |   35 +
 plugins/poll/config/locales/client.nl.yml     |    2 +
 plugins/poll/config/locales/client.ru.yml     |    2 +
 plugins/poll/config/locales/client.sv.yml     |    2 +
 plugins/poll/config/locales/client.zh_CN.yml  |    2 +
 plugins/poll/config/locales/server.ko.yml     |   17 +
 88 files changed, 3176 insertions(+), 340 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index dd74199911..759b60b904 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -31,7 +31,6 @@ ar:
         millions: "{{number}} مليون"
     dates:
       time: "h:mm a"
-      time_with_zone: "h:mm a (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
@@ -357,7 +356,6 @@ ar:
         bookmark: "انقر لوضع علامة مرجعية علي أوّل منشور في هذا الموضوع"
         unbookmark: "انقر لإزالة كلّ العلامات المرجعية في هذا الموضوع"
     bookmarks:
-      created: "لقد وضعت علامة مرجعية علي هذا المنشور"
       not_bookmarked: "أشر هذا المكتوب"
       remove: "أزل العلامة المرجعية"
       confirm_clear: "هل أنت متأكد من مسح جميع الاشعارات المرجعية من هذا الموضوع؟"
@@ -683,6 +681,10 @@ ar:
       private_message: "رسالة خاصة"
       private_messages: "الرسائل"
       user_notifications:
+        filters:
+          all: "الكل"
+          read: "المقروءة"
+          unread: "غير المقروءة"
         ignore_duration_username: "اسم المستخدم"
         ignore_duration_save: "تجاهل"
         mute_option: "مكتومة"
@@ -1098,6 +1100,7 @@ ar:
     assets_changed_confirm: "حُدث الموقع لتوّه. أتريد تحديث الصفحة ورؤية أحدث إصدار؟"
     logout: "لقد سجلت خروج."
     refresh: "تحديث"
+    home: "الصفحة الرئيسية "
     read_only_mode:
       enabled: "هذا الموقع في وضع القراءة فقط. نأمل أن تتابع تصفحه، ولكن الرد، والإعجاب وغيرها من الصلاحيات معطلة حاليا."
       login_disabled: "تسجيل الدخول معطل في حال كان الموقع في وضع القراءة فقط."
@@ -1700,7 +1703,6 @@ ar:
           "2_8": "سوف تشاهد عداد للردود الجديدة لانك تتابع هذا القسم."
           "2_4": "سوف تشاهد عداد للردود الجديدة لانك قمت بالمشاركة برد في هذا الموضوع."
           "2_2": "سوف تشاهد عداد للردود الجديدة لانك تتابع هذا الموضوع."
-          "2": 'سوف تشاهد عداد للردود الجديدة لأنّك <a href="{{basePath}}/u/{{username}}/preferences">قرأت هذا الموضوع</a>.'
           "1_2": "سيصلك إشعار إن أشار أحد إلى @اسمك أو رد عليك."
           "1": "سيصلك إشعار إن أشار أحد إلى @اسمك أو رد عليك."
           "0_7": "لن يصلك أي إشعار يخص هذا القسم."
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index 67247aea1a..87308e8966 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -25,7 +25,6 @@ be:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
-      time_with_zone: "HH:mm (z)"
       long_no_year_no_time: "D MMM"
       long_with_year_no_time: "D МММ, YYYY"
       long_date_with_year_without_time: "D MMM YYYY"
@@ -163,7 +162,6 @@ be:
         bookmark: "Націсніце каб закласці першы паведамленне ў гэтай тэме"
         unbookmark: "Націсніце каб выдаліць усе закладкі ў гэтай тэме"
     bookmarks:
-      created: "вы дадалі гэты паведамленне ў закладкі"
       remove: "выдаліць закладку"
       save: "Захаваць"
       reminders:
@@ -395,6 +393,10 @@ be:
       private_message: "паведамленне"
       private_messages: "Паведамленні"
       user_notifications:
+        filters:
+          all: "Усё"
+          read: "прачытаныя"
+          unread: "Непрачытаныя"
         ignore_duration_username: "Імя карыстальніка"
         ignore_duration_save: "ігнараваць"
         mute_option: "ігнараваць"
@@ -634,6 +636,7 @@ be:
       close: "схаваць"
     close: "зачыніць"
     refresh: "абнавіць"
+    home: "дома"
     read_only_mode:
       login_disabled: "Login is disabled while the site is in read only mode."
     learn_more: "даведацца больш ..."
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index addc3fdbac..2dee0c16b7 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -30,6 +30,7 @@ bg:
       time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -149,11 +150,14 @@ bg:
       visible:
         enabled: "добавена в списъка %{when}"
         disabled: "премахната от списъка %{when}"
+      banner:
+        enabled: "направи темата банер на %{when}. Тя ще се появява най-отгоре на всяка страница докато не бъде премахната от потребителя. "
       forwarded: "препрати горния имейл"
     topic_admin_menu: "действия по темата"
     wizard_required: "Добре дошли във вашия нов Discourse! Нека започнем с <a href='%{url}' data-auto-route='true'>съветника за настройка</a> ✨"
     emails_are_disabled: "Всички изходящи имейли са изцяло забранени от администратора. Няма да бъдат изпращани никакви имейл известия."
-    bootstrap_mode_enabled: "За да помогнем със стартирането на вашия нов сайт по-лесно поставихме сайта в \"стартиращо режим\". Всички нови потребители ще получат ниво на доверие 1 и ще имат активирани дневни известия за активноста във форума. Този режим ще бъде автоматично спрян когато бройката регистрирани потребители стигне %{min_users} ."
+    bootstrap_mode_enabled: "За да помогнем със стартирането на вашия сайт по-лесно, поставихме сайта в \"стартиращ режим\". Всички нови потребители ще получат ниво на доверие 1 и ще имат активирани дневни известия за активноста във форума. Този режим ще бъде автоматично спрян, когато бройката регистрирани потребители стигне %{min_users}."
+    bootstrap_mode_disabled: "Режимът на стартиране ще бъде изключен в следващите 24 часа. "
     themes:
       default_description: "По подразбиране"
       broken_theme_alert: "Вашият уебсайт може да не работи, защото в тема / компонент %{theme} има грешки. Изключете я тук %{path}."
@@ -228,6 +232,7 @@ bg:
       other: "{{count}} символа"
     related_messages:
       title: "Свързани съобщения"
+      see_all: 'See <a href="%{path}">всички съобщения</a> от @%{username}...'
     suggested_topics:
       title: "Подобни теми"
       pm_title: "Предложени съобщения"
@@ -256,24 +261,42 @@ bg:
         bookmark: "Щракнете за да добавите в отметки първата публикация в тази тема"
         unbookmark: "Щракнете тук за да изтриите всички отметки в тази тема"
     bookmarks:
-      created: "Вие добавихте тази публикация в отметки"
       not_bookmarked: "добавете тази публикация в Отметки"
       remove: "Премахнете отметката"
+      delete: "Изтрийте отметката"
+      confirm_delete: "Наистина ли искате да изтриете тази отметка? Напомнянето, свързано с нея, също ще бъде отменено."
+      confirm_clear: "Наистина ли искате да премахните всичките отметки от тази тема?"
       save: "Запази"
+      no_timezone: 'Не може да получавате напомняния, защото не сте настроили своята часова зона. Може да го направите <a href="%{basePath}/my/preferences/profile">във Вашия профил</a>.'
+      invalid_custom_datetime: "Въведените дата и час не са валидни. Опитайте отново."
+      list_permission_denied: "Нямате право да преглеждате отметките на този потребител."
       reminders:
+        at_desktop: "Следващия път, когато съм на компютъра"
         later_today: "По-късно днес"
+        next_business_day: "Следващия работен ден"
         tomorrow: "Утре"
         next_week: "Следваща седмица"
         later_this_week: "По-късно тази седмица"
+        start_of_next_business_week: "Следващия понеделник"
         next_month: "Следващия месец"
+        custom: "Друга дата и час"
+        none: "Без напомняне"
+        today_with_time: "днес в %{time}"
+        tomorrow_with_time: "утре в %{time}"
+        at_time: "на %{date_time}"
+        existing_reminder: "Имате напомняне за тази отметка, което ще бъде изпратено"
     drafts:
       resume: "Продължи"
       remove: "Премахване"
       new_topic: "Проект на нова тема"
+      new_private_message: "Чернова на лично съобщение"
       topic_reply: "Проект на отговор"
       abandon:
         yes_value: "Да, напусни"
         no_value: "Не, запази"
+    topic_count_unread:
+      one: "Виж {{count}} непрочетена тема"
+      other: "Виж {{count}} непрочетени теми"
     topic_count_new:
       one: "Вижте {{count}} нова тема"
       other: "Вижте {{count}} нови теми"
@@ -285,6 +308,7 @@ bg:
     upload: "Качване"
     uploading: "Качва се..."
     uploading_filename: "Качване: {{filename}}..."
+    clipboard: "клипборд"
     uploaded: "Качено!"
     pasting: "Вмъкване..."
     enable: "Позволи"
@@ -298,6 +322,8 @@ bg:
     banner:
       close: "Премахнете банера"
       edit: "Редактирай този банер >>"
+    pwa:
+      install_banner: "Искате ли <a href>да инсталирате %{title} на това устройство?</a>"
     choose_topic:
       none_found: "Няма нови теми."
       title:
@@ -311,10 +337,14 @@ bg:
       in_reply_to: "в отговор на"
       explain:
         formula: "Формула"
+        subtotal: "Междинна сума"
         total: "Общо"
+        min_score_visibility: "Минимален брой точки за видимост"
+        score_to_hide: "Точки за скриване на публикацията"
       awaiting_approval: "Очаква одобрение"
       delete: "Изтрий"
       settings:
+        saved: "Запазено"
         save_changes: "Запази промените"
         title: "Настройки"
       view_all: "Виж всички"
@@ -389,6 +419,9 @@ bg:
       approval:
         title: "Публикацията изисква одобрение"
         description: "Ние получихме вашата публикация, но тя трябва да бъде одобрена от модератора преди да бъде показана. Моля, проявете търпение."
+        pending_posts:
+          one: "Имате <strong>%{count}</strong> чакаща публикация."
+          other: "Имате <strong>{{count}}</strong> чакащи публикации."
         ok: "Ок"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> публикува <a href='{{topicUrl}}'>тази тема</a>"
@@ -421,6 +454,7 @@ bg:
       days_visited_long: "Посетени дни"
       posts_read: "Прочетени"
       posts_read_long: "Прочетени публикации"
+      last_updated: "Последно обновление:"
       total_rows:
         one: "%{count} потребител"
         other: "%{count} потребители"
@@ -432,11 +466,14 @@ bg:
         make_user_group_owner: "Превърни в собственик"
         remove_user_as_group_owner: "Премахни като собственик"
     groups:
+      member_added: "Добавено"
       add_members:
         title: "Добавете потребители"
         usernames: "Потебителско име"
       requests:
+        title: "Заявки"
         reason: "Причина"
+        accepted: "прието"
       manage:
         title: "Управление"
         name: "Име"
@@ -477,6 +514,7 @@ bg:
       message: "Съобщение"
       membership: "Членство"
       name: "Име"
+      group_name: "Име на групата"
       user_count: "Потребители"
       bio: "Относно групата"
       selector_placeholder: "въведи потребителско име "
@@ -485,18 +523,28 @@ bg:
         title: "Групи"
         all: "Всички групи"
         empty: "Няма видими групи."
+        filter: "Филтриране по тип група"
+        owner_groups: "Групи, които притежавам"
         close_groups: "Затворени групи"
+        automatic_groups: "Автоматични групи"
         automatic: "Автоматично"
         closed: "Затворена"
         public: "Публични"
         private: "Затворени"
+        public_groups: "Публични групи"
         automatic_group: Автоматична група
+        close_group: Затворете групата
         my_groups: "Моите групи"
+        group_type: "Тип група"
         is_group_user: "Член"
         is_group_owner: "Собественик"
+      title:
+        one: "група"
+        other: "Групи"
       activity: "Активност"
       members:
         title: "Членове"
+        filter_placeholder_admin: "потребителско име или имейл"
         filter_placeholder: "Потребителско име"
         remove_member: "Премахни Потребител"
         remove_member_description: "Премахни <b>%{username}</b> от тази група"
@@ -604,18 +652,31 @@ bg:
       private_message: "Съобщение"
       private_messages: "Съобщения"
       user_notifications:
+        filters:
+          all: "Всички"
+          read: "Прочетени"
+          unread: "Непрочетени"
         ignore_duration_username: "Потребителско име"
+        ignore_duration_when: "Продължителност:"
+        ignore_no_users: "Нямате игнорирани потребители."
+        add_ignored_user: "Добавете ..."
         mute_option: "Заглушен"
         normal_option: "Нормален"
       activity_stream: "Активност"
       preferences: "Настройки"
       feature_topic_on_profile:
+        open_search: "Изберете нова тема"
+        title: "Изберете тема"
         save: "Запази"
         clear:
           title: "Изчисти"
+      use_current_timezone: "Използвайте текущата часова зона"
+      profile_hidden: "Публичният профил на този потребител е скрит."
       expand_profile: "Разшири"
+      collapse_profile: "Намали"
       bookmarks: "Отметки"
       bio: "За мен"
+      timezone: "Часова зона"
       invited_by: "Поканен от"
       trust_level: "Ниво на доверие"
       notifications: "Известия"
@@ -728,6 +789,7 @@ bg:
         confirm_password_description: "Моля, потвърдете паролата за да продължите"
         name: "Име"
         label: "Код"
+        use: "Използвайте приложението за удостоверяване"
         edit: "Редактирай"
         security_key:
           register: "Регистриране"
@@ -967,13 +1029,15 @@ bg:
         fixed: "Заредете страницата"
     modal:
       close: "затвори"
+      dismiss_error: "Отхвърли грешката"
     close: "Затвори"
     assets_changed_confirm: "Страницата беше обновена. Презаредете, за да видите последната версия."
     logout: "Вие бяхте отписан."
     refresh: "Опресни"
+    home: "Начало"
     read_only_mode:
       enabled: "Сайта е в режим само за четене. Моля продължете да разглеждате, но отгавяне, харесване и всичко останали опции са спряни за сега."
-      login_disabled: "Влизането е изключено докато страницата е в мод само за четене."
+      login_disabled: "Влизането е изключено, докато страницата е в режим само за четене."
       logout_disabled: "Излизане от сайта е временно спряно, докато е пуснат режим \"само за четене\"."
     learn_more: "научете повече..."
     all_time: "общо"
@@ -981,7 +1045,7 @@ bg:
     year: "година"
     year_desc: "теми създадени през последните 365 дни"
     month: "месец"
-    month_desc: "теми създадени през последните 30 дни"
+    month_desc: "теми, създадени през последните 30 дни"
     week: "седмица"
     week_desc: "теми създадени през последните 7 дни"
     day: "ден"
@@ -990,6 +1054,9 @@ bg:
     unmute: Премахване на заглушаване
     last_post: Публикувано
     time_read: Прочетени
+    time_read_recently: "%{time_read} наскоро"
+    time_read_tooltip: "Прочетено общо %{time_read} пъти"
+    time_read_recently_tooltip: "Прочетено общо %{time_read} пъти (%{recent_time_read} в последните 60 дни)"
     last_reply_lowercase: последен отговор
     replies_lowercase:
       one: отговор
@@ -999,6 +1066,8 @@ bg:
       hide_session: "Напомни ми утре"
       hide_forever: "не благодаря"
       hidden_for_session: "Добре, Ще ви питам отново утре. През това време можете да използвате бутона \"Влизане\" или да си създадете нов потребител."
+      intro: "Здравейте! Изглежда, че следите дискусията, но все още не сте създали собствен профил."
+      value_prop: "Когато създадете профил, ще отбелязваме това, което сте чели, така че да можете да продължите от там, откъдето сте спрели. Можете също така да получавате известия тук и по електронната поща, когато има нови мнения. Също така ще може да маркирате любимите си публикации."
     summary:
       enabled_description: "В момента гледате резюме на тази тема: най-интересните публикации определени от общността."
       description: "Има <b>{{replyCount}}</b> отговора."
@@ -1012,6 +1081,8 @@ bg:
       disable: "Покажи изтритите публикации"
     private_message_info:
       title: "Съобщение"
+      invite: "Поканете други ..."
+      leave_message: "Сигурни ли сте, че искате да оставите това съобщение?"
       remove_allowed_user: "Сигурни ли сте, че искате да премахнете {{name}} от това съобщение?"
       remove_allowed_group: "Сигурни ли сте, че искате да премахнете {{name}} от това съобщение?"
     email: "Имейл"
@@ -1022,6 +1093,7 @@ bg:
     trust_level: "Ниво на доверие"
     search_hint: "потребителско име, имейл или IP адрес"
     create_account:
+      disclaimer: "С регистрацията си се съгласявате с <a href='{{privacy_link}}' target='blank'>политиката за повелителност</a> и <a href='{{tos_link}}' target='blank'>условията за ползване</a>."
       title: "Създай нов профил"
       failed: "Нещо се случи, вероятно вече има регистрация с този имейл адрес, опитайте с линка за забравена парола."
     forgot_password:
@@ -1031,11 +1103,13 @@ bg:
       reset: "Смяна на паролата"
       complete_username: "Ако профилът съвпада с потребителското име <b>%{username}</b>, трябва да получите имейл с инструкции, как да си смените паролата. "
       complete_email: "Ако профилът съвпада с <b>%{email}</b>, трябва да получите имейл с инструкции, как да си смените паролата. "
-      complete_username_not_found: "Няма профил, който да съвпада с потребителскоto име <b>%{username}</b>"
+      complete_username_not_found: "Няма профил, който да съвпада с потребителскотo име <b>%{username}</b>"
       complete_email_not_found: "Няма акаунт който да съвпада с <b>%{email}</b>"
       button_ok: "Ок"
     email_login:
-      complete_username_found: "Намерихме профил, който съвпада с %{username}, трябва да получите имейл с линк за логин."
+      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: "Няма профил, който да съвпада с потребителскоto име <b>%{username}</b>"
       complete_email_not_found: "Няма акаунт който да съвпада с <b>%{email}</b>"
@@ -1048,7 +1122,9 @@ bg:
       email_placeholder: "имейл или потребителско име"
       caps_lock_warning: "Включен е Caps Lock"
       error: "Непозната грешка"
+      cookies_error: "Браузърът ви не приема бисквитки. Влизането Ви може да е възпрепятствано, докато не активирате бисквитките."
       rate_limit: "Моля, изчакайте, преди да се опитате да влезете отново."
+      blank_username: "Моля, въведете Вашия имейл или потребителско име."
       blank_username_or_password: "Моля, въведете Вашия имейл или потребителско име и парола."
       reset_password: "Смяна на парола"
       logging_in: "Влизане..."
@@ -1067,7 +1143,7 @@ bg:
       to_continue: "Моля влезте"
       preferences: "Трябва да сте влезли, за да можете да променяте потребителските си настройки."
       forgot: "Не си спомням подробности за профила ми"
-      not_approved: "Вашият профил все още не е одобрен. Ще бъдете уведомени с имейл когато е възможно влизането Ви. "
+      not_approved: "Вашият профил все още не е одобрен. Ще бъдете уведомени с имейл, когато е възможно влизането Ви. "
       google_oauth2:
         name: "Google"
         title: "с Google"
@@ -1075,13 +1151,21 @@ bg:
         name: "Twitter"
         title: "с Twitter"
       instagram:
+        name: "Instagram"
         title: "чрез Instagram"
       facebook:
+        name: "Facebook"
         title: "със Facebook"
       github:
+        name: "GitHub"
         title: " с Github"
+      discord:
+        name: "Discord"
     invites:
+      accept_title: "Покана"
       welcome_to: "Добре дошли в %{site_name}!"
+      invited_by: "Бяхте поканени от:"
+      accept_invite: "Приеми поканата."
       success: "Профилът ви е създаден и вече сте влезли в него."
       name_label: "Име"
       password_label: "Задайте парола"
@@ -1173,12 +1257,15 @@ bg:
       composer_actions:
         reply: Отговорете
         edit: Редактирай
+        reply_to_topic:
+          label: Отговорете на тема
         create_topic:
           label: "Нова тема"
     notifications:
       title: "уведомления за @name споменавания, отговори на вашите публикации и теми, лични съобщения, и т.н."
       none: "В момента не могат да бъдат заредени уведомленията."
       empty: "Няма намерени нотификации."
+      reviewable_items: "точки, изискващи преглед"
       popup:
         mentioned: '{{username}} ви спомена в "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} ви спомена в "{{topic}}" - {{site_title}}'
@@ -1395,6 +1482,8 @@ bg:
         go_bottom: "долу"
         go: "go"
         jump_bottom: "към последната публикация"
+        jump_prompt: "отиди на..."
+        jump_prompt_long: "Отиди на..."
         jump_bottom_with_number: "отиди на публикация %{post_number}"
         jump_prompt_or: "или"
         total: всички публикации
@@ -1465,7 +1554,10 @@ bg:
         help: "Изчисти пиннатия статус на тази тема така, че тя повече да не се появява в горната част на Вашият списък с теми."
       share:
         title: "Споделяне"
+        extended_title: "Сподели линк"
         help: "споделете връзка към тази тема"
+      print:
+        title: "Печат"
       flag_topic:
         title: "Сигнал"
         help: "скрито сигнализирайте за публикацията, за да ѝ бъде обърнато внимание или изпратете скрито известие за нея"
@@ -1527,9 +1619,14 @@ bg:
           one: "%{count} публикация"
           other: "{{count}} публикации"
         cancel: "Премахни филтъра"
+      move_to:
+        title: "Премести в"
+        action: "премести в"
+        error: "Грешка при преместването на темите."
       split_topic:
         title: "Премести в нова тема"
         action: "премести в нова тема"
+        topic_name: "Заглавие на новата тема"
         radio_label: "Нова тема"
         error: "Възникна грешка при преместването на публикацията в нова тема."
         instructions:
@@ -1544,6 +1641,8 @@ bg:
           other: "Моля, изберете тема, в която искате да преместите тези <b>{{count}}</b> публикации. "
       move_to_new_message:
         radio_label: "Ново Съобщение"
+      publish_page:
+        title: "Публикуване на страници"
       change_owner:
         action: "смени собственика"
         error: "Възникна грешка при смяната на собственика"
@@ -1603,9 +1702,12 @@ bg:
         attachment_download_requires_login: "Съжаляваме, трябва да сте логнат, за да може да сваляте прикачените файлове."
       abandon_edit:
         no_value: "Не, запази"
+        no_save_draft: "Не, запази черновата"
+        yes_value: "Да, отмени промяната"
       abandon:
         confirm: "Сигурни ли сте, че искате да напуснете тази публикация?"
         no_value: "Не, запази"
+        no_save_draft: "Не, запази черновата"
         yes_value: "Да, напусни"
       via_email: "тази публикация пристига чрез имейл"
       whisper: "този пост е отбелязан като таен за модераторите"
@@ -1635,9 +1737,14 @@ bg:
         convert_to_moderator: "Добави цвят за екипа "
         revert_to_regular: "Премахни цвета на екипа "
         rebake: "Прегенерирай HTML "
+        publish_page: "Публикуване на страници"
         unhide: "Покажи "
         change_owner: "Смени Правомощията"
         grant_badge: "Присъдени значка"
+        lock_post: "Заключване на публикацията"
+        lock_post_description: "не позволявайте на публикувалия да редактира тази публикация"
+        unlock_post: "Отключи публикацията"
+        delete_topic_disallowed: "нямате разрешение за изтриване на тази тема"
         delete_topic: "изтрий темата "
       actions:
         flag: "Сигнал"
@@ -1654,6 +1761,12 @@ bg:
           notify_moderators: "съобщено на модераторите"
           notify_user: "изпрати съобщение"
           bookmark: "маркирай това"
+          like:
+            one: "хареса това"
+            other: "хареса това"
+          read:
+            one: "Прочети това"
+            other: "прочете това"
         by_you:
           off_topic: "Маркирахте това като извън темата"
           spam: "Маркирахте това като спам"
@@ -1671,16 +1784,40 @@ bg:
           hide: "Скрий ревизията"
           show: "Покажи ревизията"
           revert: "Връщане към тази редакция"
+          edit_wiki: "Редактиране на Wiki"
+          edit_post: "Редактиране на публикацията"
         displays:
           inline:
             title: "Покажи съобщение с включени допълнения и заличавания. "
+            button: "HTML"
           side_by_side:
             title: "Покажи разликите side-by-side "
+            button: "HTML"
           side_by_side_markdown:
             title: "Покажи разликите на неподправения източник side-by-side "
+            button: "Необработен"
+      raw_email:
+        displays:
+          raw:
+            title: "Покажете необработения имейл"
+            button: "Необработен"
+          text_part:
+            title: "Покажете текстовата част на имейла"
+            button: "Текст"
+          html_part:
+            button: "HTML"
       bookmarks:
+        edit: "Редактиране на отметката"
         created: "Създадени"
         name: "Име"
+        name_placeholder: "За какво е тази отметка?"
+        set_reminder: "Напомни ми"
+        actions:
+          delete_bookmark:
+            name: "Изтриване на отметка"
+            description: "Премахва отметката от вашия профил и спира всички напомняния, свързани с нея"
+          edit_bookmark:
+            name: "Редактиране на отметка"
     category:
       can: "can&hellip;"
       none: "(без категория)"
@@ -1692,6 +1829,7 @@ bg:
       topic_template: "Шаблон на темата"
       tags: "Етикети"
       tags_placeholder: "(По желание) списък на позволените етикети"
+      topic_featured_link_allowed: "Разрешаване на включени връзки в тази категория"
       delete: "Изтрий категорията"
       create: "Нова категория"
       create_long: "Създай нова категория"
@@ -1718,11 +1856,18 @@ bg:
       already_used: "Този цвят вече е използван за друга категория. "
       security: "Сигурност"
       special_warning: "Внимание: Тази категория е предварително семена категория и настройките й за сигурност не могат да се променят. Ако не искате да използвате тази категория, изтрийте темата си, вместо да я местите в категорията по предназначение."
+      uncategorized_security_warning: "Тази категория е специална. Тя е предназначен като обща зона за теми, които нямат категория. Като такава, тя не може да има настройки за сигурност."
       images: "Изображения"
       email_in: "Персонализиран входящ имейл адрес: "
       email_in_allow_strangers: "Приемай имейли от анонимни потребители, които нямат регистрация"
       email_in_disabled: "Публикуването на нови теми чрез имейл е забранено от настройките на сайта. За да разрешите публикуването на нови теми чрез имейл,"
       email_in_disabled_click: 'разрешете "email in" настройката '
+      show_subcategory_list: "Показване на списъка с подкатегории над темите в тази категория."
+      num_featured_topics: "Брой на темите, показвани на страницата с категории:"
+      subcategory_num_featured_topics: "Брой на включените теми на страницата на родителската категория:"
+      all_topics_wiki: "Направете новите теми wiki по подразбиране"
+      subcategory_list_style: "Стил на списъка с подкатегориите:"
+      sort_order: "Сортиране на списъка с теми по:"
       allow_badges_label: "Разрешете използването на значки в тази категория. "
       edit_permissions: "Редакция на достъпа"
       review_group_name: "име на групата"
@@ -1928,6 +2073,8 @@ bg:
       readonly: "Виж"
     lightbox:
       download: "изтегли"
+      previous: "Назад (стрелка наляво)"
+      next: "Напред (стрелка надясно)"
     keyboard_shortcuts_help:
       title: "Бързи клавиши"
       jump_to:
@@ -2278,6 +2425,7 @@ bg:
           edit: "Редактирай"
           mobile: "Мобилен"
           settings: "Настройки"
+          collapse: Намали
           upload: "Качване"
           installed: "Инсталирани"
           install_popular: "Популярни"
@@ -2545,7 +2693,7 @@ bg:
         titles:
           active: "Активни потребители"
           new: "Нови потребители"
-          pending: "Чакащи потребители"
+          pending: "Потребители, изискващи преглед"
           newuser: "Потребители с Ниво на доверие 0 (нов)"
           basic: "Потребители с Ниво на доверие 1 (основен)"
           member: "Потребители с Ниво за сигурност 2 (Членове)"
@@ -2713,6 +2861,7 @@ bg:
       site_text:
         description: "Можете да персонализирате всеки текст от вашия форум. Моля, започнете, като търсите по-долу:"
         search: "Търсене на текст които искате да редактирате"
+        title: "Текст"
         edit: "промени"
         revert: "Върни промените"
         revert_confirm: "Сигурен ли си, че искаш да върнеш промените?"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 93e103c993..8dcc016a95 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -28,7 +28,6 @@ bs_BA:
         millions: "{{number}} miliona"
     dates:
       time: "HH: mm"
-      time_with_zone: "HH: mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
@@ -285,7 +284,6 @@ bs_BA:
         bookmark: "Klikni kako bi dodao zabilješku na prvu objavu u temi"
         unbookmark: "Klikni da ukloniš sve zabilješke iz ove teme"
     bookmarks:
-      created: "zabilježili ste ovu stranicu"
       not_bookmarked: "sačuvaj ovaj post"
       remove: "Ukloni zabilješku"
       confirm_clear: "Dali ste sigurni dali želite izbrisati sve sačuvane stvari iz ove teme?"
@@ -780,6 +778,10 @@ bs_BA:
       private_message: "Privatne Poruke"
       private_messages: "Poruke"
       user_notifications:
+        filters:
+          all: "Sve"
+          read: "Učitaj"
+          unread: "Nepročitanih"
         ignore_duration_title: "Zanemari tajmer"
         ignore_duration_username: "Ime"
         ignore_duration_when: "Trajanje:"
@@ -2050,7 +2052,6 @@ bs_BA:
           "2_8": "Vidjeti će te broj novih odgovora jer pratite ovu kategoriju."
           "2_4": "Vidjeti će te broj novih odgovora jer ste objavili odgovor na ovu temu."
           "2_2": "Vidjeti će te broj novih odgovora jer pratite ovu temu."
-          "2": 'Vidjeti će te broj novih odgovora jer ste <a href="{{basePath}}/u/{{username}}/preferences">čitali ovu temu</a>.'
           "1_2": "Dobiti ćete notifikaciju kada neko spomene tvoje @name ili odgovori na tvoj post."
           "1": "Dobiti ćete notifikaciju kada neko spomene tvoje @name ili odgovori na tvoj post."
           "0_7": "Ignorišete sve notifikacije u ovoj kategoriji."
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 80f47fb2df..1da771ed35 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -27,7 +27,6 @@ ca:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
-      time_with_zone: "h:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
@@ -260,7 +259,6 @@ ca:
         bookmark: "Feu clic per a marcar com a preferit la primera publicació d'aquest tema"
         unbookmark: "Feu clic per a eliminar tots els preferits d'aquest tema"
     bookmarks:
-      created: "heu marcat aquesta publicació com a preferit"
       not_bookmarked: "marca aquesta publicació com a preferit"
       remove: "Elimina preferit"
       confirm_clear: "Esteu segur que voleu eliminar tots els preferits d'aquest tema?"
@@ -732,6 +730,10 @@ ca:
       private_message: "Missatge"
       private_messages: "Missatges"
       user_notifications:
+        filters:
+          all: "Tot"
+          read: "Llegit"
+          unread: "No llegits"
         ignore_duration_title: "Ignora el temporitzador"
         ignore_duration_username: "Nom d'usuari "
         ignore_duration_when: "Duració:"
@@ -1241,6 +1243,7 @@ ca:
     assets_changed_confirm: "El lloc web s'ha actualitzat. Voleu tornar a carregar la pàgina per a la versió més recent?"
     logout: "Heu tancat la sessió."
     refresh: "Actualitza"
+    home: "Pàgina principal"
     read_only_mode:
       enabled: "El lloc web és en mode només de lectura. Continueu navegant, però de moment estan desactivades les accions de respondre, 'm'agrada' i altres."
       login_disabled: "S'ha desactivat l'inici de sessió mentre aquest lloc web es trobi en mode només de lectura."
@@ -1984,7 +1987,6 @@ ca:
           "2_8": "Veureu un recompte de respostes perquè seguiu aquesta categoria. "
           "2_4": "Rebreu notificacions perquè heu escrit una resposta a aquest tema."
           "2_2": "Rebreu notificacions perquè seguiu aquest tema."
-          "2": 'Rebreu notificacions perquè heu <a href="{{basePath}}/u/{{username}}/preferences">llegit aquest tema</a>.'
           "1_2": "Sereu notificat si algú menciona el vostre @nom o us respon."
           "1": "Sereu notificat si algú us @menciona o us respon."
           "0_7": "No esteu fent cas de les notificacions d'aquesta categoria."
@@ -2381,6 +2383,7 @@ ca:
             button: "HTML"
       bookmarks:
         created: "Creat"
+        updated: "Actualitzat"
         name: "Nom"
     category:
       can: "pot&hellip; "
@@ -2686,7 +2689,6 @@ ca:
         this_week: "Setmana"
         today: "Avui"
         other_periods: "mira dalt de tot"
-    browser_update: 'Malauradament, <a href="http://www.discourse.org/faq/#browser">el vostre navegador és massa antic per a treballar amb aquest lloc web</a>. <a href="http://browsehappy.com">Actualitzeu el navegador</a>.'
     permission_types:
       full: "Crea / Respon / Mira"
       create_post: "Respon / Mira"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 1faece6fa4..f1edcc8522 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -29,7 +29,6 @@ cs:
         millions: "{{number}}M"
     dates:
       time: "H:mm"
-      time_with_zone: "H:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D. MMMM"
       full_no_year_no_time: "D. MMMM"
@@ -288,7 +287,6 @@ cs:
         bookmark: "Kliknutím vložíte záložku na první příspěvek tohoto tématu"
         unbookmark: "Kliknutím odstraníte všechny záložky v tématu"
     bookmarks:
-      created: "Záložka byla přidána."
       not_bookmarked: "přidat záložku k příspěvku"
       remove: "Odstranit záložku"
       confirm_clear: "Opravdu chcete odstranit všechny své záložky z tohoto tématu?"
@@ -632,6 +630,10 @@ cs:
       private_message: "Zpráva"
       private_messages: "Zprávy"
       user_notifications:
+        filters:
+          all: "Všechny"
+          read: "Přečtená"
+          unread: "Nepřečtená"
         ignore_duration_username: "Uživatelské jméno"
         ignore_duration_save: "ignorovat"
         mute_option: "Ztišené"
@@ -1083,6 +1085,7 @@ cs:
     assets_changed_confirm: "Tento web se právě aktualizoval. Chcete obnovit stránku a mít nejnovější verzi?"
     logout: "Byli jste odhlášeni."
     refresh: "Obnovit"
+    home: "Domů"
     read_only_mode:
       enabled: "Tato stránka je v režimu jen pro čtení. Prosim pokračujte v prohlížení, ale odpovídání a ostatní operace jsou momentálně vypnuté."
       login_disabled: "Přihlášení je zakázáno jelikož je stránka v režimu jen pro čtení."
@@ -1776,7 +1779,6 @@ cs:
           "2_8": "Uvidíte počet nových odpovědí, jelikož sledujete tuto kategorii."
           "2_4": "Uvidíte počet nových odpovědí, jelikož jste přispěli do tohoto tématu."
           "2_2": "Uvidíte počet nových odpovědí, jelikož sledujete toto téma."
-          "2": 'Uvidíte počet nových odpovědí, protože <a href="{{basePath}}/u/{{username}}/preferences">jste četl(a) toto téma</a>.'
           "1_2": "Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek."
           "1": "Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek."
           "0_7": "Ignorujete všechna oznámení v této kategorii."
@@ -2472,7 +2474,6 @@ cs:
         this_week: "Týden"
         today: "Dnes"
         other_periods: "viz nahoře"
-    browser_update: '<a href="https://www.discourse.org/faq/#browser">Váš prohlížeč je bohužel příliš starý a tyto stránky nebudou fungovat</a>. Prosíme <a href="https://browsehappy.com">pořiďte si novější verzi prohlížeče</a>.'
     permission_types:
       full: "Vytvářet / Odpovídat / Prohlížet"
       create_post: "Odpovídat / Prohlížet"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index c75122c70b..e4f1031ef2 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -27,7 +27,6 @@ da:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
-      time_with_zone: "HH:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D. MMM"
       full_no_year_no_time: "D. MMMM"
@@ -259,7 +258,6 @@ da:
         bookmark: "Klik for at sætte et bogmærke i det første indlæg i denne tråd"
         unbookmark: "Klik for at fjerne alle bogmærker i dette emne"
     bookmarks:
-      created: "du har bogmærket dette indlæg."
       not_bookmarked: "bogmærke dette indlæg"
       remove: "Fjern bogmærke"
       confirm_clear: "Er du sikker på, at du vil rydde alle dine bogmærker fra dette emne?"
@@ -731,6 +729,10 @@ da:
       private_message: "Besked"
       private_messages: "Beskeder"
       user_notifications:
+        filters:
+          all: "Alle"
+          read: "Læste"
+          unread: "Ulæst"
         ignore_duration_title: "Ignorér timer"
         ignore_duration_username: "Brugernavn"
         ignore_duration_when: "Varighed:"
@@ -1230,6 +1232,7 @@ da:
     assets_changed_confirm: "Dette site er lige blevet opdateret. Vil du opdatere nu til den seneste version?"
     logout: "Du er blevet logget ud."
     refresh: "Opdater"
+    home: "Hjem"
     read_only_mode:
       enabled: "Dette website kan kun læses lige nu. Fortsæt endelig med at kigge, men der kan ikke svares, likes eller andet indtil videre."
       login_disabled: "Log in er deaktiveret midlertidigt, da forummet er i \"kun læsnings\" tilstand."
@@ -1953,7 +1956,6 @@ da:
           "2_8": "Du vil se antallet af nye svar, fordi du følger denne kategori."
           "2_4": "Du vil se antallet af nye svar, fordi du indsendte et svar for dette emne."
           "2_2": "Du vil se antallet af nye svar, fordi du følger dette emne."
-          "2": 'Du vil se antallet af nye svar, fordi du <a href="{{basePath}}/u/{{username}}/preferences">læste dette emne</a>.'
           "1_2": "Du vil modtage en notifikation hvis nogen nævner dit @name eller svarer dig."
           "1": "Du vil modtage en notifikation hvis nogen nævner dit @name eller svarer dig."
           "0_7": "Du ignorerer alle notifikationer i denne kategori."
@@ -2645,7 +2647,6 @@ da:
         this_week: "Uge"
         today: "I dag"
         other_periods: "se top"
-    browser_update: 'Desværre er <a href="https://www.discourse.org/faq/#browser">din browser for gammel til at virke på denne side</a> . <a href="https://browsehappy.com">Opgrader din browser</a> .'
     permission_types:
       full: "Opret / Besvar / Se"
       create_post: "Besvar / Se"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 64e90d534f..61159aa31b 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -27,7 +27,6 @@ de:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
-      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D. MMM"
@@ -262,7 +261,6 @@ de:
         bookmark: "Klicke hier, um ein Lesezeichen auf den ersten Beitrag in diesem Thema zu setzen."
         unbookmark: "Klicke hier, um alle Lesezeichen in diesem Thema zu entfernen."
     bookmarks:
-      created: "du hast ein Lesezeichen zu diesem Beitrag hinzugefügt"
       not_bookmarked: "Lesezeichen auf diesen Beitrag setzen"
       remove: "Lesezeichen entfernen"
       confirm_clear: "Bist du sicher, dass du alle Lesezeichen in diesem Thema entfernen möchtest? "
@@ -742,6 +740,10 @@ de:
       private_message: "Nachricht"
       private_messages: "Nachrichten"
       user_notifications:
+        filters:
+          all: "Alle"
+          read: "Gelesen"
+          unread: "Ungelesen"
         ignore_duration_title: "Zeitschaltuhr ignorieren"
         ignore_duration_username: "Benutzername"
         ignore_duration_when: "Dauer:"
@@ -1255,6 +1257,7 @@ de:
     assets_changed_confirm: "Diese Website wurde gerade aktualisiert. Neu laden für die neuste Version?"
     logout: "Du wurdest abgemeldet."
     refresh: "Aktualisieren"
+    home: "Startseite"
     read_only_mode:
       enabled: "Diese Website befindet sich im Nur-Lesen-Modus. Du kannst weiterhin Inhalte lesen, aber das Erstellen von Beiträgen, Vergeben von Likes und Durchführen einiger weiterer Aktionen ist derzeit nicht möglich."
       login_disabled: "Die Anmeldung ist deaktiviert während sich die Website im Nur-Lesen-Modus befindet."
@@ -2013,7 +2016,6 @@ de:
           "2_8": "Du wirst eine Anzahl neuer Antworten sehen, weil du diese Kategorie verfolgst."
           "2_4": "Du wirst eine Anzahl neuer Antworten sehen, weil du einen Beitrag in diesem Thema geschrieben hast."
           "2_2": "Du wirst eine Anzahl neuer Antworten sehen, weil du dieses Thema verfolgst."
-          "2": 'Du wirst eine Anzahl neuer Antworten sehen, weil du <a href="{{basePath}}/u/{{username}}/preferences">dieses Thema gelesen hast</a>.'
           "1_2": "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet."
           "1": "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet."
           "0_7": "Du ignorierst alle Benachrichtigungen dieser Kategorie."
@@ -2417,6 +2419,7 @@ de:
       bookmarks:
         create: "Lesezeichen erstellen"
         created: "Erstellt"
+        updated: "Aktualisiert"
         name: "Name"
         actions:
           delete_bookmark:
@@ -2723,7 +2726,6 @@ de:
         this_week: "Woche"
         today: "Heute"
         other_periods: "zeige angesagte Themen:"
-    browser_update: 'Leider <a href="https://www.discourse.org/faq/#browser">ist dein Browser zu alt, damit diese Seite richtig funktioniert</a>. Bitte <a href="https://browsehappy.com">aktualisiere deinen Browser</a>.'
     permission_types:
       full: "Erstellen / Antworten / Ansehen"
       create_post: "Antworten / Ansehen"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 94d50da992..96a986d64b 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -27,7 +27,6 @@ el:
         millions: "{{number}}εκατ."
     dates:
       time: "ΗΗ:mm"
-      time_with_zone: "HH:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM"
@@ -228,7 +227,6 @@ el:
         bookmark: "Πάτα εδώ για να μπεί σελιδοδείκτης στην πρώτη ανάρτηση του νήματος."
         unbookmark: "Πάτα εδώ για να αφαιρεθούν όλοι οι σελιδοδείκτες από αυτό το νήμα."
     bookmarks:
-      created: "έχεις προσθέσει σελιδοδείκτη σε αυτή την ανάρτηση"
       remove: "Αφαίρεση Σελιδοδείκτη"
       save: "Αποθήκευση"
       reminders:
@@ -515,6 +513,10 @@ el:
       private_message: "Μήνυμα"
       private_messages: "Μηνύματα"
       user_notifications:
+        filters:
+          all: "Όλα"
+          read: "Διαβασμένο"
+          unread: "Αδιάβαστα"
         ignore_duration_username: "Όνομα Χρήστη"
         ignore_duration_save: "Αγνόηση"
         ignore_option: "Αγνοήθηκε "
@@ -904,6 +906,7 @@ el:
     assets_changed_confirm: "Αυτή η ιστοσελίδα μόλις ενημερώθηκε. Να ανανεωθεί τώρα για να φανεί η τελευταία έκδοση;"
     logout: "Αποσυνδέθηκες."
     refresh: "Ανανέωση"
+    home: "Αρχική Σελίδα"
     read_only_mode:
       enabled: "Αυτή η ιστοσελίδα είναι σε λειτουργία μόνο ανάγνωσης. Παρακαλώ συνέχισε να κάνεις περιήγηση, όμως το να απαντάς να πατάς \"μου αρέσει\" και κάποιες άλλες λειτουργίες δεν είναι διαθέσιμες τώρα."
       login_disabled: "Η δυνατότητα σύνδεσης έχει απενεργοποιηθεί όσο η ιστοσελίδα είναι σε κατάσταση μόνο ανάγνωσης."
@@ -1459,7 +1462,6 @@ el:
           "2_8": "Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή παρακολουθείς αυτήν την κατηγορία."
           "2_4": "Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή απάντησες σε αυτό το νήμα."
           "2_2": "Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή παρακολουθείς αυτό το νήμα."
-          "2": 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή <a href="{{basePath}}/u/{{username}}/preferences">διάβασες αυτό το νήμα</a>.'
           "1_2": "Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα."
           "1": "Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα."
           "0_7": "Αγνοείς όλες τις ειδοποιήσεις αυτής της κατηγορίας."
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 63ebcf23f5..3ec3f6d815 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -27,7 +27,6 @@ es:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
-      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year: "D MMM, HH:mm"
@@ -264,10 +263,7 @@ es:
         unbookmark: "Haz clic para eliminar todos los marcadores en este tema"
         unbookmark_with_reminder: "Haz clic para quitar todos los marcadores y recordatorios en este tema. Tienes un recordatorio puesto %{reminder_at} para este tema."
     bookmarks:
-      created: "has marcado esta publicación"
       not_bookmarked: "marcar esta publicación"
-      created_with_reminder: "has guardado esta publicación en marcadores con un recordatorio %{date}"
-      created_with_at_desktop_reminder: "guardaste esta publicación en marcadores y se te recordará la próxima vez que estés en tu computadora"
       remove: "Eliminar marcador"
       delete: "Borrar marcador"
       confirm_delete: "¿Seguro que quieres borrar este marcados? El recordatorio también se borrará."
@@ -759,6 +755,10 @@ es:
       private_message: "Mensaje"
       private_messages: "Mensajes"
       user_notifications:
+        filters:
+          all: "Todo"
+          read: "Leídos"
+          unread: "Sin leer"
         ignore_duration_title: "Temporizador de ignorado"
         ignore_duration_username: "Nombre de usuario"
         ignore_duration_when: "Duración:"
@@ -911,7 +911,7 @@ es:
         success: "(correo electrónico enviado)"
         in_progress: "(enviando correo electrónico)"
         error: "(error)"
-        emoji: "emoji de un candado"
+        emoji: "emoji candado"
         action: "Enviar correo electrónico para restablecer la contraseña"
         set_password: "Establecer contraseña"
         choose_new: "Escoge una nueva contraseña"
@@ -1285,6 +1285,7 @@ es:
     assets_changed_confirm: "Este sitio acaba de ser actualizado. ¿Quieres cargar la página de nuevo para ver la última versión?"
     logout: "Has cerrado sesión."
     refresh: "Actualizar"
+    home: "Inicio"
     read_only_mode:
       enabled: "Este sitio está en modo de solo lectura. Puedes continuar navegando pero algunas acciones como responder o dar me gusta no están disponibles por ahora."
       login_disabled: "Iniciar sesión está desactivado mientras el foro se encuentre en modo de solo lectura."
@@ -2059,7 +2060,6 @@ es:
           "2_8": "Verás el número de respuestas  nuevas porque estás siguiendo esta categoría."
           "2_4": "Verás el número de respuestas nuevas porque has publicado una respuesta en este tema."
           "2_2": "Verás el número de respuestas nuevas porque estás siguiendo este tema."
-          "2": 'Verás el número de respuestas nuevas porque has <a href="{{basePath}}/u/{{username}}/preferences">leído este tema</a>.'
           "1_2": "Se te notificará si alguien menciona tu @nombre o te responde."
           "1": "Se te notificará si alguien menciona tu @nombre o te responde."
           "0_7": "Estás ignorando todas las notificaciones en esta categoría."
@@ -2480,6 +2480,7 @@ es:
         create: "Crear marcador"
         edit: "Editar marcador"
         created: "Creado"
+        updated: "Actualizado"
         name: "Nombre"
         name_placeholder: "¿Para qué es este marcador?"
         set_reminder: "Recuérdame"
@@ -2795,7 +2796,6 @@ es:
         this_week: "Semana"
         today: "Hoy"
         other_periods: "ver los destacados"
-    browser_update: 'Desafortunadamente <a href="https://www.discourse.org/faq/#browser">tu navegador es demasiado antiguo para funcionar en este sitio</a>. Por favor, <a href="https://browsehappy.com">actualiza tu navegador</a>.'
     permission_types:
       full: "Crear / Responder / Ver"
       create_post: "Responder / Ver"
@@ -3184,6 +3184,7 @@ es:
             effects: Efectos
             trust_levels_none: "Ninguno"
             automatic_membership_email_domains: "Los usuarios que se registren con un dominio de correo electrónico que esté en esta lista se añadirán automáticamente a este grupo:"
+            automatic_membership_user_count: "%{count} usuarios tienen los nuevos dominios de email y serán añadidos al grupo."
             primary_group: "Establecer automáticamente como grupo principal"
         name_placeholder: "Nombre del grupo, sin espacios, al igual que los nombres de usuarios"
         primary: "Grupo principal"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index cf67e2d4aa..810a34c8be 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -27,7 +27,6 @@ et:
         millions: "{{number}}M"
     dates:
       time: "hh:mm"
-      time_with_zone: "hh:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D. MMMM"
       full_no_year_no_time: "Do MMMM"
@@ -230,7 +229,6 @@ et:
         bookmark: "Kliki selle teema esimesele postitusele järjehoidja lisamiseks"
         unbookmark: "Kliki selle teema kõigi järjehoidjate eemaldamiseks"
     bookmarks:
-      created: "lisasid sellele postitusele järjehoidja"
       not_bookmarked: "lisa sellele postitusele järjehoidja"
       remove: "Eemalda järjehoidja"
       save: "Salvesta"
@@ -555,6 +553,10 @@ et:
       private_message: "Sõnum"
       private_messages: "Sõnumid"
       user_notifications:
+        filters:
+          all: "Kõik"
+          read: "Loe"
+          unread: "Lugemata"
         ignore_duration_username: "Kasutajanimi"
         ignore_duration_save: "Ignoreeri"
         mute_option: "Vaigistatud"
@@ -963,6 +965,7 @@ et:
     assets_changed_confirm: "See sait on just uuendatud. Värskendan nüüd viimasele versioonile?"
     logout: "Sind logiti välja."
     refresh: "Värskenda"
+    home: "Avaleht"
     read_only_mode:
       enabled: "See sait on kirjutuskaitstud režiimis. Sirvimist saab jätkata, kuid vastamine, meeldimine ja teised toimingud on hetkel blokeeritud."
       login_disabled: "Sisselogimine on blokeeritud seni, kuni sait on kirjutuskaitstud režiimis."
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 3e3d664341..e29e956d0f 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -27,7 +27,6 @@ fa_IR:
         millions: "{{number}} میلیون"
     dates:
       time: "HH:mm"
-      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
@@ -262,7 +261,6 @@ fa_IR:
         bookmark: "کلیک کنید تا به اولین نوشته این موضوع نشانک بزنید"
         unbookmark: "کلیک کنید تا همهٔ نشانک‌های این موضوع را حذف کنید"
     bookmarks:
-      created: "شما این نوشته را نشانک زده‌اید"
       not_bookmarked: "این نوشته را نشانک بزنید"
       remove: "پاک کردن نشانک"
       confirm_clear: "آیا مطمئنید می‌خواهید همه‌ی نشانک‌های خود را از این موضوع پاک کنید؟"
@@ -741,6 +739,10 @@ fa_IR:
       private_message: "پیام"
       private_messages: "پیام‌ها"
       user_notifications:
+        filters:
+          all: "همه"
+          read: "خواندن"
+          unread: "خوانده‌ نشده‌"
         ignore_duration_title: "از زمانسنج صرف نظر کن"
         ignore_duration_username: "نام‌کاربری"
         ignore_duration_when: "مدت زمان:"
@@ -1247,6 +1249,7 @@ fa_IR:
     assets_changed_confirm: "این وب سایت به روز رسانی شده است. برای دیدن آخرین نسخه تازه‌سازی می‌کنید؟"
     logout: "شما از سایت خارج شده‌اید."
     refresh: "تازه کردن"
+    home: "خانه"
     read_only_mode:
       enabled: "سایت در حال فقط خواندنی است. می‌توانید موضوعات را مشاهده کنید ولی امکان ارسال پاسخ، پسندیدن و سایر عملیات در حال حاضر غیر‌فعال است."
       login_disabled: "ورود به سیستم غیر فعال شده همزمان با اینکه سایت در حال فقط خواندنی است."
@@ -1967,7 +1970,6 @@ fa_IR:
           "2_8": "به دلیل ارسال پیگیری این دسته‌بندی، پاسخ‌های جدید موضوع را خواهید دید."
           "2_4": "به دلیل ارسال نوشته در این موضوع، پاسخ‌های جدید آن را خواهید دید."
           "2_2": "به دلیل پیگیری این موضوع، تعداد پاسخ‌های جدید را خواهید دید."
-          "2": 'شما به دلیل <a href="{{basePath}}/u/{{username}}/preferences">خواندن این موضوع</a>. تعداد پاسخ‌های جدید آن را خواهید دید.'
           "1_2": "در صورتی که فردی با @نام به شما اشاره کند یا پاسخی دهد به شما اطلاع داده خواهد شد."
           "1": "در صورتی که فردی با @نام به شما اشاره کند یا پاسخی دهد، به شما اطلاع داده خواهد شد."
           "0_7": "شما تمام اعلان‌های این دسته‌بندی را نادیده گرفته اید"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index a66782aa50..f19f9d1356 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -27,9 +27,10 @@ fi:
         millions: "{{number}}M"
     dates:
       time: "H:mm"
-      time_with_zone: "H:mm (z)"
+      time_with_zone: "HH.mm (z)"
       time_short_day: "ddd HH:mm"
       timeline_date: "MMM YYYY"
+      long_no_year: "D. MMM, HH.mm"
       long_no_year_no_time: "D. MMMM[ta]"
       full_no_year_no_time: "Do MMMM[ta]"
       long_with_year: "D. MMMM[ta] YYYY H:mm"
@@ -261,10 +262,9 @@ fi:
       help:
         bookmark: "Klikkaa lisätäksesi ketjun ensimmäisen viestin kirjanmerkkeihin"
         unbookmark: "Klikkaa poistaaksesi kaikki tämän ketjun kirjanmerkit"
+        unbookmark_with_reminder: "Poista kaikki kirjanmerkkisi ja muistutuksesi tästä ketjusta klikkaamalla. Olet asettanut muistutuksen tästä ketjusta ajankohtaan %{reminder_at}."
     bookmarks:
-      created: "olet lisännyt tämän viestin kirjanmerkkeihisi"
       not_bookmarked: "lisää viesti kirjanmerkkeihin"
-      created_with_at_desktop_reminder: "kirjanmerkitsit tämän viestin ja sinua muistutetaan siitä kun seuraavan kerran olet työpöytäympäristössäsi"
       remove: "Poista kirjanmerkki"
       confirm_clear: "Haluatko varmasti poistaa kaikki kirjanmerkkisi tästä ketjusta?"
       save: "Tallenna"
@@ -747,6 +747,10 @@ fi:
       private_message: "Viesti"
       private_messages: "Viestit"
       user_notifications:
+        filters:
+          all: "Kaikki"
+          read: "Luetut"
+          unread: "Lukematta"
         ignore_duration_title: "Estoajastin"
         ignore_duration_username: "Käyttäjätunnus"
         ignore_duration_when: "Kesto:"
@@ -1260,6 +1264,7 @@ fi:
     assets_changed_confirm: "Sivustolla on tehty päivityksiä. Ladataanko uudelleen?"
     logout: "Sinut kirjattiin ulos."
     refresh: "Lataa sivu uudelleen"
+    home: "Koti"
     read_only_mode:
       enabled: "Sivusto on vain luku -tilassa. Voit jatkaa selailua, mutta vastaaminen, tykkääminen ja muita toimintoja on toistaiseksi poissa käytöstä."
       login_disabled: "Et voi kirjautua sisään, kun sivusto on vain luku -tilassa."
@@ -2016,7 +2021,6 @@ fi:
           "2_8": "Näet uusien vastausten määrän, koska olet asettanut tämän alueen seurantaan."
           "2_4": "Näet uusien vastausten määrän, koska olet kirjoittanut ketjuun."
           "2_2": "Näet uusien vastausten määrän, koska olet asettanut ketjun seurantaan."
-          "2": 'Näet uusien vastausten määrän, koska <a href="{{basePath}}/u/{{username}}/preferences">luit ketjua aiemmin</a>.'
           "1_2": "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle."
           "1": "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle."
           "0_7": "Et saa mitään ilmoituksia tältä alueelta."
@@ -2420,6 +2424,7 @@ fi:
       bookmarks:
         create: "Luo kirjanmerkki"
         created: "Luotu"
+        updated: "Päivitetty"
         name: "Nimi"
         actions:
           delete_bookmark:
@@ -2730,7 +2735,6 @@ fi:
         this_week: "Viikko"
         today: "Tänään"
         other_periods: "katso kuumat"
-    browser_update: 'Valitettavasti <a href="https://www.discourse.org/faq/#browser">selaimesi on niin vanha, ettei sivusto toimi sillä</a>. <a href="https://browsehappy.com">Päivitä selaimesi</a>.'
     permission_types:
       full: "Luoda / Vastata / Nähdä"
       create_post: "Vastata / Nähdä"
@@ -4138,7 +4142,7 @@ fi:
         secret_list:
           invalid_input: "Syöttökenttä ei voi olla tyhjä tai sisältää putkimerkkiä."
         default_categories:
-          modal_description: "Haluatko soveltaa tätä muutosta takautuvasti? Tämä muuttaa kaikkien %{count} olemassa olevan käyttäjän käyttäjäasetusta."
+          modal_description: "Haluatko tämän muutoksen vaikuttavan takautuvasti? Tämä muuttaa kaikkien %{count} olemassa olevan käyttäjän käyttäjäasetusta."
           modal_yes: "Kyllä"
           modal_no: "Ei, muutosta sovellettakoon vain tästedes"
       badges:
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 2a764de244..4471d601c0 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -27,7 +27,6 @@ fr:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
-      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd [à] HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
@@ -262,7 +261,6 @@ fr:
         bookmark: "Cliquer pour mettre un signet sur le premier message de ce sujet"
         unbookmark: "Cliquer pour retirer tous les signets de ce sujet"
     bookmarks:
-      created: "vous avez mis un signet à ce message"
       not_bookmarked: "mettre un signet à ce message"
       remove: "Retirer le signet"
       confirm_clear: "Êtes-vous sûr de vouloir retirer tous les signets de ce sujet ?"
@@ -743,6 +741,10 @@ fr:
       private_message: "Message direct"
       private_messages: "Messages directs"
       user_notifications:
+        filters:
+          all: "Toutes"
+          read: "Temps de lecture"
+          unread: "Non lus"
         ignore_duration_title: "Ignorer planification"
         ignore_duration_username: "Pseudo"
         ignore_duration_when: "Durée :"
@@ -1257,6 +1259,7 @@ fr:
     assets_changed_confirm: "Ce site vient d'être mis à jour. Rafraîchir maintenant pour accéder à la nouvelle version ?"
     logout: "Vous avez été déconnecté."
     refresh: "Rafraîchir"
+    home: "Accueil"
     read_only_mode:
       enabled: "Le site est en mode lecture seule. Vous pouvez continer à naviguer, mais les réponses, J'aime et autre interactions sont désactivées pour l'instant."
       login_disabled: "La connexion est désactivée quand le site est en lecture seule."
@@ -2012,7 +2015,6 @@ fr:
           "2_8": "Vous verrez un compteur de nouvelles réponses car vous suivez cette catégorie."
           "2_4": "Vous verrez un compteur de nouvelles réponses car vous avez répondu dans ce sujet."
           "2_2": "Vous verrez un compteur de nouvelles réponses car vous suivez ce sujet."
-          "2": 'Vous verrez un compteur de nouvelles réponses car vous <a href="{{basePath}}/u/{{username}}/preferences">avez lu ce sujet</a>.'
           "1_2": "Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond."
           "1": "Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond."
           "0_7": "Vous ignorez toutes les notifications de cette catégorie."
@@ -2416,6 +2418,7 @@ fr:
       bookmarks:
         create: "Ajouter un signet"
         created: "Créé"
+        updated: "Mis à jour"
         name: "Nom"
         actions:
           delete_bookmark:
@@ -2730,7 +2733,6 @@ fr:
         this_week: "Semaine"
         today: "Aujourd'hui"
         other_periods: "voir le top"
-    browser_update: 'Malheureusement, <a href="https://www.discourse.org/faq/#browser">votre navigateur est trop vieux pour ce site</a>. Merci <a href="https://browsehappy.com">de mettre à jour votre navigateur</a>.'
     permission_types:
       full: "Créer / Répondre / Voir"
       create_post: "Répondre / Voir"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 8a8624aba3..0ec701966a 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -27,7 +27,6 @@ gl:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
-      time_with_zone: "h:mm a (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D MMMM"
@@ -215,7 +214,6 @@ gl:
         bookmark: "Preme para engadir aos marcadores a publicación inicial deste tema"
         unbookmark: "Preme para retirar todos os marcadores deste tema"
     bookmarks:
-      created: "engadiches aos marcadores esta publicación"
       remove: "Eliminar marcador"
       save: "Gardar"
     drafts:
@@ -425,6 +423,10 @@ gl:
       private_message: "Mensaxe"
       private_messages: "Mensaxes"
       user_notifications:
+        filters:
+          all: "Todo"
+          read: "Lidos"
+          unread: "Sen ler"
         ignore_duration_username: "Nome do usuario"
         mute_option: "Silenciado"
         normal_option: "Normal"
@@ -717,6 +719,7 @@ gl:
     assets_changed_confirm: "Este sitio acaba de actualizarse. Queres recargar a páxina para ter a última versión?"
     logout: "Fuches desconectado."
     refresh: "Actualizar"
+    home: "Inicio"
     read_only_mode:
       enabled: "Este sitio está en modo só-lectura. Continúe navegando pero responder, gustar e outras accións estarán desactivadas polo de agora."
       login_disabled: "Cando o sitio está no modo de só-lectura, desactívase o inicio de sesión."
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index cd388cc382..b5a8001d03 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -29,7 +29,7 @@ he:
         millions: "{{number}} מיליון"
     dates:
       time: "h:mm a"
-      time_with_zone: "h:mm a (z)"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year: "D MMM, HH:mm"
@@ -312,10 +312,10 @@ he:
         unbookmark: "יש ללחוץ כדי להסיר את כל הסימניות בנושא זה"
         unbookmark_with_reminder: "יש ללחוץ כדי להסיר את כל הסימניות והתזכורות בנושא הזה. יש לך תזכורת שמוגדרת ל־%{reminder_at} עבור הנושא הזה."
     bookmarks:
-      created: "פוסט זה נוסף לסימניות"
+      created: "סימנת את הפוסט הזה%{name}"
       not_bookmarked: "סמנו פוסט זה עם סימנייה"
-      created_with_reminder: "סימנת את הפוסט הזה עם תזכורת %{date}"
-      created_with_at_desktop_reminder: "סימנת את הפוסט הזה ותישלח לך תזכורת בעת השימוש הבא בשולחן העבודה שלך"
+      created_with_reminder: "סימנת את הפוסט הזה עם תזכורת %{date}%{name}"
+      created_with_at_desktop_reminder: "סימנת את הפוסט הזה ותישלח אליך תזכורת עם ההתחברות הבאה שלך משולחן עבודה%{name}"
       remove: "הסרה מהסימניות"
       delete: "מחיקת סימנייה"
       confirm_delete: "למחוק את הסימנייה הזאת? גם התזכורת תימחק."
@@ -839,6 +839,10 @@ he:
       private_message: "הודעה"
       private_messages: "הודעות"
       user_notifications:
+        filters:
+          all: "הכל"
+          read: "נקרא"
+          unread: "לא-נקראו"
         ignore_duration_title: "מתזמן התעלמות"
         ignore_duration_username: "שם משתמש"
         ignore_duration_when: "משך:"
@@ -1385,6 +1389,7 @@ he:
     assets_changed_confirm: "האתר עבר עדכון. תרצו לרענן לגרסה המתקדמת ביותר?"
     logout: "יצאת מהמערכת."
     refresh: "רענן"
+    home: "בית"
     read_only_mode:
       enabled: "אתר זה נמצא במצב קריאה בלבד. אנא המשיכו לשוטט, אך תגובות, לייקים, ופעולות נוספות כרגע אינם מאופשרים."
       login_disabled: "הכניסה מנוטרלת בזמן שהאתר במצב קריאה בלבד."
@@ -1414,6 +1419,7 @@ he:
     mute: השתק
     unmute: ביטול השתקה
     last_post: פורסמו
+    local_time: "זמן מקומי"
     time_read: נקרא
     time_read_recently: "%{time_read} לאחרונה"
     time_read_tooltip: "%{time_read} זמן צפייה כולל"
@@ -2199,7 +2205,6 @@ he:
           "2_8": "תראו ספירה של תגובות חדשות כיוון שאתם עוקבים אחר קטגוריה זו."
           "2_4": "תראו ספירה של תגובות חדשות כיוון שפרסמתם תגובה לנושא זה."
           "2_2": "תראו ספירה של תגובות חדשות כיוון שאתם עוקבים אחר נושא זה:"
-          "2": 'אתם תראו ספירה של תגובות חדשות כיוון ש<a href="{{basePath}}/u/{{username}}/preferences">קראתם נושא זה</a>.'
           "1_2": "תישלח התראה אם מישהו יזכיר את @שם_המשתמש שלך או ישיב לך."
           "1": "תישלח התראה אם מישהו יזכיר את @שם_המשתמש שלך או ישיב לך."
           "0_7": "אתם מתעלמים מכל ההתראות בקטגוריה זו."
@@ -2670,6 +2675,7 @@ he:
         create: "יצירת סימנייה"
         edit: "עריכת סימנייה"
         created: "נוצר"
+        updated: "עודכן"
         name: "שם"
         name_placeholder: "עבור מה הסימנייה?"
         set_reminder: "להזכיר לי"
@@ -2740,6 +2746,7 @@ he:
       email_in_disabled_click: 'לאפשר את את ההגדרה „דוא״ל נכנס”'
       mailinglist_mirror: "קטגוריה שמשקפת רשימת תפוצה"
       show_subcategory_list: "הצגת רשימת קטגוריות משנה מעל נושאים בקטגוריה זו."
+      read_only_banner: "טקסט כרזה כאשר משתמש לא יכול ליצור נושא בקטגוריה הזו:"
       num_featured_topics: "מספר הנושאים המוצגים בדף הקטגוריות:"
       subcategory_num_featured_topics: "מספר הנושאים המומלצים בדף קטגוריית ההורה:"
       all_topics_wiki: "להפוך נושאים חדשים לעמודי ויקי כבררת מחדל"
@@ -3015,7 +3022,7 @@ he:
         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: "תגובה / צפייה"
@@ -3722,6 +3729,9 @@ he:
           settings: "הגדרות"
           translations: "תרגומים"
           extra_scss: "SCSS נוסף"
+          extra_files: "קבצים נוספים"
+          extra_files_upload: "יש לייצא את ערכת העיצוב כדי לצפות בקבצים האלה."
+          extra_files_remote: "יש לייצא את ערכת הנושא או לבדוק את מאגר ה־git כדי לצפות בקבצים אלה."
           preview: "תצוגה מקדימה"
           show_advanced: "הצגת שדות מתקדמים"
           hide_advanced: "הסתרת שדות מתקדמים"
@@ -3785,6 +3795,7 @@ he:
           license: "רישיון"
           version: "גרסה:"
           authors: "נוצרה על ידי:"
+          creator: "נוצר על ידי:"
           source_url: "מקור"
           enable: "הפעל"
           disable: "בטל"
@@ -4315,6 +4326,7 @@ he:
               <p><b>מדובר בפעולה בלתי הפיכה!</b></p>
 
               <p>כדי להמשיך עליך להקליד: <code>%{text}</code></p>
+            text: "העברת ‎@%{username}‎ אל ‎@%{targetUsername}‎"
             transfer_and_delete: "העברה ומחיקה של ‎@%{username}‎"
             cancel: "ביטול"
         merging_user: "המשתמש ממוזג…"
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index 6500e02233..8f771407d5 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -27,7 +27,6 @@ hu:
         millions: "{{number}} millió"
     dates:
       time: "h:mm a"
-      time_with_zone: "h:mm a (z)"
       timeline_date: "YYYY MMMM"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMM DD"
@@ -260,7 +259,6 @@ hu:
         bookmark: "Kattintson a téma első bejegyzésének könyvjelzőzéséhez"
         unbookmark: "Kattintson a téma valamennyi könyvjelzőjének törléséhez"
     bookmarks:
-      created: "könyvjelzőzte ezt a bejegyzést"
       not_bookmarked: "bejegyzés könyvjelzőzése"
       remove: "Könyvjelző eltávolítása"
       confirm_clear: "Biztos, hogy törli az összes könyvjelzőjétt ebből a témából?"
@@ -718,6 +716,10 @@ hu:
       private_message: "Üzenet"
       private_messages: "Üzenetek"
       user_notifications:
+        filters:
+          all: "Mind"
+          read: "Olvasás"
+          unread: "Olvasatlan"
         ignore_duration_title: "Időzítő figyelmen kívül hagyása"
         ignore_duration_username: "Felhasználónév"
         ignore_duration_when: "Időtartam:"
@@ -1163,6 +1165,7 @@ hu:
     assets_changed_confirm: "Az oldal frissítve lett. Frissíts a legújabb verzióért "
     logout: "Kijelentkeztél."
     refresh: "Frissítés"
+    home: "Kezdőlap"
     read_only_mode:
       enabled: "Az oldal \"csak olvasható\" módban van. Kérlek, folytasd tovább a böngészést, de a válaszolás, kedvelések és más tevékenységek egyelőre le vannak tiltva."
       login_disabled: "A belépés le van tiltva, amíg az oldal \"csak olvasható\" módban van."
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index b5e6fa470c..8e795a568a 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -27,7 +27,6 @@ hy:
         millions: "{{number}}մլն"
     dates:
       time: "h:mm"
-      time_with_zone: "h:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
@@ -152,12 +151,15 @@ hy:
       banner:
         enabled: "սա դարձրել է բաններ %{when}: Այն կհայտնվի յուրաքանչյուր էջի վերևում, մինչև չհեռացվի օգտատիրոջ կողմից:"
         disabled: "հեռացրել է այս բանները %{when}: Այն այլևս չի հայտնվի յուրաքանչյուր էջի վերևում:"
+      forwarded: "վերահասցեագրել նշված նամակը"
+    topic_admin_menu: "թեմայի ադմինի գործողություններ"
     wizard_required: "Բարի գալուստ Ձեր նոր Discourse! Սկսենք <a href='%{url}' data-auto-route='true'>տեղակայման մասնագետ</a>-ի հետ ✨"
     emails_are_disabled: "Բոլոր ելքային էլ. նամակները անջատվել են ադմինիստրատորի կողմից: Էլ. փոստով ոչ մի տեսակի ծանուցում չի ուղարկվի:"
     bootstrap_mode_enabled: "Ձեր նոր կայքի թողարկումը ավելի հեշտ դարձնելու համար Դուք գտնվում եք սկզբնաբեռնման(bootstrap) ռեժիմում: Բոլոր նոր օգտատերերին կտրվի վստահության մակարդակ 1, և կմիացվեն ամեն օր ստացվող ամփոփիչ էլ. նամակները: Սա ավտոմատ կերպով կանջատվի, երբ գրանցվի %{min_users} օգտատեր:"
     bootstrap_mode_disabled: "Սկզբնաբեռնման(Bootstrap) ռեժիմը կանջատվի 24 ժամվա ընթացքում:"
     themes:
       default_description: "Լռելյայն"
+      broken_theme_alert: "Դուք չեք կարող աշխատել, որովհետև թեմայի կամ կոպոնենտի մեջ %{theme} սխալ կա: Անջահել այն %{path}."
     s3:
       regions:
         ap_northeast_1: "Asia Pacific (Tokyo)"
@@ -256,18 +258,36 @@ hy:
       help:
         bookmark: "Սեղմեք՝ այս թեմայի առաջին գրառումն էջանշելու համար"
         unbookmark: "Սեղմեք՝ այս թեմայի բոլոր էջանշանները ջնջելու համար"
+        unbookmark_with_reminder: "Բոլոր էջանշանները և այդ թեմայի հիշեցումները ջնջելու համար սեղմել: Դուք արդեն ունեք հիշեցում այդ թեմայի համար, որը կարգավորված է %{reminder_at}."
     bookmarks:
-      created: "Դուք էջանշել եք այս գրառումը"
+      created: "Դուք էջանշել եք այս գրառումը %{name}"
       not_bookmarked: "Էջանշել այս գրառումը"
+      created_with_reminder: "Դուք էջանշել եք այդ գրառումը %{name} հաջորդող հիշեցումով %{date} "
+      created_with_at_desktop_reminder: "Դուք էջանշել եք այդ գրառումը %{name} հաջորդող հիշեցումով, այն կտեսնեք, երբ դուք բացեք այդ էջանշումը համակարգչի աշխատանքային սեղանին:"
       remove: "Հեռացնել էջանշանը"
+      delete: "Ջնջել Էջանշանը"
+      confirm_delete: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս էջանշանը: Բոլոր կապակցված   հիշեցումները կջնջվեն: "
       confirm_clear: "Դուք համոզվա՞ծ եք, որ ցանկանում եք հեռացնել այս թեմայի բոլոր էջանշանները:"
       save: "Պահպանել"
+      no_timezone: 'Դուք դեռ չեք նշել ձեր ժամային գոտին: Դուք չեք կարողանա հիշեցումներ անել: Տեղադրեք <a href="%{basePath}/my/preferences/profile"> ձեր պրոֆիլում:'
+      invalid_custom_datetime: "Ամսաթիվը և ժամանակը ճիշտ չէ նշված, կրկին փորձեք:"
+      list_permission_denied: "Դուք իրավունք չունեք դիտելու այս օգտատիրոջ էջանշանները: "
       reminders:
+        at_desktop: "Հաջորդ այցելությունը ֆորումին, կլինի իմ աշխատանքային սեղանի միջոցով: "
         later_today: "Այսօր, մի փոքր ուշ"
+        next_business_day: "Հաջորդ աշխատանքային օրը: "
         tomorrow: "Վաղը"
         next_week: "Հաջորդ շաբաթ"
         later_this_week: "Այս շաբաթ, մի փոքր ավելի ուշ"
+        start_of_next_business_week: "Հաջորդ Երկուշաբթի: "
         next_month: "Հաջորդ ամիս"
+        custom: "Սահմանել հիշեցումների ամսաթիվն ու ժամանակը:"
+        last_custom: "Օգտագործել ամսաթվի և ժամանակի վերջին գրառումը  "
+        none: "Հիշեցում չսահմանել "
+        today_with_time: "այսօր %{time}"
+        tomorrow_with_time: "Վաղը %{time}"
+        at_time: " %{date_time} -ում"
+        existing_reminder: "Այս էջանշանում արդեն սահմանված է հիշեցումը, որը կուղարկվի: "
     drafts:
       resume: "Վերսկսել"
       remove: "Ջնջել"
@@ -313,52 +333,136 @@ hy:
       install_banner: "Դուք ցանկանու՞մ եք <a href>տեղադրել %{title}-ը այս սարքի վրա?</a>"
     choose_topic:
       none_found: "Թեմաներ չեն գտնվել"
+      title:
+        search: "Թեմայի որոնում հետևյալ անվանումով url или id:"
+        placeholder: "Մուտքագրեք թեմայի անվանումը այստեղ url կամ id "
     choose_message:
       none_found: "Հաղորդագրություններ չեն գտնվել:"
+      title:
+        search: "Որոնում անձնական Հաղորդագրություններում"
+        placeholder: "Մուտքագրեք հաղորդագրությունների վերնագրերը url կամ id"
     review:
       order_by: "Դասավորել ըստ"
       in_reply_to: "ի պատասխան"
       explain:
+        why: "Բացատրել, թե ինչու՞ է այդ էլեմենտը հայտնվել հերթի մեջ: "
+        title: "Ամփոփիչ Գնահատական"
         formula: "Բանաձև"
+        subtotal: "Միջանկյալ հանրագումար "
         total: "Ամբողջը"
+        min_score_visibility: "Տեսանելիության համար մինիմալ գնահատական "
+        score_to_hide: "Գնահատում, որպեսզի Թաքցնել Հաղորդագրությունը"
+        take_action_bonus:
+          name: "Գործողություն է ձեռնարկվել"
+          title: "Երբ աշխատակիցը գործողություն է ձեռնարկում, գրավոր բողոքին բոնուս է տրվում:"
+        user_accuracy_bonus:
+          name: "օգտատիրոջ ճշգրտությունը"
+          title: "Օգտատերերը, ում գրավոր բողոքները համաձայնեցված են՝ կստանան բոնուս: "
+        trust_level_bonus:
+          name: "վստահության մակարդակ"
+          title: "Օգտատրիրոջ վստահության առավել մեծ մակարդակ ունենալու դեպքում, ստուգվող էլեմենտները ստանում են ավելի բարձր բալ: "
+        type_bonus:
+          name: "բոնուսի տեսակը"
+          title: "Որոշ ստուգվող տեսակների դեպքում, աշխատակիցներին կարող են բոնուս նշանակվել, որպեսզի նրանք գերակայության հասնեն: "
+      claim_help:
+        optional: "Դուք կարող եք պահանջել այդ էլեմենտը, որպեսզի ուրիշները չկարողանան այն դիտել:  "
+        required: "Դուք պետք է նախ՝ հայտ ներկայացնեք, որպեսզի կարողանաք այն դիտեք: "
+        claimed_by_you: "Դուք վերցրել եք այդ էլեմենտը և կարող եք այն դիտել: "
+        claimed_by_other: "Այս կետը կարելի է դիտել միայն <b>{{username}}</b>."
+      claim:
+        title: "հայտարարել այս թեման"
+      unclaim:
+        help: "Ջնջել այս պահանջը"
+      awaiting_approval: "Հաստատմումը սպասման մեջ է"
       delete: "Ջնջել"
       settings:
+        saved: "Պահված է"
         save_changes: "Պահպանել Փոփոխությունները"
         title: "Կարգավորումներ"
+        priorities:
+          title: "Ամփոփիչ Գերակայություններ "
       moderation_history: "Մոդերացիայի Պատմությունը"
+      view_all: "Դիտել Բոլոը"
+      grouped_by_topic: "Խմբավորել ըստ Թեմաների"
+      none: "Վերանայման՝ արդիականացման էլեմենտներ չկան "
+      view_pending: "դիտումը սպասման մեջ է "
+      title: "Վերանայում"
       topic: "Թեմա՝"
+      filtered_topic: "Դուք ֆիլտրել եք դիտման համար՝ միայն մեկ թեմայի բովանդակությունը "
       filtered_user: "Օգտատեր"
+      show_all_topics: "ցուցադրել բոլոր թեմաները"
+      deleted_post: "(գրառումը ջնջված է)"
+      deleted_user: "(օգտատերը ջնջված է)"
       user:
+        bio: "Ձեր մասին"
+        website: "Վեբ կայք"
         username: "Օգտանուն"
         email: "Էլ. հասցե"
         name: "Անուն"
+        fields: "Դաշտեր"
       topics:
         topic: "Թեմա"
         reviewable_count: "Քանակ"
+        reported_by: "Հաղորդվում է"
+        deleted: "[Թեման Ջնջված է]"
+        original: "(օրիգինալ թեմա)"
         details: "մանրամասները"
       edit: "Խմբագրել"
       save: "Պահպանել"
       cancel: "Չեղարկել"
+      new_topic: "Այս կետի հաստատումը նոր թեմա կստեղծի"
       filters:
         all_categories: "(Բոլոր կատեգորիաները)"
         type:
           title: "Տիպ"
+          all: "(բոլոր տեսակները)"
+        minimum_score: " Մինիմալ Գնահատական."
         refresh: "Թարմացնել"
+        status: "Ստատուս"
         category: "Կատեգորիա"
+        orders:
+          priority: "Գերակայության"
+          priority_asc: "Գերակայության (հետադարձ տեսակավորում)"
+          created_at: "Ստեղծվել է At"
+          created_at_asc: "Ստեղծվել է At (հետադարձ տեսակավորում)"
         priority:
+          title: "Մինիմալ Գերակայություն"
+          low: "(ցանկացած)"
+          medium: "Միջին"
           high: "Կարևոր"
+      conversation:
+        view_full: "դիտել ամբողջ զրույցը"
       scores:
+        about: "Այս գնահատականը հաշվարկվում է՝ ելնելով զեկուցողի վստահության մակարդակից, նրանց նախորդ բողքների ճշգրտությունից և հաղորդվող գրառումի գերակայությունից:"
         score: "Միավոր"
         date: "Ամսաթիվ"
         type: "Տիպ"
+        status: "Ստատուս"
+        submitted_by: "Ներկայացվել է"
+        reviewed_by: "Վերանայվել է"
       statuses:
         pending:
           title: "Սպասող"
+        approved:
+          title: "Հաստատված է"
         rejected:
           title: "Մերժված"
         ignored:
           title: "Անտեսված"
+        deleted:
+          title: "Ջնջված է"
+        reviewed:
+          title: "(բոլորը վերանայված են)"
+        all:
+          title: "(բոլորը)"
       types:
+        reviewable_flagged_post:
+          title: "Դրոշակավորված Գրառումներ"
+          flagged_by: "Դրոշակավորել է"
+        reviewable_queued_topic:
+          title: "Թեման Հերթագրված է "
+        reviewable_queued_post:
+          title: "Հաղորդագրությունը Հերթագրված է "
         reviewable_user:
           title: "Օգտատեր"
       approval:
@@ -396,6 +500,7 @@ hy:
       days_visited_long: "Այցելության Օր"
       posts_read: "Կարդացած"
       posts_read_long: "Կարդացած Գրառում"
+      last_updated: "Վերջին թարմացումը. "
       total_rows:
         one: "%{count} օգտատեր"
         other: "%{count} օգտատեր"
@@ -408,13 +513,20 @@ hy:
         remove_user_as_group_owner: "Հետ կանչել սեփականատիրոջ թույլտվությունը"
     groups:
       member_added: "Ավելացված"
+      member_requested: "Հարցով "
       add_members:
         title: "Ավելացնել Անդամներ"
         description: "Կառավարել այս խմբի անդամակցությունը"
         usernames: "Օգտանուններ"
       requests:
+        title: "Հարցումներ "
         reason: "Պատճառ"
+        accept: "Ընդունել"
         accepted: "ընդունված"
+        deny: "Մերժել"
+        denied: "Մերժվել"
+        undone: "հայցը չեղարկել"
+        handle: "Մշակել հարցումը "
       manage:
         title: "Կառավարել"
         name: "Անուն"
@@ -445,6 +557,7 @@ hy:
       empty:
         posts: "Այս խմբի անդամների կողմից գրառումներ չկան:"
         members: "Այս խմբում անդամներ չկան:"
+        requests: "Այս խմբի համար՝ մասնակցության վերաբերյալ հարցումներ չկան: "
         mentions: "Այս խմբի հիշատակումներ չկան:"
         messages: "Այս խմբի համար հաղորդագրություններ չկան:"
         topics: "Այս խմբի անդամների կողմից թեմաներ չկան:"
@@ -454,6 +567,8 @@ hy:
       leave: "Լքել"
       request: "Հարցում"
       message: "Հաղորդագրություն"
+      confirm_leave: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս թեգի խումբը:"
+      allow_membership_requests: "Թույլատրել օգտատերերին՝ անդամակցության հարցումներ ուղարկել խմբի սեփականատերերին (Պահանջում է հրապարակայնորեն տեսանելի խումբ)"
       membership_request_template: "Մասնավոր ձևանմուշ, որը կցուցադրվի օգտատերերին՝ անդամակցության հարցում ուղարկելիս"
       membership_request:
         submit: "Ուղարկել Հարցում"
@@ -500,6 +615,7 @@ hy:
         remove_owner: "Զրկել սեփականատիրոջ իրավունքից"
         remove_owner_description: "Զրկել <b>%{username}</b>-ին այս խմբի սեփականատիրոջ իրավունքից"
         owner: "Սեփականատեր"
+        forbidden: "Ձեզ թույլատրված չէ դիտել դա:"
       topics: "Թեմաներ"
       posts: "Գրառումներ"
       mentions: "Հիշատակումներ"
@@ -512,6 +628,7 @@ hy:
         only_admins: "Միայն ադմինները"
         mods_and_admins: "Միայն մոդերատորները և ադմինները"
         members_mods_and_admins: "Միայն խմբի անդամները, մոդերատորները և ադմինները"
+        owners_mods_and_admins: "Միայն խմբի անդամները, մոդերատորները և ադմինները"
         everyone: "Բոլորը"
       notifications:
         watching:
@@ -613,23 +730,41 @@ hy:
       private_message: "Հաղորդագրություն"
       private_messages: "Հաղորդագրություններ"
       user_notifications:
+        filters:
+          all: "Ամբողջը"
+          read: "Կարդացած"
+          unread: "Չկարդացած"
+        ignore_duration_title: "Անտեսված Օգտատեր"
         ignore_duration_username: "Օգտանուն"
+        ignore_duration_when: "Տևողությունը."
         ignore_duration_save: "Անտեսել"
+        ignore_duration_note: "Ուշադրություն դարձրեք, որ բոլոր անտեսումները ավտոմատ կերպով հանվում են անտեսման տևողության ավարտից հետո:"
         ignore_duration_time_frame_required: "Խնդրում ենք ընտրել ժամանակահատված"
+        ignore_no_users: "Դուք անտեսված օգտատերեր չունեք"
         ignore_option: "Անտեսված"
+        ignore_option_title: "Դուք չեք ստանա այս օգտատիրոջ ծանուցումները, և նրա բոլոր թեմաներն ու պատասխանները կթաքցվեն:"
+        add_ignored_user: "Ավելացնել"
         mute_option: "Խլացված"
+        mute_option_title: "Դուք այս օգտատիրոջից որևէ ծանուցում չեք ստանա:"
         normal_option: "Նորմալ"
+        normal_option_title: "Դուք ծանուցում կստանաք, եթե այդ օգտատերը պատասխանի ձեր հրապարակմանը, մեջբերում անի կամ հիշատակի ձեր անունը:"
       activity_stream: "Ակտիվություն"
       preferences: "Նախընտրություններ"
       feature_topic_on_profile:
+        open_search: "Ընտրեք Նոր Թեմա"
+        title: "Ընտրել Թեմա"
+        search_label: "Որոնել Թեմա ըստ վերնագրի"
         save: "Պահպանել"
         clear:
           title: "Ջնջել"
+          warning: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս թեմայի բոլոր էջանշանները:"
+      use_current_timezone: "Օգտագործեք՝ ավտոմատ կերպով Ներկայիս Ժամային գոտին որոշելը"
       profile_hidden: "Այս օգտատիրոջ հրապարակային պրոֆիլը թաքցրած է:"
       expand_profile: "Ընդլայնել"
       collapse_profile: "Կրճատել"
       bookmarks: "Էջանշաններ"
       bio: "Իմ մասին"
+      timezone: "Ժամային գոտի"
       invited_by: "Ում կողմից է հրավիրված"
       trust_level: "Վստահության Մակարդակ"
       notifications: "Ծանուցումներ"
@@ -648,12 +783,15 @@ hy:
       dismiss_notifications: "Չեղարկել Բոլորը"
       dismiss_notifications_tooltip: "Նշել բոլոր չկարդացած ծանուցումները որպես կարդացած:"
       first_notification: "Ձեր առաջին ծանուցումն է! Ընտրեք այն՝ սկսելու համար:"
+      dynamic_favicon: "Ցուցադրել քանակը բրաուզերի պատկերակի վրա"
       theme_default_on_all_devices: "Դարձնել սա լռելյայն թեմա իմ բոլոր սարքավորումների համար"
       text_size_default_on_all_devices: "Դարձնել սա լռելյայն տեքստի չափ իմ բոլոր սարքավորում համար"
       allow_private_messages: "Թույլ տալ այլ օգտատերերին ուղարկել ինձ անձնական հաղորդագրություններ"
       external_links_in_new_tab: "Բացել բոլոր արտաքին հղումները նոր ներդիրում(tab)"
       enable_quoting: "Միացնել մեջբերմամբ պատասխանելը ընդգծված տեքստի համար"
+      enable_defer: "Սեղմել <<Հետաձգում>> կոճակը, նշելով որպես չընթերցված թեմաներ "
       change: "փոխել"
+      featured_topic: "Հանրահայտ թեմա"
       moderator: "{{user}}-ը մոդերատոր է"
       admin: "{{user}}-ը ադմին է"
       moderator_tooltip: "Այս օգտատերը մոդերատոր է"
@@ -692,6 +830,7 @@ hy:
       watched_first_post_tags_instructions: "Դուք կստանաք ծանուցում այս թեգերով յուրաքանչյուր նոր թեմայում առաջին գրառման մասին:"
       muted_categories: "Խլացված"
       muted_categories_instructions: "Դուք չեք ստանա որևէ ծանուցում այս կատեգորիաների նոր թեմաների մասին, և դրանք չեն հայտնվի կատեգորիաներում կամ վերջին էջերում:"
+      muted_categories_instructions_dont_hide: "Դուք որևէ ծանուցում չեք ստանա այս կատեգորիայի նոր թեմաների վերաբերյալ:"
       no_category_access: "Որպես մոդերատոր՝ Դուք ունեք կատեգորիաների սահմանափակ թույլտվություն, պահպանելն անջատված է:"
       delete_account: "Ջնջել Իմ Հաշիվը"
       delete_account_confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք մշտապես ջնջել Ձեր հաշիվը: Այս գործողությունը չի կարող ետարկվել!"
@@ -720,6 +859,7 @@ hy:
         deleted_posts: "ջնջված գրառում"
         suspensions: "սառեցում"
         warnings_received: "զգուշացում"
+        rejected_posts: "մերժված հաղորդագրություներ"
       messages:
         all: "Բոլորը"
         inbox: "Մուտքերի արկղ"
@@ -756,14 +896,19 @@ hy:
         disable: "Անջատել"
         enable: "Միացնել"
         enable_long: "Միացնել պահուստային կոդերը"
+        manage: "Կառավարել պահուստային կոդերով: Ձեզ մնացել է պահուստային <strong>{{count}}</strong> կոդ:"
         copied_to_clipboard: "Կրնօրինակված է Փոխանակման հարթակում"
         copy_to_clipboard_error: "Փոխանակման հարթակում տվյալների կրկնօրինակման սխալ"
         remaining_codes: "Ձեզ մնացել է պահուստային <strong>{{count}}</strong> կոդ:"
+        use: "Օգտագործել պահուստային կոդը"
+        enable_prerequisites: "Դուք պետք է ակտիվացնեք առաջնային երկրորդ գործոնը՝ պահուստային կոդերի գեներացիայից առաջ:"
         codes:
           title: "Պահուստային Կոդերը Գեներացվել են"
           description: "Այս պահուստային կոդերից յուրաքանչյուրը կարող է օգտագործվել միայն մեկ անգամ: Պահեք դրանք ապահով, բայց հասանելի վայրում:"
       second_factor:
         title: "Երկգործոն վավերացում"
+        enable: "Կառավարել Երկգործոն Վավերացում"
+        forgot_password: "Մոռացե՞լ եք Գաղտնաբառը:"
         confirm_password_description: "Շարունակելու համար խնդրում ենք հաստատել Ձեր գաղտնաբառը"
         name: "Անուն"
         label: "Կոդ"
@@ -772,14 +917,31 @@ hy:
           Սկանավորեք այս QR կոդը համապատասխան հավելվածում (<a href="https://www.google.com/search?q=authenticator+apps+for+android" target="_blank">Android</a> – <a href="https://www.google.com/search?q=authenticator+apps+for+ios" target="_blank">iOS</a>) և մուտքագրեք Ձեր նույնականացման կոդը:
         disable_description: "Խնդրում ենք Ձեր հավելվածից մուտքագրել վավերացման կոդը:"
         show_key_description: "Մուտքագրել ձեռքով"
+        short_description: |
+          Ձեր ակաունտը պաշտպանեք մեկանգամյա օգտագործման անվտանգության կոդերով:
         extended_description: |
           Երկգործոն վավերացումն ավելացնում է էքստրա-անվտանգություն Ձեր հաշվին՝ պահանջելով մեկանգամյա կոդանշան(token)՝ ի հավելումն Ձեր գաղտնաբառին: Կոդանշանները կարող են գեներացվել <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: "Խնդրում ենք նկատի ունենալ, որ սոցիալական ցանցերով մուտքը կանջատվի, հենց որ երկգործոն վավերացումը միացվի Ձեր հաշվի համար:"
+        use: "Օգտագործեք Նույնականացման հավելվածը՝ ստուգման համար  "
         enforced_notice: "Դուք պարտավոր եք միացնել երկգործոն նույնականացումը՝ մինչ մուտք գործելը այս կայք:"
+        disable: "անջատել"
+        disable_title: "Անջատել Երկրորդ Գործոնը"
+        disable_confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք անջատել բոլոր երկրորդական գործոնները: "
         edit: "Խմբագրել"
+        edit_title: "Խմբագրել Երկրորդ Գործոնը"
+        edit_description: "Երկրորդ Գործոնի Անվանումը"
+        enable_security_key_description: "Երբ պատրաստեք ձեր անվտանգության ֆիզիկական բանալին, սեղմեք կոճակը <b> Գրանցվել </b> ներքևում:"
         security_key:
           register: "Գրանցվել"
+          title: "Անվտանգության Բանալիներ"
+          add: "Գրանցել Անվտանգության Բանալին"
+          default_name: "Անվտանգության Գլխավոր Բանալին"
+          not_allowed_error: "Անվտանգության բանալու գրանցման ժամանակը վերջացել է կամ չեղյալ է հայտարարվել:"
+          already_added_error: "Դուք արդեն գրանցել եք այս անվտանգության բանալին: Պետք չէ այն նորից գրանցել:"
+          edit: "Խմբագրել Անվտանգության Բանալին"
+          edit_description: "Անվտանգության Բանալիների անվանումը"
           delete: "Ջնջել"
+          name_required_error: "Դուք պետք է նշեք անվտանգության բանալու անվանումը "
       change_about:
         title: "Փոփոխել Իմ Մասին բաժինը"
         error: "Այս արժեքը փոփոխելիս տեղի է ունեցել սխալ:"
@@ -801,9 +963,15 @@ hy:
         uploaded_avatar_empty: "Ավելացնել անհատական նկար"
         upload_title: "Վերբեռնեք Ձեր նկարը"
         image_is_not_a_square: "Ուշադրություն. մենք կտրել ենք Ձեր նկարը; լայնությունն ու երկարությունը հավասար չէին:"
+      change_profile_background:
+        title: "Պրոֆիլի Վերնագիրը"
+        instructions: "Պրոֆիլի վերնագիրը կկենտրոնանա և կունենա 1110 պքս լռելյայն լայնություն:"
       change_card_background:
         title: "Օգտատիրոջ Քարտի Ֆոն"
         instructions: "Ֆոնի նկարները կբերվեն կենտրոն և կունենան 590 պքս լռելյայն լայնություն:"
+      change_featured_topic:
+        title: "Հանրահայտ թեմա"
+        instructions: "Այս թեմայի հղումը կպատկերվի օգտատիրոջ քարտում և ձեր պրոֆիլում:"
       email:
         title: "Էլ. հասցե"
         primary: "Հիմնական Էլ. հասցե"
@@ -824,6 +992,7 @@ hy:
         revoke: "Հետ կանչել"
         cancel: "Չեղարկել"
         not_connected: "(չկապակցված)"
+        confirm_modal_title: "Միացնել %{provider} Հաշիվը"
       name:
         title: "Անուն"
         instructions: "Ձեր անուն ազգանունը (ընտրովի)"
@@ -848,6 +1017,9 @@ hy:
         any: "ցանկացած"
       password_confirmation:
         title: "Կրկնել Գաղտաբառը "
+      invite_code:
+        title: "Հրավերի Կոդ"
+        instructions: "Հաշվի գրանցման համար պահանջվում է հրավերների կոդ"
       auth_tokens:
         title: "Վերջերս Օգտագործված Սարքերը"
         ip: "IP"
@@ -878,6 +1050,10 @@ hy:
         normal: "Նորմալ"
         larger: "Ավելի մեծ"
         largest: "Ամենամեծը"
+      title_count_mode:
+        title: "Ֆոնային էջի վերնագրում պատկերվում է քանակը. "
+        notifications: "Նոր Ծանուցումներ"
+        contextual: "Նոր էջի բովանդակությունը"
       like_notification_frequency:
         title: "Ծանուցել հավանելու դեպքում"
         always: "Միշտ"
@@ -931,6 +1107,7 @@ hy:
         search: "փնտրել հրավերներ..."
         title: "Հրավերներ"
         user: "Հրավիրված Օգտատեր"
+        sent: "Վերջին Ուղարկվածը"
         none: "Հրավերներ չկան:"
         truncated:
           one: "Առաջին հրավերի ցուցադրում"
@@ -1065,10 +1242,12 @@ hy:
         fixed: "Բեռնել էջը"
     modal:
       close: "փակել"
+      dismiss_error: "Չեղարկել սխալը"
     close: "Փակել"
     assets_changed_confirm: "Այս կայքը հենց նոր թարմացվել է: Թարմացնե՞լ էջը հիմա՝ ամենավերջին տարբերակն ստանալու համար:"
     logout: "Դուք դուրս եք գրվել:"
     refresh: "Թարմացնել"
+    home: "Գլխավոր էջ"
     read_only_mode:
       enabled: "Այս կայքը «միայն կարդալու համար» ռեժիմում է: Խնդրում ենք շարունակել, սակայն պատասխանելը, հավանելը և այլ գործողությունները հիմա անջատված են:"
       login_disabled: "Մուտք գործելն անջատված է, քանի դեռ կայքը գտնվում է «միայն կարդալու համար» ռեժիմում:"
@@ -1087,6 +1266,7 @@ hy:
     mute: Խլացնել
     unmute: "Միացնել "
     last_post: Հրապարակված
+    local_time: "Տեղական Ժամանակը"
     time_read: Կարդացված
     time_read_recently: "%{time_read} վերջերս"
     time_read_tooltip: "%{time_read} կարդալու ընդհանուր ժամանակը"
@@ -1128,6 +1308,7 @@ hy:
     trust_level: "Վստահության Մակարդակ"
     search_hint: "օգտանուն, էլ. հասցե կամ IP հասցե"
     create_account:
+      disclaimer: "Գրանցվելով դուք ընդունում եք <a href='{{privacy_link}}' target='blank'> գաղտնիության քաղաքականությունը </a> և <a href='{{tos_link}}' target='blank'> պայմանները </a>:"
       title: "Ստեղծել Նոր Հաշիվ"
       failed: "Ինչ-որ սխալ է տեղի ունեցել, հնարավոր է՝ այս էլ. հասցեն արդեն գրանցված է, փորձեք կատարել գաղտնաբառի վերականգնում:"
     forgot_password:
@@ -1137,6 +1318,8 @@ hy:
       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_not_found: "Ոչ մի հաշիվ չի համընկնում <b>%{username}</b> օգտանվանը"
       complete_email_not_found: "Ոչ մի հաշիվ չի համընկնում <b>%{email}</b> էլ. հասցեին"
       help: "Էլ. նամակը չի՞ եկել: Համոզվեք՝ առաջին հերթին ստուգելով Սպամ թղթապանակը: <p>Համոզված չեք, թե ո՞ր էլ. հասցեն եք օգտագործել. խնդրում ենք մուտքագրել այն այստեղ և մենք կստուգենք, թե արդյոք այն առկա է համակարգում:</p><p>Եթե Ձեր հաշվի էլ. հասցեն այլևս հասանելի չէ Ձեզ, խնդրում ենք կապ հաստատել <a href='%{basePath}/about'>մեր օգնության անձնակազմի հետ:</a></p>"
@@ -1152,17 +1335,26 @@ hy:
       complete_username_not_found: "<b>%{username}</b> օգտանվանը համապատասխանող հաշիվ չի գտնվել:"
       complete_email_not_found: "Ոչ մի հաշիվ չի համընկնում <b>%{email}</b> էլ. հասցեին"
       confirm_title: "Շարունակել դեպի %{site_name}"
+      logging_in_as: "Մուտք գործել որպես %{email}"
+      confirm_button: Ավարտել Մուտքը
     login:
       title: "Մուտք"
       username: "Օգտատեր"
       password: "Գաղտնաբառ"
       second_factor_title: "Երկգործոն Վավերացում"
       second_factor_description: "Խնդրում ենք Ձեր հավելվածից մուտքագրել վավերացման կոդը՝"
+      second_factor_backup: "Մուտք գործել օգտագործելով պահուստային կոդը"
       second_factor_backup_title: "Երկգործոն Պահուստային Պատճենում (Two Factor Backup)"
       second_factor_backup_description: "Խնդրում ենք մուտքագրել ձեր պահուստային կոդերից որևէ մեկը՝"
+      second_factor: "Մուտք գործել օգտագործելով Authenticator հավելվածը"
+      security_key_alternative: "Փորձեք ուրիշ տարբերակ"
+      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: "Կարծես թե Ձեր բրաուզերի քուքիները անջատված են: Դուք չեք կարող մուտք գործել առանց դրանք միացնելու:"
       rate_limit: "Խնդրում ենք սպասել՝ մինչ կրկին մուտք գործել փորձելը:"
       blank_username: "Խնդրում ենք մուտքագրել Ձեր էլ. հասցեն կամ օգտանունը:"
       blank_username_or_password: "Խնդրում ենք մուտքագրել Ձեր էլ. հասցեն կամ օգտանունը, և գաղտնաբառը:"
@@ -1239,8 +1431,11 @@ hy:
       shift: "Shift"
       ctrl: "Ctrl"
       alt: "Alt"
+      enter: "Մուտք"
     conditional_loading_section:
       loading: Բեռնվում է...
+    category_row:
+      topic_count: "{{count}} թեմաներ այս կատեգորիայում "
     select_kit:
       default_header_text: Ընտրել...
       no_content: Համընկնումներ չեն գտնվել
@@ -1253,9 +1448,12 @@ hy:
       min_content_not_reached:
         one: "Ընտրեք առնվազն{{count}} տարր:"
         other: "Ընտրեք առնվազն {{count}} տարր:"
+      invalid_selection_length: "Անհրաժեշտ է ընտրել առնվազն {{count}} սիմվոլ: "
     date_time_picker:
       from: Ում կողմից
       to: Ում
+      errors:
+        to_before_from: "Հաջորդ ամսաթիվը պետք է լինի ավելի մեծ, քան նախորդը:"
     emoji_picker:
       filter_placeholder: Փնտրել էմոջի
       smileys_&_emotion: Սմայլիկներ և Էմոցինաեր
@@ -1309,10 +1507,12 @@ hy:
         title_missing: "Վերնագիրը պարտադիր է:"
         title_too_short: "Վերնագիրը պետք է լինի առնվազն {{min}} սիմվոլ:"
         title_too_long: "Վերնագիրը չպետք է գերազանցի {{max}} սիմվոլը:"
+        post_missing: "Գրառումը չի կարող դատարկ լինել:"
         post_length: "Գրառումը պետք է լինի առնվազն {{min}} սիմվոլ:"
         try_like: "Դուք փորձե՞լ եք {{heart}} կոճակը:"
         category_missing: "Դուք պետք է ընտրեք կատեգորիա:"
         tags_missing: "Դուք պետք է ընտրեք առնվազն{{count}} թեգ:"
+        topic_template_not_modified: "Դետալները գրանցել թեմայի մեջ և խմբագրել ձևանմուշը: "
       save_edit: "Պահել Խմբագրումը"
       overwrite_edit: "Վերասահմանել Խմբագրումը"
       reply_original: "Պատասխանել Սկզբնական Թեմային"
@@ -1333,9 +1533,11 @@ hy:
       remove_featured_link: "Հեռացնել հղումը թեմայից:"
       reply_placeholder: "Գրեք այստեղ: Օգտագործեք Markdown, BBCode, կամ HTML ֆորմատավորման համար: Քաշեք կամ տեղադրեք նկարներ:"
       reply_placeholder_no_images: "Գրեք այստեղ: Օգտագործեք Markdown, BBCode, կամ HTML ֆորմատավորման համար:"
+      reply_placeholder_choose_category: "Մինչ այստեղ գրերը՝ ընտրեք կատեգորիա:"
       view_new_post: "Դիտել Ձեր նոր գրառումը:"
       saving: "Պահպանվում է"
       saved: "Պահված է!"
+      saved_draft: "Գրառման սևագիրն ընթացքի մեջ է: Սեղմեք՝ վերսկսելու համար:"
       uploading: "Վերբեռնվում է..."
       show_preview: "ցուցադրել նախադիտումը &raquo;"
       hide_preview: "&laquo; թաքցնել նախադիտումը"
@@ -1350,6 +1552,7 @@ hy:
       link_description: "մուտքագրեք հղման նկարագրությունն այստեղ"
       link_dialog_title: "Տեղադրել Հիպերհղումը"
       link_optional_text: "ընտրովի վերնագիր"
+      link_url_placeholder: "Տեղադրեք URL կամ տեքստը մուտքագրեք՝ թեմաները որոնելու համար"
       quote_title: "Մեջբերել"
       quote_text: "Մեջբերել բաժինը"
       code_title: "Ձևաչափված տեքստ"
@@ -1384,6 +1587,7 @@ hy:
         reply_as_new_topic:
           label: Պատասխանել որպես կապված թեմա
           desc: Ստեղծել այս թեմային հղված նոր թեմա
+          confirm: "Ձեզ մոտ պահպանված է նոր թեմայի սևագիրը, որը կվերագրվի, եթե դրա հետ կապված թեմա ստեղծեք: "
         reply_as_private_message:
           label: Նոր հաղորդագրություն
           desc: Գրել նոր անձնական նամակ
@@ -1412,6 +1616,8 @@ hy:
       title: "@անունի հիշատակումների, Ձեր գրառումների և թեմաների պատասխանների, հաղորդագրությունների և այլնի մասին ծանուցումներ "
       none: "Սյս պահին հնարավոր չէ բեռնել ծանուցումները"
       empty: "Ծանուցումներ չեն գտնվել:"
+      post_approved: "Ձեր գրառումը հաստատված է"
+      reviewable_items: "վերանայում պահանջող կետեր"
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
@@ -1426,7 +1632,7 @@ hy:
         other: "<span>{{username}}, {{username2}} և ևս {{count}}-ը</span> {{description}}"
       liked_consolidated_description:
         one: "հավանել է Ձեր {{count}} գրառում"
-        other: "հավանել է Ձեր {{count}} գրառում"
+        other: "հավանել է Ձեր {{count}} գրառումը"
       liked_consolidated: "<span>{{username}}</span> {{description}}"
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
@@ -1451,9 +1657,29 @@ hy:
         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: "գրառումը տեղափոխված է"
+        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: "Մշակել անդամակցության նոր հարցումները"
     upload_selector:
       title: "Ավելացնել նկար"
       title_with_attachments: "Ավելացնել նկար կամ ֆայլ"
@@ -1471,8 +1697,8 @@ hy:
     search:
       sort_by: "Դասավորել ըստ"
       relevance: "Համապատասխանության"
-      latest_post: "Վերջին Գրառումը"
-      latest_topic: "Վերջին Թեմայի"
+      latest_post: "Վերջին Գրառումը "
+      latest_topic: "Վերջին Թեման"
       most_viewed: "Ամենաշատ Դիտված"
       most_liked: "Ամենաշատ Հավանած"
       select_all: "Ընտրել Բոլորը"
@@ -1481,8 +1707,8 @@ hy:
       result_count:
         one: "<span>%{count} result for</span><span class='term'>{{term}}</span>"
         other: "<span>{{count}}{{plus}} արդյունք</span><span class='term'>{{term}}</span>-ի համար"
-      title: "որոնել թեմաներ, գրառումներ, օգտատերեր կամ կատեգորիաներ"
-      full_page_title: "որոնել թեմաներ կամ գրառումներ"
+      title: "որոնել թեմաներ, հաղորդագրություններ, օգտատերեր կամ կատեգորիաներ"
+      full_page_title: "որոնել թեմաներ կամ հաղորդագրություններ"
       no_results: "Արդյունքներ չեն գտնվել:"
       no_more_results: "Արդյունքներ այլևս չեն գտնվել:"
       searching: "Փնտրվում է..."
@@ -1498,6 +1724,7 @@ hy:
       context:
         user: "Որոնել @{{username}}-ի գրառումները"
         category: "Որոնել #{{category}} կատեգորիայում"
+        tag: "Որոնում #{{tag}} թեգով"
         topic: "Որոնել այս թեմայում"
         private_messages: "Որոնել հաղորդագրություններում"
       advanced:
@@ -1517,6 +1744,7 @@ hy:
           title: Միայն վերնագրի համընկնումով
           likes: Ես հավանել եմ
           posted: Ես գրառում եմ կատարել
+          created: "որոնք Ես ստեղծեցի "
           watching: Ես դիտում եմ
           tracking: Ես հետևում եմ
           private: Իմ հաղորդագրություններում
@@ -1533,6 +1761,7 @@ hy:
           label: Որտեղ թեմաները
           open: բաց են
           closed: փակ են
+          public: հանրային
           archived: արխիվացված են
           noreplies: պատասխաններ չունեն
           single_user: պարունակում են մեկ օգտատեր
@@ -1548,6 +1777,7 @@ hy:
     go_back: "ետ գնալ"
     not_logged_in_user: "օգտատիրոջ էջը՝ ընթացիկ ակտիվության և նախընտրությունների ամփոփումով"
     current_user: "գնալ իմ էջը"
+    view_all: "դիտել բոլոը"
     topics:
       new_messages_marker: "վերջին այցելությունը"
       bulk:
@@ -1616,6 +1846,15 @@ hy:
       edit_message:
         help: "Խմբագրել հաղորդագրության առաջին գրառումը"
         title: "Խմբագրել Հաղորդագրությունը"
+      defer:
+        help: "նշել որպես չընթերցված "
+        title: "Հետաձգել"
+      feature_on_profile:
+        help: "Այս թեմայի հղումը կավելացվի օգտատիրոջ քարտում և ձեր պրոֆիլում:"
+      remove_from_profile:
+        warning: "Ձեր պրոֆիլում արդեն կա ընտրված թեման: Եթե դուք ​​շարունակեք, ապա՝ այդ թեման կփոխարինի առկա թեմային:"
+        help: "Հեռացրեք այս թեմայի հղումը ձեր պրոֆիլում "
+        title: "Հեռացնել Պրոֆիլից "
       list: "Թեմաներ"
       new: "նոր թեմա"
       unread: "չկարդացած"
@@ -1654,6 +1893,10 @@ hy:
       toggle_information: "փոխանջատել թեմայի մանրամասները"
       read_more_in_category: "Ցանկանո՞ւմ եք կարդալ ավելին: Դիտեք այլ թեմաներ՝ {{catLink}}-ում կամ {{latestLink}}."
       read_more: "Ցանկանո՞ւմ եք կարդալ ավելին: {{catLink}} կամ {{latestLink}}."
+      group_request: "Այս թեման տեսնելու համար ձեզ հարկավոր է անդամակցել {{name}} խմբին: "
+      group_join: "Այս թեման տեսնելու համար հարկավոր է միանալ {{name}} խմբին:"
+      group_request_sent: "Խմբին անդամության ձեր հարցումն ուղարկվել է: Ձեզ կտեղեկացնեն, երբ այն ընդունվի:"
+      unread_indicator: "Ոչ մի անդամ դեռ չի կարդացել այս թեմայի մինչև վերջին գրառումը: "
       read_more_MF: " { UNREAD, plural, =0 {} one {<a href='{basePath}/unread'>1 չկարդացած</a> } other { <a href='{basePath}/unread'># չկարդացած</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {Կա} other{}} <a href='{basePath}/new'>1 նոր</a> topic} other { {BOTH, select, true{and } false {կա } other{}} <a href='{basePath}/new'># նոր</a> թեմա} } , կամ {CATEGORY, select, true {դիտեք այլ թեմաներ {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Դիտել բոլոր կատեգորիաները
       view_latest_topics: դիտեք վերջին թեմաները
@@ -1665,6 +1908,7 @@ hy:
         title: "Թեմայի Ժամաչափիչ"
         save: "Ժամաչափիչ Դնել"
         num_of_hours: "Ժամերի քանակը."
+        num_of_days: "Օրերի քանակը"
         remove: "Հեռացնել Ժամաչափիչը"
         publish_to: "Հրատարակել."
         when: "Երբ."
@@ -1680,7 +1924,9 @@ hy:
         next_week: "Հաջորդ շաբաթ"
         two_weeks: "Երկու Շաբաթ"
         next_month: "Հաջորդ ամիս"
+        two_months: "Երկու Ամիս"
         three_months: "Երեք Ամիս"
+        four_months: "Չորս Ամիս"
         six_months: "Վեց Ամիս"
         one_year: "Մեկ Տարի"
         forever: "Ընդմիշտ"
@@ -1705,6 +1951,8 @@ hy:
         title: "Ավտոմատ Բարձրացնել Թեման"
       reminder:
         title: "Հիշեցնել Ինձ"
+      auto_delete_replies:
+        title: "Ավտոմատ Ջնջել Պատասխանները"
       status_update_notice:
         auto_open: "Այս թեման ավտոմատ կբացվի %{timeLeft}:"
         auto_close: "Այս թեման ավտոմատ կփակվի %{timeLeft}:"
@@ -1713,6 +1961,7 @@ hy:
         auto_delete: "Այս թեման ավտոմատ կերպով կջնջվի %{timeLeft}:"
         auto_bump: "Այս թեման ավտոմատ կբարձրացվի %{timeLeft}:"
         auto_reminder: "Ձեզ կհիշեցվի այս թեմայի մասին %{timeLeft}:"
+        auto_delete_replies: "Այս թեմային վերաբերող պատասխանները հետո ավտոմատ ջնջվում են %{duration}."
       auto_close_title: "Ավտոմատ Փակման Կարգավորումները"
       auto_close_immediate:
         one: "Այս թեմայի վերջին հրապարակումը արդեն %{count} ժամ վաղեմութոյւն ունի, հետևաբար՝ թեման անմիջապես կփակվի:"
@@ -1729,6 +1978,7 @@ hy:
         jump_bottom: "ցատկել դեպի վերջին գրառում"
         jump_prompt: "ցատկել դեպի..."
         jump_prompt_of: "%{count} գրառումից"
+        jump_prompt_long: "Ցատկել դեպի.."
         jump_bottom_with_number: "ցատկել դեպի %{post_number}գրառումը"
         jump_prompt_to_date: "դեպի ամսաթիվ"
         jump_prompt_or: "կամ"
@@ -1747,7 +1997,6 @@ hy:
           "2_8": "Դուք կտեսնեք նոր պատասխանների քանակը, քանի որ հետևում եք այս կատեգորիային:"
           "2_4": "Դուք կտեսնեք նոր պատասխանների քանակը, քանի որ հրապարակել եք պատասխան այս թեմայում:"
           "2_2": "Դուք կտեսնեք նոր պատասխանների քանակը, քանի որ հետևում եք այս թեմային:"
-          "2": 'Դուք կտեսնեք նոր պատասխանների քանակը, քանի որ Դուք <a href="{{basePath}}/u/{{username}}/preferences">կարդացել եք այս թեման</a>:'
           "1_2": "Դուք ծանուցում կստանաք, եթե որևէ մեկը հիշատակի Ձեր @անունը կամ պատասխանի Ձեզ:"
           "1": "Դուք ծանուցում կստանաք, եթե որևէ մեկը հիշատակի Ձեր @անունը կամ պատասխանի Ձեզ:"
           "0_7": "Դուք անտեսում եք այս կատեգորիայի բոլոր ծանուցումները:"
@@ -1818,6 +2067,9 @@ hy:
         title: "Դրոշակավորել"
         help: "թեմային ուշադրություն գրավել՝ գաղտնի կերպով դրոշակավորելով կամ ուղարկելով գաղտնի ծանուցում այդ մասին"
         success_message: "Դուք հաջողությամբ դրոշակավորեցիք այս թեման:"
+      make_public:
+        title: "Փոխարկել Հրապարակային Թեմայի"
+        choose_category: "Խնդրում ենք ընտրել կատեգորիա՝ հրապարակային թեմայի համար"
       feature_topic:
         title: "Ամրացնել այս թեման"
         pin: "Այս թեման տեղադրել {{categoryLink}} կատեգորիայի վերևում մինչև"
@@ -1920,6 +2172,17 @@ hy:
         title: "Միավորել Ընտրված Գրառումները"
         action: "միավորել ընտրված գրառումները"
         error: "Ընտրված գրառումները միավորելիս տեղի է ունեցել սխալ:"
+      publish_page:
+        title: "Էջի Հրատարակում"
+        publish: "Հրատարակել"
+        description: "Երբ թեման հրապարակվում է որպես էջ, դրա URL- ն կարող է համընդհանուր տարածվել և պատկերվել օգտատերերի խմբագրմամբ: "
+        publish_url: "Ձեր էջը հրապարակվել է այս հասցեով՝ "
+        topic_published: "Ձեր թեման հրապարակվել է՝"
+        preview_url: "Ձեր էջը կհրապարակվի այս հասցեով՝"
+        invalid_slug: "Ներողություն, Դուք չեք կարող հրապարակել այս էջը:"
+        unpublish: "Հրապարակումը չեղարկել"
+        unpublished: "Էջի հրապարակումը չեղարկվել է և այն անհասանելի է նախկինում նշված հասցեում:"
+        publishing_settings: "Հրապարակման Կարգավորումներ"
       change_owner:
         title: "Փոխել Սեփականատիրոջը"
         action: "փոխել սեփականությունը"
@@ -1960,6 +2223,7 @@ hy:
       quote_reply: "Մեջբերել"
       edit_reason: "Պատճառը՝ "
       post_number: "գրառում {{number}}"
+      ignored: "Անտեսված բովանդակություն"
       wiki_last_edited_on: "wiki-ն վերջին անգամ խմբագրվել է"
       last_edited_on: "գրառումը վերջին անգամ խմբագրվել է"
       reply_as_new_topic: "Պատասխանել որպես հղված թեմա"
@@ -1967,6 +2231,7 @@ hy:
       continue_discussion: "Շարունակելով {{postLink}} քննարկումը՝ "
       follow_quote: "գնալ դեպի մեջբերված գրառումը"
       show_full: "Ցուցադրել Գրառումն Ամբողջությամբ"
+      show_hidden: "Դիտել անտեսված բովանդակությունը "
       deleted_by_author:
         one: "(հեղինակի կողմից հեռացված հրապարակում, ավտոմատ կերպով կջնջվի %{count} ժամից, եթե դրոշակավորված չէ)"
         other: "(եթե հեղինակի կողմից հեռացված գրառումը չդրոշակավորվի, ապա ավտոմատ կերպով կջնջվի %{count} ժամից)"
@@ -2002,10 +2267,14 @@ hy:
         attachment_upload_not_allowed_for_new_user: "Ներողություն, նոր օգտատերերը չեն կարող ֆայլեր կցել:"
         attachment_download_requires_login: "Ներողություն, Դուք պետք է մուտք գործեք՝ կցված ֆայլերը ներբեռնելու համար:"
       abandon_edit:
+        confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք հրաժարվել Ձեր փոփոխություններից:"
         no_value: "Ոչ, պահել"
+        no_save_draft: "Ոչ, պահել սևագիրը"
+        yes_value: "Այո, հրաժարվել խմբագրումից"
       abandon:
         confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք լքել Ձեր գրառումը:"
         no_value: "Ոչ, պահել"
+        no_save_draft: "Ոչ, պահել սևագիրը"
         yes_value: "Այո, լքել"
       via_email: "այս գրառումը եկել է էլ. նամակով"
       via_auto_generated_email: "այս գրառումը եկել է ավտոմատ գեներացված էլ. նամակով"
@@ -2019,6 +2288,7 @@ hy:
         reply: "պատասխանել այս գրառմանը"
         like: "հավանել այս գրառումը"
         has_liked: "Դուք հավանել եք այս գրառումը"
+        read_indicator: "անդամներ, ովքեր կարդում են այս գրառումը"
         undo_like: "Ետարկել հավանումը"
         edit: "խմբագրել այս գրառումը"
         edit_action: "Խմբագրել"
@@ -2043,6 +2313,7 @@ hy:
         convert_to_moderator: "Ավելացնել Անձնակազմի Գույն"
         revert_to_regular: "Հեռացնել Անձնակազմի Գույնը"
         rebake: "Վերակառուցել HTML-ը"
+        publish_page: "Էջի Հրատարակում"
         unhide: "Դարձնել Տեսանելի"
         change_owner: "Փոխել Սեփականատիրոջը"
         grant_badge: "Շնորհել Կրծքանշան"
@@ -2053,6 +2324,9 @@ hy:
         delete_topic_disallowed_modal: "Դուք թույլտվություն չունեք ջնջելու այս թեման: Եթե Դուք իսկապես ցանկանում եք, որ այն ջնջվի, դրոշակավորեք այն պատճառաբանության հետ միասին՝ մոդերատորի ուշադրությանը գրավելու համար:"
         delete_topic_disallowed: "Դուք թույլտվություն չունեք ջնջելու այս թեման"
         delete_topic: "ջնջել թեման"
+        add_post_notice: "Հաղորդագրություն Մոդերատորներից"
+        remove_post_notice: "Հեռացնել Մոդերատորների Հաղորդագրությունը"
+        remove_timer: "հեռացնել ժամաչափիչը"
       actions:
         flag: "Դրոշակավորել"
         defer_flags:
@@ -2124,8 +2398,18 @@ hy:
             title: "Ցուցադրել էլ. նամակի html մասը"
             button: "HTML"
       bookmarks:
+        create: "Ստեղծել էջանշան"
+        edit: "Խմբագրել էջանշանը"
         created: "Ստեղծված"
+        updated: "Թարմացված"
         name: "Անուն"
+        actions:
+          delete_bookmark:
+            name: "Ջնջել էջանշանը"
+            description: "Էջանշանի հեռացում՝ ներառելով կարգավորված բոլոր հիշեցումները "
+          edit_bookmark:
+            name: "Խմբագրել էջանշանը"
+            description: "Խմբագրել էջանշանի անվանումը կամ փոխել հիշեցման ամսաթիվը / ժամանակը"
     category:
       can: "կարող է&hellip; "
       none: "(կատեգորիա չկա)"
@@ -2138,8 +2422,17 @@ hy:
       settings: "Կարգավորումներ"
       topic_template: "Թեմայի Ձևանմուշ"
       tags: "Թեգեր"
+      tags_allowed_tags: "Սահմանափակել այս թեգերը՝ այս կատեգորիայում. "
+      tags_allowed_tag_groups: "Սահմանափակել այս թեգերը՝ այս կատեգորիայում."
       tags_placeholder: "(Ընտրովի) թույլատրված թեգերի ցանկը"
+      tags_tab_description: "Այստեղ սահմանված թեգերը և թեգերի խմբերը հասանելի կլինեն միայն այս կատեգորիայում և այլ կատեգորիաներում, որոնք նույնպես սահմանում են դրանք: Դրանք հասանելի չեն լինի օգտագործման համար այլ կատեգորիաներում:"
       tag_groups_placeholder: "(Ընտրովի) թույլատրված թեգերի խմբերի ցանկը"
+      manage_tag_groups_link: "Կառավարել թեգերի խմբերը այստեղ:"
+      allow_global_tags_label: "Նաև թույլ տալ այլ տեգեր "
+      tag_group_selector_placeholder: "(Ընտրովի) Թեգերի խումբ"
+      required_tag_group_description: "Պահանջել, որ նոր թեմաների տեգերը լինեն տեգերի խմբից:"
+      min_tags_from_required_group_label: "Թեգի Համարը."
+      required_tag_group_label: "Թեգերի խումբ."
       topic_featured_link_allowed: "Թույլատրել հանրահայտ հղումները այս կատեգորիայում"
       delete: "Ջնջել Կատեգորիան"
       create: "Նոր Կատեգորիա"
@@ -2169,6 +2462,7 @@ hy:
       special_warning: "Ուշադրություն. Այս կատեգորիան նախապես ստեղծված կատեգորիա է, և անվտանգության կարգավորումները չեն կարող փոփոխվել: Եթե Դուք չեք ցանկանում օգտագործել այս կատեգորիան, ջնջեք այն՝ փոփոխելու փոխարեն:"
       uncategorized_security_warning: "Այս կատեգորիան հատուկ է: Այն նախատեսված է որպես կատեգորիա չունեցող թեմաների պահման տարածք; այն չի կարող ունենալ անվտանգության կարգավորումներ:"
       uncategorized_general_warning: 'Այս կատեգորիան հատուկ է: Այն օգտագործվում է որպես լռելյայն կատեգորիա նոր թեմաների համար, որոնք չունեն ընտրված կատեգորիա: Եթե Դուք ցանկանում եք կանխել սա և պարտադրել կատեգորիայի ընտրությունը, <a href="%{settingLink}">խնդրում ենք անջատել կարգավորումը այստեղ</a>: Եթե ցանկանում եք փոփոխել անունը կամ նկարագրությունը, այցելեք <a href="%{customizeLink}">Customize / Text Content</a>:'
+      pending_permission_change_alert: "Դուք չեք ավելացրել %{group} այդ կատեգորիայի մեջ, սեղմեք այս կոճակը՝ դրանք ավելացնելու համար: "
       images: "Նկարներ"
       email_in: "Անհատական մուտքային էլ. հասցե՝"
       email_in_allow_strangers: "Ընդունել էլ. նամակներ հաշիվ չունեցող անանուն օգտատերերից"
@@ -2176,6 +2470,7 @@ hy:
       email_in_disabled_click: 'միացրեք "email in" կարգավորումը:'
       mailinglist_mirror: "Կատեգորիան արտապատճենում է փոստային ցուցակ"
       show_subcategory_list: "Այս կատեգորիայում ցուցադրել ենթակատեգորիաների ցանկը թեմաների վերևում:"
+      read_only_banner: "Բանների տեքստը, երբ օգտատերը չի կարող այս կատեգորիայում թեմա ստեղծել. "
       num_featured_topics: "Կատեգորիաների էջում ցուցադրվող թեմաների քանակը՝"
       subcategory_num_featured_topics: "Մայր կատեգորիայի էջում հանրահայտ թեմաների քանակը"
       all_topics_wiki: "Դարձնել նոր թեմաները wiki լռելյայն"
@@ -2185,10 +2480,12 @@ hy:
       default_top_period: "Լռելյայն թոփ ժամանակահատվածը՝"
       allow_badges_label: "Այս կատեգորիայում թույլ տալ կրծքանշանների շնորհումը"
       edit_permissions: "Խմբագրել Թույլտվությունները"
+      reviewable_by_group: "Բացի անձնակազմից, այս կատեգորիայի գրառումներն ու դրոշակները կարող են վերանայել նաև."
       review_group_name: "խմբի անունը"
       require_topic_approval: "Բոլոր նոր թեմաների համար պահանջել մոդերատորի հաստատումը"
       require_reply_approval: "Բոլոր նոր պատասխանների համար պահանջել մոդերատորի հաստատումը "
       this_year: "այս տարի"
+      position: "Դիրքը կատեգորիայի էջում."
       default_position: "Լռելյայն Դիրքը"
       position_disabled: "Կատեգորիաները կցուցադրվեն ըստ ակտիվության: Ցանկերում կատեգորիաների դասավորությունը վերահսկելու համար,"
       position_disabled_click: 'միացրեք "fixed category positions" կարգավորումը:'
@@ -2241,6 +2538,7 @@ hy:
       settings_sections:
         general: "Ընդհանուր"
         moderation: "Մոդերացիա"
+        appearance: "Արտաքին տեսք"
         email: "Էլ. հասցե"
     flagging:
       title: "Շնորհակալ ենք, որ օգնում եք պահել մեր համայնքը քաղաքակիրթ:"
@@ -2312,6 +2610,9 @@ hy:
         help: "Այս թեման ամրակցված է Ձեզ համար; այն կցուցադրվի իր կատեգորիայի վերևում"
       unlisted:
         help: "Այս թեման հանված է ցանկից; այն չի ցուցադրվի թեմաների ցանկերում, և կարող է հասանելի լինել միայն ուղղակի հղումով"
+      personal_message:
+        title: "Այս թեման անձնական հաղորդագրություն է"
+        help: "Այս թեման անձնական հաղորդագրություն է"
     posts: "Գրառումներ"
     posts_long: "այս թեմայում կա {{number}} գրառում"
     posts_likes_MF: |
@@ -2415,14 +2716,22 @@ hy:
         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: "Պատասխանել/Դիտել"
       readonly: "Դիտել"
     lightbox:
       download: "ներբեռնել"
+      close: "Փակել (Esc)"
+      content_load_error: '<a href="%url%"> Բովանդակությունը </a> հնարավոր չէ բեռնել:'
+      image_load_error: '<a href="%url%"> Պատկերը </a> հնարավոր չէ բեռնել:'
     keyboard_shortcuts_help:
+      shortcut_key_delimiter_comma: ","
+      shortcut_key_delimiter_plus: "+"
+      shortcut_delimiter_or: "%{shortcut1} կամ %{shortcut2}"
+      shortcut_delimiter_slash: "%{shortcut1}/%{shortcut2}"
+      shortcut_delimiter_space: "%{shortcut1} %{shortcut2}"
       title: "Ստեղնաշարի Համադրություններ"
       jump_to:
         title: "Ցատկել Դեպի"
@@ -2443,6 +2752,7 @@ hy:
         up_down: "%{shortcut} Տեղաշարժել նշվածը &uarr; &darr;"
         open: "%{shortcut} Բացել ընտրված թեման"
         next_prev: "%{shortcut} Հաջորդ/նախորդ բաժին"
+        go_to_unread_post: "%{shortcut} Գնալ դեպի առաջին չընթերցված գրառումը"
       application:
         title: "Հավելված"
         create: "%{shortcut} Ստեղծել նոր թեմա"
@@ -2459,6 +2769,19 @@ hy:
         title: "Կազմում"
         return: "%{shortcut} Վերադառնալ կոմպոզերին"
         fullscreen: "%{shortcut} Ամբողջական էկրանով կոմպոզեր"
+      bookmarks:
+        title: "Էջանշում"
+        enter: "%{shortcut} Պահել և փակել"
+        later_today: "%{shortcut} Այսօր, բայց ավելի ուշ"
+        later_this_week: "%{shortcut} Այս շաբաթ, մի փոքր ավելի ուշ"
+        tomorrow: "%{shortcut} Վաղը"
+        next_week: "%{shortcut} Հաջորդ շաբաթ"
+        next_month: "%{shortcut} Հաջորդ ամիս"
+        next_business_week: "%{shortcut} Հաջորդ աշխատանքային շաբաթում "
+        next_business_day: "%{shortcut} Հաջորդ աշխատանքային օրը"
+        custom: "%{shortcut} Սահմանել հիշեցումների ամսաթիվն ու ժամանակը:"
+        none: "%{shortcut} Հիշեցում չսահմանել "
+        delete: "%{shortcut} Ջնջել էջանշանը"
       actions:
         title: "Գործողություններ"
         bookmark_topic: "%{shortcut} Փոխանջատել թեմայի էջանշանը"
@@ -2479,6 +2802,12 @@ hy:
         mark_tracking: "%{shortcut} Հետևել թեմային"
         mark_watching: "%{shortcut} Դիտել թեման"
         print: "%{shortcut} Տպել թեման"
+        defer: "%{shortcut} Հետաձգել թեման"
+        topic_admin_actions: "%{shortcut} Բացել թեմայի ադմինի գործողությունները "
+      search_menu:
+        title: "Որոնման արդյունքների Մենյու "
+        prev_next: "%{shortcut} Տեղաշարժել նշվածը վեր և վար"
+        insert_url: "%{shortcut} Ընտրված հղումը տեղադրել բաց կոմպոզերի մեջ"
     badges:
       earned_n_times:
         one: "Վաստակել է այս կրծքանշանը %{count} անգամ"
@@ -2519,6 +2848,11 @@ hy:
       changed: "փոփոխված թեգերը՝ "
       tags: "Թեգեր"
       choose_for_topic: "ընտրովի թեգեր"
+      info: "Ինֆորմացիա"
+      default_info: "Այս տեգը չի սահմանափակվում որևէ կատեգորիայով և չունի հոմանիշ:"
+      category_restricted: "Այս տեգը սահմանափակված է այն կատեգորիաներով, որոնցում մուտքի թույլտվություն չունեք:"
+      synonyms: "Հոմանիշներ"
+      synonyms_description: "Հետևյալ տեգերի օգտագործման դեպքում, դրանք կփոխարինվեն <b>%{base_tag_name}</b> -ով:"
       add_synonyms: "Ավելացնել"
       delete_tag: "Ջնջել Թեգը"
       delete_confirm:
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 21b6f48c6e..4a0bdca64c 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -26,7 +26,6 @@ id:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
-      time_with_zone: "h:mm a (z)"
       time_short_day: "ddd, HH: mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
@@ -238,7 +237,6 @@ id:
         bookmark: "Klik untuk membuat penandaan pos pertama di topik ini"
         unbookmark: "Klik untuk menghapus semua penandaan di topik ini"
     bookmarks:
-      created: "Anda telah menandai post ini"
       not_bookmarked: "tandai pos ini"
       remove: "Hilangkan penandaan"
       confirm_clear: "Yakin ingin menghapus semua penandaan Anda dari topik ini?"
@@ -669,6 +667,10 @@ id:
       private_message: "pesan"
       private_messages: "Messages"
       user_notifications:
+        filters:
+          all: "Semua"
+          read: "Dibaca"
+          unread: "Belum dibaca"
         ignore_duration_title: "Abaikan Timer"
         ignore_duration_username: "Nama Pengguna"
         ignore_duration_when: "Durasi:"
@@ -1048,6 +1050,7 @@ id:
     close: "Tutup"
     logout: "Anda telah keluar."
     refresh: "Segarkan"
+    home: "Beranda"
     read_only_mode:
       logout_disabled: "Logout di-nonaktifkan saat situs dalam mode hanya-baca."
     all_time: "total"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index b3232e2d8c..b96275bd04 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -27,7 +27,7 @@ it:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
-      time_with_zone: "h:mm a (z)"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year: "D MMM, HH:mm"
@@ -264,11 +264,10 @@ it:
         unbookmark: "Clicca per rimuovere tutti i segnalibri a questo argomento"
         unbookmark_with_reminder: "Fare clic per rimuovere tutti i segnalibri e i promemoria in questo argomento. Hai un promemoria impostato %{reminder_at} per questo argomento."
     bookmarks:
-      created: "hai inserito questo messaggio nei segnalibri"
       not_bookmarked: "aggiungi ai segnalibri"
-      created_with_reminder: "hai aggiunto un segnalibro a questo post con un promemoria %{date}"
-      created_with_at_desktop_reminder: "hai aggiunto un segnalibro a questo post e ti verrà ricordato la prossima volta che sarai sul desktop"
       remove: "Rimuovi Segnalibro"
+      delete: "Cancella Segnalibro"
+      confirm_delete: "Sicuro di voler eliminare questo segnalibro? Anche il promemoria verrà eliminato."
       confirm_clear: "Sei certo di voler rimuovere tutti i segnalibri da questo argomento?"
       save: "Salva"
       no_timezone: 'Non hai ancora impostato un fuso orario. Non sarai in grado di impostare promemoria. Creane uno <a href="%{basePath}/my/preferences/profile">nel tuo profilo</a> .'
@@ -757,6 +756,10 @@ it:
       private_message: "Messaggio"
       private_messages: "Messaggi"
       user_notifications:
+        filters:
+          all: "Tutti"
+          read: "Letti"
+          unread: "Non letti"
         ignore_duration_title: "Ignora Timer"
         ignore_duration_username: "Nome utente"
         ignore_duration_when: "Durata:"
@@ -1283,6 +1286,7 @@ it:
     assets_changed_confirm: "Questo sito è stato aggiornato. Aggiornare ora alla nuova versione?"
     logout: "Sei stato disconnesso."
     refresh: "Ricarica"
+    home: "Home"
     read_only_mode:
       enabled: "Questo sito è in modalità di sola lettura. Puoi continuare a navigare nel sito, ma le risposte, i \"Mi piace\" e altre azioni sono per il momento disabilitate."
       login_disabled: "La connessione è disabilitata quando il sito è in modalità di sola lettura."
@@ -1312,6 +1316,7 @@ it:
     mute: Ignora
     unmute: Attiva
     last_post: Ultimo messaggio
+    local_time: "Ora Locale"
     time_read: Letti
     time_read_recently: "%{time_read} recentemente"
     time_read_tooltip: "%{time_read} tempo totale di lettura"
@@ -2057,7 +2062,6 @@ it:
           "2_8": "Vedrai un conteggio delle nuove risposte perché stai seguendo questa categoria."
           "2_4": "Vedrai un conteggio delle nuove risposte perché hai pubblicato una risposta in questo argomento."
           "2_2": "Vedrai un conteggio delle nuove risposte perché stai seguendo questo argomento."
-          "2": 'Vedrai un conteggio delle nuove risposte perché <a href="{{basePath}}/u/{{username}}/preferences">hai letto questo argomento</a>.'
           "1_2": "Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde."
           "1": "Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde."
           "0_7": "Stai ignorando tutte le notifiche di questa categoria."
@@ -2478,6 +2482,7 @@ it:
         create: "Crea un segnalibro"
         edit: "Modifica Segnalibro"
         created: "Creazione"
+        updated: "Aggiornato"
         name: "Nome"
         name_placeholder: "A cosa serve questo segnalibro?"
         set_reminder: "Ricordamelo"
@@ -2789,7 +2794,7 @@ it:
         this_week: "Settimana"
         today: "Oggi"
         other_periods: "vedi argomenti di punta"
-    browser_update: 'Sfortunatamente, <a href="https://www.discourse.org/faq/#browser">il tuo browser è troppo obsoleto per funzionare con questo sito</a>. Per favore, <a href="https://browsehappy.com">aggiorna il tuo browser</a>.'
+    browser_update: 'Sfortunatamente <a href="https://www.discourse.org/faq/#browser">il tuo browser è troppo obsoleto per funzionare su questo sito</a>. <a href="https://browsehappy.com">Aggiorna il tuo browser</a> per visualizzare contenuti multimediali, accedere e rispondere.'
     permission_types:
       full: "Crea / Rispondi / Visualizza"
       create_post: "Rispondi / Visualizza"
@@ -2857,6 +2862,7 @@ it:
         next_business_day: "%{shortcut} Il prossimo giorno lavorativo"
         custom: "%{shortcut} Data e ora personalizzate"
         none: "%{shortcut} Nessun promemoria"
+        delete: "%{shortcut} Cancella segnalibro"
       actions:
         title: "Azioni"
         bookmark_topic: "%{shortcut} Aggiungi/togli argomento nei segnalibri"
@@ -3114,6 +3120,7 @@ it:
           view_table: "tabella"
           view_graph: "grafico"
           refresh_report: "Aggiorna Rapporto"
+          dates: "Date (UTC)"
           groups: "Tutti i gruppi"
           disabled: "Il rapporto è disabilitato"
           totals_for_sample: "Totale per campione"
@@ -3130,6 +3137,8 @@ it:
               label: Gruppo
             category:
               label: Categoria
+            include-subcategories:
+              label: "Includi Sottocategorie"
       commits:
         latest_changes: "Ultime modifiche: per favore aggiorna spesso!"
         by: "da"
@@ -3174,6 +3183,7 @@ it:
             effects: Effetti
             trust_levels_none: "Nessuno"
             automatic_membership_email_domains: "Gli utenti che si registrano con un dominio email che corrisponde esattamente a uno presente in questa lista, saranno aggiunti automaticamente a questo gruppo:"
+            automatic_membership_user_count: "%{count} utenti hanno i nuovi domini email e verranno aggiunti al gruppo."
             primary_group: "Imposta automaticamente come gruppo principale"
         name_placeholder: "Nome del gruppo, senza spazi, stesse regole del nome utente"
         primary: "Gruppo Primario"
@@ -4034,10 +4044,28 @@ it:
         anonymize_failed: "Si è verificato un problema nel rendere anonimo l'account."
         delete: "Cancella utente"
         merge:
+          transfer_and_delete: "Trasferisci ed Elimina"
           prompt:
+            title: "Trasferisci ed Elimina @%{username}"
+            description: |
+              <p>Scegli un nuovo proprietario per i contenuti di <b>@%{username}</b></p>
+
+              <p>Tutti gli argomenti, messaggi, messaggi personali e altri contenuti creati da <b>@%{username}</b> verranno trasferiti.</p>
+            target_username_placeholder: "Nome utente del nuovo proprietario"
+            transfer_and_delete: "Trasferisci ed Elimina @%{username}"
             cancel: "Annulla"
           confirmation:
+            title: "Trasferisci ed Elimina @%{username}"
+            description: |
+              <p>Tutto il contenuto appartenente a <b>@%{username}</b> verrà trasferito e attribuito a <b>@%{targetUsername}</b>. Dopo il trasferimento del contenuto, l'account di <b>@%{username} </b> verrà eliminato.</p>
+
+              <p><b>Questa azione non può essere annullata!</b></p>
+
+              <p>Per continuare digitare: <code>%{text}</code></p>
+            transfer_and_delete: "Trasferisci ed Elimina @%{username}"
             cancel: "Annulla"
+        merging_user: "Unione utente in corso..."
+        merge_failed: "Si è verificato un errore durante l'unione degli utenti."
         delete_forbidden_because_staff: "Amministratori e moderatori non possono essere cancellati."
         delete_posts_forbidden_because_staff: "Impossibile cancellare tutti i messaggi degli amministratori e dei moderatori."
         delete_forbidden:
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 4fb8795c6b..7b3d2294a7 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -26,7 +26,6 @@ ja:
         millions: "{{number}}M"
     dates:
       time: "H:mm"
-      time_with_zone: "H:mm (z)"
       timeline_date: "YYYY年M月"
       long_no_year_no_time: "M月D日"
       full_no_year_no_time: "M月D日"
@@ -235,7 +234,6 @@ ja:
         bookmark: "クリックするとトピックの最初の投稿をブックマークします"
         unbookmark: "クリックするとトピック内の全てのブックマークを削除します"
     bookmarks:
-      created: "この投稿をブックマークしました"
       not_bookmarked: "この投稿をブックマークする"
       remove: "ブックマークを削除"
       confirm_clear: "このトピックのすべてのブックマークをクリアしますか?"
@@ -642,6 +640,10 @@ ja:
       private_message: "メッセージ"
       private_messages: "メッセージ"
       user_notifications:
+        filters:
+          all: "すべて"
+          read: "既読"
+          unread: "未読"
         ignore_duration_username: "ユーザー名"
         ignore_duration_when: "期間："
         ignore_duration_save: "無視する"
@@ -1075,6 +1077,7 @@ ja:
     assets_changed_confirm: "Discourseがアップデートされました。ページを更新して最新のバージョンにしますか？"
     logout: "ログアウトしました"
     refresh: "更新"
+    home: "ホーム"
     read_only_mode:
       enabled: "このサイトは閲覧専用モードになっています。閲覧し続けられますが、返信したりいいねを付けるなどのアクションは現在出来ません。"
       login_disabled: "閲覧専用モードのため、ログインできません。"
@@ -1660,7 +1663,6 @@ ja:
           "2_8": "このカテゴリを追跡しているので、新たな返信のカウント数が表示されます。"
           "2_4": "このトピックに返信したので、新たな返信のカウント数が表示されます。"
           "2_2": "このトピックを追跡しているので、新たな返信のカウント数が表示されます。"
-          "2": '<a href="{{basePath}}/u/{{username}}/preferences">このトピックを読む</a>ので、新しい返信の数が表示されます。'
           "1_2": "他のユーザからメンションされた場合か、メッセージ内の投稿に返信された場合に通知されます。"
           "1": "他のユーザからメンションされた場合か、メッセージ内の投稿に返信された場合に通知されます。"
           "0_7": "このカテゴリに関して一切通知を受け取りません。"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 22cdf967c5..60b18e1aa4 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -26,8 +26,10 @@ ko:
         millions: "{{number}}백만"
     dates:
       time: "a h:mm"
-      time_with_zone: "a h:mm (z)"
+      time_with_zone: "HH : mm (z)"
+      time_short_day: "ddd, HH : mm"
       timeline_date: "YYYY MMM"
+      long_no_year: "D MMM, HH : mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "YYYY MMM D a h:mm"
@@ -130,6 +132,8 @@ ko:
       banner:
         enabled: "%{when} 이 내용을 배너로 만드세요 . 사용자가 제거하지 않을 때 까지 배너는 모든 페이지 상단에 노출됩니다."
         disabled: "이 배너를 제거했습니다 %{when}. 더 이상 모든 페이지의 상단에 표시되지 않습니다."
+      forwarded: "위 이메일을 전달했습니다"
+    topic_admin_menu: "주제 조치"
     wizard_required: "새로운 Discourse에 오신것을 환영합니다! <a href='%{url}' data-auto-route='true'>설치 마법사</a> 로 시작해봅시다✨"
     emails_are_disabled: "관리자가 이메일 송신을 전체 비활성화 했습니다. 어떤 종류의 이메일 알림도 보내지지 않습니다."
     bootstrap_mode_enabled: "쉬운 시작을 위해 부트스트랩 모드로 구동 되었습니다. 모든 새로운 사용자에게 신뢰 수준 1이 부여되고 매일 이메일 다이제스트가 보내집니다. 이 기능은 총 사용자 수가 %{min_users}를 초과 할 때 자동으로 꺼집니다."
@@ -206,6 +210,7 @@ ko:
       other: "{{count}} 자"
     related_messages:
       title: "관련 메시지"
+      see_all: '@ %{username} ...의 <a href="%{path}">모든 메시지</a> 보기'
     suggested_topics:
       title: "추천 토픽"
       pm_title: "추천 메세지"
@@ -233,18 +238,33 @@ ko:
       help:
         bookmark: "클릭하면 이 토픽의 첫번째 포스트가 북마크됩니다"
         unbookmark: "클릭하면 이 토픽에 속한 모든 북마크가 제거됩니다"
+        unbookmark_with_reminder: "이 주제의 모든 책갈피 및 미리 알림을 제거하려면 클릭하십시오. 이 주제에 대한 알림 설정 %{reminder_at}이 있습니다."
     bookmarks:
-      created: "이 글을 북마크 했습니다"
       not_bookmarked: "이 글을 북마크에 추가"
       remove: "북마크 삭제"
+      delete: "북마크 삭제"
+      confirm_delete: "이 북마크를 삭제 하시겠습니까? 알림도 삭제됩니다."
       confirm_clear: "이 토픽의 모든 북마크를 지우시겠습니까?"
       save: "저장"
+      no_timezone: '아직 시간대를 설정하지 않았습니다. 미리 알림을 설정할 수 없습니다. <a href="%{basePath}/my/preferences/profile">프로필에서</a> 설정 <a href="%{basePath}/my/preferences/profile">하십시오</a> .'
+      invalid_custom_datetime: "제공 한 날짜와 시간이 잘못되었습니다. 다시 시도하십시오."
+      list_permission_denied: "이 사용자의 북마크를 볼 수있는 권한이 없습니다."
       reminders:
+        at_desktop: "다음에 저는 데스크탑에 있습니다"
         later_today: "오늘 늦게"
+        next_business_day: "다음 영업일"
         tomorrow: "내일"
         next_week: "다음 주"
         later_this_week: "이번 주 후반"
+        start_of_next_business_week: "다음주 월요일"
         next_month: "다음 달"
+        custom: "맞춤 날짜 및 시간"
+        last_custom: "마지막"
+        none: "알림이 필요하지 않습니다"
+        today_with_time: "오늘 %{time}"
+        tomorrow_with_time: "내일 %{time}"
+        at_time: "%{date_time}에서"
+        existing_reminder: "이 북마크에 대한 알림이 설정되어 전송됩니다."
     drafts:
       resume: "이력서"
       remove: "삭제"
@@ -283,30 +303,75 @@ ko:
     banner:
       close: "배너 닫기"
       edit: "이 배너 수정 >>"
+    pwa:
+      install_banner: "<a href>이 장치에 %{title}</a> 을 <a href>설치 하시겠습니까?</a>"
     choose_topic:
       none_found: "토픽을 찾을 수 없습니다."
+      title:
+        search: "주제 검색"
+        placeholder: "여기에 주제 제목, URL 또는 ID를 입력하십시오"
     choose_message:
       none_found: "메시지를 찾을 수 없습니다."
+      title:
+        search: "메시지 검색"
+        placeholder: "여기에 메시지 제목, url 또는 id를 입력하십시오"
     review:
+      order_by: "주문"
       in_reply_to: "답글"
       explain:
+        why: "이 항목이 대기열에있는 이유를 설명하십시오."
+        title: "검토 가능한 점수"
+        formula: "공식"
+        subtotal: "소계"
         total: "총"
+        min_score_visibility: "가시성에 대한 최소 점수"
+        score_to_hide: "게시물 숨기기 점수"
+        take_action_bonus:
+          name: "행동을 취했다"
+          title: "직원이 조치를 취하면 깃발에 보너스가 부여됩니다."
+        user_accuracy_bonus:
+          name: "사용자 정확도"
+          title: "역사적으로 플래그가 동의 된 사용자에게는 보너스가 제공됩니다."
+        trust_level_bonus:
+          name: "신뢰 수준"
+          title: "신뢰 수준이 높은 사용자가 만든 검토 가능한 항목의 점수가 높습니다."
+        type_bonus:
+          name: "타입 보너스"
+          title: "직원이 검토 가능한 특정 유형에 우선 순위를 부여하기 위해 보너스를 할당 할 수 있습니다."
+      claim_help:
+        optional: "다른 사람이 검토하지 못하도록이 항목을 요청할 수 있습니다."
+        required: "검토하기 전에 항목을 청구해야합니다."
+        claimed_by_you: "이 항목을 요청했으며 검토 할 수 있습니다."
+        claimed_by_other: "이 아이템은 <b>{{username}}</b> 에 <b>의해서만</b> 리뷰 될 수 있습니다."
+      claim:
+        title: "이 주제를 주장하십시오"
+      unclaim:
+        help: "이 주장을 제거"
+      awaiting_approval: "승인 대기 중"
       delete: "삭제"
       settings:
         saved: "저장 완료"
         save_changes: "변경사항 저장"
         title: "설정"
+        priorities:
+          title: "검토 가능한 우선 순위"
       moderation_history: "관리 히스토리"
       view_all: "모두 보기"
+      grouped_by_topic: "주제별로 그룹화"
       none: "검토 할 항목이 없습니다."
       view_pending: "보류중 보기"
       topic_has_pending:
         other: "이 토픽에는 승인 대기중인 게시물이 <b>{{count}}</b>개 있습니다"
+      title: "리뷰"
       topic: "토픽:"
       filtered_topic: "한 토픽에서 검토 가능한 콘텐츠로 필터링 했습니다."
       filtered_user: "사용자"
       show_all_topics: "모든 토픽 보기"
+      deleted_post: "(게시물 삭제)"
+      deleted_user: "(사용자 삭제)"
       user:
+        bio: "바이오"
+        website: "웹 사이트"
         username: "아이디"
         email: "이메일"
         name: "이름"
@@ -324,12 +389,15 @@ ko:
         topic: "토픽"
         reviewable_count: "수"
         reported_by: "보고자"
+        deleted: "[주제 삭제]"
+        original: "(원래 주제)"
         details: "상세"
         unique_users:
           other: "{{count}} 사용자"
       edit: "수정"
       save: "저장"
       cancel: "취소"
+      new_topic: "이 항목을 승인하면 새로운 주제가 생성됩니다"
       filters:
         all_categories: "(전체 카테고리)"
         type:
@@ -339,17 +407,26 @@ ko:
         refresh: "새로고침"
         status: "상태"
         category: "카테고리"
+        orders:
+          priority: "우선 순위"
+          priority_asc: "우선 순위 (역)"
+          created_at: "에 만든"
+          created_at_asc: "에서 생성 (역)"
         priority:
+          title: "최소 우선 순위"
+          low: "(어떤)"
           medium: "중간"
           high: "높음"
       conversation:
         view_full: "전체 대화 보기"
       scores:
+        about: "이 점수는보고자의 신뢰 수준, 이전 플래그의 정확성 및보고되는 항목의 우선 순위를 기반으로 계산됩니다."
         score: "점수"
         date: "날짜"
         type: "형식"
         status: "상태"
         submitted_by: "제출자"
+        reviewed_by: "검토 자"
       statuses:
         pending:
           title: "대기중"
@@ -361,10 +438,16 @@ ko:
           title: "무시됨"
         deleted:
           title: "삭제됨"
+        reviewed:
+          title: "(모두 검토 됨)"
+        all:
+          title: "(모두)"
       types:
         reviewable_flagged_post:
           title: "신고된 글"
           flagged_by: "신고자"
+        reviewable_queued_topic:
+          title: "대기중인 주제"
         reviewable_queued_post:
           title: "대기중인 글"
         reviewable_user:
@@ -404,6 +487,7 @@ ko:
       days_visited_long: "일일 조회수"
       posts_read: "읽음"
       posts_read_long: "게시글 읽음"
+      last_updated: "마지막 업데이트 :"
       total_rows:
         other: "%{count} 사용자"
     group_histories:
@@ -415,16 +499,20 @@ ko:
         remove_user_as_group_owner: "소유자 지정 취소하기"
     groups:
       member_added: "추가됨"
+      member_requested: "요청"
       add_members:
         title: "사용자 추가"
         description: "이 그룹의 회원 관리"
         usernames: "아이디"
       requests:
+        title: "요청"
         reason: "사유"
         accept: "승인"
         accepted: "승인됨"
         deny: "거부"
         denied: "거부됨"
+        undone: "취소 요청"
+        handle: "회원 요청 처리"
       manage:
         title: "관리"
         name: "이름"
@@ -434,6 +522,7 @@ ko:
         profile:
           title: 프로필
         interaction:
+          title: 상호 작용
           posting: 포스팅
           notification: 알림
         membership:
@@ -454,14 +543,18 @@ ko:
       empty:
         posts: "이 그룹에는 아직 멤버들이 포스트를 작성하지 않았습니다."
         members: "이 그룹에는 구성원이 없습니다."
+        requests: "이 그룹에 대한 회원 요청이 없습니다."
         mentions: "이 그룹에서는 언급이 없습니다."
         messages: "이 그룹에 대한 메시지는 없습니다."
         topics: "이 그룹의 멤버가 작성한 토픽이 없습니다."
         logs: "이 그룹에 대한 기록이 없습니다."
       add: "추가"
+      join: "붙다"
       leave: "나가기"
       request: "요청"
       message: "메시지"
+      confirm_leave: "이 그룹을 탈퇴 하시겠습니까?"
+      allow_membership_requests: "사용자가 그룹 소유자에게 회원 요청을 보낼 수 있도록 허용 (공개적으로 공개 된 그룹 필요)"
       membership_request_template: "가입 요청을 전송할 때 사용자에게 표시할 커스텀 템플릿"
       membership_request:
         submit: "요청 보내기"
@@ -479,15 +572,20 @@ ko:
         all: "모든 그룹"
         empty: "보이는 그룹이 없습니다."
         filter: "그룹 유형별로 분류"
+        owner_groups: "내가 소유 한 그룹"
         close_groups: "닫힌 그룹"
         automatic_groups: "자동 그룹"
         automatic: "자동"
         closed: "닫힘"
         public: "공개"
         private: "비공개"
+        public_groups: "공개 그룹"
         automatic_group: 자동 그룹
+        close_group: 그룹 닫기
         my_groups: "내 그룹"
+        group_type: "그룹 유형"
         is_group_user: "준회원"
+        is_group_owner: "소유자"
       title:
         other: "그룹"
       activity: "활동"
@@ -497,7 +595,12 @@ ko:
         filter_placeholder: "아이디"
         remove_member: "회원 삭제"
         remove_member_description: "이 그룹에서 <b>%{username}</b>(을)를 삭제합니다."
+        make_owner: "소유자 만들기"
         make_owner_description: "이 그룹에서 <b>%{username}</b>(을)를 소유자로 설정합니다."
+        remove_owner: "소유자로 제거"
+        remove_owner_description: "이 그룹의 소유자로 <b>%{username}</b> 제거"
+        owner: "소유자"
+        forbidden: "회원을 볼 수 없습니다."
       topics: "토픽"
       posts: "게시글"
       mentions: "멘션"
@@ -510,6 +613,7 @@ ko:
         only_admins: "관리자 전용"
         mods_and_admins: "운영자 및 관리자만"
         members_mods_and_admins: "그룹 멤버, 운영자, 관리자만"
+        owners_mods_and_admins: "그룹 소유자, 중재자 및 관리자 만"
         everyone: "모두"
       notifications:
         watching:
@@ -517,6 +621,7 @@ ko:
           description: "이 메시지에 새로운 답글이 있을 때 알림을 받게 되며 새로운 답글의 개수는 표시됩니다."
         watching_first_post:
           title: "첫번째 글 보기"
+          description: "이 그룹의 새 메시지에 대한 알림을 받지만 메시지에 회신하지는 않습니다."
         tracking:
           title: "추적 중"
           description: "누군가 당신의 @아이디 로 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다."
@@ -525,8 +630,10 @@ ko:
           description: "누군가 당신의 @아이디 로 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다."
         muted:
           title: "알림 : 끔"
+          description: "이 그룹의 메시지에 대한 알림을받지 않습니다."
       flair_url: "아바타 플레어 이미지"
       flair_url_placeholder: "(선택) 이미지 URL 또는 Font Awesome 아이콘 클래스"
+      flair_url_description: '20px x 20px 이상의 FontAwesome 아이콘 (허용되는 형식 : &quot;fa-icon&quot;, &quot;far fa-icon&quot;또는 &quot;fab fa-icon&quot;)을 사용하십시오.'
       flair_bg_color: "아바타 플레어 배경 색상"
       flair_bg_color_placeholder: "(선택사항) 16진수 컬러 값"
       flair_color: "아바타 플레어 색상"
@@ -546,6 +653,7 @@ ko:
       "12": "보낸 편지함"
       "13": "받은 편지함"
       "14": "대기"
+      "15": "체커"
     categories:
       all: "전체 카테고리"
       all_subcategories: "모두"
@@ -566,6 +674,7 @@ ko:
       subcategories: "하위 카테고리"
       topic_sentence:
         other: "%{count}개의 토픽"
+      n_more: "카테고리 (%{count} 더) ..."
     ip_lookup:
       title: IP 주소 Lookup
       hostname: Hostname
@@ -581,6 +690,7 @@ ko:
       topics_entered: "입력된 제목:"
       post_count: "포스트 개수"
       confirm_delete_other_accounts: "정말 이 계정들을 삭제하시겠습니까?"
+      powered_by: "<a href='https://maxmind.com'>MaxMindDB</a> 사용"
       copied: "복사됨"
     user_fields:
       none: "(옵션을 선택하세요)"
@@ -598,19 +708,38 @@ ko:
       private_message: "메시지"
       private_messages: "메시지"
       user_notifications:
+        filters:
+          all: "모두"
+          read: "읽기"
+          unread: "읽지 않은 글"
+        ignore_duration_title: "타이머 무시"
         ignore_duration_username: "아이디"
+        ignore_duration_when: "지속:"
         ignore_duration_save: "무시"
+        ignore_duration_note: "무시 기간이 만료되면 모든 무시가 자동으로 제거됩니다."
+        ignore_duration_time_frame_required: "시간대를 선택하십시오"
+        ignore_no_users: "무시 된 사용자가 없습니다."
         ignore_option: "무시됨"
+        ignore_option_title: "이 사용자와 관련된 알림을받지 않으며 모든 주제와 답글이 숨겨집니다."
+        add_ignored_user: "더하다..."
         mute_option: "알림끔"
+        mute_option_title: "이 사용자와 관련된 알림을받지 않습니다."
         normal_option: "알림 : 일반"
+        normal_option_title: "이 사용자가 답장을 보내거나 인용하거나 언급하면 알림을받습니다."
       activity_stream: "활동"
       preferences: "환경 설정"
       feature_topic_on_profile:
+        open_search: "새로운 주제를 선택하십시오"
+        title: "주제를 선택하십시오"
+        search_label: "제목으로 주제 검색"
         save: "저장"
         clear:
           title: "Clear"
+          warning: "추천 주제를 지우시겠습니까?"
+      use_current_timezone: "현재 시간대 사용"
       profile_hidden: "이 사용자의 프로필은 비공개 상태입니다."
       expand_profile: "확장"
+      collapse_profile: "무너짐"
       bookmarks: "북마크"
       bio: "내 소개"
       timezone: "시간대"
@@ -632,10 +761,15 @@ ko:
       dismiss_notifications: "모두 해지"
       dismiss_notifications_tooltip: "읽지 않은 알림을 모두 읽음으로 표시"
       first_notification: "당신의 첫 번째 알림입니다! 시작하려면 선택해보세요."
+      dynamic_favicon: "브라우저 아이콘에 카운트 표시"
+      theme_default_on_all_devices: "모든 장치에서 기본 테마로 설정"
+      text_size_default_on_all_devices: "모든 장치에서 기본 텍스트 크기로 설정"
       allow_private_messages: "다른 사용자가 나에게 개인 메시지를 보내는것을 허용"
       external_links_in_new_tab: "모든 외부 링크를 새 탭에 열기"
       enable_quoting: "강조 표시된 텍스트에 대한 알림을 사용합니다"
+      enable_defer: "읽지 않은 주제로 표시하도록 연기 활성화"
       change: "변경"
+      featured_topic: "특집 주제"
       moderator: "{{user}}님은 운영자입니다"
       admin: "{{user}}님은 관리자 입니다"
       moderator_tooltip: "이 회원은 운영자 입니다"
@@ -658,6 +792,7 @@ ko:
         individual_no_echo: "내가 쓴 것만 제외하고 모든 게시글에 대해 이메일을 보내주세요"
         many_per_day: "모든 새 게시글에 대해 이메일을 보내주세요 (일일 약 {{dailyEmailEstimate}}개)"
         few_per_day: "모든 새로운 게시글에 대해 메일을 보내주세요 (하루에 약 2개)."
+        warning: "메일 링리스트 모드가 활성화되었습니다. 이메일 알림 설정이 무시됩니다."
       tag_settings: "태그"
       watched_tags: "지켜보기"
       watched_tags_instructions: "이 태그가 붙은 토픽들을 주시하도록 자동으로 설정됩니다. 새로운 게시글이나 토픽에 대하여 알림을 받게되며 토픽 옆에 새로운 게시글의 수가 표시됩니다."
@@ -674,22 +809,27 @@ ko:
       watched_first_post_tags: "첫번째 글 보기"
       watched_first_post_tags_instructions: "이 태그가 달린 토픽이 생길 때마다 알림을 받습니다."
       muted_categories: "알림 끄기"
+      muted_categories_instructions: "이 카테고리의 새 주제에 대한 알림을받지 않으며 카테고리 또는 최신 페이지에 나타나지 않습니다."
+      muted_categories_instructions_dont_hide: "이 카테고리의 새로운 주제에 대한 알림을받지 않습니다."
       no_category_access: "운영자는 이 카테고리 접근에 제약을 받습니다. 저장이 해제 됩니다."
       delete_account: "내 계정 삭제"
       delete_account_confirm: "정말로 계정을 삭제할까요? 이 작업은 되돌릴 수 없습니다."
       deleted_yourself: "계정이 삭제 되었습니다."
+      delete_yourself_not_allowed: "계정을 삭제하려면 직원에게 문의하십시오."
       unread_message_count: "메시지"
       admin_delete: "삭제"
       users: "회원"
       muted_users: "알람 끄기"
       muted_users_instructions: "이 회원이 보낸 알림 모두 숨김"
       ignored_users: "무시됨"
+      ignored_users_instructions: "이 사용자의 모든 게시물과 알림을 표시하지 않습니다."
       tracked_topics_link: "보이기"
       automatically_unpin_topics: "글 끝에 다다르면 자동으로 토픽 고정을 해제합니다."
       apps: "앱"
       revoke_access: "접근권한 회수"
       undo_revoke_access: "접근권환 회수 취소"
       api_approved: "승인됨:"
+      api_last_used_at: "마지막에 사용한 :"
       theme: "테마"
       home: "기본 홈페이지"
       staged: "격리됨"
@@ -699,6 +839,7 @@ ko:
         deleted_posts: "삭제된 글"
         suspensions: "정지시킨 계정"
         warnings_received: "경고"
+        rejected_posts: "거부 된 게시물"
       messages:
         all: "전체"
         inbox: "수신함"
@@ -725,28 +866,62 @@ ko:
         success: "(이메일 전송)"
         in_progress: "(이메일 전송 중)"
         error: "(오류)"
+        emoji: "이모티콘 잠금"
         action: "비밀번호 재설정 메일 보내기"
         set_password: "비밀번호 설정"
         choose_new: "새로운 비밀번호를 적어주세요"
         choose: "비밀번호를 적어주세요"
       second_factor_backup:
+        title: "2 단계 백업 코드"
         regenerate: "재생성"
         disable: "해제"
         enable: "설정"
         enable_long: "백업 코드 사용"
+        manage: "백업 코드를 관리하십시오. 남아있는 <strong>{{count}}</strong> 백업 코드가 있습니다."
         copied_to_clipboard: "클립보드에 복사됨"
         copy_to_clipboard_error: "데이터를 클립보드에 복사하는데 오류가 발생했습니다."
+        remaining_codes: "남아있는 <strong>{{count}}</strong> 백업 코드가 있습니다."
+        use: "백업 코드 사용"
+        enable_prerequisites: "백업 코드를 생성하기 전에 기본 두 번째 요소를 활성화해야합니다."
         codes:
           title: "백업 코드가 재생성됨"
+          description: "이러한 각 백업 코드는 한 번만 사용할 수 있습니다. 안전하지만 접근 가능한 곳에 보관하십시오."
       second_factor:
         title: "이중 인증"
+        enable: "이중 인증 관리"
+        forgot_password: "비밀번호를 잊으 셨나요?"
         confirm_password_description: "비밀번호를 확인해주세요."
         name: "이름"
         label: "코드"
+        rate_limit: "다른 인증 코드를 시도하기 전에 기다리십시오."
+        disable_description: "앱에서 인증 코드를 입력하십시오"
+        show_key_description: "수동으로 입력"
+        oauth_enabled_warning: "계정에서 2 단계 인증이 활성화되면 소셜 로그인이 비활성화됩니다."
+        use: "인증 기 앱 사용"
+        enforced_notice: "이 사이트에 액세스하기 전에 2 단계 인증을 활성화해야합니다."
+        disable: "비활성화"
+        disable_title: "두 번째 요소 비활성화"
+        disable_confirm: "두 번째 요소를 모두 비활성화 하시겠습니까?"
         edit: "수정"
+        edit_title: "두 번째 요소 편집"
+        edit_description: "두 번째 요인 이름"
+        enable_security_key_description: "물리적 보안 키가 준비되면 아래의 등록 버튼을 누릅니다."
+        totp:
+          title: "토큰 기반 인증 자"
+          add: "새로운 인증 자"
+          default_name: "내 인증 자"
+          name_and_code_required_error: "인증 자 앱에서 이름과 코드를 제공해야합니다."
         security_key:
           register: "등록하기"
+          title: "보안 키"
+          add: "보안 키 등록"
+          default_name: "기본 보안 키"
+          not_allowed_error: "보안 키 등록 프로세스가 시간 초과되었거나 취소되었습니다."
+          already_added_error: "이 보안 키를 이미 등록했습니다. 다시 등록 할 필요가 없습니다."
+          edit: "보안 키 편집"
+          edit_description: "보안 키 이름"
           delete: "삭제"
+          name_required_error: "보안 키의 이름을 제공해야합니다."
       change_about:
         title: "내 소개 변경"
         error: "값을 바꾸는 중 에러가 발생했습니다."
@@ -763,19 +938,30 @@ ko:
         success_staff: "현재 주소로 이메일을 보냈습니다. 확인 절차에 따라 진행해 주세요."
       change_avatar:
         title: "프로필 사진 변경"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a> 기반"
+        gravatar_title: "{{gravatarName}}의 웹 사이트에서 아바타 변경"
+        gravatar_failed: "해당 이메일 주소로 {{gravatarName}}을 찾을 수 없습니다."
+        refresh_gravatar_title: "당신의 {{gravatarName}}를 상쾌하게하십시오"
         letter_based: "자동 생성된 아바타"
         uploaded_avatar: "커스텀 사진"
         uploaded_avatar_empty: "커스텀 사진 추가"
         upload_title: "프로필 사진 업로드"
         image_is_not_a_square: "경고: 정사각형 이미지가 아니기 때문에 사진을 수정하였습니다."
+      change_profile_background:
+        title: "프로필 헤더"
+        instructions: "프로필 헤더는 중앙에 위치하며 기본 너비는 1110px입니다."
       change_card_background:
         title: "사용자 카드 배경"
         instructions: "배경 이미지는 가운데를 기준으로 표시되며 590px이 기본 가로 사이즈 입니다."
+      change_featured_topic:
+        title: "특집 주제"
+        instructions: "이 주제에 대한 링크는 사용자 카드 및 프로필에 있습니다."
       email:
         title: "이메일"
         primary: "기본 이메일"
         secondary: "보조 이메일"
         no_secondary: "보조 이메일이 없습니다"
+        sso_override_instructions: "SSO 제공자로부터 이메일을 업데이트 할 수 있습니다."
         instructions: "절대로 공개되지 않습니다."
         ok: "내 이메일로 확인 메일이 전송됩니다."
         invalid: "유효한 이메일 주소를 입력해주세요."
@@ -784,10 +970,15 @@ ko:
         frequency:
           other: "최근 {{count}}분 동안접속하지 않을 경우에만 메일이 전송됩니다."
       associated_accounts:
+        title: "관련 계정"
         connect: "연결"
         revoke: "회수"
         cancel: "취소"
         not_connected: "(연결되지 않음)"
+        confirm_modal_title: "%{provider} 계정 연결"
+        confirm_description:
+          account_specific: "귀하의 %{provider} 계정 &#39;%{account_description}&#39;이 인증에 사용됩니다."
+          generic: "%{provider} 계정이 인증에 사용됩니다."
       name:
         title: "이름"
         instructions: "이름 (선택사항)"
@@ -812,12 +1003,23 @@ ko:
         any: "무관"
       password_confirmation:
         title: "비밀번호를 재입력해주세요."
+      invite_code:
+        title: "코드 초대"
+        instructions: "계정 등록에는 초대 코드가 필요합니다"
       auth_tokens:
         title: "최근에 사용한 기기"
         ip: "IP"
         details: "세부 내용"
         log_out_all: "모두 로그 아웃"
+        active: "활성 지금"
         not_you: "사용자님이 아닌가요?"
+        show_all: "모두 표시 ({{count}})"
+        show_few: "더 적게 표시"
+        was_this_you: "이게 너야?"
+        was_this_you_description: "그렇지 않은 경우 비밀번호를 변경하고 어디에서나 로그 아웃하는 것이 좋습니다."
+        browser_and_device: "{{device}}의 {{browser}}"
+        secure_account: "내 계정 보안"
+        latest_post: "마지막으로 게시했습니다…"
       last_posted: "마지막글"
       last_emailed: "마지막 이메일"
       last_seen: "마지막 접속"
@@ -827,8 +1029,17 @@ ko:
       website: "웹사이트"
       email_settings: "이메일"
       hide_profile_and_presence: "내 공개 프로필 및 현재 상태 기능 숨기기"
+      enable_physical_keyboard: "iPad에서 실제 키보드 지원 활성화"
       text_size:
+        title: "문자 크기"
+        smaller: "더 작은"
         normal: "알림 : 일반"
+        larger: "더 큰"
+        largest: "가장 큰"
+      title_count_mode:
+        title: "백그라운드 페이지 제목은 다음 개수를 표시합니다."
+        notifications: "새로운 알림"
+        contextual: "새 페이지 내용"
       like_notification_frequency:
         title: "좋아요를 받았을 때 알림받기"
         always: "항상 알림받기"
@@ -841,6 +1052,7 @@ ko:
         always: "항상 알림 받기"
         never: "알림 받지 않기"
       email_digests:
+        title: "여기를 방문하지 않을 때 인기 주제와 답글을 이메일로 보내주세요"
         every_30_minutes: "매 30분 마다"
         every_hour: "매 시간"
         daily: "매일"
@@ -850,6 +1062,7 @@ ko:
       email_level:
         title: "인용, 댓글, @아이디 멘션, 토픽 초대를 받을 때 이메일 받기"
         always: "항상 알림 받기"
+        only_when_away: "멀리있을 때만"
         never: "하지않음"
       email_messages_level: "메시지가 왔을 때 이메일 받기"
       include_tl0_in_digests: "신규 사용자가 작성한 내용도 요약 메일에 포함시키기"
@@ -880,6 +1093,8 @@ ko:
         search: "검색"
         title: "초대"
         user: "사용자 초대"
+        sent: "마지막으로 보낸"
+        none: "표시 할 초대가 없습니다."
         truncated:
           other: "앞 {{count}}개의 초대를 보여줍니다."
         redeemed: "초대를 받았습니다."
@@ -894,6 +1109,9 @@ ko:
         expired: "이 초대장의 기한이 만료되었습니다."
         rescind: "삭제"
         rescinded: "초대가 제거되었습니다."
+        rescind_all: "만료 된 모든 초대 제거"
+        rescinded_all: "모든 만료 된 초대가 제거되었습니다!"
+        rescind_all_confirm: "만료 된 초대를 모두 제거 하시겠습니까?"
         reinvite: "초대 메일 재전송"
         reinvite_all: "모든 초대장 다시 보내기"
         reinvite_all_confirm: "정말로 모든 초대장을 다시 보낼까요?"
@@ -911,6 +1129,7 @@ ko:
           text: "파일로 대량 초대하기"
           success: "파일이 성공적으로 업로드되었습니다. 완료되면 메시지로 알려드리겠습니다."
           error: "죄송합니다. CSV형식의 파일만 올릴 수 있습니다."
+          confirmation_message: "업로드 한 파일의 모든 사람에게 초대장을 이메일로 보내려고합니다."
       password:
         title: "비밀번호"
         too_short: "암호가 너무 짧습니다."
@@ -1000,14 +1219,27 @@ ko:
         fixed: "페이지 열기"
     modal:
       close: "닫기"
+      dismiss_error: "해고 오류"
     close: "닫기"
     assets_changed_confirm: "사이트가 업데이트 되었습니다. 새로고침하시겠습니까?"
     logout: "로그아웃 되었습니다."
     refresh: "새로고침"
+    home: "홈"
     read_only_mode:
       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> 합시다 <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">!</a> 이 {currentTopics, plural, one <strong>{#</strong> 주제} other은 {입니다 <strong>#</strong> 주제}}과 {currentPosts, plural, one <strong>{# 포스트}</strong> other <strong>{#</strong> 포스트}}. 방문객들은 읽고 댓글을 올리려면 더 필요 - 우리는 적어도 {requiredTopics, plural, one <strong>{# 주제}</strong> other <strong>{#</strong> 주제}}과 {requiredPosts, plural, one <strong>{# 포스트}</strong> other <strong>{#</strong> 게시물}} 좋습니다. 직원 만이 메시지를 볼 수 있습니다.
+    too_few_topics_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">토론을 시작</a> 합시다 <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">!</a> {currentTopics, plural, one {is <strong>#</strong> topic} other {are <strong>#</strong> topics}}가 있습니다. 방문자는 더 읽고 답장해야합니다. 적어도 {requiredTopics, plural, one { <strong>#</strong> topic} other { <strong>#</strong> topics}}을 (를) 권장합니다. 직원 만이 메시지를 볼 수 있습니다.
+    too_few_posts_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">토론을 시작</a> 합시다 <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">!</a> {currentPosts, plural, one {is <strong>#</strong> post} other {are <strong>#</strong> posts}}가 있습니다. 방문자는 더 읽고 답장해야합니다. – {requiredPosts, plural, one { <strong>#</strong> post} other { <strong>#</strong> posts}} 이상을 권장합니다. 직원 만이 메시지를 볼 수 있습니다.
+    logs_error_rate_notice:
+      reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error / hour} other {# errors / hour}}의</a> 사이트 설정 한계 {a0cd0dadb4f0b0b0f0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0d0"
+      reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error / minute} other {# errors / minute}}의</a> 사이트 설정 한계 {a0cd0d0b0f0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b2"
+      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural,</a> one {# 오류 / 시간}}"
+      exceeded_minute_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{a07e6f5c6cb6z485z0, plural, one {# 오류 / 분}} {0/0</a> <b>{0/0} {0} {0} {0} {0} {0} {0} {0} {0} {0} {0} 0 {0}</b>"
     learn_more: "더 배우기"
     all_time: "총"
     all_time_desc: "총 토픽"
@@ -1022,7 +1254,11 @@ ko:
     mute: 음소거
     unmute: 음소거 해제
     last_post: 게시날짜
+    local_time: "현지 시각"
     time_read: 읽음
+    time_read_recently: "최근에 %{time_read}"
+    time_read_tooltip: "읽은 총 시간 %{time_read}"
+    time_read_recently_tooltip: "%{time_read} 총 읽기 시간 (지난 60 일 동안 %{recent_time_read})"
     last_reply_lowercase: 마지막 답글
     replies_lowercase:
       other: 답글
@@ -1031,6 +1267,8 @@ ko:
       hide_session: "내일 다시 알려주기"
       hide_forever: "사양합니다."
       hidden_for_session: "알겠습니다. 내일 다시 물어볼께요. 언제든지 '로그인'을 통해서도 계정을 만들 수 있습니다."
+      intro: "여보세요! 토론을 즐기고 있지만 아직 계정에 가입하지 않은 것 같습니다."
+      value_prop: "당신이 계정을 만들 때, 우리는 당신이 읽은 것을 정확하게 기억하므로, 당신은 항상 당신이 중단 한 곳으로 돌아옵니다. 또한 누군가가 귀하에게 회신 할 때마다 여기 및 이메일을 통해 알림을받습니다. 그리고 당신은 사랑을 공유하는 게시물을 좋아할 수 있습니다. : 심장 :"
     summary:
       enabled_description: "현재 커뮤니티에서 가장 인기있는 주제의 요약본을 보고 있습니다:"
       description: "댓글이 <b>{{replyCount}}개</b> 있습니다."
@@ -1044,6 +1282,7 @@ ko:
       disable: "삭제된 글 보기"
     private_message_info:
       title: "메시지"
+      invite: "다른 사람 초대 ..."
       edit: "추가 또는 삭제 ..."
       leave_message: "정말로 이 메시지를 남길까요?"
       remove_allowed_user: "{{name}}에게서 온 메시지를 삭제할까요?"
@@ -1056,6 +1295,7 @@ ko:
     trust_level: "회원등급"
     search_hint: "아이디, 이메일 혹은 IP 주소"
     create_account:
+      disclaimer: "등록하면 <a href='{{privacy_link}}' target='blank'>개인 정보 보호 정책</a> 및 <a href='{{tos_link}}' target='blank'>서비스 약관에</a> 동의하게됩니다."
       title: "회원 가입"
       failed: "뭔가 잘못되었습니다. 이 메일은 등록이 되어있습니다. 비밀번호를 잊으셨다면 비밀번호 찾기를 눌러주세요."
     forgot_password:
@@ -1065,25 +1305,48 @@ ko:
       reset: "암호 재설정"
       complete_username: "자신의 아이디가 <b>%{username}</b>이라면, 곧 비밀번호 초기화 방법과 관련된 안내 메일을 받게 됩니다."
       complete_email: "만약 계정이 <b>%{email}</b>과 일치한다면, 비밀번호를 재설정하는 방법에 대한 이메일을 곧 받게 됩니다."
+      complete_username_found: "사용자 이름 <b>%{username}</b> 와 일치하는 계정을 찾았 <b>습니다</b> . 비밀번호 재설정 방법에 대한 지침이 담긴 이메일이 발송됩니다."
+      complete_email_found: "<b>%{email}</b> 와 일치하는 계정을 찾았 <b>습니다</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>"
       button_ok: "확인"
       button_help: "도움말"
     email_login:
+      link_label: "로그인 링크를 이메일로 보내기"
+      button_label: "이메일로"
+      emoji: "이모티콘 잠금"
+      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>과 일치하는 계정이 없습니다."
       confirm_title: "%{site_name}으로 가기"
+      logging_in_as: "%{email}으로 로그인"
+      confirm_button: 로그인 완료
     login:
       title: "로그인"
       username: "아이디"
       password: "비밀번호"
       second_factor_title: "이중 인증"
+      second_factor_description: "앱에서 인증 코드를 입력하십시오 :"
+      second_factor_backup: "백업 코드를 사용하여 로그인"
+      second_factor_backup_title: "이중 요인 백업"
       second_factor_backup_description: "백업 코드 중 하나를 입력하세요:"
+      second_factor: "OTP 앱을 사용하여 로그인"
+      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: "현재 장치 또는 브라우저가 보안 키 사용을 지원하지 않습니다. 다른 방법을 사용하십시오."
       email_placeholder: "이메일 주소 또는 아이디"
       caps_lock_warning: "Caps Lock 켜짐"
       error: "알 수없는 오류"
+      cookies_error: "브라우저에서 쿠키를 사용하지 않는 것으로 보입니다. 먼저 활성화하지 않으면 로그인하지 못할 수 있습니다."
       rate_limit: "다시 로그인 하기전에 잠시만 기다려주세요."
+      blank_username: "이메일 또는 사용자 이름을 입력하십시오."
       blank_username_or_password: "이메일 또는 아이디, 비밀번호를 입력해 주세요."
       reset_password: "암호 재설정"
       logging_in: "로그인 중.."
@@ -1096,11 +1359,13 @@ ko:
       not_allowed_from_ip_address: "이 IP 주소에서 로그인 할 수 없습니다."
       admin_not_allowed_from_ip_address: "You can't log in as admin from that IP address."
       resend_activation_email: "다시 인증 이메일을 보내려면 여기를 클릭하세요."
+      omniauth_disallow_totp: "귀하의 계정에는 2 단계 인증이 활성화되어 있습니다. 비밀번호로 로그인하십시오."
       resend_title: "활성화 이메일 다시 보내기"
       change_email: "이메일 주소 변경"
       provide_new_email: "새로운 주소를 적어주시면 확인 메일을 재전송해드리겠습니다."
       submit_new_email: "이메일 주소 변경"
       sent_activation_email_again: "<b> {{currentEmail}} </b> 주소로 인증 이메일을 보냈습니다. 이메일이 도착하기까지 몇 분 정도 걸릴 수 있습니다. 또한 스팸 메일을 확인하십시오."
+      sent_activation_email_again_generic: "다른 활성화 이메일을 보냈습니다. 도착하는 데 몇 분이 걸릴 수 있습니다. 스팸 폴더를 확인하십시오."
       to_continue: "로그인 해주세요"
       preferences: "사용자 환경을 변경하려면 로그인이 필요합니다."
       forgot: "내 계정의 상세내역 기억하지 않는다."
@@ -1120,10 +1385,15 @@ ko:
       github:
         name: "GitHub"
         title: "GitHub"
+      discord:
+        name: "불일치"
+        title: "불화"
       second_factor_toggle:
+        totp: "대신 인증 자 앱을 사용하십시오."
         backup_code: "대신 백업 코드 사용"
     invites:
       accept_title: "초대장"
+      emoji: "봉투 이모티콘"
       welcome_to: "%{site_name}에 오신것을 환영합니다."
       invited_by: "당신을 초청한 사람:"
       social_login_available: "해당 이메일 주소를 사용하는 다른 소셜 로그인으로 접속하는 것도 가능합니다."
@@ -1139,6 +1409,7 @@ ko:
       apple_international: "Apple/International"
       google: "구글"
       twitter: "트위터"
+      emoji_one: "JoyPixels (이전의 EmojiOne)"
       win10: "Win10"
       google_classic: "Google 클래식"
       facebook_messenger: "Facebook 메신저"
@@ -1146,22 +1417,40 @@ ko:
       categories_only: "카테고리만"
       categories_with_featured_topics: "주요 토픽이 있는 카테고리"
       categories_and_latest_topics: "카테고리와 최신 토픽"
+      categories_and_top_topics: "카테고리 및 주요 주제"
+      categories_boxes: "하위 범주가있는 상자"
+      categories_boxes_with_topics: "주요 주제가있는 상자"
     shortcut_modifier_key:
       shift: "Shift"
       ctrl: "Ctrl"
       alt: "Alt"
+      enter: "시작하다"
     conditional_loading_section:
       loading: 로드중...
+    category_row:
+      topic_count: "이 카테고리의 주제 {{count}}"
     select_kit:
       default_header_text: 선택...
       no_content: 일치하는 결과가 없습니다
       filter_placeholder: 검색...
+      filter_placeholder_with_any: 검색 또는 생성 ...
+      create: "만들기 : &#39;{{content}}&#39;"
+      invalid_selection_length: "선택은 {{count}} 자 이상이어야합니다."
     date_time_picker:
       from: 보내는사람
       to: 받는사람
+      errors:
+        to_before_from: "날짜는 날짜보다 늦어 야합니다."
     emoji_picker:
       filter_placeholder: 이모지 찾기
+      smileys_&_emotion: 스마일과 감정
+      people_&_body: 사람과 몸
+      animals_&_nature: 동물과 자연
+      food_&_drink: 음식과 음료
+      travel_&_places: 여행과 장소
+      activities: 활동
       objects: 사물
+      symbols: 기호
       flags: 신고들
       recent: 최근 사용
       default_tone: 피부색 없음
@@ -1171,6 +1460,13 @@ ko:
       medium_dark_tone: 약간 어두운 피부색
       dark_tone: 어두운 피부색
       default: 커스텀 emoji
+    shared_drafts:
+      title: "초안 공유"
+      notice: "이 주제는 <b>{{category}}</b> 카테고리를 볼 수있는 사람들에게만 표시됩니다."
+      destination_category: "대상 카테고리"
+      publish: "공유 초안 게시"
+      confirm_publish: "이 초안을 게시 하시겠습니까?"
+      publishing: "주제 게시 ..."
     composer:
       emoji: "이모지 :)"
       more_emoji: "더보기..."
@@ -1185,35 +1481,50 @@ ko:
       saved_local_draft_tip: "로컬로 저장됩니다."
       similar_topics: "작성하려는 내용과 비슷한 주제들..."
       drafts_offline: "초안"
+      edit_conflict: "충돌을 편집하다"
+      group_mentioned_limit: "<b>경고!</b> <a href='{{group_link}}'>{{group}}을</a> 언급했지만이 그룹에는 관리자가 구성한 언급 한도 {{max}} 사용자보다 많은 구성원이 있습니다. 아무도 알림을받지 않습니다."
       group_mentioned:
         other: "{{group}}을 언급하면, <a href='{{group_link}}'>{{count}} 명</a>의 회원에게 알림이 갑니다. 그렇게 할까요?"
       cannot_see_mention:
         category: "{{username}}에게 멘션을 썼지만, 해당 사용자가 이 카테고리에 접근할 수 없기 때문에 알림이 가지 않습니다. 이 카테고리에 접근할 수 있는 그룹에 해당 멤버가 추가되어야 합니다."
         private: "{{username}}에게 멘션을 썼지만, 해당 사용자가 개인 메시지를 볼 수 없기 때문에 알림이 가지 않습니다. 이 개인 메시지에 해당 사용자를 초대해야 합니다."
       duplicate_link: "이 토픽에는 이미<b>{{domain}}</b>의 링크가 <b>@{{username}}</b>님이 <a href='{{post_url}}'>{{ago}}</a>전에 쓴 게시글에 게시되어 있습니다. 그래도 다시 게시할까요?"
+      reference_topic_title: "RE : {{title}}"
       error:
         title_missing: "제목은 필수 항목입니다"
         title_too_short: "제목은 최소 {{min}} 글자 이상이어야 합니다."
         title_too_long: "제목은 {{max}} 글자 이상일 수 없습니다."
+        post_missing: "게시물은 비워 둘 수 없습니다"
         post_length: "글은 최소 {{min}} 글자 이상이어야 합니다."
+        try_like: "{{heart}} 버튼을 사용해 보셨습니까?"
         category_missing: "카테고리를 선택해주세요."
+        tags_missing: "최소한 {{count}} 태그를 선택해야합니다"
+        topic_template_not_modified: "토픽 템플릿을 편집하여 토픽에 세부 사항 및 세부 사항을 추가하십시오."
       save_edit: "편집 저장"
+      overwrite_edit: "덮어 쓰기 편집"
       reply_original: "기존 주제에 대해 답글을 작성합니다."
       reply_here: "여기에 답글을 작성하세요."
       reply: "답글 전송"
       cancel: "취소"
       create_topic: "새 주제 쓰기"
       create_pm: "메시지"
+      create_whisper: "속삭임"
+      create_shared_draft: "공유 초안 만들기"
+      edit_shared_draft: "공유 초안 편집"
       title: "혹은 Ctrl + Enter 누름"
       users_placeholder: "사용자 추가"
       title_placeholder: "이야기 나누고자 하는 내용을 한문장으로 적는다면?"
       title_or_link_placeholder: "제목을 입력하거나, 링크를 붙여넣으세요"
       edit_reason_placeholder: "why are you editing?"
       topic_featured_link_placeholder: "타이틀과 함께 표시될 링크를 입력하세요."
+      remove_featured_link: "주제에서 링크를 제거하십시오."
       reply_placeholder: "여기에 타이핑 하세요. 마크다운 또는 BBCode, HTML 포맷을 이용하세요. 이미지를 끌어오거나 붙여넣기 하세요."
+      reply_placeholder_no_images: "여기에 입력하십시오. Markdown, BBCode 또는 HTML을 사용하여 형식을 지정하십시오."
+      reply_placeholder_choose_category: "여기에 입력하기 전에 카테고리를 선택하십시오."
       view_new_post: "새로운 글을 볼 수 있습니다."
       saving: "저장 중..."
       saved: "저장 완료!"
+      saved_draft: "초안이 진행 중입니다. 다시 시작하려면 누릅니다."
       uploading: "업로딩 중..."
       show_preview: "미리보기를 보여줍니다 &laquo;"
       hide_preview: "&laquo; 미리보기를 숨기기"
@@ -1228,6 +1539,7 @@ ko:
       link_description: "링크 설명을 입력"
       link_dialog_title: "하이퍼링크 삽입"
       link_optional_text: "옵션 제목"
+      link_url_placeholder: "주제를 검색하기 위해 URL 또는 유형 붙여 넣기"
       quote_title: "인용구"
       quote_text: "인용구"
       code_title: "코드 샘플"
@@ -1238,7 +1550,13 @@ ko:
       olist_title: "번호 매기기 목록"
       ulist_title: "글 머리 기호 목록"
       list_item: "주제"
+      toggle_direction: "방향 전환"
       help: "마크다운 편집 도움말"
+      collapse: "작곡가 패널을 최소화"
+      open: "작곡가 패널을 엽니 다"
+      abandon: "작곡가를 닫고 초안을 버립니다."
+      enter_fullscreen: "전체 화면 작곡가 입력"
+      exit_fullscreen: "전체 화면 작곡가 종료"
       modal_ok: "확인"
       modal_cancel: "취소"
       cant_send_pm: "죄송합니다. %{username}님에게 메시지를 보낼 수 없습니다."
@@ -1250,11 +1568,30 @@ ko:
         reply: 댓글
         draft: 임시저장
         edit: 수정
+        reply_to_post:
+          label: "%{postUsername}에 의해 %{postNumber} 게시"
+          desc: 특정 게시물에 답장
+        reply_as_new_topic:
+          label: 링크 된 주제로 답장
+          desc: 이 주제에 링크 된 새로운 주제를 만듭니다
+          confirm: 새로운 토픽 초안이 저장되었으며 링크 된 토픽을 작성하면 덮어 씁니다.
         reply_as_private_message:
           label: 새 메시지
           desc: 새 개인 메시지 쓰기
+        reply_to_topic:
+          label: 주제에 대한 답변
+          desc: 특정 게시물이 아닌 주제에 대한 답변
+        toggle_whisper:
+          label: 속삭임 토글
+          desc: 속삭임은 직원 만 볼 수 있습니다
         create_topic:
           label: "새 주제글"
+        shared_draft:
+          label: "초안 공유"
+          desc: "직원 만 볼 수있는 주제 초안"
+        toggle_topic_bump:
+          label: "토픽 범프 전환"
+          desc: "최신 회신 날짜를 변경하지 않고 회신"
     notifications:
       tooltip:
         regular:
@@ -1264,6 +1601,8 @@ ko:
       title: "@name 언급, 글과 주제에 대한 답글, 개인 메시지 등에 대한 알림"
       none: "현재 알림을 불러올 수 없습니다."
       empty: "알림이 없습니다."
+      post_approved: "귀하의 게시물이 승인되었습니다"
+      reviewable_items: "검토가 필요한 항목"
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
@@ -1285,6 +1624,8 @@ ko:
       granted_badge: "'{{description}}' 를 받았습니다"
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>새 토픽</span> {{description}}"
+      membership_request_accepted: "&#39;{{group_name}}&#39;에 회원 가입"
+      membership_request_consolidated: "{{count}} &#39;{{group_name}}&#39;에 대한 오픈 멤버쉽 요청"
       group_message_summary:
         other: " {{group_name}} 사서함에 {{count}} 개의 메시지가 있습니다"
       popup:
@@ -1293,12 +1634,35 @@ ko:
         quoted: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 나를 인용했습니다'
         replied: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 내게 답글을 달았습니다'
         posted: '"{{topic}}" - {{site_title}}에서 {{username}}님이 글을 게시하였습니다'
+        private_message: '{{username}}에서 &quot;{{topic}}&quot;에 개인 메시지를 보냈습니다-{{site_title}}'
         linked: '{{username}}님이 "{{topic}}" - {{site_title}}에 내 글을 링크했습니다'
+        watching_first_post: '{{username}}가 새로운 주제 &quot;{{topic}}&quot;-{{site_title}}을 작성했습니다.'
         confirm_title: "알림 활성 - %{site_title}"
         confirm_body: "완료! 알림이 활성화되었습니다."
+        custom: "%{site_title}의 {{username}}에서 알림"
       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: "새로운 회원 요청"
     upload_selector:
       title: "이미지 추가하기"
       title_with_attachments: "이미지 또는 파일 추가하기"
@@ -1340,30 +1704,44 @@ ko:
       context:
         user: "@{{username}}의 글 검색"
         category: "#{{category}} 카테고리에서 검색"
+        tag: "# {{tag}} 태그 검색"
         topic: "이 주제를 검색"
         private_messages: "메시지 검색"
       advanced:
         title: 고급 검색
         posted_by:
           label: 글쓴이
+        in_category:
+          label: 분류
         in_group:
           label: 그룹에 속한
         with_badge:
           label: 배지가 있는
+        with_tags:
+          label: 태그
         filters:
+          label: 주제 / 게시 만 반환 ...
+          title: 제목 만 일치
           likes: 내가 좋아요 누른
           posted: 내가 게시글을 쓴
+          created: 내가 만들었다
           watching: 내가 주시하는
           tracking: 내가 추적하는
+          private: 내 메시지에서
+          bookmarks: 나는 북마크했다
           first: 가 가장 첫 포스트입니다.
           pinned: 핀고정된
           unpinned: 핀고정 되지 않은
+          seen: 읽었다
           unseen: 읽지 않은 것
           wiki: 은(는) 위키입니다.
+          images: 이미지 포함
+          all_tags: 위의 모든 태그
         statuses:
           label: 토픽 조건
           open: 가 열렸습니다
           closed: 가 닫혔습니다
+          public: 공개
           archived: 가 보관되었습니다
           noreplies: 답글이 없습니다
           single_user: 1명의 사용자를 포함합니다
@@ -1435,6 +1813,7 @@ ko:
         other: "이 토픽에 {{count}}개 게시글"
       create: "새 주제 만들기"
       create_long: "새로운 주제 만들기"
+      open_draft: "초안 열기"
       private_message: "메시지 시작"
       archive_message:
         help: "메시지를 아카이브로 옮기기"
@@ -1446,7 +1825,15 @@ ko:
         help: "메시지의 첫 번째 게시물 수정"
         title: "메시지 수정"
       defer:
+        help: "읽지 않은 상태로 표시"
         title: "연기"
+      feature_on_profile:
+        help: "사용자 카드 및 프로필에이 주제에 대한 링크 추가"
+        title: "프로필 기능"
+      remove_from_profile:
+        warning: "프로필에 이미 추천 주제가 있습니다. 계속하면이 주제가 기존 주제를 대체합니다."
+        help: "사용자 프로필에서이 주제에 대한 링크를 제거하십시오."
+        title: "프로필에서 제거"
       list: "주제 목록"
       new: "새로운 주제"
       unread: "읽지 않은"
@@ -1479,7 +1866,12 @@ ko:
       toggle_information: "주제의 세부 정보를 토글합니다."
       read_more_in_category: "더 읽을거리가 필요하신가요? {{catLink}} 또는 {{latestLink}}를 살펴보세요."
       read_more: "{{catLink}} 또는 {{latestLink}}에서 더 많은 토픽들을 찾으실 수 있습니다"
+      group_request: "이 주제를 보려면`{{name}}` 그룹의 멤버쉽을 요청해야합니다."
+      group_join: "이 주제를 보려면`{{name}}` 그룹에 가입해야합니다"
+      group_request_sent: "그룹 멤버십 요청이 전송되었습니다. 수락되면 알려드립니다."
+      unread_indicator: "아직이 주제의 마지막 게시물을 읽은 회원이 없습니다."
       read_more_MF: "읽지 않은 글 { UNREAD, plural, =0 {} one { is <a href='{basePath}/unread'>1 개</a> }other { are <a href='{basePath}/unread'># 개</a> } }, 새 글은 { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 개</a> } other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># 개</a> } } 을 확인해보세요, {CATEGORY, select, true {{catLink} 카테고리의 다른 글들도 살펴보세요.} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{FIRST_POST} : {CREATED_AT} {LAST_POST} : {BUMPED_AT}"
       browse_all_categories: 모든 카테고리 보기
       view_latest_topics: 최신 주제 보기
       suggest_create_topic: "새 주제를 작성 해 보실래요?"
@@ -1490,11 +1882,13 @@ ko:
         title: "토픽 타이머"
         save: "타이머 설정"
         num_of_hours: "시간:"
+        num_of_days: "일 수:"
         remove: "타이머 제거하기"
         publish_to: "게시되는 곳:"
         when: "게시일:"
         public_timer_types: 토픽 타이머
         private_timer_types: 사용자 토픽 타이머
+        time_frame_required: 시간대를 선택하십시오
       auto_update_input:
         none: "시간대 선택"
         later_today: "오늘 늦게"
@@ -1504,7 +1898,9 @@ ko:
         next_week: "다음 주"
         two_weeks: "2주"
         next_month: "다음 달"
+        two_months: "이 개월"
         three_months: "3개월"
+        four_months: "4 개월"
         six_months: "6개월"
         one_year: "1년"
         forever: "영구적"
@@ -1525,15 +1921,21 @@ ko:
         based_on_last_post: "적어도 주제의 마지막 글이 이만큼 오래되지 않았으면 닫지 마세요."
       auto_delete:
         title: "자동 삭제 토픽"
+      auto_bump:
+        title: "자동 범프 주제"
       reminder:
         title: "다시 알림받기"
+      auto_delete_replies:
+        title: "답글 자동 삭제"
       status_update_notice:
         auto_open: "이 토픽은 %{timeLeft}후에 자동으로 열립니다."
         auto_close: "이 토픽은 %{timeLeft}후에 자동으로 닫힙니다."
         auto_publish_to_category: "이 토픽은 <a href=%{categoryUrl}>#%{categoryName}</a>에 %{timeLeft}시간이 지나면 발행됩니다."
         auto_close_based_on_last_post: "이 주제는 마지막 답글이 달린 %{duration} 후 닫힙니다."
         auto_delete: "이 토픽은 %{timeLeft}후에 자동으로 삭제됩니다."
+        auto_bump: "이 주제는 %{timeLeft}에 자동으로 적용됩니다."
         auto_reminder: "%{timeLeft}후에 이 토픽을 다시 알려드리겠습니다."
+        auto_delete_replies: "이 주제에 대한 회신은 %{duration} 이후에 자동으로 삭제됩니다."
       auto_close_title: "자동으로 닫기 설정"
       auto_close_immediate:
         other: "주제에 마지막 게시글이 올라온 지 %{hours} 시간이 지났기 때문에 이 주제는 곧 닫힐 예정입니다."
@@ -1549,7 +1951,9 @@ ko:
         jump_bottom: "최근 글로 이동"
         jump_prompt: "넘어가기"
         jump_prompt_of: "번째, 총 %{count} 개 포스트"
+        jump_prompt_long: "로 이동 ..."
         jump_bottom_with_number: "jump to post %{post_number}"
+        jump_prompt_to_date: "현재까지"
         jump_prompt_or: "또는"
         total: 총 글
         current: 현재 글
@@ -1566,7 +1970,6 @@ ko:
           "2_8": "이 카테고리를 추적중이므로, 새로운 게시글의 수를 표시합니다."
           "2_4": "이 토픽에 게시글을 남겼기 때문에, 새로운 게시글의 수를 표시합니다."
           "2_2": "이 토픽을 추적중이므로, 새로운 게시글의 수를 표시합니다."
-          "2": '<a href="{{basePath}}/u/{{username}}/preferences">이 토픽을 읽었기 때문에,</a> 새로운 게시글의 수를 표시합니다.'
           "1_2": "누군가 내 @아아디 으로 멘션했거나 내 글에 답글이 달릴 때 알림을 받게 됩니다."
           "1": "누군가 내 @아아디 으로 멘션했거나 내 글에 답글이 달릴 때 알림을 받게 됩니다."
           "0_7": "이 주제에 관한 모든 알림을 무시하고 있습니다."
@@ -1612,6 +2015,7 @@ ko:
         visible: "목록에 넣기"
         reset_read: "값 재설정"
         make_public: "공개 토픽으로 만들기"
+        make_private: "개인 메시지 작성"
         reset_bump_date: "끌어올림 날자 리셋"
       feature:
         pin: "주제 고정"
@@ -1627,6 +2031,7 @@ ko:
         help: "더 이상 목록의 맨 위에 표시하지 않도록 이 주제의 고정 상태를 해제합니다."
       share:
         title: "공유하기"
+        extended_title: "링크 공유"
         help: "이 토픽의 링크를 공유하기"
       print:
         title: "프린트하기"
@@ -1635,6 +2040,9 @@ ko:
         title: "신고하기"
         help: "이 주제를 주의깊게 보거나 비밀리에 주의성 알림을 보내기 위해 신고합니다"
         success_message: "신고했습니다"
+      make_public:
+        title: "공개 주제로 변환"
+        choose_category: "공개 주제의 카테고리를 선택하십시오 :"
       feature_topic:
         title: "주요 주제로 설정"
         pin: " {{categoryLink}} 카테고리 주제 목록 상단에 고정 until"
@@ -1692,9 +2100,14 @@ ko:
         n_posts:
           other: "{{count}} 글"
         cancel: "필터 제거"
+      move_to:
+        title: "로 이동"
+        action: "로 이동"
+        error: "소식을 이동하는 중에 오류가 발생했습니다."
       split_topic:
         title: "새로운 주제로 이동"
         action: "새로운 주제로 이동"
+        topic_name: "새로운 주제 제목"
         radio_label: "새 주제글"
         error: "새로운 주제로 이동시키는데 문제가 발생하였습니다."
         instructions:
@@ -1703,18 +2116,38 @@ ko:
         title: "이미 있는 주제로 옮기기"
         action: "이미 있는 주제로 옮기기"
         error: "이 주제를 이동시키는데 문제가 발생하였습니다."
+        radio_label: "기존 주제"
         instructions:
           other: " <b>{{count}}</b>개의 글을 옮길 주제를 선택해주세요."
       move_to_new_message:
+        title: "새 메시지로 이동"
+        action: "새 메시지로 이동"
+        message_title: "새 메시지 제목"
         radio_label: "새로운 메시지"
         participants: "참여자"
       move_to_existing_message:
+        title: "기존 메시지로 이동"
+        action: "기존 메시지로 이동"
+        radio_label: "기존 메시지"
         participants: "참여자"
       merge_posts:
         title: "선택한 게시글 합치기"
         action: "선택한 게시글 합치기"
         error: "선택한 게시글을 합치는 중 에러가 발생했습니다."
+      publish_page:
+        title: "페이지 출판"
+        publish: "게시"
+        description: "주제가 페이지로 게시되면 해당 URL을 공유 할 수 있으며 사용자 정의 스타일과 함께 표시됩니다."
+        slug: "강타"
+        publish_url: "귀하의 페이지는 다음 위치에 게시되었습니다."
+        topic_published: "귀하의 주제는 다음 위치에 게시되었습니다."
+        preview_url: "귀하의 페이지는 다음 위치에 게시됩니다."
+        invalid_slug: "이 페이지를 게시 할 수 없습니다."
+        unpublish: "게시 취소"
+        unpublished: "귀하의 페이지가 게시 해제되었으며 더 이상 액세스 할 수 없습니다."
+        publishing_settings: "게시 설정"
       change_owner:
+        title: "소유자 변경"
         action: "작성자 바꾸기"
         error: "작성자를 바꾸는 중 에러가 발생하였습니다."
         placeholder: "새로운 작성자의 아이디"
@@ -1729,10 +2162,16 @@ ko:
         selected: "({{count}})개가 선택됨"
         select_post:
           label: "선택"
+          title: "선택에 게시물 추가"
         selected_post:
           label: "선택됨"
+          title: "선택에서 게시물을 삭제하려면 클릭"
         select_replies:
           label: "선택 + 답글"
+          title: "게시물과 모든 답글을 선택에 추가"
+        select_below:
+          label: "+ 아래에서 선택"
+          title: "선택 후 게시물 및 게시물 추가"
         delete: 선택 삭제
         cancel: 선택을 취소
         select_all: 전체 선택
@@ -1743,6 +2182,7 @@ ko:
       quote_reply: "인용하기"
       edit_reason: "사유: "
       post_number: "{{number}}번째 글"
+      ignored: "무시 된 콘텐츠"
       wiki_last_edited_on: "마지막으로 위키가 수정된 일시"
       last_edited_on: "마지막으로 편집:"
       reply_as_new_topic: "연결된 주제로 답글 작성하기"
@@ -1750,6 +2190,7 @@ ko:
       continue_discussion: "{{postLink}}에서 토론을 계속:"
       follow_quote: "인용 글로 이동"
       show_full: "전체 글 보기"
+      show_hidden: "무시 된 내용을 봅니다."
       deleted_by_author:
         other: "(작성자에 의해 취소된 글입니다. 글이 신고된 것이 아닌 한 %{count} 시간 뒤에 자동으로 삭제됩니다)"
       collapse: "축소"
@@ -1757,6 +2198,9 @@ ko:
       locked: "이 글은 운영진에 의해 수정이 금지 되었습니다."
       gap:
         other: "{{count}}개의 숨겨진 답글 보기"
+      notice:
+        new_user: "{{user}}이 처음으로 게시되었습니다. 커뮤니티에 오신 것을 환영합니다!"
+        returning_user: "우리가 {{user}}을 본 지 오래되었습니다. 마지막 게시물은 {{time}}입니다."
       unread: "읽지 않은 포스트"
       has_replies:
         other: "{{count}} 답글"
@@ -1769,16 +2213,22 @@ ko:
         create: "죄송합니다. 글을 만드는 동안 오류가 발생했습니다. 다시 시도하십시오."
         edit: "죄송합니다. 글을 수정하는 중에 오류가 발생했습니다. 다시 시도하십시오."
         upload: "죄송합니다. 파일을 업로드하는 동안 오류가 발생했습니다. 다시 시도하십시오."
+        file_too_large: "해당 파일이 너무 큽니다 (최대 크기는 {{max_size_kb}}kb 임). 대용량 파일을 클라우드 공유 서비스에 업로드 한 다음 링크를 붙여 넣어보십시오."
         too_many_uploads: "한번에 한 파일만 업로드 하실 수 있습니다."
+        too_many_dragged_and_dropped_files: "죄송합니다. 한 번에 {{max}} 파일 만 업로드 할 수 있습니다."
         upload_not_authorized: "죄송합니다. 허가되지 않은 확장자의 파일이 있습니다. (허가된 확장자: {{authorized_extensions}})."
         image_upload_not_allowed_for_new_user: "죄송합니다. 새로운 유저는 이미지를 업로드 하실 수 없습니다."
         attachment_upload_not_allowed_for_new_user: "죄송합니다. 새로운 유저는 파일 첨부를 업로드 하실 수 없습니다."
         attachment_download_requires_login: "죄송합니다. 첨부 파일을 받으려면 로그인이 필요합니다."
       abandon_edit:
+        confirm: "변경 사항을 삭제 하시겠습니까?"
         no_value: "아니요, 버리지 않습니다."
+        no_save_draft: "아니오, 초안 저장"
+        yes_value: "예, 편집 삭제"
       abandon:
         confirm: "글 작성을 취소 하시겠습니까?"
         no_value: "아니오"
+        no_save_draft: "아니오, 초안 저장"
         yes_value: "예"
       via_email: "이 주제는 이메일을 통해 등록되었습니다."
       via_auto_generated_email: "이 게시글은 자동 생성된 이메일로 작성되었습니다"
@@ -1792,6 +2242,7 @@ ko:
         reply: "이 글에 대한 답글을 작성합니다."
         like: "이 글을 좋아합니다."
         has_liked: "이 글을 좋아합니다."
+        read_indicator: "이 게시물을 읽는 회원"
         undo_like: "'좋아요' 취소"
         edit: "이 글 편집"
         edit_action: "편집"
@@ -1810,14 +2261,20 @@ ko:
         convert_to_moderator: "스태프 색상 추가하기"
         revert_to_regular: "스태프 색상 제거하기"
         rebake: "HTML 다시 빌드하기"
+        publish_page: "페이지 출판"
         unhide: "숨기지 않기"
         change_owner: "소유자 변경"
         grant_badge: "배지 부여"
         lock_post: "글 잠그기"
+        lock_post_description: "포스터가이 게시물을 편집하지 못하도록 방지"
         unlock_post: "글 잠금 해제"
         unlock_post_description: "작성자가 글을 수정하도록 허용"
+        delete_topic_disallowed_modal: "이 주제를 삭제할 권한이 없습니다. 실제로 삭제하려면 추론과 함께 중재자주의 플래그를 제출하십시오."
         delete_topic_disallowed: "이 글을 삭제할 수있는 권한이 없습니다"
         delete_topic: "토픽 삭제"
+        add_post_notice: "직원 공지 사항 추가"
+        remove_post_notice: "직원 통지 제거"
+        remove_timer: "타이머를 제거"
       actions:
         flag: "신고하기"
         undo:
@@ -1858,6 +2315,7 @@ ko:
           revert: "이 수정본으로 되돌리기"
           edit_wiki: "Wiki 편집"
           edit_post: "포스트 편집"
+          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
         displays:
           inline:
             title: "Show the rendered output with additions and removals inline"
@@ -1880,21 +2338,42 @@ ko:
             title: "이메일 HTML 파트 보이기"
             button: "HTML"
       bookmarks:
+        create: "북마크 만들기"
+        edit: "북마크 수정"
         created: "생성일자"
         name: "이름"
+        name_placeholder: "이 북마크는 무엇입니까?"
+        set_reminder: "알림"
+        actions:
+          delete_bookmark:
+            name: "북마크 삭제"
+            description: "프로필에서 북마크를 제거하고 북마크에 대한 모든 알림을 중지합니다"
+          edit_bookmark:
+            name: "북마크 수정"
+            description: "북마크 이름을 수정하거나 알림 날짜 및 시간을 변경하십시오."
     category:
       can: "허용"
       none: "(카테고리 없음)"
       all: "모든 카테고리"
       choose: "카테고리&hellip;"
       edit: "수정"
+      edit_dialog_title: "편집 : %{categoryName}"
       view: "카테고리 안의 주제 보기"
       general: "일반"
       settings: "설정"
       topic_template: "주제 템플릿"
       tags: "태그"
+      tags_allowed_tags: "이 태그를이 카테고리로 제한하십시오."
+      tags_allowed_tag_groups: "이 태그 그룹을이 카테고리로 제한하십시오."
       tags_placeholder: "(선택사항) 허용된 태그 목록"
+      tags_tab_description: "위에 지정된 태그 및 태그 그룹은이 범주 및 해당 범주를 지정하는 다른 범주에서만 사용할 수 있습니다. 다른 카테고리에서는 사용할 수 없습니다."
       tag_groups_placeholder: "(선택사항) 허용된 태그 그룹 목록"
+      manage_tag_groups_link: "여기에서 태그 그룹을 관리하십시오."
+      allow_global_tags_label: "다른 태그도 허용"
+      tag_group_selector_placeholder: "(선택 사항) 태그 그룹"
+      required_tag_group_description: "새 주제에 태그 그룹의 태그가 있어야합니다."
+      min_tags_from_required_group_label: "숫자 태그 :"
+      required_tag_group_label: "태그 그룹 :"
       topic_featured_link_allowed: "이 카테고리에 주요 링크 허용"
       delete: "카테고리 삭제"
       create: "새 카테고리"
@@ -1922,32 +2401,45 @@ ko:
       already_used: "이 색은 다른 카테고리에서 사용되고 있습니다."
       security: "보안"
       special_warning: "경고: 이 카테고리는 사전 생성된 카테고리이기 때문에 보안 설정 변경이 불가합니다. 이 카테고리를 사용하고 싶지 않다면, 수정하지말고 삭제하세요."
+      uncategorized_security_warning: "이 카테고리는 특별합니다. 카테고리가없는 주제의 보관 영역으로 사용됩니다. 보안 설정을 가질 수 없습니다."
+      uncategorized_general_warning: '이 카테고리는 특별합니다. 카테고리를 선택하지 않은 새 주제의 기본 카테고리로 사용됩니다. 이 동작을 방지하고 범주를 강제로 선택 <a href="%{settingLink}">하려면 여기에서 설정을 비활성화하십시오</a> . 이름이나 설명을 변경하려면 <a href="%{customizeLink}">사용자 정의 / 텍스트 내용으로 이동하십시오</a> .'
+      pending_permission_change_alert: "이 카테고리에 %{group}을 추가하지 않았습니다. 이 버튼을 클릭하여 추가하십시오."
       images: "이미지"
       email_in: "incoming 메일 주소 수정"
       email_in_allow_strangers: "계정이 없는 익명 유저들에게 이메일을 받습니다."
       email_in_disabled: "이메일로 새 주제 작성하기 기능이 비활성화되어 있습니다. 사이트 설정에서 '이메일로 새 주제 작성하기'를 활성화 해주세요."
       email_in_disabled_click: '"email in" 활성화'
+      mailinglist_mirror: "카테고리는 메일 링리스트를 반영"
       show_subcategory_list: "하위 카테고리 목록을 토픽위에 표시하기."
       num_featured_topics: "이 카테고리 페이지에 표시되는 토픽의 수:"
       subcategory_num_featured_topics: "부모 카테고리 페이지에 표시되는 주요 토픽의 수:"
+      all_topics_wiki: "기본적으로 새로운 토픽 위키 만들기"
       subcategory_list_style: "하위 카테고리 목록 스타일:"
       sort_order: "다음 기준으로 토픽 목록 정렬:"
       default_view: "기본 토픽 목록:"
       default_top_period: "기본 Top 기간:"
       allow_badges_label: "배지가 이 카테고리에서 주어질 수 있도록 허용"
       edit_permissions: "권한 수정"
+      reviewable_by_group: "직원 외에도이 카테고리의 게시물 및 플래그는 다음을 통해 검토 할 수 있습니다."
       review_group_name: "그룹명"
+      require_topic_approval: "모든 새로운 주제에 대한 중재자 승인 필요"
+      require_reply_approval: "모든 새 답글에 대한 중재자 승인 필요"
       this_year: "올해"
+      position: "카테고리 페이지에서의 위치 :"
       default_position: "기본 위치"
       position_disabled: "카테고리는 활동량에 따라서 표시됩니다. 목록 내의 카테고리 순서를 지정하하려면"
       position_disabled_click: '"카테고리 위치 고정" 설정을 활성화 시키십시요.'
+      minimum_required_tags: "주제에 필요한 최소 태그 수 :"
       parent: "부모 카테고리"
+      num_auto_bump_daily: "매일 자동으로 충돌하는 공개 주제 수 :"
+      navigate_to_first_post_after_read: "주제를 읽은 후 첫 번째 게시물로 이동"
       notifications:
         watching:
           title: "주시 중"
           description: "이 카테고리의 모든 토픽을 주시하도록 자동 설정됩니다. 모든 토픽과 게시글에 대하여 알림을 받게 되며, 새로운 게시글의 수가 표시됩니다."
         watching_first_post:
           title: "첫번째 글 보기"
+          description: "이 카테고리의 새 주제에 대한 알림을 받지만 주제에 대한 답장은 없습니다."
         tracking:
           title: "추적 중"
           description: "이 카테고리의 모든 토픽을 추적하도록 자동 설정됩니다. 다른 사용자가 당신의 @이름 을 언급하거나 당신의 게시글에 답글을 달 때 알림을 받게 되며 새로운 게시글의 수가 표시됩니다."
@@ -1958,10 +2450,14 @@ ko:
           title: "알림 꺼짐"
           description: "이 카테고리 내의 새 토픽에 대해 어떠한 알림도 받지 않으며, 최신 토픽 항목에도 나타나지 않습니다."
       search_priority:
+        label: "검색 우선 순위"
         options:
           normal: "알림 : 일반"
           ignore: "무시"
+          very_low: "매우 낮은"
+          low: "낮은"
           high: "높음"
+          very_high: "매우 높음"
       sort_options:
         default: "기본값"
         likes: "좋아요 수"
@@ -1981,6 +2477,8 @@ ko:
         boxes_with_featured_topics: "주요 토픽의 박스 스타일"
       settings_sections:
         general: "일반"
+        moderation: "절도"
+        appearance: "외관"
         email: "이메일"
     flagging:
       title: "우리 커뮤니티 질서를 지키는데 도와주셔서 감사합니다!"
@@ -2047,6 +2545,9 @@ ko:
         help: "이 주제는 고정되었습니다. 카테고리의 상단에 표시됩니다."
       unlisted:
         help: "이 주제는 목록에서 제외됩니다. 주제 목록에 표시되지 않으며 링크를 통해서만 접근 할 수 있습니다."
+      personal_message:
+        title: "이 주제는 개인 메시지입니다"
+        help: "이 주제는 개인 메시지입니다"
     posts: "글"
     posts_long: "이 주제의 글 수는 {{number}}개 입니다."
     posts_likes_MF: |2
@@ -2151,7 +2652,18 @@ ko:
       readonly: "보기"
     lightbox:
       download: "다운로드"
+      previous: "이전 (왼쪽 화살표 키)"
+      next: "다음 (오른쪽 화살표 키)"
+      counter: "%total %의 %curr %"
+      close: "닫기 (Esc)"
+      content_load_error: '<a href="%url%">내용을</a> 로드 할 수 없습니다.'
+      image_load_error: '<a href="%url%">이미지를</a> 로드 할 수 없습니다.'
     keyboard_shortcuts_help:
+      shortcut_key_delimiter_comma: ","
+      shortcut_key_delimiter_plus: "+"
+      shortcut_delimiter_or: "%{shortcut1} 또는 %{shortcut2}"
+      shortcut_delimiter_slash: "%{shortcut1} / %{shortcut2}"
+      shortcut_delimiter_space: "%{shortcut1} %{shortcut2}"
       title: "키보드 단축키"
       jump_to:
         title: "이동"
@@ -2171,6 +2683,7 @@ ko:
         up_down: "%{shortcut} 선택된 글 이동 &uarr; &darr;"
         open: "%{shortcut} 선택한 토픽 열기"
         next_prev: "%{shortcut} 이전/다음 섹션"
+        go_to_unread_post: "%{shortcut} 읽지 않은 첫 번째 게시물로 이동"
       application:
         title: "어플리케이션"
         create: "%{shortcut} 새 토픽을 만듭니다."
@@ -2183,6 +2696,21 @@ ko:
         dismiss_new_posts: "%{shortcut} 새글을 읽은 상태로 표시하기"
         dismiss_topics: "%{shortcut} 토픽 무시하기"
         log_out: "%{shortcut} 로그아웃"
+      composing:
+        title: "식자"
+        return: "%{shortcut} 작곡가로 돌아 가기"
+        fullscreen: "%{shortcut} 전체 화면 작곡가"
+      bookmarks:
+        title: "북마크"
+        enter: "%{shortcut} 저장 후 닫기"
+        later_today: "%{shortcut} 나중에 오늘"
+        later_this_week: "%{shortcut} 이번 주 후반"
+        next_week: "다음주에 %{shortcut}"
+        next_month: "다음 달 %{shortcut}"
+        next_business_week: "%{shortcut} 다음 주 시작"
+        next_business_day: "%{shortcut} 다음 영업일"
+        custom: "%{shortcut} 사용자 정의 날짜 및 시간"
+        delete: "%{shortcut} 북마크 삭제"
       actions:
         title: "액션"
         bookmark_topic: "%{shortcut} 북마크 토픽 켜고 끄기"
@@ -2203,6 +2731,12 @@ ko:
         mark_tracking: "%{shortcut} 토픽 알람 : 추적하기"
         mark_watching: "%{shortcut} 토픽 알람 : 주시하기"
         print: "%{shortcut} 토픽 인쇄하기"
+        defer: "%{shortcut} 주제 지연"
+        topic_admin_actions: "%{shortcut} 주제 열기 관리자 작업"
+      search_menu:
+        title: "검색 메뉴"
+        prev_next: "%{shortcut} 선택을 위아래로 이동"
+        insert_url: "%{shortcut} 열린 작곡가에 선택 물 삽입"
     badges:
       earned_n_times:
         other: "이 배지를 %{count}번 받았습니다"
@@ -2219,6 +2753,7 @@ ko:
         other: "%{count}개 수여됨"
       select_badge_for_title: 타이틀로 사용할 배지 선택하기
       none: "(없음)"
+      successfully_granted: "%{username}에 %{badge}을 성공적으로 부여 함"
       badge_grouping:
         getting_started:
           name: 시작하기
@@ -2238,7 +2773,17 @@ ko:
       changed: "바뀐 태그:"
       tags: "태그"
       choose_for_topic: "선택적 태그"
+      info: "정보"
+      default_info: "이 태그는 카테고리로 제한되지 않으며 동의어가 없습니다."
+      category_restricted: "이 태그는 액세스 권한이없는 카테고리로 제한됩니다."
+      synonyms: "동의어"
+      synonyms_description: "다음 태그를 사용하면 <b>%{base_tag_name}</b> 으로 대체됩니다."
+      edit_synonyms: "동의어 관리"
+      add_synonyms_label: "동의어 추가 :"
       add_synonyms: "추가"
+      add_synonyms_failed: "다음 태그를 동의어로 추가 할 수 없습니다 : <b>%{tag_names}</b> . 동의어가없고 다른 태그의 동의어가 아닌지 확인하십시오."
+      remove_synonym: "동의어 제거"
+      delete_synonym_confirm: '동의어 &quot;%{tag_name}&quot;를 삭제 하시겠습니까?'
       delete_tag: "태그 삭제"
       delete_confirm:
         other: "정말로 이 태그를 삭제하고 이 태그가 붙은 {{count}} 개의 토픽에서 태그를 제거할까요?"
@@ -2250,6 +2795,12 @@ ko:
       sort_by_name: "이름"
       manage_groups: "태그 그룹 관리"
       manage_groups_description: "태그 정리를 위한 그룹 정의"
+      upload: "태그 업로드"
+      upload_description: "CSV 파일을 업로드하여 일괄 적으로 태그 생성"
+      upload_instructions: "선택적으로 &#39;tag_name, tag_group&#39;형식의 태그 그룹이있는 한 줄에 하나씩."
+      upload_successful: "태그가 성공적으로 업로드되었습니다"
+      delete_unused: "사용하지 않은 태그 삭제"
+      delete_unused_description: "주제 나 개인 메시지에 첨부되지 않은 모든 태그 삭제"
       cancel_delete_unused: "취소"
       filters:
         without_category: "%{filter} %{tag} 토픽"
@@ -2259,28 +2810,36 @@ ko:
       notifications:
         watching:
           title: "주시중"
+          description: "이 태그로 모든 주제를 자동으로 볼 수 있습니다. 모든 새 게시물 및 주제에 대한 알림과 함께 읽지 않은 게시물 및 새 게시물의 수가 주제 옆에 표시됩니다."
         watching_first_post:
           title: "첫 게시글 주시중"
+          description: "이 태그에는 새로운 주제에 대한 알림이 표시되지만 주제에 대한 답장은 없습니다."
         tracking:
           title: "추적중"
+          description: "이 태그로 모든 주제를 자동으로 추적합니다. 읽지 않은 새 게시물 수와 주제 옆에 표시됩니다."
         regular:
           title: "일반"
           description: "누군가 당신의 @아이디 로 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다."
         muted:
           title: "알림끔"
+          description: "이 태그를 사용하여 새 주제에 대한 알림을받지 않으며 읽지 않은 탭에 표시되지 않습니다."
       groups:
         title: "태그 그룹"
         about: "태그 관리를 쉽게하려면 그룹에 태그를 추가하세요."
         new: "새 그룹"
         tags_label: "이 그룹의 태그:"
+        tags_placeholder: "태그"
         parent_tag_label: "부모 태그:"
         parent_tag_placeholder: "선택사항"
         parent_tag_description: "이 그룹에 속한 태그는 부모 태그가 붙기 전에는 사용할 수 없습니다."
         one_per_topic_label: "이 그룹의 태그는 토픽당 하나만 선택할 수 있도록 제한하기"
         new_name: "새 태그 그룹"
+        name_placeholder: "태그 그룹 이름"
         save: "저장"
         delete: "삭제"
         confirm_delete: "정말로 이 태그 그룹을 삭제할까요?"
+        everyone_can_use: "모든 사람이 태그를 사용할 수 있습니다"
+        usable_only_by_staff: "태그는 모든 사람에게 표시되지만 직원 만 사용할 수 있습니다"
         visible_only_to_staff: "태그는 운영진 에게만 표시됩니다"
       topics:
         none:
@@ -2300,9 +2859,11 @@ ko:
           top: "더 이상 인기 토픽이 없습니다."
           bookmarks: "더 이상 북마크한 토픽이 없습니다."
     invite:
+      custom_message: "<a href>맞춤 메시지</a> 를 작성하여 초대를 좀 더 개인적으로 만드십시오."
       custom_message_placeholder: "사용자 설정 메시지를 입력하세요"
       custom_message_template_forum: "저기요, 이 포럼에 가입하셔야 해요!"
       custom_message_template_topic: "이 토픽에 흥미 있을 거 같은데요!"
+    forced_anonymous: "극단적 인로드로 인해 로그 아웃 한 사용자가 볼 수있는 것처럼 모든 사람에게 일시적으로 표시됩니다."
     safe_mode:
       enabled: "안전모드가 활성화 되었습니다. 안전모드를 종료하려면 이 웹브라우저창을 닫아야 합니다."
   admin_js:
@@ -2313,9 +2874,14 @@ ko:
       tags:
         remove_muted_tags_from_latest:
           always: "항상 알림 받기"
+          only_muted: "단독으로 또는 다른 뮤트 태그와 함께 사용되는 경우"
           never: "하지않음"
+      reports:
+        title: "사용 가능한 보고서 목록"
       dashboard:
         title: "대시보드"
+        last_updated: "대시 보드 업데이트 :"
+        discourse_last_updated: "담론 업데이트 :"
         version: "버전"
         up_to_date: "최신상태입니다!"
         critical_available: "중요 업데이트를 사용할 수 있습니다."
@@ -2326,15 +2892,19 @@ ko:
         version_check_pending: "최근에 업데이트 되었군요! 환상적입니다!!"
         installed_version: "설치됨"
         latest_version: "최근"
+        problems_found: "현재 사이트 설정에 따른 몇 가지 조언"
         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: "백업"
         lastest_backup: "최근: %{date}"
@@ -2343,12 +2913,24 @@ ko:
         page_views: "페이지뷰"
         page_views_short: "페이지뷰"
         show_traffic_report: "자세한 트래픽 리포트 보기"
+        community_health: 지역 사회 건강
+        moderators_activity: 중재자 활동
+        whats_new_in_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일"
@@ -2360,13 +2942,25 @@ ko:
           view_table: "테이블"
           view_graph: "그래프"
           refresh_report: "보고서 새로고침"
+          dates: "날짜 (UTC)"
           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> 를 사용하여 데이터를 수집하십시오.'
           filters:
+            file-extension:
+              label: 파일 확장자
             group:
               label: 그룹
             category:
               label: 카테고리
+            include-subcategories:
+              label: "하위 카테고리 포함"
       commits:
         latest_changes: "최근 변경 사항: 자주 업데이트하십시오!"
         by: "에 의해"
@@ -2377,6 +2971,7 @@ ko:
           name:
             too_short: "그룹 이름이 너무 짧습니다"
             too_long: "그룹 이름이 너무 깁니다"
+            checking: "그룹 이름 가용성 확인 중 ..."
             available: "사용가능한 그룹 이름"
             not_available: "사용 불가능한 그룹 이름"
             blank: "그룹 이름은 공백이 될 수 없습니다"
@@ -2391,15 +2986,26 @@ ko:
             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: "%{count} 사용자는 새 이메일 도메인을 가지며 그룹에 추가됩니다."
             primary_group: "기본 그룹으로 자동 설정"
         name_placeholder: "그룹 이름, 공백 없이 username 규칙과 동일하게 입력하세요."
         primary: "주 그룹"
@@ -2417,6 +3023,7 @@ ko:
         custom: "Custom"
         automatic: "자동화"
         default_title: "기본 타이틀"
+        default_title_description: "그룹의 모든 사용자에게 적용됩니다"
         group_owners: 소유자
         add_owners: 소유자 추가하기
         none_selected: "시작할 그룹을 선택하세요"
@@ -2426,13 +3033,31 @@ ko:
         none: "지금 활성화된 API 키가 없습니다."
         user: "사용자"
         title: "API"
+        key: "키"
         created: 생성일자
+        updated: 업데이트
+        last_used: 마지막 사용
+        never_used: (못)
         generate: "API 키 생성"
+        undo_revoke: "취소 취소"
         revoke: "폐지"
         all_users: "전체 유저"
+        active_keys: "활성 API 키"
+        manage_keys: 키 관리
         show_details: 세부 내용
         description: 내용
+        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: 계속
       web_hooks:
         title: "Webhook"
@@ -2463,6 +3088,8 @@ ko:
         active_notice: "이벤트 발생 시 이벤트 상세정보를 보내드립니다."
         categories_filter_instructions: "관련된 webhook은 이벤트가 특정 카테고리와 관계가 있을 때만 트리거를 작동시킵니다. 모든 카테고리에 이 webhook을 적용하고 싶을 때는 트리거에 공백을 추가하세요."
         categories_filter: "트리거 설정된 카테고리"
+        tags_filter_instructions: "이벤트가 지정된 태그와 관련된 경우에만 관련 웹 후크가 트리거됩니다. 모든 태그에 대해 웹 후크를 트리거하려면 비워 두십시오."
+        tags_filter: "트리거 된 태그"
         groups_filter_instructions: "관련된 webhook은 이벤트가 특정 그룹과 관계가 있을 때만 트리거를 작동시킵니다. 모든 카테고리에 이 webhook을 적용하고 싶을 때는 트리거에 공백을 추가하세요."
         groups_filter: "트리거 설정된 그룹"
         delete_confirm: "이 webhook을 삭제할까요?"
@@ -2474,14 +3101,31 @@ ko:
           details: "게시글이 생성, 편집, 삭제, 재생될 때."
         user_event:
           name: "사용자 이벤트"
+          details: "사용자가 로그인하면 로그 아웃, 생성, 승인 또는 업데이트됩니다."
         group_event:
           name: "그룹 이벤트"
+          details: "그룹이 생성, 업데이트 또는 파괴 될 때."
         category_event:
           name: "카테고리 이벤트"
+          details: "카테고리가 작성, 업데이트 또는 파괴 될 때."
         tag_event:
           name: "태그 이벤트"
+          details: "태그가 생성, 업데이트 또는 파괴 될 때."
         flag_event:
           name: "신고 이벤트"
+          details: "플래그가 생성, 동의, 동의 또는 무시 될 때"
+        queued_post_event:
+          name: "승인 후 이벤트"
+          details: "대기중인 새 게시물이 작성되면 승인 또는 거부됩니다."
+        reviewable_event:
+          name: "검토 가능한 이벤트"
+          details: "새 항목을 검토 할 준비가되었고 상태가 업데이트 될 때"
+        notification_event:
+          name: "알림 이벤트"
+          details: "사용자가 피드에서 알림을받는 경우"
+        user_badge_event:
+          name: "배지 보조금 행사"
+          details: "사용자가 배지를받을 때"
         delivery_status:
           title: "발송 상태"
           inactive: "비활성화"
@@ -2560,6 +3204,7 @@ ko:
             label: "백업"
             title: "백업 생성"
             confirm: "새로운 백업을 시작할까요?"
+            without_uploads: "예 (업로드를 포함하지 않음)"
           download:
             label: "다운로드"
             title: "다운로드 링크를 붙여서 이메일 보내기"
@@ -2576,6 +3221,10 @@ ko:
             label: "롤백"
             title: "데이터베이스를 이전 workiong state로 되돌리기"
             confirm: "데이타베이스를 이전 상태로 롤백 또는 되돌리기 할까요?"
+        location:
+          local: "로컬 스토리지"
+          s3: "S3"
+        backup_storage_error: "백업 스토리지에 액세스하지 못했습니다 : %{error_message}"
       export_csv:
         success: "Export initiated, you will be notified via message when the process is complete."
         failed: "내보내기가 실패했습니다. 로그를 확인해주세요"
@@ -2599,7 +3248,9 @@ ko:
         save: "저장"
         new: "새 사용자 지정"
         new_style: "새로운 스타일"
+        install: "설치"
         delete: "삭제"
+        delete_confirm: '&quot;%{theme_name}&quot;를 삭제 하시겠습니까?'
         color: "색상"
         opacity: "투명도"
         copy: "복사"
@@ -2617,7 +3268,14 @@ ko:
           revert_confirm: "정말로 변경사항을 되돌리시겠습니까?"
         theme:
           theme: "테마"
+          component: "구성 요소"
+          components: "구성 요소"
           theme_name: "테마명"
+          component_name: "구성 요소 이름"
+          themes_intro: "기존 테마를 선택하거나 새 테마를 설치하여 시작하십시오."
+          themes_intro_emoji: "여자 아티스트 이모티콘"
+          beginners_guide_title: "강연 테마 사용에 대한 초보자 안내서"
+          developers_guide_title: "Discourse Themes에 대한 개발자 안내서"
           browse_themes: "커뮤니티 테마 보기"
           customize_desc: "커스터마이즈:"
           title: "테마"
@@ -2627,18 +3285,38 @@ ko:
           long_title: "사이트의 색상, CSS, HTML 수정하기"
           edit: "편집"
           edit_confirm: "이 테마는 원격테마입니다. 업데이트가 실행될 때 편집된 CSS/HTML 내용이 사라지게 됩니다."
+          update_confirm: "이러한 로컬 변경 사항은 업데이트로 지워집니다. 너 정말 계속하고 싶니?"
+          update_confirm_yes: "예, 업데이트를 계속하십시오"
           common: "공통"
           desktop: "데스크톱"
           mobile: "모바일"
           settings: "설정"
+          translations: "번역"
+          extra_scss: "추가 SCSS"
           preview: "미리보기"
+          show_advanced: "고급 필드 표시"
+          hide_advanced: "고급 필드 숨기기"
+          hide_unused_fields: "사용하지 않는 필드 숨기기"
           is_default: "기본값에 의해 테마가 활성화 되었습니다"
           user_selectable: "사용자가 테마를 선택하게 하기"
+          color_scheme: "색상 팔레트"
           color_scheme_select: "테마에서 사용될 컬러 선택"
           custom_sections: "커스텀 섹션:"
           theme_components: "테마 컴포넌트:"
+          add_all_themes: "모든 테마 추가"
           convert: "변환"
+          convert_component_alert: "이 구성 요소를 테마로 변환 하시겠습니까? %{relatives}에서 구성 요소로 제거됩니다."
+          convert_component_tooltip: "이 컴포넌트를 테마로 변환"
+          convert_theme_alert: "이 테마를 구성 요소로 변환 하시겠습니까? %{relatives}에서 부모로 제거됩니다."
+          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: "업로드할 파일 추가하기"
@@ -2647,28 +3325,61 @@ ko:
           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: "테마가 있는 Repository"
+          import_web_advanced: "많은..."
+          import_file_tip: "테마가 포함 된 .tar.gz, .zip 또는 .dcstyle.json 파일"
+          is_private: "테마는 개인 자식 저장소에 있습니다"
+          remote_branch: "지점 이름 (선택 사항)"
+          public_key: "다음 공개 키 액세스 권한을 리포지토리에 부여하십시오."
+          install: "설치"
           installed: "설치됨"
           install_popular: "인기"
+          install_upload: "기기에서"
+          install_git_repo: "자식 저장소에서"
+          install_create: "새로 만들기"
           about_theme: "소개"
           license: "라이센스 정보"
+          version: "버전:"
+          authors: "작성자 :"
+          source_url: "출처"
           enable: "설정"
           disable: "해제"
+          disabled: "이 구성 요소가 비활성화되었습니다."
+          disabled_by: "이 구성 요소는"
+          required_version:
+            error: "이 테마는이 버전의 Discourse와 호환되지 않기 때문에 자동으로 비활성화되었습니다."
+            minimum: "Discourse 버전 {{version}} 이상이 필요합니다."
+            maximum: "담화 버전 {{version}} 이하가 필요합니다."
+          component_of: "구성 요소 :"
           update_to_latest: "최신버전으로 업데이트하기"
           check_for_updates: "업데이트 체크하기"
           updating: "업데이트 중..."
           up_to_date: "테마가 최신입니다, 마지막으로 체크한 일시:"
           add: "추가"
           theme_settings: "테마 설정"
+          no_settings: "이 테마에는 설정이 없습니다."
+          theme_translations: "테마 번역"
           empty: "항목이 없습니다"
           commits_behind:
             other: "테마가 {{count}} 개 커밋 뒤쳐졌습니다!"
+          compare_commits: "(새로운 커밋 참조)"
+          repo_unreachable: "이 테마의 Git 저장소에 접속할 수 없습니다. 에러 메시지:"
+          imported_from_archive: "이 테마는 .zip 파일에서 가져 왔습니다."
           scss:
             text: "CSS"
             title: "커스텀 CSS를 입력하세요. 형식에 맞는 CSS 와 SCSS 스타일을 지원합니다."
@@ -2692,12 +3403,22 @@ ko:
             title: "</body> 태그 전에 들어갈 HTML"
           yaml:
             text: "YAML"
+            title: "YAML 형식으로 테마 설정 정의"
         colors:
+          select_base:
+            title: "기본 색상 팔레트 선택"
+            description: "기본 팔레트 :"
           title: "색상"
+          edit: "색상 표 편집"
+          long_title: "컬러 팔레트"
+          about: "테마에 사용되는 색상을 수정하십시오. 시작할 새 색상 팔레트를 만듭니다."
+          new_name: "새로운 컬러 팔레트"
           copy_name_prefix: "복사본"
+          delete_confirm: "이 색상 표를 삭제 하시겠습니까?"
           undo: "실행 복귀"
           undo_title: "마지막 저장 상태로 색상 변경상태를 되돌리기"
           revert: "되돌리기"
+          revert_title: "이 색상을 담론의 기본 색상 팔레트로 재설정하십시오."
           primary:
             name: "주요"
             description: "대부분의 글, 아이콘 및 테두리"
@@ -2728,13 +3449,31 @@ ko:
           love:
             name: "사랑"
             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: "담론이 수신 된 이메일을 처리하는 방법을 참조하십시오. 이메일을 올바르게 처리하려면 전체 원본 이메일 메시지 아래에 붙여 넣으십시오."
+          email: "원본 메시지"
+          run: "테스트 실행"
+          text: "선택된 텍스트 본문"
+          elided: "생략 된 텍스트"
         sending_test: "테스트 메일 발송중..."
         error: "<b>에러</b> - %{server_error}"
         test_error: "테스트 메일을 전송하는데 문제가 있습니다. 메일 설정을 다시한번 체크해보고 메일 전송이 정상인지 다시 확인하고 시도해주세요."
@@ -2760,6 +3499,7 @@ ko:
         format: "형식"
         html: "html"
         text: "문장"
+        html_preview: "이메일 내용 미리보기"
         last_seen_user: "마지막으로 본 사용자"
         no_result: "요약된 결과가 없습니다."
         reply_key: "답글 단축키"
@@ -2793,8 +3533,15 @@ ko:
             type_placeholder: "다이제스트, 가입..."
             reply_key_placeholder: "답글 키"
       moderation_history:
+        performed_by: "수행자"
+        no_results: "사용 가능한 운영 기록이 없습니다."
         actions:
           delete_user: "사용자 삭제됨"
+          suspend_user: "일시 중지 된 사용자"
+          silence_user: "사용자 침묵"
+          delete_post: "게시물 삭제"
+          delete_topic: "주제가 삭제되었습니다."
+          post_approved: "게시물 승인"
       logs:
         title: "로그"
         action: "허용여부"
@@ -2839,10 +3586,13 @@ ko:
             change_site_text: "site text 변경"
             suspend_user: "suspend user"
             unsuspend_user: "unsuspend user"
+            removed_suspend_user: "사용자 일시 중지 (삭제)"
+            removed_unsuspend_user: "일시 중지되지 않은 사용자 (제거됨)"
             grant_badge: "배지 부여"
             revoke_badge: "배지 회수"
             check_email: "이메일 확인"
             delete_topic: "토픽 삭제"
+            recover_topic: "주제 삭제 취소"
             delete_post: "글 삭제"
             impersonate: "대역"
             anonymize_user: "anonymize user"
@@ -2850,6 +3600,10 @@ ko:
             change_category_settings: "카테고리 설정 변경"
             delete_category: "카테고리 지우기"
             create_category: "카테고리 만들기"
+            silence_user: "침묵 사용자"
+            unsilence_user: "침묵하는 사용자"
+            removed_silence_user: "사용자 침묵 (제거)"
+            removed_unsilence_user: "침묵 사용자 (제거)"
             grant_admin: "관리자권한 부여"
             revoke_admin: "관리자권한 회수"
             grant_moderation: "운영자권한 부여"
@@ -2868,15 +3622,40 @@ ko:
             backup_destroy: "백업 삭제하기"
             reviewed_post: "리뷰된 글"
             custom_staff: "플러그인 커스텀 액션"
+            post_locked: "게시물 잠김"
+            post_edit: "편집 후"
+            post_unlocked: "게시물 잠금 해제"
             check_personal_message: "개인 메시지 확인"
             disabled_second_factor: "Two 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: "미공개 페이지"
         screened_emails:
           title: "블락된 이메일들"
           description: "누군가가 새로운 계정을 만들면 아래 이메일 주소는 체크되고 등록은 블락됩니다, 또는 다른 조치가 취해집니다."
@@ -2910,6 +3689,8 @@ ko:
         search_logs:
           title: "검색 로그"
           term: "기간"
+          searches: "검색"
+          click_through_rate: "클릭률"
           types:
             all_search_types: "모든 유형 검색"
             header: "헤더"
@@ -2923,8 +3704,13 @@ ko:
         search: "검색"
         clear_filter: "지우기"
         show_words: "단어 보이기"
+        one_word_per_line: "한 줄에 한 단어"
         download: 다운로드
         clear_all: 모두 지우기
+        clear_all_confirm_block: "차단 작업에 대해 본 모든 단어를 지우시겠습니까?"
+        clear_all_confirm_censor: "검열 동작에 대해 본 모든 단어를 지우시겠습니까?"
+        clear_all_confirm_flag: "신고 작업에 대해 본 모든 단어를 지우시겠습니까?"
+        clear_all_confirm_require_approval: "승인 필요 조치에 대해 본 모든 단어를 지우시겠습니까?"
         word_count:
           other: "%{count}개 단어"
         actions:
@@ -2944,9 +3730,13 @@ ko:
           add: "추가"
           success: "성공"
           exists: "이미 존재 함"
+          upload: "파일에서 추가"
           upload_successful: "성공적으로 업로드되었습니다. 단어가 추가되었습니다."
         test:
           button_label: "테스트"
+          modal_title: "&#39;%{action}&#39;테스트 단어보기"
+          description: "시청 한 단어와 일치하는지 확인하려면 아래에 텍스트를 입력하십시오"
+          found_matches: "일치하는 결과 :"
           no_matches: "일치하는 결과가 없습니다"
       impersonate:
         title: "이 사용자 행세하기"
@@ -2967,6 +3757,7 @@ ko:
           active: "활성화 사용자"
           staff: "스태프"
           suspended: "접근 금지 사용자"
+          silenced: "침묵"
           staged: "격리됨"
         approved: "승인?"
         titles:
@@ -2981,7 +3772,9 @@ ko:
           staff: "스태프"
           admins: "관리자"
           moderators: "운영자"
+          silenced: "무음 사용자"
           suspended: "접근 금지된 사용자들"
+          staged: "단계적 사용자"
         not_verified: "확인되지 않은"
         check_email:
           title: "사용자의 이메일 주소 표시"
@@ -2998,6 +3791,11 @@ ko:
         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} 까지)"
@@ -3007,9 +3805,17 @@ ko:
         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: "위약금이있는 사용자는 TL3에 도달 할 수 없습니다"
         delete_all_posts_confirm_MF: " {POSTS, plural, one {1개의 포스트} other {#개의 포스트}} 와 {TOPICS, plural, one {1개의 토픽} other {#개의 토픽}}을 삭제하려고 합니다. 정말로 삭제할까요?"
+        silence: "침묵"
+        unsilence: "침묵"
+        silenced: "침묵?"
         moderator: "운영자?"
         admin: "관리자?"
         suspended: "접근 금지?"
@@ -3056,10 +3862,18 @@ ko:
         anonymize_failed: "There was a problem anonymizing the account."
         delete: "사용자 삭제"
         merge:
+          transfer_and_delete: "전송 및 삭제"
           prompt:
+            title: "전송 및 삭제 @ %{username}"
+            target_username_placeholder: "새로운 소유자의 사용자 이름"
+            transfer_and_delete: "전송 및 삭제 @ %{username}"
             cancel: "취소"
           confirmation:
+            title: "전송 및 삭제 @ %{username}"
+            transfer_and_delete: "전송 및 삭제 @ %{username}"
             cancel: "취소"
+        merging_user: "사용자 병합 중 ..."
+        merge_failed: "사용자를 병합하는 중에 오류가 발생했습니다."
         delete_forbidden_because_staff: "관리자 및 운영자 계정은 삭제할 수 없습니다."
         delete_posts_forbidden_because_staff: "관리자와 운영자의 글은 삭제할 수 없습니다."
         delete_forbidden:
@@ -3068,6 +3882,7 @@ ko:
           other: "전체글을 삭제할 수 없습니다. 몇개의 글은 %{count}일 이전에 작성되었습니다. (The delete_user_max_post_age setting.)"
         cant_delete_all_too_many_posts:
           other: "이 사용자는 %{count}개 이상 글을 작성하였기 때문에 모든 글을 삭제 할 수 없습니다. (delete_all_posts_max 설정참고)"
+        delete_confirm: "기존 토론에서 컨텐츠를 제거하지 않으려면 사용자를 삭제하지 않고 익명화하는 것이 일반적으로 바람직합니다. <br><br> 이 사용자를 삭제 하시겠습니까? 이것은 영구적입니다!"
         delete_and_block: "이 이메일과 IP주소를 삭제하고 차단하기"
         delete_dont_block: "삭제만 하기"
         deleting_user: "사용자 삭제중..."
@@ -3080,6 +3895,10 @@ ko:
         activate_failed: "사용자 활성화에 문제가 있습니다."
         deactivate_account: "계정 비활성화"
         deactivate_failed: "사용자 비활성에 문제가 있습니다."
+        unsilence_failed: "사용자의 침묵을 해제하는 중에 문제가 발생했습니다."
+        silence_failed: "사용자를 침묵시키는 데 문제가있었습니다."
+        silence_confirm: "이 사용자를 침묵 하시겠습니까? 새로운 주제 나 게시물을 만들 수 없습니다."
+        silence_accept: "예,이 사용자를 침묵시킵니다"
         bounce_score: "반송 스코어"
         reset_bounce_score:
           label: "리셋"
@@ -3095,6 +3914,7 @@ ko:
           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: "회원등급이 고정되었습니다. 시스템이 회원등급을 올리거나 내리지 않을 것입니다."
@@ -3120,6 +3940,8 @@ ko:
           likes_received: "'좋아요' 받은 횟수"
           likes_received_days: "한번이라도 '좋아요' 받아본 날짜횟수"
           likes_received_users: "한번이라도 '좋아요' 선물해준 회원수"
+          suspended: "일시 중지됨 (지난 6 개월)"
+          silenced: "침묵 (지난 6 개월)"
           qualifies: "3등급회원 자격을 만족합니다"
           does_not_qualify: "3등급회원 자격을 만족하지 않습니다"
           will_be_promoted: "곧 승급 됩니다."
@@ -3190,6 +4012,7 @@ ko:
         clear_filter: "Clear"
         add_url: "URL 추가"
         add_host: "Host 추가"
+        add_group: "그룹 추가"
         uploaded_image_list:
           label: "목록 수정"
           empty: "아직 이미지가 없습니다. 업로드 해주세요."
@@ -3201,6 +4024,7 @@ ko:
         categories:
           all_results: "전체"
           required: "필수"
+          branding: "브랜딩"
           basic: "기본 설정"
           users: "회원"
           posting: "글"
@@ -3229,7 +4053,9 @@ ko:
         secret_list:
           invalid_input: "입력 필드는 비어 있거나 수직 막대 문자를 포함 할 수 없습니다."
         default_categories:
+          modal_description: "이 변경 사항을 역사적으로 적용 하시겠습니까? 기존 사용자 %{count}의 환경 설정이 변경됩니다."
           modal_yes: "네"
+          modal_no: "아니요, 앞으로 만 변경 사항을 적용하십시오."
       badges:
         title: 배지
         new_badge: 새 배지
@@ -3266,6 +4092,7 @@ ko:
         enabled: 배지 기능 사용
         icon: 아이콘
         image: 이미지
+        icon_help: "Font Awesome 아이콘 이름을 입력하십시오 (일반 아이콘에는 접두사 &#39;far-&#39;, 브랜드 아이콘에는 &#39;fab-&#39;사용)"
         image_help: "이미지의 URL을 입력하세요 (둘 다 설정된 경우 아이콘 필드보다 우선함)"
         query: 배지 쿼리(SQL)
         target_posts: 글들을 대상으로 하는 쿼리
@@ -3299,8 +4126,18 @@ ko:
             with_time: "<span class=\"username\">%{username}</span> at <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를 업로드하십시오
+          success: CSV가 접수되었으며 사용자는 곧 배지를 받게됩니다.
+          replace_owners: 이전 소유자에서 배지를 제거합니다
       emoji:
         title: "이모지"
         help: "모든 사람이 쓸 수 있는 이모지를 추가합니다. (팁: 여러개 파일을 한 번에 드래그 & 드롭할 수 있어요)"
@@ -3308,6 +4145,7 @@ ko:
         name: "이름"
         group: "그룹"
         image: "이미지"
+        alt: "맞춤 이모티콘 미리보기"
         delete_confirm: "정말로 :%{name}: 이모지를 삭제할까요?"
       embedding:
         get_started: "다른 웹사이트에 Discourse를 임베드하려면 호스트 추가부터 하세요"
@@ -3327,12 +4165,14 @@ ko:
         embed_post_limit: "삽입(embed)할 글 최대갯수"
         embed_title_scrubber: "게시글의 제목을 긁어오기 위해 정규표현식이 사용되었습니다"
         embed_truncate: "임베드된 글 뒷부분 잘라내기"
+        embed_unlisted: "가져온 주제는 답변이있을 때까지 나열되지 않습니다."
         embed_whitelist_selector: "CSS selector for elements that are allowed in embeds"
         embed_blacklist_selector: "CSS selector for elements that are removed from embeds"
         embed_classname_whitelist: "허용된 CSS 클래스"
         save: "삽입(Embedding) 설정 저장하기"
       permalink:
         title: "고유링크"
+        description: "포럼에서 알려지지 않은 URL에 적용 할 리디렉션"
         url: "URL"
         topic_id: "토픽 ID"
         topic_title: "토픽"
@@ -3341,6 +4181,7 @@ ko:
         category_id: "카테고리 ID"
         category_title: "카테고리"
         external_url: "외부 URL"
+        destination: "목적지"
         delete_confirm: "정말로 이 고유 링크를 삭제하시겠습니까?"
         form:
           label: "새로운:"
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index c04e5b9d4e..918f0e067c 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -29,7 +29,6 @@ lt:
         millions: "{{number}}M"
     dates:
       time: "H:mm"
-      time_with_zone: "H:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMMM D"
       full_no_year_no_time: "MMMM Do"
@@ -284,7 +283,6 @@ lt:
         bookmark: "Paspausk, kad pažymėtum pirmą įrašą šioje temoje"
         unbookmark: "Paspausk, kad pašalintum visas žymęs šioje temoje"
     bookmarks:
-      created: "jūs pažymėjot šį įrašą"
       remove: "Pašalinti Žymę"
       save: "Saugoti"
       reminders:
@@ -604,6 +602,10 @@ lt:
       private_message: "Žinutės"
       private_messages: "Žinutės"
       user_notifications:
+        filters:
+          all: "Visi"
+          read: "Skaitykite"
+          unread: "Neperskaitytos"
         ignore_duration_username: "Slapyvardis"
         ignore_duration_save: "Ignoruoti"
         mute_option: "Nutildyta"
@@ -983,6 +985,7 @@ lt:
     assets_changed_confirm: "Ši svetainė ka tik buvo atnaujinta. Perkrauti, kad matytumėte naujausią versiją?"
     logout: "Jūs buvote atjungtas nuo sistemos."
     refresh: "Atnaujinti"
+    home: "Pradinis"
     read_only_mode:
       enabled: "Puslapis veikia skaitymo (read only) režimu. Gali ieškoti, atsakinėti ar spausti \"patinka\", tačiau kitos funkcijos šiuo metu yra negalimos."
       login_disabled: "Prisijungimas yra išjungtas, kai svetainė yra skaitymo režime."
@@ -2967,6 +2970,8 @@ lt:
           likes_received: "Gauta patikimų"
           likes_received_days: "Gauta patikimų: unikalios dienos"
           likes_received_users: "Gauta patikimų: unikalūs vartotojai"
+          suspended: "Sustabdytas (6 Mėnesiai)"
+          silenced: "Užtildytas (6 Mėnesiai)"
           qualifies: "Atitinka 3 pasitikėjimo lygio reikalavimus."
           does_not_qualify: "Neatitinka 3 pasitikėjimo lygio reikalavimų."
           will_be_promoted: "Greitai bus paaukštintas."
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 5e021880d6..cc1725edd4 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -28,7 +28,6 @@ lv:
         millions: "{{number}} milj."
     dates:
       time: "hh:mm"
-      time_with_zone: "hh:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
@@ -249,7 +248,6 @@ lv:
         bookmark: "Uzklikšķiniet, lai pievienot šīs tēmas pirmo ierakstu grāmatzīmēm"
         unbookmark: "Uzklikšķiniet, lai noņemtu visas grāmatzīmes šai temā"
     bookmarks:
-      created: "tu esi pievienojies šim ierakstam grāmatzīmi"
       remove: "Noņemt grāmatzīmi"
       save: "Saglabāt"
       reminders:
@@ -538,6 +536,10 @@ lv:
       private_message: "Ziņa"
       private_messages: "Ziņas"
       user_notifications:
+        filters:
+          all: "Visi"
+          read: "Lasīts"
+          unread: "Nelasīts"
         ignore_duration_username: "Lietotājvārds"
         ignore_duration_when: "Ilgums:"
         ignore_duration_save: "Ignorēt"
@@ -1450,7 +1452,6 @@ lv:
           "2_8": "Jūs redzēsiet jauno atbilžu skaitu, jo sekojat šai sadaļai."
           "2_4": "Jūs redzēsiet jauno atbilžu skaitu, jo atbildējāt šajā tēmā."
           "2_2": "Jūs redzēsiet jauno atbilžu skaitu, jo jūs sekojat šai tēmai."
-          "2": 'Jūs redzēsiet jauno atbilžu skaitu, jo jūs <a href="{{basePath}}/u/{{username}}/preferences">lasījāt šo tēmu</a>.'
           "1_2": "Jūs saņemsiet paziņojumu, ja kāds pieminēs jūsu vārdu paziņos, ja @pseidonīmu vai atbildēs jums."
           "1": "Jūs saņemsiet paziņojumu, ja kāds pieminēs jūsu vārdu paziņos, ja @pseidonīmu vai atbildēs jums."
           "0_7": "Nesaņemt nekādus paziņojumus par šo sadaļu."
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 9782c2233e..cc40559e92 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -27,7 +27,6 @@ nb_NO:
         millions: "{{number}}M"
     dates:
       time: "LT"
-      time_with_zone: "LT (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D. MMMM"
@@ -255,7 +254,6 @@ nb_NO:
         bookmark: "Klikk for å bokmerke det første innlegget i dette emnet"
         unbookmark: "Klikk for å fjerne alle bokmerker i dette emnet"
     bookmarks:
-      created: "du har bokmerket dette innlegget"
       not_bookmarked: "bokmerk dette innlegget"
       remove: "Fjern bokmerke"
       confirm_clear: "Er du sikker på at du vil fjerne alle favoritter fra dette emnet?"
@@ -647,6 +645,10 @@ nb_NO:
       private_message: "Melding"
       private_messages: "Meldinger"
       user_notifications:
+        filters:
+          all: "Alle"
+          read: "Lest"
+          unread: "Uleste"
         ignore_duration_username: "Brukernavn"
         ignore_duration_save: "Ignorer"
         add_ignored_user: "Legg til …"
@@ -1065,6 +1067,7 @@ nb_NO:
     assets_changed_confirm: "Dette nettstedet ble nettopp oppdatert. Last inn siden på nytt nå for siste versjon?"
     logout: "Du ble logget ut"
     refresh: "Refresh"
+    home: "Hjem"
     read_only_mode:
       enabled: "Dette nettstedet er i lesemodus. Fortsett gjerne å lese, men du kan ikke svare, gi likes eller utføre andre handlinger som er slått av."
       login_disabled: "Innlogging er deaktivert mens nettsiden er i skrivebeskyttet modus."
@@ -1714,7 +1717,6 @@ nb_NO:
           "2_8": "Du vil se antall nye svar fordi du følger denne kategorien."
           "2_4": "Du vil se antall nye svar fordi du skrev et svar i dette emnet."
           "2_2": "Du vil se antall nye svar fordi du overvåker dette emnet."
-          "2": 'Du vil se antall nye svar fordi du <a href="{{basePath}}/u/{{username}}/preferences">leste dette emnet</a>.'
           "1_2": "Du vil bli varslet om noen nevner @navnet ditt eller svarer på innlegget ditt."
           "1": "Du vil bli varslet om noen nevner @navnet ditt eller svarer på innlegget ditt."
           "0_7": "Du ignorerer alle varsler i denne kategorien."
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index e69cca0469..af96cc75c7 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -264,10 +264,10 @@ nl:
         unbookmark: "Klik om alle bladwijzers in dit topic te verwijderen"
         unbookmark_with_reminder: "Klik om alle bladwijzers en herinneringen in dit topic te verwijderen. U hebt voor dit topic een herinnering ingesteld voor %{reminder_at}."
     bookmarks:
-      created: "u hebt een bladwijzer voor dit bericht gemaakt"
+      created: "u hebt een bladwijzer voor dit bericht gemaakt%{name}"
       not_bookmarked: "bladwijzer voor dit bericht maken"
-      created_with_reminder: "u hebt een bladwijzer voor dit bericht gemaakt met een herinnering voor %{date}"
-      created_with_at_desktop_reminder: "u hebt een bladwijzer voor dit bericht gemaakt en wordt de volgende keer dat u uw computer gebruikt herinnerd"
+      created_with_reminder: "u hebt een bladwijzer voor dit bericht gemaakt met een herinnering voor %{date}%{name}"
+      created_with_at_desktop_reminder: "u hebt een bladwijzer voor dit bericht gemaakt en wordt de volgende keer dat u uw computer gebruikt herinnerd%{name}"
       remove: "Bladwijzer verwijderen"
       delete: "Bladwijzer verwijderen"
       confirm_delete: "Weet u zeker dat u deze bladwijzer wilt verwijderen? De herinnering wordt ook verwijderd."
@@ -759,6 +759,10 @@ nl:
       private_message: "Bericht"
       private_messages: "Berichten"
       user_notifications:
+        filters:
+          all: "Alle"
+          read: "Gelezen"
+          unread: "Ongelezen"
         ignore_duration_title: "Negeertimer"
         ignore_duration_username: "Gebruikersnaam"
         ignore_duration_when: "Tijdsduur:"
@@ -1285,6 +1289,7 @@ nl:
     assets_changed_confirm: "Deze website is zojuist bijgewerkt. Nu vernieuwen om de nieuwste versie te laden?"
     logout: "U bent afgemeld."
     refresh: "Vernieuwen"
+    home: "Hoofdpagina"
     read_only_mode:
       enabled: "Deze website bevindt zich in alleen-lezenmodus. U kunt doorgaan met browsen, maar berichten beantwoorden, likes geven en andere acties zijn momenteel uitgeschakeld."
       login_disabled: "Aanmelden is uitgeschakeld zolang de website zich in alleen-lezenmodus bevindt."
@@ -1314,6 +1319,7 @@ nl:
     mute: Negeren
     unmute: Tonen
     last_post: Geplaatst
+    local_time: "Lokale tijd"
     time_read: Gelezen
     time_read_recently: "%{time_read} onlangs"
     time_read_tooltip: "%{time_read} totale leestijd"
@@ -2059,7 +2065,6 @@ nl:
           "2_8": "U ziet het aantal nieuwe antwoorden, omdat u deze categorie volgt."
           "2_4": "U ziet het aantal nieuwe antwoorden, omdat u een antwoord in dit topic hebt geplaatst."
           "2_2": "U ziet het aantal nieuwe antwoorden, omdat u dit topic volgt."
-          "2": 'U ziet het aantal nieuwe antwoorden, omdat u <a href="{{basePath}}/u/{{username}}/preferences">dit topic hebt gelezen</a>.'
           "1_2": "U ontvangt een melding als iemand uw @naam noemt of een bericht van u beantwoordt."
           "1": "U ontvangt een melding als iemand uw @naam noemt of een bericht van u beantwoordt."
           "0_7": "U negeert alle meldingen in deze categorie."
@@ -2480,6 +2485,7 @@ nl:
         create: "Bladwijzer maken"
         edit: "Bladwijzer bewerken"
         created: "Gemaakt"
+        updated: "Bijgewerkt"
         name: "Naam"
         name_placeholder: "Waar is deze bladwijzer voor?"
         set_reminder: "Mij herinneren"
@@ -2550,6 +2556,7 @@ nl:
       email_in_disabled_click: 'schakelt u de instelling ''e-mail in'' in.'
       mailinglist_mirror: "Categorie weerspiegelt een mailinglijst"
       show_subcategory_list: "Subcategorielijsten boven topics tonen in deze categorie"
+      read_only_banner: "Bannertekst wanneer een gebruiker geen topic in deze categorie kan maken:"
       num_featured_topics: "Aantal getoonde topics op de categoriepagina:"
       subcategory_num_featured_topics: "Aantal aanbevolen topics op pagina van bovenliggende categorie:"
       all_topics_wiki: "Nieuwe topics standaard wiki's maken"
@@ -2795,7 +2802,7 @@ nl:
         this_week: "Week"
         today: "Vandaag"
         other_periods: "eerste bekijken"
-    browser_update: 'Helaas is <a href="https://www.discourse.org/faq/#browser">uw browser te oud om met deze website te kunnen werken</a>. <a href="https://browsehappy.com">Upgrade uw browser</a>.'
+    browser_update: 'Helaas is <a href="https://www.discourse.org/faq/#browser">uw browser te oud om op deze website te kunnen werken</a>. <a href="https://browsehappy.com">Upgrade uw browser</a> om rijke inhoud te kunnen bekijken, u aan te melden, en te antwoorden.'
     permission_types:
       full: "Maken / Antwoorden / Bekijken"
       create_post: "Antwoorden / Bekijken"
@@ -3474,6 +3481,9 @@ nl:
           settings: "Instellingen"
           translations: "Vertalingen"
           extra_scss: "Extra SCSS"
+          extra_files: "Extra bestanden"
+          extra_files_upload: "Exporteer een thema om deze bestanden te bekijken."
+          extra_files_remote: "Exporteer een thema of controleer de git-repository om deze bestanden te bekijken."
           preview: "Voorbeeld"
           show_advanced: "Geavanceerde velden tonen"
           hide_advanced: "Geavanceerde velden verbergen"
@@ -3537,6 +3547,7 @@ nl:
           license: "Licentie"
           version: "Versie:"
           authors: "Geschreven door:"
+          creator: "Gemaakt door:"
           source_url: "Bron"
           enable: "Inschakelen"
           disable: "Uitschakelen"
@@ -4063,6 +4074,7 @@ nl:
               <p><b>Dit kan niet ongedaan worden gemaakt!</b></p>
 
               <p>Type het volgende om door te gaan: <code>%{text}</code></p>
+            text: "@%{username} naar @%{targetUsername} overdragen"
             transfer_and_delete: "Overdragen & @%{username} verwijderen"
             cancel: "Annuleren"
         merging_user: "Gebruiker samenvoegen..."
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 2db63526d8..fa7950b919 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -29,7 +29,6 @@ pl_PL:
         millions: "{{number}}M"
     dates:
       time: "H:mm"
-      time_with_zone: "H:mm (z)"
       time_short_day: "ddd, GG: mm"
       timeline_date: "MMM YYYY"
       long_no_year: "D MMM, GG: mm"
@@ -311,9 +310,7 @@ pl_PL:
         bookmark: "Kliknij, aby dodać pierwszy wpis tematu do zakładek"
         unbookmark: "Kliknij, aby usunąć wszystkie zakładki z tego tematu"
     bookmarks:
-      created: "zakładka dodana"
       not_bookmarked: "dodaj do zakładek"
-      created_with_at_desktop_reminder: "zakładka tego posta została dodana do zakładek, a następnym razem zostaniesz o tym powiadomiony"
       remove: "Usuń zakładkę"
       confirm_clear: "Czy na pewno chcesz usunąć wszystkie swoje zakładki ustawione w tym temacie?"
       save: "Zapisz"
@@ -831,6 +828,10 @@ pl_PL:
       private_message: "Wiadomość"
       private_messages: "Wiadomości"
       user_notifications:
+        filters:
+          all: "Wszystkie"
+          read: "Przeczytane"
+          unread: "Nieprzeczytane"
         ignore_duration_title: "Ignoruj licznik"
         ignore_duration_username: "Nazwa użytkownika"
         ignore_duration_when: "Oczekiwanie"
@@ -1373,6 +1374,7 @@ pl_PL:
     assets_changed_confirm: "Serwis został zmieniony, czy pozwolisz na przeładowanie strony w celu aktualizacji do najnowszej wersji?"
     logout: "Nastąpiło wylogowanie."
     refresh: "Odśwież"
+    home: "Strona główna"
     read_only_mode:
       enabled: "Strona jest w trybie tylko-do-odczytu. Możesz nadal przeglądać serwis, ale operacje takie jak postowanie, lajkowanie i inne są wyłączone."
       login_disabled: "Logowanie jest zablokowane, gdy strona jest w trybie tylko do odczytu."
@@ -2179,7 +2181,6 @@ pl_PL:
           "2_8": "Widzisz ilość nowych odpowiedzi, ponieważ śledzisz kategorię wątku."
           "2_4": "Widzisz ilość nowych odpowiedzi, ponieważ wypowiedziałeś się w tym wątku."
           "2_2": "Widzisz ilość nowych odpowiedzi, ponieważ śledzisz ten wątek."
-          "2": 'Widzisz ilość nowych odpowiedzi, ponieważ przeczytałeś <a href="{{basePath}}/u/{{username}}/preferences">ten wątek</a>.'
           "1_2": "Otrzymasz powiadomienie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis."
           "1": "Otrzymasz powiadomienie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis."
           "0_7": "Ignorujesz wszystkie powiadomienia z tej kategorii."
@@ -2597,6 +2598,7 @@ pl_PL:
             button: "HTML"
       bookmarks:
         created: "Utworzono"
+        updated: "Zaktualizowane"
         name: "Imię"
     category:
       can: "może&hellip; "
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 67fcbe27a9..8387963d2d 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -27,7 +27,6 @@ pt:
         millions: "{{number}}M"
     dates:
       time: "hh:mm"
-      time_with_zone: "hh:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM"
@@ -250,7 +249,6 @@ pt:
         bookmark: "Clique para adicionar um marcador à primeira publicação neste tópico"
         unbookmark: "Clique para remover todos os marcadores deste tópico"
     bookmarks:
-      created: "adicionou esta publicação aos marcadores"
       not_bookmarked: "adicionar esta publicação aos marcadores"
       remove: "Remover Marcador"
       confirm_clear: "De certeza que pretende remover todos os marcadores deste tópico?"
@@ -601,6 +599,10 @@ pt:
       private_message: "Mensagem"
       private_messages: "Mensagens"
       user_notifications:
+        filters:
+          all: "Todos"
+          read: "Lido"
+          unread: "Não Lido"
         ignore_duration_username: "Nome de utilizador"
         ignore_duration_save: "Ignorar"
         ignore_duration_time_frame_required: "Por favor selecione um intervalo de tempo"
@@ -1055,6 +1057,7 @@ pt:
     assets_changed_confirm: "Este site acabou se ser atualizado. Recarregar agora para a versão mais recente?"
     logout: "A sua sessão foi encerrada."
     refresh: "Atualizar"
+    home: "Início"
     read_only_mode:
       enabled: "Este site está no modo só de leitura. Por favor, continue a navegar, mas responder, gostar e outras ações estão de momento desativadas."
       login_disabled: "Enquanto o site se encontrar no modo só de leitura, a opção de iniciar a sessão está desativada."
@@ -1730,7 +1733,6 @@ pt:
           "2_8": "Irá ver uma contagem de novas respostas porque está a seguir esta categoria."
           "2_4": "Irá ver uma contagem de novas respostas porque publicou uma resposta a este tópico."
           "2_2": "Irá ver uma contagem de novas respostas porque está a seguir este tópico."
-          "2": 'Irá ver uma contagem de novas respostas porque <a href="{{basePath}}/u/{{username}}/preferences">leu este tópico</a>.'
           "1_2": "Será notificado se alguém mencionar o seu @nome ou responder-lhe."
           "1": "Será notificado se alguém mencionar o seu @nome ou responder-lhe."
           "0_7": "Está a ignorar todas as notificações nesta categoria."
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index bf673507c1..7281d53e48 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -27,7 +27,6 @@ pt_BR:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
-      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
@@ -262,9 +261,7 @@ pt_BR:
         bookmark: "Clique para adicionar o primeiro post deste tópico aos favoritos"
         unbookmark: "Clique para remover todos os favoritos neste tópico"
     bookmarks:
-      created: "você marcou esta postagem como favorita"
       not_bookmarked: "marcar postagem como favorita"
-      created_with_at_desktop_reminder: "você marcou esta postagem como favorita e será lembrado na próxima vez em que estiver em sua área de trabalho"
       remove: "Remover Favorito"
       confirm_clear: "Você tem certeza de que deseja apagar todos os seus favoritos deste tópico?"
       save: "Salvar"
@@ -746,6 +743,10 @@ pt_BR:
       private_message: "Mensagem"
       private_messages: "Mensagens"
       user_notifications:
+        filters:
+          all: "Tudo"
+          read: "Lido"
+          unread: "Não lidas"
         ignore_duration_title: "Ignorar Temporizador"
         ignore_duration_username: "Nome de Usuário"
         ignore_duration_when: "Duração:"
@@ -1264,6 +1265,7 @@ pt_BR:
     assets_changed_confirm: "Este site acabou de ser atualizado. Atualizar a página agora para ver a última versão?"
     logout: "Você foi desconectado."
     refresh: "Atualizar"
+    home: "Início"
     read_only_mode:
       enabled: "Este site está em modo de somente leitura. Por favor, continue a navegar, mas respostas, curtidas e outras ações estão desabilitadas por enquanto."
       login_disabled: "O login é desabilitado enquanto o site está em modo de somente leitura."
@@ -2015,7 +2017,6 @@ pt_BR:
           "2_8": "Você verá uma contagem de novas respostas porque está acompanhando esta categoria."
           "2_4": "Você verá uma contagem de novas respostas porque postou uma resposta a este tópico."
           "2_2": "Você verá uma contagem de novas respostas porque está acompanhando este tópico."
-          "2": 'Você verá uma contagem de novas respostas porque você <a href="{{basePath}}/u/{{username}}/preferences">leu este tópico</a>.'
           "1_2": "Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem."
           "1": "Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem."
           "0_7": "Você está ignorando todas as notificações nesta categoria."
@@ -2419,6 +2420,7 @@ pt_BR:
       bookmarks:
         create: "Criar marcador"
         created: "Criado"
+        updated: "Atualizado"
         name: "Nome"
     category:
       can: "pode&hellip; "
@@ -2725,7 +2727,6 @@ pt_BR:
         this_week: "Semana"
         today: "Hoje"
         other_periods: "Veja o topo"
-    browser_update: 'Infelizmente, <a href="https://www.discourse.org/faq/#browser">o seu navegador é muito antigo para funcionar neste site</a>. Por favor, <a href="https://browsehappy.com">atualize o seu navegador</a>.'
     permission_types:
       full: "Criar / Responder / Ver"
       create_post: "Responder / Ver"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 51d21ec82b..ac52c6da86 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -28,7 +28,6 @@ ro:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
-      time_with_zone: "HH:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "DD MMM"
       full_no_year_no_time: "Do MMMM "
@@ -257,7 +256,6 @@ ro:
         bookmark: "Click pentru a adăuga semn de carte la subiectul acesta"
         unbookmark: "Click pentru a șterge semnele de carte"
     bookmarks:
-      created: "Ai pus semn de carte pe acest mesaj"
       remove: "Șterge semn de carte"
       save: "Salvează"
       reminders:
@@ -585,6 +583,10 @@ ro:
       private_message: "Mesaj"
       private_messages: "Mesaje"
       user_notifications:
+        filters:
+          all: "Toate"
+          read: "Citite"
+          unread: "Necitite"
         ignore_duration_username: "Nume utilizator"
         ignore_duration_save: "Ignoră"
         mute_option: "Setate pe silențios"
@@ -988,6 +990,7 @@ ro:
     assets_changed_confirm: "Acest site tocmai a fost actualizat. Reîmprospătați pentru cea mai nouă versiune?"
     logout: "Aţi fost deconectat."
     refresh: "Reîmprospătează"
+    home: "Acasă"
     read_only_mode:
       enabled: "Acest site se află în modul exclusiv-citire. Te rugăm să continui să răsfoiești, însă sunt dezactivate acțiunile de răspuns, apreciere și altele. "
       login_disabled: "Autentificarea este dezactivată când siteul este în modul exclusiv-citire."
@@ -1567,7 +1570,6 @@ ro:
           "3_1": "Vei primi notificări deoarece ai creat acest subiect."
           "3": "Vei primi notificări deoarece urmărești activ acest subiect."
           "2_2": "Vei vedea numărul răspunsurilor noi deoarece urmărești acest subiect."
-          "2": 'Vei vedea numărul răspunsurilor noi deoarece <a href="{{basePath}}/u/{{username}}/preferences">citești acest subiect</a>'
           "1_2": "Vei fi notificat dacă cineva îți menționează @numele sau îți scrie un răspuns."
           "1": "Vei fi notificat dacă cineva îți menționează @numele sau îți scrie un răspuns."
           "0_7": "Ignori toate notificările din această categorie."
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 540448bc35..f37d3bd052 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -29,7 +29,7 @@ ru:
         millions: "{{number}} млн."
     dates:
       time: "HH:mm"
-      time_with_zone: "HH:mm (z)"
+      time_with_zone: "HH:mm (местное)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year: "D MMM, HH:mm"
@@ -312,10 +312,10 @@ ru:
         unbookmark: "Удалить все закладки в этой теме"
         unbookmark_with_reminder: "Нажмите для удаления всех закладок и напоминаний в этой теме. У вас уже есть напоминание для этой темы, настроенное на %{reminder_at}."
     bookmarks:
-      created: "Вы добавили это сообщение в закладки"
+      created: "Вы добавили это сообщение в закладки под именем %{name}"
       not_bookmarked: "Добавить сообщение в закладки"
-      created_with_reminder: "Вы добавили это сообщение в закладки с последующим напоминанием %{date}"
-      created_with_at_desktop_reminder: "Вы добавили это сообщение в закладки с последующим напоминанием, когда вы откроете это сообщение на настольном компьютере"
+      created_with_reminder: "Вы добавили это сообщение в закладки под именем %{name}с последующим напоминанием %{date} "
+      created_with_at_desktop_reminder: "Вы добавили это сообщение в закладки под именем %{name} с последующим напоминанием, когда вы откроете это сообщение на настольном компьютере"
       remove: "Удаление закладки"
       delete: "Удалить закладку"
       confirm_delete: "Вы действительно хотите удалить эту закладку? Напоминание также будет удалено."
@@ -839,6 +839,10 @@ ru:
       private_message: "Личное сообщение"
       private_messages: "Личные сообщения"
       user_notifications:
+        filters:
+          all: "Всего"
+          read: "Прочитано"
+          unread: "Непрочитанные"
         ignore_duration_title: "Игнорировать таймер"
         ignore_duration_username: "Псевдоним"
         ignore_duration_when: "Продолжительность:"
@@ -894,7 +898,7 @@ ru:
       allow_private_messages: "Разрешить другим пользователям отправлять мне личные сообщения"
       external_links_in_new_tab: "Открывать все внешние ссылки в новой вкладке"
       enable_quoting: "Позволить отвечать с цитированием выделенного текста"
-      enable_defer: "Включить кнопку отложить, чтобы помечать темы, как непрочитанные"
+      enable_defer: "Включить кнопку 'Отложить', чтобы помечать темы как непрочитанные"
       change: "изменить"
       featured_topic: "Избранная тема"
       moderator: "{{user}} — модератор"
@@ -1383,8 +1387,9 @@ ru:
       dismiss_error: "Отклонить ошибку"
     close: "Закрыть"
     assets_changed_confirm: "Сайт только что был обновлён. Перезагрузить страницу для перехода к новой версии?"
-    logout: "Вы вышли."
+    logout: "Необходимо заново войти в систему."
     refresh: "Обновить"
+    home: "Вернуться"
     read_only_mode:
       enabled: "Сайт работает в режиме \"только для чтения\". Сейчас вы можете продолжать просматривать сайт, но другие действия будут недоступны. "
       login_disabled: "Вход отключён, пока сайт в режиме «только для чтения»"
@@ -1414,6 +1419,7 @@ ru:
     mute: Отключить
     unmute: Включить
     last_post: Последнее сообщение
+    local_time: "Местное время"
     time_read: Прочитанные
     time_read_recently: "%{time_read} недавно"
     time_read_tooltip: "%{time_read} общее время чтения"
@@ -1612,7 +1618,7 @@ ru:
       from: От
       to: Кому
       errors:
-        to_before_from: "На сегодняшний день должно быть позже, чем с даты."
+        to_before_from: "Последующая дата должна быть больше предыдущей."
     emoji_picker:
       filter_placeholder: Искать emoji
       smileys_&_emotion: Смайлики и эмоции
@@ -2199,7 +2205,6 @@ ru:
           "2_8": "Вы увидите количество новых ответов, поскольку следите за этим разделом."
           "2_4": "Вы увидите количество новых ответов, поскольку вы размещали ответ в этой теме."
           "2_2": "Вы увидите количество новых ответов, поскольку следите за этой темой."
-          "2": 'Вы увидите количество новых ответов, поскольку <a href="{{basePath}}/u/{{username}}/preferences">читали эту тему</a>.'
           "1_2": "Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам."
           "1": "Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам."
           "0_7": "Не получать уведомлений из этого раздела."
@@ -2670,6 +2675,7 @@ ru:
         create: "Создать закладку"
         edit: "Изменить закладку"
         created: "Создано"
+        updated: "Обновлено"
         name: "Имя"
         name_placeholder: "Присвойте имя закладке (необязательно) "
         set_reminder: "Настроить напоминание (необязательно) "
@@ -2740,6 +2746,7 @@ ru:
       email_in_disabled_click: 'активируйте настройку "email in".'
       mailinglist_mirror: "Категория отражает список рассылки"
       show_subcategory_list: "Показывать список подразделов над списком тем в этом разделе."
+      read_only_banner: "Текст баннера, когда пользователь не может создавать темы в этом разделе:"
       num_featured_topics: "Количество тем на странице разделов"
       subcategory_num_featured_topics: "Количество избранных тем на странице родительского раздела:"
       all_topics_wiki: "Создание новых тем Wikis по умолчанию"
@@ -3015,7 +3022,7 @@ ru:
         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: "Отвечать / Просматривать"
@@ -3083,7 +3090,7 @@ ru:
         next_business_day: "%{shortcut} На следующий рабочий день"
         custom: "%{shortcut} Установить дату и время напоминания"
         none: "%{shortcut} Не настраивать напоминание"
-        delete: "%{shortcut}Удалить закладку"
+        delete: "%{shortcut} Удалить закладку"
       actions:
         title: "Темы"
         bookmark_topic: "%{shortcut} Добавить / удалить из закладок"
@@ -3298,7 +3305,7 @@ ru:
         title: "Список доступных отчетов"
       dashboard:
         title: "Админка"
-        last_updated: "Приборная панель обновлена:"
+        last_updated: "Админка обновлена:"
         discourse_last_updated: "Discourse обновлен:"
         version: "Версия"
         up_to_date: "Обновлений нет"
@@ -3427,6 +3434,7 @@ ru:
             effects: Эффекты
             trust_levels_none: "Отсутствует"
             automatic_membership_email_domains: "Пользователи, зарегистрированные c адресом электронной почты, который точно совпадает с доменом в этом списке, будут автоматически добавлены в эту группу: "
+            automatic_membership_user_count: "Следующее количество пользователей с новым почтовым доменом будут добавлены в группу: %{count}."
             primary_group: "Автоматически устанавливается в качестве основной группы"
         name_placeholder: "Название группы, без пробелов, по тем же правилам, что и для псевдонимов."
         primary: "Основная группа"
@@ -3720,6 +3728,9 @@ ru:
           settings: "Настройки"
           translations: "Переводы"
           extra_scss: "Дополнительные SCSS"
+          extra_files: "Дополнительные файлы"
+          extra_files_upload: "Экспортируйте тему для просмотра файлов."
+          extra_files_remote: "Экспортируйте тему или откройте соответствующий git-репозиторий для просмотра файлов."
           preview: "Предпросмотр"
           show_advanced: "Показать дополнительные поля"
           hide_advanced: "Скрыть дополнительные поля"
@@ -3783,6 +3794,7 @@ ru:
           license: "Лицензия"
           version: "Версия:"
           authors: "Автор:"
+          creator: "Создано:"
           source_url: "Источник"
           enable: "Включить"
           disable: "Отключить"
@@ -4313,6 +4325,7 @@ ru:
               <p><b>Операция не может быть отменена!</b></p>
 
               <p>Для продолжения введите: <code>%{text}</code></p>
+            text: "объединить пользователя @%{username} с пользователем @%{targetUsername}"
             transfer_and_delete: "Объединить контент и удалить пользователя @%{username}"
             cancel: "Отмена"
         merging_user: "Объединение пользователей..."
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 2fec5c9696..c64a0a1316 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -29,7 +29,6 @@ sk:
         millions: "{{number}}mil"
     dates:
       time: "h:mm a"
-      time_with_zone: "h:mm a (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
@@ -283,7 +282,6 @@ sk:
         bookmark: "Kliknutím vložíte záložku na prvý príspevok tejto témy"
         unbookmark: "Kliknutím odstánite všetky záložky v tejto téme"
     bookmarks:
-      created: "záložka bola pridaná"
       not_bookmarked: "Vytvor záložku na tento príspevok"
       remove: "Odstrániť záložku"
       confirm_clear: "Ste si istý, že chcete odstrániť všetky záložky z tejto témy?"
@@ -624,6 +622,10 @@ sk:
       private_message: "Správa"
       private_messages: "Správy"
       user_notifications:
+        filters:
+          all: "Všetky"
+          read: "Prečítané"
+          unread: "Neprečítané"
         ignore_duration_username: "Používateľské meno"
         mute_option: "Ignorované"
         normal_option: "Normálne"
@@ -1049,6 +1051,7 @@ sk:
     assets_changed_confirm: "Táto stránka bola práve aktualizovaná. Obnoviť na najnovšiu verziu?"
     logout: "Boli ste odhlásený."
     refresh: "Obnoviť"
+    home: "Domov"
     read_only_mode:
       enabled: "Stránky sú v móde iba na čítanie. Prosím pokračujte v prezeraní, ale iné akcie, ako odpovedanie, dávanie páči sa mi alebo niektové ďalšie sú teraz vypnuté."
       login_disabled: "Keď je zapnutý mód iba na čítanie, prihlásenie nie je možné."
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 4f707df6d0..a7331197f2 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -29,7 +29,6 @@ sl:
         millions: "{{number}}M"
     dates:
       time: "H:mm"
-      time_with_zone: "H:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D. MMMM"
@@ -305,7 +304,6 @@ sl:
         bookmark: "ustvari zaznamek prvega prispevka v tej temi"
         unbookmark: "odstrani vse zaznamke v tej temi"
     bookmarks:
-      created: "ustvarili ste zaznamek prispevka"
       not_bookmarked: "zaznamuj prispevek"
       remove: "Odstrani zaznamek"
       confirm_clear: "Ste prepričani, da želite odstraniti vse svoje zaznamke iz te teme?"
@@ -742,6 +740,10 @@ sl:
       private_message: "Zasebno sporočilo"
       private_messages: "Zasebna sporočila"
       user_notifications:
+        filters:
+          all: "Vsi"
+          read: "Čas branja"
+          unread: "Neprebrane"
         ignore_duration_title: "Prezri opomnik"
         ignore_duration_username: "Uporabniško ime"
         ignore_duration_when: "Trajanje:"
@@ -1238,6 +1240,7 @@ sl:
     assets_changed_confirm: "Stran ji bala pravkar posodobljena. Osvežimo takoj za zadnjo verzijo?"
     logout: "Bili ste odjavljeni."
     refresh: "Osveži"
+    home: "Domov"
     read_only_mode:
       enabled: "Stran je v načinu samo za branje. Lahko nadaljujete z branjem; odgovori, všečki in druga dejanja pa so onemogočena za zdaj."
       login_disabled: "Prijava je onemogočena dokler je stran v načinu za branje."
@@ -1996,7 +1999,6 @@ sl:
           "2_8": "Videli boste število novih odgovorov, ker sledite tej kategoriji."
           "2_4": "Videli boste število novih odgovorov, ker ste objavili odgovor na to temo."
           "2_2": "Videli boste število novih odgovorov, ker sledite tej temi."
-          "2": 'Videli boste število novih odgovorov, ker ste <a href="{{basePath}}/u/{{username}}/preferences">prebrali to temo</a>.'
           "1_2": "Obveščeni boste, če nekdo omeni vaše @ime ali vam odgovori."
           "1": "Obveščeni boste, če nekdo omeni vaše @ime ali vam odgovori."
           "0_7": "Ignorirate vsa obvestila za to kategorijo."
@@ -2761,7 +2763,6 @@ sl:
         this_week: "Teden"
         today: "Danes"
         other_periods: "poglej najboljše"
-    browser_update: 'Nažalost, <a href="https://www.discourse.org/faq/#browser">vaš brskalnik je preveč zastarel za to spletno stran</a>. <a href="https://browsehappy.com">Nadgradite vaš brskalnik</a>.'
     permission_types:
       full: "Ustvari / Odgovori / Vidi"
       create_post: "Odgovori / Vidi"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index f4e4997c20..1f61668a5f 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -27,7 +27,6 @@ sq:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
-      time_with_zone: "h:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
@@ -215,7 +214,6 @@ sq:
         bookmark: "Kliko për të shtuar tek të preferuarat e tua postimin e parë të kësaj teme."
         unbookmark: "Kliko për të hequr të preferuarat nga kjo temë"
     bookmarks:
-      created: "ju ruajtët këtë temë tek të preferuarat tuaja"
       remove: "Hiqeni nga të prefereruarat"
       save: "Ruaj"
     drafts:
@@ -459,6 +457,10 @@ sq:
       private_message: "Mesazh"
       private_messages: "Mesazhet"
       user_notifications:
+        filters:
+          all: "Të gjitha"
+          read: "Lexo"
+          unread: "Të palexuara"
         ignore_duration_username: "Emri i përdoruesit"
         mute_option: "Pa njoftime"
         normal_option: "Normal"
@@ -816,6 +818,7 @@ sq:
     assets_changed_confirm: "Faqja u azhornua. Doni t'a rifreskoni tani për versionin e fundit?"
     logout: "Ju jeni shkëputur!"
     refresh: "Rifresko"
+    home: "Kryefaqja"
     read_only_mode:
       enabled: "Faqja lejon vetëm leximet per momentin. Mund të vazhdoni të shfletoni, por përgjigjet, pëlqimet dhe veprime të tjera janë të çaktivizuara përkohësisht."
       login_disabled: "Nuk mund të hyni në faqe sepse faqja është përkohësisht në formatin vetëm-lexim."
@@ -1234,7 +1237,6 @@ sq:
           "2_8": "Ju do të shikoni numrin e përgjigjeve të reja sepse jeni duke gjurmuar këtë kategori. "
           "2_4": "Ju do të shikoni numrin e përgjigjeve të reja sepse ju postuat një përgjigje në këtë temë. "
           "2_2": "Ju do të shikoni numrin e përgjigjeve të reja sepse jeni duke gjurmuar këtë temë. "
-          "2": 'Ju do të shikoni numrin e përgjigjeve të reja sepse ju <a href="{{basePath}}/u/{{username}}/preferences">lexuat këtë temë</a>.'
           "1_2": "Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. "
           "1": "Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. "
           "0_7": "Ju nuk do të merrni asnjë njoftim për temat në këtë kategori. "
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index ddf56cf62c..10b5d12881 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -28,7 +28,6 @@ sr:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
-      time_with_zone: "HH:mm (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
@@ -248,7 +247,6 @@ sr:
         bookmark: "Klikni da markiraš prvi post u ovoj temi"
         unbookmark: "Klikni da bi obirsao sve markere sa ove teme"
     bookmarks:
-      created: "markirao si ovu poruku"
       remove: "Obriši marker"
       save: "Sačuvaj"
     drafts:
@@ -450,6 +448,10 @@ sr:
       private_message: "Privatna poruka"
       private_messages: "Poruke"
       user_notifications:
+        filters:
+          all: "Sve"
+          read: "Pročitano"
+          unread: "Nepročitano"
         ignore_duration_username: "Korisničko ime"
         mute_option: "Utišano"
         normal_option: "Normalno"
@@ -749,6 +751,7 @@ sr:
     assets_changed_confirm: "Ova stranica je upravo ažurirana. Osveži sada za najnoviju verziju?"
     logout: "Odjavljeni ste."
     refresh: "Osveži"
+    home: "Home"
     read_only_mode:
       login_disabled: "Prijave su onemogućene dok je stranica u modulu \"samo čitanje\"."
     learn_more: "saznaj više..."
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 0a5078294b..ce299b9c5f 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -27,7 +27,7 @@ sv:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
-      time_with_zone: "h:mm a (z)"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year: "D MMM, HH:mm"
@@ -264,10 +264,10 @@ sv:
         unbookmark: "Klicka för att radera alla bokmärken i ämnet"
         unbookmark_with_reminder: "Markera för att ta bort alla bokmärken samt påminnelser för detta ämne. Du har en påminnelse inställd till %{reminder_at} för detta ämne."
     bookmarks:
-      created: "du har bokmärkt detta inlägg"
+      created: "du har bokmärkt detta inlägg %{name}"
       not_bookmarked: "bokmärk detta inlägg"
-      created_with_reminder: "du har bokmärkt detta inlägg med en påminnelse %{date}"
-      created_with_at_desktop_reminder: "du har bokmärkt detta inlägg och kommer att påminnas nästa gång du är vid din dator"
+      created_with_reminder: "du har bokmärkt detta inlägg med en påminnelse %{date}%{name}"
+      created_with_at_desktop_reminder: "du har bokmärkt detta inlägg och kommer att påminnas nästa gång du är vid din dator%{name}"
       remove: "Ta bort bokmärke"
       delete: "Radera bokmärke"
       confirm_delete: "Är du säker på att du vill radera det här bokmärket? Påminnelsen kommer också att raderas."
@@ -759,6 +759,10 @@ sv:
       private_message: "Meddelande"
       private_messages: "Meddelanden"
       user_notifications:
+        filters:
+          all: "Alla"
+          read: "Läst"
+          unread: "Olästa"
         ignore_duration_title: "Ignorera timer"
         ignore_duration_username: "Användarnamn"
         ignore_duration_when: "Varaktighet:"
@@ -1285,6 +1289,7 @@ sv:
     assets_changed_confirm: "Den här webbplatsen uppdaterades precis. Uppdatera för att se den senaste versionen?"
     logout: "Du loggades ut."
     refresh: "Uppdatera"
+    home: "Hem"
     read_only_mode:
       enabled: "Webbplatsen är i skrivskyddat läge. Du kan fortsätta bläddra på sidan, men att skriva inlägg, gilla och andra interaktioner är inaktiverade för tillfället."
       login_disabled: "Det går inte att logga in medan siten är i skrivskyddat läge."
@@ -1314,6 +1319,7 @@ sv:
     mute: Tysta
     unmute: Avtysta
     last_post: Senaste
+    local_time: "Lokal tid"
     time_read: Läst
     time_read_recently: "%{time_read} nyligen"
     time_read_tooltip: "%{time_read} total lästid"
@@ -2059,7 +2065,6 @@ sv:
           "2_8": "Du kommer se en räknare för nya svar eftersom du följer denna kategorin."
           "2_4": "Du kommer se en räknare för nya svar eftersom du postat ett svar i detta ämne."
           "2_2": "Du kommer se en räknare för nya svar eftersom du följer detta ämne."
-          "2": 'Du kommer se en räknare för nya svar eftersom du <a href="{{basePath}}/u/{{username}}/preferences">läser detta ämne</a>. '
           "1_2": "Du kommer få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg."
           "1": "Du kommer få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg."
           "0_7": "Du ignorerar alla notifikationer i den här kategorin."
@@ -2480,6 +2485,7 @@ sv:
         create: "Skapa bokmärke"
         edit: "Redigera bokmärke"
         created: "Skapad"
+        updated: "Uppdaterad"
         name: "Namn"
         name_placeholder: "Vad används detta bokmärke till?"
         set_reminder: "Påminn mig"
@@ -2550,6 +2556,7 @@ sv:
       email_in_disabled_click: 'aktivera "inkommande e-post" inställningen.'
       mailinglist_mirror: "Kategori speglar en e-postlista"
       show_subcategory_list: "Visa listan med underkategorier ovanför ämnen i denna kategori."
+      read_only_banner: "Banderoll text när en användare inte kan skapa ett ämne i denna kategorin:"
       num_featured_topics: "Antal ämnen som visas på sidan kategorier:"
       subcategory_num_featured_topics: "Antalet favoriserade ämnen på överordnad kategorisida:"
       all_topics_wiki: "Gör nya ämnen till wikis som standard"
@@ -2795,7 +2802,7 @@ sv:
         this_week: "Vecka"
         today: "Idag"
         other_periods: "se toppen för:"
-    browser_update: 'Tyvärr, <a href="https://www.discourse.org/faq/#browser">din webbläsare är för gammal för att fungera på den här sidan</a>. Vänligen <a href="https://browsehappy.com">uppgradera din webbläsare</a>. '
+    browser_update: 'Tyvärr, <a href="https://www.discourse.org/faq/#browser">din webbläsare är för gammal för att fungera på den här sidan</a>. Vänligen <a href="https://browsehappy.com">uppgradera din webbläsare</a> för att visa formaterat innehåll, logga in eller svara. '
     permission_types:
       full: "Skapa / svara / se"
       create_post: "Svara / se"
@@ -3474,6 +3481,9 @@ sv:
           settings: "Inställningar"
           translations: "Översättningar"
           extra_scss: "Extra SCSS"
+          extra_files: "Extra filer"
+          extra_files_upload: "Exportera temat för att visa dessa filer."
+          extra_files_remote: "Exportera temat eller kontrollera gitförvaringen för att visa dessa filer."
           preview: "Förhandsgranska"
           show_advanced: "Visa avancerade fält"
           hide_advanced: "Dölj avancerade fält"
@@ -3537,6 +3547,7 @@ sv:
           license: "Licens"
           version: "Version:"
           authors: "Författad av:"
+          creator: "Skapad av:"
           source_url: "Källa"
           enable: "Aktivera"
           disable: "Inaktivera"
@@ -4063,6 +4074,7 @@ sv:
               <p><b>Detta kan inte ångras!</b></p>
 
               <p>För att fortsätta skriv: <code>%{text}</code></p>
+            text: "överför @%{username} till @%{targetUsername}"
             transfer_and_delete: "Överför & radera @%{username}"
             cancel: "Avbryt"
         merging_user: "Slår samman användare..."
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 3bab45669c..2b513eeede 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -27,7 +27,6 @@ sw:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
-      time_with_zone: "h:mm a (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
@@ -233,7 +232,6 @@ sw:
         bookmark: "Bonyeza kualamisha chapisho la kwanza kwenye mada hii"
         unbookmark: "Bofya kuondoa mialamisho yote kwenye mada hii"
     bookmarks:
-      created: "umealamisha chapisho hili"
       not_bookmarked: "alamisha chapisho hili"
       remove: "Ondoa Alamisho"
       confirm_clear: "Una uhakika unataka kuondoa mialamisho ya mada hii?"
@@ -558,6 +556,10 @@ sw:
       private_message: "Ujumbe"
       private_messages: "Ujumbe"
       user_notifications:
+        filters:
+          all: "Zote"
+          read: "Soma"
+          unread: "Haijasomwa"
         ignore_duration_username: "Jina la mtumiaji"
         ignore_duration_save: "Puuzia"
         mute_option: "Imenyamazishwa"
@@ -966,6 +968,7 @@ sw:
     assets_changed_confirm: "Tovuti hii imesasishwa hivi karibuni. Rudisha tena kupata toleo la hivi karibuni?"
     logout: "Ulitolewa."
     refresh: "Rudisha Tena"
+    home: "Nyumbani"
     read_only_mode:
       enabled: "Tovuti hii ipo kwenye hali-tumizi ya usomaji tu. Tafadhali endelea kuperuzi, lakini kujibu, kupenda na vitendo vingine vimesitishwa kwa sasa."
       login_disabled: "Kuingia kumesitishwa kipindi tovuti ipo kwenye hali-tumizi ya kusoma tu."
@@ -1603,7 +1606,6 @@ sw:
           "2_8": "Utaona jumla ya majibu mapya kwa sababu unafuatilia kategoria hii."
           "2_4": "Utaweza kuona jumla ya majibu mapya kwa sababu ulichapisha jibu kwenye mada hii."
           "2_2": "Utaweza kuona jumla ya majibu mapya kwa sababu unafuatilia mada hii."
-          "2": 'Utaweza kuona jumla ya majibu mapya kwa sababu uli<a href="{{basePath}}/u/{{username}}/preferences">soma mada hii</a>.'
           "1_2": "Utajulishwa kama mtu akitaja @jina lako au akikujibu."
           "1": "Utajulishwa kama mtu akitaja @jina lako au akikujibu."
           "0_7": "Unapuuzia taarifa za kategoria hii."
@@ -2142,7 +2144,6 @@ sw:
         this_week: "Wiki"
         today: "Leo"
         other_periods: "tazama juu"
-    browser_update: 'Kwa bahati mbaya, <a href="https://www.discourse.org/faq/#browser">kivinjari unachotumia kimepita mda na hakiwezi kufungua tovuti hii</a>. Tafadhali <a href="https://browsehappy.com">sasisha kivinjari chako</a>.'
     permission_types:
       full: "Tengeneza / Jibu / Angalia"
       create_post: "Jibu / Angalia"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index a6e245faf5..39e4382963 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -24,7 +24,6 @@ te:
             tb: టీబీ
     dates:
       time: "h:mm a"
-      time_with_zone: "h:mm a (z)"
       long_no_year_no_time: "MMM D"
       long_with_year: "MMM D, YYYY h:mm a"
       long_with_year_no_time: "MMM D, YYYY"
@@ -162,7 +161,6 @@ te:
         bookmark: "ఈ అంశంపై మొదటి టపాకి పేజీకలను పెట్టండి"
         unbookmark: "ఈ అంశంపై అన్ని పేజీకలను తొలగించడానికి నొక్కండి"
     bookmarks:
-      created: "ఈ టపాకు పేజీక ఉంచారు"
       remove: "పేజీక తొలగించండి"
       save: "భద్రపరచు"
       reminders:
@@ -350,6 +348,10 @@ te:
         rate_limit_error: "టపాలు కేవలం రోజుకు ఒకసారి మాత్రమే దిగుమతించుకోగలరు. దయచేసి రేపు ప్రయత్నించండి."
       private_messages: "సందేశాలు"
       user_notifications:
+        filters:
+          all: "అన్నీ"
+          read: "చదివిన"
+          unread: "చదవని"
         ignore_duration_username: "వాడుకరి పేరు"
         mute_option: "నిశ్శబ్దం"
       activity_stream: "కలాపం"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index a9c73f525d..3d9a939289 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -26,7 +26,6 @@ th:
         millions: "{{number}}ล้าน"
     dates:
       time: "h:mm a"
-      time_with_zone: "h:mm a (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
@@ -198,7 +197,6 @@ th:
         bookmark: "คลิกเพื่อ บุ๊คมาร์ค ที่โพสแรกของกระทู้นี้"
         unbookmark: "คลิกเพื่อลบบุ๊คมาร์คทั้งหมดในกระทู้นี้"
     bookmarks:
-      created: "คุณได้ทำบุ๊คม๊าคโพสแล้ว"
       remove: "ลบบุ๊คม๊าค"
       save: "บันทึก"
     drafts:
@@ -440,6 +438,10 @@ th:
       private_message: "ข้อความส่วนตัว"
       private_messages: "ข้อความ"
       user_notifications:
+        filters:
+          all: "ทั้งหมด"
+          read: "อ่าน"
+          unread: "ยังไม่อ่าน"
         ignore_duration_username: "ชื่อผู้ใช้"
         mute_option: "ปิด"
         normal_option: "ปกติ"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 066a38b339..9f80b0e39f 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -27,7 +27,6 @@ tr_TR:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
-      time_with_zone: "h:mm a (z)"
       time_short_day: "ggg, SS:dd"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
@@ -261,7 +260,6 @@ tr_TR:
         bookmark: "Bu konudaki ilk gönderiyi işaretlemek için tıkla"
         unbookmark: "Bu konudaki tüm işaretlenenleri kaldırmak için tıkla"
     bookmarks:
-      created: "bu gönderiyi işaretledin"
       not_bookmarked: "bu yazıya yer işareti koy"
       remove: "İşareti Kaldır"
       confirm_clear: "Bu konudaki tüm yer işaretlerinizi silmek istediğinizden emin misiniz?"
@@ -741,6 +739,10 @@ tr_TR:
       private_message: "Mesaj"
       private_messages: "Mesajlar"
       user_notifications:
+        filters:
+          all: "Tümü"
+          read: "Okunan"
+          unread: "Okunmamış"
         ignore_duration_title: "Zamanlayıcıyı Yoksay"
         ignore_duration_username: "Kullanıcı Adı"
         ignore_duration_when: "Süre:"
@@ -1252,6 +1254,7 @@ tr_TR:
     assets_changed_confirm: "Bu site henüz güncellendi. Son hali için sayfayı yenilemek ister misin?"
     logout: "Çıkış yaptın."
     refresh: "Yenile"
+    home: "Anasayfa"
     read_only_mode:
       enabled: "Bu site salt-okunur modda. Lütfen taramaya devam et, ancak yanıtlama, beğenme ve diğer eylemler şu an için devre dışı durumda. "
       login_disabled: "Site salt-okunur modda iken giriş işlemi devre dışı bırakılır ."
@@ -2006,7 +2009,6 @@ tr_TR:
           "2_8": "Bu kategoriyi takip ettiğiniz için yeni cevapların sayısını göreceksiniz."
           "2_4": "Bu konuyu yanıtladığınız için yeni cevapların sayısını göreceksiniz."
           "2_2": "Bu konuyu takip ettiğiniz için yeni cevapların sayısını göreceksiniz."
-          "2": 'Yeni cevapların sayısını göreceksiniz çünkü <a href="{{basePath}}/u/{{username}}/preferences">bu konuyu okudunuz</a>.'
           "1_2": "Birisi @isminden bahsederse ya da sana cevap verirse bildirim alacaksın."
           "1": "Birisi @isminden bahsederse veya sana cevap verirse bildirim alacaksın."
           "0_7": "Bu kategoriye ait tüm bildirimleri yok sayıyorsun."
@@ -2410,6 +2412,7 @@ tr_TR:
       bookmarks:
         create: "Yer işareti oluştur"
         created: "Oluşturuldu"
+        updated: "Güncellenmiş"
         name: "İsim"
     category:
       can: "yapabilir&hellip;"
@@ -2716,7 +2719,6 @@ tr_TR:
         this_week: "Hafta"
         today: "Bugün"
         other_periods: "yukarı bak"
-    browser_update: 'Maalesef,  <a href="https://www.discourse.org/faq/#browser">tarayıcın bu site için çok eski</a>. Lütfen <a href="https://browsehappy.com">tarayıcını güncelle</a>.'
     permission_types:
       full: "Oluştur / Cevapla / Bak"
       create_post: "Cevapla / Bak"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 6930870cf4..827ff0876a 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -29,7 +29,6 @@ uk:
         millions: "{{number}} млн."
     dates:
       time: "HH:mm"
-      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "D MMM"
@@ -310,7 +309,6 @@ uk:
         bookmark: "Натисніть, щоб закласти перший допис у цій темі"
         unbookmark: "Натисніть, щоб видалити усі закладки у цій темі"
     bookmarks:
-      created: "ви додали цей допис до закладок"
       not_bookmarked: "додати цей допис до закладок"
       remove: "Вилучити закладку"
       confirm_clear: "Ви впевнені, що хочете вилучити всі закладки з цієї теми?"
@@ -822,6 +820,10 @@ uk:
       private_message: "Повідомлення"
       private_messages: "Повідомлення"
       user_notifications:
+        filters:
+          all: "Усі"
+          read: "Прочитані"
+          unread: "Непрочитані"
         ignore_duration_title: "Ігнорувати таймер"
         ignore_duration_username: "Ім'я користувача"
         ignore_duration_when: "Тривалість:"
@@ -1355,6 +1357,7 @@ uk:
     assets_changed_confirm: "Сайт тільки що був оновлений. Перезавантажити сторінку для переходу до нової версії?"
     logout: "Ви вийшли."
     refresh: "Оновити"
+    home: "Головна"
     read_only_mode:
       enabled: "Сайт працює в режимі \"тільки для читання\". Зараз ви можете продовжувати переглядати сайт, але інші дії будуть недоступні. "
       login_disabled: "Вхід вимкнено, поки сайт перебуває в режимі лише для читання."
@@ -2149,7 +2152,6 @@ uk:
           "2_8": "Ви побачите кількість нових відповідей, тому що стежте за цим розділом."
           "2_4": "Ви побачите кількість нових відповідей, тому що ви розміщували відповідь в цій темі."
           "2_2": "Ви побачите кількість нових відповідей, тому що стежте за цією темою."
-          "2": 'Ви побачите кількість нових відповідей, тому що <a href="{{basePath}}/u/{{username}}/preferences">читали цю тему</a>.'
           "1_2": "Ви будете сповіщені, якщо хтось згадує ваше @ім'я чи відповідає вам."
           "1": "Ви будете сповіщені, якщо хтось згадує ваше @ім'я чи відповідає вам."
           "0_7": "Ви ігноруєте всі сповіщення у цій категорії."
@@ -2601,6 +2603,7 @@ uk:
       bookmarks:
         create: "Створити закладку"
         created: "Створено"
+        updated: "Оновлено"
         name: "Назва"
         actions:
           delete_bookmark:
@@ -2941,7 +2944,6 @@ uk:
         this_week: "Тиждень"
         today: "Today"
         other_periods: "показати найбільш обговорювані"
-    browser_update: 'На жаль, <a href="https://www.discourse.org/faq/#browser">ваш браузер застарів та не підтримується цим сайтом</a>. Будь ласка, <a href="https://browsehappy.com">поновіть браузер</a>.'
     permission_types:
       full: "Створювати / Відповідати / Бачити"
       create_post: "Відповідати / Бачити"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index fe817015db..30f50a2862 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -27,7 +27,6 @@ ur:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
-      time_with_zone: "h:mm a (z)"
       timeline_date: "MMM YYYY"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
@@ -259,7 +258,6 @@ ur:
         bookmark: "اِس ٹاپک کی پہلی پوسٹ بُک مارک کرنے کے لئے کلک کریں"
         unbookmark: "اِس ٹاپک کے تمام بُک مارک ہٹانے کے لئے کلک کریں"
     bookmarks:
-      created: "آپ نے یہ پوسٹ بُک مارک کرلی ہے"
       not_bookmarked: "اِس پوسٹ کو بُک مارک کریں"
       remove: "بُک مارک ہٹائیں"
       confirm_clear: "کیا آپ کو یقین ہے کہ آپ اِس ٹاپک سے اپنے تمام بُک مارکس ہٹانا چاہتے ہیں؟"
@@ -727,6 +725,10 @@ ur:
       private_message: "پیغام"
       private_messages: "پیغامات"
       user_notifications:
+        filters:
+          all: "تمام"
+          read: "پڑھ لیا گیا"
+          unread: "بغیر پڑھے"
         ignore_duration_title: "ٹائمر نظر انداز کریں"
         ignore_duration_username: "صارف کا نام"
         ignore_duration_when: "دورانیہ:"
@@ -1217,6 +1219,7 @@ ur:
     assets_changed_confirm: "یہ ویب سائٹ ابھی ابھی اَپ ڈیٹ کی گئی ہے۔ تازہ ترین ورژن کے لئے ابھی رِیفریش کریں؟"
     logout: "آپ لاگ آؤٹ ہو گئے تھے۔"
     refresh: "رِیفریش"
+    home: "ہَوم"
     read_only_mode:
       enabled: "یہ سائٹ صرف پڑھنے کے مَوڈ میں ہے۔ براہِ مہربانی براؤز کرتے رہئیے، لیکن جواب دینا، لائکس دینا، اور دیگر اعمال ابھی کے لئے غیر فعال ہیں۔"
       login_disabled: "جب تک سائٹ صرف پڑھنے کے مَوڈ میں ہے لاگ اِن غیر فعال رہے گا۔"
@@ -1941,7 +1944,6 @@ ur:
           "2_8": "آپ نئے جوابات کا شمار دیکھ سکیں گے کیونکہ آپ اِس زمرہ کو ٹرَیک کر رہے ہیں۔"
           "2_4": "آپ نئے جوابات کا شمار دیکھ سکیں گے کیونکہ آپ نے اِس ٹاپک پر ایک جواب پوسٹ کیا۔"
           "2_2": "آپ نئے جوابات کا شمار دیکھ سکیں گے کیونکہ آپ اِس ٹاپک کو ٹرَیک کر رہے ہیں۔"
-          "2": 'آپ نئے جوابات کا شمار دیکھ سکیں گے کیونکہ آپ نے <a href="{{basePath}}/u/{{username}}/preferences">یہ ٹاپک پڑھا ہے</a>۔'
           "1_2": "اگر کوئی آپ کا @نام زکر کرتا ہے یا کوئی جواب دیتا ہے تو آپ کو مطلع کر دیا جائے گا۔"
           "1": "اگر کوئی آپ کا @نام زکر کرتا ہے یا کوئی جواب دیتا ہے تو آپ کو مطلع کر دیا جائے گا۔"
           "0_7": "آپ اِس زمرہ میں تمام اطلاعات کو نظر انداز کر رہے ہیں۔"
@@ -2634,7 +2636,6 @@ ur:
         this_week: "ہفتہ"
         today: "آج"
         other_periods: "سب سے اوپر دیکھیں"
-    browser_update: 'بدقسمتی سے، <a href="https://www.discourse.org/faq/#browser"> آپ کا براؤزر اِس سائٹ کے لئے کام کرنے کے لئے بہت پرانا ہے</a>۔ براہ مہربانی <a href="https://browsehappy.com">اپنے براؤزر کو اَپ گریڈ کریں</a>۔'
     permission_types:
       full: "بنائیں / جواب دیں / ملاحظہ کریں"
       create_post: "جواب دیں / ملاحظہ کریں"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 7ddbc48055..fc4284891e 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -29,6 +29,7 @@ vi:
       time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "D MMM YYYY HH:mm"
@@ -131,6 +132,7 @@ vi:
       banner:
         enabled: "chọn đây làm banner lúc %{when}. Nó sẽ xuất hiện ở đầu mỗi trang cho đến khi bị ẩn đi bởi người dùng."
         disabled: "xoá banner này lúc %{when}. Nó sẽ không còn xuất hiện ở đầu mỗi trang."
+      forwarded: "Chuyển tiếp email phía trên"
     topic_admin_menu: "hành động cho chủ đề"
     wizard_required: "Chào mừng bạn đến với Discourse! Hãy bắt đầu với <a href='%{url}' data-auto-route='true'>hướng dẫn cài đặt</a> ✨"
     emails_are_disabled: "Ban quản trị đã tắt mọi email gửi đi. Sẽ không có bất kỳ thông báo nào qua email được gửi đi."
@@ -237,12 +239,13 @@ vi:
         bookmark: "Chọn bài viết đầu tiên của chủ đề cho vào dấu trang"
         unbookmark: "Chọn để xoá toàn bộ dấu trang trong chủ đề này"
     bookmarks:
-      created: "bạn đã đánh dấu bài viết này"
       not_bookmarked: "đánh dấu bài viết này"
       remove: "Xóa dấu trang"
+      delete: "Xóa chỉ mục"
       confirm_clear: "Bạn có chắc muốn xóa toàn bộ đánh dấu trong chủ đề này?"
       save: "Lưu"
       no_timezone: 'Bạn chưa đặt múi giờ. Bạn sẽ không thể đặt lời nhắc. Thiết lập một <a href="%{basePath}/my/preferences/profile">trong hồ sơ của bạn</a> .'
+      list_permission_denied: "Bạn không có quyền xem chỉ mục của người dùng này"
       reminders:
         at_desktop: "Lần sau tôi ở máy tính để bàn của tôi"
         tomorrow: "Ngày mai"
@@ -697,6 +700,10 @@ vi:
       private_message: "Tin nhắn"
       private_messages: "Tin nhắn"
       user_notifications:
+        filters:
+          all: "Tất cả"
+          read: "Đã đọc"
+          unread: "Chưa đọc"
         ignore_duration_title: "Bỏ qua bộ đếm giờ"
         ignore_duration_username: "Tên đăng nhập"
         ignore_duration_when: "Thời lượng:"
@@ -1116,6 +1123,7 @@ vi:
     assets_changed_confirm: "Website đã được cập nhật bản mới. Bạn có thể làm mới lại trang để có thể sử dụng bản mới được cập nhật"
     logout: "Bạn đã đăng xuất"
     refresh: "Tải lại"
+    home: "Trang chủ"
     read_only_mode:
       enabled: "Website đang ở chế độ chỉ đọc, bạn có thể duyệt xem nhưng không thể trả lời, likes, hay thực hiện các hành động khác."
       login_disabled: "Chức năng Đăng nhập đã bị tắt khi website trong trạng thái chỉ đọc"
@@ -1592,7 +1600,6 @@ vi:
           "3_1": "Bạn sẽ được nhận các tin báo bởi bạn đã tạo chủ để này."
           "3": "Bạn sẽ nhận được các tin báo bởi vì bạn đang theo dõi chủ đề này."
           "2_8": "Bạn sẽ thấy được 1 số lượng bài viết mới bởi vì bạn đang theo dấu chuyên mục này."
-          "2": 'Bạn sẽ xem được các bài trả lời bởi vì bạn <a href="{{basePath}}/u/{{username}}/preferences">đọc chủ đề này</a>.'
           "1_2": "Bạn sẽ được tin báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn."
           "1": "Bạn sẽ được tin báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn."
           "0_7": "Bạn đang bỏ qua tất cả các tin báo trong chuyên mục này."
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index b54822a862..ac953c74f1 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -240,10 +240,10 @@ zh_CN:
         unbookmark: "点击删除本主题的所有收藏"
         unbookmark_with_reminder: "点击以移除该主题上的所有收藏和提醒。你在该主题中设定了一个于%{reminder_at}的提醒。"
     bookmarks:
-      created: "你已经收藏了此帖"
+      created: "你已收藏了该帖子%{name}"
       not_bookmarked: "收藏此帖"
-      created_with_reminder: "你已经收藏该帖并且设定了一个于%{date}的提醒"
-      created_with_at_desktop_reminder: "你所收藏的此帖将会在你下次使用桌面设备时被提醒。"
+      created_with_reminder: "你已收藏了该帖子并设置了一个提醒 %{date}%{name}"
+      created_with_at_desktop_reminder: "你所收藏的此帖将会在你下次使用桌面设备时提醒你 %{name}"
       remove: "取消收藏"
       delete: "删除收藏"
       confirm_delete: "你确定要删除该收藏吗？你所设置的提醒也会被一并删除。"
@@ -719,6 +719,10 @@ zh_CN:
       private_message: "私信"
       private_messages: "私信"
       user_notifications:
+        filters:
+          all: "全部"
+          read: "阅读"
+          unread: "未读"
         ignore_duration_title: "忽略计时器"
         ignore_duration_username: "用户名"
         ignore_duration_when: "持续时间："
@@ -814,7 +818,7 @@ zh_CN:
       watched_first_post_tags: "监看新主题"
       watched_first_post_tags_instructions: "在有了这些标签的每一个新主题，第一帖会通知你。"
       muted_categories: "静音"
-      muted_categories_instructions: "你不会收到有关这些分类中新主题的任何通知，也不会出现在类别或最新页面上。"
+      muted_categories_instructions: "你不会收到这些分类中任何关于新主题的通知，并且这些新主题也不会出现在分类或最新的页面上。"
       muted_categories_instructions_dont_hide: "你将不会收到在这些分类中的新主题通知。"
       no_category_access: "无法保存，作为审核人你仅具有受限的 分类 访问权限"
       delete_account: "删除我的账户"
@@ -871,6 +875,7 @@ zh_CN:
         success: "（邮件已发送）"
         in_progress: "（正在发送邮件）"
         error: "（错误）"
+        emoji: "挂锁表情符号"
         action: "发送密码重置邮件"
         set_password: "设置密码"
         choose_new: "输入新密码"
@@ -1234,6 +1239,7 @@ zh_CN:
     assets_changed_confirm: "网站刚更新了，刷新使用新版本？"
     logout: "你已登出用户。"
     refresh: "刷新"
+    home: "首页"
     read_only_mode:
       enabled: "站点正处于只读模式。你可以继续浏览，但是回复、赞和其他操作暂时被禁用。"
       login_disabled: "只读模式下不允许登录。"
@@ -1263,6 +1269,7 @@ zh_CN:
     mute: 静音
     unmute: 取消静音
     last_post: 最后发帖
+    local_time: "当地时间"
     time_read: 阅读
     time_read_recently: "最近 %{time_read}"
     time_read_tooltip: "合计阅读时间 %{time_read}"
@@ -1323,6 +1330,7 @@ zh_CN:
     email_login:
       link_label: "给我通过邮件发送一个登录链接"
       button_label: "通过邮件"
+      emoji: "挂锁表情符号"
       complete_username: "如果有一个与用户名<b>%{username}</b>相匹配的账户，你很快就会收到一封带有登录链接的电子邮件。"
       complete_email: "如果<b>%{email}</b>与账户相匹配，你很快就会收到一封带有登录链接的电子邮件。"
       complete_username_found: "我们找到了一个与用户名<b>%{username}</b>相匹配的账户，你很快就会收到一封带有登录链接的电子邮件。"
@@ -1400,6 +1408,7 @@ zh_CN:
         backup_code: "使用备份码"
     invites:
       accept_title: "邀请"
+      emoji: "信封表情符号"
       welcome_to: "欢迎来到%{site_name}！"
       invited_by: "邀请你的是："
       social_login_available: "你也可以通过任何使用这个邮箱的社交网站登录。"
@@ -1534,7 +1543,7 @@ zh_CN:
       view_new_post: "浏览你的新帖。"
       saving: "保存中"
       saved: "已保存！"
-      saved_draft: "正在发布草稿。点击以继续。"
+      saved_draft: "正在编辑草稿。点击继续。"
       uploading: "上传中…"
       show_preview: "显示预览 &raquo;"
       hide_preview: "&laquo; 隐藏预览"
@@ -1813,7 +1822,7 @@ zh_CN:
         category: "{{category}}分类中没有主题。"
         top: "没有热门主题。"
         educate:
-          new: '<p>这里显示了近期主题列表。</p><p>默认情况下，最近 2 天内创建的主题将显示在近期列表，还会显示一个<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">近期</span>标志。<p>你可以在<a href="%{userPrefsUrl}">用户设置</a>中更改要显示哪些内容。</p>'
+          new: '<p>这里会显示近期的新主题。 </p><p>默认情况下，会显示近 2 天内创建的主题，还会显示一个<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">近期</span>的标志。<p>你可以在<a href="%{userPrefsUrl}">用户设置</a>中修改。</p>'
           unread: '<p>这里显示你的未读主题。</p><p>默认情况下，下述主题会被放在未读中。并且会在旁边显示未读的数量<span class="badge new-posts badge-notification">1</span>。如果你：</p><ul><li>创建了该主题</li><li>回复了该主题</li><li>阅读该主题超过 4 分钟</li></ul><p>或者你在主题底部的通知控制中选择了跟随或关注。</p><p>你可以在<a href="%{userPrefsUrl}">用户设置</a>中修改未读设置。</p>'
       bottom:
         latest: "没有更多主题可看了。"
@@ -1887,7 +1896,7 @@ zh_CN:
       group_request_sent: "你加入群组的请求已发送。当被接受时你会收到通知。"
       unread_indicator: "还没有成员读过此主题的最新帖子。"
       read_more_MF: "还有 { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 个未读主题</a>} other { <a href='{basePath}/unread'># 个未读主题</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{和 } false {} other{}} <a href='{basePath}/new'>1 个新</a>主题} other { {BOTH, select, true{和 } false {} other{}} <a href='{basePath}/new'># 个近期</a>主题} }可以阅读，或者{CATEGORY, select, true {浏览{catLink}中的其他主题} false {{latestLink}} other {}}"
-      bumped_at_title_MF: "{首帖}：{创建于}\n{末帖}：{顶起于}"
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: 浏览所有分类
       view_latest_topics: 查阅最新主题
       suggest_create_topic: 创建一个新的主题吧！
@@ -1986,7 +1995,6 @@ zh_CN:
           "2_8": "因为你追踪了该分类，所以你会看到新回复的数量。"
           "2_4": "你会看到新回复的数量的原因是你曾经回复过该主题。"
           "2_2": "你会看到新回复数量的原因是你正在追踪该主题。"
-          "2": '你会看到新回复数量的原因是你<a href="{{basePath}}/u/{{username}}/preferences">阅读过该主题</a>。'
           "1_2": "有人@你或回复你时会通知你。"
           "1": "如果有人@你或回复你，将通知你。"
           "0_7": "你将忽略关于该分类的所有通知。"
@@ -2075,13 +2083,13 @@ zh_CN:
         confirm_pin_globally: "已有{{count}}个全局置顶主题。太多的置顶主题可能会困扰新用户和访客。确定想再全局置顶一个主题？"
         unpin_globally: "将主题从所有主题列表的最上方移除。"
         unpin_globally_until: "从所有主题列表最上方移除主题或者移除于<strong>%{until}</strong>。"
-        global_pin_note: "允许用户取消全局置顶。"
+        global_pin_note: "用户可以自行取消全局置顶。"
         not_pinned_globally: "没有全局置顶的主题。"
         already_pinned_globally:
           other: "全局置顶的主题数：<strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "将主题设置为出现在所有页面顶端的横幅主题。"
         remove_banner: "移除所有页面顶端的横幅主题。"
-        banner_note: "用户能点击关闭隐藏横幅。且只能设置一个横幅主题。"
+        banner_note: "用户能够通隐藏横幅。在同一时间内只能设置一个横幅主题。"
         no_banner_exists: "没有横幅主题。"
         banner_exists: "当前<strong class='badge badge-notification unread'>设置</strong>了横幅主题。"
       inviting: "邀请中…"
@@ -2215,7 +2223,7 @@ zh_CN:
       reply_as_new_private_message: "向相同的收件人回复新私信"
       continue_discussion: "自 {{postLink}} 继续讨论："
       follow_quote: "转到所引用的帖子"
-      show_full: "显示所有帖子"
+      show_full: "显示完整帖子"
       show_hidden: "显示已忽略内容。"
       deleted_by_author:
         other: "（帖子被作者删除，如无标记将在 %{count} 小时后自动删除）"
@@ -2380,6 +2388,7 @@ zh_CN:
         create: "创建收藏夹"
         edit: "编辑收藏"
         created: "创建日期"
+        updated: "已更新"
         name: "名称"
         name_placeholder: "这个收藏是做什么用的？"
         set_reminder: "提醒我"
@@ -2450,6 +2459,7 @@ zh_CN:
       email_in_disabled_click: '启用“邮件发表”设置。'
       mailinglist_mirror: "分类镜像了一个邮件列表"
       show_subcategory_list: "在这个分类中把子分类列表显示在主题的上面"
+      read_only_banner: "当一名用户不能在该分类创建主题时显示的横幅文字："
       num_featured_topics: "分类页面上显示的主题数量："
       subcategory_num_featured_topics: "父分类页面上的推荐主题数量："
       all_topics_wiki: "默认将新主题设为维基主题"
@@ -2526,20 +2536,20 @@ zh_CN:
       notify_action: "私信"
       official_warning: "正式警告"
       delete_spammer: "删除垃圾发布者"
-      delete_confirm_MF: "你将删除该用户的{POSTS, plural, one {<b>1</b>个帖子} other {<b>#</b>个帖子}} and {TOPICS, plural, one {<b>1</b>个主题} other {<b>#</b>个主题}}、该账户，并阻止其IP地址 <b>%{ip_address}</b> 再次注册，并将其邮件地址 <b>%{email}</b> 加入黑名单。你确定这用户是广告散布者吗？"
-      yes_delete_spammer: "确定"
+      delete_confirm_MF: "你将删除该用户的{POSTS, plural, one {<b>1</b>个帖子} other {<b>#</b>个帖子}} 和 {TOPICS, plural, one {<b>1</b>个主题} other {<b>#</b>个主题}}，删除该账户，阻止其IP地址 <b>{ip_address}</b> 再次注册，并将其邮件地址 <b>{email}</b>加入黑名单。你确定该用户是垃圾广告发布者吗？"
+      yes_delete_spammer: "是的，删除垃圾内容发布者"
       ip_address_missing: "（N/A）"
       hidden_email_address: "（隐藏）"
-      submit_tooltip: "提交私有标记"
-      take_action_tooltip: "立即采取标记到达限制值时的措施，而不是等待更多的社区标记"
-      cant: "抱歉，现在你不能标记本帖。"
+      submit_tooltip: "提交非公开的标记"
+      take_action_tooltip: "立即采取标记达到阈值时的措施，而不是等待更多的社区标记"
+      cant: "抱歉，当前你不能标记该帖子。"
       notify_staff: "私下通知管理人员"
       formatted_name:
-        off_topic: "偏题"
-        inappropriate: "不合适"
-        spam: "广告"
-      custom_placeholder_notify_user: "请具体说明，有建设性的，再友好一些。"
-      custom_placeholder_notify_moderators: "让我们知道你关心地是什么，并尽可能地提供相关链接和例子。"
+        off_topic: "偏离话题"
+        inappropriate: "这是不当言论"
+        spam: "这是广告内容"
+      custom_placeholder_notify_user: "请具体说明，有建设性的，保持友善。"
+      custom_placeholder_notify_moderators: "让我们知道你关心的是什么，并尽可能地提供相关链接和例子。"
       custom_message:
         at_least:
           other: "输入至少 {{count}} 个字符"
@@ -2568,11 +2578,11 @@ zh_CN:
       bookmarked:
         help: "你已经收藏了此主题"
       locked:
-        help: "这个主题被关闭；不再允许新的回复"
+        help: "这个主题已被关闭；不再接受新的回复"
       archived:
         help: "本主题已归档；即已经冻结，无法修改"
       locked_and_archived:
-        help: "这个主题被关闭并存档；不再允许新的回复，并不能改变"
+        help: "这个主题已被关闭并存档；不再接受新的回复且不能被修改"
       unpinned:
         title: "解除置顶"
         help: "主题已经解除置顶；它将以默认顺序显示"
@@ -2680,7 +2690,7 @@ zh_CN:
         this_week: "周"
         today: "今天"
         other_periods: "查看热门"
-    browser_update: '抱歉，<a href="http://www.discourse.com/faq/#browser">你的浏览器版本太低，无法正常访问该站点</a>。请<a href="http://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: "回复 / 阅读"
@@ -2739,7 +2749,7 @@ zh_CN:
       bookmarks:
         title: "收藏"
         enter: "%{shortcut} 保存并关闭"
-        later_today: "%{shortcut} 今天晚些时候"
+        later_today: "%{shortcut} 今天的某个时候"
         later_this_week: "%{shortcut} 本周的晚些时候"
         tomorrow: "%{shortcut} 明天"
         next_week: "%{shortcut} 下周"
@@ -2881,7 +2891,7 @@ zh_CN:
         tags_placeholder: "标签"
         parent_tag_label: "上级标签："
         parent_tag_placeholder: "可选"
-        parent_tag_description: "未设置上级标签前群组内标签无法使用。"
+        parent_tag_description: "未设置上级标签前不能使用标签组内的标签。"
         one_per_topic_label: "只可给主题设置一个该组内的标签"
         new_name: "新建标签组"
         name_placeholder: "标签组名称"
@@ -3345,6 +3355,9 @@ zh_CN:
           settings: "设置"
           translations: "翻译"
           extra_scss: "附加 SCSS"
+          extra_files: "附加文件"
+          extra_files_upload: "导出主题以查看这些文件。"
+          extra_files_remote: "导出主题或查看git仓库以查看这些文件。"
           preview: "预览"
           show_advanced: "显示高级设置"
           hide_advanced: "隐藏高级设置"
@@ -3408,6 +3421,7 @@ zh_CN:
           license: "许可证"
           version: "版本："
           authors: "作者："
+          creator: "创建者："
           source_url: "来源"
           enable: "启用"
           disable: "停用"
@@ -3914,25 +3928,26 @@ zh_CN:
         anonymize_failed: "在匿名化该账户时遇到问题。"
         delete: "删除用户"
         merge:
-          transfer_and_delete: "转让并删除"
+          transfer_and_delete: "迁移并删除"
           prompt:
-            title: "转让并删除 @%{username}"
+            title: "迁移并删除 @%{username}"
             description: |
               <p>请为<b>@%{username} </b>的内容选择一个新的主人。</p>
 
-              <p>所有主题、帖子、消息或其它由<b>@%{username}</b>所创作的内容将被转让。</p>
+              <p>所有主题、帖子、消息或其它由<b>@%{username}</b>所创作的内容将被过户。</p>
             target_username_placeholder: "新的所有者的用户名"
-            transfer_and_delete: "转让并删除 @%{username}"
+            transfer_and_delete: "迁移并删除 @%{username}"
             cancel: "取消"
           confirmation:
-            title: "转让并删除 @%{username}"
+            title: "迁移并删除 @%{username}"
             description: |
-              <p><b>@%{username}</b>的所有内容将被转让到<b>%{targetUsername}</b>。在内容被转让后，<b>@%{username}</b>的账户将被删除。</p>
+              <p><b>@%{username}</b>的所有内容将被过户到<b>%{targetUsername}</b>。在内容被过户后，<b>@%{username}</b>的账户将被删除。</p>
 
               <p><b>该操作无法被撤销</b></p>
 
               <p>要继续请输入：<code>%{text}</code></p>
-            transfer_and_delete: "转让并删除 @%{username}"
+            text: "迁移 @%{username} 到 @%{targetUsername}"
+            transfer_and_delete: "迁移并删除 @%{username}"
             cancel: "取消"
         merging_user: "合并用户..."
         merge_failed: "合并用户时出错。"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 1d5b3ce010..f82e74325a 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -26,7 +26,6 @@ zh_TW:
         millions: "{{number}} 百萬"
     dates:
       time: "h:mm a"
-      time_with_zone: "h:mm a (z)"
       timeline_date: "YYYY年 M月"
       long_no_year_no_time: "M月 D日"
       full_no_year_no_time: "M月 D日"
@@ -233,7 +232,6 @@ zh_TW:
         bookmark: "點擊以將此話題的第一篇貼文加入書籤"
         unbookmark: "點擊以移除此話題所有書籤"
     bookmarks:
-      created: "你已將此貼文加上書籤"
       not_bookmarked: "將此貼文加入書籤"
       remove: "移除書籤"
       confirm_clear: "確定要移除該話題上的所有書籤嗎？"
@@ -647,6 +645,10 @@ zh_TW:
       private_message: "訊息"
       private_messages: "訊息"
       user_notifications:
+        filters:
+          all: "全部"
+          read: "已讀"
+          unread: "未讀"
         ignore_duration_title: "忽略計時器"
         ignore_duration_username: "使用者名稱"
         ignore_duration_when: "持續時間："
@@ -1108,6 +1110,7 @@ zh_TW:
     assets_changed_confirm: "此網站剛剛已更新，你要重整頁面以獲得最新版本嗎？"
     logout: "已登出"
     refresh: "重新整理"
+    home: "主頁"
     read_only_mode:
       enabled: "站點正處於只讀模式。你可以繼續瀏覽，但是回覆、讚和其他操作暫時被禁用。"
       login_disabled: "在唯讀模式下不能登入"
@@ -1778,7 +1781,6 @@ zh_TW:
           "2_8": "您將會看到新回覆的數量，因為你正在追蹤這個分類。"
           "2_4": "您將會看到新回覆的數量，因為你回覆了此話題。"
           "2_2": "您將會看到新回覆的數量，因為你正在追蹤這個話題。"
-          "2": '您將會看到新回覆的數量，因為你<a href="{{basePath}}/u/{{username}}/preferences">看過這個話題</a>。'
           "1_2": "如果有人@你或回覆你，將通知你。"
           "1": "如果有人@你或回覆你，將通知你。"
           "0_7": "你正忽略此分類中的所有通知。"
@@ -2424,7 +2426,6 @@ zh_TW:
         this_week: "週"
         today: "今天"
         other_periods: "前往頂端"
-    browser_update: '抱歉，<a href="https://www.discourse.org/faq/#browser">您的瀏覽器版本過舊，無法讀取該網站</a>。請<a href="https://browsehappy.com">更新您的瀏覽器</a>。'
     permission_types:
       full: "建立 / 回覆 / 觀看"
       create_post: "回覆 / 觀看"
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index 3b4b7a7c13..041232032c 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -173,10 +173,13 @@ bg:
   excerpt_image: "изображение"
   bookmarks:
     reminders:
+      at_desktop: "Следващия път, когато съм на компютъра"
       later_today: "По-късно днес"
+      next_business_day: "Следващия работен ден"
       tomorrow: "Утре"
       next_week: "Следваща седмица"
       next_month: "Следващия месец"
+      custom: "Друга дата и час"
   groups:
     errors:
       invalid_domain: "'%{domain}' е невалиден домейн."
@@ -1255,6 +1258,8 @@ bg:
       description: Получени 2 харесвания на 100 публикации
     admired:
       description: Получил 5 харесвания за 300 публикации
+    out_of_love:
+      name: От любов
     crazy_in_love:
       name: Луди от любов
     thank_you:
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index d93a6cb62f..1c4e406b11 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -60,6 +60,7 @@ es:
       optimized_link: Los enlaces de imagen optimizados son efímeros y no deben incluirse en el código fuente del tema.
     settings_errors:
       invalid_yaml: "El YAML provisto es inválido."
+      data_type_not_a_number: "Tipo de ajuste `%{name}` no soportado. Los tipos soportados son `integer`, `bool`, `list`, `enum` y `upload`"
       name_too_long: "Hay un ajuste con un nombre muy largo. La cantidad máxima de caracteres es 255"
       default_value_missing: "El ajuste «%{name}» no tiene valor por defecto"
       default_not_match_type: "El tipo de valor por defecto para el ajuste «%{name}» no coincide con el tipo de ajuste."
@@ -337,7 +338,7 @@ es:
       time_must_be_provided: "se debe especificar la hora para todos los recordatorios excepto '%{reminder_type}'"
     reminders:
       at_desktop: "La próxima vez que esté en mi ordenador"
-      later_today: "Más tarde durante el día de hoy"
+      later_today: "Más tarde, hoy"
       next_business_day: "Siguiente día hábil"
       tomorrow: "Mañana"
       next_week: "Próxima semana"
@@ -463,6 +464,7 @@ es:
               no_user_selected: "Debes seleccionar un usuario válido."
               reply_by_email_disabled: "Las respuestas por correo electrónico han sido desactivadas."
               target_user_not_found: "No se pudo encontrar a uno de los usuarios a los que envías este mensaje."
+              unable_to_update: "Hubo un error actualizando ese tema."
             featured_link:
               invalid: "es inválido. El URL debería incluir http:// o https://."
               invalid_category: "no se puede editar en esta categoría."
@@ -1384,6 +1386,8 @@ es:
     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, ellos 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 forcen el inicio de sesión y usen SSO. "
     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é habilitado. 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 habilitar «resumen de este tema». Los cambios a esta configuración se aplicarán retroactivamente dentro de una semana."
     summary_percent_filter: "Cuando un usuario hace clic en «resumen de este tema», mostrar el % de las publicaciones destacadas"
     summary_max_results: "Cantidad máxima de publicaciones devueltas en «resumen de este tema»"
     enable_personal_messages: "Permitir a los usuarios con nivel de confianza 1 (configurable a través del mínimo nivel de confianza para enviar mensajes) crear mensajes y responder a ellos. Ten en cuenta que el staff siempre puede enviar mensajes pase lo que pase."
@@ -1465,6 +1469,7 @@ es:
     allow_index_in_robots_txt: "Especificar en robots.txt que se permite que este sitio sea indexado por los motores de búsqueda en Internet. En casos excepcionales, puedes <a href='%{base_path}/admin/customize/robots'>sobrescribir robots.txt</a> permanentemente."
     email_domains_blacklist: "Una lista de dominios de correo electrónico que los usuarios no pueden utilizar para registrarse. Ejemplo: mailinator.com|trashmail.net"
     email_domains_whitelist: "Una lista de dominios de correo electrónico con los que los usuarios DEBEN registrar sus cuentas. AVISO: ¡no se permitirá el registro de usuarios cuyo correo electrónico sea de un dominio diferente a los aquí listados!"
+    auto_approve_email_domains: "Los usuarios con direcciones de email de esta lista de dominios serán aprobados automáticamente."
     hide_email_address_taken: "No informar a los usuarios de la existencia de una cuenta con un correo electrónico dado durante el registro y desde el formulario de contraseña olvidada."
     log_out_strict: "Al cerrar sesión, cierra TODAS las sesiones del usuario en todos los dispositivos"
     version_checks: "Ping el Discourse Hub para actualizaciones de versión y mostrar mensajes del número de versión en el dashboard <a href='/admin' target='_blank'>/admin</a>."
@@ -1756,6 +1761,7 @@ es:
     relative_date_duration: "Número de días desde la última publicación durante los que las fechas se mostrarán en formato relativo (7d) en vez de absoluto (20 Feb)."
     delete_user_max_post_age: "No permitir eliminar usuarios cuya primera publicación tenga una antigüedad mayor a (x) días."
     delete_all_posts_max: "El máximo número de publicaciones que pueden ser eliminadas a la vez con el botón «eliminar todas las publicaciones». Si un usuario tiene un número de publicaciones mayor que este valor, estas no podrán ser eliminadas de una vez y el usuario no podrá ser eliminado."
+    delete_user_self_max_post_count: "El número máximo de publicaciones que puede tener un usuario al tiempo que permite la auto-eliminación de la cuenta. Establezca en -1 para deshabilitar la auto-eliminación de la cuenta."
     username_change_period: "El número máximo de días después de registrarse durante los que una cuenta puede cambiar su nombre de usuario (0 para no permitir el cambio de nombre)"
     email_editable: "Permitir a los usuarios cambiar su dirección de correo electrónico después de registrarse."
     logout_redirect: "Ubicación para redirigir el navegador después del cierre de sesión (por ejemplo: https://example.com/logout)"
@@ -1831,10 +1837,12 @@ es:
     warn_reviving_old_topic_age: "Cuando alguien publica en un tema cuya última respuesta fue hace más tiempo que este número de días, se le mostrará un aviso para desalentar el hecho de revivir una antigua discusión. Establece el valor en 0 para deshabilitar."
     autohighlight_all_code: "Forzar el resaltado de código a los bloques de código preformateado cuando no se especifique el lenguaje del código."
     highlighted_languages: "Reglas de resaltado de sintaxis incluidas. (Aviso: incluir demasiados lenguajes puede afectar al rendimiento) Ver: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> para un demo."
+    show_copy_button_on_codeblocks: "Agrega un botón a los bloques de código para copiar el contenido del bloque al portapapeles del usuario. Esta característica no es compatible con Internet Explorer."
     embed_any_origin: "Permitir la inserción de contenido sin importar su origen. Esto se requiere para aplicaciones móviles con HTML estático."
     embed_topics_list: "Soportar la inserción HTML de listas de temas"
     embed_set_canonical_url: "Establece la URL canónica para los temas insertados en la URL de los contenidos insertados."
     embed_truncate: "Truncar las publicaciones insertadas."
+    embed_unlisted: "Los temas importados se ocultarán de la lista hasta que tengan una respuesta."
     embed_support_markdown: "Soporte de formato Markdown para publicaciones incrustadas."
     embed_whitelist_selector: "Lista separada por comas de elementos CSS que están permitidos en las inserciones."
     allowed_href_schemes: "Esquemas permitidos en enlaces además de http y https."
@@ -1866,6 +1874,7 @@ es:
     new_user_notice_tl: "Nivel de confianza mínimo requerido para ver avisos de usuarios nuevos."
     returning_user_notice_tl: "Nivel de confianza mínimo requerido para ver avisos de usuarios que vuelven."
     returning_users_days: "Cuántos días deben transcurrir antes de que se considere que un usuario está regresando."
+    enable_page_publishing: "Permitir que los miembros del personal publiquen temas en nuevas URL con su propio estilo."
     default_email_digest_frequency: "Cuán a menudo recibirán los usuarios correos electrónicos de resumen por defecto."
     default_include_tl0_in_digests: "Incluir publicaciones de usuarios nuevos en los correos electrónicos de resumen por defecto. Los usuarios pueden cambiar esto en sus preferencias."
     default_email_level: "Establecer nivel por defecto de las notificaciones por correo electrónico para los temas regulares."
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index cfafdd6678..f8caa6b2bb 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -1376,6 +1376,7 @@ he:
     unreachable_themes: "לא הצלחתי לבדוק אם יש עדכונים לערכות העיצוב הבאות:"
     watched_word_regexp_error: "הביטוי הרגולרי למילים במעקב %{action} שגוי. נא לבדוק את <a href='%{base_path}/admin/logs/watched_words'>הגדרות המילים במעקב</a> או לנטרל את הגדרות האתר ‚ביטוי רגולרי למילים במעקב’."
   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>."
@@ -1543,7 +1544,6 @@ he:
     allow_index_in_robots_txt: "יש לציין ב־robots.txt שמותר לאתר הזה להצטרף למאגר של מנועי החיפוש. במקרים יוצאי דופן, ניתן <a href='%{base_path}/admin/customize/robots'>לדרוס את robots.txt</a> באופן קבוע."
     email_domains_blacklist: "רשימה מופרדת בצינור (pipe) של דומיינים של אימייל אשר מהם משתמשים לא מורשים לרשום חשבונות. למשל: mailinator.com|trashmail.net"
     email_domains_whitelist: "רשימה מופרדת בצינור (pipe) אשר ר-ק ממנה משתמשים יכולים לרשום חשבונות. א-ז-ה-ר-ה: משתמשים עם אימיילים מדומיינים אחרים לא יורשו!"
-    enforce_canonical_emails: "בטרם יצירת משתמשים יש להפשיט כתובת דוא״ל לצורה אחידה כדי לאמת ייחודיות. ההגדרות תפעל רק על רישומי חשבונות חדשים. כאשר user+1@domain.com לא תהיה כתובת מורשית אם user+2@domain.com כבר רשומה."
     auto_approve_email_domains: "משתמשים עם כתובות דוא״ל מרשימת שמות התחום האלה יאושרו אוטומטית."
     hide_email_address_taken: "לא להודיע למשתמשים שקיים חשבון עם כתובת דוא״ל מסוימת במהלך ההרשמה ובטופס שחזור הססמה."
     log_out_strict: "בהתנתקות, נתקו את כל ההפעלות של המשתמש/ת בכל המכשירים"
@@ -1573,6 +1573,8 @@ he:
     sso_overrides_username: "דורס שם משתמש מקומי עם שם משתמש של אתר חיצוני מתוכן SSO בכל התחברות, ומונע שינויים מקומיים. (אזהרה: אי-התאמות עלולות להתרחש בעקבות הבדלים בדרישות אורך לגבי שמות משתמשים)"
     sso_overrides_name: "דורס שם מלא מקומי עם שם מלא מאתר חיצוני מתוכן SSO בכל התחברות, מונע שינויים מקומיים."
     sso_overrides_avatar: "דריסת התמונה הייצוגית בתמונה ייצוגית חיצונית ממטען ה־SSO. אם אפשרות זו פעילה, למשתמשים לא תהיה אפשרות להעלות תמונות ייצוגיות ל־Discourse."
+    sso_overrides_location: "דורס את מיקום המשתמש במיקום חיצוני ממטען SSO ומניעת שינויים מקומיים."
+    sso_overrides_website: "דורס את אתר המשתמש במיקום חיצוני ממטען ה־SSO ומניעת שינויים מקומיים."
     sso_overrides_profile_background: "דריסת רקע פרופיל המשתמש בתמונה ייצוגית חיצונית ממטען ה־SSO."
     sso_overrides_card_background: "דריסת רקע כרטיס המשתמש בתמונה ייצוגית חיצונית ממטען ה־SSO."
     sso_not_approved_url: "SSO של חשבונות שלא אושרו יופנו ל URL זה"
@@ -2011,6 +2013,8 @@ he:
     push_notifications_prompt: "הצגת בקשה להסכמת המשתמש."
     push_notifications_icon: "סמל העיטור שמופיע בפינת ההתרעה. הגודל הנדרש הוא 96 × 96."
     short_title: "בכותרת הקצרה ייעשה שימוש במסך הבית של המשתמש, במשגר או במקומות אחרים שבהם המקום מוגבל. אורכה לא יעלה על 12 תווים."
+    dashboard_hidden_reports: "לאפשר להסתיר את הדוחות המסוימים בלוח הבקרה."
+    dashboard_visible_tabs: "נא לבחור אילו לשוניות תופענה בלוח הבקרה."
     dashboard_general_tab_activity_metrics: "נא לבחור דיווחים שיופיעו בתור מדדי פעילות בלשונית הכללית."
     gravatar_name: "שם ספק ה־Gravatar"
     gravatar_base_url: "כתובת בסיס ה־API של ספק ה־Gravatar"
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index cd23816eac..4c6e707724 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -289,10 +289,13 @@ hy:
   excerpt_image: "նկար"
   bookmarks:
     reminders:
+      at_desktop: "Հաջորդ այցելությունը ֆորումին, կլինի իմ աշխատանքային սեղանի միջոցով: "
       later_today: "Այսօր, մի փոքր ուշ"
+      next_business_day: "Հաջորդ աշխատանքային օրը: "
       tomorrow: "Վաղը"
       next_week: "Հաջորդ շաբաթ"
       next_month: "Հաջորդ ամիս"
+      custom: "Սահմանեք հիշեցումների ամսաթիվն ու ժամանակը:"
   groups:
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' -ը վավեր վստահության մակարդակ չէ:"
@@ -759,6 +762,7 @@ hy:
     instructions: 'Մենք հենց նոր գեներացրինք նոր օգտատիրոջ API key՝ "%{application_name}" -ի հետ պգտագործելու համար, խնդրում ենք տեղադրել հետևյալ key -ը Ձեր հավելվածում.'
     otp_confirmation:
       confirm_title: "Շարունակել դեպի %{site_name}"
+      confirm_button: Ավարտել Մուտքը
     no_trust_level: "Ներողություն, Դուք չունեք օգտատիրոջ API -ի համար պահանջվող վստահության մակարդակը "
     generic_error: "Ներողություն, մենք չկարողացանք թողարկել օգտատիրոջ API key-եր, հնարավոր է՝ այս հատկանիշը անջատված է կայքի ադմինի կողմից:"
     scopes:
@@ -1789,6 +1793,10 @@ hy:
     autoclosed_disabled_lastpost: "Այս թեման այժմ բաց է: Նոր պատասխանները թույլատրելի են:"
     auto_deleted_by_timer: "Ավտոմատ կերպով ջնջվել է ժամաչափիչի կողմից:"
   login:
+    security_key_alternative: "Փորձեք ուրիշ եղանակով"
+    security_key_not_allowed_error: "Անվտանգության բանալու գրանցման ժամանակը վերջացել է կամ չեղյալ է հայտարարվել:"
+    security_key_no_matching_credential_error: "Նշված անվտանգության բանալիի մեջ չեն գտնվել համապատասխան հավատարմագրերը: "
+    security_key_support_missing_error: "Ձեր ընթացիկ սարքը կամ բրաուզերը չի պահպանում անվտանգության բանալիների  օգտագործումը: Խնդրում ենք օգտագործեք ուրիշ մեթոդ: "
     not_approved: "Ձեր հաշիվը դեռևս չի հաստատվել: Դուք ծանուցւոմ կստանաք էլ. նամակով, երբ պատրաստ լինեք մուտք գործելու:"
     incorrect_username_email_or_password: "Ոչ ճշգրիտ օգտանուն, էլ. հասցե կամ գաղտնաբառ"
     incorrect_password: "Սխալ գաղտնաբառ"
@@ -3293,10 +3301,12 @@ hy:
   reviewables:
     priorities:
       low: "Բարձր"
+      medium: "Միջին"
       high: "Ցածր"
     sensitivity:
       disabled: "Անջատված"
       low: "Բարձր"
+      medium: "Միջին"
       high: "Ցածր"
     actions:
       agree_and_keep:
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 0d4bc55444..fb079d6788 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -172,6 +172,8 @@ it:
       s3_bucket_reused: "Non puoi usare lo stesso bucket per 's3_upload_bucket' e 's3_backup_bucket'. Scegli un bucket differente, o un percorso diverso per ciascun bucket."
       secure_media_requirements: "I caricamenti S3 devono essere abilitati prima di abilitare i supporti sicuri."
       second_factor_cannot_be_enforced_with_disabled_local_login: "Non è possibile applicare 2FA se i login locali sono disabilitati."
+      local_login_cannot_be_disabled_if_second_factor_enforced: "Non è possibile disabilitare l'accesso locale se 2FA è abilitato. Disabilitare 2FA prima di disabilitare gli accessi locali."
+      cannot_enable_s3_uploads_when_s3_enabled_globally: "Non puoi abilitare i caricamenti S3 perché sono già abilitati a livello globale e l'abilitazione dei caricamenti S3 a livello di sito potrebbe causare problemi critici con i caricamenti"
     conflicting_google_user_id: 'Il Google Account ID per questo account è stato modificato; per motivi di sicurezza è richiesto l''intervendo dello staff. Si prega di contattare lo staff e indirizzarli a <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   activemodel:
     errors:
@@ -218,7 +220,11 @@ it:
   invalid_whisper_access: "I sussurri non sono abilitati oppure non hai i permessi per creare sussurri"
   not_in_group:
     title_topic: "Devi essere membro di un gruppo per vedere questo argomento."
+    title_category: "Devi essere in un gruppo per vedere questa categoria."
+    request_membership: "Richiedi di Iscrizione"
     join_group: "Unisciti al Gruppo"
+  deleted_topic: "Oops! Questo argomento è stato eliminato e non è più disponibile."
+  delete_topic_failed: "Si è verificato un errore durante l'eliminazione di questo argomento. Si prega di contattare l'amministratore del sito."
   reading_time: "Tempo di lettura"
   likes: "Mi piace"
   too_many_replies:
@@ -246,6 +252,9 @@ it:
     replies:
       one: "%{count} risposta"
       other: "%{count} risposte"
+    likes:
+      one: "%{count} \"Mi piace\""
+      other: "%{count} \"Mi piace\""
     last_reply: "Ultima risposta"
     created: "Creazione"
     new_topic: "Inizia un nuovo argomento"
@@ -280,6 +289,7 @@ it:
   max_pm_recipients: "Spiacenti, puoi inviare un messaggio ad un massimo di %{recipients_limit} destinatari."
   pm_reached_recipients_limit: "Spiacente, non sono consentiti più di %{recipients_limit} destinatari in un messaggio."
   removed_direct_reply_full_quotes: "La citazione dell'intero messaggio precedente è stata rimossa automaticamente."
+  secure_upload_not_allowed_in_public_topic: "Siamo spiacenti, i seguenti caricamenti sicuri non possono essere utilizzati in un argomento pubblico: %{upload_filenames}."
   just_posted_that: "è troppo simile a ciò che hai appena pubblicato"
   invalid_characters: "contiene caratteri non validi"
   is_invalid: "sembra poco chiaro, è una frase completa?"
@@ -290,6 +300,12 @@ it:
   topics_in_category: "Argomenti nella categoria '%{category}'"
   rss_posts_in_topic: "RSS feed di '%{topic}'"
   rss_topics_in_category: "RSS feed degli argomenti nella categoria '%{category}'"
+  rss_num_posts:
+    one: "%{count} messaggio"
+    other: "%{count} messaggi"
+  rss_num_participants:
+    one: "%{count} partecipante"
+    other: "%{count} partecipanti"
   read_full_topic: "Leggi l'argomento intero"
   private_message_abbrev: "MP"
   rss_description:
@@ -316,6 +332,9 @@ it:
   bookmarks:
     errors:
       already_bookmarked_post: "Non puoi aggiungere due volte lo stesso messaggio nei segnalibri."
+      cannot_set_past_reminder: "Non è possibile impostare un promemoria per un segnalibro nel passato."
+      cannot_set_reminder_in_distant_future: "Non è possibile impostare un promemoria per un segnalibro per più di 10 anni nel futuro."
+      time_must_be_provided: "l'ora deve essere fornita per tutti i promemoria tranne '%{reminder_type}'"
     reminders:
       at_desktop: "La prossima volta che sarò al mio desktop"
       later_today: "Più tardi oggi"
@@ -432,6 +451,7 @@ it:
               no_user_selected: "Devi selezionare un utente valido."
               reply_by_email_disabled: "La risposta via email è stata disabilitata."
               target_user_not_found: "Impossibile trovare uno degli utenti a cui stai inviando questo messaggio."
+              unable_to_update: "Si è verificato un errore durante l'aggiornamento dell'argomento."
             featured_link:
               invalid: "è invalido. Un URL dovrebbe includere http:// o https://."
               invalid_category: "non può essere modificato in questa categoria."
@@ -450,6 +470,10 @@ it:
               same_as_password: "corrisponde alla tua password."
             ip_address:
               signup_not_allowed: "L'iscrizione non è permessa da questo account."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Questo argomento non può essere inserito nel tuo profilo."
         user_email:
           attributes:
             user_id:
@@ -543,6 +567,7 @@ it:
       description_incomplete: "Il messaggio di descrizione della categoria deve avere almeno un paragrafo."
       permission_conflict: "Qualsiasi gruppo a cui è consentito l'accesso a una sottocategoria deve anche poter avere accesso alla categoria genitore. I seguenti gruppi hanno accesso a una delle sottocategorie ma non hanno accesso alla categoria genitore: %{group_names}."
       disallowed_topic_tags: "In questo argomento sono presenti etichette non consentite in questa categoria: '%{tags}'"
+      disallowed_tags_generic: "Su questo argomento non sono consentite etichette."
     cannot_delete:
       uncategorized: "Questa è una categoria speciale. È utilizzata come area di attesa per gli argomenti senza categoria. Non può essere eliminata."
       has_subcategories: "Non puoi cancellare questa categoria perché ha sotto-categorie."
@@ -708,6 +733,7 @@ it:
       windows: "Microsoft Windows"
       unknown: "sistema operativo sconosciuto"
   change_email:
+    wrong_account_error: "Hai effettuato l'accesso con un account sbagliato, esci e riprova."
     confirmed: "La tua email è stata aggiornata."
     please_continue: "Procedi su %{site_name}."
     error: "Si è verificato un errore durante la modifica del tuo indirizzo email. Forse l'indirizzo è già in uso?"
@@ -716,6 +742,14 @@ it:
     confirm: "Conferma"
     authorizing_new:
       title: "Conferma il tuo nuovo indirizzo email"
+      description: "Conferma che vuoi cambiare il tuo nuovo indirizzo email in:"
+    authorizing_old:
+      title: "Cambia il tuo indirizzo email"
+      description: "Conferma la modifica del tuo indirizzo email"
+      old_email: "Vecchia email: %{email}"
+      new_email: "Nuova email: %{email}"
+      almost_done_title: "Conferma nuovo indirizzo email"
+      almost_done_description: "Abbiamo inviato un'email al tuo nuovo indirizzo email per confermare la modifica!"
   associated_accounts:
     revoke_failed: "Impossibile revocare il tuo account con %{provider_name}."
     connected: "(connesso)"
@@ -730,6 +764,7 @@ it:
     activated: "Spiacenti, questo account è stato già attivato."
     admin_confirm:
       title: "Conferma Account Amministratore"
+      description: "Sei sicuro di voler <b>%{target_username} (%{target_email})</b> come amministratore?"
       grant: "Assegna Accesso Amministratore"
       complete: "<b>%{target_username}</b>è ora un amministratore."
       back_to: "Torna a %{title}"
@@ -778,6 +813,13 @@ it:
       description: "Metti \"Mi piace\" a questo messaggio"
       short_description: "Metti \"Mi piace\" a questo messaggio"
       long_form: "hanno messo \"Mi piace\""
+  draft:
+    sequence_conflict_error:
+      title: "errore bozza"
+      description: "La bozza viene modificata in un'altra finestra. Ricarica questa pagina."
+  draft_backup:
+    pm_title: "Backup delle bozze da argomenti in corso"
+    pm_body: "Argomento contenente backup di bozze"
   user_activity:
     no_default:
       self: "Non hai ancora nessuna attività."
@@ -793,6 +835,21 @@ it:
       others: "Nessuna risposta."
     no_drafts:
       self: "Non hai bozze; inizia a scrivere una risposta in qualsiasi argomento e verrà automaticamente salvata come nuova bozza"
+  webauthn:
+    validation:
+      invalid_type_error: "Il tipo di webauthn fornito non era valido. I tipi validi sono webauthn.get e webauthn.create."
+      challenge_mismatch_error: "La challenge fornita non corrisponde alla challenge generata dal server di autenticazione."
+      invalid_origin_error: "L'origine della richiesta di autenticazione non corrisponde all'origine del server."
+      malformed_attestation_error: "Si è verificato un errore durante la decodifica dei dati di attestazione."
+      invalid_relying_party_id_error: "L'ID Relying Party della richiesta di autenticazione non corrisponde all'ID Relying Party del server."
+      user_verification_error: "È richiesta la verifica dell'utente."
+      unsupported_public_key_algorithm_error: "L'algoritmo della chiave pubblica fornito non è supportato dal server."
+      unsupported_attestation_format_error: "Il formato dell'attestazione non è supportato dal server."
+      credential_id_in_use_error: "L'ID credenziale fornito è già in uso."
+      public_key_error: "La verifica della chiave pubblica per la credenziale non è riuscita."
+      ownership_error: "La chiave di sicurezza non è di proprietà dell'utente."
+      not_found_error: "Impossibile trovare una chiave di sicurezza con l'ID credenziale fornito."
+      unknown_cose_algorithm_error: "L'algoritmo utilizzato per la chiave di sicurezza non è riconosciuto."
   topic_flag_types:
     spam:
       title: "Spam"
@@ -829,6 +886,8 @@ it:
     description: "le preferenze email per <b>%{email}</b> sono state aggiornate. Per cambiare le tue impostazioni email <a href='%{url}'>accedi alle tue preferenze utente</a>."
     topic_description: "Per re-iscriverti a %{link}, usa il controllo notifiche in fondo o a destra dell'argomento."
     private_topic_description: "Per re-iscriverti, usa il controllo notifica in fondo o sulla destra dell'argomento."
+  uploads:
+    marked_insecure_from_theme_component_reason: "caricamento utilizzato nel componente del tema"
   unsubscribe:
     title: "Annulla iscrizione"
     stop_watching_topic: "Smetti di osservare questo argomento, %{link}"
@@ -943,7 +1002,14 @@ it:
       yaxis: "Numero di nuovi contributori"
       description: "Numero di utenti che hanno inviato il loro primo messaggio durante questo periodo."
     trust_level_growth:
+      title: "Crescita del livello di esperienza"
+      xaxis:
+        tl1_reached: "Raggiunto TL1"
+        tl2_reached: "Raggiunto TL2"
+        tl3_reached: "Raggiunto TL3"
+        tl4_reached: "Raggiunto TL4"
       yaxis: "Giorno"
+      description: "Numero di utenti che hanno aumentato il loro livello di esperienza durante questo periodo."
     consolidated_page_views:
       title: "Pagine Viste Consolidate"
       xaxis:
@@ -1004,6 +1070,7 @@ it:
       labels:
         level: Livello
       description: "Numero di utenti raggruppati per livello di esperienza."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Utenti per Tipo"
       xaxis: "Tipo"
@@ -1213,6 +1280,7 @@ it:
       other: "Il polling delle email ha generato %{count}errori nelle ultime 24 ore. Controlla <a href='%{base_path}/logs' target='_blank'>i log</a> per maggiori dettagli. "
     missing_mailgun_api_key: "Il server è configurato per inviare email via Mailgun ma non hai fornito la chiave API necessaria a verificare i messaggi webhook."
     bad_favicon_url: "Impossibile caricare la favicon.. Controlla le impostazioni della favicon in <a href='%{base_path}/admin/site_settings'>Impostazioni sito</a> ."
+    deprecated_api_usage: "Abbiamo rilevato una richiesta API che sta utilizzando un metodo di autenticazione obsoleto. Si prega di aggiornare la richiesta API per utilizzare <a href='https://meta.discourse.org/t/-/22706'>l'autenticazione HTTP headers</a>. Dopo l'aggiornamento questo messaggio potrebbe richiedere 24 ore per scomparire."
     poll_pop3_timeout: "La connessione al server POP3 sta scadendo. Le email in entrata non sono state scaricate. Per favore verifica il la tua <a href='%{base_path}/admin/site_settings/category/email'>configurazione POP3</a> e il fornitore di servizi."
     poll_pop3_auth_error: "La connessione al server POP3 è fallita per un errore di autenticazione. Per favore verifica la tua <a href='%{base_path}/admin/site_settings/category/email'>configurazione POP3</a>."
     force_https_warning: "Il tuo sito web utilizza SSL. Ma ` <a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https`</a> non è ancora abilitato nelle impostazioni del tuo sito."
@@ -2207,7 +2275,7 @@ it:
 
         Buona permanenza!
     welcome_tl1_user:
-      title: "Benvenuto utente LE1"
+      title: "Benvenuto utente TL1"
       subject_template: "Grazie per aver passato del tempo con noi"
       text_body_template: "Ehilà! \n\nAbbiamo notato che hai ti sei dato un bel daffare con la lettura, il che è fantastico, quindi ti abbiamo promosso di un [Livello di Esperienza!](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_invite:
@@ -2552,7 +2620,13 @@ it:
       text_body_template: "L'impostazione `download_remote_images_to_local` è stata disabilitata perché è stato raggiunto il limite di spazio su disco definito in `download_remote_images_threshold`."
     dashboard_problems:
       title: "Problemi Cruscotto"
-      subject_template: "Nuovo consiglio sul Cruscotto del tuo sito"
+      subject_template: "Nuovo avviso sul Cruscotto del tuo sito"
+      text_body_template: |
+        Abbiamo alcuni nuovi consigli e raccomandazioni per te in base alle attuali impostazioni del sito.
+
+        [Visita il Cruscotto del tuo sito](%{base_url}/admin) per vederlo.
+
+        Se sul cruscotto non è visibile nulla, è possibile che un altro membro del personale abbia già agito su questo avviso. Un elenco delle azioni staff è disponibile nei [Log Azioni Staff](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Sei il Nuovo Utente del Mese!"
       subject_template: "Sei il Nuovo Utente del Mese!"
@@ -2570,7 +2644,7 @@ it:
       text_body_template: |
         Ciao,
 
-        i messaggi dei nuovi utenti sono stati trattenuti in attesa di moderazione e sono attualmente in attesa di essere riesaminati. [Approva o rifiuta qui] (%{base_url}/review?Type=ReviewableQueuedPost).
+        i messaggi dei nuovi utenti sono stati trattenuti in attesa di moderazione e sono attualmente in attesa di essere riesaminati. [Approvali o rifiutali qui](%{base_url}/review?Type=ReviewableQueuedPost).
   unsubscribe_link: |
     Per annullare l'iscrizione a queste email, [clicca qui](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -2592,13 +2666,55 @@ it:
       title: "Annulla iscrizione"
       description: "Non vuoi ricevere queste email? Nessun problema! Clicca qui sotto per annullare l'iscrizione:"
     reply_by_email: "[Visita Argomento](%{base_url}%{url}) o rispondi a questa email per replicare."
-    reply_by_email_pm: "[Visita il messaggio] (%{base_url}%{url}) o rispondi a questa email per rispondere a %{participants}."
+    reply_by_email_pm: "[Visita Messaggio](%{base_url}%{url}) o rispondi a questa email per rispondere a %{participants}."
     only_reply_by_email: "Rispondi a questa email per replicare."
-    only_reply_by_email_pm: "Rispondi a questa email per rispondere a %{participants}."
+    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}."
+    visit_link_to_respond_pm: "[Visita Messaggio](%{base_url}%{url}) per rispondere a %{participants}."
     posted_by: "Pubblicato da %{username} il %{post_date}"
     pm_participants: "Partecipanti: %{participants}"
+    invited_group_to_private_message_body: |
+      %{username} ha invitato @%{group_name} a partecipare al messaggio
+
+      > **[%{topic_title}](%{topic_url})**
+      >
+      > %{topic_excerpt}
+
+      su
+
+      > %{site_title} -- %{site_description}
+
+      Per partecipare al messaggio, clicca sul seguente collegamento:
+
+      %{topic_url}
+    invited_to_private_message_body: |
+      %{username} ti ha invitato a partecipare al messaggio
+
+      > **[%{topic_title}](%{topic_url})**
+      >
+      > %{topic_excerpt}
+
+      su
+
+      > %{site_title} -- %{site_description}
+
+      Per partecipare al messaggio, clicca sul seguente collegamento:
+
+      %{topic_url}
+    invited_to_topic_body: |
+      %{username} ti ha invitato alla discussione
+
+      > **[%{topic_title}](%{topic_url})**
+      >
+      > %{topic_excerpt}
+
+      su
+
+      > %{site_title} -- %{site_description}
+
+      Per partecipare alla discussione, clicca sul seguente collegamento:
+
+      %{topic_url}
     user_invited_to_private_message_pm_group:
       title: "Gruppo Invitato da Utente ad un MP"
       subject_template: "[%{email_prefix}] %{username} ha invitato @%{group_name} a partecipare al messaggio '%{topic_title}'"
@@ -2691,8 +2807,8 @@ it:
 
         %{respond_instructions}
     user_mentioned_pm:
-      title: "Utente menzionato in Messaggio Privato"
-      subject_template: "[%{email_prefix}] [MP] %{topic_title}"
+      title: "Utente menzionato in Messaggio Personale"
+      subject_template: "[%{email_prefix}] [MP] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2781,14 +2897,15 @@ it:
 
         Se hai delle domande, [contatta il nostro amichevole staff](%{base_url}/about).
     account_second_factor_disabled:
-      title: "Autenticazione a due fattori disabilitata"
-      subject_template: "[%{email_prefix}] Autenticazione a due fattori disattivata"
-      text_body_template: "L'autenticazione a due fattori è stata disabilitata sul tuo account di %{site_name}. Ora puoi accedere solo con la tua password; non è più richiesto un codice di autenticazione aggiuntivo. \n\nSe non hai disabilitato tu l'autenticazione a due fattori, qualcuno potrebbe aver compromesso il tuo account. \n\nSe hai domande, [contatta il nostro staff] (%{base_url}/about).\n"
+      title: "Autenticazione a Due Fattori disabilitata"
+      subject_template: "[%{email_prefix}] Autenticazione a Due Fattori disabilitata"
+      text_body_template: "L'autenticazione a due fattori è stata disabilitata per il tuo account su %{site_name}. Ora puoi accedere solo con la tua password; non è più richiesto un codice di autenticazione aggiuntivo. \n\nSe non hai disabilitato tu l'autenticazione a due fattori, qualcuno potrebbe aver compromesso il tuo account. \n\nSe hai domande, [contatta il nostro staff](%{base_url}/about).\n"
     digest:
       why: "Un breve sommario di %{site_link} dalla tua ultima visita il %{last_seen_at}"
       since_last_visit: "Dalla tua ultima visita"
       new_topics: "Nuovi Argomenti"
       unread_notifications: "Notifiche Non Lette"
+      unread_high_priority: "Notifiche ad Alta Priorità Non Lette"
       liked_received: "Like ricevuti"
       new_users: "Nuovi utenti"
       popular_topics: "Argomenti Di Successo"
@@ -2800,6 +2917,7 @@ it:
       unsubscribe: "Questo riepilogo viene inviato da %{site_link} se non ti si vede da un po'. Modifica %{email_preferences_link}, o %{unsubscribe_link} per annullare l'iscrizione."
       your_email_settings: "le tue impostazioni email"
       click_here: "clicca qui"
+      from: "%{site_name}"
       preheader: "Un breve riepilogo dall'ultima tua visita il %{last_seen_at}"
     forgot_password:
       title: "Password Dimenticata"
@@ -2812,9 +2930,9 @@ it:
         Clicca il seguente collegamento per scegliere una nuova password:
         %{base_url}/u/password-reset/%{email_token}
     email_login:
-      title: "Connettiti tramite collegamento"
-      subject_template: "[%{email_prefix}] Connettiti tramite collegamento"
-      text_body_template: "Ecco il collegamento per connetterti a [%{site_name}] (%{base_url}). \n\nSe non hai richiesto questo collegamento, puoi tranquillamente ignorare questa email. \n\nFare clic sul seguente collegamento per accedere:\n %{base_url}/session/email-login/%{email_token}\n"
+      title: "Accedi tramite collegamento"
+      subject_template: "[%{email_prefix}] Accedi tramite collegamento"
+      text_body_template: "Ecco il collegamento per accedere a [%{site_name}](%{base_url}). \n\nSe non hai richiesto questo collegamento, puoi tranquillamente ignorare questa email. \n\nClicca sul seguente collegamento per accedere:\n %{base_url}/session/email-login/%{email_token}\n"
     set_password:
       title: "Imposta Password"
       subject_template: "[%{email_prefix}] Imposta Password"
@@ -2828,6 +2946,13 @@ it:
     admin_login:
       title: "Accesso Amministratore"
       subject_template: "[%{email_prefix}] Login"
+      text_body_template: |
+        Qualcuno ha richiesto di connettersi 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 collegamento per accedere:
+        %{base_url}/session/email-login/%{email_token}
     account_created:
       title: "Account Creato"
       subject_template: "[%{email_prefix}] Il Tuo Nuovo Account"
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 47d29ad2e8..ae56e14962 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -16,6 +16,7 @@ ko:
       short_no_year: "%B %-d"
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
+      no_day: "% B % Y"
   date:
     month_names: [~, 1월, 2월, 3월, 4월, 5월, 6월, 7월, 8월, 9월, 10월, 11월, 12월]
     <<: *datetime_formats
@@ -35,18 +36,47 @@ ko:
   disable_remote_images_download_reason: "디스크저장공간이 부족하여 원격 이미지 다운로드 기능이 비활성화 되었습니다."
   anonymous: "익명"
   remove_posts_deleted_by_author: "글쓴이에 의해 삭제된 글"
+  redirect_warning: "선택한 링크가 실제로 포럼에 게시되어 있는지 확인할 수 없습니다. 계속 진행하려면 아래 링크를 선택하십시오."
+  on_another_topic: "다른 주제에"
   themes:
+    bad_color_scheme: "테마, 유효하지 않은 색상 표를 업데이트 할 수 없습니다"
     other_error: "테마를 업데이트할 수 없습니다"
+    compile_error:
+      unrecognized_extension: "인식 할 수없는 파일 확장자 : %{extension}"
     import_error:
       generic: 해당 테마를 가져 오는 중 오류가 발생했습니다
+      about_json: "가져 오기 오류 : about.json이 존재하지 않거나 유효하지 않습니다"
+      about_json_values: "about.json에 유효하지 않은 값이 있습니다 : %{errors}"
+      modifier_values: "about.json 수정 자에 유효하지 않은 값이 있습니다 : %{errors}"
+      git: "자식 저장소 복제 오류, 액세스가 거부되었거나 저장소를 찾을 수 없음"
       unpack_failed: "파일 압축을 풀지 못했습니다"
+      file_too_big: "압축되지 않은 파일이 너무 큽니다."
+      unknown_file_type: "업로드 한 파일이 유효한 담화 테마가 아닙니다."
+    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`입니다."
+      name_too_long: "이름이 너무 긴 설정이 있습니다. 최대 길이는 255입니다"
+      default_value_missing: "`%{name}` 설정에는 기본값이 없습니다"
+      default_not_match_type: "`%{name}` 기본 설정 유형이 설정 유형과 일치하지 않습니다."
+      default_out_range: "`%{name}` 기본값 설정이 지정된 범위 내에 있지 않습니다."
+      enum_value_not_valid: "선택된 값은 열거 형 선택 중 하나가 아닙니다."
+      number_value_not_valid: "새 값이 허용 된 범위 내에 있지 않습니다."
       number_value_not_valid_min_max: "반드시 값은 %{min}와 %{max}사이어야 합니다."
       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:
       default_subject: "토픽에는 제목이 필요합니다"
@@ -60,7 +90,11 @@ ko:
         no_message_id_error: "메일에 'Message-Id'헤더가 없을 때 발생합니다."
         auto_generated_email_error: "'precedence'헤더가 list, junk, bulk, auto_reply로 설정되어 있거나 다른 헤더에 auto-submitted, auto-replied, auto-generated가 있을 때 발생합니다."
         no_body_detected_error: "body를 추출할 수 없거나 첨부파일이 없을 때 발생합니다."
+        no_sender_detected_error: "보낸 사람 헤더에서 유효한 이메일 주소를 찾을 수 없을 때 발생합니다."
+        from_reply_by_address_error: "보낸 사람 헤더가 이메일 주소 별 회신과 일치 할 때 발생합니다."
         inactive_user_error: "발신자(sender)가 비활성상태일 때 발생합니다."
+        silenced_user_error: "발신자가 무음 상태가되면 발생합니다."
+        bad_destination_address: "받는 사람 / 참조 필드의 전자 메일 주소가 구성된 수신 전자 메일 주소와 일치하지 않으면 발생합니다."
         strangers_not_allowed_error: "사용자가 자신이 속하지 않은 카테고리에 토픽 생성을 시도할 때 발생합니다."
         insufficient_trust_level_error: "사용자가 더 높은 신뢰 레벨이 필요한 카테고리에 토픽 생성을 시도할 때 발생합니다."
         reply_user_not_matching_error: "발신한 알림에 대하여 서로 다른 이메일로 답장이 올 때 발생합니다."
@@ -68,7 +102,10 @@ ko:
         topic_closed_error: "답글을 했지만 해당 토픽이 닫힌 경우 발생합니다."
         bounced_email_error: "반송된 이메일 리포트 이메일입니다."
         screened_email_error: "발신자의 이메일 주소가 이미 차단되었을 때 발생합니다."
+        unsubscribe_not_allowed: "이 사용자에게 이메일을 통한 구독 취소가 허용되지 않은 경우에 발생합니다."
+        email_not_allowed: "이메일 주소가 화이트리스트에 없거나 블랙리스트에있을 때 발생합니다."
       unrecognized_error: "인식되지 않은 에러"
+    secure_media_placeholder: "수정 됨 :이 사이트에 보안 미디어가 활성화되어 있습니다. 주제를 방문하여 첨부 된 이미지 / 오디오 / 비디오를보십시오."
   errors: &errors
     format: "%{attribute} %{message}"
     format_with_full_message: "<b>%{attribute}</b>:%{message}"
@@ -90,6 +127,7 @@ ko:
       inclusion: 리스트에 없음
       invalid: 올바르지 않음
       is_invalid: "문장이 불분명합니다."
+      invalid_timezone: "&#39;%{tz}&#39;은 (는) 유효한 시간대가 아닙니다"
       contains_censored_words: "검열된 단어가 있습니다: %{censored_words}"
       less_than: "%{count}보다 작아야 함"
       less_than_or_equal_to: "%{count}보다 작거나 같아야 함"
@@ -98,6 +136,8 @@ ko:
       odd: 홀수여야 함
       record_invalid: "유효성검사 실패: %{errors}"
       max_emojis: "가질수있는 이모티콘 개수가%{max_emojis_count}를 넘을수 없습니다."
+      emojis_disabled: "이모티콘을 가질 수 없습니다"
+      ip_address_already_screened: "기존 규칙에 이미 포함되어 있습니다"
       restrict_dependent_destroy:
         one: "연관된 %{record} 레코드가 존재하므로 레코드를 지울 수 없음."
         many: "연관된 %{record} 레코드가 존재하므로 레코드를 지울 수 없음."
@@ -108,6 +148,7 @@ ko:
       wrong_length:
         other: 잘못된 길이 (%{count} 글자여야 함)
       other_than: " %{count} 글자가 아니어야 합니다."
+      sso_overrides_username: "`sso_overrides_username` 설정이 활성화되어 있으므로 SSO 제공자 측에서 사용자 이름을 업데이트해야합니다."
     template:
       body: "다음 필드에 문제가 있음:"
       header:
@@ -115,17 +156,33 @@ ko:
     embed:
       load_from_remote: "글 로딩 중 오류가 발생하였습니다."
     site_settings:
+      invalid_category_id: "존재하지 않는 카테고리를 지정했습니다"
       default_categories_already_selected: "다른 목록에서 사용중인 카테고리는 선택할 수 없습니다."
+      default_tags_already_selected: "다른 목록에 사용 된 태그를 선택할 수 없습니다."
       s3_upload_bucket_is_required: "'s3_upload_bucket'이 설정되지 않으면 S3로 업로드하기를 활성화할 수 없습니다."
+      enable_s3_uploads_is_required: "S3 업로드를 활성화하지 않으면 S3에 인벤토리를 활성화 할 수 없습니다."
+      s3_backup_requires_s3_settings: "&#39;%{setting_name}&#39;을 제공하지 않으면 S3을 백업 위치로 사용할 수 없습니다."
+      s3_bucket_reused: "&#39;s3_upload_bucket&#39;및 &#39;s3_backup_bucket&#39;에 동일한 버킷을 사용할 수 없습니다. 다른 버킷을 선택하거나 각 버킷마다 다른 경로를 사용하십시오."
+      secure_media_requirements: "보안 미디어를 활성화하기 전에 S3 업로드를 활성화해야합니다."
+      second_factor_cannot_be_enforced_with_disabled_local_login: "로컬 로그인이 비활성화 된 경우 2FA를 시행 할 수 없습니다."
+      local_login_cannot_be_disabled_if_second_factor_enforced: "2FA가 적용되는 경우 로컬 로그인을 비활성화 할 수 없습니다. 로컬 로그인을 비활성화하기 전에 강제 2FA를 비활성화하십시오."
+      cannot_enable_s3_uploads_when_s3_enabled_globally: "S3 업로드가 이미 전체적으로 활성화되어 있으므로이 사이트 수준을 활성화하면 S3 업로드를 활성화 할 수 없습니다."
+    conflicting_google_user_id: '이 계정의 Google 계정 ID가 변경되었습니다. 보안상의 이유로 직원의 개입이 필요합니다. 직원에게 연락하여 <br> <a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   activemodel:
     errors:
       <<: *errors
   invite:
+    not_found: "초대 토큰이 유효하지 않습니다. <a href='%{base_url}/about'>직원에게 문의</a> 하십시오."
+    not_found_json: "초대 토큰이 유효하지 않습니다. 직원에게 문의하십시오."
+    error_message: "초대를 수락하는 중에 오류가 발생했습니다. 사이트 관리자에게 문의하십시오."
     user_exists: "<b>%{email}</b>님은 초대하지 않아도 됩니다. <a href='%{base_path}/u/%{username}/summary'>이미 회원이거든요!</a>"
+    confirm_email: "<p> 거의 다 끝났습니다! 귀하의 이메일 주소로 활성화 메일을 보냈습니다. 메일의 지침에 따라 계정을 활성화하십시오. </p><p> 도착하지 않으면 스팸 폴더를 확인하십시오. </p>"
   bulk_invite:
     file_should_be_csv: "업로드 파일은 CSV형식이어야 합니다."
+    max_rows: "첫 번째 %{max_bulk_invites} 초대가 전송되었습니다. 파일을 작은 부분으로 분할하십시오."
     error: "해당 파일을 업로드하는 중에 에러가 발생했습니다. 다음에 다시 시도해보세요."
   topic_invite:
+    failed_to_invite: "%{group_names} 그룹 중 하나에 그룹 구성원이 없으면이 주제에 사용자를 초대 할 수 없습니다."
     user_exists: "해당 사용자는 이미 초대를 받았습니다. 토픽 초대는 딱 한번만 할 수 있습니다."
   backup:
     operation_already_running: "현재 작업이 실행중입니다. 지금은 새로운 일을 시작할 수 없습니다."
@@ -136,12 +193,25 @@ ko:
     location:
       local: "로컬"
       s3: "아마존 S3"
+  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: "배지 이유로 외부 또는 잘못된 담화 링크를 사용할 수 없습니다."
+  email_template_cant_be_modified: "이 이메일 템플릿은 수정할 수 없습니다"
+  invalid_whisper_access: "속삭임이 활성화되어 있지 않거나 속삭임 게시물을 작성할 수있는 권한이 없습니다"
   not_in_group:
+    title_topic: "이 주제를 보려면 그룹에 있어야합니다."
+    title_category: "이 카테고리를 보려면 그룹에 속해 있어야합니다."
+    request_membership: "회원 신청"
     join_group: "그룹 참여하기"
+  deleted_topic: "죄송합니다! 이 주제는 삭제되었으며 더 이상 사용할 수 없습니다."
+  delete_topic_failed: "해당 주제를 삭제하는 중에 오류가 발생했습니다. 사이트 관리자에게 문의하십시오."
   reading_time: "읽은 시간"
   likes: "좋아요"
   too_many_replies:
@@ -151,6 +221,8 @@ ko:
     continue: "토론 계속하기"
     error: "삽입에 실패했습니다."
     referer: "리퍼러(Referer):"
+    error_topics: "&#39;포함 된 주제 목록&#39;사이트 설정이 활성화되지 않았습니다."
+    mismatch: "참조자가 전송되지 않았거나 다음 호스트와 일치하지 않습니다."
     no_hosts: "임베딩을 위한 호스트가 설정되지 않았습니다."
     configure: "삽입 설정"
     more_replies:
@@ -161,7 +233,9 @@ ko:
     in_reply_to: "▶ %{username}"
     replies:
       other: "%{count} 댓글"
+    last_reply: "마지막 답장"
     created: "생성일자"
+    new_topic: "새로운 주제 만들기"
   no_mentions_allowed: "죄송합니다, 다른 사용자를 언급할 수 없습니다."
   too_many_mentions:
     other: "죄송합니다, 이 포스트에서 %{count}명의 사용자만 언급할 수 있습니다."
@@ -179,12 +253,17 @@ ko:
   links_require_trust: "죄송합니다. 게시물에 링크를 포함 할 수 없습니다."
   too_many_links:
     other: "죄송합니다. 신규회원은 글 하나에 링크를 %{count}개까지 넣을 수 있습니다."
+  contains_blocked_word: "게시물에 허용되지 않는 단어가 포함되어 있습니다 : %{word}"
+  contains_blocked_words: "게시물에 허용되지 않는 단어가 여러 개 있습니다 : %{words}"
   spamming_host: "죄송합니다. 회원님은 링크를 첨부할 수 없습니다."
   user_is_suspended: "가입이 보류된 회원은 글을 쓸 수 없습니다."
   topic_not_found: "뭔가 잘못됐네요. 아마 읽려는 도중에 토픽이 닫혔거나 지워진 건 아닐까요?"
   not_accepting_pms: "죄송합니다. %{username} 님이 당분간 메시지를 받지 않습니다."
   max_pm_recipients: "죄송합니다. 최대 %{recipients_limit} 명의 수신자에게만 메시지를 보낼 수 있습니다."
+  pm_reached_recipients_limit: "메시지에 수신자가 %{recipients_limit} 명을 초과 할 수 없습니다."
   removed_direct_reply_full_quotes: "이전 전체 게시물의 인용을 자동으로 제거했습니다."
+  secure_upload_not_allowed_in_public_topic: "죄송합니다, 공개 보안 주제로는 %{upload_filenames}을 (를) 사용할 수 없습니다."
+  create_pm_on_existing_topic: "기존 주제에 대해 PM을 만들 수 없습니다."
   just_posted_that: "당신이 이전에 게시한 것과 너무 비슷합니다."
   invalid_characters: "사용할 수 없는 문자를 포함하고 있습니다."
   is_invalid: "문장이 불분명합니다."
@@ -215,22 +294,33 @@ ko:
     tag: "태그된 토픽"
     badge: "%{site_title}의 %{display_name} 배지"
   too_late_to_edit: "이 글은 작성된 지 너무 오랜 기간이 지났습니다. 수정 또는 삭제할 수 없습니다."
+  edit_conflict: "해당 게시물은 다른 사용자가 수정했으며 변경 사항을 더 이상 저장할 수 없습니다."
   revert_version_same: "복구하려는 버전과 현재 버전이 똑같습니다."
   excerpt_image: "이미지"
   bookmarks:
+    errors:
+      already_bookmarked_post: "동일한 게시물을 두 번 북마크 할 수 없습니다."
+      cannot_set_past_reminder: "과거에는 북마크 미리 알림을 설정할 수 없습니다."
+      cannot_set_reminder_in_distant_future: "앞으로 10 년 이상 책갈피 알림을 설정할 수 없습니다."
+      time_must_be_provided: "&#39;%{reminder_type}&#39;을 제외한 모든 알림에 시간을 제공해야합니다."
     reminders:
+      at_desktop: "다음에 저는 데스크탑에 있습니다"
       later_today: "오늘 늦게"
+      next_business_day: "다음 영업일"
       tomorrow: "내일"
       next_week: "다음 주"
       next_month: "다음 달"
+      custom: "맞춤 날짜 및 시간"
   groups:
     errors:
+      grant_trust_level_not_valid: "&#39;%{trust_level}&#39;은 (는) 유효한 신뢰 수준이 아닙니다."
       can_not_modify_automatic: "자동 설정 그룹은 수정할 수 없습니다."
       invalid_domain: "'%{domain}'은 유효한 도메인이 아닙니다."
       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: "이 그룹의 회원 자격을 이미 요청하셨습니다."
     default_names:
       everyone: "모든 사람"
       admins: "관리자"
@@ -243,6 +333,7 @@ ko:
       trust_level_4: "회원등급 4"
     request_membership_pm:
       title: "@%{group_name}그룹에 가입 신청"
+    view_hidden_topic_request_reason: "&#39;%{group_name}&#39;그룹에 가입하고 싶습니다. [이 주제]에 액세스 할 수 있습니다 (%{topic_url})"
   education:
     until_posts:
       other: "글 %{count}개"
@@ -316,6 +407,8 @@ ko:
               cant_send_pm: "죄송합니다. 해당 사용자에게 개인 메시지를 보낼 수 없습니다."
               no_user_selected: "유효한 사용자를 선택해주십시오"
               reply_by_email_disabled: "이메일로 답글쓰기가 비활성화되었습니다."
+              target_user_not_found: "이 메시지를 보내는 사용자 중 하나를 찾을 수 없습니다."
+              unable_to_update: "해당 주제를 업데이트하는 중에 오류가 발생했습니다."
             featured_link:
               invalid: "는 올바르지 않습니다. URL은 http:// 또는 https://를 포함해야 합니다."
               invalid_category: "이 카테고리에서는 편집할 수 없습니다."
@@ -326,9 +419,22 @@ ko:
               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:
@@ -387,6 +493,7 @@ ko:
   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: "카테고리를 찾을수 없습니다!"
@@ -397,7 +504,11 @@ ko:
       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: "이 주제에는 허용되지 않는 태그가 있습니다 : &#39;%{tags}&#39;"
+      disallowed_tags_generic: "이 주제는 태그를 허용하지 않습니다."
     cannot_delete:
+      uncategorized: "이 카테고리는 특별합니다. 카테고리가없는 주제의 보관 영역으로 사용됩니다. 삭제할 수 없습니다."
       has_subcategories: "하위 카테고리가 있어, 삭제할 수 없습니다."
       topic_exists_no_oldest: "%{count}개의 글타래가 이 카테고리 내에 있어 삭제할 수 없습니다."
     uncategorized_description: "카테고리가 필요없는 토픽이거나, 토픽에 부합하는 카테고리가 없습니다."
@@ -418,6 +529,22 @@ ko:
       broken: "이미지를 표시할수없음"
   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:
       other: "%{count}시간"
     minutes:
@@ -488,6 +615,7 @@ ko:
   user_auth_tokens:
     browser:
       chrome: "구글 크롬"
+      discoursehub: "DiscourseHub 앱"
       edge: "마이크로소프트 엣지"
       firefox: "파이어폭스"
       ie: "인터넷 익스플로러"
@@ -496,6 +624,7 @@ ko:
       unknown: "알수없는 브라우저"
     device:
       android: "안드로이드 기기"
+      chromebook: "크롬 북"
       ipad: "아이패드"
       iphone: "아이폰"
       ipod: "아이팟"
@@ -506,17 +635,33 @@ ko:
       unknown: "알수없는 디바이스"
     os:
       android: "안드로이드"
+      chromeos: "ChromeOS"
       ios: "iOS"
       linux: "리눅스"
       macos: "맥OS"
       windows: "마이크로소프트 윈도우"
       unknown: "알수없는 운영체제"
   change_email:
+    wrong_account_error: "잘못된 계정으로 로그인했습니다. 로그 아웃 한 후 다시 시도하십시오."
     confirmed: "이메일 주소가 변경되었습니다."
     please_continue: "%{site_name}으로 가기"
     error: "이메일 주소를 변경하는데 문제가 있습니다. 주소가 이미 사용되고 있나요?"
     error_staged: "이메일 주소 변경중에 에러가 발생했습니다. 이 주소는 격리된 사용자가 이미 사용중입니다."
     already_done: "죄송합니다. 이 확인 링크는 더 이상 유효하지 않습니다. 이메일이 이미 변경되지는 않았나요?"
+    confirm: "확인"
+    authorizing_new:
+      title: "새 이메일 확인"
+      description: "새 이메일 주소가 다음으로 변경되었는지 확인하십시오."
+    authorizing_old:
+      title: "이메일 주소 변경"
+      description: "이메일 주소 변경을 확인하십시오"
+      old_email: "오래된 이메일 : %{email}"
+      new_email: "새로운 이메일 : %{email}"
+      almost_done_title: "새 이메일 주소 확인"
+      almost_done_description: "변경 사항을 확인하기 위해 새 이메일 주소로 이메일을 보냈습니다!"
+  associated_accounts:
+    revoke_failed: "%{provider_name}으로 계정을 해지하지 못했습니다."
+    connected: "(연결됨)"
   activation:
     action: "여기를 눌러 계정을 활성화하세요."
     already_done: "죄송합니다. 이 계정 확인 링크는 더 이상 유효하지 않습니다."
@@ -528,6 +673,7 @@ ko:
     activated: "죄송합니다. 이 계정은 이미 활성화되었습니다."
     admin_confirm:
       title: "관리자 계정 확정하기"
+      description: "<b>%{target_username} (%{target_email})</b> 를 관리자로 설정 하시겠습니까?"
       grant: "관리자 권한 부여"
       complete: "<b>%{target_username}</b> 님은 이제 관리자입니다."
       back_to: "%{title}로 돌아가기"
@@ -549,6 +695,8 @@ ko:
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: "부적절함"
+      description: '이 게시물에는 합리적인 사람이 모욕적이거나 모욕적이거나 <a href="%{base_path}/guidelines">커뮤니티 가이드 라인을</a> 위반 한 것으로 간주하는 내용이 포함되어 있습니다.'
+      short_description: '<a href="%{base_path}/guidelines">커뮤니티 지침</a> 위반'
       long_form: "부적절함으로 신고하기"
     notify_user:
       title: "@{{username}} 님에게 메시지를 보냅니다"
@@ -574,11 +722,19 @@ ko:
       description: "좋아요"
       short_description: "좋아요"
       long_form: "이것을 좋아함"
+  draft:
+    sequence_conflict_error:
+      title: "초안 오류"
+      description: "초안이 다른 창에서 편집 중입니다. 이 페이지를 다시로드하십시오."
+  draft_backup:
+    pm_title: "진행중인 주제의 백업 초안"
+    pm_body: "백업 초안이 포함 된 주제"
   user_activity:
     no_default:
       self: "아직 활동이 없습니다."
       others: "활동 없음."
     no_bookmarks:
+      self: "북마크 된 게시물이 없습니다. 북마크를 사용하면 특정 게시물을 빠르게 참조 할 수 있습니다."
       others: "북마크가 없습니다"
     no_likes_given:
       self: "좋아요한 게시글이 없습니다"
@@ -586,6 +742,23 @@ ko:
     no_replies:
       self: "어떠한 게시물에도 답글을 단 적이 없습니다."
       others: "답글이 없습니다."
+    no_drafts:
+      self: "초안이 없습니다. 주제에 대한 답글 작성을 시작하면 새 초안으로 자동 저장됩니다."
+  webauthn:
+    validation:
+      invalid_type_error: "제공된 웹 인증 유형이 잘못되었습니다. 유효한 유형은 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: "신임 정보에 대한 공개 키 검증에 실패했습니다."
+      ownership_error: "보안 키는 사용자가 소유하지 않습니다."
+      not_found_error: "제공된 자격 증명 ID가있는 보안 키를 찾을 수 없습니다."
+      unknown_cose_algorithm_error: "보안 키에 사용 된 알고리즘이 인식되지 않습니다."
   topic_flag_types:
     spam:
       title: "스팸"
@@ -594,15 +767,21 @@ ko:
       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}">TOS</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: "자주보는 글타래"
@@ -612,7 +791,12 @@ ko:
         make: "이 글타래는 배너에 올라왔습니다. 사용자가 내리기 전까지 모든 페이지의 상단에 표시됩니다."
         remove: "이 글타래는 배너에서 내려왔습니다. 더 이상 모든 페이지의 상단에 표시되지 않습니다."
   unsubscribed:
+    title: "이메일 환경 설정이 업데이트되었습니다!"
+    description: "<b>%{email}</b> 에 대한 이메일 환경 설정이 업데이트되었습니다. 이메일 설정을 변경하려면 <a href='%{url}'>사용자 기본</a> 설정을 <a href='%{url}'>방문하십시오</a> ."
     topic_description: "%{link}를 재구독하려면 토픽 하단, 또는 우측에 있는 알림 설정을 사용하세요."
+    private_topic_description: "다시 구독하려면 주제의 맨 아래 또는 오른쪽에있는 알림 제어를 사용하십시오."
+  uploads:
+    marked_insecure_from_theme_component_reason: "테마 구성 요소에 사용 된 업로드"
   unsubscribe:
     title: "구독해지"
     stop_watching_topic: "%{link} 이 토픽 그만보기"
@@ -623,7 +807,10 @@ ko:
     different_user_description: "우리가 메일을 보낸 사용자가 아닌 다른 사용자로 로그인되어 있습니다. 로그아웃하시거나, 익명 모드를 켜시고 다시 시도해주세요."
     not_found_description: "죄송합니다. 구독 해지할 수 없습니다. 이메일의 구독해지 링크 기한이 만료되지는 않았나요?"
     log_out: "로그아웃"
+    submit: "환경 설정 저장"
     digest_frequency:
+      title: "요약 이메일을 받고 있습니다 %{frequency}"
+      select_title: "요약 이메일 빈도를 다음으로 설정하십시오."
       never: "하지않음"
       every_30_minutes: "매 30분 마다"
       every_hour: "매 시간"
@@ -637,8 +824,12 @@ ko:
     read: "읽기"
     read_write: "읽기/쓰기"
     description: '"%{application_name}" 이(가) 당신의 계정에 다음의 접근을 요청합니다:'
+    instructions: '&quot;%{application_name}&quot;과 함께 사용할 새 사용자 API 키를 생성했습니다. 다음 키를 응용 프로그램에 붙여 넣으십시오.'
+    otp_description: '&quot;%{application_name}&quot;가이 사이트에 액세스하도록 허용 하시겠습니까?'
     otp_confirmation:
       confirm_title: "%{site_name}으로 가기"
+      logging_in_as: "%{username}으로 로그인"
+      confirm_button: 로그인 완료
     no_trust_level: "죄송하지만, 사용자 API에 접근할 수 있는 신뢰 레벨보다 낮습니다."
     generic_error: "죄송합니다. 사용자 API 키를 발급할 수 없습니다. 운영진이 이 기능을 해제한 것 같습니다."
     scopes:
@@ -648,6 +839,10 @@ ko:
       session_info: "사용자 세션 정보 읽기"
       read: "모두 읽기"
       write: "모두 쓰기"
+      one_time_password: "일회성 로그인 토큰 생성"
+    invalid_public_key: "공개 키가 유효하지 않습니다."
+    invalid_auth_redirect: "죄송합니다.이 auth_redirect 호스트는 허용되지 않습니다."
+    invalid_token: "토큰이 없거나 유효하지 않거나 만료되었습니다."
   flags:
     errors:
       already_handled: "이미 처리된 신고"
@@ -658,47 +853,92 @@ ko:
         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: 작성된 PM
         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:
-      yaxis: "일"
-    consolidated_page_views:
+      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: "마지막 날에 로그인 한 회원 수를 지난 달에 로그인 한 회원 수로 나눈 값 – 커뮤니티 &#39;고착성&#39;을 나타내는 %를 반환합니다. 30 % 이상을 목표로하십시오."
     daily_engaged_users:
+      title: "참여한 일일 사용자"
       xaxis: "일"
       yaxis: "참여한 사용자"
       description: "마지막 날 좋아요나 글 게시 사용자 수 입니다."
@@ -706,14 +946,17 @@ ko:
       title: "회원 프로필 조회수"
       xaxis: "일"
       yaxis: "회원 프로필 조회된 횟수"
+      description: "사용자 프로필에 대한 새로운 관점."
     topics:
       title: "글타래들"
       xaxis: "일"
       yaxis: "새로운 글타래의 개수"
+      description: "이 기간 동안 작성된 새로운 주제."
     posts:
       title: "글들"
       xaxis: "일"
       yaxis: "새로운 글의 개수"
+      description: "이 기간 동안 작성된 새 게시물"
     likes:
       title: "좋아요"
       xaxis: "일"
@@ -728,13 +971,17 @@ ko:
       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:
@@ -743,20 +990,30 @@ ko:
         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: "일"
@@ -766,14 +1023,17 @@ ko:
       title: "운영자 주의"
       xaxis: "일"
       yaxis: "메세지 수"
+      description: "중재자가 개인 메시지로 보낸 경고 수"
     notify_moderators_private_messages:
       title: "운영자에게 알리기"
       xaxis: "일"
       yaxis: "메세지 수"
+      description: "운영자에게 플래그가 개인에게 통지 한 횟수입니다."
     notify_user_private_messages:
       title: "사용자에게 알리기"
       xaxis: "일"
       yaxis: "메세지 수"
+      description: "사용자가 플래그를 통해 비공개로 알림을받은 횟수입니다."
     top_referrers:
       title: "가장 많이 언급된 사용자들"
       xaxis: "사용자"
@@ -805,26 +1065,32 @@ ko:
       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: "일"
@@ -853,16 +1119,23 @@ ko:
       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:
@@ -879,27 +1152,57 @@ ko:
       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 파일은 기본 호스트네임을 사용하고 있습니다. 사이트의 호스트네임으로 업데이트 하세요."
     sidekiq_warning: 'Sidekiq 이 현재 실행되고 있지 않습니다. Sidekiq는 이메일 전송 같은 많은 작업들을 비동기식으로 처리합니다. 적어도 하나의 sidekiq 프로세서를 실행시켜 주세요. <a href="https://github.com/mperham/sidekiq">Sidekiq 배우기</a>.'
     queue_size_warning: "큐 작업의 수가 %{queue_size} 개 입니다. 작업의 수가 너무 많습니다. Sidekiq에 문제가 있을 수 있습니다. Sidekiq Worker를 더 추가하세요."
     memory_warning: "당신의 서버는 1GB 이하 메모리로 실행되고 있습니다. 적어도 1GB 이상의 메모리를 사용하세요."
+    google_oauth2_config_warning: '서버가 Google OAuth2 (enable_google_oauth2_logins)로 가입하고 로그인 할 수 있도록 구성되었지만 클라이언트 ID 및 클라이언트 비밀번호 값이 설정되지 않았습니다. <a href="%{base_path}/admin/site_settings">사이트 설정으로</a> 이동하여 <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="%{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="%{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="%{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="%{base_path}/admin/site_settings">설정</a> 을 업데이트하십시오. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">&quot;S3에 이미지 업로드를 설정하는 방법&quot;을 참조하십시오. 자세한 내용은</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="%{base_path}/admin/site_settings">설정</a> 을 업데이트하십시오. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">&quot;S3에 이미지 업로드를 설정하는 방법&quot;을 참조하십시오. 자세한 내용은</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:
       other: "이메일 폴링에서 지난 24시간 동안%{count}개의 에러가 발생하였습니다. 세부 정보는 <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> 설정에서 즐겨 찾기 아이콘 설정을 확인하십시오."
+    deprecated_api_usage: "더 이상 사용되지 않는 인증 방법을 사용하여 API 요청을 감지했습니다. <a href='https://meta.discourse.org/t/-/22706'>헤더 기반 인증</a> 을 사용하도록 업데이트하십시오. 이 메시지를 업데이트 한 후 사라지는 데 24 시간이 걸릴 수 있습니다."
+    update_mail_receiver: "오래된 메일 수신자 버전이 감지되었습니다. 업데이트 지침을 보려면 <a href='https://meta.discourse.org/t/-/133491'>여기</a> 를 클릭 <a href='https://meta.discourse.org/t/-/133491'>하십시오</a> . 이 메시지를 업데이트 한 후 사라지는 데 24 시간이 걸릴 수 있습니다."
     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/logs/watched_words'>감시 단어 설정을</a> 확인하거나 &#39;감시 단어 정규식&#39;사이트 설정을 비활성화하십시오."
   site_settings:
     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: "익명 사용자의 인터페이스 언어를 웹브라우저 언어 헤더를 기준으로 변경하기(실험적인 기능입니다. 익명 cache와 동작하지 않습니다.)"
+    support_mixed_text_direction: "왼쪽에서 오른쪽 및 오른쪽에서 왼쪽으로 혼합 된 텍스트 방향을 지원합니다."
     min_post_length: "글의 최소 글자 수"
     min_first_post_length: "첫 글 (내용)의 최소 길이"
     min_personal_message_post_length: "메시지에 허용되는 최소 글자 수"
@@ -916,114 +1219,224 @@ ko:
     search_recent_posts_size: "대문에 실을 최신 포스트 수"
     log_search_queries: "사용자에 의해 발생된 로그 탐색 쿼리"
     search_query_log_max_size: "최대 쿼리 기록 저장 수"
+    search_query_log_max_retention_days: "검색어를 유지하는 최대 시간 (일)입니다."
+    search_ignore_accents: "텍스트를 검색 할 때 악센트를 무시하십시오."
+    category_search_priority_very_low_weight: "카테고리 검색 우선 순위가 매우 낮은 순위에 가중치가 적용됩니다."
+    category_search_priority_low_weight: "카테고리 검색 우선 순위가 낮은 순위에 가중치가 적용됩니다."
+    category_search_priority_high_weight: "카테고리 검색 우선 순위가 높은 순위에 가중치가 적용됩니다."
+    category_search_priority_very_high_weight: "카테고리 검색 우선 순위가 매우 높은 순위에 가중치가 적용됩니다."
     allow_uncategorized_topics: "카테고리 없이 게시 허용. 주의: 카테고리 없는 글은 이 항목을 비활성화에 하기전에 카테고리 설정을 해야 합니다."
     allow_duplicate_topic_titles: "같은 제목의 동일한 주제 허용"
     unique_posts_mins: "같은 컨텐츠를 다시 글 할 수 있는 기간(분)"
     educate_until_posts: "새로운 사용자가 글를 작성할 시 글 작성 방법에 대한 교육패널을 보여주는데, 해당 패널이 보여지는 초기 글 개수"
     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: "원격의 이미지를 로컬에 다운받기 위한 최소 디스크 공간(%)"
     download_remote_images_max_days_old: "n일이 지난 후에는 포스트에 원격 이미지를 다운로드하지 않도록 설정"
     disabled_image_download_domains: "이 도메인을 통해서 원격 이미지를 다운로드 하지 않는다. ` | `를 구분자로 한 리스트"
     editing_grace_period: "글 작성 후, 편집해도 히스토리에 남기지 않는 시간 (단위: 초)"
+    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 를 설정함. parent domain을 포함한 internal link는 예외임. 이 설정을 바꾸려면 모든 baked markdown을 "rake posts:rebake" 명령으로 변경해주서야 함'
+    exclude_rel_nofollow_domains: "nofollow를 링크에 추가하지 않아야하는 도메인 목록입니다. example.com은 자동으로 sub.example.com도 허용합니다. 최소한 웹 크롤러가 모든 콘텐츠를 찾을 수 있도록이 사이트의 도메인을 추가해야합니다. 웹 사이트의 다른 부분이 다른 도메인에있는 경우 해당 도메인도 추가하십시오."
     post_excerpt_maxlength: "글 인용에 허용되는 최대 글자수"
     show_pinned_excerpt_mobile: "모바일 뷰에서 고정 토픽의 발췌 내용을 보여주기"
     show_pinned_excerpt_desktop: "데스크톱 뷰에서 고정 토픽의 발췌 내용을 보여주기"
     post_onebox_maxlength: "onebox가 적용된 Discourse 글에 허용되는 최대 글자수"
     onebox_domains_blacklist: "박스 링크 적용하지 않을 도메인의 목록"
+    inline_onebox_domains_whitelist: "제목없이 링크 된 경우 미니어처 형태로 oneboxed 될 도메인 목록"
+    enable_inline_onebox_on_all_domains: "inline_onebox_domain_whitelist 사이트 설정을 무시하고 모든 도메인에서 인라인 onebox를 허용하십시오."
+    force_custom_user_agent_hosts: "모든 요청에서 사용자 정의 onebox 사용자 에이전트를 사용할 호스트. (특히 사용자 에이전트의 액세스를 제한하는 호스트에 유용합니다)."
     max_oneboxes_per_post: "포스트 당 최대 박스링크(Onebox)의 수"
+    logo: "사이트 왼쪽 상단의 로고 이미지 높이가 120이고 가로 세로 비율이 3 : 1보다 큰 넓은 직사각형 이미지를 사용하십시오. 비워두면 사이트 제목 텍스트가 표시됩니다."
+    logo_small: "아래로 스크롤하면 사이트 왼쪽 상단에 작은 로고 이미지가 표시됩니다. 정사각형 120 × 120 이미지를 사용하십시오. 비워두면 홈 글리프가 표시됩니다."
+    digest_logo: "사이트 이메일 요약 상단에 사용 된 대체 로고 이미지. 넓은 직사각형 이미지를 사용하십시오. SVG 이미지를 사용하지 마십시오. 비워두면`logo` 설정의 이미지가 사용됩니다."
+    mobile_logo: "사이트의 모바일 버전에 사용 된 로고입니다. 높이가 120이고 가로 세로 비율이 3 : 1보다 큰 넓은 직사각형 이미지를 사용하십시오. 비워두면`logo` 설정의 이미지가 사용됩니다."
+    large_icon: "다른 메타 데이터 아이콘의 기본으로 사용되는 이미지. 이상적으로 512 x 512보다 커야합니다. 비워두면 logo_small이 사용됩니다."
+    manifest_icon: "Android에서 로고 / 스플래쉬 이미지로 사용되는 이미지. 512 × 512로 자동 크기가 조정됩니다. 비워두면 large_icon이 사용됩니다."
+    favicon: "사이트의 즐겨 찾기 아이콘은 <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon을</a> 참조 <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>하십시오</a> . CDN에서 올바르게 작동하려면 png 여야합니다. 32x32로 크기가 조정됩니다. 비워두면 large_icon이 사용됩니다."
+    apple_touch_icon: "Apple touch 장치에 사용되는 아이콘. 180x180으로 자동 크기가 조정됩니다. 비워두면 large_icon이 사용됩니다."
+    opengraph_image: "페이지에 다른 적합한 이미지가 없을 때 사용되는 기본 오픈 그래프 이미지. 비워두면 large_icon이 사용됩니다"
+    twitter_summary_large_image: "트위터 카드 &#39;요약 큰 이미지&#39;(폭 280 이상, 높이 150 이상이어야 함) 비워두면 opengraph_image를 사용하여 일반 카드 메타 데이터가 생성됩니다."
     notification_email: "The from: 이 이메일 주소는 모든 기본 시스템 메일을 보내는데 사용됩니다. 여기에 명시된 도메인은 SPF, DKIM가 적용되어 있어야하며, reverse PTR 레코드가 제대로 설정되어 있어야 메일이 도착 할 수 있습니다."
     email_custom_headers: "커스텀 이메일 해더의 pipe-delimited"
+    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> 참조 <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>하십시오.</a>"
+    detailed_404: "특정 주제에 액세스 할 수없는 이유에 대한 자세한 정보를 사용자에게 제공합니다. 참고 : URL이 유효한 주제로 연결되는지 사용자가 알기 때문에 보안 수준이 떨어집니다."
+    enforce_second_factor: "사용자가 2 단계 인증을 사용하도록합니다. 모든 사용자에게 적용하려면 &#39;모두&#39;를 선택하십시오. 직원에게만 적용하려면 &#39;직원&#39;을 선택하십시오."
     force_https: "사이트가 HTTPS를 사용하도록 강제합니다. 경고: HTTPS가 완벽히 적용되어 있는 것을 확인하기 전까지는 이 옵션을 켜지마세요. CDN, 소셜 로그인, 외부 링크로 가져오는 자료, 로고들이 HTTPS호환성이 있는지 확인하셨나요?"
     same_site_cookies: "동일 사이트 쿠키를 사용합니다. 지원되는 브라우저에서 사이트 간 요청 위조의 가능성이 있는 모든 매개체를 (관대 또는 엄격하게) 제거합니다. 경고: 엄격한 통제는 로그인을 강제하거나 SSO를 사용하는 경우에만 적용됩니다."
     summary_score_threshold: "요약본에 포함되기 위한 글의 최소 점수 값"
+    summary_posts_required: "&#39;이 주제 요약&#39;이 활성화되기 전에 주제의 최소 게시물. 이 설정에 대한 변경 사항은 일주일 이내에 소급 적용됩니다."
+    summary_likes_required: "&#39;이 주제 요약&#39;이 활성화되기 전에 주제에서 최소 좋아요를 찾습니다. 이 설정에 대한 변경 사항은 일주일 이내에 소급 적용됩니다."
     summary_percent_filter: "요약본 보기를 클릭시, 글 중에 몇 %의 상위 글을 보여줄 것인가?"
+    summary_max_results: "&#39;이 주제 요약&#39;에서 반환 한 최대 게시물"
     enable_personal_messages: "신뢰도 1 사용자(메시지 전송을 위한 최소 신뢰도로 설정가능)가 메시지를 작성하고 답장을 쓸 수 있도록 허용합니다. 운영진은 언제나 메시지를 보낼 수 있음을 참고하세요."
+    enable_system_message_replies: "개인 메시지가 비활성화 된 경우에도 사용자가 시스템 메시지에 회신 할 수 있습니다"
     enable_long_polling: "Message bus used for notification can use long polling"
     long_polling_base_url: "long polling에 사용 될 Base URL (CDN이 동적 콘텐트를 제공할 시에는 origin pull로 설정) eg: http://origin.site.com"
     long_polling_interval: "보낼 데이터가 없을 때 응답 전에 서버가 기다려야하는 시간 (로그인된 유저 전용)"
     polling_interval: "long polling을 안 쓸 때 로그인된 클라이언트가 몇 밀리초마다 poll해야 하는 지"
     anon_polling_interval: "How often should anonymous clients poll in milliseconds"
     background_polling_interval: "(페이지를 안 보고 있을 때) 클라이언트가 몇 밀리초마다 poll해야 하는 지"
+    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 (회원)의 일별 좋아요 제한을 올릴 배수"
     tl3_additional_likes_per_day_multiplier: "tl3 (정회원)의 일별 좋아요 제한을 올릴 배수"
     tl4_additional_likes_per_day_multiplier: "tl4 (리더)의 일별 좋아요 제한을 올릴 배수"
+    num_users_to_silence_new_user: "새 사용자의 게시물에이 많은 다른 사용자로부터 num_spam_flags_to_silence_new_user 스팸 플래그가 표시되면 모든 게시물을 숨기고 향후 게시를 방지하십시오. 비활성화하려면 0입니다."
+    num_tl3_flags_to_silence_new_user: "새 사용자의 게시물이 num_tl3_users_to_silence_new_user 다른 신뢰 수준 3 사용자로부터이 많은 플래그를 얻는 경우 모든 게시물을 숨기고 향후 게시를 방지하십시오. 비활성화하려면 0입니다."
+    num_tl3_users_to_silence_new_user: "새 사용자의 게시물이이 많은 다른 신뢰 수준 3 사용자로부터 num_tl3_flags_to_silence_new_user 플래그를 얻는 경우 모든 게시물을 숨기고 향후 게시를 방지하십시오. 비활성화하려면 0입니다."
+    notify_mods_when_user_silenced: "사용자가 자동으로 침묵되면 모든 중재자에게 메시지를 보냅니다."
+    flag_sockpuppets: "새 사용자가 주제를 시작한 사용자와 동일한 IP 주소로 주제에 응답하면 두 게시물을 모두 스팸 가능성으로 표시하십시오."
     traditional_markdown_linebreaks: "Markdown에서 전통적인 linebreak를 사용, linebreak시 두개의 trailing space를 사용하는 것."
+    enable_markdown_typographer: "타이포그래피 규칙을 사용하여 텍스트의 가독성을 향상 시키십시오. 직선 인용 부호 &#39;를 중괄호&#39;로 바꾸고, (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: "검토 대기열에 의심스러운 사용자를 추가하십시오. 의심스러운 사용자가 바이오 / 웹 사이트에 입장했지만 읽기 활동이 없습니다."
     pending_users_reminder_delay: "새로운 사용자가 승인을 기다리는 시간이 여기에 지정된 시간횟수보다 더 길어길경우 운영자에게 알려줍니다. 알림을 해제하려면 -1로 설정하세요."
     maximum_session_age: "마지막 방문으로 부터 n시간 동안 사용자의 로그인이 유지됩니다"
+    ga_universal_tracking_code: "Google Universal Analytics (analytics.js) 추적 코드 ID (예 : UA-12345678-9); <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics 참조</a>"
+    ga_universal_domain_name: "Google 범용 웹 로그 분석 (analytics.js) 도메인 이름 (예 : mysite.com; <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics 참조</a>"
+    ga_universal_auto_link_domains: "Google 범용 웹 로그 분석 (analytics.js) 교차 도메인 추적을 사용합니다. 이 도메인으로 나가는 링크에는 클라이언트 ID가 추가됩니다. <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>Google의 도메인 간 추적 안내서를</a> 참조하십시오 <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>.</a>"
+    gtm_container_id: "Google 태그 관리자 컨테이너 ID 예 : GTM-ABCDEF. <br/> 참고 : GTM에서로드 한 타사 스크립트는 &#39;콘텐츠 보안 정책 스크립트 src&#39;에 허용 목록에 있어야합니다."
+    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> 참조 <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>하십시오.</a>"
     moderators_create_categories: "운영자가 새로운 카테고리를 만드는 것을 허용"
     cors_origins: "Allowed origins cross-origin requests (CORS). 각 origin은 반드시 http:// 나 https:// 를 포함해야합니다. DISCOURSE_ENABLE_CORS 환경 변수를 true로 지정해줘야 CORS를 활성화할 수 있습니다."
     use_admin_ip_whitelist: "관리자는 보호IP 목록에 있는 IP에서만 로그인할 수 있게 하기(관리 > 로그 > 보호 IP)."
     blacklist_ip_blocks: "Discourse가 크롤링하지 않는 차단된 사설 IP 목록"
     whitelist_internal_hosts: "박스링크나 다른 목적으로 Discourse 가 안전하게 크롤링할 수 있는 내부 호스트의 목록"
+    allowed_iframes: "담론이 게시물에서 안전하게 허용 할 수있는 iframe src 도메인 접두사 목록"
+    whitelisted_crawler_user_agents: "사이트에 액세스 할 수있는 웹 크롤러의 사용자 에이전트 경고! 이 설정은 여기에 나열되지 않은 모든 크롤러를 허용하지 않습니다!"
+    blacklisted_crawler_user_agents: "사이트에 액세스해서는 안되는 웹 크롤러를 식별하는 사용자 에이전트 문자열의 대소 문자를 구분하지 않는 고유 한 단어입니다. 화이트리스트가 정의 된 경우 적용되지 않습니다."
+    slow_down_crawler_user_agents: "Crawls-delay 지시문을 사용하여 robots.txt에서 속도를 제한해야하는 웹 크롤러의 사용자 에이전트"
+    slow_down_crawler_rate: "slow_down_crawler_user_agents를 지정하면이 비율이 모든 크롤러에 적용됩니다 (요청 사이의 지연 시간 (초))."
+    content_security_policy: "콘텐츠 보안 정책 사용"
+    content_security_policy_report_only: "콘텐츠 보안 정책 보고서 만 사용"
+    content_security_policy_collect_reports: "/ csp_reports에서 CSP 위반 보고서 수집 사용"
+    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> 참조하십시오 <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>.</a>"
+    invalidate_inactive_admin_email_after_days: "이 기간 동안 사이트를 방문하지 않은 관리자 계정은 로그인하기 전에 이메일 주소를 다시 확인해야합니다. 비활성화하려면 0으로 설정하십시오."
     top_menu: "첫페이지 메뉴에 어떤 아이템이 뜨고 어떤 순서로 뜰지 정합니다 예 최근|새로씀|안읽음|카테고리|위로|읽음|쓴글|북마크"
     post_menu: "글 메뉴에 어떤 사항들이 무슨 순서로 올라올지 결정합니다. 예: like(좋아요)|edit(수정)|flag(신고)|delete(삭제)|share(공유)|bookmark(북마크)|reply(답글)"
     post_menu_hidden_items: "게시 메뉴에서 기본으로 숨길 메뉴 아이템들"
     share_links: "공유 다이얼로그에 어떤 아이템이 어떤 순서로 나올지 결정"
     site_contact_username: "자동 메세지를 보낼 올바른 스태프 아이디. 빈칸으로 놔두면 기본 시스템 계정이 사용됩니다."
+    site_contact_group_name: "모든 자동 메시지에 초대 할 유효한 그룹 이름입니다."
     send_welcome_message: "모든 신규 유저들에게 시작 매뉴얼과 함께 환영 메세지 보내기"
+    send_tl1_welcome_message: "새 신뢰 수준 1 사용자에게 환영 메시지를 보냅니다."
     suppress_reply_directly_below: "글의 바로 아래에 단 하나의 댓글만 있는 경우 '댓글 수'를 보여주지 않음"
     suppress_reply_directly_above: "단 하나의 댓글 위의 글이 하나 있는 상황에서 '~에 대한 댓글'을 보여주지 않음."
+    remove_full_quote: "직접 답장에서 전체 따옴표를 자동으로 제거합니다."
     suppress_reply_when_quoting: "글안에 답글이 인용될 때 in-reply-to를 보여주지 않습니다."
     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에서 마크 다운으로 변환을 사용합니다. (실험)"
     email_token_valid_hours: "비밀번호 찾기, 계정 활성화에 사용되는 토큰의 유효 기간(시간)"
     enable_badges: "배지 기능 사용"
     enable_whispers: "토픽 내 운영진 비공개 커뮤니케이션 허용"
+    allow_index_in_robots_txt: "robots.txt에 웹 검색 엔진이이 사이트를 색인 할 수 있도록 지정하십시오. 예외적 인 경우 <a href='%{base_path}/admin/customize/robots'>robots.txt를</a> 영구적으로 <a href='%{base_path}/admin/customize/robots'>무시할</a> 수 있습니다."
     email_domains_blacklist: "가입 금지된 이메일 도메인 목록, 파이프 기호로 구분. 예: mailinator.com|trashmail.net"
     email_domains_whitelist: "가입하려면 반드시 사용해야하는 이메일 도메인 목록, 파이프 기호로 구분. 경고: 이 목록외의 도메인으로는 가입이 안됩니다!"
+    auto_approve_email_domains: "이 도메인 목록의 이메일 주소를 가진 사용자는 자동으로 승인됩니다."
+    hide_email_address_taken: "가입하는 동안 및 비밀번호를 잊어 버린 양식에서 지정된 이메일 주소로 계정이 존재한다고 사용자에게 알리지 마십시오."
     log_out_strict: "로그아웃 할때, 모든 장치에서 다같이 로그아웃"
+    version_checks: "버전 관리를 위해 Discourse Hub를 핑 (Ping)하여 <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_username_character_whitelist: "사용자 이름 내에 일부 유니 코드 문자 만 허용하는 정규식. ASCII 문자와 숫자는 항상 허용되며 화이트리스트에 포함될 필요는 없습니다."
     reserved_usernames: "가입을 금지하는 아이디. 와일드카드 기호 * 를 사용해서 하나 이상의 글자를 매칭시킬 때 사용할 수 있습니다."
     min_password_length: "비밀번호 최소 글자수."
     min_admin_password_length: "관리자 계정 비밀번호 최소길이"
     password_unique_characters: "패스워드에 포함되어야 하는 최소 유일글자 수"
     block_common_passwords: "가장 흔히 사용되는 10,000개 비밀번호 목록에 있는 비밀번호를 사용하는 것을 허용하지 않음."
     enable_sso: "외부사이트 Single Sign On, SSO를 통해 로그인 활성화(경고: 유저의 이메일 주소는 반드시 외부에서 확인해야합니다!)"
+    verbose_sso_logging: "자세한 SSO 관련 진단을 <a href='%{base_path}/logs' target='_blank'>/ logs에 기록</a>"
+    enable_sso_provider: "/ session / sso_provider 엔드 포인트에서 Discourse SSO 제공자 프로토콜을 구현하려면 sso_provider_secrets를 설정해야합니다."
     sso_url: " 싱글 사인 온(SSO)엔드포인트의 URL (http:// 또는 https:// 포함 필수)"
     sso_secret: "SSO 정보 암호화 인증에 사용 될 암호 문자열, 10글자 이상이어야 합니다."
+    sso_provider_secrets: "Discourse를 SSO 공급자로 사용하는 도메인 비밀 쌍 목록입니다. SSO 비밀이 10 자 이상인지 확인하십시오. 와일드 카드 기호 *를 사용하면 도메인이나 도메인의 일부만 일치시킬 수 있습니다 (예 : * .example.com)."
     sso_overrides_bio: "사용자 프로필에서 사용자 bio를 덮어쓰고 사용자의 변경을 금지"
+    sso_overrides_groups: "모든 수동 그룹 구성원을 groups sso 속성에 지정된 그룹과 동기화하십시오 (경고 : 그룹을 지정하지 않으면 모든 수동 그룹 구성원이 사용자에 대해 지워짐)"
     sso_overrides_email: "SSO로 접속 시 사용자 이메일 정보 갱신 후 사용자 임의 변경 금지 설정 (경고: 이메일 정보 불일치가 생길 수도 있습니다)"
     sso_overrides_username: "SSO로 접속 시 사용자 아이디 정보 갱신 후 사용자 임의 변경 금지 설정 (경고: 아이디 길이/필요조건 등 내부 규정으로 인해 불일치가 생길 수도 있습니다)"
     sso_overrides_name: "SSO로 접속 시 사용자 실명 정보 갱신 후 사용자 임의 변경 금지 설정"
+    sso_overrides_avatar: "SSO 페이로드에서 외부 사이트 아바타로 사용자 아바타를 재정의합니다. 활성화하면 사용자가 Discourse에서 아바타를 업로드 할 수 없습니다."
+    sso_overrides_profile_background: "SSO 페이로드에서 외부 사이트 아바타로 사용자 프로필 배경을 재정의합니다."
+    sso_overrides_card_background: "SSO 페이로드에서 외부 사이트 아바타로 사용자 카드 배경을 재정의합니다."
     sso_not_approved_url: "승인안된 SSO 계정은 이 URL로 이동"
     sso_allows_all_return_paths: "SSO로 제공된 return_paths를 위한 도메인 제한 해제 (기본 return 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 Application의 Client ID"
     google_oauth2_client_secret: "Google Application의 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> 를 참조 <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>하십시오</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: "<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> 등록 된 트위터 인증을위한 소비자 비밀"
     enable_instagram_logins: "인스타그램 인증 켜기, instagram_consumer_key 와 instagram_consumer_secret 필요"
     instagram_consumer_key: "인스타그램 인증을 위한 Consumer key "
     instagram_consumer_secret: "인스타그램 인증을 위한 Consumer secret"
+    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 Client ID (하나는 필요합니까? <a href="https://discordapp.com/developers/applications/me">Discord 개발자 포털을</a> 방문하십시오)'
+    discord_secret: "불화 비밀 키"
+    discord_trusted_guilds: 'Discord 길드 회원 만이 Discord를 통해 로그인 할 수 있습니다. 길드에 숫자 ID를 사용하십시오. 자세한 내용은 <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">여기</a> 의 지침을 확인 <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 버켓 이름. 주의 : 프라이빗 버켓인지 반드시 확인해야하세요."
+    s3_endpoint: "엔드 포인트는 DigitalOcean Spaces 또는 Minio와 같은 S3 호환 서비스에 백업하도록 수정할 수 있습니다. 경고 : 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: "최근 방문한 시간을 저장할 주기(시간)"
@@ -1031,6 +1444,7 @@ ko:
     top_topics_formula_first_post_likes_multiplier: "인기 토픽 계산 공식의 좋아요 가중치 설정: `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: "인기 토픽 계산 공식에서 포스트당 최소 좋아요 가중치 설정: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
     rebake_old_posts_count: "15분마다 HTML로 리빌드할 옛날 포스트의 수"
+    enable_safe_mode: "사용자가 안전 모드로 들어가 플러그인을 디버깅 할 수 있도록합니다."
     rate_limit_create_topic: "사용자가 글타래를 생성하고 난 후 다음 글타래를 생성할 때 까지의 대기 기간(초)"
     rate_limit_create_post: "사용자가 포스팅을하고 난 후 다음 포스팅까지 대기 기간(초)"
     rate_limit_new_user_create_topic: "새로운 사용자 글타래를 생성하고 난 후 다음 글타래를 생성할 때 까지의 대기 기간(초)"
@@ -1045,23 +1459,38 @@ ko:
     max_topic_invitations_per_day: "하루에 유저가 최대로 보낼 수 있는 글타래 초대장 수"
     max_logins_per_ip_per_hour: "시간 당 동일 IP에서 로그인할 수 있는 최대 사용자 수"
     max_logins_per_ip_per_minute: "1분 당 동일 IP에서 로그인할 수 있는 최대 사용자 수"
+    max_post_deletions_per_minute: "사용자가 분당 삭제할 수있는 최대 게시물 수입니다."
+    max_post_deletions_per_day: "사용자가 하루에 삭제할 수있는 최대 게시물 수입니다."
     alert_admins_if_errors_per_minute: "관리자 경고를 발생시키기 위한 1분당 에러 수. 0으로 설정하면 기능 해제됨. 주의: 재시작이 필요합니다."
     alert_admins_if_errors_per_hour: "관리자 경고를 발생시키기 위한 시간당 에러 수. 0으로 설정하면 기능 해제됨. 주의: 재시작이 필요합니다."
+    categories_topics: "/ 카테고리 페이지에 표시 할 주제 수입니다. 0으로 설정하면 두 열을 대칭 (범주 및 주제)으로 유지하는 값을 자동으로 찾습니다."
     suggested_topics: "글타래 아랫부분에 몇개의 글타래를 제안하여 보여준다."
     limit_suggested_to_category: "제안된 글타래는 현재의 카테고리에 있는 글타래 중에서만 보여준다."
     suggested_topics_max_days_old: "설정된 일수 이상의 토픽은 추천하지 않음"
+    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 storage에 업로드해주세요. 중요: 올바른 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 인스턴스에서 실행되고 &quot;s3 액세스 키 ID&quot;및 &quot;s3 비밀 액세스 키&quot;설정이 무시됩니다.'
     s3_upload_bucket: "파일이 업로드 될 위치의 Amazon S3 bucket name. 경고: 소문자 알파벳만 허용되며 점 . 이나 밑줄문자 _ 가 없어야 함."
+    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). 경고: 이 설정 뒤에는 모든 글을 다시 구워야rebake 합니다."
     avatar_sizes: "자동 생성 아바타 사이즈 목록"
     external_system_avatars_enabled: "외부 아바타 시스템을 사용하기"
     external_system_avatars_url: "외부 아바타 서비스의 URL. {username} {first_letter} {color} {size} 의 대체가 허용됨"
+    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은 해제)"
     allow_staff_to_upload_any_file_in_pm: "운영진이 보내는 개인메시지에 모든 파일 첨부 허용"
+    strip_image_metadata: "스트립 이미지 메타 데이터."
+    min_ratio_to_crop: "큰 이미지를 자르는 데 사용되는 비율. 너비 / 높이의 결과를 입력하십시오."
+    simultaneous_uploads: "작곡가에서 드래그 앤 드롭 할 수있는 최대 파일 수"
     enable_flash_video_onebox: "swf, flv(어도비 플래쉬)링크를 embed 할 수 있도록 함. 주의: 보안에 대한 위험성을 알려주는 것이 좋다."
     default_invitee_trust_level: "사용자를 초대하기 위한 기본 회원등급(0-4)"
     default_trust_level: "모든 신규가입자의 기본 회원등급 (0-4). 경고: 변경시에 스팸 문제가 생길 가능성이 높습니다."
@@ -1089,10 +1518,17 @@ ko:
     tl3_requires_likes_given: "회원 레벨3 자격을 얻기 위하여 지난 (tl3 time period)동안 줘야 하는 최소 좋아요 수."
     tl3_requires_likes_received: "회원 레벨3 자격을 얻기 위하여 지난 (tl3 time period)일 동안 받아야 하는 최소 좋아요 수."
     tl3_links_no_follow: "VIP 사용자-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_send_messages: "새 개인 메시지를 작성하는 데 필요한 최소 신뢰 레벨입니다."
+    min_trust_to_flag_posts: "게시물을 신고하는 데 필요한 최소 신뢰 수준"
+    min_trust_to_post_links: "게시물에 링크를 포함하는 데 필요한 최소 신뢰 수준"
+    min_trust_to_post_images: "게시물에 이미지를 포함하는 데 필요한 최소 신뢰 수준"
+    whitelisted_link_domains: "링크를 게시 할 적절한 신뢰 수준이 없어도 사용자가 연결할 수있는 도메인"
     newuser_max_links: "새로운 사용자가 글에 붙일 수 있는 최대 링크 개수"
     newuser_max_images: "새로운 사용자가 글에 붙일 수 있는 최대 이미지 개수"
     newuser_max_attachments: "새로운 사용자가 포스트에 첨부할 수 있는 최대 파일 개수"
@@ -1100,23 +1536,32 @@ ko:
     newuser_max_replies_per_topic: "다른 사용자가 댓글을 달기 전, 새로운 사용자가 개별 토픽에 달 수 있는 최대 답글 개수"
     max_mentions_per_post: "글 당 사용할 수 있는 최대 @name 알림의 수"
     max_users_notified_per_group_mention: "그룹이 멘션을 받으면 알림을 받는 최대사용자의 수(최대치에 도달하면 알림이 전송되지 않음)"
+    enable_mentions: "사용자가 다른 사용자를 언급 할 수 있도록합니다."
     create_thumbnails: "글의 너무 큰 크기의 이미지는 thumnails와 lightbox를 만든다."
     email_time_window_mins: "알림 메일을 보내기 전 대기 기간(분), 사용자에게 글의 변경하고 완료할 수 있는 기회를 준다."
+    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: "다른 답변을 추가하지 못하기 전에 사용자가 주제에서 한 행에 게시해야하는 게시물 수입니다."
+    title_fancy_entities: "주제 제목에서 일반적인 ASCII 문자를 멋진 HTML 엔티티로 변환 <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>하십시오.</a>"
     min_title_similar_length: "유사 글타래에 대한 체크가 있기 전, 최소 제목 글자 수"
     desktop_category_page_style: "/categories 페이지의 비주얼 스타일"
     category_colors: "허용된 카테고리에 사용될 hexadecimal 색상 값의 리스트"
     category_style: "카테고리 뱃지 시각 스타일"
+    max_image_size_kb: "최대 이미지 업로드 크기 (KB)입니다. 이것은 nginx (client_max_body_size) / 아파치 또는 프록시에서도 구성해야합니다. 이보다 크고 client_max_body_size보다 작은 이미지는 업로드에 맞게 크기가 조정됩니다."
     max_attachment_size_kb: "최대 첨부파일 업로드 사이즈(kB). 이 설정은 꼭 nginx / apache와 proxy에도 적용해야 합니다."
     authorized_extensions: "파일 업로드에 허용되는 확장자 리스트 ('*'을 사용하면 모든 타입의 파일이 가능합니다.)"
+    authorized_extensions_for_staff: "`authorized_extensions` 사이트 설정에 정의 된 목록 외에 직원 사용자가 업로드 할 수있는 파일 확장자 목록입니다. (모든 파일 형식을 활성화하려면 &#39;*&#39;를 사용하십시오)"
     theme_authorized_extensions: "테마 업로드에 허용되는 확장자 목록('*'를 입력하면 모든 확장자 허용)"
     max_similar_results: "새로운 글타래를 작성할 때, 에디터 위에 보여줄 비슷한 글타래들의 개수. 제목과 본문을 바탕으로 비교합니다."
+    max_image_megapixels: "이미지에 허용되는 최대 메가 픽셀 수입니다. 메가 픽셀 수가 많은 이미지는 거부됩니다."
     title_prettify: "일반적인 제목의 오타 및 오류를 수정해준다. 모두 대문자로 쓰거나, 첫자가 소문자이거나(영문), 복수의 !, ? 혹은 마침표(.)가 중복으로 들어간 것 등"
+    title_remove_extraneous_space: "구두점 끝 부분 앞의 공백을 제거합니다."
+    automatic_topic_heat_values: '사이트 활동에 따라 &quot;주제 조회 열&quot;및 &quot;주제 열과 같은 주제&quot;설정을 자동으로 업데이트합니다.'
     topic_views_heat_low: "글타래가 연하게 하이라이트 되기 위한 조회수"
     topic_views_heat_medium: "글타래가 적당하게 하이라이트 되기 위한 조회수"
     topic_views_heat_high: "글타래가 진하게 하이라이트 되기 위한 조회수"
@@ -1132,6 +1577,7 @@ ko:
     faq_url: "FAQ주소가 있으면 전체 URL을 적어주세요."
     tos_url: "이용약관이 있으면 전체 URL을 적어주세요."
     privacy_policy_url: "개인정보 보호가 있으면 전체 URL을 적어주세요."
+    log_anonymizer_details: "익명화 된 후 사용자 세부 정보를 로그에 유지할지 여부 GDPR을 준수 할 때는이 기능을 해제해야합니다."
     newuser_spam_host_threshold: "새로운 사용자가 동일한 호스트의 링크를 포스팅하더라도 스팸으로 간주되지 않는 최대 포스팅 수 `newuser_spam_host_threshold`"
     white_listed_spam_host_domains: "스팸 호스트 테스트로부터 제외할 도메인 리스트. 새로운 사용자는 새로운 사용자는 헤당 도메인에 대한 링크를 포함하는 글를 생성하는데 제한되지 않는다."
     staff_like_weight: "스태프가 좋아요를 눌렀을 때 부여할 가산점"
@@ -1146,15 +1592,27 @@ ko:
     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: "이 우선 순위를 충족하지 않으면 검토 가능한 항목을 표시하지 않습니다."
+    high_trust_flaggers_auto_hide_posts: "TL3 + 사용자가 스팸으로 신고 한 후 새로운 사용자 게시물이 자동으로 숨겨 짐"
+    cooldown_hours_until_reflag: "게시물을 다시 게시 할 수있을 때까지 사용자가 기다려야하는 시간"
     reply_by_email_enabled: "이메일을 통해 주제에 답글을 달 수 있음."
     reply_by_email_address: "이메일 주소로 답글을 다는 템플릿. 예: %%{reply_key}@reply.myforum.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: "담론이 모든 종류의 이메일을 보내지 못하게합니다. 모든 사용자의 이메일을 비활성화하려면 &#39;예&#39;를 선택하십시오. 비 직원 사용자 만 이메일을 사용하지 않으려면 &#39;비 직원&#39;을 선택하십시오."
     strip_images_from_short_emails: "2800바이트, 즉 2.73 KB 이내 사이즈를 가지도록 이미지를 빼주세요."
     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: "수신된 이메일을 처리하는 동안 생성할 최대 격리회원 수"
@@ -1168,7 +1626,14 @@ ko:
     reset_bounce_score_after_days: "X 일 이후 반송 스코어 자동 초기화."
     attachment_content_type_blacklist: "콘텐츠 타입을 기준으로 첨부를 차단할 키워드 블랙리스트."
     attachment_filename_blacklist: "파일 이름을 기준으로 첨부를 차단할 키워드 블랙리스트."
+    forwarded_emails_behaviour: "전달 된 이메일을 담론으로 처리하는 방법"
     always_show_trimmed_content: "항상 수신 메일의 다듬어진 부분을 표시. 경고: 메일 주소가 드러날 수 있습니다."
+    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 서버를 연결합니다. (추천)"
@@ -1178,14 +1643,23 @@ ko:
     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 폴링 필요). 각 카테고리의 &quot;설정&quot;탭에서 주소를 구성하십시오.'
     email_in_min_trust: "이메일을 통해 새 글타래를 포스팅 할 수 있는 최소 사용자 회원등급"
+    email_in_authserv_id: "수신 이메일에서 인증 검사를 수행하는 서비스의 식별자입니다. 이를 구성하는 방법에 대한 지침은 <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> 을 참조 <a href='https://meta.discourse.org/t/134358'>하십시오</a> ."
+    email_in_spam_header: "스팸을 탐지하는 이메일 헤더입니다."
     email_prefix: "이메일 제목에 쓰일 [라벨]. 설정하지 않으면 기본적으로 'title(필수 설정의)' 이 된다."
     email_site_title: "사이트에서 전송되는 이메일의 보내는 이를 사이트 이름으로 설정. 설정하지 않으면 'title(필수 설정의)'이 된다. 만약 'title'에 보내는 이에 허용되지 않는 글자가 포함되어 있으면 이 설정이 사용된다."
+    find_related_post_with_key: "답글을 게시하려면 &#39;답장 키&#39;만 사용하십시오. 경고 :이 기능을 비활성화하면 이메일 주소를 기반으로 사용자 가장이 허용됩니다."
     minimum_topics_similar: "새로운 글타래를 작성할 때, 유사한 글타래들을 보여주기 위해 존재해야 할 최소 글타래 개수"
     relative_date_duration: "절대적 날짜(9월 3일) 대신 상대적 날짜(7일 전)가 사용될 일 수 (글타래가 작성된 이후부터)"
     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: "사용자가 커스텀 프로필 사진을 올릴 수 있도록 허용."
     allow_animated_avatars: "사용자가 프로필 사진으로 애니메이션 GIF 파일을 올릴 수 있도록 허용. 경고: 이 설정을 바꾼 후 avatars:refresh rake task 를 실행."
     allow_animated_thumbnails: "움직이는 gif로 썸네일을 만듭니다."
@@ -1198,16 +1672,31 @@ ko:
     suppress_digest_email_after_days: "(n) 일 이상 사이트를 방문하지 않은 사용자에게는 요약 이메일 보내지 않기."
     digest_suppress_categories: "요약 이메일에서 이 카테고리 숨기기."
     disable_digest_emails: "모든 사용자에게 요약 이메일 전송 해제하기"
+    apply_custom_styles_to_digest: "사용자 정의 이메일 템플릿 및 CSS는 요약 이메일에 적용됩니다."
+    email_accent_bg_color: "HTML 이메일에서 일부 요소의 배경으로 사용되는 강조 색입니다. 색상 이름 ( &#39;빨간색&#39;) 또는 16 진수 값 ( &#39;# FF0000&#39;)을 입력하십시오."
     email_accent_fg_color: "텍스트 컬러는 HTML 이메일의 배경색상으로 렌더링됩니다. 색상명('white')나 hex값('#FFFFFF')을 입력하세요."
     email_link_color: "HTML 이메일의 링크 색상. 색상명('blue')나 hex값('#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_review: "그룹이 특정 카테고리의 컨텐츠를 검토하도록 허용"
     allow_anonymous_posting: "익명 모드 허용"
     anonymous_posting_min_trust_level: "익명 게시 할 수 있는 최소 회원등급"
     anonymous_account_duration_minutes: "한 익명이 익명계정을 만들 때 빨리 만드는 걸 막을 분 단위 시간 예: 600으로 정해놓으면 마지막 게시하고 익명 전환 후로 600분이 지나는 즉시 새 계정이 만들어 집니다."
     hide_user_profiles_from_public: "익명사용자의 사용자 카드, 사용자 프로필, 사용자 디렉토리 해제."
+    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으로 설정"
     user_website_domains_whitelist: "이 목록에 속한 도메인으로는 개인 웹사이트 등록 불가함. ` | `를 구분자로 한 목록."
     allow_profile_backgrounds: "사용자에게 프로필 배경 이미지 업로드를 허용합니다."
     sequential_replies_threshold: "너무 많은 연속 댓글을 달고 있다고 경고를 받지 않고 사용자가 연달아 쓸 수 있는 포스트 수."
@@ -1216,11 +1705,23 @@ ko:
     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: "사용자가 하단에 도달하면 토픽 고정을 자동 해제."
     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: "일반 사용자 (신뢰 수준 1 이상)에게 Android 장치에 DiscourseHub 앱 배너를 표시합니다."
+    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으로 설정하십시오."
+    svg_icon_subset: "자산에 포함 할 FontAwesome 5 아이콘을 추가하십시오. 솔리드 아이콘에는 접두사 &#39;fa-&#39;, 일반 아이콘에는 &#39;far-&#39;, 브랜드 아이콘에는 &#39;fab-&#39;을 사용하십시오."
+    max_prints_per_hour_per_user: "최대 / print 페이지 노출 수 (사용 안함으로 설정하려면 0으로 설정)"
     full_name_required: "사용자 프로필에서 실명을 필수 입력 항목으로 설정"
     enable_names: "사용자의 실명을 프로필, 사용자카드, 이메일에서 표시함. 실명을 표시하지 않으려면 체크를 해제하세요."
     display_name_on_posts: "글에 @username 뿐만 아니라 사용자의 전체 이름도 보여준다."
@@ -1229,24 +1730,114 @@ ko:
     default_code_lang: "기본 programming language syntax highlighting은 GitHub code blocks이 적용된다. (lang-auto, ruby, python etc.)"
     warn_reviving_old_topic_age: "이 값보다 오래된 글타래에 답글을 달면, 오래된 토론이라는 것을 상기시키기 위해 주의 알림이 보여진다. 비활성화 값음 0 이다. "
     autohighlight_all_code: "형식이 지정되기 전의(되지 않은) 모든 코드 블럭들에 대해, 사용자가 언어를 지정하지 않아도 강제로 code highlighting이 적용된다."
+    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: "임베드 된 게시물에 대한 마크 다운 형식을 지원합니다."
+    embed_whitelist_selector: "포함에 허용되는 쉼표로 구분 된 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으로 설정)"
     prevent_anons_from_downloading_files: "익명 사용자가 다운로드를 받지 못하게 합니다. 경고: 이미지 파일 외 모든 첨부파일이 다운로드 받지 못하게 됩니다."
+    secure_media: '모든 업로드 (이미지, 비디오, 오디오, 텍스트, pdf, zip 및 기타)에 대한 액세스를 제한합니다. &quot;로그인 필요&quot;가 활성화 된 경우 로그인 한 사용자 만 업로드에 액세스 할 수 있습니다. 그렇지 않으면 개인 메시지 및 개인 범주의 미디어 업로드에 대해서만 액세스가 제한됩니다. 경고 :이 설정은 복잡하며 관리에 대한 깊은 이해가 필요합니다. 세부 사항 <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">은 메타에</a> 대한 <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">보안 매체 주제</a> 를 참조하십시오.'
     slug_generation_method: "slug 생성 방식. 'encoded'는 퍼센트 기호로 인코딩해서 생성합니다. 'none'은 slug 자체를 비활성화합니다.."
     enable_emoji: "emoji 활성화"
+    enable_emoji_shortcuts: ":) : p :(과 같은 일반적인 스마일 텍스트는 이모티콘으로 변환됩니다."
     emoji_set: "어떤 emoji가 좋은가요?"
+    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은 사용 안함)"
+    code_formatting_style: "작곡가의 코드 버튼은 기본적으로이 코드 형식 스타일로 설정됩니다"
+    max_allowed_message_recipients: "메시지에 허용되는 최대 수신자입니다."
+    watched_words_regular_expressions: "시청 한 단어는 정규식입니다."
+    old_post_notice_days: "게시물 알림이 오래되기 전날"
+    new_user_notice_tl: "새로운 사용자 게시물 알림을 보려면 최소 신뢰 수준이 필요합니다."
+    returning_user_notice_tl: "사용자에게 다시 게시 알림을 표시하는 데 필요한 최소 신뢰 수준입니다."
+    returning_users_days: "사용자가 돌아 오는 것으로 간주되기까지 며칠이 지났습니까?"
+    enable_page_publishing: "직원이 자신의 스타일을 사용하여 주제를 새 URL에 게시 할 수 있습니다."
+    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_like_notification_frequency: "기본적으로 좋아요에 사용자에게 알림"
+    default_topics_automatic_unpin: "사용자가 기본적으로 하단에 도달하면 주제를 자동으로 고정 해제합니다."
+    default_categories_watching: "기본적으로 감시되는 카테고리 목록."
+    default_categories_tracking: "기본적으로 추적되는 카테고리 목록."
+    default_categories_muted: "기본적으로 음소거 된 카테고리 목록."
+    default_categories_watching_first_post: "각 새 주제의 첫 번째 게시물이 기본적으로 감시되는 카테고리 목록입니다."
+    mute_all_categories_by_default: "모든 카테고리의 기본 알림 레벨을 음소거로 설정하십시오. 사용자가 &#39;최신&#39;및 &#39;카테고리&#39;페이지에 표시되도록 카테고리를 선택해야합니다. 익명 사용자의 기본값을 수정하려면 &#39;default_categories_&#39;설정을 설정하십시오."
+    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 키에 허용되는 범위 목록"
+    max_api_keys_per_user: "사용자 당 최대 사용자 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: "태그를 검색 할 때 표시 할 최대 결과 수입니다."
+    show_filter_by_tag: "태그별로 주제 목록을 필터링하는 드롭 다운을 표시하십시오."
+    max_tags_in_filter_list: "필터 드롭 다운에 표시 할 최대 태그 수입니다. 가장 많이 사용 된 태그가 표시됩니다."
+    tags_sort_alphabetically: "알파벳 순서로 태그를 표시합니다. 기본값은 인기순으로 표시하는 것입니다."
+    tags_listed_by_group: "<a href='%{base_path}/tags' target='_blank'>태그 페이지</a> 에서 태그 그룹별로 태그를 나열 <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: "주제 초안의 범주를 지정하여 공유 초안 기능을 사용하십시오. 이 범주의 주제는 직원 사용자의 주제 목록에서 표시되지 않습니다."
+    push_notifications_prompt: "사용자 동의 프롬프트를 표시합니다."
+    push_notifications_icon: "알림 코너에 나타나는 배지 아이콘. 필요한 크기는 96 × 96입니다."
+    short_title: "짧은 제목은 사용자의 홈 화면, 실행기 또는 공간이 제한 될 수있는 다른 장소에서 사용됩니다. 12 자로 제한되어야합니다."
+    dashboard_general_tab_activity_metrics: "일반 탭에서 활동 메트릭으로 표시 할 보고서를 선택하십시오."
+    gravatar_name: "Gravatar 제공 업체 이름"
+    gravatar_base_url: "Gravatar 제공자의 API 기반 URL"
+    gravatar_login_url: "사용자에게 Gravatar 서비스에 대한 로그인을 제공하는 gravatar_base_url과 관련된 URL"
     errors:
       invalid_email: "유효하지 않은 이메일 주소입니다."
       invalid_username: "해당 이름의 사용자가 없습니다."
+      invalid_group: "그 이름을 가진 그룹이 없습니다."
       invalid_integer_min_max: "%{min}이상 %{max}이하이어야 합니다."
       invalid_integer_min: "%{min}이상 이어야 합니다."
       invalid_integer_max: "%{max}이하 이어야 합니다."
@@ -1258,17 +1849,61 @@ ko:
       invalid_string_min: "글자수가 %{min}자 이상이어야 합니다."
       invalid_string_max: "글자 수가 %{max}자 이상이어야 합니다."
       invalid_reply_by_email_address: "값이 반드시 '%{reply_key}'를 갖고 있어야하며 알림 이메일과 달라야합니다."
+      invalid_alternative_reply_by_email_addresses: "모든 값은 &#39;%{reply_key}&#39;을 포함해야하며 알림 이메일과 달라야합니다."
+      pop3_polling_host_is_empty: "POP3 폴링을 활성화하기 전에 &#39;pop3 폴링 호스트&#39;를 설정해야합니다."
+      pop3_polling_username_is_empty: "POP3 폴링을 활성화하기 전에 &#39;pop3 폴링 사용자 이름&#39;을 설정해야합니다."
+      pop3_polling_password_is_empty: "POP3 폴링을 활성화하기 전에 &#39;pop3 폴링 비밀번호&#39;를 설정해야합니다."
+      pop3_polling_authentication_failed: "POP3 인증에 실패했습니다. pop3 자격 증명을 확인하십시오."
+      reply_by_email_address_is_empty: "이메일로 회신을 활성화하기 전에 &#39;이메일 주소로 회신&#39;을 설정해야합니다."
+      email_polling_disabled: "이메일로 회신을 활성화하기 전에 수동 또는 POP3 폴링을 활성화해야합니다."
+      user_locale_not_enabled: "이 설정을 활성화하기 전에 먼저 &#39;사용자 로캘 허용&#39;을 활성화해야합니다."
       invalid_regex: "허용되지 않거나 올바르지 않은 정규표현식입니다."
+      email_editable_enabled: "이 설정을 활성화하기 전에 &#39;이메일 편집 가능&#39;을 비활성화해야합니다."
+      enable_sso_disabled: "이 설정을 활성화하기 전에 먼저 &#39;sso 활성화&#39;를 활성화해야합니다."
+      staged_users_disabled: "이 설정을 활성화하기 전에 먼저 &#39;단계별 사용자&#39;를 활성화해야합니다."
+      reply_by_email_disabled: "이 설정을 활성화하기 전에 먼저 &#39;이메일로 회신&#39;을 활성화해야합니다."
+      sso_url_is_empty: "이 설정을 활성화하기 전에 &#39;sso url&#39;을 설정해야합니다."
+      sso_invite_only: "sso를 활성화하고 동시에 초대 할 수 없습니다."
+      enable_local_logins_disabled: "이 설정을 활성화하기 전에 먼저 &#39;로컬 로그인 활성화&#39;를 활성화해야합니다."
+      min_username_length_exists: "최소 사용자 이름 길이를 가장 짧은 사용자 이름 (%{username}) 이상으로 설정할 수 없습니다."
       min_username_length_range: "최소값은 최대값보다 크게 설정할 수 없습니다."
+      max_username_length_exists: "가장 긴 사용자 이름 (%{username}) 아래에서 최대 사용자 이름 길이를 설정할 수 없습니다."
       max_username_length_range: "최대값은 최소값보다 작게 설정할 수 없습니다."
+      invalid_hex_value: "색상 값은 6 자리 16 진수 코드 여야합니다."
+      category_search_priority:
+        very_low_weight_invalid: "가중치를 &#39;category_search_priority_low_weight&#39;보다 크게 설정할 수 없습니다."
+        low_weight_invalid: "가중치를 &#39;category_search_priority_very_low_weight&#39;보다 1보다 크거나 작게 설정할 수 없습니다."
+        high_weight_invalid: "가중치를 1보다 작거나 같거나 &#39;category_search_priority_very_high_weight&#39;보다 크게 설정할 수 없습니다."
+        very_high_weight_invalid: "가중치를 &#39;category_search_priority_high_weight&#39;보다 작게 설정할 수 없습니다."
+      unicode_username_whitelist:
+        regex_invalid: "정규식이 유효하지 않습니다 : %{error}"
+        leading_trailing_slash: "정규식은 슬래시로 시작하고 끝나서는 안됩니다."
+      unicode_usernames_avatars: "내부 시스템 아바타는 유니 코드 사용자 이름을 지원하지 않습니다."
+      list_value_count: "목록에는 정확히 %{count} 값이 포함되어야합니다."
+    placeholder:
+      sso_provider_secrets:
+        key: "www.example.com"
+        value: "SSO 비밀"
   search:
+    extreme_load_error: "사이트의로드가 심하고 검색이 사용 중지되었습니다. 나중에 다시 시도하십시오."
     within_post: "#%{post_number} by %{username}"
     types:
       category: "카테고리"
       topic: "검색 결과"
       user: "사용자"
+    results_page: "&#39;%{term}&#39;에 대한 검색 결과"
+    audio: "[오디오]"
+    video: "[비디오]"
   sso:
     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: "비밀이 누락되어 SSO 인증에 실패했습니다. 이 문제를 해결하려면 사이트 관리자에게 문의하십시오."
   original_poster: "원본 게시자"
   most_posts: "최대 게시자"
   most_recent_poster: "최근 게시자"
@@ -1276,9 +1911,16 @@ ko:
   redirected_to_top_reasons:
     new_user: "우리 커뮤니티에 오신 것을 환영합니다! 다음은 우리 사이트에서 가장 인기 많은 최근 글타래들입니다."
     not_seen_in_a_month: "잘 돌아오셨습니다. 다음은 당신이 오지 않은 동안 가장 인기있던 글타래들입니다."
+  merge_posts:
+    errors:
+      different_topics: "다른 주제에 속하는 게시물은 병합 할 수 없습니다."
+      different_users: "다른 사용자에게 속한 게시물은 병합 할 수 없습니다."
+  change_owner:
+    post_revision_text: "소유권 이전"
   publish_page:
     slug_errors:
       blank: "비어있으면 안됨"
+      unavailable: "사용할 수 없습니다"
       invalid: "사용할 수 없는 문자를 포함하고 있습니다."
   topic_statuses:
     autoclosed_enabled_days:
@@ -1297,10 +1939,21 @@ ko:
     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로는 관리자로 로그인할 수 없습니다."
@@ -1309,19 +1962,40 @@ ko:
     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: "다른 사용자의 초대를 수락하려는 것 같습니다. %{current_user}이 아닌 경우 로그 아웃 한 후 다시 시도하십시오."
     second_factor_title: "이중 인증"
+    second_factor_description: "앱에서 필요한 인증 코드를 입력하십시오 :"
     second_factor_backup_description: "백업 코드 중 하나를 입력하세요:"
+    second_factor_backup_title: "2 단계 백업 코드"
+    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:
+    deactivated: "&#39;%{email}&#39;에 반송 이메일이 너무 많아 비활성화되었습니다."
     deactivated_by_staff: "운영진에 의해 비활성화됨"
     activated_by_staff: "운영진에 의해 활성화됨"
     new_user_typed_too_fast: "타이핑이 너무 빠른 신규 사용자"
@@ -1329,6 +2003,8 @@ ko:
     username:
       short: "최소 %{min}자 이상이어야 합니다."
       long: "%{max}자 이상 사용할 수 없습니다."
+      too_long: "너무 길어"
+      characters: "숫자, 문자, 대시, 점 및 밑줄 만 포함해야합니다."
       unique: "이미 사용중입니다."
       blank: "공백이 없어야 합니다."
       must_begin_with_alphanumeric_or_underscore: "첫글자는 알파벳, 숫자, 언더바만 쓸 수 있습니다."
@@ -1344,10 +2020,44 @@ ko:
       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: "비활성 사용자"
+    email_in_spam_header: "사용자의 첫 번째 이메일이 스팸으로 표시되었습니다"
   unsubscribe_mailer:
     title: "메일링 구독해지"
+    subject_template: "더 이상 %{site_title}에서 이메일 업데이트를 수신하지 않기를 확인하십시오"
+  invite_mailer:
+    title: "메일러 초대"
+  custom_invite_mailer:
+    title: "맞춤 초대 메일러"
+  invite_forum_mailer:
+    title: "포럼 메일러 초대"
+    subject_template: "%{inviter_name} 님이 초대했습니다. %{site_domain_name}"
+  custom_invite_forum_mailer:
+    title: "맞춤 초대 포럼 메일러"
+    subject_template: "%{inviter_name} 님이 초대했습니다. %{site_domain_name}"
   invite_password_instructions:
+    title: "비밀번호 안내 초대"
     subject_template: "%{site_name} 계정을 위해 비밀번호 설정"
+  download_backup_mailer:
+    title: "백업 메일러 다운로드"
+    subject_template: "[%{email_prefix}] 사이트 백업 다운로드"
+  admin_confirmation_mailer:
+    title: "관리자 확인"
+    subject_template: "[%{email_prefix}] 새 관리자 계정 확인"
+  test_mailer:
+    title: "메일러 테스트"
+    subject_template: "[%{email_prefix}] 이메일 전달 테스트"
+  new_version_mailer:
+    title: "새 버전 메일러"
+    subject_template: "[%{email_prefix}] 새로운 담화 버전, 업데이트 가능"
+  new_version_mailer_with_notes:
+    title: "노트가있는 새로운 버전 메일러"
+    subject_template: "[%{email_prefix}] 업데이트 가능"
   flag_reasons:
     off_topic: "내가 올린 글타래가 **주제 벗어난 이야기**으로 신고 되었습니다. 사람들이 이 글타래의 제목이랑 글 내용이 안 맞는다고 느끼나 봅니다. "
     inappropriate: "내가 올린 글타래가 **부적절**로 신고 되었습니다. 사람들이 이 글타래가 [가이드라인](%{base_path}/guidelines)에서 벗어나 공격적, 모욕적, 폭력적이라고 느낍니다."
@@ -1360,7 +2070,22 @@ ko:
     ignored: "알려줘서 감사합니다. 살펴보겠습니다."
     ignored_and_deleted: "알려줘서 감사합니다. 해당 글을 삭제했습니다."
   system_messages:
+    private_topic_title: "주제 # %{id}"
+    contents_hidden: "내용을 보려면 게시물을 방문하십시오."
+    post_hidden:
+      title: "숨겨진 게시물"
+      subject_template: "커뮤니티 플래그로 숨겨진 게시물"
+    post_hidden_again:
+      title: "다시 숨겨진 게시물"
+      subject_template: "커뮤니티 플래그에 의해 숨겨진 게시물, 직원에게 알림"
+    flags_disagreed:
+      title: "직원이 복원 한 신고 된 게시물"
+      subject_template: "직원이 복원 한 신고 된 게시물"
+    flags_agreed_and_post_deleted:
+      title: "직원이 신고 한 소식을 삭제했습니다."
+      subject_template: "직원이 신고 한 소식을 삭제했습니다."
     welcome_user:
+      title: "사용자 환영"
       subject_template: "%{site_name} 사이트에 오신것을 환영합니다!"
       text_body_template: |
         %{site_name} 사이트에 오신것을 환영합니다!
@@ -1370,51 +2095,153 @@ ko:
         저희는 [커뮤니티 행동 방침](%{base_url}/guidelines)을 잘 따라주실 것을 믿습니다.
 
         다시한번 환영합니다!
+    welcome_tl1_user:
+      title: "TL1 사용자 환영"
+      subject_template: "우리와 함께 시간을 보내 주셔서 감사합니다"
+    welcome_staff:
+      title: "직원 환영"
+      subject_template: "축하합니다, 귀하는 %{role} 등급을 받았습니다!"
     welcome_invite:
+      title: "초대합니다"
       subject_template: "%{site_name} 사이트에 오신것을 환영합니다!"
     backup_succeeded:
+      title: "백업 성공"
       subject_template: "백업 성공"
     backup_failed:
+      title: "백업 실패"
       subject_template: "백업에 실패했습니다."
     restore_succeeded:
+      title: "복원 성공"
       subject_template: "복원 성공"
     restore_failed:
+      title: "복원 실패"
       subject_template: "복원 실패"
     bulk_invite_succeeded:
+      title: "대량 초대 성공"
       subject_template: "대량 사용자 초대가 성공적으로 진행되었습니다."
       text_body_template: "대량 사용자 초대가 진행되어 %{sent}개의 초대장을 보냈습니다."
     bulk_invite_failed:
+      title: "대량 초대 실패"
       subject_template: "대량 사용자 초대 중 오류가 났습니다."
+    csv_export_succeeded:
+      title: "CSV 내보내기 성공"
+      subject_template: "[%{export_title}] 데이터 내보내기 완료"
     csv_export_failed:
+      title: "CSV 내보내기 실패"
       subject_template: "데이터 추출 실패"
+      text_body_template: "죄송합니다. 데이터 내보내기에 실패했습니다. 로그를 확인하거나 [직원에게 문의하십시오] (%{base_url} / about)."
+    email_reject_insufficient_trust_level:
+      title: "이메일 거부 신뢰 수준이 충분하지 않습니다"
+      subject_template: "[%{email_prefix}] 이메일 문제-불충분 한 신뢰 수준"
+    email_reject_user_not_found:
+      title: "이메일 거부 사용자를 찾을 수 없음"
+      subject_template: "[%{email_prefix}] 이메일 문제-사용자를 찾을 수 없음"
+    email_reject_screened_email:
+      title: "이메일 거부 된 이메일 거부"
+      subject_template: "[%{email_prefix}] 이메일 문제-차단 된 이메일"
+    email_reject_not_allowed_email:
+      title: "이메일 거부가 허용되지 않는 이메일"
+      subject_template: "[%{email_prefix}] 이메일 문제-차단 된 이메일"
+    email_reject_inactive_user:
+      title: "이메일 거부 비활성 사용자"
+      subject_template: "[%{email_prefix}] 이메일 문제-비활성 사용자"
+    email_reject_silenced_user:
+      title: "이메일 거부 사일런트 사용자"
+      subject_template: "[%{email_prefix}] 이메일 문제-무음 사용자"
+    email_reject_reply_user_not_matching:
+      title: "이메일 거부 사용자가 일치하지 않습니다"
+      subject_template: "[%{email_prefix}] 이메일 문제-예기치 않은 회신 주소"
+    email_reject_empty:
+      title: "이메일 거부 빈"
+      subject_template: "[%{email_prefix}] 이메일 문제-내용 없음"
     email_reject_parsing:
+      title: "이메일 거부 파싱"
+      subject_template: "[%{email_prefix}] 이메일 문제-인식 할 수없는 콘텐츠"
       text_body_template: |2
 
         죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다.
 
         이메일에 내용이 안 보입니다. 답글이 이메일 상단에 있는지 확인 해주세요 -- 한줄 답변은 처리 못합니다.
+    email_reject_invalid_access:
+      title: "이메일이 잘못된 액세스를 거부"
+      subject_template: "[%{email_prefix}] 이메일 문제-잘못된 액세스"
+    email_reject_strangers_not_allowed:
+      title: "이메일 거부 낯선 사람은 허용되지 않습니다"
+      subject_template: "[%{email_prefix}] 이메일 문제-잘못된 액세스"
     email_reject_invalid_post:
+      title: "이메일 거부 잘못된 게시물"
+      subject_template: "[%{email_prefix}] 이메일 문제-게시 오류"
       text_body_template: |
         죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다.
 
         복잡한 포매팅, 대용량 메세지, 너무 짧은 메세지가 문제일 수 있습니다. 다시 시도 해보고 계속 문제 된다면 웹사이트를 통해 글을 올리세요.
     email_reject_invalid_post_specified:
+      title: "이메일 거부 잘못된 게시물 지정"
+      subject_template: "[%{email_prefix}] 이메일 문제-게시 오류"
       text_body_template: "죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. \n\n이유:\n\n%{post_error}\n\n문제를 고치고 다시 시도해 보세요.\n"
+      date_invalid: "게시물 작성 날짜가 없습니다. 이메일에 날짜 : 헤더가 누락 되었습니까?"
+    email_reject_post_too_short:
+      title: "이메일 거부 게시물이 너무 짧음"
+      subject_template: "[%{email_prefix}] 이메일 문제-게시물이 너무 짧습니다"
+    email_reject_invalid_post_action:
+      title: "이메일 거부 잘못된 사후 조치"
+      subject_template: "[%{email_prefix}] 이메일 문제-잘못된 사후 조치"
+    email_reject_reply_key:
+      title: "이메일 거부 회신 키"
+      subject_template: "[%{email_prefix}] 이메일 문제-알 수없는 회신 키"
+    email_reject_bad_destination_address:
+      title: "이메일 거부 잘못된 대상 주소"
+      subject_template: "[%{email_prefix}] 이메일 문제-알 수 없음 : 주소"
+    email_reject_old_destination:
+      title: "이메일 거부 이전 대상"
+      subject_template: "[%{email_prefix}] 이메일 문제-이전 알림에 답장하려고합니다"
+    email_reject_topic_not_found:
+      title: "이메일 거부 주제를 찾을 수 없습니다"
+      subject_template: "[%{email_prefix}] 이메일 문제-주제를 찾을 수 없습니다"
+    email_reject_topic_closed:
+      title: "이메일 거부 주제 종료"
+      subject_template: "[%{email_prefix}] 이메일 문제-주제 마감"
+    email_reject_auto_generated:
+      title: "이메일 거부 자동 생성"
+      subject_template: "[%{email_prefix}] 이메일 문제-자동 생성 된 회신"
+    email_reject_unrecognized_error:
+      title: "이메일 거부 인식 할 수없는 오류"
+      subject_template: "[%{email_prefix}] 이메일 문제-인식 할 수없는 오류"
+    email_reject_attachment:
+      title: "이메일 첨부가 거부 됨"
+      subject_template: "[%{email_prefix}] 이메일 문제-첨부 파일 거부"
+    email_reject_reply_not_allowed:
+      title: "이메일 거부 회신이 허용되지 않습니다"
+      subject_template: "[%{email_prefix}] 이메일 문제-회신이 허용되지 않습니다"
     email_error_notification:
       title: "이메일 에러 알림"
+      subject_template: "[%{email_prefix}] 이메일 문제-POP 인증 오류"
     email_revoked:
+      title: "이메일 해지"
       subject_template: "이메일 주소가 맞습니까?"
+    ignored_users_summary:
+      title: "무시 된 사용자가 임계 값을 통과했습니다."
+      subject_template: "다른 많은 사용자가 사용자를 무시하고 있습니다."
     too_many_spam_flags:
+      title: "너무 많은 스팸 플래그"
       subject_template: "대기중인 신규 계정"
     too_many_tl3_flags:
       title: "TL3 Flag가 너무 많음"
       subject_template: "대기중인 신규 계정"
+    silenced_by_staff:
+      title: "직원에 의해 침묵"
+      subject_template: "일시적으로 보류중인 계정"
+    user_automatically_silenced:
+      title: "자동 침묵하는 사용자"
+      subject_template: "커뮤니티 플래그로 새 사용자 %{username}이 침묵 함"
     spam_post_blocked:
       title: "스팸 게시글 차단됨"
       subject_template: "%{username} 신규가입자가 연속 링크로 블락됨"
     unsilenced:
+      title: "침묵하지 않는"
       subject_template: "계정의 대기가 해제되었습니다"
     pending_users_reminder:
+      title: "대기중인 사용자 알림"
       subject_template:
         other: "%{count}명의 새로운 사용자가 가입 승인 대기중 입니다."
     download_remote_images_disabled:
@@ -1423,18 +2250,43 @@ ko:
       text_body_template: "`download_remote_images_to_local` 설정이`download_remote_images_threshold`에서 정한 디스크 용량에 도달하여 비활성화 되었습니다."
     dashboard_problems:
       title: "대시보드 문제사항"
+      subject_template: "사이트 대시 보드에 대한 새로운 조언"
     new_user_of_the_month:
       title: "이달의 신규회원으로 선정되었습니다!"
       subject_template: "이달의 신규회원으로 선정되었습니다!"
+    queued_posts_reminder:
+      title: "대기중인 게시물 알림"
   subject_re: "덧: "
   subject_pm: "[PM] "
+  email_from: "%{site_name}를 통한 %{user_name}"
   user_notifications:
     previous_discussion: "이전 답글"
+    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}에 게시하였습니다."
+    pm_participants: "참가자 : %{participants}"
+    user_invited_to_private_message_pm_group:
+      title: "PM에 사용자 초대 그룹"
+      subject_template: "[%{email_prefix}] %{username} 님이 @ %{group_name}를 &#39;%{topic_title}&#39;메시지에 초대했습니다"
+    user_invited_to_private_message_pm:
+      title: "PM에 초대 된 사용자"
+      subject_template: "[%{email_prefix}] %{username}가 &#39;%{topic_title}&#39;메시지에 초대했습니다."
+    user_invited_to_private_message_pm_staged:
+      title: "PM 단계별 사용자 초대"
+      subject_template: "[%{email_prefix}] %{username}가 &#39;%{topic_title}&#39;메시지에 초대했습니다."
+    user_invited_to_topic:
+      title: "주제에 초대 된 사용자"
+      subject_template: "[%{email_prefix}] %{username} 님이 &#39;%{topic_title}&#39;에 초대했습니다."
     user_replied:
+      title: "응답 한 사용자"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |2
 
@@ -1446,6 +2298,8 @@ ko:
 
         %{respond_instructions}
     user_replied_pm:
+      title: "사용자 답변 PM"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |2
 
         %{header_instructions}
@@ -1468,6 +2322,7 @@ ko:
 
         %{respond_instructions}
     user_linked:
+      title: "연결된 사용자"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |2
 
@@ -1479,6 +2334,7 @@ ko:
 
         %{respond_instructions}
     user_mentioned:
+      title: "언급 된 사용자"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |2
 
@@ -1490,6 +2346,8 @@ ko:
 
         %{respond_instructions}
     user_mentioned_pm:
+      title: "PM을 언급 한 사용자"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |2
 
         %{header_instructions}
@@ -1500,6 +2358,7 @@ ko:
 
         %{respond_instructions}
     user_group_mentioned:
+      title: "언급 된 사용자 그룹"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |2
 
@@ -1511,6 +2370,7 @@ ko:
 
         %{respond_instructions}
     user_posted:
+      title: "게시 된 사용자"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |2
 
@@ -1534,6 +2394,8 @@ ko:
 
         %{respond_instructions}
     user_posted_pm:
+      title: "게시 된 사용자 오후"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |2
 
         %{header_instructions}
@@ -1544,36 +2406,78 @@ ko:
 
         %{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}] 귀하의 계정이 정지되었습니다"
+    account_silenced:
+      title: "계정 침묵"
+      subject_template: "[%{email_prefix}] 귀하의 계정이 침묵되었습니다"
+    account_exists:
+      title: "계정이 이미 존재합니다"
+      subject_template: "[%{email_prefix}] 계정이 이미 존재합니다"
+    account_second_factor_disabled:
+      title: "이중 인증 사용 안함"
+      subject_template: "[%{email_prefix}] 2 단계 인증 비활성화"
     digest:
       why: "%{last_seen_at}부터 지금까지 %{site_link} 사이트 근황"
       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: "비밀번호 찾기"
       subject_template: "[%{email_prefix}] 비밀번호 리셋"
+    email_login:
+      title: "링크를 통해 로그인"
+      subject_template: "[%{email_prefix}] 링크를 통해 로그인"
     set_password:
       title: "비밀번호 설정"
+      subject_template: "[%{email_prefix}] 비밀번호 설정"
     admin_login:
       title: "관리자 로그인"
       subject_template: "[%{email_prefix}] 로그인"
+    account_created:
+      title: "계정 생성"
+      subject_template: "[%{email_prefix}] 새 계정"
+    confirm_new_email:
+      title: "새 이메일 확인"
+      subject_template: "[%{email_prefix}] 새 이메일 주소 확인"
+    confirm_old_email:
+      title: "오래된 이메일 확인"
+      subject_template: "[%{email_prefix}] 현재 이메일 주소 확인"
+    notify_old_email:
+      title: "오래된 이메일 알림"
+      subject_template: "[%{email_prefix}] 귀하의 이메일 주소가 변경되었습니다"
     signup_after_approval:
+      title: "승인 후 가입"
       subject_template: "당신은 %{site_name} 가입이 승인되었습니다!"
     signup:
       title: "가입하기"
       subject_template: "[%{email_prefix}] 새 계정 확인"
+    activation_reminder:
+      title: "활성화 알림"
+      subject_template: "[%{email_prefix}] 계정 확인 알림"
+    suspicious_login:
+      title: "새로운 로그인 알림"
+      subject_template: "[%{site_name}] %{location}에서 새 로그인"
   page_not_found:
     title: "이런! 그 페이지는 더 이상 존재하지 않거나 비공개 상태입니다."
     popular_topics: "인기"
@@ -1581,6 +2485,9 @@ ko:
     see_more: "더"
     search_title: "이 사이트 검색"
     search_button: "검색"
+  offline:
+    title: "앱을로드 할 수 없습니다"
+    offline_page_message: "오프라인 상태 인 것 같습니다. 네트워크 연결을 확인하고 다시 시도하십시오."
   deleted: "삭제되었습니다"
   image: "이미지"
   upload:
@@ -1590,14 +2497,25 @@ ko:
     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: "사용자는 익명입니다"
@@ -1609,17 +2527,33 @@ ko:
     user_email_post_deleted: "글쓴이에 의해 삭제된 글"
     user_email_user_suspended: "사용자가 차단됨"
     user_email_already_read: "이미 읽은 글"
+    user_email_access_denied: "사용자는이 게시물을 볼 수 없습니다"
     sender_message_blank: "메시지 내용이 없습니다"
     sender_message_to_blank: "메세지가 비어있음"
     sender_text_part_body_blank: "본문이 비어있음"
     sender_body_blank: "본문 내용이 없습니다"
+    sender_post_deleted: "게시물이 삭제되었습니다"
+    sender_message_to_invalid: "수신자에게 잘못된 이메일 주소가 있습니다"
+    sender_topic_deleted: "주제가 삭제되었습니다"
   color_schemes:
     base_theme_name: "기본 테마 색상"
     light: "라이트"
     dark: "다크"
+    neutral: "중립국"
+    grey_amber: "회색 호박색"
+    shades_of_blue: "푸른 그늘"
+    latte: "라떼"
+    summer: "여름"
+    dark_rose: "다크 로즈"
     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: "네"
@@ -1635,22 +2569,33 @@ ko:
   privacy_topic:
     title: "개인정보처리방침"
   badges:
+    mass_award:
+      errors:
+        invalid_csv: "라인 %{line_number}에서 오류가 발생했습니다. CSV에 한 줄에 하나의 이메일이 있는지 확인하십시오."
     editor:
       name: 에디터
       description: 첫 포스트 편집
+    wiki_editor:
+      name: 위키 에디터
+      description: 첫 위키 편집
     basic_user:
       name: 초보회원
+      description: "모든 필수 커뮤니티 기능 <a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">부여</a>"
     member:
       name: 준회원
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">승인 된</a> 초대장, 그룹 메시지, 더 좋아함"
     regular:
       name: 정회원
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">설령</a> 다시 분류, 이름 바꾸기, 다음 링크, 위키, 더 좋아"
     leader:
       name: 지도자
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">부여</a> 글로벌 편집, 핀, 가까운, 보관, 분할 및 병합, 더 좋아"
     welcome:
       name: 웰컴
       description: 좋아요를 받았습니다
     autobiographer:
       name: 자서전 작가
+      description: "<a href=\"%{base_uri}/my/preferences/profile\">프로필</a> 정보 작성"
     anniversary:
       name: 1주년
       description: 1년동안 활동하고 글도 1개이상 썼습니다
@@ -1719,6 +2664,7 @@ ko:
       description: 포스트를 인용함
     read_guidelines:
       name: 가이드라인을 읽었어요
+      description: "<a href=\"%{base_uri}/guidelines\">커뮤니티 지침을</a> 읽으십시오"
     reader:
       name: 독서가
       description: 100개가 넘는 답글이 달린 토픽의 답글을 모두 읽었습니다
@@ -1763,8 +2709,10 @@ ko:
         이 배지는 300개의 포스트를 올려서 적어도 5개의 좋아요를 받았을 때 수여됩니다. 와우! 우리 커뮤니티는 당신의 꾸준하고 질높은 기여를 숭배합니다.
     out_of_love:
       name: 사랑꾼
+      description: "중고 %{max_likes_per_day} 좋아하는 하루"
     higher_love:
       name: 박애주의자
+      description: "중고 %{max_likes_per_day} 좋아하는 하루에 5 번"
     crazy_in_love:
       name: 사랑밖에 모르는 바보
       description: 20번이나 좋아요 50개를 보냈습니다
@@ -1804,6 +2752,15 @@ ko:
       long_description: |2
 
         이 배지는 매달 누구에게 얼마나 많은 좋아요를 받았는지를 기준으로 가장 훌륭한 기여를 한 신규 사용자 두 명을 축하하기 위하여 수여됩니다.
+    enthusiast:
+      name: 열성가
+      description: 연속 10 일 방문
+    aficionado:
+      name: 열렬한 애호가
+      description: 연속 100 일 방문
+    devotee:
+      name: 신봉자
+      description: 365 일 연속 방문
     badge_title_metadata: "%{site_title}의 %{display_name} 배지"
   admin_login:
     success: "이메일 보냄"
@@ -1819,6 +2776,13 @@ ko:
     title: "태그"
     staff_tag_disallowed: '"%{tag}" 태그는 운영진만 붙일 수 있습니다.'
     staff_tag_remove_disallowed: '"%{tag}" 태그는 운영진만 제거할 수 있습니다.'
+    upload_row_too_long: "CSV 파일에는 한 줄에 하나의 태그가 있어야합니다. 선택적으로 태그 뒤에 쉼표가 붙은 다음 태그 그룹 이름이 올 수 있습니다."
+    forbidden:
+      in_this_category: '이 카테고리에서는 &quot;%{tag_name}&quot;을 사용할 수 없습니다'
+      synonym: '동의어는 허용되지 않습니다. 대신 &quot;%{tag_name}&quot;을 사용하십시오.'
+      has_synonyms: '&quot;%{tag_name}&quot;에는 동의어가 있으므로 사용할 수 없습니다.'
+    invalid_target_tag: "동의어의 동의어 일 수 없습니다"
+    synonyms_exist: "동의어가 존재하는 동안 허용되지 않습니다"
   rss_by_tag: "토픽에%{tag}태그가 달렸습니다"
   finish_installation:
     congratulations: "축하합니다. Discourse를 설치하셨습니다!"
@@ -1826,8 +2790,10 @@ ko:
       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>로 보냈습니다."
@@ -1838,6 +2804,7 @@ ko:
     only_official: "비공식 플러그인 해제하기"
     no_plugins: "모든 플러그인 해제하기"
     enter: "안전모드 들어가기"
+    must_select: "안전 모드로 들어가려면 하나 이상의 옵션을 선택해야합니다."
   wizard:
     title: "Discourse Setup"
     step:
@@ -1856,8 +2823,12 @@ ko:
           site_description:
             label: "당신의 커뮤니티를 짧은 문장으로 축약하여 설명해보세요"
             placeholder: "빠오가 친구와 함께 재밌는 일들에 대하여 이야기나누는 곳"
+          short_site_description:
+            label: "몇 마디로 커뮤니티를 설명하십시오"
+            placeholder: "최고의 커뮤니티"
       introduction:
         title: "소개"
+        disabled: "<p> 제목이 &quot;%{topic_title}&quot;인 주제를 찾을 수 없습니다. </p><ul><li> 제목을 변경 한 경우 해당 주제를 편집하여 사이트의 소개 텍스트를 수정하십시오. </li><li> 이 주제를 삭제 한 경우 제목으로“%{topic_title}”을 사용하여 다른 주제를 작성하십시오. 첫 번째 게시물의 내용은 사이트의 소개 텍스트입니다. </li></ul>"
         fields:
           welcome:
             label: "웰컴 토픽"
@@ -1865,13 +2836,25 @@ ko:
             one_paragraph: "환영 메시지를 딱 한 문단으로 줄여주세요."
       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:
@@ -1881,25 +2864,47 @@ ko:
             description: "이 커뮤니티를 대표하는 개인 또는 그룹 이메일 주소를 입력하세요. 처리되지 않은 신고, 보안 업데이트와 같은 중요한 알림을 받게되며 긴급한 커뮤니티 연락을 받도록<a href='%{base_path}/about' target='_blank'>about 페이지</a> 에도 표시됩니다."
           contact_url:
             label: "웹 페이지"
+            placeholder: "https://www.example.com/contact-us"
             description: "당신 또는 당신의 조직을 위한 Contact 웹페이지입니다. <a href='%{base_path}/about' target='_blank'>about 페이지</a>에 나타나게 됩니다."
           site_contact:
             label: "자동화된 메시지"
+            description: "플래그 경고 및 백업 완료 알림과 같은 모든 자동 담론 개인 메시지가이 사용자로부터 전송됩니다."
       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: "테마"
       themes_further_reading:
         title: "테마"
+        description: "당신의 담화를 커스터마이징 하시겠습니까? 강력한 테마 시스템을 활용하십시오. <ul><li> <a href='https://meta.discourse.org/t/63682' target='_blank'>테마 또는 테마 구성 요소를 설치하는 방법</a> </li><li> <a href='https://meta.discourse.org/t/110448' target='_blank'>테마 개발자 빠른 참조 안내서</a> </li></ul> 인기있는 테마 구성 요소 (자세한 내용은 <a href='https://meta.discourse.org/c/theme/l/latest' target='_blank'>#theme</a> 탐색)"
       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: "홈페이지"
@@ -1914,11 +2919,19 @@ ko:
                 label: "주요 토픽이 있는 카테고리"
               categories_and_latest_topics:
                 label: "카테고리 및 최신 토픽"
+              categories_and_top_topics:
+                label: "카테고리 및 주요 주제"
+              categories_boxes:
+                label: "카테고리 상자"
+              categories_boxes_with_topics:
+                label: "주제가있는 카테고리 상자"
       emoji:
         title: "Emoji"
         description: "당신의 커뮤니티에는 어떤 스타일의 Emoji를 쓰고 싶으세요? 관리자, 커스터마이징, Emoji 메뉴에서 사용자정의 Emoji를 더 추가할 수도 있습니다."
       invites:
         title: "운영진 초청하기"
+        description: "거의 다 끝났습니다! 흥미로운 주제와 답변을 <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>통해 토론</a> 을 시작하여 커뮤니티를 시작하는 데 도움을 줄 사람들을 초대합시다."
+        disabled: "로컬 로그인이 비활성화되어 있으므로 누구에게도 초대장을 보낼 수 없습니다. 다음 단계로 진행하십시오."
       finished:
         title: "당신의 Discourse가 준비되었습니다!"
   search_logs:
@@ -1926,44 +2939,129 @@ ko:
   joined: "가입함"
   discourse_push_notifications:
     popup:
+      mentioned: '%{username}가 &quot;%{topic}&quot;에서 당신을 언급했습니다-%{site_title}'
+      group_mentioned: '%{username}가 &quot;%{topic}&quot;에서 당신을 언급했습니다-%{site_title}'
+      quoted: '%{username} &quot;%{topic}&quot;에서 인용-%{site_title}'
+      replied: '%{username} &quot;%{topic}&quot;에서 답장을했습니다-%{site_title}'
+      posted: '&quot;%{topic}&quot;에 게시 된 %{username}-%{site_title}'
+      private_message: '%{username}에서 &quot;%{topic}&quot;에 개인 메시지를 보냈습니다-%{site_title}'
+      linked: '&quot;%{topic}&quot;의 게시물에 링크 된 %{username}-%{site_title}'
+      watching_first_post: '%{username}가 새로운 주제 &quot;%{topic}&quot;-%{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: "웹 후크가 자동으로 비활성화되었습니다. 여러 개의 &#39;%{status}&#39;HTTP 상태 실패 응답을 받았습니다."
+    api_key:
+      revoked: 해지
+      restored: 복원
   reviewables:
+    already_handled: "감사합니다. 이미 해당 게시물을 검토 한 후 다시 신고 할 필요가 없습니다."
     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: "신뢰 수준이 낮은 사용자에게는 직원이 승인 한 주제가 있어야합니다. `approve_new_topics_unless_trust_level`을 참조하십시오."
+      fast_typer: "새로운 사용자가 첫 번째 게시물을 의심스럽게 빠르거나 의심되는 봇 또는 스패머 동작을 입력했습니다. `min_first_post_typing_time`을 참조하십시오."
+      auto_silence_regexp: "첫 번째 게시물이 &#39;auto_silence_first_post_regex&#39;설정과 일치하는 새 사용자"
+      watched_word: "이 게시물에는 감시 단어가 포함되어 있습니다. <a href='%{base_url}/admin/logs/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`를 참조하십시오."
     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_spammer:
         title: "스패머 삭제"
+        description: "사용자와 모든 게시물 및 주제를 제거하십시오."
+        confirm: "해당 사용자의 게시물, 주제를 모두 삭제하고 해당 IP 및 이메일 주소를 차단 하시겠습니까?"
       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: "거부"
       delete_user:
         title: "사용자 삭제"
+        confirm: "해당 사용자를 삭제 하시겠습니까? 그러면 모든 게시물이 삭제되고 이메일과 IP 주소가 차단됩니다."
+        reason: "검토 대기열을 통해 삭제"
+  email_style:
+    html_missing_placeholder: "html 템플릿에는 %{placeholder}이 포함되어야합니다."
+  discord:
+    not_in_allowed_guild: "인증 실패. 귀하는 허용 된 불일치 길드의 회원이 아닙니다."
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index a81fd978a6..647ec1fcc0 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -1302,6 +1302,7 @@ nl:
     unreachable_themes: "We konden niet op updates controleren voor de volgende thema's:"
     watched_word_regexp_error: "De reguliere expressie voor %{action} in de gaten gehouden woorden is ongeldig. Controleer uw <a href='%{base_path}/admin/logs/watched_words'>Instellingen voor in de gaten gehouden woorden</a>, of schakel de website-instelling 'watched words regular expressions' uit."
   site_settings:
+    display_local_time_in_user_card: "De lokale tijd weergeven op basis van de tijdzone van een gebruiker wanneer zijn of haar gebruikerskaart wordt geopend."
     censored_words: "Woorden die automatisch door &#9632;&#9632;&#9632;&#9632; zullen worden vervangen"
     delete_old_hidden_posts: "Verborgen berichten die meer dan 30 dagen verborgen blijven automatisch verwijderen"
     default_locale: "De standaardtaal van deze Discourse-instantie. U kunt de tekst van door het systeem gegenereerde categorieën en topics vervangen onder <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Aanpassen / Tekst</a>."
@@ -1469,7 +1470,6 @@ nl:
     allow_index_in_robots_txt: "Geef in robots.txt op dat deze website door webzoekmachines mag worden geïndexeerd. In uitzonderlijke gevallen kunt u <a href='%{base_path}/admin/customize/robots'>robots.txt</a> blijvend negeren."
     email_domains_blacklist: "Een door een verticaal streepje (pipe) gescheiden lijst van e-maildomeinen waarmee gebruikers geen accounts mogen registreren. Voorbeeld: mailinator.com|trashmail.net"
     email_domains_whitelist: "Een door een verticaal streepje (pipe) gescheiden lijst van e-maildomeinen waarmee gebruikers accounts MOETEN registreren. WAARSCHUWING: gebruikers met andere dan de vermelde e-maildomeinen worden niet toegestaan!"
-    enforce_canonical_emails: "E-mailadres naar canonieke vorm ombouwen voordat gebruikers worden aangemaakt, omwille van uniciteit. De instelling heeft alleen effect bij nieuwe accountregistraties. Wanneer ingesteld, kan user+1@domain.com zich niet kunnen registreren als user+2@domain.com al is geregistreerd."
     auto_approve_email_domains: "Gebruikers met e-mailadressen van deze lijst met domeinen worden automatisch goedgekeurd."
     hide_email_address_taken: "Gebruikers niet informeren dat een account met een bepaald e-mailadres bestaat tijdens registratie en vanaf het formulier voor vergeten wachtwoorden."
     log_out_strict: "Bij het afmelden ALLE sessies voor de gebruiker op alle apparaten afmelden"
@@ -1499,6 +1499,8 @@ nl:
     sso_overrides_username: "Overschrijft bij elke aanmelding lokaal opgegeven gebruikersnaam door gebruikersnaam uit SSO-payload van externe website, en voorkomt lokale wijzigingen. (WAARSCHUWING: er kunnen discrepanties ontstaan door verschillen in lengte/vereisten van gebruikersnaam)"
     sso_overrides_name: "Overschrijft bij elke aanmelding lokaal opgegeven volledige naam door volledige naam uit SSO-payload van externe website, en voorkomt lokale wijzigingen."
     sso_overrides_avatar: "Overschrijft gebruikersavatar door avatar uit SSO-payload van externe website. Als dit is ingeschakeld, mogen gebruikers geen avatars uploaden op Discourse."
+    sso_overrides_location: "Overschrijft gebruikerslocatie door externe locatie uit SSO-payload, en voorkomt lokale wijzigingen."
+    sso_overrides_website: "Overschrijft gebruikerswebsite door externe locatie uit SSO-payload, en voorkomt lokale wijzigingen."
     sso_overrides_profile_background: "Overschrijft achtergrond van gebruikersprofiel door avatar uit SSO-payload van externe website."
     sso_overrides_card_background: "Overschrijft achtergrond van gebruikerskaart door avatar uit SSO-payload van externe website."
     sso_not_approved_url: "Niet-goedgekeurde SSO-accounts omleiden naar deze URL"
@@ -1937,6 +1939,8 @@ nl:
     push_notifications_prompt: "Prompt voor gebruikerstoestemming weergeven."
     push_notifications_icon: "Het badgepictogram dat in de meldingenhoek verschijnt. Vereiste grootte is 96 × 96."
     short_title: "De korte titel wordt gebruikt op het startscherm van de gebruiker, de starter, of andere plaatsen waar ruimte beperkt kan zijn. Beperk de naam tot 12 tekens."
+    dashboard_hidden_reports: "Toestaan dat de opgegeven rapporten worden verborgen op het dashboard."
+    dashboard_visible_tabs: "Kiezen welke dashboardtabbladen zichtbaar zijn."
     dashboard_general_tab_activity_metrics: "Kies rapporten die als activiteitsgegevens op het algemene tabblad worden weergegeven."
     gravatar_name: "Naam van de Gravatar-provider"
     gravatar_base_url: "URL van de API-basis van de Gravatar-provider"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 2bb1d0e217..1cfe19be31 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -362,7 +362,7 @@ ru:
       time_must_be_provided: "время должно быть установлено для всех напоминаний, кроме '%{reminder_type}'"
     reminders:
       at_desktop: "При следующем посещении форума"
-      later_today: "Позже сегодня"
+      later_today: "Сегодня, но позже"
       next_business_day: "На следующий рабочий день"
       tomorrow: "Завтра"
       next_week: "На следующей неделе"
@@ -488,6 +488,7 @@ ru:
               no_user_selected: "Вы должны выбрать пользователя."
               reply_by_email_disabled: "Ответ по e-mail был отключен."
               target_user_not_found: "Не удалось найти одного из пользователей, которому вы отправляете это сообщение."
+              unable_to_update: "При обновлении темы произошла ошибка."
             featured_link:
               invalid: "недействителен. URL должен включать http:// или https://."
               invalid_category: "не может быть изменено в данной категории."
@@ -1292,6 +1293,7 @@ ru:
     out_of_date_themes: "Доступны обновления для следующих тем:"
     unreachable_themes: "Нам не удалось проверить наличие обновлений по следующим темам:"
   site_settings:
+    display_local_time_in_user_card: "Отображать местное время в карточке пользователя."
     censored_words: "Слова, которые будут автоматически заменены на &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Автоматически удалять сообщения, скрытые дольше чем 30 дней."
     allow_user_locale: "Позволять пользователям выбирать язык интерфейса"
@@ -1436,8 +1438,23 @@ ru:
     min_admin_password_length: "Минимальная длина пароля для Администратора."
     block_common_passwords: "Не позволять использовать пароли из списка 10 000 самых часто используемых паролей."
     enable_sso: "Включите единый вход через внешний сайт (ВНИМАНИЕ: ПОЧТОВЫЕ АДРЕСА ПОЛЬЗОВАТЕЛЕЙ *ДОЛЖНЫ* БЫТЬ ПРОВЕРЕНЫ ВНЕШНИМ САЙТОМ!)"
+    verbose_sso_logging: "Записывать подробную диагностику, связанную с SSO, в файл <a href='%{base_path}/logs' target='_blank'>/журнала</a>"
+    enable_sso_provider: "Использовать протокол поставщика единого входа (SSO). Необходимо настроить параметр sso_provider_secrets"
+    sso_url: "URL портала для осуществления технологии единого входа (должен содержать http:// или https://)"
     sso_secret: "Секретный набор символов, используемый для проверки подлинности зашифрованного входа с помощью SSO, убедитесь, что это 10 или более символов"
+    sso_provider_secrets: "Список секретных доменов, которые используют Discourse в качестве поставщика единого входа (SSO). Убедитесь, что это 10 или более символов. Может быть использован символ звёздочки для соответствия любому домену или части домена (пример: *.example.com)"
+    sso_overrides_bio: "Перезаписать в профиле информацию о пользователе и запретить её редактирование"
+    sso_overrides_groups: "Перезаписать все группы, указанные вручную, группами, указанными в соответствующем SSO-атрибуте (ВНИМАНИЕ: Если группы в SSO-атрибуте не указаны, то список групп пользователя будет очищен"
+    sso_overrides_email: "Перезаписывать локальную электронную почту электронной почтой внешнего SSO-сайта при каждом входе в систему и запретить её редактирование. (ВНИМАНИЕ: из-за этого могут возникать расхождения)"
+    sso_overrides_username: "Перезаписывать локальное имя пользователя пользователем внешнего SSO-сайта при каждом входе в систему и запретить его редактирование. (ВНИМАНИЕ: из-за этого могут возникать расхождения)"
+    sso_overrides_name: "Перезаписывать локальное полное имя пользователя полным именем пользователем внешнего SSO-сайта при каждом входе в систему и запретить его редактирование"
+    sso_overrides_avatar: "Перезаписывать локальный аватар аватаром с внешнего SSO-сайта и запретить его изменение"
+    sso_overrides_location: "Перезаписывать указанное местонахождение пользователя данными с внешнего SSO-сайта и запретить их изменение"
+    sso_overrides_website: "Перезаписывать указанный веб-сайт пользователя данными с внешнего SSO-сайта и запретить их изменение"
+    sso_overrides_profile_background: "Перезаписывать локальный фон шапки профиля аватаром с внешнего SSO-сайта"
+    sso_overrides_card_background: "Перезаписывать локальный фон карточки пользователя аватаром с внешнего SSO-сайта"
     sso_not_approved_url: "Перенаправлять неподтвержденные SSO-аккаунты на этот URL"
+    sso_allows_all_return_paths: "Не вводить ограничения для параметра return_paths на доменные имена из SSO-списка (по умолчанию возврат должен осуществляться на текущий сайт)"
     allow_new_registrations: "Разрешить регистрацию новых пользователей. Выключите, чтобы запретить посетителям создавать новые учетные записи."
     google_oauth2_client_id: "Client ID для вашего Google приложения."
     google_oauth2_client_secret: "Client secret для Google приложения"
@@ -1695,6 +1712,8 @@ ru:
     city_for_disputes: "Город для решения споров"
     push_notifications_prompt: "Отображение запроса согласия пользователя."
     push_notifications_icon: "Иконка значка, который появляется в углу уведомлений. Необходимый размер 96 × 96."
+    dashboard_hidden_reports: "Разрешить скрытие отдельных отчётов из админки."
+    dashboard_visible_tabs: "Выберите закладки, которые будут отображаться в админке."
     dashboard_general_tab_activity_metrics: "Выберите отчеты для отображения в качестве метрики активности на вкладке Общие."
     errors:
       invalid_email: "Неправильный адрес электронной почты."
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index e610dbec9b..8cb45527a3 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -1282,6 +1282,7 @@ sv:
     unreachable_themes: "Vi kunde inte kontrollera uppdateringar för följande teman:"
     watched_word_regexp_error: "Det reguljära uttrycket för %{action} bevakade ord är ogiltigt. Kontrollera dina <a href='%{base_path}/admin/logs/watched_words'>inställningar för bevakade ord</a>, eller inaktivera webbplatsens inställningar för 'watched words regular expressions'."
   site_settings:
+    display_local_time_in_user_card: "Visa den lokala tiden baserat på en användares tidszon när deras användarkort öppnas."
     censored_words: "Ord som automatiskt ersätts med &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-radera alla dolda inlägg som varit dolda i mer än 30 dagar."
     default_locale: "Standardspråket för denna Discource-instans. Du kan ersätta texten för systemgenererade kategorier och ämnen via <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Anpassa / Text</a>."
@@ -1449,7 +1450,6 @@ sv:
     allow_index_in_robots_txt: "Ange i robots.txt att den här webbplatsen får indexeras av webbsökmotorer. I undantagsfall kan du permanent <a href='%{base_path}/admin/customize/robots'>åsidosätta robots.txt</a>."
     email_domains_blacklist: "En pipe-avgränsad lista av alla e-postdomän som användare inte tillåts registrera konton med. Exempel: mailinator.com, trashmail.net"
     email_domains_whitelist: "En pipe-avgränsad lista av alla e-postdomän som användare MÅSTE registrera konton med. VARNING: Användare med e-postdomän som inte finns på listan kommer inte att tillåtas!"
-    enforce_canonical_emails: "Innan användarna skapas rensas e-postadress till kanonisk form vilket garanterar unikhet. Inställningen kommer endast att gälla vid nya kontoregistreringar. Om aktiverad kommer användare+1@domän.se inte att tillåtas registrera sig om användare+2@domän.se redan är registrerad."
     auto_approve_email_domains: "Användare med e-postadresser som finns i denna lista av domäner kommer automatiskt att godkännas."
     hide_email_address_taken: "Informera inte användare om att det finns ett konto med en given e-postadress vid registreringen eller från det glömda lösenordsformuläret."
     log_out_strict: "Vid utloggning, logga ut ALLA sessioner för den användaren på alla apparater"
@@ -1479,6 +1479,8 @@ sv:
     sso_overrides_username: "Åsidosätter lokala användarnamn med externa webbplatsers användarnamn från SSO-nyttolast vid varje inloggning, och förhindrar lokala ändringar. (VARNING: diskrepanser kan inträffa på grund av skillnader i användarnamnets längd/krav)"
     sso_overrides_name: "Åsidosätter lokala fullständiga namn med externa webbplatsers fullständiga namn från SSO-nyttolast vid varje inloggning, och förhindrar lokala ändringar."
     sso_overrides_avatar: "Åsidosätter användaravatar med extern webbplatsavatar från SSO-nyttolast. Om det är aktiverat kan användare inte ladda upp avatarer på Discourse."
+    sso_overrides_location: "Åsidosätter användarens plats med plats hämtad externt från SSO-nyttolast och förhindrar sedan lokala ändringar."
+    sso_overrides_website: "Åsidosätter användarens webbplats med data hämtad externt från SSO-nyttolast och förhindrar sedan lokala ändringar."
     sso_overrides_profile_background: "Åsidosätter användarprofilbakgrund med extern webbplatsavatar från SSO-nyttolast."
     sso_overrides_card_background: "Åsidosätter användarkortets bakgrund med extern webbplatsavatar från SSO-nyttolast."
     sso_not_approved_url: "Omdirigera icke godkända SSO-konton till den här URL:en"
@@ -1917,6 +1919,8 @@ sv:
     push_notifications_prompt: "Visa användarens samtycke genast."
     push_notifications_icon: "Utmärkelseikonen som visas i notifieringshörnet. Obligatorisk storlek är 96 x 96."
     short_title: "Den korta titeln kommer att användas på användarens startskärm, startapparat eller andra platser där utrymmet kan vara begränsat. Det bör begränsas till 12 tecken."
+    dashboard_hidden_reports: "Tillåt att de specificerade rapporterna döljs från översiktspanelen."
+    dashboard_visible_tabs: "Välj vilka flikar på översiktspanelen som ska vara synliga."
     dashboard_general_tab_activity_metrics: "Välj rapporter som ska visas som aktivitetsmätningar på fliken allmänt."
     gravatar_name: "Namn på Gravatar leverantören"
     gravatar_base_url: "Url till Gravatar leverantörens API mål"
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index b29dbf9368..845f67887f 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -740,26 +740,26 @@ zh_CN:
       title: "需要审核"
   post_action_types:
     off_topic:
-      title: "题外话"
-      description: "此帖与该主题标题和第一帖而言所讨论的主题无关，可能需要被移动。"
+      title: "偏离主题"
+      description: "该帖子与当前主题的标题和首帖内容所无关，可能需要被移动到其它地方。"
       short_description: "和讨论不相关"
-      long_form: "标记为题外话"
+      long_form: "标记为偏离主题"
     spam:
-      title: "垃圾"
+      title: "垃圾内容"
       description: "该帖子是广告或破坏。帖子没有价值或者与当前主题无关。"
-      short_description: "这是个广告或者破坏"
-      long_form: "标记为垃圾"
+      short_description: "这是广告或者破坏行为"
+      long_form: "标记为垃圾内容"
       email_title: '“%{title}”被标记为垃圾'
       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>'
       long_form: "标记为不当内容"
     notify_user:
       title: "给 @{{username}}发送一条私信"
-      description: "我想与此人私下交流他们的帖子。"
-      short_description: "我想与此人私下交流他们的帖子。"
+      description: "我想亲自与此人私下交流关于该帖子的事情。"
+      short_description: "我想亲自与此人私下交流关于该帖子的事情。"
       long_form: "以发送私信给用户"
       email_title: '你在“%{title}”中的帖子'
       email_body: "%{link}\n\n%{message}"
@@ -777,9 +777,9 @@ zh_CN:
       long_form: "已收藏本帖"
     like:
       title: "赞"
-      description: "赞本帖"
-      short_description: "赞该贴"
-      long_form: "赞本帖内容"
+      description: "点赞该帖子"
+      short_description: "赞该帖"
+      long_form: "赞了本帖"
   draft:
     sequence_conflict_error:
       title: "草稿错误"
@@ -820,20 +820,20 @@ zh_CN:
   topic_flag_types:
     spam:
       title: "垃圾"
-      description: "这个主题是广告。它对本站点没有联系和帮助，仅仅是推销信息。"
+      description: "该主题是一个广告。它对本网站没有用处或相关性，仅仅是推销内容。"
       long_form: "标记为垃圾"
-      short_description: "这是个广告"
+      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:
       title: "其他内容"
-      description: '此帖需要版主依据<a href="%{base_path}/guidelines">社区准则</a>、<a href="%{tos_url}">服务条款（TOS）</a>或其它未列出的原因来给予关注。'
-      long_form: "标记为需版主注意"
-      short_description: "需要管理人员注意的其他原因"
-      email_title: '“{title}”主题需要你的关注'
+      description: '该主题需要版主依据<a href="%{base_path}/guidelines">社区准则</a>、<a href="%{tos_url}">服务条款（TOS）</a>或其它未列出的原因给予关注。'
+      long_form: "标记以让版主注意"
+      short_description: "因其他原因需要管理人员注意"
+      email_title: '主题“%{title}”需要版主注意'
       email_body: "%{link}\n\n%{message}"
   flagging:
     you_must_edit: '<p>你的帖子被社区标记了。请<a href="%{path}">查看你的消息</a>。</p>'
@@ -1255,6 +1255,7 @@ zh_CN:
     unreachable_themes: "我们无法检查以下主题的更新："
     watched_word_regexp_error: "捕获敏感词 %{action} 的正则表达式无效。请检查你的<a href='%{base_path}/admin/logs/watched_words'>敏感词设置</a>，或禁用“敏感词正则表达式”网站设置。"
   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>替换系统生成的分类或主题的文本。"
@@ -1446,13 +1447,15 @@ zh_CN:
     sso_secret: "用于加密验证SSO信息的密钥字符串，请确保是 10 个字符或者更长"
     sso_provider_secrets: "使用Discourse作为SSO provider的域名与密钥对列表。确保SSO密钥为10个字符或更长。通配符 * 可用于匹配任何域名或仅匹配其中的一部分（例如* .example.com）。"
     sso_overrides_bio: "覆盖用户个人信息中的用户简介并禁止用户修改"
-    sso_overrides_groups: "将所有手动创建的群组与SSO属性中指定的群组同步（警告：如果你没有指定群组，那么将为用户清除手动创建的群组的成员资格）"
-    sso_overrides_email: "每登录都使用 SSO 信息中的外部站点的邮件地址覆盖本地邮件地址，并且阻止本地的邮件地址修改。（警告：因格本地邮件的正规化，邮件地址可能会有所差异）"
-    sso_overrides_username: "每次登录都使用 SSO 信息中的外部站点的用户名覆盖本地用户名，并且阻止本地的用户名修改。（警告：因本地用户名的长度或其他要求，用户名可能会有所差异）"
-    sso_overrides_name: "每次登录都使用 SSO 信息中的外部站点的全名覆盖本地全名，并且阻止本地的全名修改。"
-    sso_overrides_avatar: "使用SSO信息覆盖使用外部头像的用户头像。如果启用，则不允许用户在Discourse上传头像。"
-    sso_overrides_profile_background: "使用SSO信息中的外部站点头像覆盖用户资料背景"
-    sso_overrides_card_background: "使用SSO信息中的外部站点头像覆盖用户卡片背景。"
+    sso_overrides_groups: "将所有手动创建的群组与SSO属性中指定的群组同步（警告：如果你没有指定群组，那么将为用户清除所有手动创建的群组的成员资格）"
+    sso_overrides_email: "每次登录都使用 SSO 信息中的外部站点的邮件地址覆盖本地邮件地址，并且禁止本地修改邮件地址。（警告：由于本地邮件的规范化，邮件地址可能会有所差异）"
+    sso_overrides_username: "每次登录都使用 SSO 信息中的的用户名覆盖本地用户名，并且禁止本地修改用户名。（警告：因本地用户名的长度或其它要求，用户名可能会有所差异）"
+    sso_overrides_name: "每次登录都使用 SSO 信息中的外部站点的全名覆盖本地全名，并且禁止本地的全名修改。"
+    sso_overrides_avatar: "使用SSO信息中的外部站点头像覆盖用户头像。如果启用，则不允许用户在Discourse上传头像。"
+    sso_overrides_location: "使用SSO信息中的位置覆盖用户位置，并且禁止本地修改。"
+    sso_overrides_website: "使用SSO信息中的外部位置覆盖用户网站，并且禁止本地修改。"
+    sso_overrides_profile_background: "使用SSO信息中的外部站点的头像覆盖用户资料背景"
+    sso_overrides_card_background: "使用SSO信息中的外部站点的头像覆盖用户卡片背景。"
     sso_not_approved_url: "将未经授权的SSO账户重定向至这个 URL"
     sso_allows_all_return_paths: "不限制 SSO 所提供的 return_paths 中的域名（默认情况下返回的地址必须位于当前站点）"
     enable_local_logins: "启用基于本地用户名和密码登录的账户。必须启用此选项才能使邀请生效。警告：如果禁用，且之前未配置至少一种备用登录方法，则可能无法登录。"
@@ -1849,7 +1852,7 @@ zh_CN:
     default_categories_watching: "默认监看的分类列表。"
     default_categories_tracking: "默认跟踪的分类列表。"
     default_categories_muted: "默认静音的分类列表"
-    default_categories_watching_first_post: "默认关注该分类中每个新主题的第一条贴子"
+    default_categories_watching_first_post: "默认关注该分类中每个新主题的第一个帖子"
     mute_all_categories_by_default: "将所有分类的默认通知级别设置为静音。要求用户选择在“最新”和“分类”页面中出现的分类。如果您希望修改匿名用户的默认设置，请设置 'default_categories_'。"
     default_tags_watching: "默认监看的标签列表。"
     default_tags_tracking: "默认追踪的标签列表。"
@@ -1889,6 +1892,8 @@ zh_CN:
     push_notifications_prompt: "显示用户同意提示。"
     push_notifications_icon: "通知角中显示的徽章图标。尺寸必须为96px × 96px。"
     short_title: "短标题将用于用户主页、启动器或其他可能空间有限的地方。应该控制在12个字符内。"
+    dashboard_hidden_reports: "允许从仪表盘中隐藏指定的报告。"
+    dashboard_visible_tabs: "选择可见的仪表盘标签页"
     dashboard_general_tab_activity_metrics: "选择在常规选项卡中显示为活动指标的报告。"
     gravatar_name: "Gravatar提供商的名称"
     gravatar_base_url: "Gravatar提供商API的基础链接"
diff --git a/plugins/discourse-details/config/locales/server.ko.yml b/plugins/discourse-details/config/locales/server.ko.yml
index a454f55755..11dbf4deb8 100644
--- a/plugins/discourse-details/config/locales/server.ko.yml
+++ b/plugins/discourse-details/config/locales/server.ko.yml
@@ -8,3 +8,5 @@
 ko:
   site_settings:
     details_enabled: '상세 기능을 사용. 이를 변경하면 다음 명령어를 사용하여 모든 게시물을 다시 게시해야합니다: "rake posts:rebake".'
+  details:
+    excerpt_details: "(자세한 내용을 보려면 클릭하십시오)"
diff --git a/plugins/discourse-local-dates/config/locales/client.bg.yml b/plugins/discourse-local-dates/config/locales/client.bg.yml
index 5e1382b35c..fa9d1e7b1b 100644
--- a/plugins/discourse-local-dates/config/locales/client.bg.yml
+++ b/plugins/discourse-local-dates/config/locales/client.bg.yml
@@ -12,3 +12,4 @@ bg:
         form:
           date_title: Дата
           time_title: 'Време '
+          timezone: Часова зона
diff --git a/plugins/discourse-local-dates/config/locales/client.hy.yml b/plugins/discourse-local-dates/config/locales/client.hy.yml
index b9fe770315..ead8396f92 100644
--- a/plugins/discourse-local-dates/config/locales/client.hy.yml
+++ b/plugins/discourse-local-dates/config/locales/client.hy.yml
@@ -27,3 +27,4 @@ hy:
           date_title: Ամսաթիվ
           time_title: Ժամ
           format_title: Ամսաթվի ֆորմատ
+          timezone: Ժամային գոտի
diff --git a/plugins/discourse-local-dates/config/locales/client.ko.yml b/plugins/discourse-local-dates/config/locales/client.ko.yml
index 6d98a6c311..4bd9d3ab6f 100644
--- a/plugins/discourse-local-dates/config/locales/client.ko.yml
+++ b/plugins/discourse-local-dates/config/locales/client.ko.yml
@@ -12,6 +12,9 @@ ko:
         today: 오늘 %{time}
         tomorrow: 내일 %{time}
         yesterday: 어제 %{time}
+        countdown:
+          passed: 날짜가 지났습니다
+      title: 날짜 / 시간 삽입
       create:
         form:
           insert: 삽입
@@ -28,6 +31,7 @@ ko:
           time_title: 시간
           format_title: 날짜 형식
           timezone: 시간대
+          until: 까지...
           recurring:
             every_day: "매일"
             every_week: "매주"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.bg.yml b/plugins/discourse-narrative-bot/config/locales/server.bg.yml
index 1a726b66b8..51fed3681e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.bg.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.bg.yml
@@ -17,3 +17,6 @@ bg:
     new_user_narrative:
       hello:
         title: "Привет!"
+      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"> **отметнете това лично съобщение**. Ако го направите, може да има :подарък: в бъдещето ви!
diff --git a/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml b/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
index 61cce204f3..4a0f84b0d0 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
@@ -121,11 +121,6 @@ bs_BA:
       random_mention:
         reply: |-
           Pozdrav! Kako bi saznali šta sve mogu raditi, recite `@%{discobot_username} %{help_trigger}`.
-        tracks: |-
-          Trenutno znam kako uraditi sljedeće stvari:
-
-          `@%{discobot_username} %{reset_trigger} {ime-tutorijala}`
-          > Starta interaktivni tutorijal. `{ime-tutorijala}` može biti jedan od `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ca.yml b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
index 914e221e11..b930eeab10 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ca.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
@@ -117,11 +117,6 @@ ca:
       random_mention:
         reply: |-
           Hola! Per a trobar què puc fer, digueu `@%{discobot_username} %{help_trigger}`.
-        tracks: |-
-          Ara sé com fer les coses següents:
-
-          `@ %{discobot_username} %{reset_trigger} {name-of-tutorial}`
-          > Inicia un tutorial interactiu. El `{name-of-tutorial}` pot ser un dels següents: `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
diff --git a/plugins/discourse-narrative-bot/config/locales/server.de.yml b/plugins/discourse-narrative-bot/config/locales/server.de.yml
index 5f7ea53588..0f306d35be 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.de.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.de.yml
@@ -121,11 +121,6 @@ de:
       random_mention:
         reply: |-
           Hallo! Um herauszufinden, was ich kann, schreibe `@%{discobot_username} %{help_trigger}`.
-        tracks: |-
-          Ich weiß jetzt, wie man die folgenden Dinge macht:
-
-          `@%{discobot_username} %{reset_trigger} {Name-des-Tutorials}`
-          > Startet ein interaktives Tutorial. `{Name-des-Tutorials}` kann eins von: `%{tracks}` sein.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
diff --git a/plugins/discourse-narrative-bot/config/locales/server.es.yml b/plugins/discourse-narrative-bot/config/locales/server.es.yml
index 75451434cc..c38c9ba1c3 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.es.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.es.yml
@@ -121,11 +121,6 @@ es:
       random_mention:
         reply: |-
           ¡Hola! Para saber qué puedo hacer, escribe `@%{discobot_username} %{help_trigger}`.
-        tracks: |-
-          Actualmente sé como realizar las siguientes cosas:
-
-          `@%{discobot_username} %{reset_trigger} {nombre-del-tutorial}`
-          > Comienza un tutorial interactivo. `{nombre-del-tutorial}` puede ser uno de: `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
@@ -230,6 +225,8 @@ es:
       bookmark:
         instructions: |-
           Si quieres aprender más, selecciona debajo el botón <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> y <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **guarda en marcadores este mensaje personal**. Si lo haces, ¡puede haber un :gift: en tu futuro!
+        reply: |-
+          ¡Excelente! Ahora puedes encontrar fácilmente las conversaciones privadas en cualquier momento directamente desde la [sección de marcadores de tu perfil](%{bookmark_url}). Sólo debes seleccionar tu foto de perfil en la parte superior derecha de la pantalla &#8599;
         not_found: |-
           Oh oh, no veo ningún marcador en este tema. ¿Encontraste el botón para guardar en marcadores que se encuentra debajo de cada mensaje? Usa el botón mostrar más <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para que aparezcan acciones adicionales si necesitas.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fi.yml b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
index 20846f8be2..5ba202794b 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
@@ -121,11 +121,6 @@ fi:
       random_mention:
         reply: |-
           Moi! Jos haluat tietää mitä osaan, sano `@%{discobot_username} %{help_trigger}`.
-        tracks: |-
-          Osaan tehdä seuraavat asiat:
-
-          `@%{discobot_username}%{reset_trigger}{name-of-tutorial}`
-          > Aloittaa interaktiivisen kurssin. `{name-of-tutorial} ` voi olla jokin seuraavista: `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fr.yml b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
index 822cd2e85f..bc1ffdbaa5 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -121,11 +121,6 @@ fr:
       random_mention:
         reply: |-
           Bonjour ! Pour voir ce que je peux faire, dites `@%{discobot_username} `.
-        tracks: |-
-          Pour le moment, je sais faire les choses suivantes :
-
-          `@%{discobot_username} %{reset_trigger} {nom-du-tutoriel}`
-          > Débute un tutoriel interactif. `{nom-du-tutoriel}` est l'une des options suivantes : `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6`
diff --git a/plugins/discourse-narrative-bot/config/locales/server.he.yml b/plugins/discourse-narrative-bot/config/locales/server.he.yml
index 61c91465e4..29e96d79ba 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.he.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.he.yml
@@ -124,8 +124,8 @@ he:
         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
diff --git a/plugins/discourse-narrative-bot/config/locales/server.hu.yml b/plugins/discourse-narrative-bot/config/locales/server.hu.yml
index 0d3ff6a9ba..c252a7096d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.hu.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.hu.yml
@@ -115,11 +115,6 @@ hu:
       random_mention:
         reply: |-
           Üdv! Hogy megtudja mit tudok, mondja ezt: `@%{discobot_username} %{help_trigger}`.
-        tracks: |-
-          Jelenleg ezeket tudom csinálni:
-
-          `@%{discobot_username} %{reset_trigger} {oktatás-neve}`
-          > Elindítja az interaktív eligazítást. Az `{oktatás-neve}` ezek egyike lehet: `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
diff --git a/plugins/discourse-narrative-bot/config/locales/server.it.yml b/plugins/discourse-narrative-bot/config/locales/server.it.yml
index 265b4e8aee..3d9ef99743 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.it.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.it.yml
@@ -122,10 +122,10 @@ it:
         reply: |-
           Ciao! Per sapere cosa posso fare, dimmi `@%{discobot_username} %{help_trigger}`.
         tracks: |-
-          Al momento so fare le seguenti cose:
+          Attualmente so come fare le seguenti cose:
 
           `@%{discobot_username} %{reset_trigger} {name-of-tutorial}`
-          > Inizia un tutorial interattivo. `{name-of-tutorial}` può essere uno di: `%{tracks}`.
+          > Avvia un tutorial interattivo solo per te, in un messaggio personale. `{name-of-tutorial}` può essere uno di: `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
@@ -231,7 +231,7 @@ it:
           Selezionare un qualsiasi testo del mio messaggio farà apparire il pulsante <kbd>**Cita**</kbd>. E anche premere **Rispondi** con qualsiasi testo selezionato funzionerà! Puoi provare di nuovo?
       bookmark:
         instructions: |-
-          Se vuoi saperne di più, seleziona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> qui sotto e <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **inserisci questo messaggio personale nei segnalibri**. Se lo farai, ci potrebbe essere un :gift: per te!
+          Se vuoi saperne di più, seleziona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> qui sotto e <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **inserisci questo messaggio personale nei segnalibri**. Se lo farai, ci potrebbe essere un :gift: per te in futuro!
         reply: |
           Eccellente! Ora puoi facilmente tornare alla nostra conversazione privata in qualsiasi momento, direttamente dalla [scheda dei segnalibri sul tuo profilo](%{bookmark_url}). Basta selezionare la tua foto del profilo in alto a destra &#8599;
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ko.yml b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
index 5983e258db..3c92877fa9 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ko.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
@@ -26,6 +26,8 @@ ko:
         이 배지는 고급 유저 튜토리얼을 성공적으로 완료한 사용자에게 부여됩니다. 당신은 고급 토론 도구를 숙지하여 면허를 취득하였습니다!
   discourse_narrative_bot:
     bio: "안녕, 사실 나는 사람이 아니야. 이 사이트에 대해서 알려주는 로봇이지. 나한테 물어보고 싶은 게 있다면 메세지를 보내거나 **`@%{discobot_username}`** 를 멘션하면 돼."
+    tl2_promotion_message:
+      subject_template: "신뢰 수준 프로모션을 축하합니다!"
     timeout:
       message: |-
         안녕 @%{username}, 너한테서 소식이 없어서 한 번 말 걸어봤어.
@@ -94,6 +96,7 @@ ko:
         '8': "좋을 전망."
         '9': "응."
         '10': "괜찮아 보이는군."
+        '11': "흐릿한 답글, 다시 시도"
         '12': "다음에 다시 물어봐."
         '13': "지금은 말하지 않는 편이 낫겠어."
         '14': "지금은 예측할 수 없어."
@@ -125,8 +128,16 @@ ko:
 
           그럼, 난 잠시 자리를 비워줄게.
     new_user_narrative:
+      reset_trigger: "지도 시간"
+      title: "새로운 사용자 튜토리얼 수료증"
       cert_title: "새로운 사용자 튜토리얼을 성공적으로 마친 것에 대한 보상으로"
+      hello:
+        title: "인사말!"
+        message: |-
+          %{title}에 참여해 주셔서 감사합니다. -나는 로봇 일 뿐이지 만 [친근한 직원] (%{base_uri} / about)도 사람과 연락해야 할 경우 도움을주기 위해 여기에 있습니다. -안전상의 이유로 신규 사용자가 할 수있는 일을 일시적으로 제한합니다. 우리가 당신을 알게되면 [새로운 능력] (https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (그리고 [badges] (%{base_uri} / badges))을 얻게됩니다. -우리는 항상 [civilized community behavior] (%{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"> 링크에 대해서 작동해. 딱 링크로만 된 한줄이어야만 한다는 걸 명심해. 앞이나 뒤에 다른게 있어서는 안돼.
         not_found: |-
@@ -187,6 +198,10 @@ ko:
 
           내 포스트에서 아무 글이나 선택해도 <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"> **이 개인 메시지를 북마크하십시오 **. 당신이하는 경우 : 선물 : 미래에있을 수 있습니다!
+        reply: |-
+          우수한! 이제 [프로필의 북마크 탭] (%{bookmark_url})에서 언제든지 개인 대화로 쉽게 돌아갈 수 있습니다. 오른쪽 상단에서 프로필 사진을 선택하십시오. ↗
         not_found: |-
           어라, 이 토픽에는 북마크가 없는데? 포스트 별로 있는 북마크 버튼을 찾았니? 더 보기 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 를 눌러서 필요한 추가 기능이 있는지 살펴 봐.
       emoji:
@@ -226,6 +241,8 @@ ko:
           > :imp: 어쩌고 저쩌고 나쁜 글
 
           뭘 할지 잘 알고 있지? **이 포스트 신고하기** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> 를 눌러서 부적절하다고 알려줘!
+        reply: |-
+          [우리의 직원] (%{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:
@@ -233,6 +250,8 @@ ko:
           이봐, 내가 이 토픽에 놀라운 걸 숨겼다구. 찾아보고 싶다면, 우측 상단에 있는 **검색 아이콘을** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> 선택해서 &#8599; 찾아봐.
 
           이 토픽에서 "capy&#8203;bara"를 찾으면 돼.
+        hidden_message: |-
+          이 capybara를 어떻게 그리워 했습니까? :눈짓: <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/> 당신이 지금 처음에 돌아 왔음을 알았습니까? `%{search_answer}` 그림 이모티콘 **을 사용하여이 가난한 배고픈 카피 바라에게 먹이를 주면 자동으로 끝납니다.
         reply: |-
           예이, 찾았네! :tada:
 
@@ -243,11 +262,17 @@ ko:
           - 진짜 실물 :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**를 찾아봤어?
+      end:
+        message: |-
+          @ %{username}와 함께 해 주셔서 감사합니다! 나는 당신을 위해 이것을 만들었다, 나는 당신이 그것을 얻은 것 같아 : %{certificate} 그게 다야! [** 최신 토론 주제 **] (%{base_uri} / latest) 또는 [** 토론 범주 **] (%{base_uri} / categories)를 확인하십시오. : 선글라스 : (더 많은 것을 배우기 위해 다시 나와 이야기하고 싶다면 언제든지 메시지를 보내거나`@ %{discobot_username} &#39;를 언급하십시오!)
       certificate:
         alt: "목표달성 인증"
     advanced_user_narrative:
+      reset_trigger: "고급 튜토리얼"
       cert_title: "고급 사용자 튜토리얼을 훌륭하게 완료한 것에 대한 보상으로"
       title: ":arrow_up: 고급 사용자 기능"
+      start_message: |-
+        _advanced_ 사용자로서 [기본 설정 페이지] (%{base_uri} / my / preferences)를 방문했지만 아직 @ %{username}? 어둡거나 밝은 테마를 선택하는 등 다양한 방법으로 경험을 사용자 지정할 수 있습니다. 그러나 나는 출발한다, 시작하자!
       edit:
         bot_created_post_raw: "@%{discobot_username}는 내가 아는 한, 현존하는 가장 쿨한 봇이지:wink:"
         instructions: |-
@@ -281,10 +306,40 @@ ko:
           <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"> 삭제 취소하기가 보일거야.
+        reply: |-
+          휴, 그것은 가까운 사람이었다! : wink : 게시물을 삭제 취소 할 수있는 시간은 %{deletion_after}입니다.
       category_hashtag:
         instructions: |-
           포스트에 카테고리나 태그를 언급할 수 있다는 거 알고 있어? 예를 들어, %{category} 카테고리가 보이니?
 
           문장 중간에 `#`을 넣고 어떤 카테고리나 태그든 선택해봐.
+        not_found: |-
+          흠, 나는 어디에도 카테고리가 보이지 않습니다. `#`는 첫 번째 문자가 될 수 없습니다. 다음 답장에서이 내용을 복사 할 수 있습니까? ```텍스트 # #``을 통해 카테고리 링크를 만들 수 있습니다
+        reply: |-
+          우수한! 태그가 활성화 된 경우 두 카테고리 _and_ 태그 모두에서 작동합니다.
+      change_topic_notification_level:
+        instructions: |-
+          모든 주제에는 알림 수준이 있습니다. &#39;정상&#39;으로 시작합니다. 즉, 누군가가 나와 직접 대화 할 때만 알림을받습니다. 기본적으로 비공개 메시지의 알림 수준은 &#39;감시&#39;의 최상위 수준으로 설정되므로 모든 새 회신에 대해 알림을받습니다. 그러나 _any_ 주제의 알림 수준을 &#39;감시&#39;, &#39;추적&#39;또는 &#39;음소거 됨&#39;으로 무시할 수 있습니다. 이 주제에 대한 알림 수준을 변경해 봅시다. 주제 하단에이 주제를보고 있음을 나타내는 버튼이 있습니다. 알림 수준을 ** 추적 **으로 변경할 수 있습니까?
+        not_found: |-
+          아직도보고있는 것 같습니다 : 눈 :이 주제! 찾는 데 문제가 있으면 알림 수준 버튼이 주제 하단에 있습니다.
+        reply: |-
+          멋진 일! 나는 때때로 약간 대화가 가능하기 때문에이 주제를 무시하지 않기를 바랍니다. : grin :. 주제에 응답하거나 몇 분 이상 주제를 읽으면 자동으로 &#39;추적&#39;알림 레벨로 설정됩니다. [사용자 환경 설정] (%{base_uri} / my / preferences)에서이를 변경할 수 있습니다.
+      poll:
+        instructions: |-
+          모든 게시물에 설문 조사를 추가 할 수 있다는 것을 알고 있습니까? 를 사용해보십시오 <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"> 편집기에서 톱니 바퀴 아이콘을 클릭하거나 다음 응답에이 설문 조사를 복사하여 붙여 넣으십시오.```text [poll] * : cat : * : dog : [/ poll]```
+        reply: |-
+          여보세요, 여론 조사! 내가 당신을 가르치는 데 어떻게 했습니까? [폴] * : +1 : * : -1 : [/ 폴]
+      details:
+        instructions: |-
+          때로는 답글에서 ** 세부 사항 숨기기 **를 원할 수도 있습니다.-스포일러로 간주되는 영화 또는 TV 프로그램의 플롯 포인트를 논의 할 때. -게시물에 한 번에 읽을 때 압도적 일 수있는 많은 옵션 세부 정보가 필요한 경우. [details = 작동 방식을 보려면 이것을 선택하십시오!] 1. <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> 에디터에서 기어. 2. &quot;세부 정보 숨기기&quot;를 선택하십시오. 3. 세부 사항 요약을 편집하고 컨텐츠를 추가하십시오. [/ 세부 사항] <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> 다음 답변에 세부 정보 섹션을 추가하려면 편집기를 사용하십시오.
+        not_found: |-
+          세부 사항 위젯을 작성하는 데 문제가 있습니까? 다음 답장에 다음 내용을 포함시켜보십시오.
+        reply: |-
+          훌륭합니다. _detail_에 대한 관심은 훌륭합니다!
+      end:
+        message: |-
+          당신은 이것을 _advanced user_ 실제로 : bow : %{certificate}처럼 비난했습니다. 안녕! 나와 다시 대화하고 싶다면 언제든지 메시지를 보내주세요.
       certificate:
         alt: "고급 사용자 추적 인증"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.nl.yml b/plugins/discourse-narrative-bot/config/locales/server.nl.yml
index da479e2934..de474e3cbd 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nl.yml
@@ -95,11 +95,6 @@ nl:
       random_mention:
         reply: |-
           Hallo! Zeg `@%{discobot_username} %{help_trigger}` om te ontdekken wat ik kan.
-        tracks: |-
-          Momenteel kan ik de volgende dingen doen:
-
-          `@%{discobot_username} %{reset_trigger} {name-of-tutorial}`
-          > Start een interactieve handleiding. `{name-of-tutorial}` kan één zijn van: `%{tracks}`.
       do_not_understand:
         first_response: |-
           Hallo, bedankt voor het antwoord!
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 4a66730780..83ee3a2332 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
@@ -117,12 +117,6 @@ pl_PL:
       random_mention:
         reply: |-
           Hej! Aby dowiedzieć się, co mogę zrobić, powiedz `@%{discobot_username} %{help_trigger}`.
-        tracks: |-
-          Obecnie wiem, jak robić następujące rzeczy:
-
-          `@%{discobot_username}%{reset_trigger}{name-of-tutorial}`
-          > Zaczyna interaktywny samouczek. `{name-of-tutorial}` może być jednym z: `
-          %{tracks}`.
         bot_actions: |-
           `@ %{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
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 d50817def5..473085ce61 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
@@ -121,11 +121,6 @@ pt_BR:
       random_mention:
         reply: |-
           Oi! Para descobrir o que eu posso fazer diga `@%{discobot_username} %{help_trigger}`.
-        tracks: |-
-          Atualmente, sei como fazer as seguintes coisas:
-
-          `%{discobot_username} %{reset_trigger} {name-of-tutorial}`
-          > Inicia um tutorial interativo. `{name-of-tutorial}` pode ser um de: `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ru.yml b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
index f5f68f7a2c..9e79fe8e5c 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ru.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
@@ -121,11 +121,6 @@ ru:
       random_mention:
         reply: |-
           Привет! Чтобы узнать, что я могу сделать, наберите: `@%{discobot_username} %{help_trigger}`.
-        tracks: |-
-          Я знаю следующие команды:
-
-          `@%{discobot_username} %{reset_trigger} {название-руководства}`
-          > Запустить руководство. Доступные руководства: `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sl.yml b/plugins/discourse-narrative-bot/config/locales/server.sl.yml
index e4e61c705a..ce70e9b776 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sl.yml
@@ -113,11 +113,6 @@ sl:
       random_mention:
         reply: |-
           Pozdravljeni! Da izveste, kaj znam, recite `@%{discobot_username} %{help_trigger}`.
-        tracks: |-
-          Trenutno znam narediti naslednje stvari:
-
-          `@%{discobot_username} %{reset_trigger} {naziv-pripovedi}`
-          > Začni interaktivno pripoved.  `{naziv-pripovedi}` je lahko ena od sledečih: %{tracks}.
       do_not_understand:
         first_response: |-
           Hvala za odgovor!
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sv.yml b/plugins/discourse-narrative-bot/config/locales/server.sv.yml
index 06d136099c..862a4a4fd9 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sv.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sv.yml
@@ -74,7 +74,7 @@ sv:
         author: "Theodore Roosevelt"
       '6':
         quote: "Livet är som en låda med choklad. Du vet aldrig vad du kommer att få."
-        author: "Forrest Gump’s Mom ( Författaren: Winston Groom )"
+        author: "Forrest Gumps mamma \n( Författaren: Winston Groom )"
       '7':
         quote: "Det är ett litet steg för en man, ett jättesprång för mänskligheten."
         author: "Neil Armstrong"
@@ -90,7 +90,7 @@ sv:
       results: |-
         > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
-      trigger: "förmögenhet"
+      trigger: "framgång"
       answers:
         '1': "Det är säkert"
         '2': "Det är bestämt så"
@@ -120,12 +120,12 @@ sv:
       help_trigger: "visa hjälp"
       random_mention:
         reply: |-
-          Hej! För att ta reda på vad jag kan göra, säg `%{discobot_username}%{help_trigger}`.
+          Hej! För att ta reda på vad jag kan göra, säg `@%{discobot_username} %{help_trigger}`.
         tracks: |-
           I nuläget klarar jag av följande saker:
 
-          `@%{discobot_username}%{reset_trigger} {namn-på-handledning}`
-          > Startar en interaktiv handledning. `{namn-på-handledning}` kan vara en av dessa: `%{tracks}` .
+          `@%{discobot_username} %{reset_trigger} {namn-på-handledning}`
+          > Startar en interaktiv handledning enbart för dig, i ett privat meddelande. `{namn-på-handledning}` kan vara en av dessa: `%{tracks}` .
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
diff --git a/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml b/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
index f676323e7d..00baa82e87 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
@@ -121,11 +121,6 @@ tr_TR:
       random_mention:
         reply: |-
           Selam! Neler yapabileceğimi öğrenmek için `@ %{discobot_username} %{help_trigger}` komutunu girin.
-        tracks: |-
-          Şu anda aşağıdaki şeyleri nasıl yapacağımı biliyorum:
-
-          `` @ %{discobot_username} %{reset_trigger} {öğretici adı} `
-          &gt; Etkileşimli bir öğretici başlatır. `{öğretici adı}` şunlardan biri olabilir: `%{tracks}`.
         bot_actions: |-
           @ @ %{discobot_username} %{dice_trigger} 2d6`
           &gt;: game_die: 3, 6
diff --git a/plugins/discourse-narrative-bot/config/locales/server.uk.yml b/plugins/discourse-narrative-bot/config/locales/server.uk.yml
index f126854198..9aea96cf12 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.uk.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.uk.yml
@@ -97,9 +97,6 @@ uk:
       random_mention:
         reply: |-
           Привіт! Щоб дізнатися, що я можу зробити, скажіть `@ %{discobot_username} %{help_trigger}`.
-        tracks: |-
-          На даний момент я знаю, як робити наступні речі: `@ %{discobot_username} %{reset_trigger} {name-of-tutorial}`
-          &gt; Запускає інтерактивний підручник. `{name-of-tutorial}` може бути одним із: `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ur.yml b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
index 9621a1c406..a4dd9dec10 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ur.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
@@ -113,11 +113,6 @@ ur:
       random_mention:
         reply: |-
           ہیلو! جاننے کیلئے کہ میں کیا کر سکتا ہوں، `@%{discobot_username} %{help_trigger}` کہیں۔
-        tracks: |-
-          میں فی الحال مندرجہ ذیل چیزوں کو کرنا جانتا ہوں:
-
-          `@%{discobot_username} %{reset_trigger} {ٹیوٹوریل-کا-نام}`
-          > ایک انٹرایکٹو ٹیوٹوریل شروع کر دیتا ہے۔ {ٹیوٹوریل-کا-نام} اِن میں سے ایک ہوسکتا ہے: `%{tracks}`۔
       do_not_understand:
         first_response: |-
           ارے، جواب کیلئے شکریہ!
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 ceb416e9c3..93d56b1d50 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
@@ -122,10 +122,10 @@ zh_CN:
         reply: |-
           你好！想看看我能做什么吗？说 `@%{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
diff --git a/plugins/poll/config/locales/client.he.yml b/plugins/poll/config/locales/client.he.yml
index bc872cf83f..9362da2ee6 100644
--- a/plugins/poll/config/locales/client.he.yml
+++ b/plugins/poll/config/locales/client.he.yml
@@ -103,6 +103,8 @@ he:
           label: קבוצות מורשות
         poll_chart_type:
           label: סוג תרשים
+          bar: עמודות
+          pie: עוגה
         poll_config:
           max: מרבי
           min: מזערי
diff --git a/plugins/poll/config/locales/client.it.yml b/plugins/poll/config/locales/client.it.yml
index 042475014e..ae32f0db6f 100644
--- a/plugins/poll/config/locales/client.it.yml
+++ b/plugins/poll/config/locales/client.it.yml
@@ -93,6 +93,8 @@ it:
           label: Gruppi ammessi
         poll_chart_type:
           label: Tipo di grafico
+          bar: Barra
+          pie: Torta
         poll_config:
           max: Massimo
           min: Minimo
diff --git a/plugins/poll/config/locales/client.ko.yml b/plugins/poll/config/locales/client.ko.yml
index ff5fc69310..30ffe031fb 100644
--- a/plugins/poll/config/locales/client.ko.yml
+++ b/plugins/poll/config/locales/client.ko.yml
@@ -13,6 +13,17 @@ ko:
       total_votes:
         other: "전체 투표"
       average_rating: "평균: <strong>%{average}</strong>."
+      public:
+        title: "투표는 <strong>공개</strong> 입니다."
+      results:
+        groups:
+          title: "이 여론 조사에 투표하려면 %{groups} 회원이어야합니다."
+        vote:
+          title: "<strong>투표</strong> 결과가 표시됩니다."
+        closed:
+          title: "결과가 <strong>닫히면 표시</strong> 됩니다."
+        staff:
+          title: "결과는 <strong>직원</strong> 에게만 표시됩니다."
       multiple:
         help:
           at_least_min_options:
@@ -30,7 +41,15 @@ ko:
         label: "결과 보기"
       hide-results:
         title: "투표로 돌아가기"
+        label: "투표 표시"
+      group-results:
+        title: "사용자 필드 별 그룹 투표"
+        label: "고장 표시"
+      ungroup-results:
+        title: "모든 투표를 결합"
+        label: "고장 숨기기"
       export-results:
+        title: "설문 조사 결과 내보내기"
         label: "내보내기"
       open:
         title: "투표 열기"
@@ -40,14 +59,20 @@ ko:
         title: "투표 닫기"
         label: "닫기"
         confirm: "정말 이 투표를 닫으시겠어요?"
+      automatic_close:
+        closes_in: "<strong>%{timeLeft}</strong> 에서 닫습니다."
+        age: "휴관일 <strong>%{age}</strong>"
       error_while_toggling_status: "죄송합니다. 이 투표의 상태를 바꾸는 도중 에러가 발생하였습니다."
       error_while_casting_votes: "죄송합니다. 투표를 하는 도중 에러가 발생하였습니다."
       error_while_fetching_voters: "죄송합니다. 투표한 사람을 표시하는 도중 에러가 발생하였습니다."
+      error_while_exporting_results: "설문 조사 결과를 내보내는 중에 오류가 발생했습니다."
       ui_builder:
         title: 투표 만들기
         insert: 투표 삽입하기
         help:
+          options_count: 최소 1 개의 옵션을 입력하십시오
           invalid_values: 최소값은 최대값보다는 작아야 합니다.
+          min_step_value: 최소 단계 값은 1입니다.
         poll_type:
           label: 유형
           regular: 단일 선택
@@ -55,6 +80,14 @@ ko:
           number: 점수 매기기
         poll_result:
           label: 검색 결과
+          always: 항상 보이는
+          vote: 투표에
+          closed: 닫을 때
+          staff: 직원 만
+        poll_groups:
+          label: 허용 된 그룹
+        poll_chart_type:
+          label: 차트 종류
         poll_config:
           max: 최대
           min: 최소
@@ -63,3 +96,5 @@ ko:
           label: 투표한 사람 보기
         poll_options:
           label: 투표 선택지는 한줄에 하나씩 입력하세요
+        automatic_close:
+          label: 설문 조사 자동 종료
diff --git a/plugins/poll/config/locales/client.nl.yml b/plugins/poll/config/locales/client.nl.yml
index 83dff4bef1..1fdc3c18db 100644
--- a/plugins/poll/config/locales/client.nl.yml
+++ b/plugins/poll/config/locales/client.nl.yml
@@ -93,6 +93,8 @@ nl:
           label: Toegestane groepen
         poll_chart_type:
           label: Diagramtype
+          bar: Staaf
+          pie: Cirkel
         poll_config:
           max: Max
           min: Min
diff --git a/plugins/poll/config/locales/client.ru.yml b/plugins/poll/config/locales/client.ru.yml
index 0c7ffd71e2..9e50d65702 100644
--- a/plugins/poll/config/locales/client.ru.yml
+++ b/plugins/poll/config/locales/client.ru.yml
@@ -103,6 +103,8 @@ ru:
           label: Разрешенные группы
         poll_chart_type:
           label: Тип диаграммы
+          bar: Гистограмма
+          pie: Круговая
         poll_config:
           max: Макс.
           min: Мин.
diff --git a/plugins/poll/config/locales/client.sv.yml b/plugins/poll/config/locales/client.sv.yml
index d7e50b2411..ea5d5d65ee 100644
--- a/plugins/poll/config/locales/client.sv.yml
+++ b/plugins/poll/config/locales/client.sv.yml
@@ -93,6 +93,8 @@ sv:
           label: Tillåtna grupper
         poll_chart_type:
           label: Diagramtyp
+          bar: Stapel
+          pie: Cirkel
         poll_config:
           max: Max
           min: Min
diff --git a/plugins/poll/config/locales/client.zh_CN.yml b/plugins/poll/config/locales/client.zh_CN.yml
index f4a5ee570b..c7475e3025 100644
--- a/plugins/poll/config/locales/client.zh_CN.yml
+++ b/plugins/poll/config/locales/client.zh_CN.yml
@@ -88,6 +88,8 @@ zh_CN:
           label: 允许的群组
         poll_chart_type:
           label: 图表类型
+          bar: 条形
+          pie: 饼状
         poll_config:
           max: 最大
           min: 最小
diff --git a/plugins/poll/config/locales/server.ko.yml b/plugins/poll/config/locales/server.ko.yml
index 4805460e33..fc975d5d5a 100644
--- a/plugins/poll/config/locales/server.ko.yml
+++ b/plugins/poll/config/locales/server.ko.yml
@@ -7,25 +7,42 @@
 
 ko:
   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: "폴링 결과를 내보내는 데 사용할 Data Explorer Query의 ID입니다 (0은 사용 안함)."
   poll:
+    poll: "투표"
+    invalid_argument: "&#39;%{argument}&#39;인수에 대해 &#39;%{value}&#39;값이 잘못되었습니다."
     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> 설문 조사에는 하나 이상의 옵션이 있어야합니다."
     default_poll_must_have_less_options:
       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> 폴에는 빈 옵션이 <strong>없어야</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: "설문 조사를 만들 수 없습니다."
     email:
       link_to_poll: "클릭해서 투표보기"
+    user_field:
+      no_data: "데이터 없음"

From ff73f116e85a05c4197bf7ddcc8b0cfc93c08802 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 4 May 2020 16:31:31 +0100
Subject: [PATCH 0926/1830] DEV: Set owner on raw views (#9624)

This allows things like `Ember.inject.service` to be used within the raw view. setOwner simply sets one property on the object, and the result is cached along with the other injected properties, so this should have negligible performance impact.
---
 app/assets/javascripts/discourse/app/helpers/raw.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/helpers/raw.js b/app/assets/javascripts/discourse/app/helpers/raw.js
index f1fb873927..0a764a1dee 100644
--- a/app/assets/javascripts/discourse/app/helpers/raw.js
+++ b/app/assets/javascripts/discourse/app/helpers/raw.js
@@ -1,6 +1,7 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { findRawTemplate } from "discourse/lib/raw-templates";
 import { htmlSafe } from "@ember/template";
+import { setOwner } from "@ember/application";
 
 let _injections;
 
@@ -16,6 +17,7 @@ function renderRaw(ctx, container, template, templateName, params) {
       session: container.lookup("session:main"),
       topicTrackingState: container.lookup("topic-tracking-state:main")
     };
+    setOwner(_injections, container);
   }
 
   if (!params.view) {

From c6b31464dbc86e0dc20bf99aaee9aeeb7ac55a5b Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Mon, 4 May 2020 11:44:42 -0400
Subject: [PATCH 0927/1830] Version bump to v2.5.0.beta4

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

diff --git a/lib/version.rb b/lib/version.rb
index 07f2377661..c4fe771461 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -9,7 +9,7 @@ module Discourse
       MAJOR = 2
       MINOR = 5
       TINY  = 0
-      PRE   = 'beta3'
+      PRE   = 'beta4'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end

From 70b1e98609599446a91bdfaf59ed63ca381abe35 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 4 May 2020 18:23:45 +0200
Subject: [PATCH 0928/1830] FIX: reverts to use an observer to support loading
 more notifications (#9628)

Apparently, didReceiveAttrs is not called when loading more notifications, this would require a more heavy refactoring.
---
 .../discourse/app/components/user-notifications-large.js  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-notifications-large.js b/app/assets/javascripts/discourse/app/components/user-notifications-large.js
index 193a5b8b12..5f50878099 100644
--- a/app/assets/javascripts/discourse/app/components/user-notifications-large.js
+++ b/app/assets/javascripts/discourse/app/components/user-notifications-large.js
@@ -1,4 +1,5 @@
 import MountWidget from "discourse/components/mount-widget";
+import { observes } from "discourse-common/utils/decorators";
 
 export default MountWidget.extend({
   widget: "user-notifications-large",
@@ -6,9 +7,14 @@ export default MountWidget.extend({
   filter: null,
   args: null,
 
-  didReceiveAttrs() {
+  init() {
     this._super(...arguments);
 
+    this.args = { notifications: this.notifications, filter: this.filter };
+  },
+
+  @observes("notifications.length", "notifications.@each.read", "filter")
+  _triggerRefresh() {
     this.set("args", {
       notifications: this.notifications,
       filter: this.filter

From a2c85f08451056e11d6ae286b4e8214a1a66d8c4 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 4 May 2020 18:35:04 +0200
Subject: [PATCH 0929/1830] DEV: use the existing parsePostData function
 (#9629)

---
 test/javascripts/acceptance/bookmarks-test.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/test/javascripts/acceptance/bookmarks-test.js b/test/javascripts/acceptance/bookmarks-test.js
index 6361d43261..7bde21a515 100644
--- a/test/javascripts/acceptance/bookmarks-test.js
+++ b/test/javascripts/acceptance/bookmarks-test.js
@@ -1,15 +1,12 @@
 import { acceptance, loggedInUser } from "helpers/qunit-helpers";
 import pretender from "helpers/create-pretender";
+import { parsePostData } from "helpers/create-pretender";
 
 acceptance("Bookmarking", { loggedIn: true });
 
 function handleRequest(assert, request) {
-  const body = request.requestBody;
-  const reminderType = body
-    .substr(0, body.indexOf("&"))
-    .replace("reminder_type=", "");
-
-  assert.step(reminderType || "none");
+  const data = parsePostData(request.requestBody);
+  assert.step(data.reminder_type || "none");
 
   return [
     200,

From 5706cab89781fc627924604bfdc628f44585f8a7 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 4 May 2020 14:07:03 -0400
Subject: [PATCH 0930/1830] FIX: Improve digest email styling on Outlook 2016
 (#9626)

---
 app/views/user_notifications/digest.html.erb | 36 +++++++++++---------
 lib/email/styles.rb                          |  1 +
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index 7ce440ff46..3ff453bb1a 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -34,7 +34,7 @@
   <tr>
     <td class="side-spacer" style="width:5%;vertical-align:top;padding:0;">
       <div class="with-accent-colors">
-        <table class="spacer" style="border-spacing:0;padding:0;width:100%">
+        <table class="spacer with-accent-colors" style="border-spacing:0;padding:0;width:100%">
           <tbody>
             <tr>
               <td height="400px" style="height:400px;border-collapse:collapse!important;margin:0;mso-line-height-rule:exactly;padding:0;">&nbsp;</td>
@@ -50,7 +50,7 @@
             <td style="border-collapse:collapse!important;color:#0a0a0a;line-height:1.3;margin:0;padding:0;vertical-align:top;word-wrap:normal">
 
 <br/>
-<center class="header-since-last-visit with-accent-colors" style="font-size:22px;font-weight:400;"><%=t 'user_notifications.digest.since_last_visit' %></center>
+<center class="header-since-last-visit with-accent-colors" style="font-size:22px;font-weight:400;mso-line-height-rule:exactly;line-height:36px;"><%=t 'user_notifications.digest.since_last_visit' %></center>
 
 
 
@@ -73,7 +73,7 @@
 </tbody>
 </table>
 
-<center class="header-popular-topics with-accent-colors" style="font-size:22px;font-weight:400;margin-bottom: 8px;"><%=t 'user_notifications.digest.popular_topics' %></center>
+<center class="header-popular-topics with-accent-colors" style="font-size:22px;font-weight:400;margin-bottom: 8px; mso-line-height-rule:exactly;line-height:36px;"><%=t 'user_notifications.digest.popular_topics' %></center>
 
 
             </td>
@@ -124,7 +124,7 @@
 <table class="with-dir" style="padding:0;position:relative;vertical-align:top;width:100%">
   <tbody>
     <tr>
-      <td class="digest-topic-op" style="color:#0a0a0a;line-height:1.3;margin:0 auto;padding:<%= rtl? ? '0 16px 0 0' : '0 0 0 16px' %>;width:50px;">
+      <td class="digest-topic-op" style="color:#0a0a0a;line-height:1.3;margin:0 auto;padding:<%= rtl? ? '0 16px 0 0' : '0 0 0 16px' %>;width:50px;vertical-align:top;">
         <img src="<%= t.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:block;float:none;height:50px;width:50px;margin:0;max-width:100%;outline:0;text-align:center;text-decoration:none;" align="center" alt="<%= t.user.username -%>">
       </td>
       <td style="color:#0a0a0a;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;vertical-align:top;">
@@ -136,7 +136,7 @@
         <% end %>
       </td>
       <%- if show_image_with_url(t.image_url) && t.featured_link.nil? && !(@excerpts[t.first_post&.id]||"").include?(t.image_url) -%>
-        <td style="margin:0;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;" align="right">
+        <td style="margin:0;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;vertical-align:top;" align="right">
           <img src="<%= url_for_email(t.image_url) -%>" height="64" style="margin:auto;max-height:64px;max-width:100%;outline:0;text-decoration:none;" alt="topic image">
         </td>
       <%- end -%>
@@ -145,10 +145,10 @@
 </table>
 
 <%- if t.first_post.present? && !t.first_post.user_deleted %>
-<table class="digest-topic-body with-dir" style="border-bottom:1px solid #f3f3f3;padding:0;vertical-align:top;width:100%">
+<table class="digest-topic-body with-dir" style="border-bottom:1px solid #f3f3f3;mso-border-bottom-alt:none;padding:0;vertical-align:top;width:100%;">
   <tbody>
     <tr>
-      <td class="post-excerpt" style="color:#0a0a0a;font-size:14px;padding:0 16px 0 16px;width:100%;font-weight:normal;">
+      <td class="post-excerpt" style="color:#0a0a0a;font-size:14px;padding:0 16px 0 16px;width:100%;font-weight:normal;mso-padding-alt: 16px;">
         <%= @excerpts[t.first_post.id] %>
       </td>
     </tr>
@@ -161,29 +161,31 @@
     <tr>
       <td class="digest-topic-stat" style="padding:<%= rtl? ? '0 16px 16px 8px' : '0 8px 16px 16px' %>;white-space:nowrap;vertical-align:top;width:75px">
         <img class="digest-icon" src="<%= email_image_url 'heart.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto" alt="likes">
-        <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;"><%= t.like_count -%></p>
+        <span style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;">&nbsp;<%= t.like_count -%></span>
       </td>
       <td class="digest-topic-stat" style="padding:0 8px 16px 8px;white-space:nowrap;vertical-align:top;width:75px">
         <img class="digest-icon" src="<%= email_image_url 'comment.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto" alt="replies">
-        <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;"><%= t.posts_count - 1 -%></p>
+        <span style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;font-weight:400;">&nbsp;<%= t.posts_count - 1 -%></span>
       </td>
       <td class="digest-topic-posters" style="padding:0 8px 16px 8px;white-space:nowrap;vertical-align:top;">
         <% t.posters_summary.each do |ps| %>
           <% if ps.user %>
-            <img src="<%= ps.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:inline-block;height:20px;width:20px;outline:0;text-decoration:none;" alt="<%= ps.user.username -%>">
+            <img src="<%= ps.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:inline-block;height:20px;width:20px;outline:0;text-decoration:none;" height="20" width="20" alt="<%= ps.user.username -%>">
           <% end %>
         <% end %>
       </td>
       <td class="digest-read-more-wrap" style="line-height:1.3;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;text-align:<%= rtl? ? 'left' : 'right' %>;white-space:nowrap;vertical-align:top;">
-        <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" class="digest-button with-accent-colors" style="width:100%;text-decoration:none;padding:8px 16px;white-space:nowrap;">
-          <%=t 'user_notifications.digest.join_the_discussion' %>
-        </a>
+        <span class="with_accent-colors mso-accent-link">
+          <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" class="digest-button with-accent-colors" style="width:100%;text-decoration:none;padding:8px 16px;white-space:nowrap;">
+            <%=t 'user_notifications.digest.join_the_discussion' %>
+          </a>
+        </span>
       </td>
     </tr>
   </tbody>
 </table>
 <div style="background-color:#f3f3f3;">
-  <table class="spacer with-dir" style="padding:0;width:100%">
+  <table class="spacer with-dir" style="padding:0;width:100%;background-color:#f3f3f3">
     <tbody><tr><td height="20px" style="border-collapse:collapse!important;line-height:20px;margin:0;mso-line-height-rule:exactly;padding:0;">&#xA0;</td></tr></tbody>
   </table>
 </div>
@@ -203,7 +205,7 @@
     <td class="side-spacer" style="width:5%;vertical-align:top;padding:0;">
       <!-- Background that goes down part-way behind content -->
       <div class="with-accent-colors">
-        <table class="spacer with-dir" style="border-spacing:0;padding:0;width:100%">
+        <table class="spacer with-dir with-accent-colors" style="border-spacing:0;padding:0;width:100%">
           <tbody>
             <tr>
               <td height="400px" style="height:400px;border-collapse:collapse!important;margin:0;mso-line-height-rule:exactly;padding:0;">&nbsp;</td>
@@ -276,7 +278,7 @@
 </table>
 
 <div style="background-color:#f3f3f3">
-  <table class="spacer with-dir" style="padding:0;vertical-align:top;width:100%">
+  <table class="spacer with-dir" style="padding:0;vertical-align:top;width:100%;background-color:#f3f3f3">
     <tbody><tr><td height="40" style="-moz-hyphens:auto;-webkit-hyphens:auto;border-collapse:collapse!important;color:#0a0a0a;font-size:40px;font-weight:400;hyphens:auto;line-height:40px;margin:0;mso-line-height-rule:exactly;padding:0;vertical-align:top;word-wrap:normal">&#xA0;</td></tr></tbody>
   </table>
 </div>
@@ -295,7 +297,7 @@
 <%= digest_custom_html("above_popular_topics") %>
 
 <% if @other_new_for_you.present? %>
-  <center class="digest-new-header" style="color:#0a0a0a;background:#f3f3f3;font-size:22px;font-weight:400;padding-bottom: 8px;font-family:Helvetica,Arial,sans-serif;"><%=t 'user_notifications.digest.more_new' %></center>
+<center class="digest-new-header" style="color:#0a0a0a;background:#f3f3f3;font-size:22px;font-weight:400;padding-bottom: 8px;font-family:Helvetica,Arial,sans-serif;mso-line-height-rule:exactly;line-height:36px;"><%=t 'user_notifications.digest.more_new' %></center>
 
 <table class="digest-new-topics body with-dir" style="width:100%;background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;vertical-align:top;">
   <tr>
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 34845f9df6..955398aad8 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -217,6 +217,7 @@ module Email
       style('.whisper div.body', 'font-style: italic; color: #9c9c9c;')
       style('.lightbox-wrapper .meta', 'display: none')
       style('div.undecorated-link-footer a', "font-weight: normal;")
+      style('.mso-accent-link', "mso-border-alt: 6px solid #{SiteSetting.email_accent_bg_color}; background-color: #{SiteSetting.email_accent_bg_color};")
 
       onebox_styles
       plugin_styles

From a610a762d1594cebf6e8e44d481477272cc41c4b Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 4 May 2020 15:58:35 -0400
Subject: [PATCH 0931/1830] DEV: Deprecated icon name fix

---
 .../discourse/app/components/bookmark-actions-dropdown.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js b/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js
index 84737c4973..65707fa08d 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js
@@ -23,7 +23,7 @@ export default DropdownSelectBoxComponent.extend({
       },
       {
         id: "edit",
-        icon: "pencil",
+        icon: "pencil-alt",
         name: I18n.t("post.bookmarks.actions.edit_bookmark.name"),
         description: I18n.t("post.bookmarks.actions.edit_bookmark.description")
       }

From 0ee796f66dcb3acfb55df5f3e1c820ddbfe2bcd8 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 4 May 2020 19:40:51 -0400
Subject: [PATCH 0932/1830] revert 4afbcb9

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

diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 6142120652..5460036ba0 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -255,7 +255,8 @@
     }
   }
   .header-title {
-    margin: 0 0 0.1em 0;
+    // bottom margin here is very fragile, causes tag misalignment
+    margin: 0 0 0.15em 0;
     .archetype-private_message & {
       // PMs might have participant avatars in the header
       margin: 0;

From d59d1704527de226a9927b11b32e97b8832a686b Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Mon, 4 May 2020 21:34:25 -0300
Subject: [PATCH 0933/1830] FIX: PostgreSQL fallback was broken due to Rails
 masking exception (#9633)

The PR https://github.com/rails/rails/pull/36612 changes the raised exception
if the error message includes the target database name.

Since the error message contains the hostname, this could be triggered when
the hostname contains the database name.
---
 .../connection_adapters/postgresql_fallback_adapter.rb          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
index b8bfb62909..7cc4dce92b 100644
--- a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
+++ b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
@@ -154,7 +154,7 @@ module ActiveRecord
         begin
           connection = postgresql_connection(config)
           fallback_handler.initialized ||= true
-        rescue PG::ConnectionBad => e
+        rescue ::ActiveRecord::NoDatabaseError, PG::ConnectionBad => e
           fallback_handler.master_down
           fallback_handler.verify_master
 

From b8b1cbbfb920fcd065bff5cddbb8b69f766b9264 Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Mon, 4 May 2020 18:05:25 -0700
Subject: [PATCH 0934/1830] UX: Improve second factor UI (#9526)

This will make a few minor improvements to the second factor user interface. Highlights include:

- Using the site's title to prefix the backup code filename. If non-ascii characters are detected, then prefix "discourse" instead.
- Add icons and change the text on some of the buttons for better clarity and consistency
- Add an education link to the security key modal
---
 .../discourse/app/components/backup-codes.js  |   9 +
 .../controllers/second-factor-backup-edit.js  |   8 -
 .../discourse/app/lib/utilities.js            |  22 +++
 .../app/templates/components/backup-codes.hbs |   8 +-
 .../modal/second-factor-backup-edit.hbs       |  21 ++-
 .../modal/second-factor-edit-security-key.hbs |   6 +-
 .../templates/modal/second-factor-edit.hbs    |   6 +-
 .../templates/preferences-second-factor.hbs   |  10 +-
 app/assets/stylesheets/common/base/user.scss  |   9 +-
 config/locales/client.en.yml                  |  17 +-
 .../components/composer-presence-display.hbs  |  12 +-
 plugins/lazy-yt/assets/javascripts/lazyYT.js  | 175 ++++++++++--------
 test/javascripts/lib/utilities-test.js        |  45 +++++
 13 files changed, 239 insertions(+), 109 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/backup-codes.js b/app/assets/javascripts/discourse/app/components/backup-codes.js
index 1109c4cde6..279a659a52 100644
--- a/app/assets/javascripts/discourse/app/components/backup-codes.js
+++ b/app/assets/javascripts/discourse/app/components/backup-codes.js
@@ -1,5 +1,6 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import { toAsciiPrintable, slugify } from "discourse/lib/utilities";
 
 // https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding
 function b64EncodeUnicode(str) {
@@ -42,6 +43,14 @@ export default Component.extend({
     return backupCodes.join("\n").trim();
   },
 
+  @discourseComputed()
+  siteTitleSlug() {
+    const title = this.siteSettings.title;
+    const convertedTitle = toAsciiPrintable(title, "discourse");
+
+    return slugify(convertedTitle);
+  },
+
   actions: {
     copyToClipboard() {
       this._selectAllBackupCodes();
diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js b/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js
index aa3e0c1143..3ef9658cc4 100644
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js
+++ b/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js
@@ -1,7 +1,6 @@
 import { alias } from "@ember/object/computed";
 import { later } from "@ember/runloop";
 import Controller from "@ember/controller";
-import discourseComputed from "discourse-common/utils/decorators";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
@@ -14,13 +13,6 @@ export default Controller.extend(ModalFunctionality, {
   backupCodes: null,
   secondFactorMethod: SECOND_FACTOR_METHODS.TOTP,
 
-  @discourseComputed("backupEnabled")
-  generateBackupCodeBtnLabel(backupEnabled) {
-    return backupEnabled
-      ? "user.second_factor_backup.regenerate"
-      : "user.second_factor_backup.enable";
-  },
-
   onShow() {
     this.setProperties({
       loading: false,
diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js
index b848ca7f86..f104c30002 100644
--- a/app/assets/javascripts/discourse/app/lib/utilities.js
+++ b/app/assets/javascripts/discourse/app/lib/utilities.js
@@ -328,6 +328,28 @@ export function clipboardData(e, canUpload) {
   return { clipboard, types, canUpload, canPasteHtml };
 }
 
+// Replace any accented characters with their ASCII equivalent
+// Return the string if it only contains ASCII printable characters,
+// otherwise use the fallback
+export function toAsciiPrintable(string, fallback) {
+  if (typeof string.normalize === "function") {
+    string = string.normalize("NFD").replace(/[\u0300-\u036f]/g, "");
+  }
+
+  return /^[/\040-\176/]*$/.test(string) ? string : fallback;
+}
+
+export function slugify(string) {
+  return string
+    .trim()
+    .toLowerCase()
+    .replace(/\s|_+/g, "-") // Replace spaces and underscores with dashes
+    .replace(/[^\w\-]+/g, "") // Remove non-word characters except for dashes
+    .replace(/\-\-+/g, "-") // Replace multiple dashes with a single dash
+    .replace(/^-+/, "") // Remove leading dashes
+    .replace(/-+$/, ""); // Remove trailing dashes
+}
+
 export function toNumber(input) {
   return typeof input === "number" ? input : parseFloat(input);
 }
diff --git a/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs b/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs
index 73b7ad43aa..95ae666471 100644
--- a/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs
@@ -4,10 +4,14 @@
   {{d-button
     action=(action "copyToClipboard")
     class="backup-codes-copy-btn"
-    icon="copy"}}
+    icon="copy"
+    aria-label="user.second_factor_backup.copy_to_clipboard"
+    title="user.second_factor_backup.copy_to_clipboard"}}
 
-  <a download="backup_codes.txt"
+  <a download="{{siteTitleSlug}}-backup-codes.txt"
      class="btn no-text btn-icon backup-codes-download-btn"
+     aria-label={{i18n "user.second_factor_backup.download_backup_codes"}}
+     title={{i18n "user.second_factor_backup.download_backup_codes"}}
      rel="noopener noreferrer"
      target="_blank"
      href="data:application/octet-stream;charset=utf-8;base64,{{base64BackupCode}}">
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs
index 8a9e433672..1d3e96142b 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs
@@ -18,18 +18,27 @@
       {{/if}}
 
       <div class="actions">
-        {{d-button
-          class="btn-primary"
-          action=(action "generateSecondFactorCodes")
-          type="submit"
-          disabled=loading
-          label=generateBackupCodeBtnLabel}}
         {{#if backupEnabled}}
+          {{d-button
+            class="btn-primary"
+            icon="redo"
+            action=(action "generateSecondFactorCodes")
+            type="submit"
+            isLoading=loading
+            label="user.second_factor_backup.regenerate"}}
           {{d-button
             class="btn-danger"
+            icon="ban"
             action=(action "disableSecondFactorBackup")
             disabled=loading
             label="user.second_factor_backup.disable"}}
+        {{else}}
+          {{d-button
+            class="btn-primary"
+            action=(action "generateSecondFactorCodes")
+            type="submit"
+            disabled=loading
+            label="user.second_factor_backup.enable"}}
         {{/if}}
       </div>
 
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs
index bd0d5a2636..d0d1207d75 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs
@@ -8,11 +8,13 @@
   {{d-button
     action=(action "editSecurityKey")
     class="btn-primary"
-    label="user.second_factor.security_key.edit"
+    label="user.second_factor.security_key.save"
   }}
   {{d-button
     action=(action "disableSecurityKey")
     class="btn-danger"
-    label="user.second_factor.security_key.delete"
+    icon="trash-alt"
+    aria-label="user.second_factor.disable"
+    title="user.second_factor.disable"
   }}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs
index 2a77fceab6..a7a4f60a29 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs
@@ -8,11 +8,13 @@
   {{d-button
     action=(action "editSecondFactor")
     class="btn-primary"
-    label="user.second_factor.edit"
+    label="user.second_factor.save"
   }}
   {{d-button
     action=(action "disableSecondFactor")
     class="btn-danger"
-    label="user.second_factor.disable"
+    icon="trash-alt"
+    aria-label="user.second_factor.disable"
+    title="user.second_factor.disable"
   }}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
index d8b8d95ac0..62cadd2595 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
@@ -31,6 +31,7 @@
             <h2>{{i18n "user.second_factor.totp.title"}}</h2>
             {{d-button action=(action "createTotp")
               class="btn-primary new-totp"
+              icon="plus"
               disabled=loading
               label="user.second_factor.totp.add"}}
             {{#each totps as |totp|}}
@@ -46,6 +47,8 @@
                     class="btn-default btn-small btn-icon pad-left no-text edit"
                     disabled=loading
                     icon="pencil-alt"
+                    aria-label="user.second_factor.edit"
+                    title="user.second_factor.edit"
                   }}
                 {{/if}}
               </div>
@@ -58,6 +61,7 @@
             <h2>{{i18n "user.second_factor.security_key.title"}}</h2>
             {{d-button action=(action "createSecurityKey")
               class="btn-primary new-security-key"
+              icon="plus"
               disabled=loading
               label="user.second_factor.security_key.add"}}
             {{#each security_keys as |security_key|}}
@@ -73,6 +77,8 @@
                     class="btn-default btn-small btn-icon pad-left no-text edit"
                     disabled=loading
                     icon="pencil-alt"
+                    aria-label="user.second_factor.edit"
+                    title="user.second_factor.edit"
                   }}
                 {{/if}}
               </div>
@@ -95,6 +101,8 @@
                   class="btn-default btn-small btn-icon pad-left no-text edit edit-2fa-backup"
                   disabled=loading
                   icon="pencil-alt"
+                  aria-label="user.second_factor.edit"
+                  title="user.second_factor.edit"
                 }}
               {{/if}}
             {{else}}
@@ -107,9 +115,9 @@
           {{#unless showEnforcedNotice}}
             <div class="control-group">
               <div class="controls">
-                <h2>{{i18n "user.second_factor.disable_title"}}</h2>
                 {{d-button
                   class="btn-danger"
+                  icon="ban"
                   action=(action "disableAllSecondFactors")
                   disabled=loading
                   label="disable"}}
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 869635a250..587af3c353 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -590,8 +590,13 @@
       margin-right: 10px;
     }
 
-    .form-horizontal .instructions {
-      margin-left: 0;
+    .form-horizontal {
+      .instructions {
+        margin-left: 0;
+      }
+      .actions {
+        margin-top: 5px;
+      }
     }
 
     .backup-codes {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 336a4cf6c1..7dacfab23b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1010,8 +1010,10 @@ en:
         enable: "Enable"
         enable_long: "Enable backup codes"
         manage: "Manage backup codes. You have <strong>{{count}}</strong> backup codes remaining."
-        copied_to_clipboard: "Copied to Clipboard"
+        copy_to_clipboard: "Copy to Clipboard"
         copy_to_clipboard_error: "Error copying data to Clipboard"
+        copied_to_clipboard: "Copied to Clipboard"
+        download_backup_codes: "Download backup codes"
         remaining_codes: "You have <strong>{{count}}</strong> backup codes remaining."
         use: "Use a backup code"
         enable_prerequisites: "You must enable a primary second factor before generating backup codes."
@@ -1038,28 +1040,29 @@ en:
         oauth_enabled_warning: "Please note that social logins will be disabled once two factor authentication has been enabled on your account."
         use: "Use Authenticator app"
         enforced_notice: "You are required to enable two factor authentication before accessing this site."
-        disable: "disable"
-        disable_title: "Disable Second Factor"
+        disable: "Disable"
         disable_confirm: "Are you sure you want to disable all second factors?"
+        save: "Save"
         edit: "Edit"
         edit_title: "Edit Second Factor"
         edit_description: "Second Factor Name"
-        enable_security_key_description: "When you have your physical security key prepared press the Register button below."
+        enable_security_key_description: |
+          When you have your <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">hardware security key</a> prepared, press the Register button below.
         totp:
           title: "Token-Based Authenticators"
-          add: "New Authenticator"
+          add: "Add Authenticator"
           default_name: "My Authenticator"
           name_and_code_required_error: "You must provide a name and the code from your authenticator app."
         security_key:
           register: "Register"
           title: "Security Keys"
-          add: "Register Security Key"
+          add: "Add Security Key"
           default_name: "Main Security Key"
           not_allowed_error: "The security key registration process either timed out or was cancelled."
           already_added_error: "You have already registered this security key. You don’t have to register it again."
           edit: "Edit Security Key"
+          save: "Save"
           edit_description: "Security Key Name"
-          delete: "Delete"
           name_required_error: "You must provide a name for your security key."
 
       change_about:
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
index 453b13d07a..1f4b4ec727 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
@@ -8,12 +8,14 @@
     <span class="presence-text">
       <span class="description">
         {{#if isReply ~}}
-          {{i18n 'presence.replying'}}
+          {{i18n "presence.replying"}}
         {{~else~}}
-          {{i18n 'presence.editing'}}
-        {{~/if}}</span>{{!-- (using comment to stop whitespace)
-   --}}</span>{{!--
-   --}}<span class="wave"><span class="dot">.</span><span class="dot">.</span><span class="dot">.</span>
+          {{i18n "presence.editing"}}
+        {{~/if}}
+      </span>{{!-- (using comment to stop whitespace)
+--}}</span>{{!--
+--}}<span class="wave">
+      <span class="dot">.</span><span class="dot">.</span><span class="dot">.</span>
     </span>
   </div>
 {{/if}}
diff --git a/plugins/lazy-yt/assets/javascripts/lazyYT.js b/plugins/lazy-yt/assets/javascripts/lazyYT.js
index 897c15497d..651ea9df48 100644
--- a/plugins/lazy-yt/assets/javascripts/lazyYT.js
+++ b/plugins/lazy-yt/assets/javascripts/lazyYT.js
@@ -1,40 +1,40 @@
 /*!
-* lazyYT (lazy load YouTube videos)
-* v1.0.1 - 2014-12-30
-* (CC) This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.
-* http://creativecommons.org/licenses/by-sa/4.0/
-* Contributors: https://github.com/tylerpearson/lazyYT/graphs/contributors || https://github.com/daugilas/lazyYT/graphs/contributors
-*
-* Usage: <div class="lazyYT" data-youtube-id="laknj093n" data-parameters="rel=0">loading...</div>
-*
-* Note: Discourse has forked this from the original, beware when updating the file.
-*
-*/
+ * lazyYT (lazy load YouTube videos)
+ * v1.0.1 - 2014-12-30
+ * (CC) This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.
+ * http://creativecommons.org/licenses/by-sa/4.0/
+ * Contributors: https://github.com/tylerpearson/lazyYT/graphs/contributors || https://github.com/daugilas/lazyYT/graphs/contributors
+ *
+ * Usage: <div class="lazyYT" data-youtube-id="laknj093n" data-parameters="rel=0">loading...</div>
+ *
+ * Note: Discourse has forked this from the original, beware when updating the file.
+ *
+ */
 
-(function ($) {
-  'use strict';
+(function($) {
+  "use strict";
 
   function setUp($el, settings) {
-    var width = $el.data('width'),
-    height = $el.data('height'),
-    ratio = ($el.data('ratio')) ? $el.data('ratio') : settings.default_ratio,
-    id = $el.data('youtube-id'),
-    title = $el.data('youtube-title'),
-    padding_bottom,
-    innerHtml = [],
-    $thumb,
-    thumb_img,
-    youtube_parameters = $el.data('parameters') || '';
+    var width = $el.data("width"),
+      height = $el.data("height"),
+      ratio = $el.data("ratio") ? $el.data("ratio") : settings.default_ratio,
+      id = $el.data("youtube-id"),
+      title = $el.data("youtube-title"),
+      padding_bottom,
+      innerHtml = [],
+      $thumb,
+      thumb_img,
+      youtube_parameters = $el.data("parameters") || "";
 
     ratio = ratio.split(":");
 
     // width and height might override default_ratio value
-    if (typeof width === 'number' && typeof height === 'number') {
+    if (typeof width === "number" && typeof height === "number") {
       $el.width(width);
-      padding_bottom = height + 'px';
-    } else if (typeof width === 'number') {
+      padding_bottom = height + "px";
+    } else if (typeof width === "number") {
       $el.width(width);
-      padding_bottom = (width * ratio[1] / ratio[0]) + 'px';
+      padding_bottom = (width * ratio[1]) / ratio[0] + "px";
     } else {
       width = $el.width();
 
@@ -43,7 +43,7 @@
         width = $el.parent().width();
       }
 
-      padding_bottom = (ratio[1] / ratio[0] * 100) + '%';
+      padding_bottom = (ratio[1] / ratio[0]) * 100 + "%";
     }
 
     //
@@ -53,81 +53,108 @@
 
     // Play button from YouTube (exactly as it is in YouTube)
     innerHtml.push('<div class="ytp-large-play-button"');
-    if (width <= 640) innerHtml.push(' style="transform: scale(0.563888888888889);"');
-    innerHtml.push('>');
-    innerHtml.push('<svg>');
-    innerHtml.push('<path fill-rule="evenodd" clip-rule="evenodd" fill="#1F1F1F" class="ytp-large-play-button-svg" d="M84.15,26.4v6.35c0,2.833-0.15,5.967-0.45,9.4c-0.133,1.7-0.267,3.117-0.4,4.25l-0.15,0.95c-0.167,0.767-0.367,1.517-0.6,2.25c-0.667,2.367-1.533,4.083-2.6,5.15c-1.367,1.4-2.967,2.383-4.8,2.95c-0.633,0.2-1.316,0.333-2.05,0.4c-0.767,0.1-1.3,0.167-1.6,0.2c-4.9,0.367-11.283,0.617-19.15,0.75c-2.434,0.034-4.883,0.067-7.35,0.1h-2.95C38.417,59.117,34.5,59.067,30.3,59c-8.433-0.167-14.05-0.383-16.85-0.65c-0.067-0.033-0.667-0.117-1.8-0.25c-0.9-0.133-1.683-0.283-2.35-0.45c-2.066-0.533-3.783-1.5-5.15-2.9c-1.033-1.067-1.9-2.783-2.6-5.15C1.317,48.867,1.133,48.117,1,47.35L0.8,46.4c-0.133-1.133-0.267-2.55-0.4-4.25C0.133,38.717,0,35.583,0,32.75V26.4c0-2.833,0.133-5.95,0.4-9.35l0.4-4.25c0.167-0.966,0.417-2.05,0.75-3.25c0.7-2.333,1.567-4.033,2.6-5.1c1.367-1.434,2.967-2.434,4.8-3c0.633-0.167,1.333-0.3,2.1-0.4c0.4-0.066,0.917-0.133,1.55-0.2c4.9-0.333,11.283-0.567,19.15-0.7C35.65,0.05,39.083,0,42.05,0L45,0.05c2.467,0,4.933,0.034,7.4,0.1c7.833,0.133,14.2,0.367,19.1,0.7c0.3,0.033,0.833,0.1,1.6,0.2c0.733,0.1,1.417,0.233,2.05,0.4c1.833,0.566,3.434,1.566,4.8,3c1.066,1.066,1.933,2.767,2.6,5.1c0.367,1.2,0.617,2.284,0.75,3.25l0.4,4.25C84,20.45,84.15,23.567,84.15,26.4z M33.3,41.4L56,29.6L33.3,17.75V41.4z"></path>');
-    innerHtml.push('<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="33.3,41.4 33.3,17.75 56,29.6"></polygon>');
-    innerHtml.push('</svg>');
-    innerHtml.push('</div>'); // end of .ytp-large-play-button
+    if (width <= 640)
+      innerHtml.push(' style="transform: scale(0.563888888888889);"');
+    innerHtml.push(">");
+    innerHtml.push("<svg>");
+    innerHtml.push(
+      '<path fill-rule="evenodd" clip-rule="evenodd" fill="#1F1F1F" class="ytp-large-play-button-svg" d="M84.15,26.4v6.35c0,2.833-0.15,5.967-0.45,9.4c-0.133,1.7-0.267,3.117-0.4,4.25l-0.15,0.95c-0.167,0.767-0.367,1.517-0.6,2.25c-0.667,2.367-1.533,4.083-2.6,5.15c-1.367,1.4-2.967,2.383-4.8,2.95c-0.633,0.2-1.316,0.333-2.05,0.4c-0.767,0.1-1.3,0.167-1.6,0.2c-4.9,0.367-11.283,0.617-19.15,0.75c-2.434,0.034-4.883,0.067-7.35,0.1h-2.95C38.417,59.117,34.5,59.067,30.3,59c-8.433-0.167-14.05-0.383-16.85-0.65c-0.067-0.033-0.667-0.117-1.8-0.25c-0.9-0.133-1.683-0.283-2.35-0.45c-2.066-0.533-3.783-1.5-5.15-2.9c-1.033-1.067-1.9-2.783-2.6-5.15C1.317,48.867,1.133,48.117,1,47.35L0.8,46.4c-0.133-1.133-0.267-2.55-0.4-4.25C0.133,38.717,0,35.583,0,32.75V26.4c0-2.833,0.133-5.95,0.4-9.35l0.4-4.25c0.167-0.966,0.417-2.05,0.75-3.25c0.7-2.333,1.567-4.033,2.6-5.1c1.367-1.434,2.967-2.434,4.8-3c0.633-0.167,1.333-0.3,2.1-0.4c0.4-0.066,0.917-0.133,1.55-0.2c4.9-0.333,11.283-0.567,19.15-0.7C35.65,0.05,39.083,0,42.05,0L45,0.05c2.467,0,4.933,0.034,7.4,0.1c7.833,0.133,14.2,0.367,19.1,0.7c0.3,0.033,0.833,0.1,1.6,0.2c0.733,0.1,1.417,0.233,2.05,0.4c1.833,0.566,3.434,1.566,4.8,3c1.066,1.066,1.933,2.767,2.6,5.1c0.367,1.2,0.617,2.284,0.75,3.25l0.4,4.25C84,20.45,84.15,23.567,84.15,26.4z M33.3,41.4L56,29.6L33.3,17.75V41.4z"></path>'
+    );
+    innerHtml.push(
+      '<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="33.3,41.4 33.3,17.75 56,29.6"></polygon>'
+    );
+    innerHtml.push("</svg>");
+    innerHtml.push("</div>"); // end of .ytp-large-play-button
 
-    innerHtml.push('</div>'); // end of .ytp-thumbnail
+    innerHtml.push("</div>"); // end of .ytp-thumbnail
 
     // Video title (info bar)
     innerHtml.push('<div class="html5-info-bar">');
     innerHtml.push('<div class="html5-title">');
     innerHtml.push('<div class="html5-title-text-wrapper">');
-    innerHtml.push('<a class="html5-title-text" target="_blank" tabindex="3100" href="https://www.youtube.com/watch?v=', id, '">');
-    if (title === undefined || title === null || title === '') {
-      innerHtml.push('youtube.com/watch?v=' + id);
+    innerHtml.push(
+      '<a class="html5-title-text" target="_blank" tabindex="3100" href="https://www.youtube.com/watch?v=',
+      id,
+      '">'
+    );
+    if (title === undefined || title === null || title === "") {
+      innerHtml.push("youtube.com/watch?v=" + id);
     } else {
       innerHtml.push(title);
     }
-    innerHtml.push('</a>');
-    innerHtml.push('</div>'); // .html5-title
-    innerHtml.push('</div>'); // .html5-title-text-wrapper
-    innerHtml.push('</div>'); // end of Video title .html5-info-bar
+    innerHtml.push("</a>");
+    innerHtml.push("</div>"); // .html5-title
+    innerHtml.push("</div>"); // .html5-title-text-wrapper
+    innerHtml.push("</div>"); // end of Video title .html5-info-bar
 
-    $el.css({
-      'padding-bottom': padding_bottom
-    })
-    .html(innerHtml.join(''));
+    $el
+      .css({
+        "padding-bottom": padding_bottom
+      })
+      .html(innerHtml.join(""));
 
     if (width > 640) {
-      thumb_img = 'maxresdefault.jpg';
+      thumb_img = "maxresdefault.jpg";
     } else if (width > 480) {
-      thumb_img = 'sddefault.jpg';
+      thumb_img = "sddefault.jpg";
     } else if (width > 320) {
-      thumb_img = 'hqdefault.jpg';
+      thumb_img = "hqdefault.jpg";
     } else if (width > 120) {
-      thumb_img = 'mqdefault.jpg';
-    } else if (width === 0) { // sometimes it fails on fluid layout
-      thumb_img = 'hqdefault.jpg';
+      thumb_img = "mqdefault.jpg";
+    } else if (width === 0) {
+      // sometimes it fails on fluid layout
+      thumb_img = "hqdefault.jpg";
     } else {
-      thumb_img = 'default.jpg';
+      thumb_img = "default.jpg";
     }
 
-    $thumb = $el.find('.ytp-thumbnail').css({
-      'background-image': ['url(https://img.youtube.com/vi/', id, '/', thumb_img, ')'].join('')
-    })
-    .addClass('lazyYT-image-loaded')
-    .on('click', function (e) {
-      e.preventDefault();
+    $thumb = $el
+      .find(".ytp-thumbnail")
+      .css({
+        "background-image": [
+          "url(https://img.youtube.com/vi/",
+          id,
+          "/",
+          thumb_img,
+          ")"
+        ].join("")
+      })
+      .addClass("lazyYT-image-loaded")
+      .on("click", function(e) {
+        e.preventDefault();
 
-      if (!$el.hasClass('lazyYT-video-loaded') && $thumb.hasClass('lazyYT-image-loaded')) {
-        $el.html('<iframe src="//www.youtube.com/embed/' + id + '?autoplay=1&' + youtube_parameters + '" frameborder="0" allowfullscreen></iframe>')
-        .addClass('lazyYT-video-loaded');
-      }
-
-      if (settings.onPlay) {
-        settings.onPlay(e, $el);
-      }
-    });
+        if (
+          !$el.hasClass("lazyYT-video-loaded") &&
+          $thumb.hasClass("lazyYT-image-loaded")
+        ) {
+          $el
+            .html(
+              '<iframe src="//www.youtube.com/embed/' +
+                id +
+                "?autoplay=1&" +
+                youtube_parameters +
+                '" frameborder="0" allowfullscreen></iframe>'
+            )
+            .addClass("lazyYT-video-loaded");
+        }
 
+        if (settings.onPlay) {
+          settings.onPlay(e, $el);
+        }
+      });
   }
 
-  $.fn.lazyYT = function (newSettings) {
+  $.fn.lazyYT = function(newSettings) {
     var defaultSettings = {
-      default_ratio: '16:9',
+      default_ratio: "16:9",
       callback: null, // ToDO execute callback if given
-      container_class: 'lazyYT-container'
+      container_class: "lazyYT-container"
     };
     var settings = $.extend(defaultSettings, newSettings);
 
-    return this.each(function () {
+    return this.each(function() {
       var $el = $(this).addClass(settings.container_class);
       setUp($el, settings);
     });
   };
-
 })(jQuery);
diff --git a/test/javascripts/lib/utilities-test.js b/test/javascripts/lib/utilities-test.js
index 46609895a2..f3d14a2657 100644
--- a/test/javascripts/lib/utilities-test.js
+++ b/test/javascripts/lib/utilities-test.js
@@ -9,6 +9,8 @@ import {
   setDefaultHomepage,
   caretRowCol,
   setCaretPosition,
+  toAsciiPrintable,
+  slugify,
   fillMissingDates,
   inCodeBlock
 } from "discourse/lib/utilities";
@@ -175,6 +177,49 @@ QUnit.test("caretRowCol", assert => {
   document.body.removeChild(textarea);
 });
 
+QUnit.test("toAsciiPrintable", assert => {
+  const accentedString = "Créme_Brûlée!";
+  const unicodeString = "談話";
+
+  assert.equal(
+    toAsciiPrintable(accentedString, "discourse"),
+    "Creme_Brulee!",
+    "it replaces accented characters with the appropriate ASCII equivalent"
+  );
+
+  assert.equal(
+    toAsciiPrintable(unicodeString, "discourse"),
+    "discourse",
+    "it uses the fallback string when unable to convert"
+  );
+
+  assert.strictEqual(
+    typeof toAsciiPrintable(unicodeString),
+    "undefined",
+    "it returns undefined when unable to convert and no fallback is provided"
+  );
+});
+
+QUnit.test("slugify", assert => {
+  const asciiString = "--- 0__( Some-cool Discourse Site! )__0 --- ";
+  const accentedString = "Créme_Brûlée!";
+  const unicodeString = "談話";
+
+  assert.equal(
+    slugify(asciiString),
+    "0-some-cool-discourse-site-0",
+    "it properly slugifies an ASCII string"
+  );
+
+  assert.equal(
+    slugify(accentedString),
+    "crme-brle",
+    "it removes accented characters"
+  );
+
+  assert.equal(slugify(unicodeString), "", "it removes unicode characters");
+});
+
 QUnit.test("fillMissingDates", assert => {
   const startDate = "2017-11-12"; // YYYY-MM-DD
   const endDate = "2017-12-12"; // YYYY-MM-DD

From 9bff0882c3df594850de68ade2697407c84dcd7b Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Tue, 5 May 2020 13:46:57 +1000
Subject: [PATCH 0935/1830] FEATURE: Nokogumbo (#9577)

* FEATURE: Nokogumbo

Use Nokogumbo HTML parser.
---
 app/helpers/user_notifications_helper.rb      |   4 +-
 app/jobs/onceoff/grant_emoji.rb               |   2 +-
 app/jobs/onceoff/grant_onebox.rb              |   2 +-
 app/jobs/regular/pull_hotlinked_images.rb     |   2 +-
 app/jobs/regular/update_username.rb           |   4 +-
 app/models/category.rb                        |   2 +-
 app/models/post.rb                            |   2 +-
 app/models/post_analyzer.rb                   |   2 +-
 app/models/quoted_post.rb                     |   2 +-
 app/models/theme_field.rb                     |   2 +-
 app/models/topic_embed.rb                     |   8 +-
 app/services/inline_uploads.rb                |   6 +-
 app/services/search_indexer.rb                |   2 +-
 ...3951_backfill_post_upload_reverse_index.rb |   2 +-
 db/migrate/20140715055242_add_quoted_posts.rb |   2 +-
 lib/content_security_policy/extension.rb      |   3 +-
 lib/cooked_post_processor.rb                  |   4 +-
 lib/discourse_diff.rb                         |   2 +-
 lib/email/receiver.rb                         |   2 +-
 lib/email/styles.rb                           |  10 +-
 .../engine/whitelisted_generic_onebox.rb      |   2 +-
 lib/oneboxer.rb                               |   6 +-
 lib/post_revisor.rb                           |   2 +-
 lib/pretty_text.rb                            |  26 +++--
 lib/quote_comparer.rb                         |   2 +-
 lib/retrieve_title.rb                         |   2 +-
 lib/reviewable/conversation.rb                |   2 +-
 lib/tasks/emoji.rake                          |   2 +-
 .../spec/components/pretty_text_spec.rb       |   4 +-
 .../lib/discourse_narrative_bot/actions.rb    |   2 +-
 .../advanced_user_narrative.rb                |   6 +-
 .../new_user_narrative.rb                     |   8 +-
 plugins/poll/plugin.rb                        |   2 +-
 plugins/poll/spec/lib/pretty_text_spec.rb     |   2 +-
 script/import_scripts/ipboard3.rb             |   2 +-
 script/import_scripts/jive.rb                 |   2 +-
 script/import_scripts/jive_api.rb             |   2 +-
 script/import_scripts/lithium.rb              |   2 +-
 spec/components/cooked_post_processor_spec.rb | 107 ++++++++----------
 spec/components/email/styles_spec.rb          |   4 +-
 spec/components/excerpt_parser_spec.rb        |   2 +-
 spec/components/pretty_text_spec.rb           |  32 +++---
 spec/lib/content_security_policy_spec.rb      |   6 +-
 spec/models/topic_embed_spec.rb               |   4 +-
 spec/requests/categories_controller_spec.rb   |   2 +-
 spec/requests/email_controller_spec.rb        |   6 +-
 spec/requests/embed_controller_spec.rb        |   2 +-
 .../requests/user_api_keys_controller_spec.rb |   2 +-
 spec/services/username_changer_spec.rb        |  34 +++---
 spec/support/match_html_matcher.rb            |   2 +-
 50 files changed, 165 insertions(+), 179 deletions(-)

diff --git a/app/helpers/user_notifications_helper.rb b/app/helpers/user_notifications_helper.rb
index eb0293183b..ffbf7352c2 100644
--- a/app/helpers/user_notifications_helper.rb
+++ b/app/helpers/user_notifications_helper.rb
@@ -13,7 +13,7 @@ module UserNotificationsHelper
   end
 
   def correct_top_margin(html, desired)
-    fragment = Nokogiri::HTML.fragment(html)
+    fragment = Nokogiri::HTML5.fragment(html)
     if para = fragment.css("p:first").first
       para["style"] = "margin-top: #{desired};"
     end
@@ -32,7 +32,7 @@ module UserNotificationsHelper
   end
 
   def first_paragraphs_from(html)
-    doc = Nokogiri::HTML(html)
+    doc = Nokogiri::HTML5(html)
 
     result = +""
     length = 0
diff --git a/app/jobs/onceoff/grant_emoji.rb b/app/jobs/onceoff/grant_emoji.rb
index 5f85b431b8..5abdb34d5d 100644
--- a/app/jobs/onceoff/grant_emoji.rb
+++ b/app/jobs/onceoff/grant_emoji.rb
@@ -14,7 +14,7 @@ module Jobs
         .where("cooked LIKE '%emoji%'")
         .find_in_batches do |group|
         group.each do |p|
-          doc = Nokogiri::HTML::fragment(p.cooked)
+          doc = Nokogiri::HTML5::fragment(p.cooked)
           if (doc.css("img.emoji") - doc.css(".quote img")).size > 0
             to_award[p.user_id] ||= { post_id: p.id, created_at: p.created_at }
           end
diff --git a/app/jobs/onceoff/grant_onebox.rb b/app/jobs/onceoff/grant_onebox.rb
index 59cf443f4e..66d2cf2670 100644
--- a/app/jobs/onceoff/grant_onebox.rb
+++ b/app/jobs/onceoff/grant_onebox.rb
@@ -19,7 +19,7 @@ module Jobs
           begin
             # Note we can't use `p.cooked` here because oneboxes have been cooked out
             cooked = PrettyText.cook(p.raw)
-            doc = Nokogiri::HTML::fragment(cooked)
+            doc = Nokogiri::HTML5::fragment(cooked)
             if doc.search('a.onebox').size > 0
               to_award[p.user_id] ||= { post_id: p.id, created_at: p.created_at }
             end
diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index 2570365946..e7644e8ca8 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -157,7 +157,7 @@ module Jobs
     end
 
     def extract_images_from(html)
-      doc = Nokogiri::HTML::fragment(html)
+      doc = Nokogiri::HTML5::fragment(html)
 
       doc.css("img[src], a.lightbox[href]") -
         doc.css("img.avatar") -
diff --git a/app/jobs/regular/update_username.rb b/app/jobs/regular/update_username.rb
index d43c119060..7c9fcedb5a 100644
--- a/app/jobs/regular/update_username.rb
+++ b/app/jobs/regular/update_username.rb
@@ -154,11 +154,11 @@ module Jobs
     # and there is no reason to invalidate oneboxes, run the post analyzer etc.
     # when only the username changes.
     def update_cooked(cooked)
-      doc = Nokogiri::HTML.fragment(cooked)
+      doc = Nokogiri::HTML5.fragment(cooked)
 
       doc.css("a.mention").each do |a|
         a.content = a.content.gsub(@cooked_mention_username_regex, "@#{@new_username}")
-        a["href"] = a["href"].gsub(@cooked_mention_user_path_regex, "/u/#{@new_username}") if a["href"]
+        a["href"] = a["href"].gsub(@cooked_mention_user_path_regex, "/u/#{URI.escape(@new_username)}") if a["href"]
       end
 
       doc.css("aside.quote").each do |aside|
diff --git a/app/models/category.rb b/app/models/category.rb
index bbf1e9b98c..ddab403c5d 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -306,7 +306,7 @@ class Category < ActiveRecord::Base
 
     @@cache_text ||= LruRedux::ThreadSafeCache.new(1000)
     @@cache_text.getset(self.description) do
-      text = Nokogiri::HTML.fragment(self.description).text.strip
+      text = Nokogiri::HTML5.fragment(self.description).text.strip
       Rack::Utils.escape_html(text).html_safe
     end
   end
diff --git a/app/models/post.rb b/app/models/post.rb
index 5da5d16320..f2ee10543f 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -953,7 +953,7 @@ class Post < ActiveRecord::Base
       /\/uploads\/short-url\/[a-zA-Z0-9]+(\.[a-z0-9]+)?/
     ]
 
-    fragments ||= Nokogiri::HTML::fragment(self.cooked)
+    fragments ||= Nokogiri::HTML5::fragment(self.cooked)
     selectors = fragments.css("a/@href", "img/@src", "source/@src", "track/@src", "video/@poster")
 
     links = selectors.map do |media|
diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb
index 63fe9724b4..bae36c39f8 100644
--- a/app/models/post_analyzer.rb
+++ b/app/models/post_analyzer.rb
@@ -131,7 +131,7 @@ class PostAnalyzer
 
   def cooked_stripped
     @cooked_stripped ||= begin
-      doc = Nokogiri::HTML.fragment(cook(@raw, topic_id: @topic_id))
+      doc = Nokogiri::HTML5.fragment(cook(@raw, topic_id: @topic_id))
       doc.css("pre .mention, aside.quote > .title, aside.quote .mention, aside.quote .mention-group, .onebox, .elided").remove
       doc
     end
diff --git a/app/models/quoted_post.rb b/app/models/quoted_post.rb
index 03b981e1fb..9a6a96e9eb 100644
--- a/app/models/quoted_post.rb
+++ b/app/models/quoted_post.rb
@@ -9,7 +9,7 @@ class QuotedPost < ActiveRecord::Base
   #  we are double parsing this fragment, this may be worth optimising later
   def self.extract_from(post)
 
-    doc = Nokogiri::HTML.fragment(post.cooked)
+    doc = Nokogiri::HTML5.fragment(post.cooked)
 
     uniq = {}
 
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index 351c7b90f1..a9f98ce407 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -78,7 +78,7 @@ class ThemeField < ActiveRecord::Base
 
     js_compiler = ThemeJavascriptCompiler.new(theme_id, self.theme.name)
 
-    doc = Nokogiri::HTML.fragment(html)
+    doc = Nokogiri::HTML5.fragment(html)
 
     doc.css('script[type="text/x-handlebars"]').each do |node|
       name = node["name"] || node["data-template-name"] || "broken"
diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 43de234a15..a18e5b85de 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -126,7 +126,7 @@ class TopicEmbed < ActiveRecord::Base
       return
     end
 
-    raw_doc = Nokogiri::HTML(html)
+    raw_doc = Nokogiri::HTML5(html)
     auth_element = raw_doc.at('meta[@name="author"]')
     if auth_element.present?
       response.author = User.where(username_lower: auth_element[:content].strip).first
@@ -142,7 +142,7 @@ class TopicEmbed < ActiveRecord::Base
       title.strip!
     end
     response.title = title
-    doc = Nokogiri::HTML(read_doc.content)
+    doc = Nokogiri::HTML5(read_doc.content)
 
     tags = { 'img' => 'src', 'script' => 'src', 'a' => 'href' }
     doc.search(tags.keys.join(',')).each do |node|
@@ -198,7 +198,7 @@ class TopicEmbed < ActiveRecord::Base
     prefix = "#{uri.scheme}://#{uri.host}"
     prefix += ":#{uri.port}" if uri.port != 80 && uri.port != 443
 
-    fragment = Nokogiri::HTML.fragment("<div>#{contents}</div>")
+    fragment = Nokogiri::HTML5.fragment("<div>#{contents}</div>")
     fragment.css('a').each do |a|
       href = a['href']
       if href.present? && href.start_with?('/')
@@ -220,7 +220,7 @@ class TopicEmbed < ActiveRecord::Base
   end
 
   def self.first_paragraph_from(html)
-    doc = Nokogiri::HTML(html)
+    doc = Nokogiri::HTML5(html)
 
     result = +""
     doc.css('p').each do |p|
diff --git a/app/services/inline_uploads.rb b/app/services/inline_uploads.rb
index e75348bcce..0facc329fb 100644
--- a/app/services/inline_uploads.rb
+++ b/app/services/inline_uploads.rb
@@ -16,7 +16,7 @@ class InlineUploads
       end
     end
 
-    cooked_fragment = Nokogiri::HTML::fragment(PrettyText.cook(markdown, disable_emojis: true))
+    cooked_fragment = Nokogiri::HTML5::fragment(PrettyText.cook(markdown, disable_emojis: true))
     link_occurences = []
 
     cooked_fragment.traverse do |node|
@@ -183,7 +183,7 @@ class InlineUploads
 
   def self.match_anchor(markdown, external_href: false)
     markdown.scan(/((<a[^<]+>)([^<\a>]*?)<\/a>)/i) do |match|
-      node = Nokogiri::HTML::fragment(match[0]).children[0]
+      node = Nokogiri::HTML5::fragment(match[0]).children[0]
       href =  node.attributes["href"]&.value
 
       if href && (matched_uploads(href).present? || external_href)
@@ -199,7 +199,7 @@ class InlineUploads
 
   def self.match_img(markdown, external_src: false)
     markdown.scan(/(<(?!img)[^<>]+\/?>)?(\s*)(<img [^>\n]+>)/i) do |match|
-      node = Nokogiri::HTML::fragment(match[2].strip).children[0]
+      node = Nokogiri::HTML5::fragment(match[2].strip).children[0]
       src =  node.attributes["src"]&.value
 
       if src && (matched_uploads(src).present? || external_src)
diff --git a/app/services/search_indexer.rb b/app/services/search_indexer.rb
index 17817c4c09..ceeaaf27f2 100644
--- a/app/services/search_indexer.rb
+++ b/app/services/search_indexer.rb
@@ -191,7 +191,7 @@ class SearchIndexer
     def self.scrub(html, strip_diacritics: false)
       return +"" if html.blank?
 
-      document = Nokogiri::HTML("<div>#{html}</div>", nil, Encoding::UTF_8.to_s)
+      document = Nokogiri::HTML5("<div>#{html}</div>", nil, Encoding::UTF_8.to_s)
 
       nodes = document.css(
         "div.#{CookedPostProcessor::LIGHTBOX_WRAPPER_CSS_CLASS}"
diff --git a/db/migrate/20131014203951_backfill_post_upload_reverse_index.rb b/db/migrate/20131014203951_backfill_post_upload_reverse_index.rb
index 793da0ce64..0c5f4bb3e6 100644
--- a/db/migrate/20131014203951_backfill_post_upload_reverse_index.rb
+++ b/db/migrate/20131014203951_backfill_post_upload_reverse_index.rb
@@ -8,7 +8,7 @@ class BackfillPostUploadReverseIndex < ActiveRecord::Migration[4.2]
 
     # fill the reverse index up
     Post.select([:id, :cooked]).find_each do |post|
-      doc = Nokogiri::HTML::fragment(post.cooked)
+      doc = Nokogiri::HTML5::fragment(post.cooked)
       # images
       doc.search("img").each { |img| add_to_reverse_index(img['src'], post.id) }
       # thumbnails and/or attachments
diff --git a/db/migrate/20140715055242_add_quoted_posts.rb b/db/migrate/20140715055242_add_quoted_posts.rb
index 47550f9251..d3052b8a07 100644
--- a/db/migrate/20140715055242_add_quoted_posts.rb
+++ b/db/migrate/20140715055242_add_quoted_posts.rb
@@ -30,7 +30,7 @@ SQL
 
     results.each do |row|
       post_id, max_id = row["id"].to_i
-      doc = Nokogiri::HTML.fragment(row["cooked"])
+      doc = Nokogiri::HTML5.fragment(row["cooked"])
 
       uniq = {}
 
diff --git a/lib/content_security_policy/extension.rb b/lib/content_security_policy/extension.rb
index 4c8231b60a..93eab088e4 100644
--- a/lib/content_security_policy/extension.rb
+++ b/lib/content_security_policy/extension.rb
@@ -61,7 +61,8 @@ class ContentSecurityPolicy
       auto_script_src_extension = { script_src: [] }
       html_fields.each(&:ensure_baked!)
       doc = html_fields.map(&:value_baked).join("\n")
-      Nokogiri::HTML.fragment(doc).css('script[src]').each do |node|
+
+      Nokogiri::HTML5.fragment(doc).css('script[src]').each do |node|
         src = node['src']
         uri = URI(src)
 
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index a2d75bfdf9..725258cc10 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -24,7 +24,7 @@ class CookedPostProcessor
     @cooking_options = @cooking_options.symbolize_keys
 
     cooked = post.cook(post.raw, @cooking_options)
-    @doc = Nokogiri::HTML::fragment(cooked)
+    @doc = Nokogiri::HTML5::fragment(cooked)
     @has_oneboxes = post.post_analyzer.found_oneboxes?
     @size_cache = {}
 
@@ -95,7 +95,7 @@ class CookedPostProcessor
 
     return if previous.blank?
 
-    previous_text = Nokogiri::HTML::fragment(previous).text.strip
+    previous_text = Nokogiri::HTML5::fragment(previous).text.strip
     quoted_text = @doc.css("aside.quote:first-child blockquote").first&.text&.strip || ""
 
     return if previous_text.gsub(/(\s){2,}/, '\1') != quoted_text.gsub(/(\s){2,}/, '\1')
diff --git a/lib/discourse_diff.rb b/lib/discourse_diff.rb
index c2b3171623..cdf3787020 100644
--- a/lib/discourse_diff.rb
+++ b/lib/discourse_diff.rb
@@ -168,7 +168,7 @@ class DiscourseDiff
   end
 
   def tokenize_html_blocks(html)
-    Nokogiri::HTML.fragment(html).search("./*").map(&:to_html)
+    Nokogiri::HTML5.fragment(html).search("./*").map(&:to_html)
   end
 
   def tokenize_html(html)
diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index 69f7ccf270..3cb73a8976 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -338,7 +338,7 @@ module Email
       markdown, elided_markdown = if html.present?
         # use the first html extracter that matches
         if html_extracter = HTML_EXTRACTERS.select { |_, r| html[r] }.min_by { |_, r| html =~ r }
-          doc = Nokogiri::HTML.fragment(html)
+          doc = Nokogiri::HTML5.fragment(html)
           self.public_send(:"extract_from_#{html_extracter[0]}", doc)
         else
           markdown = HtmlToMarkdown.new(html, keep_img_tags: true, keep_cid_imgs: true).to_markdown
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 955398aad8..69bfc7ec23 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -15,7 +15,7 @@ module Email
     def initialize(html, opts = nil)
       @html = html
       @opts = opts || {}
-      @fragment = Nokogiri::HTML.fragment(@html)
+      @fragment = Nokogiri::HTML5.parse(@html)
       @custom_styles = nil
     end
 
@@ -161,7 +161,7 @@ module Email
           src_uri = i["data-original-href"].present? ? URI(i["data-original-href"]) : URI(i['src'])
           # If an iframe is protocol relative, use SSL when displaying it
           display_src = "#{src_uri.scheme || 'https'}://#{src_uri.host}#{src_uri.path}#{src_uri.query.nil? ? '' : '?' + src_uri.query}#{src_uri.fragment.nil? ? '' : '#' + src_uri.fragment}"
-          i.replace "<p><a href='#{src_uri.to_s}'>#{CGI.escapeHTML(display_src)}</a><p>"
+          i.replace(Nokogiri::HTML5.fragment("<p><a href='#{src_uri.to_s}'>#{CGI.escapeHTML(display_src)}</a><p>"))
         rescue URI::Error
           # If the URL is weird, remove the iframe
           i.remove
@@ -242,7 +242,11 @@ module Email
       strip_classes_and_ids
       replace_relative_urls
       replace_secure_media_urls
-      @fragment.to_html
+      include_body? ? @fragment.at("body").to_html : @fragment.at("body").children.to_html
+    end
+
+    def include_body?
+      @html =~ /<body>/i
     end
 
     def strip_avatars_and_emojis
diff --git a/lib/onebox/engine/whitelisted_generic_onebox.rb b/lib/onebox/engine/whitelisted_generic_onebox.rb
index a10f22e83b..7a46a0d1e5 100644
--- a/lib/onebox/engine/whitelisted_generic_onebox.rb
+++ b/lib/onebox/engine/whitelisted_generic_onebox.rb
@@ -24,7 +24,7 @@ module Onebox
         return true if WhitelistedGenericOnebox.html_providers.include?(data[:provider_name])
 
         if data[:html]["iframe"]
-          fragment = Nokogiri::HTML::fragment(data[:html])
+          fragment = Nokogiri::HTML5::fragment(data[:html])
           if iframe = fragment.at_css("iframe")
             src = iframe["src"]
             return src.present? && SiteSetting.allowed_iframes.split("|").any? { |url| src.start_with?(url) }
diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index 4e3ab68cf8..d3625f19d8 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -78,7 +78,7 @@ module Oneboxer
   # Parse URLs out of HTML, returning the document when finished.
   def self.each_onebox_link(string_or_doc, extra_paths: [])
     doc = string_or_doc
-    doc = Nokogiri::HTML::fragment(doc) if doc.is_a?(String)
+    doc = Nokogiri::HTML5::fragment(doc) if doc.is_a?(String)
 
     onebox_links = doc.css("a.#{ONEBOX_CSS_CLASS}", *extra_paths)
     if onebox_links.present?
@@ -94,14 +94,14 @@ module Oneboxer
 
   def self.apply(string_or_doc, extra_paths: nil)
     doc = string_or_doc
-    doc = Nokogiri::HTML::fragment(doc) if doc.is_a?(String)
+    doc = Nokogiri::HTML5::fragment(doc) if doc.is_a?(String)
     changed = false
 
     each_onebox_link(doc, extra_paths: extra_paths) do |url, element|
       onebox, _ = yield(url, element)
 
       if onebox
-        parsed_onebox = Nokogiri::HTML::fragment(onebox)
+        parsed_onebox = Nokogiri::HTML5::fragment(onebox)
         next unless parsed_onebox.children.count > 0
 
         if element&.parent&.node_name&.downcase == "p" &&
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 9da306db09..fd85696cf0 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -579,7 +579,7 @@ class PostRevisor
   def update_category_description
     return unless category = Category.find_by(topic_id: @topic.id)
 
-    doc = Nokogiri::HTML.fragment(@post.cooked)
+    doc = Nokogiri::HTML5.fragment(@post.cooked)
     doc.css("img").remove
 
     if html = doc.css("p").first&.inner_html&.strip
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 73c18d0099..9f3f65e350 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -259,7 +259,7 @@ module PrettyText
 
     sanitized = markdown(working_text, options)
 
-    doc = Nokogiri::HTML.fragment(sanitized)
+    doc = Nokogiri::HTML5.fragment(sanitized)
 
     if !options[:omit_nofollow] && SiteSetting.add_rel_nofollow_to_user_content
       add_rel_nofollow_to_user_content(doc)
@@ -269,7 +269,11 @@ module PrettyText
       add_mentions(doc, user_id: opts[:user_id])
     end
 
-    doc.to_html
+    scrubber = Loofah::Scrubber.new do |node|
+      node.remove if node.name == 'script'
+    end
+    loofah_fragment = Loofah.fragment(doc.to_html)
+    loofah_fragment.scrub!(scrubber).to_html
   end
 
   def self.add_rel_nofollow_to_user_content(doc)
@@ -282,7 +286,7 @@ module PrettyText
     doc.css("a").each do |l|
       href = l["href"].to_s
       begin
-        uri = URI(href)
+        uri = URI(URI.escape(href))
         site_uri ||= URI(Discourse.base_url)
 
         if !uri.host.present? ||
@@ -305,7 +309,7 @@ module PrettyText
 
   def self.extract_links(html)
     links = []
-    doc = Nokogiri::HTML.fragment(html)
+    doc = Nokogiri::HTML5.fragment(html)
 
     # remove href inside quotes & elided part
     doc.css("aside.quote a, .elided a").each { |a| a["href"] = "" }
@@ -338,7 +342,7 @@ module PrettyText
 
   def self.excerpt(html, max_length, options = {})
     # TODO: properly fix this HACK in ExcerptParser without introducing XSS
-    doc = Nokogiri::HTML.fragment(html)
+    doc = Nokogiri::HTML5.fragment(html)
     DiscourseEvent.trigger(:reduce_excerpt, doc, options)
     strip_image_wrapping(doc)
     strip_oneboxed_media(doc)
@@ -350,7 +354,7 @@ module PrettyText
     return string if string.blank?
 
     # If the user is not basic, strip links from their bio
-    fragment = Nokogiri::HTML.fragment(string)
+    fragment = Nokogiri::HTML5.fragment(string)
     fragment.css('a').each { |a| a.replace(a.inner_html) }
     fragment.to_html
   end
@@ -395,14 +399,14 @@ module PrettyText
   def self.strip_secure_media(doc)
     doc.css("a[href]").each do |a|
       if Upload.secure_media_url?(a["href"])
-        target = %w(video audio).include?(a&.parent&.parent&.name) ? a.parent.parent : a
+        target = %w(video audio).include?(a&.parent&.name) ? a.parent : a
         target.replace "<p class='secure-media-notice'>#{I18n.t("emails.secure_media_placeholder")}</p>"
       end
     end
   end
 
   def self.format_for_email(html, post = nil)
-    doc = Nokogiri::HTML.fragment(html)
+    doc = Nokogiri::HTML5.fragment(html)
     DiscourseEvent.trigger(:reduce_cooked, doc, post)
     strip_secure_media(doc) if post&.with_secure_media?
     strip_image_wrapping(doc)
@@ -462,13 +466,13 @@ module PrettyText
 
         case type
         when USER_TYPE
-          element['href'] = "#{Discourse::base_uri}/u/#{name}"
+          element['href'] = "#{Discourse::base_uri}/u/#{URI.escape(name)}"
         when GROUP_MENTIONABLE_TYPE
           element['class'] = 'mention-group notify'
-          element['href'] = "#{Discourse::base_uri}/groups/#{name}"
+          element['href'] = "#{Discourse::base_uri}/groups/#{URI.escape(name)}"
         when GROUP_TYPE
           element['class'] = 'mention-group'
-          element['href'] = "#{Discourse::base_uri}/groups/#{name}"
+          element['href'] = "#{Discourse::base_uri}/groups/#{URI.escape(name)}"
         end
       end
     end
diff --git a/lib/quote_comparer.rb b/lib/quote_comparer.rb
index 5da2891a7e..74f39f84a7 100644
--- a/lib/quote_comparer.rb
+++ b/lib/quote_comparer.rb
@@ -18,7 +18,7 @@ class QuoteComparer
   def modified?
     return true if @text.blank? || @parent_post.blank?
 
-    parent_text = Nokogiri::HTML::fragment(@parent_post.cooked).text.delete(QuoteComparer.whitespace)
+    parent_text = Nokogiri::HTML5::fragment(@parent_post.cooked).text.delete(QuoteComparer.whitespace)
     text = @text.delete(QuoteComparer.whitespace)
 
     !parent_text.include?(text)
diff --git a/lib/retrieve_title.rb b/lib/retrieve_title.rb
index 3c55ec7aec..227da9f0cb 100644
--- a/lib/retrieve_title.rb
+++ b/lib/retrieve_title.rb
@@ -11,7 +11,7 @@ module RetrieveTitle
 
   def self.extract_title(html)
     title = nil
-    if doc = Nokogiri::HTML(html)
+    if doc = Nokogiri::HTML5(html)
 
       title = doc.at('title')&.inner_text
 
diff --git a/lib/reviewable/conversation.rb b/lib/reviewable/conversation.rb
index 53eba48ef1..696959dd92 100644
--- a/lib/reviewable/conversation.rb
+++ b/lib/reviewable/conversation.rb
@@ -17,7 +17,7 @@ class Reviewable < ActiveRecord::Base
       def self.excerpt(cooked)
         excerpt = ::Post.excerpt(cooked, 250, keep_emoji_images: true)
         # remove the first link if it's the first node
-        fragment = Nokogiri::HTML.fragment(excerpt)
+        fragment = Nokogiri::HTML5.fragment(excerpt)
         if fragment.children.first == fragment.css("a:first").first && fragment.children.first
           fragment.children.first.remove
         end
diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake
index ad05c0d1b2..ace173d55c 100644
--- a/lib/tasks/emoji.rake
+++ b/lib/tasks/emoji.rake
@@ -353,7 +353,7 @@ def generate_emoji_groups(keywords, sections)
   puts "Generating groups..."
 
   list = open(EMOJI_ORDERING_URL).read
-  doc = Nokogiri::HTML(list)
+  doc = Nokogiri::HTML5(list)
   table = doc.css("table")[0]
 
   EMOJI_GROUPS.map do |group|
diff --git a/plugins/discourse-details/spec/components/pretty_text_spec.rb b/plugins/discourse-details/spec/components/pretty_text_spec.rb
index aa768305ec..dd0cf14a72 100644
--- a/plugins/discourse-details/spec/components/pretty_text_spec.rb
+++ b/plugins/discourse-details/spec/components/pretty_text_spec.rb
@@ -8,7 +8,7 @@ describe PrettyText do
   let(:post) { Fabricate(:post) }
 
   it "supports details tag" do
-    cooked_html = <<~HTML
+    cooked_html = <<~HTML.gsub("\n", "")
       <details>
       <summary>
       foo</summary>
@@ -17,7 +17,7 @@ describe PrettyText do
     HTML
 
     expect(cooked_html).to match_html(cooked_html)
-    expect(PrettyText.cook("[details=foo]\nbar\n[/details]")).to match_html(cooked_html)
+    expect(PrettyText.cook("[details=foo]\nbar\n[/details]").gsub("\n", "")).to match_html(cooked_html)
   end
 
   it "deletes elided content" do
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb
index 342e149128..56afacf2af 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb
@@ -68,7 +68,7 @@ module DiscourseNarrativeBot
     end
 
     def bot_mentioned?(post)
-      doc = Nokogiri::HTML.fragment(post.cooked)
+      doc = Nokogiri::HTML5.fragment(post.cooked)
 
       valid = false
 
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
index aa66cb1802..52f1cdab65 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
@@ -280,7 +280,7 @@ module DiscourseNarrativeBot
       topic_id = @post.topic_id
       return unless valid_topic?(topic_id)
 
-      if Nokogiri::HTML.fragment(@post.cooked).css('.hashtag').size > 0
+      if Nokogiri::HTML5.fragment(@post.cooked).css('.hashtag').size > 0
         raw = <<~RAW
           #{I18n.t("#{I18N_KEY}.category_hashtag.reply", i18n_post_args)}
 
@@ -331,7 +331,7 @@ module DiscourseNarrativeBot
       topic_id = @post.topic_id
       return unless valid_topic?(topic_id)
 
-      if Nokogiri::HTML.fragment(@post.cooked).css(".poll").size > 0
+      if Nokogiri::HTML5.fragment(@post.cooked).css(".poll").size > 0
         raw = <<~RAW
           #{I18n.t("#{I18N_KEY}.poll.reply", i18n_post_args)}
 
@@ -354,7 +354,7 @@ module DiscourseNarrativeBot
 
       fake_delay
 
-      if Nokogiri::HTML.fragment(@post.cooked).css("details").size > 0
+      if Nokogiri::HTML5.fragment(@post.cooked).css("details").size > 0
         reply_to(@post, I18n.t("#{I18N_KEY}.details.reply", i18n_post_args))
       else
         reply_to(@post, I18n.t("#{I18N_KEY}.details.not_found", i18n_post_args)) unless @data[:attempted]
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
index 5e9a1f38a5..9898ba085e 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
@@ -326,7 +326,7 @@ module DiscourseNarrativeBot
 
       cooked = @post.post_analyzer.cook(@post.raw, {})
 
-      if Nokogiri::HTML.fragment(cooked).css("img").size > 0
+      if Nokogiri::HTML5.fragment(cooked).css("img").size > 0
         set_state_data(:post_id, @post.id)
 
         if get_state_data(:liked)
@@ -366,7 +366,7 @@ module DiscourseNarrativeBot
       post_topic_id = @post.topic_id
       return unless valid_topic?(post_topic_id)
 
-      if Nokogiri::HTML.fragment(@post.cooked).css("b", "strong", "em", "i", ".bbcode-i", ".bbcode-b").size > 0
+      if Nokogiri::HTML5.fragment(@post.cooked).css("b", "strong", "em", "i", ".bbcode-i", ".bbcode-b").size > 0
         raw = <<~RAW
           #{I18n.t("#{I18N_KEY}.formatting.reply", i18n_post_args)}
 
@@ -390,7 +390,7 @@ module DiscourseNarrativeBot
       post_topic_id = @post.topic_id
       return unless valid_topic?(post_topic_id)
 
-      doc = Nokogiri::HTML.fragment(@post.cooked)
+      doc = Nokogiri::HTML5.fragment(@post.cooked)
 
       if doc.css(".quote").size > 0
         raw = <<~RAW
@@ -416,7 +416,7 @@ module DiscourseNarrativeBot
       post_topic_id = @post.topic_id
       return unless valid_topic?(post_topic_id)
 
-      doc = Nokogiri::HTML.fragment(@post.cooked)
+      doc = Nokogiri::HTML5.fragment(@post.cooked)
 
       if doc.css(".emoji").size > 0
         raw = <<~RAW
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index e0c1057e36..78fa0ba548 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -350,7 +350,7 @@ after_initialize do
         # in the validators instead of cooking twice
         cooked = PrettyText.cook(raw, topic_id: topic_id, user_id: user_id)
 
-        Nokogiri::HTML(cooked).css("div.poll").map do |p|
+        Nokogiri::HTML5(cooked).css("div.poll").map do |p|
           poll = { "options" => [], "name" => DiscoursePoll::DEFAULT_POLL_NAME }
 
           # attributes
diff --git a/plugins/poll/spec/lib/pretty_text_spec.rb b/plugins/poll/spec/lib/pretty_text_spec.rb
index db8af253a8..c4d09d2aac 100644
--- a/plugins/poll/spec/lib/pretty_text_spec.rb
+++ b/plugins/poll/spec/lib/pretty_text_spec.rb
@@ -131,7 +131,7 @@ describe PrettyText do
     MD
 
     onebox = Oneboxer.onebox_raw(post.full_url, user_id: Fabricate(:user).id)
-    doc = Nokogiri::HTML(onebox[:preview])
+    doc = Nokogiri::HTML5(onebox[:preview])
 
     expect(onebox[:preview]).to include("A post with a poll")
     expect(onebox[:preview]).to include("<a href=\"#{post.url}\">poll</a>")
diff --git a/script/import_scripts/ipboard3.rb b/script/import_scripts/ipboard3.rb
index 0791e2b3a0..4e7638633d 100644
--- a/script/import_scripts/ipboard3.rb
+++ b/script/import_scripts/ipboard3.rb
@@ -376,7 +376,7 @@ class ImportScripts::IPBoard3 < ImportScripts::Base
 
     raw.gsub!(/<(.+)>&nbsp;<\/\1>/, "\n\n")
 
-    doc = Nokogiri::HTML.fragment(raw)
+    doc = Nokogiri::HTML5.fragment(raw)
 
     doc.css("blockquote.ipsBlockquote").each do |bq|
       post_id = post_id_from_imported_post_id(bq["data-cid"])
diff --git a/script/import_scripts/jive.rb b/script/import_scripts/jive.rb
index 8d386a52c5..f380b2bfee 100644
--- a/script/import_scripts/jive.rb
+++ b/script/import_scripts/jive.rb
@@ -218,7 +218,7 @@ class ImportScripts::Jive < ImportScripts::Base
     raw = raw.dup
     raw = raw[5..-6]
 
-    doc = Nokogiri::HTML.fragment(raw)
+    doc = Nokogiri::HTML5.fragment(raw)
     doc.css('img').each do |img|
       img.remove if img['class'] == "jive-image"
     end
diff --git a/script/import_scripts/jive_api.rb b/script/import_scripts/jive_api.rb
index cf6df4d5be..cee4928227 100644
--- a/script/import_scripts/jive_api.rb
+++ b/script/import_scripts/jive_api.rb
@@ -297,7 +297,7 @@ class ImportScripts::JiveApi < ImportScripts::Base
   end
 
   def process_raw(raw)
-    doc = Nokogiri::HTML.fragment(raw)
+    doc = Nokogiri::HTML5.fragment(raw)
 
     # convert emoticon
     doc.css("span.emoticon-inline").each do |span|
diff --git a/script/import_scripts/lithium.rb b/script/import_scripts/lithium.rb
index ac18a3fa36..161618a7c1 100644
--- a/script/import_scripts/lithium.rb
+++ b/script/import_scripts/lithium.rb
@@ -913,7 +913,7 @@ SQL
       raw.sub!(match, content)
     end
 
-    doc = Nokogiri::HTML.fragment(raw)
+    doc = Nokogiri::HTML5.fragment(raw)
 
     doc.css("a,img,li-image").each do |l|
       upload_name, image, linked_upload = [nil] * 3
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 47262f1342..51e9eadf69 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -453,10 +453,8 @@ describe CookedPostProcessor do
         it "generates overlay information" do
           cpp.post_process
 
-          expect(cpp.html).to match_html <<~HTML
-            <p><div class="lightbox-wrapper"><a class="lightbox" href="//test.localhost#{upload.url}" data-download-href="//test.localhost/#{upload_path}/#{upload.sha1}" title="logo.png"><img src="//test.localhost/#{upload_path}/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png" width="690" height="788"><div class="meta">
-            <svg class="fa d-icon d-icon-far-image svg-icon" aria-hidden="true"><use xlink:href="#far-image"></use></svg><span class="filename">logo.png</span><span class="informations">1750×2000 1.21 KB</span><svg class="fa d-icon d-icon-discourse-expand svg-icon" aria-hidden="true"><use xlink:href="#discourse-expand"></use></svg>
-            </div></a></div></p>
+          expect(cpp.html).to match_html <<~HTML.rstrip
+            <p><div class="lightbox-wrapper"><a class="lightbox" href="//test.localhost#{upload.url}" data-download-href="//test.localhost/#{upload_path}/#{upload.sha1}" title="logo.png"><img src="//test.localhost/#{upload_path}/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png" width="690" height="788"><div class="meta"><svg class="fa d-icon d-icon-far-image svg-icon" aria-hidden="true"><use xlink:href="#far-image"></use></svg><span class="filename">logo.png</span><span class="informations">1750×2000 1.21 KB</span><svg class="fa d-icon d-icon-discourse-expand svg-icon" aria-hidden="true"><use xlink:href="#discourse-expand"></use></svg></div></a></div></p>
           HTML
 
           expect(cpp).to be_dirty
@@ -475,7 +473,7 @@ describe CookedPostProcessor do
 
             cpp.post_process
 
-            expect(cpp.html).to match_html <<~HTML
+            expect(cpp.html).to match_html <<~HTML.rstrip
               <p><img class="onebox" src="//test.localhost/#{upload_path}/original/1X/1234567890123456.jpg" width="690" height="788"></p>
             HTML
           end
@@ -491,7 +489,7 @@ describe CookedPostProcessor do
 
             cpp.post_process
 
-            expect(cpp.html).to match_html <<~HTML
+            expect(cpp.html).to match_html <<~HTML.rstrip
               <p><img src="//test.localhost/#{upload_path}/original/1X/1234567890123456.svg" width="690" height="788"></p>
             HTML
           end
@@ -619,10 +617,8 @@ describe CookedPostProcessor do
         it "crops the image" do
           cpp.post_process
 
-          expect(cpp.html).to match_html <<~HTML
-            <p><div class="lightbox-wrapper"><a class="lightbox" href="//test.localhost#{upload.url}" data-download-href="//test.localhost/#{upload_path}/#{upload.sha1}" title="logo.png"><img src="//test.localhost/#{upload_path}/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_230x500.png" width="230" height="500"><div class="meta">
-            <svg class="fa d-icon d-icon-far-image svg-icon" aria-hidden="true"><use xlink:href="#far-image"></use></svg><span class="filename">logo.png</span><span class="informations">1125×2436 1.21 KB</span><svg class="fa d-icon d-icon-discourse-expand svg-icon" aria-hidden="true"><use xlink:href="#discourse-expand"></use></svg>
-            </div></a></div></p>
+          expect(cpp.html).to match_html <<~HTML.rstrip
+            <p><div class="lightbox-wrapper"><a class="lightbox" href="//test.localhost#{upload.url}" data-download-href="//test.localhost/#{upload_path}/#{upload.sha1}" title="logo.png"><img src="//test.localhost/#{upload_path}/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_230x500.png" width="230" height="500"><div class="meta"><svg class="fa d-icon d-icon-far-image svg-icon" aria-hidden="true"><use xlink:href="#far-image"></use></svg><span class="filename">logo.png</span><span class="informations">1125×2436 1.21 KB</span><svg class="fa d-icon d-icon-discourse-expand svg-icon" aria-hidden="true"><use xlink:href="#discourse-expand"></use></svg></div></a></div></p>
           HTML
 
           expect(cpp).to be_dirty
@@ -652,10 +648,8 @@ describe CookedPostProcessor do
         it "generates overlay information" do
           cpp.post_process
 
-          expect(cpp.html). to match_html <<~HTML
-            <p><div class="lightbox-wrapper"><a class="lightbox" href="//test.localhost/subfolder#{upload.url}" data-download-href="//test.localhost/subfolder/#{upload_path}/#{upload.sha1}" title="logo.png"><img src="//test.localhost/subfolder/#{upload_path}/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png" width="690" height="788"><div class="meta">
-            <svg class="fa d-icon d-icon-far-image svg-icon" aria-hidden="true"><use xlink:href="#far-image"></use></svg><span class="filename">logo.png</span><span class="informations">1750×2000 1.21 KB</span><svg class="fa d-icon d-icon-discourse-expand svg-icon" aria-hidden="true"><use xlink:href="#discourse-expand"></use></svg>
-            </div></a></div></p>
+          expect(cpp.html). to match_html <<~HTML.rstrip
+            <p><div class="lightbox-wrapper"><a class="lightbox" href="//test.localhost/subfolder#{upload.url}" data-download-href="//test.localhost/subfolder/#{upload_path}/#{upload.sha1}" title="logo.png"><img src="//test.localhost/subfolder/#{upload_path}/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png" width="690" height="788"><div class="meta"><svg class="fa d-icon d-icon-far-image svg-icon" aria-hidden="true"><use xlink:href="#far-image"></use></svg><span class="filename">logo.png</span><span class="informations">1750×2000 1.21 KB</span><svg class="fa d-icon d-icon-discourse-expand svg-icon" aria-hidden="true"><use xlink:href="#discourse-expand"></use></svg></div></a></div></p>
           HTML
 
           expect(cpp).to be_dirty
@@ -665,10 +659,8 @@ describe CookedPostProcessor do
           upload.update!(original_filename: "><img src=x onerror=alert('haha')>.png")
           cpp.post_process
 
-          expect(cpp.html).to match_html <<~HTML
-            <p><div class="lightbox-wrapper"><a class="lightbox" href="//test.localhost/subfolder#{upload.url}" data-download-href="//test.localhost/subfolder/#{upload_path}/#{upload.sha1}" title="&amp;gt;&amp;lt;img src=x onerror=alert(&amp;#39;haha&amp;#39;)&amp;gt;.png"><img src="//test.localhost/subfolder/#{upload_path}/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png" width="690" height="788"><div class="meta">
-            <svg class="fa d-icon d-icon-far-image svg-icon" aria-hidden="true"><use xlink:href="#far-image"></use></svg><span class="filename">&amp;gt;&amp;lt;img src=x onerror=alert(&amp;#39;haha&amp;#39;)&amp;gt;.png</span><span class="informations">1750×2000 1.21 KB</span><svg class="fa d-icon d-icon-discourse-expand svg-icon" aria-hidden="true"><use xlink:href="#discourse-expand"></use></svg>
-            </div></a></div></p>
+          expect(cpp.html).to match_html <<~HTML.rstrip
+            <p><div class="lightbox-wrapper"><a class="lightbox" href="//test.localhost/subfolder#{upload.url}" data-download-href="//test.localhost/subfolder/#{upload_path}/#{upload.sha1}" title="&amp;gt;&amp;lt;img src=x onerror=alert(&amp;#39;haha&amp;#39;)&amp;gt;.png"><img src="//test.localhost/subfolder/#{upload_path}/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png" width="690" height="788"><div class="meta"><svg class="fa d-icon d-icon-far-image svg-icon" aria-hidden="true"><use xlink:href="#far-image"></use></svg><span class="filename">&amp;gt;&amp;lt;img src=x onerror=alert(&amp;#39;haha&amp;#39;)&amp;gt;.png</span><span class="informations">1750×2000 1.21 KB</span><svg class="fa d-icon d-icon-discourse-expand svg-icon" aria-hidden="true"><use xlink:href="#discourse-expand"></use></svg></div></a></div></p>
           HTML
         end
 
@@ -693,10 +685,8 @@ describe CookedPostProcessor do
         it "generates overlay information using image title and ignores alt" do
           cpp.post_process
 
-          expect(cpp.html).to match_html <<~HTML
-            <p><div class="lightbox-wrapper"><a class="lightbox" href="//test.localhost#{upload.url}" data-download-href="//test.localhost/#{upload_path}/#{upload.sha1}" title="WAT"><img src="//test.localhost/#{upload_path}/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png" title="WAT" alt="RED" width="690" height="788"><div class="meta">
-            <svg class="fa d-icon d-icon-far-image svg-icon" aria-hidden="true"><use xlink:href="#far-image"></use></svg><span class="filename">WAT</span><span class="informations">1750×2000 1.21 KB</span><svg class="fa d-icon d-icon-discourse-expand svg-icon" aria-hidden="true"><use xlink:href="#discourse-expand"></use></svg>
-            </div></a></div></p>
+          expect(cpp.html).to match_html <<~HTML.rstrip
+            <p><div class="lightbox-wrapper"><a class="lightbox" href="//test.localhost#{upload.url}" data-download-href="//test.localhost/#{upload_path}/#{upload.sha1}" title="WAT"><img src="//test.localhost/#{upload_path}/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png" title="WAT" alt="RED" width="690" height="788"><div class="meta"><svg class="fa d-icon d-icon-far-image svg-icon" aria-hidden="true"><use xlink:href="#far-image"></use></svg><span class="filename">WAT</span><span class="informations">1750×2000 1.21 KB</span><svg class="fa d-icon d-icon-discourse-expand svg-icon" aria-hidden="true"><use xlink:href="#discourse-expand"></use></svg></div></a></div></p>
           HTML
 
           expect(cpp).to be_dirty
@@ -723,10 +713,8 @@ describe CookedPostProcessor do
         it "generates overlay information using image title" do
           cpp.post_process
 
-          expect(cpp.html).to match_html <<~HTML
-            <p><div class="lightbox-wrapper"><a class="lightbox" href="//test.localhost#{upload.url}" data-download-href="//test.localhost/#{upload_path}/#{upload.sha1}" title="WAT"><img src="//test.localhost/#{upload_path}/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png" title="WAT" width="690" height="788"><div class="meta">
-            <svg class="fa d-icon d-icon-far-image svg-icon" aria-hidden="true"><use xlink:href="#far-image"></use></svg><span class="filename">WAT</span><span class="informations">1750×2000 1.21 KB</span><svg class="fa d-icon d-icon-discourse-expand svg-icon" aria-hidden="true"><use xlink:href="#discourse-expand"></use></svg>
-            </div></a></div></p>
+          expect(cpp.html).to match_html <<~HTML.rstrip
+            <p><div class="lightbox-wrapper"><a class="lightbox" href="//test.localhost#{upload.url}" data-download-href="//test.localhost/#{upload_path}/#{upload.sha1}" title="WAT"><img src="//test.localhost/#{upload_path}/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png" title="WAT" width="690" height="788"><div class="meta"><svg class="fa d-icon d-icon-far-image svg-icon" aria-hidden="true"><use xlink:href="#far-image"></use></svg><span class="filename">WAT</span><span class="informations">1750×2000 1.21 KB</span><svg class="fa d-icon d-icon-discourse-expand svg-icon" aria-hidden="true"><use xlink:href="#discourse-expand"></use></svg></div></a></div></p>
           HTML
 
           expect(cpp).to be_dirty
@@ -753,10 +741,8 @@ describe CookedPostProcessor do
         it "generates overlay information using image alt" do
           cpp.post_process
 
-          expect(cpp.html).to match_html <<~HTML
-            <p><div class="lightbox-wrapper"><a class="lightbox" href="//test.localhost#{upload.url}" data-download-href="//test.localhost/#{upload_path}/#{upload.sha1}" title="RED"><img src="//test.localhost/#{upload_path}/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png" alt="RED" width="690" height="788"><div class="meta">
-            <svg class="fa d-icon d-icon-far-image svg-icon" aria-hidden="true"><use xlink:href="#far-image"></use></svg><span class="filename">RED</span><span class="informations">1750×2000 1.21 KB</span><svg class="fa d-icon d-icon-discourse-expand svg-icon" aria-hidden="true"><use xlink:href="#discourse-expand"></use></svg>
-            </div></a></div></p>
+          expect(cpp.html).to match_html <<~HTML.rstrip
+            <p><div class="lightbox-wrapper"><a class="lightbox" href="//test.localhost#{upload.url}" data-download-href="//test.localhost/#{upload_path}/#{upload.sha1}" title="RED"><img src="//test.localhost/#{upload_path}/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png" alt="RED" width="690" height="788"><div class="meta"><svg class="fa d-icon d-icon-far-image svg-icon" aria-hidden="true"><use xlink:href="#far-image"></use></svg><span class="filename">RED</span><span class="informations">1750×2000 1.21 KB</span><svg class="fa d-icon d-icon-discourse-expand svg-icon" aria-hidden="true"><use xlink:href="#discourse-expand"></use></svg></div></a></div></p>
           HTML
 
           expect(cpp).to be_dirty
@@ -993,7 +979,7 @@ describe CookedPostProcessor do
       cpp = CookedPostProcessor.new(post, disable_loading_image: true)
       cpp.post_process
 
-      doc = Nokogiri::HTML::fragment(cpp.html)
+      doc = Nokogiri::HTML5::fragment(cpp.html)
       expect(doc.css('.lightbox-wrapper').size).to eq(1)
       expect(doc.css('img').first['srcset']).to_not eq(nil)
     end
@@ -1008,7 +994,7 @@ describe CookedPostProcessor do
       cpp = CookedPostProcessor.new(post, disable_loading_image: true)
       cpp.post_process
 
-      doc = Nokogiri::HTML::fragment(cpp.html)
+      doc = Nokogiri::HTML5::fragment(cpp.html)
       expect(doc.css('.lightbox-wrapper').size).to eq(0)
       expect(doc.css('img').first['srcset']).to_not eq(nil)
     end
@@ -1023,7 +1009,7 @@ describe CookedPostProcessor do
       cpp = CookedPostProcessor.new(post, disable_loading_image: true)
       cpp.post_process
 
-      doc = Nokogiri::HTML::fragment(cpp.html)
+      doc = Nokogiri::HTML5::fragment(cpp.html)
       expect(doc.css('.lightbox-wrapper').size).to eq(0)
       expect(doc.css('img').first['srcset']).to_not eq(nil)
     end
@@ -1227,7 +1213,7 @@ describe CookedPostProcessor do
 
     it "uses schemaless url for uploads" do
       cpp.optimize_urls
-      expect(cpp.html).to match_html <<~HTML
+      expect(cpp.html).to match_html <<~HTML.rstrip
         <p><a href="//test.localhost/#{upload_path}/original/2X/2345678901234567.jpg">Link</a><br>
         <img src="//test.localhost/#{upload_path}/original/1X/1234567890123456.jpg"><br>
         <a href="http://www.google.com" rel="nofollow noopener">Google</a><br>
@@ -1242,7 +1228,7 @@ describe CookedPostProcessor do
       it "uses schemaless CDN url for http uploads" do
         Rails.configuration.action_controller.stubs(:asset_host).returns("http://my.cdn.com")
         cpp.optimize_urls
-        expect(cpp.html).to match_html <<~HTML
+        expect(cpp.html).to match_html <<~HTML.rstrip
           <p><a href="//my.cdn.com/#{upload_path}/original/2X/2345678901234567.jpg">Link</a><br>
           <img src="//my.cdn.com/#{upload_path}/original/1X/1234567890123456.jpg"><br>
           <a href="http://www.google.com" rel="nofollow noopener">Google</a><br>
@@ -1255,7 +1241,7 @@ describe CookedPostProcessor do
       it "doesn't use schemaless CDN url for https uploads" do
         Rails.configuration.action_controller.stubs(:asset_host).returns("https://my.cdn.com")
         cpp.optimize_urls
-        expect(cpp.html).to match_html <<~HTML
+        expect(cpp.html).to match_html <<~HTML.rstrip
           <p><a href="https://my.cdn.com/#{upload_path}/original/2X/2345678901234567.jpg">Link</a><br>
           <img src="https://my.cdn.com/#{upload_path}/original/1X/1234567890123456.jpg"><br>
           <a href="http://www.google.com" rel="nofollow noopener">Google</a><br>
@@ -1269,7 +1255,7 @@ describe CookedPostProcessor do
         SiteSetting.login_required = true
         Rails.configuration.action_controller.stubs(:asset_host).returns("http://my.cdn.com")
         cpp.optimize_urls
-        expect(cpp.html).to match_html <<~HTML
+        expect(cpp.html).to match_html <<~HTML.rstrip
           <p><a href="//my.cdn.com/#{upload_path}/original/2X/2345678901234567.jpg">Link</a><br>
           <img src="//my.cdn.com/#{upload_path}/original/1X/1234567890123456.jpg"><br>
           <a href="http://www.google.com" rel="nofollow noopener">Google</a><br>
@@ -1283,7 +1269,7 @@ describe CookedPostProcessor do
         SiteSetting.prevent_anons_from_downloading_files = true
         Rails.configuration.action_controller.stubs(:asset_host).returns("http://my.cdn.com")
         cpp.optimize_urls
-        expect(cpp.html).to match_html <<~HTML
+        expect(cpp.html).to match_html <<~HTML.rstrip
           <p><a href="//my.cdn.com/#{upload_path}/original/2X/2345678901234567.jpg">Link</a><br>
           <img src="//my.cdn.com/#{upload_path}/original/1X/1234567890123456.jpg"><br>
           <a href="http://www.google.com" rel="nofollow noopener">Google</a><br>
@@ -1318,7 +1304,7 @@ describe CookedPostProcessor do
           cpp = CookedPostProcessor.new(the_post)
           cpp.optimize_urls
 
-          expect(cpp.html).to match_html <<~HTML
+          expect(cpp.html).to match_html <<~HTML.rstrip
             <p>This post has a local emoji <img src="https://local.cdn.com/images/emoji/twitter/+1.png?v=#{Emoji::EMOJI_VERSION}" title=":+1:" class="emoji" alt=":+1:"> and an external upload</p>
             <p><img src="https://s3.cdn.com/#{stored_path}" alt="smallest.png" data-base62-sha1="#{upload.base62_sha1}" width="10" height="20"></p>
           HTML
@@ -1336,7 +1322,7 @@ describe CookedPostProcessor do
           cpp = CookedPostProcessor.new(the_post)
           cpp.optimize_urls
 
-          expect(cpp.html).to match_html <<~HTML
+          expect(cpp.html).to match_html <<~HTML.rstrip
             <p>This post has a local emoji <img src="https://local.cdn.com/images/emoji/twitter/+1.png?v=#{Emoji::EMOJI_VERSION}" title=":+1:" class="emoji" alt=":+1:"> and an external upload</p>
             <p><img src="/secure-media-uploads/#{stored_path}" alt="smallest.png" data-base62-sha1="#{upload.base62_sha1}" width="10" height="20"></p>
           HTML
@@ -1357,18 +1343,20 @@ describe CookedPostProcessor do
 
             the_post = Fabricate(:post, raw: "This post has an S3 video onebox:\n#{video_upload.url}")
 
-            cpp = CookedPostProcessor.new(the_post)
+            cpp = CookedPostProcessor.new(the_post.reload)
+            cpp.post_process_oneboxes
+
+            cpp = CookedPostProcessor.new(the_post.reload)
             cpp.post_process_oneboxes
 
             expect(cpp.html).to match_html <<~HTML
-              <p>This post has an S3 video onebox:<br></p>
-              <div class="onebox video-onebox">
-                <video width="100%" height="100%" controls="">
-                  <source src="#{video_upload.url}">
-                    <a href="#{video_upload.url}" rel="nofollow ugc noopener">#{video_upload.url}</a>
-                  </source>
-                </video>
-              </div>
+              <p>This post has an S3 video onebox:<br>
+                        </p><div class="onebox video-onebox">
+                          <video width="100%" height="100%" controls="">
+                            <source src="#{video_upload.url}">
+                            <a href="#{video_upload.url}" rel="nofollow ugc noopener">#{video_upload.url}</a>
+                          </video>
+                        </div>
             HTML
           end
 
@@ -1384,13 +1372,12 @@ describe CookedPostProcessor do
 
             secure_url = video_upload.url.sub(SiteSetting.s3_cdn_url, "#{Discourse.base_url}/secure-media-uploads")
 
-            expect(cpp.html).to match_html <<~HTML
+            expect(cpp.html).to match_html <<~HTML.rstrip
               <p>This post has an S3 video onebox:<br>
               <div class="onebox video-onebox">
                 <video width="100%" height="100%" controls="">
                   <source src="#{secure_url}">
-                    <a href="#{secure_url}">#{secure_url}</a>
-                  </source>
+                  <a href="#{secure_url}">#{secure_url}</a>
                 </video>
               </div>
               </p>
@@ -1416,7 +1403,7 @@ describe CookedPostProcessor do
             stub_request(:head, audio_upload.url)
             stub_request(:get, image_upload.url)
 
-            raw = <<~RAW
+            raw = <<~RAW.rstrip
               This post has a video upload.
               #{video_upload.url}
 
@@ -1435,19 +1422,17 @@ describe CookedPostProcessor do
             secure_video_url = video_upload.url.sub(SiteSetting.s3_cdn_url, "#{Discourse.base_url}/secure-media-uploads")
             secure_audio_url = audio_upload.url.sub(SiteSetting.s3_cdn_url, "#{Discourse.base_url}/secure-media-uploads")
 
-            expect(cpp.html).to match_html <<~HTML
-              <p>This post has a video upload.<br></p>
+            expect(cpp.html).to match_html <<~HTML.rstrip
+              <p>This post has a video upload.<br>
               <div class="onebox video-onebox">
                 <video width="100%" height="100%" controls="">
                   <source src="#{secure_video_url}">
-                    <a href="#{secure_video_url}">#{secure_video_url}</a>
-                  </source>
+                  <a href="#{secure_video_url}">#{secure_video_url}</a>
                 </video>
               </div>
-
-             <p>This post has an audio upload.<br>
-                <audio controls><source src="#{secure_audio_url}"><a href="#{secure_audio_url}">#{secure_audio_url}</a></source></audio>
               </p>
+              <p>This post has an audio upload.<br>
+              <audio controls=""><source src="#{secure_audio_url}"><a href="#{secure_audio_url}">#{secure_audio_url}</a></audio></p>
               <p>And an image upload.<br>
               <img src="#{image_upload.url}" alt="#{image_upload.original_filename}" data-base62-sha1="#{image_upload.base62_sha1}"></p>
 
@@ -1616,7 +1601,7 @@ describe CookedPostProcessor do
 
     let(:post) { build(:post) }
     let(:cpp) { CookedPostProcessor.new(post) }
-    let(:doc) { Nokogiri::HTML::fragment('<body><div><a><img id="linked_image"></a><p><img id="standard_image"></p></div></body>') }
+    let(:doc) { Nokogiri::HTML5::fragment('<body><div><a><img id="linked_image"></a><p><img id="standard_image"></p></div></body>') }
 
     it "is true when the image is inside a link" do
       img = doc.css("img#linked_image").first
diff --git a/spec/components/email/styles_spec.rb b/spec/components/email/styles_spec.rb
index bdcd27aa06..74addfe29d 100644
--- a/spec/components/email/styles_spec.rb
+++ b/spec/components/email/styles_spec.rb
@@ -8,14 +8,14 @@ describe Email::Styles do
   def basic_fragment(html)
     styler = Email::Styles.new(html)
     styler.format_basic
-    Nokogiri::HTML.fragment(styler.to_html)
+    Nokogiri::HTML5.fragment(styler.to_html)
   end
 
   def html_fragment(html)
     styler = Email::Styles.new(html)
     styler.format_basic
     styler.format_html
-    Nokogiri::HTML.fragment(styler.to_html)
+    Nokogiri::HTML5.fragment(styler.to_html)
   end
 
   context "basic formatter" do
diff --git a/spec/components/excerpt_parser_spec.rb b/spec/components/excerpt_parser_spec.rb
index 8f0654bab5..363dd049e0 100644
--- a/spec/components/excerpt_parser_spec.rb
+++ b/spec/components/excerpt_parser_spec.rb
@@ -18,7 +18,7 @@ describe ExcerptParser do
       </details>
     HTML
 
-    expect(ExcerptParser.get_excerpt(html, 50, {})).to match_html(<<~HTML)
+    expect(ExcerptParser.get_excerpt(html, 50, {})).to match_html(<<~HTML.rstrip)
       <details><summary>FOO</summary>BAR
       Lorem ipsum dolor sit amet, consectetur adi&hellip;</details>
     HTML
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index 784b607972..8969a526bd 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -184,7 +184,7 @@ describe PrettyText do
           <aside class="quote no-group" data-username="#{user.username}" data-post="123" data-topic="456" data-full="true">
           <div class="title">
           <div class="quote-controls"></div>
-          <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
+          <img alt="" width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
           <blockquote>
           <p>ddd</p>
           </blockquote>
@@ -206,7 +206,7 @@ describe PrettyText do
           <aside class="quote no-group" data-username="#{user.username}" data-post="123" data-topic="456" data-full="true">
           <div class="title">
           <div class="quote-controls"></div>
-          <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
+          <img alt="" width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
           <blockquote>
           <p>ddd</p>
           </blockquote>
@@ -227,7 +227,7 @@ describe PrettyText do
           <aside class="quote no-group" data-username="#{user.username}" data-post="555" data-topic="666">
           <div class="title">
           <div class="quote-controls"></div>
-          <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
+          <img alt="" width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
           <blockquote>
           <p>ddd</p>
           </blockquote>
@@ -254,7 +254,7 @@ describe PrettyText do
           <aside class="quote group-#{group.name}" data-username="#{user.username}" data-post="2" data-topic="#{topic.id}">
           <div class="title">
           <div class="quote-controls"></div>
-          <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"><a href="http://test.localhost/t/this-is-a-test-topic/#{topic.id}/2">This is a test topic</a>
+          <img alt="" width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"><a href="http://test.localhost/t/this-is-a-test-topic/#{topic.id}/2">This is a test topic</a>
           </div>
           <blockquote>
           <p>ddd</p>
@@ -828,7 +828,7 @@ describe PrettyText do
 
   describe "strip_image_wrapping" do
     def strip_image_wrapping(html)
-      doc = Nokogiri::HTML.fragment(html)
+      doc = Nokogiri::HTML5.fragment(html)
       described_class.strip_image_wrapping(doc)
       doc.to_html
     end
@@ -1122,7 +1122,7 @@ describe PrettyText do
   it "can handle mixed lists" do
     # known bug in old md engine
     cooked = PrettyText.cook("* a\n\n1. b")
-    expect(cooked).to match_html("<ul>\n<li>a</li>\n</ul><ol>\n<li>b</li>\n</ol>")
+    expect(cooked).to match_html("<ul>\n<li>a</li>\n</ul>\n<ol>\n<li>b</li>\n</ol>")
   end
 
   it "can handle traditional vs non traditional newlines" do
@@ -1342,13 +1342,13 @@ HTML
 
   it "supports img bbcode" do
     cooked = PrettyText.cook "[img]http://www.image/test.png[/img]"
-    html = "<p><img src=\"http://www.image/test.png\" alt></p>"
+    html = "<p><img src=\"http://www.image/test.png\" alt=\"\"></p>"
     expect(cooked).to eq(html)
   end
 
   it "provides safety for img bbcode" do
     cooked = PrettyText.cook "[img]http://aaa.com<script>alert(1);</script>[/img]"
-    html = '<p><img src="http://aaa.com&lt;script&gt;alert(1);&lt;/script&gt;" alt></p>'
+    html = '<p><img src="http://aaa.com&lt;script&gt;alert(1);&lt;/script&gt;" alt=""></p>'
     expect(cooked).to eq(html)
   end
 
@@ -1433,10 +1433,10 @@ HTML
 
       html = <<~HTML
         <p><img src="http://png.com/my.png" alt="title with | title" width="220" height="100"><br>
-        <img src="http://png.com/my.png" alt><br>
-        <img src="http://png.com/my.png" alt width="220" height="100"><br>
+        <img src="http://png.com/my.png" alt=""><br>
+        <img src="http://png.com/my.png" alt="" width="220" height="100"><br>
         <img src="http://png.com/my.png" alt="stuff"><br>
-        <img src="http://png.com/my.png" alt title="some title" width="110" height="50"></p>
+        <img src="http://png.com/my.png" alt="" title="some title" width="110" height="50"></p>
       HTML
 
       expect(cooked).to eq(html.strip)
@@ -1452,11 +1452,11 @@ HTML
       MD
 
       html = <<~HTML
-        <p><img src="http://png.com/my.png" alt width="110" height="50"><br>
-        <img src="http://png.com/my.png" alt width="110" height="50"><br>
-        <img src="http://png.com/my.png" alt width="110" height="50"><br>
-        <img src="http://png.com/my.png" alt width="150" height="68"><br>
-        <img src="http://png.com/my.png" alt width="110" height="50"></p>
+        <p><img src="http://png.com/my.png" alt="" width="110" height="50"><br>
+        <img src="http://png.com/my.png" alt="" width="110" height="50"><br>
+        <img src="http://png.com/my.png" alt="" width="110" height="50"><br>
+        <img src="http://png.com/my.png" alt="" width="150" height="68"><br>
+        <img src="http://png.com/my.png" alt="" width="110" height="50"></p>
       HTML
 
       expect(cooked).to eq(html.strip)
diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index 168887cd47..4196b29d66 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -217,9 +217,9 @@ describe ContentSecurityPolicy do
       policy # call this first to make sure further actions clear the cache
 
       theme.set_field(target: :common, name: "header", value: <<~SCRIPT)
-        <script src='https://example.com/myscript.js'/>
-        <script src='//example2.com/protocol-less-script.js'/>
-        <script src='domain-only.com'/>
+        <script src='https://example.com/myscript.js'></script>
+        <script src='//example2.com/protocol-less-script.js'></script>
+        <script src='domain-only.com'></script>
         <script>console.log('inline script')</script>
       SCRIPT
 
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index c45a2209e1..ddfbe115ec 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -14,7 +14,7 @@ describe TopicEmbed do
     fab!(:user) { Fabricate(:user) }
     let(:title) { "How to turn a fish from good to evil in 30 seconds" }
     let(:url) { 'http://eviltrout.com/123' }
-    let(:contents) { "hello world new post <a href='/hello'>hello</a> <img src='/images/wat.jpg'>" }
+    let(:contents) { "<p>hello world new post <a href='/hello'>hello</a> <img src='/images/wat.jpg'></p>" }
     fab!(:embeddable_host) { Fabricate(:embeddable_host) }
 
     it "returns nil when the URL is malformed" do
@@ -46,7 +46,7 @@ describe TopicEmbed do
 
       it "Supports updating the post content" do
         expect do
-          TopicEmbed.import(user, url, "New title received", "muhahaha new contents!")
+          TopicEmbed.import(user, url, "New title received", "<p>muhahaha new contents!</p>")
         end.to change { topic_embed.reload.content_sha1 }
         expect(topic_embed.topic.title).to eq("New title received")
 
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index 97293742d3..e4b0cec35c 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -11,7 +11,7 @@ describe CategoriesController do
     it 'web crawler view has correct urls for subfolder install' do
       set_subfolder "/forum"
       get '/categories', headers: { 'HTTP_USER_AGENT' => 'Googlebot' }
-      html = Nokogiri::HTML(response.body)
+      html = Nokogiri::HTML5(response.body)
       expect(html.css('body.crawler')).to be_present
       expect(html.css("a[href=\"/forum/c/#{category.slug}\"]")).to be_present
     end
diff --git a/spec/requests/email_controller_spec.rb b/spec/requests/email_controller_spec.rb
index 10658907b6..ec60265f66 100644
--- a/spec/requests/email_controller_spec.rb
+++ b/spec/requests/email_controller_spec.rb
@@ -231,7 +231,7 @@ RSpec.describe EmailController do
 
         navigate_to_unsubscribe
 
-        source = Nokogiri::HTML::fragment(response.body)
+        source = Nokogiri::HTML5::fragment(response.body)
         expect(source.css(".combobox option").map(&:inner_text)).to eq(slow_digest_frequencies)
       end
 
@@ -242,7 +242,7 @@ RSpec.describe EmailController do
 
         navigate_to_unsubscribe
 
-        source = Nokogiri::HTML::fragment(response.body)
+        source = Nokogiri::HTML5::fragment(response.body)
         expect(source.css(".combobox option[selected='selected']")[0]['value']).to eq(six_months_freq.to_s)
       end
 
@@ -253,7 +253,7 @@ RSpec.describe EmailController do
 
         navigate_to_unsubscribe
 
-        source = Nokogiri::HTML::fragment(response.body)
+        source = Nokogiri::HTML5::fragment(response.body)
         expect(source.css(".combobox option[selected='selected']")[0]['value']).to eq(never_frequency.to_s)
       end
     end
diff --git a/spec/requests/embed_controller_spec.rb b/spec/requests/embed_controller_spec.rb
index 71d6eef807..ac0d6c3aa8 100644
--- a/spec/requests/embed_controller_spec.rb
+++ b/spec/requests/embed_controller_spec.rb
@@ -146,7 +146,7 @@ describe EmbedController do
 
       get '/embed/comments', params: { embed_url: embed_url }, headers: headers
 
-      html = Nokogiri::HTML.fragment(response.body)
+      html = Nokogiri::HTML5.fragment(response.body)
       css_link = html.at("link[data-target=embedded_theme]").attribute("href").value
 
       get css_link
diff --git a/spec/requests/user_api_keys_controller_spec.rb b/spec/requests/user_api_keys_controller_spec.rb
index 8148bef88a..c612eb55a1 100644
--- a/spec/requests/user_api_keys_controller_spec.rb
+++ b/spec/requests/user_api_keys_controller_spec.rb
@@ -238,7 +238,7 @@ describe UserApiKeysController do
       SiteSetting.min_trust_level_for_user_api_key = 0
       post "/user-api-key", params: args
       expect(response.status).not_to eq(302)
-      payload = Nokogiri::HTML(response.body).at('code').content
+      payload = Nokogiri::HTML5(response.body).at('code').content
       encrypted = Base64.decode64(payload)
       key = OpenSSL::PKey::RSA.new(private_key)
       parsed = JSON.parse(key.private_decrypt(encrypted))
diff --git a/spec/services/username_changer_spec.rb b/spec/services/username_changer_spec.rb
index 0013c82a94..416c986ca9 100644
--- a/spec/services/username_changer_spec.rb
+++ b/spec/services/username_changer_spec.rb
@@ -142,7 +142,7 @@ describe UsernameChanger do
           post = create_post_and_change_username(raw: ".@foo -@foo %@foo _@foo ,@foo ;@foo @@foo")
 
           expect(post.raw).to eq(".@bar -@bar %@bar _@bar ,@bar ;@bar @@bar")
-          expect(post.cooked).to match_html(<<~HTML)
+          expect(post.cooked).to match_html(<<~HTML.rstrip)
             <p>.<a class="mention" href="/u/bar">@bar</a>
                -<a class="mention" href="/u/bar">@bar</a>
                %<a class="mention" href="/u/bar">@bar</a>
@@ -164,7 +164,7 @@ describe UsernameChanger do
           post = create_post_and_change_username(raw: "**@foo** *@foo* _@foo_ ~~@foo~~")
 
           expect(post.raw).to eq("**@bar** *@bar* _@bar_ ~~@bar~~")
-          expect(post.cooked).to match_html(<<~HTML)
+          expect(post.cooked).to match_html(<<~HTML.rstrip)
             <p><strong><a class="mention" href="/u/bar">@bar</a></strong>
                <em><a class="mention" href="/u/bar">@bar</a></em>
                <em><a class="mention" href="/u/bar">@bar</a></em>
@@ -176,7 +176,7 @@ describe UsernameChanger do
           post = create_post_and_change_username(raw: "@foo. @foo, @foo: @foo; @foo_ @foo-")
 
           expect(post.raw).to eq("@bar. @bar, @bar: @bar; @bar_ @bar-")
-          expect(post.cooked).to match_html(<<~HTML)
+          expect(post.cooked).to match_html(<<~HTML.rstrip)
             <p><a class="mention" href="/u/bar">@bar</a>.
                <a class="mention" href="/u/bar">@bar</a>,
                <a class="mention" href="/u/bar">@bar</a>:
@@ -220,12 +220,8 @@ describe UsernameChanger do
           post = create_post_and_change_username(raw: "@foo @foobar @foo-bar @foo_bar @foo1")
 
           expect(post.raw).to eq("@bar @foobar @foo-bar @foo_bar @foo1")
-          expect(post.cooked).to match_html(<<~HTML)
-            <p><a class="mention" href="/u/bar">@bar</a>
-               <a class="mention" href="/u/foobar">@foobar</a>
-               <a class="mention" href="/u/foo-bar">@foo-bar</a>
-               <a class="mention" href="/u/foo_bar">@foo_bar</a>
-               <a class="mention" href="/u/foo1">@foo1</a></p>
+          expect(post.cooked).to match_html(<<~HTML.rstrip)
+            <p><a class="mention" href="/u/bar">@bar</a> <a class="mention" href="/u/foobar">@foobar</a> <a class="mention" href="/u/foo-bar">@foo-bar</a> <a class="mention" href="/u/foo_bar">@foo_bar</a> <a class="mention" href="/u/foo1">@foo1</a></p>
           HTML
         end
 
@@ -311,12 +307,8 @@ describe UsernameChanger do
             post = create_post_and_change_username(raw: "@թռչուն @թռչուն鳥 @թռչուն-鳥 @թռչուն_鳥 @թռչուն٩", target_username: 'птица')
 
             expect(post.raw).to eq("@птица @թռչուն鳥 @թռչուն-鳥 @թռչուն_鳥 @թռչուն٩")
-            expect(post.cooked).to match_html(<<~HTML)
-              <p><a class="mention" href="/u/%D0%BF%D1%82%D0%B8%D1%86%D0%B0">@птица</a>
-                 <a class="mention" href="/u/%D5%A9%D5%BC%D5%B9%D5%B8%D6%82%D5%B6%E9%B3%A5">@թռչուն鳥</a>
-                 <a class="mention" href="/u/%D5%A9%D5%BC%D5%B9%D5%B8%D6%82%D5%B6-%E9%B3%A5">@թռչուն-鳥</a>
-                 <a class="mention" href="/u/%D5%A9%D5%BC%D5%B9%D5%B8%D6%82%D5%B6_%E9%B3%A5">@թռչուն_鳥</a>
-                 <a class="mention" href="/u/%D5%A9%D5%BC%D5%B9%D5%B8%D6%82%D5%B6%D9%A9">@թռչուն٩</a></p>
+            expect(post.cooked).to match_html(<<~HTML.rstrip)
+              <p><a class="mention" href="/u/%D0%BF%D1%82%D0%B8%D1%86%D0%B0">@птица</a> <a class="mention" href="/u/%D5%A9%D5%BC%D5%B9%D5%B8%D6%82%D5%B6%E9%B3%A5">@թռչուն鳥</a> <a class="mention" href="/u/%D5%A9%D5%BC%D5%B9%D5%B8%D6%82%D5%B6-%E9%B3%A5">@թռչուն-鳥</a> <a class="mention" href="/u/%D5%A9%D5%BC%D5%B9%D5%B8%D6%82%D5%B6_%E9%B3%A5">@թռչուն_鳥</a> <a class="mention" href="/u/%D5%A9%D5%BC%D5%B9%D5%B8%D6%82%D5%B6%D9%A9">@թռչուն٩</a></p>
             HTML
           end
 
@@ -364,7 +356,7 @@ describe UsernameChanger do
             dolor sit amet
           RAW
 
-          expect(post.cooked).to match_html(<<~HTML)
+          expect(post.cooked).to match_html(<<~HTML.rstrip)
             <p>Lorem ipsum</p>
             <aside class="quote no-group" data-username="bar" data-post="1" data-topic="#{quoted_post.topic.id}">
             <div class="title">
@@ -377,7 +369,7 @@ describe UsernameChanger do
             <aside class="quote no-group" data-username="bar">
             <div class="title">
             <div class="quote-controls"></div>
-            <img alt='' width="20" height="20" src="#{avatar_url}" class="avatar"> bar:</div>
+            <img alt="" width="20" height="20" src="#{avatar_url}" class="avatar"> bar:</div>
             <blockquote>
             <p>quoted post</p>
             </blockquote>
@@ -385,7 +377,7 @@ describe UsernameChanger do
             <aside class="quote no-group" data-username="bar" data-post="1" data-topic="#{quoted_post.topic.id}">
             <div class="title">
             <div class="quote-controls"></div>
-            <img alt='' width="20" height="20" src="#{avatar_url}" class="avatar"> bar:</div>
+            <img alt="" width="20" height="20" src="#{avatar_url}" class="avatar"> bar:</div>
             <blockquote>
             <p>quoted post</p>
             </blockquote>
@@ -415,7 +407,7 @@ describe UsernameChanger do
           end
 
           let(:expected_cooked) do
-            <<~HTML
+            <<~HTML.rstrip
               <p>Lorem ipsum</p>
               <aside class="quote no-group" data-username="bar" data-post="1" data-topic="#{quoted_post.topic.id}">
               <div class="title">
@@ -459,7 +451,7 @@ describe UsernameChanger do
 
           expect(post.raw).to eq(raw)
 
-          expect(post.cooked).to match_html(<<~HTML)
+          expect(post.cooked).to match_html(<<~HTML.rstrip)
             <p><aside class="quote" data-post="#{quoted_post.post_number}" data-topic="#{quoted_post.topic.id}">
               <div class="title">
                 <div class="quote-controls"></div>
@@ -491,7 +483,7 @@ describe UsernameChanger do
 
           expect(post.raw).to eq(raw)
 
-          expect(post.cooked).to match_html(<<~HTML)
+          expect(post.cooked).to match_html(<<~HTML.rstrip)
             <p><aside class="quote" data-post="#{quoted_post.post_number}" data-topic="#{quoted_post.topic.id}">
               <div class="title">
                 <div class="quote-controls"></div>
diff --git a/spec/support/match_html_matcher.rb b/spec/support/match_html_matcher.rb
index c6b6b77102..94519530e7 100644
--- a/spec/support/match_html_matcher.rb
+++ b/spec/support/match_html_matcher.rb
@@ -17,7 +17,7 @@ RSpec::Matchers.define :match_html do |expected|
   end
 
   def make_canonical_html(html)
-    Nokogiri::HTML(html) { |config| config.options = Nokogiri::XML::ParseOptions::NOBLANKS | Nokogiri::XML::ParseOptions::COMPACT }
+    Nokogiri::HTML5(html) { |config| config[:options] = Nokogiri::XML::ParseOptions::NOBLANKS | Nokogiri::XML::ParseOptions::COMPACT }
   end
 
 end

From 6aa90145097202c2a2b978a21397fb45b4472385 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 5 May 2020 14:56:04 +1000
Subject: [PATCH 0936/1830] UX: Bookmark removal tweaks (#9635)

* Do not show confirmation modal if deleting bookmark from list unless the bookmark has a reminder
* Remove the deleted bookmark from the in-memory array for the user list so a full reload of the list is not needed and scrolling is maintained
---
 .../controllers/user-activity-bookmarks.js    | 14 +++++++++-
 .../acceptance/user-bookmarks-test.js         | 26 ++++++++++++++++---
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
index a24269d235..0f44eeea8c 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
@@ -38,11 +38,23 @@ export default Controller.extend({
     return loaded && contentLength === 0 && noResultsHelp;
   },
 
+  _removeBookmarkFromList(bookmark) {
+    this.content.removeObject(bookmark);
+  },
+
   @action
   removeBookmark(bookmark) {
+    const deleteBookmark = () => {
+      return bookmark
+        .destroy()
+        .then(() => this._removeBookmarkFromList(bookmark));
+    };
+    if (!bookmark.reminder_at) {
+      return deleteBookmark();
+    }
     bootbox.confirm(I18n.t("bookmarks.confirm_delete"), result => {
       if (result) {
-        return bookmark.destroy().then(() => this.loadItems());
+        return deleteBookmark();
       }
     });
   },
diff --git a/test/javascripts/acceptance/user-bookmarks-test.js b/test/javascripts/acceptance/user-bookmarks-test.js
index 3a276810c8..51dead8606 100644
--- a/test/javascripts/acceptance/user-bookmarks-test.js
+++ b/test/javascripts/acceptance/user-bookmarks-test.js
@@ -1,6 +1,7 @@
 import { acceptance } from "helpers/qunit-helpers";
 import selectKit from "helpers/select-kit-helper";
 import pretender from "helpers/create-pretender";
+import userFixtures from "fixtures/user_fixtures";
 
 acceptance("User's bookmarks", {
   loggedIn: true,
@@ -20,16 +21,25 @@ test("listing user bookmarks", async assert => {
   assert.ok(find(".bookmark-list-item").length);
 });
 
-test("removing a bookmark", async assert => {
+test("removing a bookmark with a reminder shows a confirmation", async assert => {
+  let listResponse = _.clone(userFixtures["/u/eviltrout/bookmarks.json"]);
+  listResponse.user_bookmark_list.bookmarks[0].reminder_at = "2028-01-01T08:00";
+  pretender.get("/u/eviltrout/bookmarks.json", () => [
+    200,
+    { "Content-Type": "application/json" },
+    listResponse
+  ]);
   await visit("/u/eviltrout/activity/bookmarks");
 
   const dropdown = selectKit(".bookmark-actions-dropdown");
   await dropdown.expand();
   await dropdown.selectRowByValue("remove");
 
-  assert.ok(exists(".bootbox.modal"));
+  assert.ok(exists(".bootbox.modal"), "it asks for delete confirmation");
 
-  await click(".bootbox.modal .btn-primary");
+  await click(".bootbox.modal a.btn-primary");
+  assert.not(exists(".bootbox.modal"));
+  listResponse.user_bookmark_list.bookmarks[0].reminder_at = null;
 });
 
 test("listing users bookmarks - no bookmarks", async assert => {
@@ -48,3 +58,13 @@ test("listing users bookmarks - no bookmarks", async assert => {
 
   assert.equal(find(".alert.alert-info").text(), "no bookmarks");
 });
+
+test("removing a bookmark with no reminder does not show a confirmation", async assert => {
+  await visit("/u/eviltrout/activity/bookmarks");
+
+  const dropdown = selectKit(".bookmark-actions-dropdown");
+  await dropdown.expand();
+  await dropdown.selectRowByValue("remove");
+
+  assert.not(exists(".bootbox.modal"), "it should not show the modal");
+});

From 5cf6984a1a1096d85c3edac22a78c4a20dbc7cb4 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 5 May 2020 16:28:31 +1000
Subject: [PATCH 0937/1830] FIX: Pre-select Later Today on bookmark edit if the
 time is the same (#9636)

If the user chooses "Later Today" as the reminder for a bookmark, then edits that bookmark, we should pre-select "Later Today" if that time has not changed (e.g. later is still 6pm). We do this to avoid confusion instead of opening the custom date + time section.
---
 .../discourse/app/controllers/bookmark.js      |  5 +++++
 test/javascripts/acceptance/bookmarks-test.js  | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/controllers/bookmark.js b/app/assets/javascripts/discourse/app/controllers/bookmark.js
index cd071c6bb4..38ce4c76ad 100644
--- a/app/assets/javascripts/discourse/app/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/app/controllers/bookmark.js
@@ -103,6 +103,11 @@ export default Controller.extend(ModalFunctionality, {
   _initializeExistingBookmarkData() {
     if (this._existingBookmarkHasReminder()) {
       let parsedReminderAt = this._parseCustomDateTime(this.model.reminderAt);
+
+      if (parsedReminderAt.isSame(this.laterToday())) {
+        return this.set("selectedReminderType", REMINDER_TYPES.LATER_TODAY);
+      }
+
       this.setProperties({
         customReminderDate: parsedReminderAt.format("YYYY-MM-DD"),
         customReminderTime: parsedReminderAt.format("HH:mm"),
diff --git a/test/javascripts/acceptance/bookmarks-test.js b/test/javascripts/acceptance/bookmarks-test.js
index 7bde21a515..51d1706a4d 100644
--- a/test/javascripts/acceptance/bookmarks-test.js
+++ b/test/javascripts/acceptance/bookmarks-test.js
@@ -195,3 +195,21 @@ test("Editing a bookmark", async assert => {
   );
   assert.verifySteps(["tomorrow"]);
 });
+
+test("Editing a bookmark that has a Later Today reminder, and it is before 6pm today", async assert => {
+  mockSuccessfulBookmarkPost(assert);
+  await visit("/t/internationalization-localization/280");
+  await openBookmarkModal();
+  await fillIn("input#bookmark-name", "Test name");
+  await click("#tap_tile_later_today");
+  await openEditBookmarkModal();
+  assert.not(
+    exists("#bookmark-custon-date > input"),
+    "it does not show the custom date input"
+  );
+  assert.ok(
+    exists("#tap_tile_later_today.active"),
+    "it preselects Later Today"
+  );
+  assert.verifySteps(["later_today"]);
+});

From 03818e642a1ae871bffdc0c39c10f05f0b8b0398 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 5 May 2020 09:07:50 +0100
Subject: [PATCH 0938/1830] FEATURE: Include optimized thumbnails for topics
 (#9215)

This introduces new APIs for obtaining optimized thumbnails for topics. There are a few building blocks required for this:

- Introduces new `image_upload_id` columns on the `posts` and `topics` table. This replaces the old `image_url` column, which means that thumbnails are now restricted to uploads. Hotlinked thumbnails are no longer possible. In normal use (with pull_hotlinked_images enabled), this has no noticeable impact

- A migration attempts to match existing urls to upload records. If a match cannot be found then the posts will be queued for rebake

- Optimized thumbnails are generated during post_process_cooked. If thumbnails are missing when serializing a topic list, then a sidekiq job is queued

- Topic lists and topics now include a `thumbnails` key, which includes all the available images:
   ```
   "thumbnails": [
   {
     "max_width": null,
     "max_height": null,
     "url": "//example.com/original-image.png",
     "width": 1380,
     "height": 1840
   },
   {
     "max_width": 1024,
     "max_height": 1024,
     "url": "//example.com/optimized-image.png",
     "width": 768,
     "height": 1024
   }
   ]
  ```

- Themes can request additional thumbnail sizes by using a modifier in their `about.json` file:
   ```
    "modifiers": {
      "topic_thumbnail_sizes": [
        [200, 200],
        [800, 800]
      ],
      ...
  ```
  Remember that these are generated asynchronously, so your theme should include logic to fallback to other available thumbnails if your requested size has not yet been generated

- Two new raw plugin outlets are introduced, to improve the customisability of the topic list. `topic-list-before-columns` and `topic-list-before-link`
---
 .../app/templates/list/topic-list-item.hbr    |  3 +
 .../templates/mobile/list/topic-list-item.hbr |  2 +
 app/jobs/regular/generate_topic_thumbnails.rb | 18 ++++
 app/jobs/scheduled/ensure_db_consistency.rb   |  3 +-
 app/models/post.rb                            |  8 ++
 app/models/theme_modifier_set.rb              | 35 +++++--
 app/models/topic.rb                           | 82 ++++++++++++++++
 app/models/topic_thumbnail.rb                 | 60 ++++++++++++
 app/models/upload.rb                          |  1 +
 app/serializers/listable_topic_serializer.rb  | 12 ++-
 app/serializers/topic_view_serializer.rb      |  6 ++
 ...9095034_add_topic_thumbnail_information.rb | 19 ++++
 ...35_migrate_image_url_to_image_upload_id.rb | 95 +++++++++++++++++++
 lib/cooked_post_processor.rb                  | 26 +++--
 lib/search.rb                                 |  2 +-
 lib/topic_query.rb                            |  6 ++
 spec/components/cooked_post_processor_spec.rb | 43 ++++++---
 spec/components/search_spec.rb                |  4 +-
 spec/components/topic_view_spec.rb            | 21 ++--
 spec/fabricators/post_fabricator.rb           |  2 +-
 spec/integration/topic_thumbnail_spec.rb      | 88 +++++++++++++++++
 spec/lib/db_helper_spec.rb                    |  9 --
 spec/models/topic_thumbnail_spec.rb           | 46 +++++++++
 .../serializers/topic_view_serializer_spec.rb | 28 +++++-
 .../web_hook_topic_view_serializer_spec.rb    |  1 +
 25 files changed, 563 insertions(+), 57 deletions(-)
 create mode 100644 app/jobs/regular/generate_topic_thumbnails.rb
 create mode 100644 app/models/topic_thumbnail.rb
 create mode 100644 db/migrate/20200429095034_add_topic_thumbnail_information.rb
 create mode 100644 db/migrate/20200429095035_migrate_image_url_to_image_upload_id.rb
 create mode 100644 spec/integration/topic_thumbnail_spec.rb
 create mode 100644 spec/models/topic_thumbnail_spec.rb

diff --git a/app/assets/javascripts/discourse/app/templates/list/topic-list-item.hbr b/app/assets/javascripts/discourse/app/templates/list/topic-list-item.hbr
index ab05872ece..03ea153bb0 100644
--- a/app/assets/javascripts/discourse/app/templates/list/topic-list-item.hbr
+++ b/app/assets/javascripts/discourse/app/templates/list/topic-list-item.hbr
@@ -1,3 +1,5 @@
+{{~raw-plugin-outlet name="topic-list-before-columns"}}
+
 {{#if bulkSelectEnabled}}
   <td class="bulk-select">
     <input type="checkbox" class="bulk-select">
@@ -12,6 +14,7 @@
   at the end of the link, preventing it from line wrapping onto its own line.
 --}}
 <td class='main-link clearfix' colspan="1">
+  {{~raw-plugin-outlet name="topic-list-before-link"}}
   <span class='link-top-line'>
     {{~raw-plugin-outlet name="topic-list-before-status"}}
     {{~raw "topic-status" topic=topic}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr b/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr
index c126de0924..6c4663b83d 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr
+++ b/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr
@@ -1,4 +1,5 @@
 <td>
+  {{~raw-plugin-outlet name="topic-list-before-columns"}}
   {{~#unless expandPinned}}
   <div class='pull-left'>
     <a href="{{topic.lastPostUrl}}" data-user-card="{{topic.last_poster_username}}">{{avatar topic.lastPosterUser imageSize="large"}}</a>
@@ -14,6 +15,7 @@
           This causes the topic-post-badge to be considered the same word as "text"
           at the end of the link, preventing it from line wrapping onto its own line.
         --}}
+        {{~raw-plugin-outlet name="topic-list-before-link"}}
         <div class='main-link'>
           {{~raw-plugin-outlet name="topic-list-before-status"}}
           {{~raw "topic-status" topic=topic~}}
diff --git a/app/jobs/regular/generate_topic_thumbnails.rb b/app/jobs/regular/generate_topic_thumbnails.rb
new file mode 100644
index 0000000000..a01452670c
--- /dev/null
+++ b/app/jobs/regular/generate_topic_thumbnails.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Jobs
+  class GenerateTopicThumbnails < ::Jobs::Base
+    sidekiq_options queue: 'ultra_low'
+
+    def execute(args)
+      topic_id = args[:topic_id]
+      extra_sizes = args[:extra_sizes]
+
+      raise Discourse::InvalidParameters.new(:topic_id) if topic_id.blank?
+
+      topic = Topic.find(topic_id)
+      topic.generate_thumbnails!(extra_sizes: extra_sizes)
+    end
+
+  end
+end
diff --git a/app/jobs/scheduled/ensure_db_consistency.rb b/app/jobs/scheduled/ensure_db_consistency.rb
index 6d7f3fbbb8..6c21814fa0 100644
--- a/app/jobs/scheduled/ensure_db_consistency.rb
+++ b/app/jobs/scheduled/ensure_db_consistency.rb
@@ -22,7 +22,8 @@ module Jobs
         CategoryTagStat,
         User,
         UserAvatar,
-        Category
+        Category,
+        TopicThumbnail
       ].each do |klass|
         klass.ensure_consistency!
         measure(klass)
diff --git a/app/models/post.rb b/app/models/post.rb
index f2ee10543f..c2f80c8c6f 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -51,6 +51,8 @@ class Post < ActiveRecord::Base
 
   has_many :user_actions, foreign_key: :target_post_id
 
+  belongs_to :image_upload, class_name: "Upload"
+
   validates_with PostValidator, unless: :skip_validation
 
   after_save :index_search
@@ -1062,6 +1064,10 @@ class Post < ActiveRecord::Base
     Upload.where(access_control_post_id: self.id)
   end
 
+  def image_url
+    image_upload&.url
+  end
+
   private
 
   def parse_quote_into_arguments(quote)
@@ -1144,6 +1150,7 @@ end
 #  action_code             :string
 #  image_url               :string
 #  locked_by_id            :integer
+#  image_upload_id         :bigint
 #
 # Indexes
 #
@@ -1152,6 +1159,7 @@ end
 #  idx_posts_user_id_deleted_at              (user_id) WHERE (deleted_at IS NULL)
 #  index_for_rebake_old                      (id) WHERE (((baked_version IS NULL) OR (baked_version < 2)) AND (deleted_at IS NULL))
 #  index_posts_on_id_and_baked_version       (id DESC,baked_version) WHERE (deleted_at IS NULL)
+#  index_posts_on_image_upload_id            (image_upload_id)
 #  index_posts_on_reply_to_post_number       (reply_to_post_number)
 #  index_posts_on_topic_id_and_percent_rank  (topic_id,percent_rank)
 #  index_posts_on_topic_id_and_post_number   (topic_id,post_number) UNIQUE
diff --git a/app/models/theme_modifier_set.rb b/app/models/theme_modifier_set.rb
index 99a8818f58..9fae7faf54 100644
--- a/app/models/theme_modifier_set.rb
+++ b/app/models/theme_modifier_set.rb
@@ -12,7 +12,7 @@ class ThemeModifierSet < ActiveRecord::Base
 
   def type_validator
     ThemeModifierSet.modifiers.each do |k, config|
-      value = public_send(k)
+      value = read_attribute(k)
       next if value.nil?
 
       case config[:type]
@@ -39,7 +39,7 @@ class ThemeModifierSet < ActiveRecord::Base
   def self.resolve_modifier_for_themes(theme_ids, modifier_name)
     return nil if !(config = self.modifiers[modifier_name])
 
-    all_values = self.where(theme_id: theme_ids).where.not(modifier_name => nil).pluck(modifier_name)
+    all_values = self.where(theme_id: theme_ids).where.not(modifier_name => nil).map { |s| s.public_send(modifier_name) }
     case config[:type]
     when :boolean
       all_values.any?
@@ -50,6 +50,26 @@ class ThemeModifierSet < ActiveRecord::Base
     end
   end
 
+  def topic_thumbnail_sizes
+    array = read_attribute(:topic_thumbnail_sizes)
+
+    return if array.nil?
+
+    array.map do |dimension|
+      parts = dimension.split("x")
+      next if parts.length != 2
+      [parts[0].to_i, parts[1].to_i]
+    end.filter(&:present?)
+  end
+
+  def topic_thumbnail_sizes=(val)
+    return write_attribute(:topic_thumbnail_sizes, val) if val.nil?
+    return write_attribute(:topic_thumbnail_sizes, val) if !val.is_a?(Array)
+    return write_attribute(:topic_thumbnail_sizes, val) if !val.all? { |v| v.is_a?(Array) && v.length == 2 }
+
+    super(val.map { |dim| "#{dim[0]}x#{dim[1]}" })
+  end
+
   private
 
   # Build the list of modifiers from the DB schema.
@@ -78,11 +98,12 @@ end
 #
 # Table name: theme_modifier_sets
 #
-#  id                       :bigint           not null, primary key
-#  theme_id                 :bigint           not null
-#  serialize_topic_excerpts :boolean
-#  csp_extensions           :string           is an Array
-#  svg_icons                :string           is an Array
+#  id                               :bigint           not null, primary key
+#  theme_id                         :bigint           not null
+#  serialize_topic_excerpts         :boolean
+#  csp_extensions                   :string           is an Array
+#  svg_icons                        :string           is an Array
+#  topic_thumbnail_sizes            :string           is an Array
 #
 # Indexes
 #
diff --git a/app/models/topic.rb b/app/models/topic.rb
index aaeca3f145..371f32d570 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -28,6 +28,83 @@ class Topic < ActiveRecord::Base
     400
   end
 
+  def self.share_thumbnail_size
+    [1024, 1024]
+  end
+
+  def self.thumbnail_sizes
+    [ self.share_thumbnail_size ]
+  end
+
+  def thumbnail_job_redis_key(extra_sizes)
+    "generate_topic_thumbnail_enqueue_#{id}_#{extra_sizes.inspect}"
+  end
+
+  def filtered_topic_thumbnails(extra_sizes: [])
+    return nil unless original = image_upload
+    return nil unless original.width && original.height
+
+    thumbnail_sizes = Topic.thumbnail_sizes + extra_sizes
+    topic_thumbnails.filter { |record| thumbnail_sizes.include?([record.max_width, record.max_height]) }
+  end
+
+  def thumbnail_info(enqueue_if_missing: false, extra_sizes: [])
+    return nil unless original = image_upload
+    return nil unless original.width && original.height
+
+    infos = []
+    infos << { # Always add original
+               max_width: nil,
+               max_height: nil,
+               width: original.width,
+               height: original.height,
+               url: original.url
+             }
+
+    records = filtered_topic_thumbnails(extra_sizes: extra_sizes)
+
+    records.each do |record|
+      next unless record.optimized_image # Only serialize successful thumbnails
+
+      infos << {
+        max_width: record.max_width,
+        max_height: record.max_height,
+        width: record.optimized_image&.width,
+        height: record.optimized_image&.height,
+        url: record.optimized_image&.url
+      }
+    end
+
+    thumbnail_sizes = Topic.thumbnail_sizes + extra_sizes
+    if SiteSetting.create_thumbnails &&
+       enqueue_if_missing &&
+       records.length < thumbnail_sizes.length &&
+       Discourse.redis.set(thumbnail_job_redis_key(extra_sizes), 1, nx: true, ex: 1.minute)
+
+      Jobs.enqueue(:generate_topic_thumbnails, { topic_id: id, extra_sizes: extra_sizes })
+    end
+
+    infos.sort_by! { |i| -i[:width] * i[:height] }
+  end
+
+  def generate_thumbnails!(extra_sizes: [])
+    return nil unless SiteSetting.create_thumbnails
+    return nil unless original = image_upload
+    return nil unless original.width && original.height
+
+    (Topic.thumbnail_sizes + extra_sizes).each do |dim|
+      TopicThumbnail.find_or_create_for!(original, max_width: dim[0], max_height: dim[1])
+    end
+  end
+
+  def image_url
+    thumbnail = topic_thumbnails.detect do |record|
+      record.max_width == Topic.share_thumbnail_size[0] &&
+        record.max_height == Topic.share_thumbnail_size[1]
+    end
+    thumbnail&.optimized_image&.url || image_upload&.url
+  end
+
   def featured_users
     @featured_users ||= TopicFeaturedUsers.new(self)
   end
@@ -139,6 +216,9 @@ class Topic < ActiveRecord::Base
   has_one :topic_search_data
   has_one :topic_embed, dependent: :destroy
 
+  belongs_to :image_upload, class_name: 'Upload'
+  has_many :topic_thumbnails, through: :image_upload
+
   # When we want to temporarily attach some data to a forum topic (usually before serialization)
   attr_accessor :user_data
   attr_accessor :category_user_data
@@ -1601,6 +1681,7 @@ end
 #  highest_staff_post_number :integer          default(0), not null
 #  featured_link             :string
 #  reviewable_score          :float            default(0.0), not null
+#  image_upload_id           :bigint
 #
 # Indexes
 #
@@ -1611,6 +1692,7 @@ end
 #  index_topics_on_created_at_and_visible  (created_at,visible) WHERE ((deleted_at IS NULL) AND ((archetype)::text <> 'private_message'::text))
 #  index_topics_on_id_and_deleted_at       (id,deleted_at)
 #  index_topics_on_id_filtered_banner      (id) UNIQUE WHERE (((archetype)::text = 'banner'::text) AND (deleted_at IS NULL))
+#  index_topics_on_image_upload_id         (image_upload_id)
 #  index_topics_on_lower_title             (lower((title)::text))
 #  index_topics_on_pinned_at               (pinned_at) WHERE (pinned_at IS NOT NULL)
 #  index_topics_on_pinned_globally         (pinned_globally) WHERE pinned_globally
diff --git a/app/models/topic_thumbnail.rb b/app/models/topic_thumbnail.rb
new file mode 100644
index 0000000000..139ddde232
--- /dev/null
+++ b/app/models/topic_thumbnail.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+# This model indicates an 'attempt' to create a topic thumbnail
+# for an upload. This means we don't keep trying to create optimized
+# images for small/invalid original images.
+#
+# Foreign keys with ON DELETE CASCADE are used to ensure unneeded data
+# is deleted automatically
+class TopicThumbnail < ActiveRecord::Base
+  belongs_to :upload
+  belongs_to :optimized_image
+
+  def self.find_or_create_for!(original, max_width: , max_height:)
+    existing = TopicThumbnail.find_by(upload: original, max_width: max_width, max_height: max_height)
+    return existing if existing
+    return nil if !SiteSetting.create_thumbnails?
+
+    target_width, target_height = ImageSizer.resize(original.width, original.height, { max_width: max_width, max_height: max_height })
+
+    if target_width < original.width && target_height < original.height
+      optimized = OptimizedImage.create_for(original, target_width, target_height)
+    end
+
+    create!(upload: original, max_width: max_width, max_height: max_height, optimized_image: optimized)
+  end
+
+  def self.ensure_consistency!
+    # Clean up records for broken upload links or broken optimized image links
+    TopicThumbnail
+      .joins("LEFT JOIN uploads on upload_id = uploads.id")
+      .joins("LEFT JOIN optimized_images on optimized_image_id = optimized_images.id")
+      .where(<<~SQL)
+        (optimized_image_id IS NOT NULL AND optimized_images IS NULL)
+        OR uploads IS NULL
+      SQL
+      .delete_all
+
+    # Delete records for sizes which are no longer needed
+    sizes = Topic.thumbnail_sizes + ThemeModifierHelper.new(theme_ids: Theme.pluck(:id)).topic_thumbnail_sizes
+    sizes_sql = sizes.map { |s| "(max_width = #{s[0].to_i} AND max_height = #{s[1].to_i})" }.join(" OR ")
+    TopicThumbnail.where.not(sizes_sql).delete_all
+  end
+end
+
+# == Schema Information
+#
+# Table name: topic_thumbnails
+#
+#  id                 :bigint           not null, primary key
+#  upload_id          :bigint           not null
+#  optimized_image_id :bigint
+#  max_width          :integer          not null
+#  max_height         :integer          not null
+#
+# Indexes
+#
+#  index_topic_thumbnails_on_optimized_image_id  (optimized_image_id)
+#  index_topic_thumbnails_on_upload_id           (upload_id)
+#  unique_topic_thumbnails                       (upload_id,max_width,max_height) UNIQUE
+#
diff --git a/app/models/upload.rb b/app/models/upload.rb
index cb4cf458af..bb4e7976f5 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -25,6 +25,7 @@ class Upload < ActiveRecord::Base
 
   has_many :optimized_images, dependent: :destroy
   has_many :user_uploads, dependent: :destroy
+  has_many :topic_thumbnails
 
   attr_accessor :for_group_message
   attr_accessor :for_theme
diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb
index a00cd2f619..52d7fb2715 100644
--- a/app/serializers/listable_topic_serializer.rb
+++ b/app/serializers/listable_topic_serializer.rb
@@ -25,10 +25,20 @@ class ListableTopicSerializer < BasicTopicSerializer
              :bookmarked,
              :liked,
              :unicode_title,
-             :unread_by_group_member
+             :unread_by_group_member,
+             :thumbnails
 
   has_one :last_poster, serializer: BasicUserSerializer, embed: :objects
 
+  def image_url
+    object.image_url
+  end
+
+  def thumbnails
+    extra_sizes = ThemeModifierHelper.new(request: scope.request).topic_thumbnail_sizes
+    object.thumbnail_info(enqueue_if_missing: true, extra_sizes: extra_sizes)
+  end
+
   def include_unicode_title?
     object.title.match?(/:[\w\-+]+:/)
   end
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index e40dca1d9f..27cc97523e 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -73,6 +73,7 @@ class TopicViewSerializer < ApplicationSerializer
     :queued_posts_count,
     :show_read_indicator,
     :requested_group_name,
+    :thumbnails
   )
 
   has_one :details, serializer: TopicViewDetailsSerializer, root: false, embed: :objects
@@ -284,4 +285,9 @@ class TopicViewSerializer < ApplicationSerializer
   def include_published_page?
     SiteSetting.enable_page_publishing? && scope.is_staff? && object.published_page.present?
   end
+
+  def thumbnails
+    extra_sizes = ThemeModifierHelper.new(request: scope.request).topic_thumbnail_sizes
+    object.topic.thumbnail_info(enqueue_if_missing: true, extra_sizes: extra_sizes)
+  end
 end
diff --git a/db/migrate/20200429095034_add_topic_thumbnail_information.rb b/db/migrate/20200429095034_add_topic_thumbnail_information.rb
new file mode 100644
index 0000000000..be34f93c32
--- /dev/null
+++ b/db/migrate/20200429095034_add_topic_thumbnail_information.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddTopicThumbnailInformation < ActiveRecord::Migration[6.0]
+  def change
+    add_reference :posts, :image_upload
+    add_reference :topics, :image_upload
+
+    add_column :theme_modifier_sets, :topic_thumbnail_sizes, :string, array: true
+
+    create_table :topic_thumbnails do |t|
+      t.references :upload, null: false
+      t.references :optimized_image, null: true
+      t.integer :max_width, null: false
+      t.integer :max_height, null: false
+    end
+
+    add_index :topic_thumbnails, [:upload_id, :max_width, :max_height], name: :unique_topic_thumbnails, unique: true
+  end
+end
diff --git a/db/migrate/20200429095035_migrate_image_url_to_image_upload_id.rb b/db/migrate/20200429095035_migrate_image_url_to_image_upload_id.rb
new file mode 100644
index 0000000000..5f4747b2c3
--- /dev/null
+++ b/db/migrate/20200429095035_migrate_image_url_to_image_upload_id.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+class MigrateImageUrlToImageUploadId < ActiveRecord::Migration[6.0]
+  disable_ddl_transaction! # Avoid holding update locks on posts for the whole migration
+
+  BATCH_SIZE = 1000
+
+  def up
+    # Defining regex here to avoid needing to double-escape the \ characters
+    regex = '\/(original|optimized)\/\dX[\/\.\w]*\/([a-zA-Z0-9]+)[\.\w]*'
+
+    execute <<~SQL
+      CREATE TEMPORARY TABLE tmp_post_image_uploads(
+        post_id int primary key,
+        upload_id int
+      )
+    SQL
+
+    # Look for an SHA1 in the existing image_url, and match to the uploads table
+    execute <<~SQL
+      INSERT INTO tmp_post_image_uploads(post_id, upload_id)
+      SELECT
+        posts.id as post_id,
+        uploads.id as upload_id
+      FROM posts
+      LEFT JOIN LATERAL regexp_matches(posts.image_url, '#{regex}') matched_sha1 ON TRUE
+      LEFT JOIN uploads on uploads.sha1 = matched_sha1[2]
+      WHERE posts.image_url IS NOT NULL
+      AND uploads.id IS NOT NULL
+      ORDER BY posts.id ASC
+    SQL
+
+    # Update the posts table to match the temp table data
+    last_update_id = -1
+    begin
+      result = DB.query <<~SQL
+        WITH to_update AS (
+          SELECT post_id, upload_id
+          FROM tmp_post_image_uploads
+          JOIN posts ON posts.id = post_id
+          WHERE posts.id > #{last_update_id}
+          ORDER BY post_id ASC
+          LIMIT #{BATCH_SIZE}
+        )
+        UPDATE posts SET image_upload_id = to_update.upload_id
+        FROM to_update
+        WHERE to_update.post_id = posts.id
+        RETURNING posts.id
+      SQL
+      last_update_id = result.last&.id
+    end while last_update_id
+
+    # Update the topic image based on the first post image
+    last_update_id = -1
+    begin
+      result = DB.query <<~SQL
+        WITH to_update AS (
+          SELECT topic_id, posts.image_upload_id as upload_id
+          FROM topics
+          JOIN posts ON post_number = 1 AND posts.topic_id = topics.id
+          WHERE posts.image_upload_id IS NOT NULL
+          AND topics.id > #{last_update_id}
+          ORDER BY topics.id ASC
+          LIMIT #{BATCH_SIZE}
+        )
+        UPDATE topics SET image_upload_id = to_update.upload_id
+        FROM to_update
+        WHERE topics.id = to_update.topic_id
+        RETURNING topics.id
+      SQL
+      last_update_id = result.last&.id
+    end while last_update_id
+
+    # For posts we couldn't figure out, mark them for background rebake
+    last_update_id = -1
+    begin
+      updated_count = DB.query <<~SQL
+        WITH to_update AS (
+          SELECT id as post_id
+          FROM posts
+          WHERE posts.image_url IS NOT NULL
+          AND posts.image_upload_id IS NULL
+          AND posts.id > #{last_update_id}
+          ORDER BY posts.id ASC
+          LIMIT #{BATCH_SIZE}
+        )
+        UPDATE posts SET baked_version = NULL
+        FROM to_update
+        WHERE posts.id = to_update.post_id
+        RETURNING posts.id
+      SQL
+      last_update_id = result.last&.id
+    end while last_update_id
+  end
+end
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 725258cc10..d2e8f4d2d5 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -490,16 +490,26 @@ class CookedPostProcessor
   end
 
   def update_post_image
-    img = extract_images_for_post.first
-    if img.blank?
-      @post.update_column(:image_url, nil) if @post.image_url
-      @post.topic.update_column(:image_url, nil) if @post.topic.image_url && @post.is_first_post?
-      return
+    upload = nil
+    eligible_image_fragments = extract_images_for_post
+
+    # Loop through those fragments until we find one with an upload record
+    @post.each_upload_url(fragments: eligible_image_fragments) do |src, path, sha1|
+      upload = Upload.find_by(sha1: sha1)
+      break if upload
     end
 
-    if img["src"].present?
-      @post.update_column(:image_url, img["src"][0...255]) # post
-      @post.topic.update_column(:image_url, img["src"][0...255]) if @post.is_first_post? # topic
+    if upload.present?
+      @post.update_column(:image_upload_id, upload.id) # post
+      if @post.is_first_post? # topic
+        @post.topic.update_column(:image_upload_id, upload.id)
+        extra_sizes = ThemeModifierHelper.new(theme_ids: Theme.user_selectable.pluck(:id)).topic_thumbnail_sizes
+        @post.topic.generate_thumbnails!(extra_sizes: extra_sizes)
+      end
+    else
+      @post.update_column(:image_upload_id, nil) if @post.image_upload_id
+      @post.topic.update_column(:image_upload_id, nil) if @post.topic.image_upload_id && @post.is_first_post?
+      nil
     end
   end
 
diff --git a/lib/search.rb b/lib/search.rb
index e1c6509c42..ffe08884ea 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -434,7 +434,7 @@ class Search
   end
 
   advanced_filter(/^with:images$/) do |posts|
-    posts.where("posts.image_url IS NOT NULL")
+    posts.where("posts.image_upload_id IS NOT NULL")
   end
 
   advanced_filter(/^category:(.+)$/) do |posts, match|
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 35bc7347fe..772ea5af28 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -828,6 +828,8 @@ class TopicQuery
     result = result.where('topics.posts_count <= ?', options[:max_posts]) if options[:max_posts].present?
     result = result.where('topics.posts_count >= ?', options[:min_posts]) if options[:min_posts].present?
 
+    result = preload_thumbnails(result)
+
     result = TopicQuery.apply_custom_filters(result, self)
 
     @guardian.filter_allowed_categories(result)
@@ -1050,6 +1052,10 @@ class TopicQuery
     result.order('topics.bumped_at DESC')
   end
 
+  def preload_thumbnails(result)
+    result.preload(:image_upload, topic_thumbnails: :optimized_image)
+  end
+
   private
 
   def sanitize_sql_array(input)
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 51e9eadf69..a429d64bee 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -751,16 +751,16 @@ describe CookedPostProcessor do
       end
 
       context "topic image" do
-        let(:post) { Fabricate(:post_with_uploaded_image) }
+        fab!(:post) { Fabricate(:post_with_uploaded_image) }
         let(:cpp) { CookedPostProcessor.new(post) }
 
         it "adds a topic image if there's one in the first post" do
           FastImage.stubs(:size)
-          expect(post.topic.image_url).to eq(nil)
+          expect(post.topic.image_upload_id).to eq(nil)
 
           cpp.post_process
           post.topic.reload
-          expect(post.topic.image_url).to be_present
+          expect(post.topic.image_upload_id).to be_present
         end
 
         it "removes image if post is edited and no longer has an image" do
@@ -768,14 +768,14 @@ describe CookedPostProcessor do
 
           cpp.post_process
           post.topic.reload
-          expect(post.topic.image_url).to be_present
-          expect(post.image_url).to be_present
+          expect(post.topic.image_upload_id).to be_present
+          expect(post.image_upload_id).to be_present
 
           post.update!(raw: "This post no longer has an image.")
           CookedPostProcessor.new(post).post_process
           post.topic.reload
-          expect(post.topic.image_url).not_to be_present
-          expect(post.image_url).not_to be_present
+          expect(post.topic.image_upload_id).not_to be_present
+          expect(post.image_upload_id).not_to be_present
         end
 
         it "won't remove the original image if another post doesn't have an image" do
@@ -784,15 +784,32 @@ describe CookedPostProcessor do
 
           cpp.post_process
           topic.reload
-          expect(topic.image_url).to be_present
-          expect(post.image_url).to be_present
+          expect(topic.image_upload_id).to be_present
+          expect(post.image_upload_id).to be_present
 
           post = Fabricate(:post, topic: topic, raw: "this post doesn't have an image")
           CookedPostProcessor.new(post).post_process
           topic.reload
 
-          expect(post.topic.image_url).to be_present
-          expect(post.image_url).to be_blank
+          expect(post.topic.image_upload_id).to be_present
+          expect(post.image_upload_id).to be_blank
+        end
+
+        it "generates thumbnails correctly" do
+          FastImage.expects(:size).returns([1750, 2000])
+
+          topic = post.topic
+          cpp.post_process
+          topic.reload
+          expect(topic.image_upload_id).to be_present
+          expect(post.image_upload_id).to be_present
+
+          post = Fabricate(:post, topic: topic, raw: "this post doesn't have an image")
+          CookedPostProcessor.new(post).post_process
+          topic.reload
+
+          expect(post.topic.image_upload_id).to be_present
+          expect(post.image_upload_id).to be_blank
         end
       end
 
@@ -802,10 +819,10 @@ describe CookedPostProcessor do
 
         it "adds a post image if there's one in the post" do
           FastImage.stubs(:size)
-          expect(reply.image_url).to eq(nil)
+          expect(reply.image_upload_id).to eq(nil)
           cpp.post_process
           reply.reload
-          expect(reply.image_url).to be_present
+          expect(reply.image_upload_id).to be_present
         end
       end
     end
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index 64e0efb726..a455d81ec1 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -1134,13 +1134,11 @@ describe Search do
 
     it 'can find posts with images' do
       post_uploaded = Fabricate(:post_with_uploaded_image)
-      post_with_image_urls = Fabricate(:post_with_image_urls)
       Fabricate(:post)
 
       CookedPostProcessor.new(post_uploaded).update_post_image
-      CookedPostProcessor.new(post_with_image_urls).update_post_image
 
-      expect(Search.execute('with:images').posts.map(&:id)).to contain_exactly(post_uploaded.id, post_with_image_urls.id)
+      expect(Search.execute('with:images').posts.map(&:id)).to contain_exactly(post_uploaded.id)
     end
 
     it 'can find by latest' do
diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb
index 16ee55dab0..73bb74ac25 100644
--- a/spec/components/topic_view_spec.rb
+++ b/spec/components/topic_view_spec.rb
@@ -708,9 +708,12 @@ describe TopicView do
   end
 
   describe '#image_url' do
-    let!(:post1) { Fabricate(:post, topic: topic) }
-    let!(:post2) { Fabricate(:post, topic: topic) }
-    let!(:post3) { Fabricate(:post, topic: topic).tap { |p| p.update_column(:image_url, "post3_image.png") }.reload }
+    fab!(:op_upload) { Fabricate(:image_upload) }
+    fab!(:post3_upload) { Fabricate(:image_upload) }
+
+    fab!(:post1) { Fabricate(:post, topic: topic) }
+    fab!(:post2) { Fabricate(:post, topic: topic) }
+    fab!(:post3) { Fabricate(:post, topic: topic).tap { |p| p.update_column(:image_upload_id, post3_upload.id) }.reload }
 
     def topic_view_for_post(post_number)
       TopicView.new(topic.id, evil_trout, post_number: post_number)
@@ -718,14 +721,14 @@ describe TopicView do
 
     context "when op has an image" do
       before do
-        topic.update_column(:image_url, "op_image.png")
-        post1.update_column(:image_url, "op_image.png")
+        topic.update_column(:image_upload_id, op_upload.id)
+        post1.update_column(:image_upload_id, op_upload.id)
       end
 
       it "uses the topic image as a fallback when posts have no image" do
-        expect(topic_view_for_post(1).image_url).to eq("op_image.png")
-        expect(topic_view_for_post(2).image_url).to eq("op_image.png")
-        expect(topic_view_for_post(3).image_url).to eq("post3_image.png")
+        expect(topic_view_for_post(1).image_url).to eq(op_upload.url)
+        expect(topic_view_for_post(2).image_url).to eq(op_upload.url)
+        expect(topic_view_for_post(3).image_url).to eq(post3_upload.url)
       end
     end
 
@@ -733,7 +736,7 @@ describe TopicView do
       it "returns nil when posts have no image" do
         expect(topic_view_for_post(1).image_url).to eq(nil)
         expect(topic_view_for_post(2).image_url).to eq(nil)
-        expect(topic_view_for_post(3).image_url).to eq("post3_image.png")
+        expect(topic_view_for_post(3).image_url).to eq(post3_upload.url)
       end
     end
   end
diff --git a/spec/fabricators/post_fabricator.rb b/spec/fabricators/post_fabricator.rb
index 412504c7c4..42235cb94f 100644
--- a/spec/fabricators/post_fabricator.rb
+++ b/spec/fabricators/post_fabricator.rb
@@ -56,7 +56,7 @@ HTML
 end
 
 Fabricator(:post_with_uploaded_image, from: :post) do
-  raw "<img src=\"/#{Discourse.store.upload_path}/original/2X/3456789012345678.png\" width=\"1500\" height=\"2000\">"
+  raw { "<img src=\"#{Fabricate(:image_upload)}\" width=\"1500\" height=\"2000\">" }
 end
 
 Fabricator(:post_with_an_attachment, from: :post) do
diff --git a/spec/integration/topic_thumbnail_spec.rb b/spec/integration/topic_thumbnail_spec.rb
new file mode 100644
index 0000000000..b288fb6c48
--- /dev/null
+++ b/spec/integration/topic_thumbnail_spec.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+require 'rails_helper'
+
+describe "Topic Thumbnails" do
+  before { SiteSetting.create_thumbnails = true }
+
+  fab!(:image) { Fabricate(:image_upload, width: 5000, height: 5000) }
+  fab!(:topic) { Fabricate(:topic, image_upload_id: image.id) }
+  fab!(:user) { Fabricate(:user) }
+
+  context 'latest' do
+    def get_topic
+      Discourse.redis.del(topic.thumbnail_job_redis_key([]))
+      get '/latest.json'
+      response.parsed_body["topic_list"]["topics"][0]
+    end
+
+    it "includes thumbnails" do
+      topic_json = nil
+      expect do
+        topic_json = get_topic
+      end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(1)
+
+      thumbnails = topic_json["thumbnails"]
+
+      # Original only. Optimized not yet generated
+      expect(thumbnails.length).to eq(1)
+
+      # Original
+      expect(thumbnails[0]["max_width"]).to eq(nil)
+      expect(thumbnails[0]["max_height"]).to eq(nil)
+      expect(thumbnails[0]["width"]).to eq(image.width)
+      expect(thumbnails[0]["height"]).to eq(image.height)
+      expect(thumbnails[0]["url"]).to eq(image.url)
+
+      # Run the job
+      args = Jobs::GenerateTopicThumbnails.jobs.last["args"].first
+      Jobs::GenerateTopicThumbnails.new.execute(args.with_indifferent_access)
+
+      # Re-request
+      expect do
+        topic_json = get_topic
+      end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(0)
+      thumbnails = topic_json["thumbnails"]
+
+      expect(thumbnails[1]["max_width"]).to eq(Topic.share_thumbnail_size[0])
+      expect(thumbnails[1]["max_height"]).to eq(Topic.share_thumbnail_size[1])
+      expect(thumbnails[1]["width"]).to eq(1024)
+      expect(thumbnails[1]["height"]).to eq(1024)
+      expect(thumbnails[1]["url"]).to include("/optimized/")
+    end
+
+    context "with a theme" do
+      before do
+        theme = Fabricate(:theme)
+        theme.theme_modifier_set.topic_thumbnail_sizes = [
+          [100, 100],
+          [200, 200],
+          [300, 300]
+        ]
+        theme.theme_modifier_set.save!
+        theme.set_default!
+      end
+
+      it "includes the theme specified resolutions" do
+        topic_json = nil
+
+        expect do
+          topic_json = get_topic
+        end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(1)
+
+        # Run the job
+        args = Jobs::GenerateTopicThumbnails.jobs.last["args"].first
+        Jobs::GenerateTopicThumbnails.new.execute(args.with_indifferent_access)
+
+        # Request again
+        expect do
+          topic_json = get_topic
+        end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(0)
+
+        thumbnails = topic_json["thumbnails"]
+
+        # Original + Optimized + 3 theme requests
+        expect(thumbnails.length).to eq(5)
+      end
+    end
+  end
+end
diff --git a/spec/lib/db_helper_spec.rb b/spec/lib/db_helper_spec.rb
index b178cd1e19..c2074a0f80 100644
--- a/spec/lib/db_helper_spec.rb
+++ b/spec/lib/db_helper_spec.rb
@@ -7,8 +7,6 @@ RSpec.describe DbHelper do
     it 'should remap columns properly' do
       post = Fabricate(:post, cooked: "this is a specialcode that I included")
       post_attributes = post.reload.attributes
-      post2 = Fabricate(:post, image_url: "/testing/specialcode")
-      post2_attributes = post2.reload.attributes
 
       badge = Fabricate(:badge, query: "specialcode")
       badge_attributes = badge.reload.attributes
@@ -19,13 +17,6 @@ RSpec.describe DbHelper do
 
       expect(post.cooked).to include("codespecial")
 
-      post2.reload
-
-      expect(post2.image_url).to eq("/testing/codespecial")
-
-      expect(post2_attributes.except("image_url"))
-        .to eq(post2.attributes.except("image_url"))
-
       badge.reload
 
       expect(badge.query).to eq("codespecial")
diff --git a/spec/models/topic_thumbnail_spec.rb b/spec/models/topic_thumbnail_spec.rb
new file mode 100644
index 0000000000..b9e1df75fd
--- /dev/null
+++ b/spec/models/topic_thumbnail_spec.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+require 'rails_helper'
+
+describe "TopicThumbnail" do
+  let(:upload1) { Fabricate(:image_upload, width: 5000, height: 5000) }
+  let(:topic) { Fabricate(:topic, image_upload: upload1) }
+
+  before do
+    SiteSetting.create_thumbnails = true
+    topic.generate_thumbnails!
+
+    TopicThumbnail.ensure_consistency!
+    topic.reload
+
+    expect(topic.topic_thumbnails.length).to eq(1)
+  end
+
+  it "cleans up deleted uploads" do
+    upload1.delete
+
+    TopicThumbnail.ensure_consistency!
+    topic.reload
+
+    expect(topic.topic_thumbnails.length).to eq(0)
+  end
+
+  it "cleans up deleted optimized images" do
+    upload1.optimized_images.reload.delete_all
+
+    TopicThumbnail.ensure_consistency!
+    topic.reload
+
+    expect(topic.topic_thumbnails.length).to eq(0)
+  end
+
+  it "cleans up unneeded sizes" do
+    expect(topic.topic_thumbnails.length).to eq(1)
+    topic.topic_thumbnails[0].update_column(:max_width, 999999)
+
+    TopicThumbnail.ensure_consistency!
+    topic.reload
+
+    expect(topic.topic_thumbnails.length).to eq(0)
+  end
+
+end
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index a80f884812..0adfbfe08a 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -46,15 +46,35 @@ describe TopicViewSerializer do
   end
 
   describe '#image_url' do
-    let(:image_url) { 'http://meta.discourse.org/images/welcome/discourse-edit-post-animated.gif' }
+    let(:image_upload) { Fabricate(:image_upload, width: 5000, height: 5000) }
 
     describe 'when a topic has an image' do
-      it 'should return the image url' do
-        topic.update!(image_url: image_url)
+      before { topic.update!(image_upload_id: image_upload.id) }
 
+      it 'should return the image url' do
         json = serialize_topic(topic, user)
 
-        expect(json[:image_url]).to eq(image_url)
+        expect(json[:image_url]).to eq(image_upload.url)
+      end
+
+      it 'should have thumbnails' do
+        SiteSetting.create_thumbnails = true
+
+        Discourse.redis.del(topic.thumbnail_job_redis_key([]))
+        json = nil
+
+        expect do
+          json = serialize_topic(topic, user)
+        end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(1)
+
+        topic.generate_thumbnails!
+
+        expect do
+          json = serialize_topic(topic, user)
+        end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(0)
+
+        # Original + Optimized
+        expect(json[:thumbnails].length).to eq(2)
       end
     end
 
diff --git a/spec/serializers/web_hook_topic_view_serializer_spec.rb b/spec/serializers/web_hook_topic_view_serializer_spec.rb
index f0499f985e..df878fb7cb 100644
--- a/spec/serializers/web_hook_topic_view_serializer_spec.rb
+++ b/spec/serializers/web_hook_topic_view_serializer_spec.rb
@@ -50,6 +50,7 @@ RSpec.describe WebHookTopicViewSerializer do
       created_by
       last_poster
       tags
+      thumbnails
     }
 
     keys = serializer.as_json.keys

From 04e493230745872493c8e98bf7e6c5819c0b619d Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 5 May 2020 09:50:50 +0100
Subject: [PATCH 0939/1830] DEV: Skip time-dependent bookmark test

---
 test/javascripts/acceptance/bookmarks-test.js | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/test/javascripts/acceptance/bookmarks-test.js b/test/javascripts/acceptance/bookmarks-test.js
index 51d1706a4d..d30ff498c0 100644
--- a/test/javascripts/acceptance/bookmarks-test.js
+++ b/test/javascripts/acceptance/bookmarks-test.js
@@ -196,20 +196,25 @@ test("Editing a bookmark", async assert => {
   assert.verifySteps(["tomorrow"]);
 });
 
-test("Editing a bookmark that has a Later Today reminder, and it is before 6pm today", async assert => {
-  mockSuccessfulBookmarkPost(assert);
-  await visit("/t/internationalization-localization/280");
-  await openBookmarkModal();
-  await fillIn("input#bookmark-name", "Test name");
-  await click("#tap_tile_later_today");
-  await openEditBookmarkModal();
-  assert.not(
-    exists("#bookmark-custon-date > input"),
-    "it does not show the custom date input"
-  );
-  assert.ok(
-    exists("#tap_tile_later_today.active"),
-    "it preselects Later Today"
-  );
-  assert.verifySteps(["later_today"]);
-});
+QUnit.skip(
+  "Editing a bookmark that has a Later Today reminder, and it is before 6pm today",
+  async assert => {
+    // This test needs to mock the current time. sandbox.useFakeTimers() seems to break the `visit` step
+
+    mockSuccessfulBookmarkPost(assert);
+    await visit("/t/internationalization-localization/280");
+    await openBookmarkModal();
+    await fillIn("input#bookmark-name", "Test name");
+    await click("#tap_tile_later_today");
+    await openEditBookmarkModal();
+    assert.not(
+      exists("#bookmark-custon-date > input"),
+      "it does not show the custom date input"
+    );
+    assert.ok(
+      exists("#tap_tile_later_today.active"),
+      "it preselects Later Today"
+    );
+    assert.verifySteps(["later_today"]);
+  }
+);

From bd0abddf6f474011b760972cb8afc0cde11db123 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 5 May 2020 12:59:47 +0200
Subject: [PATCH 0940/1830] UX: attempts to have a better use of available
 space with sk (#9639)

---
 .../select-kit/components/select-kit.js       | 31 ++++++++++++++++++-
 .../common/select-kit/category-drop.scss      |  4 ---
 .../common/select-kit/category-row.scss       |  2 +-
 .../select-kit/dropdown-select-box.scss       |  3 +-
 .../common/select-kit/multi-select.scss       |  4 ---
 .../select-kit/notifications-button.scss      |  5 ---
 .../common/select-kit/pinned-button.scss      |  6 ----
 .../common/select-kit/select-kit.scss         |  6 ----
 .../topic-footer-mobile-dropdown.scss         | 24 +++++++++-----
 app/assets/stylesheets/mobile/compose.scss    |  7 -----
 10 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index e5c9394908..12a258357b 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -808,7 +808,7 @@ export default Component.extend(
           placementStrategy = inModal ? "fixed" : "absolute";
         }
 
-        const verticalOffset = this.multiSelect ? 0 : 2;
+        const verticalOffset = this.multiSelect ? 0 : 3;
 
         /* global Popper:true */
         this.popper = Popper.createPopper(anchor, popper, {
@@ -822,6 +822,35 @@ export default Component.extend(
                 offset: [0, verticalOffset]
               }
             },
+            {
+              name: "applySmallScreenOffset",
+              enabled: window.innerWidth <= 450,
+              phase: "main",
+              fn({ state }) {
+                let { x } = state.elements.reference.getBoundingClientRect();
+                state.modifiersData.popperOffsets.x = -x + 10;
+              }
+            },
+            {
+              name: "applySmallScreenMaxWidth",
+              enabled: window.innerWidth <= 450,
+              phase: "beforeWrite",
+              fn({ state }) {
+                state.styles.popper.width = `${window.innerWidth - 20}px`;
+              }
+            },
+            {
+              name: "sameWidth",
+              enabled: window.innerWidth > 400,
+              phase: "beforeWrite",
+              requires: ["computeStyles"],
+              fn: ({ state }) => {
+                state.styles.popper.minWidth = `${state.rects.reference.width}px`;
+              },
+              effect: ({ state }) => {
+                state.elements.popper.style.minWidth = `${state.elements.reference.offsetWidth}px`;
+              }
+            },
             {
               name: "positionWrapper",
               phase: "afterWrite",
diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss
index 2f84f85a3c..8529cfd2a2 100644
--- a/app/assets/stylesheets/common/select-kit/category-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/category-drop.scss
@@ -39,10 +39,6 @@
         }
       }
 
-      .select-kit-body {
-        min-width: 300px;
-      }
-
       .select-kit-row {
         flex-direction: column;
         align-items: flex-start;
diff --git a/app/assets/stylesheets/common/select-kit/category-row.scss b/app/assets/stylesheets/common/select-kit/category-row.scss
index 0d90a61814..2bbe33c96e 100644
--- a/app/assets/stylesheets/common/select-kit/category-row.scss
+++ b/app/assets/stylesheets/common/select-kit/category-row.scss
@@ -1,6 +1,6 @@
 .select-kit {
   .category-row {
-    max-width: 320px;
+    max-width: 345px;
     .category-status {
       display: flex;
       align-items: center;
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index 13ac7f46e3..5221072afa 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -17,8 +17,6 @@
       border: 1px solid $primary-low;
       background-clip: padding-box;
       box-shadow: shadow("dropdown");
-      max-width: 300px;
-      width: 300px;
     }
 
     .select-kit-row {
@@ -89,6 +87,7 @@
           font-weight: normal;
           color: $primary-medium;
           white-space: normal;
+          min-width: 350px;
         }
       }
     }
diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss
index 65d9d290d5..83648c0eb5 100644
--- a/app/assets/stylesheets/common/select-kit/multi-select.scss
+++ b/app/assets/stylesheets/common/select-kit/multi-select.scss
@@ -4,10 +4,6 @@
     background: $secondary;
     border-radius: 0;
 
-    .select-kit-body {
-      width: 100%;
-    }
-
     .select-kit-row {
       margin: 5px;
       min-height: 1px;
diff --git a/app/assets/stylesheets/common/select-kit/notifications-button.scss b/app/assets/stylesheets/common/select-kit/notifications-button.scss
index 03d7e8c209..40ed042d53 100644
--- a/app/assets/stylesheets/common/select-kit/notifications-button.scss
+++ b/app/assets/stylesheets/common/select-kit/notifications-button.scss
@@ -3,11 +3,6 @@
     &.notifications-button {
       .select-kit-body {
         max-width: 400px;
-        width: 400px;
-
-        @media screen and (max-width: 767px) {
-          width: auto;
-        }
       }
 
       .select-kit-row {
diff --git a/app/assets/stylesheets/common/select-kit/pinned-button.scss b/app/assets/stylesheets/common/select-kit/pinned-button.scss
index e1b31d2d82..f080b8a016 100644
--- a/app/assets/stylesheets/common/select-kit/pinned-button.scss
+++ b/app/assets/stylesheets/common/select-kit/pinned-button.scss
@@ -24,11 +24,5 @@
 
   .pinned-options {
     display: inline;
-
-    .select-kit-body {
-      min-width: unset;
-      max-width: unset;
-      width: 550px;
-    }
   }
 }
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 59a3d42a1b..2f2c31bb9b 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -1,6 +1,5 @@
 .select-kit {
   border: none;
-  min-width: 220px;
   box-sizing: border-box;
   display: inline-block;
   flex-direction: column;
@@ -22,12 +21,8 @@
     .select-kit-body {
       display: flex;
       flex-direction: column;
-      left: 0;
-      position: absolute;
-      top: 0;
       align-items: center;
       justify-content: center;
-      max-width: 450px;
     }
 
     .select-kit-collection {
@@ -133,7 +128,6 @@
     display: none;
     background: $secondary;
     box-sizing: border-box;
-    width: auto;
   }
 
   .select-kit-row {
diff --git a/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss b/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss
index 42a90c7c6a..932ddf346f 100644
--- a/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss
+++ b/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss
@@ -1,11 +1,19 @@
-.topic-footer-mobile-dropdown {
-  .select-kit-row {
-    .svg-icon-title {
-      margin-right: 0.5em;
-    }
-    &.bookmarked {
-      .d-icon {
-        color: $tertiary;
+.select-kit {
+  &.combo-box {
+    &.topic-footer-mobile-dropdown {
+      .select-kit-row {
+        .svg-icon-title {
+          margin-right: 0.5em;
+        }
+        &.bookmarked {
+          .d-icon {
+            color: $tertiary;
+          }
+        }
+      }
+
+      .select-kit-collection {
+        max-height: 100%;
       }
     }
   }
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index 636fa06ada..902f42102c 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -81,9 +81,6 @@
 
   .category-input {
     margin-bottom: 5px;
-    .category-chooser {
-      width: 100% !important;
-    }
   }
 
   .submit-panel {
@@ -206,10 +203,6 @@
         }
       }
     }
-
-    .title-and-category .select-kit {
-      min-width: unset;
-    }
   }
 
   .title-input,

From 6b14a0f3528096d43d94a59961b37b6f585aff5e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 5 May 2020 13:01:02 +0200
Subject: [PATCH 0941/1830] FIX: apply sameWidth from 450px screen width

---
 app/assets/javascripts/select-kit/components/select-kit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 12a258357b..61e21beeec 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -841,7 +841,7 @@ export default Component.extend(
             },
             {
               name: "sameWidth",
-              enabled: window.innerWidth > 400,
+              enabled: window.innerWidth > 450,
               phase: "beforeWrite",
               requires: ["computeStyles"],
               fn: ({ state }) => {

From 8010e1ab2edb4601ba34fe58c6b1507f064bea3d Mon Sep 17 00:00:00 2001
From: Zdravko Curic <zcuric@users.noreply.github.com>
Date: Tue, 5 May 2020 15:18:02 +0200
Subject: [PATCH 0942/1830] DEV: Add remove button function to PluginAPI
 (#9627)

---
 .../discourse/app/lib/plugin-api.js           | 16 ++++++-
 .../discourse/app/widgets/post-menu.js        |  5 +++
 test/javascripts/widgets/post-menu-test.js    | 44 +++++++++++++++++++
 3 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 test/javascripts/widgets/post-menu-test.js

diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index 3d9dcd4a49..ab04e0e711 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -5,7 +5,7 @@ import { addPluginOutletDecorator } from "discourse/components/plugin-connector"
 import { addTopicTitleDecorator } from "discourse/components/topic-title";
 import ComposerEditor from "discourse/components/composer-editor";
 import DiscourseBanner from "discourse/components/discourse-banner";
-import { addButton } from "discourse/widgets/post-menu";
+import { addButton, removeButton } from "discourse/widgets/post-menu";
 import { includeAttributes } from "discourse/lib/transform-post";
 import { registerHighlightJSLanguage } from "discourse/lib/highlight-syntax";
 import { addToolbarCallback } from "discourse/components/d-editor";
@@ -399,11 +399,25 @@ class PluginApi {
    *     position: 'first'  // can be `first`, `last` or `second-last-hidden`
    *   };
    * });
+   * ```
    **/
   addPostMenuButton(name, callback) {
     addButton(name, callback);
   }
 
+  /**
+   * Remove existing button below a post with your plugin.
+   *
+   * Example:
+   *
+   * ```
+   * api.removePostMenuButton('like');
+   * ```
+   **/
+  removePostMenuButton(name) {
+    removeButton(name);
+  }
+
   /**
    * A hook that is called when the editor toolbar is created. You can
    * use this to add custom editor buttons.
diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
index 62489dc94d..b02253a8e1 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@@ -41,6 +41,11 @@ export function addButton(name, builder) {
   _extraButtons[name] = builder;
 }
 
+export function removeButton(name) {
+  if (_extraButtons[name]) delete _extraButtons[name];
+  if (_builders[name]) delete _builders[name];
+}
+
 function registerButton(name, builder) {
   _builders[name] = builder;
 }
diff --git a/test/javascripts/widgets/post-menu-test.js b/test/javascripts/widgets/post-menu-test.js
new file mode 100644
index 0000000000..971fdfa348
--- /dev/null
+++ b/test/javascripts/widgets/post-menu-test.js
@@ -0,0 +1,44 @@
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
+import { withPluginApi } from "discourse/lib/plugin-api";
+
+moduleForWidget("post-menu");
+
+widgetTest("add extra button", {
+  template: '{{mount-widget widget="post-menu" args=args}}',
+  beforeEach() {
+    this.set("args", {});
+    withPluginApi("0.8", api => {
+      api.addPostMenuButton("coffee", () => {
+        return {
+          action: "drinkCoffee",
+          icon: "coffee",
+          className: "hot-coffee",
+          title: "coffee.title",
+          position: "first"
+        };
+      });
+    });
+  },
+  async test(assert) {
+    assert.ok(
+      find(".actions .extra-buttons .hot-coffee").length === 1,
+      "It renders extra button"
+    );
+  }
+});
+
+widgetTest("remove extra button", {
+  template: '{{mount-widget widget="post-menu" args=args}}',
+  beforeEach() {
+    this.set("args", {});
+    withPluginApi("0.8", api => {
+      api.removePostMenuButton("coffee");
+    });
+  },
+  async test(assert) {
+    assert.ok(
+      find(".actions .extra-buttons .hot-coffee").length === 0,
+      "It doesn't removes coffee button"
+    );
+  }
+});

From 1019789d1a3b7cdadc89482aeead374b81f2164b Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Tue, 5 May 2020 16:56:04 +0300
Subject: [PATCH 0943/1830] FIX: Resolve Schema.org validation issues

---
 app/views/categories/index.html.erb |  2 +-
 app/views/layouts/crawler.html.erb  | 30 ++++++++++++++++++++++++-----
 app/views/list/list.erb             |  3 ++-
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb
index 3e476eabcc..93d3e17033 100644
--- a/app/views/categories/index.html.erb
+++ b/app/views/categories/index.html.erb
@@ -1,4 +1,5 @@
 <div itemscope itemtype='http://schema.org/ItemList'>
+  <meta itemprop='itemListOrder' content='http://schema.org/ItemListOrderDescending'>
   <table class='category-list'>
     <thead>
       <tr>
@@ -7,7 +8,6 @@
       </tr>
     </thead>
     <tbody>
-      <meta itemprop='itemListOrder' content='http://schema.org/ItemListOrderDescending'>
       <% @category_list.categories.each_with_index do |c, index| %>
         <tr>
           <td class='category' style='border-color: #<%= c.color %>;'>
diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb
index b5a8345550..8848af5cf4 100644
--- a/app/views/layouts/crawler.html.erb
+++ b/app/views/layouts/crawler.html.erb
@@ -36,11 +36,31 @@
     <footer class="container wrap">
       <nav class='crawler-nav'>
         <ul>
-        <li itemscope itemtype='http://schema.org/SiteNavigationElement' itemprop="name"><a href='<%= path "/" %>' itemprop="url"><%= t 'home_title' %> </a></li>
-        <li itemscope itemtype='http://schema.org/SiteNavigationElement' itemprop="name"><a href='<%= path "/categories" %>' itemprop="url"><%= t 'js.filters.categories.title' %> </a></li>
-        <li itemscope itemtype='http://schema.org/SiteNavigationElement' itemprop="name"><a href='<%= path "/guidelines" %>' itemprop="url"><%= t 'guidelines_topic.title' %> </a></li>
-        <li itemscope itemtype='http://schema.org/SiteNavigationElement' itemprop="name"><a href='<%= path "/tos" %>' itemprop="url"><%= t 'tos_topic.title' %> </a></li>
-        <li itemscope itemtype='http://schema.org/SiteNavigationElement' itemprop="name"><a href='<%= path "/privacy" %>' itemprop="url"><%= t 'privacy_topic.title' %> </a></li>
+        <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
+          <span itemprop='name'>
+            <a href='<%= path "/" %>' itemprop="url"><%= t 'home_title' %> </a>
+          </span>
+        </li>
+        <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
+          <span itemprop='name'>
+            <a href='<%= path "/categories" %>' itemprop="url"><%= t 'js.filters.categories.title' %> </a>
+          </span>
+        </li>
+        <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
+          <span itemprop='name'>
+            <a href='<%= path "/guidelines" %>' itemprop="url"><%= t 'guidelines_topic.title' %> </a>
+          </span>
+        </li>
+        <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
+          <span itemprop='name'>
+            <a href='<%= path "/tos" %>' itemprop="url"><%= t 'tos_topic.title' %> </a>
+          </span>
+        </li>
+        <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
+          <span itemprop='name'>
+            <a href='<%= path "/privacy" %>' itemprop="url"><%= t 'privacy_topic.title' %> </a>
+          </span>
+        </li>
         </ul>
       </nav>
       <p class='powered-by-link'><%= t 'powered_by_html' %></p>
diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index 9fa5a1f034..579022caee 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -39,6 +39,8 @@
 <% end %>
 
 <div itemscope itemtype='http://schema.org/ItemList'>
+  <meta itemprop='itemListOrder' content='http://schema.org/ItemListOrderDescending'>
+
   <table class='topic-list'>
 
     <thead>
@@ -52,7 +54,6 @@
     </thead>
 
     <tbody>
-      <meta itemprop='itemListOrder' content='http://schema.org/ItemListOrderDescending'>
       <% @list.topics.each_with_index do |t,i| %>
         <tr class="topic-list-item">
           <td class="main-link" itemprop='itemListElement' itemscope itemtype='http://schema.org/ListItem'>

From 0be68f147a17469366708a9db51ada1c221bec46 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 5 May 2020 16:28:52 +0100
Subject: [PATCH 0944/1830] FIX: Avoid using a temporary table in image url
 database migration

When using pgbouncer without a transaction, it's possible for the connection to change between statements in a migration. Instead, create a real table, and drop it when the migration is finished
---
 ...095035_migrate_image_url_to_image_upload_id.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/db/migrate/20200429095035_migrate_image_url_to_image_upload_id.rb b/db/migrate/20200429095035_migrate_image_url_to_image_upload_id.rb
index 5f4747b2c3..e6d905f5df 100644
--- a/db/migrate/20200429095035_migrate_image_url_to_image_upload_id.rb
+++ b/db/migrate/20200429095035_migrate_image_url_to_image_upload_id.rb
@@ -9,8 +9,11 @@ class MigrateImageUrlToImageUploadId < ActiveRecord::Migration[6.0]
     # Defining regex here to avoid needing to double-escape the \ characters
     regex = '\/(original|optimized)\/\dX[\/\.\w]*\/([a-zA-Z0-9]+)[\.\w]*'
 
+    # Can't use a real temporary table because we're running outside a transaction
+    # and the connection could change between statements
+    drop_temporary_table! # First check it doesn't already exist
     execute <<~SQL
-      CREATE TEMPORARY TABLE tmp_post_image_uploads(
+      CREATE TABLE tmp_post_image_uploads(
         post_id int primary key,
         upload_id int
       )
@@ -91,5 +94,15 @@ class MigrateImageUrlToImageUploadId < ActiveRecord::Migration[6.0]
       SQL
       last_update_id = result.last&.id
     end while last_update_id
+  ensure
+    drop_temporary_table!
+  end
+
+  def drop_temporary_table!
+    Migration::SafeMigrate.disable!
+    execute <<~SQL
+      DROP TABLE IF EXISTS tmp_post_image_uploads
+    SQL
+    Migration::SafeMigrate.enable!
   end
 end

From 657facb1d552e6f6682e632ec7e22f27aca378cd Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Tue, 5 May 2020 10:51:49 -0500
Subject: [PATCH 0945/1830] FIX: Fixes wrapping of buttons with larger buttons

Thanks to Kris for solution
---
 app/assets/stylesheets/common/base/_topic-list.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 5b9cff0076..98d484ff63 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -286,7 +286,8 @@ ol.category-breadcrumb {
 }
 
 .top-title-buttons {
-  display: inline;
+  display: inline-flex;
+  margin: .25em 0;
 
   button {
     margin-right: 0.5em;

From 612284cef31cb9f068e0d36d01306d355a065ced Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 5 May 2020 12:15:03 -0400
Subject: [PATCH 0946/1830] DEV: Remove `Discourse.RAW_TEMPLATES` (#9630)

We were sharing `Discourse` both as an application object and a
namespace which complicated things for Ember CLI. This patch
moves raw templates into `__DISCOURSE_RAW_TEMPLATES` and adds
a couple helper methods to create/remove them.
---
 app/assets/javascripts/app-boot.js            |  5 +++
 .../addon/lib/raw-templates.js                | 38 +++++++++++++++++++
 app/assets/javascripts/discourse/app/app.js   |  1 -
 .../app/components/badge-selector.js          |  2 +-
 .../app/components/composer-editor.js         |  2 +-
 .../discourse/app/components/d-editor.js      |  2 +-
 .../discourse/app/components/emoji-picker.js  |  2 +-
 .../app/components/group-selector.js          |  2 +-
 .../app/components/topic-list-item.js         |  2 +-
 .../discourse/app/components/user-selector.js |  2 +-
 .../javascripts/discourse/app/helpers/raw.js  |  2 +-
 .../discourse/app/lib/plugin-connectors.js    | 13 +------
 .../discourse/app/lib/raw-templates.js        | 17 ---------
 .../javascripts/discourse/app/lib/search.js   |  2 +-
 app/models/theme_field.rb                     |  2 +-
 config/application.rb                         |  2 +-
 lib/theme_javascript_compiler.rb              |  6 +--
 spec/lib/theme_javascript_compiler_spec.rb    |  8 ++--
 spec/models/theme_field_spec.rb               |  6 +--
 .../acceptance/raw-plugin-outlet-test.js      | 12 ++++--
 20 files changed, 75 insertions(+), 53 deletions(-)
 create mode 100644 app/assets/javascripts/discourse-common/addon/lib/raw-templates.js
 delete mode 100644 app/assets/javascripts/discourse/app/lib/raw-templates.js

diff --git a/app/assets/javascripts/app-boot.js b/app/assets/javascripts/app-boot.js
index d744e7f649..0fd7a5ea97 100644
--- a/app/assets/javascripts/app-boot.js
+++ b/app/assets/javascripts/app-boot.js
@@ -6,6 +6,11 @@
   }
   let Discourse = requirejs("discourse/app").default;
 
+  // required for our template compiler
+  window.__DISCOURSE_RAW_TEMPLATES = requirejs(
+    "discourse-common/lib/raw-templates"
+  ).__DISCOURSE_RAW_TEMPLATES;
+
   // ensure Discourse is added as a global
   window.Discourse = Discourse;
 })();
diff --git a/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js b/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js
new file mode 100644
index 0000000000..2aa14dbf0d
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js
@@ -0,0 +1,38 @@
+import { getResolverOption } from "discourse-common/resolver";
+
+export const __DISCOURSE_RAW_TEMPLATES = {};
+
+export function addRawTemplate(name, template) {
+  __DISCOURSE_RAW_TEMPLATES[name] = template;
+}
+
+export function removeRawTemplate(name) {
+  delete __DISCOURSE_RAW_TEMPLATES[name];
+}
+
+export function findRawTemplate(name) {
+  if (getResolverOption("mobileView")) {
+    return (
+      __DISCOURSE_RAW_TEMPLATES[`javascripts/mobile/${name}`] ||
+      __DISCOURSE_RAW_TEMPLATES[`javascripts/${name}`] ||
+      __DISCOURSE_RAW_TEMPLATES[`mobile/${name}`] ||
+      __DISCOURSE_RAW_TEMPLATES[name]
+    );
+  }
+
+  return (
+    __DISCOURSE_RAW_TEMPLATES[`javascripts/${name}`] ||
+    __DISCOURSE_RAW_TEMPLATES[name]
+  );
+}
+
+export function buildRawConnectorCache(findOutlets) {
+  let result = {};
+  findOutlets(__DISCOURSE_RAW_TEMPLATES, (outletName, resource) => {
+    result[outletName] = result[outletName] || [];
+    result[outletName].push({
+      template: __DISCOURSE_RAW_TEMPLATES[resource]
+    });
+  });
+  return result;
+}
diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index 8080da1af6..62c4cfdf90 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -10,7 +10,6 @@ const _pluginCallbacks = [];
 const Discourse = Application.extend(FocusEvent, {
   rootElement: "#main",
   _docTitle: document.title,
-  RAW_TEMPLATES: {},
   __widget_helpers: {},
   customEvents: {
     paste: "paste"
diff --git a/app/assets/javascripts/discourse/app/components/badge-selector.js b/app/assets/javascripts/discourse/app/components/badge-selector.js
index 0f5c22941b..47cf4dbd10 100644
--- a/app/assets/javascripts/discourse/app/components/badge-selector.js
+++ b/app/assets/javascripts/discourse/app/components/badge-selector.js
@@ -3,7 +3,7 @@ import discourseComputed, {
   on,
   observes
 } from "discourse-common/utils/decorators";
-import { findRawTemplate } from "discourse/lib/raw-templates";
+import { findRawTemplate } from "discourse-common/lib/raw-templates";
 const { makeArray } = Ember;
 
 export default Component.extend({
diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js
index a71902ed52..7d89caa070 100644
--- a/app/assets/javascripts/discourse/app/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/app/components/composer-editor.js
@@ -22,7 +22,7 @@ import { load, LOADING_ONEBOX_CSS_CLASS } from "pretty-text/oneboxer";
 import { applyInlineOneboxes } from "pretty-text/inline-oneboxer";
 import { ajax } from "discourse/lib/ajax";
 import EmberObject from "@ember/object";
-import { findRawTemplate } from "discourse/lib/raw-templates";
+import { findRawTemplate } from "discourse-common/lib/raw-templates";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import {
   tinyAvatar,
diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index faeeb11c77..d1a64b4c0f 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -10,7 +10,7 @@ import { categoryHashtagTriggerRule } from "discourse/lib/category-hashtags";
 import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
 import { cookAsync } from "discourse/lib/text";
 import { getRegister } from "discourse-common/lib/get-owner";
-import { findRawTemplate } from "discourse/lib/raw-templates";
+import { findRawTemplate } from "discourse-common/lib/raw-templates";
 import { siteDir } from "discourse/lib/text-direction";
 import {
   determinePostReplaceSelection,
diff --git a/app/assets/javascripts/discourse/app/components/emoji-picker.js b/app/assets/javascripts/discourse/app/components/emoji-picker.js
index e088f9c409..86fa8fcec9 100644
--- a/app/assets/javascripts/discourse/app/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/app/components/emoji-picker.js
@@ -2,7 +2,7 @@ import { inject as service } from "@ember/service";
 import { throttle, debounce, schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { on, observes } from "discourse-common/utils/decorators";
-import { findRawTemplate } from "discourse/lib/raw-templates";
+import { findRawTemplate } from "discourse-common/lib/raw-templates";
 import { emojiUrlFor } from "discourse/lib/text";
 import {
   extendedEmojiList,
diff --git a/app/assets/javascripts/discourse/app/components/group-selector.js b/app/assets/javascripts/discourse/app/components/group-selector.js
index 3fe2e505f8..a743cde69f 100644
--- a/app/assets/javascripts/discourse/app/components/group-selector.js
+++ b/app/assets/javascripts/discourse/app/components/group-selector.js
@@ -4,7 +4,7 @@ import discourseComputed, {
   on,
   observes
 } from "discourse-common/utils/decorators";
-import { findRawTemplate } from "discourse/lib/raw-templates";
+import { findRawTemplate } from "discourse-common/lib/raw-templates";
 
 export default Component.extend({
   @discourseComputed("placeholderKey")
diff --git a/app/assets/javascripts/discourse/app/components/topic-list-item.js b/app/assets/javascripts/discourse/app/components/topic-list-item.js
index 0746ed95f6..2460dc8fc9 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list-item.js
+++ b/app/assets/javascripts/discourse/app/components/topic-list-item.js
@@ -3,7 +3,7 @@ import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import { schedule } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
-import { findRawTemplate } from "discourse/lib/raw-templates";
+import { findRawTemplate } from "discourse-common/lib/raw-templates";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { on } from "@ember/object/evented";
 
diff --git a/app/assets/javascripts/discourse/app/components/user-selector.js b/app/assets/javascripts/discourse/app/components/user-selector.js
index d362c60e62..a340b27f18 100644
--- a/app/assets/javascripts/discourse/app/components/user-selector.js
+++ b/app/assets/javascripts/discourse/app/components/user-selector.js
@@ -2,7 +2,7 @@ import { isEmpty } from "@ember/utils";
 import { on, observes } from "discourse-common/utils/decorators";
 import TextField from "discourse/components/text-field";
 import userSearch from "discourse/lib/user-search";
-import { findRawTemplate } from "discourse/lib/raw-templates";
+import { findRawTemplate } from "discourse-common/lib/raw-templates";
 
 export default TextField.extend({
   autocorrect: false,
diff --git a/app/assets/javascripts/discourse/app/helpers/raw.js b/app/assets/javascripts/discourse/app/helpers/raw.js
index 0a764a1dee..fe0d43c88b 100644
--- a/app/assets/javascripts/discourse/app/helpers/raw.js
+++ b/app/assets/javascripts/discourse/app/helpers/raw.js
@@ -1,5 +1,5 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
-import { findRawTemplate } from "discourse/lib/raw-templates";
+import { findRawTemplate } from "discourse-common/lib/raw-templates";
 import { htmlSafe } from "@ember/template";
 import { setOwner } from "@ember/application";
 
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-connectors.js b/app/assets/javascripts/discourse/app/lib/plugin-connectors.js
index 8bf830be89..65aa1ce2f9 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-connectors.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-connectors.js
@@ -1,5 +1,6 @@
 import Site from "discourse/models/site";
 import deprecated from "discourse-common/lib/deprecated";
+import { buildRawConnectorCache } from "discourse-common/lib/raw-templates";
 
 let _connectorCache;
 let _rawConnectorCache;
@@ -82,16 +83,6 @@ function buildConnectorCache() {
   });
 }
 
-function buildRawConnectorCache() {
-  _rawConnectorCache = {};
-  findOutlets(Discourse.RAW_TEMPLATES, (outletName, resource) => {
-    _rawConnectorCache[outletName] = _rawConnectorCache[outletName] || [];
-    _rawConnectorCache[outletName].push({
-      template: Discourse.RAW_TEMPLATES[resource]
-    });
-  });
-}
-
 export function connectorsFor(outletName) {
   if (!_connectorCache) {
     buildConnectorCache();
@@ -107,7 +98,7 @@ export function renderedConnectorsFor(outletName, args, context) {
 
 export function rawConnectorsFor(outletName) {
   if (!_rawConnectorCache) {
-    buildRawConnectorCache();
+    _rawConnectorCache = buildRawConnectorCache(findOutlets);
   }
   return _rawConnectorCache[outletName] || [];
 }
diff --git a/app/assets/javascripts/discourse/app/lib/raw-templates.js b/app/assets/javascripts/discourse/app/lib/raw-templates.js
deleted file mode 100644
index 3dffd81870..0000000000
--- a/app/assets/javascripts/discourse/app/lib/raw-templates.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { getResolverOption } from "discourse-common/resolver";
-
-export function findRawTemplate(name) {
-  if (getResolverOption("mobileView")) {
-    return (
-      Discourse.RAW_TEMPLATES[`javascripts/mobile/${name}`] ||
-      Discourse.RAW_TEMPLATES[`javascripts/${name}`] ||
-      Discourse.RAW_TEMPLATES[`mobile/${name}`] ||
-      Discourse.RAW_TEMPLATES[name]
-    );
-  }
-
-  return (
-    Discourse.RAW_TEMPLATES[`javascripts/${name}`] ||
-    Discourse.RAW_TEMPLATES[name]
-  );
-}
diff --git a/app/assets/javascripts/discourse/app/lib/search.js b/app/assets/javascripts/discourse/app/lib/search.js
index f057425bc5..fb0dd3c493 100644
--- a/app/assets/javascripts/discourse/app/lib/search.js
+++ b/app/assets/javascripts/discourse/app/lib/search.js
@@ -1,7 +1,7 @@
 import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
-import { findRawTemplate } from "discourse/lib/raw-templates";
+import { findRawTemplate } from "discourse-common/lib/raw-templates";
 import Category from "discourse/models/category";
 import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
 import userSearch from "discourse/lib/user-search";
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index a9f98ce407..c2e8d06a72 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -60,7 +60,7 @@ class ThemeField < ActiveRecord::Base
   validates :name, format: { with: /\A[a-z_][a-z0-9_-]*\z/i },
                    if: Proc.new { |field| ThemeField.theme_var_type_ids.include?(field.type_id) }
 
-  BASE_COMPILER_VERSION = 15
+  BASE_COMPILER_VERSION = 16
   DEPENDENT_CONSTANTS = [
     BASE_COMPILER_VERSION,
     Ember::VERSION,
diff --git a/config/application.rb b/config/application.rb
index 0145ddbe7a..3b9d4da7db 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -245,7 +245,7 @@ module Discourse
 
     # Our templates shouldn't start with 'discourse/app/templates'
     config.handlebars.templates_root = 'discourse/app/templates'
-    config.handlebars.raw_template_namespace = "Discourse.RAW_TEMPLATES"
+    config.handlebars.raw_template_namespace = "__DISCOURSE_RAW_TEMPLATES"
     Sprockets.register_mime_type 'text/x-handlebars', extensions: ['.hbr']
     Sprockets.register_transformer 'text/x-handlebars', 'application/javascript', Ember::Handlebars::Template
 
diff --git a/lib/theme_javascript_compiler.rb b/lib/theme_javascript_compiler.rb
index 988a96ad9e..17bebf1b22 100644
--- a/lib/theme_javascript_compiler.rb
+++ b/lib/theme_javascript_compiler.rb
@@ -195,9 +195,9 @@ class ThemeJavascriptCompiler
     compiled = RawTemplatePrecompiler.new(@theme_id).compile(hbs_template)
     @content << <<~JS
       (function() {
-        if ('Discourse' in window) {
-          Discourse.RAW_TEMPLATES[#{raw_template_name(name)}] = requirejs('discourse-common/lib/raw-handlebars').template(#{compiled});
-        }
+        const addRawTemplate = requirejs('discourse-common/lib/raw-templates').addRawTemplate;
+        const template = requirejs('discourse-common/lib/raw-handlebars').template(#{compiled});
+        addRawTemplate(#{raw_template_name(name)}, template);
       })();
     JS
   rescue Barber::PrecompilerError => e
diff --git a/spec/lib/theme_javascript_compiler_spec.rb b/spec/lib/theme_javascript_compiler_spec.rb
index ca0c9cd046..e82bb64597 100644
--- a/spec/lib/theme_javascript_compiler_spec.rb
+++ b/spec/lib/theme_javascript_compiler_spec.rb
@@ -112,19 +112,19 @@ describe ThemeJavascriptCompiler do
 
   describe "#append_raw_template" do
     let(:compiler) { ThemeJavascriptCompiler.new(1, 'marks') }
-    it 'adds the correct template to "Discourse.RAW_TEMPLATES"' do
+    it 'uses the correct template paths' do
       template = "<h1>hello</h1>"
       name = "/path/to/templates1"
       compiler.append_raw_template("#{name}.raw", template)
-      expect(compiler.content.to_s).to include("Discourse.RAW_TEMPLATES[\"#{name}\"]")
+      expect(compiler.content.to_s).to include("addRawTemplate(\"#{name}\"")
 
       name = "/path/to/templates2"
       compiler.append_raw_template("#{name}.hbr", template)
-      expect(compiler.content.to_s).to include("Discourse.RAW_TEMPLATES[\"#{name}\"]")
+      expect(compiler.content.to_s).to include("addRawTemplate(\"#{name}\"")
 
       name = "/path/to/templates3"
       compiler.append_raw_template("#{name}.hbs", template)
-      expect(compiler.content.to_s).to include("Discourse.RAW_TEMPLATES[\"#{name}.hbs\"]")
+      expect(compiler.content.to_s).to include("addRawTemplate(\"#{name}.hbs\"")
     end
   end
 end
diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rb
index 306b3aeec3..570a861d7a 100644
--- a/spec/models/theme_field_spec.rb
+++ b/spec/models/theme_field_spec.rb
@@ -196,14 +196,14 @@ HTML
     expect(js_field.reload.value_baked).to eq(expected_js.strip)
 
     expect(hbs_field.reload.value_baked).to include('Ember.TEMPLATES["discovery"]')
-    expect(raw_hbs_field.reload.value_baked).to include('Discourse.RAW_TEMPLATES["discovery"]')
-    expect(hbr_field.reload.value_baked).to include('Discourse.RAW_TEMPLATES["other_discovery"]')
+    expect(raw_hbs_field.reload.value_baked).to include('addRawTemplate("discovery"')
+    expect(hbr_field.reload.value_baked).to include('addRawTemplate("other_discovery"')
     expect(unknown_field.reload.value_baked).to eq("")
     expect(unknown_field.reload.error).to eq(I18n.t("themes.compile_error.unrecognized_extension", extension: "blah"))
 
     # All together
     expect(theme.javascript_cache.content).to include('Ember.TEMPLATES["discovery"]')
-    expect(theme.javascript_cache.content).to include('Discourse.RAW_TEMPLATES["discovery"]')
+    expect(theme.javascript_cache.content).to include('addRawTemplate("discovery"')
     expect(theme.javascript_cache.content).to include('define("discourse/controllers/discovery"')
     expect(theme.javascript_cache.content).to include('define("discourse/controllers/discovery-2"')
     expect(theme.javascript_cache.content).to include("var settings =")
diff --git a/test/javascripts/acceptance/raw-plugin-outlet-test.js b/test/javascripts/acceptance/raw-plugin-outlet-test.js
index 8f104ce37b..a5a81208ce 100644
--- a/test/javascripts/acceptance/raw-plugin-outlet-test.js
+++ b/test/javascripts/acceptance/raw-plugin-outlet-test.js
@@ -1,17 +1,23 @@
 import { acceptance } from "helpers/qunit-helpers";
 import compile from "handlebars-compiler";
+import {
+  addRawTemplate,
+  removeRawTemplate
+} from "discourse-common/lib/raw-templates";
 
 const CONNECTOR =
   "javascripts/raw-test/connectors/topic-list-before-status/lala";
+
 acceptance("Raw Plugin Outlet", {
   beforeEach() {
-    Discourse.RAW_TEMPLATES[CONNECTOR] = compile(
-      `<span class='topic-lala'>{{context.topic.id}}</span>`
+    addRawTemplate(
+      CONNECTOR,
+      compile(`<span class='topic-lala'>{{context.topic.id}}</span>`)
     );
   },
 
   afterEach() {
-    delete Discourse.RAW_TEMPLATES[CONNECTOR];
+    removeRawTemplate(CONNECTOR);
   }
 });
 

From bae813fac60e0b85935bb532a5ac99fd0d54f6d6 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Tue, 5 May 2020 11:29:19 -0500
Subject: [PATCH 0947/1830] fix linting

---
 app/assets/stylesheets/common/base/_topic-list.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 98d484ff63..2bf7e0c24d 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -287,7 +287,7 @@ ol.category-breadcrumb {
 
 .top-title-buttons {
   display: inline-flex;
-  margin: .25em 0;
+  margin: 0.25em 0;
 
   button {
     margin-right: 0.5em;

From 2edee747187a5218f405f92ac2c955e725145198 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 5 May 2020 13:45:14 -0400
Subject: [PATCH 0948/1830] FIX: Flaky tests. Due to CSS transitions opacity
 might not be 0 yet.

---
 test/javascripts/helpers/assertions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/helpers/assertions.js b/test/javascripts/helpers/assertions.js
index 81fbd40b1b..241357251b 100644
--- a/test/javascripts/helpers/assertions.js
+++ b/test/javascripts/helpers/assertions.js
@@ -15,7 +15,7 @@ function invisible(selector) {
   const $items = find(selector + ":visible");
   return (
     $items.length === 0 ||
-    $items.css("opacity") === "0" ||
+    $items.css("opacity") !== "1" ||
     $items.css("visibility") === "hidden"
   );
 }

From 4cf3dbe3db2f21833d0790b1e4c3abebab751b7c Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 5 May 2020 14:14:38 -0400
Subject: [PATCH 0949/1830] DEV: Remove `Discourse.` global variable usage in
 initializers

---
 app/assets/javascripts/discourse/app/app.js | 56 ++++++++-------------
 1 file changed, 20 insertions(+), 36 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index 62c4cfdf90..55fdf73ddf 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -120,54 +120,38 @@ const Discourse = Application.extend(FocusEvent, {
     return loginController.authenticationComplete(options);
   },
 
+  _prepareInitializer(moduleName) {
+    const module = requirejs(moduleName, null, null, true);
+    if (!module) {
+      throw new Error(moduleName + " must export an initializer.");
+    }
+
+    const init = module.default;
+    const oldInitialize = init.initialize;
+    init.initialize = () => oldInitialize.call(init, this.__container__, this);
+    return init;
+  },
+
   // Start up the Discourse application by running all the initializers we've defined.
   start() {
     $("noscript").remove();
 
-    Object.keys(requirejs._eak_seen).forEach(function(key) {
+    Object.keys(requirejs._eak_seen).forEach(key => {
       if (/\/pre\-initializers\//.test(key)) {
-        const module = requirejs(key, null, null, true);
-        if (!module) {
-          throw new Error(key + " must export an initializer.");
-        }
-
-        const init = module.default;
-        const oldInitialize = init.initialize;
-        init.initialize = function() {
-          oldInitialize.call(this, Discourse.__container__, Discourse);
-        };
-
-        Discourse.initializer(init);
-      }
-    });
-
-    Object.keys(requirejs._eak_seen).forEach(function(key) {
-      if (/\/initializers\//.test(key)) {
-        const module = requirejs(key, null, null, true);
-        if (!module) {
-          throw new Error(key + " must export an initializer.");
-        }
-
-        const init = module.default;
-        const oldInitialize = init.initialize;
-        init.initialize = function() {
-          oldInitialize.call(this, Discourse.__container__, Discourse);
-        };
-
-        Discourse.instanceInitializer(init);
+        this.initializer(this._prepareInitializer(key));
+      } else if (/\/initializers\//.test(key)) {
+        this.instanceInitializer(this._prepareInitializer(key));
       }
     });
 
     // Plugins that are registered via `<script>` tags.
     const withPluginApi = requirejs("discourse/lib/plugin-api").withPluginApi;
     let initCount = 0;
-    _pluginCallbacks.forEach(function(cb) {
-      Discourse.instanceInitializer({
-        name: "_discourse_plugin_" + ++initCount,
+    _pluginCallbacks.forEach(cb => {
+      this.instanceInitializer({
+        name: `_discourse_plugin_${++initCount}`,
         after: "inject-objects",
-        initialize() {
-          withPluginApi(cb.version, cb.code);
-        }
+        initialize: () => withPluginApi(cb.version, cb.code)
       });
     });
   },

From 279835f603ad075e90a84675c6e6571b15a02258 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 5 May 2020 14:42:47 -0400
Subject: [PATCH 0950/1830] DEV: Remove more `Discourse.` globals

---
 app/assets/javascripts/discourse/app/app.js   | 23 +++++++++----------
 .../javascripts/discourse/app/lib/text.js     |  6 +++--
 .../discourse/app/lib/utilities.js            |  4 +++-
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index 55fdf73ddf..83e8ef8473 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -17,7 +17,6 @@ const Discourse = Application.extend(FocusEvent, {
 
   reset() {
     this._super(...arguments);
-
     Mousetrap.reset();
   },
 
@@ -28,18 +27,18 @@ const Discourse = Application.extend(FocusEvent, {
     if (url !== "/" && !/^\/[^\/]/.test(url)) return url;
 
     if (url[0] !== "/") url = "/" + url;
-    if (url.startsWith(Discourse.BaseUri)) return url;
+    if (url.startsWith(this.BaseUri)) return url;
 
-    return Discourse.BaseUri + url;
+    return this.BaseUri + url;
   },
 
   getURLWithCDN(url) {
-    url = Discourse.getURL(url);
+    url = this.getURL(url);
     // only relative urls
-    if (Discourse.CDN && /^\/[^\/]/.test(url)) {
-      url = Discourse.CDN + url;
-    } else if (Discourse.S3CDN) {
-      url = url.replace(Discourse.S3BaseUrl, Discourse.S3CDN);
+    if (this.CDN && /^\/[^\/]/.test(url)) {
+      url = this.CDN + url;
+    } else if (this.S3CDN) {
+      url = url.replace(this.S3BaseUrl, this.S3CDN);
     }
     return url;
   },
@@ -48,7 +47,7 @@ const Discourse = Application.extend(FocusEvent, {
 
   @observes("_docTitle", "hasFocus", "contextCount", "notificationCount")
   _titleChanged() {
-    let title = this._docTitle || Discourse.SiteSettings.title;
+    let title = this._docTitle || this.SiteSettings.title;
 
     let displayCount = this.displayCount;
     let dynamicFavicon = this.currentUser && this.currentUser.dynamic_favicon;
@@ -70,13 +69,13 @@ const Discourse = Application.extend(FocusEvent, {
   @observes("contextCount", "notificationCount")
   faviconChanged() {
     if (this.currentUser && this.currentUser.get("dynamic_favicon")) {
-      let url = Discourse.SiteSettings.site_favicon_url;
+      let url = this.SiteSettings.site_favicon_url;
 
       // Since the favicon is cached on the browser for a really long time, we
       // append the favicon_url as query params to the path so that the cache
       // is not used when the favicon changes.
       if (/^http/.test(url)) {
-        url = Discourse.getURL("/favicon/proxied?" + encodeURIComponent(url));
+        url = this.getURL("/favicon/proxied?" + encodeURIComponent(url));
       }
 
       var displayCount = this.displayCount;
@@ -116,7 +115,7 @@ const Discourse = Application.extend(FocusEvent, {
 
   authenticationComplete(options) {
     // TODO, how to dispatch this to the controller without the container?
-    const loginController = Discourse.__container__.lookup("controller:login");
+    const loginController = this.__container__.lookup("controller:login");
     return loginController.authenticationComplete(options);
   },
 
diff --git a/app/assets/javascripts/discourse/app/lib/text.js b/app/assets/javascripts/discourse/app/lib/text.js
index 867ecf9d32..464f9c3709 100644
--- a/app/assets/javascripts/discourse/app/lib/text.js
+++ b/app/assets/javascripts/discourse/app/lib/text.js
@@ -7,13 +7,15 @@ import { formatUsername } from "discourse/lib/utilities";
 import { Promise } from "rsvp";
 import { htmlSafe } from "@ember/template";
 
+const getURLWithCDN = url => Discourse.getURLWithCDN(url);
+
 function getOpts(opts) {
   const siteSettings = Discourse.__container__.lookup("site-settings:main"),
     site = Discourse.__container__.lookup("site:main");
 
   opts = _.merge(
     {
-      getURL: Discourse.getURLWithCDN,
+      getURL: getURLWithCDN,
       currentUser: Discourse.__container__.lookup("current-user:main"),
       censoredRegexp: site.censored_regexp,
       siteSettings,
@@ -67,7 +69,7 @@ function emojiOptions() {
   }
 
   return {
-    getURL: Discourse.getURLWithCDN,
+    getURL: url => getURLWithCDN(url),
     emojiSet: Discourse.SiteSettings.emoji_set,
     enableEmojiShortcuts: Discourse.SiteSettings.enable_emoji_shortcuts,
     inlineEmoji: Discourse.SiteSettings.enable_inline_emoji_translation
diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js
index f104c30002..b27ae52a7f 100644
--- a/app/assets/javascripts/discourse/app/lib/utilities.js
+++ b/app/assets/javascripts/discourse/app/lib/utilities.js
@@ -54,8 +54,10 @@ export function getRawSize(size) {
   return size * Math.min(3, Math.max(1, Math.round(pixelRatio)));
 }
 
+const getURLWithCDN = url => Discourse.getURLWithCDN(url);
+
 export function avatarImg(options, getURL) {
-  getURL = getURL || Discourse.getURLWithCDN;
+  getURL = getURL || getURLWithCDN;
 
   const size = translateSize(options.size);
   const url = avatarUrl(options.avatarTemplate, size);

From e1d64cf896b18533c6374bdcaf25ba32ccf988ad Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 5 May 2020 14:54:13 -0400
Subject: [PATCH 0951/1830] DEV: Have `app/app` export a class not an instance.

The app boot should call `create()`
---
 app/assets/javascripts/app-boot.js          | 2 +-
 app/assets/javascripts/discourse/app/app.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/app-boot.js b/app/assets/javascripts/app-boot.js
index 0fd7a5ea97..ef4702622a 100644
--- a/app/assets/javascripts/app-boot.js
+++ b/app/assets/javascripts/app-boot.js
@@ -4,7 +4,7 @@
   if (window.unsupportedBrowser) {
     throw "Unsupported browser detected";
   }
-  let Discourse = requirejs("discourse/app").default;
+  let Discourse = requirejs("discourse/app").default.create();
 
   // required for our template compiler
   window.__DISCOURSE_RAW_TEMPLATES = requirejs(
diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index 83e8ef8473..23ea0b1667 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -179,6 +179,6 @@ const Discourse = Application.extend(FocusEvent, {
       return this.currentAssetVersion;
     }
   })
-}).create();
+});
 
 export default Discourse;

From e7443ab5dac29c2b48924b0545be47e500a375b2 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Tue, 5 May 2020 12:12:22 -0700
Subject: [PATCH 0952/1830] FIX: Preserve code blocks when quoting (#9632)

But, produce a non-block quote if a single code line is quoted.
---
 .../javascripts/discourse/app/lib/utilities.js   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js
index b27ae52a7f..439b521e38 100644
--- a/app/assets/javascripts/discourse/app/lib/utilities.js
+++ b/app/assets/javascripts/discourse/app/lib/utilities.js
@@ -136,6 +136,7 @@ export function selectedText() {
   for (let r = 0; r < selection.rangeCount; r++) {
     const range = selection.getRangeAt(r);
     const $ancestor = $(range.commonAncestorContainer);
+    const $codeBlockTest = $ancestor.parent("pre");
 
     // ensure we never quote text in the post menu area
     const $postMenuArea = $ancestor.find(".post-menu-area")[0];
@@ -143,7 +144,20 @@ export function selectedText() {
       range.setEndBefore($postMenuArea);
     }
 
-    $div.append(range.cloneContents());
+    if ($codeBlockTest.length) {
+      const $code = $("<code>");
+      $code.append(range.cloneContents());
+      // Even though this was a code block, produce a non-block quote if it's a single line.
+      if (/\n/.test($code.text())) {
+        const $pre = $("<pre>");
+        $pre.append($code);
+        $div.append($pre);
+      } else {
+        $div.append($code);
+      }
+    } else {
+      $div.append(range.cloneContents());
+    }
   }
 
   return toMarkdown($div.html());

From e27f07e57ded9898030c54b65aefbc76547d04e8 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 5 May 2020 17:18:36 -0400
Subject: [PATCH 0953/1830] minor followup to 657facb

---
 app/assets/stylesheets/common/base/_topic-list.scss | 1 +
 config/locales/client.en.yml                        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 2bf7e0c24d..9570a2994b 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -288,6 +288,7 @@ ol.category-breadcrumb {
 .top-title-buttons {
   display: inline-flex;
   margin: 0.25em 0;
+  flex-wrap: wrap;
 
   button {
     margin-right: 0.5em;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 7dacfab23b..b4b6ad31f2 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3060,7 +3060,7 @@ en:
         this_month: "Month"
         this_week: "Week"
         today: "Today"
-        other_periods: "see top"
+        other_periods: "see top:"
 
     browser_update: 'Unfortunately, <a href="https://www.discourse.org/faq/#browser">your browser is too old to work on this site</a>. Please <a href="https://browsehappy.com">upgrade your browser</a> to view rich content, login, and reply.'
 

From 27d1a605af0d2dffa08fd5e819e1548a797e1d24 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 5 May 2020 17:31:35 -0400
Subject: [PATCH 0954/1830] revert spacing reduction from 4afbcb9

---
 app/assets/stylesheets/mobile/header.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss
index 59bb253de2..54ec7a9677 100644
--- a/app/assets/stylesheets/mobile/header.scss
+++ b/app/assets/stylesheets/mobile/header.scss
@@ -38,7 +38,8 @@
       }
       .header-title {
         font-size: $font-0;
-        margin: 0 0 0.25em 0;
+        // the margin-bottom here is fragile, changing it can cause tag alignment issues
+        margin: 0 0 0.35em 0;
         .archetype-private_message & {
           // PMs might have participant avatars in the header
           margin: 0 0 0.15em 0;

From 0a766b594e715f188d063404ccd4d7a7b9b32104 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 5 May 2020 19:50:00 -0400
Subject: [PATCH 0955/1830] add class for topic-list dismiss button container

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

diff --git a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
index 8f13b1b615..2bb1379c80 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
@@ -3,7 +3,7 @@
 {{/if}}
 
 {{#if showDismissAtTop}}
-  <div class="row">
+  <div class="row dismiss-container-top">
     {{#if showDismissRead}}
       {{d-button
         class="btn-default dismiss-read"

From 4e1c2fbd18a833ea56a83047dfbe41bb7355a742 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 5 May 2020 21:00:40 -0400
Subject: [PATCH 0956/1830] UX: Add prefixed property so Firefox also gets
 4-space tabs in code

---
 app/assets/stylesheets/common/foundation/base.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index ab3e2cc791..280a7e1c97 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -103,6 +103,7 @@ fieldset {
 
 pre code {
   overflow: auto;
+  -moz-tab-size: 4;
   tab-size: 4;
 }
 

From b299f5f49108e1872eb896ff5935995d5515ebf2 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 5 May 2020 10:00:34 +0800
Subject: [PATCH 0957/1830] DEV: Use Ember.Service over manually registering a
 factory.

Follow up to 9e827eb420c7aefd166fba1e7724eced81aaffe7
---
 .../inject-discourse-objects.js               |  9 ++-
 .../composer-presence-display.js.es6          | 19 +----
 .../components/topic-presence-display.js.es6  | 11 +--
 .../initializers/discourse-presence.js.es6    | 32 ---------
 ...resence-manager.js.es6 => presence.js.es6} | 71 +------------------
 .../services/presence-manager.js.es6          | 70 ++++++++++++++++++
 6 files changed, 83 insertions(+), 129 deletions(-)
 delete mode 100644 plugins/discourse-presence/assets/javascripts/discourse/initializers/discourse-presence.js.es6
 rename plugins/discourse-presence/assets/javascripts/discourse/lib/{presence-manager.js.es6 => presence.js.es6} (77%)
 create mode 100644 plugins/discourse-presence/assets/javascripts/discourse/services/presence-manager.js.es6

diff --git a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
index b41299712e..8140c5f1e8 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
@@ -28,7 +28,10 @@ export default {
 
     const messageBus = window.MessageBus;
     app.register("message-bus:main", messageBus, { instantiate: false });
-    ALL_TARGETS.forEach(t => app.inject(t, "messageBus", "message-bus:main"));
+
+    ALL_TARGETS.concat("service").forEach(t =>
+      app.inject(t, "messageBus", "message-bus:main")
+    );
 
     const currentUser = User.current();
     app.register("current-user:main", currentUser, { instantiate: false });
@@ -47,7 +50,7 @@ export default {
 
     const siteSettings = app.SiteSettings;
     app.register("site-settings:main", siteSettings, { instantiate: false });
-    ALL_TARGETS.forEach(t =>
+    ALL_TARGETS.concat("service").forEach(t =>
       app.inject(t, "siteSettings", "site-settings:main")
     );
 
@@ -77,7 +80,7 @@ export default {
     );
 
     if (currentUser) {
-      ["component", "route", "controller"].forEach(t => {
+      ["component", "route", "controller", "service"].forEach(t => {
         app.inject(t, "currentUser", "current-user:main");
       });
     }
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index a371e5f4a9..6f94bad993 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -1,17 +1,12 @@
 import Component from "@ember/component";
-import { getOwner } from "@ember/application";
 import { cancel } from "@ember/runloop";
 import { equal, gt } from "@ember/object/computed";
+import { inject as service } from "@ember/service";
 import discourseComputed, {
   observes,
   on
 } from "discourse-common/utils/decorators";
-import {
-  REPLYING,
-  CLOSED,
-  EDITING,
-  COMPOSER_TYPE
-} from "../lib/presence-manager";
+import { REPLYING, CLOSED, EDITING, COMPOSER_TYPE } from "../lib/presence";
 import { REPLY, EDIT } from "discourse/models/composer";
 
 export default Component.extend({
@@ -22,15 +17,7 @@ export default Component.extend({
   reply: null,
   title: null,
   isWhispering: null,
-  presenceManager: null,
-
-  init() {
-    this._super(...arguments);
-
-    this.setProperties({
-      presenceManager: getOwner(this).lookup("presence-manager:main")
-    });
-  },
+  presenceManager: service(),
 
   @discourseComputed("topic.id")
   users(topicId) {
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
index 2f683ca741..c44742c9aa 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
@@ -1,17 +1,12 @@
 import Component from "@ember/component";
-import { getOwner } from "@ember/application";
 import { gt } from "@ember/object/computed";
+import { inject as service } from "@ember/service";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
-import { TOPIC_TYPE } from "../lib/presence-manager";
+import { TOPIC_TYPE } from "../lib/presence";
 
 export default Component.extend({
   topic: null,
-  presenceManager: null,
-
-  init() {
-    this._super(...arguments);
-    this.set("presenceManager", getOwner(this).lookup("presence-manager:main"));
-  },
+  presenceManager: service(),
 
   @discourseComputed("topic.id")
   users(topicId) {
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/initializers/discourse-presence.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/initializers/discourse-presence.js.es6
deleted file mode 100644
index 1009fc1453..0000000000
--- a/plugins/discourse-presence/assets/javascripts/discourse/initializers/discourse-presence.js.es6
+++ /dev/null
@@ -1,32 +0,0 @@
-import { withPluginApi } from "discourse/lib/plugin-api";
-import PresenceManager from "../lib/presence-manager";
-import ENV from "discourse-common/config/environment";
-
-function initializeDiscoursePresence(api, { app }) {
-  const currentUser = api.getCurrentUser();
-
-  if (currentUser) {
-    app.register(
-      "presence-manager:main",
-      PresenceManager.create({
-        currentUser,
-        messageBus: api.container.lookup("message-bus:main"),
-        siteSettings: api.container.lookup("site-settings:main")
-      }),
-      { instantiate: false }
-    );
-  }
-}
-
-export default {
-  name: "discourse-presence",
-  after: "message-bus",
-
-  initialize(container, app) {
-    const siteSettings = container.lookup("site-settings:main");
-
-    if (siteSettings.presence_enabled && ENV.environment !== "test") {
-      withPluginApi("0.8.40", initializeDiscoursePresence, { app });
-    }
-  }
-};
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/lib/presence-manager.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/lib/presence.js.es6
similarity index 77%
rename from plugins/discourse-presence/assets/javascripts/discourse/lib/presence-manager.js.es6
rename to plugins/discourse-presence/assets/javascripts/discourse/lib/presence.js.es6
index 1be35640ca..57eedc0525 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/lib/presence-manager.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/lib/presence.js.es6
@@ -214,73 +214,4 @@ const Presence = EmberObject.extend({
   }
 });
 
-const PresenceManager = EmberObject.extend({
-  presences: null,
-  currentUser: null,
-  messageBus: null,
-  siteSettings: null,
-
-  init() {
-    this._super(...arguments);
-
-    this.setProperties({
-      presences: {}
-    });
-  },
-
-  subscribe(topicId, type) {
-    if (!topicId) return;
-    this._getPresence(topicId).subscribe(type);
-  },
-
-  unsubscribe(topicId, type) {
-    if (!topicId) return;
-    const presence = this._getPresence(topicId);
-
-    if (presence.unsubscribe(type)) {
-      delete this.presences[topicId];
-    }
-  },
-
-  users(topicId) {
-    if (!topicId) return [];
-    return this._getPresence(topicId).users;
-  },
-
-  editingUsers(topicId) {
-    if (!topicId) return [];
-    return this._getPresence(topicId).editingUsers;
-  },
-
-  throttlePublish(topicId, state, whisper, postId) {
-    if (!topicId) return;
-    return this._getPresence(topicId).throttlePublish(state, whisper, postId);
-  },
-
-  publish(topicId, state, whisper, postId) {
-    if (!topicId) return;
-    return this._getPresence(topicId).publish(state, whisper, postId);
-  },
-
-  cleanUpPresence(type) {
-    Object.keys(this.presences).forEach(key => {
-      this.publish(key, CLOSED);
-      this.unsubscribe(key, type);
-    });
-  },
-
-  _getPresence(topicId) {
-    if (!this.presences[topicId]) {
-      this.presences[topicId] = Presence.create({
-        messageBus: this.messageBus,
-        siteSettings: this.siteSettings,
-        currentUser: this.currentUser,
-        topicId
-      });
-    }
-
-    return this.presences[topicId];
-  }
-});
-
-export default PresenceManager;
+export default Presence;
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/services/presence-manager.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/services/presence-manager.js.es6
new file mode 100644
index 0000000000..1aaca2d1ac
--- /dev/null
+++ b/plugins/discourse-presence/assets/javascripts/discourse/services/presence-manager.js.es6
@@ -0,0 +1,70 @@
+import Service from "@ember/service";
+import Presence, { CLOSED } from "../lib/presence";
+
+const PresenceManager = Service.extend({
+  presences: null,
+
+  init() {
+    this._super(...arguments);
+
+    this.setProperties({
+      presences: {}
+    });
+  },
+
+  subscribe(topicId, type) {
+    if (!topicId) return;
+    this._getPresence(topicId).subscribe(type);
+  },
+
+  unsubscribe(topicId, type) {
+    if (!topicId) return;
+    const presence = this._getPresence(topicId);
+
+    if (presence.unsubscribe(type)) {
+      delete this.presences[topicId];
+    }
+  },
+
+  users(topicId) {
+    if (!topicId) return [];
+    return this._getPresence(topicId).users;
+  },
+
+  editingUsers(topicId) {
+    if (!topicId) return [];
+    return this._getPresence(topicId).editingUsers;
+  },
+
+  throttlePublish(topicId, state, whisper, postId) {
+    if (!topicId) return;
+    return this._getPresence(topicId).throttlePublish(state, whisper, postId);
+  },
+
+  publish(topicId, state, whisper, postId) {
+    if (!topicId) return;
+    return this._getPresence(topicId).publish(state, whisper, postId);
+  },
+
+  cleanUpPresence(type) {
+    Object.keys(this.presences).forEach(key => {
+      this.publish(key, CLOSED);
+      this.unsubscribe(key, type);
+    });
+  },
+
+  _getPresence(topicId) {
+    if (!this.presences[topicId]) {
+      this.presences[topicId] = Presence.create({
+        messageBus: this.messageBus,
+        siteSettings: this.siteSettings,
+        currentUser: this.currentUser,
+        topicId
+      });
+    }
+
+    return this.presences[topicId];
+  }
+});
+
+export default PresenceManager;

From 1062dbc3e9cbf9370803c0acea55eb3c054060ca Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 5 May 2020 16:42:48 +0800
Subject: [PATCH 0958/1830] FIX: Discobot has not been created with our custom
 avatar.

Previously the image was imported from a Discourse hosted CDN but the
URL has since become invalid. However, it was not caught since all
errors are rescued. This commit fixes the issue by shipping the user
avatar with the plugin.
---
 app/models/user_avatar.rb                     |  28 ++++++++-----
 .../assets/images/discobot.png                | Bin 0 -> 10343 bytes
 .../db/fixtures/001_discobot.rb               |  38 ++++++++----------
 3 files changed, 35 insertions(+), 31 deletions(-)
 create mode 100644 plugins/discourse-narrative-bot/assets/images/discobot.png

diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index f6dbf13312..e2b7f44dc6 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -96,16 +96,31 @@ class UserAvatar < ActiveRecord::Base
 
     return unless tempfile
 
-    ext = FastImage.type(tempfile).to_s
-    tempfile.rewind
+    create_custom_avatar(
+      user,
+      tempfile,
+      override_gravatar: options&.dig(:override_gravatar),
+      origin: avatar_url
+    )
+  rescue Net::ReadTimeout, OpenURI::HTTPError
+    # skip saving, we are not connected to the net
+  ensure
+    tempfile.close! if tempfile && tempfile.respond_to?(:close!)
+  end
 
-    upload = UploadCreator.new(tempfile, "external-avatar." + ext, origin: avatar_url, type: "avatar").create_for(user.id)
+  def self.create_custom_avatar(user, file, override_gravatar: false, origin: nil)
+    ext = FastImage.type(file).to_s
+    file.rewind
+
+    upload = UploadCreator.new(file, "external-avatar.#{ext}",
+      origin: origin,
+      type: "avatar"
+    ).create_for(user.id)
 
     user.create_user_avatar! unless user.user_avatar
 
     if !user.user_avatar.contains_upload?(upload.id)
       user.user_avatar.update!(custom_upload_id: upload.id)
-      override_gravatar = !options || options[:override_gravatar]
 
       if user.uploaded_avatar_id.nil? ||
           !user.user_avatar.contains_upload?(user.uploaded_avatar_id) ||
@@ -114,11 +129,6 @@ class UserAvatar < ActiveRecord::Base
         user.update!(uploaded_avatar_id: upload.id)
       end
     end
-
-  rescue Net::ReadTimeout, OpenURI::HTTPError
-    # skip saving, we are not connected to the net
-  ensure
-    tempfile.close! if tempfile && tempfile.respond_to?(:close!)
   end
 
   def self.ensure_consistency!
diff --git a/plugins/discourse-narrative-bot/assets/images/discobot.png b/plugins/discourse-narrative-bot/assets/images/discobot.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6c711304241edfc3e23d08a463cb4fbffcb7e7d
GIT binary patch
literal 10343
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

literal 0
HcmV?d00001

diff --git a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
index 3972a350fb..f30861e89a 100644
--- a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
+++ b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
@@ -1,23 +1,24 @@
 # frozen_string_literal: true
 
 discobot_username = 'discobot'
+discobot_user_id = -2
 
-def seed_primary_email
+def seed_primary_email(user_id)
   UserEmail.seed do |ue|
-    ue.id = -2
+    ue.id = user_id
     ue.email = "discobot_email"
     ue.primary = true
-    ue.user_id = -2
+    ue.user_id = user_id
   end
 end
 
-unless user = User.find_by(id: -2)
+unless user = User.find_by(id: discobot_user_id)
   suggested_username = UserNameSuggester.suggest(discobot_username)
 
-  seed_primary_email
+  seed_primary_email(discobot_user_id)
 
   User.seed do |u|
-    u.id = -2
+    u.id = discobot_user_id
     u.name = discobot_username
     u.username = suggested_username
     u.username_lower = suggested_username.downcase
@@ -26,26 +27,13 @@ unless user = User.find_by(id: -2)
     u.approved = true
     u.trust_level = TrustLevel[4]
   end
-
-  # TODO Pull the user avatar from that thread for now. In the future, pull it from a local file or from some central discobot repo.
-  if !Rails.env.test?
-    begin
-      UserAvatar.import_url_for_user(
-        "https://cdn.discourse.org/dev/uploads/default/original/2X/e/edb63d57a720838a7ce6a68f02ba4618787f2299.png",
-        User.find(-2),
-        override_gravatar: true
-      )
-    rescue
-      # In case the avatar can't be downloaded, don't fail seed
-    end
-  end
 end
 
-bot = User.find(-2)
+bot = User.find(discobot_user_id)
 
 # ensure discobot has a primary email
 unless bot.primary_email
-  seed_primary_email
+  seed_primary_email(discobot_user_id)
   bot.reload
 end
 
@@ -62,4 +50,10 @@ if !bot.user_profile.bio_raw
   )
 end
 
-Group.user_trust_level_change!(-2, TrustLevel[4])
+if !Rails.env.test? && (bot.user_avatar&.custom_upload_id.blank?)
+  File.open(Rails.root.join("plugins", "discourse-narrative-bot", "assets", "images", "discobot.png"), 'r') do |file|
+    UserAvatar.create_custom_avatar(bot, file, override_gravatar: true)
+  end
+end
+
+Group.user_trust_level_change!(discobot_user_id, TrustLevel[4])

From 4f26893d57c80fe59db323ed42bfc6e6d2110173 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 6 May 2020 00:02:49 -0400
Subject: [PATCH 0959/1830] UX: Fix time alignment on user activity pages

---
 .../stylesheets/common/components/user-stream-item.scss    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/components/user-stream-item.scss b/app/assets/stylesheets/common/components/user-stream-item.scss
index 76321a2eb2..56f4b74532 100644
--- a/app/assets/stylesheets/common/components/user-stream-item.scss
+++ b/app/assets/stylesheets/common/components/user-stream-item.scss
@@ -39,11 +39,16 @@
   .time,
   .delete-info,
   .draft-type {
-    margin-left: auto;
+    float: right;
     color: $primary-medium;
     font-size: $font-down-2;
   }
 
+  .notification .time {
+    margin-left: auto;
+    float: none;
+  }
+
   .draft-type {
     clear: right;
   }

From 4239ca1f8d172f6a5c8342996ceefe9887f7a263 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 6 May 2020 14:23:13 +1000
Subject: [PATCH 0960/1830] FIX: Change user digest email total unread
 notification calculation (#9648)

We now add together unread notifications (which are low-priority only) and unread high priority notifications (PMs and bookmark reminder notifications), and removed the separate "X unread high priority notifications" count in the user digest email.
---
 app/mailers/user_notifications.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 7b35e9b3e8..d1e883f4f4 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -213,12 +213,12 @@ class UserNotifications < ActionMailer::Base
                    value: new_topics_count,
                    href: "#{Discourse.base_url}/new" }]
 
-      value = user.unread_notifications
+      # totalling unread notifications (which are low-priority only) and unread
+      # PMs and bookmark reminder notifications, so the total is both unread low
+      # and high priority PMs
+      value = user.unread_notifications + user.unread_high_priority_notifications
       @counts << { label_key: 'user_notifications.digest.unread_notifications', value: value, href: "#{Discourse.base_url}/my/notifications" } if value > 0
 
-      value = user.unread_high_priority_notifications
-      @counts << { label_key: 'user_notifications.digest.unread_high_priority', value: value, href: "#{Discourse.base_url}/my/notifications" } if value > 0
-
       if @counts.size < 3
         value = user.unread_notifications_of_type(Notification.types[:liked])
         @counts << { label_key: 'user_notifications.digest.liked_received', value: value, href: "#{Discourse.base_url}/my/notifications" } if value > 0

From fa572d3a7a6a3e107fdbc5f00e04d2bb990ab77d Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 6 May 2020 15:22:43 +1000
Subject: [PATCH 0961/1830] DEV: Remove all code referencing at_desktop
 bookmark reminders (#9650)

We have found no need for these reminder types, so we are removing the code for them.
---
 .../discourse/app/controllers/bookmark.js     | 10 ---
 .../javascripts/discourse/app/lib/bookmark.js |  1 -
 .../app/templates/modal/bookmark.hbs          |  6 --
 .../discourse/app/widgets/post-menu.js        |  2 -
 .../bookmark_reminder_notifications.rb        | 83 +------------------
 app/models/bookmark.rb                        | 13 +--
 config/locales/server.de.yml                  |  2 +-
 config/locales/server.en.yml                  |  2 +-
 config/locales/server.es.yml                  |  2 +-
 config/locales/server.fi.yml                  |  2 +-
 config/locales/server.he.yml                  |  2 +-
 config/locales/server.it.yml                  |  2 +-
 config/locales/server.ko.yml                  |  2 +-
 config/locales/server.nl.yml                  |  2 +-
 config/locales/server.pl_PL.yml               |  2 +-
 config/locales/server.ru.yml                  |  2 +-
 config/locales/server.sv.yml                  |  2 +-
 config/locales/server.tr_TR.yml               |  2 +-
 config/locales/server.uk.yml                  |  2 +-
 config/locales/server.zh_CN.yml               |  2 +-
 config/site_settings.yml                      |  4 -
 ...6_migrate_at_desktop_bookmark_reminders.rb | 17 ++++
 lib/auth/default_current_user_provider.rb     |  4 -
 lib/bookmark_manager.rb                       | 13 ---
 lib/bookmark_reminder_notification_handler.rb | 30 -------
 .../default_current_user_provider_spec.rb     |  8 --
 .../bookmark_reminder_notifications_spec.rb   | 68 ---------------
 spec/lib/bookmark_manager_spec.rb             | 62 +-------------
 ...mark_reminder_notification_handler_spec.rb | 56 -------------
 spec/requests/bookmarks_controller_spec.rb    |  2 +-
 30 files changed, 36 insertions(+), 371 deletions(-)
 create mode 100644 db/migrate/20200506044956_migrate_at_desktop_bookmark_reminders.rb

diff --git a/app/assets/javascripts/discourse/app/controllers/bookmark.js b/app/assets/javascripts/discourse/app/controllers/bookmark.js
index 38ce4c76ad..992c3228a0 100644
--- a/app/assets/javascripts/discourse/app/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/app/controllers/bookmark.js
@@ -175,14 +175,6 @@ export default Controller.extend(ModalFunctionality, {
     return isPresent(id);
   },
 
-  @discourseComputed()
-  showAtDesktop() {
-    return (
-      this.siteSettings.enable_bookmark_at_desktop_reminders &&
-      this.site.mobileView
-    );
-  },
-
   @discourseComputed("selectedReminderType")
   customDateTimeSelected(selectedReminderType) {
     return selectedReminderType === REMINDER_TYPES.CUSTOM;
@@ -346,8 +338,6 @@ export default Controller.extend(ModalFunctionality, {
     }
 
     switch (this.selectedReminderType) {
-      case REMINDER_TYPES.AT_DESKTOP:
-        return null;
       case REMINDER_TYPES.LATER_TODAY:
         return this.laterToday();
       case REMINDER_TYPES.NEXT_BUSINESS_DAY:
diff --git a/app/assets/javascripts/discourse/app/lib/bookmark.js b/app/assets/javascripts/discourse/app/lib/bookmark.js
index 8874034e9a..ebad371313 100644
--- a/app/assets/javascripts/discourse/app/lib/bookmark.js
+++ b/app/assets/javascripts/discourse/app/lib/bookmark.js
@@ -17,7 +17,6 @@ export function formattedReminderTime(reminderAt, timezone) {
 }
 
 export const REMINDER_TYPES = {
-  AT_DESKTOP: "at_desktop",
   LATER_TODAY: "later_today",
   NEXT_BUSINESS_DAY: "next_business_day",
   TOMORROW: "tomorrow",
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
index 821ffe1976..2cac81e9b6 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
@@ -26,12 +26,6 @@
 
       {{#if userHasTimezoneSet}}
         {{#tap-tile-grid activeTile=selectedReminderType as |grid|}}
-          {{#if showAtDesktop}}
-            {{#tap-tile icon="desktop" tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
-              <div class="tap-tile-title">{{i18n "bookmarks.reminders.at_desktop"}}</div>
-            {{/tap-tile}}
-          {{/if}}
-
           {{#if showLaterToday}}
             {{#tap-tile icon="far-moon" tileId=reminderTypes.LATER_TODAY activeTile=grid.activeTile onChange=(action "selectReminderType")}}
               <div class="tap-tile-title">{{i18n "bookmarks.reminders.later_today"}}</div>
diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
index b02253a8e1..376772c237 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@@ -306,8 +306,6 @@ registerButton("bookmark", attrs => {
       );
       title = "bookmarks.created_with_reminder";
       titleOptions.date = formattedReminder;
-    } else if (attrs.bookmarkReminderType === "at_desktop") {
-      title = "bookmarks.created_with_at_desktop_reminder";
     } else {
       title = "bookmarks.created";
     }
diff --git a/app/jobs/scheduled/bookmark_reminder_notifications.rb b/app/jobs/scheduled/bookmark_reminder_notifications.rb
index 4dca47c1f6..cb7b016074 100644
--- a/app/jobs/scheduled/bookmark_reminder_notifications.rb
+++ b/app/jobs/scheduled/bookmark_reminder_notifications.rb
@@ -6,9 +6,6 @@ module Jobs
   # Any leftovers will be caught in the next run, because the reminder_at column
   # is set to NULL once a reminder has been sent.
   class BookmarkReminderNotifications < ::Jobs::Scheduled
-    JOB_RUN_NUMBER_KEY ||= 'jobs_bookmark_reminder_notifications_job_run_num'
-    AT_DESKTOP_CONSISTENCY_RUN_NUMBER ||= 6
-
     every 5.minutes
 
     def self.max_reminder_notifications_per_run
@@ -21,88 +18,10 @@ module Jobs
     end
 
     def execute(args = nil)
-      bookmarks = Bookmark.pending_reminders
-        .where.not(reminder_type: Bookmark.reminder_types[:at_desktop])
-        .includes(:user).order('reminder_at ASC')
-
+      bookmarks = Bookmark.pending_reminders.includes(:user).order('reminder_at ASC')
       bookmarks.limit(BookmarkReminderNotifications.max_reminder_notifications_per_run).each do |bookmark|
         BookmarkReminderNotificationHandler.send_notification(bookmark)
       end
-
-      # we only want to ensure the desktop consistency every X runs of this job
-      # (every 30 mins in this case) so we don't bother redis too much, and the
-      # at desktop consistency problem should not really happen unless people
-      # are setting the "at desktop" reminder, going out for milk, and never coming
-      # back
-      current_job_run_number = Discourse.redis.get(JOB_RUN_NUMBER_KEY).to_i
-      if current_job_run_number == AT_DESKTOP_CONSISTENCY_RUN_NUMBER
-        ensure_at_desktop_consistency
-      end
-
-      increment_job_run_number(current_job_run_number)
-    end
-
-    def increment_job_run_number(current_job_run_number)
-      if current_job_run_number.zero? || current_job_run_number == AT_DESKTOP_CONSISTENCY_RUN_NUMBER
-        new_job_run_number = 1
-      else
-        new_job_run_number = current_job_run_number + 1
-      end
-      Discourse.redis.set(JOB_RUN_NUMBER_KEY, new_job_run_number)
-    end
-
-    def ensure_at_desktop_consistency
-      pending_at_desktop_bookmark_reminders = \
-        Bookmark.includes(:user)
-          .references(:user)
-          .pending_at_desktop_reminders
-          .where('users.last_seen_at >= :one_day_ago', one_day_ago: 1.day.ago.utc)
-
-      return if pending_at_desktop_bookmark_reminders.count.zero?
-
-      unique_users = pending_at_desktop_bookmark_reminders.map(&:user).uniq.map { |u| [u.id, u] }.flatten
-      unique_users = Hash[*unique_users]
-      pending_reminders_for_redis_check = unique_users.keys.map do |user_id|
-        "#{BookmarkReminderNotificationHandler::PENDING_AT_DESKTOP_KEY_PREFIX}#{user_id}"
-      end
-
-      Discourse.redis.mget(pending_reminders_for_redis_check).each.with_index do |value, idx|
-        next if value.present?
-        user_id = pending_reminders_for_redis_check[idx][/\d+/].to_i
-        user = unique_users[user_id]
-
-        user_pending_bookmark_reminders = pending_at_desktop_bookmark_reminders.select do |bookmark|
-          bookmark.user == user
-        end
-
-        user_expired_bookmark_reminders = user_pending_bookmark_reminders.select do |bookmark|
-          bookmark.reminder_set_at <= expiry_limit_datetime
-        end
-
-        next if user_pending_bookmark_reminders.length == user_expired_bookmark_reminders.length
-
-        # only tell the cache-gods that this user has pending "at desktop" reminders
-        # if they haven't let them all expire before coming back to their desktop
-        #
-        # the next time they visit the desktop the reminders will be cleared out once
-        # the notifications are sent
-        BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user)
-      end
-
-      clear_expired_at_desktop_reminders
-    end
-
-    def clear_expired_at_desktop_reminders
-      Bookmark
-        .pending_at_desktop_reminders
-        .where('reminder_set_at <= :expiry_limit_datetime', expiry_limit_datetime: expiry_limit_datetime)
-        .update_all(
-          reminder_set_at: nil, reminder_type: nil
-        )
-    end
-
-    def expiry_limit_datetime
-      BookmarkReminderNotificationHandler::PENDING_AT_DESKTOP_EXPIRY_DAYS.days.ago.utc
     end
   end
 end
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index 2dc9733e6c..3cfae4fe17 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -6,8 +6,8 @@ class Bookmark < ActiveRecord::Base
   belongs_to :topic
 
   validates :reminder_at, presence: {
-    message: I18n.t("bookmarks.errors.time_must_be_provided", reminder_type: I18n.t("bookmarks.reminders.at_desktop")),
-    if: -> { reminder_type.present? && reminder_type != Bookmark.reminder_types[:at_desktop] }
+    message: I18n.t("bookmarks.errors.time_must_be_provided"),
+    if: -> { reminder_type.present? }
   }
 
   validate :unique_per_post_for_user
@@ -47,21 +47,12 @@ class Bookmark < ActiveRecord::Base
     where("reminder_at IS NOT NULL AND reminder_at <= :before_time", before_time: before_time)
   end
 
-  scope :pending_at_desktop_reminders, ->(before_time = Time.now.utc) do
-    where("reminder_at IS NULL AND reminder_type = :at_desktop", at_desktop: reminder_types[:at_desktop])
-  end
-
   scope :pending_reminders_for_user, ->(user) do
     pending_reminders.where(user: user)
   end
 
-  scope :at_desktop_reminders_for_user, ->(user) do
-    where("reminder_type = :at_desktop AND user_id = :user_id", at_desktop: reminder_types[:at_desktop], user_id: user.id)
-  end
-
   def self.reminder_types
     @reminder_type = Enum.new(
-      at_desktop: 0,
       later_today: 1,
       next_business_day: 2,
       tomorrow: 3,
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 9efbe74319..1d9b104de1 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -325,7 +325,7 @@ de:
   bookmarks:
     errors:
       already_bookmarked_post: "Du kannst denselben Beitrag nicht zweimal zu deinen Lesezeichen hinzufügen."
-      time_must_be_provided: "Zeit muss eingestellt werden für alle Erinnerungen ausser '%{reminder_type}'"
+      time_must_be_provided: "Zeit muss eingestellt werden für alle Erinnerungen"
     reminders:
       at_desktop: "Nächstes mal wenn ich an meinem PC bin"
       later_today: "Im Laufe des Tages"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index bb7863aa18..f49bb37979 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -391,7 +391,7 @@ en:
       already_bookmarked_post: "You cannot bookmark the same post twice."
       cannot_set_past_reminder: "You cannot set a bookmark reminder in the past."
       cannot_set_reminder_in_distant_future: "You cannot set a bookmark reminder more than 10 years in the future."
-      time_must_be_provided: "time must be provided for all reminders except '%{reminder_type}'"
+      time_must_be_provided: "time must be provided for all reminders"
 
     reminders:
       at_desktop: "Next time I'm at my desktop"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 1c4e406b11..cfb25c5694 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -335,7 +335,7 @@ es:
       already_bookmarked_post: "No puedes guardar la misma publicación en marcadores dos veces."
       cannot_set_past_reminder: "No puedes establecer un recordatorio de marcador en el pasado."
       cannot_set_reminder_in_distant_future: "No puedes establecer un recordatorio de marcador más de 10 años en el futuro."
-      time_must_be_provided: "se debe especificar la hora para todos los recordatorios excepto '%{reminder_type}'"
+      time_must_be_provided: "se debe especificar la hora para todos los recordatorios"
     reminders:
       at_desktop: "La próxima vez que esté en mi ordenador"
       later_today: "Más tarde, hoy"
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 73a9acd1dc..7fbbb3a1a8 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -326,7 +326,7 @@ fi:
       already_bookmarked_post: "Samaa viestiä ei voi kirjanmerkitä kahdesti."
       cannot_set_past_reminder: "Kirjanmerkkimuistutusta ei voi asettaa menneisyyteen."
       cannot_set_reminder_in_distant_future: "Kirjanmerkkimuistutusta ei voi asettaa yli 10 vuoden päähän tulevaisuuteen."
-      time_must_be_provided: "kaikkiin muistutuksiin paitsi '%{reminder_type}' tarvitaan aika"
+      time_must_be_provided: "kaikkiin muistutuksiin tarvitaan aika"
     reminders:
       at_desktop: "Ensi kerralla kun olen työpöytäympäristössäni"
       later_today: "Myöhemmin tänään"
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index f8caa6b2bb..314d2d907c 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -369,7 +369,7 @@ he:
       already_bookmarked_post: "אי אפשר לסמן את אותו הפוסט פעמיים"
       cannot_set_past_reminder: "אי אפשר להגדיר תזכורת סימנייה למועד שעבר."
       cannot_set_reminder_in_distant_future: "לא ניתן להגדיר תזכורת סימנייה למעבר ל־10 שנים בעתיד."
-      time_must_be_provided: "צריך לציין זמן לכל התזכורות למעט ‚%{reminder_type}’"
+      time_must_be_provided: "צריך לציין זמן לכל התזכורות"
     reminders:
       at_desktop: "בשימוש הבא דרך שולחן העבודה"
       later_today: "בהמשך היום"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index fb079d6788..e1de966519 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -334,7 +334,7 @@ it:
       already_bookmarked_post: "Non puoi aggiungere due volte lo stesso messaggio nei segnalibri."
       cannot_set_past_reminder: "Non è possibile impostare un promemoria per un segnalibro nel passato."
       cannot_set_reminder_in_distant_future: "Non è possibile impostare un promemoria per un segnalibro per più di 10 anni nel futuro."
-      time_must_be_provided: "l'ora deve essere fornita per tutti i promemoria tranne '%{reminder_type}'"
+      time_must_be_provided: "l'ora deve essere fornita per tutti i promemoria"
     reminders:
       at_desktop: "La prossima volta che sarò al mio desktop"
       later_today: "Più tardi oggi"
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index ae56e14962..dc8ec6212a 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -302,7 +302,7 @@ ko:
       already_bookmarked_post: "동일한 게시물을 두 번 북마크 할 수 없습니다."
       cannot_set_past_reminder: "과거에는 북마크 미리 알림을 설정할 수 없습니다."
       cannot_set_reminder_in_distant_future: "앞으로 10 년 이상 책갈피 알림을 설정할 수 없습니다."
-      time_must_be_provided: "&#39;%{reminder_type}&#39;을 제외한 모든 알림에 시간을 제공해야합니다."
+      time_must_be_provided: "을 모든 알림에 시간을 제공해야합니다."
     reminders:
       at_desktop: "다음에 저는 데스크탑에 있습니다"
       later_today: "오늘 늦게"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 647ec1fcc0..34ffb7558d 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -335,7 +335,7 @@ nl:
       already_bookmarked_post: "U kunt geen twee bladwijzers voor hetzelfde bericht maken."
       cannot_set_past_reminder: "U kunt geen bladwijzerherinnering in het verleden instellen."
       cannot_set_reminder_in_distant_future: "U kunt geen bladwijzerherinnering later dan over 10 jaar instellen."
-      time_must_be_provided: "tijd moet voor alle herinneringen behalve '%{reminder_type}' worden opgegeven"
+      time_must_be_provided: "tijd moet voor alle herinneringen worden opgegeven"
     reminders:
       at_desktop: "De volgende keer vanaf mijn computer"
       later_today: "Later vandaag"
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 02bb335598..356901790a 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -352,7 +352,7 @@ pl_PL:
       already_bookmarked_post: "Nie możesz dodać zakładki do tego samego postu dwa razy."
       cannot_set_past_reminder: "W przeszłości nie można ustawić przypomnienia o zakładce."
       cannot_set_reminder_in_distant_future: "Nie możesz ustawić przypomnienia o zakładce na więcej niż 10 lat w przyszłości."
-      time_must_be_provided: "dla wszystkich przypomnień należy przewidzieć czas z wyjątkiem „%{reminder_type}”"
+      time_must_be_provided: "dla wszystkich przypomnień należy przewidzieć czas"
     reminders:
       at_desktop: "Następnym razem będę na swoim pulpicie"
       later_today: "Później dzisiaj"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 1cfe19be31..9289721673 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -359,7 +359,7 @@ ru:
       already_bookmarked_post: "Вы не можете дважды добавить сообщение в закладки"
       cannot_set_past_reminder: "Нельзя указать уже прошедшую дату напоминания."
       cannot_set_reminder_in_distant_future: "Нельзя указать дату напоминания, отличающуюся от текущей более чем на 10 лет. "
-      time_must_be_provided: "время должно быть установлено для всех напоминаний, кроме '%{reminder_type}'"
+      time_must_be_provided: "время должно быть установлено для всех напоминаний"
     reminders:
       at_desktop: "При следующем посещении форума"
       later_today: "Сегодня, но позже"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 8cb45527a3..6686010862 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -335,7 +335,7 @@ sv:
       already_bookmarked_post: "Du kan inte bokmärka samma inlägg två gånger."
       cannot_set_past_reminder: "Du kan inte sätta en påminnelse för bokmärke i det förflutna."
       cannot_set_reminder_in_distant_future: "Du kan inte sätta en påminnelse för bokmärke mer än 10 år framåt i tiden."
-      time_must_be_provided: "tid måste tillhandahållas för alla påminnelser utom '%{reminder_type}'"
+      time_must_be_provided: "tid måste tillhandahållas för alla påminnelser"
     reminders:
       at_desktop: "Nästa gång är jag vid datorn"
       later_today: "Senare idag"
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 063fbd4e00..a9c04b6ca1 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -324,7 +324,7 @@ tr_TR:
   bookmarks:
     errors:
       already_bookmarked_post: "Aynı gönderiyi iki kez işaretleyemezsiniz."
-      time_must_be_provided: "&#39;%{reminder_type}&#39; dışındaki tüm hatırlatıcılara zaman verilmelidir"
+      time_must_be_provided: "Tüm hatırlatıcılara zaman verilmelidir"
     reminders:
       at_desktop: "Bir dahaki sefere masaüstümdeyim"
       later_today: "Bugün ilerleyen saatlerde"
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index f71315c01e..92e1287ab5 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -354,7 +354,7 @@ uk:
   bookmarks:
     errors:
       already_bookmarked_post: "Ви не можете зробити закладку на одну публікацію двічі."
-      time_must_be_provided: "Для всіх нагадувань повинен бути встановлений час, крім '%{reminder_type}'"
+      time_must_be_provided: "Для всіх нагадувань повинен бути встановлений час"
     reminders:
       at_desktop: "Наступного разу на мій робочий стіл"
       later_today: "Пізніше сьогодні"
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 845f67887f..d1f5b7c61f 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -318,7 +318,7 @@ zh_CN:
       already_bookmarked_post: "你不能将同一帖子收藏两次。"
       cannot_set_past_reminder: "你不能在此主题设置收藏提醒。"
       cannot_set_reminder_in_distant_future: "你不能够设置一个大于十年的收藏提醒。"
-      time_must_be_provided: "必须为除“ %{reminder_type}”以外的所有提醒提供时间"
+      time_must_be_provided: "必须为除提醒提供时间"
     reminders:
       at_desktop: "下次我使用桌面设备时"
       later_today: "今天的某个时候"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index edda4aa263..ea4bbd4b66 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -294,10 +294,6 @@ basic:
     client: true
     default: true
     hidden: true
-  enable_bookmark_at_desktop_reminders:
-    client: true
-    default: false
-    hidden: true
   push_notifications_prompt:
     default: true
     client: true
diff --git a/db/migrate/20200506044956_migrate_at_desktop_bookmark_reminders.rb b/db/migrate/20200506044956_migrate_at_desktop_bookmark_reminders.rb
new file mode 100644
index 0000000000..add607b31d
--- /dev/null
+++ b/db/migrate/20200506044956_migrate_at_desktop_bookmark_reminders.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class MigrateAtDesktopBookmarkReminders < ActiveRecord::Migration[6.0]
+  def up
+    # reminder_type 0 is at_desktop, which is no longer valid
+    DB.exec(
+      <<~SQL, now: Time.zone.now
+        UPDATE bookmarks SET reminder_type = NULL, reminder_at = NULL, updated_at = :now
+        WHERE reminder_type = 0
+      SQL
+    )
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index acd9381771..81217248a5 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -124,10 +124,6 @@ class Auth::DefaultCurrentUserProvider
         u.update_last_seen!
         u.update_ip_address!(ip)
       end
-
-      BookmarkReminderNotificationHandler.defer_at_desktop_reminder(
-        user: u, request_user_agent: @request.user_agent
-      )
     end
 
     @env[CURRENT_USER_KEY] = current_user
diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index 1670a97661..23328021f6 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -29,7 +29,6 @@ class BookmarkManager
 
     update_topic_user_bookmarked(topic: post.topic, bookmarked: true)
 
-    BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(@user)
     bookmark
   end
 
@@ -40,7 +39,6 @@ class BookmarkManager
     raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_delete?(bookmark)
 
     bookmark.destroy
-    clear_at_desktop_cache_if_required
 
     bookmarks_remaining_in_topic = Bookmark.exists?(topic_id: bookmark.topic_id, user: @user)
     if !bookmarks_remaining_in_topic
@@ -61,8 +59,6 @@ class BookmarkManager
 
       update_topic_user_bookmarked(topic: topic, bookmarked: false)
     end
-
-    clear_at_desktop_cache_if_required
   end
 
   def self.send_reminder_notification(id)
@@ -94,15 +90,6 @@ class BookmarkManager
 
   private
 
-  def clear_at_desktop_cache_if_required
-    return if user_has_any_pending_at_desktop_reminders?
-    Discourse.redis.del(BookmarkReminderNotificationHandler::PENDING_AT_DESKTOP_KEY_PREFIX + @user.id.to_s)
-  end
-
-  def user_has_any_pending_at_desktop_reminders?
-    Bookmark.at_desktop_reminders_for_user(@user).any?
-  end
-
   def update_topic_user_bookmarked(topic:, bookmarked:)
     TopicUser.change(@user.id, topic, bookmarked: bookmarked)
   end
diff --git a/lib/bookmark_reminder_notification_handler.rb b/lib/bookmark_reminder_notification_handler.rb
index e129b4ac19..223c55b2ac 100644
--- a/lib/bookmark_reminder_notification_handler.rb
+++ b/lib/bookmark_reminder_notification_handler.rb
@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 class BookmarkReminderNotificationHandler
-  PENDING_AT_DESKTOP_KEY_PREFIX ||= 'pending_at_desktop_bookmark_reminder_user_'
-  PENDING_AT_DESKTOP_EXPIRY_DAYS ||= 20
-
   def self.send_notification(bookmark)
     return if bookmark.blank?
     Bookmark.transaction do
@@ -42,31 +39,4 @@ class BookmarkReminderNotificationHandler
       }.to_json
     )
   end
-
-  def self.user_has_pending_at_desktop_reminders?(user)
-    Discourse.redis.exists("#{PENDING_AT_DESKTOP_KEY_PREFIX}#{user.id}")
-  end
-
-  def self.cache_pending_at_desktop_reminder(user)
-    Discourse.redis.setex("#{PENDING_AT_DESKTOP_KEY_PREFIX}#{user.id}", PENDING_AT_DESKTOP_EXPIRY_DAYS.days, true)
-  end
-
-  def self.send_at_desktop_reminder(user:, request_user_agent:)
-    return if MobileDetection.mobile_device?(request_user_agent)
-
-    return if !user_has_pending_at_desktop_reminders?(user)
-
-    DistributedMutex.synchronize("sending_at_desktop_bookmark_reminders_user_#{user.id}") do
-      Bookmark.at_desktop_reminders_for_user(user).each do |bookmark|
-        BookmarkReminderNotificationHandler.send_notification(bookmark)
-      end
-      Discourse.redis.del("#{PENDING_AT_DESKTOP_KEY_PREFIX}#{user.id}")
-    end
-  end
-
-  def self.defer_at_desktop_reminder(user:, request_user_agent:)
-    Scheduler::Defer.later "Sending Desktop Bookmark Reminders" do
-      send_at_desktop_reminder(user: user, request_user_agent: request_user_agent)
-    end
-  end
 end
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index e5ce0ced7b..141382da8c 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -502,14 +502,6 @@ describe Auth::DefaultCurrentUserProvider do
         expect(u.last_seen_at).to eq(nil)
       end
     end
-
-    it "defers any at_desktop bookmark reminders" do
-      BookmarkReminderNotificationHandler.expects(:defer_at_desktop_reminder).with(
-        user: user, request_user_agent: 'test'
-      )
-      provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}", "HTTP_USER_AGENT" => 'test')
-      provider2.current_user
-    end
   end
 
   it "should update last seen for non ajax" do
diff --git a/spec/jobs/bookmark_reminder_notifications_spec.rb b/spec/jobs/bookmark_reminder_notifications_spec.rb
index 58f7262503..0bcfa0b3d2 100644
--- a/spec/jobs/bookmark_reminder_notifications_spec.rb
+++ b/spec/jobs/bookmark_reminder_notifications_spec.rb
@@ -48,28 +48,6 @@ RSpec.describe Jobs::BookmarkReminderNotifications do
     expect(bookmark4.reload.reminder_at).not_to eq(nil)
   end
 
-  it "increments the job run number correctly and resets to 1 when it reaches 6" do
-    expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq(nil)
-    subject.execute
-    expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq('1')
-    subject.execute
-    subject.execute
-    subject.execute
-    subject.execute
-    subject.execute
-    expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq('6')
-    subject.execute
-    expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq('1')
-  end
-
-  context "when one of the bookmark reminder types is at_desktop" do
-    let(:bookmark1) { Fabricate(:bookmark, reminder_type: :at_desktop) }
-    it "is not included in the run, because it is not time-based" do
-      BookmarkManager.any_instance.expects(:send_reminder_notification).with(bookmark1.id).never
-      subject.execute
-    end
-  end
-
   context "when the number of notifications exceed max_reminder_notifications_per_run" do
     it "does not send them in the current run, but will send them in the next" do
       begin
@@ -81,50 +59,4 @@ RSpec.describe Jobs::BookmarkReminderNotifications do
       end
     end
   end
-
-  context "when this is the 6th run (so every half hour) of this job we need to ensure consistency of at_desktop reminders" do
-    let(:set_at) { Time.zone.now }
-    let!(:bookmark) do
-      Fabricate(
-        :bookmark,
-        reminder_type: Bookmark.reminder_types[:at_desktop],
-        reminder_at: nil,
-        reminder_set_at: set_at
-      )
-    end
-    before do
-      Discourse.redis.set(Jobs::BookmarkReminderNotifications::JOB_RUN_NUMBER_KEY, 6)
-      bookmark.user.update(last_seen_at: Time.zone.now - 1.minute)
-    end
-    context "when an at_desktop reminder is not pending in redis for a user who should have one" do
-      it "puts the pending reminder into redis" do
-        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(false)
-        subject.execute
-        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(true)
-      end
-
-      context "if the user has not been seen in the past 24 hours" do
-        before do
-          bookmark.user.update(last_seen_at: Time.zone.now - 25.hours)
-        end
-        it "does not put the pending reminder into redis" do
-          subject.execute
-          expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(false)
-        end
-      end
-
-      context "if the at_desktop reminder is expired (set over PENDING_AT_DESKTOP_EXPIRY_DAYS days ago)" do
-        let(:set_at) { Time.zone.now - (BookmarkReminderNotificationHandler::PENDING_AT_DESKTOP_EXPIRY_DAYS + 1).days }
-        it "does not put the pending reminder into redis, and clears the reminder type/time" do
-          expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(false)
-          subject.execute
-          expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(false)
-          bookmark.reload
-          expect(bookmark.reminder_set_at).to eq(nil)
-          expect(bookmark.reminder_last_sent_at).to eq(nil)
-          expect(bookmark.reminder_type).to eq(nil)
-        end
-      end
-    end
-  end
 end
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index 34b029b515..d821e99446 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -42,28 +42,6 @@ RSpec.describe BookmarkManager do
       end
     end
 
-    context "when the reminder type is at_desktop" do
-      let(:reminder_type) { 'at_desktop' }
-      let(:reminder_at) { nil }
-
-      def create_bookmark
-        subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
-      end
-
-      it "this is a special case which needs client-side logic and has no reminder_at datetime" do
-        create_bookmark
-        bookmark = Bookmark.find_by(user: user)
-
-        expect(bookmark.reminder_at).to eq(nil)
-        expect(bookmark.reminder_type).to eq(Bookmark.reminder_types[:at_desktop])
-      end
-
-      it "sets a redis key for the user so we know they have a pending at_desktop reminder" do
-        create_bookmark
-        expect(Discourse.redis.get("pending_at_desktop_bookmark_reminder_user_#{user.id}")).not_to eq(nil)
-      end
-    end
-
     context "when the bookmark already exists for the user & post" do
       before do
         Bookmark.create(post: post, user: user, topic: post.topic)
@@ -80,7 +58,7 @@ RSpec.describe BookmarkManager do
       it "adds an error to the manager" do
         subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at)
         expect(subject.errors.full_messages).to include(
-          "Reminder at " + I18n.t("bookmarks.errors.time_must_be_provided", reminder_type: I18n.t("bookmarks.reminders.at_desktop"))
+          "Reminder at " + I18n.t("bookmarks.errors.time_must_be_provided")
         )
       end
     end
@@ -157,25 +135,6 @@ RSpec.describe BookmarkManager do
         expect { subject.destroy(9999) }.to raise_error(Discourse::NotFound)
       end
     end
-
-    context "if the user has pending at desktop reminders for another bookmark" do
-      before do
-        Fabricate(:bookmark, user: user, post: Fabricate(:post), reminder_type: Bookmark.reminder_types[:at_desktop])
-        BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user)
-      end
-      it "does not clear the at bookmark redis key" do
-        subject.destroy(bookmark.id)
-        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(user)).to eq(true)
-      end
-    end
-
-    context "if the user has pending at desktop reminders for another bookmark" do
-      it "does clear the at bookmark redis key" do
-        BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user)
-        subject.destroy(bookmark.id)
-        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(user)).to eq(false)
-      end
-    end
   end
 
   describe ".update" do
@@ -241,25 +200,6 @@ RSpec.describe BookmarkManager do
       expect(Bookmark.where(user: user2, topic: topic).length).to eq(1)
     end
 
-    context "if the user has pending at desktop reminders for another bookmark" do
-      before do
-        Fabricate(:bookmark, user: user, post: Fabricate(:post), reminder_type: Bookmark.reminder_types[:at_desktop])
-        BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user)
-      end
-      it "does not clear the at bookmark redis key" do
-        subject.destroy_for_topic(topic)
-        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(user)).to eq(true)
-      end
-    end
-
-    context "if the user has pending at desktop reminders for another bookmark" do
-      it "does clear the at bookmark redis key" do
-        BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user)
-        subject.destroy_for_topic(topic)
-        expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(user)).to eq(false)
-      end
-    end
-
     it "updates the topic user bookmarked column to false" do
       TopicUser.create(user: user, topic: topic, bookmarked: true)
       subject.destroy_for_topic(topic)
diff --git a/spec/lib/bookmark_reminder_notification_handler_spec.rb b/spec/lib/bookmark_reminder_notification_handler_spec.rb
index 318a52429a..d86ce73a5e 100644
--- a/spec/lib/bookmark_reminder_notification_handler_spec.rb
+++ b/spec/lib/bookmark_reminder_notification_handler_spec.rb
@@ -37,60 +37,4 @@ RSpec.describe BookmarkReminderNotificationHandler do
       end
     end
   end
-
-  describe "#send_at_desktop_reminder" do
-    fab!(:reminder) do
-      Fabricate(
-        :bookmark,
-        user: user,
-        reminder_type: Bookmark.reminder_types[:at_desktop],
-        reminder_at: nil,
-        reminder_set_at: Time.zone.now
-      )
-    end
-    let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
-
-    context "when there are pending bookmark at desktop reminders" do
-      before do
-        described_class.cache_pending_at_desktop_reminder(user)
-      end
-
-      context "when the user agent is for mobile" do
-        let(:user_agent) { "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1" }
-        it "does not attempt to send any reminders" do
-          DistributedMutex.expects(:synchronize).never
-          send_reminder
-        end
-      end
-
-      context "when the user agent is for desktop" do
-        let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" }
-
-        it "deletes the key in redis" do
-          send_reminder
-          expect(described_class.user_has_pending_at_desktop_reminders?(user)).to eq(false)
-        end
-
-        it "sends a notification to the user and clears the reminder_at" do
-          send_reminder
-          expect(Notification.where(user: user, notification_type: Notification.types[:bookmark_reminder]).count).to eq(1)
-          expect(reminder.reload.reminder_type).to eq(nil)
-          expect(reminder.reload.reminder_last_sent_at).not_to eq(nil)
-          expect(reminder.reload.reminder_set_at).to eq(nil)
-        end
-      end
-    end
-
-    context "when there are no pending bookmark at desktop reminders" do
-      it "does nothing" do
-        DistributedMutex.expects(:synchronize).never
-        send_reminder
-      end
-    end
-
-    def send_reminder
-      subject.send_at_desktop_reminder(user: user, request_user_agent: user_agent)
-    end
-  end
-
 end
diff --git a/spec/requests/bookmarks_controller_spec.rb b/spec/requests/bookmarks_controller_spec.rb
index 8c29af8707..7c4292c78d 100644
--- a/spec/requests/bookmarks_controller_spec.rb
+++ b/spec/requests/bookmarks_controller_spec.rb
@@ -40,7 +40,7 @@ describe BookmarksController do
 
         expect(response.status).to eq(400)
         expect(JSON.parse(response.body)['errors'].first).to include(
-          I18n.t("bookmarks.errors.time_must_be_provided", reminder_type: I18n.t("bookmarks.reminders.at_desktop"))
+          I18n.t("bookmarks.errors.time_must_be_provided")
         )
       end
     end

From f8c18ac888071c1e228d84c846e3c6dfabbc6032 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 6 May 2020 16:21:48 +1000
Subject: [PATCH 0962/1830] DEV: remove fragile spec

The failover spec is very fragile and tests specific implementation
vs actual behavior

We rely on a different script during the build process to test
failover operates correctly
---
 .../postgresql_fallback_adapter_spec.rb       | 171 ------------------
 1 file changed, 171 deletions(-)
 delete mode 100644 spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb

diff --git a/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb b/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb
deleted file mode 100644
index 8a53e37c5c..0000000000
--- a/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb
+++ /dev/null
@@ -1,171 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe ActiveRecord::ConnectionHandling do
-  let(:replica_host) { "1.1.1.1" }
-  let(:replica_port) { 6432 }
-
-  let(:config) do
-    ActiveRecord::Base.connection_config.merge(
-      adapter: "postgresql_fallback",
-      replica_host: replica_host,
-      replica_port: replica_port
-    )
-  end
-
-  let(:multisite_db) { "database_2" }
-
-  let(:multisite_config) do
-    {
-      host: 'localhost1',
-      port: 5432,
-      replica_host: replica_host,
-      replica_port: replica_port
-    }
-  end
-
-  let(:postgresql_fallback_handler) { PostgreSQLFallbackHandler.instance }
-
-  before do
-    @threads = Thread.list
-    postgresql_fallback_handler.initialized = true
-  end
-
-  after do
-    Sidekiq.unpause!
-    (Thread.list - @threads).each(&:kill)
-    postgresql_fallback_handler.setup!
-
-    ActiveRecord::Base.unstub(:postgresql_connection)
-    ActiveRecord::Base.clear_all_connections!
-    ActiveRecord::Base.establish_connection
-
-    Discourse.redis.flushall
-  end
-
-  describe "#postgresql_fallback_connection" do
-    it 'should return a PostgreSQL adapter' do
-      connection = ActiveRecord::Base.postgresql_fallback_connection(config)
-
-      expect(connection)
-        .to be_an_instance_of(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-    end
-
-    context 'when master server is down' do
-      let(:replica_connection) { mock('replica_connection') }
-
-      it 'should failover to a replica server' do
-        RailsMultisite::ConnectionManagement
-          .stubs(:all_dbs)
-          .returns(['default', multisite_db])
-
-        postgresql_fallback_handler.expects(:verify_master).at_least(3)
-
-        [config, multisite_config].each do |configuration|
-          ActiveRecord::Base.expects(:postgresql_connection)
-            .with(configuration)
-            .raises(PG::ConnectionBad)
-
-          ActiveRecord::Base.expects(:verify_replica).with(replica_connection)
-
-          ActiveRecord::Base.expects(:postgresql_connection).with(
-            configuration.dup.merge(host: replica_host, port: replica_port)
-          ).returns(replica_connection)
-        end
-
-        expect(postgresql_fallback_handler.master_down?).to eq(nil)
-
-        message = MessageBus.track_publish(PostgreSQLFallbackHandler::DATABASE_DOWN_CHANNEL) do
-          expect { ActiveRecord::Base.postgresql_fallback_connection(config) }
-            .to raise_error(PG::ConnectionBad)
-        end.first
-
-        expect(message.data[:db]).to eq('default')
-        expect(message.data[:pid]).to eq(Process.pid)
-
-        expect { ActiveRecord::Base.postgresql_fallback_connection(config) }
-          .to change { Discourse.readonly_mode? }.from(false).to(true)
-
-        expect(postgresql_fallback_handler.master_down?).to eq(true)
-        expect(Sidekiq.paused?).to eq(true)
-
-        with_multisite_db(multisite_db) do
-          begin
-            expect(postgresql_fallback_handler.master_down?).to eq(nil)
-
-            message = MessageBus.track_publish(PostgreSQLFallbackHandler::DATABASE_DOWN_CHANNEL) do
-              expect { ActiveRecord::Base.postgresql_fallback_connection(multisite_config) }
-                .to raise_error(PG::ConnectionBad)
-            end.first
-
-            expect(message.data[:db]).to eq(multisite_db)
-
-            expect do
-              ActiveRecord::Base.postgresql_fallback_connection(multisite_config)
-            end.to change { Discourse.readonly_mode? }.from(false).to(true)
-
-            expect(postgresql_fallback_handler.master_down?).to eq(true)
-          ensure
-            postgresql_fallback_handler.master_up(multisite_db)
-            expect(postgresql_fallback_handler.master_down?).to eq(nil)
-          end
-        end
-
-        ActiveRecord::Base.unstub(:postgresql_connection)
-
-        postgresql_fallback_handler.initiate_fallback_to_master
-
-        expect(Discourse.readonly_mode?).to eq(false)
-        expect(Sidekiq.paused?).to eq(false)
-        expect(ActiveRecord::Base.connection_pool.connections.count).to eq(0)
-        expect(postgresql_fallback_handler.master_down?).to eq(nil)
-
-        expect(ActiveRecord::Base.connection)
-          .to be_an_instance_of(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-      end
-    end
-
-    context 'when both master and replica server is down' do
-      it 'should raise the right error' do
-        ActiveRecord::Base.expects(:postgresql_connection)
-          .with(config)
-          .raises(PG::ConnectionBad)
-          .once
-
-        ActiveRecord::Base.expects(:postgresql_connection)
-          .with(
-            config.dup.merge(host: replica_host, port: replica_port)
-          )
-          .raises(PG::ConnectionBad)
-          .once
-
-        postgresql_fallback_handler.expects(:verify_master).twice
-
-        2.times do
-          expect { ActiveRecord::Base.postgresql_fallback_connection(config) }
-            .to raise_error(PG::ConnectionBad)
-        end
-      end
-    end
-  end
-
-  describe '.verify_replica' do
-    describe 'when database is not in recovery' do
-      it 'should raise the right error' do
-        expect do
-          ActiveRecord::Base.send(:verify_replica, ActiveRecord::Base.connection)
-        end.to raise_error(RuntimeError, "Replica database server is not in recovery mode.")
-      end
-    end
-  end
-
-  def with_multisite_db(dbname)
-    begin
-      RailsMultisite::ConnectionManagement.expects(:current_db).returns(dbname).at_least_once
-      yield
-    ensure
-      RailsMultisite::ConnectionManagement.unstub(:current_db)
-    end
-  end
-end

From 5121708814b12280b64bad821a5eb20cdd32f51c Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 6 May 2020 15:58:30 +0530
Subject: [PATCH 0963/1830] Add styling for Reddit video onebox.

https://github.com/discourse/onebox/commit/0d49811aac2927823c65fc0c6acae5150d33c5cc
---
 .../stylesheets/common/base/onebox.scss       | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 4c0a9f357b..6d4f66d16f 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -188,7 +188,7 @@ aside.onebox {
 
       // full size images for instagram, twitter, etc.
       .aspect-image-full-size {
-        max-height: 500px;
+        max-height: 100%;
         width: calc(500px * var(--aspect-ratio));
         max-width: 100%;
 
@@ -280,6 +280,18 @@ aside.onebox {
       right: 10px;
       position: absolute;
     }
+
+    .reddit-video-icon {
+      &:before {
+        opacity: 0.8;
+        content: svg-uri(
+          '<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 512 512" fill="white"><path d="M424.4 214.7L72.4 6.6C43.8-10.3 0 6.1 0 47.9V464c0 37.5 40.7 60.1 72.4 41.3l352-208c31.4-18.5 31.5-64.1 0-82.6z"></path></svg>'
+        );
+      }
+      bottom: 155px;
+      right: 50px;
+      position: absolute;
+    }
   }
 }
 
@@ -663,6 +675,13 @@ aside.onebox.stackexchange .onebox-body {
   }
 }
 
+.onebox.reddit {
+  div.description {
+    color: dark-light-choose($primary-medium, $secondary-medium);
+    padding-top: 10px;
+  }
+}
+
 .onebox.githubcommit {
   pre.message {
     padding: 0;

From 72ad701df0663d6a131531faf506d5424e3ebfb6 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 6 May 2020 11:58:35 +0100
Subject: [PATCH 0964/1830] DEV: Stub #flush in StdOutDemux for
 multisite:migrate

https://meta.discourse.org/t/multisite-migrate-error/150579/2
---
 lib/tasks/db.rake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 81087473a0..5a6c67c918 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -91,6 +91,10 @@ class StdOutDemux
       @data.delete Thread.current
     end
   end
+
+  def flush
+    # Do nothing
+  end
 end
 
 task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |_, args|

From 8ede0e7bc2aceffb535f44c05eecca9b187e8b5c Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 6 May 2020 17:55:00 +0530
Subject: [PATCH 0965/1830] Bump onebox version.

- add linkedin and meetedgar to whitelist
- FEATURE: reddit video onebox
- FEATURE: facebook video onebox
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d16ced6284..48dbd444f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -241,7 +241,7 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.9.27.2)
+    onebox (1.9.28)
       addressable (~> 2.7.0)
       htmlentities (~> 4.3)
       multi_json (~> 1.11)

From e23f1a907134d5241101109401b2a097132c81ee Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 6 May 2020 15:03:06 +0200
Subject: [PATCH 0966/1830] DEV: Move rubocop config to rubocop-discourse
 (#9616)

---
 .rubocop.yml | 359 +--------------------------------------------------
 Gemfile      |   2 -
 Gemfile.lock |   2 -
 3 files changed, 2 insertions(+), 361 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 0cb02e3e97..d46296cf88 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,357 +1,2 @@
-require:
-  - rubocop-discourse
-  - rubocop-rspec
-
-AllCops:
-  TargetRubyVersion: 2.6
-  DisabledByDefault: true
-  Exclude:
-    - "db/schema.rb"
-    - "bundle/**/*"
-    - "vendor/**/*"
-    - "node_modules/**/*"
-    - "public/**/*"
-    - "plugins/**/gems/**/*"
-
-Discourse:
-  Enabled: true
-
-Discourse/NoChdir:
-  Exclude:
-    - 'spec/**/*' # Specs are run sequentially, so chdir can be used
-    - 'plugins/*/spec/**/*'
-
-# Prefer &&/|| over and/or.
-Style/AndOr:
-  Enabled: true
-
-Style/FrozenStringLiteralComment:
-  Enabled: true
-
-# Align `when` with `case`.
-Layout/CaseIndentation:
-  Enabled: true
-
-# Align comments with method definitions.
-Layout/CommentIndentation:
-  Enabled: true
-
-# No extra empty lines.
-Layout/EmptyLines:
-  Enabled: true
-
-# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
-Style/HashSyntax:
-  Enabled: true
-
-# Two spaces, no tabs (for indentation).
-Layout/IndentationWidth:
-  Enabled: true
-
-Layout/SpaceAfterColon:
-  Enabled: true
-
-Layout/SpaceAfterComma:
-  Enabled: true
-
-Layout/SpaceAroundEqualsInParameterDefault:
-  Enabled: true
-
-Layout/SpaceAroundKeyword:
-  Enabled: true
-
-Layout/SpaceAroundOperators:
-  Enabled: true
-
-Layout/SpaceBeforeFirstArg:
-  Enabled: true
-
-# Defining a method with parameters needs parentheses.
-Style/MethodDefParentheses:
-  Enabled: true
-
-# Use `foo {}` not `foo{}`.
-Layout/SpaceBeforeBlockBraces:
-  Enabled: true
-
-# Use `foo { bar }` not `foo {bar}`.
-Layout/SpaceInsideBlockBraces:
-  Enabled: true
-
-# Use `{ a: 1 }` not `{a:1}`.
-Layout/SpaceInsideHashLiteralBraces:
-  Enabled: true
-
-Layout/SpaceInsideParens:
-  Enabled: true
-
-# Detect hard tabs, no hard tabs.
-Layout/IndentationStyle:
-  Enabled: true
-
-# Blank lines should not have any spaces.
-Layout/TrailingEmptyLines:
-  Enabled: true
-
-# No trailing whitespace.
-Layout/TrailingWhitespace:
-  Enabled: true
-
-Lint/Debugger:
-  Enabled: true
-
-Layout/BlockAlignment:
-  Enabled: true
-
-# Align `end` with the matching keyword or starting expression except for
-# assignments, where it should be aligned with the LHS.
-Layout/EndAlignment:
-  Enabled: true
-  EnforcedStyleAlignWith: variable
-
-# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
-Lint/RequireParentheses:
-  Enabled: true
-
-Lint/ShadowingOuterLocalVariable:
-  Enabled: true
-
-Layout/MultilineMethodCallIndentation:
-  Enabled: true
-  EnforcedStyle: indented
-
-Layout/HashAlignment:
-  Enabled: true
-
-Bundler/OrderedGems:
-  Enabled: false
-
-Style/SingleLineMethods:
-  Enabled: true
-
-Style/Semicolon:
-  Enabled: true
-  AllowAsExpressionSeparator: true
-
-Style/RedundantReturn:
-  Enabled: true
-
-Style/GlobalVars:
-  Enabled: true
-  Severity: warning
-  Exclude:
-    - 'lib/tasks/**/*'
-    - 'script/**/*'
-    - 'spec/**/*.rb'
-    - 'plugins/*/spec/**/*'
-
-# Specs
-
-RSpec/AnyInstance:
-  Enabled: false # To be decided
-
-RSpec/AroundBlock:
-  Enabled: true
-
-RSpec/BeforeAfterAll:
-  Enabled: false # To be decided
-
-RSpec/ContextMethod:
-  Enabled: false # TODO
-
-RSpec/ContextWording:
-  Enabled: false # To be decided
-
-RSpec/DescribeClass:
-  Enabled: false # To be decided
-
-RSpec/DescribeMethod:
-  Enabled: true
-
-RSpec/DescribeSymbol:
-  Enabled: false # To be decided
-
-RSpec/DescribedClass:
-  Enabled: false # To be decided
-
-RSpec/DescribedClassModuleWrapping:
-  Enabled: false # To be decided
-
-RSpec/EmptyExampleGroup:
-  Enabled: true
-  Exclude:
-    - 'spec/requests/api/*'
-
-RSpec/EmptyLineAfterExample:
-  Enabled: false # TODO
-
-RSpec/EmptyLineAfterExampleGroup:
-  Enabled: false # TODO
-
-RSpec/EmptyLineAfterFinalLet:
-  Enabled: false # TODO
-
-RSpec/EmptyLineAfterHook:
-  Enabled: false # TODO
-
-RSpec/EmptyLineAfterSubject:
-  Enabled: false # TODO
-
-RSpec/ExampleLength:
-  Enabled: false # To be decided
-
-RSpec/ExampleWithoutDescription:
-  Enabled: true
-
-RSpec/ExampleWording:
-  Enabled: false # TODO
-
-RSpec/ExpectActual:
-  Enabled: true
-
-RSpec/ExpectChange:
-  Enabled: false # To be decided
-
-RSpec/ExpectInHook:
-  Enabled: false # To be decided
-
-RSpec/ExpectOutput:
-  Enabled: true
-
-RSpec/FilePath:
-  Enabled: false # To be decided
-
-RSpec/Focus:
-  Enabled: true
-
-RSpec/HookArgument:
-  Enabled: false # TODO
-
-RSpec/HooksBeforeExamples:
-  Enabled: false # TODO
-
-RSpec/ImplicitBlockExpectation:
-  Enabled: true
-
-RSpec/ImplicitExpect:
-  Enabled: false # To be decided
-
-RSpec/ImplicitSubject:
-  Enabled: false # To be decided
-
-RSpec/InstanceSpy:
-  Enabled: true
-
-RSpec/InstanceVariable:
-  Enabled: false # TODO
-
-RSpec/InvalidPredicateMatcher:
-  Enabled: true
-
-RSpec/ItBehavesLike:
-  Enabled: true
-
-RSpec/IteratedExpectation:
-  Enabled: false # To be decided
-
-RSpec/LeadingSubject:
-  Enabled: false # TODO
-
-RSpec/LeakyConstantDeclaration:
-  Enabled: false # To be decided
-
-RSpec/LetBeforeExamples:
-  Enabled: false # TODO
-
-RSpec/LetSetup:
-  Enabled: false # TODO
-
-RSpec/MessageChain:
-  Enabled: true
-
-RSpec/MessageSpies:
-  Enabled: true
-
-RSpec/MissingExampleGroupArgument:
-  Enabled: true
-
-RSpec/MultipleDescribes:
-  Enabled: false # TODO
-
-RSpec/MultipleSubjects:
-  Enabled: true
-
-RSpec/NamedSubject:
-  Enabled: false # To be decided
-
-RSpec/NestedGroups:
-  Enabled: false # To be decided
-
-RSpec/OverwritingSetup:
-  Enabled: true
-
-RSpec/ReceiveCounts:
-  Enabled: true
-
-RSpec/ReceiveNever:
-  Enabled: true
-
-RSpec/RepeatedDescription:
-  Enabled: false # TODO
-
-RSpec/RepeatedExample:
-  Enabled: false # TODO
-
-RSpec/RepeatedExampleGroupBody:
-  Enabled: false # TODO
-
-RSpec/RepeatedExampleGroupDescription:
-  Enabled: false # TODO
-
-RSpec/ReturnFromStub:
-  Enabled: true
-
-RSpec/ScatteredSetup:
-  Enabled: false # TODO
-
-RSpec/SharedContext:
-  Enabled: true
-
-RSpec/SharedExamples:
-  Enabled: true
-
-RSpec/SingleArgumentMessageChain:
-  Enabled: true
-
-RSpec/SubjectStub:
-  Enabled: true
-
-RSpec/UnspecifiedException:
-  Enabled: true
-
-RSpec/VerifiedDoubles:
-  Enabled: true
-
-RSpec/VoidExpect:
-  Enabled: true
-
-RSpec/Yield:
-  Enabled: true
-
-Capybara/CurrentPathExpectation:
-  Enabled: true
-
-Capybara/FeatureMethods:
-  Enabled: true
-
-FactoryBot/AttributeDefinedStatically:
-  Enabled: true
-
-FactoryBot/CreateList:
-  Enabled: true
-
-FactoryBot/FactoryClassName:
-  Enabled: true
-
-Rails/HttpStatus:
-  Enabled: true
+inherit_gem:
+  rubocop-discourse: default.yml
diff --git a/Gemfile b/Gemfile
index 742bf82d0b..039acc6a2a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -172,9 +172,7 @@ group :test, :development do
   gem 'shoulda-matchers', require: false
   gem 'rspec-html-matchers'
   gem 'byebug', require: ENV['RM_INFO'].nil?, platform: :mri
-  gem 'rubocop', require: false
   gem "rubocop-discourse", require: false
-  gem "rubocop-rspec", require: false
   gem 'parallel_tests'
 
   gem 'rswag-specs'
diff --git a/Gemfile.lock b/Gemfile.lock
index 48dbd444f9..6c378be0a3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -528,9 +528,7 @@ DEPENDENCIES
   rspec-rails
   rswag-specs
   rtlit
-  rubocop
   rubocop-discourse
-  rubocop-rspec
   ruby-prof
   ruby-readability
   rubyzip

From eda2d184d6e89963a35148ed285ff772f8fd0e38 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 6 May 2020 09:13:58 -0400
Subject: [PATCH 0967/1830] Backwards compatibility for raw-templates lib

---
 app/assets/javascripts/discourse-loader.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index bafa10820a..5d189a2857 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -5,7 +5,8 @@ var define, requirejs;
   var EMBER_MODULES = {};
   var ALIASES = {
     "ember-addons/ember-computed-decorators":
-      "discourse-common/utils/decorators"
+      "discourse-common/utils/decorators",
+    "discourse/lib/raw-templates": "discourse-common/lib/raw-templates"
   };
   if (typeof Ember !== "undefined") {
     EMBER_MODULES = {

From 10ca6968af15e4c8125043fdeadeadef4670375a Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 6 May 2020 19:33:50 +0530
Subject: [PATCH 0968/1830] Bump onebox version

- reuse existing video icon class
- CSS changes for reddit video onebox
---
 Gemfile.lock                                   |  2 +-
 app/assets/stylesheets/common/base/onebox.scss | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6c378be0a3..6d97e8a504 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -241,7 +241,7 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.9.28)
+    onebox (1.9.28.1)
       addressable (~> 2.7.0)
       htmlentities (~> 4.3)
       multi_json (~> 1.11)
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 6d4f66d16f..e31e660b7f 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -276,22 +276,10 @@ aside.onebox {
           '<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 512 512" fill="white"><path d="M424.4 214.7L72.4 6.6C43.8-10.3 0 6.1 0 47.9V464c0 37.5 40.7 60.1 72.4 41.3l352-208c31.4-18.5 31.5-64.1 0-82.6z"></path></svg>'
         );
       }
-      bottom: 10px;
+      bottom: 15px;
       right: 10px;
       position: absolute;
     }
-
-    .reddit-video-icon {
-      &:before {
-        opacity: 0.8;
-        content: svg-uri(
-          '<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 512 512" fill="white"><path d="M424.4 214.7L72.4 6.6C43.8-10.3 0 6.1 0 47.9V464c0 37.5 40.7 60.1 72.4 41.3l352-208c31.4-18.5 31.5-64.1 0-82.6z"></path></svg>'
-        );
-      }
-      bottom: 155px;
-      right: 50px;
-      position: absolute;
-    }
   }
 }
 
@@ -676,6 +664,9 @@ aside.onebox.stackexchange .onebox-body {
 }
 
 .onebox.reddit {
+  div.aspect-image-full-size {
+    position: relative;
+  }
   div.description {
     color: dark-light-choose($primary-medium, $secondary-medium);
     padding-top: 10px;

From 7c2d3275f4c4da07302f94518a7ff63f567fd72d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 6 May 2020 10:35:15 -0400
Subject: [PATCH 0969/1830] DEV: Remove `Discourse` constants from focus mixin.

Also removes the mixin which was only used in `app/app`
---
 .../addon/mixins/focus-event.js               | 45 -------------------
 app/assets/javascripts/discourse/app/app.js   | 39 ++++++++++++++--
 .../inject-discourse-objects.js               |  1 +
 3 files changed, 37 insertions(+), 48 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse-common/addon/mixins/focus-event.js

diff --git a/app/assets/javascripts/discourse-common/addon/mixins/focus-event.js b/app/assets/javascripts/discourse-common/addon/mixins/focus-event.js
deleted file mode 100644
index 0688c90831..0000000000
--- a/app/assets/javascripts/discourse-common/addon/mixins/focus-event.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import { bind } from "@ember/runloop";
-import { getOwner } from "discourse-common/lib/get-owner";
-import Mixin from "@ember/object/mixin";
-
-export default Mixin.create({
-  ready() {
-    this._super(...arguments);
-
-    this._onChangeHandler = bind(this, this._onChange);
-
-    // Default to true
-    Discourse.set("hasFocus", true);
-
-    document.addEventListener("visibilitychange", this._onChangeHandler);
-    document.addEventListener("resume", this._onChangeHandler);
-    document.addEventListener("freeze", this._onChangeHandler);
-  },
-
-  reset() {
-    this._super(...arguments);
-
-    document.removeEventListener("visibilitychange", this._onChangeHandler);
-    document.removeEventListener("resume", this._onChangeHandler);
-    document.removeEventListener("freeze", this._onChangeHandler);
-
-    this._onChangeHandler = null;
-  },
-
-  _onChange() {
-    const container = getOwner(this);
-    const appEvents = container.lookup("service:app-events");
-
-    if (document.visibilityState === "hidden") {
-      if (Discourse.hasFocus) {
-        Discourse.set("hasFocus", false);
-        appEvents.trigger("discourse:focus-changed", false);
-      }
-    } else {
-      if (!Discourse.hasFocus) {
-        Discourse.set("hasFocus", true);
-        appEvents.trigger("discourse:focus-changed", true);
-      }
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index 23ea0b1667..b484afcf52 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -2,15 +2,18 @@
 import Application from "@ember/application";
 import { computed } from "@ember/object";
 import { buildResolver } from "discourse-common/resolver";
+import { bind } from "@ember/runloop";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import FocusEvent from "discourse-common/mixins/focus-event";
 
 const _pluginCallbacks = [];
 
-const Discourse = Application.extend(FocusEvent, {
+const Discourse = Application.extend({
   rootElement: "#main",
   _docTitle: document.title,
   __widget_helpers: {},
+  hasFocus: null,
+  _boundFocusChange: null,
+
   customEvents: {
     paste: "paste"
   },
@@ -18,6 +21,24 @@ const Discourse = Application.extend(FocusEvent, {
   reset() {
     this._super(...arguments);
     Mousetrap.reset();
+
+    document.removeEventListener("visibilitychange", this._boundFocusChange);
+    document.removeEventListener("resume", this._boundFocusChange);
+    document.removeEventListener("freeze", this._boundFocusChange);
+
+    this._boundFocusChange = null;
+  },
+
+  ready() {
+    this._super(...arguments);
+    this._boundFocusChange = bind(this, this._focusChanged);
+
+    // Default to true
+    this.set("hasFocus", true);
+
+    document.addEventListener("visibilitychange", this._boundFocusChange);
+    document.addEventListener("resume", this._boundFocusChange);
+    document.addEventListener("freeze", this._boundFocusChange);
   },
 
   getURL(url) {
@@ -178,7 +199,19 @@ const Discourse = Application.extend(FocusEvent, {
       }
       return this.currentAssetVersion;
     }
-  })
+  }),
+
+  _focusChanged() {
+    if (document.visibilityState === "hidden") {
+      if (this.hasFocus) {
+        this.set("hasFocus", false);
+        this.appEvents.trigger("discourse:focus-changed", false);
+      }
+    } else if (!this.hasFocus) {
+      this.set("hasFocus", true);
+      this.appEvents.trigger("discourse:focus-changed", true);
+    }
+  }
 });
 
 export default Discourse;
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
index 8140c5f1e8..30d1fb4e02 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
@@ -20,6 +20,7 @@ export default {
 
     // backwards compatibility: remove when plugins have updated
     app.register("store:main", Store);
+    app.appEvents = container.lookup("service:app-events");
 
     if (!app.hasRegistration("service:store")) {
       app.register("service:store", Store);

From 70bf1669bef1d5e8366da2881cf8dc896722efad Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Wed, 6 May 2020 11:54:08 -0300
Subject: [PATCH 0970/1830] DEV: Use a copy of the fixture file instead of the
 original one (#9645)

---
 spec/requests/user_avatars_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/requests/user_avatars_controller_spec.rb b/spec/requests/user_avatars_controller_spec.rb
index 6ed8d88236..9772fe4b2d 100644
--- a/spec/requests/user_avatars_controller_spec.rb
+++ b/spec/requests/user_avatars_controller_spec.rb
@@ -27,7 +27,7 @@ describe UserAvatarsController do
       # travis is not good here, no image magick
       if !ENV["TRAVIS"]
         let :upload do
-          File.open("#{Rails.root}/spec/fixtures/images/cropped.png") do |f|
+          File.open(file_from_fixtures("cropped.png")) do |f|
             UploadCreator.new(
               f,
               "test.png"

From c99ecba68f11b036dc52b8b1eec2ced6a2e9f06b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 6 May 2020 17:16:20 +0200
Subject: [PATCH 0971/1830] DEV: improves sk api (#9653)

- reduces the API to 3 actions for now: appendContent/prependContent/onChange
- well tested
- removes all previous APIS which were only half supported or too dangerous as they could collide with other plugins or core behaviors
- this plugins also puts every sk test helpers in one file
---
 .../discourse/app/lib/plugin-api.js           |   2 +-
 .../select-kit/components/select-kit.js       |  71 +----
 .../select-kit/mixins/plugin-api.js           | 264 ++----------------
 .../components/select-kit/api-test.js         | 109 ++++++++
 .../select-kit/category-chooser-test.js       |   2 +-
 .../select-kit/category-drop-test.js          |   2 +-
 .../select-kit/list-setting-test.js           |   2 +-
 .../select-kit/mini-tag-chooser-test.js       |   2 +-
 .../select-kit/multi-select-test.js           |   2 +-
 .../select-kit/notifications-button-test.js   |   5 +-
 .../select-kit/select-kit-test-helper.js      |  35 ---
 .../select-kit/single-select-test.js          |   2 +-
 .../components/select-kit/tag-drop-test.js    |   2 +-
 .../select-kit/user-chooser-test.js           |   2 +-
 test/javascripts/helpers/select-kit-helper.js |  35 +++
 15 files changed, 197 insertions(+), 340 deletions(-)
 create mode 100644 test/javascripts/components/select-kit/api-test.js
 delete mode 100644 test/javascripts/components/select-kit/select-kit-test-helper.js

diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index ab04e0e711..342dce0a6d 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -54,7 +54,7 @@ import { on } from "@ember/object/evented";
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.8.42";
+const PLUGIN_API_VERSION = "0.8.43";
 
 class PluginApi {
   constructor(version, container) {
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 61e21beeec..84f0fab35c 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -16,12 +16,8 @@ import {
 } from "@ember/runloop";
 import { Promise } from "rsvp";
 import {
-  applyHeaderContentPluginApiCallbacks,
-  applyModifyNoSelectionPluginApiCallbacks,
   applyContentPluginApiCallbacks,
-  applyOnOpenPluginApiCallbacks,
-  applyOnClosePluginApiCallbacks,
-  applyOnInputPluginApiCallbacks
+  applyOnChangePluginApiCallbacks
 } from "select-kit/mixins/plugin-api";
 
 export const MAIN_COLLECTION = "MAIN_COLLECTION";
@@ -379,15 +375,7 @@ export default Component.extend(
         cancel(this._searchPromise);
       }
 
-      const input = applyOnInputPluginApiCallbacks(
-        this.pluginApiIdentifiers,
-        event,
-        this.selectKit
-      );
-
-      if (input) {
-        debounce(this, this._debouncedInput, event.target.value, 200);
-      }
+      debounce(this, this._debouncedInput, event.target.value, 200);
     },
 
     _debouncedInput(filter) {
@@ -430,6 +418,9 @@ export default Component.extend(
         }
 
         this._boundaryActionHandler("onChange", value, items);
+
+        applyOnChangePluginApiCallbacks(value, items, this);
+
         resolve(items);
       }).finally(() => {
         if (!this.isDestroying && !this.isDestroyed) {
@@ -448,11 +439,7 @@ export default Component.extend(
     _modifyContentWrapper(content) {
       content = this.modifyContent(content);
 
-      return applyContentPluginApiCallbacks(
-        this.pluginApiIdentifiers,
-        content,
-        this.selectKit
-      );
+      return applyContentPluginApiCallbacks(content, this);
     },
 
     modifyContent(content) {
@@ -460,13 +447,7 @@ export default Component.extend(
     },
 
     _modifyNoSelectionWrapper() {
-      let none = this.modifyNoSelection();
-
-      return applyModifyNoSelectionPluginApiCallbacks(
-        this.pluginApiIdentifiers,
-        none,
-        this.selectKit
-      );
+      return this.modifyNoSelection();
     },
 
     modifyNoSelection() {
@@ -498,12 +479,6 @@ export default Component.extend(
     },
 
     _modifySelectionWrapper(item) {
-      applyHeaderContentPluginApiCallbacks(
-        this.pluginApiIdentifiers,
-        item,
-        this.selectKit
-      );
-
       return this.modifySelection(item);
     },
 
@@ -731,30 +706,14 @@ export default Component.extend(
       this.selectKit.change(null, null);
     },
 
-    _onOpenWrapper(event) {
-      let boundaryAction = this._boundaryActionHandler("onOpen");
-
-      boundaryAction = applyOnOpenPluginApiCallbacks(
-        this.pluginApiIdentifiers,
-        this.selectKit,
-        event
-      );
-
-      return boundaryAction;
+    _onOpenWrapper() {
+      return this._boundaryActionHandler("onOpen");
     },
 
-    _onCloseWrapper(event) {
+    _onCloseWrapper() {
       this.set("selectKit.highlighted", null);
 
-      let boundaryAction = this._boundaryActionHandler("onClose");
-
-      boundaryAction = applyOnClosePluginApiCallbacks(
-        this.pluginApiIdentifiers,
-        this.selectKit,
-        event
-      );
-
-      return boundaryAction;
+      return this._boundaryActionHandler("onClose");
     },
 
     _toggle(event) {
@@ -772,9 +731,7 @@ export default Component.extend(
 
       this.clearErrors();
 
-      if (!this.selectKit.onClose(event)) {
-        return;
-      }
+      this.selectKit.onClose(event);
 
       this.selectKit.setProperties({
         isExpanded: false,
@@ -789,9 +746,7 @@ export default Component.extend(
 
       this.clearErrors();
 
-      if (!this.selectKit.onOpen(event)) {
-        return;
-      }
+      this.selectKit.onOpen(event);
 
       if (!this.popper) {
         const anchor = document.querySelector(
diff --git a/app/assets/javascripts/select-kit/mixins/plugin-api.js b/app/assets/javascripts/select-kit/mixins/plugin-api.js
index 370f301b15..22f446dca6 100644
--- a/app/assets/javascripts/select-kit/mixins/plugin-api.js
+++ b/app/assets/javascripts/select-kit/mixins/plugin-api.js
@@ -12,257 +12,55 @@ function appendContent(pluginApiIdentifiers, contentFunction) {
 }
 
 let _prependContentCallbacks = {};
-function prependContent(pluginApiIdentifiers, contentFunction) {
-  if (isNone(_prependContentCallbacks[pluginApiIdentifiers])) {
-    _prependContentCallbacks[pluginApiIdentifiers] = [];
+function prependContent(targetedIdentifier, contentFunction) {
+  if (isNone(_prependContentCallbacks[targetedIdentifier])) {
+    _prependContentCallbacks[targetedIdentifier] = [];
   }
 
-  _prependContentCallbacks[pluginApiIdentifiers].push(contentFunction);
+  _prependContentCallbacks[targetedIdentifier].push(contentFunction);
 }
 
-let _filterContentCallbacks = {};
-function filterContent(pluginApiIdentifiers, contentFunction) {
-  if (isNone(_filterContentCallbacks[pluginApiIdentifiers])) {
-    _filterContentCallbacks[pluginApiIdentifiers] = [];
+let _onChangeCallbacks = {};
+function onChange(pluginApiIdentifiers, mutationFunction) {
+  if (isNone(_onChangeCallbacks[pluginApiIdentifiers])) {
+    _onChangeCallbacks[pluginApiIdentifiers] = [];
   }
 
-  _filterContentCallbacks[pluginApiIdentifiers].push(contentFunction);
+  _onChangeCallbacks[pluginApiIdentifiers].push(mutationFunction);
 }
 
-let _modifyContentCallbacks = {};
-function modifyContent(pluginApiIdentifiers, contentFunction) {
-  if (isNone(_modifyContentCallbacks[pluginApiIdentifiers])) {
-    _modifyContentCallbacks[pluginApiIdentifiers] = [];
-  }
-
-  _modifyContentCallbacks[pluginApiIdentifiers].push(contentFunction);
-}
-
-let _modifyHeaderComputedContentCallbacks = {};
-function modifyHeaderComputedContent(pluginApiIdentifiers, contentFunction) {
-  if (isNone(_modifyHeaderComputedContentCallbacks[pluginApiIdentifiers])) {
-    _modifyHeaderComputedContentCallbacks[pluginApiIdentifiers] = [];
-  }
-
-  _modifyHeaderComputedContentCallbacks[pluginApiIdentifiers].push(
-    contentFunction
-  );
-}
-
-let _modifyNoSelectionCallbacks = {};
-function modifyNoSelection(pluginApiIdentifiers, contentFunction) {
-  if (isNone(_modifyNoSelectionCallbacks[pluginApiIdentifiers])) {
-    _modifyNoSelectionCallbacks[pluginApiIdentifiers] = [];
-  }
-
-  _modifyNoSelectionCallbacks[pluginApiIdentifiers].push(contentFunction);
-}
-
-let _modifyCollectionHeaderCallbacks = {};
-function modifyCollectionHeader(pluginApiIdentifiers, contentFunction) {
-  if (isNone(_modifyCollectionHeaderCallbacks[pluginApiIdentifiers])) {
-    _modifyCollectionHeaderCallbacks[pluginApiIdentifiers] = [];
-  }
-
-  _modifyCollectionHeaderCallbacks[pluginApiIdentifiers].push(contentFunction);
-}
-
-let _onSelectCallbacks = {};
-function onSelect(pluginApiIdentifiers, mutationFunction) {
-  if (isNone(_onSelectCallbacks[pluginApiIdentifiers])) {
-    _onSelectCallbacks[pluginApiIdentifiers] = [];
-  }
-
-  _onSelectCallbacks[pluginApiIdentifiers].push(mutationFunction);
-}
-
-let _onOpenCallbacks = {};
-function onOpen(pluginApiIdentifiers, mutationFunction) {
-  if (isNone(_onOpenCallbacks[pluginApiIdentifiers])) {
-    _onOpenCallbacks[pluginApiIdentifiers] = [];
-  }
-
-  _onOpenCallbacks[pluginApiIdentifiers].push(mutationFunction);
-}
-
-let _onCloseCallbacks = {};
-function onClose(pluginApiIdentifiers, mutationFunction) {
-  if (isNone(_onCloseCallbacks[pluginApiIdentifiers])) {
-    _onCloseCallbacks[pluginApiIdentifiers] = [];
-  }
-
-  _onCloseCallbacks[pluginApiIdentifiers].push(mutationFunction);
-}
-
-let _onInputCallbacks = {};
-function onInput(pluginApiIdentifiers, mutationFunction) {
-  if (isNone(_onInputCallbacks[pluginApiIdentifiers])) {
-    _onInputCallbacks[pluginApiIdentifiers] = [];
-  }
-
-  _onInputCallbacks[pluginApiIdentifiers].push(mutationFunction);
-}
-
-export function applyContentPluginApiCallbacks(
-  identifiers,
-  content,
-  selectKit
-) {
-  identifiers.forEach(key => {
+export function applyContentPluginApiCallbacks(content, component) {
+  makeArray(component.pluginApiIdentifiers).forEach(key => {
     (_prependContentCallbacks[key] || []).forEach(c => {
-      content = makeArray(c(selectKit, content)).concat(content);
+      content = makeArray(c(component, content)).concat(content);
     });
     (_appendContentCallbacks[key] || []).forEach(c => {
-      content = content.concat(makeArray(c(selectKit, content)));
-    });
-    const filterCallbacks = _filterContentCallbacks[key] || [];
-    if (filterCallbacks.length) {
-      content = content.filter(c => {
-        let kept = true;
-        filterCallbacks.forEach(cb => {
-          kept = cb(selectKit, c);
-        });
-        return kept;
-      });
-    }
-    (_modifyContentCallbacks[key] || []).forEach(c => {
-      content = c(selectKit, content);
+      content = content.concat(makeArray(c(component, content)));
     });
   });
 
   return content;
 }
 
-export function applyHeaderContentPluginApiCallbacks(
-  identifiers,
-  content,
-  context
-) {
-  identifiers.forEach(key => {
-    (_modifyHeaderComputedContentCallbacks[key] || []).forEach(c => {
-      content = c(context, content);
-    });
-  });
-
-  return content;
-}
-export function applyModifyNoSelectionPluginApiCallbacks(
-  identifiers,
-  content,
-  context
-) {
-  identifiers.forEach(key => {
-    (_modifyNoSelectionCallbacks[key] || []).forEach(c => {
-      content = c(context, content);
-    });
-  });
-
-  return content;
-}
-
-export function applyCollectionHeaderCallbacks(
-  identifiers,
-  content,
-  selectKit
-) {
-  identifiers.forEach(key => {
-    (_modifyCollectionHeaderCallbacks[key] || []).forEach(c => {
-      content = c(selectKit, content);
-    });
-  });
-
-  return content;
-}
-
-export function applyOnSelectPluginApiCallbacks(identifiers, val, selectKit) {
-  identifiers.forEach(key => {
-    (_onSelectCallbacks[key] || []).forEach(c => c(selectKit, val));
+export function applyOnChangePluginApiCallbacks(value, items, component) {
+  makeArray(component.pluginApiIdentifiers).forEach(key => {
+    (_onChangeCallbacks[key] || []).forEach(c => c(component, value, items));
   });
 }
 
-export function applyOnOpenPluginApiCallbacks(identifiers, selectKit, event) {
-  let keepBubbling = true;
-  identifiers.forEach(key => {
-    (_onOpenCallbacks[key] || []).forEach(
-      c => (keepBubbling = c(selectKit, event))
-    );
-  });
-  return keepBubbling;
-}
-
-export function applyOnClosePluginApiCallbacks(identifiers, selectKit, event) {
-  let keepBubbling = true;
-  identifiers.forEach(key => {
-    (_onCloseCallbacks[key] || []).forEach(
-      c => (keepBubbling = c(selectKit, event))
-    );
-  });
-  return keepBubbling;
-}
-
-export function applyOnInputPluginApiCallbacks(identifiers, event, selectKit) {
-  let keepBubbling = true;
-  identifiers.forEach(key => {
-    (_onInputCallbacks[key] || []).forEach(
-      c => (keepBubbling = c(selectKit, event))
-    );
-  });
-  return keepBubbling;
-}
-
-export function modifySelectKit(pluginApiIdentifiers) {
+export function modifySelectKit(targetedIdentifier) {
   return {
-    appendContent: content => {
-      appendContent(pluginApiIdentifiers, () => {
-        return content;
-      });
-      return modifySelectKit(pluginApiIdentifiers);
+    appendContent: callback => {
+      appendContent(targetedIdentifier, callback);
+      return modifySelectKit(targetedIdentifier);
     },
-    prependContent: content => {
-      prependContent(pluginApiIdentifiers, () => {
-        return content;
-      });
-      return modifySelectKit(pluginApiIdentifiers);
+    prependContent: callback => {
+      prependContent(targetedIdentifier, callback);
+      return modifySelectKit(targetedIdentifier);
     },
-    filterContent: filterFunction => {
-      filterContent(pluginApiIdentifiers, filterFunction);
-      return modifySelectKit(pluginApiIdentifiers);
-    },
-    modifyContent: callback => {
-      modifyContent(pluginApiIdentifiers, callback);
-      return modifySelectKit(pluginApiIdentifiers);
-    },
-    modifyHeaderComputedContent: callback => {
-      modifyHeaderComputedContent(pluginApiIdentifiers, callback);
-      return modifySelectKit(pluginApiIdentifiers);
-    },
-    modifySelection: callback => {
-      modifyHeaderComputedContent(pluginApiIdentifiers, callback);
-      return modifySelectKit(pluginApiIdentifiers);
-    },
-    modifyNoSelection: callback => {
-      modifyNoSelection(pluginApiIdentifiers, callback);
-      return modifySelectKit(pluginApiIdentifiers);
-    },
-    modifyCollectionHeader: callback => {
-      modifyCollectionHeader(pluginApiIdentifiers, callback);
-      return modifySelectKit(pluginApiIdentifiers);
-    },
-    onSelect: callback => {
-      onSelect(pluginApiIdentifiers, callback);
-      return modifySelectKit(pluginApiIdentifiers);
-    },
-    onClose: callback => {
-      onClose(pluginApiIdentifiers, callback);
-      return modifySelectKit(pluginApiIdentifiers);
-    },
-    onOpen: callback => {
-      onOpen(pluginApiIdentifiers, callback);
-      return modifySelectKit(pluginApiIdentifiers);
-    },
-    onInput: callback => {
-      onInput(pluginApiIdentifiers, callback);
-      return modifySelectKit(pluginApiIdentifiers);
+    onChange: callback => {
+      onChange(targetedIdentifier, callback);
+      return modifySelectKit(targetedIdentifier);
     }
   };
 }
@@ -270,15 +68,7 @@ export function modifySelectKit(pluginApiIdentifiers) {
 export function clearCallbacks() {
   _appendContentCallbacks = {};
   _prependContentCallbacks = {};
-  _filterContentCallbacks = {};
-  _modifyNoSelectionCallbacks = {};
-  _modifyContentCallbacks = {};
-  _modifyHeaderComputedContentCallbacks = {};
-  _modifyCollectionHeaderCallbacks = {};
-  _onSelectCallbacks = {};
-  _onCloseCallbacks = {};
-  _onOpenCallbacks = {};
-  _onInputCallbacks = {};
+  _onChangeCallbacks = {};
 }
 
 const EMPTY_ARRAY = Object.freeze([]);
diff --git a/test/javascripts/components/select-kit/api-test.js b/test/javascripts/components/select-kit/api-test.js
new file mode 100644
index 0000000000..db17590ede
--- /dev/null
+++ b/test/javascripts/components/select-kit/api-test.js
@@ -0,0 +1,109 @@
+import componentTest from "helpers/component-test";
+import selectKit, {
+  testSelectKitModule,
+  setDefaultState,
+  DEFAULT_CONTENT
+} from "helpers/select-kit-helper";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import { clearCallbacks } from "select-kit/mixins/plugin-api";
+
+testSelectKitModule("select-kit:api", {
+  beforeEach() {
+    this.setProperties({
+      comboBox: selectKit(".combo-box"),
+      singleSelect: selectKit(".single-select:not(.combo-box)")
+    });
+  },
+
+  afterEach() {
+    clearCallbacks();
+  }
+});
+
+componentTest("modifySelectKit(identifier).appendContent", {
+  template: `
+    {{combo-box value=value content=content onChange=onChange}}
+    {{single-select value=value content=content onChange=onChange}}
+  `,
+
+  beforeEach() {
+    setDefaultState(this, null, { content: DEFAULT_CONTENT });
+
+    withPluginApi("0.8.43", api => {
+      api.modifySelectKit("combo-box").appendContent(() => {
+        return {
+          id: "alpaca",
+          name: "Alpaca"
+        };
+      });
+    });
+  },
+
+  async test(assert) {
+    await this.comboBox.expand();
+    const row = this.comboBox.rowByIndex(3);
+    assert.ok(row.exists());
+    assert.equal(row.value(), "alpaca");
+
+    await this.comboBox.collapse();
+
+    assert.notOk(this.singleSelect.rowByValue("alpaca").exists());
+  }
+});
+
+componentTest("modifySelectKit(identifier).prependContent", {
+  template: `
+    {{combo-box value=value content=content onChange=onChange}}
+    {{single-select value=value content=content onChange=onChange}}
+  `,
+
+  beforeEach() {
+    setDefaultState(this, null, { content: DEFAULT_CONTENT });
+
+    withPluginApi("0.8.43", api => {
+      api.modifySelectKit("combo-box").prependContent(() => {
+        return {
+          id: "alpaca",
+          name: "Alpaca"
+        };
+      });
+    });
+  },
+
+  afterEach() {},
+
+  async test(assert) {
+    await this.comboBox.expand();
+    const row = this.comboBox.rowByIndex(0);
+    assert.ok(row.exists());
+    assert.equal(row.value(), "alpaca");
+
+    await this.comboBox.collapse();
+
+    assert.notOk(this.singleSelect.rowByValue("alpaca").exists());
+  }
+});
+
+componentTest("modifySelectKit(identifier).onChange", {
+  template: `
+    <div id="test"></div>
+    {{combo-box value=value content=content onChange=onChange}}
+  `,
+
+  beforeEach() {
+    setDefaultState(this, null, { content: DEFAULT_CONTENT });
+
+    withPluginApi("0.8.43", api => {
+      api.modifySelectKit("combo-box").onChange((component, value, item) => {
+        find("#test").text(item.name);
+      });
+    });
+  },
+
+  async test(assert) {
+    await this.comboBox.expand();
+    await this.comboBox.selectRowByIndex(0);
+
+    assert.equal(find("#test").text(), "foo");
+  }
+});
diff --git a/test/javascripts/components/select-kit/category-chooser-test.js b/test/javascripts/components/select-kit/category-chooser-test.js
index 196f692e3c..19146cb3b4 100644
--- a/test/javascripts/components/select-kit/category-chooser-test.js
+++ b/test/javascripts/components/select-kit/category-chooser-test.js
@@ -1,5 +1,5 @@
 import componentTest from "helpers/component-test";
-import { testSelectKitModule } from "./select-kit-test-helper";
+import { testSelectKitModule } from "helpers/select-kit-helper";
 
 testSelectKitModule("category-chooser");
 
diff --git a/test/javascripts/components/select-kit/category-drop-test.js b/test/javascripts/components/select-kit/category-drop-test.js
index 5c45042cb9..923bd93bbc 100644
--- a/test/javascripts/components/select-kit/category-drop-test.js
+++ b/test/javascripts/components/select-kit/category-drop-test.js
@@ -1,7 +1,7 @@
 import DiscourseURL from "discourse/lib/url";
 import Category from "discourse/models/category";
 import componentTest from "helpers/component-test";
-import { testSelectKitModule } from "./select-kit-test-helper";
+import { testSelectKitModule } from "helpers/select-kit-helper";
 import {
   NO_CATEGORIES_ID,
   ALL_CATEGORIES_ID
diff --git a/test/javascripts/components/select-kit/list-setting-test.js b/test/javascripts/components/select-kit/list-setting-test.js
index 37e08081d2..5fddc9ea56 100644
--- a/test/javascripts/components/select-kit/list-setting-test.js
+++ b/test/javascripts/components/select-kit/list-setting-test.js
@@ -1,5 +1,5 @@
 import componentTest from "helpers/component-test";
-import { testSelectKitModule } from "./select-kit-test-helper";
+import { testSelectKitModule } from "helpers/select-kit-helper";
 
 testSelectKitModule("list-setting");
 
diff --git a/test/javascripts/components/select-kit/mini-tag-chooser-test.js b/test/javascripts/components/select-kit/mini-tag-chooser-test.js
index 4c23021272..f929cb99d4 100644
--- a/test/javascripts/components/select-kit/mini-tag-chooser-test.js
+++ b/test/javascripts/components/select-kit/mini-tag-chooser-test.js
@@ -1,5 +1,5 @@
 import componentTest from "helpers/component-test";
-import { testSelectKitModule } from "./select-kit-test-helper";
+import { testSelectKitModule } from "helpers/select-kit-helper";
 
 testSelectKitModule("mini-tag-chooser");
 
diff --git a/test/javascripts/components/select-kit/multi-select-test.js b/test/javascripts/components/select-kit/multi-select-test.js
index 7e63690485..d3d022273e 100644
--- a/test/javascripts/components/select-kit/multi-select-test.js
+++ b/test/javascripts/components/select-kit/multi-select-test.js
@@ -1,5 +1,5 @@
 import componentTest from "helpers/component-test";
-import { testSelectKitModule } from "./select-kit-test-helper";
+import { testSelectKitModule } from "helpers/select-kit-helper";
 
 testSelectKitModule("multi-select");
 
diff --git a/test/javascripts/components/select-kit/notifications-button-test.js b/test/javascripts/components/select-kit/notifications-button-test.js
index 44f9cf3974..7da1f8002f 100644
--- a/test/javascripts/components/select-kit/notifications-button-test.js
+++ b/test/javascripts/components/select-kit/notifications-button-test.js
@@ -1,5 +1,8 @@
 import componentTest from "helpers/component-test";
-import { testSelectKitModule, setDefaultState } from "./select-kit-test-helper";
+import {
+  testSelectKitModule,
+  setDefaultState
+} from "helpers/select-kit-helper";
 
 testSelectKitModule("notifications-button");
 
diff --git a/test/javascripts/components/select-kit/select-kit-test-helper.js b/test/javascripts/components/select-kit/select-kit-test-helper.js
deleted file mode 100644
index 828b656e5d..0000000000
--- a/test/javascripts/components/select-kit/select-kit-test-helper.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import selectKit from "helpers/select-kit-helper";
-
-export function testSelectKitModule(moduleName, options = {}) {
-  moduleForComponent(`select-kit/${moduleName}`, {
-    integration: true,
-
-    beforeEach() {
-      this.set("subject", selectKit());
-      options.beforeEach && options.beforeEach.call(this);
-    },
-
-    afterEach() {
-      options.afterEach && options.afterEach.call(this);
-    }
-  });
-}
-
-export const DEFAULT_CONTENT = [
-  { id: 1, name: "foo" },
-  { id: 2, name: "bar" },
-  { id: 3, name: "baz" }
-];
-
-export function setDefaultState(ctx, value, options = {}) {
-  const properties = Object.assign(
-    {
-      onChange: v => {
-        this.set("value", v);
-      }
-    },
-    options || {}
-  );
-
-  ctx.setProperties(properties);
-}
diff --git a/test/javascripts/components/select-kit/single-select-test.js b/test/javascripts/components/select-kit/single-select-test.js
index ac53d73bf7..66bd940328 100644
--- a/test/javascripts/components/select-kit/single-select-test.js
+++ b/test/javascripts/components/select-kit/single-select-test.js
@@ -1,5 +1,5 @@
 import componentTest from "helpers/component-test";
-import { testSelectKitModule } from "./select-kit-test-helper";
+import { testSelectKitModule } from "helpers/select-kit-helper";
 
 testSelectKitModule("single-select");
 
diff --git a/test/javascripts/components/select-kit/tag-drop-test.js b/test/javascripts/components/select-kit/tag-drop-test.js
index 2c6d156052..39ab21187f 100644
--- a/test/javascripts/components/select-kit/tag-drop-test.js
+++ b/test/javascripts/components/select-kit/tag-drop-test.js
@@ -1,5 +1,5 @@
 import componentTest from "helpers/component-test";
-import { testSelectKitModule } from "./select-kit-test-helper";
+import { testSelectKitModule } from "helpers/select-kit-helper";
 import Site from "discourse/models/site";
 import { set } from "@ember/object";
 import pretender from "helpers/create-pretender";
diff --git a/test/javascripts/components/select-kit/user-chooser-test.js b/test/javascripts/components/select-kit/user-chooser-test.js
index c59d7cb571..d54da015d5 100644
--- a/test/javascripts/components/select-kit/user-chooser-test.js
+++ b/test/javascripts/components/select-kit/user-chooser-test.js
@@ -1,5 +1,5 @@
 import componentTest from "helpers/component-test";
-import { testSelectKitModule } from "./select-kit-test-helper";
+import { testSelectKitModule } from "helpers/select-kit-helper";
 import pretender from "helpers/create-pretender";
 
 testSelectKitModule("user-chooser");
diff --git a/test/javascripts/helpers/select-kit-helper.js b/test/javascripts/helpers/select-kit-helper.js
index c103c4371c..5d80b8f0b3 100644
--- a/test/javascripts/helpers/select-kit-helper.js
+++ b/test/javascripts/helpers/select-kit-helper.js
@@ -276,3 +276,38 @@ export default function selectKit(selector) {
     }
   };
 }
+
+export function testSelectKitModule(moduleName, options = {}) {
+  moduleForComponent(`select-kit/${moduleName}`, {
+    integration: true,
+
+    beforeEach() {
+      this.set("subject", selectKit());
+      options.beforeEach && options.beforeEach.call(this);
+    },
+
+    afterEach() {
+      options.afterEach && options.afterEach.call(this);
+    }
+  });
+}
+
+export const DEFAULT_CONTENT = [
+  { id: 1, name: "foo" },
+  { id: 2, name: "bar" },
+  { id: 3, name: "baz" }
+];
+
+export function setDefaultState(ctx, value, options = {}) {
+  const properties = Object.assign(
+    {
+      value,
+      onChange: v => {
+        ctx.set("value", v);
+      }
+    },
+    options || {}
+  );
+
+  ctx.setProperties(properties);
+}

From 2f714c741234b2802a41e02aaa72ef78c5e79b8e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 6 May 2020 17:16:36 +0200
Subject: [PATCH 0972/1830] FIX: end date of ranges in html preview was
 incorrect (#9654)

This commit also remove an unused block of code as previewedTimezones can't be empty anymore.
---
 .../javascripts/lib/local-date-builder.js.es6 | 16 ++----
 .../lib/local-date-builder-test.js.es6        | 49 +++++++++++++++++--
 2 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
index 827ba74ad5..96b48dde7e 100644
--- a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
@@ -113,22 +113,16 @@ export default class LocalDateBuilder {
       previewedTimezones.push({
         timezone: this._zoneWithoutPrefix(timezone),
         formated: this._createDateTimeRange(
-          localDate.datetimeWithZone(timezone),
+          DateWithZoneHelper.fromDatetime(
+            localDate.datetime,
+            localDate.timezone,
+            timezone
+          ),
           this.time
         )
       });
     });
 
-    if (!previewedTimezones.length) {
-      previewedTimezones.push({
-        timezone: "UTC",
-        formated: this._createDateTimeRange(
-          localDate.datetimeWithZone("Etc/UTC"),
-          this.time
-        )
-      });
-    }
-
     return previewedTimezones.uniqBy("timezone");
   }
 
diff --git a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
index 34499440d6..66a4938dbb 100644
--- a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
+++ b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
@@ -330,7 +330,7 @@ QUnit.test("previews", assert => {
           },
           {
             formated:
-              "Monday, March 23, 2020 10:00 AM → Monday, March 23, 2020 10:00 AM",
+              "Sunday, March 22, 2020 10:00 AM → Monday, March 23, 2020 10:00 AM",
             timezone: "Sydney"
           }
         ]
@@ -403,7 +403,11 @@ QUnit.test("previews", assert => {
 
   freezeTime({ date: "2020-04-06", timezone: PARIS }, () => {
     assert.buildsCorrectDate(
-      { timezone: PARIS, date: "2020-04-07", timezones: [LONDON, LAGOS] },
+      {
+        timezone: PARIS,
+        date: "2020-04-07",
+        timezones: [LONDON, LAGOS, SYDNEY]
+      },
       {
         previews: [
           {
@@ -414,13 +418,50 @@ QUnit.test("previews", assert => {
           },
           {
             formated:
-              "Tuesday, April 7, 2020 11:00 PM → Tuesday, April 7, 2020 11:00 PM",
+              "Monday, April 6, 2020 11:00 PM → Tuesday, April 7, 2020 11:00 PM",
             timezone: "London"
           },
           {
             formated:
-              "Tuesday, April 7, 2020 11:00 PM → Tuesday, April 7, 2020 11:00 PM",
+              "Monday, April 6, 2020 11:00 PM → Tuesday, April 7, 2020 11:00 PM",
             timezone: "Lagos"
+          },
+          {
+            formated:
+              "Tuesday, April 7, 2020 8:00 AM → Wednesday, April 8, 2020 8:00 AM",
+            timezone: "Sydney"
+          }
+        ]
+      }
+    );
+  });
+
+  freezeTime({ date: "2020-04-06", timezone: PARIS }, () => {
+    assert.buildsCorrectDate(
+      {
+        timezone: PARIS,
+        date: "2020-04-07",
+        time: "14:54",
+        timezones: [LONDON, LAGOS, SYDNEY]
+      },
+      {
+        previews: [
+          {
+            current: true,
+            formated: "April 7, 2020 2:54 PM",
+            timezone: "Paris"
+          },
+          {
+            formated: "April 7, 2020 1:54 PM",
+            timezone: "London"
+          },
+          {
+            formated: "April 7, 2020 1:54 PM",
+            timezone: "Lagos"
+          },
+          {
+            formated: "April 7, 2020 10:54 PM",
+            timezone: "Sydney"
           }
         ]
       }

From 2d31a14789f00243d75e368cb781e6944a61b16f Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 6 May 2020 17:22:25 +0200
Subject: [PATCH 0973/1830] Revert "DEV: Move rubocop config to
 rubocop-discourse (#9616)"

This reverts commit e23f1a907134d5241101109401b2a097132c81ee.

Reverting as this currently breaks our plugin linting job in GithHub Action and Jenkins. Will re-revert after all the plugins get the latest rubocop config and/or a (potential) rubocop issue is fixed.
---
 .rubocop.yml | 359 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 Gemfile      |   2 +
 Gemfile.lock |   2 +
 3 files changed, 361 insertions(+), 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index d46296cf88..0cb02e3e97 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,2 +1,357 @@
-inherit_gem:
-  rubocop-discourse: default.yml
+require:
+  - rubocop-discourse
+  - rubocop-rspec
+
+AllCops:
+  TargetRubyVersion: 2.6
+  DisabledByDefault: true
+  Exclude:
+    - "db/schema.rb"
+    - "bundle/**/*"
+    - "vendor/**/*"
+    - "node_modules/**/*"
+    - "public/**/*"
+    - "plugins/**/gems/**/*"
+
+Discourse:
+  Enabled: true
+
+Discourse/NoChdir:
+  Exclude:
+    - 'spec/**/*' # Specs are run sequentially, so chdir can be used
+    - 'plugins/*/spec/**/*'
+
+# Prefer &&/|| over and/or.
+Style/AndOr:
+  Enabled: true
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+
+# Align `when` with `case`.
+Layout/CaseIndentation:
+  Enabled: true
+
+# Align comments with method definitions.
+Layout/CommentIndentation:
+  Enabled: true
+
+# No extra empty lines.
+Layout/EmptyLines:
+  Enabled: true
+
+# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
+Style/HashSyntax:
+  Enabled: true
+
+# Two spaces, no tabs (for indentation).
+Layout/IndentationWidth:
+  Enabled: true
+
+Layout/SpaceAfterColon:
+  Enabled: true
+
+Layout/SpaceAfterComma:
+  Enabled: true
+
+Layout/SpaceAroundEqualsInParameterDefault:
+  Enabled: true
+
+Layout/SpaceAroundKeyword:
+  Enabled: true
+
+Layout/SpaceAroundOperators:
+  Enabled: true
+
+Layout/SpaceBeforeFirstArg:
+  Enabled: true
+
+# Defining a method with parameters needs parentheses.
+Style/MethodDefParentheses:
+  Enabled: true
+
+# Use `foo {}` not `foo{}`.
+Layout/SpaceBeforeBlockBraces:
+  Enabled: true
+
+# Use `foo { bar }` not `foo {bar}`.
+Layout/SpaceInsideBlockBraces:
+  Enabled: true
+
+# Use `{ a: 1 }` not `{a:1}`.
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: true
+
+Layout/SpaceInsideParens:
+  Enabled: true
+
+# Detect hard tabs, no hard tabs.
+Layout/IndentationStyle:
+  Enabled: true
+
+# Blank lines should not have any spaces.
+Layout/TrailingEmptyLines:
+  Enabled: true
+
+# No trailing whitespace.
+Layout/TrailingWhitespace:
+  Enabled: true
+
+Lint/Debugger:
+  Enabled: true
+
+Layout/BlockAlignment:
+  Enabled: true
+
+# Align `end` with the matching keyword or starting expression except for
+# assignments, where it should be aligned with the LHS.
+Layout/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: variable
+
+# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
+Lint/RequireParentheses:
+  Enabled: true
+
+Lint/ShadowingOuterLocalVariable:
+  Enabled: true
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+Layout/HashAlignment:
+  Enabled: true
+
+Bundler/OrderedGems:
+  Enabled: false
+
+Style/SingleLineMethods:
+  Enabled: true
+
+Style/Semicolon:
+  Enabled: true
+  AllowAsExpressionSeparator: true
+
+Style/RedundantReturn:
+  Enabled: true
+
+Style/GlobalVars:
+  Enabled: true
+  Severity: warning
+  Exclude:
+    - 'lib/tasks/**/*'
+    - 'script/**/*'
+    - 'spec/**/*.rb'
+    - 'plugins/*/spec/**/*'
+
+# Specs
+
+RSpec/AnyInstance:
+  Enabled: false # To be decided
+
+RSpec/AroundBlock:
+  Enabled: true
+
+RSpec/BeforeAfterAll:
+  Enabled: false # To be decided
+
+RSpec/ContextMethod:
+  Enabled: false # TODO
+
+RSpec/ContextWording:
+  Enabled: false # To be decided
+
+RSpec/DescribeClass:
+  Enabled: false # To be decided
+
+RSpec/DescribeMethod:
+  Enabled: true
+
+RSpec/DescribeSymbol:
+  Enabled: false # To be decided
+
+RSpec/DescribedClass:
+  Enabled: false # To be decided
+
+RSpec/DescribedClassModuleWrapping:
+  Enabled: false # To be decided
+
+RSpec/EmptyExampleGroup:
+  Enabled: true
+  Exclude:
+    - 'spec/requests/api/*'
+
+RSpec/EmptyLineAfterExample:
+  Enabled: false # TODO
+
+RSpec/EmptyLineAfterExampleGroup:
+  Enabled: false # TODO
+
+RSpec/EmptyLineAfterFinalLet:
+  Enabled: false # TODO
+
+RSpec/EmptyLineAfterHook:
+  Enabled: false # TODO
+
+RSpec/EmptyLineAfterSubject:
+  Enabled: false # TODO
+
+RSpec/ExampleLength:
+  Enabled: false # To be decided
+
+RSpec/ExampleWithoutDescription:
+  Enabled: true
+
+RSpec/ExampleWording:
+  Enabled: false # TODO
+
+RSpec/ExpectActual:
+  Enabled: true
+
+RSpec/ExpectChange:
+  Enabled: false # To be decided
+
+RSpec/ExpectInHook:
+  Enabled: false # To be decided
+
+RSpec/ExpectOutput:
+  Enabled: true
+
+RSpec/FilePath:
+  Enabled: false # To be decided
+
+RSpec/Focus:
+  Enabled: true
+
+RSpec/HookArgument:
+  Enabled: false # TODO
+
+RSpec/HooksBeforeExamples:
+  Enabled: false # TODO
+
+RSpec/ImplicitBlockExpectation:
+  Enabled: true
+
+RSpec/ImplicitExpect:
+  Enabled: false # To be decided
+
+RSpec/ImplicitSubject:
+  Enabled: false # To be decided
+
+RSpec/InstanceSpy:
+  Enabled: true
+
+RSpec/InstanceVariable:
+  Enabled: false # TODO
+
+RSpec/InvalidPredicateMatcher:
+  Enabled: true
+
+RSpec/ItBehavesLike:
+  Enabled: true
+
+RSpec/IteratedExpectation:
+  Enabled: false # To be decided
+
+RSpec/LeadingSubject:
+  Enabled: false # TODO
+
+RSpec/LeakyConstantDeclaration:
+  Enabled: false # To be decided
+
+RSpec/LetBeforeExamples:
+  Enabled: false # TODO
+
+RSpec/LetSetup:
+  Enabled: false # TODO
+
+RSpec/MessageChain:
+  Enabled: true
+
+RSpec/MessageSpies:
+  Enabled: true
+
+RSpec/MissingExampleGroupArgument:
+  Enabled: true
+
+RSpec/MultipleDescribes:
+  Enabled: false # TODO
+
+RSpec/MultipleSubjects:
+  Enabled: true
+
+RSpec/NamedSubject:
+  Enabled: false # To be decided
+
+RSpec/NestedGroups:
+  Enabled: false # To be decided
+
+RSpec/OverwritingSetup:
+  Enabled: true
+
+RSpec/ReceiveCounts:
+  Enabled: true
+
+RSpec/ReceiveNever:
+  Enabled: true
+
+RSpec/RepeatedDescription:
+  Enabled: false # TODO
+
+RSpec/RepeatedExample:
+  Enabled: false # TODO
+
+RSpec/RepeatedExampleGroupBody:
+  Enabled: false # TODO
+
+RSpec/RepeatedExampleGroupDescription:
+  Enabled: false # TODO
+
+RSpec/ReturnFromStub:
+  Enabled: true
+
+RSpec/ScatteredSetup:
+  Enabled: false # TODO
+
+RSpec/SharedContext:
+  Enabled: true
+
+RSpec/SharedExamples:
+  Enabled: true
+
+RSpec/SingleArgumentMessageChain:
+  Enabled: true
+
+RSpec/SubjectStub:
+  Enabled: true
+
+RSpec/UnspecifiedException:
+  Enabled: true
+
+RSpec/VerifiedDoubles:
+  Enabled: true
+
+RSpec/VoidExpect:
+  Enabled: true
+
+RSpec/Yield:
+  Enabled: true
+
+Capybara/CurrentPathExpectation:
+  Enabled: true
+
+Capybara/FeatureMethods:
+  Enabled: true
+
+FactoryBot/AttributeDefinedStatically:
+  Enabled: true
+
+FactoryBot/CreateList:
+  Enabled: true
+
+FactoryBot/FactoryClassName:
+  Enabled: true
+
+Rails/HttpStatus:
+  Enabled: true
diff --git a/Gemfile b/Gemfile
index 039acc6a2a..742bf82d0b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -172,7 +172,9 @@ group :test, :development do
   gem 'shoulda-matchers', require: false
   gem 'rspec-html-matchers'
   gem 'byebug', require: ENV['RM_INFO'].nil?, platform: :mri
+  gem 'rubocop', require: false
   gem "rubocop-discourse", require: false
+  gem "rubocop-rspec", require: false
   gem 'parallel_tests'
 
   gem 'rswag-specs'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6d97e8a504..839f58f148 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -528,7 +528,9 @@ DEPENDENCIES
   rspec-rails
   rswag-specs
   rtlit
+  rubocop
   rubocop-discourse
+  rubocop-rspec
   ruby-prof
   ruby-readability
   rubyzip

From f5bdbd347e7e5b5885a3a4190cda535b9043c1c2 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 6 May 2020 11:28:02 -0400
Subject: [PATCH 0974/1830] Revert "FIX: Discobot has not been created with our
 custom avatar."

This reverts commit 1062dbc3e9cbf9370803c0acea55eb3c054060ca.

Looks like it's causing some errors on migration.

```
/var/www/discourse/lib/image_sizer.rb:6:in `resize'
/var/www/discourse/lib/upload_creator.rb:120:in `block in create_for'
/var/www/discourse/lib/distributed_mutex.rb:33:in `block in synchronize'
/var/www/discourse/lib/distributed_mutex.rb:29:in `synchronize'
/var/www/discourse/lib/distributed_mutex.rb:29:in `synchronize'
/var/www/discourse/lib/distributed_mutex.rb:14:in `synchronize'
/var/www/discourse/lib/upload_creator.rb:37:in `create_for'
```
---
 app/models/user_avatar.rb                     |  28 +++++--------
 .../assets/images/discobot.png                | Bin 10343 -> 0 bytes
 .../db/fixtures/001_discobot.rb               |  38 ++++++++++--------
 3 files changed, 31 insertions(+), 35 deletions(-)
 delete mode 100644 plugins/discourse-narrative-bot/assets/images/discobot.png

diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index e2b7f44dc6..f6dbf13312 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -96,31 +96,16 @@ class UserAvatar < ActiveRecord::Base
 
     return unless tempfile
 
-    create_custom_avatar(
-      user,
-      tempfile,
-      override_gravatar: options&.dig(:override_gravatar),
-      origin: avatar_url
-    )
-  rescue Net::ReadTimeout, OpenURI::HTTPError
-    # skip saving, we are not connected to the net
-  ensure
-    tempfile.close! if tempfile && tempfile.respond_to?(:close!)
-  end
+    ext = FastImage.type(tempfile).to_s
+    tempfile.rewind
 
-  def self.create_custom_avatar(user, file, override_gravatar: false, origin: nil)
-    ext = FastImage.type(file).to_s
-    file.rewind
-
-    upload = UploadCreator.new(file, "external-avatar.#{ext}",
-      origin: origin,
-      type: "avatar"
-    ).create_for(user.id)
+    upload = UploadCreator.new(tempfile, "external-avatar." + ext, origin: avatar_url, type: "avatar").create_for(user.id)
 
     user.create_user_avatar! unless user.user_avatar
 
     if !user.user_avatar.contains_upload?(upload.id)
       user.user_avatar.update!(custom_upload_id: upload.id)
+      override_gravatar = !options || options[:override_gravatar]
 
       if user.uploaded_avatar_id.nil? ||
           !user.user_avatar.contains_upload?(user.uploaded_avatar_id) ||
@@ -129,6 +114,11 @@ class UserAvatar < ActiveRecord::Base
         user.update!(uploaded_avatar_id: upload.id)
       end
     end
+
+  rescue Net::ReadTimeout, OpenURI::HTTPError
+    # skip saving, we are not connected to the net
+  ensure
+    tempfile.close! if tempfile && tempfile.respond_to?(:close!)
   end
 
   def self.ensure_consistency!
diff --git a/plugins/discourse-narrative-bot/assets/images/discobot.png b/plugins/discourse-narrative-bot/assets/images/discobot.png
deleted file mode 100644
index b6c711304241edfc3e23d08a463cb4fbffcb7e7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10343
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

diff --git a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
index f30861e89a..3972a350fb 100644
--- a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
+++ b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
@@ -1,24 +1,23 @@
 # frozen_string_literal: true
 
 discobot_username = 'discobot'
-discobot_user_id = -2
 
-def seed_primary_email(user_id)
+def seed_primary_email
   UserEmail.seed do |ue|
-    ue.id = user_id
+    ue.id = -2
     ue.email = "discobot_email"
     ue.primary = true
-    ue.user_id = user_id
+    ue.user_id = -2
   end
 end
 
-unless user = User.find_by(id: discobot_user_id)
+unless user = User.find_by(id: -2)
   suggested_username = UserNameSuggester.suggest(discobot_username)
 
-  seed_primary_email(discobot_user_id)
+  seed_primary_email
 
   User.seed do |u|
-    u.id = discobot_user_id
+    u.id = -2
     u.name = discobot_username
     u.username = suggested_username
     u.username_lower = suggested_username.downcase
@@ -27,13 +26,26 @@ unless user = User.find_by(id: discobot_user_id)
     u.approved = true
     u.trust_level = TrustLevel[4]
   end
+
+  # TODO Pull the user avatar from that thread for now. In the future, pull it from a local file or from some central discobot repo.
+  if !Rails.env.test?
+    begin
+      UserAvatar.import_url_for_user(
+        "https://cdn.discourse.org/dev/uploads/default/original/2X/e/edb63d57a720838a7ce6a68f02ba4618787f2299.png",
+        User.find(-2),
+        override_gravatar: true
+      )
+    rescue
+      # In case the avatar can't be downloaded, don't fail seed
+    end
+  end
 end
 
-bot = User.find(discobot_user_id)
+bot = User.find(-2)
 
 # ensure discobot has a primary email
 unless bot.primary_email
-  seed_primary_email(discobot_user_id)
+  seed_primary_email
   bot.reload
 end
 
@@ -50,10 +62,4 @@ if !bot.user_profile.bio_raw
   )
 end
 
-if !Rails.env.test? && (bot.user_avatar&.custom_upload_id.blank?)
-  File.open(Rails.root.join("plugins", "discourse-narrative-bot", "assets", "images", "discobot.png"), 'r') do |file|
-    UserAvatar.create_custom_avatar(bot, file, override_gravatar: true)
-  end
-end
-
-Group.user_trust_level_change!(discobot_user_id, TrustLevel[4])
+Group.user_trust_level_change!(-2, TrustLevel[4])

From 666823d4b7cf7bee4c1c81c1df1d1db944620f7f Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 6 May 2020 18:41:15 +0200
Subject: [PATCH 0975/1830] Revert "Revert "DEV: Move rubocop config to
 rubocop-discourse (#9616)""

This reverts commit 2d31a14789f00243d75e368cb781e6944a61b16f.

Should be good now - all the plugins are using the updated rubocop config.
---
 .rubocop.yml | 359 +--------------------------------------------------
 Gemfile      |   2 -
 Gemfile.lock |   2 -
 3 files changed, 2 insertions(+), 361 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 0cb02e3e97..d46296cf88 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,357 +1,2 @@
-require:
-  - rubocop-discourse
-  - rubocop-rspec
-
-AllCops:
-  TargetRubyVersion: 2.6
-  DisabledByDefault: true
-  Exclude:
-    - "db/schema.rb"
-    - "bundle/**/*"
-    - "vendor/**/*"
-    - "node_modules/**/*"
-    - "public/**/*"
-    - "plugins/**/gems/**/*"
-
-Discourse:
-  Enabled: true
-
-Discourse/NoChdir:
-  Exclude:
-    - 'spec/**/*' # Specs are run sequentially, so chdir can be used
-    - 'plugins/*/spec/**/*'
-
-# Prefer &&/|| over and/or.
-Style/AndOr:
-  Enabled: true
-
-Style/FrozenStringLiteralComment:
-  Enabled: true
-
-# Align `when` with `case`.
-Layout/CaseIndentation:
-  Enabled: true
-
-# Align comments with method definitions.
-Layout/CommentIndentation:
-  Enabled: true
-
-# No extra empty lines.
-Layout/EmptyLines:
-  Enabled: true
-
-# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
-Style/HashSyntax:
-  Enabled: true
-
-# Two spaces, no tabs (for indentation).
-Layout/IndentationWidth:
-  Enabled: true
-
-Layout/SpaceAfterColon:
-  Enabled: true
-
-Layout/SpaceAfterComma:
-  Enabled: true
-
-Layout/SpaceAroundEqualsInParameterDefault:
-  Enabled: true
-
-Layout/SpaceAroundKeyword:
-  Enabled: true
-
-Layout/SpaceAroundOperators:
-  Enabled: true
-
-Layout/SpaceBeforeFirstArg:
-  Enabled: true
-
-# Defining a method with parameters needs parentheses.
-Style/MethodDefParentheses:
-  Enabled: true
-
-# Use `foo {}` not `foo{}`.
-Layout/SpaceBeforeBlockBraces:
-  Enabled: true
-
-# Use `foo { bar }` not `foo {bar}`.
-Layout/SpaceInsideBlockBraces:
-  Enabled: true
-
-# Use `{ a: 1 }` not `{a:1}`.
-Layout/SpaceInsideHashLiteralBraces:
-  Enabled: true
-
-Layout/SpaceInsideParens:
-  Enabled: true
-
-# Detect hard tabs, no hard tabs.
-Layout/IndentationStyle:
-  Enabled: true
-
-# Blank lines should not have any spaces.
-Layout/TrailingEmptyLines:
-  Enabled: true
-
-# No trailing whitespace.
-Layout/TrailingWhitespace:
-  Enabled: true
-
-Lint/Debugger:
-  Enabled: true
-
-Layout/BlockAlignment:
-  Enabled: true
-
-# Align `end` with the matching keyword or starting expression except for
-# assignments, where it should be aligned with the LHS.
-Layout/EndAlignment:
-  Enabled: true
-  EnforcedStyleAlignWith: variable
-
-# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
-Lint/RequireParentheses:
-  Enabled: true
-
-Lint/ShadowingOuterLocalVariable:
-  Enabled: true
-
-Layout/MultilineMethodCallIndentation:
-  Enabled: true
-  EnforcedStyle: indented
-
-Layout/HashAlignment:
-  Enabled: true
-
-Bundler/OrderedGems:
-  Enabled: false
-
-Style/SingleLineMethods:
-  Enabled: true
-
-Style/Semicolon:
-  Enabled: true
-  AllowAsExpressionSeparator: true
-
-Style/RedundantReturn:
-  Enabled: true
-
-Style/GlobalVars:
-  Enabled: true
-  Severity: warning
-  Exclude:
-    - 'lib/tasks/**/*'
-    - 'script/**/*'
-    - 'spec/**/*.rb'
-    - 'plugins/*/spec/**/*'
-
-# Specs
-
-RSpec/AnyInstance:
-  Enabled: false # To be decided
-
-RSpec/AroundBlock:
-  Enabled: true
-
-RSpec/BeforeAfterAll:
-  Enabled: false # To be decided
-
-RSpec/ContextMethod:
-  Enabled: false # TODO
-
-RSpec/ContextWording:
-  Enabled: false # To be decided
-
-RSpec/DescribeClass:
-  Enabled: false # To be decided
-
-RSpec/DescribeMethod:
-  Enabled: true
-
-RSpec/DescribeSymbol:
-  Enabled: false # To be decided
-
-RSpec/DescribedClass:
-  Enabled: false # To be decided
-
-RSpec/DescribedClassModuleWrapping:
-  Enabled: false # To be decided
-
-RSpec/EmptyExampleGroup:
-  Enabled: true
-  Exclude:
-    - 'spec/requests/api/*'
-
-RSpec/EmptyLineAfterExample:
-  Enabled: false # TODO
-
-RSpec/EmptyLineAfterExampleGroup:
-  Enabled: false # TODO
-
-RSpec/EmptyLineAfterFinalLet:
-  Enabled: false # TODO
-
-RSpec/EmptyLineAfterHook:
-  Enabled: false # TODO
-
-RSpec/EmptyLineAfterSubject:
-  Enabled: false # TODO
-
-RSpec/ExampleLength:
-  Enabled: false # To be decided
-
-RSpec/ExampleWithoutDescription:
-  Enabled: true
-
-RSpec/ExampleWording:
-  Enabled: false # TODO
-
-RSpec/ExpectActual:
-  Enabled: true
-
-RSpec/ExpectChange:
-  Enabled: false # To be decided
-
-RSpec/ExpectInHook:
-  Enabled: false # To be decided
-
-RSpec/ExpectOutput:
-  Enabled: true
-
-RSpec/FilePath:
-  Enabled: false # To be decided
-
-RSpec/Focus:
-  Enabled: true
-
-RSpec/HookArgument:
-  Enabled: false # TODO
-
-RSpec/HooksBeforeExamples:
-  Enabled: false # TODO
-
-RSpec/ImplicitBlockExpectation:
-  Enabled: true
-
-RSpec/ImplicitExpect:
-  Enabled: false # To be decided
-
-RSpec/ImplicitSubject:
-  Enabled: false # To be decided
-
-RSpec/InstanceSpy:
-  Enabled: true
-
-RSpec/InstanceVariable:
-  Enabled: false # TODO
-
-RSpec/InvalidPredicateMatcher:
-  Enabled: true
-
-RSpec/ItBehavesLike:
-  Enabled: true
-
-RSpec/IteratedExpectation:
-  Enabled: false # To be decided
-
-RSpec/LeadingSubject:
-  Enabled: false # TODO
-
-RSpec/LeakyConstantDeclaration:
-  Enabled: false # To be decided
-
-RSpec/LetBeforeExamples:
-  Enabled: false # TODO
-
-RSpec/LetSetup:
-  Enabled: false # TODO
-
-RSpec/MessageChain:
-  Enabled: true
-
-RSpec/MessageSpies:
-  Enabled: true
-
-RSpec/MissingExampleGroupArgument:
-  Enabled: true
-
-RSpec/MultipleDescribes:
-  Enabled: false # TODO
-
-RSpec/MultipleSubjects:
-  Enabled: true
-
-RSpec/NamedSubject:
-  Enabled: false # To be decided
-
-RSpec/NestedGroups:
-  Enabled: false # To be decided
-
-RSpec/OverwritingSetup:
-  Enabled: true
-
-RSpec/ReceiveCounts:
-  Enabled: true
-
-RSpec/ReceiveNever:
-  Enabled: true
-
-RSpec/RepeatedDescription:
-  Enabled: false # TODO
-
-RSpec/RepeatedExample:
-  Enabled: false # TODO
-
-RSpec/RepeatedExampleGroupBody:
-  Enabled: false # TODO
-
-RSpec/RepeatedExampleGroupDescription:
-  Enabled: false # TODO
-
-RSpec/ReturnFromStub:
-  Enabled: true
-
-RSpec/ScatteredSetup:
-  Enabled: false # TODO
-
-RSpec/SharedContext:
-  Enabled: true
-
-RSpec/SharedExamples:
-  Enabled: true
-
-RSpec/SingleArgumentMessageChain:
-  Enabled: true
-
-RSpec/SubjectStub:
-  Enabled: true
-
-RSpec/UnspecifiedException:
-  Enabled: true
-
-RSpec/VerifiedDoubles:
-  Enabled: true
-
-RSpec/VoidExpect:
-  Enabled: true
-
-RSpec/Yield:
-  Enabled: true
-
-Capybara/CurrentPathExpectation:
-  Enabled: true
-
-Capybara/FeatureMethods:
-  Enabled: true
-
-FactoryBot/AttributeDefinedStatically:
-  Enabled: true
-
-FactoryBot/CreateList:
-  Enabled: true
-
-FactoryBot/FactoryClassName:
-  Enabled: true
-
-Rails/HttpStatus:
-  Enabled: true
+inherit_gem:
+  rubocop-discourse: default.yml
diff --git a/Gemfile b/Gemfile
index 742bf82d0b..039acc6a2a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -172,9 +172,7 @@ group :test, :development do
   gem 'shoulda-matchers', require: false
   gem 'rspec-html-matchers'
   gem 'byebug', require: ENV['RM_INFO'].nil?, platform: :mri
-  gem 'rubocop', require: false
   gem "rubocop-discourse", require: false
-  gem "rubocop-rspec", require: false
   gem 'parallel_tests'
 
   gem 'rswag-specs'
diff --git a/Gemfile.lock b/Gemfile.lock
index 839f58f148..6d97e8a504 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -528,9 +528,7 @@ DEPENDENCIES
   rspec-rails
   rswag-specs
   rtlit
-  rubocop
   rubocop-discourse
-  rubocop-rspec
   ruby-prof
   ruby-readability
   rubyzip

From 6c968b794510bfad1385bcb625eacef47b46cb25 Mon Sep 17 00:00:00 2001
From: "Kyle E. Mitchell" <kyle@kemitchell.com>
Date: Wed, 6 May 2020 09:51:45 -0700
Subject: [PATCH 0976/1830] Add script for compiling copyright deposits (#9646)

* Add script for compiling copyright deposits

* git mv copyright-deposit script/
---
 .gitignore               |  5 +++-
 script/copyright-deposit | 64 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100755 script/copyright-deposit

diff --git a/.gitignore b/.gitignore
index 97d1a6b930..2ef99613b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,4 +137,7 @@ node_modules
 openapi/*
 
 # ember-cli generated
-dist
\ No newline at end of file
+dist
+
+# Copyright Deposits
+copyright
diff --git a/script/copyright-deposit b/script/copyright-deposit
new file mode 100755
index 0000000000..2c3318045f
--- /dev/null
+++ b/script/copyright-deposit
@@ -0,0 +1,64 @@
+#!/bin/bash
+set -e
+mkdir -p copyright
+
+tmp=$(mktemp -d)
+function cleanup () {
+  rm -rf "$tmp"
+}
+trap cleanup EXIT
+
+# Docs
+echo "Compiling documentation deposit..."
+docs="$tmp/docs"
+mkdir -p "$docs"
+
+# ./README.md
+echo "README.md"
+PDF_FLAGS="--pdf-engine=xelatex"
+pandoc $PDF_FLAGS -o "$tmp/docs/00000.pdf" README.md
+
+# ./docs
+counter=0
+for md in docs/*.md; do
+  echo "$md"
+  counter=$((counter+1))
+  printf -v padded "%05d" $counter
+  pandoc $PDF_FLAGS -o "$docs/$padded.pdf" "$md"
+done
+
+pdftk $docs/*.pdf cat output copyright/documentation-deposit.pdf
+echo "copyright/documentation-deposit.pdf"
+
+# Code
+echo "Compiling code deposit..."
+code="$tmp/code"
+mkdir -p "$code"
+files=$(git ls-files app script | grep -E "\\.(js|rb)$")
+sample=15
+first=$(head -n "$sample" <<< "$files")
+last=$(tail -n "$sample" <<< "$files")
+
+unoconv --listener &
+
+function process_code () {
+  echo "$1"
+  counter=$((counter+1))
+  printf -v padded "%05d" $counter
+  printf "%s\\n\\n" "$1" > "$code/$padded.txt"
+  cat "$1" >> "$code/$padded.txt"
+  unoconv -o "$code/$padded.pdf" "$code/$padded.txt"
+}
+
+counter=0
+while IFS= read -r file; do
+  process_code "$file"
+done <<< "$first"
+while IFS= read -r file; do
+  process_code "$file"
+done <<< "$last"
+
+pdftk $code/*.pdf cat output $code/code.pdf
+# first 25 pages and last 25 pages
+pdftk $code/code.pdf cat 1-25 r25-end output copyright/code-deposit.pdf
+echo "copyright/code-deposit.pdf"

From 01929e3505105e186a4ee90e6a25640bf92ebe70 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 6 May 2020 15:28:06 -0400
Subject: [PATCH 0977/1830] DEV: Move `preload-store` to
 `discourse/lib/preload-store`

It's only used inside Discourse so it needn't be its own module
---
 app/assets/javascripts/admin/routes/admin-backups-logs.js | 2 +-
 app/assets/javascripts/admin/routes/admin-backups.js      | 2 +-
 app/assets/javascripts/discourse-loader.js                | 3 ++-
 .../javascripts/discourse/app/adapters/topic-list.js      | 2 +-
 .../javascripts/discourse/app/helpers/custom-html.js      | 2 +-
 .../javascripts/discourse/app/initializers/banner.js      | 2 +-
 .../discourse/app/initializers/enable-emoji.js            | 2 +-
 .../javascripts/{ => discourse/app/lib}/preload-store.js  | 8 ++------
 .../javascripts/discourse/app/models/category-list.js     | 2 +-
 app/assets/javascripts/discourse/app/models/site.js       | 2 +-
 .../discourse/app/models/topic-tracking-state.js          | 2 +-
 app/assets/javascripts/discourse/app/models/topic.js      | 2 +-
 app/assets/javascripts/discourse/app/models/user.js       | 2 +-
 .../javascripts/discourse/app/routes/account-created.js   | 2 +-
 .../javascripts/discourse/app/routes/badges-index.js      | 2 +-
 .../javascripts/discourse/app/routes/badges-show.js       | 2 +-
 .../discourse/app/routes/discovery-categories.js          | 2 +-
 .../javascripts/discourse/app/routes/full-page-search.js  | 2 +-
 .../javascripts/discourse/app/routes/invites-show.js      | 2 +-
 .../javascripts/discourse/app/routes/password-reset.js    | 2 +-
 app/assets/javascripts/preload-application-data.js        | 2 +-
 lib/discourse_js_processor.rb                             | 1 -
 test/javascripts/acceptance/account-created-test.js       | 2 +-
 test/javascripts/acceptance/custom-html-set-test.js       | 2 +-
 test/javascripts/acceptance/invite-accept-test.js         | 2 +-
 test/javascripts/acceptance/password-reset-test.js        | 2 +-
 test/javascripts/helpers/site.js                          | 2 +-
 test/javascripts/lib/preload-store-test.js                | 2 +-
 28 files changed, 29 insertions(+), 33 deletions(-)
 rename app/assets/javascripts/{ => discourse/app/lib}/preload-store.js (86%)

diff --git a/app/assets/javascripts/admin/routes/admin-backups-logs.js b/app/assets/javascripts/admin/routes/admin-backups-logs.js
index 3d24756a4a..2c7e16eed7 100644
--- a/app/assets/javascripts/admin/routes/admin-backups-logs.js
+++ b/app/assets/javascripts/admin/routes/admin-backups-logs.js
@@ -1,6 +1,6 @@
 import EmberObject from "@ember/object";
 import Route from "@ember/routing/route";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 
 export default Route.extend({
   // since the logs are pushed via the message bus
diff --git a/app/assets/javascripts/admin/routes/admin-backups.js b/app/assets/javascripts/admin/routes/admin-backups.js
index 6bc42d725f..85bfc197b9 100644
--- a/app/assets/javascripts/admin/routes/admin-backups.js
+++ b/app/assets/javascripts/admin/routes/admin-backups.js
@@ -4,7 +4,7 @@ import { ajax } from "discourse/lib/ajax";
 import showModal from "discourse/lib/show-modal";
 import BackupStatus from "admin/models/backup-status";
 import Backup from "admin/models/backup";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 import User from "discourse/models/user";
 
 const LOG_CHANNEL = "/admin/backups/logs";
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 5d189a2857..e14a457bd1 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -6,7 +6,8 @@ var define, requirejs;
   var ALIASES = {
     "ember-addons/ember-computed-decorators":
       "discourse-common/utils/decorators",
-    "discourse/lib/raw-templates": "discourse-common/lib/raw-templates"
+    "discourse/lib/raw-templates": "discourse-common/lib/raw-templates",
+    "preload-store": "discourse/lib/preload-store"
   };
   if (typeof Ember !== "undefined") {
     EMBER_MODULES = {
diff --git a/app/assets/javascripts/discourse/app/adapters/topic-list.js b/app/assets/javascripts/discourse/app/adapters/topic-list.js
index 3d280047eb..bd45b85e09 100644
--- a/app/assets/javascripts/discourse/app/adapters/topic-list.js
+++ b/app/assets/javascripts/discourse/app/adapters/topic-list.js
@@ -1,6 +1,6 @@
 import { ajax } from "discourse/lib/ajax";
 import RestAdapter from "discourse/adapters/rest";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 
 export function finderFor(filter, params) {
   return function() {
diff --git a/app/assets/javascripts/discourse/app/helpers/custom-html.js b/app/assets/javascripts/discourse/app/helpers/custom-html.js
index b9d424a2c9..202476fcda 100644
--- a/app/assets/javascripts/discourse/app/helpers/custom-html.js
+++ b/app/assets/javascripts/discourse/app/helpers/custom-html.js
@@ -1,4 +1,4 @@
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 import { htmlSafe } from "@ember/template";
 
 let _customizations = {};
diff --git a/app/assets/javascripts/discourse/app/initializers/banner.js b/app/assets/javascripts/discourse/app/initializers/banner.js
index ccec6a95b4..91e3ab3a6a 100644
--- a/app/assets/javascripts/discourse/app/initializers/banner.js
+++ b/app/assets/javascripts/discourse/app/initializers/banner.js
@@ -1,5 +1,5 @@
 import EmberObject from "@ember/object";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 
 export default {
   name: "banner",
diff --git a/app/assets/javascripts/discourse/app/initializers/enable-emoji.js b/app/assets/javascripts/discourse/app/initializers/enable-emoji.js
index a6e3e6d03a..fd91b69aec 100644
--- a/app/assets/javascripts/discourse/app/initializers/enable-emoji.js
+++ b/app/assets/javascripts/discourse/app/initializers/enable-emoji.js
@@ -1,6 +1,6 @@
 import { withPluginApi } from "discourse/lib/plugin-api";
 import { registerEmoji } from "pretty-text/emoji";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 
 export default {
   name: "enable-emoji",
diff --git a/app/assets/javascripts/preload-store.js b/app/assets/javascripts/discourse/app/lib/preload-store.js
similarity index 86%
rename from app/assets/javascripts/preload-store.js
rename to app/assets/javascripts/discourse/app/lib/preload-store.js
index 132588695b..ebee66cfce 100644
--- a/app/assets/javascripts/preload-store.js
+++ b/app/assets/javascripts/discourse/app/lib/preload-store.js
@@ -1,9 +1,5 @@
-/**
-  We can insert data into the PreloadStore when the document is loaded.
-  The data can be accessed once by a key, after which it is removed
-
-  @class PreloadStore
-**/
+//  We can insert data into the PreloadStore when the document is loaded.
+// The data can be accessed once by a key, after which it is removed
 import { Promise } from "rsvp";
 
 export default {
diff --git a/app/assets/javascripts/discourse/app/models/category-list.js b/app/assets/javascripts/discourse/app/models/category-list.js
index ce655978b3..e3c028e156 100644
--- a/app/assets/javascripts/discourse/app/models/category-list.js
+++ b/app/assets/javascripts/discourse/app/models/category-list.js
@@ -1,5 +1,5 @@
 import ArrayProxy from "@ember/array/proxy";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 import { ajax } from "discourse/lib/ajax";
 import Topic from "discourse/models/topic";
 import Category from "discourse/models/category";
diff --git a/app/assets/javascripts/discourse/app/models/site.js b/app/assets/javascripts/discourse/app/models/site.js
index 29de94c3a8..455368bf85 100644
--- a/app/assets/javascripts/discourse/app/models/site.js
+++ b/app/assets/javascripts/discourse/app/models/site.js
@@ -7,7 +7,7 @@ import PostActionType from "discourse/models/post-action-type";
 import Singleton from "discourse/mixins/singleton";
 import RestModel from "discourse/models/rest";
 import TrustLevel from "discourse/models/trust-level";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 import deprecated from "discourse-common/lib/deprecated";
 
 const Site = RestModel.extend({
diff --git a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
index bccb7747eb..7cb74d8845 100644
--- a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
+++ b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
@@ -2,7 +2,7 @@ import EmberObject, { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 import Category from "discourse/models/category";
 import User from "discourse/models/user";
 
diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js
index 00f8c8839f..573104b6eb 100644
--- a/app/assets/javascripts/discourse/app/models/topic.js
+++ b/app/assets/javascripts/discourse/app/models/topic.js
@@ -10,7 +10,7 @@ import ActionSummary from "discourse/models/action-summary";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { censor } from "pretty-text/censored-words";
 import { emojiUnescape } from "discourse/lib/text";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 import { userPath } from "discourse/lib/url";
 import discourseComputed, {
   observes,
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index bebf2d3dcb..6f4cf5dfcf 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -18,7 +18,7 @@ import UserAction from "discourse/models/user-action";
 import UserDraftsStream from "discourse/models/user-drafts-stream";
 import Group from "discourse/models/group";
 import { emojiUnescape } from "discourse/lib/text";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 import { defaultHomepage } from "discourse/lib/utilities";
 import { userPath } from "discourse/lib/url";
 import Category from "discourse/models/category";
diff --git a/app/assets/javascripts/discourse/app/routes/account-created.js b/app/assets/javascripts/discourse/app/routes/account-created.js
index 901f6c0ffb..3ba5e2ca4e 100644
--- a/app/assets/javascripts/discourse/app/routes/account-created.js
+++ b/app/assets/javascripts/discourse/app/routes/account-created.js
@@ -1,5 +1,5 @@
 import Route from "@ember/routing/route";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 
 export default Route.extend({
   setupController(controller) {
diff --git a/app/assets/javascripts/discourse/app/routes/badges-index.js b/app/assets/javascripts/discourse/app/routes/badges-index.js
index c4acb15592..142a9ef807 100644
--- a/app/assets/javascripts/discourse/app/routes/badges-index.js
+++ b/app/assets/javascripts/discourse/app/routes/badges-index.js
@@ -1,6 +1,6 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import Badge from "discourse/models/badge";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 
 export default DiscourseRoute.extend({
   model() {
diff --git a/app/assets/javascripts/discourse/app/routes/badges-show.js b/app/assets/javascripts/discourse/app/routes/badges-show.js
index 86b8f0d4af..b4c0b6e681 100644
--- a/app/assets/javascripts/discourse/app/routes/badges-show.js
+++ b/app/assets/javascripts/discourse/app/routes/badges-show.js
@@ -1,7 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import UserBadge from "discourse/models/user-badge";
 import Badge from "discourse/models/badge";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 import { hash } from "rsvp";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/discovery-categories.js b/app/assets/javascripts/discourse/app/routes/discovery-categories.js
index 2770a8093e..ba07642941 100644
--- a/app/assets/javascripts/discourse/app/routes/discovery-categories.js
+++ b/app/assets/javascripts/discourse/app/routes/discovery-categories.js
@@ -7,7 +7,7 @@ import CategoryList from "discourse/models/category-list";
 import { defaultHomepage } from "discourse/lib/utilities";
 import TopicList from "discourse/models/topic-list";
 import { ajax } from "discourse/lib/ajax";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 import { searchPriorities } from "discourse/components/concerns/category-search-priorities";
 import { hash } from "rsvp";
 import Site from "discourse/models/site";
diff --git a/app/assets/javascripts/discourse/app/routes/full-page-search.js b/app/assets/javascripts/discourse/app/routes/full-page-search.js
index 6fe75cd83b..e95c6f8745 100644
--- a/app/assets/javascripts/discourse/app/routes/full-page-search.js
+++ b/app/assets/javascripts/discourse/app/routes/full-page-search.js
@@ -5,7 +5,7 @@ import {
   getSearchKey,
   isValidSearchTerm
 } from "discourse/lib/search";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 import { getTransient, setTransient } from "discourse/lib/page-tracker";
 import { escapeExpression } from "discourse/lib/utilities";
 
diff --git a/app/assets/javascripts/discourse/app/routes/invites-show.js b/app/assets/javascripts/discourse/app/routes/invites-show.js
index 7ec701b842..ded630dc8c 100644
--- a/app/assets/javascripts/discourse/app/routes/invites-show.js
+++ b/app/assets/javascripts/discourse/app/routes/invites-show.js
@@ -1,5 +1,5 @@
 import DiscourseRoute from "discourse/routes/discourse";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 
 export default DiscourseRoute.extend({
   titleToken() {
diff --git a/app/assets/javascripts/discourse/app/routes/password-reset.js b/app/assets/javascripts/discourse/app/routes/password-reset.js
index 393b19f96a..58e690fac8 100644
--- a/app/assets/javascripts/discourse/app/routes/password-reset.js
+++ b/app/assets/javascripts/discourse/app/routes/password-reset.js
@@ -1,5 +1,5 @@
 import DiscourseRoute from "discourse/routes/discourse";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 import { ajax } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
 
diff --git a/app/assets/javascripts/preload-application-data.js b/app/assets/javascripts/preload-application-data.js
index c72d4a66d1..0b93ded00d 100644
--- a/app/assets/javascripts/preload-application-data.js
+++ b/app/assets/javascripts/preload-application-data.js
@@ -1,6 +1,6 @@
 // discourse-skip-module
 (function() {
-  const ps = require("preload-store").default;
+  const ps = require("discourse/lib/preload-store").default;
   const preloadedDataElement = document.getElementById("data-preloaded");
   const setupData = document.getElementById("data-discourse-setup").dataset;
 
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 1aa140aebf..94e39d0d82 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -48,7 +48,6 @@ class DiscourseJsProcessor
     return false if relative_path.start_with?("#{js_root}/plugins/")
 
     return true if %w(
-      preload-store
       preload-application-data
       wizard-start
       onpopstate-handler
diff --git a/test/javascripts/acceptance/account-created-test.js b/test/javascripts/acceptance/account-created-test.js
index e9d57d9389..3b2dad73f8 100644
--- a/test/javascripts/acceptance/account-created-test.js
+++ b/test/javascripts/acceptance/account-created-test.js
@@ -1,5 +1,5 @@
 import { acceptance } from "helpers/qunit-helpers";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 
 acceptance("Account Created");
 
diff --git a/test/javascripts/acceptance/custom-html-set-test.js b/test/javascripts/acceptance/custom-html-set-test.js
index 8df5e7e3a1..fa5a94a8f9 100644
--- a/test/javascripts/acceptance/custom-html-set-test.js
+++ b/test/javascripts/acceptance/custom-html-set-test.js
@@ -1,6 +1,6 @@
 import { acceptance } from "helpers/qunit-helpers";
 import { setCustomHTML } from "discourse/helpers/custom-html";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 
 acceptance("CustomHTML set");
 
diff --git a/test/javascripts/acceptance/invite-accept-test.js b/test/javascripts/acceptance/invite-accept-test.js
index 6078bce9ef..27fd023394 100644
--- a/test/javascripts/acceptance/invite-accept-test.js
+++ b/test/javascripts/acceptance/invite-accept-test.js
@@ -1,5 +1,5 @@
 import { acceptance } from "helpers/qunit-helpers";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 
 acceptance("Invite Accept", {
   settings: {
diff --git a/test/javascripts/acceptance/password-reset-test.js b/test/javascripts/acceptance/password-reset-test.js
index 476c426f9f..0bec015050 100644
--- a/test/javascripts/acceptance/password-reset-test.js
+++ b/test/javascripts/acceptance/password-reset-test.js
@@ -1,5 +1,5 @@
 import { acceptance } from "helpers/qunit-helpers";
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 import { parsePostData } from "helpers/create-pretender";
 
 acceptance("Password Reset", {
diff --git a/test/javascripts/helpers/site.js b/test/javascripts/helpers/site.js
index 7c4b2273dd..ce7ffc8825 100644
--- a/test/javascripts/helpers/site.js
+++ b/test/javascripts/helpers/site.js
@@ -1,4 +1,4 @@
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 
 /*jshint maxlen:10000000 */
 PreloadStore.store("site", {
diff --git a/test/javascripts/lib/preload-store-test.js b/test/javascripts/lib/preload-store-test.js
index e25e89ee82..effb683e66 100644
--- a/test/javascripts/lib/preload-store-test.js
+++ b/test/javascripts/lib/preload-store-test.js
@@ -1,4 +1,4 @@
-import PreloadStore from "preload-store";
+import PreloadStore from "discourse/lib/preload-store";
 import { Promise } from "rsvp";
 
 QUnit.module("preload-store", {

From 7acb25db12fe18d94926ed13e977e129eb5a9cca Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 6 May 2020 15:55:52 -0400
Subject: [PATCH 0978/1830] FIX: preload-store was moved

---
 test/javascripts/test_helper.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index d15cd7c8fb..6e9333587d 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -12,7 +12,6 @@
 //= require route-recognizer/dist/route-recognizer
 //= require pretender/pretender
 //= require discourse-loader
-//= require preload-store
 
 //= require locales/i18n
 //= require locales/en_US

From 029d091ea8f5ac9936136de405f512c26403de54 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 6 May 2020 22:18:47 +0200
Subject: [PATCH 0979/1830] FIX: displays poll's close date in local time
 (#9656)

---
 plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
index 9564ec89e0..3ca2b793c6 100644
--- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
+++ b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
@@ -745,7 +745,7 @@ createWidget("discourse-poll-buttons", {
     }
 
     if (poll.get("close")) {
-      const closeDate = moment.utc(poll.get("close"));
+      const closeDate = moment(poll.get("close"));
       if (closeDate.isValid()) {
         const title = closeDate.format("LLL");
         let label;
@@ -754,7 +754,7 @@ createWidget("discourse-poll-buttons", {
           const age = relativeAge(closeDate.toDate(), { addAgo: true });
           label = I18n.t("poll.automatic_close.age", { age });
         } else {
-          const timeLeft = moment().to(closeDate.local(), true);
+          const timeLeft = moment().to(closeDate, true);
           label = I18n.t("poll.automatic_close.closes_in", { timeLeft });
         }
 

From 97657aa32244895dd724fc1c1700b379f3480f59 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 6 May 2020 16:46:48 -0400
Subject: [PATCH 0980/1830] Don't precompile preload-store

---
 config/application.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/application.rb b/config/application.rb
index 3b9d4da7db..b2649ad17f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -134,7 +134,6 @@ module Discourse
     config.assets.precompile += %w{
       vendor.js
       admin.js
-      preload-store.js
       browser-detect.js
       browser-update.js
       break_string.js

From 15a938e861da593013c761859b7f72c7d00bb518 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Wed, 6 May 2020 13:57:26 -0700
Subject: [PATCH 0981/1830] FIX: make can_invite_to_forum robust against plugin
 interference (#9644)

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

diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index 5fa2db54e8..9e238375cc 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -123,7 +123,7 @@ class CurrentUserSerializer < BasicUserSerializer
   end
 
   def can_invite_to_forum
-    true
+    scope.can_invite_to_forum?
   end
 
   def include_can_invite_to_forum?

From ec2f3169ff43a440250bc54f7c6c43d64fcc8263 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Wed, 6 May 2020 22:57:14 +0200
Subject: [PATCH 0982/1830] FIX: Using the `default_locale` in locale fallbacks
 caused problems

Locale files get precompiled after deployment and they contained translations from the `default_locale`. That's especially bad in multisites, because the initial `default_locale` is `en_US`. Sites where the `default_locale` isn't `en_US` could see missing translations. The same thing could happen when users are allowed to chose a different locale.

This change simplifies the logic by not using the `default_locale` in the locale chain. It always falls back to `en` in case of missing translations.
---
 lib/i18n/backend/fallback_locale_list.rb   | 18 +++---
 spec/components/js_locale_helper_spec.rb   | 12 ++--
 spec/lib/i18n/discourse_i18n_spec.rb       |  9 ---
 spec/lib/i18n/fallback_locale_list_spec.rb | 21 +++++--
 spec/models/theme_field_spec.rb            | 66 ++++++++++++----------
 spec/models/theme_spec.rb                  | 10 +++-
 6 files changed, 72 insertions(+), 64 deletions(-)

diff --git a/lib/i18n/backend/fallback_locale_list.rb b/lib/i18n/backend/fallback_locale_list.rb
index e1b3d25ebb..f1b5acaea6 100644
--- a/lib/i18n/backend/fallback_locale_list.rb
+++ b/lib/i18n/backend/fallback_locale_list.rb
@@ -6,19 +6,15 @@ module I18n
     class FallbackLocaleList < Hash
       def [](locale)
         locale = locale.to_sym
-        return [locale] if locale == :en
+        locale_list = [locale]
+        return locale_list if locale == :en
 
-        fallback_locale = LocaleSiteSetting.fallback_locale(locale)
-        site_locale = SiteSetting.default_locale.to_sym
-
-        locale_list =
-          if locale == site_locale || site_locale == :en || fallback_locale == :en
-            [locale, fallback_locale, :en]
-          else
-            site_fallback_locale = LocaleSiteSetting.fallback_locale(site_locale)
-            [locale, fallback_locale, site_locale, site_fallback_locale, :en]
-          end
+        while (fallback_locale = LocaleSiteSetting.fallback_locale(locale))
+          locale_list << fallback_locale
+          locale = fallback_locale
+        end
 
+        locale_list << :en
         locale_list.uniq.compact
       end
     end
diff --git a/spec/components/js_locale_helper_spec.rb b/spec/components/js_locale_helper_spec.rb
index c1b9933f08..e1c9cb40bb 100644
--- a/spec/components/js_locale_helper_spec.rb
+++ b/spec/components/js_locale_helper_spec.rb
@@ -130,7 +130,7 @@ describe JsLocaleHelper do
     end
   end
 
-  it 'performs fallbacks to english if a translation is not available' do
+  it 'performs fallbacks to English if a translation is not available' do
     JsLocaleHelper.set_translations('en', "en" => {
         "js" => {
           "only_english" => "1-en",
@@ -161,12 +161,12 @@ describe JsLocaleHelper do
     expected = {
       "none" => "[uk.js.none]",
       "only_english" => "1-en",
-      "only_site" => "2-ru",
-      "english_and_site" => "3-ru",
+      "only_site" => "[uk.js.only_site]",
+      "english_and_site" => "3-en",
       "only_user" => "4-uk",
       "english_and_user" => "5-uk",
       "site_and_user" => "6-uk",
-      "all_three" => "7-uk",
+      "all_three" => "7-uk"
     }
 
     SiteSetting.default_locale = 'ru'
@@ -178,9 +178,9 @@ describe JsLocaleHelper do
     ctx.eval(JsLocaleHelper.output_locale(I18n.locale))
     ctx.eval('I18n.defaultLocale = "ru";')
 
-    expect(ctx.eval('I18n.translations.en.js').keys).to contain_exactly("only_english")
-    expect(ctx.eval('I18n.translations.ru.js').keys).to contain_exactly("only_site", "english_and_site")
+    expect(ctx.eval('I18n.translations').keys).to contain_exactly("uk", "en")
     expect(ctx.eval('I18n.translations.uk.js').keys).to contain_exactly("all_three", "english_and_user", "only_user", "site_and_user")
+    expect(ctx.eval('I18n.translations.en.js').keys).to contain_exactly("only_english", "english_and_site")
 
     expected.each do |key, expect|
       expect(ctx.eval("I18n.t(#{"js.#{key}".inspect})")).to eq(expect)
diff --git a/spec/lib/i18n/discourse_i18n_spec.rb b/spec/lib/i18n/discourse_i18n_spec.rb
index 0215dc33fe..39c0691d36 100644
--- a/spec/lib/i18n/discourse_i18n_spec.rb
+++ b/spec/lib/i18n/discourse_i18n_spec.rb
@@ -13,7 +13,6 @@ describe I18n::Backend::DiscourseI18n do
     backend.store_translations(:en, foo: 'Foo in :en', bar: 'Bar in :en', wat: 'Hello %{count}')
     backend.store_translations(:en, items: { one: 'one item', other: '%{count} items' })
     backend.store_translations(:de, bar: 'Bar in :de')
-    backend.store_translations(:ru, baz: 'Baz in :ru')
     backend.store_translations(:en, link: '[text](url)')
   end
 
@@ -54,13 +53,6 @@ describe I18n::Backend::DiscourseI18n do
       expect(backend.translate(:de, 'bar')).to eq('Bar in :de')
       expect(backend.translate(:de, 'foo')).to eq('Foo in :en')
     end
-
-    it 'uses default_locale as fallback when key exists' do
-      SiteSetting.default_locale = 'ru'
-      expect(backend.translate(:de, 'bar')).to eq('Bar in :de')
-      expect(backend.translate(:de, 'baz')).to eq('Baz in :ru')
-      expect(backend.translate(:de, 'foo')).to eq('Foo in :en')
-    end
   end
 
   describe '#exists?' do
@@ -75,7 +67,6 @@ describe I18n::Backend::DiscourseI18n do
     it 'returns true when an existing key and an existing locale is given' do
       expect(backend.exists?(:en, :foo)).to eq(true)
       expect(backend.exists?(:de, :bar)).to eq(true)
-      expect(backend.exists?(:ru, :baz)).to eq(true)
     end
 
     it 'returns false when a non-existing key and an existing locale is given' do
diff --git a/spec/lib/i18n/fallback_locale_list_spec.rb b/spec/lib/i18n/fallback_locale_list_spec.rb
index 793ac8b2a0..f84a4908aa 100644
--- a/spec/lib/i18n/fallback_locale_list_spec.rb
+++ b/spec/lib/i18n/fallback_locale_list_spec.rb
@@ -16,7 +16,7 @@ describe I18n::Backend::FallbackLocaleList do
   it "works when default_locale is English (United States)" do
     SiteSetting.default_locale = :en_US
 
-    expect(list[:ru]).to eq([:ru, :en_US, :en])
+    expect(list[:ru]).to eq([:ru, :en])
     expect(list[:en_US]).to eq([:en_US, :en])
     expect(list[:en]).to eq([:en])
   end
@@ -24,7 +24,7 @@ describe I18n::Backend::FallbackLocaleList do
   it "works when default_locale is not English" do
     SiteSetting.default_locale = :de
 
-    expect(list[:ru]).to eq([:ru, :de, :en])
+    expect(list[:ru]).to eq([:ru, :en])
     expect(list[:de]).to eq([:de, :en])
     expect(list[:en]).to eq([:en])
     expect(list[:en_US]).to eq([:en_US, :en])
@@ -34,6 +34,7 @@ describe I18n::Backend::FallbackLocaleList do
     before do
       DiscoursePluginRegistry.register_locale("es_MX", fallbackLocale: "es")
       DiscoursePluginRegistry.register_locale("de_AT", fallbackLocale: "de")
+      DiscoursePluginRegistry.register_locale("de_AT-formal", fallbackLocale: "de_AT")
     end
 
     after do
@@ -44,15 +45,27 @@ describe I18n::Backend::FallbackLocaleList do
       SiteSetting.default_locale = :en
 
       expect(list[:de_AT]).to eq([:de_AT, :de, :en])
+      expect(list[:"de_AT-formal"]).to eq([:"de_AT-formal", :de_AT, :de, :en])
       expect(list[:de]).to eq([:de, :en])
       expect(list[:en]).to eq([:en])
     end
 
+    it "works when default_locale is English (United States)" do
+      SiteSetting.default_locale = :en_US
+
+      expect(list[:de_AT]).to eq([:de_AT, :de, :en])
+      expect(list[:"de_AT-formal"]).to eq([:"de_AT-formal", :de_AT, :de, :en])
+      expect(list[:de]).to eq([:de, :en])
+      expect(list[:en]).to eq([:en])
+      expect(list[:en_US]).to eq([:en_US, :en])
+    end
+
     it "works when default_locale is not English" do
       SiteSetting.default_locale = :de
 
-      expect(list[:es_MX]).to eq([:es_MX, :es, :de, :en])
-      expect(list[:es]).to eq([:es, :de, :en])
+      expect(list[:es_MX]).to eq([:es_MX, :es, :en])
+      expect(list[:"de_AT-formal"]).to eq([:"de_AT-formal", :de_AT, :de, :en])
+      expect(list[:es]).to eq([:es, :en])
       expect(list[:en]).to eq([:en])
     end
   end
diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rb
index 570a861d7a..fcc91536f4 100644
--- a/spec/models/theme_field_spec.rb
+++ b/spec/models/theme_field_spec.rb
@@ -8,6 +8,10 @@ describe ThemeField do
     ThemeField.destroy_all
   end
 
+  before do
+    I18n.locale = :en
+  end
+
   describe "scope: find_by_theme_ids" do
     it "returns result in the specified order" do
       theme = Fabricate(:theme)
@@ -60,22 +64,22 @@ describe ThemeField do
 
   it 'only extracts inline javascript to an external file' do
     html = <<~HTML
-    <script type="text/discourse-plugin" version="0.8">
-      var a = "inline discourse plugin";
-    </script>
-    <script type="text/template" data-template="custom-template">
-      <div>custom script type</div>
-    </script>
-    <script>
-      var b = "inline raw script";
-    </script>
-    <script type="texT/jAvasCripT">
-      var c = "text/javascript";
-    </script>
-    <script type="application/javascript">
-      var d = "application/javascript";
-    </script>
-    <script src="/external-script.js"></script>
+      <script type="text/discourse-plugin" version="0.8">
+        var a = "inline discourse plugin";
+      </script>
+      <script type="text/template" data-template="custom-template">
+        <div>custom script type</div>
+      </script>
+      <script>
+        var b = "inline raw script";
+      </script>
+      <script type="texT/jAvasCripT">
+        var c = "text/javascript";
+      </script>
+      <script type="application/javascript">
+        var d = "application/javascript";
+      </script>
+      <script src="/external-script.js"></script>
     HTML
 
     theme_field = ThemeField.create!(theme_id: 1, target_id: 0, name: "header", value: html)
@@ -91,13 +95,13 @@ describe ThemeField do
 
   it 'adds newlines between the extracted javascripts' do
     html = <<~HTML
-    <script>var a = 10</script>
-    <script>var b = 10</script>
+      <script>var a = 10</script>
+      <script>var b = 10</script>
     HTML
 
     extracted = <<~JavaScript
-    var a = 10
-    var b = 10
+      var a = 10
+      var b = 10
     JavaScript
 
     theme_field = ThemeField.create!(theme_id: 1, target_id: 0, name: "header", value: html)
@@ -301,8 +305,8 @@ HTML
     let!(:theme3) { Fabricate(:theme) }
 
     let!(:en1) {
-      ThemeField.create!(theme: theme, target_id: Theme.targets[:translations], name: "en_US",
-                         value: { en_US: { somestring1: "helloworld", group: { key1: "enval1" } } }
+      ThemeField.create!(theme: theme, target_id: Theme.targets[:translations], name: "en",
+                         value: { en: { somestring1: "helloworld", group: { key1: "enval1" } } }
                                   .deep_stringify_keys.to_yaml
       )
     }
@@ -313,21 +317,21 @@ HTML
       )
     }
     let!(:fr2) { ThemeField.create!(theme: theme2, target_id: Theme.targets[:translations], name: "fr", value: "") }
-    let!(:en2) { ThemeField.create!(theme: theme2, target_id: Theme.targets[:translations], name: "en_US", value: "") }
+    let!(:en2) { ThemeField.create!(theme: theme2, target_id: Theme.targets[:translations], name: "en", value: "") }
     let!(:ca3) { ThemeField.create!(theme: theme3, target_id: Theme.targets[:translations], name: "ca", value: "") }
-    let!(:en3) { ThemeField.create!(theme: theme3, target_id: Theme.targets[:translations], name: "en_US", value: "") }
+    let!(:en3) { ThemeField.create!(theme: theme3, target_id: Theme.targets[:translations], name: "en", value: "") }
 
     describe "scopes" do
       it "filter_locale_fields returns results in the correct order" do
         expect(ThemeField.find_by_theme_ids([theme3.id, theme.id, theme2.id])
           .filter_locale_fields(
-           ["en_US", "fr"]
+           ["en", "fr"]
         )).to eq([en3, en1, fr1, en2, fr2])
       end
 
       it "find_first_locale_fields returns only the first locale for each theme" do
         expect(ThemeField.find_first_locale_fields(
-          [theme3.id, theme.id, theme2.id], ["ca", "en_US", "fr"]
+          [theme3.id, theme.id, theme2.id], ["ca", "en", "fr"]
         )).to eq([ca3, en1, en2])
       end
     end
@@ -358,7 +362,7 @@ HTML
       it "loads correctly" do
         expect(fr1.translation_data).to eq(
           fr: { somestring1: "bonjourworld", group: { key2: "frval2" } },
-          en_US: { somestring1: "helloworld", group: { key1: "enval1" } }
+          en: { somestring1: "helloworld", group: { key1: "enval1" } }
         )
       end
 
@@ -380,7 +384,7 @@ HTML
         theme.reload
         expect(fr1.translation_data).to eq(
           fr: { somestring1: "bonjourworld", group: { key2: "frval2" } },
-          en_US: { somestring1: "helloworld", group: { key1: "overriddentest1" } }
+          en: { somestring1: "helloworld", group: { key1: "overriddentest1" } }
         )
       end
     end
@@ -398,9 +402,9 @@ HTML
     describe "prefix injection" do
       it "injects into JS" do
         html = <<~HTML
-        <script type="text/discourse-plugin" version="0.8">
-          var a = "inline discourse plugin";
-        </script>
+          <script type="text/discourse-plugin" version="0.8">
+            var a = "inline discourse plugin";
+          </script>
         HTML
 
         theme_field = ThemeField.create!(theme_id: theme.id, target_id: 0, name: "head_tag", value: html)
diff --git a/spec/models/theme_spec.rb b/spec/models/theme_spec.rb
index ae162773e3..04b452ccfc 100644
--- a/spec/models/theme_spec.rb
+++ b/spec/models/theme_spec.rb
@@ -7,6 +7,10 @@ describe Theme do
     Theme.clear_cache!
   end
 
+  before do
+    I18n.locale = :en
+  end
+
   fab! :user do
     Fabricate(:user)
   end
@@ -657,8 +661,8 @@ HTML
     end
 
     it "can create a hash of overridden values" do
-      en_translation = ThemeField.create!(theme_id: theme.id, name: "en_US", type_id: ThemeField.types[:yaml], target_id: Theme.targets[:translations], value: <<~YAML)
-        en_US:
+      en_translation = ThemeField.create!(theme_id: theme.id, name: "en", type_id: ThemeField.types[:yaml], target_id: Theme.targets[:translations], value: <<~YAML)
+        en:
           group_of_translations:
             translation1: en test1
       YAML
@@ -668,7 +672,7 @@ HTML
       theme.update_translation("group_of_translations.translation1", "overriddentest2")
       theme.reload
       expect(theme.translation_override_hash).to eq(
-        "en_US" => {
+        "en" => {
           "group_of_translations" => {
             "translation1" => "overriddentest1"
           }

From 05799538e60bf653b706f3e40d45ff4435e9e3b1 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Thu, 7 May 2020 07:52:21 +1000
Subject: [PATCH 0983/1830] FIX: correct edit notification username for PMs
 (#9649)

When the tag is added to PM by admin, notification has an incorrect username (post author username instead of admin username)
---
 app/services/post_alerter.rb       | 4 +++-
 spec/services/post_alerter_spec.rb | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index 196e4aee35..02924fa3cd 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -628,7 +628,9 @@ class PostAlerter
 
     each_user_in_batches(notify) do |user|
       notification_type = already_seen_user_ids.include?(user.id) ? Notification.types[:edited] : Notification.types[:posted]
-      create_notification(user, notification_type, post)
+      opts = {}
+      opts[:display_username] = post.last_editor.username if notification_type == Notification.types[:edited]
+      create_notification(user, notification_type, post, opts)
     end
   end
 
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index f5f0d14421..f3794d8bcb 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -1128,12 +1128,16 @@ describe PostAlerter do
   describe '#notify_post_users' do
     fab!(:topic) { Fabricate(:topic) }
     fab!(:post) { Fabricate(:post, topic: topic) }
+    fab!(:last_editor) { Fabricate(:user) }
+    fab!(:tag) { Fabricate(:tag) }
 
     it 'creates single edit notification when post is modified' do
       TopicUser.create!(user_id: user.id, topic_id: topic.id, notification_level: TopicUser.notification_levels[:watching], highest_seen_post_number: post.post_number)
+      PostRevisor.new(post).revise!(last_editor, tags: [tag.name])
       PostAlerter.new.notify_post_users(post, [])
       expect(Notification.count).to eq(1)
       expect(Notification.last.notification_type).to eq(Notification.types[:edited])
+      expect(JSON.parse(Notification.last.data)["display_username"]).to eq(last_editor.username)
 
       PostAlerter.new.notify_post_users(post, [])
       expect(Notification.count).to eq(1)

From 3d6c952c3e7ccacdafaae105e99b6c9b4080529c Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 6 May 2020 18:02:39 -0400
Subject: [PATCH 0984/1830] UX: remove bold to de-emphasize category names on
 visited topics

---
 app/assets/stylesheets/common/base/_topic-list.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 9570a2994b..aa51fccce1 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -52,6 +52,13 @@
   a.title:not(.badge-notification) {
     color: $primary-medium;
   }
+  span.badge-category {
+    font-weight: normal;
+    color: $primary-medium;
+  }
+  a.discourse-tag {
+    color: $primary-medium;
+  }
 }
 
 .topic-list-item {

From 7e303f9320650264800d96170b452bec6d8e729d Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 7 May 2020 09:10:32 +1000
Subject: [PATCH 0985/1830] DEV: Upgrade sinon and fix time based bookmark
 tests (#9647)

Update sinon.js to 9.0.2 to access async fake timers https://sinonjs.org/releases/v9.0.2/fake-timers/ which can then be used with acceptance tests (previously useFakeTimers didn't work with await, e.g. for visit).

Fix the bookmark acceptance test that was time based to use these new fake timers.

Add a fakeTime function that uses moment and the provided date string + timezone to freeze time using useFakeTimers and return a clock.

Add a timeStep function that accepts a clock from fakeTime and a function to run. Once the function is run we call clock.tickAsync(1000) to progress the fake clock forward 1s to progress promises/callbacks.
---
 package.json                                  |   2 +-
 test/javascripts/acceptance/bookmarks-test.js |  59 ++++++----
 test/javascripts/controllers/bookmark-test.js |   4 +-
 test/javascripts/helpers/qunit-helpers.js     |  10 ++
 test/javascripts/lib/bookmark-test.js         |   9 +-
 yarn.lock                                     | 111 +++++++++---------
 6 files changed, 109 insertions(+), 86 deletions(-)

diff --git a/package.json b/package.json
index 95dc2e4d05..59ed84ca8d 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "puppeteer": "1.20",
     "qunit": "2.8.0",
     "route-recognizer": "^0.3.3",
-    "sinon": "^7.2.5"
+    "sinon": "^9.0.2"
   },
   "scripts": {
     "preinstall": "node -e \"if(process.env.npm_execpath.indexOf('yarn') === -1) throw new Error('NPM is not supported, please use Yarn instead. ')\""
diff --git a/test/javascripts/acceptance/bookmarks-test.js b/test/javascripts/acceptance/bookmarks-test.js
index d30ff498c0..df8fb56e93 100644
--- a/test/javascripts/acceptance/bookmarks-test.js
+++ b/test/javascripts/acceptance/bookmarks-test.js
@@ -1,8 +1,18 @@
-import { acceptance, loggedInUser } from "helpers/qunit-helpers";
+import {
+  acceptance,
+  loggedInUser,
+  fakeTime,
+  timeStep
+} from "helpers/qunit-helpers";
 import pretender from "helpers/create-pretender";
 import { parsePostData } from "helpers/create-pretender";
 
-acceptance("Bookmarking", { loggedIn: true });
+acceptance("Bookmarking", {
+  loggedIn: true,
+  afterEach() {
+    sandbox.restore();
+  }
+});
 
 function handleRequest(assert, request) {
   const data = parsePostData(request.requestBody);
@@ -196,25 +206,26 @@ test("Editing a bookmark", async assert => {
   assert.verifySteps(["tomorrow"]);
 });
 
-QUnit.skip(
-  "Editing a bookmark that has a Later Today reminder, and it is before 6pm today",
-  async assert => {
-    // This test needs to mock the current time. sandbox.useFakeTimers() seems to break the `visit` step
-
-    mockSuccessfulBookmarkPost(assert);
-    await visit("/t/internationalization-localization/280");
-    await openBookmarkModal();
-    await fillIn("input#bookmark-name", "Test name");
-    await click("#tap_tile_later_today");
-    await openEditBookmarkModal();
-    assert.not(
-      exists("#bookmark-custon-date > input"),
-      "it does not show the custom date input"
-    );
-    assert.ok(
-      exists("#tap_tile_later_today.active"),
-      "it preselects Later Today"
-    );
-    assert.verifySteps(["later_today"]);
-  }
-);
+test("Editing a bookmark that has a Later Today reminder, and it is before 6pm today", async assert => {
+  mockSuccessfulBookmarkPost(assert);
+  let clock = fakeTime(
+    "2020-05-04T13:00:00",
+    loggedInUser().resolvedTimezone()
+  );
+  await timeStep(clock, () =>
+    visit("/t/internationalization-localization/280")
+  );
+  await timeStep(clock, () => openBookmarkModal());
+  await timeStep(clock, () => fillIn("input#bookmark-name", "Test name"));
+  await timeStep(clock, () => click("#tap_tile_later_today"));
+  await timeStep(clock, () => openEditBookmarkModal());
+  assert.not(
+    exists("#bookmark-custon-date > input"),
+    "it does not show the custom date input"
+  );
+  assert.ok(
+    exists("#tap_tile_later_today.active"),
+    "it preselects Later Today"
+  );
+  assert.verifySteps(["later_today"]);
+});
diff --git a/test/javascripts/controllers/bookmark-test.js b/test/javascripts/controllers/bookmark-test.js
index 67d918703b..246d10dd4d 100644
--- a/test/javascripts/controllers/bookmark-test.js
+++ b/test/javascripts/controllers/bookmark-test.js
@@ -2,6 +2,7 @@ import { logIn } from "helpers/qunit-helpers";
 import User from "discourse/models/user";
 import KeyboardShortcutInitializer from "discourse/initializers/keyboard-shortcuts";
 import { REMINDER_TYPES } from "discourse/lib/bookmark";
+import { fakeTime } from "helpers/qunit-helpers";
 let BookmarkController;
 
 moduleFor("controller:bookmark", {
@@ -18,8 +19,7 @@ moduleFor("controller:bookmark", {
 });
 
 function mockMomentTz(dateString) {
-  let now = moment.tz(dateString, BookmarkController.userTimezone);
-  sandbox.useFakeTimers(now.valueOf());
+  fakeTime(dateString, BookmarkController.userTimezone);
 }
 
 QUnit.test("showLaterToday when later today is tomorrow do not show", function(
diff --git a/test/javascripts/helpers/qunit-helpers.js b/test/javascripts/helpers/qunit-helpers.js
index 0bc9eaece8..2dd5c793a7 100644
--- a/test/javascripts/helpers/qunit-helpers.js
+++ b/test/javascripts/helpers/qunit-helpers.js
@@ -41,6 +41,16 @@ export function loggedInUser() {
   return User.current();
 }
 
+export function fakeTime(timeString, timezone) {
+  let now = moment.tz(timeString, timezone);
+  return sandbox.useFakeTimers(now.valueOf());
+}
+
+export async function timeStep(clock, fn) {
+  fn();
+  return await clock.tickAsync(1000);
+}
+
 const Plugin = $.fn.modal;
 const Modal = Plugin.Constructor;
 
diff --git a/test/javascripts/lib/bookmark-test.js b/test/javascripts/lib/bookmark-test.js
index 1e2530a530..c863c8884f 100644
--- a/test/javascripts/lib/bookmark-test.js
+++ b/test/javascripts/lib/bookmark-test.js
@@ -1,10 +1,13 @@
 import { formattedReminderTime } from "discourse/lib/bookmark";
+import { fakeTime } from "helpers/qunit-helpers";
 
 QUnit.module("lib:bookmark", {
   beforeEach() {
-    // set the current now time for all tests
-    let now = moment.tz("2020-04-11 08:00:00", "Australia/Brisbane");
-    sandbox.useFakeTimers(now.valueOf());
+    fakeTime("2020-04-11 08:00:00", "Australia/Brisbane");
+  },
+
+  afterEach() {
+    sandbox.restore();
   }
 });
 
diff --git a/yarn.lock b/yarn.lock
index 742a3bd36e..5173f2807a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -159,29 +159,43 @@
   resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f"
   integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA==
 
-"@sinonjs/commons@^1", "@sinonjs/commons@^1.0.2", "@sinonjs/commons@^1.3.0":
+"@sinonjs/commons@^1":
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.3.0.tgz#50a2754016b6f30a994ceda6d9a0a8c36adda849"
   integrity sha512-j4ZwhaHmwsCb4DlDOIWnI5YyKDNMoNThsmwEpfHx6a1EpsGZ9qYLxP++LMlmBRjtGptGHFsGItJ768snllFWpA==
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/formatio@^3.1.0":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-3.1.1.tgz#3b40de6412b6475cfb046f303b9d8ee13bc7e7ae"
-  integrity sha512-kMqzWDvtplLhIfqlsDSM2i7T37iHPyEa3Y2Mon/DNE84fnOHheRW0jpuJCxiGUcS5DLs+yGtJPyJpN9rdqMjlA==
+"@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.7.2":
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2"
+  integrity sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw==
+  dependencies:
+    type-detect "4.0.8"
+
+"@sinonjs/fake-timers@^6.0.0", "@sinonjs/fake-timers@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
+  integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+
+"@sinonjs/formatio@^5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-5.0.1.tgz#f13e713cb3313b1ab965901b01b0828ea6b77089"
+  integrity sha512-KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ==
   dependencies:
     "@sinonjs/commons" "^1"
-    "@sinonjs/samsam" "^3.1.0"
+    "@sinonjs/samsam" "^5.0.2"
 
-"@sinonjs/samsam@^3.1.0", "@sinonjs/samsam@^3.2.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-3.2.0.tgz#58c62b5f1f42e46d039d073d0ae2753da676bf0c"
-  integrity sha512-j5F1rScewLtx6pbTK0UAjA3jJj4RYiSKOix53YWv+Jzy/AZ69qHxUpU8fwVLjyKbEEud9QrLpv6Ggs7WqTimYw==
+"@sinonjs/samsam@^5.0.2", "@sinonjs/samsam@^5.0.3":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.0.3.tgz#86f21bdb3d52480faf0892a480c9906aa5a52938"
+  integrity sha512-QucHkc2uMJ0pFGjJUDP3F9dq5dx8QIaqISl9QgwLOh6P9yv877uONPGXh/OH/0zmM3tW1JjuJltAZV2l7zU+uQ==
   dependencies:
-    "@sinonjs/commons" "^1.0.2"
-    array-from "^2.1.1"
-    lodash "^4.17.11"
+    "@sinonjs/commons" "^1.6.0"
+    lodash.get "^4.4.2"
+    type-detect "^4.0.8"
 
 "@sinonjs/text-encoding@^0.7.1":
   version "0.7.1"
@@ -321,11 +335,6 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-array-from@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"
-  integrity sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=
-
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -883,10 +892,10 @@ detect-file@^1.0.0:
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
   integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
-diff@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
+diff@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
 dir-glob@^3.0.1:
   version "3.0.1"
@@ -1912,16 +1921,16 @@ locate-path@^5.0.0:
     semver "5.3.0"
     uglify-js "2.7.5"
 
+lodash.get@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
+
 lodash@4.17.15, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-lodash@^4.17.11:
-  version "4.17.14"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"
-  integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==
-
 log-symbols@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
@@ -1929,16 +1938,6 @@ log-symbols@^3.0.0:
   dependencies:
     chalk "^2.4.2"
 
-lolex@^2.3.2:
-  version "2.7.5"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.7.5.tgz#113001d56bfc7e02d56e36291cc5c413d1aa0733"
-  integrity sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==
-
-lolex@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-3.1.0.tgz#1a7feb2fefd75b3e3a7f79f0e110d9476e294434"
-  integrity sha512-zFo5MgCJ0rZ7gQg69S4pqBsLURbFw11X68C18OcJjJQbqaXm2NoTrGl1IMM3TIz0/BnN1tIs2tzmmqvCsOMMjw==
-
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -2182,15 +2181,15 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-nise@^1.4.10:
-  version "1.4.10"
-  resolved "https://registry.yarnpkg.com/nise/-/nise-1.4.10.tgz#ae46a09a26436fae91a38a60919356ae6db143b6"
-  integrity sha512-sa0RRbj53dovjc7wombHmVli9ZihXbXCQ2uH3TNm03DyvOSIQbxg+pbqDKrk2oxMK1rtLGVlKxcB9rrc6X5YjA==
+nise@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/nise/-/nise-4.0.3.tgz#9f79ff02fa002ed5ffbc538ad58518fa011dc913"
+  integrity sha512-EGlhjm7/4KvmmE6B/UFsKh7eHykRl9VH+au8dduHLCyWUO/hr7+N+WtTvDUwc9zHuM1IaIJs/0lQ6Ag1jDkQSg==
   dependencies:
-    "@sinonjs/formatio" "^3.1.0"
+    "@sinonjs/commons" "^1.7.0"
+    "@sinonjs/fake-timers" "^6.0.0"
     "@sinonjs/text-encoding" "^0.7.1"
     just-extend "^4.0.2"
-    lolex "^2.3.2"
     path-to-regexp "^1.7.0"
 
 node-int64@^0.4.0:
@@ -2752,18 +2751,18 @@ simple-html-tokenizer@^0.5.9:
   resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.9.tgz#1a83fe97f5a3e39b335fddf71cfe9b0263b581c2"
   integrity sha512-w/3FEDN94r4JQ9WoYrIr8RqDIPZdyNkdpbK9glFady1CAEyD97XWCv8HFetQO21w81e7h7Nh59iYTyG1mUJftg==
 
-sinon@^7.2.5:
-  version "7.2.5"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-7.2.5.tgz#1a4e4a819b59ed1dc0054b469981c72849fab43f"
-  integrity sha512-1c2KK6g5NQr9XNYCEcUbeFtBpKZD1FXEw0VX7gNhWUBtkchguT2lNdS7XmS7y64OpQWfSNeeV/f8py3NNcQ63Q==
+sinon@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.0.2.tgz#b9017e24633f4b1c98dfb6e784a5f0509f5fd85d"
+  integrity sha512-0uF8Q/QHkizNUmbK3LRFqx5cpTttEVXudywY9Uwzy8bTfZUhljZ7ARzSxnRHWYWtVTeh4Cw+tTb3iU21FQVO9A==
   dependencies:
-    "@sinonjs/commons" "^1.3.0"
-    "@sinonjs/formatio" "^3.1.0"
-    "@sinonjs/samsam" "^3.2.0"
-    diff "^3.5.0"
-    lolex "^3.1.0"
-    nise "^1.4.10"
-    supports-color "^5.5.0"
+    "@sinonjs/commons" "^1.7.2"
+    "@sinonjs/fake-timers" "^6.0.1"
+    "@sinonjs/formatio" "^5.0.1"
+    "@sinonjs/samsam" "^5.0.3"
+    diff "^4.0.2"
+    nise "^4.0.1"
+    supports-color "^7.1.0"
 
 slash@^3.0.0:
   version "3.0.0"
@@ -2918,7 +2917,7 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
-supports-color@^5.3.0, supports-color@^5.5.0:
+supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -3022,7 +3021,7 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-detect@4.0.8:
+type-detect@4.0.8, type-detect@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==

From 6e2060e973954d1b5151fd728158668803c32478 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 6 May 2020 21:19:46 -0400
Subject: [PATCH 0986/1830] Remove extra category whitespace on
 category+latest/top pages

---
 .../app/templates/components/latest-topic-list-item.hbs        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs b/app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs
index 5e369f51f9..f89043711a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs
@@ -20,8 +20,7 @@
     {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
   </div>
   <div class="bottom-row">
-    {{category-link topic.category}}
-    {{discourse-tags topic mode="list"}}
+    {{category-link topic.category}}{{discourse-tags topic mode="list"}}{{! intentionally inline to avoid whitespace}}
   </div>
 </div>
 <div class="topic-stats">

From 7052e6f4a1ed8fa58430a3acb7ec59f454438612 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 7 May 2020 07:13:37 +0530
Subject: [PATCH 0987/1830] UX: remove top padding from reddit onebox
 description

---
 app/assets/stylesheets/common/base/onebox.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index e31e660b7f..124da3ec4b 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -669,7 +669,6 @@ aside.onebox.stackexchange .onebox-body {
   }
   div.description {
     color: dark-light-choose($primary-medium, $secondary-medium);
-    padding-top: 10px;
   }
 }
 

From f782c3019c59bb9d12375a63af7a05bc4eeedb46 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 6 May 2020 21:40:18 -0400
Subject: [PATCH 0988/1830] FIX: Improve topic timeline calculation logic

Followup to 999e2ff5

Switching between the topic timeline and the progress bar was buggy when
resizing the composer. The root of the problem is that we can't know
the height of the timeline once it's hidden from view.

This uses a magic number for the calucation, which in this case is
necessary. Additionally, the calculation now takes place when
the resizing of the composer ends (previously, it was triggered when
dragging was started, which caused issues when resizing slowly).
---
 .../discourse/app/components/composer-body.js          |  5 +++--
 .../discourse/app/components/topic-navigation.js       | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/composer-body.js b/app/assets/javascripts/discourse/app/components/composer-body.js
index 83792801aa..1f0f661f33 100644
--- a/app/assets/javascripts/discourse/app/components/composer-body.js
+++ b/app/assets/javascripts/discourse/app/components/composer-body.js
@@ -128,12 +128,13 @@ export default Component.extend(KeyEnterEscape, {
       throttle(this, performDrag, event, THROTTLE_RATE);
     }).bind(this);
 
-    const endDrag = () => {
+    const endDrag = (() => {
+      this.appEvents.trigger("composer:resize-ended");
       $document.off(DRAG_EVENTS, throttledPerformDrag);
       $document.off(END_EVENTS, endDrag);
       $composer.removeClass("clear-transitions");
       $composer.focus();
-    };
+    }).bind(this);
 
     $grippie.on(START_EVENTS, event => {
       event.preventDefault();
diff --git a/app/assets/javascripts/discourse/app/components/topic-navigation.js b/app/assets/javascripts/discourse/app/components/topic-navigation.js
index 7c96ccf00c..614e144f5f 100644
--- a/app/assets/javascripts/discourse/app/components/topic-navigation.js
+++ b/app/assets/javascripts/discourse/app/components/topic-navigation.js
@@ -9,7 +9,8 @@ import PanEvents, {
   SWIPE_VELOCITY_THRESHOLD
 } from "discourse/mixins/pan-events";
 
-const MIN_WIDTH_TIMELINE = 924;
+const MIN_WIDTH_TIMELINE = 924,
+  MIN_HEIGHT_TIMELINE = 325;
 
 export default Component.extend(PanEvents, {
   composerOpen: null,
@@ -39,7 +40,6 @@ export default Component.extend(PanEvents, {
       if (renderTimeline) {
         const width = window.innerWidth,
           composer = document.getElementById("reply-control"),
-          timelineContainer = document.querySelector(".timeline-container"),
           headerContainer = document.querySelector(".d-header"),
           headerHeight = (headerContainer && headerContainer.offsetHeight) || 0;
 
@@ -47,7 +47,7 @@ export default Component.extend(PanEvents, {
           renderTimeline =
             width > MIN_WIDTH_TIMELINE &&
             window.innerHeight - composer.offsetHeight - headerHeight >
-              (timelineContainer ? timelineContainer.offsetHeight : 0);
+              MIN_HEIGHT_TIMELINE;
         }
       }
 
@@ -196,7 +196,7 @@ export default Component.extend(PanEvents, {
         this._checkSize()
       );
       this.appEvents.on("composer:opened", this, this.composerOpened);
-      this.appEvents.on("composer:resized", this, this.composerOpened);
+      this.appEvents.on("composer:resize-ended", this, this.composerOpened);
       this.appEvents.on("composer:closed", this, this.composerClosed);
       $("#reply-control").on("div-resized.discourse-topic-navigation", () =>
         this._checkSize()
@@ -219,7 +219,7 @@ export default Component.extend(PanEvents, {
     if (!this.site.mobileView) {
       $(window).off("resize.discourse-topic-navigation");
       this.appEvents.off("composer:opened", this, this.composerOpened);
-      this.appEvents.off("composer:resized", this, this.composerOpened);
+      this.appEvents.off("composer:resize-ended", this, this.composerOpened);
       this.appEvents.off("composer:closed", this, this.composerClosed);
       $("#reply-control").off("div-resized.discourse-topic-navigation");
     }

From 0d394e6b7607367824db376c3135d3b2e6c28cbe Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Wed, 6 May 2020 19:17:15 -0700
Subject: [PATCH 0989/1830] FEATURE: Include category position when exporting
 categories (#9658)

---
 lib/import_export/base_exporter.rb    |  2 +-
 spec/fixtures/json/import-export.json | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/import_export/base_exporter.rb b/lib/import_export/base_exporter.rb
index f53b38025f..509266652c 100644
--- a/lib/import_export/base_exporter.rb
+++ b/lib/import_export/base_exporter.rb
@@ -5,7 +5,7 @@ module ImportExport
     attr_reader :export_data, :categories
 
     CATEGORY_ATTRS = [:id, :name, :color, :created_at, :user_id, :slug, :description, :text_color,
-                      :auto_close_hours, :parent_category_id, :auto_close_based_on_last_post,
+                      :auto_close_hours, :position, :parent_category_id, :auto_close_based_on_last_post,
                       :topic_template, :all_topics_wiki, :permissions_params]
 
     GROUP_ATTRS = [:id, :name, :created_at, :automatic_membership_email_domains, :primary_group,
diff --git a/spec/fixtures/json/import-export.json b/spec/fixtures/json/import-export.json
index f991e7f2c4..f852a9def1 100644
--- a/spec/fixtures/json/import-export.json
+++ b/spec/fixtures/json/import-export.json
@@ -4,12 +4,12 @@
     {"id":42,"name":"custom_group_import","created_at":"2017-10-26T15:33:46.328Z","automatic_membership_email_domains":"","primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"bio_raw":"This is a custom group import","allow_membership_requests":false,"full_name":"Custom Group Import","default_notification_level":3,"visibility_level":0,"public_exit":false,"public_admission":false,"membership_request_template":"","messageable_level":0,"mentionable_level":0,"members_visibility_level":0,"publish_read_state":false,"user_ids":[2]}
   ],
   "categories":[
-    {"id":8,"name":"Custom Category","color":"0088CC","created_at":"2017-10-26T15:32:44.083Z","user_id":1,"slug":"custom-category","description":null,"text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":3,"auto_close_based_on_last_post":false,"topic_template":"","all_topics_wiki":false,"permissions_params":{"custom_group":1,"everyone":2}},
-    {"id":10,"name":"Site Feedback Import","color":"27AA5B","created_at":"2017-10-26T17:12:39.995Z","user_id":-1,"slug":"site-feedback-import","description":"Discussion about this site, its organization, how it works, and how we can improve it.","text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"all_topics_wiki":false,"permissions_params":{}},
-    {"id":11,"name":"Uncategorized Import","color":"0088CC","created_at":"2017-10-26T17:12:32.359Z","user_id":-1,"slug":"uncategorized-import","description":"","text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"all_topics_wiki":false,"permissions_params":{}},
-    {"id":12,"name":"Lounge Import","color":"A461EF","created_at":"2017-10-26T17:12:39.490Z","user_id":-1,"slug":"lounge-import","description":"A category exclusive to members with trust level 3 and higher.","text_color":"652D90","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"all_topics_wiki":false,"permissions_params":{"trust_level_3":1}},
-    {"id":13,"name":"Staff Import","color":"E45735","created_at":"2017-10-26T17:12:42.806Z","user_id":2,"slug":"staff-import","description":"Private category for staff discussions. Topics are only visible to admins and moderators.","text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"all_topics_wiki":false,"permissions_params":{"custom_group_import":1,"staff":1}},
-    {"id":15,"name":"Custom Category Import","color":"0088CC","created_at":"2017-10-26T15:32:44.083Z","user_id":2,"slug":"custom-category-import","description":null,"text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":10,"auto_close_based_on_last_post":false,"topic_template":"","all_topics_wiki":false,"permissions_params":{"custom_group_import":1,"everyone":2}}
+    {"id":8,"name":"Custom Category","color":"0088CC","created_at":"2017-10-26T15:32:44.083Z","user_id":1,"slug":"custom-category","description":null,"text_color":"FFFFFF","auto_close_hours":null,"position":1,"parent_category_id":3,"auto_close_based_on_last_post":false,"topic_template":"","all_topics_wiki":false,"permissions_params":{"custom_group":1,"everyone":2}},
+    {"id":10,"name":"Site Feedback Import","color":"27AA5B","created_at":"2017-10-26T17:12:39.995Z","user_id":-1,"slug":"site-feedback-import","description":"Discussion about this site, its organization, how it works, and how we can improve it.","text_color":"FFFFFF","auto_close_hours":null,"position":2,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"all_topics_wiki":false,"permissions_params":{}},
+    {"id":11,"name":"Uncategorized Import","color":"0088CC","created_at":"2017-10-26T17:12:32.359Z","user_id":-1,"slug":"uncategorized-import","description":"","text_color":"FFFFFF","auto_close_hours":null,"position":0,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"all_topics_wiki":false,"permissions_params":{}},
+    {"id":12,"name":"Lounge Import","color":"A461EF","created_at":"2017-10-26T17:12:39.490Z","user_id":-1,"slug":"lounge-import","description":"A category exclusive to members with trust level 3 and higher.","text_color":"652D90","auto_close_hours":null,"position":3,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"all_topics_wiki":false,"permissions_params":{"trust_level_3":1}},
+    {"id":13,"name":"Staff Import","color":"E45735","created_at":"2017-10-26T17:12:42.806Z","user_id":2,"slug":"staff-import","description":"Private category for staff discussions. Topics are only visible to admins and moderators.","text_color":"FFFFFF","auto_close_hours":null,"position":5,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"all_topics_wiki":false,"permissions_params":{"custom_group_import":1,"staff":1}},
+    {"id":15,"name":"Custom Category Import","color":"0088CC","created_at":"2017-10-26T15:32:44.083Z","user_id":2,"slug":"custom-category-import","description":null,"text_color":"FFFFFF","auto_close_hours":null,"position":1,"parent_category_id":10,"auto_close_based_on_last_post":false,"topic_template":"","all_topics_wiki":false,"permissions_params":{"custom_group_import":1,"everyone":2}}
   ],
   "users":[
     {"id":1,"email":"email@example.com","username":"example","name":"Example","created_at":"2017-10-07T15:01:24.597Z","trust_level":4,"active":true,"last_emailed_at":null},

From 33c8adda8392801d280b90bba2d32ea7cf58881f Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 6 May 2020 22:59:22 -0400
Subject: [PATCH 0990/1830] UX: Adjust admin menu to better fit short
 (horizontal) viewports

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

diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 42cddb00bc..ae82843411 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -217,3 +217,41 @@ sub sub {
   align-items: center;
   flex-wrap: wrap;
 }
+
+@media screen and (max-height: 600px) {
+  .topic-admin-popup-menu {
+    box-sizing: border-box;
+    width: 100%;
+    padding: 1em;
+    .header {
+      padding: 0;
+      position: relative;
+      .close-button {
+        position: absolute;
+        display: inline-block;
+        right: 0;
+        top: -0.1em;
+        width: auto;
+        background: transparent;
+      }
+    }
+    ul {
+      display: grid;
+      grid-template-columns: 1fr 1fr 1fr;
+      @media screen and (max-width: 550px) {
+        grid-template-columns: 1fr 1fr;
+      }
+      > div {
+        margin-right: 0.5em;
+        overflow: hidden;
+        &:nth-of-type(2) {
+          // move delete further from modal close
+          order: 12;
+        }
+        button {
+          @include ellipsis;
+        }
+      }
+    }
+  }
+}

From 423802fbce93c0cf98187b33a97d4edc9cdb34ee Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 6 May 2020 23:05:47 -0400
Subject: [PATCH 0991/1830] UX: Fix modal positioning when iOS keyboard is
 visible

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

diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 9667a0cb47..5d10d6d150 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -141,6 +141,13 @@
   z-index: z("modal", "content");
   overflow: auto;
 
+  .keyboard-visible & {
+    height: calc(var(--composer-vh, 1vh) * 100);
+    .modal-inner-container {
+      max-height: 100%;
+    }
+  }
+
   &:not(.history-modal) {
     .modal-body:not(.reorder-categories):not(.poll-ui-builder) {
       max-height: 80vh !important;

From 6fb0f36ce141e5638899b19860d6d5c38ceb49dd Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 7 May 2020 13:37:39 +1000
Subject: [PATCH 0992/1830] FEATURE: Optionally delete bookmark when reminder
 sent (#9637)

We now show an options gear icon next to the bookmark name.

When expanded we show the "delete bookmark when reminder sent" option. The value of this checkbox is saved in local storage for the user.

If this is ticked, when a reminder is sent for the bookmark the bookmark itself is deleted. This is so people can use the reminder functionality by itself.

Also remove the blue alert reminder section from the "Edit Bookmark" modal as it just added clutter, because the user can already see they had a reminder set:

Adds a default false boolean column `delete_when_reminder_sent` to bookmarks.
---
 .../discourse/app/controllers/bookmark.js     | 41 ++++++++++++++++++-
 .../javascripts/discourse/app/models/post.js  |  3 ++
 .../app/templates/modal/bookmark.hbs          | 10 ++++-
 .../common/components/bookmark-modal.scss     | 20 +++++++++
 app/controllers/bookmarks_controller.rb       | 10 ++++-
 app/models/bookmark.rb                        | 23 ++++++-----
 app/serializers/post_serializer.rb            |  9 ++++
 config/locales/client.en.yml                  |  1 +
 ...when_reminder_sent_boolean_to_bookmarks.rb |  7 ++++
 lib/bookmark_manager.rb                       | 30 ++++++++------
 lib/bookmark_reminder_notification_handler.rb |  5 +++
 spec/lib/bookmark_manager_spec.rb             | 30 +++++++++++++-
 ...mark_reminder_notification_handler_spec.rb | 14 +++++++
 test/javascripts/acceptance/bookmarks-test.js | 24 +++++++++++
 14 files changed, 196 insertions(+), 31 deletions(-)
 create mode 100644 db/migrate/20200505060712_add_delete_when_reminder_sent_boolean_to_bookmarks.rb

diff --git a/app/assets/javascripts/discourse/app/controllers/bookmark.js b/app/assets/javascripts/discourse/app/controllers/bookmark.js
index 992c3228a0..7d86ed2b74 100644
--- a/app/assets/javascripts/discourse/app/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/app/controllers/bookmark.js
@@ -1,4 +1,5 @@
 import { and } from "@ember/object/computed";
+import { next } from "@ember/runloop";
 import { action } from "@ember/object";
 import { isPresent } from "@ember/utils";
 import Controller from "@ember/controller";
@@ -59,6 +60,8 @@ export default Controller.extend(ModalFunctionality, {
   lastCustomReminderTime: null,
   mouseTrap: null,
   userTimezone: null,
+  showOptions: false,
+  options: null,
 
   onShow() {
     this.setProperties({
@@ -70,9 +73,13 @@ export default Controller.extend(ModalFunctionality, {
       customReminderTime: this._defaultCustomReminderTime(),
       lastCustomReminderDate: null,
       lastCustomReminderTime: null,
-      userTimezone: this.currentUser.resolvedTimezone()
+      userTimezone: this.currentUser.resolvedTimezone(),
+      showOptions: false,
+      options: {},
+      model: this.model || {}
     });
 
+    this._loadBookmarkOptions();
     this._bindKeyboardShortcuts();
     this._loadLastUsedCustomReminderDatetime();
 
@@ -124,6 +131,21 @@ export default Controller.extend(ModalFunctionality, {
     return isPresent(this.model) && isPresent(this.model.reminderAt);
   },
 
+  _loadBookmarkOptions() {
+    this.set(
+      "options.deleteWhenReminderSent",
+      this.model.deleteWhenReminderSent ||
+        localStorage.bookmarkOptionsDeleteWhenReminderSent === "true"
+    );
+
+    // we want to make sure the options panel opens so the user
+    // knows they have set these options previously. run next otherwise
+    // the modal is not visible when it tries to slide down the options
+    if (this.options.deleteWhenReminderSent) {
+      next(() => this.toggleOptionsPanel());
+    }
+  },
+
   _loadLastUsedCustomReminderDatetime() {
     let lastTime = localStorage.lastCustomBookmarkReminderTime;
     let lastDate = localStorage.lastCustomBookmarkReminderDate;
@@ -268,6 +290,8 @@ export default Controller.extend(ModalFunctionality, {
       localStorage.lastCustomBookmarkReminderDate = this.customReminderDate;
     }
 
+    localStorage.bookmarkOptionsDeleteWhenReminderSent = this.options.deleteWhenReminderSent;
+
     let reminderType;
     if (this.selectedReminderType === REMINDER_TYPES.NONE) {
       reminderType = null;
@@ -282,7 +306,8 @@ export default Controller.extend(ModalFunctionality, {
       reminder_at: reminderAtISO,
       name: this.model.name,
       post_id: this.model.postId,
-      id: this.model.id
+      id: this.model.id,
+      delete_when_reminder_sent: this.options.deleteWhenReminderSent
     };
 
     if (this._editingExistingBookmark()) {
@@ -294,6 +319,7 @@ export default Controller.extend(ModalFunctionality, {
           this.afterSave({
             reminderAt: reminderAtISO,
             reminderType: this.selectedReminderType,
+            deleteWhenReminderSent: this.options.deleteWhenReminderSent,
             id: this.model.id,
             name: this.model.name
           });
@@ -305,6 +331,7 @@ export default Controller.extend(ModalFunctionality, {
           this.afterSave({
             reminderAt: reminderAtISO,
             reminderType: this.selectedReminderType,
+            deleteWhenReminderSent: this.options.deleteWhenReminderSent,
             id: response.id,
             name: this.model.name
           });
@@ -420,6 +447,16 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
+  @action
+  toggleOptionsPanel() {
+    if (this.showOptions) {
+      $(".bookmark-options-panel").slideUp("fast");
+    } else {
+      $(".bookmark-options-panel").slideDown("fast");
+    }
+    this.toggleProperty("showOptions");
+  },
+
   @action
   saveAndClose() {
     if (this._saving || this._deleting) {
diff --git a/app/assets/javascripts/discourse/app/models/post.js b/app/assets/javascripts/discourse/app/models/post.js
index e7cf6028e5..e0565b420c 100644
--- a/app/assets/javascripts/discourse/app/models/post.js
+++ b/app/assets/javascripts/discourse/app/models/post.js
@@ -316,6 +316,7 @@ const Post = RestModel.extend({
           postId: this.id,
           id: this.bookmark_id,
           reminderAt: this.bookmark_reminder_at,
+          deleteWhenReminderSent: this.bookmark_delete_when_reminder_sent,
           name: this.bookmark_name
         },
         title: this.bookmark_id
@@ -334,6 +335,8 @@ const Post = RestModel.extend({
             bookmarked: true,
             bookmark_reminder_at: savedData.reminderAt,
             bookmark_reminder_type: savedData.reminderType,
+            bookmark_delete_when_reminder_sent:
+              savedData.deleteWhenReminderSent,
             bookmark_name: savedData.name,
             bookmark_id: savedData.id
           });
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
index 2cac81e9b6..b69713e757 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
@@ -8,8 +8,16 @@
       </div>
     {{/if}}
 
-    <div class="control-group">
+    <div class="control-group bookmark-name-wrap">
       {{input id="bookmark-name" value=model.name name="name" class="bookmark-name" placeholder=(i18n "post.bookmarks.name_placeholder")}}
+      {{d-button icon="gear" action=(action "toggleOptionsPanel") class="bookmark-options-button"}}
+    </div>
+
+    <div class="bookmark-options-panel">
+      <label for="delete_when_reminder_sent">
+        {{i18n "bookmarks.delete_when_reminder_sent"}}
+        {{input id="delete_when_reminder_sent" type="checkbox" checked=options.deleteWhenReminderSent}}
+      </label>
     </div>
 
     {{#if showExistingReminderAt }}
diff --git a/app/assets/stylesheets/common/components/bookmark-modal.scss b/app/assets/stylesheets/common/components/bookmark-modal.scss
index 45ad12fc18..b870ec00d1 100644
--- a/app/assets/stylesheets/common/components/bookmark-modal.scss
+++ b/app/assets/stylesheets/common/components/bookmark-modal.scss
@@ -62,4 +62,24 @@
       flex: 1 1 auto;
     }
   }
+
+  .bookmark-name-wrap {
+    display: inline-flex;
+    width: 100%;
+    align-items: end;
+  }
+
+  .bookmark-options-button {
+    margin-left: 0.5em;
+    background: transparent;
+  }
+
+  .bookmark-options-panel {
+    margin-bottom: 18px;
+    display: none;
+
+    input[type="checkbox"] {
+      margin-right: 0.85em;
+    }
+  }
 }
diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
index f7fed51f59..001e75c119 100644
--- a/app/controllers/bookmarks_controller.rb
+++ b/app/controllers/bookmarks_controller.rb
@@ -11,7 +11,10 @@ class BookmarksController < ApplicationController
       post_id: params[:post_id],
       name: params[:name],
       reminder_type: params[:reminder_type],
-      reminder_at: params[:reminder_at]
+      reminder_at: params[:reminder_at],
+      options: {
+        delete_when_reminder_sent: params[:delete_when_reminder_sent]
+      }
     )
 
     if bookmark_manager.errors.empty?
@@ -35,7 +38,10 @@ class BookmarksController < ApplicationController
       bookmark_id: params[:id],
       name: params[:name],
       reminder_type: params[:reminder_type],
-      reminder_at: params[:reminder_at]
+      reminder_at: params[:reminder_at],
+      options: {
+        delete_when_reminder_sent: params[:delete_when_reminder_sent]
+      }
     )
 
     if bookmark_manager.errors.empty?
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index 3cfae4fe17..3125f8f9fe 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -79,17 +79,18 @@ end
 #
 # Table name: bookmarks
 #
-#  id                    :bigint           not null, primary key
-#  user_id               :bigint           not null
-#  topic_id              :bigint           not null
-#  post_id               :bigint           not null
-#  name                  :string
-#  reminder_type         :integer
-#  reminder_at           :datetime
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  reminder_last_sent_at :datetime
-#  reminder_set_at       :datetime
+#  id                        :bigint           not null, primary key
+#  user_id                   :bigint           not null
+#  topic_id                  :bigint           not null
+#  post_id                   :bigint           not null
+#  name                      :string
+#  reminder_type             :integer
+#  reminder_at               :datetime
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#  reminder_last_sent_at     :datetime
+#  reminder_set_at           :datetime
+#  delete_when_reminder_sent :boolean          default(FALSE)
 #
 # Indexes
 #
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index ef39e37caa..35a50a5f96 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -53,6 +53,7 @@ class PostSerializer < BasicPostSerializer
              :bookmark_id,
              :bookmark_reminder_type,
              :bookmark_name,
+             :bookmark_delete_when_reminder_sent,
              :raw,
              :actions_summary,
              :moderator?,
@@ -331,6 +332,10 @@ class PostSerializer < BasicPostSerializer
     include_bookmarked?
   end
 
+  def include_bookmark_delete_when_reminder_sent?
+    include_bookmarked?
+  end
+
   def include_bookmark_id?
     include_bookmarked?
   end
@@ -353,6 +358,10 @@ class PostSerializer < BasicPostSerializer
     post_bookmark&.name
   end
 
+  def bookmark_delete_when_reminder_sent
+    post_bookmark&.delete_when_reminder_sent
+  end
+
   def bookmark_id
     post_bookmark&.id
   end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index b4b6ad31f2..e4a65a3b1e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -319,6 +319,7 @@ en:
       no_timezone: 'You have not set a timezone yet. You will not be able to set reminders. Set one up <a href="%{basePath}/my/preferences/profile">in your profile</a>.'
       invalid_custom_datetime: "The date and time you provided is invalid, please try again."
       list_permission_denied: "You do not have permission to view this user's bookmarks."
+      delete_when_reminder_sent: "Delete this bookmark when the reminder notification is sent."
       reminders:
         at_desktop: "Next time I'm at my desktop"
         later_today: "Later today"
diff --git a/db/migrate/20200505060712_add_delete_when_reminder_sent_boolean_to_bookmarks.rb b/db/migrate/20200505060712_add_delete_when_reminder_sent_boolean_to_bookmarks.rb
new file mode 100644
index 0000000000..7e4ca807fa
--- /dev/null
+++ b/db/migrate/20200505060712_add_delete_when_reminder_sent_boolean_to_bookmarks.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDeleteWhenReminderSentBooleanToBookmarks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :bookmarks, :delete_when_reminder_sent, :boolean, nullabe: false, default: false
+  end
+end
diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index 23328021f6..90088181f6 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -7,20 +7,22 @@ class BookmarkManager
     @user = user
   end
 
-  def create(post_id:, name: nil, reminder_type: nil, reminder_at: nil)
+  def create(post_id:, name: nil, reminder_type: nil, reminder_at: nil, options: {})
     post = Post.unscoped.includes(:topic).find(post_id)
     reminder_type = parse_reminder_type(reminder_type)
 
     raise Discourse::InvalidAccess.new if !Guardian.new(@user).can_see_post?(post)
 
     bookmark = Bookmark.create(
-      user_id: @user.id,
-      topic: post.topic,
-      post: post,
-      name: name,
-      reminder_type: reminder_type,
-      reminder_at: reminder_at,
-      reminder_set_at: Time.zone.now
+      {
+        user_id: @user.id,
+        topic: post.topic,
+        post: post,
+        name: name,
+        reminder_type: reminder_type,
+        reminder_at: reminder_at,
+        reminder_set_at: Time.zone.now
+      }.merge(options)
     )
 
     if bookmark.errors.any?
@@ -66,7 +68,7 @@ class BookmarkManager
     BookmarkReminderNotificationHandler.send_notification(bookmark)
   end
 
-  def update(bookmark_id:, name:, reminder_type:, reminder_at:)
+  def update(bookmark_id:, name:, reminder_type:, reminder_at:, options: {})
     bookmark = Bookmark.find_by(id: bookmark_id)
 
     raise Discourse::NotFound if bookmark.blank?
@@ -75,10 +77,12 @@ class BookmarkManager
     reminder_type = parse_reminder_type(reminder_type)
 
     success = bookmark.update(
-      name: name,
-      reminder_at: reminder_at,
-      reminder_type: reminder_type,
-      reminder_set_at: Time.zone.now
+      {
+        name: name,
+        reminder_at: reminder_at,
+        reminder_type: reminder_type,
+        reminder_set_at: Time.zone.now
+      }.merge(options)
     )
 
     if bookmark.errors.any?
diff --git a/lib/bookmark_reminder_notification_handler.rb b/lib/bookmark_reminder_notification_handler.rb
index 223c55b2ac..b1f32cee61 100644
--- a/lib/bookmark_reminder_notification_handler.rb
+++ b/lib/bookmark_reminder_notification_handler.rb
@@ -9,6 +9,11 @@ class BookmarkReminderNotificationHandler
       end
 
       create_notification(bookmark)
+
+      if bookmark.delete_when_reminder_sent?
+        return bookmark.destroy
+      end
+
       clear_reminder(bookmark)
     end
   end
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index d821e99446..24bdd6bd15 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -42,6 +42,17 @@ RSpec.describe BookmarkManager do
       end
     end
 
+    context "when options are provided" do
+      let(:options) { { delete_when_reminder_sent: true } }
+
+      it "saves any additional options successfully" do
+        subject.create(post_id: post.id, name: name, options: options)
+        bookmark = Bookmark.find_by(user: user)
+
+        expect(bookmark.delete_when_reminder_sent).to eq(true)
+      end
+    end
+
     context "when the bookmark already exists for the user & post" do
       before do
         Bookmark.create(post: post, user: user, topic: post.topic)
@@ -142,14 +153,19 @@ RSpec.describe BookmarkManager do
     let(:new_name) { "Some new name" }
     let(:new_reminder_at) { 10.days.from_now }
     let(:new_reminder_type) { Bookmark.reminder_types[:custom] }
+    let(:options) { {} }
 
     def update_bookmark
       subject.update(
-        bookmark_id: bookmark.id, name: new_name, reminder_type: new_reminder_type, reminder_at: new_reminder_at
+        bookmark_id: bookmark.id,
+        name: new_name,
+        reminder_type: new_reminder_type,
+        reminder_at: new_reminder_at,
+        options: options
       )
     end
 
-    it "saves the time and new reminder type sucessfully" do
+    it "saves the time and new reminder type and new name sucessfully" do
       update_bookmark
       bookmark.reload
       expect(bookmark.name).to eq(new_name)
@@ -157,6 +173,16 @@ RSpec.describe BookmarkManager do
       expect(bookmark.reminder_type).to eq(new_reminder_type)
     end
 
+    context "when options are provided" do
+      let(:options) { { delete_when_reminder_sent: true } }
+
+      it "saves any additional options successfully" do
+        update_bookmark
+        bookmark.reload
+        expect(bookmark.delete_when_reminder_sent).to eq(true)
+      end
+    end
+
     context "if the new reminder type is a string" do
       let(:new_reminder_type) { "custom" }
       it "is parsed" do
diff --git a/spec/lib/bookmark_reminder_notification_handler_spec.rb b/spec/lib/bookmark_reminder_notification_handler_spec.rb
index d86ce73a5e..6af860f2f0 100644
--- a/spec/lib/bookmark_reminder_notification_handler_spec.rb
+++ b/spec/lib/bookmark_reminder_notification_handler_spec.rb
@@ -28,6 +28,20 @@ RSpec.describe BookmarkReminderNotificationHandler do
       expect(data["bookmark_name"]).to eq(bookmark.name)
     end
 
+    it "clears the reminder" do
+      subject.send_notification(bookmark)
+      bookmark.reload
+      expect(bookmark.reload.no_reminder?).to eq(true)
+    end
+
+    context "when the delete_when_reminder_sent boolean is true " do
+      it "deletes the bookmark after the reminder gets sent" do
+        bookmark.update(delete_when_reminder_sent: true)
+        subject.send_notification(bookmark)
+        expect(Bookmark.find_by(id: bookmark.id)).to eq(nil)
+      end
+    end
+
     context "when the post has been deleted" do
       it "clears the reminder and does not send a notification" do
         bookmark.post.trash!
diff --git a/test/javascripts/acceptance/bookmarks-test.js b/test/javascripts/acceptance/bookmarks-test.js
index df8fb56e93..762cd1ee07 100644
--- a/test/javascripts/acceptance/bookmarks-test.js
+++ b/test/javascripts/acceptance/bookmarks-test.js
@@ -106,6 +106,30 @@ test("Saving a bookmark with a reminder", async assert => {
   assert.verifySteps(["tomorrow"]);
 });
 
+test("Opening the options panel and remembering the option", async assert => {
+  mockSuccessfulBookmarkPost(assert);
+  await visit("/t/internationalization-localization/280");
+  await openBookmarkModal();
+  await click(".bookmark-options-button");
+  assert.ok(
+    exists(".bookmark-options-panel"),
+    "it should open the options panel"
+  );
+  await click("#delete_when_reminder_sent");
+  await click("#save-bookmark");
+  await openEditBookmarkModal();
+
+  assert.ok(
+    exists(".bookmark-options-panel"),
+    "it should reopen the options panel"
+  );
+  assert.ok(
+    exists(".bookmark-options-panel #delete_when_reminder_sent:checked"),
+    "it should pre-check delete when reminder sent option"
+  );
+  assert.verifySteps(["none"]);
+});
+
 test("Saving a bookmark with no reminder or name", async assert => {
   mockSuccessfulBookmarkPost(assert);
   await visit("/t/internationalization-localization/280");

From be48e503fd90a45f404953710953ddfe00aac944 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 7 May 2020 14:30:10 +1000
Subject: [PATCH 0993/1830] FIX: Show the Bookmark button for PM topics (#9659)

There is no point in suppressing this now that we have bookmark reminders.
---
 .../discourse/app/initializers/topic-footer-buttons.js       | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
index a75949ba23..7751be37a1 100644
--- a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
+++ b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
@@ -84,7 +84,7 @@ export default {
     });
 
     registerTopicFooterButton({
-      dependentKeys: ["topic.bookmarked", "topic.isPrivateMessage"],
+      dependentKeys: ["topic.bookmarked"],
       id: "bookmark",
       icon() {
         if (this.get("topic.bookmark_reminder_at")) {
@@ -120,9 +120,6 @@ export default {
       action: "toggleBookmark",
       dropdown() {
         return this.site.mobileView;
-      },
-      displayed() {
-        return !this.get("topic.isPrivateMessage");
       }
     });
 

From 37be2958f7ec2bb65c05019c370fa3f3b7e0744f Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 7 May 2020 14:35:32 +1000
Subject: [PATCH 0994/1830] DEV: Allow specifying if a notification is
 high_priority on create (#9660)

This allows for special cases where we may not want a certain notification type to ALWAYS be high priority (e.g. a topic timer).
---
 app/models/notification.rb       |  4 +++-
 spec/models/notification_spec.rb | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index 0407f17c96..b549ee50ab 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -45,7 +45,9 @@ class Notification < ActiveRecord::Base
   end
 
   before_create do
-    self.high_priority = Notification.high_priority_types.include?(self.notification_type)
+    # if we have manually set the notification to high_priority on create then
+    # make sure that is respected
+    self.high_priority = self.high_priority || Notification.high_priority_types.include?(self.notification_type)
   end
 
   def self.purge_old!
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 9f0a38a836..740bf8e50a 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -87,6 +87,24 @@ describe Notification do
 
   end
 
+  describe 'high priority creation' do
+    fab!(:user) { Fabricate(:user) }
+
+    it "automatically marks the notification as high priority if it is a high priority type" do
+      notif = Notification.create(user: user, notification_type: Notification.types[:bookmark_reminder], data: {})
+      expect(notif.high_priority).to eq(true)
+      notif = Notification.create(user: user, notification_type: Notification.types[:private_message], data: {})
+      expect(notif.high_priority).to eq(true)
+      notif = Notification.create(user: user, notification_type: Notification.types[:liked], data: {})
+      expect(notif.high_priority).to eq(false)
+    end
+
+    it "allows manually specifying a notification is high priority" do
+      notif = Notification.create(user: user, notification_type: Notification.types[:liked], data: {}, high_priority: true)
+      expect(notif.high_priority).to eq(true)
+    end
+  end
+
   describe 'unread counts' do
 
     fab!(:user) { Fabricate(:user) }

From 136a5456534c7e468b8052f865ce970a3bf375e9 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 7 May 2020 15:53:26 +1000
Subject: [PATCH 0995/1830] DEV: upgrade to Rails 6.0.3

Upgrades Rails to latest, this version has better compatibility
with Ruby 2.7

During the upgrade we needed a new cleaner mechanism for configuring
message bus.

All tests are green.

If anything weird pops up please revert.
---
 Gemfile                                      | 14 ++---
 Gemfile.lock                                 | 58 ++++++++++----------
 config/application.rb                        |  5 ++
 config/initializers/200-first_middlewares.rb |  6 +-
 4 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/Gemfile b/Gemfile
index 039acc6a2a..980bce100a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,13 +18,13 @@ else
   # this allows us to include the bits of rails we use without pieces we do not.
   #
   # To issue a rails update bump the version number here
-  gem 'actionmailer', '6.0.2.2'
-  gem 'actionpack', '6.0.2.2'
-  gem 'actionview', '6.0.2.2'
-  gem 'activemodel', '6.0.2.2'
-  gem 'activerecord', '6.0.2.2'
-  gem 'activesupport', '6.0.2.2'
-  gem 'railties', '6.0.2.2'
+  gem 'actionmailer', '6.0.3'
+  gem 'actionpack', '6.0.3'
+  gem 'actionview', '6.0.3'
+  gem 'activemodel', '6.0.3'
+  gem 'activerecord', '6.0.3'
+  gem 'activesupport', '6.0.3'
+  gem 'railties', '6.0.3'
   gem 'sprockets-rails'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 6d97e8a504..bcc38a6607 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      actionview (= 6.0.2.2)
-      activejob (= 6.0.2.2)
+    actionmailer (6.0.3)
+      actionpack (= 6.0.3)
+      actionview (= 6.0.3)
+      activejob (= 6.0.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.2.2)
-      actionview (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionpack (6.0.3)
+      actionview (= 6.0.3)
+      activesupport (= 6.0.3)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionview (6.0.3)
+      activesupport (= 6.0.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -24,20 +24,20 @@ GEM
       actionview (>= 6.0.a)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    activejob (6.0.3)
+      activesupport (= 6.0.3)
       globalid (>= 0.3.6)
-    activemodel (6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activerecord (6.0.2.2)
-      activemodel (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activesupport (6.0.2.2)
+    activemodel (6.0.3)
+      activesupport (= 6.0.3)
+    activerecord (6.0.3)
+      activemodel (= 6.0.3)
+      activesupport (= 6.0.3)
+    activesupport (6.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     annotate (3.1.1)
@@ -184,7 +184,7 @@ GEM
       mini_mime (>= 0.1.1)
     maxminddb (0.1.22)
     memory_profiler (0.9.14)
-    message_bus (3.1.0)
+    message_bus (3.2.0)
       rack (>= 1.1.3)
     method_source (1.0.0)
     mini_mime (1.0.2)
@@ -281,9 +281,9 @@ GEM
     rails_multisite (2.1.1)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
-    railties (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    railties (6.0.3)
+      actionpack (= 6.0.3)
+      activesupport (= 6.0.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -428,14 +428,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (= 6.0.2.2)
-  actionpack (= 6.0.2.2)
-  actionview (= 6.0.2.2)
+  actionmailer (= 6.0.3)
+  actionpack (= 6.0.3)
+  actionview (= 6.0.3)
   actionview_precompiler
   active_model_serializers (~> 0.8.3)
-  activemodel (= 6.0.2.2)
-  activerecord (= 6.0.2.2)
-  activesupport (= 6.0.2.2)
+  activemodel (= 6.0.3)
+  activerecord (= 6.0.3)
+  activesupport (= 6.0.3)
   addressable
   annotate
   aws-sdk-s3
@@ -512,7 +512,7 @@ DEPENDENCIES
   rack-mini-profiler
   rack-protection
   rails_multisite
-  railties (= 6.0.2.2)
+  railties (= 6.0.3)
   rake
   rb-fsevent
   rb-inotify (~> 0.9)
diff --git a/config/application.rb b/config/application.rb
index b2649ad17f..502981af40 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -91,6 +91,11 @@ module Discourse
       end
     end
 
+    # we skip it cause we configure it in the initializer
+    # the railstie for message_bus would insert it in the
+    # wrong position
+    config.skip_message_bus_middleware = true
+
     # Disable so this is only run manually
     # we may want to change this later on
     # issue is image_optim crashes on missing dependencies
diff --git a/config/initializers/200-first_middlewares.rb b/config/initializers/200-first_middlewares.rb
index 2647fd039a..7f0484bad3 100644
--- a/config/initializers/200-first_middlewares.rb
+++ b/config/initializers/200-first_middlewares.rb
@@ -6,12 +6,8 @@
 #
 # We aren't manipulating the middleware stack directly because of
 # https://github.com/rails/rails/pull/27936
-session_operations = Rails::Configuration::MiddlewareStackProxy.new([
-   [:delete, MessageBus::Rack::Middleware],
-   [:unshift, MessageBus::Rack::Middleware],
-])
 
-Rails.configuration.middleware = Rails.configuration.middleware + session_operations
+Rails.configuration.middleware.unshift(MessageBus::Rack::Middleware)
 
 # no reason to track this in development, that is 300+ redis calls saved per
 # page view (we serve all assets out of thin in development)

From 87b1d435d2a0ccaf401c933a8f4788248a0a402e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 09:10:29 +0200
Subject: [PATCH 0996/1830] FIX: improves positioning of sk in mobile when
 inside a modal (#9657)

---
 .../select-kit/components/select-kit.js       | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 84f0fab35c..71cf24e576 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -782,8 +782,10 @@ export default Component.extend(
               enabled: window.innerWidth <= 450,
               phase: "main",
               fn({ state }) {
-                let { x } = state.elements.reference.getBoundingClientRect();
-                state.modifiersData.popperOffsets.x = -x + 10;
+                if (!inModal) {
+                  let { x } = state.elements.reference.getBoundingClientRect();
+                  state.modifiersData.popperOffsets.x = -x + 10;
+                }
               }
             },
             {
@@ -791,7 +793,18 @@ export default Component.extend(
               enabled: window.innerWidth <= 450,
               phase: "beforeWrite",
               fn({ state }) {
-                state.styles.popper.width = `${window.innerWidth - 20}px`;
+                if (inModal) {
+                  const innerModal = document.querySelector(
+                    "#discourse-modal div.modal-inner-container"
+                  );
+
+                  if (innerModal) {
+                    state.styles.popper.width = `${innerModal.clientWidth -
+                      20}px`;
+                  }
+                } else {
+                  state.styles.popper.width = `${window.innerWidth - 20}px`;
+                }
               }
             },
             {

From 2ff8b4f5d9dd72a55d7ebdc23a3758dd5ec4682d Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 7 May 2020 11:44:39 +0100
Subject: [PATCH 0997/1830] Revert "DEV: upgrade to Rails 6.0.3"

This was causing issues during multisite:migrate

https://meta.discourse.org/t/multisite-migrate-broken-since-rails-6-0-3-update/150691

This reverts commit 136a5456534c7e468b8052f865ce970a3bf375e9.
---
 Gemfile                                      | 14 ++---
 Gemfile.lock                                 | 58 ++++++++++----------
 config/application.rb                        |  5 --
 config/initializers/200-first_middlewares.rb |  6 +-
 4 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/Gemfile b/Gemfile
index 980bce100a..039acc6a2a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,13 +18,13 @@ else
   # this allows us to include the bits of rails we use without pieces we do not.
   #
   # To issue a rails update bump the version number here
-  gem 'actionmailer', '6.0.3'
-  gem 'actionpack', '6.0.3'
-  gem 'actionview', '6.0.3'
-  gem 'activemodel', '6.0.3'
-  gem 'activerecord', '6.0.3'
-  gem 'activesupport', '6.0.3'
-  gem 'railties', '6.0.3'
+  gem 'actionmailer', '6.0.2.2'
+  gem 'actionpack', '6.0.2.2'
+  gem 'actionview', '6.0.2.2'
+  gem 'activemodel', '6.0.2.2'
+  gem 'activerecord', '6.0.2.2'
+  gem 'activesupport', '6.0.2.2'
+  gem 'railties', '6.0.2.2'
   gem 'sprockets-rails'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index bcc38a6607..6d97e8a504 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (6.0.3)
-      actionpack (= 6.0.3)
-      actionview (= 6.0.3)
-      activejob (= 6.0.3)
+    actionmailer (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      actionview (= 6.0.2.2)
+      activejob (= 6.0.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3)
-      actionview (= 6.0.3)
-      activesupport (= 6.0.3)
+    actionpack (6.0.2.2)
+      actionview (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.3)
-      activesupport (= 6.0.3)
+    actionview (6.0.2.2)
+      activesupport (= 6.0.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -24,20 +24,20 @@ GEM
       actionview (>= 6.0.a)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (6.0.3)
-      activesupport (= 6.0.3)
+    activejob (6.0.2.2)
+      activesupport (= 6.0.2.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.3)
-      activesupport (= 6.0.3)
-    activerecord (6.0.3)
-      activemodel (= 6.0.3)
-      activesupport (= 6.0.3)
-    activesupport (6.0.3)
+    activemodel (6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activerecord (6.0.2.2)
+      activemodel (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activesupport (6.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      zeitwerk (~> 2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     annotate (3.1.1)
@@ -184,7 +184,7 @@ GEM
       mini_mime (>= 0.1.1)
     maxminddb (0.1.22)
     memory_profiler (0.9.14)
-    message_bus (3.2.0)
+    message_bus (3.1.0)
       rack (>= 1.1.3)
     method_source (1.0.0)
     mini_mime (1.0.2)
@@ -281,9 +281,9 @@ GEM
     rails_multisite (2.1.1)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
-    railties (6.0.3)
-      actionpack (= 6.0.3)
-      activesupport (= 6.0.3)
+    railties (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -428,14 +428,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (= 6.0.3)
-  actionpack (= 6.0.3)
-  actionview (= 6.0.3)
+  actionmailer (= 6.0.2.2)
+  actionpack (= 6.0.2.2)
+  actionview (= 6.0.2.2)
   actionview_precompiler
   active_model_serializers (~> 0.8.3)
-  activemodel (= 6.0.3)
-  activerecord (= 6.0.3)
-  activesupport (= 6.0.3)
+  activemodel (= 6.0.2.2)
+  activerecord (= 6.0.2.2)
+  activesupport (= 6.0.2.2)
   addressable
   annotate
   aws-sdk-s3
@@ -512,7 +512,7 @@ DEPENDENCIES
   rack-mini-profiler
   rack-protection
   rails_multisite
-  railties (= 6.0.3)
+  railties (= 6.0.2.2)
   rake
   rb-fsevent
   rb-inotify (~> 0.9)
diff --git a/config/application.rb b/config/application.rb
index 502981af40..b2649ad17f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -91,11 +91,6 @@ module Discourse
       end
     end
 
-    # we skip it cause we configure it in the initializer
-    # the railstie for message_bus would insert it in the
-    # wrong position
-    config.skip_message_bus_middleware = true
-
     # Disable so this is only run manually
     # we may want to change this later on
     # issue is image_optim crashes on missing dependencies
diff --git a/config/initializers/200-first_middlewares.rb b/config/initializers/200-first_middlewares.rb
index 7f0484bad3..2647fd039a 100644
--- a/config/initializers/200-first_middlewares.rb
+++ b/config/initializers/200-first_middlewares.rb
@@ -6,8 +6,12 @@
 #
 # We aren't manipulating the middleware stack directly because of
 # https://github.com/rails/rails/pull/27936
+session_operations = Rails::Configuration::MiddlewareStackProxy.new([
+   [:delete, MessageBus::Rack::Middleware],
+   [:unshift, MessageBus::Rack::Middleware],
+])
 
-Rails.configuration.middleware.unshift(MessageBus::Rack::Middleware)
+Rails.configuration.middleware = Rails.configuration.middleware + session_operations
 
 # no reason to track this in development, that is 300+ redis calls saved per
 # page view (we serve all assets out of thin in development)

From 3debb576d4d30b2a78a59a9f18da8f0e6cc0635e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:24:15 +0200
Subject: [PATCH 0998/1830] REFACTOR: require-valid-alt-text was duplicated
 (#9663)

---
 .template-lintrc.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.template-lintrc.js b/.template-lintrc.js
index d7b4a104eb..adf0ccad1f 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -8,7 +8,6 @@ module.exports = {
   rules: {
     "block-indentation": true,
     "deprecated-render-helper": true,
-    "require-valid-alt-text": false,
     "linebreak-style": true,
     "link-rel-noopener": "strict",
     "no-abstract-roles": true,

From ac4251fc9d08d470968108e6d8fe1c60a49e9cf7 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:24:35 +0200
Subject: [PATCH 0999/1830] REFACTOR: publishedPage property was duplicated
 (#9664)

---
 app/assets/javascripts/discourse/app/controllers/publish-page.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/publish-page.js b/app/assets/javascripts/discourse/app/controllers/publish-page.js
index 37462fce38..f6c864682a 100644
--- a/app/assets/javascripts/discourse/app/controllers/publish-page.js
+++ b/app/assets/javascripts/discourse/app/controllers/publish-page.js
@@ -27,7 +27,6 @@ export default Controller.extend(ModalFunctionality, StateHelpers, {
   reason: null,
   publishedPage: null,
   disabled: not("valid"),
-  publishedPage: null,
 
   showUrl: computed("state", function() {
     return (

From 01272f20851841cbae3e488be98a1eb339b9f924 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:24:54 +0200
Subject: [PATCH 1000/1830] REFACTOR: removes unreachable code (#9665)

* REFACTOR: removes unreachable code

* this one too
---
 app/assets/javascripts/pretty-text/emoji.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/assets/javascripts/pretty-text/emoji.js b/app/assets/javascripts/pretty-text/emoji.js
index 6346cd93b1..a2963b84e1 100644
--- a/app/assets/javascripts/pretty-text/emoji.js
+++ b/app/assets/javascripts/pretty-text/emoji.js
@@ -126,8 +126,6 @@ export function performEmojiUnescape(string, opts) {
         } alt='${emojiVal}' class='${classes}'>`
       : m;
   });
-
-  return string;
 }
 
 export function performEmojiEscape(string, opts) {
@@ -145,8 +143,6 @@ export function performEmojiEscape(string, opts) {
 
     return m;
   });
-
-  return string;
 }
 
 export function isCustomEmoji(code, opts) {

From 864f48b2e6964c16317e6523b6dac1b3081577e0 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:25:23 +0200
Subject: [PATCH 1001/1830] REFACTOR: removes useless conditional (#9668)

Given we will return true on the line before if inlineEmoji, this will always be false.
---
 app/assets/javascripts/pretty-text/emoji.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/pretty-text/emoji.js b/app/assets/javascripts/pretty-text/emoji.js
index a2963b84e1..74af3b90cd 100644
--- a/app/assets/javascripts/pretty-text/emoji.js
+++ b/app/assets/javascripts/pretty-text/emoji.js
@@ -82,7 +82,7 @@ function isReplacableInlineEmoji(string, index, inlineEmoji) {
 
   // index depends on regex; when `inlineEmoji` is false, the regex starts
   // with a `\B` character, so there's no need to subtract from the index
-  const beforeEmoji = string.slice(0, index - (inlineEmoji ? 1 : 0));
+  const beforeEmoji = string.slice(0, index);
 
   return (
     beforeEmoji.length === 0 ||

From 5a201082c783f6ab6e50d95d0818481c824effa3 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:25:44 +0200
Subject: [PATCH 1002/1830] REFACTOR: removes useless conditional (#9667)

This use of variable 'content' always evaluates to true.
---
 app/assets/javascripts/select-kit/components/multi-select.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/multi-select.js b/app/assets/javascripts/select-kit/components/multi-select.js
index 51ce57dc94..16681b8262 100644
--- a/app/assets/javascripts/select-kit/components/multi-select.js
+++ b/app/assets/javascripts/select-kit/components/multi-select.js
@@ -104,7 +104,7 @@ export default SelectKitComponent.extend({
         }
       });
 
-      return this.selectKit.modifySelection(content || []);
+      return this.selectKit.modifySelection(content);
     } else {
       return this.selectKit.noneItem;
     }

From 48375db84801523277ddfbde901302ea6f228ff8 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:27:15 +0200
Subject: [PATCH 1003/1830] REFACTOR: removes superfluous argument passed to
 findWidget (#9669)

findWidget accepts only one argument
---
 app/assets/javascripts/discourse/app/widgets/glue.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/glue.js b/app/assets/javascripts/discourse/app/widgets/glue.js
index 2fe75def26..78aa33196b 100644
--- a/app/assets/javascripts/discourse/app/widgets/glue.js
+++ b/app/assets/javascripts/discourse/app/widgets/glue.js
@@ -58,11 +58,11 @@ export default class WidgetGlue {
       widget.vnode.children.forEach(child => {
         if (child.constructor.name === "CustomWidget") {
           widgets.push(child);
-          findWidgets(child, widgets);
+          findWidgets(child);
         }
       });
     };
-    findWidgets(this._tree, widgets);
+    findWidgets(this._tree);
     widgets.reverse().forEach(widget => widget.destroy());
 
     cancel(this._timeout);

From d020e70643dd9b62f50b16ce071e41c917927bd5 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:27:53 +0200
Subject: [PATCH 1004/1830] REFACTOR: removes unreachable return statement
 (#9670)

---
 .../javascripts/discourse/app/components/reviewable-item.js      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/reviewable-item.js b/app/assets/javascripts/discourse/app/components/reviewable-item.js
index 6f62710478..a0ef38412f 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-item.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-item.js
@@ -127,7 +127,6 @@ export default Component.extend({
         console.error(`No handler for ${action.client_action} found`);
         return;
       }
-      return;
     } else {
       return performAction();
     }

From 930989d462a299f69e424276e653a661ffe8ccb2 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:28:28 +0200
Subject: [PATCH 1005/1830] REFACTOR: variable '_postSnapshot' always evaluates
 to true (#9671)

---
 .../javascripts/select-kit/components/composer-actions.js      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js b/app/assets/javascripts/select-kit/components/composer-actions.js
index 6b82d66f97..7afd4d616e 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js
@@ -133,8 +133,7 @@ export default DropdownSelectBoxComponent.extend({
     if (
       this.canWhisper &&
       (!_postSnapshot ||
-        (_postSnapshot &&
-          _postSnapshot.post_type !== this.site.post_types.whisper))
+        _postSnapshot.post_type !== this.site.post_types.whisper)
     ) {
       items.push({
         name: I18n.t("composer.composer_actions.toggle_whisper.label"),

From a2109bd9b2dace89e06f0cb9710d33ff1a83ed78 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:30:51 +0200
Subject: [PATCH 1006/1830] REFACTOR: value assigned to cp here is unused.
 (#9672)

---
 app/assets/javascripts/discourse/app/lib/autocomplete.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/autocomplete.js b/app/assets/javascripts/discourse/app/lib/autocomplete.js
index 4979760483..03fc408a91 100644
--- a/app/assets/javascripts/discourse/app/lib/autocomplete.js
+++ b/app/assets/javascripts/discourse/app/lib/autocomplete.js
@@ -492,7 +492,6 @@ export default function(options) {
             (!prev || allowedLettersRegex.test(prev))
           ) {
             completeStart = c;
-            cp = completeEnd = initial;
             term = me[0].value.substring(c + 1, initial);
             updateAutoComplete(dataSource(term, options));
             return true;

From d5fe1279bde7d9d0df542b2be244ac94a8289d8d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:34:14 +0200
Subject: [PATCH 1007/1830] REFACTOR: value assigned to precision here is
 unused (#9673)

---
 app/assets/javascripts/locales/i18n.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/locales/i18n.js b/app/assets/javascripts/locales/i18n.js
index 42ac634359..e0f7019a08 100644
--- a/app/assets/javascripts/locales/i18n.js
+++ b/app/assets/javascripts/locales/i18n.js
@@ -202,7 +202,6 @@ I18n.toNumber = function(number, options) {
     formattedNumber;
 
   number = parts[0];
-  precision = parts[1];
 
   while (number.length > 0) {
     buffer.unshift(number.substr(Math.max(0, number.length - 3), 3));

From a04b226c2b9f6a857b61de54fd204fb9b92755e0 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:34:25 +0200
Subject: [PATCH 1008/1830] REFACTOR: removes useless conditional (#9674)

We already check if there's a post in the line before.
---
 app/assets/javascripts/discourse/app/lib/link-lookup.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/link-lookup.js b/app/assets/javascripts/discourse/app/lib/link-lookup.js
index 278987633c..0d742da85f 100644
--- a/app/assets/javascripts/discourse/app/lib/link-lookup.js
+++ b/app/assets/javascripts/discourse/app/lib/link-lookup.js
@@ -20,11 +20,9 @@ export default class LinkLookup {
     if (linkInfo) {
       if (post) {
         // Skip edits to the OP
-        if (post) {
-          const postNumber = post.get("post_number");
-          if (postNumber === 1 || postNumber === linkInfo.post_number) {
-            return NO_RESULT;
-          }
+        const postNumber = post.get("post_number");
+        if (postNumber === 1 || postNumber === linkInfo.post_number) {
+          return NO_RESULT;
         }
 
         // Don't warn on older posts

From a078b086ba6cd3f8dca7962e4d5062212dcae2ce Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:34:36 +0200
Subject: [PATCH 1009/1830] REFACToR: removes useless assignment to local
 variable (#9675)

---
 .../pretty-text/engines/discourse-markdown/quotes.js        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
index c66122f7f4..92819eee3b 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
@@ -103,7 +103,7 @@ const rule = {
       token = state.push("quote_controls_open", "div", 1);
       token.attrs = [["class", "quote-controls"]];
 
-      token = state.push("quote_controls_close", "div", -1);
+      state.push("quote_controls_close", "div", -1);
 
       if (avatarImg) {
         token = state.push("html_inline", "", 0);
@@ -144,10 +144,10 @@ const rule = {
         token.content = ` ${displayName}:`;
       }
 
-      token = state.push("quote_header_close", "div", -1);
+      state.push("quote_header_close", "div", -1);
     }
 
-    token = state.push("bbcode_open", "blockquote", 1);
+    state.push("bbcode_open", "blockquote", 1);
   },
 
   after: function(state) {

From 08e8ae82cc54714634dd1b9925c274d47c10076b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:34:49 +0200
Subject: [PATCH 1010/1830] REFACTOR: removes useless conditional (#9677)

---
 .../discourse/app/components/group-manage-save-button.js         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/group-manage-save-button.js b/app/assets/javascripts/discourse/app/components/group-manage-save-button.js
index 31217a190f..d1304834ee 100644
--- a/app/assets/javascripts/discourse/app/components/group-manage-save-button.js
+++ b/app/assets/javascripts/discourse/app/components/group-manage-save-button.js
@@ -8,7 +8,6 @@ export default Component.extend({
 
   @discourseComputed("saving")
   savingText(saving) {
-    if (saving) return I18n.t("saving");
     return saving ? I18n.t("saving") : I18n.t("save");
   },
 

From affc79bb6866eccd30893864d096287d26e20e56 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:35:54 +0200
Subject: [PATCH 1011/1830] REFACTOR: removes useless assignment to local
 variable (#9676)

---
 .../pretty-text/engines/discourse-markdown/d-wrap.js            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/d-wrap.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/d-wrap.js
index 73dd3ca26c..37f42df99f 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/d-wrap.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/d-wrap.js
@@ -57,7 +57,7 @@ const inlineRule = {
       token.content = content;
     }
 
-    token = state.push("wrap_close", "span", -1);
+    state.push("wrap_close", "span", -1);
     return true;
   }
 };

From e74170cd9e459eac5dc9997840cb7052c3b084bd Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:36:15 +0200
Subject: [PATCH 1012/1830] REFACTOR: Superfluous arguments passed to function
 resolveSize (#9678)

resolveSize accepts only one param
---
 app/assets/javascripts/pretty-text/oneboxer.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/pretty-text/oneboxer.js b/app/assets/javascripts/pretty-text/oneboxer.js
index 034120502c..f5faf56128 100644
--- a/app/assets/javascripts/pretty-text/oneboxer.js
+++ b/app/assets/javascripts/pretty-text/oneboxer.js
@@ -29,7 +29,7 @@ function resolveSize(img) {
 }
 
 // Detect square images and apply smaller onebox-avatar class
-function applySquareGenericOnebox($elem, normalizedUrl) {
+function applySquareGenericOnebox($elem) {
   if (!$elem.hasClass("whitelistedgeneric")) {
     return;
   }
@@ -43,10 +43,10 @@ function applySquareGenericOnebox($elem, normalizedUrl) {
   }
 
   if (img.complete) {
-    resolveSize(img, $elem, normalizedUrl);
+    resolveSize(img);
   } else {
     $img.on("load.onebox", () => {
-      resolveSize(img, $elem, normalizedUrl);
+      resolveSize(img);
       $img.off("load.onebox");
     });
   }

From 8be0ba3aa41339d376b790d007fb69ce6809d368 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:36:29 +0200
Subject: [PATCH 1013/1830] REFACTOR: function was incorrectly called as a
 constructor (#9679)

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

diff --git a/app/assets/javascripts/discourse/app/lib/text.js b/app/assets/javascripts/discourse/app/lib/text.js
index 464f9c3709..692e75b9b5 100644
--- a/app/assets/javascripts/discourse/app/lib/text.js
+++ b/app/assets/javascripts/discourse/app/lib/text.js
@@ -43,7 +43,7 @@ export function sanitize(text, options) {
 }
 
 export function sanitizeAsync(text, options) {
-  return new loadMarkdownIt().then(() => {
+  return loadMarkdownIt().then(() => {
     return createPrettyText(options).sanitize(text);
   });
 }

From 23d585f255af235ad7345cd570a55361228029fa Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:37:02 +0200
Subject: [PATCH 1014/1830] REFACTOR: removes unreachable statement (#9680)

---
 lib/javascripts/messageformat-lookup.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/javascripts/messageformat-lookup.js b/lib/javascripts/messageformat-lookup.js
index e34cd4803b..7e31717756 100644
--- a/lib/javascripts/messageformat-lookup.js
+++ b/lib/javascripts/messageformat-lookup.js
@@ -1,17 +1,14 @@
 (function() {
-
   I18n.messageFormat = function(key, options) {
     var fn = I18n._compiledMFs[key];
     if (fn) {
       try {
         return fn(options);
-      } catch(err) {
+      } catch (err) {
         return err.message;
       }
     } else {
-      return 'Missing Key: ' + key;
+      return "Missing Key: " + key;
     }
-    return I18n._compiledMFs[key](options);
   };
-
 })();

From af78d188b8bf5d8653ad895bd68b06f67792e3d6 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:37:20 +0200
Subject: [PATCH 1015/1830] REFACTOR: removes useless self assignment (#9681)

---
 app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
index e5c8138673..06ebf23666 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
@@ -91,7 +91,6 @@ createWidget("topic-admin-menu-button", {
     const position = $button.position();
 
     const rtl = $("html").hasClass("rtl");
-    position.left = position.left;
     position.outerHeight = $button.outerHeight();
 
     if (rtl) {

From 9846c43d9320bffbdd6b765fedc1994078655b65 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:37:56 +0200
Subject: [PATCH 1016/1830] REFACTOR: removes use of undeclared variable
 (#9682)

---
 .../app/components/groups-form-profile-fields.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 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 988e4ac843..39077b9257 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
@@ -31,25 +31,24 @@ export default Component.extend({
 
   @observes("nameInput")
   _validateName() {
-    name = this.nameInput;
-    if (name === this.get("model.name")) return;
+    if (this.nameInput === this.get("model.name")) return;
 
-    if (name === undefined) {
+    if (this.nameInput === undefined) {
       return this._failedInputValidation();
     }
 
-    if (name === "") {
+    if (this.nameInput === "") {
       this.set("uniqueNameValidation", null);
       return this._failedInputValidation(I18n.t("admin.groups.new.name.blank"));
     }
 
-    if (name.length < this.siteSettings.min_username_length) {
+    if (this.nameInput.length < this.siteSettings.min_username_length) {
       return this._failedInputValidation(
         I18n.t("admin.groups.new.name.too_short")
       );
     }
 
-    if (name.length > this.siteSettings.max_username_length) {
+    if (this.nameInput.length > this.siteSettings.max_username_length) {
       return this._failedInputValidation(
         I18n.t("admin.groups.new.name.too_long")
       );
@@ -63,10 +62,9 @@ export default Component.extend({
   },
 
   checkGroupName: discourseDebounce(function() {
-    name = this.nameInput;
-    if (isEmpty(name)) return;
+    if (isEmpty(this.nameInput)) return;
 
-    Group.checkName(name)
+    Group.checkName(this.nameInput)
       .then(response => {
         const validationName = "uniqueNameValidation";
 

From 206d45fd9607facbf0484e5bd09ad04439dcc5b2 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:38:09 +0200
Subject: [PATCH 1017/1830] REFACTOR: removes superfluous argument (#9683)

---
 app/assets/javascripts/admin/models/report.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/models/report.js b/app/assets/javascripts/admin/models/report.js
index d0152c1a9e..080ca4551b 100644
--- a/app/assets/javascripts/admin/models/report.js
+++ b/app/assets/javascripts/admin/models/report.js
@@ -346,7 +346,7 @@ const Report = EmberObject.extend({
 
     return {
       value: username,
-      formatedValue: username ? formatedValue(username) : "—"
+      formatedValue: username ? formatedValue() : "—"
     };
   },
 

From 99c3ce03cbd7367a395b3fe0c4065f37f9b27902 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:38:23 +0200
Subject: [PATCH 1018/1830] REFACTOR: removes superfluous argument (#9684)

hideTooltip doesnt accept any argument
---
 app/assets/javascripts/discourse/app/lib/tooltip.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/tooltip.js b/app/assets/javascripts/discourse/app/lib/tooltip.js
index 852451bf31..5242370dae 100644
--- a/app/assets/javascripts/discourse/app/lib/tooltip.js
+++ b/app/assets/javascripts/discourse/app/lib/tooltip.js
@@ -22,7 +22,7 @@ export function showTooltip(e) {
   pos.top -= delta.top;
   pos.left -= delta.left;
 
-  hideTooltip(tooltipID);
+  hideTooltip();
 
   $this.after(`
     <div id="discourse-tooltip" ${retina}>

From 265baa40c60b5e0c1b5a39e8b26d56bf86faeef3 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:38:38 +0200
Subject: [PATCH 1019/1830] REFACTOR:  useless conditional as 'data' always
 evaluates to true (#9685)

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

diff --git a/app/assets/javascripts/discourse/app/mixins/upload.js b/app/assets/javascripts/discourse/app/mixins/upload.js
index f7d568cb96..1066a1e95a 100644
--- a/app/assets/javascripts/discourse/app/mixins/upload.js
+++ b/app/assets/javascripts/discourse/app/mixins/upload.js
@@ -99,7 +99,7 @@ export default Mixin.create({
     });
 
     $upload.on("fileuploadfail", (e, data) => {
-      if (!data || (data && data.errorThrown !== "abort")) {
+      if (!data || data.errorThrown !== "abort") {
         displayErrorForUpload(data);
       }
       reset();

From 1dd9df9cd0832d91279a22e626fb842dc29c0a2a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:39:53 +0200
Subject: [PATCH 1020/1830] REFACTOR: removes overwritten properties and
 duplicates fn (#9686)

---
 .../admin/components/admin-report.js          |  2 --
 .../discourse/app/components/text-field.js    | 33 +++++--------------
 .../discourse/app/controllers/composer.js     |  2 --
 .../discourse-local-dates-create-form.js.es6  |  1 -
 4 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/app/assets/javascripts/admin/components/admin-report.js b/app/assets/javascripts/admin/components/admin-report.js
index 757a90a7db..352b92fb93 100644
--- a/app/assets/javascripts/admin/components/admin-report.js
+++ b/app/assets/javascripts/admin/components/admin-report.js
@@ -59,8 +59,6 @@ export default Component.extend({
   forcedModes: null,
   showAllReportsLink: false,
   filters: null,
-  startDate: null,
-  endDate: null,
   showTrend: false,
   showHeader: true,
   showTitle: true,
diff --git a/app/assets/javascripts/discourse/app/components/text-field.js b/app/assets/javascripts/discourse/app/components/text-field.js
index 5809d25a86..affad24e80 100644
--- a/app/assets/javascripts/discourse/app/components/text-field.js
+++ b/app/assets/javascripts/discourse/app/components/text-field.js
@@ -6,9 +6,6 @@ import { next, debounce, cancel } from "@ember/runloop";
 const DEBOUNCE_MS = 500;
 
 export default TextField.extend({
-  _prevValue: null,
-  _timer: null,
-
   attributeBindings: [
     "autocorrect",
     "autocapitalize",
@@ -17,13 +14,22 @@ export default TextField.extend({
     "dir"
   ],
 
+  init() {
+    this._super(...arguments);
+
+    this._prevValue = null;
+    this._timer = null;
+  },
+
   didReceiveAttrs() {
     this._super(...arguments);
+
     this._prevValue = this.value;
   },
 
   didUpdateAttrs() {
     this._super(...arguments);
+
     if (this._prevValue !== this.value) {
       if (this.onChangeImmediate) {
         next(() => this.onChangeImmediate(this.value));
@@ -71,27 +77,6 @@ export default TextField.extend({
     }
   },
 
-  didReceiveAttrs() {
-    this._super(...arguments);
-    this._prevValue = this.value;
-  },
-
-  didUpdateAttrs() {
-    this._super(...arguments);
-    if (this._prevValue !== this.value) {
-      if (this.onChangeImmediate) {
-        next(() => this.onChangeImmediate(this.value));
-      }
-      if (this.onChange) {
-        debounce(this, this._debouncedChange, DEBOUNCE_MS);
-      }
-    }
-  },
-
-  _debouncedChange() {
-    next(() => this.onChange(this.value));
-  },
-
   @discourseComputed("placeholderKey")
   placeholder: {
     get() {
diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index 9ed71e654a..6a0fa4e6ef 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -95,8 +95,6 @@ export default Controller.extend({
   scopedCategoryId: null,
   lastValidatedAt: null,
   isUploading: false,
-  allowUpload: false,
-  uploadIcon: "upload",
   topic: null,
   linkLookup: null,
   showPreview: true,
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
index df092d9a89..0ba26c48b4 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
@@ -24,7 +24,6 @@ export default Component.extend({
   formats: null,
   recurring: null,
   advancedMode: false,
-  isValid: true,
   timezone: null,
   fromSelected: null,
   fromFilled: notEmpty("date"),

From 3cd412ae02d632c83324f220fe02f0a97ca93e89 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 16:41:26 +0200
Subject: [PATCH 1021/1830] REFACTOR: removes useless variable assignment
 (#9666)

---
 .../select-kit/components/select-kit.js        | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 71cf24e576..74544c91f1 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -641,19 +641,18 @@ export default Component.extend(
     },
 
     _highlightNext() {
-      const highlightedIndex = this.mainCollection.indexOf(
+      let highlightedIndex = this.mainCollection.indexOf(
         this.selectKit.highlighted
       );
-      let newHighlightedIndex = highlightedIndex;
       const count = this.mainCollection.length;
 
       if (highlightedIndex < count - 1) {
-        newHighlightedIndex = highlightedIndex + 1;
+        highlightedIndex = highlightedIndex + 1;
       } else {
-        newHighlightedIndex = 0;
+        highlightedIndex = 0;
       }
 
-      const highlighted = this.mainCollection.objectAt(newHighlightedIndex);
+      const highlighted = this.mainCollection.objectAt(highlightedIndex);
       if (highlighted) {
         this._scrollToRow(highlighted);
         this.set("selectKit.highlighted", highlighted);
@@ -661,19 +660,18 @@ export default Component.extend(
     },
 
     _highlightPrevious() {
-      const highlightedIndex = this.mainCollection.indexOf(
+      let highlightedIndex = this.mainCollection.indexOf(
         this.selectKit.highlighted
       );
-      let newHighlightedIndex = highlightedIndex;
       const count = this.mainCollection.length;
 
       if (highlightedIndex > 0) {
-        newHighlightedIndex = highlightedIndex - 1;
+        highlightedIndex = highlightedIndex - 1;
       } else {
-        newHighlightedIndex = count - 1;
+        highlightedIndex = count - 1;
       }
 
-      const highlighted = this.mainCollection.objectAt(newHighlightedIndex);
+      const highlighted = this.mainCollection.objectAt(highlightedIndex);
       if (highlighted) {
         this._scrollToRow(highlighted);
         this.set("selectKit.highlighted", highlighted);

From 69ef0da4c269dea0aeaf97b8fd3c4fcff2fa5284 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 7 May 2020 11:00:47 -0400
Subject: [PATCH 1022/1830] FIX: `preload-store` was removed

---
 app/views/layouts/application.html.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index f1984038e7..862e00f2db 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -26,7 +26,6 @@
       <%= preload_script_url ExtraLocalesController.url('overrides') %>
     <%- end %>
     <%= preload_script "ember_jquery" %>
-    <%= preload_script "preload-store" %>
     <%= preload_script "vendor" %>
     <%= preload_script "pretty-text-bundle" %>
     <%= preload_script "application" %>

From 781e3f5e100a2c81fa14339a2213be91fffcaacc Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Thu, 7 May 2020 17:04:12 +0200
Subject: [PATCH 1023/1830] DEV: Use `response.parsed_body` in specs (#9615)

Most of it was autofixed with rubocop-discourse 2.1.1.
---
 .../spec/controllers/polls_controller_spec.rb |  38 +--
 .../spec/controllers/posts_controller_spec.rb |  58 ++---
 .../spec/integration/poll_endpoints_spec.rb   |   8 +-
 .../invite_only_registration_spec.rb          |   2 +-
 spec/integration/rate_limiting_spec.rb        |   2 +-
 spec/requests/admin/api_controller_spec.rb    |   8 +-
 .../requests/admin/backups_controller_spec.rb |   2 +-
 spec/requests/admin/badges_controller_spec.rb |   8 +-
 .../admin/color_schemes_controller_spec.rb    |   8 +-
 .../admin/dashboard_controller_spec.rb        |   8 +-
 spec/requests/admin/email_controller_spec.rb  |  36 +--
 .../admin/email_styles_controller_spec.rb     |   6 +-
 .../admin/email_templates_controller_spec.rb  |  16 +-
 spec/requests/admin/emojis_controller_spec.rb |  10 +-
 spec/requests/admin/groups_controller_spec.rb |   4 +-
 .../admin/permalinks_controller_spec.rb       |   6 +-
 .../requests/admin/plugins_controller_spec.rb |   2 +-
 .../requests/admin/reports_controller_spec.rb |  14 +-
 .../admin/robots_txt_controller_spec.rb       |   8 +-
 .../admin/screened_emails_controller_spec.rb  |   2 +-
 .../screened_ip_addresses_controller_spec.rb  |   4 +-
 .../admin/screened_urls_controller_spec.rb    |   2 +-
 spec/requests/admin/search_logs_spec.rb       |   4 +-
 .../admin/site_settings_controller_spec.rb    |  10 +-
 .../admin/site_texts_controller_spec.rb       |  52 ++--
 .../staff_action_logs_controller_spec.rb      |  10 +-
 spec/requests/admin/themes_controller_spec.rb |  38 +--
 .../admin/user_fields_controller_spec.rb      |   2 +-
 spec/requests/admin/users_controller_spec.rb  |  26 +-
 .../admin/versions_controller_spec.rb         |   4 +-
 .../admin/web_hooks_controller_spec.rb        |   4 +-
 spec/requests/application_controller_spec.rb  |   4 +-
 .../associate_accounts_controller_spec.rb     |   4 +-
 spec/requests/badges_controller_spec.rb       |   4 +-
 spec/requests/bookmarks_controller_spec.rb    |   8 +-
 spec/requests/categories_controller_spec.rb   |  12 +-
 .../category_hashtags_controller_spec.rb      |   6 +-
 .../composer_messages_controller_spec.rb      |   2 +-
 .../directory_items_controller_spec.rb        |  10 +-
 spec/requests/draft_controller_spec.rb        |  16 +-
 spec/requests/drafts_controller_spec.rb       |   8 +-
 spec/requests/embed_controller_spec.rb        |   4 +-
 spec/requests/groups_controller_spec.rb       |  98 ++++----
 .../requests/inline_onebox_controller_spec.rb |   4 +-
 spec/requests/invites_controller_spec.rb      |  24 +-
 spec/requests/list_controller_spec.rb         |  34 +--
 spec/requests/metadata_controller_spec.rb     |   1 +
 .../requests/notifications_controller_spec.rb |   4 +-
 .../omniauth_callbacks_controller_spec.rb     |   2 +-
 spec/requests/post_actions_controller_spec.rb |   2 +-
 spec/requests/post_readers_controller_spec.rb |  18 +-
 spec/requests/posts_controller_spec.rb        |  64 ++---
 spec/requests/reviewables_controller_spec.rb  |  54 ++---
 spec/requests/robots_txt_controller_spec.rb   |   4 +-
 spec/requests/search_controller_spec.rb       |  20 +-
 spec/requests/session_controller_spec.rb      |  82 +++----
 .../similar_topics_controller_spec.rb         |   8 +-
 spec/requests/site_controller_spec.rb         |   8 +-
 spec/requests/static_controller_spec.rb       |   2 +-
 spec/requests/svg_sprite_controller_spec.rb   |   4 +-
 spec/requests/tag_groups_controller_spec.rb   |   2 +-
 spec/requests/tags_controller_spec.rb         | 126 +++++-----
 spec/requests/topics_controller_spec.rb       |  96 ++++----
 spec/requests/uploads_controller_spec.rb      |  34 +--
 spec/requests/user_actions_controller_spec.rb |   8 +-
 .../requests/user_api_keys_controller_spec.rb |   2 +-
 spec/requests/user_badges_controller_spec.rb  |  10 +-
 spec/requests/users_controller_spec.rb        | 222 +++++++++---------
 spec/requests/wizard_controller_spec.rb       |   2 +-
 spec/support/integration_helpers.rb           |   4 +-
 70 files changed, 705 insertions(+), 714 deletions(-)

diff --git a/plugins/poll/spec/controllers/polls_controller_spec.rb b/plugins/poll/spec/controllers/polls_controller_spec.rb
index 74f15824f2..9534a5ca42 100644
--- a/plugins/poll/spec/controllers/polls_controller_spec.rb
+++ b/plugins/poll/spec/controllers/polls_controller_spec.rb
@@ -25,7 +25,7 @@ describe ::DiscoursePoll::PollsController do
 
       expect(response.status).to eq(200)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["poll"]["name"]).to eq("poll")
       expect(json["poll"]["voters"]).to eq(1)
       expect(json["vote"]).to eq(["5c24fc1df56d764b550ceae1b9319125"])
@@ -53,7 +53,7 @@ describe ::DiscoursePoll::PollsController do
 
       expect(response.status).to eq(200)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["poll"]["name"]).to eq("poll")
       expect(json["poll"]["voters"]).to eq(1)
       expect(json["vote"]).to eq(["5c24fc1df56d764b550ceae1b9319125"])
@@ -80,7 +80,7 @@ describe ::DiscoursePoll::PollsController do
 
       expect(response.status).to eq(200)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["poll"]["name"]).to eq("poll")
       expect(json["poll"]["voters"]).to eq(1)
       expect(json["vote"]).to eq(["5c24fc1df56d764b550ceae1b9319125"])
@@ -96,7 +96,7 @@ describe ::DiscoursePoll::PollsController do
       }, format: :json
 
       expect(response.status).not_to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("poll.requires_at_least_1_valid_option"))
     end
 
@@ -112,7 +112,7 @@ describe ::DiscoursePoll::PollsController do
       }, format: :json
 
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["poll"]["voters"]).to eq(1)
       expect(json["poll"]["options"][0]["votes"]).to eq(0)
       expect(json["poll"]["options"][1]["votes"]).to eq(1)
@@ -136,7 +136,7 @@ describe ::DiscoursePoll::PollsController do
       }, format: :json
 
       expect(response.status).not_to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("poll.topic_must_be_open_to_vote"))
     end
 
@@ -148,7 +148,7 @@ describe ::DiscoursePoll::PollsController do
       }, format: :json
 
       expect(response.status).not_to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("poll.post_is_deleted"))
     end
 
@@ -160,7 +160,7 @@ describe ::DiscoursePoll::PollsController do
       }, format: :json
 
       expect(response.status).not_to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("poll.user_cant_post_in_topic"))
     end
 
@@ -170,7 +170,7 @@ describe ::DiscoursePoll::PollsController do
       }, format: :json
 
       expect(response.status).not_to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("poll.no_poll_with_this_name", name: "foobar"))
     end
 
@@ -182,7 +182,7 @@ describe ::DiscoursePoll::PollsController do
       }, format: :json
 
       expect(response.status).not_to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("poll.poll_must_be_open_to_vote"))
     end
 
@@ -194,7 +194,7 @@ describe ::DiscoursePoll::PollsController do
       }, format: :json
 
       expect(response.status).not_to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("js.poll.results.groups.title", groups: poll.polls.first.groups))
     end
 
@@ -210,7 +210,7 @@ describe ::DiscoursePoll::PollsController do
 
       expect(response.status).to eq(200)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["poll"]["voters"]).to eq(18)
       expect(json["poll"]["options"][0]["votes"]).to eq(12)
       expect(json["poll"]["options"][1]["votes"]).to eq(6)
@@ -230,7 +230,7 @@ describe ::DiscoursePoll::PollsController do
         expect(response.status).to eq(200)
       end.first
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["poll"]["status"]).to eq("closed")
       expect(message.channel).to eq(channel)
     end
@@ -248,7 +248,7 @@ describe ::DiscoursePoll::PollsController do
         expect(response.status).to eq(200)
       end.first
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["poll"]["status"]).to eq("closed")
       expect(message.channel).to eq(channel)
     end
@@ -261,7 +261,7 @@ describe ::DiscoursePoll::PollsController do
       }, format: :json
 
       expect(response.status).not_to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("poll.post_is_deleted"))
     end
 
@@ -303,7 +303,7 @@ describe ::DiscoursePoll::PollsController do
 
       expect(response.status).to eq(200)
 
-      json = JSON.parse(response.body)
+      json = response.parsed_body
 
       # no user3 cause voter_limit is 2
       expect(json["voters"][first].map { |h| h["id"] }).to contain_exactly(user1.id, user2.id)
@@ -323,7 +323,7 @@ describe ::DiscoursePoll::PollsController do
 
       expect(response.status).to eq(200)
 
-      json = JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(json["voters"][first].size).to eq(1)
 
@@ -347,7 +347,7 @@ describe ::DiscoursePoll::PollsController do
 
       expect(response.status).to eq(200)
 
-      json = JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(json["voters"][first].size).to eq(1)
       expect(json["voters"][second].size).to eq(1)
@@ -378,7 +378,7 @@ describe ::DiscoursePoll::PollsController do
 
       expect(response.status).to eq(200)
 
-      json = JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(json["voters"][first].size).to eq(1)
     end
diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb
index 3cedf9017f..be26174871 100644
--- a/plugins/poll/spec/controllers/posts_controller_spec.rb
+++ b/plugins/poll/spec/controllers/posts_controller_spec.rb
@@ -17,7 +17,7 @@ describe PostsController do
       }, format: :json
 
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["cooked"]).to match("data-poll-")
       expect(Poll.exists?(post_id: json["id"])).to eq(true)
     end
@@ -30,7 +30,7 @@ describe PostsController do
       }, format: :json
 
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["cooked"]).to match("data-poll-")
       expect(Poll.exists?(post_id: json["id"])).to eq(true)
     end
@@ -49,7 +49,7 @@ describe PostsController do
              change { Poll.count }.by(1)
 
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       post_id = json["id"]
 
       expect(Poll.find_by(post_id: post_id).close_at).to eq_time(close_date)
@@ -67,7 +67,7 @@ describe PostsController do
       }, format: :json
 
       expect(response).not_to be_successful
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("poll.default_poll_must_have_different_options"))
     end
 
@@ -77,7 +77,7 @@ describe PostsController do
       }, format: :json
 
       expect(response).not_to be_successful
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("poll.default_poll_must_have_at_least_1_option"))
     end
 
@@ -91,7 +91,7 @@ describe PostsController do
       }, format: :json
 
       expect(response).not_to be_successful
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("poll.default_poll_must_have_less_options", count: SiteSetting.poll_maximum_options))
     end
 
@@ -101,7 +101,7 @@ describe PostsController do
       }, format: :json
 
       expect(response).not_to be_successful
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("poll.default_poll_with_multiple_choices_has_invalid_parameters"))
     end
 
@@ -111,7 +111,7 @@ describe PostsController do
       }, format: :json
 
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["cooked"]).to match("data-poll-")
       expect(json["cooked"]).to include("&lt;script&gt;")
       expect(Poll.find_by(post_id: json["id"]).name).to eq("&lt;script&gt;alert(&#39;xss&#39;)&lt;/script&gt;")
@@ -123,7 +123,7 @@ describe PostsController do
       }, format: :json
 
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["cooked"]).to match("data-poll-")
       expect(Poll.exists?(post_id: json["id"])).to eq(true)
     end
@@ -134,7 +134,7 @@ describe PostsController do
       }, format: :json
 
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["cooked"]).to match("data-poll-")
       expect(Poll.where(post_id: json["id"]).count).to eq(1)
     end
@@ -149,7 +149,7 @@ describe PostsController do
               title: title, raw: "[poll]\n- A\n- B\n[/poll]"
             }, format: :json
 
-            ::JSON.parse(response.body)["id"]
+            response.parsed_body["id"]
           end
         end
 
@@ -159,7 +159,7 @@ describe PostsController do
           }, format: :json
 
           expect(response.status).to eq(200)
-          json = ::JSON.parse(response.body)
+          json = response.parsed_body
           expect(json["post"]["polls"][0]["options"][2]["html"]).to eq("C")
         end
 
@@ -171,7 +171,7 @@ describe PostsController do
           }, format: :json
 
           expect(response.status).to eq(200)
-          json = ::JSON.parse(response.body)
+          json = response.parsed_body
           expect(json["post"]["polls_votes"]).to_not be
         end
 
@@ -189,7 +189,7 @@ describe PostsController do
               title: title, raw: poll
             }, format: :json
 
-            ::JSON.parse(response.body)["id"]
+            response.parsed_body["id"]
           end
         end
 
@@ -207,14 +207,14 @@ describe PostsController do
             }, format: :json
 
             expect(response.status).to eq(200)
-            json = ::JSON.parse(response.body)
+            json = response.parsed_body
             expect(json["post"]["polls"][0]["options"][1]["html"]).to eq("C")
           end
 
           it "support changes on the post" do
             put :update, params: { id: post_id, post: { raw: updated } }, format: :json
             expect(response.status).to eq(200)
-            json = ::JSON.parse(response.body)
+            json = response.parsed_body
             expect(json["post"]["cooked"]).to match("before")
           end
 
@@ -232,7 +232,7 @@ describe PostsController do
             }, format: :json
 
             expect(response).not_to be_successful
-            json = ::JSON.parse(response.body)
+            json = response.parsed_body
             expect(json["errors"][0]).to eq(I18n.t(
               "poll.edit_window_expired.cannot_edit_default_poll_with_votes",
               minutes: poll_edit_window_mins
@@ -242,7 +242,7 @@ describe PostsController do
           it "support changes on the post" do
             put :update, params: { id: post_id, post: { raw: updated } }, format: :json
             expect(response.status).to eq(200)
-            json = ::JSON.parse(response.body)
+            json = response.parsed_body
             expect(json["post"]["cooked"]).to match("before")
           end
 
@@ -262,7 +262,7 @@ describe PostsController do
       }, format: :json
 
       expect(response).not_to be_successful
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("poll.named_poll_must_have_different_options", name: "foo"))
     end
 
@@ -272,7 +272,7 @@ describe PostsController do
       }, format: :json
 
       expect(response).not_to be_successful
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("poll.named_poll_must_have_at_least_1_option", name: "foo"))
     end
 
@@ -286,7 +286,7 @@ describe PostsController do
       }, format: :json
 
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["cooked"]).to match("data-poll-")
       expect(Poll.where(post_id: json["id"]).count).to eq(2)
     end
@@ -297,7 +297,7 @@ describe PostsController do
       }, format: :json
 
       expect(response).not_to be_successful
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("poll.multiple_polls_without_name"))
     end
 
@@ -307,7 +307,7 @@ describe PostsController do
       }, format: :json
 
       expect(response).not_to be_successful
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("poll.multiple_polls_with_same_name", name: "foo"))
     end
 
@@ -326,7 +326,7 @@ describe PostsController do
       }, format: :json
 
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["cooked"]).to eq("<p>[poll]</p>\n<ul>\n<li>A</li>\n<li>B<br>\n[/poll]</li>\n</ul>")
     end
   end
@@ -344,7 +344,7 @@ describe PostsController do
       }, format: :json
 
       expect(response).not_to be_successful
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"][0]).to eq(I18n.t("poll.insufficient_rights_to_create"))
     end
 
@@ -362,7 +362,7 @@ describe PostsController do
         topic_id: topic.id, raw: "[poll]\n- A\n- B\n[/poll]"
       }, format: :json
 
-      expect(::JSON.parse(response.body)["errors"]).to eq(nil)
+      expect(response.parsed_body["errors"]).to eq(nil)
     end
   end
 
@@ -379,7 +379,7 @@ describe PostsController do
       }, format: :json
 
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["cooked"]).to match("data-poll-")
       expect(Poll.exists?(post_id: json["id"])).to eq(true)
     end
@@ -398,7 +398,7 @@ describe PostsController do
       }, format: :json
 
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["cooked"]).to match("data-poll-")
       expect(Poll.exists?(post_id: json["id"])).to eq(true)
     end
@@ -417,7 +417,7 @@ describe PostsController do
       }, format: :json
 
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["cooked"]).to match("data-poll-")
       expect(Poll.exists?(post_id: json["id"])).to eq(true)
     end
diff --git a/plugins/poll/spec/integration/poll_endpoints_spec.rb b/plugins/poll/spec/integration/poll_endpoints_spec.rb
index 868e003326..21ed171f97 100644
--- a/plugins/poll/spec/integration/poll_endpoints_spec.rb
+++ b/plugins/poll/spec/integration/poll_endpoints_spec.rb
@@ -24,7 +24,7 @@ describe "DiscoursePoll endpoints" do
 
       expect(response.status).to eq(200)
 
-      poll = JSON.parse(response.body)["voters"]
+      poll = response.parsed_body["voters"]
       option = poll[option_a]
 
       expect(option.length).to eq(1)
@@ -48,7 +48,7 @@ describe "DiscoursePoll endpoints" do
 
       expect(response.status).to eq(200)
 
-      poll = JSON.parse(response.body)["voters"]
+      poll = response.parsed_body["voters"]
 
       expect(poll[option_a]).to eq(nil)
 
@@ -112,7 +112,7 @@ describe "DiscoursePoll endpoints" do
 
         expect(response.status).to eq(200)
 
-        poll = JSON.parse(response.body)["voters"]
+        poll = response.parsed_body["voters"]
 
         expect(poll.first["id"]).to eq(user.id)
         expect(poll.first["username"]).to eq(user.username)
@@ -165,7 +165,7 @@ describe "DiscoursePoll endpoints" do
       }
 
       expect(response.status).to eq(200)
-      expect(JSON.parse(response.body).deep_symbolize_keys).to eq(
+      expect(response.parsed_body.deep_symbolize_keys).to eq(
         grouped_results: [
           { group: "Value0", options: [{ digest: option_a, html: "A", votes: 1 }, { digest: option_b, html: "B", votes: 0 }] },
           { group: "Value1", options: [{ digest: option_a, html: "A", votes: 2 }, { digest: option_b, html: "B", votes: 1 }] },
diff --git a/spec/integration/invite_only_registration_spec.rb b/spec/integration/invite_only_registration_spec.rb
index 5f19efb60f..811ad4ed93 100644
--- a/spec/integration/invite_only_registration_spec.rb
+++ b/spec/integration/invite_only_registration_spec.rb
@@ -24,7 +24,7 @@ describe 'invite only' do
         HTTP_API_USERNAME: admin.username
       }
 
-      user_id = JSON.parse(response.body)["user_id"]
+      user_id = response.parsed_body["user_id"]
       expect(user_id).to be > 0
 
       # activate and approve
diff --git a/spec/integration/rate_limiting_spec.rb b/spec/integration/rate_limiting_spec.rb
index 9a41f9120f..a623d7aa22 100644
--- a/spec/integration/rate_limiting_spec.rb
+++ b/spec/integration/rate_limiting_spec.rb
@@ -74,7 +74,7 @@ describe 'rate limiter integration' do
 
     expect(response.status).to eq(429)
 
-    data = JSON.parse(response.body)
+    data = response.parsed_body
 
     expect(response.headers['Retry-After']).to eq(60)
     expect(data["extras"]["wait_seconds"]).to eq(60)
diff --git a/spec/requests/admin/api_controller_spec.rb b/spec/requests/admin/api_controller_spec.rb
index 9c48d74732..029801dbcf 100644
--- a/spec/requests/admin/api_controller_spec.rb
+++ b/spec/requests/admin/api_controller_spec.rb
@@ -22,7 +22,7 @@ describe Admin::ApiController do
       it "succeeds" do
         get "/admin/api/keys.json"
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)["keys"].length).to eq(2)
+        expect(response.parsed_body["keys"].length).to eq(2)
       end
     end
 
@@ -30,7 +30,7 @@ describe Admin::ApiController do
       it "succeeds" do
         get "/admin/api/keys/#{key1.id}.json"
         expect(response.status).to eq(200)
-        data = JSON.parse(response.body)["key"]
+        data = response.parsed_body["key"]
         expect(data["id"]).to eq(key1.id)
         expect(data["key"]).to eq(nil)
         expect(data["truncated_key"]).to eq(key1.key[0..3])
@@ -92,7 +92,7 @@ describe Admin::ApiController do
         }
         expect(response.status).to eq(200)
 
-        data = JSON.parse(response.body)
+        data = response.parsed_body
 
         expect(data['key']['description']).to eq("master key description")
         expect(data['key']['user']).to eq(nil)
@@ -117,7 +117,7 @@ describe Admin::ApiController do
         }
         expect(response.status).to eq(200)
 
-        data = JSON.parse(response.body)
+        data = response.parsed_body
 
         expect(data['key']['description']).to eq("restricted key description")
         expect(data['key']['user']['username']).to eq(user.username)
diff --git a/spec/requests/admin/backups_controller_spec.rb b/spec/requests/admin/backups_controller_spec.rb
index 406898e028..466d4a938b 100644
--- a/spec/requests/admin/backups_controller_spec.rb
+++ b/spec/requests/admin/backups_controller_spec.rb
@@ -67,7 +67,7 @@ RSpec.describe Admin::BackupsController do
           get "/admin/backups.json"
           expect(response.status).to eq(200)
 
-          filenames = JSON.parse(response.body).map { |backup| backup["filename"] }
+          filenames = response.parsed_body.map { |backup| backup["filename"] }
           expect(filenames).to include(backup_filename)
           expect(filenames).to include(backup_filename2)
         end
diff --git a/spec/requests/admin/badges_controller_spec.rb b/spec/requests/admin/badges_controller_spec.rb
index f54875a21a..185143e4f9 100644
--- a/spec/requests/admin/badges_controller_spec.rb
+++ b/spec/requests/admin/badges_controller_spec.rb
@@ -27,7 +27,7 @@ describe Admin::BadgesController do
         }
 
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)["grant_count"]).to be > 0
+        expect(response.parsed_body["grant_count"]).to be > 0
       end
 
       it 'does not allow anything if enable_badge_sql is disabled' do
@@ -49,7 +49,7 @@ describe Admin::BadgesController do
           name: 'test', query: 'select 1 as user_id, null as granted_at', badge_type_id: 1
         }
 
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(response.status).to eq(200)
         expect(json["badge"]["name"]).to eq('test')
         expect(json["badge"]["query"]).to eq('select 1 as user_id, null as granted_at')
@@ -76,7 +76,7 @@ describe Admin::BadgesController do
 
         expect(groupings2.map { |g| g.name }).to eq(names)
         expect((groupings.map(&:id) - groupings2.map { |g| g.id }).compact).to be_blank
-        expect(::JSON.parse(response.body)["badge_groupings"].length).to eq(groupings2.length)
+        expect(response.parsed_body["badge_groupings"].length).to eq(groupings2.length)
       end
     end
 
@@ -85,7 +85,7 @@ describe Admin::BadgesController do
         get "/admin/badges/types.json"
 
         expect(response.status).to eq(200)
-        expect(::JSON.parse(response.body)["badge_types"]).to be_present
+        expect(response.parsed_body["badge_types"]).to be_present
       end
     end
 
diff --git a/spec/requests/admin/color_schemes_controller_spec.rb b/spec/requests/admin/color_schemes_controller_spec.rb
index 8cf4e20fc1..782d9ee5c2 100644
--- a/spec/requests/admin/color_schemes_controller_spec.rb
+++ b/spec/requests/admin/color_schemes_controller_spec.rb
@@ -28,7 +28,7 @@ describe Admin::ColorSchemesController do
         get "/admin/color_schemes.json"
 
         expect(response.status).to eq(200)
-        schemes = JSON.parse(response.body).map { |scheme| scheme["name"] }
+        schemes = response.parsed_body.map { |scheme| scheme["name"] }
         expect(schemes).to include(scheme_name)
       end
     end
@@ -38,7 +38,7 @@ describe Admin::ColorSchemesController do
         post "/admin/color_schemes.json", params: valid_params
 
         expect(response.status).to eq(200)
-        expect(::JSON.parse(response.body)['id']).to be_present
+        expect(response.parsed_body['id']).to be_present
       end
 
       it "returns failure with invalid params" do
@@ -48,7 +48,7 @@ describe Admin::ColorSchemesController do
         post "/admin/color_schemes.json", params: valid_params
 
         expect(response.status).to eq(422)
-        expect(::JSON.parse(response.body)['errors']).to be_present
+        expect(response.parsed_body['errors']).to be_present
       end
     end
 
@@ -77,7 +77,7 @@ describe Admin::ColorSchemesController do
         put "/admin/color_schemes/#{color_scheme.id}.json", params: params
 
         expect(response.status).to eq(422)
-        expect(::JSON.parse(response.body)['errors']).to be_present
+        expect(response.parsed_body['errors']).to be_present
       end
     end
 
diff --git a/spec/requests/admin/dashboard_controller_spec.rb b/spec/requests/admin/dashboard_controller_spec.rb
index 22b5a36829..46602ae91d 100644
--- a/spec/requests/admin/dashboard_controller_spec.rb
+++ b/spec/requests/admin/dashboard_controller_spec.rb
@@ -29,7 +29,7 @@ describe Admin::DashboardController do
           get "/admin/dashboard.json"
 
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)['version_check']).to be_present
+          expect(response.parsed_body['version_check']).to be_present
         end
       end
 
@@ -41,7 +41,7 @@ describe Admin::DashboardController do
         it 'does not return discourse version info' do
           get "/admin/dashboard.json"
           expect(response.status).to eq(200)
-          json = JSON.parse(response.body)
+          json = response.parsed_body
           expect(json['version_check']).not_to be_present
         end
       end
@@ -57,7 +57,7 @@ describe Admin::DashboardController do
           get "/admin/dashboard/problems.json"
 
           expect(response.status).to eq(200)
-          json = JSON.parse(response.body)
+          json = response.parsed_body
           expect(json['problems'].size).to eq(0)
         end
       end
@@ -70,7 +70,7 @@ describe Admin::DashboardController do
         it 'returns an array of strings' do
           get "/admin/dashboard/problems.json"
           expect(response.status).to eq(200)
-          json = JSON.parse(response.body)
+          json = response.parsed_body
           expect(json['problems'].size).to eq(2)
           expect(json['problems'][0]).to be_a(String)
           expect(json['problems'][1]).to be_a(String)
diff --git a/spec/requests/admin/email_controller_spec.rb b/spec/requests/admin/email_controller_spec.rb
index eb632bcbe1..eb6d23fd06 100644
--- a/spec/requests/admin/email_controller_spec.rb
+++ b/spec/requests/admin/email_controller_spec.rb
@@ -26,7 +26,7 @@ describe Admin::EmailController do
 
     it 'does not include the password in the response' do
       get "/admin/email.json"
-      mail_settings = JSON.parse(response.body)['settings']
+      mail_settings = response.parsed_body['settings']
 
       expect(
         mail_settings.select { |setting| setting['name'] == 'password' }
@@ -47,7 +47,7 @@ describe Admin::EmailController do
       get "/admin/email/sent.json"
 
       expect(response.status).to eq(200)
-      log = JSON.parse(response.body).first
+      log = response.parsed_body.first
       expect(log["id"]).to eq(email_log.id)
       expect(log["reply_key"]).to eq(nil)
 
@@ -56,7 +56,7 @@ describe Admin::EmailController do
       get "/admin/email/sent.json"
 
       expect(response.status).to eq(200)
-      log = JSON.parse(response.body).first
+      log = response.parsed_body.first
       expect(log["id"]).to eq(email_log.id)
       expect(log["reply_key"]).to eq(post_reply_key.reply_key)
     end
@@ -80,7 +80,7 @@ describe Admin::EmailController do
 
         expect(response.status).to eq(200)
 
-        logs = JSON.parse(response.body)
+        logs = response.parsed_body
 
         expect(logs.size).to eq(1)
         expect(logs.first["reply_key"]).to eq(post_reply_key_2.reply_key)
@@ -98,7 +98,7 @@ describe Admin::EmailController do
 
       expect(response.status).to eq(200)
 
-      logs = JSON.parse(response.body)
+      logs = response.parsed_body
 
       expect(logs.first["id"]).to eq(log2.id)
       expect(logs.last["id"]).to eq(log1.id)
@@ -112,7 +112,7 @@ describe Admin::EmailController do
 
         expect(response.status).to eq(200)
 
-        logs = JSON.parse(response.body)
+        logs = response.parsed_body
 
         expect(logs.count).to eq(1)
         expect(logs.first["id"]).to eq(log1.id)
@@ -147,7 +147,7 @@ describe Admin::EmailController do
           admin.email
         )
 
-        incoming = JSON.parse(response.body)
+        incoming = response.parsed_body
         expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test"))
       end
 
@@ -160,7 +160,7 @@ describe Admin::EmailController do
           eviltrout.email
         )
 
-        incoming = JSON.parse(response.body)
+        incoming = response.parsed_body
         expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test"))
       end
 
@@ -173,7 +173,7 @@ describe Admin::EmailController do
           eviltrout.email
         )
 
-        incoming = JSON.parse(response.body)
+        incoming = response.parsed_body
         expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test"))
       end
     end
@@ -214,7 +214,7 @@ describe Admin::EmailController do
       Fabricate(:incoming_email, error: "")
       get "/admin/email/rejected.json"
       expect(response.status).to eq(200)
-      rejected = JSON.parse(response.body)
+      rejected = response.parsed_body
       expect(rejected.first['error']).to eq(I18n.t("emails.incoming.unrecognized_error"))
     end
   end
@@ -224,7 +224,7 @@ describe Admin::EmailController do
       incoming_email = Fabricate(:incoming_email, error: "")
       get "/admin/email/incoming/#{incoming_email.id}.json"
       expect(response.status).to eq(200)
-      incoming = JSON.parse(response.body)
+      incoming = response.parsed_body
       expect(incoming['error']).to eq(I18n.t("emails.incoming.unrecognized_error"))
     end
   end
@@ -234,7 +234,7 @@ describe Admin::EmailController do
       get "/admin/email/incoming_from_bounced/12345.json"
       expect(response.status).to eq(404)
 
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"]).to include("Discourse::InvalidParameters")
     end
 
@@ -242,7 +242,7 @@ describe Admin::EmailController do
       get "/admin/email/incoming_from_bounced/#{email_log.id}.json"
       expect(response.status).to eq(404)
 
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["errors"]).to include("Discourse::InvalidParameters")
     end
 
@@ -262,7 +262,7 @@ describe Admin::EmailController do
         get "/admin/email/incoming_from_bounced/#{email_log.id}.json"
         expect(response.status).to eq(200)
 
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["error"]).to eq(error_message)
       end
 
@@ -276,7 +276,7 @@ describe Admin::EmailController do
         get "/admin/email/incoming_from_bounced/#{email_log.id}.json"
         expect(response.status).to eq(200)
 
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["error"]).to eq(error_message)
       end
 
@@ -286,7 +286,7 @@ describe Admin::EmailController do
         get "/admin/email/incoming_from_bounced/#{email_log.id}.json"
         expect(response.status).to eq(404)
 
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["errors"]).to include("Discourse::InvalidParameters")
       end
 
@@ -294,7 +294,7 @@ describe Admin::EmailController do
         get "/admin/email/incoming_from_bounced/#{email_log.id}.json"
         expect(response.status).to eq(404)
 
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["errors"]).to include("Discourse::NotFound")
       end
     end
@@ -317,7 +317,7 @@ describe Admin::EmailController do
       EMAIL
       post "/admin/email/advanced-test.json", params: { email: email }
       expect(response.status).to eq(200)
-      incoming = JSON.parse(response.body)
+      incoming = response.parsed_body
       expect(incoming['format']).to eq(1)
       expect(incoming['text']).to eq("Hello, this is a test!")
       expect(incoming['elided']).to eq("---\n\nThis part should be elided.")
diff --git a/spec/requests/admin/email_styles_controller_spec.rb b/spec/requests/admin/email_styles_controller_spec.rb
index 9d1f297e7e..0884503dc6 100644
--- a/spec/requests/admin/email_styles_controller_spec.rb
+++ b/spec/requests/admin/email_styles_controller_spec.rb
@@ -21,7 +21,7 @@ describe Admin::EmailStylesController do
       get '/admin/customize/email_style.json'
       expect(response.status).to eq(200)
 
-      json = ::JSON.parse(response.body)['email_style']
+      json = response.parsed_body['email_style']
       expect(json['html']).to eq(default_html)
       expect(json['css']).to eq(default_css)
     end
@@ -32,7 +32,7 @@ describe Admin::EmailStylesController do
       get '/admin/customize/email_style.json'
       expect(response.status).to eq(200)
 
-      json = ::JSON.parse(response.body)['email_style']
+      json = response.parsed_body['email_style']
       expect(json['html']).to eq("For you: %{email_content}")
       expect(json['css']).to eq(".user-name { font-size: 24px; }")
     end
@@ -59,7 +59,7 @@ describe Admin::EmailStylesController do
         email_style: valid_params.merge(html: 'No email content')
       }
       expect(response.status).to eq(422)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json['errors']).to include(
         I18n.t(
           'email_style.html_missing_placeholder',
diff --git a/spec/requests/admin/email_templates_controller_spec.rb b/spec/requests/admin/email_templates_controller_spec.rb
index 9b98d4880a..1de916a36f 100644
--- a/spec/requests/admin/email_templates_controller_spec.rb
+++ b/spec/requests/admin/email_templates_controller_spec.rb
@@ -37,7 +37,7 @@ RSpec.describe Admin::EmailTemplatesController do
 
       expect(response.status).to eq(200)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json['email_templates']).to be_present
     end
 
@@ -51,7 +51,7 @@ RSpec.describe Admin::EmailTemplatesController do
 
       get '/admin/customize/email_templates.json'
       expect(response.status).to eq(200)
-      templates = JSON.parse(response.body)['email_templates']
+      templates = response.parsed_body['email_templates']
       template = templates.find { |t| t['id'] == 'user_notifications.admin_login' }
       expect(template['can_revert']).to eq(true)
 
@@ -59,7 +59,7 @@ RSpec.describe Admin::EmailTemplatesController do
 
       get '/admin/customize/email_templates.json'
       expect(response.status).to eq(200)
-      templates = JSON.parse(response.body)['email_templates']
+      templates = response.parsed_body['email_templates']
       template = templates.find { |t| t['id'] == 'user_notifications.admin_login' }
       expect(template['can_revert']).to eq(false)
     end
@@ -93,7 +93,7 @@ RSpec.describe Admin::EmailTemplatesController do
 
         expect(response).not_to be_successful
 
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['error_type']).to eq('not_found')
       end
 
@@ -103,7 +103,7 @@ RSpec.describe Admin::EmailTemplatesController do
             email_template: { subject: email_subject, body: email_body }
           }, headers: headers
 
-          json = ::JSON.parse(response.body)
+          json = response.parsed_body
           expect(json).to be_present
 
           errors = json['errors']
@@ -196,7 +196,7 @@ RSpec.describe Admin::EmailTemplatesController do
 
           expect(response.status).to eq(200)
 
-          json = ::JSON.parse(response.body)
+          json = response.parsed_body
           expect(json).to be_present
 
           template = json['email_template']
@@ -279,7 +279,7 @@ RSpec.describe Admin::EmailTemplatesController do
         delete '/admin/customize/email_templates/non_existent_template', headers: headers
         expect(response).not_to be_successful
 
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['error_type']).to eq('not_found')
       end
 
@@ -307,7 +307,7 @@ RSpec.describe Admin::EmailTemplatesController do
           delete '/admin/customize/email_templates/user_notifications.admin_login', headers: headers
           expect(response.status).to eq(200)
 
-          json = ::JSON.parse(response.body)
+          json = response.parsed_body
           expect(json).to be_present
 
           template = json['email_template']
diff --git a/spec/requests/admin/emojis_controller_spec.rb b/spec/requests/admin/emojis_controller_spec.rb
index 5ab52b3447..39078a2fc4 100644
--- a/spec/requests/admin/emojis_controller_spec.rb
+++ b/spec/requests/admin/emojis_controller_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe Admin::EmojisController do
       get "/admin/customize/emojis.json"
       expect(response.status).to eq(200)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json[0]["name"]).to eq("osama-test-emoji")
       expect(json[0]["url"]).to eq(upload.url)
     end
@@ -34,7 +34,7 @@ RSpec.describe Admin::EmojisController do
         }
 
         expect(response.status).to eq(422)
-        parsed = JSON.parse(response.body)
+        parsed = response.parsed_body
         expect(parsed["errors"]).to eq([I18n.t('upload.images.size_not_found')])
       end
     end
@@ -49,7 +49,7 @@ RSpec.describe Admin::EmojisController do
         }
 
         expect(response.status).to eq(422)
-        parsed = JSON.parse(response.body)
+        parsed = response.parsed_body
         expect(parsed["errors"]).to eq([
           "Name #{I18n.t('activerecord.errors.models.custom_emoji.attributes.name.taken')}"
         ])
@@ -69,7 +69,7 @@ RSpec.describe Admin::EmojisController do
 
       expect(upload.original_filename).to eq('logo.png')
 
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(response.status).to eq(200)
       expect(data["errors"]).to eq(nil)
       expect(data["name"]).to eq(custom_emoji.name)
@@ -88,7 +88,7 @@ RSpec.describe Admin::EmojisController do
 
       custom_emoji = CustomEmoji.last
 
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(response.status).to eq(200)
       expect(custom_emoji.group).to eq("foo")
     end
diff --git a/spec/requests/admin/groups_controller_spec.rb b/spec/requests/admin/groups_controller_spec.rb
index 7ddc1562fe..1b0f1fd297 100644
--- a/spec/requests/admin/groups_controller_spec.rb
+++ b/spec/requests/admin/groups_controller_spec.rb
@@ -88,7 +88,7 @@ RSpec.describe Admin::GroupsController do
 
       expect(response.status).to eq(200)
 
-      response_body = JSON.parse(response.body)
+      response_body = response.parsed_body
 
       expect(response_body["usernames"]).to contain_exactly(user.username, admin.username)
 
@@ -190,7 +190,7 @@ RSpec.describe Admin::GroupsController do
       expect(user2.title).to eq("WAT")
       expect(user2.trust_level).to eq(4)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json['message']).to eq("2 users have been added to the group.")
       expect(json['users_not_added'][0]).to eq("doesnt_exist")
     end
diff --git a/spec/requests/admin/permalinks_controller_spec.rb b/spec/requests/admin/permalinks_controller_spec.rb
index 80df731909..a84a0b2935 100644
--- a/spec/requests/admin/permalinks_controller_spec.rb
+++ b/spec/requests/admin/permalinks_controller_spec.rb
@@ -24,7 +24,7 @@ describe Admin::PermalinksController do
       get "/admin/permalinks.json", params: { filter: "topic" }
 
       expect(response.status).to eq(200)
-      result = JSON.parse(response.body)
+      result = response.parsed_body
       expect(result.length).to eq(2)
     end
 
@@ -37,7 +37,7 @@ describe Admin::PermalinksController do
       get "/admin/permalinks.json", params: { filter: "discourse" }
 
       expect(response.status).to eq(200)
-      result = JSON.parse(response.body)
+      result = response.parsed_body
       expect(result.length).to eq(2)
     end
 
@@ -50,7 +50,7 @@ describe Admin::PermalinksController do
       get "/admin/permalinks.json", params: { filter: "discourse" }
 
       expect(response.status).to eq(200)
-      result = JSON.parse(response.body)
+      result = response.parsed_body
       expect(result.length).to eq(3)
     end
   end
diff --git a/spec/requests/admin/plugins_controller_spec.rb b/spec/requests/admin/plugins_controller_spec.rb
index 75b1b5f21e..463fb321b7 100644
--- a/spec/requests/admin/plugins_controller_spec.rb
+++ b/spec/requests/admin/plugins_controller_spec.rb
@@ -16,7 +16,7 @@ describe Admin::PluginsController do
     it 'should return JSON' do
       get "/admin/plugins.json"
       expect(response.status).to eq(200)
-      expect(::JSON.parse(response.body).has_key?('plugins')).to eq(true)
+      expect(response.parsed_body.has_key?('plugins')).to eq(true)
     end
   end
 end
diff --git a/spec/requests/admin/reports_controller_spec.rb b/spec/requests/admin/reports_controller_spec.rb
index 1f3208746e..1138b1be6f 100644
--- a/spec/requests/admin/reports_controller_spec.rb
+++ b/spec/requests/admin/reports_controller_spec.rb
@@ -27,7 +27,7 @@ describe Admin::ReportsController do
           }
 
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)["reports"].count).to eq(2)
+          expect(response.parsed_body["reports"].count).to eq(2)
         end
       end
 
@@ -42,9 +42,9 @@ describe Admin::ReportsController do
             }
 
             expect(response.status).to eq(200)
-            expect(JSON.parse(response.body)["reports"].count).to eq(2)
-            expect(JSON.parse(response.body)["reports"][0]["type"]).to eq("topics")
-            expect(JSON.parse(response.body)["reports"][1]["type"]).to eq("not_found")
+            expect(response.parsed_body["reports"].count).to eq(2)
+            expect(response.parsed_body["reports"][0]["type"]).to eq("topics")
+            expect(response.parsed_body["reports"][1]["type"]).to eq("not_found")
           end
         end
 
@@ -92,7 +92,7 @@ describe Admin::ReportsController do
             get "/admin/reports/topics.json"
 
             expect(response.status).to eq(200)
-            expect(JSON.parse(response.body)["report"]["total"]).to eq(1)
+            expect(response.parsed_body["report"]["total"]).to eq(1)
           end
         end
       end
@@ -107,7 +107,7 @@ describe Admin::ReportsController do
 
           expect(response.status).to eq(200)
 
-          report = JSON.parse(response.body)["report"]
+          report = response.parsed_body["report"]
 
           expect(report["type"]).to eq('topics')
           expect(report["data"].count).to eq(1)
@@ -126,7 +126,7 @@ describe Admin::ReportsController do
 
           expect(response.status).to eq(200)
 
-          report = JSON.parse(response.body)["report"]
+          report = response.parsed_body["report"]
 
           expect(report["type"]).to eq('signups')
           expect(report["data"].count).to eq(1)
diff --git a/spec/requests/admin/robots_txt_controller_spec.rb b/spec/requests/admin/robots_txt_controller_spec.rb
index 046914017a..e23e0b8d38 100644
--- a/spec/requests/admin/robots_txt_controller_spec.rb
+++ b/spec/requests/admin/robots_txt_controller_spec.rb
@@ -38,7 +38,7 @@ describe Admin::RobotsTxtController do
     it "returns default content if there are no overrides" do
       get "/admin/customize/robots.json"
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["robots_txt"]).to be_present
       expect(json["overridden"]).to eq(false)
     end
@@ -47,7 +47,7 @@ describe Admin::RobotsTxtController do
       SiteSetting.overridden_robots_txt = "something"
       get "/admin/customize/robots.json"
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["robots_txt"]).to eq("something")
       expect(json["overridden"]).to eq(true)
     end
@@ -59,7 +59,7 @@ describe Admin::RobotsTxtController do
     it "overrides the site's default robots.txt" do
       put "/admin/customize/robots.json", params: { robots_txt: "new_content" }
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["robots_txt"]).to eq("new_content")
       expect(json["overridden"]).to eq(true)
       expect(SiteSetting.overridden_robots_txt).to eq("new_content")
@@ -82,7 +82,7 @@ describe Admin::RobotsTxtController do
       SiteSetting.overridden_robots_txt = "overridden_content"
       delete "/admin/customize/robots.json"
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["robots_txt"]).not_to include("overridden_content")
       expect(json["overridden"]).to eq(false)
       expect(SiteSetting.overridden_robots_txt).to eq("")
diff --git a/spec/requests/admin/screened_emails_controller_spec.rb b/spec/requests/admin/screened_emails_controller_spec.rb
index e1e3b41ebb..50ae5a22e0 100644
--- a/spec/requests/admin/screened_emails_controller_spec.rb
+++ b/spec/requests/admin/screened_emails_controller_spec.rb
@@ -16,7 +16,7 @@ describe Admin::ScreenedEmailsController do
       Fabricate(:screened_email)
       get "/admin/logs/screened_emails.json"
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json.size).to eq(1)
     end
   end
diff --git a/spec/requests/admin/screened_ip_addresses_controller_spec.rb b/spec/requests/admin/screened_ip_addresses_controller_spec.rb
index 8bfd1b8d1f..c4ae9927ef 100644
--- a/spec/requests/admin/screened_ip_addresses_controller_spec.rb
+++ b/spec/requests/admin/screened_ip_addresses_controller_spec.rb
@@ -24,13 +24,13 @@ describe Admin::ScreenedIpAddressesController do
       get "/admin/logs/screened_ip_addresses.json", params: { filter: "1.2.*" }
 
       expect(response.status).to eq(200)
-      result = JSON.parse(response.body)
+      result = response.parsed_body
       expect(result.length).to eq(3)
 
       get "/admin/logs/screened_ip_addresses.json", params: { filter: "4.5.6.7" }
 
       expect(response.status).to eq(200)
-      result = JSON.parse(response.body)
+      result = response.parsed_body
       expect(result.length).to eq(1)
     end
   end
diff --git a/spec/requests/admin/screened_urls_controller_spec.rb b/spec/requests/admin/screened_urls_controller_spec.rb
index 32af969c6f..55027ec6bb 100644
--- a/spec/requests/admin/screened_urls_controller_spec.rb
+++ b/spec/requests/admin/screened_urls_controller_spec.rb
@@ -16,7 +16,7 @@ describe Admin::ScreenedUrlsController do
       Fabricate(:screened_url)
       get "/admin/logs/screened_urls.json"
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json.size).to eq(1)
     end
   end
diff --git a/spec/requests/admin/search_logs_spec.rb b/spec/requests/admin/search_logs_spec.rb
index bca3d030aa..6ac294380e 100644
--- a/spec/requests/admin/search_logs_spec.rb
+++ b/spec/requests/admin/search_logs_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Admin::SearchLogsController do
 
       expect(response.status).to eq(200)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json[0]['term']).to eq('ruby')
       expect(json[0]['searches']).to eq(1)
       expect(json[0]['ctr']).to eq(0)
@@ -67,7 +67,7 @@ RSpec.describe Admin::SearchLogsController do
 
       expect(response.status).to eq(200)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json['term']['type']).to eq('search_log_term')
       expect(json['term']['search_result']).to be_present
     end
diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rb
index 5dc564e701..7962ab295d 100644
--- a/spec/requests/admin/site_settings_controller_spec.rb
+++ b/spec/requests/admin/site_settings_controller_spec.rb
@@ -19,7 +19,7 @@ describe Admin::SiteSettingsController do
       it 'returns valid info' do
         get "/admin/site_settings.json"
         expect(response.status).to eq(200)
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["site_settings"].length).to be > 100
 
         locale = json["site_settings"].select do |s|
@@ -183,7 +183,7 @@ describe Admin::SiteSettingsController do
             default_categories_watching: category_id
           }
 
-          expect(JSON.parse(response.body)["user_count"]).to eq(User.count)
+          expect(response.parsed_body["user_count"]).to eq(User.count)
 
           CategoryUser.create!(category_id: category_id, notification_level: tracking, user: user)
 
@@ -191,7 +191,7 @@ describe Admin::SiteSettingsController do
             default_categories_watching: category_id
           }
 
-          expect(JSON.parse(response.body)["user_count"]).to eq(User.count - 1)
+          expect(response.parsed_body["user_count"]).to eq(User.count - 1)
 
           SiteSetting.setting(:default_categories_watching, "")
         end
@@ -203,7 +203,7 @@ describe Admin::SiteSettingsController do
             default_tags_watching: tag.name
           }
 
-          expect(JSON.parse(response.body)["user_count"]).to eq(User.count)
+          expect(response.parsed_body["user_count"]).to eq(User.count)
 
           TagUser.create!(tag_id: tag.id, notification_level: tracking, user: user)
 
@@ -211,7 +211,7 @@ describe Admin::SiteSettingsController do
             default_tags_watching: tag.name
           }
 
-          expect(JSON.parse(response.body)["user_count"]).to eq(User.count - 1)
+          expect(response.parsed_body["user_count"]).to eq(User.count - 1)
 
           SiteSetting.setting(:default_tags_watching, "")
         end
diff --git a/spec/requests/admin/site_texts_controller_spec.rb b/spec/requests/admin/site_texts_controller_spec.rb
index 6606b4446f..aea6653e36 100644
--- a/spec/requests/admin/site_texts_controller_spec.rb
+++ b/spec/requests/admin/site_texts_controller_spec.rb
@@ -48,35 +48,35 @@ RSpec.describe Admin::SiteTextsController do
       it 'returns json' do
         get "/admin/customize/site_texts.json", params: { q: 'title' }
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)['site_texts']).to include(include("id" => "title"))
+        expect(response.parsed_body['site_texts']).to include(include("id" => "title"))
       end
 
       it 'sets has_more to true if more than 50 results were found' do
         get "/admin/customize/site_texts.json", params: { q: 'e' }
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)['site_texts'].size).to eq(50)
-        expect(JSON.parse(response.body)['extras']['has_more']).to be_truthy
+        expect(response.parsed_body['site_texts'].size).to eq(50)
+        expect(response.parsed_body['extras']['has_more']).to be_truthy
       end
 
       it 'works with pages' do
         texts = Set.new
 
         get "/admin/customize/site_texts.json", params: { q: 'e' }
-        JSON.parse(response.body)['site_texts'].each { |text| texts << text['id'] }
+        response.parsed_body['site_texts'].each { |text| texts << text['id'] }
         expect(texts.size).to eq(50)
 
         get "/admin/customize/site_texts.json", params: { q: 'e', page: 1 }
-        JSON.parse(response.body)['site_texts'].each { |text| texts << text['id'] }
+        response.parsed_body['site_texts'].each { |text| texts << text['id'] }
         expect(texts.size).to eq(100)
       end
 
       it 'works with locales' do
         get "/admin/customize/site_texts.json", params: { q: 'yes_value', locale: 'en' }
-        value = JSON.parse(response.body)['site_texts'].find { |text| text['id'] == 'js.yes_value' }['value']
+        value = response.parsed_body['site_texts'].find { |text| text['id'] == 'js.yes_value' }['value']
         expect(value).to eq(I18n.with_locale(:en) { I18n.t('js.yes_value') })
 
         get "/admin/customize/site_texts.json", params: { q: 'yes_value', locale: 'de' }
-        value = JSON.parse(response.body)['site_texts'].find { |text| text['id'] == 'js.yes_value' }['value']
+        value = response.parsed_body['site_texts'].find { |text| text['id'] == 'js.yes_value' }['value']
         expect(value).to eq(I18n.with_locale(:de) { I18n.t('js.yes_value') })
       end
 
@@ -99,7 +99,7 @@ RSpec.describe Admin::SiteTextsController do
         ].each do |search_term|
           get "/admin/customize/site_texts.json", params: { q: search_term }
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)['site_texts']).to include(include("id" => "title", "value" => value))
+          expect(response.parsed_body['site_texts']).to include(include("id" => "title", "value" => value))
         end
       end
 
@@ -114,7 +114,7 @@ RSpec.describe Admin::SiteTextsController do
         ].each do |search_term|
           get "/admin/customize/site_texts.json", params: { q: search_term }
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)['site_texts']).to include(include("id" => "embed.loading", "value" => value))
+          expect(response.parsed_body['site_texts']).to include(include("id" => "embed.loading", "value" => value))
         end
       end
 
@@ -125,11 +125,11 @@ RSpec.describe Admin::SiteTextsController do
 
         get "/admin/customize/site_texts.json", params: { q: 'missing_plural_key' }
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)['site_texts']).to be_empty
+        expect(response.parsed_body['site_texts']).to be_empty
 
         get "/admin/customize/site_texts.json", params: { q: 'another_missing_key' }
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)['site_texts']).to be_empty
+        expect(response.parsed_body['site_texts']).to be_empty
       end
 
       context 'plural keys' do
@@ -205,7 +205,7 @@ RSpec.describe Admin::SiteTextsController do
         get "/admin/customize/site_texts/js.topic.list.json"
         expect(response.status).to eq(200)
 
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
 
         site_text = json['site_text']
 
@@ -217,7 +217,7 @@ RSpec.describe Admin::SiteTextsController do
         get "/admin/customize/site_texts/js.emoji_picker.food_&_drink.json"
         expect(response.status).to eq(200)
 
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
 
         site_text = json['site_text']
 
@@ -239,14 +239,14 @@ RSpec.describe Admin::SiteTextsController do
 
         get "/admin/customize/site_texts/#{key}.json"
         expect(response.status).to eq(200)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['site_text']['overridden']).to eq(true)
 
         TranslationOverride.destroy_all
 
         get "/admin/customize/site_texts/#{key}.json"
         expect(response.status).to eq(200)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['site_text']['overridden']).to eq(false)
       end
 
@@ -265,7 +265,7 @@ RSpec.describe Admin::SiteTextsController do
               get "/admin/customize/site_texts/#{id}.json"
               expect(response.status).to eq(200)
 
-              json = ::JSON.parse(response.body)
+              json = response.parsed_body
               expect(json).to be_present
 
               site_text = json['site_text']
@@ -312,7 +312,7 @@ RSpec.describe Admin::SiteTextsController do
 
         expect(response.status).to eq(404)
 
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['error_type']).to eq('not_found')
       end
 
@@ -323,7 +323,7 @@ RSpec.describe Admin::SiteTextsController do
 
         expect(response.status).to eq(200)
 
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         site_text = json['site_text']
 
         expect(site_text['id']).to eq('js.emoji_picker.animals_&_nature')
@@ -337,7 +337,7 @@ RSpec.describe Admin::SiteTextsController do
 
         expect(response.status).to eq(403)
 
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['error_type']).to eq('invalid_access')
         expect(json['errors'].size).to eq(1)
         expect(json['errors'].first).to eq(I18n.t('email_template_cant_be_modified'))
@@ -352,7 +352,7 @@ RSpec.describe Admin::SiteTextsController do
 
         expect(response.status).to eq(422)
 
-        body = JSON.parse(response.body)
+        body = response.parsed_body
 
         expect(body['message']).to eq(I18n.t(
           'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
@@ -390,7 +390,7 @@ RSpec.describe Admin::SiteTextsController do
         put "/admin/customize/site_texts/title.json", params: { site_text: { value: 'hello' } }
         expect(response.status).to eq(200)
 
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
 
         site_text = json['site_text']
 
@@ -401,7 +401,7 @@ RSpec.describe Admin::SiteTextsController do
         delete "/admin/customize/site_texts/title.json"
         expect(response.status).to eq(200)
 
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
 
         site_text = json['site_text']
 
@@ -422,24 +422,24 @@ RSpec.describe Admin::SiteTextsController do
 
         get "/admin/customize/site_texts/title.json"
         expect(response.status).to eq(200)
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['site_text']['value']).to eq(ru_title)
 
         get "/admin/customize/site_texts/js.topic.read_more_MF.json"
         expect(response.status).to eq(200)
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['site_text']['value']).to eq(ru_mf_text)
 
         SiteSetting.default_locale = :en
 
         get "/admin/customize/site_texts/title.json"
         expect(response.status).to eq(200)
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['site_text']['value']).to_not eq(ru_title)
 
         get "/admin/customize/site_texts/js.topic.read_more_MF.json"
         expect(response.status).to eq(200)
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['site_text']['value']).to_not eq(ru_mf_text)
       end
 
diff --git a/spec/requests/admin/staff_action_logs_controller_spec.rb b/spec/requests/admin/staff_action_logs_controller_spec.rb
index 9e639402e4..6d61fba42a 100644
--- a/spec/requests/admin/staff_action_logs_controller_spec.rb
+++ b/spec/requests/admin/staff_action_logs_controller_spec.rb
@@ -20,7 +20,7 @@ describe Admin::StaffActionLogsController do
 
       get "/admin/logs/staff_action_logs.json", params: { action_id: UserHistory.actions[:delete_topic] }
 
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(response.status).to eq(200)
 
       expect(json["staff_action_logs"].length).to eq(1)
@@ -38,14 +38,14 @@ describe Admin::StaffActionLogsController do
 
       get "/admin/logs/staff_action_logs.json", params: { limit: 3 }
 
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(response.status).to eq(200)
       expect(json["staff_action_logs"].length).to eq(3)
       expect(json["staff_action_logs"][0]["new_value"]).to eq("value 4")
 
       get "/admin/logs/staff_action_logs.json", params: { limit: 3, page: 1 }
 
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(response.status).to eq(200)
       expect(json["staff_action_logs"].length).to eq(1)
       expect(json["staff_action_logs"][0]["new_value"]).to eq("value 1")
@@ -59,7 +59,7 @@ describe Admin::StaffActionLogsController do
       it 'Uses the custom_staff id' do
         get "/admin/logs/staff_action_logs.json", params: {}
 
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         action = json['extras']['user_history_actions'].first
 
         expect(action['id']).to eq plugin_extended_action.to_s
@@ -84,7 +84,7 @@ describe Admin::StaffActionLogsController do
       get "/admin/logs/staff_action_logs/#{record.id}/diff.json"
       expect(response.status).to eq(200)
 
-      parsed = JSON.parse(response.body)
+      parsed = response.parsed_body
       expect(parsed["side_by_side"]).to include("up")
       expect(parsed["side_by_side"]).to include("down")
 
diff --git a/spec/requests/admin/themes_controller_spec.rb b/spec/requests/admin/themes_controller_spec.rb
index 65dfbf3dd3..24d8d7712e 100644
--- a/spec/requests/admin/themes_controller_spec.rb
+++ b/spec/requests/admin/themes_controller_spec.rb
@@ -17,7 +17,7 @@ describe Admin::ThemesController do
     it 'can generate key pairs' do
       post "/admin/themes/generate_key_pair.json"
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["private_key"]).to include("RSA PRIVATE KEY")
       expect(json["public_key"]).to include("ssh-rsa ")
     end
@@ -35,12 +35,12 @@ describe Admin::ThemesController do
       upload = Upload.find_by(original_filename: "fake.woff2")
 
       expect(upload.id).not_to be_nil
-      expect(JSON.parse(response.body)["upload_id"]).to eq(upload.id)
+      expect(response.parsed_body["upload_id"]).to eq(upload.id)
     end
 
     context "when trying to upload an existing file" do
       let(:uploaded_file) { Upload.find_by(original_filename: "fake.woff2") }
-      let(:response_json) { JSON.parse(response.body) }
+      let(:response_json) { response.parsed_body }
 
       before do
         post "/admin/themes/upload_asset.json", params: { file: upload }
@@ -77,7 +77,7 @@ describe Admin::ThemesController do
         expect(response.status).to eq(201)
       end.to change { Theme.count }.by (1)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(json["theme"]["name"]).to eq("Awesome Theme")
       expect(json["theme"]["theme_fields"].length).to eq(3)
@@ -110,7 +110,7 @@ describe Admin::ThemesController do
       post "/admin/themes/import.json", params: { theme: theme_json_file }
       expect(response.status).to eq(201)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(json["theme"]["name"]).to eq("Sam's Simple Theme")
       expect(json["theme"]["theme_fields"].length).to eq(2)
@@ -124,7 +124,7 @@ describe Admin::ThemesController do
         post "/admin/themes/import.json", params: { theme: theme_archive }
       end.to change { Theme.count }.by (1)
       expect(response.status).to eq(201)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(json["theme"]["name"]).to eq("Header Icons")
       expect(json["theme"]["theme_fields"].length).to eq(5)
@@ -139,7 +139,7 @@ describe Admin::ThemesController do
         post "/admin/themes/import.json", params: { bundle: theme_archive }
       end.to change { Theme.count }.by (0)
       expect(response.status).to eq(201)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(json["theme"]["name"]).to eq("Header Icons")
       expect(json["theme"]["theme_fields"].length).to eq(5)
@@ -157,7 +157,7 @@ describe Admin::ThemesController do
         end.to change { Theme.count }.by (0)
       end
       expect(response.status).to eq(201)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
 
       # Ensure only one refresh message is sent.
       # More than 1 is wasteful, and can trigger unusual race conditions in the client
@@ -179,7 +179,7 @@ describe Admin::ThemesController do
         post "/admin/themes/import.json", params: { bundle: theme_archive, theme_id: nil }
       end.to change { Theme.count }.by (1)
       expect(response.status).to eq(201)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(json["theme"]["name"]).to eq("Header Icons")
       expect(json["theme"]["id"]).not_to eq(existing_theme.id)
@@ -213,7 +213,7 @@ describe Admin::ThemesController do
 
       expect(response.status).to eq(200)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(json["extras"]["color_schemes"].length).to eq(2)
       theme_json = json["themes"].find { |t| t["id"] == theme.id }
@@ -233,7 +233,7 @@ describe Admin::ThemesController do
 
       expect(response.status).to eq(201)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(json["theme"]["theme_fields"].length).to eq(1)
       expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1)
@@ -293,7 +293,7 @@ describe Admin::ThemesController do
 
       expect(response.status).to eq(200)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
 
       fields = json["theme"]["theme_fields"].sort { |a, b| a["value"] <=> b["value"] }
 
@@ -329,7 +329,7 @@ describe Admin::ThemesController do
 
       # Response correct
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["theme"]["translations"][0]["value"]).to eq("overridenstring")
 
       # Database correct
@@ -347,7 +347,7 @@ describe Admin::ThemesController do
       }
       # Response correct
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["theme"]["translations"][0]["value"]).to eq("defaultstring")
 
       # Database correct
@@ -380,7 +380,7 @@ describe Admin::ThemesController do
         }
       }
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["theme"]["enabled"]).to eq(false)
       expect(UserHistory.where(
         context: child.id.to_s,
@@ -415,7 +415,7 @@ describe Admin::ThemesController do
         }
       }
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(UserHistory.where(
         context: child.id.to_s,
@@ -441,7 +441,7 @@ describe Admin::ThemesController do
         theme: { remote_update: true }
       }
       expect(response.status).to eq(422)
-      expect(JSON.parse(response.body)["errors"].first).to eq("error message")
+      expect(response.parsed_body["errors"].first).to eq("error message")
     end
 
     it 'returns the right error message' do
@@ -452,7 +452,7 @@ describe Admin::ThemesController do
       }
 
       expect(response.status).to eq(400)
-      expect(JSON.parse(response.body)["errors"].first).to include(I18n.t("themes.errors.component_no_default"))
+      expect(response.parsed_body["errors"].first).to include(I18n.t("themes.errors.component_no_default"))
     end
   end
 
@@ -512,7 +512,7 @@ describe Admin::ThemesController do
       }
 
       expect(response.status).to eq(200)
-      expect(JSON.parse(response.body)["bg"]).to eq("green")
+      expect(response.parsed_body["bg"]).to eq("green")
 
       theme.reload
       expect(theme.included_settings[:bg]).to eq("green")
diff --git a/spec/requests/admin/user_fields_controller_spec.rb b/spec/requests/admin/user_fields_controller_spec.rb
index 9bcbd6cc18..672e1f6ede 100644
--- a/spec/requests/admin/user_fields_controller_spec.rb
+++ b/spec/requests/admin/user_fields_controller_spec.rb
@@ -49,7 +49,7 @@ describe Admin::UserFieldsController do
       it "returns a list of user fields" do
         get "/admin/customize/user_fields.json"
         expect(response.status).to eq(200)
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['user_fields']).to be_present
       end
     end
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index 273ff48192..f62407d956 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -19,14 +19,14 @@ RSpec.describe Admin::UsersController do
     it 'returns success with JSON' do
       get "/admin/users/list.json"
       expect(response.status).to eq(200)
-      expect(JSON.parse(response.body)).to be_present
+      expect(response.parsed_body).to be_present
     end
 
     context 'when showing emails' do
       it "returns email for all the users" do
         get "/admin/users/list.json", params: { show_emails: "true" }
         expect(response.status).to eq(200)
-        data = ::JSON.parse(response.body)
+        data = response.parsed_body
         data.each do |user|
           expect(user["email"]).to be_present
         end
@@ -582,7 +582,7 @@ RSpec.describe Admin::UsersController do
       it "returns an api response that the user can't be deleted because it has posts" do
         delete "/admin/users/#{delete_me.id}.json"
         expect(response.status).to eq(403)
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['deleted']).to eq(false)
       end
 
@@ -608,7 +608,7 @@ RSpec.describe Admin::UsersController do
     it "returns success" do
       put "/admin/users/#{reg_user.id}/activate.json"
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json['success']).to eq("OK")
       reg_user.reload
       expect(reg_user.active).to eq(true)
@@ -634,7 +634,7 @@ RSpec.describe Admin::UsersController do
     it "returns success" do
       put "/admin/users/#{reg_user.id}/deactivate.json"
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json['success']).to eq("OK")
       reg_user.reload
       expect(reg_user.active).to eq(false)
@@ -647,7 +647,7 @@ RSpec.describe Admin::UsersController do
     it "returns success" do
       post "/admin/users/#{reg_user.id}/log_out.json"
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json['success']).to eq("OK")
     end
 
@@ -765,7 +765,7 @@ RSpec.describe Admin::UsersController do
 
       get "/admin/users/ip-info.json", params: { ip: ip }
       expect(response.status).to eq(200)
-      expect(JSON.parse(response.body).symbolize_keys).to eq(
+      expect(response.parsed_body.symbolize_keys).to eq(
         city: "London",
         country: "United Kingdom",
         country_code: "GB",
@@ -848,7 +848,7 @@ RSpec.describe Admin::UsersController do
 
       post "/admin/users/sync_sso.json", params: Rack::Utils.parse_query(sso.payload)
       expect(response.status).to eq(403)
-      expect(JSON.parse(response.body)["message"]).to include("Primary email can't be blank")
+      expect(response.parsed_body["message"]).to include("Primary email can't be blank")
     end
 
     it 'should return the right message if the signature is invalid' do
@@ -860,8 +860,8 @@ RSpec.describe Admin::UsersController do
       correct_payload = Rack::Utils.parse_query(sso.payload)
       post "/admin/users/sync_sso.json", params: correct_payload.merge(sig: "someincorrectsignature")
       expect(response.status).to eq(422)
-      expect(JSON.parse(response.body)["message"]).to include(I18n.t('sso.login_error'))
-      expect(JSON.parse(response.body)["message"]).not_to include(correct_payload["sig"])
+      expect(response.parsed_body["message"]).to include(I18n.t('sso.login_error'))
+      expect(response.parsed_body["message"]).not_to include(correct_payload["sig"])
     end
 
     it "returns 404 if the external id does not exist" do
@@ -871,7 +871,7 @@ RSpec.describe Admin::UsersController do
       sso.external_id = ""
       post "/admin/users/sync_sso.json", params: Rack::Utils.parse_query(sso.payload)
       expect(response.status).to eq(422)
-      expect(JSON.parse(response.body)["message"]).to include(I18n.t('sso.blank_id_error'))
+      expect(response.parsed_body["message"]).to include(I18n.t('sso.blank_id_error'))
     end
   end
 
@@ -975,7 +975,7 @@ RSpec.describe Admin::UsersController do
       it 'returns how many posts were deleted' do
         put "/admin/users/#{user.id}/delete_posts_batch.json"
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)["posts_deleted"]).to eq(3)
+        expect(response.parsed_body["posts_deleted"]).to eq(3)
       end
     end
 
@@ -983,7 +983,7 @@ RSpec.describe Admin::UsersController do
       it "returns correct json" do
         put "/admin/users/#{user.id}/delete_posts_batch.json"
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)["posts_deleted"]).to eq(0)
+        expect(response.parsed_body["posts_deleted"]).to eq(0)
       end
     end
   end
diff --git a/spec/requests/admin/versions_controller_spec.rb b/spec/requests/admin/versions_controller_spec.rb
index 8922c99585..2057f3700a 100644
--- a/spec/requests/admin/versions_controller_spec.rb
+++ b/spec/requests/admin/versions_controller_spec.rb
@@ -25,13 +25,13 @@ describe Admin::VersionsController do
       it 'should return the currently available version' do
         get "/admin/version_check.json"
         expect(response.status).to eq(200)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['latest_version']).to eq('1.2.33')
       end
 
       it "should return the installed version" do
         get "/admin/version_check.json"
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(response.status).to eq(200)
         expect(json['installed_version']).to eq(Discourse::VERSION::STRING)
       end
diff --git a/spec/requests/admin/web_hooks_controller_spec.rb b/spec/requests/admin/web_hooks_controller_spec.rb
index be8e36f7ac..125032351a 100644
--- a/spec/requests/admin/web_hooks_controller_spec.rb
+++ b/spec/requests/admin/web_hooks_controller_spec.rb
@@ -34,7 +34,7 @@ describe Admin::WebHooksController do
 
         expect(response.status).to eq(200)
 
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["web_hook"]["payload_url"]).to eq("https://meta.discourse.org/")
         expect(UserHistory.where(acting_user_id: admin.id, action: UserHistory.actions[:web_hook_create]).count).to eq(1)
       end
@@ -54,7 +54,7 @@ describe Admin::WebHooksController do
         }
 
         expect(response.status).to eq(422)
-        response_body = JSON.parse(response.body)
+        response_body = response.parsed_body
 
         expect(response_body["errors"]).to be_present
       end
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index 4d551942f6..4a96174610 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -232,7 +232,7 @@ RSpec.describe ApplicationController do
 
       expect(log).not_to include('exception app middleware')
 
-      expect(JSON.parse(response.body)).to eq(
+      expect(response.parsed_body).to eq(
         "status" => 400,
         "error" => "Bad Request"
       )
@@ -245,7 +245,7 @@ RSpec.describe ApplicationController do
       get "/search/query.json", params: { trem: "misspelled term" }
 
       expect(response.status).to eq(400)
-      expect(JSON.parse(response.body)).to eq(
+      expect(response.parsed_body).to eq(
         "errors" => ["param is missing or the value is empty: term"]
       )
     end
diff --git a/spec/requests/associate_accounts_controller_spec.rb b/spec/requests/associate_accounts_controller_spec.rb
index 8e67b2732e..3b06878f6c 100644
--- a/spec/requests/associate_accounts_controller_spec.rb
+++ b/spec/requests/associate_accounts_controller_spec.rb
@@ -52,7 +52,7 @@ RSpec.describe Users::AssociateAccountsController do
       # Request associate info
       uri = URI.parse(response.redirect_url)
       get "#{uri.path}.json"
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data["provider_name"]).to eq("google_oauth2")
       expect(data["account_description"]).to eq("someemail@test.com")
 
@@ -64,7 +64,7 @@ RSpec.describe Users::AssociateAccountsController do
       # Back to first user
       sign_in(user)
       get "#{uri.path}.json"
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data["provider_name"]).to eq("google_oauth2")
 
       # Make the connection
diff --git a/spec/requests/badges_controller_spec.rb b/spec/requests/badges_controller_spec.rb
index 777596a4ff..f89bb7c830 100644
--- a/spec/requests/badges_controller_spec.rb
+++ b/spec/requests/badges_controller_spec.rb
@@ -15,7 +15,7 @@ describe BadgesController do
       get "/badges.json"
 
       expect(response.status).to eq(200)
-      parsed = JSON.parse(response.body)
+      parsed = response.parsed_body
       expect(parsed["badges"].length).to eq(Badge.enabled.count)
     end
   end
@@ -24,7 +24,7 @@ describe BadgesController do
     it "should return a badge" do
       get "/badges/#{badge.id}.json"
       expect(response.status).to eq(200)
-      parsed = JSON.parse(response.body)
+      parsed = response.parsed_body
       expect(parsed["badge"]).to be_present
     end
 
diff --git a/spec/requests/bookmarks_controller_spec.rb b/spec/requests/bookmarks_controller_spec.rb
index 7c4292c78d..5ab699f9d0 100644
--- a/spec/requests/bookmarks_controller_spec.rb
+++ b/spec/requests/bookmarks_controller_spec.rb
@@ -25,7 +25,7 @@ describe BookmarksController do
         }
 
         expect(response.status).to eq(400)
-        expect(JSON.parse(response.body)['errors']).to include(
+        expect(response.parsed_body['errors']).to include(
           I18n.t("bookmarks.errors.already_bookmarked_post")
         )
       end
@@ -39,7 +39,7 @@ describe BookmarksController do
         }
 
         expect(response.status).to eq(400)
-        expect(JSON.parse(response.body)['errors'].first).to include(
+        expect(response.parsed_body['errors'].first).to include(
           I18n.t("bookmarks.errors.time_must_be_provided")
         )
       end
@@ -60,7 +60,7 @@ describe BookmarksController do
         delete "/bookmarks/#{bookmark.id}.json"
 
         expect(response.status).to eq(404)
-        expect(JSON.parse(response.body)['errors'].first).to include(
+        expect(response.parsed_body['errors'].first).to include(
           I18n.t("not_found")
         )
       end
@@ -73,7 +73,7 @@ describe BookmarksController do
         delete "/bookmarks/#{bookmark.id}.json"
 
         expect(response.status).to eq(403)
-        expect(JSON.parse(response.body)['errors'].first).to include(
+        expect(response.parsed_body['errors'].first).to include(
           I18n.t("invalid_access")
         )
       end
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index e4b0cec35c..a4825fb101 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -129,7 +129,7 @@ describe CategoriesController do
           }
 
           expect(response.status).to eq(422)
-          expect(JSON.parse(response.body)['errors']).to be_present
+          expect(response.parsed_body['errors']).to be_present
         end
       end
 
@@ -156,7 +156,7 @@ describe CategoriesController do
           }
 
           expect(response.status).to eq(200)
-          cat_json = ::JSON.parse(response.body)['category']
+          cat_json = response.parsed_body['category']
           expect(cat_json).to be_present
           expect(cat_json['reviewable_by_group_name']).to eq(group.name)
           expect(cat_json['name']).to eq('hello')
@@ -497,21 +497,21 @@ describe CategoriesController do
       SiteSetting.categories_topics = 5
 
       get '/categories_and_latest.json'
-      expect(JSON.parse(response.body)['topic_list']['topics'].size).to eq(5)
+      expect(response.parsed_body['topic_list']['topics'].size).to eq(5)
     end
 
     it 'works when SiteSetting.categories_topics is null' do
       SiteSetting.categories_topics = 0
 
       get '/categories_and_latest.json'
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json['category_list']['categories'].size).to eq(2) # 'Uncategorized' and category
       expect(json['topic_list']['topics'].size).to eq(5)
 
       Fabricate(:category, parent_category: category)
 
       get '/categories_and_latest.json'
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json['category_list']['categories'].size).to eq(2)
       expect(json['topic_list']['topics'].size).to eq(5)
 
@@ -519,7 +519,7 @@ describe CategoriesController do
       Fabricate(:category)
 
       get '/categories_and_latest.json'
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json['category_list']['categories'].size).to eq(4)
       expect(json['topic_list']['topics'].size).to eq(6)
     end
diff --git a/spec/requests/category_hashtags_controller_spec.rb b/spec/requests/category_hashtags_controller_spec.rb
index f055998d84..f2f62a82ea 100644
--- a/spec/requests/category_hashtags_controller_spec.rb
+++ b/spec/requests/category_hashtags_controller_spec.rb
@@ -17,7 +17,7 @@ describe CategoryHashtagsController do
           get "/category_hashtags/check.json", params: { category_slugs: [category.slug, 'none'] }
 
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)).to eq(
+          expect(response.parsed_body).to eq(
             "valid" => [{ "slug" => category.hashtag_slug, "url" => category.url_with_id }]
           )
         end
@@ -29,7 +29,7 @@ describe CategoryHashtagsController do
           get "/category_hashtags/check.json", params: { category_slugs: [private_category.slug] }
 
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)).to eq("valid" => [])
+          expect(response.parsed_body).to eq("valid" => [])
         end
       end
 
@@ -44,7 +44,7 @@ describe CategoryHashtagsController do
             params: { category_slugs: [private_category.slug] }
 
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)).to eq(
+          expect(response.parsed_body).to eq(
             "valid" => [{ "slug" => private_category.hashtag_slug, "url" => private_category.url_with_id }]
           )
         end
diff --git a/spec/requests/composer_messages_controller_spec.rb b/spec/requests/composer_messages_controller_spec.rb
index 0654bca1ab..241f931868 100644
--- a/spec/requests/composer_messages_controller_spec.rb
+++ b/spec/requests/composer_messages_controller_spec.rb
@@ -27,7 +27,7 @@ describe ComposerMessagesController do
 
         get "/composer_messages.json", params: args
         expect(response.status).to eq(200)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["composer_messages"].first["id"]).to eq("reviving_old")
       end
     end
diff --git a/spec/requests/directory_items_controller_spec.rb b/spec/requests/directory_items_controller_spec.rb
index 31f416f6d4..73a76e5830 100644
--- a/spec/requests/directory_items_controller_spec.rb
+++ b/spec/requests/directory_items_controller_spec.rb
@@ -40,7 +40,7 @@ describe DirectoryItemsController do
     it "succeeds with a valid value" do
       get '/directory_items.json', params: { period: 'all' }
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(json).to be_present
       expect(json['directory_items']).to be_present
@@ -63,7 +63,7 @@ describe DirectoryItemsController do
       get '/directory_items.json', params: { period: 'all', name: 'eviltrout' }
       expect(response.status).to eq(200)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json).to be_present
       expect(json['directory_items'].length).to eq(1)
       expect(json['meta']['total_rows_directory_items']).to eq(1)
@@ -74,7 +74,7 @@ describe DirectoryItemsController do
       get '/directory_items.json', params: { period: 'all', name: 'stage_user' }
       expect(response.status).to eq(200)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json).to be_present
       expect(json['directory_items'].length).to eq(1)
       expect(json['meta']['total_rows_directory_items']).to eq(1)
@@ -85,7 +85,7 @@ describe DirectoryItemsController do
       get '/directory_items.json', params: { period: 'all', exclude_usernames: "stage_user,eviltrout" }
       expect(response.status).to eq(200)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json).to be_present
       expect(json['directory_items'].length).to eq(2)
       expect(json['meta']['total_rows_directory_items']).to eq(2)
@@ -97,7 +97,7 @@ describe DirectoryItemsController do
       get '/directory_items.json', params: { period: 'all', group: group.name }
       expect(response.status).to eq(200)
 
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json).to be_present
       expect(json['directory_items'].length).to eq(2)
       expect(json['meta']['total_rows_directory_items']).to eq(2)
diff --git a/spec/requests/draft_controller_spec.rb b/spec/requests/draft_controller_spec.rb
index c84f3fceb3..f0596ce20e 100644
--- a/spec/requests/draft_controller_spec.rb
+++ b/spec/requests/draft_controller_spec.rb
@@ -33,7 +33,7 @@ describe DraftController do
 
     get "/draft.json", params: { draft_key: 'hello' }
     expect(response.status).to eq(200)
-    json = ::JSON.parse(response.body)
+    json = response.parsed_body
     expect(json['draft']).to eq('test')
 
     get "/draft.json"
@@ -54,7 +54,7 @@ describe DraftController do
       }.to_json
     }
 
-    expect(JSON.parse(response.body)['conflict_user']).to eq(nil)
+    expect(response.parsed_body['conflict_user']).to eq(nil)
 
     post "/draft.json", params: {
       draft_key: "topic",
@@ -66,7 +66,7 @@ describe DraftController do
       }.to_json
     }
 
-    json = JSON.parse(response.body)
+    json = response.parsed_body
 
     expect(json['conflict_user']['id']).to eq(post.last_editor.id)
     expect(json['conflict_user']).to include('avatar_template')
@@ -94,7 +94,7 @@ describe DraftController do
     }
 
     expect(response.status).to eq(200)
-    json = JSON.parse(response.body)
+    json = response.parsed_body
     expect(json["draft_sequence"]).to eq(1)
   end
 
@@ -110,7 +110,7 @@ describe DraftController do
 
     expect(response.status).to eq(200)
 
-    json = JSON.parse(response.body)
+    json = response.parsed_body
     expect(json["draft_sequence"]).to eq(0)
 
     post "/draft.json", params: {
@@ -121,7 +121,7 @@ describe DraftController do
     }
 
     expect(response.status).to eq(200)
-    json = JSON.parse(response.body)
+    json = response.parsed_body
     expect(json["draft_sequence"]).to eq(1)
 
     expect(DraftSequence.current(user, "abc")).to eq(1)
@@ -134,7 +134,7 @@ describe DraftController do
     }
 
     expect(response.status).to eq(200)
-    json = JSON.parse(response.body)
+    json = response.parsed_body
     expect(json["draft_sequence"]).to eq(1)
 
     post "/draft.json", params: {
@@ -145,7 +145,7 @@ describe DraftController do
     }
 
     expect(response.status).to eq(200)
-    json = JSON.parse(response.body)
+    json = response.parsed_body
     expect(json["draft_sequence"]).to eq(2)
   end
 
diff --git a/spec/requests/drafts_controller_spec.rb b/spec/requests/drafts_controller_spec.rb
index d67d32828c..0ce0be8663 100644
--- a/spec/requests/drafts_controller_spec.rb
+++ b/spec/requests/drafts_controller_spec.rb
@@ -13,7 +13,7 @@ describe DraftsController do
     Draft.set(user, 'xxx', 0, '{}')
     get "/drafts.json", params: { username: user.username }
     expect(response.status).to eq(200)
-    parsed = JSON.parse(response.body)
+    parsed = response.parsed_body
     expect(parsed["drafts"].length).to eq(1)
   end
 
@@ -23,7 +23,7 @@ describe DraftsController do
     Draft.clear(user, 'xxx', 0)
     get "/drafts.json", params: { username: user.username }
     expect(response.status).to eq(200)
-    parsed = JSON.parse(response.body)
+    parsed = response.parsed_body
     expect(parsed["drafts"].length).to eq(0)
   end
 
@@ -45,13 +45,13 @@ describe DraftsController do
     sign_in(topic_user)
     get "/drafts.json", params: { username: topic_user.username }
     expect(response.status).to eq(200)
-    parsed = JSON.parse(response.body)
+    parsed = response.parsed_body
     expect(parsed["drafts"].first["title"]).to eq(topic.title)
 
     sign_in(other_user)
     get "/drafts.json", params: { username: other_user.username }
     expect(response.status).to eq(200)
-    parsed = JSON.parse(response.body)
+    parsed = response.parsed_body
     expect(parsed["drafts"].first["title"]).to eq(nil)
   end
 end
diff --git a/spec/requests/embed_controller_spec.rb b/spec/requests/embed_controller_spec.rb
index ac0d6c3aa8..62e42b1d81 100644
--- a/spec/requests/embed_controller_spec.rb
+++ b/spec/requests/embed_controller_spec.rb
@@ -52,7 +52,7 @@ describe EmbedController do
             params: { embed_url: topic_embed.embed_url },
             headers: { HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: "system" }
 
-          json = JSON.parse(response.body)
+          json = response.parsed_body
           expect(json['topic_id']).to eq(topic_embed.topic.id)
           expect(json['post_id']).to eq(topic_embed.post.id)
           expect(json['topic_slug']).to eq(topic_embed.topic.slug)
@@ -65,7 +65,7 @@ describe EmbedController do
             params: { embed_url: "http://nope.com" },
             headers: { HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: "system" }
 
-          json = JSON.parse(response.body)
+          json = response.parsed_body
           expect(json["error_type"]).to eq("not_found")
         end
       end
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 5edf1bcb6f..bbbb373067 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -22,7 +22,7 @@ describe GroupsController do
 
       expect(response.status).to eq(200)
 
-      body = JSON.parse(response.body)
+      body = response.parsed_body
 
       expect(body["groups"].size).to eq(36)
       expect(body["total_rows_groups"]).to eq(50)
@@ -32,7 +32,7 @@ describe GroupsController do
 
       expect(response.status).to eq(200)
 
-      body = JSON.parse(response.body)
+      body = response.parsed_body
 
       expect(body["groups"].size).to eq(14)
       expect(body["total_rows_groups"]).to eq(50)
@@ -79,7 +79,7 @@ describe GroupsController do
 
         expect(response.status).to eq(200)
 
-        body = JSON.parse(response.body)
+        body = response.parsed_body
 
         expect(body["groups"].first["id"]).to eq(testing_group.id)
         expect(body["load_more_groups"]).to eq("/groups?filter=test&page=1")
@@ -100,7 +100,7 @@ describe GroupsController do
 
           expect(response.status).to eq(200)
 
-          body = JSON.parse(response.body)
+          body = response.parsed_body
 
           expect(body["groups"].map { |g| g["id"] }).to eq([
             other_group.id, group.id, moderator_group_id
@@ -114,7 +114,7 @@ describe GroupsController do
 
           expect(response.status).to eq(200)
 
-          body = JSON.parse(response.body)
+          body = response.parsed_body
 
           expect(body["groups"].map { |g| g["id"] }).to eq([
             other_group.id, group.id, moderator_group_id
@@ -130,7 +130,7 @@ describe GroupsController do
 
           expect(response.status).to eq(200)
 
-          body = JSON.parse(response.body)
+          body = response.parsed_body
 
           expect(body["groups"].map { |g| g["id"] }).to eq([
             moderator_group_id, group.id, other_group.id
@@ -144,7 +144,7 @@ describe GroupsController do
 
           expect(response.status).to eq(200)
 
-          body = JSON.parse(response.body)
+          body = response.parsed_body
 
           expect(body["groups"].map { |g| g["id"] }).to eq([
             moderator_group_id, group.id, other_group.id
@@ -163,7 +163,7 @@ describe GroupsController do
 
       expect(response.status).to eq(200)
 
-      body = JSON.parse(response.body)
+      body = response.parsed_body
 
       group_ids = body["groups"].map { |g| g["id"] }
 
@@ -209,7 +209,7 @@ describe GroupsController do
         get "/groups.json", params: { username: u.username }
 
         expect(response.status).to eq(200)
-        group_names = JSON.parse(response.body)["groups"].map { |g| g["name"] }
+        group_names = response.parsed_body["groups"].map { |g| g["name"] }
         expect(group_names).to contain_exactly("0_0")
 
         # logged in user
@@ -217,7 +217,7 @@ describe GroupsController do
         get "/groups.json", params: { username: u.username }
 
         expect(response.status).to eq(200)
-        group_names = JSON.parse(response.body)["groups"].map { |g| g["name"] }
+        group_names = response.parsed_body["groups"].map { |g| g["name"] }
         expect(group_names).to contain_exactly("0_0", "0_1", "1_0", "1_1")
 
         # member of the group
@@ -225,7 +225,7 @@ describe GroupsController do
         get "/groups.json", params: { username: u.username }
 
         expect(response.status).to eq(200)
-        group_names = JSON.parse(response.body)["groups"].map { |g| g["name"] }
+        group_names = response.parsed_body["groups"].map { |g| g["name"] }
         expect(group_names).to contain_exactly("0_0", "0_1", "0_2", "1_0", "1_1", "1_2", "2_0", "2_1", "2_2")
 
         # owner
@@ -233,7 +233,7 @@ describe GroupsController do
         get "/groups.json", params: { username: u.username }
 
         expect(response.status).to eq(200)
-        group_names = JSON.parse(response.body)["groups"].map { |g| g["name"] }
+        group_names = response.parsed_body["groups"].map { |g| g["name"] }
         expect(group_names).to contain_exactly("0_0", "0_1", "0_4", "1_0", "1_1", "1_4", "2_4", "3_4", "4_0", "4_1", "4_2", "4_3", "4_4")
 
         # moderator
@@ -241,7 +241,7 @@ describe GroupsController do
         get "/groups.json", params: { username: u.username }
 
         expect(response.status).to eq(200)
-        group_names = JSON.parse(response.body)["groups"].map { |g| g["name"] }
+        group_names = response.parsed_body["groups"].map { |g| g["name"] }
         expect(group_names).to contain_exactly("0_0", "0_1", "0_3", "1_0", "1_1", "1_3", "3_0", "3_1", "3_3")
 
         # admin
@@ -249,7 +249,7 @@ describe GroupsController do
         get "/groups.json", params: { username: u.username }
 
         expect(response.status).to eq(200)
-        group_names = JSON.parse(response.body)["groups"].map { |g| g["name"] }
+        group_names = response.parsed_body["groups"].map { |g| g["name"] }
         all_group_names = levels.product(levels).map { |a, b| "#{a}_#{b}" }
         expect(group_names).to contain_exactly(*all_group_names)
       end
@@ -270,7 +270,7 @@ describe GroupsController do
 
         expect(response.status).to eq(200)
 
-        body = JSON.parse(response.body)
+        body = response.parsed_body
 
         group_ids = body["groups"].map { |g| g["id"] }
         group_body = body["groups"].find { |g| g["id"] == group.id }
@@ -292,7 +292,7 @@ describe GroupsController do
 
           expect(response.status).to eq(200)
 
-          body = JSON.parse(response.body)
+          body = response.parsed_body
           group_ids = body["groups"].map { |g| g["id"] }
 
           expect(body["total_rows_groups"]).to eq(expected_group_ids.count)
@@ -360,7 +360,7 @@ describe GroupsController do
 
       expect(response.status).to eq(200)
 
-      body = JSON.parse(response.body)
+      body = response.parsed_body
 
       expect(body['group']['id']).to eq(group.id)
       expect(body['extras']["visible_group_names"]).to eq([group.name])
@@ -373,7 +373,7 @@ describe GroupsController do
 
         expect(response.status).to eq(200)
 
-        body = JSON.parse(response.body)
+        body = response.parsed_body
 
         expect(body['group']['id']).to eq(group.id)
 
@@ -409,7 +409,7 @@ describe GroupsController do
 
         expect(response.status).to eq(200)
 
-        body = JSON.parse(response.body)['group']
+        body = response.parsed_body['group']
 
         expect(body["id"]).to eq(group.id)
       end
@@ -441,7 +441,7 @@ describe GroupsController do
       get "/groups/#{group.name}/posts.json"
 
       expect(response.status).to eq(200)
-      expect(JSON.parse(response.body).first["id"]).to eq(post.id)
+      expect(response.parsed_body.first["id"]).to eq(post.id)
     end
   end
 
@@ -492,7 +492,7 @@ describe GroupsController do
 
       expect(response.status).to eq(200)
 
-      members = JSON.parse(response.body)["members"]
+      members = response.parsed_body["members"]
 
       expect(members.map { |m| m['username'] }).to eq(usernames[0..2])
 
@@ -500,12 +500,12 @@ describe GroupsController do
 
       expect(response.status).to eq(200)
 
-      members = JSON.parse(response.body)["members"]
+      members = response.parsed_body["members"]
 
       expect(members.map { |m| m['username'] }).to eq(usernames[3..5])
 
       get "/groups/#{group.name}/members.json", params: { order: 'added_at', desc: true }
-      members = JSON.parse(response.body)["members"]
+      members = response.parsed_body["members"]
 
       expect(members.last['added_at']).to eq(first_user.created_at.as_json)
     end
@@ -549,7 +549,7 @@ describe GroupsController do
       get "/groups/#{group.name}/mentionable.json"
       expect(response.status).to eq(200)
 
-      body = JSON.parse(response.body)
+      body = response.parsed_body
       expect(body["mentionable"]).to eq(false)
 
       group.update!(
@@ -560,7 +560,7 @@ describe GroupsController do
       get "/groups/#{group.name}/mentionable.json"
       expect(response.status).to eq(200)
 
-      body = JSON.parse(response.body)
+      body = response.parsed_body
       expect(body["mentionable"]).to eq(true)
 
       group.update!(
@@ -571,7 +571,7 @@ describe GroupsController do
       get "/groups/#{group.name}/mentionable.json"
       expect(response.status).to eq(200)
 
-      body = JSON.parse(response.body)
+      body = response.parsed_body
       expect(body["mentionable"]).to eq(true)
     end
   end
@@ -583,7 +583,7 @@ describe GroupsController do
       get "/groups/#{group.name}/messageable.json"
       expect(response.status).to eq(200)
 
-      body = JSON.parse(response.body)
+      body = response.parsed_body
       expect(body["messageable"]).to eq(false)
 
       group.update!(
@@ -594,7 +594,7 @@ describe GroupsController do
       get "/groups/#{group.name}/messageable.json"
       expect(response.status).to eq(200)
 
-      body = JSON.parse(response.body)
+      body = response.parsed_body
       expect(body["messageable"]).to eq(true)
     end
   end
@@ -855,7 +855,7 @@ describe GroupsController do
 
       expect(response.status).to eq(200)
 
-      members = JSON.parse(response.body)["members"]
+      members = response.parsed_body["members"]
 
       expect(members.map { |m| m["id"] }).to eq([user1.id, user2.id, user3.id])
 
@@ -863,7 +863,7 @@ describe GroupsController do
 
       expect(response.status).to eq(200)
 
-      members = JSON.parse(response.body)["members"]
+      members = response.parsed_body["members"]
 
       expect(members.map { |m| m["id"] }).to eq([user2.id, user1.id, user3.id])
 
@@ -873,7 +873,7 @@ describe GroupsController do
 
       expect(response.status).to eq(200)
 
-      members = JSON.parse(response.body)["members"]
+      members = response.parsed_body["members"]
 
       expect(members.map { |m| m["id"] }).to eq([user2.id, user1.id, user3.id])
     end
@@ -883,7 +883,7 @@ describe GroupsController do
 
       expect(response.status).to eq(200)
 
-      members = JSON.parse(response.body)["members"]
+      members = response.parsed_body["members"]
 
       expect(members.map { |m| m["id"] })
         .to contain_exactly(user1.id, user2.id, user3.id)
@@ -897,7 +897,7 @@ describe GroupsController do
 
       get "/groups/#{group.name}/members.json", params: { requesters: true }
 
-      members = JSON.parse(response.body)["members"]
+      members = response.parsed_body["members"]
       expect(members.length).to eq(1)
       expect(members.first["username"]).to eq(user4.username)
       expect(members.first["reason"]).to eq(request4.reason)
@@ -912,7 +912,7 @@ describe GroupsController do
           get "/groups/#{group.name}/members.json", params: { filter: email }
 
           expect(response.status).to eq(200)
-          members = JSON.parse(response.body)["members"]
+          members = response.parsed_body["members"]
           expect(members).to eq([])
         end
       end
@@ -934,7 +934,7 @@ describe GroupsController do
             get "/groups/#{group.name}/members.json", params: { filter: filter }
 
             expect(response.status).to eq(200)
-            members = JSON.parse(response.body)["members"]
+            members = response.parsed_body["members"]
             expect(members.map { |m| m["id"] }).to contain_exactly(*ids)
           end
         end
@@ -947,7 +947,7 @@ describe GroupsController do
             get "/groups/#{group.name}/members.json", params: { filter: filter }
 
             expect(response.status).to eq(200)
-            members = JSON.parse(response.body)["members"]
+            members = response.parsed_body["members"]
             expect(members.map { |m| m["id"] }).to contain_exactly(user1.id)
           end
         end
@@ -1089,7 +1089,7 @@ describe GroupsController do
 
           expect(response.status).to eq(422)
 
-          expect(JSON.parse(response.body)["errors"]).to include(I18n.t(
+          expect(response.parsed_body["errors"]).to include(I18n.t(
             "groups.errors.member_already_exist",
             username: "alice, bob",
             count: 2
@@ -1102,7 +1102,7 @@ describe GroupsController do
 
         expect(response.status).to eq(422)
 
-        expect(JSON.parse(response.body)["errors"]).to include(I18n.t(
+        expect(response.parsed_body["errors"]).to include(I18n.t(
           "groups.errors.member_already_exist",
           username: user.username,
           count: 1
@@ -1119,7 +1119,7 @@ describe GroupsController do
 
           expect(response.status).to eq(400)
 
-          body = JSON.parse(response.body)
+          body = response.parsed_body
 
           expect(body["error_type"]).to eq("invalid_parameters")
         end
@@ -1365,7 +1365,7 @@ describe GroupsController do
 
           expect(response.status).to eq(200)
 
-          result = JSON.parse(response.body)["logs"].find { |entry| entry["subject"] == "public_exit" }
+          result = response.parsed_body["logs"].find { |entry| entry["subject"] == "public_exit" }
 
           expect(result["action"]).to eq(GroupHistory.actions[1].to_s)
           expect(result["subject"]).to eq('public_exit')
@@ -1397,7 +1397,7 @@ describe GroupsController do
 
         expect(response.status).to eq(200)
 
-        result = JSON.parse(response.body)["logs"].first
+        result = response.parsed_body["logs"].first
 
         expect(result["action"]).to eq(GroupHistory.actions[3].to_s)
       end
@@ -1420,7 +1420,7 @@ describe GroupsController do
 
         expect(response.status).to eq(200)
 
-        logs = JSON.parse(response.body)["logs"]
+        logs = response.parsed_body["logs"]
 
         expect(logs.count).to eq(1)
         expect(logs.first["action"]).to eq(GroupHistory.actions[2].to_s)
@@ -1471,7 +1471,7 @@ describe GroupsController do
 
       post = Post.last
       topic = post.topic
-      body = JSON.parse(response.body)
+      body = response.parsed_body
 
       expect(body['relative_url']).to eq(topic.relative_url)
       expect(post.topic.custom_fields['requested_group_id'].to_i).to eq(group.id)
@@ -1520,7 +1520,7 @@ describe GroupsController do
         get '/groups/search.json'
 
         expect(response.status).to eq(200)
-        groups = JSON.parse(response.body)
+        groups = response.parsed_body
 
         expected_ids = Group::AUTO_GROUPS.map { |name, id| id }
         expected_ids.delete(Group::AUTO_GROUPS[:everyone])
@@ -1532,7 +1532,7 @@ describe GroupsController do
           get "/groups/search.json?term=#{term}"
 
           expect(response.status).to eq(200)
-          groups = JSON.parse(response.body)
+          groups = response.parsed_body
 
           expect(groups.length).to eq(1)
           expect(groups.first['id']).to eq(group.id)
@@ -1541,7 +1541,7 @@ describe GroupsController do
         get "/groups/search.json?term=KingOfTheNorth"
 
         expect(response.status).to eq(200)
-        groups = JSON.parse(response.body)
+        groups = response.parsed_body
 
         expect(groups).to eq([])
       end
@@ -1558,7 +1558,7 @@ describe GroupsController do
         get "/groups/search.json?term=north"
 
         expect(response.status).to eq(200)
-        groups = JSON.parse(response.body)
+        groups = response.parsed_body
 
         expect(groups.length).to eq(1)
         expect(groups.first['id']).to eq(hidden_group.id)
@@ -1572,7 +1572,7 @@ describe GroupsController do
         get '/groups/search.json?ignore_automatic=true'
 
         expect(response.status).to eq(200)
-        groups = JSON.parse(response.body)
+        groups = response.parsed_body
 
         expect(groups.length).to eq(2)
 
@@ -1626,7 +1626,7 @@ describe GroupsController do
       get "/groups/check-name.json", params: { group_name: 'test' }
 
       expect(response.status).to eq(200)
-      expect(JSON.parse(response.body)["available"]).to eq(true)
+      expect(response.parsed_body["available"]).to eq(true)
     end
   end
 end
diff --git a/spec/requests/inline_onebox_controller_spec.rb b/spec/requests/inline_onebox_controller_spec.rb
index 1a29e75275..8aed821fef 100644
--- a/spec/requests/inline_onebox_controller_spec.rb
+++ b/spec/requests/inline_onebox_controller_spec.rb
@@ -15,7 +15,7 @@ describe InlineOneboxController do
     it "returns empty JSON for empty input" do
       get "/inline-onebox.json", params: { urls: [] }
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json['inline-oneboxes']).to eq([])
     end
 
@@ -25,7 +25,7 @@ describe InlineOneboxController do
       it "returns information for a valid link" do
         get "/inline-onebox.json", params: { urls: [ topic.url ] }
         expect(response.status).to eq(200)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         onebox = json['inline-oneboxes'][0]
 
         expect(onebox).to be_present
diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rb
index 8af1c741ea..5e2bf32aa3 100644
--- a/spec/requests/invites_controller_spec.rb
+++ b/spec/requests/invites_controller_spec.rb
@@ -94,7 +94,7 @@ describe InvitesController do
         invite = Invite.invite_by_email("invite@example.com", user)
         post "/invites.json", params: { email: invite.email }
         expect(response.status).to eq(422)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["failed"]).to be_present
       end
 
@@ -129,7 +129,7 @@ describe InvitesController do
         sign_in(Fabricate(:admin))
         post "/invites.json", params: { email: "test@mailinator.com" }
         expect(response.status).to eq(422)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["errors"]).to be_present
       end
     end
@@ -208,7 +208,7 @@ describe InvitesController do
       it "redirects to the root and doesn't change the session" do
         put "/invites/show/doesntexist.json"
         expect(response.status).to eq(200)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["success"]).to eq(false)
         expect(json["message"]).to eq(I18n.t('invite.not_found_json'))
         expect(session[:current_user_id]).to be_blank
@@ -221,7 +221,7 @@ describe InvitesController do
         invite.update_attribute(:email, "John Doe <john.doe@example.com>")
         put "/invites/show/#{invite.invite_key}.json"
         expect(response.status).to eq(200)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["success"]).to eq(false)
         expect(json["message"]).to eq(I18n.t('invite.error_message'))
         expect(session[:current_user_id]).to be_blank
@@ -243,7 +243,7 @@ describe InvitesController do
         put "/invites/show/#{invite.invite_key}.json"
 
         expect(response.status).to eq(200)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["success"]).to eq(false)
         expect(json["message"]).to eq(I18n.t('invite.not_found_json'))
         expect(session[:current_user_id]).to be_blank
@@ -286,7 +286,7 @@ describe InvitesController do
           it 'redirects to the first topic the user was invited to' do
             put "/invites/show/#{invite.invite_key}.json"
             expect(response.status).to eq(200)
-            json = JSON.parse(response.body)
+            json = response.parsed_body
             expect(json["success"]).to eq(true)
             expect(json["redirect_to"]).to eq(topic.relative_url)
           end
@@ -306,7 +306,7 @@ describe InvitesController do
           it "doesn't log in the user if there's a validation error" do
             put "/invites/show/#{invite.invite_key}.json", params: { password: "password" }
             expect(response.status).to eq(200)
-            json = JSON.parse(response.body)
+            json = response.parsed_body
             expect(json["success"]).to eq(false)
             expect(json["errors"]["password"]).to be_present
           end
@@ -317,7 +317,7 @@ describe InvitesController do
             user.send_welcome_message = true
             put "/invites/show/#{invite.invite_key}.json"
             expect(response.status).to eq(200)
-            expect(JSON.parse(response.body)["success"]).to eq(true)
+            expect(response.parsed_body["success"]).to eq(true)
 
             expect(Jobs::SendSystemMessage.jobs.size).to eq(1)
           end
@@ -371,7 +371,7 @@ describe InvitesController do
                 end.to change { UserAuthToken.count }.by(1)
 
                 expect(response.status).to eq(200)
-                expect(JSON.parse(response.body)["success"]).to eq(true)
+                expect(response.parsed_body["success"]).to eq(true)
 
                 expect(Jobs::InvitePasswordInstructionsEmail.jobs.size).to eq(0)
                 expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
@@ -391,8 +391,8 @@ describe InvitesController do
                 end.not_to change { UserAuthToken.count }
 
                 expect(response.status).to eq(200)
-                expect(JSON.parse(response.body)["success"]).to eq(true)
-                expect(JSON.parse(response.body)["message"]).to eq(I18n.t("invite.confirm_email"))
+                expect(response.parsed_body["success"]).to eq(true)
+                expect(response.parsed_body["message"]).to eq(I18n.t("invite.confirm_email"))
 
                 invited_user = User.find_by_email(invite.email)
                 expect(invited_user.active).to eq(false)
@@ -526,7 +526,7 @@ describe InvitesController do
 
         expect(response.status).to eq(422)
         expect(Jobs::BulkInvite.jobs.size).to eq(1)
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["errors"][0]).to eq(I18n.t("bulk_invite.max_rows", max_bulk_invites: SiteSetting.max_bulk_invites))
       end
     end
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index 38daebea59..d1238c1f00 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -68,7 +68,7 @@ RSpec.describe ListController do
 
       get "/latest.json", params: { topic_ids: "#{p.topic_id}" }
       expect(response.status).to eq(200)
-      parsed = JSON.parse(response.body)
+      parsed = response.parsed_body
       expect(parsed["topic_list"]["topics"].length).to eq(1)
     end
 
@@ -90,11 +90,11 @@ RSpec.describe ListController do
       TopTopic.refresh!
 
       get "/categories_and_top.json"
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data["topic_list"]["topics"].length).to eq(1)
 
       get "/categories_and_latest.json"
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data["topic_list"]["topics"].length).to eq(2)
     end
   end
@@ -169,7 +169,7 @@ RSpec.describe ListController do
 
         expect(response.status).to eq(200)
 
-        expect(JSON.parse(response.body)["topic_list"]["topics"].first["id"])
+        expect(response.parsed_body["topic_list"]["topics"].first["id"])
           .to eq(topic.id)
       end
     end
@@ -184,7 +184,7 @@ RSpec.describe ListController do
         get "/topics/private-messages-group/#{user.username}/#{UrlHelper.encode_component(unicode_group.name)}.json"
         expect(response.status).to eq(200)
 
-        expect(JSON.parse(response.body)["topic_list"]["topics"].first["id"])
+        expect(response.parsed_body["topic_list"]["topics"].first["id"])
           .to eq(topic.id)
       end
     end
@@ -217,7 +217,7 @@ RSpec.describe ListController do
           get "/topics/groups/#{group.name}.json"
 
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)["topic_list"]).to be_present
+          expect(response.parsed_body["topic_list"]).to be_present
         end
       end
 
@@ -286,7 +286,7 @@ RSpec.describe ListController do
 
         expect(response.status).to eq(200)
 
-        topics = JSON.parse(response.body)["topic_list"]["topics"]
+        topics = response.parsed_body["topic_list"]["topics"]
 
         expect(topics.map { |topic| topic["id"] }).to contain_exactly(
           topic.id, topic2.id
@@ -384,7 +384,7 @@ RSpec.describe ListController do
         it 'uses the correct category' do
           get "/c/#{other_category.slug}/l/latest.json"
           expect(response.status).to eq(200)
-          body = JSON.parse(response.body)
+          body = response.parsed_body
           expect(body["topic_list"]["topics"].first["category_id"])
             .to eq(other_category.id)
         end
@@ -429,7 +429,7 @@ RSpec.describe ListController do
           category.update!(default_view: 'top', default_top_period: 'monthly')
           get "/c/#{category.slug}.json"
           expect(response.status).to eq(200)
-          json = JSON.parse(response.body)
+          json = response.parsed_body
           expect(json["topic_list"]["for_period"]).to eq("monthly")
         end
 
@@ -437,7 +437,7 @@ RSpec.describe ListController do
           category.update!(default_view: nil)
           get "/c/#{category.slug}.json"
           expect(response.status).to eq(200)
-          json = JSON.parse(response.body)
+          json = response.parsed_body
           expect(json["topic_list"]["for_period"]).to be_blank
         end
 
@@ -445,7 +445,7 @@ RSpec.describe ListController do
           category.update!(default_view: '')
           get "/c/#{category.slug}.json"
           expect(response.status).to eq(200)
-          json = JSON.parse(response.body)
+          json = response.parsed_body
           expect(json["topic_list"]["for_period"]).to be_blank
         end
 
@@ -453,7 +453,7 @@ RSpec.describe ListController do
           category.update!(default_view: 'latest')
           get "/c/#{category.slug}.json"
           expect(response.status).to eq(200)
-          json = JSON.parse(response.body)
+          json = response.parsed_body
           expect(json["topic_list"]["for_period"]).to be_blank
         end
       end
@@ -502,7 +502,7 @@ RSpec.describe ListController do
     it "should respond with a list" do
       get "/topics/created-by/#{user.username}.json"
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["topic_list"]["topics"].size).to eq(2)
     end
 
@@ -510,7 +510,7 @@ RSpec.describe ListController do
       user.update!(username: "myname.test")
       get "/topics/created-by/#{user.username}", xhr: true
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["topic_list"]["topics"].size).to eq(2)
     end
   end
@@ -528,7 +528,7 @@ RSpec.describe ListController do
       sign_in(user)
       get "/topics/private-messages/#{user.username}.json"
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["topic_list"]["topics"].size).to eq(1)
     end
   end
@@ -549,7 +549,7 @@ RSpec.describe ListController do
       sign_in(user)
       get "/topics/private-messages-sent/#{user.username}.json"
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["topic_list"]["topics"].size).to eq(1)
     end
   end
@@ -572,7 +572,7 @@ RSpec.describe ListController do
       sign_in(user)
       get "/topics/private-messages-unread/#{user.username}.json"
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["topic_list"]["topics"].size).to eq(1)
     end
   end
diff --git a/spec/requests/metadata_controller_spec.rb b/spec/requests/metadata_controller_spec.rb
index 4e00f5a1c6..e008236da1 100644
--- a/spec/requests/metadata_controller_spec.rb
+++ b/spec/requests/metadata_controller_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:disable Discourse/NoJsonParseResponse
 
 require 'rails_helper'
 
diff --git a/spec/requests/notifications_controller_spec.rb b/spec/requests/notifications_controller_spec.rb
index 4db535fa18..bb3c9022a3 100644
--- a/spec/requests/notifications_controller_spec.rb
+++ b/spec/requests/notifications_controller_spec.rb
@@ -125,14 +125,14 @@ describe NotificationsController do
       describe '#create' do
         it "can create notification" do
           create_notification(admin.id, 200, :to_not)
-          expect(::JSON.parse(response.body)["id"]).to_not eq(nil)
+          expect(response.parsed_body["id"]).to_not eq(nil)
         end
       end
 
       describe '#update' do
         it "can update notification" do
           update_notification(8, 200, :to)
-          expect(::JSON.parse(response.body)["topic_id"]).to eq(8)
+          expect(response.parsed_body["topic_id"]).to eq(8)
         end
       end
 
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index e604a89aba..78a82e51f5 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -141,7 +141,7 @@ RSpec.describe Users::OmniauthCallbacksController do
           expect(response.location).to include("/auth/failure?message=csrf_detected")
 
           get "/session/csrf.json"
-          token = JSON.parse(response.body)["csrf"]
+          token = response.parsed_body["csrf"]
 
           post "/auth/google_oauth2", params: { authenticity_token: token }
           expect(response.status).to eq(302)
diff --git a/spec/requests/post_actions_controller_spec.rb b/spec/requests/post_actions_controller_spec.rb
index e8ed8a5b7d..f2b8d60dd8 100644
--- a/spec/requests/post_actions_controller_spec.rb
+++ b/spec/requests/post_actions_controller_spec.rb
@@ -108,7 +108,7 @@ RSpec.describe PostActionsController do
 
       expect(response.status).to eq(422)
 
-      expect(JSON.parse(response.body)["errors"].first).to eq(I18n.t(
+      expect(response.parsed_body["errors"].first).to eq(I18n.t(
         :not_accepting_pms, username: user2.username
       ))
     end
diff --git a/spec/requests/post_readers_controller_spec.rb b/spec/requests/post_readers_controller_spec.rb
index 0c56966bc3..4916f54cac 100644
--- a/spec/requests/post_readers_controller_spec.rb
+++ b/spec/requests/post_readers_controller_spec.rb
@@ -25,7 +25,7 @@ describe PostReadersController do
       it 'returns an empty list when nobody has read the topic' do
         get '/post_readers.json', params: { id: @post.id }
 
-        readers = JSON.parse(response.body)['post_readers']
+        readers = response.parsed_body['post_readers']
 
         expect(readers).to be_empty
       end
@@ -34,7 +34,7 @@ describe PostReadersController do
         TopicUser.create!(user: reader, topic: @group_message, last_read_post_number: 3)
 
         get '/post_readers.json', params: { id: @post.id }
-        reader_data = JSON.parse(response.body)['post_readers'].first
+        reader_data = response.parsed_body['post_readers'].first
 
         assert_reader_is_correctly_serialized(reader_data, reader, @post)
       end
@@ -43,7 +43,7 @@ describe PostReadersController do
         TopicUser.create!(user: reader, topic: @group_message, last_read_post_number: 4)
 
         get '/post_readers.json', params: { id: @post.id }
-        reader_data = JSON.parse(response.body)['post_readers'].first
+        reader_data = response.parsed_body['post_readers'].first
 
         assert_reader_is_correctly_serialized(reader_data, reader, @post)
       end
@@ -52,7 +52,7 @@ describe PostReadersController do
         TopicUser.create!(user: reader, topic: @group_message, last_read_post_number: 1)
 
         get '/post_readers.json', params: { id: @post.id }
-        readers = JSON.parse(response.body)['post_readers']
+        readers = response.parsed_body['post_readers']
 
         expect(readers).to be_empty
       end
@@ -62,7 +62,7 @@ describe PostReadersController do
         TopicUser.create!(user: reader, topic: @group_message, last_read_post_number: nil)
 
         get '/post_readers.json', params: { id: @post.id }
-        readers = JSON.parse(response.body)['post_readers']
+        readers = response.parsed_body['post_readers']
 
         expect(readers).to be_empty
       end
@@ -72,7 +72,7 @@ describe PostReadersController do
         reader.update(staged: true)
 
         get '/post_readers.json', params: { id: @post.id }
-        readers = JSON.parse(response.body)['post_readers']
+        readers = response.parsed_body['post_readers']
 
         expect(readers).to be_empty
       end
@@ -83,7 +83,7 @@ describe PostReadersController do
         TopicUser.create!(user: non_staff_user, topic: @group_message, last_read_post_number: 4)
 
         get '/post_readers.json', params: { id: @post.id }
-        readers = JSON.parse(response.body)['post_readers']
+        readers = response.parsed_body['post_readers']
 
         expect(readers).to be_empty
       end
@@ -94,7 +94,7 @@ describe PostReadersController do
         TopicUser.create!(user: admin, topic: @group_message, last_read_post_number: 4)
 
         get '/post_readers.json', params: { id: @post.id }
-        reader_data = JSON.parse(response.body)['post_readers'].first
+        reader_data = response.parsed_body['post_readers'].first
 
         assert_reader_is_correctly_serialized(reader_data, admin, @post)
       end
@@ -103,7 +103,7 @@ describe PostReadersController do
         TopicUser.create!(user: Discourse.system_user, topic: @group_message, last_read_post_number: 4)
 
         get '/post_readers.json', params: { id: @post.id }
-        readers = JSON.parse(response.body)['post_readers']
+        readers = response.parsed_body['post_readers']
 
         expect(readers).to be_empty
       end
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index af25d9c000..909db8c509 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -81,7 +81,7 @@ describe PostsController do
       new_post = create_post
 
       get "/posts/#{new_post.id}.json"
-      parsed = JSON.parse(response.body)
+      parsed = response.parsed_body
 
       expect(parsed["topic_slug"]).to eq(new_post.topic.slug)
       expect(parsed["moderator"]).to eq(false)
@@ -107,7 +107,7 @@ describe PostsController do
       _third_post = Fabricate(:post, topic: first_post.topic, created_at: 3.days.ago)
 
       get "/posts/by-date/#{second_post.topic_id}/#{(second_post.created_at - 2.days).strftime("%Y-%m-%d")}.json"
-      json = JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(response.status).to eq(200)
       expect(json["id"]).to eq(second_post.id)
@@ -115,7 +115,7 @@ describe PostsController do
 
     it 'returns no post if date is > at last created post' do
       get "/posts/by-date/#{post.topic_id}/2245-11-11.json"
-      _json = JSON.parse(response.body)
+      _json = response.parsed_body
       expect(response.status).to eq(404)
     end
   end
@@ -135,7 +135,7 @@ describe PostsController do
       get "/posts/#{child.id}/reply-history.json"
       expect(response.status).to eq(200)
 
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json[0]['id']).to eq(parent.id)
       expect(json[0]['user_custom_fields']['hello']).to eq('world')
       expect(json[0]['user_custom_fields']['hidden']).to be_blank
@@ -158,7 +158,7 @@ describe PostsController do
       get "/posts/#{parent.id}/replies.json"
       expect(response.status).to eq(200)
 
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json[0]['id']).to eq(child.id)
       expect(json[0]['user_custom_fields']['hello']).to eq('world')
       expect(json[0]['user_custom_fields']['hidden']).to be_blank
@@ -324,7 +324,7 @@ describe PostsController do
         put "/posts/#{post.id}.json", params: update_params
 
         expect(response.status).to eq(422)
-        expect(JSON.parse(response.body)['errors']).to include(I18n.t('too_late_to_edit'))
+        expect(response.parsed_body['errors']).to include(I18n.t('too_late_to_edit'))
       end
 
       it 'does not allow TL2 to update when edit time limit expired' do
@@ -338,7 +338,7 @@ describe PostsController do
         put "/posts/#{post.id}.json", params: update_params
 
         expect(response.status).to eq(422)
-        expect(JSON.parse(response.body)['errors']).to include(I18n.t('too_late_to_edit'))
+        expect(response.parsed_body['errors']).to include(I18n.t('too_late_to_edit'))
       end
 
       it 'passes the image sizes through' do
@@ -477,7 +477,7 @@ describe PostsController do
       end
       it "marks topic_bookmaked as true" do
         delete "/posts/#{post.id}/bookmark.json"
-        expect(JSON.parse(response.body)['topic_bookmarked']).to eq(true)
+        expect(response.parsed_body['topic_bookmarked']).to eq(true)
       end
     end
   end
@@ -671,7 +671,7 @@ describe PostsController do
 
         expect(response.status).to eq(400)
 
-        expect(JSON.parse(response.body)["errors"]).to include(
+        expect(response.parsed_body["errors"]).to include(
           I18n.t("invalid_params", message: "category")
         )
       end
@@ -698,7 +698,7 @@ describe PostsController do
           }
 
           expect(response.status).to eq(200)
-          parsed = ::JSON.parse(response.body)
+          parsed = response.parsed_body
 
           expect(parsed["action"]).to eq("enqueued")
 
@@ -737,7 +737,7 @@ describe PostsController do
           }
 
           expect(response.status).to eq(200)
-          parsed = ::JSON.parse(response.body)
+          parsed = response.parsed_body
 
           expect(parsed["action"]).not_to be_present
 
@@ -756,7 +756,7 @@ describe PostsController do
           }
 
           expect(response).not_to be_successful
-          parsed = ::JSON.parse(response.body)
+          parsed = response.parsed_body
           expect(parsed["action"]).not_to eq("enqueued")
         end
 
@@ -769,7 +769,7 @@ describe PostsController do
           }
 
           expect(response).not_to be_successful
-          parsed = ::JSON.parse(response.body)
+          parsed = response.parsed_body
           expect(parsed["action"]).not_to eq("enqueued")
         end
       end
@@ -783,7 +783,7 @@ describe PostsController do
         }
 
         expect(response.status).to eq(200)
-        parsed = ::JSON.parse(response.body)
+        parsed = response.parsed_body
 
         expect(parsed["action"]).to eq("enqueued")
         reviewable = ReviewableQueuedPost.find_by(created_by: user)
@@ -820,7 +820,7 @@ describe PostsController do
 
         expect(response.status).to eq(200)
 
-        parsed = ::JSON.parse(response.body)
+        parsed = response.parsed_body
         post = Post.find(parsed['id'])
 
         expect(post.topic.topic_allowed_users.length).to eq(1)
@@ -835,7 +835,7 @@ describe PostsController do
         }
 
         expect(response.status).to eq(200)
-        parsed = ::JSON.parse(response.body)
+        parsed = response.parsed_body
         expect(parsed['post']).to be_present
         expect(parsed['post']['cooked']).to be_present
       end
@@ -884,7 +884,7 @@ describe PostsController do
         }
 
         expect(response.status).to eq(422)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['errors']).to be_present
       end
 
@@ -983,7 +983,7 @@ describe PostsController do
           }
 
           expect(response.status).to eq(422)
-          expect(JSON.parse(response.body)["errors"]).to include(
+          expect(response.parsed_body["errors"]).to include(
             I18n.t("activerecord.errors.models.topic.attributes.base.no_user_selected")
           )
         end
@@ -1004,7 +1004,7 @@ describe PostsController do
           }
 
           expect(response.status).to eq(422)
-          expect(JSON.parse(response.body)["errors"]).to include(
+          expect(response.parsed_body["errors"]).to include(
             I18n.t("create_pm_on_existing_topic")
           )
         end
@@ -1027,7 +1027,7 @@ describe PostsController do
             meta_data: { xyz: 'abc' }
           }
 
-          expect(JSON.parse(response.body)["errors"]).to include(I18n.t(:spamming_host))
+          expect(response.parsed_body["errors"]).to include(I18n.t(:spamming_host))
         end
 
         context "allow_uncategorized_topics is false" do
@@ -1102,7 +1102,7 @@ describe PostsController do
               shared_draft: 'true'
             }
             expect(response.status).to eq(200)
-            result = JSON.parse(response.body)
+            result = response.parsed_body
             topic = Topic.find(result['topic_id'])
             expect(topic.category_id).to eq(shared_category.id)
             expect(topic.shared_draft.category_id).to eq(destination_category.id)
@@ -1394,13 +1394,13 @@ describe PostsController do
       it "fails when revision is blank" do
         put "/posts/#{post_id}/revisions/#{blank_post_revision.number}/revert.json"
         expect(response.status).to eq(422)
-        expect(JSON.parse(response.body)['errors']).to include(I18n.t('revert_version_same'))
+        expect(response.parsed_body['errors']).to include(I18n.t('revert_version_same'))
       end
 
       it "fails when revised version is same as current version" do
         put "/posts/#{post_id}/revisions/#{same_post_revision.number}/revert.json"
         expect(response.status).to eq(422)
-        expect(JSON.parse(response.body)['errors']).to include(I18n.t('revert_version_same'))
+        expect(response.parsed_body['errors']).to include(I18n.t('revert_version_same'))
       end
 
       it "works!" do
@@ -1435,7 +1435,7 @@ describe PostsController do
       TopicEmbed.expects(:expanded_for).with(post).returns("full content")
       get "/posts/#{post.id}/expand-embed.json"
       expect(response.status).to eq(200)
-      expect(::JSON.parse(response.body)['cooked']).to eq("full content")
+      expect(response.parsed_body['cooked']).to eq("full content")
     end
   end
 
@@ -1472,7 +1472,7 @@ describe PostsController do
         get "/posts/#{user.username}/flagged.json"
         expect(response.status).to eq(200)
 
-        expect(JSON.parse(response.body).length).to eq(2)
+        expect(response.parsed_body.length).to eq(2)
       end
     end
   end
@@ -1507,7 +1507,7 @@ describe PostsController do
         get "/posts/#{user.username}/deleted.json"
         expect(response.status).to eq(200)
 
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data.length).to eq(0)
       end
 
@@ -1521,7 +1521,7 @@ describe PostsController do
         get "/posts/#{user.username}/deleted.json"
         expect(response.status).to eq(200)
 
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data.length).to eq(0)
       end
 
@@ -1537,7 +1537,7 @@ describe PostsController do
         get "/posts/#{user.username}/deleted.json"
         expect(response.status).to eq(200)
 
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data.length).to eq(1)
         expect(data[0]["id"]).to eq(post_deleted_by_admin.id)
         expect(data[0]["deleted_by"]["id"]).to eq(admin.id)
@@ -1650,7 +1650,7 @@ describe PostsController do
         get "/private-posts.json"
         expect(response.status).to eq(200)
 
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         post_ids = json['private_posts'].map { |p| p['id'] }
 
         expect(post_ids).to include private_post.id
@@ -1683,7 +1683,7 @@ describe PostsController do
         get "/posts.json"
         expect(response.status).to eq(200)
 
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         post_ids = json['latest_posts'].map { |p| p['id'] }
 
         expect(post_ids).to include public_post.id
@@ -1699,7 +1699,7 @@ describe PostsController do
       get "/posts/#{post.id}/cooked.json"
 
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(json).to be_present
       expect(json['cooked']).to eq('WAt')
@@ -1725,7 +1725,7 @@ describe PostsController do
         get "/posts/#{post.id}/raw-email.json"
         expect(response.status).to eq(200)
 
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['raw_email']).to eq('email_content')
       end
     end
diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rb
index b89af08df5..88064fa8eb 100644
--- a/spec/requests/reviewables_controller_spec.rb
+++ b/spec/requests/reviewables_controller_spec.rb
@@ -48,7 +48,7 @@ describe ReviewablesController do
       it "returns empty JSON when nothing to review" do
         get "/review.json"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['reviewables']).to eq([])
       end
 
@@ -57,7 +57,7 @@ describe ReviewablesController do
 
         get "/review.json"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['reviewables']).to be_present
 
         json_review = json['reviewables'][0]
@@ -79,14 +79,14 @@ describe ReviewablesController do
       it "supports filtering by score" do
         get "/review.json?min_score=1000"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['reviewables']).to be_blank
       end
 
       it "supports offsets" do
         get "/review.json?offset=100"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['reviewables']).to be_blank
       end
 
@@ -94,7 +94,7 @@ describe ReviewablesController do
         Fabricate(:reviewable)
         get "/review.json?type=ReviewableUser"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['reviewables']).to be_present
       end
 
@@ -108,23 +108,23 @@ describe ReviewablesController do
 
         get "/review.json?type=ReviewableUser&status=pending"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['reviewables']).to be_blank
 
         Fabricate(:reviewable, status: Reviewable.statuses[:approved])
         get "/review.json?type=ReviewableUser&status=approved"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['reviewables']).to be_present
 
         get "/review.json?type=ReviewableUser&status=reviewed"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['reviewables']).to be_present
 
         get "/review.json?type=ReviewableUser&status=all"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['reviewables']).to be_present
       end
 
@@ -138,18 +138,18 @@ describe ReviewablesController do
         r = Fabricate(:reviewable)
         get "/review.json?category_id=#{other_category.id}"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['reviewables']).to be_blank
 
         get "/review.json?category_id=#{r.category_id}"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['reviewables']).to be_present
 
         # By default all categories are returned
         get "/review.json"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['reviewables']).to be_present
       end
 
@@ -162,7 +162,7 @@ describe ReviewablesController do
 
         get "/review.json"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
 
         json_review = json['reviewables'][0]
         expect(json_review['id']).to eq(reviewable.id)
@@ -173,7 +173,7 @@ describe ReviewablesController do
         let(:from) { 3.days.ago.strftime('%F') }
         let(:to) { 1.day.ago.strftime('%F') }
 
-        let(:reviewables) { ::JSON.parse(response.body)['reviewables'] }
+        let(:reviewables) { response.parsed_body['reviewables'] }
 
         it 'returns an empty array when no reviewable matches the date range' do
           reviewable = Fabricate(:reviewable)
@@ -231,7 +231,7 @@ describe ReviewablesController do
           get "/review/#{reviewable.id}.json"
           expect(response.code).to eq("200")
 
-          json = ::JSON.parse(response.body)
+          json = response.parsed_body
           expect(json['reviewable']['id']).to eq(reviewable.id)
         end
 
@@ -264,7 +264,7 @@ describe ReviewablesController do
         it "returns the conversation" do
           get "/review/#{reviewable.id}.json"
           expect(response.code).to eq("200")
-          json = ::JSON.parse(response.body)
+          json = response.parsed_body
 
           score = json['reviewable_scores'][0]
           conversation_id = score['reviewable_conversation_id']
@@ -298,7 +298,7 @@ describe ReviewablesController do
           get "/review/#{reviewable.id}/explain.json"
           expect(response.code).to eq("200")
 
-          json = ::JSON.parse(response.body)
+          json = response.parsed_body
           expect(json['reviewable_explanation']['id']).to eq(reviewable.id)
           expect(json['reviewable_explanation']['total_score']).to eq(reviewable.score)
         end
@@ -337,7 +337,7 @@ describe ReviewablesController do
         version = qp.version
         put "/review/#{qp.id}/perform/approve_post.json?version=#{version}"
         expect(response.code).to eq("422")
-        result = ::JSON.parse(response.body)
+        result = response.parsed_body
         expect(result['errors']).to be_present
         expect(qp.reload.version).to eq(version)
       end
@@ -345,7 +345,7 @@ describe ReviewablesController do
       it "requires a version parameter" do
         put "/review/#{reviewable.id}/perform/approve_user.json"
         expect(response.code).to eq("422")
-        result = ::JSON.parse(response.body)
+        result = response.parsed_body
         expect(result['errors']).to be_present
       end
 
@@ -354,7 +354,7 @@ describe ReviewablesController do
 
         put "/review/#{reviewable.id}/perform/approve_user.json?version=#{reviewable.version}"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['reviewable_perform_result']['success']).to eq(true)
         expect(json['reviewable_perform_result']['version']).to eq(1)
         expect(json['reviewable_perform_result']['transition_to']).to eq('approved')
@@ -394,7 +394,7 @@ describe ReviewablesController do
         it "fails when the version is wrong" do
           put "/review/#{reviewable.id}/perform/approve_user.json?version=#{reviewable.version + 1}"
           expect(response.code).to eq("409")
-          json = ::JSON.parse(response.body)
+          json = response.parsed_body
           expect(json['errors']).to be_present
         end
       end
@@ -410,7 +410,7 @@ describe ReviewablesController do
       it "returns empty json for no reviewables" do
         get "/review/topics.json"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['reviewable_topics']).to be_blank
       end
 
@@ -422,7 +422,7 @@ describe ReviewablesController do
 
         get "/review/topics.json"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         json_topic = json['reviewable_topics'].find { |rt| rt['id'] == post0.topic_id }
         expect(json_topic['claimed_by_id']).to eq(moderator.id)
 
@@ -439,7 +439,7 @@ describe ReviewablesController do
         get "/review/topics.json"
         expect(response.code).to eq("200")
 
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['reviewable_topics']).to be_present
 
         json_topic = json['reviewable_topics'].find { |rt| rt['id'] == post0.topic_id }
@@ -456,7 +456,7 @@ describe ReviewablesController do
       it "renders the settings as JSON" do
         get "/review/settings.json"
         expect(response.code).to eq("200")
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['reviewable_settings']).to be_present
         expect(json['reviewable_score_types']).to be_present
       end
@@ -552,7 +552,7 @@ describe ReviewablesController do
         )
         expect(history).to be_present
 
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['payload']['raw']).to eq('new raw content')
         expect(json['version'] > 0).to eq(true)
       end
@@ -580,7 +580,7 @@ describe ReviewablesController do
         expect(reviewable_topic.payload['tags']).to eq(['t2', 't3', 't1'])
         expect(reviewable_topic.category_id).to eq(new_category_id)
 
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['payload']['raw']).to eq('new topic op')
         expect(json['payload']['title']).to eq('new topic title')
         expect(json['payload']['extra']).to be_blank
diff --git a/spec/requests/robots_txt_controller_spec.rb b/spec/requests/robots_txt_controller_spec.rb
index e58f35172d..c15297ff11 100644
--- a/spec/requests/robots_txt_controller_spec.rb
+++ b/spec/requests/robots_txt_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe RobotsTxtController do
   describe '#builder' do
     it "returns json information for building a robots.txt" do
       get "/robots-builder.json"
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json).to be_present
       expect(json['header']).to be_present
       expect(json['agents']).to be_present
@@ -17,7 +17,7 @@ RSpec.describe RobotsTxtController do
 
       get "/robots-builder.json"
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json['header']).to be_present
       expect(json['agents']).to be_present
       expect(json['overridden']).to eq("something")
diff --git a/spec/requests/search_controller_spec.rb b/spec/requests/search_controller_spec.rb
index d1d8fff353..947bd8754a 100644
--- a/spec/requests/search_controller_spec.rb
+++ b/spec/requests/search_controller_spec.rb
@@ -68,7 +68,7 @@ describe SearchController do
 
         expect(response.status).to eq(200)
 
-        data = JSON.parse(response.body)
+        data = response.parsed_body
 
         expect(data["posts"]).to be_empty
         expect(data["grouped_search_result"]["error"]).not_to be_empty
@@ -93,7 +93,7 @@ describe SearchController do
 
       expect(response.status).to eq(200)
 
-      data = JSON.parse(response.body)
+      data = response.parsed_body
 
       expect(data['posts'].length).to eq(1)
       expect(data['posts'][0]['id']).to eq(awesome_post.id)
@@ -108,7 +108,7 @@ describe SearchController do
       }
 
       expect(response.status).to eq(200)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
 
       expect(data['posts'][0]['id']).to eq(user_post.id)
       expect(data['users']).to be_blank
@@ -118,7 +118,7 @@ describe SearchController do
       }
 
       expect(response.status).to eq(200)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
 
       expect(data['posts']).to be_blank
       expect(data['users'][0]['id']).to eq(user.id)
@@ -135,7 +135,7 @@ describe SearchController do
         }
 
         expect(response.status).to eq(200)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
 
         expect(data['topics'][0]['id']).to eq(awesome_post.topic_id)
       end
@@ -149,7 +149,7 @@ describe SearchController do
         }
 
         expect(response.status).to eq(200)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
 
         expect(data['topics'][0]['id']).to eq(user_post.topic_id)
       end
@@ -164,7 +164,7 @@ describe SearchController do
       expect(response.status).to eq(200)
       expect(SearchLog.where(term: 'wookie')).to be_present
 
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       search_log_id = json['grouped_search_result']['search_log_id']
       expect(search_log_id).to be_present
 
@@ -257,7 +257,7 @@ describe SearchController do
     it "sort posts with search priority when search term is empty" do
       get "/search.json", params: { q: 'status:open' }
       expect(response.status).to eq(200)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       post1 = data["posts"].find { |e| e["id"] == old_very_hight_priority_post.id }
       post2 = data["posts"].find { |e| e["id"] == low_priority_post.id }
       expect(data["posts"][0]["id"]).to eq(old_very_hight_priority_post.id)
@@ -267,7 +267,7 @@ describe SearchController do
     it "sort posts with search priority when no order query" do
       get "/search.json", params: { q: 'status:open Priority Post' }
       expect(response.status).to eq(200)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data["posts"][0]["id"]).to eq(old_very_hight_priority_post.id)
       expect(data["posts"][1]["id"]).to eq(hight_priority_post.id)
       expect(data["posts"][2]["id"]).to eq(low_priority_post.id)
@@ -276,7 +276,7 @@ describe SearchController do
     it "doesn't sort posts with search piority when query with order" do
       get "/search.json", params: { q: 'status:open order:latest Priority Post' }
       expect(response.status).to eq(200)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data["posts"][0]["id"]).to eq(hight_priority_post.id)
       expect(data["posts"][1]["id"]).to eq(low_priority_post.id)
       expect(data["posts"][2]["id"]).to eq(old_very_hight_priority_post.id)
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index 70f88f8e2a..51b023df68 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -60,8 +60,8 @@ RSpec.describe SessionController do
       it 'returns information' do
         get "/session/email-login/#{email_token.token}.json"
 
-        expect(JSON.parse(response.body)["can_login"]).to eq(true)
-        expect(JSON.parse(response.body)["second_factor_required"]).to eq(nil)
+        expect(response.parsed_body["can_login"]).to eq(true)
+        expect(response.parsed_body["second_factor_required"]).to eq(nil)
 
         # Does not log in the user
         expect(session[:current_user_id]).to be_nil
@@ -90,7 +90,7 @@ RSpec.describe SessionController do
         it "includes that information in the response" do
           get "/session/email-login/#{email_token.token}.json"
 
-          response_body_parsed = JSON.parse(response.body)
+          response_body_parsed = response.parsed_body
           expect(response_body_parsed["can_login"]).to eq(true)
           expect(response_body_parsed["second_factor_required"]).to eq(true)
           expect(response_body_parsed["backup_codes_enabled"]).to eq(true)
@@ -103,7 +103,7 @@ RSpec.describe SessionController do
         it "includes that information in the response" do
           get "/session/email-login/#{email_token.token}.json"
 
-          response_body_parsed = JSON.parse(response.body)
+          response_body_parsed = response.parsed_body
           expect(response_body_parsed["can_login"]).to eq(true)
           expect(response_body_parsed["security_key_required"]).to eq(true)
           expect(response_body_parsed["second_factor_required"]).to eq(nil)
@@ -148,7 +148,7 @@ RSpec.describe SessionController do
         post "/session/email-login/adasdad.json"
 
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)["error"]).to eq(
+        expect(response.parsed_body["error"]).to eq(
           I18n.t('email_login.invalid_token')
         )
       end
@@ -161,7 +161,7 @@ RSpec.describe SessionController do
 
           expect(response.status).to eq(200)
 
-          expect(JSON.parse(response.body)["error"]).to eq(
+          expect(response.parsed_body["error"]).to eq(
             I18n.t('email_login.invalid_token')
           )
         end
@@ -172,7 +172,7 @@ RSpec.describe SessionController do
       it 'returns success' do
         post "/session/email-login/#{email_token.token}.json"
 
-        expect(JSON.parse(response.body)["success"]).to eq("OK")
+        expect(response.parsed_body["success"]).to eq("OK")
         expect(session[:current_user_id]).to eq(user.id)
       end
 
@@ -201,7 +201,7 @@ RSpec.describe SessionController do
 
         expect(response.status).to eq(200)
 
-        expect(JSON.parse(response.body)["error"]).to eq(I18n.t("login.not_approved"))
+        expect(response.parsed_body["error"]).to eq(I18n.t("login.not_approved"))
         expect(session[:current_user_id]).to eq(nil)
       end
 
@@ -221,7 +221,7 @@ RSpec.describe SessionController do
 
           expect(response.status).to eq(200)
 
-          expect(JSON.parse(response.body)["error"]).to eq(
+          expect(response.parsed_body["error"]).to eq(
             I18n.t("login.admin_not_allowed_from_ip_address", username: user.username)
           )
           expect(session[:current_user_id]).to eq(nil)
@@ -245,7 +245,7 @@ RSpec.describe SessionController do
 
           expect(response.status).to eq(200)
 
-          expect(JSON.parse(response.body)["error"]).to eq(
+          expect(response.parsed_body["error"]).to eq(
             I18n.t("login.not_allowed_from_ip_address", username: user.username)
           )
           expect(session[:current_user_id]).to eq(nil)
@@ -270,7 +270,7 @@ RSpec.describe SessionController do
 
         expect(response.status).to eq(200)
 
-        expect(JSON.parse(response.body)["error"]).to eq(
+        expect(response.parsed_body["error"]).to eq(
           I18n.t("login.suspended", date: I18n.l(user.suspended_till, format: :date_only)
         ))
         expect(session[:current_user_id]).to eq(nil)
@@ -290,7 +290,7 @@ RSpec.describe SessionController do
 
               expect(response.status).to eq(200)
 
-              expect(JSON.parse(response.body)["error"]).to eq(
+              expect(response.parsed_body["error"]).to eq(
                 I18n.t("login.invalid_second_factor_code")
               )
               expect(session[:current_user_id]).to eq(nil)
@@ -304,7 +304,7 @@ RSpec.describe SessionController do
               }
 
               expect(response.status).to eq(200)
-              expect(JSON.parse(response.body)["error"]).to eq(
+              expect(response.parsed_body["error"]).to eq(
                 I18n.t("login.invalid_second_factor_code")
               )
               expect(session[:current_user_id]).to eq(nil)
@@ -320,7 +320,7 @@ RSpec.describe SessionController do
                 second_factor_method: UserSecondFactor.methods[:totp]
               }
 
-              expect(JSON.parse(response.body)["success"]).to eq("OK")
+              expect(response.parsed_body["success"]).to eq("OK")
               expect(session[:current_user_id]).to eq(user.id)
             end
           end
@@ -331,7 +331,7 @@ RSpec.describe SessionController do
                 second_factor_method: UserSecondFactor.methods[:backup_codes]
               }
 
-              expect(JSON.parse(response.body)["success"]).to eq("OK")
+              expect(response.parsed_body["success"]).to eq("OK")
               expect(session[:current_user_id]).to eq(user.id)
             end
           end
@@ -346,7 +346,7 @@ RSpec.describe SessionController do
 
             expect(response.status).to eq(200)
 
-            expect(JSON.parse(response.body)["error"]).to eq(
+            expect(response.parsed_body["error"]).to eq(
               I18n.t("login.invalid_second_factor_code")
             )
             expect(session[:current_user_id]).to eq(nil)
@@ -381,7 +381,7 @@ RSpec.describe SessionController do
 
             expect(response.status).to eq(200)
             expect(session[:current_user_id]).to eq(nil)
-            response_body = JSON.parse(response.body)
+            response_body = response.parsed_body
             expect(response_body['error']).to eq(I18n.t(
               'login.not_enabled_second_factor_method'
             ))
@@ -402,7 +402,7 @@ RSpec.describe SessionController do
 
             expect(response.status).to eq(200)
             expect(session[:current_user_id]).to eq(nil)
-            response_body = JSON.parse(response.body)
+            response_body = response.parsed_body
             expect(response_body["failed"]).to eq("FAILED")
             expect(response_body['error']).to eq(I18n.t(
               'webauthn.validation.not_found_error'
@@ -447,7 +447,7 @@ RSpec.describe SessionController do
 
           expect(response.status).to eq(200)
           expect(session[:current_user_id]).to eq(nil)
-          response_body = JSON.parse(response.body)
+          response_body = response.parsed_body
           expect(response_body['error']).to eq(I18n.t(
             'login.invalid_second_factor_code'
           ))
@@ -461,7 +461,7 @@ RSpec.describe SessionController do
 
           expect(response.status).to eq(200)
           expect(session[:current_user_id]).to eq(nil)
-          response_body = JSON.parse(response.body)
+          response_body = response.parsed_body
           expect(response_body['error']).to eq(I18n.t(
             'login.invalid_second_factor_code'
           ))
@@ -491,7 +491,7 @@ RSpec.describe SessionController do
       get "/session/#{user.username}/become.json"
 
       expect(response.status).to eq(403)
-      expect(JSON.parse(response.body)["error_type"]).to eq("invalid_access")
+      expect(response.parsed_body["error_type"]).to eq("invalid_access")
       expect(session[:current_user_id]).to be_blank
     end
 
@@ -1226,7 +1226,7 @@ RSpec.describe SessionController do
           }
 
           expect(response.status).to eq(200)
-          expect(::JSON.parse(response.body)['error']).to eq(
+          expect(response.parsed_body['error']).to eq(
             I18n.t("login.incorrect_username_email_or_password")
           )
         end
@@ -1240,7 +1240,7 @@ RSpec.describe SessionController do
           }
 
           expect(response.status).to eq(200)
-          expect(::JSON.parse(response.body)['error']).to eq(
+          expect(response.parsed_body['error']).to eq(
             I18n.t("login.incorrect_username_email_or_password")
           )
         end
@@ -1258,7 +1258,7 @@ RSpec.describe SessionController do
           }
 
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)['error']).to eq(I18n.t('login.suspended_with_reason',
+          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)
           ))
@@ -1275,7 +1275,7 @@ RSpec.describe SessionController do
           }
 
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)['error']).to eq(I18n.t('login.not_activated'))
+          expect(response.parsed_body['error']).to eq(I18n.t('login.not_activated'))
         end
       end
 
@@ -1342,7 +1342,7 @@ RSpec.describe SessionController do
 
             expect(response.status).to eq(200)
             expect(session[:current_user_id]).to eq(nil)
-            response_body = JSON.parse(response.body)
+            response_body = response.parsed_body
             expect(response_body["failed"]).to eq("FAILED")
             expect(response_body['error']).to eq(I18n.t(
               'login.invalid_security_key'
@@ -1366,7 +1366,7 @@ RSpec.describe SessionController do
 
             expect(response.status).to eq(200)
             expect(session[:current_user_id]).to eq(nil)
-            response_body = JSON.parse(response.body)
+            response_body = response.parsed_body
             expect(response_body["failed"]).to eq("FAILED")
             expect(response_body['error']).to eq(I18n.t(
               'webauthn.validation.not_found_error'
@@ -1407,9 +1407,9 @@ RSpec.describe SessionController do
 
             expect(response.status).to eq(200)
             expect(session[:current_user_id]).to eq(nil)
-            response_body = JSON.parse(response.body)
+            response_body = response.parsed_body
             expect(response_body["failed"]).to eq("FAILED")
-            expect(JSON.parse(response.body)['error']).to eq(I18n.t(
+            expect(response.parsed_body['error']).to eq(I18n.t(
               'login.not_enabled_second_factor_method'
             ))
           end
@@ -1428,7 +1428,7 @@ RSpec.describe SessionController do
             }
 
             expect(response.status).to eq(200)
-            expect(JSON.parse(response.body)['error']).to eq(I18n.t(
+            expect(response.parsed_body['error']).to eq(I18n.t(
               'login.invalid_second_factor_method'
             ))
           end
@@ -1445,7 +1445,7 @@ RSpec.describe SessionController do
               }
 
               expect(response.status).to eq(200)
-              expect(JSON.parse(response.body)['error']).to eq(I18n.t(
+              expect(response.parsed_body['error']).to eq(I18n.t(
                 'login.invalid_second_factor_code'
               ))
             end
@@ -1460,7 +1460,7 @@ RSpec.describe SessionController do
               }
 
               expect(response.status).to eq(200)
-              expect(JSON.parse(response.body)['error']).to eq(I18n.t(
+              expect(response.parsed_body['error']).to eq(I18n.t(
                 'login.invalid_second_factor_code'
               ))
             end
@@ -1553,7 +1553,7 @@ RSpec.describe SessionController do
             login: username, password: 'myawesomepassword'
           }
           expect(response.status).to eq(200)
-          expect(::JSON.parse(response.body)['error']).not_to be_present
+          expect(response.parsed_body['error']).not_to be_present
         end
 
         it "strips spaces from the email" do
@@ -1561,7 +1561,7 @@ RSpec.describe SessionController do
             login: email, password: 'myawesomepassword'
           }
           expect(response.status).to eq(200)
-          expect(::JSON.parse(response.body)['error']).not_to be_present
+          expect(response.parsed_body['error']).not_to be_present
         end
       end
 
@@ -1585,7 +1585,7 @@ RSpec.describe SessionController do
 
           it "shows the 'not approved' error message" do
             expect(response.status).to eq(200)
-            expect(JSON.parse(response.body)['error']).to eq(
+            expect(response.parsed_body['error']).to eq(
               I18n.t('login.not_approved')
             )
           end
@@ -1635,7 +1635,7 @@ RSpec.describe SessionController do
           }
 
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)['error']).to be_present
+          expect(response.parsed_body['error']).to be_present
           expect(session[:current_user_id]).not_to eq(user.id)
         end
 
@@ -1670,7 +1670,7 @@ RSpec.describe SessionController do
       it "shows the 'not activated' error message" do
         post_login
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)['error']).to eq(
+        expect(response.parsed_body['error']).to eq(
           I18n.t 'login.not_activated'
         )
       end
@@ -1681,7 +1681,7 @@ RSpec.describe SessionController do
         it "shows the 'not approved' error message" do
           post_login
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)['error']).to eq(
+          expect(response.parsed_body['error']).to eq(
             I18n.t 'login.not_approved'
           )
         end
@@ -1707,7 +1707,7 @@ RSpec.describe SessionController do
         }
 
         expect(response.status).to eq(429)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["error_type"]).to eq("rate_limit")
       end
 
@@ -1732,7 +1732,7 @@ RSpec.describe SessionController do
         }
 
         expect(response.status).to eq(429)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["error_type"]).to eq("rate_limit")
       end
     end
@@ -1936,7 +1936,7 @@ RSpec.describe SessionController do
       it "returns the JSON for the user" do
         get "/session/current.json"
         expect(response.status).to eq(200)
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['current_user']).to be_present
         expect(json['current_user']['id']).to eq(user.id)
       end
diff --git a/spec/requests/similar_topics_controller_spec.rb b/spec/requests/similar_topics_controller_spec.rb
index e2ce12bdfc..cef7f5e205 100644
--- a/spec/requests/similar_topics_controller_spec.rb
+++ b/spec/requests/similar_topics_controller_spec.rb
@@ -33,7 +33,7 @@ describe SimilarTopicsController do
 
       get "/topics/similar_to.json", params: { title: title, raw: raw }
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["similar_topics"].size).to eq(0)
     end
 
@@ -51,7 +51,7 @@ describe SimilarTopicsController do
           get "/topics/similar_to.json", params: { title: title, raw: raw }
 
           expect(response.status).to eq(200)
-          similar_topics = ::JSON.parse(response.body)["similar_topics"]
+          similar_topics = response.parsed_body["similar_topics"]
           expect(similar_topics.size).to eq(1)
           expect(similar_topics.first["topic_id"]).to eq(topic.id)
         end
@@ -69,7 +69,7 @@ describe SimilarTopicsController do
             get "/topics/similar_to.json", params: { title: title, raw: raw }
 
             expect(response.status).to eq(200)
-            similar_topics = ::JSON.parse(response.body)["similar_topics"].map { |topic| topic["topic_id"] }
+            similar_topics = response.parsed_body["similar_topics"].map { |topic| topic["topic_id"] }
             expect(similar_topics.size).to eq(2)
             expect(similar_topics).to include(topic.id)
             expect(similar_topics).to include(private_topic.id)
@@ -85,7 +85,7 @@ describe SimilarTopicsController do
         get "/topics/similar_to.json", params: { title: title, raw: raw }
 
         expect(response.status).to eq(200)
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["similar_topics"].size).to eq(0)
       end
     end
diff --git a/spec/requests/site_controller_spec.rb b/spec/requests/site_controller_spec.rb
index 01dd996049..670a0998a3 100644
--- a/spec/requests/site_controller_spec.rb
+++ b/spec/requests/site_controller_spec.rb
@@ -17,7 +17,7 @@ describe SiteController do
       Theme.clear_default!
 
       get "/site/basic-info.json"
-      json = JSON.parse(response.body)
+      json = response.parsed_body
 
       expected_url = UrlHelper.absolute(upload.url)
 
@@ -38,7 +38,7 @@ describe SiteController do
       SiteSetting.share_anonymized_statistics = true
 
       get "/site/statistics.json"
-      json = JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(response.status).to eq(200)
       expect(json["topic_count"]).to be_present
@@ -74,7 +74,7 @@ describe SiteController do
       SiteSetting.selectable_avatars_enabled = false
 
       get "/site/selectable-avatars.json"
-      json = JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(response.status).to eq(200)
       expect(json).to eq([])
@@ -84,7 +84,7 @@ describe SiteController do
       SiteSetting.selectable_avatars_enabled = true
 
       get "/site/selectable-avatars.json"
-      json = JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(response.status).to eq(200)
       expect(json).to contain_exactly("https://www.discourse.org", "https://meta.discourse.org")
diff --git a/spec/requests/static_controller_spec.rb b/spec/requests/static_controller_spec.rb
index dff4e02959..8444b20ed4 100644
--- a/spec/requests/static_controller_spec.rb
+++ b/spec/requests/static_controller_spec.rb
@@ -316,7 +316,7 @@ describe StaticController do
       it "redirects to the root" do
         post "/login.json", params: { redirect: ["/foo"] }
         expect(response.status).to eq(400)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["errors"]).to be_present
         expect(json["errors"]).to include(
           I18n.t("invalid_params", message: "redirect")
diff --git a/spec/requests/svg_sprite_controller_spec.rb b/spec/requests/svg_sprite_controller_spec.rb
index ca61ee3027..cdfdab766a 100644
--- a/spec/requests/svg_sprite_controller_spec.rb
+++ b/spec/requests/svg_sprite_controller_spec.rb
@@ -76,7 +76,7 @@ describe SvgSpriteController do
 
       expect(response.status).to eq(200)
 
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data.length).to eq(200)
       expect(data[0]["id"]).to eq("ad")
     end
@@ -88,7 +88,7 @@ describe SvgSpriteController do
 
       expect(response.status).to eq(200)
 
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data.length).to eq(1)
       expect(data[0]["id"]).to eq("fab-500px")
     end
diff --git a/spec/requests/tag_groups_controller_spec.rb b/spec/requests/tag_groups_controller_spec.rb
index 05f4aba2b3..140f295029 100644
--- a/spec/requests/tag_groups_controller_spec.rb
+++ b/spec/requests/tag_groups_controller_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe TagGroupsController do
 
         expect(response.status).to eq(200)
 
-        tag_groups = JSON.parse(response.body)["tag_groups"]
+        tag_groups = response.parsed_body["tag_groups"]
 
         expect(tag_groups.count).to eq(1)
         expect(tag_groups.first["id"]).to eq(tag_group.id)
diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
index 8528194691..b4c0b866ea 100644
--- a/spec/requests/tags_controller_spec.rb
+++ b/spec/requests/tags_controller_spec.rb
@@ -3,17 +3,10 @@
 require 'rails_helper'
 
 describe TagsController do
-  define_method(:get_json_body) do
-    ::JSON.parse(response.body)
-  end
-
-  let(:json) { get_json_body }
-
   fab!(:user) { Fabricate(:user) }
   fab!(:admin) { Fabricate(:admin) }
   fab!(:regular_user) { Fabricate(:trust_level_4) }
   fab!(:moderator) { Fabricate(:moderator) }
-
   fab!(:category)  { Fabricate(:category) }
   fab!(:subcategory) { Fabricate(:category, parent_category_id: category.id) }
 
@@ -33,7 +26,7 @@ describe TagsController do
 
         expect(response.status).to eq(200)
 
-        tags = json["tags"]
+        tags = response.parsed_body["tags"]
         expect(tags.length).to eq(1)
         expect(tags[0]['text']).to eq("topic-test")
       end
@@ -48,9 +41,9 @@ describe TagsController do
         get "/tags.json"
         expect(response.status).to eq(200)
 
-        tags = json["tags"]
+        tags = response.parsed_body["tags"]
         expect(tags.length).to eq(0)
-        group = json.dig('extras', 'tag_groups')&.first
+        group = response.parsed_body.dig('extras', 'tag_groups')&.first
         expect(group).to be_present
         expect(group['tags'].length).to eq(2)
         expect(group['tags'].map { |t| t['id'] }).to contain_exactly(test_tag.name, topic_tag.name)
@@ -71,7 +64,7 @@ describe TagsController do
 
         expect(response.status).to eq(200)
 
-        tags = json["tags"]
+        tags = response.parsed_body["tags"]
         expect(tags.length).to eq(2)
       end
 
@@ -135,7 +128,7 @@ describe TagsController do
       it "should produce the topic inside the category and not the topic outside of it" do
         get "/tags/c/#{category.slug}/#{tag.name}.json"
 
-        topic_ids = json['topic_list']['topics'].map { |x| x['id'] }
+        topic_ids = response.parsed_body['topic_list']['topics'].map { |x| x['id'] }
         expect(topic_ids).to include(topic_in_category.id)
         expect(topic_ids).to_not include(topic_out_of_category.id)
         expect(topic_ids).to_not include(topic_in_category_without_tag.id)
@@ -168,7 +161,7 @@ describe TagsController do
       it "should produce the topic inside the subcategory and not the topic outside of it" do
         get "/tags/c/#{category.slug}/#{subcategory.slug}/#{tag.name}.json"
 
-        topic_ids = json['topic_list']['topics'].map { |x| x['id'] }
+        topic_ids = response.parsed_body['topic_list']['topics'].map { |x| x['id'] }
         expect(topic_ids).to include(topic_in_subcategory.id)
         expect(topic_ids).to_not include(topic_out_of_subcategory.id)
         expect(topic_ids).to_not include(topic_in_subcategory_without_tag.id)
@@ -188,26 +181,26 @@ describe TagsController do
     it "can handle tag with no synonyms" do
       get "/tag/#{tag.name}/info.json"
       expect(response.status).to eq(200)
-      expect(json.dig('tag_info', 'name')).to eq(tag.name)
-      expect(json.dig('tag_info', 'synonyms')).to be_empty
-      expect(json.dig('tag_info', 'category_ids')).to be_empty
-      expect(json.dig('tag_info', 'category_restricted')).to eq(false)
+      expect(response.parsed_body.dig('tag_info', 'name')).to eq(tag.name)
+      expect(response.parsed_body.dig('tag_info', 'synonyms')).to be_empty
+      expect(response.parsed_body.dig('tag_info', 'category_ids')).to be_empty
+      expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(false)
     end
 
     it "can handle a synonym" do
       get "/tag/#{synonym.name}/info.json"
       expect(response.status).to eq(200)
-      expect(json.dig('tag_info', 'name')).to eq(synonym.name)
-      expect(json.dig('tag_info', 'synonyms')).to be_empty
-      expect(json.dig('tag_info', 'category_ids')).to be_empty
-      expect(json.dig('tag_info', 'category_restricted')).to eq(false)
+      expect(response.parsed_body.dig('tag_info', 'name')).to eq(synonym.name)
+      expect(response.parsed_body.dig('tag_info', 'synonyms')).to be_empty
+      expect(response.parsed_body.dig('tag_info', 'category_ids')).to be_empty
+      expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(false)
     end
 
     it "can return a tag's synonyms" do
       synonym
       get "/tag/#{tag.name}/info.json"
       expect(response.status).to eq(200)
-      expect(json.dig('tag_info', 'synonyms').map { |t| t['text'] }).to eq([synonym.name])
+      expect(response.parsed_body.dig('tag_info', 'synonyms').map { |t| t['text'] }).to eq([synonym.name])
     end
 
     it "returns 404 if tag is staff-only" do
@@ -230,9 +223,9 @@ describe TagsController do
       category2.update!(tag_groups: [tag_group])
       staff_category = Fabricate(:private_category, group: Fabricate(:group), tags: [tag])
       get "/tag/#{tag.name}/info.json"
-      expect(json.dig('tag_info', 'category_ids')).to contain_exactly(category.id, category2.id)
-      expect(json['categories']).to be_present
-      expect(json.dig('tag_info', 'category_restricted')).to eq(true)
+      expect(response.parsed_body.dig('tag_info', 'category_ids')).to contain_exactly(category.id, category2.id)
+      expect(response.parsed_body['categories']).to be_present
+      expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(true)
     end
 
     context 'tag belongs to a tag group' do
@@ -241,13 +234,13 @@ describe TagsController do
       it "returns tag groups if tag groups are visible" do
         SiteSetting.tags_listed_by_group = true
         get "/tag/#{tag.name}/info.json"
-        expect(json.dig('tag_info', 'tag_group_names')).to eq([tag_group.name])
+        expect(response.parsed_body.dig('tag_info', 'tag_group_names')).to eq([tag_group.name])
       end
 
       it "doesn't return tag groups if tag groups aren't visible" do
         SiteSetting.tags_listed_by_group = false
         get "/tag/#{tag.name}/info.json"
-        expect(json['tag_info'].has_key?('tag_group_names')).to eq(false)
+        expect(response.parsed_body['tag_info'].has_key?('tag_group_names')).to eq(false)
       end
 
       context "restricted to a private category" do
@@ -262,24 +255,24 @@ describe TagsController do
         it "can return categories to users who can access them" do
           sign_in(admin)
           get "/tag/#{tag.name}/info.json"
-          expect(json.dig('tag_info', 'category_ids')).to contain_exactly(private_category.id)
-          expect(json['categories']).to be_present
-          expect(json.dig('tag_info', 'category_restricted')).to eq(true)
+          expect(response.parsed_body.dig('tag_info', 'category_ids')).to contain_exactly(private_category.id)
+          expect(response.parsed_body['categories']).to be_present
+          expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(true)
         end
 
         it "can indicate category restriction to users who can't access them" do
           sign_in(user)
           get "/tag/#{tag.name}/info.json"
-          expect(json.dig('tag_info', 'category_ids')).to be_empty
-          expect(json['categories']).to be_blank
-          expect(json.dig('tag_info', 'category_restricted')).to eq(true)
+          expect(response.parsed_body.dig('tag_info', 'category_ids')).to be_empty
+          expect(response.parsed_body['categories']).to be_blank
+          expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(true)
         end
 
         it "can indicate category restriction to anon" do
           get "/tag/#{tag.name}/info.json"
-          expect(json.dig('tag_info', 'category_ids')).to be_empty
-          expect(json['categories']).to be_blank
-          expect(json.dig('tag_info', 'category_restricted')).to eq(true)
+          expect(response.parsed_body.dig('tag_info', 'category_ids')).to be_empty
+          expect(response.parsed_body['categories']).to be_blank
+          expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(true)
         end
       end
     end
@@ -293,7 +286,7 @@ describe TagsController do
 
       expect(response.status).to eq(200)
 
-      response_tag = json["valid"].first
+      response_tag = response.parsed_body["valid"].first
       expect(response_tag["value"]).to eq(tag.name)
     end
   end
@@ -359,7 +352,7 @@ describe TagsController do
 
         expect(response.status).to eq(200)
 
-        tag = json['tags']
+        tag = response.parsed_body['tags']
         expect(tag[0]["id"]).to eq('test')
       end
     end
@@ -374,7 +367,7 @@ describe TagsController do
 
         expect(response.status).to eq(200)
 
-        tag = json['tags']
+        tag = response.parsed_body['tags']
         expect(tag[0]["id"]).to eq('test')
       end
 
@@ -383,7 +376,7 @@ describe TagsController do
 
         expect(response.status).to eq(200)
 
-        tag = json['tags']
+        tag = response.parsed_body['tags']
         expect(tag[0]["id"]).to eq('test')
       end
     end
@@ -408,7 +401,7 @@ describe TagsController do
 
     context 'tagging enabled' do
       def parse_topic_ids
-        get_json_body["topic_list"]["topics"]
+        response.parsed_body["topic_list"]["topics"]
           .map { |topic| topic["id"] }
       end
 
@@ -552,7 +545,7 @@ describe TagsController do
         tag_names.each { |name| Fabricate(:tag, name: name) }
         get "/tags/filter/search.json", params: { q: 'stu' }
         expect(response.status).to eq(200)
-        expect(json["results"].map { |j| j["id"] }.sort).to eq(['stuff', 'stumped'])
+        expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq(['stuff', 'stumped'])
       end
 
       it "returns tags ordered by topic_count, and prioritises exact matches" do
@@ -562,7 +555,7 @@ describe TagsController do
 
         get '/tags/filter/search.json', params: { q: 'tag', limit: 2 }
         expect(response.status).to eq(200)
-        expect(json['results'].map { |j| j['id'] }).to eq(['tag', 'tag2'])
+        expect(response.parsed_body['results'].map { |j| j['id'] }).to eq(['tag', 'tag2'])
       end
 
       context 'with category restriction' do
@@ -573,17 +566,17 @@ describe TagsController do
           nope = Fabricate(:tag, name: 'nope')
           get "/tags/filter/search.json", params: { q: nope.name, categoryId: category.id }
           expect(response.status).to eq(200)
-          expect(json["results"].map { |j| j["id"] }.sort).to eq([])
-          expect(json["forbidden"]).to be_present
-          expect(json["forbidden_message"]).to eq(I18n.t("tags.forbidden.in_this_category", tag_name: nope.name))
+          expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq([])
+          expect(response.parsed_body["forbidden"]).to be_present
+          expect(response.parsed_body["forbidden_message"]).to eq(I18n.t("tags.forbidden.in_this_category", tag_name: nope.name))
         end
 
         it "can say if given tag is restricted to different category" do
           category
           get "/tags/filter/search.json", params: { q: yup.name, categoryId: Fabricate(:category).id }
-          expect(json["results"].map { |j| j["id"] }.sort).to eq([])
-          expect(json["forbidden"]).to be_present
-          expect(json["forbidden_message"]).to eq(I18n.t(
+          expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq([])
+          expect(response.parsed_body["forbidden"]).to be_present
+          expect(response.parsed_body["forbidden_message"]).to eq(I18n.t(
             "tags.forbidden.restricted_to",
             count: 1,
             tag_name: yup.name,
@@ -595,7 +588,7 @@ describe TagsController do
           nope = Fabricate(:tag, name: 'nope')
           get "/tags/filter/search.json", params: { categoryId: category.id }
           expect(response.status).to eq(200)
-          expect(json["results"].map { |j| j["id"] }.sort).to eq([yup.name])
+          expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq([yup.name])
         end
       end
 
@@ -606,21 +599,21 @@ describe TagsController do
         it "can return synonyms" do
           get "/tags/filter/search.json", params: { q: 'plant' }
           expect(response.status).to eq(200)
-          expect(json['results'].map { |j| j['id'] }).to contain_exactly('plant', 'plants')
+          expect(response.parsed_body['results'].map { |j| j['id'] }).to contain_exactly('plant', 'plants')
         end
 
         it "can omit synonyms" do
           get "/tags/filter/search.json", params: { q: 'plant', excludeSynonyms: 'true' }
           expect(response.status).to eq(200)
-          expect(json['results'].map { |j| j['id'] }).to contain_exactly('plant')
+          expect(response.parsed_body['results'].map { |j| j['id'] }).to contain_exactly('plant')
         end
 
         it "can return a message about synonyms not being allowed" do
           get "/tags/filter/search.json", params: { q: 'plants', excludeSynonyms: 'true' }
           expect(response.status).to eq(200)
-          expect(json["results"].map { |j| j["id"] }.sort).to eq([])
-          expect(json["forbidden"]).to be_present
-          expect(json["forbidden_message"]).to eq(I18n.t("tags.forbidden.synonym", tag_name: tag.name))
+          expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq([])
+          expect(response.parsed_body["forbidden"]).to be_present
+          expect(response.parsed_body["forbidden_message"]).to eq(I18n.t("tags.forbidden.synonym", tag_name: tag.name))
         end
       end
 
@@ -628,7 +621,7 @@ describe TagsController do
         yup, nope = Fabricate(:tag, name: 'yup'), Fabricate(:tag, name: 'nope')
         get "/tags/filter/search.json", params: { q: 'N/ope' }
         expect(response.status).to eq(200)
-        expect(json["results"].map { |j| j["id"] }.sort).to eq(["nope"])
+        expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq(["nope"])
       end
 
       it "can return tags that are in secured categories but are allowed to be used" do
@@ -636,7 +629,7 @@ describe TagsController do
         Fabricate(:topic, category: c, tags: [Fabricate(:tag, name: "cooltag")])
         get "/tags/filter/search.json", params: { q: "cool" }
         expect(response.status).to eq(200)
-        expect(json["results"].map { |j| j["id"] }).to eq(['cooltag'])
+        expect(response.parsed_body["results"].map { |j| j["id"] }).to eq(['cooltag'])
       end
 
       it "supports Chinese and Russian" do
@@ -645,13 +638,11 @@ describe TagsController do
 
         get "/tags/filter/search.json", params: { q: '房' }
         expect(response.status).to eq(200)
-        json = get_json_body
-        expect(json["results"].map { |j| j["id"] }).to eq(['房地产'])
+        expect(response.parsed_body["results"].map { |j| j["id"] }).to eq(['房地产'])
 
         get "/tags/filter/search.json", params: { q: 'тема' }
         expect(response.status).to eq(200)
-        json = get_json_body
-        expect(json["results"].map { |j| j["id"] }).to eq(['тема-в-разработке'])
+        expect(response.parsed_body["results"].map { |j| j["id"] }).to eq(['тема-в-разработке'])
       end
 
       it "can return all the results" do
@@ -659,10 +650,10 @@ describe TagsController do
         tag_group2 = Fabricate(:tag_group, tag_names: ['common1', 'common2'])
         category = Fabricate(:category, tag_groups: [tag_group1])
         get "/tags/filter/search.json", params: { q: '', limit: 5, categoryId: category.id, filterForInput: 'true' }
+
         expect(response.status).to eq(200)
-        json = get_json_body
         expect_same_tag_names(
-          json["results"].map { |j| j["id"] },
+          response.parsed_body["results"].map { |j| j["id"] },
           ['common1', 'common2', 'group1tag', 'group1tag2']
         )
       end
@@ -688,7 +679,7 @@ describe TagsController do
         it 'returns a tag not found message' do
           delete "/tag/doesntexists.json"
           expect(response).not_to be_successful
-          expect(json['error_type']).to eq('not_found')
+          expect(response.parsed_body['error_type']).to eq('not_found')
         end
       end
     end
@@ -720,7 +711,7 @@ describe TagsController do
         it 'returns the correct unused tags' do
           get "/tags/unused.json"
           expect(response.status).to eq(200)
-          expect(json["tags"]).to contain_exactly("unused1", "unused2")
+          expect(response.parsed_body["tags"]).to contain_exactly("unused1", "unused2")
         end
 
         it 'deletes the correct tags' do
@@ -817,9 +808,8 @@ describe TagsController do
         tag3 = Fabricate(:tag)
         post "/tag/#{tag3.name}/synonyms.json", params: { synonyms: [tag.name] }
         expect(response.status).to eq(200)
-        json = JSON.parse(response.body)
-        expect(json['failed']).to be_present
-        expect(json.dig('failed_tags', tag.name)).to be_present
+        expect(response.parsed_body['failed']).to be_present
+        expect(response.parsed_body.dig('failed_tags', tag.name)).to be_present
       end
     end
   end
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index ebb2b90f04..9f9b32ce2e 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe TopicsController do
       get "/t/#{topic.id}/wordpress.json", params: { best: 3 }
 
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
 
       # The JSON has the data the wordpress plugin needs
       expect(json['id']).to eq(topic.id)
@@ -92,7 +92,7 @@ RSpec.describe TopicsController do
         }
         expect(response.status).to eq(422)
 
-        result = ::JSON.parse(response.body)
+        result = response.parsed_body
 
         expect(result['errors']).to be_present
       end
@@ -112,7 +112,7 @@ RSpec.describe TopicsController do
 
           expect(response.status).to eq(200)
 
-          result = ::JSON.parse(response.body)
+          result = response.parsed_body
 
           expect(result['success']).to eq(true)
           expect(result['url']).to eq(Topic.last.relative_url)
@@ -135,7 +135,7 @@ RSpec.describe TopicsController do
 
             expect(response.status).to eq(200)
 
-            result = JSON.parse(response.body)
+            result = response.parsed_body
 
             expect(result['success']).to eq(true)
             expect(result['url']).to eq(Topic.last.relative_url)
@@ -150,7 +150,7 @@ RSpec.describe TopicsController do
             post_ids: [p2.id]
           }
           expect(response.status).to eq(200)
-          result = ::JSON.parse(response.body)
+          result = response.parsed_body
           expect(result['success']).to eq(false)
           expect(result['url']).to be_blank
         end
@@ -174,7 +174,7 @@ RSpec.describe TopicsController do
             p1.reload
             p2.reload
 
-            new_topic_id = JSON.parse(response.body)["url"].split("/").last.to_i
+            new_topic_id = response.parsed_body["url"].split("/").last.to_i
             new_topic = Topic.find(new_topic_id)
             expect(p1.topic.id).to eq(new_topic.id)
             expect(p2.topic.id).to eq(new_topic.id)
@@ -200,7 +200,7 @@ RSpec.describe TopicsController do
           }
 
           expect(response.status).to eq(200)
-          result = ::JSON.parse(response.body)
+          result = response.parsed_body
           expect(result['success']).to eq(true)
           expect(result['url']).to be_present
         end
@@ -238,7 +238,7 @@ RSpec.describe TopicsController do
           }
 
           expect(response.status).to eq(200)
-          result = ::JSON.parse(response.body)
+          result = response.parsed_body
           expect(result['success']).to eq(false)
           expect(result['url']).to be_blank
         end
@@ -264,7 +264,7 @@ RSpec.describe TopicsController do
         }
 
         expect(response.status).to eq(403)
-        result = ::JSON.parse(response.body)
+        result = response.parsed_body
         expect(result['errors']).to be_present
       end
 
@@ -285,7 +285,7 @@ RSpec.describe TopicsController do
 
           expect(response.status).to eq(200)
 
-          result = ::JSON.parse(response.body)
+          result = response.parsed_body
 
           expect(result['success']).to eq(true)
           expect(result['url']).to eq(Topic.last.relative_url)
@@ -308,7 +308,7 @@ RSpec.describe TopicsController do
 
             expect(response.status).to eq(200)
 
-            result = JSON.parse(response.body)
+            result = response.parsed_body
 
             expect(result['success']).to eq(true)
             expect(result['url']).to eq(Topic.last.relative_url)
@@ -324,7 +324,7 @@ RSpec.describe TopicsController do
             archetype: 'private_message'
           }
           expect(response.status).to eq(200)
-          result = ::JSON.parse(response.body)
+          result = response.parsed_body
           expect(result['success']).to eq(false)
           expect(result['url']).to be_blank
         end
@@ -353,7 +353,7 @@ RSpec.describe TopicsController do
           }
 
           expect(response.status).to eq(200)
-          result = ::JSON.parse(response.body)
+          result = response.parsed_body
           expect(result['success']).to eq(true)
           expect(result['url']).to be_present
         end
@@ -367,7 +367,7 @@ RSpec.describe TopicsController do
           }
 
           expect(response.status).to eq(200)
-          result = ::JSON.parse(response.body)
+          result = response.parsed_body
           expect(result['success']).to eq(false)
           expect(result['url']).to be_blank
         end
@@ -409,7 +409,7 @@ RSpec.describe TopicsController do
           }
 
           expect(response.status).to eq(200)
-          result = ::JSON.parse(response.body)
+          result = response.parsed_body
           expect(result['success']).to eq(true)
           expect(result['url']).to be_present
         end
@@ -453,7 +453,7 @@ RSpec.describe TopicsController do
           }
 
           expect(response.status).to eq(200)
-          result = ::JSON.parse(response.body)
+          result = response.parsed_body
           expect(result['success']).to eq(true)
           expect(result['url']).to be_present
         end
@@ -697,7 +697,7 @@ RSpec.describe TopicsController do
         expect(topic.reload.closed).to eq(false)
         expect(topic.topic_timers).to eq([])
 
-        body = JSON.parse(response.body)
+        body = response.parsed_body
 
         expect(body['topic_status_update']).to eq(nil)
       end
@@ -887,7 +887,7 @@ RSpec.describe TopicsController do
     it "returns JSON for the slug" do
       get "/t/id_for/#{topic.slug}.json"
       expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
+      json = response.parsed_body
       expect(json['topic_id']).to eq(topic.id)
       expect(json['url']).to eq(topic.url)
       expect(json['slug']).to eq(topic.slug)
@@ -953,7 +953,7 @@ RSpec.describe TopicsController do
           put "/t/#{topic.slug}/#{topic.id}.json"
 
           expect(response.status).to eq(200)
-          expect(::JSON.parse(response.body)['basic_topic']).to be_present
+          expect(response.parsed_body['basic_topic']).to be_present
         end
 
         it "throws an error if it could not be saved" do
@@ -1164,7 +1164,7 @@ RSpec.describe TopicsController do
 
             put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: restricted_category.id }
 
-            result = ::JSON.parse(response.body)
+            result = response.parsed_body
 
             expect(response.status).to eq(422)
             expect(result['errors']).to be_present
@@ -1177,7 +1177,7 @@ RSpec.describe TopicsController do
 
             put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: restricted_category.id }
 
-            result = ::JSON.parse(response.body)
+            result = response.parsed_body
 
             expect(response.status).to eq(422)
             expect(result['errors']).to be_present
@@ -1215,7 +1215,7 @@ RSpec.describe TopicsController do
               category_id: category.id
             }
 
-            result = ::JSON.parse(response.body)
+            result = response.parsed_body
             expect(response.status).to eq(422)
             expect(result['errors']).to be_present
             expect(result['errors'][0]).to include(tag2.name)
@@ -1229,7 +1229,7 @@ RSpec.describe TopicsController do
               category_id: category.id
             }
 
-            result = ::JSON.parse(response.body)
+            result = response.parsed_body
             expect(response.status).to eq(200)
             expect(topic.reload.tags).to include(tag1)
           end
@@ -1242,7 +1242,7 @@ RSpec.describe TopicsController do
               category_id: category.id
             }
 
-            result = ::JSON.parse(response.body)
+            result = response.parsed_body
             expect(response.status).to eq(200)
             expect(topic.reload.tags).to contain_exactly(tag3)
           end
@@ -1255,7 +1255,7 @@ RSpec.describe TopicsController do
               category_id: category.id
             }
 
-            result = ::JSON.parse(response.body)
+            result = response.parsed_body
             expect(response.status).to eq(422)
             expect(result['errors']).to be_present
             expect(result['errors'][0]).not_to include(tag3.name)
@@ -1269,7 +1269,7 @@ RSpec.describe TopicsController do
               category_id: restricted_category.id
             }
 
-            result = ::JSON.parse(response.body)
+            result = response.parsed_body
             expect(response.status).to eq(200)
           end
         end
@@ -1763,7 +1763,7 @@ RSpec.describe TopicsController do
 
     context 'filters' do
       def extract_post_stream
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         json["post_stream"]["posts"].map { |post| post["id"] }
       end
 
@@ -2070,7 +2070,7 @@ RSpec.describe TopicsController do
 
       expect(response.status).to eq(200)
 
-      body = JSON.parse(response.body)
+      body = response.parsed_body
 
       expect(body["post_ids"]).to eq([post2.id, post3.id])
     end
@@ -2089,7 +2089,7 @@ RSpec.describe TopicsController do
 
           expect(response.status).to eq(200)
 
-          body = JSON.parse(response.body)
+          body = response.parsed_body
 
           expect(body["post_ids"]).to eq([post2.id])
         end
@@ -2107,7 +2107,7 @@ RSpec.describe TopicsController do
 
           expect(response.status).to eq(200)
 
-          body = JSON.parse(response.body)
+          body = response.parsed_body
 
           expect(body["post_ids"]).to eq([post2.id])
         end
@@ -2131,14 +2131,14 @@ RSpec.describe TopicsController do
 
       expect(response.status).to eq(200)
 
-      body = JSON.parse(response.body)
+      body = response.parsed_body
 
       expect(body["post_stream"]["posts"].first["id"]).to eq(post.id)
 
       expect(body["suggested_topics"]).to eq(nil)
 
       get "/t/#{topic.id}/posts.json?include_suggested=true"
-      body = JSON.parse(response.body)
+      body = response.parsed_body
 
       expect(body["suggested_topics"]).not_to eq(nil)
     end
@@ -2159,7 +2159,7 @@ RSpec.describe TopicsController do
 
           expect(response.status).to eq(200)
 
-          body = JSON.parse(response.body)
+          body = response.parsed_body
 
           expect(body["post_stream"]["posts"].first["id"]).to eq(post2.id)
         end
@@ -2180,7 +2180,7 @@ RSpec.describe TopicsController do
 
           expect(response.status).to eq(200)
 
-          body = JSON.parse(response.body)
+          body = response.parsed_body
 
           expect(body["post_stream"]["posts"].first["id"]).to eq(post2.id)
         end
@@ -2484,7 +2484,7 @@ RSpec.describe TopicsController do
       get "/topics/feature_stats.json", params: { category_id: 1 }
 
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["pinned_in_category_count"]).to eq(0)
       expect(json["pinned_globally_count"]).to eq(0)
       expect(json["banner_count"]).to eq(0)
@@ -2494,7 +2494,7 @@ RSpec.describe TopicsController do
       Fabricate(:topic, category_id: 1, archetype: Archetype.banner, visible: false)
 
       get "/topics/feature_stats.json", params: { category_id: 1 }
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["banner_count"]).to eq(1)
     end
   end
@@ -2510,7 +2510,7 @@ RSpec.describe TopicsController do
         post_ids: [first_post.id, second_post.id, random_post.id]
       }
 
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       json.sort! { |a, b| a["post_id"] <=> b["post_id"] }
 
       # no random post
@@ -2550,7 +2550,7 @@ RSpec.describe TopicsController do
           expect(topic.archetype).to eq(Archetype.private_message)
           expect(response.status).to eq(200)
 
-          result = ::JSON.parse(response.body)
+          result = response.parsed_body
           expect(result['success']).to eq(true)
           expect(result['url']).to be_present
         end
@@ -2579,7 +2579,7 @@ RSpec.describe TopicsController do
           expect(topic.category_id).to eq(category.id)
           expect(response.status).to eq(200)
 
-          result = ::JSON.parse(response.body)
+          result = response.parsed_body
           expect(result['success']).to eq(true)
           expect(result['url']).to be_present
         end
@@ -2630,7 +2630,7 @@ RSpec.describe TopicsController do
         }
 
         expect(response.status).to eq(403)
-        expect(JSON.parse(response.body)["error_type"]).to eq('invalid_access')
+        expect(response.parsed_body["error_type"]).to eq('invalid_access')
       end
     end
 
@@ -2653,7 +2653,7 @@ RSpec.describe TopicsController do
         expect(topic_status_update.topic).to eq(topic)
         expect(topic_status_update.execute_at).to eq_time(24.hours.from_now)
 
-        json = JSON.parse(response.body)
+        json = response.parsed_body
 
         expect(DateTime.parse(json['execute_at']))
           .to eq_time(DateTime.parse(topic_status_update.execute_at.to_s))
@@ -2673,7 +2673,7 @@ RSpec.describe TopicsController do
         expect(response.status).to eq(200)
         expect(topic.reload.public_topic_timer).to eq(nil)
 
-        json = JSON.parse(response.body)
+        json = response.parsed_body
 
         expect(json['execute_at']).to eq(nil)
         expect(json['duration']).to eq(nil)
@@ -2694,7 +2694,7 @@ RSpec.describe TopicsController do
         expect(topic_status_update.execute_at).to eq_time(5.days.from_now)
         expect(topic_status_update.duration).to eq(5)
 
-        json = JSON.parse(response.body)
+        json = response.parsed_body
 
         expect(DateTime.parse(json['execute_at']))
           .to eq_time(DateTime.parse(topic_status_update.execute_at.to_s))
@@ -2719,7 +2719,7 @@ RSpec.describe TopicsController do
           expect(topic_status_update.status_type)
             .to eq(TopicTimer.types[:publish_to_category])
 
-          json = JSON.parse(response.body)
+          json = response.parsed_body
 
           expect(json['category_id']).to eq(topic.category_id)
         end
@@ -2812,7 +2812,7 @@ RSpec.describe TopicsController do
 
             expect(response.status).to eq(422)
 
-            response_body = JSON.parse(response.body)
+            response_body = response.parsed_body
 
             expect(response_body["errors"]).to eq([
               I18n.t("topic_invite.failed_to_invite",
@@ -2853,7 +2853,7 @@ RSpec.describe TopicsController do
             user: user2.username
           }
           expect(response.status).to eq(422)
-          expect(JSON.parse(response.body)["errors"]).to contain_exactly(
+          expect(response.parsed_body["errors"]).to contain_exactly(
             I18n.t("pm_reached_recipients_limit", recipients_limit: SiteSetting.max_allowed_message_recipients)
           )
         end
@@ -2975,7 +2975,7 @@ RSpec.describe TopicsController do
           group: group.name
         }
         expect(response.status).to eq(422)
-        expect(JSON.parse(response.body)["errors"]).to contain_exactly(
+        expect(response.parsed_body["errors"]).to contain_exactly(
           I18n.t("pm_reached_recipients_limit", recipients_limit: SiteSetting.max_allowed_message_recipients)
         )
       end
@@ -3060,7 +3060,7 @@ RSpec.describe TopicsController do
         it "will publish the topic" do
           put "/t/#{topic.id}/publish.json", params: { destination_category_id: category.id }
           expect(response.status).to eq(200)
-          json = ::JSON.parse(response.body)['basic_topic']
+          json = response.parsed_body['basic_topic']
 
           result = Topic.find(json['id'])
           expect(result.category_id).to eq(category.id)
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index 13298866c0..d773ec1adc 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -36,7 +36,7 @@ describe UploadsController do
       it 'is successful with an image' do
         post "/uploads.json", params: { file: logo, type: "avatar" }
         expect(response.status).to eq 200
-        expect(JSON.parse(response.body)["id"]).to be_present
+        expect(response.parsed_body["id"]).to be_present
         expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(1)
       end
 
@@ -47,7 +47,7 @@ describe UploadsController do
         expect(response.status).to eq 200
 
         expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(0)
-        id = JSON.parse(response.body)["id"]
+        id = response.parsed_body["id"]
         expect(id).to be
       end
 
@@ -65,7 +65,7 @@ describe UploadsController do
           HTTP_API_USERNAME: user.username.downcase
         }
 
-        json = ::JSON.parse(response.body)
+        json = response.parsed_body
 
         expect(response.status).to eq(200)
         expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(1)
@@ -82,7 +82,7 @@ describe UploadsController do
           type: "profile_background",
         }
 
-        id = JSON.parse(response.body)["id"]
+        id = response.parsed_body["id"]
         expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(0)
         expect(Upload.find(id).retain_hours).to eq(100)
       end
@@ -91,7 +91,7 @@ describe UploadsController do
         post "/uploads.json", params: { type: "composer" }
 
         expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(0)
-        message = JSON.parse(response.body)
+        message = response.parsed_body
         expect(response.status).to eq 422
         expect(message["errors"]).to contain_exactly(I18n.t("upload.file_missing"))
       end
@@ -104,7 +104,7 @@ describe UploadsController do
 
         expect(response.status).to eq(422)
         expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(0)
-        errors = JSON.parse(response.body)["errors"]
+        errors = response.parsed_body["errors"]
         expect(errors.first).to eq(I18n.t("upload.attachments.too_large", max_size_kb: 1))
       end
 
@@ -140,7 +140,7 @@ describe UploadsController do
         }
 
         expect(response.status).to eq(200)
-        id = JSON.parse(response.body)["id"]
+        id = response.parsed_body["id"]
         expect(Upload.last.id).to eq(id)
       end
 
@@ -155,7 +155,7 @@ describe UploadsController do
         }
 
         expect(response.status).to eq(200)
-        id = JSON.parse(response.body)["id"]
+        id = response.parsed_body["id"]
 
         upload = Upload.last
 
@@ -174,7 +174,7 @@ describe UploadsController do
         }
 
         expect(response.status).to eq(200)
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data["id"]).to be_present
       end
 
@@ -187,7 +187,7 @@ describe UploadsController do
           type: "composer",
         }
 
-        data = JSON.parse(response.body)
+        data = response.parsed_body
         expect(data["errors"].first).to eq(I18n.t("upload.unauthorized", authorized_extensions: ''))
       end
 
@@ -196,7 +196,7 @@ describe UploadsController do
 
         expect(response.status).to eq(422)
         expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(0)
-        message = JSON.parse(response.body)["errors"]
+        message = response.parsed_body["errors"]
         expect(message).to contain_exactly(I18n.t("upload.images.size_not_found"))
       end
     end
@@ -214,7 +214,7 @@ describe UploadsController do
 
     expect(response.status).to eq(200)
 
-    url = JSON.parse(response.body)["url"]
+    url = response.parsed_body["url"]
     upload = Upload.get_from_url(url)
     upload
   end
@@ -465,7 +465,7 @@ describe UploadsController do
         post "/uploads/lookup-urls.json", params: { short_urls: [upload.short_url] }
         expect(response.status).to eq(200)
 
-        result = JSON.parse(response.body)
+        result = response.parsed_body
         expect(result[0]["url"]).to match("secure-media-uploads")
       end
 
@@ -600,7 +600,7 @@ describe UploadsController do
       post "/uploads/lookup-urls.json", params: { short_urls: [upload.short_url] }
       expect(response.status).to eq(200)
 
-      result = JSON.parse(response.body)
+      result = response.parsed_body
       expect(result[0]["url"]).to eq(upload.url)
       expect(result[0]["short_path"]).to eq(upload.short_path)
     end
@@ -623,7 +623,7 @@ describe UploadsController do
         post "/uploads/lookup-urls.json", params: { short_urls: [upload.short_url] }
         expect(response.status).to eq(200)
 
-        result = JSON.parse(response.body)
+        result = response.parsed_body
         expect(result[0]["url"]).to match("/secure-media-uploads")
         expect(result[0]["short_path"]).to eq(upload.short_path)
       end
@@ -635,7 +635,7 @@ describe UploadsController do
         post "/uploads/lookup-urls.json", params: { short_urls: [upload.short_url] }
         expect(response.status).to eq(200)
 
-        result = JSON.parse(response.body)
+        result = response.parsed_body
         expect(result[0]["url"]).to match("/secure-media-uploads")
         expect(result[0]["short_path"]).to eq(upload.short_path)
       end
@@ -679,7 +679,7 @@ describe UploadsController do
 
         expect(response.status).to eq(200)
 
-        result = JSON.parse(response.body)
+        result = response.parsed_body
 
         expect(result["original_filename"]).to eq(upload.original_filename)
         expect(result["width"]).to eq(upload.width)
diff --git a/spec/requests/user_actions_controller_spec.rb b/spec/requests/user_actions_controller_spec.rb
index 1240a96947..d0d04ad660 100644
--- a/spec/requests/user_actions_controller_spec.rb
+++ b/spec/requests/user_actions_controller_spec.rb
@@ -26,7 +26,7 @@ describe UserActionsController do
       get "/user_actions.json", params: { username: post.user.username }
 
       expect(response.status).to eq(200)
-      parsed = JSON.parse(response.body)
+      parsed = response.parsed_body
       actions = parsed["user_actions"]
       expect(actions.length).to eq(1)
       action = actions[0]
@@ -50,7 +50,7 @@ describe UserActionsController do
 
       expect(response.status).to eq(200)
 
-      response_body = JSON.parse(response.body)
+      response_body = response.parsed_body
 
       expect(response_body["user_actions"].count).to eq(1)
 
@@ -68,7 +68,7 @@ describe UserActionsController do
       }
 
       expect(response.status).to eq(200)
-      parsed = JSON.parse(response.body)
+      parsed = response.parsed_body
 
       expect(parsed["no_results_help"]).to eq(I18n.t("user_activity.no_bookmarks.self"))
     end
@@ -83,7 +83,7 @@ describe UserActionsController do
       }
 
       expect(response.status).to eq(200)
-      parsed = JSON.parse(response.body)
+      parsed = response.parsed_body
 
       expect(parsed["no_results_help"]).to eq(I18n.t("user_activity.no_bookmarks.others"))
     end
diff --git a/spec/requests/user_api_keys_controller_spec.rb b/spec/requests/user_api_keys_controller_spec.rb
index c612eb55a1..11ab1db45d 100644
--- a/spec/requests/user_api_keys_controller_spec.rb
+++ b/spec/requests/user_api_keys_controller_spec.rb
@@ -255,7 +255,7 @@ describe UserApiKeysController do
       SiteSetting.min_trust_level_for_user_api_key = 0
       post "/user-api-key.json", params: args
       expect(response.status).not_to eq(302)
-      payload = JSON.parse(response.body)["payload"]
+      payload = response.parsed_body["payload"]
       encrypted = Base64.decode64(payload)
       key = OpenSSL::PKey::RSA.new(private_key)
       parsed = JSON.parse(key.private_decrypt(encrypted))
diff --git a/spec/requests/user_badges_controller_spec.rb b/spec/requests/user_badges_controller_spec.rb
index bd0c8ca354..1c19e01de7 100644
--- a/spec/requests/user_badges_controller_spec.rb
+++ b/spec/requests/user_badges_controller_spec.rb
@@ -15,7 +15,7 @@ describe UserBadgesController do
       get "/user_badges.json", params: { badge_id: badge.id }
       expect(response.status).to eq(200)
 
-      parsed = JSON.parse(response.body)
+      parsed = response.parsed_body
       expect(parsed["topics"]).to eq(nil)
       expect(parsed["badges"].length).to eq(1)
       expect(parsed["user_badge_info"]["user_badges"][0]["post_id"]).to eq(nil)
@@ -40,7 +40,7 @@ describe UserBadgesController do
       get "/user-badges/#{user.username}.json"
 
       expect(response.status).to eq(200)
-      parsed = JSON.parse(response.body)
+      parsed = response.parsed_body
       expect(parsed["user_badges"].length).to eq(1)
     end
 
@@ -49,7 +49,7 @@ describe UserBadgesController do
       get "/user-badges/#{user.username}", xhr: true
 
       expect(response.status).to eq(200)
-      parsed = JSON.parse(response.body)
+      parsed = response.parsed_body
       expect(parsed["user_badges"].length).to eq(1)
     end
 
@@ -57,7 +57,7 @@ describe UserBadgesController do
       get "/user_badges.json", params: { badge_id: badge.id }
 
       expect(response.status).to eq(200)
-      parsed = JSON.parse(response.body)
+      parsed = response.parsed_body
       expect(parsed["user_badge_info"]["user_badges"].length).to eq(1)
     end
 
@@ -67,7 +67,7 @@ describe UserBadgesController do
       }
 
       expect(response.status).to eq(200)
-      parsed = JSON.parse(response.body)
+      parsed = response.parsed_body
       expect(parsed["user_badges"].first.has_key?('count')).to eq(true)
     end
   end
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 5d09c1031f..53c936f820 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -12,7 +12,7 @@ describe UsersController do
       get '/u/hp.json'
       expect(response.status).to eq(200)
 
-      json = JSON.parse(response.body)
+      json = response.parsed_body
 
       params = {
         email: 'jane@jane.com',
@@ -179,7 +179,7 @@ describe UsersController do
         get "/u/password-reset/#{token}.json"
 
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)["message"]).to eq(I18n.t('password_reset.no_token'))
+        expect(response.parsed_body["message"]).to eq(I18n.t('password_reset.no_token'))
         expect(session[:current_user_id]).to be_blank
       end
     end
@@ -204,7 +204,7 @@ describe UsersController do
         put "/u/password-reset/evil_trout!.json", params: { password: "awesomeSecretPassword" }
 
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)["message"]).to eq(I18n.t('password_reset.no_token'))
+        expect(response.parsed_body["message"]).to eq(I18n.t('password_reset.no_token'))
         expect(session[:current_user_id]).to be_blank
       end
     end
@@ -488,7 +488,7 @@ describe UsersController do
         put "/u/password-reset/#{token}.json", params: { password: '' }
 
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)["errors"]).to be_present
+        expect(response.parsed_body["errors"]).to be_present
         expect(session[:current_user_id]).to be_blank
       end
 
@@ -496,7 +496,7 @@ describe UsersController do
         put "/u/password-reset/#{token}.json", params: { password: ('x' * (User.max_password_length + 1)) }
 
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)["errors"]).to be_present
+        expect(response.parsed_body["errors"]).to be_present
         expect(session[:current_user_id]).to be_blank
       end
 
@@ -504,7 +504,7 @@ describe UsersController do
         put "/u/password-reset/#{token}.json", params: { password: 'ksjafh928r' }
 
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)["errors"]).to be_blank
+        expect(response.parsed_body["errors"]).to be_blank
         expect(session[:current_user_id]).to be_present
       end
 
@@ -512,7 +512,7 @@ describe UsersController do
         SiteSetting.must_approve_users = true
 
         put "/u/password-reset/#{token}.json", params: { password: 'ksjafh928r' }
-        expect(JSON.parse(response.body)["errors"]).to be_blank
+        expect(response.parsed_body["errors"]).to be_blank
         expect(session[:current_user_id]).to be_blank
       end
     end
@@ -585,7 +585,7 @@ describe UsersController do
   describe '#create' do
     def honeypot_magic(params)
       get '/u/hp.json'
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       params[:password_confirmation] = json["value"]
       params[:challenge] = json["challenge"].reverse
       params
@@ -635,13 +635,13 @@ describe UsersController do
 
         post_user(invite_code: "abcd")
         expect(response.status).to eq(200)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["success"]).to eq(false)
 
         # case insensitive and stripped of leading/ending spaces
         post_user(invite_code: " AbC deF ")
         expect(response.status).to eq(200)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["success"]).to eq(true)
 
       end
@@ -694,7 +694,7 @@ describe UsersController do
         post_user
         expect(response.status).to eq(200)
 
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['success']).to eq(false)
         expect(json['message']).to be_present
       end
@@ -702,7 +702,7 @@ describe UsersController do
       it 'creates a user correctly' do
         post_user
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)['active']).to be_falsey
+        expect(response.parsed_body['active']).to be_falsey
 
         # should save user_created_message in session
         expect(session["user_created_message"]).to be_present
@@ -722,7 +722,7 @@ describe UsersController do
           post_user
           expect(response.status).to eq(200)
 
-          expect(JSON.parse(response.body)['active']).to be_falsey
+          expect(response.parsed_body['active']).to be_falsey
 
           # should save user_created_message in session
           expect(session["user_created_message"]).to be_present
@@ -745,7 +745,7 @@ describe UsersController do
           post_user
           expect(response.status).to eq(200)
 
-          json = JSON.parse(response.body)
+          json = response.parsed_body
           expect(json['success']).to eq(false)
           expect(json['message']).to be_present
         end
@@ -759,7 +759,7 @@ describe UsersController do
           expect(response.status).to eq(200)
           expect(session["user_created_message"]).to be_present
 
-          json = JSON.parse(response.body)
+          json = response.parsed_body
           expect(json['active']).to be_falsey
           expect(json['message']).to eq(I18n.t("login.activate_email", email: post_user_params[:email]))
         end
@@ -770,7 +770,7 @@ describe UsersController do
       it "won't create the user as active" do
         post "/u.json", params: post_user_params.merge(active: true)
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)['active']).to be_falsey
+        expect(response.parsed_body['active']).to be_falsey
       end
 
       context "with a regular api key" do
@@ -782,7 +782,7 @@ describe UsersController do
             params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key }
 
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)['active']).to be_falsey
+          expect(response.parsed_body['active']).to be_falsey
         end
       end
 
@@ -801,7 +801,7 @@ describe UsersController do
           expect(Jobs::SendSystemMessage.jobs.size).to eq(0)
 
           expect(response.status).to eq(200)
-          json = JSON.parse(response.body)
+          json = response.parsed_body
 
           new_user = User.find(json["user_id"])
           email_token = new_user.email_tokens.active.where(email: new_user.email).first
@@ -822,7 +822,7 @@ describe UsersController do
           post "/u.json", params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key }
 
           expect(response.status).to eq(200)
-          json = JSON.parse(response.body)
+          json = response.parsed_body
 
           new_user = User.find(json["user_id"])
           expect(json['active']).to be_truthy
@@ -837,7 +837,7 @@ describe UsersController do
           post "/u.json", params: post_user_params, headers: { HTTP_API_KEY: api_key.key }
 
           expect(response.status).to eq(200)
-          json = JSON.parse(response.body)
+          json = response.parsed_body
 
           new_user = User.find(json["user_id"])
           expect(json['active']).to eq(false)
@@ -850,7 +850,7 @@ describe UsersController do
 
           post "/u.json", params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key }
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)['active']).to be_falsy
+          expect(response.parsed_body['active']).to be_falsy
         end
 
         it "won't set the new user's locale to the admin's locale" do
@@ -860,7 +860,7 @@ describe UsersController do
           post "/u.json", params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key }
           expect(response.status).to eq(200)
 
-          json = JSON.parse(response.body)
+          json = response.parsed_body
           new_user = User.find(json["user_id"])
           expect(new_user.locale).not_to eq("fr")
         end
@@ -873,7 +873,7 @@ describe UsersController do
           post "/u.json", params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key }
 
           expect(response.status).to eq(200)
-          json = JSON.parse(response.body)
+          json = response.parsed_body
 
           new_user = User.find(json["user_id"])
           expect(json['active']).to be_truthy
@@ -945,7 +945,7 @@ describe UsersController do
         User.any_instance.expects(:enqueue_welcome_message)
         post_user
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)['message']).to eq(
+        expect(response.parsed_body['message']).to eq(
           I18n.t 'login.active'
         )
       end
@@ -961,7 +961,7 @@ describe UsersController do
         User.any_instance.expects(:enqueue_welcome_message)
         post_user
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)['active']).to be_truthy
+        expect(response.parsed_body['active']).to be_truthy
       end
 
       it 'doesn\'t succeed when new registrations are disabled' do
@@ -970,7 +970,7 @@ describe UsersController do
         post_user
         expect(response.status).to eq(200)
 
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['success']).to eq(false)
         expect(json['message']).to be_present
       end
@@ -1019,7 +1019,7 @@ describe UsersController do
           }
 
           expect(response.status).to eq(200)
-          json = JSON.parse(response.body)
+          json = response.parsed_body
           expect(json['success']).to eq(false)
           expect(json['message']).to be_present
         end
@@ -1033,7 +1033,7 @@ describe UsersController do
           }
 
           expect(response.status).to eq(200)
-          json = JSON.parse(response.body)
+          json = response.parsed_body
           expect(json['success']).to eq(true)
         end
       end
@@ -1042,7 +1042,7 @@ describe UsersController do
     it "creates user successfully but doesn't activate the account" do
       post_user
       expect(response.status).to eq(200)
-      json = JSON::parse(response.body)
+      json = response.parsed_body
       expect(json["success"]).to eq(true)
       expect(User.find_by(username: @user.username).active).to eq(false)
     end
@@ -1057,7 +1057,7 @@ describe UsersController do
 
         expect(response.status).to eq(200)
 
-        json = JSON::parse(response.body)
+        json = response.parsed_body
         expect(json["success"]).to eq(true)
 
         # should not change the session
@@ -1103,7 +1103,7 @@ describe UsersController do
 
       it 'should report failed' do
         post "/u.json", params: create_params
-        json = JSON::parse(response.body)
+        json = response.parsed_body
         expect(json["success"]).not_to eq(true)
 
         # should not change the session
@@ -1253,7 +1253,7 @@ describe UsersController do
         )
 
         expect(response.status).to eq(200)
-        result = ::JSON.parse(response.body)
+        result = response.parsed_body
         expect(result["success"]).to eq(true)
 
         created_user = User.find_by_email(staged.email)
@@ -1309,7 +1309,7 @@ describe UsersController do
 
         expect(response.status).to eq(422)
 
-        body = JSON.parse(response.body)
+        body = response.parsed_body
 
         expect(body['errors'].first).to include(I18n.t(
           'user.username.short', min: User.username_length.begin
@@ -1328,7 +1328,7 @@ describe UsersController do
       it 'raises an error when the username clashes with an existing user route' do
         put "/u/#{user.username}/preferences/username.json", params: { new_username: 'account-created' }
 
-        body = JSON.parse(response.body)
+        body = response.parsed_body
 
         expect(body['errors'].first).to include(I18n.t('login.reserved_username'))
       end
@@ -1337,7 +1337,7 @@ describe UsersController do
         SiteSetting.reserved_usernames = 'reserved'
 
         put "/u/#{user.username}/preferences/username.json", params: { new_username: 'reserved' }
-        body = JSON.parse(response.body)
+        body = response.parsed_body
 
         expect(body['errors'].first).to include(I18n.t('login.reserved_username'))
       end
@@ -1370,7 +1370,7 @@ describe UsersController do
       it 'should return a JSON response with the updated username' do
         put "/u/#{user.username}/preferences/username.json", params: { new_username: new_username }
 
-        expect(::JSON.parse(response.body)['username']).to eq(new_username)
+        expect(response.parsed_body['username']).to eq(new_username)
       end
 
       it 'should respond with proper error message if sso_overrides_username is enabled' do
@@ -1383,7 +1383,7 @@ describe UsersController do
         put "/u/#{user.username}/preferences/username.json", params: { new_username: new_username }
 
         expect(response.status).to eq(422)
-        expect(::JSON.parse(response.body)['errors'].first).to include(I18n.t('errors.messages.sso_overrides_username'))
+        expect(response.parsed_body['errors'].first).to include(I18n.t('errors.messages.sso_overrides_username'))
       end
     end
   end
@@ -1397,15 +1397,15 @@ describe UsersController do
     shared_examples 'when username is unavailable' do
       it 'should return available as false in the JSON and return a suggested username' do
         expect(response.status).to eq(200)
-        expect(::JSON.parse(response.body)['available']).to eq(false)
-        expect(::JSON.parse(response.body)['suggestion']).to be_present
+        expect(response.parsed_body['available']).to eq(false)
+        expect(response.parsed_body['suggestion']).to be_present
       end
     end
 
     shared_examples 'when username is available' do
       it 'should return available in the JSON' do
         expect(response.status).to eq(200)
-        expect(::JSON.parse(response.body)['available']).to eq(true)
+        expect(response.parsed_body['available']).to eq(true)
       end
     end
 
@@ -1432,8 +1432,8 @@ describe UsersController do
     shared_examples 'checking an invalid username' do
       it 'should not return an available key but should return an error message' do
         expect(response.status).to eq(200)
-        expect(::JSON.parse(response.body)['available']).to eq(nil)
-        expect(::JSON.parse(response.body)['errors']).to be_present
+        expect(response.parsed_body['available']).to eq(nil)
+        expect(response.parsed_body['errors']).to be_present
       end
     end
 
@@ -1445,7 +1445,7 @@ describe UsersController do
 
       it 'should return the invalid characters message' do
         expect(response.status).to eq(200)
-        expect(::JSON.parse(response.body)['errors']).to include(I18n.t(:'user.username.characters'))
+        expect(response.parsed_body['errors']).to include(I18n.t(:'user.username.characters'))
       end
     end
 
@@ -1457,7 +1457,7 @@ describe UsersController do
 
       it 'should return the "too long" message' do
         expect(response.status).to eq(200)
-        expect(::JSON.parse(response.body)['errors']).to include(I18n.t(:'user.username.long', max: User.username_length.end))
+        expect(response.parsed_body['errors']).to include(I18n.t(:'user.username.long', max: User.username_length.end))
       end
     end
 
@@ -1509,7 +1509,7 @@ describe UsersController do
       get "/u/#{user.username}/invited_count.json"
       expect(response.status).to eq(200)
 
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json).to be_present
       expect(json['counts']).to be_present
     end
@@ -1542,14 +1542,14 @@ describe UsersController do
       get "/u/#{inviter.username}/invited.json", params: { search: 'billybob' }
       expect(response.status).to eq(200)
 
-      invites = JSON.parse(response.body)['invites']
+      invites = response.parsed_body['invites']
       expect(invites.size).to eq(1)
       expect(invites.first).to include('email' => 'billybob@example.com')
 
       get "/u/#{inviter.username}/invited.json", params: { search: invitee.username }
       expect(response.status).to eq(200)
 
-      invites = JSON.parse(response.body)['invites']
+      invites = response.parsed_body['invites']
       expect(invites.size).to eq(2)
       expect(invites[0]['email']).to be_present
     end
@@ -1565,13 +1565,13 @@ describe UsersController do
       get "/u/#{inviter.username}/invited.json", params: { search: 'billybob' }
       expect(response.status).to eq(200)
 
-      invites = JSON.parse(response.body)['invites']
+      invites = response.parsed_body['invites']
       expect(invites.size).to eq(0)
 
       get "/u/#{inviter.username}/invited.json", params: { search: invitee.username }
       expect(response.status).to eq(200)
 
-      invites = JSON.parse(response.body)['invites']
+      invites = response.parsed_body['invites']
       expect(invites.size).to eq(2)
       expect(invites[0]['email']).to be_blank
     end
@@ -1587,7 +1587,7 @@ describe UsersController do
       get "/u/#{inviter.username}/invited.json", params: { search: 'billybob' }
       expect(response.status).to eq(200)
 
-      invites = JSON.parse(response.body)['invites']
+      invites = response.parsed_body['invites']
       expect(invites.size).to eq(1)
       expect(invites[0]['email']).to be_present
     end
@@ -1613,7 +1613,7 @@ describe UsersController do
           get "/u/#{inviter.username}/invited.json"
           expect(response.status).to eq(200)
 
-          invites = JSON.parse(response.body)['invites']
+          invites = response.parsed_body['invites']
           expect(invites.size).to eq(1)
           expect(invites.first).to include('email' => invite.email)
         end
@@ -1631,7 +1631,7 @@ describe UsersController do
             get "/u/#{inviter.username}/invited/pending.json"
             expect(response.status).to eq(200)
 
-            invites = JSON.parse(response.body)['invites']
+            invites = response.parsed_body['invites']
             expect(invites.size).to eq(1)
             expect(invites.first).to include("email" => invite.email)
           end
@@ -1664,7 +1664,7 @@ describe UsersController do
           get "/u/#{inviter.username}/invited.json"
           expect(response.status).to eq(200)
 
-          invites = JSON.parse(response.body)['invites']
+          invites = response.parsed_body['invites']
           expect(invites.size).to eq(1)
           expect(invites.first).to include('email' => invite.email)
         end
@@ -1931,7 +1931,7 @@ describe UsersController do
         it 'returns user JSON' do
           put "/u/#{user.username}.json"
 
-          json = JSON.parse(response.body)
+          json = response.parsed_body
           expect(json['user']['id']).to eq user.id
         end
       end
@@ -2035,7 +2035,7 @@ describe UsersController do
           post "/u/action/send_activation_email.json", params: { username: user.username }
 
           expect(response.status).to eq(409)
-          expect(JSON.parse(response.body)['errors']).to include(I18n.t(
+          expect(response.parsed_body['errors']).to include(I18n.t(
             'activation.activated'
           ))
           expect(session[SessionController::ACTIVATE_USER_KEY]).to eq(nil)
@@ -2477,7 +2477,7 @@ describe UsersController do
         get "/u/#{user.username}/emails.json"
 
         expect(response.status).to eq(200)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["email"]).to eq(user.email)
         expect(json["secondary_emails"]).to eq(user.secondary_emails)
         expect(json["associated_accounts"]).to eq([])
@@ -2490,7 +2490,7 @@ describe UsersController do
         get "/u/#{user.username}/emails.json"
 
         expect(response.status).to eq(200)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["email"]).to eq(user.email)
         expect(json["secondary_emails"]).to eq(user.secondary_emails)
         expect(json["associated_accounts"]).to eq([])
@@ -2503,7 +2503,7 @@ describe UsersController do
         get "/u/#{inactive_user.username}/emails.json"
 
         expect(response.status).to eq(200)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["email"]).to eq(inactive_user.email)
         expect(json["secondary_emails"]).to eq(inactive_user.secondary_emails)
         expect(json["associated_accounts"]).to eq([])
@@ -2525,7 +2525,7 @@ describe UsersController do
       get "/u/is_local_username.json", params: { username: user.username }
 
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["valid"][0]).to eq(user.username)
     end
 
@@ -2533,7 +2533,7 @@ describe UsersController do
       sign_in(user)
       get "/u/is_local_username.json", params: { username: group.name }
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["valid_groups"]).to include(group.name)
       expect(json["mentionable_groups"].find { |g| g['name'] == group.name }).to be_present
     end
@@ -2542,7 +2542,7 @@ describe UsersController do
       sign_in(user)
       get "/u/is_local_username.json", params: { username: unmentionable.name }
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["valid_groups"]).to include(unmentionable.name)
       expect(json["mentionable_groups"]).to be_blank
     end
@@ -2551,7 +2551,7 @@ describe UsersController do
       get "/u/is_local_username.json", params: { usernames: [user.username, "system"] }
 
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["valid"].size).to eq(2)
     end
 
@@ -2561,7 +2561,7 @@ describe UsersController do
       get "/u/is_local_username.json", params: { usernames: [staged.username] }
 
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["valid"].size).to eq(0)
     end
 
@@ -2573,7 +2573,7 @@ describe UsersController do
       }
 
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["cannot_see"].size).to eq(1)
     end
 
@@ -2585,7 +2585,7 @@ describe UsersController do
       }
 
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["cannot_see"].size).to eq(0)
     end
 
@@ -2597,7 +2597,7 @@ describe UsersController do
       }
 
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["cannot_see"].size).to eq(1)
     end
 
@@ -2609,7 +2609,7 @@ describe UsersController do
       }
 
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["cannot_see"].size).to eq(0)
     end
   end
@@ -2632,7 +2632,7 @@ describe UsersController do
         get "/u/#{user.username}/topic-tracking-state.json"
 
         expect(response.status).to eq(200)
-        states = JSON.parse(response.body)
+        states = response.parsed_body
         expect(states[0]["topic_id"]).to eq(topic.id)
       end
     end
@@ -2645,7 +2645,7 @@ describe UsersController do
 
       get "/u/#{user.username_lower}/summary.json"
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
 
       expect(json["user_summary"]["topic_count"]).to eq(1)
       expect(json["user_summary"]["post_count"]).to eq(0)
@@ -2903,7 +2903,7 @@ describe UsersController do
       it "returns success" do
         get "/u/#{user.username}.json"
         expect(response.status).to eq(200)
-        parsed = JSON.parse(response.body)["user"]
+        parsed = response.parsed_body["user"]
 
         expect(parsed['username']).to eq(user.username)
         expect(parsed["profile_hidden"]).to be_blank
@@ -2915,7 +2915,7 @@ describe UsersController do
 
         get "/u/#{user.username}.json"
         expect(response.status).to eq(200)
-        parsed = JSON.parse(response.body)["user"]
+        parsed = response.parsed_body["user"]
 
         expect(parsed["username"]).to eq(user.username)
         expect(parsed["profile_hidden"]).to eq(true)
@@ -2956,7 +2956,7 @@ describe UsersController do
         expect(response.status).to eq(200)
         expect(response.headers['X-Robots-Tag']).to eq('noindex')
 
-        json = JSON.parse(response.body)
+        json = response.parsed_body
 
         expect(json["user"]["has_title_badges"]).to eq(false)
       end
@@ -3010,7 +3010,7 @@ describe UsersController do
         it "returns fetch for a matching external_id" do
           get "/u/by-external/997.json"
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)["user"]["username"]).to eq(user.username)
+          expect(response.parsed_body["user"]["username"]).to eq(user.username)
         end
 
         it "returns not found when external_id doesn't match" do
@@ -3032,7 +3032,7 @@ describe UsersController do
 
         it "includes only visible posts" do
           get "/u/#{admin.username}.json", params: { include_post_count_for: topic.id }
-          topic_post_count = JSON.parse(response.body).dig("user", "topic_post_count")
+          topic_post_count = response.parsed_body.dig("user", "topic_post_count")
           expect(topic_post_count[topic.id.to_s]).to eq(1)
         end
 
@@ -3040,7 +3040,7 @@ describe UsersController do
           sign_in(admin)
 
           get "/u/#{admin.username}.json", params: { include_post_count_for: topic.id }
-          topic_post_count = JSON.parse(response.body).dig("user", "topic_post_count")
+          topic_post_count = response.parsed_body.dig("user", "topic_post_count")
           expect(topic_post_count[topic.id.to_s]).to eq(2)
         end
       end
@@ -3074,7 +3074,7 @@ describe UsersController do
       it "returns success" do
         get "/u/#{user.username}/card.json"
         expect(response.status).to eq(200)
-        parsed = JSON.parse(response.body)["user"]
+        parsed = response.parsed_body["user"]
 
         expect(parsed["username"]).to eq(user.username)
         expect(parsed["profile_hidden"]).to be_blank
@@ -3099,7 +3099,7 @@ describe UsersController do
         get "/u/#{user.username}/card.json"
         expect(response.status).to eq(200)
 
-        json = JSON.parse(response.body)
+        json = response.parsed_body
 
         expect(json["user"]["associated_accounts"]).to eq(nil) # Not serialized in card
         expect(json["user"]["username"]).to eq(user.username)
@@ -3125,7 +3125,7 @@ describe UsersController do
     it "returns success" do
       get "/user-cards.json?user_ids=#{user.id},#{user2.id}"
       expect(response.status).to eq(200)
-      parsed = JSON.parse(response.body)["users"]
+      parsed = response.parsed_body["users"]
 
       expect(parsed.map { |u| u["username"] }).to contain_exactly(user.username, user2.username)
     end
@@ -3140,7 +3140,7 @@ describe UsersController do
       user2.user_option.update(hide_profile_and_presence: true)
       get "/user-cards.json?user_ids=#{user.id},#{user2.id}"
       expect(response.status).to eq(200)
-      parsed = JSON.parse(response.body)["users"]
+      parsed = response.parsed_body["users"]
 
       expect(parsed.map { |u| u["username"] }).to contain_exactly(user.username)
     end
@@ -3221,14 +3221,14 @@ describe UsersController do
     it "searches when provided the term only" do
       get "/u/search/users.json", params: { term: user.name.split(" ").last }
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["users"].map { |u| u["username"] }).to include(user.username)
     end
 
     it "searches when provided the topic only" do
       get "/u/search/users.json", params: { topic_id: topic.id }
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["users"].map { |u| u["username"] }).to include(user.username)
     end
 
@@ -3238,7 +3238,7 @@ describe UsersController do
       }
 
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["users"].map { |u| u["username"] }).to include(user.username)
     end
 
@@ -3262,7 +3262,7 @@ describe UsersController do
       }
 
       expect(response.status).to eq(200)
-      json = JSON.parse(response.body)
+      json = response.parsed_body
       expect(json["users"].map { |u| u["username"] }).to_not include(user.username)
       expect(json["users"].map { |u| u["username"] }).to include(privileged_user.username)
     end
@@ -3283,7 +3283,7 @@ describe UsersController do
 
       it "returns names" do
         get "/u/search/users.json", params: { term: user.name }
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["users"].map { |u| u["name"] }).to include(user.name)
       end
     end
@@ -3295,7 +3295,7 @@ describe UsersController do
 
       it "returns names" do
         get "/u/search/users.json", params: { term: user.name }
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json["users"].map { |u| u["name"] }).not_to include(user.name)
       end
     end
@@ -3347,7 +3347,7 @@ describe UsersController do
 
           expect(response.status).to eq(200)
 
-          groups = JSON.parse(response.body)["groups"]
+          groups = response.parsed_body["groups"]
           expect(groups).to eq(nil)
         end
 
@@ -3356,7 +3356,7 @@ describe UsersController do
 
           expect(response.status).to eq(200)
 
-          groups = JSON.parse(response.body)["groups"]
+          groups = response.parsed_body["groups"]
 
           expect(groups.map { |group| group['name'] })
             .to_not include(private_group.name)
@@ -3370,7 +3370,7 @@ describe UsersController do
           }
 
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)).not_to have_key(:groups)
+          expect(response.parsed_body).not_to have_key(:groups)
         end
 
         it "searches for messageable groups" do
@@ -3382,7 +3382,7 @@ describe UsersController do
 
           expect(response.status).to eq(200)
 
-          expect(JSON.parse(response.body)["groups"].map { |group| group['name'] })
+          expect(response.parsed_body["groups"].map { |group| group['name'] })
             .to contain_exactly(messageable_group.name, Group.find(Group::AUTO_GROUPS[:moderators]).name)
         end
 
@@ -3395,7 +3395,7 @@ describe UsersController do
 
           expect(response.status).to eq(200)
 
-          groups = JSON.parse(response.body)["groups"]
+          groups = response.parsed_body["groups"]
 
           expect(groups.map { |group| group['name'] })
             .to contain_exactly(mentionable_group.name, mentionable_group_2.name)
@@ -3411,7 +3411,7 @@ describe UsersController do
           }
 
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)).not_to have_key(:groups)
+          expect(response.parsed_body).not_to have_key(:groups)
 
           get "/u/search/users.json", params: {
             include_mentionable_groups: 'false',
@@ -3420,7 +3420,7 @@ describe UsersController do
           }
 
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)).not_to have_key(:groups)
+          expect(response.parsed_body).not_to have_key(:groups)
 
           get "/u/search/users.json", params: {
             include_messageable_groups: 'false',
@@ -3429,7 +3429,7 @@ describe UsersController do
           }
 
           expect(response.status).to eq(200)
-          expect(JSON.parse(response.body)).not_to have_key(:groups)
+          expect(response.parsed_body).not_to have_key(:groups)
         end
       end
 
@@ -3477,7 +3477,7 @@ describe UsersController do
         end
 
         def users_found
-          JSON.parse(response.body)['users'].map { |u| u['username'] }
+          response.parsed_body['users'].map { |u| u['username'] }
         end
       end
     end
@@ -3505,7 +3505,7 @@ describe UsersController do
       post "/u/email-login.json", params: { login: user.email }
 
       expect(response.status).to eq(200)
-      expect(JSON.parse(response.body)['user_found']).to eq(true)
+      expect(response.parsed_body['user_found']).to eq(true)
 
       job_args = Jobs::CriticalUserEmail.jobs.last["args"].first
 
@@ -3530,7 +3530,7 @@ describe UsersController do
         post "/u/email-login.json", params: { login: '@random' }
 
         expect(response.status).to eq(200)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json['user_found']).to eq(false)
         expect(json['hide_taken']).to eq(false)
         expect(Jobs::CriticalUserEmail.jobs).to eq([])
@@ -3543,7 +3543,7 @@ describe UsersController do
         post "/u/email-login.json", params: { login: user.email }
 
         expect(response.status).to eq(200)
-        json = JSON.parse(response.body)
+        json = response.parsed_body
         expect(json.has_key?('user_found')).to eq(false)
         expect(json['hide_taken']).to eq(true)
       end
@@ -3610,7 +3610,7 @@ describe UsersController do
 
           expect(response.status).to eq(200)
 
-          response_body = JSON.parse(response.body)
+          response_body = response.parsed_body
 
           expect(response_body['key']).to be_present
           expect(response_body['qr']).to be_present
@@ -3646,7 +3646,7 @@ describe UsersController do
         post "/users/enable_second_factor_totp.json", params: { name: "test", second_factor_token: "123456" }
       end
       it "shows a helpful error message to the user" do
-        expect(JSON.parse(response.body)['error']).to eq(I18n.t("login.invalid_second_factor_code"))
+        expect(response.parsed_body['error']).to eq(I18n.t("login.invalid_second_factor_code"))
       end
     end
 
@@ -3656,7 +3656,7 @@ describe UsersController do
         post "/users/enable_second_factor_totp.json", params: { second_factor_token: "123456" }
       end
       it "shows a helpful error message to the user" do
-        expect(JSON.parse(response.body)['error']).to eq(I18n.t("login.missing_second_factor_name"))
+        expect(response.parsed_body['error']).to eq(I18n.t("login.missing_second_factor_name"))
       end
     end
 
@@ -3666,7 +3666,7 @@ describe UsersController do
         post "/users/enable_second_factor_totp.json", params: { name: "test" }
       end
       it "shows a helpful error message to the user" do
-        expect(JSON.parse(response.body)['error']).to eq(I18n.t("login.missing_second_factor_code"))
+        expect(response.parsed_body['error']).to eq(I18n.t("login.missing_second_factor_code"))
       end
     end
   end
@@ -3813,7 +3813,7 @@ describe UsersController do
 
           expect(response.status).to eq(200)
 
-          response_body = JSON.parse(response.body)
+          response_body = response.parsed_body
 
           # we use SecureRandom.hex(16) for backup codes, ensure this continues to be the case
           expect(response_body['backup_codes'].map(&:length)).to eq([32] * 10)
@@ -3826,7 +3826,7 @@ describe UsersController do
     it "stores the challenge in the session and returns challenge data, user id, and supported algorithms" do
       create_second_factor_security_key
       secure_session = read_secure_session
-      response_parsed = JSON.parse(response.body)
+      response_parsed = response.parsed_body
       expect(response_parsed["challenge"]).to eq(
         Webauthn.challenge(user, secure_session)
       )
@@ -3849,7 +3849,7 @@ describe UsersController do
 
       it "returns those existing active credentials" do
         create_second_factor_security_key
-        response_parsed = JSON.parse(response.body)
+        response_parsed = response.parsed_body
         expect(response_parsed["existing_active_credential_ids"]).to eq(
           [user_security_key.credential_id]
         )
@@ -3862,7 +3862,7 @@ describe UsersController do
       it "creates a security key for the user" do
         simulate_localhost_webauthn_challenge
         create_second_factor_security_key
-        response_parsed = JSON.parse(response.body)
+        response_parsed = response.parsed_body
 
         post "/u/register_second_factor_security_key.json", params: valid_security_key_create_post_data
 
@@ -3876,7 +3876,7 @@ describe UsersController do
       it "shows a security key error and does not create a key" do
         stub_as_dev_localhost
         create_second_factor_security_key
-        response_parsed = JSON.parse(response.body)
+        response_parsed = response.parsed_body
 
         post "/u/register_second_factor_security_key.json", params: {
           id: "bad id",
@@ -3888,7 +3888,7 @@ describe UsersController do
         }
 
         expect(user.security_keys.count).to eq(0)
-        expect(JSON.parse(response.body)["error"]).to eq(I18n.t("webauthn.validation.invalid_type_error"))
+        expect(response.parsed_body["error"]).to eq(I18n.t("webauthn.validation.invalid_type_error"))
       end
     end
   end
@@ -4082,7 +4082,7 @@ describe UsersController do
 
         it 'returns password required response' do
           expect(response.status).to eq(200)
-          response_body = JSON.parse(response.body)
+          response_body = response.parsed_body
           expect(response_body['password_required']).to eq(true)
         end
       end
@@ -4100,7 +4100,7 @@ describe UsersController do
             post "/u/second_factors.json", params: { password: password }
 
             expect(response.status).to eq(200)
-            response_body = JSON.parse(response.body)
+            response_body = response.parsed_body
             expect(response_body['totps'].map { |second_factor| second_factor['id'] }).to include(totp_second_factor.id)
             expect(response_body['security_keys'].map { |second_factor| second_factor['id'] }).to include(security_key_second_factor.id)
           end
@@ -4113,7 +4113,7 @@ describe UsersController do
 
             post "/u/second_factors.json", params: { password: password }
 
-            response_body = JSON.parse(response.body)
+            response_body = response.parsed_body
             expect(response_body['error']).to eq(
               I18n.t("login.incorrect_password")
             )
@@ -4237,7 +4237,7 @@ describe UsersController do
       sign_in(user)
       get "/u/#{user.username}/bookmarks.json"
       expect(response.status).to eq(200)
-      expect(JSON.parse(response.body)['user_bookmark_list']['bookmarks'].map { |b| b['id'] }).to match_array([bookmark1.id, bookmark2.id])
+      expect(response.parsed_body['user_bookmark_list']['bookmarks'].map { |b| b['id'] }).to match_array([bookmark1.id, bookmark2.id])
     end
 
     it "does not show another user's bookmarks" do
diff --git a/spec/requests/wizard_controller_spec.rb b/spec/requests/wizard_controller_spec.rb
index d315a09313..0d10b4b3de 100644
--- a/spec/requests/wizard_controller_spec.rb
+++ b/spec/requests/wizard_controller_spec.rb
@@ -43,7 +43,7 @@ describe WizardController do
       sign_in(Fabricate(:admin))
       get "/wizard.json"
       expect(response.status).to eq(200)
-      expect(::JSON.parse(response.body).has_key?('wizard')).to eq(true)
+      expect(response.parsed_body.has_key?('wizard')).to eq(true)
     end
   end
 end
diff --git a/spec/support/integration_helpers.rb b/spec/support/integration_helpers.rb
index b306814aea..8155ef4d2c 100644
--- a/spec/support/integration_helpers.rb
+++ b/spec/support/integration_helpers.rb
@@ -6,7 +6,7 @@ module IntegrationHelpers
 
     expect(response.status).to eq(200)
 
-    body = JSON.parse(response.body)
+    body = response.parsed_body
     honeypot = body["value"]
     challenge = body["challenge"]
     user = Fabricate.build(:user)
@@ -21,7 +21,7 @@ module IntegrationHelpers
 
     expect(response.status).to eq(200)
 
-    body = JSON.parse(response.body)
+    body = response.parsed_body
     User.find(body["user_id"])
   end
 

From 79c64eaeff185b931f146dd01c3bee1ae022e6b9 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 7 May 2020 12:37:47 -0400
Subject: [PATCH 1024/1830] DEV: Move pretty-text into an ember-addon format
 (#9689)

---
 app/assets/javascripts/markdown-it-bundle.js  |    38 +-
 app/assets/javascripts/pretty-text-bundle.js  |    30 +-
 .../pretty-text/{ => addon}/censored-words.js |     0
 .../context/inline-onebox-css-classes.js.erb  |     0
 .../pretty-text/{ => addon}/emoji.js          |     0
 .../pretty-text/{ => addon}/emoji/data.js.erb |     0
 .../{ => addon}/emoji/version.js.erb          |     0
 .../engines/discourse-markdown-it.js          |     0
 .../discourse-markdown/bbcode-block.js        |     0
 .../discourse-markdown/bbcode-inline.js       |     0
 .../discourse-markdown/category-hashtag.js    |     0
 .../engines/discourse-markdown/censored.js    |     0
 .../engines/discourse-markdown/code.js        |     0
 .../engines/discourse-markdown/d-wrap.js      |     0
 .../engines/discourse-markdown/emoji.js       |     0
 .../engines/discourse-markdown/helpers.js     |     0
 .../engines/discourse-markdown/html-img.js    |     0
 .../discourse-markdown/inject-line-number.js  |     0
 .../engines/discourse-markdown/mentions.js    |     0
 .../engines/discourse-markdown/newline.js     |     0
 .../engines/discourse-markdown/onebox.js      |     0
 .../engines/discourse-markdown/paragraph.js   |     0
 .../engines/discourse-markdown/quotes.js      |     0
 .../discourse-markdown/resize-controls.js     |     0
 .../engines/discourse-markdown/table.js       |     0
 .../discourse-markdown/text-post-process.js   |     0
 .../discourse-markdown/upload-protocol.js     |     0
 .../pretty-text/{ => addon}/guid.js           |     0
 .../{ => addon}/inline-oneboxer.js            |     0
 .../pretty-text/{ => addon}/oneboxer-cache.js |     0
 .../pretty-text/{ => addon}/oneboxer.js       |     0
 .../pretty-text/{ => addon}/pretty-text.js    |     0
 .../pretty-text/{ => addon}/sanitizer.js      |     0
 .../{ => addon}/upload-short-url.js           |     0
 .../pretty-text/{ => addon}/white-lister.js   |     0
 .../pretty-text/{ => addon}/xss.js            |     0
 .../javascripts/pretty-text/app/.gitkeep      |     0
 .../pretty-text/config/ember-try.js           |    89 +
 .../pretty-text/config/environment.js         |     5 +
 .../pretty-text/ember-cli-build.js            |     9 +
 app/assets/javascripts/pretty-text/index.js   |     5 +
 .../javascripts/pretty-text/package.json      |    54 +
 app/assets/javascripts/pretty-text/yarn.lock  | 10485 ++++++++++++++++
 43 files changed, 10681 insertions(+), 34 deletions(-)
 rename app/assets/javascripts/pretty-text/{ => addon}/censored-words.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/context/inline-onebox-css-classes.js.erb (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/emoji.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/emoji/data.js.erb (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/emoji/version.js.erb (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown-it.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/bbcode-block.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/bbcode-inline.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/category-hashtag.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/censored.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/code.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/d-wrap.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/emoji.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/helpers.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/html-img.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/inject-line-number.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/mentions.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/newline.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/onebox.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/paragraph.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/quotes.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/resize-controls.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/table.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/text-post-process.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/engines/discourse-markdown/upload-protocol.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/guid.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/inline-oneboxer.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/oneboxer-cache.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/oneboxer.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/pretty-text.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/sanitizer.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/upload-short-url.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/white-lister.js (100%)
 rename app/assets/javascripts/pretty-text/{ => addon}/xss.js (100%)
 create mode 100644 app/assets/javascripts/pretty-text/app/.gitkeep
 create mode 100644 app/assets/javascripts/pretty-text/config/ember-try.js
 create mode 100644 app/assets/javascripts/pretty-text/config/environment.js
 create mode 100644 app/assets/javascripts/pretty-text/ember-cli-build.js
 create mode 100644 app/assets/javascripts/pretty-text/index.js
 create mode 100644 app/assets/javascripts/pretty-text/package.json
 create mode 100644 app/assets/javascripts/pretty-text/yarn.lock

diff --git a/app/assets/javascripts/markdown-it-bundle.js b/app/assets/javascripts/markdown-it-bundle.js
index 052891aaf5..2299af2c60 100644
--- a/app/assets/javascripts/markdown-it-bundle.js
+++ b/app/assets/javascripts/markdown-it-bundle.js
@@ -1,20 +1,20 @@
 //= require markdown-it.js
-//= require ./pretty-text/engines/discourse-markdown/helpers
-//= require ./pretty-text/engines/discourse-markdown/mentions
-//= require ./pretty-text/engines/discourse-markdown/quotes
-//= require ./pretty-text/engines/discourse-markdown/emoji
-//= require ./pretty-text/engines/discourse-markdown/onebox
-//= require ./pretty-text/engines/discourse-markdown/bbcode-block
-//= require ./pretty-text/engines/discourse-markdown/bbcode-inline
-//= require ./pretty-text/engines/discourse-markdown/code
-//= require ./pretty-text/engines/discourse-markdown/category-hashtag
-//= require ./pretty-text/engines/discourse-markdown/censored
-//= require ./pretty-text/engines/discourse-markdown/table
-//= require ./pretty-text/engines/discourse-markdown/paragraph
-//= require ./pretty-text/engines/discourse-markdown/newline
-//= require ./pretty-text/engines/discourse-markdown/html-img
-//= require ./pretty-text/engines/discourse-markdown/text-post-process
-//= require ./pretty-text/engines/discourse-markdown/upload-protocol
-//= require ./pretty-text/engines/discourse-markdown/inject-line-number
-//= require ./pretty-text/engines/discourse-markdown/resize-controls
-//= require ./pretty-text/engines/discourse-markdown/d-wrap
+//= require ./pretty-text/addon/engines/discourse-markdown/helpers
+//= require ./pretty-text/addon/engines/discourse-markdown/mentions
+//= require ./pretty-text/addon/engines/discourse-markdown/quotes
+//= require ./pretty-text/addon/engines/discourse-markdown/emoji
+//= require ./pretty-text/addon/engines/discourse-markdown/onebox
+//= require ./pretty-text/addon/engines/discourse-markdown/bbcode-block
+//= require ./pretty-text/addon/engines/discourse-markdown/bbcode-inline
+//= require ./pretty-text/addon/engines/discourse-markdown/code
+//= require ./pretty-text/addon/engines/discourse-markdown/category-hashtag
+//= require ./pretty-text/addon/engines/discourse-markdown/censored
+//= require ./pretty-text/addon/engines/discourse-markdown/table
+//= require ./pretty-text/addon/engines/discourse-markdown/paragraph
+//= require ./pretty-text/addon/engines/discourse-markdown/newline
+//= require ./pretty-text/addon/engines/discourse-markdown/html-img
+//= require ./pretty-text/addon/engines/discourse-markdown/text-post-process
+//= require ./pretty-text/addon/engines/discourse-markdown/upload-protocol
+//= require ./pretty-text/addon/engines/discourse-markdown/inject-line-number
+//= require ./pretty-text/addon/engines/discourse-markdown/resize-controls
+//= require ./pretty-text/addon/engines/discourse-markdown/d-wrap
diff --git a/app/assets/javascripts/pretty-text-bundle.js b/app/assets/javascripts/pretty-text-bundle.js
index c964a71cda..a2adade382 100644
--- a/app/assets/javascripts/pretty-text-bundle.js
+++ b/app/assets/javascripts/pretty-text-bundle.js
@@ -1,16 +1,16 @@
-//= require ./pretty-text/pretty-text
-//= require ./pretty-text/guid
-//= require ./pretty-text/censored-words
-//= require ./pretty-text/emoji/data
-//= require ./pretty-text/emoji/version
-//= require ./pretty-text/emoji
-//= require ./pretty-text/engines/discourse-markdown-it
+//= require ./pretty-text/addon/pretty-text
+//= require ./pretty-text/addon/guid
+//= require ./pretty-text/addon/censored-words
+//= require ./pretty-text/addon/emoji/data
+//= require ./pretty-text/addon/emoji/version
+//= require ./pretty-text/addon/emoji
+//= require ./pretty-text/addon/engines/discourse-markdown-it
 //= require xss.min
-//= require ./pretty-text/xss
-//= require ./pretty-text/white-lister
-//= require ./pretty-text/sanitizer
-//= require ./pretty-text/oneboxer
-//= require ./pretty-text/oneboxer-cache
-//= require ./pretty-text/context/inline-onebox-css-classes
-//= require ./pretty-text/inline-oneboxer
-//= require ./pretty-text/upload-short-url
+//= require ./pretty-text/addon/xss
+//= require ./pretty-text/addon/white-lister
+//= require ./pretty-text/addon/sanitizer
+//= require ./pretty-text/addon/oneboxer
+//= require ./pretty-text/addon/oneboxer-cache
+//= require ./pretty-text/addon/context/inline-onebox-css-classes
+//= require ./pretty-text/addon/inline-oneboxer
+//= require ./pretty-text/addon/upload-short-url
diff --git a/app/assets/javascripts/pretty-text/censored-words.js b/app/assets/javascripts/pretty-text/addon/censored-words.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/censored-words.js
rename to app/assets/javascripts/pretty-text/addon/censored-words.js
diff --git a/app/assets/javascripts/pretty-text/context/inline-onebox-css-classes.js.erb b/app/assets/javascripts/pretty-text/addon/context/inline-onebox-css-classes.js.erb
similarity index 100%
rename from app/assets/javascripts/pretty-text/context/inline-onebox-css-classes.js.erb
rename to app/assets/javascripts/pretty-text/addon/context/inline-onebox-css-classes.js.erb
diff --git a/app/assets/javascripts/pretty-text/emoji.js b/app/assets/javascripts/pretty-text/addon/emoji.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/emoji.js
rename to app/assets/javascripts/pretty-text/addon/emoji.js
diff --git a/app/assets/javascripts/pretty-text/emoji/data.js.erb b/app/assets/javascripts/pretty-text/addon/emoji/data.js.erb
similarity index 100%
rename from app/assets/javascripts/pretty-text/emoji/data.js.erb
rename to app/assets/javascripts/pretty-text/addon/emoji/data.js.erb
diff --git a/app/assets/javascripts/pretty-text/emoji/version.js.erb b/app/assets/javascripts/pretty-text/addon/emoji/version.js.erb
similarity index 100%
rename from app/assets/javascripts/pretty-text/emoji/version.js.erb
rename to app/assets/javascripts/pretty-text/addon/emoji/version.js.erb
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown-it.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown-it.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/bbcode-block.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/bbcode-block.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/bbcode-inline.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/bbcode-inline.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/category-hashtag.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/category-hashtag.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/censored.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/censored.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/code.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/code.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/d-wrap.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/d-wrap.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/d-wrap.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/d-wrap.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/emoji.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/emoji.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/helpers.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/helpers.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/html-img.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/html-img.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/inject-line-number.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/inject-line-number.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/inject-line-number.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/inject-line-number.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/mentions.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/mentions.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/newline.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/newline.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/onebox.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/onebox.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/paragraph.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/paragraph.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/quotes.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/quotes.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/resize-controls.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/resize-controls.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/table.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/table.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/text-post-process.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/text-post-process.js
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/upload-protocol.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js
rename to app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/upload-protocol.js
diff --git a/app/assets/javascripts/pretty-text/guid.js b/app/assets/javascripts/pretty-text/addon/guid.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/guid.js
rename to app/assets/javascripts/pretty-text/addon/guid.js
diff --git a/app/assets/javascripts/pretty-text/inline-oneboxer.js b/app/assets/javascripts/pretty-text/addon/inline-oneboxer.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/inline-oneboxer.js
rename to app/assets/javascripts/pretty-text/addon/inline-oneboxer.js
diff --git a/app/assets/javascripts/pretty-text/oneboxer-cache.js b/app/assets/javascripts/pretty-text/addon/oneboxer-cache.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/oneboxer-cache.js
rename to app/assets/javascripts/pretty-text/addon/oneboxer-cache.js
diff --git a/app/assets/javascripts/pretty-text/oneboxer.js b/app/assets/javascripts/pretty-text/addon/oneboxer.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/oneboxer.js
rename to app/assets/javascripts/pretty-text/addon/oneboxer.js
diff --git a/app/assets/javascripts/pretty-text/pretty-text.js b/app/assets/javascripts/pretty-text/addon/pretty-text.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/pretty-text.js
rename to app/assets/javascripts/pretty-text/addon/pretty-text.js
diff --git a/app/assets/javascripts/pretty-text/sanitizer.js b/app/assets/javascripts/pretty-text/addon/sanitizer.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/sanitizer.js
rename to app/assets/javascripts/pretty-text/addon/sanitizer.js
diff --git a/app/assets/javascripts/pretty-text/upload-short-url.js b/app/assets/javascripts/pretty-text/addon/upload-short-url.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/upload-short-url.js
rename to app/assets/javascripts/pretty-text/addon/upload-short-url.js
diff --git a/app/assets/javascripts/pretty-text/white-lister.js b/app/assets/javascripts/pretty-text/addon/white-lister.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/white-lister.js
rename to app/assets/javascripts/pretty-text/addon/white-lister.js
diff --git a/app/assets/javascripts/pretty-text/xss.js b/app/assets/javascripts/pretty-text/addon/xss.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/xss.js
rename to app/assets/javascripts/pretty-text/addon/xss.js
diff --git a/app/assets/javascripts/pretty-text/app/.gitkeep b/app/assets/javascripts/pretty-text/app/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/pretty-text/config/ember-try.js b/app/assets/javascripts/pretty-text/config/ember-try.js
new file mode 100644
index 0000000000..bcae42888f
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/config/ember-try.js
@@ -0,0 +1,89 @@
+"use strict";
+
+const getChannelURL = require("ember-source-channel-url");
+
+module.exports = async function() {
+  return {
+    useYarn: true,
+    scenarios: [
+      {
+        name: "ember-lts-3.8",
+        npm: {
+          devDependencies: {
+            "ember-source": "~3.8.0"
+          }
+        }
+      },
+      {
+        name: "ember-lts-3.12",
+        npm: {
+          devDependencies: {
+            "ember-source": "~3.12.0"
+          }
+        }
+      },
+      {
+        name: "ember-release",
+        npm: {
+          devDependencies: {
+            "ember-source": await getChannelURL("release")
+          }
+        }
+      },
+      {
+        name: "ember-beta",
+        npm: {
+          devDependencies: {
+            "ember-source": await getChannelURL("beta")
+          }
+        }
+      },
+      {
+        name: "ember-canary",
+        npm: {
+          devDependencies: {
+            "ember-source": await getChannelURL("canary")
+          }
+        }
+      },
+      // The default `.travis.yml` runs this scenario via `yarn test`,
+      // not via `ember try`. It's still included here so that running
+      // `ember try:each` manually or from a customized CI config will run it
+      // along with all the other scenarios.
+      {
+        name: "ember-default",
+        npm: {
+          devDependencies: {}
+        }
+      },
+      {
+        name: "ember-default-with-jquery",
+        env: {
+          EMBER_OPTIONAL_FEATURES: JSON.stringify({
+            "jquery-integration": true
+          })
+        },
+        npm: {
+          devDependencies: {
+            "@ember/jquery": "^0.5.1"
+          }
+        }
+      },
+      {
+        name: "ember-classic",
+        env: {
+          EMBER_OPTIONAL_FEATURES: JSON.stringify({
+            "application-template-wrapper": true,
+            "default-async-observers": false,
+            "template-only-glimmer-components": false
+          })
+        },
+        npm: {
+          ember: {
+            edition: "classic"
+          }
+        }
+      }
+    ]
+  };
+};
diff --git a/app/assets/javascripts/pretty-text/config/environment.js b/app/assets/javascripts/pretty-text/config/environment.js
new file mode 100644
index 0000000000..352093f4ed
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/config/environment.js
@@ -0,0 +1,5 @@
+"use strict";
+
+module.exports = function(/* environment, appConfig */) {
+  return {};
+};
diff --git a/app/assets/javascripts/pretty-text/ember-cli-build.js b/app/assets/javascripts/pretty-text/ember-cli-build.js
new file mode 100644
index 0000000000..cbf921270c
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/ember-cli-build.js
@@ -0,0 +1,9 @@
+"use strict";
+
+const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");
+
+module.exports = function(defaults) {
+  let app = new EmberAddon(defaults, {});
+
+  return app.toTree();
+};
diff --git a/app/assets/javascripts/pretty-text/index.js b/app/assets/javascripts/pretty-text/index.js
new file mode 100644
index 0000000000..e8db57f915
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/index.js
@@ -0,0 +1,5 @@
+"use strict";
+
+module.exports = {
+  name: require("./package").name
+};
diff --git a/app/assets/javascripts/pretty-text/package.json b/app/assets/javascripts/pretty-text/package.json
new file mode 100644
index 0000000000..a6632ff012
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/package.json
@@ -0,0 +1,54 @@
+{
+  "name": "pretty-text",
+  "version": "1.0.0",
+  "description": "Discourse's text rendering pipeline",
+  "author": "Discourse",
+  "license": "GPLv2",
+  "keywords": [
+    "ember-addon"
+  ],
+  "repository": "",
+  "license": "",
+  "author": "",
+  "scripts": {
+    "build": "ember build",
+    "lint:hbs": "ember-template-lint .",
+    "lint:js": "eslint .",
+    "start": "ember serve"
+  },
+  "dependencies": {
+    "ember-cli-babel": "^7.13.0",
+    "ember-cli-htmlbars": "^4.2.0",
+    "ember-auto-import": "^1.5.3"
+  },
+  "devDependencies": {
+    "@ember/optional-features": "^1.1.0",
+    "@glimmer/component": "^1.0.0",
+    "babel-eslint": "^10.0.3",
+    "broccoli-asset-rev": "^3.0.0",
+    "ember-cli": "~3.15.2",
+    "ember-cli-dependency-checker": "^3.2.0",
+    "ember-cli-eslint": "^5.1.0",
+    "ember-cli-inject-live-reload": "^2.0.1",
+    "ember-cli-sri": "^2.1.1",
+    "ember-cli-template-lint": "^1.0.0-beta.3",
+    "ember-cli-uglify": "^3.0.0",
+    "ember-disable-prototype-extensions": "^1.1.3",
+    "ember-export-application-global": "^2.0.1",
+    "ember-load-initializers": "^2.1.1",
+    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-resolver": "^7.0.0",
+    "ember-source": "~3.15.0",
+    "ember-source-channel-url": "^2.0.1",
+    "ember-try": "^1.4.0",
+    "eslint-plugin-ember": "^7.7.1",
+    "eslint-plugin-node": "^10.0.0",
+    "loader.js": "^4.7.0"
+  },
+  "engines": {
+    "node": "8.* || >= 10.*"
+  },
+  "ember": {
+    "edition": "octane"
+  }
+}
diff --git a/app/assets/javascripts/pretty-text/yarn.lock b/app/assets/javascripts/pretty-text/yarn.lock
new file mode 100644
index 0000000000..fc099710ca
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/yarn.lock
@@ -0,0 +1,10485 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
+  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
+  dependencies:
+    "@babel/highlight" "^7.8.3"
+
+"@babel/compat-data@^7.8.6", "@babel/compat-data@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz#04815556fc90b0c174abd2c0c1bb966faa036a6c"
+  integrity sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==
+  dependencies:
+    browserslist "^4.9.1"
+    invariant "^2.2.4"
+    semver "^5.5.0"
+
+"@babel/core@^7.1.6", "@babel/core@^7.2.2", "@babel/core@^7.3.4", "@babel/core@^7.7.2", "@babel/core@^7.8.3", "@babel/core@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
+  integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.9.0"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helpers" "^7.9.0"
+    "@babel/parser" "^7.9.0"
+    "@babel/template" "^7.8.6"
+    "@babel/traverse" "^7.9.0"
+    "@babel/types" "^7.9.0"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.2"
+    lodash "^4.17.13"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.9.0", "@babel/generator@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.5.tgz#27f0917741acc41e6eaaced6d68f96c3fa9afaf9"
+  integrity sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==
+  dependencies:
+    "@babel/types" "^7.9.5"
+    jsesc "^2.5.1"
+    lodash "^4.17.13"
+    source-map "^0.5.0"
+
+"@babel/helper-annotate-as-pure@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
+  integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
+  integrity sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-compilation-targets@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"
+  integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==
+  dependencies:
+    "@babel/compat-data" "^7.8.6"
+    browserslist "^4.9.1"
+    invariant "^2.2.4"
+    levenary "^1.1.1"
+    semver "^5.5.0"
+
+"@babel/helper-create-class-features-plugin@^7.5.5", "@babel/helper-create-class-features-plugin@^7.8.3":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.5.tgz#79753d44017806b481017f24b02fd4113c7106ea"
+  integrity sha512-IipaxGaQmW4TfWoXdqjY0TzoXQ1HRS0kPpEgvjosb3u7Uedcq297xFqDQiCcQtRRwzIMif+N1MLVI8C5a4/PAA==
+  dependencies:
+    "@babel/helper-function-name" "^7.9.5"
+    "@babel/helper-member-expression-to-functions" "^7.8.3"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+
+"@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
+  integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-regex" "^7.8.3"
+    regexpu-core "^4.7.0"
+
+"@babel/helper-define-map@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
+  integrity sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==
+  dependencies:
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/types" "^7.8.3"
+    lodash "^4.17.13"
+
+"@babel/helper-explode-assignable-expression@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
+  integrity sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==
+  dependencies:
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-function-name@^7.8.3", "@babel/helper-function-name@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
+  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/types" "^7.9.5"
+
+"@babel/helper-get-function-arity@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
+  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-hoist-variables@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
+  integrity sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-member-expression-to-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
+  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
+  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-module-transforms@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
+  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
+    "@babel/helper-simple-access" "^7.8.3"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/template" "^7.8.6"
+    "@babel/types" "^7.9.0"
+    lodash "^4.17.13"
+
+"@babel/helper-optimise-call-expression@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
+  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
+  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
+
+"@babel/helper-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
+  integrity sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==
+  dependencies:
+    lodash "^4.17.13"
+
+"@babel/helper-remap-async-to-generator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
+  integrity sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-wrap-function" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8"
+  integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.8.3"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/traverse" "^7.8.6"
+    "@babel/types" "^7.8.6"
+
+"@babel/helper-simple-access@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
+  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
+  dependencies:
+    "@babel/template" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-split-export-declaration@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
+  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
+  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
+
+"@babel/helper-wrap-function@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
+  integrity sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helpers@^7.9.0":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"
+  integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==
+  dependencies:
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.9.0"
+    "@babel/types" "^7.9.0"
+
+"@babel/highlight@^7.8.3":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
+  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.9.0"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.3.4", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
+  integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
+
+"@babel/plugin-proposal-async-generator-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
+  integrity sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
+
+"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e"
+  integrity sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-proposal-decorators@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz#2156860ab65c5abf068c3f67042184041066543e"
+  integrity sha512-e3RvdvS4qPJVTe288DlXjwKflpfy1hr0j5dz5WpIYYeP7vQZg2WfAEIp8k5/Lwis/m5REXEteIz6rrcDtXXG7w==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-decorators" "^7.8.3"
+
+"@babel/plugin-proposal-dynamic-import@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054"
+  integrity sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+
+"@babel/plugin-proposal-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
+  integrity sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
+  integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+
+"@babel/plugin-proposal-numeric-separator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
+  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+
+"@babel/plugin-proposal-object-rest-spread@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz#3fd65911306d8746014ec0d0cf78f0e39a149116"
+  integrity sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-transform-parameters" "^7.9.5"
+
+"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
+  integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+
+"@babel/plugin-proposal-optional-chaining@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
+  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
+  integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.8.8"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-async-generators@^7.8.0":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-decorators@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz#8d2c15a9f1af624b0025f961682a9d53d3001bda"
+  integrity sha512-8Hg4dNNT9/LcA1zQlfwuKR8BUc/if7Q7NkTam9sGTcJphLwpf2g4S42uhspQrIrR+dpzE0dtTqBVFoHl8GtnnQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-dynamic-import@^7.2.0", "@babel/plugin-syntax-dynamic-import@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
+  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-json-strings@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
+  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-object-rest-spread@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-catch-binding@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-chaining@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-top-level-await@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
+  integrity sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-typescript@^7.2.0", "@babel/plugin-syntax-typescript@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz#c1f659dda97711a569cef75275f7e15dcaa6cabc"
+  integrity sha512-GO1MQ/SGGGoiEXY0e0bSpHimJvxqB7lktLLIq2pv8xG7WZ8IMEle74jIe1FhprHBWjwjZtXHkycDLZXIWM5Wfg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-arrow-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
+  integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-async-to-generator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
+  integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-remap-async-to-generator" "^7.8.3"
+
+"@babel/plugin-transform-block-scoped-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
+  integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-block-scoping@^7.6.2", "@babel/plugin-transform-block-scoping@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
+  integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    lodash "^4.17.13"
+
+"@babel/plugin-transform-classes@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
+  integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-define-map" "^7.8.3"
+    "@babel/helper-function-name" "^7.9.5"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    globals "^11.1.0"
+
+"@babel/plugin-transform-computed-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
+  integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-destructuring@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
+  integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
+  integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-duplicate-keys@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
+  integrity sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-exponentiation-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
+  integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-for-of@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
+  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-function-name@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
+  integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
+  integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-member-expression-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
+  integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-modules-amd@^7.5.0", "@babel/plugin-transform-modules-amd@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz#19755ee721912cf5bb04c07d50280af3484efef4"
+  integrity sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    babel-plugin-dynamic-import-node "^2.3.0"
+
+"@babel/plugin-transform-modules-commonjs@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz#e3e72f4cbc9b4a260e30be0ea59bdf5a39748940"
+  integrity sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-simple-access" "^7.8.3"
+    babel-plugin-dynamic-import-node "^2.3.0"
+
+"@babel/plugin-transform-modules-systemjs@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz#e9fd46a296fc91e009b64e07ddaa86d6f0edeb90"
+  integrity sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    babel-plugin-dynamic-import-node "^2.3.0"
+
+"@babel/plugin-transform-modules-umd@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
+  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
+  integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+
+"@babel/plugin-transform-new-target@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
+  integrity sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-object-assign@^7.2.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.8.3.tgz#dc3b8dd50ef03837868a37b7df791f64f288538e"
+  integrity sha512-i3LuN8tPDqUCRFu3dkzF2r1Nx0jp4scxtm7JxtIqI9he9Vk20YD+/zshdzR9JLsoBMlJlNR82a62vQExNEVx/Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-object-super@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
+  integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.3"
+
+"@babel/plugin-transform-parameters@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
+  integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-property-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
+  integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-regenerator@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
+  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
+  dependencies:
+    regenerator-transform "^0.14.2"
+
+"@babel/plugin-transform-reserved-words@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
+  integrity sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-runtime@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz#45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"
+  integrity sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    resolve "^1.8.1"
+    semver "^5.5.1"
+
+"@babel/plugin-transform-shorthand-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
+  integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
+  integrity sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-sticky-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
+  integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-regex" "^7.8.3"
+
+"@babel/plugin-transform-template-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
+  integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-typeof-symbol@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
+  integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-typescript@^7.9.0":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz#4bb4dde4f10bbf2d787fce9707fb09b483e33359"
+  integrity sha512-yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-typescript" "^7.8.3"
+
+"@babel/plugin-transform-typescript@~7.4.0":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.4.5.tgz#ab3351ba35307b79981993536c93ff8be050ba28"
+  integrity sha512-RPB/YeGr4ZrFKNwfuQRlMf2lxoCUaU01MTw39/OFE/RiL8HDjtn68BwEPft1P7JN4akyEmjGWAMNldOV7o9V2g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-typescript" "^7.2.0"
+
+"@babel/plugin-transform-typescript@~7.5.0":
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz#6d862766f09b2da1cb1f7d505fe2aedab6b7d4b8"
+  integrity sha512-pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.5.5"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-typescript" "^7.2.0"
+
+"@babel/plugin-transform-unicode-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
+  integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/polyfill@^7.8.3", "@babel/polyfill@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.8.7.tgz#151ec24c7135481336168c3bd8b8bf0cf91c032f"
+  integrity sha512-LeSfP9bNZH2UOZgcGcZ0PIHUt1ZuHub1L3CVmEyqLxCeDLm4C5Gi8jRH8ZX2PNpDhQCo0z6y/+DIs2JlliXW8w==
+  dependencies:
+    core-js "^2.6.5"
+    regenerator-runtime "^0.13.4"
+
+"@babel/preset-env@^7.0.0", "@babel/preset-env@^7.9.0":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.5.tgz#8ddc76039bc45b774b19e2fc548f6807d8a8919f"
+  integrity sha512-eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ==
+  dependencies:
+    "@babel/compat-data" "^7.9.0"
+    "@babel/helper-compilation-targets" "^7.8.7"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
+    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
+    "@babel/plugin-proposal-json-strings" "^7.8.3"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
+    "@babel/plugin-proposal-object-rest-spread" "^7.9.5"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/plugin-syntax-top-level-await" "^7.8.3"
+    "@babel/plugin-transform-arrow-functions" "^7.8.3"
+    "@babel/plugin-transform-async-to-generator" "^7.8.3"
+    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
+    "@babel/plugin-transform-block-scoping" "^7.8.3"
+    "@babel/plugin-transform-classes" "^7.9.5"
+    "@babel/plugin-transform-computed-properties" "^7.8.3"
+    "@babel/plugin-transform-destructuring" "^7.9.5"
+    "@babel/plugin-transform-dotall-regex" "^7.8.3"
+    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
+    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
+    "@babel/plugin-transform-for-of" "^7.9.0"
+    "@babel/plugin-transform-function-name" "^7.8.3"
+    "@babel/plugin-transform-literals" "^7.8.3"
+    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
+    "@babel/plugin-transform-modules-amd" "^7.9.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.9.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.9.0"
+    "@babel/plugin-transform-modules-umd" "^7.9.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
+    "@babel/plugin-transform-new-target" "^7.8.3"
+    "@babel/plugin-transform-object-super" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.9.5"
+    "@babel/plugin-transform-property-literals" "^7.8.3"
+    "@babel/plugin-transform-regenerator" "^7.8.7"
+    "@babel/plugin-transform-reserved-words" "^7.8.3"
+    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
+    "@babel/plugin-transform-spread" "^7.8.3"
+    "@babel/plugin-transform-sticky-regex" "^7.8.3"
+    "@babel/plugin-transform-template-literals" "^7.8.3"
+    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
+    "@babel/plugin-transform-unicode-regex" "^7.8.3"
+    "@babel/preset-modules" "^0.1.3"
+    "@babel/types" "^7.9.5"
+    browserslist "^4.9.1"
+    core-js-compat "^3.6.2"
+    invariant "^2.2.2"
+    levenary "^1.1.1"
+    semver "^5.5.0"
+
+"@babel/preset-modules@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
+  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    esutils "^2.0.2"
+
+"@babel/runtime@^7.8.4", "@babel/runtime@^7.9.0":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
+  integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/template@^7.8.3", "@babel/template@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
+  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/parser" "^7.8.6"
+    "@babel/types" "^7.8.6"
+
+"@babel/traverse@^7.1.6", "@babel/traverse@^7.2.4", "@babel/traverse@^7.3.4", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.5.tgz#6e7c56b44e2ac7011a948c21e283ddd9d9db97a2"
+  integrity sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.9.5"
+    "@babel/helper-function-name" "^7.9.5"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/parser" "^7.9.0"
+    "@babel/types" "^7.9.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.13"
+
+"@babel/types@^7.1.6", "@babel/types@^7.3.2", "@babel/types@^7.3.4", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444"
+  integrity sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.9.5"
+    lodash "^4.17.13"
+    to-fast-properties "^2.0.0"
+
+"@cnakazawa/watch@^1.0.3":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
+  integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
+  dependencies:
+    exec-sh "^0.3.2"
+    minimist "^1.2.0"
+
+"@ember-data/rfc395-data@^0.0.4":
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz#ecb86efdf5d7733a76ff14ea651a1b0ed1f8a843"
+  integrity sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==
+
+"@ember/edition-utils@^1.1.1", "@ember/edition-utils@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
+  integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
+
+"@ember/optional-features@^1.1.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@ember/optional-features/-/optional-features-1.3.0.tgz#d7da860417b85a56cec88419f30da5ee1dde2756"
+  integrity sha512-Lrfojy4xKwTX+J4EAylmxZY2TO6bQtP4Lg5C8/z2priVqiT0X5fVB1+4WQCJbRBetctO1lMDnqjmhWCVKB8bmQ==
+  dependencies:
+    chalk "^3.0.0"
+    ember-cli-version-checker "^3.1.3"
+    glob "^7.1.6"
+    inquirer "^7.0.1"
+    mkdirp "^0.5.1"
+    silent-error "^1.1.1"
+    util.promisify "^1.0.0"
+
+"@ember/test-helpers@^1.7.1":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-1.7.1.tgz#cc22a954b3b46856518f034bd492a74e0482389f"
+  integrity sha512-+ioumnanSRJzZ0ZH30FIkB0r41UhVyuWQ9R9Yp1phDWJQDLumxg+25WDr40relwcH6z0Cn6LIEzeTVujO/0Rww==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-funnel "^2.0.2"
+    ember-assign-polyfill "^2.6.0"
+    ember-cli-babel "^7.7.3"
+    ember-cli-htmlbars-inline-precompile "^2.1.0"
+    ember-test-waiters "^1.1.1"
+
+"@embroider/core@0.4.3", "@embroider/core@^0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.4.3.tgz#117973b9761d68aee14d820bbaefeb05d5984ba8"
+  integrity sha512-n24WU/dGuGDqZrljWoX8raK2wFX3R8iJG0rfCWx+1kW87IvB+ZgS3j4KiZ/S788BA07udrYsrgecYnciG2bBMg==
+  dependencies:
+    "@babel/core" "^7.2.2"
+    "@babel/parser" "^7.3.4"
+    "@babel/plugin-syntax-dynamic-import" "^7.2.0"
+    "@babel/traverse" "^7.3.4"
+    "@babel/types" "^7.3.4"
+    "@embroider/macros" "0.4.3"
+    assert-never "^1.1.0"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    broccoli-persistent-filter "^2.2.2"
+    broccoli-plugin "^1.3.0"
+    broccoli-source "^1.1.0"
+    debug "^3.1.0"
+    fast-sourcemap-concat "^1.4.0"
+    filesize "^4.1.2"
+    fs-extra "^7.0.1"
+    fs-tree-diff "^2.0.0"
+    handlebars "^4.0.11"
+    js-string-escape "^1.0.1"
+    jsdom "^12.0.0"
+    json-stable-stringify "^1.0.1"
+    lodash "^4.17.10"
+    pkg-up "^2.0.0"
+    resolve "^1.8.1"
+    resolve-package-path "^1.2.2"
+    semver "^5.5.0"
+    strip-bom "^3.0.0"
+    typescript-memoize "^1.0.0-alpha.3"
+    walk-sync "^1.1.3"
+
+"@embroider/macros@0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.4.3.tgz#ea5604b8bd578520f15886a428a6c4fa9481abc0"
+  integrity sha512-vq/Ny2ULpKxq60Sv5usSrz651dXFM5phP/O5G5MWDY8YOodIkRLGqtub34sB0OmwxpCuTntUzl9P/I4wkyQ3Kw==
+  dependencies:
+    "@babel/core" "^7.2.2"
+    "@babel/traverse" "^7.2.4"
+    "@babel/types" "^7.3.2"
+    "@embroider/core" "0.4.3"
+    resolve "^1.8.1"
+    semver "^5.6.0"
+
+"@glimmer/component@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.0.0.tgz#f9052c8e99fb7b3d48d27c65891c5f0e59084a82"
+  integrity sha512-1ERZYNLZRuC8RYbcfkJeAWn3Ly7W2VdoHLQIHCmhQH/m7ubkNOdLQcTnUzje7OnRUs9EJ6DjfoN57XRX9Ux4rA==
+  dependencies:
+    "@glimmer/di" "^0.1.9"
+    "@glimmer/env" "^0.1.7"
+    "@glimmer/util" "^0.44.0"
+    broccoli-file-creator "^2.1.1"
+    broccoli-merge-trees "^3.0.2"
+    ember-cli-babel "^7.7.3"
+    ember-cli-get-component-path-option "^1.0.0"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-path-utils "^1.0.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-typescript "3.0.0"
+    ember-compatibility-helpers "^1.1.2"
+
+"@glimmer/di@^0.1.9":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.1.11.tgz#a6878c07a13a2c2c76fcde598a5c97637bfc4280"
+  integrity sha1-poeMB6E6LCx2/N5ZilyXY3v8QoA=
+
+"@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
+  integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
+
+"@glimmer/interfaces@^0.47.9":
+  version "0.47.9"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.47.9.tgz#4c50b5343815045318bba38915f780ae39f14590"
+  integrity sha512-xne80DHkPC70u08LKV9g0+PboAmIw0A+vDXjJXMrDoRcNzCR4dXR6nvKD/Een+wbwwBaRawCIn45Rnk5+Dyvrg==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/syntax@^0.47.9":
+  version "0.47.9"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.47.9.tgz#f3d141efc97f601928335771721d1f27eb1ed7d2"
+  integrity sha512-ld3x2bTkAr/BXOkI1b3cDVBwMl0BTYtBNKODks0Fi/1DLx+F1jl4abpKJ5cww1k2iQ75jgG31IhBwb7YC2PmFA==
+  dependencies:
+    "@glimmer/interfaces" "^0.47.9"
+    "@glimmer/util" "^0.47.9"
+    handlebars "^4.5.1"
+    simple-html-tokenizer "^0.5.9"
+
+"@glimmer/util@^0.44.0":
+  version "0.44.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.44.0.tgz#45df98d73812440206ae7bda87cfe04aaae21ed9"
+  integrity sha512-duAsm30uVK9jSysElCbLyU6QQYO2X9iLDLBIBUcCqck9qN1o3tK2qWiHbGK5d6g8E2AJ4H88UrfElkyaJlGrwg==
+
+"@glimmer/util@^0.47.9":
+  version "0.47.9"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.47.9.tgz#ad3085eba3975bcbc74d28aefc871becbe800417"
+  integrity sha512-MJEumozi3TKmx+kzTpqPdC0jLEIuWSS3JNdBXceqTGRZQGmE5Zxqd8ydH5KOYpsKSfURHGCi2vU6+X/Q4z2b6g==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@simple-dom/interface" "^1.4.0"
+
+"@mrmlnc/readdir-enhanced@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
+  dependencies:
+    call-me-maybe "^1.0.1"
+    glob-to-regexp "^0.3.0"
+
+"@nodelib/fs.scandir@2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
+  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.3"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
+  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
+
+"@nodelib/fs.stat@^1.1.2":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
+  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.3"
+    fastq "^1.6.0"
+
+"@simple-dom/interface@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f"
+  integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA==
+
+"@sindresorhus/is@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
+  integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
+
+"@types/body-parser@*":
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f"
+  integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
+"@types/chai-as-promised@^7.1.2":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.2.tgz#2f564420e81eaf8650169e5a3a6b93e096e5068b"
+  integrity sha512-PO2gcfR3Oxa+u0QvECLe1xKXOqYTzCmWf0FhLhjREoW3fPAVamjihL7v1MOVLJLsnAMdLcjkfrs01yvDMwVK4Q==
+  dependencies:
+    "@types/chai" "*"
+
+"@types/chai@*", "@types/chai@^4.2.9":
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.11.tgz#d3614d6c5f500142358e6ed24e1bf16657536c50"
+  integrity sha512-t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==
+
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
+"@types/connect@*":
+  version "3.4.33"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546"
+  integrity sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==
+  dependencies:
+    "@types/node" "*"
+
+"@types/events@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
+
+"@types/express-serve-static-core@*":
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.5.tgz#a00ac7dadd746ae82477443e4d480a6a93ea083c"
+  integrity sha512-578YH5Lt88AKoADy0b2jQGwJtrBxezXtVe/MBqWXKZpqx91SnC0pVkVCcxcytz3lWW+cHBYDi3Ysh0WXc+rAYw==
+  dependencies:
+    "@types/node" "*"
+    "@types/range-parser" "*"
+
+"@types/express@^4.17.2":
+  version "4.17.6"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.6.tgz#6bce49e49570507b86ea1b07b806f04697fac45e"
+  integrity sha512-n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "*"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
+"@types/fs-extra@^5.0.5":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.1.0.tgz#2a325ef97901504a3828718c390d34b8426a10a1"
+  integrity sha512-AInn5+UBFIK9FK5xc9yP5e3TQSPNNgjHByqYcj9g5elVBnDQcQL7PlO1CIRy2gWlbwK7UPYqi7vRvFA44dCmYQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/glob@*", "@types/glob@^7.1.1":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
+  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
+  dependencies:
+    "@types/events" "*"
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/mime@*":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d"
+  integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==
+
+"@types/minimatch@*", "@types/minimatch@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+
+"@types/node@*":
+  version "13.13.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.4.tgz#1581d6c16e3d4803eb079c87d4ac893ee7501c2c"
+  integrity sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==
+
+"@types/qs@*":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.1.tgz#937fab3194766256ee09fcd40b781740758617e7"
+  integrity sha512-lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw==
+
+"@types/range-parser@*":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
+  integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
+
+"@types/rimraf@^2.0.2":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.4.tgz#403887b0b53c6100a6c35d2ab24f6ccc042fec46"
+  integrity sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==
+  dependencies:
+    "@types/glob" "*"
+    "@types/node" "*"
+
+"@types/serve-static@*":
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz#eb7e1c41c4468272557e897e9171ded5e2ded9d1"
+  integrity sha512-oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==
+  dependencies:
+    "@types/express-serve-static-core" "*"
+    "@types/mime" "*"
+
+"@types/symlink-or-copy@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@types/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#4151a81b4052c80bc2becbae09f3a9ec010a9c7a"
+  integrity sha512-Lja2xYuuf2B3knEsga8ShbOdsfNOtzT73GyJmZyY7eGl2+ajOqrs8yM5ze0fsSoYwvA6bw7/Qr7OZ7PEEmYwWg==
+
+"@webassemblyjs/ast@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
+  integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/wast-parser" "1.7.11"
+
+"@webassemblyjs/floating-point-hex-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
+  integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
+
+"@webassemblyjs/helper-api-error@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
+  integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
+
+"@webassemblyjs/helper-buffer@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
+  integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
+
+"@webassemblyjs/helper-code-frame@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
+  integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.7.11"
+
+"@webassemblyjs/helper-fsm@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
+  integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
+
+"@webassemblyjs/helper-module-context@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
+  integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
+
+"@webassemblyjs/helper-wasm-bytecode@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
+  integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
+
+"@webassemblyjs/helper-wasm-section@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
+  integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+
+"@webassemblyjs/ieee754@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
+  integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
+  integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
+  dependencies:
+    "@xtuc/long" "4.2.1"
+
+"@webassemblyjs/utf8@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
+  integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
+
+"@webassemblyjs/wasm-edit@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
+  integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/helper-wasm-section" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+    "@webassemblyjs/wasm-opt" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+    "@webassemblyjs/wast-printer" "1.7.11"
+
+"@webassemblyjs/wasm-gen@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
+  integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/ieee754" "1.7.11"
+    "@webassemblyjs/leb128" "1.7.11"
+    "@webassemblyjs/utf8" "1.7.11"
+
+"@webassemblyjs/wasm-opt@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
+  integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+
+"@webassemblyjs/wasm-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
+  integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-api-error" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/ieee754" "1.7.11"
+    "@webassemblyjs/leb128" "1.7.11"
+    "@webassemblyjs/utf8" "1.7.11"
+
+"@webassemblyjs/wast-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
+  integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/floating-point-hex-parser" "1.7.11"
+    "@webassemblyjs/helper-api-error" "1.7.11"
+    "@webassemblyjs/helper-code-frame" "1.7.11"
+    "@webassemblyjs/helper-fsm" "1.7.11"
+    "@xtuc/long" "4.2.1"
+
+"@webassemblyjs/wast-printer@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
+  integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/wast-parser" "1.7.11"
+    "@xtuc/long" "4.2.1"
+
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+
+"@xtuc/long@4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
+  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
+
+abab@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
+  integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
+
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+  dependencies:
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
+
+acorn-dynamic-import@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
+  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
+  dependencies:
+    acorn "^5.0.0"
+
+acorn-globals@^4.3.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
+  integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==
+  dependencies:
+    acorn "^6.0.1"
+    acorn-walk "^6.0.1"
+
+acorn-jsx@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
+  integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
+
+acorn-walk@^6.0.1:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
+  integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
+
+acorn@^5.0.0, acorn@^5.6.2:
+  version "5.7.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
+  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
+
+acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.7:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
+  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
+
+after@0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
+  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
+
+ajv-errors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
+
+ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
+  integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
+
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5, ajv@^6.9.1:
+  version "6.12.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
+  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+amd-name-resolver@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.2.0.tgz#fc41b3848824b557313897d71f8d5a0184fbe679"
+  integrity sha512-hlSTWGS1t6/xq5YCed7YALg7tKZL3rkl7UwEZ/eCIkn8JxmM6fU6Qs/1hwtjQqfuYxlffuUcgYEm0f5xP4YKaA==
+  dependencies:
+    ensure-posix-path "^1.0.1"
+
+amd-name-resolver@^1.2.1, amd-name-resolver@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.3.1.tgz#ffe71c683c6e7191fc4ae1bb3aaed15abea135d9"
+  integrity sha512-26qTEWqZQ+cxSYygZ4Cf8tsjDBLceJahhtewxtKZA3SRa4PluuqYCuheemDQD+7Mf5B7sr+zhTDWAHDh02a1Dw==
+  dependencies:
+    ensure-posix-path "^1.0.1"
+    object-hash "^1.3.1"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
+
+ansi-escapes@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
+
+ansi-escapes@^4.2.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
+  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
+  dependencies:
+    type-fest "^0.11.0"
+
+ansi-html@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+
+ansi-styles@^3.0.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
+ansi-to-html@^0.6.6:
+  version "0.6.14"
+  resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.14.tgz#65fe6d08bba5dd9db33f44a20aec331e0010dad8"
+  integrity sha512-7ZslfB1+EnFSDO5Ju+ue5Y6It19DRnZXWv8jrGHgIlPna5Mh4jz7BV5jCbQneXNFurQcKoolaaAjHtgSBfOIuA==
+  dependencies:
+    entities "^1.1.2"
+
+ansicolors@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
+  integrity sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8=
+
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
+
+aot-test-generators@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/aot-test-generators/-/aot-test-generators-0.1.0.tgz#43f0f615f97cb298d7919c1b0b4e6b7310b03cd0"
+  integrity sha1-Q/D2Ffl8spjXkZwbC05rcxCwPNA=
+  dependencies:
+    jsesc "^2.5.0"
+
+aproba@^1.0.3, aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
+are-we-there-yet@~1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+
+array-to-error@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-to-error/-/array-to-error-1.1.1.tgz#d68812926d14097a205579a667eeaf1856a44c07"
+  integrity sha1-1ogSkm0UCXogVXmmZ+6vGFakTAc=
+  dependencies:
+    array-to-sentence "^1.1.0"
+
+array-to-sentence@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/array-to-sentence/-/array-to-sentence-1.1.0.tgz#c804956dafa53232495b205a9452753a258d39fc"
+  integrity sha1-yASVba+lMjJJWyBalFJ1OiWNOfw=
+
+array-union@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+
+arraybuffer.slice@~0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
+
+asn1.js@^4.0.0:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-never@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.0.tgz#e6597ed9e357f7e62c074dfa7c71e30ed7b67a8b"
+  integrity sha512-61QPxh2lfV5j2dBsEtwhz8/sUj+baAIuCpQxeWorGeMxlTkbeyGyq7igxJB8yij1JdzUhyoiekNHMXrMYnkjvA==
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+assert@^1.1.1:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
+  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
+  dependencies:
+    object-assign "^4.1.1"
+    util "0.10.3"
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+
+ast-types@0.13.3:
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.3.tgz#50da3f28d17bdbc7969a3a2d83a0e4a72ae755a7"
+  integrity sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA==
+
+astral-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
+
+async-disk-cache@^1.2.1:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-1.3.5.tgz#cc6206ed79bb6982b878fc52e0505e4f52b62a02"
+  integrity sha512-VZpqfR0R7CEOJZ/0FOTgWq70lCrZyS1rkI8PXugDUkTKyyAUgZ2zQ09gLhMkEn+wN8LYeUTPxZdXtlX/kmbXKQ==
+  dependencies:
+    debug "^2.1.3"
+    heimdalljs "^0.2.3"
+    istextorbinary "2.1.0"
+    mkdirp "^0.5.0"
+    rimraf "^2.5.3"
+    rsvp "^3.0.18"
+    username-sync "^1.0.2"
+
+async-each@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
+
+async-limiter@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
+
+async-promise-queue@^1.0.3, async-promise-queue@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/async-promise-queue/-/async-promise-queue-1.0.5.tgz#cb23bce9fce903a133946a700cc85f27f09ea49d"
+  integrity sha512-xi0aQ1rrjPWYmqbwr18rrSKbSaXIeIwSd1J4KAgVfkq8utNbdZoht7GfvfY6swFUAMJ9obkc4WPJmtGwl+B8dw==
+  dependencies:
+    async "^2.4.1"
+    debug "^2.6.8"
+
+async@^2.4.1, async@^2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  dependencies:
+    lodash "^4.17.14"
+
+async@~0.2.9:
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+  integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E=
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
+  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
+
+babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+babel-core@^6.26.0, babel-core@^6.26.3:
+  version "6.26.3"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
+  integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.1"
+    debug "^2.6.9"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.8"
+    slash "^1.0.0"
+    source-map "^0.5.7"
+
+babel-eslint@^10.0.3:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
+  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
+    eslint-visitor-keys "^1.0.0"
+    resolve "^1.12.0"
+
+babel-generator@^6.26.0:
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.7"
+    trim-right "^1.0.1"
+
+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+  integrity sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=
+  dependencies:
+    babel-helper-explode-assignable-expression "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-call-delegate@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+  integrity sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-define-map@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
+  integrity sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-explode-assignable-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+  integrity sha1-8luCz33BBDPFX3BZLVdGQArCLKo=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+  integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=
+  dependencies:
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-get-function-arity@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+  integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-hoist-variables@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+  integrity sha1-HssnaJydJVE+rbyZFKc/VAi+enY=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-optimise-call-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+  integrity sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-regex@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
+  integrity sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-remap-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+  integrity sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-replace-supers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+  integrity sha1-v22/5Dk40XNpohPKiov3S2qQqxo=
+  dependencies:
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helpers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-loader@^8.0.6:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
+  integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==
+  dependencies:
+    find-cache-dir "^2.1.0"
+    loader-utils "^1.4.0"
+    mkdirp "^0.5.3"
+    pify "^4.0.1"
+    schema-utils "^2.6.5"
+
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-check-es2015-constants@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+  integrity sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-debug-macros@^0.2.0, babel-plugin-debug-macros@^0.2.0-beta.6:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0.tgz#0120ac20ce06ccc57bf493b667cf24b85c28da7a"
+  integrity sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==
+  dependencies:
+    semver "^5.3.0"
+
+babel-plugin-debug-macros@^0.3.0, babel-plugin-debug-macros@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.3.tgz#29c3449d663f61c7385f5b8c72d8015b069a5cb7"
+  integrity sha512-E+NI8TKpxJDBbVkdWkwHrKgJi696mnRL8XYrOPYw82veNHPDORM9WIQifl6TpIo8PNy2tU2skPqbfkmHXrHKQA==
+  dependencies:
+    semver "^5.3.0"
+
+babel-plugin-dynamic-import-node@^2.3.0:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
+  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
+  dependencies:
+    object.assign "^4.1.0"
+
+babel-plugin-ember-data-packages-polyfill@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-data-packages-polyfill/-/babel-plugin-ember-data-packages-polyfill-0.1.2.tgz#21154c095ddc703722b1fb8bb06c126c0b6d77dc"
+  integrity sha512-kTHnOwoOXfPXi00Z8yAgyD64+jdSXk3pknnS7NlqnCKAU6YDkXZ4Y7irl66kaZjZn0FBBt0P4YOZFZk85jYOww==
+  dependencies:
+    "@ember-data/rfc395-data" "^0.0.4"
+
+babel-plugin-ember-modules-api-polyfill@^2.12.0, babel-plugin-ember-modules-api-polyfill@^2.6.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.12.0.tgz#a5e703205ba4e625a7fab9bb1aea64ef3222cf75"
+  integrity sha512-ZQU4quX0TJ1yYyosPy5PFigKdCFEVHJ6H0b3hwjxekIP9CDwzk0OhQuKhCOPti+d52VWjjCjxu2BrXEih29mFw==
+  dependencies:
+    ember-rfc176-data "^0.3.12"
+
+babel-plugin-filter-imports@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-3.0.0.tgz#a849683837ad29960da17492fb32789ab6b09a11"
+  integrity sha512-p/chjzVTgCxUqyLM0q/pfWVZS7IJTwGQMwNg0LOvuQpKiTftQgZDtkGB8XvETnUw19rRcL7bJCTopSwibTN2tA==
+  dependencies:
+    "@babel/types" "^7.4.0"
+    lodash "^4.17.11"
+
+babel-plugin-htmlbars-inline-precompile@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-1.0.0.tgz#a9d2f6eaad8a3f3d361602de593a8cbef8179c22"
+  integrity sha512-4jvKEHR1bAX03hBDZ94IXsYCj3bwk9vYsn6ux6JZNL2U5pvzCWjqyrGahfsGNrhERyxw8IqcirOi9Q6WCo3dkQ==
+
+babel-plugin-htmlbars-inline-precompile@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-3.0.1.tgz#e1e38a4087f446578e419a21c112530c8df02345"
+  integrity sha512-ZiFY0nQjtdMPGIDwp/5LYOs6rCr54QfcSV5nPbrA7C++Fv4Vb2Q/qrKYx78t+dwmARJztnOBlObFk4z8veHxNA==
+
+babel-plugin-module-resolver@^3.1.1, babel-plugin-module-resolver@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz#ddfa5e301e3b9aa12d852a9979f18b37881ff5a7"
+  integrity sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==
+  dependencies:
+    find-babel-config "^1.1.0"
+    glob "^7.1.2"
+    pkg-up "^2.0.0"
+    reselect "^3.0.1"
+    resolve "^1.4.0"
+
+babel-plugin-syntax-async-functions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+  integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=
+
+babel-plugin-syntax-dynamic-import@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
+  integrity sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=
+
+babel-plugin-syntax-exponentiation-operator@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+  integrity sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=
+
+babel-plugin-syntax-trailing-function-commas@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+  integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=
+
+babel-plugin-transform-async-to-generator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+  integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.24.1"
+    babel-plugin-syntax-async-functions "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-arrow-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
+  integrity sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
+  integrity sha1-u8UbSflk1wy42OC5ToICRs46YUE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoping@^6.23.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
+  integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-plugin-transform-es2015-classes@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
+  integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=
+  dependencies:
+    babel-helper-define-map "^6.24.1"
+    babel-helper-function-name "^6.24.1"
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-helper-replace-supers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-computed-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
+  integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-destructuring@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+  integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
+  integrity sha1-c+s9MQypaePvnskcU3QabxV2Qj4=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-for-of@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
+  integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-function-name@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
+  integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
+  integrity sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
+  integrity sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=
+  dependencies:
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+  version "6.26.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
+  integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-types "^6.26.0"
+
+babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
+  integrity sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-umd@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
+  integrity sha1-rJl+YoXNGO1hdq22B9YCNErThGg=
+  dependencies:
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-object-super@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
+  integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40=
+  dependencies:
+    babel-helper-replace-supers "^6.24.1"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-parameters@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+  integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=
+  dependencies:
+    babel-helper-call-delegate "^6.24.1"
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
+  integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-spread@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
+  integrity sha1-1taKmfia7cRTbIGlQujdnxdG+NE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-sticky-regex@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
+  integrity sha1-AMHNsaynERLN8M9hJsLta0V8zbw=
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-template-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
+  integrity sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
+  integrity sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-unicode-regex@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
+  integrity sha1-04sS9C6nMj9yk4fxinxa4frrNek=
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    regexpu-core "^2.0.0"
+
+babel-plugin-transform-exponentiation-operator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+  integrity sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=
+  dependencies:
+    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
+    babel-plugin-syntax-exponentiation-operator "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-regenerator@^6.22.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
+  integrity sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=
+  dependencies:
+    regenerator-transform "^0.10.0"
+
+babel-plugin-transform-strict-mode@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
+  integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-polyfill@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
+  integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=
+  dependencies:
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    regenerator-runtime "^0.10.5"
+
+babel-preset-env@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
+  integrity sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-to-generator "^6.22.0"
+    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoping "^6.23.0"
+    babel-plugin-transform-es2015-classes "^6.23.0"
+    babel-plugin-transform-es2015-computed-properties "^6.22.0"
+    babel-plugin-transform-es2015-destructuring "^6.23.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
+    babel-plugin-transform-es2015-for-of "^6.23.0"
+    babel-plugin-transform-es2015-function-name "^6.22.0"
+    babel-plugin-transform-es2015-literals "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.22.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-umd "^6.23.0"
+    babel-plugin-transform-es2015-object-super "^6.22.0"
+    babel-plugin-transform-es2015-parameters "^6.23.0"
+    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
+    babel-plugin-transform-es2015-spread "^6.22.0"
+    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
+    babel-plugin-transform-es2015-template-literals "^6.22.0"
+    babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
+    babel-plugin-transform-exponentiation-operator "^6.22.0"
+    babel-plugin-transform-regenerator "^6.22.0"
+    browserslist "^3.2.6"
+    invariant "^2.2.2"
+    semver "^5.3.0"
+
+babel-register@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  integrity sha1-btAhFz4vy0htestFxgCahW9kcHE=
+  dependencies:
+    babel-core "^6.26.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.17.4"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.15"
+
+babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
+babel-template@^6.24.1, babel-template@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
+
+babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
+
+babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
+  dependencies:
+    babel-runtime "^6.26.0"
+    esutils "^2.0.2"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
+
+babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
+
+backbone@^1.1.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.4.0.tgz#54db4de9df7c3811c3f032f34749a4cd27f3bd12"
+  integrity sha512-RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ==
+  dependencies:
+    underscore ">=1.8.3"
+
+backo2@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+
+base64-arraybuffer@0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
+  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
+
+base64-js@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.2.tgz#024f0f72afa25b75f9c0ee73cd4f55ec1bed9784"
+  integrity sha1-Ak8Pcq+iW3X5wO5zzU9V7Bvtl4Q=
+
+base64-js@^1.0.2:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
+  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
+
+base64id@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
+  integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
+basic-auth@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
+  integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
+  dependencies:
+    safe-buffer "5.1.2"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  dependencies:
+    tweetnacl "^0.14.3"
+
+better-assert@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
+  dependencies:
+    callsite "1.0.0"
+
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
+binary-extensions@^1.0.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
+
+"binaryextensions@1 || 2":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.2.0.tgz#e7c6ba82d4f5f5758c26078fe8eea28881233311"
+  integrity sha512-bHhs98rj/7i/RZpCSJ3uk55pLXOItjIrh2sRQZSM6OoktScX+LxJzvlU+FELp9j3TdcddTmmYArLSGptCTwjuw==
+
+bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
+
+blank-object@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/blank-object/-/blank-object-1.0.2.tgz#f990793fbe9a8c8dd013fb3219420bec81d5f4b9"
+  integrity sha1-+ZB5P76ajI3QE/syGUIL7IHV9Lk=
+
+blob@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
+  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
+
+bluebird@^3.1.1, bluebird@^3.4.6, bluebird@^3.5.5:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
+
+body-parser@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+  dependencies:
+    bytes "3.1.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
+
+body@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
+  integrity sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=
+  dependencies:
+    continuable-cache "^0.3.1"
+    error "^7.0.0"
+    raw-body "~1.1.0"
+    safe-json-parse "~1.0.1"
+
+bops@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/bops/-/bops-0.0.3.tgz#c5cbf6fea8be7401ca5ea6d1679e6c4e8b407c79"
+  integrity sha1-xcv2/qi+dAHKXqbRZ55sTotAfHk=
+  dependencies:
+    base64-js "0.0.2"
+    to-utf8 "0.0.1"
+
+bower-config@^1.4.1:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.3.tgz#3454fecdc5f08e7aa9cc6d556e492be0669689ae"
+  integrity sha512-MVyyUk3d1S7d2cl6YISViwJBc2VXCkxF5AUFykvN0PQj5FsUiMNSgAYTso18oRFfyZ6XEtjrgg9MAaufHbOwNw==
+  dependencies:
+    graceful-fs "^4.1.3"
+    minimist "^0.2.1"
+    mout "^1.0.0"
+    osenv "^0.1.3"
+    untildify "^2.1.0"
+    wordwrap "^0.0.3"
+
+bower-endpoint-parser@0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz#00b565adbfab6f2d35addde977e97962acbcb3f6"
+  integrity sha1-ALVlrb+rby01rd3pd+l5Yqy8s/Y=
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^2.3.1, braces@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
+braces@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+broccoli-amd-funnel@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-amd-funnel/-/broccoli-amd-funnel-2.0.1.tgz#dbdbfd28841731342d538126567c25bea3f15310"
+  integrity sha512-VRE+0PYAN4jQfkIq3GKRj4U/4UV9rVpLan5ll6fVYV4ziVg4OEfR5GUnILEg++QtR4xSaugRxCPU5XJLDy3bNQ==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    symlink-or-copy "^1.2.0"
+
+broccoli-asset-rev@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-asset-rev/-/broccoli-asset-rev-3.0.0.tgz#65a28c8a062d6ee2cffd91ed2a8309e0f8253ac6"
+  integrity sha512-gAHQZnwvtl74tGevUqGuWoyOdJUdMMv0TjGSMzbdyGImr9fZcnM6xmggDA8bUawrMto9NFi00ZtNUgA4dQiUBw==
+  dependencies:
+    broccoli-asset-rewrite "^2.0.0"
+    broccoli-filter "^1.2.2"
+    broccoli-persistent-filter "^1.4.3"
+    json-stable-stringify "^1.0.0"
+    minimatch "^3.0.4"
+    rsvp "^3.0.6"
+
+broccoli-asset-rewrite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-asset-rewrite/-/broccoli-asset-rewrite-2.0.0.tgz#603c4a52d4c8987a2f681254436923ac0a9c94ab"
+  integrity sha512-dqhxdQpooNi7LHe8J9Jdxp6o3YPFWl4vQmint6zrsn2sVbOo+wpyiX3erUSt0IBtjNkAxqJjuvS375o2cLBHTA==
+  dependencies:
+    broccoli-filter "^1.2.3"
+
+broccoli-babel-transpiler@^6.5.0:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.5.1.tgz#a4afc8d3b59b441518eb9a07bd44149476e30738"
+  integrity sha512-w6GcnkxvHcNCte5FcLGEG1hUdQvlfvSN/6PtGWU/otg69Ugk8rUk51h41R0Ugoc+TNxyeFG1opRt2RlA87XzNw==
+  dependencies:
+    babel-core "^6.26.0"
+    broccoli-funnel "^2.0.1"
+    broccoli-merge-trees "^2.0.0"
+    broccoli-persistent-filter "^1.4.3"
+    clone "^2.0.0"
+    hash-for-dep "^1.2.3"
+    heimdalljs-logger "^0.1.7"
+    json-stable-stringify "^1.0.0"
+    rsvp "^4.8.2"
+    workerpool "^2.3.0"
+
+broccoli-babel-transpiler@^7.3.0, broccoli-babel-transpiler@^7.4.0:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.4.0.tgz#f3069f0f77e8017aa17e1e757dfb4a30de044182"
+  integrity sha512-DzPXQr1C+zOgzXG40wqPjtjSSa6wRKb+Ls45Qtq7Pn+GxL3/jIvQOBZi0/irZ5dlYVbRMEZiUnaIBIOha2ygIw==
+  dependencies:
+    "@babel/core" "^7.8.3"
+    "@babel/polyfill" "^7.8.3"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.2"
+    broccoli-persistent-filter "^2.2.1"
+    clone "^2.1.2"
+    hash-for-dep "^1.4.7"
+    heimdalljs-logger "^0.1.9"
+    json-stable-stringify "^1.0.1"
+    rsvp "^4.8.4"
+    workerpool "^3.1.1"
+
+broccoli-builder@^0.18.14:
+  version "0.18.14"
+  resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.14.tgz#4b79e2f844de11a4e1b816c3f49c6df4776c312d"
+  integrity sha1-S3ni+ETeEaThuBbD9Jxt9HdsMS0=
+  dependencies:
+    broccoli-node-info "^1.1.0"
+    heimdalljs "^0.2.0"
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.2"
+    rimraf "^2.2.8"
+    rsvp "^3.0.17"
+    silent-error "^1.0.1"
+
+broccoli-caching-writer@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07"
+  integrity sha1-uTz1j5Jk8AMHWGjbBXdPTn8lvQc=
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.2.5"
+    broccoli-plugin "1.1.0"
+    debug "^2.1.1"
+    rimraf "^2.2.8"
+    rsvp "^3.0.17"
+    walk-sync "^0.2.5"
+
+broccoli-caching-writer@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-3.0.3.tgz#0bd2c96a9738d6a6ab590f07ba35c5157d7db476"
+  integrity sha1-C9LJapc41qarWQ8HujXFFX19tHY=
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.2.1"
+    debug "^2.1.1"
+    rimraf "^2.2.8"
+    rsvp "^3.0.17"
+    walk-sync "^0.3.0"
+
+broccoli-clean-css@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-clean-css/-/broccoli-clean-css-1.1.0.tgz#9db143d9af7e0ae79c26e3ac5a9bb2d720ea19fa"
+  integrity sha1-nbFD2a9+CuecJuOsWpuy1yDqGfo=
+  dependencies:
+    broccoli-persistent-filter "^1.1.6"
+    clean-css-promise "^0.1.0"
+    inline-source-map-comment "^1.0.5"
+    json-stable-stringify "^1.0.0"
+
+broccoli-concat@^3.2.2, broccoli-concat@^3.7.1, broccoli-concat@^3.7.4:
+  version "3.7.5"
+  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.7.5.tgz#223beda8c1184252cf08ae020a3d45ffa6a48218"
+  integrity sha512-rDs1Mej3Ej0Cy5yIO9oIQq5+BCv0opAwS2NW7M0BeCsAMeFM42Z/zacDUC6jKc5OV5wiHvGTyCPLnZkMe0h6kQ==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.3.0"
+    ensure-posix-path "^1.0.2"
+    fast-sourcemap-concat "^1.4.0"
+    find-index "^1.1.0"
+    fs-extra "^4.0.3"
+    fs-tree-diff "^0.5.7"
+    lodash.merge "^4.6.2"
+    lodash.omit "^4.1.0"
+    lodash.uniq "^4.2.0"
+    walk-sync "^0.3.2"
+
+broccoli-config-loader@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-config-loader/-/broccoli-config-loader-1.0.1.tgz#d10aaf8ebc0cb45c1da5baa82720e1d88d28c80a"
+  integrity sha512-MDKYQ50rxhn+g17DYdfzfEM9DjTuSGu42Db37A8TQHQe8geYEcUZ4SQqZRgzdAI3aRQNlA1yBHJfOeGmOjhLIg==
+  dependencies:
+    broccoli-caching-writer "^3.0.3"
+
+broccoli-config-replace@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/broccoli-config-replace/-/broccoli-config-replace-1.1.2.tgz#6ea879d92a5bad634d11329b51fc5f4aafda9c00"
+  integrity sha1-bqh52SpbrWNNETKbUfxfSq/anAA=
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.2.0"
+    debug "^2.2.0"
+    fs-extra "^0.24.0"
+
+broccoli-debug@^0.6.4, broccoli-debug@^0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.5.tgz#164a5cdafd8936e525e702bf8f91f39d758e2e78"
+  integrity sha512-RIVjHvNar9EMCLDW/FggxFRXqpjhncM/3qq87bn/y+/zR9tqEkHvTqbyOc4QnB97NO2m6342w4wGkemkaeOuWg==
+  dependencies:
+    broccoli-plugin "^1.2.1"
+    fs-tree-diff "^0.5.2"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    symlink-or-copy "^1.1.8"
+    tree-sync "^1.2.2"
+
+broccoli-file-creator@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-2.1.1.tgz#7351dd2496c762cfce7736ce9b49e3fce0c7b7db"
+  integrity sha512-YpjOExWr92C5vhnK0kmD81kM7U09kdIRZk9w4ZDCDHuHXW+VE/x6AGEOQQW3loBQQ6Jk+k+TSm8dESy4uZsnjw==
+  dependencies:
+    broccoli-plugin "^1.1.0"
+    mkdirp "^0.5.1"
+
+broccoli-filter@^1.2.2, broccoli-filter@^1.2.3:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-1.3.0.tgz#71e3a8e32a17f309e12261919c5b1006d6766de6"
+  integrity sha512-VXJXw7eBfG82CFxaBDjYmyN7V72D4In2zwLVQJd/h3mBfF3CMdRTsv2L20lmRTtCv1sAHcB+LgMso90e/KYiLw==
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.0.0"
+    copy-dereference "^1.0.0"
+    debug "^2.2.0"
+    mkdirp "^0.5.1"
+    promise-map-series "^0.2.1"
+    rsvp "^3.0.18"
+    symlink-or-copy "^1.0.1"
+    walk-sync "^0.3.1"
+
+broccoli-funnel-reducer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea"
+  integrity sha1-ETZbKnha7JsXlyo234fu8kxcwOo=
+
+broccoli-funnel@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296"
+  integrity sha1-zdw6/F/xaFqAI0iP/3TOb7WlEpY=
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^1.3.0"
+    debug "^2.2.0"
+    exists-sync "0.0.4"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^0.5.3"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    mkdirp "^0.5.0"
+    path-posix "^1.0.0"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+    walk-sync "^0.3.1"
+
+broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-2.0.2.tgz#0edf629569bc10bd02cc525f74b9a38e71366a75"
+  integrity sha512-/vDTqtv7ipjEZQOVqO4vGDVAOZyuYzQ/EgGoyewfOgh1M7IQAToBKZI0oAQPgMBeFPPlIbfMuAngk+ohPBuaHQ==
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^1.3.0"
+    debug "^2.2.0"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^0.5.3"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    mkdirp "^0.5.0"
+    path-posix "^1.0.0"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+    walk-sync "^0.3.1"
+
+broccoli-kitchen-sink-helpers@^0.2.5:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
+  integrity sha1-peCYbtjXb7WYS2jD8EUNOpbjbsw=
+  dependencies:
+    glob "^5.0.10"
+    mkdirp "^0.5.1"
+
+broccoli-kitchen-sink-helpers@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.3.1.tgz#77c7c18194b9664163ec4fcee2793444926e0c06"
+  integrity sha1-d8fBgZS5ZkFj7E/O4nk0RJJuDAY=
+  dependencies:
+    glob "^5.0.10"
+    mkdirp "^0.5.1"
+
+broccoli-lint-eslint@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-lint-eslint/-/broccoli-lint-eslint-5.0.0.tgz#05365879d597dd78496a1c718db0e5ea5d4a2bde"
+  integrity sha512-V7M6U4th21bf1X4u3KoZa0xkcPq9JCSyKxB/nCWCBFMI3rkrB8nlyDLd8DKIUTqL+ojlFOGV5lohPZwndw0sZw==
+  dependencies:
+    aot-test-generators "^0.1.0"
+    broccoli-concat "^3.2.2"
+    broccoli-persistent-filter "^2.1.0"
+    eslint "^5.6.0"
+    json-stable-stringify "^1.0.1"
+    lodash.defaultsdeep "^4.6.0"
+    md5-hex "^2.0.0"
+
+broccoli-merge-trees@^1.0.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5"
+  integrity sha1-oAFRm7UGfwZYnZGvopQkRaLQ/bU=
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    can-symlink "^1.0.0"
+    fast-ordered-set "^1.0.2"
+    fs-tree-diff "^0.5.4"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+
+broccoli-merge-trees@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-2.0.1.tgz#14d4b7fc1a90318c12b16f843e6ba2693808100c"
+  integrity sha512-WjaexJ+I8BxP5V5RNn6um/qDRSmKoiBC/QkRi79FT9ClHfldxRyCDs9mcV7mmoaPlsshmmPaUz5jdtcKA6DClQ==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    merge-trees "^1.0.1"
+
+broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.2.tgz#f33b451994225522b5c9bcf27d59decfd8ba537d"
+  integrity sha512-ZyPAwrOdlCddduFbsMyyFzJUrvW6b04pMvDiAQZrCwghlvgowJDY+EfoXn+eR1RRA5nmGHJ+B68T63VnpRiT1A==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    merge-trees "^2.0.0"
+
+broccoli-middleware@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-2.1.1.tgz#183635bbef4dc1241533ee001a162f013d776cb9"
+  integrity sha512-BK8aPhQpOLsHWiftrqXQr84XsvzUqeaN4PlCQOYg5yM0M+WKAHtX2WFXmicSQZOVgKDyh5aeoNTFkHjBAEBzwQ==
+  dependencies:
+    ansi-html "^0.0.7"
+    handlebars "^4.0.4"
+    has-ansi "^3.0.0"
+    mime-types "^2.1.18"
+
+broccoli-module-normalizer@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/broccoli-module-normalizer/-/broccoli-module-normalizer-1.3.0.tgz#f9982d9cbb776b4ed754161cc6547784d3eb19de"
+  integrity sha512-0idZCOtdVG6xXoQ36Psc1ApMCr3lW5DB+WEAOEwHcUoESIBHzwcRPQTxheGIjZ5o0hxpsRYAUH5x0ErtNezbrQ==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    merge-trees "^1.0.1"
+    rimraf "^2.6.2"
+    symlink-or-copy "^1.1.8"
+
+broccoli-module-unification-reexporter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-module-unification-reexporter/-/broccoli-module-unification-reexporter-1.0.0.tgz#031909c5d3f159ec11d5f9e2346f2861db8acb3e"
+  integrity sha512-HTi9ua520M20aBZomaiBopsSt3yjL7J/paR3XPjieygK7+ShATBiZdn0B+ZPiniBi4I8JuMn1q0fNFUevtP//A==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    mkdirp "^0.5.1"
+    walk-sync "^0.3.2"
+
+broccoli-node-api@^1.6.0, broccoli-node-api@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-api/-/broccoli-node-api-1.7.0.tgz#391aa6edecd2a42c63c111b4162956b2fa288cb6"
+  integrity sha512-QIqLSVJWJUVOhclmkmypJJH9u9s/aWH4+FH6Q6Ju5l+Io4dtwqdPUNmDfw40o6sxhbZHhqGujDJuHTML1wG8Yw==
+
+broccoli-node-info@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-1.1.0.tgz#3aa2e31e07e5bdb516dd25214f7c45ba1c459412"
+  integrity sha1-OqLjHgflvbUW3SUhT3xFuhxFlBI=
+
+broccoli-node-info@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-2.1.0.tgz#ca84560e8570ff78565bea1699866ddbf58ad644"
+  integrity sha512-l6qDuboJThHfRVVWQVaTs++bFdrFTP0gJXgsWenczc1PavRVUmL1Eyb2swTAXXMpDOnr2zhNOBLx4w9AxkqbPQ==
+
+broccoli-output-wrapper@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-output-wrapper/-/broccoli-output-wrapper-2.0.0.tgz#f1e0b9b2f259a67fd41a380141c3c20b096828e6"
+  integrity sha512-V/ozejo+snzNf75i/a6iTmp71k+rlvqjE3+jYfimuMwR1tjNNRdtfno+NGNQB2An9bIAeqZnKhMDurAznHAdtA==
+  dependencies:
+    heimdalljs-logger "^0.1.10"
+
+broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.4.3:
+  version "1.4.6"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.6.tgz#80762d19000880a77da33c34373299c0f6a3e615"
+  integrity sha512-0RejLwoC95kv4kta8KAa+FmECJCK78Qgm8SRDEK7YyU0N9Cx6KpY3UCDy9WELl3mCXLN8TokNxc7/hp3lL4lfw==
+  dependencies:
+    async-disk-cache "^1.2.1"
+    async-promise-queue "^1.0.3"
+    broccoli-plugin "^1.0.0"
+    fs-tree-diff "^0.5.2"
+    hash-for-dep "^1.0.2"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    mkdirp "^0.5.1"
+    promise-map-series "^0.2.1"
+    rimraf "^2.6.1"
+    rsvp "^3.0.18"
+    symlink-or-copy "^1.0.1"
+    walk-sync "^0.3.1"
+
+broccoli-persistent-filter@^2.1.0, broccoli-persistent-filter@^2.2.1, broccoli-persistent-filter@^2.2.2, broccoli-persistent-filter@^2.3.0, broccoli-persistent-filter@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-2.3.1.tgz#4a052e0e0868b344c3a2977e35a3d497aa9eca72"
+  integrity sha512-hVsmIgCDrl2NFM+3Gs4Cr2TA6UPaIZip99hN8mtkaUPgM8UeVnCbxelCvBjUBHo0oaaqP5jzqqnRVvb568Yu5g==
+  dependencies:
+    async-disk-cache "^1.2.1"
+    async-promise-queue "^1.0.3"
+    broccoli-plugin "^1.0.0"
+    fs-tree-diff "^2.0.0"
+    hash-for-dep "^1.5.0"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    mkdirp "^0.5.1"
+    promise-map-series "^0.2.1"
+    rimraf "^2.6.1"
+    rsvp "^4.7.0"
+    symlink-or-copy "^1.0.1"
+    sync-disk-cache "^1.3.3"
+    walk-sync "^1.0.0"
+
+broccoli-plugin@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.1.0.tgz#73e2cfa05f8ea1e3fc1420c40c3d9e7dc724bf02"
+  integrity sha1-c+LPoF+OoeP8FCDEDD2efcckvwI=
+  dependencies:
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.0.1"
+
+broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli-plugin@^1.2.1, broccoli-plugin@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.3.1.tgz#a26315732fb99ed2d9fb58f12a1e14e986b4fabd"
+  integrity sha512-DW8XASZkmorp+q7J4EeDEZz+LoyKLAd2XZULXyD9l4m9/hAKV3vjHmB1kiUshcWAYMgTP1m2i4NnqCE/23h6AQ==
+  dependencies:
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.1.8"
+
+broccoli-plugin@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-2.1.0.tgz#2fab6c578219cfcc64f773e9616073313fc8b334"
+  integrity sha512-ElE4caljW4slapyEhSD9jU9Uayc8SoSABWdmY9SqbV8DHNxU6xg1jJsPcMm+cXOvggR3+G+OXAYQeFjWVnznaw==
+  dependencies:
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.1.8"
+
+broccoli-plugin@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-3.1.0.tgz#54ba6dd90a42ec3db5624063292610e326b1e542"
+  integrity sha512-7w7FP8WJYjLvb0eaw27LO678TGGaom++49O1VYIuzjhXjK5kn2+AMlDm7CaUFw4F7CLGoVQeZ84d8gICMJa4lA==
+  dependencies:
+    broccoli-node-api "^1.6.0"
+    broccoli-output-wrapper "^2.0.0"
+    fs-merger "^3.0.1"
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.1.8"
+
+broccoli-slow-trees@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-slow-trees/-/broccoli-slow-trees-3.1.0.tgz#8e48903f59e061bf1213963733b9e61dec2ee5d7"
+  integrity sha512-FRI7mRTk2wjIDrdNJd6znS7Kmmne4VkAkl8Ix1R/VoePFMD0g0tEl671xswzFqaRjpT9Qu+CC4hdXDLDJBuzMw==
+  dependencies:
+    heimdalljs "^0.2.1"
+
+broccoli-source@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-1.1.0.tgz#54f0e82c8b73f46580cbbc4f578f0b32fca8f809"
+  integrity sha1-VPDoLItz9GWAy7xPV48LMvyo+Ak=
+
+broccoli-source@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-3.0.0.tgz#c7c9ba24505941b72a0244568285bc859f69dfbd"
+  integrity sha512-G4Zc8HngZIdASyQOiz/9H/0Gjc2F02EFwhWF4wiueaI+/FBrM9Ixj6Prno/1aiLIYcN0JvRC3oytN9uOVonTww==
+  dependencies:
+    broccoli-node-api "^1.6.0"
+
+broccoli-sri-hash@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/broccoli-sri-hash/-/broccoli-sri-hash-2.1.2.tgz#bc69905ed7a381ad325cc0d02ded071328ebf3f3"
+  integrity sha1-vGmQXtejga0yXMDQLe0HEyjr8/M=
+  dependencies:
+    broccoli-caching-writer "^2.2.0"
+    mkdirp "^0.5.1"
+    rsvp "^3.1.0"
+    sri-toolbox "^0.2.0"
+    symlink-or-copy "^1.0.1"
+
+broccoli-stew@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-3.0.0.tgz#fd1d19d162ad9490b42e5c563b78c26eb1e80b95"
+  integrity sha512-NXfi+Vas24n3Ivo21GvENTI55qxKu7OwKRnCLWXld8MiLiQKQlWIq28eoARaFj0lTUFwUa4jKZeA7fW9PiWQeg==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-funnel "^2.0.0"
+    broccoli-merge-trees "^3.0.1"
+    broccoli-persistent-filter "^2.3.0"
+    broccoli-plugin "^2.1.0"
+    chalk "^2.4.1"
+    debug "^4.1.1"
+    ensure-posix-path "^1.0.1"
+    fs-extra "^8.0.1"
+    minimatch "^3.0.4"
+    resolve "^1.11.1"
+    rsvp "^4.8.5"
+    symlink-or-copy "^1.2.0"
+    walk-sync "^1.1.3"
+
+broccoli-uglify-sourcemap@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-3.2.0.tgz#d96f1d41f6c18e9a5d49af1a5ab9489cdcac1c6c"
+  integrity sha512-kkkn8v7kXdWwnZNekq+3ILuTAGkZoaoEMUYCKoER5/uokuoyTjtdYLHaE7UxHkuPEuLfjvJYv21sCCePZ74/2g==
+  dependencies:
+    async-promise-queue "^1.0.5"
+    broccoli-plugin "^1.2.1"
+    debug "^4.1.0"
+    lodash.defaultsdeep "^4.6.1"
+    matcher-collection "^2.0.0"
+    mkdirp "^0.5.0"
+    source-map-url "^0.4.0"
+    symlink-or-copy "^1.0.1"
+    terser "^4.3.9"
+    walk-sync "^1.1.3"
+    workerpool "^5.0.1"
+
+broccoli@^3.2.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-3.4.1.tgz#3acf2c8d998ed57fb7a89dee1b1b5e8e956e285b"
+  integrity sha512-DTIHD4olRsXr+Y+6k/E6PqnnSKAAROwgM77qmCloojmJS19QiIAJq7Pq2w6qZx9tQZt1zByhYgLm3r1m73yTPQ==
+  dependencies:
+    "@types/chai" "^4.2.9"
+    "@types/chai-as-promised" "^7.1.2"
+    "@types/express" "^4.17.2"
+    ansi-html "^0.0.7"
+    broccoli-node-info "^2.1.0"
+    broccoli-slow-trees "^3.0.1"
+    broccoli-source "^3.0.0"
+    commander "^4.1.1"
+    connect "^3.6.6"
+    console-ui "^3.0.4"
+    esm "^3.2.4"
+    findup-sync "^4.0.0"
+    handlebars "^4.7.3"
+    heimdalljs "^0.2.6"
+    heimdalljs-logger "^0.1.9"
+    https "^1.0.0"
+    mime-types "^2.1.26"
+    resolve-path "^1.4.0"
+    rimraf "^3.0.2"
+    sane "^4.0.0"
+    tmp "^0.0.33"
+    tree-sync "^2.0.0"
+    underscore.string "^3.2.2"
+    watch-detector "^1.0.0"
+
+brorand@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
+
+browser-process-hrtime@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
+  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
+
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+browserify-rsa@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
+  dependencies:
+    bn.js "^4.1.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
+  dependencies:
+    bn.js "^4.1.1"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.2"
+    elliptic "^6.0.0"
+    inherits "^2.0.1"
+    parse-asn1 "^5.0.0"
+
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
+  dependencies:
+    pako "~1.0.5"
+
+browserslist@^3.2.6:
+  version "3.2.8"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6"
+  integrity sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==
+  dependencies:
+    caniuse-lite "^1.0.30000844"
+    electron-to-chromium "^1.3.47"
+
+browserslist@^4.8.5, browserslist@^4.9.1:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
+  integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
+  dependencies:
+    caniuse-lite "^1.0.30001043"
+    electron-to-chromium "^1.3.413"
+    node-releases "^1.1.53"
+    pkg-up "^2.0.0"
+
+bser@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
+  dependencies:
+    node-int64 "^0.4.0"
+
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+
+buffer-alloc@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
+
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
+
+buffer@^4.3.0:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
+
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
+
+bytes@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
+  integrity sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=
+
+bytes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+
+cacache@^12.0.2:
+  version "12.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
+  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
+  dependencies:
+    bluebird "^3.5.5"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.4"
+    graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.3"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+cacheable-request@^2.1.1:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
+  integrity sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=
+  dependencies:
+    clone-response "1.0.2"
+    get-stream "3.0.0"
+    http-cache-semantics "3.8.1"
+    keyv "3.0.0"
+    lowercase-keys "1.0.0"
+    normalize-url "2.0.1"
+    responselike "1.0.2"
+
+calculate-cache-key-for-tree@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/calculate-cache-key-for-tree/-/calculate-cache-key-for-tree-2.0.0.tgz#7ac57f149a4188eacb0a45b210689215d3fef8d6"
+  integrity sha512-Quw8a6y8CPmRd6eU+mwypktYCwUcf8yVFIRbNZ6tPQEckX9yd+EBVEPC/GSZZrMWH9e7Vz4pT7XhpmyApRByLQ==
+  dependencies:
+    json-stable-stringify "^1.0.1"
+
+call-me-maybe@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
+
+callsite@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
+
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+can-symlink@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/can-symlink/-/can-symlink-1.0.0.tgz#97b607d8a84bb6c6e228b902d864ecb594b9d219"
+  integrity sha1-l7YH2KhLtsbiKLkC2GTstZS50hk=
+  dependencies:
+    tmp "0.0.28"
+
+caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001043:
+  version "1.0.30001048"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz#4bb4f1bc2eb304e5e1154da80b93dee3f1cf447e"
+  integrity sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==
+
+capture-exit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
+  dependencies:
+    rsvp "^4.8.4"
+
+capture-stack-trace@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
+  integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
+
+cardinal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9"
+  integrity sha1-UOIcGwqjdyn5N33vGWtanOyTLuk=
+  dependencies:
+    ansicolors "~0.2.1"
+    redeyed "~1.0.0"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
+chalk@^1.0.0, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+
+charm@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35"
+  integrity sha1-it02cVOm2aWBMxBSxAkJkdqZXjU=
+  dependencies:
+    inherits "^2.0.1"
+
+chokidar@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
+chownr@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+
+chrome-trace-event@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
+  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
+  dependencies:
+    tslib "^1.9.0"
+
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
+clean-base-url@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clean-base-url/-/clean-base-url-1.0.0.tgz#c901cf0a20b972435b0eccd52d056824a4351b7b"
+  integrity sha1-yQHPCiC5ckNbDszVLQVoJKQ1G3s=
+
+clean-css-promise@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/clean-css-promise/-/clean-css-promise-0.1.1.tgz#43f3d2c8dfcb2bf071481252cd9b76433c08eecb"
+  integrity sha1-Q/PSyN/LK/BxSBJSzZt2QzwI7ss=
+  dependencies:
+    array-to-error "^1.0.0"
+    clean-css "^3.4.5"
+    pinkie-promise "^2.0.0"
+
+clean-css@^3.4.5:
+  version "3.4.28"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
+  integrity sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=
+  dependencies:
+    commander "2.8.x"
+    source-map "0.4.x"
+
+clean-up-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clean-up-path/-/clean-up-path-1.0.0.tgz#de9e8196519912e749c9eaf67c13d64fac72a3e5"
+  integrity sha512-PHGlEF0Z6976qQyN6gM7kKH6EH0RdfZcc8V+QhFe36eRxV0SMH5OUBZG7Bxa9YcreNzyNbK63cGiZxdSZgosRw==
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
+cli-spinners@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.3.0.tgz#0632239a4b5aa4c958610142c34bb7a651fc8df5"
+  integrity sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==
+
+cli-table3@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
+  integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==
+  dependencies:
+    object-assign "^4.1.0"
+    string-width "^2.1.1"
+  optionalDependencies:
+    colors "^1.1.2"
+
+cli-table@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
+  integrity sha1-9TsFJmqLGguTSz0IIebi3FkUriM=
+  dependencies:
+    colors "1.0.3"
+
+cli-width@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
+
+clone-response@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+  dependencies:
+    mimic-response "^1.0.0"
+
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
+clone@^2.0.0, clone@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+colors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+  integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
+
+colors@^1.1.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@2.12.2:
+  version "2.12.2"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
+  integrity sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==
+
+commander@2.8.x:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
+  integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
+commander@^2.20.0, commander@^2.6.0, commander@~2.20.3:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+commander@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
+
+common-tags@^1.4.0, common-tags@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
+  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+
+component-bind@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
+
+component-emitter@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+
+component-emitter@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+
+component-inherit@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
+
+compressible@~2.0.16:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
+  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
+  dependencies:
+    mime-db ">= 1.43.0 < 2"
+
+compression@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+  dependencies:
+    accepts "~1.3.5"
+    bytes "3.0.0"
+    compressible "~2.0.16"
+    debug "2.6.9"
+    on-headers "~1.0.2"
+    safe-buffer "5.1.2"
+    vary "~1.1.2"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+concat-stream@^1.5.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+configstore@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
+  integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
+  dependencies:
+    dot-prop "^5.2.0"
+    graceful-fs "^4.1.2"
+    make-dir "^3.0.0"
+    unique-string "^2.0.0"
+    write-file-atomic "^3.0.0"
+    xdg-basedir "^4.0.0"
+
+connect@^3.6.6:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
+  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
+  dependencies:
+    debug "2.6.9"
+    finalhandler "1.1.2"
+    parseurl "~1.3.3"
+    utils-merge "1.0.1"
+
+console-browserify@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
+  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
+
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+
+console-ui@^3.0.4, console-ui@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-3.1.1.tgz#681a0414e8b0a23ed679d0a2802e39d920801171"
+  integrity sha512-22y+uk4AGq9quz6kofKQjkeCIAm86+MTxT/RZMFm8fMArP2lAkzxjUjNyrw7S6wXnnB+qRnC+/2ANMTke68RTQ==
+  dependencies:
+    chalk "^2.1.0"
+    inquirer "^6"
+    json-stable-stringify "^1.0.1"
+    ora "^3.4.0"
+    through2 "^3.0.1"
+
+consolidate@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
+  integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==
+  dependencies:
+    bluebird "^3.1.1"
+
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
+
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
+
+content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+
+continuable-cache@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
+  integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=
+
+convert-source-map@^1.5.1, convert-source-map@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+
+cookie@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
+
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
+copy-dereference@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/copy-dereference/-/copy-dereference-1.0.0.tgz#6b131865420fd81b413ba994b44d3655311152b6"
+  integrity sha1-axMYZUIP2BtBO6mUtE02VTERUrY=
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+
+core-js-compat@^3.6.2:
+  version "3.6.5"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
+  integrity sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==
+  dependencies:
+    browserslist "^4.8.5"
+    semver "7.0.0"
+
+core-js@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
+  integrity sha1-TekR5mew6ukSTjQlS1OupvxhjT4=
+
+core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
+  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
+
+core-object@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/core-object/-/core-object-3.1.5.tgz#fa627b87502adc98045e44678e9a8ec3b9c0d2a9"
+  integrity sha512-sA2/4+/PZ/KV6CKgjrVrrUVBKCkdDO02CUlQ0YKTQoYUwPYNOtOAcWlbYhd5v/1JqYaA6oZ4sDlOU4ppVw6Wbg==
+  dependencies:
+    chalk "^2.0.0"
+
+core-util-is@1.0.2, core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+create-ecdh@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.0.0"
+
+create-error-class@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
+  integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
+  dependencies:
+    capture-stack-trace "^1.0.0"
+
+create-hash@^1.1.0, create-hash@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+cross-spawn@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.2.tgz#d0d7dcfa74e89115c7619f4f721a94e1fdb716d6"
+  integrity sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
+
+crypto-random-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
+  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
+
+cssom@0.3.x, cssom@^0.3.4:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
+
+cssstyle@^1.1.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1"
+  integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==
+  dependencies:
+    cssom "0.3.x"
+
+cyclist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
+  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
+
+dag-map@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dag-map/-/dag-map-2.0.2.tgz#9714b472de82a1843de2fba9b6876938cab44c68"
+  integrity sha1-lxS0ct6CoYQ94vuptodpOMq0TGg=
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  dependencies:
+    assert-plus "^1.0.0"
+
+data-urls@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
+  integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==
+  dependencies:
+    abab "^2.0.0"
+    whatwg-mimetype "^2.2.0"
+    whatwg-url "^7.0.0"
+
+debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  dependencies:
+    ms "^2.1.1"
+
+debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
+debug@~3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  dependencies:
+    ms "2.0.0"
+
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+
+decompress-response@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
+  dependencies:
+    mimic-response "^1.0.0"
+
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  dependencies:
+    clone "^1.0.2"
+
+define-properties@^1.1.2, define-properties@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  dependencies:
+    object-keys "^1.0.12"
+
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+
+depd@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
+des.js@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
+  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+
+detect-file@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
+
+detect-indent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
+  dependencies:
+    repeating "^2.0.0"
+
+detect-indent@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd"
+  integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==
+
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
+detect-newline@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
+  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
+
+diff@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
+diffie-hellman@^5.0.0:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+dir-glob@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
+  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
+  dependencies:
+    path-type "^3.0.0"
+
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
+domain-browser@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
+
+domexception@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
+  dependencies:
+    webidl-conversions "^4.0.2"
+
+dot-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"
+  integrity sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==
+  dependencies:
+    no-case "^3.0.3"
+    tslib "^1.10.0"
+
+dot-prop@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
+  integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==
+  dependencies:
+    is-obj "^2.0.0"
+
+duplex@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/duplex/-/duplex-1.0.0.tgz#6abc5c16ec17e4c578578727126700590d3a2dda"
+  integrity sha1-arxcFuwX5MV4V4cnEmcAWQ06Ldo=
+
+duplexer3@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
+
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+editions@^1.1.1:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
+  integrity sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+electron-to-chromium@^1.3.413, electron-to-chromium@^1.3.47:
+  version "1.3.421"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.421.tgz#4abfe7e49070b5b437ec2ce442543add8eb66800"
+  integrity sha512-ogxgmvHGfDuLA+GtgfK0jkFWlBb4MCZK2U1MM+l98sf4U3Ixtrfw1iC9w4mQqNvo+lHgM4pR62TqoT4QrvKJCw==
+
+elliptic@^6.0.0:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
+  integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==
+  dependencies:
+    bn.js "^4.4.0"
+    brorand "^1.0.1"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.0"
+
+ember-assign-polyfill@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/ember-assign-polyfill/-/ember-assign-polyfill-2.6.0.tgz#07847e3357ee35b33f886a0b5fbec6873f6860eb"
+  integrity sha512-Y8NzOmHI/g4PuJ+xC14eTYiQbigNYddyHB8FY2kuQMxThTEIDE7SJtgttJrYYcPciOu0Tnb5ff36iO46LeiXkw==
+  dependencies:
+    ember-cli-babel "^6.16.0"
+    ember-cli-version-checker "^2.0.0"
+
+ember-auto-import@^1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.5.3.tgz#b32936f874d1ed7057ad2ed3f6116357820be44b"
+  integrity sha512-7JfdunM1BmLy/lyUXu7uEoi0Gi4+dxkGM23FgIEyW5g7z4MidhP53Fc61t49oPSnq7+J4lLpbH1f6C+mDMgb4A==
+  dependencies:
+    "@babel/core" "^7.1.6"
+    "@babel/preset-env" "^7.0.0"
+    "@babel/traverse" "^7.1.6"
+    "@babel/types" "^7.1.6"
+    "@embroider/core" "^0.4.3"
+    babel-core "^6.26.3"
+    babel-loader "^8.0.6"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    babel-template "^6.26.0"
+    babylon "^6.18.0"
+    broccoli-debug "^0.6.4"
+    broccoli-plugin "^1.3.0"
+    debug "^3.1.0"
+    ember-cli-babel "^6.6.0"
+    enhanced-resolve "^4.0.0"
+    fs-extra "^6.0.1"
+    fs-tree-diff "^1.0.0"
+    handlebars "^4.3.1"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.10"
+    mkdirp "^0.5.1"
+    pkg-up "^2.0.0"
+    resolve "^1.7.1"
+    rimraf "^2.6.2"
+    symlink-or-copy "^1.2.0"
+    typescript-memoize "^1.0.0-alpha.3"
+    walk-sync "^0.3.3"
+    webpack "~4.28"
+
+ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.0.tgz#de3baedd093163b6c2461f95964888c1676325ac"
+  integrity sha512-Zr4my8Xn+CzO0gIuFNXji0eTRml5AxZUTDQz/wsNJ5AJAtyFWCY4QtKdoELNNbiCVGt1lq5yLiwTm4scGKu6xA==
+
+ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.16.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
+  integrity sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==
+  dependencies:
+    amd-name-resolver "1.2.0"
+    babel-plugin-debug-macros "^0.2.0-beta.6"
+    babel-plugin-ember-modules-api-polyfill "^2.6.0"
+    babel-plugin-transform-es2015-modules-amd "^6.24.0"
+    babel-polyfill "^6.26.0"
+    babel-preset-env "^1.7.0"
+    broccoli-babel-transpiler "^6.5.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.0"
+    broccoli-source "^1.1.0"
+    clone "^2.0.0"
+    ember-cli-version-checker "^2.1.2"
+    semver "^5.5.0"
+
+ember-cli-babel@^7.11.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.7.3:
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.19.0.tgz#e6eddea18a867231fcf90a80689e92b98be9a63b"
+  integrity sha512-HiWKuoyy35vGEr+iCw6gUnQ3pS5qslyTlKEDW8cVoMbvZNGYBgRxHed5nklVUh+BS74AwR9lsp25BTAagYAP9Q==
+  dependencies:
+    "@babel/core" "^7.9.0"
+    "@babel/helper-compilation-targets" "^7.8.7"
+    "@babel/plugin-proposal-class-properties" "^7.8.3"
+    "@babel/plugin-proposal-decorators" "^7.8.3"
+    "@babel/plugin-transform-modules-amd" "^7.9.0"
+    "@babel/plugin-transform-runtime" "^7.9.0"
+    "@babel/plugin-transform-typescript" "^7.9.0"
+    "@babel/polyfill" "^7.8.7"
+    "@babel/preset-env" "^7.9.0"
+    "@babel/runtime" "^7.9.0"
+    amd-name-resolver "^1.2.1"
+    babel-plugin-debug-macros "^0.3.0"
+    babel-plugin-ember-data-packages-polyfill "^0.1.2"
+    babel-plugin-ember-modules-api-polyfill "^2.12.0"
+    babel-plugin-module-resolver "^3.1.1"
+    broccoli-babel-transpiler "^7.4.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.1"
+    broccoli-source "^1.1.0"
+    clone "^2.1.2"
+    ember-cli-babel-plugin-helpers "^1.1.0"
+    ember-cli-version-checker "^4.1.0"
+    ensure-posix-path "^1.0.2"
+    fixturify-project "^1.10.0"
+    rimraf "^3.0.1"
+    semver "^5.5.0"
+
+ember-cli-dependency-checker@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.2.0.tgz#9202ad9e14d6fda33cffc22a11c343c2a8885330"
+  integrity sha512-dkSmcJ/jY/2ms/S6ph2jXSfOW5VfOpLfg5DFEbra0SaMNgYkNDFF1o0U4OdTsG37L5h/AXWNuVtnOa4TMabz9Q==
+  dependencies:
+    chalk "^2.3.0"
+    find-yarn-workspace-root "^1.1.0"
+    is-git-url "^1.0.0"
+    resolve "^1.5.0"
+    semver "^5.3.0"
+
+ember-cli-eslint@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-eslint/-/ember-cli-eslint-5.1.0.tgz#acdb9b072911e04b07c313b610f514db4086d21a"
+  integrity sha512-o6787b0tgkRNp+KJo5BiQxtkLuz/yyYqVWF31LPrh+ZCC8jETrfyjsuk8VPDxKLGq7qEiQNJUgOEW87HTad7Vg==
+  dependencies:
+    broccoli-lint-eslint "^5.0.0"
+    ember-cli-version-checker "^3.0.0"
+    rsvp "^4.6.1"
+    walk-sync "^1.0.0"
+
+ember-cli-get-component-path-option@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
+  integrity sha1-DXtZVVni+QUKvtgE8djv8bCLx3E=
+
+ember-cli-htmlbars-inline-precompile@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-2.1.0.tgz#61b91ff1879d44ae504cadb46fb1f2604995ae08"
+  integrity sha512-BylIHduwQkncPhnj0ZyorBuljXbTzLgRo6kuHf1W+IHFxThFl2xG+r87BVwsqx4Mn9MTgW9SE0XWjwBJcSWd6Q==
+  dependencies:
+    babel-plugin-htmlbars-inline-precompile "^1.0.0"
+    ember-cli-version-checker "^2.1.2"
+    hash-for-dep "^1.2.3"
+    heimdalljs-logger "^0.1.9"
+    silent-error "^1.1.0"
+
+ember-cli-htmlbars@^4.2.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.3.1.tgz#4af8adc21ab3c4953f768956b7f7d207782cb175"
+  integrity sha512-CW6AY/yzjeVqoRtItOKj3hcYzc5dWPRETmeCzr2Iqjt5vxiVtpl0z5VTqHqIlT5fsFx6sGWBQXNHIe+ivYsxXQ==
+  dependencies:
+    "@ember/edition-utils" "^1.2.0"
+    babel-plugin-htmlbars-inline-precompile "^3.0.1"
+    broccoli-debug "^0.6.5"
+    broccoli-persistent-filter "^2.3.1"
+    broccoli-plugin "^3.1.0"
+    common-tags "^1.8.0"
+    ember-cli-babel-plugin-helpers "^1.1.0"
+    fs-tree-diff "^2.0.1"
+    hash-for-dep "^1.5.1"
+    heimdalljs-logger "^0.1.10"
+    json-stable-stringify "^1.0.1"
+    semver "^6.3.0"
+    strip-bom "^4.0.0"
+    walk-sync "^2.0.2"
+
+ember-cli-inject-live-reload@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-2.0.2.tgz#95edb543b386239d35959e5ea9579f5382976ac7"
+  integrity sha512-HDD6o/kBHT/kUtazklU0OW23q2jigIN42QmcpFdXUSvJ2/2SYA6yIqSUxWfJgISmtn5gTNZ2KPq1p3dLkhJxSQ==
+  dependencies:
+    clean-base-url "^1.0.0"
+    ember-cli-version-checker "^3.1.3"
+
+ember-cli-is-package-missing@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-is-package-missing/-/ember-cli-is-package-missing-1.0.0.tgz#6e6184cafb92635dd93ca6c946b104292d4e3390"
+  integrity sha1-bmGEyvuSY13ZPKbJRrEEKS1OM5A=
+
+ember-cli-lodash-subset@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
+  integrity sha1-IMtop5D+D94kiN39jvu332/nZvI=
+
+ember-cli-normalize-entity-name@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz#0b14f7bcbc599aa117b5fddc81e4fd03c4bad5b7"
+  integrity sha1-CxT3vLxZmqEXtf3cgeT9A8S61bc=
+  dependencies:
+    silent-error "^1.0.0"
+
+ember-cli-path-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-path-utils/-/ember-cli-path-utils-1.0.0.tgz#4e39af8b55301cddc5017739b77a804fba2071ed"
+  integrity sha1-Tjmvi1UwHN3FAXc5t3qAT7ogce0=
+
+ember-cli-preprocess-registry@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-preprocess-registry/-/ember-cli-preprocess-registry-3.3.0.tgz#685837a314fbe57224bd54b189f4b9c23907a2de"
+  integrity sha512-60GYpw7VPeB7TvzTLZTuLTlHdOXvayxjAQ+IxM2T04Xkfyu75O2ItbWlftQW7NZVGkaCsXSRAmn22PG03VpLMA==
+  dependencies:
+    broccoli-clean-css "^1.1.0"
+    broccoli-funnel "^2.0.1"
+    debug "^3.0.1"
+    process-relative-require "^1.0.0"
+
+ember-cli-sri@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-sri/-/ember-cli-sri-2.1.1.tgz#971620934a4b9183cf7923cc03e178b83aa907fd"
+  integrity sha1-lxYgk0pLkYPPeSPMA+F4uDqpB/0=
+  dependencies:
+    broccoli-sri-hash "^2.1.0"
+
+ember-cli-string-utils@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1"
+  integrity sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=
+
+ember-cli-template-lint@^1.0.0-beta.3:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-template-lint/-/ember-cli-template-lint-1.0.0.tgz#8ca8f5f05fdcad35c13f26b65fb93c016196bdc9"
+  integrity sha512-acWyJUvRFo2aA/0kqeUxfCPwLtPk3ckZ/1I0BzBX9qW/Gi8qWqYnwnI/vEotIqmsQl+npbl0/SXeQHFrUdyB0g==
+  dependencies:
+    aot-test-generators "^0.1.0"
+    broccoli-concat "^3.7.1"
+    broccoli-persistent-filter "^2.1.0"
+    chalk "^2.4.1"
+    debug "^4.0.1"
+    ember-cli-version-checker "^3.0.1"
+    ember-template-lint "^1.2.0"
+    json-stable-stringify "^1.0.1"
+    md5-hex "^2.0.0"
+    strip-ansi "^4.0.0"
+    walk-sync "^1.1.3"
+
+ember-cli-test-loader@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-2.2.0.tgz#3fb8d5d1357e4460d3f0a092f5375e71b6f7c243"
+  integrity sha512-mlSXX9SciIRwGkFTX6XGyJYp4ry6oCFZRxh5jJ7VH8UXLTNx2ZACtDTwaWtNhYrWXgKyiDUvmD8enD56aePWRA==
+  dependencies:
+    ember-cli-babel "^6.8.1"
+
+ember-cli-typescript@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-3.0.0.tgz#3b838d1ce9e4d22a98e68da22ceac6dc0cfd9bfc"
+  integrity sha512-lo5YArbJzJi5ssvaGqTt6+FnhTALnSvYVuxM7lfyL1UCMudyNJ94ovH5C7n5il7ATd6WsNiAPRUO/v+s5Jq/aA==
+  dependencies:
+    "@babel/plugin-transform-typescript" "~7.5.0"
+    ansi-to-html "^0.6.6"
+    debug "^4.0.0"
+    ember-cli-babel-plugin-helpers "^1.0.0"
+    execa "^2.0.0"
+    fs-extra "^8.0.0"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^6.0.0"
+    stagehand "^1.0.0"
+    walk-sync "^2.0.0"
+
+ember-cli-typescript@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-2.0.2.tgz#464984131fbdc05655eb61d1c3cdd911d3137f0d"
+  integrity sha512-7I5azCTxOgRDN8aSSnJZIKSqr+MGnT+jLTUbBYqF8wu6ojs2DUnTePxUcQMcvNh3Q3B1ySv7Q/uZFSjdU9gSjA==
+  dependencies:
+    "@babel/plugin-proposal-class-properties" "^7.1.0"
+    "@babel/plugin-transform-typescript" "~7.4.0"
+    ansi-to-html "^0.6.6"
+    debug "^4.0.0"
+    ember-cli-babel-plugin-helpers "^1.0.0"
+    execa "^1.0.0"
+    fs-extra "^7.0.0"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^6.0.0"
+    stagehand "^1.0.0"
+    walk-sync "^1.0.0"
+
+ember-cli-uglify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-3.0.0.tgz#8819665b2cc5fe70e3ba9fe7a94645209bc42fd6"
+  integrity sha512-n3QxdBfAgBdb2Cnso82Kt/nxm3ppIjnYWM8uhOEhF1aYxNXfM7AJrc+yiqTCDUR61Db8aCpHfAMvChz3kyme7g==
+  dependencies:
+    broccoli-uglify-sourcemap "^3.1.0"
+    lodash.defaultsdeep "^4.6.0"
+
+ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.1, ember-cli-version-checker@^2.1.2:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3"
+  integrity sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg==
+  dependencies:
+    resolve "^1.3.3"
+    semver "^5.3.0"
+
+ember-cli-version-checker@^3.0.0, ember-cli-version-checker@^3.0.1, ember-cli-version-checker@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-3.1.3.tgz#7c9b4f5ff30fdebcd480b1c06c4de43bb51c522c"
+  integrity sha512-PZNSvpzwWgv68hcXxyjREpj3WWb81A7rtYNQq1lLEgrWIchF8ApKJjWP3NBpHjaatwILkZAV8klair5WFlXAKg==
+  dependencies:
+    resolve-package-path "^1.2.6"
+    semver "^5.6.0"
+
+ember-cli-version-checker@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-4.1.0.tgz#7fc9836bdbc87451d286ba6a9a89b23591d8bbb7"
+  integrity sha512-yLf2YqotTSsjiXwx9Dt6H7AU0QcldFn5SLk/pG3Zqb0aHNeanBOPlx4/Ysa46ILGWYIh0fDH34AEVRueXTrQBQ==
+  dependencies:
+    resolve-package-path "^2.0.0"
+    semver "^6.3.0"
+    silent-error "^1.1.1"
+
+ember-cli@~3.15.2:
+  version "3.15.2"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.15.2.tgz#c2a5871850da7537e0cb3cd0e7d59fd76cd3184e"
+  integrity sha512-ciuFaLokZDJfEzltH3QUxZYnQcigCzNrjyyVbeNtr3qUMICHZEzrreQjqIdmuOzmog+BOFddgAB2i/b7ewmV0Q==
+  dependencies:
+    "@babel/core" "^7.7.2"
+    "@babel/plugin-transform-modules-amd" "^7.5.0"
+    amd-name-resolver "^1.3.1"
+    babel-plugin-module-resolver "^3.2.0"
+    bower-config "^1.4.1"
+    bower-endpoint-parser "0.2.2"
+    broccoli "^3.2.0"
+    broccoli-amd-funnel "^2.0.1"
+    broccoli-babel-transpiler "^7.3.0"
+    broccoli-builder "^0.18.14"
+    broccoli-concat "^3.7.4"
+    broccoli-config-loader "^1.0.1"
+    broccoli-config-replace "^1.1.2"
+    broccoli-debug "^0.6.5"
+    broccoli-funnel "^2.0.2"
+    broccoli-funnel-reducer "^1.0.0"
+    broccoli-merge-trees "^3.0.2"
+    broccoli-middleware "^2.1.0"
+    broccoli-module-normalizer "^1.3.0"
+    broccoli-module-unification-reexporter "^1.0.0"
+    broccoli-slow-trees "^3.0.1"
+    broccoli-source "^3.0.0"
+    broccoli-stew "^3.0.0"
+    calculate-cache-key-for-tree "^2.0.0"
+    capture-exit "^2.0.0"
+    chalk "^2.4.2"
+    ci-info "^2.0.0"
+    clean-base-url "^1.0.0"
+    compression "^1.7.4"
+    configstore "^5.0.0"
+    console-ui "^3.1.1"
+    core-object "^3.1.5"
+    dag-map "^2.0.2"
+    diff "^4.0.1"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-lodash-subset "^2.0.1"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-preprocess-registry "^3.3.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-source-channel-url "^2.0.1"
+    ensure-posix-path "^1.0.2"
+    execa "^1.0.0"
+    exit "^0.1.2"
+    express "^4.16.4"
+    filesize "^4.2.0"
+    find-up "^4.1.0"
+    find-yarn-workspace-root "^1.2.1"
+    fs-extra "^8.1.0"
+    fs-tree-diff "^2.0.1"
+    get-caller-file "^2.0.5"
+    git-repo-info "^2.1.0"
+    glob "^7.1.4"
+    heimdalljs "^0.2.6"
+    heimdalljs-fs-monitor "^0.2.3"
+    heimdalljs-graph "^1.0.0"
+    heimdalljs-logger "^0.1.10"
+    http-proxy "^1.18.0"
+    inflection "^1.12.0"
+    is-git-url "^1.0.0"
+    isbinaryfile "^3.0.3"
+    js-yaml "^3.13.1"
+    json-stable-stringify "^1.0.1"
+    leek "0.0.24"
+    lodash.template "^4.5.0"
+    markdown-it "^9.1.0"
+    markdown-it-terminal "0.1.0"
+    minimatch "^3.0.4"
+    morgan "^1.9.1"
+    nopt "^3.0.6"
+    npm-package-arg "^6.1.1"
+    p-defer "^3.0.0"
+    portfinder "^1.0.25"
+    promise-map-series "^0.2.3"
+    promise.prototype.finally "^3.1.1"
+    quick-temp "^0.1.8"
+    resolve "^1.12.0"
+    resolve-package-path "^1.2.7"
+    rsvp "^4.8.5"
+    sane "^4.1.0"
+    semver "^6.3.0"
+    silent-error "^1.1.1"
+    sort-package-json "^1.23.1"
+    symlink-or-copy "^1.2.0"
+    temp "0.9.0"
+    testem "^2.17.0"
+    tiny-lr "^1.1.1"
+    tree-sync "^2.0.0"
+    uuid "^3.3.3"
+    walk-sync "^2.0.2"
+    watch-detector "^1.0.0"
+    yam "^1.0.0"
+
+ember-compatibility-helpers@^1.1.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.1.tgz#87c92c4303f990ff455c28ca39fb3ee11441aa16"
+  integrity sha512-6wzYvnhg1ihQUT5yGqnLtleq3Nv5KNv79WhrEuNU9SwR4uIxCO+KpyC7r3d5VI0EM7/Nmv9Nd0yTkzmTMdVG1A==
+  dependencies:
+    babel-plugin-debug-macros "^0.2.0"
+    ember-cli-version-checker "^2.1.1"
+    semver "^5.4.1"
+
+ember-disable-prototype-extensions@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/ember-disable-prototype-extensions/-/ember-disable-prototype-extensions-1.1.3.tgz#1969135217654b5e278f9fe2d9d4e49b5720329e"
+  integrity sha1-GWkTUhdlS14nj5/i2dTkm1cgMp4=
+
+ember-export-application-global@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-2.0.1.tgz#b120a70e322ab208defc9e2daebe8d0dfc2dcd46"
+  integrity sha512-B7wiurPgsxsSGzJuPFkpBWnaeuCu2PGpG2BjyrfA1VcL7//o+5RSnZqiCEY326y7qmxb2GoCgo0ft03KBU0rRw==
+
+ember-load-initializers@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-2.1.1.tgz#d1a8bead00bc44222b0ab181840869992beb30f5"
+  integrity sha512-Ho5sBeaZPN3HmZkYkcLrjSBF3DTNmzC5h0DizzDj8cjpnCvaqeofphJDnH41k6kLv/QHMk4pMRISPcwc+bOceQ==
+  dependencies:
+    ember-cli-babel "^7.11.0"
+    ember-cli-typescript "^2.0.2"
+
+ember-maybe-import-regenerator@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/ember-maybe-import-regenerator/-/ember-maybe-import-regenerator-0.1.6.tgz#35d41828afa6d6a59bc0da3ce47f34c573d776ca"
+  integrity sha1-NdQYKK+m1qWbwNo85H80xXPXdso=
+  dependencies:
+    broccoli-funnel "^1.0.1"
+    broccoli-merge-trees "^1.0.0"
+    ember-cli-babel "^6.0.0-beta.4"
+    regenerator-runtime "^0.9.5"
+
+ember-qunit@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-4.6.0.tgz#ad79fd3ff00073a8779400cc5a4b44829517590f"
+  integrity sha512-i5VOGn0RP8XH+5qkYDOZshbqAvO6lHgF65D0gz8vRx4DszCIvJMJO+bbftBTfYMxp6rqG85etAA6pfNxE0DqsQ==
+  dependencies:
+    "@ember/test-helpers" "^1.7.1"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.2"
+    common-tags "^1.4.0"
+    ember-cli-babel "^7.12.0"
+    ember-cli-test-loader "^2.2.0"
+    qunit "^2.9.3"
+
+ember-resolver@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-7.0.0.tgz#07ca86b3bae373395b44bba784b8c133f75d61c2"
+  integrity sha512-tqyWk9E1P5LL42x7AnVoE25a/YWe0WcwAr8LXasm5V7Az3vFR/zbFtwN0oI3tpoSP/nCoGWDct6dRYlXrQjqBQ==
+  dependencies:
+    babel-plugin-debug-macros "^0.3.3"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.0"
+    ember-cli-babel "^7.13.2"
+    ember-cli-version-checker "^3.1.3"
+    resolve "^1.14.0"
+
+ember-rfc176-data@^0.3.12:
+  version "0.3.12"
+  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.12.tgz#90d82878e69e2ac9a5438e8ce14d12c6031c5bd2"
+  integrity sha512-g9HeZj/gU5bfIIrGXkP7MhS2b3Vu5DfNUrYr14hy99TgIvtZETO+96QF4WOEUXGjIJdfTRjerVnQlqngPQSv1g==
+
+ember-router-generator@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-2.0.0.tgz#d04abfed4ba8b42d166477bbce47fccc672dbde0"
+  integrity sha512-89oVHVJwmLDvGvAUWgS87KpBoRhy3aZ6U0Ql6HOmU4TrPkyaa8pM0W81wj9cIwjYprcQtN9EwzZMHnq46+oUyw==
+  dependencies:
+    "@babel/parser" "^7.4.5"
+    "@babel/traverse" "^7.4.5"
+    recast "^0.18.1"
+
+ember-source-channel-url@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ember-source-channel-url/-/ember-source-channel-url-1.2.0.tgz#77eb9d0889e5f5370e6c70fcb2696c63ff4a34a1"
+  integrity sha512-CLClcHzVf+8GoFk4176R16nwXoel70bd7DKVAY6D8M0m5fJJhbTrAPYpDA0lY8A60HZo9j/s8A8LWiGh1YmdZg==
+  dependencies:
+    got "^8.0.1"
+
+ember-source-channel-url@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-source-channel-url/-/ember-source-channel-url-2.0.1.tgz#18b88f8a00b7746e7a456b3551abb3aea18729cc"
+  integrity sha512-YlLUHW9gNvxEaohIj5exykoTZb4xj9ZRTcR4J3svv9S8rjAHJUnHmqC5Fd9onCs+NGxHo7KwR/fDwsfadbDu5Q==
+  dependencies:
+    got "^8.0.1"
+
+ember-source@~3.15.0:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.15.0.tgz#f6500c6d289ce58231bf1e6695c4974df2be7390"
+  integrity sha512-daTELJBDMGqAmQb/Puxdk1YR204/zs1DEiEMQWlqbtmhphAoDUbGi9ifJu20ajP/IcOCWw9Vp7aPzguTohWF7w==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/plugin-transform-block-scoping" "^7.6.2"
+    "@babel/plugin-transform-object-assign" "^7.2.0"
+    "@ember/edition-utils" "^1.1.1"
+    babel-plugin-debug-macros "^0.3.3"
+    babel-plugin-filter-imports "^3.0.0"
+    broccoli-concat "^3.7.4"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.2"
+    chalk "^2.4.2"
+    ember-cli-babel "^7.11.0"
+    ember-cli-get-component-path-option "^1.0.0"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-path-utils "^1.0.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-version-checker "^3.1.3"
+    ember-router-generator "^2.0.0"
+    inflection "^1.12.0"
+    jquery "^3.4.1"
+    resolve "^1.11.1"
+    semver "^6.1.1"
+    silent-error "^1.1.1"
+
+ember-template-lint@^1.2.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-1.14.0.tgz#fd3e8ec600b0b3de16b5701bf02acc99d192008e"
+  integrity sha512-M4CebpUZ6G8NEX05FsvlB6nFRO9Xi3eJWbGbnHI1Sakyp5Hl739fTPR5yPn/Gscc/sgNU25Rq1RSm0hoevrYGA==
+  dependencies:
+    "@glimmer/syntax" "^0.47.9"
+    chalk "^2.4.2"
+    globby "^9.2.0"
+    minimatch "^3.0.4"
+    resolve "^1.15.1"
+    strip-bom "^3.0.0"
+
+ember-test-waiters@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ember-test-waiters/-/ember-test-waiters-1.2.0.tgz#c12ead4313934c24cff41857020cacdbf8e6effe"
+  integrity sha512-aEw7YuutLuJT4NUuPTNiGFwgTYl23ThqmBxSkfFimQAn+keWjAftykk3dlFELuhsJhYW/S8YoVjN0bSAQRLNtw==
+  dependencies:
+    ember-cli-babel "^7.11.0"
+    semver "^6.3.0"
+
+ember-try-config@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-try-config/-/ember-try-config-3.0.0.tgz#012d8c90cae9eb624e2b62040bf7e76a1aa58edc"
+  integrity sha512-pNwHS29O1ACczkrxBKRtDY0TzTb7uPnA5eHEe+4NF6qpLK5FVnL3EtgZ8+yVYtnm1If5mZ07rIubw45vaSek7w==
+  dependencies:
+    ember-source-channel-url "^1.0.1"
+    lodash "^4.6.1"
+    package-json "^4.0.1"
+    remote-git-tags "^2.0.0"
+    rsvp "^4.8.1"
+    semver "^5.5.0"
+
+ember-try@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-1.4.0.tgz#be15965bd1727c27a65a78c4c8392f03763cc565"
+  integrity sha512-o0SoCH4K8umCf8etphla8FDygKfQGkwY+w47wEuYFVKaESrOZaK63ObnAK7DTKkjJU74Fss2abf+r+pAWpX43g==
+  dependencies:
+    chalk "^2.4.2"
+    cli-table3 "^0.5.1"
+    core-object "^3.1.5"
+    debug "^4.1.1"
+    ember-try-config "^3.0.0"
+    execa "^1.0.0"
+    extend "^3.0.0"
+    fs-extra "^5.0.0"
+    promise-map-series "^0.2.1"
+    resolve "^1.10.1"
+    rimraf "^2.6.3"
+    rsvp "^4.7.0"
+    walk-sync "^1.1.3"
+
+emit-function@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/emit-function/-/emit-function-0.0.2.tgz#e3a50b3d61be1bf8ca88b924bf713157a5bec124"
+  integrity sha1-46ULPWG+G/jKiLkkv3ExV6W+wSQ=
+
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
+engine.io-client@~3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.1.tgz#922ddb47eecdcb541136a93aeead24718fd05461"
+  integrity sha512-RJNmA+A9Js+8Aoq815xpGAsgWH1VoSYM//2VgIiu9lNOaHFfLpTjH4tOzktBpjIs5lvOfiNY1dwf+NuU6D38Mw==
+  dependencies:
+    component-emitter "1.2.1"
+    component-inherit "0.0.3"
+    debug "~4.1.0"
+    engine.io-parser "~2.2.0"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    ws "~6.1.0"
+    xmlhttprequest-ssl "~1.5.4"
+    yeast "0.1.2"
+
+engine.io-parser@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.0.tgz#312c4894f57d52a02b420868da7b5c1c84af80ed"
+  integrity sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==
+  dependencies:
+    after "0.8.2"
+    arraybuffer.slice "~0.0.7"
+    base64-arraybuffer "0.1.5"
+    blob "0.0.5"
+    has-binary2 "~1.0.2"
+
+engine.io@~3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.1.tgz#a61cbc13fa0cb27d9453fd079a29ee980564b069"
+  integrity sha512-8MfIfF1/IIfxuc2gv5K+XlFZczw/BpTvqBdl0E2fBLkYQp4miv4LuDTVtYt4yMyaIFLEr4vtaSgV4mjvll8Crw==
+  dependencies:
+    accepts "~1.3.4"
+    base64id "2.0.0"
+    cookie "0.3.1"
+    debug "~4.1.0"
+    engine.io-parser "~2.2.0"
+    ws "^7.1.2"
+
+enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
+  integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.5.0"
+    tapable "^1.0.0"
+
+ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, ensure-posix-path@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce"
+  integrity sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==
+
+entities@^1.1.2, entities@~1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+
+errno@^0.1.3, errno@~0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
+  dependencies:
+    prr "~1.0.1"
+
+error@^7.0.0:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/error/-/error-7.2.1.tgz#eab21a4689b5f684fc83da84a0e390de82d94894"
+  integrity sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==
+  dependencies:
+    string-template "~0.2.1"
+
+es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5:
+  version "1.17.5"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
+  integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.1.5"
+    is-regex "^1.0.5"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimleft "^2.1.1"
+    string.prototype.trimright "^2.1.1"
+
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+escodegen@^1.11.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"
+  integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+eslint-plugin-ember@^7.7.1:
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-7.13.0.tgz#a1df7794f06cdc6e1b8acfe6c59db5cf861f53dc"
+  integrity sha512-qIbw4uP0qUJoiWF4+7MTJWqwEN86RGmBNId0cwSoHoVNWtcw50R1ajYgxM1Q5FVUdoisVeSl9lKVRh5zkDFl+g==
+  dependencies:
+    "@ember-data/rfc395-data" "^0.0.4"
+    ember-rfc176-data "^0.3.12"
+    snake-case "^3.0.3"
+
+eslint-plugin-es@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz#0f5f5da5f18aa21989feebe8a73eadefb3432976"
+  integrity sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ==
+  dependencies:
+    eslint-utils "^1.4.2"
+    regexpp "^3.0.0"
+
+eslint-plugin-node@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-10.0.0.tgz#fd1adbc7a300cf7eb6ac55cf4b0b6fc6e577f5a6"
+  integrity sha512-1CSyM/QCjs6PXaT18+zuAXsjXGIGo5Rw630rSKwokSs2jrYURQc4R5JZpoanNCqwNmepg+0eZ9L7YiRUJb8jiQ==
+  dependencies:
+    eslint-plugin-es "^2.0.0"
+    eslint-utils "^1.4.2"
+    ignore "^5.1.1"
+    minimatch "^3.0.4"
+    resolve "^1.10.1"
+    semver "^6.1.0"
+
+eslint-scope@^4.0.0, eslint-scope@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-utils@^1.3.1, eslint-utils@^1.4.2:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
+  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
+  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+
+eslint@^5.6.0:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
+  integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    ajv "^6.9.1"
+    chalk "^2.1.0"
+    cross-spawn "^6.0.5"
+    debug "^4.0.1"
+    doctrine "^3.0.0"
+    eslint-scope "^4.0.3"
+    eslint-utils "^1.3.1"
+    eslint-visitor-keys "^1.0.0"
+    espree "^5.0.1"
+    esquery "^1.0.1"
+    esutils "^2.0.2"
+    file-entry-cache "^5.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob "^7.1.2"
+    globals "^11.7.0"
+    ignore "^4.0.6"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    inquirer "^6.2.2"
+    js-yaml "^3.13.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.11"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.2"
+    progress "^2.0.0"
+    regexpp "^2.0.1"
+    semver "^5.5.1"
+    strip-ansi "^4.0.0"
+    strip-json-comments "^2.0.1"
+    table "^5.2.3"
+    text-table "^0.2.0"
+
+esm@^3.2.4:
+  version "3.2.25"
+  resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
+  integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
+
+espree@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
+  integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
+  dependencies:
+    acorn "^6.0.7"
+    acorn-jsx "^5.0.0"
+    eslint-visitor-keys "^1.0.0"
+
+esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+esprima@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
+  integrity sha1-U88kes2ncxPlUcOqLnM0LT+099k=
+
+esquery@^1.0.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
+  dependencies:
+    estraverse "^5.1.0"
+
+esrecurse@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
+  dependencies:
+    estraverse "^4.1.0"
+
+estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+estraverse@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
+  integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+
+eventemitter3@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
+  integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==
+
+events-to-array@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.1.2.tgz#2d41f563e1fe400ed4962fe1a4d5c6a7539df7f6"
+  integrity sha1-LUH1Y+H+QA7Uli/hpNXGp1Od9/Y=
+
+events@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"
+  integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
+exec-sh@^0.3.2:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
+  integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
+
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+execa@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99"
+  integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^3.0.0"
+    onetime "^5.1.0"
+    p-finally "^2.0.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
+exists-sync@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.4.tgz#9744c2c428cc03b01060db454d4b12f0ef3c8879"
+  integrity sha1-l0TCxCjMA7AQYNtFTUsS8O88iHk=
+
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+expand-tilde@^2.0.0, expand-tilde@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
+  dependencies:
+    homedir-polyfill "^1.0.1"
+
+express@^4.10.7, express@^4.16.4:
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+  dependencies:
+    accepts "~1.3.7"
+    array-flatten "1.1.1"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
+    content-type "~1.0.4"
+    cookie "0.4.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extend@^3.0.0, extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+external-editor@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
+fast-deep-equal@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
+  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+
+fast-glob@^2.2.6:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
+  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
+  dependencies:
+    "@mrmlnc/readdir-enhanced" "^2.2.1"
+    "@nodelib/fs.stat" "^1.1.2"
+    glob-parent "^3.1.0"
+    is-glob "^4.0.0"
+    merge2 "^1.2.3"
+    micromatch "^3.1.10"
+
+fast-glob@^3.1.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d"
+  integrity sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@~2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
+fast-ordered-set@^1.0.0, fast-ordered-set@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/fast-ordered-set/-/fast-ordered-set-1.0.3.tgz#3fbb36634f7be79e4f7edbdb4a357dee25d184eb"
+  integrity sha1-P7s2Y097555PftvbSjV97iXRhOs=
+  dependencies:
+    blank-object "^1.0.1"
+
+fast-sourcemap-concat@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/fast-sourcemap-concat/-/fast-sourcemap-concat-1.4.0.tgz#122c330d4a2afaff16ad143bc9674b87cd76c8ad"
+  integrity sha512-x90Wlx/2C83lfyg7h4oguTZN4MyaVfaiUSJQNpU+YEA0Odf9u659Opo44b0LfoVg9G/bOE++GdID/dkyja+XcA==
+  dependencies:
+    chalk "^2.0.0"
+    fs-extra "^5.0.0"
+    heimdalljs-logger "^0.1.9"
+    memory-streams "^0.1.3"
+    mkdirp "^0.5.0"
+    source-map "^0.4.2"
+    source-map-url "^0.3.0"
+    sourcemap-validator "^1.1.0"
+
+fastq@^1.6.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.7.0.tgz#fcd79a08c5bd7ec5b55cd3f5c4720db551929801"
+  integrity sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==
+  dependencies:
+    reusify "^1.0.4"
+
+faye-websocket@~0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+fb-watchman@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
+  dependencies:
+    bser "2.1.1"
+
+figgy-pudding@^3.5.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
+  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
+
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+figures@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-entry-cache@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
+  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+  dependencies:
+    flat-cache "^2.0.1"
+
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
+filesize@^4.1.2, filesize@^4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-4.2.1.tgz#ab1cb2069db5d415911c1a13e144c0e743bc89bc"
+  integrity sha512-bP82Hi8VRZX/TUBKfE24iiUGsB/sfm2WUrwTQyAzQrhO3V9IhcBBNBXMyzLY5orACxRyYJ3d2HeRVX+eFv4lmA==
+
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+finalhandler@1.1.2, finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
+
+find-babel-config@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
+  integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
+  dependencies:
+    json5 "^0.5.1"
+    path-exists "^3.0.0"
+
+find-cache-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^2.0.0"
+    pkg-dir "^3.0.0"
+
+find-index@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/find-index/-/find-index-1.1.1.tgz#4b221f8d46b7f8bea33d8faed953f3ca7a081cbc"
+  integrity sha512-XYKutXMrIK99YMUPf91KX5QVJoG31/OsgftD6YoTPAObfQIxM4ziA9f0J1AsqKhJmo+IeaIPP0CFopTD4bdUBw==
+
+find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
+  dependencies:
+    locate-path "^2.0.0"
+
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
+find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+find-yarn-workspace-root@^1.1.0, find-yarn-workspace-root@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
+  integrity sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==
+  dependencies:
+    fs-extra "^4.0.3"
+    micromatch "^3.1.4"
+
+findup-sync@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0"
+  integrity sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^4.0.0"
+    micromatch "^4.0.2"
+    resolve-dir "^1.0.1"
+
+fireworm@^0.7.0:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/fireworm/-/fireworm-0.7.1.tgz#ccf20f7941f108883fcddb99383dbe6e1861c758"
+  integrity sha1-zPIPeUHxCIg/zduZOD2+bhhhx1g=
+  dependencies:
+    async "~0.2.9"
+    is-type "0.0.1"
+    lodash.debounce "^3.1.1"
+    lodash.flatten "^3.0.2"
+    minimatch "^3.0.2"
+
+fixturify-project@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-1.10.0.tgz#091c452a9bb15f09b6b9cc7cf5c0ad559f1d9aad"
+  integrity sha512-L1k9uiBQuN0Yr8tA9Noy2VSQ0dfg0B8qMdvT7Wb5WQKc7f3dn3bzCbSrqlb+etLW+KDV4cBC7R1OvcMg3kcxmA==
+  dependencies:
+    fixturify "^1.2.0"
+    tmp "^0.0.33"
+
+fixturify@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-1.3.0.tgz#163c468093c7c4d90b70cde39fd6325f6528b25d"
+  integrity sha512-tL0svlOy56pIMMUQ4bU1xRe6NZbFSa/ABTWMxW2mH38lFGc9TrNAKWcMBQ7eIjo3wqSS8f2ICabFaatFyFmrVQ==
+  dependencies:
+    "@types/fs-extra" "^5.0.5"
+    "@types/minimatch" "^3.0.3"
+    "@types/rimraf" "^2.0.2"
+    fs-extra "^7.0.1"
+    matcher-collection "^2.0.0"
+
+flat-cache@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
+  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+  dependencies:
+    flatted "^2.0.0"
+    rimraf "2.6.3"
+    write "1.0.3"
+
+flatted@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
+  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
+
+flush-write-stream@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.3.6"
+
+follow-redirects@^1.0.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb"
+  integrity sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==
+  dependencies:
+    debug "^3.0.0"
+
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
+forwarded@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  dependencies:
+    map-cache "^0.2.2"
+
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+
+from2@^2.1.0, from2@^2.1.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
+fs-extra@^0.24.0:
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
+  integrity sha1-1OQ0KpZnXLeEZjOmCZJJMytTmVI=
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+    path-is-absolute "^1.0.0"
+    rimraf "^2.2.8"
+
+fs-extra@^4.0.2, fs-extra@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"
+  integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
+  integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^7.0.0, fs-extra@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^8.0.0, fs-extra@^8.0.1, fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-merger@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/fs-merger/-/fs-merger-3.0.3.tgz#d43c978e3cd5dbc29fb34144182eba749ab8c4b5"
+  integrity sha512-d9Qx+XlPRU4mkp+JYhUvp5NyS31uhqffIgs6EBnZcjrlO9RwSv0lkWi6PIDxgdNF+vjn9QCZevunGDpfoy4BGg==
+  dependencies:
+    broccoli-node-api "^1.7.0"
+    broccoli-node-info "^2.1.0"
+    fs-extra "^8.0.1"
+    fs-tree-diff "^2.0.1"
+    rimraf "^2.6.3"
+    walk-sync "^2.0.2"
+
+fs-minipass@^1.2.5:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
+  dependencies:
+    minipass "^2.6.0"
+
+fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6, fs-tree-diff@^0.5.7:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.9.tgz#a4ec6182c2f5bd80b9b83c8e23e4522e6f5fd946"
+  integrity sha512-872G8ax0kHh01m9n/2KDzgYwouKza0Ad9iFltBpNykvROvf2AGtoOzPJgGx125aolGPER3JuC7uZFrQ7bG1AZw==
+  dependencies:
+    heimdalljs-logger "^0.1.7"
+    object-assign "^4.1.0"
+    path-posix "^1.0.0"
+    symlink-or-copy "^1.1.8"
+
+fs-tree-diff@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-1.0.2.tgz#0e2931733a85b55feb3472c0b89a20b0c03ac0de"
+  integrity sha512-Zro2ACaPVDgVOx9+s5s5AfPlAD0kMJdbwGvTGF6KC1SjxjiGWxJvV4mUTDkFVSy3OUw2C/f1qpdjF81hGqSBAw==
+  dependencies:
+    heimdalljs-logger "^0.1.7"
+    object-assign "^4.1.0"
+    path-posix "^1.0.0"
+    symlink-or-copy "^1.1.8"
+
+fs-tree-diff@^2.0.0, fs-tree-diff@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz#343e4745ab435ec39ebac5f9059ad919cd034afa"
+  integrity sha512-x+CfAZ/lJHQqwlD64pYM5QxWjzWhSjroaVsr8PW831zOApL55qPibed0c+xebaLWVr2BnHFoHdrwOv8pzt8R5A==
+  dependencies:
+    "@types/symlink-or-copy" "^1.2.0"
+    heimdalljs-logger "^0.1.7"
+    object-assign "^4.1.0"
+    path-posix "^1.0.0"
+    symlink-or-copy "^1.1.8"
+
+fs-updater@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/fs-updater/-/fs-updater-1.0.4.tgz#2329980f99ae9176e9a0e84f7637538a182ce63b"
+  integrity sha512-0pJX4mJF/qLsNEwTct8CdnnRdagfb+LmjRPJ8sO+nCnAZLW0cTmz4rTgU25n+RvTuWSITiLKrGVJceJPBIPlKg==
+  dependencies:
+    can-symlink "^1.0.0"
+    clean-up-path "^1.0.0"
+    heimdalljs "^0.2.5"
+    heimdalljs-logger "^0.1.9"
+    rimraf "^2.6.2"
+
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
+  dependencies:
+    graceful-fs "^4.1.2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+fsevents@^1.2.7:
+  version "1.2.12"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz#db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c"
+  integrity sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==
+  dependencies:
+    bindings "^1.5.0"
+    nan "^2.12.1"
+
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+gensync@^1.0.0-beta.1:
+  version "1.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
+  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
+
+get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-stdin@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
+
+get-stream@3.0.0, get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
+get-stream@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
+  integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==
+  dependencies:
+    pump "^3.0.0"
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  dependencies:
+    assert-plus "^1.0.0"
+
+git-fetch-pack@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/git-fetch-pack/-/git-fetch-pack-0.1.1.tgz#7703a32cf0db80f060d2766a34ac00d02cebcdf5"
+  integrity sha1-dwOjLPDbgPBg0nZqNKwA0CzrzfU=
+  dependencies:
+    bops "0.0.3"
+    emit-function "0.0.2"
+    git-packed-ref-parse "0.0.0"
+    through "~2.2.7"
+
+git-hooks-list@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/git-hooks-list/-/git-hooks-list-1.0.3.tgz#be5baaf78203ce342f2f844a9d2b03dba1b45156"
+  integrity sha512-Y7wLWcrLUXwk2noSka166byGCvhMtDRpgHdzCno1UQv/n/Hegp++a2xBWJL1lJarnKD3SWaljD+0z1ztqxuKyQ==
+
+git-packed-ref-parse@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/git-packed-ref-parse/-/git-packed-ref-parse-0.0.0.tgz#b85046931f3e4a65679b5de54af3a5d3df372646"
+  integrity sha1-uFBGkx8+SmVnm13lSvOl0983JkY=
+  dependencies:
+    line-stream "0.0.0"
+    through "~2.2.7"
+
+git-read-pkt-line@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/git-read-pkt-line/-/git-read-pkt-line-0.0.8.tgz#494037854ed57bd90cd55676540d86ab0cb36caa"
+  integrity sha1-SUA3hU7Ve9kM1VZ2VA2GqwyzbKo=
+  dependencies:
+    bops "0.0.3"
+    through "~2.2.7"
+
+git-repo-info@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-2.1.1.tgz#220ffed8cbae74ef8a80e3052f2ccb5179aed058"
+  integrity sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg==
+
+git-transport-protocol@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/git-transport-protocol/-/git-transport-protocol-0.1.0.tgz#99f4dd6389b9161eded74a9e617d6ba5ed0a6c2c"
+  integrity sha1-mfTdY4m5Fh7e10qeYX1rpe0KbCw=
+  dependencies:
+    duplex "~1.0.0"
+    emit-function "0.0.2"
+    git-read-pkt-line "0.0.8"
+    git-write-pkt-line "0.1.0"
+    through "~2.2.7"
+
+git-write-pkt-line@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/git-write-pkt-line/-/git-write-pkt-line-0.1.0.tgz#a84c1856c09011908389b2f06f911d91f6394694"
+  integrity sha1-qEwYVsCQEZCDibLwb5EdkfY5RpQ=
+  dependencies:
+    bops "0.0.3"
+    through "~2.2.7"
+
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
+glob-parent@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob-to-regexp@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
+
+glob@^5.0.10:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.0.4, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+global-modules@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
+  dependencies:
+    global-prefix "^1.0.1"
+    is-windows "^1.0.1"
+    resolve-dir "^1.0.0"
+
+global-prefix@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
+  dependencies:
+    expand-tilde "^2.0.2"
+    homedir-polyfill "^1.0.1"
+    ini "^1.3.4"
+    is-windows "^1.0.1"
+    which "^1.2.14"
+
+globals@^11.1.0, globals@^11.7.0:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
+globals@^9.18.0:
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
+
+globby@11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.0.tgz#56fd0e9f0d4f8fb0c456f1ab0dee96e1380bc154"
+  integrity sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
+
+globby@^9.2.0:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
+  integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
+  dependencies:
+    "@types/glob" "^7.1.1"
+    array-union "^1.0.2"
+    dir-glob "^2.2.2"
+    fast-glob "^2.2.6"
+    glob "^7.1.3"
+    ignore "^4.0.3"
+    pify "^4.0.1"
+    slash "^2.0.0"
+
+got@^6.7.1:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
+  integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=
+  dependencies:
+    create-error-class "^3.0.0"
+    duplexer3 "^0.1.4"
+    get-stream "^3.0.0"
+    is-redirect "^1.0.0"
+    is-retry-allowed "^1.0.0"
+    is-stream "^1.0.0"
+    lowercase-keys "^1.0.0"
+    safe-buffer "^5.0.1"
+    timed-out "^4.0.0"
+    unzip-response "^2.0.1"
+    url-parse-lax "^1.0.0"
+
+got@^8.0.1:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
+  integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==
+  dependencies:
+    "@sindresorhus/is" "^0.7.0"
+    cacheable-request "^2.1.1"
+    decompress-response "^3.3.0"
+    duplexer3 "^0.1.4"
+    get-stream "^3.0.0"
+    into-stream "^3.1.0"
+    is-retry-allowed "^1.1.0"
+    isurl "^1.0.0-alpha5"
+    lowercase-keys "^1.0.0"
+    mimic-response "^1.0.0"
+    p-cancelable "^0.4.0"
+    p-timeout "^2.0.1"
+    pify "^3.0.0"
+    safe-buffer "^5.1.1"
+    timed-out "^4.0.1"
+    url-parse-lax "^3.0.0"
+    url-to-options "^1.0.1"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
+
+growly@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
+
+handlebars@^4.0.11, handlebars@^4.0.4, handlebars@^4.3.1, handlebars@^4.5.1, handlebars@^4.7.3:
+  version "4.7.6"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
+  integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
+  dependencies:
+    minimist "^1.2.5"
+    neo-async "^2.6.0"
+    source-map "^0.6.1"
+    wordwrap "^1.0.0"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+  dependencies:
+    ajv "^6.5.5"
+    har-schema "^2.0.0"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-ansi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-3.0.0.tgz#36077ef1d15f333484aa7fa77a28606f1c655b37"
+  integrity sha1-Ngd+8dFfMzSEqn+neihgbxxlWzc=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+has-binary2@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
+  dependencies:
+    isarray "2.0.1"
+
+has-cors@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+has-symbol-support-x@^1.4.1:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
+  integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
+
+has-symbols@^1.0.0, has-symbols@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
+  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
+
+has-to-string-tag-x@^1.2.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
+  integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
+  dependencies:
+    has-symbol-support-x "^1.4.1"
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+hash-base@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+hash-for-dep@^1.0.2, hash-for-dep@^1.2.3, hash-for-dep@^1.4.7, hash-for-dep@^1.5.0, hash-for-dep@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.5.1.tgz#497754b39bee2f1c4ade4521bfd2af0a7c1196e3"
+  integrity sha512-/dQ/A2cl7FBPI2pO0CANkvuuVi/IFS5oTyJ0PsOb6jW6WbVW1js5qJXMJTNbWHXBIPdFTWFbabjB+mE0d+gelw==
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    heimdalljs "^0.2.3"
+    heimdalljs-logger "^0.1.7"
+    path-root "^0.1.1"
+    resolve "^1.10.0"
+    resolve-package-path "^1.0.11"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.1"
+
+heimdalljs-fs-monitor@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/heimdalljs-fs-monitor/-/heimdalljs-fs-monitor-0.2.3.tgz#1aedd4b1c61d86c51f6141fb75c5a3350dc41b15"
+  integrity sha512-fYAvqSP0CxeOjLrt61B4wux/jqZzdZnS2xfb2oc14NP6BTZ8gtgtR2op6gKFakOR8lm8GN9Xhz1K4A1ZvJ4RQw==
+  dependencies:
+    heimdalljs "^0.2.3"
+    heimdalljs-logger "^0.1.7"
+
+heimdalljs-graph@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/heimdalljs-graph/-/heimdalljs-graph-1.0.0.tgz#0059857952988e54f3a74bb23edaf669f8eaf6af"
+  integrity sha512-v2AsTERBss0ukm/Qv4BmXrkwsT5x6M1V5Om6E8NcDQ/ruGkERsfsuLi5T8jx8qWzKMGYlwzAd7c/idymxRaPzA==
+
+heimdalljs-logger@^0.1.10, heimdalljs-logger@^0.1.7, heimdalljs-logger@^0.1.9:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/heimdalljs-logger/-/heimdalljs-logger-0.1.10.tgz#90cad58aabb1590a3c7e640ddc6a4cd3a43faaf7"
+  integrity sha512-pO++cJbhIufVI/fmB/u2Yty3KJD0TqNPecehFae0/eps0hkZ3b4Zc/PezUMOpYuHFQbA7FxHZxa305EhmjLj4g==
+  dependencies:
+    debug "^2.2.0"
+    heimdalljs "^0.2.6"
+
+heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3, heimdalljs@^0.2.5, heimdalljs@^0.2.6:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/heimdalljs/-/heimdalljs-0.2.6.tgz#b0eebabc412813aeb9542f9cc622cb58dbdcd9fe"
+  integrity sha512-o9bd30+5vLBvBtzCPwwGqpry2+n0Hi6H1+qwt6y+0kwRHGGF8TFIhJPmnuM0xO97zaKrDZMwO/V56fAnn8m/tA==
+  dependencies:
+    rsvp "~3.2.1"
+
+hmac-drbg@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
+home-or-tmp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg=
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.1"
+
+homedir-polyfill@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
+  dependencies:
+    parse-passwd "^1.0.0"
+
+hosted-git-info@^2.7.1:
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+
+html-encoding-sniffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
+  dependencies:
+    whatwg-encoding "^1.0.1"
+
+http-cache-semantics@3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
+
+http-errors@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
+http-errors@~1.7.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+"http-parser-js@>=0.4.0 <0.4.11":
+  version "0.4.10"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
+  integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
+
+http-proxy@^1.13.1, http-proxy@^1.18.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a"
+  integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==
+  dependencies:
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
+
+https@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https/-/https-1.0.0.tgz#3c37c7ae1a8eeb966904a2ad1e975a194b7ed3a4"
+  integrity sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q=
+
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+ieee754@^1.1.4:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
+
+ignore-walk@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
+  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
+  dependencies:
+    minimatch "^3.0.4"
+
+ignore@^4.0.3, ignore@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+
+ignore@^5.1.1, ignore@^5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
+  integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
+
+import-fresh@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
+  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
+
+infer-owner@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
+
+inflection@^1.12.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
+  integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
+
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+ini@^1.3.4, ini@~1.3.0:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+
+inline-source-map-comment@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/inline-source-map-comment/-/inline-source-map-comment-1.0.5.tgz#50a8a44c2a790dfac441b5c94eccd5462635faf6"
+  integrity sha1-UKikTCp5DfrEQbXJTszVRiY1+vY=
+  dependencies:
+    chalk "^1.0.0"
+    get-stdin "^4.0.1"
+    minimist "^1.1.1"
+    sum-up "^1.0.1"
+    xtend "^4.0.0"
+
+inquirer@^6, inquirer@^6.2.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
+  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
+  dependencies:
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^2.0.0"
+    lodash "^4.17.12"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.4.0"
+    string-width "^2.1.0"
+    strip-ansi "^5.1.0"
+    through "^2.3.6"
+
+inquirer@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29"
+  integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^3.0.0"
+    cli-cursor "^3.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.15"
+    mute-stream "0.0.8"
+    run-async "^2.4.0"
+    rxjs "^6.5.3"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
+
+into-stream@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
+  integrity sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=
+  dependencies:
+    from2 "^2.1.1"
+    p-is-promise "^1.1.0"
+
+invariant@^2.2.2, invariant@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
+  dependencies:
+    loose-envify "^1.0.0"
+
+ipaddr.js@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
+is-callable@^1.1.4, is-callable@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
+  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-date-object@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
+  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-extendable@^0.1.0, is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  dependencies:
+    is-plain-object "^2.0.4"
+
+is-extglob@^2.1.0, is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-finite@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
+  integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-git-url@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b"
+  integrity sha1-U/aEzRQyhbUsMkS05vKCU1J69ms=
+
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-glob@^4.0.0, is-glob@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
+  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
+
+is-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
+  integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
+
+is-plain-obj@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
+  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  dependencies:
+    isobject "^3.0.1"
+
+is-redirect@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
+  integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
+
+is-regex@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
+  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
+  dependencies:
+    has "^1.0.3"
+
+is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
+  integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
+
+is-stream@^1.0.0, is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
+is-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
+  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+
+is-symbol@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
+  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+  dependencies:
+    has-symbols "^1.0.1"
+
+is-type@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/is-type/-/is-type-0.0.1.tgz#f651d85c365d44955d14a51d8d7061f3f6b4779c"
+  integrity sha1-9lHYXDZdRJVdFKUdjXBh8/a0d5w=
+  dependencies:
+    core-util-is "~1.0.0"
+
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
+is-windows@^1.0.1, is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isarray@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
+
+isbinaryfile@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
+  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
+  dependencies:
+    buffer-alloc "^1.2.0"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+istextorbinary@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.1.0.tgz#dbed2a6f51be2f7475b68f89465811141b758874"
+  integrity sha1-2+0qb1G+L3R1to+JRlgRFBt1iHQ=
+  dependencies:
+    binaryextensions "1 || 2"
+    editions "^1.1.1"
+    textextensions "1 || 2"
+
+isurl@^1.0.0-alpha5:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
+  integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
+  dependencies:
+    has-to-string-tag-x "^1.2.0"
+    is-object "^1.0.1"
+
+jquery@^3.4.1:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
+  integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
+
+js-reporters@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/js-reporters/-/js-reporters-1.2.1.tgz#f88c608e324a3373a95bcc45ad305e5c979c459b"
+  integrity sha1-+IxgjjJKM3OpW8xFrTBeXJecRZs=
+
+js-string-escape@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+  integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=
+
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
+
+js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.2.5, js-yaml@^3.2.7:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
+jsdom@^12.0.0:
+  version "12.2.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-12.2.0.tgz#7cf3f5b5eafd47f8f09ca52315d367ff6e95de23"
+  integrity sha512-QPOggIJ8fquWPLaYYMoh+zqUmdphDtu1ju0QGTitZT1Yd8I5qenPpXM1etzUegu3MjVp8XPzgZxdn8Yj7e40ig==
+  dependencies:
+    abab "^2.0.0"
+    acorn "^6.0.2"
+    acorn-globals "^4.3.0"
+    array-equal "^1.0.0"
+    cssom "^0.3.4"
+    cssstyle "^1.1.1"
+    data-urls "^1.0.1"
+    domexception "^1.0.1"
+    escodegen "^1.11.0"
+    html-encoding-sniffer "^1.0.2"
+    nwsapi "^2.0.9"
+    parse5 "5.1.0"
+    pn "^1.1.0"
+    request "^2.88.0"
+    request-promise-native "^1.0.5"
+    saxes "^3.1.3"
+    symbol-tree "^3.2.2"
+    tough-cookie "^2.4.3"
+    w3c-hr-time "^1.0.1"
+    webidl-conversions "^4.0.2"
+    whatwg-encoding "^1.0.5"
+    whatwg-mimetype "^2.2.0"
+    whatwg-url "^7.0.0"
+    ws "^6.1.0"
+    xml-name-validator "^3.0.0"
+
+jsesc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
+
+jsesc@^2.5.0, jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+
+jsesc@~0.3.x:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.3.0.tgz#1bf5ee63b4539fe2e26d0c1e99c240b97a457972"
+  integrity sha1-G/XuY7RTn+LibQwemcJAuXpFeXI=
+
+jsesc@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
+
+json-buffer@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
+
+json-parse-better-errors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+
+json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
+  dependencies:
+    jsonify "~0.0.0"
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
+json5@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+  dependencies:
+    minimist "^1.2.5"
+
+jsonfile@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+keyv@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
+  integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==
+  dependencies:
+    json-buffer "3.0.0"
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
+leek@0.0.24:
+  version "0.0.24"
+  resolved "https://registry.yarnpkg.com/leek/-/leek-0.0.24.tgz#e400e57f0e60d8ef2bd4d068dc428a54345dbcda"
+  integrity sha1-5ADlfw5g2O8r1NBo3EKKVDRdvNo=
+  dependencies:
+    debug "^2.1.0"
+    lodash.assign "^3.2.0"
+    rsvp "^3.0.21"
+
+leven@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+
+levenary@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
+  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
+  dependencies:
+    leven "^3.1.0"
+
+levn@^0.3.0, levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+line-stream@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/line-stream/-/line-stream-0.0.0.tgz#888b7cc7951c6a05ce4d696dd1e6b8262371bb45"
+  integrity sha1-iIt8x5UcagXOTWlt0ea4JiNxu0U=
+  dependencies:
+    through "~2.2.0"
+
+linkify-it@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
+  integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==
+  dependencies:
+    uc.micro "^1.0.1"
+
+livereload-js@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c"
+  integrity sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==
+
+loader-runner@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
+  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
+
+loader-utils@^1.1.0, loader-utils@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
+loader.js@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/loader.js/-/loader.js-4.7.0.tgz#a1a52902001c83631efde9688b8ab3799325ef1f"
+  integrity sha512-9M2KvGT6duzGMgkOcTkWb+PR/Q2Oe54df/tLgHGVmFpAmtqJ553xJh6N63iFYI2yjo2PeJXbS5skHi/QpJq4vA==
+
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+lodash._baseassign@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
+  integrity sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=
+  dependencies:
+    lodash._basecopy "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash._basecopy@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
+  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
+
+lodash._baseflatten@^3.0.0:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz#0770ff80131af6e34f3b511796a7ba5214e65ff7"
+  integrity sha1-B3D/gBMa9uNPO1EXlqe6UhTmX/c=
+  dependencies:
+    lodash.isarguments "^3.0.0"
+    lodash.isarray "^3.0.0"
+
+lodash._bindcallback@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
+  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
+
+lodash._createassigner@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
+  integrity sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=
+  dependencies:
+    lodash._bindcallback "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+    lodash.restparam "^3.0.0"
+
+lodash._getnative@^3.0.0:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
+
+lodash._isiterateecall@^3.0.0:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
+  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
+
+lodash._reinterpolate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
+
+lodash.assign@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"
+  integrity sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=
+  dependencies:
+    lodash._baseassign "^3.0.0"
+    lodash._createassigner "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash.assignin@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
+  integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI=
+
+lodash.castarray@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115"
+  integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU=
+
+lodash.clonedeep@^4.4.1:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+
+lodash.debounce@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz#812211c378a94cc29d5aa4e3346cf0bfce3a7df5"
+  integrity sha1-gSIRw3ipTMKdWqTjNGzwv846ffU=
+  dependencies:
+    lodash._getnative "^3.0.0"
+
+lodash.defaultsdeep@^4.6.0, lodash.defaultsdeep@^4.6.1:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6"
+  integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==
+
+lodash.find@^4.5.1:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1"
+  integrity sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E=
+
+lodash.flatten@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-3.0.2.tgz#de1cf57758f8f4479319d35c3e9cc60c4501938c"
+  integrity sha1-3hz1d1j49EeTGdNcPpzGDEUBk4w=
+  dependencies:
+    lodash._baseflatten "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+
+lodash.foreach@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
+  integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=
+
+lodash.isarguments@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
+
+lodash.isarray@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
+
+lodash.keys@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
+  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
+  dependencies:
+    lodash._getnative "^3.0.0"
+    lodash.isarguments "^3.0.0"
+    lodash.isarray "^3.0.0"
+
+lodash.merge@^4.6.0, lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lodash.omit@^4.1.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
+  integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=
+
+lodash.restparam@^3.0.0:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
+
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+
+lodash.template@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+
+lodash.uniq@^4.2.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
+lodash.uniqby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
+  integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
+
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.6.1:
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+
+log-symbols@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+  dependencies:
+    chalk "^2.0.1"
+
+loose-envify@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
+lower-case@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7"
+  integrity sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==
+  dependencies:
+    tslib "^1.10.0"
+
+lowercase-keys@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+  integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=
+
+lowercase-keys@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
+
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
+make-dir@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
+make-dir@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
+makeerror@1.0.x:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+  dependencies:
+    tmpl "1.0.x"
+
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  dependencies:
+    object-visit "^1.0.0"
+
+markdown-it-terminal@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.1.0.tgz#545abd8dd01c3d62353bfcea71db580b51d22bd9"
+  integrity sha1-VFq9jdAcPWI1O/zqcdtYC1HSK9k=
+  dependencies:
+    ansi-styles "^3.0.0"
+    cardinal "^1.0.0"
+    cli-table "^0.3.1"
+    lodash.merge "^4.6.0"
+    markdown-it "^8.3.1"
+
+markdown-it@^8.3.1:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
+  integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==
+  dependencies:
+    argparse "^1.0.7"
+    entities "~1.1.1"
+    linkify-it "^2.0.0"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
+markdown-it@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-9.1.0.tgz#df9601c168568704d554b1fff9af0c5b561168d9"
+  integrity sha512-xHKG4C8iPriyfu/jc2hsCC045fKrMQ0VexX2F1FGYiRxDxqMB2aAhF8WauJ3fltn2kb90moGBkiiEdooGIg55w==
+  dependencies:
+    argparse "^1.0.7"
+    entities "~1.1.1"
+    linkify-it "^2.0.0"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
+matcher-collection@^1.0.0, matcher-collection@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.1.2.tgz#1076f506f10ca85897b53d14ef54f90a5c426838"
+  integrity sha512-YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g==
+  dependencies:
+    minimatch "^3.0.2"
+
+matcher-collection@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-2.0.1.tgz#90be1a4cf58d6f2949864f65bb3b0f3e41303b29"
+  integrity sha512-daE62nS2ZQsDg9raM0IlZzLmI2u+7ZapXBwdoeBUKAYERPDDIc0qNqA8E0Rp2D+gspKR7BgIFP52GeujaGXWeQ==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    minimatch "^3.0.2"
+
+md5-hex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-2.0.0.tgz#d0588e9f1c74954492ecd24ac0ac6ce997d92e33"
+  integrity sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=
+  dependencies:
+    md5-o-matic "^0.1.1"
+
+md5-o-matic@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3"
+  integrity sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=
+
+md5.js@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+mdurl@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+
+memory-fs@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
+  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+memory-fs@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+memory-streams@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/memory-streams/-/memory-streams-0.1.3.tgz#d9b0017b4b87f1d92f55f2745c9caacb1dc93ceb"
+  integrity sha512-qVQ/CjkMyMInPaaRMrwWNDvf6boRZXaT/DbQeMYcCWuXPEBf1v8qChOc9OlEVQp2uOvRXa1Qu30fLmKhY6NipA==
+  dependencies:
+    readable-stream "~1.0.2"
+
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
+merge-trees@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-1.0.1.tgz#ccbe674569787f9def17fd46e6525f5700bbd23e"
+  integrity sha1-zL5nRWl4f53vF/1G5lJfVwC70j4=
+  dependencies:
+    can-symlink "^1.0.0"
+    fs-tree-diff "^0.5.4"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+
+merge-trees@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-2.0.0.tgz#a560d796e566c5d9b2c40472a2967cca48d85161"
+  integrity sha512-5xBbmqYBalWqmhYm51XlohhkmVOua3VAUrrWh8t9iOkaLpS6ifqm/UVuUjQCeDVJ9Vx3g2l6ihfkbLSTeKsHbw==
+  dependencies:
+    fs-updater "^1.0.4"
+    heimdalljs "^0.2.5"
+
+merge2@^1.2.3, merge2@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
+  integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
+
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+
+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
+micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
+mime-db@1.44.0, "mime-db@>= 1.43.0 < 2":
+  version "1.44.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
+
+mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.26, mime-types@~2.1.19, mime-types@~2.1.24:
+  version "2.1.27"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
+  dependencies:
+    mime-db "1.44.0"
+
+mime@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
+mimic-fn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+mimic-response@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
+minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
+
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.1.tgz#827ba4e7593464e7c221e8c5bed930904ee2c455"
+  integrity sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==
+
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+minipass@^2.2.0, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
+  dependencies:
+    minipass "^2.9.0"
+
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^3.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
+mixin-deep@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.0:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  dependencies:
+    minimist "^1.2.5"
+
+mktemp@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
+  integrity sha1-bQUVYRyKjITkhKogABKbmOmB/ws=
+
+morgan@^1.9.1:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
+  integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==
+  dependencies:
+    basic-auth "~2.0.1"
+    debug "2.6.9"
+    depd "~2.0.0"
+    on-finished "~2.3.0"
+    on-headers "~1.0.2"
+
+mout@^1.0.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/mout/-/mout-1.2.2.tgz#c9b718a499806a0632cede178e80f436259e777d"
+  integrity sha512-w0OUxFEla6z3d7sVpMZGBCpQvYh8PHS1wZ6Wu9GNKHMpAHWJ0if0LsQZh3DlOqw55HlhJEOMLpFnwtxp99Y5GA==
+
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
+ms@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+mustache@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.2.1.tgz#89e78a9d207d78f2799b1e95764a25bf71a28322"
+  integrity sha512-RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA==
+
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
+nan@^2.12.1:
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
+  integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+
+needle@^2.2.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a"
+  integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+
+neo-async@^2.5.0, neo-async@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
+  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
+no-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz#c21b434c1ffe48b39087e86cfb4d2582e9df18f8"
+  integrity sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==
+  dependencies:
+    lower-case "^2.0.1"
+    tslib "^1.10.0"
+
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
+
+node-libs-browser@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
+  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^3.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.1"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.11.0"
+    vm-browserify "^1.0.1"
+
+node-modules-path@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/node-modules-path/-/node-modules-path-1.0.2.tgz#e3acede9b7baf4bc336e3496b58e5b40d517056e"
+  integrity sha512-6Gbjq+d7uhkO7epaKi5DNgUJn7H0gEyA4Jg0Mo1uQOi3Rk50G83LtmhhFyw0LxnAFhtlspkiiw52ISP13qzcBg==
+
+node-notifier@^5.0.1:
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.3.tgz#cb72daf94c93904098e28b9c590fd866e464bd50"
+  integrity sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==
+  dependencies:
+    growly "^1.3.0"
+    is-wsl "^1.1.0"
+    semver "^5.5.0"
+    shellwords "^0.1.1"
+    which "^1.3.0"
+
+node-pre-gyp@*:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
+  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4.4.2"
+
+node-releases@^1.1.53:
+  version "1.1.53"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
+  integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
+
+node-watch@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.6.1.tgz#b9874111ce9f5841b1c7596120206c7b825be0e9"
+  integrity sha512-gwQiR7weFRV8mAtT0x0kXkZ18dfRLB45xH7q0hCOVQMLfLb2f1ZaSvR57q4/b/Vj6B0RwMNJYbvb69e1yM7qEA==
+
+nopt@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
+  dependencies:
+    abbrev "1"
+
+nopt@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
+  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
+normalize-path@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+normalize-url@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
+  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
+  dependencies:
+    prepend-http "^2.0.0"
+    query-string "^5.0.1"
+    sort-keys "^2.0.0"
+
+npm-bundled@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
+  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
+  dependencies:
+    npm-normalize-package-bin "^1.0.1"
+
+npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+
+npm-package-arg@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
+  integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
+  dependencies:
+    hosted-git-info "^2.7.1"
+    osenv "^0.1.5"
+    semver "^5.6.0"
+    validate-npm-package-name "^3.0.0"
+
+npm-packlist@^1.1.6:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
+  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+    npm-normalize-package-bin "^1.0.1"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  dependencies:
+    path-key "^2.0.0"
+
+npm-run-path@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5"
+  integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==
+  dependencies:
+    path-key "^3.0.0"
+
+npmlog@^4.0.0, npmlog@^4.0.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
+nwsapi@^2.0.9:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
+  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+object-assign@4.1.1, object-assign@^4.1.0, object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
+object-component@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
+  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
+
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-hash@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
+  integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
+
+object-inspect@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
+  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
+
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  dependencies:
+    isobject "^3.0.0"
+
+object.assign@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+  dependencies:
+    define-properties "^1.1.2"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    object-keys "^1.0.11"
+
+object.getownpropertydescriptors@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
+  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  dependencies:
+    isobject "^3.0.1"
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  dependencies:
+    ee-first "1.1.1"
+
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
+  dependencies:
+    mimic-fn "^1.0.0"
+
+onetime@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
+  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+  dependencies:
+    mimic-fn "^2.1.0"
+
+optionator@^0.8.1, optionator@^0.8.2:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
+ora@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318"
+  integrity sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==
+  dependencies:
+    chalk "^2.4.2"
+    cli-cursor "^2.1.0"
+    cli-spinners "^2.0.0"
+    log-symbols "^2.2.0"
+    strip-ansi "^5.2.0"
+    wcwidth "^1.0.1"
+
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
+
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
+osenv@^0.1.3, osenv@^0.1.4, osenv@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+p-cancelable@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
+  integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
+
+p-defer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83"
+  integrity sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw==
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+p-finally@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
+  integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==
+
+p-is-promise@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
+
+p-limit@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
+  dependencies:
+    p-try "^1.0.0"
+
+p-limit@^2.0.0, p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
+  dependencies:
+    p-limit "^1.1.0"
+
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+  dependencies:
+    p-limit "^2.0.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-timeout@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
+  integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==
+  dependencies:
+    p-finally "^1.0.0"
+
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+package-json@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
+  integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=
+  dependencies:
+    got "^6.7.1"
+    registry-auth-token "^3.0.1"
+    registry-url "^3.0.3"
+    semver "^5.1.0"
+
+pako@~1.0.5:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
+
+parallel-transform@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
+  dependencies:
+    cyclist "^1.0.1"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
+
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
+parse-asn1@^5.0.0:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e"
+  integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==
+  dependencies:
+    asn1.js "^4.0.0"
+    browserify-aes "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+    safe-buffer "^5.1.1"
+
+parse-passwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
+
+parse5@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
+  integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==
+
+parseqs@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
+  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
+  dependencies:
+    better-assert "~1.0.0"
+
+parseuri@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
+  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
+  dependencies:
+    better-assert "~1.0.0"
+
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+
+path-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
+
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-is-absolute@1.0.1, path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-is-inside@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
+
+path-key@^2.0.0, path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
+path-key@^3.0.0, path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+
+path-posix@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/path-posix/-/path-posix-1.0.0.tgz#06b26113f56beab042545a23bfa88003ccac260f"
+  integrity sha1-BrJhE/Vr6rBCVFojv6iAA8ysJg8=
+
+path-root-regex@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
+
+path-root@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
+  dependencies:
+    path-root-regex "^0.1.0"
+
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
+  dependencies:
+    pify "^3.0.0"
+
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+pbkdf2@^3.0.3:
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
+  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+picomatch@^2.0.5, picomatch@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
+  dependencies:
+    find-up "^3.0.0"
+
+pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
+  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
+  dependencies:
+    find-up "^2.1.0"
+
+pn@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
+  integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
+
+portfinder@^1.0.25:
+  version "1.0.25"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
+  integrity sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==
+  dependencies:
+    async "^2.6.2"
+    debug "^3.1.1"
+    mkdirp "^0.5.1"
+
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+
+prepend-http@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
+
+prepend-http@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
+
+printf@^0.5.1:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/printf/-/printf-0.5.3.tgz#8b7eec278d886833312238b2bf42b2b6f250880a"
+  integrity sha512-t3lYN6vPU5PZXDiEZZqoyXvN8wCsBfi8gPoxTKo2e5hhV673t/KUh+mfO8P8lCOCDC/BWcOGIxKyebxc5FuqLA==
+
+private@^0.1.6, private@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
+
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+process-relative-require@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/process-relative-require/-/process-relative-require-1.0.0.tgz#1590dfcf5b8f2983ba53e398446b68240b4cc68a"
+  integrity sha1-FZDfz1uPKYO6U+OYRGtoJAtMxoo=
+  dependencies:
+    node-modules-path "^1.0.0"
+
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+
+progress@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
+
+promise-map-series@^0.2.1, promise-map-series@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.2.3.tgz#c2d377afc93253f6bd03dbb77755eb88ab20a847"
+  integrity sha1-wtN3r8kyU/a9A9u3d1XriKsgqEc=
+  dependencies:
+    rsvp "^3.0.14"
+
+promise.prototype.finally@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz#b8af89160c9c673cefe3b4c4435b53cfd0287067"
+  integrity sha512-A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.0"
+    function-bind "^1.1.1"
+
+proxy-addr@~2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
+  integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.9.1"
+
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
+
+psl@^1.1.28:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+
+public-encrypt@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
+
+pump@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.3:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
+  dependencies:
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
+
+punycode@^1.2.4:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+punycode@^2.1.0, punycode@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+qs@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
+
+qs@^6.4.0:
+  version "6.9.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.3.tgz#bfadcd296c2d549f1dffa560619132c977f5008e"
+  integrity sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==
+
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+query-string@^5.0.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
+  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
+  dependencies:
+    decode-uri-component "^0.2.0"
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
+
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+
+quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408"
+  integrity sha1-urAqJCq4+w3XWKPJd2sy+aXZRAg=
+  dependencies:
+    mktemp "~0.4.0"
+    rimraf "^2.5.4"
+    underscore.string "~3.3.4"
+
+qunit-dom@^0.9.2:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/qunit-dom/-/qunit-dom-0.9.2.tgz#cc7bb777e4f5faa749eca843f54e199755df8473"
+  integrity sha512-BPf7OZjhXo9ekgsViNjQVS9BWkm2yQsPvBoy0juvt5nOFlcBVVwHSYsgpsJOunWkI1IgA3eStAC9mQx3Zw734g==
+  dependencies:
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.1"
+
+qunit@^2.9.3:
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.9.3.tgz#9522a088e76f0782f70a45db92f2fd14db311bcc"
+  integrity sha512-RH4VYSaVsNRDthMFFboTJAJ8q4kJM5LvOqWponKUYPEAeOcmc/YFV1QsZ7ikknA3TjqliWFJYEV63vvVXaALmQ==
+  dependencies:
+    commander "2.12.2"
+    js-reporters "1.2.1"
+    minimatch "3.0.4"
+    node-watch "0.6.1"
+    resolve "1.9.0"
+
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
+range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+raw-body@~1.1.0:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
+  integrity sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=
+  dependencies:
+    bytes "1"
+    string_decoder "0.10"
+
+rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+"readable-stream@2 || 3":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+readable-stream@~1.0.2:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readdirp@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
+    readable-stream "^2.0.2"
+
+recast@^0.18.1:
+  version "0.18.10"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.18.10.tgz#605ebbe621511eb89b6356a7e224bff66ed91478"
+  integrity sha512-XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ==
+  dependencies:
+    ast-types "0.13.3"
+    esprima "~4.0.0"
+    private "^0.1.8"
+    source-map "~0.6.1"
+
+redeyed@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-1.0.1.tgz#e96c193b40c0816b00aec842698e61185e55498a"
+  integrity sha1-6WwZO0DAgWsArshCaY5hGF5VSYo=
+  dependencies:
+    esprima "~3.0.0"
+
+regenerate-unicode-properties@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
+  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+  dependencies:
+    regenerate "^1.4.0"
+
+regenerate@^1.2.1, regenerate@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
+
+regenerator-runtime@^0.10.5:
+  version "0.10.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
+  integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=
+
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
+
+regenerator-runtime@^0.13.4:
+  version "0.13.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
+  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
+
+regenerator-runtime@^0.9.5:
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz#d33eb95d0d2001a4be39659707c51b0cb71ce029"
+  integrity sha1-0z65XQ0gAaS+OWWXB8UbDLcc4Ck=
+
+regenerator-transform@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
+  integrity sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==
+  dependencies:
+    babel-runtime "^6.18.0"
+    babel-types "^6.19.0"
+    private "^0.1.6"
+
+regenerator-transform@^0.14.2:
+  version "0.14.4"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
+  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
+  dependencies:
+    "@babel/runtime" "^7.8.4"
+    private "^0.1.8"
+
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
+regexpp@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
+  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+
+regexpp@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+
+regexpu-core@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+  integrity sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+regexpu-core@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
+  integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
+  dependencies:
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^8.2.0"
+    regjsgen "^0.5.1"
+    regjsparser "^0.6.4"
+    unicode-match-property-ecmascript "^1.0.4"
+    unicode-match-property-value-ecmascript "^1.2.0"
+
+registry-auth-token@^3.0.1:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e"
+  integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==
+  dependencies:
+    rc "^1.1.6"
+    safe-buffer "^5.0.1"
+
+registry-url@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
+  integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI=
+  dependencies:
+    rc "^1.0.1"
+
+regjsgen@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
+
+regjsgen@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
+  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
+
+regjsparser@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
+  dependencies:
+    jsesc "~0.5.0"
+
+regjsparser@^0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
+  integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
+  dependencies:
+    jsesc "~0.5.0"
+
+remote-git-tags@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/remote-git-tags/-/remote-git-tags-2.0.0.tgz#1152f39cf8b5268ae0e4307636ef741ec341664c"
+  integrity sha1-EVLznPi1Jorg5DB2Nu90HsNBZkw=
+  dependencies:
+    git-fetch-pack "^0.1.1"
+    git-transport-protocol "^0.1.0"
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+
+repeat-element@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+
+repeating@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
+  dependencies:
+    is-finite "^1.0.0"
+
+request-promise-core@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
+  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
+  dependencies:
+    lodash "^4.17.15"
+
+request-promise-native@^1.0.5:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
+  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
+  dependencies:
+    request-promise-core "1.1.3"
+    stealthy-require "^1.1.1"
+    tough-cookie "^2.3.3"
+
+request@^2.88.0:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+
+reselect@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
+  integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
+
+resolve-dir@^1.0.0, resolve-dir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
+  dependencies:
+    expand-tilde "^2.0.0"
+    global-modules "^1.0.0"
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+resolve-package-path@^1.0.11, resolve-package-path@^1.2.2, resolve-package-path@^1.2.6, resolve-package-path@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-1.2.7.tgz#2a7bc37ad96865e239330e3102c31322847e652e"
+  integrity sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q==
+  dependencies:
+    path-root "^0.1.1"
+    resolve "^1.10.0"
+
+resolve-package-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-2.0.0.tgz#7f258ab86ff074fff4ff8027a28f94d17d6fb1df"
+  integrity sha512-/CLuzodHO2wyyHTzls5Qr+EFeG6RcW4u6//gjYvUfcfyuplIX1SSccU+A5A9A78Gmezkl3NBkFAMxLbzTY9TJA==
+  dependencies:
+    path-root "^0.1.1"
+    resolve "^1.13.1"
+
+resolve-path@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
+  integrity sha1-xL2p9e+y/OZSR4c6s2u02DT+Fvc=
+  dependencies:
+    http-errors "~1.6.2"
+    path-is-absolute "1.0.1"
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+
+resolve@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06"
+  integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==
+  dependencies:
+    path-parse "^1.0.6"
+
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.0, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.7.1, resolve@^1.8.1:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
+  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+  dependencies:
+    path-parse "^1.0.6"
+
+responselike@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
+  dependencies:
+    lowercase-keys "^1.0.0"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+rimraf@2.6.3, rimraf@~2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@^3.0.1, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
+rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
+
+rsvp@^4.6.1, rsvp@^4.7.0, rsvp@^4.8.1, rsvp@^4.8.2, rsvp@^4.8.4, rsvp@^4.8.5:
+  version "4.8.5"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
+
+rsvp@~3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a"
+  integrity sha1-B8tKXfJa3Z6Cbrxn3Mn9idsn2Eo=
+
+run-async@^2.2.0, run-async@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
+run-parallel@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
+  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
+
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
+  dependencies:
+    aproba "^1.1.1"
+
+rxjs@^6.4.0, rxjs@^6.5.3:
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
+  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
+  dependencies:
+    tslib "^1.9.0"
+
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
+  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+
+safe-json-parse@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
+  integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  dependencies:
+    ret "~0.1.10"
+
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+sane@^4.0.0, sane@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
+  dependencies:
+    "@cnakazawa/watch" "^1.0.3"
+    anymatch "^2.0.0"
+    capture-exit "^2.0.0"
+    exec-sh "^0.3.2"
+    execa "^1.0.0"
+    fb-watchman "^2.0.0"
+    micromatch "^3.1.4"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+
+sax@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+saxes@^3.1.3:
+  version "3.1.11"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b"
+  integrity sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==
+  dependencies:
+    xmlchars "^2.1.1"
+
+schema-utils@^0.4.4:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
+  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+
+schema-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-errors "^1.0.0"
+    ajv-keywords "^3.1.0"
+
+schema-utils@^2.6.5:
+  version "2.6.6"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz#299fe6bd4a3365dc23d99fd446caff8f1d6c330c"
+  integrity sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==
+  dependencies:
+    ajv "^6.12.0"
+    ajv-keywords "^3.4.1"
+
+semver@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
+  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+
+semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
+serialize-javascript@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
+  integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
+
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
+
+set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+setimmediate@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+shellwords@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+
+silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.0, silent-error@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/silent-error/-/silent-error-1.1.1.tgz#f72af5b0d73682a2ba1778b7e32cd8aa7c2d8662"
+  integrity sha512-n4iEKyNcg4v6/jpb3c0/iyH2G1nzUNl7Gpqtn/mHIJK9S/q/7MCfoO4rwVOoO59qPFIc0hVHvMbiOJ0NdtxKKw==
+  dependencies:
+    debug "^2.2.0"
+
+simple-html-tokenizer@^0.5.9:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.9.tgz#1a83fe97f5a3e39b335fddf71cfe9b0263b581c2"
+  integrity sha512-w/3FEDN94r4JQ9WoYrIr8RqDIPZdyNkdpbK9glFady1CAEyD97XWCv8HFetQO21w81e7h7Nh59iYTyG1mUJftg==
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
+
+slash@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+slice-ansi@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
+  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
+  dependencies:
+    ansi-styles "^3.2.0"
+    astral-regex "^1.0.0"
+    is-fullwidth-code-point "^2.0.0"
+
+snake-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.3.tgz#c598b822ab443fcbb145ae8a82c5e43526d5bbee"
+  integrity sha512-WM1sIXEO+rsAHBKjGf/6R1HBBcgbncKS08d2Aqec/mrDSpU80SiOU41hO7ny6DToHSyrlwTYzQBIK1FPSx4Y3Q==
+  dependencies:
+    dot-case "^3.0.3"
+    tslib "^1.10.0"
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
+socket.io-adapter@~1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
+  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
+
+socket.io-client@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz#14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4"
+  integrity sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==
+  dependencies:
+    backo2 "1.0.2"
+    base64-arraybuffer "0.1.5"
+    component-bind "1.0.0"
+    component-emitter "1.2.1"
+    debug "~4.1.0"
+    engine.io-client "~3.4.0"
+    has-binary2 "~1.0.2"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    object-component "0.0.3"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    socket.io-parser "~3.3.0"
+    to-array "0.1.4"
+
+socket.io-parser@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.0.tgz#2b52a96a509fdf31440ba40fed6094c7d4f1262f"
+  integrity sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==
+  dependencies:
+    component-emitter "1.2.1"
+    debug "~3.1.0"
+    isarray "2.0.1"
+
+socket.io-parser@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.0.tgz#370bb4a151df2f77ce3345ff55a7072cc6e9565a"
+  integrity sha512-/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ==
+  dependencies:
+    component-emitter "1.2.1"
+    debug "~4.1.0"
+    isarray "2.0.1"
+
+socket.io@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.3.0.tgz#cd762ed6a4faeca59bc1f3e243c0969311eb73fb"
+  integrity sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==
+  dependencies:
+    debug "~4.1.0"
+    engine.io "~3.4.0"
+    has-binary2 "~1.0.2"
+    socket.io-adapter "~1.1.0"
+    socket.io-client "2.3.0"
+    socket.io-parser "~3.4.0"
+
+sort-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+sort-object-keys@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
+  integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==
+
+sort-package-json@^1.23.1:
+  version "1.42.1"
+  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.42.1.tgz#4085582dfe83c60951673de2d5e4ce09dd47bd4e"
+  integrity sha512-+JgZVjEQhJuJ57RCUcF3rzESYCW/n3vCLWdhqBdPkerEgRTj5teGdJrCcj772zT1VzewqWk616/4xuRyIffyqQ==
+  dependencies:
+    detect-indent "^6.0.0"
+    detect-newline "3.1.0"
+    git-hooks-list "1.0.3"
+    globby "11.0.0"
+    is-plain-obj "2.1.0"
+    sort-object-keys "^1.1.3"
+
+source-list-map@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
+
+source-map-resolve@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-support@^0.4.15:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
+  dependencies:
+    source-map "^0.5.6"
+
+source-map-support@~0.5.12:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-url@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
+  integrity sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=
+
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+
+source-map@0.4.x, source-map@^0.4.2:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+source-map@~0.1.x:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
+  dependencies:
+    amdefine ">=0.0.4"
+
+sourcemap-validator@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/sourcemap-validator/-/sourcemap-validator-1.1.1.tgz#3d7d8a399ccab09c1fedc510d65436e25b1c386b"
+  integrity sha512-pq6y03Vs6HUaKo9bE0aLoksAcpeOo9HZd7I8pI6O480W/zxNZ9U32GfzgtPP0Pgc/K1JHna569nAbOk3X8/Qtw==
+  dependencies:
+    jsesc "~0.3.x"
+    lodash.foreach "^4.5.0"
+    lodash.template "^4.5.0"
+    source-map "~0.1.x"
+
+spawn-args@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/spawn-args/-/spawn-args-0.2.0.tgz#fb7d0bd1d70fd4316bd9e3dec389e65f9d6361bb"
+  integrity sha1-+30L0dcP1DFr2ePew4nmX51jYbs=
+
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  dependencies:
+    extend-shallow "^3.0.0"
+
+sprintf-js@^1.0.3:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+
+sri-toolbox@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/sri-toolbox/-/sri-toolbox-0.2.0.tgz#a7fea5c3fde55e675cf1c8c06f3ebb5c2935835e"
+  integrity sha1-p/6lw/3lXmdc8cjAbz67XCk1g14=
+
+sshpk@^1.7.0:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
+ssri@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  dependencies:
+    figgy-pudding "^3.5.1"
+
+stagehand@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stagehand/-/stagehand-1.0.0.tgz#79515e2ad3a02c63f8720c7df9b6077ae14276d9"
+  integrity sha512-zrXl0QixAtSHFyN1iv04xOBgplbT4HgC8T7g+q8ESZbDNi5uZbMtxLukFVXPJ5Nl7zCYvYcrT3Mj24WYCH93hw==
+  dependencies:
+    debug "^4.1.0"
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+
+stealthy-require@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
+
+stream-browserify@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
+stream-each@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
+  dependencies:
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
+
+stream-http@^2.7.2:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
+stream-shift@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
+
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+
+string-template@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
+  integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
+
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+"string-width@^1.0.2 || 2", string-width@^2.1.0, string-width@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string-width@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
+string-width@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
+
+string.prototype.trimend@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
+  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+
+string.prototype.trimleft@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
+  integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+    string.prototype.trimstart "^1.0.0"
+
+string.prototype.trimright@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"
+  integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+    string.prototype.trimend "^1.0.0"
+
+string.prototype.trimstart@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
+  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+
+string_decoder@0.10, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+
+string_decoder@^1.0.0, string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
+strip-bom@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
+  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
+strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
+styled_string@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/styled_string/-/styled_string-0.0.1.tgz#d22782bd81295459bc4f1df18c4bad8e94dd124a"
+  integrity sha1-0ieCvYEpVFm8Tx3xjEutjpTdEko=
+
+sum-up@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sum-up/-/sum-up-1.0.3.tgz#1c661f667057f63bcb7875aa1438bc162525156e"
+  integrity sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=
+  dependencies:
+    chalk "^1.0.0"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  dependencies:
+    has-flag "^4.0.0"
+
+symbol-tree@^3.2.2:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
+
+symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.3.1.tgz#9506dd64d8e98fa21dcbf4018d1eab23e77f71fe"
+  integrity sha512-0K91MEXFpBUaywiwSSkmKjnGcasG/rVBXFLJz5DrgGabpYD6N+3yZrfD6uUIfpuTu65DZLHi7N8CizHc07BPZA==
+
+sync-disk-cache@^1.3.3:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/sync-disk-cache/-/sync-disk-cache-1.3.4.tgz#53a2c5a09d8f4bb53160bce182a456ad71574024"
+  integrity sha512-GlkGeM81GPPEKz/lH7QUTbvqLq7K/IUTuaKDSMulP9XQ42glqNJIN/RKgSOw4y8vxL1gOVvj+W7ruEO4s36eCw==
+  dependencies:
+    debug "^2.1.3"
+    heimdalljs "^0.2.3"
+    mkdirp "^0.5.0"
+    rimraf "^2.2.8"
+    username-sync "^1.0.2"
+
+table@^5.2.3:
+  version "5.4.6"
+  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
+  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
+  dependencies:
+    ajv "^6.10.2"
+    lodash "^4.17.14"
+    slice-ansi "^2.1.0"
+    string-width "^3.0.0"
+
+tap-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-7.0.0.tgz#54db35302fda2c2ccc21954ad3be22b2cba42721"
+  integrity sha512-05G8/LrzqOOFvZhhAk32wsGiPZ1lfUrl+iV7+OkKgfofZxiceZWMHkKmow71YsyVQ8IvGBP2EjcIjE5gL4l5lA==
+  dependencies:
+    events-to-array "^1.0.1"
+    js-yaml "^3.2.7"
+    minipass "^2.2.0"
+
+tapable@^1.0.0, tapable@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
+
+tar@^4.4.2:
+  version "4.4.13"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.8.6"
+    minizlib "^1.2.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.3"
+
+temp@0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.0.tgz#61391795a11bd9738d4c4d7f55f012cb8f55edaa"
+  integrity sha512-YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ==
+  dependencies:
+    rimraf "~2.6.2"
+
+terser-webpack-plugin@^1.1.0:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
+  integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==
+  dependencies:
+    cacache "^12.0.2"
+    find-cache-dir "^2.1.0"
+    is-wsl "^1.1.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^2.1.2"
+    source-map "^0.6.1"
+    terser "^4.1.2"
+    webpack-sources "^1.4.0"
+    worker-farm "^1.7.0"
+
+terser@^4.1.2, terser@^4.3.9:
+  version "4.6.12"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.12.tgz#44b98aef8703fdb09a3491bf79b43faffc5b4fee"
+  integrity sha512-fnIwuaKjFPANG6MAixC/k1TDtnl1YlPLUlLVIxxGZUn1gfUx2+l3/zGNB72wya+lgsb50QBi2tUV75RiODwnww==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
+testem@^2.17.0:
+  version "2.17.0"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-2.17.0.tgz#1cb4a2a90524a088803dfe52fbf197a6fd73c883"
+  integrity sha512-PLkIlT523w5rTJPWwR4TL1EiAEa941ECV7d4pMqsB0YdnH+sCTz0loWMKCUSdhR+VijveAZ6anE/JHehE7KqMQ==
+  dependencies:
+    backbone "^1.1.2"
+    bluebird "^3.4.6"
+    charm "^1.0.0"
+    commander "^2.6.0"
+    compression "^1.7.4"
+    consolidate "^0.15.1"
+    execa "^1.0.0"
+    express "^4.10.7"
+    fireworm "^0.7.0"
+    glob "^7.0.4"
+    http-proxy "^1.13.1"
+    js-yaml "^3.2.5"
+    lodash.assignin "^4.1.0"
+    lodash.castarray "^4.4.0"
+    lodash.clonedeep "^4.4.1"
+    lodash.find "^4.5.1"
+    lodash.uniqby "^4.7.0"
+    mkdirp "^0.5.1"
+    mustache "^3.0.0"
+    node-notifier "^5.0.1"
+    npmlog "^4.0.0"
+    printf "^0.5.1"
+    rimraf "^2.4.4"
+    socket.io "^2.1.0"
+    spawn-args "^0.2.0"
+    styled_string "0.0.1"
+    tap-parser "^7.0.0"
+    tmp "0.0.33"
+    xmldom "^0.1.19"
+
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+
+"textextensions@1 || 2":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.6.0.tgz#d7e4ab13fe54e32e08873be40d51b74229b00fc4"
+  integrity sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==
+
+through2@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
+through2@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
+  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
+  dependencies:
+    readable-stream "2 || 3"
+
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+
+through@~2.2.0, through@~2.2.7:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.2.7.tgz#6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd"
+  integrity sha1-bo4hIAGR1OtqmfbwEN9Gqhxusr0=
+
+timed-out@^4.0.0, timed-out@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
+  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
+
+timers-browserify@^2.0.4:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f"
+  integrity sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==
+  dependencies:
+    setimmediate "^1.0.4"
+
+tiny-lr@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab"
+  integrity sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==
+  dependencies:
+    body "^5.1.0"
+    debug "^3.1.0"
+    faye-websocket "~0.10.0"
+    livereload-js "^2.3.0"
+    object-assign "^4.1.0"
+    qs "^6.4.0"
+
+tmp@0.0.28:
+  version "0.0.28"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120"
+  integrity sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=
+  dependencies:
+    os-tmpdir "~1.0.1"
+
+tmp@0.0.33, tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+tmp@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
+  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
+  dependencies:
+    rimraf "^2.6.3"
+
+tmpl@1.0.x:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+
+to-array@0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
+  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
+
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
+
+to-fast-properties@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
+
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+to-utf8@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/to-utf8/-/to-utf8-0.0.1.tgz#d17aea72ff2fba39b9e43601be7b3ff72e089852"
+  integrity sha1-0Xrqcv8vujm55DYBvns/9y4ImFI=
+
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
+tough-cookie@^2.3.3, tough-cookie@^2.4.3, tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tr46@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
+  dependencies:
+    punycode "^2.1.0"
+
+tree-sync@^1.2.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-1.4.0.tgz#314598d13abaf752547d9335b8f95d9a137100d6"
+  integrity sha512-YvYllqh3qrR5TAYZZTXdspnIhlKAYezPYw11ntmweoceu4VK+keN356phHRIIo1d+RDmLpHZrUlmxga2gc9kSQ==
+  dependencies:
+    debug "^2.2.0"
+    fs-tree-diff "^0.5.6"
+    mkdirp "^0.5.1"
+    quick-temp "^0.1.5"
+    walk-sync "^0.3.3"
+
+tree-sync@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-2.0.0.tgz#e51456731d5ac93b92f9a1d58dd383f76f0f2f39"
+  integrity sha512-AzeJnbmJjGVfWMTJ0T152fv8NDTbQc9ERY4nEs7Lmxd94Xah2bUS56+CcoTh6FB8qn2KjBMjC0mLNc731aVBqw==
+  dependencies:
+    debug "^2.2.0"
+    fs-tree-diff "^0.5.6"
+    mkdirp "^0.5.1"
+    quick-temp "^0.1.5"
+    walk-sync "^0.3.3"
+
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
+
+tslib@^1.10.0, tslib@^1.9.0:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
+  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
+
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-fest@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
+  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+
+typescript-memoize@^1.0.0-alpha.3:
+  version "1.0.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.0-alpha.3.tgz#699a5415f886694a8d6e2e5451bc28a39a6bc2f9"
+  integrity sha1-aZpUFfiGaUqNbi5UUbwoo5prwvk=
+  dependencies:
+    core-js "2.4.1"
+
+uc.micro@^1.0.1, uc.micro@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
+  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
+
+uglify-js@^3.1.4:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.1.tgz#a56a71c8caa2d36b5556cc1fd57df01ae3491539"
+  integrity sha512-JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA==
+  dependencies:
+    commander "~2.20.3"
+
+underscore.string@^3.2.2, underscore.string@~3.3.4:
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023"
+  integrity sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==
+  dependencies:
+    sprintf-js "^1.0.3"
+    util-deprecate "^1.0.2"
+
+underscore@>=1.8.3:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.10.2.tgz#73d6aa3668f3188e4adb0f1943bd12cfd7efaaaf"
+  integrity sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==
+
+unicode-canonical-property-names-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
+  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+
+unicode-match-property-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
+  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+  dependencies:
+    unicode-canonical-property-names-ecmascript "^1.0.4"
+    unicode-property-aliases-ecmascript "^1.0.4"
+
+unicode-match-property-value-ecmascript@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
+  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+
+unicode-property-aliases-ecmascript@^1.0.4:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
+  integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
+
+union-value@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^2.0.1"
+
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
+  dependencies:
+    imurmurhash "^0.1.4"
+
+unique-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
+  integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
+  dependencies:
+    crypto-random-string "^2.0.0"
+
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+untildify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-2.1.0.tgz#17eb2807987f76952e9c0485fc311d06a826a2e0"
+  integrity sha1-F+soB5h/dpUunASF/DEdBqgmouA=
+  dependencies:
+    os-homedir "^1.0.0"
+
+unzip-response@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
+  integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
+
+upath@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
+
+uri-js@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  dependencies:
+    punycode "^2.1.0"
+
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+
+url-parse-lax@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
+  integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
+  dependencies:
+    prepend-http "^1.0.1"
+
+url-parse-lax@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
+  dependencies:
+    prepend-http "^2.0.0"
+
+url-to-options@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
+  integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
+
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+
+username-sync@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.2.tgz#0a3697909fb7b5768d29e2921f573acfdd427592"
+  integrity sha512-ayNkOJdoNSGNDBE46Nkc+l6IXmeugbzahZLSMkwvgRWv5y5ZqNY2IrzcgmkR4z32sj1W3tM3TuTUMqkqBzO+RA==
+
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+util.promisify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"
+  integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.2"
+    has-symbols "^1.0.1"
+    object.getownpropertydescriptors "^2.1.0"
+
+util@0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
+  dependencies:
+    inherits "2.0.1"
+
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
+  dependencies:
+    inherits "2.0.3"
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+
+uuid@^3.3.2, uuid@^3.3.3:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
+validate-npm-package-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
+  dependencies:
+    builtins "^1.0.3"
+
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+vm-browserify@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
+  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
+
+w3c-hr-time@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
+  dependencies:
+    browser-process-hrtime "^1.0.0"
+
+walk-sync@^0.2.5:
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.2.7.tgz#b49be4ee6867657aeb736978b56a29d10fa39969"
+  integrity sha1-tJvk7mhnZXrrc2l4tWop0Q+jmWk=
+  dependencies:
+    ensure-posix-path "^1.0.0"
+    matcher-collection "^1.0.0"
+
+walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.2, walk-sync@^0.3.3:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.3.4.tgz#cf78486cc567d3a96b5b2237c6108017a5ffb9a4"
+  integrity sha512-ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==
+  dependencies:
+    ensure-posix-path "^1.0.0"
+    matcher-collection "^1.0.0"
+
+walk-sync@^1.0.0, walk-sync@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-1.1.4.tgz#81049f3d8095479b49574cfa5f558d7a252b127d"
+  integrity sha512-nowc9thB/Jg0KW4TgxoRjLLYRPvl3DB/98S89r4ZcJqq2B0alNcKDh6pzLkBSkPMzRSMsJghJHQi79qw0YWEkA==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^1.1.1"
+
+walk-sync@^2.0.0, walk-sync@^2.0.2:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.1.0.tgz#e214248e5f5cf497ddd87db5a2a02e47e29c6501"
+  integrity sha512-KpH9Xw64LNSx7/UI+3guRZvJWlDxVA4+KKb/4puRoVrG8GkvZRxnF3vhxdjgpoKJGL2TVg1OrtkXIE/VuGPLHQ==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^2.0.0"
+
+walker@~1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+  dependencies:
+    makeerror "1.0.x"
+
+watch-detector@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/watch-detector/-/watch-detector-1.0.0.tgz#c7b722d8695fee9ab6071e0f38f258e6adb22609"
+  integrity sha512-siywMl3fXK30Tlpu/dUBHhlpxhQmHdguZ8OIb813eU9lrVmmsJa9k0+n1HtJ+7p3SzFCPq2XbmR3GUYpPC3TBA==
+  dependencies:
+    heimdalljs-logger "^0.1.10"
+    semver "^6.3.0"
+    silent-error "^1.1.1"
+    tmp "^0.1.0"
+
+watchpack@^1.5.0:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2"
+  integrity sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==
+  dependencies:
+    chokidar "^2.1.8"
+    graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
+
+wcwidth@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  dependencies:
+    defaults "^1.0.3"
+
+webidl-conversions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
+
+webpack-sources@^1.3.0, webpack-sources@^1.4.0:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
+  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack@~4.28:
+  version "4.28.4"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.28.4.tgz#1ddae6c89887d7efb752adf0c3cd32b9b07eacd0"
+  integrity sha512-NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-module-context" "1.7.11"
+    "@webassemblyjs/wasm-edit" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+    acorn "^5.6.2"
+    acorn-dynamic-import "^3.0.0"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+    chrome-trace-event "^1.0.0"
+    enhanced-resolve "^4.1.0"
+    eslint-scope "^4.0.0"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.3.0"
+    loader-utils "^1.1.0"
+    memory-fs "~0.4.1"
+    micromatch "^3.1.8"
+    mkdirp "~0.5.0"
+    neo-async "^2.5.0"
+    node-libs-browser "^2.0.0"
+    schema-utils "^0.4.4"
+    tapable "^1.1.0"
+    terser-webpack-plugin "^1.1.0"
+    watchpack "^1.5.0"
+    webpack-sources "^1.3.0"
+
+websocket-driver@>=0.5.1:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"
+  integrity sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==
+  dependencies:
+    http-parser-js ">=0.4.0 <0.4.11"
+    safe-buffer ">=5.1.0"
+    websocket-extensions ">=0.1.1"
+
+websocket-extensions@>=0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+
+whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+  dependencies:
+    iconv-lite "0.4.24"
+
+whatwg-mimetype@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
+
+whatwg-url@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
+  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
+
+which@^1.2.14, which@^1.2.9, which@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+  dependencies:
+    string-width "^1.0.2 || 2"
+
+word-wrap@~1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
+wordwrap@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+
+wordwrap@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+
+worker-farm@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
+  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
+  dependencies:
+    errno "~0.1.7"
+
+workerpool@^2.3.0:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-2.3.3.tgz#49a70089bd55e890d68cc836a19419451d7c81d7"
+  integrity sha512-L1ovlYHp6UObYqElXXpbd214GgbEKDED0d3sj7pRdFXjNkb2+un/AUcCkceHizO0IVI6SOGGncrcjozruCkRgA==
+  dependencies:
+    object-assign "4.1.1"
+
+workerpool@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-3.1.2.tgz#b34e79243647decb174b7481ab5b351dc565c426"
+  integrity sha512-WJFA0dGqIK7qj7xPTqciWBH5DlJQzoPjsANvc3Y4hNB0SScT+Emjvt0jPPkDBUjBNngX1q9hHgt1Gfwytu6pug==
+  dependencies:
+    "@babel/core" "^7.3.4"
+    object-assign "4.1.1"
+    rsvp "^4.8.4"
+
+workerpool@^5.0.1:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-5.0.4.tgz#4f67cb70ff7550a27ab94de25b0b843cd92059a2"
+  integrity sha512-Sywova24Ow2NQ24JPB68bI89EdqMDjUXo4OpofK/QMD7C2ZVMloYBgQ5J3PChcBJHj2vspsmGx1/3nBKXtUkXQ==
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+write-file-atomic@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
+  dependencies:
+    imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
+    signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
+
+write@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
+  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
+  dependencies:
+    mkdirp "^0.5.1"
+
+ws@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
+  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  dependencies:
+    async-limiter "~1.0.0"
+
+ws@^7.1.2:
+  version "7.2.5"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz#abb1370d4626a5a9cd79d8de404aa18b3465d10d"
+  integrity sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==
+
+ws@~6.1.0:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
+  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
+  dependencies:
+    async-limiter "~1.0.0"
+
+xdg-basedir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
+  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
+
+xml-name-validator@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
+
+xmlchars@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
+
+xmldom@^0.1.19:
+  version "0.1.31"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
+  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
+
+xmlhttprequest-ssl@~1.5.4:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
+  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
+
+xtend@^4.0.0, xtend@~4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+
+y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
+yam@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/yam/-/yam-1.0.0.tgz#7f6c91dc0f5de75a031e6da6b3907c3d25ab0de5"
+  integrity sha512-Hv9xxHtsJ9228wNhk03xnlDReUuWVvHwM4rIbjdAXYvHLs17xjuyF50N6XXFMN6N0omBaqgOok/MCK3At9fTAg==
+  dependencies:
+    fs-extra "^4.0.2"
+    lodash.merge "^4.6.0"
+
+yeast@0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=

From 788e3054699a61223d3ba0bbc192ab5368c87134 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 7 May 2020 19:56:35 +0200
Subject: [PATCH 1025/1830] FIX: parenthesis were wrong, resulting in an always
 true expression (#9690)

---
 .../javascripts/discourse/app/components/navigation-bar.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/navigation-bar.js b/app/assets/javascripts/discourse/app/components/navigation-bar.js
index 3da0001ad9..fc10137aae 100644
--- a/app/assets/javascripts/discourse/app/components/navigation-bar.js
+++ b/app/assets/javascripts/discourse/app/components/navigation-bar.js
@@ -29,7 +29,7 @@ export default Component.extend(FilterModeMixin, {
           if (
             c.connectorClass &&
             typeof c.connectorClass.path === "function" &&
-            typeof (c.connectorClass.displayName === "function")
+            typeof c.connectorClass.displayName === "function"
           ) {
             let path = c.connectorClass.path(category);
             if (path.indexOf(filterType) > 0) {

From 4891276742310662bf2185846f8982f930ba8d18 Mon Sep 17 00:00:00 2001
From: Dax74 <Dax74@users.noreply.github.com>
Date: Thu, 7 May 2020 20:36:36 +0200
Subject: [PATCH 1026/1830] Reduce the width of the input field on desktop

---
 app/assets/stylesheets/common/base/cat_reorder.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/cat_reorder.scss b/app/assets/stylesheets/common/base/cat_reorder.scss
index 085f1f8e9f..8ec73962e1 100644
--- a/app/assets/stylesheets/common/base/cat_reorder.scss
+++ b/app/assets/stylesheets/common/base/cat_reorder.scss
@@ -5,7 +5,7 @@
     }
   }
   input {
-    width: 4em;
+    width: 3em;
     @include breakpoint(mobile-extra-large) {
       width: 2em;
     }

From 744bbf6904e9d69e0077ebdfe3b7ba080600d08e Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 8 May 2020 00:34:53 +0530
Subject: [PATCH 1027/1830] FEATURE: exclude muted categories from the "top"
 topics list.

---
 lib/topic_query.rb                  | 1 +
 spec/components/topic_query_spec.rb | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 772ea5af28..5f8658661b 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -265,6 +265,7 @@ class TopicQuery
   def list_top_for(period)
     score = "#{period}_score"
     create_list(:top, unordered: true) do |topics|
+      topics = remove_muted_categories(topics, @user)
       topics = topics.joins(:top_topic).where("top_topics.#{score} > 0")
       if period == :yearly && @user.try(:trust_level) == TrustLevel[0]
         topics.order(TopicQuerySQL.order_top_with_pinned_category_for(score))
diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb
index 0bafbbb1b3..d6e56a069d 100644
--- a/spec/components/topic_query_spec.rb
+++ b/spec/components/topic_query_spec.rb
@@ -265,7 +265,7 @@ describe TopicQuery do
   end
 
   context 'muted categories' do
-    it 'is removed from new and latest lists' do
+    it 'is removed from top, new and latest lists' do
       category = Fabricate(:category_with_definition)
       topic = Fabricate(:topic, category: category)
       CategoryUser.create!(user_id: user.id,
@@ -273,6 +273,8 @@ describe TopicQuery do
                            notification_level: CategoryUser.notification_levels[:muted])
       expect(topic_query.list_new.topics.map(&:id)).not_to include(topic.id)
       expect(topic_query.list_latest.topics.map(&:id)).not_to include(topic.id)
+      TopTopic.create!(topic: topic, all_score: 1)
+      expect(topic_query.list_top_for(:all).topics.map(&:id)).not_to include(topic.id)
     end
   end
 

From 3567a906617521e1d081a631538ad2cbfdcfc051 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 7 May 2020 15:45:25 -0400
Subject: [PATCH 1028/1830] DEV: Ember Addon needs a vendor dir

---
 app/assets/javascripts/pretty-text/vendor/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/assets/javascripts/pretty-text/vendor/.gitkeep

diff --git a/app/assets/javascripts/pretty-text/vendor/.gitkeep b/app/assets/javascripts/pretty-text/vendor/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2

From f9608c0af5f7b1109117a5aba979acb00c28cf9a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 7 May 2020 16:08:48 -0400
Subject: [PATCH 1029/1830] DEV: Remove INLINE_ONEBOX_* constants

There were two constants here, `INLINE_ONEBOX_LOADING_CSS_CLASS` and
`INLINE_ONEBOX_CSS_CLASS` that were both longer than the strings they
were DRYing up: `inline-onebox-loading` and `inline-onebox`

I normally appreciate constants, but in this case it meant that we had
a lot of JS imports resulting in many more lines of code (and CPU cycles
spent figuring them out.)

It also meant we had an `.erb` file and had to invoke Ruby to create the
JS file, which meant the app was harder to port to Ember CLI.

I removed the constants. It's less DRY but faster and simpler, and
arguably the loss of DRYness is not significant as you can still search
for the `inline-onebox-loading` and `inline-onebox` strings easily if
you are refactoring.
---
 .../app/components/composer-editor.js         | 45 +++++++---------
 app/assets/javascripts/pretty-text-bundle.js  |  1 -
 .../context/inline-onebox-css-classes.js.erb  |  5 --
 .../engines/discourse-markdown/onebox.js      |  8 +--
 .../pretty-text/addon/inline-oneboxer.js      |  9 +---
 .../pretty-text/addon/white-lister.js         |  9 +---
 lib/cooked_post_processor.rb                  |  8 ++-
 spec/components/cooked_post_processor_spec.rb | 53 +++++--------------
 .../acceptance/composer-onebox-test.js        |  5 +-
 test/javascripts/lib/pretty-text-test.js      | 13 +++--
 10 files changed, 48 insertions(+), 108 deletions(-)
 delete mode 100644 app/assets/javascripts/pretty-text/addon/context/inline-onebox-css-classes.js.erb

diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js
index 7d89caa070..7af84831e7 100644
--- a/app/assets/javascripts/discourse/app/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/app/components/composer-editor.js
@@ -43,10 +43,6 @@ import {
   cacheShortUploadUrl,
   resolveAllShortUrls
 } from "pretty-text/upload-short-url";
-import {
-  INLINE_ONEBOX_LOADING_CSS_CLASS,
-  INLINE_ONEBOX_CSS_CLASS
-} from "pretty-text/context/inline-onebox-css-classes";
 import ENV from "discourse-common/config/environment";
 
 const REBUILD_SCROLL_MAP_EVENTS = ["composer:resized", "composer:typed-reply"];
@@ -968,32 +964,29 @@ export default Component.extend({
           // Inline Oneboxes = `a.inline-onebox-loading` -> `a.inline-onebox`
 
           let loadedOneboxes = $preview.find(
-            `aside.onebox, a.${LOADING_ONEBOX_CSS_CLASS}, a.${INLINE_ONEBOX_CSS_CLASS}`
+            `aside.onebox, a.${LOADING_ONEBOX_CSS_CLASS}, a.inline-onebox-loading`
           ).length;
 
-          $preview
-            .find(`a.onebox, a.${INLINE_ONEBOX_LOADING_CSS_CLASS}`)
-            .each((_, link) => {
-              const $link = $(link);
-              const text = $link.text();
-              const isInline =
-                $link.attr("class") === INLINE_ONEBOX_LOADING_CSS_CLASS;
-              const m = isInline ? inlineOneboxes : oneboxes;
+          $preview.find(`a.onebox, a.inline-onebox-loading`).each((_, link) => {
+            const $link = $(link);
+            const text = $link.text();
+            const isInline = $link.attr("class") === "inline-onebox-loading";
+            const m = isInline ? inlineOneboxes : oneboxes;
 
-              if (loadedOneboxes < this.siteSettings.max_oneboxes_per_post) {
-                if (m[text] === undefined) {
-                  m[text] = [];
-                  loadedOneboxes++;
-                }
-                m[text].push(link);
-              } else {
-                if (m[text] !== undefined) {
-                  m[text].push(link);
-                } else if (isInline) {
-                  $link.removeClass(INLINE_ONEBOX_LOADING_CSS_CLASS);
-                }
+            if (loadedOneboxes < this.siteSettings.max_oneboxes_per_post) {
+              if (m[text] === undefined) {
+                m[text] = [];
+                loadedOneboxes++;
               }
-            });
+              m[text].push(link);
+            } else {
+              if (m[text] !== undefined) {
+                m[text].push(link);
+              } else if (isInline) {
+                $link.removeClass("inline-onebox-loading");
+              }
+            }
+          });
 
           if (Object.keys(oneboxes).length > 0) {
             this._loadOneboxes(oneboxes);
diff --git a/app/assets/javascripts/pretty-text-bundle.js b/app/assets/javascripts/pretty-text-bundle.js
index a2adade382..62dd6c1439 100644
--- a/app/assets/javascripts/pretty-text-bundle.js
+++ b/app/assets/javascripts/pretty-text-bundle.js
@@ -11,6 +11,5 @@
 //= require ./pretty-text/addon/sanitizer
 //= require ./pretty-text/addon/oneboxer
 //= require ./pretty-text/addon/oneboxer-cache
-//= require ./pretty-text/addon/context/inline-onebox-css-classes
 //= require ./pretty-text/addon/inline-oneboxer
 //= require ./pretty-text/addon/upload-short-url
diff --git a/app/assets/javascripts/pretty-text/addon/context/inline-onebox-css-classes.js.erb b/app/assets/javascripts/pretty-text/addon/context/inline-onebox-css-classes.js.erb
deleted file mode 100644
index a252fb2880..0000000000
--- a/app/assets/javascripts/pretty-text/addon/context/inline-onebox-css-classes.js.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-export const INLINE_ONEBOX_LOADING_CSS_CLASS =
-  "<%= CookedPostProcessor::INLINE_ONEBOX_LOADING_CSS_CLASS %>";
-
-export const INLINE_ONEBOX_CSS_CLASS =
-  "<%= CookedPostProcessor::INLINE_ONEBOX_CSS_CLASS %>";
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/onebox.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/onebox.js
index 7358bdaa06..94bd5dd60f 100644
--- a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/onebox.js
+++ b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/onebox.js
@@ -1,9 +1,5 @@
 import { lookupCache } from "pretty-text/oneboxer-cache";
 import { cachedInlineOnebox } from "pretty-text/inline-oneboxer";
-import {
-  INLINE_ONEBOX_LOADING_CSS_CLASS,
-  INLINE_ONEBOX_CSS_CLASS
-} from "pretty-text/context/inline-onebox-css-classes";
 
 const ONEBOX = 1;
 const INLINE = 2;
@@ -103,9 +99,9 @@ function applyOnebox(state, silent) {
 
             if (onebox && onebox.title) {
               text.content = onebox.title;
-              attrs.push(["class", INLINE_ONEBOX_CSS_CLASS]);
+              attrs.push(["class", "inline-onebox"]);
             } else if (!onebox) {
-              attrs.push(["class", INLINE_ONEBOX_LOADING_CSS_CLASS]);
+              attrs.push(["class", "inline-onebox-loading"]);
             }
           }
         }
diff --git a/app/assets/javascripts/pretty-text/addon/inline-oneboxer.js b/app/assets/javascripts/pretty-text/addon/inline-oneboxer.js
index 6645d1dac7..a4587eda74 100644
--- a/app/assets/javascripts/pretty-text/addon/inline-oneboxer.js
+++ b/app/assets/javascripts/pretty-text/addon/inline-oneboxer.js
@@ -1,8 +1,3 @@
-import {
-  INLINE_ONEBOX_LOADING_CSS_CLASS,
-  INLINE_ONEBOX_CSS_CLASS
-} from "pretty-text/context/inline-onebox-css-classes";
-
 const _cache = {};
 
 export function applyInlineOneboxes(inline, ajax, opts) {
@@ -27,8 +22,8 @@ export function applyInlineOneboxes(inline, ajax, opts) {
         links.forEach(link => {
           $(link)
             .text(onebox.title)
-            .addClass(INLINE_ONEBOX_CSS_CLASS)
-            .removeClass(INLINE_ONEBOX_LOADING_CSS_CLASS);
+            .addClass("inline-onebox")
+            .removeClass("inline-onebox-loading");
         });
       }
     });
diff --git a/app/assets/javascripts/pretty-text/addon/white-lister.js b/app/assets/javascripts/pretty-text/addon/white-lister.js
index 8a3a1140f1..88eb29085b 100644
--- a/app/assets/javascripts/pretty-text/addon/white-lister.js
+++ b/app/assets/javascripts/pretty-text/addon/white-lister.js
@@ -1,8 +1,3 @@
-import {
-  INLINE_ONEBOX_LOADING_CSS_CLASS,
-  INLINE_ONEBOX_CSS_CLASS
-} from "pretty-text/context/inline-onebox-css-classes";
-
 // to match:
 // abcd
 // abcd[test]
@@ -121,8 +116,8 @@ export const DEFAULT_LIST = [
   "a.mention",
   "a.mention-group",
   "a.onebox",
-  `a.${INLINE_ONEBOX_CSS_CLASS}`,
-  `a.${INLINE_ONEBOX_LOADING_CSS_CLASS}`,
+  `a.inline-onebox`,
+  `a.inline-onebox-loading`,
   "a[data-bbcode]",
   "a[name]",
   "a[rel=nofollow]",
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index d2e8f4d2d5..d6fb05a308 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -4,8 +4,6 @@
 # For example, inserting the onebox content, or image sizes/thumbnails.
 
 class CookedPostProcessor
-  INLINE_ONEBOX_LOADING_CSS_CLASS = "inline-onebox-loading"
-  INLINE_ONEBOX_CSS_CLASS = "inline-onebox"
   LIGHTBOX_WRAPPER_CSS_CLASS = "lightbox-wrapper"
   LOADING_SIZE = 10
   LOADING_COLORS = 32
@@ -518,7 +516,7 @@ class CookedPostProcessor
     oneboxes = {}
     inlineOneboxes = {}
 
-    Oneboxer.apply(@doc, extra_paths: [".#{INLINE_ONEBOX_LOADING_CSS_CLASS}"]) do |url, element|
+    Oneboxer.apply(@doc, extra_paths: [".inline-onebox-loading"]) do |url, element|
       is_onebox = element["class"] == Oneboxer::ONEBOX_CSS_CLASS
       map = is_onebox ? oneboxes : inlineOneboxes
       skip_onebox = limit <= 0 && !map[url]
@@ -724,14 +722,14 @@ class CookedPostProcessor
 
     if title = inline_onebox&.dig(:title)
       element.children = CGI.escapeHTML(title)
-      element.add_class(INLINE_ONEBOX_CSS_CLASS)
+      element.add_class("inline-onebox")
     end
 
     remove_inline_onebox_loading_class(element)
   end
 
   def remove_inline_onebox_loading_class(element)
-    element.remove_class(INLINE_ONEBOX_LOADING_CSS_CLASS)
+    element.remove_class("inline-onebox-loading")
   end
 
   def is_svg?(img)
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index a429d64bee..b62350d2be 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -97,10 +97,7 @@ describe CookedPostProcessor do
         cpp.post_process
 
         expect(cpp.html).to have_tag('a',
-          with: {
-            href: url,
-            class: described_class::INLINE_ONEBOX_CSS_CLASS
-          },
+          with: { href: url, class: "inline-onebox" },
           text: title,
           count: 2
         )
@@ -113,9 +110,7 @@ describe CookedPostProcessor do
         )
 
         expect(cpp.html).to have_tag('a',
-          without: {
-            class: described_class::INLINE_ONEBOX_LOADING_CSS_CLASS
-          },
+          without: { class: "inline-onebox-loading" },
           text: not_oneboxed_url,
           count: 1
         )
@@ -131,10 +126,6 @@ describe CookedPostProcessor do
     end
 
     describe 'when post contains inline oneboxes' do
-      let(:loading_css_class) do
-        described_class::INLINE_ONEBOX_LOADING_CSS_CLASS
-      end
-
       before do
         SiteSetting.enable_inline_onebox_on_all_domains = true
       end
@@ -148,12 +139,8 @@ describe CookedPostProcessor do
           cpp.post_process
 
           expect(cpp.html).to have_tag('a',
-            with: {
-              href: UrlHelper.cook_url(url)
-            },
-            without: {
-              class: loading_css_class
-            },
+            with: { href: UrlHelper.cook_url(url) },
+            without: { class: "inline-onebox-loading" },
             text: topic.title,
             count: 1
           )
@@ -163,12 +150,8 @@ describe CookedPostProcessor do
           cpp.post_process
 
           expect(cpp.html).to have_tag('a',
-            with: {
-              href: UrlHelper.cook_url(url)
-            },
-            without: {
-              class: loading_css_class
-            },
+            with: { href: UrlHelper.cook_url(url) },
+            without: { class: "inline-onebox-loading" },
             text: topic.title,
             count: 1
           )
@@ -235,33 +218,21 @@ describe CookedPostProcessor do
           html = cpp.html
 
           expect(html).to_not have_tag('a',
-            with: {
-              href: url_no_path
-            },
-            without: {
-              class: loading_css_class
-            },
+            with: { href: url_no_path },
+            without: { class: "inline-onebox-loading" },
             text: title
           )
 
           expect(html).to have_tag('a',
-            with: {
-              href: url_with_path
-            },
-            without: {
-              class: loading_css_class
-            },
+            with: { href: url_with_path },
+            without: { class: "inline-onebox-loading" },
             text: title,
             count: 2
           )
 
           expect(html).to have_tag('a',
-            with: {
-              href: url_with_query_param
-            },
-            without: {
-              class: loading_css_class
-            },
+            with: { href: url_with_query_param },
+            without: { class: "inline-onebox-loading" },
             text: title,
             count: 1
           )
diff --git a/test/javascripts/acceptance/composer-onebox-test.js b/test/javascripts/acceptance/composer-onebox-test.js
index 6e047238b0..ab2484d1e9 100644
--- a/test/javascripts/acceptance/composer-onebox-test.js
+++ b/test/javascripts/acceptance/composer-onebox-test.js
@@ -1,5 +1,4 @@
 import { acceptance } from "helpers/qunit-helpers";
-import { INLINE_ONEBOX_CSS_CLASS } from "pretty-text/context/inline-onebox-css-classes";
 
 acceptance("Composer - Onebox", {
   loggedIn: true,
@@ -36,10 +35,10 @@ http://www.example.com/has-title.html
         .trim(),
       `
 <p><aside class=\"onebox\"><article class=\"onebox-body\"><h3><a href=\"http://www.example.com/article.html\">An interesting article</a></h3></article></aside><br>
-This is another test <a href=\"http://www.example.com/has-title.html\" class=\"${INLINE_ONEBOX_CSS_CLASS}\">This is a great title</a></p>
+This is another test <a href=\"http://www.example.com/has-title.html\" class=\"inline-onebox\">This is a great title</a></p>
 <p><a href=\"http://www.example.com/no-title.html\" class=\"onebox\" target=\"_blank\">http://www.example.com/no-title.html</a></p>
 <p>This is another test <a href=\"http://www.example.com/no-title.html\" class=\"\">http://www.example.com/no-title.html</a><br>
-This is another test <a href=\"http://www.example.com/has-title.html\" class=\"${INLINE_ONEBOX_CSS_CLASS}\">This is a great title</a></p>
+This is another test <a href=\"http://www.example.com/has-title.html\" class=\"inline-onebox\">This is a great title</a></p>
 <p><aside class=\"onebox\"><article class=\"onebox-body\"><h3><a href=\"http://www.example.com/article.html\">An interesting article</a></h3></article></aside></p>
       `.trim()
     );
diff --git a/test/javascripts/lib/pretty-text-test.js b/test/javascripts/lib/pretty-text-test.js
index 8443cccdb6..a5619bcc77 100644
--- a/test/javascripts/lib/pretty-text-test.js
+++ b/test/javascripts/lib/pretty-text-test.js
@@ -2,7 +2,6 @@ import { buildQuote } from "discourse/lib/quote";
 import Post from "discourse/models/post";
 import PrettyText, { buildOptions } from "pretty-text/pretty-text";
 import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
-import { INLINE_ONEBOX_LOADING_CSS_CLASS } from "pretty-text/context/inline-onebox-css-classes";
 import {
   applyCachedInlineOnebox,
   deleteCachedInlineOnebox
@@ -205,7 +204,7 @@ QUnit.test("Links", assert => {
 
   assert.cooked(
     `Youtube: ${link}`,
-    `<p>Youtube: <a href="${link}" class="${INLINE_ONEBOX_LOADING_CSS_CLASS}">${link}</a></p>`,
+    `<p>Youtube: <a href="${link}" class="inline-onebox-loading">${link}</a></p>`,
     "allows links to contain query params"
   );
 
@@ -222,7 +221,7 @@ QUnit.test("Links", assert => {
 
   assert.cooked(
     "Derpy: http://derp.com?__test=1",
-    `<p>Derpy: <a href="http://derp.com?__test=1" class="${INLINE_ONEBOX_LOADING_CSS_CLASS}">http://derp.com?__test=1</a></p>`,
+    `<p>Derpy: <a href="http://derp.com?__test=1" class="inline-onebox-loading">http://derp.com?__test=1</a></p>`,
     "works with double underscores in urls"
   );
 
@@ -252,7 +251,7 @@ QUnit.test("Links", assert => {
 
   assert.cooked(
     "Batman: http://en.wikipedia.org/wiki/The_Dark_Knight_(film)",
-    `<p>Batman: <a href="http://en.wikipedia.org/wiki/The_Dark_Knight_(film)" class="${INLINE_ONEBOX_LOADING_CSS_CLASS}">http://en.wikipedia.org/wiki/The_Dark_Knight_(film)</a></p>`,
+    `<p>Batman: <a href="http://en.wikipedia.org/wiki/The_Dark_Knight_(film)" class="inline-onebox-loading">http://en.wikipedia.org/wiki/The_Dark_Knight_(film)</a></p>`,
     "autolinks a URL with parentheses (like Wikipedia)"
   );
 
@@ -264,7 +263,7 @@ QUnit.test("Links", assert => {
 
   assert.cooked(
     "1. View @eviltrout's profile here: http://meta.discourse.org/u/eviltrout/activity<br/>next line.",
-    `<ol>\n<li>View <span class="mention">@eviltrout</span>\'s profile here: <a href="http://meta.discourse.org/u/eviltrout/activity" class="${INLINE_ONEBOX_LOADING_CSS_CLASS}">http://meta.discourse.org/u/eviltrout/activity</a><br>next line.</li>\n</ol>`,
+    `<ol>\n<li>View <span class="mention">@eviltrout</span>\'s profile here: <a href="http://meta.discourse.org/u/eviltrout/activity" class="inline-onebox-loading">http://meta.discourse.org/u/eviltrout/activity</a><br>next line.</li>\n</ol>`,
     "allows autolinking within a list without inserting a paragraph."
   );
 
@@ -289,8 +288,8 @@ QUnit.test("Links", assert => {
   assert.cooked(
     "http://discourse.org and http://discourse.org/another_url and http://www.imdb.com/name/nm2225369",
     '<p><a href="http://discourse.org">http://discourse.org</a> and ' +
-      `<a href="http://discourse.org/another_url" class="${INLINE_ONEBOX_LOADING_CSS_CLASS}">http://discourse.org/another_url</a> and ` +
-      `<a href="http://www.imdb.com/name/nm2225369" class="${INLINE_ONEBOX_LOADING_CSS_CLASS}">http://www.imdb.com/name/nm2225369</a></p>`,
+      `<a href="http://discourse.org/another_url" class="inline-onebox-loading">http://discourse.org/another_url</a> and ` +
+      `<a href="http://www.imdb.com/name/nm2225369" class="inline-onebox-loading">http://www.imdb.com/name/nm2225369</a></p>`,
     "allows multiple links on one line"
   );
 

From 94d10b46cad862116cf956e68fa9e1ee9985f067 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 7 May 2020 16:24:47 -0400
Subject: [PATCH 1030/1830] Admin popup menu needs a higher z-index than the bg
 cloak on mobile

---
 app/assets/stylesheets/common/base/topic-admin-menu.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss
index e6a9f6240c..f310bc76e2 100644
--- a/app/assets/stylesheets/common/base/topic-admin-menu.scss
+++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss
@@ -40,7 +40,7 @@
     width: 100%;
     padding: 0;
     padding-bottom: env(safe-area-inset-bottom);
-    z-index: 1000;
+    z-index: z("modal", "popover");
 
     @keyframes slideUp {
       0% {
@@ -65,6 +65,10 @@
       margin-top: 0;
     }
   }
+
+  .mobile-view & {
+    z-index: z("modal", "popover");
+  }
 }
 
 .modal-body.feature-topic {

From ef94b0f1a7d70d8f14f9e3efd565d043ef9e1071 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 7 May 2020 16:28:54 -0400
Subject: [PATCH 1031/1830] FIX: Incorrect CSS class

---
 .../javascripts/discourse/app/components/composer-editor.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js
index 7af84831e7..ade361365b 100644
--- a/app/assets/javascripts/discourse/app/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/app/components/composer-editor.js
@@ -964,7 +964,7 @@ export default Component.extend({
           // Inline Oneboxes = `a.inline-onebox-loading` -> `a.inline-onebox`
 
           let loadedOneboxes = $preview.find(
-            `aside.onebox, a.${LOADING_ONEBOX_CSS_CLASS}, a.inline-onebox-loading`
+            `aside.onebox, a.${LOADING_ONEBOX_CSS_CLASS}, a.inline-onebox`
           ).length;
 
           $preview.find(`a.onebox, a.inline-onebox-loading`).each((_, link) => {

From e83dc752383e2ee98777daebe016c81b5d5f09c0 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 8 May 2020 10:43:23 +1000
Subject: [PATCH 1032/1830] FIX: Migration to set column NOT NULL for
 delete_when_reminder_sent on bookmarks (#9696)

Also fix typo in original migration.

Meta: https://meta.discourse.org/t/improved-bookmarks-with-reminders/144542/152?u=mjrbrennan
---
 ..._add_delete_when_reminder_sent_boolean_to_bookmarks.rb | 2 +-
 ..._ensure_bookmark_delete_when_reminder_sent_not_null.rb | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20200507234409_ensure_bookmark_delete_when_reminder_sent_not_null.rb

diff --git a/db/migrate/20200505060712_add_delete_when_reminder_sent_boolean_to_bookmarks.rb b/db/migrate/20200505060712_add_delete_when_reminder_sent_boolean_to_bookmarks.rb
index 7e4ca807fa..66976ff4e5 100644
--- a/db/migrate/20200505060712_add_delete_when_reminder_sent_boolean_to_bookmarks.rb
+++ b/db/migrate/20200505060712_add_delete_when_reminder_sent_boolean_to_bookmarks.rb
@@ -2,6 +2,6 @@
 
 class AddDeleteWhenReminderSentBooleanToBookmarks < ActiveRecord::Migration[6.0]
   def change
-    add_column :bookmarks, :delete_when_reminder_sent, :boolean, nullabe: false, default: false
+    add_column :bookmarks, :delete_when_reminder_sent, :boolean, null: false, default: false
   end
 end
diff --git a/db/migrate/20200507234409_ensure_bookmark_delete_when_reminder_sent_not_null.rb b/db/migrate/20200507234409_ensure_bookmark_delete_when_reminder_sent_not_null.rb
new file mode 100644
index 0000000000..5052675f96
--- /dev/null
+++ b/db/migrate/20200507234409_ensure_bookmark_delete_when_reminder_sent_not_null.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class EnsureBookmarkDeleteWhenReminderSentNotNull < ActiveRecord::Migration[6.0]
+  def change
+    DB.exec("UPDATE bookmarks SET delete_when_reminder_sent = false WHERE delete_when_reminder_sent IS NULL")
+    change_column_null :bookmarks, :delete_when_reminder_sent, false
+  end
+end

From 22dffe6f6951a26b0040381548952d38cb58b203 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Fri, 8 May 2020 15:24:37 +0000
Subject: [PATCH 1033/1830] FIX: Do not allow null options for bookmark manager

---
 lib/bookmark_manager.rb           | 10 ++++++++--
 spec/lib/bookmark_manager_spec.rb | 11 +++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/lib/bookmark_manager.rb b/lib/bookmark_manager.rb
index 90088181f6..44e6361f22 100644
--- a/lib/bookmark_manager.rb
+++ b/lib/bookmark_manager.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class BookmarkManager
+  DEFAULT_OPTIONS = { delete_when_reminder_sent: false }
+
   include HasErrors
 
   def initialize(user)
@@ -22,7 +24,7 @@ class BookmarkManager
         reminder_type: reminder_type,
         reminder_at: reminder_at,
         reminder_set_at: Time.zone.now
-      }.merge(options)
+      }.merge(default_options(options))
     )
 
     if bookmark.errors.any?
@@ -82,7 +84,7 @@ class BookmarkManager
         reminder_at: reminder_at,
         reminder_type: reminder_type,
         reminder_set_at: Time.zone.now
-      }.merge(options)
+      }.merge(default_options(options))
     )
 
     if bookmark.errors.any?
@@ -102,4 +104,8 @@ class BookmarkManager
     return if reminder_type.blank?
     reminder_type.is_a?(Integer) ? reminder_type : Bookmark.reminder_types[reminder_type.to_sym]
   end
+
+  def default_options(options)
+    DEFAULT_OPTIONS.merge(options) { |key, old, new| new.nil? ? old : new }
+  end
 end
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index 24bdd6bd15..6aabf79824 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -53,6 +53,17 @@ RSpec.describe BookmarkManager do
       end
     end
 
+    context "when options are provided with null values" do
+      let(:options) { { delete_when_reminder_sent: nil } }
+
+      it "saves defaults successfully" do
+        subject.create(post_id: post.id, name: name, options: options)
+        bookmark = Bookmark.find_by(user: user)
+
+        expect(bookmark.delete_when_reminder_sent).to eq(false)
+      end
+    end
+
     context "when the bookmark already exists for the user & post" do
       before do
         Bookmark.create(post: post, user: user, topic: post.topic)

From a3e1e9ef167584653b0c139a68ec635bf066243e Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Fri, 8 May 2020 11:14:59 +1000
Subject: [PATCH 1034/1830] FIX: remove deprecated URI.escape (#9697)

During Nokogumbo changes I introduced back URI.escape which is deprecated.
---
 app/jobs/regular/update_username.rb | 2 +-
 lib/pretty_text.rb                  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/jobs/regular/update_username.rb b/app/jobs/regular/update_username.rb
index 7c9fcedb5a..5a067afb99 100644
--- a/app/jobs/regular/update_username.rb
+++ b/app/jobs/regular/update_username.rb
@@ -158,7 +158,7 @@ module Jobs
 
       doc.css("a.mention").each do |a|
         a.content = a.content.gsub(@cooked_mention_username_regex, "@#{@new_username}")
-        a["href"] = a["href"].gsub(@cooked_mention_user_path_regex, "/u/#{URI.escape(@new_username)}") if a["href"]
+        a["href"] = a["href"].gsub(@cooked_mention_user_path_regex, "/u/#{UrlHelper.encode_component(@new_username)}") if a["href"]
       end
 
       doc.css("aside.quote").each do |aside|
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 9f3f65e350..f355b898ab 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -286,7 +286,7 @@ module PrettyText
     doc.css("a").each do |l|
       href = l["href"].to_s
       begin
-        uri = URI(URI.escape(href))
+        uri = URI(UrlHelper.encode_component(href))
         site_uri ||= URI(Discourse.base_url)
 
         if !uri.host.present? ||
@@ -466,13 +466,13 @@ module PrettyText
 
         case type
         when USER_TYPE
-          element['href'] = "#{Discourse::base_uri}/u/#{URI.escape(name)}"
+          element['href'] = "#{Discourse::base_uri}/u/#{UrlHelper.encode_component(name)}"
         when GROUP_MENTIONABLE_TYPE
           element['class'] = 'mention-group notify'
-          element['href'] = "#{Discourse::base_uri}/groups/#{URI.escape(name)}"
+          element['href'] = "#{Discourse::base_uri}/groups/#{UrlHelper.encode_component(name)}"
         when GROUP_TYPE
           element['class'] = 'mention-group'
-          element['href'] = "#{Discourse::base_uri}/groups/#{URI.escape(name)}"
+          element['href'] = "#{Discourse::base_uri}/groups/#{UrlHelper.encode_component(name)}"
         end
       end
     end

From efd0e4d02be64d8cbbda473f7077bfd0c2fe29b5 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 8 May 2020 09:27:26 +0800
Subject: [PATCH 1035/1830] FIX: Don't trigger user_updated event for bot
 users.

---
 app/models/user.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 0beec5739a..f932f15abf 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -127,7 +127,10 @@ class User < ActiveRecord::Base
   after_create :set_default_categories_preferences
   after_create :set_default_tags_preferences
 
-  after_update :trigger_user_updated_event, if: :saved_change_to_uploaded_avatar_id?
+  after_update :trigger_user_updated_event, if: Proc.new {
+    self.human? && self.saved_change_to_uploaded_avatar_id?
+  }
+
   after_update :trigger_user_automatic_group_refresh, if: :saved_change_to_staged?
 
   before_save :update_usernames

From 609e929186c45a58e0f4ddf9b2a11ecb75b02415 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 8 May 2020 10:44:51 +1000
Subject: [PATCH 1036/1830] Revert "Revert "DEV: upgrade to Rails 6.0.3""

This reverts commit 2ff8b4f5d9dd72a55d7ebdc23a3758dd5ec4682d.

Attempt #2 at a Rails update this time we also update the
rails_multisite gem to allow for cleaner reordering
---
 Gemfile                                      | 14 ++---
 Gemfile.lock                                 | 60 ++++++++++----------
 config/application.rb                        |  6 ++
 config/initializers/200-first_middlewares.rb | 17 ++----
 4 files changed, 47 insertions(+), 50 deletions(-)

diff --git a/Gemfile b/Gemfile
index 039acc6a2a..980bce100a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,13 +18,13 @@ else
   # this allows us to include the bits of rails we use without pieces we do not.
   #
   # To issue a rails update bump the version number here
-  gem 'actionmailer', '6.0.2.2'
-  gem 'actionpack', '6.0.2.2'
-  gem 'actionview', '6.0.2.2'
-  gem 'activemodel', '6.0.2.2'
-  gem 'activerecord', '6.0.2.2'
-  gem 'activesupport', '6.0.2.2'
-  gem 'railties', '6.0.2.2'
+  gem 'actionmailer', '6.0.3'
+  gem 'actionpack', '6.0.3'
+  gem 'actionview', '6.0.3'
+  gem 'activemodel', '6.0.3'
+  gem 'activerecord', '6.0.3'
+  gem 'activesupport', '6.0.3'
+  gem 'railties', '6.0.3'
   gem 'sprockets-rails'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 6d97e8a504..dc81306ab7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      actionview (= 6.0.2.2)
-      activejob (= 6.0.2.2)
+    actionmailer (6.0.3)
+      actionpack (= 6.0.3)
+      actionview (= 6.0.3)
+      activejob (= 6.0.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.2.2)
-      actionview (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionpack (6.0.3)
+      actionview (= 6.0.3)
+      activesupport (= 6.0.3)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionview (6.0.3)
+      activesupport (= 6.0.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -24,20 +24,20 @@ GEM
       actionview (>= 6.0.a)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    activejob (6.0.3)
+      activesupport (= 6.0.3)
       globalid (>= 0.3.6)
-    activemodel (6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activerecord (6.0.2.2)
-      activemodel (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activesupport (6.0.2.2)
+    activemodel (6.0.3)
+      activesupport (= 6.0.3)
+    activerecord (6.0.3)
+      activemodel (= 6.0.3)
+      activesupport (= 6.0.3)
+    activesupport (6.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     annotate (3.1.1)
@@ -184,7 +184,7 @@ GEM
       mini_mime (>= 0.1.1)
     maxminddb (0.1.22)
     memory_profiler (0.9.14)
-    message_bus (3.1.0)
+    message_bus (3.2.0)
       rack (>= 1.1.3)
     method_source (1.0.0)
     mini_mime (1.0.2)
@@ -278,12 +278,12 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails_multisite (2.1.1)
+    rails_multisite (2.1.2)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
-    railties (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    railties (6.0.3)
+      actionpack (= 6.0.3)
+      activesupport (= 6.0.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -428,14 +428,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (= 6.0.2.2)
-  actionpack (= 6.0.2.2)
-  actionview (= 6.0.2.2)
+  actionmailer (= 6.0.3)
+  actionpack (= 6.0.3)
+  actionview (= 6.0.3)
   actionview_precompiler
   active_model_serializers (~> 0.8.3)
-  activemodel (= 6.0.2.2)
-  activerecord (= 6.0.2.2)
-  activesupport (= 6.0.2.2)
+  activemodel (= 6.0.3)
+  activerecord (= 6.0.3)
+  activesupport (= 6.0.3)
   addressable
   annotate
   aws-sdk-s3
@@ -512,7 +512,7 @@ DEPENDENCIES
   rack-mini-profiler
   rack-protection
   rails_multisite
-  railties (= 6.0.2.2)
+  railties (= 6.0.3)
   rake
   rb-fsevent
   rb-inotify (~> 0.9)
diff --git a/config/application.rb b/config/application.rb
index b2649ad17f..3eb998adca 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -91,6 +91,12 @@ module Discourse
       end
     end
 
+    # we skip it cause we configure it in the initializer
+    # the railstie for message_bus would insert it in the
+    # wrong position
+    config.skip_message_bus_middleware = true
+    config.skip_multisite_middleware = true
+
     # Disable so this is only run manually
     # we may want to change this later on
     # issue is image_optim crashes on missing dependencies
diff --git a/config/initializers/200-first_middlewares.rb b/config/initializers/200-first_middlewares.rb
index 2647fd039a..14432d8b9a 100644
--- a/config/initializers/200-first_middlewares.rb
+++ b/config/initializers/200-first_middlewares.rb
@@ -6,12 +6,8 @@
 #
 # We aren't manipulating the middleware stack directly because of
 # https://github.com/rails/rails/pull/27936
-session_operations = Rails::Configuration::MiddlewareStackProxy.new([
-   [:delete, MessageBus::Rack::Middleware],
-   [:unshift, MessageBus::Rack::Middleware],
-])
 
-Rails.configuration.middleware = Rails.configuration.middleware + session_operations
+Rails.configuration.middleware.unshift(MessageBus::Rack::Middleware)
 
 # no reason to track this in development, that is 300+ redis calls saved per
 # page view (we serve all assets out of thin in development)
@@ -25,12 +21,7 @@ if Rails.env != 'development' || ENV['TRACK_REQUESTS']
 end
 
 if Rails.configuration.multisite
-  # Multisite needs to be first, because the request tracker and message bus
-  # rely on it
-  session_operations = Rails::Configuration::MiddlewareStackProxy.new([
-     [:delete, RailsMultisite::Middleware],
-     [:unshift, [RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config]],
-  ])
-
-  Rails.configuration.middleware = Rails.configuration.middleware + session_operations
+  # Multisite needs to be first, because the request tracker and message bus rely on it
+  Rails.configuration.middleware.unshift RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config
+  Rails.configuration.middleware.delete ActionDispatch::Executor
 end

From 1840023c284e05f8d5dad609528fc080ea228c3f Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 7 May 2020 22:57:52 -0400
Subject: [PATCH 1037/1830] UX: Improve banner & alert close button alignment
 and consistency

---
 app/assets/stylesheets/common/base/alert.scss        |  9 ++++-----
 app/assets/stylesheets/common/components/banner.scss | 12 ++++++++++--
 app/assets/stylesheets/desktop/alert.scss            |  2 +-
 app/assets/stylesheets/desktop/banner.scss           |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss
index c367b3f8ea..d729cdc742 100644
--- a/app/assets/stylesheets/common/base/alert.scss
+++ b/app/assets/stylesheets/common/base/alert.scss
@@ -1,5 +1,5 @@
 .alert {
-  padding: 0.5em 1em;
+  padding: 0.5em 2.5em 0.5em 1em;
   background-color: $danger-low;
   color: $primary;
   position: relative;
@@ -7,11 +7,10 @@
   .close {
     font-size: $font-up-3;
     position: absolute;
-    top: 8px;
-    right: 8px;
-
+    top: 0.265em;
+    right: 0.66em;
     .d-icon {
-      color: $primary-low-mid;
+      color: $primary-medium;
     }
   }
 
diff --git a/app/assets/stylesheets/common/components/banner.scss b/app/assets/stylesheets/common/components/banner.scss
index 72f45ff949..1399ace364 100644
--- a/app/assets/stylesheets/common/components/banner.scss
+++ b/app/assets/stylesheets/common/components/banner.scss
@@ -3,7 +3,7 @@
 // --------------------------------------------------
 
 #banner {
-  padding: 10px;
+  padding: 0.5em 1em;
   background: $tertiary-low;
   color: $primary;
   z-index: z("base") + 1;
@@ -14,13 +14,21 @@
   }
 
   .close {
-    margin-top: -5px;
     color: $primary-low-mid;
     padding-left: 5px;
     float: right;
+    .d-icon {
+      color: $primary-medium;
+    }
   }
 
   .meta {
     display: none;
   }
 }
+
+#banner-content {
+  hr {
+    border-color: $primary-medium;
+  }
+}
diff --git a/app/assets/stylesheets/desktop/alert.scss b/app/assets/stylesheets/desktop/alert.scss
index eead66319a..f3f57eac66 100644
--- a/app/assets/stylesheets/desktop/alert.scss
+++ b/app/assets/stylesheets/desktop/alert.scss
@@ -1,3 +1,3 @@
 .alert {
-  margin-bottom: 15px;
+  margin-bottom: 1em;
 }
diff --git a/app/assets/stylesheets/desktop/banner.scss b/app/assets/stylesheets/desktop/banner.scss
index 3bfe777809..ecfcff7d37 100644
--- a/app/assets/stylesheets/desktop/banner.scss
+++ b/app/assets/stylesheets/desktop/banner.scss
@@ -3,7 +3,7 @@
 // --------------------------------------------------
 
 #banner {
-  margin-bottom: 10px;
+  margin-bottom: 1em;
   max-width: 1090px;
   max-height: 250px;
 }

From d8d54a92f15782bb906d2f0b2c7d5e966b29f819 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 8 May 2020 13:30:16 +1000
Subject: [PATCH 1038/1830] FEATURE: tighten rate limiting rules for forgot
 password

1. Total 6 attempts per day per user
2. Total of 5 per unique email/login that is not found per hour
3. If an admin blocks an IP that IP can not request a reset
---
 app/controllers/session_controller.rb    | 14 +++++--
 config/locales/server.en.yml             |  1 +
 spec/requests/session_controller_spec.rb | 47 ++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index aa46f2dba2..024d746aeb 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -401,13 +401,21 @@ class SessionController < ApplicationController
   def forgot_password
     params.require(:login)
 
+    if ScreenedIpAddress.should_block?(request.remote_ip)
+      return render_json_error(I18n.t("login.reset_not_allowed_from_ip_address"))
+    end
+
     RateLimiter.new(nil, "forgot-password-hr-#{request.remote_ip}", 6, 1.hour).performed!
     RateLimiter.new(nil, "forgot-password-min-#{request.remote_ip}", 3, 1.minute).performed!
 
-    RateLimiter.new(nil, "forgot-password-login-hour-#{params[:login].to_s[0..100]}", 12, 1.hour).performed!
-    RateLimiter.new(nil, "forgot-password-login-min-#{params[:login].to_s[0..100]}", 3, 1.minute).performed!
-
     user = User.find_by_username_or_email(params[:login])
+
+    if user
+      RateLimiter.new(nil, "forgot-password-login-day-#{user.username}", 6, 1.day).performed!
+    else
+      RateLimiter.new(nil, "forgot-password-login-hour-#{params[:login].to_s[0..100]}", 5, 1.hour).performed!
+    end
+
     user_presence = user.present? && user.human? && !user.staged
     if user_presence
       email_token = user.email_tokens.create(email: user.email)
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index f49bb37979..c948a2ef62 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2385,6 +2385,7 @@ en:
     not_activated: "You can't log in yet. We sent an activation email to you. Please follow the instructions in the email to activate your account."
     not_allowed_from_ip_address: "You can't log in as %{username} from that IP address."
     admin_not_allowed_from_ip_address: "You can't log in as admin from that IP address."
+    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}"
     errors: "%{errors}"
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index 51b023df68..49b4d0943f 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -1825,6 +1825,53 @@ RSpec.describe SessionController do
       expect(response.status).to eq(400)
     end
 
+    it 'should correctly screen ips' do
+      ScreenedIpAddress.create!(
+        ip_address: '100.0.0.1',
+        action_type: ScreenedIpAddress.actions[:block]
+      )
+
+      post "/session/forgot_password.json",
+        params: { login: 'made_up' },
+        headers: { 'REMOTE_ADDR' => '100.0.0.1'  }
+
+      expect(response.parsed_body).to eq({
+        "errors" => [I18n.t("login.reset_not_allowed_from_ip_address")]
+      })
+
+    end
+
+    it 'should correctly rate limits' do
+      RateLimiter.enable
+      RateLimiter.clear_all!
+
+      user = Fabricate(:user)
+
+      3.times do
+        post "/session/forgot_password.json", params: { login: user.username }
+        expect(response.status).to eq(200)
+      end
+
+      post "/session/forgot_password.json", params: { login: user.username }
+      expect(response.status).to eq(422)
+
+      3.times do
+        post "/session/forgot_password.json",
+          params: { login: user.username },
+          headers: { 'REMOTE_ADDR' => '10.1.1.1'  }
+
+        expect(response.status).to eq(200)
+      end
+
+      post "/session/forgot_password.json",
+        params: { login: user.username },
+        headers: { 'REMOTE_ADDR' => '100.1.1.1'  }
+
+      # not allowed, max 6 a day
+      expect(response.status).to eq(422)
+
+    end
+
     context 'for a non existant username' do
       it "doesn't generate a new token for a made up username" do
         expect do

From 6359a5f8a9bcb81923812d83ea77bfce0e94860c Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 8 May 2020 14:58:39 +0800
Subject: [PATCH 1039/1830] DEV: Fix poll plugin causing error when server
 reloads in dev env.

---
 plugins/poll/plugin.rb | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index 78fa0ba548..ec4a7570a6 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -451,28 +451,30 @@ after_initialize do
     mount ::DiscoursePoll::Engine, at: "/polls"
   end
 
-  Post.class_eval do
-    attr_accessor :extracted_polls
+  reloadable_patch do
+    Post.class_eval do
+      attr_accessor :extracted_polls
 
-    has_many :polls, dependent: :destroy
+      has_many :polls, dependent: :destroy
 
-    after_save do
-      polls = self.extracted_polls
-      next if polls.blank? || !polls.is_a?(Hash)
-      post = self
+      after_save do
+        polls = self.extracted_polls
+        next if polls.blank? || !polls.is_a?(Hash)
+        post = self
 
-      Poll.transaction do
-        polls.values.each do |poll|
-          DiscoursePoll::Poll.create!(post.id, poll)
+        Poll.transaction do
+          polls.values.each do |poll|
+            DiscoursePoll::Poll.create!(post.id, poll)
+          end
+          post.custom_fields[DiscoursePoll::HAS_POLLS] = true
+          post.save_custom_fields(true)
         end
-        post.custom_fields[DiscoursePoll::HAS_POLLS] = true
-        post.save_custom_fields(true)
       end
     end
-  end
 
-  User.class_eval do
-    has_many :poll_votes, dependent: :delete_all
+    User.class_eval do
+      has_many :poll_votes, dependent: :delete_all
+    end
   end
 
   validate(:post, :validate_polls) do |force = nil|

From 9d172eeaa532fe5b93f5ad6657cb8049dab4fb0d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 8 May 2020 09:19:36 +0200
Subject: [PATCH 1040/1830] REFACTOR: removes implicit operand conversion
 (#9700)

---
 app/assets/javascripts/select-kit/components/multi-select.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/multi-select.js b/app/assets/javascripts/select-kit/components/multi-select.js
index 16681b8262..1252e47b1a 100644
--- a/app/assets/javascripts/select-kit/components/multi-select.js
+++ b/app/assets/javascripts/select-kit/components/multi-select.js
@@ -115,7 +115,7 @@ export default SelectKitComponent.extend({
       event.stopPropagation();
 
       const input = this.getFilterInput();
-      if (input && !input.value.length >= 1) {
+      if (input && input.value.length === 0) {
         const selected = this.element.querySelectorAll(
           ".select-kit-header .choice.select-kit-selected-name"
         );

From 00a038d64624ec8cfb91bc031c100698cdb54397 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 8 May 2020 09:19:48 +0200
Subject: [PATCH 1041/1830] REFACTOR: removes various assignments and
 superfluous params (#9699)

---
 .../javascripts/discourse/app/models/topic-tracking-state.js   | 3 +--
 app/assets/javascripts/locales/i18n.js                         | 1 -
 .../addon/engines/discourse-markdown/bbcode-inline.js          | 2 +-
 .../pretty-text/addon/engines/discourse-markdown/html-img.js   | 2 +-
 .../pretty-text/addon/engines/discourse-markdown/paragraph.js  | 2 +-
 app/assets/javascripts/pretty-text/addon/oneboxer.js           | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
index 7cb74d8845..be49ad4b39 100644
--- a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
+++ b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
@@ -452,14 +452,13 @@ const TopicTrackingState = EmberObject.extend({
     }
 
     let categoryId = category ? get(category, "id") : null;
-    let categoryName = category ? get(category, "name") : null;
 
     if (name === "new") {
       return this.countNew(categoryId);
     } else if (name === "unread") {
       return this.countUnread(categoryId);
     } else {
-      categoryName = name.split("/")[1];
+      const categoryName = name.split("/")[1];
       if (categoryName) {
         return this.countCategory(categoryId);
       }
diff --git a/app/assets/javascripts/locales/i18n.js b/app/assets/javascripts/locales/i18n.js
index e0f7019a08..480287700a 100644
--- a/app/assets/javascripts/locales/i18n.js
+++ b/app/assets/javascripts/locales/i18n.js
@@ -197,7 +197,6 @@ I18n.toNumber = function(number, options) {
       .toFixed(options.precision)
       .toString(),
     parts = string.split(this.SEPARATOR),
-    precision,
     buffer = [],
     formattedNumber;
 
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/bbcode-inline.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/bbcode-inline.js
index 98788ae063..ab57fcb716 100644
--- a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/bbcode-inline.js
+++ b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/bbcode-inline.js
@@ -225,7 +225,7 @@ export function setup(helper) {
         token = state.push("text", "", 0);
         token.content = content;
 
-        token = state.push("link_close", "a", -1);
+        state.push("link_close", "a", -1);
         return true;
       }
     });
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/html-img.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/html-img.js
index bdc61788f5..800d520a9e 100644
--- a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/html-img.js
+++ b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/html-img.js
@@ -66,7 +66,7 @@ function rule(state, startLine, endLine) {
   token.map = [startLine, state.line];
   token.children = [];
 
-  token = state.push("paragraph_close", "p", -1);
+  state.push("paragraph_close", "p", -1);
   state.parentType = oldParentType;
 
   return true;
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/paragraph.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/paragraph.js
index 267317589e..879faf95dd 100644
--- a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/paragraph.js
+++ b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/paragraph.js
@@ -78,7 +78,7 @@ function paragraph(state, startLine /*, endLine*/) {
   // CUSTOM
   token.leading_space = hasLeadingSpace;
 
-  token = state.push("paragraph_close", "p", -1);
+  state.push("paragraph_close", "p", -1);
 
   state.parentType = oldParentType;
   return true;
diff --git a/app/assets/javascripts/pretty-text/addon/oneboxer.js b/app/assets/javascripts/pretty-text/addon/oneboxer.js
index f5faf56128..e0720c3cad 100644
--- a/app/assets/javascripts/pretty-text/addon/oneboxer.js
+++ b/app/assets/javascripts/pretty-text/addon/oneboxer.js
@@ -78,7 +78,7 @@ function loadNext(ajax) {
         let $html = $(html);
         setLocalCache(normalize(url), $html);
         $elem.replaceWith($html);
-        applySquareGenericOnebox($html, normalize(url));
+        applySquareGenericOnebox($html);
       },
       result => {
         if (result && result.jqXHR && result.jqXHR.status === 429) {

From 8d3900c6daddb52c025bc42b0aa60fe3bcb1b61f Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 8 May 2020 10:35:29 +0200
Subject: [PATCH 1042/1830] DEV: gear icon is deprecated in favor of cog
 (#9704)

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

diff --git a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
index b69713e757..5dc8225767 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
@@ -10,7 +10,7 @@
 
     <div class="control-group bookmark-name-wrap">
       {{input id="bookmark-name" value=model.name name="name" class="bookmark-name" placeholder=(i18n "post.bookmarks.name_placeholder")}}
-      {{d-button icon="gear" action=(action "toggleOptionsPanel") class="bookmark-options-button"}}
+      {{d-button icon="cog" action=(action "toggleOptionsPanel") class="bookmark-options-button"}}
     </div>
 
     <div class="bookmark-options-panel">

From 704e4b9cf81176e560247b8de5618e7132ef8a29 Mon Sep 17 00:00:00 2001
From: Rishabh <rishabh.nambiar@discourse.org>
Date: Fri, 8 May 2020 18:38:29 +0530
Subject: [PATCH 1043/1830] DOCS: Update community install info

Update pricing as per https://www.literatecomputing.com/discourse-installation-packages (same url)
---
 docs/INSTALL-cloud.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md
index 33ea1e7915..806651ce76 100644
--- a/docs/INSTALL-cloud.md
+++ b/docs/INSTALL-cloud.md
@@ -1,6 +1,6 @@
 **Set up Discourse in the cloud in under 30 minutes** with zero knowledge of Rails or Linux shell. One example is [DigitalOcean][do], but these steps will work on any **Docker-compatible** cloud provider or local server.
 
->  🔔 Don't have 30 minutes to set this up? For a flat one-time fee of $99, the community can install Discourse in the cloud for you. [Click here to purchase a self-supported community install](https://www.literatecomputing.com/product/discourse-install/).
+>  🔔 Don't have 30 minutes to set this up? For a flat one-time fee of $150, the community can install Discourse in the cloud for you. [Click here to purchase a self-supported community install](https://www.literatecomputing.com/product/discourse-install/).
 
 ### Create New Cloud Server
 

From e46bf15407c90d66043cb908b6c13942aaa01ec6 Mon Sep 17 00:00:00 2001
From: Dax74 <Dax74@users.noreply.github.com>
Date: Fri, 8 May 2020 16:39:31 +0200
Subject: [PATCH 1044/1830] FIX: some adjustment for the UI of the table

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

diff --git a/app/assets/stylesheets/common/base/cat_reorder.scss b/app/assets/stylesheets/common/base/cat_reorder.scss
index 8ec73962e1..2a35f9b935 100644
--- a/app/assets/stylesheets/common/base/cat_reorder.scss
+++ b/app/assets/stylesheets/common/base/cat_reorder.scss
@@ -5,7 +5,8 @@
     }
   }
   input {
-    width: 3em;
+    width: 2.333em;
+    padding: 4px;
     @include breakpoint(mobile-extra-large) {
       width: 2em;
     }
@@ -18,6 +19,7 @@
     margin: 0 0.667em;
     td {
       padding: 0.5em 0.5em 0.5em 0;
+      min-width: 10em;
       @include breakpoint(mobile, min-width) {
         min-width: 15em;
       }

From 646bee2efe1bf605eba11aa1b22727ee89790c2d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 8 May 2020 16:46:13 +0200
Subject: [PATCH 1045/1830] DEV: removes a setTimeout and ensure shorcut is not
 propagated (#9702)

---
 .../discourse/app/controllers/composer.js     | 42 +++++++++++--------
 .../discourse/app/lib/keyboard-shortcuts.js   | 13 ++++--
 2 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index 6a0fa4e6ef..836ce63cb7 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -23,7 +23,7 @@ import { shortDate } from "discourse/lib/formatter";
 import { SAVE_LABELS, SAVE_ICONS } from "discourse/models/composer";
 import { Promise } from "rsvp";
 import ENV from "discourse-common/config/environment";
-import EmberObject, { computed } from "@ember/object";
+import EmberObject, { computed, action } from "@ember/object";
 import deprecated from "discourse-common/lib/deprecated";
 
 function loadDraft(store, opts) {
@@ -219,26 +219,26 @@ export default Controller.extend({
   isWhispering: or("replyingToWhisper", "model.whisper"),
 
   @discourseComputed("model.action", "isWhispering")
-  saveIcon(action, isWhispering) {
+  saveIcon(modelAction, isWhispering) {
     if (isWhispering) return "far-eye-slash";
 
-    return SAVE_ICONS[action];
+    return SAVE_ICONS[modelAction];
   },
 
   @discourseComputed("model.action", "isWhispering", "model.editConflict")
-  saveLabel(action, isWhispering, editConflict) {
+  saveLabel(modelAction, isWhispering, editConflict) {
     if (editConflict) return "composer.overwrite_edit";
     else if (isWhispering) return "composer.create_whisper";
 
-    return SAVE_LABELS[action];
+    return SAVE_LABELS[modelAction];
   },
 
   @discourseComputed("isStaffUser", "model.action")
-  canWhisper(isStaffUser, action) {
+  canWhisper(isStaffUser, modelAction) {
     return (
       this.siteSettings.enable_whispers &&
       isStaffUser &&
-      Composer.REPLY === action
+      Composer.REPLY === modelAction
     );
   },
 
@@ -329,6 +329,20 @@ export default Controller.extend({
     return uploadIcon(this.currentUser.staff);
   },
 
+  @action
+  openIfDraft(event) {
+    if (this.get("model.viewDraft")) {
+      // when called from shortcut, ensure we don't propagate the key to
+      // the composer input title
+      if (event) {
+        event.preventDefault();
+        event.stopPropagation();
+      }
+
+      this.set("model.composeState", Composer.OPEN);
+    }
+  },
+
   actions: {
     togglePreview() {
       this.toggleProperty("showPreview");
@@ -368,8 +382,8 @@ export default Controller.extend({
       this.set("model.uploadCancelled", true);
     },
 
-    onPopupMenuAction(action) {
-      this.send(action);
+    onPopupMenuAction(menuAction) {
+      this.send(menuAction);
     },
 
     storeToolbarState(toolbarEvent) {
@@ -539,12 +553,6 @@ export default Controller.extend({
       }
     },
 
-    openIfDraft() {
-      if (this.get("model.viewDraft")) {
-        this.set("model.composeState", Composer.OPEN);
-      }
-    },
-
     groupsMentioned(groups) {
       if (
         !this.get("model.creatingPrivateMessage") &&
@@ -1161,8 +1169,8 @@ export default Controller.extend({
   },
 
   @discourseComputed("model.action")
-  canEdit(action) {
-    return action === "edit" && this.currentUser.can_edit;
+  canEdit(modelAction) {
+    return modelAction === "edit" && this.currentUser.can_edit;
   },
 
   @discourseComputed("model.composeState")
diff --git a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
index 2fe61c5be9..985d9fc1af 100644
--- a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
@@ -3,7 +3,7 @@ import DiscourseURL from "discourse/lib/url";
 import Composer from "discourse/models/composer";
 import { minimumOffset } from "discourse/lib/offset-calculator";
 import { ajax } from "discourse/lib/ajax";
-import { throttle } from "@ember/runloop";
+import { throttle, schedule } from "@ember/runloop";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 
 const DEFAULT_BINDINGS = {
@@ -330,12 +330,17 @@ export default {
     });
   },
 
-  focusComposer() {
+  focusComposer(event) {
     const composer = this.container.lookup("controller:composer");
     if (composer.get("model.viewOpen")) {
-      setTimeout(() => $("textarea.d-editor-input").focus(), 0);
+      preventKeyboardEvent(event);
+
+      schedule("afterRender", () => {
+        const input = document.querySelector("textarea.d-editor-input");
+        input && input.focus();
+      });
     } else {
-      composer.send("openIfDraft");
+      composer.openIfDraft(event);
     }
   },
 

From 350fe932cafa2874e5fd87b4d401223754158656 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 8 May 2020 16:46:24 +0200
Subject: [PATCH 1046/1830] DEV: removes setTimeout and reduces timer in tests
 (#9701)

---
 .../discourse/app/lib/category-tag-search.js         | 12 ++++++++----
 .../javascripts/discourse/app/lib/user-search.js     | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/category-tag-search.js b/app/assets/javascripts/discourse/app/lib/category-tag-search.js
index c258ddb6ae..a5665a116c 100644
--- a/app/assets/javascripts/discourse/app/lib/category-tag-search.js
+++ b/app/assets/javascripts/discourse/app/lib/category-tag-search.js
@@ -4,6 +4,7 @@ import Category from "discourse/models/category";
 import { TAG_HASHTAG_POSTFIX } from "discourse/lib/tag-hashtags";
 import { SEPARATOR } from "discourse/lib/category-hashtags";
 import { Promise } from "rsvp";
+import { later, cancel } from "@ember/runloop";
 
 var cache = {};
 var cacheTime;
@@ -17,9 +18,12 @@ function updateCache(term, results) {
 
 function searchTags(term, categories, limit) {
   return new Promise(resolve => {
-    const clearPromise = setTimeout(() => {
-      resolve(CANCELLED_STATUS);
-    }, 5000);
+    const clearPromise = later(
+      () => {
+        resolve(CANCELLED_STATUS);
+      },
+      Ember.testing ? 25 : 5000
+    );
 
     const debouncedSearch = discourseDebounce((q, cats, resultFunc) => {
       oldSearch = $.ajax(Discourse.getURL("/tags/filter/search"), {
@@ -55,7 +59,7 @@ function searchTags(term, categories, limit) {
     }, 300);
 
     debouncedSearch(term, categories, result => {
-      clearTimeout(clearPromise);
+      cancel(clearPromise);
       resolve(updateCache(term, result));
     });
   });
diff --git a/app/assets/javascripts/discourse/app/lib/user-search.js b/app/assets/javascripts/discourse/app/lib/user-search.js
index fcdc421427..b374b59b90 100644
--- a/app/assets/javascripts/discourse/app/lib/user-search.js
+++ b/app/assets/javascripts/discourse/app/lib/user-search.js
@@ -3,6 +3,7 @@ import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
 import { userPath } from "discourse/lib/url";
 import { emailValid } from "discourse/lib/utilities";
 import { Promise } from "rsvp";
+import { later, cancel } from "@ember/runloop";
 
 var cache = {},
   cacheKey,
@@ -180,9 +181,12 @@ export default function userSearch(options) {
 
     cacheKey = newCacheKey;
 
-    var clearPromise = setTimeout(function() {
-      resolve(CANCELLED_STATUS);
-    }, 5000);
+    const clearPromise = later(
+      () => {
+        resolve(CANCELLED_STATUS);
+      },
+      Ember.testing ? 25 : 5000
+    );
 
     if (skipSearch(term, options.allowEmails)) {
       resolve([]);
@@ -199,7 +203,7 @@ export default function userSearch(options) {
       allowedUsers,
       groupMembersOf,
       function(r) {
-        clearTimeout(clearPromise);
+        cancel(clearPromise);
         resolve(organizeResults(r, options));
       }
     );

From a40649409e5d9cabbcd6adabec17e8895bedb376 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 8 May 2020 17:04:28 +0200
Subject: [PATCH 1047/1830] DEV: calling preload-store is deprecated (#9703)

---
 test/javascripts/test_helper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 6e9333587d..19ab641a75 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -166,7 +166,7 @@ QUnit.testStart(function(ctx) {
     _DiscourseURL.redirectedTo = url;
   };
 
-  var ps = require("preload-store").default;
+  var ps = require("discourse/lib/preload-store").default;
   ps.reset();
 
   window.sandbox = sinon;

From 3cce1b4e78619ce4aa2e7cac534beeee615fd3ed Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 8 May 2020 11:10:34 -0400
Subject: [PATCH 1048/1830] FIX: Support transpiling js in plugins with a root
 admin folder

---
 lib/plugin/instance.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 85f06dfb22..023b53e061 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -533,6 +533,7 @@ class Plugin::Instance
 
       if transpile_js
         DiscourseJsProcessor.plugin_transpile_paths << root_path.sub(Rails.root.to_s, '').sub(/^\/*/, '')
+        DiscourseJsProcessor.plugin_transpile_paths << admin_path.sub(Rails.root.to_s, '').sub(/^\/*/, '')
       end
     end
 
@@ -674,8 +675,9 @@ class Plugin::Instance
     if @path
       # Automatically include all ES6 JS and hbs files
       root_path = "#{File.dirname(@path)}/assets/javascripts"
+      admin_path = "#{File.dirname(@path)}/admin/assets/javascripts"
 
-      Dir.glob("#{root_path}/**/*") do |f|
+      Dir.glob(["#{root_path}/**/*", "#{admin_path}/**/*"]) do |f|
         f_str = f.to_s
         if File.directory?(f)
           yield [f, true]

From 47788da7060aec0151296649431465e487f87404 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Fri, 8 May 2020 10:47:01 -0500
Subject: [PATCH 1049/1830] FIX: Bookmark Modal Input (#9707)

---
 app/assets/stylesheets/common/components/bookmark-modal.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/stylesheets/common/components/bookmark-modal.scss b/app/assets/stylesheets/common/components/bookmark-modal.scss
index b870ec00d1..bf81e4ddfe 100644
--- a/app/assets/stylesheets/common/components/bookmark-modal.scss
+++ b/app/assets/stylesheets/common/components/bookmark-modal.scss
@@ -16,6 +16,7 @@
 
     .ember-text-field.bookmark-name {
       width: 100%;
+      margin-bottom: 0.5em;
     }
   }
 
@@ -71,6 +72,7 @@
 
   .bookmark-options-button {
     margin-left: 0.5em;
+    margin-bottom: 0.5em;
     background: transparent;
   }
 

From dae29afd7d2deac7483757f0ad983b1f492e9567 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 8 May 2020 13:50:56 -0400
Subject: [PATCH 1050/1830] Build(deps): Bump jquery-rails from 4.3.5 to 4.4.0
 (#9709)

Bumps [jquery-rails](https://github.com/rails/jquery-rails) from 4.3.5 to 4.4.0.
- [Release notes](https://github.com/rails/jquery-rails/releases)
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/jquery-rails/compare/v4.3.5...v4.4.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index dc81306ab7..c574b7b72b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -153,7 +153,7 @@ GEM
     in_threads (1.5.4)
     jaro_winkler (1.5.4)
     jmespath (1.4.0)
-    jquery-rails (4.3.5)
+    jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)

From 7f373e8b9315597059a6e23e9f070a4e8a371233 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 8 May 2020 13:25:25 -0400
Subject: [PATCH 1051/1830] DEV: Don't use `js.erb` for constants

Adds a new rake task to auto generate a constants.js file with the
constants present. This makes migrating to Ember CLI easier, but also
slightly speeds up asset compilation by having to do less work.

If the constants change you need to run:
`rake javascripts:update_constants`
---
 .../concerns/category-search-priorities.js.erb |  1 -
 .../app/components/edit-category-settings.js   |  4 ++--
 .../app/lib/concerns/search-constants.js.erb   |  1 -
 .../javascripts/discourse/app/lib/constants.js | 13 +++++++++++++
 .../discourse/app/lib/highlight-search.js      |  4 ++--
 .../app/routes/discovery-categories.js         |  4 ++--
 lib/tasks/javascript.rake                      | 18 +++++++++++++++++-
 7 files changed, 36 insertions(+), 9 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse/app/components/concerns/category-search-priorities.js.erb
 delete mode 100644 app/assets/javascripts/discourse/app/lib/concerns/search-constants.js.erb
 create mode 100644 app/assets/javascripts/discourse/app/lib/constants.js

diff --git a/app/assets/javascripts/discourse/app/components/concerns/category-search-priorities.js.erb b/app/assets/javascripts/discourse/app/components/concerns/category-search-priorities.js.erb
deleted file mode 100644
index 643b1777f9..0000000000
--- a/app/assets/javascripts/discourse/app/components/concerns/category-search-priorities.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-export const searchPriorities = <%= Searchable::PRIORITIES.to_json %>;
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 6ee6d77ffa..f0ab1cea12 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-settings.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-settings.js
@@ -2,7 +2,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { empty, and } from "@ember/object/computed";
 import { setting } from "discourse/lib/computed";
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
-import { searchPriorities } from "discourse/components/concerns/category-search-priorities";
+import { SearchPriorities } from "discourse/lib/constants";
 import Group from "discourse/models/group";
 
 const categorySortCriteria = [];
@@ -71,7 +71,7 @@ export default buildCategoryPanel("settings", {
   searchPrioritiesOptions() {
     const options = [];
 
-    Object.entries(searchPriorities).forEach(entry => {
+    Object.entries(SearchPriorities).forEach(entry => {
       const [name, value] = entry;
 
       options.push({
diff --git a/app/assets/javascripts/discourse/app/lib/concerns/search-constants.js.erb b/app/assets/javascripts/discourse/app/lib/concerns/search-constants.js.erb
deleted file mode 100644
index 4cb005cc68..0000000000
--- a/app/assets/javascripts/discourse/app/lib/concerns/search-constants.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-export const PHRASE_MATCH_REGEXP_PATTERN = '<%= Search::PHRASE_MATCH_REGEXP_PATTERN %>';
diff --git a/app/assets/javascripts/discourse/app/lib/constants.js b/app/assets/javascripts/discourse/app/lib/constants.js
new file mode 100644
index 0000000000..8b752571d5
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/constants.js
@@ -0,0 +1,13 @@
+// DO NOT EDIT THIS FILE!!!
+// Update it by running `rake javascript:update_constants`
+
+export const SearchPriorities = {
+  ignore: 1,
+  very_low: 2,
+  low: 3,
+  normal: 0,
+  high: 4,
+  very_high: 5
+};
+
+export const SearchPhraseRegexp = '"([^"]+)"';
diff --git a/app/assets/javascripts/discourse/app/lib/highlight-search.js b/app/assets/javascripts/discourse/app/lib/highlight-search.js
index 0d9318fb7a..e7dfc465ec 100644
--- a/app/assets/javascripts/discourse/app/lib/highlight-search.js
+++ b/app/assets/javascripts/discourse/app/lib/highlight-search.js
@@ -1,4 +1,4 @@
-import { PHRASE_MATCH_REGEXP_PATTERN } from "discourse/lib/concerns/search-constants";
+import { SearchPhraseRegexp } from "discourse/lib/constants";
 import highlightHTML from "discourse/lib/highlight-html";
 
 export const CLASS_NAME = "search-highlight";
@@ -7,7 +7,7 @@ export default function(elem, term, opts = {}) {
   if (!_.isEmpty(term)) {
     // special case ignore "l" which is used for magic sorting
     let words = _.reject(
-      term.match(new RegExp(`${PHRASE_MATCH_REGEXP_PATTERN}|[^\\s]+`, "g")),
+      term.match(new RegExp(`${SearchPhraseRegexp}|[^\\s]+`, "g")),
       t => t === "l"
     );
 
diff --git a/app/assets/javascripts/discourse/app/routes/discovery-categories.js b/app/assets/javascripts/discourse/app/routes/discovery-categories.js
index ba07642941..c1f440d453 100644
--- a/app/assets/javascripts/discourse/app/routes/discovery-categories.js
+++ b/app/assets/javascripts/discourse/app/routes/discovery-categories.js
@@ -8,7 +8,7 @@ import { defaultHomepage } from "discourse/lib/utilities";
 import TopicList from "discourse/models/topic-list";
 import { ajax } from "discourse/lib/ajax";
 import PreloadStore from "discourse/lib/preload-store";
-import { searchPriorities } from "discourse/components/concerns/category-search-priorities";
+import { SearchPriorities } from "discourse/lib/constants";
 import { hash } from "rsvp";
 import Site from "discourse/models/site";
 
@@ -145,7 +145,7 @@ export function openNewCategoryModal(context) {
     allow_badges: true,
     topic_featured_link_allowed: true,
     custom_fields: {},
-    search_priority: searchPriorities.normal
+    search_priority: SearchPriorities.normal
   });
 
   showModal("edit-category", { model }).set("selectedTab", "general");
diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rake
index d5381834df..835c83cfca 100644
--- a/lib/tasks/javascript.rake
+++ b/lib/tasks/javascript.rake
@@ -12,8 +12,24 @@ def library_src
   "#{Rails.root}/node_modules"
 end
 
-task 'javascript:update' do
+task 'javascript:update_constants' => :environment do
+  constants_js = <<~JS
+    // DO NOT EDIT THIS FILE!!!
+    // Update it by running `rake javascript:update_constants`
 
+    export const SearchPriorities = #{Searchable::PRIORITIES.to_json};
+
+    export const SearchPhraseRegexp = '#{Search::PHRASE_MATCH_REGEXP_PATTERN}';
+  JS
+
+  output_path = "#{Rails.root}/app/assets/javascripts/discourse/app/lib/constants.js"
+  File.write(output_path, constants_js)
+  puts "contants.js created"
+  %x{yarn run prettier --write #{output_path}}
+  puts "constants.js prettified"
+end
+
+task 'javascript:update' do
   require 'uglifier'
 
   yarn = system("yarn install")

From b2e4ca968b979c338f38ef641808084960563fec Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 8 May 2020 14:13:20 -0400
Subject: [PATCH 1052/1830] DEV: Remove `translate` API from plugin.

It appears to be completely unused at this point.
---
 app/models/emoji.rb    |  2 +-
 lib/plugin/instance.rb | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index cfd121b76e..7222cafebc 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -126,7 +126,7 @@ class Emoji
   end
 
   def self.load_translations
-    db["translations"].merge(Plugin::CustomEmoji.translations)
+    db["translations"]
   end
 
   def self.base_directory
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 023b53e061..13064a7e23 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -30,15 +30,6 @@ class Plugin::CustomEmoji
   def self.unregister(name, group = Emoji::DEFAULT_GROUP)
     emojis[group].delete(name)
   end
-
-  def self.translations
-    @@translations ||= {}
-  end
-
-  def self.translate(from, to)
-    @@cache_key = Digest::SHA1.hexdigest(cache_key + from)[0..10]
-    translations[from] = to
-  end
 end
 
 class Plugin::Instance
@@ -491,10 +482,6 @@ class Plugin::Instance
     Emoji.clear_cache
   end
 
-  def translate_emoji(from, to)
-    Plugin::CustomEmoji.translate(from, to)
-  end
-
   def automatic_assets
     css = styles.join("\n")
     js = javascripts.join("\n")

From 5bac2828ee31753abc09347cb9105deccde11720 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 8 May 2020 21:10:52 +0200
Subject: [PATCH 1053/1830] DEV: 25ms was too short and causing test failures
 (#9712)

---
 app/assets/javascripts/discourse/app/lib/category-tag-search.js | 2 +-
 app/assets/javascripts/discourse/app/lib/user-search.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/category-tag-search.js b/app/assets/javascripts/discourse/app/lib/category-tag-search.js
index a5665a116c..85b17f5aac 100644
--- a/app/assets/javascripts/discourse/app/lib/category-tag-search.js
+++ b/app/assets/javascripts/discourse/app/lib/category-tag-search.js
@@ -22,7 +22,7 @@ function searchTags(term, categories, limit) {
       () => {
         resolve(CANCELLED_STATUS);
       },
-      Ember.testing ? 25 : 5000
+      Ember.testing ? 50 : 5000
     );
 
     const debouncedSearch = discourseDebounce((q, cats, resultFunc) => {
diff --git a/app/assets/javascripts/discourse/app/lib/user-search.js b/app/assets/javascripts/discourse/app/lib/user-search.js
index b374b59b90..86d7d46012 100644
--- a/app/assets/javascripts/discourse/app/lib/user-search.js
+++ b/app/assets/javascripts/discourse/app/lib/user-search.js
@@ -185,7 +185,7 @@ export default function userSearch(options) {
       () => {
         resolve(CANCELLED_STATUS);
       },
-      Ember.testing ? 25 : 5000
+      Ember.testing ? 50 : 5000
     );
 
     if (skipSearch(term, options.allowEmails)) {

From 564e8566d74078ca9e75277f158c49fdafe399d7 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 8 May 2020 21:12:04 +0200
Subject: [PATCH 1054/1830] SECURITY: updates juqery to 3.5.0 (#9708)

https://github.com/advisories/GHSA-gxr4-xjj5-5px2
---
 package.json                        |    2 +-
 vendor/assets/javascripts/jquery.js | 1240 ++++++++++++++++-----------
 yarn.lock                           |    8 +-
 3 files changed, 762 insertions(+), 488 deletions(-)

diff --git a/package.json b/package.json
index 59ed84ca8d..1c6fb3db61 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "highlight.js": "https://github.com/highlightjs/highlight.js",
     "htmlparser": "https://github.com/tautologistics/node-htmlparser",
     "intersection-observer": "^0.5.1",
-    "jquery": "3.4.1",
+    "jquery": "3.5.0",
     "jquery-color": "3.0.0-alpha.1",
     "jquery-resize": "https://github.com/cowboy/jquery-resize/",
     "jquery-tags-input": "1.3.5",
diff --git a/vendor/assets/javascripts/jquery.js b/vendor/assets/javascripts/jquery.js
index 773ad95c56..2170756398 100644
--- a/vendor/assets/javascripts/jquery.js
+++ b/vendor/assets/javascripts/jquery.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v3.4.1
+ * jQuery JavaScript Library v3.5.0
  * https://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2019-05-01T21:04Z
+ * Date: 2020-04-10T15:07Z
  */
 ( function( global, factory ) {
 
@@ -47,13 +47,16 @@
 
 var arr = [];
 
-var document = window.document;
-
 var getProto = Object.getPrototypeOf;
 
 var slice = arr.slice;
 
-var concat = arr.concat;
+var flat = arr.flat ? function( array ) {
+	return arr.flat.call( array );
+} : function( array ) {
+	return arr.concat.apply( [], array );
+};
+
 
 var push = arr.push;
 
@@ -86,6 +89,8 @@ var isWindow = function isWindow( obj ) {
 	};
 
 
+var document = window.document;
+
 
 
 	var preservedScriptAttributes = {
@@ -142,7 +147,7 @@ function toType( obj ) {
 
 
 var
-	version = "3.4.1",
+	version = "3.5.0",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -150,11 +155,7 @@ var
 		// The jQuery object is actually just the init constructor 'enhanced'
 		// Need init if jQuery is called (just allow error to be thrown if not included)
 		return new jQuery.fn.init( selector, context );
-	},
-
-	// Support: Android <=4.0 only
-	// Make sure we trim BOM and NBSP
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
+	};
 
 jQuery.fn = jQuery.prototype = {
 
@@ -220,6 +221,18 @@ jQuery.fn = jQuery.prototype = {
 		return this.eq( -1 );
 	},
 
+	even: function() {
+		return this.pushStack( jQuery.grep( this, function( _elem, i ) {
+			return ( i + 1 ) % 2;
+		} ) );
+	},
+
+	odd: function() {
+		return this.pushStack( jQuery.grep( this, function( _elem, i ) {
+			return i % 2;
+		} ) );
+	},
+
 	eq: function( i ) {
 		var len = this.length,
 			j = +i + ( i < 0 ? len : 0 );
@@ -353,9 +366,10 @@ jQuery.extend( {
 		return true;
 	},
 
-	// Evaluates a script in a global context
-	globalEval: function( code, options ) {
-		DOMEval( code, { nonce: options && options.nonce } );
+	// Evaluates a script in a provided context; falls back to the global one
+	// if not specified.
+	globalEval: function( code, options, doc ) {
+		DOMEval( code, { nonce: options && options.nonce }, doc );
 	},
 
 	each: function( obj, callback ) {
@@ -379,13 +393,6 @@ jQuery.extend( {
 		return obj;
 	},
 
-	// Support: Android <=4.0 only
-	trim: function( text ) {
-		return text == null ?
-			"" :
-			( text + "" ).replace( rtrim, "" );
-	},
-
 	// results is for internal usage only
 	makeArray: function( arr, results ) {
 		var ret = results || [];
@@ -472,7 +479,7 @@ jQuery.extend( {
 		}
 
 		// Flatten any nested arrays
-		return concat.apply( [], ret );
+		return flat( ret );
 	},
 
 	// A global GUID counter for objects
@@ -489,7 +496,7 @@ if ( typeof Symbol === "function" ) {
 
 // Populate the class2type map
 jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
-function( i, name ) {
+function( _i, name ) {
 	class2type[ "[object " + name + "]" ] = name.toLowerCase();
 } );
 
@@ -511,17 +518,16 @@ function isArrayLike( obj ) {
 }
 var Sizzle =
 /*!
- * Sizzle CSS Selector Engine v2.3.4
+ * Sizzle CSS Selector Engine v2.3.5
  * https://sizzlejs.com/
  *
  * Copyright JS Foundation and other contributors
  * Released under the MIT license
  * https://js.foundation/
  *
- * Date: 2019-04-08
+ * Date: 2020-03-14
  */
-(function( window ) {
-
+( function( window ) {
 var i,
 	support,
 	Expr,
@@ -561,59 +567,70 @@ var i,
 	},
 
 	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
+	hasOwn = ( {} ).hasOwnProperty,
 	arr = [],
 	pop = arr.pop,
-	push_native = arr.push,
+	pushNative = arr.push,
 	push = arr.push,
 	slice = arr.slice,
+
 	// Use a stripped-down indexOf as it's faster than native
 	// https://jsperf.com/thor-indexof-vs-for/5
 	indexOf = function( list, elem ) {
 		var i = 0,
 			len = list.length;
 		for ( ; i < len; i++ ) {
-			if ( list[i] === elem ) {
+			if ( list[ i ] === elem ) {
 				return i;
 			}
 		}
 		return -1;
 	},
 
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
+	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|" +
+		"ismap|loop|multiple|open|readonly|required|scoped",
 
 	// Regular expressions
 
 	// http://www.w3.org/TR/css3-selectors/#whitespace
 	whitespace = "[\\x20\\t\\r\\n\\f]",
 
-	// http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = "(?:\\\\.|[\\w-]|[^\0-\\xa0])+",
+	// https://www.w3.org/TR/css-syntax-3/#ident-token-diagram
+	identifier = "(?:\\\\[\\da-fA-F]{1,6}" + whitespace +
+		"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",
 
 	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
 	attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
+
 		// Operator (capture 2)
 		"*([*^$|!~]?=)" + whitespace +
-		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
-		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
-		"*\\]",
+
+		// "Attribute values must be CSS identifiers [capture 5]
+		// or strings [capture 3 or capture 4]"
+		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" +
+		whitespace + "*\\]",
 
 	pseudos = ":(" + identifier + ")(?:\\((" +
+
 		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
 		// 1. quoted (capture 3; capture 4 or capture 5)
 		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
+
 		// 2. simple (capture 6)
 		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
+
 		// 3. anything else (capture 2)
 		".*" +
 		")\\)|)",
 
 	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
 	rwhitespace = new RegExp( whitespace + "+", "g" ),
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
+	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" +
+		whitespace + "+$", "g" ),
 
 	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
+	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace +
+		"*" ),
 	rdescend = new RegExp( whitespace + "|>" ),
 
 	rpseudo = new RegExp( pseudos ),
@@ -625,14 +642,16 @@ var i,
 		"TAG": new RegExp( "^(" + identifier + "|[*])" ),
 		"ATTR": new RegExp( "^" + attributes ),
 		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" +
+			whitespace + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" +
+			whitespace + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
 		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
+
 		// For use in libraries implementing .is()
 		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
+		"needsContext": new RegExp( "^" + whitespace +
+			"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + whitespace +
+			"*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
 	},
 
 	rhtml = /HTML$/i,
@@ -648,18 +667,21 @@ var i,
 
 	// CSS escapes
 	// http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox<24
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
+	runescape = new RegExp( "\\\\[\\da-fA-F]{1,6}" + whitespace + "?|\\\\([^\\r\\n\\f])", "g" ),
+	funescape = function( escape, nonHex ) {
+		var high = "0x" + escape.slice( 1 ) - 0x10000;
+
+		return nonHex ?
+
+			// Strip the backslash prefix from a non-hex escape sequence
+			nonHex :
+
+			// Replace a hexadecimal escape sequence with the encoded Unicode code point
+			// Support: IE <=11+
+			// For values outside the Basic Multilingual Plane (BMP), manually construct a
+			// surrogate pair
 			high < 0 ?
-				// BMP codepoint
 				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
 				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
 	},
 
@@ -675,7 +697,8 @@ var i,
 			}
 
 			// Control characters and (dependent upon position) numbers get escaped as code points
-			return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
+			return ch.slice( 0, -1 ) + "\\" +
+				ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
 		}
 
 		// Other potentially-special ASCII characters get backslash-escaped
@@ -700,18 +723,20 @@ var i,
 // Optimize for push.apply( _, NodeList )
 try {
 	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
+		( arr = slice.call( preferredDoc.childNodes ) ),
 		preferredDoc.childNodes
 	);
+
 	// Support: Android<4.0
 	// Detect silently failing push.apply
+	// eslint-disable-next-line no-unused-expressions
 	arr[ preferredDoc.childNodes.length ].nodeType;
 } catch ( e ) {
 	push = { apply: arr.length ?
 
 		// Leverage slice if possible
 		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
+			pushNative.apply( target, slice.call( els ) );
 		} :
 
 		// Support: IE<9
@@ -719,8 +744,9 @@ try {
 		function( target, els ) {
 			var j = target.length,
 				i = 0;
+
 			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
+			while ( ( target[ j++ ] = els[ i++ ] ) ) {}
 			target.length = j - 1;
 		}
 	};
@@ -744,24 +770,21 @@ function Sizzle( selector, context, results, seed ) {
 
 	// Try to shortcut find operations (as opposed to filters) in HTML documents
 	if ( !seed ) {
-
-		if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-			setDocument( context );
-		}
+		setDocument( context );
 		context = context || document;
 
 		if ( documentIsHTML ) {
 
 			// If the selector is sufficiently simple, try using a "get*By*" DOM method
 			// (excepting DocumentFragment context, where the methods don't exist)
-			if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
+			if ( nodeType !== 11 && ( match = rquickExpr.exec( selector ) ) ) {
 
 				// ID selector
-				if ( (m = match[1]) ) {
+				if ( ( m = match[ 1 ] ) ) {
 
 					// Document context
 					if ( nodeType === 9 ) {
-						if ( (elem = context.getElementById( m )) ) {
+						if ( ( elem = context.getElementById( m ) ) ) {
 
 							// Support: IE, Opera, Webkit
 							// TODO: identify versions
@@ -780,7 +803,7 @@ function Sizzle( selector, context, results, seed ) {
 						// Support: IE, Opera, Webkit
 						// TODO: identify versions
 						// getElementById can match elements by name instead of ID
-						if ( newContext && (elem = newContext.getElementById( m )) &&
+						if ( newContext && ( elem = newContext.getElementById( m ) ) &&
 							contains( context, elem ) &&
 							elem.id === m ) {
 
@@ -790,12 +813,12 @@ function Sizzle( selector, context, results, seed ) {
 					}
 
 				// Type selector
-				} else if ( match[2] ) {
+				} else if ( match[ 2 ] ) {
 					push.apply( results, context.getElementsByTagName( selector ) );
 					return results;
 
 				// Class selector
-				} else if ( (m = match[3]) && support.getElementsByClassName &&
+				} else if ( ( m = match[ 3 ] ) && support.getElementsByClassName &&
 					context.getElementsByClassName ) {
 
 					push.apply( results, context.getElementsByClassName( m ) );
@@ -806,11 +829,11 @@ function Sizzle( selector, context, results, seed ) {
 			// Take advantage of querySelectorAll
 			if ( support.qsa &&
 				!nonnativeSelectorCache[ selector + " " ] &&
-				(!rbuggyQSA || !rbuggyQSA.test( selector )) &&
+				( !rbuggyQSA || !rbuggyQSA.test( selector ) ) &&
 
 				// Support: IE 8 only
 				// Exclude object elements
-				(nodeType !== 1 || context.nodeName.toLowerCase() !== "object") ) {
+				( nodeType !== 1 || context.nodeName.toLowerCase() !== "object" ) ) {
 
 				newSelector = selector;
 				newContext = context;
@@ -819,27 +842,36 @@ function Sizzle( selector, context, results, seed ) {
 				// descendant combinators, which is not what we want.
 				// In such cases, we work around the behavior by prefixing every selector in the
 				// list with an ID selector referencing the scope context.
+				// The technique has to be used as well when a leading combinator is used
+				// as such selectors are not recognized by querySelectorAll.
 				// Thanks to Andrew Dupont for this technique.
-				if ( nodeType === 1 && rdescend.test( selector ) ) {
+				if ( nodeType === 1 &&
+					( rdescend.test( selector ) || rcombinators.test( selector ) ) ) {
 
-					// Capture the context ID, setting it first if necessary
-					if ( (nid = context.getAttribute( "id" )) ) {
-						nid = nid.replace( rcssescape, fcssescape );
-					} else {
-						context.setAttribute( "id", (nid = expando) );
+					// Expand context for sibling selectors
+					newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
+						context;
+
+					// We can use :scope instead of the ID hack if the browser
+					// supports it & if we're not changing the context.
+					if ( newContext !== context || !support.scope ) {
+
+						// Capture the context ID, setting it first if necessary
+						if ( ( nid = context.getAttribute( "id" ) ) ) {
+							nid = nid.replace( rcssescape, fcssescape );
+						} else {
+							context.setAttribute( "id", ( nid = expando ) );
+						}
 					}
 
 					// Prefix every selector in the list
 					groups = tokenize( selector );
 					i = groups.length;
 					while ( i-- ) {
-						groups[i] = "#" + nid + " " + toSelector( groups[i] );
+						groups[ i ] = ( nid ? "#" + nid : ":scope" ) + " " +
+							toSelector( groups[ i ] );
 					}
 					newSelector = groups.join( "," );
-
-					// Expand context for sibling selectors
-					newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
-						context;
 				}
 
 				try {
@@ -872,12 +904,14 @@ function createCache() {
 	var keys = [];
 
 	function cache( key, value ) {
+
 		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
 		if ( keys.push( key + " " ) > Expr.cacheLength ) {
+
 			// Only keep the most recent entries
 			delete cache[ keys.shift() ];
 		}
-		return (cache[ key + " " ] = value);
+		return ( cache[ key + " " ] = value );
 	}
 	return cache;
 }
@@ -896,17 +930,19 @@ function markFunction( fn ) {
  * @param {Function} fn Passed the created element and returns a boolean result
  */
 function assert( fn ) {
-	var el = document.createElement("fieldset");
+	var el = document.createElement( "fieldset" );
 
 	try {
 		return !!fn( el );
-	} catch (e) {
+	} catch ( e ) {
 		return false;
 	} finally {
+
 		// Remove from its parent by default
 		if ( el.parentNode ) {
 			el.parentNode.removeChild( el );
 		}
+
 		// release memory in IE
 		el = null;
 	}
@@ -918,11 +954,11 @@ function assert( fn ) {
  * @param {Function} handler The method that will be applied
  */
 function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
+	var arr = attrs.split( "|" ),
 		i = arr.length;
 
 	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
+		Expr.attrHandle[ arr[ i ] ] = handler;
 	}
 }
 
@@ -944,7 +980,7 @@ function siblingCheck( a, b ) {
 
 	// Check if b follows a
 	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
+		while ( ( cur = cur.nextSibling ) ) {
 			if ( cur === b ) {
 				return -1;
 			}
@@ -972,7 +1008,7 @@ function createInputPseudo( type ) {
 function createButtonPseudo( type ) {
 	return function( elem ) {
 		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
+		return ( name === "input" || name === "button" ) && elem.type === type;
 	};
 }
 
@@ -1015,7 +1051,7 @@ function createDisabledPseudo( disabled ) {
 					// Where there is no isDisabled, check manually
 					/* jshint -W018 */
 					elem.isDisabled !== !disabled &&
-						inDisabledFieldset( elem ) === disabled;
+					inDisabledFieldset( elem ) === disabled;
 			}
 
 			return elem.disabled === disabled;
@@ -1037,21 +1073,21 @@ function createDisabledPseudo( disabled ) {
  * @param {Function} fn
  */
 function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
+	return markFunction( function( argument ) {
 		argument = +argument;
-		return markFunction(function( seed, matches ) {
+		return markFunction( function( seed, matches ) {
 			var j,
 				matchIndexes = fn( [], seed.length, argument ),
 				i = matchIndexes.length;
 
 			// Match elements found at the specified indexes
 			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
+				if ( seed[ ( j = matchIndexes[ i ] ) ] ) {
+					seed[ j ] = !( matches[ j ] = seed[ j ] );
 				}
 			}
-		});
-	});
+		} );
+	} );
 }
 
 /**
@@ -1073,7 +1109,7 @@ support = Sizzle.support = {};
  */
 isXML = Sizzle.isXML = function( elem ) {
 	var namespace = elem.namespaceURI,
-		docElem = (elem.ownerDocument || elem).documentElement;
+		docElem = ( elem.ownerDocument || elem ).documentElement;
 
 	// Support: IE <=8
 	// Assume HTML when documentElement doesn't yet exist, such as inside loading iframes
@@ -1091,7 +1127,11 @@ setDocument = Sizzle.setDocument = function( node ) {
 		doc = node ? node.ownerDocument || node : preferredDoc;
 
 	// Return early if doc is invalid or already selected
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
+	// Support: IE 11+, Edge 17 - 18+
+	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+	// two documents; shallow comparisons work.
+	// eslint-disable-next-line eqeqeq
+	if ( doc == document || doc.nodeType !== 9 || !doc.documentElement ) {
 		return document;
 	}
 
@@ -1100,10 +1140,14 @@ setDocument = Sizzle.setDocument = function( node ) {
 	docElem = document.documentElement;
 	documentIsHTML = !isXML( document );
 
-	// Support: IE 9-11, Edge
+	// Support: IE 9 - 11+, Edge 12 - 18+
 	// Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
-	if ( preferredDoc !== document &&
-		(subWindow = document.defaultView) && subWindow.top !== subWindow ) {
+	// Support: IE 11+, Edge 17 - 18+
+	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+	// two documents; shallow comparisons work.
+	// eslint-disable-next-line eqeqeq
+	if ( preferredDoc != document &&
+		( subWindow = document.defaultView ) && subWindow.top !== subWindow ) {
 
 		// Support: IE 11, Edge
 		if ( subWindow.addEventListener ) {
@@ -1115,25 +1159,36 @@ setDocument = Sizzle.setDocument = function( node ) {
 		}
 	}
 
+	// Support: IE 8 - 11+, Edge 12 - 18+, Chrome <=16 - 25 only, Firefox <=3.6 - 31 only,
+	// Safari 4 - 5 only, Opera <=11.6 - 12.x only
+	// IE/Edge & older browsers don't support the :scope pseudo-class.
+	// Support: Safari 6.0 only
+	// Safari 6.0 supports :scope but it's an alias of :root there.
+	support.scope = assert( function( el ) {
+		docElem.appendChild( el ).appendChild( document.createElement( "div" ) );
+		return typeof el.querySelectorAll !== "undefined" &&
+			!el.querySelectorAll( ":scope fieldset div" ).length;
+	} );
+
 	/* Attributes
 	---------------------------------------------------------------------- */
 
 	// Support: IE<8
 	// Verify that getAttribute really returns attributes and not properties
 	// (excepting IE8 booleans)
-	support.attributes = assert(function( el ) {
+	support.attributes = assert( function( el ) {
 		el.className = "i";
-		return !el.getAttribute("className");
-	});
+		return !el.getAttribute( "className" );
+	} );
 
 	/* getElement(s)By*
 	---------------------------------------------------------------------- */
 
 	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( el ) {
-		el.appendChild( document.createComment("") );
-		return !el.getElementsByTagName("*").length;
-	});
+	support.getElementsByTagName = assert( function( el ) {
+		el.appendChild( document.createComment( "" ) );
+		return !el.getElementsByTagName( "*" ).length;
+	} );
 
 	// Support: IE<9
 	support.getElementsByClassName = rnative.test( document.getElementsByClassName );
@@ -1142,38 +1197,38 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// Check if getElementById returns elements by name
 	// The broken getElementById methods don't pick up programmatically-set names,
 	// so use a roundabout getElementsByName test
-	support.getById = assert(function( el ) {
+	support.getById = assert( function( el ) {
 		docElem.appendChild( el ).id = expando;
 		return !document.getElementsByName || !document.getElementsByName( expando ).length;
-	});
+	} );
 
 	// ID filter and find
 	if ( support.getById ) {
-		Expr.filter["ID"] = function( id ) {
+		Expr.filter[ "ID" ] = function( id ) {
 			var attrId = id.replace( runescape, funescape );
 			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
+				return elem.getAttribute( "id" ) === attrId;
 			};
 		};
-		Expr.find["ID"] = function( id, context ) {
+		Expr.find[ "ID" ] = function( id, context ) {
 			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
 				var elem = context.getElementById( id );
 				return elem ? [ elem ] : [];
 			}
 		};
 	} else {
-		Expr.filter["ID"] =  function( id ) {
+		Expr.filter[ "ID" ] =  function( id ) {
 			var attrId = id.replace( runescape, funescape );
 			return function( elem ) {
 				var node = typeof elem.getAttributeNode !== "undefined" &&
-					elem.getAttributeNode("id");
+					elem.getAttributeNode( "id" );
 				return node && node.value === attrId;
 			};
 		};
 
 		// Support: IE 6 - 7 only
 		// getElementById is not reliable as a find shortcut
-		Expr.find["ID"] = function( id, context ) {
+		Expr.find[ "ID" ] = function( id, context ) {
 			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
 				var node, i, elems,
 					elem = context.getElementById( id );
@@ -1181,7 +1236,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 				if ( elem ) {
 
 					// Verify the id attribute
-					node = elem.getAttributeNode("id");
+					node = elem.getAttributeNode( "id" );
 					if ( node && node.value === id ) {
 						return [ elem ];
 					}
@@ -1189,8 +1244,8 @@ setDocument = Sizzle.setDocument = function( node ) {
 					// Fall back on getElementsByName
 					elems = context.getElementsByName( id );
 					i = 0;
-					while ( (elem = elems[i++]) ) {
-						node = elem.getAttributeNode("id");
+					while ( ( elem = elems[ i++ ] ) ) {
+						node = elem.getAttributeNode( "id" );
 						if ( node && node.value === id ) {
 							return [ elem ];
 						}
@@ -1203,7 +1258,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 	}
 
 	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
+	Expr.find[ "TAG" ] = support.getElementsByTagName ?
 		function( tag, context ) {
 			if ( typeof context.getElementsByTagName !== "undefined" ) {
 				return context.getElementsByTagName( tag );
@@ -1218,12 +1273,13 @@ setDocument = Sizzle.setDocument = function( node ) {
 			var elem,
 				tmp = [],
 				i = 0,
+
 				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
 				results = context.getElementsByTagName( tag );
 
 			// Filter out possible comments
 			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
+				while ( ( elem = results[ i++ ] ) ) {
 					if ( elem.nodeType === 1 ) {
 						tmp.push( elem );
 					}
@@ -1235,7 +1291,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 		};
 
 	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
+	Expr.find[ "CLASS" ] = support.getElementsByClassName && function( className, context ) {
 		if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
 			return context.getElementsByClassName( className );
 		}
@@ -1256,10 +1312,14 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// See https://bugs.jquery.com/ticket/13378
 	rbuggyQSA = [];
 
-	if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
+	if ( ( support.qsa = rnative.test( document.querySelectorAll ) ) ) {
+
 		// Build QSA regex
 		// Regex strategy adopted from Diego Perini
-		assert(function( el ) {
+		assert( function( el ) {
+
+			var input;
+
 			// Select is set to empty string on purpose
 			// This is to test IE's treatment of not explicitly
 			// setting a boolean content attribute,
@@ -1273,78 +1333,98 @@ setDocument = Sizzle.setDocument = function( node ) {
 			// Nothing should be selected when empty strings follow ^= or $= or *=
 			// The test attribute must be unknown in Opera but "safe" for WinRT
 			// https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( el.querySelectorAll("[msallowcapture^='']").length ) {
+			if ( el.querySelectorAll( "[msallowcapture^='']" ).length ) {
 				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
 			}
 
 			// Support: IE8
 			// Boolean attributes and "value" are not treated correctly
-			if ( !el.querySelectorAll("[selected]").length ) {
+			if ( !el.querySelectorAll( "[selected]" ).length ) {
 				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
 			}
 
 			// Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
 			if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
-				rbuggyQSA.push("~=");
+				rbuggyQSA.push( "~=" );
+			}
+
+			// Support: IE 11+, Edge 15 - 18+
+			// IE 11/Edge don't find elements on a `[name='']` query in some cases.
+			// Adding a temporary attribute to the document before the selection works
+			// around the issue.
+			// Interestingly, IE 10 & older don't seem to have the issue.
+			input = document.createElement( "input" );
+			input.setAttribute( "name", "" );
+			el.appendChild( input );
+			if ( !el.querySelectorAll( "[name='']" ).length ) {
+				rbuggyQSA.push( "\\[" + whitespace + "*name" + whitespace + "*=" +
+					whitespace + "*(?:''|\"\")" );
 			}
 
 			// Webkit/Opera - :checked should return selected option elements
 			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
 			// IE8 throws error here and will not see later tests
-			if ( !el.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
+			if ( !el.querySelectorAll( ":checked" ).length ) {
+				rbuggyQSA.push( ":checked" );
 			}
 
 			// Support: Safari 8+, iOS 8+
 			// https://bugs.webkit.org/show_bug.cgi?id=136851
 			// In-page `selector#id sibling-combinator selector` fails
 			if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) {
-				rbuggyQSA.push(".#.+[+~]");
+				rbuggyQSA.push( ".#.+[+~]" );
 			}
-		});
 
-		assert(function( el ) {
+			// Support: Firefox <=3.6 - 5 only
+			// Old Firefox doesn't throw on a badly-escaped identifier.
+			el.querySelectorAll( "\\\f" );
+			rbuggyQSA.push( "[\\r\\n\\f]" );
+		} );
+
+		assert( function( el ) {
 			el.innerHTML = "<a href='' disabled='disabled'></a>" +
 				"<select disabled='disabled'><option/></select>";
 
 			// Support: Windows 8 Native Apps
 			// The type and name attributes are restricted during .innerHTML assignment
-			var input = document.createElement("input");
+			var input = document.createElement( "input" );
 			input.setAttribute( "type", "hidden" );
 			el.appendChild( input ).setAttribute( "name", "D" );
 
 			// Support: IE8
 			// Enforce case-sensitivity of name attribute
-			if ( el.querySelectorAll("[name=d]").length ) {
+			if ( el.querySelectorAll( "[name=d]" ).length ) {
 				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
 			}
 
 			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
 			// IE8 throws error here and will not see later tests
-			if ( el.querySelectorAll(":enabled").length !== 2 ) {
+			if ( el.querySelectorAll( ":enabled" ).length !== 2 ) {
 				rbuggyQSA.push( ":enabled", ":disabled" );
 			}
 
 			// Support: IE9-11+
 			// IE's :disabled selector does not pick up the children of disabled fieldsets
 			docElem.appendChild( el ).disabled = true;
-			if ( el.querySelectorAll(":disabled").length !== 2 ) {
+			if ( el.querySelectorAll( ":disabled" ).length !== 2 ) {
 				rbuggyQSA.push( ":enabled", ":disabled" );
 			}
 
+			// Support: Opera 10 - 11 only
 			// Opera 10-11 does not throw on post-comma invalid pseudos
-			el.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
+			el.querySelectorAll( "*,:x" );
+			rbuggyQSA.push( ",.*:" );
+		} );
 	}
 
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
+	if ( ( support.matchesSelector = rnative.test( ( matches = docElem.matches ||
 		docElem.webkitMatchesSelector ||
 		docElem.mozMatchesSelector ||
 		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
+		docElem.msMatchesSelector ) ) ) ) {
+
+		assert( function( el ) {
 
-		assert(function( el ) {
 			// Check to see if it's possible to do matchesSelector
 			// on a disconnected node (IE 9)
 			support.disconnectedMatch = matches.call( el, "*" );
@@ -1353,11 +1433,11 @@ setDocument = Sizzle.setDocument = function( node ) {
 			// Gecko does not error, returns false instead
 			matches.call( el, "[s!='']:x" );
 			rbuggyMatches.push( "!=", pseudos );
-		});
+		} );
 	}
 
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
+	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join( "|" ) );
+	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join( "|" ) );
 
 	/* Contains
 	---------------------------------------------------------------------- */
@@ -1374,11 +1454,11 @@ setDocument = Sizzle.setDocument = function( node ) {
 				adown.contains ?
 					adown.contains( bup ) :
 					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
+			) );
 		} :
 		function( a, b ) {
 			if ( b ) {
-				while ( (b = b.parentNode) ) {
+				while ( ( b = b.parentNode ) ) {
 					if ( b === a ) {
 						return true;
 					}
@@ -1407,7 +1487,11 @@ setDocument = Sizzle.setDocument = function( node ) {
 		}
 
 		// Calculate position if both inputs belong to the same document
-		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
+		// Support: IE 11+, Edge 17 - 18+
+		// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+		// two documents; shallow comparisons work.
+		// eslint-disable-next-line eqeqeq
+		compare = ( a.ownerDocument || a ) == ( b.ownerDocument || b ) ?
 			a.compareDocumentPosition( b ) :
 
 			// Otherwise we know they are disconnected
@@ -1415,13 +1499,24 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 		// Disconnected nodes
 		if ( compare & 1 ||
-			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
+			( !support.sortDetached && b.compareDocumentPosition( a ) === compare ) ) {
 
 			// Choose the first element that is related to our preferred document
-			if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
+			// Support: IE 11+, Edge 17 - 18+
+			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+			// two documents; shallow comparisons work.
+			// eslint-disable-next-line eqeqeq
+			if ( a == document || a.ownerDocument == preferredDoc &&
+				contains( preferredDoc, a ) ) {
 				return -1;
 			}
-			if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
+
+			// Support: IE 11+, Edge 17 - 18+
+			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+			// two documents; shallow comparisons work.
+			// eslint-disable-next-line eqeqeq
+			if ( b == document || b.ownerDocument == preferredDoc &&
+				contains( preferredDoc, b ) ) {
 				return 1;
 			}
 
@@ -1434,6 +1529,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 		return compare & 4 ? -1 : 1;
 	} :
 	function( a, b ) {
+
 		// Exit early if the nodes are identical
 		if ( a === b ) {
 			hasDuplicate = true;
@@ -1449,8 +1545,14 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 		// Parentless nodes are either documents or disconnected
 		if ( !aup || !bup ) {
-			return a === document ? -1 :
-				b === document ? 1 :
+
+			// Support: IE 11+, Edge 17 - 18+
+			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+			// two documents; shallow comparisons work.
+			/* eslint-disable eqeqeq */
+			return a == document ? -1 :
+				b == document ? 1 :
+				/* eslint-enable eqeqeq */
 				aup ? -1 :
 				bup ? 1 :
 				sortInput ?
@@ -1464,26 +1566,32 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 		// Otherwise we need full lists of their ancestors for comparison
 		cur = a;
-		while ( (cur = cur.parentNode) ) {
+		while ( ( cur = cur.parentNode ) ) {
 			ap.unshift( cur );
 		}
 		cur = b;
-		while ( (cur = cur.parentNode) ) {
+		while ( ( cur = cur.parentNode ) ) {
 			bp.unshift( cur );
 		}
 
 		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
+		while ( ap[ i ] === bp[ i ] ) {
 			i++;
 		}
 
 		return i ?
+
 			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
+			siblingCheck( ap[ i ], bp[ i ] ) :
 
 			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
+			// Support: IE 11+, Edge 17 - 18+
+			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+			// two documents; shallow comparisons work.
+			/* eslint-disable eqeqeq */
+			ap[ i ] == preferredDoc ? -1 :
+			bp[ i ] == preferredDoc ? 1 :
+			/* eslint-enable eqeqeq */
 			0;
 	};
 
@@ -1495,10 +1603,7 @@ Sizzle.matches = function( expr, elements ) {
 };
 
 Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
+	setDocument( elem );
 
 	if ( support.matchesSelector && documentIsHTML &&
 		!nonnativeSelectorCache[ expr + " " ] &&
@@ -1510,12 +1615,13 @@ Sizzle.matchesSelector = function( elem, expr ) {
 
 			// IE 9's matchesSelector returns false on disconnected nodes
 			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
+
+				// As well, disconnected nodes are said to be in a document
+				// fragment in IE 9
+				elem.document && elem.document.nodeType !== 11 ) {
 				return ret;
 			}
-		} catch (e) {
+		} catch ( e ) {
 			nonnativeSelectorCache( expr, true );
 		}
 	}
@@ -1524,20 +1630,31 @@ Sizzle.matchesSelector = function( elem, expr ) {
 };
 
 Sizzle.contains = function( context, elem ) {
+
 	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
+	// Support: IE 11+, Edge 17 - 18+
+	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+	// two documents; shallow comparisons work.
+	// eslint-disable-next-line eqeqeq
+	if ( ( context.ownerDocument || context ) != document ) {
 		setDocument( context );
 	}
 	return contains( context, elem );
 };
 
 Sizzle.attr = function( elem, name ) {
+
 	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
+	// Support: IE 11+, Edge 17 - 18+
+	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+	// two documents; shallow comparisons work.
+	// eslint-disable-next-line eqeqeq
+	if ( ( elem.ownerDocument || elem ) != document ) {
 		setDocument( elem );
 	}
 
 	var fn = Expr.attrHandle[ name.toLowerCase() ],
+
 		// Don't get fooled by Object.prototype properties (jQuery #13807)
 		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
 			fn( elem, name, !documentIsHTML ) :
@@ -1547,13 +1664,13 @@ Sizzle.attr = function( elem, name ) {
 		val :
 		support.attributes || !documentIsHTML ?
 			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
+			( val = elem.getAttributeNode( name ) ) && val.specified ?
 				val.value :
 				null;
 };
 
 Sizzle.escape = function( sel ) {
-	return (sel + "").replace( rcssescape, fcssescape );
+	return ( sel + "" ).replace( rcssescape, fcssescape );
 };
 
 Sizzle.error = function( msg ) {
@@ -1576,7 +1693,7 @@ Sizzle.uniqueSort = function( results ) {
 	results.sort( sortOrder );
 
 	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
+		while ( ( elem = results[ i++ ] ) ) {
 			if ( elem === results[ i ] ) {
 				j = duplicates.push( i );
 			}
@@ -1604,17 +1721,21 @@ getText = Sizzle.getText = function( elem ) {
 		nodeType = elem.nodeType;
 
 	if ( !nodeType ) {
+
 		// If no nodeType, this is expected to be an array
-		while ( (node = elem[i++]) ) {
+		while ( ( node = elem[ i++ ] ) ) {
+
 			// Do not traverse comment nodes
 			ret += getText( node );
 		}
 	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+
 		// Use textContent for elements
 		// innerText usage removed for consistency of new lines (jQuery #11153)
 		if ( typeof elem.textContent === "string" ) {
 			return elem.textContent;
 		} else {
+
 			// Traverse its children
 			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
 				ret += getText( elem );
@@ -1623,6 +1744,7 @@ getText = Sizzle.getText = function( elem ) {
 	} else if ( nodeType === 3 || nodeType === 4 ) {
 		return elem.nodeValue;
 	}
+
 	// Do not include comment or processing instruction nodes
 
 	return ret;
@@ -1650,19 +1772,21 @@ Expr = Sizzle.selectors = {
 
 	preFilter: {
 		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
+			match[ 1 ] = match[ 1 ].replace( runescape, funescape );
 
 			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
+			match[ 3 ] = ( match[ 3 ] || match[ 4 ] ||
+				match[ 5 ] || "" ).replace( runescape, funescape );
 
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
+			if ( match[ 2 ] === "~=" ) {
+				match[ 3 ] = " " + match[ 3 ] + " ";
 			}
 
 			return match.slice( 0, 4 );
 		},
 
 		"CHILD": function( match ) {
+
 			/* matches from matchExpr["CHILD"]
 				1 type (only|nth|...)
 				2 what (child|of-type)
@@ -1673,22 +1797,25 @@ Expr = Sizzle.selectors = {
 				7 sign of y-component
 				8 y of y-component
 			*/
-			match[1] = match[1].toLowerCase();
+			match[ 1 ] = match[ 1 ].toLowerCase();
+
+			if ( match[ 1 ].slice( 0, 3 ) === "nth" ) {
 
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
 				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
+				if ( !match[ 3 ] ) {
+					Sizzle.error( match[ 0 ] );
 				}
 
 				// numeric x and y parameters for Expr.filter.CHILD
 				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
+				match[ 4 ] = +( match[ 4 ] ?
+					match[ 5 ] + ( match[ 6 ] || 1 ) :
+					2 * ( match[ 3 ] === "even" || match[ 3 ] === "odd" ) );
+				match[ 5 ] = +( ( match[ 7 ] + match[ 8 ] ) || match[ 3 ] === "odd" );
 
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
+				// other types prohibit arguments
+			} else if ( match[ 3 ] ) {
+				Sizzle.error( match[ 0 ] );
 			}
 
 			return match;
@@ -1696,26 +1823,28 @@ Expr = Sizzle.selectors = {
 
 		"PSEUDO": function( match ) {
 			var excess,
-				unquoted = !match[6] && match[2];
+				unquoted = !match[ 6 ] && match[ 2 ];
 
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
+			if ( matchExpr[ "CHILD" ].test( match[ 0 ] ) ) {
 				return null;
 			}
 
 			// Accept quoted arguments as-is
-			if ( match[3] ) {
-				match[2] = match[4] || match[5] || "";
+			if ( match[ 3 ] ) {
+				match[ 2 ] = match[ 4 ] || match[ 5 ] || "";
 
 			// Strip excess characters from unquoted arguments
 			} else if ( unquoted && rpseudo.test( unquoted ) &&
+
 				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
+				( excess = tokenize( unquoted, true ) ) &&
+
 				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+				( excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length ) ) {
 
 				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
+				match[ 0 ] = match[ 0 ].slice( 0, excess );
+				match[ 2 ] = unquoted.slice( 0, excess );
 			}
 
 			// Return only captures needed by the pseudo filter method (type and argument)
@@ -1728,7 +1857,9 @@ Expr = Sizzle.selectors = {
 		"TAG": function( nodeNameSelector ) {
 			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
 			return nodeNameSelector === "*" ?
-				function() { return true; } :
+				function() {
+					return true;
+				} :
 				function( elem ) {
 					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
 				};
@@ -1738,10 +1869,16 @@ Expr = Sizzle.selectors = {
 			var pattern = classCache[ className + " " ];
 
 			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
-				});
+				( pattern = new RegExp( "(^|" + whitespace +
+					")" + className + "(" + whitespace + "|$)" ) ) && classCache(
+						className, function( elem ) {
+							return pattern.test(
+								typeof elem.className === "string" && elem.className ||
+								typeof elem.getAttribute !== "undefined" &&
+									elem.getAttribute( "class" ) ||
+								""
+							);
+				} );
 		},
 
 		"ATTR": function( name, operator, check ) {
@@ -1757,6 +1894,8 @@ Expr = Sizzle.selectors = {
 
 				result += "";
 
+				/* eslint-disable max-len */
+
 				return operator === "=" ? result === check :
 					operator === "!=" ? result !== check :
 					operator === "^=" ? check && result.indexOf( check ) === 0 :
@@ -1765,10 +1904,12 @@ Expr = Sizzle.selectors = {
 					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
 					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
 					false;
+				/* eslint-enable max-len */
+
 			};
 		},
 
-		"CHILD": function( type, what, argument, first, last ) {
+		"CHILD": function( type, what, _argument, first, last ) {
 			var simple = type.slice( 0, 3 ) !== "nth",
 				forward = type.slice( -4 ) !== "last",
 				ofType = what === "of-type";
@@ -1780,7 +1921,7 @@ Expr = Sizzle.selectors = {
 					return !!elem.parentNode;
 				} :
 
-				function( elem, context, xml ) {
+				function( elem, _context, xml ) {
 					var cache, uniqueCache, outerCache, node, nodeIndex, start,
 						dir = simple !== forward ? "nextSibling" : "previousSibling",
 						parent = elem.parentNode,
@@ -1794,7 +1935,7 @@ Expr = Sizzle.selectors = {
 						if ( simple ) {
 							while ( dir ) {
 								node = elem;
-								while ( (node = node[ dir ]) ) {
+								while ( ( node = node[ dir ] ) ) {
 									if ( ofType ?
 										node.nodeName.toLowerCase() === name :
 										node.nodeType === 1 ) {
@@ -1802,6 +1943,7 @@ Expr = Sizzle.selectors = {
 										return false;
 									}
 								}
+
 								// Reverse direction for :only-* (if we haven't yet done so)
 								start = dir = type === "only" && !start && "nextSibling";
 							}
@@ -1817,22 +1959,22 @@ Expr = Sizzle.selectors = {
 
 							// ...in a gzip-friendly way
 							node = parent;
-							outerCache = node[ expando ] || (node[ expando ] = {});
+							outerCache = node[ expando ] || ( node[ expando ] = {} );
 
 							// Support: IE <9 only
 							// Defend against cloned attroperties (jQuery gh-1709)
 							uniqueCache = outerCache[ node.uniqueID ] ||
-								(outerCache[ node.uniqueID ] = {});
+								( outerCache[ node.uniqueID ] = {} );
 
 							cache = uniqueCache[ type ] || [];
 							nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
 							diff = nodeIndex && cache[ 2 ];
 							node = nodeIndex && parent.childNodes[ nodeIndex ];
 
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
+							while ( ( node = ++nodeIndex && node && node[ dir ] ||
 
 								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
+								( diff = nodeIndex = 0 ) || start.pop() ) ) {
 
 								// When found, cache indexes on `parent` and break
 								if ( node.nodeType === 1 && ++diff && node === elem ) {
@@ -1842,16 +1984,18 @@ Expr = Sizzle.selectors = {
 							}
 
 						} else {
+
 							// Use previously-cached element index if available
 							if ( useCache ) {
+
 								// ...in a gzip-friendly way
 								node = elem;
-								outerCache = node[ expando ] || (node[ expando ] = {});
+								outerCache = node[ expando ] || ( node[ expando ] = {} );
 
 								// Support: IE <9 only
 								// Defend against cloned attroperties (jQuery gh-1709)
 								uniqueCache = outerCache[ node.uniqueID ] ||
-									(outerCache[ node.uniqueID ] = {});
+									( outerCache[ node.uniqueID ] = {} );
 
 								cache = uniqueCache[ type ] || [];
 								nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
@@ -1861,9 +2005,10 @@ Expr = Sizzle.selectors = {
 							// xml :nth-child(...)
 							// or :nth-last-child(...) or :nth(-last)?-of-type(...)
 							if ( diff === false ) {
+
 								// Use the same loop as above to seek `elem` from the start
-								while ( (node = ++nodeIndex && node && node[ dir ] ||
-									(diff = nodeIndex = 0) || start.pop()) ) {
+								while ( ( node = ++nodeIndex && node && node[ dir ] ||
+									( diff = nodeIndex = 0 ) || start.pop() ) ) {
 
 									if ( ( ofType ?
 										node.nodeName.toLowerCase() === name :
@@ -1872,12 +2017,13 @@ Expr = Sizzle.selectors = {
 
 										// Cache the index of each encountered element
 										if ( useCache ) {
-											outerCache = node[ expando ] || (node[ expando ] = {});
+											outerCache = node[ expando ] ||
+												( node[ expando ] = {} );
 
 											// Support: IE <9 only
 											// Defend against cloned attroperties (jQuery gh-1709)
 											uniqueCache = outerCache[ node.uniqueID ] ||
-												(outerCache[ node.uniqueID ] = {});
+												( outerCache[ node.uniqueID ] = {} );
 
 											uniqueCache[ type ] = [ dirruns, diff ];
 										}
@@ -1898,6 +2044,7 @@ Expr = Sizzle.selectors = {
 		},
 
 		"PSEUDO": function( pseudo, argument ) {
+
 			// pseudo-class names are case-insensitive
 			// http://www.w3.org/TR/selectors/#pseudo-classes
 			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
@@ -1917,15 +2064,15 @@ Expr = Sizzle.selectors = {
 			if ( fn.length > 1 ) {
 				args = [ pseudo, pseudo, "", argument ];
 				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
+					markFunction( function( seed, matches ) {
 						var idx,
 							matched = fn( seed, argument ),
 							i = matched.length;
 						while ( i-- ) {
-							idx = indexOf( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
+							idx = indexOf( seed, matched[ i ] );
+							seed[ idx ] = !( matches[ idx ] = matched[ i ] );
 						}
-					}) :
+					} ) :
 					function( elem ) {
 						return fn( elem, 0, args );
 					};
@@ -1936,8 +2083,10 @@ Expr = Sizzle.selectors = {
 	},
 
 	pseudos: {
+
 		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
+		"not": markFunction( function( selector ) {
+
 			// Trim the selector passed to compile
 			// to avoid treating leading and trailing
 			// spaces as combinators
@@ -1946,39 +2095,40 @@ Expr = Sizzle.selectors = {
 				matcher = compile( selector.replace( rtrim, "$1" ) );
 
 			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
+				markFunction( function( seed, matches, _context, xml ) {
 					var elem,
 						unmatched = matcher( seed, null, xml, [] ),
 						i = seed.length;
 
 					// Match elements unmatched by `matcher`
 					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
+						if ( ( elem = unmatched[ i ] ) ) {
+							seed[ i ] = !( matches[ i ] = elem );
 						}
 					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
+				} ) :
+				function( elem, _context, xml ) {
+					input[ 0 ] = elem;
 					matcher( input, null, xml, results );
+
 					// Don't keep the element (issue #299)
-					input[0] = null;
+					input[ 0 ] = null;
 					return !results.pop();
 				};
-		}),
+		} ),
 
-		"has": markFunction(function( selector ) {
+		"has": markFunction( function( selector ) {
 			return function( elem ) {
 				return Sizzle( selector, elem ).length > 0;
 			};
-		}),
+		} ),
 
-		"contains": markFunction(function( text ) {
+		"contains": markFunction( function( text ) {
 			text = text.replace( runescape, funescape );
 			return function( elem ) {
 				return ( elem.textContent || getText( elem ) ).indexOf( text ) > -1;
 			};
-		}),
+		} ),
 
 		// "Whether an element is represented by a :lang() selector
 		// is based solely on the element's language value
@@ -1988,25 +2138,26 @@ Expr = Sizzle.selectors = {
 		// The identifier C does not have to be a valid language name."
 		// http://www.w3.org/TR/selectors/#lang-pseudo
 		"lang": markFunction( function( lang ) {
+
 			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
+			if ( !ridentifier.test( lang || "" ) ) {
 				Sizzle.error( "unsupported lang: " + lang );
 			}
 			lang = lang.replace( runescape, funescape ).toLowerCase();
 			return function( elem ) {
 				var elemLang;
 				do {
-					if ( (elemLang = documentIsHTML ?
+					if ( ( elemLang = documentIsHTML ?
 						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
+						elem.getAttribute( "xml:lang" ) || elem.getAttribute( "lang" ) ) ) {
 
 						elemLang = elemLang.toLowerCase();
 						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
 					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
+				} while ( ( elem = elem.parentNode ) && elem.nodeType === 1 );
 				return false;
 			};
-		}),
+		} ),
 
 		// Miscellaneous
 		"target": function( elem ) {
@@ -2019,7 +2170,9 @@ Expr = Sizzle.selectors = {
 		},
 
 		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+			return elem === document.activeElement &&
+				( !document.hasFocus || document.hasFocus() ) &&
+				!!( elem.type || elem.href || ~elem.tabIndex );
 		},
 
 		// Boolean properties
@@ -2027,16 +2180,20 @@ Expr = Sizzle.selectors = {
 		"disabled": createDisabledPseudo( true ),
 
 		"checked": function( elem ) {
+
 			// In CSS3, :checked should return both checked and selected elements
 			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
 			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+			return ( nodeName === "input" && !!elem.checked ) ||
+				( nodeName === "option" && !!elem.selected );
 		},
 
 		"selected": function( elem ) {
+
 			// Accessing this property makes selected-by-default
 			// options in Safari work properly
 			if ( elem.parentNode ) {
+				// eslint-disable-next-line no-unused-expressions
 				elem.parentNode.selectedIndex;
 			}
 
@@ -2045,6 +2202,7 @@ Expr = Sizzle.selectors = {
 
 		// Contents
 		"empty": function( elem ) {
+
 			// http://www.w3.org/TR/selectors/#empty-pseudo
 			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
 			//   but not by others (comment: 8; processing instruction: 7; etc.)
@@ -2058,7 +2216,7 @@ Expr = Sizzle.selectors = {
 		},
 
 		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
+			return !Expr.pseudos[ "empty" ]( elem );
 		},
 
 		// Element/input types
@@ -2082,39 +2240,40 @@ Expr = Sizzle.selectors = {
 
 				// Support: IE<8
 				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
+				( ( attr = elem.getAttribute( "type" ) ) == null ||
+					attr.toLowerCase() === "text" );
 		},
 
 		// Position-in-collection
-		"first": createPositionalPseudo(function() {
+		"first": createPositionalPseudo( function() {
 			return [ 0 ];
-		}),
+		} ),
 
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
+		"last": createPositionalPseudo( function( _matchIndexes, length ) {
 			return [ length - 1 ];
-		}),
+		} ),
 
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
+		"eq": createPositionalPseudo( function( _matchIndexes, length, argument ) {
 			return [ argument < 0 ? argument + length : argument ];
-		}),
+		} ),
 
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
+		"even": createPositionalPseudo( function( matchIndexes, length ) {
 			var i = 0;
 			for ( ; i < length; i += 2 ) {
 				matchIndexes.push( i );
 			}
 			return matchIndexes;
-		}),
+		} ),
 
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
+		"odd": createPositionalPseudo( function( matchIndexes, length ) {
 			var i = 1;
 			for ( ; i < length; i += 2 ) {
 				matchIndexes.push( i );
 			}
 			return matchIndexes;
-		}),
+		} ),
 
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+		"lt": createPositionalPseudo( function( matchIndexes, length, argument ) {
 			var i = argument < 0 ?
 				argument + length :
 				argument > length ?
@@ -2124,19 +2283,19 @@ Expr = Sizzle.selectors = {
 				matchIndexes.push( i );
 			}
 			return matchIndexes;
-		}),
+		} ),
 
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+		"gt": createPositionalPseudo( function( matchIndexes, length, argument ) {
 			var i = argument < 0 ? argument + length : argument;
 			for ( ; ++i < length; ) {
 				matchIndexes.push( i );
 			}
 			return matchIndexes;
-		})
+		} )
 	}
 };
 
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
+Expr.pseudos[ "nth" ] = Expr.pseudos[ "eq" ];
 
 // Add button/input type pseudos
 for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
@@ -2167,37 +2326,39 @@ tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
 	while ( soFar ) {
 
 		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
+		if ( !matched || ( match = rcomma.exec( soFar ) ) ) {
 			if ( match ) {
+
 				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
+				soFar = soFar.slice( match[ 0 ].length ) || soFar;
 			}
-			groups.push( (tokens = []) );
+			groups.push( ( tokens = [] ) );
 		}
 
 		matched = false;
 
 		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
+		if ( ( match = rcombinators.exec( soFar ) ) ) {
 			matched = match.shift();
-			tokens.push({
+			tokens.push( {
 				value: matched,
+
 				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
+				type: match[ 0 ].replace( rtrim, " " )
+			} );
 			soFar = soFar.slice( matched.length );
 		}
 
 		// Filters
 		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
+			if ( ( match = matchExpr[ type ].exec( soFar ) ) && ( !preFilters[ type ] ||
+				( match = preFilters[ type ]( match ) ) ) ) {
 				matched = match.shift();
-				tokens.push({
+				tokens.push( {
 					value: matched,
 					type: type,
 					matches: match
-				});
+				} );
 				soFar = soFar.slice( matched.length );
 			}
 		}
@@ -2214,6 +2375,7 @@ tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
 		soFar.length :
 		soFar ?
 			Sizzle.error( selector ) :
+
 			// Cache the tokens
 			tokenCache( selector, groups ).slice( 0 );
 };
@@ -2223,7 +2385,7 @@ function toSelector( tokens ) {
 		len = tokens.length,
 		selector = "";
 	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
+		selector += tokens[ i ].value;
 	}
 	return selector;
 }
@@ -2236,9 +2398,10 @@ function addCombinator( matcher, combinator, base ) {
 		doneName = done++;
 
 	return combinator.first ?
+
 		// Check against closest ancestor/preceding element
 		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
+			while ( ( elem = elem[ dir ] ) ) {
 				if ( elem.nodeType === 1 || checkNonElements ) {
 					return matcher( elem, context, xml );
 				}
@@ -2253,7 +2416,7 @@ function addCombinator( matcher, combinator, base ) {
 
 			// We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
 			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
+				while ( ( elem = elem[ dir ] ) ) {
 					if ( elem.nodeType === 1 || checkNonElements ) {
 						if ( matcher( elem, context, xml ) ) {
 							return true;
@@ -2261,27 +2424,29 @@ function addCombinator( matcher, combinator, base ) {
 					}
 				}
 			} else {
-				while ( (elem = elem[ dir ]) ) {
+				while ( ( elem = elem[ dir ] ) ) {
 					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
+						outerCache = elem[ expando ] || ( elem[ expando ] = {} );
 
 						// Support: IE <9 only
 						// Defend against cloned attroperties (jQuery gh-1709)
-						uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {});
+						uniqueCache = outerCache[ elem.uniqueID ] ||
+							( outerCache[ elem.uniqueID ] = {} );
 
 						if ( skip && skip === elem.nodeName.toLowerCase() ) {
 							elem = elem[ dir ] || elem;
-						} else if ( (oldCache = uniqueCache[ key ]) &&
+						} else if ( ( oldCache = uniqueCache[ key ] ) &&
 							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
 
 							// Assign to newCache so results back-propagate to previous elements
-							return (newCache[ 2 ] = oldCache[ 2 ]);
+							return ( newCache[ 2 ] = oldCache[ 2 ] );
 						} else {
+
 							// Reuse newcache so results back-propagate to previous elements
 							uniqueCache[ key ] = newCache;
 
 							// A match means we're done; a fail means we have to keep checking
-							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
+							if ( ( newCache[ 2 ] = matcher( elem, context, xml ) ) ) {
 								return true;
 							}
 						}
@@ -2297,20 +2462,20 @@ function elementMatcher( matchers ) {
 		function( elem, context, xml ) {
 			var i = matchers.length;
 			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
+				if ( !matchers[ i ]( elem, context, xml ) ) {
 					return false;
 				}
 			}
 			return true;
 		} :
-		matchers[0];
+		matchers[ 0 ];
 }
 
 function multipleContexts( selector, contexts, results ) {
 	var i = 0,
 		len = contexts.length;
 	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
+		Sizzle( selector, contexts[ i ], results );
 	}
 	return results;
 }
@@ -2323,7 +2488,7 @@ function condense( unmatched, map, filter, context, xml ) {
 		mapped = map != null;
 
 	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
+		if ( ( elem = unmatched[ i ] ) ) {
 			if ( !filter || filter( elem, context, xml ) ) {
 				newUnmatched.push( elem );
 				if ( mapped ) {
@@ -2343,14 +2508,18 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 	if ( postFinder && !postFinder[ expando ] ) {
 		postFinder = setMatcher( postFinder, postSelector );
 	}
-	return markFunction(function( seed, results, context, xml ) {
+	return markFunction( function( seed, results, context, xml ) {
 		var temp, i, elem,
 			preMap = [],
 			postMap = [],
 			preexisting = results.length,
 
 			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+			elems = seed || multipleContexts(
+				selector || "*",
+				context.nodeType ? [ context ] : context,
+				[]
+			),
 
 			// Prefilter to get matcher input, preserving a map for seed-results synchronization
 			matcherIn = preFilter && ( seed || !selector ) ?
@@ -2358,6 +2527,7 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 				elems,
 
 			matcherOut = matcher ?
+
 				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
 				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
 
@@ -2381,8 +2551,8 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 			// Un-match failing elements by moving them back to matcherIn
 			i = temp.length;
 			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+				if ( ( elem = temp[ i ] ) ) {
+					matcherOut[ postMap[ i ] ] = !( matcherIn[ postMap[ i ] ] = elem );
 				}
 			}
 		}
@@ -2390,25 +2560,27 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 		if ( seed ) {
 			if ( postFinder || preFilter ) {
 				if ( postFinder ) {
+
 					// Get the final matcherOut by condensing this intermediate into postFinder contexts
 					temp = [];
 					i = matcherOut.length;
 					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
+						if ( ( elem = matcherOut[ i ] ) ) {
+
 							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
+							temp.push( ( matcherIn[ i ] = elem ) );
 						}
 					}
-					postFinder( null, (matcherOut = []), temp, xml );
+					postFinder( null, ( matcherOut = [] ), temp, xml );
 				}
 
 				// Move matched elements from seed to results to keep them synchronized
 				i = matcherOut.length;
 				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
+					if ( ( elem = matcherOut[ i ] ) &&
+						( temp = postFinder ? indexOf( seed, elem ) : preMap[ i ] ) > -1 ) {
 
-						seed[temp] = !(results[temp] = elem);
+						seed[ temp ] = !( results[ temp ] = elem );
 					}
 				}
 			}
@@ -2426,14 +2598,14 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 				push.apply( results, matcherOut );
 			}
 		}
-	});
+	} );
 }
 
 function matcherFromTokens( tokens ) {
 	var checkContext, matcher, j,
 		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
+		leadingRelative = Expr.relative[ tokens[ 0 ].type ],
+		implicitRelative = leadingRelative || Expr.relative[ " " ],
 		i = leadingRelative ? 1 : 0,
 
 		// The foundational matcher ensures that elements are reachable from top-level context(s)
@@ -2445,38 +2617,43 @@ function matcherFromTokens( tokens ) {
 		}, implicitRelative, true ),
 		matchers = [ function( elem, context, xml ) {
 			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
+				( checkContext = context ).nodeType ?
 					matchContext( elem, context, xml ) :
 					matchAnyContext( elem, context, xml ) );
+
 			// Avoid hanging onto element (issue #299)
 			checkContext = null;
 			return ret;
 		} ];
 
 	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
+		if ( ( matcher = Expr.relative[ tokens[ i ].type ] ) ) {
+			matchers = [ addCombinator( elementMatcher( matchers ), matcher ) ];
 		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
+			matcher = Expr.filter[ tokens[ i ].type ].apply( null, tokens[ i ].matches );
 
 			// Return special upon seeing a positional matcher
 			if ( matcher[ expando ] ) {
+
 				// Find the next relative operator (if any) for proper handling
 				j = ++i;
 				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
+					if ( Expr.relative[ tokens[ j ].type ] ) {
 						break;
 					}
 				}
 				return setMatcher(
 					i > 1 && elementMatcher( matchers ),
 					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
+
+					// If the preceding token was a descendant combinator, insert an implicit any-element `*`
+					tokens
+						.slice( 0, i - 1 )
+						.concat( { value: tokens[ i - 2 ].type === " " ? "*" : "" } )
 					).replace( rtrim, "$1" ),
 					matcher,
 					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+					j < len && matcherFromTokens( ( tokens = tokens.slice( j ) ) ),
 					j < len && toSelector( tokens )
 				);
 			}
@@ -2497,28 +2674,40 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 				unmatched = seed && [],
 				setMatched = [],
 				contextBackup = outermostContext,
+
 				// We must always have either seed elements or outermost context
-				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
+				elems = seed || byElement && Expr.find[ "TAG" ]( "*", outermost ),
+
 				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
+				dirrunsUnique = ( dirruns += contextBackup == null ? 1 : Math.random() || 0.1 ),
 				len = elems.length;
 
 			if ( outermost ) {
-				outermostContext = context === document || context || outermost;
+
+				// Support: IE 11+, Edge 17 - 18+
+				// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+				// two documents; shallow comparisons work.
+				// eslint-disable-next-line eqeqeq
+				outermostContext = context == document || context || outermost;
 			}
 
 			// Add elements passing elementMatchers directly to results
 			// Support: IE<9, Safari
 			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
-			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
+			for ( ; i !== len && ( elem = elems[ i ] ) != null; i++ ) {
 				if ( byElement && elem ) {
 					j = 0;
-					if ( !context && elem.ownerDocument !== document ) {
+
+					// Support: IE 11+, Edge 17 - 18+
+					// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+					// two documents; shallow comparisons work.
+					// eslint-disable-next-line eqeqeq
+					if ( !context && elem.ownerDocument != document ) {
 						setDocument( elem );
 						xml = !documentIsHTML;
 					}
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context || document, xml) ) {
+					while ( ( matcher = elementMatchers[ j++ ] ) ) {
+						if ( matcher( elem, context || document, xml ) ) {
 							results.push( elem );
 							break;
 						}
@@ -2530,8 +2719,9 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 
 				// Track unmatched elements for set filters
 				if ( bySet ) {
+
 					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
+					if ( ( elem = !matcher && elem ) ) {
 						matchedCount--;
 					}
 
@@ -2555,16 +2745,17 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 			// numerically zero.
 			if ( bySet && i !== matchedCount ) {
 				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
+				while ( ( matcher = setMatchers[ j++ ] ) ) {
 					matcher( unmatched, setMatched, context, xml );
 				}
 
 				if ( seed ) {
+
 					// Reintegrate element matches to eliminate the need for sorting
 					if ( matchedCount > 0 ) {
 						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
+							if ( !( unmatched[ i ] || setMatched[ i ] ) ) {
+								setMatched[ i ] = pop.call( results );
 							}
 						}
 					}
@@ -2605,13 +2796,14 @@ compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
 		cached = compilerCache[ selector + " " ];
 
 	if ( !cached ) {
+
 		// Generate a function of recursive functions that can be used to check each element
 		if ( !match ) {
 			match = tokenize( selector );
 		}
 		i = match.length;
 		while ( i-- ) {
-			cached = matcherFromTokens( match[i] );
+			cached = matcherFromTokens( match[ i ] );
 			if ( cached[ expando ] ) {
 				setMatchers.push( cached );
 			} else {
@@ -2620,7 +2812,10 @@ compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
 		}
 
 		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+		cached = compilerCache(
+			selector,
+			matcherFromGroupMatchers( elementMatchers, setMatchers )
+		);
 
 		// Save selector and tokenization
 		cached.selector = selector;
@@ -2640,7 +2835,7 @@ compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
 select = Sizzle.select = function( selector, context, results, seed ) {
 	var i, tokens, token, type, find,
 		compiled = typeof selector === "function" && selector,
-		match = !seed && tokenize( (selector = compiled.selector || selector) );
+		match = !seed && tokenize( ( selector = compiled.selector || selector ) );
 
 	results = results || [];
 
@@ -2649,11 +2844,12 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 	if ( match.length === 1 ) {
 
 		// Reduce context if the leading compound selector is an ID
-		tokens = match[0] = match[0].slice( 0 );
-		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-				context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[1].type ] ) {
+		tokens = match[ 0 ] = match[ 0 ].slice( 0 );
+		if ( tokens.length > 2 && ( token = tokens[ 0 ] ).type === "ID" &&
+			context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[ 1 ].type ] ) {
 
-			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
+			context = ( Expr.find[ "ID" ]( token.matches[ 0 ]
+				.replace( runescape, funescape ), context ) || [] )[ 0 ];
 			if ( !context ) {
 				return results;
 
@@ -2666,20 +2862,22 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 		}
 
 		// Fetch a seed set for right-to-left matching
-		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
+		i = matchExpr[ "needsContext" ].test( selector ) ? 0 : tokens.length;
 		while ( i-- ) {
-			token = tokens[i];
+			token = tokens[ i ];
 
 			// Abort if we hit a combinator
-			if ( Expr.relative[ (type = token.type) ] ) {
+			if ( Expr.relative[ ( type = token.type ) ] ) {
 				break;
 			}
-			if ( (find = Expr.find[ type ]) ) {
+			if ( ( find = Expr.find[ type ] ) ) {
+
 				// Search, expanding context for leading sibling combinators
-				if ( (seed = find(
-					token.matches[0].replace( runescape, funescape ),
-					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
-				)) ) {
+				if ( ( seed = find(
+					token.matches[ 0 ].replace( runescape, funescape ),
+					rsibling.test( tokens[ 0 ].type ) && testContext( context.parentNode ) ||
+						context
+				) ) ) {
 
 					// If seed is empty or no tokens remain, we can return early
 					tokens.splice( i, 1 );
@@ -2710,7 +2908,7 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 // One-time assignments
 
 // Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
+support.sortStable = expando.split( "" ).sort( sortOrder ).join( "" ) === expando;
 
 // Support: Chrome 14-35+
 // Always assume duplicates if they aren't passed to the comparison function
@@ -2721,58 +2919,59 @@ setDocument();
 
 // Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
 // Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( el ) {
+support.sortDetached = assert( function( el ) {
+
 	// Should return 1, but returns 4 (following)
-	return el.compareDocumentPosition( document.createElement("fieldset") ) & 1;
-});
+	return el.compareDocumentPosition( document.createElement( "fieldset" ) ) & 1;
+} );
 
 // Support: IE<8
 // Prevent attribute/property "interpolation"
 // https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( el ) {
+if ( !assert( function( el ) {
 	el.innerHTML = "<a href='#'></a>";
-	return el.firstChild.getAttribute("href") === "#" ;
-}) ) {
+	return el.firstChild.getAttribute( "href" ) === "#";
+} ) ) {
 	addHandle( "type|href|height|width", function( elem, name, isXML ) {
 		if ( !isXML ) {
 			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
 		}
-	});
+	} );
 }
 
 // Support: IE<9
 // Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( el ) {
+if ( !support.attributes || !assert( function( el ) {
 	el.innerHTML = "<input/>";
 	el.firstChild.setAttribute( "value", "" );
 	return el.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
+} ) ) {
+	addHandle( "value", function( elem, _name, isXML ) {
 		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
 			return elem.defaultValue;
 		}
-	});
+	} );
 }
 
 // Support: IE<9
 // Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( el ) {
-	return el.getAttribute("disabled") == null;
-}) ) {
+if ( !assert( function( el ) {
+	return el.getAttribute( "disabled" ) == null;
+} ) ) {
 	addHandle( booleans, function( elem, name, isXML ) {
 		var val;
 		if ( !isXML ) {
 			return elem[ name ] === true ? name.toLowerCase() :
-					(val = elem.getAttributeNode( name )) && val.specified ?
+				( val = elem.getAttributeNode( name ) ) && val.specified ?
 					val.value :
-				null;
+					null;
 		}
-	});
+	} );
 }
 
 return Sizzle;
 
-})( window );
+} )( window );
 
 
 
@@ -3141,7 +3340,7 @@ jQuery.each( {
 	parents: function( elem ) {
 		return dir( elem, "parentNode" );
 	},
-	parentsUntil: function( elem, i, until ) {
+	parentsUntil: function( elem, _i, until ) {
 		return dir( elem, "parentNode", until );
 	},
 	next: function( elem ) {
@@ -3156,10 +3355,10 @@ jQuery.each( {
 	prevAll: function( elem ) {
 		return dir( elem, "previousSibling" );
 	},
-	nextUntil: function( elem, i, until ) {
+	nextUntil: function( elem, _i, until ) {
 		return dir( elem, "nextSibling", until );
 	},
-	prevUntil: function( elem, i, until ) {
+	prevUntil: function( elem, _i, until ) {
 		return dir( elem, "previousSibling", until );
 	},
 	siblings: function( elem ) {
@@ -3169,7 +3368,13 @@ jQuery.each( {
 		return siblings( elem.firstChild );
 	},
 	contents: function( elem ) {
-		if ( typeof elem.contentDocument !== "undefined" ) {
+		if ( elem.contentDocument != null &&
+
+			// Support: IE 11+
+			// <object> elements with no `data` attribute has an object
+			// `contentDocument` with a `null` prototype.
+			getProto( elem.contentDocument ) ) {
+
 			return elem.contentDocument;
 		}
 
@@ -3512,7 +3717,7 @@ jQuery.extend( {
 					var fns = arguments;
 
 					return jQuery.Deferred( function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
+						jQuery.each( tuples, function( _i, tuple ) {
 
 							// Map tuples (progress, done, fail) to arguments (done, fail, progress)
 							var fn = isFunction( fns[ tuple[ 4 ] ] ) && fns[ tuple[ 4 ] ];
@@ -3965,7 +4170,7 @@ var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
 			// ...except when executing function values
 			} else {
 				bulk = fn;
-				fn = function( elem, key, value ) {
+				fn = function( elem, _key, value ) {
 					return bulk.call( jQuery( elem ), value );
 				};
 			}
@@ -4000,7 +4205,7 @@ var rmsPrefix = /^-ms-/,
 	rdashAlpha = /-([a-z])/g;
 
 // Used by camelCase as callback to replace()
-function fcamelCase( all, letter ) {
+function fcamelCase( _all, letter ) {
 	return letter.toUpperCase();
 }
 
@@ -4039,7 +4244,7 @@ Data.prototype = {
 
 		// If not, create one
 		if ( !value ) {
-			value = {};
+			value = Object.create( null );
 
 			// We can accept data for non-element nodes in modern browsers,
 			// but we should not, see #8335.
@@ -4528,27 +4733,6 @@ var isHiddenWithinTree = function( elem, el ) {
 			jQuery.css( elem, "display" ) === "none";
 	};
 
-var swap = function( elem, options, callback, args ) {
-	var ret, name,
-		old = {};
-
-	// Remember the old values, and insert the new ones
-	for ( name in options ) {
-		old[ name ] = elem.style[ name ];
-		elem.style[ name ] = options[ name ];
-	}
-
-	ret = callback.apply( elem, args || [] );
-
-	// Revert the old values
-	for ( name in options ) {
-		elem.style[ name ] = old[ name ];
-	}
-
-	return ret;
-};
-
-
 
 
 function adjustCSS( elem, prop, valueParts, tween ) {
@@ -4719,11 +4903,40 @@ var rscriptType = ( /^$|^module$|\/(?:java|ecma)script/i );
 
 
 
-// We have to close these tags to support XHTML (#13200)
-var wrapMap = {
+( function() {
+	var fragment = document.createDocumentFragment(),
+		div = fragment.appendChild( document.createElement( "div" ) ),
+		input = document.createElement( "input" );
+
+	// Support: Android 4.0 - 4.3 only
+	// Check state lost if the name is set (#11217)
+	// Support: Windows Web Apps (WWA)
+	// `name` and `type` must use .setAttribute for WWA (#14901)
+	input.setAttribute( "type", "radio" );
+	input.setAttribute( "checked", "checked" );
+	input.setAttribute( "name", "t" );
+
+	div.appendChild( input );
+
+	// Support: Android <=4.1 only
+	// Older WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+	// Support: IE <=11 only
+	// Make sure textarea (and checkbox) defaultValue is properly cloned
+	div.innerHTML = "<textarea>x</textarea>";
+	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
 
 	// Support: IE <=9 only
-	option: [ 1, "<select multiple='multiple'>", "</select>" ],
+	// IE <=9 replaces <option> tags with their contents when inserted outside of
+	// the select element.
+	div.innerHTML = "<option></option>";
+	support.option = !!div.lastChild;
+} )();
+
+
+// We have to close these tags to support XHTML (#13200)
+var wrapMap = {
 
 	// XHTML parsers do not magically insert elements in the
 	// same way that tag soup parsers do. So we cannot shorten
@@ -4736,12 +4949,14 @@ var wrapMap = {
 	_default: [ 0, "", "" ]
 };
 
-// Support: IE <=9 only
-wrapMap.optgroup = wrapMap.option;
-
 wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
 wrapMap.th = wrapMap.td;
 
+// Support: IE <=9 only
+if ( !support.option ) {
+	wrapMap.optgroup = wrapMap.option = [ 1, "<select multiple='multiple'>", "</select>" ];
+}
+
 
 function getAll( context, tag ) {
 
@@ -4874,32 +5089,6 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
 }
 
 
-( function() {
-	var fragment = document.createDocumentFragment(),
-		div = fragment.appendChild( document.createElement( "div" ) ),
-		input = document.createElement( "input" );
-
-	// Support: Android 4.0 - 4.3 only
-	// Check state lost if the name is set (#11217)
-	// Support: Windows Web Apps (WWA)
-	// `name` and `type` must use .setAttribute for WWA (#14901)
-	input.setAttribute( "type", "radio" );
-	input.setAttribute( "checked", "checked" );
-	input.setAttribute( "name", "t" );
-
-	div.appendChild( input );
-
-	// Support: Android <=4.1 only
-	// Older WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE <=11 only
-	// Make sure textarea (and checkbox) defaultValue is properly cloned
-	div.innerHTML = "<textarea>x</textarea>";
-	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-} )();
-
-
 var
 	rkeyEvent = /^key/,
 	rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
@@ -5008,8 +5197,8 @@ jQuery.event = {
 			special, handlers, type, namespaces, origType,
 			elemData = dataPriv.get( elem );
 
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
+		// Only attach events to objects that accept data
+		if ( !acceptData( elem ) ) {
 			return;
 		}
 
@@ -5033,7 +5222,7 @@ jQuery.event = {
 
 		// Init the element's event structure and main handler, if this is the first
 		if ( !( events = elemData.events ) ) {
-			events = elemData.events = {};
+			events = elemData.events = Object.create( null );
 		}
 		if ( !( eventHandle = elemData.handle ) ) {
 			eventHandle = elemData.handle = function( e ) {
@@ -5191,12 +5380,15 @@ jQuery.event = {
 
 	dispatch: function( nativeEvent ) {
 
-		// Make a writable jQuery.Event from the native event object
-		var event = jQuery.event.fix( nativeEvent );
-
 		var i, j, ret, matched, handleObj, handlerQueue,
 			args = new Array( arguments.length ),
-			handlers = ( dataPriv.get( this, "events" ) || {} )[ event.type ] || [],
+
+			// Make a writable jQuery.Event from the native event object
+			event = jQuery.event.fix( nativeEvent ),
+
+			handlers = (
+					dataPriv.get( this, "events" ) || Object.create( null )
+				)[ event.type ] || [],
 			special = jQuery.event.special[ event.type ] || {};
 
 		// Use the fix-ed jQuery.Event rather than the (read-only) native event
@@ -5771,13 +5963,6 @@ jQuery.fn.extend( {
 
 var
 
-	/* eslint-disable max-len */
-
-	// See https://github.com/eslint/eslint/issues/3229
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,
-
-	/* eslint-enable */
-
 	// Support: IE <=10 - 11, Edge 12 - 13 only
 	// In IE/Edge using regex groups here causes severe slowdowns.
 	// See https://connect.microsoft.com/IE/feedback/details/1736512/
@@ -5814,7 +5999,7 @@ function restoreScript( elem ) {
 }
 
 function cloneCopyEvent( src, dest ) {
-	var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events;
+	var i, l, type, pdataOld, udataOld, udataCur, events;
 
 	if ( dest.nodeType !== 1 ) {
 		return;
@@ -5822,13 +6007,11 @@ function cloneCopyEvent( src, dest ) {
 
 	// 1. Copy private data: events, handlers, etc.
 	if ( dataPriv.hasData( src ) ) {
-		pdataOld = dataPriv.access( src );
-		pdataCur = dataPriv.set( dest, pdataOld );
+		pdataOld = dataPriv.get( src );
 		events = pdataOld.events;
 
 		if ( events ) {
-			delete pdataCur.handle;
-			pdataCur.events = {};
+			dataPriv.remove( dest, "handle events" );
 
 			for ( type in events ) {
 				for ( i = 0, l = events[ type ].length; i < l; i++ ) {
@@ -5864,7 +6047,7 @@ function fixInput( src, dest ) {
 function domManip( collection, args, callback, ignored ) {
 
 	// Flatten any nested arrays
-	args = concat.apply( [], args );
+	args = flat( args );
 
 	var fragment, first, scripts, hasScripts, node, doc,
 		i = 0,
@@ -5939,7 +6122,7 @@ function domManip( collection, args, callback, ignored ) {
 							if ( jQuery._evalUrl && !node.noModule ) {
 								jQuery._evalUrl( node.src, {
 									nonce: node.nonce || node.getAttribute( "nonce" )
-								} );
+								}, doc );
 							}
 						} else {
 							DOMEval( node.textContent.replace( rcleanScript, "" ), node, doc );
@@ -5976,7 +6159,7 @@ function remove( elem, selector, keepData ) {
 
 jQuery.extend( {
 	htmlPrefilter: function( html ) {
-		return html.replace( rxhtmlTag, "<$1></$2>" );
+		return html;
 	},
 
 	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
@@ -6238,6 +6421,27 @@ var getStyles = function( elem ) {
 		return view.getComputedStyle( elem );
 	};
 
+var swap = function( elem, options, callback ) {
+	var ret, name,
+		old = {};
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.call( elem );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
+
 var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 
 
@@ -6295,7 +6499,7 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 	}
 
 	var pixelPositionVal, boxSizingReliableVal, scrollboxSizeVal, pixelBoxStylesVal,
-		reliableMarginLeftVal,
+		reliableTrDimensionsVal, reliableMarginLeftVal,
 		container = document.createElement( "div" ),
 		div = document.createElement( "div" );
 
@@ -6330,6 +6534,35 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 		scrollboxSize: function() {
 			computeStyleTests();
 			return scrollboxSizeVal;
+		},
+
+		// Support: IE 9 - 11+, Edge 15 - 18+
+		// IE/Edge misreport `getComputedStyle` of table rows with width/height
+		// set in CSS while `offset*` properties report correct values.
+		// Behavior in IE 9 is more subtle than in newer versions & it passes
+		// some versions of this test; make sure not to make it pass there!
+		reliableTrDimensions: function() {
+			var table, tr, trChild, trStyle;
+			if ( reliableTrDimensionsVal == null ) {
+				table = document.createElement( "table" );
+				tr = document.createElement( "tr" );
+				trChild = document.createElement( "div" );
+
+				table.style.cssText = "position:absolute;left:-11111px";
+				tr.style.height = "1px";
+				trChild.style.height = "9px";
+
+				documentElement
+					.appendChild( table )
+					.appendChild( tr )
+					.appendChild( trChild );
+
+				trStyle = window.getComputedStyle( tr );
+				reliableTrDimensionsVal = parseInt( trStyle.height ) > 3;
+
+				documentElement.removeChild( table );
+			}
+			return reliableTrDimensionsVal;
 		}
 	} );
 } )();
@@ -6454,7 +6687,7 @@ var
 		fontWeight: "400"
 	};
 
-function setPositiveNumber( elem, value, subtract ) {
+function setPositiveNumber( _elem, value, subtract ) {
 
 	// Any relative (+/-) values have already been
 	// normalized at this point
@@ -6559,17 +6792,26 @@ function getWidthOrHeight( elem, dimension, extra ) {
 	}
 
 
-	// Fall back to offsetWidth/offsetHeight when value is "auto"
-	// This happens for inline elements with no explicit setting (gh-3571)
-	// Support: Android <=4.1 - 4.3 only
-	// Also use offsetWidth/offsetHeight for misreported inline dimensions (gh-3602)
-	// Support: IE 9-11 only
-	// Also use offsetWidth/offsetHeight for when box sizing is unreliable
-	// We use getClientRects() to check for hidden/disconnected.
-	// In those cases, the computed value can be trusted to be border-box
+	// Support: IE 9 - 11 only
+	// Use offsetWidth/offsetHeight for when box sizing is unreliable.
+	// In those cases, the computed value can be trusted to be border-box.
 	if ( ( !support.boxSizingReliable() && isBorderBox ||
+
+		// Support: IE 10 - 11+, Edge 15 - 18+
+		// IE/Edge misreport `getComputedStyle` of table rows with width/height
+		// set in CSS while `offset*` properties report correct values.
+		// Interestingly, in some cases IE 9 doesn't suffer from this issue.
+		!support.reliableTrDimensions() && nodeName( elem, "tr" ) ||
+
+		// Fall back to offsetWidth/offsetHeight when value is "auto"
+		// This happens for inline elements with no explicit setting (gh-3571)
 		val === "auto" ||
+
+		// Support: Android <=4.1 - 4.3 only
+		// Also use offsetWidth/offsetHeight for misreported inline dimensions (gh-3602)
 		!parseFloat( val ) && jQuery.css( elem, "display", false, styles ) === "inline" ) &&
+
+		// Make sure the element is visible & connected
 		elem.getClientRects().length ) {
 
 		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
@@ -6764,7 +7006,7 @@ jQuery.extend( {
 	}
 } );
 
-jQuery.each( [ "height", "width" ], function( i, dimension ) {
+jQuery.each( [ "height", "width" ], function( _i, dimension ) {
 	jQuery.cssHooks[ dimension ] = {
 		get: function( elem, computed, extra ) {
 			if ( computed ) {
@@ -7537,7 +7779,7 @@ jQuery.fn.extend( {
 			clearQueue = type;
 			type = undefined;
 		}
-		if ( clearQueue && type !== false ) {
+		if ( clearQueue ) {
 			this.queue( type || "fx", [] );
 		}
 
@@ -7620,7 +7862,7 @@ jQuery.fn.extend( {
 	}
 } );
 
-jQuery.each( [ "toggle", "show", "hide" ], function( i, name ) {
+jQuery.each( [ "toggle", "show", "hide" ], function( _i, name ) {
 	var cssFn = jQuery.fn[ name ];
 	jQuery.fn[ name ] = function( speed, easing, callback ) {
 		return speed == null || typeof speed === "boolean" ?
@@ -7841,7 +8083,7 @@ boolHook = {
 	}
 };
 
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
+jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( _i, name ) {
 	var getter = attrHandle[ name ] || jQuery.find.attr;
 
 	attrHandle[ name ] = function( elem, name, isXML ) {
@@ -8465,7 +8707,9 @@ jQuery.extend( jQuery.event, {
 				special.bindType || type;
 
 			// jQuery handler
-			handle = ( dataPriv.get( cur, "events" ) || {} )[ event.type ] &&
+			handle = (
+					dataPriv.get( cur, "events" ) || Object.create( null )
+				)[ event.type ] &&
 				dataPriv.get( cur, "handle" );
 			if ( handle ) {
 				handle.apply( cur, data );
@@ -8576,7 +8820,10 @@ if ( !support.focusin ) {
 
 		jQuery.event.special[ fix ] = {
 			setup: function() {
-				var doc = this.ownerDocument || this,
+
+				// Handle: regular nodes (via `this.ownerDocument`), window
+				// (via `this.document`) & document (via `this`).
+				var doc = this.ownerDocument || this.document || this,
 					attaches = dataPriv.access( doc, fix );
 
 				if ( !attaches ) {
@@ -8585,7 +8832,7 @@ if ( !support.focusin ) {
 				dataPriv.access( doc, fix, ( attaches || 0 ) + 1 );
 			},
 			teardown: function() {
-				var doc = this.ownerDocument || this,
+				var doc = this.ownerDocument || this.document || this,
 					attaches = dataPriv.access( doc, fix ) - 1;
 
 				if ( !attaches ) {
@@ -8601,7 +8848,7 @@ if ( !support.focusin ) {
 }
 var location = window.location;
 
-var nonce = Date.now();
+var nonce = { guid: Date.now() };
 
 var rquery = ( /\?/ );
 
@@ -8733,7 +8980,7 @@ jQuery.fn.extend( {
 				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
 				( this.checked || !rcheckableType.test( type ) );
 		} )
-		.map( function( i, elem ) {
+		.map( function( _i, elem ) {
 			var val = jQuery( this ).val();
 
 			if ( val == null ) {
@@ -9346,7 +9593,8 @@ jQuery.extend( {
 			// Add or update anti-cache param if needed
 			if ( s.cache === false ) {
 				cacheURL = cacheURL.replace( rantiCache, "$1" );
-				uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce++ ) + uncached;
+				uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce.guid++ ) +
+					uncached;
 			}
 
 			// Put hash and anti-cache on the URL that will be requested (gh-1732)
@@ -9479,6 +9727,11 @@ jQuery.extend( {
 				response = ajaxHandleResponses( s, jqXHR, responses );
 			}
 
+			// Use a noop converter for missing script
+			if ( !isSuccess && jQuery.inArray( "script", s.dataTypes ) > -1 ) {
+				s.converters[ "text script" ] = function() {};
+			}
+
 			// Convert no matter what (that way responseXXX fields are always set)
 			response = ajaxConvert( s, response, jqXHR, isSuccess );
 
@@ -9569,7 +9822,7 @@ jQuery.extend( {
 	}
 } );
 
-jQuery.each( [ "get", "post" ], function( i, method ) {
+jQuery.each( [ "get", "post" ], function( _i, method ) {
 	jQuery[ method ] = function( url, data, callback, type ) {
 
 		// Shift arguments if data argument was omitted
@@ -9590,8 +9843,17 @@ jQuery.each( [ "get", "post" ], function( i, method ) {
 	};
 } );
 
+jQuery.ajaxPrefilter( function( s ) {
+	var i;
+	for ( i in s.headers ) {
+		if ( i.toLowerCase() === "content-type" ) {
+			s.contentType = s.headers[ i ] || "";
+		}
+	}
+} );
 
-jQuery._evalUrl = function( url, options ) {
+
+jQuery._evalUrl = function( url, options, doc ) {
 	return jQuery.ajax( {
 		url: url,
 
@@ -9609,7 +9871,7 @@ jQuery._evalUrl = function( url, options ) {
 			"text script": function() {}
 		},
 		dataFilter: function( response ) {
-			jQuery.globalEval( response, options );
+			jQuery.globalEval( response, options, doc );
 		}
 	} );
 };
@@ -9931,7 +10193,7 @@ var oldCallbacks = [],
 jQuery.ajaxSetup( {
 	jsonp: "callback",
 	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
+		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce.guid++ ) );
 		this[ callback ] = true;
 		return callback;
 	}
@@ -10148,23 +10410,6 @@ jQuery.fn.load = function( url, params, callback ) {
 
 
 
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [
-	"ajaxStart",
-	"ajaxStop",
-	"ajaxComplete",
-	"ajaxError",
-	"ajaxSuccess",
-	"ajaxSend"
-], function( i, type ) {
-	jQuery.fn[ type ] = function( fn ) {
-		return this.on( type, fn );
-	};
-} );
-
-
-
-
 jQuery.expr.pseudos.animated = function( elem ) {
 	return jQuery.grep( jQuery.timers, function( fn ) {
 		return elem === fn.elem;
@@ -10221,6 +10466,12 @@ jQuery.offset = {
 			options.using.call( elem, props );
 
 		} else {
+			if ( typeof props.top === "number" ) {
+				props.top += "px";
+			}
+			if ( typeof props.left === "number" ) {
+				props.left += "px";
+			}
 			curElem.css( props );
 		}
 	}
@@ -10371,7 +10622,7 @@ jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function(
 // Blink bug: https://bugs.chromium.org/p/chromium/issues/detail?id=589347
 // getComputedStyle returns percent when specified for top/left/bottom/right;
 // rather than make the css module depend on the offset module, just check for it here
-jQuery.each( [ "top", "left" ], function( i, prop ) {
+jQuery.each( [ "top", "left" ], function( _i, prop ) {
 	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
 		function( elem, computed ) {
 			if ( computed ) {
@@ -10434,25 +10685,19 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 } );
 
 
-jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup contextmenu" ).split( " " ),
-	function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
+jQuery.each( [
+	"ajaxStart",
+	"ajaxStop",
+	"ajaxComplete",
+	"ajaxError",
+	"ajaxSuccess",
+	"ajaxSend"
+], function( _i, type ) {
+	jQuery.fn[ type ] = function( fn ) {
+		return this.on( type, fn );
 	};
 } );
 
-jQuery.fn.extend( {
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-} );
-
 
 
 
@@ -10474,9 +10719,33 @@ jQuery.fn.extend( {
 		return arguments.length === 1 ?
 			this.off( selector, "**" ) :
 			this.off( types, selector || "**", fn );
+	},
+
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
 	}
 } );
 
+jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup contextmenu" ).split( " " ),
+	function( _i, name ) {
+
+		// Handle event binding
+		jQuery.fn[ name ] = function( data, fn ) {
+			return arguments.length > 0 ?
+				this.on( name, null, data, fn ) :
+				this.trigger( name );
+		};
+	} );
+
+
+
+
+// Support: Android <=4.0 only
+// Make sure we trim BOM and NBSP
+var rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
+
 // Bind a function to a context, optionally partially applying any
 // arguments.
 // jQuery.proxy is deprecated to promote standards (specifically Function#bind)
@@ -10539,6 +10808,11 @@ jQuery.isNumeric = function( obj ) {
 		!isNaN( obj - parseFloat( obj ) );
 };
 
+jQuery.trim = function( text ) {
+	return text == null ?
+		"" :
+		( text + "" ).replace( rtrim, "" );
+};
 
 
 
@@ -10587,7 +10861,7 @@ jQuery.noConflict = function( deep ) {
 // Expose jQuery and $ identifiers, even in AMD
 // (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
 // and CommonJS for browser emulators (#13566)
-if ( !noGlobal ) {
+if ( typeof noGlobal === "undefined" ) {
 	window.jQuery = window.$ = jQuery;
 }
 
diff --git a/yarn.lock b/yarn.lock
index 5173f2807a..0e7adeaa19 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1804,10 +1804,10 @@ jquery.cookie@1.4.1:
   resolved "https://registry.yarnpkg.com/jquery.cookie/-/jquery.cookie-1.4.1.tgz#d63dce209eab691fe63316db08ca9e47e0f9385b"
   integrity sha1-1j3OIJ6raR/mMxbbCMqeR+D5OFs=
 
-jquery@3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
-  integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
+jquery@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
+  integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
 
 js-reporters@1.2.1:
   version "1.2.1"

From da561a430d5148675cdfc343eca0a9a9e788dd74 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 8 May 2020 14:38:41 -0500
Subject: [PATCH 1055/1830] DEV: Add data-name to popular-theme-item rows
 (#9714)

---
 .../javascripts/admin/templates/modal/admin-install-theme.hbs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
index 604befe690..053ce042a8 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs
@@ -9,7 +9,7 @@
     {{#if popular}}
       <div class="popular-theme-items">
         {{#each themes as |theme|}}
-          <div class="popular-theme-item">
+          <div class="popular-theme-item" data-name={{theme.name}}>
             <div class="popular-theme-name">
               <a href={{theme.meta_url}} rel="noopener noreferrer" target="_blank">
                 {{#if theme.component}}

From 34e5f807ec738279be513aab7c68980966bf7d87 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 8 May 2020 15:50:55 -0400
Subject: [PATCH 1056/1830] DEV: User UPPER_CASE for constants

---
 .../discourse/app/components/edit-category-settings.js        | 4 ++--
 app/assets/javascripts/discourse/app/lib/constants.js         | 4 ++--
 app/assets/javascripts/discourse/app/lib/highlight-search.js  | 4 ++--
 .../javascripts/discourse/app/routes/discovery-categories.js  | 4 ++--
 lib/tasks/javascript.rake                                     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

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 f0ab1cea12..d3b647984e 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-settings.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-settings.js
@@ -2,7 +2,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { empty, and } from "@ember/object/computed";
 import { setting } from "discourse/lib/computed";
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
-import { SearchPriorities } from "discourse/lib/constants";
+import { SEARCH_PRIORITIES } from "discourse/lib/constants";
 import Group from "discourse/models/group";
 
 const categorySortCriteria = [];
@@ -71,7 +71,7 @@ export default buildCategoryPanel("settings", {
   searchPrioritiesOptions() {
     const options = [];
 
-    Object.entries(SearchPriorities).forEach(entry => {
+    Object.entries(SEARCH_PRIORITIES).forEach(entry => {
       const [name, value] = entry;
 
       options.push({
diff --git a/app/assets/javascripts/discourse/app/lib/constants.js b/app/assets/javascripts/discourse/app/lib/constants.js
index 8b752571d5..32114cdfe8 100644
--- a/app/assets/javascripts/discourse/app/lib/constants.js
+++ b/app/assets/javascripts/discourse/app/lib/constants.js
@@ -1,7 +1,7 @@
 // DO NOT EDIT THIS FILE!!!
 // Update it by running `rake javascript:update_constants`
 
-export const SearchPriorities = {
+export const SEARCH_PRIORITIES = {
   ignore: 1,
   very_low: 2,
   low: 3,
@@ -10,4 +10,4 @@ export const SearchPriorities = {
   very_high: 5
 };
 
-export const SearchPhraseRegexp = '"([^"]+)"';
+export const SEARCH_PHRASE_REGEXP = '"([^"]+)"';
diff --git a/app/assets/javascripts/discourse/app/lib/highlight-search.js b/app/assets/javascripts/discourse/app/lib/highlight-search.js
index e7dfc465ec..6f23342656 100644
--- a/app/assets/javascripts/discourse/app/lib/highlight-search.js
+++ b/app/assets/javascripts/discourse/app/lib/highlight-search.js
@@ -1,4 +1,4 @@
-import { SearchPhraseRegexp } from "discourse/lib/constants";
+import { SEARCH_PHRASE_REGEXP } from "discourse/lib/constants";
 import highlightHTML from "discourse/lib/highlight-html";
 
 export const CLASS_NAME = "search-highlight";
@@ -7,7 +7,7 @@ export default function(elem, term, opts = {}) {
   if (!_.isEmpty(term)) {
     // special case ignore "l" which is used for magic sorting
     let words = _.reject(
-      term.match(new RegExp(`${SearchPhraseRegexp}|[^\\s]+`, "g")),
+      term.match(new RegExp(`${SEARCH_PHRASE_REGEXP}|[^\\s]+`, "g")),
       t => t === "l"
     );
 
diff --git a/app/assets/javascripts/discourse/app/routes/discovery-categories.js b/app/assets/javascripts/discourse/app/routes/discovery-categories.js
index c1f440d453..600c0ccdc8 100644
--- a/app/assets/javascripts/discourse/app/routes/discovery-categories.js
+++ b/app/assets/javascripts/discourse/app/routes/discovery-categories.js
@@ -8,7 +8,7 @@ import { defaultHomepage } from "discourse/lib/utilities";
 import TopicList from "discourse/models/topic-list";
 import { ajax } from "discourse/lib/ajax";
 import PreloadStore from "discourse/lib/preload-store";
-import { SearchPriorities } from "discourse/lib/constants";
+import { SEARCH_PRIORITIES } from "discourse/lib/constants";
 import { hash } from "rsvp";
 import Site from "discourse/models/site";
 
@@ -145,7 +145,7 @@ export function openNewCategoryModal(context) {
     allow_badges: true,
     topic_featured_link_allowed: true,
     custom_fields: {},
-    search_priority: SearchPriorities.normal
+    search_priority: SEARCH_PRIORITIES.normal
   });
 
   showModal("edit-category", { model }).set("selectedTab", "general");
diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rake
index 835c83cfca..79cd860689 100644
--- a/lib/tasks/javascript.rake
+++ b/lib/tasks/javascript.rake
@@ -17,9 +17,9 @@ task 'javascript:update_constants' => :environment do
     // DO NOT EDIT THIS FILE!!!
     // Update it by running `rake javascript:update_constants`
 
-    export const SearchPriorities = #{Searchable::PRIORITIES.to_json};
+    export const SEARCH_PRIORITIES = #{Searchable::PRIORITIES.to_json};
 
-    export const SearchPhraseRegexp = '#{Search::PHRASE_MATCH_REGEXP_PATTERN}';
+    export const SEARCH_PHRASE_REGEXP = '#{Search::PHRASE_MATCH_REGEXP_PATTERN}';
   JS
 
   output_path = "#{Rails.root}/app/assets/javascripts/discourse/app/lib/constants.js"

From d653d2f5d98de5933a9671075b781398ce83a826 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 8 May 2020 16:20:27 -0400
Subject: [PATCH 1057/1830] UX: Prevent timeline overlapping topic footer
 buttons

---
 app/assets/stylesheets/common/topic-timeline.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/topic-timeline.scss b/app/assets/stylesheets/common/topic-timeline.scss
index e1e54b679a..2d13a8a5de 100644
--- a/app/assets/stylesheets/common/topic-timeline.scss
+++ b/app/assets/stylesheets/common/topic-timeline.scss
@@ -26,6 +26,7 @@
       opacity: 0;
       pointer-events: none;
       cursor: default;
+      height: 0px;
     }
   }
 

From 9bf11a8c68887820a9cb9661fd186081fb374786 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 9 May 2020 10:26:23 +0200
Subject: [PATCH 1058/1830] DEV: allows select-kit to prevent autofocus of
 header after onChange (#9718)

---
 .../app/templates/components/d-editor.hbs     |  1 +
 .../select-kit/components/select-kit.js       | 13 ++++---
 .../select-kit/single-select-test.js          | 38 +++++++++++++++++++
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
index f48dc424ac..10b4eb6142 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
@@ -12,6 +12,7 @@
               options=(hash
                 popupTitle=b.title
                 icon=b.icon
+                focusAfterOnchange=false
               )
             }}
           {{else}}
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 74544c91f1..4ac3ed3d0e 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -269,7 +269,8 @@ export default Component.extend(
       filterComponent: "select-kit/select-kit-filter",
       selectedNameComponent: "selected-name",
       castInteger: false,
-      preventsClickPropagation: false
+      preventsClickPropagation: false,
+      focusAfterOnchange: true
     },
 
     autoFilterable: computed("content.[]", "selectKit.filter", function() {
@@ -428,10 +429,12 @@ export default Component.extend(
             this.selectKit.close();
           }
 
-          this._safeAfterRender(() => {
-            this._focusFilter();
-            this.popper && this.popper.update();
-          });
+          if (this.selectKit.options.focusAfterOnchange) {
+            this._safeAfterRender(() => {
+              this._focusFilter();
+              this.popper && this.popper.update();
+            });
+          }
         }
       });
     },
diff --git a/test/javascripts/components/select-kit/single-select-test.js b/test/javascripts/components/select-kit/single-select-test.js
index 66bd940328..a360429488 100644
--- a/test/javascripts/components/select-kit/single-select-test.js
+++ b/test/javascripts/components/select-kit/single-select-test.js
@@ -257,3 +257,41 @@ componentTest("prevents propagating click event on header", {
     assert.equal(this.value, DEFAULT_VALUE);
   }
 });
+
+componentTest("focusAfterOnChange", {
+  template:
+    "{{d-button class='focus-me'}}{{single-select options=(hash focusAfterOnchange=focusAfterOnchange) value=value content=content onChange=onChange}}",
+
+  beforeEach() {
+    this.setProperties({
+      onChange: () => {
+        find(".focus-me").focus();
+        this.set("value", "foo");
+      },
+      content: DEFAULT_CONTENT,
+      value: DEFAULT_VALUE
+    });
+  },
+
+  async test(assert) {
+    this.set("focusAfterOnchange", true);
+
+    await this.subject.expand();
+    await this.subject.selectRowByIndex(0);
+
+    assert.ok(
+      document.activeElement.classList.contains("single-select-header"),
+      "it selects the header"
+    );
+
+    this.set("focusAfterOnchange", false);
+
+    await this.subject.expand();
+    await this.subject.selectRowByIndex(0);
+
+    assert.notOk(
+      document.activeElement.classList.contains("single-select-header"),
+      "it doesn’t select the header"
+    );
+  }
+});

From 862d153f54d7786277de1339b659958e4c24f20d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 9 May 2020 11:50:47 +0200
Subject: [PATCH 1059/1830] REFACTOR: removes dead code (#9721)

---
 .../javascripts/discourse/app/components/emoji-picker.js       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/emoji-picker.js b/app/assets/javascripts/discourse/app/components/emoji-picker.js
index 86fa8fcec9..bafd5929a9 100644
--- a/app/assets/javascripts/discourse/app/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/app/components/emoji-picker.js
@@ -38,8 +38,6 @@ export default Component.extend({
       this.$picker.css({ width: "", left: "", bottom: "", display: "none" });
 
     this.$modal.removeClass("fadeIn");
-
-    clearTimeout(this._checkTimeout);
   },
 
   show() {
@@ -71,7 +69,6 @@ export default Component.extend({
   @on("init")
   _setInitialValues() {
     this.set("customEmojis", customEmojis());
-    this._checkTimeout = null;
     this.scrollPosition = 0;
     this.$visibleSections = [];
   },

From 3b2b635e9b3779e19c3fb03a62f64aa1dca143c1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 10 May 2020 08:57:48 +0200
Subject: [PATCH 1060/1830] DEV: removes setInterval as it might cause issues
 (#9722)

---
 .../discourse/app/components/emoji-picker.js     | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/emoji-picker.js b/app/assets/javascripts/discourse/app/components/emoji-picker.js
index bafd5929a9..a77b564e59 100644
--- a/app/assets/javascripts/discourse/app/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/app/components/emoji-picker.js
@@ -1,5 +1,5 @@
 import { inject as service } from "@ember/service";
-import { throttle, debounce, schedule } from "@ember/runloop";
+import { throttle, debounce, schedule, later } from "@ember/runloop";
 import Component from "@ember/component";
 import { on, observes } from "discourse-common/utils/decorators";
 import { findRawTemplate } from "discourse-common/lib/raw-templates";
@@ -196,6 +196,8 @@ export default Component.extend({
     if (!this.site.isMobileDevice) {
       this._bindHover();
     }
+
+    later(this, this._onScroll, 100);
   },
 
   _bindModalClick() {
@@ -221,7 +223,6 @@ export default Component.extend({
   _unbindEvents() {
     $(this.element).off();
     $(window).off("resize");
-    clearInterval(this._refreshInterval);
     $("#reply-control").off("div-resizing");
     $("html").off("mouseup.emoji-picker");
   },
@@ -370,12 +371,11 @@ export default Component.extend({
   },
 
   _bindSectionsScroll() {
-    let onScroll = () => {
-      debounce(this, this._checkVisibleSection, 50);
-    };
+    this.$list.on("scroll", this._onScroll.bind(this));
+  },
 
-    this.$list.on("scroll", onScroll);
-    this._refreshInterval = setInterval(onScroll, 100);
+  _onScroll() {
+    debounce(this, this._checkVisibleSection, 50);
   },
 
   _checkVisibleSection(force) {
@@ -420,6 +420,8 @@ export default Component.extend({
 
       this._loadVisibleSections();
     }
+
+    later(this, this._checkVisibleSection, 100);
   },
 
   _loadVisibleSections() {

From 8149bfbaf1545c99764647bc40b53e32f7896550 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Sun, 10 May 2020 14:07:45 +0300
Subject: [PATCH 1061/1830]  FEATURE: Filter settings by plugin (#9692)

---
 .../admin/controllers/admin-site-settings.js  | 27 ++++++++++++++--
 .../javascripts/admin/routes/admin-plugins.js | 18 ++++-------
 app/models/site_setting.rb                    |  6 ++--
 app/serializers/admin_plugin_serializer.rb    | 13 ++------
 lib/discourse.rb                              |  2 +-
 lib/plugin/instance.rb                        |  6 +---
 lib/site_setting_extension.rb                 | 10 ++++++
 spec/components/plugin/instance_spec.rb       | 15 ---------
 .../acceptance/admin-site-settings-test.js    | 23 ++++++++++----
 test/javascripts/fixtures/site_settings.js    | 31 +++++++++++++------
 10 files changed, 85 insertions(+), 66 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js b/app/assets/javascripts/admin/controllers/admin-site-settings.js
index ac84553a71..e3225b163d 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings.js
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js
@@ -15,12 +15,32 @@ export default Controller.extend({
     // If we have no content, don't bother filtering anything
     if (!!isEmpty(this.allSiteSettings)) return;
 
-    let filter;
+    let filter, pluginFilter;
     if (this.filter) {
-      filter = this.filter.toLowerCase().trim();
+      filter = this.filter
+        .toLowerCase()
+        .split(" ")
+        .filter(word => {
+          if (word.length === 0) {
+            return false;
+          }
+
+          if (word.startsWith("plugin:")) {
+            pluginFilter = word.substr("plugin:".length).trim();
+            return false;
+          }
+
+          return true;
+        })
+        .join(" ")
+        .trim();
     }
 
-    if ((!filter || 0 === filter.length) && !this.onlyOverridden) {
+    if (
+      (!filter || 0 === filter.length) &&
+      (!pluginFilter || 0 === pluginFilter.length) &&
+      !this.onlyOverridden
+    ) {
       this.set("visibleSiteSettings", this.allSiteSettings);
       if (this.categoryNameKey === "all_results") {
         this.transitionToRoute("adminSiteSettings");
@@ -39,6 +59,7 @@ export default Controller.extend({
     this.allSiteSettings.forEach(settingsCategory => {
       const siteSettings = settingsCategory.siteSettings.filter(item => {
         if (this.onlyOverridden && !item.get("overridden")) return false;
+        if (pluginFilter && item.plugin !== pluginFilter) return false;
         if (filter) {
           const setting = item.get("setting").toLowerCase();
           return (
diff --git a/app/assets/javascripts/admin/routes/admin-plugins.js b/app/assets/javascripts/admin/routes/admin-plugins.js
index c4af286faf..261610a97e 100644
--- a/app/assets/javascripts/admin/routes/admin-plugins.js
+++ b/app/assets/javascripts/admin/routes/admin-plugins.js
@@ -9,18 +9,12 @@ export default Route.extend({
       const controller = this.controllerFor("adminSiteSettings");
       this.transitionTo("adminSiteSettingsCategory", "plugins").then(() => {
         if (plugin) {
-          const siteSettingFilter = plugin.get("enabled_setting_filter");
-          const match = /^(.*)_enabled/.exec(plugin.get("enabled_setting"));
-          const filter = siteSettingFilter || match[1];
-
-          if (filter) {
-            // filterContent() is normally on a debounce from typing.
-            // Because we don't want the default of "All Results", we tell it
-            // to skip the next debounce.
-            controller.set("filter", filter);
-            controller.set("_skipBounce", true);
-            controller.filterContentNow("plugins");
-          }
+          // filterContent() is normally on a debounce from typing.
+          // Because we don't want the default of "All Results", we tell it
+          // to skip the next debounce.
+          controller.set("filter", `plugin:${plugin.id}`);
+          controller.set("_skipBounce", true);
+          controller.filterContentNow("plugins");
         }
       });
     }
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index 7925f91ef1..bc96633359 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -12,9 +12,9 @@ class SiteSetting < ActiveRecord::Base
     true
   end
 
-  def self.load_settings(file)
+  def self.load_settings(file, plugin: nil)
     SiteSettings::YamlLoader.new(file).load do |category, name, default, opts|
-      setting(name, default, opts.merge(category: category))
+      setting(name, default, opts.merge(category: category, plugin: plugin))
     end
   end
 
@@ -22,7 +22,7 @@ class SiteSetting < ActiveRecord::Base
 
   unless Rails.env.test? && ENV['LOAD_PLUGINS'] != "1"
     Dir[File.join(Rails.root, "plugins", "*", "config", "settings.yml")].each do |file|
-      load_settings(file)
+      load_settings(file, plugin: file.split("/")[-3])
     end
   end
 
diff --git a/app/serializers/admin_plugin_serializer.rb b/app/serializers/admin_plugin_serializer.rb
index 3b8fc0e323..843ca58408 100644
--- a/app/serializers/admin_plugin_serializer.rb
+++ b/app/serializers/admin_plugin_serializer.rb
@@ -8,11 +8,10 @@ class AdminPluginSerializer < ApplicationSerializer
              :admin_route,
              :enabled,
              :enabled_setting,
-             :is_official,
-             :enabled_setting_filter
+             :is_official
 
   def id
-    object.metadata.name
+    object.directory_name
   end
 
   def name
@@ -39,14 +38,6 @@ class AdminPluginSerializer < ApplicationSerializer
     object.enabled_site_setting
   end
 
-  def include_enabled_setting_filter?
-    object.enabled_site_setting_filter.present?
-  end
-
-  def enabled_setting_filter
-    object.enabled_site_setting_filter
-  end
-
   def include_url?
     url.present?
   end
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 9bdbc2b302..649fb00c63 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -801,7 +801,7 @@ module Discourse
     redis_key = "deprecate-notice-#{digest}"
 
     if !Discourse.redis.without_namespace.get(redis_key)
-      Rails.logger.warn(warning)
+      Rails.logger.warn(warning) if Rails.logger
       begin
         Discourse.redis.without_namespace.setex(redis_key, 3600, "x")
       rescue Redis::CommandError => e
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 13064a7e23..006aa310b0 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -626,11 +626,7 @@ class Plugin::Instance
   end
 
   def enabled_site_setting_filter(filter = nil)
-    if filter
-      @enabled_setting_filter = filter
-    else
-      @enabled_setting_filter
-    end
+    Discourse.deprecate("`enabled_site_setting_filter` is deprecated", output_in_test: true)
   end
 
   def enabled_site_setting(setting = nil)
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 64fe9d6d44..09b616eda9 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -110,6 +110,10 @@ module SiteSettingExtension
     @secret_settings ||= []
   end
 
+  def plugins
+    @plugins ||= {}
+  end
+
   def setting(name_arg, default = nil, opts = {})
     name = name_arg.to_sym
 
@@ -158,6 +162,10 @@ module SiteSettingExtension
         secret_settings << name
       end
 
+      if opts[:plugin]
+        plugins[name] = opts[:plugin]
+      end
+
       type_supervisor.load_setting(
         name,
         opts.extract!(*SiteSettings::TypeSupervisor::CONSUMED_OPTS)
@@ -246,6 +254,8 @@ module SiteSettingExtension
         placeholder: placeholder(s)
       }.merge!(type_hash)
 
+      opts[:plugin] = plugins[s] if plugins[s]
+
       opts
     end.unshift(locale_setting_hash)
   end
diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb
index 26dd0d39c7..1c5bee7066 100644
--- a/spec/components/plugin/instance_spec.rb
+++ b/spec/components/plugin/instance_spec.rb
@@ -502,21 +502,6 @@ describe Plugin::Instance do
     end
   end
 
-  describe '#enabled_site_setting_filter' do
-    describe 'when filter is blank' do
-      it 'should return the right value' do
-        expect(Plugin::Instance.new.enabled_site_setting_filter).to eq(nil)
-      end
-    end
-
-    it 'should set the right value' do
-      instance = Plugin::Instance.new
-      instance.enabled_site_setting_filter('test')
-
-      expect(instance.enabled_site_setting_filter).to eq('test')
-    end
-  end
-
   describe '#register_reviewable_types' do
     it 'Overrides the existing Reviewable types adding new ones' do
       current_types = Reviewable.types
diff --git a/test/javascripts/acceptance/admin-site-settings-test.js b/test/javascripts/acceptance/admin-site-settings-test.js
index b0975a9ae7..f02d093b39 100644
--- a/test/javascripts/acceptance/admin-site-settings-test.js
+++ b/test/javascripts/acceptance/admin-site-settings-test.js
@@ -10,7 +10,7 @@ acceptance("Admin - Site Settings", {
   },
 
   pretend(server, helper) {
-    server.put("/admin/site_settings/title", body => {
+    server.put("/admin/site_settings/title", (body) => {
       titleOverride = body.requestBody.split("=")[1];
       return helper.response({ success: "OK" });
     });
@@ -22,14 +22,14 @@ acceptance("Admin - Site Settings", {
         titleSetting.value = titleOverride;
       }
       const response = {
-        site_settings: [titleSetting, ...fixtures.slice(1)]
+        site_settings: [titleSetting, ...fixtures.slice(1)],
       };
       return helper.response(response);
     });
-  }
+  },
 });
 
-QUnit.test("upload site setting", async assert => {
+QUnit.test("upload site setting", async (assert) => {
   await visit("/admin/site_settings");
 
   assert.ok(
@@ -40,7 +40,7 @@ QUnit.test("upload site setting", async assert => {
   assert.ok(exists(".row.setting.upload .undo"), "undo button is present");
 });
 
-QUnit.test("changing value updates dirty state", async assert => {
+QUnit.test("changing value updates dirty state", async (assert) => {
   await visit("/admin/site_settings");
   await fillIn("#setting-filter", " title ");
   assert.equal(count(".row.setting"), 1, "filter returns 1 site setting");
@@ -89,7 +89,7 @@ QUnit.test("changing value updates dirty state", async assert => {
 
 QUnit.test(
   "always shows filtered site settings if a filter is set",
-  async assert => {
+  async (assert) => {
     await visit("/admin/site_settings");
     await fillIn("#setting-filter", "title");
     assert.equal(count(".row.setting"), 1);
@@ -103,3 +103,14 @@ QUnit.test(
     assert.equal(count(".row.setting"), 1);
   }
 );
+
+QUnit.test("filter settings by plugin name", async (assert) => {
+  await visit("/admin/site_settings");
+
+  await fillIn("#setting-filter", "plugin:discourse-logo");
+  assert.equal(count(".row.setting"), 1);
+
+  // inexistent plugin
+  await fillIn("#setting-filter", "plugin:discourse-plugin");
+  assert.equal(count(".row.setting"), 0);
+});
diff --git a/test/javascripts/fixtures/site_settings.js b/test/javascripts/fixtures/site_settings.js
index cf48b6c10b..c31d4c8412 100644
--- a/test/javascripts/fixtures/site_settings.js
+++ b/test/javascripts/fixtures/site_settings.js
@@ -9,7 +9,7 @@ export default {
         category: "required",
         preview: null,
         secret: false,
-        type: "string"
+        type: "string",
       },
       {
         setting: "contact_email",
@@ -20,7 +20,7 @@ export default {
         category: "required",
         preview: null,
         secret: false,
-        type: "email"
+        type: "email",
       },
       {
         setting: "site_contact_username",
@@ -31,7 +31,7 @@ export default {
         category: "required",
         preview: null,
         secret: false,
-        type: "username"
+        type: "username",
       },
       {
         setting: "logo",
@@ -41,7 +41,7 @@ export default {
         category: "required",
         preview: null,
         secret: false,
-        type: "upload"
+        type: "upload",
       },
       {
         setting: "top_menu",
@@ -61,13 +61,24 @@ export default {
           "categories",
           "read",
           "posted",
-          "bookmarks"
+          "bookmarks",
         ],
-        list_type: "compact"
-      }
+        list_type: "compact",
+      },
+      {
+        setting: "plugin_logo",
+        description: "Some plugin logo",
+        default: "",
+        value: "/some/image",
+        category: "required",
+        preview: null,
+        secret: false,
+        type: "upload",
+        plugin: "discourse-logo",
+      },
     ],
     diags: {
-      last_message_processed: null
-    }
-  }
+      last_message_processed: null,
+    },
+  },
 };

From 09caf614dee0053026a82ace904d7e93e001f22b Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nenciu.bianca@gmail.com>
Date: Sun, 10 May 2020 15:05:23 +0300
Subject: [PATCH 1062/1830] DEV: Fix build

Rails.logger is not available when Discourse.deprecate is called from
enabled_site_setting_filter.

Follow up to db4601823546b7a1451b82a6f556a30a55166a21.
---
 lib/discourse.rb       | 2 +-
 lib/plugin/instance.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/discourse.rb b/lib/discourse.rb
index 649fb00c63..9bdbc2b302 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -801,7 +801,7 @@ module Discourse
     redis_key = "deprecate-notice-#{digest}"
 
     if !Discourse.redis.without_namespace.get(redis_key)
-      Rails.logger.warn(warning) if Rails.logger
+      Rails.logger.warn(warning)
       begin
         Discourse.redis.without_namespace.setex(redis_key, 3600, "x")
       rescue Redis::CommandError => e
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 006aa310b0..5f218ab699 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -626,7 +626,7 @@ class Plugin::Instance
   end
 
   def enabled_site_setting_filter(filter = nil)
-    Discourse.deprecate("`enabled_site_setting_filter` is deprecated", output_in_test: true)
+    STDERR.puts("`enabled_site_setting_filter` is deprecated")
   end
 
   def enabled_site_setting(setting = nil)

From 8f5a651e51a0f6f476bc7342fc261a3183913702 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Sun, 10 May 2020 19:54:07 +0200
Subject: [PATCH 1063/1830] DEV: No need for double `await`

---
 test/javascripts/acceptance/category-edit-security-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/acceptance/category-edit-security-test.js b/test/javascripts/acceptance/category-edit-security-test.js
index 131b26ff9d..1bab13f1e4 100644
--- a/test/javascripts/acceptance/category-edit-security-test.js
+++ b/test/javascripts/acceptance/category-edit-security-test.js
@@ -84,7 +84,7 @@ QUnit.test("adding a previously removed permission", async assert => {
   await visit("/c/bug");
 
   await click(".edit-category");
-  await await click("li.edit-category-security a");
+  await click("li.edit-category-security a");
   await click(".edit-category-tab-security .edit-permission");
   await click(
     ".edit-category-tab-security .permission-list li:first-of-type .remove-permission"

From 44712c5f9825eca6cb38ed5351f5fa33fc8d107e Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 11 May 2020 10:04:38 +1000
Subject: [PATCH 1064/1830] FIX: ESC to dismiss empty draft topic composer

Previously originalTitle was set to undefined leading to
titleDirty being unconditionally undefined for new topics

That mean you could not dismiss the composer via ESC
---
 app/assets/javascripts/discourse/app/models/composer.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index 56e4d1ac80..211e4ca93d 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -785,11 +785,14 @@ const Composer = RestModel.extend({
       });
     }
 
+    this.set("originalTitle", "");
+
     if (opts.title) {
       this.set("title", opts.title);
     }
 
     this.set("originalText", opts.draft ? "" : this.reply);
+
     if (this.editingFirstPost) {
       this.set("originalTitle", this.title);
     }

From 12d4d51d810ac557531b8f3b273cc4566adc1cd2 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Mon, 11 May 2020 11:01:47 +1000
Subject: [PATCH 1065/1830] FIX: CurrentUser now must be passed to
 resolveTimezone and user card local time issues (#9734)

* This is to prevent user's timezones being changed accidentally
e.g. by admin looking at a user
* This problem only occurred via the user card, however the user card
was still calling userTimezone even if the setting to display user
time in card was disabled
---
 .../app/components/user-card-contents.js      |  5 +++-
 .../discourse/app/controllers/bookmark.js     |  2 +-
 .../app/initializers/topic-footer-buttons.js  |  2 +-
 .../discourse/app/models/bookmark.js          |  2 +-
 .../javascripts/discourse/app/models/user.js  | 27 +++++++++++++------
 .../discourse/app/widgets/post-menu.js        |  2 +-
 test/javascripts/acceptance/bookmarks-test.js |  4 +--
 test/javascripts/acceptance/user-card-test.js | 23 ++++++++++++++++
 test/javascripts/controllers/bookmark-test.js |  8 ++++--
 test/javascripts/models/user-test.js          | 24 ++++++++++++++---
 10 files changed, 78 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-card-contents.js b/app/assets/javascripts/discourse/app/components/user-card-contents.js
index 629545601a..7b92e86011 100644
--- a/app/assets/javascripts/discourse/app/components/user-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/user-card-contents.js
@@ -72,7 +72,10 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
 
   @discourseComputed("user")
   userTimezone(user) {
-    return user.resolvedTimezone();
+    if (!this.showUserLocalTime) {
+      return;
+    }
+    return user.resolvedTimezone(this.currentUser);
   },
 
   @discourseComputed("userTimezone")
diff --git a/app/assets/javascripts/discourse/app/controllers/bookmark.js b/app/assets/javascripts/discourse/app/controllers/bookmark.js
index 7d86ed2b74..4e9e6c3c78 100644
--- a/app/assets/javascripts/discourse/app/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/app/controllers/bookmark.js
@@ -73,7 +73,7 @@ export default Controller.extend(ModalFunctionality, {
       customReminderTime: this._defaultCustomReminderTime(),
       lastCustomReminderDate: null,
       lastCustomReminderTime: null,
-      userTimezone: this.currentUser.resolvedTimezone(),
+      userTimezone: this.currentUser.resolvedTimezone(this.currentUser),
       showOptions: false,
       options: {},
       model: this.model || {}
diff --git a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
index 7751be37a1..54d0853204 100644
--- a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
+++ b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
@@ -109,7 +109,7 @@ export default {
             return I18n.t("bookmarked.help.unbookmark_with_reminder", {
               reminder_at: formattedReminderTime(
                 bookmark_reminder_at,
-                currentUser.resolvedTimezone()
+                currentUser.resolvedTimezone(currentUser)
               )
             });
           }
diff --git a/app/assets/javascripts/discourse/app/models/bookmark.js b/app/assets/javascripts/discourse/app/models/bookmark.js
index 44daca7cdd..fd88264583 100644
--- a/app/assets/javascripts/discourse/app/models/bookmark.js
+++ b/app/assets/javascripts/discourse/app/models/bookmark.js
@@ -113,7 +113,7 @@ const Bookmark = RestModel.extend({
   formattedReminder(bookmarkReminderAt, currentUser) {
     return formattedReminderTime(
       bookmarkReminderAt,
-      currentUser.resolvedTimezone()
+      currentUser.resolvedTimezone(currentUser)
     ).capitalize();
   },
 
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index 6f4cf5dfcf..fc98218426 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -849,17 +849,21 @@ const User = RestModel.extend({
     );
   },
 
-  resolvedTimezone() {
-    if (this._timezone) {
+  resolvedTimezone(currentUser) {
+    if (this.hasSavedTimezone()) {
       return this._timezone;
     }
 
-    this.changeTimezone(moment.tz.guess());
-    ajax(userPath(this.username + ".json"), {
-      type: "PUT",
-      dataType: "json",
-      data: { timezone: this._timezone }
-    });
+    // only change the timezone and save it if we are
+    // looking at our own user
+    if (currentUser.id === this.id) {
+      this.changeTimezone(moment.tz.guess());
+      ajax(userPath(this.username + ".json"), {
+        type: "PUT",
+        dataType: "json",
+        data: { timezone: this._timezone }
+      });
+    }
 
     return this._timezone;
   },
@@ -868,6 +872,13 @@ const User = RestModel.extend({
     this._timezone = tz;
   },
 
+  hasSavedTimezone() {
+    if (this._timezone) {
+      return true;
+    }
+    return false;
+  },
+
   calculateMutedIds(notificationLevel, id, type) {
     const muted_ids = this.get(type);
     if (notificationLevel === NotificationLevels.MUTED) {
diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
index 376772c237..00c859717c 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@@ -302,7 +302,7 @@ registerButton("bookmark", attrs => {
     if (attrs.bookmarkReminderAt) {
       let formattedReminder = formattedReminderTime(
         attrs.bookmarkReminderAt,
-        Discourse.currentUser.resolvedTimezone()
+        Discourse.currentUser.resolvedTimezone(Discourse.currentUser)
       );
       title = "bookmarks.created_with_reminder";
       titleOptions.date = formattedReminder;
diff --git a/test/javascripts/acceptance/bookmarks-test.js b/test/javascripts/acceptance/bookmarks-test.js
index 762cd1ee07..83781f7ffb 100644
--- a/test/javascripts/acceptance/bookmarks-test.js
+++ b/test/javascripts/acceptance/bookmarks-test.js
@@ -205,7 +205,7 @@ test("Editing a bookmark", async assert => {
   mockSuccessfulBookmarkPost(assert);
 
   await visit("/t/internationalization-localization/280");
-  let now = moment.tz(loggedInUser().resolvedTimezone());
+  let now = moment.tz(loggedInUser().resolvedTimezone(loggedInUser()));
   let tomorrow = now.add(1, "day").format("YYYY-MM-DD");
   await openBookmarkModal();
   await fillIn("input#bookmark-name", "Test name");
@@ -234,7 +234,7 @@ test("Editing a bookmark that has a Later Today reminder, and it is before 6pm t
   mockSuccessfulBookmarkPost(assert);
   let clock = fakeTime(
     "2020-05-04T13:00:00",
-    loggedInUser().resolvedTimezone()
+    loggedInUser().resolvedTimezone(loggedInUser())
   );
   await timeStep(clock, () =>
     visit("/t/internationalization-localization/280")
diff --git a/test/javascripts/acceptance/user-card-test.js b/test/javascripts/acceptance/user-card-test.js
index f15bbd3a7a..8ba3c95cac 100644
--- a/test/javascripts/acceptance/user-card-test.js
+++ b/test/javascripts/acceptance/user-card-test.js
@@ -64,6 +64,29 @@ QUnit.test("user card local time", async assert => {
   );
 });
 
+QUnit.test(
+  "user card local time - does not update timezone for another user",
+  async assert => {
+    User.current().changeTimezone("Australia/Brisbane");
+    let cardResponse = _.clone(userFixtures["/u/charlie/card.json"]);
+    delete cardResponse.user.timezone;
+
+    pretender.get("/u/charlie/card.json", () => [
+      200,
+      { "Content-Type": "application/json" },
+      cardResponse
+    ]);
+
+    await visit("/t/internationalization-localization/280");
+    await click("a[data-user-card=charlie]:first");
+
+    assert.not(
+      exists(".user-card .local-time"),
+      "it does not show the local time if the user card returns a null/undefined timezone for another user"
+    );
+  }
+);
+
 acceptance("User Card", { loggedIn: true });
 
 QUnit.test("user card", async assert => {
diff --git a/test/javascripts/controllers/bookmark-test.js b/test/javascripts/controllers/bookmark-test.js
index 246d10dd4d..0474215f4a 100644
--- a/test/javascripts/controllers/bookmark-test.js
+++ b/test/javascripts/controllers/bookmark-test.js
@@ -114,7 +114,9 @@ QUnit.test(
   function(assert) {
     let dt = moment.tz(
       "2019-12-11T11:37:16",
-      BookmarkController.currentUser.resolvedTimezone()
+      BookmarkController.currentUser.resolvedTimezone(
+        BookmarkController.currentUser
+      )
     );
 
     assert.equal(
@@ -208,7 +210,9 @@ QUnit.test(
       moment
         .tz(
           "2028-12-12 08:00",
-          BookmarkController.currentUser.resolvedTimezone()
+          BookmarkController.currentUser.resolvedTimezone(
+            BookmarkController.currentUser
+          )
         )
         .toString(),
       "the custom date and time are parsed correctly with default time"
diff --git a/test/javascripts/models/user-test.js b/test/javascripts/models/user-test.js
index 90dcef574e..97632b148f 100644
--- a/test/javascripts/models/user-test.js
+++ b/test/javascripts/models/user-test.js
@@ -71,7 +71,7 @@ QUnit.test("canMangeGroup", assert => {
 
 QUnit.test("resolvedTimezone", assert => {
   const tz = "Australia/Brisbane";
-  let user = User.create({ timezone: tz, username: "chuck" });
+  let user = User.create({ timezone: tz, username: "chuck", id: 111 });
   let stub = sandbox.stub(moment.tz, "guess").returns("America/Chicago");
 
   pretender.put("/u/chuck.json", () => {
@@ -80,7 +80,7 @@ QUnit.test("resolvedTimezone", assert => {
 
   let spy = sandbox.spy(ajaxlib, "ajax");
   assert.equal(
-    user.resolvedTimezone(),
+    user.resolvedTimezone(user),
     tz,
     "if the user already has a timezone return it"
   );
@@ -88,9 +88,9 @@ QUnit.test("resolvedTimezone", assert => {
     spy.notCalled,
     "if the user already has a timezone do not call AJAX update"
   );
-  user = User.create({ username: "chuck" });
+  user = User.create({ username: "chuck", id: 111 });
   assert.equal(
-    user.resolvedTimezone(),
+    user.resolvedTimezone(user),
     "America/Chicago",
     "if the user has no timezone guess it with moment"
   );
@@ -102,6 +102,22 @@ QUnit.test("resolvedTimezone", assert => {
     }),
     "if the user has no timezone save it with an AJAX update"
   );
+
+  let otherUser = User.create({ username: "howardhamlin", id: 999 });
+  assert.equal(
+    otherUser.resolvedTimezone(user),
+    null,
+    "if the user has no timezone and the user is not the current user, do NOT guess with moment"
+  );
+  assert.not(
+    spy.calledWith("/u/howardhamlin.json", {
+      type: "PUT",
+      dataType: "json",
+      data: { timezone: "America/Chicago" }
+    }),
+    "if the user has no timezone, and the user is not the current user, do NOT save it with an AJAX update"
+  );
+
   stub.restore();
 });
 

From 676be3a853454a33cf627c3d570feb37d3bb0bfd Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 11 May 2020 11:06:55 +1000
Subject: [PATCH 1066/1830] FEATURE: add no_index header if robots is disabled

Expand SiteSetting.allow_index_in_robots_txt so it also adds a
noindex header if set to false.

This makes sure that nothing is indexed even if it somehow reaches
Google.
---
 app/controllers/application_controller.rb | 2 +-
 spec/requests/topics_controller_spec.rb   | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 813af0c12f..7abf1f3659 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -44,7 +44,7 @@ class ApplicationController < ActionController::Base
   after_action  :perform_refresh_session
   after_action  :dont_cache_page
   after_action  :conditionally_allow_site_embedding
-  after_action  :add_noindex_header, if: -> { is_feed_request? }
+  after_action  :add_noindex_header, if: -> { is_feed_request? || !SiteSetting.allow_index_in_robots_txt }
 
   layout :set_layout
 
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 9f9b32ce2e..b4d157d536 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -1843,12 +1843,19 @@ RSpec.describe TopicsController do
     end
 
     it "is not included for normal topics" do
-      topic = Fabricate(:topic, visible: true)
       get "/t/#{topic.slug}/#{topic.id}.json"
 
       expect(response.headers['X-Robots-Tag']).to eq(nil)
     end
 
+    it "is included when allow_index_in_robots_txt is set to false" do
+      SiteSetting.allow_index_in_robots_txt = false
+
+      get "/t/#{topic.slug}/#{topic.id}.json"
+
+      expect(response.headers['X-Robots-Tag']).to eq('noindex')
+    end
+
     it "doesn't store an incoming link when there's no referer" do
       expect {
         get "/t/#{topic.id}.json"

From 4a74f18e95d04578b1461788de3635fc35edbf06 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 11 May 2020 09:34:00 +0800
Subject: [PATCH 1067/1830] PERF: Move fetching of avatar into hijack for
 discobot certificate

---
 plugins/discourse-narrative-bot/plugin.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index 29766f640e..a6be5dd056 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -92,10 +92,10 @@ after_initialize do
 
         user = User.find_by(id: params[:user_id])
         raise Discourse::NotFound if user.blank?
-        cdn_avatar_url = fetch_avatar_url(user)
 
         hijack do
-          generator = CertificateGenerator.new(user, params[:date], cdn_avatar_url)
+          avatar_data = fetch_avatar(user)
+          generator = CertificateGenerator.new(user, params[:date], avatar_data)
 
           svg = params[:type] == 'advanced' ? generator.advanced_user_track : generator.new_user_track
 
@@ -107,7 +107,7 @@ after_initialize do
 
       private
 
-      def fetch_avatar_url(user)
+      def fetch_avatar(user)
         avatar_url = UrlHelper.absolute(Discourse.base_uri + user.avatar_template.gsub('{size}', '250'))
         FileHelper.download(
           avatar_url.to_s,

From bb4e8899c41889f7316e512d6ed89a3847fa655b Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 11 May 2020 12:14:21 +1000
Subject: [PATCH 1068/1830] FEATURE: let Google index pages so it can remove
 them

Google insists on indexing pages so it can figure out if they
can be removed from the index.

see: https://support.google.com/webmasters/answer/6332384?hl=en

This change ensures the we have special behavior for Googlebot
where we allow indexing, but block the actual indexing via
X-Robots-Tag
---
 app/controllers/application_controller.rb   | 8 +++++++-
 app/views/robots_txt/no_index.erb           | 9 +++++++++
 spec/requests/robots_txt_controller_spec.rb | 1 +
 spec/requests/topics_controller_spec.rb     | 2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7abf1f3659..abde04d24b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -806,7 +806,13 @@ class ApplicationController < ActionController::Base
   end
 
   def add_noindex_header
-    response.headers['X-Robots-Tag'] = 'noindex' if request.get?
+    if request.get?
+      if SiteSetting.allow_index_in_robots_txt
+        response.headers['X-Robots-Tag'] = 'noindex'
+      else
+        response.headers['X-Robots-Tag'] = 'noindex, nofollow'
+      end
+    end
   end
 
   protected
diff --git a/app/views/robots_txt/no_index.erb b/app/views/robots_txt/no_index.erb
index 7697afcf26..a02cc1b1f5 100644
--- a/app/views/robots_txt/no_index.erb
+++ b/app/views/robots_txt/no_index.erb
@@ -1,4 +1,13 @@
 # See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
 #
+
+# Googlebot must be allowed to index so it can remove items from the index
+# we return the X-Robots-Tag with noindex, nofollow which will ensure
+# indexing is minimized and nothing shows up in Google search results
+User-agent: googlebot
+Allow: <%= Discourse.base_uri + "/" %>
+Disallow: <%= Discourse.base_uri + "/uploads/*" %>
+
 User-agent: *
 Disallow: <%= Discourse.base_uri + "/" %>
+
diff --git a/spec/requests/robots_txt_controller_spec.rb b/spec/requests/robots_txt_controller_spec.rb
index c15297ff11..16327997c9 100644
--- a/spec/requests/robots_txt_controller_spec.rb
+++ b/spec/requests/robots_txt_controller_spec.rb
@@ -132,6 +132,7 @@ RSpec.describe RobotsTxtController do
       get '/robots.txt'
 
       expect(response.body).to_not include("Disallow: /u/")
+      expect(response.body).to include("User-agent: googlebot\nAllow")
     end
 
     it "returns overridden robots.txt if the file is overridden" do
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index b4d157d536..b2c9b5ebda 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -1853,7 +1853,7 @@ RSpec.describe TopicsController do
 
       get "/t/#{topic.slug}/#{topic.id}.json"
 
-      expect(response.headers['X-Robots-Tag']).to eq('noindex')
+      expect(response.headers['X-Robots-Tag']).to eq('noindex, nofollow')
     end
 
     it "doesn't store an incoming link when there's no referer" do

From 29842e682b43e86d6716555f1028d743d8fecf72 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Mon, 11 May 2020 13:59:14 +1000
Subject: [PATCH 1069/1830] FIX: Resolve issues with Next Monday for bookmarks
 not working in certain locales (#9737)

In moment.js the .day() function can accept a day string but this is locale based, so e.g. in Finnish locale the string "Monday" means nothing and will parse incorrectly to Sunday. To resolve this we always use the moment.js number for the day of the week we want.
---
 .../javascripts/discourse/app/controllers/bookmark.js     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/bookmark.js b/app/assets/javascripts/discourse/app/controllers/bookmark.js
index 4e9e6c3c78..9653fd9266 100644
--- a/app/assets/javascripts/discourse/app/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/app/controllers/bookmark.js
@@ -23,6 +23,8 @@ const GLOBAL_SHORTCUTS_TO_PAUSE = ["c", "r", "l", "d", "t"];
 const START_OF_DAY_HOUR = 8;
 const LATER_TODAY_CUTOFF_HOUR = 17;
 const LATER_TODAY_MAX_HOUR = 18;
+const MOMENT_MONDAY = 1;
+const MOMENT_THURSDAY = 4;
 
 const BOOKMARK_BINDINGS = {
   enter: { handler: "saveAndClose" },
@@ -220,7 +222,7 @@ export default Controller.extend(ModalFunctionality, {
 
   @discourseComputed()
   showLaterThisWeek() {
-    return this.now().day() < 4; // 4 is Thursday
+    return this.now().day() < MOMENT_THURSDAY;
   },
 
   @discourseComputed("parsedLastCustomReminderDatetime")
@@ -238,7 +240,7 @@ export default Controller.extend(ModalFunctionality, {
   @discourseComputed()
   startNextBusinessWeekFormatted() {
     return this.nextWeek()
-      .day("Monday")
+      .day(MOMENT_MONDAY)
       .format(I18n.t("dates.long_no_year"));
   },
 
@@ -374,7 +376,7 @@ export default Controller.extend(ModalFunctionality, {
       case REMINDER_TYPES.NEXT_WEEK:
         return this.nextWeek();
       case REMINDER_TYPES.START_OF_NEXT_BUSINESS_WEEK:
-        return this.nextWeek().day("Monday");
+        return this.nextWeek().day(MOMENT_MONDAY);
       case REMINDER_TYPES.LATER_THIS_WEEK:
         return this.laterThisWeek();
       case REMINDER_TYPES.NEXT_MONTH:

From 07b728c5e557c9aae91c51f3eaac5c32d479f2a2 Mon Sep 17 00:00:00 2001
From: Joshua Rosenfeld <jomaxro@discourse.org>
Date: Mon, 11 May 2020 01:05:42 -0400
Subject: [PATCH 1070/1830] FEATURE: add noindex header to badges, groups, and
 /my pages (#9736)

---
 app/controllers/badges_controller.rb    | 1 +
 app/controllers/groups_controller.rb    | 1 +
 app/controllers/users_controller.rb     | 2 +-
 spec/requests/badges_controller_spec.rb | 1 +
 spec/requests/groups_controller_spec.rb | 1 +
 spec/requests/users_controller_spec.rb  | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/badges_controller.rb b/app/controllers/badges_controller.rb
index f5c82ea3c1..14ff402160 100644
--- a/app/controllers/badges_controller.rb
+++ b/app/controllers/badges_controller.rb
@@ -2,6 +2,7 @@
 
 class BadgesController < ApplicationController
   skip_before_action :check_xhr, only: [:index, :show]
+  after_action :add_noindex_header
 
   def index
     raise Discourse::NotFound unless SiteSetting.enable_badges
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index c9a623d819..60ba516799 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -15,6 +15,7 @@ class GroupsController < ApplicationController
 
   skip_before_action :preload_json, :check_xhr, only: [:posts_feed, :mentions_feed]
   skip_before_action :check_xhr, only: [:show]
+  after_action :add_noindex_header
 
   TYPE_FILTERS = {
     my: Proc.new { |groups, user|
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2c0ca62876..d7319dc2f5 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -48,7 +48,7 @@ class UsersController < ApplicationController
                                                             :admin_login,
                                                             :confirm_admin]
 
-  after_action :add_noindex_header, only: [:show]
+  after_action :add_noindex_header, only: [:show, :my_redirect]
 
   def index
   end
diff --git a/spec/requests/badges_controller_spec.rb b/spec/requests/badges_controller_spec.rb
index f89bb7c830..170977f31c 100644
--- a/spec/requests/badges_controller_spec.rb
+++ b/spec/requests/badges_controller_spec.rb
@@ -17,6 +17,7 @@ describe BadgesController do
       expect(response.status).to eq(200)
       parsed = response.parsed_body
       expect(parsed["badges"].length).to eq(Badge.enabled.count)
+      expect(response.headers['X-Robots-Tag']).to eq('noindex')
     end
   end
 
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index bbbb373067..8d58f3f531 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -364,6 +364,7 @@ describe GroupsController do
 
       expect(body['group']['id']).to eq(group.id)
       expect(body['extras']["visible_group_names"]).to eq([group.name])
+      expect(response.headers['X-Robots-Tag']).to eq('noindex')
     end
 
     context 'as an admin' do
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 53c936f820..cfb1437c06 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -2433,6 +2433,7 @@ describe UsersController do
     it "redirects if the user is not logged in" do
       get "/my/wat.json"
       expect(response).to be_redirect
+      expect(response.headers['X-Robots-Tag']).to eq('noindex')
     end
 
     context "when the user is logged in" do

From b180e6e737900b50939b088c7cb53fb5119354ef Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 11 May 2020 18:36:09 +1000
Subject: [PATCH 1071/1830] FIX: default to blank title on open

In production `title` was set to undefined causing a
discrepancy between originalTitle and title

This attempts to work around the issue in the production bundle
---
 app/assets/javascripts/discourse/app/models/composer.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index 211e4ca93d..e02f17cb64 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -785,7 +785,10 @@ const Composer = RestModel.extend({
       });
     }
 
-    this.set("originalTitle", "");
+    if (this.get("canEditTitle")) {
+      this.set("originalTitle", "");
+      this.set("title", "");
+    }
 
     if (opts.title) {
       this.set("title", opts.title);

From a3a464b838a52b68d06c1678a174ab8522bd8ef5 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 11 May 2020 16:26:02 +0800
Subject: [PATCH 1072/1830] DEV: Improve description of addPosterIcon plugin
 api.

---
 app/assets/javascripts/discourse/app/lib/plugin-api.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index 342dce0a6d..06cecc25ad 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -267,6 +267,7 @@ class PluginApi {
    *   className   (optional) a css class to apply to the icon
    *   url         (optional) where to link the icon
    *   title       (optional) the tooltip title for the icon on hover
+   *   text        (optional) text to display alongside the emoji or icon
    *
    * ```
    * api.addPosterIcon((cfs, attrs) => {

From 8233610d92fb7241658c6888f378c5ddd587e324 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 11 May 2020 16:26:43 +0800
Subject: [PATCH 1073/1830] DEV: Add `add_controller_callback` server side
 plugin api.

---
 lib/plugin/instance.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 5f218ab699..d8bc0b49a4 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -235,6 +235,16 @@ class Plugin::Instance
     end
   end
 
+  def add_controller_callback(klass_name, callback, &block)
+    reloadable_patch do |plugin|
+      klass = klass_name.to_s.classify.constantize rescue klass_name.to_s.constantize
+
+      klass.public_send(callback) do |controller, action|
+        block.call(controller, action) if plugin.enabled?
+      end
+    end
+  end
+
   # Add a post_custom_fields_whitelister block to the TopicView, respecting if the plugin is enabled
   def topic_view_post_custom_fields_whitelister(&block)
     reloadable_patch do |plugin|

From f293b28198c84064f9720ea403c113dbc2428737 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 11 May 2020 16:32:41 +0800
Subject: [PATCH 1074/1830] FEATURE: Pass instance of revisor to `post_edited`
 DiscourseEvent.

---
 lib/post_revisor.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index fd85696cf0..97d516b0ed 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -43,7 +43,7 @@ class PostRevisor
 
   POST_TRACKED_FIELDS = %w{raw cooked edit_reason user_id wiki post_type}
 
-  attr_reader :category_changed
+  attr_reader :category_changed, :post_revision
 
   def initialize(post, topic = post.topic)
     @post = post
@@ -469,7 +469,7 @@ class PostRevisor
       modifications["cooked"][0] = cached_original_cooked || modifications["cooked"][0]
     end
 
-    PostRevision.create!(
+    @post_revision = PostRevision.create!(
       user_id: @post.last_editor_id,
       post_id: @post.id,
       number: @post.version,
@@ -598,7 +598,7 @@ class PostRevisor
   def post_process_post
     @post.invalidate_oneboxes = true
     @post.trigger_post_process
-    DiscourseEvent.trigger(:post_edited, @post, self.topic_changed?)
+    DiscourseEvent.trigger(:post_edited, @post, self.topic_changed?, self)
   end
 
   def update_topic_word_counts

From 77f5bb1419b79c9537db24c8965ad698434b7dad Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 11 May 2020 19:05:32 +1000
Subject: [PATCH 1075/1830] FIX: stop clearing title by mistake

b180e6e737900b caused a short lived regression.

This code is very deliberate about ensuring originalTitle is
set correctly
---
 .../javascripts/discourse/app/models/composer.js       | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index e02f17cb64..0f88c24218 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -785,18 +785,16 @@ const Composer = RestModel.extend({
       });
     }
 
-    if (this.get("canEditTitle")) {
-      this.set("originalTitle", "");
-      this.set("title", "");
-    }
-
     if (opts.title) {
       this.set("title", opts.title);
     }
 
     this.set("originalText", opts.draft ? "" : this.reply);
 
-    if (this.editingFirstPost) {
+    if (this.canEditTitle) {
+      if (isEmpty(this.title) && this.title !== "") {
+        this.set("title", "");
+      }
       this.set("originalTitle", this.title);
     }
 

From 89c6f697b8496d068229bdfc19fe22f144a4f54b Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 11 May 2020 09:23:36 -0500
Subject: [PATCH 1076/1830] DEV: Plugin outlet after save or cancel composer
 buttons (#9725)

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

diff --git a/app/assets/javascripts/discourse/app/templates/composer.hbs b/app/assets/javascripts/discourse/app/templates/composer.hbs
index c577fbc704..672d5d2d01 100644
--- a/app/assets/javascripts/discourse/app/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer.hbs
@@ -185,6 +185,7 @@
                 </span>
               {{/if}}
             </div>
+            {{plugin-outlet name="composer-after-save-or-cancel" connectorTagName="" args=(hash model=model)}}
           </div>
 
           {{#if site.mobileView}}

From a9cf680f762c122387e67b24ba45efc74a23cfd1 Mon Sep 17 00:00:00 2001
From: Risto <ristoe@hotmail.com>
Date: Mon, 11 May 2020 17:43:21 +0300
Subject: [PATCH 1077/1830] A typo fix (#9717)

---
 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 e4a65a3b1e..2d60c1b284 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1842,7 +1842,7 @@ en:
           other: "{{count}} unread messages"
         high_priority:
           one: "%{count} unread high priority notification"
-          other: "%{count} unread high priority notificationis"
+          other: "%{count} unread high priority notifications"
       title: "notifications of @name mentions, replies to your posts and topics, messages, etc"
       none: "Unable to load notifications at this time."
       empty: "No notifications found."

From addf9d62f89de10cea0beb6195dd744e70d35c85 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 11 May 2020 16:45:28 +0200
Subject: [PATCH 1078/1830] FIX: prevents rendering topic-category if empty
 (#9720)

---
 app/controllers/topics_controller.rb |  2 ++
 app/views/topics/show.html.erb       | 12 ++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 2d93468185..954369af27 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -1012,6 +1012,8 @@ class TopicsController < ApplicationController
 
     respond_to do |format|
       format.html do
+        @tags = SiteSetting.tagging_enabled ? @topic_view.topic.tags : []
+        @breadcrumbs = helpers.categories_breadcrumb(@topic_view.topic) || []
         @description_meta = @topic_view.topic.excerpt.present? ? @topic_view.topic.excerpt : @topic_view.summary
         store_preloaded("topic_#{@topic_view.topic.id}", MultiJson.dump(topic_view_serializer))
         render :show
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index 801e0a0973..2c6f27155a 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -4,9 +4,8 @@
       <%= render_topic_title(@topic_view.topic) %>
     </h1>
 
-    <div class="topic-category" itemscope itemtype="http://schema.org/BreadcrumbList">
-      <% @breadcrumbs = categories_breadcrumb(@topic_view.topic) %>
-      <% if @breadcrumbs.present? %>
+    <% if @breadcrumbs.present? || @tags.present? %>
+      <div class="topic-category" itemscope itemtype="http://schema.org/BreadcrumbList">
         <% @breadcrumbs.each_with_index do |c, i| %>
           <span itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
             <a href="<%= Discourse.base_url %><%= c[:url] %>" class="badge-wrapper bullet" itemprop="item">
@@ -16,10 +15,7 @@
             <meta itemprop="position" content="<%= i + 1 %>" />
           </span>
         <% end %>
-      <% end %>
 
-      <% if SiteSetting.tagging_enabled %>
-        <% @tags = @topic_view.topic.tags %>
         <% if @tags.present? %>
           <meta itemprop='keywords' content='<%= @tags.map(&:name).join(', ') %>'>
           <div class='discourse-tags list-tags'>
@@ -28,8 +24,8 @@
             <% end %>
           </div>
         <% end %>
-      <% end %>
-    </div>
+      </div>
+    <% end %>
   </div>
 
   <%= server_plugin_outlet "topic_header" %>

From 5fc51ed49c8670092f9b4c1cfeddcd3297fffdcf Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 11 May 2020 15:46:54 +0100
Subject: [PATCH 1079/1830] DEV: Remove unused DiscoursePlugin class (#9715)

---
 config/application.rb                    |  1 -
 lib/discourse_plugin.rb                  | 52 ----------------------
 lib/discourse_plugin_registry.rb         |  6 ---
 spec/components/discourse_plugin_spec.rb | 56 ------------------------
 4 files changed, 115 deletions(-)
 delete mode 100644 lib/discourse_plugin.rb
 delete mode 100644 spec/components/discourse_plugin_spec.rb

diff --git a/config/application.rb b/config/application.rb
index 3eb998adca..fab55ac9f4 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -23,7 +23,6 @@ require 'sprockets/railtie'
 # Plugin related stuff
 require_relative '../lib/plugin_initialization_guard'
 require_relative '../lib/discourse_event'
-require_relative '../lib/discourse_plugin'
 require_relative '../lib/discourse_plugin_registry'
 
 require_relative '../lib/plugin_gem'
diff --git a/lib/discourse_plugin.rb b/lib/discourse_plugin.rb
deleted file mode 100644
index 5d687e0788..0000000000
--- a/lib/discourse_plugin.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-# A basic plugin for Discourse. Meant to be extended and filled in.
-# Most work is delegated to a registry.
-
-class DiscoursePlugin
-
-  attr_reader :registry
-
-  def initialize(registry)
-    @registry = registry
-  end
-
-  def setup
-    # Initialize the plugin here
-  end
-
-  # Loads and mixes in the plugin's mixins into the host app's classes.
-  # A mixin named "UserMixin" will be included into the "User" class.
-  def self.include_mixins
-    mixins.each do |mixin|
-      original_class = mixin.to_s.demodulize.sub("Mixin", "")
-      dependency_file_name = original_class.underscore
-      require_dependency(dependency_file_name)
-      original_class.constantize.public_send(:include, mixin)
-    end
-  end
-
-  # Find the modules defined in the plugin with "Mixin" in their name.
-  def self.mixins
-    constants.map { |const_name| const_get(const_name) }
-      .select { |const| const.class == Module && const.name["Mixin"] }
-  end
-
-  def register_js(file, opts = {})
-    @registry.register_js(file, opts)
-  end
-
-  def register_css(file, plugin_directory_name)
-    @registry.register_css(file, plugin_directory_name)
-  end
-
-  def register_archetype(name, options = {})
-    @registry.register_archetype(name, options)
-  end
-
-  def listen_for(event_name)
-    return unless self.respond_to?(event_name)
-    DiscourseEvent.on(event_name, &self.method(event_name))
-  end
-
-end
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index 8e9dde7d82..2022c24ccf 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -296,10 +296,4 @@ class DiscoursePluginRegistry
     locales.clear
   end
 
-  def self.setup(plugin_class)
-    registry = DiscoursePluginRegistry.new
-    plugin = plugin_class.new(registry)
-    plugin.setup
-  end
-
 end
diff --git a/spec/components/discourse_plugin_spec.rb b/spec/components/discourse_plugin_spec.rb
deleted file mode 100644
index 12a19d94c5..0000000000
--- a/spec/components/discourse_plugin_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe DiscoursePlugin do
-
-  class TestPlugin < DiscoursePlugin
-    module SomeModule
-    end
-
-    module TestMixin
-    end
-  end
-
-  let(:registry) { mock }
-  let(:plugin) { TestPlugin.new(registry) }
-
-  describe ".mixins" do
-    it "finds its mixins" do
-      expect(TestPlugin.mixins).to eq([TestPlugin::TestMixin])
-    end
-  end
-
-  it "delegates adding js to the registry" do
-    registry.expects(:register_js).with('test.js', any_parameters)
-    plugin.register_js('test.js')
-  end
-
-  it "delegates adding css to the registry" do
-    registry.expects(:register_css).with('test.css', 'test')
-    plugin.register_css('test.css', 'test')
-  end
-
-  it "delegates creating archetypes" do
-    registry.expects(:register_archetype).with('banana', oh: 'no!')
-    plugin.register_archetype('banana', oh: 'no!')
-  end
-
-  context 'registering for callbacks' do
-    before do
-      plugin.stubs(:hello)
-      @proc = plugin.listen_for(:hello).first
-    end
-
-    after do
-      DiscourseEvent.off(:hello, &@proc)
-    end
-
-    it "calls the method when it is triggered" do
-      plugin.expects(:hello).with('there')
-      DiscourseEvent.trigger(:hello, 'there')
-    end
-
-  end
-
-end

From b7d6eb39865d8665b61ff311ecaafa591cf21321 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 11 May 2020 17:04:33 +0200
Subject: [PATCH 1080/1830] DEV: Various GitHub Actions CI tweaks (#9724)

* DEV: Update bundler in GitHub Actions CI

* DEV: Fix bundler deprecation warning

Fixes the following two deprecation warnings:

```
[DEPRECATED] The `--deployment` flag is deprecated because it relies on being remembered across bundler invocations, which bundler will no longer do in future versions. Instead please use `bundle config set deployment 'true'`, and stop using this flag
```

```
[DEPRECATED] The `--without` flag is deprecated because it relies on being remembered across bundler invocations, which bundler will no longer do in future versions. Instead please use `bundle config set without 'development'`, and stop using this flag
```

* DEV: The default `retry` value is already `3`

See https://bundler.io/v2.0/man/bundle-config.1.html:

> retry (BUNDLE_RETRY): The number of times to retry failed network requests. Defaults to 3.

* DEV: `&& \` isn't required in multiline `step.run`

Steps use the fail-fast strategy.

* DEV: Use multiline `step.run` where possible
---
 .github/workflows/ci.yml | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aa94465faf..25dbc3839c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,12 +57,14 @@ jobs:
           fetch-depth: 1
 
       - name: Setup Git
-        run:  git config --global user.email "ci@ci.invalid" && git config --global user.name "Discourse CI"
+        run: |
+          git config --global user.email "ci@ci.invalid"
+          git config --global user.name "Discourse CI"
 
       - name: Setup packages
         if: env.BUILD_TYPE != 'LINT'
         run: |
-          sudo apt-get -yqq install postgresql-client libpq-dev gifsicle jpegoptim optipng jhead && \
+          sudo apt-get -yqq install postgresql-client libpq-dev gifsicle jpegoptim optipng jhead
           wget -qO- https://raw.githubusercontent.com/discourse/discourse_docker/master/image/base/install-pngquant | sudo sh
 
       - name: Setup redis
@@ -78,7 +80,10 @@ jobs:
           architecture: 'x64'
 
       - name: Setup bundler
-        run: gem install bundler -v 2.1.1 --no-doc
+        run: |
+          gem install bundler -v 2.1.4 --no-doc
+          bundle config deployment 'true'
+          bundle config without 'development'
 
       - name: Bundler cache
         uses: actions/cache@v1
@@ -90,7 +95,7 @@ jobs:
             ${{ runner.os }}-gem-
 
       - name: Setup gems
-        run: bundle install --without development --deployment --jobs 4 --retry 3
+        run: bundle install --jobs 4
 
       - name: Get yarn cache directory
         id: yarn-cache-dir
@@ -114,11 +119,15 @@ jobs:
 
       - name: Create database
         if: env.BUILD_TYPE != 'LINT'
-        run: bin/rake db:create && bin/rake db:migrate
+        run: |
+          bin/rake db:create
+          bin/rake db:migrate
 
       - name: Create parallel databases
         if: env.BUILD_TYPE == 'BACKEND' && env.TARGET == 'CORE'
-        run: bin/rake parallel:create && bin/rake parallel:migrate
+        run: |
+          bin/rake parallel:create
+          bin/rake parallel:migrate
 
       - name: Rubocop
         if: env.BUILD_TYPE == 'LINT'
@@ -126,7 +135,9 @@ jobs:
 
       - name: ESLint
         if: env.BUILD_TYPE == 'LINT'
-        run: yarn eslint app/assets/javascripts test/javascripts && yarn eslint --ext .es6 app/assets/javascripts test/javascripts plugins
+        run: |
+          yarn eslint app/assets/javascripts test/javascripts
+          yarn eslint --ext .es6 app/assets/javascripts test/javascripts plugins
 
       - name: Prettier
         if: env.BUILD_TYPE == 'LINT'
@@ -136,7 +147,9 @@ jobs:
 
       - name: Core RSpec
         if: env.BUILD_TYPE == 'BACKEND' && env.TARGET == 'CORE'
-        run: bin/turbo_rspec && bin/rake plugin:spec
+        run: |
+          bin/turbo_rspec
+          bin/rake plugin:spec
 
       - name: Plugin RSpec
         if: env.BUILD_TYPE == 'BACKEND' && env.TARGET == 'PLUGINS'

From a2bb33b6d7837b07617530b3e54eb83fb7c59ca2 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 11 May 2020 17:05:05 +0200
Subject: [PATCH 1081/1830] REFACTOR: Remove an unused Topic model observer
 (#9723)

As far I can tell nothing sets categoryName on the Topic model. Didn't find anything in all-the-plugins/all-the-themes either.
---
 app/assets/javascripts/discourse/app/models/topic.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js
index 573104b6eb..f7ec6ead94 100644
--- a/app/assets/javascripts/discourse/app/models/topic.js
+++ b/app/assets/javascripts/discourse/app/models/topic.js
@@ -236,16 +236,6 @@ const Topic = RestModel.extend({
     this.set("category", Category.findById(this.category_id));
   },
 
-  @observes("categoryName")
-  _categoryNameChanged() {
-    const categoryName = this.categoryName;
-    let category;
-    if (categoryName) {
-      category = this.site.get("categories").findBy("name", categoryName);
-    }
-    this.set("category", category);
-  },
-
   categoryClass: fmt("category.fullSlug", "category-%@"),
 
   @discourseComputed("tags")

From 7d3c4a5f1388b65601dbbc7eda9235f540f9e57d Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 11 May 2020 17:05:40 +0200
Subject: [PATCH 1082/1830] FIX: Show category name in badge preview on edit
 (#9726)

---
 .../discourse/app/components/edit-category-general.js        | 2 +-
 .../app/templates/components/category-name-fields.hbs        | 2 +-
 test/javascripts/acceptance/category-edit-test.js            | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/edit-category-general.js b/app/assets/javascripts/discourse/app/components/edit-category-general.js
index 9d3e548a20..ad9c056623 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-general.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-general.js
@@ -66,7 +66,7 @@ export default buildCategoryPanel("general", {
 
   @discourseComputed(
     "category.parent_category_id",
-    "category.categoryName",
+    "category.name",
     "category.color",
     "category.text_color"
   )
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs
index b54858ff79..7bcefbbe18 100644
--- a/app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs
@@ -2,7 +2,7 @@
   {{#unless category.isUncategorizedCategory}}
     <section class="field-item">
       <label>{{i18n "category.name"}}</label>
-      {{text-field value=category.name placeholderKey="category.name_placeholder" maxlength="50"}}
+      {{text-field value=category.name placeholderKey="category.name_placeholder" maxlength="50" class="category-name"}}
     </section>
   {{/unless}}
   <section class="field-item">
diff --git a/test/javascripts/acceptance/category-edit-test.js b/test/javascripts/acceptance/category-edit-test.js
index efdf73d90d..7123b2dcaa 100644
--- a/test/javascripts/acceptance/category-edit-test.js
+++ b/test/javascripts/acceptance/category-edit-test.js
@@ -21,6 +21,11 @@ QUnit.test("Editing the category", async assert => {
   await visit("/c/bug");
 
   await click(".edit-category");
+
+  assert.equal(find(".d-modal .badge-category").text(), "bug");
+  await fillIn("input.category-name", "testing");
+  assert.equal(find(".d-modal .badge-category").text(), "testing");
+
   await fillIn("#edit-text-color", "#ff0000");
 
   await click(".edit-category-topic-template");

From c6f68e4006e8c834664c3e01820e510d984ea3b3 Mon Sep 17 00:00:00 2001
From: Francesco Frassinelli <fraph24@gmail.com>
Date: Mon, 11 May 2020 17:07:57 +0200
Subject: [PATCH 1083/1830] Fix syntax error in fluxbb.rb (#9727)

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

diff --git a/script/import_scripts/fluxbb.rb b/script/import_scripts/fluxbb.rb
index 3cd1c93bd7..38b84ed3c1 100644
--- a/script/import_scripts/fluxbb.rb
+++ b/script/import_scripts/fluxbb.rb
@@ -63,7 +63,7 @@ class ImportScripts::FluxBB < ImportScripts::Base
   def import_users
     puts '', "creating users"
 
-    total_count = mysql_query(`SELECT count(*) count FROM #{FLUXBB_PREFIX}users;`).first['count']
+    total_count = mysql_query("SELECT count(*) count FROM #{FLUXBB_PREFIX}users;").first['count']
 
     batches(BATCH_SIZE) do |offset|
       results = mysql_query(

From 22ed36e48318fa283d0d9849a15114475e125df0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 11 May 2020 11:20:15 -0400
Subject: [PATCH 1084/1830] Build(deps): Bump rspec-expectations from 3.9.1 to
 3.9.2 (#9732)

Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.9.1 to 3.9.2.
- [Release notes](https://github.com/rspec/rspec-expectations/releases)
- [Changelog](https://github.com/rspec/rspec-expectations/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-expectations/compare/v3.9.1...v3.9.2)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index c574b7b72b..82bbbb6483 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -319,7 +319,7 @@ GEM
       rspec-mocks (~> 3.9.0)
     rspec-core (3.9.2)
       rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.1)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-html-matchers (0.9.2)

From 33b8314ac586f8b75bdb5b5b23ddba1eb80cb439 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 11 May 2020 11:20:35 -0400
Subject: [PATCH 1085/1830] Build(deps): Bump public_suffix from 4.0.4 to 4.0.5
 (#9733)

Bumps [public_suffix](https://github.com/weppos/publicsuffix-ruby) from 4.0.4 to 4.0.5.
- [Release notes](https://github.com/weppos/publicsuffix-ruby/releases)
- [Changelog](https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/weppos/publicsuffix-ruby/compare/v4.0.4...v4.0.5)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 82bbbb6483..d06f55ab45 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -262,7 +262,7 @@ GEM
       method_source (~> 1.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (4.0.4)
+    public_suffix (4.0.5)
     puma (4.3.3)
       nio4r (~> 2.0)
     r2 (0.2.7)

From f722fa3615fe8cd88536720bf6e5469fa0c29228 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 11 May 2020 17:32:39 +0200
Subject: [PATCH 1086/1830] DEV: Remove .travis.yml config

We're no longer use Travis in core.
---
 .travis.yml | 86 -----------------------------------------------------
 1 file changed, 86 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 7119b6cd2e..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-language: ruby
-
-git:
-  depth: false
-
-branches:
-  only:
-    - master
-    - beta
-    - stable
-
-env:
-  global:
-    - TRAVIS_NODE_VERSION="10"
-    - DISCOURSE_HOSTNAME=www.example.com
-    - RUBY_GLOBAL_METHOD_CACHE_SIZE=131072
-  matrix:
-    - "RAILS_MASTER=0 QUNIT_RUN=0 RUN_LINT=0"
-    - "RAILS_MASTER=0 QUNIT_RUN=1 RUN_LINT=0"
-    - "RAILS_MASTER=0 QUNIT_RUN=0 RUN_LINT=1"
-
-addons:
-  chrome: stable
-  postgresql: "9.6"
-  apt:
-    update: true
-    packages:
-    - gifsicle
-    - jpegoptim
-    - optipng
-    - jhead
-
-matrix:
-  fast_finish: true
-
-rvm:
-  - 2.6.3
-
-services:
-  - redis-server
-
-sudo: required
-dist: xenial
-
-cache:
-  yarn: true
-  directories:
-    - vendor/bundle
-
-before_install:
-  - wget -qO- https://raw.githubusercontent.com/discourse/discourse_docker/master/image/base/install-pngquant | sudo sh
-  - nvm install node
-  - node --version
-  - gem install bundler -v 1.17.3
-  - git clone --depth=1 https://github.com/discourse/discourse-backup-uploads-to-s3.git plugins/discourse-backup-uploads-to-s3
-  - git clone --depth=1 https://github.com/discourse/discourse-spoiler-alert.git plugins/discourse-spoiler-alert
-  - git clone --depth=1 https://github.com/discourse/discourse-cakeday.git plugins/discourse-cakeday
-  - git clone --depth=1 https://github.com/discourse/discourse-canned-replies.git plugins/discourse-canned-replies
-  - git clone --depth=1 https://github.com/discourse/discourse-chat-integration.git plugins/discourse-chat-integration
-  - git clone --depth=1 https://github.com/discourse/discourse-assign.git plugins/discourse-assign
-  - git clone --depth=1 https://github.com/discourse/discourse-patreon.git plugins/discourse-patreon
-  - git clone --depth=1 https://github.com/discourse/discourse-user-notes.git plugins/discourse-user-notes
-  - git clone --depth=1 https://github.com/discourse/discourse-group-tracker
-  - export PATH=$HOME/.yarn/bin:$PATH
-
-install:
-  - bash -c "if [ '$RAILS_MASTER' == '1' ]; then bundle update --retry=3 --jobs=3 arel rails seed-fu; fi"
-  - bash -c "if [ '$RAILS_MASTER' == '0' ]; then bundle install --without development --deployment --retry=3 --jobs=3; fi"
-  - bash -c "if [ '$QUNIT_RUN' == '1' ] || [ '$RUN_LINT' == '1' ]; then yarn install --dev; fi"
-  - bash -c "if [ '$RUN_LINT' != '1' ]; then bundle exec rake db:create && LOAD_PLUGINS=1 bundle exec rake db:migrate; fi"
-
-script:
-  - |
-    bash -c "
-      if [ '$RUN_LINT' == '1' ]; then
-        npx lefthook run lints
-      else
-        if [ '$QUNIT_RUN' == '1' ]; then
-          bundle exec rake qunit:test['1200000'] && \
-          bundle exec rake qunit:test['1200000','/wizard/qunit'] && \
-          bundle exec rake plugin:qunit
-        else
-          bundle exec rspec && bundle exec rake plugin:spec
-        fi
-      fi
-    "

From fe2d5da623eac21f3293fa4d1ae1a14be02e1c99 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Sun, 10 May 2020 20:35:31 +0200
Subject: [PATCH 1087/1830] DEV: Remove obsolete commented out tests

Commented out in 2016 in ff74bd7e28a13014dd09228445bf0a9938066518
---
 .../acceptance/search-full-test.js            | 66 -------------------
 1 file changed, 66 deletions(-)

diff --git a/test/javascripts/acceptance/search-full-test.js b/test/javascripts/acceptance/search-full-test.js
index d869af65a3..06af593add 100644
--- a/test/javascripts/acceptance/search-full-test.js
+++ b/test/javascripts/acceptance/search-full-test.js
@@ -172,72 +172,6 @@ QUnit.test("update category through advanced search ui", async assert => {
   );
 });
 
-// test("update group through advanced search ui", assert => {
-//   visit("/search");
-//   fillIn('.search-query', 'none');
-//
-//   fillIn('.search-advanced-options .group-selector', 'moderators');
-//   click('.search-advanced-options .group-selector');
-//   keyEvent('.search-advanced-options .group-selector', 'keydown', 8);
-//
-//   andThen(() => {
-//     waitFor(() => {
-//       assert.ok(visible('.search-advanced-options .autocomplete'), '"autocomplete" popup is visible');
-//       assert.ok(exists('.search-advanced-options .autocomplete ul li a:contains("moderators")'), '"autocomplete" popup has an entry for "moderators"');
-//
-//       click('.search-advanced-options .autocomplete ul li a:first');
-//
-//       andThen(() => {
-//         assert.ok(exists('.search-advanced-options span:contains("moderators")'), 'has "moderators" pre-populated');
-//         assert.equal(find('.search-query').val(), "none group:moderators", 'has updated search term to "none group:moderators"');
-//       });
-//     });
-//   });
-// });
-
-// test("update badges through advanced search ui", assert => {
-//   visit("/search");
-//   fillIn('.search-query', 'none');
-//
-//   fillIn('.search-advanced-options .badge-names', 'Reader');
-//   click('.search-advanced-options .badge-names');
-//   keyEvent('.search-advanced-options .badge-names', 'keydown', 8);
-//
-//   andThen(() => {
-//     waitFor(() => {
-//       assert.ok(visible('.search-advanced-options .autocomplete'), '"autocomplete" popup is visible');
-//       assert.ok(exists('.search-advanced-options .autocomplete ul li a:contains("Reader")'), '"autocomplete" popup has an entry for "Reader"');
-//
-//       click('.search-advanced-options .autocomplete ul li a:first');
-//
-//       andThen(() => {
-//         assert.ok(exists('.search-advanced-options span:contains("Reader")'), 'has "Reader" pre-populated');
-//         assert.equal(find('.search-query').val(), "none badge:Reader", 'has updated search term to "none badge:Reader"');
-//       });
-//     });
-//   });
-// });
-
-// test("update tags through advanced search ui", assert => {
-//   visit("/search");
-//   fillIn('.search-query', 'none');
-//
-//
-//   keyEvent('.search-advanced-options .tag-chooser input.select2-input', 'keydown', 110);
-//   fillIn('.search-advanced-options .tag-chooser input.select2-input', 'monkey');
-//   keyEvent('.search-advanced-options .tag-chooser input.select2-input', 'keyup', 110);
-//
-//   andThen(() => {
-//     waitFor(() => {
-//       click('li.select2-result-selectable:first');
-//       andThen(() => {
-//         assert.ok(exists('.search-advanced-options .tag-chooser .tag-monkey'), 'has "monkey" pre-populated');
-//         assert.equal(find('.search-query').val(), "none tags:monkey", 'has updated search term to "none tags:monkey"');
-//       });
-//     });
-//   });
-// });
-//
 QUnit.test(
   "update in:title filter through advanced search ui",
   async assert => {

From 6e3fe1abbacdde004b33e50003a8b2d2908d8622 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Sun, 10 May 2020 20:41:21 +0200
Subject: [PATCH 1088/1830] DEV: Use async/await instead of `andThen()`

---
 .../poll-builder-disabled-test.js.es6         | 42 ++++++++-----------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6 b/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6
index bb04f7c742..81975a928c 100644
--- a/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6
@@ -13,41 +13,35 @@ acceptance("Poll Builder - polls are disabled", {
   }
 });
 
-test("regular user - sufficient trust level", assert => {
+test("regular user - sufficient trust level", async assert => {
   updateCurrentUser({ moderator: false, admin: false, trust_level: 3 });
 
-  displayPollBuilderButton();
+  await displayPollBuilderButton();
 
-  andThen(() => {
-    assert.ok(
-      !exists(".select-kit-row[title='Build Poll']"),
-      "it hides the builder button"
-    );
-  });
+  assert.ok(
+    !exists(".select-kit-row[title='Build Poll']"),
+    "it hides the builder button"
+  );
 });
 
-test("regular user - insufficient trust level", assert => {
+test("regular user - insufficient trust level", async assert => {
   updateCurrentUser({ moderator: false, admin: false, trust_level: 1 });
 
-  displayPollBuilderButton();
+  await displayPollBuilderButton();
 
-  andThen(() => {
-    assert.ok(
-      !exists(".select-kit-row[title='Build Poll']"),
-      "it hides the builder button"
-    );
-  });
+  assert.ok(
+    !exists(".select-kit-row[title='Build Poll']"),
+    "it hides the builder button"
+  );
 });
 
-test("staff", assert => {
+test("staff", async assert => {
   updateCurrentUser({ moderator: true });
 
-  displayPollBuilderButton();
+  await displayPollBuilderButton();
 
-  andThen(() => {
-    assert.ok(
-      !exists(".select-kit-row[title='Build Poll']"),
-      "it hides the builder button"
-    );
-  });
+  assert.ok(
+    !exists(".select-kit-row[title='Build Poll']"),
+    "it hides the builder button"
+  );
 });

From 4d137b4f89d18fa4d6448f4e516f220a1df2ba0b Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Mon, 11 May 2020 13:32:37 -0300
Subject: [PATCH 1089/1830] FIX: Handle a deleted topic in thumbnail generation

Follow up to 03818e642a1ae871bffdc0c39c10f05f0b8b0398

A topic can be deleted between job enqueue and job execution
---
 app/jobs/regular/generate_topic_thumbnails.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/jobs/regular/generate_topic_thumbnails.rb b/app/jobs/regular/generate_topic_thumbnails.rb
index a01452670c..e670e0fe41 100644
--- a/app/jobs/regular/generate_topic_thumbnails.rb
+++ b/app/jobs/regular/generate_topic_thumbnails.rb
@@ -10,8 +10,8 @@ module Jobs
 
       raise Discourse::InvalidParameters.new(:topic_id) if topic_id.blank?
 
-      topic = Topic.find(topic_id)
-      topic.generate_thumbnails!(extra_sizes: extra_sizes)
+      topic = Topic.find_by(id: topic_id)
+      topic&.generate_thumbnails!(extra_sizes: extra_sizes)
     end
 
   end

From c6bf552ca3a61059d569d199d1e330547a78f761 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 11 May 2020 18:42:18 +0200
Subject: [PATCH 1090/1830] FIX: title should attempt to fallback to label
 before name (#9739)

---
 app/assets/javascripts/select-kit/components/selected-name.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/selected-name.js b/app/assets/javascripts/select-kit/components/selected-name.js
index ac23c16446..e3377d1e1e 100644
--- a/app/assets/javascripts/select-kit/components/selected-name.js
+++ b/app/assets/javascripts/select-kit/components/selected-name.js
@@ -40,7 +40,9 @@ export default Component.extend(UtilsMixin, {
   }),
 
   title: computed("item", function() {
-    return this._safeProperty("title", this.item) || this.name || "";
+    return (
+      this._safeProperty("title", this.item) || this.label || this.name || ""
+    );
   }),
 
   label: computed("title", "name", function() {

From 7a95dd48415c2152f1c791b2dfcd04f6910c1ca7 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 11 May 2020 18:42:51 +0200
Subject: [PATCH 1091/1830] DEV: allows to define an ariaLabel on d-button
 (#9716)

* DEV: allows to define an ariaLabel on d-button

This topic also adds this function to topic-footer-buttons, simplifies the whole logic of titile/label/arialabel in d-button and adds tests for these properties.

* typo
---
 .../discourse/app/components/d-button.js      | 51 ++++++-------
 .../app/lib/register-topic-footer-button.js   | 13 ++++
 .../app/templates/components/d-button.hbs     |  4 +-
 .../components/topic-footer-buttons.hbs       |  1 +
 test/javascripts/components/d-button-test.js  | 72 +++++++++++++++++++
 5 files changed, 114 insertions(+), 27 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/d-button.js b/app/assets/javascripts/discourse/app/components/d-button.js
index 4df816a347..ad4d32a5a2 100644
--- a/app/assets/javascripts/discourse/app/components/d-button.js
+++ b/app/assets/javascripts/discourse/app/components/d-button.js
@@ -5,12 +5,17 @@ import discourseComputed from "discourse-common/utils/decorators";
 import DiscourseURL from "discourse/lib/url";
 
 export default Component.extend({
+  tagName: "button",
   // subclasses need this
   layoutName: "components/d-button",
-
   form: null,
-
   type: "button",
+  title: null,
+  translatedTitle: null,
+  label: null,
+  translatedLabel: null,
+  ariaLabel: null,
+  translatedAriaLabel: null,
 
   isLoading: computed({
     set(key, value) {
@@ -19,7 +24,6 @@ export default Component.extend({
     }
   }),
 
-  tagName: "button",
   classNameBindings: [
     "isLoading:is-loading",
     "btnLink::btn",
@@ -30,8 +34,8 @@ export default Component.extend({
   attributeBindings: [
     "form",
     "isDisabled:disabled",
-    "translatedTitle:title",
-    "translatedLabel:aria-label",
+    "computedTitle:title",
+    "computedAriaLabel:aria-label",
     "tabindex",
     "type"
   ],
@@ -46,7 +50,7 @@ export default Component.extend({
 
   btnLink: equal("display", "link"),
 
-  @discourseComputed("icon", "translatedLabel")
+  @discourseComputed("icon", "computedLabel")
   btnType(icon, translatedLabel) {
     if (icon) {
       return translatedLabel ? "btn-icon-text" : "btn-icon";
@@ -55,28 +59,25 @@ export default Component.extend({
     }
   },
 
-  noText: empty("translatedLabel"),
+  noText: empty("computedLabel"),
 
-  @discourseComputed("title")
-  translatedTitle: {
-    get() {
-      if (this._translatedTitle) return this._translatedTitle;
-      if (this.title) return I18n.t(this.title);
-    },
-    set(value) {
-      return (this._translatedTitle = value);
-    }
+  @discourseComputed("title", "translatedTitle")
+  computedTitle(title, translatedTitle) {
+    if (this.title) return I18n.t(title);
+    return translatedTitle;
   },
 
-  @discourseComputed("label")
-  translatedLabel: {
-    get() {
-      if (this._translatedLabel) return this._translatedLabel;
-      if (this.label) return I18n.t(this.label);
-    },
-    set(value) {
-      return (this._translatedLabel = value);
-    }
+  @discourseComputed("label", "translatedLabel")
+  computedLabel(label, translatedLabel) {
+    if (this.label) return I18n.t(label);
+    return translatedLabel;
+  },
+
+  @discourseComputed("ariaLabel", "translatedAriaLabel", "computedLabel")
+  computedAriaLabel(ariaLabel, translatedAriaLabel, computedLabel) {
+    if (ariaLabel) return I18n.t(ariaLabel);
+    if (translatedAriaLabel) return translatedAriaLabel;
+    return computedLabel;
   },
 
   click() {
diff --git a/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js b/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js
index c2dd9eb96c..ecac09a89a 100644
--- a/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js
+++ b/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js
@@ -28,6 +28,10 @@ export function registerTopicFooterButton(button) {
     label: null,
     translatedLabel: null,
 
+    // local key path for aria label
+    ariaLabel: null,
+    translatedAriaLabel: null,
+
     // is this button disaplyed in the mobile dropdown or as an inline button ?
     dropdown: false,
 
@@ -98,6 +102,15 @@ export function getTopicFooterButtons() {
             ? I18n.t(label)
             : _compute(button, "translatedLabel");
 
+          const ariaLabel = _compute(button, "ariaLabel");
+          if (ariaLabel) {
+            discourseComputedButon.ariaLabel = I18n.t(ariaLabel);
+          } else {
+            const translatedAriaLabel = _compute(button, "translatedAriaLabel");
+            discourseComputedButon.ariaLabel =
+              translatedAriaLabel || discourseComputedButon.label;
+          }
+
           const title = _compute(button, "title");
           discourseComputedButon.title = title
             ? I18n.t(title)
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
index 6c9ed40075..10d12b4d83 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
@@ -10,8 +10,8 @@
   {{/if}}
 {{/if}}
 
-{{#if translatedLabel}}
-  <span class="d-button-label">{{html-safe translatedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
+{{#if computedLabel}}
+  <span class="d-button-label">{{html-safe computedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
 {{/if}}
 
 {{yield}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
index 766ae9bf2b..007ec9c19d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
@@ -29,6 +29,7 @@
       icon=button.icon
       translatedLabel=button.label
       translatedTitle=button.title
+      translatedAriaLabel=button.ariaLabel
       disabled=button.disabled}}
   {{/each}}
 
diff --git a/test/javascripts/components/d-button-test.js b/test/javascripts/components/d-button-test.js
index 5b0bdeb150..1d85d922c4 100644
--- a/test/javascripts/components/d-button-test.js
+++ b/test/javascripts/components/d-button-test.js
@@ -100,3 +100,75 @@ componentTest("disabled button", {
     assert.ok(find("button:not([disabled])").length, "the button is enabled");
   }
 });
+
+componentTest("aria-label", {
+  template:
+    "{{d-button ariaLabel=ariaLabel translatedAriaLabel=translatedAriaLabel}}",
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = { fooAriaLabel: "foo" };
+  },
+
+  test(assert) {
+    this.set("ariaLabel", "test.fooAriaLabel");
+
+    assert.equal(
+      find("button")[0].getAttribute("aria-label"),
+      I18n.t("test.fooAriaLabel")
+    );
+
+    this.setProperties({
+      ariaLabel: null,
+      translatedAriaLabel: "bar"
+    });
+
+    assert.equal(find("button")[0].getAttribute("aria-label"), "bar");
+  }
+});
+
+componentTest("title", {
+  template: "{{d-button title=title translatedTitle=translatedTitle}}",
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = { fooTitle: "foo" };
+  },
+
+  test(assert) {
+    this.set("title", "test.fooTitle");
+    assert.equal(
+      find("button")[0].getAttribute("title"),
+      I18n.t("test.fooTitle")
+    );
+
+    this.setProperties({
+      title: null,
+      translatedTitle: "bar"
+    });
+
+    assert.equal(find("button")[0].getAttribute("title"), "bar");
+  }
+});
+
+componentTest("label", {
+  template: "{{d-button label=label translatedLabel=translatedLabel}}",
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = { fooLabel: "foo" };
+  },
+
+  test(assert) {
+    this.set("label", "test.fooLabel");
+
+    assert.equal(
+      find("button .d-button-label").text(),
+      I18n.t("test.fooLabel")
+    );
+
+    this.setProperties({
+      label: null,
+      translatedLabel: "bar"
+    });
+
+    assert.equal(find("button .d-button-label").text(), "bar");
+  }
+});

From 0deb05740f39e29976b69b1be2af1d38f098f4fd Mon Sep 17 00:00:00 2001
From: jjaffeux <j.jaffeux@gmail.com>
Date: Mon, 11 May 2020 19:19:13 +0200
Subject: [PATCH 1092/1830] Revert "DEV: allows to define an ariaLabel on
 d-button (#9716)"

This reverts commit 7a95dd48415c2152f1c791b2dfcd04f6910c1ca7.
---
 .../discourse/app/components/d-button.js      | 51 +++++++------
 .../app/lib/register-topic-footer-button.js   | 13 ----
 .../app/templates/components/d-button.hbs     |  4 +-
 .../components/topic-footer-buttons.hbs       |  1 -
 test/javascripts/components/d-button-test.js  | 72 -------------------
 5 files changed, 27 insertions(+), 114 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/d-button.js b/app/assets/javascripts/discourse/app/components/d-button.js
index ad4d32a5a2..4df816a347 100644
--- a/app/assets/javascripts/discourse/app/components/d-button.js
+++ b/app/assets/javascripts/discourse/app/components/d-button.js
@@ -5,17 +5,12 @@ import discourseComputed from "discourse-common/utils/decorators";
 import DiscourseURL from "discourse/lib/url";
 
 export default Component.extend({
-  tagName: "button",
   // subclasses need this
   layoutName: "components/d-button",
+
   form: null,
+
   type: "button",
-  title: null,
-  translatedTitle: null,
-  label: null,
-  translatedLabel: null,
-  ariaLabel: null,
-  translatedAriaLabel: null,
 
   isLoading: computed({
     set(key, value) {
@@ -24,6 +19,7 @@ export default Component.extend({
     }
   }),
 
+  tagName: "button",
   classNameBindings: [
     "isLoading:is-loading",
     "btnLink::btn",
@@ -34,8 +30,8 @@ export default Component.extend({
   attributeBindings: [
     "form",
     "isDisabled:disabled",
-    "computedTitle:title",
-    "computedAriaLabel:aria-label",
+    "translatedTitle:title",
+    "translatedLabel:aria-label",
     "tabindex",
     "type"
   ],
@@ -50,7 +46,7 @@ export default Component.extend({
 
   btnLink: equal("display", "link"),
 
-  @discourseComputed("icon", "computedLabel")
+  @discourseComputed("icon", "translatedLabel")
   btnType(icon, translatedLabel) {
     if (icon) {
       return translatedLabel ? "btn-icon-text" : "btn-icon";
@@ -59,25 +55,28 @@ export default Component.extend({
     }
   },
 
-  noText: empty("computedLabel"),
+  noText: empty("translatedLabel"),
 
-  @discourseComputed("title", "translatedTitle")
-  computedTitle(title, translatedTitle) {
-    if (this.title) return I18n.t(title);
-    return translatedTitle;
+  @discourseComputed("title")
+  translatedTitle: {
+    get() {
+      if (this._translatedTitle) return this._translatedTitle;
+      if (this.title) return I18n.t(this.title);
+    },
+    set(value) {
+      return (this._translatedTitle = value);
+    }
   },
 
-  @discourseComputed("label", "translatedLabel")
-  computedLabel(label, translatedLabel) {
-    if (this.label) return I18n.t(label);
-    return translatedLabel;
-  },
-
-  @discourseComputed("ariaLabel", "translatedAriaLabel", "computedLabel")
-  computedAriaLabel(ariaLabel, translatedAriaLabel, computedLabel) {
-    if (ariaLabel) return I18n.t(ariaLabel);
-    if (translatedAriaLabel) return translatedAriaLabel;
-    return computedLabel;
+  @discourseComputed("label")
+  translatedLabel: {
+    get() {
+      if (this._translatedLabel) return this._translatedLabel;
+      if (this.label) return I18n.t(this.label);
+    },
+    set(value) {
+      return (this._translatedLabel = value);
+    }
   },
 
   click() {
diff --git a/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js b/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js
index ecac09a89a..c2dd9eb96c 100644
--- a/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js
+++ b/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js
@@ -28,10 +28,6 @@ export function registerTopicFooterButton(button) {
     label: null,
     translatedLabel: null,
 
-    // local key path for aria label
-    ariaLabel: null,
-    translatedAriaLabel: null,
-
     // is this button disaplyed in the mobile dropdown or as an inline button ?
     dropdown: false,
 
@@ -102,15 +98,6 @@ export function getTopicFooterButtons() {
             ? I18n.t(label)
             : _compute(button, "translatedLabel");
 
-          const ariaLabel = _compute(button, "ariaLabel");
-          if (ariaLabel) {
-            discourseComputedButon.ariaLabel = I18n.t(ariaLabel);
-          } else {
-            const translatedAriaLabel = _compute(button, "translatedAriaLabel");
-            discourseComputedButon.ariaLabel =
-              translatedAriaLabel || discourseComputedButon.label;
-          }
-
           const title = _compute(button, "title");
           discourseComputedButon.title = title
             ? I18n.t(title)
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
index 10d12b4d83..6c9ed40075 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
@@ -10,8 +10,8 @@
   {{/if}}
 {{/if}}
 
-{{#if computedLabel}}
-  <span class="d-button-label">{{html-safe computedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
+{{#if translatedLabel}}
+  <span class="d-button-label">{{html-safe translatedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
 {{/if}}
 
 {{yield}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
index 007ec9c19d..766ae9bf2b 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
@@ -29,7 +29,6 @@
       icon=button.icon
       translatedLabel=button.label
       translatedTitle=button.title
-      translatedAriaLabel=button.ariaLabel
       disabled=button.disabled}}
   {{/each}}
 
diff --git a/test/javascripts/components/d-button-test.js b/test/javascripts/components/d-button-test.js
index 1d85d922c4..5b0bdeb150 100644
--- a/test/javascripts/components/d-button-test.js
+++ b/test/javascripts/components/d-button-test.js
@@ -100,75 +100,3 @@ componentTest("disabled button", {
     assert.ok(find("button:not([disabled])").length, "the button is enabled");
   }
 });
-
-componentTest("aria-label", {
-  template:
-    "{{d-button ariaLabel=ariaLabel translatedAriaLabel=translatedAriaLabel}}",
-
-  beforeEach() {
-    I18n.translations[I18n.locale].js.test = { fooAriaLabel: "foo" };
-  },
-
-  test(assert) {
-    this.set("ariaLabel", "test.fooAriaLabel");
-
-    assert.equal(
-      find("button")[0].getAttribute("aria-label"),
-      I18n.t("test.fooAriaLabel")
-    );
-
-    this.setProperties({
-      ariaLabel: null,
-      translatedAriaLabel: "bar"
-    });
-
-    assert.equal(find("button")[0].getAttribute("aria-label"), "bar");
-  }
-});
-
-componentTest("title", {
-  template: "{{d-button title=title translatedTitle=translatedTitle}}",
-
-  beforeEach() {
-    I18n.translations[I18n.locale].js.test = { fooTitle: "foo" };
-  },
-
-  test(assert) {
-    this.set("title", "test.fooTitle");
-    assert.equal(
-      find("button")[0].getAttribute("title"),
-      I18n.t("test.fooTitle")
-    );
-
-    this.setProperties({
-      title: null,
-      translatedTitle: "bar"
-    });
-
-    assert.equal(find("button")[0].getAttribute("title"), "bar");
-  }
-});
-
-componentTest("label", {
-  template: "{{d-button label=label translatedLabel=translatedLabel}}",
-
-  beforeEach() {
-    I18n.translations[I18n.locale].js.test = { fooLabel: "foo" };
-  },
-
-  test(assert) {
-    this.set("label", "test.fooLabel");
-
-    assert.equal(
-      find("button .d-button-label").text(),
-      I18n.t("test.fooLabel")
-    );
-
-    this.setProperties({
-      label: null,
-      translatedLabel: "bar"
-    });
-
-    assert.equal(find("button .d-button-label").text(), "bar");
-  }
-});

From 141f16eb6b6f3f35a10dc1133e66507dd5931fb0 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Mon, 11 May 2020 20:37:50 +0300
Subject: [PATCH 1093/1830] FIX: Multiple schema.org improvements

* Do not show "Uncategorized" category in topics list.
* Use "BreadcrumbList" only if topic is in a category.
* Add tags list as keywords to the first post.
* Add "dateModified" even if it is the same with "datePublished".
* Show "crawler-linkback-list" only if there are links to be shown.
---
 .../common/base/crawler_layout.scss           |  4 ++
 app/views/list/list.erb                       |  2 +-
 app/views/topics/show.html.erb                | 37 ++++++++++++-------
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/common/base/crawler_layout.scss b/app/assets/stylesheets/common/base/crawler_layout.scss
index b0588f35b5..c279aceff4 100644
--- a/app/assets/stylesheets/common/base/crawler_layout.scss
+++ b/app/assets/stylesheets/common/base/crawler_layout.scss
@@ -33,6 +33,10 @@ body.crawler {
     margin-top: 4em;
   }
 
+  .topic-category {
+    display: inline;
+  }
+
   .discourse-tags {
     color: $primary-medium;
   }
diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index 579022caee..2d32efb77b 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -67,7 +67,7 @@
               <a href='<%= t.url %>' class='title raw-link raw-topic-link'><%= t.title %></a>
             </span>
             <div class="link-bottom-line">
-              <% if (!@category || @category.has_children?) && t.category %>
+              <% if (!@category || @category.has_children?) && t.category && !t.category.uncategorized? %>
                 <a href='<%= t.category.url %>' class='badge-wrapper bullet'>
                   <span class='badge-category-bg' style='background-color: #<%= t.category.color %>'></span>
                   <span class='badge-category clear-badge'>
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index 2c6f27155a..c72ab9a427 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -4,26 +4,29 @@
       <%= render_topic_title(@topic_view.topic) %>
     </h1>
 
-    <% if @breadcrumbs.present? || @tags.present? %>
+    <% if @breadcrumbs.present? %>
       <div class="topic-category" itemscope itemtype="http://schema.org/BreadcrumbList">
         <% @breadcrumbs.each_with_index do |c, i| %>
           <span itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
             <a href="<%= Discourse.base_url %><%= c[:url] %>" class="badge-wrapper bullet" itemprop="item">
-              <span class="badge-category-bg" style='background-color: #<%= c[:color] %>'></span>
-              <span class="category-name" itemprop="name"><%= c[:name] %></span>
+              <span class='badge-category-bg' style='background-color: #<%= c[:color] %>'></span>
+              <span class='badge-category clear-badge'>
+                <span class='category-name' itemprop='name'><%= c[:name] %></span>
+              </span>
             </a>
             <meta itemprop="position" content="<%= i + 1 %>" />
           </span>
         <% end %>
+      </div>
+    <% end %>
 
-        <% if @tags.present? %>
-          <meta itemprop='keywords' content='<%= @tags.map(&:name).join(', ') %>'>
-          <div class='discourse-tags list-tags'>
-            <% @tags.each_with_index do |tag, i| %>
-              <a href='<%= "#{Discourse.base_url}/tag/#{tag.name}" %>' class='discourse-tag' rel="tag"><%= tag.name -%></a><% if i < @tags.size - 1 %>, <% end %>
-            <% end %>
-          </div>
-        <% end %>
+    <% if @tags.present? %>
+      <div class="topic-category">
+        <div class='discourse-tags list-tags'>
+          <% @tags.each_with_index do |tag, i| %>
+            <a href='<%= "#{Discourse.base_url}/tag/#{tag.name}" %>' class='discourse-tag' rel="tag"><%= tag.name -%></a><% if i < @tags.size - 1 %>, <% end %>
+          <% end %>
+        </div>
       </div>
     <% end %>
   </div>
@@ -32,7 +35,7 @@
 
   <%- if include_crawler_content? %>
 
-  <% @topic_view.posts.each do |post| %>
+  <% @topic_view.posts.each_with_index do |post, idx| %>
     <div itemscope itemtype='http://schema.org/DiscussionForumPosting' class='topic-body crawler-post'>
       <% if (u = post.user) %>
         <div class='crawler-post-meta'>
@@ -48,6 +51,10 @@
             <% end %>
           </span>
 
+          <% if post.image_url %>
+            <link itemprop="image" href="<%= Discourse.base_url %><%= post.image_url %>">
+          <% end %>
+
           <span class="crawler-post-infos">
             <% if post.updated_at > post.created_at %>
               <meta itemprop='datePublished' content='<%= post.created_at.to_formatted_s(:iso8601) %>'>
@@ -58,6 +65,7 @@
               <time itemprop='datePublished' datetime='<%= post.created_at.to_formatted_s(:iso8601) %>' class='post-time'>
                 <%= l post.created_at, format: :long %>
               </time>
+              <meta itemprop='dateModified' content='<%= post.updated_at.to_formatted_s(:iso8601) %>'>
             <% end %>
           <span itemprop='position'>#<%= post.post_number %></span>
           </span>
@@ -67,6 +75,9 @@
         </div>
 
         <meta itemprop='headline' content='<%= @topic_view.title %>'>
+        <% if idx == 0 %>
+          <meta itemprop='keywords' content='<%= @tags.map(&:name).join(', ') %>'>
+        <% end %>
 
         <div itemprop="interactionStatistic" itemscope itemtype="http://schema.org/InteractionCounter">
            <meta itemprop="interactionType" content="http://schema.org/LikeAction"/>
@@ -79,7 +90,7 @@
             <meta itemprop="userInteractionCount" content="<%= post.reply_count %>" />
           </div>
 
-          <% if @topic_view.link_counts[post.id] && @topic_view.link_counts[post.id].length > 0 %>
+          <% if @topic_view.link_counts[post.id] && @topic_view.link_counts[post.id].filter { |l| l[:reflection] }.length > 0 %>
             <div class='crawler-linkback-list' itemscope itemtype='http://schema.org/ItemList'>
               <% @topic_view.link_counts[post.id].each_with_index do |link, i| %>
                 <% if link[:reflection] && link[:title].present? %>

From 5a073c6a0a140d07cd1c73f746e4dc0878f77e4b Mon Sep 17 00:00:00 2001
From: jjaffeux <j.jaffeux@gmail.com>
Date: Mon, 11 May 2020 20:09:11 +0200
Subject: [PATCH 1094/1830] Revert "FIX: title should attempt to fallback to
 label before name (#9739)"

This reverts commit c6bf552ca3a61059d569d199d1e330547a78f761.
---
 app/assets/javascripts/select-kit/components/selected-name.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/selected-name.js b/app/assets/javascripts/select-kit/components/selected-name.js
index e3377d1e1e..ac23c16446 100644
--- a/app/assets/javascripts/select-kit/components/selected-name.js
+++ b/app/assets/javascripts/select-kit/components/selected-name.js
@@ -40,9 +40,7 @@ export default Component.extend(UtilsMixin, {
   }),
 
   title: computed("item", function() {
-    return (
-      this._safeProperty("title", this.item) || this.label || this.name || ""
-    );
+    return this._safeProperty("title", this.item) || this.name || "";
   }),
 
   label: computed("title", "name", function() {

From af6e61defd695a21e7d15b8dcf55a31fbc20283e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 11 May 2020 20:46:08 +0200
Subject: [PATCH 1095/1830] FIX: sets a title for notifications button (#9745)

---
 .../select-kit/components/notifications-button.js         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/notifications-button.js b/app/assets/javascripts/select-kit/components/notifications-button.js
index f52b5446d3..abf02da3dc 100644
--- a/app/assets/javascripts/select-kit/components/notifications-button.js
+++ b/app/assets/javascripts/select-kit/components/notifications-button.js
@@ -22,10 +22,12 @@ export default DropdownSelectBoxComponent.extend({
   modifySelection(content) {
     content = content || {};
     const { i18nPrefix, i18nPostfix } = this.selectKit.options;
+    const title = I18n.t(
+      `${i18nPrefix}.${this.buttonForValue.key}${i18nPostfix}.title`
+    );
     setProperties(content, {
-      label: I18n.t(
-        `${i18nPrefix}.${this.buttonForValue.key}${i18nPostfix}.title`
-      ),
+      title,
+      label: title,
       icon: this.buttonForValue.icon
     });
     return content;

From ab919332dc0c1cc3edcb5190f1f57f621364624e Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Mon, 11 May 2020 13:06:49 -0600
Subject: [PATCH 1096/1830] DEV: api documentation updates (#9612)

* DEV: api documentation updates

- Created a script to convert json responses to rswag
- Documented several api endpoints
- Switched rswag to use header based auth

* Update script, fix some schema missmatches
---
 script/json_to_rswag.rb              | 101 ++++++
 spec/requests/api/categories_spec.rb | 360 +++++++++++++++++++-
 spec/requests/api/groups_spec.rb     |  79 +++++
 spec/requests/api/posts_spec.rb      | 484 +++++++++++++++++++++++++++
 spec/requests/api/users_spec.rb      |  55 +++
 5 files changed, 1072 insertions(+), 7 deletions(-)
 create mode 100644 script/json_to_rswag.rb
 create mode 100644 spec/requests/api/groups_spec.rb
 create mode 100644 spec/requests/api/posts_spec.rb
 create mode 100644 spec/requests/api/users_spec.rb

diff --git a/script/json_to_rswag.rb b/script/json_to_rswag.rb
new file mode 100644
index 0000000000..e3e25ea2dc
--- /dev/null
+++ b/script/json_to_rswag.rb
@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+require 'json'
+
+# This script is used for development to help document rswag api responses.  It
+# takes a json response string as an input and converts it to ruby in the format
+# that rswag wants so that you can copy+paste it into the appropriate spec rather
+# than typing it by hand.
+#
+# example:
+#
+# ruby script/json_to_rswag.rb '{"success":true,"active":true,"message":"Your account is activated and ready to use.","user_id":18}'
+#
+# will output:
+#
+# schema type: :object, properties: {
+#   success: { type: :boolean },
+#   active: { type: :boolean },
+#   message: { type: :string },
+#   user_id: { type: :integer },
+# }
+
+class JsonToRswag
+
+  def initialize
+    @output = Array.new
+    @output.push("schema type: :object, properties: {")
+  end
+
+  def get_type(k, v)
+    type = ""
+    type = "integer" if v.is_a? Integer
+    type = "number" if v.is_a? Float
+    type = "object" if v.is_a? Hash
+    type = "array" if v.is_a? Array
+    type = "boolean" if v == true || v == false
+    type = "null" if v == nil
+    type = "string" if v.is_a? String
+    if type == ""
+      puts "Cannot determine type for:"
+      puts v
+      exit 1
+    end
+    type
+  end
+
+  def run(h, indent)
+    h.each do |k, v|
+      type = get_type(k, v)
+
+      if type == "object"
+        @output << "#{' ' * indent}#{k}: {"
+        @output << "#{' ' * (indent + 2)}type: :object,"
+        @output << "#{' ' * (indent + 2)}properties: {"
+        run(v, indent + 4)
+        @output << "#{' ' * indent}},"
+      end
+
+      if type == "array"
+        @output << "#{' ' * indent}#{k}: {"
+        @output << "#{' ' * (indent + 2)}type: :array,"
+        @output << "#{' ' * (indent + 2)}items: {"
+        a = v.first
+        if a.is_a? Hash
+          @output << "#{' ' * (indent + 4)}type: :object,"
+          @output << "#{' ' * (indent + 4)}properties: {"
+          run(a , indent + 6)
+          @output << "#{' ' * (indent + 2)}},"
+        else
+          @output << "#{' ' * (indent + 2)}},"
+        end
+        @output << "#{' ' * indent}},"
+      end
+
+      if type == "null"
+        @output << "#{' ' * indent}#{k}: { type: :string, nullable: true },"
+      elsif type != "object" && type != "array"
+        @output << "#{' ' * indent}#{k}: { type: :#{type} },"
+      end
+    end
+
+    @output << "#{' ' * (indent - 2)}}"
+  end
+
+  def print
+    puts @output
+  end
+
+end
+
+input = ARGV[0]
+
+if input == nil || input == ""
+  puts "Please pass in a json string."
+  exit 1
+end
+
+json = JSON.parse(input)
+
+json_to_rswag = JsonToRswag.new
+json_to_rswag.run(json, 2)
+json_to_rswag.print
diff --git a/spec/requests/api/categories_spec.rb b/spec/requests/api/categories_spec.rb
index 0c82cfa389..5de0bdeee9 100644
--- a/spec/requests/api/categories_spec.rb
+++ b/spec/requests/api/categories_spec.rb
@@ -4,6 +4,7 @@ require 'swagger_helper'
 describe 'categories' do
 
   let(:admin) { Fabricate(:admin) }
+  let!(:category) { Fabricate(:category, user: admin) }
 
   before do
     Jobs.run_immediately!
@@ -13,11 +14,7 @@ describe 'categories' do
   path '/categories.json' do
 
     post 'Creates a category' do
-      before do
-        Jobs.run_immediately!
-        sign_in(admin)
-      end
-      tags 'Category'
+      tags 'Categories'
       consumes 'application/json'
       parameter name: :category, in: :body, schema: {
         type: :object,
@@ -38,6 +35,46 @@ describe 'categories' do
                 id: { type: :integer },
                 name: { type: :string },
                 color: { type: :string },
+                text_color: { type: :string },
+                slug: { type: :string },
+                topic_count: { type: :integer },
+                post_count: { type: :integer },
+                position: { type: :integer },
+                description: { type: :string, nullable: true },
+                description_text: { type: :string, nullable: true },
+                topic_url: { type: :string },
+                read_restricted: { type: :boolean },
+                permission: { type: :integer, nullable: true },
+                notification_level: { type: :integer, nullable: true },
+                can_edit: { type: :boolean },
+                topic_template: { type: :string, nullable: true },
+                has_children: { type: :boolean, nullable: true },
+                sort_order: { type: :string, nullable: true },
+                show_subcategory_list: { type: :boolean },
+                num_featured_topics: { type: :integer },
+                default_view: { type: :string, nullable: true },
+                subcategory_list_style: { type: :string },
+                default_topic_period: { type: :string },
+                minimum_required_tags: { type: :integer },
+                navigate_to_first_post_after_read: { type: :boolean },
+                custom_fields: { type: :object },
+                min_tags_from_required_group: { type: :integer },
+                required_tag_group_name: { type: :string, nullable: true },
+                available_groups: { type: :array },
+                auto_close_hours: { type: :integer, nullable: true },
+                auto_close_based_on_last_post: { type: :boolean },
+                group_permissions: { type: :array },
+                email_in: { type: :boolean, nullable: true },
+                email_in_allow_strangers: { type: :boolean },
+                mailinglist_mirror: { type: :boolean },
+                all_topics_wiki: { type: :boolean },
+                can_delete: { type: :boolean },
+                cannot_delete_reason: { type: :string, nullable: true },
+                allow_badges: { type: :boolean },
+                topic_featured_link_allowed: { type: :boolean },
+                search_priority: { type: :integer },
+                uploaded_logo: { type: :string, nullable: true },
+                uploaded_background: { type: :string, nullable: true },
               },
               required: ["id"]
             }
@@ -49,7 +86,7 @@ describe 'categories' do
     end
 
     get 'Retreives a list of categories' do
-      tags 'Category'
+      tags 'Categories'
       produces 'application/json'
 
       response '200', 'categories response' do
@@ -62,7 +99,46 @@ describe 'categories' do
               draft: { type: :string, nullable: true },
               draft_key: { type: :string },
               draft_sequence: { type: :integer },
-              categories: { type: :array },
+              categories: {
+                type: :array,
+                items: {
+                  type: :object,
+                  properties: {
+                    id: { type: :integer },
+                    name: { type: :string },
+                    color: { type: :string },
+                    text_color: { type: :string },
+                    slug: { type: :string },
+                    topic_count: { type: :integer },
+                    post_count: { type: :integer },
+                    position: { type: :integer },
+                    description: { type: :string, nullable: true },
+                    description_text: { type: :string, nullable: true },
+                    topic_url: { type: :string, nullable: true },
+                    read_restricted: { type: :boolean },
+                    permission: { type: :integer, nullable: true },
+                    notification_level: { type: :integer, nullable: true },
+                    can_edit: { type: :boolean },
+                    topic_template: { type: :string, nullable: true },
+                    has_children: { type: :boolean, nullable: true },
+                    sort_order: { type: :string, nullable: true },
+                    show_subcategory_list: { type: :boolean },
+                    num_featured_topics: { type: :integer },
+                    default_view: { type: :string, nullable: true },
+                    subcategory_list_style: { type: :string },
+                    default_topic_period: { type: :string },
+                    minimum_required_tags: { type: :integer },
+                    navigate_to_first_post_after_read: { type: :boolean },
+                    topics_day: { type: :integer },
+                    topics_week: { type: :integer },
+                    topics_month: { type: :integer },
+                    topics_year: { type: :integer },
+                    topics_all_time: { type: :integer },
+                    uploaded_logo: { type: :string, nullable: true },
+                    uploaded_background: { type: :string, nullable: true },
+                  }
+                }
+              },
             }, required: ["categories"]
           }
         }, required: ["category_list"]
@@ -70,4 +146,274 @@ describe 'categories' do
       end
     end
   end
+
+  path '/categories/{category_id}.json' do
+
+    put 'Updates a category' do
+      tags 'Categories'
+      consumes 'application/json'
+      parameter name: :category_id, in: :path, schema: { type: :string }
+      parameter name: :category, in: :body, schema: {
+        type: :object,
+        properties: {
+          name: { type: :string },
+          color: { type: :string },
+          text_color: { type: :string },
+        },
+        required: [ 'name', 'color', 'text_color' ]
+      }
+
+      produces 'application/json'
+      response '200', 'category created' do
+        schema type: :object, properties: {
+          success: { type: :string },
+          category: {
+            type: :object,
+            properties: {
+              id: { type: :integer },
+              name: { type: :string },
+              color: { type: :string },
+              text_color: { type: :string },
+              slug: { type: :string },
+              topic_count: { type: :integer },
+              post_count: { type: :integer },
+              position: { type: :integer },
+              description: { type: :string, nullable: true },
+              description_text: { type: :string, nullable: true },
+              description_excerpt: { type: :string, nullable: true },
+              topic_url: { type: :string, nullable: true },
+              read_restricted: { type: :boolean },
+              permission: { type: :string, nullable: true },
+              notification_level: { type: :integer, nullable: true },
+              can_edit: { type: :boolean },
+              topic_template: { type: :string, nullable: true },
+              has_children: { type: :string, nullable: true },
+              sort_order: { type: :string, nullable: true },
+              sort_ascending: { type: :string, nullable: true },
+              show_subcategory_list: { type: :boolean },
+              num_featured_topics: { type: :integer },
+              default_view: { type: :string, nullable: true },
+              subcategory_list_style: { type: :string },
+              default_top_period: { type: :string },
+              minimum_required_tags: { type: :integer },
+              navigate_to_first_post_after_read: { type: :boolean },
+              custom_fields: {
+                type: :object,
+                properties: {
+                }
+              },
+              min_tags_from_required_group: { type: :integer },
+              required_tag_group_name: { type: :string, nullable: true },
+              available_groups: {
+                type: :array,
+                items: {
+                },
+              },
+              auto_close_hours: { type: :string, nullable: true },
+              auto_close_based_on_last_post: { type: :boolean },
+              group_permissions: {
+                type: :array,
+                items: {
+                  type: :object,
+                  properties: {
+                    permission_type: { type: :integer },
+                    group_name: { type: :string },
+                  }
+                },
+              },
+              email_in: { type: :string, nullable: true },
+              email_in_allow_strangers: { type: :boolean },
+              mailinglist_mirror: { type: :boolean },
+              all_topics_wiki: { type: :boolean },
+              can_delete: { type: :boolean },
+              cannot_delete_reason: { type: :string, nullable: true },
+              allow_badges: { type: :boolean },
+              topic_featured_link_allowed: { type: :boolean },
+              search_priority: { type: :integer },
+              uploaded_logo: { type: :string, nullable: true },
+              uploaded_background: { type: :string, nullable: true },
+            }
+          },
+        }
+
+        let(:category_id) { category.id }
+        run_test!
+      end
+    end
+  end
+
+  path '/c/{category_id}.json' do
+
+    get 'List topics' do
+      tags 'Categories'
+      produces 'application/json'
+      parameter name: :category_id, in: :path, schema: { type: :string }
+
+      response '200', 'response' do
+        schema type: :object, properties: {
+          users: {
+            type: :array,
+            items: {
+              type: :object,
+              properties: {
+                id: { type: :integer },
+                username: { type: :string },
+                name: { type: :string, nullable: true },
+                avatar_template: { type: :string },
+              }
+            }
+          },
+          primary_groups: {
+            type: :array
+          },
+          topic_list: {
+            type: :object,
+            properties: {
+              can_create_topic: { type: :boolean },
+              draft: { type: :string, nullable: true },
+              draft_key: { type: :string },
+              draft_sequence: { type: :integer },
+              per_page: { type: :integer },
+              topics: {
+                type: :array,
+                items: {
+                  type: :object,
+                  properties: {
+                    id: { type: :integer },
+                    title: { type: :string },
+                    fancy_title: { type: :string },
+                    slug: { type: :string },
+                    posts_count: { type: :integer },
+                    reply_count: { type: :integer },
+                    highest_post_number: { type: :integer },
+                    image_url: { type: :string, nullable: true },
+                    created_at: { type: :string },
+                    last_posted_at: { type: :string },
+                    bumped: { type: :boolean },
+                    bumped_at: { type: :string },
+                    archetype: { type: :string },
+                    unseen: { type: :boolean },
+                    pinned: { type: :boolean },
+                    unpinned: { type: :boolean, nullable: true },
+                    excerpt: { type: :string },
+                    visible: { type: :boolean },
+                    closed: { type: :boolean },
+                    archived: { type: :boolean },
+                    bookmarked: { type: :boolean, nullable: true },
+                    liked: { type: :boolean, nullable: true },
+                    views: { type: :integer },
+                    like_count: { type: :integer },
+                    has_summary: { type: :boolean },
+                    last_poster_username: { type: :string },
+                    category_id: { type: :integer },
+                    op_like_count: { type: :integer },
+                    pinned_globally: { type: :boolean },
+                    featured_link: { type: :string, nullable: true },
+                    posters: {
+                      type: :array,
+                      items: {
+                        type: :object,
+                        properties: {
+                          extras: { type: :string },
+                          description: { type: :string },
+                          user_id: { type: :integer },
+                          primary_group_id: { type: :integer, nullable: true },
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+        let(:category_id) { category.id }
+        run_test!
+      end
+    end
+  end
+
+  path '/c/{category_id}/show.json' do
+
+    get 'Show category' do
+      tags 'Categories'
+      produces 'application/json'
+      parameter name: :category_id, in: :path, schema: { type: :string }
+
+      response '200', 'response' do
+        schema type: :object, properties: {
+          category: {
+            type: :object,
+            properties: {
+              id: { type: :integer },
+              name: { type: :string },
+              color: { type: :string },
+              text_color: { type: :string },
+              slug: { type: :string },
+              topic_count: { type: :integer },
+              post_count: { type: :integer },
+              position: { type: :integer },
+              description: { type: :string, nullable: true },
+              description_text: { type: :string, nullable: true },
+              description_excerpt: { type: :string, nullable: true },
+              topic_url: { type: :string, nullable: true },
+              read_restricted: { type: :boolean },
+              permission: { type: :integer },
+              notification_level: { type: :integer, nullable: true },
+              can_edit: { type: :boolean },
+              topic_template: { type: :string, nullable: true },
+              has_children: { type: :string, nullable: true },
+              sort_order: { type: :string, nullable: true },
+              sort_ascending: { type: :string, nullable: true },
+              show_subcategory_list: { type: :boolean },
+              num_featured_topics: { type: :integer },
+              default_view: { type: :string, nullable: true },
+              subcategory_list_style: { type: :string },
+              default_top_period: { type: :string },
+              minimum_required_tags: { type: :integer },
+              navigate_to_first_post_after_read: { type: :boolean },
+              custom_fields: {
+                type: :object,
+                properties: {
+                }
+              },
+              min_tags_from_required_group: { type: :integer },
+              required_tag_group_name: { type: :string, nullable: true },
+              available_groups: {
+                type: :array,
+                items: {
+                },
+              },
+              auto_close_hours: { type: :string, nullable: true },
+              auto_close_based_on_last_post: { type: :boolean },
+              group_permissions: {
+                type: :array,
+                items: {
+                  type: :object,
+                  properties: {
+                    permission_type: { type: :integer },
+                    group_name: { type: :string },
+                  }
+                },
+              },
+              email_in: { type: :string, nullable: true },
+              email_in_allow_strangers: { type: :boolean },
+              mailinglist_mirror: { type: :boolean },
+              all_topics_wiki: { type: :boolean },
+              can_delete: { type: :boolean },
+              cannot_delete_reason: { type: :string, nullable: true },
+              allow_badges: { type: :boolean },
+              topic_featured_link_allowed: { type: :boolean },
+              search_priority: { type: :integer },
+              uploaded_logo: { type: :string, nullable: true },
+              uploaded_background: { type: :string, nullable: true },
+            }
+          },
+        }
+        let(:category_id) { category.id }
+        run_test!
+      end
+    end
+  end
+
 end
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
new file mode 100644
index 0000000000..ab3112aa89
--- /dev/null
+++ b/spec/requests/api/groups_spec.rb
@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+require 'swagger_helper'
+
+describe 'groups' do
+
+  let(:admin) { Fabricate(:admin) }
+
+  before do
+    Jobs.run_immediately!
+    sign_in(admin)
+  end
+
+  path '/admin/groups.json' do
+
+    post 'Creates a group' do
+      tags 'Group'
+      consumes 'application/json'
+      parameter name: :group, in: :body, schema: {
+        type: :object,
+        properties: {
+          group: {
+            type: :object,
+            properties: {
+              name: { type: :string },
+            }, required: [ 'name' ]
+          }
+        },
+      }
+
+      produces 'application/json'
+      response '200', 'group created' do
+        schema type: :object, properties: {
+            basic_group: {
+              type: :object,
+              properties: {
+                id: { type: :integer },
+                automatic: { type: :boolean },
+                name: { type: :string },
+                user_count: { type: :integer },
+                mentionable_level: { type: :integer },
+                messageable_level: { type: :integer },
+                visibility_level: { type: :integer },
+                automatic_membership_email_domains: { type: :string, nullable: true },
+                automatic_membership_retroactive: { type: :boolean },
+                primary_group: { type: :boolean },
+                title: { type: :string, nullable: true },
+                grant_trust_level: { type: :string, nullable: true },
+                incoming_email: { type: :string, nullable: true },
+                has_messages: { type: :boolean },
+                flair_url: { type: :string, nullable: true },
+                flair_bg_color: { type: :string, nullable: true },
+                flair_color: { type: :string, nullable: true },
+                bio_raw: { type: :string, nullable: true },
+                bio_cooked: { type: :string, nullable: true },
+                bio_excerpt: { type: :string, nullable: true },
+                public_admission: { type: :boolean },
+                public_exit: { type: :boolean },
+                allow_membership_requests: { type: :boolean },
+                full_name: { type: :string, nullable: true },
+                default_notification_level: { type: :integer },
+                membership_request_template: { type: :string, nullable: true },
+                membership_visibility_level: { type: :integer },
+                can_see_members: { type: :boolean },
+                publish_read_state: { type: :boolean },
+              },
+              required: ["id"]
+            }
+          }, required: ["basic_group"]
+
+        let(:group) { { name: 'awesome' } }
+        run_test! do |response|
+          data = JSON.parse(response.body)
+          expect(data['basic_group']['name']).to eq("awesome")
+        end
+      end
+    end
+
+  end
+end
diff --git a/spec/requests/api/posts_spec.rb b/spec/requests/api/posts_spec.rb
new file mode 100644
index 0000000000..d232cae183
--- /dev/null
+++ b/spec/requests/api/posts_spec.rb
@@ -0,0 +1,484 @@
+# frozen_string_literal: true
+require 'swagger_helper'
+
+describe 'posts' do
+
+  let(:'Api-Key') { Fabricate(:api_key).key }
+  let(:'Api-Username') { 'system' }
+
+  path '/posts.json' do
+
+    get 'List latest posts across topics' do
+      tags 'Posts'
+      parameter name: 'Api-Key', in: :header, type: :string, required: true
+      parameter name: 'Api-Username', in: :header, type: :string, required: true
+      produces 'application/json'
+
+      response '200', 'latest posts' do
+        schema type: :object, properties: {
+          latest_posts: {
+            type: :array,
+            items: {
+              type: :object,
+              properties: {
+                id: { type: :integer },
+                name: { type: :string },
+                username: { type: :string },
+                avatar_template: { type: :string },
+                created_at: { type: :string },
+                cooked: { type: :string },
+                post_number: { type: :integer },
+                post_type: { type: :integer },
+                updated_at: { type: :string },
+                reply_count: { type: :integer },
+                reply_to_post_number: { type: :string, nullable: true },
+                quote_count: { type: :integer },
+                incoming_link_count: { type: :integer },
+                reads: { type: :integer },
+                readers_count: { type: :integer },
+                score: { type: :number },
+                yours: { type: :boolean },
+                topic_id: { type: :integer },
+                topic_slug: { type: :string },
+                topic_title: { type: :string },
+                topic_html_title: { type: :string },
+                category_id: { type: :integer },
+                display_username: { type: :string },
+                primary_group_name: { type: :string, nullable: true },
+                primary_group_flair_url: { type: :string, nullable: true },
+                primary_group_flair_bg_color: { type: :string, nullable: true },
+                primary_group_flair_color: { type: :string, nullable: true },
+                version: { type: :integer },
+                can_edit: { type: :boolean },
+                can_delete: { type: :boolean },
+                can_recover: { type: :boolean },
+                can_wiki: { type: :boolean },
+                user_title: { type: :string, nullable: true },
+                raw: { type: :string },
+                actions_summary: {
+                  type: :array,
+                  items: {
+                    type: :object,
+                    properties: {
+                      id: { type: :integer },
+                      can_act: { type: :boolean },
+                    }
+                  },
+                },
+                moderator: { type: :boolean },
+                admin: { type: :boolean },
+                staff: { type: :boolean },
+                user_id: { type: :integer },
+                hidden: { type: :boolean },
+                trust_level: { type: :integer },
+                deleted_at: { type: :string, nullable: true },
+                user_deleted: { type: :boolean },
+                edit_reason: { type: :string, nullable: true },
+                can_view_edit_history: { type: :boolean },
+                wiki: { type: :boolean },
+                reviewable_id: { type: :string, nullable: true },
+                reviewable_score_count: { type: :integer },
+                reviewable_score_pending_count: { type: :integer },
+              }
+            },
+          },
+        }
+
+        let!(:post) { Fabricate(:post) }
+        run_test!
+      end
+    end
+
+    post 'Creates a new topic, a new post, or a private message' do
+      tags 'Posts'
+      consumes 'application/json'
+      parameter name: 'Api-Key', in: :header, type: :string, required: true
+      parameter name: 'Api-Username', in: :header, type: :string, required: true
+      # Can't be named :post!
+      parameter name: :post_body, in: :body, schema: {
+        type: :object,
+        properties: {
+          title: {
+            type: :string,
+            description: 'Required if creating a new topic or new private message.'
+          },
+          topic_id: {
+            type: :integer,
+            description: 'Required if creating a new post.'
+          },
+          raw: { type: :string },
+          category: {
+            type: :integer,
+            description: 'Optional if creating a new topic, and ignored if creating a new post.'
+          },
+          target_usernames: {
+            type: :string,
+            description: 'Required for private message, comma separated.',
+            example: 'blake,sam'
+          },
+          archetype: { type: :string },
+          created_at: { type: :string },
+        },
+        required: [ 'raw' ]
+      }
+
+      produces 'application/json'
+      response '200', 'post created' do
+        schema type: :object, properties: {
+          id: { type: :integer },
+          name: { type: :string, nullable: true },
+          username: { type: :string },
+          avatar_template: { type: :string },
+          created_at: { type: :string },
+          cooked: { type: :string },
+          post_number: { type: :integer },
+          post_type: { type: :integer },
+          updated_at: { type: :string },
+          reply_count: { type: :integer },
+          reply_to_post_number: { type: :string, nullable: true },
+          quote_count: { type: :integer },
+          incoming_link_count: { type: :integer },
+          reads: { type: :integer },
+          readers_count: { type: :integer },
+          score: { type: :integer },
+          yours: { type: :boolean },
+          topic_id: { type: :integer },
+          topic_slug: { type: :string },
+          display_username: { type: :string, nullable: true },
+          primary_group_name: { type: :string, nullable: true },
+          primary_group_flair_url: { type: :string, nullable: true },
+          primary_group_flair_bg_color: { type: :string, nullable: true },
+          primary_group_flair_color: { type: :string, nullable: true },
+          version: { type: :integer },
+          can_edit: { type: :boolean },
+          can_delete: { type: :boolean },
+          can_recover: { type: :boolean },
+          can_wiki: { type: :boolean },
+          user_title: { type: :string, nullable: true },
+          actions_summary: {
+            type: :array,
+            items: {
+              type: :object,
+              properties: {
+                id: { type: :integer },
+                can_act: { type: :boolean },
+              }
+            },
+          },
+          moderator: { type: :boolean },
+          admin: { type: :boolean },
+          staff: { type: :boolean },
+          user_id: { type: :integer },
+          draft_sequence: { type: :integer },
+          hidden: { type: :boolean },
+          trust_level: { type: :integer },
+          deleted_at: { type: :string, nullable: true },
+          user_deleted: { type: :boolean },
+          edit_reason: { type: :string, nullable: true },
+          can_view_edit_history: { type: :boolean },
+          wiki: { type: :boolean },
+          reviewable_id: { type: :string, nullable: true },
+          reviewable_score_count: { type: :integer },
+          reviewable_score_pending_count: { type: :integer },
+        }
+
+        let(:post_body) { Fabricate(:post) }
+        run_test!
+      end
+    end
+  end
+
+  path '/posts/{id}.json' do
+
+    get 'Retreive a single post' do
+      tags 'Posts'
+      parameter name: 'Api-Key', in: :header, type: :string, required: true
+      parameter name: 'Api-Username', in: :header, type: :string, required: true
+      parameter name: :id, in: :path, schema: { type: :string }
+
+      produces 'application/json'
+
+      response '200', 'latest posts' do
+        schema type: :object, properties: {
+          id: { type: :integer },
+          name: { type: :string, nullable: true },
+          username: { type: :string },
+          avatar_template: { type: :string },
+          created_at: { type: :string },
+          cooked: { type: :string },
+          post_number: { type: :integer },
+          post_type: { type: :integer },
+          updated_at: { type: :string },
+          reply_count: { type: :integer },
+          reply_to_post_number: { type: :string, nullable: true },
+          quote_count: { type: :integer },
+          incoming_link_count: { type: :integer },
+          reads: { type: :integer },
+          readers_count: { type: :integer },
+          score: { type: :integer },
+          yours: { type: :boolean },
+          topic_id: { type: :integer },
+          topic_slug: { type: :string },
+          display_username: { type: :string, nullable: true },
+          primary_group_name: { type: :string, nullable: true },
+          primary_group_flair_url: { type: :string, nullable: true },
+          primary_group_flair_bg_color: { type: :string, nullable: true },
+          primary_group_flair_color: { type: :string, nullable: true },
+          version: { type: :integer },
+          can_edit: { type: :boolean },
+          can_delete: { type: :boolean },
+          can_recover: { type: :boolean },
+          can_wiki: { type: :boolean },
+          user_title: { type: :string, nullable: true },
+          raw: { type: :string },
+          actions_summary: {
+            type: :array,
+            items: {
+              type: :object,
+              properties: {
+                id: { type: :integer },
+                can_act: { type: :boolean },
+              }
+            },
+          },
+          moderator: { type: :boolean },
+          admin: { type: :boolean },
+          staff: { type: :boolean },
+          user_id: { type: :integer },
+          hidden: { type: :boolean },
+          trust_level: { type: :integer },
+          deleted_at: { type: :string, nullable: true },
+          user_deleted: { type: :boolean },
+          edit_reason: { type: :string, nullable: true },
+          can_view_edit_history: { type: :boolean },
+          wiki: { type: :boolean },
+          reviewable_id: { type: :string, nullable: true },
+          reviewable_score_count: { type: :integer },
+          reviewable_score_pending_count: { type: :integer },
+        }
+
+        let(:id) { Fabricate(:post).id }
+        run_test!
+      end
+    end
+
+    put 'Update a single post' do
+      tags 'Posts'
+      consumes 'application/json'
+      parameter name: 'Api-Key', in: :header, type: :string, required: true
+      parameter name: 'Api-Username', in: :header, type: :string, required: true
+      parameter name: :id, in: :path, schema: { type: :string }
+
+      parameter name: :post_body, in: :body, schema: {
+        type: :object,
+        properties: {
+          post: {
+            type: :object,
+            properties: {
+              raw: { type: :string },
+              edit_reason: { type: :string },
+            }, required: [ 'raw' ]
+          }
+        }
+      }
+
+      produces 'application/json'
+      response '200', 'post updated' do
+        schema type: :object, properties: {
+          post: {
+            type: :object,
+            properties: {
+              id: { type: :integer },
+              name: { type: :string, nullable: true },
+              username: { type: :string },
+              avatar_template: { type: :string },
+              created_at: { type: :string },
+              cooked: { type: :string },
+              post_number: { type: :integer },
+              post_type: { type: :integer },
+              updated_at: { type: :string },
+              reply_count: { type: :integer },
+              reply_to_post_number: { type: :string, nullable: true },
+              quote_count: { type: :integer },
+              incoming_link_count: { type: :integer },
+              reads: { type: :integer },
+              readers_count: { type: :integer },
+              score: { type: :number },
+              yours: { type: :boolean },
+              topic_id: { type: :integer },
+              topic_slug: { type: :string },
+              display_username: { type: :string, nullable: true },
+              primary_group_name: { type: :string, nullable: true },
+              primary_group_flair_url: { type: :string, nullable: true },
+              primary_group_flair_bg_color: { type: :string, nullable: true },
+              primary_group_flair_color: { type: :string, nullable: true },
+              version: { type: :integer },
+              can_edit: { type: :boolean },
+              can_delete: { type: :boolean },
+              can_recover: { type: :boolean },
+              can_wiki: { type: :boolean },
+              user_title: { type: :string, nullable: true },
+              actions_summary: {
+                type: :array,
+                items: {
+                  type: :object,
+                  properties: {
+                    id: { type: :integer },
+                    can_act: { type: :boolean },
+                  }
+                },
+              },
+              moderator: { type: :boolean },
+              admin: { type: :boolean },
+              staff: { type: :boolean },
+              user_id: { type: :integer },
+              draft_sequence: { type: :integer },
+              hidden: { type: :boolean },
+              trust_level: { type: :integer },
+              deleted_at: { type: :string, nullable: true },
+              user_deleted: { type: :boolean },
+              edit_reason: { type: :string, nullable: true },
+              can_view_edit_history: { type: :boolean },
+              wiki: { type: :boolean },
+              reviewable_id: { type: :string, nullable: true },
+              reviewable_score_count: { type: :integer },
+              reviewable_score_pending_count: { type: :integer },
+            }
+          },
+        }
+
+        let(:post_body) { { 'post': { 'raw': 'Updated content!', 'edit_reason': 'fixed typo' } } }
+        let(:id) { Fabricate(:post).id }
+
+        run_test! do |response|
+          data = JSON.parse(response.body)
+          expect(data['post']['cooked']).to eq("<p>Updated content!</p>")
+          expect(data['post']['edit_reason']).to eq("fixed typo")
+        end
+      end
+    end
+  end
+
+  path '/posts/{id}/locked.json' do
+    put 'Lock a post from being edited' do
+      tags 'Posts'
+      consumes 'application/json'
+      parameter name: 'Api-Key', in: :header, type: :string, required: true
+      parameter name: 'Api-Username', in: :header, type: :string, required: true
+      parameter name: :id, in: :path, schema: { type: :string }
+
+      parameter name: :post_body, in: :body, schema: {
+        type: :object,
+        properties: {
+          locked: { type: :boolean }
+        }, required: [ 'locked' ]
+      }
+
+      produces 'application/json'
+      response '200', 'post updated' do
+        schema type: :object, properties: {
+          locked: { type: :boolean },
+        }
+
+        let(:post_body) { { 'locked': 'true' } }
+        let(:id) { Fabricate(:post).id }
+
+        run_test! do |response|
+          data = JSON.parse(response.body)
+          expect(data['locked']).to eq(true)
+        end
+      end
+    end
+  end
+
+  path '/post_actions.json' do
+    post 'Like a post and other actions' do
+      tags 'Posts'
+      consumes 'application/json'
+      parameter name: 'Api-Key', in: :header, type: :string, required: true
+      parameter name: 'Api-Username', in: :header, type: :string, required: true
+
+      parameter name: :post_body, in: :body, schema: {
+        type: :object,
+        properties: {
+          id: { type: :integer },
+          post_action_type_id: { type: :integer },
+          flag_topic: { type: :boolean },
+        }, required: [ 'id', 'post_action_type_id' ]
+      }
+
+      produces 'application/json'
+      response '200', 'post updated' do
+        schema type: :object, properties: {
+          id: { type: :integer },
+          name: { type: :string },
+          username: { type: :string },
+          avatar_template: { type: :string },
+          created_at: { type: :string },
+          cooked: { type: :string },
+          post_number: { type: :integer },
+          post_type: { type: :integer },
+          updated_at: { type: :string },
+          reply_count: { type: :integer },
+          reply_to_post_number: { type: :string, nullable: true },
+          quote_count: { type: :integer },
+          incoming_link_count: { type: :integer },
+          reads: { type: :integer },
+          readers_count: { type: :integer },
+          score: { type: :number },
+          yours: { type: :boolean },
+          topic_id: { type: :integer },
+          topic_slug: { type: :string },
+          display_username: { type: :string },
+          primary_group_name: { type: :string, nullable: true },
+          primary_group_flair_url: { type: :string, nullable: true },
+          primary_group_flair_bg_color: { type: :string, nullable: true },
+          primary_group_flair_color: { type: :string, nullable: true },
+          version: { type: :integer },
+          can_edit: { type: :boolean },
+          can_delete: { type: :boolean },
+          can_recover: { type: :boolean },
+          can_wiki: { type: :boolean },
+          user_title: { type: :string, nullable: true },
+          actions_summary: {
+            type: :array,
+            items: {
+              type: :object,
+              properties: {
+                id: { type: :integer },
+                count: { type: :integer },
+                acted: { type: :boolean },
+                can_undo: { type: :boolean },
+              }
+            },
+          },
+          moderator: { type: :boolean },
+          admin: { type: :boolean },
+          staff: { type: :boolean },
+          user_id: { type: :integer },
+          hidden: { type: :boolean },
+          trust_level: { type: :integer },
+          deleted_at: { type: :string, nullable: true },
+          user_deleted: { type: :boolean },
+          edit_reason: { type: :string, nullable: true },
+          can_view_edit_history: { type: :boolean },
+          wiki: { type: :boolean },
+          notice_type: { type: :string },
+          reviewable_id: { type: :string, nullable: true },
+          reviewable_score_count: { type: :integer },
+          reviewable_score_pending_count: { type: :integer },
+        }
+
+        let(:id) { Fabricate(:post).id }
+        let(:post_body) { { id: id, post_action_type_id: 2 } }
+
+        run_test! do |response|
+          data = JSON.parse(response.body)
+          expect(data['actions_summary'][0]['id']).to eq(2)
+          expect(data['actions_summary'][0]['count']).to eq(1)
+        end
+      end
+    end
+  end
+
+end
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
new file mode 100644
index 0000000000..925f3be083
--- /dev/null
+++ b/spec/requests/api/users_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+require 'swagger_helper'
+
+describe 'users' do
+
+  let(:'Api-Key') { Fabricate(:api_key).key }
+  let(:'Api-Username') { 'system' }
+
+  path '/users.json' do
+
+    post 'Creates a user' do
+      tags 'Users'
+      consumes 'application/json'
+      parameter name: 'Api-Key', in: :header, type: :string, required: true
+      parameter name: 'Api-Username', in: :header, type: :string, required: true
+      parameter name: :user_body, in: :body, schema: {
+        type: :object,
+        properties: {
+          "name": { type: :string },
+          "email": { type: :string },
+          "password": { type: :string },
+          "username": { type: :string },
+          "active": { type: :boolean },
+          "approved": { type: :boolean },
+          "user_fields[1]": { type: :string },
+        },
+        required: ['name', 'email', 'password', 'username']
+      }
+
+      produces 'application/json'
+      response '200', 'user created' do
+        schema type: :object, properties: {
+          success: { type: :boolean },
+          active: { type: :boolean },
+          message: { type: :string },
+          user_id: { type: :integer },
+        }
+
+        let(:user_body) { {
+          name: 'user',
+          username: 'user1',
+          email: 'user1@example.com',
+          password: '13498428e9597cab689b468ebc0a5d33',
+          active: true
+        } }
+        run_test! do |response|
+          data = JSON.parse(response.body)
+          expect(data['success']).to eq(true)
+          expect(data['active']).to eq(true)
+        end
+      end
+    end
+
+  end
+end

From d2b16a761867abbdcc793c92405e26a69e868e97 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 11 May 2020 15:29:46 -0400
Subject: [PATCH 1097/1830] DEV: Generate `emoji/data` on demand (#9744)

These emoji rarely change and can be re-generated when we make changes
to them.
---
 .../pretty-text/addon/emoji/data.js           | 4554 +++++++++++++++++
 .../pretty-text/addon/emoji/data.js.erb       |    6 -
 lib/tasks/javascript.rake                     |   23 +-
 3 files changed, 4576 insertions(+), 7 deletions(-)
 create mode 100644 app/assets/javascripts/pretty-text/addon/emoji/data.js
 delete mode 100644 app/assets/javascripts/pretty-text/addon/emoji/data.js.erb

diff --git a/app/assets/javascripts/pretty-text/addon/emoji/data.js b/app/assets/javascripts/pretty-text/addon/emoji/data.js
new file mode 100644
index 0000000000..a6332e9e37
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/addon/emoji/data.js
@@ -0,0 +1,4554 @@
+// DO NOT EDIT THIS FILE!!!
+// Update it by running `rake javascript:update_constants`
+
+export const emojis = [
+  "grinning",
+  "grimacing",
+  "grin",
+  "joy",
+  "rofl",
+  "smiley",
+  "smile",
+  "sweat_smile",
+  "laughing",
+  "innocent",
+  "wink",
+  "blush",
+  "slightly_smiling_face",
+  "upside_down_face",
+  "relaxed",
+  "yum",
+  "relieved",
+  "heart_eyes",
+  "kissing_heart",
+  "kissing",
+  "kissing_smiling_eyes",
+  "kissing_closed_eyes",
+  "stuck_out_tongue_winking_eye",
+  "stuck_out_tongue_closed_eyes",
+  "stuck_out_tongue",
+  "money_mouth_face",
+  "nerd_face",
+  "sunglasses",
+  "clown_face",
+  "cowboy_hat_face",
+  "hugs",
+  "smirk",
+  "no_mouth",
+  "neutral_face",
+  "expressionless",
+  "unamused",
+  "roll_eyes",
+  "thinking",
+  "lying_face",
+  "flushed",
+  "disappointed",
+  "worried",
+  "angry",
+  "rage",
+  "pensive",
+  "confused",
+  "slightly_frowning_face",
+  "frowning_face",
+  "persevere",
+  "confounded",
+  "tired_face",
+  "weary",
+  "triumph",
+  "open_mouth",
+  "scream",
+  "fearful",
+  "cold_sweat",
+  "hushed",
+  "frowning",
+  "anguished",
+  "cry",
+  "disappointed_relieved",
+  "drooling_face",
+  "sleepy",
+  "sweat",
+  "sob",
+  "dizzy_face",
+  "astonished",
+  "zipper_mouth_face",
+  "nauseated_face",
+  "sneezing_face",
+  "mask",
+  "face_with_thermometer",
+  "face_with_head_bandage",
+  "sleeping",
+  "zzz",
+  "poop",
+  "smiling_imp",
+  "imp",
+  "japanese_ogre",
+  "japanese_goblin",
+  "skull",
+  "ghost",
+  "alien",
+  "robot",
+  "smiley_cat",
+  "smile_cat",
+  "joy_cat",
+  "heart_eyes_cat",
+  "smirk_cat",
+  "kissing_cat",
+  "scream_cat",
+  "crying_cat_face",
+  "pouting_cat",
+  "raised_hands",
+  "clap",
+  "wave",
+  "call_me_hand",
+  "+1",
+  "-1",
+  "facepunch",
+  "fist",
+  "fist_left",
+  "fist_right",
+  "v",
+  "ok_hand",
+  "raised_hand",
+  "raised_back_of_hand",
+  "open_hands",
+  "muscle",
+  "pray",
+  "handshake",
+  "point_up",
+  "point_up_2",
+  "point_down",
+  "point_left",
+  "point_right",
+  "fu",
+  "raised_hand_with_fingers_splayed",
+  "metal",
+  "crossed_fingers",
+  "vulcan_salute",
+  "writing_hand",
+  "selfie",
+  "nail_care",
+  "lips",
+  "tongue",
+  "ear",
+  "nose",
+  "eye",
+  "eyes",
+  "bust_in_silhouette",
+  "busts_in_silhouette",
+  "speaking_head",
+  "baby",
+  "boy",
+  "girl",
+  "man",
+  "woman",
+  "blonde_woman",
+  "blonde_man",
+  "older_man",
+  "older_woman",
+  "man_with_gua_pi_mao",
+  "woman_with_turban",
+  "man_with_turban",
+  "policewoman",
+  "policeman",
+  "construction_worker_woman",
+  "construction_worker_man",
+  "guardswoman",
+  "guardsman",
+  "female_detective",
+  "male_detective",
+  "woman_health_worker",
+  "man_health_worker",
+  "woman_farmer",
+  "man_farmer",
+  "woman_cook",
+  "man_cook",
+  "woman_student",
+  "man_student",
+  "woman_singer",
+  "man_singer",
+  "woman_teacher",
+  "man_teacher",
+  "woman_factory_worker",
+  "man_factory_worker",
+  "woman_technologist",
+  "man_technologist",
+  "woman_office_worker",
+  "man_office_worker",
+  "woman_mechanic",
+  "man_mechanic",
+  "woman_scientist",
+  "man_scientist",
+  "woman_artist",
+  "man_artist",
+  "woman_firefighter",
+  "man_firefighter",
+  "woman_pilot",
+  "man_pilot",
+  "woman_astronaut",
+  "man_astronaut",
+  "woman_judge",
+  "man_judge",
+  "mrs_claus",
+  "santa",
+  "angel",
+  "pregnant_woman",
+  "princess",
+  "prince",
+  "bride_with_veil",
+  "man_in_tuxedo",
+  "running_woman",
+  "running_man",
+  "walking_woman",
+  "walking_man",
+  "dancer",
+  "man_dancing",
+  "dancing_women",
+  "dancing_men",
+  "couple",
+  "two_men_holding_hands",
+  "two_women_holding_hands",
+  "bowing_woman",
+  "bowing_man",
+  "man_facepalming",
+  "woman_facepalming",
+  "woman_shrugging",
+  "man_shrugging",
+  "tipping_hand_woman",
+  "tipping_hand_man",
+  "no_good_woman",
+  "no_good_man",
+  "ok_woman",
+  "ok_man",
+  "raising_hand_woman",
+  "raising_hand_man",
+  "pouting_woman",
+  "pouting_man",
+  "frowning_woman",
+  "frowning_man",
+  "haircut_woman",
+  "haircut_man",
+  "massage_woman",
+  "massage_man",
+  "couple_with_heart_woman_man",
+  "couple_with_heart_woman_woman",
+  "couple_with_heart_man_man",
+  "couplekiss_man_woman",
+  "couplekiss_woman_woman",
+  "couplekiss_man_man",
+  "family_man_woman_boy",
+  "family_man_woman_girl",
+  "family_man_woman_girl_boy",
+  "family_man_woman_boy_boy",
+  "family_man_woman_girl_girl",
+  "family_woman_woman_boy",
+  "family_woman_woman_girl",
+  "family_woman_woman_girl_boy",
+  "family_woman_woman_boy_boy",
+  "family_woman_woman_girl_girl",
+  "family_man_man_boy",
+  "family_man_man_girl",
+  "family_man_man_girl_boy",
+  "family_man_man_boy_boy",
+  "family_man_man_girl_girl",
+  "family_woman_boy",
+  "family_woman_girl",
+  "family_woman_girl_boy",
+  "family_woman_boy_boy",
+  "family_woman_girl_girl",
+  "family_man_boy",
+  "family_man_girl",
+  "family_man_girl_boy",
+  "family_man_boy_boy",
+  "family_man_girl_girl",
+  "womans_clothes",
+  "tshirt",
+  "jeans",
+  "necktie",
+  "dress",
+  "bikini",
+  "kimono",
+  "lipstick",
+  "kiss",
+  "footprints",
+  "high_heel",
+  "sandal",
+  "boot",
+  "mans_shoe",
+  "athletic_shoe",
+  "womans_hat",
+  "tophat",
+  "rescue_worker_helmet",
+  "mortar_board",
+  "crown",
+  "school_satchel",
+  "pouch",
+  "purse",
+  "handbag",
+  "briefcase",
+  "eyeglasses",
+  "dark_sunglasses",
+  "ring",
+  "closed_umbrella",
+  "dog",
+  "cat",
+  "mouse",
+  "hamster",
+  "rabbit",
+  "fox_face",
+  "bear",
+  "panda_face",
+  "koala",
+  "tiger",
+  "lion",
+  "cow",
+  "pig",
+  "pig_nose",
+  "frog",
+  "squid",
+  "octopus",
+  "shrimp",
+  "monkey_face",
+  "gorilla",
+  "see_no_evil",
+  "hear_no_evil",
+  "speak_no_evil",
+  "monkey",
+  "chicken",
+  "penguin",
+  "bird",
+  "baby_chick",
+  "hatching_chick",
+  "hatched_chick",
+  "duck",
+  "eagle",
+  "owl",
+  "bat",
+  "wolf",
+  "boar",
+  "horse",
+  "unicorn",
+  "honeybee",
+  "bug",
+  "butterfly",
+  "snail",
+  "beetle",
+  "ant",
+  "spider",
+  "scorpion",
+  "crab",
+  "snake",
+  "lizard",
+  "turtle",
+  "tropical_fish",
+  "fish",
+  "blowfish",
+  "dolphin",
+  "shark",
+  "whale",
+  "whale2",
+  "crocodile",
+  "leopard",
+  "tiger2",
+  "water_buffalo",
+  "ox",
+  "cow2",
+  "deer",
+  "dromedary_camel",
+  "camel",
+  "elephant",
+  "rhinoceros",
+  "goat",
+  "ram",
+  "sheep",
+  "racehorse",
+  "pig2",
+  "rat",
+  "mouse2",
+  "rooster",
+  "turkey",
+  "dove",
+  "dog2",
+  "poodle",
+  "cat2",
+  "rabbit2",
+  "chipmunk",
+  "paw_prints",
+  "dragon",
+  "dragon_face",
+  "cactus",
+  "christmas_tree",
+  "evergreen_tree",
+  "deciduous_tree",
+  "palm_tree",
+  "seedling",
+  "herb",
+  "shamrock",
+  "four_leaf_clover",
+  "bamboo",
+  "tanabata_tree",
+  "leaves",
+  "fallen_leaf",
+  "maple_leaf",
+  "ear_of_rice",
+  "hibiscus",
+  "sunflower",
+  "rose",
+  "wilted_flower",
+  "tulip",
+  "blossom",
+  "cherry_blossom",
+  "bouquet",
+  "mushroom",
+  "chestnut",
+  "jack_o_lantern",
+  "shell",
+  "spider_web",
+  "earth_americas",
+  "earth_africa",
+  "earth_asia",
+  "full_moon",
+  "waning_gibbous_moon",
+  "last_quarter_moon",
+  "waning_crescent_moon",
+  "new_moon",
+  "waxing_crescent_moon",
+  "first_quarter_moon",
+  "waxing_gibbous_moon",
+  "new_moon_with_face",
+  "full_moon_with_face",
+  "first_quarter_moon_with_face",
+  "last_quarter_moon_with_face",
+  "sun_with_face",
+  "crescent_moon",
+  "star",
+  "star2",
+  "dizzy",
+  "sparkles",
+  "comet",
+  "sunny",
+  "sun_behind_small_cloud",
+  "partly_sunny",
+  "sun_behind_large_cloud",
+  "sun_behind_rain_cloud",
+  "cloud",
+  "cloud_with_rain",
+  "cloud_with_lightning_and_rain",
+  "cloud_with_lightning",
+  "zap",
+  "fire",
+  "boom",
+  "snowflake",
+  "cloud_with_snow",
+  "snowman",
+  "snowman_with_snow",
+  "wind_face",
+  "dash",
+  "tornado",
+  "fog",
+  "open_umbrella",
+  "umbrella",
+  "droplet",
+  "sweat_drops",
+  "ocean",
+  "green_apple",
+  "apple",
+  "pear",
+  "tangerine",
+  "lemon",
+  "banana",
+  "watermelon",
+  "grapes",
+  "strawberry",
+  "melon",
+  "cherries",
+  "peach",
+  "pineapple",
+  "kiwi_fruit",
+  "avocado",
+  "tomato",
+  "eggplant",
+  "cucumber",
+  "carrot",
+  "hot_pepper",
+  "potato",
+  "corn",
+  "sweet_potato",
+  "peanuts",
+  "honey_pot",
+  "croissant",
+  "bread",
+  "baguette_bread",
+  "cheese",
+  "egg",
+  "bacon",
+  "pancakes",
+  "poultry_leg",
+  "meat_on_bone",
+  "fried_shrimp",
+  "fried_egg",
+  "hamburger",
+  "fries",
+  "stuffed_flatbread",
+  "hotdog",
+  "pizza",
+  "spaghetti",
+  "taco",
+  "burrito",
+  "green_salad",
+  "shallow_pan_of_food",
+  "ramen",
+  "stew",
+  "fish_cake",
+  "sushi",
+  "bento",
+  "curry",
+  "rice_ball",
+  "rice",
+  "rice_cracker",
+  "oden",
+  "dango",
+  "shaved_ice",
+  "ice_cream",
+  "icecream",
+  "cake",
+  "birthday",
+  "custard",
+  "candy",
+  "lollipop",
+  "chocolate_bar",
+  "popcorn",
+  "doughnut",
+  "cookie",
+  "milk_glass",
+  "beer",
+  "beers",
+  "clinking_glasses",
+  "wine_glass",
+  "tumbler_glass",
+  "cocktail",
+  "tropical_drink",
+  "champagne",
+  "sake",
+  "tea",
+  "coffee",
+  "baby_bottle",
+  "spoon",
+  "fork_and_knife",
+  "plate_with_cutlery",
+  "soccer",
+  "basketball",
+  "football",
+  "baseball",
+  "tennis",
+  "volleyball",
+  "rugby_football",
+  "8ball",
+  "golf",
+  "golfing_woman",
+  "golfing_man",
+  "ping_pong",
+  "badminton",
+  "goal_net",
+  "ice_hockey",
+  "field_hockey",
+  "cricket_bat_and_ball",
+  "ski",
+  "skier",
+  "snowboarder",
+  "person_fencing",
+  "women_wrestling",
+  "men_wrestling",
+  "woman_cartwheeling",
+  "man_cartwheeling",
+  "woman_playing_handball",
+  "man_playing_handball",
+  "ice_skate",
+  "bow_and_arrow",
+  "fishing_pole_and_fish",
+  "boxing_glove",
+  "martial_arts_uniform",
+  "rowing_woman",
+  "rowing_man",
+  "swimming_woman",
+  "swimming_man",
+  "woman_playing_water_polo",
+  "man_playing_water_polo",
+  "surfing_woman",
+  "surfing_man",
+  "bath",
+  "basketball_woman",
+  "basketball_man",
+  "weight_lifting_woman",
+  "weight_lifting_man",
+  "biking_woman",
+  "biking_man",
+  "mountain_biking_woman",
+  "mountain_biking_man",
+  "horse_racing",
+  "business_suit_levitating",
+  "trophy",
+  "running_shirt_with_sash",
+  "medal_sports",
+  "medal_military",
+  "1st_place_medal",
+  "2nd_place_medal",
+  "3rd_place_medal",
+  "reminder_ribbon",
+  "rosette",
+  "ticket",
+  "tickets",
+  "performing_arts",
+  "art",
+  "circus_tent",
+  "woman_juggling",
+  "man_juggling",
+  "microphone",
+  "headphones",
+  "musical_score",
+  "musical_keyboard",
+  "drum",
+  "saxophone",
+  "trumpet",
+  "guitar",
+  "violin",
+  "clapper",
+  "video_game",
+  "space_invader",
+  "dart",
+  "game_die",
+  "slot_machine",
+  "bowling",
+  "red_car",
+  "taxi",
+  "blue_car",
+  "bus",
+  "trolleybus",
+  "racing_car",
+  "police_car",
+  "ambulance",
+  "fire_engine",
+  "minibus",
+  "truck",
+  "articulated_lorry",
+  "tractor",
+  "kick_scooter",
+  "motorcycle",
+  "bike",
+  "motor_scooter",
+  "rotating_light",
+  "oncoming_police_car",
+  "oncoming_bus",
+  "oncoming_automobile",
+  "oncoming_taxi",
+  "aerial_tramway",
+  "mountain_cableway",
+  "suspension_railway",
+  "railway_car",
+  "train",
+  "monorail",
+  "bullettrain_side",
+  "bullettrain_front",
+  "light_rail",
+  "mountain_railway",
+  "steam_locomotive",
+  "train2",
+  "metro",
+  "tram",
+  "station",
+  "helicopter",
+  "small_airplane",
+  "airplane",
+  "flight_departure",
+  "flight_arrival",
+  "sailboat",
+  "motor_boat",
+  "speedboat",
+  "ferry",
+  "passenger_ship",
+  "rocket",
+  "artificial_satellite",
+  "seat",
+  "canoe",
+  "anchor",
+  "construction",
+  "fuelpump",
+  "busstop",
+  "vertical_traffic_light",
+  "traffic_light",
+  "checkered_flag",
+  "ship",
+  "ferris_wheel",
+  "roller_coaster",
+  "carousel_horse",
+  "building_construction",
+  "foggy",
+  "tokyo_tower",
+  "factory",
+  "fountain",
+  "rice_scene",
+  "mountain",
+  "mountain_snow",
+  "mount_fuji",
+  "volcano",
+  "japan",
+  "camping",
+  "tent",
+  "national_park",
+  "motorway",
+  "railway_track",
+  "sunrise",
+  "sunrise_over_mountains",
+  "desert",
+  "beach_umbrella",
+  "desert_island",
+  "city_sunrise",
+  "city_sunset",
+  "cityscape",
+  "night_with_stars",
+  "bridge_at_night",
+  "milky_way",
+  "stars",
+  "sparkler",
+  "fireworks",
+  "rainbow",
+  "houses",
+  "european_castle",
+  "japanese_castle",
+  "stadium",
+  "statue_of_liberty",
+  "house",
+  "house_with_garden",
+  "derelict_house",
+  "office",
+  "department_store",
+  "post_office",
+  "european_post_office",
+  "hospital",
+  "bank",
+  "hotel",
+  "convenience_store",
+  "school",
+  "love_hotel",
+  "wedding",
+  "classical_building",
+  "church",
+  "mosque",
+  "synagogue",
+  "kaaba",
+  "shinto_shrine",
+  "watch",
+  "iphone",
+  "calling",
+  "computer",
+  "keyboard",
+  "desktop_computer",
+  "printer",
+  "computer_mouse",
+  "trackball",
+  "joystick",
+  "clamp",
+  "minidisc",
+  "floppy_disk",
+  "cd",
+  "dvd",
+  "vhs",
+  "camera",
+  "camera_flash",
+  "video_camera",
+  "movie_camera",
+  "film_projector",
+  "film_strip",
+  "telephone_receiver",
+  "phone",
+  "pager",
+  "fax",
+  "tv",
+  "radio",
+  "studio_microphone",
+  "level_slider",
+  "control_knobs",
+  "stopwatch",
+  "timer_clock",
+  "alarm_clock",
+  "mantelpiece_clock",
+  "hourglass_flowing_sand",
+  "hourglass",
+  "satellite",
+  "battery",
+  "electric_plug",
+  "bulb",
+  "flashlight",
+  "candle",
+  "wastebasket",
+  "oil_drum",
+  "money_with_wings",
+  "dollar",
+  "yen",
+  "euro",
+  "pound",
+  "moneybag",
+  "credit_card",
+  "gem",
+  "balance_scale",
+  "wrench",
+  "hammer",
+  "hammer_and_pick",
+  "hammer_and_wrench",
+  "pick",
+  "nut_and_bolt",
+  "gear",
+  "chains",
+  "gun",
+  "bomb",
+  "hocho",
+  "dagger",
+  "crossed_swords",
+  "shield",
+  "smoking",
+  "skull_and_crossbones",
+  "coffin",
+  "funeral_urn",
+  "amphora",
+  "crystal_ball",
+  "prayer_beads",
+  "barber",
+  "alembic",
+  "telescope",
+  "microscope",
+  "hole",
+  "pill",
+  "syringe",
+  "thermometer",
+  "label",
+  "bookmark",
+  "toilet",
+  "shower",
+  "bathtub",
+  "key",
+  "old_key",
+  "couch_and_lamp",
+  "sleeping_bed",
+  "bed",
+  "door",
+  "bellhop_bell",
+  "framed_picture",
+  "world_map",
+  "parasol_on_ground",
+  "moyai",
+  "shopping",
+  "shopping_cart",
+  "balloon",
+  "flags",
+  "ribbon",
+  "gift",
+  "confetti_ball",
+  "tada",
+  "dolls",
+  "wind_chime",
+  "crossed_flags",
+  "izakaya_lantern",
+  "email",
+  "envelope_with_arrow",
+  "incoming_envelope",
+  "e-mail",
+  "love_letter",
+  "postbox",
+  "mailbox_closed",
+  "mailbox",
+  "mailbox_with_mail",
+  "mailbox_with_no_mail",
+  "package",
+  "postal_horn",
+  "inbox_tray",
+  "outbox_tray",
+  "scroll",
+  "page_with_curl",
+  "bookmark_tabs",
+  "bar_chart",
+  "chart_with_upwards_trend",
+  "chart_with_downwards_trend",
+  "page_facing_up",
+  "date",
+  "calendar",
+  "spiral_calendar",
+  "card_index",
+  "card_file_box",
+  "ballot_box",
+  "file_cabinet",
+  "clipboard",
+  "spiral_notepad",
+  "file_folder",
+  "open_file_folder",
+  "card_index_dividers",
+  "newspaper_roll",
+  "newspaper",
+  "notebook",
+  "closed_book",
+  "green_book",
+  "blue_book",
+  "orange_book",
+  "notebook_with_decorative_cover",
+  "ledger",
+  "books",
+  "open_book",
+  "link",
+  "paperclip",
+  "paperclips",
+  "scissors",
+  "triangular_ruler",
+  "straight_ruler",
+  "pushpin",
+  "round_pushpin",
+  "triangular_flag_on_post",
+  "white_flag",
+  "black_flag",
+  "rainbow_flag",
+  "closed_lock_with_key",
+  "lock",
+  "unlock",
+  "lock_with_ink_pen",
+  "pen",
+  "fountain_pen",
+  "black_nib",
+  "memo",
+  "pencil2",
+  "crayon",
+  "paintbrush",
+  "mag",
+  "mag_right",
+  "heart",
+  "yellow_heart",
+  "green_heart",
+  "blue_heart",
+  "purple_heart",
+  "black_heart",
+  "broken_heart",
+  "heavy_heart_exclamation",
+  "two_hearts",
+  "revolving_hearts",
+  "heartbeat",
+  "heartpulse",
+  "sparkling_heart",
+  "cupid",
+  "gift_heart",
+  "heart_decoration",
+  "peace_symbol",
+  "latin_cross",
+  "star_and_crescent",
+  "om",
+  "wheel_of_dharma",
+  "star_of_david",
+  "six_pointed_star",
+  "menorah",
+  "yin_yang",
+  "orthodox_cross",
+  "place_of_worship",
+  "ophiuchus",
+  "aries",
+  "taurus",
+  "gemini",
+  "cancer",
+  "leo",
+  "virgo",
+  "libra",
+  "scorpius",
+  "sagittarius",
+  "capricorn",
+  "aquarius",
+  "pisces",
+  "id",
+  "atom_symbol",
+  "u7a7a",
+  "u5272",
+  "radioactive",
+  "biohazard",
+  "mobile_phone_off",
+  "vibration_mode",
+  "u6709",
+  "u7121",
+  "u7533",
+  "u55b6",
+  "u6708",
+  "eight_pointed_black_star",
+  "vs",
+  "accept",
+  "white_flower",
+  "ideograph_advantage",
+  "secret",
+  "congratulations",
+  "u5408",
+  "u6e80",
+  "u7981",
+  "a",
+  "b",
+  "ab",
+  "cl",
+  "o2",
+  "sos",
+  "no_entry",
+  "name_badge",
+  "no_entry_sign",
+  "x",
+  "o",
+  "stop_sign",
+  "anger",
+  "hotsprings",
+  "no_pedestrians",
+  "do_not_litter",
+  "no_bicycles",
+  "non-potable_water",
+  "underage",
+  "no_mobile_phones",
+  "exclamation",
+  "grey_exclamation",
+  "question",
+  "grey_question",
+  "bangbang",
+  "interrobang",
+  "100",
+  "low_brightness",
+  "high_brightness",
+  "trident",
+  "fleur_de_lis",
+  "part_alternation_mark",
+  "warning",
+  "children_crossing",
+  "beginner",
+  "recycle",
+  "u6307",
+  "chart",
+  "sparkle",
+  "eight_spoked_asterisk",
+  "negative_squared_cross_mark",
+  "white_check_mark",
+  "diamond_shape_with_a_dot_inside",
+  "cyclone",
+  "loop",
+  "globe_with_meridians",
+  "m",
+  "atm",
+  "sa",
+  "passport_control",
+  "customs",
+  "baggage_claim",
+  "left_luggage",
+  "wheelchair",
+  "no_smoking",
+  "wc",
+  "parking",
+  "potable_water",
+  "mens",
+  "womens",
+  "baby_symbol",
+  "restroom",
+  "put_litter_in_its_place",
+  "cinema",
+  "signal_strength",
+  "koko",
+  "ng",
+  "ok",
+  "up",
+  "cool",
+  "new",
+  "free",
+  "zero",
+  "one",
+  "two",
+  "three",
+  "four",
+  "five",
+  "six",
+  "seven",
+  "eight",
+  "nine",
+  "keycap_ten",
+  "asterisk",
+  "1234",
+  "arrow_forward",
+  "pause_button",
+  "next_track_button",
+  "stop_button",
+  "record_button",
+  "play_or_pause_button",
+  "previous_track_button",
+  "fast_forward",
+  "rewind",
+  "twisted_rightwards_arrows",
+  "repeat",
+  "repeat_one",
+  "arrow_backward",
+  "arrow_up_small",
+  "arrow_down_small",
+  "arrow_double_up",
+  "arrow_double_down",
+  "arrow_right",
+  "arrow_left",
+  "arrow_up",
+  "arrow_down",
+  "arrow_upper_right",
+  "arrow_lower_right",
+  "arrow_lower_left",
+  "arrow_upper_left",
+  "arrow_up_down",
+  "left_right_arrow",
+  "arrows_counterclockwise",
+  "arrow_right_hook",
+  "leftwards_arrow_with_hook",
+  "arrow_heading_up",
+  "arrow_heading_down",
+  "hash",
+  "information_source",
+  "abc",
+  "abcd",
+  "capital_abcd",
+  "symbols",
+  "musical_note",
+  "notes",
+  "wavy_dash",
+  "curly_loop",
+  "heavy_check_mark",
+  "arrows_clockwise",
+  "heavy_plus_sign",
+  "heavy_minus_sign",
+  "heavy_division_sign",
+  "heavy_multiplication_x",
+  "heavy_dollar_sign",
+  "currency_exchange",
+  "copyright",
+  "registered",
+  "tm",
+  "end",
+  "back",
+  "on",
+  "top",
+  "soon",
+  "ballot_box_with_check",
+  "radio_button",
+  "white_circle",
+  "black_circle",
+  "red_circle",
+  "large_blue_circle",
+  "small_orange_diamond",
+  "small_blue_diamond",
+  "large_orange_diamond",
+  "large_blue_diamond",
+  "small_red_triangle",
+  "black_small_square",
+  "white_small_square",
+  "black_large_square",
+  "white_large_square",
+  "small_red_triangle_down",
+  "black_medium_square",
+  "white_medium_square",
+  "black_medium_small_square",
+  "white_medium_small_square",
+  "black_square_button",
+  "white_square_button",
+  "speaker",
+  "sound",
+  "loud_sound",
+  "mute",
+  "mega",
+  "loudspeaker",
+  "bell",
+  "no_bell",
+  "black_joker",
+  "mahjong",
+  "spades",
+  "clubs",
+  "hearts",
+  "diamonds",
+  "flower_playing_cards",
+  "thought_balloon",
+  "right_anger_bubble",
+  "speech_balloon",
+  "left_speech_bubble",
+  "clock1",
+  "clock2",
+  "clock3",
+  "clock4",
+  "clock5",
+  "clock6",
+  "clock7",
+  "clock8",
+  "clock9",
+  "clock10",
+  "clock11",
+  "clock12",
+  "clock130",
+  "clock230",
+  "clock330",
+  "clock430",
+  "clock530",
+  "clock630",
+  "clock730",
+  "clock830",
+  "clock930",
+  "clock1030",
+  "clock1130",
+  "clock1230",
+  "afghanistan",
+  "aland_islands",
+  "albania",
+  "algeria",
+  "american_samoa",
+  "andorra",
+  "angola",
+  "anguilla",
+  "antarctica",
+  "antigua_barbuda",
+  "argentina",
+  "armenia",
+  "aruba",
+  "australia",
+  "austria",
+  "azerbaijan",
+  "bahamas",
+  "bahrain",
+  "bangladesh",
+  "barbados",
+  "belarus",
+  "belgium",
+  "belize",
+  "benin",
+  "bermuda",
+  "bhutan",
+  "bolivia",
+  "caribbean_netherlands",
+  "bosnia_herzegovina",
+  "botswana",
+  "brazil",
+  "british_indian_ocean_territory",
+  "british_virgin_islands",
+  "brunei",
+  "bulgaria",
+  "burkina_faso",
+  "burundi",
+  "cape_verde",
+  "cambodia",
+  "cameroon",
+  "canada",
+  "canary_islands",
+  "cayman_islands",
+  "central_african_republic",
+  "chad",
+  "chile",
+  "cn",
+  "christmas_island",
+  "cocos_islands",
+  "colombia",
+  "comoros",
+  "congo_brazzaville",
+  "congo_kinshasa",
+  "cook_islands",
+  "costa_rica",
+  "croatia",
+  "cuba",
+  "curacao",
+  "cyprus",
+  "czech_republic",
+  "denmark",
+  "djibouti",
+  "dominica",
+  "dominican_republic",
+  "ecuador",
+  "egypt",
+  "el_salvador",
+  "equatorial_guinea",
+  "eritrea",
+  "estonia",
+  "ethiopia",
+  "eu",
+  "falkland_islands",
+  "faroe_islands",
+  "fiji",
+  "finland",
+  "fr",
+  "french_guiana",
+  "french_polynesia",
+  "french_southern_territories",
+  "gabon",
+  "gambia",
+  "georgia",
+  "de",
+  "ghana",
+  "gibraltar",
+  "greece",
+  "greenland",
+  "grenada",
+  "guadeloupe",
+  "guam",
+  "guatemala",
+  "guernsey",
+  "guinea",
+  "guinea_bissau",
+  "guyana",
+  "haiti",
+  "honduras",
+  "hong_kong",
+  "hungary",
+  "iceland",
+  "india",
+  "indonesia",
+  "iran",
+  "iraq",
+  "ireland",
+  "isle_of_man",
+  "israel",
+  "it",
+  "cote_divoire",
+  "jamaica",
+  "jp",
+  "jersey",
+  "jordan",
+  "kazakhstan",
+  "kenya",
+  "kiribati",
+  "kosovo",
+  "kuwait",
+  "kyrgyzstan",
+  "laos",
+  "latvia",
+  "lebanon",
+  "lesotho",
+  "liberia",
+  "libya",
+  "liechtenstein",
+  "lithuania",
+  "luxembourg",
+  "macau",
+  "macedonia",
+  "madagascar",
+  "malawi",
+  "malaysia",
+  "maldives",
+  "mali",
+  "malta",
+  "marshall_islands",
+  "martinique",
+  "mauritania",
+  "mauritius",
+  "mayotte",
+  "mexico",
+  "micronesia",
+  "moldova",
+  "monaco",
+  "mongolia",
+  "montenegro",
+  "montserrat",
+  "morocco",
+  "mozambique",
+  "myanmar",
+  "namibia",
+  "nauru",
+  "nepal",
+  "netherlands",
+  "new_caledonia",
+  "new_zealand",
+  "nicaragua",
+  "niger",
+  "nigeria",
+  "niue",
+  "norfolk_island",
+  "northern_mariana_islands",
+  "north_korea",
+  "norway",
+  "oman",
+  "pakistan",
+  "palau",
+  "palestinian_territories",
+  "panama",
+  "papua_new_guinea",
+  "paraguay",
+  "peru",
+  "philippines",
+  "pitcairn_islands",
+  "poland",
+  "portugal",
+  "puerto_rico",
+  "qatar",
+  "reunion",
+  "romania",
+  "ru",
+  "rwanda",
+  "st_barthelemy",
+  "st_helena",
+  "st_kitts_nevis",
+  "st_lucia",
+  "st_pierre_miquelon",
+  "st_vincent_grenadines",
+  "samoa",
+  "san_marino",
+  "sao_tome_principe",
+  "saudi_arabia",
+  "senegal",
+  "serbia",
+  "seychelles",
+  "sierra_leone",
+  "singapore",
+  "sint_maarten",
+  "slovakia",
+  "slovenia",
+  "solomon_islands",
+  "somalia",
+  "south_africa",
+  "south_georgia_south_sandwich_islands",
+  "kr",
+  "south_sudan",
+  "es",
+  "sri_lanka",
+  "sudan",
+  "suriname",
+  "swaziland",
+  "sweden",
+  "switzerland",
+  "syria",
+  "taiwan",
+  "tajikistan",
+  "tanzania",
+  "thailand",
+  "timor_leste",
+  "togo",
+  "tokelau",
+  "tonga",
+  "trinidad_tobago",
+  "tunisia",
+  "tr",
+  "turkmenistan",
+  "turks_caicos_islands",
+  "tuvalu",
+  "uganda",
+  "ukraine",
+  "united_arab_emirates",
+  "uk",
+  "us",
+  "us_virgin_islands",
+  "uruguay",
+  "uzbekistan",
+  "vanuatu",
+  "vatican_city",
+  "venezuela",
+  "vietnam",
+  "wallis_futuna",
+  "western_sahara",
+  "yemen",
+  "zambia",
+  "zimbabwe",
+  "star_struck",
+  "face_with_raised_eyebrow",
+  "exploding_head",
+  "crazy_face",
+  "face_with_symbols_over_mouth",
+  "face_vomiting",
+  "shushing_face",
+  "face_with_hand_over_mouth",
+  "face_with_monocle",
+  "child",
+  "adult",
+  "older_adult",
+  "woman_with_headscarf",
+  "bearded_person",
+  "breast_feeding",
+  "mage",
+  "woman_mage",
+  "fairy",
+  "vampire",
+  "mermaid",
+  "merman",
+  "elf",
+  "genie",
+  "woman_genie",
+  "zombie",
+  "woman_zombie",
+  "person_in_steamy_room",
+  "woman_in_steamy_room",
+  "person_climbing",
+  "woman_climbing",
+  "person_in_lotus_position",
+  "woman_in_lotus_position",
+  "love_you_gesture",
+  "palms_up_together",
+  "brain",
+  "orange_heart",
+  "scarf",
+  "gloves",
+  "coat",
+  "socks",
+  "billed_cap",
+  "zebra",
+  "giraffe",
+  "hedgehog",
+  "sauropod",
+  "t_rex",
+  "cricket",
+  "coconut",
+  "broccoli",
+  "pretzel",
+  "cut_of_meat",
+  "sandwich",
+  "bowl_with_spoon",
+  "canned_food",
+  "dumpling",
+  "fortune_cookie",
+  "takeout_box",
+  "pie",
+  "cup_with_straw",
+  "chopsticks",
+  "flying_saucer",
+  "sled",
+  "curling_stone",
+  "svalbard_and_jan_mayen",
+  "st_martin",
+  "us_outlying_islands",
+  "tristan_da_cunha",
+  "heard_and_mc_donald_islands",
+  "ceuta_and_melilla",
+  "diego_garcia",
+  "ascension_island",
+  "bouvet_island",
+  "clipperton_island",
+  "united_nations",
+  "smiling_face_with_three_hearts",
+  "hot_face",
+  "cold_face",
+  "partying_face",
+  "woozy_face",
+  "pleading_face",
+  "man_red_haired",
+  "man_curly_haired",
+  "man_white_haired",
+  "man_bald",
+  "woman_red_haired",
+  "woman_curly_haired",
+  "woman_white_haired",
+  "woman_bald",
+  "superhero",
+  "man_superhero",
+  "woman_superhero",
+  "supervillain",
+  "woman_supervillain",
+  "man_supervillain",
+  "leg",
+  "foot",
+  "bone",
+  "tooth",
+  "goggles",
+  "lab_coat",
+  "hiking_boot",
+  "flat_shoe",
+  "raccoon",
+  "llama",
+  "hippopotamus",
+  "kangaroo",
+  "badger",
+  "swan",
+  "peacock",
+  "parrot",
+  "lobster",
+  "mosquito",
+  "microbe",
+  "mango",
+  "leafy_green",
+  "bagel",
+  "salt",
+  "moon_cake",
+  "cupcake",
+  "compass",
+  "brick",
+  "skateboard",
+  "luggage",
+  "firecracker",
+  "red_gift_envelope",
+  "softball",
+  "flying_disc",
+  "lacrosse",
+  "nazar_amulet",
+  "jigsaw",
+  "teddy_bear",
+  "chess_pawn",
+  "thread",
+  "yarn",
+  "abacus",
+  "receipt",
+  "toolbox",
+  "magnet",
+  "test_tube",
+  "petri_dish",
+  "dna",
+  "lotion_bottle",
+  "safety_pin",
+  "broom",
+  "basket",
+  "roll_of_toilet_paper",
+  "soap",
+  "sponge",
+  "fire_extinguisher",
+  "infinity",
+  "pirate_flag",
+  "waffle",
+  "otter",
+  "sloth",
+  "ice_cube",
+  "ringer_planet",
+  "flamingo",
+  "yawning_face",
+  "pinching_hand",
+  "service_dog",
+  "orangutan",
+  "auto_rickshaw",
+  "parachute",
+  "yo-yo",
+  "kite",
+  "brown_square",
+  "purple_square",
+  "blue_square",
+  "green_square",
+  "yellow_square",
+  "orange_square",
+  "red_square",
+  "brown_circle",
+  "purple_circle",
+  "green_circle",
+  "yellow_circle",
+  "orange_circle",
+  "razor",
+  "chair",
+  "stethoscope",
+  "adhesive_bandage",
+  "drop_of_blood",
+  "probing_cane",
+  "axe",
+  "diya_lamp",
+  "banjo",
+  "ballet_shoes",
+  "shorts",
+  "briefs",
+  "one_piece_swimsuit",
+  "sari",
+  "safety_vest",
+  "diving_mask",
+  "motorized_wheelchair",
+  "manual_wheelchair",
+  "hindu_temple",
+  "maté",
+  "beverage_box",
+  "oyster",
+  "butter",
+  "falafel",
+  "onion",
+  "garlic",
+  "skunk",
+  "guide_dog",
+  "people_holding_hands",
+  "woman_in_manual_wheelchair",
+  "man_in_manual_wheelchair",
+  "woman_in_motorized_wheelchair",
+  "man_in_motorized_wheelchair",
+  "woman_with_probing_cane",
+  "man_with_probing_cane",
+  "woman_kneeling",
+  "man_kneeling",
+  "man_standing",
+  "woman_standing",
+  "deaf_woman",
+  "deaf_man",
+  "hear_with_hearing_aid",
+  "mechanical_leg",
+  "mechanical_arm",
+  "white_heart",
+  "brown_heart",
+  "transgender_flag"
+];
+export const tonableEmojis = [
+  "raised_hands",
+  "clap",
+  "wave",
+  "call_me_hand",
+  "+1",
+  "-1",
+  "facepunch",
+  "fist",
+  "fist_left",
+  "fist_right",
+  "v",
+  "ok_hand",
+  "raised_hand",
+  "raised_back_of_hand",
+  "open_hands",
+  "muscle",
+  "pray",
+  "point_up",
+  "point_up_2",
+  "point_down",
+  "point_left",
+  "point_right",
+  "fu",
+  "raised_hand_with_fingers_splayed",
+  "metal",
+  "crossed_fingers",
+  "vulcan_salute",
+  "writing_hand",
+  "selfie",
+  "nail_care",
+  "ear",
+  "nose",
+  "baby",
+  "boy",
+  "girl",
+  "man",
+  "woman",
+  "blonde_woman",
+  "blonde_man",
+  "older_man",
+  "older_woman",
+  "man_with_gua_pi_mao",
+  "woman_with_turban",
+  "man_with_turban",
+  "policewoman",
+  "policeman",
+  "construction_worker_woman",
+  "construction_worker_man",
+  "guardswoman",
+  "guardsman",
+  "male_detective",
+  "woman_health_worker",
+  "man_health_worker",
+  "woman_farmer",
+  "man_farmer",
+  "woman_cook",
+  "man_cook",
+  "woman_student",
+  "man_student",
+  "woman_singer",
+  "man_singer",
+  "woman_teacher",
+  "man_teacher",
+  "woman_factory_worker",
+  "man_factory_worker",
+  "woman_technologist",
+  "man_technologist",
+  "woman_office_worker",
+  "man_office_worker",
+  "woman_mechanic",
+  "man_mechanic",
+  "woman_scientist",
+  "man_scientist",
+  "woman_artist",
+  "man_artist",
+  "woman_firefighter",
+  "man_firefighter",
+  "woman_pilot",
+  "man_pilot",
+  "woman_astronaut",
+  "man_astronaut",
+  "woman_judge",
+  "man_judge",
+  "mrs_claus",
+  "santa",
+  "angel",
+  "pregnant_woman",
+  "princess",
+  "prince",
+  "bride_with_veil",
+  "man_in_tuxedo",
+  "running_woman",
+  "running_man",
+  "walking_woman",
+  "walking_man",
+  "dancer",
+  "man_dancing",
+  "bowing_woman",
+  "bowing_man",
+  "man_facepalming",
+  "woman_facepalming",
+  "woman_shrugging",
+  "man_shrugging",
+  "tipping_hand_woman",
+  "tipping_hand_man",
+  "no_good_woman",
+  "no_good_man",
+  "ok_woman",
+  "ok_man",
+  "raising_hand_woman",
+  "raising_hand_man",
+  "pouting_woman",
+  "pouting_man",
+  "frowning_woman",
+  "frowning_man",
+  "haircut_woman",
+  "haircut_man",
+  "massage_woman",
+  "massage_man",
+  "golfing_man",
+  "snowboarder",
+  "woman_cartwheeling",
+  "man_cartwheeling",
+  "woman_playing_handball",
+  "man_playing_handball",
+  "rowing_woman",
+  "rowing_man",
+  "swimming_woman",
+  "swimming_man",
+  "woman_playing_water_polo",
+  "man_playing_water_polo",
+  "surfing_woman",
+  "surfing_man",
+  "bath",
+  "basketball_man",
+  "weight_lifting_man",
+  "biking_woman",
+  "biking_man",
+  "mountain_biking_woman",
+  "mountain_biking_man",
+  "horse_racing",
+  "business_suit_levitating",
+  "woman_juggling",
+  "man_juggling",
+  "sleeping_bed",
+  "child",
+  "adult",
+  "older_adult",
+  "woman_with_headscarf",
+  "bearded_person",
+  "breast_feeding",
+  "mage",
+  "woman_mage",
+  "fairy",
+  "vampire",
+  "mermaid",
+  "merman",
+  "elf",
+  "person_in_steamy_room",
+  "woman_in_steamy_room",
+  "person_climbing",
+  "woman_climbing",
+  "person_in_lotus_position",
+  "woman_in_lotus_position",
+  "love_you_gesture",
+  "palms_up_together"
+];
+export const aliases = {
+  right_anger_bubble: ["anger_right"],
+  ballot_box: ["ballot_box_with_ballot"],
+  basketball_man: ["basketball_player", "person_with_ball"],
+  beach_umbrella: ["umbrella_on_ground", "beach", "beach_with_umbrella"],
+  parasol_on_ground: ["umbrella_on_ground"],
+  bellhop_bell: ["bellhop"],
+  biohazard: ["biohazard_sign"],
+  bow_and_arrow: ["archery"],
+  spiral_calendar: ["calendar_spiral", "spiral_calendar_pad"],
+  card_file_box: ["card_box"],
+  champagne: ["bottle_with_popping_cork"],
+  cheese: ["cheese_wedge"],
+  city_sunset: ["city_dusk"],
+  couch_and_lamp: ["couch"],
+  crayon: ["lower_left_crayon"],
+  cricket_bat_and_ball: ["cricket_bat_ball"],
+  latin_cross: ["cross"],
+  dagger: ["dagger_knife"],
+  desktop_computer: ["desktop"],
+  card_index_dividers: ["dividers"],
+  dove: ["dove_of_peace"],
+  footprints: ["feet"],
+  fire: ["flame"],
+  black_flag: ["flag_black", "waving_black_flag"],
+  cn: ["flag_cn"],
+  de: ["flag_de"],
+  es: ["flag_es"],
+  fr: ["flag_fr"],
+  uk: ["gb", "flag_gb"],
+  it: ["flag_it"],
+  jp: ["flag_jp"],
+  kr: ["flag_kr"],
+  ru: ["flag_ru"],
+  us: ["flag_us"],
+  white_flag: ["flag_white", "waving_white_flag"],
+  plate_with_cutlery: ["fork_knife_plate", "fork_and_knife_with_plate"],
+  framed_picture: ["frame_photo", "frame_with_picture"],
+  hammer_and_pick: ["hammer_pick"],
+  heavy_heart_exclamation: [
+    "heart_exclamation",
+    "heavy_heart_exclamation_mark_ornament"
+  ],
+  houses: ["homes", "house_buildings"],
+  hotdog: ["hot_dog"],
+  derelict_house: ["house_abandoned", "derelict_house_building"],
+  desert_island: ["island"],
+  old_key: ["key2"],
+  laughing: ["satisfied"],
+  business_suit_levitating: ["levitate", "man_in_business_suit_levitating"],
+  weight_lifting_man: ["lifter", "weight_lifter"],
+  medal_sports: ["medal", "sports_medal"],
+  metal: ["sign_of_the_horns"],
+  fu: ["middle_finger", "reversed_hand_with_middle_finger_extended"],
+  motorcycle: ["racing_motorcycle"],
+  mountain_snow: ["snow_capped_mountain"],
+  newspaper_roll: ["newspaper2", "rolled_up_newspaper"],
+  spiral_notepad: ["notepad_spiral", "spiral_note_pad"],
+  oil_drum: ["oil"],
+  older_woman: ["grandma"],
+  paintbrush: ["lower_left_paintbrush"],
+  paperclips: ["linked_paperclips"],
+  pause_button: ["double_vertical_bar"],
+  peace_symbol: ["peace"],
+  fountain_pen: ["pen_fountain", "lower_left_fountain_pen"],
+  ping_pong: ["table_tennis"],
+  place_of_worship: ["worship_symbol"],
+  poop: ["shit", "hankey", "poo"],
+  radioactive: ["radioactive_sign"],
+  railway_track: ["railroad_track"],
+  robot: ["robot_face"],
+  skull: ["skeleton"],
+  skull_and_crossbones: ["skull_crossbones"],
+  speaking_head: ["speaking_head_in_silhouette"],
+  male_detective: ["spy", "sleuth_or_spy"],
+  thinking: ["thinking_face"],
+  "-1": ["thumbsdown"],
+  "+1": ["thumbsup"],
+  cloud_with_lightning_and_rain: [
+    "thunder_cloud_rain",
+    "thunder_cloud_and_rain"
+  ],
+  tickets: ["admission_tickets"],
+  next_track_button: ["track_next", "next_track"],
+  previous_track_button: ["track_previous", "previous_track"],
+  unicorn: ["unicorn_face"],
+  funeral_urn: ["urn"],
+  sun_behind_large_cloud: ["white_sun_cloud", "white_sun_behind_cloud"],
+  sun_behind_rain_cloud: [
+    "white_sun_rain_cloud",
+    "white_sun_behind_cloud_with_rain"
+  ],
+  partly_sunny: ["white_sun_small_cloud", "white_sun_with_small_cloud"],
+  open_umbrella: ["umbrella2"],
+  hammer_and_wrench: ["tools"],
+  face_with_thermometer: ["thermometer_face"],
+  timer_clock: ["timer"],
+  keycap_ten: ["ten"],
+  memo: ["pencil"],
+  rescue_worker_helmet: ["helmet_with_cross", "helmet_with_white_cross"],
+  slightly_smiling_face: ["slightly_smiling", "slight_smile"],
+  construction_worker_man: ["construction_worker"],
+  upside_down_face: ["upside_down"],
+  money_mouth_face: ["money_mouth"],
+  nerd_face: ["nerd"],
+  hugs: ["hugging", "hugging_face"],
+  roll_eyes: ["rolling_eyes", "face_with_rolling_eyes"],
+  slightly_frowning_face: ["slight_frown"],
+  frowning_face: ["frowning2", "white_frowning_face"],
+  zipper_mouth_face: ["zipper_mouth"],
+  face_with_head_bandage: ["head_bandage"],
+  raised_hand_with_fingers_splayed: ["hand_splayed"],
+  raised_hand: ["hand"],
+  vulcan_salute: [
+    "vulcan",
+    "raised_hand_with_part_between_middle_and_ring_fingers"
+  ],
+  policeman: ["cop"],
+  running_man: ["runner"],
+  walking_man: ["walking"],
+  bowing_man: ["bow"],
+  no_good_woman: ["no_good"],
+  raising_hand_woman: ["raising_hand"],
+  pouting_woman: ["person_with_pouting_face"],
+  frowning_woman: ["person_frowning"],
+  haircut_woman: ["haircut"],
+  massage_woman: ["massage"],
+  tshirt: ["shirt"],
+  biking_man: ["bicyclist"],
+  mountain_biking_man: ["mountain_bicyclist"],
+  passenger_ship: ["cruise_ship"],
+  motor_boat: ["motorboat", "boat"],
+  flight_arrival: ["airplane_arriving"],
+  flight_departure: ["airplane_departure"],
+  small_airplane: ["airplane_small"],
+  racing_car: ["race_car"],
+  family_man_woman_boy_boy: ["family_man_woman_boys"],
+  family_man_woman_girl_girl: ["family_man_woman_girls"],
+  family_woman_woman_boy: ["family_women_boy"],
+  family_woman_woman_girl: ["family_women_girl"],
+  family_woman_woman_girl_boy: ["family_women_girl_boy"],
+  family_woman_woman_boy_boy: ["family_women_boys"],
+  family_woman_woman_girl_girl: ["family_women_girls"],
+  family_man_man_boy: ["family_men_boy"],
+  family_man_man_girl: ["family_men_girl"],
+  family_man_man_girl_boy: ["family_men_girl_boy"],
+  family_man_man_boy_boy: ["family_men_boys"],
+  family_man_man_girl_girl: ["family_men_girls"],
+  cloud_with_lightning: ["cloud_lightning"],
+  tornado: ["cloud_tornado", "cloud_with_tornado"],
+  cloud_with_rain: ["cloud_rain"],
+  cloud_with_snow: ["cloud_snow"],
+  asterisk: ["keycap_star"],
+  studio_microphone: ["microphone2"],
+  medal_military: ["military_medal"],
+  couple_with_heart_woman_woman: ["female_couple_with_heart"],
+  couple_with_heart_man_man: ["male_couple_with_heart"],
+  couplekiss_woman_woman: ["female_couplekiss"],
+  couplekiss_man_man: ["male_couplekiss"],
+  honeybee: ["bee"],
+  lion: ["lion_face"],
+  artificial_satellite: ["satellite_orbital"],
+  computer_mouse: ["mouse_three_button", "three_button_mouse"],
+  hocho: ["knife"],
+  swimming_man: ["swimmer"],
+  wind_face: ["wind_blowing_face"],
+  golfing_man: ["golfer"],
+  facepunch: ["punch"],
+  building_construction: ["construction_site"],
+  family_man_woman_girl_boy: ["family"],
+  ice_hockey: ["hockey"],
+  snowman_with_snow: ["snowman2"],
+  play_or_pause_button: ["play_pause"],
+  film_projector: ["projector"],
+  shopping: ["shopping_bags"],
+  open_book: ["book"],
+  national_park: ["park"],
+  world_map: ["map"],
+  pen: ["pen_ballpoint", "lower_left_ballpoint_pen"],
+  email: ["envelope", "e-mail"],
+  phone: ["telephone"],
+  atom_symbol: ["atom"],
+  mantelpiece_clock: ["clock"],
+  camera_flash: ["camera_with_flash"],
+  film_strip: ["film_frames"],
+  balance_scale: ["scales"],
+  surfing_man: ["surfer"],
+  couplekiss_man_woman: ["couplekiss"],
+  couple_with_heart_woman_man: ["couple_with_heart"],
+  clamp: ["compression"],
+  dancing_women: ["dancers"],
+  blonde_man: ["person_with_blond_hair"],
+  sleeping_bed: ["sleeping_accommodation"],
+  om: ["om_symbol"],
+  tipping_hand_woman: ["information_desk_person"],
+  rowing_man: ["rowboat"],
+  new_moon: ["moon"],
+  oncoming_automobile: ["car", "automobile"],
+  fleur_de_lis: ["fleur-de-lis"],
+  face_vomiting: ["puke"]
+};
+export const searchAliases = {
+  sad: [
+    "frowning_face",
+    "slightly_frowning_face",
+    "sob",
+    "crying_cat_face",
+    "cry"
+  ],
+  cry: ["sob"]
+};
+export const translations = {
+  ":)": "slight_smile",
+  ":-)": "slight_smile",
+  "^_^": "slight_smile",
+  "^__^": "slight_smile",
+  ":(": "frowning",
+  ":-(": "frowning",
+  ";)": "wink",
+  ";-)": "wink",
+  ":'(": "cry",
+  ":'-(": "cry",
+  ":-'(": "cry",
+  ":p": "stuck_out_tongue",
+  ":P": "stuck_out_tongue",
+  ":-P": "stuck_out_tongue",
+  ":O": "open_mouth",
+  ":-O": "open_mouth",
+  ":D": "smiley",
+  ":-D": "smiley",
+  ":|": "expressionless",
+  ":-|": "expressionless",
+  ":/": "confused",
+  "8-)": "sunglasses",
+  ";P": "stuck_out_tongue_winking_eye",
+  ";-P": "stuck_out_tongue_winking_eye",
+  ":$": "blush",
+  ":-$": "blush"
+};
+export const replacements = {
+  "😀": "grinning",
+  "😬": "grimacing",
+  "😁": "grin",
+  "😂": "joy",
+  "🤣": "rofl",
+  "😃": "smiley",
+  "😄": "smile",
+  "😅": "sweat_smile",
+  "😆": "laughing",
+  "😇": "innocent",
+  "😉": "wink",
+  "😊": "blush",
+  "🙂": "slightly_smiling_face",
+  "🙃": "upside_down_face",
+  "☺": "slight_smile",
+  "😋": "yum",
+  "😌": "relieved",
+  "😍": "heart_eyes",
+  "😘": "kissing_heart",
+  "😗": "kissing",
+  "😙": "kissing_smiling_eyes",
+  "😚": "kissing_closed_eyes",
+  "😜": "stuck_out_tongue_winking_eye",
+  "😝": "stuck_out_tongue_closed_eyes",
+  "😛": "stuck_out_tongue",
+  "🤑": "money_mouth_face",
+  "🤓": "nerd_face",
+  "😎": "sunglasses",
+  "🤡": "clown_face",
+  "🤠": "cowboy_hat_face",
+  "🤗": "hugs",
+  "😏": "smirk",
+  "😶": "no_mouth",
+  "😐": "neutral_face",
+  "😑": "expressionless",
+  "😒": "unamused",
+  "🙄": "roll_eyes",
+  "🤔": "thinking",
+  "🤥": "lying_face",
+  "😳": "flushed",
+  "😞": "disappointed",
+  "😟": "worried",
+  "😠": "angry",
+  "😡": "rage",
+  "😔": "pensive",
+  "😕": "confused",
+  "🙁": "slightly_frowning_face",
+  "☹": "frowning",
+  "😣": "persevere",
+  "😖": "confounded",
+  "😫": "tired_face",
+  "😩": "weary",
+  "😤": "triumph",
+  "😮": "open_mouth",
+  "😱": "scream",
+  "😨": "fearful",
+  "😰": "cold_sweat",
+  "😯": "hushed",
+  "😦": "frowning",
+  "😧": "anguished",
+  "😢": "cry",
+  "😥": "disappointed_relieved",
+  "🤤": "drooling_face",
+  "😪": "sleepy",
+  "😓": "sweat",
+  "😭": "sob",
+  "😵": "dizzy_face",
+  "😲": "astonished",
+  "🤐": "zipper_mouth_face",
+  "🤢": "nauseated_face",
+  "🤧": "sneezing_face",
+  "😷": "mask",
+  "🤒": "face_with_thermometer",
+  "🤕": "face_with_head_bandage",
+  "😴": "sleeping",
+  "💤": "zzz",
+  "💩": "poop",
+  "😈": "smiling_imp",
+  "👿": "imp",
+  "👹": "japanese_ogre",
+  "👺": "japanese_goblin",
+  "💀": "skull",
+  "👻": "ghost",
+  "👽": "alien",
+  "🤖": "robot",
+  "😺": "smiley_cat",
+  "😸": "smile_cat",
+  "😹": "joy_cat",
+  "😻": "heart_eyes_cat",
+  "😼": "smirk_cat",
+  "😽": "kissing_cat",
+  "🙀": "scream_cat",
+  "😿": "crying_cat_face",
+  "😾": "pouting_cat",
+  "🙌": "raised_hands",
+  "🙌🏻": "raised_hands:t2",
+  "🙌🏼": "raised_hands:t3",
+  "🙌🏽": "raised_hands:t4",
+  "🙌🏾": "raised_hands:t5",
+  "🙌🏿": "raised_hands:t6",
+  "👏": "clap",
+  "👏🏻": "clap:t2",
+  "👏🏼": "clap:t3",
+  "👏🏽": "clap:t4",
+  "👏🏾": "clap:t5",
+  "👏🏿": "clap:t6",
+  "👋": "wave",
+  "👋🏻": "wave:t2",
+  "👋🏼": "wave:t3",
+  "👋🏽": "wave:t4",
+  "👋🏾": "wave:t5",
+  "👋🏿": "wave:t6",
+  "🤙": "call_me_hand",
+  "🤙🏻": "call_me_hand:t2",
+  "🤙🏼": "call_me_hand:t3",
+  "🤙🏽": "call_me_hand:t4",
+  "🤙🏾": "call_me_hand:t5",
+  "🤙🏿": "call_me_hand:t6",
+  "👍": "+1",
+  "👍🏻": "+1:t2",
+  "👍🏼": "+1:t3",
+  "👍🏽": "+1:t4",
+  "👍🏾": "+1:t5",
+  "👍🏿": "+1:t6",
+  "👎": "-1",
+  "👎🏻": "-1:t2",
+  "👎🏼": "-1:t3",
+  "👎🏽": "-1:t4",
+  "👎🏾": "-1:t5",
+  "👎🏿": "-1:t6",
+  "👊": "facepunch",
+  "👊🏻": "facepunch:t2",
+  "👊🏼": "facepunch:t3",
+  "👊🏽": "facepunch:t4",
+  "👊🏾": "facepunch:t5",
+  "👊🏿": "facepunch:t6",
+  "✊": "fist",
+  "✊🏻": "fist:t2",
+  "✊🏼": "fist:t3",
+  "✊🏽": "fist:t4",
+  "✊🏾": "fist:t5",
+  "✊🏿": "fist:t6",
+  "🤛": "fist_left",
+  "🤛🏻": "fist_left:t2",
+  "🤛🏼": "fist_left:t3",
+  "🤛🏽": "fist_left:t4",
+  "🤛🏾": "fist_left:t5",
+  "🤛🏿": "fist_left:t6",
+  "🤜": "fist_right",
+  "🤜🏻": "fist_right:t2",
+  "🤜🏼": "fist_right:t3",
+  "🤜🏽": "fist_right:t4",
+  "🤜🏾": "fist_right:t5",
+  "🤜🏿": "fist_right:t6",
+  "✌": "v",
+  "✌🏻": "v:t2",
+  "✌🏼": "v:t3",
+  "✌🏽": "v:t4",
+  "✌🏾": "v:t5",
+  "✌🏿": "v:t6",
+  "👌": "ok_hand",
+  "👌🏻": "ok_hand:t2",
+  "👌🏼": "ok_hand:t3",
+  "👌🏽": "ok_hand:t4",
+  "👌🏾": "ok_hand:t5",
+  "👌🏿": "ok_hand:t6",
+  "✋": "raised_hand",
+  "✋🏻": "raised_hand:t2",
+  "✋🏼": "raised_hand:t3",
+  "✋🏽": "raised_hand:t4",
+  "✋🏾": "raised_hand:t5",
+  "✋🏿": "raised_hand:t6",
+  "🤚": "raised_back_of_hand",
+  "🤚🏻": "raised_back_of_hand:t2",
+  "🤚🏼": "raised_back_of_hand:t3",
+  "🤚🏽": "raised_back_of_hand:t4",
+  "🤚🏾": "raised_back_of_hand:t5",
+  "🤚🏿": "raised_back_of_hand:t6",
+  "👐": "open_hands",
+  "👐🏻": "open_hands:t2",
+  "👐🏼": "open_hands:t3",
+  "👐🏽": "open_hands:t4",
+  "👐🏾": "open_hands:t5",
+  "👐🏿": "open_hands:t6",
+  "💪": "muscle",
+  "💪🏻": "muscle:t2",
+  "💪🏼": "muscle:t3",
+  "💪🏽": "muscle:t4",
+  "💪🏾": "muscle:t5",
+  "💪🏿": "muscle:t6",
+  "🙏": "pray",
+  "🙏🏻": "pray:t2",
+  "🙏🏼": "pray:t3",
+  "🙏🏽": "pray:t4",
+  "🙏🏾": "pray:t5",
+  "🙏🏿": "pray:t6",
+  "🤝": "handshake",
+  "☝": "point_up",
+  "☝🏻": "point_up:t2",
+  "☝🏼": "point_up:t3",
+  "☝🏽": "point_up:t4",
+  "☝🏾": "point_up:t5",
+  "☝🏿": "point_up:t6",
+  "👆": "point_up_2",
+  "👆🏻": "point_up_2:t2",
+  "👆🏼": "point_up_2:t3",
+  "👆🏽": "point_up_2:t4",
+  "👆🏾": "point_up_2:t5",
+  "👆🏿": "point_up_2:t6",
+  "👇": "point_down",
+  "👇🏻": "point_down:t2",
+  "👇🏼": "point_down:t3",
+  "👇🏽": "point_down:t4",
+  "👇🏾": "point_down:t5",
+  "👇🏿": "point_down:t6",
+  "👈": "point_left",
+  "👈🏻": "point_left:t2",
+  "👈🏼": "point_left:t3",
+  "👈🏽": "point_left:t4",
+  "👈🏾": "point_left:t5",
+  "👈🏿": "point_left:t6",
+  "👉": "point_right",
+  "👉🏻": "point_right:t2",
+  "👉🏼": "point_right:t3",
+  "👉🏽": "point_right:t4",
+  "👉🏾": "point_right:t5",
+  "👉🏿": "point_right:t6",
+  "🖕": "fu",
+  "🖕🏻": "fu:t2",
+  "🖕🏼": "fu:t3",
+  "🖕🏽": "fu:t4",
+  "🖕🏾": "fu:t5",
+  "🖕🏿": "fu:t6",
+  "🖐": "raised_hand_with_fingers_splayed",
+  "🖐🏻": "raised_hand_with_fingers_splayed:t2",
+  "🖐🏼": "raised_hand_with_fingers_splayed:t3",
+  "🖐🏽": "raised_hand_with_fingers_splayed:t4",
+  "🖐🏾": "raised_hand_with_fingers_splayed:t5",
+  "🖐🏿": "raised_hand_with_fingers_splayed:t6",
+  "🤘": "metal",
+  "🤘🏻": "metal:t2",
+  "🤘🏼": "metal:t3",
+  "🤘🏽": "metal:t4",
+  "🤘🏾": "metal:t5",
+  "🤘🏿": "metal:t6",
+  "🤞": "crossed_fingers",
+  "🤞🏻": "crossed_fingers:t2",
+  "🤞🏼": "crossed_fingers:t3",
+  "🤞🏽": "crossed_fingers:t4",
+  "🤞🏾": "crossed_fingers:t5",
+  "🤞🏿": "crossed_fingers:t6",
+  "🖖": "vulcan_salute",
+  "🖖🏻": "vulcan_salute:t2",
+  "🖖🏼": "vulcan_salute:t3",
+  "🖖🏽": "vulcan_salute:t4",
+  "🖖🏾": "vulcan_salute:t5",
+  "🖖🏿": "vulcan_salute:t6",
+  "✍": "writing_hand",
+  "✍🏻": "writing_hand:t2",
+  "✍🏼": "writing_hand:t3",
+  "✍🏽": "writing_hand:t4",
+  "✍🏾": "writing_hand:t5",
+  "✍🏿": "writing_hand:t6",
+  "🤳": "selfie",
+  "🤳🏻": "selfie:t2",
+  "🤳🏼": "selfie:t3",
+  "🤳🏽": "selfie:t4",
+  "🤳🏾": "selfie:t5",
+  "🤳🏿": "selfie:t6",
+  "💅": "nail_care",
+  "💅🏻": "nail_care:t2",
+  "💅🏼": "nail_care:t3",
+  "💅🏽": "nail_care:t4",
+  "💅🏾": "nail_care:t5",
+  "💅🏿": "nail_care:t6",
+  "👄": "lips",
+  "👅": "tongue",
+  "👂": "ear",
+  "👂🏻": "ear:t2",
+  "👂🏼": "ear:t3",
+  "👂🏽": "ear:t4",
+  "👂🏾": "ear:t5",
+  "👂🏿": "ear:t6",
+  "👃": "nose",
+  "👃🏻": "nose:t2",
+  "👃🏼": "nose:t3",
+  "👃🏽": "nose:t4",
+  "👃🏾": "nose:t5",
+  "👃🏿": "nose:t6",
+  "👁": "eye",
+  "👀": "eyes",
+  "👤": "bust_in_silhouette",
+  "👥": "busts_in_silhouette",
+  "🗣": "speaking_head",
+  "👶": "baby",
+  "👶🏻": "baby:t2",
+  "👶🏼": "baby:t3",
+  "👶🏽": "baby:t4",
+  "👶🏾": "baby:t5",
+  "👶🏿": "baby:t6",
+  "👦": "boy",
+  "👦🏻": "boy:t2",
+  "👦🏼": "boy:t3",
+  "👦🏽": "boy:t4",
+  "👦🏾": "boy:t5",
+  "👦🏿": "boy:t6",
+  "👧": "girl",
+  "👧🏻": "girl:t2",
+  "👧🏼": "girl:t3",
+  "👧🏽": "girl:t4",
+  "👧🏾": "girl:t5",
+  "👧🏿": "girl:t6",
+  "👨": "man",
+  "👨🏻": "man:t2",
+  "👨🏼": "man:t3",
+  "👨🏽": "man:t4",
+  "👨🏾": "man:t5",
+  "👨🏿": "man:t6",
+  "👩": "woman",
+  "👩🏻": "woman:t2",
+  "👩🏼": "woman:t3",
+  "👩🏽": "woman:t4",
+  "👩🏾": "woman:t5",
+  "👩🏿": "woman:t6",
+  "👱‍♀️": "blonde_woman",
+  "👱🏻‍♀️": "blonde_woman:t2",
+  "👱🏼‍♀️": "blonde_woman:t3",
+  "👱🏽‍♀️": "blonde_woman:t4",
+  "👱🏾‍♀️": "blonde_woman:t5",
+  "👱🏿‍♀️": "blonde_woman:t6",
+  "👱": "blonde_man",
+  "👱🏻": "blonde_man:t2",
+  "👱🏼": "blonde_man:t3",
+  "👱🏽": "blonde_man:t4",
+  "👱🏾": "blonde_man:t5",
+  "👱🏿": "blonde_man:t6",
+  "👴": "older_man",
+  "👴🏻": "older_man:t2",
+  "👴🏼": "older_man:t3",
+  "👴🏽": "older_man:t4",
+  "👴🏾": "older_man:t5",
+  "👴🏿": "older_man:t6",
+  "👵": "older_woman",
+  "👵🏻": "older_woman:t2",
+  "👵🏼": "older_woman:t3",
+  "👵🏽": "older_woman:t4",
+  "👵🏾": "older_woman:t5",
+  "👵🏿": "older_woman:t6",
+  "👲": "man_with_gua_pi_mao",
+  "👲🏻": "man_with_gua_pi_mao:t2",
+  "👲🏼": "man_with_gua_pi_mao:t3",
+  "👲🏽": "man_with_gua_pi_mao:t4",
+  "👲🏾": "man_with_gua_pi_mao:t5",
+  "👲🏿": "man_with_gua_pi_mao:t6",
+  "👳‍♀️": "woman_with_turban",
+  "👳🏻‍♀️": "woman_with_turban:t2",
+  "👳🏼‍♀️": "woman_with_turban:t3",
+  "👳🏽‍♀️": "woman_with_turban:t4",
+  "👳🏾‍♀️": "woman_with_turban:t5",
+  "👳🏿‍♀️": "woman_with_turban:t6",
+  "👳": "man_with_turban",
+  "👳🏻": "man_with_turban:t2",
+  "👳🏼": "man_with_turban:t3",
+  "👳🏽": "man_with_turban:t4",
+  "👳🏾": "man_with_turban:t5",
+  "👳🏿": "man_with_turban:t6",
+  "👮‍♀️": "policewoman",
+  "👮🏻‍♀️": "policewoman:t2",
+  "👮🏼‍♀️": "policewoman:t3",
+  "👮🏽‍♀️": "policewoman:t4",
+  "👮🏾‍♀️": "policewoman:t5",
+  "👮🏿‍♀️": "policewoman:t6",
+  "👮": "policeman",
+  "👮🏻": "policeman:t2",
+  "👮🏼": "policeman:t3",
+  "👮🏽": "policeman:t4",
+  "👮🏾": "policeman:t5",
+  "👮🏿": "policeman:t6",
+  "👷‍♀️": "construction_worker_woman",
+  "👷🏻‍♀️": "construction_worker_woman:t2",
+  "👷🏼‍♀️": "construction_worker_woman:t3",
+  "👷🏽‍♀️": "construction_worker_woman:t4",
+  "👷🏾‍♀️": "construction_worker_woman:t5",
+  "👷🏿‍♀️": "construction_worker_woman:t6",
+  "👷": "construction_worker_man",
+  "👷🏻": "construction_worker_man:t2",
+  "👷🏼": "construction_worker_man:t3",
+  "👷🏽": "construction_worker_man:t4",
+  "👷🏾": "construction_worker_man:t5",
+  "👷🏿": "construction_worker_man:t6",
+  "💂‍♀️": "guardswoman",
+  "💂🏻‍♀️": "guardswoman:t2",
+  "💂🏼‍♀️": "guardswoman:t3",
+  "💂🏽‍♀️": "guardswoman:t4",
+  "💂🏾‍♀️": "guardswoman:t5",
+  "💂🏿‍♀️": "guardswoman:t6",
+  "💂": "guardsman",
+  "💂🏻": "guardsman:t2",
+  "💂🏼": "guardsman:t3",
+  "💂🏽": "guardsman:t4",
+  "💂🏾": "guardsman:t5",
+  "💂🏿": "guardsman:t6",
+  "🕵️‍♀": "female_detective",
+  "🕵": "male_detective",
+  "🕵🏻": "male_detective:t2",
+  "🕵🏼": "male_detective:t3",
+  "🕵🏽": "male_detective:t4",
+  "🕵🏾": "male_detective:t5",
+  "🕵🏿": "male_detective:t6",
+  "👩‍⚕️": "woman_health_worker",
+  "👩🏻‍⚕️": "woman_health_worker:t2",
+  "👩🏼‍⚕️": "woman_health_worker:t3",
+  "👩🏽‍⚕️": "woman_health_worker:t4",
+  "👩🏾‍⚕️": "woman_health_worker:t5",
+  "👩🏿‍⚕️": "woman_health_worker:t6",
+  "👨‍⚕️": "man_health_worker",
+  "👨🏻‍⚕️": "man_health_worker:t2",
+  "👨🏼‍⚕️": "man_health_worker:t3",
+  "👨🏽‍⚕️": "man_health_worker:t4",
+  "👨🏾‍⚕️": "man_health_worker:t5",
+  "👨🏿‍⚕️": "man_health_worker:t6",
+  "👩‍🌾": "woman_farmer",
+  "👩🏻‍🌾": "woman_farmer:t2",
+  "👩🏼‍🌾": "woman_farmer:t3",
+  "👩🏽‍🌾": "woman_farmer:t4",
+  "👩🏾‍🌾": "woman_farmer:t5",
+  "👩🏿‍🌾": "woman_farmer:t6",
+  "👨‍🌾": "man_farmer",
+  "👨🏻‍🌾": "man_farmer:t2",
+  "👨🏼‍🌾": "man_farmer:t3",
+  "👨🏽‍🌾": "man_farmer:t4",
+  "👨🏾‍🌾": "man_farmer:t5",
+  "👨🏿‍🌾": "man_farmer:t6",
+  "👩‍🍳": "woman_cook",
+  "👩🏻‍🍳": "woman_cook:t2",
+  "👩🏼‍🍳": "woman_cook:t3",
+  "👩🏽‍🍳": "woman_cook:t4",
+  "👩🏾‍🍳": "woman_cook:t5",
+  "👩🏿‍🍳": "woman_cook:t6",
+  "👨‍🍳": "man_cook",
+  "👨🏻‍🍳": "man_cook:t2",
+  "👨🏼‍🍳": "man_cook:t3",
+  "👨🏽‍🍳": "man_cook:t4",
+  "👨🏾‍🍳": "man_cook:t5",
+  "👨🏿‍🍳": "man_cook:t6",
+  "👩‍🎓": "woman_student",
+  "👩🏻‍🎓": "woman_student:t2",
+  "👩🏼‍🎓": "woman_student:t3",
+  "👩🏽‍🎓": "woman_student:t4",
+  "👩🏾‍🎓": "woman_student:t5",
+  "👩🏿‍🎓": "woman_student:t6",
+  "👨‍🎓": "man_student",
+  "👨🏻‍🎓": "man_student:t2",
+  "👨🏼‍🎓": "man_student:t3",
+  "👨🏽‍🎓": "man_student:t4",
+  "👨🏾‍🎓": "man_student:t5",
+  "👨🏿‍🎓": "man_student:t6",
+  "👩‍🎤": "woman_singer",
+  "👩🏻‍🎤": "woman_singer:t2",
+  "👩🏼‍🎤": "woman_singer:t3",
+  "👩🏽‍🎤": "woman_singer:t4",
+  "👩🏾‍🎤": "woman_singer:t5",
+  "👩🏿‍🎤": "woman_singer:t6",
+  "👨‍🎤": "man_singer",
+  "👨🏻‍🎤": "man_singer:t2",
+  "👨🏼‍🎤": "man_singer:t3",
+  "👨🏽‍🎤": "man_singer:t4",
+  "👨🏾‍🎤": "man_singer:t5",
+  "👨🏿‍🎤": "man_singer:t6",
+  "👩‍🏫": "woman_teacher",
+  "👩🏻‍🏫": "woman_teacher:t2",
+  "👩🏼‍🏫": "woman_teacher:t3",
+  "👩🏽‍🏫": "woman_teacher:t4",
+  "👩🏾‍🏫": "woman_teacher:t5",
+  "👩🏿‍🏫": "woman_teacher:t6",
+  "👨‍🏫": "man_teacher",
+  "👨🏻‍🏫": "man_teacher:t2",
+  "👨🏼‍🏫": "man_teacher:t3",
+  "👨🏽‍🏫": "man_teacher:t4",
+  "👨🏾‍🏫": "man_teacher:t5",
+  "👨🏿‍🏫": "man_teacher:t6",
+  "👩‍🏭": "woman_factory_worker",
+  "👩🏻‍🏭": "woman_factory_worker:t2",
+  "👩🏼‍🏭": "woman_factory_worker:t3",
+  "👩🏽‍🏭": "woman_factory_worker:t4",
+  "👩🏾‍🏭": "woman_factory_worker:t5",
+  "👩🏿‍🏭": "woman_factory_worker:t6",
+  "👨‍🏭": "man_factory_worker",
+  "👨🏻‍🏭": "man_factory_worker:t2",
+  "👨🏼‍🏭": "man_factory_worker:t3",
+  "👨🏽‍🏭": "man_factory_worker:t4",
+  "👨🏾‍🏭": "man_factory_worker:t5",
+  "👨🏿‍🏭": "man_factory_worker:t6",
+  "👩‍💻": "woman_technologist",
+  "👩🏻‍💻": "woman_technologist:t2",
+  "👩🏼‍💻": "woman_technologist:t3",
+  "👩🏽‍💻": "woman_technologist:t4",
+  "👩🏾‍💻": "woman_technologist:t5",
+  "👩🏿‍💻": "woman_technologist:t6",
+  "👨‍💻": "man_technologist",
+  "👨🏻‍💻": "man_technologist:t2",
+  "👨🏼‍💻": "man_technologist:t3",
+  "👨🏽‍💻": "man_technologist:t4",
+  "👨🏾‍💻": "man_technologist:t5",
+  "👨🏿‍💻": "man_technologist:t6",
+  "👩‍💼": "woman_office_worker",
+  "👩🏻‍💼": "woman_office_worker:t2",
+  "👩🏼‍💼": "woman_office_worker:t3",
+  "👩🏽‍💼": "woman_office_worker:t4",
+  "👩🏾‍💼": "woman_office_worker:t5",
+  "👩🏿‍💼": "woman_office_worker:t6",
+  "👨‍💼": "man_office_worker",
+  "👨🏻‍💼": "man_office_worker:t2",
+  "👨🏼‍💼": "man_office_worker:t3",
+  "👨🏽‍💼": "man_office_worker:t4",
+  "👨🏾‍💼": "man_office_worker:t5",
+  "👨🏿‍💼": "man_office_worker:t6",
+  "👩‍🔧": "woman_mechanic",
+  "👩🏻‍🔧": "woman_mechanic:t2",
+  "👩🏼‍🔧": "woman_mechanic:t3",
+  "👩🏽‍🔧": "woman_mechanic:t4",
+  "👩🏾‍🔧": "woman_mechanic:t5",
+  "👩🏿‍🔧": "woman_mechanic:t6",
+  "👨‍🔧": "man_mechanic",
+  "👨🏻‍🔧": "man_mechanic:t2",
+  "👨🏼‍🔧": "man_mechanic:t3",
+  "👨🏽‍🔧": "man_mechanic:t4",
+  "👨🏾‍🔧": "man_mechanic:t5",
+  "👨🏿‍🔧": "man_mechanic:t6",
+  "👩‍🔬": "woman_scientist",
+  "👩🏻‍🔬": "woman_scientist:t2",
+  "👩🏼‍🔬": "woman_scientist:t3",
+  "👩🏽‍🔬": "woman_scientist:t4",
+  "👩🏾‍🔬": "woman_scientist:t5",
+  "👩🏿‍🔬": "woman_scientist:t6",
+  "👨‍🔬": "man_scientist",
+  "👨🏻‍🔬": "man_scientist:t2",
+  "👨🏼‍🔬": "man_scientist:t3",
+  "👨🏽‍🔬": "man_scientist:t4",
+  "👨🏾‍🔬": "man_scientist:t5",
+  "👨🏿‍🔬": "man_scientist:t6",
+  "👩‍🎨": "woman_artist",
+  "👩🏻‍🎨": "woman_artist:t2",
+  "👩🏼‍🎨": "woman_artist:t3",
+  "👩🏽‍🎨": "woman_artist:t4",
+  "👩🏾‍🎨": "woman_artist:t5",
+  "👩🏿‍🎨": "woman_artist:t6",
+  "👨‍🎨": "man_artist",
+  "👨🏻‍🎨": "man_artist:t2",
+  "👨🏼‍🎨": "man_artist:t3",
+  "👨🏽‍🎨": "man_artist:t4",
+  "👨🏾‍🎨": "man_artist:t5",
+  "👨🏿‍🎨": "man_artist:t6",
+  "👩‍🚒": "woman_firefighter",
+  "👩🏻‍🚒": "woman_firefighter:t2",
+  "👩🏼‍🚒": "woman_firefighter:t3",
+  "👩🏽‍🚒": "woman_firefighter:t4",
+  "👩🏾‍🚒": "woman_firefighter:t5",
+  "👩🏿‍🚒": "woman_firefighter:t6",
+  "👨‍🚒": "man_firefighter",
+  "👨🏻‍🚒": "man_firefighter:t2",
+  "👨🏼‍🚒": "man_firefighter:t3",
+  "👨🏽‍🚒": "man_firefighter:t4",
+  "👨🏾‍🚒": "man_firefighter:t5",
+  "👨🏿‍🚒": "man_firefighter:t6",
+  "👩‍✈️": "woman_pilot",
+  "👩🏻‍✈️": "woman_pilot:t2",
+  "👩🏼‍✈️": "woman_pilot:t3",
+  "👩🏽‍✈️": "woman_pilot:t4",
+  "👩🏾‍✈️": "woman_pilot:t5",
+  "👩🏿‍✈️": "woman_pilot:t6",
+  "👨‍✈️": "man_pilot",
+  "👨🏻‍✈️": "man_pilot:t2",
+  "👨🏼‍✈️": "man_pilot:t3",
+  "👨🏽‍✈️": "man_pilot:t4",
+  "👨🏾‍✈️": "man_pilot:t5",
+  "👨🏿‍✈️": "man_pilot:t6",
+  "👩‍🚀": "woman_astronaut",
+  "👩🏻‍🚀": "woman_astronaut:t2",
+  "👩🏼‍🚀": "woman_astronaut:t3",
+  "👩🏽‍🚀": "woman_astronaut:t4",
+  "👩🏾‍🚀": "woman_astronaut:t5",
+  "👩🏿‍🚀": "woman_astronaut:t6",
+  "👨‍🚀": "man_astronaut",
+  "👨🏻‍🚀": "man_astronaut:t2",
+  "👨🏼‍🚀": "man_astronaut:t3",
+  "👨🏽‍🚀": "man_astronaut:t4",
+  "👨🏾‍🚀": "man_astronaut:t5",
+  "👨🏿‍🚀": "man_astronaut:t6",
+  "👩‍⚖️": "woman_judge",
+  "👩🏻‍⚖️": "woman_judge:t2",
+  "👩🏼‍⚖️": "woman_judge:t3",
+  "👩🏽‍⚖️": "woman_judge:t4",
+  "👩🏾‍⚖️": "woman_judge:t5",
+  "👩🏿‍⚖️": "woman_judge:t6",
+  "👨‍⚖️": "man_judge",
+  "👨🏻‍⚖️": "man_judge:t2",
+  "👨🏼‍⚖️": "man_judge:t3",
+  "👨🏽‍⚖️": "man_judge:t4",
+  "👨🏾‍⚖️": "man_judge:t5",
+  "👨🏿‍⚖️": "man_judge:t6",
+  "🤶": "mrs_claus",
+  "🤶🏻": "mrs_claus:t2",
+  "🤶🏼": "mrs_claus:t3",
+  "🤶🏽": "mrs_claus:t4",
+  "🤶🏾": "mrs_claus:t5",
+  "🤶🏿": "mrs_claus:t6",
+  "🎅": "santa",
+  "🎅🏻": "santa:t2",
+  "🎅🏼": "santa:t3",
+  "🎅🏽": "santa:t4",
+  "🎅🏾": "santa:t5",
+  "🎅🏿": "santa:t6",
+  "👼": "angel",
+  "👼🏻": "angel:t2",
+  "👼🏼": "angel:t3",
+  "👼🏽": "angel:t4",
+  "👼🏾": "angel:t5",
+  "👼🏿": "angel:t6",
+  "🤰": "pregnant_woman",
+  "🤰🏻": "pregnant_woman:t2",
+  "🤰🏼": "pregnant_woman:t3",
+  "🤰🏽": "pregnant_woman:t4",
+  "🤰🏾": "pregnant_woman:t5",
+  "🤰🏿": "pregnant_woman:t6",
+  "👸": "princess",
+  "👸🏻": "princess:t2",
+  "👸🏼": "princess:t3",
+  "👸🏽": "princess:t4",
+  "👸🏾": "princess:t5",
+  "👸🏿": "princess:t6",
+  "🤴": "prince",
+  "🤴🏻": "prince:t2",
+  "🤴🏼": "prince:t3",
+  "🤴🏽": "prince:t4",
+  "🤴🏾": "prince:t5",
+  "🤴🏿": "prince:t6",
+  "👰": "bride_with_veil",
+  "👰🏻": "bride_with_veil:t2",
+  "👰🏼": "bride_with_veil:t3",
+  "👰🏽": "bride_with_veil:t4",
+  "👰🏾": "bride_with_veil:t5",
+  "👰🏿": "bride_with_veil:t6",
+  "🤵": "man_in_tuxedo",
+  "🤵🏻": "man_in_tuxedo:t2",
+  "🤵🏼": "man_in_tuxedo:t3",
+  "🤵🏽": "man_in_tuxedo:t4",
+  "🤵🏾": "man_in_tuxedo:t5",
+  "🤵🏿": "man_in_tuxedo:t6",
+  "🏃‍♀️": "running_woman",
+  "🏃🏻‍♀️": "running_woman:t2",
+  "🏃🏼‍♀️": "running_woman:t3",
+  "🏃🏽‍♀️": "running_woman:t4",
+  "🏃🏾‍♀️": "running_woman:t5",
+  "🏃🏿‍♀️": "running_woman:t6",
+  "🏃": "running_man",
+  "🏃🏻": "running_man:t2",
+  "🏃🏼": "running_man:t3",
+  "🏃🏽": "running_man:t4",
+  "🏃🏾": "running_man:t5",
+  "🏃🏿": "running_man:t6",
+  "🚶‍♀️": "walking_woman",
+  "🚶🏻‍♀️": "walking_woman:t2",
+  "🚶🏼‍♀️": "walking_woman:t3",
+  "🚶🏽‍♀️": "walking_woman:t4",
+  "🚶🏾‍♀️": "walking_woman:t5",
+  "🚶🏿‍♀️": "walking_woman:t6",
+  "🚶": "walking_man",
+  "🚶🏻": "walking_man:t2",
+  "🚶🏼": "walking_man:t3",
+  "🚶🏽": "walking_man:t4",
+  "🚶🏾": "walking_man:t5",
+  "🚶🏿": "walking_man:t6",
+  "💃": "dancer",
+  "💃🏻": "dancer:t2",
+  "💃🏼": "dancer:t3",
+  "💃🏽": "dancer:t4",
+  "💃🏾": "dancer:t5",
+  "💃🏿": "dancer:t6",
+  "🕺": "man_dancing",
+  "🕺🏻": "man_dancing:t2",
+  "🕺🏼": "man_dancing:t3",
+  "🕺🏽": "man_dancing:t4",
+  "🕺🏾": "man_dancing:t5",
+  "🕺🏿": "man_dancing:t6",
+  "👯": "dancing_women",
+  "👯‍♂": "dancing_men",
+  "👫": "couple",
+  "👬": "two_men_holding_hands",
+  "👭": "two_women_holding_hands",
+  "🙇‍♀️": "bowing_woman",
+  "🙇🏻‍♀️": "bowing_woman:t2",
+  "🙇🏼‍♀️": "bowing_woman:t3",
+  "🙇🏽‍♀️": "bowing_woman:t4",
+  "🙇🏾‍♀️": "bowing_woman:t5",
+  "🙇🏿‍♀️": "bowing_woman:t6",
+  "🙇": "bowing_man",
+  "🙇🏻": "bowing_man:t2",
+  "🙇🏼": "bowing_man:t3",
+  "🙇🏽": "bowing_man:t4",
+  "🙇🏾": "bowing_man:t5",
+  "🙇🏿": "bowing_man:t6",
+  "🤦‍♂️": "man_facepalming",
+  "🤦🏻‍♂️": "man_facepalming:t2",
+  "🤦🏼‍♂️": "man_facepalming:t3",
+  "🤦🏽‍♂️": "man_facepalming:t4",
+  "🤦🏾‍♂️": "man_facepalming:t5",
+  "🤦🏿‍♂️": "man_facepalming:t6",
+  "🤦‍♀️": "woman_facepalming",
+  "🤦🏻‍♀️": "woman_facepalming:t2",
+  "🤦🏼‍♀️": "woman_facepalming:t3",
+  "🤦🏽‍♀️": "woman_facepalming:t4",
+  "🤦🏾‍♀️": "woman_facepalming:t5",
+  "🤦🏿‍♀️": "woman_facepalming:t6",
+  "🤷‍♀️": "woman_shrugging",
+  "🤷🏻‍♀️": "woman_shrugging:t2",
+  "🤷🏼‍♀️": "woman_shrugging:t3",
+  "🤷🏽‍♀️": "woman_shrugging:t4",
+  "🤷🏾‍♀️": "woman_shrugging:t5",
+  "🤷🏿‍♀️": "woman_shrugging:t6",
+  "🤷‍♂️": "man_shrugging",
+  "🤷🏻‍♂️": "man_shrugging:t2",
+  "🤷🏼‍♂️": "man_shrugging:t3",
+  "🤷🏽‍♂️": "man_shrugging:t4",
+  "🤷🏾‍♂️": "man_shrugging:t5",
+  "🤷🏿‍♂️": "man_shrugging:t6",
+  "💁‍♀️": "tipping_hand_woman",
+  "💁🏻‍♀️": "tipping_hand_woman:t2",
+  "💁🏼‍♀️": "tipping_hand_woman:t3",
+  "💁🏽‍♀️": "tipping_hand_woman:t4",
+  "💁🏾‍♀️": "tipping_hand_woman:t5",
+  "💁🏿‍♀️": "tipping_hand_woman:t6",
+  "💁‍♂️": "tipping_hand_man",
+  "💁🏻‍♂️": "tipping_hand_man:t2",
+  "💁🏼‍♂️": "tipping_hand_man:t3",
+  "💁🏽‍♂️": "tipping_hand_man:t4",
+  "💁🏾‍♂️": "tipping_hand_man:t5",
+  "💁🏿‍♂️": "tipping_hand_man:t6",
+  "🙅‍♀️": "no_good_woman",
+  "🙅🏻‍♀️": "no_good_woman:t2",
+  "🙅🏼‍♀️": "no_good_woman:t3",
+  "🙅🏽‍♀️": "no_good_woman:t4",
+  "🙅🏾‍♀️": "no_good_woman:t5",
+  "🙅🏿‍♀️": "no_good_woman:t6",
+  "🙅‍♂️": "no_good_man",
+  "🙅🏻‍♂️": "no_good_man:t2",
+  "🙅🏼‍♂️": "no_good_man:t3",
+  "🙅🏽‍♂️": "no_good_man:t4",
+  "🙅🏾‍♂️": "no_good_man:t5",
+  "🙅🏿‍♂️": "no_good_man:t6",
+  "🙆‍♀️": "ok_woman",
+  "🙆🏻‍♀️": "ok_woman:t2",
+  "🙆🏼‍♀️": "ok_woman:t3",
+  "🙆🏽‍♀️": "ok_woman:t4",
+  "🙆🏾‍♀️": "ok_woman:t5",
+  "🙆🏿‍♀️": "ok_woman:t6",
+  "🙆‍♂️": "ok_man",
+  "🙆🏻‍♂️": "ok_man:t2",
+  "🙆🏼‍♂️": "ok_man:t3",
+  "🙆🏽‍♂️": "ok_man:t4",
+  "🙆🏾‍♂️": "ok_man:t5",
+  "🙆🏿‍♂️": "ok_man:t6",
+  "🙋‍♀️": "raising_hand_woman",
+  "🙋🏻‍♀️": "raising_hand_woman:t2",
+  "🙋🏼‍♀️": "raising_hand_woman:t3",
+  "🙋🏽‍♀️": "raising_hand_woman:t4",
+  "🙋🏾‍♀️": "raising_hand_woman:t5",
+  "🙋🏿‍♀️": "raising_hand_woman:t6",
+  "🙋‍♂️": "raising_hand_man",
+  "🙋🏻‍♂️": "raising_hand_man:t2",
+  "🙋🏼‍♂️": "raising_hand_man:t3",
+  "🙋🏽‍♂️": "raising_hand_man:t4",
+  "🙋🏾‍♂️": "raising_hand_man:t5",
+  "🙋🏿‍♂️": "raising_hand_man:t6",
+  "🙎‍♀️": "pouting_woman",
+  "🙎🏻‍♀️": "pouting_woman:t2",
+  "🙎🏼‍♀️": "pouting_woman:t3",
+  "🙎🏽‍♀️": "pouting_woman:t4",
+  "🙎🏾‍♀️": "pouting_woman:t5",
+  "🙎🏿‍♀️": "pouting_woman:t6",
+  "🙎‍♂️": "pouting_man",
+  "🙎🏻‍♂️": "pouting_man:t2",
+  "🙎🏼‍♂️": "pouting_man:t3",
+  "🙎🏽‍♂️": "pouting_man:t4",
+  "🙎🏾‍♂️": "pouting_man:t5",
+  "🙎🏿‍♂️": "pouting_man:t6",
+  "🙍‍♀️": "frowning_woman",
+  "🙍🏻‍♀️": "frowning_woman:t2",
+  "🙍🏼‍♀️": "frowning_woman:t3",
+  "🙍🏽‍♀️": "frowning_woman:t4",
+  "🙍🏾‍♀️": "frowning_woman:t5",
+  "🙍🏿‍♀️": "frowning_woman:t6",
+  "🙍‍♂️": "frowning_man",
+  "🙍🏻‍♂️": "frowning_man:t2",
+  "🙍🏼‍♂️": "frowning_man:t3",
+  "🙍🏽‍♂️": "frowning_man:t4",
+  "🙍🏾‍♂️": "frowning_man:t5",
+  "🙍🏿‍♂️": "frowning_man:t6",
+  "💇‍♀️": "haircut_woman",
+  "💇🏻‍♀️": "haircut_woman:t2",
+  "💇🏼‍♀️": "haircut_woman:t3",
+  "💇🏽‍♀️": "haircut_woman:t4",
+  "💇🏾‍♀️": "haircut_woman:t5",
+  "💇🏿‍♀️": "haircut_woman:t6",
+  "💇‍♂️": "haircut_man",
+  "💇🏻‍♂️": "haircut_man:t2",
+  "💇🏼‍♂️": "haircut_man:t3",
+  "💇🏽‍♂️": "haircut_man:t4",
+  "💇🏾‍♂️": "haircut_man:t5",
+  "💇🏿‍♂️": "haircut_man:t6",
+  "💆‍♀️": "massage_woman",
+  "💆🏻‍♀️": "massage_woman:t2",
+  "💆🏼‍♀️": "massage_woman:t3",
+  "💆🏽‍♀️": "massage_woman:t4",
+  "💆🏾‍♀️": "massage_woman:t5",
+  "💆🏿‍♀️": "massage_woman:t6",
+  "💆‍♂️": "massage_man",
+  "💆🏻‍♂️": "massage_man:t2",
+  "💆🏼‍♂️": "massage_man:t3",
+  "💆🏽‍♂️": "massage_man:t4",
+  "💆🏾‍♂️": "massage_man:t5",
+  "💆🏿‍♂️": "massage_man:t6",
+  "💑": "couple_with_heart_woman_man",
+  "👩‍❤️‍👩": "couple_with_heart_woman_woman",
+  "👨‍❤️‍👨": "couple_with_heart_man_man",
+  "💏": "couplekiss_man_woman",
+  "👩‍❤️‍💋‍👩": "couplekiss_woman_woman",
+  "👨‍❤️‍💋‍👨": "couplekiss_man_man",
+  "👪": "family_man_woman_boy",
+  "👨‍👩‍👧": "family_man_woman_girl",
+  "👨‍👩‍👧‍👦": "family_man_woman_girl_boy",
+  "👨‍👩‍👦‍👦": "family_man_woman_boy_boy",
+  "👨‍👩‍👧‍👧": "family_man_woman_girl_girl",
+  "👩‍👩‍👦": "family_woman_woman_boy",
+  "👩‍👩‍👧": "family_woman_woman_girl",
+  "👩‍👩‍👧‍👦": "family_woman_woman_girl_boy",
+  "👩‍👩‍👦‍👦": "family_woman_woman_boy_boy",
+  "👩‍👩‍👧‍👧": "family_woman_woman_girl_girl",
+  "👨‍👨‍👦": "family_man_man_boy",
+  "👨‍👨‍👧": "family_man_man_girl",
+  "👨‍👨‍👧‍👦": "family_man_man_girl_boy",
+  "👨‍👨‍👦‍👦": "family_man_man_boy_boy",
+  "👨‍👨‍👧‍👧": "family_man_man_girl_girl",
+  "👩‍👦": "family_woman_boy",
+  "👩‍👧": "family_woman_girl",
+  "👩‍👧‍👦": "family_woman_girl_boy",
+  "👩‍👦‍👦": "family_woman_boy_boy",
+  "👩‍👧‍👧": "family_woman_girl_girl",
+  "👨‍👦": "family_man_boy",
+  "👨‍👧": "family_man_girl",
+  "👨‍👧‍👦": "family_man_girl_boy",
+  "👨‍👦‍👦": "family_man_boy_boy",
+  "👨‍👧‍👧": "family_man_girl_girl",
+  "👚": "womans_clothes",
+  "👕": "tshirt",
+  "👖": "jeans",
+  "👔": "necktie",
+  "👗": "dress",
+  "👙": "bikini",
+  "👘": "kimono",
+  "💄": "lipstick",
+  "💋": "kiss",
+  "👣": "footprints",
+  "👠": "high_heel",
+  "👡": "sandal",
+  "👢": "boot",
+  "👞": "mans_shoe",
+  "👟": "athletic_shoe",
+  "👒": "womans_hat",
+  "🎩": "tophat",
+  "⛑": "rescue_worker_helmet",
+  "🎓": "mortar_board",
+  "👑": "crown",
+  "🎒": "school_satchel",
+  "👝": "pouch",
+  "👛": "purse",
+  "👜": "handbag",
+  "💼": "briefcase",
+  "👓": "eyeglasses",
+  "🕶": "dark_sunglasses",
+  "💍": "ring",
+  "🌂": "closed_umbrella",
+  "🐶": "dog",
+  "🐱": "cat",
+  "🐭": "mouse",
+  "🐹": "hamster",
+  "🐰": "rabbit",
+  "🦊": "fox_face",
+  "🐻": "bear",
+  "🐼": "panda_face",
+  "🐨": "koala",
+  "🐯": "tiger",
+  "🦁": "lion",
+  "🐮": "cow",
+  "🐷": "pig",
+  "🐽": "pig_nose",
+  "🐸": "frog",
+  "🦑": "squid",
+  "🐙": "octopus",
+  "🦐": "shrimp",
+  "🐵": "monkey_face",
+  "🦍": "gorilla",
+  "🙈": "see_no_evil",
+  "🙉": "hear_no_evil",
+  "🙊": "speak_no_evil",
+  "🐒": "monkey",
+  "🐔": "chicken",
+  "🐧": "penguin",
+  "🐦": "bird",
+  "🐤": "baby_chick",
+  "🐣": "hatching_chick",
+  "🐥": "hatched_chick",
+  "🦆": "duck",
+  "🦅": "eagle",
+  "🦉": "owl",
+  "🦇": "bat",
+  "🐺": "wolf",
+  "🐗": "boar",
+  "🐴": "horse",
+  "🦄": "unicorn",
+  "🐝": "honeybee",
+  "🐛": "bug",
+  "🦋": "butterfly",
+  "🐌": "snail",
+  "🐞": "beetle",
+  "🐜": "ant",
+  "🕷": "spider",
+  "🦂": "scorpion",
+  "🦀": "crab",
+  "🐍": "snake",
+  "🦎": "lizard",
+  "🐢": "turtle",
+  "🐠": "tropical_fish",
+  "🐟": "fish",
+  "🐡": "blowfish",
+  "🐬": "dolphin",
+  "🦈": "shark",
+  "🐳": "whale",
+  "🐋": "whale2",
+  "🐊": "crocodile",
+  "🐆": "leopard",
+  "🐅": "tiger2",
+  "🐃": "water_buffalo",
+  "🐂": "ox",
+  "🐄": "cow2",
+  "🦌": "deer",
+  "🐪": "dromedary_camel",
+  "🐫": "camel",
+  "🐘": "elephant",
+  "🦏": "rhinoceros",
+  "🐐": "goat",
+  "🐏": "ram",
+  "🐑": "sheep",
+  "🐎": "racehorse",
+  "🐖": "pig2",
+  "🐀": "rat",
+  "🐁": "mouse2",
+  "🐓": "rooster",
+  "🦃": "turkey",
+  "🕊": "dove",
+  "🐕": "dog2",
+  "🐩": "poodle",
+  "🐈": "cat2",
+  "🐇": "rabbit2",
+  "🐿": "chipmunk",
+  "🐾": "paw_prints",
+  "🐉": "dragon",
+  "🐲": "dragon_face",
+  "🌵": "cactus",
+  "🎄": "christmas_tree",
+  "🌲": "evergreen_tree",
+  "🌳": "deciduous_tree",
+  "🌴": "palm_tree",
+  "🌱": "seedling",
+  "🌿": "herb",
+  "☘": "shamrock",
+  "🍀": "four_leaf_clover",
+  "🎍": "bamboo",
+  "🎋": "tanabata_tree",
+  "🍃": "leaves",
+  "🍂": "fallen_leaf",
+  "🍁": "maple_leaf",
+  "🌾": "ear_of_rice",
+  "🌺": "hibiscus",
+  "🌻": "sunflower",
+  "🌹": "rose",
+  "🥀": "wilted_flower",
+  "🌷": "tulip",
+  "🌼": "blossom",
+  "🌸": "cherry_blossom",
+  "💐": "bouquet",
+  "🍄": "mushroom",
+  "🌰": "chestnut",
+  "🎃": "jack_o_lantern",
+  "🐚": "shell",
+  "🕸": "spider_web",
+  "🌎": "earth_americas",
+  "🌍": "earth_africa",
+  "🌏": "earth_asia",
+  "🌕": "full_moon",
+  "🌖": "waning_gibbous_moon",
+  "🌗": "last_quarter_moon",
+  "🌘": "waning_crescent_moon",
+  "🌑": "new_moon",
+  "🌒": "waxing_crescent_moon",
+  "🌓": "first_quarter_moon",
+  "🌔": "waxing_gibbous_moon",
+  "🌚": "new_moon_with_face",
+  "🌝": "full_moon_with_face",
+  "🌛": "first_quarter_moon_with_face",
+  "🌜": "last_quarter_moon_with_face",
+  "🌞": "sun_with_face",
+  "🌙": "crescent_moon",
+  "⭐": "star",
+  "🌟": "star2",
+  "💫": "dizzy",
+  "✨": "sparkles",
+  "☄": "comet",
+  "☀": "sunny",
+  "🌤": "sun_behind_small_cloud",
+  "⛅": "partly_sunny",
+  "🌥": "sun_behind_large_cloud",
+  "🌦": "sun_behind_rain_cloud",
+  "☁": "cloud",
+  "🌧": "cloud_with_rain",
+  "⛈": "cloud_with_lightning_and_rain",
+  "🌩": "cloud_with_lightning",
+  "⚡": "zap",
+  "🔥": "fire",
+  "💥": "boom",
+  "❄": "snowflake",
+  "🌨": "cloud_with_snow",
+  "⛄": "snowman",
+  "☃": "snowman_with_snow",
+  "🌬": "wind_face",
+  "💨": "dash",
+  "🌪": "tornado",
+  "🌫": "fog",
+  "☂": "open_umbrella",
+  "☔": "umbrella",
+  "💧": "droplet",
+  "💦": "sweat_drops",
+  "🌊": "ocean",
+  "🍏": "green_apple",
+  "🍎": "apple",
+  "🍐": "pear",
+  "🍊": "tangerine",
+  "🍋": "lemon",
+  "🍌": "banana",
+  "🍉": "watermelon",
+  "🍇": "grapes",
+  "🍓": "strawberry",
+  "🍈": "melon",
+  "🍒": "cherries",
+  "🍑": "peach",
+  "🍍": "pineapple",
+  "🥝": "kiwi_fruit",
+  "🥑": "avocado",
+  "🍅": "tomato",
+  "🍆": "eggplant",
+  "🥒": "cucumber",
+  "🥕": "carrot",
+  "🌶": "hot_pepper",
+  "🥔": "potato",
+  "🌽": "corn",
+  "🍠": "sweet_potato",
+  "🥜": "peanuts",
+  "🍯": "honey_pot",
+  "🥐": "croissant",
+  "🍞": "bread",
+  "🥖": "baguette_bread",
+  "🧀": "cheese",
+  "🥚": "egg",
+  "🥓": "bacon",
+  "🥞": "pancakes",
+  "🍗": "poultry_leg",
+  "🍖": "meat_on_bone",
+  "🍤": "fried_shrimp",
+  "🍳": "fried_egg",
+  "🍔": "hamburger",
+  "🍟": "fries",
+  "🥙": "stuffed_flatbread",
+  "🌭": "hotdog",
+  "🍕": "pizza",
+  "🍝": "spaghetti",
+  "🌮": "taco",
+  "🌯": "burrito",
+  "🥗": "green_salad",
+  "🥘": "shallow_pan_of_food",
+  "🍜": "ramen",
+  "🍲": "stew",
+  "🍥": "fish_cake",
+  "🍣": "sushi",
+  "🍱": "bento",
+  "🍛": "curry",
+  "🍙": "rice_ball",
+  "🍚": "rice",
+  "🍘": "rice_cracker",
+  "🍢": "oden",
+  "🍡": "dango",
+  "🍧": "shaved_ice",
+  "🍨": "ice_cream",
+  "🍦": "icecream",
+  "🍰": "cake",
+  "🎂": "birthday",
+  "🍮": "custard",
+  "🍬": "candy",
+  "🍭": "lollipop",
+  "🍫": "chocolate_bar",
+  "🍿": "popcorn",
+  "🍩": "doughnut",
+  "🍪": "cookie",
+  "🥛": "milk_glass",
+  "🍺": "beer",
+  "🍻": "beers",
+  "🥂": "clinking_glasses",
+  "🍷": "wine_glass",
+  "🥃": "tumbler_glass",
+  "🍸": "cocktail",
+  "🍹": "tropical_drink",
+  "🍾": "champagne",
+  "🍶": "sake",
+  "🍵": "tea",
+  "☕": "coffee",
+  "🍼": "baby_bottle",
+  "🥄": "spoon",
+  "🍴": "fork_and_knife",
+  "🍽": "plate_with_cutlery",
+  "⚽": "soccer",
+  "🏀": "basketball",
+  "🏈": "football",
+  "⚾": "baseball",
+  "🎾": "tennis",
+  "🏐": "volleyball",
+  "🏉": "rugby_football",
+  "🎱": "8ball",
+  "⛳": "golf",
+  "🏌️‍♀": "golfing_woman",
+  "🏌": "golfing_man",
+  "🏌🏻": "golfing_man:t2",
+  "🏌🏼": "golfing_man:t3",
+  "🏌🏽": "golfing_man:t4",
+  "🏌🏾": "golfing_man:t5",
+  "🏌🏿": "golfing_man:t6",
+  "🏓": "ping_pong",
+  "🏸": "badminton",
+  "🥅": "goal_net",
+  "🏒": "ice_hockey",
+  "🏑": "field_hockey",
+  "🏏": "cricket_bat_and_ball",
+  "🎿": "ski",
+  "⛷": "skier",
+  "🏂": "snowboarder",
+  "🏂🏻": "snowboarder:t2",
+  "🏂🏼": "snowboarder:t3",
+  "🏂🏽": "snowboarder:t4",
+  "🏂🏾": "snowboarder:t5",
+  "🏂🏿": "snowboarder:t6",
+  "🤺": "person_fencing",
+  "🤼‍♀": "women_wrestling",
+  "🤼‍♂": "men_wrestling",
+  "🤸‍♀️": "woman_cartwheeling",
+  "🤸🏻‍♀️": "woman_cartwheeling:t2",
+  "🤸🏼‍♀️": "woman_cartwheeling:t3",
+  "🤸🏽‍♀️": "woman_cartwheeling:t4",
+  "🤸🏾‍♀️": "woman_cartwheeling:t5",
+  "🤸🏿‍♀️": "woman_cartwheeling:t6",
+  "🤸‍♂️": "man_cartwheeling",
+  "🤸🏻‍♂️": "man_cartwheeling:t2",
+  "🤸🏼‍♂️": "man_cartwheeling:t3",
+  "🤸🏽‍♂️": "man_cartwheeling:t4",
+  "🤸🏾‍♂️": "man_cartwheeling:t5",
+  "🤸🏿‍♂️": "man_cartwheeling:t6",
+  "🤾‍♀️": "woman_playing_handball",
+  "🤾🏻‍♀️": "woman_playing_handball:t2",
+  "🤾🏼‍♀️": "woman_playing_handball:t3",
+  "🤾🏽‍♀️": "woman_playing_handball:t4",
+  "🤾🏾‍♀️": "woman_playing_handball:t5",
+  "🤾🏿‍♀️": "woman_playing_handball:t6",
+  "🤾‍♂️": "man_playing_handball",
+  "🤾🏻‍♂️": "man_playing_handball:t2",
+  "🤾🏼‍♂️": "man_playing_handball:t3",
+  "🤾🏽‍♂️": "man_playing_handball:t4",
+  "🤾🏾‍♂️": "man_playing_handball:t5",
+  "🤾🏿‍♂️": "man_playing_handball:t6",
+  "⛸": "ice_skate",
+  "🏹": "bow_and_arrow",
+  "🎣": "fishing_pole_and_fish",
+  "🥊": "boxing_glove",
+  "🥋": "martial_arts_uniform",
+  "🚣‍♀️": "rowing_woman",
+  "🚣🏻‍♀️": "rowing_woman:t2",
+  "🚣🏼‍♀️": "rowing_woman:t3",
+  "🚣🏽‍♀️": "rowing_woman:t4",
+  "🚣🏾‍♀️": "rowing_woman:t5",
+  "🚣🏿‍♀️": "rowing_woman:t6",
+  "🚣": "rowing_man",
+  "🚣🏻": "rowing_man:t2",
+  "🚣🏼": "rowing_man:t3",
+  "🚣🏽": "rowing_man:t4",
+  "🚣🏾": "rowing_man:t5",
+  "🚣🏿": "rowing_man:t6",
+  "🏊‍♀️": "swimming_woman",
+  "🏊🏻‍♀️": "swimming_woman:t2",
+  "🏊🏼‍♀️": "swimming_woman:t3",
+  "🏊🏽‍♀️": "swimming_woman:t4",
+  "🏊🏾‍♀️": "swimming_woman:t5",
+  "🏊🏿‍♀️": "swimming_woman:t6",
+  "🏊": "swimming_man",
+  "🏊🏻": "swimming_man:t2",
+  "🏊🏼": "swimming_man:t3",
+  "🏊🏽": "swimming_man:t4",
+  "🏊🏾": "swimming_man:t5",
+  "🏊🏿": "swimming_man:t6",
+  "🤽‍♀️": "woman_playing_water_polo",
+  "🤽🏻‍♀️": "woman_playing_water_polo:t2",
+  "🤽🏼‍♀️": "woman_playing_water_polo:t3",
+  "🤽🏽‍♀️": "woman_playing_water_polo:t4",
+  "🤽🏾‍♀️": "woman_playing_water_polo:t5",
+  "🤽🏿‍♀️": "woman_playing_water_polo:t6",
+  "🤽‍♂️": "man_playing_water_polo",
+  "🤽🏻‍♂️": "man_playing_water_polo:t2",
+  "🤽🏼‍♂️": "man_playing_water_polo:t3",
+  "🤽🏽‍♂️": "man_playing_water_polo:t4",
+  "🤽🏾‍♂️": "man_playing_water_polo:t5",
+  "🤽🏿‍♂️": "man_playing_water_polo:t6",
+  "🏄‍♀️": "surfing_woman",
+  "🏄🏻‍♀️": "surfing_woman:t2",
+  "🏄🏼‍♀️": "surfing_woman:t3",
+  "🏄🏽‍♀️": "surfing_woman:t4",
+  "🏄🏾‍♀️": "surfing_woman:t5",
+  "🏄🏿‍♀️": "surfing_woman:t6",
+  "🏄": "surfing_man",
+  "🏄🏻": "surfing_man:t2",
+  "🏄🏼": "surfing_man:t3",
+  "🏄🏽": "surfing_man:t4",
+  "🏄🏾": "surfing_man:t5",
+  "🏄🏿": "surfing_man:t6",
+  "🛀": "bath",
+  "🛀🏻": "bath:t2",
+  "🛀🏼": "bath:t3",
+  "🛀🏽": "bath:t4",
+  "🛀🏾": "bath:t5",
+  "🛀🏿": "bath:t6",
+  "⛹️‍♀": "basketball_woman",
+  "⛹": "basketball_man",
+  "⛹🏻": "basketball_man:t2",
+  "⛹🏼": "basketball_man:t3",
+  "⛹🏽": "basketball_man:t4",
+  "⛹🏾": "basketball_man:t5",
+  "⛹🏿": "basketball_man:t6",
+  "🏋️‍♀": "weight_lifting_woman",
+  "🏋": "weight_lifting_man",
+  "🏋🏻": "weight_lifting_man:t2",
+  "🏋🏼": "weight_lifting_man:t3",
+  "🏋🏽": "weight_lifting_man:t4",
+  "🏋🏾": "weight_lifting_man:t5",
+  "🏋🏿": "weight_lifting_man:t6",
+  "🚴‍♀️": "biking_woman",
+  "🚴🏻‍♀️": "biking_woman:t2",
+  "🚴🏼‍♀️": "biking_woman:t3",
+  "🚴🏽‍♀️": "biking_woman:t4",
+  "🚴🏾‍♀️": "biking_woman:t5",
+  "🚴🏿‍♀️": "biking_woman:t6",
+  "🚴": "biking_man",
+  "🚴🏻": "biking_man:t2",
+  "🚴🏼": "biking_man:t3",
+  "🚴🏽": "biking_man:t4",
+  "🚴🏾": "biking_man:t5",
+  "🚴🏿": "biking_man:t6",
+  "🚵‍♀️": "mountain_biking_woman",
+  "🚵🏻‍♀️": "mountain_biking_woman:t2",
+  "🚵🏼‍♀️": "mountain_biking_woman:t3",
+  "🚵🏽‍♀️": "mountain_biking_woman:t4",
+  "🚵🏾‍♀️": "mountain_biking_woman:t5",
+  "🚵🏿‍♀️": "mountain_biking_woman:t6",
+  "🚵": "mountain_biking_man",
+  "🚵🏻": "mountain_biking_man:t2",
+  "🚵🏼": "mountain_biking_man:t3",
+  "🚵🏽": "mountain_biking_man:t4",
+  "🚵🏾": "mountain_biking_man:t5",
+  "🚵🏿": "mountain_biking_man:t6",
+  "🏇": "horse_racing",
+  "🏇🏻": "horse_racing:t2",
+  "🏇🏼": "horse_racing:t3",
+  "🏇🏽": "horse_racing:t4",
+  "🏇🏾": "horse_racing:t5",
+  "🏇🏿": "horse_racing:t6",
+  "🕴": "business_suit_levitating",
+  "🕴🏻": "business_suit_levitating:t2",
+  "🕴🏼": "business_suit_levitating:t3",
+  "🕴🏽": "business_suit_levitating:t4",
+  "🕴🏾": "business_suit_levitating:t5",
+  "🕴🏿": "business_suit_levitating:t6",
+  "🏆": "trophy",
+  "🎽": "running_shirt_with_sash",
+  "🏅": "medal_sports",
+  "🎖": "medal_military",
+  "🥇": "1st_place_medal",
+  "🥈": "2nd_place_medal",
+  "🥉": "3rd_place_medal",
+  "🎗": "reminder_ribbon",
+  "🏵": "rosette",
+  "🎫": "ticket",
+  "🎟": "tickets",
+  "🎭": "performing_arts",
+  "🎨": "art",
+  "🎪": "circus_tent",
+  "🤹‍♀️": "woman_juggling",
+  "🤹🏻‍♀️": "woman_juggling:t2",
+  "🤹🏼‍♀️": "woman_juggling:t3",
+  "🤹🏽‍♀️": "woman_juggling:t4",
+  "🤹🏾‍♀️": "woman_juggling:t5",
+  "🤹🏿‍♀️": "woman_juggling:t6",
+  "🤹‍♂️": "man_juggling",
+  "🤹🏻‍♂️": "man_juggling:t2",
+  "🤹🏼‍♂️": "man_juggling:t3",
+  "🤹🏽‍♂️": "man_juggling:t4",
+  "🤹🏾‍♂️": "man_juggling:t5",
+  "🤹🏿‍♂️": "man_juggling:t6",
+  "🎤": "microphone",
+  "🎧": "headphones",
+  "🎼": "musical_score",
+  "🎹": "musical_keyboard",
+  "🥁": "drum",
+  "🎷": "saxophone",
+  "🎺": "trumpet",
+  "🎸": "guitar",
+  "🎻": "violin",
+  "🎬": "clapper",
+  "🎮": "video_game",
+  "👾": "space_invader",
+  "🎯": "dart",
+  "🎲": "game_die",
+  "🎰": "slot_machine",
+  "🎳": "bowling",
+  "🚗": "red_car",
+  "🚕": "taxi",
+  "🚙": "blue_car",
+  "🚌": "bus",
+  "🚎": "trolleybus",
+  "🏎": "racing_car",
+  "🚓": "police_car",
+  "🚑": "ambulance",
+  "🚒": "fire_engine",
+  "🚐": "minibus",
+  "🚚": "truck",
+  "🚛": "articulated_lorry",
+  "🚜": "tractor",
+  "🛴": "kick_scooter",
+  "🏍": "motorcycle",
+  "🚲": "bike",
+  "🛵": "motor_scooter",
+  "🚨": "rotating_light",
+  "🚔": "oncoming_police_car",
+  "🚍": "oncoming_bus",
+  "🚘": "oncoming_automobile",
+  "🚖": "oncoming_taxi",
+  "🚡": "aerial_tramway",
+  "🚠": "mountain_cableway",
+  "🚟": "suspension_railway",
+  "🚃": "railway_car",
+  "🚋": "train",
+  "🚝": "monorail",
+  "🚄": "bullettrain_side",
+  "🚅": "bullettrain_front",
+  "🚈": "light_rail",
+  "🚞": "mountain_railway",
+  "🚂": "steam_locomotive",
+  "🚆": "train2",
+  "🚇": "metro",
+  "🚊": "tram",
+  "🚉": "station",
+  "🚁": "helicopter",
+  "🛩": "small_airplane",
+  "✈": "airplane",
+  "🛫": "flight_departure",
+  "🛬": "flight_arrival",
+  "⛵": "sailboat",
+  "🛥": "motor_boat",
+  "🚤": "speedboat",
+  "⛴": "ferry",
+  "🛳": "passenger_ship",
+  "🚀": "rocket",
+  "🛰": "artificial_satellite",
+  "💺": "seat",
+  "🛶": "canoe",
+  "⚓": "anchor",
+  "🚧": "construction",
+  "⛽": "fuelpump",
+  "🚏": "busstop",
+  "🚦": "vertical_traffic_light",
+  "🚥": "traffic_light",
+  "🏁": "checkered_flag",
+  "🚢": "ship",
+  "🎡": "ferris_wheel",
+  "🎢": "roller_coaster",
+  "🎠": "carousel_horse",
+  "🏗": "building_construction",
+  "🌁": "foggy",
+  "🗼": "tokyo_tower",
+  "🏭": "factory",
+  "⛲": "fountain",
+  "🎑": "rice_scene",
+  "⛰": "mountain",
+  "🏔": "mountain_snow",
+  "🗻": "mount_fuji",
+  "🌋": "volcano",
+  "🗾": "japan",
+  "🏕": "camping",
+  "⛺": "tent",
+  "🏞": "national_park",
+  "🛣": "motorway",
+  "🛤": "railway_track",
+  "🌅": "sunrise",
+  "🌄": "sunrise_over_mountains",
+  "🏜": "desert",
+  "🏖": "beach_umbrella",
+  "🏝": "desert_island",
+  "🌇": "city_sunrise",
+  "🌆": "city_sunset",
+  "🏙": "cityscape",
+  "🌃": "night_with_stars",
+  "🌉": "bridge_at_night",
+  "🌌": "milky_way",
+  "🌠": "stars",
+  "🎇": "sparkler",
+  "🎆": "fireworks",
+  "🌈": "rainbow",
+  "🏘": "houses",
+  "🏰": "european_castle",
+  "🏯": "japanese_castle",
+  "🏟": "stadium",
+  "🗽": "statue_of_liberty",
+  "🏠": "house",
+  "🏡": "house_with_garden",
+  "🏚": "derelict_house",
+  "🏢": "office",
+  "🏬": "department_store",
+  "🏣": "post_office",
+  "🏤": "european_post_office",
+  "🏥": "hospital",
+  "🏦": "bank",
+  "🏨": "hotel",
+  "🏪": "convenience_store",
+  "🏫": "school",
+  "🏩": "love_hotel",
+  "💒": "wedding",
+  "🏛": "classical_building",
+  "⛪": "church",
+  "🕌": "mosque",
+  "🕍": "synagogue",
+  "🕋": "kaaba",
+  "⛩": "shinto_shrine",
+  "⌚": "watch",
+  "📱": "iphone",
+  "📲": "calling",
+  "💻": "computer",
+  "⌨": "keyboard",
+  "🖥": "desktop_computer",
+  "🖨": "printer",
+  "🖱": "computer_mouse",
+  "🖲": "trackball",
+  "🕹": "joystick",
+  "🗜": "clamp",
+  "💽": "minidisc",
+  "💾": "floppy_disk",
+  "💿": "cd",
+  "📀": "dvd",
+  "📼": "vhs",
+  "📷": "camera",
+  "📸": "camera_flash",
+  "📹": "video_camera",
+  "🎥": "movie_camera",
+  "📽": "film_projector",
+  "🎞": "film_strip",
+  "📞": "telephone_receiver",
+  "☎": "phone",
+  "📟": "pager",
+  "📠": "fax",
+  "📺": "tv",
+  "📻": "radio",
+  "🎙": "studio_microphone",
+  "🎚": "level_slider",
+  "🎛": "control_knobs",
+  "⏱": "stopwatch",
+  "⏲": "timer_clock",
+  "⏰": "alarm_clock",
+  "🕰": "mantelpiece_clock",
+  "⏳": "hourglass_flowing_sand",
+  "⌛": "hourglass",
+  "📡": "satellite",
+  "🔋": "battery",
+  "🔌": "electric_plug",
+  "💡": "bulb",
+  "🔦": "flashlight",
+  "🕯": "candle",
+  "🗑": "wastebasket",
+  "🛢": "oil_drum",
+  "💸": "money_with_wings",
+  "💵": "dollar",
+  "💴": "yen",
+  "💶": "euro",
+  "💷": "pound",
+  "💰": "moneybag",
+  "💳": "credit_card",
+  "💎": "gem",
+  "⚖": "balance_scale",
+  "🔧": "wrench",
+  "🔨": "hammer",
+  "⚒": "hammer_and_pick",
+  "🛠": "hammer_and_wrench",
+  "⛏": "pick",
+  "🔩": "nut_and_bolt",
+  "⚙": "gear",
+  "⛓": "chains",
+  "🔫": "gun",
+  "💣": "bomb",
+  "🔪": "hocho",
+  "🗡": "dagger",
+  "⚔": "crossed_swords",
+  "🛡": "shield",
+  "🚬": "smoking",
+  "☠": "skull_and_crossbones",
+  "⚰": "coffin",
+  "⚱": "funeral_urn",
+  "🏺": "amphora",
+  "🔮": "crystal_ball",
+  "📿": "prayer_beads",
+  "💈": "barber",
+  "⚗": "alembic",
+  "🔭": "telescope",
+  "🔬": "microscope",
+  "🕳": "hole",
+  "💊": "pill",
+  "💉": "syringe",
+  "🌡": "thermometer",
+  "🏷": "label",
+  "🔖": "bookmark",
+  "🚽": "toilet",
+  "🚿": "shower",
+  "🛁": "bathtub",
+  "🔑": "key",
+  "🗝": "old_key",
+  "🛋": "couch_and_lamp",
+  "🛌": "sleeping_bed",
+  "🛌🏻": "sleeping_bed:t2",
+  "🛌🏼": "sleeping_bed:t3",
+  "🛌🏽": "sleeping_bed:t4",
+  "🛌🏾": "sleeping_bed:t5",
+  "🛌🏿": "sleeping_bed:t6",
+  "🛏": "bed",
+  "🚪": "door",
+  "🛎": "bellhop_bell",
+  "🖼": "framed_picture",
+  "🗺": "world_map",
+  "⛱": "parasol_on_ground",
+  "🗿": "moyai",
+  "🛍": "shopping",
+  "🛒": "shopping_cart",
+  "🎈": "balloon",
+  "🎏": "flags",
+  "🎀": "ribbon",
+  "🎁": "gift",
+  "🎊": "confetti_ball",
+  "🎉": "tada",
+  "🎎": "dolls",
+  "🎐": "wind_chime",
+  "🎌": "crossed_flags",
+  "🏮": "izakaya_lantern",
+  "✉": "email",
+  "📩": "envelope_with_arrow",
+  "📨": "incoming_envelope",
+  "📧": "e-mail",
+  "💌": "love_letter",
+  "📮": "postbox",
+  "📪": "mailbox_closed",
+  "📫": "mailbox",
+  "📬": "mailbox_with_mail",
+  "📭": "mailbox_with_no_mail",
+  "📦": "package",
+  "📯": "postal_horn",
+  "📥": "inbox_tray",
+  "📤": "outbox_tray",
+  "📜": "scroll",
+  "📃": "page_with_curl",
+  "📑": "bookmark_tabs",
+  "📊": "bar_chart",
+  "📈": "chart_with_upwards_trend",
+  "📉": "chart_with_downwards_trend",
+  "📄": "page_facing_up",
+  "📅": "date",
+  "📆": "calendar",
+  "🗓": "spiral_calendar",
+  "📇": "card_index",
+  "🗃": "card_file_box",
+  "🗳": "ballot_box",
+  "🗄": "file_cabinet",
+  "📋": "clipboard",
+  "🗒": "spiral_notepad",
+  "📁": "file_folder",
+  "📂": "open_file_folder",
+  "🗂": "card_index_dividers",
+  "🗞": "newspaper_roll",
+  "📰": "newspaper",
+  "📓": "notebook",
+  "📕": "closed_book",
+  "📗": "green_book",
+  "📘": "blue_book",
+  "📙": "orange_book",
+  "📔": "notebook_with_decorative_cover",
+  "📒": "ledger",
+  "📚": "books",
+  "📖": "open_book",
+  "🔗": "link",
+  "📎": "paperclip",
+  "🖇": "paperclips",
+  "✂": "scissors",
+  "📐": "triangular_ruler",
+  "📏": "straight_ruler",
+  "📌": "pushpin",
+  "📍": "round_pushpin",
+  "🚩": "triangular_flag_on_post",
+  "🏳": "white_flag",
+  "🏴": "black_flag",
+  "🏳️‍🌈": "rainbow_flag",
+  "🔐": "closed_lock_with_key",
+  "🔒": "lock",
+  "🔓": "unlock",
+  "🔏": "lock_with_ink_pen",
+  "🖊": "pen",
+  "🖋": "fountain_pen",
+  "✒": "black_nib",
+  "📝": "memo",
+  "✏": "pencil2",
+  "🖍": "crayon",
+  "🖌": "paintbrush",
+  "🔍": "mag",
+  "🔎": "mag_right",
+  "❤": "heart",
+  "💛": "yellow_heart",
+  "💚": "green_heart",
+  "💙": "blue_heart",
+  "💜": "purple_heart",
+  "🖤": "black_heart",
+  "💔": "broken_heart",
+  "❣": "heavy_heart_exclamation",
+  "💕": "two_hearts",
+  "💞": "revolving_hearts",
+  "💓": "heartbeat",
+  "💗": "heartpulse",
+  "💖": "sparkling_heart",
+  "💘": "cupid",
+  "💝": "gift_heart",
+  "💟": "heart_decoration",
+  "☮": "peace_symbol",
+  "✝": "latin_cross",
+  "☪": "star_and_crescent",
+  "🕉": "om",
+  "☸": "wheel_of_dharma",
+  "✡": "star_of_david",
+  "🔯": "six_pointed_star",
+  "🕎": "menorah",
+  "☯": "yin_yang",
+  "☦": "orthodox_cross",
+  "🛐": "place_of_worship",
+  "⛎": "ophiuchus",
+  "♈": "aries",
+  "♉": "taurus",
+  "♊": "gemini",
+  "♋": "cancer",
+  "♌": "leo",
+  "♍": "virgo",
+  "♎": "libra",
+  "♏": "scorpius",
+  "♐": "sagittarius",
+  "♑": "capricorn",
+  "♒": "aquarius",
+  "♓": "pisces",
+  "🆔": "id",
+  "⚛": "atom_symbol",
+  "🈳": "u7a7a",
+  "🈹": "u5272",
+  "☢": "radioactive",
+  "☣": "biohazard",
+  "📴": "mobile_phone_off",
+  "📳": "vibration_mode",
+  "🈶": "u6709",
+  "🈚": "u7121",
+  "🈸": "u7533",
+  "🈺": "u55b6",
+  "🈷": "u6708",
+  "✴": "eight_pointed_black_star",
+  "🆚": "vs",
+  "🉑": "accept",
+  "💮": "white_flower",
+  "🉐": "ideograph_advantage",
+  "㊙": "secret",
+  "㊗": "congratulations",
+  "🈴": "u5408",
+  "🈵": "u6e80",
+  "🈲": "u7981",
+  "🅰": "a",
+  "🅱": "b",
+  "🆎": "ab",
+  "🆑": "cl",
+  "🅾": "o2",
+  "🆘": "sos",
+  "⛔": "no_entry",
+  "📛": "name_badge",
+  "🚫": "no_entry_sign",
+  "❌": "x",
+  "⭕": "o",
+  "🛑": "stop_sign",
+  "💢": "anger",
+  "♨": "hotsprings",
+  "🚷": "no_pedestrians",
+  "🚯": "do_not_litter",
+  "🚳": "no_bicycles",
+  "🚱": "non-potable_water",
+  "🔞": "underage",
+  "📵": "no_mobile_phones",
+  "❗": "exclamation",
+  "❕": "grey_exclamation",
+  "❓": "question",
+  "❔": "grey_question",
+  "‼": "bangbang",
+  "⁉": "interrobang",
+  "💯": "100",
+  "🔅": "low_brightness",
+  "🔆": "high_brightness",
+  "🔱": "trident",
+  "⚜": "fleur_de_lis",
+  "〽": "part_alternation_mark",
+  "⚠": "warning",
+  "🚸": "children_crossing",
+  "🔰": "beginner",
+  "♻": "recycle",
+  "🈯": "u6307",
+  "💹": "chart",
+  "❇": "sparkle",
+  "✳": "eight_spoked_asterisk",
+  "❎": "negative_squared_cross_mark",
+  "✅": "white_check_mark",
+  "💠": "diamond_shape_with_a_dot_inside",
+  "🌀": "cyclone",
+  "➿": "loop",
+  "🌐": "globe_with_meridians",
+  "Ⓜ": "m",
+  "🏧": "atm",
+  "🈂": "sa",
+  "🛂": "passport_control",
+  "🛃": "customs",
+  "🛄": "baggage_claim",
+  "🛅": "left_luggage",
+  "♿": "wheelchair",
+  "🚭": "no_smoking",
+  "🚾": "wc",
+  "🅿": "parking",
+  "🚰": "potable_water",
+  "🚹": "mens",
+  "🚺": "womens",
+  "🚼": "baby_symbol",
+  "🚻": "restroom",
+  "🚮": "put_litter_in_its_place",
+  "🎦": "cinema",
+  "📶": "signal_strength",
+  "🈁": "koko",
+  "🆖": "ng",
+  "🆗": "ok",
+  "🆙": "up",
+  "🆒": "cool",
+  "🆕": "new",
+  "🆓": "free",
+  "0️⃣": "zero",
+  "1️⃣": "one",
+  "2️⃣": "two",
+  "3️⃣": "three",
+  "4️⃣": "four",
+  "5️⃣": "five",
+  "6️⃣": "six",
+  "7️⃣": "seven",
+  "8️⃣": "eight",
+  "9️⃣": "nine",
+  "🔟": "keycap_ten",
+  "*️⃣": "asterisk",
+  "🔢": "1234",
+  "▶": "arrow_forward",
+  "⏸": "pause_button",
+  "⏭": "next_track_button",
+  "⏹": "stop_button",
+  "⏺": "record_button",
+  "⏯": "play_or_pause_button",
+  "⏮": "previous_track_button",
+  "⏩": "fast_forward",
+  "⏪": "rewind",
+  "🔀": "twisted_rightwards_arrows",
+  "🔁": "repeat",
+  "🔂": "repeat_one",
+  "◀": "arrow_backward",
+  "🔼": "arrow_up_small",
+  "🔽": "arrow_down_small",
+  "⏫": "arrow_double_up",
+  "⏬": "arrow_double_down",
+  "➡": "arrow_right",
+  "⬅": "arrow_left",
+  "⬆": "arrow_up",
+  "⬇": "arrow_down",
+  "↗": "arrow_upper_right",
+  "↘": "arrow_lower_right",
+  "↙": "arrow_lower_left",
+  "↖": "arrow_upper_left",
+  "↕": "arrow_up_down",
+  "🔄": "arrows_counterclockwise",
+  "↪": "arrow_right_hook",
+  "↩": "leftwards_arrow_with_hook",
+  "⤴": "arrow_heading_up",
+  "⤵": "arrow_heading_down",
+  "#️⃣": "hash",
+  ℹ: "information_source",
+  "🔤": "abc",
+  "🔡": "abcd",
+  "🔠": "capital_abcd",
+  "🔣": "symbols",
+  "🎵": "musical_note",
+  "🎶": "notes",
+  "〰": "wavy_dash",
+  "➰": "curly_loop",
+  "✔": "heavy_check_mark",
+  "🔃": "arrows_clockwise",
+  "➕": "heavy_plus_sign",
+  "➖": "heavy_minus_sign",
+  "➗": "heavy_division_sign",
+  "✖": "heavy_multiplication_x",
+  "💲": "heavy_dollar_sign",
+  "💱": "currency_exchange",
+  "🔚": "end",
+  "🔙": "back",
+  "🔛": "on",
+  "🔝": "top",
+  "🔜": "soon",
+  "☑": "ballot_box_with_check",
+  "🔘": "radio_button",
+  "⚪": "white_circle",
+  "⚫": "black_circle",
+  "🔴": "red_circle",
+  "🔵": "large_blue_circle",
+  "🔸": "small_orange_diamond",
+  "🔹": "small_blue_diamond",
+  "🔶": "large_orange_diamond",
+  "🔷": "large_blue_diamond",
+  "🔺": "small_red_triangle",
+  "▪": "black_small_square",
+  "▫": "white_small_square",
+  "⬛": "black_large_square",
+  "⬜": "white_large_square",
+  "🔻": "small_red_triangle_down",
+  "◼": "black_medium_square",
+  "◻": "white_medium_square",
+  "◾": "black_medium_small_square",
+  "◽": "white_medium_small_square",
+  "🔲": "black_square_button",
+  "🔳": "white_square_button",
+  "🔈": "speaker",
+  "🔉": "sound",
+  "🔊": "loud_sound",
+  "🔇": "mute",
+  "📣": "mega",
+  "📢": "loudspeaker",
+  "🔔": "bell",
+  "🔕": "no_bell",
+  "🃏": "black_joker",
+  "🀄": "mahjong",
+  "♠": "spades",
+  "♣": "clubs",
+  "♥": "heart",
+  "♦": "diamonds",
+  "🎴": "flower_playing_cards",
+  "💭": "thought_balloon",
+  "🗯": "right_anger_bubble",
+  "💬": "speech_balloon",
+  "🗨": "left_speech_bubble",
+  "🕐": "clock1",
+  "🕑": "clock2",
+  "🕒": "clock3",
+  "🕓": "clock4",
+  "🕔": "clock5",
+  "🕕": "clock6",
+  "🕖": "clock7",
+  "🕗": "clock8",
+  "🕘": "clock9",
+  "🕙": "clock10",
+  "🕚": "clock11",
+  "🕛": "clock12",
+  "🕜": "clock130",
+  "🕝": "clock230",
+  "🕞": "clock330",
+  "🕟": "clock430",
+  "🕠": "clock530",
+  "🕡": "clock630",
+  "🕢": "clock730",
+  "🕣": "clock830",
+  "🕤": "clock930",
+  "🕥": "clock1030",
+  "🕦": "clock1130",
+  "🕧": "clock1230",
+  "🇦🇫": "afghanistan",
+  "🇦🇽": "aland_islands",
+  "🇦🇱": "albania",
+  "🇩🇿": "algeria",
+  "🇦🇸": "american_samoa",
+  "🇦🇩": "andorra",
+  "🇦🇴": "angola",
+  "🇦🇮": "anguilla",
+  "🇦🇶": "antarctica",
+  "🇦🇬": "antigua_barbuda",
+  "🇦🇷": "argentina",
+  "🇦🇲": "armenia",
+  "🇦🇼": "aruba",
+  "🇦🇺": "australia",
+  "🇦🇹": "austria",
+  "🇦🇿": "azerbaijan",
+  "🇧🇸": "bahamas",
+  "🇧🇭": "bahrain",
+  "🇧🇩": "bangladesh",
+  "🇧🇧": "barbados",
+  "🇧🇾": "belarus",
+  "🇧🇪": "belgium",
+  "🇧🇿": "belize",
+  "🇧🇯": "benin",
+  "🇧🇲": "bermuda",
+  "🇧🇹": "bhutan",
+  "🇧🇴": "bolivia",
+  "🇧🇶": "caribbean_netherlands",
+  "🇧🇦": "bosnia_herzegovina",
+  "🇧🇼": "botswana",
+  "🇧🇷": "brazil",
+  "🇮🇴": "british_indian_ocean_territory",
+  "🇻🇬": "british_virgin_islands",
+  "🇧🇳": "brunei",
+  "🇧🇬": "bulgaria",
+  "🇧🇫": "burkina_faso",
+  "🇧🇮": "burundi",
+  "🇨🇻": "cape_verde",
+  "🇰🇭": "cambodia",
+  "🇨🇲": "cameroon",
+  "🇨🇦": "canada",
+  "🇮🇨": "canary_islands",
+  "🇰🇾": "cayman_islands",
+  "🇨🇫": "central_african_republic",
+  "🇹🇩": "chad",
+  "🇨🇱": "chile",
+  "🇨🇳": "cn",
+  "🇨🇽": "christmas_island",
+  "🇨🇨": "cocos_islands",
+  "🇨🇴": "colombia",
+  "🇰🇲": "comoros",
+  "🇨🇬": "congo_brazzaville",
+  "🇨🇩": "congo_kinshasa",
+  "🇨🇰": "cook_islands",
+  "🇨🇷": "costa_rica",
+  "🇭🇷": "croatia",
+  "🇨🇺": "cuba",
+  "🇨🇼": "curacao",
+  "🇨🇾": "cyprus",
+  "🇨🇿": "czech_republic",
+  "🇩🇰": "denmark",
+  "🇩🇯": "djibouti",
+  "🇩🇲": "dominica",
+  "🇩🇴": "dominican_republic",
+  "🇪🇨": "ecuador",
+  "🇪🇬": "egypt",
+  "🇸🇻": "el_salvador",
+  "🇬🇶": "equatorial_guinea",
+  "🇪🇷": "eritrea",
+  "🇪🇪": "estonia",
+  "🇪🇹": "ethiopia",
+  "🇪🇺": "eu",
+  "🇫🇰": "falkland_islands",
+  "🇫🇴": "faroe_islands",
+  "🇫🇯": "fiji",
+  "🇫🇮": "finland",
+  "🇫🇷": "fr",
+  "🇬🇫": "french_guiana",
+  "🇵🇫": "french_polynesia",
+  "🇹🇫": "french_southern_territories",
+  "🇬🇦": "gabon",
+  "🇬🇲": "gambia",
+  "🇬🇪": "georgia",
+  "🇩🇪": "de",
+  "🇬🇭": "ghana",
+  "🇬🇮": "gibraltar",
+  "🇬🇷": "greece",
+  "🇬🇱": "greenland",
+  "🇬🇩": "grenada",
+  "🇬🇵": "guadeloupe",
+  "🇬🇺": "guam",
+  "🇬🇹": "guatemala",
+  "🇬🇬": "guernsey",
+  "🇬🇳": "guinea",
+  "🇬🇼": "guinea_bissau",
+  "🇬🇾": "guyana",
+  "🇭🇹": "haiti",
+  "🇭🇳": "honduras",
+  "🇭🇰": "hong_kong",
+  "🇭🇺": "hungary",
+  "🇮🇸": "iceland",
+  "🇮🇳": "india",
+  "🇮🇩": "indonesia",
+  "🇮🇷": "iran",
+  "🇮🇶": "iraq",
+  "🇮🇪": "ireland",
+  "🇮🇲": "isle_of_man",
+  "🇮🇱": "israel",
+  "🇮🇹": "it",
+  "🇨🇮": "cote_divoire",
+  "🇯🇲": "jamaica",
+  "🇯🇵": "jp",
+  "🇯🇪": "jersey",
+  "🇯🇴": "jordan",
+  "🇰🇿": "kazakhstan",
+  "🇰🇪": "kenya",
+  "🇰🇮": "kiribati",
+  "🇽🇰": "kosovo",
+  "🇰🇼": "kuwait",
+  "🇰🇬": "kyrgyzstan",
+  "🇱🇦": "laos",
+  "🇱🇻": "latvia",
+  "🇱🇧": "lebanon",
+  "🇱🇸": "lesotho",
+  "🇱🇷": "liberia",
+  "🇱🇾": "libya",
+  "🇱🇮": "liechtenstein",
+  "🇱🇹": "lithuania",
+  "🇱🇺": "luxembourg",
+  "🇲🇴": "macau",
+  "🇲🇰": "macedonia",
+  "🇲🇬": "madagascar",
+  "🇲🇼": "malawi",
+  "🇲🇾": "malaysia",
+  "🇲🇻": "maldives",
+  "🇲🇱": "mali",
+  "🇲🇹": "malta",
+  "🇲🇭": "marshall_islands",
+  "🇲🇶": "martinique",
+  "🇲🇷": "mauritania",
+  "🇲🇺": "mauritius",
+  "🇾🇹": "mayotte",
+  "🇲🇽": "mexico",
+  "🇫🇲": "micronesia",
+  "🇲🇩": "moldova",
+  "🇲🇨": "monaco",
+  "🇲🇳": "mongolia",
+  "🇲🇪": "montenegro",
+  "🇲🇸": "montserrat",
+  "🇲🇦": "morocco",
+  "🇲🇿": "mozambique",
+  "🇲🇲": "myanmar",
+  "🇳🇦": "namibia",
+  "🇳🇷": "nauru",
+  "🇳🇵": "nepal",
+  "🇳🇱": "netherlands",
+  "🇳🇨": "new_caledonia",
+  "🇳🇿": "new_zealand",
+  "🇳🇮": "nicaragua",
+  "🇳🇪": "niger",
+  "🇳🇬": "nigeria",
+  "🇳🇺": "niue",
+  "🇳🇫": "norfolk_island",
+  "🇲🇵": "northern_mariana_islands",
+  "🇰🇵": "north_korea",
+  "🇳🇴": "norway",
+  "🇴🇲": "oman",
+  "🇵🇰": "pakistan",
+  "🇵🇼": "palau",
+  "🇵🇸": "palestinian_territories",
+  "🇵🇦": "panama",
+  "🇵🇬": "papua_new_guinea",
+  "🇵🇾": "paraguay",
+  "🇵🇪": "peru",
+  "🇵🇭": "philippines",
+  "🇵🇳": "pitcairn_islands",
+  "🇵🇱": "poland",
+  "🇵🇹": "portugal",
+  "🇵🇷": "puerto_rico",
+  "🇶🇦": "qatar",
+  "🇷🇪": "reunion",
+  "🇷🇴": "romania",
+  "🇷🇺": "ru",
+  "🇷🇼": "rwanda",
+  "🇧🇱": "st_barthelemy",
+  "🇸🇭": "st_helena",
+  "🇰🇳": "st_kitts_nevis",
+  "🇱🇨": "st_lucia",
+  "🇵🇲": "st_pierre_miquelon",
+  "🇻🇨": "st_vincent_grenadines",
+  "🇼🇸": "samoa",
+  "🇸🇲": "san_marino",
+  "🇸🇹": "sao_tome_principe",
+  "🇸🇦": "saudi_arabia",
+  "🇸🇳": "senegal",
+  "🇷🇸": "serbia",
+  "🇸🇨": "seychelles",
+  "🇸🇱": "sierra_leone",
+  "🇸🇬": "singapore",
+  "🇸🇽": "sint_maarten",
+  "🇸🇰": "slovakia",
+  "🇸🇮": "slovenia",
+  "🇸🇧": "solomon_islands",
+  "🇸🇴": "somalia",
+  "🇿🇦": "south_africa",
+  "🇬🇸": "south_georgia_south_sandwich_islands",
+  "🇰🇷": "kr",
+  "🇸🇸": "south_sudan",
+  "🇪🇸": "es",
+  "🇱🇰": "sri_lanka",
+  "🇸🇩": "sudan",
+  "🇸🇷": "suriname",
+  "🇸🇿": "swaziland",
+  "🇸🇪": "sweden",
+  "🇨🇭": "switzerland",
+  "🇸🇾": "syria",
+  "🇹🇼": "taiwan",
+  "🇹🇯": "tajikistan",
+  "🇹🇿": "tanzania",
+  "🇹🇭": "thailand",
+  "🇹🇱": "timor_leste",
+  "🇹🇬": "togo",
+  "🇹🇰": "tokelau",
+  "🇹🇴": "tonga",
+  "🇹🇹": "trinidad_tobago",
+  "🇹🇳": "tunisia",
+  "🇹🇷": "tr",
+  "🇹🇲": "turkmenistan",
+  "🇹🇨": "turks_caicos_islands",
+  "🇹🇻": "tuvalu",
+  "🇺🇬": "uganda",
+  "🇺🇦": "ukraine",
+  "🇦🇪": "united_arab_emirates",
+  "🇬🇧": "uk",
+  "🇺🇸": "us",
+  "🇻🇮": "us_virgin_islands",
+  "🇺🇾": "uruguay",
+  "🇺🇿": "uzbekistan",
+  "🇻🇺": "vanuatu",
+  "🇻🇦": "vatican_city",
+  "🇻🇪": "venezuela",
+  "🇻🇳": "vietnam",
+  "🇼🇫": "wallis_futuna",
+  "🇪🇭": "western_sahara",
+  "🇾🇪": "yemen",
+  "🇿🇲": "zambia",
+  "🇿🇼": "zimbabwe",
+  "🤩": "star_struck",
+  "🤨": "face_with_raised_eyebrow",
+  "🤯": "exploding_head",
+  "🤪": "crazy_face",
+  "🤬": "face_with_symbols_over_mouth",
+  "🤮": "face_vomiting",
+  "🤫": "shushing_face",
+  "🤭": "face_with_hand_over_mouth",
+  "🧐": "face_with_monocle",
+  "🧒": "child",
+  "🧒🏻": "child:t2",
+  "🧒🏼": "child:t3",
+  "🧒🏽": "child:t4",
+  "🧒🏾": "child:t5",
+  "🧒🏿": "child:t6",
+  "🧑": "adult",
+  "🧑🏻": "adult:t2",
+  "🧑🏼": "adult:t3",
+  "🧑🏽": "adult:t4",
+  "🧑🏾": "adult:t5",
+  "🧑🏿": "adult:t6",
+  "🧓": "older_adult",
+  "🧓🏻": "older_adult:t2",
+  "🧓🏼": "older_adult:t3",
+  "🧓🏽": "older_adult:t4",
+  "🧓🏾": "older_adult:t5",
+  "🧓🏿": "older_adult:t6",
+  "🧕": "woman_with_headscarf",
+  "🧕🏻": "woman_with_headscarf:t2",
+  "🧕🏼": "woman_with_headscarf:t3",
+  "🧕🏽": "woman_with_headscarf:t4",
+  "🧕🏾": "woman_with_headscarf:t5",
+  "🧕🏿": "woman_with_headscarf:t6",
+  "🧔": "bearded_person",
+  "🧔🏻": "bearded_person:t2",
+  "🧔🏼": "bearded_person:t3",
+  "🧔🏽": "bearded_person:t4",
+  "🧔🏾": "bearded_person:t5",
+  "🧔🏿": "bearded_person:t6",
+  "🤱": "breast_feeding",
+  "🤱🏻": "breast_feeding:t2",
+  "🤱🏼": "breast_feeding:t3",
+  "🤱🏽": "breast_feeding:t4",
+  "🤱🏾": "breast_feeding:t5",
+  "🤱🏿": "breast_feeding:t6",
+  "🧙": "mage",
+  "🧙🏻": "mage:t2",
+  "🧙🏼": "mage:t3",
+  "🧙🏽": "mage:t4",
+  "🧙🏾": "mage:t5",
+  "🧙🏿": "mage:t6",
+  "🧙‍♀️": "woman_mage",
+  "🧙🏻‍♀️": "woman_mage:t2",
+  "🧙🏼‍♀️": "woman_mage:t3",
+  "🧙🏽‍♀️": "woman_mage:t4",
+  "🧙🏾‍♀️": "woman_mage:t5",
+  "🧙🏿‍♀️": "woman_mage:t6",
+  "🧚": "fairy",
+  "🧚🏻": "fairy:t2",
+  "🧚🏼": "fairy:t3",
+  "🧚🏽": "fairy:t4",
+  "🧚🏾": "fairy:t5",
+  "🧚🏿": "fairy:t6",
+  "🧛": "vampire",
+  "🧛🏻": "vampire:t2",
+  "🧛🏼": "vampire:t3",
+  "🧛🏽": "vampire:t4",
+  "🧛🏾": "vampire:t5",
+  "🧛🏿": "vampire:t6",
+  "🧜": "mermaid",
+  "🧜🏻": "mermaid:t2",
+  "🧜🏼": "mermaid:t3",
+  "🧜🏽": "mermaid:t4",
+  "🧜🏾": "mermaid:t5",
+  "🧜🏿": "mermaid:t6",
+  "🧜‍♂️": "merman",
+  "🧜🏻‍♂️": "merman:t2",
+  "🧜🏼‍♂️": "merman:t3",
+  "🧜🏽‍♂️": "merman:t4",
+  "🧜🏾‍♂️": "merman:t5",
+  "🧜🏿‍♂️": "merman:t6",
+  "🧝": "elf",
+  "🧝🏻": "elf:t2",
+  "🧝🏼": "elf:t3",
+  "🧝🏽": "elf:t4",
+  "🧝🏾": "elf:t5",
+  "🧝🏿": "elf:t6",
+  "🧞": "genie",
+  "🧞‍♀": "woman_genie",
+  "🧟": "zombie",
+  "🧟‍♀": "woman_zombie",
+  "🧖": "person_in_steamy_room",
+  "🧖🏻": "person_in_steamy_room:t2",
+  "🧖🏼": "person_in_steamy_room:t3",
+  "🧖🏽": "person_in_steamy_room:t4",
+  "🧖🏾": "person_in_steamy_room:t5",
+  "🧖🏿": "person_in_steamy_room:t6",
+  "🧖‍♀️": "woman_in_steamy_room",
+  "🧖🏻‍♀️": "woman_in_steamy_room:t2",
+  "🧖🏼‍♀️": "woman_in_steamy_room:t3",
+  "🧖🏽‍♀️": "woman_in_steamy_room:t4",
+  "🧖🏾‍♀️": "woman_in_steamy_room:t5",
+  "🧖🏿‍♀️": "woman_in_steamy_room:t6",
+  "🧗": "person_climbing",
+  "🧗🏻": "person_climbing:t2",
+  "🧗🏼": "person_climbing:t3",
+  "🧗🏽": "person_climbing:t4",
+  "🧗🏾": "person_climbing:t5",
+  "🧗🏿": "person_climbing:t6",
+  "🧗‍♀️": "woman_climbing",
+  "🧗🏻‍♀️": "woman_climbing:t2",
+  "🧗🏼‍♀️": "woman_climbing:t3",
+  "🧗🏽‍♀️": "woman_climbing:t4",
+  "🧗🏾‍♀️": "woman_climbing:t5",
+  "🧗🏿‍♀️": "woman_climbing:t6",
+  "🧘": "person_in_lotus_position",
+  "🧘🏻": "person_in_lotus_position:t2",
+  "🧘🏼": "person_in_lotus_position:t3",
+  "🧘🏽": "person_in_lotus_position:t4",
+  "🧘🏾": "person_in_lotus_position:t5",
+  "🧘🏿": "person_in_lotus_position:t6",
+  "🧘‍♀️": "woman_in_lotus_position",
+  "🧘🏻‍♀️": "woman_in_lotus_position:t2",
+  "🧘🏼‍♀️": "woman_in_lotus_position:t3",
+  "🧘🏽‍♀️": "woman_in_lotus_position:t4",
+  "🧘🏾‍♀️": "woman_in_lotus_position:t5",
+  "🧘🏿‍♀️": "woman_in_lotus_position:t6",
+  "🤟": "love_you_gesture",
+  "🤟🏻": "love_you_gesture:t2",
+  "🤟🏼": "love_you_gesture:t3",
+  "🤟🏽": "love_you_gesture:t4",
+  "🤟🏾": "love_you_gesture:t5",
+  "🤟🏿": "love_you_gesture:t6",
+  "🤲": "palms_up_together",
+  "🤲🏻": "palms_up_together:t2",
+  "🤲🏼": "palms_up_together:t3",
+  "🤲🏽": "palms_up_together:t4",
+  "🤲🏾": "palms_up_together:t5",
+  "🤲🏿": "palms_up_together:t6",
+  "🧠": "brain",
+  "🧡": "orange_heart",
+  "🧣": "scarf",
+  "🧤": "gloves",
+  "🧥": "coat",
+  "🧦": "socks",
+  "🧢": "billed_cap",
+  "🦓": "zebra",
+  "🦒": "giraffe",
+  "🦔": "hedgehog",
+  "🦕": "sauropod",
+  "🦖": "t_rex",
+  "🦗": "cricket",
+  "🥥": "coconut",
+  "🥦": "broccoli",
+  "🥨": "pretzel",
+  "🥩": "cut_of_meat",
+  "🥪": "sandwich",
+  "🥣": "bowl_with_spoon",
+  "🥫": "canned_food",
+  "🥟": "dumpling",
+  "🥠": "fortune_cookie",
+  "🥡": "takeout_box",
+  "🥧": "pie",
+  "🥤": "cup_with_straw",
+  "🥢": "chopsticks",
+  "🛸": "flying_saucer",
+  "🛷": "sled",
+  "🥌": "curling_stone",
+  "🇸🇯": "svalbard_and_jan_mayen",
+  "🇲🇫": "st_martin",
+  "🇺🇲": "us_outlying_islands",
+  "🇹🇦": "tristan_da_cunha",
+  "🇭🇲": "heard_and_mc_donald_islands",
+  "🇪🇦": "ceuta_and_melilla",
+  "🇩🇬": "diego_garcia",
+  "🇦🇨": "ascension_island",
+  "🇧🇻": "bouvet_island",
+  "🇨🇵": "clipperton_island",
+  "🇺🇳": "united_nations",
+  "🥰": "smiling_face_with_three_hearts",
+  "🥵": "hot_face",
+  "🥶": "cold_face",
+  "🥳": "partying_face",
+  "🥴": "woozy_face",
+  "🥺": "pleading_face",
+  "👨‍🦰": "man_red_haired",
+  "👨‍🦱": "man_curly_haired",
+  "👨‍🦳": "man_white_haired",
+  "👨‍🦲": "man_bald",
+  "👩‍🦰": "woman_red_haired",
+  "👩‍🦱": "woman_curly_haired",
+  "👩‍🦳": "woman_white_haired",
+  "👩‍🦲": "woman_bald",
+  "🦸": "superhero",
+  "🦸‍♂": "man_superhero",
+  "🦸‍♀": "woman_superhero",
+  "🦹": "supervillain",
+  "🦹‍♀": "woman_supervillain",
+  "🦹‍♂": "man_supervillain",
+  "🦵": "leg",
+  "🦶": "foot",
+  "🦴": "bone",
+  "🦷": "tooth",
+  "🥽": "goggles",
+  "🥼": "lab_coat",
+  "🥾": "hiking_boot",
+  "🥿": "flat_shoe",
+  "🦝": "raccoon",
+  "🦙": "llama",
+  "🦛": "hippopotamus",
+  "🦘": "kangaroo",
+  "🦡": "badger",
+  "🦢": "swan",
+  "🦚": "peacock",
+  "🦜": "parrot",
+  "🦞": "lobster",
+  "🦟": "mosquito",
+  "🦠": "microbe",
+  "🥭": "mango",
+  "🥬": "leafy_green",
+  "🥯": "bagel",
+  "🧂": "salt",
+  "🥮": "moon_cake",
+  "🧁": "cupcake",
+  "🧭": "compass",
+  "🧱": "brick",
+  "🛹": "skateboard",
+  "🧳": "luggage",
+  "🧨": "firecracker",
+  "🧧": "red_gift_envelope",
+  "🥎": "softball",
+  "🥏": "flying_disc",
+  "🥍": "lacrosse",
+  "🧿": "nazar_amulet",
+  "🧩": "jigsaw",
+  "🧸": "teddy_bear",
+  "♟": "chess_pawn",
+  "🧵": "thread",
+  "🧶": "yarn",
+  "🧮": "abacus",
+  "🧾": "receipt",
+  "🧰": "toolbox",
+  "🧲": "magnet",
+  "🧪": "test_tube",
+  "🧫": "petri_dish",
+  "🧬": "dna",
+  "🧴": "lotion_bottle",
+  "🧷": "safety_pin",
+  "🧹": "broom",
+  "🧺": "basket",
+  "🧻": "roll_of_toilet_paper",
+  "🧼": "soap",
+  "🧽": "sponge",
+  "🧯": "fire_extinguisher",
+  "♾": "infinity",
+  "🏴‍☠": "pirate_flag",
+  "🧇": "waffle",
+  "🦦": "otter",
+  "🦥": "sloth",
+  "🧊": "ice_cube",
+  "🪐": "ringer_planet",
+  "🦩": "flamingo",
+  "🥱": "yawning_face",
+  "🤏": "pinching_hand",
+  "🐕‍🦺": "service_dog",
+  "🦧": "orangutan",
+  "🛺": "auto_rickshaw",
+  "🪂": "parachute",
+  "🪀": "yo-yo",
+  "🪁": "kite",
+  "🟫": "brown_square",
+  "🟪": "purple_square",
+  "🟦": "blue_square",
+  "🟩": "green_square",
+  "🟨": "yellow_square",
+  "🟧": "orange_square",
+  "🟥": "red_square",
+  "🟤": "brown_circle",
+  "🟣": "purple_circle",
+  "🟢": "green_circle",
+  "🟡": "yellow_circle",
+  "🟠": "orange_circle",
+  "🪒": "razor",
+  "🪑": "chair",
+  "🩺": "stethoscope",
+  "🩹": "adhesive_bandage",
+  "🩸": "drop_of_blood",
+  "🦯": "probing_cane",
+  "🪓": "axe",
+  "🪔": "diya_lamp",
+  "🪕": "banjo",
+  "🩰": "ballet_shoes",
+  "🩳": "shorts",
+  "🩲": "briefs",
+  "🩱": "one_piece_swimsuit",
+  "🥻": "sari",
+  "🦺": "safety_vest",
+  "🤿": "diving_mask",
+  "🦼": "motorized_wheelchair",
+  "🦽": "manual_wheelchair",
+  "🛕": "hindu_temple",
+  "🧉": "maté",
+  "🧃": "beverage_box",
+  "🦪": "oyster",
+  "🧈": "butter",
+  "🧆": "falafel",
+  "🧅": "onion",
+  "🧄": "garlic",
+  "🦨": "skunk",
+  "🦮": "guide_dog",
+  "🧑‍🤝‍🧑": "people_holding_hands",
+  "👩‍🦽": "woman_in_manual_wheelchair",
+  "👨‍🦽": "man_in_manual_wheelchair",
+  "👩‍🦼": "woman_in_motorized_wheelchair",
+  "👨‍🦼": "man_in_motorized_wheelchair",
+  "👩‍🦯": "woman_with_probing_cane",
+  "👨‍🦯": "man_with_probing_cane",
+  "🧎‍♀": "woman_kneeling",
+  "🧎‍♂": "man_kneeling",
+  "🧍‍♂": "man_standing",
+  "🧍‍♀": "woman_standing",
+  "🧏‍♀": "deaf_woman",
+  "🧏‍♂": "deaf_man",
+  "🦻": "hear_with_hearing_aid",
+  "🦿": "mechanical_leg",
+  "🦾": "mechanical_arm",
+  "🤍": "white_heart",
+  "🤎": "brown_heart",
+  "🏳️‍⚧": "transgender_flag",
+  "☻": "slight_smile",
+  "♡": "heart"
+};
diff --git a/app/assets/javascripts/pretty-text/addon/emoji/data.js.erb b/app/assets/javascripts/pretty-text/addon/emoji/data.js.erb
deleted file mode 100644
index 5825170790..0000000000
--- a/app/assets/javascripts/pretty-text/addon/emoji/data.js.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-export const emojis = <%= Emoji.standard.map(&:name).flatten.inspect %>;
-export const tonableEmojis = <%= Emoji.tonable_emojis.flatten.inspect %>;
-export const aliases = <%= Emoji.aliases.inspect.gsub("=>", ":") %>;
-export const searchAliases = <%= Emoji.search_aliases.inspect.gsub("=>", ":") %>;
-export const translations = <%= Emoji.translations.inspect.gsub("=>", ":") %>;
-export const replacements = <%= Emoji.unicode_replacements_json %>;
diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rake
index 79cd860689..a415d8b881 100644
--- a/lib/tasks/javascript.rake
+++ b/lib/tasks/javascript.rake
@@ -13,9 +13,13 @@ def library_src
 end
 
 task 'javascript:update_constants' => :environment do
-  constants_js = <<~JS
+  header = <<~HEADER
     // DO NOT EDIT THIS FILE!!!
     // Update it by running `rake javascript:update_constants`
+  HEADER
+
+  constants_js = <<~JS
+    #{header}
 
     export const SEARCH_PRIORITIES = #{Searchable::PRIORITIES.to_json};
 
@@ -27,6 +31,23 @@ task 'javascript:update_constants' => :environment do
   puts "contants.js created"
   %x{yarn run prettier --write #{output_path}}
   puts "constants.js prettified"
+
+  # app/assets/javascripts/pretty-text/addon/emoji/data.js.erb
+  emoji_data_js = <<~JS
+    #{header}
+
+    export const emojis = #{Emoji.standard.map(&:name).flatten.inspect};
+    export const tonableEmojis = #{Emoji.tonable_emojis.flatten.inspect};
+    export const aliases = #{Emoji.aliases.inspect.gsub("=>", ":")};
+    export const searchAliases = #{Emoji.search_aliases.inspect.gsub("=>", ":")};
+    export const translations = #{Emoji.translations.inspect.gsub("=>", ":")};
+    export const replacements = #{Emoji.unicode_replacements_json};
+  JS
+  output_path = "#{Rails.root}/app/assets/javascripts/pretty-text/addon/emoji/data.js"
+  File.write(output_path, emoji_data_js)
+  puts "emoji/data.js created"
+  %x{yarn run prettier --write #{output_path}}
+  puts "emoji/data.js prettified"
 end
 
 task 'javascript:update' do

From 8311374a5a406b147cb767d9e9d4daf05ed0a5fd Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 11 May 2020 15:43:09 -0400
Subject: [PATCH 1098/1830] DEV: Replace `version.js.erb` with pre generated
 file

---
 .../pretty-text/addon/emoji/version.js        |  4 +++
 .../pretty-text/addon/emoji/version.js.erb    |  2 --
 lib/tasks/javascript.rake                     | 34 +++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 app/assets/javascripts/pretty-text/addon/emoji/version.js
 delete mode 100644 app/assets/javascripts/pretty-text/addon/emoji/version.js.erb

diff --git a/app/assets/javascripts/pretty-text/addon/emoji/version.js b/app/assets/javascripts/pretty-text/addon/emoji/version.js
new file mode 100644
index 0000000000..a57796bd77
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/addon/emoji/version.js
@@ -0,0 +1,4 @@
+// DO NOT EDIT THIS FILE!!!
+// Update it by running `rake javascript:update_constants`
+
+export const IMAGE_VERSION = "9";
diff --git a/app/assets/javascripts/pretty-text/addon/emoji/version.js.erb b/app/assets/javascripts/pretty-text/addon/emoji/version.js.erb
deleted file mode 100644
index b846ca59d5..0000000000
--- a/app/assets/javascripts/pretty-text/addon/emoji/version.js.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-// bump up this number to expire all emojis
-export const IMAGE_VERSION = "<%= Emoji::EMOJI_VERSION %>";
diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rake
index a415d8b881..2b57ca0bc7 100644
--- a/lib/tasks/javascript.rake
+++ b/lib/tasks/javascript.rake
@@ -12,30 +12,29 @@ def library_src
   "#{Rails.root}/node_modules"
 end
 
-task 'javascript:update_constants' => :environment do
+def write_template(path, template)
   header = <<~HEADER
     // DO NOT EDIT THIS FILE!!!
     // Update it by running `rake javascript:update_constants`
   HEADER
 
-  constants_js = <<~JS
-    #{header}
+  basename = File.basename(path)
+  output_path = "#{Rails.root}/app/assets/javascripts/#{path}"
 
+  File.write(output_path, "#{header}\n\n#{template}")
+  puts "#{basename} created"
+  %x{yarn run prettier --write #{output_path}}
+  puts "#{basename} prettified"
+end
+
+task 'javascript:update_constants' => :environment do
+  write_template("discourse/app/lib/constants.js", <<~JS)
     export const SEARCH_PRIORITIES = #{Searchable::PRIORITIES.to_json};
 
     export const SEARCH_PHRASE_REGEXP = '#{Search::PHRASE_MATCH_REGEXP_PATTERN}';
   JS
 
-  output_path = "#{Rails.root}/app/assets/javascripts/discourse/app/lib/constants.js"
-  File.write(output_path, constants_js)
-  puts "contants.js created"
-  %x{yarn run prettier --write #{output_path}}
-  puts "constants.js prettified"
-
-  # app/assets/javascripts/pretty-text/addon/emoji/data.js.erb
-  emoji_data_js = <<~JS
-    #{header}
-
+  write_template("pretty-text/addon/emoji/data.js", <<~JS)
     export const emojis = #{Emoji.standard.map(&:name).flatten.inspect};
     export const tonableEmojis = #{Emoji.tonable_emojis.flatten.inspect};
     export const aliases = #{Emoji.aliases.inspect.gsub("=>", ":")};
@@ -43,11 +42,10 @@ task 'javascript:update_constants' => :environment do
     export const translations = #{Emoji.translations.inspect.gsub("=>", ":")};
     export const replacements = #{Emoji.unicode_replacements_json};
   JS
-  output_path = "#{Rails.root}/app/assets/javascripts/pretty-text/addon/emoji/data.js"
-  File.write(output_path, emoji_data_js)
-  puts "emoji/data.js created"
-  %x{yarn run prettier --write #{output_path}}
-  puts "emoji/data.js prettified"
+
+  write_template("pretty-text/addon/emoji/version.js", <<~JS)
+    export const IMAGE_VERSION = "#{Emoji::EMOJI_VERSION}";
+  JS
 end
 
 task 'javascript:update' do

From 4c17ff98fafb0214efeebc02f0a9ece3194da357 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 11 May 2020 15:51:10 -0400
Subject: [PATCH 1099/1830] DEV: Remove deprecation for `Discourse.Session`

---
 app/assets/javascripts/discourse/app/models/session.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/session.js b/app/assets/javascripts/discourse/app/models/session.js
index 9f05080ea9..517cf769cb 100644
--- a/app/assets/javascripts/discourse/app/models/session.js
+++ b/app/assets/javascripts/discourse/app/models/session.js
@@ -1,6 +1,5 @@
 import RestModel from "discourse/models/rest";
 import Singleton from "discourse/mixins/singleton";
-import deprecated from "discourse-common/lib/deprecated";
 
 // A data model representing current session data. You can put transient
 // data here you might want later. It is not stored or serialized anywhere.
@@ -12,13 +11,4 @@ const Session = RestModel.extend({
 
 Session.reopenClass(Singleton);
 
-Object.defineProperty(Discourse, "Session", {
-  get() {
-    deprecated("Import the Session object instead of using Discourse.Session", {
-      since: "2.4.0",
-      dropFrom: "2.5.0"
-    });
-    return Session;
-  }
-});
 export default Session;

From 46730a2f0d4916a5361cfa9e2a197acf80c0abe6 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 11 May 2020 16:06:06 -0400
Subject: [PATCH 1100/1830] DEV: Allow us to keep the deprecation with Ember
 CLI

---
 .../javascripts/discourse/app/models/site.js  | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/site.js b/app/assets/javascripts/discourse/app/models/site.js
index 455368bf85..03aee34519 100644
--- a/app/assets/javascripts/discourse/app/models/site.js
+++ b/app/assets/javascripts/discourse/app/models/site.js
@@ -216,18 +216,20 @@ Site.reopenClass(Singleton, {
   }
 });
 
-let warned = false;
-Object.defineProperty(Discourse, "Site", {
-  get() {
-    if (!warned) {
-      deprecated("Import the Site class instead of using Discourse.Site", {
-        since: "2.4.0",
-        dropFrom: "2.6.0"
-      });
-      warned = true;
+if (typeof Discourse !== "undefined") {
+  let warned = false;
+  Object.defineProperty(Discourse, "Site", {
+    get() {
+      if (!warned) {
+        deprecated("Import the Site class instead of using Discourse.Site", {
+          since: "2.4.0",
+          dropFrom: "2.6.0"
+        });
+        warned = true;
+      }
+      return Site;
     }
-    return Site;
-  }
-});
+  });
+}
 
 export default Site;

From b4bd238dd698f7ee8ea9d0a06061d7c2d68de604 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 11 May 2020 16:08:12 -0400
Subject: [PATCH 1101/1830] DEV: Add safe deprecation to `Discourse.User`

---
 .../javascripts/discourse/app/models/user.js  | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index fc98218426..f5435ae63e 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -990,18 +990,20 @@ User.reopenClass(Singleton, {
   }
 });
 
-let warned = false;
-Object.defineProperty(Discourse, "User", {
-  get() {
-    if (!warned) {
-      deprecated("Import the User class instead of using User", {
-        since: "2.4.0",
-        dropFrom: "2.6.0"
-      });
-      warned = true;
+if (typeof Discourse !== "undefined") {
+  let warned = false;
+  Object.defineProperty(Discourse, "User", {
+    get() {
+      if (!warned) {
+        deprecated("Import the User class instead of using User", {
+          since: "2.4.0",
+          dropFrom: "2.6.0"
+        });
+        warned = true;
+      }
+      return User;
     }
-    return User;
-  }
-});
+  });
+}
 
 export default User;

From 286b4e535e1abb0024170a205decba4f9f82d3c4 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 11 May 2020 22:09:44 +0200
Subject: [PATCH 1102/1830] DEV: allows buttons to define aria-label (#9747)

---
 .../discourse/app/components/d-button.js      | 51 ++++++-------
 .../app/lib/register-topic-footer-button.js   | 13 ++++
 .../app/templates/components/d-button.hbs     |  4 +-
 .../components/topic-footer-buttons.hbs       |  1 +
 test/javascripts/components/d-button-test.js  | 72 +++++++++++++++++++
 5 files changed, 114 insertions(+), 27 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/d-button.js b/app/assets/javascripts/discourse/app/components/d-button.js
index 4df816a347..ad4d32a5a2 100644
--- a/app/assets/javascripts/discourse/app/components/d-button.js
+++ b/app/assets/javascripts/discourse/app/components/d-button.js
@@ -5,12 +5,17 @@ import discourseComputed from "discourse-common/utils/decorators";
 import DiscourseURL from "discourse/lib/url";
 
 export default Component.extend({
+  tagName: "button",
   // subclasses need this
   layoutName: "components/d-button",
-
   form: null,
-
   type: "button",
+  title: null,
+  translatedTitle: null,
+  label: null,
+  translatedLabel: null,
+  ariaLabel: null,
+  translatedAriaLabel: null,
 
   isLoading: computed({
     set(key, value) {
@@ -19,7 +24,6 @@ export default Component.extend({
     }
   }),
 
-  tagName: "button",
   classNameBindings: [
     "isLoading:is-loading",
     "btnLink::btn",
@@ -30,8 +34,8 @@ export default Component.extend({
   attributeBindings: [
     "form",
     "isDisabled:disabled",
-    "translatedTitle:title",
-    "translatedLabel:aria-label",
+    "computedTitle:title",
+    "computedAriaLabel:aria-label",
     "tabindex",
     "type"
   ],
@@ -46,7 +50,7 @@ export default Component.extend({
 
   btnLink: equal("display", "link"),
 
-  @discourseComputed("icon", "translatedLabel")
+  @discourseComputed("icon", "computedLabel")
   btnType(icon, translatedLabel) {
     if (icon) {
       return translatedLabel ? "btn-icon-text" : "btn-icon";
@@ -55,28 +59,25 @@ export default Component.extend({
     }
   },
 
-  noText: empty("translatedLabel"),
+  noText: empty("computedLabel"),
 
-  @discourseComputed("title")
-  translatedTitle: {
-    get() {
-      if (this._translatedTitle) return this._translatedTitle;
-      if (this.title) return I18n.t(this.title);
-    },
-    set(value) {
-      return (this._translatedTitle = value);
-    }
+  @discourseComputed("title", "translatedTitle")
+  computedTitle(title, translatedTitle) {
+    if (this.title) return I18n.t(title);
+    return translatedTitle;
   },
 
-  @discourseComputed("label")
-  translatedLabel: {
-    get() {
-      if (this._translatedLabel) return this._translatedLabel;
-      if (this.label) return I18n.t(this.label);
-    },
-    set(value) {
-      return (this._translatedLabel = value);
-    }
+  @discourseComputed("label", "translatedLabel")
+  computedLabel(label, translatedLabel) {
+    if (this.label) return I18n.t(label);
+    return translatedLabel;
+  },
+
+  @discourseComputed("ariaLabel", "translatedAriaLabel", "computedLabel")
+  computedAriaLabel(ariaLabel, translatedAriaLabel, computedLabel) {
+    if (ariaLabel) return I18n.t(ariaLabel);
+    if (translatedAriaLabel) return translatedAriaLabel;
+    return computedLabel;
   },
 
   click() {
diff --git a/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js b/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js
index c2dd9eb96c..ecac09a89a 100644
--- a/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js
+++ b/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js
@@ -28,6 +28,10 @@ export function registerTopicFooterButton(button) {
     label: null,
     translatedLabel: null,
 
+    // local key path for aria label
+    ariaLabel: null,
+    translatedAriaLabel: null,
+
     // is this button disaplyed in the mobile dropdown or as an inline button ?
     dropdown: false,
 
@@ -98,6 +102,15 @@ export function getTopicFooterButtons() {
             ? I18n.t(label)
             : _compute(button, "translatedLabel");
 
+          const ariaLabel = _compute(button, "ariaLabel");
+          if (ariaLabel) {
+            discourseComputedButon.ariaLabel = I18n.t(ariaLabel);
+          } else {
+            const translatedAriaLabel = _compute(button, "translatedAriaLabel");
+            discourseComputedButon.ariaLabel =
+              translatedAriaLabel || discourseComputedButon.label;
+          }
+
           const title = _compute(button, "title");
           discourseComputedButon.title = title
             ? I18n.t(title)
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
index 6c9ed40075..10d12b4d83 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
@@ -10,8 +10,8 @@
   {{/if}}
 {{/if}}
 
-{{#if translatedLabel}}
-  <span class="d-button-label">{{html-safe translatedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
+{{#if computedLabel}}
+  <span class="d-button-label">{{html-safe computedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
 {{/if}}
 
 {{yield}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
index 766ae9bf2b..007ec9c19d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
@@ -29,6 +29,7 @@
       icon=button.icon
       translatedLabel=button.label
       translatedTitle=button.title
+      translatedAriaLabel=button.ariaLabel
       disabled=button.disabled}}
   {{/each}}
 
diff --git a/test/javascripts/components/d-button-test.js b/test/javascripts/components/d-button-test.js
index 5b0bdeb150..1d85d922c4 100644
--- a/test/javascripts/components/d-button-test.js
+++ b/test/javascripts/components/d-button-test.js
@@ -100,3 +100,75 @@ componentTest("disabled button", {
     assert.ok(find("button:not([disabled])").length, "the button is enabled");
   }
 });
+
+componentTest("aria-label", {
+  template:
+    "{{d-button ariaLabel=ariaLabel translatedAriaLabel=translatedAriaLabel}}",
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = { fooAriaLabel: "foo" };
+  },
+
+  test(assert) {
+    this.set("ariaLabel", "test.fooAriaLabel");
+
+    assert.equal(
+      find("button")[0].getAttribute("aria-label"),
+      I18n.t("test.fooAriaLabel")
+    );
+
+    this.setProperties({
+      ariaLabel: null,
+      translatedAriaLabel: "bar"
+    });
+
+    assert.equal(find("button")[0].getAttribute("aria-label"), "bar");
+  }
+});
+
+componentTest("title", {
+  template: "{{d-button title=title translatedTitle=translatedTitle}}",
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = { fooTitle: "foo" };
+  },
+
+  test(assert) {
+    this.set("title", "test.fooTitle");
+    assert.equal(
+      find("button")[0].getAttribute("title"),
+      I18n.t("test.fooTitle")
+    );
+
+    this.setProperties({
+      title: null,
+      translatedTitle: "bar"
+    });
+
+    assert.equal(find("button")[0].getAttribute("title"), "bar");
+  }
+});
+
+componentTest("label", {
+  template: "{{d-button label=label translatedLabel=translatedLabel}}",
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = { fooLabel: "foo" };
+  },
+
+  test(assert) {
+    this.set("label", "test.fooLabel");
+
+    assert.equal(
+      find("button .d-button-label").text(),
+      I18n.t("test.fooLabel")
+    );
+
+    this.setProperties({
+      label: null,
+      translatedLabel: "bar"
+    });
+
+    assert.equal(find("button .d-button-label").text(), "bar");
+  }
+});

From 74db3179741c8836faf5fcffdc23bb4a1b4ab89a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 11 May 2020 16:09:58 -0400
Subject: [PATCH 1103/1830] DEV: Remove deprecation for `Discourse.Category`

---
 .../javascripts/discourse/app/models/category.js      | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/category.js b/app/assets/javascripts/discourse/app/models/category.js
index 7d2b590562..78802cba87 100644
--- a/app/assets/javascripts/discourse/app/models/category.js
+++ b/app/assets/javascripts/discourse/app/models/category.js
@@ -5,7 +5,6 @@ import RestModel from "discourse/models/rest";
 import { on } from "discourse-common/utils/decorators";
 import PermissionType from "discourse/models/permission-type";
 import { NotificationLevels } from "discourse/lib/notification-levels";
-import deprecated from "discourse-common/lib/deprecated";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
 
@@ -513,14 +512,4 @@ Category.reopenClass({
   }
 });
 
-Object.defineProperty(Discourse, "Category", {
-  get() {
-    deprecated(
-      "Import the Category class instead of using Discourse.Category",
-      { since: "2.4.0", dropFrom: "2.5.0" }
-    );
-    return Category;
-  }
-});
-
 export default Category;

From eed7983404fdf7f2f2b48144035739aa158099d7 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 11 May 2020 16:11:33 -0400
Subject: [PATCH 1104/1830] DEV: Remove `Discourse.Route`

---
 .../javascripts/discourse/app/routes/discourse.js     | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/routes/discourse.js b/app/assets/javascripts/discourse/app/routes/discourse.js
index 91be0b4331..6d04c6b04f 100644
--- a/app/assets/javascripts/discourse/app/routes/discourse.js
+++ b/app/assets/javascripts/discourse/app/routes/discourse.js
@@ -2,7 +2,6 @@ import { once } from "@ember/runloop";
 import Composer from "discourse/models/composer";
 import { getOwner } from "discourse-common/lib/get-owner";
 import Route from "@ember/routing/route";
-import deprecated from "discourse-common/lib/deprecated";
 import { seenUser } from "discourse/lib/user-presence";
 
 const DiscourseRoute = Route.extend({
@@ -113,14 +112,4 @@ const DiscourseRoute = Route.extend({
   }
 });
 
-Object.defineProperty(Discourse, "Route", {
-  get() {
-    deprecated("Import the Route class instead of using Discourse.Route", {
-      since: "2.4.0",
-      dropFrom: "2.5.0"
-    });
-    return Route;
-  }
-});
-
 export default DiscourseRoute;

From 22af44ac4944aa72c5a5506b7734551406b14e06 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 11 May 2020 16:13:29 -0400
Subject: [PATCH 1105/1830] DEV: Remove `Discourse.Mobile`

---
 app/assets/javascripts/discourse/app/lib/mobile.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/mobile.js b/app/assets/javascripts/discourse/app/lib/mobile.js
index 96ee5f7099..511e269d83 100644
--- a/app/assets/javascripts/discourse/app/lib/mobile.js
+++ b/app/assets/javascripts/discourse/app/lib/mobile.js
@@ -1,4 +1,3 @@
-import deprecated from "discourse-common/lib/deprecated";
 import ENV from "discourse-common/config/environment";
 
 let mobileForced = false;
@@ -65,13 +64,4 @@ export function resetMobile() {
   mobileForced = false;
 }
 
-Object.defineProperty(Discourse, "Mobile", {
-  get() {
-    deprecated(
-      "`Discourse.Mobile` is deprecated, use `this.site.mobileView` instead"
-    );
-    return Mobile;
-  }
-});
-
 export default Mobile;

From b4d27d327deeab8e42fd67bafe5dd369742e636e Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 11 May 2020 16:50:53 -0400
Subject: [PATCH 1106/1830] Revert "DEV: Remove `Discourse.Route`"

This reverts commit eed7983404fdf7f2f2b48144035739aa158099d7.
---
 .../javascripts/discourse/app/routes/discourse.js     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/routes/discourse.js b/app/assets/javascripts/discourse/app/routes/discourse.js
index 6d04c6b04f..91be0b4331 100644
--- a/app/assets/javascripts/discourse/app/routes/discourse.js
+++ b/app/assets/javascripts/discourse/app/routes/discourse.js
@@ -2,6 +2,7 @@ import { once } from "@ember/runloop";
 import Composer from "discourse/models/composer";
 import { getOwner } from "discourse-common/lib/get-owner";
 import Route from "@ember/routing/route";
+import deprecated from "discourse-common/lib/deprecated";
 import { seenUser } from "discourse/lib/user-presence";
 
 const DiscourseRoute = Route.extend({
@@ -112,4 +113,14 @@ const DiscourseRoute = Route.extend({
   }
 });
 
+Object.defineProperty(Discourse, "Route", {
+  get() {
+    deprecated("Import the Route class instead of using Discourse.Route", {
+      since: "2.4.0",
+      dropFrom: "2.5.0"
+    });
+    return Route;
+  }
+});
+
 export default DiscourseRoute;

From 90b900704b5f9fff3a513b0bf6b897b15c44ce54 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 11 May 2020 16:54:52 -0400
Subject: [PATCH 1107/1830] FIX: Improve mobile footer nav accessibility

---
 .../javascripts/discourse/app/widgets/footer-nav.js  | 12 ++++++++----
 config/locales/client.en.yml                         |  6 ++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/footer-nav.js b/app/assets/javascripts/discourse/app/widgets/footer-nav.js
index 92c90263da..4ff85830a6 100644
--- a/app/assets/javascripts/discourse/app/widgets/footer-nav.js
+++ b/app/assets/javascripts/discourse/app/widgets/footer-nav.js
@@ -12,7 +12,8 @@ createWidget("footer-nav", {
         action: "goBack",
         icon: "chevron-left",
         className: "btn-large",
-        disabled: !attrs.canGoBack
+        disabled: !attrs.canGoBack,
+        title: "footer_nav.back"
       })
     );
 
@@ -21,7 +22,8 @@ createWidget("footer-nav", {
         action: "goForward",
         icon: "chevron-right",
         className: "btn-large",
-        disabled: !attrs.canGoForward
+        disabled: !attrs.canGoForward,
+        title: "footer_nav.forward"
       })
     );
 
@@ -30,7 +32,8 @@ createWidget("footer-nav", {
         this.attach("flat-button", {
           action: "share",
           icon: "link",
-          className: "btn-large"
+          className: "btn-large",
+          title: "footer_nav.share"
         })
       );
 
@@ -38,7 +41,8 @@ createWidget("footer-nav", {
         this.attach("flat-button", {
           action: "dismiss",
           icon: "chevron-down",
-          className: "btn-large"
+          className: "btn-large",
+          title: "footer_nav.dismiss"
         })
       );
     }
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 2d60c1b284..5d49c7492d 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3319,6 +3319,12 @@ en:
 
     forced_anonymous: "Due to extreme load, this is temporarily being shown to everyone as a logged out user would see it."
 
+    footer_nav:
+      back: "Back"
+      forward: "Forward"
+      share: "Share"
+      dismiss: "Dismiss"
+
     safe_mode:
       enabled: "Safe mode is enabled, to exit safe mode close this browser window"
 

From e744b9efec7f0b0aafcc91455bbafd9dd7f5f95a Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Mon, 11 May 2020 14:40:29 -0700
Subject: [PATCH 1108/1830] FIX: add tabindex=-1 on tabLoc post links

This prevents tabbing from confusing screenreaders, as having default tabindex
with aria-hidden confuses screenreaders
---
 app/assets/javascripts/discourse/app/widgets/post.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js
index d2f79335e2..b1a04cc036 100644
--- a/app/assets/javascripts/discourse/app/widgets/post.js
+++ b/app/assets/javascripts/discourse/app/widgets/post.js
@@ -556,7 +556,9 @@ createWidget("post-article", {
 
   html(attrs, state) {
     const rows = [
-      h("a.tabLoc", { attributes: { href: "", "aria-hidden": true } })
+      h("a.tabLoc", {
+        attributes: { href: "", "aria-hidden": true, tabindex: -1 }
+      })
     ];
     if (state.repliesAbove.length) {
       const replies = state.repliesAbove.map(p => {

From 7cdf41d3117486c86385acb58d7fe4f431116df5 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 11 May 2020 18:28:45 -0400
Subject: [PATCH 1109/1830] DEV: Remove reference to Discourse.Category

---
 app/assets/javascripts/select-kit/components/category-drop.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/category-drop.js b/app/assets/javascripts/select-kit/components/category-drop.js
index c80f46bea9..d01b9e40da 100644
--- a/app/assets/javascripts/select-kit/components/category-drop.js
+++ b/app/assets/javascripts/select-kit/components/category-drop.js
@@ -137,7 +137,7 @@ export default ComboBoxComponent.extend({
 
   search(filter) {
     if (filter) {
-      let results = Discourse.Category.search(filter);
+      let results = Category.search(filter);
       results = this._filterUncategorized(results).sort((a, b) => {
         if (a.parent_category_id && !b.parent_category_id) {
           return 1;

From 4c8bece104867ae21eab61646afa2504d75e9707 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Tue, 12 May 2020 09:13:20 +1000
Subject: [PATCH 1110/1830] FEATURE: default canonical URL (#9738)

For pages that do not specify canonical URL we will default to `https://SITENAME/PATH`.

This ensures that if a URL is crawled on the CDN the search ranking will transfer to the main site.

Additionally we whitelist the `?page` param
---
 lib/canonical_url.rb                         | 13 +++++++++++--
 spec/requests/application_controller_spec.rb | 14 ++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/lib/canonical_url.rb b/lib/canonical_url.rb
index b46f006f1c..d318bd56de 100644
--- a/lib/canonical_url.rb
+++ b/lib/canonical_url.rb
@@ -13,9 +13,18 @@ module CanonicalURL
   end
 
   module Helpers
+    ALLOWED_CANONICAL_PARAMS = %w(page)
     def canonical_link_tag(url = nil)
-      return '' unless url || @canonical_url
-      tag('link', rel: 'canonical', href: url || @canonical_url || request.url)
+      tag('link', rel: 'canonical', href: url || @canonical_url || default_canonical)
+    end
+
+    def default_canonical
+      canonical = +"#{Discourse.base_url_no_prefix}#{request.path}"
+      allowed_params = params.select { |key| ALLOWED_CANONICAL_PARAMS.include?(key) }
+      if allowed_params.present?
+        canonical << "?#{allowed_params.keys.zip(allowed_params.values).map { |key, value| "#{key}=#{value}" }.join("&")}"
+      end
+      canonical
     end
   end
 end
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index 4a96174610..8e4dc439d8 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -605,4 +605,18 @@ RSpec.describe ApplicationController do
     expect(response.status).to eq(200)
     expect(response.body).to include('Discourse')
   end
+
+  it 'has canonical tag' do
+    get '/', headers: { HTTP_ACCEPT: '*/*' }
+    expect(response.body).to have_tag("link", with: { rel: "canonical", href: "http://test.localhost/" })
+    get '/?query_param=true', headers: { HTTP_ACCEPT: '*/*' }
+    expect(response.body).to have_tag("link", with: { rel: "canonical", href: "http://test.localhost/" })
+    get '/latest?page=2&additional_param=true', headers: { HTTP_ACCEPT: '*/*' }
+    expect(response.body).to have_tag("link", with: { rel: "canonical", href: "http://test.localhost/latest?page=2" })
+    get '/404', headers: { HTTP_ACCEPT: '*/*' }
+    expect(response.body).to have_tag("link", with: { rel: "canonical", href: "http://test.localhost/404" })
+    topic = create_post.topic
+    get "/t/#{topic.slug}/#{topic.id}"
+    expect(response.body).to have_tag("link", with: { rel: "canonical", href: "http://test.localhost/t/#{topic.slug}/#{topic.id}" })
+  end
 end

From aa2a9da4b2e0f6b98963144888bb0a6ed9b71063 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 12 May 2020 09:51:59 +1000
Subject: [PATCH 1111/1830] PERF: reduce exclusive locking when changing tables

posts and topics tables can be huge, this migration change
ensures the migration performs less work in one giant transaction
reducing risk of deadlocks

Migration is re-runnable thanks to NOT EXISTS checks
---
 ...9095034_add_topic_thumbnail_information.rb | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/db/migrate/20200429095034_add_topic_thumbnail_information.rb b/db/migrate/20200429095034_add_topic_thumbnail_information.rb
index be34f93c32..ee48265c6d 100644
--- a/db/migrate/20200429095034_add_topic_thumbnail_information.rb
+++ b/db/migrate/20200429095034_add_topic_thumbnail_information.rb
@@ -1,19 +1,36 @@
 # frozen_string_literal: true
 
 class AddTopicThumbnailInformation < ActiveRecord::Migration[6.0]
-  def change
-    add_reference :posts, :image_upload
-    add_reference :topics, :image_upload
+  disable_ddl_transaction!
 
-    add_column :theme_modifier_sets, :topic_thumbnail_sizes, :string, array: true
+  def up
 
-    create_table :topic_thumbnails do |t|
-      t.references :upload, null: false
-      t.references :optimized_image, null: true
-      t.integer :max_width, null: false
-      t.integer :max_height, null: false
+    # tables are huge ... avoid holding on to large number of locks by doing one at a time
+    execute <<~SQL
+      ALTER TABLE posts
+      ADD COLUMN IF NOT EXISTS image_upload_id bigint
+    SQL
+
+    execute <<~SQL
+      ALTER TABLE topics
+      ADD COLUMN IF NOT EXISTS image_upload_id bigint
+    SQL
+
+    ActiveRecord::Base.transaction do
+      add_column :theme_modifier_sets, :topic_thumbnail_sizes, :string, array: true
+
+      create_table :topic_thumbnails do |t|
+        t.references :upload, null: false
+        t.references :optimized_image, null: true
+        t.integer :max_width, null: false
+        t.integer :max_height, null: false
+      end
+
+      add_index :topic_thumbnails, [:upload_id, :max_width, :max_height], name: :unique_topic_thumbnails, unique: true
     end
+  end
 
-    add_index :topic_thumbnails, [:upload_id, :max_width, :max_height], name: :unique_topic_thumbnails, unique: true
+  def down
+    raise IrriversibleMigration
   end
 end

From f4a53bd8f0007a578bb6507b07c92527e1ead995 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 12 May 2020 09:57:31 +1000
Subject: [PATCH 1112/1830] DEV: create missing indexes

These indexes should have been created in aa2a9da4
---
 .../20200429095034_add_topic_thumbnail_information.rb  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/db/migrate/20200429095034_add_topic_thumbnail_information.rb b/db/migrate/20200429095034_add_topic_thumbnail_information.rb
index ee48265c6d..2902d7730d 100644
--- a/db/migrate/20200429095034_add_topic_thumbnail_information.rb
+++ b/db/migrate/20200429095034_add_topic_thumbnail_information.rb
@@ -16,6 +16,16 @@ class AddTopicThumbnailInformation < ActiveRecord::Migration[6.0]
       ADD COLUMN IF NOT EXISTS image_upload_id bigint
     SQL
 
+    execute <<~SQL
+      CREATE INDEX CONCURRENTLY IF NOT EXISTS
+      index_posts_on_image_upload_id ON posts USING btree (image_upload_id);
+    SQL
+
+    execute <<~SQL
+      CREATE INDEX CONCURRENTLY IF NOT EXISTS
+      index_topics_on_image_upload_id ON public.topics USING btree (image_upload_id);
+    SQL
+
     ActiveRecord::Base.transaction do
       add_column :theme_modifier_sets, :topic_thumbnail_sizes, :string, array: true
 

From dfe55d2344a689807da49d26c5c0a2993cb694a8 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 12 May 2020 10:09:02 +1000
Subject: [PATCH 1113/1830] DEV: remove prefix

.public was a cut-and-paste fail, removing
---
 db/migrate/20200429095034_add_topic_thumbnail_information.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/migrate/20200429095034_add_topic_thumbnail_information.rb b/db/migrate/20200429095034_add_topic_thumbnail_information.rb
index 2902d7730d..6275f29fef 100644
--- a/db/migrate/20200429095034_add_topic_thumbnail_information.rb
+++ b/db/migrate/20200429095034_add_topic_thumbnail_information.rb
@@ -18,12 +18,12 @@ class AddTopicThumbnailInformation < ActiveRecord::Migration[6.0]
 
     execute <<~SQL
       CREATE INDEX CONCURRENTLY IF NOT EXISTS
-      index_posts_on_image_upload_id ON posts USING btree (image_upload_id);
+      index_posts_on_image_upload_id ON posts USING btree (image_upload_id)
     SQL
 
     execute <<~SQL
       CREATE INDEX CONCURRENTLY IF NOT EXISTS
-      index_topics_on_image_upload_id ON public.topics USING btree (image_upload_id);
+      index_topics_on_image_upload_id ON topics USING btree (image_upload_id)
     SQL
 
     ActiveRecord::Base.transaction do

From 6f228b0312738b328e66eb0a458060e28419306c Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Mon, 11 May 2020 17:55:44 -0700
Subject: [PATCH 1114/1830] FIX: Remove unnecessary forward slashes in regex

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

diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js
index 439b521e38..2c108e0f77 100644
--- a/app/assets/javascripts/discourse/app/lib/utilities.js
+++ b/app/assets/javascripts/discourse/app/lib/utilities.js
@@ -352,7 +352,7 @@ export function toAsciiPrintable(string, fallback) {
     string = string.normalize("NFD").replace(/[\u0300-\u036f]/g, "");
   }
 
-  return /^[/\040-\176/]*$/.test(string) ? string : fallback;
+  return /^[\040-\176]*$/.test(string) ? string : fallback;
 }
 
 export function slugify(string) {

From a009ec597da2a72561cc396aca40d0e77481b751 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 11 May 2020 21:12:33 -0400
Subject: [PATCH 1115/1830] remove ember container div

---
 .../discourse/app/templates/components/reviewable-user.hbs     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs
index be61c74e81..f7476919c2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs
@@ -37,7 +37,8 @@
     {{#each userFields as |f|}}
       {{reviewable-field classes="reviewable-user-details user-field"
                          name=f.name
-                         value=f.value}}
+                         value=f.value
+                         tagName=""}}
     {{/each}}
   </div>
 

From 3c423faafda25b99da697b170f18f3d119000770 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 12 May 2020 11:13:18 +0800
Subject: [PATCH 1116/1830] DEV: Avoid repeating draft key logic in multiple
 places.

---
 lib/post_creator.rb                  | 2 +-
 spec/components/post_creator_spec.rb | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 6f91e35b5d..40856682ab 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -303,7 +303,7 @@ class PostCreator
 
   def draft_key
     @draft_key ||= @opts[:draft_key]
-    @draft_key ||= @topic ? "topic_#{@topic.id}" : "new_topic"
+    @draft_key ||= @topic ? @topic.draft_key : Draft::NEW_TOPIC
   end
 
   def build_post_stats
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index 0b3999a322..7882e11c4b 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -301,9 +301,8 @@ describe PostCreator do
       end
 
       it 'creates post stats' do
-
-        Draft.set(user, 'new_topic', 0, "test")
-        Draft.set(user, 'new_topic', 0, "test1")
+        Draft.set(user, Draft::NEW_TOPIC, 0, "test")
+        Draft.set(user, Draft::NEW_TOPIC, 0, "test1")
 
         begin
           PostCreator.track_post_stats = true

From 39a2d90e0f21cb1f43da95153c8f64b91bff9a77 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 12 May 2020 14:09:38 +1000
Subject: [PATCH 1117/1830] DEV: Pass currentUser to post-menu button builders
 (#9752)

Adding this from a review; I was using Discourse.currentUser which is frowned upon now.

Passing currentUser both for regular post menu buttons and extra buttons attached via the plugin API.

Lots of formatting/whitespace changes, best off reviewing with ?w=1
---
 .../discourse/app/widgets/post-menu.js        | 89 ++++++++++---------
 1 file changed, 49 insertions(+), 40 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
index 00c859717c..4b82dcb336 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@@ -51,10 +51,10 @@ function registerButton(name, builder) {
 }
 
 export function buildButton(name, widget) {
-  let { attrs, state, siteSettings, settings } = widget;
+  let { attrs, state, siteSettings, settings, currentUser } = widget;
   let builder = _builders[name];
   if (builder) {
-    let button = builder(attrs, state, siteSettings, settings);
+    let button = builder(attrs, state, siteSettings, settings, currentUser);
     if (button && !button.id) {
       button.id = name;
     }
@@ -287,46 +287,49 @@ registerButton("reply", (attrs, state, siteSettings, postMenuSettings) => {
   return args;
 });
 
-registerButton("bookmark", attrs => {
-  if (!attrs.canBookmark) {
-    return;
-  }
-
-  let classNames = ["bookmark", "with-reminder"];
-  let title = "bookmarks.not_bookmarked";
-  let titleOptions = { name: "" };
-
-  if (attrs.bookmarked) {
-    classNames.push("bookmarked");
-
-    if (attrs.bookmarkReminderAt) {
-      let formattedReminder = formattedReminderTime(
-        attrs.bookmarkReminderAt,
-        Discourse.currentUser.resolvedTimezone(Discourse.currentUser)
-      );
-      title = "bookmarks.created_with_reminder";
-      titleOptions.date = formattedReminder;
-    } else {
-      title = "bookmarks.created";
+registerButton(
+  "bookmark",
+  (attrs, _state, _siteSettings, _settings, currentUser) => {
+    if (!attrs.canBookmark) {
+      return;
     }
 
-    if (attrs.bookmarkName) {
-      titleOptions.name = `. ${attrs.bookmarkName}`;
-    }
-  }
+    let classNames = ["bookmark", "with-reminder"];
+    let title = "bookmarks.not_bookmarked";
+    let titleOptions = { name: "" };
 
-  return {
-    id: attrs.bookmarked ? "unbookmark" : "bookmark",
-    action: "toggleBookmark",
-    title,
-    titleOptions,
-    className: classNames.join(" "),
-    icon:
-      attrs.bookmarkReminderAt || attrs.bookmarkReminderType === "at_desktop"
-        ? "discourse-bookmark-clock"
-        : "bookmark"
-  };
-});
+    if (attrs.bookmarked) {
+      classNames.push("bookmarked");
+
+      if (attrs.bookmarkReminderAt) {
+        let formattedReminder = formattedReminderTime(
+          attrs.bookmarkReminderAt,
+          currentUser.resolvedTimezone(currentUser)
+        );
+        title = "bookmarks.created_with_reminder";
+        titleOptions.date = formattedReminder;
+      } else {
+        title = "bookmarks.created";
+      }
+
+      if (attrs.bookmarkName) {
+        titleOptions.name = `. ${attrs.bookmarkName}`;
+      }
+    }
+
+    return {
+      id: attrs.bookmarked ? "unbookmark" : "bookmark",
+      action: "toggleBookmark",
+      title,
+      titleOptions,
+      className: classNames.join(" "),
+      icon:
+        attrs.bookmarkReminderAt || attrs.bookmarkReminderType === "at_desktop"
+          ? "discourse-bookmark-clock"
+          : "bookmark"
+    };
+  }
+);
 
 registerButton("admin", attrs => {
   if (!attrs.canManage && !attrs.canWiki) {
@@ -497,7 +500,13 @@ export default createWidget("post-menu", {
 
     Object.values(_extraButtons).forEach(builder => {
       if (builder) {
-        const buttonAtts = builder(attrs, this.state, this.siteSettings);
+        const buttonAtts = builder(
+          attrs,
+          this.state,
+          this.siteSettings,
+          this.settings,
+          this.currentUser
+        );
         if (buttonAtts) {
           const { position, beforeButton, afterButton } = buttonAtts;
           delete buttonAtts.position;

From d301af39bd3d0808fa3c0c40740539237058bee7 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 12 May 2020 13:56:24 +0800
Subject: [PATCH 1118/1830] PERF: Avoid hitting DB when fetching draft sequence
 of bot user.

---
 app/models/draft_sequence.rb       |  2 ++
 spec/models/draft_sequence_spec.rb | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/models/draft_sequence.rb b/app/models/draft_sequence.rb
index eeb5520fcc..d77a6d416e 100644
--- a/app/models/draft_sequence.rb
+++ b/app/models/draft_sequence.rb
@@ -23,6 +23,8 @@ class DraftSequence < ActiveRecord::Base
     user_id = user
     user_id = user.id unless user.is_a?(Integer)
 
+    return nil if user_id < 0
+
     # perf critical path
     r, _ = DB.query_single('select sequence from draft_sequences where user_id = ? and draft_key = ?', user_id, key)
     r.to_i
diff --git a/spec/models/draft_sequence_spec.rb b/spec/models/draft_sequence_spec.rb
index 5147f46a7c..282b129f15 100644
--- a/spec/models/draft_sequence_spec.rb
+++ b/spec/models/draft_sequence_spec.rb
@@ -5,9 +5,16 @@ require 'rails_helper'
 describe DraftSequence do
   fab!(:user) { Fabricate(:user) }
 
-  it 'should produce next sequence for a key' do
-    expect(DraftSequence.next!(user, 'test')).to eq 1
-    expect(DraftSequence.next!(user, 'test')).to eq 2
+  describe '.next' do
+    it 'should produce next sequence for a key' do
+      expect(DraftSequence.next!(user, 'test')).to eq 1
+      expect(DraftSequence.next!(user, 'test')).to eq 2
+    end
+
+    it 'should not produce next sequence for non-human user' do
+      user.id = -99999
+      2.times { expect(DraftSequence.next!(user, 'test')).to eq(0) }
+    end
   end
 
   describe '.current' do
@@ -15,6 +22,11 @@ describe DraftSequence do
       expect(DraftSequence.current(user, 'test')).to eq 0
     end
 
+    it 'should return nil for non-human user' do
+      user.id = -99999
+      expect(DraftSequence.current(user, 'test')).to eq(nil)
+    end
+
     it 'should return the right sequence' do
       expect(DraftSequence.next!(user, 'test')).to eq(1)
       expect(DraftSequence.current(user, 'test')).to eq(1)

From 8fb99f218d950e1ecae9116de27afa9474741257 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 12 May 2020 14:25:20 +0800
Subject: [PATCH 1119/1830] FEATURE: Allow plugins to register a callback to
 ignore DraftSequence.

---
 app/models/draft_sequence.rb | 14 ++++++++++++--
 lib/plugin/instance.rb       |  9 +++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/models/draft_sequence.rb b/app/models/draft_sequence.rb
index d77a6d416e..ecdfff4c39 100644
--- a/app/models/draft_sequence.rb
+++ b/app/models/draft_sequence.rb
@@ -5,7 +5,7 @@ class DraftSequence < ActiveRecord::Base
     user_id = user
     user_id = user.id unless user.is_a?(Integer)
 
-    return 0 if user_id < 0
+    return 0 if invalid_user_id?(user_id)
 
     h = { user_id: user_id, draft_key: key }
     c = DraftSequence.find_by(h)
@@ -23,12 +23,22 @@ class DraftSequence < ActiveRecord::Base
     user_id = user
     user_id = user.id unless user.is_a?(Integer)
 
-    return nil if user_id < 0
+    return nil if invalid_user_id?(user_id)
 
     # perf critical path
     r, _ = DB.query_single('select sequence from draft_sequences where user_id = ? and draft_key = ?', user_id, key)
     r.to_i
   end
+
+  cattr_accessor :plugin_ignore_draft_sequence_callbacks
+  self.plugin_ignore_draft_sequence_callbacks = {}
+
+  def self.invalid_user_id?(user_id)
+    user_id < 0 || self.plugin_ignore_draft_sequence_callbacks.any? do |plugin, callback|
+      plugin.enabled? ? callback.call(user_id) : false
+    end
+  end
+  private_class_method :invalid_user_id?
 end
 
 # == Schema Information
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index d8bc0b49a4..c1904b6c75 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -409,6 +409,15 @@ class Plugin::Instance
     SeedFu.fixture_paths.concat(paths)
   end
 
+  # Applies to all sites in a multisite environment. Block is not called if
+  # plugin is not enabled. Block is called with `user_id` and has to return a
+  # boolean based on whether the given `user_id` should be ignored.
+  def register_ignore_draft_sequence_callback(&block)
+    reloadable_patch do |plugin|
+      ::DraftSequence.plugin_ignore_draft_sequence_callbacks[plugin] = block
+    end
+  end
+
   def listen_for(event_name)
     return unless self.respond_to?(event_name)
     DiscourseEvent.on(event_name, &self.method(event_name))

From 4ea7a7cf6742fc83d5220ed28f14a65059577164 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 11 May 2020 22:13:22 +0000
Subject: [PATCH 1120/1830] Build(deps): Bump rubocop from 0.82.0 to 0.83.0

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.82.0 to 0.83.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.82.0...v0.83.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d06f55ab45..1153a7884d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -151,7 +151,6 @@ GEM
       concurrent-ruby (~> 1.0)
     image_size (1.5.0)
     in_threads (1.5.4)
-    jaro_winkler (1.5.4)
     jmespath (1.4.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
@@ -342,8 +341,7 @@ GEM
       json-schema (~> 2.2)
       railties (>= 3.1, < 7.0)
     rtlit (0.0.5)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.83.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)

From 451e9c4bb91fb3bf9b2144da15d811b59fcf6bc0 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 12 May 2020 16:08:34 +1000
Subject: [PATCH 1121/1830] DEV: minor SQL formatting change

Moved join prior to left join to make query less confusing.

Has no material impact on performance.
---
 app/jobs/scheduled/reindex_search.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/jobs/scheduled/reindex_search.rb b/app/jobs/scheduled/reindex_search.rb
index c0eee8f5db..50d3e540f7 100644
--- a/app/jobs/scheduled/reindex_search.rb
+++ b/app/jobs/scheduled/reindex_search.rb
@@ -113,11 +113,11 @@ module Jobs
         SELECT
           posts.id
         FROM posts
+        JOIN topics ON topics.id = posts.topic_id
         LEFT JOIN post_search_data pd
           ON pd.locale = :locale
           AND pd.version = :version
           AND pd.post_id = posts.id
-        INNER JOIN topics ON topics.id = posts.topic_id
         WHERE pd.post_id IS NULL
         AND posts.deleted_at IS NULL
         AND topics.deleted_at IS NULL

From a29ae17d3a57c6cd92716b53bbab5b9a229f77e7 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 12 May 2020 16:55:24 +1000
Subject: [PATCH 1122/1830] FIX: saving drafts unconditionally increases
 sequence

Previously we only changed sequence on ownership change, this
cause a race condition between tabs where user could type for a
long time without being warned of an out of date draft.

This change is a radical change and we should watch closely.

Code was already in place to track sequence on the client so no
changes are needed there.
---
 app/models/draft.rb                           | 22 +++++++++----------
 app/models/draft_sequence.rb                  |  2 +-
 ...2064023_change_draft_sequence_to_bigint.rb |  8 +++++++
 spec/models/draft_spec.rb                     | 21 ++++++++++++------
 spec/requests/draft_controller_spec.rb        |  8 +++----
 5 files changed, 38 insertions(+), 23 deletions(-)
 create mode 100644 db/migrate/20200512064023_change_draft_sequence_to_bigint.rb

diff --git a/app/models/draft.rb b/app/models/draft.rb
index 9d4c08e56f..a2fba62fe5 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -43,17 +43,17 @@ class Draft < ActiveRecord::Base
         raise Draft::OutOfSequence
       end
 
-      if owner && current_owner && current_owner != owner
-        sequence += 1
+      sequence += 1
 
-        DraftSequence.upsert({
-            sequence: sequence,
-            draft_key: key,
-            user_id: user.id,
-          },
-          unique_by: [:user_id, :draft_key]
-        )
-      end
+      # we need to keep upping our sequence on every save
+      # if we do not do that there are bad race conditions
+      DraftSequence.upsert({
+          sequence: sequence,
+          draft_key: key,
+          user_id: user.id,
+        },
+        unique_by: [:user_id, :draft_key]
+      )
 
       DB.exec(<<~SQL, id: draft_id, sequence: sequence, data: data, owner: owner || current_owner)
         UPDATE drafts
@@ -337,7 +337,7 @@ end
 #  data       :text             not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
-#  sequence   :integer          default(0), not null
+#  sequence   :bigint           default(0), not null
 #  revisions  :integer          default(1), not null
 #  owner      :string
 #
diff --git a/app/models/draft_sequence.rb b/app/models/draft_sequence.rb
index ecdfff4c39..411d77492f 100644
--- a/app/models/draft_sequence.rb
+++ b/app/models/draft_sequence.rb
@@ -48,7 +48,7 @@ end
 #  id        :integer          not null, primary key
 #  user_id   :integer          not null
 #  draft_key :string           not null
-#  sequence  :integer          not null
+#  sequence  :bigint           not null
 #
 # Indexes
 #
diff --git a/db/migrate/20200512064023_change_draft_sequence_to_bigint.rb b/db/migrate/20200512064023_change_draft_sequence_to_bigint.rb
new file mode 100644
index 0000000000..97d511ee15
--- /dev/null
+++ b/db/migrate/20200512064023_change_draft_sequence_to_bigint.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class ChangeDraftSequenceToBigint < ActiveRecord::Migration[6.0]
+  def change
+    change_column :drafts, :sequence, :bigint, default: 0, null: false
+    change_column :draft_sequences, :sequence, :bigint, null: false
+  end
+end
diff --git a/spec/models/draft_spec.rb b/spec/models/draft_spec.rb
index 823ab5fab9..b2066b048d 100644
--- a/spec/models/draft_spec.rb
+++ b/spec/models/draft_spec.rb
@@ -21,13 +21,13 @@ describe Draft do
         random_key: "random"
       }
 
-      Draft.set(user, "xyz", 0, draft.to_json)
+      seq = Draft.set(user, "xyz", 0, draft.to_json)
       draft["reply"] = "test" * 100
 
       half_grace = (SiteSetting.editing_grace_period / 2 + 1).seconds
 
       freeze_time half_grace.from_now
-      Draft.set(user, "xyz", 0, draft.to_json)
+      seq = Draft.set(user, "xyz", seq, draft.to_json)
 
       draft_post = BackupDraftPost.find_by(user_id: user.id, key: "xyz").post
 
@@ -37,7 +37,7 @@ describe Draft do
 
       # this should trigger a post revision as 10 minutes have passed
       draft["reply"] = "hello"
-      Draft.set(user, "xyz", 0, draft.to_json)
+      Draft.set(user, "xyz", seq, draft.to_json)
 
       draft_topic = BackupDraftTopic.find_by(user_id: user.id)
       expect(draft_topic.topic.posts_count).to eq(2)
@@ -58,9 +58,16 @@ describe Draft do
   end
 
   it "should overwrite draft data correctly" do
-    Draft.set(user, "test", 0, "data")
-    Draft.set(user, "test", 0, "new data")
-    expect(Draft.get(user, "test", 0)).to eq "new data"
+    seq = Draft.set(user, "test", 0, "data")
+    seq = Draft.set(user, "test", seq, "new data")
+    expect(Draft.get(user, "test", seq)).to eq "new data"
+  end
+
+  it "should increase the sequence on every save" do
+    seq = Draft.set(user, "test", 0, "data")
+    expect(seq).to eq(0)
+    seq = Draft.set(user, "test", 0, "data")
+    expect(seq).to eq(1)
   end
 
   it "should clear drafts on request" do
@@ -227,7 +234,7 @@ describe Draft do
       expect(draft_seq).to eq(1)
 
       draft_seq = Draft.set(user, 'new_topic', 1, 'hello world', _owner = 'HIJKL')
-      expect(draft_seq).to eq(1)
+      expect(draft_seq).to eq(2)
     end
 
     it 'can correctly preload drafts' do
diff --git a/spec/requests/draft_controller_spec.rb b/spec/requests/draft_controller_spec.rb
index f0596ce20e..f828e6d89d 100644
--- a/spec/requests/draft_controller_spec.rb
+++ b/spec/requests/draft_controller_spec.rb
@@ -22,7 +22,7 @@ describe DraftController do
   end
 
   it "returns 404 when the key is missing" do
-    user = sign_in(Fabricate(:user))
+    _user = sign_in(Fabricate(:user))
     post "/draft.json", params: { data: { my: "data" }.to_json, sequence: 0 }
     expect(response.status).to eq(404)
   end
@@ -135,18 +135,18 @@ describe DraftController do
 
     expect(response.status).to eq(200)
     json = response.parsed_body
-    expect(json["draft_sequence"]).to eq(1)
+    expect(json["draft_sequence"]).to eq(2)
 
     post "/draft.json", params: {
       draft_key: "abc",
-      sequence: 1,
+      sequence: 2,
       data: { c: "test" }.to_json,
       owner: "abc"
     }
 
     expect(response.status).to eq(200)
     json = response.parsed_body
-    expect(json["draft_sequence"]).to eq(2)
+    expect(json["draft_sequence"]).to eq(3)
   end
 
   it 'raises an error for out-of-sequence draft setting' do

From 16137308b011146be29f88c3856b154d55d04abf Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Tue, 12 May 2020 11:18:19 +0300
Subject: [PATCH 1123/1830] FIX: Show Settings button if plugin has settings
 (#9728)

It used to check if the plugin has an enabled_setting.
---
 app/assets/javascripts/admin/templates/plugins-index.hbs | 2 +-
 app/serializers/admin_plugin_serializer.rb               | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index b89b6e6f01..072f7d2141 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -47,7 +47,7 @@
           </td>
           <td class="settings">
             {{#if currentUser.admin}}
-              {{#if plugin.enabled_setting}}
+              {{#if plugin.has_settings}}
                 {{d-button class="btn-default" action=(route-action "showSettings") actionParam=plugin icon="cog" label="admin.plugins.change_settings_short"}}
               {{/if}}
             {{/if}}
diff --git a/app/serializers/admin_plugin_serializer.rb b/app/serializers/admin_plugin_serializer.rb
index 843ca58408..809773c854 100644
--- a/app/serializers/admin_plugin_serializer.rb
+++ b/app/serializers/admin_plugin_serializer.rb
@@ -8,6 +8,7 @@ class AdminPluginSerializer < ApplicationSerializer
              :admin_route,
              :enabled,
              :enabled_setting,
+             :has_settings,
              :is_official
 
   def id
@@ -38,6 +39,10 @@ class AdminPluginSerializer < ApplicationSerializer
     object.enabled_site_setting
   end
 
+  def has_settings
+    SiteSetting.plugins.values.include?(id)
+  end
+
   def include_url?
     url.present?
   end

From 6230f5c5543a294b701290e913d8db9cf777970f Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 12 May 2020 13:35:36 +0100
Subject: [PATCH 1124/1830] FEATURE: Allow parameter authentication for
 UserApiKeys (#9742)

This refactors default_current_user_provider in a few ways:
- Introduce a generic `api_parameter_allowed?` method which checks for whitelisted routes/formats
- Only read the api_key parameter on allowed routes. It is now completely ignored on other routes (previously it would raise a 403)
- Start reading user_api_key parameter on allowed routes
- Refactor tests as end-end integration tests

A plugin API for PARAMETER_API_PATTERNS will be added soon
---
 lib/auth/default_current_user_provider.rb     |  67 ++++--
 .../default_current_user_provider_spec.rb     | 226 +-----------------
 spec/integration/api_keys_spec.rb             |  89 +++++++
 spec/integration/user_api_keys_spec.rb        |  18 --
 spec/requests/topics_controller_spec.rb       |   4 +-
 5 files changed, 144 insertions(+), 260 deletions(-)
 create mode 100644 spec/integration/api_keys_spec.rb
 delete mode 100644 spec/integration/user_api_keys_spec.rb

diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index 81217248a5..ad94861cf7 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -9,6 +9,7 @@ class Auth::DefaultCurrentUserProvider
   HEADER_API_USERNAME ||= "HTTP_API_USERNAME"
   HEADER_API_USER_EXTERNAL_ID ||= "HTTP_API_USER_EXTERNAL_ID"
   HEADER_API_USER_ID ||= "HTTP_API_USER_ID"
+  PARAMETER_USER_API_KEY ||= "user_api_key"
   USER_API_KEY ||= "HTTP_USER_API_KEY"
   USER_API_CLIENT_ID ||= "HTTP_USER_API_CLIENT_ID"
   API_KEY_ENV ||= "_DISCOURSE_API"
@@ -18,6 +19,35 @@ class Auth::DefaultCurrentUserProvider
   COOKIE_ATTEMPTS_PER_MIN ||= 10
   BAD_TOKEN ||= "_DISCOURSE_BAD_TOKEN"
 
+  PARAMETER_API_PATTERNS = [
+    {
+      method: :get,
+      route: [
+        "posts#latest",
+        "posts#user_topics_feed",
+        "posts#user_posts_feed",
+        "groups#posts_feed",
+        "groups#mentions_feed",
+        "list#category_feed",
+        "list#latest_feed",
+        "list#new_feed",
+        "list#unread_feed",
+        "topics#feed"
+      ],
+      format: :rss
+    },
+    {
+      method: :get,
+      route: "users#bookmarks",
+      format: :ics
+    },
+    {
+      method: :post,
+      route: "admin/email#handle_mail",
+      format: "*"
+    }
+  ]
+
   # do all current user initialization here
   def initialize(env)
     @env = env
@@ -42,7 +72,15 @@ class Auth::DefaultCurrentUserProvider
     request = @request
 
     user_api_key = @env[USER_API_KEY]
-    api_key = @env.blank? ? nil : @env[HEADER_API_KEY] || request[API_KEY]
+    api_key = @env[HEADER_API_KEY]
+
+    if !@env.blank? && request[PARAMETER_USER_API_KEY] && api_parameter_allowed?
+      user_api_key ||= request[PARAMETER_USER_API_KEY]
+    end
+
+    if !@env.blank? && request[API_KEY] && api_parameter_allowed?
+      api_key ||= request[API_KEY]
+    end
 
     auth_token = request.cookies[TOKEN_COOKIE] unless user_api_key || api_key
 
@@ -283,10 +321,6 @@ class Auth::DefaultCurrentUserProvider
     if api_key = ApiKey.active.with_key(api_key_value).includes(:user).first
       api_username = header_api_key? ? @env[HEADER_API_USERNAME] : request[API_USERNAME]
 
-      if !header_api_key?
-        raise Discourse::InvalidAccess unless is_whitelisted_query_param_auth_route?(request)
-      end
-
       if api_key.allowed_ips.present? && !api_key.allowed_ips.any? { |ip| ip.include?(request.ip) }
         Rails.logger.warn("[Unauthorized API Access] username: #{api_username}, IP address: #{request.ip}")
         return nil
@@ -313,18 +347,21 @@ class Auth::DefaultCurrentUserProvider
 
   private
 
-  def is_whitelisted_query_param_auth_route?(request)
-    (is_user_feed?(request) || is_handle_mail?(request))
-  end
+  # By default we only allow headers for sending API credentials
+  # However, in some scenarios it is essential to send them via url parameters
+  # so we need to add some exceptions
+  def api_parameter_allowed?
+    request_method = @env["REQUEST_METHOD"]&.downcase&.to_sym
+    request_format = @env['action_dispatch.request.formats']&.first&.symbol
 
-  def is_user_feed?(request)
-    return true if request.path.match?(/\/(c|t){1}\/\S*.(rss|json)/) && request.get? # topic or category route
-    return true if request.path.match?(/\/(latest|top|categories).(rss|json)/) && request.get? # specific routes with rss
-    return true if request.path.match?(/\/u\/\S*\/bookmarks.(ics|json)/) && request.get? # specific routes with ics
-  end
+    path_params = @env['action_dispatch.request.path_parameters']
+    request_route = "#{path_params[:controller]}##{path_params[:action]}" if path_params
 
-  def is_handle_mail?(request)
-    return true if request.path == "/admin/email/handle_mail" && request.post?
+    PARAMETER_API_PATTERNS.any? do |p|
+      (p[:method] == "*" || Array(p[:method]).include?(request_method)) &&
+      (p[:format] == "*" || Array(p[:format]).include?(request_format)) &&
+      (p[:route] == "*" || Array(p[:route]).include?(request_route))
+    end
   end
 
   def header_api_key?
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index 141382da8c..1b698cbf36 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -22,50 +22,7 @@ describe Auth::DefaultCurrentUserProvider do
     expect(provider.current_user).to eq(nil)
   end
 
-  context "server api" do
-
-    it "raises errors for incorrect api_key" do
-      expect {
-        provider("/?api_key=INCORRECT").current_user
-      }.to raise_error(Discourse::InvalidAccess, /API username or key is invalid/)
-    end
-
-    it "finds a user for a correct per-user api key" do
-      user = Fabricate(:user)
-      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
-      params = { "HTTP_API_KEY" => api_key.key }
-      good_provider = provider("/", params)
-      expect(good_provider.current_user.id).to eq(user.id)
-      expect(good_provider.is_api?).to eq(true)
-      expect(good_provider.is_user_api?).to eq(false)
-      expect(good_provider.should_update_last_seen?).to eq(false)
-
-      user.update_columns(active: false)
-
-      expect {
-        provider("/?api_key=#{api_key.key}").current_user
-      }.to raise_error(Discourse::InvalidAccess)
-
-      user.update_columns(active: true, suspended_till: 1.day.from_now)
-
-      expect {
-        provider("/?api_key=#{api_key.key}").current_user
-      }.to raise_error(Discourse::InvalidAccess)
-    end
-
-    it "raises for a user pretending" do
-      user = Fabricate(:user)
-      user2 = Fabricate(:user)
-      key = ApiKey.create!(user_id: user.id, created_by_id: -1)
-
-      expect {
-        provider("/?api_key=#{key.key}&api_username=#{user2.username.downcase}").current_user
-      }.to raise_error(Discourse::InvalidAccess)
-
-      key.reload
-      expect(key.last_used_at).to eq(nil)
-    end
-
+  context "server header api" do
     it "raises for a revoked key" do
       user = Fabricate(:user)
       api_key = ApiKey.create!
@@ -86,187 +43,6 @@ describe Auth::DefaultCurrentUserProvider do
       expect(api_key.last_used_at).to eq(nil)
     end
 
-    it "raises for a user with a mismatching ip" do
-      user = Fabricate(:user)
-      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1, allowed_ips: ['10.0.0.0/24'])
-
-      expect {
-        provider("/?api_key=#{api_key.key}&api_username=#{user.username.downcase}", "REMOTE_ADDR" => "10.1.0.1").current_user
-      }.to raise_error(Discourse::InvalidAccess)
-
-    end
-
-    it "allows a user with a matching ip" do
-      freeze_time
-
-      user = Fabricate(:user)
-      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1, allowed_ips: ['100.0.0.0/24'])
-      params = {
-        "HTTP_API_USERNAME" => user.username.downcase,
-        "HTTP_API_KEY" => api_key.key,
-        "REMOTE_ADDR" => "100.0.0.22"
-      }
-
-      found_user = provider("/", params).current_user
-
-      expect(found_user.id).to eq(user.id)
-
-      params = {
-        "HTTP_API_USERNAME" => user.username.downcase,
-        "HTTP_API_KEY" => api_key.key,
-        "HTTP_X_FORWARDED_FOR" => "10.1.1.1, 100.0.0.22"
-      }
-
-      found_user = provider("/", params).current_user
-      expect(found_user.id).to eq(user.id)
-
-      api_key.reload
-      expect(api_key.last_used_at).to eq_time(Time.zone.now)
-    end
-
-    it "finds a user for a correct system api key" do
-      user = Fabricate(:user)
-      api_key = ApiKey.create!(created_by_id: -1)
-      params = { "HTTP_API_USERNAME" => user.username.downcase, "HTTP_API_KEY" => api_key.key }
-      expect(provider("/", params).current_user.id).to eq(user.id)
-    end
-
-    it "raises for a mismatched api_key param and header username" do
-      user = Fabricate(:user)
-      api_key = ApiKey.create!(created_by_id: -1)
-      params = { "HTTP_API_USERNAME" => user.username.downcase }
-      expect {
-        provider("/?api_key=#{api_key.key}", params).current_user
-      }.to raise_error(Discourse::InvalidAccess)
-    end
-
-    it "finds a user for a correct system api key with external id" do
-      user = Fabricate(:user)
-      api_key = ApiKey.create!(created_by_id: -1)
-      params = { "HTTP_API_KEY" => api_key.key, "HTTP_API_USER_EXTERNAL_ID" => "abc" }
-      SingleSignOnRecord.create(user_id: user.id, external_id: "abc", last_payload: '')
-      expect(provider("/", params).current_user.id).to eq(user.id)
-    end
-
-    it "raises for a mismatched api_key param and header external id" do
-      user = Fabricate(:user)
-      api_key = ApiKey.create!(created_by_id: -1)
-      SingleSignOnRecord.create(user_id: user.id, external_id: "abc", last_payload: '')
-      params = { "HTTP_API_USER_EXTERNAL_ID" => "abc" }
-      expect {
-        provider("/?api_key=#{api_key.key}", params).current_user
-      }.to raise_error(Discourse::InvalidAccess)
-    end
-
-    it "finds a user for a correct system api key with id" do
-      user = Fabricate(:user)
-      api_key = ApiKey.create!(created_by_id: -1)
-      params = { "HTTP_API_USER_ID" => user.id, "HTTP_API_KEY" => api_key.key }
-      expect(provider("/", params).current_user.id).to eq(user.id)
-    end
-
-    it "raises for a mismatched api_key param and header user id" do
-      user = Fabricate(:user)
-      api_key = ApiKey.create!(created_by_id: -1)
-      params = { "HTTP_API_USER_ID" => user.id }
-      expect {
-        provider("/?api_key=#{api_key.key}", params).current_user
-      }.to raise_error(Discourse::InvalidAccess)
-    end
-
-    context "rate limiting" do
-      before do
-        RateLimiter.enable
-      end
-
-      after do
-        RateLimiter.disable
-      end
-
-      it "rate limits api requests per api key" do
-        global_setting :max_admin_api_reqs_per_key_per_minute, 3
-
-        freeze_time
-
-        user = Fabricate(:user)
-        api_key = ApiKey.create!(created_by_id: -1)
-        key = api_key.key
-        user_params = { "HTTP_API_KEY" => key, "HTTP_API_USERNAME" => user.username.downcase }
-        system_params = { "HTTP_API_KEY" => key, "HTTP_API_USERNAME" => "system" }
-
-        provider("/", user_params).current_user
-        provider("/", system_params).current_user
-        provider("/", user_params).current_user
-
-        expect do
-          provider("/", system_params).current_user
-        end.to raise_error(RateLimiter::LimitExceeded)
-
-        freeze_time 59.seconds.from_now
-
-        expect do
-          provider("/", system_params).current_user
-        end.to raise_error(RateLimiter::LimitExceeded)
-
-        freeze_time 2.seconds.from_now
-
-        # 1 minute elapsed
-        provider("/", system_params).current_user
-
-        # should not rake limit a random key
-        api_key.destroy
-        api_key = ApiKey.create!(created_by_id: -1)
-        user_params = { "HTTP_API_KEY" => api_key.key, "HTTP_API_USERNAME" => user.username.downcase }
-        provider("/", user_params).current_user
-
-      end
-    end
-
-  end
-
-  context "whitelisted api auth query param routes" do
-
-    it "allows rss feeds" do
-      user = Fabricate(:user)
-      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
-      url = "/latest.rss?api_key=#{api_key.key}&api_username=#{user.username.downcase}"
-      expect(provider(url).current_user.id).to eq(user.id)
-    end
-
-    it "allows ics feeds" do
-      user = Fabricate(:user)
-      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
-      url = "/u/#{user.username}/bookmarks.ics?api_key=#{api_key.key}&api_username=#{user.username.downcase}"
-      expect(provider(url).current_user.id).to eq(user.id)
-    end
-
-    it "allows handle mail route" do
-      user = Fabricate(:user)
-      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
-      url = "/admin/email/handle_mail?api_key=#{api_key.key}&api_username=#{user.username.downcase}"
-      opts = { method: "POST" }
-      expect(provider(url, opts).current_user.id).to eq(user.id)
-    end
-
-    it "raises errors for non whitlisted routes" do
-      user = Fabricate(:user)
-      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
-      url = "/u?api_key=#{api_key.key}&api_username=#{user.username.downcase}"
-      expect {
-        provider(url).current_user
-      }.to raise_error(Discourse::InvalidAccess)
-    end
-
-    it "still allows header based auth" do
-      user = Fabricate(:user)
-      api_key = ApiKey.create!(user_id: user.id, created_by_id: -1)
-      params = { "HTTP_API_KEY" => api_key.key, "HTTP_API_USERNAME" => user.username.downcase }
-      expect(provider("/", params).current_user.id).to eq(user.id)
-    end
-  end
-
-  context "server header api" do
-
     it "raises errors for incorrect api_key" do
       params = { "HTTP_API_KEY" => "INCORRECT" }
       expect {
diff --git a/spec/integration/api_keys_spec.rb b/spec/integration/api_keys_spec.rb
new file mode 100644
index 0000000000..451768718f
--- /dev/null
+++ b/spec/integration/api_keys_spec.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'api keys' do
+  let(:user) { Fabricate(:user) }
+  let(:api_key) { ApiKey.create!(user_id: user.id, created_by_id: Discourse.system_user) }
+
+  it 'works in headers' do
+    get '/session/current.json', headers: {
+      HTTP_API_KEY: api_key.key
+    }
+    expect(response.status).to eq(200)
+    expect(response.parsed_body["current_user"]["username"]).to eq(user.username)
+  end
+
+  it 'does not work in parameters' do
+    get '/session/current.json', params: {
+      api_key: api_key.key
+    }
+    expect(response.status).to eq(404)
+  end
+
+  it 'allows parameters on ics routes' do
+    get "/u/#{user.username}/bookmarks.ics?api_key=#{api_key.key}&api_username=#{user.username.downcase}"
+    expect(response.status).to eq(200)
+
+    # Confirm not for JSON
+    get "/u/#{user.username}/bookmarks.json?api_key=#{api_key.key}&api_username=#{user.username.downcase}"
+    expect(response.status).to eq(403)
+  end
+
+  it 'allows parameters for handle mail' do
+    admin_api_key = ApiKey.create!(user: Fabricate(:admin), created_by_id: Discourse.system_user)
+
+    post "/admin/email/handle_mail.json?api_key=#{admin_api_key.key}", params: { email: "blah" }
+    expect(response.status).to eq(200)
+  end
+
+  it 'allows parameters for rss feeds' do
+    SiteSetting.login_required = true
+
+    get "/latest.rss?api_key=#{api_key.key}&api_username=#{user.username.downcase}"
+    expect(response.status).to eq(200)
+
+    # Confirm not allowed for json
+    get "/latest.json?api_key=#{api_key.key}&api_username=#{user.username.downcase}"
+    expect(response.status).to eq(302)
+  end
+
+end
+
+describe 'user api keys' do
+  let(:user) { Fabricate(:user) }
+  let(:user_api_key) { Fabricate(:readonly_user_api_key, user: user) }
+
+  it 'updates last used time on use' do
+    freeze_time
+
+    user_api_key.update_columns(last_used_at: 7.days.ago)
+
+    get '/session/current.json', headers: {
+      HTTP_USER_API_KEY: user_api_key.key,
+    }
+
+    expect(user_api_key.reload.last_used_at).to eq_time(Time.zone.now)
+  end
+
+  it 'allows parameters on ics routes' do
+    get "/u/#{user.username}/bookmarks.ics?user_api_key=#{user_api_key.key}"
+    expect(response.status).to eq(200)
+
+    # Confirm not for JSON
+    get "/u/#{user.username}/bookmarks.json?user_api_key=#{user_api_key.key}"
+    expect(response.status).to eq(403)
+  end
+
+  it 'allows parameters for rss feeds' do
+    SiteSetting.login_required = true
+
+    get "/latest.rss?user_api_key=#{user_api_key.key}"
+    expect(response.status).to eq(200)
+
+    # Confirm not allowed for json
+    get "/latest.json?user_api_key=#{user_api_key.key}"
+    expect(response.status).to eq(302)
+  end
+
+end
diff --git a/spec/integration/user_api_keys_spec.rb b/spec/integration/user_api_keys_spec.rb
deleted file mode 100644
index 5bbdff319e..0000000000
--- a/spec/integration/user_api_keys_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe 'user api keys integration' do
-  it 'updates last used time on use' do
-    freeze_time
-
-    user_api_key = Fabricate(:readonly_user_api_key)
-    user_api_key.update_columns(last_used_at: 7.days.ago)
-
-    get '/session/current.json', headers: {
-      HTTP_USER_API_KEY: user_api_key.key,
-    }
-
-    expect(user_api_key.reload.last_used_at).to eq_time(Time.zone.now)
-  end
-end
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index b2c9b5ebda..cf4f5f15b4 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -1817,7 +1817,7 @@ RSpec.describe TopicsController do
         end
 
         it 'shows the topic if valid api key is provided' do
-          get "/t/#{topic.slug}/#{topic.id}.json", params: { api_key: api_key.key }
+          get "/t/#{topic.slug}/#{topic.id}.json", headers: { "HTTP_API_KEY" => api_key.key }
 
           expect(response.status).to eq(200)
           topic.reload
@@ -1826,7 +1826,7 @@ RSpec.describe TopicsController do
 
         it 'returns 403 for an invalid key' do
           [:json, :html].each do |format|
-            get "/t/#{topic.slug}/#{topic.id}.#{format}", params: { api_key: "bad" }
+            get "/t/#{topic.slug}/#{topic.id}.#{format}", headers: { "HTTP_API_KEY" => "bad" }
 
             expect(response.code.to_i).to eq(403)
             expect(response.body).to include(I18n.t("invalid_access"))

From 9bce91f59f468da1f42a91afe88387cb0ab60899 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Tue, 12 May 2020 09:41:16 -0500
Subject: [PATCH 1125/1830] DEV: Allow plugins to add extra icons to
 category-link (#9743)

---
 .../discourse/app/helpers/category-link.js    | 19 ++++++++++++++-----
 .../discourse/app/lib/plugin-api.js           | 17 +++++++++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/helpers/category-link.js b/app/assets/javascripts/discourse/app/helpers/category-link.js
index 7f566b576f..2f4699b18c 100644
--- a/app/assets/javascripts/discourse/app/helpers/category-link.js
+++ b/app/assets/javascripts/discourse/app/helpers/category-link.js
@@ -18,6 +18,12 @@ function categoryStripe(color, classes) {
   return "<span class='" + classes + "' " + style + "></span>";
 }
 
+let _extraIconRenderers = [];
+
+export function addExtraIconRenderer(renderer) {
+  _extraIconRenderers.push(renderer);
+}
+
 /**
   Generates category badge HTML
 
@@ -149,12 +155,15 @@ function defaultCategoryLinkRenderer(category, opts) {
   }
 
   if (restricted) {
-    html += `${iconHTML(
-      "lock"
-    )}<span class="category-name" ${categoryDir}>${categoryName}</span>`;
-  } else {
-    html += `<span class="category-name" ${categoryDir}>${categoryName}</span>`;
+    html += iconHTML("lock");
   }
+  _extraIconRenderers.forEach(renderer => {
+    const iconName = renderer(category);
+    if (iconName) {
+      html += iconHTML(iconName);
+    }
+  });
+  html += `<span class="category-name" ${categoryDir}>${categoryName}</span>`;
   html += "</span>";
 
   if (opts.topicCount && categoryStyle !== "box") {
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index 06cecc25ad..a10e183bf2 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -48,6 +48,7 @@ import {
   addComposerUploadMarkdownResolver
 } from "discourse/components/composer-editor";
 import { addCategorySortCriteria } from "discourse/components/edit-category-settings";
+import { addExtraIconRenderer } from "discourse/helpers/category-link";
 import { queryRegistry } from "discourse/widgets/widget";
 import Composer from "discourse/models/composer";
 import { on } from "@ember/object/evented";
@@ -1065,6 +1066,22 @@ class PluginApi {
   decorateTopicTitle(callback) {
     addTopicTitleDecorator(callback);
   }
+
+  /**
+   * Allows adding icons to the category-link html
+   *
+   * ```
+   * api.addCategoryLinkIcon((category) => {
+   *  if (category.someProperty) {
+        return "eye"
+      }
+   * });
+   * ```
+   *
+   **/
+  addCategoryLinkIcon(renderer) {
+    addExtraIconRenderer(renderer);
+  }
 }
 
 let _pluginv01;

From c94e6a9a66757ea48d99e3ee8d880523871cb6f4 Mon Sep 17 00:00:00 2001
From: Joshua Rosenfeld <jomaxro@discourse.org>
Date: Tue, 12 May 2020 10:44:46 -0400
Subject: [PATCH 1126/1830] FEATURE: add noindex header to tags pages (#9748)

---
 app/controllers/tags_controller.rb    | 2 ++
 spec/requests/tags_controller_spec.rb | 1 +
 2 files changed, 3 insertions(+)

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index ada5d6f66d..51cbb5297b 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -24,6 +24,8 @@ class TagsController < ::ApplicationController
 
   before_action :fetch_tag, only: [:info, :create_synonyms, :destroy_synonym]
 
+  after_action :add_noindex_header
+
   def index
     @description_meta = I18n.t("tags.title")
     @title = @description_meta
diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
index b4c0b866ea..926e506e35 100644
--- a/spec/requests/tags_controller_spec.rb
+++ b/spec/requests/tags_controller_spec.rb
@@ -29,6 +29,7 @@ describe TagsController do
         tags = response.parsed_body["tags"]
         expect(tags.length).to eq(1)
         expect(tags[0]['text']).to eq("topic-test")
+        expect(response.headers['X-Robots-Tag']).to eq('noindex')
       end
     end
 

From 0344ad14c1f997672f81e4d6cbabec6d0dbb1e8d Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 12 May 2020 16:08:35 +0100
Subject: [PATCH 1127/1830] FIX: Add missing rss routes to parameter api
 whitelist

---
 lib/auth/default_current_user_provider.rb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index ad94861cf7..0b0f647ad9 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -24,15 +24,18 @@ class Auth::DefaultCurrentUserProvider
       method: :get,
       route: [
         "posts#latest",
-        "posts#user_topics_feed",
         "posts#user_posts_feed",
         "groups#posts_feed",
         "groups#mentions_feed",
+        "list#user_topics_feed",
         "list#category_feed",
-        "list#latest_feed",
-        "list#new_feed",
-        "list#unread_feed",
-        "topics#feed"
+        "topics#feed",
+        "badges#show",
+        "tags#tag_feed",
+        "tags#show",
+        *[:latest, :unread, :new, :read, :posted, :bookmarks].map { |f| "list##{f}_feed" },
+        *[:all, :yearly, :quarterly, :monthly, :weekly, :daily].map { |p| "list#top_#{p}_feed" },
+        *[:latest, :unread, :new, :read, :posted, :bookmarks].map { |f| "tags#show_#{f}" }
       ],
       format: :rss
     },

From 088c11a12c226f1c2511a2da269dc5f938fe2f6c Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 12 May 2020 11:14:57 -0400
Subject: [PATCH 1128/1830] FIX: Don't raise an exception if a TopicLink cannot
 be created

This can happen under concurrency and it's fine. If a `TopicLink`
already exists we can continue on without raising an error.
---
 app/models/topic_link.rb | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index f913dc6459..afc6faea00 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -213,16 +213,18 @@ class TopicLink < ActiveRecord::Base
     unless TopicLink.exists?(topic_id: post.topic_id, post_id: post.id, url: url)
       file_extension = File.extname(parsed.path)[1..10].downcase unless parsed.path.nil? || File.extname(parsed.path).empty?
       begin
-        TopicLink.create!(post_id: post.id,
-                          user_id: post.user_id,
-                          topic_id: post.topic_id,
-                          url: url,
-                          domain: parsed.host || Discourse.current_hostname,
-                          internal: internal,
-                          link_topic_id: topic&.id,
-                          link_post_id: reflected_post.try(:id),
-                          quote: link.is_quote,
-                          extension: file_extension)
+        TopicLink.create(
+          post_id: post.id,
+          user_id: post.user_id,
+          topic_id: post.topic_id,
+          url: url,
+          domain: parsed.host || Discourse.current_hostname,
+          internal: internal,
+          link_topic_id: topic&.id,
+          link_post_id: reflected_post.try(:id),
+          quote: link.is_quote,
+          extension: file_extension
+        )
       rescue ActiveRecord::RecordNotUnique
         # it's fine
       end

From 2298e14d383e2ad06ab0f6f63b743eaab3b77345 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Tue, 12 May 2020 12:24:33 -0300
Subject: [PATCH 1129/1830] FEATURE: Support for App Shortcuts Menu (#9749)

* FEATURE: Support for App Shortcuts Menu

This adds a list of shortcuts to a installed Discourse instance.

It can be accessed by right clicks or long press on the app icon.

See https://github.com/MicrosoftEdge/MSEdgeExplainers/blob/master/Shortcuts/explainer.md

List of possible follow ups include:

- Making it admin customizable
- Making it user customizable
- Using SVG icons from the site icon sprite
- Picking an accent color for icons

* FIX: Add type to shortcut menu icons
---
 app/controllers/metadata_controller.rb    | 52 ++++++++++++++++++++++-
 spec/requests/metadata_controller_spec.rb |  8 ++++
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/app/controllers/metadata_controller.rb b/app/controllers/metadata_controller.rb
index ccde4cd1b7..ce6f1f85c6 100644
--- a/app/controllers/metadata_controller.rb
+++ b/app/controllers/metadata_controller.rb
@@ -50,7 +50,57 @@ class MetadataController < ApplicationController
           title: "title",
           text: "body"
         }
-      }
+      },
+      shortcuts: [
+        {
+          name: I18n.t('js.topic.create_long'),
+          short_name: I18n.t('js.topic.create'),
+          url: "/new-topic",
+          icons: [
+            {
+              src: ActionController::Base.helpers.image_url("push-notifications/check.png"),
+              sizes: "128x128",
+              type: "image/png"
+            }
+          ]
+        },
+        {
+          name: I18n.t('js.user.messages.inbox'),
+          short_name: I18n.t('js.user.messages.inbox'),
+          url: "/my/messages",
+          icons: [
+            {
+              src: ActionController::Base.helpers.image_url("push-notifications/private_message.png"),
+              sizes: "128x128",
+              type: "image/png"
+            }
+          ]
+        },
+        {
+          name: I18n.t('js.user.bookmarks'),
+          short_name: I18n.t('js.user.bookmarks'),
+          url: "/my/bookmarks",
+          icons: [
+            {
+              src: ActionController::Base.helpers.image_url("push-notifications/check.png"),
+              sizes: "128x128",
+              type: "image/png"
+            }
+          ]
+        },
+        {
+          name: I18n.t('js.filters.top.title'),
+          short_name: I18n.t('js.filters.top.title'),
+          url: "/top",
+          icons: [
+            {
+              src: ActionController::Base.helpers.image_url("push-notifications/check.png"),
+              sizes: "128x128",
+              type: "image/png"
+            }
+          ]
+        }
+      ]
     }
 
     logo = SiteSetting.site_manifest_icon_url
diff --git a/spec/requests/metadata_controller_spec.rb b/spec/requests/metadata_controller_spec.rb
index e008236da1..ae8166428b 100644
--- a/spec/requests/metadata_controller_spec.rb
+++ b/spec/requests/metadata_controller_spec.rb
@@ -86,6 +86,14 @@ RSpec.describe MetadataController do
       manifest = JSON.parse(response.body)
       expect(manifest["short_name"]).to eq("foo")
     end
+
+    it 'contains valid shortcuts by default' do
+      get "/manifest.webmanifest"
+      expect(response.status).to eq(200)
+      manifest = JSON.parse(response.body)
+      expect(manifest["shortcuts"].size).to be > 0
+      expect { URI.parse(manifest["shortcuts"][0]["icons"][0]["src"]) }.not_to raise_error
+    end
   end
 
   describe 'opensearch.xml' do

From 497dc6eaa714dbbd0c79fd45f7d69de01fad6e87 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Tue, 12 May 2020 16:34:12 +0100
Subject: [PATCH 1130/1830] Add a global setting for CDN origin

This is so that, on a multisite cluster, when we handle a CDN request,
the hostname that is requested corresponds to one of the sites -
specifically the default site.
---
 app/models/global_setting.rb   | 1 +
 config/discourse_defaults.conf | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index 57d22d6618..f4425919ed 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -140,6 +140,7 @@ class GlobalSetting
     hostnames << backup_hostname if backup_hostname.present?
 
     hostnames << URI.parse(cdn_url).host if cdn_url.present?
+    hostnames << cdn_origin_hostname if cdn_origin_hostname.present?
 
     hash["host_names"] = hostnames
     hash["database"] = db_name
diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf
index 4adfdca7e9..ac71f6a8b6 100644
--- a/config/discourse_defaults.conf
+++ b/config/discourse_defaults.conf
@@ -96,6 +96,9 @@ load_mini_profiler = true
 # recommended, cdn used to access assets
 cdn_url =
 
+# The hostname used by the CDN to request assets
+cdn_origin_hostname =
+
 # comma delimited list of emails that have developer level access
 developer_emails =
 

From 1c0c425f38616e801b5b917d3c95706f9a2a8e5c Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Tue, 12 May 2020 13:10:57 -0300
Subject: [PATCH 1131/1830] DEV: Detect correct data dir using ENV

---
 lib/tasks/docker.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index 1b74d3ee20..2d1f9fee14 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -97,7 +97,7 @@ task 'docker:test' do
       puts "Starting background redis"
       @redis_pid = Process.spawn('redis-server --dir tmp/test_data/redis')
 
-      @postgres_bin = "/usr/lib/postgresql/10/bin/"
+      @postgres_bin = "/usr/lib/postgresql/#{ENV['PG_MAJOR']}/bin/"
       `#{@postgres_bin}initdb -D tmp/test_data/pg`
 
       # speed up db, never do this in production mmmmk

From 033644ea823fb908a6c55692cafa3fbae8e947e3 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 12 May 2020 12:23:12 -0400
Subject: [PATCH 1132/1830] DEV: Adds an integrity spec for JS constants

---
 spec/integrity/js_constants_spec.rb | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 spec/integrity/js_constants_spec.rb

diff --git a/spec/integrity/js_constants_spec.rb b/spec/integrity/js_constants_spec.rb
new file mode 100644
index 0000000000..c0c52d6f79
--- /dev/null
+++ b/spec/integrity/js_constants_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe "constants match ruby" do
+
+  let(:ctx) { MiniRacer::Context.new }
+
+  def parse(file)
+    # mini racer doesn't handle JS modules so we'll do this hack
+    source = File.read("#{Rails.root}/app/assets/javascripts/#{file}")
+    source.gsub!(/^export */, '')
+    ctx.eval(source)
+  end
+
+  it "has the correct values" do
+    parse("discourse/app/lib/constants.js")
+    parse("pretty-text/addon/emoji/version.js")
+
+    priorities = ctx.eval("SEARCH_PRIORITIES")
+    Searchable::PRIORITIES.each do |key, value|
+      expect(priorities[key.to_s]).to eq(value)
+    end
+
+    expect(ctx.eval("SEARCH_PHRASE_REGEXP")).to eq(Search::PHRASE_MATCH_REGEXP_PATTERN)
+    expect(ctx.eval("IMAGE_VERSION")).to eq(Emoji::EMOJI_VERSION)
+  end
+
+end

From e73e9aa7f2bb111d9830eb501846e7a5b6b48091 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 12 May 2020 18:32:12 +0200
Subject: [PATCH 1133/1830] DEV:  skip failing test (#9755)

---
 test/javascripts/acceptance/bookmarks-test.js | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/test/javascripts/acceptance/bookmarks-test.js b/test/javascripts/acceptance/bookmarks-test.js
index 83781f7ffb..88175f5389 100644
--- a/test/javascripts/acceptance/bookmarks-test.js
+++ b/test/javascripts/acceptance/bookmarks-test.js
@@ -230,26 +230,29 @@ test("Editing a bookmark", async assert => {
   assert.verifySteps(["tomorrow"]);
 });
 
-test("Editing a bookmark that has a Later Today reminder, and it is before 6pm today", async assert => {
-  mockSuccessfulBookmarkPost(assert);
-  let clock = fakeTime(
-    "2020-05-04T13:00:00",
-    loggedInUser().resolvedTimezone(loggedInUser())
-  );
-  await timeStep(clock, () =>
-    visit("/t/internationalization-localization/280")
-  );
-  await timeStep(clock, () => openBookmarkModal());
-  await timeStep(clock, () => fillIn("input#bookmark-name", "Test name"));
-  await timeStep(clock, () => click("#tap_tile_later_today"));
-  await timeStep(clock, () => openEditBookmarkModal());
-  assert.not(
-    exists("#bookmark-custon-date > input"),
-    "it does not show the custom date input"
-  );
-  assert.ok(
-    exists("#tap_tile_later_today.active"),
-    "it preselects Later Today"
-  );
-  assert.verifySteps(["later_today"]);
-});
+QUnit.skip(
+  "Editing a bookmark that has a Later Today reminder, and it is before 6pm today",
+  async assert => {
+    mockSuccessfulBookmarkPost(assert);
+    let clock = fakeTime(
+      "2020-05-04T13:00:00",
+      loggedInUser().resolvedTimezone(loggedInUser())
+    );
+    await timeStep(clock, () =>
+      visit("/t/internationalization-localization/280")
+    );
+    await timeStep(clock, () => openBookmarkModal());
+    await timeStep(clock, () => fillIn("input#bookmark-name", "Test name"));
+    await timeStep(clock, () => click("#tap_tile_later_today"));
+    await timeStep(clock, () => openEditBookmarkModal());
+    assert.not(
+      exists("#bookmark-custon-date > input"),
+      "it does not show the custom date input"
+    );
+    assert.ok(
+      exists("#tap_tile_later_today.active"),
+      "it preselects Later Today"
+    );
+    assert.verifySteps(["later_today"]);
+  }
+);

From d9f5499f3a89b33be76ce498974d1ca5dd2452d8 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 12 May 2020 14:14:46 -0400
Subject: [PATCH 1134/1830] Revert "Revert "DEV: Remove `Discourse.Route`""

This reverts commit b4d27d327deeab8e42fd67bafe5dd369742e636e.

Plugins have been updated to not use this anymore.
---
 .../javascripts/discourse/app/routes/discourse.js     | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/routes/discourse.js b/app/assets/javascripts/discourse/app/routes/discourse.js
index 91be0b4331..6d04c6b04f 100644
--- a/app/assets/javascripts/discourse/app/routes/discourse.js
+++ b/app/assets/javascripts/discourse/app/routes/discourse.js
@@ -2,7 +2,6 @@ import { once } from "@ember/runloop";
 import Composer from "discourse/models/composer";
 import { getOwner } from "discourse-common/lib/get-owner";
 import Route from "@ember/routing/route";
-import deprecated from "discourse-common/lib/deprecated";
 import { seenUser } from "discourse/lib/user-presence";
 
 const DiscourseRoute = Route.extend({
@@ -113,14 +112,4 @@ const DiscourseRoute = Route.extend({
   }
 });
 
-Object.defineProperty(Discourse, "Route", {
-  get() {
-    deprecated("Import the Route class instead of using Discourse.Route", {
-      since: "2.4.0",
-      dropFrom: "2.5.0"
-    });
-    return Route;
-  }
-});
-
 export default DiscourseRoute;

From e990d8adce6930b93ac23887ae2f5f718e4ef09a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 12 May 2020 21:30:41 +0200
Subject: [PATCH 1135/1830]  FIX: ensures preview is correctly computing
 timezone for current user (#9758)

This also fixes a related bug with timezones on displayed date when in calendar range.
---
 .../javascripts/lib/local-date-builder.js.es6 | 19 +++++++---
 .../lib/local-date-builder-test.js.es6        | 35 +++++++++++++++++++
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
index 96b48dde7e..7c4dd7862f 100644
--- a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
@@ -89,7 +89,14 @@ export default class LocalDateBuilder {
     previewedTimezones.push({
       timezone: this._zoneWithoutPrefix(this.localTimezone),
       current: true,
-      formated: this._createDateTimeRange(localDate, this.time)
+      formated: this._createDateTimeRange(
+        DateWithZoneHelper.fromDatetime(
+          localDate.datetime,
+          localDate.timezone,
+          this.localTimezone
+        ),
+        this.time
+      )
     });
 
     if (
@@ -180,10 +187,12 @@ export default class LocalDateBuilder {
         );
 
       if (inCalendarRange && sameTimezone) {
-        return localDate.datetime.calendar(
-          moment.tz(this.localTimezone),
-          this._calendarFormats(this.time ? this.time : null)
-        );
+        return localDate
+          .datetimeWithZone(this.localTimezone)
+          .calendar(
+            moment.tz(localDate.timezone),
+            this._calendarFormats(this.time ? this.time : null)
+          );
       }
     }
 
diff --git a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
index 66a4938dbb..d4864f742b 100644
--- a/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
+++ b/plugins/discourse-local-dates/test/javascripts/lib/local-date-builder-test.js.es6
@@ -298,6 +298,18 @@ QUnit.test("option[calendar]", assert => {
       "it stops formating out of calendar range"
     )
   );
+
+  freezeTime({ date: "2020-05-12", timezone: LOS_ANGELES }, () => {
+    assert.buildsCorrectDate(
+      {
+        date: "2020-05-13",
+        time: "18:00",
+        localTimezone: LOS_ANGELES
+      },
+      { formated: "Tomorrow 11:00 AM" },
+      "it correctly displays a different local timezone"
+    );
+  });
 });
 
 QUnit.test("previews", assert => {
@@ -467,4 +479,27 @@ QUnit.test("previews", assert => {
       }
     );
   });
+
+  freezeTime({ date: "2020-05-12", timezone: LOS_ANGELES }, () => {
+    assert.buildsCorrectDate(
+      {
+        date: "2020-05-13",
+        time: "18:00",
+        localTimezone: LOS_ANGELES
+      },
+      {
+        previews: [
+          {
+            current: true,
+            formated: "May 13, 2020 11:00 AM",
+            timezone: "Los Angeles"
+          },
+          {
+            formated: "May 13, 2020 6:00 PM",
+            timezone: "UTC"
+          }
+        ]
+      }
+    );
+  });
 });

From 9981fa4466052d1f0429b5fef9a7c040490940af Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 13 May 2020 09:05:56 +1000
Subject: [PATCH 1136/1830] FIX: Prevent column name conflicts in reviewable
 code (#9753)

We were getting errors like this in Reviewables in some cases:

```
ActiveRecord::StatementInvalid (PG::AmbiguousColumn: ERROR:  column reference "category_id" is ambiguous
LINE 4: ...TRUE) OR (reviewable_by_group_id IN (NULL))) AND (category_i...
```

The problem that was making everything go boom is that plugins can add their own custom filters for Reviewables. If one is doing an INNER JOIN on topics, which has its own category_id column, we would get the above AmbiguousColumn error. The solution here is to just make all references to the reviewable columns in the list_for and viewable_by code prefixed by the table name e.g. reviewables.category_id.
---
 app/models/reviewable.rb       | 31 ++++++++++++++++---------------
 spec/models/reviewable_spec.rb | 27 +++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 0fd3f4059b..99c2ad62c0 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -406,7 +406,7 @@ class Reviewable < ActiveRecord::Base
   def self.viewable_by(user, order: nil, preload: true)
     return none unless user.present?
 
-    result = self.order(order || 'score desc, created_at desc')
+    result = self.order(order || 'reviewables.score desc, reviewables.created_at desc')
 
     if preload
       result = result.includes(
@@ -422,10 +422,10 @@ class Reviewable < ActiveRecord::Base
     group_ids = SiteSetting.enable_category_group_review? ? user.group_users.pluck(:group_id) : []
 
     result.where(
-      '(reviewable_by_moderator AND :staff) OR (reviewable_by_group_id IN (:group_ids))',
+      '(reviewables.reviewable_by_moderator AND :staff) OR (reviewables.reviewable_by_group_id IN (:group_ids))',
       staff: user.staff?,
       group_ids: group_ids
-    ).where("category_id IS NULL OR category_id IN (?)", Guardian.new(user).allowed_category_ids)
+    ).where("reviewables.category_id IS NULL OR reviewables.category_id IN (?)", Guardian.new(user).allowed_category_ids)
   end
 
   def self.pending_count(user)
@@ -451,13 +451,13 @@ class Reviewable < ActiveRecord::Base
 
     order = case sort_order
             when 'priority_asc'
-              'score ASC, created_at DESC'
+              'reviewables.score ASC, reviewables.created_at DESC'
             when 'created_at'
-              'created_at DESC, score DESC'
+              'reviewables.created_at DESC, reviewables.score DESC'
             when 'created_at_asc'
-              'created_at ASC, score DESC'
+              'reviewables.created_at ASC, reviewables.score DESC'
             else
-              'score DESC, created_at DESC'
+              'reviewables.score DESC, reviewables.created_at DESC'
     end
 
     if username.present?
@@ -469,19 +469,19 @@ class Reviewable < ActiveRecord::Base
     result = viewable_by(user, order: order)
 
     result = by_status(result, status)
-    result = result.where(type: type) if type
-    result = result.where(category_id: category_id) if category_id
-    result = result.where(topic_id: topic_id) if topic_id
-    result = result.where("created_at >= ?", from_date) if from_date
-    result = result.where("created_at <= ?", to_date) if to_date
+    result = result.where('reviewables.type = ?', type) if type
+    result = result.where('reviewables.category_id = ?', category_id) if category_id
+    result = result.where('reviewables.topic_id = ?', topic_id) if topic_id
+    result = result.where("reviewables.created_at >= ?", from_date) if from_date
+    result = result.where("reviewables.created_at <= ?", to_date) if to_date
 
     if min_score > 0 && status == :pending && type.nil?
       result = result.where(
-        "score >= ? OR type IN (?)",
+        "reviewables.score >= ? OR reviewables.type IN (?)",
         min_score, [ReviewableQueuedPost.name, ReviewableUser.name]
       )
     elsif min_score > 0
-      result = result.where("score >= ?", min_score)
+      result = result.where("reviewables.score >= ?", min_score)
     end
 
     if !custom_filters.empty?
@@ -497,7 +497,8 @@ class Reviewable < ActiveRecord::Base
     # If a reviewable doesn't have a target, allow us to filter on who created that reviewable.
     if user_id
       result = result.where(
-        "(target_created_by_id IS NULL AND created_by_id = :user_id) OR (target_created_by_id = :user_id)",
+        "(reviewables.target_created_by_id IS NULL AND reviewables.created_by_id = :user_id)
+        OR (reviewables.target_created_by_id = :user_id)",
         user_id: user_id
       )
     end
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index 5fd051fc0c..8d58d6a537 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -479,6 +479,33 @@ RSpec.describe Reviewable, type: :model do
       expect(results.size).to eq(1)
       expect(results.first).to eq first_reviewable
     end
+
+    context "when listing for a moderator with a custom filter that joins tables with same named columns" do
+      it "should not error" do
+        first_reviewable = Fabricate(:reviewable)
+        second_reviewable = Fabricate(:reviewable)
+        custom_filter = [
+          :troublemaker,
+          Proc.new do |results, value|
+            results.joins(<<~SQL
+          INNER JOIN posts p ON p.id = target_id
+          INNER JOIN topics t ON t.id = p.topic_id
+          INNER JOIN topic_custom_fields tcf ON tcf.topic_id = t.id
+          INNER JOIN users u ON u.id = tcf.value::integer
+                          SQL
+                         )
+              .where(target_type: Post.name)
+              .where('tcf.name = ?', 'troublemaker_user_id')
+              .where('u.username = ?', value)
+          end
+        ]
+
+        Reviewable.add_custom_filter(custom_filter)
+        mod = Fabricate(:moderator)
+        results = Reviewable.list_for(mod, additional_filters: { troublemaker: 'badguy' })
+        expect { results.first }.not_to raise_error
+      end
+    end
   end
 
   describe '.by_status' do

From 4078b2288702346262c9ef2221fe4f47764101a1 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Tue, 12 May 2020 18:11:22 -0600
Subject: [PATCH 1137/1830] FIX: Handle missing provider return sso url

This commit prevents a 500 error from occurring if someone is trying to
setup their discourse instance as a sso provider and they don't pass in
a `return_sso_url` in their payload.
---
 lib/single_sign_on_provider.rb           | 1 +
 spec/requests/session_controller_spec.rb | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/lib/single_sign_on_provider.rb b/lib/single_sign_on_provider.rb
index d97ecdf6c8..a626ffcf26 100644
--- a/lib/single_sign_on_provider.rb
+++ b/lib/single_sign_on_provider.rb
@@ -19,6 +19,7 @@ class SingleSignOnProvider < SingleSignOn
     decoded = Base64.decode64(parsed["sso"])
     decoded_hash = Rack::Utils.parse_query(decoded)
 
+    raise ParseError unless decoded_hash.key? 'return_sso_url'
     @return_sso_url = decoded_hash['return_sso_url']
   end
 
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index 49b4d0943f..dd44d52970 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -1055,6 +1055,13 @@ RSpec.describe SessionController do
         expect(response.body).to eq(I18n.t("sso.missing_secret"))
       end
 
+      it "returns a 422 if no return_sso_url" do
+        SiteSetting.sso_provider_secrets = "abcdefghij"
+        sso = SingleSignOnProvider.new
+        get "/session/sso_provider?sso=asdf&sig=abcdefghij"
+        expect(response.status).to eq(422)
+      end
+
       it "successfully redirects user to return_sso_url when the user is logged in" do
         sign_in(@user)
 

From 765e842101a53359a60e7f4dffa35631f46d4b3c Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 12 May 2020 22:51:28 -0400
Subject: [PATCH 1138/1830] UX: remove underline from del & ins elements

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

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index d6bf0ec166..4570d424df 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -116,6 +116,12 @@
   a {
     word-wrap: break-word;
   }
+
+  del,
+  ins {
+    text-decoration: none;
+  }
+  
   ins {
     background-color: dark-light-choose(
       $success-low,

From 822e594fc87e01cdbecdfd44679dbcbe4fada76a Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 13 May 2020 10:43:44 +0800
Subject: [PATCH 1139/1830] UX: Improve display of site setting validation
 message.

Previously, the validation message is shown inline with the label which
leads to the available width for both element being reduced.
---
 .../admin/templates/components/site-settings/bool.hbs          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
index 11384580c1..848c68145c 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs
@@ -1,5 +1,6 @@
 <label>
   {{input type="checkbox" checked=enabled}}
   <span>{{html-safe setting.description}}</span>
-  {{setting-validation-message message=validationMessage}}
 </label>
+
+{{setting-validation-message message=validationMessage}}

From 34c39b65bb09b86df51b90a2c1cfa54c3bf705ff Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 13 May 2020 11:09:40 +0800
Subject: [PATCH 1140/1830] PERF: Avoid executing the same query twice.

---
 app/models/topic_tracking_state.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index 015e1b0c11..244ce472b9 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -195,6 +195,8 @@ class TopicTrackingState
     #
     # This code needs to be VERY efficient as it is triggered via the message bus and may steal
     #  cycles from usual requests
+    tag_ids = muted_tag_ids(user)
+
     sql = +report_raw_sql(
       topic_id: topic_id,
       skip_unread: true,
@@ -202,7 +204,7 @@ class TopicTrackingState
       staff: user.staff?,
       admin: user.admin?,
       user: user,
-      muted_tag_ids: muted_tag_ids(user)
+      muted_tag_ids: tag_ids
     )
 
     sql << "\nUNION ALL\n\n"
@@ -215,7 +217,7 @@ class TopicTrackingState
       filter_old_unread: true,
       admin: user.admin?,
       user: user,
-      muted_tag_ids: muted_tag_ids(user)
+      muted_tag_ids: tag_ids
     )
 
     DB.query(

From 811bc3544ffeed2b8c377797a057c81e3a9978db Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 12 May 2020 23:12:46 -0400
Subject: [PATCH 1141/1830] prettier

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

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 4570d424df..6e465bbc6b 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -121,7 +121,7 @@
   ins {
     text-decoration: none;
   }
-  
+
   ins {
     background-color: dark-light-choose(
       $success-low,

From a64cf265fdd36be16e148606b5a02e3a0807c6bc Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 13 May 2020 14:03:24 +1000
Subject: [PATCH 1142/1830] FIX: Change /bookmarks URL back to topic list and
 add bookmark poster avatars (#9759)

* Changes the /bookmarks URL to show the original "topics filtered by bookmark" list instead of redirecting to user activity bookmarks (see https://meta.discourse.org/t/domain-com-bookmarks-is-showing-domain-com-u-user-activity-bookmarks-with-reminders/149252/12)
* Add the user avatar for the user who made the post that is bookmarked
---
 .../discourse/app/models/bookmark.js          | 14 +++++++++++++
 .../discourse/app/routes/discovery.js         |  7 -------
 .../app/templates/user/bookmarks.hbs          | 16 +++++++++++----
 .../app/widgets/quick-access-bookmarks.js     |  2 +-
 .../common/components/bookmark-list-item.scss |  9 +++++++++
 app/serializers/user_bookmark_serializer.rb   | 20 ++++++++++++++++---
 .../user_bookmark_serializer_spec.rb          |  4 +++-
 test/javascripts/fixtures/user_fixtures.js    |  4 +++-
 8 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/bookmark.js b/app/assets/javascripts/discourse/app/models/bookmark.js
index fd88264583..3fc34c7280 100644
--- a/app/assets/javascripts/discourse/app/models/bookmark.js
+++ b/app/assets/javascripts/discourse/app/models/bookmark.js
@@ -1,4 +1,5 @@
 import Category from "discourse/models/category";
+import User from "discourse/models/user";
 import { isRTL } from "discourse/lib/text-direction";
 import { censor } from "pretty-text/censored-words";
 import { emojiUnescape } from "discourse/lib/text";
@@ -135,6 +136,19 @@ const Bookmark = RestModel.extend({
       }
     }
     return ajax({ url: moreUrl });
+  },
+
+  @discourseComputed(
+    "post_user_username",
+    "post_user_avatar_template",
+    "post_user_name"
+  )
+  postUser(post_user_username, avatarTemplate, name) {
+    return User.create({
+      username: post_user_username,
+      avatar_template: avatarTemplate,
+      name: name
+    });
   }
 });
 
diff --git a/app/assets/javascripts/discourse/app/routes/discovery.js b/app/assets/javascripts/discourse/app/routes/discovery.js
index e4cff5e115..394c9d53ca 100644
--- a/app/assets/javascripts/discourse/app/routes/discovery.js
+++ b/app/assets/javascripts/discourse/app/routes/discovery.js
@@ -13,14 +13,7 @@ export default DiscourseRoute.extend(OpenComposer, {
   },
 
   beforeModel(transition) {
-    // the new bookmark list is radically different to this topic-based one,
-    // including being able to show links to multiple posts to the same topic
-    // and being based on a different model. better to just redirect
     const url = transition.intent.url;
-    if (url === "/bookmarks") {
-      this.transitionTo("userActivity.bookmarks", this.currentUser);
-    }
-
     if (
       (url === "/" || url === "/latest" || url === "/categories") &&
       transition.targetName.indexOf("discovery.top") === -1 &&
diff --git a/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
index aa40b814b5..33a43e6da2 100644
--- a/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
@@ -6,8 +6,9 @@
       <table class="topic-list bookmark-list">
         <thead>
           <th>{{i18n "topic.title"}}</th>
-          <th>{{i18n "post.bookmarks.updated"}}</th>
-          <th>{{i18n "activity"}}</th>
+          <th>&nbsp;</th>
+          <th class="post-metadata">{{i18n "post.bookmarks.updated"}}</th>
+          <th class="post-metadata">{{i18n "activity"}}</th>
           <th>&nbsp;</th>
         </thead>
         <tbody>
@@ -39,8 +40,15 @@
                   {{discourse-tags bookmark mode="list" tagsForUser=tagsForUser}}
                 </div>
               </td>
-              <td>{{format-date bookmark.updated_at format="tiny"}}</td>
-              {{raw "list/activity-column" topic=bookmark class="num" tagName="td"}}
+              <td>
+                {{#if bookmark.post_user_avatar_template}}
+                  <a href={{bookmark.postUser.path}} data-user-card={{bookmark.post_user_username}}>
+                    {{avatar bookmark.postUser avatarTemplatePath="avatar_template" usernamePath="username" namePath="name" imageSize="small"}}
+                  </a>
+                {{/if}}
+              </td>
+              <td class="post-metadata">{{format-date bookmark.updated_at format="tiny"}}</td>
+              {{raw "list/activity-column" topic=bookmark class="num post-metadata" tagName="td"}}
               <td>
                 {{bookmark-actions-dropdown
                   bookmark=bookmark
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js b/app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js
index 3782b3e67c..75ca481671 100644
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js
+++ b/app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js
@@ -36,7 +36,7 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
         bookmark.post_number || bookmark.linked_post_number
       ),
       content: bookmark.title,
-      username: bookmark.username
+      username: bookmark.post_user_username
     });
   },
 
diff --git a/app/assets/stylesheets/common/components/bookmark-list-item.scss b/app/assets/stylesheets/common/components/bookmark-list-item.scss
index 7de562d1d3..e698e06d98 100644
--- a/app/assets/stylesheets/common/components/bookmark-list-item.scss
+++ b/app/assets/stylesheets/common/components/bookmark-list-item.scss
@@ -1,4 +1,13 @@
+.bookmark-list {
+  th.post-metadata {
+    text-align: center;
+  }
+}
+
 .bookmark-list-item {
+  td.post-metadata {
+    text-align: center;
+  }
   .bookmark-metadata {
     font-size: $font-down-2;
     white-space: nowrap;
diff --git a/app/serializers/user_bookmark_serializer.rb b/app/serializers/user_bookmark_serializer.rb
index d4fcc4a72d..06b9c1523b 100644
--- a/app/serializers/user_bookmark_serializer.rb
+++ b/app/serializers/user_bookmark_serializer.rb
@@ -24,7 +24,9 @@ class UserBookmarkSerializer < ApplicationSerializer
              :highest_post_number,
              :bumped_at,
              :slug,
-             :username
+             :post_user_username,
+             :post_user_avatar_template,
+             :post_user_name
 
   def topic
     @topic ||= object.topic || Topic.unscoped.find(object.topic_id)
@@ -94,7 +96,19 @@ class UserBookmarkSerializer < ApplicationSerializer
     topic.slug
   end
 
-  def username
-    post.user.username
+  def post_user
+    @post_user ||= post.user
+  end
+
+  def post_user_username
+    post_user.username
+  end
+
+  def post_user_avatar_template
+    post_user.avatar_template
+  end
+
+  def post_user_name
+    post_user.name
   end
 end
diff --git a/spec/serializers/user_bookmark_serializer_spec.rb b/spec/serializers/user_bookmark_serializer_spec.rb
index e97ebfe467..a192cae912 100644
--- a/spec/serializers/user_bookmark_serializer_spec.rb
+++ b/spec/serializers/user_bookmark_serializer_spec.rb
@@ -28,7 +28,9 @@ RSpec.describe UserBookmarkSerializer do
     expect(s.highest_post_number).to eq(1)
     expect(s.bumped_at).to eq_time(bookmark.topic.bumped_at)
     expect(s.slug).to eq(bookmark.topic.slug)
-    expect(s.username).to eq(bookmark.post.user.username)
+    expect(s.post_user_username).to eq(bookmark.post.user.username)
+    expect(s.post_user_name).to eq(bookmark.post.user.name)
+    expect(s.post_user_avatar_template).not_to eq(nil)
   end
 
   context "when the topic is deleted" do
diff --git a/test/javascripts/fixtures/user_fixtures.js b/test/javascripts/fixtures/user_fixtures.js
index abf4a39037..9dd58f150d 100644
--- a/test/javascripts/fixtures/user_fixtures.js
+++ b/test/javascripts/fixtures/user_fixtures.js
@@ -419,7 +419,9 @@ export default {
           highest_post_number: 5,
           bumped_at: "2020-04-06T05:20:00.172Z",
           slug: "yelling-topic-title",
-          username: "someguy"
+          post_user_username: "someguy",
+          post_user_name: "Some Guy",
+          post_user_avatar_template: "/letter_avatar/someguy/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"
         }
       ]
     }

From 0e09c5837f1ba23e565ed94edc9fea7c75f1bdc5 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 13 May 2020 15:16:07 +1000
Subject: [PATCH 1143/1830] DEV: Try once more to make acceptance test fake
 timers work

In my original PR (#9647) I attempted to solve the problem of
using fake timers in acceptance tests by using the new sinon
clock.tickAsync methods. This way of doing things seems to be flawed,
however, as we are getting random spec timeouts starting with the
bookmark acceptance test where this was introduced.

I think I was going about things the wrong way. This commit introduces
a new function with callback (acceptanceUseFakeClock) that sets up the
fake timers using sinon.useFakeTimers with the shouldAdvanceTime option
set to true. This advances time at a normal rate of 20ms per tick, which
means that we are not freezing any time and existing setTimeout funcs.
should proceed as normal. Along with this the callback passed will
run clock.reset() at the end to make sure all the timers are cleaned
up correctly.

There is an optional third parameter after the callback, which is the
timezone. If the user is logged in for the acceptance test then their
timezone is used, otherwise we default to America/Denver.

Usage is (inside an acceptance test):

```
test("Name of the test", async assert => {
  // first parameter is time to start fake clock at
  await acceptanceUseFakeClock("2020-05-04T13:00:00", async () => {
    // test code goes here e.g. await visit("/url");
  });
});
```
---
 test/javascripts/acceptance/bookmarks-test.js | 30 +++++++------------
 test/javascripts/helpers/qunit-helpers.js     | 26 ++++++++++++----
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/test/javascripts/acceptance/bookmarks-test.js b/test/javascripts/acceptance/bookmarks-test.js
index 88175f5389..6680bfea7d 100644
--- a/test/javascripts/acceptance/bookmarks-test.js
+++ b/test/javascripts/acceptance/bookmarks-test.js
@@ -1,8 +1,7 @@
 import {
   acceptance,
   loggedInUser,
-  fakeTime,
-  timeStep
+  acceptanceUseFakeClock
 } from "helpers/qunit-helpers";
 import pretender from "helpers/create-pretender";
 import { parsePostData } from "helpers/create-pretender";
@@ -230,23 +229,16 @@ test("Editing a bookmark", async assert => {
   assert.verifySteps(["tomorrow"]);
 });
 
-QUnit.skip(
-  "Editing a bookmark that has a Later Today reminder, and it is before 6pm today",
-  async assert => {
+test("Editing a bookmark that has a Later Today reminder, and it is before 6pm today", async assert => {
+  await acceptanceUseFakeClock("2020-05-04T13:00:00", async () => {
     mockSuccessfulBookmarkPost(assert);
-    let clock = fakeTime(
-      "2020-05-04T13:00:00",
-      loggedInUser().resolvedTimezone(loggedInUser())
-    );
-    await timeStep(clock, () =>
-      visit("/t/internationalization-localization/280")
-    );
-    await timeStep(clock, () => openBookmarkModal());
-    await timeStep(clock, () => fillIn("input#bookmark-name", "Test name"));
-    await timeStep(clock, () => click("#tap_tile_later_today"));
-    await timeStep(clock, () => openEditBookmarkModal());
+    await visit("/t/internationalization-localization/280");
+    await openBookmarkModal();
+    await fillIn("input#bookmark-name", "Test name");
+    await click("#tap_tile_later_today");
+    await openEditBookmarkModal();
     assert.not(
-      exists("#bookmark-custon-date > input"),
+      exists("#bookmark-custom-date > input"),
       "it does not show the custom date input"
     );
     assert.ok(
@@ -254,5 +246,5 @@ QUnit.skip(
       "it preselects Later Today"
     );
     assert.verifySteps(["later_today"]);
-  }
-);
+  });
+});
diff --git a/test/javascripts/helpers/qunit-helpers.js b/test/javascripts/helpers/qunit-helpers.js
index 2dd5c793a7..f196bd03bc 100644
--- a/test/javascripts/helpers/qunit-helpers.js
+++ b/test/javascripts/helpers/qunit-helpers.js
@@ -41,14 +41,30 @@ export function loggedInUser() {
   return User.current();
 }
 
-export function fakeTime(timeString, timezone) {
+export function fakeTime(timeString, timezone = null, advanceTime = false) {
   let now = moment.tz(timeString, timezone);
-  return sandbox.useFakeTimers(now.valueOf());
+  return sandbox.useFakeTimers({
+    now: now.valueOf(),
+    shouldAdvanceTime: advanceTime
+  });
 }
 
-export async function timeStep(clock, fn) {
-  fn();
-  return await clock.tickAsync(1000);
+export async function acceptanceUseFakeClock(
+  timeString,
+  callback,
+  timezone = null
+) {
+  if (!timezone) {
+    let user = loggedInUser();
+    if (user) {
+      timezone = user.resolvedTimezone(user);
+    } else {
+      timezone = "America/Denver";
+    }
+  }
+  let clock = fakeTime(timeString, timezone, true);
+  await callback();
+  clock.reset();
 }
 
 const Plugin = $.fn.modal;

From aa40a07d7304be291085bc0a710445344597c161 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 13 May 2020 13:26:24 +0800
Subject: [PATCH 1144/1830] FIX: Throttle typing function in
 discourse-presence.

---
 .../components/composer-presence-display.js.es6  | 16 +++++++++++++---
 .../javascripts/discourse/lib/presence.js.es6    | 13 +------------
 .../discourse/services/presence-manager.js.es6   |  5 -----
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index 6f94bad993..c8bde292e8 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -1,12 +1,18 @@
 import Component from "@ember/component";
-import { cancel } from "@ember/runloop";
+import { cancel, throttle } from "@ember/runloop";
 import { equal, gt } from "@ember/object/computed";
 import { inject as service } from "@ember/service";
 import discourseComputed, {
   observes,
   on
 } from "discourse-common/utils/decorators";
-import { REPLYING, CLOSED, EDITING, COMPOSER_TYPE } from "../lib/presence";
+import {
+  REPLYING,
+  CLOSED,
+  EDITING,
+  COMPOSER_TYPE,
+  KEEP_ALIVE_DURATION_SECONDS
+} from "../lib/presence";
 import { REPLY, EDIT } from "discourse/models/composer";
 
 export default Component.extend({
@@ -55,6 +61,10 @@ export default Component.extend({
 
   @observes("reply", "title")
   typing() {
+    throttle(this, this._typing, KEEP_ALIVE_DURATION_SECONDS * 1000);
+  },
+
+  _typing() {
     const action = this.action;
 
     if (action !== REPLY && action !== EDIT) {
@@ -70,7 +80,7 @@ export default Component.extend({
 
     this._prevPublishData = data;
 
-    this._throttle = this.presenceManager.throttlePublish(
+    this._throttle = this.presenceManager.publish(
       data.topicId,
       data.state,
       data.whisper,
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/lib/presence.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/lib/presence.js.es6
index 57eedc0525..7bf057fd8d 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/lib/presence.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/lib/presence.js.es6
@@ -1,5 +1,5 @@
 import EmberObject from "@ember/object";
-import { cancel, later, throttle } from "@ember/runloop";
+import { cancel, later } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 
@@ -99,17 +99,6 @@ const Presence = EmberObject.extend({
     return `/presence/${topicId}`;
   },
 
-  throttlePublish(state, whisper, postId) {
-    return throttle(
-      this,
-      this.publish,
-      state,
-      whisper,
-      postId,
-      KEEP_ALIVE_DURATION_SECONDS * 1000
-    );
-  },
-
   publish(state, whisper, postId) {
     if (this.get("currentUser.hide_profile_and_presence")) return;
 
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/services/presence-manager.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/services/presence-manager.js.es6
index 1aaca2d1ac..63af48d194 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/services/presence-manager.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/services/presence-manager.js.es6
@@ -36,11 +36,6 @@ const PresenceManager = Service.extend({
     return this._getPresence(topicId).editingUsers;
   },
 
-  throttlePublish(topicId, state, whisper, postId) {
-    if (!topicId) return;
-    return this._getPresence(topicId).throttlePublish(state, whisper, postId);
-  },
-
   publish(topicId, state, whisper, postId) {
     if (!topicId) return;
     return this._getPresence(topicId).publish(state, whisper, postId);

From 15e32dc1af90ceafbb8eadf2e0e5ecc59b9a7527 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 13 May 2020 13:41:03 +0800
Subject: [PATCH 1145/1830] FIX: Composer presence shows user as editing when
 replying.

---
 .../discourse/components/composer-presence-display.js.es6       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index c8bde292e8..c896be345a 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -35,7 +35,7 @@ export default Component.extend({
     return this.presenceManager.editingUsers(topicId);
   },
 
-  isReply: equal("action", "reply"),
+  isReply: equal("action", REPLY),
 
   @on("didInsertElement")
   subscribe() {

From ca8d11635cea65e73335c3357d40de5513adb5fe Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 13 May 2020 13:57:12 +0800
Subject: [PATCH 1146/1830] Add missing export in
 15e32dc1af90ceafbb8eadf2e0e5ecc59b9a7527.

---
 .../assets/javascripts/discourse/lib/presence.js.es6            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/discourse-presence/assets/javascripts/discourse/lib/presence.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/lib/presence.js.es6
index 7bf057fd8d..83424e8277 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/lib/presence.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/lib/presence.js.es6
@@ -16,7 +16,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 //   update the client-side timestamp of when client A was last seen.
 // - If client A disconnects or becomes inactive, the state of client A will be
 //   cleaned up on client B by a scheduler that runs every TIMER_INTERVAL_MILLISECONDS
-const KEEP_ALIVE_DURATION_SECONDS = 10;
+export const KEEP_ALIVE_DURATION_SECONDS = 10;
 const BUFFER_DURATION_SECONDS = KEEP_ALIVE_DURATION_SECONDS + 2;
 
 const MESSAGE_BUS_LAST_ID = 0;

From 7f841dc21f301b04fe5d83ee651b8ddf72518d43 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 13 May 2020 16:05:39 +1000
Subject: [PATCH 1147/1830] PERF: avoid race conditions when creating topic
 links

Previously the code was very race condition prone leading to
odd failures in production

It was re-written in raw SQL to avoid conditions where rows
conflict on inserts

There is no clean way in ActiveRecord to do:

Insert, on conflict do nothing and return existing id.

This also increases test coverage, we were previously not testing
the code responsible for crawling external sites directly
---
 app/models/topic_link.rb       | 158 +++++++++++++++++++++++++--------
 spec/models/topic_link_spec.rb |  48 +++++++---
 2 files changed, 155 insertions(+), 51 deletions(-)

diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index afc6faea00..3f992d9f8f 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -140,9 +140,12 @@ class TopicLink < ActiveRecord::Base
 
   end
 
-  # Crawl a link's title after it's saved
+  def self.crawl_link_title(topic_link_id)
+    Jobs.enqueue(:crawl_topic_link, topic_link_id: topic_link_id)
+  end
+
   def crawl_link_title
-    Jobs.enqueue(:crawl_topic_link, topic_link_id: id)
+    TopicLink.crawl_link_title(id)
   end
 
   def self.duplicate_lookup(topic)
@@ -167,6 +170,97 @@ class TopicLink < ActiveRecord::Base
 
   private
 
+  # This pattern is used to create topic links very efficiently with minimal
+  # errors under heavy concurrent use
+  #
+  # It avoids a SELECT to find out if the record is there and minimizes all
+  # the work it needs to do in case a record is missing
+  #
+  # It handles calling the required callback and has parity with Rails implementation
+  #
+  # Usually we would rely on ActiveRecord but in this case we have had lots of churn
+  # around creation of topic links leading to hard to debug log messages in production
+  #
+  def self.safe_create_topic_link(
+    post_id:,
+    user_id:,
+    topic_id:,
+    url:,
+    domain: nil,
+    internal: false,
+    link_topic_id: nil,
+    link_post_id: nil,
+    quote: false,
+    extension: nil,
+    reflection: false
+  )
+
+    domain ||= Discourse.current_hostname
+
+    sql = <<~SQL
+      WITH new_row AS(
+        INSERT INTO topic_links(
+          post_id,
+          user_id,
+          topic_id,
+          url,
+          domain,
+          internal,
+          link_topic_id,
+          link_post_id,
+          quote,
+          extension,
+          reflection,
+          created_at,
+          updated_at
+        ) VALUES (
+          :post_id,
+          :user_id,
+          :topic_id,
+          :url,
+          :domain,
+          :internal,
+          :link_topic_id,
+          :link_post_id,
+          :quote,
+          :extension,
+          :reflection,
+          :now,
+          :now
+        )
+        ON CONFLICT DO NOTHING
+        RETURNING id
+      )
+      SELECT COALESCE(
+        (SELECT id FROM new_row),
+        (SELECT id FROM topic_links WHERE post_id = :post_id AND topic_id = :topic_id AND url = :url)
+      ), (SELECT id FROM new_row) IS NOT NULL
+    SQL
+
+    topic_link_id, new_record = DB.query_single(sql,
+      post_id: post_id,
+      user_id: user_id,
+      topic_id: topic_id,
+      url: url,
+      domain: domain,
+      internal: internal,
+      link_topic_id: link_topic_id,
+      link_post_id: link_post_id,
+      quote: quote,
+      extension: extension,
+      reflection: reflection,
+      now: Time.now
+    )
+
+    if new_record
+      DB.after_commit do
+        crawl_link_title(topic_link_id)
+      end
+    end
+
+    topic_link_id
+  end
+
   def self.ensure_entry_for(post, link, parsed)
     url = link.url
     internal = false
@@ -210,25 +304,20 @@ class TopicLink < ActiveRecord::Base
     url = url[0...TopicLink.max_url_length]
     return nil if parsed && parsed.host && parsed.host.length > TopicLink.max_domain_length
 
-    unless TopicLink.exists?(topic_id: post.topic_id, post_id: post.id, url: url)
-      file_extension = File.extname(parsed.path)[1..10].downcase unless parsed.path.nil? || File.extname(parsed.path).empty?
-      begin
-        TopicLink.create(
-          post_id: post.id,
-          user_id: post.user_id,
-          topic_id: post.topic_id,
-          url: url,
-          domain: parsed.host || Discourse.current_hostname,
-          internal: internal,
-          link_topic_id: topic&.id,
-          link_post_id: reflected_post.try(:id),
-          quote: link.is_quote,
-          extension: file_extension
-        )
-      rescue ActiveRecord::RecordNotUnique
-        # it's fine
-      end
-    end
+    file_extension = File.extname(parsed.path)[1..10].downcase unless parsed.path.nil? || File.extname(parsed.path).empty?
+
+    safe_create_topic_link(
+      post_id: post.id,
+      user_id: post.user_id,
+      topic_id: post.topic_id,
+      url: url,
+      domain: parsed.host,
+      internal: internal,
+      link_topic_id: topic&.id,
+      link_post_id: reflected_post.try(:id),
+      quote: link.is_quote,
+      extension: file_extension,
+    )
 
     reflected_id = nil
 
@@ -236,24 +325,19 @@ class TopicLink < ActiveRecord::Base
     if topic && post.topic && topic.archetype != 'private_message' && post.topic.archetype != 'private_message' && post.topic.visible?
       prefix = Discourse.base_url_no_prefix
       reflected_url = "#{prefix}#{post.topic.relative_url(post.post_number)}"
-      tl = TopicLink.find_by(topic_id: topic&.id,
-                             post_id: reflected_post&.id,
-                             url: reflected_url)
 
-      unless tl
-        tl = TopicLink.create(user_id: post.user_id,
-                              topic_id: topic&.id,
-                              post_id: reflected_post&.id,
-                              url: reflected_url,
-                              domain: Discourse.current_hostname,
-                              reflection: true,
-                              internal: true,
-                              link_topic_id: post.topic_id,
-                              link_post_id: post.id)
+      reflected_id = safe_create_topic_link(
+        user_id: post.user_id,
+        topic_id: topic&.id,
+        post_id: reflected_post&.id,
+        url: reflected_url,
+        domain: Discourse.current_hostname,
+        reflection: true,
+        internal: true,
+        link_topic_id: post.topic_id,
+        link_post_id: post.id
+      )
 
-      end
-
-      reflected_id = tl.id if tl.persisted?
     end
 
     [url, reflected_id]
diff --git a/spec/models/topic_link_spec.rb b/spec/models/topic_link_spec.rb
index 2f8a0bec33..c1a11711a7 100644
--- a/spec/models/topic_link_spec.rb
+++ b/spec/models/topic_link_spec.rb
@@ -28,31 +28,49 @@ describe TopicLink do
   end
 
   describe 'external links' do
-    fab!(:post2) do
-      Fabricate(:post, raw: <<~RAW, user: user, topic: topic)
+    it 'correctly handles links' do
+
+      non_png = "https://b.com/#{SecureRandom.hex}"
+
+      # prepare a title for one of the links
+      stub_request(:get, non_png).
+        with(headers: {
+          'Accept' => '*/*',
+          'Accept-Encoding' => 'gzip',
+          'Host' => 'b.com',
+        }).
+        to_return(status: 200, body: "<html><head><title>amazing</title></head></html>", headers: {})
+
+      # so we run crawl_topic_links
+      Jobs.run_immediately!
+
+      png_title = "#{SecureRandom.hex}.png"
+      png = "https://awesome.com/#{png_title}"
+
+      post = Fabricate(:post, raw: <<~RAW, user: user, topic: topic)
         http://a.com/
-        https://b.com/b
+        #{non_png}
         http://#{'a' * 200}.com/invalid
         //b.com/#{'a' * 500}
+        #{png}
       RAW
-    end
 
-    before do
-      TopicLink.extract_from(post2)
-    end
+      TopicLink.extract_from(post)
+
+      # we have a special rule for images title where we pull them out of the filename
+      expect(topic.topic_links.where(url: png).pluck(:title).first).to eq(png_title)
+      expect(topic.topic_links.where(url: non_png).pluck(:title).first).to eq("amazing")
 
-    it 'works' do
       expect(topic.topic_links.pluck(:url)).to contain_exactly(
+        png,
+        non_png,
         "http://a.com/",
-        "https://b.com/b",
         "//b.com/#{'a' * 500}"[0...TopicLink.max_url_length]
       )
-    end
 
-    it "doesn't reset them when rebaking" do
       old_ids = topic.topic_links.pluck(:id)
 
-      TopicLink.extract_from(post2)
+      TopicLink.extract_from(post)
 
       new_ids = topic.topic_links.pluck(:id)
 
@@ -107,15 +125,17 @@ describe TopicLink do
         # this is subtle, but we had a bug were second time
         # TopicLink.extract_from was called a reflection was nuked
         2.times do
-          topic.reload
           TopicLink.extract_from(linked_post)
 
+          topic.reload
+          other_topic.reload
+
           link = topic.topic_links.first
           expect(link).to be_present
           expect(link).to be_internal
           expect(link.url).to eq(url)
           expect(link.domain).to eq(test_uri.host)
-          link.link_topic_id == other_topic.id
+          expect(link.link_topic_id). to eq(other_topic.id)
           expect(link).not_to be_reflection
 
           reflection = other_topic.topic_links.first

From 623920f13d8532c3f843f99a008239858957159e Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 13 May 2020 14:07:54 +0800
Subject: [PATCH 1148/1830] FEATURE: Introduce a staff only override key for
 discourse-presence.

Merge remote-tracking branch 'origin/coding-standards'
This uses the composer as a bridge for other plugins.
---
 .../composer-presence-display.js.es6          | 36 +++----
 .../javascripts/discourse/lib/presence.js.es6 |  8 +-
 .../services/presence-manager.js.es6          |  9 +-
 .../connectors/composer-fields/presence.hbs   |  9 +-
 plugins/discourse-presence/plugin.rb          | 98 ++++++++++---------
 .../spec/requests/presence_controller_spec.rb | 22 +++++
 6 files changed, 103 insertions(+), 79 deletions(-)

diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index c896be345a..a01c982471 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -17,36 +17,30 @@ import { REPLY, EDIT } from "discourse/models/composer";
 
 export default Component.extend({
   // Passed in variables
-  action: null,
-  post: null,
-  topic: null,
-  reply: null,
-  title: null,
-  isWhispering: null,
   presenceManager: service(),
 
-  @discourseComputed("topic.id")
+  @discourseComputed("model.topic.id")
   users(topicId) {
     return this.presenceManager.users(topicId);
   },
 
-  @discourseComputed("topic.id")
+  @discourseComputed("model.topic.id")
   editingUsers(topicId) {
     return this.presenceManager.editingUsers(topicId);
   },
 
-  isReply: equal("action", REPLY),
+  isReply: equal("model.action", REPLY),
 
   @on("didInsertElement")
   subscribe() {
-    this.presenceManager.subscribe(this.get("topic.id"), COMPOSER_TYPE);
+    this.presenceManager.subscribe(this.get("model.topic.id"), COMPOSER_TYPE);
   },
 
   @discourseComputed(
-    "post.id",
+    "model.post.id",
     "editingUsers.@each.last_seen",
     "users.@each.last_seen",
-    "action"
+    "model.action"
   )
   presenceUsers(postId, editingUsers, users, action) {
     if (action === EDIT) {
@@ -59,23 +53,24 @@ export default Component.extend({
 
   shouldDisplay: gt("presenceUsers.length", 0),
 
-  @observes("reply", "title")
+  @observes("model.reply", "model.title")
   typing() {
     throttle(this, this._typing, KEEP_ALIVE_DURATION_SECONDS * 1000);
   },
 
   _typing() {
-    const action = this.action;
+    const action = this.get("model.action");
 
     if (action !== REPLY && action !== EDIT) {
       return;
     }
 
     let data = {
-      topicId: this.get("topic.id"),
+      topicId: this.get("model.topic.id"),
       state: action === EDIT ? EDITING : REPLYING,
-      whisper: this.whisper,
-      postId: this.get("post.id")
+      whisper: this.get("model.whisper"),
+      postId: this.get("model.post.id"),
+      presenceStaffOnly: this.get("model._presenceStaffOnly")
     };
 
     this._prevPublishData = data;
@@ -84,16 +79,17 @@ export default Component.extend({
       data.topicId,
       data.state,
       data.whisper,
-      data.postId
+      data.postId,
+      data.presenceStaffOnly
     );
   },
 
-  @observes("whisper")
+  @observes("model.whisper")
   cancelThrottle() {
     this._cancelThrottle();
   },
 
-  @observes("action", "topic.id")
+  @observes("model.action", "model.topic.id")
   composerState() {
     if (this._prevPublishData) {
       this.presenceManager.publish(
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/lib/presence.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/lib/presence.js.es6
index 83424e8277..1bc90d93ca 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/lib/presence.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/lib/presence.js.es6
@@ -99,7 +99,7 @@ const Presence = EmberObject.extend({
     return `/presence/${topicId}`;
   },
 
-  publish(state, whisper, postId) {
+  publish(state, whisper, postId, staffOnly) {
     if (this.get("currentUser.hide_profile_and_presence")) return;
 
     const data = {
@@ -108,13 +108,17 @@ const Presence = EmberObject.extend({
     };
 
     if (whisper) {
-      data.is_whisper = 1;
+      data.is_whisper = true;
     }
 
     if (postId && state === EDITING) {
       data.post_id = postId;
     }
 
+    if (staffOnly) {
+      data.staff_only = true;
+    }
+
     return ajax("/presence/publish", {
       type: "POST",
       data
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/services/presence-manager.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/services/presence-manager.js.es6
index 63af48d194..3913009b30 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/services/presence-manager.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/services/presence-manager.js.es6
@@ -36,9 +36,14 @@ const PresenceManager = Service.extend({
     return this._getPresence(topicId).editingUsers;
   },
 
-  publish(topicId, state, whisper, postId) {
+  publish(topicId, state, whisper, postId, staffOnly) {
     if (!topicId) return;
-    return this._getPresence(topicId).publish(state, whisper, postId);
+    return this._getPresence(topicId).publish(
+      state,
+      whisper,
+      postId,
+      staffOnly
+    );
   },
 
   cleanUpPresence(type) {
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs
index 8fa1fb3862..daae93fc74 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs
@@ -1,8 +1 @@
-{{composer-presence-display
-  action=model.action
-  post=model.post
-  topic=model.topic
-  reply=model.reply
-  title=model.title
-  whisper=model.whisper
-}}
+{{composer-presence-display model=model}}
diff --git a/plugins/discourse-presence/plugin.rb b/plugins/discourse-presence/plugin.rb
index ce91b1ad2e..de6a3e0fd9 100644
--- a/plugins/discourse-presence/plugin.rb
+++ b/plugins/discourse-presence/plugin.rb
@@ -73,61 +73,65 @@ after_initialize do
         max_backlog_age: Presence::MAX_BACKLOG_AGE_SECONDS
       }
 
-      case permitted_params[:state]
-      when EDITING_STATE
+      if permitted_params[:staff_only]
         opts[:group_ids] = [Group::AUTO_GROUPS[:staff]]
+      else
+        case permitted_params[:state]
+        when EDITING_STATE
+          opts[:group_ids] = [Group::AUTO_GROUPS[:staff]]
 
-        if !post.locked? && !permitted_params[:is_whisper]
-          opts[:user_ids] = [post.user_id]
+          if !post.locked? && !permitted_params[:is_whisper]
+            opts[:user_ids] = [post.user_id]
 
-          if topic.private_message?
-            if post.wiki
-              opts[:user_ids] = opts[:user_ids].concat(
-                topic.allowed_users.where(
-                  "trust_level >= ? AND NOT admin OR moderator",
-                  SiteSetting.min_trust_to_edit_wiki_post
-                ).pluck(:id)
-              )
+            if topic.private_message?
+              if post.wiki
+                opts[:user_ids] = opts[:user_ids].concat(
+                  topic.allowed_users.where(
+                    "trust_level >= ? AND NOT admin OR moderator",
+                    SiteSetting.min_trust_to_edit_wiki_post
+                  ).pluck(:id)
+                )
 
-              opts[:user_ids].uniq!
+                opts[:user_ids].uniq!
 
-              # Ignore trust level and just publish to all allowed groups since
-              # trying to figure out which users in the allowed groups have
-              # the necessary trust levels can lead to a large array of user ids
-              # if the groups are big.
-              opts[:group_ids] = opts[:group_ids].concat(
-                topic.allowed_groups.pluck(:id)
-              )
-            end
-          else
-            if post.wiki
-              opts[:group_ids] << Group::AUTO_GROUPS[:"trust_level_#{SiteSetting.min_trust_to_edit_wiki_post}"]
-            elsif SiteSetting.trusted_users_can_edit_others?
-              opts[:group_ids] << Group::AUTO_GROUPS[:trust_level_4]
+                # Ignore trust level and just publish to all allowed groups since
+                # trying to figure out which users in the allowed groups have
+                # the necessary trust levels can lead to a large array of user ids
+                # if the groups are big.
+                opts[:group_ids] = opts[:group_ids].concat(
+                  topic.allowed_groups.pluck(:id)
+                )
+              end
+            else
+              if post.wiki
+                opts[:group_ids] << Group::AUTO_GROUPS[:"trust_level_#{SiteSetting.min_trust_to_edit_wiki_post}"]
+              elsif SiteSetting.trusted_users_can_edit_others?
+                opts[:group_ids] << Group::AUTO_GROUPS[:trust_level_4]
+              end
             end
           end
-        end
-      when REPLYING_STATE
-        if permitted_params[:is_whisper]
-          opts[:group_ids] = [Group::AUTO_GROUPS[:staff]]
-        elsif topic.private_message?
-          opts[:user_ids] = topic.allowed_users.pluck(:id)
+        when REPLYING_STATE
+          if permitted_params[:is_whisper]
+            opts[:group_ids] = [Group::AUTO_GROUPS[:staff]]
+          elsif topic.private_message?
+            opts[:user_ids] = topic.allowed_users.pluck(:id)
 
-          opts[:group_ids] = [Group::AUTO_GROUPS[:staff]].concat(
-            topic.allowed_groups.pluck(:id)
-          )
-        else
-          opts[:group_ids] = topic.secure_group_ids
-        end
-      when CLOSED_STATE
-        if topic.private_message?
-          opts[:user_ids] = topic.allowed_users.pluck(:id)
+            opts[:group_ids] = [Group::AUTO_GROUPS[:staff]].concat(
+              topic.allowed_groups.pluck(:id)
+            )
+          else
+            opts[:group_ids] = topic.secure_group_ids
+          end
+        when CLOSED_STATE
+          if topic.private_message?
+            opts[:user_ids] = topic.allowed_users.pluck(:id)
 
-          opts[:group_ids] = [Group::AUTO_GROUPS[:staff]].concat(
-            topic.allowed_groups.pluck(:id)
-          )
-        else
-          opts[:group_ids] = topic.secure_group_ids
+            opts[:group_ids] = [Group::AUTO_GROUPS[:staff]].concat(
+              topic.allowed_groups.pluck(:id)
+            )
+          else
+            opts[:group_ids] = topic.secure_group_ids
+          end
         end
       end
 
@@ -158,7 +162,7 @@ after_initialize do
     end
 
     def permitted_params
-      params.permit(:state, :topic_id, :post_id, :is_whisper)
+      params.permit(:state, :topic_id, :post_id, :is_whisper, :staff_only)
     end
   end
 
diff --git a/plugins/discourse-presence/spec/requests/presence_controller_spec.rb b/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
index c13e04fa6c..b0b3343097 100644
--- a/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
+++ b/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
@@ -193,6 +193,28 @@ describe ::Presence::PresencesController do
         expect(message.user_ids).to eq(nil)
       end
 
+      it 'publishes the message to staff group when staff_only param override is present' do
+        messages = MessageBus.track_publish do
+          post '/presence/publish.json', params: {
+            topic_id: public_topic.id,
+            state: 'replying',
+            staff_only: true
+          }
+
+          expect(response.status).to eq(200)
+        end
+
+        expect(messages.length).to eq(1)
+
+        message = messages.first
+
+        expect(message.channel).to eq("/presence/#{public_topic.id}")
+        expect(message.data.dig(:user, :id)).to eq(user.id)
+        expect(message.data[:published_at]).to eq(Time.zone.now.to_i)
+        expect(message.group_ids).to contain_exactly(Group::AUTO_GROUPS[:staff])
+        expect(message.user_ids).to eq(nil)
+      end
+
       it 'publishes the message to staff group when a staff is editing a whisper' do
         SiteSetting.enable_whispers = true
         sign_in(admin)

From 50e63f52027f302a8844711834865955d06c1bf4 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 13 May 2020 16:58:26 +1000
Subject: [PATCH 1149/1830] Skip later today test again :'(

---
 test/javascripts/acceptance/bookmarks-test.js | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/test/javascripts/acceptance/bookmarks-test.js b/test/javascripts/acceptance/bookmarks-test.js
index 6680bfea7d..c2b26fbe6f 100644
--- a/test/javascripts/acceptance/bookmarks-test.js
+++ b/test/javascripts/acceptance/bookmarks-test.js
@@ -229,22 +229,25 @@ test("Editing a bookmark", async assert => {
   assert.verifySteps(["tomorrow"]);
 });
 
-test("Editing a bookmark that has a Later Today reminder, and it is before 6pm today", async assert => {
-  await acceptanceUseFakeClock("2020-05-04T13:00:00", async () => {
-    mockSuccessfulBookmarkPost(assert);
-    await visit("/t/internationalization-localization/280");
-    await openBookmarkModal();
-    await fillIn("input#bookmark-name", "Test name");
-    await click("#tap_tile_later_today");
-    await openEditBookmarkModal();
-    assert.not(
-      exists("#bookmark-custom-date > input"),
-      "it does not show the custom date input"
-    );
-    assert.ok(
-      exists("#tap_tile_later_today.active"),
-      "it preselects Later Today"
-    );
-    assert.verifySteps(["later_today"]);
-  });
-});
+QUnit.skip(
+  "Editing a bookmark that has a Later Today reminder, and it is before 6pm today",
+  async assert => {
+    await acceptanceUseFakeClock("2020-05-04T13:00:00", async () => {
+      mockSuccessfulBookmarkPost(assert);
+      await visit("/t/internationalization-localization/280");
+      await openBookmarkModal();
+      await fillIn("input#bookmark-name", "Test name");
+      await click("#tap_tile_later_today");
+      await openEditBookmarkModal();
+      assert.not(
+        exists("#bookmark-custom-date > input"),
+        "it does not show the custom date input"
+      );
+      assert.ok(
+        exists("#tap_tile_later_today.active"),
+        "it preselects Later Today"
+      );
+      assert.verifySteps(["later_today"]);
+    });
+  }
+);

From c405b15914128ac57fd164ab0ea38cfb5e08e893 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 13 May 2020 15:40:11 +0800
Subject: [PATCH 1150/1830] DEV: Add plugin outlet
 `revision-user-details-after`.

---
 app/assets/javascripts/discourse/app/templates/modal/history.hbs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse/app/templates/modal/history.hbs b/app/assets/javascripts/discourse/app/templates/modal/history.hbs
index fb41be53b0..528f5a8bf3 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/history.hbs
@@ -5,6 +5,7 @@
       {{#link-to "user" model.username}}
         {{bound-avatar-template model.avatar_template "small"}} {{model.username}}
       {{/link-to}}
+      {{plugin-outlet name="revision-user-details-after" noTags=true args=(hash model=model)}}
       <span class="date">{{bound-date model.created_at}}</span>
       {{#if model.edit_reason}}
         &mdash; <span class="edit-reason">{{model.edit_reason}}</span>

From 7d857d79bd1d2ee454a7fc8c20cc1babe8ab6940 Mon Sep 17 00:00:00 2001
From: RK Aranas <rk.aranas@gmail.com>
Date: Mon, 11 May 2020 23:38:41 +0800
Subject: [PATCH 1151/1830] UX: Fix hard coded value in Crazy in Love badge
 description

Currently, the Crazy in Love badge's description has a hard coded
value of 50.This should correspond to the max_likes_per_day value
instead.
---
 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 c948a2ef62..2840e4fd5b 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -4373,7 +4373,7 @@ en:
         This badge is granted when you use all %{max_likes_per_day} of your daily likes for 5 days. Thanks for taking the time actively encouraging the best conversations every day!
     crazy_in_love:
       name: Crazy in Love
-      description: Used 50 likes in a day 20 times
+      description: Used %{max_likes_per_day} likes in a day 20 times
       long_description: |
         This badge is granted when you use all %{max_likes_per_day} of your daily likes for 20 days. Wow! You’re a role model for encouraging your fellow community members!
     thank_you:

From d4717f5d1e91be0000399b5d23b62c9b45f9dfa4 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 13 May 2020 12:25:34 +0100
Subject: [PATCH 1152/1830] DEV: Reduce repeated code in
 discourse_plugin_registry (#9705)

Use a helper method to simplify creating a new register. Previously this would require creating lots of different methods manually, and adding every register to the clear/reset functions
---
 lib/discourse_plugin_registry.rb              | 187 ++++--------------
 lib/plugin/instance.rb                        |   1 -
 .../discourse_plugin_registry_spec.rb         |  12 +-
 spec/rails_helper.rb                          |   2 +-
 4 files changed, 43 insertions(+), 159 deletions(-)

diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index 2022c24ccf..acd35ecc79 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -5,100 +5,45 @@
 #
 class DiscoursePluginRegistry
 
-  class << self
-    attr_writer :javascripts
-    attr_writer :auth_providers
-    attr_writer :service_workers
-    attr_writer :admin_javascripts
-    attr_writer :stylesheets
-    attr_writer :mobile_stylesheets
-    attr_writer :desktop_stylesheets
-    attr_writer :sass_variables
-    attr_writer :handlebars
-    attr_writer :serialized_current_user_fields
-    attr_writer :seed_data
-    attr_writer :svg_icons
-    attr_writer :locales
-    attr_accessor :custom_html
+  # Shortcut to create new register in the plugin registry
+  #   - Register is created in a class variable using the specified name/type
+  #   - Defines singleton method to access the register
+  #   - Defines instance method as a shortcut to the singleton method
+  #   - Automatically deletes the register on ::clear!
+  def self.define_register(register_name, type)
+    @@register_names ||= Set.new
+    @@register_names << register_name
 
-    def plugins
-      @plugins ||= []
+    define_singleton_method(register_name) do
+      instance_variable_get(:"@#{register_name}") ||
+        instance_variable_set(:"@#{register_name}", type.new)
     end
 
-    # Default accessor values
-    def javascripts
-      @javascripts ||= Set.new
-    end
-
-    def auth_providers
-      @auth_providers ||= Set.new
-    end
-
-    def service_workers
-      @service_workers ||= Set.new
-    end
-
-    def asset_globs
-      @asset_globs ||= Set.new
-    end
-
-    def admin_javascripts
-      @admin_javascripts ||= Set.new
-    end
-
-    def stylesheets
-      @stylesheets ||= Hash.new
-    end
-
-    def mobile_stylesheets
-      @mobile_stylesheets ||= Hash.new
-    end
-
-    def desktop_stylesheets
-      @desktop_stylesheets ||= Hash.new
-    end
-
-    def sass_variables
-      @sass_variables ||= Set.new
-    end
-
-    def svg_icons
-      @svg_icons ||= []
-    end
-
-    def handlebars
-      @handlebars ||= Set.new
-    end
-
-    def serialized_current_user_fields
-      @serialized_current_user_fields ||= Set.new
-    end
-
-    def seed_data
-      @seed_data ||= HashWithIndifferentAccess.new({})
-    end
-
-    def locales
-      @locales ||= HashWithIndifferentAccess.new({})
-    end
-
-    def html_builders
-      @html_builders ||= {}
-    end
-
-    def seed_path_builders
-      @seed_path_builders ||= Set.new
-    end
-
-    def vendored_pretty_text
-      @vendored_pretty_text ||= Set.new
-    end
-
-    def vendored_core_pretty_text
-      @vendored_core_pretty_text ||= Set.new
+    define_method(register_name) do
+      self.class.public_send(register_name)
     end
   end
 
+  define_register :javascripts, Set
+  define_register :auth_providers, Set
+  define_register :service_workers, Set
+  define_register :admin_javascripts, Set
+  define_register :stylesheets, Hash
+  define_register :mobile_stylesheets, Hash
+  define_register :desktop_stylesheets, Hash
+  define_register :sass_variables, Set
+  define_register :handlebars, Set
+  define_register :serialized_current_user_fields, Set
+  define_register :seed_data, HashWithIndifferentAccess
+  define_register :locales, HashWithIndifferentAccess
+  define_register :svg_icons, Set
+  define_register :custom_html, Hash
+  define_register :asset_globs, Set
+  define_register :html_builders, Hash
+  define_register :seed_path_builders, Set
+  define_register :vendored_pretty_text, Set
+  define_register :vendored_core_pretty_text, Set
+
   def self.register_auth_provider(auth_provider)
     self.auth_providers << auth_provider
   end
@@ -230,70 +175,10 @@ class DiscoursePluginRegistry
     asset
   end
 
-  def locales
-    self.class.locales
-  end
-
-  def javascripts
-    self.class.javascripts
-  end
-
-  def auth_providers
-    self.class.auth_providers
-  end
-
-  def service_workers
-    self.class.service_workers
-  end
-
-  def stylesheets
-    self.class.stylesheets
-  end
-
-  def mobile_stylesheets
-    self.class.mobile_stylesheets
-  end
-
-  def desktop_stylesheets
-    self.class.desktop_stylesheets
-  end
-
-  def sass_variables
-    self.class.sass_variables
-  end
-
-  def handlebars
-    self.class.handlebars
-  end
-
-  def self.clear
-    self.javascripts = nil
-    self.auth_providers = nil
-    self.service_workers = nil
-    self.stylesheets = nil
-    self.mobile_stylesheets = nil
-    self.desktop_stylesheets = nil
-    self.sass_variables = nil
-    self.handlebars = nil
-    self.locales = nil
-  end
-
   def self.reset!
-    javascripts.clear
-    auth_providers.clear
-    service_workers.clear
-    admin_javascripts.clear
-    stylesheets.clear
-    mobile_stylesheets.clear
-    desktop_stylesheets.clear
-    sass_variables.clear
-    serialized_current_user_fields
-    asset_globs.clear
-    html_builders.clear
-    vendored_pretty_text.clear
-    vendored_core_pretty_text.clear
-    seed_path_builders.clear
-    locales.clear
+    @@register_names.each do |name|
+      instance_variable_set(:"@#{name}", nil)
+    end
   end
 
 end
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index c1904b6c75..a127ce0ca9 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -456,7 +456,6 @@ class Plugin::Instance
   end
 
   def register_custom_html(hash)
-    DiscoursePluginRegistry.custom_html ||= {}
     DiscoursePluginRegistry.custom_html.merge!(hash)
   end
 
diff --git a/spec/components/discourse_plugin_registry_spec.rb b/spec/components/discourse_plugin_registry_spec.rb
index bbb4f8e416..2fb9f41fef 100644
--- a/spec/components/discourse_plugin_registry_spec.rb
+++ b/spec/components/discourse_plugin_registry_spec.rb
@@ -12,42 +12,42 @@ describe DiscoursePluginRegistry do
 
   context '#stylesheets' do
     it 'defaults to an empty Set' do
-      registry.stylesheets = nil
+      registry.reset!
       expect(registry.stylesheets).to eq(Hash.new)
     end
   end
 
   context '#mobile_stylesheets' do
     it 'defaults to an empty Set' do
-      registry.mobile_stylesheets = nil
+      registry.reset!
       expect(registry.mobile_stylesheets).to eq(Hash.new)
     end
   end
 
   context '#javascripts' do
     it 'defaults to an empty Set' do
-      registry.javascripts = nil
+      registry.reset!
       expect(registry.javascripts).to eq(Set.new)
     end
   end
 
   context '#auth_providers' do
     it 'defaults to an empty Set' do
-      registry.auth_providers = nil
+      registry.reset!
       expect(registry.auth_providers).to eq(Set.new)
     end
   end
 
   context '#admin_javascripts' do
     it 'defaults to an empty Set' do
-      registry.admin_javascripts = nil
+      registry.reset!
       expect(registry.admin_javascripts).to eq(Set.new)
     end
   end
 
   context '#seed_data' do
     it 'defaults to an empty Set' do
-      registry.seed_data = nil
+      registry.reset!
       expect(registry.seed_data).to be_a(Hash)
       expect(registry.seed_data.size).to eq(0)
     end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 04a90b3e06..c2692af427 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -188,7 +188,7 @@ RSpec.configure do |config|
     # Ugly, but needed until we have a user creator
     User.skip_callback(:create, :after, :ensure_in_trust_level_group)
 
-    DiscoursePluginRegistry.clear if ENV['LOAD_PLUGINS'] != "1"
+    DiscoursePluginRegistry.reset! if ENV['LOAD_PLUGINS'] != "1"
     Discourse.current_user_provider = TestCurrentUserProvider
 
     SiteSetting.refresh!

From ff331e845a98702678d72b249f10965e1c03d216 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 13 May 2020 12:54:28 +0100
Subject: [PATCH 1153/1830] DEV: Prevent 'previous definition' warnings for
 PARAMETER_API_PATTERNS

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

diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index 0b0f647ad9..36ba51051f 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -19,7 +19,7 @@ class Auth::DefaultCurrentUserProvider
   COOKIE_ATTEMPTS_PER_MIN ||= 10
   BAD_TOKEN ||= "_DISCOURSE_BAD_TOKEN"
 
-  PARAMETER_API_PATTERNS = [
+  PARAMETER_API_PATTERNS ||= [
     {
       method: :get,
       route: [

From d69263f93494e513b9b13dce0582d571f30a9ce8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 13 May 2020 10:57:39 -0400
Subject: [PATCH 1154/1830] Build(deps-dev): Bump ruby-prof from 1.3.2 to 1.4.0
 (#9761)

Bumps [ruby-prof](https://github.com/ruby-prof/ruby-prof) from 1.3.2 to 1.4.0.
- [Release notes](https://github.com/ruby-prof/ruby-prof/releases)
- [Changelog](https://github.com/ruby-prof/ruby-prof/blob/master/CHANGES)
- [Commits](https://github.com/ruby-prof/ruby-prof/compare/1.3.2...1.4.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 1153a7884d..f36fdb2cde 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -353,7 +353,7 @@ GEM
       rubocop-rspec (>= 1.39.0)
     rubocop-rspec (1.39.0)
       rubocop (>= 0.68.1)
-    ruby-prof (1.3.2)
+    ruby-prof (1.4.0)
     ruby-progressbar (1.10.1)
     ruby-readability (0.7.0)
       guess_html_encoding (>= 0.0.4)

From 9b85e75937724b7a55f7c16b9a4d8c588857dedc Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 13 May 2020 17:11:44 +0200
Subject: [PATCH 1155/1830] FIX: prevents SvgSprite.bundle to query ThemeField
 two times (#9762)

---
 lib/svg_sprite/svg_sprite.rb | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index f2c4bcdbb7..918a28435c 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -209,24 +209,26 @@ module SvgSprite
   THEME_SPRITE_VAR_NAME = "icons-sprite"
 
   def self.custom_svg_sprites(theme_ids = [])
-    custom_sprite_paths = Dir.glob("#{Rails.root}/plugins/*/svg-icons/*.svg")
+    get_set_cache("custom_svg_sprites_#{Theme.transform_ids(theme_ids).join(',')}") do
+      custom_sprite_paths = Dir.glob("#{Rails.root}/plugins/*/svg-icons/*.svg")
 
-    ThemeField.where(type_id: ThemeField.types[:theme_upload_var], name: THEME_SPRITE_VAR_NAME, theme_id: Theme.transform_ids(theme_ids))
-      .pluck(:upload_id).each do |upload_id|
+      ThemeField.where(type_id: ThemeField.types[:theme_upload_var], name: THEME_SPRITE_VAR_NAME, theme_id: Theme.transform_ids(theme_ids))
+        .pluck(:upload_id).each do |upload_id|
 
-      upload = Upload.find(upload_id) rescue nil
+        upload = Upload.find(upload_id) rescue nil
 
-      if Discourse.store.external?
-        external_copy = Discourse.store.download(upload) rescue nil
-        original_path = external_copy.try(:path)
-      else
-        original_path = Discourse.store.path_for(upload)
+        if Discourse.store.external?
+          external_copy = Discourse.store.download(upload) rescue nil
+          original_path = external_copy.try(:path)
+        else
+          original_path = Discourse.store.path_for(upload)
+        end
+
+        custom_sprite_paths << original_path if original_path.present?
       end
 
-      custom_sprite_paths << original_path if original_path.present?
+      custom_sprite_paths
     end
-
-    custom_sprite_paths
   end
 
   def self.all_icons(theme_ids = [])

From cb8f8de422b8b270dc57f3614d3d9d718bfc40ef Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 13 May 2020 16:17:05 +0100
Subject: [PATCH 1156/1830] Revert "FEATURE: Add same site cookie 'None' option
 to make cross domain systems possible (#9374)"

samesite=none is not supported in Rack 2.0.8. We can re-apply this change once Rack has been upgraded.

https://meta.discourse.org/t/cooke-samesite-none-not-working-because-of-outdated-rack-version/151331

This reverts commit 94c02286818214fa48a064503496698849a7f237.
---
 config/site_settings.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index ea4bbd4b66..d49bb0e4cf 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1382,8 +1382,7 @@ security:
       - Lax
       - Strict
       - Disabled
-      - None
-    regex: "^(Lax|Strict|Disabled|None)$"
+    regex: "^(Lax|Strict|Disabled)$"
   enable_escaped_fragments: true
   allow_index_in_robots_txt: true
   moderators_create_categories: false

From 3d54f497db40575c996b4ef4374ccc44ba82f354 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 13 May 2020 12:22:14 -0500
Subject: [PATCH 1157/1830] DEV: add classes to li's inside user navigation
 (#9766)

---
 .../javascripts/discourse/app/templates/user.hbs   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs
index 9290b1d832..1841f77c30 100644
--- a/app/assets/javascripts/discourse/app/templates/user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user.hbs
@@ -227,28 +227,28 @@
       <section class="user-primary-navigation">
         {{#mobile-nav class='main-nav' desktopClass="nav nav-pills user-nav" currentPath=currentPath}}
           {{#unless model.profile_hidden}}
-            <li>{{#link-to 'user.summary'}}{{i18n 'user.summary.title'}}{{/link-to}}</li>
-            <li>{{#link-to 'userActivity'}}{{i18n 'user.activity_stream'}}{{/link-to}}</li>
+            <li class="summary">{{#link-to 'user.summary'}}{{i18n 'user.summary.title'}}{{/link-to}}</li>
+            <li class="activity">{{#link-to 'userActivity'}}{{i18n 'user.activity_stream'}}{{/link-to}}</li>
           {{/unless}}
           {{#if showNotificationsTab}}
-            <li>
+            <li class="user-notifications">
               {{#link-to 'userNotifications'}}
                 {{d-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
               {{/link-to}}
             </li>
           {{/if}}
           {{#if showPrivateMessages}}
-            <li>{{#link-to 'userPrivateMessages'}}{{d-icon "far-envelope"}}{{i18n 'user.private_messages'}}{{/link-to}}</li>
+            <li class="private-messages">{{#link-to 'userPrivateMessages'}}{{d-icon "far-envelope"}}{{i18n 'user.private_messages'}}{{/link-to}}</li>
           {{/if}}
           {{#if canInviteToForum}}
-            <li>{{#link-to 'userInvited'}}{{d-icon "user-plus"}}{{i18n 'user.invited.title'}}{{/link-to}}</li>
+            <li class="invited">{{#link-to 'userInvited'}}{{d-icon "user-plus"}}{{i18n 'user.invited.title'}}{{/link-to}}</li>
           {{/if}}
           {{#if showBadges}}
-            <li>{{#link-to 'user.badges'}}{{d-icon "certificate"}}{{i18n 'badges.title'}}{{/link-to}}</li>
+            <li class="badges">{{#link-to 'user.badges'}}{{d-icon "certificate"}}{{i18n 'badges.title'}}{{/link-to}}</li>
           {{/if}}
           {{plugin-outlet name="user-main-nav" tagName='' connectorTagName='li' args=(hash model=model)}}
           {{#if model.can_edit}}
-            <li>{{#link-to 'preferences'}}{{d-icon "cog"}}{{i18n 'user.preferences'}}{{/link-to}}</li>
+            <li class="preferences">{{#link-to 'preferences'}}{{d-icon "cog"}}{{i18n 'user.preferences'}}{{/link-to}}</li>
           {{/if}}
         {{/mobile-nav}}
       </section>

From e1f11f43748b12c667406714d9f9e2e1185ffe21 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 13 May 2020 16:03:56 -0400
Subject: [PATCH 1158/1830] Build(deps-dev): Bump better_errors from 2.7.0 to
 2.7.1 (#9767)

Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.7.0 to 2.7.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.7.0...v2.7.1)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index f36fdb2cde..87d71f722e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -66,7 +66,7 @@ GEM
     barber (0.12.2)
       ember-source (>= 1.0, < 3.1)
       execjs (>= 1.2, < 3)
-    better_errors (2.7.0)
+    better_errors (2.7.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)

From 1059557ce11c474fdf568571423a88821b072141 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Wed, 13 May 2020 13:08:15 -0700
Subject: [PATCH 1159/1830] DEV: Standardize ignored_columns removal comments
 (#9771)

---
 app/models/category.rb   | 1 +
 app/models/group.rb      | 1 +
 app/models/post.rb       | 2 +-
 app/models/post_reply.rb | 1 +
 app/models/topic.rb      | 2 +-
 app/models/user_email.rb | 5 +++--
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index ddab403c5d..63db814752 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -5,6 +5,7 @@ class Category < ActiveRecord::Base
     'none'
   ]
 
+  # TODO(2020-11-18): remove
   self.ignored_columns = %w{
     suppress_from_latest
   }
diff --git a/app/models/group.rb b/app/models/group.rb
index 1f93c99b2c..5bc41d7b42 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Group < ActiveRecord::Base
+  # TODO(2021-04-22): remove
   self.ignored_columns = %w{
     automatic_membership_retroactive
   }
diff --git a/app/models/post.rb b/app/models/post.rb
index c2f80c8c6f..89dbbcfebb 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -10,7 +10,7 @@ class Post < ActiveRecord::Base
   include HasCustomFields
   include LimitedEdit
 
-  # remove line Jan 2021
+  # TODO(2021-01-04): remove
   self.ignored_columns = ["avg_time"]
 
   cattr_accessor :plugin_permitted_create_params
diff --git a/app/models/post_reply.rb b/app/models/post_reply.rb
index 9cc9be2692..fc8eee4d1b 100644
--- a/app/models/post_reply.rb
+++ b/app/models/post_reply.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class PostReply < ActiveRecord::Base
+  # TODO(2020-01-17): remove
   self.ignored_columns = %w{
     reply_id
   }
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 371f32d570..cdbd6ee285 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -10,7 +10,7 @@ class Topic < ActiveRecord::Base
   include LimitedEdit
   extend Forwardable
 
-  # remove line Jan 2021
+  # TODO(2021-01-04): remove
   self.ignored_columns = ["avg_time"]
 
   def_delegator :featured_users, :user_ids, :featured_user_ids
diff --git a/app/models/user_email.rb b/app/models/user_email.rb
index e4bfe5034a..7ce64cb4a2 100644
--- a/app/models/user_email.rb
+++ b/app/models/user_email.rb
@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 class UserEmail < ActiveRecord::Base
+  # TODO(2020-04-24): remove
+  self.ignored_columns = ['canonical_email']
+
   belongs_to :user
 
   attr_accessor :skip_validate_email
@@ -17,8 +20,6 @@ class UserEmail < ActiveRecord::Base
 
   scope :secondary, -> { where(primary: false) }
 
-  self.ignored_columns = ['canonical_email']
-
   private
 
   def strip_downcase_email

From eab560fe2aa9053f6d227d29ec6c1ad0939ea940 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 13 May 2020 16:23:41 -0400
Subject: [PATCH 1160/1830] DEV: import I18n instead of global usage (#9768)

Co-authored-by: Mark VanLandingham <markvanlan@gmail.com>
Co-authored-by: Robin Ward <robin.ward@gmail.com>

Co-authored-by: Mark VanLandingham <markvanlan@gmail.com>
---
 .../admin/components/admin-backups-logs.js       |  1 +
 .../components/admin-report-storage-stats.js     |  1 +
 .../javascripts/admin/components/admin-report.js |  1 +
 .../admin/components/admin-user-field-item.js    |  1 +
 .../admin/components/admin-watched-word.js       |  1 +
 .../components/admin-web-hook-event-chooser.js   |  1 +
 .../admin/components/admin-web-hook-event.js     |  1 +
 .../admin/components/admin-web-hook-status.js    |  1 +
 .../admin/components/email-styles-editor.js      |  1 +
 .../admin/components/embeddable-host.js          |  1 +
 .../admin/components/inline-edit-checkbox.js     |  1 +
 .../javascripts/admin/components/ip-lookup.js    |  1 +
 .../admin/components/penalty-post-action.js      |  1 +
 .../admin/components/permalink-form.js           |  1 +
 .../admin/components/resumable-upload.js         |  1 +
 .../admin/components/screened-ip-address-form.js |  1 +
 .../admin/components/secret-value-list.js        |  1 +
 .../admin/components/tags-uploader.js            |  1 +
 .../admin/components/watched-word-form.js        |  1 +
 .../admin/components/watched-word-uploader.js    |  1 +
 .../admin/controllers/admin-api-keys-new.js      |  1 +
 .../admin/controllers/admin-backups-index.js     |  1 +
 .../admin/controllers/admin-badges-award.js      |  1 +
 .../admin/controllers/admin-badges-show.js       |  1 +
 .../controllers/admin-customize-colors-show.js   |  1 +
 .../admin/controllers/admin-customize-colors.js  |  1 +
 .../admin-customize-email-style-edit.js          |  1 +
 .../admin-customize-email-templates-edit.js      |  1 +
 .../controllers/admin-customize-themes-edit.js   |  1 +
 .../controllers/admin-customize-themes-show.js   |  1 +
 .../admin/controllers/admin-dashboard-general.js |  1 +
 .../admin/controllers/admin-email-index.js       |  1 +
 .../admin/controllers/admin-emojis.js            |  1 +
 .../admin-logs-screened-ip-addresses.js          |  1 +
 .../controllers/admin-logs-staff-action-logs.js  |  1 +
 .../admin/controllers/admin-permalinks.js        |  1 +
 .../admin/controllers/admin-search-logs-index.js |  1 +
 .../admin/controllers/admin-search-logs-term.js  |  1 +
 .../admin/controllers/admin-site-settings.js     |  1 +
 .../admin/controllers/admin-site-text-edit.js    |  1 +
 .../admin/controllers/admin-user-badges.js       |  1 +
 .../admin/controllers/admin-user-fields.js       |  1 +
 .../admin/controllers/admin-user-index.js        |  1 +
 .../admin/controllers/admin-users-list-show.js   |  1 +
 .../controllers/admin-watched-words-action.js    |  1 +
 .../admin/controllers/admin-web-hooks-show.js    |  1 +
 .../admin/controllers/admin-web-hooks.js         |  1 +
 .../admin/controllers/modals/admin-add-upload.js |  1 +
 .../controllers/modals/admin-badge-preview.js    |  1 +
 .../modals/admin-edit-badge-groupings.js         |  1 +
 .../controllers/modals/admin-install-theme.js    |  1 +
 .../modals/admin-merge-users-confirmation.js     |  1 +
 .../admin/controllers/modals/admin-reseed.js     |  1 +
 .../javascripts/admin/helpers/human-size.js      |  1 +
 .../admin/helpers/post-action-title.js           |  1 +
 .../admin/mixins/penalty-controller.js           |  1 +
 .../admin/mixins/setting-component.js            |  1 +
 .../javascripts/admin/mixins/setting-object.js   |  1 +
 .../javascripts/admin/models/admin-user.js       |  1 +
 app/assets/javascripts/admin/models/backup.js    |  1 +
 .../admin/models/color-scheme-color.js           |  1 +
 .../javascripts/admin/models/color-scheme.js     |  1 +
 app/assets/javascripts/admin/models/flag-type.js |  1 +
 app/assets/javascripts/admin/models/report.js    |  1 +
 .../javascripts/admin/models/screened-email.js   |  1 +
 .../admin/models/screened-ip-address.js          |  1 +
 .../javascripts/admin/models/screened-url.js     |  1 +
 .../javascripts/admin/models/site-setting.js     |  1 +
 .../javascripts/admin/models/staff-action-log.js |  1 +
 app/assets/javascripts/admin/models/theme.js     |  1 +
 .../javascripts/admin/models/watched-word.js     |  1 +
 .../javascripts/admin/routes/admin-backups.js    |  1 +
 .../admin/routes/admin-badges-show.js            |  1 +
 .../javascripts/admin/routes/admin-badges.js     |  1 +
 .../routes/admin-customize-email-style-edit.js   |  1 +
 .../admin/routes/admin-customize-themes-edit.js  |  1 +
 .../admin/routes/admin-customize-themes-show.js  |  1 +
 .../admin/routes/admin-site-settings-category.js |  1 +
 .../admin/routes/admin-watched-words-action.js   |  1 +
 app/assets/javascripts/admin/routes/admin.js     |  1 +
 .../javascripts/admin/services/admin-tools.js    |  1 +
 .../discourse-common/addon/helpers/bound-i18n.js |  1 +
 .../discourse-common/addon/helpers/i18n.js       |  1 +
 .../discourse-common/addon/lib/icon-library.js   |  1 +
 app/assets/javascripts/discourse-loader.js       |  6 +++++-
 .../app/components/auth-token-dropdown.js        |  1 +
 .../discourse/app/components/backup-uploader.js  |  1 +
 .../discourse/app/components/badge-selector.js   |  1 +
 .../discourse/app/components/badge-title.js      |  1 +
 .../app/components/bookmark-actions-dropdown.js  |  1 +
 .../app/components/color-picker-choice.js        |  1 +
 .../app/components/composer-action-title.js      |  1 +
 .../discourse/app/components/composer-editor.js  |  1 +
 .../app/components/composer-messages.js          |  1 +
 .../discourse/app/components/composer-title.js   |  1 +
 .../app/components/composer-user-selector.js     |  1 +
 .../components/conditional-loading-section.js    |  1 +
 .../discourse/app/components/count-i18n.js       |  1 +
 .../app/components/create-topics-notice.js       |  1 +
 .../discourse/app/components/csv-uploader.js     |  1 +
 .../discourse/app/components/d-button.js         |  1 +
 .../discourse/app/components/d-editor.js         |  1 +
 .../discourse/app/components/d-modal.js          |  1 +
 .../discourse/app/components/date-input.js       |  1 +
 .../discourse/app/components/date-picker.js      |  1 +
 .../discourse/app/components/directory-toggle.js |  1 +
 .../app/components/discourse-linked-text.js      |  1 +
 .../app/components/edit-category-settings.js     |  1 +
 .../app/components/edit-category-tab.js          |  1 +
 .../discourse/app/components/flag-action-type.js |  1 +
 .../discourse/app/components/flat-button.js      |  1 +
 .../app/components/future-date-input.js          |  1 +
 .../discourse/app/components/global-notice.js    |  1 +
 .../app/components/group-flair-inputs.js         |  1 +
 .../app/components/group-manage-logs-filter.js   |  1 +
 .../app/components/group-manage-save-button.js   |  1 +
 .../app/components/group-member-dropdown.js      |  1 +
 .../app/components/group-membership-button.js    |  1 +
 .../discourse/app/components/group-selector.js   |  1 +
 .../components/groups-form-interaction-fields.js |  1 +
 .../components/groups-form-membership-fields.js  |  1 +
 .../app/components/groups-form-profile-fields.js |  1 +
 .../discourse/app/components/images-uploader.js  |  1 +
 .../discourse/app/components/invite-panel.js     |  1 +
 .../discourse/app/components/nav-item.js         |  1 +
 .../discourse/app/components/number-field.js     |  1 +
 .../app/components/preference-checkbox.js        |  1 +
 .../discourse/app/components/reviewable-item.js  |  1 +
 .../app/components/search-advanced-options.js    |  1 +
 .../app/components/search-text-field.js          |  1 +
 .../app/components/second-factor-form.js         |  1 +
 .../discourse/app/components/share-panel.js      |  1 +
 .../discourse/app/components/share-popup.js      |  1 +
 .../app/components/shared-draft-controls.js      |  1 +
 .../discourse/app/components/suggested-topics.js |  1 +
 .../discourse/app/components/tag-groups-form.js  |  1 +
 .../discourse/app/components/tag-info.js         |  1 +
 .../discourse/app/components/tag-list.js         |  1 +
 .../app/components/tags-admin-dropdown.js        |  1 +
 .../discourse/app/components/text-field.js       |  1 +
 .../discourse/app/components/topic-entrance.js   |  1 +
 .../app/components/topic-join-group-notice.js    |  1 +
 .../discourse/app/components/topic-list-item.js  |  1 +
 .../app/components/topic-post-badges.js          |  1 +
 .../discourse/app/components/topic-progress.js   |  1 +
 .../discourse/app/components/topic-status.js     |  1 +
 .../discourse/app/components/topic-timer-info.js |  1 +
 .../app/components/user-card-contents.js         |  1 +
 .../app/components/user-flag-percentage.js       |  1 +
 .../discourse/app/controllers/about.js           |  1 +
 .../discourse/app/controllers/badges/show.js     |  1 +
 .../discourse/app/controllers/bookmark.js        |  1 +
 .../app/controllers/bulk-notification-level.js   |  1 +
 .../discourse/app/controllers/change-owner.js    |  1 +
 .../app/controllers/change-timestamp.js          |  1 +
 .../discourse/app/controllers/composer.js        |  1 +
 .../discourse/app/controllers/create-account.js  |  1 +
 .../app/controllers/discovery/topics.js          |  1 +
 .../discourse/app/controllers/edit-category.js   |  1 +
 .../app/controllers/edit-topic-timer.js          |  1 +
 .../discourse/app/controllers/exception.js       |  1 +
 .../discourse/app/controllers/feature-topic.js   |  1 +
 .../discourse/app/controllers/forgot-password.js |  1 +
 .../app/controllers/full-page-search.js          |  1 +
 .../discourse/app/controllers/grant-badge.js     |  1 +
 .../discourse/app/controllers/group.js           |  1 +
 .../discourse/app/controllers/groups-index.js    |  1 +
 .../discourse/app/controllers/groups-new.js      |  1 +
 .../discourse/app/controllers/history.js         |  1 +
 .../controllers/ignore-duration-with-username.js |  1 +
 .../discourse/app/controllers/ignore-duration.js |  1 +
 .../discourse/app/controllers/invites-show.js    |  1 +
 .../app/controllers/keyboard-shortcuts-help.js   |  1 +
 .../discourse/app/controllers/login.js           |  1 +
 .../discourse/app/controllers/move-to-topic.js   |  1 +
 .../discourse/app/controllers/password-reset.js  |  1 +
 .../app/controllers/preferences/account.js       |  1 +
 .../app/controllers/preferences/email.js         |  1 +
 .../app/controllers/preferences/emails.js        |  1 +
 .../app/controllers/preferences/interface.js     |  1 +
 .../app/controllers/preferences/notifications.js |  1 +
 .../app/controllers/preferences/profile.js       |  1 +
 .../app/controllers/preferences/second-factor.js |  1 +
 .../app/controllers/preferences/username.js      |  1 +
 .../controllers/request-group-membership-form.js |  1 +
 .../discourse/app/controllers/review-index.js    |  1 +
 .../second-factor-add-security-key.js            |  1 +
 .../app/controllers/second-factor-add-totp.js    |  1 +
 .../app/controllers/second-factor-backup-edit.js |  1 +
 .../discourse/app/controllers/tags-index.js      |  1 +
 .../discourse/app/controllers/tags-show.js       |  1 +
 .../app/controllers/topic-bulk-actions.js        |  1 +
 .../discourse/app/controllers/topic.js           |  1 +
 .../discourse/app/controllers/upload-selector.js |  1 +
 .../app/controllers/user-activity-bookmarks.js   |  1 +
 .../discourse/app/controllers/user-activity.js   |  1 +
 .../app/controllers/user-invited-show.js         |  1 +
 .../app/controllers/user-private-messages.js     |  1 +
 .../discourse/app/helpers/application.js         |  1 +
 .../discourse/app/helpers/category-link.js       |  1 +
 .../discourse/app/helpers/period-title.js        |  1 +
 .../helpers/reviewable-history-description.js    |  1 +
 .../discourse/app/helpers/reviewable-status.js   |  1 +
 .../discourse/app/helpers/theme-helpers.js       |  1 +
 .../discourse/app/helpers/user-status.js         |  1 +
 .../discourse/app/initializers/asset-version.js  |  1 +
 .../discourse/app/initializers/localization.js   |  1 +
 .../discourse/app/initializers/logout.js         |  1 +
 .../app/initializers/sharing-sources.js          |  1 +
 .../app/initializers/topic-footer-buttons.js     |  1 +
 .../javascripts/discourse/app/lib/ajax-error.js  |  1 +
 app/assets/javascripts/discourse/app/lib/ajax.js |  1 +
 .../javascripts/discourse/app/lib/bookmark.js    |  1 +
 .../javascripts/discourse/app/lib/click-track.js |  1 +
 .../javascripts/discourse/app/lib/computed.js    |  1 +
 .../discourse/app/lib/desktop-notifications.js   |  1 +
 .../javascripts/discourse/app/lib/export-csv.js  |  1 +
 .../discourse/app/lib/export-result.js           |  1 +
 .../javascripts/discourse/app/lib/formatter.js   |  1 +
 .../javascripts/discourse/app/lib/lightbox.js    |  1 +
 .../app/lib/register-topic-footer-button.js      |  1 +
 .../javascripts/discourse/app/lib/search.js      |  1 +
 .../javascripts/discourse/app/lib/show-modal.js  |  1 +
 .../discourse/app/lib/static-route-builder.js    |  1 +
 .../discourse/app/lib/theme-selector.js          |  1 +
 .../discourse/app/lib/transform-post.js          |  1 +
 .../javascripts/discourse/app/lib/uploads.js     |  1 +
 .../javascripts/discourse/app/lib/utilities.js   |  1 +
 .../javascripts/discourse/app/lib/webauthn.js    |  1 +
 .../discourse/app/mixins/name-validation.js      |  1 +
 .../discourse/app/mixins/password-validation.js  |  1 +
 .../javascripts/discourse/app/mixins/upload.js   |  1 +
 .../discourse/app/mixins/username-validation.js  |  1 +
 .../discourse/app/models/badge-grouping.js       |  1 +
 .../javascripts/discourse/app/models/bookmark.js |  1 +
 .../discourse/app/models/category-list.js        |  1 +
 .../javascripts/discourse/app/models/composer.js |  1 +
 .../discourse/app/models/group-history.js        |  1 +
 .../discourse/app/models/login-method.js         |  1 +
 .../javascripts/discourse/app/models/nav-item.js |  1 +
 .../discourse/app/models/permission-type.js      |  1 +
 .../discourse/app/models/post-stream.js          |  1 +
 .../javascripts/discourse/app/models/post.js     |  1 +
 .../discourse/app/models/reviewable.js           |  1 +
 .../discourse/app/models/topic-details.js        |  1 +
 .../javascripts/discourse/app/models/topic.js    |  1 +
 .../discourse/app/models/user-draft.js           |  1 +
 .../javascripts/discourse/app/models/user.js     |  1 +
 .../app/raw-views/list/post-count-or-badges.js   |  1 +
 .../app/raw-views/list/posts-count-column.js     |  1 +
 .../app/raw-views/topic-list-header-column.js    |  1 +
 .../discourse/app/raw-views/topic-status.js      |  1 +
 .../javascripts/discourse/app/routes/about.js    |  1 +
 .../discourse/app/routes/application.js          |  1 +
 .../discourse/app/routes/badges-index.js         |  1 +
 .../discourse/app/routes/build-category-route.js |  1 +
 .../app/routes/build-group-messages-route.js     |  1 +
 .../app/routes/build-private-messages-route.js   |  1 +
 .../discourse/app/routes/build-topic-route.js    |  1 +
 .../discourse/app/routes/discovery-categories.js |  1 +
 .../discourse/app/routes/email-login.js          |  1 +
 .../discourse/app/routes/full-page-search.js     |  1 +
 .../discourse/app/routes/group-activity-posts.js |  1 +
 .../app/routes/group-activity-topics.js          |  1 +
 .../discourse/app/routes/group-index.js          |  1 +
 .../app/routes/group-manage-interaction.js       |  1 +
 .../discourse/app/routes/group-manage-logs.js    |  1 +
 .../app/routes/group-manage-membership.js        |  1 +
 .../discourse/app/routes/group-manage-profile.js |  1 +
 .../discourse/app/routes/group-manage.js         |  1 +
 .../discourse/app/routes/group-messages.js       |  1 +
 .../discourse/app/routes/group-requests.js       |  1 +
 .../discourse/app/routes/groups-index.js         |  1 +
 .../discourse/app/routes/groups-new.js           |  1 +
 .../discourse/app/routes/invites-show.js         |  1 +
 .../discourse/app/routes/new-message.js          |  1 +
 .../discourse/app/routes/password-reset.js       |  1 +
 .../javascripts/discourse/app/routes/review.js   |  1 +
 .../discourse/app/routes/tag-groups-new.js       |  1 +
 .../discourse/app/routes/tag-groups.js           |  1 +
 .../discourse/app/routes/tags-index.js           |  1 +
 .../discourse/app/routes/tags-show.js            |  1 +
 .../user-private-messages-group-archive.js       |  1 +
 .../app/routes/user-private-messages-group.js    |  1 +
 .../app/routes/user-private-messages-tags.js     |  1 +
 .../javascripts/discourse/app/routes/user.js     |  1 +
 .../javascripts/discourse/app/routes/users.js    |  1 +
 .../discourse/app/services/logs-notice.js        |  1 +
 .../discourse/app/widgets/actions-summary.js     |  1 +
 .../bookmark-reminder-notification-item.js       |  1 +
 .../javascripts/discourse/app/widgets/button.js  |  1 +
 .../app/widgets/custom-notification-item.js      |  1 +
 .../app/widgets/default-notification-item.js     |  1 +
 .../group-message-summary-notification-item.js   |  1 +
 .../app/widgets/hamburger-categories.js          |  1 +
 .../discourse/app/widgets/hamburger-menu.js      |  1 +
 .../discourse/app/widgets/header-topic-info.js   |  1 +
 .../javascripts/discourse/app/widgets/header.js  |  1 +
 .../liked-consolidated-notification-item.js      |  1 +
 .../app/widgets/liked-notification-item.js       |  1 +
 .../javascripts/discourse/app/widgets/link.js    |  1 +
 ...bership-request-accepted-notification-item.js |  1 +
 ...hip-request-consolidated-notification-item.js |  1 +
 .../discourse/app/widgets/post-admin-menu.js     |  1 +
 .../discourse/app/widgets/post-cooked.js         |  1 +
 .../app/widgets/post-edits-indicator.js          |  1 +
 .../discourse/app/widgets/post-gap.js            |  1 +
 .../discourse/app/widgets/post-small-action.js   |  1 +
 .../javascripts/discourse/app/widgets/post.js    |  1 +
 .../discourse/app/widgets/poster-name.js         |  1 +
 .../discourse/app/widgets/private-message-map.js |  1 +
 .../discourse/app/widgets/quick-access-panel.js  |  1 +
 .../app/widgets/quick-access-profile.js          |  1 +
 .../app/widgets/search-menu-controls.js          |  1 +
 .../discourse/app/widgets/search-menu-results.js |  1 +
 .../discourse/app/widgets/time-gap.js            |  1 +
 .../app/widgets/toggle-topic-summary.js          |  1 +
 .../discourse/app/widgets/topic-admin-menu.js    |  1 +
 .../discourse/app/widgets/topic-map.js           |  1 +
 .../discourse/app/widgets/topic-status.js        |  1 +
 .../discourse/app/widgets/topic-timeline.js      |  1 +
 .../discourse/app/widgets/widget-dropdown.js     |  1 +
 .../javascripts/discourse/app/widgets/widget.js  |  1 +
 .../components/categories-admin-dropdown.js      |  1 +
 .../select-kit/components/category-chooser.js    |  1 +
 .../select-kit/components/category-drop.js       |  1 +
 .../select-kit/components/composer-actions.js    |  1 +
 .../components/future-date-input-selector.js     |  1 +
 .../select-kit/components/group-dropdown.js      |  1 +
 .../components/group-members-dropdown.js         |  1 +
 .../select-kit/components/mini-tag-chooser.js    |  1 +
 .../multi-select/multi-select-filter.js          |  1 +
 .../components/notifications-button.js           |  1 +
 .../notifications-button-row.js                  |  1 +
 .../components/notifications-filter.js           |  1 +
 .../period-chooser/period-chooser-row.js         |  1 +
 .../select-kit/components/pinned-button.js       |  1 +
 .../select-kit/components/pinned-options.js      |  1 +
 .../select-kit/components/select-kit.js          |  1 +
 .../components/select-kit/select-kit-filter.js   |  1 +
 .../components/select-kit/select-kit-row.js      |  1 +
 .../components/toolbar-popup-menu-options.js     |  1 +
 .../components/user-notifications-dropdown.js    |  1 +
 app/assets/javascripts/select-kit/mixins/tags.js |  1 +
 .../javascripts/wizard/components/invite-list.js |  1 +
 .../wizard/components/theme-preview.js           |  1 +
 .../wizard/components/wizard-field-image.js      |  1 +
 .../javascripts/wizard/components/wizard-step.js |  1 +
 .../javascripts/wizard/test/test_helper.js       |  3 ++-
 lib/pretty_text.rb                               |  7 ++++---
 lib/pretty_text/shims.js                         | 16 ++++++++++------
 test/javascripts/test_helper.js                  |  3 +--
 352 files changed, 369 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/admin/components/admin-backups-logs.js b/app/assets/javascripts/admin/components/admin-backups-logs.js
index 1837409c58..76c8cff1ac 100644
--- a/app/assets/javascripts/admin/components/admin-backups-logs.js
+++ b/app/assets/javascripts/admin/components/admin-backups-logs.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import discourseDebounce from "discourse/lib/debounce";
diff --git a/app/assets/javascripts/admin/components/admin-report-storage-stats.js b/app/assets/javascripts/admin/components/admin-report-storage-stats.js
index 61629c626e..0be7256690 100644
--- a/app/assets/javascripts/admin/components/admin-report-storage-stats.js
+++ b/app/assets/javascripts/admin/components/admin-report-storage-stats.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/admin/components/admin-report.js b/app/assets/javascripts/admin/components/admin-report.js
index 352b92fb93..b9ce9a6fdf 100644
--- a/app/assets/javascripts/admin/components/admin-report.js
+++ b/app/assets/javascripts/admin/components/admin-report.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { makeArray } from "discourse-common/lib/helpers";
 import { alias, or, and, equal, notEmpty, not } from "@ember/object/computed";
diff --git a/app/assets/javascripts/admin/components/admin-user-field-item.js b/app/assets/javascripts/admin/components/admin-user-field-item.js
index a02404de98..d59abe4437 100644
--- a/app/assets/javascripts/admin/components/admin-user-field-item.js
+++ b/app/assets/javascripts/admin/components/admin-user-field-item.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { empty } from "@ember/object/computed";
 import { scheduleOnce } from "@ember/runloop";
diff --git a/app/assets/javascripts/admin/components/admin-watched-word.js b/app/assets/javascripts/admin/components/admin-watched-word.js
index d4f5108c0f..28a1771246 100644
--- a/app/assets/javascripts/admin/components/admin-watched-word.js
+++ b/app/assets/javascripts/admin/components/admin-watched-word.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
 
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js b/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js
index a38695c735..7e76d8f6bd 100644
--- a/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js
+++ b/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event.js b/app/assets/javascripts/admin/components/admin-web-hook-event.js
index 365e22aa67..11bb2b4024 100644
--- a/app/assets/javascripts/admin/components/admin-web-hook-event.js
+++ b/app/assets/javascripts/admin/components/admin-web-hook-event.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-status.js b/app/assets/javascripts/admin/components/admin-web-hook-status.js
index 0c24edc9d6..6c1591bc4c 100644
--- a/app/assets/javascripts/admin/components/admin-web-hook-status.js
+++ b/app/assets/javascripts/admin/components/admin-web-hook-status.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
diff --git a/app/assets/javascripts/admin/components/email-styles-editor.js b/app/assets/javascripts/admin/components/email-styles-editor.js
index ef5cdb077e..93d4df6b7d 100644
--- a/app/assets/javascripts/admin/components/email-styles-editor.js
+++ b/app/assets/javascripts/admin/components/email-styles-editor.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { reads } from "@ember/object/computed";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/admin/components/embeddable-host.js b/app/assets/javascripts/admin/components/embeddable-host.js
index 1d853b8986..cc96741fed 100644
--- a/app/assets/javascripts/admin/components/embeddable-host.js
+++ b/app/assets/javascripts/admin/components/embeddable-host.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { or } from "@ember/object/computed";
diff --git a/app/assets/javascripts/admin/components/inline-edit-checkbox.js b/app/assets/javascripts/admin/components/inline-edit-checkbox.js
index 2eb2c3ee5a..2d681202b9 100644
--- a/app/assets/javascripts/admin/components/inline-edit-checkbox.js
+++ b/app/assets/javascripts/admin/components/inline-edit-checkbox.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 
diff --git a/app/assets/javascripts/admin/components/ip-lookup.js b/app/assets/javascripts/admin/components/ip-lookup.js
index b27191d617..d004555513 100644
--- a/app/assets/javascripts/admin/components/ip-lookup.js
+++ b/app/assets/javascripts/admin/components/ip-lookup.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import EmberObject from "@ember/object";
 import { later } from "@ember/runloop";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/admin/components/penalty-post-action.js b/app/assets/javascripts/admin/components/penalty-post-action.js
index 916546452c..aeea3406c8 100644
--- a/app/assets/javascripts/admin/components/penalty-post-action.js
+++ b/app/assets/javascripts/admin/components/penalty-post-action.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { equal } from "@ember/object/computed";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/admin/components/permalink-form.js b/app/assets/javascripts/admin/components/permalink-form.js
index e1b62a11df..0a15f51f57 100644
--- a/app/assets/javascripts/admin/components/permalink-form.js
+++ b/app/assets/javascripts/admin/components/permalink-form.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/admin/components/resumable-upload.js b/app/assets/javascripts/admin/components/resumable-upload.js
index 7425f174fe..ed95ea68be 100644
--- a/app/assets/javascripts/admin/components/resumable-upload.js
+++ b/app/assets/javascripts/admin/components/resumable-upload.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { later, schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
diff --git a/app/assets/javascripts/admin/components/screened-ip-address-form.js b/app/assets/javascripts/admin/components/screened-ip-address-form.js
index 48b92641b4..1046f4c210 100644
--- a/app/assets/javascripts/admin/components/screened-ip-address-form.js
+++ b/app/assets/javascripts/admin/components/screened-ip-address-form.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/admin/components/secret-value-list.js b/app/assets/javascripts/admin/components/secret-value-list.js
index ea4ecf792c..399ec5c6e7 100644
--- a/app/assets/javascripts/admin/components/secret-value-list.js
+++ b/app/assets/javascripts/admin/components/secret-value-list.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import Component from "@ember/component";
 import { on } from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/admin/components/tags-uploader.js b/app/assets/javascripts/admin/components/tags-uploader.js
index 88f4afc8d9..7530f29e21 100644
--- a/app/assets/javascripts/admin/components/tags-uploader.js
+++ b/app/assets/javascripts/admin/components/tags-uploader.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import UploadMixin from "discourse/mixins/upload";
diff --git a/app/assets/javascripts/admin/components/watched-word-form.js b/app/assets/javascripts/admin/components/watched-word-form.js
index fff5b86e26..96ddbffd7c 100644
--- a/app/assets/javascripts/admin/components/watched-word-form.js
+++ b/app/assets/javascripts/admin/components/watched-word-form.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/admin/components/watched-word-uploader.js b/app/assets/javascripts/admin/components/watched-word-uploader.js
index 05dc41c207..dceecea228 100644
--- a/app/assets/javascripts/admin/components/watched-word-uploader.js
+++ b/app/assets/javascripts/admin/components/watched-word-uploader.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys-new.js b/app/assets/javascripts/admin/controllers/admin-api-keys-new.js
index 9384e79557..eaddcfcd82 100644
--- a/app/assets/javascripts/admin/controllers/admin-api-keys-new.js
+++ b/app/assets/javascripts/admin/controllers/admin-api-keys-new.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isBlank } from "@ember/utils";
 import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/admin/controllers/admin-backups-index.js b/app/assets/javascripts/admin/controllers/admin-backups-index.js
index 45f25dd617..c3b43450b1 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-index.js
+++ b/app/assets/javascripts/admin/controllers/admin-backups-index.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { alias, equal } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/admin/controllers/admin-badges-award.js b/app/assets/javascripts/admin/controllers/admin-badges-award.js
index ef141ccac1..d7945b15c7 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges-award.js
+++ b/app/assets/javascripts/admin/controllers/admin-badges-award.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
diff --git a/app/assets/javascripts/admin/controllers/admin-badges-show.js b/app/assets/javascripts/admin/controllers/admin-badges-show.js
index a860d2f992..6a44fe4ae4 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges-show.js
+++ b/app/assets/javascripts/admin/controllers/admin-badges-show.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { reads } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js
index a27022390f..61f6e5d6e7 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { later } from "@ember/runloop";
 import Controller from "@ember/controller";
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors.js b/app/assets/javascripts/admin/controllers/admin-customize-colors.js
index e2ff119aa4..062121fc47 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors.js
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import showModal from "discourse/lib/show-modal";
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js b/app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js
index d534792b00..0daf5c7973 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js
+++ b/app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
 
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js b/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js
index 3617edca75..f6e19c6368 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js
+++ b/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js
index c3c0f4fc99..a606505692 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 import { url } from "discourse/lib/computed";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
index 5440c4260a..2c5ad32a18 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { makeArray } from "discourse-common/lib/helpers";
 import {
   empty,
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js
index 5f2ea86819..07a195b566 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { makeArray } from "discourse-common/lib/helpers";
 import { inject } from "@ember/controller";
diff --git a/app/assets/javascripts/admin/controllers/admin-email-index.js b/app/assets/javascripts/admin/controllers/admin-email-index.js
index 3433f6f55f..8fad5ff034 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-index.js
+++ b/app/assets/javascripts/admin/controllers/admin-email-index.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { empty } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/admin/controllers/admin-emojis.js b/app/assets/javascripts/admin/controllers/admin-emojis.js
index 1a49670703..96b9e1ff8e 100644
--- a/app/assets/javascripts/admin/controllers/admin-emojis.js
+++ b/app/assets/javascripts/admin/controllers/admin-emojis.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { sort } from "@ember/object/computed";
 import EmberObject, { action, computed } from "@ember/object";
 import Controller from "@ember/controller";
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js
index 789f070db1..73a780e278 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
 import { outputExportResult } from "discourse/lib/export-result";
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js
index 7ef84b45ad..059267ca40 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js
+++ b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { gt } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { scheduleOnce } from "@ember/runloop";
diff --git a/app/assets/javascripts/admin/controllers/admin-permalinks.js b/app/assets/javascripts/admin/controllers/admin-permalinks.js
index 6f0842049c..177bb4148d 100644
--- a/app/assets/javascripts/admin/controllers/admin-permalinks.js
+++ b/app/assets/javascripts/admin/controllers/admin-permalinks.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
 import Permalink from "admin/models/permalink";
diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-index.js b/app/assets/javascripts/admin/controllers/admin-search-logs-index.js
index 397b4c9b9e..ab58efbfcb 100644
--- a/app/assets/javascripts/admin/controllers/admin-search-logs-index.js
+++ b/app/assets/javascripts/admin/controllers/admin-search-logs-index.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 export const DEFAULT_PERIOD = "yearly";
 
diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-term.js b/app/assets/javascripts/admin/controllers/admin-search-logs-term.js
index 66def62c97..cd493e35bc 100644
--- a/app/assets/javascripts/admin/controllers/admin-search-logs-term.js
+++ b/app/assets/javascripts/admin/controllers/admin-search-logs-term.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 import { DEFAULT_PERIOD } from "admin/controllers/admin-search-logs-index";
 
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js b/app/assets/javascripts/admin/controllers/admin-site-settings.js
index e3225b163d..04826ca133 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings.js
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
 import Controller from "@ember/controller";
diff --git a/app/assets/javascripts/admin/controllers/admin-site-text-edit.js b/app/assets/javascripts/admin/controllers/admin-site-text-edit.js
index d24a172910..417c823824 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-text-edit.js
+++ b/app/assets/javascripts/admin/controllers/admin-site-text-edit.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js b/app/assets/javascripts/admin/controllers/admin-user-badges.js
index a42bf58ca5..63e7edca25 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-badges.js
+++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias, sort } from "@ember/object/computed";
 import { next } from "@ember/runloop";
diff --git a/app/assets/javascripts/admin/controllers/admin-user-fields.js b/app/assets/javascripts/admin/controllers/admin-user-fields.js
index b81b08f559..61e916748b 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-fields.js
+++ b/app/assets/javascripts/admin/controllers/admin-user-fields.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { gte, sort } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js b/app/assets/javascripts/admin/controllers/admin-user-index.js
index 9076e56654..de6545056f 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { notEmpty, and } from "@ember/object/computed";
 import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js b/app/assets/javascripts/admin/controllers/admin-users-list-show.js
index 8b7adb194c..23deb83955 100644
--- a/app/assets/javascripts/admin/controllers/admin-users-list-show.js
+++ b/app/assets/javascripts/admin/controllers/admin-users-list-show.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js
index cf5815da73..1a8070569f 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { or } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js
index 4332f52d9c..031ad8ee8b 100644
--- a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js
+++ b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks.js b/app/assets/javascripts/admin/controllers/admin-web-hooks.js
index f9f401e330..ec025662ef 100644
--- a/app/assets/javascripts/admin/controllers/admin-web-hooks.js
+++ b/app/assets/javascripts/admin/controllers/admin-web-hooks.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js
index 6fb2859618..da260b409e 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js
+++ b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { and, not } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js
index c5baa8eb9a..531d3ea665 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js
+++ b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { alias, map } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js
index f1d1274abd..1372f16ca9 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js
+++ b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 import { A } from "@ember/array";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js b/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js
index 16cf2034d5..7b74bc9964 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js
+++ b/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { equal, match, alias } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js b/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js
index 91dbe7d072..08ac66070c 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js
+++ b/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller, { inject as controller } from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-reseed.js b/app/assets/javascripts/admin/controllers/modals/admin-reseed.js
index 326a3a66a7..44bf29a207 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-reseed.js
+++ b/app/assets/javascripts/admin/controllers/modals/admin-reseed.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/admin/helpers/human-size.js b/app/assets/javascripts/admin/helpers/human-size.js
index cb022e64e1..fe543937f1 100644
--- a/app/assets/javascripts/admin/helpers/human-size.js
+++ b/app/assets/javascripts/admin/helpers/human-size.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { htmlHelper } from "discourse-common/lib/helpers";
 
 export default htmlHelper(size => I18n.toHumanSize(size));
diff --git a/app/assets/javascripts/admin/helpers/post-action-title.js b/app/assets/javascripts/admin/helpers/post-action-title.js
index 657aee2e9b..53b5922ae5 100644
--- a/app/assets/javascripts/admin/helpers/post-action-title.js
+++ b/app/assets/javascripts/admin/helpers/post-action-title.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Helper from "@ember/component/helper";
 
 function postActionTitle([id, nameKey]) {
diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js b/app/assets/javascripts/admin/mixins/penalty-controller.js
index 46ba124e18..73349e1067 100644
--- a/app/assets/javascripts/admin/mixins/penalty-controller.js
+++ b/app/assets/javascripts/admin/mixins/penalty-controller.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Mixin from "@ember/object/mixin";
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js b/app/assets/javascripts/admin/mixins/setting-component.js
index e7afc119f2..83dcc31e65 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js
+++ b/app/assets/javascripts/admin/mixins/setting-component.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { warn } from "@ember/debug";
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias, oneWay } from "@ember/object/computed";
diff --git a/app/assets/javascripts/admin/mixins/setting-object.js b/app/assets/javascripts/admin/mixins/setting-object.js
index 0d97e79873..bfacbedc8e 100644
--- a/app/assets/javascripts/admin/mixins/setting-object.js
+++ b/app/assets/javascripts/admin/mixins/setting-object.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { computed } from "@ember/object";
 import Mixin from "@ember/object/mixin";
diff --git a/app/assets/javascripts/admin/models/admin-user.js b/app/assets/javascripts/admin/models/admin-user.js
index 1ddb7a52ff..71b8078f6e 100644
--- a/app/assets/javascripts/admin/models/admin-user.js
+++ b/app/assets/javascripts/admin/models/admin-user.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { filter, or, gt, lt, not } from "@ember/object/computed";
 import { iconHTML } from "discourse-common/lib/icon-library";
diff --git a/app/assets/javascripts/admin/models/backup.js b/app/assets/javascripts/admin/models/backup.js
index 882173300a..2c41e1ef9d 100644
--- a/app/assets/javascripts/admin/models/backup.js
+++ b/app/assets/javascripts/admin/models/backup.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import { extractError } from "discourse/lib/ajax-error";
 import EmberObject from "@ember/object";
diff --git a/app/assets/javascripts/admin/models/color-scheme-color.js b/app/assets/javascripts/admin/models/color-scheme-color.js
index f1aa235a4b..e55fa258f8 100644
--- a/app/assets/javascripts/admin/models/color-scheme-color.js
+++ b/app/assets/javascripts/admin/models/color-scheme-color.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed, {
   observes,
   on
diff --git a/app/assets/javascripts/admin/models/color-scheme.js b/app/assets/javascripts/admin/models/color-scheme.js
index ee60097b74..5fe6337f0d 100644
--- a/app/assets/javascripts/admin/models/color-scheme.js
+++ b/app/assets/javascripts/admin/models/color-scheme.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { A } from "@ember/array";
 import ArrayProxy from "@ember/array/proxy";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/admin/models/flag-type.js b/app/assets/javascripts/admin/models/flag-type.js
index 93fb2eacc9..1079110045 100644
--- a/app/assets/javascripts/admin/models/flag-type.js
+++ b/app/assets/javascripts/admin/models/flag-type.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import RestModel from "discourse/models/rest";
 
diff --git a/app/assets/javascripts/admin/models/report.js b/app/assets/javascripts/admin/models/report.js
index 080ca4551b..2e0b448887 100644
--- a/app/assets/javascripts/admin/models/report.js
+++ b/app/assets/javascripts/admin/models/report.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { makeArray } from "discourse-common/lib/helpers";
 import { isEmpty } from "@ember/utils";
diff --git a/app/assets/javascripts/admin/models/screened-email.js b/app/assets/javascripts/admin/models/screened-email.js
index 4ef3217edf..df2fa40ff9 100644
--- a/app/assets/javascripts/admin/models/screened-email.js
+++ b/app/assets/javascripts/admin/models/screened-email.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
 import EmberObject from "@ember/object";
diff --git a/app/assets/javascripts/admin/models/screened-ip-address.js b/app/assets/javascripts/admin/models/screened-ip-address.js
index bfac17d86c..585acb9b79 100644
--- a/app/assets/javascripts/admin/models/screened-ip-address.js
+++ b/app/assets/javascripts/admin/models/screened-ip-address.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { equal } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/admin/models/screened-url.js b/app/assets/javascripts/admin/models/screened-url.js
index 31ea850778..4cde3d1261 100644
--- a/app/assets/javascripts/admin/models/screened-url.js
+++ b/app/assets/javascripts/admin/models/screened-url.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
 import EmberObject from "@ember/object";
diff --git a/app/assets/javascripts/admin/models/site-setting.js b/app/assets/javascripts/admin/models/site-setting.js
index 4edc89a1b9..01e34566f5 100644
--- a/app/assets/javascripts/admin/models/site-setting.js
+++ b/app/assets/javascripts/admin/models/site-setting.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import Setting from "admin/mixins/setting-object";
 import EmberObject from "@ember/object";
diff --git a/app/assets/javascripts/admin/models/staff-action-log.js b/app/assets/javascripts/admin/models/staff-action-log.js
index 45330b13fc..a077d054c0 100644
--- a/app/assets/javascripts/admin/models/staff-action-log.js
+++ b/app/assets/javascripts/admin/models/staff-action-log.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
 import AdminUser from "admin/models/admin-user";
diff --git a/app/assets/javascripts/admin/models/theme.js b/app/assets/javascripts/admin/models/theme.js
index e63e9e1cce..0b96660f99 100644
--- a/app/assets/javascripts/admin/models/theme.js
+++ b/app/assets/javascripts/admin/models/theme.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { get } from "@ember/object";
 import { isBlank, isEmpty } from "@ember/utils";
 import { or, gt } from "@ember/object/computed";
diff --git a/app/assets/javascripts/admin/models/watched-word.js b/app/assets/javascripts/admin/models/watched-word.js
index dac78affe1..6713a8a605 100644
--- a/app/assets/javascripts/admin/models/watched-word.js
+++ b/app/assets/javascripts/admin/models/watched-word.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import EmberObject from "@ember/object";
 
diff --git a/app/assets/javascripts/admin/routes/admin-backups.js b/app/assets/javascripts/admin/routes/admin-backups.js
index 85bfc197b9..3d517acbf1 100644
--- a/app/assets/javascripts/admin/routes/admin-backups.js
+++ b/app/assets/javascripts/admin/routes/admin-backups.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js b/app/assets/javascripts/admin/routes/admin-badges-show.js
index 4a29cfae0a..7a74db7161 100644
--- a/app/assets/javascripts/admin/routes/admin-badges-show.js
+++ b/app/assets/javascripts/admin/routes/admin-badges-show.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { get } from "@ember/object";
 import Route from "@ember/routing/route";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/admin/routes/admin-badges.js b/app/assets/javascripts/admin/routes/admin-badges.js
index 0dac4bbaa2..ab6de98504 100644
--- a/app/assets/javascripts/admin/routes/admin-badges.js
+++ b/app/assets/javascripts/admin/routes/admin-badges.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import Badge from "discourse/models/badge";
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js b/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js
index 8dcc18f0d9..d3a2b035af 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js
+++ b/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Route from "@ember/routing/route";
 export default Route.extend({
   model(params) {
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js b/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js
index 62a70f0d7c..5cb695ddcd 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Route from "@ember/routing/route";
 export default Route.extend({
   model(params) {
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-show.js b/app/assets/javascripts/admin/routes/admin-customize-themes-show.js
index 5b9ce25169..ee175a9df8 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-themes-show.js
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes-show.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Route from "@ember/routing/route";
 import { scrollTop } from "discourse/mixins/scroll-top";
 import { THEMES, COMPONENTS } from "admin/models/theme";
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings-category.js b/app/assets/javascripts/admin/routes/admin-site-settings-category.js
index b5a2f810b2..e8a9b853d4 100644
--- a/app/assets/javascripts/admin/routes/admin-site-settings-category.js
+++ b/app/assets/javascripts/admin/routes/admin-site-settings-category.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words-action.js b/app/assets/javascripts/admin/routes/admin-watched-words-action.js
index 358cfebe67..af416c48de 100644
--- a/app/assets/javascripts/admin/routes/admin-watched-words-action.js
+++ b/app/assets/javascripts/admin/routes/admin-watched-words-action.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 
diff --git a/app/assets/javascripts/admin/routes/admin.js b/app/assets/javascripts/admin/routes/admin.js
index bc4e8173ef..0a7ae99fdd 100644
--- a/app/assets/javascripts/admin/routes/admin.js
+++ b/app/assets/javascripts/admin/routes/admin.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/admin/services/admin-tools.js b/app/assets/javascripts/admin/services/admin-tools.js
index bb5e1ac06a..6193beed66 100644
--- a/app/assets/javascripts/admin/services/admin-tools.js
+++ b/app/assets/javascripts/admin/services/admin-tools.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 // A service that can act as a bridge between the front end Discourse application
 // and the admin application. Use this if you need front end code to access admin
 // modules. Inject it optionally, and if it exists go to town!
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js b/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js
index 0d58d0f5c3..2eb7a75f65 100644
--- a/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js
+++ b/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { htmlHelper } from "discourse-common/lib/helpers";
 
 export default htmlHelper((key, params) => I18n.t(key, params.hash));
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/i18n.js b/app/assets/javascripts/discourse-common/addon/helpers/i18n.js
index 902ed699bf..f9fc65aa8d 100644
--- a/app/assets/javascripts/discourse-common/addon/helpers/i18n.js
+++ b/app/assets/javascripts/discourse-common/addon/helpers/i18n.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { registerUnbound } from "discourse-common/lib/helpers";
 
 registerUnbound("i18n", (key, params) => I18n.t(key, params));
diff --git a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js
index 047cbd854c..decc668180 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { h } from "virtual-dom";
 import attributeHook from "discourse-common/lib/attribute-hook";
 import deprecated from "discourse-common/lib/deprecated";
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index e14a457bd1..8442f0cec7 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -1,7 +1,6 @@
 var define, requirejs;
 
 (function() {
-  // In future versions of ember we don't need this
   var EMBER_MODULES = {};
   var ALIASES = {
     "ember-addons/ember-computed-decorators":
@@ -9,6 +8,8 @@ var define, requirejs;
     "discourse/lib/raw-templates": "discourse-common/lib/raw-templates",
     "preload-store": "discourse/lib/preload-store"
   };
+
+  // In future versions of ember we don't need this
   if (typeof Ember !== "undefined") {
     EMBER_MODULES = {
       jquery: { default: $ },
@@ -140,6 +141,9 @@ var define, requirejs;
       },
       "@ember/object/internals": {
         guidFor: Ember.guidFor
+      },
+      I18n: {
+        default: I18n
       }
     };
   }
diff --git a/app/assets/javascripts/discourse/app/components/auth-token-dropdown.js b/app/assets/javascripts/discourse/app/components/auth-token-dropdown.js
index ef4d819ead..10bfab5e49 100644
--- a/app/assets/javascripts/discourse/app/components/auth-token-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/auth-token-dropdown.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 import { computed } from "@ember/object";
 
diff --git a/app/assets/javascripts/discourse/app/components/backup-uploader.js b/app/assets/javascripts/discourse/app/components/backup-uploader.js
index 331684ee25..93a71e0293 100644
--- a/app/assets/javascripts/discourse/app/components/backup-uploader.js
+++ b/app/assets/javascripts/discourse/app/components/backup-uploader.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/discourse/app/components/badge-selector.js b/app/assets/javascripts/discourse/app/components/badge-selector.js
index 47cf4dbd10..f4803c99d8 100644
--- a/app/assets/javascripts/discourse/app/components/badge-selector.js
+++ b/app/assets/javascripts/discourse/app/components/badge-selector.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Component from "@ember/component";
 import discourseComputed, {
   on,
diff --git a/app/assets/javascripts/discourse/app/components/badge-title.js b/app/assets/javascripts/discourse/app/components/badge-title.js
index ad80c39ddc..ab4acbeca5 100644
--- a/app/assets/javascripts/discourse/app/components/badge-title.js
+++ b/app/assets/javascripts/discourse/app/components/badge-title.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js b/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js
index 65707fa08d..9e31068f70 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { computed } from "@ember/object";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 import { action } from "@ember/object";
diff --git a/app/assets/javascripts/discourse/app/components/color-picker-choice.js b/app/assets/javascripts/discourse/app/components/color-picker-choice.js
index a384ca1920..88d51953cf 100644
--- a/app/assets/javascripts/discourse/app/components/color-picker-choice.js
+++ b/app/assets/javascripts/discourse/app/components/color-picker-choice.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 
diff --git a/app/assets/javascripts/discourse/app/components/composer-action-title.js b/app/assets/javascripts/discourse/app/components/composer-action-title.js
index 86a968154a..c48009c6ba 100644
--- a/app/assets/javascripts/discourse/app/components/composer-action-title.js
+++ b/app/assets/javascripts/discourse/app/components/composer-action-title.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { alias, equal } from "@ember/object/computed";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js
index ade361365b..de6fa4344a 100644
--- a/app/assets/javascripts/discourse/app/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/app/components/composer-editor.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { debounce, later, next, schedule, throttle } from "@ember/runloop";
 import Component from "@ember/component";
 import userSearch from "discourse/lib/user-search";
diff --git a/app/assets/javascripts/discourse/app/components/composer-messages.js b/app/assets/javascripts/discourse/app/components/composer-messages.js
index cafae73058..40f8ba1104 100644
--- a/app/assets/javascripts/discourse/app/components/composer-messages.js
+++ b/app/assets/javascripts/discourse/app/components/composer-messages.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { not } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { scheduleOnce } from "@ember/runloop";
diff --git a/app/assets/javascripts/discourse/app/components/composer-title.js b/app/assets/javascripts/discourse/app/components/composer-title.js
index b4cb3ef382..7ee2cb513a 100644
--- a/app/assets/javascripts/discourse/app/components/composer-title.js
+++ b/app/assets/javascripts/discourse/app/components/composer-title.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { alias, or } from "@ember/object/computed";
 import { debounce, next, schedule } from "@ember/runloop";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/composer-user-selector.js b/app/assets/javascripts/discourse/app/components/composer-user-selector.js
index efbc3aafdb..30c7d2fb61 100644
--- a/app/assets/javascripts/discourse/app/components/composer-user-selector.js
+++ b/app/assets/javascripts/discourse/app/components/composer-user-selector.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/app/components/conditional-loading-section.js b/app/assets/javascripts/discourse/app/components/conditional-loading-section.js
index fb6f310518..92005cd888 100644
--- a/app/assets/javascripts/discourse/app/components/conditional-loading-section.js
+++ b/app/assets/javascripts/discourse/app/components/conditional-loading-section.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Component from "@ember/component";
 export default Component.extend({
   classNames: ["conditional-loading-section"],
diff --git a/app/assets/javascripts/discourse/app/components/count-i18n.js b/app/assets/javascripts/discourse/app/components/count-i18n.js
index d0fd9bdccb..225e56755a 100644
--- a/app/assets/javascripts/discourse/app/components/count-i18n.js
+++ b/app/assets/javascripts/discourse/app/components/count-i18n.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Component from "@ember/component";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/discourse/app/components/create-topics-notice.js b/app/assets/javascripts/discourse/app/components/create-topics-notice.js
index 7db4e65df9..10bc561434 100644
--- a/app/assets/javascripts/discourse/app/components/create-topics-notice.js
+++ b/app/assets/javascripts/discourse/app/components/create-topics-notice.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/csv-uploader.js b/app/assets/javascripts/discourse/app/components/csv-uploader.js
index b3bb4e8d1f..884e7724bd 100644
--- a/app/assets/javascripts/discourse/app/components/csv-uploader.js
+++ b/app/assets/javascripts/discourse/app/components/csv-uploader.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import UploadMixin from "discourse/mixins/upload";
diff --git a/app/assets/javascripts/discourse/app/components/d-button.js b/app/assets/javascripts/discourse/app/components/d-button.js
index ad4d32a5a2..de914fe901 100644
--- a/app/assets/javascripts/discourse/app/components/d-button.js
+++ b/app/assets/javascripts/discourse/app/components/d-button.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { notEmpty, empty, equal } from "@ember/object/computed";
 import { computed } from "@ember/object";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index d1a64b4c0f..4fd5ec4bc2 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { debounce, later, next, schedule, scheduleOnce } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/d-modal.js b/app/assets/javascripts/discourse/app/components/d-modal.js
index bc81971d83..e338cc6a61 100644
--- a/app/assets/javascripts/discourse/app/components/d-modal.js
+++ b/app/assets/javascripts/discourse/app/components/d-modal.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { next } from "@ember/runloop";
 import { on } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/date-input.js b/app/assets/javascripts/discourse/app/components/date-input.js
index d4ee63ee9b..870f16f312 100644
--- a/app/assets/javascripts/discourse/app/components/date-input.js
+++ b/app/assets/javascripts/discourse/app/components/date-input.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { schedule } from "@ember/runloop";
 import { action } from "@ember/object";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/date-picker.js b/app/assets/javascripts/discourse/app/components/date-picker.js
index c10d7ecdd8..e6f0aaaefc 100644
--- a/app/assets/javascripts/discourse/app/components/date-picker.js
+++ b/app/assets/javascripts/discourse/app/components/date-picker.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 /* global Pikaday:true */
diff --git a/app/assets/javascripts/discourse/app/components/directory-toggle.js b/app/assets/javascripts/discourse/app/components/directory-toggle.js
index a2dcec81b5..a2e288caee 100644
--- a/app/assets/javascripts/discourse/app/components/directory-toggle.js
+++ b/app/assets/javascripts/discourse/app/components/directory-toggle.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
diff --git a/app/assets/javascripts/discourse/app/components/discourse-linked-text.js b/app/assets/javascripts/discourse/app/components/discourse-linked-text.js
index 55240d4ee2..fae43c2d2b 100644
--- a/app/assets/javascripts/discourse/app/components/discourse-linked-text.js
+++ b/app/assets/javascripts/discourse/app/components/discourse-linked-text.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 
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 d3b647984e..5844e45d0c 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-settings.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-settings.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { empty, and } from "@ember/object/computed";
 import { setting } from "discourse/lib/computed";
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-tab.js b/app/assets/javascripts/discourse/app/components/edit-category-tab.js
index 9fa7984533..ebd5e9dc5d 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-tab.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-tab.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/flag-action-type.js b/app/assets/javascripts/discourse/app/components/flag-action-type.js
index a88356c9a9..93de11b8fb 100644
--- a/app/assets/javascripts/discourse/app/components/flag-action-type.js
+++ b/app/assets/javascripts/discourse/app/components/flag-action-type.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { and, not, equal } from "@ember/object/computed";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/flat-button.js b/app/assets/javascripts/discourse/app/components/flat-button.js
index f2f38fdc27..e58a27e942 100644
--- a/app/assets/javascripts/discourse/app/components/flat-button.js
+++ b/app/assets/javascripts/discourse/app/components/flat-button.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 
diff --git a/app/assets/javascripts/discourse/app/components/future-date-input.js b/app/assets/javascripts/discourse/app/components/future-date-input.js
index d54e68e782..37be61c202 100644
--- a/app/assets/javascripts/discourse/app/components/future-date-input.js
+++ b/app/assets/javascripts/discourse/app/components/future-date-input.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { equal, and, empty, or } from "@ember/object/computed";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/global-notice.js b/app/assets/javascripts/discourse/app/components/global-notice.js
index abaf730672..15eb1bf376 100644
--- a/app/assets/javascripts/discourse/app/components/global-notice.js
+++ b/app/assets/javascripts/discourse/app/components/global-notice.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { bind, cancel } from "@ember/runloop";
 import Component from "@ember/component";
 import LogsNotice from "discourse/services/logs-notice";
diff --git a/app/assets/javascripts/discourse/app/components/group-flair-inputs.js b/app/assets/javascripts/discourse/app/components/group-flair-inputs.js
index 81b17bcb8d..7b432e1271 100644
--- a/app/assets/javascripts/discourse/app/components/group-flair-inputs.js
+++ b/app/assets/javascripts/discourse/app/components/group-flair-inputs.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { debounce } from "@ember/runloop";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.js b/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.js
index 98e0c16cdd..70851af62e 100644
--- a/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.js
+++ b/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 
diff --git a/app/assets/javascripts/discourse/app/components/group-manage-save-button.js b/app/assets/javascripts/discourse/app/components/group-manage-save-button.js
index d1304834ee..91a6adbed7 100644
--- a/app/assets/javascripts/discourse/app/components/group-manage-save-button.js
+++ b/app/assets/javascripts/discourse/app/components/group-manage-save-button.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { popupAjaxError } from "discourse/lib/ajax-error";
diff --git a/app/assets/javascripts/discourse/app/components/group-member-dropdown.js b/app/assets/javascripts/discourse/app/components/group-member-dropdown.js
index 1ee959ecb2..20d6ab90ad 100644
--- a/app/assets/javascripts/discourse/app/components/group-member-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/group-member-dropdown.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 import { computed } from "@ember/object";
 
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 7c808bc3eb..88985455dd 100644
--- a/app/assets/javascripts/discourse/app/components/group-membership-button.js
+++ b/app/assets/javascripts/discourse/app/components/group-membership-button.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
diff --git a/app/assets/javascripts/discourse/app/components/group-selector.js b/app/assets/javascripts/discourse/app/components/group-selector.js
index a743cde69f..4fb6d1be08 100644
--- a/app/assets/javascripts/discourse/app/components/group-selector.js
+++ b/app/assets/javascripts/discourse/app/components/group-selector.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import Component from "@ember/component";
 import discourseComputed, {
diff --git a/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js b/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js
index 62a7d17ece..9f20ed3101 100644
--- a/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js
+++ b/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 
diff --git a/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.js b/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.js
index 78903d6c5a..b20f952864 100644
--- a/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.js
+++ b/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { computed } from "@ember/object";
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 39077b9257..e3da6d0c7b 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
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { not } from "@ember/object/computed";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/images-uploader.js b/app/assets/javascripts/discourse/app/components/images-uploader.js
index 4e68324b0c..15eb2d41f6 100644
--- a/app/assets/javascripts/discourse/app/components/images-uploader.js
+++ b/app/assets/javascripts/discourse/app/components/images-uploader.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import UploadMixin from "discourse/mixins/upload";
diff --git a/app/assets/javascripts/discourse/app/components/invite-panel.js b/app/assets/javascripts/discourse/app/components/invite-panel.js
index 0748809131..0c3b832ab0 100644
--- a/app/assets/javascripts/discourse/app/components/invite-panel.js
+++ b/app/assets/javascripts/discourse/app/components/invite-panel.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import EmberObject, { computed } from "@ember/object";
diff --git a/app/assets/javascripts/discourse/app/components/nav-item.js b/app/assets/javascripts/discourse/app/components/nav-item.js
index 7358e2ded6..8c2037ef0a 100644
--- a/app/assets/javascripts/discourse/app/components/nav-item.js
+++ b/app/assets/javascripts/discourse/app/components/nav-item.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { inject as service } from "@ember/service";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/number-field.js b/app/assets/javascripts/discourse/app/components/number-field.js
index feb61f36b1..42a8e46af7 100644
--- a/app/assets/javascripts/discourse/app/components/number-field.js
+++ b/app/assets/javascripts/discourse/app/components/number-field.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import TextField from "discourse/components/text-field";
 import discourseComputed from "discourse-common/utils/decorators";
 
diff --git a/app/assets/javascripts/discourse/app/components/preference-checkbox.js b/app/assets/javascripts/discourse/app/components/preference-checkbox.js
index 83ad27853f..f78f767ac3 100644
--- a/app/assets/javascripts/discourse/app/components/preference-checkbox.js
+++ b/app/assets/javascripts/discourse/app/components/preference-checkbox.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-item.js b/app/assets/javascripts/discourse/app/components/reviewable-item.js
index a0ef38412f..3d028a8bf8 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-item.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-item.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/discourse/app/components/search-advanced-options.js b/app/assets/javascripts/discourse/app/components/search-advanced-options.js
index 274e62e7b1..a2f6fcfd6a 100644
--- a/app/assets/javascripts/discourse/app/components/search-advanced-options.js
+++ b/app/assets/javascripts/discourse/app/components/search-advanced-options.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { debounce, scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import { observes } from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/app/components/search-text-field.js b/app/assets/javascripts/discourse/app/components/search-text-field.js
index fc6ca86c08..f11456c722 100644
--- a/app/assets/javascripts/discourse/app/components/search-text-field.js
+++ b/app/assets/javascripts/discourse/app/components/search-text-field.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { on } from "discourse-common/utils/decorators";
 import TextField from "discourse/components/text-field";
diff --git a/app/assets/javascripts/discourse/app/components/second-factor-form.js b/app/assets/javascripts/discourse/app/components/second-factor-form.js
index 47bd68a487..43d37862db 100644
--- a/app/assets/javascripts/discourse/app/components/second-factor-form.js
+++ b/app/assets/javascripts/discourse/app/components/second-factor-form.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
diff --git a/app/assets/javascripts/discourse/app/components/share-panel.js b/app/assets/javascripts/discourse/app/components/share-panel.js
index 00bfd41082..5094854bcf 100644
--- a/app/assets/javascripts/discourse/app/components/share-panel.js
+++ b/app/assets/javascripts/discourse/app/components/share-panel.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/share-popup.js b/app/assets/javascripts/discourse/app/components/share-popup.js
index 9a9db6a494..a329da8d07 100644
--- a/app/assets/javascripts/discourse/app/components/share-popup.js
+++ b/app/assets/javascripts/discourse/app/components/share-popup.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { bind, scheduleOnce, later } from "@ember/runloop";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/shared-draft-controls.js b/app/assets/javascripts/discourse/app/components/shared-draft-controls.js
index 4374380e03..5a9e6436c8 100644
--- a/app/assets/javascripts/discourse/app/components/shared-draft-controls.js
+++ b/app/assets/javascripts/discourse/app/components/shared-draft-controls.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 
diff --git a/app/assets/javascripts/discourse/app/components/suggested-topics.js b/app/assets/javascripts/discourse/app/components/suggested-topics.js
index 11dc410ab0..e5c5a40f15 100644
--- a/app/assets/javascripts/discourse/app/components/suggested-topics.js
+++ b/app/assets/javascripts/discourse/app/components/suggested-topics.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { computed, get } from "@ember/object";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/tag-groups-form.js b/app/assets/javascripts/discourse/app/components/tag-groups-form.js
index b77220cd08..a1df90730c 100644
--- a/app/assets/javascripts/discourse/app/components/tag-groups-form.js
+++ b/app/assets/javascripts/discourse/app/components/tag-groups-form.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/tag-info.js b/app/assets/javascripts/discourse/app/components/tag-info.js
index 5f2d0e7d6c..c4fa98ccc2 100644
--- a/app/assets/javascripts/discourse/app/components/tag-info.js
+++ b/app/assets/javascripts/discourse/app/components/tag-info.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
diff --git a/app/assets/javascripts/discourse/app/components/tag-list.js b/app/assets/javascripts/discourse/app/components/tag-list.js
index d02bd3b8ca..b76c9291e8 100644
--- a/app/assets/javascripts/discourse/app/components/tag-list.js
+++ b/app/assets/javascripts/discourse/app/components/tag-list.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { sort } from "@ember/object/computed";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js b/app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js
index 58f28b3796..9aa1725e33 100644
--- a/app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 import { computed } from "@ember/object";
 
diff --git a/app/assets/javascripts/discourse/app/components/text-field.js b/app/assets/javascripts/discourse/app/components/text-field.js
index affad24e80..f9c13ec4d3 100644
--- a/app/assets/javascripts/discourse/app/components/text-field.js
+++ b/app/assets/javascripts/discourse/app/components/text-field.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import TextField from "@ember/component/text-field";
 import discourseComputed from "discourse-common/utils/decorators";
 import { siteDir, isRTL, isLTR } from "discourse/lib/text-direction";
diff --git a/app/assets/javascripts/discourse/app/components/topic-entrance.js b/app/assets/javascripts/discourse/app/components/topic-entrance.js
index b27a7fe15d..8ecde647f5 100644
--- a/app/assets/javascripts/discourse/app/components/topic-entrance.js
+++ b/app/assets/javascripts/discourse/app/components/topic-entrance.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/topic-join-group-notice.js b/app/assets/javascripts/discourse/app/components/topic-join-group-notice.js
index 07db8b0fa8..216a3fb2b0 100644
--- a/app/assets/javascripts/discourse/app/components/topic-join-group-notice.js
+++ b/app/assets/javascripts/discourse/app/components/topic-join-group-notice.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 
diff --git a/app/assets/javascripts/discourse/app/components/topic-list-item.js b/app/assets/javascripts/discourse/app/components/topic-list-item.js
index 2460dc8fc9..030903a389 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list-item.js
+++ b/app/assets/javascripts/discourse/app/components/topic-list-item.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/topic-post-badges.js b/app/assets/javascripts/discourse/app/components/topic-post-badges.js
index 9d3cded17f..5c38d52712 100644
--- a/app/assets/javascripts/discourse/app/components/topic-post-badges.js
+++ b/app/assets/javascripts/discourse/app/components/topic-post-badges.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Component from "@ember/component";
 
 export default Component.extend({
diff --git a/app/assets/javascripts/discourse/app/components/topic-progress.js b/app/assets/javascripts/discourse/app/components/topic-progress.js
index 35e40d175e..3f927bd78c 100644
--- a/app/assets/javascripts/discourse/app/components/topic-progress.js
+++ b/app/assets/javascripts/discourse/app/components/topic-progress.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { alias } from "@ember/object/computed";
 import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/topic-status.js b/app/assets/javascripts/discourse/app/components/topic-status.js
index 569292eb5e..8edf0d991c 100644
--- a/app/assets/javascripts/discourse/app/components/topic-status.js
+++ b/app/assets/javascripts/discourse/app/components/topic-status.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
diff --git a/app/assets/javascripts/discourse/app/components/topic-timer-info.js b/app/assets/javascripts/discourse/app/components/topic-timer-info.js
index 30eb177ca3..6bbde2a217 100644
--- a/app/assets/javascripts/discourse/app/components/topic-timer-info.js
+++ b/app/assets/javascripts/discourse/app/components/topic-timer-info.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { cancel, later } from "@ember/runloop";
 import Component from "@ember/component";
diff --git a/app/assets/javascripts/discourse/app/components/user-card-contents.js b/app/assets/javascripts/discourse/app/components/user-card-contents.js
index 7b92e86011..ee19f26d82 100644
--- a/app/assets/javascripts/discourse/app/components/user-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/user-card-contents.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { alias, gte, and, gt, not, or } from "@ember/object/computed";
 import EmberObject, { set } from "@ember/object";
diff --git a/app/assets/javascripts/discourse/app/components/user-flag-percentage.js b/app/assets/javascripts/discourse/app/components/user-flag-percentage.js
index 60e3c4ccef..ee15cae965 100644
--- a/app/assets/javascripts/discourse/app/components/user-flag-percentage.js
+++ b/app/assets/javascripts/discourse/app/components/user-flag-percentage.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 
diff --git a/app/assets/javascripts/discourse/app/controllers/about.js b/app/assets/javascripts/discourse/app/controllers/about.js
index 9225421995..dcae91a154 100644
--- a/app/assets/javascripts/discourse/app/controllers/about.js
+++ b/app/assets/javascripts/discourse/app/controllers/about.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { gt } from "@ember/object/computed";
 import Controller from "@ember/controller";
diff --git a/app/assets/javascripts/discourse/app/controllers/badges/show.js b/app/assets/javascripts/discourse/app/controllers/badges/show.js
index ae89c737ea..0ab92eac3f 100644
--- a/app/assets/javascripts/discourse/app/controllers/badges/show.js
+++ b/app/assets/javascripts/discourse/app/controllers/badges/show.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller, { inject as controller } from "@ember/controller";
 import EmberObject from "@ember/object";
 import Badge from "discourse/models/badge";
diff --git a/app/assets/javascripts/discourse/app/controllers/bookmark.js b/app/assets/javascripts/discourse/app/controllers/bookmark.js
index 9653fd9266..aa731cb62d 100644
--- a/app/assets/javascripts/discourse/app/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/app/controllers/bookmark.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { and } from "@ember/object/computed";
 import { next } from "@ember/runloop";
 import { action } from "@ember/object";
diff --git a/app/assets/javascripts/discourse/app/controllers/bulk-notification-level.js b/app/assets/javascripts/discourse/app/controllers/bulk-notification-level.js
index 7e0642c9fc..7750d25570 100644
--- a/app/assets/javascripts/discourse/app/controllers/bulk-notification-level.js
+++ b/app/assets/javascripts/discourse/app/controllers/bulk-notification-level.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { empty } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
diff --git a/app/assets/javascripts/discourse/app/controllers/change-owner.js b/app/assets/javascripts/discourse/app/controllers/change-owner.js
index 0380faf86c..247703e11d 100644
--- a/app/assets/javascripts/discourse/app/controllers/change-owner.js
+++ b/app/assets/javascripts/discourse/app/controllers/change-owner.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
diff --git a/app/assets/javascripts/discourse/app/controllers/change-timestamp.js b/app/assets/javascripts/discourse/app/controllers/change-timestamp.js
index 5cb6bdba53..b81c1928a9 100644
--- a/app/assets/javascripts/discourse/app/controllers/change-timestamp.js
+++ b/app/assets/javascripts/discourse/app/controllers/change-timestamp.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { next } from "@ember/runloop";
diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index 836ce63cb7..d8aed927ff 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { and, or, alias, reads } from "@ember/object/computed";
 import { debounce } from "@ember/runloop";
diff --git a/app/assets/javascripts/discourse/app/controllers/create-account.js b/app/assets/javascripts/discourse/app/controllers/create-account.js
index b0567c07b4..1593ff95ad 100644
--- a/app/assets/javascripts/discourse/app/controllers/create-account.js
+++ b/app/assets/javascripts/discourse/app/controllers/create-account.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { A } from "@ember/array";
 import { isEmpty } from "@ember/utils";
 import { notEmpty, or, not } from "@ember/object/computed";
diff --git a/app/assets/javascripts/discourse/app/controllers/discovery/topics.js b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
index 0ea6c59918..2434da4c61 100644
--- a/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
+++ b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias, not, gt, empty, notEmpty, equal } from "@ember/object/computed";
 import { inject as controller } from "@ember/controller";
diff --git a/app/assets/javascripts/discourse/app/controllers/edit-category.js b/app/assets/javascripts/discourse/app/controllers/edit-category.js
index e014cd1ea2..3cf6cea182 100644
--- a/app/assets/javascripts/discourse/app/controllers/edit-category.js
+++ b/app/assets/javascripts/discourse/app/controllers/edit-category.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
diff --git a/app/assets/javascripts/discourse/app/controllers/edit-topic-timer.js b/app/assets/javascripts/discourse/app/controllers/edit-topic-timer.js
index 926c2492b9..ca2ae26738 100644
--- a/app/assets/javascripts/discourse/app/controllers/edit-topic-timer.js
+++ b/app/assets/javascripts/discourse/app/controllers/edit-topic-timer.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import EmberObject, { setProperties } from "@ember/object";
 import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/app/controllers/exception.js b/app/assets/javascripts/discourse/app/controllers/exception.js
index e9a5f10d16..4dd27f3c58 100644
--- a/app/assets/javascripts/discourse/app/controllers/exception.js
+++ b/app/assets/javascripts/discourse/app/controllers/exception.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { equal, gte, none, alias } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import Controller from "@ember/controller";
diff --git a/app/assets/javascripts/discourse/app/controllers/feature-topic.js b/app/assets/javascripts/discourse/app/controllers/feature-topic.js
index 8fb459a145..253bce8eb2 100644
--- a/app/assets/javascripts/discourse/app/controllers/feature-topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/feature-topic.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
diff --git a/app/assets/javascripts/discourse/app/controllers/forgot-password.js b/app/assets/javascripts/discourse/app/controllers/forgot-password.js
index 0f667683ad..9821947e3b 100644
--- a/app/assets/javascripts/discourse/app/controllers/forgot-password.js
+++ b/app/assets/javascripts/discourse/app/controllers/forgot-password.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import Controller from "@ember/controller";
diff --git a/app/assets/javascripts/discourse/app/controllers/full-page-search.js b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
index 5a92e4a453..1183a8eec2 100644
--- a/app/assets/javascripts/discourse/app/controllers/full-page-search.js
+++ b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { or } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
diff --git a/app/assets/javascripts/discourse/app/controllers/grant-badge.js b/app/assets/javascripts/discourse/app/controllers/grant-badge.js
index a3cd4e11e8..edc034f917 100644
--- a/app/assets/javascripts/discourse/app/controllers/grant-badge.js
+++ b/app/assets/javascripts/discourse/app/controllers/grant-badge.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
diff --git a/app/assets/javascripts/discourse/app/controllers/group.js b/app/assets/javascripts/discourse/app/controllers/group.js
index 3ec4f40128..bb77f1a632 100644
--- a/app/assets/javascripts/discourse/app/controllers/group.js
+++ b/app/assets/javascripts/discourse/app/controllers/group.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import EmberObject, { action } from "@ember/object";
 import Controller, { inject as controller } from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/app/controllers/groups-index.js b/app/assets/javascripts/discourse/app/controllers/groups-index.js
index 228527bc38..5373a60a61 100644
--- a/app/assets/javascripts/discourse/app/controllers/groups-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/groups-index.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller, { inject as controller } from "@ember/controller";
 import { debounce } from "@ember/runloop";
 import { action } from "@ember/object";
diff --git a/app/assets/javascripts/discourse/app/controllers/groups-new.js b/app/assets/javascripts/discourse/app/controllers/groups-new.js
index 25cefd4300..94a598cbf1 100644
--- a/app/assets/javascripts/discourse/app/controllers/groups-new.js
+++ b/app/assets/javascripts/discourse/app/controllers/groups-new.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { action } from "@ember/object";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/discourse/app/controllers/history.js b/app/assets/javascripts/discourse/app/controllers/history.js
index 5a34f292cf..b368a283fb 100644
--- a/app/assets/javascripts/discourse/app/controllers/history.js
+++ b/app/assets/javascripts/discourse/app/controllers/history.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias, gt, not, or, equal } from "@ember/object/computed";
 import Controller from "@ember/controller";
diff --git a/app/assets/javascripts/discourse/app/controllers/ignore-duration-with-username.js b/app/assets/javascripts/discourse/app/controllers/ignore-duration-with-username.js
index 491c496df7..6dbb39407c 100644
--- a/app/assets/javascripts/discourse/app/controllers/ignore-duration-with-username.js
+++ b/app/assets/javascripts/discourse/app/controllers/ignore-duration-with-username.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
diff --git a/app/assets/javascripts/discourse/app/controllers/ignore-duration.js b/app/assets/javascripts/discourse/app/controllers/ignore-duration.js
index c78b73cbb3..95d9b42e94 100644
--- a/app/assets/javascripts/discourse/app/controllers/ignore-duration.js
+++ b/app/assets/javascripts/discourse/app/controllers/ignore-duration.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
diff --git a/app/assets/javascripts/discourse/app/controllers/invites-show.js b/app/assets/javascripts/discourse/app/controllers/invites-show.js
index 58b7ca3685..b421b77058 100644
--- a/app/assets/javascripts/discourse/app/controllers/invites-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/invites-show.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { alias, notEmpty } from "@ember/object/computed";
 import Controller from "@ember/controller";
diff --git a/app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js
index 2b0df87882..2199e6b711 100644
--- a/app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js
+++ b/app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
diff --git a/app/assets/javascripts/discourse/app/controllers/login.js b/app/assets/javascripts/discourse/app/controllers/login.js
index 993b1a398f..4bc124b060 100644
--- a/app/assets/javascripts/discourse/app/controllers/login.js
+++ b/app/assets/javascripts/discourse/app/controllers/login.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { alias, or, readOnly } from "@ember/object/computed";
diff --git a/app/assets/javascripts/discourse/app/controllers/move-to-topic.js b/app/assets/javascripts/discourse/app/controllers/move-to-topic.js
index b2b7dd7f10..424aef2628 100644
--- a/app/assets/javascripts/discourse/app/controllers/move-to-topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/move-to-topic.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { alias, equal } from "@ember/object/computed";
 import { next } from "@ember/runloop";
diff --git a/app/assets/javascripts/discourse/app/controllers/password-reset.js b/app/assets/javascripts/discourse/app/controllers/password-reset.js
index efdf9db0ae..764396c21e 100644
--- a/app/assets/javascripts/discourse/app/controllers/password-reset.js
+++ b/app/assets/javascripts/discourse/app/controllers/password-reset.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { alias, or, readOnly } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/account.js b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
index 463d5b9283..584440ed0c 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/account.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { not, or, gt } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { iconHTML } from "discourse-common/lib/icon-library";
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/email.js b/app/assets/javascripts/discourse/app/controllers/preferences/email.js
index 413638e0db..f79e4d15d1 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/email.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/email.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { empty, or } from "@ember/object/computed";
 import Controller from "@ember/controller";
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/emails.js b/app/assets/javascripts/discourse/app/controllers/preferences/emails.js
index 880b50f7bd..02babe32bc 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/emails.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/emails.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { equal } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
index ea68080ccd..1ad85b7d7b 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { setDefaultHomepage } from "discourse/lib/utilities";
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js b/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js
index 5667a55fda..f738f82bb6 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import { popupAjaxError } from "discourse/lib/ajax-error";
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/profile.js b/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
index 7eac6c1067..88ec0ee4ad 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js b/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
index 67c7b58c83..b9aae2ab24 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { alias, and } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/username.js b/app/assets/javascripts/discourse/app/controllers/preferences/username.js
index 3b5cbfc477..8e13897bd9 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/username.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/username.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { empty, or } from "@ember/object/computed";
 import Controller from "@ember/controller";
diff --git a/app/assets/javascripts/discourse/app/controllers/request-group-membership-form.js b/app/assets/javascripts/discourse/app/controllers/request-group-membership-form.js
index bbb54d03dd..4d9a34726e 100644
--- a/app/assets/javascripts/discourse/app/controllers/request-group-membership-form.js
+++ b/app/assets/javascripts/discourse/app/controllers/request-group-membership-form.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
diff --git a/app/assets/javascripts/discourse/app/controllers/review-index.js b/app/assets/javascripts/discourse/app/controllers/review-index.js
index 462fa69715..103edb4f07 100644
--- a/app/assets/javascripts/discourse/app/controllers/review-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/review-index.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
 import { isPresent } from "@ember/utils";
diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-add-security-key.js b/app/assets/javascripts/discourse/app/controllers/second-factor-add-security-key.js
index 935f71e263..82a2a1fc4b 100644
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-add-security-key.js
+++ b/app/assets/javascripts/discourse/app/controllers/second-factor-add-security-key.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import {
diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js b/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
index 10752e41c7..2e86bc1272 100644
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
+++ b/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js b/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js
index 3ef9658cc4..e3b91e3be3 100644
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js
+++ b/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { alias } from "@ember/object/computed";
 import { later } from "@ember/runloop";
 import Controller from "@ember/controller";
diff --git a/app/assets/javascripts/discourse/app/controllers/tags-index.js b/app/assets/javascripts/discourse/app/controllers/tags-index.js
index 14473df9a5..75806c5fe6 100644
--- a/app/assets/javascripts/discourse/app/controllers/tags-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/tags-index.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias, notEmpty } from "@ember/object/computed";
 import Controller from "@ember/controller";
diff --git a/app/assets/javascripts/discourse/app/controllers/tags-show.js b/app/assets/javascripts/discourse/app/controllers/tags-show.js
index e9bb719116..55e5d87362 100644
--- a/app/assets/javascripts/discourse/app/controllers/tags-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/tags-show.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { alias } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
index 723e7fee54..c4776d5fc9 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { empty, alias } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index 3ec58a5556..2c2ebdc7fe 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isPresent, isEmpty } from "@ember/utils";
 import { or, and, not, alias } from "@ember/object/computed";
 import EmberObject from "@ember/object";
diff --git a/app/assets/javascripts/discourse/app/controllers/upload-selector.js b/app/assets/javascripts/discourse/app/controllers/upload-selector.js
index eae9a3a2bb..0c9b1d139d 100644
--- a/app/assets/javascripts/discourse/app/controllers/upload-selector.js
+++ b/app/assets/javascripts/discourse/app/controllers/upload-selector.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { equal } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
diff --git a/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
index 0f44eeea8c..48cd32aa86 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 import showModal from "discourse/lib/show-modal";
 import { Promise } from "rsvp";
diff --git a/app/assets/javascripts/discourse/app/controllers/user-activity.js b/app/assets/javascripts/discourse/app/controllers/user-activity.js
index 12333fcf07..be48af10f5 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-activity.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-activity.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { alias } from "@ember/object/computed";
 import { inject as service } from "@ember/service";
 import Controller, { inject as controller } from "@ember/controller";
diff --git a/app/assets/javascripts/discourse/app/controllers/user-invited-show.js b/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
index 0b8c07d0fb..eb3a42fd14 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { equal, reads, gte } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import Invite from "discourse/models/invite";
diff --git a/app/assets/javascripts/discourse/app/controllers/user-private-messages.js b/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
index 79cdc7822a..d079104584 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias, equal, and } from "@ember/object/computed";
 import { inject as service } from "@ember/service";
diff --git a/app/assets/javascripts/discourse/app/helpers/application.js b/app/assets/javascripts/discourse/app/helpers/application.js
index 8ebdb1c51f..86599a5fe7 100644
--- a/app/assets/javascripts/discourse/app/helpers/application.js
+++ b/app/assets/javascripts/discourse/app/helpers/application.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { registerUnbound } from "discourse-common/lib/helpers";
 import {
   longDate,
diff --git a/app/assets/javascripts/discourse/app/helpers/category-link.js b/app/assets/javascripts/discourse/app/helpers/category-link.js
index 2f4699b18c..9530c26982 100644
--- a/app/assets/javascripts/discourse/app/helpers/category-link.js
+++ b/app/assets/javascripts/discourse/app/helpers/category-link.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { get } from "@ember/object";
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { isRTL } from "discourse/lib/text-direction";
diff --git a/app/assets/javascripts/discourse/app/helpers/period-title.js b/app/assets/javascripts/discourse/app/helpers/period-title.js
index 4a16e20f35..a99d8e2396 100644
--- a/app/assets/javascripts/discourse/app/helpers/period-title.js
+++ b/app/assets/javascripts/discourse/app/helpers/period-title.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { htmlHelper } from "discourse-common/lib/helpers";
 
 const TITLE_SUBS = {
diff --git a/app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js b/app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js
index 61b8897f84..c944046f0e 100644
--- a/app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js
+++ b/app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { htmlHelper } from "discourse-common/lib/helpers";
 import { htmlStatus } from "discourse/helpers/reviewable-status";
 import { EDITED } from "discourse/models/reviewable-history";
diff --git a/app/assets/javascripts/discourse/app/helpers/reviewable-status.js b/app/assets/javascripts/discourse/app/helpers/reviewable-status.js
index 4dcc12d3a4..646e1bab48 100644
--- a/app/assets/javascripts/discourse/app/helpers/reviewable-status.js
+++ b/app/assets/javascripts/discourse/app/helpers/reviewable-status.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { htmlHelper } from "discourse-common/lib/helpers";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import {
diff --git a/app/assets/javascripts/discourse/app/helpers/theme-helpers.js b/app/assets/javascripts/discourse/app/helpers/theme-helpers.js
index eae8dfa66d..1e878656f5 100644
--- a/app/assets/javascripts/discourse/app/helpers/theme-helpers.js
+++ b/app/assets/javascripts/discourse/app/helpers/theme-helpers.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { registerUnbound } from "discourse-common/lib/helpers";
 import deprecated from "discourse-common/lib/deprecated";
 
diff --git a/app/assets/javascripts/discourse/app/helpers/user-status.js b/app/assets/javascripts/discourse/app/helpers/user-status.js
index b3706ca4e2..999190dd2e 100644
--- a/app/assets/javascripts/discourse/app/helpers/user-status.js
+++ b/app/assets/javascripts/discourse/app/helpers/user-status.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { htmlHelper } from "discourse-common/lib/helpers";
 import { escapeExpression } from "discourse/lib/utilities";
diff --git a/app/assets/javascripts/discourse/app/initializers/asset-version.js b/app/assets/javascripts/discourse/app/initializers/asset-version.js
index f685d1b091..fad499c8bb 100644
--- a/app/assets/javascripts/discourse/app/initializers/asset-version.js
+++ b/app/assets/javascripts/discourse/app/initializers/asset-version.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { later } from "@ember/runloop";
 //  Subscribe to "asset-version" change events via the Message Bus
 export default {
diff --git a/app/assets/javascripts/discourse/app/initializers/localization.js b/app/assets/javascripts/discourse/app/initializers/localization.js
index cbe50e53d5..fd5a364d6c 100644
--- a/app/assets/javascripts/discourse/app/initializers/localization.js
+++ b/app/assets/javascripts/discourse/app/initializers/localization.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 export default {
   name: "localization",
   after: "inject-objects",
diff --git a/app/assets/javascripts/discourse/app/initializers/logout.js b/app/assets/javascripts/discourse/app/initializers/logout.js
index 067dd1e538..76ccca2736 100644
--- a/app/assets/javascripts/discourse/app/initializers/logout.js
+++ b/app/assets/javascripts/discourse/app/initializers/logout.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import logout from "discourse/lib/logout";
 
 let _showingLogout = false;
diff --git a/app/assets/javascripts/discourse/app/initializers/sharing-sources.js b/app/assets/javascripts/discourse/app/initializers/sharing-sources.js
index d3ca4fde2a..b56e174f04 100644
--- a/app/assets/javascripts/discourse/app/initializers/sharing-sources.js
+++ b/app/assets/javascripts/discourse/app/initializers/sharing-sources.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Sharing from "discourse/lib/sharing";
 
 export default {
diff --git a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
index 54d0853204..a13ccd2219 100644
--- a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
+++ b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import showModal from "discourse/lib/show-modal";
 import { registerTopicFooterButton } from "discourse/lib/register-topic-footer-button";
 import { formattedReminderTime } from "discourse/lib/bookmark";
diff --git a/app/assets/javascripts/discourse/app/lib/ajax-error.js b/app/assets/javascripts/discourse/app/lib/ajax-error.js
index de96aa14d8..e0c16b5e45 100644
--- a/app/assets/javascripts/discourse/app/lib/ajax-error.js
+++ b/app/assets/javascripts/discourse/app/lib/ajax-error.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 export function extractError(error, defaultMessage) {
   if (error instanceof Error) {
     // eslint-disable-next-line no-console
diff --git a/app/assets/javascripts/discourse/app/lib/ajax.js b/app/assets/javascripts/discourse/app/lib/ajax.js
index e2318b0d9f..1eadcda626 100644
--- a/app/assets/javascripts/discourse/app/lib/ajax.js
+++ b/app/assets/javascripts/discourse/app/lib/ajax.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { run } from "@ember/runloop";
 import userPresent from "discourse/lib/user-presence";
 import logout from "discourse/lib/logout";
diff --git a/app/assets/javascripts/discourse/app/lib/bookmark.js b/app/assets/javascripts/discourse/app/lib/bookmark.js
index ebad371313..7de4a468bd 100644
--- a/app/assets/javascripts/discourse/app/lib/bookmark.js
+++ b/app/assets/javascripts/discourse/app/lib/bookmark.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 export function formattedReminderTime(reminderAt, timezone) {
   let reminderAtDate = moment.tz(reminderAt, timezone);
   let formatted = reminderAtDate.format(I18n.t("dates.time"));
diff --git a/app/assets/javascripts/discourse/app/lib/click-track.js b/app/assets/javascripts/discourse/app/lib/click-track.js
index 31bf961ab4..199a90ea43 100644
--- a/app/assets/javascripts/discourse/app/lib/click-track.js
+++ b/app/assets/javascripts/discourse/app/lib/click-track.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { later } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import DiscourseURL from "discourse/lib/url";
diff --git a/app/assets/javascripts/discourse/app/lib/computed.js b/app/assets/javascripts/discourse/app/lib/computed.js
index 321ea32464..68eefd11da 100644
--- a/app/assets/javascripts/discourse/app/lib/computed.js
+++ b/app/assets/javascripts/discourse/app/lib/computed.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { computed } from "@ember/object";
 import { htmlSafe as htmlSafeTemplateHelper } from "@ember/template";
 
diff --git a/app/assets/javascripts/discourse/app/lib/desktop-notifications.js b/app/assets/javascripts/discourse/app/lib/desktop-notifications.js
index 394d9a6dd3..48b5eb0956 100644
--- a/app/assets/javascripts/discourse/app/lib/desktop-notifications.js
+++ b/app/assets/javascripts/discourse/app/lib/desktop-notifications.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { later } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import KeyValueStore from "discourse/lib/key-value-store";
diff --git a/app/assets/javascripts/discourse/app/lib/export-csv.js b/app/assets/javascripts/discourse/app/lib/export-csv.js
index 41957f9bf5..4f4a1e4b9c 100644
--- a/app/assets/javascripts/discourse/app/lib/export-csv.js
+++ b/app/assets/javascripts/discourse/app/lib/export-csv.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
diff --git a/app/assets/javascripts/discourse/app/lib/export-result.js b/app/assets/javascripts/discourse/app/lib/export-result.js
index da1058d564..9865d9b461 100644
--- a/app/assets/javascripts/discourse/app/lib/export-result.js
+++ b/app/assets/javascripts/discourse/app/lib/export-result.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 export function outputExportResult(result) {
   if (result.success) {
     bootbox.alert(I18n.t("admin.export_csv.success"));
diff --git a/app/assets/javascripts/discourse/app/lib/formatter.js b/app/assets/javascripts/discourse/app/lib/formatter.js
index 2a93f590d7..e953567e05 100644
--- a/app/assets/javascripts/discourse/app/lib/formatter.js
+++ b/app/assets/javascripts/discourse/app/lib/formatter.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 export function shortDate(date) {
   return moment(date).format(I18n.t("dates.medium.date_year"));
 }
diff --git a/app/assets/javascripts/discourse/app/lib/lightbox.js b/app/assets/javascripts/discourse/app/lib/lightbox.js
index 34330c44c8..3f16b7f423 100644
--- a/app/assets/javascripts/discourse/app/lib/lightbox.js
+++ b/app/assets/javascripts/discourse/app/lib/lightbox.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import loadScript from "discourse/lib/load-script";
 import { escapeExpression } from "discourse/lib/utilities";
 import { renderIcon } from "discourse-common/lib/icon-library";
diff --git a/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js b/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js
index ecac09a89a..bfc975809d 100644
--- a/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js
+++ b/app/assets/javascripts/discourse/app/lib/register-topic-footer-button.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import error from "@ember/error";
 import { computed } from "@ember/object";
 
diff --git a/app/assets/javascripts/discourse/app/lib/search.js b/app/assets/javascripts/discourse/app/lib/search.js
index fb0dd3c493..07eb6ad7bf 100644
--- a/app/assets/javascripts/discourse/app/lib/search.js
+++ b/app/assets/javascripts/discourse/app/lib/search.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/discourse/app/lib/show-modal.js b/app/assets/javascripts/discourse/app/lib/show-modal.js
index 18e6e8698f..514c49f3ee 100644
--- a/app/assets/javascripts/discourse/app/lib/show-modal.js
+++ b/app/assets/javascripts/discourse/app/lib/show-modal.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { dasherize } from "@ember/string";
 
 export default function(name, opts) {
diff --git a/app/assets/javascripts/discourse/app/lib/static-route-builder.js b/app/assets/javascripts/discourse/app/lib/static-route-builder.js
index 91cda0f0be..06b4eae431 100644
--- a/app/assets/javascripts/discourse/app/lib/static-route-builder.js
+++ b/app/assets/javascripts/discourse/app/lib/static-route-builder.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import StaticPage from "discourse/models/static-page";
 import DiscourseURL, { jumpToElement } from "discourse/lib/url";
diff --git a/app/assets/javascripts/discourse/app/lib/theme-selector.js b/app/assets/javascripts/discourse/app/lib/theme-selector.js
index e0ba455d4f..9d293fe312 100644
--- a/app/assets/javascripts/discourse/app/lib/theme-selector.js
+++ b/app/assets/javascripts/discourse/app/lib/theme-selector.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import deprecated from "discourse-common/lib/deprecated";
 
diff --git a/app/assets/javascripts/discourse/app/lib/transform-post.js b/app/assets/javascripts/discourse/app/lib/transform-post.js
index c48f042160..9c39e41713 100644
--- a/app/assets/javascripts/discourse/app/lib/transform-post.js
+++ b/app/assets/javascripts/discourse/app/lib/transform-post.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { userPath } from "discourse/lib/url";
 
diff --git a/app/assets/javascripts/discourse/app/lib/uploads.js b/app/assets/javascripts/discourse/app/lib/uploads.js
index 37ded98e4f..9ceafaf0a0 100644
--- a/app/assets/javascripts/discourse/app/lib/uploads.js
+++ b/app/assets/javascripts/discourse/app/lib/uploads.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isAppleDevice } from "discourse/lib/utilities";
 
 function isGUID(value) {
diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js
index 2c108e0f77..cb805206a3 100644
--- a/app/assets/javascripts/discourse/app/lib/utilities.js
+++ b/app/assets/javascripts/discourse/app/lib/utilities.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { escape } from "pretty-text/sanitizer";
 import toMarkdown from "discourse/lib/to-markdown";
 import Handlebars from "handlebars";
diff --git a/app/assets/javascripts/discourse/app/lib/webauthn.js b/app/assets/javascripts/discourse/app/lib/webauthn.js
index 6b3e81ad4d..4ada688d26 100644
--- a/app/assets/javascripts/discourse/app/lib/webauthn.js
+++ b/app/assets/javascripts/discourse/app/lib/webauthn.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 export function stringToBuffer(str) {
   let buffer = new ArrayBuffer(str.length);
   let byteView = new Uint8Array(buffer);
diff --git a/app/assets/javascripts/discourse/app/mixins/name-validation.js b/app/assets/javascripts/discourse/app/mixins/name-validation.js
index 3b377f095b..a36ea6a7c0 100644
--- a/app/assets/javascripts/discourse/app/mixins/name-validation.js
+++ b/app/assets/javascripts/discourse/app/mixins/name-validation.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import discourseComputed from "discourse-common/utils/decorators";
 import Mixin from "@ember/object/mixin";
diff --git a/app/assets/javascripts/discourse/app/mixins/password-validation.js b/app/assets/javascripts/discourse/app/mixins/password-validation.js
index d660f5208b..355e9bf4b4 100644
--- a/app/assets/javascripts/discourse/app/mixins/password-validation.js
+++ b/app/assets/javascripts/discourse/app/mixins/password-validation.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import discourseComputed from "discourse-common/utils/decorators";
 import Mixin from "@ember/object/mixin";
diff --git a/app/assets/javascripts/discourse/app/mixins/upload.js b/app/assets/javascripts/discourse/app/mixins/upload.js
index 1066a1e95a..85fdbc0031 100644
--- a/app/assets/javascripts/discourse/app/mixins/upload.js
+++ b/app/assets/javascripts/discourse/app/mixins/upload.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { warn } from "@ember/debug";
 import {
   displayErrorForUpload,
diff --git a/app/assets/javascripts/discourse/app/mixins/username-validation.js b/app/assets/javascripts/discourse/app/mixins/username-validation.js
index fcd0ea89ba..081956f5c7 100644
--- a/app/assets/javascripts/discourse/app/mixins/username-validation.js
+++ b/app/assets/javascripts/discourse/app/mixins/username-validation.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import discourseDebounce from "discourse/lib/debounce";
 import { setting } from "discourse/lib/computed";
diff --git a/app/assets/javascripts/discourse/app/models/badge-grouping.js b/app/assets/javascripts/discourse/app/models/badge-grouping.js
index 6dbaa5c7c6..eed25171b6 100644
--- a/app/assets/javascripts/discourse/app/models/badge-grouping.js
+++ b/app/assets/javascripts/discourse/app/models/badge-grouping.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import RestModel from "discourse/models/rest";
 
diff --git a/app/assets/javascripts/discourse/app/models/bookmark.js b/app/assets/javascripts/discourse/app/models/bookmark.js
index 3fc34c7280..a55fb80ace 100644
--- a/app/assets/javascripts/discourse/app/models/bookmark.js
+++ b/app/assets/javascripts/discourse/app/models/bookmark.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Category from "discourse/models/category";
 import User from "discourse/models/user";
 import { isRTL } from "discourse/lib/text-direction";
diff --git a/app/assets/javascripts/discourse/app/models/category-list.js b/app/assets/javascripts/discourse/app/models/category-list.js
index e3c028e156..754fe4d29c 100644
--- a/app/assets/javascripts/discourse/app/models/category-list.js
+++ b/app/assets/javascripts/discourse/app/models/category-list.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import ArrayProxy from "@ember/array/proxy";
 import PreloadStore from "discourse/lib/preload-store";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index 0f88c24218..4f87162d3a 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { reads, equal, not, or, and } from "@ember/object/computed";
 import EmberObject, { set } from "@ember/object";
diff --git a/app/assets/javascripts/discourse/app/models/group-history.js b/app/assets/javascripts/discourse/app/models/group-history.js
index 8c22e9af5f..05702e6d47 100644
--- a/app/assets/javascripts/discourse/app/models/group-history.js
+++ b/app/assets/javascripts/discourse/app/models/group-history.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import RestModel from "discourse/models/rest";
 
diff --git a/app/assets/javascripts/discourse/app/models/login-method.js b/app/assets/javascripts/discourse/app/models/login-method.js
index 2a3ab489c4..0f2f1a46c0 100644
--- a/app/assets/javascripts/discourse/app/models/login-method.js
+++ b/app/assets/javascripts/discourse/app/models/login-method.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import EmberObject from "@ember/object";
 import { updateCsrfToken } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/discourse/app/models/nav-item.js b/app/assets/javascripts/discourse/app/models/nav-item.js
index 83330778e0..412cd8ec2e 100644
--- a/app/assets/javascripts/discourse/app/models/nav-item.js
+++ b/app/assets/javascripts/discourse/app/models/nav-item.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { emojiUnescape } from "discourse/lib/text";
 import Category from "discourse/models/category";
diff --git a/app/assets/javascripts/discourse/app/models/permission-type.js b/app/assets/javascripts/discourse/app/models/permission-type.js
index f6ad56c928..698c2db228 100644
--- a/app/assets/javascripts/discourse/app/models/permission-type.js
+++ b/app/assets/javascripts/discourse/app/models/permission-type.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import EmberObject from "@ember/object";
 
diff --git a/app/assets/javascripts/discourse/app/models/post-stream.js b/app/assets/javascripts/discourse/app/models/post-stream.js
index 4accbbe268..2c56f8ef8a 100644
--- a/app/assets/javascripts/discourse/app/models/post-stream.js
+++ b/app/assets/javascripts/discourse/app/models/post-stream.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { or, not, and } from "@ember/object/computed";
diff --git a/app/assets/javascripts/discourse/app/models/post.js b/app/assets/javascripts/discourse/app/models/post.js
index e0565b420c..35b600aae2 100644
--- a/app/assets/javascripts/discourse/app/models/post.js
+++ b/app/assets/javascripts/discourse/app/models/post.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import EmberObject, { computed, get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
diff --git a/app/assets/javascripts/discourse/app/models/reviewable.js b/app/assets/javascripts/discourse/app/models/reviewable.js
index fd6ad39603..05efaab627 100644
--- a/app/assets/javascripts/discourse/app/models/reviewable.js
+++ b/app/assets/javascripts/discourse/app/models/reviewable.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
diff --git a/app/assets/javascripts/discourse/app/models/topic-details.js b/app/assets/javascripts/discourse/app/models/topic-details.js
index 849b072bd5..50449aa0e3 100644
--- a/app/assets/javascripts/discourse/app/models/topic-details.js
+++ b/app/assets/javascripts/discourse/app/models/topic-details.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js
index f7ec6ead94..af4b87fbe2 100644
--- a/app/assets/javascripts/discourse/app/models/topic.js
+++ b/app/assets/javascripts/discourse/app/models/topic.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import EmberObject from "@ember/object";
 import { not, notEmpty, equal, and, or } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/discourse/app/models/user-draft.js b/app/assets/javascripts/discourse/app/models/user-draft.js
index 6e31ae3b2f..2f45738222 100644
--- a/app/assets/javascripts/discourse/app/models/user-draft.js
+++ b/app/assets/javascripts/discourse/app/models/user-draft.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import RestModel from "discourse/models/rest";
 import { postUrl } from "discourse/lib/utilities";
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index f5435ae63e..6e287ccf72 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { A } from "@ember/array";
 import { isEmpty } from "@ember/utils";
 import { gt, equal, or } from "@ember/object/computed";
diff --git a/app/assets/javascripts/discourse/app/raw-views/list/post-count-or-badges.js b/app/assets/javascripts/discourse/app/raw-views/list/post-count-or-badges.js
index dd301f8b72..8f81b19fd5 100644
--- a/app/assets/javascripts/discourse/app/raw-views/list/post-count-or-badges.js
+++ b/app/assets/javascripts/discourse/app/raw-views/list/post-count-or-badges.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { or, and } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/discourse/app/raw-views/list/posts-count-column.js b/app/assets/javascripts/discourse/app/raw-views/list/posts-count-column.js
index 12a27f3a22..7e38e6c618 100644
--- a/app/assets/javascripts/discourse/app/raw-views/list/posts-count-column.js
+++ b/app/assets/javascripts/discourse/app/raw-views/list/posts-count-column.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import EmberObject from "@ember/object";
 import { fmt } from "discourse/lib/computed";
diff --git a/app/assets/javascripts/discourse/app/raw-views/topic-list-header-column.js b/app/assets/javascripts/discourse/app/raw-views/topic-list-header-column.js
index dfa6e7039c..09aa7216ab 100644
--- a/app/assets/javascripts/discourse/app/raw-views/topic-list-header-column.js
+++ b/app/assets/javascripts/discourse/app/raw-views/topic-list-header-column.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import EmberObject from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 
diff --git a/app/assets/javascripts/discourse/app/raw-views/topic-status.js b/app/assets/javascripts/discourse/app/raw-views/topic-status.js
index d6b2c74999..6c973bafa2 100644
--- a/app/assets/javascripts/discourse/app/raw-views/topic-status.js
+++ b/app/assets/javascripts/discourse/app/raw-views/topic-status.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import EmberObject from "@ember/object";
 
diff --git a/app/assets/javascripts/discourse/app/routes/about.js b/app/assets/javascripts/discourse/app/routes/about.js
index f7d88a8421..95568535ef 100644
--- a/app/assets/javascripts/discourse/app/routes/about.js
+++ b/app/assets/javascripts/discourse/app/routes/about.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import DiscourseRoute from "discourse/routes/discourse";
 
diff --git a/app/assets/javascripts/discourse/app/routes/application.js b/app/assets/javascripts/discourse/app/routes/application.js
index f164375bc7..b30dffebf8 100644
--- a/app/assets/javascripts/discourse/app/routes/application.js
+++ b/app/assets/javascripts/discourse/app/routes/application.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { once } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/discourse/app/routes/badges-index.js b/app/assets/javascripts/discourse/app/routes/badges-index.js
index 142a9ef807..35fcb42b92 100644
--- a/app/assets/javascripts/discourse/app/routes/badges-index.js
+++ b/app/assets/javascripts/discourse/app/routes/badges-index.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import Badge from "discourse/models/badge";
 import PreloadStore from "discourse/lib/preload-store";
diff --git a/app/assets/javascripts/discourse/app/routes/build-category-route.js b/app/assets/javascripts/discourse/app/routes/build-category-route.js
index f46ea868f7..18fe88124f 100644
--- a/app/assets/javascripts/discourse/app/routes/build-category-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-category-route.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import {
   filterQueryParams,
diff --git a/app/assets/javascripts/discourse/app/routes/build-group-messages-route.js b/app/assets/javascripts/discourse/app/routes/build-group-messages-route.js
index 1a2724af9c..f23a42c2c6 100644
--- a/app/assets/javascripts/discourse/app/routes/build-group-messages-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-group-messages-route.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import UserTopicListRoute from "discourse/routes/user-topic-list";
 
 export default type => {
diff --git a/app/assets/javascripts/discourse/app/routes/build-private-messages-route.js b/app/assets/javascripts/discourse/app/routes/build-private-messages-route.js
index abae09a255..bbd39fc5ba 100644
--- a/app/assets/javascripts/discourse/app/routes/build-private-messages-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-private-messages-route.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import UserTopicListRoute from "discourse/routes/user-topic-list";
 import { findOrResetCachedTopicList } from "discourse/lib/cached-topic-list";
 import UserAction from "discourse/models/user-action";
diff --git a/app/assets/javascripts/discourse/app/routes/build-topic-route.js b/app/assets/javascripts/discourse/app/routes/build-topic-route.js
index 10a67214d9..8d34c8380e 100644
--- a/app/assets/javascripts/discourse/app/routes/build-topic-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-topic-route.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import { queryParams } from "discourse/controllers/discovery-sortable";
 import { defaultHomepage } from "discourse/lib/utilities";
diff --git a/app/assets/javascripts/discourse/app/routes/discovery-categories.js b/app/assets/javascripts/discourse/app/routes/discovery-categories.js
index 600c0ccdc8..b162a57b13 100644
--- a/app/assets/javascripts/discourse/app/routes/discovery-categories.js
+++ b/app/assets/javascripts/discourse/app/routes/discovery-categories.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import EmberObject from "@ember/object";
 import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
diff --git a/app/assets/javascripts/discourse/app/routes/email-login.js b/app/assets/javascripts/discourse/app/routes/email-login.js
index 34936369b1..f12757a624 100644
--- a/app/assets/javascripts/discourse/app/routes/email-login.js
+++ b/app/assets/javascripts/discourse/app/routes/email-login.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 
diff --git a/app/assets/javascripts/discourse/app/routes/full-page-search.js b/app/assets/javascripts/discourse/app/routes/full-page-search.js
index e95c6f8745..d2abf0decf 100644
--- a/app/assets/javascripts/discourse/app/routes/full-page-search.js
+++ b/app/assets/javascripts/discourse/app/routes/full-page-search.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 import {
diff --git a/app/assets/javascripts/discourse/app/routes/group-activity-posts.js b/app/assets/javascripts/discourse/app/routes/group-activity-posts.js
index 86b35b6534..52a8eced19 100644
--- a/app/assets/javascripts/discourse/app/routes/group-activity-posts.js
+++ b/app/assets/javascripts/discourse/app/routes/group-activity-posts.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { get } from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 
diff --git a/app/assets/javascripts/discourse/app/routes/group-activity-topics.js b/app/assets/javascripts/discourse/app/routes/group-activity-topics.js
index 04da3aeb67..63945d6b61 100644
--- a/app/assets/javascripts/discourse/app/routes/group-activity-topics.js
+++ b/app/assets/javascripts/discourse/app/routes/group-activity-topics.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/group-index.js b/app/assets/javascripts/discourse/app/routes/group-index.js
index a543c89613..cdd8310709 100644
--- a/app/assets/javascripts/discourse/app/routes/group-index.js
+++ b/app/assets/javascripts/discourse/app/routes/group-index.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import showModal from "discourse/lib/show-modal";
 import { action } from "@ember/object";
diff --git a/app/assets/javascripts/discourse/app/routes/group-manage-interaction.js b/app/assets/javascripts/discourse/app/routes/group-manage-interaction.js
index e273e2d22f..8b8b79997b 100644
--- a/app/assets/javascripts/discourse/app/routes/group-manage-interaction.js
+++ b/app/assets/javascripts/discourse/app/routes/group-manage-interaction.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/group-manage-logs.js b/app/assets/javascripts/discourse/app/routes/group-manage-logs.js
index ad49c84619..39c6aa9dcf 100644
--- a/app/assets/javascripts/discourse/app/routes/group-manage-logs.js
+++ b/app/assets/javascripts/discourse/app/routes/group-manage-logs.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/group-manage-membership.js b/app/assets/javascripts/discourse/app/routes/group-manage-membership.js
index 1ded3e2b07..b0ac11428b 100644
--- a/app/assets/javascripts/discourse/app/routes/group-manage-membership.js
+++ b/app/assets/javascripts/discourse/app/routes/group-manage-membership.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/group-manage-profile.js b/app/assets/javascripts/discourse/app/routes/group-manage-profile.js
index b720151ff4..04769be406 100644
--- a/app/assets/javascripts/discourse/app/routes/group-manage-profile.js
+++ b/app/assets/javascripts/discourse/app/routes/group-manage-profile.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/group-manage.js b/app/assets/javascripts/discourse/app/routes/group-manage.js
index 70b5f053c7..ec052e047e 100644
--- a/app/assets/javascripts/discourse/app/routes/group-manage.js
+++ b/app/assets/javascripts/discourse/app/routes/group-manage.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/group-messages.js b/app/assets/javascripts/discourse/app/routes/group-messages.js
index 1a605ec168..65ca96fcff 100644
--- a/app/assets/javascripts/discourse/app/routes/group-messages.js
+++ b/app/assets/javascripts/discourse/app/routes/group-messages.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/group-requests.js b/app/assets/javascripts/discourse/app/routes/group-requests.js
index 548529cab0..2d317236c4 100644
--- a/app/assets/javascripts/discourse/app/routes/group-requests.js
+++ b/app/assets/javascripts/discourse/app/routes/group-requests.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/groups-index.js b/app/assets/javascripts/discourse/app/routes/groups-index.js
index dff87c3cb2..0659986cd9 100644
--- a/app/assets/javascripts/discourse/app/routes/groups-index.js
+++ b/app/assets/javascripts/discourse/app/routes/groups-index.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/groups-new.js b/app/assets/javascripts/discourse/app/routes/groups-new.js
index 67f76347d9..9da8dca7da 100644
--- a/app/assets/javascripts/discourse/app/routes/groups-new.js
+++ b/app/assets/javascripts/discourse/app/routes/groups-new.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import Group from "discourse/models/group";
 
diff --git a/app/assets/javascripts/discourse/app/routes/invites-show.js b/app/assets/javascripts/discourse/app/routes/invites-show.js
index ded630dc8c..c236a9a5db 100644
--- a/app/assets/javascripts/discourse/app/routes/invites-show.js
+++ b/app/assets/javascripts/discourse/app/routes/invites-show.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import PreloadStore from "discourse/lib/preload-store";
 
diff --git a/app/assets/javascripts/discourse/app/routes/new-message.js b/app/assets/javascripts/discourse/app/routes/new-message.js
index c85001cbbf..b3d37af8b8 100644
--- a/app/assets/javascripts/discourse/app/routes/new-message.js
+++ b/app/assets/javascripts/discourse/app/routes/new-message.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { next } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import User from "discourse/models/user";
diff --git a/app/assets/javascripts/discourse/app/routes/password-reset.js b/app/assets/javascripts/discourse/app/routes/password-reset.js
index 58e690fac8..f637715f50 100644
--- a/app/assets/javascripts/discourse/app/routes/password-reset.js
+++ b/app/assets/javascripts/discourse/app/routes/password-reset.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import PreloadStore from "discourse/lib/preload-store";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/discourse/app/routes/review.js b/app/assets/javascripts/discourse/app/routes/review.js
index 9c28f22c54..dc8b26241c 100644
--- a/app/assets/javascripts/discourse/app/routes/review.js
+++ b/app/assets/javascripts/discourse/app/routes/review.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/tag-groups-new.js b/app/assets/javascripts/discourse/app/routes/tag-groups-new.js
index 64c460f512..5194595b6a 100644
--- a/app/assets/javascripts/discourse/app/routes/tag-groups-new.js
+++ b/app/assets/javascripts/discourse/app/routes/tag-groups-new.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/tag-groups.js b/app/assets/javascripts/discourse/app/routes/tag-groups.js
index 1010b04c03..c171de7018 100644
--- a/app/assets/javascripts/discourse/app/routes/tag-groups.js
+++ b/app/assets/javascripts/discourse/app/routes/tag-groups.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
diff --git a/app/assets/javascripts/discourse/app/routes/tags-index.js b/app/assets/javascripts/discourse/app/routes/tags-index.js
index 99cd3a211d..f6e8ceb412 100644
--- a/app/assets/javascripts/discourse/app/routes/tags-index.js
+++ b/app/assets/javascripts/discourse/app/routes/tags-index.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import Tag from "discourse/models/tag";
 
diff --git a/app/assets/javascripts/discourse/app/routes/tags-show.js b/app/assets/javascripts/discourse/app/routes/tags-show.js
index f598e4fe24..74a7ad5efb 100644
--- a/app/assets/javascripts/discourse/app/routes/tags-show.js
+++ b/app/assets/javascripts/discourse/app/routes/tags-show.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import Composer from "discourse/models/composer";
 import showModal from "discourse/lib/show-modal";
diff --git a/app/assets/javascripts/discourse/app/routes/user-private-messages-group-archive.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-group-archive.js
index 0aece428d2..74ad2f5d14 100644
--- a/app/assets/javascripts/discourse/app/routes/user-private-messages-group-archive.js
+++ b/app/assets/javascripts/discourse/app/routes/user-private-messages-group-archive.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import createPMRoute from "discourse/routes/build-private-messages-route";
 import { findOrResetCachedTopicList } from "discourse/lib/cached-topic-list";
 
diff --git a/app/assets/javascripts/discourse/app/routes/user-private-messages-group.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-group.js
index 971cb506cb..f3e606ae96 100644
--- a/app/assets/javascripts/discourse/app/routes/user-private-messages-group.js
+++ b/app/assets/javascripts/discourse/app/routes/user-private-messages-group.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import createPMRoute from "discourse/routes/build-private-messages-route";
 import { findOrResetCachedTopicList } from "discourse/lib/cached-topic-list";
 
diff --git a/app/assets/javascripts/discourse/app/routes/user-private-messages-tags.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-tags.js
index cfe2d026bb..d6bb30ad1a 100644
--- a/app/assets/javascripts/discourse/app/routes/user-private-messages-tags.js
+++ b/app/assets/javascripts/discourse/app/routes/user-private-messages-tags.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
diff --git a/app/assets/javascripts/discourse/app/routes/user.js b/app/assets/javascripts/discourse/app/routes/user.js
index 85248c9038..c5619412d1 100644
--- a/app/assets/javascripts/discourse/app/routes/user.js
+++ b/app/assets/javascripts/discourse/app/routes/user.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import User from "discourse/models/user";
 
diff --git a/app/assets/javascripts/discourse/app/routes/users.js b/app/assets/javascripts/discourse/app/routes/users.js
index 76f310d11b..a67e287e44 100644
--- a/app/assets/javascripts/discourse/app/routes/users.js
+++ b/app/assets/javascripts/discourse/app/routes/users.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import { longDate } from "discourse/lib/formatter";
 
diff --git a/app/assets/javascripts/discourse/app/services/logs-notice.js b/app/assets/javascripts/discourse/app/services/logs-notice.js
index 217e1bad7f..c84dadb944 100644
--- a/app/assets/javascripts/discourse/app/services/logs-notice.js
+++ b/app/assets/javascripts/discourse/app/services/logs-notice.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
 import discourseComputed, {
diff --git a/app/assets/javascripts/discourse/app/widgets/actions-summary.js b/app/assets/javascripts/discourse/app/widgets/actions-summary.js
index 56c32a64ea..25e0035897 100644
--- a/app/assets/javascripts/discourse/app/widgets/actions-summary.js
+++ b/app/assets/javascripts/discourse/app/widgets/actions-summary.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
 import { avatarFor } from "discourse/widgets/post";
 import { h } from "virtual-dom";
diff --git a/app/assets/javascripts/discourse/app/widgets/bookmark-reminder-notification-item.js b/app/assets/javascripts/discourse/app/widgets/bookmark-reminder-notification-item.js
index 1a6691dda8..12a8062f27 100644
--- a/app/assets/javascripts/discourse/app/widgets/bookmark-reminder-notification-item.js
+++ b/app/assets/javascripts/discourse/app/widgets/bookmark-reminder-notification-item.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidgetFrom } from "discourse/widgets/widget";
 import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import { formatUsername } from "discourse/lib/utilities";
diff --git a/app/assets/javascripts/discourse/app/widgets/button.js b/app/assets/javascripts/discourse/app/widgets/button.js
index ee6f8c46d2..fbc6036992 100644
--- a/app/assets/javascripts/discourse/app/widgets/button.js
+++ b/app/assets/javascripts/discourse/app/widgets/button.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { h } from "virtual-dom";
diff --git a/app/assets/javascripts/discourse/app/widgets/custom-notification-item.js b/app/assets/javascripts/discourse/app/widgets/custom-notification-item.js
index ec567b51e5..be52488ec7 100644
--- a/app/assets/javascripts/discourse/app/widgets/custom-notification-item.js
+++ b/app/assets/javascripts/discourse/app/widgets/custom-notification-item.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidgetFrom } from "discourse/widgets/widget";
 import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import { formatUsername } from "discourse/lib/utilities";
diff --git a/app/assets/javascripts/discourse/app/widgets/default-notification-item.js b/app/assets/javascripts/discourse/app/widgets/default-notification-item.js
index 60e4c94ed1..e44a35d341 100644
--- a/app/assets/javascripts/discourse/app/widgets/default-notification-item.js
+++ b/app/assets/javascripts/discourse/app/widgets/default-notification-item.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import RawHtml from "discourse/widgets/raw-html";
diff --git a/app/assets/javascripts/discourse/app/widgets/group-message-summary-notification-item.js b/app/assets/javascripts/discourse/app/widgets/group-message-summary-notification-item.js
index b3162a33e3..33d6f4a113 100644
--- a/app/assets/javascripts/discourse/app/widgets/group-message-summary-notification-item.js
+++ b/app/assets/javascripts/discourse/app/widgets/group-message-summary-notification-item.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidgetFrom } from "discourse/widgets/widget";
 import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 
diff --git a/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js b/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js
index 3a51939f33..dd1b1693e5 100644
--- a/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js
+++ b/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 import { number } from "discourse/lib/formatter";
diff --git a/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js b/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
index 48af267c16..91aefaaa89 100644
--- a/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { later } from "@ember/runloop";
 import { createWidget, applyDecorators } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
diff --git a/app/assets/javascripts/discourse/app/widgets/header-topic-info.js b/app/assets/javascripts/discourse/app/widgets/header-topic-info.js
index 0958dcd8e4..64a81513e7 100644
--- a/app/assets/javascripts/discourse/app/widgets/header-topic-info.js
+++ b/app/assets/javascripts/discourse/app/widgets/header-topic-info.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { applyDecorators, createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 import { iconNode } from "discourse-common/lib/icon-library";
diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index f2e80b8dae..ca4d73c925 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { get } from "@ember/object";
 import { schedule } from "@ember/runloop";
 import { createWidget } from "discourse/widgets/widget";
diff --git a/app/assets/javascripts/discourse/app/widgets/liked-consolidated-notification-item.js b/app/assets/javascripts/discourse/app/widgets/liked-consolidated-notification-item.js
index bc4ce3f43f..aca00298d5 100644
--- a/app/assets/javascripts/discourse/app/widgets/liked-consolidated-notification-item.js
+++ b/app/assets/javascripts/discourse/app/widgets/liked-consolidated-notification-item.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { createWidgetFrom } from "discourse/widgets/widget";
 import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
diff --git a/app/assets/javascripts/discourse/app/widgets/liked-notification-item.js b/app/assets/javascripts/discourse/app/widgets/liked-notification-item.js
index e24762edd4..c2ff54809c 100644
--- a/app/assets/javascripts/discourse/app/widgets/liked-notification-item.js
+++ b/app/assets/javascripts/discourse/app/widgets/liked-notification-item.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidgetFrom } from "discourse/widgets/widget";
 import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import { formatUsername } from "discourse/lib/utilities";
diff --git a/app/assets/javascripts/discourse/app/widgets/link.js b/app/assets/javascripts/discourse/app/widgets/link.js
index 1194e1c8ae..3d10f189a6 100644
--- a/app/assets/javascripts/discourse/app/widgets/link.js
+++ b/app/assets/javascripts/discourse/app/widgets/link.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { createWidget } from "discourse/widgets/widget";
 import { iconNode } from "discourse-common/lib/icon-library";
diff --git a/app/assets/javascripts/discourse/app/widgets/membership-request-accepted-notification-item.js b/app/assets/javascripts/discourse/app/widgets/membership-request-accepted-notification-item.js
index de5d2efced..9f65c7967d 100644
--- a/app/assets/javascripts/discourse/app/widgets/membership-request-accepted-notification-item.js
+++ b/app/assets/javascripts/discourse/app/widgets/membership-request-accepted-notification-item.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidgetFrom } from "discourse/widgets/widget";
 import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import { groupPath } from "discourse/lib/url";
diff --git a/app/assets/javascripts/discourse/app/widgets/membership-request-consolidated-notification-item.js b/app/assets/javascripts/discourse/app/widgets/membership-request-consolidated-notification-item.js
index fafa3656f6..914db124a0 100644
--- a/app/assets/javascripts/discourse/app/widgets/membership-request-consolidated-notification-item.js
+++ b/app/assets/javascripts/discourse/app/widgets/membership-request-consolidated-notification-item.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidgetFrom } from "discourse/widgets/widget";
 import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
 import { userPath } from "discourse/lib/url";
diff --git a/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
index 2b94b8a85c..fbe2994b3c 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 import { ButtonClass } from "discourse/widgets/button";
diff --git a/app/assets/javascripts/discourse/app/widgets/post-cooked.js b/app/assets/javascripts/discourse/app/widgets/post-cooked.js
index 6cd3a6f66a..5f5c6e87ec 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-cooked.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-cooked.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { ajax } from "discourse/lib/ajax";
 import { isValidLink } from "discourse/lib/click-track";
diff --git a/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js b/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js
index f928df4727..5836327bb2 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { longDate } from "discourse/lib/formatter";
diff --git a/app/assets/javascripts/discourse/app/widgets/post-gap.js b/app/assets/javascripts/discourse/app/widgets/post-gap.js
index 7a81707a6a..e4ba009147 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-gap.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-gap.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
 
 export default createWidget("post-gap", {
diff --git a/app/assets/javascripts/discourse/app/widgets/post-small-action.js b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
index 709d70153a..1b46648d56 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-small-action.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
 import RawHtml from "discourse/widgets/raw-html";
 import { iconNode } from "discourse-common/lib/icon-library";
diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js
index b1a04cc036..467b25a117 100644
--- a/app/assets/javascripts/discourse/app/widgets/post.js
+++ b/app/assets/javascripts/discourse/app/widgets/post.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import PostCooked from "discourse/widgets/post-cooked";
 import DecoratorHelper from "discourse/widgets/decorator-helper";
 import { createWidget, applyDecorators } from "discourse/widgets/widget";
diff --git a/app/assets/javascripts/discourse/app/widgets/poster-name.js b/app/assets/javascripts/discourse/app/widgets/poster-name.js
index 7babc63ee1..d0680fb831 100644
--- a/app/assets/javascripts/discourse/app/widgets/poster-name.js
+++ b/app/assets/javascripts/discourse/app/widgets/poster-name.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { createWidget, applyDecorators } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
diff --git a/app/assets/javascripts/discourse/app/widgets/private-message-map.js b/app/assets/javascripts/discourse/app/widgets/private-message-map.js
index 62be57b150..824e198b1b 100644
--- a/app/assets/javascripts/discourse/app/widgets/private-message-map.js
+++ b/app/assets/javascripts/discourse/app/widgets/private-message-map.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { makeArray } from "discourse-common/lib/helpers";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js b/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js
index 8922571233..b53868e0d4 100644
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js
+++ b/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Session from "discourse/models/session";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js b/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
index c4c7b71927..bbdd5ddad5 100644
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
+++ b/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import QuickAccessPanel from "discourse/widgets/quick-access-panel";
 import { createWidgetFrom } from "discourse/widgets/widget";
 import { Promise } from "rsvp";
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 7884b1ac77..df6d5755a4 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu-controls.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu-controls.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { get } from "@ember/object";
 import { searchContextDescription } from "discourse/lib/search";
 import { h } from "virtual-dom";
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 cdb486954f..e5792e9713 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu-results.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu-results.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { avatarImg } from "discourse/widgets/post";
 import { dateNode } from "discourse/helpers/node";
 import RawHtml from "discourse/widgets/raw-html";
diff --git a/app/assets/javascripts/discourse/app/widgets/time-gap.js b/app/assets/javascripts/discourse/app/widgets/time-gap.js
index bf004a1fa9..0dd2c8974a 100644
--- a/app/assets/javascripts/discourse/app/widgets/time-gap.js
+++ b/app/assets/javascripts/discourse/app/widgets/time-gap.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 
diff --git a/app/assets/javascripts/discourse/app/widgets/toggle-topic-summary.js b/app/assets/javascripts/discourse/app/widgets/toggle-topic-summary.js
index c712a81a31..f75bbca5dc 100644
--- a/app/assets/javascripts/discourse/app/widgets/toggle-topic-summary.js
+++ b/app/assets/javascripts/discourse/app/widgets/toggle-topic-summary.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import RawHtml from "discourse/widgets/raw-html";
 import { createWidget } from "discourse/widgets/widget";
 
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
index 06ebf23666..8e140d0c07 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidget, applyDecorators } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-map.js b/app/assets/javascripts/discourse/app/widgets/topic-map.js
index c434e84985..1d473de0af 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-map.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-map.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 import { avatarImg, avatarFor } from "discourse/widgets/post";
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-status.js b/app/assets/javascripts/discourse/app/widgets/topic-status.js
index 366fe462a2..f7619ce411 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-status.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-status.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { h } from "virtual-dom";
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-timeline.js b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
index b74f691bfb..9d2ffd6467 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { later } from "@ember/runloop";
 import { createWidget } from "discourse/widgets/widget";
 import ComponentConnector from "discourse/widgets/component-connector";
diff --git a/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
index dbb34a5e64..e7de0a2255 100644
--- a/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
+++ b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
 import { schedule } from "@ember/runloop";
 import hbs from "discourse/widgets/hbs-compiler";
diff --git a/app/assets/javascripts/discourse/app/widgets/widget.js b/app/assets/javascripts/discourse/app/widgets/widget.js
index dd30201007..f945bd2c9f 100644
--- a/app/assets/javascripts/discourse/app/widgets/widget.js
+++ b/app/assets/javascripts/discourse/app/widgets/widget.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import {
   WidgetClickHook,
   WidgetDoubleClickHook,
diff --git a/app/assets/javascripts/select-kit/components/categories-admin-dropdown.js b/app/assets/javascripts/select-kit/components/categories-admin-dropdown.js
index f56b270523..015343bd54 100644
--- a/app/assets/javascripts/select-kit/components/categories-admin-dropdown.js
+++ b/app/assets/javascripts/select-kit/components/categories-admin-dropdown.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 import { computed } from "@ember/object";
 import { setting } from "discourse/lib/computed";
diff --git a/app/assets/javascripts/select-kit/components/category-chooser.js b/app/assets/javascripts/select-kit/components/category-chooser.js
index 423481706a..f36e8be2d3 100644
--- a/app/assets/javascripts/select-kit/components/category-chooser.js
+++ b/app/assets/javascripts/select-kit/components/category-chooser.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import ComboBoxComponent from "select-kit/components/combo-box";
 import PermissionType from "discourse/models/permission-type";
 import Category from "discourse/models/category";
diff --git a/app/assets/javascripts/select-kit/components/category-drop.js b/app/assets/javascripts/select-kit/components/category-drop.js
index d01b9e40da..ebe5eec4b2 100644
--- a/app/assets/javascripts/select-kit/components/category-drop.js
+++ b/app/assets/javascripts/select-kit/components/category-drop.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { readOnly } from "@ember/object/computed";
 import { computed } from "@ember/object";
 import ComboBoxComponent from "select-kit/components/combo-box";
diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js b/app/assets/javascripts/select-kit/components/composer-actions.js
index 7afd4d616e..0dc266e417 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 import {
   PRIVATE_MESSAGE,
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector.js b/app/assets/javascripts/select-kit/components/future-date-input-selector.js
index ae34273692..a2770936e5 100644
--- a/app/assets/javascripts/select-kit/components/future-date-input-selector.js
+++ b/app/assets/javascripts/select-kit/components/future-date-input-selector.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { computed } from "@ember/object";
 import { equal } from "@ember/object/computed";
 import { isEmpty } from "@ember/utils";
diff --git a/app/assets/javascripts/select-kit/components/group-dropdown.js b/app/assets/javascripts/select-kit/components/group-dropdown.js
index 57f7a8ff74..cf7cfb9a64 100644
--- a/app/assets/javascripts/select-kit/components/group-dropdown.js
+++ b/app/assets/javascripts/select-kit/components/group-dropdown.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { reads, gte } from "@ember/object/computed";
 import ComboBoxComponent from "select-kit/components/combo-box";
 import DiscourseURL from "discourse/lib/url";
diff --git a/app/assets/javascripts/select-kit/components/group-members-dropdown.js b/app/assets/javascripts/select-kit/components/group-members-dropdown.js
index bd9cd7ca71..7e3c82a2e5 100644
--- a/app/assets/javascripts/select-kit/components/group-members-dropdown.js
+++ b/app/assets/javascripts/select-kit/components/group-members-dropdown.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 import { action, computed } from "@ember/object";
 
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
index bf11e816dc..94b9fa055a 100644
--- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
+++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { empty, or } from "@ember/object/computed";
 import ComboBox from "select-kit/components/combo-box";
 import TagsMixin from "select-kit/mixins/tags";
diff --git a/app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js b/app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js
index aa51493816..3e83ecde6d 100644
--- a/app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js
+++ b/app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 const { isEmpty } = Ember;
 import SelectKitFilterComponent from "select-kit/components/select-kit/select-kit-filter";
diff --git a/app/assets/javascripts/select-kit/components/notifications-button.js b/app/assets/javascripts/select-kit/components/notifications-button.js
index abf02da3dc..32dc2ad7ba 100644
--- a/app/assets/javascripts/select-kit/components/notifications-button.js
+++ b/app/assets/javascripts/select-kit/components/notifications-button.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 import { allLevels, buttonDetails } from "discourse/lib/notification-levels";
 import { computed, setProperties } from "@ember/object";
diff --git a/app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js b/app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js
index 3638bb6169..ccdebb2d4a 100644
--- a/app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js
+++ b/app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { readOnly } from "@ember/object/computed";
 import { computed } from "@ember/object";
 import DropdownSelectBoxRowComponent from "select-kit/components/dropdown-select-box/dropdown-select-box-row";
diff --git a/app/assets/javascripts/select-kit/components/notifications-filter.js b/app/assets/javascripts/select-kit/components/notifications-filter.js
index 2223fead72..fba0d1e62a 100644
--- a/app/assets/javascripts/select-kit/components/notifications-filter.js
+++ b/app/assets/javascripts/select-kit/components/notifications-filter.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 import { computed } from "@ember/object";
 
diff --git a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js
index 4a2e42a063..649f04c6f2 100644
--- a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js
+++ b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DropdownSelectBoxRowComponent from "select-kit/components/dropdown-select-box/dropdown-select-box-row";
 import discourseComputed from "discourse-common/utils/decorators";
 
diff --git a/app/assets/javascripts/select-kit/components/pinned-button.js b/app/assets/javascripts/select-kit/components/pinned-button.js
index 8332f0f41a..15feeeb817 100644
--- a/app/assets/javascripts/select-kit/components/pinned-button.js
+++ b/app/assets/javascripts/select-kit/components/pinned-button.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 
diff --git a/app/assets/javascripts/select-kit/components/pinned-options.js b/app/assets/javascripts/select-kit/components/pinned-options.js
index 2b9263bc43..7498f036ae 100644
--- a/app/assets/javascripts/select-kit/components/pinned-options.js
+++ b/app/assets/javascripts/select-kit/components/pinned-options.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { computed, action } from "@ember/object";
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 4ac3ed3d0e..43905d52f3 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import EmberObject, { computed, get, guidFor } from "@ember/object";
 import Component from "@ember/component";
 import deprecated from "discourse-common/lib/deprecated";
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js b/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js
index 1b562790b1..b5b9bccd54 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isPresent } from "@ember/utils";
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js b/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js
index 6ec3cc6d05..c3ab6024b0 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Component from "@ember/component";
 import { computed } from "@ember/object";
 import { makeArray } from "discourse-common/lib/helpers";
diff --git a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js b/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js
index 9c3c619bf1..2fffef964c 100644
--- a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js
+++ b/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 
 const HEADING_COLLECTION = "HEADING_COLLECTION";
diff --git a/app/assets/javascripts/select-kit/components/user-notifications-dropdown.js b/app/assets/javascripts/select-kit/components/user-notifications-dropdown.js
index 11546965c9..936b9e25e9 100644
--- a/app/assets/javascripts/select-kit/components/user-notifications-dropdown.js
+++ b/app/assets/javascripts/select-kit/components/user-notifications-dropdown.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DropdownSelectBox from "select-kit/components/dropdown-select-box";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
diff --git a/app/assets/javascripts/select-kit/mixins/tags.js b/app/assets/javascripts/select-kit/mixins/tags.js
index 1477278f62..8e96cf4f79 100644
--- a/app/assets/javascripts/select-kit/mixins/tags.js
+++ b/app/assets/javascripts/select-kit/mixins/tags.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { reads } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
diff --git a/app/assets/javascripts/wizard/components/invite-list.js b/app/assets/javascripts/wizard/components/invite-list.js
index 39435e0f89..1fdaab1df4 100644
--- a/app/assets/javascripts/wizard/components/invite-list.js
+++ b/app/assets/javascripts/wizard/components/invite-list.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 
diff --git a/app/assets/javascripts/wizard/components/theme-preview.js b/app/assets/javascripts/wizard/components/theme-preview.js
index 768e2e5522..a62dd67d0f 100644
--- a/app/assets/javascripts/wizard/components/theme-preview.js
+++ b/app/assets/javascripts/wizard/components/theme-preview.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { observes } from "discourse-common/utils/decorators";
 import {
diff --git a/app/assets/javascripts/wizard/components/wizard-field-image.js b/app/assets/javascripts/wizard/components/wizard-field-image.js
index e97137707d..5644105fd1 100644
--- a/app/assets/javascripts/wizard/components/wizard-field-image.js
+++ b/app/assets/javascripts/wizard/components/wizard-field-image.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Component from "@ember/component";
 import getUrl from "discourse-common/lib/get-url";
 import discourseComputed from "discourse-common/utils/decorators";
diff --git a/app/assets/javascripts/wizard/components/wizard-step.js b/app/assets/javascripts/wizard/components/wizard-step.js
index 9056e9a052..0b00263973 100644
--- a/app/assets/javascripts/wizard/components/wizard-step.js
+++ b/app/assets/javascripts/wizard/components/wizard-step.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import getUrl from "discourse-common/lib/get-url";
diff --git a/app/assets/javascripts/wizard/test/test_helper.js b/app/assets/javascripts/wizard/test/test_helper.js
index 5835ba12ba..c04a59f778 100644
--- a/app/assets/javascripts/wizard/test/test_helper.js
+++ b/app/assets/javascripts/wizard/test/test_helper.js
@@ -4,6 +4,8 @@
 //= require env
 //= require jquery.debug
 //= require ember.debug
+//= require locales/i18n
+//= require locales/en_US
 //= require discourse-loader
 //= require jquery.debug
 //= require handlebars
@@ -18,7 +20,6 @@
 //= require_tree ./acceptance
 //= require_tree ./models
 //= require_tree ./components
-//= require locales/en_US
 //= require fake_xml_http_request
 //= require route-recognizer/dist/route-recognizer
 //= require pretender/pretender
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index f355b898ab..1e4775d121 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -75,6 +75,10 @@ module PrettyText
     end
     ctx.eval("__PRETTY_TEXT = true")
 
+    PrettyText::Helpers.instance_methods.each do |method|
+      ctx.attach("__helpers.#{method}", PrettyText::Helpers.method(method))
+    end
+
     ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/discourse-loader.js")
     ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/handlebars-shim.js")
     ctx_load(ctx, "vendor/assets/javascripts/lodash.js")
@@ -85,9 +89,6 @@ module PrettyText
     apply_es6_file(ctx, root_path, "discourse/app/lib/to-markdown")
     apply_es6_file(ctx, root_path, "discourse/app/lib/utilities")
 
-    PrettyText::Helpers.instance_methods.each do |method|
-      ctx.attach("__helpers.#{method}", PrettyText::Helpers.method(method))
-    end
     ctx.load("#{Rails.root}/lib/pretty_text/shims.js")
     ctx.eval("__setUnicode(#{Emoji.unicode_replacements_json})")
 
diff --git a/lib/pretty_text/shims.js b/lib/pretty_text/shims.js
index 4d77520eb2..cc288ceb40 100644
--- a/lib/pretty_text/shims.js
+++ b/lib/pretty_text/shims.js
@@ -4,6 +4,16 @@ __performEmojiUnescape = require("pretty-text/emoji").performEmojiUnescape;
 __buildReplacementsList = require("pretty-text/emoji").buildReplacementsList;
 __performEmojiEscape = require("pretty-text/emoji").performEmojiEscape;
 
+I18n = {
+  t(a, b) {
+    return __helpers.t(a, b);
+  }
+};
+
+define("I18n", ["exports"], function(exports) {
+  exports.default = I18n;
+});
+
 __utils = require("discourse/lib/utilities");
 
 __emojiUnicodeReplacer = null;
@@ -90,9 +100,3 @@ function __lookupPrimaryUserGroup(username) {
 function __getCurrentUser(userId) {
   return __helpers.get_current_user(userId);
 }
-
-I18n = {
-  t: function(a, b) {
-    return __helpers.t(a, b);
-  }
-};
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 19ab641a75..5646f9847d 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -11,10 +11,9 @@
 //= require fake_xml_http_request
 //= require route-recognizer/dist/route-recognizer
 //= require pretender/pretender
-//= require discourse-loader
-
 //= require locales/i18n
 //= require locales/en_US
+//= require discourse-loader
 
 // Stuff we need to load first
 //= require vendor

From 5cb806827a0e4d8777cf017f209452bf22a691ec Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Wed, 13 May 2020 16:29:18 -0700
Subject: [PATCH 1161/1830] DEV: Add checks that assets do not modify cookies
 to smoke-test.js (#9504)

This adds three new checks to the smoke test: that assets and service-worker.js do not
clear invalid cookies, but normal application routes do.

This functions as a test that the nginx config correctly strips out Set-Cookie responses
from the service-worker.js file.
---
 test/smoke_test.js | 80 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 79 insertions(+), 1 deletion(-)

diff --git a/test/smoke_test.js b/test/smoke_test.js
index abd1a4589b..99928b5039 100644
--- a/test/smoke_test.js
+++ b/test/smoke_test.js
@@ -14,6 +14,15 @@ console.log(`Starting Discourse Smoke Test for ${url}`);
 const puppeteer = require("puppeteer");
 const path = require("path");
 
+async function getCookie(name, page) {
+  const cookies = await page.cookies();
+  let found = null;
+  cookies.forEach(c => {
+    if (c.name === name) found = c;
+  });
+  return found;
+}
+
 (async () => {
   const browser = await puppeteer.launch({
     // when debugging localy setting the SHOW_BROWSER env variable can be very helpful
@@ -70,7 +79,11 @@ const path = require("path");
   page.on("console", msg => console.log(`PAGE LOG: ${msg.text()}`));
 
   page.on("response", resp => {
-    if (resp.status() !== 200 && resp.status() !== 302) {
+    if (
+      resp.status() !== 200 &&
+      resp.status() !== 302 &&
+      resp.status() !== 304
+    ) {
       console.log(
         "FAILED HTTP REQUEST TO " + resp.url() + " Status is: " + resp.status()
       );
@@ -129,10 +142,75 @@ const path = require("path");
     return page.waitForSelector("header .login-button", { visible: true });
   });
 
+  // Prep for assets check
+  const anyStylesheetEl = await page.$('link[href][rel="stylesheet"]');
+  const anyAssetPath = await page.evaluate(
+    el => el.getAttribute("href"),
+    anyStylesheetEl
+  );
+  if (!anyAssetPath) {
+    return console.log("FAILED - could not retrieve an asset path");
+  }
+
   if (process.env.LOGIN_AT_BEGINNING) {
     await login();
   }
 
+  function checkNoCookies(testPath) {
+    return async function() {
+      const priorCookie = await getCookie("_t", page);
+      const testURL = new URL(testPath, url);
+
+      await page.setCookie({
+        name: "_t",
+        value: "invalid_auth_token",
+        url: url,
+        domain: priorCookie.domain,
+        path: priorCookie.path,
+        expires: priorCookie.expires,
+        httpOnly: priorCookie.httpOnly,
+        secure: priorCookie.secure,
+        session: priorCookie.session,
+        sameSite: priorCookie.sameSite
+      });
+      const badCookie = await getCookie("_t", page);
+      if (badCookie.value !== "invalid_auth_token") {
+        throw "FAILED - could not set cookie";
+      }
+
+      await page.goto(testURL);
+
+      const newCookie = await getCookie("_t", page);
+      if (newCookie === null || newCookie.value !== "invalid_auth_token") {
+        throw "FAILED - Cookie was modified while fetching " + testPath;
+      }
+
+      await page.setCookie(priorCookie);
+    };
+  }
+
+  await exec(
+    `assets do not set cookies (${anyAssetPath})`,
+    checkNoCookies(anyAssetPath || "/assets/stylesheets/bogus.css")
+  );
+  await exec(
+    "service-worker.js does not set cookies",
+    checkNoCookies("/service-worker.js")
+  );
+  await exec("application paths do clear invalid cookies", async () => {
+    const fn = checkNoCookies("/about");
+    let failure = false;
+    try {
+      await fn();
+      failure = true;
+    } catch (e) {
+      // Expecting cookies to be set, so a throw is correct
+    }
+    if (failure) {
+      throw "FAILED - cookies not fixed on an application path";
+    }
+  });
+
   await exec("go to latest page", () => {
     return page.goto(path.join(url, "latest"));
   });

From 732776e2ce4cd89d64a7ccd42e68e530d4ff162a Mon Sep 17 00:00:00 2001
From: Kane York <rikingcoding@gmail.com>
Date: Wed, 13 May 2020 16:41:18 -0700
Subject: [PATCH 1162/1830] Revert "DEV: Add checks that assets do not modify
 cookies to smoke-test.js (#9504)" (#9773)

This reverts commit 5cb806827a0e4d8777cf017f209452bf22a691ec.
---
 test/smoke_test.js | 80 +---------------------------------------------
 1 file changed, 1 insertion(+), 79 deletions(-)

diff --git a/test/smoke_test.js b/test/smoke_test.js
index 99928b5039..abd1a4589b 100644
--- a/test/smoke_test.js
+++ b/test/smoke_test.js
@@ -14,15 +14,6 @@ console.log(`Starting Discourse Smoke Test for ${url}`);
 const puppeteer = require("puppeteer");
 const path = require("path");
 
-async function getCookie(name, page) {
-  const cookies = await page.cookies();
-  let found = null;
-  cookies.forEach(c => {
-    if (c.name === name) found = c;
-  });
-  return found;
-}
-
 (async () => {
   const browser = await puppeteer.launch({
     // when debugging localy setting the SHOW_BROWSER env variable can be very helpful
@@ -79,11 +70,7 @@ async function getCookie(name, page) {
   page.on("console", msg => console.log(`PAGE LOG: ${msg.text()}`));
 
   page.on("response", resp => {
-    if (
-      resp.status() !== 200 &&
-      resp.status() !== 302 &&
-      resp.status() !== 304
-    ) {
+    if (resp.status() !== 200 && resp.status() !== 302) {
       console.log(
         "FAILED HTTP REQUEST TO " + resp.url() + " Status is: " + resp.status()
       );
@@ -142,75 +129,10 @@ async function getCookie(name, page) {
     return page.waitForSelector("header .login-button", { visible: true });
   });
 
-  // Prep for assets check
-  const anyStylesheetEl = await page.$('link[href][rel="stylesheet"]');
-  const anyAssetPath = await page.evaluate(
-    el => el.getAttribute("href"),
-    anyStylesheetEl
-  );
-  if (!anyAssetPath) {
-    return console.log("FAILED - could not retrieve an asset path");
-  }
-
   if (process.env.LOGIN_AT_BEGINNING) {
     await login();
   }
 
-  function checkNoCookies(testPath) {
-    return async function() {
-      const priorCookie = await getCookie("_t", page);
-      const testURL = new URL(testPath, url);
-
-      await page.setCookie({
-        name: "_t",
-        value: "invalid_auth_token",
-        url: url,
-        domain: priorCookie.domain,
-        path: priorCookie.path,
-        expires: priorCookie.expires,
-        httpOnly: priorCookie.httpOnly,
-        secure: priorCookie.secure,
-        session: priorCookie.session,
-        sameSite: priorCookie.sameSite
-      });
-      const badCookie = await getCookie("_t", page);
-      if (badCookie.value !== "invalid_auth_token") {
-        throw "FAILED - could not set cookie";
-      }
-
-      await page.goto(testURL);
-
-      const newCookie = await getCookie("_t", page);
-      if (newCookie === null || newCookie.value !== "invalid_auth_token") {
-        throw "FAILED - Cookie was modified while fetching " + testPath;
-      }
-
-      await page.setCookie(priorCookie);
-    };
-  }
-
-  await exec(
-    `assets do not set cookies (${anyAssetPath})`,
-    checkNoCookies(anyAssetPath || "/assets/stylesheets/bogus.css")
-  );
-  await exec(
-    "service-worker.js does not set cookies",
-    checkNoCookies("/service-worker.js")
-  );
-  await exec("application paths do clear invalid cookies", async () => {
-    const fn = checkNoCookies("/about");
-    let failure = false;
-    try {
-      await fn();
-      failure = true;
-    } catch (e) {
-      // Expecting cookies to be set, so a throw is correct
-    }
-    if (failure) {
-      throw "FAILED - cookies not fixed on an application path";
-    }
-  });
-
   await exec("go to latest page", () => {
     return page.goto(path.join(url, "latest"));
   });

From ad7c964cd1ed3d6b10ae14123a565d456339e64e Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 13 May 2020 21:24:40 -0400
Subject: [PATCH 1163/1830] FIX: Prevent Safari from scrolling when closing
 composer

Unlike other browsers, Safari maintains focus on elements even when
they are hidden. And since the composer is fixed-positioned when hidden,
closing the composer on a topic with several replies causes Safari to
scroll the window up.

Deliberately blurring the focused element fixes the issue.
---
 app/assets/javascripts/discourse/app/controllers/composer.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index d8aed927ff..c589c7f00b 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -1162,6 +1162,7 @@ export default Controller.extend({
     const elem = document.querySelector("html");
     elem.classList.remove("fullscreen-composer");
 
+    document.activeElement.blur();
     this.setProperties({ model: null, lastValidatedAt: null });
   },
 

From c5ef4651797b411ed9201239f205d13bd163742e Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 14 May 2020 10:04:45 +0800
Subject: [PATCH 1164/1830] DEV: Avoid relative paths when importing in
 plugins.

---
 .../discourse/components/composer-presence-display.js.es6     | 3 ++-
 .../discourse/components/topic-presence-display.js.es6        | 2 +-
 .../javascripts/discourse/services/presence-manager.js.es6    | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index a01c982471..110bfb49d3 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -12,7 +12,8 @@ import {
   EDITING,
   COMPOSER_TYPE,
   KEEP_ALIVE_DURATION_SECONDS
-} from "../lib/presence";
+} from "discourse/plugins/discourse-presence/discourse/lib/presence";
+
 import { REPLY, EDIT } from "discourse/models/composer";
 
 export default Component.extend({
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
index c44742c9aa..b64fd93c38 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
@@ -2,7 +2,7 @@ import Component from "@ember/component";
 import { gt } from "@ember/object/computed";
 import { inject as service } from "@ember/service";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
-import { TOPIC_TYPE } from "../lib/presence";
+import { TOPIC_TYPE } from "discourse/plugins/discourse-presence/discourse/lib/presence";
 
 export default Component.extend({
   topic: null,
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/services/presence-manager.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/services/presence-manager.js.es6
index 3913009b30..11b6c9e5e7 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/services/presence-manager.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/services/presence-manager.js.es6
@@ -1,5 +1,7 @@
 import Service from "@ember/service";
-import Presence, { CLOSED } from "../lib/presence";
+import Presence, {
+  CLOSED
+} from "discourse/plugins/discourse-presence/discourse/lib/presence";
 
 const PresenceManager = Service.extend({
   presences: null,

From 3d5589e026a0e5bc317c5a3334a35158fe0711fd Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 14 May 2020 10:07:55 +0800
Subject: [PATCH 1165/1830] DEV: Remove assertions that are not required.

---
 .../spec/requests/presence_controller_spec.rb                  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/discourse-presence/spec/requests/presence_controller_spec.rb b/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
index b0b3343097..b18d731b9b 100644
--- a/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
+++ b/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
@@ -208,9 +208,6 @@ describe ::Presence::PresencesController do
 
         message = messages.first
 
-        expect(message.channel).to eq("/presence/#{public_topic.id}")
-        expect(message.data.dig(:user, :id)).to eq(user.id)
-        expect(message.data[:published_at]).to eq(Time.zone.now.to_i)
         expect(message.group_ids).to contain_exactly(Group::AUTO_GROUPS[:staff])
         expect(message.user_ids).to eq(nil)
       end

From a849bdf0c9cdd3dc96caa1170b213ff5f7d19216 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 14 May 2020 12:52:10 +0800
Subject: [PATCH 1166/1830] FIX: Don't publish typing presence if composer
 isn't opened.

Hitting cancel on composer will set composer's reply and title to null
causing our observer to fire.
---
 .../discourse/components/composer-presence-display.js.es6    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index 110bfb49d3..39e7e8ebf7 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -62,7 +62,10 @@ export default Component.extend({
   _typing() {
     const action = this.get("model.action");
 
-    if (action !== REPLY && action !== EDIT) {
+    if (
+      (action !== REPLY && action !== EDIT) ||
+      !this.get("model.composerOpened")
+    ) {
       return;
     }
 

From ce4b5b56e5fbf53438592b865c733759ebfa95c3 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 14 May 2020 15:35:44 +1000
Subject: [PATCH 1167/1830] FIX: never save draft while it is saving

Previously if saving a draft took longer than 2 seconds there
could be conditions where drafts could be saved concurrently.
This meant the composer could race with itself and raise conflicts.

This is likely to happen on bad internet connections or where
latency is really high.

Additionally a throttle was added so drafts save unconditionally
every 15 seconds.

Save draft in the model now properly and consistently returns a
promise.
---
 .../discourse/app/controllers/composer.js     | 18 ++++++++++++++++--
 .../discourse/app/models/composer.js          | 19 +++++++++++--------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index c589c7f00b..e86b14b455 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -1095,7 +1095,13 @@ export default Controller.extend({
   _saveDraft() {
     const model = this.model;
     if (model) {
-      model.saveDraft();
+      if (model.draftSaving) {
+        debounce(this, this._saveDraft, 2000);
+      } else {
+        model.saveDraft().finally(() => {
+          this._lastDraftSaved = Date.now();
+        });
+      }
     }
   },
 
@@ -1107,7 +1113,15 @@ export default Controller.extend({
       !this.skipAutoSave &&
       !this.model.disableDrafts
     ) {
-      debounce(this, this._saveDraft, 2000);
+      if (!this._lastDraftSaved) {
+        // pretend so we get a save unconditionally in 15 secs
+        this._lastDraftSaved = Date.now();
+      }
+      if (Date.now() - this._lastDraftSaved > 15000) {
+        this._saveDraft();
+      } else {
+        debounce(this, this._saveDraft, 2000);
+      }
     }
   },
 
diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index 4f87162d3a..a17461a856 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -1086,12 +1086,14 @@ const Composer = RestModel.extend({
   },
 
   saveDraft() {
+    if (this.draftSaving) return Promise.resolve();
+
     // Do not save when drafts are disabled
-    if (this.disableDrafts) return;
+    if (this.disableDrafts) return Promise.resolve();
 
     if (this.canEditTitle) {
       // Save title and/or post body
-      if (!this.title && !this.reply) return;
+      if (!this.title && !this.reply) return Promise.resolve();
 
       if (
         this.title &&
@@ -1099,14 +1101,15 @@ const Composer = RestModel.extend({
         this.reply &&
         this.replyLength < this.siteSettings.min_post_length
       ) {
-        return;
+        return Promise.resolve();
       }
     } else {
       // Do not save when there is no reply
-      if (!this.reply) return;
+      if (!this.reply) return Promise.resolve();
 
       // Do not save when the reply's length is too small
-      if (this.replyLength < this.siteSettings.min_post_length) return;
+      if (this.replyLength < this.siteSettings.min_post_length)
+        return Promise.resolve();
     }
 
     this.setProperties({
@@ -1138,13 +1141,11 @@ const Composer = RestModel.extend({
         }
         if (result.conflict_user) {
           this.setProperties({
-            draftSaving: false,
             draftStatus: I18n.t("composer.edit_conflict"),
             draftConflictUser: result.conflict_user
           });
         } else {
           this.setProperties({
-            draftSaving: false,
             draftSaved: true,
             draftConflictUser: null
           });
@@ -1169,10 +1170,12 @@ const Composer = RestModel.extend({
         }
 
         this.setProperties({
-          draftSaving: false,
           draftStatus: draftStatus || I18n.t("composer.drafts_offline"),
           draftConflictUser: null
         });
+      })
+      .finally(() => {
+        this.set("draftSaving", false);
       });
   },
 

From 3d050bdaa31633a954758894629c0eb9fea537d0 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 14 May 2020 16:41:34 +1000
Subject: [PATCH 1168/1830] DEV: correct test suite

We have no choice but to bypass recursive debouncers in test

Otherwise we overrun the stack with frames
---
 .../javascripts/discourse/app/controllers/composer.js       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index e86b14b455..cd3d3576bb 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -1096,7 +1096,11 @@ export default Controller.extend({
     const model = this.model;
     if (model) {
       if (model.draftSaving) {
-        debounce(this, this._saveDraft, 2000);
+        // in test debounce is Ember.run, this will cause
+        // an infinite loop
+        if (ENV.environment !== "test") {
+          debounce(this, this._saveDraft, 2000);
+        }
       } else {
         model.saveDraft().finally(() => {
           this._lastDraftSaved = Date.now();

From c014b9385448a67143ef401d5461681caa49633c Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 14 May 2020 12:15:33 +0530
Subject: [PATCH 1169/1830] UX: don't disable "create account" button & display
 error message for required fields. (#9643)

---
 .../discourse/app/components/user-field.js    | 10 +++
 .../app/controllers/create-account.js         | 79 ++++++++++++-------
 .../discourse/app/mixins/name-validation.js   |  6 +-
 .../app/mixins/password-validation.js         | 51 +++++++-----
 .../app/mixins/user-fields-validation.js      | 11 ++-
 .../app/mixins/username-validation.js         | 64 +++++++++------
 app/assets/stylesheets/desktop/login.scss     |  1 +
 config/locales/client.en.yml                  |  5 ++
 .../create-account-user-fields-test.js        | 33 +++-----
 test/javascripts/acceptance/sign-in-test.js   | 14 +---
 10 files changed, 162 insertions(+), 112 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-field.js b/app/assets/javascripts/discourse/app/components/user-field.js
index f8e2554ab0..386b869c00 100644
--- a/app/assets/javascripts/discourse/app/components/user-field.js
+++ b/app/assets/javascripts/discourse/app/components/user-field.js
@@ -6,6 +6,16 @@ export default Component.extend({
   classNameBindings: [":user-field", "field.field_type", "customFieldClass"],
   layoutName: fmt("field.field_type", "components/user-fields/%@"),
 
+  didInsertElement() {
+    this._super(...arguments);
+
+    let element = this.element.querySelector(
+      ".user-field.dropdown .select-kit-header"
+    );
+    element = element || this.element.querySelector("input");
+    this.field.element = element;
+  },
+
   @discourseComputed
   noneLabel() {
     return "user_fields.none";
diff --git a/app/assets/javascripts/discourse/app/controllers/create-account.js b/app/assets/javascripts/discourse/app/controllers/create-account.js
index 1593ff95ad..75ec7b2a66 100644
--- a/app/assets/javascripts/discourse/app/controllers/create-account.js
+++ b/app/assets/javascripts/discourse/app/controllers/create-account.js
@@ -61,27 +61,9 @@ export default Controller.extend(
       this._createUserFields();
     },
 
-    @discourseComputed(
-      "passwordRequired",
-      "nameValidation.failed",
-      "emailValidation.failed",
-      "usernameValidation.failed",
-      "passwordValidation.failed",
-      "userFieldsValidation.failed",
-      "formSubmitted",
-      "inviteCode"
-    )
+    @discourseComputed("formSubmitted")
     submitDisabled() {
       if (this.formSubmitted) return true;
-      if (this.get("nameValidation.failed")) return true;
-      if (this.get("emailValidation.failed")) return true;
-      if (this.get("usernameValidation.failed") && this.usernameRequired)
-        return true;
-      if (this.get("passwordValidation.failed") && this.passwordRequired)
-        return true;
-      if (this.get("userFieldsValidation.failed")) return true;
-
-      if (this.requireInviteCode && !this.inviteCode) return true;
 
       return false;
     },
@@ -114,18 +96,26 @@ export default Controller.extend(
     // Check the email address
     @discourseComputed("accountEmail", "rejectedEmails.[]")
     emailValidation(email, rejectedEmails) {
+      const failedAttrs = {
+        failed: true,
+        element: document.querySelector("#new-account-email")
+      };
+
       // If blank, fail without a reason
       if (isEmpty(email)) {
-        return EmberObject.create({
-          failed: true
-        });
+        return EmberObject.create(
+          Object.assign(failedAttrs, {
+            message: I18n.t("user.email.required")
+          })
+        );
       }
 
       if (rejectedEmails.includes(email)) {
-        return EmberObject.create({
-          failed: true,
-          reason: I18n.t("user.email.invalid")
-        });
+        return EmberObject.create(
+          Object.assign(failedAttrs, {
+            reason: I18n.t("user.email.invalid")
+          })
+        );
       }
 
       if (
@@ -149,10 +139,11 @@ export default Controller.extend(
         });
       }
 
-      return EmberObject.create({
-        failed: true,
-        reason: I18n.t("user.email.invalid")
-      });
+      return EmberObject.create(
+        Object.assign(failedAttrs, {
+          reason: I18n.t("user.email.invalid")
+        })
+      );
     },
 
     @discourseComputed(
@@ -312,6 +303,34 @@ export default Controller.extend(
       },
 
       createAccount() {
+        this.clearFlash();
+
+        const validation = [
+          this.emailValidation,
+          this.usernameValidation,
+          this.nameValidation,
+          this.passwordValidation,
+          this.userFieldsValidation
+        ].find(v => v.failed);
+
+        if (validation) {
+          if (validation.message) {
+            this.flash(validation.message, "error");
+          }
+
+          const element = validation.element;
+          if (element.tagName === "DIV") {
+            if (element.scrollIntoView) {
+              element.scrollIntoView();
+            }
+            element.click();
+          } else {
+            element.focus();
+          }
+
+          return;
+        }
+
         if (new Date() - this._challengeDate > 1000 * this._challengeExpiry) {
           this.fetchConfirmationValue().then(() =>
             this.performAccountCreation()
diff --git a/app/assets/javascripts/discourse/app/mixins/name-validation.js b/app/assets/javascripts/discourse/app/mixins/name-validation.js
index a36ea6a7c0..a2e024b633 100644
--- a/app/assets/javascripts/discourse/app/mixins/name-validation.js
+++ b/app/assets/javascripts/discourse/app/mixins/name-validation.js
@@ -18,7 +18,11 @@ export default Mixin.create({
   @discourseComputed("accountName")
   nameValidation() {
     if (this.siteSettings.full_name_required && isEmpty(this.accountName)) {
-      return EmberObject.create({ failed: true });
+      return EmberObject.create({
+        failed: true,
+        message: I18n.t("user.name.required"),
+        element: document.querySelector("#new-account-name")
+      });
     }
 
     return EmberObject.create({ ok: true });
diff --git a/app/assets/javascripts/discourse/app/mixins/password-validation.js b/app/assets/javascripts/discourse/app/mixins/password-validation.js
index 355e9bf4b4..0348362d75 100644
--- a/app/assets/javascripts/discourse/app/mixins/password-validation.js
+++ b/app/assets/javascripts/discourse/app/mixins/password-validation.js
@@ -43,44 +43,57 @@ export default Mixin.create({
     accountEmail,
     passwordMinLength
   ) {
+    const failedAttrs = {
+      failed: true,
+      element: document.querySelector("#new-account-password")
+    };
+
     if (!passwordRequired) {
       return EmberObject.create({ ok: true });
     }
 
     if (rejectedPasswords.includes(password)) {
-      return EmberObject.create({
-        failed: true,
-        reason:
-          this.rejectedPasswordsMessages.get(password) ||
-          I18n.t("user.password.common")
-      });
+      return EmberObject.create(
+        Object.assign(failedAttrs, {
+          reason:
+            this.rejectedPasswordsMessages.get(password) ||
+            I18n.t("user.password.common")
+        })
+      );
     }
 
     // If blank, fail without a reason
     if (isEmpty(password)) {
-      return EmberObject.create({ failed: true });
+      return EmberObject.create(
+        Object.assign(failedAttrs, {
+          message: I18n.t("user.password.required")
+        })
+      );
     }
 
     // If too short
     if (password.length < passwordMinLength) {
-      return EmberObject.create({
-        failed: true,
-        reason: I18n.t("user.password.too_short")
-      });
+      return EmberObject.create(
+        Object.assign(failedAttrs, {
+          reason: I18n.t("user.password.too_short")
+        })
+      );
     }
 
     if (!isEmpty(accountUsername) && password === accountUsername) {
-      return EmberObject.create({
-        failed: true,
-        reason: I18n.t("user.password.same_as_username")
-      });
+      return EmberObject.create(
+        Object.assign(failedAttrs, {
+          reason: I18n.t("user.password.same_as_username")
+        })
+      );
     }
 
     if (!isEmpty(accountEmail) && password === accountEmail) {
-      return EmberObject.create({
-        failed: true,
-        reason: I18n.t("user.password.same_as_email")
-      });
+      return EmberObject.create(
+        Object.assign(failedAttrs, {
+          reason: I18n.t("user.password.same_as_email")
+        })
+      );
     }
 
     // Looks good!
diff --git a/app/assets/javascripts/discourse/app/mixins/user-fields-validation.js b/app/assets/javascripts/discourse/app/mixins/user-fields-validation.js
index 5a7ff18808..520fb8af2a 100644
--- a/app/assets/javascripts/discourse/app/mixins/user-fields-validation.js
+++ b/app/assets/javascripts/discourse/app/mixins/user-fields-validation.js
@@ -27,12 +27,17 @@ export default Mixin.create({
       userFields = userFields.filterBy("field.required");
     }
     if (!isEmpty(userFields)) {
-      const anyEmpty = userFields.any(uf => {
+      const emptyUserField = userFields.find(uf => {
         const val = uf.get("value");
         return !val || isEmpty(val);
       });
-      if (anyEmpty) {
-        return EmberObject.create({ failed: true });
+      if (emptyUserField) {
+        const userField = emptyUserField.field;
+        return EmberObject.create({
+          failed: true,
+          message: I18n.t("user_fields.required", { name: userField.name }),
+          element: userField.element
+        });
       }
     }
     return EmberObject.create({ ok: true });
diff --git a/app/assets/javascripts/discourse/app/mixins/username-validation.js b/app/assets/javascripts/discourse/app/mixins/username-validation.js
index 081956f5c7..06776501f8 100644
--- a/app/assets/javascripts/discourse/app/mixins/username-validation.js
+++ b/app/assets/javascripts/discourse/app/mixins/username-validation.js
@@ -31,6 +31,10 @@ export default Mixin.create({
 
   @discourseComputed("accountUsername")
   basicUsernameValidation(accountUsername) {
+    const failedAttrs = {
+      failed: true,
+      element: document.querySelector("#new-account-username")
+    };
     this.set("uniqueUsernameValidation", null);
 
     if (accountUsername && accountUsername === this.prefilledUsername) {
@@ -42,31 +46,38 @@ export default Mixin.create({
 
     // If blank, fail without a reason
     if (isEmpty(accountUsername)) {
-      return EmberObject.create({ failed: true });
+      return EmberObject.create(
+        Object.assign(failedAttrs, {
+          message: I18n.t("user.username.required")
+        })
+      );
     }
 
     // If too short
     if (accountUsername.length < this.siteSettings.min_username_length) {
-      return EmberObject.create({
-        failed: true,
-        reason: I18n.t("user.username.too_short")
-      });
+      return EmberObject.create(
+        Object.assign(failedAttrs, {
+          reason: I18n.t("user.username.too_short")
+        })
+      );
     }
 
     // If too long
     if (accountUsername.length > this.maxUsernameLength) {
-      return EmberObject.create({
-        failed: true,
-        reason: I18n.t("user.username.too_long")
-      });
+      return EmberObject.create(
+        Object.assign(failedAttrs, {
+          reason: I18n.t("user.username.too_long")
+        })
+      );
     }
 
     this.checkUsernameAvailability();
     // Let's check it out asynchronously
-    return EmberObject.create({
-      failed: true,
-      reason: I18n.t("user.username.checking")
-    });
+    return EmberObject.create(
+      Object.assign(failedAttrs, {
+        reason: I18n.t("user.username.checking")
+      })
+    );
   },
 
   shouldCheckUsernameAvailability() {
@@ -93,23 +104,30 @@ export default Mixin.create({
               })
             );
           } else {
+            const failedAttrs = {
+              failed: true,
+              element: document.querySelector("#new-account-username")
+            };
+
             if (result.suggestion) {
               return this.set(
                 "uniqueUsernameValidation",
-                EmberObject.create({
-                  failed: true,
-                  reason: I18n.t("user.username.not_available", result)
-                })
+                EmberObject.create(
+                  Object.assign(failedAttrs, {
+                    reason: I18n.t("user.username.not_available", result)
+                  })
+                )
               );
             } else {
               return this.set(
                 "uniqueUsernameValidation",
-                EmberObject.create({
-                  failed: true,
-                  reason: result.errors
-                    ? result.errors.join(" ")
-                    : I18n.t("user.username.not_available_no_suggestion")
-                })
+                EmberObject.create(
+                  Object.assign(failedAttrs, {
+                    reason: result.errors
+                      ? result.errors.join(" ")
+                      : I18n.t("user.username.not_available_no_suggestion")
+                  })
+                )
               );
             }
           }
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 78a4048509..188f6eff1a 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -39,6 +39,7 @@
 
   #modal-alert {
     max-width: 100%;
+    margin-bottom: 0;
     padding: 8px 16px;
   }
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 5d49c7492d..6fab3f42ed 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -821,6 +821,7 @@ en:
 
     user_fields:
       none: "(select an option)"
+      required: 'Please enter a value for "%{name}"'
 
     user:
       said: "{{username}}:"
@@ -1115,6 +1116,7 @@ en:
         sso_override_instructions: "Email can be updated from SSO provider."
         instructions: "Never shown to the public."
         ok: "We will email you to confirm"
+        required: "Please enter an email address"
         invalid: "Please enter a valid email address"
         authenticated: "Your email has been authenticated by {{provider}}"
         frequency_immediately: "We'll email you immediately if you haven't read the thing we're emailing you about."
@@ -1137,6 +1139,7 @@ en:
         title: "Name"
         instructions: "your full name (optional)"
         instructions_required: "Your full name"
+        required: "Please enter a name"
         too_short: "Your name is too short"
         ok: "Your name looks good"
       username:
@@ -1150,6 +1153,7 @@ en:
         too_long: "Your username is too long"
         checking: "Checking username availability..."
         prefilled: "Email matches this registered username"
+        required: "Please enter a username"
 
       locale:
         title: "Interface language"
@@ -1308,6 +1312,7 @@ en:
         same_as_email: "Your password is the same as your email."
         ok: "Your password looks good."
         instructions: "at least %{count} characters"
+        required: "Please enter a password"
 
       summary:
         title: "Summary"
diff --git a/test/javascripts/acceptance/create-account-user-fields-test.js b/test/javascripts/acceptance/create-account-user-fields-test.js
index 476dad902a..6ddd946984 100644
--- a/test/javascripts/acceptance/create-account-user-fields-test.js
+++ b/test/javascripts/acceptance/create-account-user-fields-test.js
@@ -31,10 +31,10 @@ QUnit.test("create account with user fields", async assert => {
 
   assert.ok(exists(".create-account"), "it shows the create account modal");
   assert.ok(exists(".user-field"), "it has at least one user field");
-  assert.ok(
-    exists(".modal-footer .btn-primary:disabled"),
-    "create account is disabled at first"
-  );
+
+  await click(".modal-footer .btn-primary");
+  assert.ok(exists("#modal-alert"), "it shows the required field alert");
+  assert.equal(find("#modal-alert").text(), "Please enter an email address");
 
   await fillIn("#new-account-name", "Dr. Good Tuna");
   await fillIn("#new-account-password", "cool password bro");
@@ -52,28 +52,13 @@ QUnit.test("create account with user fields", async assert => {
     exists("#account-email-validation.good"),
     "the email validation is good"
   );
-  assert.ok(
-    exists(".modal-footer .btn-primary:disabled"),
-    "create account is still disabled due to lack of user fields"
-  );
+
+  await click(".modal-footer .btn-primary");
+  assert.equal(find("#modal-alert")[0].style.display, "");
 
   await fillIn(".user-field input[type=text]:first", "Barky");
-
-  assert.ok(
-    exists(".modal-footer .btn-primary:disabled"),
-    "create account is disabled because field is not checked"
-  );
-
   await click(".user-field input[type=checkbox]");
 
-  assert.ok(
-    !exists(".modal-footer .btn-primary:disabled"),
-    "create account is enabled because field is checked"
-  );
-
-  await click(".user-field input[type=checkbox]");
-  assert.ok(
-    exists(".modal-footer .btn-primary:disabled"),
-    "unchecking the checkbox disables the create account button"
-  );
+  await click(".modal-footer .btn-primary");
+  assert.equal(find("#modal-alert")[0].style.display, "none");
 });
diff --git a/test/javascripts/acceptance/sign-in-test.js b/test/javascripts/acceptance/sign-in-test.js
index 62520e8a62..5ba70ce4a3 100644
--- a/test/javascripts/acceptance/sign-in-test.js
+++ b/test/javascripts/acceptance/sign-in-test.js
@@ -132,10 +132,6 @@ QUnit.test("create account", async assert => {
   await click("header .sign-up-button");
 
   assert.ok(exists(".create-account"), "it shows the create account modal");
-  assert.ok(
-    exists(".modal-footer .btn-primary:disabled"),
-    "create account is disabled at first"
-  );
 
   await fillIn("#new-account-name", "Dr. Good Tuna");
   await fillIn("#new-account-password", "cool password bro");
@@ -151,20 +147,14 @@ QUnit.test("create account", async assert => {
     exists("#username-validation.bad"),
     "the username validation is bad"
   );
-  assert.ok(
-    exists(".modal-footer .btn-primary:disabled"),
-    "create account is still disabled"
-  );
+  await click(".modal-footer .btn-primary");
+  assert.ok(exists("#new-account-username:focus"), "username field is focused");
 
   await fillIn("#new-account-username", "goodtuna");
   assert.ok(
     exists("#username-validation.good"),
     "the username validation is good"
   );
-  assert.not(
-    exists(".modal-footer .btn-primary:disabled"),
-    "create account is enabled"
-  );
 
   await click(".modal-footer .btn-primary");
   assert.ok(

From d2267834050d0baafc7eb65202509978ca82576d Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 14 May 2020 15:26:50 +0800
Subject: [PATCH 1170/1830] Revert "DEV: Add `add_controller_callback` server
 side plugin api."

This reverts commit 8233610d92fb7241658c6888f378c5ddd587e324.

Too much messy around with blocks to support `before_action` and
`around_action`.
---
 lib/plugin/instance.rb | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index a127ce0ca9..647a453b20 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -235,16 +235,6 @@ class Plugin::Instance
     end
   end
 
-  def add_controller_callback(klass_name, callback, &block)
-    reloadable_patch do |plugin|
-      klass = klass_name.to_s.classify.constantize rescue klass_name.to_s.constantize
-
-      klass.public_send(callback) do |controller, action|
-        block.call(controller, action) if plugin.enabled?
-      end
-    end
-  end
-
   # Add a post_custom_fields_whitelister block to the TopicView, respecting if the plugin is enabled
   def topic_view_post_custom_fields_whitelister(&block)
     reloadable_patch do |plugin|

From b80128a97340d89cc3ded33c01d7b56019cac513 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Thu, 14 May 2020 10:42:01 +0300
Subject: [PATCH 1171/1830] FEATURE: Add structured data to follow Google's
 guidelines (#9764)

All Schema.org properties are optional, but Google has a set of
properties which are required.
---
 app/views/topics/show.html.erb | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index c72ab9a427..a395d4374e 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -36,9 +36,17 @@
   <%- if include_crawler_content? %>
 
   <% @topic_view.posts.each_with_index do |post, idx| %>
-    <div itemscope itemtype='http://schema.org/DiscussionForumPosting' class='topic-body crawler-post'>
-      <% if (u = post.user) %>
+    <% if (u = post.user) %>
+      <div itemscope itemtype='http://schema.org/DiscussionForumPosting' class='topic-body crawler-post'>
         <div class='crawler-post-meta'>
+          <div itemprop='publisher' itemscope itemtype="http://schema.org/Organization">
+            <meta itemprop='name' content='<%= SiteSetting.company_name.presence || SiteSetting.title %>'>
+            <% if application_logo_url.present? %>
+              <div itemprop='logo' itemscope itemtype="http://schema.org/ImageObject">
+                <meta itemprop='url' content='<%= application_logo_url %>'>
+              </div>
+            <% end %>
+          </div>
           <span class="creator" itemprop="author" itemscope itemtype="http://schema.org/Person">
             <a itemprop="url" href='<%= Discourse.base_url %>/u/<%= u.username %>'><span itemprop='name'><%= u.username %></span></a>
             <%= "(#{u.name})" if (SiteSetting.display_name_on_posts && SiteSetting.enable_names? && !u.name.blank?) %>
@@ -51,6 +59,8 @@
             <% end %>
           </span>
 
+          <link itemprop="mainEntityOfPage" href="<%= post.topic.url %>">
+
           <% if post.image_url %>
             <link itemprop="image" href="<%= Discourse.base_url %><%= post.image_url %>">
           <% end %>
@@ -105,9 +115,8 @@
               <% end %>
             </div>
          <% end %>
-
-      <% end %>
-    </div>
+      </div>
+    <% end %>
   <% end %>
 
   <% if @topic_view.prev_page || @topic_view.next_page %>

From 5b603cb3ab8a3f24b13767458ec9c45552cb03c8 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 14 May 2020 17:51:44 +1000
Subject: [PATCH 1172/1830] FIX: update mini racer to correct heap dumps

This corrects an issue where mini racer's `write_heap_snapshot`
produces corrupt heaps cause the file is not flushed.
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 87d71f722e..ce187c888d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -188,7 +188,7 @@ GEM
     method_source (1.0.0)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    mini_racer (0.2.10)
+    mini_racer (0.2.11)
       libv8 (> 7.3)
     mini_scheduler (0.12.2)
       sidekiq

From d7e230c1b9115fa3806382bfc32d98cdfc27b711 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 14 May 2020 13:56:45 +0800
Subject: [PATCH 1173/1830] UX: Introduce composer-actions when editing a post.

---
 .../app/components/composer-action-title.js   |  1 -
 .../components/composer-action-title.hbs      | 26 ++++++-------
 .../select-kit/components/composer-actions.js | 38 ++++++++++++++-----
 .../acceptance/composer-actions-test.js       | 12 ++++++
 4 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/composer-action-title.js b/app/assets/javascripts/discourse/app/components/composer-action-title.js
index c48009c6ba..9f61ab4bff 100644
--- a/app/assets/javascripts/discourse/app/components/composer-action-title.js
+++ b/app/assets/javascripts/discourse/app/components/composer-action-title.js
@@ -23,7 +23,6 @@ export default Component.extend({
   classNames: ["composer-action-title"],
   options: alias("model.replyOptions"),
   action: alias("model.action"),
-  isEditing: equal("action", EDIT),
 
   @discourseComputed("options", "action")
   actionTitle(opts, action) {
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-action-title.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-action-title.hbs
index 5d3b2eef4d..1551e4aff4 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-action-title.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/composer-action-title.hbs
@@ -1,18 +1,14 @@
-{{#if isEditing}}
-  {{d-icon "pencil-alt"}}
-{{else}}
-  {{composer-actions
-    composerModel=model
-    replyOptions=model.replyOptions
-    canWhisper=canWhisper
-    openComposer=openComposer
-    closeComposer=closeComposer
-    action=model.action
-    tabindex=tabindex
-    topic=model.topic
-    post=model.post
-  }}
-{{/if}}
+{{composer-actions
+  composerModel=model
+  replyOptions=model.replyOptions
+  canWhisper=canWhisper
+  openComposer=openComposer
+  closeComposer=closeComposer
+  action=model.action
+  tabindex=tabindex
+  topic=model.topic
+  post=model.post
+}}
 
 <span class="action-title">
   {{actionTitle}}
diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js b/app/assets/javascripts/select-kit/components/composer-actions.js
index 0dc266e417..2af59593f1 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js
@@ -4,10 +4,12 @@ import {
   PRIVATE_MESSAGE,
   CREATE_TOPIC,
   CREATE_SHARED_DRAFT,
-  REPLY
+  REPLY,
+  EDIT
 } from "discourse/models/composer";
 import Draft from "discourse/models/draft";
 import { computed } from "@ember/object";
+import { equal } from "@ember/object/computed";
 import { camelize } from "@ember/string";
 import { isEmpty } from "@ember/utils";
 
@@ -24,13 +26,23 @@ export default DropdownSelectBoxComponent.extend({
   seq: 0,
   pluginApiIdentifiers: ["composer-actions"],
   classNames: ["composer-actions"],
+  isEditing: equal("action", EDIT),
 
   selectKitOptions: {
-    icon: "share",
+    icon: "iconForComposerAction",
     filterable: false,
     showFullTitle: false
   },
 
+  iconForComposerAction: computed("action", function() {
+    switch (this.action) {
+      case EDIT:
+        return "pencil-alt";
+      default:
+        return "share";
+    }
+  }),
+
   contentChanged() {
     this.set("seq", this.seq + 1);
   },
@@ -54,6 +66,11 @@ export default DropdownSelectBoxComponent.extend({
       this.contentChanged();
     }
 
+    this.set(
+      "selectKit.options.icon",
+      this.action === EDIT ? "pencil-alt" : "share"
+    );
+
     if (isEmpty(this.content)) {
       this.set("selectKit.isHidden", true);
     }
@@ -69,6 +86,7 @@ export default DropdownSelectBoxComponent.extend({
     if (
       this.action !== CREATE_TOPIC &&
       this.action !== CREATE_SHARED_DRAFT &&
+      !this.isEditing &&
       _topicSnapshot
     ) {
       items.push({
@@ -100,7 +118,8 @@ export default DropdownSelectBoxComponent.extend({
 
     if (
       this.siteSettings.enable_personal_messages &&
-      this.action !== PRIVATE_MESSAGE
+      this.action !== PRIVATE_MESSAGE &&
+      !this.isEditing
     ) {
       items.push({
         name: I18n.t(
@@ -115,12 +134,13 @@ export default DropdownSelectBoxComponent.extend({
     }
 
     if (
-      (this.action !== REPLY && _topicSnapshot) ||
-      (this.action === REPLY &&
-        _topicSnapshot &&
-        this.replyOptions.userAvatar &&
-        this.replyOptions.userLink &&
-        this.replyOptions.topicLink)
+      !this.isEditing &&
+      ((this.action !== REPLY && _topicSnapshot) ||
+        (this.action === REPLY &&
+          _topicSnapshot &&
+          this.replyOptions.userAvatar &&
+          this.replyOptions.userLink &&
+          this.replyOptions.topicLink))
     ) {
       items.push({
         name: I18n.t("composer.composer_actions.reply_to_topic.label"),
diff --git a/test/javascripts/acceptance/composer-actions-test.js b/test/javascripts/acceptance/composer-actions-test.js
index bd7458ccb0..729e307ffb 100644
--- a/test/javascripts/acceptance/composer-actions-test.js
+++ b/test/javascripts/acceptance/composer-actions-test.js
@@ -339,6 +339,18 @@ QUnit.test(
   }
 );
 
+QUnit.test("editing post", async assert => {
+  const composerActions = selectKit(".composer-actions");
+
+  await visit("/t/internationalization-localization/280");
+  await click("article#post_1 button.show-more-actions");
+  await click("article#post_1 button.edit");
+  await composerActions.expand();
+
+  assert.equal(composerActions.rows().length, 1);
+  assert.equal(composerActions.rowByIndex(0).value(), "reply_to_post");
+});
+
 acceptance("Composer Actions With New Topic Draft", {
   loggedIn: true,
   settings: {

From 95a80525ae81387b7f4dcf84c6618d74d1d46e82 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 14 May 2020 15:58:44 +0800
Subject: [PATCH 1174/1830] DEV: Remove erroneous code introduced in
 d7e230c1b9115fa3806382bfc32d98cdfc27b711

---
 .../javascripts/select-kit/components/composer-actions.js    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js b/app/assets/javascripts/select-kit/components/composer-actions.js
index 2af59593f1..114d0e32f2 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js
@@ -66,11 +66,6 @@ export default DropdownSelectBoxComponent.extend({
       this.contentChanged();
     }
 
-    this.set(
-      "selectKit.options.icon",
-      this.action === EDIT ? "pencil-alt" : "share"
-    );
-
     if (isEmpty(this.content)) {
       this.set("selectKit.isHidden", true);
     }

From fdea969f14be8ea6d38fac9a6057fc3bca75884d Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 14 May 2020 16:02:54 +0800
Subject: [PATCH 1175/1830] DEV: Minor follow up to
 d7e230c1b9115fa3806382bfc32d98cdfc27b711

---
 .../javascripts/select-kit/components/composer-actions.js  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js b/app/assets/javascripts/select-kit/components/composer-actions.js
index 114d0e32f2..5740a91f5c 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js
@@ -35,12 +35,7 @@ export default DropdownSelectBoxComponent.extend({
   },
 
   iconForComposerAction: computed("action", function() {
-    switch (this.action) {
-      case EDIT:
-        return "pencil-alt";
-      default:
-        return "share";
-    }
+    return this.isEditing ? "pencil-alt" : "share";
   }),
 
   contentChanged() {

From a1a798ac7d004b88064098cf3a38dab24ee25f94 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 14 May 2020 14:27:55 +0800
Subject: [PATCH 1176/1830] DEV: Expose `Composer.serializeOnUpdate` in client
 side plugin api.

Also expose `Composer.serializeOnCreate` as well.
---
 .../discourse/app/lib/plugin-api.js           | 32 ++++++++++++++++++-
 .../discourse/app/models/composer.js          | 25 +++++++++++++--
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index a10e183bf2..4b6356c44d 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -55,7 +55,7 @@ import { on } from "@ember/object/evented";
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.8.43";
+const PLUGIN_API_VERSION = "0.9.0";
 
 class PluginApi {
   constructor(version, container) {
@@ -956,6 +956,36 @@ class PluginApi {
     Composer.serializeToDraft(fieldName, property);
   }
 
+  /**
+   * Adds a field to composer create serializer
+   *
+   * Example:
+   *
+   * api.serializeOnCreate('key_set_in_model', 'field_name_in_payload');
+   *
+   * to keep both of them same
+   * api.serializeOnCreate('field_name');
+   *
+   */
+  serializeOnCreate(fieldName, property) {
+    Composer.serializeOnCreate(fieldName, property);
+  }
+
+  /**
+   * Adds a field to composer update serializer
+   *
+   * Example:
+   *
+   * api.serializeOnUpdate('key_set_in_model', 'field_name_in_payload');
+   *
+   * to keep both of them same
+   * api.serializeOnUpdate('field_name');
+   *
+   */
+  serializeOnUpdate(fieldName, property) {
+    Composer.serializeOnUpdate(fieldName, property);
+  }
+
   /**
    * Registers a criteria that can be used as default topic order on category
    * pages.
diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index a17461a856..98ccdfaa6d 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -61,6 +61,11 @@ const CLOSED = "closed",
     no_bump: "noBump",
     draft_key: "draftKey"
   },
+  _update_serializer = {
+    raw: "reply",
+    topic_id: "topic.id",
+    raw_old: "rawOld"
+  },
   _edit_topic_serializer = {
     title: "topic.title",
     categoryId: "topic.category.id",
@@ -851,6 +856,11 @@ const Composer = RestModel.extend({
     });
   },
 
+  @discourseComputed("editConflict", "originalText")
+  rawOld(editConflict, originalText) {
+    return editConflict ? null : originalText;
+  },
+
   editPost(opts) {
     const post = this.post;
     const oldCooked = post.cooked;
@@ -885,14 +895,12 @@ const Composer = RestModel.extend({
     }
 
     const props = {
-      topic_id: this.topic.id,
-      raw: this.reply,
-      raw_old: this.editConflict ? null : this.originalText,
       edit_reason: opts.editReason,
       image_sizes: opts.imageSizes,
       cooked: this.getCookedHtml()
     };
 
+    this.serialize(_update_serializer, props);
     this.set("composeState", SAVING);
 
     const rollback = throwAjaxError(error => {
@@ -1225,6 +1233,17 @@ Composer.reopenClass({
     return Object.keys(_create_serializer);
   },
 
+  serializeOnUpdate(fieldName, property) {
+    if (!property) {
+      property = fieldName;
+    }
+    _update_serializer[fieldName] = property;
+  },
+
+  serializedFieldsForUpdate() {
+    return Object.keys(_update_serializer);
+  },
+
   serializeToDraft(fieldName, property) {
     if (!property) {
       property = fieldName;

From 9a18bacbe3412824fa9ada22237bab8f0ac25169 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 14 May 2020 16:10:51 +0800
Subject: [PATCH 1177/1830] DEV: Fix lint.

---
 .../discourse/app/components/composer-action-title.js           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/composer-action-title.js b/app/assets/javascripts/discourse/app/components/composer-action-title.js
index 9f61ab4bff..0b58290f31 100644
--- a/app/assets/javascripts/discourse/app/components/composer-action-title.js
+++ b/app/assets/javascripts/discourse/app/components/composer-action-title.js
@@ -1,5 +1,5 @@
 import I18n from "I18n";
-import { alias, equal } from "@ember/object/computed";
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import {

From 321879a61977e21bf645d53eafcefdee33d8a867 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Thu, 14 May 2020 11:48:55 +0300
Subject: [PATCH 1178/1830] FIX: Load locale first in wizard app

---
 app/views/wizard/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/wizard/index.html.erb b/app/views/wizard/index.html.erb
index a4ca2cb460..e9df213a66 100644
--- a/app/views/wizard/index.html.erb
+++ b/app/views/wizard/index.html.erb
@@ -1,11 +1,11 @@
 <html>
   <head>
     <%= discourse_stylesheet_link_tag :wizard, theme_ids: nil %>
-    <%= preload_script 'ember_jquery' %>
     <%= preload_script "locales/#{I18n.locale}" %>
     <%- if ExtraLocalesController.client_overrides_exist? %>
       <%= preload_script_url ExtraLocalesController.url('overrides') %>
     <%- end %>
+    <%= preload_script 'ember_jquery' %>
     <%= preload_script 'wizard-vendor' %>
     <%= preload_script 'wizard-application' %>
     <%= preload_script_url ExtraLocalesController.url('wizard') %>

From 3ed6a0e9046f12145332a08c9fdcdc948ca0d5cd Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Thu, 14 May 2020 14:10:07 +0300
Subject: [PATCH 1179/1830] FIX: Detect Wayback Machine using user agent
 (#9777)

---
 lib/crawler_detection.rb                  | 4 ++--
 spec/components/crawler_detection_spec.rb | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/crawler_detection.rb b/lib/crawler_detection.rb
index 6cd1eba542..4a90f84865 100644
--- a/lib/crawler_detection.rb
+++ b/lib/crawler_detection.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module CrawlerDetection
-  WAYBACK_MACHINE_URL = "web.archive.org"
+  WAYBACK_MACHINE_URL = "archive.org"
 
   def self.to_matcher(string, type: nil)
     escaped = string.split('|').map { |agent| Regexp.escape(agent) }.join('|')
@@ -15,7 +15,7 @@ module CrawlerDetection
   end
 
   def self.crawler?(user_agent, via_header = nil)
-    return true if user_agent.nil? || via_header&.include?(WAYBACK_MACHINE_URL)
+    return true if user_agent.nil? || user_agent&.include?(WAYBACK_MACHINE_URL) || via_header&.include?(WAYBACK_MACHINE_URL)
 
     # this is done to avoid regenerating regexes
     @non_crawler_matchers ||= {}
diff --git a/spec/components/crawler_detection_spec.rb b/spec/components/crawler_detection_spec.rb
index db45d2cbd6..1492d010fb 100644
--- a/spec/components/crawler_detection_spec.rb
+++ b/spec/components/crawler_detection_spec.rb
@@ -51,7 +51,9 @@ describe CrawlerDetection do
     end
 
     it "returns true when VIA header contains 'web.archive.org'" do
-      crawler!("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36", "HTTP/1.0 web.archive.org (Wayback Save Page)")
+      crawler! "Mozilla/5.0 (compatible; archive.org_bot +http://archive.org/details/archive.org_bot)"
+      crawler! "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36", "HTTP/1.0 web.archive.org (Wayback Save Page)"
+      crawler! "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36", "Mozilla/5.0 (compatible; archive.org_bot; Wayback Machine Live Record; http://archive.org/details/archive.org_bot), 1.1 warcprox"
     end
 
     it "returns false for non-crawler user agents" do

From 42e5a5bb3986af8f4dff9195f83ebe7dd81a8b96 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 14 May 2020 14:38:03 +0200
Subject: [PATCH 1180/1830] DEV: do not append/prepend if callback returns
 nothing (#9778)

---
 .../select-kit/mixins/plugin-api.js           | 10 +++++++--
 .../components/select-kit/api-test.js         | 22 ++++++++++++-------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/select-kit/mixins/plugin-api.js b/app/assets/javascripts/select-kit/mixins/plugin-api.js
index 22f446dca6..50b05977f5 100644
--- a/app/assets/javascripts/select-kit/mixins/plugin-api.js
+++ b/app/assets/javascripts/select-kit/mixins/plugin-api.js
@@ -32,10 +32,16 @@ function onChange(pluginApiIdentifiers, mutationFunction) {
 export function applyContentPluginApiCallbacks(content, component) {
   makeArray(component.pluginApiIdentifiers).forEach(key => {
     (_prependContentCallbacks[key] || []).forEach(c => {
-      content = makeArray(c(component, content)).concat(content);
+      const prependedContent = c(component, content);
+      if (prependedContent) {
+        content = makeArray(prependedContent).concat(content);
+      }
     });
     (_appendContentCallbacks[key] || []).forEach(c => {
-      content = content.concat(makeArray(c(component, content)));
+      const appendedContent = c(component, content);
+      if (appendedContent) {
+        content = content.concat(makeArray(appendedContent));
+      }
     });
   });
 
diff --git a/test/javascripts/components/select-kit/api-test.js b/test/javascripts/components/select-kit/api-test.js
index db17590ede..68414809b4 100644
--- a/test/javascripts/components/select-kit/api-test.js
+++ b/test/javascripts/components/select-kit/api-test.js
@@ -36,14 +36,18 @@ componentTest("modifySelectKit(identifier).appendContent", {
           name: "Alpaca"
         };
       });
+      api.modifySelectKit("combo-box").appendContent(() => {});
     });
   },
 
   async test(assert) {
     await this.comboBox.expand();
-    const row = this.comboBox.rowByIndex(3);
-    assert.ok(row.exists());
-    assert.equal(row.value(), "alpaca");
+
+    assert.equal(this.comboBox.rows().length, 4);
+
+    const appendedRow = this.comboBox.rowByIndex(3);
+    assert.ok(appendedRow.exists());
+    assert.equal(appendedRow.value(), "alpaca");
 
     await this.comboBox.collapse();
 
@@ -67,16 +71,18 @@ componentTest("modifySelectKit(identifier).prependContent", {
           name: "Alpaca"
         };
       });
+      api.modifySelectKit("combo-box").prependContent(() => {});
     });
   },
 
-  afterEach() {},
-
   async test(assert) {
     await this.comboBox.expand();
-    const row = this.comboBox.rowByIndex(0);
-    assert.ok(row.exists());
-    assert.equal(row.value(), "alpaca");
+
+    assert.equal(this.comboBox.rows().length, 4);
+
+    const prependedRow = this.comboBox.rowByIndex(0);
+    assert.ok(prependedRow.exists());
+    assert.equal(prependedRow.value(), "alpaca");
 
     await this.comboBox.collapse();
 

From a047004c9aaf0652af0d773d48f9ecda351985c5 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Thu, 14 May 2020 09:04:58 -0500
Subject: [PATCH 1181/1830] FIX: Specific email error for replies to digest
 emails (#9770)

---
 config/locales/server.en.yml           | 10 ++++++++
 lib/email/processor.rb                 |  1 +
 lib/email/receiver.rb                  |  2 ++
 spec/components/email/receiver_spec.rb | 35 ++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 2840e4fd5b..996fd4040b 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3094,6 +3094,16 @@ en:
 
         You don't have permissions to reply to the topic. If you believe this is an error, [contact a staff member](%{base_url}/about).
 
+    email_reject_reply_to_digest:
+      title: "Email Reject Reply To Summary"
+      subject_template: "[%{email_prefix}] Email issue -- Reply to Summary"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        You replied to a Summary email, which is not accepted.
+
+        If you believe this is an error, [contact a staff member](%{base_url}/about).
+
     email_error_notification:
       title: "Email Error Notification"
       subject_template: "[%{email_prefix}] Email issue -- POP authentication error"
diff --git a/lib/email/processor.rb b/lib/email/processor.rb
index 76acd2749e..e9b8857234 100644
--- a/lib/email/processor.rb
+++ b/lib/email/processor.rb
@@ -66,6 +66,7 @@ module Email
                          when Discourse::InvalidAccess                     then :email_reject_invalid_access
                          when Email::Receiver::OldDestinationError         then :email_reject_old_destination
                          when Email::Receiver::ReplyNotAllowedError        then :email_reject_reply_not_allowed
+                         when Email::Receiver::ReplyToDigestError          then :email_reject_reply_to_digest
                          else                                                   :email_reject_unrecognized_error
       end
 
diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index 3cb73a8976..fad5e42cfb 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -32,6 +32,7 @@ module Email
     class UnsubscribeNotAllowed        < ProcessingError; end
     class EmailNotAllowed              < ProcessingError; end
     class OldDestinationError          < ProcessingError; end
+    class ReplyToDigestError           < ProcessingError; end
 
     attr_reader :incoming_email
     attr_reader :raw_email
@@ -190,6 +191,7 @@ module Email
           end
         end
 
+        raise ReplyToDigestError if EmailLog.where(email_type: "digest", message_id: @mail.in_reply_to).exists?
         raise BadDestinationAddress
       end
     end
diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb
index 7644d6df06..9a601c067d 100644
--- a/spec/components/email/receiver_spec.rb
+++ b/spec/components/email/receiver_spec.rb
@@ -1531,4 +1531,39 @@ describe Email::Receiver do
     end
 
   end
+
+  describe "replying to digest" do
+    fab!(:user) { Fabricate(:user) }
+    fab!(:digest_message_id) { "7402d8ae-1c6e-44bc-9948-48e007839bcc@localhost" }
+    fab!(:email_log) { Fabricate(:email_log,
+      user: user,
+      email_type: 'digest',
+      to_address: user.email,
+      message_id: digest_message_id
+    )}
+    let(:email) {
+      <<~EOF
+      MIME-Version: 1.0
+      Date: Tue, 01 Jan 2019 00:00:00 +0300
+      From: someone <#{user.email}>
+      To: Discourse <#{SiteSetting.notification_email}>
+      Message-ID: <CANtGPwC3ZmWSxnnEuJHfosbtc9d0-ZV02b_7KuyircDt4peDC2@mail.gmail.com>
+      In-Reply-To: <#{digest_message_id}>
+      Subject: Re: [Discourse] Summary
+      References: <#{digest_message_id}>
+      Content-Type: text/plain; charset="UTF-8"
+
+      hello there! I like the digest!
+
+      EOF
+    }
+
+    before do
+      Jobs.run_immediately!
+    end
+
+    it 'returns a ReplyToDigestError' do
+      expect { Email::Receiver.new(email).process! }.to raise_error(Email::Receiver::ReplyToDigestError)
+    end
+  end
 end

From aa2d040526cdfac5d14a6d3e323042cd0089d812 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 14 May 2020 10:04:08 -0400
Subject: [PATCH 1182/1830] DEV: Update ESLint to remove I18n global

Also fixes missed imports in core.
---
 app/assets/javascripts/discourse-loader.js                | 1 +
 .../discourse/app/mixins/user-fields-validation.js        | 1 +
 app/assets/javascripts/preload-application-data.js        | 1 +
 package.json                                              | 2 +-
 test/javascripts/acceptance/admin-user-emails-test.js     | 1 +
 test/javascripts/acceptance/admin-users-list-test.js      | 1 +
 test/javascripts/acceptance/bookmarks-test.js             | 1 +
 test/javascripts/acceptance/composer-actions-test.js      | 1 +
 .../javascripts/acceptance/composer-edit-conflict-test.js | 1 +
 test/javascripts/acceptance/composer-test.js              | 1 +
 test/javascripts/acceptance/forgot-password-test.js       | 1 +
 test/javascripts/acceptance/group-index-test.js           | 1 +
 test/javascripts/acceptance/group-test.js                 | 1 +
 test/javascripts/acceptance/groups-new-test.js            | 1 +
 .../login-with-email-and-hide-email-address-taken-test.js | 1 +
 test/javascripts/acceptance/login-with-email-test.js      | 1 +
 test/javascripts/acceptance/password-reset-test.js        | 1 +
 test/javascripts/acceptance/personal-message-test.js      | 1 +
 test/javascripts/acceptance/preferences-test.js           | 1 +
 .../acceptance/topic-footer-buttons-mobile-test.js        | 1 +
 test/javascripts/acceptance/topic-move-posts-test.js      | 1 +
 test/javascripts/acceptance/topic-test.js                 | 1 +
 .../javascripts/admin/components/themes-list-item-test.js | 1 +
 test/javascripts/admin/components/themes-list-test.js     | 1 +
 test/javascripts/components/d-button-test.js              | 1 +
 test/javascripts/components/d-editor-test.js              | 1 +
 test/javascripts/components/secret-value-list-test.js     | 1 +
 .../components/select-kit/category-chooser-test.js        | 1 +
 .../components/select-kit/category-drop-test.js           | 1 +
 .../components/select-kit/mini-tag-chooser-test.js        | 1 +
 .../components/select-kit/single-select-test.js           | 1 +
 test/javascripts/components/select-kit/tag-drop-test.js   | 1 +
 .../select-kit/topic-notifications-button-test.js         | 1 +
 .../select-kit/topic-notifications-options-test.js        | 1 +
 test/javascripts/components/text-field-test.js            | 1 +
 test/javascripts/controllers/create-account-test.js       | 1 +
 test/javascripts/fixtures/topic.js                        | 1 +
 test/javascripts/initializers/localization-test.js        | 1 +
 test/javascripts/lib/computed-test.js                     | 1 +
 test/javascripts/lib/i18n-test.js                         | 1 +
 test/javascripts/lib/search-test.js                       | 1 +
 test/javascripts/lib/uploads-test.js                      | 1 +
 test/javascripts/models/user-drafts-test.js               | 1 +
 test/javascripts/widgets/post-test.js                     | 1 +
 test/javascripts/widgets/user-menu-test.js                | 1 +
 test/javascripts/widgets/widget-dropdown-test.js          | 1 +
 test/javascripts/widgets/widget-test.js                   | 1 +
 yarn.lock                                                 | 8 ++++----
 48 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 8442f0cec7..d11217a985 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -143,6 +143,7 @@ var define, requirejs;
         guidFor: Ember.guidFor
       },
       I18n: {
+        // eslint-disable-next-line
         default: I18n
       }
     };
diff --git a/app/assets/javascripts/discourse/app/mixins/user-fields-validation.js b/app/assets/javascripts/discourse/app/mixins/user-fields-validation.js
index 520fb8af2a..46051a9e50 100644
--- a/app/assets/javascripts/discourse/app/mixins/user-fields-validation.js
+++ b/app/assets/javascripts/discourse/app/mixins/user-fields-validation.js
@@ -2,6 +2,7 @@ import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
 import Mixin from "@ember/object/mixin";
+import I18n from "I18n";
 
 export default Mixin.create({
   @on("init")
diff --git a/app/assets/javascripts/preload-application-data.js b/app/assets/javascripts/preload-application-data.js
index 0b93ded00d..bb11ecbea4 100644
--- a/app/assets/javascripts/preload-application-data.js
+++ b/app/assets/javascripts/preload-application-data.js
@@ -3,6 +3,7 @@
   const ps = require("discourse/lib/preload-store").default;
   const preloadedDataElement = document.getElementById("data-preloaded");
   const setupData = document.getElementById("data-discourse-setup").dataset;
+  const I18n = require("I18n").default;
 
   if (preloadedDataElement) {
     const preloaded = JSON.parse(preloadedDataElement.dataset.preloaded);
diff --git a/package.json b/package.json
index 1c6fb3db61..c055b38c2b 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "chrome-launcher": "^0.12.0",
     "chrome-remote-interface": "^0.25",
     "ember-template-lint": "^2.5.2",
-    "eslint-config-discourse": "1.1.1",
+    "eslint-config-discourse": "1.1.2",
     "eslint-plugin-discourse-ember": "0.0.3",
     "lodash-cli": "https://github.com/lodash-archive/lodash-cli.git",
     "pretender": "^1.6",
diff --git a/test/javascripts/acceptance/admin-user-emails-test.js b/test/javascripts/acceptance/admin-user-emails-test.js
index a9c0c2dcb3..80c7bf437e 100644
--- a/test/javascripts/acceptance/admin-user-emails-test.js
+++ b/test/javascripts/acceptance/admin-user-emails-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Admin - User Emails", { loggedIn: true });
diff --git a/test/javascripts/acceptance/admin-users-list-test.js b/test/javascripts/acceptance/admin-users-list-test.js
index 1c41fce169..dc0d65ff5f 100644
--- a/test/javascripts/acceptance/admin-users-list-test.js
+++ b/test/javascripts/acceptance/admin-users-list-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Admin - Users List", { loggedIn: true });
diff --git a/test/javascripts/acceptance/bookmarks-test.js b/test/javascripts/acceptance/bookmarks-test.js
index c2b26fbe6f..db94c6a8f3 100644
--- a/test/javascripts/acceptance/bookmarks-test.js
+++ b/test/javascripts/acceptance/bookmarks-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import {
   acceptance,
   loggedInUser,
diff --git a/test/javascripts/acceptance/composer-actions-test.js b/test/javascripts/acceptance/composer-actions-test.js
index 729e307ffb..fb1a374dc3 100644
--- a/test/javascripts/acceptance/composer-actions-test.js
+++ b/test/javascripts/acceptance/composer-actions-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import selectKit from "helpers/select-kit-helper";
 import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
 import { _clearSnapshots } from "select-kit/components/composer-actions";
diff --git a/test/javascripts/acceptance/composer-edit-conflict-test.js b/test/javascripts/acceptance/composer-edit-conflict-test.js
index 890a7dff5c..3da144dbee 100644
--- a/test/javascripts/acceptance/composer-edit-conflict-test.js
+++ b/test/javascripts/acceptance/composer-edit-conflict-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { acceptance } from "helpers/qunit-helpers";
 import pretender from "helpers/create-pretender";
 
diff --git a/test/javascripts/acceptance/composer-test.js b/test/javascripts/acceptance/composer-test.js
index 9520bd9d5c..95fed9f93b 100644
--- a/test/javascripts/acceptance/composer-test.js
+++ b/test/javascripts/acceptance/composer-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { run } from "@ember/runloop";
 import selectKit from "helpers/select-kit-helper";
 import { acceptance } from "helpers/qunit-helpers";
diff --git a/test/javascripts/acceptance/forgot-password-test.js b/test/javascripts/acceptance/forgot-password-test.js
index 773f570913..c568873888 100644
--- a/test/javascripts/acceptance/forgot-password-test.js
+++ b/test/javascripts/acceptance/forgot-password-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { acceptance } from "helpers/qunit-helpers";
 
 let userFound = false;
diff --git a/test/javascripts/acceptance/group-index-test.js b/test/javascripts/acceptance/group-index-test.js
index d3ea58aac6..55feb15fdb 100644
--- a/test/javascripts/acceptance/group-index-test.js
+++ b/test/javascripts/acceptance/group-index-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
 
 acceptance("Group Members");
diff --git a/test/javascripts/acceptance/group-test.js b/test/javascripts/acceptance/group-test.js
index 9ba5a9f2f0..530774b0d6 100644
--- a/test/javascripts/acceptance/group-test.js
+++ b/test/javascripts/acceptance/group-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import selectKit from "helpers/select-kit-helper";
 import { acceptance } from "helpers/qunit-helpers";
 import pretender from "helpers/create-pretender";
diff --git a/test/javascripts/acceptance/groups-new-test.js b/test/javascripts/acceptance/groups-new-test.js
index 62f88b9710..aba3bca3a2 100644
--- a/test/javascripts/acceptance/groups-new-test.js
+++ b/test/javascripts/acceptance/groups-new-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("New Group");
diff --git a/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js b/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js
index 1c12c1f055..e1902d7cbe 100644
--- a/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js
+++ b/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { acceptance } from "helpers/qunit-helpers";
 import pretender from "helpers/create-pretender";
 
diff --git a/test/javascripts/acceptance/login-with-email-test.js b/test/javascripts/acceptance/login-with-email-test.js
index 738c2920d3..dbc8cccd5f 100644
--- a/test/javascripts/acceptance/login-with-email-test.js
+++ b/test/javascripts/acceptance/login-with-email-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { acceptance } from "helpers/qunit-helpers";
 
 let userFound = false;
diff --git a/test/javascripts/acceptance/password-reset-test.js b/test/javascripts/acceptance/password-reset-test.js
index 0bec015050..be63589102 100644
--- a/test/javascripts/acceptance/password-reset-test.js
+++ b/test/javascripts/acceptance/password-reset-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { acceptance } from "helpers/qunit-helpers";
 import PreloadStore from "discourse/lib/preload-store";
 import { parsePostData } from "helpers/create-pretender";
diff --git a/test/javascripts/acceptance/personal-message-test.js b/test/javascripts/acceptance/personal-message-test.js
index b705d59960..4762d456c3 100644
--- a/test/javascripts/acceptance/personal-message-test.js
+++ b/test/javascripts/acceptance/personal-message-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Personal Message", {
diff --git a/test/javascripts/acceptance/preferences-test.js b/test/javascripts/acceptance/preferences-test.js
index 4e2f2d5979..a9db1f08e5 100644
--- a/test/javascripts/acceptance/preferences-test.js
+++ b/test/javascripts/acceptance/preferences-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
 import selectKit from "helpers/select-kit-helper";
 
diff --git a/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js b/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js
index ca3483ad28..db3268fe61 100644
--- a/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js
+++ b/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import selectKit from "helpers/select-kit-helper";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import { clearTopicFooterButtons } from "discourse/lib/register-topic-footer-button";
diff --git a/test/javascripts/acceptance/topic-move-posts-test.js b/test/javascripts/acceptance/topic-move-posts-test.js
index ea5ab11a06..8d9124f440 100644
--- a/test/javascripts/acceptance/topic-move-posts-test.js
+++ b/test/javascripts/acceptance/topic-move-posts-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Topic move posts", { loggedIn: true });
 
diff --git a/test/javascripts/acceptance/topic-test.js b/test/javascripts/acceptance/topic-test.js
index ab271369c3..eae9f30446 100644
--- a/test/javascripts/acceptance/topic-test.js
+++ b/test/javascripts/acceptance/topic-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import selectKit from "helpers/select-kit-helper";
 import { acceptance } from "helpers/qunit-helpers";
diff --git a/test/javascripts/admin/components/themes-list-item-test.js b/test/javascripts/admin/components/themes-list-item-test.js
index ff94859bb2..134cf6cded 100644
--- a/test/javascripts/admin/components/themes-list-item-test.js
+++ b/test/javascripts/admin/components/themes-list-item-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import componentTest from "helpers/component-test";
 import Theme from "admin/models/theme";
 
diff --git a/test/javascripts/admin/components/themes-list-test.js b/test/javascripts/admin/components/themes-list-test.js
index 420a75f4e3..8a2d595f1e 100644
--- a/test/javascripts/admin/components/themes-list-test.js
+++ b/test/javascripts/admin/components/themes-list-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import componentTest from "helpers/component-test";
 import Theme, { THEMES, COMPONENTS } from "admin/models/theme";
 
diff --git a/test/javascripts/components/d-button-test.js b/test/javascripts/components/d-button-test.js
index 1d85d922c4..7d28c4d5e7 100644
--- a/test/javascripts/components/d-button-test.js
+++ b/test/javascripts/components/d-button-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import componentTest from "helpers/component-test";
 moduleForComponent("d-button", { integration: true });
 
diff --git a/test/javascripts/components/d-editor-test.js b/test/javascripts/components/d-editor-test.js
index 222ddeea76..480de56928 100644
--- a/test/javascripts/components/d-editor-test.js
+++ b/test/javascripts/components/d-editor-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { next } from "@ember/runloop";
 import { clearToolbarCallbacks } from "discourse/components/d-editor";
 import componentTest from "helpers/component-test";
diff --git a/test/javascripts/components/secret-value-list-test.js b/test/javascripts/components/secret-value-list-test.js
index 22e4e5d87b..72cb70f759 100644
--- a/test/javascripts/components/secret-value-list-test.js
+++ b/test/javascripts/components/secret-value-list-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import componentTest from "helpers/component-test";
 moduleForComponent("secret-value-list", { integration: true });
 
diff --git a/test/javascripts/components/select-kit/category-chooser-test.js b/test/javascripts/components/select-kit/category-chooser-test.js
index 19146cb3b4..3f921efec4 100644
--- a/test/javascripts/components/select-kit/category-chooser-test.js
+++ b/test/javascripts/components/select-kit/category-chooser-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import componentTest from "helpers/component-test";
 import { testSelectKitModule } from "helpers/select-kit-helper";
 
diff --git a/test/javascripts/components/select-kit/category-drop-test.js b/test/javascripts/components/select-kit/category-drop-test.js
index 923bd93bbc..38c32aa85c 100644
--- a/test/javascripts/components/select-kit/category-drop-test.js
+++ b/test/javascripts/components/select-kit/category-drop-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseURL from "discourse/lib/url";
 import Category from "discourse/models/category";
 import componentTest from "helpers/component-test";
diff --git a/test/javascripts/components/select-kit/mini-tag-chooser-test.js b/test/javascripts/components/select-kit/mini-tag-chooser-test.js
index f929cb99d4..76265e7f83 100644
--- a/test/javascripts/components/select-kit/mini-tag-chooser-test.js
+++ b/test/javascripts/components/select-kit/mini-tag-chooser-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import componentTest from "helpers/component-test";
 import { testSelectKitModule } from "helpers/select-kit-helper";
 
diff --git a/test/javascripts/components/select-kit/single-select-test.js b/test/javascripts/components/select-kit/single-select-test.js
index a360429488..ca041c13ec 100644
--- a/test/javascripts/components/select-kit/single-select-test.js
+++ b/test/javascripts/components/select-kit/single-select-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import componentTest from "helpers/component-test";
 import { testSelectKitModule } from "helpers/select-kit-helper";
 
diff --git a/test/javascripts/components/select-kit/tag-drop-test.js b/test/javascripts/components/select-kit/tag-drop-test.js
index 39ab21187f..c66eee0a26 100644
--- a/test/javascripts/components/select-kit/tag-drop-test.js
+++ b/test/javascripts/components/select-kit/tag-drop-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import componentTest from "helpers/component-test";
 import { testSelectKitModule } from "helpers/select-kit-helper";
 import Site from "discourse/models/site";
diff --git a/test/javascripts/components/select-kit/topic-notifications-button-test.js b/test/javascripts/components/select-kit/topic-notifications-button-test.js
index 101b0e1104..6f2f2861cc 100644
--- a/test/javascripts/components/select-kit/topic-notifications-button-test.js
+++ b/test/javascripts/components/select-kit/topic-notifications-button-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import selectKit from "helpers/select-kit-helper";
 import componentTest from "helpers/component-test";
 import Topic from "discourse/models/topic";
diff --git a/test/javascripts/components/select-kit/topic-notifications-options-test.js b/test/javascripts/components/select-kit/topic-notifications-options-test.js
index 454ea3e988..c0d30d4d97 100644
--- a/test/javascripts/components/select-kit/topic-notifications-options-test.js
+++ b/test/javascripts/components/select-kit/topic-notifications-options-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import selectKit from "helpers/select-kit-helper";
 import componentTest from "helpers/component-test";
 import Topic from "discourse/models/topic";
diff --git a/test/javascripts/components/text-field-test.js b/test/javascripts/components/text-field-test.js
index 7b26dddb10..0d458a02db 100644
--- a/test/javascripts/components/text-field-test.js
+++ b/test/javascripts/components/text-field-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import componentTest from "helpers/component-test";
 
 moduleForComponent("text-field", { integration: true });
diff --git a/test/javascripts/controllers/create-account-test.js b/test/javascripts/controllers/create-account-test.js
index 29494ceeaf..eaad2b7054 100644
--- a/test/javascripts/controllers/create-account-test.js
+++ b/test/javascripts/controllers/create-account-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { mapRoutes } from "discourse/mapping-router";
 
 moduleFor("controller:create-account", "controller:create-account", {
diff --git a/test/javascripts/fixtures/topic.js b/test/javascripts/fixtures/topic.js
index b520532feb..e1cf0a96ae 100644
--- a/test/javascripts/fixtures/topic.js
+++ b/test/javascripts/fixtures/topic.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 /*jshint maxlen:10000000 */
 export default {
   "/t/280/1.json": {
diff --git a/test/javascripts/initializers/localization-test.js b/test/javascripts/initializers/localization-test.js
index 7182e6d8f4..40de7c5c8f 100644
--- a/test/javascripts/initializers/localization-test.js
+++ b/test/javascripts/initializers/localization-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import LocalizationInitializer from "discourse/initializers/localization";
 
 QUnit.module("initializer:localization", {
diff --git a/test/javascripts/lib/computed-test.js b/test/javascripts/lib/computed-test.js
index 253673e5b6..b2eda9dcd7 100644
--- a/test/javascripts/lib/computed-test.js
+++ b/test/javascripts/lib/computed-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import EmberObject from "@ember/object";
 import {
   setting,
diff --git a/test/javascripts/lib/i18n-test.js b/test/javascripts/lib/i18n-test.js
index 9655f4420b..78c26ccddd 100644
--- a/test/javascripts/lib/i18n-test.js
+++ b/test/javascripts/lib/i18n-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 QUnit.module("lib:i18n", {
   _locale: I18n.locale,
   _fallbackLocale: I18n.fallbackLocale,
diff --git a/test/javascripts/lib/search-test.js b/test/javascripts/lib/search-test.js
index 6fe1f466c8..bb88e4e646 100644
--- a/test/javascripts/lib/search-test.js
+++ b/test/javascripts/lib/search-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import {
   translateResults,
   searchContextDescription
diff --git a/test/javascripts/lib/uploads-test.js b/test/javascripts/lib/uploads-test.js
index 0dfc71a4d7..dcbabe6144 100644
--- a/test/javascripts/lib/uploads-test.js
+++ b/test/javascripts/lib/uploads-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import {
   validateUploadedFiles,
   authorizedExtensions,
diff --git a/test/javascripts/models/user-drafts-test.js b/test/javascripts/models/user-drafts-test.js
index 20f68718df..2b6b23edfa 100644
--- a/test/javascripts/models/user-drafts-test.js
+++ b/test/javascripts/models/user-drafts-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import UserDraft from "discourse/models/user-draft";
 import { NEW_TOPIC_KEY } from "discourse/models/composer";
 import User from "discourse/models/user";
diff --git a/test/javascripts/widgets/post-test.js b/test/javascripts/widgets/post-test.js
index bc12234c31..90422c7809 100644
--- a/test/javascripts/widgets/post-test.js
+++ b/test/javascripts/widgets/post-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import EmberObject from "@ember/object";
 import { moduleForWidget, widgetTest } from "helpers/widget-test";
 
diff --git a/test/javascripts/widgets/user-menu-test.js b/test/javascripts/widgets/user-menu-test.js
index 39f2a33722..c9d1403275 100644
--- a/test/javascripts/widgets/user-menu-test.js
+++ b/test/javascripts/widgets/user-menu-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DiscourseURL from "discourse/lib/url";
 import { moduleForWidget, widgetTest } from "helpers/widget-test";
 
diff --git a/test/javascripts/widgets/widget-dropdown-test.js b/test/javascripts/widgets/widget-dropdown-test.js
index 2bc7f94b26..1d60a84615 100644
--- a/test/javascripts/widgets/widget-dropdown-test.js
+++ b/test/javascripts/widgets/widget-dropdown-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { moduleForWidget, widgetTest } from "helpers/widget-test";
 
 moduleForWidget("widget-dropdown");
diff --git a/test/javascripts/widgets/widget-test.js b/test/javascripts/widgets/widget-test.js
index 9df74324c7..5fcc1f28af 100644
--- a/test/javascripts/widgets/widget-test.js
+++ b/test/javascripts/widgets/widget-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { next } from "@ember/runloop";
 import { moduleForWidget, widgetTest } from "helpers/widget-test";
 import { createWidget } from "discourse/widgets/widget";
diff --git a/yarn.lock b/yarn.lock
index 0e7adeaa19..60ae598392 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -978,10 +978,10 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-eslint-config-discourse@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-1.1.1.tgz#8a7f7f6f1a388b0e88f5b79145ae2a8b4a13e3d4"
-  integrity sha512-b3dp9DOcXYWkPQpXms/bMDy0Scb6DO/nZAAsl5I9yTNhtkx96zZMTp9QEyC8QaCXOTUpIXEE6V+Mpyjtsk3gWg==
+eslint-config-discourse@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-1.1.2.tgz#f8569579ea3fc348a989bbab0780a5c426038744"
+  integrity sha512-yF29RxKyvFvQbnICCGext0rlXzQMm4AZuBxqOVFonjb0sUbB/08l/FyLHmXKpKgLCEMV6RrJKB7xxPL6twtUkA==
   dependencies:
     babel-eslint "^8.2"
     eslint "^4.19"

From 42b300b9beb6f8b93eed93322dd034656da96ba1 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 14 May 2020 10:40:53 -0400
Subject: [PATCH 1183/1830] DEV: Skip I18n in plugins until they can be updated

---
 .github/workflows/ci.yml | 2 +-
 lib/tasks/docker.rake    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 25dbc3839c..b5a33d7a45 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -137,7 +137,7 @@ jobs:
         if: env.BUILD_TYPE == 'LINT'
         run: |
           yarn eslint app/assets/javascripts test/javascripts
-          yarn eslint --ext .es6 app/assets/javascripts test/javascripts plugins
+          yarn eslint --global I18n --ext .es6 plugins
 
       - name: Prettier
         if: env.BUILD_TYPE == 'LINT'
diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index 2d1f9fee14..6733ae31a0 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -66,7 +66,7 @@ task 'docker:test' do
 
       if ENV["SINGLE_PLUGIN"]
         @good &&= run_or_fail("bundle exec rubocop --parallel plugins/#{ENV["SINGLE_PLUGIN"]}")
-        @good &&= run_or_fail("yarn eslint --ext .es6 plugins/#{ENV['SINGLE_PLUGIN']}")
+        @good &&= run_or_fail("yarn eslint --global I18n --ext .es6 plugins/#{ENV['SINGLE_PLUGIN']}")
 
         puts "Listing prettier offenses in #{ENV['SINGLE_PLUGIN']}:"
         @good &&= run_or_fail_prettier("plugins/#{ENV['SINGLE_PLUGIN']}/**/*.scss", "plugins/#{ENV['SINGLE_PLUGIN']}/**/*.es6")
@@ -74,7 +74,9 @@ task 'docker:test' do
         @good &&= run_or_fail("bundle exec rake plugin:update_all") unless ENV["SKIP_PLUGINS"]
         @good &&= run_or_fail("bundle exec rubocop --parallel") unless ENV["SKIP_CORE"]
         @good &&= run_or_fail("yarn eslint app/assets/javascripts test/javascripts") unless ENV["SKIP_CORE"]
-        @good &&= run_or_fail("yarn eslint --ext .es6 app/assets/javascripts test/javascripts plugins") unless ENV["SKIP_PLUGINS"]
+
+        # TODO: remove --global I18n once plugins can be updated
+        @good &&= run_or_fail("yarn eslint --global I18n --ext .es6 plugins") unless ENV["SKIP_PLUGINS"]
 
         unless ENV["SKIP_CORE"]
           puts "Listing prettier offenses in core:"

From ec8f08d0da1b32213f3674d8e6dd8ff98e84d39d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Thu, 14 May 2020 17:17:42 +0200
Subject: [PATCH 1184/1830] =?UTF-8?q?FIX:=20don't=20compute=20draft=20for?=
 =?UTF-8?q?=20(ro)bots=20=F0=9F=A4=96=20in=20topics=20list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/topic_list_responder.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/topic_list_responder.rb b/lib/topic_list_responder.rb
index c590e250ff..545b8ece1d 100644
--- a/lib/topic_list_responder.rb
+++ b/lib/topic_list_responder.rb
@@ -7,8 +7,11 @@ module TopicListResponder
     discourse_expires_in 1.minute
 
     list.draft_key = Draft::NEW_TOPIC
-    list.draft_sequence = DraftSequence.current(current_user, Draft::NEW_TOPIC)
-    list.draft = Draft.get(current_user, list.draft_key, list.draft_sequence) if current_user
+
+    if current_user&.human?
+      list.draft_sequence = DraftSequence.current(current_user, list.draft_key)
+      list.draft = Draft.get(current_user, list.draft_key, list.draft_sequence)
+    end
 
     respond_to do |format|
       format.html do

From c979f1877bb1971e0d61fe80a9394be986fb5860 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 14 May 2020 12:01:58 -0400
Subject: [PATCH 1185/1830] FIX: Deleting old migration

It was using ActiveRecord which broke migrating a new site. The groups
table now has a unique constraint on group name so this migration from
2014 should not be necessary anymore.
---
 ...216112341_resolve_duplicate_group_names.rb | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 db/migrate/20141216112341_resolve_duplicate_group_names.rb

diff --git a/db/migrate/20141216112341_resolve_duplicate_group_names.rb b/db/migrate/20141216112341_resolve_duplicate_group_names.rb
deleted file mode 100644
index c9249af68b..0000000000
--- a/db/migrate/20141216112341_resolve_duplicate_group_names.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-class ResolveDuplicateGroupNames < ActiveRecord::Migration[4.2]
-
-  def up
-    results = DB.query_single 'SELECT id FROM groups
-                              WHERE name ILIKE
-                               (SELECT lower(name)
-                                FROM groups
-                                GROUP BY lower(name)
-                                HAVING count(*) > 1);'
-
-    groups = Group.where id: results
-    groups.group_by { |g| g.name.downcase }.each do |key, value|
-      value.each_with_index do |dup, index|
-        dup.update! name: "#{dup.name[0..18]}_#{index + 1}" if index > 0
-      end
-    end
-  end
-
-  def down
-    # does not reverse changes
-  end
-
-end

From 0c6f30d92a4090aa7447e2e579a17a180e49ce17 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 14 May 2020 17:33:16 +0100
Subject: [PATCH 1186/1830] FIX: Allow lazy-yt thumbnails to fetched by
 pull_hotlinked_images

The thumbnails were being correctly downloaded, but the URLs were not being substituted correctly in post_process_cooked because the lazy-yt output did not include the `onebox` class.
---
 plugins/lazy-yt/plugin.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/lazy-yt/plugin.rb b/plugins/lazy-yt/plugin.rb
index 9d0af49153..3665244463 100644
--- a/plugins/lazy-yt/plugin.rb
+++ b/plugins/lazy-yt/plugin.rb
@@ -29,7 +29,7 @@ class Onebox::Engine::YoutubeOnebox
       escaped_title = ERB::Util.html_escape(video_title)
 
       <<~EOF
-      <div class="lazyYT"
+      <div class="onebox lazyYT"
            data-youtube-id="#{video_id}"
            data-youtube-title="#{escaped_title}"
            data-width="#{video_width}"

From 87b94881371aaa48fb0e74909b2f398884261ed1 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 14 May 2020 12:48:28 -0400
Subject: [PATCH 1187/1830] UX: Limit iOS modal keyboard changes to composer

Followup to 423802fbc
---
 app/assets/stylesheets/common/base/modal.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 5d10d6d150..3f4d85c61f 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -141,10 +141,11 @@
   z-index: z("modal", "content");
   overflow: auto;
 
-  .keyboard-visible & {
+  html.keyboard-visible body.ios-safari-composer-hacks & {
     height: calc(var(--composer-vh, 1vh) * 100);
     .modal-inner-container {
       max-height: 100%;
+      margin-bottom: 0px;
     }
   }
 

From bec6bace53cc1f27cbbeb2e11dfa30e47fa72439 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Thu, 14 May 2020 11:57:35 -0500
Subject: [PATCH 1188/1830] DEV: Allow plugins to hide user stats by new
 guardian method (#9772)

---
 .../discourse/app/templates/user/summary.hbs  | 88 ++++++++++---------
 app/models/user_summary.rb                    |  4 +
 app/serializers/user_summary_serializer.rb    | 43 ++++++++-
 lib/guardian/user_guardian.rb                 |  4 +
 4 files changed, 95 insertions(+), 44 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/user/summary.hbs b/app/assets/javascripts/discourse/app/templates/user/summary.hbs
index ddd89595c5..de025dbf16 100644
--- a/app/assets/javascripts/discourse/app/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/summary.hbs
@@ -1,53 +1,55 @@
 {{#d-section pageClass="user-summary" tagName=""}}
   <div class="user-content">
-    <div class="top-section stats-section">
-      <h3 class="stats-title">{{i18n "user.summary.stats"}}</h3>
-      <ul>
-        <li>
-          {{user-stat value=model.days_visited label="user.summary.days_visited"}}
-        </li>
-        <li>
-          {{user-stat value=timeRead label="user.summary.time_read" type="string"}}
-        </li>
-        {{#if showRecentTimeRead}}
+    {{#if model.can_see_summary_stats}}
+      <div class="top-section stats-section">
+        <h3 class="stats-title">{{i18n "user.summary.stats"}}</h3>
+        <ul>
           <li>
-            {{user-stat value=recentTimeRead label="user.summary.recent_time_read" type="string"}}
+            {{user-stat value=model.days_visited label="user.summary.days_visited"}}
+          </li>
+          <li>
+            {{user-stat value=timeRead label="user.summary.time_read" type="string"}}
+          </li>
+          {{#if showRecentTimeRead}}
+            <li>
+              {{user-stat value=recentTimeRead label="user.summary.recent_time_read" type="string"}}
+            </li>
+          {{/if}}
+          <li>
+            {{user-stat value=model.topics_entered label="user.summary.topics_entered"}}
+          </li>
+          <li>
+            {{user-stat value=model.posts_read_count label="user.summary.posts_read"}}
           </li>
-        {{/if}}
-        <li>
-          {{user-stat value=model.topics_entered label="user.summary.topics_entered"}}
-        </li>
-        <li>
-          {{user-stat value=model.posts_read_count label="user.summary.posts_read"}}
-        </li>
-        <li class="linked-stat">
-          {{#link-to "userActivity.likesGiven"}}
-            {{user-stat value=model.likes_given icon="heart" label="user.summary.likes_given"}}
-          {{/link-to}}
-        </li>
-        {{#if model.bookmark_count}}
           <li class="linked-stat">
-            {{#link-to "userActivity.bookmarks"}}
-              {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}}
+            {{#link-to "userActivity.likesGiven"}}
+              {{user-stat value=model.likes_given icon="heart" label="user.summary.likes_given"}}
             {{/link-to}}
           </li>
-        {{/if}}
-        <li class="linked-stat">
-          {{#link-to "userActivity.topics"}}
-            {{user-stat value=model.topic_count label="user.summary.topic_count"}}
-          {{/link-to}}
-        </li>
-        <li class="linked-stat">
-          {{#link-to "userActivity.replies"}}
-            {{user-stat value=model.post_count label="user.summary.post_count"}}
-          {{/link-to}}
-        </li>
-        <li>
-          {{user-stat value=model.likes_received icon="heart" label="user.summary.likes_received"}}
-        </li>
-        {{plugin-outlet name="user-summary-stat" tagName="" connectorTagName="li" args=(hash model=model)}}
-      </ul>
-    </div>
+          {{#if model.bookmark_count}}
+            <li class="linked-stat">
+              {{#link-to "userActivity.bookmarks"}}
+                {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}}
+              {{/link-to}}
+            </li>
+          {{/if}}
+          <li class="linked-stat">
+            {{#link-to "userActivity.topics"}}
+              {{user-stat value=model.topic_count label="user.summary.topic_count"}}
+            {{/link-to}}
+          </li>
+          <li class="linked-stat">
+            {{#link-to "userActivity.replies"}}
+              {{user-stat value=model.post_count label="user.summary.post_count"}}
+            {{/link-to}}
+          </li>
+          <li>
+            {{user-stat value=model.likes_received icon="heart" label="user.summary.likes_received"}}
+          </li>
+          {{plugin-outlet name="user-summary-stat" tagName="" connectorTagName="li" args=(hash model=model)}}
+        </ul>
+      </div>
+    {{/if}}
 
     <div class="top-section">
       {{#user-summary-section title="top_replies" class="replies-section pull-left"}}
diff --git a/app/models/user_summary.rb b/app/models/user_summary.rb
index 435702d67b..09c025bc91 100644
--- a/app/models/user_summary.rb
+++ b/app/models/user_summary.rb
@@ -112,6 +112,10 @@ class UserSummary
     @user.id
   end
 
+  def user
+    @user
+  end
+
   def user_stat
     @user.user_stat
   end
diff --git a/app/serializers/user_summary_serializer.rb b/app/serializers/user_summary_serializer.rb
index d05ef817c7..3a7c9d8fb3 100644
--- a/app/serializers/user_summary_serializer.rb
+++ b/app/serializers/user_summary_serializer.rb
@@ -56,7 +56,12 @@ class UserSummarySerializer < ApplicationSerializer
              :post_count,
              :time_read,
              :recent_time_read,
-             :bookmark_count
+             :bookmark_count,
+             :can_see_summary_stats
+
+  def can_see_summary_stats
+    scope.can_see_summary_stats?(object.user)
+  end
 
   def include_badges?
     SiteSetting.enable_badges
@@ -73,4 +78,40 @@ class UserSummarySerializer < ApplicationSerializer
   def recent_time_read
     object.recent_time_read
   end
+
+  def include_likes_given?
+    can_see_summary_stats
+  end
+
+  def include_likes_received?
+    can_see_summary_stats
+  end
+
+  def include_topics_entered?
+    can_see_summary_stats
+  end
+
+  def include_posts_read_count?
+    can_see_summary_stats
+  end
+
+  def include_days_visited?
+    can_see_summary_stats
+  end
+
+  def include_topic_count?
+    can_see_summary_stats
+  end
+
+  def include_post_count?
+    can_see_summary_stats
+  end
+
+  def include_time_read?
+    can_see_summary_stats
+  end
+
+  def include_recent_time_read?
+    can_see_summary_stats
+  end
 end
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index 4ee12fe6ea..517c924b4a 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -154,4 +154,8 @@ module UserGuardian
         .exists?
     )
   end
+
+  def can_see_summary_stats?(target_user)
+    true
+  end
 end

From 956d15d13fd8056cbf60ca64ebbd1edca00d0125 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 14 May 2020 18:01:43 +0100
Subject: [PATCH 1189/1830] UX: Do not use small onebox images as post/topic
 images

---
 lib/cooked_post_processor.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index d6fb05a308..258b791dde 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -216,7 +216,11 @@ class CookedPostProcessor
     # minus images inside quotes
     @doc.css(".quote img") -
     # minus onebox site icons
-    @doc.css("img.site-icon")
+    @doc.css("img.site-icon") -
+    # minus onebox avatars
+    @doc.css("img.onebox-avatar") -
+    # minus small onebox images (large images are .aspect-image-full-size)
+    @doc.css(".onebox .aspect-image img")
   end
 
   def oneboxed_images

From 9ad3f4401a723650da0a91cc1751b22d6f8e83a1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 14 May 2020 19:31:38 +0200
Subject: [PATCH 1190/1830] DEV: always pull latest coding standard
 dependencies (#9782)

---
 package.json | 4 ++--
 yarn.lock    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index c055b38c2b..29a464c677 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
     "chrome-launcher": "^0.12.0",
     "chrome-remote-interface": "^0.25",
     "ember-template-lint": "^2.5.2",
-    "eslint-config-discourse": "1.1.2",
-    "eslint-plugin-discourse-ember": "0.0.3",
+    "eslint-config-discourse": "latest",
+    "eslint-plugin-discourse-ember": "latest",
     "lodash-cli": "https://github.com/lodash-archive/lodash-cli.git",
     "pretender": "^1.6",
     "puppeteer": "1.20",
diff --git a/yarn.lock b/yarn.lock
index 60ae598392..4d96747e62 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -978,7 +978,7 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-eslint-config-discourse@1.1.2:
+eslint-config-discourse@latest:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-1.1.2.tgz#f8569579ea3fc348a989bbab0780a5c426038744"
   integrity sha512-yF29RxKyvFvQbnICCGext0rlXzQMm4AZuBxqOVFonjb0sUbB/08l/FyLHmXKpKgLCEMV6RrJKB7xxPL6twtUkA==
@@ -987,7 +987,7 @@ eslint-config-discourse@1.1.2:
     eslint "^4.19"
     prettier "^1.19.1"
 
-eslint-plugin-discourse-ember@0.0.3:
+eslint-plugin-discourse-ember@latest:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/eslint-plugin-discourse-ember/-/eslint-plugin-discourse-ember-0.0.3.tgz#69e5876c2ece38ab3d6c4a05f0a20a7dc4c21e37"
   integrity sha512-EFwWU4FlOSLBa4RolKZL8QD1eGOnvSkACLt4Big+o1ZUIpW7gGvfnJPtxkbaQ4XmhtZ5HetYt6862vVqhUMv9A==

From aee8e62e216fea49ed345d4a64317fafdac4e1c4 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 14 May 2020 14:17:19 -0400
Subject: [PATCH 1191/1830] FEATURE: Add endpoint for individual SVG icons
 (#9765)

---
 app/controllers/svg_sprite_controller.rb    | 29 +++++++++++++++++++--
 config/routes.rb                            |  1 +
 spec/requests/svg_sprite_controller_spec.rb | 28 ++++++++++++++++++++
 3 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/app/controllers/svg_sprite_controller.rb b/app/controllers/svg_sprite_controller.rb
index c4cd07e23e..1a7aad9f06 100644
--- a/app/controllers/svg_sprite_controller.rb
+++ b/app/controllers/svg_sprite_controller.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 class SvgSpriteController < ApplicationController
-  skip_before_action :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show, :search]
+  skip_before_action :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show, :search, :svg_icon]
 
-  requires_login except: [:show]
+  requires_login except: [:show, :svg_icon]
 
   def show
 
@@ -49,4 +49,29 @@ class SvgSpriteController < ApplicationController
       render json: icons.take(200), root: false
     end
   end
+
+  def svg_icon
+    no_cookies
+
+    RailsMultisite::ConnectionManagement.with_hostname(params[:hostname]) do
+      params.permit(:color)
+      name = params.require(:name)
+      icon = SvgSprite.search(name)
+
+      if icon.blank?
+        render body: nil, status: 404
+      else
+        doc = Nokogiri.XML(icon)
+        doc.at_xpath("symbol").name = "svg"
+        doc.at_xpath("svg")['xmlns'] = "http://www.w3.org/2000/svg"
+        doc.at_xpath("svg")['fill'] = "##{params[:color]}" if params[:color]
+
+        response.headers["Last-Modified"] = 1.years.ago.httpdate
+        response.headers["Content-Length"] = doc.to_s.bytesize.to_s
+        immutable_for 1.day
+
+        render plain: doc, disposition: nil, content_type: 'image/svg+xml'
+      end
+    end
+  end
 end
diff --git a/config/routes.rb b/config/routes.rb
index 10199d1dff..353af09a49 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -503,6 +503,7 @@ Discourse::Application.routes.draw do
   get "svg-sprite/:hostname/svg-:theme_ids-:version.js" => "svg_sprite#show", constraints: { hostname: /[\w\.-]+/, version: /\h{40}/, theme_ids: /([0-9]+(,[0-9]+)*)?/, format: :js }
   get "svg-sprite/search/:keyword" => "svg_sprite#search", format: false, constraints: { keyword: /[-a-z0-9\s\%]+/ }
   get "svg-sprite/picker-search" => "svg_sprite#icon_picker_search", defaults: { format: :json }
+  get "svg-sprite/:hostname/icon(/:color)/:name.svg" => "svg_sprite#svg_icon", constraints: { hostname: /[\w\.-]+/, name: /[-a-z0-9\s\%]+/, color: /(\h{6})/, format: :svg }
 
   get "highlight-js/:hostname/:version.js" => "highlight_js#show", constraints: { hostname: /[\w\.-]+/, format: :js }
 
diff --git a/spec/requests/svg_sprite_controller_spec.rb b/spec/requests/svg_sprite_controller_spec.rb
index cdfdab766a..540235552a 100644
--- a/spec/requests/svg_sprite_controller_spec.rb
+++ b/spec/requests/svg_sprite_controller_spec.rb
@@ -93,4 +93,32 @@ describe SvgSpriteController do
       expect(data[0]["id"]).to eq("fab-500px")
     end
   end
+
+  context 'svg_icon' do
+    it "requires .svg extension" do
+      get "/svg-sprite/#{Discourse.current_hostname}/icon/bolt"
+      expect(response.status).to eq(404)
+    end
+
+    it "returns SVG given an icon name" do
+      get "/svg-sprite/#{Discourse.current_hostname}/icon/bolt.svg"
+      expect(response.status).to eq(200)
+      expect(response.body).to include('bolt')
+    end
+
+    it "returns SVG given an icon name and a color" do
+      get "/svg-sprite/#{Discourse.current_hostname}/icon/CC0000/fab-github.svg"
+      expect(response.status).to eq(200)
+
+      expect(response.body).to include('fab-github')
+      expect(response.body).to include('fill="#CC0000"')
+      expect(response.headers["Cache-Control"]).to eq("max-age=86400, public, immutable")
+    end
+
+    it "ignores non-HEX colors" do
+      get "/svg-sprite/#{Discourse.current_hostname}/icon/orange/fab-github.svg"
+      expect(response.status).to eq(404)
+    end
+
+  end
 end

From 186c471c44a278cfc8f29a18a649ce681ef92ab5 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 14 May 2020 11:35:16 -0700
Subject: [PATCH 1192/1830] Reland "DEV: Add checks that assets do not modify
 cookies to smoke-test.js" (#9774)

* Revert "Revert "DEV: Add checks that assets do not modify cookies to smoke-test.js (#9504)" (#9773)"

This reverts commit 732776e2ce4cd89d64a7ccd42e68e530d4ff162a.

* FIX: Run cookie tests only after logging in
---
 test/smoke_test.js | 80 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 79 insertions(+), 1 deletion(-)

diff --git a/test/smoke_test.js b/test/smoke_test.js
index abd1a4589b..728ac91c5f 100644
--- a/test/smoke_test.js
+++ b/test/smoke_test.js
@@ -14,6 +14,15 @@ console.log(`Starting Discourse Smoke Test for ${url}`);
 const puppeteer = require("puppeteer");
 const path = require("path");
 
+async function getCookie(name, page) {
+  const cookies = await page.cookies();
+  let found = null;
+  cookies.forEach(c => {
+    if (c.name === name) found = c;
+  });
+  return found;
+}
+
 (async () => {
   const browser = await puppeteer.launch({
     // when debugging localy setting the SHOW_BROWSER env variable can be very helpful
@@ -70,7 +79,11 @@ const path = require("path");
   page.on("console", msg => console.log(`PAGE LOG: ${msg.text()}`));
 
   page.on("response", resp => {
-    if (resp.status() !== 200 && resp.status() !== 302) {
+    if (
+      resp.status() !== 200 &&
+      resp.status() !== 302 &&
+      resp.status() !== 304
+    ) {
       console.log(
         "FAILED HTTP REQUEST TO " + resp.url() + " Status is: " + resp.status()
       );
@@ -129,6 +142,49 @@ const path = require("path");
     return page.waitForSelector("header .login-button", { visible: true });
   });
 
+  // Prep for assets check
+  const anyStylesheetEl = await page.$('link[href][rel="stylesheet"]');
+  const anyAssetPath = await page.evaluate(
+    el => el.getAttribute("href"),
+    anyStylesheetEl
+  );
+  if (!anyAssetPath) {
+    return console.log("FAILED - could not retrieve an asset path");
+  }
+
+  function checkNoCookies(testPath) {
+    return async function() {
+      const priorCookie = await getCookie("_t", page);
+      const testURL = new URL(testPath, url);
+
+      await page.setCookie({
+        name: "_t",
+        value: "invalid_auth_token",
+        url: url,
+        domain: priorCookie.domain,
+        path: priorCookie.path,
+        expires: priorCookie.expires,
+        httpOnly: priorCookie.httpOnly,
+        secure: priorCookie.secure,
+        session: priorCookie.session,
+        sameSite: priorCookie.sameSite
+      });
+      const badCookie = await getCookie("_t", page);
+      if (badCookie.value !== "invalid_auth_token") {
+        throw "FAILED - could not set cookie";
+      }
+
+      await page.goto(testURL);
+
+      const newCookie = await getCookie("_t", page);
+      if (newCookie === null || newCookie.value !== "invalid_auth_token") {
+        throw "FAILED - Cookie was modified while fetching " + testPath;
+      }
+
+      await page.setCookie(priorCookie);
+    };
+  }
+
   if (process.env.LOGIN_AT_BEGINNING) {
     await login();
   }
@@ -182,6 +238,28 @@ const path = require("path");
       return promise;
     });
 
+    await exec(
+      `assets do not set cookies (${anyAssetPath})`,
+      checkNoCookies(anyAssetPath || "/assets/stylesheets/bogus.css")
+    );
+    await exec(
+      "service-worker.js does not set cookies",
+      checkNoCookies("/service-worker.js")
+    );
+    await exec("application paths do clear invalid cookies", async () => {
+      const fn = checkNoCookies("/about");
+      let failure = false;
+      try {
+        await fn();
+        failure = true;
+      } catch (e) {
+        // Expecting cookies to be set, so a throw is correct
+      }
+      if (failure) {
+        throw "FAILED - cookies not fixed on an application path";
+      }
+    });
+
     await exec("it shows a topic list", () => {
       return page.waitForSelector(".topic-list", { visible: true });
     });

From 63b8b3c8490b4dd72e27a2aa31a10b3e4a6f8043 Mon Sep 17 00:00:00 2001
From: Kane York <rikingcoding@gmail.com>
Date: Thu, 14 May 2020 12:04:09 -0700
Subject: [PATCH 1193/1830] Revert "Reland "DEV: Add checks that assets do not
 modify cookies to smoke-test.js" (#9774)" (#9783)

This reverts commit 186c471c44a278cfc8f29a18a649ce681ef92ab5.
---
 test/smoke_test.js | 80 +---------------------------------------------
 1 file changed, 1 insertion(+), 79 deletions(-)

diff --git a/test/smoke_test.js b/test/smoke_test.js
index 728ac91c5f..abd1a4589b 100644
--- a/test/smoke_test.js
+++ b/test/smoke_test.js
@@ -14,15 +14,6 @@ console.log(`Starting Discourse Smoke Test for ${url}`);
 const puppeteer = require("puppeteer");
 const path = require("path");
 
-async function getCookie(name, page) {
-  const cookies = await page.cookies();
-  let found = null;
-  cookies.forEach(c => {
-    if (c.name === name) found = c;
-  });
-  return found;
-}
-
 (async () => {
   const browser = await puppeteer.launch({
     // when debugging localy setting the SHOW_BROWSER env variable can be very helpful
@@ -79,11 +70,7 @@ async function getCookie(name, page) {
   page.on("console", msg => console.log(`PAGE LOG: ${msg.text()}`));
 
   page.on("response", resp => {
-    if (
-      resp.status() !== 200 &&
-      resp.status() !== 302 &&
-      resp.status() !== 304
-    ) {
+    if (resp.status() !== 200 && resp.status() !== 302) {
       console.log(
         "FAILED HTTP REQUEST TO " + resp.url() + " Status is: " + resp.status()
       );
@@ -142,49 +129,6 @@ async function getCookie(name, page) {
     return page.waitForSelector("header .login-button", { visible: true });
   });
 
-  // Prep for assets check
-  const anyStylesheetEl = await page.$('link[href][rel="stylesheet"]');
-  const anyAssetPath = await page.evaluate(
-    el => el.getAttribute("href"),
-    anyStylesheetEl
-  );
-  if (!anyAssetPath) {
-    return console.log("FAILED - could not retrieve an asset path");
-  }
-
-  function checkNoCookies(testPath) {
-    return async function() {
-      const priorCookie = await getCookie("_t", page);
-      const testURL = new URL(testPath, url);
-
-      await page.setCookie({
-        name: "_t",
-        value: "invalid_auth_token",
-        url: url,
-        domain: priorCookie.domain,
-        path: priorCookie.path,
-        expires: priorCookie.expires,
-        httpOnly: priorCookie.httpOnly,
-        secure: priorCookie.secure,
-        session: priorCookie.session,
-        sameSite: priorCookie.sameSite
-      });
-      const badCookie = await getCookie("_t", page);
-      if (badCookie.value !== "invalid_auth_token") {
-        throw "FAILED - could not set cookie";
-      }
-
-      await page.goto(testURL);
-
-      const newCookie = await getCookie("_t", page);
-      if (newCookie === null || newCookie.value !== "invalid_auth_token") {
-        throw "FAILED - Cookie was modified while fetching " + testPath;
-      }
-
-      await page.setCookie(priorCookie);
-    };
-  }
-
   if (process.env.LOGIN_AT_BEGINNING) {
     await login();
   }
@@ -238,28 +182,6 @@ async function getCookie(name, page) {
       return promise;
     });
 
-    await exec(
-      `assets do not set cookies (${anyAssetPath})`,
-      checkNoCookies(anyAssetPath || "/assets/stylesheets/bogus.css")
-    );
-    await exec(
-      "service-worker.js does not set cookies",
-      checkNoCookies("/service-worker.js")
-    );
-    await exec("application paths do clear invalid cookies", async () => {
-      const fn = checkNoCookies("/about");
-      let failure = false;
-      try {
-        await fn();
-        failure = true;
-      } catch (e) {
-        // Expecting cookies to be set, so a throw is correct
-      }
-      if (failure) {
-        throw "FAILED - cookies not fixed on an application path";
-      }
-    });
-
     await exec("it shows a topic list", () => {
       return page.waitForSelector(".topic-list", { visible: true });
     });

From 459556053788956dd5e428099d6fe6db593f288c Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Thu, 14 May 2020 16:32:53 -0300
Subject: [PATCH 1194/1830] FIX: Use proper icons for App shortcut menu

Follow up to 3b0fa9b using the new icon URL introduced in e618efe

Will automatically use icons of the primary color of the active theme
 for the user during install.
---
 app/controllers/metadata_controller.rb | 27 ++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/controllers/metadata_controller.rb b/app/controllers/metadata_controller.rb
index ce6f1f85c6..2ce4adaa3f 100644
--- a/app/controllers/metadata_controller.rb
+++ b/app/controllers/metadata_controller.rb
@@ -33,6 +33,9 @@ class MetadataController < ApplicationController
       end
     end
 
+    primary_color = ColorScheme.hex_for_name('primary', view_context.scheme_id)
+    icon_url_base = UrlHelper.absolute("/svg-sprite/#{Discourse.current_hostname}/icon/#{primary_color}")
+
     manifest = {
       name: SiteSetting.title,
       short_name: SiteSetting.short_title.presence || SiteSetting.title.truncate(12, separator: ' ', omission: ''),
@@ -58,9 +61,9 @@ class MetadataController < ApplicationController
           url: "/new-topic",
           icons: [
             {
-              src: ActionController::Base.helpers.image_url("push-notifications/check.png"),
-              sizes: "128x128",
-              type: "image/png"
+              src: "#{icon_url_base}/plus.svg",
+              sizes: "any",
+              type: "image/svg+xml"
             }
           ]
         },
@@ -70,9 +73,9 @@ class MetadataController < ApplicationController
           url: "/my/messages",
           icons: [
             {
-              src: ActionController::Base.helpers.image_url("push-notifications/private_message.png"),
-              sizes: "128x128",
-              type: "image/png"
+              src: "#{icon_url_base}/envelope.svg",
+              sizes: "any",
+              type: "image/svg+xml"
             }
           ]
         },
@@ -82,9 +85,9 @@ class MetadataController < ApplicationController
           url: "/my/bookmarks",
           icons: [
             {
-              src: ActionController::Base.helpers.image_url("push-notifications/check.png"),
-              sizes: "128x128",
-              type: "image/png"
+              src: "#{icon_url_base}/bookmark.svg",
+              sizes: "any",
+              type: "image/svg+xml"
             }
           ]
         },
@@ -94,9 +97,9 @@ class MetadataController < ApplicationController
           url: "/top",
           icons: [
             {
-              src: ActionController::Base.helpers.image_url("push-notifications/check.png"),
-              sizes: "128x128",
-              type: "image/png"
+              src: "#{icon_url_base}/signal.svg",
+              sizes: "any",
+              type: "image/svg+xml"
             }
           ]
         }

From e0e967ac46a15bf56df3f0eb1723f4c89bfdeadc Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 14 May 2020 13:03:42 -0700
Subject: [PATCH 1195/1830] FIX: Apply code quoting with no syntax highlighting
 (#9784)

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

diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js
index cb805206a3..688aa53929 100644
--- a/app/assets/javascripts/discourse/app/lib/utilities.js
+++ b/app/assets/javascripts/discourse/app/lib/utilities.js
@@ -137,7 +137,6 @@ export function selectedText() {
   for (let r = 0; r < selection.rangeCount; r++) {
     const range = selection.getRangeAt(r);
     const $ancestor = $(range.commonAncestorContainer);
-    const $codeBlockTest = $ancestor.parent("pre");
 
     // ensure we never quote text in the post menu area
     const $postMenuArea = $ancestor.find(".post-menu-area")[0];
@@ -145,6 +144,7 @@ export function selectedText() {
       range.setEndBefore($postMenuArea);
     }
 
+    const $codeBlockTest = $ancestor.parents("pre");
     if ($codeBlockTest.length) {
       const $code = $("<code>");
       $code.append(range.cloneContents());

From 1b7f23a1bc79e323a93cdcc06bbdc499a128a72b Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 14 May 2020 16:35:32 -0400
Subject: [PATCH 1196/1830] FIX: don't compute draft for bots on categories
 index route

---
 app/controllers/categories_controller.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 770275a65e..4520670bc6 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -31,11 +31,13 @@ class CategoriesController < ApplicationController
 
     @category_list = CategoryList.new(guardian, category_options)
     @category_list.draft_key = Draft::NEW_TOPIC
-    @category_list.draft_sequence = DraftSequence.current(
-      current_user,
-      Draft::NEW_TOPIC
-    )
-    @category_list.draft = Draft.get(current_user, Draft::NEW_TOPIC, @category_list.draft_sequence) if current_user
+    if current_user&.human?
+      @category_list.draft_sequence = DraftSequence.current(
+        current_user,
+        Draft::NEW_TOPIC
+      )
+      @category_list.draft = Draft.get(current_user, Draft::NEW_TOPIC, @category_list.draft_sequence)
+    end
 
     if category_options[:is_homepage] && SiteSetting.short_site_description.present?
       @title = "#{SiteSetting.title} - #{SiteSetting.short_site_description}"

From 5ff2a235f6e566e4d42e3fd14034fa8e1424e964 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 14 May 2020 16:37:45 -0400
Subject: [PATCH 1197/1830] DEV: Allow 3-digit HEX color code in single icon
 route

Followup to aee8e62
---
 app/controllers/svg_sprite_controller.rb    | 12 +++++++++++-
 config/routes.rb                            |  2 +-
 spec/requests/svg_sprite_controller_spec.rb |  9 +++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/controllers/svg_sprite_controller.rb b/app/controllers/svg_sprite_controller.rb
index 1a7aad9f06..81b970547e 100644
--- a/app/controllers/svg_sprite_controller.rb
+++ b/app/controllers/svg_sprite_controller.rb
@@ -64,7 +64,7 @@ class SvgSpriteController < ApplicationController
         doc = Nokogiri.XML(icon)
         doc.at_xpath("symbol").name = "svg"
         doc.at_xpath("svg")['xmlns'] = "http://www.w3.org/2000/svg"
-        doc.at_xpath("svg")['fill'] = "##{params[:color]}" if params[:color]
+        doc.at_xpath("svg")['fill'] = adjust_hex(params[:color]) if params[:color]
 
         response.headers["Last-Modified"] = 1.years.ago.httpdate
         response.headers["Content-Length"] = doc.to_s.bytesize.to_s
@@ -74,4 +74,14 @@ class SvgSpriteController < ApplicationController
       end
     end
   end
+
+  private
+
+  def adjust_hex(hex)
+    if hex.size == 3
+      chars = hex.scan(/\w/)
+      hex = chars.zip(chars).flatten.join
+    end
+    "##{hex}"
+  end
 end
diff --git a/config/routes.rb b/config/routes.rb
index 353af09a49..d3a1082d43 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -503,7 +503,7 @@ Discourse::Application.routes.draw do
   get "svg-sprite/:hostname/svg-:theme_ids-:version.js" => "svg_sprite#show", constraints: { hostname: /[\w\.-]+/, version: /\h{40}/, theme_ids: /([0-9]+(,[0-9]+)*)?/, format: :js }
   get "svg-sprite/search/:keyword" => "svg_sprite#search", format: false, constraints: { keyword: /[-a-z0-9\s\%]+/ }
   get "svg-sprite/picker-search" => "svg_sprite#icon_picker_search", defaults: { format: :json }
-  get "svg-sprite/:hostname/icon(/:color)/:name.svg" => "svg_sprite#svg_icon", constraints: { hostname: /[\w\.-]+/, name: /[-a-z0-9\s\%]+/, color: /(\h{6})/, format: :svg }
+  get "svg-sprite/:hostname/icon(/:color)/:name.svg" => "svg_sprite#svg_icon", constraints: { hostname: /[\w\.-]+/, name: /[-a-z0-9\s\%]+/, color: /(\h{3}{1,2})/, format: :svg }
 
   get "highlight-js/:hostname/:version.js" => "highlight_js#show", constraints: { hostname: /[\w\.-]+/, format: :js }
 
diff --git a/spec/requests/svg_sprite_controller_spec.rb b/spec/requests/svg_sprite_controller_spec.rb
index 540235552a..60584b8ea8 100644
--- a/spec/requests/svg_sprite_controller_spec.rb
+++ b/spec/requests/svg_sprite_controller_spec.rb
@@ -115,6 +115,15 @@ describe SvgSpriteController do
       expect(response.headers["Cache-Control"]).to eq("max-age=86400, public, immutable")
     end
 
+    it "returns SVG given an icon name and a 3-character HEX color" do
+      get "/svg-sprite/#{Discourse.current_hostname}/icon/C00/fab-github.svg"
+      expect(response.status).to eq(200)
+
+      expect(response.body).to include('fab-github')
+      expect(response.body).to include('fill="#CC0000"')
+      expect(response.headers["Cache-Control"]).to eq("max-age=86400, public, immutable")
+    end
+
     it "ignores non-HEX colors" do
       get "/svg-sprite/#{Discourse.current_hostname}/icon/orange/fab-github.svg"
       expect(response.status).to eq(404)

From bb7fca832fb16399df664c95f21980c41c0bc621 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Thu, 14 May 2020 18:08:51 -0300
Subject: [PATCH 1198/1830] FIX: Workaround WebAPK server bug with images
 without sizes

Google WebAPK server was returning 500 with `any` sized svgs,
which is a spec violation.

Workaround for now setting a static size.

See https://bugs.chromium.org/p/chromium/issues/detail?id=1061911
---
 app/controllers/metadata_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/metadata_controller.rb b/app/controllers/metadata_controller.rb
index 2ce4adaa3f..7265ca1dd7 100644
--- a/app/controllers/metadata_controller.rb
+++ b/app/controllers/metadata_controller.rb
@@ -62,7 +62,7 @@ class MetadataController < ApplicationController
           icons: [
             {
               src: "#{icon_url_base}/plus.svg",
-              sizes: "any",
+              sizes: "128x128",
               type: "image/svg+xml"
             }
           ]
@@ -74,7 +74,7 @@ class MetadataController < ApplicationController
           icons: [
             {
               src: "#{icon_url_base}/envelope.svg",
-              sizes: "any",
+              sizes: "128x128",
               type: "image/svg+xml"
             }
           ]
@@ -86,7 +86,7 @@ class MetadataController < ApplicationController
           icons: [
             {
               src: "#{icon_url_base}/bookmark.svg",
-              sizes: "any",
+              sizes: "128x128",
               type: "image/svg+xml"
             }
           ]
@@ -98,7 +98,7 @@ class MetadataController < ApplicationController
           icons: [
             {
               src: "#{icon_url_base}/signal.svg",
-              sizes: "any",
+              sizes: "128x128",
               type: "image/svg+xml"
             }
           ]

From 675c9c38c82511bd942c88e74ee6aaf328d4fe6e Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Thu, 14 May 2020 19:33:54 -0300
Subject: [PATCH 1199/1830] Revert "FIX: Workaround WebAPK server bug with
 images without sizes"

This reverts commit bb7fca832fb16399df664c95f21980c41c0bc621.
---
 app/controllers/metadata_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/metadata_controller.rb b/app/controllers/metadata_controller.rb
index 7265ca1dd7..2ce4adaa3f 100644
--- a/app/controllers/metadata_controller.rb
+++ b/app/controllers/metadata_controller.rb
@@ -62,7 +62,7 @@ class MetadataController < ApplicationController
           icons: [
             {
               src: "#{icon_url_base}/plus.svg",
-              sizes: "128x128",
+              sizes: "any",
               type: "image/svg+xml"
             }
           ]
@@ -74,7 +74,7 @@ class MetadataController < ApplicationController
           icons: [
             {
               src: "#{icon_url_base}/envelope.svg",
-              sizes: "128x128",
+              sizes: "any",
               type: "image/svg+xml"
             }
           ]
@@ -86,7 +86,7 @@ class MetadataController < ApplicationController
           icons: [
             {
               src: "#{icon_url_base}/bookmark.svg",
-              sizes: "128x128",
+              sizes: "any",
               type: "image/svg+xml"
             }
           ]
@@ -98,7 +98,7 @@ class MetadataController < ApplicationController
           icons: [
             {
               src: "#{icon_url_base}/signal.svg",
-              sizes: "128x128",
+              sizes: "any",
               type: "image/svg+xml"
             }
           ]

From 869f9b20a2dc62fcaa3c596b383f80a0b6b20c84 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 14 May 2020 15:42:00 -0700
Subject: [PATCH 1200/1830] PERF: Dematerialize topic_reply_count (#9769)

* PERF: Dematerialize topic_reply_count

It's only ever used for trust level promotions that run daily, or compared to 0. We don't need to track it on every post creation.

* UX: Add symbol in TL3 report if topic reply count is capped

* DEV: Drop user_stats.topic_reply_count column
---
 .../admin/models/tl3-requirements.js          |  5 +++
 .../admin/templates/user-tl3-requirements.hbs |  2 +-
 .../components/notification-consent-banner.js |  8 ++---
 .../discourse/app/controllers/composer.js     |  7 +---
 app/jobs/scheduled/tl3_promotions.rb          |  1 -
 app/models/trust_level3_requirements.rb       |  6 +---
 app/models/user_stat.rb                       | 34 +++++++++++++++----
 app/serializers/current_user_serializer.rb    | 11 ++----
 .../20200513185052_drop_topic_reply_count.rb  | 19 +++++++++++
 lib/post_creator.rb                           |  5 ---
 lib/post_destroyer.rb                         |  5 ---
 lib/post_revisor.rb                           |  2 --
 lib/promotion.rb                              |  2 +-
 lib/tasks/import.rake                         | 18 +---------
 script/import_scripts/base.rb                 | 27 ---------------
 spec/components/post_creator_spec.rb          | 22 ------------
 spec/components/promotion_spec.rb             | 13 +++++--
 spec/jobs/tl3_promotions_spec.rb              |  1 -
 spec/services/post_owner_changer_spec.rb      |  4 ---
 19 files changed, 73 insertions(+), 119 deletions(-)
 create mode 100644 db/post_migrate/20200513185052_drop_topic_reply_count.rb

diff --git a/app/assets/javascripts/admin/models/tl3-requirements.js b/app/assets/javascripts/admin/models/tl3-requirements.js
index 424aea4f58..6331333de7 100644
--- a/app/assets/javascripts/admin/models/tl3-requirements.js
+++ b/app/assets/javascripts/admin/models/tl3-requirements.js
@@ -12,6 +12,11 @@ export default EmberObject.extend({
     return Math.round((minDaysVisited * 100) / timePeriod);
   },
 
+  @discourseComputed("num_topics_replied_to", "min_topics_replied_to")
+  capped_topics_replied_to(numReplied, minReplied) {
+    return numReplied > minReplied;
+  },
+
   @discourseComputed(
     "days_visited",
     "min_days_visited",
diff --git a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
index 6a76b438a1..de71c0bfb9 100644
--- a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
+++ b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
@@ -33,7 +33,7 @@
       <tr>
         <th>{{i18n "admin.user.tl3_requirements.topics_replied_to"}}</th>
         <td>{{check-icon model.tl3Requirements.met.topics_replied_to}}</td>
-        <td>{{model.tl3Requirements.num_topics_replied_to}}</td>
+        <td>{{#if model.tl3Requirements.capped_topics_replied_to}}&ge; {{/if}}{{model.tl3Requirements.num_topics_replied_to}}</td>
         <td>{{model.tl3Requirements.min_topics_replied_to}}</td>
       </tr>
       <tr>
diff --git a/app/assets/javascripts/discourse/app/components/notification-consent-banner.js b/app/assets/javascripts/discourse/app/components/notification-consent-banner.js
index 97ee9b0aa7..0ef2aca78a 100644
--- a/app/assets/javascripts/discourse/app/components/notification-consent-banner.js
+++ b/app/assets/javascripts/discourse/app/components/notification-consent-banner.js
@@ -20,21 +20,19 @@ export default DesktopNotificationConfig.extend({
     "isNotSupported",
     "isEnabled",
     "bannerDismissed",
-    "currentUser.reply_count",
-    "currentUser.topic_count"
+    "currentUser.any_posts"
   )
   showNotificationPromptBanner(
     isNotSupported,
     isEnabled,
     bannerDismissed,
-    replyCount,
-    topicCount
+    anyPosts
   ) {
     return (
       this.siteSettings.push_notifications_prompt &&
       !isNotSupported &&
       this.currentUser &&
-      replyCount + topicCount > 0 &&
+      anyPosts &&
       Notification.permission !== "denied" &&
       Notification.permission !== "granted" &&
       !isEnabled &&
diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index cd3d3576bb..4890db311e 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -732,12 +732,7 @@ export default Controller.extend({
 
         this.close();
 
-        const currentUser = this.currentUser;
-        if (composer.creatingTopic) {
-          currentUser.set("topic_count", currentUser.topic_count + 1);
-        } else {
-          currentUser.set("reply_count", currentUser.reply_count + 1);
-        }
+        this.currentUser.set("any_posts", true);
 
         const post = result.target;
         if (post && !staged) {
diff --git a/app/jobs/scheduled/tl3_promotions.rb b/app/jobs/scheduled/tl3_promotions.rb
index 7dcce77a05..af1d6350ff 100644
--- a/app/jobs/scheduled/tl3_promotions.rb
+++ b/app/jobs/scheduled/tl3_promotions.rb
@@ -34,7 +34,6 @@ module Jobs
         ).where.not(id: demoted_user_ids)
         .joins(:user_stat)
         .where("user_stats.days_visited >= ?", SiteSetting.tl3_requires_days_visited)
-        .where("user_stats.topic_reply_count >= ?", SiteSetting.tl3_requires_topics_replied_to)
         .where("user_stats.topics_entered >= ?", SiteSetting.tl3_requires_topics_viewed_all_time)
         .where("user_stats.posts_read_count >= ?", SiteSetting.tl3_requires_posts_read_all_time)
         .where("user_stats.likes_given >= ?", SiteSetting.tl3_requires_likes_given)
diff --git a/app/models/trust_level3_requirements.rb b/app/models/trust_level3_requirements.rb
index bf511a0647..3e35497d19 100644
--- a/app/models/trust_level3_requirements.rb
+++ b/app/models/trust_level3_requirements.rb
@@ -143,11 +143,7 @@ class TrustLevel3Requirements
   end
 
   def num_topics_replied_to
-    @user.posts
-      .public_posts
-      .where("posts.created_at > ? AND posts.post_number > 1", time_period.days.ago)
-      .select("distinct topic_id")
-      .count
+    @user.user_stat.calc_topic_reply_count!(min_topics_replied_to + 1, time_period.days.ago)
   end
 
   def min_topics_replied_to
diff --git a/app/models/user_stat.rb b/app/models/user_stat.rb
index cda2c1513a..1eb168bc9b 100644
--- a/app/models/user_stat.rb
+++ b/app/models/user_stat.rb
@@ -4,6 +4,9 @@ class UserStat < ActiveRecord::Base
   belongs_to :user
   after_save :trigger_badges
 
+  # TODO(2021-05-13): Remove
+  self.ignored_columns = ["topic_reply_count"]
+
   def self.ensure_consistency!(last_seen = 1.hour.ago)
     reset_bounce_scores
     update_distinct_badge_count
@@ -151,12 +154,30 @@ class UserStat < ActiveRecord::Base
   end
 
   # topic_reply_count is a count of posts in other users' topics
-  def update_topic_reply_count
-    self.topic_reply_count = Topic
-      .joins("INNER JOIN posts ON topics.id = posts.topic_id AND topics.user_id <> posts.user_id")
-      .where("posts.deleted_at IS NULL AND posts.user_id = ?", self.user_id)
-      .distinct
-      .count
+  def calc_topic_reply_count!(max, start_time = nil)
+    sql = <<~SQL
+    SELECT COUNT(*) count
+    FROM (
+      SELECT DISTINCT posts.topic_id
+      FROM posts
+      INNER JOIN topics ON topics.id = posts.topic_id
+      WHERE posts.user_id = ?
+      AND topics.user_id <> posts.user_id
+      AND posts.deleted_at IS NULL AND topics.deleted_at IS NULL
+      AND topics.archetype <> 'private_message'
+      #{start_time.nil? ? '' : 'AND posts.created_at > ?'}
+      LIMIT ?
+    ) as user_topic_replies
+    SQL
+    if start_time.nil?
+      DB.query_single(sql, self.user_id, max).first
+    else
+      DB.query_single(sql, self.user_id, start_time, max).first
+    end
+  end
+
+  def any_posts
+    user.posts.exists?
   end
 
   MAX_TIME_READ_DIFF = 100
@@ -212,7 +233,6 @@ end
 #  posts_read_count         :integer          default(0), not null
 #  likes_given              :integer          default(0), not null
 #  likes_received           :integer          default(0), not null
-#  topic_reply_count        :integer          default(0), not null
 #  new_since                :datetime         not null
 #  read_faq                 :datetime
 #  first_post_created_at    :datetime
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index 9e238375cc..290569a3b1 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -12,8 +12,7 @@ class CurrentUserSerializer < BasicUserSerializer
              :moderator?,
              :staff?,
              :title,
-             :reply_count,
-             :topic_count,
+             :any_posts,
              :enable_quoting,
              :enable_defer,
              :external_links_in_new_tab,
@@ -66,12 +65,8 @@ class CurrentUserSerializer < BasicUserSerializer
     object.user_stat.read_faq?
   end
 
-  def topic_count
-    object.user_stat.topic_count
-  end
-
-  def reply_count
-    object.user_stat.topic_reply_count
+  def any_posts
+    object.user_stat.any_posts
   end
 
   def hide_profile_and_presence
diff --git a/db/post_migrate/20200513185052_drop_topic_reply_count.rb b/db/post_migrate/20200513185052_drop_topic_reply_count.rb
new file mode 100644
index 0000000000..5bae3435c6
--- /dev/null
+++ b/db/post_migrate/20200513185052_drop_topic_reply_count.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class DropTopicReplyCount < ActiveRecord::Migration[6.0]
+  DROPPED_COLUMNS ||= {
+    user_stats: %i{
+      topic_reply_count
+    }
+  }
+
+  def up
+    DROPPED_COLUMNS.each do |table, columns|
+      Migration::ColumnDropper.execute_drop(table, columns)
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 40856682ab..8a37e4c9c6 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -539,11 +539,6 @@ class PostCreator
       @user.user_stat.topic_count += 1 if @post.is_first_post?
     end
 
-    # We don't count replies to your own topics
-    if !@opts[:import_mode] && @user.id != @topic.user_id
-      @user.user_stat.update_topic_reply_count
-    end
-
     @user.user_stat.save!
 
     if !@topic.private_message? && @post.post_type != Post.types[:whisper]
diff --git a/lib/post_destroyer.rb b/lib/post_destroyer.rb
index 578722543f..9a5aece702 100644
--- a/lib/post_destroyer.rb
+++ b/lib/post_destroyer.rb
@@ -350,11 +350,6 @@ class PostDestroyer
       author.user_stat.topic_count -= 1 if @post.is_first_post?
     end
 
-    # We don't count replies to your own topics in topic_reply_count
-    if @topic && author.id != @topic.user_id
-      author.user_stat.update_topic_reply_count
-    end
-
     author.user_stat.save!
 
     if @post.created_at == author.last_posted_at
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 97d516b0ed..3c9ec277cd 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -394,7 +394,6 @@ class PostRevisor
         prev_owner_user_stat.topic_count -= 1 if @post.is_first_post?
         prev_owner_user_stat.likes_received -= likes
       end
-      prev_owner_user_stat.update_topic_reply_count
 
       if @post.created_at == prev_owner.user_stat.first_post_created_at
         prev_owner_user_stat.first_post_created_at = prev_owner.posts.order('created_at ASC').first.try(:created_at)
@@ -408,7 +407,6 @@ class PostRevisor
         new_owner_user_stat.topic_count += 1 if @post.is_first_post?
         new_owner_user_stat.likes_received += likes
       end
-      new_owner_user_stat.update_topic_reply_count
       new_owner_user_stat.save!
     end
   end
diff --git a/lib/promotion.rb b/lib/promotion.rb
index 3734ab8faa..d96b304d5a 100644
--- a/lib/promotion.rb
+++ b/lib/promotion.rb
@@ -91,7 +91,7 @@ class Promotion
     return false if stat.days_visited < SiteSetting.tl2_requires_days_visited
     return false if stat.likes_received < SiteSetting.tl2_requires_likes_received
     return false if stat.likes_given < SiteSetting.tl2_requires_likes_given
-    return false if stat.topic_reply_count < SiteSetting.tl2_requires_topic_reply_count
+    return false if stat.calc_topic_reply_count!(SiteSetting.tl2_requires_topic_reply_count) < SiteSetting.tl2_requires_topic_reply_count
 
     true
   end
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index 14212bfb95..9084a6492a 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -227,7 +227,6 @@ def update_user_stats
 
   # TODO: topic_count is counting all topics you replied in as if you started the topic.
   # TODO: post_count is counting first posts.
-  # TODO: topic_reply_count is never used, and is counting PMs here.
   DB.exec <<-SQL
     WITH X AS (
       SELECT p.user_id
@@ -235,20 +234,6 @@ def update_user_stats
            , COUNT(DISTINCT p.topic_id) topics
            , MIN(p.created_at) min_created_at
            , COALESCE(COUNT(DISTINCT DATE(p.created_at)), 0) days
-           , COALESCE((
-              SELECT COUNT(*)
-                FROM topics
-               WHERE id IN (
-                SELECT topic_id
-                  FROM posts p2
-                  JOIN topics t2 ON t2.id = p2.topic_id
-                 WHERE p2.deleted_at IS NULL
-                   AND p2.post_type = 1
-                   AND NOT COALESCE(p2.hidden, 't')
-                   AND p2.user_id <> t2.user_id
-                   AND p2.user_id = p.user_id
-                )
-              ), 0) topic_replies
         FROM posts p
         JOIN topics t ON t.id = p.topic_id
        WHERE p.deleted_at IS NULL
@@ -268,7 +253,6 @@ def update_user_stats
          , topics_entered = X.topics
          , first_post_created_at = X.min_created_at
          , days_visited = X.days
-         , topic_reply_count = X.topic_replies
       FROM X
      WHERE user_stats.user_id = X.user_id
        AND (post_count <> X.posts
@@ -278,7 +262,7 @@ def update_user_stats
          OR topics_entered <> X.topics
          OR COALESCE(first_post_created_at, '1970-01-01') <> X.min_created_at
          OR days_visited <> X.days
-         OR topic_reply_count <> X.topic_replies)
+         )
   SQL
 end
 
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 48bd67e516..035c8a3e57 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -58,7 +58,6 @@ class ImportScripts::Base
       update_post_timings
       update_feature_topic_users
       update_category_featured_topics
-      update_topic_count_replies
       reset_topic_counters
     end
 
@@ -690,19 +689,6 @@ class ImportScripts::Base
   end
 
   def update_user_stats
-    puts "", "Updating topic reply counts..."
-
-    count = 0
-    total = User.real.count
-
-    User.real.find_each do |u|
-      u.create_user_stat if u.user_stat.nil?
-      us = u.user_stat
-      us.update_topic_reply_count
-      us.save
-      print_status(count += 1, total, get_start_time("user_stats"))
-    end
-
     puts "", "Updating first_post_created_at..."
 
     DB.exec <<~SQL
@@ -807,19 +793,6 @@ class ImportScripts::Base
     end
   end
 
-  def update_topic_count_replies
-    puts "", "Updating user topic reply counts"
-
-    count = 0
-    total = User.real.count
-
-    User.real.find_each do |u|
-      u.user_stat.update_topic_reply_count
-      u.user_stat.save!
-      print_status(count += 1, total, get_start_time("topic_count_replies"))
-    end
-  end
-
   def update_tl0
     puts "", "Setting users with no posts to trust level 0"
 
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index 7882e11c4b..5936959804 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -253,28 +253,6 @@ describe PostCreator do
         creator_with_image_sizes.create
       end
 
-      it 'increases topic response counts' do
-        first_post = creator.create
-
-        # ensure topic user is correct
-        topic_user = first_post.user.topic_users.find_by(topic_id: first_post.topic_id)
-        expect(topic_user).to be_present
-        expect(topic_user).to be_posted
-        expect(topic_user.last_read_post_number).to eq(first_post.post_number)
-        expect(topic_user.highest_seen_post_number).to eq(first_post.post_number)
-
-        user2 = Fabricate(:coding_horror)
-        expect(user2.user_stat.topic_reply_count).to eq(0)
-
-        expect(first_post.user.user_stat.reload.topic_reply_count).to eq(0)
-
-        PostCreator.new(user2, topic_id: first_post.topic_id, raw: "this is my test post 123").create
-
-        expect(first_post.user.user_stat.reload.topic_reply_count).to eq(0)
-
-        expect(user2.user_stat.reload.topic_reply_count).to eq(1)
-      end
-
       it 'sets topic excerpt if first post, but not second post' do
         first_post = creator.create
         topic = first_post.topic.reload
diff --git a/spec/components/promotion_spec.rb b/spec/components/promotion_spec.rb
index 8f29ef2725..232715f9fe 100644
--- a/spec/components/promotion_spec.rb
+++ b/spec/components/promotion_spec.rb
@@ -124,6 +124,8 @@ describe Promotion do
     context "that has done the requisite things" do
 
       before do
+        SiteSetting.tl2_requires_topic_reply_count = 3
+
         stat = user.user_stat
         stat.topics_entered = SiteSetting.tl2_requires_topics_entered
         stat.posts_read_count = SiteSetting.tl2_requires_read_posts
@@ -131,7 +133,10 @@ describe Promotion do
         stat.days_visited = SiteSetting.tl2_requires_days_visited * 60
         stat.likes_received = SiteSetting.tl2_requires_likes_received
         stat.likes_given = SiteSetting.tl2_requires_likes_given
-        stat.topic_reply_count = SiteSetting.tl2_requires_topic_reply_count
+        SiteSetting.tl2_requires_topic_reply_count.times do |_|
+          topic = Fabricate(:topic)
+          reply = Fabricate(:post, topic: topic, user: user, post_number: 2)
+        end
 
         @result = promotion.review
       end
@@ -148,6 +153,7 @@ describe Promotion do
     context "when the account hasn't existed long enough" do
       it "does not promote the user" do
         user.created_at = 1.minute.ago
+        SiteSetting.tl2_requires_topic_reply_count = 3
 
         stat = user.user_stat
         stat.topics_entered = SiteSetting.tl2_requires_topics_entered
@@ -156,7 +162,10 @@ describe Promotion do
         stat.days_visited = SiteSetting.tl2_requires_days_visited * 60
         stat.likes_received = SiteSetting.tl2_requires_likes_received
         stat.likes_given = SiteSetting.tl2_requires_likes_given
-        stat.topic_reply_count = SiteSetting.tl2_requires_topic_reply_count
+        SiteSetting.tl2_requires_topic_reply_count.times do |_|
+          topic = Fabricate(:topic)
+          reply = Fabricate(:post, topic: topic, user: user, post_number: 2)
+        end
 
         result = promotion.review
         expect(result).to eq(false)
diff --git a/spec/jobs/tl3_promotions_spec.rb b/spec/jobs/tl3_promotions_spec.rb
index f76007df55..6bb23fca83 100644
--- a/spec/jobs/tl3_promotions_spec.rb
+++ b/spec/jobs/tl3_promotions_spec.rb
@@ -8,7 +8,6 @@ describe Jobs::Tl3Promotions do
     user.create_user_stat if user.user_stat.nil?
     user.user_stat.update!(
       days_visited: 1000,
-      topic_reply_count: 1000,
       topics_entered: 1000,
       posts_read_count: 1000,
       likes_given: 1000,
diff --git a/spec/services/post_owner_changer_spec.rb b/spec/services/post_owner_changer_spec.rb
index 1cee8eeae9..d2cf53b6ad 100644
--- a/spec/services/post_owner_changer_spec.rb
+++ b/spec/services/post_owner_changer_spec.rb
@@ -111,14 +111,12 @@ describe PostOwnerChanger do
           topic_count: 1,
           post_count: 1,
           first_post_created_at: p1.created_at,
-          topic_reply_count: 0
         )
 
         p2user.user_stat.update!(
           topic_count: 0,
           post_count: 1,
           first_post_created_at: p2.created_at,
-          topic_reply_count: 1
         )
 
         UserAction.create!(action_type: UserAction::NEW_TOPIC, user_id: p1user.id, acting_user_id: p1user.id,
@@ -155,13 +153,11 @@ describe PostOwnerChanger do
         p1_user_stat = p1user.user_stat
 
         expect(p1_user_stat.first_post_created_at).to eq(nil)
-        expect(p1_user_stat.topic_reply_count).to eq(0)
         expect(p1_user_stat.likes_received).to eq(0)
 
         p2_user_stat = p2user.user_stat
 
         expect(p2_user_stat.first_post_created_at).to eq(nil)
-        expect(p2_user_stat.topic_reply_count).to eq(0)
 
         user_a_stat = user_a.user_stat
 

From 65a3fdbc571f594f9afbb2368d058b2da71c434b Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Fri, 15 May 2020 09:24:07 +1000
Subject: [PATCH 1201/1830] FIX: randomly failing user_spec (#9754)

* FIX: randomly falling user_spec

When we evaluate `update_last_seen!` we relay on Redis to not run that code too often

https://github.com/discourse/discourse/blob/master/app/models/user.rb#L753

The problem is that not all specs which are running `update_last_seen!` are not cleaning after themselves

For examples specs in that block https://github.com/discourse/discourse/blob/master/spec/models/user_spec.rb#L901

So it can be replicated when you run a few times
`bundle exec rspec  ./spec/models/user_spec.rb -e "should not update the first seen value if it doesn't exist" -e "should have 0 for days_visited"`

We should delete Redis key after each spec which is evaluating `update_last_seen!`
---
 spec/models/user_spec.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index bb27aa4af0..637e2fd418 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -873,6 +873,10 @@ describe User do
       SiteSetting.previous_visit_timeout_hours = 1
     end
 
+    after do
+      Discourse.redis.del("user:#{user.id}:#{Time.zone.now.to_date}")
+    end
+
     it "should act correctly" do
       expect(user.previous_visit_at).to eq(nil)
 
@@ -903,6 +907,10 @@ describe User do
     let!(:first_visit_date) { Time.zone.now }
     let!(:second_visit_date) { 2.hours.from_now }
 
+    after do
+      Discourse.redis.del("user:#{user.id}:#{Time.zone.now.to_date}")
+    end
+
     it "should update the last seen value" do
       expect(user.last_seen_at).to eq nil
       user.update_last_seen!(first_visit_date)
@@ -976,7 +984,9 @@ describe User do
 
     describe 'with no previous values' do
       after do
-        Discourse.redis.flushall
+        Discourse.redis.del("user:#{user.id}:#{Time.zone.now.to_date}")
+        unfreeze_time
+        Discourse.redis.del("user:#{user.id}:#{Time.zone.now.to_date}")
       end
 
       it "updates last_seen_at" do
@@ -1305,6 +1315,9 @@ describe User do
       let!(:user) { Fabricate(:user) }
       let!(:now) { Time.zone.now }
       before { user.update_last_seen!(now) }
+      after do
+        Discourse.redis.del("user:#{user.id}:#{now.to_date}")
+      end
 
       it "with existing UserVisit record, increments the posts_read value" do
         expect {

From 11cd149122c884cd6e5e35f0611160cd3c1dbf59 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Thu, 14 May 2020 21:56:35 -0300
Subject: [PATCH 1202/1830] FIX: WebAPK minting was broken due to shortcut
 icons

SVG support is very flaky, but this way at least minting works again
---
 app/controllers/metadata_controller.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/metadata_controller.rb b/app/controllers/metadata_controller.rb
index 2ce4adaa3f..3ac058e33a 100644
--- a/app/controllers/metadata_controller.rb
+++ b/app/controllers/metadata_controller.rb
@@ -62,8 +62,8 @@ class MetadataController < ApplicationController
           icons: [
             {
               src: "#{icon_url_base}/plus.svg",
-              sizes: "any",
-              type: "image/svg+xml"
+              sizes: "131x150",
+              type: "image/svg"
             }
           ]
         },
@@ -74,8 +74,8 @@ class MetadataController < ApplicationController
           icons: [
             {
               src: "#{icon_url_base}/envelope.svg",
-              sizes: "any",
-              type: "image/svg+xml"
+              sizes: "150x150",
+              type: "image/svg"
             }
           ]
         },
@@ -86,8 +86,8 @@ class MetadataController < ApplicationController
           icons: [
             {
               src: "#{icon_url_base}/bookmark.svg",
-              sizes: "any",
-              type: "image/svg+xml"
+              sizes: "113x150",
+              type: "image/svg"
             }
           ]
         },
@@ -98,8 +98,8 @@ class MetadataController < ApplicationController
           icons: [
             {
               src: "#{icon_url_base}/signal.svg",
-              sizes: "any",
-              type: "image/svg+xml"
+              sizes: "188x150",
+              type: "image/svg"
             }
           ]
         }

From 1a2b9435b0a17c9d06eb5e8e47cfe042a62b9853 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Thu, 14 May 2020 20:10:59 -0600
Subject: [PATCH 1203/1830] DEV: Standardize table sorting verbiage (#9757)

* DEV: Standardize table sorting verbiage

This commit creates a common component that tables can use to make their
headers sortable. This commit also standardizes on using `desc` as the
default and passing in the `asc=true` flag to adjust the sorting
direction.

* Add deprecation warnings

Adds deprecation warnings if using previous params and maintains
backwards compatibility. Set the default sort value for group members to
be asc.

* switch group requests to use common table-header-toggle

* update fixture
---
 .../components/admin-directory-toggle.js      | 30 -------------------
 .../controllers/admin-users-list-show.js      |  4 +--
 .../admin/routes/admin-users-list-show.js     |  4 +--
 .../components/admin-directory-toggle.hbs     |  1 -
 .../admin/templates/users-list-show.hbs       | 16 +++++-----
 .../app/components/group-index-toggle.js      | 30 -------------------
 ...ctory-toggle.js => table-header-toggle.js} |  0
 .../discourse/app/controllers/group-index.js  | 12 ++++----
 .../components/group-index-toggle.hbs         |  1 -
 ...ory-toggle.hbs => table-header-toggle.hbs} |  0
 .../discourse/app/templates/group-index.hbs   |  8 ++---
 .../app/templates/group-requests.hbs          |  4 +--
 .../discourse/app/templates/users.hbs         | 14 ++++-----
 app/controllers/groups_controller.rb          |  6 +++-
 lib/admin_user_index_query.rb                 |  3 +-
 .../components/admin_user_index_query_spec.rb |  6 ++--
 spec/requests/groups_controller_spec.rb       | 12 ++++----
 test/javascripts/helpers/create-pretender.js  |  4 +--
 18 files changed, 49 insertions(+), 106 deletions(-)
 delete mode 100644 app/assets/javascripts/admin/components/admin-directory-toggle.js
 delete mode 100644 app/assets/javascripts/admin/templates/components/admin-directory-toggle.hbs
 delete mode 100644 app/assets/javascripts/discourse/app/components/group-index-toggle.js
 rename app/assets/javascripts/discourse/app/components/{directory-toggle.js => table-header-toggle.js} (100%)
 delete mode 100644 app/assets/javascripts/discourse/app/templates/components/group-index-toggle.hbs
 rename app/assets/javascripts/discourse/app/templates/components/{directory-toggle.hbs => table-header-toggle.hbs} (100%)

diff --git a/app/assets/javascripts/admin/components/admin-directory-toggle.js b/app/assets/javascripts/admin/components/admin-directory-toggle.js
deleted file mode 100644
index 093f29826b..0000000000
--- a/app/assets/javascripts/admin/components/admin-directory-toggle.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import Component from "@ember/component";
-import { iconHTML } from "discourse-common/lib/icon-library";
-
-export default Component.extend({
-  tagName: "th",
-  classNames: ["sortable"],
-  chevronIcon: null,
-  toggleProperties() {
-    if (this.order === this.field) {
-      this.set("ascending", this.ascending ? null : true);
-    } else {
-      this.setProperties({ order: this.field, ascending: null });
-    }
-  },
-  toggleChevron() {
-    if (this.order === this.field) {
-      let chevron = iconHTML(this.ascending ? "chevron-up" : "chevron-down");
-      this.set("chevronIcon", `${chevron}`.htmlSafe());
-    } else {
-      this.set("chevronIcon", null);
-    }
-  },
-  click() {
-    this.toggleProperties();
-  },
-  didReceiveAttrs() {
-    this._super(...arguments);
-    this.toggleChevron();
-  }
-});
diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js b/app/assets/javascripts/admin/controllers/admin-users-list-show.js
index 23deb83955..9f82545dac 100644
--- a/app/assets/javascripts/admin/controllers/admin-users-list-show.js
+++ b/app/assets/javascripts/admin/controllers/admin-users-list-show.js
@@ -11,7 +11,7 @@ export default Controller.extend(CanCheckEmails, {
   model: null,
   query: null,
   order: null,
-  ascending: null,
+  asc: null,
   showEmails: false,
   refreshing: false,
   listFilter: null,
@@ -54,7 +54,7 @@ export default Controller.extend(CanCheckEmails, {
       filter: this.listFilter,
       show_emails: this.showEmails,
       order: this.order,
-      ascending: this.ascending,
+      asc: this.asc,
       page: this._page
     })
       .then(result => {
diff --git a/app/assets/javascripts/admin/routes/admin-users-list-show.js b/app/assets/javascripts/admin/routes/admin-users-list-show.js
index 764fe4ad34..c16591d37f 100644
--- a/app/assets/javascripts/admin/routes/admin-users-list-show.js
+++ b/app/assets/javascripts/admin/routes/admin-users-list-show.js
@@ -3,7 +3,7 @@ import DiscourseRoute from "discourse/routes/discourse";
 export default DiscourseRoute.extend({
   queryParams: {
     order: { refreshModel: true },
-    ascending: { refreshModel: true }
+    asc: { refreshModel: true }
   },
 
   // TODO: this has been introduced to fix a bug in admin-users-list-show
@@ -18,7 +18,7 @@ export default DiscourseRoute.extend({
       if (controller) {
         controller.setProperties({
           order: transition.to.queryParams.order,
-          ascending: transition.to.queryParams.ascending,
+          asc: transition.to.queryParams.asc,
           query: params.filter,
           refreshing: false
         });
diff --git a/app/assets/javascripts/admin/templates/components/admin-directory-toggle.hbs b/app/assets/javascripts/admin/templates/components/admin-directory-toggle.hbs
deleted file mode 100644
index 7ea697404f..0000000000
--- a/app/assets/javascripts/admin/templates/components/admin-directory-toggle.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<span class="header-contents">{{i18n this.i18nKey}}{{chevronIcon}}</span>
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index e96f794a67..ff66a923a2 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -23,14 +23,14 @@
   {{#if model}}
     <table class="table users-list grid">
       <thead>
-        {{admin-directory-toggle field="username" i18nKey="username" order=order ascending=ascending}}
-        {{admin-directory-toggle field="email" i18nKey="email" order=order ascending=ascending}}
-        {{admin-directory-toggle field="last_emailed" i18nKey="admin.users.last_emailed" order=order ascending=ascending}}
-        {{admin-directory-toggle field="seen" i18nKey="last_seen" order=order ascending=ascending}}
-        {{admin-directory-toggle field="topics_viewed" i18nKey="admin.user.topics_entered" order=order ascending=ascending}}
-        {{admin-directory-toggle field="posts_read" i18nKey="admin.user.posts_read_count" order=order ascending=ascending}}
-        {{admin-directory-toggle field="read_time" i18nKey="admin.user.time_read" order=order ascending=ascending}}
-        {{admin-directory-toggle field="created" i18nKey="created" order=order ascending=ascending}}
+        {{table-header-toggle field="username" labelKey="username" order=order asc=asc}}
+        {{table-header-toggle field="email" labelKey="email" order=order asc=asc}}
+        {{table-header-toggle field="last_emailed" labelKey="admin.users.last_emailed" order=order asc=asc}}
+        {{table-header-toggle field="seen" labelKey="last_seen" order=order asc=asc}}
+        {{table-header-toggle field="topics_viewed" labelKey="admin.user.topics_entered" order=order asc=asc}}
+        {{table-header-toggle field="posts_read" labelKey="admin.user.posts_read_count" order=order asc=asc}}
+        {{table-header-toggle field="read_time" labelKey="admin.user.time_read" order=order asc=asc}}
+        {{table-header-toggle field="created" labelKey="created" order=order asc=asc}}
         {{#if siteSettings.must_approve_users}}
           <th>{{i18n "admin.users.approved"}}</th>
         {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/group-index-toggle.js b/app/assets/javascripts/discourse/app/components/group-index-toggle.js
deleted file mode 100644
index f84b9b3d21..0000000000
--- a/app/assets/javascripts/discourse/app/components/group-index-toggle.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import Component from "@ember/component";
-import { iconHTML } from "discourse-common/lib/icon-library";
-
-export default Component.extend({
-  tagName: "th",
-  classNames: ["sortable"],
-  chevronIcon: null,
-  toggleProperties() {
-    if (this.order === this.field) {
-      this.set("desc", this.desc ? null : true);
-    } else {
-      this.setProperties({ order: this.field, desc: null });
-    }
-  },
-  toggleChevron() {
-    if (this.order === this.field) {
-      let chevron = iconHTML(this.desc ? "chevron-down" : "chevron-up");
-      this.set("chevronIcon", `${chevron}`.htmlSafe());
-    } else {
-      this.set("chevronIcon", null);
-    }
-  },
-  click() {
-    this.toggleProperties();
-  },
-  didReceiveAttrs() {
-    this._super(...arguments);
-    this.toggleChevron();
-  }
-});
diff --git a/app/assets/javascripts/discourse/app/components/directory-toggle.js b/app/assets/javascripts/discourse/app/components/table-header-toggle.js
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/directory-toggle.js
rename to app/assets/javascripts/discourse/app/components/table-header-toggle.js
diff --git a/app/assets/javascripts/discourse/app/controllers/group-index.js b/app/assets/javascripts/discourse/app/controllers/group-index.js
index 6d66189144..c0ab592fde 100644
--- a/app/assets/javascripts/discourse/app/controllers/group-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/group-index.js
@@ -8,10 +8,10 @@ import { action } from "@ember/object";
 export default Controller.extend({
   application: controller(),
 
-  queryParams: ["order", "desc", "filter"],
+  queryParams: ["order", "asc", "filter"],
 
   order: "",
-  desc: null,
+  asc: true,
   filter: null,
   filterInput: null,
 
@@ -24,7 +24,7 @@ export default Controller.extend({
     this.set("filter", this.filterInput);
   }, 500),
 
-  @observes("order", "desc", "filter")
+  @observes("order", "asc", "filter")
   _filtersChanged() {
     this.findMembers(true);
   },
@@ -49,9 +49,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 };
   },
 
   hasMembers: gt("model.members.length", 0),
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-index-toggle.hbs b/app/assets/javascripts/discourse/app/templates/components/group-index-toggle.hbs
deleted file mode 100644
index 7ea697404f..0000000000
--- a/app/assets/javascripts/discourse/app/templates/components/group-index-toggle.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<span class="header-contents">{{i18n this.i18nKey}}{{chevronIcon}}</span>
diff --git a/app/assets/javascripts/discourse/app/templates/components/directory-toggle.hbs b/app/assets/javascripts/discourse/app/templates/components/table-header-toggle.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/directory-toggle.hbs
rename to app/assets/javascripts/discourse/app/templates/components/table-header-toggle.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/group-index.hbs b/app/assets/javascripts/discourse/app/templates/group-index.hbs
index f917c42d76..07d46d374b 100644
--- a/app/assets/javascripts/discourse/app/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-index.hbs
@@ -29,11 +29,11 @@
     {{#load-more selector=".group-members tr" action=(action "loadMore")}}
       <table class="group-members">
         <thead>
-          {{group-index-toggle order=order desc=desc field="username_lower" i18nKey="username"}}
+          {{table-header-toggle order=order asc=asc field="username_lower" labelKey="username"}}
           <th class="group-owner">{{i18n "groups.members.owner"}}</th>
-          {{group-index-toggle order=order desc=desc field="added_at" i18nKey="groups.member_added"}}
-          {{group-index-toggle order=order desc=desc field="last_posted_at" i18nKey="last_post"}}
-          {{group-index-toggle order=order desc=desc field="last_seen_at" i18nKey="last_seen"}}
+          {{table-header-toggle order=order asc=asc field="added_at" labelKey="groups.member_added"}}
+          {{table-header-toggle order=order asc=asc field="last_posted_at" labelKey="last_post"}}
+          {{table-header-toggle order=order asc=asc field="last_seen_at" labelKey="last_seen"}}
           <th></th>
         </thead>
 
diff --git a/app/assets/javascripts/discourse/app/templates/group-requests.hbs b/app/assets/javascripts/discourse/app/templates/group-requests.hbs
index 7ee73b8fb6..017aaaef08 100644
--- a/app/assets/javascripts/discourse/app/templates/group-requests.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-requests.hbs
@@ -12,8 +12,8 @@
     {{#load-more selector=".group-members tr" action=(action "loadMore")}}
       <table class="group-members">
         <thead>
-          {{group-index-toggle order=order desc=desc field="username_lower" i18nKey="username"}}
-          {{group-index-toggle order=order desc=desc field="requested_at" i18nKey="groups.member_requested"}}
+          {{table-header-toggle order=order asc=asc field="username_lower" labelKey="username"}}
+          {{table-header-toggle order=order asc=asc field="requested_at" labelKey="groups.member_requested"}}
           <th>{{i18n "groups.requests.reason"}}</th>
           <th></th>
           <th></th>
diff --git a/app/assets/javascripts/discourse/app/templates/users.hbs b/app/assets/javascripts/discourse/app/templates/users.hbs
index cdb85f24de..1d3450d0f8 100644
--- a/app/assets/javascripts/discourse/app/templates/users.hbs
+++ b/app/assets/javascripts/discourse/app/templates/users.hbs
@@ -22,13 +22,13 @@
             <table>
               <thead>
                 <th>{{i18n "directory.total_rows" count=model.totalRows}}</th>
-                {{directory-toggle field="likes_received" order=order asc=asc icon="heart"}}
-                {{directory-toggle field="likes_given" order=order asc=asc icon="heart"}}
-                {{directory-toggle field="topic_count" order=order asc=asc}}
-                {{directory-toggle field="post_count" order=order asc=asc}}
-                {{directory-toggle field="topics_entered" order=order asc=asc}}
-                {{directory-toggle field="posts_read" order=order asc=asc}}
-                {{directory-toggle field="days_visited" order=order asc=asc}}
+                {{table-header-toggle field="likes_received" order=order asc=asc icon="heart"}}
+                {{table-header-toggle field="likes_given" order=order asc=asc icon="heart"}}
+                {{table-header-toggle field="topic_count" order=order asc=asc}}
+                {{table-header-toggle field="post_count" order=order asc=asc}}
+                {{table-header-toggle field="topics_entered" order=order asc=asc}}
+                {{table-header-toggle field="posts_read" order=order asc=asc}}
+                {{table-header-toggle field="days_visited" order=order asc=asc}}
                 {{#if showTimeRead}}
                   <th>{{i18n "directory.time_read"}}</th>
                 {{/if}}
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 60ba516799..bb763811d0 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -209,7 +209,11 @@ class GroupsController < ApplicationController
     raise Discourse::InvalidParameters.new(:limit) if limit < 0 || limit > 1000
     raise Discourse::InvalidParameters.new(:offset) if offset < 0
 
-    dir = (params[:desc] && params[:desc].present?) ? 'DESC' : 'ASC'
+    dir = (params[:asc] && params[:asc].present?) ? 'ASC' : 'DESC'
+    if params[:desc]
+      Discourse.deprecate(":desc is deprecated please use :asc instead", output_in_test: true)
+      dir = (params[:desc] && params[:desc].present?) ? 'DESC' : 'ASC'
+    end
     order = ""
 
     if params[:requesters]
diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb
index 4d04e61fd2..8780aced0c 100644
--- a/lib/admin_user_index_query.rb
+++ b/lib/admin_user_index_query.rb
@@ -37,7 +37,8 @@ class AdminUserIndexQuery
   end
 
   def custom_direction
-    asc = params[:ascending]
+    Discourse.deprecate(":ascending is deprecated please use :asc instead", output_in_test: true) if params[:ascending]
+    asc = params[:asc] || params[:ascending]
     asc.present? && asc ? "ASC" : "DESC"
   end
 
diff --git a/spec/components/admin_user_index_query_spec.rb b/spec/components/admin_user_index_query_spec.rb
index 971468523f..e41c7fc068 100644
--- a/spec/components/admin_user_index_query_spec.rb
+++ b/spec/components/admin_user_index_query_spec.rb
@@ -29,7 +29,7 @@ describe AdminUserIndexQuery do
     end
 
     it "allows custom ordering asc" do
-      query = ::AdminUserIndexQuery.new(order: "trust_level", ascending: true)
+      query = ::AdminUserIndexQuery.new(order: "trust_level", asc: true)
       expect(query.find_users_query.to_sql).to match("trust_level ASC")
     end
 
@@ -39,7 +39,7 @@ describe AdminUserIndexQuery do
     end
 
     it "allows custom ordering and direction for stats" do
-      query = ::AdminUserIndexQuery.new(order: "topics_viewed", ascending: true)
+      query = ::AdminUserIndexQuery.new(order: "topics_viewed", asc: true)
       expect(query.find_users_query.to_sql).to match("topics_entered ASC")
     end
   end
@@ -118,7 +118,7 @@ describe AdminUserIndexQuery do
     end
 
     it "shows nil values first with asc" do
-      users = ::AdminUserIndexQuery.new(order: "last_emailed", ascending: true).find_users
+      users = ::AdminUserIndexQuery.new(order: "last_emailed", asc: true).find_users
 
       expect(users.where('users.id > -2').count).to eq(2)
       expect(users.where('users.id > -2').order('users.id asc').first.username).to eq("system")
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 8d58f3f531..45a4db2d21 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -489,7 +489,7 @@ describe GroupsController do
       4.times { group.add(Fabricate(:user)) }
       usernames = group.users.map { |m| m.username }.sort
 
-      get "/groups/#{group.name}/members.json", params: { limit: 3 }
+      get "/groups/#{group.name}/members.json", params: { limit: 3, asc: true }
 
       expect(response.status).to eq(200)
 
@@ -497,7 +497,7 @@ describe GroupsController do
 
       expect(members.map { |m| m['username'] }).to eq(usernames[0..2])
 
-      get "/groups/#{group.name}/members.json", params: { limit: 3, offset: 3 }
+      get "/groups/#{group.name}/members.json", params: { limit: 3, offset: 3, asc: true }
 
       expect(response.status).to eq(200)
 
@@ -505,7 +505,7 @@ describe GroupsController do
 
       expect(members.map { |m| m['username'] }).to eq(usernames[3..5])
 
-      get "/groups/#{group.name}/members.json", params: { order: 'added_at', desc: true }
+      get "/groups/#{group.name}/members.json", params: { order: 'added_at' }
       members = response.parsed_body["members"]
 
       expect(members.last['added_at']).to eq(first_user.created_at.as_json)
@@ -851,7 +851,7 @@ describe GroupsController do
 
     it "should allow members to be sorted by" do
       get "/groups/#{group.name}/members.json", params: {
-        order: 'last_seen_at', desc: true
+        order: 'last_seen_at'
       }
 
       expect(response.status).to eq(200)
@@ -860,7 +860,7 @@ describe GroupsController do
 
       expect(members.map { |m| m["id"] }).to eq([user1.id, user2.id, user3.id])
 
-      get "/groups/#{group.name}/members.json", params: { order: 'last_seen_at' }
+      get "/groups/#{group.name}/members.json", params: { order: 'last_seen_at', asc: true }
 
       expect(response.status).to eq(200)
 
@@ -869,7 +869,7 @@ describe GroupsController do
       expect(members.map { |m| m["id"] }).to eq([user2.id, user1.id, user3.id])
 
       get "/groups/#{group.name}/members.json", params: {
-        order: 'last_posted_at', desc: true
+        order: 'last_posted_at'
       }
 
       expect(response.status).to eq(200)
diff --git a/test/javascripts/helpers/create-pretender.js b/test/javascripts/helpers/create-pretender.js
index d5e92e55ed..b09965fb96 100644
--- a/test/javascripts/helpers/create-pretender.js
+++ b/test/javascripts/helpers/create-pretender.js
@@ -620,7 +620,7 @@ export function applyDefaultHandlers(pretender) {
       });
     }
 
-    const ascending = request.queryParams.ascending;
+    const asc = request.queryParams.asc;
     const order = request.queryParams.order;
 
     if (order) {
@@ -629,7 +629,7 @@ export function applyDefaultHandlers(pretender) {
       });
     }
 
-    if (ascending) {
+    if (asc) {
       store = store.reverse();
     }
 

From e37ea4a4a13d4c7117b8a5da7900cae78b84d388 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 15 May 2020 09:14:14 +0800
Subject: [PATCH 1204/1830] Revert "FIX: don't compute draft for bots on
 categories index route"

This reverts commit 1b7f23a1bc79e323a93cdcc06bbdc499a128a72b.
---
 app/controllers/categories_controller.rb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 4520670bc6..770275a65e 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -31,13 +31,11 @@ class CategoriesController < ApplicationController
 
     @category_list = CategoryList.new(guardian, category_options)
     @category_list.draft_key = Draft::NEW_TOPIC
-    if current_user&.human?
-      @category_list.draft_sequence = DraftSequence.current(
-        current_user,
-        Draft::NEW_TOPIC
-      )
-      @category_list.draft = Draft.get(current_user, Draft::NEW_TOPIC, @category_list.draft_sequence)
-    end
+    @category_list.draft_sequence = DraftSequence.current(
+      current_user,
+      Draft::NEW_TOPIC
+    )
+    @category_list.draft = Draft.get(current_user, Draft::NEW_TOPIC, @category_list.draft_sequence) if current_user
 
     if category_options[:is_homepage] && SiteSetting.short_site_description.present?
       @title = "#{SiteSetting.title} - #{SiteSetting.short_site_description}"

From 245e8212cac1066403a13f4c3c4bfcf31509e745 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 15 May 2020 09:14:20 +0800
Subject: [PATCH 1205/1830] =?UTF-8?q?Revert=20"FIX:=20don't=20compute=20dr?=
 =?UTF-8?q?aft=20for=20(ro)bots=20=F0=9F=A4=96=20in=20topics=20list"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ec8f08d0da1b32213f3674d8e6dd8ff98e84d39d.
---
 lib/topic_list_responder.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/topic_list_responder.rb b/lib/topic_list_responder.rb
index 545b8ece1d..c590e250ff 100644
--- a/lib/topic_list_responder.rb
+++ b/lib/topic_list_responder.rb
@@ -7,11 +7,8 @@ module TopicListResponder
     discourse_expires_in 1.minute
 
     list.draft_key = Draft::NEW_TOPIC
-
-    if current_user&.human?
-      list.draft_sequence = DraftSequence.current(current_user, list.draft_key)
-      list.draft = Draft.get(current_user, list.draft_key, list.draft_sequence)
-    end
+    list.draft_sequence = DraftSequence.current(current_user, Draft::NEW_TOPIC)
+    list.draft = Draft.get(current_user, list.draft_key, list.draft_sequence) if current_user
 
     respond_to do |format|
       format.html do

From 165fa13c9d45f486927a00d9c08bc307817a27cb Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 15 May 2020 10:39:39 +0800
Subject: [PATCH 1206/1830] FIX: Always return 0 for non-human user current
 DraftSequence.

---
 app/models/draft_sequence.rb       | 2 +-
 spec/models/draft_sequence_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/draft_sequence.rb b/app/models/draft_sequence.rb
index 411d77492f..681a8bcb2e 100644
--- a/app/models/draft_sequence.rb
+++ b/app/models/draft_sequence.rb
@@ -23,7 +23,7 @@ class DraftSequence < ActiveRecord::Base
     user_id = user
     user_id = user.id unless user.is_a?(Integer)
 
-    return nil if invalid_user_id?(user_id)
+    return 0 if invalid_user_id?(user_id)
 
     # perf critical path
     r, _ = DB.query_single('select sequence from draft_sequences where user_id = ? and draft_key = ?', user_id, key)
diff --git a/spec/models/draft_sequence_spec.rb b/spec/models/draft_sequence_spec.rb
index 282b129f15..47747c15d5 100644
--- a/spec/models/draft_sequence_spec.rb
+++ b/spec/models/draft_sequence_spec.rb
@@ -24,7 +24,7 @@ describe DraftSequence do
 
     it 'should return nil for non-human user' do
       user.id = -99999
-      expect(DraftSequence.current(user, 'test')).to eq(nil)
+      expect(DraftSequence.current(user, 'test')).to eq(0)
     end
 
     it 'should return the right sequence' do

From 0cbaa8d813f8cf911f48a44d95f596428b89b55e Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 15 May 2020 12:44:17 +1000
Subject: [PATCH 1207/1830] FEATURE: extend duration allowed for download

Previously we would raise a warning in the logs if downloading
a file (from s3) takes longer than 60 seconds.

At scale this happens reasonably frequently.

1. Raised the duration to 3 minutes

2. Pulled the resizing mutex out of the downloading mutex
so we have less and clearer error logs
---
 app/models/optimized_image.rb | 16 +++++++++-------
 lib/file_store/base_store.rb  |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index e5783532c8..654d60a35c 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -56,6 +56,15 @@ class OptimizedImage < ActiveRecord::Base
 
     return thumbnail if thumbnail
 
+    # create the thumbnail otherwise
+    original_path = Discourse.store.path_for(upload)
+
+    if original_path.blank?
+      # download is protected with a DistributedMutex
+      external_copy = Discourse.store.download(upload) rescue nil
+      original_path = external_copy.try(:path)
+    end
+
     lock(upload.id, width, height) do
       # may have been generated since we got the lock
       thumbnail = find_by(upload_id: upload.id, width: width, height: height)
@@ -63,13 +72,6 @@ class OptimizedImage < ActiveRecord::Base
       # return the previous thumbnail if any
       return thumbnail if thumbnail
 
-      # create the thumbnail otherwise
-      original_path = Discourse.store.path_for(upload)
-      if original_path.blank?
-        external_copy = Discourse.store.download(upload) rescue nil
-        original_path = external_copy.try(:path)
-      end
-
       if original_path.blank?
         Rails.logger.error("Could not find file in the store located at url: #{upload.url}")
       else
diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rb
index 6307465a8f..df85960391 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -77,7 +77,7 @@ module FileStore
     end
 
     def download(upload)
-      DistributedMutex.synchronize("download_#{upload.sha1}") do
+      DistributedMutex.synchronize("download_#{upload.sha1}", validity: 3.minutes) do
         filename = "#{upload.sha1}#{File.extname(upload.original_filename)}"
         file = get_from_cache(filename)
 

From 4601833e4ed98aaaaf90c0ddab2bfebfae42db7c Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 15 May 2020 14:01:54 +1000
Subject: [PATCH 1208/1830] PERF: ensure we run full GC on contexts

Prior to this change we would never clear memory from contexts and
rely on V8 reacting to pressure

This could lead to bloating of PrettyText and Transpiler contexts

This optimisations ensures that we will clear memory 2 seconds after
the last eval on the context
---
 Gemfile.lock                  | 2 +-
 lib/discourse_js_processor.rb | 2 +-
 lib/js_locale_helper.rb       | 2 +-
 lib/pretty_text.rb            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ce187c888d..2a195eeebb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -188,7 +188,7 @@ GEM
     method_source (1.0.0)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    mini_racer (0.2.11)
+    mini_racer (0.2.14)
       libv8 (> 7.3)
     mini_scheduler (0.12.2)
       sidekiq
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 94e39d0d82..df5e35c697 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -79,7 +79,7 @@ class DiscourseJsProcessor
 
     def self.create_new_context
       # timeout any eval that takes longer than 15 seconds
-      ctx = MiniRacer::Context.new(timeout: 15000)
+      ctx = MiniRacer::Context.new(timeout: 15000, ensure_gc_after_idle: 2000)
       ctx.eval("var self = this; #{File.read("#{Rails.root}/vendor/assets/javascripts/babel.js")}")
       ctx.eval(File.read(Ember::Source.bundled_path_for('ember-template-compiler.js')))
       ctx.eval("module = {}; exports = {};")
diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb
index 99d344ef8c..8864eca71a 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -282,7 +282,7 @@ module JsLocaleHelper
   def self.with_context
     @mutex.synchronize do
       yield @ctx ||= begin
-        ctx = MiniRacer::Context.new(timeout: 15000)
+        ctx = MiniRacer::Context.new(timeout: 15000, ensure_gc_after_idle: 2000)
         ctx.load("#{Rails.root}/lib/javascripts/messageformat.js")
         ctx
       end
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 1e4775d121..0f114c5169 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -65,7 +65,7 @@ module PrettyText
   end
 
   def self.create_es6_context
-    ctx = MiniRacer::Context.new(timeout: 25000)
+    ctx = MiniRacer::Context.new(timeout: 25000, ensure_gc_after_idle: 2000)
 
     ctx.eval("window = {}; window.devicePixelRatio = 2;") # hack to make code think stuff is retina
 

From 9ab5801a1bc5bfc505673d0c74f1a3c1e6c28461 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 15 May 2020 14:23:27 +0800
Subject: [PATCH 1209/1830] FIX: Allow post migrations using `#change` to carry
 out unsafe migration

---
 lib/migration/safe_migrate.rb                  |  8 ++++++--
 spec/components/migration/safe_migrate_spec.rb | 18 ++++++++++++++----
 .../change/20990309014015_drop_email_logs.rb   | 10 ++++++++++
 3 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 spec/fixtures/db/post_migrate/change/20990309014015_drop_email_logs.rb

diff --git a/lib/migration/safe_migrate.rb b/lib/migration/safe_migrate.rb
index cf6c43be91..0b65ee0a26 100644
--- a/lib/migration/safe_migrate.rb
+++ b/lib/migration/safe_migrate.rb
@@ -34,13 +34,17 @@ class Migration::SafeMigrate
     private
 
     def is_post_deploy_migration?
+      instance_methods = self.class.instance_methods(false)
+
       method =
-        if self.respond_to?(:up)
+        if instance_methods.include?(:up)
           :up
-        elsif self.respond_to?(:change)
+        elsif instance_methods.include?(:change)
           :change
         end
 
+      return false if !method
+
       self.method(method).source_location.first.include?(
         Discourse::DB_POST_MIGRATE_PATH
       )
diff --git a/spec/components/migration/safe_migrate_spec.rb b/spec/components/migration/safe_migrate_spec.rb
index f7d3a3839d..d15416e4a2 100644
--- a/spec/components/migration/safe_migrate_spec.rb
+++ b/spec/components/migration/safe_migrate_spec.rb
@@ -99,18 +99,28 @@ describe Migration::SafeMigrate do
   end
 
   describe 'for a post deployment migration' do
-    it 'should not ban unsafe migrations' do
-      user = Fabricate(:user)
+    it 'should not ban unsafe migrations using up' do
       Migration::SafeMigrate::SafeMigration.enable_safe!
 
-      path = File.expand_path "#{Rails.root}/spec/fixtures/db/post_migrate"
+      path = File.expand_path "#{Rails.root}/spec/fixtures/db/post_migrate/drop_table"
+
+      output = capture_stdout do
+        migrate_up(path)
+      end
+
+      expect(output).to include("drop_table(:email_logs)")
+    end
+
+    it 'should not ban unsafe migrations using change' do
+      Migration::SafeMigrate::SafeMigration.enable_safe!
+
+      path = File.expand_path "#{Rails.root}/spec/fixtures/db/post_migrate/change"
 
       output = capture_stdout do
         migrate_up(path)
       end
 
       expect(output).to include("drop_table(:email_logs)")
-      expect(user.reload).to eq(user)
     end
   end
 end
diff --git a/spec/fixtures/db/post_migrate/change/20990309014015_drop_email_logs.rb b/spec/fixtures/db/post_migrate/change/20990309014015_drop_email_logs.rb
new file mode 100644
index 0000000000..7b4b1e2252
--- /dev/null
+++ b/spec/fixtures/db/post_migrate/change/20990309014015_drop_email_logs.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class DropEmailLogs < ActiveRecord::Migration[5.2]
+  DROPPED_TABLES ||= %i{email_logs}
+
+  def change
+    drop_table :email_logs
+    raise ActiveRecord::Rollback
+  end
+end

From 858735b5dab1b3d322f4fcc0f8c956c1a527d4a1 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 15 May 2020 15:00:04 +0800
Subject: [PATCH 1210/1830] DEV: Fix broken test due to
 9ab5801a1bc5bfc505673d0c74f1a3c1e6c28461.

---
 spec/lib/backup_restore/database_restorer_spec.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/spec/lib/backup_restore/database_restorer_spec.rb b/spec/lib/backup_restore/database_restorer_spec.rb
index 9f1cc0c935..8a7b9ec8a9 100644
--- a/spec/lib/backup_restore/database_restorer_spec.rb
+++ b/spec/lib/backup_restore/database_restorer_spec.rb
@@ -155,7 +155,7 @@ describe BackupRestore::DatabaseRestorer do
 
   context "readonly functions" do
     before do
-      Migration::SafeMigrate.stubs(:post_migration_path).returns("spec/fixtures/db/post_migrate")
+      Migration::SafeMigrate.stubs(:post_migration_path).returns("spec/fixtures/db/post_migrate/drop_column")
     end
 
     it "doesn't try to drop function when no functions have been created" do
@@ -164,12 +164,10 @@ describe BackupRestore::DatabaseRestorer do
     end
 
     it "creates and drops all functions when none exist" do
-      Migration::BaseDropper.expects(:create_readonly_function).with(:email_logs, nil)
       Migration::BaseDropper.expects(:create_readonly_function).with(:posts, :via_email)
       Migration::BaseDropper.expects(:create_readonly_function).with(:posts, :raw_email)
       execute_stubbed_restore(stub_readonly_functions: false)
 
-      Migration::BaseDropper.expects(:drop_readonly_function).with(:email_logs, nil)
       Migration::BaseDropper.expects(:drop_readonly_function).with(:posts, :via_email)
       Migration::BaseDropper.expects(:drop_readonly_function).with(:posts, :raw_email)
       subject.clean_up

From f9a9bd136b1414beec89626ff956877c40aebf73 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 15 May 2020 16:16:58 +0800
Subject: [PATCH 1211/1830] FEATURE: Expose `Composer.serializeToTopic` in
 client side plugin api.

---
 .../javascripts/discourse/app/lib/plugin-api.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index 4b6356c44d..d17fde9235 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -55,7 +55,7 @@ import { on } from "@ember/object/evented";
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.9.0";
+const PLUGIN_API_VERSION = "0.10.0";
 
 class PluginApi {
   constructor(version, container) {
@@ -941,6 +941,21 @@ class PluginApi {
     Composer.reopen({ beforeSave: method });
   }
 
+  /**
+   * Adds a field to topic edit serializer
+   *
+   * Example:
+   *
+   * api.serializeToTopic('key_set_in_model', 'field_name_in_payload');
+   *
+   * to keep both of them same
+   * api.serializeToTopic('field_name');
+   *
+   */
+  serializeToTopic(fieldName, property) {
+    Composer.serializeToTopic(fieldName, property);
+  }
+
   /**
    * Adds a field to draft serializer
    *

From dada1fc4175baf796ce7c357b12e1aaa19468afe Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 15 May 2020 16:40:49 +0800
Subject: [PATCH 1212/1830] UX: Better composer-action icon when creating new
 topic.

---
 .../javascripts/select-kit/components/composer-actions.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js b/app/assets/javascripts/select-kit/components/composer-actions.js
index 5740a91f5c..556d151057 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js
@@ -35,7 +35,13 @@ export default DropdownSelectBoxComponent.extend({
   },
 
   iconForComposerAction: computed("action", function() {
-    return this.isEditing ? "pencil-alt" : "share";
+    if (this.isEditing) {
+      return "pencil-alt";
+    } else if (this.action == CREATE_TOPIC) {
+      return "plus";
+    } else {
+      return "share";
+    }
   }),
 
   contentChanged() {

From 162d125b83deef1d7a3d0fa02fed037c28b5f0e9 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 15 May 2020 20:23:17 +0800
Subject: [PATCH 1213/1830] Fix lint.

---
 .../javascripts/select-kit/components/composer-actions.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js b/app/assets/javascripts/select-kit/components/composer-actions.js
index 556d151057..a3830d5ae0 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js
@@ -37,7 +37,7 @@ export default DropdownSelectBoxComponent.extend({
   iconForComposerAction: computed("action", function() {
     if (this.isEditing) {
       return "pencil-alt";
-    } else if (this.action == CREATE_TOPIC) {
+    } else if (this.action === CREATE_TOPIC) {
       return "plus";
     } else {
       return "share";

From 0495a748d09873ca87fe217329fb84487ab87f0d Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 15 May 2020 13:35:20 +0100
Subject: [PATCH 1214/1830] FIX: Use CDN URLs for topic thumbnails

---
 app/models/topic.rb                            | 6 +++++-
 spec/components/topic_view_spec.rb             | 8 ++++----
 spec/integration/topic_thumbnail_spec.rb       | 2 +-
 spec/serializers/topic_view_serializer_spec.rb | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index cdbd6ee285..22307a8dad 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -84,6 +84,8 @@ class Topic < ActiveRecord::Base
       Jobs.enqueue(:generate_topic_thumbnails, { topic_id: id, extra_sizes: extra_sizes })
     end
 
+    infos.each { |i| i[:url] = UrlHelper.cook_url(i[:url], secure: original.secure?) }
+
     infos.sort_by! { |i| -i[:width] * i[:height] }
   end
 
@@ -102,7 +104,9 @@ class Topic < ActiveRecord::Base
       record.max_width == Topic.share_thumbnail_size[0] &&
         record.max_height == Topic.share_thumbnail_size[1]
     end
-    thumbnail&.optimized_image&.url || image_upload&.url
+
+    raw_url = thumbnail&.optimized_image&.url || image_upload&.url
+    UrlHelper.cook_url(raw_url, secure: image_upload&.secure?)
   end
 
   def featured_users
diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb
index 73bb74ac25..d55a475c71 100644
--- a/spec/components/topic_view_spec.rb
+++ b/spec/components/topic_view_spec.rb
@@ -726,9 +726,9 @@ describe TopicView do
       end
 
       it "uses the topic image as a fallback when posts have no image" do
-        expect(topic_view_for_post(1).image_url).to eq(op_upload.url)
-        expect(topic_view_for_post(2).image_url).to eq(op_upload.url)
-        expect(topic_view_for_post(3).image_url).to eq(post3_upload.url)
+        expect(topic_view_for_post(1).image_url).to end_with(op_upload.url)
+        expect(topic_view_for_post(2).image_url).to end_with(op_upload.url)
+        expect(topic_view_for_post(3).image_url).to end_with(post3_upload.url)
       end
     end
 
@@ -736,7 +736,7 @@ describe TopicView do
       it "returns nil when posts have no image" do
         expect(topic_view_for_post(1).image_url).to eq(nil)
         expect(topic_view_for_post(2).image_url).to eq(nil)
-        expect(topic_view_for_post(3).image_url).to eq(post3_upload.url)
+        expect(topic_view_for_post(3).image_url).to end_with(post3_upload.url)
       end
     end
   end
diff --git a/spec/integration/topic_thumbnail_spec.rb b/spec/integration/topic_thumbnail_spec.rb
index b288fb6c48..9ba35cbe97 100644
--- a/spec/integration/topic_thumbnail_spec.rb
+++ b/spec/integration/topic_thumbnail_spec.rb
@@ -31,7 +31,7 @@ describe "Topic Thumbnails" do
       expect(thumbnails[0]["max_height"]).to eq(nil)
       expect(thumbnails[0]["width"]).to eq(image.width)
       expect(thumbnails[0]["height"]).to eq(image.height)
-      expect(thumbnails[0]["url"]).to eq(image.url)
+      expect(thumbnails[0]["url"]).to end_with(image.url)
 
       # Run the job
       args = Jobs::GenerateTopicThumbnails.jobs.last["args"].first
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index 0adfbfe08a..5da26a674e 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -54,7 +54,7 @@ describe TopicViewSerializer do
       it 'should return the image url' do
         json = serialize_topic(topic, user)
 
-        expect(json[:image_url]).to eq(image_upload.url)
+        expect(json[:image_url]).to end_with(image_upload.url)
       end
 
       it 'should have thumbnails' do

From 461b4e5cc6e747d2aa57163d840d79781e10a937 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 15 May 2020 14:04:38 +0100
Subject: [PATCH 1215/1830] DEV: Add framework for filtered plugin registers
 (#9763)

* DEV: Add framework for filtered plugin registers

Plugins often need to add values to a list, and we need to filter those lists at runtime to ignore values from disabled plugins. This commit provides a re-usable way to do that, which should make it easier to add new registers in future, and also reduce repeated code.

Follow-up commits will migrate existing registers to use this new system

* DEV: Migrate user and group custom field APIs to plugin registry

This gives us a consistent system for checking plugin enabled state, so we are repeating less logic. API changes are backwards compatible
---
 app/controllers/admin/groups_controller.rb    |  2 +-
 app/controllers/groups_controller.rb          |  2 +-
 app/models/group.rb                           | 14 +----
 app/models/user.rb                            | 56 +++++--------------
 lib/discourse_plugin_registry.rb              | 31 ++++++++++
 lib/plugin/instance.rb                        | 18 +++---
 .../discourse_plugin_registry_spec.rb         | 46 +++++++++++++++
 spec/requests/admin/groups_controller_spec.rb |  4 +-
 spec/requests/groups_controller_spec.rb       |  4 +-
 spec/requests/reviewables_controller_spec.rb  |  2 +-
 spec/requests/users_controller_spec.rb        |  6 +-
 spec/serializers/user_serializer_spec.rb      |  4 +-
 12 files changed, 111 insertions(+), 78 deletions(-)

diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index a8413ebefc..50cef29164 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -177,7 +177,7 @@ class Admin::GroupsController < Admin::AdminController
       :usernames,
       :publish_read_state
     ]
-    custom_fields = Group.editable_group_custom_fields
+    custom_fields = DiscoursePluginRegistry.editable_group_custom_fields
     permitted << { custom_fields: custom_fields } unless custom_fields.blank?
 
     params.require(:group).permit(permitted)
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index bb763811d0..2716282d6a 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -545,7 +545,7 @@ class GroupsController < ApplicationController
             :publish_read_state
           ])
 
-          custom_fields = Group.editable_group_custom_fields
+          custom_fields = DiscoursePluginRegistry.editable_group_custom_fields
           default_params << { custom_fields: custom_fields } unless custom_fields.blank?
         end
 
diff --git a/app/models/group.rb b/app/models/group.rb
index 5bc41d7b42..80c6080bc1 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -266,19 +266,9 @@ class Group < ActiveRecord::Base
     end
   end
 
-  def self.plugin_editable_group_custom_fields
-    @plugin_editable_group_custom_fields ||= {}
-  end
-
   def self.register_plugin_editable_group_custom_field(custom_field_name, plugin)
-    plugin_editable_group_custom_fields[custom_field_name] = plugin
-  end
-
-  def self.editable_group_custom_fields
-    plugin_editable_group_custom_fields.reduce([]) do |fields, (k, v)|
-      next(fields) unless v.enabled?
-      fields << k
-    end.uniq
+    Discourse.deprecate("Editable group custom fields should be registered using the plugin API", since: "v2.4.0.beta4", drop_from: "v2.5.0")
+    DiscoursePluginRegistry.register_editable_group_custom_field(custom_field_name, plugin)
   end
 
   def downcase_incoming_email
diff --git a/app/models/user.rb b/app/models/user.rb
index f932f15abf..9d682a62bd 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -267,72 +267,44 @@ class User < ActiveRecord::Base
     end
   end
 
-  def self.plugin_editable_user_custom_fields
-    @plugin_editable_user_custom_fields ||= {}
-  end
-
-  def self.plugin_staff_editable_user_custom_fields
-    @plugin_staff_editable_user_custom_fields ||= {}
-  end
-
-  def self.register_plugin_editable_user_custom_field(custom_field_name, plugin, staff_only: false)
-    if staff_only
-      plugin_staff_editable_user_custom_fields[custom_field_name] = plugin
-    else
-      plugin_editable_user_custom_fields[custom_field_name] = plugin
-    end
-  end
-
   def self.editable_user_custom_fields(by_staff: false)
     fields = []
-
-    plugin_editable_user_custom_fields.each do |k, v|
-      fields << k if v.enabled?
-    end
-
-    if by_staff
-      plugin_staff_editable_user_custom_fields.each do |k, v|
-        fields << k if v.enabled?
-      end
-    end
+    fields.push *DiscoursePluginRegistry.self_editable_user_custom_fields
+    fields.push *DiscoursePluginRegistry.staff_editable_user_custom_fields if by_staff
 
     fields.uniq
   end
 
-  def self.plugin_staff_user_custom_fields
-    @plugin_staff_user_custom_fields ||= {}
+  def self.register_plugin_editable_user_custom_field(custom_field_name, plugin, staff_only: false)
+    Discourse.deprecate("Editable user custom fields should be registered using the plugin API", since: "v2.4.0.beta4", drop_from: "v2.5.0")
+    DiscoursePluginRegistry.register_editable_user_custom_field(custom_field_name, plugin, staff_only: staff_only)
   end
 
   def self.register_plugin_staff_custom_field(custom_field_name, plugin)
-    plugin_staff_user_custom_fields[custom_field_name] = plugin
-  end
-
-  def self.plugin_public_user_custom_fields
-    @plugin_public_user_custom_fields ||= {}
+    Discourse.deprecate("Staff user custom fields should be registered using the plugin API",  since: "v2.4.0.beta4", drop_from: "v2.5.0")
+    DiscoursePluginRegistry.register_staff_user_custom_field(custom_field_name, plugin)
   end
 
   def self.register_plugin_public_custom_field(custom_field_name, plugin)
-    plugin_public_user_custom_fields[custom_field_name] = plugin
+    Discourse.deprecate("Public user custom fields should be registered using the plugin API", since: "v2.4.0.beta4", drop_from: "v2.5.0")
+    DiscoursePluginRegistry.register_public_user_custom_field(custom_field_name, plugin)
   end
 
   def self.whitelisted_user_custom_fields(guardian)
     fields = []
 
-    plugin_public_user_custom_fields.each do |k, v|
-      fields << k if v.enabled?
-    end
+    fields.push *DiscoursePluginRegistry.public_user_custom_fields
 
     if SiteSetting.public_user_custom_fields.present?
-      fields += SiteSetting.public_user_custom_fields.split('|')
+      fields.push *SiteSetting.public_user_custom_fields.split('|')
     end
 
     if guardian.is_staff?
       if SiteSetting.staff_user_custom_fields.present?
-        fields += SiteSetting.staff_user_custom_fields.split('|')
-      end
-      plugin_staff_user_custom_fields.each do |k, v|
-        fields << k if v.enabled?
+        fields.push *SiteSetting.staff_user_custom_fields.split('|')
       end
+
+      fields.push *DiscoursePluginRegistry.staff_user_custom_fields
     end
 
     fields.uniq
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index acd35ecc79..ae260e2ce1 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -24,6 +24,29 @@ class DiscoursePluginRegistry
     end
   end
 
+  # Create a new register (see `define_register`) with some additions:
+  #   - Register is created in a class variable using the specified name/type
+  #   - Defines singleton method to access the register
+  #   - Defines instance method as a shortcut to the singleton method
+  #   - Automatically deletes the register on ::clear!
+  def self.define_filtered_register(register_name)
+    define_register(register_name, Array)
+
+    singleton_class.alias_method :"_raw_#{register_name}", :"#{register_name}"
+
+    define_singleton_method(register_name) do
+      unfiltered = public_send(:"_raw_#{register_name}")
+      unfiltered
+        .filter { |v| v[:plugin].enabled? }
+        .map { |v| v[:value] }
+        .uniq
+    end
+
+    define_singleton_method("register_#{register_name.to_s.singularize}") do |value, plugin|
+      public_send(:"_raw_#{register_name}") << { plugin: plugin, value: value }
+    end
+  end
+
   define_register :javascripts, Set
   define_register :auth_providers, Set
   define_register :service_workers, Set
@@ -44,6 +67,14 @@ class DiscoursePluginRegistry
   define_register :vendored_pretty_text, Set
   define_register :vendored_core_pretty_text, Set
 
+  define_filtered_register :staff_user_custom_fields
+  define_filtered_register :public_user_custom_fields
+
+  define_filtered_register :self_editable_user_custom_fields
+  define_filtered_register :staff_editable_user_custom_fields
+
+  define_filtered_register :editable_group_custom_fields
+
   def self.register_auth_provider(auth_provider)
     self.auth_providers << auth_provider
   end
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 647a453b20..a993ce52f0 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -146,27 +146,23 @@ class Plugin::Instance
   end
 
   def whitelist_staff_user_custom_field(field)
-    reloadable_patch do |plugin|
-      ::User.register_plugin_staff_custom_field(field, plugin) # plugin.enabled? is checked at runtime
-    end
+    DiscoursePluginRegistry.register_staff_user_custom_field(field, self)
   end
 
   def whitelist_public_user_custom_field(field)
-    reloadable_patch do |plugin|
-      ::User.register_plugin_public_custom_field(field, plugin) # plugin.enabled? is checked at runtime
-    end
+    DiscoursePluginRegistry.register_public_user_custom_field(field, self)
   end
 
   def register_editable_user_custom_field(field, staff_only: false)
-    reloadable_patch do |plugin|
-      ::User.register_plugin_editable_user_custom_field(field, plugin, staff_only: staff_only) # plugin.enabled? is checked at runtime
+    if staff_only
+      DiscoursePluginRegistry.register_staff_editable_user_custom_field(field, self)
+    else
+      DiscoursePluginRegistry.register_self_editable_user_custom_field(field, self)
     end
   end
 
   def register_editable_group_custom_field(field)
-    reloadable_patch do |plugin|
-      ::Group.register_plugin_editable_group_custom_field(field, plugin) # plugin.enabled? is checked at runtime
-    end
+    DiscoursePluginRegistry.register_editable_group_custom_field(field, self)
   end
 
   def custom_avatar_column(column)
diff --git a/spec/components/discourse_plugin_registry_spec.rb b/spec/components/discourse_plugin_registry_spec.rb
index 2fb9f41fef..3dc1bce882 100644
--- a/spec/components/discourse_plugin_registry_spec.rb
+++ b/spec/components/discourse_plugin_registry_spec.rb
@@ -10,6 +10,52 @@ describe DiscoursePluginRegistry do
   let(:registry) { TestRegistry }
   let(:registry_instance) { registry.new }
 
+  context '::define_register' do
+    let(:fresh_registry) { Class.new(TestRegistry) }
+
+    let(:plugin_class) do
+      Class.new(Plugin::Instance) do
+        attr_accessor :enabled
+        def enabled?
+          @enabled
+        end
+      end
+    end
+
+    let(:plugin) { plugin_class.new }
+
+    it 'works for a set' do
+      fresh_registry.define_register(:test_things, Set)
+      fresh_registry.test_things << "My Thing"
+      expect(fresh_registry.test_things).to contain_exactly("My Thing")
+      fresh_registry.reset!
+      expect(fresh_registry.test_things.length).to eq(0)
+    end
+
+    it 'works for a hash' do
+      fresh_registry.define_register(:test_things, Hash)
+      fresh_registry.test_things[:test] = "hello world"
+      expect(fresh_registry.test_things[:test]).to eq("hello world")
+      fresh_registry.reset!
+      expect(fresh_registry.test_things[:test]).to eq(nil)
+    end
+
+    context '::define_filtered_register' do
+      it 'works' do
+        fresh_registry.define_filtered_register(:test_things)
+        expect(fresh_registry.test_things.length).to eq(0)
+
+        fresh_registry.register_test_thing("mything", plugin)
+
+        plugin.enabled = true
+        expect(fresh_registry.test_things).to contain_exactly("mything")
+
+        plugin.enabled = false
+        expect(fresh_registry.test_things.length).to eq(0)
+      end
+    end
+  end
+
   context '#stylesheets' do
     it 'defaults to an empty Set' do
       registry.reset!
diff --git a/spec/requests/admin/groups_controller_spec.rb b/spec/requests/admin/groups_controller_spec.rb
index 1b0f1fd297..1279d33ed3 100644
--- a/spec/requests/admin/groups_controller_spec.rb
+++ b/spec/requests/admin/groups_controller_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe Admin::GroupsController do
       end
 
       after do
-        Group.plugin_editable_group_custom_fields.clear
+        DiscoursePluginRegistry.reset!
       end
 
       it "only updates allowed user fields" do
@@ -63,7 +63,7 @@ RSpec.describe Admin::GroupsController do
       end
 
       it "is secure when there are no registered editable fields" do
-        Group.plugin_editable_group_custom_fields.clear
+        DiscoursePluginRegistry.reset!
         params = group_params
         params[:group].merge!(custom_fields: { test: :hello1, test2: :hello2 })
 
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 45a4db2d21..ff387a2ff3 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -620,7 +620,7 @@ describe GroupsController do
       end
 
       after do
-        Group.plugin_editable_group_custom_fields.clear
+        DiscoursePluginRegistry.reset!
       end
 
       it "only updates allowed user fields" do
@@ -634,7 +634,7 @@ describe GroupsController do
       end
 
       it "is secure when there are no registered editable fields" do
-        Group.plugin_editable_group_custom_fields.clear
+        DiscoursePluginRegistry.reset!
         put "/groups/#{@group.id}.json", params: { group: { custom_fields: { test: :hello1, test2: :hello2 } } }
 
         @group.reload
diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rb
index 88064fa8eb..c14b0d8cd5 100644
--- a/spec/requests/reviewables_controller_spec.rb
+++ b/spec/requests/reviewables_controller_spec.rb
@@ -200,7 +200,7 @@ describe ReviewablesController do
         end
 
         after do
-          User.plugin_public_user_custom_fields.clear
+          DiscoursePluginRegistry.reset!
         end
 
         it "returns user data with custom fields" do
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index cfb1437c06..af09e50f1e 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -1851,8 +1851,7 @@ describe UsersController do
             end
 
             after do
-              User.plugin_editable_user_custom_fields.clear
-              User.plugin_staff_editable_user_custom_fields.clear
+              DiscoursePluginRegistry.reset!
             end
 
             it "only updates allowed user fields" do
@@ -1903,8 +1902,7 @@ describe UsersController do
             end
 
             it "is secure when there are no registered editable fields" do
-              User.plugin_editable_user_custom_fields.clear
-              User.plugin_staff_editable_user_custom_fields.clear
+              DiscoursePluginRegistry.reset!
               put "/u/#{user.username}.json", params: { custom_fields: { test1: :hello1, test2: :hello2, test3: :hello3 } }
               expect(response.status).to eq(200)
               expect(user.custom_fields["test1"]).to be_blank
diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb
index 9aa80e5011..2086c351ba 100644
--- a/spec/serializers/user_serializer_spec.rb
+++ b/spec/serializers/user_serializer_spec.rb
@@ -257,10 +257,10 @@ describe UserSerializer do
       end
 
       after do
-        User.plugin_public_user_custom_fields.clear
+        DiscoursePluginRegistry.reset!
       end
 
-      it "serializes the fields listed in plugin_public_user_custom_fields" do
+      it "serializes the fields listed in public_user_custom_fields" do
         expect(json[:custom_fields]['public_field']).to eq(user.custom_fields['public_field'])
         expect(json[:custom_fields]['secret_field']).to eq(nil)
       end

From 6a96c424b758b32ff63f78a74ada50090e7334ed Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 15 May 2020 21:16:13 +0800
Subject: [PATCH 1216/1830] FIX: Correct plugin api version bump.

It doesn't seem to be following semver.
---
 app/assets/javascripts/discourse/app/lib/plugin-api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index d17fde9235..b11283bb47 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -55,7 +55,7 @@ import { on } from "@ember/object/evented";
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.10.0";
+const PLUGIN_API_VERSION = "0.8.44";
 
 class PluginApi {
   constructor(version, container) {

From d1146ccb7b8b8619d0170108400cfbdfcb191cc2 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 15 May 2020 21:22:44 +0800
Subject: [PATCH 1217/1830] Revert "FIX: Correct plugin api version bump."

This reverts commit 6a96c424b758b32ff63f78a74ada50090e7334ed.

False alarm. I was deploying on a docker image which was still on 0.9.0.
---
 app/assets/javascripts/discourse/app/lib/plugin-api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index b11283bb47..d17fde9235 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -55,7 +55,7 @@ import { on } from "@ember/object/evented";
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.8.44";
+const PLUGIN_API_VERSION = "0.10.0";
 
 class PluginApi {
   constructor(version, container) {

From 26c2fb43544a5a66e85fa8f2d4a045655c988e6e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 15 May 2020 16:12:22 +0200
Subject: [PATCH 1218/1830] DEV: skip click track test (#9792)

This test might be responsible of random test failures, skip this for now to check if the random failure sill happens after dozens of tests.
---
 test/javascripts/acceptance/click-track-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/acceptance/click-track-test.js b/test/javascripts/acceptance/click-track-test.js
index d26e96d5a5..7e1f78b301 100644
--- a/test/javascripts/acceptance/click-track-test.js
+++ b/test/javascripts/acceptance/click-track-test.js
@@ -3,7 +3,7 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Click Track", {});
 
-QUnit.test("Do not track mentions", async assert => {
+QUnit.skip("Do not track mentions", async assert => {
   pretender.post("/clicks/track", () => assert.ok(false));
 
   await visit("/t/internationalization-localization/280");

From 769611f2d98a90e569824682b07124fd50e3856e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 15 May 2020 10:13:49 -0400
Subject: [PATCH 1219/1830] Build(deps-dev): Bump ruby-prof from 1.4.0 to 1.4.1
 (#9790)

Bumps [ruby-prof](https://github.com/ruby-prof/ruby-prof) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/ruby-prof/ruby-prof/releases)
- [Changelog](https://github.com/ruby-prof/ruby-prof/blob/master/CHANGES)
- [Commits](https://github.com/ruby-prof/ruby-prof/compare/1.4.0...1.4.1)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 2a195eeebb..3cc281953e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -353,7 +353,7 @@ GEM
       rubocop-rspec (>= 1.39.0)
     rubocop-rspec (1.39.0)
       rubocop (>= 0.68.1)
-    ruby-prof (1.4.0)
+    ruby-prof (1.4.1)
     ruby-progressbar (1.10.1)
     ruby-readability (0.7.0)
       guess_html_encoding (>= 0.0.4)

From 3a615a8bdde6eb8c68fe538aee110e0db87a5ea3 Mon Sep 17 00:00:00 2001
From: cketti <ck@cketti.de>
Date: Mon, 11 May 2020 16:18:44 +0200
Subject: [PATCH 1220/1830] Update description of level 0 user limitations

With the default configuration new users can post 1 image.
---
 docs/ADMIN-QUICK-START-GUIDE.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/ADMIN-QUICK-START-GUIDE.md b/docs/ADMIN-QUICK-START-GUIDE.md
index 96e4610cf6..3b030b1d89 100644
--- a/docs/ADMIN-QUICK-START-GUIDE.md
+++ b/docs/ADMIN-QUICK-START-GUIDE.md
@@ -82,7 +82,8 @@ Discourse is designed to offer safe defaults for public communities, even with n
 All new users start out in a sandbox with restrictions for everyone's safety. **Trust level 0 (new) users _cannot_** &hellip;
 
 - post more than 2 hyperlinks
-- post any images or file attachments
+- post more than 1 image
+- post file attachments
 - send personal messages
 - flag posts or topics
 - have actual links in the "about me" field of their profile

From 9810ca1dbdaf6c51f39bde8e13293d8bb45ccff6 Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Fri, 15 May 2020 10:08:46 -0500
Subject: [PATCH 1221/1830] UX: Add copied text upon copy button click (#9793)

---
 .../javascripts/discourse/app/initializers/copy-codeblocks.js | 4 ++++
 config/locales/client.en.yml                                  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js b/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
index 62552f60b9..a0b0d50962 100644
--- a/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
+++ b/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
@@ -2,6 +2,7 @@ import { withPluginApi } from "discourse/lib/plugin-api";
 import { cancel, later } from "@ember/runloop";
 import { Promise } from "rsvp";
 import { iconHTML } from "discourse-common/lib/icon-library";
+import I18n from "I18n";
 
 // http://github.com/feross/clipboard-copy
 function clipboardCopy(text) {
@@ -86,6 +87,8 @@ export default {
         if (code) {
           clipboardCopy(code.innerText.trim()).then(() => {
             button.classList.add("copied");
+            const state = button.innerHTML;
+            button.innerHTML = I18n.t("copy_codeblock.copied");
 
             const commandId = Ember.guidFor(button);
 
@@ -96,6 +99,7 @@ export default {
 
             _fadeCopyCodeblocksRunners[commandId] = later(() => {
               button.classList.remove("copied");
+              button.innerHTML = state;
               delete _fadeCopyCodeblocksRunners[commandId];
             }, 3000);
           });
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 6fab3f42ed..56d65743ba 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -336,6 +336,9 @@ en:
         tomorrow_with_time: "tomorrow at %{time}"
         at_time: "at %{date_time}"
         existing_reminder: "You have a reminder set for this bookmark which will be sent"
+    
+    copy_codeblock:
+      copied: "copied!"
 
     drafts:
       resume: "Resume"

From b07f1bfd93e9b2c120480ac684a25dfd7451f209 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 15 May 2020 17:36:00 +0200
Subject: [PATCH 1222/1830] FIX: displays a title on sk header if no selected
 name (#9794)

none has to be defined.
---
 .../components/categories-admin-dropdown.js   |  3 +-
 .../select-kit/select-kit-header.js           | 12 ++++-
 .../select-kit/components/selected-name.js    |  9 ++--
 .../templates/components/selected-name.hbs    | 44 ++++++++++---------
 .../common/select-kit/select-kit.scss         |  1 +
 config/locales/client.en.yml                  |  3 ++
 .../select-kit/dropdown-select-box-test.js    | 19 +++++++-
 7 files changed, 62 insertions(+), 29 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/categories-admin-dropdown.js b/app/assets/javascripts/select-kit/components/categories-admin-dropdown.js
index 015343bd54..d8ea039ffd 100644
--- a/app/assets/javascripts/select-kit/components/categories-admin-dropdown.js
+++ b/app/assets/javascripts/select-kit/components/categories-admin-dropdown.js
@@ -12,7 +12,8 @@ export default DropdownSelectBoxComponent.extend({
     icon: "bars",
     showFullTitle: false,
     autoFilterable: false,
-    filterable: false
+    filterable: false,
+    none: "select_kit.components.categories_admin_dropdown.title"
   },
 
   content: computed(function() {
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js
index 61f57d1b5d..785b2a4702 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js
@@ -27,7 +27,7 @@ export default Component.extend(UtilsMixin, {
     "roleButton:role",
     "selectedValue:data-value",
     "selectedNames:data-name",
-    "serializedNames:title"
+    "buttonTitle:title"
   ],
 
   selectedValue: computed("value", function() {
@@ -42,6 +42,16 @@ export default Component.extend(UtilsMixin, {
       .join(",");
   }),
 
+  buttonTitle: computed("value", "selectKit.noneItem", function() {
+    if (
+      !this.value &&
+      this.selectKit.noneItem &&
+      !this.selectKit.options.showFullTitle
+    ) {
+      return this.selectKit.noneItem.title || this.selectKit.noneItem.name;
+    }
+  }),
+
   icons: computed("selectKit.options.{icon,icons}", function() {
     const icon = makeArray(this.selectKit.options.icon);
     const icons = makeArray(this.selectKit.options.icons);
diff --git a/app/assets/javascripts/select-kit/components/selected-name.js b/app/assets/javascripts/select-kit/components/selected-name.js
index ac23c16446..e1c75a6e5f 100644
--- a/app/assets/javascripts/select-kit/components/selected-name.js
+++ b/app/assets/javascripts/select-kit/components/selected-name.js
@@ -1,17 +1,16 @@
-import { computed, get } from "@ember/object";
+import { computed, get, action } from "@ember/object";
 import Component from "@ember/component";
 import { makeArray } from "discourse-common/lib/helpers";
 import UtilsMixin from "select-kit/mixins/utils";
 
 export default Component.extend(UtilsMixin, {
+  tagName: "",
   layoutName: "select-kit/templates/components/selected-name",
-  classNames: ["select-kit-selected-name", "selected-name", "choice"],
   name: null,
   value: null,
-  tabindex: 0,
-  attributeBindings: ["title", "value:data-value", "name:data-name"],
 
-  click() {
+  @action
+  onSelectedNameClick() {
     if (this.selectKit.options.clearOnClick) {
       this.selectKit.deselect(this.item);
       return false;
diff --git a/app/assets/javascripts/select-kit/templates/components/selected-name.hbs b/app/assets/javascripts/select-kit/templates/components/selected-name.hbs
index b1b1aa9ae3..7fb7650bf1 100644
--- a/app/assets/javascripts/select-kit/templates/components/selected-name.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/selected-name.hbs
@@ -1,26 +1,30 @@
 {{#if selectKit.options.showFullTitle}}
-  {{#if item.icon}}
-    {{d-icon item.icon}}
-  {{/if}}
-
-  <span class="name">
-    {{label}}
-  </span>
-
-  {{#if selectKit.options.clearOnClick}}
-    {{d-icon "times"}}
-  {{else}}
-    {{#if shouldDisplayClearableButton}}
-      {{d-button
-        class="btn-clear"
-        icon="times"
-        action=selectKit.deselect
-        actionParam=item
-      }}
+  <div {{action "onSelectedNameClick"}} tabindex="0" title={{title}} data-value={{value}} data-name={{name}} class="select-kit-selected-name selected-name choice">
+    {{#if item.icon}}
+      {{d-icon item.icon}}
     {{/if}}
-  {{/if}}
+
+    <span class="name">
+      {{label}}
+    </span>
+
+    {{#if selectKit.options.clearOnClick}}
+      {{d-icon "times"}}
+    {{else}}
+      {{#if shouldDisplayClearableButton}}
+        {{d-button
+          class="btn-clear"
+          icon="times"
+          action=selectKit.deselect
+          actionParam=item
+        }}
+      {{/if}}
+    {{/if}}
+  </div>
 {{else}}
   {{#if item.icon}}
-    {{d-icon item.icon}}
+    <div tabindex="0" class="select-kit-selected-name selected-name choice">
+      {{d-icon item.icon}}
+    </div>
   {{/if}}
 {{/if}}
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 2f2c31bb9b..e8fd875612 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -68,6 +68,7 @@
       flex: 0 1 auto;
       color: inherit;
       display: flex;
+      outline: none;
 
       .d-icon + .name {
         margin-left: 0.5em;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 56d65743ba..9746f37f37 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1670,6 +1670,9 @@ en:
         one: "Select at least {{count}} item."
         other: "Select at least {{count}} items."
       invalid_selection_length: "Selection must be at least {{count}} characters."
+      components:
+        categories_admin_dropdown:
+          title: "Categories admin dropdown"
 
     date_time_picker:
       from: From
diff --git a/test/javascripts/components/select-kit/dropdown-select-box-test.js b/test/javascripts/components/select-kit/dropdown-select-box-test.js
index 5eaaaa8e30..550d3babc4 100644
--- a/test/javascripts/components/select-kit/dropdown-select-box-test.js
+++ b/test/javascripts/components/select-kit/dropdown-select-box-test.js
@@ -60,13 +60,19 @@ componentTest("options.showFullTitle=false", {
       value=value
       content=content
       options=(hash
+        icon="times"
         showFullTitle=showFullTitle
+        none=none
       )
     }}
   `,
 
   beforeEach() {
-    setDefaultState(this, { showFullTitle: false });
+    setDefaultState(this, {
+      value: null,
+      showFullTitle: false,
+      none: "test_none"
+    });
   },
 
   async test(assert) {
@@ -75,10 +81,19 @@ componentTest("options.showFullTitle=false", {
         this.subject
           .header()
           .el()
-          .find(".selected-name .body")
+          .find(".selected-name")
       ),
       "it hides the text of the selected item"
     );
+
+    assert.equal(
+      this.subject
+        .header()
+        .el()
+        .attr("title"),
+      "[en_US.test_none]",
+      "it adds a title attribute to the button"
+    );
   }
 });
 

From 7edd312f8500065aa935815e769b8f7961e614a5 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 15 May 2020 18:27:06 +0200
Subject: [PATCH 1223/1830] UX: focus category name when editing category
 (#9795)

---
 .../app/components/edit-category-general.js      | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/components/edit-category-general.js b/app/assets/javascripts/discourse/app/components/edit-category-general.js
index ad9c056623..6fc54434de 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-general.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-general.js
@@ -1,6 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { not } from "@ember/object/computed";
+import { later } from "@ember/runloop";
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import Category from "discourse/models/category";
@@ -12,6 +13,12 @@ export default buildCategoryPanel("general", {
     this.foregroundColors = ["FFFFFF", "000000"];
   },
 
+  didInsertElement() {
+    this._super(...arguments);
+
+    this._focusCategoryName();
+  },
+
   canSelectParentCategory: not("category.isUncategorizedCategory"),
   uncategorizedSiteSettingLink: Discourse.getURL(
     "/admin/site_settings/category/all_results?filter=allow_uncategorized_topics"
@@ -101,5 +108,14 @@ export default buildCategoryPanel("general", {
       window.open(this.get("category.topic_url"), "_blank").focus();
       return false;
     }
+  },
+
+  _focusCategoryName() {
+    later(() => {
+      if (this.element && !this.isDestroying && !this.isDestroyed) {
+        const categoryName = this.element.querySelector(".category-name");
+        categoryName && categoryName.focus();
+      }
+    }, 25);
   }
 });

From ac042c2bbe491240a5f2dc4c0e2aca478b0ff83e Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 15 May 2020 17:49:27 +0100
Subject: [PATCH 1224/1830] UX: Fetch higher-resolution youtube thumbnails
 where available

We have been using YouTube's 'hqdefault.jpg' image which works consistently to provide a 480x360 thumbnail. YouTube does provide larger thumbnails, but not consistently for every video. By using og:image, we will fetch the best resolution YouTube can provide for each video.

This commit also refactors lazy-yt to re-use the thumbnail already existing in the cooked content. This means we get lazy-loading for free, and avoid hotlinking images to YouTube (when download remote images is enabled on the site).
---
 plugins/lazy-yt/assets/javascripts/lazyYT.js  | 30 +++++++++++++------
 plugins/lazy-yt/assets/stylesheets/lazyYT.css | 12 ++++++--
 plugins/lazy-yt/plugin.rb                     |  5 +++-
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/plugins/lazy-yt/assets/javascripts/lazyYT.js b/plugins/lazy-yt/assets/javascripts/lazyYT.js
index 651ea9df48..92a3542a06 100644
--- a/plugins/lazy-yt/assets/javascripts/lazyYT.js
+++ b/plugins/lazy-yt/assets/javascripts/lazyYT.js
@@ -87,6 +87,8 @@
     innerHtml.push("</div>"); // .html5-title-text-wrapper
     innerHtml.push("</div>"); // end of Video title .html5-info-bar
 
+    const prefetchedThumbnail = $el[0].querySelector(".ytp-thumbnail-image");
+
     $el
       .css({
         "padding-bottom": padding_bottom
@@ -108,17 +110,27 @@
       thumb_img = "default.jpg";
     }
 
+    if (prefetchedThumbnail) {
+      $el.find(".ytp-thumbnail").append(prefetchedThumbnail);
+    } else {
+      // Fallback for old posts which were baked before the lazy-yt onebox prefetched a thumbnail
+      $el
+        .find(".ytp-thumbnail")
+        .append(
+          $(
+            [
+              '<img class="ytp-thumbnail-image" src="https://img.youtube.com/vi/',
+              id,
+              "/",
+              thumb_img,
+              '">'
+            ].join("")
+          )
+        );
+    }
+
     $thumb = $el
       .find(".ytp-thumbnail")
-      .css({
-        "background-image": [
-          "url(https://img.youtube.com/vi/",
-          id,
-          "/",
-          thumb_img,
-          ")"
-        ].join("")
-      })
       .addClass("lazyYT-image-loaded")
       .on("click", function(e) {
         e.preventDefault();
diff --git a/plugins/lazy-yt/assets/stylesheets/lazyYT.css b/plugins/lazy-yt/assets/stylesheets/lazyYT.css
index 134a535eb3..233c342c74 100644
--- a/plugins/lazy-yt/assets/stylesheets/lazyYT.css
+++ b/plugins/lazy-yt/assets/stylesheets/lazyYT.css
@@ -103,11 +103,12 @@
   font-size: normal !important;
   font-weight: normal !important;
   line-height: 1 !important;
-  opacity: .9;
+  opacity: 0.9;
+  z-index: 935;
 }
 
 .ytp-large-play-button-svg {
-  opacity: .9;
+  opacity: 0.9;
   fill: #1f1f1f;
 }
 
@@ -116,3 +117,10 @@
   opacity: 1;
   fill: #cc181e;
 }
+
+.ytp-thumbnail-image {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
diff --git a/plugins/lazy-yt/plugin.rb b/plugins/lazy-yt/plugin.rb
index 3665244463..4f5517c22a 100644
--- a/plugins/lazy-yt/plugin.rb
+++ b/plugins/lazy-yt/plugin.rb
@@ -25,6 +25,9 @@ class Onebox::Engine::YoutubeOnebox
       video_width = (params['width'] && params['width'].to_i <= 695) ? params['width'] : 480 # embed width
       video_height = (params['height'] && params['height'].to_i <= 500) ? params['height'] : 270 # embed height
 
+      og = get_opengraph.data
+      thumbnail_url = og[:image] || "https://img.youtube.com/vi/#{video_id}/hqdefault.jpg"
+
       # Put in the LazyYT div instead of the iframe
       escaped_title = ERB::Util.html_escape(video_title)
 
@@ -36,7 +39,7 @@ class Onebox::Engine::YoutubeOnebox
            data-height="#{video_height}"
            data-parameters="#{embed_params}">
         <a href="https://www.youtube.com/watch?v=#{video_id}" target="_blank">
-          <img src="https://img.youtube.com/vi/#{video_id}/hqdefault.jpg" width="#{video_width}" height="#{video_height}" title="#{escaped_title}">
+          <img class="ytp-thumbnail-image" src="#{thumbnail_url}" width="#{video_width}" height="#{video_height}" title="#{escaped_title}">
         </a>
       </div>
       EOF

From f86b123cfc753cd9cff02620cbbb7376fe01ebbe Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 15 May 2020 17:55:34 +0100
Subject: [PATCH 1225/1830] DEV: Remove use of `const` in untranspiled js

---
 plugins/lazy-yt/assets/javascripts/lazyYT.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/lazy-yt/assets/javascripts/lazyYT.js b/plugins/lazy-yt/assets/javascripts/lazyYT.js
index 92a3542a06..101196b6c2 100644
--- a/plugins/lazy-yt/assets/javascripts/lazyYT.js
+++ b/plugins/lazy-yt/assets/javascripts/lazyYT.js
@@ -87,7 +87,7 @@
     innerHtml.push("</div>"); // .html5-title-text-wrapper
     innerHtml.push("</div>"); // end of Video title .html5-info-bar
 
-    const prefetchedThumbnail = $el[0].querySelector(".ytp-thumbnail-image");
+    var prefetchedThumbnail = $el[0].querySelector(".ytp-thumbnail-image");
 
     $el
       .css({

From eee20a9814217376dd2e5fd48e2fb1a490bd2d1d Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 15 May 2020 18:12:53 +0100
Subject: [PATCH 1226/1830] FIX: Include plugin CSS assets when previewing
 themes

---
 app/controllers/themes_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/themes_controller.rb b/app/controllers/themes_controller.rb
index e13f880b05..6520ec7097 100644
--- a/app/controllers/themes_controller.rb
+++ b/app/controllers/themes_controller.rb
@@ -12,6 +12,7 @@ class ThemesController < ::ApplicationController
 
     targets = view_context.mobile_view? ? [:mobile, :mobile_theme] : [:desktop, :desktop_theme]
     targets << :admin if guardian.is_staff?
+    targets.append(*Discourse.find_plugin_css_assets(mobile_view: true, desktop_view: true))
 
     object = targets.map do |target|
       Stylesheet::Manager.stylesheet_data(target, theme_ids).map do |hash|

From 6b04760572f85c18a539bf5a9001ca574f9c4da1 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 15 May 2020 13:52:03 -0400
Subject: [PATCH 1227/1830] FIX: Component was still used by data explorer

---
 .../javascripts/discourse/app/components/directory-toggle.js  | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 app/assets/javascripts/discourse/app/components/directory-toggle.js

diff --git a/app/assets/javascripts/discourse/app/components/directory-toggle.js b/app/assets/javascripts/discourse/app/components/directory-toggle.js
new file mode 100644
index 0000000000..3cf125298f
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/directory-toggle.js
@@ -0,0 +1,4 @@
+import TableHeader from "discourse/components/table-header-toggle";
+
+// TODO: Remove once Discourse 2.5 is stable
+export default TableHeader.extend();

From 7f07c513a73b928807244ec66db3e3b1ca13dae0 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Sat, 16 May 2020 01:54:44 +0800
Subject: [PATCH 1228/1830] FIX: Switching composer action does not refresh
 composer actions content (#9791)

---
 .../select-kit/components/composer-actions.js  | 18 ++++++++++++++----
 .../acceptance/composer-actions-test.js        | 12 +++++++++---
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js b/app/assets/javascripts/select-kit/components/composer-actions.js
index a3830d5ae0..adaccf2953 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js
@@ -16,10 +16,12 @@ import { isEmpty } from "@ember/utils";
 // Component can get destroyed and lose state
 let _topicSnapshot = null;
 let _postSnapshot = null;
+let _actionSnapshot = null;
 
 export function _clearSnapshots() {
   _topicSnapshot = null;
   _postSnapshot = null;
+  _actionSnapshot = null;
 }
 
 export default DropdownSelectBoxComponent.extend({
@@ -50,6 +52,7 @@ export default DropdownSelectBoxComponent.extend({
 
   didReceiveAttrs() {
     this._super(...arguments);
+    let changeContent = false;
 
     // if we change topic we want to change both snapshots
     if (
@@ -58,18 +61,25 @@ export default DropdownSelectBoxComponent.extend({
     ) {
       _topicSnapshot = this.topic;
       _postSnapshot = this.post;
-      this.contentChanged();
+      changeContent = true;
     }
 
     // if we hit reply on a different post we want to change postSnapshot
     if (this.post && (!_postSnapshot || this.post.id !== _postSnapshot.id)) {
       _postSnapshot = this.post;
+      changeContent = true;
+    }
+
+    if (this.action !== _actionSnapshot) {
+      _actionSnapshot = this.action;
+      changeContent = true;
+    }
+
+    if (changeContent) {
       this.contentChanged();
     }
 
-    if (isEmpty(this.content)) {
-      this.set("selectKit.isHidden", true);
-    }
+    this.set("selectKit.isHidden", isEmpty(this.content));
   },
 
   modifySelection() {
diff --git a/test/javascripts/acceptance/composer-actions-test.js b/test/javascripts/acceptance/composer-actions-test.js
index fb1a374dc3..fff2e804f6 100644
--- a/test/javascripts/acceptance/composer-actions-test.js
+++ b/test/javascripts/acceptance/composer-actions-test.js
@@ -148,12 +148,18 @@ QUnit.test("reply_as_new_topic without a new_topic draft", async assert => {
 });
 
 QUnit.test("hide component if no content", async assert => {
-  const composerActions = selectKit(".composer-actions");
+  await visit("/");
+  await click("button#create-topic");
 
-  await visit("/u/eviltrout/messages");
-  await click(".new-private-message");
+  const composerActions = selectKit(".composer-actions");
+  await composerActions.expand();
+  await composerActions.selectRowByValue("reply_as_private_message");
 
   assert.ok(composerActions.el().hasClass("is-hidden"));
+
+  await click("button#create-topic");
+  await composerActions.expand();
+  assert.equal(composerActions.rows().length, 2);
 });
 
 QUnit.test("interactions", async assert => {

From db8e872bda16b5639b582ecdf6c8966dac823c58 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 15 May 2020 16:07:35 -0400
Subject: [PATCH 1229/1830] DEV: Move select kit to an addon (#9797)

---
 app/assets/javascripts/application.js         |     2 +-
 .../javascripts/select-kit/app/.gitkeep       |     0
 .../components/admin-group-selector.js        |     0
 .../components/categories-admin-dropdown.js   |     0
 .../{ => app}/components/category-chooser.js  |     0
 .../{ => app}/components/category-drop.js     |     0
 .../category-drop/category-drop-header.js     |     0
 .../category-notifications-button.js          |     0
 .../{ => app}/components/category-row.js      |     0
 .../{ => app}/components/category-selector.js |     0
 .../{ => app}/components/color-palettes.js    |     0
 .../color-palettes/color-palettes-row.js      |     0
 .../{ => app}/components/combo-box.js         |     0
 .../components/combo-box/combo-box-header.js  |     0
 .../{ => app}/components/composer-actions.js  |     0
 .../{ => app}/components/create-color-row.js  |     0
 .../components/dropdown-select-box.js         |     0
 .../dropdown-select-box-header.js             |     0
 .../dropdown-select-box-row.js                |     0
 .../components/future-date-input-selector.js  |     0
 .../future-date-input-selector-header.js      |     0
 .../future-date-input-selector-row.js         |     0
 .../future-date-input-selector/mixin.js       |     0
 .../{ => app}/components/group-dropdown.js    |     0
 .../components/group-members-dropdown.js      |     0
 .../components/group-notifications-button.js  |     0
 .../{ => app}/components/icon-picker.js       |     0
 .../{ => app}/components/list-setting.js      |     0
 .../{ => app}/components/mini-tag-chooser.js  |     0
 .../mini-tag-chooser-header.js                |     0
 .../mini-tag-chooser/selected-collection.js   |     0
 .../{ => app}/components/multi-select.js      |     0
 .../multi-select/multi-select-filter.js       |     0
 .../multi-select/multi-select-header.js       |     0
 .../multi-select/selected-category.js         |     0
 .../components/multi-select/selected-color.js |     0
 .../{ => app}/components/none-category-row.js |     0
 .../components/notifications-button.js        |     0
 .../notifications-button-row.js               |     0
 .../components/notifications-filter.js        |     0
 .../notifications-filter-header.js            |     0
 .../{ => app}/components/period-chooser.js    |     0
 .../period-chooser/period-chooser-header.js   |     0
 .../period-chooser/period-chooser-row.js      |     0
 .../{ => app}/components/pinned-button.js     |     0
 .../{ => app}/components/pinned-options.js    |     0
 .../search-advanced-category-chooser.js       |     0
 .../{ => app}/components/select-kit.js        |     0
 .../select-kit/errors-collection.js           |     0
 .../components/select-kit/select-kit-body.js  |     0
 .../select-kit/select-kit-collection.js       |     0
 .../select-kit/select-kit-create-row.js       |     0
 .../select-kit/select-kit-filter.js           |     0
 .../select-kit/select-kit-header.js           |     0
 .../select-kit/select-kit-none-row.js         |     0
 .../components/select-kit/select-kit-row.js   |     0
 .../select-kit/single-select-header.js        |     0
 .../{ => app}/components/selected-color.js    |     0
 .../{ => app}/components/selected-name.js     |     0
 .../{ => app}/components/single-select.js     |     0
 .../{ => app}/components/tag-chooser-row.js   |     0
 .../{ => app}/components/tag-chooser.js       |     0
 .../{ => app}/components/tag-drop.js          |     0
 .../components/tag-drop/tag-drop-header.js    |     0
 .../{ => app}/components/tag-group-chooser.js |     0
 .../components/tag-notifications-button.js    |     0
 .../{ => app}/components/tag-row.js           |     0
 .../{ => app}/components/timezone-input.js    |     0
 .../components/toolbar-popup-menu-options.js  |     0
 .../toolbar-popup-menu-options-heading.js     |     0
 .../topic-footer-mobile-dropdown.js           |     0
 .../components/topic-notifications-button.js  |     0
 .../components/topic-notifications-options.js |     0
 .../{ => app}/components/user-chooser.js      |     0
 .../components/user-chooser/user-row.js       |     0
 .../components/user-notifications-dropdown.js |     0
 .../select-kit/{ => app}/mixins/plugin-api.js |     0
 .../select-kit/{ => app}/mixins/tags.js       |     0
 .../select-kit/{ => app}/mixins/utils.js      |     0
 .../category-drop/category-drop-header.hbs    |     0
 .../templates/components/category-row.hbs     |     0
 .../color-palettes/color-palettes-row.hbs     |     0
 .../components/combo-box/combo-box-header.hbs |     0
 .../templates/components/create-color-row.hbs |     0
 .../dropdown-select-box-header.hbs            |     0
 .../dropdown-select-box-row.hbs               |     0
 .../future-date-input-selector-header.hbs     |     0
 .../future-date-input-selector-row.hbs        |     0
 .../mini-tag-chooser-header.hbs               |     0
 .../mini-tag-chooser/selected-collection.hbs  |     0
 .../templates/components/multi-select.hbs     |     0
 .../multi-select/multi-select-header.hbs      |     0
 .../multi-select/selected-category.hbs        |     0
 .../notifications-filter-header.hbs           |     0
 .../period-chooser/period-chooser-header.hbs  |     0
 .../period-chooser/period-chooser-row.hbs     |     0
 .../templates/components/pinned-button.hbs    |     0
 .../select-kit/errors-collection.hbs          |     0
 .../components/select-kit/select-kit-body.hbs |     0
 .../select-kit/select-kit-collection.hbs      |     0
 .../select-kit/select-kit-filter.hbs          |     0
 .../components/select-kit/select-kit-row.hbs  |     0
 .../select-kit/single-select-header.hbs       |     0
 .../templates/components/selected-name.hbs    |     0
 .../templates/components/single-select.hbs    |     0
 .../templates/components/tag-chooser-row.hbs  |     0
 .../components/tag-drop/tag-drop-header.hbs   |     0
 .../templates/components/tag-row.hbs          |     0
 .../toolbar-popup-menu-options-heading.hbs    |     0
 .../components/topic-notifications-button.hbs |     0
 .../components/user-chooser/user-row.hbs      |     0
 .../select-kit/config/ember-try.js            |    89 +
 .../select-kit/config/environment.js          |     5 +
 .../javascripts/select-kit/ember-cli-build.js |     9 +
 app/assets/javascripts/select-kit/index.js    |     6 +
 .../javascripts/select-kit/package.json       |    54 +
 app/assets/javascripts/select-kit/yarn.lock   | 10485 ++++++++++++++++
 app/assets/javascripts/wizard-application.js  |     2 +-
 config/application.rb                         |     6 +-
 lib/freedom_patches/ember_handlebars.rb       |    15 +
 120 files changed, 10670 insertions(+), 3 deletions(-)
 create mode 100644 app/assets/javascripts/select-kit/app/.gitkeep
 rename app/assets/javascripts/select-kit/{ => app}/components/admin-group-selector.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/categories-admin-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/category-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/category-drop.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/category-drop/category-drop-header.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/category-notifications-button.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/category-row.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/category-selector.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/color-palettes.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/color-palettes/color-palettes-row.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/combo-box.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/combo-box/combo-box-header.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/composer-actions.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/create-color-row.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/dropdown-select-box.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/dropdown-select-box/dropdown-select-box-header.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/dropdown-select-box/dropdown-select-box-row.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/future-date-input-selector.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/future-date-input-selector/future-date-input-selector-header.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/future-date-input-selector/future-date-input-selector-row.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/future-date-input-selector/mixin.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/group-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/group-members-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/group-notifications-button.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/icon-picker.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/list-setting.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/mini-tag-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/mini-tag-chooser/mini-tag-chooser-header.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/mini-tag-chooser/selected-collection.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/multi-select.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/multi-select/multi-select-filter.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/multi-select/multi-select-header.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/multi-select/selected-category.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/multi-select/selected-color.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/none-category-row.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/notifications-button.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/notifications-button/notifications-button-row.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/notifications-filter.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/notifications-filter/notifications-filter-header.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/period-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/period-chooser/period-chooser-header.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/period-chooser/period-chooser-row.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/pinned-button.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/pinned-options.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/search-advanced-category-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/select-kit.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/select-kit/errors-collection.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/select-kit/select-kit-body.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/select-kit/select-kit-collection.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/select-kit/select-kit-create-row.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/select-kit/select-kit-filter.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/select-kit/select-kit-header.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/select-kit/select-kit-none-row.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/select-kit/select-kit-row.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/select-kit/single-select-header.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/selected-color.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/selected-name.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/single-select.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/tag-chooser-row.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/tag-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/tag-drop.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/tag-drop/tag-drop-header.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/tag-group-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/tag-notifications-button.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/tag-row.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/timezone-input.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/toolbar-popup-menu-options.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/topic-footer-mobile-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/topic-notifications-button.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/topic-notifications-options.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/user-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/user-chooser/user-row.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/components/user-notifications-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/mixins/plugin-api.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/mixins/tags.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/mixins/utils.js (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/category-drop/category-drop-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/category-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/color-palettes/color-palettes-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/combo-box/combo-box-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/create-color-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/dropdown-select-box/dropdown-select-box-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/dropdown-select-box/dropdown-select-box-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/future-date-input-selector/future-date-input-selector-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/future-date-input-selector/future-date-input-selector-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/mini-tag-chooser/selected-collection.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/multi-select.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/multi-select/multi-select-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/multi-select/selected-category.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/notifications-filter/notifications-filter-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/period-chooser/period-chooser-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/period-chooser/period-chooser-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/pinned-button.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/select-kit/errors-collection.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/select-kit/select-kit-body.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/select-kit/select-kit-collection.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/select-kit/select-kit-filter.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/select-kit/select-kit-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/select-kit/single-select-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/selected-name.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/single-select.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/tag-chooser-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/tag-drop/tag-drop-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/tag-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/topic-notifications-button.hbs (100%)
 rename app/assets/javascripts/select-kit/{ => app}/templates/components/user-chooser/user-row.hbs (100%)
 create mode 100644 app/assets/javascripts/select-kit/config/ember-try.js
 create mode 100644 app/assets/javascripts/select-kit/config/environment.js
 create mode 100644 app/assets/javascripts/select-kit/ember-cli-build.js
 create mode 100644 app/assets/javascripts/select-kit/index.js
 create mode 100644 app/assets/javascripts/select-kit/package.json
 create mode 100644 app/assets/javascripts/select-kit/yarn.lock
 create mode 100644 lib/freedom_patches/ember_handlebars.rb

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index d7f9c0d96b..4445fd7986 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,6 +1,6 @@
 //= require_tree ./discourse-common/addon
 //= require ./polyfills
-//= require_tree ./select-kit
+//= require_tree ./select-kit/app
 //= require ./discourse/app/app
 //= require ./app-boot
 
diff --git a/app/assets/javascripts/select-kit/app/.gitkeep b/app/assets/javascripts/select-kit/app/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/select-kit/components/admin-group-selector.js b/app/assets/javascripts/select-kit/app/components/admin-group-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/admin-group-selector.js
rename to app/assets/javascripts/select-kit/app/components/admin-group-selector.js
diff --git a/app/assets/javascripts/select-kit/components/categories-admin-dropdown.js b/app/assets/javascripts/select-kit/app/components/categories-admin-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/categories-admin-dropdown.js
rename to app/assets/javascripts/select-kit/app/components/categories-admin-dropdown.js
diff --git a/app/assets/javascripts/select-kit/components/category-chooser.js b/app/assets/javascripts/select-kit/app/components/category-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-chooser.js
rename to app/assets/javascripts/select-kit/app/components/category-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/category-drop.js b/app/assets/javascripts/select-kit/app/components/category-drop.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-drop.js
rename to app/assets/javascripts/select-kit/app/components/category-drop.js
diff --git a/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js b/app/assets/javascripts/select-kit/app/components/category-drop/category-drop-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js
rename to app/assets/javascripts/select-kit/app/components/category-drop/category-drop-header.js
diff --git a/app/assets/javascripts/select-kit/components/category-notifications-button.js b/app/assets/javascripts/select-kit/app/components/category-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-notifications-button.js
rename to app/assets/javascripts/select-kit/app/components/category-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/components/category-row.js b/app/assets/javascripts/select-kit/app/components/category-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-row.js
rename to app/assets/javascripts/select-kit/app/components/category-row.js
diff --git a/app/assets/javascripts/select-kit/components/category-selector.js b/app/assets/javascripts/select-kit/app/components/category-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/category-selector.js
rename to app/assets/javascripts/select-kit/app/components/category-selector.js
diff --git a/app/assets/javascripts/select-kit/components/color-palettes.js b/app/assets/javascripts/select-kit/app/components/color-palettes.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/color-palettes.js
rename to app/assets/javascripts/select-kit/app/components/color-palettes.js
diff --git a/app/assets/javascripts/select-kit/components/color-palettes/color-palettes-row.js b/app/assets/javascripts/select-kit/app/components/color-palettes/color-palettes-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/color-palettes/color-palettes-row.js
rename to app/assets/javascripts/select-kit/app/components/color-palettes/color-palettes-row.js
diff --git a/app/assets/javascripts/select-kit/components/combo-box.js b/app/assets/javascripts/select-kit/app/components/combo-box.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/combo-box.js
rename to app/assets/javascripts/select-kit/app/components/combo-box.js
diff --git a/app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js b/app/assets/javascripts/select-kit/app/components/combo-box/combo-box-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js
rename to app/assets/javascripts/select-kit/app/components/combo-box/combo-box-header.js
diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js b/app/assets/javascripts/select-kit/app/components/composer-actions.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/composer-actions.js
rename to app/assets/javascripts/select-kit/app/components/composer-actions.js
diff --git a/app/assets/javascripts/select-kit/components/create-color-row.js b/app/assets/javascripts/select-kit/app/components/create-color-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/create-color-row.js
rename to app/assets/javascripts/select-kit/app/components/create-color-row.js
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box.js b/app/assets/javascripts/select-kit/app/components/dropdown-select-box.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/dropdown-select-box.js
rename to app/assets/javascripts/select-kit/app/components/dropdown-select-box.js
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js b/app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js
rename to app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-header.js
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js b/app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js
rename to app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-row.js
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector.js b/app/assets/javascripts/select-kit/app/components/future-date-input-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/future-date-input-selector.js
rename to app/assets/javascripts/select-kit/app/components/future-date-input-selector.js
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-header.js b/app/assets/javascripts/select-kit/app/components/future-date-input-selector/future-date-input-selector-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-header.js
rename to app/assets/javascripts/select-kit/app/components/future-date-input-selector/future-date-input-selector-header.js
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-row.js b/app/assets/javascripts/select-kit/app/components/future-date-input-selector/future-date-input-selector-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-row.js
rename to app/assets/javascripts/select-kit/app/components/future-date-input-selector/future-date-input-selector-row.js
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js b/app/assets/javascripts/select-kit/app/components/future-date-input-selector/mixin.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js
rename to app/assets/javascripts/select-kit/app/components/future-date-input-selector/mixin.js
diff --git a/app/assets/javascripts/select-kit/components/group-dropdown.js b/app/assets/javascripts/select-kit/app/components/group-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/group-dropdown.js
rename to app/assets/javascripts/select-kit/app/components/group-dropdown.js
diff --git a/app/assets/javascripts/select-kit/components/group-members-dropdown.js b/app/assets/javascripts/select-kit/app/components/group-members-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/group-members-dropdown.js
rename to app/assets/javascripts/select-kit/app/components/group-members-dropdown.js
diff --git a/app/assets/javascripts/select-kit/components/group-notifications-button.js b/app/assets/javascripts/select-kit/app/components/group-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/group-notifications-button.js
rename to app/assets/javascripts/select-kit/app/components/group-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/components/icon-picker.js b/app/assets/javascripts/select-kit/app/components/icon-picker.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/icon-picker.js
rename to app/assets/javascripts/select-kit/app/components/icon-picker.js
diff --git a/app/assets/javascripts/select-kit/components/list-setting.js b/app/assets/javascripts/select-kit/app/components/list-setting.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/list-setting.js
rename to app/assets/javascripts/select-kit/app/components/list-setting.js
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js b/app/assets/javascripts/select-kit/app/components/mini-tag-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/mini-tag-chooser.js
rename to app/assets/javascripts/select-kit/app/components/mini-tag-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js b/app/assets/javascripts/select-kit/app/components/mini-tag-chooser/mini-tag-chooser-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js
rename to app/assets/javascripts/select-kit/app/components/mini-tag-chooser/mini-tag-chooser-header.js
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser/selected-collection.js b/app/assets/javascripts/select-kit/app/components/mini-tag-chooser/selected-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/mini-tag-chooser/selected-collection.js
rename to app/assets/javascripts/select-kit/app/components/mini-tag-chooser/selected-collection.js
diff --git a/app/assets/javascripts/select-kit/components/multi-select.js b/app/assets/javascripts/select-kit/app/components/multi-select.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/multi-select.js
rename to app/assets/javascripts/select-kit/app/components/multi-select.js
diff --git a/app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js b/app/assets/javascripts/select-kit/app/components/multi-select/multi-select-filter.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js
rename to app/assets/javascripts/select-kit/app/components/multi-select/multi-select-filter.js
diff --git a/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js b/app/assets/javascripts/select-kit/app/components/multi-select/multi-select-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js
rename to app/assets/javascripts/select-kit/app/components/multi-select/multi-select-header.js
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-category.js b/app/assets/javascripts/select-kit/app/components/multi-select/selected-category.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/multi-select/selected-category.js
rename to app/assets/javascripts/select-kit/app/components/multi-select/selected-category.js
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-color.js b/app/assets/javascripts/select-kit/app/components/multi-select/selected-color.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/multi-select/selected-color.js
rename to app/assets/javascripts/select-kit/app/components/multi-select/selected-color.js
diff --git a/app/assets/javascripts/select-kit/components/none-category-row.js b/app/assets/javascripts/select-kit/app/components/none-category-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/none-category-row.js
rename to app/assets/javascripts/select-kit/app/components/none-category-row.js
diff --git a/app/assets/javascripts/select-kit/components/notifications-button.js b/app/assets/javascripts/select-kit/app/components/notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/notifications-button.js
rename to app/assets/javascripts/select-kit/app/components/notifications-button.js
diff --git a/app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js b/app/assets/javascripts/select-kit/app/components/notifications-button/notifications-button-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js
rename to app/assets/javascripts/select-kit/app/components/notifications-button/notifications-button-row.js
diff --git a/app/assets/javascripts/select-kit/components/notifications-filter.js b/app/assets/javascripts/select-kit/app/components/notifications-filter.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/notifications-filter.js
rename to app/assets/javascripts/select-kit/app/components/notifications-filter.js
diff --git a/app/assets/javascripts/select-kit/components/notifications-filter/notifications-filter-header.js b/app/assets/javascripts/select-kit/app/components/notifications-filter/notifications-filter-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/notifications-filter/notifications-filter-header.js
rename to app/assets/javascripts/select-kit/app/components/notifications-filter/notifications-filter-header.js
diff --git a/app/assets/javascripts/select-kit/components/period-chooser.js b/app/assets/javascripts/select-kit/app/components/period-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/period-chooser.js
rename to app/assets/javascripts/select-kit/app/components/period-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js b/app/assets/javascripts/select-kit/app/components/period-chooser/period-chooser-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js
rename to app/assets/javascripts/select-kit/app/components/period-chooser/period-chooser-header.js
diff --git a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js b/app/assets/javascripts/select-kit/app/components/period-chooser/period-chooser-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js
rename to app/assets/javascripts/select-kit/app/components/period-chooser/period-chooser-row.js
diff --git a/app/assets/javascripts/select-kit/components/pinned-button.js b/app/assets/javascripts/select-kit/app/components/pinned-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/pinned-button.js
rename to app/assets/javascripts/select-kit/app/components/pinned-button.js
diff --git a/app/assets/javascripts/select-kit/components/pinned-options.js b/app/assets/javascripts/select-kit/app/components/pinned-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/pinned-options.js
rename to app/assets/javascripts/select-kit/app/components/pinned-options.js
diff --git a/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js b/app/assets/javascripts/select-kit/app/components/search-advanced-category-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js
rename to app/assets/javascripts/select-kit/app/components/search-advanced-category-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/app/components/select-kit.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit.js
rename to app/assets/javascripts/select-kit/app/components/select-kit.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/errors-collection.js b/app/assets/javascripts/select-kit/app/components/select-kit/errors-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/errors-collection.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/errors-collection.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-body.js b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-body.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-body.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/select-kit-body.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/select-kit-collection.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-create-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/select-kit-create-row.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-filter.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/select-kit-filter.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/select-kit-header.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-none-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/select-kit-none-row.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/select-kit-row.js
diff --git a/app/assets/javascripts/select-kit/components/select-kit/single-select-header.js b/app/assets/javascripts/select-kit/app/components/select-kit/single-select-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/select-kit/single-select-header.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/single-select-header.js
diff --git a/app/assets/javascripts/select-kit/components/selected-color.js b/app/assets/javascripts/select-kit/app/components/selected-color.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/selected-color.js
rename to app/assets/javascripts/select-kit/app/components/selected-color.js
diff --git a/app/assets/javascripts/select-kit/components/selected-name.js b/app/assets/javascripts/select-kit/app/components/selected-name.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/selected-name.js
rename to app/assets/javascripts/select-kit/app/components/selected-name.js
diff --git a/app/assets/javascripts/select-kit/components/single-select.js b/app/assets/javascripts/select-kit/app/components/single-select.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/single-select.js
rename to app/assets/javascripts/select-kit/app/components/single-select.js
diff --git a/app/assets/javascripts/select-kit/components/tag-chooser-row.js b/app/assets/javascripts/select-kit/app/components/tag-chooser-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-chooser-row.js
rename to app/assets/javascripts/select-kit/app/components/tag-chooser-row.js
diff --git a/app/assets/javascripts/select-kit/components/tag-chooser.js b/app/assets/javascripts/select-kit/app/components/tag-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-chooser.js
rename to app/assets/javascripts/select-kit/app/components/tag-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/tag-drop.js b/app/assets/javascripts/select-kit/app/components/tag-drop.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-drop.js
rename to app/assets/javascripts/select-kit/app/components/tag-drop.js
diff --git a/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js b/app/assets/javascripts/select-kit/app/components/tag-drop/tag-drop-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js
rename to app/assets/javascripts/select-kit/app/components/tag-drop/tag-drop-header.js
diff --git a/app/assets/javascripts/select-kit/components/tag-group-chooser.js b/app/assets/javascripts/select-kit/app/components/tag-group-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-group-chooser.js
rename to app/assets/javascripts/select-kit/app/components/tag-group-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/tag-notifications-button.js b/app/assets/javascripts/select-kit/app/components/tag-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-notifications-button.js
rename to app/assets/javascripts/select-kit/app/components/tag-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/components/tag-row.js b/app/assets/javascripts/select-kit/app/components/tag-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/tag-row.js
rename to app/assets/javascripts/select-kit/app/components/tag-row.js
diff --git a/app/assets/javascripts/select-kit/components/timezone-input.js b/app/assets/javascripts/select-kit/app/components/timezone-input.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/timezone-input.js
rename to app/assets/javascripts/select-kit/app/components/timezone-input.js
diff --git a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js b/app/assets/javascripts/select-kit/app/components/toolbar-popup-menu-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js
rename to app/assets/javascripts/select-kit/app/components/toolbar-popup-menu-options.js
diff --git a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js b/app/assets/javascripts/select-kit/app/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
rename to app/assets/javascripts/select-kit/app/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
diff --git a/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js b/app/assets/javascripts/select-kit/app/components/topic-footer-mobile-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js
rename to app/assets/javascripts/select-kit/app/components/topic-footer-mobile-dropdown.js
diff --git a/app/assets/javascripts/select-kit/components/topic-notifications-button.js b/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/topic-notifications-button.js
rename to app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/components/topic-notifications-options.js b/app/assets/javascripts/select-kit/app/components/topic-notifications-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/topic-notifications-options.js
rename to app/assets/javascripts/select-kit/app/components/topic-notifications-options.js
diff --git a/app/assets/javascripts/select-kit/components/user-chooser.js b/app/assets/javascripts/select-kit/app/components/user-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/user-chooser.js
rename to app/assets/javascripts/select-kit/app/components/user-chooser.js
diff --git a/app/assets/javascripts/select-kit/components/user-chooser/user-row.js b/app/assets/javascripts/select-kit/app/components/user-chooser/user-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/user-chooser/user-row.js
rename to app/assets/javascripts/select-kit/app/components/user-chooser/user-row.js
diff --git a/app/assets/javascripts/select-kit/components/user-notifications-dropdown.js b/app/assets/javascripts/select-kit/app/components/user-notifications-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/components/user-notifications-dropdown.js
rename to app/assets/javascripts/select-kit/app/components/user-notifications-dropdown.js
diff --git a/app/assets/javascripts/select-kit/mixins/plugin-api.js b/app/assets/javascripts/select-kit/app/mixins/plugin-api.js
similarity index 100%
rename from app/assets/javascripts/select-kit/mixins/plugin-api.js
rename to app/assets/javascripts/select-kit/app/mixins/plugin-api.js
diff --git a/app/assets/javascripts/select-kit/mixins/tags.js b/app/assets/javascripts/select-kit/app/mixins/tags.js
similarity index 100%
rename from app/assets/javascripts/select-kit/mixins/tags.js
rename to app/assets/javascripts/select-kit/app/mixins/tags.js
diff --git a/app/assets/javascripts/select-kit/mixins/utils.js b/app/assets/javascripts/select-kit/app/mixins/utils.js
similarity index 100%
rename from app/assets/javascripts/select-kit/mixins/utils.js
rename to app/assets/javascripts/select-kit/app/mixins/utils.js
diff --git a/app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/category-drop/category-drop-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/category-drop/category-drop-header.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/category-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/category-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/category-row.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/color-palettes/color-palettes-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/color-palettes/color-palettes-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/color-palettes/color-palettes-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/color-palettes/color-palettes-row.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/combo-box/combo-box-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/combo-box/combo-box-header.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/create-color-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/create-color-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/create-color-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/create-color-row.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/mini-tag-chooser/selected-collection.hbs b/app/assets/javascripts/select-kit/app/templates/components/mini-tag-chooser/selected-collection.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/mini-tag-chooser/selected-collection.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/mini-tag-chooser/selected-collection.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select.hbs b/app/assets/javascripts/select-kit/app/templates/components/multi-select.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/multi-select.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/multi-select.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select/multi-select-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/multi-select/multi-select-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/multi-select/multi-select-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/multi-select/multi-select-header.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs b/app/assets/javascripts/select-kit/app/templates/components/multi-select/selected-category.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/multi-select/selected-category.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/notifications-filter/notifications-filter-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/notifications-filter/notifications-filter-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/notifications-filter/notifications-filter-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/notifications-filter/notifications-filter-header.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/period-chooser/period-chooser-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/period-chooser/period-chooser-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/period-chooser/period-chooser-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/period-chooser/period-chooser-header.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/period-chooser/period-chooser-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/period-chooser/period-chooser-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/period-chooser/period-chooser-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/period-chooser/period-chooser-row.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs b/app/assets/javascripts/select-kit/app/templates/components/pinned-button.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/pinned-button.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/errors-collection.hbs b/app/assets/javascripts/select-kit/app/templates/components/select-kit/errors-collection.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/select-kit/errors-collection.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/select-kit/errors-collection.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-body.hbs b/app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-body.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-body.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-body.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs b/app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-collection.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-collection.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs b/app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-filter.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-filter.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-row.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/single-select-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/select-kit/single-select-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/select-kit/single-select-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/select-kit/single-select-header.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/selected-name.hbs b/app/assets/javascripts/select-kit/app/templates/components/selected-name.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/selected-name.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/selected-name.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/single-select.hbs b/app/assets/javascripts/select-kit/app/templates/components/single-select.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/single-select.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/single-select.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/tag-chooser-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/tag-chooser-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/tag-chooser-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/tag-chooser-row.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/tag-drop/tag-drop-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/tag-drop/tag-drop-header.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/tag-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/tag-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/tag-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/tag-row.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs b/app/assets/javascripts/select-kit/app/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
diff --git a/app/assets/javascripts/select-kit/templates/components/user-chooser/user-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/user-chooser/user-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/templates/components/user-chooser/user-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/user-chooser/user-row.hbs
diff --git a/app/assets/javascripts/select-kit/config/ember-try.js b/app/assets/javascripts/select-kit/config/ember-try.js
new file mode 100644
index 0000000000..bcae42888f
--- /dev/null
+++ b/app/assets/javascripts/select-kit/config/ember-try.js
@@ -0,0 +1,89 @@
+"use strict";
+
+const getChannelURL = require("ember-source-channel-url");
+
+module.exports = async function() {
+  return {
+    useYarn: true,
+    scenarios: [
+      {
+        name: "ember-lts-3.8",
+        npm: {
+          devDependencies: {
+            "ember-source": "~3.8.0"
+          }
+        }
+      },
+      {
+        name: "ember-lts-3.12",
+        npm: {
+          devDependencies: {
+            "ember-source": "~3.12.0"
+          }
+        }
+      },
+      {
+        name: "ember-release",
+        npm: {
+          devDependencies: {
+            "ember-source": await getChannelURL("release")
+          }
+        }
+      },
+      {
+        name: "ember-beta",
+        npm: {
+          devDependencies: {
+            "ember-source": await getChannelURL("beta")
+          }
+        }
+      },
+      {
+        name: "ember-canary",
+        npm: {
+          devDependencies: {
+            "ember-source": await getChannelURL("canary")
+          }
+        }
+      },
+      // The default `.travis.yml` runs this scenario via `yarn test`,
+      // not via `ember try`. It's still included here so that running
+      // `ember try:each` manually or from a customized CI config will run it
+      // along with all the other scenarios.
+      {
+        name: "ember-default",
+        npm: {
+          devDependencies: {}
+        }
+      },
+      {
+        name: "ember-default-with-jquery",
+        env: {
+          EMBER_OPTIONAL_FEATURES: JSON.stringify({
+            "jquery-integration": true
+          })
+        },
+        npm: {
+          devDependencies: {
+            "@ember/jquery": "^0.5.1"
+          }
+        }
+      },
+      {
+        name: "ember-classic",
+        env: {
+          EMBER_OPTIONAL_FEATURES: JSON.stringify({
+            "application-template-wrapper": true,
+            "default-async-observers": false,
+            "template-only-glimmer-components": false
+          })
+        },
+        npm: {
+          ember: {
+            edition: "classic"
+          }
+        }
+      }
+    ]
+  };
+};
diff --git a/app/assets/javascripts/select-kit/config/environment.js b/app/assets/javascripts/select-kit/config/environment.js
new file mode 100644
index 0000000000..352093f4ed
--- /dev/null
+++ b/app/assets/javascripts/select-kit/config/environment.js
@@ -0,0 +1,5 @@
+"use strict";
+
+module.exports = function(/* environment, appConfig */) {
+  return {};
+};
diff --git a/app/assets/javascripts/select-kit/ember-cli-build.js b/app/assets/javascripts/select-kit/ember-cli-build.js
new file mode 100644
index 0000000000..cbf921270c
--- /dev/null
+++ b/app/assets/javascripts/select-kit/ember-cli-build.js
@@ -0,0 +1,9 @@
+"use strict";
+
+const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");
+
+module.exports = function(defaults) {
+  let app = new EmberAddon(defaults, {});
+
+  return app.toTree();
+};
diff --git a/app/assets/javascripts/select-kit/index.js b/app/assets/javascripts/select-kit/index.js
new file mode 100644
index 0000000000..dc0b0d2a36
--- /dev/null
+++ b/app/assets/javascripts/select-kit/index.js
@@ -0,0 +1,6 @@
+"use strict";
+
+module.exports = {
+  name: require("./package").name,
+  options: {}
+};
diff --git a/app/assets/javascripts/select-kit/package.json b/app/assets/javascripts/select-kit/package.json
new file mode 100644
index 0000000000..ceb3cff51f
--- /dev/null
+++ b/app/assets/javascripts/select-kit/package.json
@@ -0,0 +1,54 @@
+{
+  "name": "select-kit",
+  "version": "1.0.0",
+  "description": "Discourse's select widget",
+  "author": "Discourse",
+  "license": "GPLv2",
+  "keywords": [
+    "ember-addon"
+  ],
+  "repository": "",
+  "license": "",
+  "author": "",
+  "scripts": {
+    "build": "ember build",
+    "lint:hbs": "ember-template-lint .",
+    "lint:js": "eslint .",
+    "start": "ember serve"
+  },
+  "dependencies": {
+    "ember-cli-babel": "^7.13.0",
+    "ember-cli-htmlbars": "^4.2.0",
+    "ember-auto-import": "^1.5.3"
+  },
+  "devDependencies": {
+    "@ember/optional-features": "^1.1.0",
+    "@glimmer/component": "^1.0.0",
+    "babel-eslint": "^10.0.3",
+    "broccoli-asset-rev": "^3.0.0",
+    "ember-cli": "~3.15.2",
+    "ember-cli-dependency-checker": "^3.2.0",
+    "ember-cli-eslint": "^5.1.0",
+    "ember-cli-inject-live-reload": "^2.0.1",
+    "ember-cli-sri": "^2.1.1",
+    "ember-cli-template-lint": "^1.0.0-beta.3",
+    "ember-cli-uglify": "^3.0.0",
+    "ember-disable-prototype-extensions": "^1.1.3",
+    "ember-export-application-global": "^2.0.1",
+    "ember-load-initializers": "^2.1.1",
+    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-resolver": "^7.0.0",
+    "ember-source": "~3.15.0",
+    "ember-source-channel-url": "^2.0.1",
+    "ember-try": "^1.4.0",
+    "eslint-plugin-ember": "^7.7.1",
+    "eslint-plugin-node": "^10.0.0",
+    "loader.js": "^4.7.0"
+  },
+  "engines": {
+    "node": "8.* || >= 10.*"
+  },
+  "ember": {
+    "edition": "octane"
+  }
+}
diff --git a/app/assets/javascripts/select-kit/yarn.lock b/app/assets/javascripts/select-kit/yarn.lock
new file mode 100644
index 0000000000..fc099710ca
--- /dev/null
+++ b/app/assets/javascripts/select-kit/yarn.lock
@@ -0,0 +1,10485 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
+  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
+  dependencies:
+    "@babel/highlight" "^7.8.3"
+
+"@babel/compat-data@^7.8.6", "@babel/compat-data@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz#04815556fc90b0c174abd2c0c1bb966faa036a6c"
+  integrity sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==
+  dependencies:
+    browserslist "^4.9.1"
+    invariant "^2.2.4"
+    semver "^5.5.0"
+
+"@babel/core@^7.1.6", "@babel/core@^7.2.2", "@babel/core@^7.3.4", "@babel/core@^7.7.2", "@babel/core@^7.8.3", "@babel/core@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
+  integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.9.0"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helpers" "^7.9.0"
+    "@babel/parser" "^7.9.0"
+    "@babel/template" "^7.8.6"
+    "@babel/traverse" "^7.9.0"
+    "@babel/types" "^7.9.0"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.2"
+    lodash "^4.17.13"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.9.0", "@babel/generator@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.5.tgz#27f0917741acc41e6eaaced6d68f96c3fa9afaf9"
+  integrity sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==
+  dependencies:
+    "@babel/types" "^7.9.5"
+    jsesc "^2.5.1"
+    lodash "^4.17.13"
+    source-map "^0.5.0"
+
+"@babel/helper-annotate-as-pure@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
+  integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
+  integrity sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-compilation-targets@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"
+  integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==
+  dependencies:
+    "@babel/compat-data" "^7.8.6"
+    browserslist "^4.9.1"
+    invariant "^2.2.4"
+    levenary "^1.1.1"
+    semver "^5.5.0"
+
+"@babel/helper-create-class-features-plugin@^7.5.5", "@babel/helper-create-class-features-plugin@^7.8.3":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.5.tgz#79753d44017806b481017f24b02fd4113c7106ea"
+  integrity sha512-IipaxGaQmW4TfWoXdqjY0TzoXQ1HRS0kPpEgvjosb3u7Uedcq297xFqDQiCcQtRRwzIMif+N1MLVI8C5a4/PAA==
+  dependencies:
+    "@babel/helper-function-name" "^7.9.5"
+    "@babel/helper-member-expression-to-functions" "^7.8.3"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+
+"@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
+  integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-regex" "^7.8.3"
+    regexpu-core "^4.7.0"
+
+"@babel/helper-define-map@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
+  integrity sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==
+  dependencies:
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/types" "^7.8.3"
+    lodash "^4.17.13"
+
+"@babel/helper-explode-assignable-expression@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
+  integrity sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==
+  dependencies:
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-function-name@^7.8.3", "@babel/helper-function-name@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
+  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/types" "^7.9.5"
+
+"@babel/helper-get-function-arity@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
+  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-hoist-variables@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
+  integrity sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-member-expression-to-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
+  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
+  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-module-transforms@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
+  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
+    "@babel/helper-simple-access" "^7.8.3"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/template" "^7.8.6"
+    "@babel/types" "^7.9.0"
+    lodash "^4.17.13"
+
+"@babel/helper-optimise-call-expression@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
+  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
+  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
+
+"@babel/helper-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
+  integrity sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==
+  dependencies:
+    lodash "^4.17.13"
+
+"@babel/helper-remap-async-to-generator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
+  integrity sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-wrap-function" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8"
+  integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.8.3"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/traverse" "^7.8.6"
+    "@babel/types" "^7.8.6"
+
+"@babel/helper-simple-access@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
+  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
+  dependencies:
+    "@babel/template" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-split-export-declaration@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
+  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
+  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
+
+"@babel/helper-wrap-function@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
+  integrity sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
+"@babel/helpers@^7.9.0":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"
+  integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==
+  dependencies:
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.9.0"
+    "@babel/types" "^7.9.0"
+
+"@babel/highlight@^7.8.3":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
+  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.9.0"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.3.4", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
+  integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
+
+"@babel/plugin-proposal-async-generator-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
+  integrity sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
+
+"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e"
+  integrity sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-proposal-decorators@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz#2156860ab65c5abf068c3f67042184041066543e"
+  integrity sha512-e3RvdvS4qPJVTe288DlXjwKflpfy1hr0j5dz5WpIYYeP7vQZg2WfAEIp8k5/Lwis/m5REXEteIz6rrcDtXXG7w==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-decorators" "^7.8.3"
+
+"@babel/plugin-proposal-dynamic-import@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054"
+  integrity sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+
+"@babel/plugin-proposal-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
+  integrity sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
+  integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+
+"@babel/plugin-proposal-numeric-separator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
+  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+
+"@babel/plugin-proposal-object-rest-spread@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz#3fd65911306d8746014ec0d0cf78f0e39a149116"
+  integrity sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-transform-parameters" "^7.9.5"
+
+"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
+  integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+
+"@babel/plugin-proposal-optional-chaining@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
+  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
+  integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.8.8"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-async-generators@^7.8.0":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-decorators@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz#8d2c15a9f1af624b0025f961682a9d53d3001bda"
+  integrity sha512-8Hg4dNNT9/LcA1zQlfwuKR8BUc/if7Q7NkTam9sGTcJphLwpf2g4S42uhspQrIrR+dpzE0dtTqBVFoHl8GtnnQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-dynamic-import@^7.2.0", "@babel/plugin-syntax-dynamic-import@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
+  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-json-strings@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
+  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-object-rest-spread@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-catch-binding@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-chaining@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-top-level-await@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
+  integrity sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-typescript@^7.2.0", "@babel/plugin-syntax-typescript@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz#c1f659dda97711a569cef75275f7e15dcaa6cabc"
+  integrity sha512-GO1MQ/SGGGoiEXY0e0bSpHimJvxqB7lktLLIq2pv8xG7WZ8IMEle74jIe1FhprHBWjwjZtXHkycDLZXIWM5Wfg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-arrow-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
+  integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-async-to-generator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
+  integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-remap-async-to-generator" "^7.8.3"
+
+"@babel/plugin-transform-block-scoped-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
+  integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-block-scoping@^7.6.2", "@babel/plugin-transform-block-scoping@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
+  integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    lodash "^4.17.13"
+
+"@babel/plugin-transform-classes@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
+  integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-define-map" "^7.8.3"
+    "@babel/helper-function-name" "^7.9.5"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    globals "^11.1.0"
+
+"@babel/plugin-transform-computed-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
+  integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-destructuring@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
+  integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
+  integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-duplicate-keys@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
+  integrity sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-exponentiation-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
+  integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-for-of@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
+  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-function-name@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
+  integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
+  integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-member-expression-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
+  integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-modules-amd@^7.5.0", "@babel/plugin-transform-modules-amd@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz#19755ee721912cf5bb04c07d50280af3484efef4"
+  integrity sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    babel-plugin-dynamic-import-node "^2.3.0"
+
+"@babel/plugin-transform-modules-commonjs@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz#e3e72f4cbc9b4a260e30be0ea59bdf5a39748940"
+  integrity sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-simple-access" "^7.8.3"
+    babel-plugin-dynamic-import-node "^2.3.0"
+
+"@babel/plugin-transform-modules-systemjs@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz#e9fd46a296fc91e009b64e07ddaa86d6f0edeb90"
+  integrity sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    babel-plugin-dynamic-import-node "^2.3.0"
+
+"@babel/plugin-transform-modules-umd@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
+  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
+  integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+
+"@babel/plugin-transform-new-target@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
+  integrity sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-object-assign@^7.2.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.8.3.tgz#dc3b8dd50ef03837868a37b7df791f64f288538e"
+  integrity sha512-i3LuN8tPDqUCRFu3dkzF2r1Nx0jp4scxtm7JxtIqI9he9Vk20YD+/zshdzR9JLsoBMlJlNR82a62vQExNEVx/Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-object-super@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
+  integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.3"
+
+"@babel/plugin-transform-parameters@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
+  integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-property-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
+  integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-regenerator@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
+  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
+  dependencies:
+    regenerator-transform "^0.14.2"
+
+"@babel/plugin-transform-reserved-words@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
+  integrity sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-runtime@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz#45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"
+  integrity sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    resolve "^1.8.1"
+    semver "^5.5.1"
+
+"@babel/plugin-transform-shorthand-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
+  integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
+  integrity sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-sticky-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
+  integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-regex" "^7.8.3"
+
+"@babel/plugin-transform-template-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
+  integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-typeof-symbol@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
+  integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-typescript@^7.9.0":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz#4bb4dde4f10bbf2d787fce9707fb09b483e33359"
+  integrity sha512-yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-typescript" "^7.8.3"
+
+"@babel/plugin-transform-typescript@~7.4.0":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.4.5.tgz#ab3351ba35307b79981993536c93ff8be050ba28"
+  integrity sha512-RPB/YeGr4ZrFKNwfuQRlMf2lxoCUaU01MTw39/OFE/RiL8HDjtn68BwEPft1P7JN4akyEmjGWAMNldOV7o9V2g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-typescript" "^7.2.0"
+
+"@babel/plugin-transform-typescript@~7.5.0":
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz#6d862766f09b2da1cb1f7d505fe2aedab6b7d4b8"
+  integrity sha512-pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.5.5"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-typescript" "^7.2.0"
+
+"@babel/plugin-transform-unicode-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
+  integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/polyfill@^7.8.3", "@babel/polyfill@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.8.7.tgz#151ec24c7135481336168c3bd8b8bf0cf91c032f"
+  integrity sha512-LeSfP9bNZH2UOZgcGcZ0PIHUt1ZuHub1L3CVmEyqLxCeDLm4C5Gi8jRH8ZX2PNpDhQCo0z6y/+DIs2JlliXW8w==
+  dependencies:
+    core-js "^2.6.5"
+    regenerator-runtime "^0.13.4"
+
+"@babel/preset-env@^7.0.0", "@babel/preset-env@^7.9.0":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.5.tgz#8ddc76039bc45b774b19e2fc548f6807d8a8919f"
+  integrity sha512-eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ==
+  dependencies:
+    "@babel/compat-data" "^7.9.0"
+    "@babel/helper-compilation-targets" "^7.8.7"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
+    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
+    "@babel/plugin-proposal-json-strings" "^7.8.3"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
+    "@babel/plugin-proposal-object-rest-spread" "^7.9.5"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/plugin-syntax-top-level-await" "^7.8.3"
+    "@babel/plugin-transform-arrow-functions" "^7.8.3"
+    "@babel/plugin-transform-async-to-generator" "^7.8.3"
+    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
+    "@babel/plugin-transform-block-scoping" "^7.8.3"
+    "@babel/plugin-transform-classes" "^7.9.5"
+    "@babel/plugin-transform-computed-properties" "^7.8.3"
+    "@babel/plugin-transform-destructuring" "^7.9.5"
+    "@babel/plugin-transform-dotall-regex" "^7.8.3"
+    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
+    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
+    "@babel/plugin-transform-for-of" "^7.9.0"
+    "@babel/plugin-transform-function-name" "^7.8.3"
+    "@babel/plugin-transform-literals" "^7.8.3"
+    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
+    "@babel/plugin-transform-modules-amd" "^7.9.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.9.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.9.0"
+    "@babel/plugin-transform-modules-umd" "^7.9.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
+    "@babel/plugin-transform-new-target" "^7.8.3"
+    "@babel/plugin-transform-object-super" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.9.5"
+    "@babel/plugin-transform-property-literals" "^7.8.3"
+    "@babel/plugin-transform-regenerator" "^7.8.7"
+    "@babel/plugin-transform-reserved-words" "^7.8.3"
+    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
+    "@babel/plugin-transform-spread" "^7.8.3"
+    "@babel/plugin-transform-sticky-regex" "^7.8.3"
+    "@babel/plugin-transform-template-literals" "^7.8.3"
+    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
+    "@babel/plugin-transform-unicode-regex" "^7.8.3"
+    "@babel/preset-modules" "^0.1.3"
+    "@babel/types" "^7.9.5"
+    browserslist "^4.9.1"
+    core-js-compat "^3.6.2"
+    invariant "^2.2.2"
+    levenary "^1.1.1"
+    semver "^5.5.0"
+
+"@babel/preset-modules@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
+  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    esutils "^2.0.2"
+
+"@babel/runtime@^7.8.4", "@babel/runtime@^7.9.0":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
+  integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/template@^7.8.3", "@babel/template@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
+  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/parser" "^7.8.6"
+    "@babel/types" "^7.8.6"
+
+"@babel/traverse@^7.1.6", "@babel/traverse@^7.2.4", "@babel/traverse@^7.3.4", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.5.tgz#6e7c56b44e2ac7011a948c21e283ddd9d9db97a2"
+  integrity sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.9.5"
+    "@babel/helper-function-name" "^7.9.5"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/parser" "^7.9.0"
+    "@babel/types" "^7.9.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.13"
+
+"@babel/types@^7.1.6", "@babel/types@^7.3.2", "@babel/types@^7.3.4", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444"
+  integrity sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.9.5"
+    lodash "^4.17.13"
+    to-fast-properties "^2.0.0"
+
+"@cnakazawa/watch@^1.0.3":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
+  integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
+  dependencies:
+    exec-sh "^0.3.2"
+    minimist "^1.2.0"
+
+"@ember-data/rfc395-data@^0.0.4":
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz#ecb86efdf5d7733a76ff14ea651a1b0ed1f8a843"
+  integrity sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==
+
+"@ember/edition-utils@^1.1.1", "@ember/edition-utils@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
+  integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
+
+"@ember/optional-features@^1.1.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@ember/optional-features/-/optional-features-1.3.0.tgz#d7da860417b85a56cec88419f30da5ee1dde2756"
+  integrity sha512-Lrfojy4xKwTX+J4EAylmxZY2TO6bQtP4Lg5C8/z2priVqiT0X5fVB1+4WQCJbRBetctO1lMDnqjmhWCVKB8bmQ==
+  dependencies:
+    chalk "^3.0.0"
+    ember-cli-version-checker "^3.1.3"
+    glob "^7.1.6"
+    inquirer "^7.0.1"
+    mkdirp "^0.5.1"
+    silent-error "^1.1.1"
+    util.promisify "^1.0.0"
+
+"@ember/test-helpers@^1.7.1":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-1.7.1.tgz#cc22a954b3b46856518f034bd492a74e0482389f"
+  integrity sha512-+ioumnanSRJzZ0ZH30FIkB0r41UhVyuWQ9R9Yp1phDWJQDLumxg+25WDr40relwcH6z0Cn6LIEzeTVujO/0Rww==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-funnel "^2.0.2"
+    ember-assign-polyfill "^2.6.0"
+    ember-cli-babel "^7.7.3"
+    ember-cli-htmlbars-inline-precompile "^2.1.0"
+    ember-test-waiters "^1.1.1"
+
+"@embroider/core@0.4.3", "@embroider/core@^0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.4.3.tgz#117973b9761d68aee14d820bbaefeb05d5984ba8"
+  integrity sha512-n24WU/dGuGDqZrljWoX8raK2wFX3R8iJG0rfCWx+1kW87IvB+ZgS3j4KiZ/S788BA07udrYsrgecYnciG2bBMg==
+  dependencies:
+    "@babel/core" "^7.2.2"
+    "@babel/parser" "^7.3.4"
+    "@babel/plugin-syntax-dynamic-import" "^7.2.0"
+    "@babel/traverse" "^7.3.4"
+    "@babel/types" "^7.3.4"
+    "@embroider/macros" "0.4.3"
+    assert-never "^1.1.0"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    broccoli-persistent-filter "^2.2.2"
+    broccoli-plugin "^1.3.0"
+    broccoli-source "^1.1.0"
+    debug "^3.1.0"
+    fast-sourcemap-concat "^1.4.0"
+    filesize "^4.1.2"
+    fs-extra "^7.0.1"
+    fs-tree-diff "^2.0.0"
+    handlebars "^4.0.11"
+    js-string-escape "^1.0.1"
+    jsdom "^12.0.0"
+    json-stable-stringify "^1.0.1"
+    lodash "^4.17.10"
+    pkg-up "^2.0.0"
+    resolve "^1.8.1"
+    resolve-package-path "^1.2.2"
+    semver "^5.5.0"
+    strip-bom "^3.0.0"
+    typescript-memoize "^1.0.0-alpha.3"
+    walk-sync "^1.1.3"
+
+"@embroider/macros@0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.4.3.tgz#ea5604b8bd578520f15886a428a6c4fa9481abc0"
+  integrity sha512-vq/Ny2ULpKxq60Sv5usSrz651dXFM5phP/O5G5MWDY8YOodIkRLGqtub34sB0OmwxpCuTntUzl9P/I4wkyQ3Kw==
+  dependencies:
+    "@babel/core" "^7.2.2"
+    "@babel/traverse" "^7.2.4"
+    "@babel/types" "^7.3.2"
+    "@embroider/core" "0.4.3"
+    resolve "^1.8.1"
+    semver "^5.6.0"
+
+"@glimmer/component@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.0.0.tgz#f9052c8e99fb7b3d48d27c65891c5f0e59084a82"
+  integrity sha512-1ERZYNLZRuC8RYbcfkJeAWn3Ly7W2VdoHLQIHCmhQH/m7ubkNOdLQcTnUzje7OnRUs9EJ6DjfoN57XRX9Ux4rA==
+  dependencies:
+    "@glimmer/di" "^0.1.9"
+    "@glimmer/env" "^0.1.7"
+    "@glimmer/util" "^0.44.0"
+    broccoli-file-creator "^2.1.1"
+    broccoli-merge-trees "^3.0.2"
+    ember-cli-babel "^7.7.3"
+    ember-cli-get-component-path-option "^1.0.0"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-path-utils "^1.0.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-typescript "3.0.0"
+    ember-compatibility-helpers "^1.1.2"
+
+"@glimmer/di@^0.1.9":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.1.11.tgz#a6878c07a13a2c2c76fcde598a5c97637bfc4280"
+  integrity sha1-poeMB6E6LCx2/N5ZilyXY3v8QoA=
+
+"@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
+  integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
+
+"@glimmer/interfaces@^0.47.9":
+  version "0.47.9"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.47.9.tgz#4c50b5343815045318bba38915f780ae39f14590"
+  integrity sha512-xne80DHkPC70u08LKV9g0+PboAmIw0A+vDXjJXMrDoRcNzCR4dXR6nvKD/Een+wbwwBaRawCIn45Rnk5+Dyvrg==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/syntax@^0.47.9":
+  version "0.47.9"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.47.9.tgz#f3d141efc97f601928335771721d1f27eb1ed7d2"
+  integrity sha512-ld3x2bTkAr/BXOkI1b3cDVBwMl0BTYtBNKODks0Fi/1DLx+F1jl4abpKJ5cww1k2iQ75jgG31IhBwb7YC2PmFA==
+  dependencies:
+    "@glimmer/interfaces" "^0.47.9"
+    "@glimmer/util" "^0.47.9"
+    handlebars "^4.5.1"
+    simple-html-tokenizer "^0.5.9"
+
+"@glimmer/util@^0.44.0":
+  version "0.44.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.44.0.tgz#45df98d73812440206ae7bda87cfe04aaae21ed9"
+  integrity sha512-duAsm30uVK9jSysElCbLyU6QQYO2X9iLDLBIBUcCqck9qN1o3tK2qWiHbGK5d6g8E2AJ4H88UrfElkyaJlGrwg==
+
+"@glimmer/util@^0.47.9":
+  version "0.47.9"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.47.9.tgz#ad3085eba3975bcbc74d28aefc871becbe800417"
+  integrity sha512-MJEumozi3TKmx+kzTpqPdC0jLEIuWSS3JNdBXceqTGRZQGmE5Zxqd8ydH5KOYpsKSfURHGCi2vU6+X/Q4z2b6g==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@simple-dom/interface" "^1.4.0"
+
+"@mrmlnc/readdir-enhanced@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
+  dependencies:
+    call-me-maybe "^1.0.1"
+    glob-to-regexp "^0.3.0"
+
+"@nodelib/fs.scandir@2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
+  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.3"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
+  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
+
+"@nodelib/fs.stat@^1.1.2":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
+  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.3"
+    fastq "^1.6.0"
+
+"@simple-dom/interface@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f"
+  integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA==
+
+"@sindresorhus/is@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
+  integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
+
+"@types/body-parser@*":
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f"
+  integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
+"@types/chai-as-promised@^7.1.2":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.2.tgz#2f564420e81eaf8650169e5a3a6b93e096e5068b"
+  integrity sha512-PO2gcfR3Oxa+u0QvECLe1xKXOqYTzCmWf0FhLhjREoW3fPAVamjihL7v1MOVLJLsnAMdLcjkfrs01yvDMwVK4Q==
+  dependencies:
+    "@types/chai" "*"
+
+"@types/chai@*", "@types/chai@^4.2.9":
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.11.tgz#d3614d6c5f500142358e6ed24e1bf16657536c50"
+  integrity sha512-t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==
+
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
+"@types/connect@*":
+  version "3.4.33"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546"
+  integrity sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==
+  dependencies:
+    "@types/node" "*"
+
+"@types/events@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
+
+"@types/express-serve-static-core@*":
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.5.tgz#a00ac7dadd746ae82477443e4d480a6a93ea083c"
+  integrity sha512-578YH5Lt88AKoADy0b2jQGwJtrBxezXtVe/MBqWXKZpqx91SnC0pVkVCcxcytz3lWW+cHBYDi3Ysh0WXc+rAYw==
+  dependencies:
+    "@types/node" "*"
+    "@types/range-parser" "*"
+
+"@types/express@^4.17.2":
+  version "4.17.6"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.6.tgz#6bce49e49570507b86ea1b07b806f04697fac45e"
+  integrity sha512-n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "*"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
+"@types/fs-extra@^5.0.5":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.1.0.tgz#2a325ef97901504a3828718c390d34b8426a10a1"
+  integrity sha512-AInn5+UBFIK9FK5xc9yP5e3TQSPNNgjHByqYcj9g5elVBnDQcQL7PlO1CIRy2gWlbwK7UPYqi7vRvFA44dCmYQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/glob@*", "@types/glob@^7.1.1":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
+  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
+  dependencies:
+    "@types/events" "*"
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/mime@*":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d"
+  integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==
+
+"@types/minimatch@*", "@types/minimatch@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+
+"@types/node@*":
+  version "13.13.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.4.tgz#1581d6c16e3d4803eb079c87d4ac893ee7501c2c"
+  integrity sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==
+
+"@types/qs@*":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.1.tgz#937fab3194766256ee09fcd40b781740758617e7"
+  integrity sha512-lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw==
+
+"@types/range-parser@*":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
+  integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
+
+"@types/rimraf@^2.0.2":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.4.tgz#403887b0b53c6100a6c35d2ab24f6ccc042fec46"
+  integrity sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==
+  dependencies:
+    "@types/glob" "*"
+    "@types/node" "*"
+
+"@types/serve-static@*":
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz#eb7e1c41c4468272557e897e9171ded5e2ded9d1"
+  integrity sha512-oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==
+  dependencies:
+    "@types/express-serve-static-core" "*"
+    "@types/mime" "*"
+
+"@types/symlink-or-copy@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@types/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#4151a81b4052c80bc2becbae09f3a9ec010a9c7a"
+  integrity sha512-Lja2xYuuf2B3knEsga8ShbOdsfNOtzT73GyJmZyY7eGl2+ajOqrs8yM5ze0fsSoYwvA6bw7/Qr7OZ7PEEmYwWg==
+
+"@webassemblyjs/ast@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
+  integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/wast-parser" "1.7.11"
+
+"@webassemblyjs/floating-point-hex-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
+  integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
+
+"@webassemblyjs/helper-api-error@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
+  integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
+
+"@webassemblyjs/helper-buffer@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
+  integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
+
+"@webassemblyjs/helper-code-frame@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
+  integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.7.11"
+
+"@webassemblyjs/helper-fsm@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
+  integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
+
+"@webassemblyjs/helper-module-context@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
+  integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
+
+"@webassemblyjs/helper-wasm-bytecode@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
+  integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
+
+"@webassemblyjs/helper-wasm-section@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
+  integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+
+"@webassemblyjs/ieee754@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
+  integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
+  integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
+  dependencies:
+    "@xtuc/long" "4.2.1"
+
+"@webassemblyjs/utf8@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
+  integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
+
+"@webassemblyjs/wasm-edit@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
+  integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/helper-wasm-section" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+    "@webassemblyjs/wasm-opt" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+    "@webassemblyjs/wast-printer" "1.7.11"
+
+"@webassemblyjs/wasm-gen@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
+  integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/ieee754" "1.7.11"
+    "@webassemblyjs/leb128" "1.7.11"
+    "@webassemblyjs/utf8" "1.7.11"
+
+"@webassemblyjs/wasm-opt@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
+  integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+
+"@webassemblyjs/wasm-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
+  integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-api-error" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/ieee754" "1.7.11"
+    "@webassemblyjs/leb128" "1.7.11"
+    "@webassemblyjs/utf8" "1.7.11"
+
+"@webassemblyjs/wast-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
+  integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/floating-point-hex-parser" "1.7.11"
+    "@webassemblyjs/helper-api-error" "1.7.11"
+    "@webassemblyjs/helper-code-frame" "1.7.11"
+    "@webassemblyjs/helper-fsm" "1.7.11"
+    "@xtuc/long" "4.2.1"
+
+"@webassemblyjs/wast-printer@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
+  integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/wast-parser" "1.7.11"
+    "@xtuc/long" "4.2.1"
+
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+
+"@xtuc/long@4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
+  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
+
+abab@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
+  integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
+
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+  dependencies:
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
+
+acorn-dynamic-import@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
+  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
+  dependencies:
+    acorn "^5.0.0"
+
+acorn-globals@^4.3.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
+  integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==
+  dependencies:
+    acorn "^6.0.1"
+    acorn-walk "^6.0.1"
+
+acorn-jsx@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
+  integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
+
+acorn-walk@^6.0.1:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
+  integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
+
+acorn@^5.0.0, acorn@^5.6.2:
+  version "5.7.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
+  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
+
+acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.7:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
+  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
+
+after@0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
+  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
+
+ajv-errors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
+
+ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
+  integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
+
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5, ajv@^6.9.1:
+  version "6.12.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
+  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+amd-name-resolver@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.2.0.tgz#fc41b3848824b557313897d71f8d5a0184fbe679"
+  integrity sha512-hlSTWGS1t6/xq5YCed7YALg7tKZL3rkl7UwEZ/eCIkn8JxmM6fU6Qs/1hwtjQqfuYxlffuUcgYEm0f5xP4YKaA==
+  dependencies:
+    ensure-posix-path "^1.0.1"
+
+amd-name-resolver@^1.2.1, amd-name-resolver@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.3.1.tgz#ffe71c683c6e7191fc4ae1bb3aaed15abea135d9"
+  integrity sha512-26qTEWqZQ+cxSYygZ4Cf8tsjDBLceJahhtewxtKZA3SRa4PluuqYCuheemDQD+7Mf5B7sr+zhTDWAHDh02a1Dw==
+  dependencies:
+    ensure-posix-path "^1.0.1"
+    object-hash "^1.3.1"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
+
+ansi-escapes@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
+
+ansi-escapes@^4.2.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
+  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
+  dependencies:
+    type-fest "^0.11.0"
+
+ansi-html@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+
+ansi-styles@^3.0.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
+ansi-to-html@^0.6.6:
+  version "0.6.14"
+  resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.14.tgz#65fe6d08bba5dd9db33f44a20aec331e0010dad8"
+  integrity sha512-7ZslfB1+EnFSDO5Ju+ue5Y6It19DRnZXWv8jrGHgIlPna5Mh4jz7BV5jCbQneXNFurQcKoolaaAjHtgSBfOIuA==
+  dependencies:
+    entities "^1.1.2"
+
+ansicolors@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
+  integrity sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8=
+
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
+
+aot-test-generators@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/aot-test-generators/-/aot-test-generators-0.1.0.tgz#43f0f615f97cb298d7919c1b0b4e6b7310b03cd0"
+  integrity sha1-Q/D2Ffl8spjXkZwbC05rcxCwPNA=
+  dependencies:
+    jsesc "^2.5.0"
+
+aproba@^1.0.3, aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
+are-we-there-yet@~1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+
+array-to-error@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-to-error/-/array-to-error-1.1.1.tgz#d68812926d14097a205579a667eeaf1856a44c07"
+  integrity sha1-1ogSkm0UCXogVXmmZ+6vGFakTAc=
+  dependencies:
+    array-to-sentence "^1.1.0"
+
+array-to-sentence@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/array-to-sentence/-/array-to-sentence-1.1.0.tgz#c804956dafa53232495b205a9452753a258d39fc"
+  integrity sha1-yASVba+lMjJJWyBalFJ1OiWNOfw=
+
+array-union@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+
+arraybuffer.slice@~0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
+
+asn1.js@^4.0.0:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-never@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.0.tgz#e6597ed9e357f7e62c074dfa7c71e30ed7b67a8b"
+  integrity sha512-61QPxh2lfV5j2dBsEtwhz8/sUj+baAIuCpQxeWorGeMxlTkbeyGyq7igxJB8yij1JdzUhyoiekNHMXrMYnkjvA==
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+assert@^1.1.1:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
+  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
+  dependencies:
+    object-assign "^4.1.1"
+    util "0.10.3"
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+
+ast-types@0.13.3:
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.3.tgz#50da3f28d17bdbc7969a3a2d83a0e4a72ae755a7"
+  integrity sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA==
+
+astral-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
+
+async-disk-cache@^1.2.1:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-1.3.5.tgz#cc6206ed79bb6982b878fc52e0505e4f52b62a02"
+  integrity sha512-VZpqfR0R7CEOJZ/0FOTgWq70lCrZyS1rkI8PXugDUkTKyyAUgZ2zQ09gLhMkEn+wN8LYeUTPxZdXtlX/kmbXKQ==
+  dependencies:
+    debug "^2.1.3"
+    heimdalljs "^0.2.3"
+    istextorbinary "2.1.0"
+    mkdirp "^0.5.0"
+    rimraf "^2.5.3"
+    rsvp "^3.0.18"
+    username-sync "^1.0.2"
+
+async-each@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
+
+async-limiter@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
+
+async-promise-queue@^1.0.3, async-promise-queue@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/async-promise-queue/-/async-promise-queue-1.0.5.tgz#cb23bce9fce903a133946a700cc85f27f09ea49d"
+  integrity sha512-xi0aQ1rrjPWYmqbwr18rrSKbSaXIeIwSd1J4KAgVfkq8utNbdZoht7GfvfY6swFUAMJ9obkc4WPJmtGwl+B8dw==
+  dependencies:
+    async "^2.4.1"
+    debug "^2.6.8"
+
+async@^2.4.1, async@^2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  dependencies:
+    lodash "^4.17.14"
+
+async@~0.2.9:
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+  integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E=
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
+  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
+
+babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+babel-core@^6.26.0, babel-core@^6.26.3:
+  version "6.26.3"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
+  integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.1"
+    debug "^2.6.9"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.8"
+    slash "^1.0.0"
+    source-map "^0.5.7"
+
+babel-eslint@^10.0.3:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
+  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
+    eslint-visitor-keys "^1.0.0"
+    resolve "^1.12.0"
+
+babel-generator@^6.26.0:
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.7"
+    trim-right "^1.0.1"
+
+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+  integrity sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=
+  dependencies:
+    babel-helper-explode-assignable-expression "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-call-delegate@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+  integrity sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-define-map@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
+  integrity sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-explode-assignable-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+  integrity sha1-8luCz33BBDPFX3BZLVdGQArCLKo=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+  integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=
+  dependencies:
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-get-function-arity@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+  integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-hoist-variables@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+  integrity sha1-HssnaJydJVE+rbyZFKc/VAi+enY=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-optimise-call-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+  integrity sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-regex@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
+  integrity sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-remap-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+  integrity sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-replace-supers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+  integrity sha1-v22/5Dk40XNpohPKiov3S2qQqxo=
+  dependencies:
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helpers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-loader@^8.0.6:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
+  integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==
+  dependencies:
+    find-cache-dir "^2.1.0"
+    loader-utils "^1.4.0"
+    mkdirp "^0.5.3"
+    pify "^4.0.1"
+    schema-utils "^2.6.5"
+
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-check-es2015-constants@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+  integrity sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-debug-macros@^0.2.0, babel-plugin-debug-macros@^0.2.0-beta.6:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0.tgz#0120ac20ce06ccc57bf493b667cf24b85c28da7a"
+  integrity sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==
+  dependencies:
+    semver "^5.3.0"
+
+babel-plugin-debug-macros@^0.3.0, babel-plugin-debug-macros@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.3.tgz#29c3449d663f61c7385f5b8c72d8015b069a5cb7"
+  integrity sha512-E+NI8TKpxJDBbVkdWkwHrKgJi696mnRL8XYrOPYw82veNHPDORM9WIQifl6TpIo8PNy2tU2skPqbfkmHXrHKQA==
+  dependencies:
+    semver "^5.3.0"
+
+babel-plugin-dynamic-import-node@^2.3.0:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
+  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
+  dependencies:
+    object.assign "^4.1.0"
+
+babel-plugin-ember-data-packages-polyfill@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-data-packages-polyfill/-/babel-plugin-ember-data-packages-polyfill-0.1.2.tgz#21154c095ddc703722b1fb8bb06c126c0b6d77dc"
+  integrity sha512-kTHnOwoOXfPXi00Z8yAgyD64+jdSXk3pknnS7NlqnCKAU6YDkXZ4Y7irl66kaZjZn0FBBt0P4YOZFZk85jYOww==
+  dependencies:
+    "@ember-data/rfc395-data" "^0.0.4"
+
+babel-plugin-ember-modules-api-polyfill@^2.12.0, babel-plugin-ember-modules-api-polyfill@^2.6.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.12.0.tgz#a5e703205ba4e625a7fab9bb1aea64ef3222cf75"
+  integrity sha512-ZQU4quX0TJ1yYyosPy5PFigKdCFEVHJ6H0b3hwjxekIP9CDwzk0OhQuKhCOPti+d52VWjjCjxu2BrXEih29mFw==
+  dependencies:
+    ember-rfc176-data "^0.3.12"
+
+babel-plugin-filter-imports@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-3.0.0.tgz#a849683837ad29960da17492fb32789ab6b09a11"
+  integrity sha512-p/chjzVTgCxUqyLM0q/pfWVZS7IJTwGQMwNg0LOvuQpKiTftQgZDtkGB8XvETnUw19rRcL7bJCTopSwibTN2tA==
+  dependencies:
+    "@babel/types" "^7.4.0"
+    lodash "^4.17.11"
+
+babel-plugin-htmlbars-inline-precompile@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-1.0.0.tgz#a9d2f6eaad8a3f3d361602de593a8cbef8179c22"
+  integrity sha512-4jvKEHR1bAX03hBDZ94IXsYCj3bwk9vYsn6ux6JZNL2U5pvzCWjqyrGahfsGNrhERyxw8IqcirOi9Q6WCo3dkQ==
+
+babel-plugin-htmlbars-inline-precompile@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-3.0.1.tgz#e1e38a4087f446578e419a21c112530c8df02345"
+  integrity sha512-ZiFY0nQjtdMPGIDwp/5LYOs6rCr54QfcSV5nPbrA7C++Fv4Vb2Q/qrKYx78t+dwmARJztnOBlObFk4z8veHxNA==
+
+babel-plugin-module-resolver@^3.1.1, babel-plugin-module-resolver@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz#ddfa5e301e3b9aa12d852a9979f18b37881ff5a7"
+  integrity sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==
+  dependencies:
+    find-babel-config "^1.1.0"
+    glob "^7.1.2"
+    pkg-up "^2.0.0"
+    reselect "^3.0.1"
+    resolve "^1.4.0"
+
+babel-plugin-syntax-async-functions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+  integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=
+
+babel-plugin-syntax-dynamic-import@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
+  integrity sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=
+
+babel-plugin-syntax-exponentiation-operator@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+  integrity sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=
+
+babel-plugin-syntax-trailing-function-commas@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+  integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=
+
+babel-plugin-transform-async-to-generator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+  integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.24.1"
+    babel-plugin-syntax-async-functions "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-arrow-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
+  integrity sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
+  integrity sha1-u8UbSflk1wy42OC5ToICRs46YUE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoping@^6.23.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
+  integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-plugin-transform-es2015-classes@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
+  integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=
+  dependencies:
+    babel-helper-define-map "^6.24.1"
+    babel-helper-function-name "^6.24.1"
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-helper-replace-supers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-computed-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
+  integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-destructuring@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+  integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
+  integrity sha1-c+s9MQypaePvnskcU3QabxV2Qj4=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-for-of@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
+  integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-function-name@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
+  integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
+  integrity sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
+  integrity sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=
+  dependencies:
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+  version "6.26.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
+  integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-types "^6.26.0"
+
+babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
+  integrity sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-umd@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
+  integrity sha1-rJl+YoXNGO1hdq22B9YCNErThGg=
+  dependencies:
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-object-super@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
+  integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40=
+  dependencies:
+    babel-helper-replace-supers "^6.24.1"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-parameters@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+  integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=
+  dependencies:
+    babel-helper-call-delegate "^6.24.1"
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
+  integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-spread@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
+  integrity sha1-1taKmfia7cRTbIGlQujdnxdG+NE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-sticky-regex@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
+  integrity sha1-AMHNsaynERLN8M9hJsLta0V8zbw=
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-template-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
+  integrity sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
+  integrity sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-unicode-regex@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
+  integrity sha1-04sS9C6nMj9yk4fxinxa4frrNek=
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    regexpu-core "^2.0.0"
+
+babel-plugin-transform-exponentiation-operator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+  integrity sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=
+  dependencies:
+    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
+    babel-plugin-syntax-exponentiation-operator "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-regenerator@^6.22.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
+  integrity sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=
+  dependencies:
+    regenerator-transform "^0.10.0"
+
+babel-plugin-transform-strict-mode@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
+  integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-polyfill@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
+  integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=
+  dependencies:
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    regenerator-runtime "^0.10.5"
+
+babel-preset-env@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
+  integrity sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-to-generator "^6.22.0"
+    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoping "^6.23.0"
+    babel-plugin-transform-es2015-classes "^6.23.0"
+    babel-plugin-transform-es2015-computed-properties "^6.22.0"
+    babel-plugin-transform-es2015-destructuring "^6.23.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
+    babel-plugin-transform-es2015-for-of "^6.23.0"
+    babel-plugin-transform-es2015-function-name "^6.22.0"
+    babel-plugin-transform-es2015-literals "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.22.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-umd "^6.23.0"
+    babel-plugin-transform-es2015-object-super "^6.22.0"
+    babel-plugin-transform-es2015-parameters "^6.23.0"
+    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
+    babel-plugin-transform-es2015-spread "^6.22.0"
+    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
+    babel-plugin-transform-es2015-template-literals "^6.22.0"
+    babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
+    babel-plugin-transform-exponentiation-operator "^6.22.0"
+    babel-plugin-transform-regenerator "^6.22.0"
+    browserslist "^3.2.6"
+    invariant "^2.2.2"
+    semver "^5.3.0"
+
+babel-register@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  integrity sha1-btAhFz4vy0htestFxgCahW9kcHE=
+  dependencies:
+    babel-core "^6.26.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.17.4"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.15"
+
+babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
+babel-template@^6.24.1, babel-template@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
+
+babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
+
+babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
+  dependencies:
+    babel-runtime "^6.26.0"
+    esutils "^2.0.2"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
+
+babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
+
+backbone@^1.1.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.4.0.tgz#54db4de9df7c3811c3f032f34749a4cd27f3bd12"
+  integrity sha512-RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ==
+  dependencies:
+    underscore ">=1.8.3"
+
+backo2@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+
+base64-arraybuffer@0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
+  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
+
+base64-js@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.2.tgz#024f0f72afa25b75f9c0ee73cd4f55ec1bed9784"
+  integrity sha1-Ak8Pcq+iW3X5wO5zzU9V7Bvtl4Q=
+
+base64-js@^1.0.2:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
+  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
+
+base64id@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
+  integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
+basic-auth@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
+  integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
+  dependencies:
+    safe-buffer "5.1.2"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  dependencies:
+    tweetnacl "^0.14.3"
+
+better-assert@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
+  dependencies:
+    callsite "1.0.0"
+
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
+binary-extensions@^1.0.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
+
+"binaryextensions@1 || 2":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.2.0.tgz#e7c6ba82d4f5f5758c26078fe8eea28881233311"
+  integrity sha512-bHhs98rj/7i/RZpCSJ3uk55pLXOItjIrh2sRQZSM6OoktScX+LxJzvlU+FELp9j3TdcddTmmYArLSGptCTwjuw==
+
+bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
+
+blank-object@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/blank-object/-/blank-object-1.0.2.tgz#f990793fbe9a8c8dd013fb3219420bec81d5f4b9"
+  integrity sha1-+ZB5P76ajI3QE/syGUIL7IHV9Lk=
+
+blob@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
+  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
+
+bluebird@^3.1.1, bluebird@^3.4.6, bluebird@^3.5.5:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
+
+body-parser@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+  dependencies:
+    bytes "3.1.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
+
+body@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
+  integrity sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=
+  dependencies:
+    continuable-cache "^0.3.1"
+    error "^7.0.0"
+    raw-body "~1.1.0"
+    safe-json-parse "~1.0.1"
+
+bops@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/bops/-/bops-0.0.3.tgz#c5cbf6fea8be7401ca5ea6d1679e6c4e8b407c79"
+  integrity sha1-xcv2/qi+dAHKXqbRZ55sTotAfHk=
+  dependencies:
+    base64-js "0.0.2"
+    to-utf8 "0.0.1"
+
+bower-config@^1.4.1:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.3.tgz#3454fecdc5f08e7aa9cc6d556e492be0669689ae"
+  integrity sha512-MVyyUk3d1S7d2cl6YISViwJBc2VXCkxF5AUFykvN0PQj5FsUiMNSgAYTso18oRFfyZ6XEtjrgg9MAaufHbOwNw==
+  dependencies:
+    graceful-fs "^4.1.3"
+    minimist "^0.2.1"
+    mout "^1.0.0"
+    osenv "^0.1.3"
+    untildify "^2.1.0"
+    wordwrap "^0.0.3"
+
+bower-endpoint-parser@0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz#00b565adbfab6f2d35addde977e97962acbcb3f6"
+  integrity sha1-ALVlrb+rby01rd3pd+l5Yqy8s/Y=
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^2.3.1, braces@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
+braces@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+broccoli-amd-funnel@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-amd-funnel/-/broccoli-amd-funnel-2.0.1.tgz#dbdbfd28841731342d538126567c25bea3f15310"
+  integrity sha512-VRE+0PYAN4jQfkIq3GKRj4U/4UV9rVpLan5ll6fVYV4ziVg4OEfR5GUnILEg++QtR4xSaugRxCPU5XJLDy3bNQ==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    symlink-or-copy "^1.2.0"
+
+broccoli-asset-rev@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-asset-rev/-/broccoli-asset-rev-3.0.0.tgz#65a28c8a062d6ee2cffd91ed2a8309e0f8253ac6"
+  integrity sha512-gAHQZnwvtl74tGevUqGuWoyOdJUdMMv0TjGSMzbdyGImr9fZcnM6xmggDA8bUawrMto9NFi00ZtNUgA4dQiUBw==
+  dependencies:
+    broccoli-asset-rewrite "^2.0.0"
+    broccoli-filter "^1.2.2"
+    broccoli-persistent-filter "^1.4.3"
+    json-stable-stringify "^1.0.0"
+    minimatch "^3.0.4"
+    rsvp "^3.0.6"
+
+broccoli-asset-rewrite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-asset-rewrite/-/broccoli-asset-rewrite-2.0.0.tgz#603c4a52d4c8987a2f681254436923ac0a9c94ab"
+  integrity sha512-dqhxdQpooNi7LHe8J9Jdxp6o3YPFWl4vQmint6zrsn2sVbOo+wpyiX3erUSt0IBtjNkAxqJjuvS375o2cLBHTA==
+  dependencies:
+    broccoli-filter "^1.2.3"
+
+broccoli-babel-transpiler@^6.5.0:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.5.1.tgz#a4afc8d3b59b441518eb9a07bd44149476e30738"
+  integrity sha512-w6GcnkxvHcNCte5FcLGEG1hUdQvlfvSN/6PtGWU/otg69Ugk8rUk51h41R0Ugoc+TNxyeFG1opRt2RlA87XzNw==
+  dependencies:
+    babel-core "^6.26.0"
+    broccoli-funnel "^2.0.1"
+    broccoli-merge-trees "^2.0.0"
+    broccoli-persistent-filter "^1.4.3"
+    clone "^2.0.0"
+    hash-for-dep "^1.2.3"
+    heimdalljs-logger "^0.1.7"
+    json-stable-stringify "^1.0.0"
+    rsvp "^4.8.2"
+    workerpool "^2.3.0"
+
+broccoli-babel-transpiler@^7.3.0, broccoli-babel-transpiler@^7.4.0:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.4.0.tgz#f3069f0f77e8017aa17e1e757dfb4a30de044182"
+  integrity sha512-DzPXQr1C+zOgzXG40wqPjtjSSa6wRKb+Ls45Qtq7Pn+GxL3/jIvQOBZi0/irZ5dlYVbRMEZiUnaIBIOha2ygIw==
+  dependencies:
+    "@babel/core" "^7.8.3"
+    "@babel/polyfill" "^7.8.3"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.2"
+    broccoli-persistent-filter "^2.2.1"
+    clone "^2.1.2"
+    hash-for-dep "^1.4.7"
+    heimdalljs-logger "^0.1.9"
+    json-stable-stringify "^1.0.1"
+    rsvp "^4.8.4"
+    workerpool "^3.1.1"
+
+broccoli-builder@^0.18.14:
+  version "0.18.14"
+  resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.14.tgz#4b79e2f844de11a4e1b816c3f49c6df4776c312d"
+  integrity sha1-S3ni+ETeEaThuBbD9Jxt9HdsMS0=
+  dependencies:
+    broccoli-node-info "^1.1.0"
+    heimdalljs "^0.2.0"
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.2"
+    rimraf "^2.2.8"
+    rsvp "^3.0.17"
+    silent-error "^1.0.1"
+
+broccoli-caching-writer@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07"
+  integrity sha1-uTz1j5Jk8AMHWGjbBXdPTn8lvQc=
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.2.5"
+    broccoli-plugin "1.1.0"
+    debug "^2.1.1"
+    rimraf "^2.2.8"
+    rsvp "^3.0.17"
+    walk-sync "^0.2.5"
+
+broccoli-caching-writer@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-3.0.3.tgz#0bd2c96a9738d6a6ab590f07ba35c5157d7db476"
+  integrity sha1-C9LJapc41qarWQ8HujXFFX19tHY=
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.2.1"
+    debug "^2.1.1"
+    rimraf "^2.2.8"
+    rsvp "^3.0.17"
+    walk-sync "^0.3.0"
+
+broccoli-clean-css@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-clean-css/-/broccoli-clean-css-1.1.0.tgz#9db143d9af7e0ae79c26e3ac5a9bb2d720ea19fa"
+  integrity sha1-nbFD2a9+CuecJuOsWpuy1yDqGfo=
+  dependencies:
+    broccoli-persistent-filter "^1.1.6"
+    clean-css-promise "^0.1.0"
+    inline-source-map-comment "^1.0.5"
+    json-stable-stringify "^1.0.0"
+
+broccoli-concat@^3.2.2, broccoli-concat@^3.7.1, broccoli-concat@^3.7.4:
+  version "3.7.5"
+  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.7.5.tgz#223beda8c1184252cf08ae020a3d45ffa6a48218"
+  integrity sha512-rDs1Mej3Ej0Cy5yIO9oIQq5+BCv0opAwS2NW7M0BeCsAMeFM42Z/zacDUC6jKc5OV5wiHvGTyCPLnZkMe0h6kQ==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.3.0"
+    ensure-posix-path "^1.0.2"
+    fast-sourcemap-concat "^1.4.0"
+    find-index "^1.1.0"
+    fs-extra "^4.0.3"
+    fs-tree-diff "^0.5.7"
+    lodash.merge "^4.6.2"
+    lodash.omit "^4.1.0"
+    lodash.uniq "^4.2.0"
+    walk-sync "^0.3.2"
+
+broccoli-config-loader@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-config-loader/-/broccoli-config-loader-1.0.1.tgz#d10aaf8ebc0cb45c1da5baa82720e1d88d28c80a"
+  integrity sha512-MDKYQ50rxhn+g17DYdfzfEM9DjTuSGu42Db37A8TQHQe8geYEcUZ4SQqZRgzdAI3aRQNlA1yBHJfOeGmOjhLIg==
+  dependencies:
+    broccoli-caching-writer "^3.0.3"
+
+broccoli-config-replace@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/broccoli-config-replace/-/broccoli-config-replace-1.1.2.tgz#6ea879d92a5bad634d11329b51fc5f4aafda9c00"
+  integrity sha1-bqh52SpbrWNNETKbUfxfSq/anAA=
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.2.0"
+    debug "^2.2.0"
+    fs-extra "^0.24.0"
+
+broccoli-debug@^0.6.4, broccoli-debug@^0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.5.tgz#164a5cdafd8936e525e702bf8f91f39d758e2e78"
+  integrity sha512-RIVjHvNar9EMCLDW/FggxFRXqpjhncM/3qq87bn/y+/zR9tqEkHvTqbyOc4QnB97NO2m6342w4wGkemkaeOuWg==
+  dependencies:
+    broccoli-plugin "^1.2.1"
+    fs-tree-diff "^0.5.2"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    symlink-or-copy "^1.1.8"
+    tree-sync "^1.2.2"
+
+broccoli-file-creator@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-2.1.1.tgz#7351dd2496c762cfce7736ce9b49e3fce0c7b7db"
+  integrity sha512-YpjOExWr92C5vhnK0kmD81kM7U09kdIRZk9w4ZDCDHuHXW+VE/x6AGEOQQW3loBQQ6Jk+k+TSm8dESy4uZsnjw==
+  dependencies:
+    broccoli-plugin "^1.1.0"
+    mkdirp "^0.5.1"
+
+broccoli-filter@^1.2.2, broccoli-filter@^1.2.3:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-1.3.0.tgz#71e3a8e32a17f309e12261919c5b1006d6766de6"
+  integrity sha512-VXJXw7eBfG82CFxaBDjYmyN7V72D4In2zwLVQJd/h3mBfF3CMdRTsv2L20lmRTtCv1sAHcB+LgMso90e/KYiLw==
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^1.0.0"
+    copy-dereference "^1.0.0"
+    debug "^2.2.0"
+    mkdirp "^0.5.1"
+    promise-map-series "^0.2.1"
+    rsvp "^3.0.18"
+    symlink-or-copy "^1.0.1"
+    walk-sync "^0.3.1"
+
+broccoli-funnel-reducer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea"
+  integrity sha1-ETZbKnha7JsXlyo234fu8kxcwOo=
+
+broccoli-funnel@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296"
+  integrity sha1-zdw6/F/xaFqAI0iP/3TOb7WlEpY=
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^1.3.0"
+    debug "^2.2.0"
+    exists-sync "0.0.4"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^0.5.3"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    mkdirp "^0.5.0"
+    path-posix "^1.0.0"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+    walk-sync "^0.3.1"
+
+broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-2.0.2.tgz#0edf629569bc10bd02cc525f74b9a38e71366a75"
+  integrity sha512-/vDTqtv7ipjEZQOVqO4vGDVAOZyuYzQ/EgGoyewfOgh1M7IQAToBKZI0oAQPgMBeFPPlIbfMuAngk+ohPBuaHQ==
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^1.3.0"
+    debug "^2.2.0"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^0.5.3"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    mkdirp "^0.5.0"
+    path-posix "^1.0.0"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+    walk-sync "^0.3.1"
+
+broccoli-kitchen-sink-helpers@^0.2.5:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
+  integrity sha1-peCYbtjXb7WYS2jD8EUNOpbjbsw=
+  dependencies:
+    glob "^5.0.10"
+    mkdirp "^0.5.1"
+
+broccoli-kitchen-sink-helpers@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.3.1.tgz#77c7c18194b9664163ec4fcee2793444926e0c06"
+  integrity sha1-d8fBgZS5ZkFj7E/O4nk0RJJuDAY=
+  dependencies:
+    glob "^5.0.10"
+    mkdirp "^0.5.1"
+
+broccoli-lint-eslint@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-lint-eslint/-/broccoli-lint-eslint-5.0.0.tgz#05365879d597dd78496a1c718db0e5ea5d4a2bde"
+  integrity sha512-V7M6U4th21bf1X4u3KoZa0xkcPq9JCSyKxB/nCWCBFMI3rkrB8nlyDLd8DKIUTqL+ojlFOGV5lohPZwndw0sZw==
+  dependencies:
+    aot-test-generators "^0.1.0"
+    broccoli-concat "^3.2.2"
+    broccoli-persistent-filter "^2.1.0"
+    eslint "^5.6.0"
+    json-stable-stringify "^1.0.1"
+    lodash.defaultsdeep "^4.6.0"
+    md5-hex "^2.0.0"
+
+broccoli-merge-trees@^1.0.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5"
+  integrity sha1-oAFRm7UGfwZYnZGvopQkRaLQ/bU=
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    can-symlink "^1.0.0"
+    fast-ordered-set "^1.0.2"
+    fs-tree-diff "^0.5.4"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+
+broccoli-merge-trees@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-2.0.1.tgz#14d4b7fc1a90318c12b16f843e6ba2693808100c"
+  integrity sha512-WjaexJ+I8BxP5V5RNn6um/qDRSmKoiBC/QkRi79FT9ClHfldxRyCDs9mcV7mmoaPlsshmmPaUz5jdtcKA6DClQ==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    merge-trees "^1.0.1"
+
+broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.2.tgz#f33b451994225522b5c9bcf27d59decfd8ba537d"
+  integrity sha512-ZyPAwrOdlCddduFbsMyyFzJUrvW6b04pMvDiAQZrCwghlvgowJDY+EfoXn+eR1RRA5nmGHJ+B68T63VnpRiT1A==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    merge-trees "^2.0.0"
+
+broccoli-middleware@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-2.1.1.tgz#183635bbef4dc1241533ee001a162f013d776cb9"
+  integrity sha512-BK8aPhQpOLsHWiftrqXQr84XsvzUqeaN4PlCQOYg5yM0M+WKAHtX2WFXmicSQZOVgKDyh5aeoNTFkHjBAEBzwQ==
+  dependencies:
+    ansi-html "^0.0.7"
+    handlebars "^4.0.4"
+    has-ansi "^3.0.0"
+    mime-types "^2.1.18"
+
+broccoli-module-normalizer@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/broccoli-module-normalizer/-/broccoli-module-normalizer-1.3.0.tgz#f9982d9cbb776b4ed754161cc6547784d3eb19de"
+  integrity sha512-0idZCOtdVG6xXoQ36Psc1ApMCr3lW5DB+WEAOEwHcUoESIBHzwcRPQTxheGIjZ5o0hxpsRYAUH5x0ErtNezbrQ==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    merge-trees "^1.0.1"
+    rimraf "^2.6.2"
+    symlink-or-copy "^1.1.8"
+
+broccoli-module-unification-reexporter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-module-unification-reexporter/-/broccoli-module-unification-reexporter-1.0.0.tgz#031909c5d3f159ec11d5f9e2346f2861db8acb3e"
+  integrity sha512-HTi9ua520M20aBZomaiBopsSt3yjL7J/paR3XPjieygK7+ShATBiZdn0B+ZPiniBi4I8JuMn1q0fNFUevtP//A==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    mkdirp "^0.5.1"
+    walk-sync "^0.3.2"
+
+broccoli-node-api@^1.6.0, broccoli-node-api@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-api/-/broccoli-node-api-1.7.0.tgz#391aa6edecd2a42c63c111b4162956b2fa288cb6"
+  integrity sha512-QIqLSVJWJUVOhclmkmypJJH9u9s/aWH4+FH6Q6Ju5l+Io4dtwqdPUNmDfw40o6sxhbZHhqGujDJuHTML1wG8Yw==
+
+broccoli-node-info@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-1.1.0.tgz#3aa2e31e07e5bdb516dd25214f7c45ba1c459412"
+  integrity sha1-OqLjHgflvbUW3SUhT3xFuhxFlBI=
+
+broccoli-node-info@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-2.1.0.tgz#ca84560e8570ff78565bea1699866ddbf58ad644"
+  integrity sha512-l6qDuboJThHfRVVWQVaTs++bFdrFTP0gJXgsWenczc1PavRVUmL1Eyb2swTAXXMpDOnr2zhNOBLx4w9AxkqbPQ==
+
+broccoli-output-wrapper@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-output-wrapper/-/broccoli-output-wrapper-2.0.0.tgz#f1e0b9b2f259a67fd41a380141c3c20b096828e6"
+  integrity sha512-V/ozejo+snzNf75i/a6iTmp71k+rlvqjE3+jYfimuMwR1tjNNRdtfno+NGNQB2An9bIAeqZnKhMDurAznHAdtA==
+  dependencies:
+    heimdalljs-logger "^0.1.10"
+
+broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.4.3:
+  version "1.4.6"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.6.tgz#80762d19000880a77da33c34373299c0f6a3e615"
+  integrity sha512-0RejLwoC95kv4kta8KAa+FmECJCK78Qgm8SRDEK7YyU0N9Cx6KpY3UCDy9WELl3mCXLN8TokNxc7/hp3lL4lfw==
+  dependencies:
+    async-disk-cache "^1.2.1"
+    async-promise-queue "^1.0.3"
+    broccoli-plugin "^1.0.0"
+    fs-tree-diff "^0.5.2"
+    hash-for-dep "^1.0.2"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    mkdirp "^0.5.1"
+    promise-map-series "^0.2.1"
+    rimraf "^2.6.1"
+    rsvp "^3.0.18"
+    symlink-or-copy "^1.0.1"
+    walk-sync "^0.3.1"
+
+broccoli-persistent-filter@^2.1.0, broccoli-persistent-filter@^2.2.1, broccoli-persistent-filter@^2.2.2, broccoli-persistent-filter@^2.3.0, broccoli-persistent-filter@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-2.3.1.tgz#4a052e0e0868b344c3a2977e35a3d497aa9eca72"
+  integrity sha512-hVsmIgCDrl2NFM+3Gs4Cr2TA6UPaIZip99hN8mtkaUPgM8UeVnCbxelCvBjUBHo0oaaqP5jzqqnRVvb568Yu5g==
+  dependencies:
+    async-disk-cache "^1.2.1"
+    async-promise-queue "^1.0.3"
+    broccoli-plugin "^1.0.0"
+    fs-tree-diff "^2.0.0"
+    hash-for-dep "^1.5.0"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    mkdirp "^0.5.1"
+    promise-map-series "^0.2.1"
+    rimraf "^2.6.1"
+    rsvp "^4.7.0"
+    symlink-or-copy "^1.0.1"
+    sync-disk-cache "^1.3.3"
+    walk-sync "^1.0.0"
+
+broccoli-plugin@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.1.0.tgz#73e2cfa05f8ea1e3fc1420c40c3d9e7dc724bf02"
+  integrity sha1-c+LPoF+OoeP8FCDEDD2efcckvwI=
+  dependencies:
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.0.1"
+
+broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli-plugin@^1.2.1, broccoli-plugin@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.3.1.tgz#a26315732fb99ed2d9fb58f12a1e14e986b4fabd"
+  integrity sha512-DW8XASZkmorp+q7J4EeDEZz+LoyKLAd2XZULXyD9l4m9/hAKV3vjHmB1kiUshcWAYMgTP1m2i4NnqCE/23h6AQ==
+  dependencies:
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.1.8"
+
+broccoli-plugin@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-2.1.0.tgz#2fab6c578219cfcc64f773e9616073313fc8b334"
+  integrity sha512-ElE4caljW4slapyEhSD9jU9Uayc8SoSABWdmY9SqbV8DHNxU6xg1jJsPcMm+cXOvggR3+G+OXAYQeFjWVnznaw==
+  dependencies:
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.1.8"
+
+broccoli-plugin@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-3.1.0.tgz#54ba6dd90a42ec3db5624063292610e326b1e542"
+  integrity sha512-7w7FP8WJYjLvb0eaw27LO678TGGaom++49O1VYIuzjhXjK5kn2+AMlDm7CaUFw4F7CLGoVQeZ84d8gICMJa4lA==
+  dependencies:
+    broccoli-node-api "^1.6.0"
+    broccoli-output-wrapper "^2.0.0"
+    fs-merger "^3.0.1"
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.1.8"
+
+broccoli-slow-trees@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-slow-trees/-/broccoli-slow-trees-3.1.0.tgz#8e48903f59e061bf1213963733b9e61dec2ee5d7"
+  integrity sha512-FRI7mRTk2wjIDrdNJd6znS7Kmmne4VkAkl8Ix1R/VoePFMD0g0tEl671xswzFqaRjpT9Qu+CC4hdXDLDJBuzMw==
+  dependencies:
+    heimdalljs "^0.2.1"
+
+broccoli-source@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-1.1.0.tgz#54f0e82c8b73f46580cbbc4f578f0b32fca8f809"
+  integrity sha1-VPDoLItz9GWAy7xPV48LMvyo+Ak=
+
+broccoli-source@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-3.0.0.tgz#c7c9ba24505941b72a0244568285bc859f69dfbd"
+  integrity sha512-G4Zc8HngZIdASyQOiz/9H/0Gjc2F02EFwhWF4wiueaI+/FBrM9Ixj6Prno/1aiLIYcN0JvRC3oytN9uOVonTww==
+  dependencies:
+    broccoli-node-api "^1.6.0"
+
+broccoli-sri-hash@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/broccoli-sri-hash/-/broccoli-sri-hash-2.1.2.tgz#bc69905ed7a381ad325cc0d02ded071328ebf3f3"
+  integrity sha1-vGmQXtejga0yXMDQLe0HEyjr8/M=
+  dependencies:
+    broccoli-caching-writer "^2.2.0"
+    mkdirp "^0.5.1"
+    rsvp "^3.1.0"
+    sri-toolbox "^0.2.0"
+    symlink-or-copy "^1.0.1"
+
+broccoli-stew@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-3.0.0.tgz#fd1d19d162ad9490b42e5c563b78c26eb1e80b95"
+  integrity sha512-NXfi+Vas24n3Ivo21GvENTI55qxKu7OwKRnCLWXld8MiLiQKQlWIq28eoARaFj0lTUFwUa4jKZeA7fW9PiWQeg==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-funnel "^2.0.0"
+    broccoli-merge-trees "^3.0.1"
+    broccoli-persistent-filter "^2.3.0"
+    broccoli-plugin "^2.1.0"
+    chalk "^2.4.1"
+    debug "^4.1.1"
+    ensure-posix-path "^1.0.1"
+    fs-extra "^8.0.1"
+    minimatch "^3.0.4"
+    resolve "^1.11.1"
+    rsvp "^4.8.5"
+    symlink-or-copy "^1.2.0"
+    walk-sync "^1.1.3"
+
+broccoli-uglify-sourcemap@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-3.2.0.tgz#d96f1d41f6c18e9a5d49af1a5ab9489cdcac1c6c"
+  integrity sha512-kkkn8v7kXdWwnZNekq+3ILuTAGkZoaoEMUYCKoER5/uokuoyTjtdYLHaE7UxHkuPEuLfjvJYv21sCCePZ74/2g==
+  dependencies:
+    async-promise-queue "^1.0.5"
+    broccoli-plugin "^1.2.1"
+    debug "^4.1.0"
+    lodash.defaultsdeep "^4.6.1"
+    matcher-collection "^2.0.0"
+    mkdirp "^0.5.0"
+    source-map-url "^0.4.0"
+    symlink-or-copy "^1.0.1"
+    terser "^4.3.9"
+    walk-sync "^1.1.3"
+    workerpool "^5.0.1"
+
+broccoli@^3.2.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-3.4.1.tgz#3acf2c8d998ed57fb7a89dee1b1b5e8e956e285b"
+  integrity sha512-DTIHD4olRsXr+Y+6k/E6PqnnSKAAROwgM77qmCloojmJS19QiIAJq7Pq2w6qZx9tQZt1zByhYgLm3r1m73yTPQ==
+  dependencies:
+    "@types/chai" "^4.2.9"
+    "@types/chai-as-promised" "^7.1.2"
+    "@types/express" "^4.17.2"
+    ansi-html "^0.0.7"
+    broccoli-node-info "^2.1.0"
+    broccoli-slow-trees "^3.0.1"
+    broccoli-source "^3.0.0"
+    commander "^4.1.1"
+    connect "^3.6.6"
+    console-ui "^3.0.4"
+    esm "^3.2.4"
+    findup-sync "^4.0.0"
+    handlebars "^4.7.3"
+    heimdalljs "^0.2.6"
+    heimdalljs-logger "^0.1.9"
+    https "^1.0.0"
+    mime-types "^2.1.26"
+    resolve-path "^1.4.0"
+    rimraf "^3.0.2"
+    sane "^4.0.0"
+    tmp "^0.0.33"
+    tree-sync "^2.0.0"
+    underscore.string "^3.2.2"
+    watch-detector "^1.0.0"
+
+brorand@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
+
+browser-process-hrtime@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
+  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
+
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+browserify-rsa@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
+  dependencies:
+    bn.js "^4.1.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
+  dependencies:
+    bn.js "^4.1.1"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.2"
+    elliptic "^6.0.0"
+    inherits "^2.0.1"
+    parse-asn1 "^5.0.0"
+
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
+  dependencies:
+    pako "~1.0.5"
+
+browserslist@^3.2.6:
+  version "3.2.8"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6"
+  integrity sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==
+  dependencies:
+    caniuse-lite "^1.0.30000844"
+    electron-to-chromium "^1.3.47"
+
+browserslist@^4.8.5, browserslist@^4.9.1:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
+  integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
+  dependencies:
+    caniuse-lite "^1.0.30001043"
+    electron-to-chromium "^1.3.413"
+    node-releases "^1.1.53"
+    pkg-up "^2.0.0"
+
+bser@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
+  dependencies:
+    node-int64 "^0.4.0"
+
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+
+buffer-alloc@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
+
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
+
+buffer@^4.3.0:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
+
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
+
+bytes@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
+  integrity sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=
+
+bytes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+
+cacache@^12.0.2:
+  version "12.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
+  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
+  dependencies:
+    bluebird "^3.5.5"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.4"
+    graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.3"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+cacheable-request@^2.1.1:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
+  integrity sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=
+  dependencies:
+    clone-response "1.0.2"
+    get-stream "3.0.0"
+    http-cache-semantics "3.8.1"
+    keyv "3.0.0"
+    lowercase-keys "1.0.0"
+    normalize-url "2.0.1"
+    responselike "1.0.2"
+
+calculate-cache-key-for-tree@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/calculate-cache-key-for-tree/-/calculate-cache-key-for-tree-2.0.0.tgz#7ac57f149a4188eacb0a45b210689215d3fef8d6"
+  integrity sha512-Quw8a6y8CPmRd6eU+mwypktYCwUcf8yVFIRbNZ6tPQEckX9yd+EBVEPC/GSZZrMWH9e7Vz4pT7XhpmyApRByLQ==
+  dependencies:
+    json-stable-stringify "^1.0.1"
+
+call-me-maybe@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
+
+callsite@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
+
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+can-symlink@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/can-symlink/-/can-symlink-1.0.0.tgz#97b607d8a84bb6c6e228b902d864ecb594b9d219"
+  integrity sha1-l7YH2KhLtsbiKLkC2GTstZS50hk=
+  dependencies:
+    tmp "0.0.28"
+
+caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001043:
+  version "1.0.30001048"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz#4bb4f1bc2eb304e5e1154da80b93dee3f1cf447e"
+  integrity sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==
+
+capture-exit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
+  dependencies:
+    rsvp "^4.8.4"
+
+capture-stack-trace@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
+  integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
+
+cardinal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9"
+  integrity sha1-UOIcGwqjdyn5N33vGWtanOyTLuk=
+  dependencies:
+    ansicolors "~0.2.1"
+    redeyed "~1.0.0"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
+chalk@^1.0.0, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+
+charm@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35"
+  integrity sha1-it02cVOm2aWBMxBSxAkJkdqZXjU=
+  dependencies:
+    inherits "^2.0.1"
+
+chokidar@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
+chownr@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+
+chrome-trace-event@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
+  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
+  dependencies:
+    tslib "^1.9.0"
+
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
+clean-base-url@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clean-base-url/-/clean-base-url-1.0.0.tgz#c901cf0a20b972435b0eccd52d056824a4351b7b"
+  integrity sha1-yQHPCiC5ckNbDszVLQVoJKQ1G3s=
+
+clean-css-promise@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/clean-css-promise/-/clean-css-promise-0.1.1.tgz#43f3d2c8dfcb2bf071481252cd9b76433c08eecb"
+  integrity sha1-Q/PSyN/LK/BxSBJSzZt2QzwI7ss=
+  dependencies:
+    array-to-error "^1.0.0"
+    clean-css "^3.4.5"
+    pinkie-promise "^2.0.0"
+
+clean-css@^3.4.5:
+  version "3.4.28"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
+  integrity sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=
+  dependencies:
+    commander "2.8.x"
+    source-map "0.4.x"
+
+clean-up-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clean-up-path/-/clean-up-path-1.0.0.tgz#de9e8196519912e749c9eaf67c13d64fac72a3e5"
+  integrity sha512-PHGlEF0Z6976qQyN6gM7kKH6EH0RdfZcc8V+QhFe36eRxV0SMH5OUBZG7Bxa9YcreNzyNbK63cGiZxdSZgosRw==
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
+cli-spinners@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.3.0.tgz#0632239a4b5aa4c958610142c34bb7a651fc8df5"
+  integrity sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==
+
+cli-table3@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
+  integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==
+  dependencies:
+    object-assign "^4.1.0"
+    string-width "^2.1.1"
+  optionalDependencies:
+    colors "^1.1.2"
+
+cli-table@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
+  integrity sha1-9TsFJmqLGguTSz0IIebi3FkUriM=
+  dependencies:
+    colors "1.0.3"
+
+cli-width@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
+
+clone-response@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+  dependencies:
+    mimic-response "^1.0.0"
+
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
+clone@^2.0.0, clone@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+colors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+  integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
+
+colors@^1.1.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@2.12.2:
+  version "2.12.2"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
+  integrity sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==
+
+commander@2.8.x:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
+  integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
+commander@^2.20.0, commander@^2.6.0, commander@~2.20.3:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+commander@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
+
+common-tags@^1.4.0, common-tags@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
+  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+
+component-bind@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
+
+component-emitter@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+
+component-emitter@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+
+component-inherit@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
+
+compressible@~2.0.16:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
+  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
+  dependencies:
+    mime-db ">= 1.43.0 < 2"
+
+compression@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+  dependencies:
+    accepts "~1.3.5"
+    bytes "3.0.0"
+    compressible "~2.0.16"
+    debug "2.6.9"
+    on-headers "~1.0.2"
+    safe-buffer "5.1.2"
+    vary "~1.1.2"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+concat-stream@^1.5.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+configstore@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
+  integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
+  dependencies:
+    dot-prop "^5.2.0"
+    graceful-fs "^4.1.2"
+    make-dir "^3.0.0"
+    unique-string "^2.0.0"
+    write-file-atomic "^3.0.0"
+    xdg-basedir "^4.0.0"
+
+connect@^3.6.6:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
+  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
+  dependencies:
+    debug "2.6.9"
+    finalhandler "1.1.2"
+    parseurl "~1.3.3"
+    utils-merge "1.0.1"
+
+console-browserify@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
+  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
+
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+
+console-ui@^3.0.4, console-ui@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-3.1.1.tgz#681a0414e8b0a23ed679d0a2802e39d920801171"
+  integrity sha512-22y+uk4AGq9quz6kofKQjkeCIAm86+MTxT/RZMFm8fMArP2lAkzxjUjNyrw7S6wXnnB+qRnC+/2ANMTke68RTQ==
+  dependencies:
+    chalk "^2.1.0"
+    inquirer "^6"
+    json-stable-stringify "^1.0.1"
+    ora "^3.4.0"
+    through2 "^3.0.1"
+
+consolidate@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
+  integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==
+  dependencies:
+    bluebird "^3.1.1"
+
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
+
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
+
+content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+
+continuable-cache@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
+  integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=
+
+convert-source-map@^1.5.1, convert-source-map@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+
+cookie@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
+
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
+copy-dereference@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/copy-dereference/-/copy-dereference-1.0.0.tgz#6b131865420fd81b413ba994b44d3655311152b6"
+  integrity sha1-axMYZUIP2BtBO6mUtE02VTERUrY=
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+
+core-js-compat@^3.6.2:
+  version "3.6.5"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
+  integrity sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==
+  dependencies:
+    browserslist "^4.8.5"
+    semver "7.0.0"
+
+core-js@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
+  integrity sha1-TekR5mew6ukSTjQlS1OupvxhjT4=
+
+core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
+  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
+
+core-object@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/core-object/-/core-object-3.1.5.tgz#fa627b87502adc98045e44678e9a8ec3b9c0d2a9"
+  integrity sha512-sA2/4+/PZ/KV6CKgjrVrrUVBKCkdDO02CUlQ0YKTQoYUwPYNOtOAcWlbYhd5v/1JqYaA6oZ4sDlOU4ppVw6Wbg==
+  dependencies:
+    chalk "^2.0.0"
+
+core-util-is@1.0.2, core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+create-ecdh@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.0.0"
+
+create-error-class@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
+  integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
+  dependencies:
+    capture-stack-trace "^1.0.0"
+
+create-hash@^1.1.0, create-hash@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+cross-spawn@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.2.tgz#d0d7dcfa74e89115c7619f4f721a94e1fdb716d6"
+  integrity sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
+
+crypto-random-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
+  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
+
+cssom@0.3.x, cssom@^0.3.4:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
+
+cssstyle@^1.1.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1"
+  integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==
+  dependencies:
+    cssom "0.3.x"
+
+cyclist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
+  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
+
+dag-map@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dag-map/-/dag-map-2.0.2.tgz#9714b472de82a1843de2fba9b6876938cab44c68"
+  integrity sha1-lxS0ct6CoYQ94vuptodpOMq0TGg=
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  dependencies:
+    assert-plus "^1.0.0"
+
+data-urls@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
+  integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==
+  dependencies:
+    abab "^2.0.0"
+    whatwg-mimetype "^2.2.0"
+    whatwg-url "^7.0.0"
+
+debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  dependencies:
+    ms "^2.1.1"
+
+debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
+debug@~3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  dependencies:
+    ms "2.0.0"
+
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+
+decompress-response@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
+  dependencies:
+    mimic-response "^1.0.0"
+
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  dependencies:
+    clone "^1.0.2"
+
+define-properties@^1.1.2, define-properties@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  dependencies:
+    object-keys "^1.0.12"
+
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+
+depd@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
+des.js@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
+  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+
+detect-file@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
+
+detect-indent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
+  dependencies:
+    repeating "^2.0.0"
+
+detect-indent@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd"
+  integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==
+
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
+detect-newline@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
+  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
+
+diff@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
+diffie-hellman@^5.0.0:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+dir-glob@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
+  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
+  dependencies:
+    path-type "^3.0.0"
+
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
+domain-browser@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
+
+domexception@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
+  dependencies:
+    webidl-conversions "^4.0.2"
+
+dot-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"
+  integrity sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==
+  dependencies:
+    no-case "^3.0.3"
+    tslib "^1.10.0"
+
+dot-prop@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
+  integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==
+  dependencies:
+    is-obj "^2.0.0"
+
+duplex@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/duplex/-/duplex-1.0.0.tgz#6abc5c16ec17e4c578578727126700590d3a2dda"
+  integrity sha1-arxcFuwX5MV4V4cnEmcAWQ06Ldo=
+
+duplexer3@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
+
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+editions@^1.1.1:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
+  integrity sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+electron-to-chromium@^1.3.413, electron-to-chromium@^1.3.47:
+  version "1.3.421"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.421.tgz#4abfe7e49070b5b437ec2ce442543add8eb66800"
+  integrity sha512-ogxgmvHGfDuLA+GtgfK0jkFWlBb4MCZK2U1MM+l98sf4U3Ixtrfw1iC9w4mQqNvo+lHgM4pR62TqoT4QrvKJCw==
+
+elliptic@^6.0.0:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
+  integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==
+  dependencies:
+    bn.js "^4.4.0"
+    brorand "^1.0.1"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.0"
+
+ember-assign-polyfill@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/ember-assign-polyfill/-/ember-assign-polyfill-2.6.0.tgz#07847e3357ee35b33f886a0b5fbec6873f6860eb"
+  integrity sha512-Y8NzOmHI/g4PuJ+xC14eTYiQbigNYddyHB8FY2kuQMxThTEIDE7SJtgttJrYYcPciOu0Tnb5ff36iO46LeiXkw==
+  dependencies:
+    ember-cli-babel "^6.16.0"
+    ember-cli-version-checker "^2.0.0"
+
+ember-auto-import@^1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.5.3.tgz#b32936f874d1ed7057ad2ed3f6116357820be44b"
+  integrity sha512-7JfdunM1BmLy/lyUXu7uEoi0Gi4+dxkGM23FgIEyW5g7z4MidhP53Fc61t49oPSnq7+J4lLpbH1f6C+mDMgb4A==
+  dependencies:
+    "@babel/core" "^7.1.6"
+    "@babel/preset-env" "^7.0.0"
+    "@babel/traverse" "^7.1.6"
+    "@babel/types" "^7.1.6"
+    "@embroider/core" "^0.4.3"
+    babel-core "^6.26.3"
+    babel-loader "^8.0.6"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    babel-template "^6.26.0"
+    babylon "^6.18.0"
+    broccoli-debug "^0.6.4"
+    broccoli-plugin "^1.3.0"
+    debug "^3.1.0"
+    ember-cli-babel "^6.6.0"
+    enhanced-resolve "^4.0.0"
+    fs-extra "^6.0.1"
+    fs-tree-diff "^1.0.0"
+    handlebars "^4.3.1"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.10"
+    mkdirp "^0.5.1"
+    pkg-up "^2.0.0"
+    resolve "^1.7.1"
+    rimraf "^2.6.2"
+    symlink-or-copy "^1.2.0"
+    typescript-memoize "^1.0.0-alpha.3"
+    walk-sync "^0.3.3"
+    webpack "~4.28"
+
+ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.0.tgz#de3baedd093163b6c2461f95964888c1676325ac"
+  integrity sha512-Zr4my8Xn+CzO0gIuFNXji0eTRml5AxZUTDQz/wsNJ5AJAtyFWCY4QtKdoELNNbiCVGt1lq5yLiwTm4scGKu6xA==
+
+ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.16.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
+  integrity sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==
+  dependencies:
+    amd-name-resolver "1.2.0"
+    babel-plugin-debug-macros "^0.2.0-beta.6"
+    babel-plugin-ember-modules-api-polyfill "^2.6.0"
+    babel-plugin-transform-es2015-modules-amd "^6.24.0"
+    babel-polyfill "^6.26.0"
+    babel-preset-env "^1.7.0"
+    broccoli-babel-transpiler "^6.5.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.0"
+    broccoli-source "^1.1.0"
+    clone "^2.0.0"
+    ember-cli-version-checker "^2.1.2"
+    semver "^5.5.0"
+
+ember-cli-babel@^7.11.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.7.3:
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.19.0.tgz#e6eddea18a867231fcf90a80689e92b98be9a63b"
+  integrity sha512-HiWKuoyy35vGEr+iCw6gUnQ3pS5qslyTlKEDW8cVoMbvZNGYBgRxHed5nklVUh+BS74AwR9lsp25BTAagYAP9Q==
+  dependencies:
+    "@babel/core" "^7.9.0"
+    "@babel/helper-compilation-targets" "^7.8.7"
+    "@babel/plugin-proposal-class-properties" "^7.8.3"
+    "@babel/plugin-proposal-decorators" "^7.8.3"
+    "@babel/plugin-transform-modules-amd" "^7.9.0"
+    "@babel/plugin-transform-runtime" "^7.9.0"
+    "@babel/plugin-transform-typescript" "^7.9.0"
+    "@babel/polyfill" "^7.8.7"
+    "@babel/preset-env" "^7.9.0"
+    "@babel/runtime" "^7.9.0"
+    amd-name-resolver "^1.2.1"
+    babel-plugin-debug-macros "^0.3.0"
+    babel-plugin-ember-data-packages-polyfill "^0.1.2"
+    babel-plugin-ember-modules-api-polyfill "^2.12.0"
+    babel-plugin-module-resolver "^3.1.1"
+    broccoli-babel-transpiler "^7.4.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.1"
+    broccoli-source "^1.1.0"
+    clone "^2.1.2"
+    ember-cli-babel-plugin-helpers "^1.1.0"
+    ember-cli-version-checker "^4.1.0"
+    ensure-posix-path "^1.0.2"
+    fixturify-project "^1.10.0"
+    rimraf "^3.0.1"
+    semver "^5.5.0"
+
+ember-cli-dependency-checker@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.2.0.tgz#9202ad9e14d6fda33cffc22a11c343c2a8885330"
+  integrity sha512-dkSmcJ/jY/2ms/S6ph2jXSfOW5VfOpLfg5DFEbra0SaMNgYkNDFF1o0U4OdTsG37L5h/AXWNuVtnOa4TMabz9Q==
+  dependencies:
+    chalk "^2.3.0"
+    find-yarn-workspace-root "^1.1.0"
+    is-git-url "^1.0.0"
+    resolve "^1.5.0"
+    semver "^5.3.0"
+
+ember-cli-eslint@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-eslint/-/ember-cli-eslint-5.1.0.tgz#acdb9b072911e04b07c313b610f514db4086d21a"
+  integrity sha512-o6787b0tgkRNp+KJo5BiQxtkLuz/yyYqVWF31LPrh+ZCC8jETrfyjsuk8VPDxKLGq7qEiQNJUgOEW87HTad7Vg==
+  dependencies:
+    broccoli-lint-eslint "^5.0.0"
+    ember-cli-version-checker "^3.0.0"
+    rsvp "^4.6.1"
+    walk-sync "^1.0.0"
+
+ember-cli-get-component-path-option@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
+  integrity sha1-DXtZVVni+QUKvtgE8djv8bCLx3E=
+
+ember-cli-htmlbars-inline-precompile@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-2.1.0.tgz#61b91ff1879d44ae504cadb46fb1f2604995ae08"
+  integrity sha512-BylIHduwQkncPhnj0ZyorBuljXbTzLgRo6kuHf1W+IHFxThFl2xG+r87BVwsqx4Mn9MTgW9SE0XWjwBJcSWd6Q==
+  dependencies:
+    babel-plugin-htmlbars-inline-precompile "^1.0.0"
+    ember-cli-version-checker "^2.1.2"
+    hash-for-dep "^1.2.3"
+    heimdalljs-logger "^0.1.9"
+    silent-error "^1.1.0"
+
+ember-cli-htmlbars@^4.2.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.3.1.tgz#4af8adc21ab3c4953f768956b7f7d207782cb175"
+  integrity sha512-CW6AY/yzjeVqoRtItOKj3hcYzc5dWPRETmeCzr2Iqjt5vxiVtpl0z5VTqHqIlT5fsFx6sGWBQXNHIe+ivYsxXQ==
+  dependencies:
+    "@ember/edition-utils" "^1.2.0"
+    babel-plugin-htmlbars-inline-precompile "^3.0.1"
+    broccoli-debug "^0.6.5"
+    broccoli-persistent-filter "^2.3.1"
+    broccoli-plugin "^3.1.0"
+    common-tags "^1.8.0"
+    ember-cli-babel-plugin-helpers "^1.1.0"
+    fs-tree-diff "^2.0.1"
+    hash-for-dep "^1.5.1"
+    heimdalljs-logger "^0.1.10"
+    json-stable-stringify "^1.0.1"
+    semver "^6.3.0"
+    strip-bom "^4.0.0"
+    walk-sync "^2.0.2"
+
+ember-cli-inject-live-reload@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-2.0.2.tgz#95edb543b386239d35959e5ea9579f5382976ac7"
+  integrity sha512-HDD6o/kBHT/kUtazklU0OW23q2jigIN42QmcpFdXUSvJ2/2SYA6yIqSUxWfJgISmtn5gTNZ2KPq1p3dLkhJxSQ==
+  dependencies:
+    clean-base-url "^1.0.0"
+    ember-cli-version-checker "^3.1.3"
+
+ember-cli-is-package-missing@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-is-package-missing/-/ember-cli-is-package-missing-1.0.0.tgz#6e6184cafb92635dd93ca6c946b104292d4e3390"
+  integrity sha1-bmGEyvuSY13ZPKbJRrEEKS1OM5A=
+
+ember-cli-lodash-subset@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
+  integrity sha1-IMtop5D+D94kiN39jvu332/nZvI=
+
+ember-cli-normalize-entity-name@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz#0b14f7bcbc599aa117b5fddc81e4fd03c4bad5b7"
+  integrity sha1-CxT3vLxZmqEXtf3cgeT9A8S61bc=
+  dependencies:
+    silent-error "^1.0.0"
+
+ember-cli-path-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-path-utils/-/ember-cli-path-utils-1.0.0.tgz#4e39af8b55301cddc5017739b77a804fba2071ed"
+  integrity sha1-Tjmvi1UwHN3FAXc5t3qAT7ogce0=
+
+ember-cli-preprocess-registry@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-preprocess-registry/-/ember-cli-preprocess-registry-3.3.0.tgz#685837a314fbe57224bd54b189f4b9c23907a2de"
+  integrity sha512-60GYpw7VPeB7TvzTLZTuLTlHdOXvayxjAQ+IxM2T04Xkfyu75O2ItbWlftQW7NZVGkaCsXSRAmn22PG03VpLMA==
+  dependencies:
+    broccoli-clean-css "^1.1.0"
+    broccoli-funnel "^2.0.1"
+    debug "^3.0.1"
+    process-relative-require "^1.0.0"
+
+ember-cli-sri@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-sri/-/ember-cli-sri-2.1.1.tgz#971620934a4b9183cf7923cc03e178b83aa907fd"
+  integrity sha1-lxYgk0pLkYPPeSPMA+F4uDqpB/0=
+  dependencies:
+    broccoli-sri-hash "^2.1.0"
+
+ember-cli-string-utils@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1"
+  integrity sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=
+
+ember-cli-template-lint@^1.0.0-beta.3:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-template-lint/-/ember-cli-template-lint-1.0.0.tgz#8ca8f5f05fdcad35c13f26b65fb93c016196bdc9"
+  integrity sha512-acWyJUvRFo2aA/0kqeUxfCPwLtPk3ckZ/1I0BzBX9qW/Gi8qWqYnwnI/vEotIqmsQl+npbl0/SXeQHFrUdyB0g==
+  dependencies:
+    aot-test-generators "^0.1.0"
+    broccoli-concat "^3.7.1"
+    broccoli-persistent-filter "^2.1.0"
+    chalk "^2.4.1"
+    debug "^4.0.1"
+    ember-cli-version-checker "^3.0.1"
+    ember-template-lint "^1.2.0"
+    json-stable-stringify "^1.0.1"
+    md5-hex "^2.0.0"
+    strip-ansi "^4.0.0"
+    walk-sync "^1.1.3"
+
+ember-cli-test-loader@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-2.2.0.tgz#3fb8d5d1357e4460d3f0a092f5375e71b6f7c243"
+  integrity sha512-mlSXX9SciIRwGkFTX6XGyJYp4ry6oCFZRxh5jJ7VH8UXLTNx2ZACtDTwaWtNhYrWXgKyiDUvmD8enD56aePWRA==
+  dependencies:
+    ember-cli-babel "^6.8.1"
+
+ember-cli-typescript@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-3.0.0.tgz#3b838d1ce9e4d22a98e68da22ceac6dc0cfd9bfc"
+  integrity sha512-lo5YArbJzJi5ssvaGqTt6+FnhTALnSvYVuxM7lfyL1UCMudyNJ94ovH5C7n5il7ATd6WsNiAPRUO/v+s5Jq/aA==
+  dependencies:
+    "@babel/plugin-transform-typescript" "~7.5.0"
+    ansi-to-html "^0.6.6"
+    debug "^4.0.0"
+    ember-cli-babel-plugin-helpers "^1.0.0"
+    execa "^2.0.0"
+    fs-extra "^8.0.0"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^6.0.0"
+    stagehand "^1.0.0"
+    walk-sync "^2.0.0"
+
+ember-cli-typescript@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-2.0.2.tgz#464984131fbdc05655eb61d1c3cdd911d3137f0d"
+  integrity sha512-7I5azCTxOgRDN8aSSnJZIKSqr+MGnT+jLTUbBYqF8wu6ojs2DUnTePxUcQMcvNh3Q3B1ySv7Q/uZFSjdU9gSjA==
+  dependencies:
+    "@babel/plugin-proposal-class-properties" "^7.1.0"
+    "@babel/plugin-transform-typescript" "~7.4.0"
+    ansi-to-html "^0.6.6"
+    debug "^4.0.0"
+    ember-cli-babel-plugin-helpers "^1.0.0"
+    execa "^1.0.0"
+    fs-extra "^7.0.0"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^6.0.0"
+    stagehand "^1.0.0"
+    walk-sync "^1.0.0"
+
+ember-cli-uglify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-3.0.0.tgz#8819665b2cc5fe70e3ba9fe7a94645209bc42fd6"
+  integrity sha512-n3QxdBfAgBdb2Cnso82Kt/nxm3ppIjnYWM8uhOEhF1aYxNXfM7AJrc+yiqTCDUR61Db8aCpHfAMvChz3kyme7g==
+  dependencies:
+    broccoli-uglify-sourcemap "^3.1.0"
+    lodash.defaultsdeep "^4.6.0"
+
+ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.1, ember-cli-version-checker@^2.1.2:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3"
+  integrity sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg==
+  dependencies:
+    resolve "^1.3.3"
+    semver "^5.3.0"
+
+ember-cli-version-checker@^3.0.0, ember-cli-version-checker@^3.0.1, ember-cli-version-checker@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-3.1.3.tgz#7c9b4f5ff30fdebcd480b1c06c4de43bb51c522c"
+  integrity sha512-PZNSvpzwWgv68hcXxyjREpj3WWb81A7rtYNQq1lLEgrWIchF8ApKJjWP3NBpHjaatwILkZAV8klair5WFlXAKg==
+  dependencies:
+    resolve-package-path "^1.2.6"
+    semver "^5.6.0"
+
+ember-cli-version-checker@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-4.1.0.tgz#7fc9836bdbc87451d286ba6a9a89b23591d8bbb7"
+  integrity sha512-yLf2YqotTSsjiXwx9Dt6H7AU0QcldFn5SLk/pG3Zqb0aHNeanBOPlx4/Ysa46ILGWYIh0fDH34AEVRueXTrQBQ==
+  dependencies:
+    resolve-package-path "^2.0.0"
+    semver "^6.3.0"
+    silent-error "^1.1.1"
+
+ember-cli@~3.15.2:
+  version "3.15.2"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.15.2.tgz#c2a5871850da7537e0cb3cd0e7d59fd76cd3184e"
+  integrity sha512-ciuFaLokZDJfEzltH3QUxZYnQcigCzNrjyyVbeNtr3qUMICHZEzrreQjqIdmuOzmog+BOFddgAB2i/b7ewmV0Q==
+  dependencies:
+    "@babel/core" "^7.7.2"
+    "@babel/plugin-transform-modules-amd" "^7.5.0"
+    amd-name-resolver "^1.3.1"
+    babel-plugin-module-resolver "^3.2.0"
+    bower-config "^1.4.1"
+    bower-endpoint-parser "0.2.2"
+    broccoli "^3.2.0"
+    broccoli-amd-funnel "^2.0.1"
+    broccoli-babel-transpiler "^7.3.0"
+    broccoli-builder "^0.18.14"
+    broccoli-concat "^3.7.4"
+    broccoli-config-loader "^1.0.1"
+    broccoli-config-replace "^1.1.2"
+    broccoli-debug "^0.6.5"
+    broccoli-funnel "^2.0.2"
+    broccoli-funnel-reducer "^1.0.0"
+    broccoli-merge-trees "^3.0.2"
+    broccoli-middleware "^2.1.0"
+    broccoli-module-normalizer "^1.3.0"
+    broccoli-module-unification-reexporter "^1.0.0"
+    broccoli-slow-trees "^3.0.1"
+    broccoli-source "^3.0.0"
+    broccoli-stew "^3.0.0"
+    calculate-cache-key-for-tree "^2.0.0"
+    capture-exit "^2.0.0"
+    chalk "^2.4.2"
+    ci-info "^2.0.0"
+    clean-base-url "^1.0.0"
+    compression "^1.7.4"
+    configstore "^5.0.0"
+    console-ui "^3.1.1"
+    core-object "^3.1.5"
+    dag-map "^2.0.2"
+    diff "^4.0.1"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-lodash-subset "^2.0.1"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-preprocess-registry "^3.3.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-source-channel-url "^2.0.1"
+    ensure-posix-path "^1.0.2"
+    execa "^1.0.0"
+    exit "^0.1.2"
+    express "^4.16.4"
+    filesize "^4.2.0"
+    find-up "^4.1.0"
+    find-yarn-workspace-root "^1.2.1"
+    fs-extra "^8.1.0"
+    fs-tree-diff "^2.0.1"
+    get-caller-file "^2.0.5"
+    git-repo-info "^2.1.0"
+    glob "^7.1.4"
+    heimdalljs "^0.2.6"
+    heimdalljs-fs-monitor "^0.2.3"
+    heimdalljs-graph "^1.0.0"
+    heimdalljs-logger "^0.1.10"
+    http-proxy "^1.18.0"
+    inflection "^1.12.0"
+    is-git-url "^1.0.0"
+    isbinaryfile "^3.0.3"
+    js-yaml "^3.13.1"
+    json-stable-stringify "^1.0.1"
+    leek "0.0.24"
+    lodash.template "^4.5.0"
+    markdown-it "^9.1.0"
+    markdown-it-terminal "0.1.0"
+    minimatch "^3.0.4"
+    morgan "^1.9.1"
+    nopt "^3.0.6"
+    npm-package-arg "^6.1.1"
+    p-defer "^3.0.0"
+    portfinder "^1.0.25"
+    promise-map-series "^0.2.3"
+    promise.prototype.finally "^3.1.1"
+    quick-temp "^0.1.8"
+    resolve "^1.12.0"
+    resolve-package-path "^1.2.7"
+    rsvp "^4.8.5"
+    sane "^4.1.0"
+    semver "^6.3.0"
+    silent-error "^1.1.1"
+    sort-package-json "^1.23.1"
+    symlink-or-copy "^1.2.0"
+    temp "0.9.0"
+    testem "^2.17.0"
+    tiny-lr "^1.1.1"
+    tree-sync "^2.0.0"
+    uuid "^3.3.3"
+    walk-sync "^2.0.2"
+    watch-detector "^1.0.0"
+    yam "^1.0.0"
+
+ember-compatibility-helpers@^1.1.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.1.tgz#87c92c4303f990ff455c28ca39fb3ee11441aa16"
+  integrity sha512-6wzYvnhg1ihQUT5yGqnLtleq3Nv5KNv79WhrEuNU9SwR4uIxCO+KpyC7r3d5VI0EM7/Nmv9Nd0yTkzmTMdVG1A==
+  dependencies:
+    babel-plugin-debug-macros "^0.2.0"
+    ember-cli-version-checker "^2.1.1"
+    semver "^5.4.1"
+
+ember-disable-prototype-extensions@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/ember-disable-prototype-extensions/-/ember-disable-prototype-extensions-1.1.3.tgz#1969135217654b5e278f9fe2d9d4e49b5720329e"
+  integrity sha1-GWkTUhdlS14nj5/i2dTkm1cgMp4=
+
+ember-export-application-global@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-2.0.1.tgz#b120a70e322ab208defc9e2daebe8d0dfc2dcd46"
+  integrity sha512-B7wiurPgsxsSGzJuPFkpBWnaeuCu2PGpG2BjyrfA1VcL7//o+5RSnZqiCEY326y7qmxb2GoCgo0ft03KBU0rRw==
+
+ember-load-initializers@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-2.1.1.tgz#d1a8bead00bc44222b0ab181840869992beb30f5"
+  integrity sha512-Ho5sBeaZPN3HmZkYkcLrjSBF3DTNmzC5h0DizzDj8cjpnCvaqeofphJDnH41k6kLv/QHMk4pMRISPcwc+bOceQ==
+  dependencies:
+    ember-cli-babel "^7.11.0"
+    ember-cli-typescript "^2.0.2"
+
+ember-maybe-import-regenerator@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/ember-maybe-import-regenerator/-/ember-maybe-import-regenerator-0.1.6.tgz#35d41828afa6d6a59bc0da3ce47f34c573d776ca"
+  integrity sha1-NdQYKK+m1qWbwNo85H80xXPXdso=
+  dependencies:
+    broccoli-funnel "^1.0.1"
+    broccoli-merge-trees "^1.0.0"
+    ember-cli-babel "^6.0.0-beta.4"
+    regenerator-runtime "^0.9.5"
+
+ember-qunit@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-4.6.0.tgz#ad79fd3ff00073a8779400cc5a4b44829517590f"
+  integrity sha512-i5VOGn0RP8XH+5qkYDOZshbqAvO6lHgF65D0gz8vRx4DszCIvJMJO+bbftBTfYMxp6rqG85etAA6pfNxE0DqsQ==
+  dependencies:
+    "@ember/test-helpers" "^1.7.1"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.2"
+    common-tags "^1.4.0"
+    ember-cli-babel "^7.12.0"
+    ember-cli-test-loader "^2.2.0"
+    qunit "^2.9.3"
+
+ember-resolver@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-7.0.0.tgz#07ca86b3bae373395b44bba784b8c133f75d61c2"
+  integrity sha512-tqyWk9E1P5LL42x7AnVoE25a/YWe0WcwAr8LXasm5V7Az3vFR/zbFtwN0oI3tpoSP/nCoGWDct6dRYlXrQjqBQ==
+  dependencies:
+    babel-plugin-debug-macros "^0.3.3"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.0"
+    ember-cli-babel "^7.13.2"
+    ember-cli-version-checker "^3.1.3"
+    resolve "^1.14.0"
+
+ember-rfc176-data@^0.3.12:
+  version "0.3.12"
+  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.12.tgz#90d82878e69e2ac9a5438e8ce14d12c6031c5bd2"
+  integrity sha512-g9HeZj/gU5bfIIrGXkP7MhS2b3Vu5DfNUrYr14hy99TgIvtZETO+96QF4WOEUXGjIJdfTRjerVnQlqngPQSv1g==
+
+ember-router-generator@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-2.0.0.tgz#d04abfed4ba8b42d166477bbce47fccc672dbde0"
+  integrity sha512-89oVHVJwmLDvGvAUWgS87KpBoRhy3aZ6U0Ql6HOmU4TrPkyaa8pM0W81wj9cIwjYprcQtN9EwzZMHnq46+oUyw==
+  dependencies:
+    "@babel/parser" "^7.4.5"
+    "@babel/traverse" "^7.4.5"
+    recast "^0.18.1"
+
+ember-source-channel-url@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ember-source-channel-url/-/ember-source-channel-url-1.2.0.tgz#77eb9d0889e5f5370e6c70fcb2696c63ff4a34a1"
+  integrity sha512-CLClcHzVf+8GoFk4176R16nwXoel70bd7DKVAY6D8M0m5fJJhbTrAPYpDA0lY8A60HZo9j/s8A8LWiGh1YmdZg==
+  dependencies:
+    got "^8.0.1"
+
+ember-source-channel-url@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-source-channel-url/-/ember-source-channel-url-2.0.1.tgz#18b88f8a00b7746e7a456b3551abb3aea18729cc"
+  integrity sha512-YlLUHW9gNvxEaohIj5exykoTZb4xj9ZRTcR4J3svv9S8rjAHJUnHmqC5Fd9onCs+NGxHo7KwR/fDwsfadbDu5Q==
+  dependencies:
+    got "^8.0.1"
+
+ember-source@~3.15.0:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.15.0.tgz#f6500c6d289ce58231bf1e6695c4974df2be7390"
+  integrity sha512-daTELJBDMGqAmQb/Puxdk1YR204/zs1DEiEMQWlqbtmhphAoDUbGi9ifJu20ajP/IcOCWw9Vp7aPzguTohWF7w==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/plugin-transform-block-scoping" "^7.6.2"
+    "@babel/plugin-transform-object-assign" "^7.2.0"
+    "@ember/edition-utils" "^1.1.1"
+    babel-plugin-debug-macros "^0.3.3"
+    babel-plugin-filter-imports "^3.0.0"
+    broccoli-concat "^3.7.4"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.2"
+    chalk "^2.4.2"
+    ember-cli-babel "^7.11.0"
+    ember-cli-get-component-path-option "^1.0.0"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-path-utils "^1.0.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-version-checker "^3.1.3"
+    ember-router-generator "^2.0.0"
+    inflection "^1.12.0"
+    jquery "^3.4.1"
+    resolve "^1.11.1"
+    semver "^6.1.1"
+    silent-error "^1.1.1"
+
+ember-template-lint@^1.2.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-1.14.0.tgz#fd3e8ec600b0b3de16b5701bf02acc99d192008e"
+  integrity sha512-M4CebpUZ6G8NEX05FsvlB6nFRO9Xi3eJWbGbnHI1Sakyp5Hl739fTPR5yPn/Gscc/sgNU25Rq1RSm0hoevrYGA==
+  dependencies:
+    "@glimmer/syntax" "^0.47.9"
+    chalk "^2.4.2"
+    globby "^9.2.0"
+    minimatch "^3.0.4"
+    resolve "^1.15.1"
+    strip-bom "^3.0.0"
+
+ember-test-waiters@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ember-test-waiters/-/ember-test-waiters-1.2.0.tgz#c12ead4313934c24cff41857020cacdbf8e6effe"
+  integrity sha512-aEw7YuutLuJT4NUuPTNiGFwgTYl23ThqmBxSkfFimQAn+keWjAftykk3dlFELuhsJhYW/S8YoVjN0bSAQRLNtw==
+  dependencies:
+    ember-cli-babel "^7.11.0"
+    semver "^6.3.0"
+
+ember-try-config@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-try-config/-/ember-try-config-3.0.0.tgz#012d8c90cae9eb624e2b62040bf7e76a1aa58edc"
+  integrity sha512-pNwHS29O1ACczkrxBKRtDY0TzTb7uPnA5eHEe+4NF6qpLK5FVnL3EtgZ8+yVYtnm1If5mZ07rIubw45vaSek7w==
+  dependencies:
+    ember-source-channel-url "^1.0.1"
+    lodash "^4.6.1"
+    package-json "^4.0.1"
+    remote-git-tags "^2.0.0"
+    rsvp "^4.8.1"
+    semver "^5.5.0"
+
+ember-try@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-1.4.0.tgz#be15965bd1727c27a65a78c4c8392f03763cc565"
+  integrity sha512-o0SoCH4K8umCf8etphla8FDygKfQGkwY+w47wEuYFVKaESrOZaK63ObnAK7DTKkjJU74Fss2abf+r+pAWpX43g==
+  dependencies:
+    chalk "^2.4.2"
+    cli-table3 "^0.5.1"
+    core-object "^3.1.5"
+    debug "^4.1.1"
+    ember-try-config "^3.0.0"
+    execa "^1.0.0"
+    extend "^3.0.0"
+    fs-extra "^5.0.0"
+    promise-map-series "^0.2.1"
+    resolve "^1.10.1"
+    rimraf "^2.6.3"
+    rsvp "^4.7.0"
+    walk-sync "^1.1.3"
+
+emit-function@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/emit-function/-/emit-function-0.0.2.tgz#e3a50b3d61be1bf8ca88b924bf713157a5bec124"
+  integrity sha1-46ULPWG+G/jKiLkkv3ExV6W+wSQ=
+
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
+engine.io-client@~3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.1.tgz#922ddb47eecdcb541136a93aeead24718fd05461"
+  integrity sha512-RJNmA+A9Js+8Aoq815xpGAsgWH1VoSYM//2VgIiu9lNOaHFfLpTjH4tOzktBpjIs5lvOfiNY1dwf+NuU6D38Mw==
+  dependencies:
+    component-emitter "1.2.1"
+    component-inherit "0.0.3"
+    debug "~4.1.0"
+    engine.io-parser "~2.2.0"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    ws "~6.1.0"
+    xmlhttprequest-ssl "~1.5.4"
+    yeast "0.1.2"
+
+engine.io-parser@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.0.tgz#312c4894f57d52a02b420868da7b5c1c84af80ed"
+  integrity sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==
+  dependencies:
+    after "0.8.2"
+    arraybuffer.slice "~0.0.7"
+    base64-arraybuffer "0.1.5"
+    blob "0.0.5"
+    has-binary2 "~1.0.2"
+
+engine.io@~3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.1.tgz#a61cbc13fa0cb27d9453fd079a29ee980564b069"
+  integrity sha512-8MfIfF1/IIfxuc2gv5K+XlFZczw/BpTvqBdl0E2fBLkYQp4miv4LuDTVtYt4yMyaIFLEr4vtaSgV4mjvll8Crw==
+  dependencies:
+    accepts "~1.3.4"
+    base64id "2.0.0"
+    cookie "0.3.1"
+    debug "~4.1.0"
+    engine.io-parser "~2.2.0"
+    ws "^7.1.2"
+
+enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
+  integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.5.0"
+    tapable "^1.0.0"
+
+ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, ensure-posix-path@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce"
+  integrity sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==
+
+entities@^1.1.2, entities@~1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+
+errno@^0.1.3, errno@~0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
+  dependencies:
+    prr "~1.0.1"
+
+error@^7.0.0:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/error/-/error-7.2.1.tgz#eab21a4689b5f684fc83da84a0e390de82d94894"
+  integrity sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==
+  dependencies:
+    string-template "~0.2.1"
+
+es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5:
+  version "1.17.5"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
+  integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.1.5"
+    is-regex "^1.0.5"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimleft "^2.1.1"
+    string.prototype.trimright "^2.1.1"
+
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+escodegen@^1.11.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"
+  integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+eslint-plugin-ember@^7.7.1:
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-7.13.0.tgz#a1df7794f06cdc6e1b8acfe6c59db5cf861f53dc"
+  integrity sha512-qIbw4uP0qUJoiWF4+7MTJWqwEN86RGmBNId0cwSoHoVNWtcw50R1ajYgxM1Q5FVUdoisVeSl9lKVRh5zkDFl+g==
+  dependencies:
+    "@ember-data/rfc395-data" "^0.0.4"
+    ember-rfc176-data "^0.3.12"
+    snake-case "^3.0.3"
+
+eslint-plugin-es@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz#0f5f5da5f18aa21989feebe8a73eadefb3432976"
+  integrity sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ==
+  dependencies:
+    eslint-utils "^1.4.2"
+    regexpp "^3.0.0"
+
+eslint-plugin-node@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-10.0.0.tgz#fd1adbc7a300cf7eb6ac55cf4b0b6fc6e577f5a6"
+  integrity sha512-1CSyM/QCjs6PXaT18+zuAXsjXGIGo5Rw630rSKwokSs2jrYURQc4R5JZpoanNCqwNmepg+0eZ9L7YiRUJb8jiQ==
+  dependencies:
+    eslint-plugin-es "^2.0.0"
+    eslint-utils "^1.4.2"
+    ignore "^5.1.1"
+    minimatch "^3.0.4"
+    resolve "^1.10.1"
+    semver "^6.1.0"
+
+eslint-scope@^4.0.0, eslint-scope@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-utils@^1.3.1, eslint-utils@^1.4.2:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
+  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
+  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+
+eslint@^5.6.0:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
+  integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    ajv "^6.9.1"
+    chalk "^2.1.0"
+    cross-spawn "^6.0.5"
+    debug "^4.0.1"
+    doctrine "^3.0.0"
+    eslint-scope "^4.0.3"
+    eslint-utils "^1.3.1"
+    eslint-visitor-keys "^1.0.0"
+    espree "^5.0.1"
+    esquery "^1.0.1"
+    esutils "^2.0.2"
+    file-entry-cache "^5.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob "^7.1.2"
+    globals "^11.7.0"
+    ignore "^4.0.6"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    inquirer "^6.2.2"
+    js-yaml "^3.13.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.11"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.2"
+    progress "^2.0.0"
+    regexpp "^2.0.1"
+    semver "^5.5.1"
+    strip-ansi "^4.0.0"
+    strip-json-comments "^2.0.1"
+    table "^5.2.3"
+    text-table "^0.2.0"
+
+esm@^3.2.4:
+  version "3.2.25"
+  resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
+  integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
+
+espree@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
+  integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
+  dependencies:
+    acorn "^6.0.7"
+    acorn-jsx "^5.0.0"
+    eslint-visitor-keys "^1.0.0"
+
+esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+esprima@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
+  integrity sha1-U88kes2ncxPlUcOqLnM0LT+099k=
+
+esquery@^1.0.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
+  dependencies:
+    estraverse "^5.1.0"
+
+esrecurse@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
+  dependencies:
+    estraverse "^4.1.0"
+
+estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+estraverse@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
+  integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+
+eventemitter3@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
+  integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==
+
+events-to-array@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.1.2.tgz#2d41f563e1fe400ed4962fe1a4d5c6a7539df7f6"
+  integrity sha1-LUH1Y+H+QA7Uli/hpNXGp1Od9/Y=
+
+events@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"
+  integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
+exec-sh@^0.3.2:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
+  integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
+
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+execa@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99"
+  integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^3.0.0"
+    onetime "^5.1.0"
+    p-finally "^2.0.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
+exists-sync@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.4.tgz#9744c2c428cc03b01060db454d4b12f0ef3c8879"
+  integrity sha1-l0TCxCjMA7AQYNtFTUsS8O88iHk=
+
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+expand-tilde@^2.0.0, expand-tilde@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
+  dependencies:
+    homedir-polyfill "^1.0.1"
+
+express@^4.10.7, express@^4.16.4:
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+  dependencies:
+    accepts "~1.3.7"
+    array-flatten "1.1.1"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
+    content-type "~1.0.4"
+    cookie "0.4.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extend@^3.0.0, extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+external-editor@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
+fast-deep-equal@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
+  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+
+fast-glob@^2.2.6:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
+  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
+  dependencies:
+    "@mrmlnc/readdir-enhanced" "^2.2.1"
+    "@nodelib/fs.stat" "^1.1.2"
+    glob-parent "^3.1.0"
+    is-glob "^4.0.0"
+    merge2 "^1.2.3"
+    micromatch "^3.1.10"
+
+fast-glob@^3.1.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d"
+  integrity sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@~2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
+fast-ordered-set@^1.0.0, fast-ordered-set@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/fast-ordered-set/-/fast-ordered-set-1.0.3.tgz#3fbb36634f7be79e4f7edbdb4a357dee25d184eb"
+  integrity sha1-P7s2Y097555PftvbSjV97iXRhOs=
+  dependencies:
+    blank-object "^1.0.1"
+
+fast-sourcemap-concat@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/fast-sourcemap-concat/-/fast-sourcemap-concat-1.4.0.tgz#122c330d4a2afaff16ad143bc9674b87cd76c8ad"
+  integrity sha512-x90Wlx/2C83lfyg7h4oguTZN4MyaVfaiUSJQNpU+YEA0Odf9u659Opo44b0LfoVg9G/bOE++GdID/dkyja+XcA==
+  dependencies:
+    chalk "^2.0.0"
+    fs-extra "^5.0.0"
+    heimdalljs-logger "^0.1.9"
+    memory-streams "^0.1.3"
+    mkdirp "^0.5.0"
+    source-map "^0.4.2"
+    source-map-url "^0.3.0"
+    sourcemap-validator "^1.1.0"
+
+fastq@^1.6.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.7.0.tgz#fcd79a08c5bd7ec5b55cd3f5c4720db551929801"
+  integrity sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==
+  dependencies:
+    reusify "^1.0.4"
+
+faye-websocket@~0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+fb-watchman@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
+  dependencies:
+    bser "2.1.1"
+
+figgy-pudding@^3.5.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
+  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
+
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+figures@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-entry-cache@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
+  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+  dependencies:
+    flat-cache "^2.0.1"
+
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
+filesize@^4.1.2, filesize@^4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-4.2.1.tgz#ab1cb2069db5d415911c1a13e144c0e743bc89bc"
+  integrity sha512-bP82Hi8VRZX/TUBKfE24iiUGsB/sfm2WUrwTQyAzQrhO3V9IhcBBNBXMyzLY5orACxRyYJ3d2HeRVX+eFv4lmA==
+
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+finalhandler@1.1.2, finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
+
+find-babel-config@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
+  integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
+  dependencies:
+    json5 "^0.5.1"
+    path-exists "^3.0.0"
+
+find-cache-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^2.0.0"
+    pkg-dir "^3.0.0"
+
+find-index@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/find-index/-/find-index-1.1.1.tgz#4b221f8d46b7f8bea33d8faed953f3ca7a081cbc"
+  integrity sha512-XYKutXMrIK99YMUPf91KX5QVJoG31/OsgftD6YoTPAObfQIxM4ziA9f0J1AsqKhJmo+IeaIPP0CFopTD4bdUBw==
+
+find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
+  dependencies:
+    locate-path "^2.0.0"
+
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
+find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+find-yarn-workspace-root@^1.1.0, find-yarn-workspace-root@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
+  integrity sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==
+  dependencies:
+    fs-extra "^4.0.3"
+    micromatch "^3.1.4"
+
+findup-sync@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0"
+  integrity sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^4.0.0"
+    micromatch "^4.0.2"
+    resolve-dir "^1.0.1"
+
+fireworm@^0.7.0:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/fireworm/-/fireworm-0.7.1.tgz#ccf20f7941f108883fcddb99383dbe6e1861c758"
+  integrity sha1-zPIPeUHxCIg/zduZOD2+bhhhx1g=
+  dependencies:
+    async "~0.2.9"
+    is-type "0.0.1"
+    lodash.debounce "^3.1.1"
+    lodash.flatten "^3.0.2"
+    minimatch "^3.0.2"
+
+fixturify-project@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-1.10.0.tgz#091c452a9bb15f09b6b9cc7cf5c0ad559f1d9aad"
+  integrity sha512-L1k9uiBQuN0Yr8tA9Noy2VSQ0dfg0B8qMdvT7Wb5WQKc7f3dn3bzCbSrqlb+etLW+KDV4cBC7R1OvcMg3kcxmA==
+  dependencies:
+    fixturify "^1.2.0"
+    tmp "^0.0.33"
+
+fixturify@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-1.3.0.tgz#163c468093c7c4d90b70cde39fd6325f6528b25d"
+  integrity sha512-tL0svlOy56pIMMUQ4bU1xRe6NZbFSa/ABTWMxW2mH38lFGc9TrNAKWcMBQ7eIjo3wqSS8f2ICabFaatFyFmrVQ==
+  dependencies:
+    "@types/fs-extra" "^5.0.5"
+    "@types/minimatch" "^3.0.3"
+    "@types/rimraf" "^2.0.2"
+    fs-extra "^7.0.1"
+    matcher-collection "^2.0.0"
+
+flat-cache@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
+  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+  dependencies:
+    flatted "^2.0.0"
+    rimraf "2.6.3"
+    write "1.0.3"
+
+flatted@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
+  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
+
+flush-write-stream@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.3.6"
+
+follow-redirects@^1.0.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb"
+  integrity sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==
+  dependencies:
+    debug "^3.0.0"
+
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
+forwarded@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  dependencies:
+    map-cache "^0.2.2"
+
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+
+from2@^2.1.0, from2@^2.1.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
+fs-extra@^0.24.0:
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
+  integrity sha1-1OQ0KpZnXLeEZjOmCZJJMytTmVI=
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+    path-is-absolute "^1.0.0"
+    rimraf "^2.2.8"
+
+fs-extra@^4.0.2, fs-extra@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"
+  integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
+  integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^7.0.0, fs-extra@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^8.0.0, fs-extra@^8.0.1, fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-merger@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/fs-merger/-/fs-merger-3.0.3.tgz#d43c978e3cd5dbc29fb34144182eba749ab8c4b5"
+  integrity sha512-d9Qx+XlPRU4mkp+JYhUvp5NyS31uhqffIgs6EBnZcjrlO9RwSv0lkWi6PIDxgdNF+vjn9QCZevunGDpfoy4BGg==
+  dependencies:
+    broccoli-node-api "^1.7.0"
+    broccoli-node-info "^2.1.0"
+    fs-extra "^8.0.1"
+    fs-tree-diff "^2.0.1"
+    rimraf "^2.6.3"
+    walk-sync "^2.0.2"
+
+fs-minipass@^1.2.5:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
+  dependencies:
+    minipass "^2.6.0"
+
+fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6, fs-tree-diff@^0.5.7:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.9.tgz#a4ec6182c2f5bd80b9b83c8e23e4522e6f5fd946"
+  integrity sha512-872G8ax0kHh01m9n/2KDzgYwouKza0Ad9iFltBpNykvROvf2AGtoOzPJgGx125aolGPER3JuC7uZFrQ7bG1AZw==
+  dependencies:
+    heimdalljs-logger "^0.1.7"
+    object-assign "^4.1.0"
+    path-posix "^1.0.0"
+    symlink-or-copy "^1.1.8"
+
+fs-tree-diff@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-1.0.2.tgz#0e2931733a85b55feb3472c0b89a20b0c03ac0de"
+  integrity sha512-Zro2ACaPVDgVOx9+s5s5AfPlAD0kMJdbwGvTGF6KC1SjxjiGWxJvV4mUTDkFVSy3OUw2C/f1qpdjF81hGqSBAw==
+  dependencies:
+    heimdalljs-logger "^0.1.7"
+    object-assign "^4.1.0"
+    path-posix "^1.0.0"
+    symlink-or-copy "^1.1.8"
+
+fs-tree-diff@^2.0.0, fs-tree-diff@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz#343e4745ab435ec39ebac5f9059ad919cd034afa"
+  integrity sha512-x+CfAZ/lJHQqwlD64pYM5QxWjzWhSjroaVsr8PW831zOApL55qPibed0c+xebaLWVr2BnHFoHdrwOv8pzt8R5A==
+  dependencies:
+    "@types/symlink-or-copy" "^1.2.0"
+    heimdalljs-logger "^0.1.7"
+    object-assign "^4.1.0"
+    path-posix "^1.0.0"
+    symlink-or-copy "^1.1.8"
+
+fs-updater@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/fs-updater/-/fs-updater-1.0.4.tgz#2329980f99ae9176e9a0e84f7637538a182ce63b"
+  integrity sha512-0pJX4mJF/qLsNEwTct8CdnnRdagfb+LmjRPJ8sO+nCnAZLW0cTmz4rTgU25n+RvTuWSITiLKrGVJceJPBIPlKg==
+  dependencies:
+    can-symlink "^1.0.0"
+    clean-up-path "^1.0.0"
+    heimdalljs "^0.2.5"
+    heimdalljs-logger "^0.1.9"
+    rimraf "^2.6.2"
+
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
+  dependencies:
+    graceful-fs "^4.1.2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+fsevents@^1.2.7:
+  version "1.2.12"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz#db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c"
+  integrity sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==
+  dependencies:
+    bindings "^1.5.0"
+    nan "^2.12.1"
+
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+gensync@^1.0.0-beta.1:
+  version "1.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
+  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
+
+get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-stdin@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
+
+get-stream@3.0.0, get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
+get-stream@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
+  integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==
+  dependencies:
+    pump "^3.0.0"
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  dependencies:
+    assert-plus "^1.0.0"
+
+git-fetch-pack@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/git-fetch-pack/-/git-fetch-pack-0.1.1.tgz#7703a32cf0db80f060d2766a34ac00d02cebcdf5"
+  integrity sha1-dwOjLPDbgPBg0nZqNKwA0CzrzfU=
+  dependencies:
+    bops "0.0.3"
+    emit-function "0.0.2"
+    git-packed-ref-parse "0.0.0"
+    through "~2.2.7"
+
+git-hooks-list@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/git-hooks-list/-/git-hooks-list-1.0.3.tgz#be5baaf78203ce342f2f844a9d2b03dba1b45156"
+  integrity sha512-Y7wLWcrLUXwk2noSka166byGCvhMtDRpgHdzCno1UQv/n/Hegp++a2xBWJL1lJarnKD3SWaljD+0z1ztqxuKyQ==
+
+git-packed-ref-parse@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/git-packed-ref-parse/-/git-packed-ref-parse-0.0.0.tgz#b85046931f3e4a65679b5de54af3a5d3df372646"
+  integrity sha1-uFBGkx8+SmVnm13lSvOl0983JkY=
+  dependencies:
+    line-stream "0.0.0"
+    through "~2.2.7"
+
+git-read-pkt-line@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/git-read-pkt-line/-/git-read-pkt-line-0.0.8.tgz#494037854ed57bd90cd55676540d86ab0cb36caa"
+  integrity sha1-SUA3hU7Ve9kM1VZ2VA2GqwyzbKo=
+  dependencies:
+    bops "0.0.3"
+    through "~2.2.7"
+
+git-repo-info@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-2.1.1.tgz#220ffed8cbae74ef8a80e3052f2ccb5179aed058"
+  integrity sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg==
+
+git-transport-protocol@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/git-transport-protocol/-/git-transport-protocol-0.1.0.tgz#99f4dd6389b9161eded74a9e617d6ba5ed0a6c2c"
+  integrity sha1-mfTdY4m5Fh7e10qeYX1rpe0KbCw=
+  dependencies:
+    duplex "~1.0.0"
+    emit-function "0.0.2"
+    git-read-pkt-line "0.0.8"
+    git-write-pkt-line "0.1.0"
+    through "~2.2.7"
+
+git-write-pkt-line@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/git-write-pkt-line/-/git-write-pkt-line-0.1.0.tgz#a84c1856c09011908389b2f06f911d91f6394694"
+  integrity sha1-qEwYVsCQEZCDibLwb5EdkfY5RpQ=
+  dependencies:
+    bops "0.0.3"
+    through "~2.2.7"
+
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
+glob-parent@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob-to-regexp@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
+
+glob@^5.0.10:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.0.4, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+global-modules@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
+  dependencies:
+    global-prefix "^1.0.1"
+    is-windows "^1.0.1"
+    resolve-dir "^1.0.0"
+
+global-prefix@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
+  dependencies:
+    expand-tilde "^2.0.2"
+    homedir-polyfill "^1.0.1"
+    ini "^1.3.4"
+    is-windows "^1.0.1"
+    which "^1.2.14"
+
+globals@^11.1.0, globals@^11.7.0:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
+globals@^9.18.0:
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
+
+globby@11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.0.tgz#56fd0e9f0d4f8fb0c456f1ab0dee96e1380bc154"
+  integrity sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
+
+globby@^9.2.0:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
+  integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
+  dependencies:
+    "@types/glob" "^7.1.1"
+    array-union "^1.0.2"
+    dir-glob "^2.2.2"
+    fast-glob "^2.2.6"
+    glob "^7.1.3"
+    ignore "^4.0.3"
+    pify "^4.0.1"
+    slash "^2.0.0"
+
+got@^6.7.1:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
+  integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=
+  dependencies:
+    create-error-class "^3.0.0"
+    duplexer3 "^0.1.4"
+    get-stream "^3.0.0"
+    is-redirect "^1.0.0"
+    is-retry-allowed "^1.0.0"
+    is-stream "^1.0.0"
+    lowercase-keys "^1.0.0"
+    safe-buffer "^5.0.1"
+    timed-out "^4.0.0"
+    unzip-response "^2.0.1"
+    url-parse-lax "^1.0.0"
+
+got@^8.0.1:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
+  integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==
+  dependencies:
+    "@sindresorhus/is" "^0.7.0"
+    cacheable-request "^2.1.1"
+    decompress-response "^3.3.0"
+    duplexer3 "^0.1.4"
+    get-stream "^3.0.0"
+    into-stream "^3.1.0"
+    is-retry-allowed "^1.1.0"
+    isurl "^1.0.0-alpha5"
+    lowercase-keys "^1.0.0"
+    mimic-response "^1.0.0"
+    p-cancelable "^0.4.0"
+    p-timeout "^2.0.1"
+    pify "^3.0.0"
+    safe-buffer "^5.1.1"
+    timed-out "^4.0.1"
+    url-parse-lax "^3.0.0"
+    url-to-options "^1.0.1"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
+
+growly@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
+
+handlebars@^4.0.11, handlebars@^4.0.4, handlebars@^4.3.1, handlebars@^4.5.1, handlebars@^4.7.3:
+  version "4.7.6"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
+  integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
+  dependencies:
+    minimist "^1.2.5"
+    neo-async "^2.6.0"
+    source-map "^0.6.1"
+    wordwrap "^1.0.0"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+  dependencies:
+    ajv "^6.5.5"
+    har-schema "^2.0.0"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-ansi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-3.0.0.tgz#36077ef1d15f333484aa7fa77a28606f1c655b37"
+  integrity sha1-Ngd+8dFfMzSEqn+neihgbxxlWzc=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+has-binary2@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
+  dependencies:
+    isarray "2.0.1"
+
+has-cors@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+has-symbol-support-x@^1.4.1:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
+  integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
+
+has-symbols@^1.0.0, has-symbols@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
+  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
+
+has-to-string-tag-x@^1.2.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
+  integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
+  dependencies:
+    has-symbol-support-x "^1.4.1"
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+hash-base@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+hash-for-dep@^1.0.2, hash-for-dep@^1.2.3, hash-for-dep@^1.4.7, hash-for-dep@^1.5.0, hash-for-dep@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.5.1.tgz#497754b39bee2f1c4ade4521bfd2af0a7c1196e3"
+  integrity sha512-/dQ/A2cl7FBPI2pO0CANkvuuVi/IFS5oTyJ0PsOb6jW6WbVW1js5qJXMJTNbWHXBIPdFTWFbabjB+mE0d+gelw==
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    heimdalljs "^0.2.3"
+    heimdalljs-logger "^0.1.7"
+    path-root "^0.1.1"
+    resolve "^1.10.0"
+    resolve-package-path "^1.0.11"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.1"
+
+heimdalljs-fs-monitor@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/heimdalljs-fs-monitor/-/heimdalljs-fs-monitor-0.2.3.tgz#1aedd4b1c61d86c51f6141fb75c5a3350dc41b15"
+  integrity sha512-fYAvqSP0CxeOjLrt61B4wux/jqZzdZnS2xfb2oc14NP6BTZ8gtgtR2op6gKFakOR8lm8GN9Xhz1K4A1ZvJ4RQw==
+  dependencies:
+    heimdalljs "^0.2.3"
+    heimdalljs-logger "^0.1.7"
+
+heimdalljs-graph@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/heimdalljs-graph/-/heimdalljs-graph-1.0.0.tgz#0059857952988e54f3a74bb23edaf669f8eaf6af"
+  integrity sha512-v2AsTERBss0ukm/Qv4BmXrkwsT5x6M1V5Om6E8NcDQ/ruGkERsfsuLi5T8jx8qWzKMGYlwzAd7c/idymxRaPzA==
+
+heimdalljs-logger@^0.1.10, heimdalljs-logger@^0.1.7, heimdalljs-logger@^0.1.9:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/heimdalljs-logger/-/heimdalljs-logger-0.1.10.tgz#90cad58aabb1590a3c7e640ddc6a4cd3a43faaf7"
+  integrity sha512-pO++cJbhIufVI/fmB/u2Yty3KJD0TqNPecehFae0/eps0hkZ3b4Zc/PezUMOpYuHFQbA7FxHZxa305EhmjLj4g==
+  dependencies:
+    debug "^2.2.0"
+    heimdalljs "^0.2.6"
+
+heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3, heimdalljs@^0.2.5, heimdalljs@^0.2.6:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/heimdalljs/-/heimdalljs-0.2.6.tgz#b0eebabc412813aeb9542f9cc622cb58dbdcd9fe"
+  integrity sha512-o9bd30+5vLBvBtzCPwwGqpry2+n0Hi6H1+qwt6y+0kwRHGGF8TFIhJPmnuM0xO97zaKrDZMwO/V56fAnn8m/tA==
+  dependencies:
+    rsvp "~3.2.1"
+
+hmac-drbg@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
+home-or-tmp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg=
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.1"
+
+homedir-polyfill@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
+  dependencies:
+    parse-passwd "^1.0.0"
+
+hosted-git-info@^2.7.1:
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+
+html-encoding-sniffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
+  dependencies:
+    whatwg-encoding "^1.0.1"
+
+http-cache-semantics@3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
+
+http-errors@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
+http-errors@~1.7.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+"http-parser-js@>=0.4.0 <0.4.11":
+  version "0.4.10"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
+  integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
+
+http-proxy@^1.13.1, http-proxy@^1.18.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a"
+  integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==
+  dependencies:
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
+
+https@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https/-/https-1.0.0.tgz#3c37c7ae1a8eeb966904a2ad1e975a194b7ed3a4"
+  integrity sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q=
+
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+ieee754@^1.1.4:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
+
+ignore-walk@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
+  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
+  dependencies:
+    minimatch "^3.0.4"
+
+ignore@^4.0.3, ignore@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+
+ignore@^5.1.1, ignore@^5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
+  integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
+
+import-fresh@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
+  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
+
+infer-owner@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
+
+inflection@^1.12.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
+  integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
+
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+ini@^1.3.4, ini@~1.3.0:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+
+inline-source-map-comment@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/inline-source-map-comment/-/inline-source-map-comment-1.0.5.tgz#50a8a44c2a790dfac441b5c94eccd5462635faf6"
+  integrity sha1-UKikTCp5DfrEQbXJTszVRiY1+vY=
+  dependencies:
+    chalk "^1.0.0"
+    get-stdin "^4.0.1"
+    minimist "^1.1.1"
+    sum-up "^1.0.1"
+    xtend "^4.0.0"
+
+inquirer@^6, inquirer@^6.2.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
+  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
+  dependencies:
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^2.0.0"
+    lodash "^4.17.12"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.4.0"
+    string-width "^2.1.0"
+    strip-ansi "^5.1.0"
+    through "^2.3.6"
+
+inquirer@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29"
+  integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^3.0.0"
+    cli-cursor "^3.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.15"
+    mute-stream "0.0.8"
+    run-async "^2.4.0"
+    rxjs "^6.5.3"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
+
+into-stream@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
+  integrity sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=
+  dependencies:
+    from2 "^2.1.1"
+    p-is-promise "^1.1.0"
+
+invariant@^2.2.2, invariant@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
+  dependencies:
+    loose-envify "^1.0.0"
+
+ipaddr.js@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
+is-callable@^1.1.4, is-callable@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
+  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-date-object@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
+  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-extendable@^0.1.0, is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  dependencies:
+    is-plain-object "^2.0.4"
+
+is-extglob@^2.1.0, is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-finite@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
+  integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-git-url@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b"
+  integrity sha1-U/aEzRQyhbUsMkS05vKCU1J69ms=
+
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-glob@^4.0.0, is-glob@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
+  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
+
+is-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
+  integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
+
+is-plain-obj@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
+  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  dependencies:
+    isobject "^3.0.1"
+
+is-redirect@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
+  integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
+
+is-regex@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
+  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
+  dependencies:
+    has "^1.0.3"
+
+is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
+  integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
+
+is-stream@^1.0.0, is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
+is-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
+  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+
+is-symbol@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
+  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+  dependencies:
+    has-symbols "^1.0.1"
+
+is-type@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/is-type/-/is-type-0.0.1.tgz#f651d85c365d44955d14a51d8d7061f3f6b4779c"
+  integrity sha1-9lHYXDZdRJVdFKUdjXBh8/a0d5w=
+  dependencies:
+    core-util-is "~1.0.0"
+
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
+is-windows@^1.0.1, is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isarray@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
+
+isbinaryfile@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
+  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
+  dependencies:
+    buffer-alloc "^1.2.0"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+istextorbinary@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.1.0.tgz#dbed2a6f51be2f7475b68f89465811141b758874"
+  integrity sha1-2+0qb1G+L3R1to+JRlgRFBt1iHQ=
+  dependencies:
+    binaryextensions "1 || 2"
+    editions "^1.1.1"
+    textextensions "1 || 2"
+
+isurl@^1.0.0-alpha5:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
+  integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
+  dependencies:
+    has-to-string-tag-x "^1.2.0"
+    is-object "^1.0.1"
+
+jquery@^3.4.1:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
+  integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
+
+js-reporters@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/js-reporters/-/js-reporters-1.2.1.tgz#f88c608e324a3373a95bcc45ad305e5c979c459b"
+  integrity sha1-+IxgjjJKM3OpW8xFrTBeXJecRZs=
+
+js-string-escape@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+  integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=
+
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
+
+js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.2.5, js-yaml@^3.2.7:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
+jsdom@^12.0.0:
+  version "12.2.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-12.2.0.tgz#7cf3f5b5eafd47f8f09ca52315d367ff6e95de23"
+  integrity sha512-QPOggIJ8fquWPLaYYMoh+zqUmdphDtu1ju0QGTitZT1Yd8I5qenPpXM1etzUegu3MjVp8XPzgZxdn8Yj7e40ig==
+  dependencies:
+    abab "^2.0.0"
+    acorn "^6.0.2"
+    acorn-globals "^4.3.0"
+    array-equal "^1.0.0"
+    cssom "^0.3.4"
+    cssstyle "^1.1.1"
+    data-urls "^1.0.1"
+    domexception "^1.0.1"
+    escodegen "^1.11.0"
+    html-encoding-sniffer "^1.0.2"
+    nwsapi "^2.0.9"
+    parse5 "5.1.0"
+    pn "^1.1.0"
+    request "^2.88.0"
+    request-promise-native "^1.0.5"
+    saxes "^3.1.3"
+    symbol-tree "^3.2.2"
+    tough-cookie "^2.4.3"
+    w3c-hr-time "^1.0.1"
+    webidl-conversions "^4.0.2"
+    whatwg-encoding "^1.0.5"
+    whatwg-mimetype "^2.2.0"
+    whatwg-url "^7.0.0"
+    ws "^6.1.0"
+    xml-name-validator "^3.0.0"
+
+jsesc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
+
+jsesc@^2.5.0, jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+
+jsesc@~0.3.x:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.3.0.tgz#1bf5ee63b4539fe2e26d0c1e99c240b97a457972"
+  integrity sha1-G/XuY7RTn+LibQwemcJAuXpFeXI=
+
+jsesc@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
+
+json-buffer@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
+
+json-parse-better-errors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+
+json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
+  dependencies:
+    jsonify "~0.0.0"
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
+json5@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+  dependencies:
+    minimist "^1.2.5"
+
+jsonfile@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+keyv@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
+  integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==
+  dependencies:
+    json-buffer "3.0.0"
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
+leek@0.0.24:
+  version "0.0.24"
+  resolved "https://registry.yarnpkg.com/leek/-/leek-0.0.24.tgz#e400e57f0e60d8ef2bd4d068dc428a54345dbcda"
+  integrity sha1-5ADlfw5g2O8r1NBo3EKKVDRdvNo=
+  dependencies:
+    debug "^2.1.0"
+    lodash.assign "^3.2.0"
+    rsvp "^3.0.21"
+
+leven@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+
+levenary@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
+  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
+  dependencies:
+    leven "^3.1.0"
+
+levn@^0.3.0, levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+line-stream@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/line-stream/-/line-stream-0.0.0.tgz#888b7cc7951c6a05ce4d696dd1e6b8262371bb45"
+  integrity sha1-iIt8x5UcagXOTWlt0ea4JiNxu0U=
+  dependencies:
+    through "~2.2.0"
+
+linkify-it@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
+  integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==
+  dependencies:
+    uc.micro "^1.0.1"
+
+livereload-js@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c"
+  integrity sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==
+
+loader-runner@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
+  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
+
+loader-utils@^1.1.0, loader-utils@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
+loader.js@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/loader.js/-/loader.js-4.7.0.tgz#a1a52902001c83631efde9688b8ab3799325ef1f"
+  integrity sha512-9M2KvGT6duzGMgkOcTkWb+PR/Q2Oe54df/tLgHGVmFpAmtqJ553xJh6N63iFYI2yjo2PeJXbS5skHi/QpJq4vA==
+
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+lodash._baseassign@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
+  integrity sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=
+  dependencies:
+    lodash._basecopy "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash._basecopy@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
+  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
+
+lodash._baseflatten@^3.0.0:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz#0770ff80131af6e34f3b511796a7ba5214e65ff7"
+  integrity sha1-B3D/gBMa9uNPO1EXlqe6UhTmX/c=
+  dependencies:
+    lodash.isarguments "^3.0.0"
+    lodash.isarray "^3.0.0"
+
+lodash._bindcallback@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
+  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
+
+lodash._createassigner@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
+  integrity sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=
+  dependencies:
+    lodash._bindcallback "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+    lodash.restparam "^3.0.0"
+
+lodash._getnative@^3.0.0:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
+
+lodash._isiterateecall@^3.0.0:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
+  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
+
+lodash._reinterpolate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
+
+lodash.assign@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"
+  integrity sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=
+  dependencies:
+    lodash._baseassign "^3.0.0"
+    lodash._createassigner "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash.assignin@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
+  integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI=
+
+lodash.castarray@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115"
+  integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU=
+
+lodash.clonedeep@^4.4.1:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+
+lodash.debounce@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz#812211c378a94cc29d5aa4e3346cf0bfce3a7df5"
+  integrity sha1-gSIRw3ipTMKdWqTjNGzwv846ffU=
+  dependencies:
+    lodash._getnative "^3.0.0"
+
+lodash.defaultsdeep@^4.6.0, lodash.defaultsdeep@^4.6.1:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6"
+  integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==
+
+lodash.find@^4.5.1:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1"
+  integrity sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E=
+
+lodash.flatten@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-3.0.2.tgz#de1cf57758f8f4479319d35c3e9cc60c4501938c"
+  integrity sha1-3hz1d1j49EeTGdNcPpzGDEUBk4w=
+  dependencies:
+    lodash._baseflatten "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+
+lodash.foreach@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
+  integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=
+
+lodash.isarguments@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
+
+lodash.isarray@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
+
+lodash.keys@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
+  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
+  dependencies:
+    lodash._getnative "^3.0.0"
+    lodash.isarguments "^3.0.0"
+    lodash.isarray "^3.0.0"
+
+lodash.merge@^4.6.0, lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lodash.omit@^4.1.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
+  integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=
+
+lodash.restparam@^3.0.0:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
+
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+
+lodash.template@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+
+lodash.uniq@^4.2.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
+lodash.uniqby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
+  integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
+
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.6.1:
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+
+log-symbols@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+  dependencies:
+    chalk "^2.0.1"
+
+loose-envify@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
+lower-case@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7"
+  integrity sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==
+  dependencies:
+    tslib "^1.10.0"
+
+lowercase-keys@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+  integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=
+
+lowercase-keys@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
+
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
+make-dir@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
+make-dir@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
+makeerror@1.0.x:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+  dependencies:
+    tmpl "1.0.x"
+
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  dependencies:
+    object-visit "^1.0.0"
+
+markdown-it-terminal@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.1.0.tgz#545abd8dd01c3d62353bfcea71db580b51d22bd9"
+  integrity sha1-VFq9jdAcPWI1O/zqcdtYC1HSK9k=
+  dependencies:
+    ansi-styles "^3.0.0"
+    cardinal "^1.0.0"
+    cli-table "^0.3.1"
+    lodash.merge "^4.6.0"
+    markdown-it "^8.3.1"
+
+markdown-it@^8.3.1:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
+  integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==
+  dependencies:
+    argparse "^1.0.7"
+    entities "~1.1.1"
+    linkify-it "^2.0.0"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
+markdown-it@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-9.1.0.tgz#df9601c168568704d554b1fff9af0c5b561168d9"
+  integrity sha512-xHKG4C8iPriyfu/jc2hsCC045fKrMQ0VexX2F1FGYiRxDxqMB2aAhF8WauJ3fltn2kb90moGBkiiEdooGIg55w==
+  dependencies:
+    argparse "^1.0.7"
+    entities "~1.1.1"
+    linkify-it "^2.0.0"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
+matcher-collection@^1.0.0, matcher-collection@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.1.2.tgz#1076f506f10ca85897b53d14ef54f90a5c426838"
+  integrity sha512-YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g==
+  dependencies:
+    minimatch "^3.0.2"
+
+matcher-collection@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-2.0.1.tgz#90be1a4cf58d6f2949864f65bb3b0f3e41303b29"
+  integrity sha512-daE62nS2ZQsDg9raM0IlZzLmI2u+7ZapXBwdoeBUKAYERPDDIc0qNqA8E0Rp2D+gspKR7BgIFP52GeujaGXWeQ==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    minimatch "^3.0.2"
+
+md5-hex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-2.0.0.tgz#d0588e9f1c74954492ecd24ac0ac6ce997d92e33"
+  integrity sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=
+  dependencies:
+    md5-o-matic "^0.1.1"
+
+md5-o-matic@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3"
+  integrity sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=
+
+md5.js@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+mdurl@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+
+memory-fs@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
+  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+memory-fs@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+memory-streams@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/memory-streams/-/memory-streams-0.1.3.tgz#d9b0017b4b87f1d92f55f2745c9caacb1dc93ceb"
+  integrity sha512-qVQ/CjkMyMInPaaRMrwWNDvf6boRZXaT/DbQeMYcCWuXPEBf1v8qChOc9OlEVQp2uOvRXa1Qu30fLmKhY6NipA==
+  dependencies:
+    readable-stream "~1.0.2"
+
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
+merge-trees@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-1.0.1.tgz#ccbe674569787f9def17fd46e6525f5700bbd23e"
+  integrity sha1-zL5nRWl4f53vF/1G5lJfVwC70j4=
+  dependencies:
+    can-symlink "^1.0.0"
+    fs-tree-diff "^0.5.4"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+
+merge-trees@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-2.0.0.tgz#a560d796e566c5d9b2c40472a2967cca48d85161"
+  integrity sha512-5xBbmqYBalWqmhYm51XlohhkmVOua3VAUrrWh8t9iOkaLpS6ifqm/UVuUjQCeDVJ9Vx3g2l6ihfkbLSTeKsHbw==
+  dependencies:
+    fs-updater "^1.0.4"
+    heimdalljs "^0.2.5"
+
+merge2@^1.2.3, merge2@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
+  integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
+
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+
+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
+micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
+mime-db@1.44.0, "mime-db@>= 1.43.0 < 2":
+  version "1.44.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
+
+mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.26, mime-types@~2.1.19, mime-types@~2.1.24:
+  version "2.1.27"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
+  dependencies:
+    mime-db "1.44.0"
+
+mime@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
+mimic-fn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+mimic-response@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
+minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
+
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.1.tgz#827ba4e7593464e7c221e8c5bed930904ee2c455"
+  integrity sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==
+
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+minipass@^2.2.0, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
+  dependencies:
+    minipass "^2.9.0"
+
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^3.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
+mixin-deep@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.0:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  dependencies:
+    minimist "^1.2.5"
+
+mktemp@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
+  integrity sha1-bQUVYRyKjITkhKogABKbmOmB/ws=
+
+morgan@^1.9.1:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
+  integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==
+  dependencies:
+    basic-auth "~2.0.1"
+    debug "2.6.9"
+    depd "~2.0.0"
+    on-finished "~2.3.0"
+    on-headers "~1.0.2"
+
+mout@^1.0.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/mout/-/mout-1.2.2.tgz#c9b718a499806a0632cede178e80f436259e777d"
+  integrity sha512-w0OUxFEla6z3d7sVpMZGBCpQvYh8PHS1wZ6Wu9GNKHMpAHWJ0if0LsQZh3DlOqw55HlhJEOMLpFnwtxp99Y5GA==
+
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
+ms@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+mustache@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.2.1.tgz#89e78a9d207d78f2799b1e95764a25bf71a28322"
+  integrity sha512-RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA==
+
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
+nan@^2.12.1:
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
+  integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+
+needle@^2.2.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a"
+  integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+
+neo-async@^2.5.0, neo-async@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
+  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
+no-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz#c21b434c1ffe48b39087e86cfb4d2582e9df18f8"
+  integrity sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==
+  dependencies:
+    lower-case "^2.0.1"
+    tslib "^1.10.0"
+
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
+
+node-libs-browser@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
+  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^3.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.1"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.11.0"
+    vm-browserify "^1.0.1"
+
+node-modules-path@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/node-modules-path/-/node-modules-path-1.0.2.tgz#e3acede9b7baf4bc336e3496b58e5b40d517056e"
+  integrity sha512-6Gbjq+d7uhkO7epaKi5DNgUJn7H0gEyA4Jg0Mo1uQOi3Rk50G83LtmhhFyw0LxnAFhtlspkiiw52ISP13qzcBg==
+
+node-notifier@^5.0.1:
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.3.tgz#cb72daf94c93904098e28b9c590fd866e464bd50"
+  integrity sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==
+  dependencies:
+    growly "^1.3.0"
+    is-wsl "^1.1.0"
+    semver "^5.5.0"
+    shellwords "^0.1.1"
+    which "^1.3.0"
+
+node-pre-gyp@*:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
+  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4.4.2"
+
+node-releases@^1.1.53:
+  version "1.1.53"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
+  integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
+
+node-watch@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.6.1.tgz#b9874111ce9f5841b1c7596120206c7b825be0e9"
+  integrity sha512-gwQiR7weFRV8mAtT0x0kXkZ18dfRLB45xH7q0hCOVQMLfLb2f1ZaSvR57q4/b/Vj6B0RwMNJYbvb69e1yM7qEA==
+
+nopt@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
+  dependencies:
+    abbrev "1"
+
+nopt@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
+  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
+normalize-path@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+normalize-url@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
+  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
+  dependencies:
+    prepend-http "^2.0.0"
+    query-string "^5.0.1"
+    sort-keys "^2.0.0"
+
+npm-bundled@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
+  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
+  dependencies:
+    npm-normalize-package-bin "^1.0.1"
+
+npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+
+npm-package-arg@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
+  integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
+  dependencies:
+    hosted-git-info "^2.7.1"
+    osenv "^0.1.5"
+    semver "^5.6.0"
+    validate-npm-package-name "^3.0.0"
+
+npm-packlist@^1.1.6:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
+  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+    npm-normalize-package-bin "^1.0.1"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  dependencies:
+    path-key "^2.0.0"
+
+npm-run-path@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5"
+  integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==
+  dependencies:
+    path-key "^3.0.0"
+
+npmlog@^4.0.0, npmlog@^4.0.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
+nwsapi@^2.0.9:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
+  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+object-assign@4.1.1, object-assign@^4.1.0, object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
+object-component@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
+  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
+
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-hash@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
+  integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
+
+object-inspect@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
+  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
+
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  dependencies:
+    isobject "^3.0.0"
+
+object.assign@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+  dependencies:
+    define-properties "^1.1.2"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    object-keys "^1.0.11"
+
+object.getownpropertydescriptors@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
+  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  dependencies:
+    isobject "^3.0.1"
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  dependencies:
+    ee-first "1.1.1"
+
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
+  dependencies:
+    mimic-fn "^1.0.0"
+
+onetime@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
+  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+  dependencies:
+    mimic-fn "^2.1.0"
+
+optionator@^0.8.1, optionator@^0.8.2:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
+ora@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318"
+  integrity sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==
+  dependencies:
+    chalk "^2.4.2"
+    cli-cursor "^2.1.0"
+    cli-spinners "^2.0.0"
+    log-symbols "^2.2.0"
+    strip-ansi "^5.2.0"
+    wcwidth "^1.0.1"
+
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
+
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
+osenv@^0.1.3, osenv@^0.1.4, osenv@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+p-cancelable@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
+  integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
+
+p-defer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83"
+  integrity sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw==
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+p-finally@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
+  integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==
+
+p-is-promise@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
+
+p-limit@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
+  dependencies:
+    p-try "^1.0.0"
+
+p-limit@^2.0.0, p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
+  dependencies:
+    p-limit "^1.1.0"
+
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+  dependencies:
+    p-limit "^2.0.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-timeout@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
+  integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==
+  dependencies:
+    p-finally "^1.0.0"
+
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+package-json@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
+  integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=
+  dependencies:
+    got "^6.7.1"
+    registry-auth-token "^3.0.1"
+    registry-url "^3.0.3"
+    semver "^5.1.0"
+
+pako@~1.0.5:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
+
+parallel-transform@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
+  dependencies:
+    cyclist "^1.0.1"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
+
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
+parse-asn1@^5.0.0:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e"
+  integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==
+  dependencies:
+    asn1.js "^4.0.0"
+    browserify-aes "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+    safe-buffer "^5.1.1"
+
+parse-passwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
+
+parse5@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
+  integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==
+
+parseqs@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
+  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
+  dependencies:
+    better-assert "~1.0.0"
+
+parseuri@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
+  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
+  dependencies:
+    better-assert "~1.0.0"
+
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+
+path-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
+
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-is-absolute@1.0.1, path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-is-inside@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
+
+path-key@^2.0.0, path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
+path-key@^3.0.0, path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+
+path-posix@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/path-posix/-/path-posix-1.0.0.tgz#06b26113f56beab042545a23bfa88003ccac260f"
+  integrity sha1-BrJhE/Vr6rBCVFojv6iAA8ysJg8=
+
+path-root-regex@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
+
+path-root@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
+  dependencies:
+    path-root-regex "^0.1.0"
+
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
+  dependencies:
+    pify "^3.0.0"
+
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+pbkdf2@^3.0.3:
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
+  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+picomatch@^2.0.5, picomatch@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
+  dependencies:
+    find-up "^3.0.0"
+
+pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
+  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
+  dependencies:
+    find-up "^2.1.0"
+
+pn@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
+  integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
+
+portfinder@^1.0.25:
+  version "1.0.25"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
+  integrity sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==
+  dependencies:
+    async "^2.6.2"
+    debug "^3.1.1"
+    mkdirp "^0.5.1"
+
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+
+prepend-http@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
+
+prepend-http@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
+
+printf@^0.5.1:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/printf/-/printf-0.5.3.tgz#8b7eec278d886833312238b2bf42b2b6f250880a"
+  integrity sha512-t3lYN6vPU5PZXDiEZZqoyXvN8wCsBfi8gPoxTKo2e5hhV673t/KUh+mfO8P8lCOCDC/BWcOGIxKyebxc5FuqLA==
+
+private@^0.1.6, private@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
+
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+process-relative-require@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/process-relative-require/-/process-relative-require-1.0.0.tgz#1590dfcf5b8f2983ba53e398446b68240b4cc68a"
+  integrity sha1-FZDfz1uPKYO6U+OYRGtoJAtMxoo=
+  dependencies:
+    node-modules-path "^1.0.0"
+
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+
+progress@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
+
+promise-map-series@^0.2.1, promise-map-series@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.2.3.tgz#c2d377afc93253f6bd03dbb77755eb88ab20a847"
+  integrity sha1-wtN3r8kyU/a9A9u3d1XriKsgqEc=
+  dependencies:
+    rsvp "^3.0.14"
+
+promise.prototype.finally@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz#b8af89160c9c673cefe3b4c4435b53cfd0287067"
+  integrity sha512-A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.0"
+    function-bind "^1.1.1"
+
+proxy-addr@~2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
+  integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.9.1"
+
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
+
+psl@^1.1.28:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+
+public-encrypt@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
+
+pump@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.3:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
+  dependencies:
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
+
+punycode@^1.2.4:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+punycode@^2.1.0, punycode@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+qs@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
+
+qs@^6.4.0:
+  version "6.9.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.3.tgz#bfadcd296c2d549f1dffa560619132c977f5008e"
+  integrity sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==
+
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+query-string@^5.0.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
+  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
+  dependencies:
+    decode-uri-component "^0.2.0"
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
+
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+
+quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408"
+  integrity sha1-urAqJCq4+w3XWKPJd2sy+aXZRAg=
+  dependencies:
+    mktemp "~0.4.0"
+    rimraf "^2.5.4"
+    underscore.string "~3.3.4"
+
+qunit-dom@^0.9.2:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/qunit-dom/-/qunit-dom-0.9.2.tgz#cc7bb777e4f5faa749eca843f54e199755df8473"
+  integrity sha512-BPf7OZjhXo9ekgsViNjQVS9BWkm2yQsPvBoy0juvt5nOFlcBVVwHSYsgpsJOunWkI1IgA3eStAC9mQx3Zw734g==
+  dependencies:
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.1"
+
+qunit@^2.9.3:
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.9.3.tgz#9522a088e76f0782f70a45db92f2fd14db311bcc"
+  integrity sha512-RH4VYSaVsNRDthMFFboTJAJ8q4kJM5LvOqWponKUYPEAeOcmc/YFV1QsZ7ikknA3TjqliWFJYEV63vvVXaALmQ==
+  dependencies:
+    commander "2.12.2"
+    js-reporters "1.2.1"
+    minimatch "3.0.4"
+    node-watch "0.6.1"
+    resolve "1.9.0"
+
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
+range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+raw-body@~1.1.0:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
+  integrity sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=
+  dependencies:
+    bytes "1"
+    string_decoder "0.10"
+
+rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+"readable-stream@2 || 3":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+readable-stream@~1.0.2:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readdirp@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
+    readable-stream "^2.0.2"
+
+recast@^0.18.1:
+  version "0.18.10"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.18.10.tgz#605ebbe621511eb89b6356a7e224bff66ed91478"
+  integrity sha512-XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ==
+  dependencies:
+    ast-types "0.13.3"
+    esprima "~4.0.0"
+    private "^0.1.8"
+    source-map "~0.6.1"
+
+redeyed@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-1.0.1.tgz#e96c193b40c0816b00aec842698e61185e55498a"
+  integrity sha1-6WwZO0DAgWsArshCaY5hGF5VSYo=
+  dependencies:
+    esprima "~3.0.0"
+
+regenerate-unicode-properties@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
+  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+  dependencies:
+    regenerate "^1.4.0"
+
+regenerate@^1.2.1, regenerate@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
+
+regenerator-runtime@^0.10.5:
+  version "0.10.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
+  integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=
+
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
+
+regenerator-runtime@^0.13.4:
+  version "0.13.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
+  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
+
+regenerator-runtime@^0.9.5:
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz#d33eb95d0d2001a4be39659707c51b0cb71ce029"
+  integrity sha1-0z65XQ0gAaS+OWWXB8UbDLcc4Ck=
+
+regenerator-transform@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
+  integrity sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==
+  dependencies:
+    babel-runtime "^6.18.0"
+    babel-types "^6.19.0"
+    private "^0.1.6"
+
+regenerator-transform@^0.14.2:
+  version "0.14.4"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
+  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
+  dependencies:
+    "@babel/runtime" "^7.8.4"
+    private "^0.1.8"
+
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
+regexpp@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
+  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+
+regexpp@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+
+regexpu-core@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+  integrity sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+regexpu-core@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
+  integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
+  dependencies:
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^8.2.0"
+    regjsgen "^0.5.1"
+    regjsparser "^0.6.4"
+    unicode-match-property-ecmascript "^1.0.4"
+    unicode-match-property-value-ecmascript "^1.2.0"
+
+registry-auth-token@^3.0.1:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e"
+  integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==
+  dependencies:
+    rc "^1.1.6"
+    safe-buffer "^5.0.1"
+
+registry-url@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
+  integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI=
+  dependencies:
+    rc "^1.0.1"
+
+regjsgen@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
+
+regjsgen@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
+  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
+
+regjsparser@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
+  dependencies:
+    jsesc "~0.5.0"
+
+regjsparser@^0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
+  integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
+  dependencies:
+    jsesc "~0.5.0"
+
+remote-git-tags@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/remote-git-tags/-/remote-git-tags-2.0.0.tgz#1152f39cf8b5268ae0e4307636ef741ec341664c"
+  integrity sha1-EVLznPi1Jorg5DB2Nu90HsNBZkw=
+  dependencies:
+    git-fetch-pack "^0.1.1"
+    git-transport-protocol "^0.1.0"
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+
+repeat-element@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+
+repeating@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
+  dependencies:
+    is-finite "^1.0.0"
+
+request-promise-core@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
+  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
+  dependencies:
+    lodash "^4.17.15"
+
+request-promise-native@^1.0.5:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
+  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
+  dependencies:
+    request-promise-core "1.1.3"
+    stealthy-require "^1.1.1"
+    tough-cookie "^2.3.3"
+
+request@^2.88.0:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+
+reselect@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
+  integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
+
+resolve-dir@^1.0.0, resolve-dir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
+  dependencies:
+    expand-tilde "^2.0.0"
+    global-modules "^1.0.0"
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+resolve-package-path@^1.0.11, resolve-package-path@^1.2.2, resolve-package-path@^1.2.6, resolve-package-path@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-1.2.7.tgz#2a7bc37ad96865e239330e3102c31322847e652e"
+  integrity sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q==
+  dependencies:
+    path-root "^0.1.1"
+    resolve "^1.10.0"
+
+resolve-package-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-2.0.0.tgz#7f258ab86ff074fff4ff8027a28f94d17d6fb1df"
+  integrity sha512-/CLuzodHO2wyyHTzls5Qr+EFeG6RcW4u6//gjYvUfcfyuplIX1SSccU+A5A9A78Gmezkl3NBkFAMxLbzTY9TJA==
+  dependencies:
+    path-root "^0.1.1"
+    resolve "^1.13.1"
+
+resolve-path@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
+  integrity sha1-xL2p9e+y/OZSR4c6s2u02DT+Fvc=
+  dependencies:
+    http-errors "~1.6.2"
+    path-is-absolute "1.0.1"
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+
+resolve@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06"
+  integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==
+  dependencies:
+    path-parse "^1.0.6"
+
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.0, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.7.1, resolve@^1.8.1:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
+  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+  dependencies:
+    path-parse "^1.0.6"
+
+responselike@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
+  dependencies:
+    lowercase-keys "^1.0.0"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+rimraf@2.6.3, rimraf@~2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@^3.0.1, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
+rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
+
+rsvp@^4.6.1, rsvp@^4.7.0, rsvp@^4.8.1, rsvp@^4.8.2, rsvp@^4.8.4, rsvp@^4.8.5:
+  version "4.8.5"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
+
+rsvp@~3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a"
+  integrity sha1-B8tKXfJa3Z6Cbrxn3Mn9idsn2Eo=
+
+run-async@^2.2.0, run-async@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
+run-parallel@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
+  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
+
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
+  dependencies:
+    aproba "^1.1.1"
+
+rxjs@^6.4.0, rxjs@^6.5.3:
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
+  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
+  dependencies:
+    tslib "^1.9.0"
+
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
+  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+
+safe-json-parse@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
+  integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  dependencies:
+    ret "~0.1.10"
+
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+sane@^4.0.0, sane@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
+  dependencies:
+    "@cnakazawa/watch" "^1.0.3"
+    anymatch "^2.0.0"
+    capture-exit "^2.0.0"
+    exec-sh "^0.3.2"
+    execa "^1.0.0"
+    fb-watchman "^2.0.0"
+    micromatch "^3.1.4"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+
+sax@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+saxes@^3.1.3:
+  version "3.1.11"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b"
+  integrity sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==
+  dependencies:
+    xmlchars "^2.1.1"
+
+schema-utils@^0.4.4:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
+  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+
+schema-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-errors "^1.0.0"
+    ajv-keywords "^3.1.0"
+
+schema-utils@^2.6.5:
+  version "2.6.6"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz#299fe6bd4a3365dc23d99fd446caff8f1d6c330c"
+  integrity sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==
+  dependencies:
+    ajv "^6.12.0"
+    ajv-keywords "^3.4.1"
+
+semver@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
+  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+
+semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
+serialize-javascript@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
+  integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
+
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
+
+set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+setimmediate@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+shellwords@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+
+silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.0, silent-error@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/silent-error/-/silent-error-1.1.1.tgz#f72af5b0d73682a2ba1778b7e32cd8aa7c2d8662"
+  integrity sha512-n4iEKyNcg4v6/jpb3c0/iyH2G1nzUNl7Gpqtn/mHIJK9S/q/7MCfoO4rwVOoO59qPFIc0hVHvMbiOJ0NdtxKKw==
+  dependencies:
+    debug "^2.2.0"
+
+simple-html-tokenizer@^0.5.9:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.9.tgz#1a83fe97f5a3e39b335fddf71cfe9b0263b581c2"
+  integrity sha512-w/3FEDN94r4JQ9WoYrIr8RqDIPZdyNkdpbK9glFady1CAEyD97XWCv8HFetQO21w81e7h7Nh59iYTyG1mUJftg==
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
+
+slash@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+slice-ansi@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
+  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
+  dependencies:
+    ansi-styles "^3.2.0"
+    astral-regex "^1.0.0"
+    is-fullwidth-code-point "^2.0.0"
+
+snake-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.3.tgz#c598b822ab443fcbb145ae8a82c5e43526d5bbee"
+  integrity sha512-WM1sIXEO+rsAHBKjGf/6R1HBBcgbncKS08d2Aqec/mrDSpU80SiOU41hO7ny6DToHSyrlwTYzQBIK1FPSx4Y3Q==
+  dependencies:
+    dot-case "^3.0.3"
+    tslib "^1.10.0"
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
+socket.io-adapter@~1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
+  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
+
+socket.io-client@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz#14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4"
+  integrity sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==
+  dependencies:
+    backo2 "1.0.2"
+    base64-arraybuffer "0.1.5"
+    component-bind "1.0.0"
+    component-emitter "1.2.1"
+    debug "~4.1.0"
+    engine.io-client "~3.4.0"
+    has-binary2 "~1.0.2"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    object-component "0.0.3"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    socket.io-parser "~3.3.0"
+    to-array "0.1.4"
+
+socket.io-parser@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.0.tgz#2b52a96a509fdf31440ba40fed6094c7d4f1262f"
+  integrity sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==
+  dependencies:
+    component-emitter "1.2.1"
+    debug "~3.1.0"
+    isarray "2.0.1"
+
+socket.io-parser@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.0.tgz#370bb4a151df2f77ce3345ff55a7072cc6e9565a"
+  integrity sha512-/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ==
+  dependencies:
+    component-emitter "1.2.1"
+    debug "~4.1.0"
+    isarray "2.0.1"
+
+socket.io@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.3.0.tgz#cd762ed6a4faeca59bc1f3e243c0969311eb73fb"
+  integrity sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==
+  dependencies:
+    debug "~4.1.0"
+    engine.io "~3.4.0"
+    has-binary2 "~1.0.2"
+    socket.io-adapter "~1.1.0"
+    socket.io-client "2.3.0"
+    socket.io-parser "~3.4.0"
+
+sort-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+sort-object-keys@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
+  integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==
+
+sort-package-json@^1.23.1:
+  version "1.42.1"
+  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.42.1.tgz#4085582dfe83c60951673de2d5e4ce09dd47bd4e"
+  integrity sha512-+JgZVjEQhJuJ57RCUcF3rzESYCW/n3vCLWdhqBdPkerEgRTj5teGdJrCcj772zT1VzewqWk616/4xuRyIffyqQ==
+  dependencies:
+    detect-indent "^6.0.0"
+    detect-newline "3.1.0"
+    git-hooks-list "1.0.3"
+    globby "11.0.0"
+    is-plain-obj "2.1.0"
+    sort-object-keys "^1.1.3"
+
+source-list-map@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
+
+source-map-resolve@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-support@^0.4.15:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
+  dependencies:
+    source-map "^0.5.6"
+
+source-map-support@~0.5.12:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-url@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
+  integrity sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=
+
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+
+source-map@0.4.x, source-map@^0.4.2:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+source-map@~0.1.x:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
+  dependencies:
+    amdefine ">=0.0.4"
+
+sourcemap-validator@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/sourcemap-validator/-/sourcemap-validator-1.1.1.tgz#3d7d8a399ccab09c1fedc510d65436e25b1c386b"
+  integrity sha512-pq6y03Vs6HUaKo9bE0aLoksAcpeOo9HZd7I8pI6O480W/zxNZ9U32GfzgtPP0Pgc/K1JHna569nAbOk3X8/Qtw==
+  dependencies:
+    jsesc "~0.3.x"
+    lodash.foreach "^4.5.0"
+    lodash.template "^4.5.0"
+    source-map "~0.1.x"
+
+spawn-args@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/spawn-args/-/spawn-args-0.2.0.tgz#fb7d0bd1d70fd4316bd9e3dec389e65f9d6361bb"
+  integrity sha1-+30L0dcP1DFr2ePew4nmX51jYbs=
+
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  dependencies:
+    extend-shallow "^3.0.0"
+
+sprintf-js@^1.0.3:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+
+sri-toolbox@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/sri-toolbox/-/sri-toolbox-0.2.0.tgz#a7fea5c3fde55e675cf1c8c06f3ebb5c2935835e"
+  integrity sha1-p/6lw/3lXmdc8cjAbz67XCk1g14=
+
+sshpk@^1.7.0:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
+ssri@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  dependencies:
+    figgy-pudding "^3.5.1"
+
+stagehand@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stagehand/-/stagehand-1.0.0.tgz#79515e2ad3a02c63f8720c7df9b6077ae14276d9"
+  integrity sha512-zrXl0QixAtSHFyN1iv04xOBgplbT4HgC8T7g+q8ESZbDNi5uZbMtxLukFVXPJ5Nl7zCYvYcrT3Mj24WYCH93hw==
+  dependencies:
+    debug "^4.1.0"
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+
+stealthy-require@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
+
+stream-browserify@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
+stream-each@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
+  dependencies:
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
+
+stream-http@^2.7.2:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
+stream-shift@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
+
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+
+string-template@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
+  integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
+
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+"string-width@^1.0.2 || 2", string-width@^2.1.0, string-width@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string-width@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
+string-width@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
+
+string.prototype.trimend@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
+  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+
+string.prototype.trimleft@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
+  integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+    string.prototype.trimstart "^1.0.0"
+
+string.prototype.trimright@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"
+  integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+    string.prototype.trimend "^1.0.0"
+
+string.prototype.trimstart@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
+  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+
+string_decoder@0.10, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+
+string_decoder@^1.0.0, string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
+strip-bom@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
+  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
+strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
+styled_string@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/styled_string/-/styled_string-0.0.1.tgz#d22782bd81295459bc4f1df18c4bad8e94dd124a"
+  integrity sha1-0ieCvYEpVFm8Tx3xjEutjpTdEko=
+
+sum-up@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sum-up/-/sum-up-1.0.3.tgz#1c661f667057f63bcb7875aa1438bc162525156e"
+  integrity sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=
+  dependencies:
+    chalk "^1.0.0"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  dependencies:
+    has-flag "^4.0.0"
+
+symbol-tree@^3.2.2:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
+
+symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.3.1.tgz#9506dd64d8e98fa21dcbf4018d1eab23e77f71fe"
+  integrity sha512-0K91MEXFpBUaywiwSSkmKjnGcasG/rVBXFLJz5DrgGabpYD6N+3yZrfD6uUIfpuTu65DZLHi7N8CizHc07BPZA==
+
+sync-disk-cache@^1.3.3:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/sync-disk-cache/-/sync-disk-cache-1.3.4.tgz#53a2c5a09d8f4bb53160bce182a456ad71574024"
+  integrity sha512-GlkGeM81GPPEKz/lH7QUTbvqLq7K/IUTuaKDSMulP9XQ42glqNJIN/RKgSOw4y8vxL1gOVvj+W7ruEO4s36eCw==
+  dependencies:
+    debug "^2.1.3"
+    heimdalljs "^0.2.3"
+    mkdirp "^0.5.0"
+    rimraf "^2.2.8"
+    username-sync "^1.0.2"
+
+table@^5.2.3:
+  version "5.4.6"
+  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
+  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
+  dependencies:
+    ajv "^6.10.2"
+    lodash "^4.17.14"
+    slice-ansi "^2.1.0"
+    string-width "^3.0.0"
+
+tap-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-7.0.0.tgz#54db35302fda2c2ccc21954ad3be22b2cba42721"
+  integrity sha512-05G8/LrzqOOFvZhhAk32wsGiPZ1lfUrl+iV7+OkKgfofZxiceZWMHkKmow71YsyVQ8IvGBP2EjcIjE5gL4l5lA==
+  dependencies:
+    events-to-array "^1.0.1"
+    js-yaml "^3.2.7"
+    minipass "^2.2.0"
+
+tapable@^1.0.0, tapable@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
+
+tar@^4.4.2:
+  version "4.4.13"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.8.6"
+    minizlib "^1.2.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.3"
+
+temp@0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.0.tgz#61391795a11bd9738d4c4d7f55f012cb8f55edaa"
+  integrity sha512-YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ==
+  dependencies:
+    rimraf "~2.6.2"
+
+terser-webpack-plugin@^1.1.0:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
+  integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==
+  dependencies:
+    cacache "^12.0.2"
+    find-cache-dir "^2.1.0"
+    is-wsl "^1.1.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^2.1.2"
+    source-map "^0.6.1"
+    terser "^4.1.2"
+    webpack-sources "^1.4.0"
+    worker-farm "^1.7.0"
+
+terser@^4.1.2, terser@^4.3.9:
+  version "4.6.12"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.12.tgz#44b98aef8703fdb09a3491bf79b43faffc5b4fee"
+  integrity sha512-fnIwuaKjFPANG6MAixC/k1TDtnl1YlPLUlLVIxxGZUn1gfUx2+l3/zGNB72wya+lgsb50QBi2tUV75RiODwnww==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
+testem@^2.17.0:
+  version "2.17.0"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-2.17.0.tgz#1cb4a2a90524a088803dfe52fbf197a6fd73c883"
+  integrity sha512-PLkIlT523w5rTJPWwR4TL1EiAEa941ECV7d4pMqsB0YdnH+sCTz0loWMKCUSdhR+VijveAZ6anE/JHehE7KqMQ==
+  dependencies:
+    backbone "^1.1.2"
+    bluebird "^3.4.6"
+    charm "^1.0.0"
+    commander "^2.6.0"
+    compression "^1.7.4"
+    consolidate "^0.15.1"
+    execa "^1.0.0"
+    express "^4.10.7"
+    fireworm "^0.7.0"
+    glob "^7.0.4"
+    http-proxy "^1.13.1"
+    js-yaml "^3.2.5"
+    lodash.assignin "^4.1.0"
+    lodash.castarray "^4.4.0"
+    lodash.clonedeep "^4.4.1"
+    lodash.find "^4.5.1"
+    lodash.uniqby "^4.7.0"
+    mkdirp "^0.5.1"
+    mustache "^3.0.0"
+    node-notifier "^5.0.1"
+    npmlog "^4.0.0"
+    printf "^0.5.1"
+    rimraf "^2.4.4"
+    socket.io "^2.1.0"
+    spawn-args "^0.2.0"
+    styled_string "0.0.1"
+    tap-parser "^7.0.0"
+    tmp "0.0.33"
+    xmldom "^0.1.19"
+
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+
+"textextensions@1 || 2":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.6.0.tgz#d7e4ab13fe54e32e08873be40d51b74229b00fc4"
+  integrity sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==
+
+through2@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
+through2@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
+  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
+  dependencies:
+    readable-stream "2 || 3"
+
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+
+through@~2.2.0, through@~2.2.7:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.2.7.tgz#6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd"
+  integrity sha1-bo4hIAGR1OtqmfbwEN9Gqhxusr0=
+
+timed-out@^4.0.0, timed-out@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
+  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
+
+timers-browserify@^2.0.4:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f"
+  integrity sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==
+  dependencies:
+    setimmediate "^1.0.4"
+
+tiny-lr@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab"
+  integrity sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==
+  dependencies:
+    body "^5.1.0"
+    debug "^3.1.0"
+    faye-websocket "~0.10.0"
+    livereload-js "^2.3.0"
+    object-assign "^4.1.0"
+    qs "^6.4.0"
+
+tmp@0.0.28:
+  version "0.0.28"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120"
+  integrity sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=
+  dependencies:
+    os-tmpdir "~1.0.1"
+
+tmp@0.0.33, tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+tmp@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
+  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
+  dependencies:
+    rimraf "^2.6.3"
+
+tmpl@1.0.x:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+
+to-array@0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
+  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
+
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
+
+to-fast-properties@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
+
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+to-utf8@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/to-utf8/-/to-utf8-0.0.1.tgz#d17aea72ff2fba39b9e43601be7b3ff72e089852"
+  integrity sha1-0Xrqcv8vujm55DYBvns/9y4ImFI=
+
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
+tough-cookie@^2.3.3, tough-cookie@^2.4.3, tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tr46@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
+  dependencies:
+    punycode "^2.1.0"
+
+tree-sync@^1.2.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-1.4.0.tgz#314598d13abaf752547d9335b8f95d9a137100d6"
+  integrity sha512-YvYllqh3qrR5TAYZZTXdspnIhlKAYezPYw11ntmweoceu4VK+keN356phHRIIo1d+RDmLpHZrUlmxga2gc9kSQ==
+  dependencies:
+    debug "^2.2.0"
+    fs-tree-diff "^0.5.6"
+    mkdirp "^0.5.1"
+    quick-temp "^0.1.5"
+    walk-sync "^0.3.3"
+
+tree-sync@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-2.0.0.tgz#e51456731d5ac93b92f9a1d58dd383f76f0f2f39"
+  integrity sha512-AzeJnbmJjGVfWMTJ0T152fv8NDTbQc9ERY4nEs7Lmxd94Xah2bUS56+CcoTh6FB8qn2KjBMjC0mLNc731aVBqw==
+  dependencies:
+    debug "^2.2.0"
+    fs-tree-diff "^0.5.6"
+    mkdirp "^0.5.1"
+    quick-temp "^0.1.5"
+    walk-sync "^0.3.3"
+
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
+
+tslib@^1.10.0, tslib@^1.9.0:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
+  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
+
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-fest@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
+  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+
+typescript-memoize@^1.0.0-alpha.3:
+  version "1.0.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.0-alpha.3.tgz#699a5415f886694a8d6e2e5451bc28a39a6bc2f9"
+  integrity sha1-aZpUFfiGaUqNbi5UUbwoo5prwvk=
+  dependencies:
+    core-js "2.4.1"
+
+uc.micro@^1.0.1, uc.micro@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
+  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
+
+uglify-js@^3.1.4:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.1.tgz#a56a71c8caa2d36b5556cc1fd57df01ae3491539"
+  integrity sha512-JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA==
+  dependencies:
+    commander "~2.20.3"
+
+underscore.string@^3.2.2, underscore.string@~3.3.4:
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023"
+  integrity sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==
+  dependencies:
+    sprintf-js "^1.0.3"
+    util-deprecate "^1.0.2"
+
+underscore@>=1.8.3:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.10.2.tgz#73d6aa3668f3188e4adb0f1943bd12cfd7efaaaf"
+  integrity sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==
+
+unicode-canonical-property-names-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
+  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+
+unicode-match-property-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
+  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+  dependencies:
+    unicode-canonical-property-names-ecmascript "^1.0.4"
+    unicode-property-aliases-ecmascript "^1.0.4"
+
+unicode-match-property-value-ecmascript@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
+  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+
+unicode-property-aliases-ecmascript@^1.0.4:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
+  integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
+
+union-value@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^2.0.1"
+
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
+  dependencies:
+    imurmurhash "^0.1.4"
+
+unique-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
+  integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
+  dependencies:
+    crypto-random-string "^2.0.0"
+
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+untildify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-2.1.0.tgz#17eb2807987f76952e9c0485fc311d06a826a2e0"
+  integrity sha1-F+soB5h/dpUunASF/DEdBqgmouA=
+  dependencies:
+    os-homedir "^1.0.0"
+
+unzip-response@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
+  integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
+
+upath@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
+
+uri-js@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  dependencies:
+    punycode "^2.1.0"
+
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+
+url-parse-lax@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
+  integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
+  dependencies:
+    prepend-http "^1.0.1"
+
+url-parse-lax@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
+  dependencies:
+    prepend-http "^2.0.0"
+
+url-to-options@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
+  integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
+
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+
+username-sync@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.2.tgz#0a3697909fb7b5768d29e2921f573acfdd427592"
+  integrity sha512-ayNkOJdoNSGNDBE46Nkc+l6IXmeugbzahZLSMkwvgRWv5y5ZqNY2IrzcgmkR4z32sj1W3tM3TuTUMqkqBzO+RA==
+
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+util.promisify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"
+  integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.2"
+    has-symbols "^1.0.1"
+    object.getownpropertydescriptors "^2.1.0"
+
+util@0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
+  dependencies:
+    inherits "2.0.1"
+
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
+  dependencies:
+    inherits "2.0.3"
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+
+uuid@^3.3.2, uuid@^3.3.3:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
+validate-npm-package-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
+  dependencies:
+    builtins "^1.0.3"
+
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+vm-browserify@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
+  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
+
+w3c-hr-time@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
+  dependencies:
+    browser-process-hrtime "^1.0.0"
+
+walk-sync@^0.2.5:
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.2.7.tgz#b49be4ee6867657aeb736978b56a29d10fa39969"
+  integrity sha1-tJvk7mhnZXrrc2l4tWop0Q+jmWk=
+  dependencies:
+    ensure-posix-path "^1.0.0"
+    matcher-collection "^1.0.0"
+
+walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.2, walk-sync@^0.3.3:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.3.4.tgz#cf78486cc567d3a96b5b2237c6108017a5ffb9a4"
+  integrity sha512-ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==
+  dependencies:
+    ensure-posix-path "^1.0.0"
+    matcher-collection "^1.0.0"
+
+walk-sync@^1.0.0, walk-sync@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-1.1.4.tgz#81049f3d8095479b49574cfa5f558d7a252b127d"
+  integrity sha512-nowc9thB/Jg0KW4TgxoRjLLYRPvl3DB/98S89r4ZcJqq2B0alNcKDh6pzLkBSkPMzRSMsJghJHQi79qw0YWEkA==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^1.1.1"
+
+walk-sync@^2.0.0, walk-sync@^2.0.2:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.1.0.tgz#e214248e5f5cf497ddd87db5a2a02e47e29c6501"
+  integrity sha512-KpH9Xw64LNSx7/UI+3guRZvJWlDxVA4+KKb/4puRoVrG8GkvZRxnF3vhxdjgpoKJGL2TVg1OrtkXIE/VuGPLHQ==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^2.0.0"
+
+walker@~1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+  dependencies:
+    makeerror "1.0.x"
+
+watch-detector@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/watch-detector/-/watch-detector-1.0.0.tgz#c7b722d8695fee9ab6071e0f38f258e6adb22609"
+  integrity sha512-siywMl3fXK30Tlpu/dUBHhlpxhQmHdguZ8OIb813eU9lrVmmsJa9k0+n1HtJ+7p3SzFCPq2XbmR3GUYpPC3TBA==
+  dependencies:
+    heimdalljs-logger "^0.1.10"
+    semver "^6.3.0"
+    silent-error "^1.1.1"
+    tmp "^0.1.0"
+
+watchpack@^1.5.0:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2"
+  integrity sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==
+  dependencies:
+    chokidar "^2.1.8"
+    graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
+
+wcwidth@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  dependencies:
+    defaults "^1.0.3"
+
+webidl-conversions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
+
+webpack-sources@^1.3.0, webpack-sources@^1.4.0:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
+  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack@~4.28:
+  version "4.28.4"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.28.4.tgz#1ddae6c89887d7efb752adf0c3cd32b9b07eacd0"
+  integrity sha512-NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-module-context" "1.7.11"
+    "@webassemblyjs/wasm-edit" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+    acorn "^5.6.2"
+    acorn-dynamic-import "^3.0.0"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+    chrome-trace-event "^1.0.0"
+    enhanced-resolve "^4.1.0"
+    eslint-scope "^4.0.0"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.3.0"
+    loader-utils "^1.1.0"
+    memory-fs "~0.4.1"
+    micromatch "^3.1.8"
+    mkdirp "~0.5.0"
+    neo-async "^2.5.0"
+    node-libs-browser "^2.0.0"
+    schema-utils "^0.4.4"
+    tapable "^1.1.0"
+    terser-webpack-plugin "^1.1.0"
+    watchpack "^1.5.0"
+    webpack-sources "^1.3.0"
+
+websocket-driver@>=0.5.1:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"
+  integrity sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==
+  dependencies:
+    http-parser-js ">=0.4.0 <0.4.11"
+    safe-buffer ">=5.1.0"
+    websocket-extensions ">=0.1.1"
+
+websocket-extensions@>=0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+
+whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+  dependencies:
+    iconv-lite "0.4.24"
+
+whatwg-mimetype@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
+
+whatwg-url@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
+  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
+
+which@^1.2.14, which@^1.2.9, which@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+  dependencies:
+    string-width "^1.0.2 || 2"
+
+word-wrap@~1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
+wordwrap@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+
+wordwrap@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+
+worker-farm@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
+  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
+  dependencies:
+    errno "~0.1.7"
+
+workerpool@^2.3.0:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-2.3.3.tgz#49a70089bd55e890d68cc836a19419451d7c81d7"
+  integrity sha512-L1ovlYHp6UObYqElXXpbd214GgbEKDED0d3sj7pRdFXjNkb2+un/AUcCkceHizO0IVI6SOGGncrcjozruCkRgA==
+  dependencies:
+    object-assign "4.1.1"
+
+workerpool@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-3.1.2.tgz#b34e79243647decb174b7481ab5b351dc565c426"
+  integrity sha512-WJFA0dGqIK7qj7xPTqciWBH5DlJQzoPjsANvc3Y4hNB0SScT+Emjvt0jPPkDBUjBNngX1q9hHgt1Gfwytu6pug==
+  dependencies:
+    "@babel/core" "^7.3.4"
+    object-assign "4.1.1"
+    rsvp "^4.8.4"
+
+workerpool@^5.0.1:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-5.0.4.tgz#4f67cb70ff7550a27ab94de25b0b843cd92059a2"
+  integrity sha512-Sywova24Ow2NQ24JPB68bI89EdqMDjUXo4OpofK/QMD7C2ZVMloYBgQ5J3PChcBJHj2vspsmGx1/3nBKXtUkXQ==
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+write-file-atomic@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
+  dependencies:
+    imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
+    signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
+
+write@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
+  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
+  dependencies:
+    mkdirp "^0.5.1"
+
+ws@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
+  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  dependencies:
+    async-limiter "~1.0.0"
+
+ws@^7.1.2:
+  version "7.2.5"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz#abb1370d4626a5a9cd79d8de404aa18b3465d10d"
+  integrity sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==
+
+ws@~6.1.0:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
+  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
+  dependencies:
+    async-limiter "~1.0.0"
+
+xdg-basedir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
+  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
+
+xml-name-validator@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
+
+xmlchars@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
+
+xmldom@^0.1.19:
+  version "0.1.31"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
+  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
+
+xmlhttprequest-ssl@~1.5.4:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
+  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
+
+xtend@^4.0.0, xtend@~4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+
+y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
+yam@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/yam/-/yam-1.0.0.tgz#7f6c91dc0f5de75a031e6da6b3907c3d25ab0de5"
+  integrity sha512-Hv9xxHtsJ9228wNhk03xnlDReUuWVvHwM4rIbjdAXYvHLs17xjuyF50N6XXFMN6N0omBaqgOok/MCK3At9fTAg==
+  dependencies:
+    fs-extra "^4.0.2"
+    lodash.merge "^4.6.0"
+
+yeast@0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
diff --git a/app/assets/javascripts/wizard-application.js b/app/assets/javascripts/wizard-application.js
index 3b1e536366..b8e8797f0c 100644
--- a/app/assets/javascripts/wizard-application.js
+++ b/app/assets/javascripts/wizard-application.js
@@ -1,6 +1,6 @@
 //= require_tree ./discourse-common/addon
 //= require i18n-patches
-//= require_tree ./select-kit
+//= require_tree ./select-kit/app
 //= require wizard/router
 //= require wizard/wizard
 //= require_tree ./wizard/templates
diff --git a/config/application.rb b/config/application.rb
index fab55ac9f4..43a8bf3091 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -248,7 +248,11 @@ module Discourse
     config.exceptions_app = Middleware::DiscoursePublicExceptions.new(Rails.public_path)
 
     # Our templates shouldn't start with 'discourse/app/templates'
-    config.handlebars.templates_root = 'discourse/app/templates'
+    config.handlebars.templates_root = {
+      'discourse/app/templates' => '',
+      'select-kit/app/templates' => 'select-kit/templates/'
+    }
+
     config.handlebars.raw_template_namespace = "__DISCOURSE_RAW_TEMPLATES"
     Sprockets.register_mime_type 'text/x-handlebars', extensions: ['.hbr']
     Sprockets.register_transformer 'text/x-handlebars', 'application/javascript', Ember::Handlebars::Template
diff --git a/lib/freedom_patches/ember_handlebars.rb b/lib/freedom_patches/ember_handlebars.rb
new file mode 100644
index 0000000000..e8200b9dc3
--- /dev/null
+++ b/lib/freedom_patches/ember_handlebars.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Ember::Handlebars::Template
+
+  # TODO: Remove this after we move to Ember CLI
+  def template_path(path, config)
+    root = config.templates_root
+
+    config.templates_root.each do |k, v|
+      path = path.sub(/#{Regexp.quote(k)}\//, v)
+    end
+
+    path.split('/').join(config.templates_path_separator)
+  end
+end

From e81a4048e33416a97175172d77631b6080cfaca6 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 16 May 2020 11:20:37 +0200
Subject: [PATCH 1230/1830] REFACTOR: s/focusAfterOnchange/focusAfterOnChange
 (#9801)

---
 .../discourse/app/templates/components/d-editor.hbs         | 2 +-
 .../javascripts/select-kit/app/components/select-kit.js     | 4 ++--
 .../javascripts/components/select-kit/single-select-test.js | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
index 10b4eb6142..369acfdd34 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
@@ -12,7 +12,7 @@
               options=(hash
                 popupTitle=b.title
                 icon=b.icon
-                focusAfterOnchange=false
+                focusAfterOnChange=false
               )
             }}
           {{else}}
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit.js b/app/assets/javascripts/select-kit/app/components/select-kit.js
index 43905d52f3..f2fbbbf1c2 100644
--- a/app/assets/javascripts/select-kit/app/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/app/components/select-kit.js
@@ -271,7 +271,7 @@ export default Component.extend(
       selectedNameComponent: "selected-name",
       castInteger: false,
       preventsClickPropagation: false,
-      focusAfterOnchange: true
+      focusAfterOnChange: true
     },
 
     autoFilterable: computed("content.[]", "selectKit.filter", function() {
@@ -430,7 +430,7 @@ export default Component.extend(
             this.selectKit.close();
           }
 
-          if (this.selectKit.options.focusAfterOnchange) {
+          if (this.selectKit.options.focusAfterOnChange) {
             this._safeAfterRender(() => {
               this._focusFilter();
               this.popper && this.popper.update();
diff --git a/test/javascripts/components/select-kit/single-select-test.js b/test/javascripts/components/select-kit/single-select-test.js
index ca041c13ec..cb89c596b4 100644
--- a/test/javascripts/components/select-kit/single-select-test.js
+++ b/test/javascripts/components/select-kit/single-select-test.js
@@ -261,7 +261,7 @@ componentTest("prevents propagating click event on header", {
 
 componentTest("focusAfterOnChange", {
   template:
-    "{{d-button class='focus-me'}}{{single-select options=(hash focusAfterOnchange=focusAfterOnchange) value=value content=content onChange=onChange}}",
+    "{{d-button class='focus-me'}}{{single-select options=(hash focusAfterOnChange=focusAfterOnChange) value=value content=content onChange=onChange}}",
 
   beforeEach() {
     this.setProperties({
@@ -275,7 +275,7 @@ componentTest("focusAfterOnChange", {
   },
 
   async test(assert) {
-    this.set("focusAfterOnchange", true);
+    this.set("focusAfterOnChange", true);
 
     await this.subject.expand();
     await this.subject.selectRowByIndex(0);
@@ -285,7 +285,7 @@ componentTest("focusAfterOnChange", {
       "it selects the header"
     );
 
-    this.set("focusAfterOnchange", false);
+    this.set("focusAfterOnChange", false);
 
     await this.subject.expand();
     await this.subject.selectRowByIndex(0);

From ea63fa7de70858df46fb34e07daaaa7db59bd4e4 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Mon, 18 May 2020 09:13:37 +1000
Subject: [PATCH 1231/1830] FIX: extract reset_last_seen_cache! in user_spec
 (#9808)

Helper method to avoid code duplication
---
 spec/models/user_spec.rb | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 637e2fd418..89d5f62704 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -874,7 +874,7 @@ describe User do
     end
 
     after do
-      Discourse.redis.del("user:#{user.id}:#{Time.zone.now.to_date}")
+      reset_last_seen_cache!(user)
     end
 
     it "should act correctly" do
@@ -908,7 +908,7 @@ describe User do
     let!(:second_visit_date) { 2.hours.from_now }
 
     after do
-      Discourse.redis.del("user:#{user.id}:#{Time.zone.now.to_date}")
+      reset_last_seen_cache!(user)
     end
 
     it "should update the last seen value" do
@@ -984,9 +984,9 @@ describe User do
 
     describe 'with no previous values' do
       after do
-        Discourse.redis.del("user:#{user.id}:#{Time.zone.now.to_date}")
+        reset_last_seen_cache!(user)
         unfreeze_time
-        Discourse.redis.del("user:#{user.id}:#{Time.zone.now.to_date}")
+        reset_last_seen_cache!(user)
       end
 
       it "updates last_seen_at" do
@@ -1316,7 +1316,7 @@ describe User do
       let!(:now) { Time.zone.now }
       before { user.update_last_seen!(now) }
       after do
-        Discourse.redis.del("user:#{user.id}:#{now.to_date}")
+        reset_last_seen_cache!(user)
       end
 
       it "with existing UserVisit record, increments the posts_read value" do
@@ -2374,4 +2374,8 @@ describe User do
       expect(user2.recent_time_read).to eq(50)
     end
   end
+
+  def reset_last_seen_cache!(user)
+    Discourse.redis.del("user:#{user.id}:#{Time.zone.now.to_date}")
+  end
 end

From 862773ec83756a2deb6beaabbcb16756a98595f9 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 18 May 2020 10:54:56 +1000
Subject: [PATCH 1232/1830] FIX: do not remove stop words when using English
 locale

PG already handles English stop words, the list in cppjieba is
bigger than the list PG uses, which in turn causes confusion cause
words such as "volume" are stripped using cppijieba stop word list

We will follow up with another commit here to apply the Chinese
word stopwords, but for now to eliminate the confusion we are
skipping applying the stopword list when the dictionary in PG is
in English.
---
 lib/search.rb           | 13 ++++++++++++-
 spec/lib/search_spec.rb | 14 ++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/lib/search.rb b/lib/search.rb
index ffe08884ea..8d76057fc9 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -72,7 +72,18 @@ class Search
         require 'cppjieba_rb' unless defined? CppjiebaRb
         mode = (purpose == :query ? :query : :mix)
         data = CppjiebaRb.segment(search_data, mode: mode)
-        data = CppjiebaRb.filter_stop_word(data).join(' ')
+
+        # TODO: we still want to tokenize here but the current stopword list is too wide
+        # in cppjieba leading to words such as volume to be skipped. PG already has an English
+        # stopword list so use that vs relying on cppjieba
+        if ts_config != 'english'
+          data = CppjiebaRb.filter_stop_word(data)
+        else
+          data = data.filter { |s| s.present? }
+        end
+
+        data = data.join(' ')
+
       else
         data.squish!
       end
diff --git a/spec/lib/search_spec.rb b/spec/lib/search_spec.rb
index 7b81e27306..f8c6faed2d 100644
--- a/spec/lib/search_spec.rb
+++ b/spec/lib/search_spec.rb
@@ -4,6 +4,20 @@ require 'rails_helper'
 
 describe Search do
 
+  context "#prepare_data" do
+    it "does not remove English stop words in mixed mode" do
+      SiteSetting.search_tokenize_chinese_japanese_korean = true
+
+      tokenized = Search.prepare_data("monkey 吃香蕉 in a loud volume")
+      expect(tokenized).to eq("monkey 吃 香蕉 in a loud volume")
+
+      SiteSetting.default_locale = 'zh_CN'
+
+      tokenized = Search.prepare_data("monkey 吃香蕉 in a loud volume")
+      expect(tokenized).to eq("monkey 吃 香蕉 loud")
+    end
+  end
+
   context "#ts_config" do
     it "maps locales to correct Postgres dictionaries" do
       expect(Search.ts_config).to eq("english")

From e5dc843185feb268c277bb0ee4db9666d6452783 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 18 May 2020 10:10:40 +0200
Subject: [PATCH 1233/1830] FIX: ensures hide is called when card is destroyed
 (#9814)

---
 .../javascripts/discourse/app/mixins/card-contents-base.js      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/mixins/card-contents-base.js b/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
index 59464e1d61..54bf99e56f 100644
--- a/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
+++ b/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
@@ -304,6 +304,8 @@ export default Mixin.create({
       this,
       "_topicHeaderTrigger"
     );
+
+    this._hide();
   },
 
   keyUp(e) {

From 320b21ab5b910631aecee6ff6ef3d411c3a6a54a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 18 May 2020 10:50:33 +0200
Subject: [PATCH 1234/1830] UX: allows dropdown-select-box to display a caret
 (#9803)

```
selectKitOptions: {
  showCaret: true // default false
}
```
---
 .../app/components/dropdown-select-box.js         |  5 ++++-
 .../dropdown-select-box-header.js                 | 15 ++++++++++++++-
 .../app/components/notifications-button.js        |  3 ++-
 .../select-kit/app/components/pinned-options.js   |  3 +--
 .../dropdown-select-box-header.hbs                |  2 ++
 .../stylesheets/common/select-kit/select-kit.scss |  1 +
 6 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/select-kit/app/components/dropdown-select-box.js b/app/assets/javascripts/select-kit/app/components/dropdown-select-box.js
index 171215aac8..af07d69bc5 100644
--- a/app/assets/javascripts/select-kit/app/components/dropdown-select-box.js
+++ b/app/assets/javascripts/select-kit/app/components/dropdown-select-box.js
@@ -8,7 +8,10 @@ export default SingleSelectComponent.extend({
     autoFilterable: false,
     filterable: false,
     showFullTitle: true,
-    headerComponent: "dropdown-select-box/dropdown-select-box-header"
+    headerComponent: "dropdown-select-box/dropdown-select-box-header",
+    caretUpIcon: "caret-up",
+    caretDownIcon: "caret-down",
+    showCaret: false
   },
 
   modifyComponentForRow() {
diff --git a/app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-header.js b/app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-header.js
index 2b04e4094a..7404513b68 100644
--- a/app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-header.js
+++ b/app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-header.js
@@ -14,5 +14,18 @@ export default SingleSelectHeaderComponent.extend({
 
   btnClassName: computed("showFullTitle", function() {
     return `btn ${this.showFullTitle ? "btn-icon-text" : "no-text btn-icon"}`;
-  })
+  }),
+
+  caretUpIcon: readOnly("selectKit.options.caretUpIcon"),
+
+  caretDownIcon: readOnly("selectKit.options.caretDownIcon"),
+
+  caretIcon: computed(
+    "selectKit.isExpanded",
+    "caretUpIcon",
+    "caretDownIcon",
+    function() {
+      return this.selectKit.isExpanded ? this.caretUpIcon : this.caretDownIcon;
+    }
+  )
 });
diff --git a/app/assets/javascripts/select-kit/app/components/notifications-button.js b/app/assets/javascripts/select-kit/app/components/notifications-button.js
index 32dc2ad7ba..f5423b9e64 100644
--- a/app/assets/javascripts/select-kit/app/components/notifications-button.js
+++ b/app/assets/javascripts/select-kit/app/components/notifications-button.js
@@ -13,7 +13,8 @@ export default DropdownSelectBoxComponent.extend({
     autoFilterable: false,
     filterable: false,
     i18nPrefix: "",
-    i18nPostfix: ""
+    i18nPostfix: "",
+    showCaret: true
   },
 
   modifyComponentForRow() {
diff --git a/app/assets/javascripts/select-kit/app/components/pinned-options.js b/app/assets/javascripts/select-kit/app/components/pinned-options.js
index 7498f036ae..0a3e9246ad 100644
--- a/app/assets/javascripts/select-kit/app/components/pinned-options.js
+++ b/app/assets/javascripts/select-kit/app/components/pinned-options.js
@@ -1,6 +1,5 @@
 import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
-import { iconHTML } from "discourse-common/lib/icon-library";
 import { computed, action } from "@ember/object";
 
 const UNPINNED = "unpinned";
@@ -17,7 +16,7 @@ export default DropdownSelectBoxComponent.extend({
     const state = pinned ? `pinned${globally}` : UNPINNED;
     const title = I18n.t(`topic_statuses.${state}.title`);
 
-    content.label = `<span>${title}</span>${iconHTML("caret-down")}`.htmlSafe();
+    content.label = `<span>${title}</span>`.htmlSafe();
     content.title = title;
     content.name = state;
     content.icon = `thumbtack${state === UNPINNED ? " unpinned" : ""}`;
diff --git a/app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
index 0aa601db9a..8ce66b4838 100644
--- a/app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
+++ b/app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
@@ -6,3 +6,5 @@
   selectKit=selectKit
   shouldDisplayClearableButton=shouldDisplayClearableButton
 }}
+
+{{d-icon caretIcon class="caret-icon"}}
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index e8fd875612..130bad52f8 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -106,6 +106,7 @@
 
     .caret-icon {
       margin-left: auto;
+      margin-right: 0;
       padding-left: 5px;
       pointer-events: none;
       color: inherit;

From d01c336899bd8e3f04cfe55b239239c512ad2953 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 18 May 2020 17:22:39 +0800
Subject: [PATCH 1235/1830] DEV: Clean up some Redis leaks in test env.

---
 app/models/application_request.rb                  | 10 +++++++++-
 app/services/badge_granter.rb                      | 10 +++++++++-
 spec/components/middleware/request_tracker_spec.rb |  9 +++++++++
 spec/models/application_request_spec.rb            |  7 ++++---
 spec/models/report_spec.rb                         |  4 ++++
 spec/requests/users_controller_spec.rb             |  4 ++++
 spec/services/badge_granter_spec.rb                | 13 +++++++++----
 spec/tasks/redis_spec.rb                           |  2 ++
 8 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/app/models/application_request.rb b/app/models/application_request.rb
index df3cc15ab4..52a6a8a87e 100644
--- a/app/models/application_request.rb
+++ b/app/models/application_request.rb
@@ -15,8 +15,16 @@ class ApplicationRequest < ActiveRecord::Base
 
   include CachedCounting
 
+  def self.disable
+    @enabled = false
+  end
+
+  def self.enable
+    @enabled = true
+  end
+
   def self.increment!(type, opts = nil)
-    perform_increment!(redis_key(type), opts)
+    perform_increment!(redis_key(type), opts) if @enabled
   end
 
   def self.write_cache!(date = nil)
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index afa1a3cc3d..e402fb880c 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -2,6 +2,14 @@
 
 class BadgeGranter
 
+  def self.disable_queue
+    @queue_enabled = false
+  end
+
+  def self.enable_queue
+    @queue_enabled = true
+  end
+
   def initialize(badge, user, opts = {})
     @badge, @user, @opts = badge, user, opts
     @granted_by = opts[:granted_by] || Discourse.system_user
@@ -116,7 +124,7 @@ class BadgeGranter
   end
 
   def self.queue_badge_grant(type, opt)
-    return unless SiteSetting.enable_badges
+    return if !SiteSetting.enable_badges || !@queue_enabled
     payload = nil
 
     case type
diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb
index f0b605b53e..67efd8c975 100644
--- a/spec/components/middleware/request_tracker_spec.rb
+++ b/spec/components/middleware/request_tracker_spec.rb
@@ -15,6 +15,15 @@ describe Middleware::RequestTracker do
     }.merge(opts)
   end
 
+  before do
+    ApplicationRequest.enable
+  end
+
+  after do
+    ApplicationRequest.disable
+    ApplicationRequest.clear_cache!
+  end
+
   context "full request" do
     before do
       @orig = WebCrawlerRequest.autoflush
diff --git a/spec/models/application_request_spec.rb b/spec/models/application_request_spec.rb
index 794fbbb53a..0531e1c8dd 100644
--- a/spec/models/application_request_spec.rb
+++ b/spec/models/application_request_spec.rb
@@ -4,11 +4,12 @@ require 'rails_helper'
 
 describe ApplicationRequest do
   before do
+    ApplicationRequest.enable
     ApplicationRequest.last_flush = Time.now.utc
-    Discourse.redis.flushall
   end
 
   after do
+    ApplicationRequest.disable
     ApplicationRequest.clear_cache!
   end
 
@@ -44,7 +45,7 @@ describe ApplicationRequest do
   end
 
   it 'logs nothing for an unflushed increment' do
-    ApplicationRequest.increment!(:anon)
+    ApplicationRequest.increment!(:page_view_anon)
     expect(ApplicationRequest.count).to eq(0)
   end
 
@@ -90,7 +91,7 @@ describe ApplicationRequest do
 
   it 'clears cache correctly' do
     # otherwise we have test pollution
-    inc(:anon)
+    inc(:page_view_anon)
     ApplicationRequest.clear_cache!
     ApplicationRequest.write_cache!
 
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index 7b4dc6dcc1..7ccaf60941 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -1173,6 +1173,7 @@ describe Report do
 
     context "with data" do
       it "works" do
+        ApplicationRequest.enable
         3.times { ApplicationRequest.increment!(:page_view_crawler) }
         2.times { ApplicationRequest.increment!(:page_view_logged_in) }
         ApplicationRequest.increment!(:page_view_anon)
@@ -1190,6 +1191,9 @@ describe Report do
 
         expect(page_view_anon_report[:color]).to eql("#40c8ff")
         expect(page_view_anon_report[:data][0][:y]).to eql(1)
+      ensure
+        ApplicationRequest.disable
+        ApplicationRequest.clear_cache!
       end
     end
   end
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index af09e50f1e..5d3e0bc0de 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -1779,6 +1779,7 @@ describe UsersController do
           end
 
           it "updates the title" do
+            BadgeGranter.enable_queue
             user.update!(locale: :fr)
             user.change_trust_level!(TrustLevel[4])
             BadgeGranter.process_queue!
@@ -1786,6 +1787,9 @@ describe UsersController do
             leader_title = I18n.t("badges.leader.name", locale: :fr)
             put "/u/#{user.username}.json", params: { title: leader_title }
             expect(user.reload.title).to eq(leader_title)
+          ensure
+            BadgeGranter.disable_queue
+            BadgeGranter.clear_queue!
           end
         end
 
diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb
index d6e08a1a63..b2fa73c9e0 100644
--- a/spec/services/badge_granter_spec.rb
+++ b/spec/services/badge_granter_spec.rb
@@ -7,6 +7,15 @@ describe BadgeGranter do
   fab!(:badge) { Fabricate(:badge) }
   fab!(:user) { Fabricate(:user) }
 
+  before do
+    BadgeGranter.enable_queue
+  end
+
+  after do
+    BadgeGranter.disable_queue
+    BadgeGranter.clear_queue!
+  end
+
   describe 'revoke_titles' do
     it 'can correctly revoke titles' do
       badge = Fabricate(:badge, allow_title: true)
@@ -269,10 +278,6 @@ describe BadgeGranter do
     fab!(:user) { Fabricate(:user) }
     fab!(:liker) { Fabricate(:user) }
 
-    before do
-      BadgeGranter.clear_queue!
-    end
-
     it "grants autobiographer" do
       user.user_profile.bio_raw = "THIS IS MY bio it a long bio I like my bio"
       user.uploaded_avatar_id = 10
diff --git a/spec/tasks/redis_spec.rb b/spec/tasks/redis_spec.rb
index 4e22801ab2..627ae66c2d 100644
--- a/spec/tasks/redis_spec.rb
+++ b/spec/tasks/redis_spec.rb
@@ -36,6 +36,8 @@ RSpec.describe "Redis rake tasks", type: :multisite do
       orphan_keys.each do |key|
         expect(redis.get(key)).to eq(nil)
       end
+    ensure
+      active_keys.each { |key| redis.del(key) }
     end
   end
 end

From 918bd75909d73cd5361f285d59f9b2e0db97e4ac Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 18 May 2020 11:47:08 +0200
Subject: [PATCH 1236/1830] FIX: allows to remove a topic timer with
 delete_replies as type (#9800)

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

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 954369af27..211e94ce8d 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -445,7 +445,7 @@ class TopicsController < ApplicationController
         invalid_param(:status_type)
       end
     based_on_last_post = params[:based_on_last_post]
-    params.require(:duration) if based_on_last_post || TopicTimer.types[:delete_replies] == status_type
+    params.require(:duration) if based_on_last_post
 
     topic = Topic.find_by(id: params[:topic_id])
     guardian.ensure_can_moderate!(topic)
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index cf4f5f15b4..726b92228f 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -2709,6 +2709,24 @@ RSpec.describe TopicsController do
         expect(json['duration']).to eq(topic_status_update.duration)
       end
 
+      it 'should be able to delete a topic status update for delete_replies type' do
+        Fabricate(:topic_timer, topic: topic, status_type: TopicTimer.types[:delete_replies])
+
+        post "/t/#{topic.id}/timer.json", params: {
+          time: nil,
+          status_type: TopicTimer.types[7]
+        }
+
+        expect(response.status).to eq(200)
+        expect(topic.reload.public_topic_timer).to eq(nil)
+
+        json = response.parsed_body
+
+        expect(json['execute_at']).to eq(nil)
+        expect(json['duration']).to eq(nil)
+        expect(json['closed']).to eq(topic.closed)
+      end
+
       describe 'publishing topic to category in the future' do
         it 'should be able to create the topic status update' do
           post "/t/#{topic.id}/timer.json", params: {

From f968155288b7450056b50680cc2d2dd8f7d8bee9 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 18 May 2020 12:04:29 +0100
Subject: [PATCH 1237/1830] FIX: Ensure no image downloads during topic
 thumbnail serialization

If image uploads are missing a width/height, we re-download them to update the width/height in the database. However, this takes significant resources so we don't want to run this logic during topic serialization.
---
 app/models/topic.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index 22307a8dad..d331a30806 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -42,7 +42,7 @@ class Topic < ActiveRecord::Base
 
   def filtered_topic_thumbnails(extra_sizes: [])
     return nil unless original = image_upload
-    return nil unless original.width && original.height
+    return nil unless original.read_attribute(:width) && original.read_attribute(:height)
 
     thumbnail_sizes = Topic.thumbnail_sizes + extra_sizes
     topic_thumbnails.filter { |record| thumbnail_sizes.include?([record.max_width, record.max_height]) }
@@ -50,7 +50,7 @@ class Topic < ActiveRecord::Base
 
   def thumbnail_info(enqueue_if_missing: false, extra_sizes: [])
     return nil unless original = image_upload
-    return nil unless original.width && original.height
+    return nil unless original.read_attribute(:width) && original.read_attribute(:height)
 
     infos = []
     infos << { # Always add original

From 9482ddff7343d2e913a5177d2cdef100140b57f2 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 18 May 2020 14:07:40 +0200
Subject: [PATCH 1238/1830] UX: show caret only in topic footer buttons
 dropdown select boxes (#9816)

---
 .../javascripts/discourse/app/widgets/topic-timeline.js       | 3 ++-
 .../javascripts/select-kit/app/components/pinned-options.js   | 4 ++++
 .../select-kit/app/components/topic-notifications-button.js   | 1 +
 .../select-kit/app/components/topic-notifications-options.js  | 3 ++-
 .../dropdown-select-box/dropdown-select-box-header.hbs        | 4 +++-
 .../app/templates/components/topic-notifications-button.hbs   | 1 +
 6 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/topic-timeline.js b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
index 9d2ffd6467..55dcafa553 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
@@ -390,7 +390,8 @@ createWidget("timeline-footer-controls", {
             showFullTitle: false,
             appendReason: false,
             placement: "bottom-end",
-            mountedAsWidget: true
+            mountedAsWidget: true,
+            showCaret: false
           },
           ["notificationLevel"]
         )
diff --git a/app/assets/javascripts/select-kit/app/components/pinned-options.js b/app/assets/javascripts/select-kit/app/components/pinned-options.js
index 0a3e9246ad..f220617fe1 100644
--- a/app/assets/javascripts/select-kit/app/components/pinned-options.js
+++ b/app/assets/javascripts/select-kit/app/components/pinned-options.js
@@ -9,6 +9,10 @@ export default DropdownSelectBoxComponent.extend({
   pluginApiIdentifiers: ["pinned-options"],
   classNames: ["pinned-options"],
 
+  selectKitOptions: {
+    showCaret: true
+  },
+
   modifySelection(content) {
     const pinnedGlobally = this.get("topic.pinned_globally");
     const pinned = this.value;
diff --git a/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js b/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
index dd5c985eab..58329393e7 100644
--- a/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
+++ b/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
@@ -9,6 +9,7 @@ export default Component.extend({
   placement: "bottom-start",
   notificationLevel: null,
   topic: null,
+  showCaret: true,
 
   @action
   changeTopicNotificationLevel(levelId) {
diff --git a/app/assets/javascripts/select-kit/app/components/topic-notifications-options.js b/app/assets/javascripts/select-kit/app/components/topic-notifications-options.js
index ae3dd48317..5548eb2741 100644
--- a/app/assets/javascripts/select-kit/app/components/topic-notifications-options.js
+++ b/app/assets/javascripts/select-kit/app/components/topic-notifications-options.js
@@ -9,7 +9,8 @@ export default NotificationsButtonComponent.extend({
 
   selectKitOptions: {
     i18nPrefix: "i18nPrefix",
-    i18nPostfix: "i18nPostfix"
+    i18nPostfix: "i18nPostfix",
+    showCaret: true
   },
 
   i18nPrefix: "topic.notifications",
diff --git a/app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
index 8ce66b4838..297c4fde9d 100644
--- a/app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
+++ b/app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
@@ -7,4 +7,6 @@
   shouldDisplayClearableButton=shouldDisplayClearableButton
 }}
 
-{{d-icon caretIcon class="caret-icon"}}
+{{#if selectKit.options.showCaret}}
+  {{d-icon caretIcon class="caret-icon"}}
+{{/if}}
diff --git a/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
index b111dd6a58..50dd20e56e 100644
--- a/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
+++ b/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
@@ -6,6 +6,7 @@
     showFullTitle=showFullTitle
     placement=placement
     preventsClickPropagation=true
+    showCaret=showCaret
   )
 }}
 

From 48ed1b40cf31e5523e16ec68ee78db4db491ba89 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 18 May 2020 14:20:23 +0200
Subject: [PATCH 1239/1830] REFACTOR: ensures later is correctly canceled
 (#9796)

---
 .../app/components/edit-category-general.js   | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/edit-category-general.js b/app/assets/javascripts/discourse/app/components/edit-category-general.js
index 6fc54434de..a2a477f6a1 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-general.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-general.js
@@ -1,7 +1,8 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { not } from "@ember/object/computed";
-import { later } from "@ember/runloop";
+import { action } from "@ember/object";
+import { later, cancel } from "@ember/runloop";
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import Category from "discourse/models/category";
@@ -19,6 +20,12 @@ export default buildCategoryPanel("general", {
     this._focusCategoryName();
   },
 
+  willDestroyElement() {
+    this._super(...arguments);
+
+    this._laterFocus && cancel(this._laterFocus);
+  },
+
   canSelectParentCategory: not("category.isUncategorizedCategory"),
   uncategorizedSiteSettingLink: Discourse.getURL(
     "/admin/site_settings/category/all_results?filter=allow_uncategorized_topics"
@@ -103,19 +110,16 @@ export default buildCategoryPanel("general", {
     return !isUncategorizedCategory && categoryId;
   },
 
-  actions: {
-    showCategoryTopic() {
-      window.open(this.get("category.topic_url"), "_blank").focus();
-      return false;
-    }
+  @action
+  showCategoryTopic() {
+    window.open(this.get("category.topic_url"), "_blank").focus();
+    return false;
   },
 
   _focusCategoryName() {
-    later(() => {
-      if (this.element && !this.isDestroying && !this.isDestroyed) {
-        const categoryName = this.element.querySelector(".category-name");
-        categoryName && categoryName.focus();
-      }
+    this._laterFocus = later(() => {
+      const categoryName = this.element.querySelector(".category-name");
+      categoryName && categoryName.focus();
     }, 25);
   }
 });

From 1876b3cc4c5dbc8d02bc1d44959db66969370e01 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 18 May 2020 15:29:24 +0200
Subject: [PATCH 1240/1830] FIX: more resilient/consistent date-picker loading
 (#9817)

---
 .../discourse/app/components/date-input.js    | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/date-input.js b/app/assets/javascripts/discourse/app/components/date-input.js
index 870f16f312..0b03e6bd62 100644
--- a/app/assets/javascripts/discourse/app/components/date-input.js
+++ b/app/assets/javascripts/discourse/app/components/date-input.js
@@ -1,3 +1,4 @@
+import { Promise } from "rsvp";
 import I18n from "I18n";
 import { schedule } from "@ember/runloop";
 import { action } from "@ember/object";
@@ -16,20 +17,34 @@ export default Component.extend({
     return mobileView ? "date" : "text";
   },
 
-  @on("didInsertElement")
-  _loadDatePicker() {
+  click(event) {
+    event.stopPropagation();
+  },
+
+  didInsertElement() {
+    this._super(...arguments);
+
     schedule("afterRender", () => {
-      const container = this.element.querySelector(`#${this.containerId}`);
+      if (!this.element || this.isDestroying || this.isDestroying) {
+        return;
+      }
+
+      let promise;
+      const container = document.getElementById(this.containerId);
 
       if (this.site.mobileView) {
-        this._loadNativePicker(container);
+        promise = this._loadNativePicker(container);
       } else {
-        this._loadPikadayPicker(container);
+        promise = this._loadPikadayPicker(container);
       }
 
-      if (this._picker && this.date) {
-        this._picker.setDate(moment(this.date).toDate(), true);
-      }
+      promise.then(picker => {
+        this._picker = picker;
+
+        if (this._picker && this.date) {
+          this._picker.setDate(moment(this.date).toDate(), true);
+        }
+      });
     });
   },
 
@@ -50,7 +65,7 @@ export default Component.extend({
   },
 
   _loadPikadayPicker(container) {
-    loadScript("/javascripts/pikaday.js").then(() => {
+    return loadScript("/javascripts/pikaday.js").then(() => {
       let defaultOptions = {
         field: this.element.querySelector(".date-picker"),
         container: container || this.element.querySelector(".picker-container"),
@@ -73,10 +88,7 @@ export default Component.extend({
         });
       }
 
-      this._picker = new Pikaday(
-        Object.assign({}, defaultOptions, this._opts())
-      );
-      this._picker.setDate(moment(this.date).toDate(), true);
+      return new Pikaday(Object.assign({}, defaultOptions, this._opts()));
     });
   },
 
@@ -96,11 +108,12 @@ export default Component.extend({
     picker.setMinDate = date => {
       picker.min = date;
     };
-    this._picker = picker;
 
     if (this.date) {
       picker.setDate(this.date);
     }
+
+    return Promise.resolve(picker);
   },
 
   _handleSelection(value) {

From 303dece5ee82d4635cd01c3b5d35108d213de968 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 18 May 2020 15:37:58 +0200
Subject: [PATCH 1241/1830] DEV: skip this test for now (#9818)

It seems to be involved in various random failures
---
 test/javascripts/acceptance/user-card-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/acceptance/user-card-test.js b/test/javascripts/acceptance/user-card-test.js
index 8ba3c95cac..36125dee47 100644
--- a/test/javascripts/acceptance/user-card-test.js
+++ b/test/javascripts/acceptance/user-card-test.js
@@ -10,7 +10,7 @@ acceptance("User Card - Show Local Time", {
   settings: { display_local_time_in_user_card: true }
 });
 
-QUnit.test("user card local time", async assert => {
+QUnit.skip("user card local time", async assert => {
   User.current().changeTimezone("Australia/Brisbane");
   let cardResponse = _.clone(userFixtures["/u/eviltrout/card.json"]);
   cardResponse.user.timezone = "Australia/Perth";

From 96848b76494f030992a16e7b1dac7eab2ad5d522 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 18 May 2020 15:00:41 +0100
Subject: [PATCH 1242/1830] UX: Allow secure media URLs to be cached for a
 short period of time

Signed S3 URLs are valid for 15 seconds, so we can safely allow the browser to cache them for 10 seconds. This should help with large numbers of requests when composing a post with many images.
---
 app/controllers/uploads_controller.rb    |  5 +++++
 spec/requests/uploads_controller_spec.rb | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index ccbd762e72..64fcd795b5 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -10,6 +10,8 @@ class UploadsController < ApplicationController
 
   before_action :is_asset_path, only: [:show, :show_short, :show_secure]
 
+  SECURE_REDIRECT_GRACE_SECONDS = 5
+
   def create
     # capture current user for block later on
     me = current_user
@@ -151,6 +153,9 @@ class UploadsController < ApplicationController
       return render_404 if current_user.nil?
     end
 
+    cache_seconds = S3Helper::DOWNLOAD_URL_EXPIRES_AFTER_SECONDS - SECURE_REDIRECT_GRACE_SECONDS
+    expires_in cache_seconds.seconds # defaults to public: false, so only cached by the client browser
+
     # url_for figures out the full URL, handling multisite DBs,
     # and will return a presigned URL for the upload
     if path_with_ext.blank?
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index d773ec1adc..d8eaee516b 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -396,6 +396,16 @@ describe UploadsController do
           expect(response).to redirect_to(Discourse.store.signed_url_for_path(Discourse.store.get_path_for_upload(upload)))
         end
 
+        it "has the correct caching header" do
+          sign_in(user)
+          get upload.short_path
+
+          expected_max_age = S3Helper::DOWNLOAD_URL_EXPIRES_AFTER_SECONDS - UploadsController::SECURE_REDIRECT_GRACE_SECONDS
+          expect(expected_max_age).to be > 0 # Sanity check that the constants haven't been set to broken values
+
+          expect(response.headers["Cache-Control"]).to eq("max-age=#{expected_max_age}, private")
+        end
+
         it "raises invalid access if the user cannot access the upload access control post" do
           sign_in(user)
           post = Fabricate(:post)

From cfad38184ddefec94bcaa5f3488788a74e32cada Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 18 May 2020 17:44:47 +0200
Subject: [PATCH 1243/1830] FIX: improves and fixes a regression with
 category-selector (#9821)

---
 .../select-kit/app/components/category-selector.js        | 4 ++++
 .../components/multi-select/selected-category.hbs         | 8 +++++---
 .../stylesheets/common/select-kit/category-selector.scss  | 8 ++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/select-kit/app/components/category-selector.js b/app/assets/javascripts/select-kit/app/components/category-selector.js
index 20475d7570..96ee7c0e78 100644
--- a/app/assets/javascripts/select-kit/app/components/category-selector.js
+++ b/app/assets/javascripts/select-kit/app/components/category-selector.js
@@ -43,6 +43,10 @@ export default MultiSelectComponent.extend({
     );
   },
 
+  modifyComponentForRow() {
+    return "category-row";
+  },
+
   actions: {
     onChange(values) {
       this.attrs.onChange(
diff --git a/app/assets/javascripts/select-kit/app/templates/components/multi-select/selected-category.hbs b/app/assets/javascripts/select-kit/app/templates/components/multi-select/selected-category.hbs
index dd729183a8..5d35d2b794 100644
--- a/app/assets/javascripts/select-kit/app/templates/components/multi-select/selected-category.hbs
+++ b/app/assets/javascripts/select-kit/app/templates/components/multi-select/selected-category.hbs
@@ -1,4 +1,6 @@
-<div class="body">
-  {{badge}}
-  {{d-icon "times"}}
+<div {{action "onSelectedNameClick"}} tabindex="0" title={{title}} data-value={{value}} data-name={{name}} class="select-kit-selected-name selected-name choice">
+  <div class="body">
+    {{badge}}
+    {{d-icon "times"}}
+  </div>
 </div>
diff --git a/app/assets/stylesheets/common/select-kit/category-selector.scss b/app/assets/stylesheets/common/select-kit/category-selector.scss
index 0f2ba6c419..972be8bae4 100644
--- a/app/assets/stylesheets/common/select-kit/category-selector.scss
+++ b/app/assets/stylesheets/common/select-kit/category-selector.scss
@@ -9,5 +9,13 @@
         }
       }
     }
+
+    .category-row {
+      max-width: 100%;
+
+      .topic-count {
+        margin-left: 0.25em;
+      }
+    }
   }
 }

From 27c611b1d10cff7248e223796b2f6d0b316f627e Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Mon, 18 May 2020 18:05:34 +0200
Subject: [PATCH 1244/1830] FIX: Reverting multiple translation overrides
 didn't clear cache

---
 app/models/translation_override.rb       | 36 ++++++++++-------
 spec/models/translation_override_spec.rb | 49 ++++++++++++++++--------
 2 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/app/models/translation_override.rb b/app/models/translation_override.rb
index 8d1f31cc43..e51edda282 100644
--- a/app/models/translation_override.rb
+++ b/app/models/translation_override.rb
@@ -28,38 +28,48 @@ class TranslationOverride < ActiveRecord::Base
 
     translation_override = find_or_initialize_by(params)
     params.merge!(data) if translation_override.new_record?
-    i18n_changed([key]) if translation_override.update(data)
+    i18n_changed(locale, [key]) if translation_override.update(data)
     translation_override
   end
 
-  def self.revert!(locale, *keys)
+  def self.revert!(locale, keys)
+    keys = Array.wrap(keys)
     TranslationOverride.where(locale: locale, translation_key: keys).delete_all
-    i18n_changed(keys)
+    i18n_changed(locale, keys)
   end
 
-  def self.i18n_changed(keys)
+  def self.reload_locale!
     I18n.reload!
     ExtraLocalesController.clear_cache!
     MessageBus.publish('/i18n-flush', refresh: true)
-
-    keys.flatten.each do |key|
-      return if expire_cache(key)
-    end
   end
 
-  def self.expire_cache(key)
+  def self.clear_cached_keys!(locale, keys)
+    should_clear_anon_cache = false
+    keys.each do |key|
+      should_clear_anon_cache |= expire_cache(locale, key)
+    end
+    Site.clear_anon_cache! if should_clear_anon_cache
+  end
+
+  def self.i18n_changed(locale, keys)
+    reload_locale!
+    clear_cached_keys!(locale, keys)
+  end
+
+  def self.expire_cache(locale, key)
     if key.starts_with?('post_action_types.')
-      ApplicationSerializer.expire_cache_fragment!("post_action_types_#{I18n.locale}")
+      ApplicationSerializer.expire_cache_fragment!("post_action_types_#{locale}")
     elsif key.starts_with?('topic_flag_types.')
-      ApplicationSerializer.expire_cache_fragment!("post_action_flag_types_#{I18n.locale}")
+      ApplicationSerializer.expire_cache_fragment!("post_action_flag_types_#{locale}")
     else
       return false
     end
-
-    Site.clear_anon_cache!
     true
   end
 
+  private_class_method :reload_locale!
+  private_class_method :clear_cached_keys!
   private_class_method :i18n_changed
   private_class_method :expire_cache
 
diff --git a/spec/models/translation_override_spec.rb b/spec/models/translation_override_spec.rb
index bdb61989bf..879c76ed13 100644
--- a/spec/models/translation_override_spec.rb
+++ b/spec/models/translation_override_spec.rb
@@ -93,40 +93,59 @@ describe TranslationOverride do
 
   context "site cache" do
     def cached_value(guardian, types_name, name_key, attribute)
-      json = Site.json_for(guardian)
+      I18n.with_locale(:en) do
+        json = Site.json_for(guardian)
 
-      JSON.parse(json)[types_name]
-        .find { |x| x['name_key'] == name_key }[attribute]
+        JSON.parse(json)[types_name]
+          .find { |x| x['name_key'] == name_key }[attribute]
+      end
     end
 
     shared_examples "resets site text" do
       it "resets the site cache when translations of post_action_types are changed" do
         anon_guardian = Guardian.new
         user_guardian = Guardian.new(Fabricate(:user))
-        original_value = I18n.t(translation_key)
-        types_name, name_key, attribute = translation_key.split('.')
 
-        expect(cached_value(user_guardian, types_name, name_key, attribute)).to eq(original_value)
-        expect(cached_value(anon_guardian, types_name, name_key, attribute)).to eq(original_value)
+        I18n.locale = :de
 
-        TranslationOverride.upsert!('en', translation_key, 'bar')
-        expect(cached_value(user_guardian, types_name, name_key, attribute)).to eq('bar')
-        expect(cached_value(anon_guardian, types_name, name_key, attribute)).to eq('bar')
+        translation_keys.each do |translation_key|
+          original_value = I18n.t(translation_key, locale: 'en')
+          types_name, name_key, attribute = translation_key.split('.')
 
-        TranslationOverride.revert!('en', translation_key)
-        expect(cached_value(user_guardian, types_name, name_key, attribute)).to eq(original_value)
-        expect(cached_value(anon_guardian, types_name, name_key, attribute)).to eq(original_value)
+          expect(cached_value(user_guardian, types_name, name_key, attribute)).to eq(original_value)
+          expect(cached_value(anon_guardian, types_name, name_key, attribute)).to eq(original_value)
+
+          TranslationOverride.upsert!('en', translation_key, 'bar')
+          expect(cached_value(user_guardian, types_name, name_key, attribute)).to eq('bar')
+          expect(cached_value(anon_guardian, types_name, name_key, attribute)).to eq('bar')
+        end
+
+        TranslationOverride.revert!('en', translation_keys)
+
+        translation_keys.each do |translation_key|
+          original_value = I18n.t(translation_key, locale: 'en')
+          types_name, name_key, attribute = translation_key.split('.')
+
+          expect(cached_value(user_guardian, types_name, name_key, attribute)).to eq(original_value)
+          expect(cached_value(anon_guardian, types_name, name_key, attribute)).to eq(original_value)
+        end
       end
     end
 
     context "post_action_types" do
-      let(:translation_key) { 'post_action_types.off_topic.description' }
+      let(:translation_keys) { ['post_action_types.off_topic.description'] }
 
       include_examples "resets site text"
     end
 
     context "topic_flag_types" do
-      let(:translation_key) { 'topic_flag_types.spam.description' }
+      let(:translation_keys) { ['topic_flag_types.spam.description'] }
+
+      include_examples "resets site text"
+    end
+
+    context "multiple keys" do
+      let(:translation_keys) { ['post_action_types.off_topic.description', 'topic_flag_types.spam.description'] }
 
       include_examples "resets site text"
     end

From 6d5e9db883451195c67672d960a8c3c693a2e8c3 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Mon, 18 May 2020 18:45:47 +0200
Subject: [PATCH 1245/1830] FIX: Restoring backup didn't clear cached
 translation overrides

---
 app/models/translation_override.rb       | 10 +++++
 lib/backup_restore/restorer.rb           |  6 +++
 spec/models/translation_override_spec.rb | 57 +++++++++++++++++-------
 3 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/app/models/translation_override.rb b/app/models/translation_override.rb
index e51edda282..e883a0f1bd 100644
--- a/app/models/translation_override.rb
+++ b/app/models/translation_override.rb
@@ -38,6 +38,16 @@ class TranslationOverride < ActiveRecord::Base
     i18n_changed(locale, keys)
   end
 
+  def self.reload_all_overrides!
+    reload_locale!
+
+    overrides = TranslationOverride.pluck(:locale, :translation_key)
+    overrides = overrides.group_by(&:first).map { |k, a| [k, a.map(&:last)] }
+    overrides.each do |locale, keys|
+      clear_cached_keys!(locale, keys)
+    end
+  end
+
   def self.reload_locale!
     I18n.reload!
     ExtraLocalesController.clear_cache!
diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb
index 7a2b37d01a..30f4c093ff 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -55,6 +55,7 @@ module BackupRestore
       clear_category_cache
       clear_emoji_cache
       clear_theme_cache
+      reload_translations
 
       @uploads_restorer.restore(@tmp_directory)
 
@@ -131,6 +132,11 @@ module BackupRestore
       Emoji.clear_cache
     end
 
+    def reload_translations
+      log "Reloading translations..."
+      TranslationOverride.reload_all_overrides!
+    end
+
     def notify_user
       if user = User.find_by_email(@user_info[:email])
         log "Notifying '#{user.username}' of the end of the restore..."
diff --git a/spec/models/translation_override_spec.rb b/spec/models/translation_override_spec.rb
index 879c76ed13..8dd4c8eb4a 100644
--- a/spec/models/translation_override_spec.rb
+++ b/spec/models/translation_override_spec.rb
@@ -92,8 +92,10 @@ describe TranslationOverride do
   end
 
   context "site cache" do
-    def cached_value(guardian, types_name, name_key, attribute)
-      I18n.with_locale(:en) do
+    def cached_value(guardian, translation_key, locale:)
+      types_name, name_key, attribute = translation_key.split('.')
+
+      I18n.with_locale(locale) do
         json = Site.json_for(guardian)
 
         JSON.parse(json)[types_name]
@@ -101,33 +103,29 @@ describe TranslationOverride do
       end
     end
 
+    let!(:anon_guardian) { Guardian.new }
+    let!(:user_guardian) { Guardian.new(Fabricate(:user)) }
+
     shared_examples "resets site text" do
       it "resets the site cache when translations of post_action_types are changed" do
-        anon_guardian = Guardian.new
-        user_guardian = Guardian.new(Fabricate(:user))
-
         I18n.locale = :de
 
         translation_keys.each do |translation_key|
           original_value = I18n.t(translation_key, locale: 'en')
-          types_name, name_key, attribute = translation_key.split('.')
-
-          expect(cached_value(user_guardian, types_name, name_key, attribute)).to eq(original_value)
-          expect(cached_value(anon_guardian, types_name, name_key, attribute)).to eq(original_value)
+          expect(cached_value(user_guardian, translation_key, locale: 'en')).to eq(original_value)
+          expect(cached_value(anon_guardian, translation_key, locale: 'en')).to eq(original_value)
 
           TranslationOverride.upsert!('en', translation_key, 'bar')
-          expect(cached_value(user_guardian, types_name, name_key, attribute)).to eq('bar')
-          expect(cached_value(anon_guardian, types_name, name_key, attribute)).to eq('bar')
+          expect(cached_value(user_guardian, translation_key, locale: 'en')).to eq('bar')
+          expect(cached_value(anon_guardian, translation_key, locale: 'en')).to eq('bar')
         end
 
         TranslationOverride.revert!('en', translation_keys)
 
         translation_keys.each do |translation_key|
           original_value = I18n.t(translation_key, locale: 'en')
-          types_name, name_key, attribute = translation_key.split('.')
-
-          expect(cached_value(user_guardian, types_name, name_key, attribute)).to eq(original_value)
-          expect(cached_value(anon_guardian, types_name, name_key, attribute)).to eq(original_value)
+          expect(cached_value(user_guardian, translation_key, locale: 'en')).to eq(original_value)
+          expect(cached_value(anon_guardian, translation_key, locale: 'en')).to eq(original_value)
         end
       end
     end
@@ -149,5 +147,34 @@ describe TranslationOverride do
 
       include_examples "resets site text"
     end
+
+    describe "#reload_all_overrides!" do
+      it "correctly reloads all translation overrides" do
+        original_en_topics = I18n.t("topics", locale: :en)
+        original_en_emoji = I18n.t("js.composer.emoji", locale: :en)
+        original_en_offtopic_description = I18n.t("post_action_types.off_topic.description", locale: :en)
+        original_de_likes = I18n.t("likes", locale: :de)
+
+        TranslationOverride.create!(locale: "en", translation_key: "topics", value: "Threads")
+        TranslationOverride.create!(locale: "en", translation_key: "js.composer.emoji", value: "Smilies")
+        TranslationOverride.create!(locale: "en", translation_key: "post_action_types.off_topic.description", value: "Overridden description")
+        TranslationOverride.create!(locale: "de", translation_key: "likes", value: "„Gefällt mir“-Angaben")
+
+        expect(I18n.t("topics", locale: :en)).to eq(original_en_topics)
+        expect(I18n.t("js.composer.emoji", locale: :en)).to eq(original_en_emoji)
+        expect(cached_value(anon_guardian, "post_action_types.off_topic.description", locale: :en)).to eq(original_en_offtopic_description)
+        expect(I18n.t("likes", locale: :de)).to eq(original_de_likes)
+
+        TranslationOverride.reload_all_overrides!
+
+        expect(I18n.t("topics", locale: :en)).to eq("Threads")
+        expect(I18n.t("js.composer.emoji", locale: :en)).to eq("Smilies")
+        expect(cached_value(anon_guardian, "post_action_types.off_topic.description", locale: :en)).to eq("Overridden description")
+        expect(I18n.t("likes", locale: :de)).to eq("„Gefällt mir“-Angaben")
+
+        TranslationOverride.revert!(:en, ["topics", "js.composer.emoji", "post_action_types.off_topic.description"])
+        TranslationOverride.revert!(:de, ["likes"])
+      end
+    end
   end
 end

From 16f6240782d7135b4a17c09537c7d3e891d97b8d Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Tue, 19 May 2020 08:43:45 +1000
Subject: [PATCH 1246/1830] FIX: Bump rack version from 2.0.8 to 2.2.2 (#9811)

Version 2.1.1 was not working with our Sidekiq but version 2.2.2 is fine
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 980bce100a..6c72e48bab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -131,7 +131,7 @@ gem 'highline', '~> 1.7.0', require: false
 # This is a bit of a hornets nest cause in an ideal world we much prefer
 # if Sidekiq reused session and CSRF mitigation with Discourse on the
 # _forum_session cookie instead of a rack.session cookie
-gem 'rack', '2.0.8'
+gem 'rack', '2.2.2'
 
 gem 'rack-protection' # security
 gem 'cbor', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 3cc281953e..752d48c3c9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -265,7 +265,7 @@ GEM
     puma (4.3.3)
       nio4r (~> 2.0)
     r2 (0.2.7)
-    rack (2.0.8)
+    rack (2.2.2)
     rack-mini-profiler (2.0.1)
       rack (>= 1.2.0)
     rack-protection (2.0.8.1)
@@ -506,7 +506,7 @@ DEPENDENCIES
   pry-rails
   puma
   r2
-  rack (= 2.0.8)
+  rack (= 2.2.2)
   rack-mini-profiler
   rack-protection
   rails_multisite

From f99f6ca111c4d8aa1f014b2c8acd0275ff26a841 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Tue, 19 May 2020 09:09:36 +1000
Subject: [PATCH 1247/1830] FIX: randomize file name when created from fixtures
 (#9731)

* FIX: randomize file name when created from fixtures

When a temporary file is created from fixtures it should have a unique name.
It is to prevent a collision in parallel specs evaluation

* FIX: use /tmp/pid folder to keep fixture files
---
 spec/rails_helper.rb                          | 24 ++++++++++++++++---
 spec/requests/admin/themes_controller_spec.rb |  8 ++++---
 spec/requests/uploads_controller_spec.rb      | 12 ++++++----
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index c2692af427..a0ce4b71b7 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -237,6 +237,12 @@ RSpec.configure do |config|
     end
   end
 
+  config.after(:suite) do
+    if SpecSecureRandom.value
+      FileUtils.remove_dir(file_from_fixtures_tmp_folder, true)
+    end
+  end
+
   config.before :each, &TestSetup.method(:test_setup)
 
   config.before(:each, type: :multisite) do
@@ -368,9 +374,15 @@ def unfreeze_time
 end
 
 def file_from_fixtures(filename, directory = "images")
-  FileUtils.mkdir_p("#{Rails.root}/tmp/spec") unless Dir.exists?("#{Rails.root}/tmp/spec")
-  FileUtils.cp("#{Rails.root}/spec/fixtures/#{directory}/#{filename}", "#{Rails.root}/tmp/spec/#{filename}")
-  File.new("#{Rails.root}/tmp/spec/#{filename}")
+  SpecSecureRandom.value ||= SecureRandom.hex
+  FileUtils.mkdir_p(file_from_fixtures_tmp_folder) unless Dir.exists?(file_from_fixtures_tmp_folder)
+  tmp_file_path = File.join(file_from_fixtures_tmp_folder, SecureRandom.hex << filename)
+  FileUtils.cp("#{Rails.root}/spec/fixtures/#{directory}/#{filename}", tmp_file_path)
+  File.new(tmp_file_path)
+end
+
+def file_from_fixtures_tmp_folder
+  File.join(Dir.tmpdir, "rspec_#{Process.pid}_#{SpecSecureRandom.value}")
 end
 
 def has_trigger?(trigger_name)
@@ -410,3 +422,9 @@ def track_log_messages(level: nil)
 ensure
   Rails.logger = old_logger
 end
+
+class SpecSecureRandom
+  class << self
+    attr_accessor :value
+  end
+end
diff --git a/spec/requests/admin/themes_controller_spec.rb b/spec/requests/admin/themes_controller_spec.rb
index 24d8d7712e..39e24e8940 100644
--- a/spec/requests/admin/themes_controller_spec.rb
+++ b/spec/requests/admin/themes_controller_spec.rb
@@ -24,22 +24,24 @@ describe Admin::ThemesController do
   end
 
   describe '#upload_asset' do
+    let(:file) { file_from_fixtures("fake.woff2", "woff2") }
+    let(:filename) { File.basename(file) }
     let(:upload) do
-      Rack::Test::UploadedFile.new(file_from_fixtures("fake.woff2", "woff2"))
+      Rack::Test::UploadedFile.new(file)
     end
 
     it 'can create a theme upload' do
       post "/admin/themes/upload_asset.json", params: { file: upload }
       expect(response.status).to eq(201)
 
-      upload = Upload.find_by(original_filename: "fake.woff2")
+      upload = Upload.find_by(original_filename: filename)
 
       expect(upload.id).not_to be_nil
       expect(response.parsed_body["upload_id"]).to eq(upload.id)
     end
 
     context "when trying to upload an existing file" do
-      let(:uploaded_file) { Upload.find_by(original_filename: "fake.woff2") }
+      let(:uploaded_file) { Upload.find_by(original_filename: filename) }
       let(:response_json) { response.parsed_body }
 
       before do
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index d8eaee516b..0be31c1811 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -16,9 +16,11 @@ describe UploadsController do
         sign_in(user)
       end
 
+      let(:logo_file) { file_from_fixtures("logo.png") }
       let(:logo) do
-        Rack::Test::UploadedFile.new(file_from_fixtures("logo.png"))
+        Rack::Test::UploadedFile.new(logo_file)
       end
+      let(:logo_filename) { File.basename(logo_file) }
 
       let(:fake_jpg) do
         Rack::Test::UploadedFile.new(file_from_fixtures("fake.jpg"))
@@ -160,7 +162,7 @@ describe UploadsController do
         upload = Upload.last
 
         expect(upload.id).to eq(id)
-        expect(upload.original_filename).to eq('logo.png')
+        expect(upload.original_filename).to eq(logo_filename)
       end
 
       it 'respects `authorized_extensions_for_staff` setting when staff upload file' do
@@ -265,7 +267,7 @@ describe UploadsController do
       expect(response.status).to eq(200)
 
       expect(response.headers["Content-Disposition"])
-        .to eq(%Q|attachment; filename="logo.png"; filename*=UTF-8''logo.png|)
+        .to eq(%Q|attachment; filename="#{upload.original_filename}"; filename*=UTF-8''#{upload.original_filename}|)
     end
 
     it 'returns 200 when js file' do
@@ -282,7 +284,7 @@ describe UploadsController do
       get "/uploads/#{site}/#{upload.sha1}.json"
       expect(response.status).to eq(200)
       expect(response.headers["Content-Disposition"])
-        .to eq(%Q|attachment; filename="image_no_extension.png"; filename*=UTF-8''image_no_extension.png|)
+        .to eq(%Q|attachment; filename="#{upload.original_filename}"; filename*=UTF-8''#{upload.original_filename}|)
     end
 
     it "handles file without extension" do
@@ -292,7 +294,7 @@ describe UploadsController do
       get "/uploads/#{site}/#{upload.sha1}.json"
       expect(response.status).to eq(200)
       expect(response.headers["Content-Disposition"])
-        .to eq(%Q|attachment; filename="not_an_image"; filename*=UTF-8''not_an_image|)
+        .to eq(%Q|attachment; filename="#{upload.original_filename}"; filename*=UTF-8''#{upload.original_filename}|)
     end
 
     context "prevent anons from downloading files" do

From 96c02caba7e37d771a8dc89aa4dab786a9cfbf9f Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 19 May 2020 10:20:00 +0800
Subject: [PATCH 1248/1830] DEV: Change use of Redis `flushall` to `flushdb`.

FLUSHALL removes all keys from all databases. Instead we only want to
remove keys from the current Redis database.
---
 config/initializers/001-redis.rb                              | 2 +-
 .../spec/discourse_narrative_bot/track_selector_spec.rb       | 2 +-
 spec/components/auth/default_current_user_provider_spec.rb    | 2 +-
 spec/components/discourse_redis_spec.rb                       | 4 ++--
 spec/components/email/processor_spec.rb                       | 2 +-
 spec/components/pretty_text_spec.rb                           | 4 ++--
 spec/jobs/bookmark_reminder_notifications_spec.rb             | 2 +-
 spec/lib/bookmark_reminder_notification_handler_spec.rb       | 2 +-
 spec/models/topic_spec.rb                                     | 2 +-
 spec/requests/admin/backups_controller_spec.rb                | 2 +-
 spec/requests/admin/users_controller_spec.rb                  | 2 +-
 spec/requests/search_controller_spec.rb                       | 4 ++--
 spec/requests/topics_controller_spec.rb                       | 2 +-
 spec/requests/webhooks_controller_spec.rb                     | 2 +-
 spec/services/word_watcher_spec.rb                            | 2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/config/initializers/001-redis.rb b/config/initializers/001-redis.rb
index e48441594e..d11303a9d5 100644
--- a/config/initializers/001-redis.rb
+++ b/config/initializers/001-redis.rb
@@ -2,5 +2,5 @@
 
 if Rails.env.development? && ENV['DISCOURSE_FLUSH_REDIS']
   puts "Flushing redis (development mode)"
-  Discourse.redis.flushall
+  Discourse.redis.flushdb
 end
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
index 4e24b9feae..6914dff1d2 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
@@ -472,7 +472,7 @@ describe DiscourseNarrativeBot::TrackSelector do
           let(:post) { Fabricate(:post, topic: topic) }
 
           after do
-            Discourse.redis.flushall
+            Discourse.redis.flushdb
           end
 
           describe 'when random reply massage has been displayed in the last 6 hours' do
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index 1b698cbf36..8c14233a5b 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -237,7 +237,7 @@ describe Auth::DefaultCurrentUserProvider do
     end
 
     after do
-      Discourse.redis.flushall
+      Discourse.redis.flushdb
     end
 
     it "should not update last seen for suspended users" do
diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb
index 6d4af1d817..abc9a5917a 100644
--- a/spec/components/discourse_redis_spec.rb
+++ b/spec/components/discourse_redis_spec.rb
@@ -21,11 +21,11 @@ describe DiscourseRedis do
     let(:raw_redis) { Redis.new(DiscourseRedis.config) }
 
     before do
-      raw_redis.flushall
+      raw_redis.flushdb
     end
 
     after do
-      raw_redis.flushall
+      raw_redis.flushdb
     end
 
     describe 'when namespace is enabled' do
diff --git a/spec/components/email/processor_spec.rb b/spec/components/email/processor_spec.rb
index 3fe4ab41b7..606955551a 100644
--- a/spec/components/email/processor_spec.rb
+++ b/spec/components/email/processor_spec.rb
@@ -5,7 +5,7 @@ require "email/processor"
 
 describe Email::Processor do
   after do
-    Discourse.redis.flushall
+    Discourse.redis.flushdb
   end
 
   let(:from) { "foo@bar.com" }
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index 8969a526bd..c5ef73c4d2 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -508,7 +508,7 @@ describe PrettyText do
         ['apple', 'banana'].each { |w| Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor]) }
         expect(PrettyText.cook("# banana")).not_to include('banana')
       ensure
-        Discourse.redis.flushall
+        Discourse.redis.flushdb
       end
     end
   end
@@ -1166,7 +1166,7 @@ HTML
   end
 
   describe "censoring" do
-    after(:all) { Discourse.redis.flushall }
+    after(:all) { Discourse.redis.flushdb }
 
     def expect_cooked_match(raw, expected_cooked)
       expect(PrettyText.cook(raw)).to eq(expected_cooked)
diff --git a/spec/jobs/bookmark_reminder_notifications_spec.rb b/spec/jobs/bookmark_reminder_notifications_spec.rb
index 0bcfa0b3d2..25379d0ba3 100644
--- a/spec/jobs/bookmark_reminder_notifications_spec.rb
+++ b/spec/jobs/bookmark_reminder_notifications_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe Jobs::BookmarkReminderNotifications do
     bookmark1.update_column(:reminder_at, five_minutes_ago - 10.minutes)
     bookmark2.update_column(:reminder_at, five_minutes_ago - 5.minutes)
     bookmark3.update_column(:reminder_at, five_minutes_ago)
-    Discourse.redis.flushall
+    Discourse.redis.flushdb
   end
 
   it "sends every reminder and marks the reminder_at to nil for all bookmarks, as well as last sent date" do
diff --git a/spec/lib/bookmark_reminder_notification_handler_spec.rb b/spec/lib/bookmark_reminder_notification_handler_spec.rb
index 6af860f2f0..3d9a6d77f6 100644
--- a/spec/lib/bookmark_reminder_notification_handler_spec.rb
+++ b/spec/lib/bookmark_reminder_notification_handler_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe BookmarkReminderNotificationHandler do
   fab!(:user) { Fabricate(:user) }
 
   before do
-    Discourse.redis.flushall
+    Discourse.redis.flushdb
   end
 
   describe "#send_notification" do
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index d381579300..d1d5d1cc91 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -33,7 +33,7 @@ describe Topic do
 
       describe 'censored words' do
         after do
-          Discourse.redis.flushall
+          Discourse.redis.flushdb
         end
 
         describe 'when title contains censored words' do
diff --git a/spec/requests/admin/backups_controller_spec.rb b/spec/requests/admin/backups_controller_spec.rb
index 466d4a938b..03b9245744 100644
--- a/spec/requests/admin/backups_controller_spec.rb
+++ b/spec/requests/admin/backups_controller_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe Admin::BackupsController do
   end
 
   after do
-    Discourse.redis.flushall
+    Discourse.redis.flushdb
 
     @paths&.each { |path| File.delete(path) if File.exists?(path) }
     @paths = nil
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index f62407d956..099372cad0 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -293,7 +293,7 @@ RSpec.describe Admin::UsersController do
     fab!(:another_user) { Fabricate(:coding_horror) }
 
     after do
-      Discourse.redis.flushall
+      Discourse.redis.flushdb
     end
 
     it "raises an error when the user doesn't have permission" do
diff --git a/spec/requests/search_controller_spec.rb b/spec/requests/search_controller_spec.rb
index 947bd8754a..dac11690d3 100644
--- a/spec/requests/search_controller_spec.rb
+++ b/spec/requests/search_controller_spec.rb
@@ -26,11 +26,11 @@ describe SearchController do
     before do
       # TODO be a bit more strategic here instead of junking
       # all of redis
-      Discourse.redis.flushall
+      Discourse.redis.flushdb
     end
 
     after do
-      Discourse.redis.flushall
+      Discourse.redis.flushdb
     end
 
     context "when overloaded" do
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 726b92228f..9649f57f5b 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -2127,7 +2127,7 @@ RSpec.describe TopicsController do
     let(:topic) { post.topic }
 
     after do
-      Discourse.redis.flushall
+      Discourse.redis.flushdb
     end
 
     it 'returns first post of the topic' do
diff --git a/spec/requests/webhooks_controller_spec.rb b/spec/requests/webhooks_controller_spec.rb
index 7772e0eb18..580c0c72f0 100644
--- a/spec/requests/webhooks_controller_spec.rb
+++ b/spec/requests/webhooks_controller_spec.rb
@@ -3,7 +3,7 @@
 require "rails_helper"
 
 describe WebhooksController do
-  before { Discourse.redis.flushall }
+  before { Discourse.redis.flushdb }
 
   let(:email) { "em@il.com" }
   let(:message_id) { "12345@il.com" }
diff --git a/spec/services/word_watcher_spec.rb b/spec/services/word_watcher_spec.rb
index 0f6a2b7bb3..5cf70b6583 100644
--- a/spec/services/word_watcher_spec.rb
+++ b/spec/services/word_watcher_spec.rb
@@ -7,7 +7,7 @@ describe WordWatcher do
   let(:raw) { "Do you like liquorice?\n\nI really like them. One could even say that I am *addicted* to liquorice. Anf if\nyou can mix it up with some anise, then I'm in heaven ;)" }
 
   after do
-    Discourse.redis.flushall
+    Discourse.redis.flushdb
   end
 
   describe '.word_matcher_regexp' do

From 05beaa7f45b3dfd9dead38cf4716481d58beab0b Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 19 May 2020 10:26:23 +0800
Subject: [PATCH 1249/1830] DEV: Remove override of `flushdb` in
 `DiscourseRedis`.

---
 lib/discourse_redis.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index ff946cacfb..6b630b7b34 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -266,12 +266,6 @@ class DiscourseRedis
     end
   end
 
-  def flushdb
-    DiscourseRedis.ignore_readonly do
-      keys.each { |k| del(k) }
-    end
-  end
-
   def reconnect
     @redis._client.reconnect
   end

From 864fb45ff081cad58e122ca5b4a15ffebd4dbb31 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 19 May 2020 00:24:17 -0400
Subject: [PATCH 1250/1830] Improve mobile friendliness of crawler view

---
 .../common/base/crawler_layout.scss           | 30 +++++++++++++++++++
 app/views/list/list.erb                       |  8 ++---
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/common/base/crawler_layout.scss b/app/assets/stylesheets/common/base/crawler_layout.scss
index c279aceff4..bff0addac1 100644
--- a/app/assets/stylesheets/common/base/crawler_layout.scss
+++ b/app/assets/stylesheets/common/base/crawler_layout.scss
@@ -27,6 +27,36 @@ body.crawler {
 
   .topic-list {
     margin-bottom: 1em;
+    @media (max-width: 850px) {
+      td {
+        word-break: break-all;
+        &.posters {
+          a:not(:last-of-type) {
+            display: none;
+          }
+          a:last-of-type {
+            display: block;
+          }
+        }
+      }
+
+      td,
+      th {
+        &.views {
+          display: none;
+        }
+      }
+
+      .link-top-line {
+        a.title {
+          padding: 0;
+        }
+      }
+
+      .link-bottom-line {
+        margin-top: 0.25em;
+      }
+    }
   }
 
   footer {
diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index 2d32efb77b..2338d39c6a 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -47,8 +47,8 @@
       <tr>
         <th><%= t 'js.topic.title' %></th>
         <th></th>
-        <th><%= t 'js.replies' %></th>
-        <th><%= t 'js.views' %></th>
+        <th class="replies"><%= t 'js.replies' %></th>
+        <th class="views"><%= t 'js.views' %></th>
         <th><%= t 'js.activity' %></th>
       </tr>
     </thead>
@@ -101,10 +101,10 @@
               <% end %>
             <% end %>
           </td>
-          <td>
+          <td class="replies">
             <span class='posts' title='<%= t 'posts' %>'><%= t.posts_count %></span>
           </td>
-          <td>
+          <td class="views">
             <span class='views' title='<%= t 'views' %>'><%= t.views %></span>
           </td>
           <td>

From 062cb1e1cb110d42a33033671df9186533d1a3c6 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 19 May 2020 13:40:58 +0800
Subject: [PATCH 1251/1830] UX: Remove caret from notifications-button.

---
 .../select-kit/app/components/notifications-button.js          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/select-kit/app/components/notifications-button.js b/app/assets/javascripts/select-kit/app/components/notifications-button.js
index f5423b9e64..32dc2ad7ba 100644
--- a/app/assets/javascripts/select-kit/app/components/notifications-button.js
+++ b/app/assets/javascripts/select-kit/app/components/notifications-button.js
@@ -13,8 +13,7 @@ export default DropdownSelectBoxComponent.extend({
     autoFilterable: false,
     filterable: false,
     i18nPrefix: "",
-    i18nPostfix: "",
-    showCaret: true
+    i18nPostfix: ""
   },
 
   modifyComponentForRow() {

From 779dc30d2e06a57d9505262d91fea6404ffa2e97 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 19 May 2020 16:31:05 +1000
Subject: [PATCH 1252/1830] FIX: Join bookmarks migration on users to avoid
 missing user records

* the post_actions table has no FK to users, so if a user has been
  deleted we may end up with dangling post_action records, which then
  interferes with the bookmarks migration because bookmarks DO have
  an FK to users
---
 ...20200409033412_create_bookmarks_from_post_action_bookmarks.rb | 1 +
 lib/tasks/bookmarks.rake                                         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb b/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb
index 092a0e7b99..57b1885e35 100644
--- a/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb
+++ b/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb
@@ -16,6 +16,7 @@ class CreateBookmarksFromPostActionBookmarks < ActiveRecord::Migration[6.0]
         INNER JOIN posts ON posts.id = post_actions.post_id
         LEFT JOIN bookmarks ON bookmarks.post_id = post_actions.post_id AND bookmarks.user_id = post_actions.user_id
         INNER JOIN topics ON topics.id = posts.topic_id
+        INNER JOIN users ON users.id = post_actions.user_id
         WHERE bookmarks.id IS NULL AND post_action_type_id = :type_id AND post_actions.deleted_at IS NULL AND posts.deleted_at IS NULL
         LIMIT 2000
         SQL
diff --git a/lib/tasks/bookmarks.rake b/lib/tasks/bookmarks.rake
index d3cf545d2d..87fe005b07 100644
--- a/lib/tasks/bookmarks.rake
+++ b/lib/tasks/bookmarks.rake
@@ -22,6 +22,7 @@ task "bookmarks:sync_to_table" => :environment do |_t, args|
         INNER JOIN posts ON posts.id = post_actions.post_id
         LEFT JOIN bookmarks ON bookmarks.post_id = post_actions.post_id AND bookmarks.user_id = post_actions.user_id
         INNER JOIN topics ON topics.id = posts.topic_id
+        INNER JOIN users ON users.id = post_actions.user_id
         WHERE bookmarks.id IS NULL AND post_action_type_id = :type_id AND post_actions.deleted_at IS NULL AND posts.deleted_at IS NULL
         LIMIT 2000
       SQL

From 3623a395dc970e36bdf4b95c1054e01c5be746ef Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 19 May 2020 09:51:34 +0200
Subject: [PATCH 1253/1830] UI: refinements to topic footer buttons (#9780)

---
 .../components/topic-footer-buttons.hbs       |  4 +-
 .../templates/components/pinned-button.hbs    |  5 +--
 .../components/topic-notifications-button.hbs | 37 +++++++++++-------
 .../stylesheets/common/base/topic-post.scss   | 38 ++++++++++++++++---
 .../common/select-kit/pinned-button.scss      | 21 ----------
 .../topic-notifications-button.scss           | 27 -------------
 .../stylesheets/desktop/topic-post.scss       | 17 ++-------
 app/assets/stylesheets/mobile/topic-post.scss | 20 +---------
 8 files changed, 67 insertions(+), 102 deletions(-)
 delete mode 100644 app/assets/stylesheets/common/select-kit/topic-notifications-button.scss

diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
index 007ec9c19d..aa5b44a716 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
@@ -50,10 +50,10 @@
                   args=(hash topic=topic)
                   tagName=""
                   connectorTagName="span"}}
-
-  {{pinned-button pinned=topic.pinned topic=topic}}
 </div>
 
+{{pinned-button pinned=topic.pinned topic=topic}}
+
 {{#if showNotificationsButton}}
   {{topic-notifications-button
     notificationLevel=topic.details.notification_level
diff --git a/app/assets/javascripts/select-kit/app/templates/components/pinned-button.hbs b/app/assets/javascripts/select-kit/app/templates/components/pinned-button.hbs
index f54bdb6b5f..91bfe147ff 100644
--- a/app/assets/javascripts/select-kit/app/templates/components/pinned-button.hbs
+++ b/app/assets/javascripts/select-kit/app/templates/components/pinned-button.hbs
@@ -1,5 +1,4 @@
-{{pinned-options value=pinned topic=topic}}
-
 <p class="reason">
-  {{html-safe reasonText}}
+  {{pinned-options value=pinned topic=topic}}
+  <span class="text">{{html-safe reasonText}}</span>
 </p>
diff --git a/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
index 50dd20e56e..fa6f3e83a2 100644
--- a/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
+++ b/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
@@ -1,17 +1,28 @@
-{{topic-notifications-options
-  value=notificationLevel
-  topic=topic
-  onChange=(action "changeTopicNotificationLevel")
-  options=(hash
-    showFullTitle=showFullTitle
-    placement=placement
-    preventsClickPropagation=true
-    showCaret=showCaret
-  )
-}}
-
 {{#if appendReason}}
   <p class="reason">
-    {{html-safe topic.details.notificationReasonText}}
+    {{topic-notifications-options
+      value=notificationLevel
+      topic=topic
+      onChange=(action "changeTopicNotificationLevel")
+      options=(hash
+        showFullTitle=showFullTitle
+        placement=placement
+        preventsClickPropagation=true
+        showCaret=showCaret
+      )
+    }}
+    <span class="text">{{html-safe topic.details.notificationReasonText}}</span>
   </p>
+{{else}}
+  {{topic-notifications-options
+    value=notificationLevel
+    topic=topic
+    onChange=(action "changeTopicNotificationLevel")
+    options=(hash
+      showFullTitle=showFullTitle
+      placement=placement
+      preventsClickPropagation=true
+      showCaret=showCaret
+    )
+  }}
 {{/if}}
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 6e465bbc6b..3ebee34ed2 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1005,10 +1005,38 @@ a.mention-group {
 }
 
 #topic-footer-buttons {
-  .reason {
-    color: $primary-high;
-    display: inline;
-    margin: 0 0 0 8px;
-    line-height: $line-height-medium;
+  padding: 0.5em 0;
+
+  .topic-footer-main-buttons {
+    margin: -0.5em 0;
+
+    > .btn,
+    .topic-admin-menu-button-container {
+      margin: 0.5em 0.5em 0.5em 0;
+    }
+
+    .topic-admin-menu-button-container {
+      display: inline-flex;
+    }
+  }
+
+  .pinned-button:not(.is-hidden) + .topic-notifications-button {
+    margin-top: 0;
+  }
+
+  .pinned-button,
+  .topic-notifications-button {
+    margin: 1em 0;
+
+    .reason {
+      color: $primary-high;
+      display: inline-flex;
+      margin: 0;
+      align-items: center;
+
+      .text {
+        margin-left: 0.5em;
+      }
+    }
   }
 }
diff --git a/app/assets/stylesheets/common/select-kit/pinned-button.scss b/app/assets/stylesheets/common/select-kit/pinned-button.scss
index f080b8a016..3e51092ae3 100644
--- a/app/assets/stylesheets/common/select-kit/pinned-button.scss
+++ b/app/assets/stylesheets/common/select-kit/pinned-button.scss
@@ -1,28 +1,7 @@
 #topic-footer-buttons {
   .pinned-button {
-    min-width: auto;
-    margin: 1em 0;
-
     &.is-hidden {
       display: none;
     }
-
-    .btn {
-      margin: 0;
-    }
-
-    .reason {
-      display: inline;
-      line-height: $line-height-medium;
-    }
-  }
-}
-
-.pinned-button {
-  margin: 0;
-  min-width: auto;
-
-  .pinned-options {
-    display: inline;
   }
 }
diff --git a/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss b/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
deleted file mode 100644
index 1e7c797205..0000000000
--- a/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-#topic-footer-buttons {
-  .topic-notifications-button {
-    min-width: auto;
-    margin: 1em 0;
-
-    .btn {
-      margin: 0;
-    }
-
-    .reason {
-      display: inline;
-      line-height: $line-height-medium;
-    }
-  }
-}
-
-.topic-notifications-button .topic-notifications-options {
-  min-width: auto;
-}
-
-.topic-notifications-button {
-  margin: 0;
-
-  .topic-notifications-options {
-    display: inline-flex;
-  }
-}
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index ca304b8e95..5adc17d3eb 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -451,20 +451,15 @@ pre.copy-codeblocks:hover .copy-cmd {
   }
 }
 
-@mixin topic-footer-button {
-  margin-bottom: 5px;
-  margin-right: 10px;
-}
-
 #topic-footer-buttons {
-  padding: 10px 10px 0 0;
-  float: left;
-  .btn {
-    @include topic-footer-button;
+  max-width: calc(690px + (11px * 2) + 45px);
+
+  .bookmark {
     .d-icon-bookmark.bookmarked {
       color: $tertiary;
     }
   }
+
   .bookmark.bookmarked .d-icon-bookmark,
   .bookmark.bookmarked .d-icon-discourse-bookmark-clock {
     color: $tertiary;
@@ -474,10 +469,6 @@ pre.copy-codeblocks:hover .copy-cmd {
   }
 }
 
-#topic-footer-button {
-  width: 757px;
-}
-
 .suggested-topics {
   clear: left;
   padding: 20px 0 15px 0;
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 9cd4931ce8..f6fa70b25a 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -235,20 +235,16 @@ a.reply-to-tab {
 }
 
 #topic-footer-buttons {
-  @include clearfix;
-  padding: 20px 0 0 0;
   .d-icon-bookmark.bookmarked,
   .d-icon-discourse-bookmark-clock.bookmarked {
     color: $tertiary;
   }
-  .combobox {
+
+  .topic-footer-mobile-dropdown {
     margin-right: 0.5em;
     width: 160px;
-    margin-bottom: 0.5em;
   }
-}
 
-#topic-footer-buttons {
   .topic-notifications-button,
   .pinned-button {
     display: flex;
@@ -263,11 +259,6 @@ a.reply-to-tab {
   }
 }
 
-#topic-footer-button {
-  width: 100px;
-  margin: 0 auto;
-}
-
 .suggested-topics {
   clear: left;
   padding: 20px 0 15px 0;
@@ -292,13 +283,6 @@ span.post-count {
   opacity: 0.8;
 }
 
-#topic-footer-buttons {
-  .btn {
-    margin-bottom: 0.5em;
-    margin-right: 0.5em;
-  }
-}
-
 #topic-title {
   z-index: z("base") + 1;
   margin: 0 0 0 0 !important;

From 7b7c0ef52fecf472860513744786c6f442f56960 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 19 May 2020 10:02:40 +0200
Subject: [PATCH 1254/1830] DEV: removes brittle test (#9826)

---
 test/javascripts/acceptance/emoji-picker-test.js | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/test/javascripts/acceptance/emoji-picker-test.js b/test/javascripts/acceptance/emoji-picker-test.js
index 6a4922ed5c..a3d8472b53 100644
--- a/test/javascripts/acceptance/emoji-picker-test.js
+++ b/test/javascripts/acceptance/emoji-picker-test.js
@@ -168,19 +168,6 @@ QUnit.test(
   }
 );
 
-QUnit.test("emoji picker lazy loads emojis", async assert => {
-  await visit("/t/internationalization-localization/280");
-  await click("#topic-footer-buttons .btn.create");
-
-  await click("button.emoji.btn");
-
-  assert.equal(
-    find('.emoji-picker button[title="massage_woman"]').css("background-image"),
-    "none",
-    "it doesn't load invisible emojis"
-  );
-});
-
 QUnit.test("emoji picker persists state", async assert => {
   await visit("/t/internationalization-localization/280");
   await click("#topic-footer-buttons .btn.create");

From 1647ba4624965dae6b88576c9f120731616cac9f Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 19 May 2020 11:29:38 +0200
Subject: [PATCH 1255/1830] FIX: applies flex on topic-footer-main-buttons
 (#9829)

---
 app/assets/stylesheets/common/base/topic-post.scss | 6 ++++--
 app/assets/stylesheets/mobile/topic-post.scss      | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 3ebee34ed2..54aa976c0c 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1008,11 +1008,13 @@ a.mention-group {
   padding: 0.5em 0;
 
   .topic-footer-main-buttons {
-    margin: -0.5em 0;
+    margin: 0 0 -0.5em 0;
+    display: flex;
+    flex-wrap: wrap;
 
     > .btn,
     .topic-admin-menu-button-container {
-      margin: 0.5em 0.5em 0.5em 0;
+      margin: 0 0.5em 0.5em 0;
     }
 
     .topic-admin-menu-button-container {
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index f6fa70b25a..db68682303 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -241,7 +241,7 @@ a.reply-to-tab {
   }
 
   .topic-footer-mobile-dropdown {
-    margin-right: 0.5em;
+    margin: 0 0.5em 0.5em 0;
     width: 160px;
   }
 

From f2574736a22850a6972ea8fda659b98603650807 Mon Sep 17 00:00:00 2001
From: dave0688 <d.kreutzer@pulsdrei.de>
Date: Tue, 19 May 2020 10:32:56 +0100
Subject: [PATCH 1256/1830] FEATURE: Add same site cookie 'None' option to make
 cross domain systems possible (#9374)

Previously reverted in cb8f8de4, but can be re-applied now that Rack has been updated
---
 config/site_settings.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index d49bb0e4cf..ea4bbd4b66 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1382,7 +1382,8 @@ security:
       - Lax
       - Strict
       - Disabled
-    regex: "^(Lax|Strict|Disabled)$"
+      - None
+    regex: "^(Lax|Strict|Disabled|None)$"
   enable_escaped_fragments: true
   allow_index_in_robots_txt: true
   moderators_create_categories: false

From 725e38f9d7c42975c9d75afe0a1f79499693667b Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 19 May 2020 10:38:58 +0100
Subject: [PATCH 1257/1830] DEV: Allow plugins to request topic thumbnail sizes
 (#9828)

In plugin.rb, you can register new sizes like

```
register_topic_thumbnail_size [512, 512]
```

For more information about thumbnails see https://github.com/discourse/discourse/commit/03818e642a1ae871bffdc0c39c10f05f0b8b0398
---
 app/models/topic.rb                      |  8 +++---
 lib/discourse_plugin_registry.rb         |  2 ++
 lib/plugin/instance.rb                   | 10 +++++++
 spec/integration/topic_thumbnail_spec.rb | 33 ++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index d331a30806..f02b4fc030 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -33,11 +33,11 @@ class Topic < ActiveRecord::Base
   end
 
   def self.thumbnail_sizes
-    [ self.share_thumbnail_size ]
+    [ self.share_thumbnail_size ] + DiscoursePluginRegistry.topic_thumbnail_sizes
   end
 
-  def thumbnail_job_redis_key(extra_sizes)
-    "generate_topic_thumbnail_enqueue_#{id}_#{extra_sizes.inspect}"
+  def thumbnail_job_redis_key(sizes)
+    "generate_topic_thumbnail_enqueue_#{id}_#{sizes.inspect}"
   end
 
   def filtered_topic_thumbnails(extra_sizes: [])
@@ -79,7 +79,7 @@ class Topic < ActiveRecord::Base
     if SiteSetting.create_thumbnails &&
        enqueue_if_missing &&
        records.length < thumbnail_sizes.length &&
-       Discourse.redis.set(thumbnail_job_redis_key(extra_sizes), 1, nx: true, ex: 1.minute)
+       Discourse.redis.set(thumbnail_job_redis_key(thumbnail_sizes), 1, nx: true, ex: 1.minute)
 
       Jobs.enqueue(:generate_topic_thumbnails, { topic_id: id, extra_sizes: extra_sizes })
     end
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index ae260e2ce1..ab382a4d15 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -75,6 +75,8 @@ class DiscoursePluginRegistry
 
   define_filtered_register :editable_group_custom_fields
 
+  define_filtered_register :topic_thumbnail_sizes
+
   def self.register_auth_provider(auth_provider)
     self.auth_providers << auth_provider
   end
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index a993ce52f0..ab48f7cbea 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -165,6 +165,16 @@ class Plugin::Instance
     DiscoursePluginRegistry.register_editable_group_custom_field(field, self)
   end
 
+  # Request a new size for topic thumbnails
+  # Will respect plugin enabled setting is enabled
+  # Size should be an array with two elements [max_width, max_height]
+  def register_topic_thumbnail_size(size)
+    if !(size.kind_of?(Array) && size.length == 2)
+      raise ArgumentError.new("Topic thumbnail dimension is not valid")
+    end
+    DiscoursePluginRegistry.register_topic_thumbnail_size(size, self)
+  end
+
   def custom_avatar_column(column)
     reloadable_patch do |plugin|
       AvatarLookup.lookup_columns << column
diff --git a/spec/integration/topic_thumbnail_spec.rb b/spec/integration/topic_thumbnail_spec.rb
index 9ba35cbe97..c71cf8f96e 100644
--- a/spec/integration/topic_thumbnail_spec.rb
+++ b/spec/integration/topic_thumbnail_spec.rb
@@ -84,5 +84,38 @@ describe "Topic Thumbnails" do
         expect(thumbnails.length).to eq(5)
       end
     end
+
+    context "with a plugin" do
+      before do
+        plugin = Plugin::Instance.new
+        plugin.register_topic_thumbnail_size [512, 512]
+      end
+
+      after do
+        DiscoursePluginRegistry.reset!
+      end
+
+      it "includes the theme specified resolutions" do
+        topic_json = nil
+
+        expect do
+          topic_json = get_topic
+        end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(1)
+
+        # Run the job
+        args = Jobs::GenerateTopicThumbnails.jobs.last["args"].first
+        Jobs::GenerateTopicThumbnails.new.execute(args.with_indifferent_access)
+
+        # Request again
+        expect do
+          topic_json = get_topic
+        end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(0)
+
+        thumbnails = topic_json["thumbnails"]
+
+        # Original + Optimized + 1 plugin request
+        expect(thumbnails.length).to eq(3)
+      end
+    end
   end
 end

From e9f579bd3f133854dcd7dced202bff43be69364f Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 19 May 2020 11:04:02 +0100
Subject: [PATCH 1258/1830] DEV: Clean up thumbnail tests correctly

---
 spec/integration/topic_thumbnail_spec.rb       | 2 +-
 spec/serializers/topic_view_serializer_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/integration/topic_thumbnail_spec.rb b/spec/integration/topic_thumbnail_spec.rb
index c71cf8f96e..dcdbb084d5 100644
--- a/spec/integration/topic_thumbnail_spec.rb
+++ b/spec/integration/topic_thumbnail_spec.rb
@@ -10,7 +10,7 @@ describe "Topic Thumbnails" do
 
   context 'latest' do
     def get_topic
-      Discourse.redis.del(topic.thumbnail_job_redis_key([]))
+      Discourse.redis.del(topic.thumbnail_job_redis_key(Topic.thumbnail_sizes))
       get '/latest.json'
       response.parsed_body["topic_list"]["topics"][0]
     end
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index 5da26a674e..f6249b275b 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -60,7 +60,7 @@ describe TopicViewSerializer do
       it 'should have thumbnails' do
         SiteSetting.create_thumbnails = true
 
-        Discourse.redis.del(topic.thumbnail_job_redis_key([]))
+        Discourse.redis.del(topic.thumbnail_job_redis_key(Topic.thumbnail_sizes))
         json = nil
 
         expect do

From 05ca0c908fb83e4e29af1dccee83110a227aafbb Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Tue, 19 May 2020 14:13:28 +0300
Subject: [PATCH 1259/1830] FIX: GroupArchivedMessage belongs to Group, not
 User

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

diff --git a/app/models/group_archived_message.rb b/app/models/group_archived_message.rb
index 1715a57585..8199a53cf6 100644
--- a/app/models/group_archived_message.rb
+++ b/app/models/group_archived_message.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class GroupArchivedMessage < ActiveRecord::Base
-  belongs_to :user
+  belongs_to :group
   belongs_to :topic
 
   def self.move_to_inbox!(group_id, topic)

From 7c3663ff737a8030d8669a923486144a7e20cfd3 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 19 May 2020 13:27:57 +0200
Subject: [PATCH 1260/1830] UX: adds visual feedback when changing topic
 notifications level (#9831)

---
 .../discourse/app/models/topic-details.js     | 12 +++++-----
 .../components/topic-notifications-button.js  | 22 +++++++++++++++++--
 .../components/topic-notifications-button.hbs |  2 ++
 .../stylesheets/common/base/topic-post.scss   |  8 +++++++
 .../common/select-kit/select-kit.scss         |  5 +++++
 5 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/topic-details.js b/app/assets/javascripts/discourse/app/models/topic-details.js
index 50449aa0e3..45dd194841 100644
--- a/app/assets/javascripts/discourse/app/models/topic-details.js
+++ b/app/assets/javascripts/discourse/app/models/topic-details.js
@@ -61,12 +61,14 @@ const TopicDetails = RestModel.extend({
     }
   },
 
-  updateNotifications(v) {
-    this.set("notification_level", v);
-    this.set("notifications_reason_id", null);
-    return ajax("/t/" + this.get("topic.id") + "/notifications", {
+  updateNotifications(level) {
+    this.setProperties({
+      notification_level: level,
+      notifications_reason_id: null
+    });
+    return ajax(`/t/${this.get("topic.id")}/notifications`, {
       type: "POST",
-      data: { notification_level: v }
+      data: { notification_level: level }
     });
   },
 
diff --git a/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js b/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
index 58329393e7..a8743d8d59 100644
--- a/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
+++ b/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
@@ -1,20 +1,38 @@
 import Component from "@ember/component";
-import { action } from "@ember/object";
+import { action, computed } from "@ember/object";
+import { later, cancel } from "@ember/runloop";
 
 export default Component.extend({
   layoutName: "select-kit/templates/components/topic-notifications-button",
   classNames: ["topic-notifications-button"],
+  classNameBindings: ["isLoading"],
   appendReason: true,
   showFullTitle: true,
   placement: "bottom-start",
   notificationLevel: null,
   topic: null,
   showCaret: true,
+  isLoading: false,
+  icon: computed("isLoading", function() {
+    return this.isLoading ? "spinner" : null;
+  }),
+
+  willDestroyElement() {
+    this._super(...arguments);
+
+    this._endLoadingHandler && cancel(this._endLoadingHandler);
+  },
 
   @action
   changeTopicNotificationLevel(levelId) {
     if (levelId !== this.notificationLevel) {
-      this.topic.details.updateNotifications(levelId);
+      this.set("isLoading", true);
+      this.topic.details.updateNotifications(levelId).finally(() => {
+        this._endLoadingHandler = later(
+          () => this.set("isLoading", false),
+          250
+        );
+      });
     }
   }
 });
diff --git a/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
index fa6f3e83a2..f21111ebbd 100644
--- a/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
+++ b/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
@@ -5,6 +5,7 @@
       topic=topic
       onChange=(action "changeTopicNotificationLevel")
       options=(hash
+        icon=icon
         showFullTitle=showFullTitle
         placement=placement
         preventsClickPropagation=true
@@ -19,6 +20,7 @@
     topic=topic
     onChange=(action "changeTopicNotificationLevel")
     options=(hash
+      icon=icon
       showFullTitle=showFullTitle
       placement=placement
       preventsClickPropagation=true
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 54aa976c0c..a290f2ce17 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1026,6 +1026,14 @@ a.mention-group {
     margin-top: 0;
   }
 
+  .topic-notifications-button.is-loading {
+    pointer-events: none;
+    user-select: none;
+    .topic-notifications-options {
+      opacity: 0.5;
+    }
+  }
+
   .pinned-button,
   .topic-notifications-button {
     margin: 1em 0;
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 130bad52f8..a9769b5971 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -63,6 +63,11 @@
     flex-direction: row;
     min-height: 30px;
 
+    .d-icon-spinner {
+      -webkit-animation: rotate-forever 1s infinite linear;
+      animation: rotate-forever 1s infinite linear;
+    }
+
     .selected-name {
       text-align: left;
       flex: 0 1 auto;

From b4c5ff17a3ace1ab293b7c28821d11a4324ea1af Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Tue, 19 May 2020 14:03:54 +0100
Subject: [PATCH 1261/1830] FIX: Show a useful message when starting a plugin
 fails without a backtrace

---
 lib/plugin_initialization_guard.rb | 53 ++++++++++++++++++------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/lib/plugin_initialization_guard.rb b/lib/plugin_initialization_guard.rb
index a5a164e9e2..11fd943090 100644
--- a/lib/plugin_initialization_guard.rb
+++ b/lib/plugin_initialization_guard.rb
@@ -6,33 +6,44 @@ def plugin_initialization_guard(&block)
   rescue => error
     plugins_directory = Rails.root + 'plugins'
 
-    plugin_path = error.backtrace_locations.lazy.map do |location|
-      Pathname.new(location.absolute_path)
-        .ascend
-        .lazy
-        .find { |path| path.parent == plugins_directory }
-    end.next
+    if error.backtrace
+      plugin_path = error.backtrace_locations.lazy.map do |location|
+        Pathname.new(location.absolute_path)
+          .ascend
+          .lazy
+          .find { |path| path.parent == plugins_directory }
+      end.next
 
-    raise unless plugin_path
+      raise unless plugin_path
 
-    stack_trace = error.backtrace.each_with_index.inject([]) do |messages, (line, index)|
-      if index == 0
-        messages << "#{line}: #{error} (#{error.class})"
-      else
-        messages << "\t#{index}: from #{line}"
-      end
-    end.reverse.join("\n")
+      stack_trace = error.backtrace.each_with_index.inject([]) do |messages, (line, index)|
+        if index == 0
+          messages << "#{line}: #{error} (#{error.class})"
+        else
+          messages << "\t#{index}: from #{line}"
+        end
+      end.reverse.join("\n")
 
-    STDERR.puts <<~MESSAGE
-      #{stack_trace}
+      STDERR.puts <<~MESSAGE
+        #{stack_trace}
 
-      ** INCOMPATIBLE PLUGIN **
+        ** INCOMPATIBLE PLUGIN **
 
-      You are unable to build Discourse due to errors in the plugin at
-      #{plugin_path}
+        You are unable to build Discourse due to errors in the plugin at
+        #{plugin_path}
 
-      Please try removing this plugin and rebuilding again!
-    MESSAGE
+        Please try removing this plugin and rebuilding again!
+      MESSAGE
+    else
+      STDERR.puts <<~MESSAGE
+        ** PLUGIN FAILURE **
+
+        You are unable to build Discourse due to this error during plugin
+        initialization:
+
+        #{error}
+      MESSAGE
+    end
     exit 1
   end
 end

From f038f8f1547ab5b5a98e28596ef50552180415c7 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Tue, 19 May 2020 18:45:29 +0530
Subject: [PATCH 1262/1830] FIX: description for 'uncategorized' category was
 blank

---
 app/controllers/list_controller.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 81511387f7..5eadbbcf6d 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -331,7 +331,13 @@ class ListController < ApplicationController
 
     params[:category] = @category.id.to_s
 
-    @description_meta = @category.description_text
+    @description_meta = if @category.uncategorized?
+      I18n.t('category.uncategorized_description', locale: SiteSetting.default_locale)
+    else
+      @category.description_text
+    end
+    @description_meta = SiteSetting.site_description if @description_meta.blank?
+
     if !guardian.can_see?(@category)
       if SiteSetting.detailed_404
         raise Discourse::InvalidAccess

From 38c05a4f07f029dbf4ba0ae189d2318db151046d Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Tue, 19 May 2020 14:27:12 +0100
Subject: [PATCH 1263/1830] FIX: Check backtrace and backtrace_locations before
 trying to print an error

... during plugin initialization.
---
 lib/plugin_initialization_guard.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugin_initialization_guard.rb b/lib/plugin_initialization_guard.rb
index 11fd943090..42c1bda864 100644
--- a/lib/plugin_initialization_guard.rb
+++ b/lib/plugin_initialization_guard.rb
@@ -6,7 +6,7 @@ def plugin_initialization_guard(&block)
   rescue => error
     plugins_directory = Rails.root + 'plugins'
 
-    if error.backtrace
+    if error.backtrace && error.backtrace_locations
       plugin_path = error.backtrace_locations.lazy.map do |location|
         Pathname.new(location.absolute_path)
           .ascend

From ab6737c44a8177c8dc730c23793ef0e475004082 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 19 May 2020 17:13:40 +0200
Subject: [PATCH 1264/1830] UX: improves topic-notifications-button loading
 behavior (#9832)

---
 .../discourse/app/models/topic-details.js      |  9 +++++----
 .../components/topic-notifications-button.js   | 16 +++-------------
 .../stylesheets/common/base/topic-post.scss    |  8 --------
 .../select-kit/topic-notifications-button.scss | 18 ++++++++++++++++++
 4 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100644 app/assets/stylesheets/common/select-kit/topic-notifications-button.scss

diff --git a/app/assets/javascripts/discourse/app/models/topic-details.js b/app/assets/javascripts/discourse/app/models/topic-details.js
index 45dd194841..d8d5ea0036 100644
--- a/app/assets/javascripts/discourse/app/models/topic-details.js
+++ b/app/assets/javascripts/discourse/app/models/topic-details.js
@@ -62,13 +62,14 @@ const TopicDetails = RestModel.extend({
   },
 
   updateNotifications(level) {
-    this.setProperties({
-      notification_level: level,
-      notifications_reason_id: null
-    });
     return ajax(`/t/${this.get("topic.id")}/notifications`, {
       type: "POST",
       data: { notification_level: level }
+    }).then(() => {
+      this.setProperties({
+        notification_level: level,
+        notifications_reason_id: null
+      });
     });
   },
 
diff --git a/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js b/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
index a8743d8d59..d9c0900182 100644
--- a/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
+++ b/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
@@ -1,6 +1,5 @@
 import Component from "@ember/component";
 import { action, computed } from "@ember/object";
-import { later, cancel } from "@ember/runloop";
 
 export default Component.extend({
   layoutName: "select-kit/templates/components/topic-notifications-button",
@@ -17,22 +16,13 @@ export default Component.extend({
     return this.isLoading ? "spinner" : null;
   }),
 
-  willDestroyElement() {
-    this._super(...arguments);
-
-    this._endLoadingHandler && cancel(this._endLoadingHandler);
-  },
-
   @action
   changeTopicNotificationLevel(levelId) {
     if (levelId !== this.notificationLevel) {
       this.set("isLoading", true);
-      this.topic.details.updateNotifications(levelId).finally(() => {
-        this._endLoadingHandler = later(
-          () => this.set("isLoading", false),
-          250
-        );
-      });
+      this.topic.details
+        .updateNotifications(levelId)
+        .finally(() => this.set("isLoading", false));
     }
   }
 });
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index a290f2ce17..54aa976c0c 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1026,14 +1026,6 @@ a.mention-group {
     margin-top: 0;
   }
 
-  .topic-notifications-button.is-loading {
-    pointer-events: none;
-    user-select: none;
-    .topic-notifications-options {
-      opacity: 0.5;
-    }
-  }
-
   .pinned-button,
   .topic-notifications-button {
     margin: 1em 0;
diff --git a/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss b/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
new file mode 100644
index 0000000000..b3808031a1
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
@@ -0,0 +1,18 @@
+.topic-notifications-button {
+  &.is-loading {
+    pointer-events: none;
+    user-select: none;
+
+    .d-icon-spinner {
+      margin: 0;
+    }
+
+    .selected-name .d-icon {
+      display: none;
+    }
+
+    .topic-notifications-options {
+      opacity: 0.5;
+    }
+  }
+}

From 01c27d991ab47046484badaf33d086aa2621bbb3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 19 May 2020 11:34:53 -0400
Subject: [PATCH 1265/1830] Build(deps-dev): Bump minitest from 5.14.0 to
 5.14.1 (#9807)

Bumps [minitest](https://github.com/seattlerb/minitest) from 5.14.0 to 5.14.1.
- [Release notes](https://github.com/seattlerb/minitest/releases)
- [Changelog](https://github.com/seattlerb/minitest/blob/master/History.rdoc)
- [Commits](https://github.com/seattlerb/minitest/commits)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 752d48c3c9..dd28a91644 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -195,7 +195,7 @@ GEM
     mini_sql (0.2.5)
     mini_suffix (0.3.0)
       ffi (~> 1.9)
-    minitest (5.14.0)
+    minitest (5.14.1)
     mocha (1.11.2)
     mock_redis (0.23.0)
     msgpack (1.3.3)

From b23fe547abe42f6b1c576e579bd55e4320dae54f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 19 May 2020 12:40:39 -0400
Subject: [PATCH 1266/1830] Build(deps): Bump puma from 4.3.3 to 4.3.4 (#9824)

Bumps [puma](https://github.com/puma/puma) from 4.3.3 to 4.3.4.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.3.3...v4.3.4)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index dd28a91644..9dded39922 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -262,7 +262,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.5)
-    puma (4.3.3)
+    puma (4.3.4)
       nio4r (~> 2.0)
     r2 (0.2.7)
     rack (2.2.2)

From 42229fecadd23348bf74da7f98119bd2d82a225b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 19 May 2020 12:46:16 -0400
Subject: [PATCH 1267/1830] Build(deps): Bump rbtrace from 0.4.12 to 0.4.13
 (#9827)

Bumps [rbtrace](https://github.com/tmm1/rbtrace) from 0.4.12 to 0.4.13.
- [Release notes](https://github.com/tmm1/rbtrace/releases)
- [Commits](https://github.com/tmm1/rbtrace/compare/v0.4.12...v0.4.13)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 9dded39922..f2c187b9b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -294,7 +294,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbtrace (0.4.12)
+    rbtrace (0.4.13)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)

From 05d8091bd35ba5e2a5f468efce7e37cfab898295 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 19 May 2020 20:39:29 +0200
Subject: [PATCH 1268/1830] DEV: adds triggerOnChangeOnTab option to select-kit
 (#9833)

Usage:

```
options=(hash triggerOnChangeOnTab=false)
```

This will prevent to select the row when pressing tab.
---
 .../discourse/app/templates/components/d-navigation.hbs     | 3 +++
 .../javascripts/select-kit/app/components/select-kit.js     | 3 ++-
 .../app/components/select-kit/select-kit-header.js          | 6 +++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
index e9e0b9a34f..2ac52d5f71 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
@@ -3,6 +3,9 @@
 {{#if showCategoryAdmin}}
   {{categories-admin-dropdown
     onChange=(action "selectCategoryAdminDropdownAction")
+    options=(hash
+      triggerOnChangeOnTab=false
+    )
   }}
 {{/if}}
 
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit.js b/app/assets/javascripts/select-kit/app/components/select-kit.js
index f2fbbbf1c2..140e96782d 100644
--- a/app/assets/javascripts/select-kit/app/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/app/components/select-kit.js
@@ -271,7 +271,8 @@ export default Component.extend(
       selectedNameComponent: "selected-name",
       castInteger: false,
       preventsClickPropagation: false,
-      focusAfterOnChange: true
+      focusAfterOnChange: true,
+      triggerOnChangeOnTab: true
     },
 
     autoFilterable: computed("content.[]", "selectKit.filter", function() {
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-header.js b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-header.js
index 785b2a4702..5697826f59 100644
--- a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-header.js
+++ b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-header.js
@@ -140,7 +140,11 @@ export default Component.extend(UtilsMixin, {
       this._focusFilterInput();
     } else if (event.keyCode === 9) {
       // Tab
-      if (this.selectKit.highlighted && this.selectKit.isExpanded) {
+      if (
+        this.selectKit.highlighted &&
+        this.selectKit.isExpanded &&
+        this.selectKit.options.triggerOnChangeOnTab
+      ) {
         this.selectKit.select(
           this.getValue(this.selectKit.highlighted),
           this.selectKit.highlighted

From a239900522a119b12e1a126f0c255d10ace9035b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 19 May 2020 20:44:54 +0200
Subject: [PATCH 1269/1830] UI: reduces category row description margin (#9834)

---
 app/assets/stylesheets/common/select-kit/category-row.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/stylesheets/common/select-kit/category-row.scss b/app/assets/stylesheets/common/select-kit/category-row.scss
index 2bbe33c96e..df43c95603 100644
--- a/app/assets/stylesheets/common/select-kit/category-row.scss
+++ b/app/assets/stylesheets/common/select-kit/category-row.scss
@@ -9,6 +9,9 @@
       -ms-flex: 1 1 auto;
       flex: 1 1 auto;
     }
+    .category-desc p {
+      margin: 0;
+    }
     .category-status {
       .badge-wrapper.box {
         margin-bottom: 1px;

From 52228b1fa659cef0d4c17c401ea553a0acd7bee8 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Tue, 19 May 2020 16:09:03 -0300
Subject: [PATCH 1270/1830] DEV: These routes don't exist anymore (#9823)

---
 app/assets/javascripts/admin/models/admin-user.js | 6 ------
 config/routes.rb                                  | 1 -
 2 files changed, 7 deletions(-)

diff --git a/app/assets/javascripts/admin/models/admin-user.js b/app/assets/javascripts/admin/models/admin-user.js
index 71b8078f6e..9977fa8dd4 100644
--- a/app/assets/javascripts/admin/models/admin-user.js
+++ b/app/assets/javascripts/admin/models/admin-user.js
@@ -77,12 +77,6 @@ const AdminUser = User.extend({
     });
   },
 
-  revokeApiKey() {
-    return ajax(`/admin/users/${this.id}/revoke_api_key`, {
-      type: "DELETE"
-    }).then(() => this.set("api_key", null));
-  },
-
   deleteAllPosts() {
     let deletedPosts = 0;
     const user = this;
diff --git a/config/routes.rb b/config/routes.rb
index d3a1082d43..a881b260d1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -120,7 +120,6 @@ Discourse::Application.routes.draw do
       put "unsuspend"
       put "revoke_admin", constraints: AdminConstraint.new
       put "grant_admin", constraints: AdminConstraint.new
-      post "generate_api_key", constraints: AdminConstraint.new
       put "revoke_moderation", constraints: AdminConstraint.new
       put "grant_moderation", constraints: AdminConstraint.new
       put "approve"

From 0a700d81fca8d84c83428e44e6ff31f392535fc1 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 19 May 2020 22:34:37 +0200
Subject: [PATCH 1271/1830] FIX: Restoring backups could fail for database
 dumps > 8GiB

This is a temporary fix until we ship a new image with bsdtar.
---
 lib/backup_restore/backup_file_handler.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/backup_restore/backup_file_handler.rb b/lib/backup_restore/backup_file_handler.rb
index c5e3702488..7b26356989 100644
--- a/lib/backup_restore/backup_file_handler.rb
+++ b/lib/backup_restore/backup_file_handler.rb
@@ -65,9 +65,10 @@ module BackupRestore
       return if !@is_archive
 
       log "Unzipping archive, this may take a while..."
-      pipeline = Compression::Pipeline.new([Compression::Tar.new, Compression::Gzip.new])
-      unzipped_path = pipeline.decompress(@tmp_directory, @archive_path, available_size)
-      pipeline.strip_directory(unzipped_path, @tmp_directory)
+      Discourse::Utils.execute_command(
+        'tar', '--extract', '--gzip', '--file', @archive_path, '--directory', @tmp_directory,
+        failure_message: "Failed to decompress archive."
+      )
     end
 
     def extract_db_dump

From 72f139191e9b3aeebeca31ffa8b75977afe5d816 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 20 May 2020 10:40:38 +1000
Subject: [PATCH 1272/1830] FIX: S3 store has_been_uploaded? was not taking
 into account s3 bucket path (#9810)

In some cases, between Discourse forums the hostname of a URL could match if they are hosting S3 files on the same bucket but the S3 bucket path might not. So e.g. https://testbucket.somesite.com/testpath/some/file/url.png vs https://testbucket.somesite.com/prodpath/some/file/url.png. So has_been_uploaded? was returning true for the second URL, even though it may have been uploaded on a different Discourse forum.

This is a very rare case but must be accounted for, because this impacts UrlHelper.is_local which mistakenly thinks the file has already been downloaded and thus allows the URL to be cooked, where we want to return the full URL to be downloaded using PullHotlinkedImages.
---
 lib/file_store/s3_store.rb                  | 22 ++++++++++-
 spec/components/file_store/s3_store_spec.rb |  8 +++-
 spec/multisite/s3_store_spec.rb             | 43 +++++++++++++++++++++
 3 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index 6a26ebd7ee..46dece4cfc 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -79,12 +79,30 @@ module FileStore
     def has_been_uploaded?(url)
       return false if url.blank?
 
+      parsed_url = URI.parse(url)
       base_hostname = URI.parse(absolute_base_url).hostname
-      return true if url[base_hostname]
+      if url[base_hostname]
+        # if the hostnames match it means the upload is in the same
+        # bucket on s3. however, the bucket folder path may differ in
+        # some cases, and we do not want to assume the url is uploaded
+        # here. e.g. the path of the current site could be /prod and the
+        # other site could be /staging
+        if s3_bucket_folder_path.present?
+          return parsed_url.path.starts_with?("/#{s3_bucket_folder_path}")
+        else
+          return true
+        end
+        return false
+      end
 
       return false if SiteSetting.Upload.s3_cdn_url.blank?
       cdn_hostname = URI.parse(SiteSetting.Upload.s3_cdn_url || "").hostname
-      cdn_hostname.presence && url[cdn_hostname]
+      return true if cdn_hostname.presence && url[cdn_hostname]
+      false
+    end
+
+    def s3_bucket_folder_path
+      @s3_helper.s3_bucket_folder_path
     end
 
     def s3_bucket_name
diff --git a/spec/components/file_store/s3_store_spec.rb b/spec/components/file_store/s3_store_spec.rb
index 99f57c7104..81e39d0e20 100644
--- a/spec/components/file_store/s3_store_spec.rb
+++ b/spec/components/file_store/s3_store_spec.rb
@@ -251,7 +251,7 @@ describe FileStore::S3Store do
 
       before do
         optimized_image.update!(
-          url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com#{image_path}"
+          url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{image_path}"
         )
       end
 
@@ -272,6 +272,12 @@ describe FileStore::S3Store do
           SiteSetting.s3_upload_bucket = "s3-upload-bucket/discourse-uploads"
         end
 
+        before do
+          optimized_image.update!(
+            url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/discourse-uploads/#{image_path}"
+          )
+        end
+
         it "removes the file from s3 with the right paths" do
           s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
           s3_object = stub
diff --git a/spec/multisite/s3_store_spec.rb b/spec/multisite/s3_store_spec.rb
index 922c5f433b..064c699a12 100644
--- a/spec/multisite/s3_store_spec.rb
+++ b/spec/multisite/s3_store_spec.rb
@@ -217,4 +217,47 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
       end
     end
   end
+
+  describe "#has_been_uploaded?" do
+    before do
+      SiteSetting.s3_region = 'us-west-1'
+      SiteSetting.s3_upload_bucket = "s3-upload-bucket/test"
+      SiteSetting.s3_access_key_id = "s3-access-key-id"
+      SiteSetting.s3_secret_access_key = "s3-secret-access-key"
+      SiteSetting.enable_s3_uploads = true
+    end
+
+    let(:store) { FileStore::S3Store.new }
+    let(:client) { Aws::S3::Client.new(stub_responses: true) }
+    let(:resource) { Aws::S3::Resource.new(client: client) }
+    let(:s3_bucket) { resource.bucket(SiteSetting.s3_upload_bucket) }
+    let(:s3_helper) { store.s3_helper }
+
+    it "returns false for blank urls" do
+      url = ""
+      expect(store.has_been_uploaded?(url)).to eq(false)
+    end
+
+    it "returns true if the base hostname is the same for both urls" do
+      url = "https://s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
+      expect(store.has_been_uploaded?(url)).to eq(true)
+    end
+
+    it "returns false if the base hostname is the same for both urls BUT the bucket name is different in the path" do
+      bucket = "someotherbucket"
+      url = "https://s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{bucket}/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
+      expect(store.has_been_uploaded?(url)).to eq(false)
+    end
+
+    it "returns false if the hostnames do not match and the s3_cdn_url is blank" do
+      url = "https://www.someotherhostname.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
+      expect(store.has_been_uploaded?(url)).to eq(false)
+    end
+
+    it "returns true if the s3_cdn_url is present and matches the url hostname" do
+      SiteSetting.s3_cdn_url = "https://www.someotherhostname.com"
+      url = "https://www.someotherhostname.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
+      expect(store.has_been_uploaded?(url)).to eq(true)
+    end
+  end
 end

From e334133294b2308da7fbacc772a12b99eb6d30c2 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 20 May 2020 10:45:49 +1000
Subject: [PATCH 1273/1830] PERF: Remove foreign keys from bookmarks (#9837)

As a general rule we do not add FKs in Discourse and instead rely on consistency checks at weekly/daily intervals
---
 .../20200520001619_remove_fks_from_bookmarks.rb          | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 db/post_migrate/20200520001619_remove_fks_from_bookmarks.rb

diff --git a/db/post_migrate/20200520001619_remove_fks_from_bookmarks.rb b/db/post_migrate/20200520001619_remove_fks_from_bookmarks.rb
new file mode 100644
index 0000000000..80fee6dab4
--- /dev/null
+++ b/db/post_migrate/20200520001619_remove_fks_from_bookmarks.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveFksFromBookmarks < ActiveRecord::Migration[6.0]
+  def change
+    remove_foreign_key :bookmarks, :topics
+    remove_foreign_key :bookmarks, :posts
+    remove_foreign_key :bookmarks, :users
+  end
+end

From a93d0a8fcc3a9004c63a99b14189d7e26bc6328d Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 19 May 2020 21:11:49 -0400
Subject: [PATCH 1274/1830] UX: Remove bold from category badge text

---
 app/assets/stylesheets/common/base/_topic-list.scss  | 1 -
 app/assets/stylesheets/common/components/badges.scss | 1 -
 app/assets/stylesheets/mobile/discourse.scss         | 5 -----
 3 files changed, 7 deletions(-)

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index aa51fccce1..a80e54c4fd 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -53,7 +53,6 @@
     color: $primary-medium;
   }
   span.badge-category {
-    font-weight: normal;
     color: $primary-medium;
   }
   a.discourse-tag {
diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index 3881ee7b70..20ed535931 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -17,7 +17,6 @@
 
 .badge-wrapper {
   font-size: $font-down-1;
-  font-weight: bold;
   white-space: nowrap;
   position: relative;
   display: inline-flex;
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index 260f8d4b13..c9406abca6 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -63,11 +63,6 @@ blockquote {
   margin-bottom: 9px;
 }
 
-// categories should not be bold on mobile; they fight with the topic title too much
-.badge-wrapper {
-  font-weight: normal;
-}
-
 .mobile-nav {
   margin: 0;
   padding: 0;

From 6b92c78033a1a26eea56f0417b6811581fab7a38 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 20 May 2020 11:27:57 +1000
Subject: [PATCH 1275/1830] FIX: purge all associated data on user delete

This commit reorganises the delete dependencies on users and make sure
all are covered. We forgot some on bookmarks, security keys, anon users
and so on.
---
 app/models/user.rb | 122 ++++++++++++++++++++++-----------------------
 1 file changed, 59 insertions(+), 63 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 9d682a62bd..5d162848eb 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -7,102 +7,95 @@ class User < ActiveRecord::Base
   include SecondFactorManager
   include HasDestroyedWebHook
 
+  DEFAULT_FEATURED_BADGE_COUNT = 3
+
+  # not deleted on user delete
   has_many :posts
-  has_many :notifications, dependent: :delete_all
-  has_many :topic_users, dependent: :delete_all
+  has_many :topics
+  has_many :uploads
+
   has_many :category_users, dependent: :destroy
   has_many :tag_users, dependent: :destroy
   has_many :user_api_keys, dependent: :destroy
-  has_many :topics
-  has_many :bookmarks
+  has_many :topic_allowed_users, dependent: :destroy
+  has_many :user_archived_messages, dependent: :destroy
+  has_many :email_change_requests, dependent: :destroy
+  has_many :email_tokens, dependent: :destroy
+  has_many :invites, dependent: :destroy
+  has_many :topic_links, dependent: :destroy
+  has_many :user_uploads, dependent: :destroy
+  has_many :user_emails, dependent: :destroy
+  has_many :user_associated_accounts, dependent: :destroy
+  has_many :oauth2_user_infos, dependent: :destroy
+  has_many :user_second_factors, dependent: :destroy
+  has_many :user_badges, -> { for_enabled_badges }, dependent: :destroy
+  has_many :user_auth_tokens, dependent: :destroy
+  has_many :group_users, dependent: :destroy
+  has_many :user_warnings, dependent: :destroy
+  has_many :api_keys, dependent: :destroy
+  has_many :push_subscriptions, dependent: :destroy
+  has_many :acting_group_histories, dependent: :destroy, foreign_key: :acting_user_id, class_name: 'GroupHistory'
+  has_many :targeted_group_histories, dependent: :destroy, foreign_key: :target_user_id, class_name: 'GroupHistory'
+  has_many :reviewable_scores, dependent: :destroy
 
-  # dependent deleting handled via before_destroy
+  has_one :user_option, dependent: :destroy
+  has_one :user_avatar, dependent: :destroy
+  has_one :github_user_info, dependent: :destroy
+  has_one :primary_email, -> { where(primary: true)  }, class_name: 'UserEmail', dependent: :destroy
+  has_one :user_stat, dependent: :destroy
+  has_one :user_profile, dependent: :destroy, inverse_of: :user
+  has_one :single_sign_on_record, dependent: :destroy
+  has_one :anonymous_user_master, class_name: 'AnonymousUser', dependent: :destroy
+  has_one :anonymous_user_shadow, ->(record) { where(active: true) }, foreign_key: :master_user_id, class_name: 'AnonymousUser', dependent: :destroy
+
+  # delete all is faster but bypasses callbacks
+  has_many :bookmarks, dependent: :delete_all
+  has_many :notifications, dependent: :delete_all
+  has_many :topic_users, dependent: :delete_all
+  has_many :email_logs, dependent: :delete_all
+  has_many :incoming_emails, dependent: :delete_all
+  has_many :user_visits, dependent: :delete_all
+  has_many :user_auth_token_logs, dependent: :delete_all
+  has_many :group_requests, dependent: :delete_all
+  has_many :muted_user_records, class_name: 'MutedUser', dependent: :delete_all
+  has_many :ignored_user_records, class_name: 'IgnoredUser', dependent: :delete_all
+
+  # dependent deleting handled via before_destroy (special cases)
   has_many :user_actions
   has_many :post_actions
+  has_many :post_timings
+  has_many :directory_items
+  has_many :security_keys, -> {
+    where(enabled: true)
+  }, class_name: "UserSecurityKey"
 
-  DEFAULT_FEATURED_BADGE_COUNT = 3
-
-  has_many :user_badges, -> { for_enabled_badges }, dependent: :destroy
   has_many :badges, through: :user_badges
   has_many :default_featured_user_badges,
             -> { for_enabled_badges.grouped_with_count.where("featured_rank <= ?", DEFAULT_FEATURED_BADGE_COUNT) },
             class_name: "UserBadge"
 
-  has_many :email_logs, dependent: :delete_all
-  has_many :incoming_emails, dependent: :delete_all
-  has_many :post_timings
-  has_many :topic_allowed_users, dependent: :destroy
   has_many :topics_allowed, through: :topic_allowed_users, source: :topic
-  has_many :email_tokens, dependent: :destroy
-  has_many :user_visits, dependent: :destroy
-  has_many :invites, dependent: :destroy
-  has_many :topic_links, dependent: :destroy
-  has_many :uploads
-  has_many :user_warnings
-  has_many :user_archived_messages, dependent: :destroy
-  has_many :email_change_requests, dependent: :destroy
-
-  # see before_destroy
-  has_many :directory_items
-  has_many :user_auth_tokens, dependent: :destroy
-  has_many :user_auth_token_logs, dependent: :destroy
-
-  has_many :group_users, dependent: :destroy
   has_many :groups, through: :group_users
-  has_many :group_requests, dependent: :destroy
   has_many :secure_categories, through: :groups, source: :categories
 
-  has_many :user_uploads, dependent: :destroy
-  has_many :user_emails, dependent: :destroy
-
-  has_one :primary_email, -> { where(primary: true)  }, class_name: 'UserEmail', dependent: :destroy
-
-  has_one :user_option, dependent: :destroy
-  has_one :user_avatar, dependent: :destroy
-  has_many :user_associated_accounts, dependent: :destroy
-  has_one :github_user_info, dependent: :destroy
-  has_many :oauth2_user_infos, dependent: :destroy
-  has_many :user_second_factors, dependent: :destroy
-
+  # deleted in user_second_factors relationship
   has_many :totps, -> {
     where(method: UserSecondFactor.methods[:totp], enabled: true)
   }, class_name: "UserSecondFactor"
 
-  has_many :security_keys, -> {
-    where(enabled: true)
-  }, class_name: "UserSecurityKey"
-
-  has_one :anonymous_user_master, class_name: 'AnonymousUser'
-  has_one :anonymous_user_shadow, ->(record) { where(active: true) }, foreign_key: :master_user_id, class_name: 'AnonymousUser'
-
   has_one :master_user, through: :anonymous_user_master
   has_one :shadow_user, through: :anonymous_user_shadow, source: :user
 
-  has_one :user_stat, dependent: :destroy
-  has_one :user_profile, dependent: :destroy, inverse_of: :user
   has_one :profile_background_upload, through: :user_profile
   has_one :card_background_upload, through: :user_profile
-  has_one :single_sign_on_record, dependent: :destroy
   belongs_to :approved_by, class_name: 'User'
   belongs_to :primary_group, class_name: 'Group'
 
-  has_many :muted_user_records, class_name: 'MutedUser'
   has_many :muted_users, through: :muted_user_records
-
-  has_many :ignored_user_records, class_name: 'IgnoredUser'
   has_many :ignored_users, through: :ignored_user_records
 
-  has_many :api_keys, dependent: :destroy
-
-  has_many :push_subscriptions, dependent: :destroy
-
   belongs_to :uploaded_avatar, class_name: 'Upload'
 
-  has_many :acting_group_histories, dependent: :destroy, foreign_key: :acting_user_id, class_name: 'GroupHistory'
-  has_many :targeted_group_histories, dependent: :destroy, foreign_key: :target_user_id, class_name: 'GroupHistory'
-
-  has_many :reviewable_scores, dependent: :destroy
-
   delegate :last_sent_email_address, to: :email_logs
 
   validates_presence_of :username
@@ -164,6 +157,9 @@ class User < ActiveRecord::Base
     DirectoryItem.where(user_id: self.id)
       .where('period_type in (?)', DirectoryItem.period_types.values)
       .delete_all
+
+    # our relationship filters on enabled, this makes sure everything is deleted
+    UserSecurityKey.where(user_id: self.id).delete_all
   end
 
   # Skip validating email, for example from a particular auth provider plugin
@@ -933,7 +929,7 @@ class User < ActiveRecord::Base
 
   def activate
     if email_token = self.email_tokens.active.where(email: self.email).first
-      user = EmailToken.confirm(email_token.token, skip_reviewable: true)
+      EmailToken.confirm(email_token.token, skip_reviewable: true)
     end
     self.update!(active: true)
     create_reviewable

From 234cd5c3e7f8d1be7c98af7eeb572e5b79f0a16a Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 20 May 2020 10:16:28 +0800
Subject: [PATCH 1276/1830] FIX: Switch discobot to pull avatar from gravatar.

---
 app/models/user_avatar.rb                          | 12 ++++++++++--
 .../db/fixtures/001_discobot.rb                    | 14 +++++++-------
 ...st_gravatar_download_attempt_on_user_avatars.rb | 12 ++++++++++++
 plugins/discourse-narrative-bot/plugin.rb          |  6 ++++++
 4 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb

diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index f6dbf13312..bd2751d6b4 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -5,6 +5,14 @@ class UserAvatar < ActiveRecord::Base
   belongs_to :gravatar_upload, class_name: 'Upload'
   belongs_to :custom_upload, class_name: 'Upload'
 
+  @@custom_user_gravatar_email_hash = {
+    Discourse::SYSTEM_USER_ID => User.email_hash("info@discourse.org")
+  }
+
+  def self.register_custom_user_gravatar_email_hash(user_id, email)
+    @@custom_user_gravatar_email_hash[user_id] = User.email_hash(email)
+  end
+
   def contains_upload?(id)
     gravatar_upload_id == id || custom_upload_id == id
   end
@@ -12,14 +20,14 @@ class UserAvatar < ActiveRecord::Base
   def update_gravatar!
     DistributedMutex.synchronize("update_gravatar_#{user_id}") do
       begin
-        self.update!(last_gravatar_download_attempt: Time.now)
+        self.update!(last_gravatar_download_attempt: Time.zone.now)
 
         max = Discourse.avatar_sizes.max
 
         # The user could be deleted before this executes
         return if user.blank? || user.primary_email.blank?
 
-        email_hash = user_id == Discourse::SYSTEM_USER_ID ? User.email_hash("info@discourse.org") : user.email_hash
+        email_hash = @@custom_user_gravatar_email_hash[user_id] || user.email_hash
         gravatar_url = "https://#{SiteSetting.gravatar_base_url}/avatar/#{email_hash}.png?s=#{max}&d=404&reset_cache=#{SecureRandom.urlsafe_base64(5)}"
 
         # follow redirects in case gravatar change rules on us
diff --git a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
index 3972a350fb..bc204e4021 100644
--- a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
+++ b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
@@ -4,20 +4,20 @@ discobot_username = 'discobot'
 
 def seed_primary_email
   UserEmail.seed do |ue|
-    ue.id = -2
+    ue.id = DiscourseNarrativeBot::BOT_USER_ID
     ue.email = "discobot_email"
     ue.primary = true
-    ue.user_id = -2
+    ue.user_id = DiscourseNarrativeBot::BOT_USER_ID
   end
 end
 
-unless user = User.find_by(id: -2)
+unless user = User.find_by(id: DiscourseNarrativeBot::BOT_USER_ID)
   suggested_username = UserNameSuggester.suggest(discobot_username)
 
   seed_primary_email
 
   User.seed do |u|
-    u.id = -2
+    u.id = DiscourseNarrativeBot::BOT_USER_ID
     u.name = discobot_username
     u.username = suggested_username
     u.username_lower = suggested_username.downcase
@@ -32,7 +32,7 @@ unless user = User.find_by(id: -2)
     begin
       UserAvatar.import_url_for_user(
         "https://cdn.discourse.org/dev/uploads/default/original/2X/e/edb63d57a720838a7ce6a68f02ba4618787f2299.png",
-        User.find(-2),
+        User.find(DiscourseNarrativeBot::BOT_USER_ID),
         override_gravatar: true
       )
     rescue
@@ -41,7 +41,7 @@ unless user = User.find_by(id: -2)
   end
 end
 
-bot = User.find(-2)
+bot = User.find(DiscourseNarrativeBot::BOT_USER_ID)
 
 # ensure discobot has a primary email
 unless bot.primary_email
@@ -62,4 +62,4 @@ if !bot.user_profile.bio_raw
   )
 end
 
-Group.user_trust_level_change!(-2, TrustLevel[4])
+Group.user_trust_level_change!(DiscourseNarrativeBot::BOT_USER_ID, TrustLevel[4])
diff --git a/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb b/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb
new file mode 100644
index 0000000000..5f80851d7e
--- /dev/null
+++ b/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb
@@ -0,0 +1,12 @@
+class ClearLastGravatarDownloadAttemptOnUserAvatars < ActiveRecord::Migration[6.0]
+  def up
+    execute <<~SQL
+      UPDATE user_avatars
+      SET last_gravatar_download_attempt = null
+      WHERE user_id = -2 AND custom_upload_id IS NULL AND gravatar_upload_id IS NULL
+    SQL
+  end
+
+  def down
+  end
+end
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index a6be5dd056..61047c0e8b 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -55,6 +55,7 @@ after_initialize do
 
   module ::DiscourseNarrativeBot
     PLUGIN_NAME = "discourse-narrative-bot".freeze
+    BOT_USER_ID = -2
 
     class Engine < ::Rails::Engine
       engine_name PLUGIN_NAME
@@ -271,4 +272,9 @@ after_initialize do
       end
     end
   end
+
+  UserAvatar.register_custom_user_gravatar_email_hash(
+    DiscourseNarrativeBot::BOT_USER_ID,
+    "discobot@discourse.org"
+  )
 end

From b7387d4611b0b3416daf48ba1e4ca82e1d83ecaa Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 20 May 2020 10:22:51 +0800
Subject: [PATCH 1277/1830] DEV: Remove code unused code when seeding narrative
 bot.

---
 .../db/fixtures/001_discobot.rb                     | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
index bc204e4021..fda50b4829 100644
--- a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
+++ b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
@@ -26,19 +26,6 @@ unless user = User.find_by(id: DiscourseNarrativeBot::BOT_USER_ID)
     u.approved = true
     u.trust_level = TrustLevel[4]
   end
-
-  # TODO Pull the user avatar from that thread for now. In the future, pull it from a local file or from some central discobot repo.
-  if !Rails.env.test?
-    begin
-      UserAvatar.import_url_for_user(
-        "https://cdn.discourse.org/dev/uploads/default/original/2X/e/edb63d57a720838a7ce6a68f02ba4618787f2299.png",
-        User.find(DiscourseNarrativeBot::BOT_USER_ID),
-        override_gravatar: true
-      )
-    rescue
-      # In case the avatar can't be downloaded, don't fail seed
-    end
-  end
 end
 
 bot = User.find(DiscourseNarrativeBot::BOT_USER_ID)

From 37983a78150315b7b8cf2818f8cedbc0c78a689d Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 20 May 2020 10:33:34 +0800
Subject: [PATCH 1278/1830] Fix lint.

---
 ...5508_clear_last_gravatar_download_attempt_on_user_avatars.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb b/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb
index 5f80851d7e..d7f30797b5 100644
--- a/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb
+++ b/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ClearLastGravatarDownloadAttemptOnUserAvatars < ActiveRecord::Migration[6.0]
   def up
     execute <<~SQL

From 05f7d5a2def9590ccba5e2894942d119442cd741 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 20 May 2020 14:12:58 +1000
Subject: [PATCH 1279/1830] UX: Rename "Edit Message" to "Edit"

This reduces the space taken by the button.
---
 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 9746f37f37..a647dc5cde 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2100,7 +2100,7 @@ en:
         help: "Move message back to Inbox"
       edit_message:
         help: "Edit first post of the message"
-        title: "Edit Message"
+        title: "Edit"
       defer:
         help: "Mark as unread"
         title: "Defer"

From b031e3220ae5504ab265999270f109b2b8b973df Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 20 May 2020 15:28:01 +1000
Subject: [PATCH 1280/1830] FIX: migrations should not fail when db is part
 migrated

When part migrated the translate overrides may have missing columns
in that case just silently ignore overrides
---
 lib/freedom_patches/translate_accelerator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index ee724d56d1..5a82623f8f 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -164,7 +164,7 @@ module I18n
 
       by_site[locale].with_indifferent_access
     rescue ActiveRecord::StatementInvalid => e
-      if PG::UndefinedTable === e.cause
+      if PG::UndefinedTable === e.cause || PG::UndefinedColumn === e.cause
         {}
       else
         raise

From e97cb20c2a5601d5ca7e6e9f23c2d7138539b2d8 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 20 May 2020 16:46:49 +1000
Subject: [PATCH 1281/1830] UX: strip text from PM bookmark and share buttons

Also organize priorities in an easier to reason about way and
shift bookmark topic so it is after link. (consistent with posts)
---
 .../app/initializers/topic-footer-buttons.js  | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
index a13ccd2219..e00c947310 100644
--- a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
+++ b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
@@ -3,6 +3,13 @@ import showModal from "discourse/lib/show-modal";
 import { registerTopicFooterButton } from "discourse/lib/register-topic-footer-button";
 import { formattedReminderTime } from "discourse/lib/bookmark";
 
+const SHARE_PRIORITY = 1000;
+const BOOKMARK_PRIORITY = 900;
+const ARCHIVE_PRIORITY = 800;
+const FLAG_PRIORITY = 700;
+const EDIT_MESSAGE_PRIORITY = 600;
+const DEFER_PRIORITY = 500;
+
 export default {
   name: "topic-footer-buttons",
 
@@ -11,8 +18,12 @@ export default {
     registerTopicFooterButton({
       id: "share-and-invite",
       icon: "link",
-      priority: 999,
-      label: "topic.share.title",
+      priority: SHARE_PRIORITY,
+      label() {
+        if (!this.get("topic.isPrivateMessage") || this.site.mobileView) {
+          return "topic.share.title";
+        }
+      },
       title: "topic.share.help",
       action() {
         const panels = [
@@ -67,7 +78,7 @@ export default {
     registerTopicFooterButton({
       id: "flag",
       icon: "flag",
-      priority: 998,
+      priority: FLAG_PRIORITY,
       label: "topic.flag_topic.title",
       title: "topic.flag_topic.help",
       action: "showFlagTopic",
@@ -93,14 +104,16 @@ export default {
         }
         return "bookmark";
       },
-      priority: 1000,
+      priority: BOOKMARK_PRIORITY,
       classNames() {
         const bookmarked = this.get("topic.bookmarked");
         return bookmarked ? ["bookmark", "bookmarked"] : ["bookmark"];
       },
       label() {
-        const bookmarked = this.get("topic.bookmarked");
-        return bookmarked ? "bookmarked.clear_bookmarks" : "bookmarked.title";
+        if (!this.get("topic.isPrivateMessage") || this.site.mobileView) {
+          const bookmarked = this.get("topic.bookmarked");
+          return bookmarked ? "bookmarked.clear_bookmarks" : "bookmarked.title";
+        }
       },
       translatedTitle() {
         const bookmarked = this.get("topic.bookmarked");
@@ -126,7 +139,7 @@ export default {
 
     registerTopicFooterButton({
       id: "archive",
-      priority: 996,
+      priority: ARCHIVE_PRIORITY,
       icon() {
         return this.archiveIcon;
       },
@@ -155,7 +168,7 @@ export default {
 
     registerTopicFooterButton({
       id: "edit-message",
-      priority: 750,
+      priority: EDIT_MESSAGE_PRIORITY,
       icon: "pencil-alt",
       label: "topic.edit_message.title",
       title: "topic.edit_message.help",
@@ -170,7 +183,7 @@ export default {
     registerTopicFooterButton({
       id: "defer",
       icon: "circle",
-      priority: 300,
+      priority: DEFER_PRIORITY,
       label: "topic.defer.title",
       title: "topic.defer.help",
       action: "deferTopic",

From 30bbc485d02edf7e37b73fc5fdd988365bc90617 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 20 May 2020 16:53:48 +1000
Subject: [PATCH 1282/1830] DEV: remove superfluous comment

---
 Gemfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6c72e48bab..949b45404c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -127,10 +127,6 @@ gem 'mini_racer'
 # TODO: determine why highline is being held back and upgrade to latest
 gem 'highline', '~> 1.7.0', require: false
 
-# TODO: Upgrading breaks Sidekiq Web
-# This is a bit of a hornets nest cause in an ideal world we much prefer
-# if Sidekiq reused session and CSRF mitigation with Discourse on the
-# _forum_session cookie instead of a rack.session cookie
 gem 'rack', '2.2.2'
 
 gem 'rack-protection' # security

From f7f436e536ba0df963d2f7257a4a700bdfc96bbc Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 20 May 2020 15:40:00 +0800
Subject: [PATCH 1283/1830] DEV: Install `rails_failover` gem to test our Redis
 changes.

---
 Gemfile                          |  2 ++
 Gemfile.lock                     |  3 +++
 app/models/global_setting.rb     | 24 ++++++++++++++++++------
 config/initializers/001-redis.rb | 17 +++++++++++++++++
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 949b45404c..a80f23dbc0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -248,3 +248,5 @@ end
 gem 'webpush', require: false
 gem 'colored2', require: false
 gem 'maxminddb'
+
+gem 'rails_failover', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index f2c187b9b8..29f2fee899 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -277,6 +277,8 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
+    rails_failover (0.1.0)
+      redis (~> 4)
     rails_multisite (2.1.2)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
@@ -509,6 +511,7 @@ DEPENDENCIES
   rack (= 2.2.2)
   rack-mini-profiler
   rack-protection
+  rails_failover
   rails_multisite
   railties (= 6.0.3)
   rake
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index f4425919ed..21e5a137dc 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -164,9 +164,15 @@ class GlobalSetting
         c[:port] = redis_port if redis_port
 
         if redis_slave_host && redis_slave_port
-          c[:slave_host] = redis_slave_host
-          c[:slave_port] = redis_slave_port
-          c[:connector] = DiscourseRedis::Connector
+          if ENV["RAILS_FAILOVER"]
+            c[:replica_host] = redis_slave_host
+            c[:replica_port] = redis_slave_port
+            c[:connector] = RailsFailover::Redis::Connector
+          else
+            c[:slave_host] = redis_slave_host
+            c[:slave_port] = redis_slave_port
+            c[:connector] = DiscourseRedis::Connector
+          end
         end
 
         c[:password] = redis_password if redis_password.present?
@@ -188,9 +194,15 @@ class GlobalSetting
         c[:port] = message_bus_redis_port if message_bus_redis_port
 
         if message_bus_redis_slave_host && message_bus_redis_slave_port
-          c[:slave_host] = message_bus_redis_slave_host
-          c[:slave_port] = message_bus_redis_slave_port
-          c[:connector] = DiscourseRedis::Connector
+          if ENV["RAILS_FAILOVER"]
+            c[:replica_host] = message_bus_redis_slave_host
+            c[:replica_port] = message_bus_redis_slave_port
+            c[:connector] = RailsFailover::Redis::Connector
+          else
+            c[:slave_host] = message_bus_redis_slave_host
+            c[:slave_port] = message_bus_redis_slave_port
+            c[:connector] = DiscourseRedis::Connector
+          end
         end
 
         c[:password] = message_bus_redis_password if message_bus_redis_password.present?
diff --git a/config/initializers/001-redis.rb b/config/initializers/001-redis.rb
index d11303a9d5..14ce997b8f 100644
--- a/config/initializers/001-redis.rb
+++ b/config/initializers/001-redis.rb
@@ -4,3 +4,20 @@ if Rails.env.development? && ENV['DISCOURSE_FLUSH_REDIS']
   puts "Flushing redis (development mode)"
   Discourse.redis.flushdb
 end
+
+if ENV['RAILS_FAILOVER']
+  require 'rails_failover'
+
+  message_bus_keepalive_interval = MessageBus.keepalive_interval
+
+  RailsFailover::Redis.register_master_up_callback do
+    MessageBus.keepalive_interval = message_bus_keepalive_interval
+    Discourse.clear_readonly!
+    Discourse.request_refresh!
+  end
+
+  RailsFailover::Redis.register_master_down_callback do
+    # Disables MessageBus keepalive when Redis is in readonly mode
+    MessageBus.keepalive_interval = 0
+  end
+end

From 2f03a879f96f258542ef7d002f6ad4ca0e55767c Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 20 May 2020 16:06:40 +0800
Subject: [PATCH 1284/1830] DEV: Require `rails_failover` before global
 settings.

---
 config/application.rb            | 4 ++++
 config/initializers/001-redis.rb | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 43a8bf3091..ba4486320c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -27,6 +27,10 @@ require_relative '../lib/discourse_plugin_registry'
 
 require_relative '../lib/plugin_gem'
 
+if ENV['RAILS_FAILOVER']
+  require 'rails_failover'
+end
+
 # Global config
 require_relative '../app/models/global_setting'
 GlobalSetting.configure!
diff --git a/config/initializers/001-redis.rb b/config/initializers/001-redis.rb
index 14ce997b8f..f28c59a3b1 100644
--- a/config/initializers/001-redis.rb
+++ b/config/initializers/001-redis.rb
@@ -6,8 +6,6 @@ if Rails.env.development? && ENV['DISCOURSE_FLUSH_REDIS']
 end
 
 if ENV['RAILS_FAILOVER']
-  require 'rails_failover'
-
   message_bus_keepalive_interval = MessageBus.keepalive_interval
 
   RailsFailover::Redis.register_master_up_callback do

From 3aecc1990b8e8ffea8da50fb48d3e76610306098 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 20 May 2020 16:17:59 +0800
Subject: [PATCH 1285/1830] DEV: Review follow up to
 234cd5c3e7f8d1be7c98af7eeb572e5b79f0a16a.

---
 ...15508_clear_last_gravatar_download_attempt_on_user_avatars.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb b/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb
index d7f30797b5..c902973081 100644
--- a/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb
+++ b/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb
@@ -10,5 +10,6 @@ class ClearLastGravatarDownloadAttemptOnUserAvatars < ActiveRecord::Migration[6.
   end
 
   def down
+    raise ActiveRecord::IrreversibleMigration
   end
 end

From fb15da43da1a4f8f733812dc4af455f27e756418 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Wed, 20 May 2020 12:07:48 +0300
Subject: [PATCH 1286/1830] Remove old web hooks in favor of 'reviewable' web
 hook (#9776)

* FIX: Emit web hooks for flags

* FEATURE: Remove 'flag' web hook in favor of 'reviewable' web hook

* FEATURE: Remove 'queued post' web hook in favor of 'reviewable' web hook

* FIX: Do not set a default value for web hooks with no events
---
 .../admin/routes/admin-web-hooks-show.js      |  3 +--
 app/models/web_hook_event_type.rb             |  2 --
 config/locales/client.en.yml                  |  6 ------
 db/fixtures/007_web_hook_event_types.rb       | 10 ---------
 .../20200514075356_remove_flag_web_hooks.rb   | 21 +++++++++++++++++++
 ...0514075407_remove_queued_post_web_hooks.rb | 21 +++++++++++++++++++
 spec/fabricators/web_hook_fabricator.rb       | 16 --------------
 7 files changed, 43 insertions(+), 36 deletions(-)
 create mode 100644 db/migrate/20200514075356_remove_flag_web_hooks.rb
 create mode 100644 db/migrate/20200514075407_remove_queued_post_web_hooks.rb

diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js
index 34aed775cc..f0860e79f7 100644
--- a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js
@@ -1,5 +1,4 @@
 import { get } from "@ember/object";
-import { isEmpty } from "@ember/utils";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
@@ -15,7 +14,7 @@ export default DiscourseRoute.extend({
   },
 
   setupController(controller, model) {
-    if (model.get("isNew") || isEmpty(model.get("web_hook_event_types"))) {
+    if (model.get("isNew")) {
       model.set("web_hook_event_types", controller.get("defaultEventTypes"));
     }
 
diff --git a/app/models/web_hook_event_type.rb b/app/models/web_hook_event_type.rb
index 952c1c2062..442f14cb8c 100644
--- a/app/models/web_hook_event_type.rb
+++ b/app/models/web_hook_event_type.rb
@@ -7,8 +7,6 @@ class WebHookEventType < ActiveRecord::Base
   GROUP = 4
   CATEGORY = 5
   TAG = 6
-  FLAG = 7
-  QUEUED_POST = 8
   REVIEWABLE = 9
   NOTIFICATION = 10
   SOLVED = 11
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a647dc5cde..0da7d67342 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3598,12 +3598,6 @@ en:
         tag_event:
           name: "Tag Event"
           details: "When a tag is created, updated or destroyed."
-        flag_event:
-          name: "Flag Event"
-          details: "When a flag is created, agreed, disagreed or ignored."
-        queued_post_event:
-          name: "Post Approval Event"
-          details: "When a new queued post is created, approved or rejected."
         reviewable_event:
           name: "Reviewable Event"
           details: "When a new item is ready for review and when its status is updated."
diff --git a/db/fixtures/007_web_hook_event_types.rb b/db/fixtures/007_web_hook_event_types.rb
index 8bf8e93805..ec666ec5ad 100644
--- a/db/fixtures/007_web_hook_event_types.rb
+++ b/db/fixtures/007_web_hook_event_types.rb
@@ -30,16 +30,6 @@ WebHookEventType.seed do |b|
   b.name = "tag"
 end
 
-WebHookEventType.seed do |b|
-  b.id = WebHookEventType::FLAG
-  b.name = "flag"
-end
-
-WebHookEventType.seed do |b|
-  b.id = WebHookEventType::QUEUED_POST
-  b.name = "queued_post"
-end
-
 WebHookEventType.seed do |b|
   b.id = WebHookEventType::REVIEWABLE
   b.name = "reviewable"
diff --git a/db/migrate/20200514075356_remove_flag_web_hooks.rb b/db/migrate/20200514075356_remove_flag_web_hooks.rb
new file mode 100644
index 0000000000..448b7fb771
--- /dev/null
+++ b/db/migrate/20200514075356_remove_flag_web_hooks.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class RemoveFlagWebHooks < ActiveRecord::Migration[6.0]
+  def up
+    flag_event_type_id = 7
+
+    DB.exec <<~SQL
+    DELETE FROM web_hook_event_types_hooks
+    WHERE web_hook_event_type_id = #{flag_event_type_id}
+    SQL
+
+    DB.exec <<~SQL
+    DELETE FROM web_hook_event_types
+    WHERE id = #{flag_event_type_id}
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20200514075407_remove_queued_post_web_hooks.rb b/db/migrate/20200514075407_remove_queued_post_web_hooks.rb
new file mode 100644
index 0000000000..632e5013dc
--- /dev/null
+++ b/db/migrate/20200514075407_remove_queued_post_web_hooks.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class RemoveQueuedPostWebHooks < ActiveRecord::Migration[6.0]
+  def up
+    queued_post_event_type_id = 8
+
+    DB.exec <<~SQL
+    DELETE FROM web_hook_event_types_hooks
+    WHERE web_hook_event_type_id = #{queued_post_event_type_id}
+    SQL
+
+    DB.exec <<~SQL
+    DELETE FROM web_hook_event_types
+    WHERE id = #{queued_post_event_type_id}
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/spec/fabricators/web_hook_fabricator.rb b/spec/fabricators/web_hook_fabricator.rb
index 4647251080..9edc591791 100644
--- a/spec/fabricators/web_hook_fabricator.rb
+++ b/spec/fabricators/web_hook_fabricator.rb
@@ -71,22 +71,6 @@ Fabricator(:tag_web_hook, from: :web_hook) do
   end
 end
 
-Fabricator(:flag_web_hook, from: :web_hook) do
-  transient flag_hook: WebHookEventType.find_by(name: 'flag')
-
-  after_build do |web_hook, transients|
-    web_hook.web_hook_event_types = [transients[:flag_hook]]
-  end
-end
-
-Fabricator(:queued_post_web_hook, from: :web_hook) do
-  transient queued_post_hook: WebHookEventType.find_by(name: 'queued_post')
-
-  after_build do |web_hook, transients|
-    web_hook.web_hook_event_types = [transients[:queued_post_hook]]
-  end
-end
-
 Fabricator(:reviewable_web_hook, from: :web_hook) do
   transient reviewable_hook: WebHookEventType.find_by(name: 'reviewable')
 

From 02f44def5693ff3ab88259f65453ed9b4b7f5711 Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Wed, 20 May 2020 12:46:27 +0300
Subject: [PATCH 1287/1830] FIX: Don't blow up when trying to parse invalid or
 non-ASCII URLs (#9838)

* FIX: Don't blow up when trying to parseinvalid or non-ASCII URLs

Follow-up to https://github.com/discourse/discourse/commit/72f139191e9b3aeebeca31ffa8b75977afe5d816
---
 lib/file_store/s3_store.rb                  | 7 ++++++-
 spec/components/file_store/s3_store_spec.rb | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index 46dece4cfc..f42fa73057 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -79,7 +79,12 @@ module FileStore
     def has_been_uploaded?(url)
       return false if url.blank?
 
-      parsed_url = URI.parse(url)
+      begin
+        parsed_url = URI.parse(URI.encode(url))
+      rescue URI::InvalidURIError
+        return false
+      end
+
       base_hostname = URI.parse(absolute_base_url).hostname
       if url[base_hostname]
         # if the hostnames match it means the upload is in the same
diff --git a/spec/components/file_store/s3_store_spec.rb b/spec/components/file_store/s3_store_spec.rb
index 81e39d0e20..15c36b05be 100644
--- a/spec/components/file_store/s3_store_spec.rb
+++ b/spec/components/file_store/s3_store_spec.rb
@@ -304,6 +304,15 @@ describe FileStore::S3Store do
 
   describe ".has_been_uploaded?" do
 
+    it "doesn't crash for invalid URLs" do
+      expect(store.has_been_uploaded?("https://site.discourse.com/#bad#6")).to eq(false)
+    end
+
+    it "doesn't crash if URL contains non-ascii characters" do
+      expect(store.has_been_uploaded?("//s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com/漢1337.png")).to eq(true)
+      expect(store.has_been_uploaded?("//s3-upload-bucket.s3.amazonaws.com/漢1337.png")).to eq(false)
+    end
+
     it "identifies S3 uploads" do
       expect(store.has_been_uploaded?("//s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com/1337.png")).to eq(true)
     end

From 30631a963ff6c619395b771ec3e97ea6e20a49c2 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 20 May 2020 14:07:00 +0200
Subject: [PATCH 1288/1830] UX: moves editFirstPost in taggable Pms in dropdown
 on mobile (#9840)

---
 .../discourse/app/initializers/topic-footer-buttons.js         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
index e00c947310..a2de76d3e9 100644
--- a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
+++ b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
@@ -175,6 +175,9 @@ export default {
       action: "editFirstPost",
       classNames: ["edit-message"],
       dependentKeys: ["editFirstPost", "showEditOnFooter"],
+      dropdown() {
+        return this.site.mobileView && this.get("topic.isPrivateMessage");
+      },
       displayed() {
         return this.showEditOnFooter;
       }

From 4a533ec594c1b2fb54a3d9125a24f1ac4d8fc254 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 20 May 2020 19:22:20 +0530
Subject: [PATCH 1289/1830] FIX: do not parameterize tag_id (#9839)

Parameterizing tag_id was breaking tags with non-ascii characters or emoji.

Bug report: https://meta.discourse.org/t/unable-to-see-pm-lists-for-non-ascii-tag/151723/4
---
 lib/topic_query_params.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/topic_query_params.rb b/lib/topic_query_params.rb
index e1bb23cb9f..bab30135a1 100644
--- a/lib/topic_query_params.rb
+++ b/lib/topic_query_params.rb
@@ -3,7 +3,7 @@
 module TopicQueryParams
   def build_topic_list_options
     options = {}
-    params[:tags] = [params[:tag_id].parameterize] if params[:tag_id].present? && guardian.can_tag_pms?
+    params[:tags] = [params[:tag_id]] if params[:tag_id].present? && guardian.can_tag_pms?
 
     TopicQuery.public_valid_options.each do |key|
       if params.key?(key)

From cfff8b1f27f9d709179452d67cd99430bffb1a91 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 20 May 2020 10:37:43 -0400
Subject: [PATCH 1290/1830] Build(deps): Bump puma from 4.3.4 to 4.3.5 (#9836)

Bumps [puma](https://github.com/puma/puma) from 4.3.4 to 4.3.5.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/commits)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 29f2fee899..9709a203c6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -262,7 +262,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.5)
-    puma (4.3.4)
+    puma (4.3.5)
       nio4r (~> 2.0)
     r2 (0.2.7)
     rack (2.2.2)

From bd57ae83f1a4b1dea92ae9234013e2ebd41df6b6 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 20 May 2020 10:26:20 -0500
Subject: [PATCH 1291/1830] DEV: Guardian for hiding about stats (#9841)

---
 .../discourse/app/templates/about.hbs         | 88 ++++++++++---------
 app/controllers/about_controller.rb           |  2 +-
 app/serializers/about_serializer.rb           | 11 ++-
 lib/guardian.rb                               |  4 +
 test/javascripts/fixtures/about.js            |  1 +
 5 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/about.hbs b/app/assets/javascripts/discourse/app/templates/about.hbs
index 63cae2c260..2659b0ebac 100644
--- a/app/assets/javascripts/discourse/app/templates/about.hbs
+++ b/app/assets/javascripts/discourse/app/templates/about.hbs
@@ -64,50 +64,52 @@
           </section>
         {{/each}}
       {{/if}}
-      <section class="about stats">
-        <h3>{{d-icon "far-chart-bar"}}  {{i18n "about.stats"}}</h3>
+      {{#if model.can_see_about_stats}}
+        <section class="about stats">
+          <h3>{{d-icon "far-chart-bar"}}  {{i18n "about.stats"}}</h3>
 
-        <table class="table">
-          <tbody>
-            <tr>
-              <th>&nbsp;</th>
-              <th>{{i18n "about.stat.last_7_days"}}</th>
-              <th>{{i18n "about.stat.last_30_days"}}</th>
-              <th>{{i18n "about.stat.all_time"}}</th>
-            </tr>
-            <tr>
-              <td class="title">{{i18n "about.topic_count"}}</td>
-              <td>{{number model.stats.topics_7_days}}</td>
-              <td>{{number model.stats.topics_30_days}}</td>
-              <td>{{number model.stats.topic_count}}</td>
-            </tr>
-            <tr>
-              <td>{{i18n "about.post_count"}}</td>
-              <td>{{number model.stats.posts_7_days}}</td>
-              <td>{{number model.stats.posts_30_days}}</td>
-              <td>{{number model.stats.post_count}}</td>
-            </tr>
-            <tr>
-              <td>{{i18n "about.user_count"}}</td>
-              <td>{{number model.stats.users_7_days}}</td>
-              <td>{{number model.stats.users_30_days}}</td>
-              <td>{{number model.stats.user_count}}</td>
-            </tr>
-            <tr>
-              <td>{{i18n "about.active_user_count"}}</td>
-              <td>{{number model.stats.active_users_7_days}}</td>
-              <td>{{number model.stats.active_users_30_days}}</td>
-              <td>&mdash;</td>
-            </tr>
-            <tr>
-              <td>{{i18n "about.like_count"}}</td>
-              <td>{{number model.stats.likes_7_days}}</td>
-              <td>{{number model.stats.likes_30_days}}</td>
-              <td>{{number model.stats.like_count}}</td>
-            </tr>
-          </tbody>
-        </table>
-      </section>
+          <table class="table">
+            <tbody>
+              <tr>
+                <th>&nbsp;</th>
+                <th>{{i18n "about.stat.last_7_days"}}</th>
+                <th>{{i18n "about.stat.last_30_days"}}</th>
+                <th>{{i18n "about.stat.all_time"}}</th>
+              </tr>
+              <tr>
+                <td class="title">{{i18n "about.topic_count"}}</td>
+                <td>{{number model.stats.topics_7_days}}</td>
+                <td>{{number model.stats.topics_30_days}}</td>
+                <td>{{number model.stats.topic_count}}</td>
+              </tr>
+              <tr>
+                <td>{{i18n "about.post_count"}}</td>
+                <td>{{number model.stats.posts_7_days}}</td>
+                <td>{{number model.stats.posts_30_days}}</td>
+                <td>{{number model.stats.post_count}}</td>
+              </tr>
+              <tr>
+                <td>{{i18n "about.user_count"}}</td>
+                <td>{{number model.stats.users_7_days}}</td>
+                <td>{{number model.stats.users_30_days}}</td>
+                <td>{{number model.stats.user_count}}</td>
+              </tr>
+              <tr>
+                <td>{{i18n "about.active_user_count"}}</td>
+                <td>{{number model.stats.active_users_7_days}}</td>
+                <td>{{number model.stats.active_users_30_days}}</td>
+                <td>&mdash;</td>
+              </tr>
+              <tr>
+                <td>{{i18n "about.like_count"}}</td>
+                <td>{{number model.stats.likes_7_days}}</td>
+                <td>{{number model.stats.likes_30_days}}</td>
+                <td>{{number model.stats.like_count}}</td>
+              </tr>
+            </tbody>
+          </table>
+        </section>
+      {{/if}}
 
       {{#if contactInfo}}
         <section class="about contact">
diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index fe2d3a2327..3f3f9e15a3 100644
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -16,7 +16,7 @@ class AboutController < ApplicationController
         render :index
       end
       format.json do
-        render_serialized(@about, AboutSerializer)
+        render_json_dump(AboutSerializer.new(@about, scope: guardian))
       end
     end
   end
diff --git a/app/serializers/about_serializer.rb b/app/serializers/about_serializer.rb
index 308f990fd6..8230c590a4 100644
--- a/app/serializers/about_serializer.rb
+++ b/app/serializers/about_serializer.rb
@@ -21,7 +21,16 @@ class AboutSerializer < ApplicationSerializer
              :title,
              :locale,
              :version,
-             :https
+             :https,
+             :can_see_about_stats
+
+  def can_see_about_stats
+    scope.can_see_about_stats?
+  end
+
+  def include_stats?
+    can_see_about_stats
+  end
 
   def stats
     object.class.fetch_cached_stats || Jobs::AboutStats.new.execute({})
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 00d496e46e..456461fead 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -493,6 +493,10 @@ class Guardian
     is_staff?
   end
 
+  def can_see_about_stats?
+    true
+  end
+
   def auth_token
     if cookie = request&.cookies[Auth::DefaultCurrentUserProvider::TOKEN_COOKIE]
       UserAuthToken.hash_token(cookie)
diff --git a/test/javascripts/fixtures/about.js b/test/javascripts/fixtures/about.js
index 7f9f17cbba..4c7de6a87a 100644
--- a/test/javascripts/fixtures/about.js
+++ b/test/javascripts/fixtures/about.js
@@ -1,6 +1,7 @@
 export default {
   "about.json": {
     about: {
+      can_see_about_stats: true,
       stats: {
         topic_count: 27480,
         post_count: 490358,

From 6c9c8dfefdc2682b848c4a34ce1a8b7e386c3756 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 20 May 2020 11:31:11 -0400
Subject: [PATCH 1292/1830] FIX: `guidFor` is not part of `Ember.Object`

---
 app/assets/javascripts/discourse-loader.js                     | 1 -
 .../javascripts/discourse/app/initializers/copy-codeblocks.js  | 3 ++-
 app/assets/javascripts/select-kit/app/components/select-kit.js | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index d11217a985..fc829ae12f 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -36,7 +36,6 @@ var define, requirejs;
         default: Ember.Object,
         get: Ember.get,
         getProperties: Ember.getProperties,
-        guidFor: Ember.guidFor,
         set: Ember.set,
         setProperties: Ember.setProperties,
         computed: Ember.computed,
diff --git a/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js b/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
index a0b0d50962..f6fcef5e17 100644
--- a/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
+++ b/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
@@ -3,6 +3,7 @@ import { cancel, later } from "@ember/runloop";
 import { Promise } from "rsvp";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import I18n from "I18n";
+import { guidFor } from "@ember/object/internals";
 
 // http://github.com/feross/clipboard-copy
 function clipboardCopy(text) {
@@ -90,7 +91,7 @@ export default {
             const state = button.innerHTML;
             button.innerHTML = I18n.t("copy_codeblock.copied");
 
-            const commandId = Ember.guidFor(button);
+            const commandId = guidFor(button);
 
             if (_fadeCopyCodeblocksRunners[commandId]) {
               cancel(_fadeCopyCodeblocksRunners[commandId]);
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit.js b/app/assets/javascripts/select-kit/app/components/select-kit.js
index 140e96782d..02acfb5a2e 100644
--- a/app/assets/javascripts/select-kit/app/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/app/components/select-kit.js
@@ -1,5 +1,6 @@
 import I18n from "I18n";
-import EmberObject, { computed, get, guidFor } from "@ember/object";
+import EmberObject, { computed, get } from "@ember/object";
+import { guidFor } from "@ember/object/internals";
 import Component from "@ember/component";
 import deprecated from "discourse-common/lib/deprecated";
 import { makeArray } from "discourse-common/lib/helpers";

From 8e7efb48ae0d43a4c3a32d75f65da6512c568da0 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Wed, 20 May 2020 10:39:04 -0500
Subject: [PATCH 1293/1830] FIX: Update default_template.html

---
 app/views/email/default_template.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/email/default_template.html b/app/views/email/default_template.html
index 382f939273..99b2e94995 100644
--- a/app/views/email/default_template.html
+++ b/app/views/email/default_template.html
@@ -3,6 +3,8 @@
 
 <head>
   <meta http-equiv="Content-type" name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no, width=device-width">
+  <!-- prevent ios zooming + autoscaling -->
+  <meta name="x-apple-disable-message-reformatting" />
   <title></title>
 </head>
 

From 09ca75d17e8e3a38e84e3e39e41e2ee11fa3a9e9 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 20 May 2020 11:48:35 -0400
Subject: [PATCH 1294/1830] FIX: select-kit was in the wrong place

`app/` means we want to merge it into our application there. `addon`
means give it its own module namespace, which is what we wanted.
---
 app/assets/javascripts/application.js                           | 2 +-
 app/assets/javascripts/select-kit/addon/.gitkeep                | 0
 .../{app => addon}/components/admin-group-selector.js           | 0
 .../{app => addon}/components/categories-admin-dropdown.js      | 0
 .../select-kit/{app => addon}/components/category-chooser.js    | 0
 .../select-kit/{app => addon}/components/category-drop.js       | 0
 .../components/category-drop/category-drop-header.js            | 0
 .../{app => addon}/components/category-notifications-button.js  | 0
 .../select-kit/{app => addon}/components/category-row.js        | 0
 .../select-kit/{app => addon}/components/category-selector.js   | 0
 .../select-kit/{app => addon}/components/color-palettes.js      | 0
 .../components/color-palettes/color-palettes-row.js             | 0
 .../select-kit/{app => addon}/components/combo-box.js           | 0
 .../{app => addon}/components/combo-box/combo-box-header.js     | 0
 .../select-kit/{app => addon}/components/composer-actions.js    | 0
 .../select-kit/{app => addon}/components/create-color-row.js    | 0
 .../select-kit/{app => addon}/components/dropdown-select-box.js | 0
 .../dropdown-select-box/dropdown-select-box-header.js           | 0
 .../components/dropdown-select-box/dropdown-select-box-row.js   | 0
 .../{app => addon}/components/future-date-input-selector.js     | 0
 .../future-date-input-selector-header.js                        | 0
 .../future-date-input-selector-row.js                           | 0
 .../components/future-date-input-selector/mixin.js              | 0
 .../select-kit/{app => addon}/components/group-dropdown.js      | 0
 .../{app => addon}/components/group-members-dropdown.js         | 0
 .../{app => addon}/components/group-notifications-button.js     | 0
 .../select-kit/{app => addon}/components/icon-picker.js         | 0
 .../select-kit/{app => addon}/components/list-setting.js        | 0
 .../select-kit/{app => addon}/components/mini-tag-chooser.js    | 0
 .../components/mini-tag-chooser/mini-tag-chooser-header.js      | 0
 .../components/mini-tag-chooser/selected-collection.js          | 0
 .../select-kit/{app => addon}/components/multi-select.js        | 0
 .../components/multi-select/multi-select-filter.js              | 0
 .../components/multi-select/multi-select-header.js              | 0
 .../{app => addon}/components/multi-select/selected-category.js | 0
 .../{app => addon}/components/multi-select/selected-color.js    | 0
 .../select-kit/{app => addon}/components/none-category-row.js   | 0
 .../{app => addon}/components/notifications-button.js           | 0
 .../components/notifications-button/notifications-button-row.js | 0
 .../{app => addon}/components/notifications-filter.js           | 0
 .../notifications-filter/notifications-filter-header.js         | 0
 .../select-kit/{app => addon}/components/period-chooser.js      | 0
 .../components/period-chooser/period-chooser-header.js          | 0
 .../components/period-chooser/period-chooser-row.js             | 0
 .../select-kit/{app => addon}/components/pinned-button.js       | 0
 .../select-kit/{app => addon}/components/pinned-options.js      | 0
 .../components/search-advanced-category-chooser.js              | 0
 .../select-kit/{app => addon}/components/select-kit.js          | 0
 .../{app => addon}/components/select-kit/errors-collection.js   | 0
 .../{app => addon}/components/select-kit/select-kit-body.js     | 0
 .../components/select-kit/select-kit-collection.js              | 0
 .../components/select-kit/select-kit-create-row.js              | 0
 .../{app => addon}/components/select-kit/select-kit-filter.js   | 0
 .../{app => addon}/components/select-kit/select-kit-header.js   | 0
 .../{app => addon}/components/select-kit/select-kit-none-row.js | 0
 .../{app => addon}/components/select-kit/select-kit-row.js      | 0
 .../components/select-kit/single-select-header.js               | 0
 .../select-kit/{app => addon}/components/selected-color.js      | 0
 .../select-kit/{app => addon}/components/selected-name.js       | 0
 .../select-kit/{app => addon}/components/single-select.js       | 0
 .../select-kit/{app => addon}/components/tag-chooser-row.js     | 0
 .../select-kit/{app => addon}/components/tag-chooser.js         | 0
 .../select-kit/{app => addon}/components/tag-drop.js            | 0
 .../{app => addon}/components/tag-drop/tag-drop-header.js       | 0
 .../select-kit/{app => addon}/components/tag-group-chooser.js   | 0
 .../{app => addon}/components/tag-notifications-button.js       | 0
 .../javascripts/select-kit/{app => addon}/components/tag-row.js | 0
 .../select-kit/{app => addon}/components/timezone-input.js      | 0
 .../{app => addon}/components/toolbar-popup-menu-options.js     | 0
 .../toolbar-popup-menu-options-heading.js                       | 0
 .../{app => addon}/components/topic-footer-mobile-dropdown.js   | 0
 .../{app => addon}/components/topic-notifications-button.js     | 0
 .../{app => addon}/components/topic-notifications-options.js    | 0
 .../select-kit/{app => addon}/components/user-chooser.js        | 0
 .../{app => addon}/components/user-chooser/user-row.js          | 0
 .../{app => addon}/components/user-notifications-dropdown.js    | 0
 .../javascripts/select-kit/{app => addon}/mixins/plugin-api.js  | 0
 app/assets/javascripts/select-kit/{app => addon}/mixins/tags.js | 0
 .../javascripts/select-kit/{app => addon}/mixins/utils.js       | 0
 .../templates/components/category-drop/category-drop-header.hbs | 0
 .../{app => addon}/templates/components/category-row.hbs        | 0
 .../templates/components/color-palettes/color-palettes-row.hbs  | 0
 .../templates/components/combo-box/combo-box-header.hbs         | 0
 .../{app => addon}/templates/components/create-color-row.hbs    | 0
 .../dropdown-select-box/dropdown-select-box-header.hbs          | 0
 .../components/dropdown-select-box/dropdown-select-box-row.hbs  | 0
 .../future-date-input-selector-header.hbs                       | 0
 .../future-date-input-selector-row.hbs                          | 0
 .../components/mini-tag-chooser/mini-tag-chooser-header.hbs     | 0
 .../components/mini-tag-chooser/selected-collection.hbs         | 0
 .../{app => addon}/templates/components/multi-select.hbs        | 0
 .../templates/components/multi-select/multi-select-header.hbs   | 0
 .../templates/components/multi-select/selected-category.hbs     | 0
 .../notifications-filter/notifications-filter-header.hbs        | 0
 .../components/period-chooser/period-chooser-header.hbs         | 0
 .../templates/components/period-chooser/period-chooser-row.hbs  | 0
 .../{app => addon}/templates/components/pinned-button.hbs       | 0
 .../templates/components/select-kit/errors-collection.hbs       | 0
 .../templates/components/select-kit/select-kit-body.hbs         | 0
 .../templates/components/select-kit/select-kit-collection.hbs   | 0
 .../templates/components/select-kit/select-kit-filter.hbs       | 0
 .../templates/components/select-kit/select-kit-row.hbs          | 0
 .../templates/components/select-kit/single-select-header.hbs    | 0
 .../{app => addon}/templates/components/selected-name.hbs       | 0
 .../{app => addon}/templates/components/single-select.hbs       | 0
 .../{app => addon}/templates/components/tag-chooser-row.hbs     | 0
 .../templates/components/tag-drop/tag-drop-header.hbs           | 0
 .../select-kit/{app => addon}/templates/components/tag-row.hbs  | 0
 .../toolbar-popup-menu-options-heading.hbs                      | 0
 .../templates/components/topic-notifications-button.hbs         | 0
 .../templates/components/user-chooser/user-row.hbs              | 0
 111 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/select-kit/addon/.gitkeep
 rename app/assets/javascripts/select-kit/{app => addon}/components/admin-group-selector.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/categories-admin-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/category-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/category-drop.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/category-drop/category-drop-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/category-notifications-button.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/category-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/category-selector.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/color-palettes.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/color-palettes/color-palettes-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/combo-box.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/combo-box/combo-box-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/composer-actions.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/create-color-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/dropdown-select-box.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/dropdown-select-box/dropdown-select-box-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/dropdown-select-box/dropdown-select-box-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/future-date-input-selector.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/future-date-input-selector/future-date-input-selector-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/future-date-input-selector/future-date-input-selector-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/future-date-input-selector/mixin.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/group-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/group-members-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/group-notifications-button.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/icon-picker.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/list-setting.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/mini-tag-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/mini-tag-chooser/mini-tag-chooser-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/mini-tag-chooser/selected-collection.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/multi-select.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/multi-select/multi-select-filter.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/multi-select/multi-select-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/multi-select/selected-category.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/multi-select/selected-color.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/none-category-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/notifications-button.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/notifications-button/notifications-button-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/notifications-filter.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/notifications-filter/notifications-filter-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/period-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/period-chooser/period-chooser-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/period-chooser/period-chooser-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/pinned-button.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/pinned-options.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/search-advanced-category-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/errors-collection.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/select-kit-body.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/select-kit-collection.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/select-kit-create-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/select-kit-filter.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/select-kit-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/select-kit-none-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/select-kit-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/single-select-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/selected-color.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/selected-name.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/single-select.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/tag-chooser-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/tag-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/tag-drop.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/tag-drop/tag-drop-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/tag-group-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/tag-notifications-button.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/tag-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/timezone-input.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/toolbar-popup-menu-options.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/topic-footer-mobile-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/topic-notifications-button.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/topic-notifications-options.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/user-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/user-chooser/user-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/user-notifications-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/mixins/plugin-api.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/mixins/tags.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/mixins/utils.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/category-drop/category-drop-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/category-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/color-palettes/color-palettes-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/combo-box/combo-box-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/create-color-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/dropdown-select-box/dropdown-select-box-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/dropdown-select-box/dropdown-select-box-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/future-date-input-selector/future-date-input-selector-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/future-date-input-selector/future-date-input-selector-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/mini-tag-chooser/selected-collection.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/multi-select.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/multi-select/multi-select-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/multi-select/selected-category.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/notifications-filter/notifications-filter-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/period-chooser/period-chooser-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/period-chooser/period-chooser-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/pinned-button.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/select-kit/errors-collection.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/select-kit/select-kit-body.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/select-kit/select-kit-collection.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/select-kit/select-kit-filter.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/select-kit/select-kit-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/select-kit/single-select-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/selected-name.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/single-select.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/tag-chooser-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/tag-drop/tag-drop-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/tag-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/topic-notifications-button.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/user-chooser/user-row.hbs (100%)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 4445fd7986..40f1d275bb 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,6 +1,6 @@
 //= require_tree ./discourse-common/addon
 //= require ./polyfills
-//= require_tree ./select-kit/app
+//= require_tree ./select-kit/addon
 //= require ./discourse/app/app
 //= require ./app-boot
 
diff --git a/app/assets/javascripts/select-kit/addon/.gitkeep b/app/assets/javascripts/select-kit/addon/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/select-kit/app/components/admin-group-selector.js b/app/assets/javascripts/select-kit/addon/components/admin-group-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/admin-group-selector.js
rename to app/assets/javascripts/select-kit/addon/components/admin-group-selector.js
diff --git a/app/assets/javascripts/select-kit/app/components/categories-admin-dropdown.js b/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/categories-admin-dropdown.js
rename to app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
diff --git a/app/assets/javascripts/select-kit/app/components/category-chooser.js b/app/assets/javascripts/select-kit/addon/components/category-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/category-chooser.js
rename to app/assets/javascripts/select-kit/addon/components/category-chooser.js
diff --git a/app/assets/javascripts/select-kit/app/components/category-drop.js b/app/assets/javascripts/select-kit/addon/components/category-drop.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/category-drop.js
rename to app/assets/javascripts/select-kit/addon/components/category-drop.js
diff --git a/app/assets/javascripts/select-kit/app/components/category-drop/category-drop-header.js b/app/assets/javascripts/select-kit/addon/components/category-drop/category-drop-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/category-drop/category-drop-header.js
rename to app/assets/javascripts/select-kit/addon/components/category-drop/category-drop-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/category-notifications-button.js b/app/assets/javascripts/select-kit/addon/components/category-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/category-notifications-button.js
rename to app/assets/javascripts/select-kit/addon/components/category-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/app/components/category-row.js b/app/assets/javascripts/select-kit/addon/components/category-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/category-row.js
rename to app/assets/javascripts/select-kit/addon/components/category-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/category-selector.js b/app/assets/javascripts/select-kit/addon/components/category-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/category-selector.js
rename to app/assets/javascripts/select-kit/addon/components/category-selector.js
diff --git a/app/assets/javascripts/select-kit/app/components/color-palettes.js b/app/assets/javascripts/select-kit/addon/components/color-palettes.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/color-palettes.js
rename to app/assets/javascripts/select-kit/addon/components/color-palettes.js
diff --git a/app/assets/javascripts/select-kit/app/components/color-palettes/color-palettes-row.js b/app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/color-palettes/color-palettes-row.js
rename to app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/combo-box.js b/app/assets/javascripts/select-kit/addon/components/combo-box.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/combo-box.js
rename to app/assets/javascripts/select-kit/addon/components/combo-box.js
diff --git a/app/assets/javascripts/select-kit/app/components/combo-box/combo-box-header.js b/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/combo-box/combo-box-header.js
rename to app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/composer-actions.js b/app/assets/javascripts/select-kit/addon/components/composer-actions.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/composer-actions.js
rename to app/assets/javascripts/select-kit/addon/components/composer-actions.js
diff --git a/app/assets/javascripts/select-kit/app/components/create-color-row.js b/app/assets/javascripts/select-kit/addon/components/create-color-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/create-color-row.js
rename to app/assets/javascripts/select-kit/addon/components/create-color-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/dropdown-select-box.js b/app/assets/javascripts/select-kit/addon/components/dropdown-select-box.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/dropdown-select-box.js
rename to app/assets/javascripts/select-kit/addon/components/dropdown-select-box.js
diff --git a/app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-header.js b/app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-header.js
rename to app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-row.js b/app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-row.js
rename to app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/future-date-input-selector.js b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/future-date-input-selector.js
rename to app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js
diff --git a/app/assets/javascripts/select-kit/app/components/future-date-input-selector/future-date-input-selector-header.js b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/future-date-input-selector/future-date-input-selector-header.js
rename to app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/future-date-input-selector/future-date-input-selector-row.js b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/future-date-input-selector/future-date-input-selector-row.js
rename to app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/future-date-input-selector/mixin.js b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/mixin.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/future-date-input-selector/mixin.js
rename to app/assets/javascripts/select-kit/addon/components/future-date-input-selector/mixin.js
diff --git a/app/assets/javascripts/select-kit/app/components/group-dropdown.js b/app/assets/javascripts/select-kit/addon/components/group-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/group-dropdown.js
rename to app/assets/javascripts/select-kit/addon/components/group-dropdown.js
diff --git a/app/assets/javascripts/select-kit/app/components/group-members-dropdown.js b/app/assets/javascripts/select-kit/addon/components/group-members-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/group-members-dropdown.js
rename to app/assets/javascripts/select-kit/addon/components/group-members-dropdown.js
diff --git a/app/assets/javascripts/select-kit/app/components/group-notifications-button.js b/app/assets/javascripts/select-kit/addon/components/group-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/group-notifications-button.js
rename to app/assets/javascripts/select-kit/addon/components/group-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/app/components/icon-picker.js b/app/assets/javascripts/select-kit/addon/components/icon-picker.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/icon-picker.js
rename to app/assets/javascripts/select-kit/addon/components/icon-picker.js
diff --git a/app/assets/javascripts/select-kit/app/components/list-setting.js b/app/assets/javascripts/select-kit/addon/components/list-setting.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/list-setting.js
rename to app/assets/javascripts/select-kit/addon/components/list-setting.js
diff --git a/app/assets/javascripts/select-kit/app/components/mini-tag-chooser.js b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/mini-tag-chooser.js
rename to app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js
diff --git a/app/assets/javascripts/select-kit/app/components/mini-tag-chooser/mini-tag-chooser-header.js b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/mini-tag-chooser-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/mini-tag-chooser/mini-tag-chooser-header.js
rename to app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/mini-tag-chooser-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/mini-tag-chooser/selected-collection.js b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/mini-tag-chooser/selected-collection.js
rename to app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js
diff --git a/app/assets/javascripts/select-kit/app/components/multi-select.js b/app/assets/javascripts/select-kit/addon/components/multi-select.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/multi-select.js
rename to app/assets/javascripts/select-kit/addon/components/multi-select.js
diff --git a/app/assets/javascripts/select-kit/app/components/multi-select/multi-select-filter.js b/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/multi-select/multi-select-filter.js
rename to app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.js
diff --git a/app/assets/javascripts/select-kit/app/components/multi-select/multi-select-header.js b/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/multi-select/multi-select-header.js
rename to app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/multi-select/selected-category.js b/app/assets/javascripts/select-kit/addon/components/multi-select/selected-category.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/multi-select/selected-category.js
rename to app/assets/javascripts/select-kit/addon/components/multi-select/selected-category.js
diff --git a/app/assets/javascripts/select-kit/app/components/multi-select/selected-color.js b/app/assets/javascripts/select-kit/addon/components/multi-select/selected-color.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/multi-select/selected-color.js
rename to app/assets/javascripts/select-kit/addon/components/multi-select/selected-color.js
diff --git a/app/assets/javascripts/select-kit/app/components/none-category-row.js b/app/assets/javascripts/select-kit/addon/components/none-category-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/none-category-row.js
rename to app/assets/javascripts/select-kit/addon/components/none-category-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/notifications-button.js b/app/assets/javascripts/select-kit/addon/components/notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/notifications-button.js
rename to app/assets/javascripts/select-kit/addon/components/notifications-button.js
diff --git a/app/assets/javascripts/select-kit/app/components/notifications-button/notifications-button-row.js b/app/assets/javascripts/select-kit/addon/components/notifications-button/notifications-button-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/notifications-button/notifications-button-row.js
rename to app/assets/javascripts/select-kit/addon/components/notifications-button/notifications-button-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/notifications-filter.js b/app/assets/javascripts/select-kit/addon/components/notifications-filter.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/notifications-filter.js
rename to app/assets/javascripts/select-kit/addon/components/notifications-filter.js
diff --git a/app/assets/javascripts/select-kit/app/components/notifications-filter/notifications-filter-header.js b/app/assets/javascripts/select-kit/addon/components/notifications-filter/notifications-filter-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/notifications-filter/notifications-filter-header.js
rename to app/assets/javascripts/select-kit/addon/components/notifications-filter/notifications-filter-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/period-chooser.js b/app/assets/javascripts/select-kit/addon/components/period-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/period-chooser.js
rename to app/assets/javascripts/select-kit/addon/components/period-chooser.js
diff --git a/app/assets/javascripts/select-kit/app/components/period-chooser/period-chooser-header.js b/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/period-chooser/period-chooser-header.js
rename to app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/period-chooser/period-chooser-row.js b/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/period-chooser/period-chooser-row.js
rename to app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/pinned-button.js b/app/assets/javascripts/select-kit/addon/components/pinned-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/pinned-button.js
rename to app/assets/javascripts/select-kit/addon/components/pinned-button.js
diff --git a/app/assets/javascripts/select-kit/app/components/pinned-options.js b/app/assets/javascripts/select-kit/addon/components/pinned-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/pinned-options.js
rename to app/assets/javascripts/select-kit/addon/components/pinned-options.js
diff --git a/app/assets/javascripts/select-kit/app/components/search-advanced-category-chooser.js b/app/assets/javascripts/select-kit/addon/components/search-advanced-category-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/search-advanced-category-chooser.js
rename to app/assets/javascripts/select-kit/addon/components/search-advanced-category-chooser.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit.js b/app/assets/javascripts/select-kit/addon/components/select-kit.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/errors-collection.js b/app/assets/javascripts/select-kit/addon/components/select-kit/errors-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/errors-collection.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/errors-collection.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-body.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-body.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/select-kit-body.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-body.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-collection.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/select-kit-collection.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-create-row.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-create-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/select-kit-create-row.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-create-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-filter.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/select-kit-filter.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-header.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/select-kit-header.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-none-row.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-none-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/select-kit-none-row.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-none-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-row.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/select-kit-row.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/single-select-header.js b/app/assets/javascripts/select-kit/addon/components/select-kit/single-select-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/single-select-header.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/single-select-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/selected-color.js b/app/assets/javascripts/select-kit/addon/components/selected-color.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/selected-color.js
rename to app/assets/javascripts/select-kit/addon/components/selected-color.js
diff --git a/app/assets/javascripts/select-kit/app/components/selected-name.js b/app/assets/javascripts/select-kit/addon/components/selected-name.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/selected-name.js
rename to app/assets/javascripts/select-kit/addon/components/selected-name.js
diff --git a/app/assets/javascripts/select-kit/app/components/single-select.js b/app/assets/javascripts/select-kit/addon/components/single-select.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/single-select.js
rename to app/assets/javascripts/select-kit/addon/components/single-select.js
diff --git a/app/assets/javascripts/select-kit/app/components/tag-chooser-row.js b/app/assets/javascripts/select-kit/addon/components/tag-chooser-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/tag-chooser-row.js
rename to app/assets/javascripts/select-kit/addon/components/tag-chooser-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/tag-chooser.js b/app/assets/javascripts/select-kit/addon/components/tag-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/tag-chooser.js
rename to app/assets/javascripts/select-kit/addon/components/tag-chooser.js
diff --git a/app/assets/javascripts/select-kit/app/components/tag-drop.js b/app/assets/javascripts/select-kit/addon/components/tag-drop.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/tag-drop.js
rename to app/assets/javascripts/select-kit/addon/components/tag-drop.js
diff --git a/app/assets/javascripts/select-kit/app/components/tag-drop/tag-drop-header.js b/app/assets/javascripts/select-kit/addon/components/tag-drop/tag-drop-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/tag-drop/tag-drop-header.js
rename to app/assets/javascripts/select-kit/addon/components/tag-drop/tag-drop-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/tag-group-chooser.js b/app/assets/javascripts/select-kit/addon/components/tag-group-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/tag-group-chooser.js
rename to app/assets/javascripts/select-kit/addon/components/tag-group-chooser.js
diff --git a/app/assets/javascripts/select-kit/app/components/tag-notifications-button.js b/app/assets/javascripts/select-kit/addon/components/tag-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/tag-notifications-button.js
rename to app/assets/javascripts/select-kit/addon/components/tag-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/app/components/tag-row.js b/app/assets/javascripts/select-kit/addon/components/tag-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/tag-row.js
rename to app/assets/javascripts/select-kit/addon/components/tag-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/timezone-input.js b/app/assets/javascripts/select-kit/addon/components/timezone-input.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/timezone-input.js
rename to app/assets/javascripts/select-kit/addon/components/timezone-input.js
diff --git a/app/assets/javascripts/select-kit/app/components/toolbar-popup-menu-options.js b/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/toolbar-popup-menu-options.js
rename to app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options.js
diff --git a/app/assets/javascripts/select-kit/app/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js b/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
rename to app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
diff --git a/app/assets/javascripts/select-kit/app/components/topic-footer-mobile-dropdown.js b/app/assets/javascripts/select-kit/addon/components/topic-footer-mobile-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/topic-footer-mobile-dropdown.js
rename to app/assets/javascripts/select-kit/addon/components/topic-footer-mobile-dropdown.js
diff --git a/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js b/app/assets/javascripts/select-kit/addon/components/topic-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
rename to app/assets/javascripts/select-kit/addon/components/topic-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/app/components/topic-notifications-options.js b/app/assets/javascripts/select-kit/addon/components/topic-notifications-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/topic-notifications-options.js
rename to app/assets/javascripts/select-kit/addon/components/topic-notifications-options.js
diff --git a/app/assets/javascripts/select-kit/app/components/user-chooser.js b/app/assets/javascripts/select-kit/addon/components/user-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/user-chooser.js
rename to app/assets/javascripts/select-kit/addon/components/user-chooser.js
diff --git a/app/assets/javascripts/select-kit/app/components/user-chooser/user-row.js b/app/assets/javascripts/select-kit/addon/components/user-chooser/user-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/user-chooser/user-row.js
rename to app/assets/javascripts/select-kit/addon/components/user-chooser/user-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/user-notifications-dropdown.js b/app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/user-notifications-dropdown.js
rename to app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js
diff --git a/app/assets/javascripts/select-kit/app/mixins/plugin-api.js b/app/assets/javascripts/select-kit/addon/mixins/plugin-api.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/mixins/plugin-api.js
rename to app/assets/javascripts/select-kit/addon/mixins/plugin-api.js
diff --git a/app/assets/javascripts/select-kit/app/mixins/tags.js b/app/assets/javascripts/select-kit/addon/mixins/tags.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/mixins/tags.js
rename to app/assets/javascripts/select-kit/addon/mixins/tags.js
diff --git a/app/assets/javascripts/select-kit/app/mixins/utils.js b/app/assets/javascripts/select-kit/addon/mixins/utils.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/mixins/utils.js
rename to app/assets/javascripts/select-kit/addon/mixins/utils.js
diff --git a/app/assets/javascripts/select-kit/app/templates/components/category-drop/category-drop-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/category-drop/category-drop-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/category-drop/category-drop-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/category-drop/category-drop-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/category-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/color-palettes/color-palettes-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/color-palettes/color-palettes-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/color-palettes/color-palettes-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/color-palettes/color-palettes-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/combo-box/combo-box-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/create-color-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/create-color-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/create-color-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/create-color-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/future-date-input-selector/future-date-input-selector-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/future-date-input-selector/future-date-input-selector-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/mini-tag-chooser/selected-collection.hbs b/app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/selected-collection.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/mini-tag-chooser/selected-collection.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/selected-collection.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/multi-select.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/multi-select.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/multi-select/multi-select-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/multi-select/multi-select-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/multi-select/selected-category.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/multi-select/selected-category.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/notifications-filter/notifications-filter-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/notifications-filter/notifications-filter-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/notifications-filter/notifications-filter-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/notifications-filter/notifications-filter-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/period-chooser/period-chooser-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/period-chooser/period-chooser-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/period-chooser/period-chooser-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/period-chooser/period-chooser-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/pinned-button.hbs b/app/assets/javascripts/select-kit/addon/templates/components/pinned-button.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/pinned-button.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/pinned-button.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/select-kit/errors-collection.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/errors-collection.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/select-kit/errors-collection.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/select-kit/errors-collection.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-body.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-body.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-body.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-body.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-collection.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-collection.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-collection.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-collection.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-filter.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-filter.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/select-kit/single-select-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/single-select-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/select-kit/single-select-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/select-kit/single-select-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/selected-name.hbs b/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/selected-name.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/single-select.hbs b/app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/single-select.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/tag-chooser-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/tag-chooser-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/tag-chooser-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/tag-chooser-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/tag-drop/tag-drop-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/tag-drop/tag-drop-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/tag-drop/tag-drop-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/tag-drop/tag-drop-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/tag-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/tag-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/tag-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/tag-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs b/app/assets/javascripts/select-kit/addon/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/addon/templates/components/topic-notifications-button.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/topic-notifications-button.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/user-chooser/user-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/user-chooser/user-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/user-chooser/user-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/user-chooser/user-row.hbs

From 8851b79472faf1d0f53fa2e7c4d07c91ca96a9a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 20 May 2020 18:00:25 +0200
Subject: [PATCH 1295/1830] DEV: less code for Category#url

---
 app/models/category.rb | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index 63db814752..6ecfe9d3af 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -709,37 +709,29 @@ class Category < ActiveRecord::Base
     ].include? id
   end
 
-  @@url_cache = DistributedCache.new('category_url')
+  def full_slug(separator = "-")
+    start_idx = "#{Discourse.base_uri}/c/".size
+    url[start_idx..-1].gsub("/", separator)
+  end
+
+  @@url_cache = DistributedCache.new("category_url")
 
   def clear_url_cache
     @@url_cache.clear
   end
 
-  def full_slug(separator = "-")
-    start_idx = "#{Discourse.base_uri}/c/".length
-    url[start_idx..-1].gsub("/", separator)
-  end
-
   def url
-    url = @@url_cache[self.id]
-    unless url
-      url = "#{Discourse.base_uri}/c/#{slug_path.join('/')}"
-
-      @@url_cache[self.id] = url
-    end
-
-    url
+    @@url_cache[self.id] ||= "#{Discourse.base_uri}/c/#{slug_path.join('/')}"
   end
 
   def url_with_id
     self.parent_category ? "#{url}/#{self.id}" : "#{Discourse.base_uri}/c/#{self.slug}/#{self.id}"
   end
 
-  # If the name changes, try and update the category definition topic too if it's
-  # an exact match
+  # If the name changes, try and update the category definition topic too if it's an exact match
   def rename_category_definition
-    old_name = saved_changes.transform_values(&:first)["name"]
     return unless topic.present?
+    old_name = saved_changes.transform_values(&:first)["name"]
     if topic.title == I18n.t("category.topic_prefix", category: old_name)
       topic.update_attribute(:title, I18n.t("category.topic_prefix", category: name))
     end

From 3062036f2ffee70fa6d72a9a95eadd120fe78980 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 20 May 2020 12:05:41 -0400
Subject: [PATCH 1296/1830] FIX: Allow deprecation to work with Ember CLI

---
 .../discourse/app/models/nav-item.js          | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/nav-item.js b/app/assets/javascripts/discourse/app/models/nav-item.js
index 412cd8ec2e..955e536e1e 100644
--- a/app/assets/javascripts/discourse/app/models/nav-item.js
+++ b/app/assets/javascripts/discourse/app/models/nav-item.js
@@ -273,12 +273,17 @@ export function addNavItem(item) {
   NavItem.extraNavItemDescriptors.push(item);
 }
 
-Object.defineProperty(Discourse, "NavItem", {
-  get() {
-    deprecated("Import the NavItem class instead of using Discourse.NavItem", {
-      since: "2.4.0",
-      dropFrom: "2.5.0"
-    });
-    return NavItem;
-  }
-});
+if (typeof Discourse !== "undefined") {
+  Object.defineProperty(Discourse, "NavItem", {
+    get() {
+      deprecated(
+        "Import the NavItem class instead of using Discourse.NavItem",
+        {
+          since: "2.4.0",
+          dropFrom: "2.5.0"
+        }
+      );
+      return NavItem;
+    }
+  });
+}

From ba04bb755232bef01347b2b24638f2874e04c61f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 20 May 2020 12:13:15 -0400
Subject: [PATCH 1297/1830] FIX: Path should be `addon` not `app`

---
 app/assets/javascripts/wizard-application.js | 2 +-
 config/application.rb                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/wizard-application.js b/app/assets/javascripts/wizard-application.js
index b8e8797f0c..4e2a7adc07 100644
--- a/app/assets/javascripts/wizard-application.js
+++ b/app/assets/javascripts/wizard-application.js
@@ -1,6 +1,6 @@
 //= require_tree ./discourse-common/addon
 //= require i18n-patches
-//= require_tree ./select-kit/app
+//= require_tree ./select-kit/addon
 //= require wizard/router
 //= require wizard/wizard
 //= require_tree ./wizard/templates
diff --git a/config/application.rb b/config/application.rb
index ba4486320c..0157dc8289 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -254,7 +254,7 @@ module Discourse
     # Our templates shouldn't start with 'discourse/app/templates'
     config.handlebars.templates_root = {
       'discourse/app/templates' => '',
-      'select-kit/app/templates' => 'select-kit/templates/'
+      'select-kit/addon/templates' => 'select-kit/templates/'
     }
 
     config.handlebars.raw_template_namespace = "__DISCOURSE_RAW_TEMPLATES"

From e1bd57007be821a7efa0becb7b812449ac53b67f Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 20 May 2020 11:30:27 -0500
Subject: [PATCH 1298/1830] DEV: Specs for AboutController can_see_about_stats?
 impact (#9843)

---
 spec/requests/about_controller_spec.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/spec/requests/about_controller_spec.rb b/spec/requests/about_controller_spec.rb
index 6c58284979..a10b766304 100644
--- a/spec/requests/about_controller_spec.rb
+++ b/spec/requests/about_controller_spec.rb
@@ -36,5 +36,21 @@ describe AboutController do
         expect(response.body).to include("<title>About - Discourse</title>")
       end
     end
+
+    it "serializes stats when 'Guardian#can_see_about_stats?' is true" do
+      Guardian.any_instance.stubs(:can_see_about_stats?).returns(true)
+      get "/about.json"
+
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["about"].keys).to include("stats")
+    end
+
+    it "does not serialize stats when 'Guardian#can_see_about_stats?' is false" do
+      Guardian.any_instance.stubs(:can_see_about_stats?).returns(false)
+      get "/about.json"
+
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["about"].keys).not_to include("stats")
+    end
   end
 end

From 096eca0ee813fa5ba79d76e6012f251e5f85a8e4 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 20 May 2020 15:09:17 -0400
Subject: [PATCH 1299/1830] FIX: Requests were not being logged correctly

`enable` was defaulting to `nil` which is not what we wanted.
---
 app/models/application_request.rb | 7 ++++---
 spec/rails_helper.rb              | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/models/application_request.rb b/app/models/application_request.rb
index 52a6a8a87e..3d0d8ae905 100644
--- a/app/models/application_request.rb
+++ b/app/models/application_request.rb
@@ -16,15 +16,16 @@ class ApplicationRequest < ActiveRecord::Base
   include CachedCounting
 
   def self.disable
-    @enabled = false
+    @disabled = true
   end
 
   def self.enable
-    @enabled = true
+    @disabled = false
   end
 
   def self.increment!(type, opts = nil)
-    perform_increment!(redis_key(type), opts) if @enabled
+    return if @disabled
+    perform_increment!(redis_key(type), opts)
   end
 
   def self.write_cache!(date = nil)
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index a0ce4b71b7..cd235fedc9 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -128,6 +128,9 @@ module TestSetup
     # code that runs inside jobs. run_later! means they are put on the redis
     # queue and never processed.
     Jobs.run_later!
+
+    # Don't track ApplicationRequests in test mode unless opted in
+    ApplicationRequest.disable
   end
 end
 

From eef47a26d9ea6db10a646771b094a9f534511c85 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 20 May 2020 17:17:47 -0400
Subject: [PATCH 1300/1830] UX: More consistent mobile banner/alert styles, css
 cleanup

---
 app/assets/stylesheets/common/base/alert.scss | 1 +
 app/assets/stylesheets/desktop.scss           | 1 -
 app/assets/stylesheets/desktop/alert.scss     | 3 ---
 app/assets/stylesheets/mobile/alert.scss      | 5 +++--
 app/assets/stylesheets/mobile/banner.scss     | 7 +------
 5 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 app/assets/stylesheets/desktop/alert.scss

diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss
index d729cdc742..05a2902905 100644
--- a/app/assets/stylesheets/common/base/alert.scss
+++ b/app/assets/stylesheets/common/base/alert.scss
@@ -3,6 +3,7 @@
   background-color: $danger-low;
   color: $primary;
   position: relative;
+  margin-bottom: 1em;
 
   .close {
     font-size: $font-up-3;
diff --git a/app/assets/stylesheets/desktop.scss b/app/assets/stylesheets/desktop.scss
index 70229afbbc..064cd7174a 100644
--- a/app/assets/stylesheets/desktop.scss
+++ b/app/assets/stylesheets/desktop.scss
@@ -2,7 +2,6 @@
 
 /* @import "desktop/*"; TODO: get this working again */
 
-@import "desktop/alert";
 @import "desktop/banner";
 @import "desktop/compose";
 @import "desktop/discourse";
diff --git a/app/assets/stylesheets/desktop/alert.scss b/app/assets/stylesheets/desktop/alert.scss
deleted file mode 100644
index f3f57eac66..0000000000
--- a/app/assets/stylesheets/desktop/alert.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.alert {
-  margin-bottom: 1em;
-}
diff --git a/app/assets/stylesheets/mobile/alert.scss b/app/assets/stylesheets/mobile/alert.scss
index 0ee9b44ee0..12e60245e5 100644
--- a/app/assets/stylesheets/mobile/alert.scss
+++ b/app/assets/stylesheets/mobile/alert.scss
@@ -1,7 +1,8 @@
-// there are (n) new or updated topics, click to show
 .alert.alert-info {
-  margin: 0;
+  margin-bottom: 0.5em;
   &.clickable {
+    // there are (n) new or updated topics, click to show
+    margin-bottom: 0;
     padding: 1em;
   }
 }
diff --git a/app/assets/stylesheets/mobile/banner.scss b/app/assets/stylesheets/mobile/banner.scss
index 852b284736..fc308f0588 100644
--- a/app/assets/stylesheets/mobile/banner.scss
+++ b/app/assets/stylesheets/mobile/banner.scss
@@ -3,11 +3,6 @@
 // --------------------------------------------------
 
 #banner {
-  // go full width on mobile, by extending into the 10px wrap
-  // borders on left and right
-  margin: 0 -10px;
   max-height: 180px;
-  @media all and (max-height: 499px) {
-    max-height: 100px;
-  }
+  height: 20vh;
 }

From 234933c781c0a0e6705b38abb2da9ec0c62af839 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Wed, 20 May 2020 19:00:35 -0300
Subject: [PATCH 1301/1830] FIX: Show staff counters if the rejected posts
 count is the only value to show (#9845)

---
 app/assets/javascripts/discourse/app/controllers/user.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js
index cc2db042fb..b466f084ed 100644
--- a/app/assets/javascripts/discourse/app/controllers/user.js
+++ b/app/assets/javascripts/discourse/app/controllers/user.js
@@ -51,13 +51,15 @@ export default Controller.extend(CanCheckEmails, {
   hasDeletedPosts: gt("model.number_of_deleted_posts", 0),
   hasBeenSuspended: gt("model.number_of_suspensions", 0),
   hasReceivedWarnings: gt("model.warnings_received_count", 0),
+  hasRejectedPosts: gt("model.number_of_rejected_posts", 0),
 
   showStaffCounters: or(
     "hasGivenFlags",
     "hasFlaggedPosts",
     "hasDeletedPosts",
     "hasBeenSuspended",
-    "hasReceivedWarnings"
+    "hasReceivedWarnings",
+    "hasRejectedPosts"
   ),
 
   showFeaturedTopic: and(

From 62ecb2885fed1fee95b8879811c7978eb509a910 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 20 May 2020 18:05:27 -0400
Subject: [PATCH 1302/1830] glob @import desktop and mobile scss

---
 app/assets/stylesheets/desktop.scss | 19 +----------------
 app/assets/stylesheets/mobile.scss  | 33 +----------------------------
 2 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/app/assets/stylesheets/desktop.scss b/app/assets/stylesheets/desktop.scss
index 064cd7174a..e9213e897b 100644
--- a/app/assets/stylesheets/desktop.scss
+++ b/app/assets/stylesheets/desktop.scss
@@ -1,23 +1,6 @@
 @import "common";
 
-/* @import "desktop/*"; TODO: get this working again */
-
-@import "desktop/banner";
-@import "desktop/compose";
-@import "desktop/discourse";
-@import "desktop/header";
-@import "desktop/login";
-@import "desktop/modal";
-@import "desktop/category-list";
-@import "desktop/latest-topic-list";
-@import "desktop/topic-list";
-@import "desktop/topic-post";
-@import "desktop/topic";
-@import "desktop/upload";
-@import "desktop/user";
-@import "desktop/history";
-@import "desktop/group";
-@import "desktop/admin_customize";
+@import "desktop/*";
 
 // Import all component-specific files
 @import "desktop/components/*";
diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss
index ee9c3ed92d..a3202ca43c 100644
--- a/app/assets/stylesheets/mobile.scss
+++ b/app/assets/stylesheets/mobile.scss
@@ -1,37 +1,6 @@
 @import "common";
 
-/* @import "mobile/*"; TODO: get this working again */
-
-@import "mobile/buttons";
-@import "mobile/alert";
-@import "mobile/banner";
-@import "mobile/compose";
-@import "mobile/discourse";
-@import "mobile/header";
-@import "mobile/login";
-@import "mobile/modal";
-@import "mobile/topic-list";
-@import "mobile/topic-post";
-@import "mobile/topic";
-@import "mobile/upload";
-@import "mobile/user";
-@import "mobile/history";
-@import "mobile/lightbox";
-@import "mobile/directory";
-@import "mobile/search";
-@import "mobile/emoji";
-@import "mobile/ring";
-@import "mobile/group";
-@import "mobile/dashboard";
-@import "mobile/admin_badges";
-@import "mobile/admin_customize";
-@import "mobile/admin_reports";
-@import "mobile/admin_report";
-@import "mobile/admin_report_table";
-@import "mobile/admin_report_counters";
-@import "mobile/admin_emojis";
-@import "mobile/menu-panel";
-@import "mobile/reviewables";
+@import "mobile/*";
 
 // Import all component-specific files
 @import "mobile/components/*";

From bf7103343afc3c1ff39cef1af3ba07cfac49ef5d Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Thu, 21 May 2020 08:19:21 +1000
Subject: [PATCH 1303/1830] FIX: sidekiq is using _forim_session (#9825)

Configure Sidekiq to use _forum_session instead of a rack.session
---
 config/routes.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/routes.rb b/config/routes.rb
index a881b260d1..e3e7731bb2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -23,6 +23,7 @@ Discourse::Application.routes.draw do
   post "webhooks/sparkpost" => "webhooks#sparkpost"
 
   scope path: nil, constraints: { format: /.*/ } do
+    Sidekiq::Web.set :sessions, Rails.application.config.session_options
     if Rails.env.development?
       mount Sidekiq::Web => "/sidekiq"
       mount Logster::Web => "/logs"

From 68db5deaeca9e3b89501581abaf6e69a9f7ae760 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 21 May 2020 06:55:22 +0800
Subject: [PATCH 1304/1830] FIX: Badge granter was disabled by default.

---
 app/services/badge_granter.rb | 6 +++---
 spec/rails_helper.rb          | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index e402fb880c..a5027c5303 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -3,11 +3,11 @@
 class BadgeGranter
 
   def self.disable_queue
-    @queue_enabled = false
+    @queue_disabled = true
   end
 
   def self.enable_queue
-    @queue_enabled = true
+    @queue_disabled = false
   end
 
   def initialize(badge, user, opts = {})
@@ -124,7 +124,7 @@ class BadgeGranter
   end
 
   def self.queue_badge_grant(type, opt)
-    return if !SiteSetting.enable_badges || !@queue_enabled
+    return if !SiteSetting.enable_badges || @queue_disabled
     payload = nil
 
     case type
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index cd235fedc9..256de29658 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -131,6 +131,9 @@ module TestSetup
 
     # Don't track ApplicationRequests in test mode unless opted in
     ApplicationRequest.disable
+
+    # Don't queue badge grant in test mode
+    BadgeGranter.disable_queue
   end
 end
 

From df68d11c388e405b21c285c17ba633b1f731e512 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 21 May 2020 13:19:48 +1000
Subject: [PATCH 1305/1830] FEATURE: Add topic excerpt max length site setting
 (#9847)

Adds a new topic_excerpt_maxlength site setting.

* When topic excerpt is requested for a post, use the new topic_excerpt_maxlength site setting to limit the size of the excerpt
* Remove code for getting/setting Post.excerpt_size as it is not used anywhere
---
 app/models/post.rb                  | 10 +---------
 config/locales/server.en.yml        |  1 +
 config/site_settings.yml            |  6 ++++++
 spec/components/search_spec.rb      |  2 +-
 spec/fabricators/post_fabricator.rb |  2 +-
 spec/models/post_spec.rb            | 19 +++++++++++++++++++
 6 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/models/post.rb b/app/models/post.rb
index 89dbbcfebb..30ebaf0163 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -159,14 +159,6 @@ class Post < ActiveRecord::Base
     includes(:post_details).find_by(post_details: { key: key, value: value })
   end
 
-  def self.excerpt_size=(sz)
-    @excerpt_size = sz
-  end
-
-  def self.excerpt_size
-    @excerpt_size || 220
-  end
-
   def whisper?
     post_type == Post.types[:whisper]
   end
@@ -482,7 +474,7 @@ class Post < ActiveRecord::Base
   end
 
   def excerpt_for_topic
-    Post.excerpt(cooked, Post.excerpt_size, strip_links: true, strip_images: true, post: self)
+    Post.excerpt(cooked, SiteSetting.topic_excerpt_maxlength, strip_links: true, strip_images: true, post: self)
   end
 
   def is_first_post?
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 996fd4040b..d44d4678ed 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1467,6 +1467,7 @@ en:
     exclude_rel_nofollow_domains: "A list of domains where nofollow should not be added to links. example.com will automatically allow sub.example.com as well. As a minimum, you should add the domain of this site to help web crawlers find all content. If other parts of your website are at other domains, add those too."
 
     post_excerpt_maxlength: "Maximum length of a post excerpt / summary."
+    topic_excerpt_maxlength: "Maximum length of a topic excerpt / summary, generated from the first post in a topic."
     show_pinned_excerpt_mobile: "Show excerpt on pinned topics in mobile view."
     show_pinned_excerpt_desktop: "Show excerpt on pinned topics in desktop view."
     post_onebox_maxlength: "Maximum length of a oneboxed Discourse post in characters."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index ea4bbd4b66..88387952d7 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -819,6 +819,12 @@ posting:
       ja: 120
       zh_CN: 120
       zh_TW: 120
+  topic_excerpt_maxlength:
+    default: 220
+    locale_default:
+      ja: 120
+      zh_CN: 120
+      zh_TW: 120
   show_pinned_excerpt_mobile:
     client: true
     default: true
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index a455d81ec1..599ea3c5aa 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -444,7 +444,7 @@ describe Search do
       end
 
       let(:expected_blurb) do
-        "...to satisfy any test conditions that require content longer than the typical test post raw content. elephant"
+        "...quire content longer than the typical test post raw content. It really is some long content, folks. elephant"
       end
 
       it 'returns the post' do
diff --git a/spec/fabricators/post_fabricator.rb b/spec/fabricators/post_fabricator.rb
index 42235cb94f..77a234d981 100644
--- a/spec/fabricators/post_fabricator.rb
+++ b/spec/fabricators/post_fabricator.rb
@@ -10,7 +10,7 @@ end
 Fabricator(:post_with_long_raw_content, from: :post) do
   raw 'This is a sample post with semi-long raw content. The raw content is also more than
       two hundred characters to satisfy any test conditions that require content longer
-      than the typical test post raw content.'
+      than the typical test post raw content. It really is some long content, folks.'
 end
 
 Fabricator(:post_with_youtube, from: :post) do
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 4cc716d691..d0e2aba631 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1158,6 +1158,25 @@ describe Post do
     expect(post.custom_fields).to eq("Tommy" => "Hanks", "Vincent" => "Vega")
   end
 
+  describe "#excerpt_for_topic" do
+    it "returns a topic excerpt, defaulting to 220 chars" do
+      expected_excerpt = "This is a sample post with semi-long raw content. The raw content is also more than \ntwo hundred characters to satisfy any test conditions that require content longer \nthan the typical test post raw content. It really is&hellip;"
+      post = Fabricate(:post_with_long_raw_content)
+      post.rebake!
+      excerpt = post.excerpt_for_topic
+      expect(excerpt).to eq(expected_excerpt)
+    end
+
+    it "respects the site setting for topic excerpt" do
+      SiteSetting.topic_excerpt_maxlength = 10
+      expected_excerpt = "This is a &hellip;"
+      post = Fabricate(:post_with_long_raw_content)
+      post.rebake!
+      excerpt = post.excerpt_for_topic
+      expect(excerpt).to eq(expected_excerpt)
+    end
+  end
+
   describe "#rebake!" do
     it "will rebake a post correctly" do
       post = create_post

From f4b82f1dc05081b5745a49a3b0dfa7f2bc852e3f Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 21 May 2020 07:19:25 +0800
Subject: [PATCH 1306/1830] DEV: Fix randomly failing spec.

If a user is created with an id of 999, a `upload.user_id ==
user_avatar.user_id` will return true. This fix increases the id of the
upload to something that we will not hit in the foreseeable future.
---
 spec/components/guardian/user_guardian_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/components/guardian/user_guardian_spec.rb b/spec/components/guardian/user_guardian_spec.rb
index b812fa9526..10b6afc941 100644
--- a/spec/components/guardian/user_guardian_spec.rb
+++ b/spec/components/guardian/user_guardian_spec.rb
@@ -25,13 +25,13 @@ describe UserGuardian do
   end
 
   let :already_uploaded do
-    u = Upload.new(user_id: 999, id: 2)
+    u = Upload.new(user_id: 9999, id: 2)
     user_avatar.custom_upload_id = u.id
     u
   end
 
   let :not_my_upload do
-    Upload.new(user_id: 999, id: 3)
+    Upload.new(user_id: 9999, id: 3)
   end
 
   let(:moderator_upload) do

From a2d939608d5b3adc7f037dc0ca38e7d1f6b895f6 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 21 May 2020 11:41:58 +0800
Subject: [PATCH 1307/1830] Bump rails_failover to 0.2.0.

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9709a203c6..6d65777f2c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -277,7 +277,7 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails_failover (0.1.0)
+    rails_failover (0.2.0)
       redis (~> 4)
     rails_multisite (2.1.2)
       activerecord (> 5.0, < 7)

From 3c9212fd88c6663061d9e5dd2ddc38e1e5d317bd Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 21 May 2020 13:00:05 +0530
Subject: [PATCH 1308/1830] UX: add title for user profile link

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

diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index ca4d73c925..c38e48a979 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -125,6 +125,7 @@ createWidget(
           {
             attributes: {
               href: attrs.user.get("path"),
+              title: attrs.user.get("username"),
               "data-auto-route": true
             }
           },

From 18959ff9da96b78cbb2fb0d0583022d7d0d329d0 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 21 May 2020 14:02:12 +0530
Subject: [PATCH 1309/1830] UX: user name instead username for profile link
 title

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

diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index c38e48a979..8e27a15a03 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -125,7 +125,7 @@ createWidget(
           {
             attributes: {
               href: attrs.user.get("path"),
-              title: attrs.user.get("username"),
+              title: attrs.user.get("name"),
               "data-auto-route": true
             }
           },

From 7b6fbe9af2a4c7ac46d723af7079705e4b2de01d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 21 May 2020 11:04:23 +0200
Subject: [PATCH 1310/1830] FIX: adds missing tags to published page header
 (#9835)

---
 app/views/layouts/publish.html.erb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/views/layouts/publish.html.erb b/app/views/layouts/publish.html.erb
index 5bb0f957c5..4a249e8f32 100644
--- a/app/views/layouts/publish.html.erb
+++ b/app/views/layouts/publish.html.erb
@@ -2,13 +2,8 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, user-scalable=yes, viewport-fit=cover">
-
+    <%= render partial: "layouts/head" %>
     <%= render partial: "common/discourse_publish_stylesheet" %>
-
-    <%- if @canonical_url -%>
-      <link rel="canonical" href="<%= @canonical_url %>" />
-    <%- end -%>
   </head>
   <body class="<%= @body_classes.to_a.join(' ') %>">
     <%= yield %>

From 66960563ea9a34175018a7b742ee1149143fc830 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 21 May 2020 11:16:44 +0200
Subject: [PATCH 1311/1830] FIX: ensures category chooser is case insensitive
 (#9850)

---
 .../addon/components/category-chooser.js         |  1 +
 .../acceptance/category-chooser-test.js          | 16 ++++++++++++++++
 test/javascripts/helpers/select-kit-helper.js    |  9 +++++++++
 3 files changed, 26 insertions(+)

diff --git a/app/assets/javascripts/select-kit/addon/components/category-chooser.js b/app/assets/javascripts/select-kit/addon/components/category-chooser.js
index f36e8be2d3..72d0167ac0 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-chooser.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-chooser.js
@@ -67,6 +67,7 @@ export default ComboBoxComponent.extend({
 
   search(filter) {
     if (filter) {
+      filter = filter.toLowerCase();
       return this.content.filter(item => {
         const category = Category.findById(this.getValue(item));
         const categoryName = this.getName(item);
diff --git a/test/javascripts/acceptance/category-chooser-test.js b/test/javascripts/acceptance/category-chooser-test.js
index b6772ab771..2247c8cbee 100644
--- a/test/javascripts/acceptance/category-chooser-test.js
+++ b/test/javascripts/acceptance/category-chooser-test.js
@@ -29,3 +29,19 @@ QUnit.test("prefill category when category_id is set", async assert => {
     1
   );
 });
+
+QUnit.test("filter is case insensitive", async assert => {
+  const categoryChooser = selectKit(".category-chooser");
+
+  await visit("/");
+  await click("#create-topic");
+  await categoryChooser.expand();
+  await categoryChooser.fillInFilter("bug");
+
+  assert.ok(categoryChooser.rows().length, 1);
+
+  await categoryChooser.emptyFilter();
+  await categoryChooser.fillInFilter("Bug");
+
+  assert.ok(categoryChooser.rows().length, 1);
+});
diff --git a/test/javascripts/helpers/select-kit-helper.js b/test/javascripts/helpers/select-kit-helper.js
index 5d80b8f0b3..f795991326 100644
--- a/test/javascripts/helpers/select-kit-helper.js
+++ b/test/javascripts/helpers/select-kit-helper.js
@@ -32,6 +32,11 @@ async function selectKitFillInFilter(filter, selector) {
   );
 }
 
+async function selectKitEmptyFilter(selector) {
+  checkSelectKitIsNotCollapsed(selector);
+  await fillIn(`${selector} .filter-input`, "");
+}
+
 async function selectKitSelectRowByValue(value, selector) {
   checkSelectKitIsNotCollapsed(selector);
   await click(`${selector} .select-kit-row[data-value='${value}']`);
@@ -180,6 +185,10 @@ export default function selectKit(selector) {
       await selectKitFillInFilter(filter, selector);
     },
 
+    async emptyFilter() {
+      await selectKitEmptyFilter(selector);
+    },
+
     async keyboard(value, target) {
       await keyboardHelper(value, target, selector);
     },

From bde8862f0fba59edaf8fd9159caf4d56a51dbf79 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 21 May 2020 10:44:25 +0100
Subject: [PATCH 1312/1830] FIX: Allow GitHub app client_id to be used for
 OAuth configuration

---
 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 88387952d7..6209cc621a 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -394,7 +394,7 @@ login:
     default: false
   github_client_id:
     default: ""
-    regex: "^[a-f0-9]+$"
+    regex: "^[a-zA-Z0-9\\.]+$"
   github_client_secret:
     default: ""
     regex: "^[a-f0-9]+$"

From 11304ba27c2ab40f7b25bccfd74dcb4ca81f3ca5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 21 May 2020 09:23:34 -0400
Subject: [PATCH 1313/1830] Build(deps): Bump rubocop from 0.83.0 to 0.84.0
 (#9849)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.83.0 to 0.84.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.83.0...v0.84.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6d65777f2c..db4b88d863 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -343,13 +343,16 @@ GEM
       json-schema (~> 2.2)
       railties (>= 3.1, < 7.0)
     rtlit (0.0.5)
-    rubocop (0.83.0)
+    rubocop (0.84.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
     rubocop-discourse (2.1.2)
       rubocop (>= 0.69.0)
       rubocop-rspec (>= 1.39.0)

From 1a5bcf2a648caf3d277ae2b0856a566789c55e3f Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Thu, 21 May 2020 08:32:50 -0500
Subject: [PATCH 1314/1830] UX: Remove live theme previewing in favor of
 refresh (#9798)

---
 .../app/controllers/preferences/interface.js  | 30 +++++----
 .../discourse/app/helpers/page-reloader.js    | 10 +++
 .../discourse/app/lib/theme-selector.js       | 61 -------------------
 .../app/templates/preferences/interface.hbs   |  4 +-
 app/assets/stylesheets/common/base/user.scss  |  3 +
 app/controllers/themes_controller.rb          | 31 ----------
 config/locales/client.en.yml                  |  1 +
 config/routes.rb                              |  2 -
 .../acceptance/preferences-test.js            |  1 -
 9 files changed, 35 insertions(+), 108 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/helpers/page-reloader.js
 delete mode 100644 app/controllers/themes_controller.rb

diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
index 1ad85b7d7b..2fcc5781c3 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
@@ -2,13 +2,10 @@ import I18n from "I18n";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { setDefaultHomepage } from "discourse/lib/utilities";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import {
-  listThemes,
-  previewTheme,
-  setLocalTheme
-} from "discourse/lib/theme-selector";
+import discourseComputed from "discourse-common/utils/decorators";
+import { listThemes, setLocalTheme } from "discourse/lib/theme-selector";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import pageReloader from "discourse/helpers/page-reloader";
 import {
   safariHacksDisabled,
   isiPad,
@@ -28,6 +25,9 @@ const TEXT_SIZES = ["smaller", "normal", "larger", "largest"];
 const TITLE_COUNT_MODES = ["notifications", "contextual"];
 
 export default Controller.extend({
+  currentThemeId: -1,
+  preferencesController: inject("preferences"),
+
   @discourseComputed("makeThemeDefault")
   saveAttrNames(makeDefault) {
     let attrs = [
@@ -51,8 +51,6 @@ export default Controller.extend({
     return attrs;
   },
 
-  preferencesController: inject("preferences"),
-
   @discourseComputed()
   isiPad() {
     // TODO: remove this preference checkbox when iOS adoption > 90%
@@ -105,10 +103,14 @@ export default Controller.extend({
     return themes && themes.length > 1;
   },
 
-  @observes("themeId")
-  themeIdChanged() {
-    const id = this.themeId;
-    previewTheme([id]);
+  @discourseComputed("themeId")
+  themeIdChanged(themeId) {
+    if (this.currentThemeId === -1) {
+      this.set("currentThemeId", themeId);
+      return false;
+    } else {
+      return this.currentThemeId !== themeId;
+    }
   },
 
   @discourseComputed("model.user_option.theme_ids", "themeId")
@@ -189,6 +191,10 @@ export default Controller.extend({
               this.disableSafariHacks.toString()
             );
           }
+
+          if (this.themeId !== this.currentThemeId) {
+            pageReloader.reload();
+          }
         })
         .catch(popupAjaxError);
     },
diff --git a/app/assets/javascripts/discourse/app/helpers/page-reloader.js b/app/assets/javascripts/discourse/app/helpers/page-reloader.js
new file mode 100644
index 0000000000..6429be3a3c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/helpers/page-reloader.js
@@ -0,0 +1,10 @@
+import EmberObject from "@ember/object";
+import Ember from "ember";
+
+export default EmberObject.create({
+  reload: function() {
+    if (!Ember.testing) {
+      location.reload();
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/app/lib/theme-selector.js b/app/assets/javascripts/discourse/app/lib/theme-selector.js
index 9d293fe312..2eb4912c9c 100644
--- a/app/assets/javascripts/discourse/app/lib/theme-selector.js
+++ b/app/assets/javascripts/discourse/app/lib/theme-selector.js
@@ -1,5 +1,4 @@
 import I18n from "I18n";
-import { ajax } from "discourse/lib/ajax";
 import deprecated from "discourse-common/lib/deprecated";
 
 const keySelector = "meta[name=discourse_theme_ids]";
@@ -44,66 +43,6 @@ export function setLocalTheme(ids, themeSeq) {
   }
 }
 
-export function refreshCSS(node, hash, newHref) {
-  let $orig = $(node);
-
-  if ($orig.data("reloading")) {
-    clearTimeout($orig.data("timeout"));
-    $orig.data("copy").remove();
-  }
-
-  if (!$orig.data("orig")) {
-    $orig.data("orig", node.href);
-  }
-
-  $orig.data("reloading", true);
-
-  const orig = $(node).data("orig");
-
-  let reloaded = $orig.clone(true);
-  if (hash) {
-    reloaded[0].href =
-      orig + (orig.indexOf("?") >= 0 ? "&hash=" : "?hash=") + hash;
-  } else {
-    reloaded[0].href = newHref;
-  }
-
-  $orig.after(reloaded);
-
-  let timeout = setTimeout(() => {
-    $orig.remove();
-    reloaded.data("reloading", false);
-  }, 2000);
-
-  $orig.data("timeout", timeout);
-  $orig.data("copy", reloaded);
-}
-
-export function previewTheme(ids = []) {
-  ids = ids.reject(id => !id);
-  if (!ids.includes(currentThemeId())) {
-    Discourse.set("assetVersion", "forceRefresh");
-
-    ajax(`/themes/assets/${ids.length > 0 ? ids.join("-") : "default"}`).then(
-      results => {
-        const elem = _.first($(keySelector));
-        if (elem) {
-          elem.content = ids.join(",");
-        }
-
-        results.themes.forEach(theme => {
-          const node = $(
-            `link[rel=stylesheet][data-target=${theme.target}]`
-          )[0];
-          if (node) {
-            refreshCSS(node, null, theme.new_href);
-          }
-        });
-      }
-    );
-  }
-}
-
 export function listThemes(site) {
   let themes = site.get("user_themes");
 
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
index 45607c8cb7..4f1f13c614 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
@@ -5,9 +5,11 @@
       {{combo-box
         content=userSelectableThemes
         value=themeId
-        onChange=(action (mut themeId))
       }}
     </div>
+    {{#if themeIdChanged}}
+      <p class="alert alert-success save-theme-alert">{{i18n "user.save_to_change_theme" save_text=(i18n "save") }}</p>
+    {{/if}}
     {{#if showThemeSetDefault}}
       <div class="controls">
         {{preference-checkbox labelKey="user.theme_default_on_all_devices" checked=makeThemeDefault}}
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 587af3c353..4d5e9f4288 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -653,6 +653,9 @@
     padding: 5px 0;
     font-weight: bold;
   }
+  .save-theme-alert {
+    font-size: $font-down-1;
+  }
 }
 
 .paginated-topics-list {
diff --git a/app/controllers/themes_controller.rb b/app/controllers/themes_controller.rb
deleted file mode 100644
index 6520ec7097..0000000000
--- a/app/controllers/themes_controller.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-class ThemesController < ::ApplicationController
-  def assets
-    theme_ids = params[:ids].to_s.split("-").map(&:to_i)
-
-    if params[:ids] == "default"
-      theme_ids = nil
-    else
-      raise Discourse::NotFound unless guardian.allow_themes?(theme_ids)
-    end
-
-    targets = view_context.mobile_view? ? [:mobile, :mobile_theme] : [:desktop, :desktop_theme]
-    targets << :admin if guardian.is_staff?
-    targets.append(*Discourse.find_plugin_css_assets(mobile_view: true, desktop_view: true))
-
-    object = targets.map do |target|
-      Stylesheet::Manager.stylesheet_data(target, theme_ids).map do |hash|
-        next hash unless Rails.env.development?
-
-        dup_hash = hash.dup
-        dup_hash[:new_href] = dup_hash[:new_href].dup
-        dup_hash[:new_href] << (dup_hash[:new_href].include?("?") ? "&" : "?")
-        dup_hash[:new_href] << SecureRandom.hex
-        dup_hash
-      end
-    end.flatten
-
-    render json: object.as_json
-  end
-end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 0da7d67342..3c3618ef96 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -963,6 +963,7 @@ en:
       api_approved: "Approved:"
       api_last_used_at: "Last used at:"
       theme: "Theme"
+      save_to_change_theme: 'Theme will be updated after you click "%{save_text}"'
       home: "Default Home Page"
       staged: "Staged"
 
diff --git a/config/routes.rb b/config/routes.rb
index e3e7731bb2..69ade71938 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -950,8 +950,6 @@ Discourse::Application.routes.draw do
   get "/safe-mode" => "safe_mode#index"
   post "/safe-mode" => "safe_mode#enter", as: "safe_mode_enter"
 
-  get "/themes/assets/:ids" => "themes#assets"
-
   unless Rails.env.production?
     get "/qunit" => "qunit#index"
     get "/wizard/qunit" => "wizard#qunit"
diff --git a/test/javascripts/acceptance/preferences-test.js b/test/javascripts/acceptance/preferences-test.js
index a9db1f08e5..20afdcd167 100644
--- a/test/javascripts/acceptance/preferences-test.js
+++ b/test/javascripts/acceptance/preferences-test.js
@@ -1,7 +1,6 @@
 import I18n from "I18n";
 import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
 import selectKit from "helpers/select-kit-helper";
-
 import User from "discourse/models/user";
 
 acceptance("User Preferences", {

From 5a71c51ddd50512aa83283b8b820c7cbe7592ef7 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 21 May 2020 12:40:33 -0400
Subject: [PATCH 1315/1830] FIX: tag input says tags are optional when they're
 required

---
 app/assets/javascripts/discourse/app/controllers/topic.js | 7 +++++++
 app/assets/javascripts/discourse/app/templates/topic.hbs  | 1 +
 2 files changed, 8 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index 2c2ebdc7fe..ba7caf554d 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -185,6 +185,13 @@ export default Controller.extend(bufferedProperty("model"), {
     );
   },
 
+  @discourseComputed("model.category")
+  minimumRequiredTags(category) {
+    return category && category.minimum_required_tags > 0
+      ? category.minimum_required_tags
+      : null;
+  },
+
   _forceRefreshPostStream() {
     this.appEvents.trigger("post-stream:refresh", { force: true });
   },
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index 488970c10e..d5e22f5437 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -36,6 +36,7 @@
                 options=(hash
                   filterable=true
                   categoryId=buffered.category_id
+                  minimum=minimumRequiredTags
                 )
               }}
             {{/if}}

From d11c462104e704e3ccd512a9b5d558c7d13555b2 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 21 May 2020 14:26:03 -0400
Subject: [PATCH 1316/1830] SECURITY: ERB execution in custom Email Style

---
 app/helpers/email_helper.rb               |   8 +-
 app/views/layouts/email_template.html.erb |   5 +-
 spec/integration/email_style_spec.rb      | 203 ++++++++++++----------
 3 files changed, 113 insertions(+), 103 deletions(-)

diff --git a/app/helpers/email_helper.rb b/app/helpers/email_helper.rb
index c579473a4d..14364d45c3 100644
--- a/app/helpers/email_helper.rb
+++ b/app/helpers/email_helper.rb
@@ -25,12 +25,8 @@ module EmailHelper
     raw "<a href='#{Discourse.base_url}#{url}' style='color: ##{@anchor_color}'>#{title}</a>"
   end
 
-  def email_html_template(binding_arg)
-    template = EmailStyle.new.html.sub(
-      '%{email_content}',
-      '<%= yield %><% if defined?(html_body) %><%= html_body %><% end %>'
-    )
-    ERB.new(template).result(binding_arg)
+  def email_html_template
+    EmailStyle.new.html.sub('%{email_content}', yield).html_safe
   end
 
   protected
diff --git a/app/views/layouts/email_template.html.erb b/app/views/layouts/email_template.html.erb
index 80da92efc2..611eba0df4 100644
--- a/app/views/layouts/email_template.html.erb
+++ b/app/views/layouts/email_template.html.erb
@@ -2,5 +2,8 @@
   <%= yield %>
   <% if defined?(html_body) %><%= html_body %><% end %>
 <% else %>
-  <%= email_html_template(binding).html_safe %>
+  <%= email_html_template do %>
+    <%= yield %>
+    <% if defined?(html_body) %><%= html_body %><% end %>
+  <% end %>
 <% end %>
diff --git a/spec/integration/email_style_spec.rb b/spec/integration/email_style_spec.rb
index ef69850891..395dd19df1 100644
--- a/spec/integration/email_style_spec.rb
+++ b/spec/integration/email_style_spec.rb
@@ -3,128 +3,139 @@
 require "rails_helper"
 
 describe EmailStyle do
-  before do
-    SiteSetting.email_custom_template = "<body><h1>FOR YOU</h1><div>%{email_content}</div></body>"
-    SiteSetting.email_custom_css = 'h1 { color: red; } div.body { color: #FAB; }'
-    SiteSetting.email_custom_css_compiled = SiteSetting.email_custom_css
-  end
 
-  after do
-    SiteSetting.remove_override!(:email_custom_template)
-    SiteSetting.remove_override!(:email_custom_css)
-  end
-
-  context 'invite' do
-    fab!(:invite) { Fabricate(:invite) }
-    let(:invite_mail) { InviteMailer.send_invite(invite) }
-
-    subject(:mail_html) { Email::Renderer.new(invite_mail).html }
-
-    it 'applies customizations' do
-      expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-      expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
-    end
-
-    it 'applies customizations if compiled is missing' do
-      SiteSetting.remove_override!(:email_custom_css_compiled)
-      expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-      expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
-    end
-
-    it 'can apply RTL attrs' do
-      SiteSetting.default_locale = 'he'
-      body_attrs = mail_html.match(/<body ([^>])+/)
-      expect(body_attrs[0]&.downcase).to match(/text-align:\s*right/)
-      expect(body_attrs[0]&.downcase).to include('dir="rtl"')
+  context "ERB evaluation" do
+    it "does not evaluate ERB outside of the email itself" do
+      SiteSetting.email_custom_template = "<div>%{email_content}</div><%= (111 * 333) %>"
+      html = Email::Renderer.new(UserNotifications.signup(Fabricate(:user))).html
+      expect(html).not_to match("36963")
     end
   end
 
-  context 'user_replied' do
-    let(:response_by_user) { Fabricate(:user, name: "John Doe") }
-    let(:category) { Fabricate(:category, name: 'India') }
-    let(:topic) { Fabricate(:topic, category: category, title: "Super cool topic") }
-    let(:post) { Fabricate(:post, topic: topic, raw: 'This is My super duper cool topic') }
-    let(:response) { Fabricate(:basic_reply, topic: post.topic, user: response_by_user) }
-    let(:user) { Fabricate(:user) }
-    let(:notification) { Fabricate(:replied_notification, user: user, post: response) }
-
-    let(:mail) do
-      UserNotifications.user_replied(
-        user,
-        post: response,
-        notification_type: notification.notification_type,
-        notification_data_hash: notification.data_hash
-      )
+  context "with a custom template" do
+    before do
+      SiteSetting.email_custom_template = "<body><h1>FOR YOU</h1><div>%{email_content}</div></body>"
+      SiteSetting.email_custom_css = 'h1 { color: red; } div.body { color: #FAB; }'
+      SiteSetting.email_custom_css_compiled = SiteSetting.email_custom_css
     end
 
-    subject(:mail_html) { Email::Renderer.new(mail).html }
-
-    it "customizations are applied to html part of emails" do
-      expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-      matches = mail_html.match(/<div style="([^"]+)">#{post.raw}/)
-      expect(matches[1]).to include('color: #FAB;') # custom
-      expect(matches[1]).to include('padding-top:5px;') # div.body
+    after do
+      SiteSetting.remove_override!(:email_custom_template)
+      SiteSetting.remove_override!(:email_custom_css)
     end
 
-    # TODO: translation override
-  end
+    context 'invite' do
+      fab!(:invite) { Fabricate(:invite) }
+      let(:invite_mail) { InviteMailer.send_invite(invite) }
 
-  context 'signup' do
-    let(:signup_mail) { UserNotifications.signup(Fabricate(:user)) }
-    subject(:mail_html) { Email::Renderer.new(signup_mail).html }
+      subject(:mail_html) { Email::Renderer.new(invite_mail).html }
 
-    it "customizations are applied to html part of emails" do
-      expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-      expect(mail_html).to include('activate-account')
+      it 'applies customizations' do
+        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+        expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
+      end
+
+      it 'applies customizations if compiled is missing' do
+        SiteSetting.remove_override!(:email_custom_css_compiled)
+        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+        expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
+      end
+
+      it 'can apply RTL attrs' do
+        SiteSetting.default_locale = 'he'
+        body_attrs = mail_html.match(/<body ([^>])+/)
+        expect(body_attrs[0]&.downcase).to match(/text-align:\s*right/)
+        expect(body_attrs[0]&.downcase).to include('dir="rtl"')
+      end
     end
 
-    context 'translation override' do
-      before do
-        TranslationOverride.upsert!(
-          'en',
-          'user_notifications.signup.text_body_template',
-          "CLICK THAT LINK: %{base_url}/u/activate-account/%{email_token}"
+    context 'user_replied' do
+      let(:response_by_user) { Fabricate(:user, name: "John Doe") }
+      let(:category) { Fabricate(:category, name: 'India') }
+      let(:topic) { Fabricate(:topic, category: category, title: "Super cool topic") }
+      let(:post) { Fabricate(:post, topic: topic, raw: 'This is My super duper cool topic') }
+      let(:response) { Fabricate(:basic_reply, topic: post.topic, user: response_by_user) }
+      let(:user) { Fabricate(:user) }
+      let(:notification) { Fabricate(:replied_notification, user: user, post: response) }
+
+      let(:mail) do
+        UserNotifications.user_replied(
+          user,
+          post: response,
+          notification_type: notification.notification_type,
+          notification_data_hash: notification.data_hash
         )
       end
 
-      after do
-        TranslationOverride.revert!('en', ['user_notifications.signup.text_body_template'])
+      subject(:mail_html) { Email::Renderer.new(mail).html }
+
+      it "customizations are applied to html part of emails" do
+        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+        matches = mail_html.match(/<div style="([^"]+)">#{post.raw}/)
+        expect(matches[1]).to include('color: #FAB;') # custom
+        expect(matches[1]).to include('padding-top:5px;') # div.body
       end
 
-      it "applies customizations when translation override exists" do
-        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-        expect(mail_html.scan('CLICK THAT LINK').count).to eq(1)
-      end
+      # TODO: translation override
     end
 
-    context 'with some bad css' do
-      before do
-        SiteSetting.email_custom_css = '@import "nope.css"; h1 {{{ size: really big; '
-        SiteSetting.email_custom_css_compiled = SiteSetting.email_custom_css
-      end
+    context 'signup' do
+      let(:signup_mail) { UserNotifications.signup(Fabricate(:user)) }
+      subject(:mail_html) { Email::Renderer.new(signup_mail).html }
 
-      it "can render the html" do
-        expect(mail_html.scan(/<h1\s*(?:style=""){0,1}>FOR YOU<\/h1>/).count).to eq(1)
+      it "customizations are applied to html part of emails" do
+        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
         expect(mail_html).to include('activate-account')
       end
-    end
-  end
 
-  context 'digest' do
-    fab!(:popular_topic) { Fabricate(:topic, user: Fabricate(:coding_horror), created_at: 1.hour.ago) }
-    let(:summary_email) { UserNotifications.digest(Fabricate(:user)) }
-    subject(:mail_html) { Email::Renderer.new(summary_email).html }
+      context 'translation override' do
+        before do
+          TranslationOverride.upsert!(
+            'en',
+            'user_notifications.signup.text_body_template',
+            "CLICK THAT LINK: %{base_url}/u/activate-account/%{email_token}"
+          )
+        end
 
-    it "customizations are applied to html part of emails" do
-      expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-      expect(mail_html).to include(popular_topic.title)
+        after do
+          TranslationOverride.revert!('en', ['user_notifications.signup.text_body_template'])
+        end
+
+        it "applies customizations when translation override exists" do
+          expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+          expect(mail_html.scan('CLICK THAT LINK').count).to eq(1)
+        end
+      end
+
+      context 'with some bad css' do
+        before do
+          SiteSetting.email_custom_css = '@import "nope.css"; h1 {{{ size: really big; '
+          SiteSetting.email_custom_css_compiled = SiteSetting.email_custom_css
+        end
+
+        it "can render the html" do
+          expect(mail_html.scan(/<h1\s*(?:style=""){0,1}>FOR YOU<\/h1>/).count).to eq(1)
+          expect(mail_html).to include('activate-account')
+        end
+      end
     end
 
-    it "doesn't apply customizations if apply_custom_styles_to_digest is disabled" do
-      SiteSetting.apply_custom_styles_to_digest = false
-      expect(mail_html).to_not include('<h1 style="color: red;">FOR YOU</h1>')
-      expect(mail_html).to_not include('FOR YOU')
-      expect(mail_html).to include(popular_topic.title)
+    context 'digest' do
+      fab!(:popular_topic) { Fabricate(:topic, user: Fabricate(:coding_horror), created_at: 1.hour.ago) }
+      let(:summary_email) { UserNotifications.digest(Fabricate(:user)) }
+      subject(:mail_html) { Email::Renderer.new(summary_email).html }
+
+      it "customizations are applied to html part of emails" do
+        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+        expect(mail_html).to include(popular_topic.title)
+      end
+
+      it "doesn't apply customizations if apply_custom_styles_to_digest is disabled" do
+        SiteSetting.apply_custom_styles_to_digest = false
+        expect(mail_html).to_not include('<h1 style="color: red;">FOR YOU</h1>')
+        expect(mail_html).to_not include('FOR YOU')
+        expect(mail_html).to include(popular_topic.title)
+      end
     end
   end
 end

From c0779df99d6e8cbd9b3216d967ae89cdd226ad40 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 22 May 2020 11:20:25 +1000
Subject: [PATCH 1317/1830] FIX: Remove access control post FK from uploads
 (#9853)

---
 app/models/upload.rb                                       | 4 ----
 .../20200522004855_remove_access_control_post_fk.rb        | 7 +++++++
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 db/post_migrate/20200522004855_remove_access_control_post_fk.rb

diff --git a/app/models/upload.rb b/app/models/upload.rb
index bb4e7976f5..31c931c172 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -448,7 +448,3 @@ end
 #  index_uploads_on_url                     (url)
 #  index_uploads_on_user_id                 (user_id)
 #
-# Foreign Keys
-#
-#  fk_rails_...  (access_control_post_id => posts.id)
-#
diff --git a/db/post_migrate/20200522004855_remove_access_control_post_fk.rb b/db/post_migrate/20200522004855_remove_access_control_post_fk.rb
new file mode 100644
index 0000000000..36c8d0fbb7
--- /dev/null
+++ b/db/post_migrate/20200522004855_remove_access_control_post_fk.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveAccessControlPostFk < ActiveRecord::Migration[6.0]
+  def change
+    remove_foreign_key :uploads, column: :access_control_post_id
+  end
+end

From f9d55b49416971023fce2b457d3d5384c2c52cac Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 22 May 2020 13:04:15 +1000
Subject: [PATCH 1318/1830] FEATURE: Update the topic excerpt when the OP is
 rebaked (#9852)

* We now have a site setting "topic_excerpt_maxlength" that is used when the OP is created or revised to generate a topic excerpt.
* However, posts created before this setting was introduced cannot benefit from this change unless they are revised, and if the topic excerpt length setting is changed that situation is also not covererd.
* This PR makes a change to rebake! to update the topic excerpt IF the post is the OP.
---
 app/models/post.rb       |  4 ++++
 app/models/topic.rb      |  7 +++++++
 lib/post_revisor.rb      |  6 +-----
 spec/models/post_spec.rb | 19 +++++++++++++++++++
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/app/models/post.rb b/app/models/post.rb
index 30ebaf0163..e1a3a1f391 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -650,6 +650,10 @@ class Post < ActiveRecord::Base
       baked_version: BAKED_VERSION
     )
 
+    if is_first_post?
+      topic.update_excerpt(excerpt_for_topic)
+    end
+
     if invalidate_broken_images
       custom_fields.delete(BROKEN_IMAGES)
       save_custom_fields
diff --git a/app/models/topic.rb b/app/models/topic.rb
index f02b4fc030..38affdb327 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -1476,6 +1476,13 @@ class Topic < ActiveRecord::Base
     private_topic
   end
 
+  def update_excerpt(excerpt)
+    update_column(:excerpt, excerpt)
+    if archetype == "banner"
+      ApplicationController.banner_json_cache.clear
+    end
+  end
+
   def pm_with_non_human_user?
     sql = <<~SQL
     SELECT 1 FROM topics
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 3c9ec277cd..d610fccf37 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -567,11 +567,7 @@ class PostRevisor
   end
 
   def update_topic_excerpt
-    excerpt = @post.excerpt_for_topic
-    @topic.update_column(:excerpt, excerpt)
-    if @topic.archetype == "banner"
-      ApplicationController.banner_json_cache.clear
-    end
+    @topic.update_excerpt(@post.excerpt_for_topic)
   end
 
   def update_category_description
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index d0e2aba631..5bc5206bce 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1195,6 +1195,25 @@ describe Post do
       expect(post.cooked).to eq(first_cooked)
       expect(result).to eq(true)
     end
+
+    it "updates the topic excerpt at the same time if it is the OP" do
+      post = create_post
+      post.topic.update(excerpt: "test")
+      DB.exec("UPDATE posts SET cooked = 'frogs' WHERE id = ?", [ post.id ])
+      post.reload
+      result = post.rebake!
+      post.topic.reload
+      expect(post.topic.excerpt).not_to eq("test")
+    end
+
+    it "does not update the topic excerpt if the post is not the OP" do
+      post = create_post
+      post2 = create_post
+      post.topic.update(excerpt: "test")
+      result = post2.rebake!
+      post.topic.reload
+      expect(post.topic.excerpt).to eq("test")
+    end
   end
 
   describe "#set_owner" do

From 61d8955fcb165d2a55760279928306b47fb98898 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Fri, 22 May 2020 14:42:22 +0530
Subject: [PATCH 1319/1830] DEV: add spec for tag with unicode name

---
 spec/requests/list_controller_spec.rb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index d1238c1f00..bc913c58a0 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -128,7 +128,7 @@ RSpec.describe ListController do
     let(:moderator) { Fabricate(:moderator) }
     let(:admin) { Fabricate(:admin) }
     let(:tag) { Fabricate(:tag) }
-    let(:private_message) { Fabricate(:private_message_topic) }
+    let(:private_message) { Fabricate(:private_message_topic, user: admin) }
 
     before do
       SiteSetting.tagging_enabled = true
@@ -149,6 +149,17 @@ RSpec.describe ListController do
         expect(response.status).to eq(200)
       end
     end
+
+    it 'should work for tag with unicode name' do
+      unicode_tag = Fabricate(:tag, name: 'hello-🇺🇸')
+      Fabricate(:topic_tag, tag: unicode_tag, topic: private_message)
+
+      sign_in(admin)
+      get "/topics/private-messages-tags/#{admin.username}/#{UrlHelper.encode_component(unicode_tag.name)}.json"
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["topic_list"]["topics"].first["id"])
+        .to eq(private_message.id)
+    end
   end
 
   describe '#private_messages_group' do

From e71f5e8951bcffdaac3476d96efaa2232b809a4c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 22 May 2020 15:19:55 +0200
Subject: [PATCH 1320/1830] UI: apply margin only if the menu has content
 (#9857)

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

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 54aa976c0c..55b9063ea7 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1012,13 +1012,15 @@ a.mention-group {
     display: flex;
     flex-wrap: wrap;
 
-    > .btn,
-    .topic-admin-menu-button-container {
+    > .btn {
+      display: inline-flex;
       margin: 0 0.5em 0.5em 0;
     }
 
-    .topic-admin-menu-button-container {
+    .topic-admin-menu-button-container > span:not(:empty) {
       display: inline-flex;
+      margin: 0 0 0.5em 0;
+      margin-right: 0.5em;
     }
   }
 

From 793085c703608b345f12e94e3b53b7df07e5521e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 22 May 2020 15:23:17 +0200
Subject: [PATCH 1321/1830] REFACTOR: slightly cleaner topic admin button css
 (#9858)

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

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 55b9063ea7..b55bb19048 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1017,10 +1017,12 @@ a.mention-group {
       margin: 0 0.5em 0.5em 0;
     }
 
-    .topic-admin-menu-button-container > span:not(:empty) {
+    .topic-admin-menu-button-container {
       display: inline-flex;
-      margin: 0 0 0.5em 0;
-      margin-right: 0.5em;
+    }
+
+    .topic-admin-menu-button-container > span:not(:empty) {
+      margin: 0 0.5em 0.5em 0;
     }
   }
 

From f9649c92b5c9c2c850c993d47196a5a656d64547 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 22 May 2020 09:37:35 -0500
Subject: [PATCH 1322/1830] FIX: Live reloading of css in development (#9859)

---
 .../discourse/app/lib/theme-selector.js       | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/lib/theme-selector.js b/app/assets/javascripts/discourse/app/lib/theme-selector.js
index 2eb4912c9c..48f63c31fb 100644
--- a/app/assets/javascripts/discourse/app/lib/theme-selector.js
+++ b/app/assets/javascripts/discourse/app/lib/theme-selector.js
@@ -43,6 +43,41 @@ export function setLocalTheme(ids, themeSeq) {
   }
 }
 
+export function refreshCSS(node, hash, newHref) {
+  let $orig = $(node);
+
+  if ($orig.data("reloading")) {
+    clearTimeout($orig.data("timeout"));
+    $orig.data("copy").remove();
+  }
+
+  if (!$orig.data("orig")) {
+    $orig.data("orig", node.href);
+  }
+
+  $orig.data("reloading", true);
+
+  const orig = $(node).data("orig");
+
+  let reloaded = $orig.clone(true);
+  if (hash) {
+    reloaded[0].href =
+      orig + (orig.indexOf("?") >= 0 ? "&hash=" : "?hash=") + hash;
+  } else {
+    reloaded[0].href = newHref;
+  }
+
+  $orig.after(reloaded);
+
+  let timeout = setTimeout(() => {
+    $orig.remove();
+    reloaded.data("reloading", false);
+  }, 2000);
+
+  $orig.data("timeout", timeout);
+  $orig.data("copy", reloaded);
+}
+
 export function listThemes(site) {
   let themes = site.get("user_themes");
 

From 671f882fa34e4d4fcf68dfac1af3244244aa860f Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Fri, 22 May 2020 11:50:28 -0300
Subject: [PATCH 1323/1830] FIX: We don't create a Post object if the queued
 post gets rejected. We need to count review items directly. (#9856)

---
 app/models/user.rb       | 7 +++----
 spec/models/user_spec.rb | 9 ++-------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 5d162848eb..d9678d1a1c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1115,10 +1115,9 @@ class User < ActiveRecord::Base
   end
 
   def number_of_rejected_posts
-    Post.with_deleted
-      .where(user_id: self.id)
-      .joins('INNER JOIN reviewables r ON posts.id = r.target_id')
-      .where(r: { status: Reviewable.statuses[:rejected], type: ReviewableQueuedPost.name })
+    ReviewableQueuedPost
+      .where(status: Reviewable.statuses[:rejected])
+      .where(created_by_id: self.id)
       .count
   end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 89d5f62704..4d2592c788 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1578,20 +1578,15 @@ describe User do
 
     describe '#number_of_rejected_posts' do
       it 'counts rejected posts' do
-        post = Fabricate(:post, user: user)
-
-        Fabricate(:reviewable_queued_post, target: post, status: Reviewable.statuses[:rejected])
+        Fabricate(:reviewable_queued_post, created_by: user, status: Reviewable.statuses[:rejected])
 
         expect(user.number_of_rejected_posts).to eq(1)
       end
 
       it 'ignore non-rejected posts' do
-        post = Fabricate(:post, user: user)
-
-        Fabricate(:reviewable_queued_post, target: post, status: Reviewable.statuses[:approved])
+        Fabricate(:reviewable_queued_post, created_by: user, status: Reviewable.statuses[:approved])
 
         expect(user.number_of_rejected_posts).to eq(0)
-
       end
     end
   end

From 06e1d430c1aa84ca5c55ac60cc712f63416e3a44 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 22 May 2020 17:03:22 +0200
Subject: [PATCH 1324/1830] FIX: better cross browser topic footer buttons
 alignment (#9860)

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

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index b55bb19048..48c361c164 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1013,8 +1013,15 @@ a.mention-group {
     flex-wrap: wrap;
 
     > .btn {
-      display: inline-flex;
       margin: 0 0.5em 0.5em 0;
+      display: inline-flex;
+      align-items: center;
+
+      .d-button-label {
+        display: flex;
+        flex: 1 0 auto;
+        align-items: center;
+      }
     }
 
     .topic-admin-menu-button-container {

From 37128d71c7b9c5cd5f3d67989c7cbf5ddf126772 Mon Sep 17 00:00:00 2001
From: Ankur Dahiya <legalos.lotr@gmail.com>
Date: Fri, 22 May 2020 09:27:52 -0700
Subject: [PATCH 1325/1830] Add rails_helper to spec (#9861)

---
 .../spec/jobs/send_advanced_tutorial_message_spec.rb            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/discourse-narrative-bot/spec/jobs/send_advanced_tutorial_message_spec.rb b/plugins/discourse-narrative-bot/spec/jobs/send_advanced_tutorial_message_spec.rb
index 5d3674cae0..874e40cfe8 100644
--- a/plugins/discourse-narrative-bot/spec/jobs/send_advanced_tutorial_message_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/jobs/send_advanced_tutorial_message_spec.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rails_helper'
+
 RSpec.describe Jobs::SendAdvancedTutorialMessage do
   before do
     Jobs.run_immediately!

From bf8085e436f379ffabc5b217ea0cefdbb7430677 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Fri, 22 May 2020 13:33:29 -0500
Subject: [PATCH 1326/1830] FIX: Double Button Alignment Mobile (#9862)

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

diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index db68682303..d84b4a727c 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -36,6 +36,7 @@ span.badge-posts {
     .double-button {
       display: flex;
       flex: 0 1 auto;
+      align-items: center;
       button {
         &.like,
         &.read-indicator,

From 03d26cd6f0f81794505eedf05e5416fddb3e578f Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Fri, 22 May 2020 14:54:37 -0600
Subject: [PATCH 1327/1830] SECURITY: ensure embed_url contains valid http(s)
 uri

---
 app/models/topic_embed.rb              |  2 ++
 lib/post_creator.rb                    |  4 ++++
 spec/models/topic_embed_spec.rb        |  8 ++++++++
 spec/requests/posts_controller_spec.rb | 11 +++++++++++
 4 files changed, 25 insertions(+)

diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index a18e5b85de..362ee79f4a 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -109,6 +109,8 @@ class TopicEmbed < ActiveRecord::Base
 
     url = UrlHelper.escape_uri(url)
     original_uri = URI.parse(url)
+    raise URI::InvalidURIError unless original_uri.is_a?(URI::HTTP)
+
     opts = {
       tags: %w[div p code pre h1 h2 h3 b em i strong a img ul li ol blockquote],
       attributes: %w[href src class],
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 8a37e4c9c6..c3b9556df2 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -374,6 +374,10 @@ class PostCreator
   # discourse post.
   def create_embedded_topic
     return unless @opts[:embed_url].present?
+
+    original_uri = URI.parse(@opts[:embed_url])
+    raise Discourse::InvalidParameters.new(:embed_url) unless original_uri.is_a?(URI::HTTP)
+
     embed = TopicEmbed.new(topic_id: @post.topic_id, post_id: @post.id, embed_url: @opts[:embed_url])
     rollback_from_errors!(embed) unless embed.save
   end
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index ddfbe115ec..c91781e6dd 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -308,6 +308,14 @@ describe TopicEmbed do
       end
     end
 
+    context "non-http URL" do
+      let(:url) { '/test.txt' }
+
+      it "throws an error" do
+        expect { TopicEmbed.find_remote(url) }.to raise_error(URI::InvalidURIError)
+      end
+    end
+
     context "emails" do
       let(:url) { 'http://example.com/foo' }
       let(:contents) { '<p><a href="mailto:foo%40example.com">URL encoded @ symbol</a></p><p><a href="mailto:bar@example.com">normal mailto link</a></p>' }
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 909db8c509..ff355ada96 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -675,6 +675,17 @@ describe PostsController do
           I18n.t("invalid_params", message: "category")
         )
       end
+
+      it 'will raise an error if specified embed_url is invalid' do
+        user = Fabricate(:admin)
+        master_key = Fabricate(:api_key).key
+
+        post "/posts.json",
+          params: { title: 'this is a test title', raw: 'this is test body', embed_url: '/test.txt' },
+          headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
+
+        expect(response.status).to eq(422)
+      end
     end
 
     describe "when logged in" do

From 2660c2e21d84bea667e1ea339f91cda352328062 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Fri, 22 May 2020 20:25:35 -0700
Subject: [PATCH 1328/1830] minor copyedit on theme import error

---
 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 996fd4040b..06f02313eb 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -81,7 +81,7 @@ en:
       unrecognized_extension: "Unrecognized file extension: %{extension}"
     import_error:
       generic: An error occured while importing that theme
-      about_json: "Import Error: about.json does not exist, or is invalid"
+      about_json: "Import Error: about.json does not exist, or is invalid. Are you sure this is a Discourse Theme?"
       about_json_values: "about.json contains invalid values: %{errors}"
       modifier_values: "about.json modifiers contain invalid values: %{errors}"
       git: "Error cloning git repository, access is denied or repository is not found"

From 20780a1eeed56b321daf18ee6bbfe681a51d1bf4 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Fri, 22 May 2020 20:25:56 -0700
Subject: [PATCH 1329/1830] Revert "Merge branch 'master' of
 https://github.com/discourse/discourse"

This reverts commit e62a85cf6fd81a2a34aff6144bd36b9ac459964a, reversing
changes made to 2660c2e21d84bea667e1ea339f91cda352328062.
---
 Gemfile                                       |   6 +-
 Gemfile.lock                                  |  14 +-
 .../javascripts/admin/models/admin-user.js    |   6 +
 .../admin/routes/admin-web-hooks-show.js      |   3 +-
 app/assets/javascripts/application.js         |   2 +-
 app/assets/javascripts/discourse-loader.js    |   1 +
 .../app/controllers/preferences/interface.js  |  30 +--
 .../discourse/app/controllers/topic.js        |   7 -
 .../discourse/app/controllers/user.js         |   4 +-
 .../discourse/app/helpers/page-reloader.js    |  10 -
 .../app/initializers/copy-codeblocks.js       |   3 +-
 .../app/initializers/topic-footer-buttons.js  |  34 +--
 .../discourse/app/lib/theme-selector.js       |  26 +++
 .../discourse/app/models/nav-item.js          |  23 +-
 .../discourse/app/models/topic-details.js     |  13 +-
 .../discourse/app/templates/about.hbs         |  88 ++++----
 .../app/templates/components/d-navigation.hbs |   3 -
 .../components/topic-footer-buttons.hbs       |   4 +-
 .../app/templates/preferences/interface.hbs   |   4 +-
 .../discourse/app/templates/topic.hbs         |   1 -
 .../discourse/app/widgets/header.js           |   1 -
 .../javascripts/select-kit/addon/.gitkeep     |   0
 .../templates/components/pinned-button.hbs    |   4 -
 .../components/topic-notifications-button.hbs |  30 ---
 .../components/admin-group-selector.js        |   0
 .../components/categories-admin-dropdown.js   |   0
 .../components/category-chooser.js            |   1 -
 .../components/category-drop.js               |   0
 .../category-drop/category-drop-header.js     |   0
 .../category-notifications-button.js          |   0
 .../{addon => app}/components/category-row.js |   0
 .../components/category-selector.js           |   0
 .../components/color-palettes.js              |   0
 .../color-palettes/color-palettes-row.js      |   0
 .../{addon => app}/components/combo-box.js    |   0
 .../components/combo-box/combo-box-header.js  |   0
 .../components/composer-actions.js            |   0
 .../components/create-color-row.js            |   0
 .../components/dropdown-select-box.js         |   0
 .../dropdown-select-box-header.js             |   0
 .../dropdown-select-box-row.js                |   0
 .../components/future-date-input-selector.js  |   0
 .../future-date-input-selector-header.js      |   0
 .../future-date-input-selector-row.js         |   0
 .../future-date-input-selector/mixin.js       |   0
 .../components/group-dropdown.js              |   0
 .../components/group-members-dropdown.js      |   0
 .../components/group-notifications-button.js  |   0
 .../{addon => app}/components/icon-picker.js  |   0
 .../{addon => app}/components/list-setting.js |   0
 .../components/mini-tag-chooser.js            |   0
 .../mini-tag-chooser-header.js                |   0
 .../mini-tag-chooser/selected-collection.js   |   0
 .../{addon => app}/components/multi-select.js |   0
 .../multi-select/multi-select-filter.js       |   0
 .../multi-select/multi-select-header.js       |   0
 .../multi-select/selected-category.js         |   0
 .../components/multi-select/selected-color.js |   0
 .../components/none-category-row.js           |   0
 .../components/notifications-button.js        |   3 +-
 .../notifications-button-row.js               |   0
 .../components/notifications-filter.js        |   0
 .../notifications-filter-header.js            |   0
 .../components/period-chooser.js              |   0
 .../period-chooser/period-chooser-header.js   |   0
 .../period-chooser/period-chooser-row.js      |   0
 .../components/pinned-button.js               |   0
 .../components/pinned-options.js              |   0
 .../search-advanced-category-chooser.js       |   0
 .../{addon => app}/components/select-kit.js   |   6 +-
 .../select-kit/errors-collection.js           |   0
 .../components/select-kit/select-kit-body.js  |   0
 .../select-kit/select-kit-collection.js       |   0
 .../select-kit/select-kit-create-row.js       |   0
 .../select-kit/select-kit-filter.js           |   0
 .../select-kit/select-kit-header.js           |   6 +-
 .../select-kit/select-kit-none-row.js         |   0
 .../components/select-kit/select-kit-row.js   |   0
 .../select-kit/single-select-header.js        |   0
 .../components/selected-color.js              |   0
 .../components/selected-name.js               |   0
 .../components/single-select.js               |   0
 .../components/tag-chooser-row.js             |   0
 .../{addon => app}/components/tag-chooser.js  |   0
 .../{addon => app}/components/tag-drop.js     |   0
 .../components/tag-drop/tag-drop-header.js    |   0
 .../components/tag-group-chooser.js           |   0
 .../components/tag-notifications-button.js    |   0
 .../{addon => app}/components/tag-row.js      |   0
 .../components/timezone-input.js              |   0
 .../components/toolbar-popup-menu-options.js  |   0
 .../toolbar-popup-menu-options-heading.js     |   0
 .../topic-footer-mobile-dropdown.js           |   0
 .../components/topic-notifications-button.js  |  12 +-
 .../components/topic-notifications-options.js |   0
 .../{addon => app}/components/user-chooser.js |   0
 .../components/user-chooser/user-row.js       |   0
 .../components/user-notifications-dropdown.js |   0
 .../{addon => app}/mixins/plugin-api.js       |   0
 .../select-kit/{addon => app}/mixins/tags.js  |   0
 .../select-kit/{addon => app}/mixins/utils.js |   0
 .../category-drop/category-drop-header.hbs    |   0
 .../templates/components/category-row.hbs     |   0
 .../color-palettes/color-palettes-row.hbs     |   0
 .../components/combo-box/combo-box-header.hbs |   0
 .../templates/components/create-color-row.hbs |   0
 .../dropdown-select-box-header.hbs            |   0
 .../dropdown-select-box-row.hbs               |   0
 .../future-date-input-selector-header.hbs     |   0
 .../future-date-input-selector-row.hbs        |   0
 .../mini-tag-chooser-header.hbs               |   0
 .../mini-tag-chooser/selected-collection.hbs  |   0
 .../templates/components/multi-select.hbs     |   0
 .../multi-select/multi-select-header.hbs      |   0
 .../multi-select/selected-category.hbs        |   0
 .../notifications-filter-header.hbs           |   0
 .../period-chooser/period-chooser-header.hbs  |   0
 .../period-chooser/period-chooser-row.hbs     |   0
 .../templates/components/pinned-button.hbs    |   5 +
 .../select-kit/errors-collection.hbs          |   0
 .../components/select-kit/select-kit-body.hbs |   0
 .../select-kit/select-kit-collection.hbs      |   0
 .../select-kit/select-kit-filter.hbs          |   0
 .../components/select-kit/select-kit-row.hbs  |   0
 .../select-kit/single-select-header.hbs       |   0
 .../templates/components/selected-name.hbs    |   0
 .../templates/components/single-select.hbs    |   0
 .../templates/components/tag-chooser-row.hbs  |   0
 .../components/tag-drop/tag-drop-header.hbs   |   0
 .../templates/components/tag-row.hbs          |   0
 .../toolbar-popup-menu-options-heading.hbs    |   0
 .../components/topic-notifications-button.hbs |  17 ++
 .../components/user-chooser/user-row.hbs      |   0
 app/assets/javascripts/wizard-application.js  |   2 +-
 .../stylesheets/common/base/_topic-list.scss  |   1 +
 app/assets/stylesheets/common/base/alert.scss |   1 -
 .../common/base/crawler_layout.scss           |  30 ---
 .../stylesheets/common/base/topic-post.scss   |  51 +----
 app/assets/stylesheets/common/base/user.scss  |   3 -
 .../stylesheets/common/components/badges.scss |   1 +
 .../common/select-kit/category-row.scss       |   3 -
 .../common/select-kit/pinned-button.scss      |  21 ++
 .../common/select-kit/select-kit.scss         |   5 -
 .../topic-notifications-button.scss           |  31 ++-
 app/assets/stylesheets/desktop.scss           |  20 +-
 app/assets/stylesheets/desktop/alert.scss     |   3 +
 .../stylesheets/desktop/topic-post.scss       |  17 +-
 app/assets/stylesheets/mobile.scss            |  33 ++-
 app/assets/stylesheets/mobile/alert.scss      |   5 +-
 app/assets/stylesheets/mobile/banner.scss     |   7 +-
 app/assets/stylesheets/mobile/discourse.scss  |   5 +
 app/assets/stylesheets/mobile/topic-post.scss |  23 +-
 app/controllers/about_controller.rb           |   2 +-
 app/controllers/list_controller.rb            |   8 +-
 app/controllers/themes_controller.rb          |  31 +++
 app/helpers/email_helper.rb                   |   8 +-
 app/models/application_request.rb             |   7 +-
 app/models/category.rb                        |  26 ++-
 app/models/global_setting.rb                  |  24 +-
 app/models/group_archived_message.rb          |   2 +-
 app/models/post.rb                            |  14 +-
 app/models/topic.rb                           |  15 +-
 app/models/topic_embed.rb                     |   2 -
 app/models/upload.rb                          |   4 +
 app/models/user.rb                            | 129 ++++++-----
 app/models/user_avatar.rb                     |  12 +-
 app/models/web_hook_event_type.rb             |   2 +
 app/serializers/about_serializer.rb           |  11 +-
 app/services/badge_granter.rb                 |   6 +-
 app/views/email/default_template.html         |   2 -
 app/views/layouts/email_template.html.erb     |   5 +-
 app/views/layouts/publish.html.erb            |   7 +-
 app/views/list/list.erb                       |   8 +-
 config/application.rb                         |   6 +-
 config/initializers/001-redis.rb              |  17 +-
 config/locales/client.en.yml                  |   9 +-
 config/locales/server.en.yml                  |   1 -
 config/routes.rb                              |   4 +-
 config/site_settings.yml                      |  11 +-
 db/fixtures/007_web_hook_event_types.rb       |  10 +
 ...te_bookmarks_from_post_action_bookmarks.rb |   1 -
 .../20200514075356_remove_flag_web_hooks.rb   |  21 --
 ...0514075407_remove_queued_post_web_hooks.rb |  21 --
 ...0200520001619_remove_fks_from_bookmarks.rb |   9 -
 ...522004855_remove_access_control_post_fk.rb |   7 -
 lib/backup_restore/backup_file_handler.rb     |   7 +-
 lib/discourse_plugin_registry.rb              |   2 -
 lib/discourse_redis.rb                        |   6 +
 lib/file_store/s3_store.rb                    |  27 +--
 lib/freedom_patches/translate_accelerator.rb  |   2 +-
 lib/guardian.rb                               |   4 -
 lib/plugin/instance.rb                        |  10 -
 lib/plugin_initialization_guard.rb            |  53 ++---
 lib/post_creator.rb                           |   4 -
 lib/post_revisor.rb                           |   6 +-
 lib/tasks/bookmarks.rake                      |   1 -
 lib/topic_query_params.rb                     |   2 +-
 .../db/fixtures/001_discobot.rb               |  25 ++-
 ...avatar_download_attempt_on_user_avatars.rb |  15 --
 plugins/discourse-narrative-bot/plugin.rb     |   6 -
 .../track_selector_spec.rb                    |   2 +-
 .../send_advanced_tutorial_message_spec.rb    |   2 -
 .../default_current_user_provider_spec.rb     |   2 +-
 spec/components/discourse_redis_spec.rb       |   4 +-
 spec/components/email/processor_spec.rb       |   2 +-
 spec/components/file_store/s3_store_spec.rb   |  17 +-
 .../components/guardian/user_guardian_spec.rb |   4 +-
 spec/components/pretty_text_spec.rb           |   4 +-
 spec/components/search_spec.rb                |   2 +-
 spec/fabricators/post_fabricator.rb           |   2 +-
 spec/fabricators/web_hook_fabricator.rb       |  16 ++
 spec/integration/email_style_spec.rb          | 211 +++++++++---------
 spec/integration/topic_thumbnail_spec.rb      |  35 +--
 .../bookmark_reminder_notifications_spec.rb   |   2 +-
 ...mark_reminder_notification_handler_spec.rb |   2 +-
 spec/models/post_spec.rb                      |  38 ----
 spec/models/topic_embed_spec.rb               |   8 -
 spec/models/topic_spec.rb                     |   2 +-
 spec/models/user_spec.rb                      |   9 +-
 spec/multisite/s3_store_spec.rb               |  43 ----
 spec/rails_helper.rb                          |   6 -
 spec/requests/about_controller_spec.rb        |  16 --
 .../requests/admin/backups_controller_spec.rb |   2 +-
 spec/requests/admin/users_controller_spec.rb  |   2 +-
 spec/requests/list_controller_spec.rb         |  13 +-
 spec/requests/posts_controller_spec.rb        |  11 -
 spec/requests/search_controller_spec.rb       |   4 +-
 spec/requests/topics_controller_spec.rb       |   2 +-
 spec/requests/webhooks_controller_spec.rb     |   2 +-
 .../serializers/topic_view_serializer_spec.rb |   2 +-
 spec/services/word_watcher_spec.rb            |   2 +-
 .../acceptance/category-chooser-test.js       |  16 --
 .../acceptance/emoji-picker-test.js           |  13 ++
 .../acceptance/preferences-test.js            |   1 +
 test/javascripts/fixtures/about.js            |   1 -
 test/javascripts/helpers/select-kit-helper.js |   9 -
 236 files changed, 717 insertions(+), 1033 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse/app/helpers/page-reloader.js
 delete mode 100644 app/assets/javascripts/select-kit/addon/.gitkeep
 delete mode 100644 app/assets/javascripts/select-kit/addon/templates/components/pinned-button.hbs
 delete mode 100644 app/assets/javascripts/select-kit/addon/templates/components/topic-notifications-button.hbs
 rename app/assets/javascripts/select-kit/{addon => app}/components/admin-group-selector.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/categories-admin-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/category-chooser.js (99%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/category-drop.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/category-drop/category-drop-header.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/category-notifications-button.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/category-row.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/category-selector.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/color-palettes.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/color-palettes/color-palettes-row.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/combo-box.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/combo-box/combo-box-header.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/composer-actions.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/create-color-row.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/dropdown-select-box.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/dropdown-select-box/dropdown-select-box-header.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/dropdown-select-box/dropdown-select-box-row.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/future-date-input-selector.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/future-date-input-selector/future-date-input-selector-header.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/future-date-input-selector/future-date-input-selector-row.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/future-date-input-selector/mixin.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/group-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/group-members-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/group-notifications-button.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/icon-picker.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/list-setting.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/mini-tag-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/mini-tag-chooser/mini-tag-chooser-header.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/mini-tag-chooser/selected-collection.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/multi-select.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/multi-select/multi-select-filter.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/multi-select/multi-select-header.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/multi-select/selected-category.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/multi-select/selected-color.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/none-category-row.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/notifications-button.js (96%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/notifications-button/notifications-button-row.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/notifications-filter.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/notifications-filter/notifications-filter-header.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/period-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/period-chooser/period-chooser-header.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/period-chooser/period-chooser-row.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/pinned-button.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/pinned-options.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/search-advanced-category-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/select-kit.js (99%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/select-kit/errors-collection.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/select-kit/select-kit-body.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/select-kit/select-kit-collection.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/select-kit/select-kit-create-row.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/select-kit/select-kit-filter.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/select-kit/select-kit-header.js (97%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/select-kit/select-kit-none-row.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/select-kit/select-kit-row.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/select-kit/single-select-header.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/selected-color.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/selected-name.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/single-select.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/tag-chooser-row.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/tag-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/tag-drop.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/tag-drop/tag-drop-header.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/tag-group-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/tag-notifications-button.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/tag-row.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/timezone-input.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/toolbar-popup-menu-options.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/topic-footer-mobile-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/topic-notifications-button.js (55%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/topic-notifications-options.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/user-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/user-chooser/user-row.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/components/user-notifications-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/mixins/plugin-api.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/mixins/tags.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/mixins/utils.js (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/category-drop/category-drop-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/category-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/color-palettes/color-palettes-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/combo-box/combo-box-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/create-color-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/dropdown-select-box/dropdown-select-box-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/dropdown-select-box/dropdown-select-box-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/future-date-input-selector/future-date-input-selector-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/future-date-input-selector/future-date-input-selector-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/mini-tag-chooser/selected-collection.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/multi-select.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/multi-select/multi-select-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/multi-select/selected-category.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/notifications-filter/notifications-filter-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/period-chooser/period-chooser-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/period-chooser/period-chooser-row.hbs (100%)
 create mode 100644 app/assets/javascripts/select-kit/app/templates/components/pinned-button.hbs
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/select-kit/errors-collection.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/select-kit/select-kit-body.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/select-kit/select-kit-collection.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/select-kit/select-kit-filter.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/select-kit/select-kit-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/select-kit/single-select-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/selected-name.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/single-select.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/tag-chooser-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/tag-drop/tag-drop-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/tag-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs (100%)
 create mode 100644 app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
 rename app/assets/javascripts/select-kit/{addon => app}/templates/components/user-chooser/user-row.hbs (100%)
 create mode 100644 app/assets/stylesheets/desktop/alert.scss
 create mode 100644 app/controllers/themes_controller.rb
 delete mode 100644 db/migrate/20200514075356_remove_flag_web_hooks.rb
 delete mode 100644 db/migrate/20200514075407_remove_queued_post_web_hooks.rb
 delete mode 100644 db/post_migrate/20200520001619_remove_fks_from_bookmarks.rb
 delete mode 100644 db/post_migrate/20200522004855_remove_access_control_post_fk.rb
 delete mode 100644 plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb

diff --git a/Gemfile b/Gemfile
index a80f23dbc0..6c72e48bab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -127,6 +127,10 @@ gem 'mini_racer'
 # TODO: determine why highline is being held back and upgrade to latest
 gem 'highline', '~> 1.7.0', require: false
 
+# TODO: Upgrading breaks Sidekiq Web
+# This is a bit of a hornets nest cause in an ideal world we much prefer
+# if Sidekiq reused session and CSRF mitigation with Discourse on the
+# _forum_session cookie instead of a rack.session cookie
 gem 'rack', '2.2.2'
 
 gem 'rack-protection' # security
@@ -248,5 +252,3 @@ end
 gem 'webpush', require: false
 gem 'colored2', require: false
 gem 'maxminddb'
-
-gem 'rails_failover', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index db4b88d863..752d48c3c9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -195,7 +195,7 @@ GEM
     mini_sql (0.2.5)
     mini_suffix (0.3.0)
       ffi (~> 1.9)
-    minitest (5.14.1)
+    minitest (5.14.0)
     mocha (1.11.2)
     mock_redis (0.23.0)
     msgpack (1.3.3)
@@ -262,7 +262,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.5)
-    puma (4.3.5)
+    puma (4.3.3)
       nio4r (~> 2.0)
     r2 (0.2.7)
     rack (2.2.2)
@@ -277,8 +277,6 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails_failover (0.2.0)
-      redis (~> 4)
     rails_multisite (2.1.2)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
@@ -296,7 +294,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbtrace (0.4.13)
+    rbtrace (0.4.12)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
@@ -343,16 +341,13 @@ GEM
       json-schema (~> 2.2)
       railties (>= 3.1, < 7.0)
     rtlit (0.0.5)
-    rubocop (0.84.0)
+    rubocop (0.83.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
-      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
     rubocop-discourse (2.1.2)
       rubocop (>= 0.69.0)
       rubocop-rspec (>= 1.39.0)
@@ -514,7 +509,6 @@ DEPENDENCIES
   rack (= 2.2.2)
   rack-mini-profiler
   rack-protection
-  rails_failover
   rails_multisite
   railties (= 6.0.3)
   rake
diff --git a/app/assets/javascripts/admin/models/admin-user.js b/app/assets/javascripts/admin/models/admin-user.js
index 9977fa8dd4..71b8078f6e 100644
--- a/app/assets/javascripts/admin/models/admin-user.js
+++ b/app/assets/javascripts/admin/models/admin-user.js
@@ -77,6 +77,12 @@ const AdminUser = User.extend({
     });
   },
 
+  revokeApiKey() {
+    return ajax(`/admin/users/${this.id}/revoke_api_key`, {
+      type: "DELETE"
+    }).then(() => this.set("api_key", null));
+  },
+
   deleteAllPosts() {
     let deletedPosts = 0;
     const user = this;
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js
index f0860e79f7..34aed775cc 100644
--- a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js
@@ -1,4 +1,5 @@
 import { get } from "@ember/object";
+import { isEmpty } from "@ember/utils";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
@@ -14,7 +15,7 @@ export default DiscourseRoute.extend({
   },
 
   setupController(controller, model) {
-    if (model.get("isNew")) {
+    if (model.get("isNew") || isEmpty(model.get("web_hook_event_types"))) {
       model.set("web_hook_event_types", controller.get("defaultEventTypes"));
     }
 
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 40f1d275bb..4445fd7986 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,6 +1,6 @@
 //= require_tree ./discourse-common/addon
 //= require ./polyfills
-//= require_tree ./select-kit/addon
+//= require_tree ./select-kit/app
 //= require ./discourse/app/app
 //= require ./app-boot
 
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index fc829ae12f..d11217a985 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -36,6 +36,7 @@ var define, requirejs;
         default: Ember.Object,
         get: Ember.get,
         getProperties: Ember.getProperties,
+        guidFor: Ember.guidFor,
         set: Ember.set,
         setProperties: Ember.setProperties,
         computed: Ember.computed,
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
index 2fcc5781c3..1ad85b7d7b 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
@@ -2,10 +2,13 @@ import I18n from "I18n";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { setDefaultHomepage } from "discourse/lib/utilities";
-import discourseComputed from "discourse-common/utils/decorators";
-import { listThemes, setLocalTheme } from "discourse/lib/theme-selector";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import {
+  listThemes,
+  previewTheme,
+  setLocalTheme
+} from "discourse/lib/theme-selector";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import pageReloader from "discourse/helpers/page-reloader";
 import {
   safariHacksDisabled,
   isiPad,
@@ -25,9 +28,6 @@ const TEXT_SIZES = ["smaller", "normal", "larger", "largest"];
 const TITLE_COUNT_MODES = ["notifications", "contextual"];
 
 export default Controller.extend({
-  currentThemeId: -1,
-  preferencesController: inject("preferences"),
-
   @discourseComputed("makeThemeDefault")
   saveAttrNames(makeDefault) {
     let attrs = [
@@ -51,6 +51,8 @@ export default Controller.extend({
     return attrs;
   },
 
+  preferencesController: inject("preferences"),
+
   @discourseComputed()
   isiPad() {
     // TODO: remove this preference checkbox when iOS adoption > 90%
@@ -103,14 +105,10 @@ export default Controller.extend({
     return themes && themes.length > 1;
   },
 
-  @discourseComputed("themeId")
-  themeIdChanged(themeId) {
-    if (this.currentThemeId === -1) {
-      this.set("currentThemeId", themeId);
-      return false;
-    } else {
-      return this.currentThemeId !== themeId;
-    }
+  @observes("themeId")
+  themeIdChanged() {
+    const id = this.themeId;
+    previewTheme([id]);
   },
 
   @discourseComputed("model.user_option.theme_ids", "themeId")
@@ -191,10 +189,6 @@ export default Controller.extend({
               this.disableSafariHacks.toString()
             );
           }
-
-          if (this.themeId !== this.currentThemeId) {
-            pageReloader.reload();
-          }
         })
         .catch(popupAjaxError);
     },
diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index ba7caf554d..2c2ebdc7fe 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -185,13 +185,6 @@ export default Controller.extend(bufferedProperty("model"), {
     );
   },
 
-  @discourseComputed("model.category")
-  minimumRequiredTags(category) {
-    return category && category.minimum_required_tags > 0
-      ? category.minimum_required_tags
-      : null;
-  },
-
   _forceRefreshPostStream() {
     this.appEvents.trigger("post-stream:refresh", { force: true });
   },
diff --git a/app/assets/javascripts/discourse/app/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js
index b466f084ed..cc2db042fb 100644
--- a/app/assets/javascripts/discourse/app/controllers/user.js
+++ b/app/assets/javascripts/discourse/app/controllers/user.js
@@ -51,15 +51,13 @@ export default Controller.extend(CanCheckEmails, {
   hasDeletedPosts: gt("model.number_of_deleted_posts", 0),
   hasBeenSuspended: gt("model.number_of_suspensions", 0),
   hasReceivedWarnings: gt("model.warnings_received_count", 0),
-  hasRejectedPosts: gt("model.number_of_rejected_posts", 0),
 
   showStaffCounters: or(
     "hasGivenFlags",
     "hasFlaggedPosts",
     "hasDeletedPosts",
     "hasBeenSuspended",
-    "hasReceivedWarnings",
-    "hasRejectedPosts"
+    "hasReceivedWarnings"
   ),
 
   showFeaturedTopic: and(
diff --git a/app/assets/javascripts/discourse/app/helpers/page-reloader.js b/app/assets/javascripts/discourse/app/helpers/page-reloader.js
deleted file mode 100644
index 6429be3a3c..0000000000
--- a/app/assets/javascripts/discourse/app/helpers/page-reloader.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import EmberObject from "@ember/object";
-import Ember from "ember";
-
-export default EmberObject.create({
-  reload: function() {
-    if (!Ember.testing) {
-      location.reload();
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js b/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
index f6fcef5e17..a0b0d50962 100644
--- a/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
+++ b/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
@@ -3,7 +3,6 @@ import { cancel, later } from "@ember/runloop";
 import { Promise } from "rsvp";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import I18n from "I18n";
-import { guidFor } from "@ember/object/internals";
 
 // http://github.com/feross/clipboard-copy
 function clipboardCopy(text) {
@@ -91,7 +90,7 @@ export default {
             const state = button.innerHTML;
             button.innerHTML = I18n.t("copy_codeblock.copied");
 
-            const commandId = guidFor(button);
+            const commandId = Ember.guidFor(button);
 
             if (_fadeCopyCodeblocksRunners[commandId]) {
               cancel(_fadeCopyCodeblocksRunners[commandId]);
diff --git a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
index a2de76d3e9..a13ccd2219 100644
--- a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
+++ b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
@@ -3,13 +3,6 @@ import showModal from "discourse/lib/show-modal";
 import { registerTopicFooterButton } from "discourse/lib/register-topic-footer-button";
 import { formattedReminderTime } from "discourse/lib/bookmark";
 
-const SHARE_PRIORITY = 1000;
-const BOOKMARK_PRIORITY = 900;
-const ARCHIVE_PRIORITY = 800;
-const FLAG_PRIORITY = 700;
-const EDIT_MESSAGE_PRIORITY = 600;
-const DEFER_PRIORITY = 500;
-
 export default {
   name: "topic-footer-buttons",
 
@@ -18,12 +11,8 @@ export default {
     registerTopicFooterButton({
       id: "share-and-invite",
       icon: "link",
-      priority: SHARE_PRIORITY,
-      label() {
-        if (!this.get("topic.isPrivateMessage") || this.site.mobileView) {
-          return "topic.share.title";
-        }
-      },
+      priority: 999,
+      label: "topic.share.title",
       title: "topic.share.help",
       action() {
         const panels = [
@@ -78,7 +67,7 @@ export default {
     registerTopicFooterButton({
       id: "flag",
       icon: "flag",
-      priority: FLAG_PRIORITY,
+      priority: 998,
       label: "topic.flag_topic.title",
       title: "topic.flag_topic.help",
       action: "showFlagTopic",
@@ -104,16 +93,14 @@ export default {
         }
         return "bookmark";
       },
-      priority: BOOKMARK_PRIORITY,
+      priority: 1000,
       classNames() {
         const bookmarked = this.get("topic.bookmarked");
         return bookmarked ? ["bookmark", "bookmarked"] : ["bookmark"];
       },
       label() {
-        if (!this.get("topic.isPrivateMessage") || this.site.mobileView) {
-          const bookmarked = this.get("topic.bookmarked");
-          return bookmarked ? "bookmarked.clear_bookmarks" : "bookmarked.title";
-        }
+        const bookmarked = this.get("topic.bookmarked");
+        return bookmarked ? "bookmarked.clear_bookmarks" : "bookmarked.title";
       },
       translatedTitle() {
         const bookmarked = this.get("topic.bookmarked");
@@ -139,7 +126,7 @@ export default {
 
     registerTopicFooterButton({
       id: "archive",
-      priority: ARCHIVE_PRIORITY,
+      priority: 996,
       icon() {
         return this.archiveIcon;
       },
@@ -168,16 +155,13 @@ export default {
 
     registerTopicFooterButton({
       id: "edit-message",
-      priority: EDIT_MESSAGE_PRIORITY,
+      priority: 750,
       icon: "pencil-alt",
       label: "topic.edit_message.title",
       title: "topic.edit_message.help",
       action: "editFirstPost",
       classNames: ["edit-message"],
       dependentKeys: ["editFirstPost", "showEditOnFooter"],
-      dropdown() {
-        return this.site.mobileView && this.get("topic.isPrivateMessage");
-      },
       displayed() {
         return this.showEditOnFooter;
       }
@@ -186,7 +170,7 @@ export default {
     registerTopicFooterButton({
       id: "defer",
       icon: "circle",
-      priority: DEFER_PRIORITY,
+      priority: 300,
       label: "topic.defer.title",
       title: "topic.defer.help",
       action: "deferTopic",
diff --git a/app/assets/javascripts/discourse/app/lib/theme-selector.js b/app/assets/javascripts/discourse/app/lib/theme-selector.js
index 48f63c31fb..9d293fe312 100644
--- a/app/assets/javascripts/discourse/app/lib/theme-selector.js
+++ b/app/assets/javascripts/discourse/app/lib/theme-selector.js
@@ -1,4 +1,5 @@
 import I18n from "I18n";
+import { ajax } from "discourse/lib/ajax";
 import deprecated from "discourse-common/lib/deprecated";
 
 const keySelector = "meta[name=discourse_theme_ids]";
@@ -78,6 +79,31 @@ export function refreshCSS(node, hash, newHref) {
   $orig.data("copy", reloaded);
 }
 
+export function previewTheme(ids = []) {
+  ids = ids.reject(id => !id);
+  if (!ids.includes(currentThemeId())) {
+    Discourse.set("assetVersion", "forceRefresh");
+
+    ajax(`/themes/assets/${ids.length > 0 ? ids.join("-") : "default"}`).then(
+      results => {
+        const elem = _.first($(keySelector));
+        if (elem) {
+          elem.content = ids.join(",");
+        }
+
+        results.themes.forEach(theme => {
+          const node = $(
+            `link[rel=stylesheet][data-target=${theme.target}]`
+          )[0];
+          if (node) {
+            refreshCSS(node, null, theme.new_href);
+          }
+        });
+      }
+    );
+  }
+}
+
 export function listThemes(site) {
   let themes = site.get("user_themes");
 
diff --git a/app/assets/javascripts/discourse/app/models/nav-item.js b/app/assets/javascripts/discourse/app/models/nav-item.js
index 955e536e1e..412cd8ec2e 100644
--- a/app/assets/javascripts/discourse/app/models/nav-item.js
+++ b/app/assets/javascripts/discourse/app/models/nav-item.js
@@ -273,17 +273,12 @@ export function addNavItem(item) {
   NavItem.extraNavItemDescriptors.push(item);
 }
 
-if (typeof Discourse !== "undefined") {
-  Object.defineProperty(Discourse, "NavItem", {
-    get() {
-      deprecated(
-        "Import the NavItem class instead of using Discourse.NavItem",
-        {
-          since: "2.4.0",
-          dropFrom: "2.5.0"
-        }
-      );
-      return NavItem;
-    }
-  });
-}
+Object.defineProperty(Discourse, "NavItem", {
+  get() {
+    deprecated("Import the NavItem class instead of using Discourse.NavItem", {
+      since: "2.4.0",
+      dropFrom: "2.5.0"
+    });
+    return NavItem;
+  }
+});
diff --git a/app/assets/javascripts/discourse/app/models/topic-details.js b/app/assets/javascripts/discourse/app/models/topic-details.js
index d8d5ea0036..50449aa0e3 100644
--- a/app/assets/javascripts/discourse/app/models/topic-details.js
+++ b/app/assets/javascripts/discourse/app/models/topic-details.js
@@ -61,15 +61,12 @@ const TopicDetails = RestModel.extend({
     }
   },
 
-  updateNotifications(level) {
-    return ajax(`/t/${this.get("topic.id")}/notifications`, {
+  updateNotifications(v) {
+    this.set("notification_level", v);
+    this.set("notifications_reason_id", null);
+    return ajax("/t/" + this.get("topic.id") + "/notifications", {
       type: "POST",
-      data: { notification_level: level }
-    }).then(() => {
-      this.setProperties({
-        notification_level: level,
-        notifications_reason_id: null
-      });
+      data: { notification_level: v }
     });
   },
 
diff --git a/app/assets/javascripts/discourse/app/templates/about.hbs b/app/assets/javascripts/discourse/app/templates/about.hbs
index 2659b0ebac..63cae2c260 100644
--- a/app/assets/javascripts/discourse/app/templates/about.hbs
+++ b/app/assets/javascripts/discourse/app/templates/about.hbs
@@ -64,52 +64,50 @@
           </section>
         {{/each}}
       {{/if}}
-      {{#if model.can_see_about_stats}}
-        <section class="about stats">
-          <h3>{{d-icon "far-chart-bar"}}  {{i18n "about.stats"}}</h3>
+      <section class="about stats">
+        <h3>{{d-icon "far-chart-bar"}}  {{i18n "about.stats"}}</h3>
 
-          <table class="table">
-            <tbody>
-              <tr>
-                <th>&nbsp;</th>
-                <th>{{i18n "about.stat.last_7_days"}}</th>
-                <th>{{i18n "about.stat.last_30_days"}}</th>
-                <th>{{i18n "about.stat.all_time"}}</th>
-              </tr>
-              <tr>
-                <td class="title">{{i18n "about.topic_count"}}</td>
-                <td>{{number model.stats.topics_7_days}}</td>
-                <td>{{number model.stats.topics_30_days}}</td>
-                <td>{{number model.stats.topic_count}}</td>
-              </tr>
-              <tr>
-                <td>{{i18n "about.post_count"}}</td>
-                <td>{{number model.stats.posts_7_days}}</td>
-                <td>{{number model.stats.posts_30_days}}</td>
-                <td>{{number model.stats.post_count}}</td>
-              </tr>
-              <tr>
-                <td>{{i18n "about.user_count"}}</td>
-                <td>{{number model.stats.users_7_days}}</td>
-                <td>{{number model.stats.users_30_days}}</td>
-                <td>{{number model.stats.user_count}}</td>
-              </tr>
-              <tr>
-                <td>{{i18n "about.active_user_count"}}</td>
-                <td>{{number model.stats.active_users_7_days}}</td>
-                <td>{{number model.stats.active_users_30_days}}</td>
-                <td>&mdash;</td>
-              </tr>
-              <tr>
-                <td>{{i18n "about.like_count"}}</td>
-                <td>{{number model.stats.likes_7_days}}</td>
-                <td>{{number model.stats.likes_30_days}}</td>
-                <td>{{number model.stats.like_count}}</td>
-              </tr>
-            </tbody>
-          </table>
-        </section>
-      {{/if}}
+        <table class="table">
+          <tbody>
+            <tr>
+              <th>&nbsp;</th>
+              <th>{{i18n "about.stat.last_7_days"}}</th>
+              <th>{{i18n "about.stat.last_30_days"}}</th>
+              <th>{{i18n "about.stat.all_time"}}</th>
+            </tr>
+            <tr>
+              <td class="title">{{i18n "about.topic_count"}}</td>
+              <td>{{number model.stats.topics_7_days}}</td>
+              <td>{{number model.stats.topics_30_days}}</td>
+              <td>{{number model.stats.topic_count}}</td>
+            </tr>
+            <tr>
+              <td>{{i18n "about.post_count"}}</td>
+              <td>{{number model.stats.posts_7_days}}</td>
+              <td>{{number model.stats.posts_30_days}}</td>
+              <td>{{number model.stats.post_count}}</td>
+            </tr>
+            <tr>
+              <td>{{i18n "about.user_count"}}</td>
+              <td>{{number model.stats.users_7_days}}</td>
+              <td>{{number model.stats.users_30_days}}</td>
+              <td>{{number model.stats.user_count}}</td>
+            </tr>
+            <tr>
+              <td>{{i18n "about.active_user_count"}}</td>
+              <td>{{number model.stats.active_users_7_days}}</td>
+              <td>{{number model.stats.active_users_30_days}}</td>
+              <td>&mdash;</td>
+            </tr>
+            <tr>
+              <td>{{i18n "about.like_count"}}</td>
+              <td>{{number model.stats.likes_7_days}}</td>
+              <td>{{number model.stats.likes_30_days}}</td>
+              <td>{{number model.stats.like_count}}</td>
+            </tr>
+          </tbody>
+        </table>
+      </section>
 
       {{#if contactInfo}}
         <section class="about contact">
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
index 2ac52d5f71..e9e0b9a34f 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
@@ -3,9 +3,6 @@
 {{#if showCategoryAdmin}}
   {{categories-admin-dropdown
     onChange=(action "selectCategoryAdminDropdownAction")
-    options=(hash
-      triggerOnChangeOnTab=false
-    )
   }}
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
index aa5b44a716..007ec9c19d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
@@ -50,9 +50,9 @@
                   args=(hash topic=topic)
                   tagName=""
                   connectorTagName="span"}}
-</div>
 
-{{pinned-button pinned=topic.pinned topic=topic}}
+  {{pinned-button pinned=topic.pinned topic=topic}}
+</div>
 
 {{#if showNotificationsButton}}
   {{topic-notifications-button
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
index 4f1f13c614..45607c8cb7 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
@@ -5,11 +5,9 @@
       {{combo-box
         content=userSelectableThemes
         value=themeId
+        onChange=(action (mut themeId))
       }}
     </div>
-    {{#if themeIdChanged}}
-      <p class="alert alert-success save-theme-alert">{{i18n "user.save_to_change_theme" save_text=(i18n "save") }}</p>
-    {{/if}}
     {{#if showThemeSetDefault}}
       <div class="controls">
         {{preference-checkbox labelKey="user.theme_default_on_all_devices" checked=makeThemeDefault}}
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index d5e22f5437..488970c10e 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -36,7 +36,6 @@
                 options=(hash
                   filterable=true
                   categoryId=buffered.category_id
-                  minimum=minimumRequiredTags
                 )
               }}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index 8e27a15a03..ca4d73c925 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -125,7 +125,6 @@ createWidget(
           {
             attributes: {
               href: attrs.user.get("path"),
-              title: attrs.user.get("name"),
               "data-auto-route": true
             }
           },
diff --git a/app/assets/javascripts/select-kit/addon/.gitkeep b/app/assets/javascripts/select-kit/addon/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/pinned-button.hbs b/app/assets/javascripts/select-kit/addon/templates/components/pinned-button.hbs
deleted file mode 100644
index 91bfe147ff..0000000000
--- a/app/assets/javascripts/select-kit/addon/templates/components/pinned-button.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-<p class="reason">
-  {{pinned-options value=pinned topic=topic}}
-  <span class="text">{{html-safe reasonText}}</span>
-</p>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/addon/templates/components/topic-notifications-button.hbs
deleted file mode 100644
index f21111ebbd..0000000000
--- a/app/assets/javascripts/select-kit/addon/templates/components/topic-notifications-button.hbs
+++ /dev/null
@@ -1,30 +0,0 @@
-{{#if appendReason}}
-  <p class="reason">
-    {{topic-notifications-options
-      value=notificationLevel
-      topic=topic
-      onChange=(action "changeTopicNotificationLevel")
-      options=(hash
-        icon=icon
-        showFullTitle=showFullTitle
-        placement=placement
-        preventsClickPropagation=true
-        showCaret=showCaret
-      )
-    }}
-    <span class="text">{{html-safe topic.details.notificationReasonText}}</span>
-  </p>
-{{else}}
-  {{topic-notifications-options
-    value=notificationLevel
-    topic=topic
-    onChange=(action "changeTopicNotificationLevel")
-    options=(hash
-      icon=icon
-      showFullTitle=showFullTitle
-      placement=placement
-      preventsClickPropagation=true
-      showCaret=showCaret
-    )
-  }}
-{{/if}}
diff --git a/app/assets/javascripts/select-kit/addon/components/admin-group-selector.js b/app/assets/javascripts/select-kit/app/components/admin-group-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/admin-group-selector.js
rename to app/assets/javascripts/select-kit/app/components/admin-group-selector.js
diff --git a/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js b/app/assets/javascripts/select-kit/app/components/categories-admin-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
rename to app/assets/javascripts/select-kit/app/components/categories-admin-dropdown.js
diff --git a/app/assets/javascripts/select-kit/addon/components/category-chooser.js b/app/assets/javascripts/select-kit/app/components/category-chooser.js
similarity index 99%
rename from app/assets/javascripts/select-kit/addon/components/category-chooser.js
rename to app/assets/javascripts/select-kit/app/components/category-chooser.js
index 72d0167ac0..f36e8be2d3 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-chooser.js
+++ b/app/assets/javascripts/select-kit/app/components/category-chooser.js
@@ -67,7 +67,6 @@ export default ComboBoxComponent.extend({
 
   search(filter) {
     if (filter) {
-      filter = filter.toLowerCase();
       return this.content.filter(item => {
         const category = Category.findById(this.getValue(item));
         const categoryName = this.getName(item);
diff --git a/app/assets/javascripts/select-kit/addon/components/category-drop.js b/app/assets/javascripts/select-kit/app/components/category-drop.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/category-drop.js
rename to app/assets/javascripts/select-kit/app/components/category-drop.js
diff --git a/app/assets/javascripts/select-kit/addon/components/category-drop/category-drop-header.js b/app/assets/javascripts/select-kit/app/components/category-drop/category-drop-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/category-drop/category-drop-header.js
rename to app/assets/javascripts/select-kit/app/components/category-drop/category-drop-header.js
diff --git a/app/assets/javascripts/select-kit/addon/components/category-notifications-button.js b/app/assets/javascripts/select-kit/app/components/category-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/category-notifications-button.js
rename to app/assets/javascripts/select-kit/app/components/category-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/addon/components/category-row.js b/app/assets/javascripts/select-kit/app/components/category-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/category-row.js
rename to app/assets/javascripts/select-kit/app/components/category-row.js
diff --git a/app/assets/javascripts/select-kit/addon/components/category-selector.js b/app/assets/javascripts/select-kit/app/components/category-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/category-selector.js
rename to app/assets/javascripts/select-kit/app/components/category-selector.js
diff --git a/app/assets/javascripts/select-kit/addon/components/color-palettes.js b/app/assets/javascripts/select-kit/app/components/color-palettes.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/color-palettes.js
rename to app/assets/javascripts/select-kit/app/components/color-palettes.js
diff --git a/app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.js b/app/assets/javascripts/select-kit/app/components/color-palettes/color-palettes-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.js
rename to app/assets/javascripts/select-kit/app/components/color-palettes/color-palettes-row.js
diff --git a/app/assets/javascripts/select-kit/addon/components/combo-box.js b/app/assets/javascripts/select-kit/app/components/combo-box.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/combo-box.js
rename to app/assets/javascripts/select-kit/app/components/combo-box.js
diff --git a/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.js b/app/assets/javascripts/select-kit/app/components/combo-box/combo-box-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.js
rename to app/assets/javascripts/select-kit/app/components/combo-box/combo-box-header.js
diff --git a/app/assets/javascripts/select-kit/addon/components/composer-actions.js b/app/assets/javascripts/select-kit/app/components/composer-actions.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/composer-actions.js
rename to app/assets/javascripts/select-kit/app/components/composer-actions.js
diff --git a/app/assets/javascripts/select-kit/addon/components/create-color-row.js b/app/assets/javascripts/select-kit/app/components/create-color-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/create-color-row.js
rename to app/assets/javascripts/select-kit/app/components/create-color-row.js
diff --git a/app/assets/javascripts/select-kit/addon/components/dropdown-select-box.js b/app/assets/javascripts/select-kit/app/components/dropdown-select-box.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/dropdown-select-box.js
rename to app/assets/javascripts/select-kit/app/components/dropdown-select-box.js
diff --git a/app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-header.js b/app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-header.js
rename to app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-header.js
diff --git a/app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-row.js b/app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-row.js
rename to app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-row.js
diff --git a/app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js b/app/assets/javascripts/select-kit/app/components/future-date-input-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js
rename to app/assets/javascripts/select-kit/app/components/future-date-input-selector.js
diff --git a/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-header.js b/app/assets/javascripts/select-kit/app/components/future-date-input-selector/future-date-input-selector-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-header.js
rename to app/assets/javascripts/select-kit/app/components/future-date-input-selector/future-date-input-selector-header.js
diff --git a/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-row.js b/app/assets/javascripts/select-kit/app/components/future-date-input-selector/future-date-input-selector-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-row.js
rename to app/assets/javascripts/select-kit/app/components/future-date-input-selector/future-date-input-selector-row.js
diff --git a/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/mixin.js b/app/assets/javascripts/select-kit/app/components/future-date-input-selector/mixin.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/future-date-input-selector/mixin.js
rename to app/assets/javascripts/select-kit/app/components/future-date-input-selector/mixin.js
diff --git a/app/assets/javascripts/select-kit/addon/components/group-dropdown.js b/app/assets/javascripts/select-kit/app/components/group-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/group-dropdown.js
rename to app/assets/javascripts/select-kit/app/components/group-dropdown.js
diff --git a/app/assets/javascripts/select-kit/addon/components/group-members-dropdown.js b/app/assets/javascripts/select-kit/app/components/group-members-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/group-members-dropdown.js
rename to app/assets/javascripts/select-kit/app/components/group-members-dropdown.js
diff --git a/app/assets/javascripts/select-kit/addon/components/group-notifications-button.js b/app/assets/javascripts/select-kit/app/components/group-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/group-notifications-button.js
rename to app/assets/javascripts/select-kit/app/components/group-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/addon/components/icon-picker.js b/app/assets/javascripts/select-kit/app/components/icon-picker.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/icon-picker.js
rename to app/assets/javascripts/select-kit/app/components/icon-picker.js
diff --git a/app/assets/javascripts/select-kit/addon/components/list-setting.js b/app/assets/javascripts/select-kit/app/components/list-setting.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/list-setting.js
rename to app/assets/javascripts/select-kit/app/components/list-setting.js
diff --git a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js b/app/assets/javascripts/select-kit/app/components/mini-tag-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js
rename to app/assets/javascripts/select-kit/app/components/mini-tag-chooser.js
diff --git a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/mini-tag-chooser-header.js b/app/assets/javascripts/select-kit/app/components/mini-tag-chooser/mini-tag-chooser-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/mini-tag-chooser-header.js
rename to app/assets/javascripts/select-kit/app/components/mini-tag-chooser/mini-tag-chooser-header.js
diff --git a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js b/app/assets/javascripts/select-kit/app/components/mini-tag-chooser/selected-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js
rename to app/assets/javascripts/select-kit/app/components/mini-tag-chooser/selected-collection.js
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select.js b/app/assets/javascripts/select-kit/app/components/multi-select.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/multi-select.js
rename to app/assets/javascripts/select-kit/app/components/multi-select.js
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.js b/app/assets/javascripts/select-kit/app/components/multi-select/multi-select-filter.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.js
rename to app/assets/javascripts/select-kit/app/components/multi-select/multi-select-filter.js
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.js b/app/assets/javascripts/select-kit/app/components/multi-select/multi-select-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.js
rename to app/assets/javascripts/select-kit/app/components/multi-select/multi-select-header.js
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select/selected-category.js b/app/assets/javascripts/select-kit/app/components/multi-select/selected-category.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/multi-select/selected-category.js
rename to app/assets/javascripts/select-kit/app/components/multi-select/selected-category.js
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select/selected-color.js b/app/assets/javascripts/select-kit/app/components/multi-select/selected-color.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/multi-select/selected-color.js
rename to app/assets/javascripts/select-kit/app/components/multi-select/selected-color.js
diff --git a/app/assets/javascripts/select-kit/addon/components/none-category-row.js b/app/assets/javascripts/select-kit/app/components/none-category-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/none-category-row.js
rename to app/assets/javascripts/select-kit/app/components/none-category-row.js
diff --git a/app/assets/javascripts/select-kit/addon/components/notifications-button.js b/app/assets/javascripts/select-kit/app/components/notifications-button.js
similarity index 96%
rename from app/assets/javascripts/select-kit/addon/components/notifications-button.js
rename to app/assets/javascripts/select-kit/app/components/notifications-button.js
index 32dc2ad7ba..f5423b9e64 100644
--- a/app/assets/javascripts/select-kit/addon/components/notifications-button.js
+++ b/app/assets/javascripts/select-kit/app/components/notifications-button.js
@@ -13,7 +13,8 @@ export default DropdownSelectBoxComponent.extend({
     autoFilterable: false,
     filterable: false,
     i18nPrefix: "",
-    i18nPostfix: ""
+    i18nPostfix: "",
+    showCaret: true
   },
 
   modifyComponentForRow() {
diff --git a/app/assets/javascripts/select-kit/addon/components/notifications-button/notifications-button-row.js b/app/assets/javascripts/select-kit/app/components/notifications-button/notifications-button-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/notifications-button/notifications-button-row.js
rename to app/assets/javascripts/select-kit/app/components/notifications-button/notifications-button-row.js
diff --git a/app/assets/javascripts/select-kit/addon/components/notifications-filter.js b/app/assets/javascripts/select-kit/app/components/notifications-filter.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/notifications-filter.js
rename to app/assets/javascripts/select-kit/app/components/notifications-filter.js
diff --git a/app/assets/javascripts/select-kit/addon/components/notifications-filter/notifications-filter-header.js b/app/assets/javascripts/select-kit/app/components/notifications-filter/notifications-filter-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/notifications-filter/notifications-filter-header.js
rename to app/assets/javascripts/select-kit/app/components/notifications-filter/notifications-filter-header.js
diff --git a/app/assets/javascripts/select-kit/addon/components/period-chooser.js b/app/assets/javascripts/select-kit/app/components/period-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/period-chooser.js
rename to app/assets/javascripts/select-kit/app/components/period-chooser.js
diff --git a/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-header.js b/app/assets/javascripts/select-kit/app/components/period-chooser/period-chooser-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-header.js
rename to app/assets/javascripts/select-kit/app/components/period-chooser/period-chooser-header.js
diff --git a/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-row.js b/app/assets/javascripts/select-kit/app/components/period-chooser/period-chooser-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-row.js
rename to app/assets/javascripts/select-kit/app/components/period-chooser/period-chooser-row.js
diff --git a/app/assets/javascripts/select-kit/addon/components/pinned-button.js b/app/assets/javascripts/select-kit/app/components/pinned-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/pinned-button.js
rename to app/assets/javascripts/select-kit/app/components/pinned-button.js
diff --git a/app/assets/javascripts/select-kit/addon/components/pinned-options.js b/app/assets/javascripts/select-kit/app/components/pinned-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/pinned-options.js
rename to app/assets/javascripts/select-kit/app/components/pinned-options.js
diff --git a/app/assets/javascripts/select-kit/addon/components/search-advanced-category-chooser.js b/app/assets/javascripts/select-kit/app/components/search-advanced-category-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/search-advanced-category-chooser.js
rename to app/assets/javascripts/select-kit/app/components/search-advanced-category-chooser.js
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit.js b/app/assets/javascripts/select-kit/app/components/select-kit.js
similarity index 99%
rename from app/assets/javascripts/select-kit/addon/components/select-kit.js
rename to app/assets/javascripts/select-kit/app/components/select-kit.js
index 02acfb5a2e..f2fbbbf1c2 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/app/components/select-kit.js
@@ -1,6 +1,5 @@
 import I18n from "I18n";
-import EmberObject, { computed, get } from "@ember/object";
-import { guidFor } from "@ember/object/internals";
+import EmberObject, { computed, get, guidFor } from "@ember/object";
 import Component from "@ember/component";
 import deprecated from "discourse-common/lib/deprecated";
 import { makeArray } from "discourse-common/lib/helpers";
@@ -272,8 +271,7 @@ export default Component.extend(
       selectedNameComponent: "selected-name",
       castInteger: false,
       preventsClickPropagation: false,
-      focusAfterOnChange: true,
-      triggerOnChangeOnTab: true
+      focusAfterOnChange: true
     },
 
     autoFilterable: computed("content.[]", "selectKit.filter", function() {
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/errors-collection.js b/app/assets/javascripts/select-kit/app/components/select-kit/errors-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/select-kit/errors-collection.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/errors-collection.js
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-body.js b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-body.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-body.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/select-kit-body.js
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/select-kit-collection.js
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-create-row.js b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-create-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-create-row.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/select-kit-create-row.js
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-filter.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/select-kit-filter.js
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-header.js
similarity index 97%
rename from app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/select-kit-header.js
index 5697826f59..785b2a4702 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
+++ b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-header.js
@@ -140,11 +140,7 @@ export default Component.extend(UtilsMixin, {
       this._focusFilterInput();
     } else if (event.keyCode === 9) {
       // Tab
-      if (
-        this.selectKit.highlighted &&
-        this.selectKit.isExpanded &&
-        this.selectKit.options.triggerOnChangeOnTab
-      ) {
+      if (this.selectKit.highlighted && this.selectKit.isExpanded) {
         this.selectKit.select(
           this.getValue(this.selectKit.highlighted),
           this.selectKit.highlighted
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-none-row.js b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-none-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-none-row.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/select-kit-none-row.js
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js b/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/select-kit-row.js
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/single-select-header.js b/app/assets/javascripts/select-kit/app/components/select-kit/single-select-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/select-kit/single-select-header.js
rename to app/assets/javascripts/select-kit/app/components/select-kit/single-select-header.js
diff --git a/app/assets/javascripts/select-kit/addon/components/selected-color.js b/app/assets/javascripts/select-kit/app/components/selected-color.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/selected-color.js
rename to app/assets/javascripts/select-kit/app/components/selected-color.js
diff --git a/app/assets/javascripts/select-kit/addon/components/selected-name.js b/app/assets/javascripts/select-kit/app/components/selected-name.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/selected-name.js
rename to app/assets/javascripts/select-kit/app/components/selected-name.js
diff --git a/app/assets/javascripts/select-kit/addon/components/single-select.js b/app/assets/javascripts/select-kit/app/components/single-select.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/single-select.js
rename to app/assets/javascripts/select-kit/app/components/single-select.js
diff --git a/app/assets/javascripts/select-kit/addon/components/tag-chooser-row.js b/app/assets/javascripts/select-kit/app/components/tag-chooser-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/tag-chooser-row.js
rename to app/assets/javascripts/select-kit/app/components/tag-chooser-row.js
diff --git a/app/assets/javascripts/select-kit/addon/components/tag-chooser.js b/app/assets/javascripts/select-kit/app/components/tag-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/tag-chooser.js
rename to app/assets/javascripts/select-kit/app/components/tag-chooser.js
diff --git a/app/assets/javascripts/select-kit/addon/components/tag-drop.js b/app/assets/javascripts/select-kit/app/components/tag-drop.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/tag-drop.js
rename to app/assets/javascripts/select-kit/app/components/tag-drop.js
diff --git a/app/assets/javascripts/select-kit/addon/components/tag-drop/tag-drop-header.js b/app/assets/javascripts/select-kit/app/components/tag-drop/tag-drop-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/tag-drop/tag-drop-header.js
rename to app/assets/javascripts/select-kit/app/components/tag-drop/tag-drop-header.js
diff --git a/app/assets/javascripts/select-kit/addon/components/tag-group-chooser.js b/app/assets/javascripts/select-kit/app/components/tag-group-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/tag-group-chooser.js
rename to app/assets/javascripts/select-kit/app/components/tag-group-chooser.js
diff --git a/app/assets/javascripts/select-kit/addon/components/tag-notifications-button.js b/app/assets/javascripts/select-kit/app/components/tag-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/tag-notifications-button.js
rename to app/assets/javascripts/select-kit/app/components/tag-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/addon/components/tag-row.js b/app/assets/javascripts/select-kit/app/components/tag-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/tag-row.js
rename to app/assets/javascripts/select-kit/app/components/tag-row.js
diff --git a/app/assets/javascripts/select-kit/addon/components/timezone-input.js b/app/assets/javascripts/select-kit/app/components/timezone-input.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/timezone-input.js
rename to app/assets/javascripts/select-kit/app/components/timezone-input.js
diff --git a/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options.js b/app/assets/javascripts/select-kit/app/components/toolbar-popup-menu-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options.js
rename to app/assets/javascripts/select-kit/app/components/toolbar-popup-menu-options.js
diff --git a/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js b/app/assets/javascripts/select-kit/app/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
rename to app/assets/javascripts/select-kit/app/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
diff --git a/app/assets/javascripts/select-kit/addon/components/topic-footer-mobile-dropdown.js b/app/assets/javascripts/select-kit/app/components/topic-footer-mobile-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/topic-footer-mobile-dropdown.js
rename to app/assets/javascripts/select-kit/app/components/topic-footer-mobile-dropdown.js
diff --git a/app/assets/javascripts/select-kit/addon/components/topic-notifications-button.js b/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
similarity index 55%
rename from app/assets/javascripts/select-kit/addon/components/topic-notifications-button.js
rename to app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
index d9c0900182..58329393e7 100644
--- a/app/assets/javascripts/select-kit/addon/components/topic-notifications-button.js
+++ b/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
@@ -1,28 +1,20 @@
 import Component from "@ember/component";
-import { action, computed } from "@ember/object";
+import { action } from "@ember/object";
 
 export default Component.extend({
   layoutName: "select-kit/templates/components/topic-notifications-button",
   classNames: ["topic-notifications-button"],
-  classNameBindings: ["isLoading"],
   appendReason: true,
   showFullTitle: true,
   placement: "bottom-start",
   notificationLevel: null,
   topic: null,
   showCaret: true,
-  isLoading: false,
-  icon: computed("isLoading", function() {
-    return this.isLoading ? "spinner" : null;
-  }),
 
   @action
   changeTopicNotificationLevel(levelId) {
     if (levelId !== this.notificationLevel) {
-      this.set("isLoading", true);
-      this.topic.details
-        .updateNotifications(levelId)
-        .finally(() => this.set("isLoading", false));
+      this.topic.details.updateNotifications(levelId);
     }
   }
 });
diff --git a/app/assets/javascripts/select-kit/addon/components/topic-notifications-options.js b/app/assets/javascripts/select-kit/app/components/topic-notifications-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/topic-notifications-options.js
rename to app/assets/javascripts/select-kit/app/components/topic-notifications-options.js
diff --git a/app/assets/javascripts/select-kit/addon/components/user-chooser.js b/app/assets/javascripts/select-kit/app/components/user-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/user-chooser.js
rename to app/assets/javascripts/select-kit/app/components/user-chooser.js
diff --git a/app/assets/javascripts/select-kit/addon/components/user-chooser/user-row.js b/app/assets/javascripts/select-kit/app/components/user-chooser/user-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/user-chooser/user-row.js
rename to app/assets/javascripts/select-kit/app/components/user-chooser/user-row.js
diff --git a/app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js b/app/assets/javascripts/select-kit/app/components/user-notifications-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js
rename to app/assets/javascripts/select-kit/app/components/user-notifications-dropdown.js
diff --git a/app/assets/javascripts/select-kit/addon/mixins/plugin-api.js b/app/assets/javascripts/select-kit/app/mixins/plugin-api.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/mixins/plugin-api.js
rename to app/assets/javascripts/select-kit/app/mixins/plugin-api.js
diff --git a/app/assets/javascripts/select-kit/addon/mixins/tags.js b/app/assets/javascripts/select-kit/app/mixins/tags.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/mixins/tags.js
rename to app/assets/javascripts/select-kit/app/mixins/tags.js
diff --git a/app/assets/javascripts/select-kit/addon/mixins/utils.js b/app/assets/javascripts/select-kit/app/mixins/utils.js
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/mixins/utils.js
rename to app/assets/javascripts/select-kit/app/mixins/utils.js
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/category-drop/category-drop-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/category-drop/category-drop-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/category-drop/category-drop-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/category-drop/category-drop-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/category-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/category-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/color-palettes/color-palettes-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/color-palettes/color-palettes-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/color-palettes/color-palettes-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/color-palettes/color-palettes-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/combo-box/combo-box-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/combo-box/combo-box-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/create-color-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/create-color-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/create-color-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/create-color-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/selected-collection.hbs b/app/assets/javascripts/select-kit/app/templates/components/mini-tag-chooser/selected-collection.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/selected-collection.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/mini-tag-chooser/selected-collection.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs b/app/assets/javascripts/select-kit/app/templates/components/multi-select.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/multi-select.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/multi-select/multi-select-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/multi-select/multi-select-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs b/app/assets/javascripts/select-kit/app/templates/components/multi-select/selected-category.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/multi-select/selected-category.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/notifications-filter/notifications-filter-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/notifications-filter/notifications-filter-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/notifications-filter/notifications-filter-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/notifications-filter/notifications-filter-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/period-chooser/period-chooser-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/period-chooser/period-chooser-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/period-chooser/period-chooser-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/period-chooser/period-chooser-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/pinned-button.hbs b/app/assets/javascripts/select-kit/app/templates/components/pinned-button.hbs
new file mode 100644
index 0000000000..f54bdb6b5f
--- /dev/null
+++ b/app/assets/javascripts/select-kit/app/templates/components/pinned-button.hbs
@@ -0,0 +1,5 @@
+{{pinned-options value=pinned topic=topic}}
+
+<p class="reason">
+  {{html-safe reasonText}}
+</p>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/errors-collection.hbs b/app/assets/javascripts/select-kit/app/templates/components/select-kit/errors-collection.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/select-kit/errors-collection.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/select-kit/errors-collection.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-body.hbs b/app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-body.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-body.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-body.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-collection.hbs b/app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-collection.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-collection.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-collection.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs b/app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-filter.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-filter.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/single-select-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/select-kit/single-select-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/select-kit/single-select-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/select-kit/single-select-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs b/app/assets/javascripts/select-kit/app/templates/components/selected-name.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/selected-name.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs b/app/assets/javascripts/select-kit/app/templates/components/single-select.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/single-select.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/tag-chooser-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/tag-chooser-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/tag-chooser-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/tag-chooser-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/tag-drop/tag-drop-header.hbs b/app/assets/javascripts/select-kit/app/templates/components/tag-drop/tag-drop-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/tag-drop/tag-drop-header.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/tag-drop/tag-drop-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/tag-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/tag-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/tag-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/tag-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs b/app/assets/javascripts/select-kit/app/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
new file mode 100644
index 0000000000..50dd20e56e
--- /dev/null
+++ b/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
@@ -0,0 +1,17 @@
+{{topic-notifications-options
+  value=notificationLevel
+  topic=topic
+  onChange=(action "changeTopicNotificationLevel")
+  options=(hash
+    showFullTitle=showFullTitle
+    placement=placement
+    preventsClickPropagation=true
+    showCaret=showCaret
+  )
+}}
+
+{{#if appendReason}}
+  <p class="reason">
+    {{html-safe topic.details.notificationReasonText}}
+  </p>
+{{/if}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/user-chooser/user-row.hbs b/app/assets/javascripts/select-kit/app/templates/components/user-chooser/user-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/user-chooser/user-row.hbs
rename to app/assets/javascripts/select-kit/app/templates/components/user-chooser/user-row.hbs
diff --git a/app/assets/javascripts/wizard-application.js b/app/assets/javascripts/wizard-application.js
index 4e2a7adc07..b8e8797f0c 100644
--- a/app/assets/javascripts/wizard-application.js
+++ b/app/assets/javascripts/wizard-application.js
@@ -1,6 +1,6 @@
 //= require_tree ./discourse-common/addon
 //= require i18n-patches
-//= require_tree ./select-kit/addon
+//= require_tree ./select-kit/app
 //= require wizard/router
 //= require wizard/wizard
 //= require_tree ./wizard/templates
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index a80e54c4fd..aa51fccce1 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -53,6 +53,7 @@
     color: $primary-medium;
   }
   span.badge-category {
+    font-weight: normal;
     color: $primary-medium;
   }
   a.discourse-tag {
diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss
index 05a2902905..d729cdc742 100644
--- a/app/assets/stylesheets/common/base/alert.scss
+++ b/app/assets/stylesheets/common/base/alert.scss
@@ -3,7 +3,6 @@
   background-color: $danger-low;
   color: $primary;
   position: relative;
-  margin-bottom: 1em;
 
   .close {
     font-size: $font-up-3;
diff --git a/app/assets/stylesheets/common/base/crawler_layout.scss b/app/assets/stylesheets/common/base/crawler_layout.scss
index bff0addac1..c279aceff4 100644
--- a/app/assets/stylesheets/common/base/crawler_layout.scss
+++ b/app/assets/stylesheets/common/base/crawler_layout.scss
@@ -27,36 +27,6 @@ body.crawler {
 
   .topic-list {
     margin-bottom: 1em;
-    @media (max-width: 850px) {
-      td {
-        word-break: break-all;
-        &.posters {
-          a:not(:last-of-type) {
-            display: none;
-          }
-          a:last-of-type {
-            display: block;
-          }
-        }
-      }
-
-      td,
-      th {
-        &.views {
-          display: none;
-        }
-      }
-
-      .link-top-line {
-        a.title {
-          padding: 0;
-        }
-      }
-
-      .link-bottom-line {
-        margin-top: 0.25em;
-      }
-    }
   }
 
   footer {
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 48c361c164..6e465bbc6b 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1005,51 +1005,10 @@ a.mention-group {
 }
 
 #topic-footer-buttons {
-  padding: 0.5em 0;
-
-  .topic-footer-main-buttons {
-    margin: 0 0 -0.5em 0;
-    display: flex;
-    flex-wrap: wrap;
-
-    > .btn {
-      margin: 0 0.5em 0.5em 0;
-      display: inline-flex;
-      align-items: center;
-
-      .d-button-label {
-        display: flex;
-        flex: 1 0 auto;
-        align-items: center;
-      }
-    }
-
-    .topic-admin-menu-button-container {
-      display: inline-flex;
-    }
-
-    .topic-admin-menu-button-container > span:not(:empty) {
-      margin: 0 0.5em 0.5em 0;
-    }
-  }
-
-  .pinned-button:not(.is-hidden) + .topic-notifications-button {
-    margin-top: 0;
-  }
-
-  .pinned-button,
-  .topic-notifications-button {
-    margin: 1em 0;
-
-    .reason {
-      color: $primary-high;
-      display: inline-flex;
-      margin: 0;
-      align-items: center;
-
-      .text {
-        margin-left: 0.5em;
-      }
-    }
+  .reason {
+    color: $primary-high;
+    display: inline;
+    margin: 0 0 0 8px;
+    line-height: $line-height-medium;
   }
 }
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 4d5e9f4288..587af3c353 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -653,9 +653,6 @@
     padding: 5px 0;
     font-weight: bold;
   }
-  .save-theme-alert {
-    font-size: $font-down-1;
-  }
 }
 
 .paginated-topics-list {
diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index 20ed535931..3881ee7b70 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -17,6 +17,7 @@
 
 .badge-wrapper {
   font-size: $font-down-1;
+  font-weight: bold;
   white-space: nowrap;
   position: relative;
   display: inline-flex;
diff --git a/app/assets/stylesheets/common/select-kit/category-row.scss b/app/assets/stylesheets/common/select-kit/category-row.scss
index df43c95603..2bbe33c96e 100644
--- a/app/assets/stylesheets/common/select-kit/category-row.scss
+++ b/app/assets/stylesheets/common/select-kit/category-row.scss
@@ -9,9 +9,6 @@
       -ms-flex: 1 1 auto;
       flex: 1 1 auto;
     }
-    .category-desc p {
-      margin: 0;
-    }
     .category-status {
       .badge-wrapper.box {
         margin-bottom: 1px;
diff --git a/app/assets/stylesheets/common/select-kit/pinned-button.scss b/app/assets/stylesheets/common/select-kit/pinned-button.scss
index 3e51092ae3..f080b8a016 100644
--- a/app/assets/stylesheets/common/select-kit/pinned-button.scss
+++ b/app/assets/stylesheets/common/select-kit/pinned-button.scss
@@ -1,7 +1,28 @@
 #topic-footer-buttons {
   .pinned-button {
+    min-width: auto;
+    margin: 1em 0;
+
     &.is-hidden {
       display: none;
     }
+
+    .btn {
+      margin: 0;
+    }
+
+    .reason {
+      display: inline;
+      line-height: $line-height-medium;
+    }
+  }
+}
+
+.pinned-button {
+  margin: 0;
+  min-width: auto;
+
+  .pinned-options {
+    display: inline;
   }
 }
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index a9769b5971..130bad52f8 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -63,11 +63,6 @@
     flex-direction: row;
     min-height: 30px;
 
-    .d-icon-spinner {
-      -webkit-animation: rotate-forever 1s infinite linear;
-      animation: rotate-forever 1s infinite linear;
-    }
-
     .selected-name {
       text-align: left;
       flex: 0 1 auto;
diff --git a/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss b/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
index b3808031a1..1e7c797205 100644
--- a/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
+++ b/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
@@ -1,18 +1,27 @@
-.topic-notifications-button {
-  &.is-loading {
-    pointer-events: none;
-    user-select: none;
+#topic-footer-buttons {
+  .topic-notifications-button {
+    min-width: auto;
+    margin: 1em 0;
 
-    .d-icon-spinner {
+    .btn {
       margin: 0;
     }
 
-    .selected-name .d-icon {
-      display: none;
-    }
-
-    .topic-notifications-options {
-      opacity: 0.5;
+    .reason {
+      display: inline;
+      line-height: $line-height-medium;
     }
   }
 }
+
+.topic-notifications-button .topic-notifications-options {
+  min-width: auto;
+}
+
+.topic-notifications-button {
+  margin: 0;
+
+  .topic-notifications-options {
+    display: inline-flex;
+  }
+}
diff --git a/app/assets/stylesheets/desktop.scss b/app/assets/stylesheets/desktop.scss
index e9213e897b..70229afbbc 100644
--- a/app/assets/stylesheets/desktop.scss
+++ b/app/assets/stylesheets/desktop.scss
@@ -1,6 +1,24 @@
 @import "common";
 
-@import "desktop/*";
+/* @import "desktop/*"; TODO: get this working again */
+
+@import "desktop/alert";
+@import "desktop/banner";
+@import "desktop/compose";
+@import "desktop/discourse";
+@import "desktop/header";
+@import "desktop/login";
+@import "desktop/modal";
+@import "desktop/category-list";
+@import "desktop/latest-topic-list";
+@import "desktop/topic-list";
+@import "desktop/topic-post";
+@import "desktop/topic";
+@import "desktop/upload";
+@import "desktop/user";
+@import "desktop/history";
+@import "desktop/group";
+@import "desktop/admin_customize";
 
 // Import all component-specific files
 @import "desktop/components/*";
diff --git a/app/assets/stylesheets/desktop/alert.scss b/app/assets/stylesheets/desktop/alert.scss
new file mode 100644
index 0000000000..f3f57eac66
--- /dev/null
+++ b/app/assets/stylesheets/desktop/alert.scss
@@ -0,0 +1,3 @@
+.alert {
+  margin-bottom: 1em;
+}
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 5adc17d3eb..ca304b8e95 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -451,15 +451,20 @@ pre.copy-codeblocks:hover .copy-cmd {
   }
 }
 
-#topic-footer-buttons {
-  max-width: calc(690px + (11px * 2) + 45px);
+@mixin topic-footer-button {
+  margin-bottom: 5px;
+  margin-right: 10px;
+}
 
-  .bookmark {
+#topic-footer-buttons {
+  padding: 10px 10px 0 0;
+  float: left;
+  .btn {
+    @include topic-footer-button;
     .d-icon-bookmark.bookmarked {
       color: $tertiary;
     }
   }
-
   .bookmark.bookmarked .d-icon-bookmark,
   .bookmark.bookmarked .d-icon-discourse-bookmark-clock {
     color: $tertiary;
@@ -469,6 +474,10 @@ pre.copy-codeblocks:hover .copy-cmd {
   }
 }
 
+#topic-footer-button {
+  width: 757px;
+}
+
 .suggested-topics {
   clear: left;
   padding: 20px 0 15px 0;
diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss
index a3202ca43c..ee9c3ed92d 100644
--- a/app/assets/stylesheets/mobile.scss
+++ b/app/assets/stylesheets/mobile.scss
@@ -1,6 +1,37 @@
 @import "common";
 
-@import "mobile/*";
+/* @import "mobile/*"; TODO: get this working again */
+
+@import "mobile/buttons";
+@import "mobile/alert";
+@import "mobile/banner";
+@import "mobile/compose";
+@import "mobile/discourse";
+@import "mobile/header";
+@import "mobile/login";
+@import "mobile/modal";
+@import "mobile/topic-list";
+@import "mobile/topic-post";
+@import "mobile/topic";
+@import "mobile/upload";
+@import "mobile/user";
+@import "mobile/history";
+@import "mobile/lightbox";
+@import "mobile/directory";
+@import "mobile/search";
+@import "mobile/emoji";
+@import "mobile/ring";
+@import "mobile/group";
+@import "mobile/dashboard";
+@import "mobile/admin_badges";
+@import "mobile/admin_customize";
+@import "mobile/admin_reports";
+@import "mobile/admin_report";
+@import "mobile/admin_report_table";
+@import "mobile/admin_report_counters";
+@import "mobile/admin_emojis";
+@import "mobile/menu-panel";
+@import "mobile/reviewables";
 
 // Import all component-specific files
 @import "mobile/components/*";
diff --git a/app/assets/stylesheets/mobile/alert.scss b/app/assets/stylesheets/mobile/alert.scss
index 12e60245e5..0ee9b44ee0 100644
--- a/app/assets/stylesheets/mobile/alert.scss
+++ b/app/assets/stylesheets/mobile/alert.scss
@@ -1,8 +1,7 @@
+// there are (n) new or updated topics, click to show
 .alert.alert-info {
-  margin-bottom: 0.5em;
+  margin: 0;
   &.clickable {
-    // there are (n) new or updated topics, click to show
-    margin-bottom: 0;
     padding: 1em;
   }
 }
diff --git a/app/assets/stylesheets/mobile/banner.scss b/app/assets/stylesheets/mobile/banner.scss
index fc308f0588..852b284736 100644
--- a/app/assets/stylesheets/mobile/banner.scss
+++ b/app/assets/stylesheets/mobile/banner.scss
@@ -3,6 +3,11 @@
 // --------------------------------------------------
 
 #banner {
+  // go full width on mobile, by extending into the 10px wrap
+  // borders on left and right
+  margin: 0 -10px;
   max-height: 180px;
-  height: 20vh;
+  @media all and (max-height: 499px) {
+    max-height: 100px;
+  }
 }
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index c9406abca6..260f8d4b13 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -63,6 +63,11 @@ blockquote {
   margin-bottom: 9px;
 }
 
+// categories should not be bold on mobile; they fight with the topic title too much
+.badge-wrapper {
+  font-weight: normal;
+}
+
 .mobile-nav {
   margin: 0;
   padding: 0;
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index d84b4a727c..9cd4931ce8 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -36,7 +36,6 @@ span.badge-posts {
     .double-button {
       display: flex;
       flex: 0 1 auto;
-      align-items: center;
       button {
         &.like,
         &.read-indicator,
@@ -236,16 +235,20 @@ a.reply-to-tab {
 }
 
 #topic-footer-buttons {
+  @include clearfix;
+  padding: 20px 0 0 0;
   .d-icon-bookmark.bookmarked,
   .d-icon-discourse-bookmark-clock.bookmarked {
     color: $tertiary;
   }
-
-  .topic-footer-mobile-dropdown {
-    margin: 0 0.5em 0.5em 0;
+  .combobox {
+    margin-right: 0.5em;
     width: 160px;
+    margin-bottom: 0.5em;
   }
+}
 
+#topic-footer-buttons {
   .topic-notifications-button,
   .pinned-button {
     display: flex;
@@ -260,6 +263,11 @@ a.reply-to-tab {
   }
 }
 
+#topic-footer-button {
+  width: 100px;
+  margin: 0 auto;
+}
+
 .suggested-topics {
   clear: left;
   padding: 20px 0 15px 0;
@@ -284,6 +292,13 @@ span.post-count {
   opacity: 0.8;
 }
 
+#topic-footer-buttons {
+  .btn {
+    margin-bottom: 0.5em;
+    margin-right: 0.5em;
+  }
+}
+
 #topic-title {
   z-index: z("base") + 1;
   margin: 0 0 0 0 !important;
diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index 3f3f9e15a3..fe2d3a2327 100644
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -16,7 +16,7 @@ class AboutController < ApplicationController
         render :index
       end
       format.json do
-        render_json_dump(AboutSerializer.new(@about, scope: guardian))
+        render_serialized(@about, AboutSerializer)
       end
     end
   end
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 5eadbbcf6d..81511387f7 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -331,13 +331,7 @@ class ListController < ApplicationController
 
     params[:category] = @category.id.to_s
 
-    @description_meta = if @category.uncategorized?
-      I18n.t('category.uncategorized_description', locale: SiteSetting.default_locale)
-    else
-      @category.description_text
-    end
-    @description_meta = SiteSetting.site_description if @description_meta.blank?
-
+    @description_meta = @category.description_text
     if !guardian.can_see?(@category)
       if SiteSetting.detailed_404
         raise Discourse::InvalidAccess
diff --git a/app/controllers/themes_controller.rb b/app/controllers/themes_controller.rb
new file mode 100644
index 0000000000..6520ec7097
--- /dev/null
+++ b/app/controllers/themes_controller.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class ThemesController < ::ApplicationController
+  def assets
+    theme_ids = params[:ids].to_s.split("-").map(&:to_i)
+
+    if params[:ids] == "default"
+      theme_ids = nil
+    else
+      raise Discourse::NotFound unless guardian.allow_themes?(theme_ids)
+    end
+
+    targets = view_context.mobile_view? ? [:mobile, :mobile_theme] : [:desktop, :desktop_theme]
+    targets << :admin if guardian.is_staff?
+    targets.append(*Discourse.find_plugin_css_assets(mobile_view: true, desktop_view: true))
+
+    object = targets.map do |target|
+      Stylesheet::Manager.stylesheet_data(target, theme_ids).map do |hash|
+        next hash unless Rails.env.development?
+
+        dup_hash = hash.dup
+        dup_hash[:new_href] = dup_hash[:new_href].dup
+        dup_hash[:new_href] << (dup_hash[:new_href].include?("?") ? "&" : "?")
+        dup_hash[:new_href] << SecureRandom.hex
+        dup_hash
+      end
+    end.flatten
+
+    render json: object.as_json
+  end
+end
diff --git a/app/helpers/email_helper.rb b/app/helpers/email_helper.rb
index 14364d45c3..c579473a4d 100644
--- a/app/helpers/email_helper.rb
+++ b/app/helpers/email_helper.rb
@@ -25,8 +25,12 @@ module EmailHelper
     raw "<a href='#{Discourse.base_url}#{url}' style='color: ##{@anchor_color}'>#{title}</a>"
   end
 
-  def email_html_template
-    EmailStyle.new.html.sub('%{email_content}', yield).html_safe
+  def email_html_template(binding_arg)
+    template = EmailStyle.new.html.sub(
+      '%{email_content}',
+      '<%= yield %><% if defined?(html_body) %><%= html_body %><% end %>'
+    )
+    ERB.new(template).result(binding_arg)
   end
 
   protected
diff --git a/app/models/application_request.rb b/app/models/application_request.rb
index 3d0d8ae905..52a6a8a87e 100644
--- a/app/models/application_request.rb
+++ b/app/models/application_request.rb
@@ -16,16 +16,15 @@ class ApplicationRequest < ActiveRecord::Base
   include CachedCounting
 
   def self.disable
-    @disabled = true
+    @enabled = false
   end
 
   def self.enable
-    @disabled = false
+    @enabled = true
   end
 
   def self.increment!(type, opts = nil)
-    return if @disabled
-    perform_increment!(redis_key(type), opts)
+    perform_increment!(redis_key(type), opts) if @enabled
   end
 
   def self.write_cache!(date = nil)
diff --git a/app/models/category.rb b/app/models/category.rb
index 6ecfe9d3af..63db814752 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -709,29 +709,37 @@ class Category < ActiveRecord::Base
     ].include? id
   end
 
-  def full_slug(separator = "-")
-    start_idx = "#{Discourse.base_uri}/c/".size
-    url[start_idx..-1].gsub("/", separator)
-  end
-
-  @@url_cache = DistributedCache.new("category_url")
+  @@url_cache = DistributedCache.new('category_url')
 
   def clear_url_cache
     @@url_cache.clear
   end
 
+  def full_slug(separator = "-")
+    start_idx = "#{Discourse.base_uri}/c/".length
+    url[start_idx..-1].gsub("/", separator)
+  end
+
   def url
-    @@url_cache[self.id] ||= "#{Discourse.base_uri}/c/#{slug_path.join('/')}"
+    url = @@url_cache[self.id]
+    unless url
+      url = "#{Discourse.base_uri}/c/#{slug_path.join('/')}"
+
+      @@url_cache[self.id] = url
+    end
+
+    url
   end
 
   def url_with_id
     self.parent_category ? "#{url}/#{self.id}" : "#{Discourse.base_uri}/c/#{self.slug}/#{self.id}"
   end
 
-  # If the name changes, try and update the category definition topic too if it's an exact match
+  # If the name changes, try and update the category definition topic too if it's
+  # an exact match
   def rename_category_definition
-    return unless topic.present?
     old_name = saved_changes.transform_values(&:first)["name"]
+    return unless topic.present?
     if topic.title == I18n.t("category.topic_prefix", category: old_name)
       topic.update_attribute(:title, I18n.t("category.topic_prefix", category: name))
     end
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index 21e5a137dc..f4425919ed 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -164,15 +164,9 @@ class GlobalSetting
         c[:port] = redis_port if redis_port
 
         if redis_slave_host && redis_slave_port
-          if ENV["RAILS_FAILOVER"]
-            c[:replica_host] = redis_slave_host
-            c[:replica_port] = redis_slave_port
-            c[:connector] = RailsFailover::Redis::Connector
-          else
-            c[:slave_host] = redis_slave_host
-            c[:slave_port] = redis_slave_port
-            c[:connector] = DiscourseRedis::Connector
-          end
+          c[:slave_host] = redis_slave_host
+          c[:slave_port] = redis_slave_port
+          c[:connector] = DiscourseRedis::Connector
         end
 
         c[:password] = redis_password if redis_password.present?
@@ -194,15 +188,9 @@ class GlobalSetting
         c[:port] = message_bus_redis_port if message_bus_redis_port
 
         if message_bus_redis_slave_host && message_bus_redis_slave_port
-          if ENV["RAILS_FAILOVER"]
-            c[:replica_host] = message_bus_redis_slave_host
-            c[:replica_port] = message_bus_redis_slave_port
-            c[:connector] = RailsFailover::Redis::Connector
-          else
-            c[:slave_host] = message_bus_redis_slave_host
-            c[:slave_port] = message_bus_redis_slave_port
-            c[:connector] = DiscourseRedis::Connector
-          end
+          c[:slave_host] = message_bus_redis_slave_host
+          c[:slave_port] = message_bus_redis_slave_port
+          c[:connector] = DiscourseRedis::Connector
         end
 
         c[:password] = message_bus_redis_password if message_bus_redis_password.present?
diff --git a/app/models/group_archived_message.rb b/app/models/group_archived_message.rb
index 8199a53cf6..1715a57585 100644
--- a/app/models/group_archived_message.rb
+++ b/app/models/group_archived_message.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class GroupArchivedMessage < ActiveRecord::Base
-  belongs_to :group
+  belongs_to :user
   belongs_to :topic
 
   def self.move_to_inbox!(group_id, topic)
diff --git a/app/models/post.rb b/app/models/post.rb
index e1a3a1f391..89dbbcfebb 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -159,6 +159,14 @@ class Post < ActiveRecord::Base
     includes(:post_details).find_by(post_details: { key: key, value: value })
   end
 
+  def self.excerpt_size=(sz)
+    @excerpt_size = sz
+  end
+
+  def self.excerpt_size
+    @excerpt_size || 220
+  end
+
   def whisper?
     post_type == Post.types[:whisper]
   end
@@ -474,7 +482,7 @@ class Post < ActiveRecord::Base
   end
 
   def excerpt_for_topic
-    Post.excerpt(cooked, SiteSetting.topic_excerpt_maxlength, strip_links: true, strip_images: true, post: self)
+    Post.excerpt(cooked, Post.excerpt_size, strip_links: true, strip_images: true, post: self)
   end
 
   def is_first_post?
@@ -650,10 +658,6 @@ class Post < ActiveRecord::Base
       baked_version: BAKED_VERSION
     )
 
-    if is_first_post?
-      topic.update_excerpt(excerpt_for_topic)
-    end
-
     if invalidate_broken_images
       custom_fields.delete(BROKEN_IMAGES)
       save_custom_fields
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 38affdb327..d331a30806 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -33,11 +33,11 @@ class Topic < ActiveRecord::Base
   end
 
   def self.thumbnail_sizes
-    [ self.share_thumbnail_size ] + DiscoursePluginRegistry.topic_thumbnail_sizes
+    [ self.share_thumbnail_size ]
   end
 
-  def thumbnail_job_redis_key(sizes)
-    "generate_topic_thumbnail_enqueue_#{id}_#{sizes.inspect}"
+  def thumbnail_job_redis_key(extra_sizes)
+    "generate_topic_thumbnail_enqueue_#{id}_#{extra_sizes.inspect}"
   end
 
   def filtered_topic_thumbnails(extra_sizes: [])
@@ -79,7 +79,7 @@ class Topic < ActiveRecord::Base
     if SiteSetting.create_thumbnails &&
        enqueue_if_missing &&
        records.length < thumbnail_sizes.length &&
-       Discourse.redis.set(thumbnail_job_redis_key(thumbnail_sizes), 1, nx: true, ex: 1.minute)
+       Discourse.redis.set(thumbnail_job_redis_key(extra_sizes), 1, nx: true, ex: 1.minute)
 
       Jobs.enqueue(:generate_topic_thumbnails, { topic_id: id, extra_sizes: extra_sizes })
     end
@@ -1476,13 +1476,6 @@ class Topic < ActiveRecord::Base
     private_topic
   end
 
-  def update_excerpt(excerpt)
-    update_column(:excerpt, excerpt)
-    if archetype == "banner"
-      ApplicationController.banner_json_cache.clear
-    end
-  end
-
   def pm_with_non_human_user?
     sql = <<~SQL
     SELECT 1 FROM topics
diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 362ee79f4a..a18e5b85de 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -109,8 +109,6 @@ class TopicEmbed < ActiveRecord::Base
 
     url = UrlHelper.escape_uri(url)
     original_uri = URI.parse(url)
-    raise URI::InvalidURIError unless original_uri.is_a?(URI::HTTP)
-
     opts = {
       tags: %w[div p code pre h1 h2 h3 b em i strong a img ul li ol blockquote],
       attributes: %w[href src class],
diff --git a/app/models/upload.rb b/app/models/upload.rb
index 31c931c172..bb4e7976f5 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -448,3 +448,7 @@ end
 #  index_uploads_on_url                     (url)
 #  index_uploads_on_user_id                 (user_id)
 #
+# Foreign Keys
+#
+#  fk_rails_...  (access_control_post_id => posts.id)
+#
diff --git a/app/models/user.rb b/app/models/user.rb
index d9678d1a1c..9d682a62bd 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -7,95 +7,102 @@ class User < ActiveRecord::Base
   include SecondFactorManager
   include HasDestroyedWebHook
 
-  DEFAULT_FEATURED_BADGE_COUNT = 3
-
-  # not deleted on user delete
   has_many :posts
-  has_many :topics
-  has_many :uploads
-
+  has_many :notifications, dependent: :delete_all
+  has_many :topic_users, dependent: :delete_all
   has_many :category_users, dependent: :destroy
   has_many :tag_users, dependent: :destroy
   has_many :user_api_keys, dependent: :destroy
-  has_many :topic_allowed_users, dependent: :destroy
-  has_many :user_archived_messages, dependent: :destroy
-  has_many :email_change_requests, dependent: :destroy
-  has_many :email_tokens, dependent: :destroy
-  has_many :invites, dependent: :destroy
-  has_many :topic_links, dependent: :destroy
-  has_many :user_uploads, dependent: :destroy
-  has_many :user_emails, dependent: :destroy
-  has_many :user_associated_accounts, dependent: :destroy
-  has_many :oauth2_user_infos, dependent: :destroy
-  has_many :user_second_factors, dependent: :destroy
-  has_many :user_badges, -> { for_enabled_badges }, dependent: :destroy
-  has_many :user_auth_tokens, dependent: :destroy
-  has_many :group_users, dependent: :destroy
-  has_many :user_warnings, dependent: :destroy
-  has_many :api_keys, dependent: :destroy
-  has_many :push_subscriptions, dependent: :destroy
-  has_many :acting_group_histories, dependent: :destroy, foreign_key: :acting_user_id, class_name: 'GroupHistory'
-  has_many :targeted_group_histories, dependent: :destroy, foreign_key: :target_user_id, class_name: 'GroupHistory'
-  has_many :reviewable_scores, dependent: :destroy
+  has_many :topics
+  has_many :bookmarks
 
-  has_one :user_option, dependent: :destroy
-  has_one :user_avatar, dependent: :destroy
-  has_one :github_user_info, dependent: :destroy
-  has_one :primary_email, -> { where(primary: true)  }, class_name: 'UserEmail', dependent: :destroy
-  has_one :user_stat, dependent: :destroy
-  has_one :user_profile, dependent: :destroy, inverse_of: :user
-  has_one :single_sign_on_record, dependent: :destroy
-  has_one :anonymous_user_master, class_name: 'AnonymousUser', dependent: :destroy
-  has_one :anonymous_user_shadow, ->(record) { where(active: true) }, foreign_key: :master_user_id, class_name: 'AnonymousUser', dependent: :destroy
-
-  # delete all is faster but bypasses callbacks
-  has_many :bookmarks, dependent: :delete_all
-  has_many :notifications, dependent: :delete_all
-  has_many :topic_users, dependent: :delete_all
-  has_many :email_logs, dependent: :delete_all
-  has_many :incoming_emails, dependent: :delete_all
-  has_many :user_visits, dependent: :delete_all
-  has_many :user_auth_token_logs, dependent: :delete_all
-  has_many :group_requests, dependent: :delete_all
-  has_many :muted_user_records, class_name: 'MutedUser', dependent: :delete_all
-  has_many :ignored_user_records, class_name: 'IgnoredUser', dependent: :delete_all
-
-  # dependent deleting handled via before_destroy (special cases)
+  # dependent deleting handled via before_destroy
   has_many :user_actions
   has_many :post_actions
-  has_many :post_timings
-  has_many :directory_items
-  has_many :security_keys, -> {
-    where(enabled: true)
-  }, class_name: "UserSecurityKey"
 
+  DEFAULT_FEATURED_BADGE_COUNT = 3
+
+  has_many :user_badges, -> { for_enabled_badges }, dependent: :destroy
   has_many :badges, through: :user_badges
   has_many :default_featured_user_badges,
             -> { for_enabled_badges.grouped_with_count.where("featured_rank <= ?", DEFAULT_FEATURED_BADGE_COUNT) },
             class_name: "UserBadge"
 
+  has_many :email_logs, dependent: :delete_all
+  has_many :incoming_emails, dependent: :delete_all
+  has_many :post_timings
+  has_many :topic_allowed_users, dependent: :destroy
   has_many :topics_allowed, through: :topic_allowed_users, source: :topic
+  has_many :email_tokens, dependent: :destroy
+  has_many :user_visits, dependent: :destroy
+  has_many :invites, dependent: :destroy
+  has_many :topic_links, dependent: :destroy
+  has_many :uploads
+  has_many :user_warnings
+  has_many :user_archived_messages, dependent: :destroy
+  has_many :email_change_requests, dependent: :destroy
+
+  # see before_destroy
+  has_many :directory_items
+  has_many :user_auth_tokens, dependent: :destroy
+  has_many :user_auth_token_logs, dependent: :destroy
+
+  has_many :group_users, dependent: :destroy
   has_many :groups, through: :group_users
+  has_many :group_requests, dependent: :destroy
   has_many :secure_categories, through: :groups, source: :categories
 
-  # deleted in user_second_factors relationship
+  has_many :user_uploads, dependent: :destroy
+  has_many :user_emails, dependent: :destroy
+
+  has_one :primary_email, -> { where(primary: true)  }, class_name: 'UserEmail', dependent: :destroy
+
+  has_one :user_option, dependent: :destroy
+  has_one :user_avatar, dependent: :destroy
+  has_many :user_associated_accounts, dependent: :destroy
+  has_one :github_user_info, dependent: :destroy
+  has_many :oauth2_user_infos, dependent: :destroy
+  has_many :user_second_factors, dependent: :destroy
+
   has_many :totps, -> {
     where(method: UserSecondFactor.methods[:totp], enabled: true)
   }, class_name: "UserSecondFactor"
 
+  has_many :security_keys, -> {
+    where(enabled: true)
+  }, class_name: "UserSecurityKey"
+
+  has_one :anonymous_user_master, class_name: 'AnonymousUser'
+  has_one :anonymous_user_shadow, ->(record) { where(active: true) }, foreign_key: :master_user_id, class_name: 'AnonymousUser'
+
   has_one :master_user, through: :anonymous_user_master
   has_one :shadow_user, through: :anonymous_user_shadow, source: :user
 
+  has_one :user_stat, dependent: :destroy
+  has_one :user_profile, dependent: :destroy, inverse_of: :user
   has_one :profile_background_upload, through: :user_profile
   has_one :card_background_upload, through: :user_profile
+  has_one :single_sign_on_record, dependent: :destroy
   belongs_to :approved_by, class_name: 'User'
   belongs_to :primary_group, class_name: 'Group'
 
+  has_many :muted_user_records, class_name: 'MutedUser'
   has_many :muted_users, through: :muted_user_records
+
+  has_many :ignored_user_records, class_name: 'IgnoredUser'
   has_many :ignored_users, through: :ignored_user_records
 
+  has_many :api_keys, dependent: :destroy
+
+  has_many :push_subscriptions, dependent: :destroy
+
   belongs_to :uploaded_avatar, class_name: 'Upload'
 
+  has_many :acting_group_histories, dependent: :destroy, foreign_key: :acting_user_id, class_name: 'GroupHistory'
+  has_many :targeted_group_histories, dependent: :destroy, foreign_key: :target_user_id, class_name: 'GroupHistory'
+
+  has_many :reviewable_scores, dependent: :destroy
+
   delegate :last_sent_email_address, to: :email_logs
 
   validates_presence_of :username
@@ -157,9 +164,6 @@ class User < ActiveRecord::Base
     DirectoryItem.where(user_id: self.id)
       .where('period_type in (?)', DirectoryItem.period_types.values)
       .delete_all
-
-    # our relationship filters on enabled, this makes sure everything is deleted
-    UserSecurityKey.where(user_id: self.id).delete_all
   end
 
   # Skip validating email, for example from a particular auth provider plugin
@@ -929,7 +933,7 @@ class User < ActiveRecord::Base
 
   def activate
     if email_token = self.email_tokens.active.where(email: self.email).first
-      EmailToken.confirm(email_token.token, skip_reviewable: true)
+      user = EmailToken.confirm(email_token.token, skip_reviewable: true)
     end
     self.update!(active: true)
     create_reviewable
@@ -1115,9 +1119,10 @@ class User < ActiveRecord::Base
   end
 
   def number_of_rejected_posts
-    ReviewableQueuedPost
-      .where(status: Reviewable.statuses[:rejected])
-      .where(created_by_id: self.id)
+    Post.with_deleted
+      .where(user_id: self.id)
+      .joins('INNER JOIN reviewables r ON posts.id = r.target_id')
+      .where(r: { status: Reviewable.statuses[:rejected], type: ReviewableQueuedPost.name })
       .count
   end
 
diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index bd2751d6b4..f6dbf13312 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -5,14 +5,6 @@ class UserAvatar < ActiveRecord::Base
   belongs_to :gravatar_upload, class_name: 'Upload'
   belongs_to :custom_upload, class_name: 'Upload'
 
-  @@custom_user_gravatar_email_hash = {
-    Discourse::SYSTEM_USER_ID => User.email_hash("info@discourse.org")
-  }
-
-  def self.register_custom_user_gravatar_email_hash(user_id, email)
-    @@custom_user_gravatar_email_hash[user_id] = User.email_hash(email)
-  end
-
   def contains_upload?(id)
     gravatar_upload_id == id || custom_upload_id == id
   end
@@ -20,14 +12,14 @@ class UserAvatar < ActiveRecord::Base
   def update_gravatar!
     DistributedMutex.synchronize("update_gravatar_#{user_id}") do
       begin
-        self.update!(last_gravatar_download_attempt: Time.zone.now)
+        self.update!(last_gravatar_download_attempt: Time.now)
 
         max = Discourse.avatar_sizes.max
 
         # The user could be deleted before this executes
         return if user.blank? || user.primary_email.blank?
 
-        email_hash = @@custom_user_gravatar_email_hash[user_id] || user.email_hash
+        email_hash = user_id == Discourse::SYSTEM_USER_ID ? User.email_hash("info@discourse.org") : user.email_hash
         gravatar_url = "https://#{SiteSetting.gravatar_base_url}/avatar/#{email_hash}.png?s=#{max}&d=404&reset_cache=#{SecureRandom.urlsafe_base64(5)}"
 
         # follow redirects in case gravatar change rules on us
diff --git a/app/models/web_hook_event_type.rb b/app/models/web_hook_event_type.rb
index 442f14cb8c..952c1c2062 100644
--- a/app/models/web_hook_event_type.rb
+++ b/app/models/web_hook_event_type.rb
@@ -7,6 +7,8 @@ class WebHookEventType < ActiveRecord::Base
   GROUP = 4
   CATEGORY = 5
   TAG = 6
+  FLAG = 7
+  QUEUED_POST = 8
   REVIEWABLE = 9
   NOTIFICATION = 10
   SOLVED = 11
diff --git a/app/serializers/about_serializer.rb b/app/serializers/about_serializer.rb
index 8230c590a4..308f990fd6 100644
--- a/app/serializers/about_serializer.rb
+++ b/app/serializers/about_serializer.rb
@@ -21,16 +21,7 @@ class AboutSerializer < ApplicationSerializer
              :title,
              :locale,
              :version,
-             :https,
-             :can_see_about_stats
-
-  def can_see_about_stats
-    scope.can_see_about_stats?
-  end
-
-  def include_stats?
-    can_see_about_stats
-  end
+             :https
 
   def stats
     object.class.fetch_cached_stats || Jobs::AboutStats.new.execute({})
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index a5027c5303..e402fb880c 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -3,11 +3,11 @@
 class BadgeGranter
 
   def self.disable_queue
-    @queue_disabled = true
+    @queue_enabled = false
   end
 
   def self.enable_queue
-    @queue_disabled = false
+    @queue_enabled = true
   end
 
   def initialize(badge, user, opts = {})
@@ -124,7 +124,7 @@ class BadgeGranter
   end
 
   def self.queue_badge_grant(type, opt)
-    return if !SiteSetting.enable_badges || @queue_disabled
+    return if !SiteSetting.enable_badges || !@queue_enabled
     payload = nil
 
     case type
diff --git a/app/views/email/default_template.html b/app/views/email/default_template.html
index 99b2e94995..382f939273 100644
--- a/app/views/email/default_template.html
+++ b/app/views/email/default_template.html
@@ -3,8 +3,6 @@
 
 <head>
   <meta http-equiv="Content-type" name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no, width=device-width">
-  <!-- prevent ios zooming + autoscaling -->
-  <meta name="x-apple-disable-message-reformatting" />
   <title></title>
 </head>
 
diff --git a/app/views/layouts/email_template.html.erb b/app/views/layouts/email_template.html.erb
index 611eba0df4..80da92efc2 100644
--- a/app/views/layouts/email_template.html.erb
+++ b/app/views/layouts/email_template.html.erb
@@ -2,8 +2,5 @@
   <%= yield %>
   <% if defined?(html_body) %><%= html_body %><% end %>
 <% else %>
-  <%= email_html_template do %>
-    <%= yield %>
-    <% if defined?(html_body) %><%= html_body %><% end %>
-  <% end %>
+  <%= email_html_template(binding).html_safe %>
 <% end %>
diff --git a/app/views/layouts/publish.html.erb b/app/views/layouts/publish.html.erb
index 4a249e8f32..5bb0f957c5 100644
--- a/app/views/layouts/publish.html.erb
+++ b/app/views/layouts/publish.html.erb
@@ -2,8 +2,13 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <%= render partial: "layouts/head" %>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, user-scalable=yes, viewport-fit=cover">
+
     <%= render partial: "common/discourse_publish_stylesheet" %>
+
+    <%- if @canonical_url -%>
+      <link rel="canonical" href="<%= @canonical_url %>" />
+    <%- end -%>
   </head>
   <body class="<%= @body_classes.to_a.join(' ') %>">
     <%= yield %>
diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index 2338d39c6a..2d32efb77b 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -47,8 +47,8 @@
       <tr>
         <th><%= t 'js.topic.title' %></th>
         <th></th>
-        <th class="replies"><%= t 'js.replies' %></th>
-        <th class="views"><%= t 'js.views' %></th>
+        <th><%= t 'js.replies' %></th>
+        <th><%= t 'js.views' %></th>
         <th><%= t 'js.activity' %></th>
       </tr>
     </thead>
@@ -101,10 +101,10 @@
               <% end %>
             <% end %>
           </td>
-          <td class="replies">
+          <td>
             <span class='posts' title='<%= t 'posts' %>'><%= t.posts_count %></span>
           </td>
-          <td class="views">
+          <td>
             <span class='views' title='<%= t 'views' %>'><%= t.views %></span>
           </td>
           <td>
diff --git a/config/application.rb b/config/application.rb
index 0157dc8289..43a8bf3091 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -27,10 +27,6 @@ require_relative '../lib/discourse_plugin_registry'
 
 require_relative '../lib/plugin_gem'
 
-if ENV['RAILS_FAILOVER']
-  require 'rails_failover'
-end
-
 # Global config
 require_relative '../app/models/global_setting'
 GlobalSetting.configure!
@@ -254,7 +250,7 @@ module Discourse
     # Our templates shouldn't start with 'discourse/app/templates'
     config.handlebars.templates_root = {
       'discourse/app/templates' => '',
-      'select-kit/addon/templates' => 'select-kit/templates/'
+      'select-kit/app/templates' => 'select-kit/templates/'
     }
 
     config.handlebars.raw_template_namespace = "__DISCOURSE_RAW_TEMPLATES"
diff --git a/config/initializers/001-redis.rb b/config/initializers/001-redis.rb
index f28c59a3b1..e48441594e 100644
--- a/config/initializers/001-redis.rb
+++ b/config/initializers/001-redis.rb
@@ -2,20 +2,5 @@
 
 if Rails.env.development? && ENV['DISCOURSE_FLUSH_REDIS']
   puts "Flushing redis (development mode)"
-  Discourse.redis.flushdb
-end
-
-if ENV['RAILS_FAILOVER']
-  message_bus_keepalive_interval = MessageBus.keepalive_interval
-
-  RailsFailover::Redis.register_master_up_callback do
-    MessageBus.keepalive_interval = message_bus_keepalive_interval
-    Discourse.clear_readonly!
-    Discourse.request_refresh!
-  end
-
-  RailsFailover::Redis.register_master_down_callback do
-    # Disables MessageBus keepalive when Redis is in readonly mode
-    MessageBus.keepalive_interval = 0
-  end
+  Discourse.redis.flushall
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 3c3618ef96..9746f37f37 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -963,7 +963,6 @@ en:
       api_approved: "Approved:"
       api_last_used_at: "Last used at:"
       theme: "Theme"
-      save_to_change_theme: 'Theme will be updated after you click "%{save_text}"'
       home: "Default Home Page"
       staged: "Staged"
 
@@ -2101,7 +2100,7 @@ en:
         help: "Move message back to Inbox"
       edit_message:
         help: "Edit first post of the message"
-        title: "Edit"
+        title: "Edit Message"
       defer:
         help: "Mark as unread"
         title: "Defer"
@@ -3599,6 +3598,12 @@ en:
         tag_event:
           name: "Tag Event"
           details: "When a tag is created, updated or destroyed."
+        flag_event:
+          name: "Flag Event"
+          details: "When a flag is created, agreed, disagreed or ignored."
+        queued_post_event:
+          name: "Post Approval Event"
+          details: "When a new queued post is created, approved or rejected."
         reviewable_event:
           name: "Reviewable Event"
           details: "When a new item is ready for review and when its status is updated."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 2341f05c72..06f02313eb 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1467,7 +1467,6 @@ en:
     exclude_rel_nofollow_domains: "A list of domains where nofollow should not be added to links. example.com will automatically allow sub.example.com as well. As a minimum, you should add the domain of this site to help web crawlers find all content. If other parts of your website are at other domains, add those too."
 
     post_excerpt_maxlength: "Maximum length of a post excerpt / summary."
-    topic_excerpt_maxlength: "Maximum length of a topic excerpt / summary, generated from the first post in a topic."
     show_pinned_excerpt_mobile: "Show excerpt on pinned topics in mobile view."
     show_pinned_excerpt_desktop: "Show excerpt on pinned topics in desktop view."
     post_onebox_maxlength: "Maximum length of a oneboxed Discourse post in characters."
diff --git a/config/routes.rb b/config/routes.rb
index 69ade71938..d3a1082d43 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -23,7 +23,6 @@ Discourse::Application.routes.draw do
   post "webhooks/sparkpost" => "webhooks#sparkpost"
 
   scope path: nil, constraints: { format: /.*/ } do
-    Sidekiq::Web.set :sessions, Rails.application.config.session_options
     if Rails.env.development?
       mount Sidekiq::Web => "/sidekiq"
       mount Logster::Web => "/logs"
@@ -121,6 +120,7 @@ Discourse::Application.routes.draw do
       put "unsuspend"
       put "revoke_admin", constraints: AdminConstraint.new
       put "grant_admin", constraints: AdminConstraint.new
+      post "generate_api_key", constraints: AdminConstraint.new
       put "revoke_moderation", constraints: AdminConstraint.new
       put "grant_moderation", constraints: AdminConstraint.new
       put "approve"
@@ -950,6 +950,8 @@ Discourse::Application.routes.draw do
   get "/safe-mode" => "safe_mode#index"
   post "/safe-mode" => "safe_mode#enter", as: "safe_mode_enter"
 
+  get "/themes/assets/:ids" => "themes#assets"
+
   unless Rails.env.production?
     get "/qunit" => "qunit#index"
     get "/wizard/qunit" => "wizard#qunit"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 6209cc621a..d49bb0e4cf 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -394,7 +394,7 @@ login:
     default: false
   github_client_id:
     default: ""
-    regex: "^[a-zA-Z0-9\\.]+$"
+    regex: "^[a-f0-9]+$"
   github_client_secret:
     default: ""
     regex: "^[a-f0-9]+$"
@@ -819,12 +819,6 @@ posting:
       ja: 120
       zh_CN: 120
       zh_TW: 120
-  topic_excerpt_maxlength:
-    default: 220
-    locale_default:
-      ja: 120
-      zh_CN: 120
-      zh_TW: 120
   show_pinned_excerpt_mobile:
     client: true
     default: true
@@ -1388,8 +1382,7 @@ security:
       - Lax
       - Strict
       - Disabled
-      - None
-    regex: "^(Lax|Strict|Disabled|None)$"
+    regex: "^(Lax|Strict|Disabled)$"
   enable_escaped_fragments: true
   allow_index_in_robots_txt: true
   moderators_create_categories: false
diff --git a/db/fixtures/007_web_hook_event_types.rb b/db/fixtures/007_web_hook_event_types.rb
index ec666ec5ad..8bf8e93805 100644
--- a/db/fixtures/007_web_hook_event_types.rb
+++ b/db/fixtures/007_web_hook_event_types.rb
@@ -30,6 +30,16 @@ WebHookEventType.seed do |b|
   b.name = "tag"
 end
 
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::FLAG
+  b.name = "flag"
+end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::QUEUED_POST
+  b.name = "queued_post"
+end
+
 WebHookEventType.seed do |b|
   b.id = WebHookEventType::REVIEWABLE
   b.name = "reviewable"
diff --git a/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb b/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb
index 57b1885e35..092a0e7b99 100644
--- a/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb
+++ b/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb
@@ -16,7 +16,6 @@ class CreateBookmarksFromPostActionBookmarks < ActiveRecord::Migration[6.0]
         INNER JOIN posts ON posts.id = post_actions.post_id
         LEFT JOIN bookmarks ON bookmarks.post_id = post_actions.post_id AND bookmarks.user_id = post_actions.user_id
         INNER JOIN topics ON topics.id = posts.topic_id
-        INNER JOIN users ON users.id = post_actions.user_id
         WHERE bookmarks.id IS NULL AND post_action_type_id = :type_id AND post_actions.deleted_at IS NULL AND posts.deleted_at IS NULL
         LIMIT 2000
         SQL
diff --git a/db/migrate/20200514075356_remove_flag_web_hooks.rb b/db/migrate/20200514075356_remove_flag_web_hooks.rb
deleted file mode 100644
index 448b7fb771..0000000000
--- a/db/migrate/20200514075356_remove_flag_web_hooks.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-class RemoveFlagWebHooks < ActiveRecord::Migration[6.0]
-  def up
-    flag_event_type_id = 7
-
-    DB.exec <<~SQL
-    DELETE FROM web_hook_event_types_hooks
-    WHERE web_hook_event_type_id = #{flag_event_type_id}
-    SQL
-
-    DB.exec <<~SQL
-    DELETE FROM web_hook_event_types
-    WHERE id = #{flag_event_type_id}
-    SQL
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-end
diff --git a/db/migrate/20200514075407_remove_queued_post_web_hooks.rb b/db/migrate/20200514075407_remove_queued_post_web_hooks.rb
deleted file mode 100644
index 632e5013dc..0000000000
--- a/db/migrate/20200514075407_remove_queued_post_web_hooks.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-class RemoveQueuedPostWebHooks < ActiveRecord::Migration[6.0]
-  def up
-    queued_post_event_type_id = 8
-
-    DB.exec <<~SQL
-    DELETE FROM web_hook_event_types_hooks
-    WHERE web_hook_event_type_id = #{queued_post_event_type_id}
-    SQL
-
-    DB.exec <<~SQL
-    DELETE FROM web_hook_event_types
-    WHERE id = #{queued_post_event_type_id}
-    SQL
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-end
diff --git a/db/post_migrate/20200520001619_remove_fks_from_bookmarks.rb b/db/post_migrate/20200520001619_remove_fks_from_bookmarks.rb
deleted file mode 100644
index 80fee6dab4..0000000000
--- a/db/post_migrate/20200520001619_remove_fks_from_bookmarks.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class RemoveFksFromBookmarks < ActiveRecord::Migration[6.0]
-  def change
-    remove_foreign_key :bookmarks, :topics
-    remove_foreign_key :bookmarks, :posts
-    remove_foreign_key :bookmarks, :users
-  end
-end
diff --git a/db/post_migrate/20200522004855_remove_access_control_post_fk.rb b/db/post_migrate/20200522004855_remove_access_control_post_fk.rb
deleted file mode 100644
index 36c8d0fbb7..0000000000
--- a/db/post_migrate/20200522004855_remove_access_control_post_fk.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class RemoveAccessControlPostFk < ActiveRecord::Migration[6.0]
-  def change
-    remove_foreign_key :uploads, column: :access_control_post_id
-  end
-end
diff --git a/lib/backup_restore/backup_file_handler.rb b/lib/backup_restore/backup_file_handler.rb
index 7b26356989..c5e3702488 100644
--- a/lib/backup_restore/backup_file_handler.rb
+++ b/lib/backup_restore/backup_file_handler.rb
@@ -65,10 +65,9 @@ module BackupRestore
       return if !@is_archive
 
       log "Unzipping archive, this may take a while..."
-      Discourse::Utils.execute_command(
-        'tar', '--extract', '--gzip', '--file', @archive_path, '--directory', @tmp_directory,
-        failure_message: "Failed to decompress archive."
-      )
+      pipeline = Compression::Pipeline.new([Compression::Tar.new, Compression::Gzip.new])
+      unzipped_path = pipeline.decompress(@tmp_directory, @archive_path, available_size)
+      pipeline.strip_directory(unzipped_path, @tmp_directory)
     end
 
     def extract_db_dump
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index ab382a4d15..ae260e2ce1 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -75,8 +75,6 @@ class DiscoursePluginRegistry
 
   define_filtered_register :editable_group_custom_fields
 
-  define_filtered_register :topic_thumbnail_sizes
-
   def self.register_auth_provider(auth_provider)
     self.auth_providers << auth_provider
   end
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index 6b630b7b34..ff946cacfb 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -266,6 +266,12 @@ class DiscourseRedis
     end
   end
 
+  def flushdb
+    DiscourseRedis.ignore_readonly do
+      keys.each { |k| del(k) }
+    end
+  end
+
   def reconnect
     @redis._client.reconnect
   end
diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index f42fa73057..6a26ebd7ee 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -79,35 +79,12 @@ module FileStore
     def has_been_uploaded?(url)
       return false if url.blank?
 
-      begin
-        parsed_url = URI.parse(URI.encode(url))
-      rescue URI::InvalidURIError
-        return false
-      end
-
       base_hostname = URI.parse(absolute_base_url).hostname
-      if url[base_hostname]
-        # if the hostnames match it means the upload is in the same
-        # bucket on s3. however, the bucket folder path may differ in
-        # some cases, and we do not want to assume the url is uploaded
-        # here. e.g. the path of the current site could be /prod and the
-        # other site could be /staging
-        if s3_bucket_folder_path.present?
-          return parsed_url.path.starts_with?("/#{s3_bucket_folder_path}")
-        else
-          return true
-        end
-        return false
-      end
+      return true if url[base_hostname]
 
       return false if SiteSetting.Upload.s3_cdn_url.blank?
       cdn_hostname = URI.parse(SiteSetting.Upload.s3_cdn_url || "").hostname
-      return true if cdn_hostname.presence && url[cdn_hostname]
-      false
-    end
-
-    def s3_bucket_folder_path
-      @s3_helper.s3_bucket_folder_path
+      cdn_hostname.presence && url[cdn_hostname]
     end
 
     def s3_bucket_name
diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index 5a82623f8f..ee724d56d1 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -164,7 +164,7 @@ module I18n
 
       by_site[locale].with_indifferent_access
     rescue ActiveRecord::StatementInvalid => e
-      if PG::UndefinedTable === e.cause || PG::UndefinedColumn === e.cause
+      if PG::UndefinedTable === e.cause
         {}
       else
         raise
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 456461fead..00d496e46e 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -493,10 +493,6 @@ class Guardian
     is_staff?
   end
 
-  def can_see_about_stats?
-    true
-  end
-
   def auth_token
     if cookie = request&.cookies[Auth::DefaultCurrentUserProvider::TOKEN_COOKIE]
       UserAuthToken.hash_token(cookie)
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index ab48f7cbea..a993ce52f0 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -165,16 +165,6 @@ class Plugin::Instance
     DiscoursePluginRegistry.register_editable_group_custom_field(field, self)
   end
 
-  # Request a new size for topic thumbnails
-  # Will respect plugin enabled setting is enabled
-  # Size should be an array with two elements [max_width, max_height]
-  def register_topic_thumbnail_size(size)
-    if !(size.kind_of?(Array) && size.length == 2)
-      raise ArgumentError.new("Topic thumbnail dimension is not valid")
-    end
-    DiscoursePluginRegistry.register_topic_thumbnail_size(size, self)
-  end
-
   def custom_avatar_column(column)
     reloadable_patch do |plugin|
       AvatarLookup.lookup_columns << column
diff --git a/lib/plugin_initialization_guard.rb b/lib/plugin_initialization_guard.rb
index 42c1bda864..a5a164e9e2 100644
--- a/lib/plugin_initialization_guard.rb
+++ b/lib/plugin_initialization_guard.rb
@@ -6,44 +6,33 @@ def plugin_initialization_guard(&block)
   rescue => error
     plugins_directory = Rails.root + 'plugins'
 
-    if error.backtrace && error.backtrace_locations
-      plugin_path = error.backtrace_locations.lazy.map do |location|
-        Pathname.new(location.absolute_path)
-          .ascend
-          .lazy
-          .find { |path| path.parent == plugins_directory }
-      end.next
+    plugin_path = error.backtrace_locations.lazy.map do |location|
+      Pathname.new(location.absolute_path)
+        .ascend
+        .lazy
+        .find { |path| path.parent == plugins_directory }
+    end.next
 
-      raise unless plugin_path
+    raise unless plugin_path
 
-      stack_trace = error.backtrace.each_with_index.inject([]) do |messages, (line, index)|
-        if index == 0
-          messages << "#{line}: #{error} (#{error.class})"
-        else
-          messages << "\t#{index}: from #{line}"
-        end
-      end.reverse.join("\n")
+    stack_trace = error.backtrace.each_with_index.inject([]) do |messages, (line, index)|
+      if index == 0
+        messages << "#{line}: #{error} (#{error.class})"
+      else
+        messages << "\t#{index}: from #{line}"
+      end
+    end.reverse.join("\n")
 
-      STDERR.puts <<~MESSAGE
-        #{stack_trace}
+    STDERR.puts <<~MESSAGE
+      #{stack_trace}
 
-        ** INCOMPATIBLE PLUGIN **
+      ** INCOMPATIBLE PLUGIN **
 
-        You are unable to build Discourse due to errors in the plugin at
-        #{plugin_path}
+      You are unable to build Discourse due to errors in the plugin at
+      #{plugin_path}
 
-        Please try removing this plugin and rebuilding again!
-      MESSAGE
-    else
-      STDERR.puts <<~MESSAGE
-        ** PLUGIN FAILURE **
-
-        You are unable to build Discourse due to this error during plugin
-        initialization:
-
-        #{error}
-      MESSAGE
-    end
+      Please try removing this plugin and rebuilding again!
+    MESSAGE
     exit 1
   end
 end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index c3b9556df2..8a37e4c9c6 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -374,10 +374,6 @@ class PostCreator
   # discourse post.
   def create_embedded_topic
     return unless @opts[:embed_url].present?
-
-    original_uri = URI.parse(@opts[:embed_url])
-    raise Discourse::InvalidParameters.new(:embed_url) unless original_uri.is_a?(URI::HTTP)
-
     embed = TopicEmbed.new(topic_id: @post.topic_id, post_id: @post.id, embed_url: @opts[:embed_url])
     rollback_from_errors!(embed) unless embed.save
   end
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index d610fccf37..3c9ec277cd 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -567,7 +567,11 @@ class PostRevisor
   end
 
   def update_topic_excerpt
-    @topic.update_excerpt(@post.excerpt_for_topic)
+    excerpt = @post.excerpt_for_topic
+    @topic.update_column(:excerpt, excerpt)
+    if @topic.archetype == "banner"
+      ApplicationController.banner_json_cache.clear
+    end
   end
 
   def update_category_description
diff --git a/lib/tasks/bookmarks.rake b/lib/tasks/bookmarks.rake
index 87fe005b07..d3cf545d2d 100644
--- a/lib/tasks/bookmarks.rake
+++ b/lib/tasks/bookmarks.rake
@@ -22,7 +22,6 @@ task "bookmarks:sync_to_table" => :environment do |_t, args|
         INNER JOIN posts ON posts.id = post_actions.post_id
         LEFT JOIN bookmarks ON bookmarks.post_id = post_actions.post_id AND bookmarks.user_id = post_actions.user_id
         INNER JOIN topics ON topics.id = posts.topic_id
-        INNER JOIN users ON users.id = post_actions.user_id
         WHERE bookmarks.id IS NULL AND post_action_type_id = :type_id AND post_actions.deleted_at IS NULL AND posts.deleted_at IS NULL
         LIMIT 2000
       SQL
diff --git a/lib/topic_query_params.rb b/lib/topic_query_params.rb
index bab30135a1..e1bb23cb9f 100644
--- a/lib/topic_query_params.rb
+++ b/lib/topic_query_params.rb
@@ -3,7 +3,7 @@
 module TopicQueryParams
   def build_topic_list_options
     options = {}
-    params[:tags] = [params[:tag_id]] if params[:tag_id].present? && guardian.can_tag_pms?
+    params[:tags] = [params[:tag_id].parameterize] if params[:tag_id].present? && guardian.can_tag_pms?
 
     TopicQuery.public_valid_options.each do |key|
       if params.key?(key)
diff --git a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
index fda50b4829..3972a350fb 100644
--- a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
+++ b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
@@ -4,20 +4,20 @@ discobot_username = 'discobot'
 
 def seed_primary_email
   UserEmail.seed do |ue|
-    ue.id = DiscourseNarrativeBot::BOT_USER_ID
+    ue.id = -2
     ue.email = "discobot_email"
     ue.primary = true
-    ue.user_id = DiscourseNarrativeBot::BOT_USER_ID
+    ue.user_id = -2
   end
 end
 
-unless user = User.find_by(id: DiscourseNarrativeBot::BOT_USER_ID)
+unless user = User.find_by(id: -2)
   suggested_username = UserNameSuggester.suggest(discobot_username)
 
   seed_primary_email
 
   User.seed do |u|
-    u.id = DiscourseNarrativeBot::BOT_USER_ID
+    u.id = -2
     u.name = discobot_username
     u.username = suggested_username
     u.username_lower = suggested_username.downcase
@@ -26,9 +26,22 @@ unless user = User.find_by(id: DiscourseNarrativeBot::BOT_USER_ID)
     u.approved = true
     u.trust_level = TrustLevel[4]
   end
+
+  # TODO Pull the user avatar from that thread for now. In the future, pull it from a local file or from some central discobot repo.
+  if !Rails.env.test?
+    begin
+      UserAvatar.import_url_for_user(
+        "https://cdn.discourse.org/dev/uploads/default/original/2X/e/edb63d57a720838a7ce6a68f02ba4618787f2299.png",
+        User.find(-2),
+        override_gravatar: true
+      )
+    rescue
+      # In case the avatar can't be downloaded, don't fail seed
+    end
+  end
 end
 
-bot = User.find(DiscourseNarrativeBot::BOT_USER_ID)
+bot = User.find(-2)
 
 # ensure discobot has a primary email
 unless bot.primary_email
@@ -49,4 +62,4 @@ if !bot.user_profile.bio_raw
   )
 end
 
-Group.user_trust_level_change!(DiscourseNarrativeBot::BOT_USER_ID, TrustLevel[4])
+Group.user_trust_level_change!(-2, TrustLevel[4])
diff --git a/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb b/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb
deleted file mode 100644
index c902973081..0000000000
--- a/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class ClearLastGravatarDownloadAttemptOnUserAvatars < ActiveRecord::Migration[6.0]
-  def up
-    execute <<~SQL
-      UPDATE user_avatars
-      SET last_gravatar_download_attempt = null
-      WHERE user_id = -2 AND custom_upload_id IS NULL AND gravatar_upload_id IS NULL
-    SQL
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-end
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index 61047c0e8b..a6be5dd056 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -55,7 +55,6 @@ after_initialize do
 
   module ::DiscourseNarrativeBot
     PLUGIN_NAME = "discourse-narrative-bot".freeze
-    BOT_USER_ID = -2
 
     class Engine < ::Rails::Engine
       engine_name PLUGIN_NAME
@@ -272,9 +271,4 @@ after_initialize do
       end
     end
   end
-
-  UserAvatar.register_custom_user_gravatar_email_hash(
-    DiscourseNarrativeBot::BOT_USER_ID,
-    "discobot@discourse.org"
-  )
 end
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
index 6914dff1d2..4e24b9feae 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
@@ -472,7 +472,7 @@ describe DiscourseNarrativeBot::TrackSelector do
           let(:post) { Fabricate(:post, topic: topic) }
 
           after do
-            Discourse.redis.flushdb
+            Discourse.redis.flushall
           end
 
           describe 'when random reply massage has been displayed in the last 6 hours' do
diff --git a/plugins/discourse-narrative-bot/spec/jobs/send_advanced_tutorial_message_spec.rb b/plugins/discourse-narrative-bot/spec/jobs/send_advanced_tutorial_message_spec.rb
index 874e40cfe8..5d3674cae0 100644
--- a/plugins/discourse-narrative-bot/spec/jobs/send_advanced_tutorial_message_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/jobs/send_advanced_tutorial_message_spec.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'rails_helper'
-
 RSpec.describe Jobs::SendAdvancedTutorialMessage do
   before do
     Jobs.run_immediately!
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index 8c14233a5b..1b698cbf36 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -237,7 +237,7 @@ describe Auth::DefaultCurrentUserProvider do
     end
 
     after do
-      Discourse.redis.flushdb
+      Discourse.redis.flushall
     end
 
     it "should not update last seen for suspended users" do
diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb
index abc9a5917a..6d4af1d817 100644
--- a/spec/components/discourse_redis_spec.rb
+++ b/spec/components/discourse_redis_spec.rb
@@ -21,11 +21,11 @@ describe DiscourseRedis do
     let(:raw_redis) { Redis.new(DiscourseRedis.config) }
 
     before do
-      raw_redis.flushdb
+      raw_redis.flushall
     end
 
     after do
-      raw_redis.flushdb
+      raw_redis.flushall
     end
 
     describe 'when namespace is enabled' do
diff --git a/spec/components/email/processor_spec.rb b/spec/components/email/processor_spec.rb
index 606955551a..3fe4ab41b7 100644
--- a/spec/components/email/processor_spec.rb
+++ b/spec/components/email/processor_spec.rb
@@ -5,7 +5,7 @@ require "email/processor"
 
 describe Email::Processor do
   after do
-    Discourse.redis.flushdb
+    Discourse.redis.flushall
   end
 
   let(:from) { "foo@bar.com" }
diff --git a/spec/components/file_store/s3_store_spec.rb b/spec/components/file_store/s3_store_spec.rb
index 15c36b05be..99f57c7104 100644
--- a/spec/components/file_store/s3_store_spec.rb
+++ b/spec/components/file_store/s3_store_spec.rb
@@ -251,7 +251,7 @@ describe FileStore::S3Store do
 
       before do
         optimized_image.update!(
-          url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{image_path}"
+          url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com#{image_path}"
         )
       end
 
@@ -272,12 +272,6 @@ describe FileStore::S3Store do
           SiteSetting.s3_upload_bucket = "s3-upload-bucket/discourse-uploads"
         end
 
-        before do
-          optimized_image.update!(
-            url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/discourse-uploads/#{image_path}"
-          )
-        end
-
         it "removes the file from s3 with the right paths" do
           s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
           s3_object = stub
@@ -304,15 +298,6 @@ describe FileStore::S3Store do
 
   describe ".has_been_uploaded?" do
 
-    it "doesn't crash for invalid URLs" do
-      expect(store.has_been_uploaded?("https://site.discourse.com/#bad#6")).to eq(false)
-    end
-
-    it "doesn't crash if URL contains non-ascii characters" do
-      expect(store.has_been_uploaded?("//s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com/漢1337.png")).to eq(true)
-      expect(store.has_been_uploaded?("//s3-upload-bucket.s3.amazonaws.com/漢1337.png")).to eq(false)
-    end
-
     it "identifies S3 uploads" do
       expect(store.has_been_uploaded?("//s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com/1337.png")).to eq(true)
     end
diff --git a/spec/components/guardian/user_guardian_spec.rb b/spec/components/guardian/user_guardian_spec.rb
index 10b6afc941..b812fa9526 100644
--- a/spec/components/guardian/user_guardian_spec.rb
+++ b/spec/components/guardian/user_guardian_spec.rb
@@ -25,13 +25,13 @@ describe UserGuardian do
   end
 
   let :already_uploaded do
-    u = Upload.new(user_id: 9999, id: 2)
+    u = Upload.new(user_id: 999, id: 2)
     user_avatar.custom_upload_id = u.id
     u
   end
 
   let :not_my_upload do
-    Upload.new(user_id: 9999, id: 3)
+    Upload.new(user_id: 999, id: 3)
   end
 
   let(:moderator_upload) do
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index c5ef73c4d2..8969a526bd 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -508,7 +508,7 @@ describe PrettyText do
         ['apple', 'banana'].each { |w| Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor]) }
         expect(PrettyText.cook("# banana")).not_to include('banana')
       ensure
-        Discourse.redis.flushdb
+        Discourse.redis.flushall
       end
     end
   end
@@ -1166,7 +1166,7 @@ HTML
   end
 
   describe "censoring" do
-    after(:all) { Discourse.redis.flushdb }
+    after(:all) { Discourse.redis.flushall }
 
     def expect_cooked_match(raw, expected_cooked)
       expect(PrettyText.cook(raw)).to eq(expected_cooked)
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index 599ea3c5aa..a455d81ec1 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -444,7 +444,7 @@ describe Search do
       end
 
       let(:expected_blurb) do
-        "...quire content longer than the typical test post raw content. It really is some long content, folks. elephant"
+        "...to satisfy any test conditions that require content longer than the typical test post raw content. elephant"
       end
 
       it 'returns the post' do
diff --git a/spec/fabricators/post_fabricator.rb b/spec/fabricators/post_fabricator.rb
index 77a234d981..42235cb94f 100644
--- a/spec/fabricators/post_fabricator.rb
+++ b/spec/fabricators/post_fabricator.rb
@@ -10,7 +10,7 @@ end
 Fabricator(:post_with_long_raw_content, from: :post) do
   raw 'This is a sample post with semi-long raw content. The raw content is also more than
       two hundred characters to satisfy any test conditions that require content longer
-      than the typical test post raw content. It really is some long content, folks.'
+      than the typical test post raw content.'
 end
 
 Fabricator(:post_with_youtube, from: :post) do
diff --git a/spec/fabricators/web_hook_fabricator.rb b/spec/fabricators/web_hook_fabricator.rb
index 9edc591791..4647251080 100644
--- a/spec/fabricators/web_hook_fabricator.rb
+++ b/spec/fabricators/web_hook_fabricator.rb
@@ -71,6 +71,22 @@ Fabricator(:tag_web_hook, from: :web_hook) do
   end
 end
 
+Fabricator(:flag_web_hook, from: :web_hook) do
+  transient flag_hook: WebHookEventType.find_by(name: 'flag')
+
+  after_build do |web_hook, transients|
+    web_hook.web_hook_event_types = [transients[:flag_hook]]
+  end
+end
+
+Fabricator(:queued_post_web_hook, from: :web_hook) do
+  transient queued_post_hook: WebHookEventType.find_by(name: 'queued_post')
+
+  after_build do |web_hook, transients|
+    web_hook.web_hook_event_types = [transients[:queued_post_hook]]
+  end
+end
+
 Fabricator(:reviewable_web_hook, from: :web_hook) do
   transient reviewable_hook: WebHookEventType.find_by(name: 'reviewable')
 
diff --git a/spec/integration/email_style_spec.rb b/spec/integration/email_style_spec.rb
index 395dd19df1..ef69850891 100644
--- a/spec/integration/email_style_spec.rb
+++ b/spec/integration/email_style_spec.rb
@@ -3,139 +3,128 @@
 require "rails_helper"
 
 describe EmailStyle do
+  before do
+    SiteSetting.email_custom_template = "<body><h1>FOR YOU</h1><div>%{email_content}</div></body>"
+    SiteSetting.email_custom_css = 'h1 { color: red; } div.body { color: #FAB; }'
+    SiteSetting.email_custom_css_compiled = SiteSetting.email_custom_css
+  end
 
-  context "ERB evaluation" do
-    it "does not evaluate ERB outside of the email itself" do
-      SiteSetting.email_custom_template = "<div>%{email_content}</div><%= (111 * 333) %>"
-      html = Email::Renderer.new(UserNotifications.signup(Fabricate(:user))).html
-      expect(html).not_to match("36963")
+  after do
+    SiteSetting.remove_override!(:email_custom_template)
+    SiteSetting.remove_override!(:email_custom_css)
+  end
+
+  context 'invite' do
+    fab!(:invite) { Fabricate(:invite) }
+    let(:invite_mail) { InviteMailer.send_invite(invite) }
+
+    subject(:mail_html) { Email::Renderer.new(invite_mail).html }
+
+    it 'applies customizations' do
+      expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+      expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
+    end
+
+    it 'applies customizations if compiled is missing' do
+      SiteSetting.remove_override!(:email_custom_css_compiled)
+      expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+      expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
+    end
+
+    it 'can apply RTL attrs' do
+      SiteSetting.default_locale = 'he'
+      body_attrs = mail_html.match(/<body ([^>])+/)
+      expect(body_attrs[0]&.downcase).to match(/text-align:\s*right/)
+      expect(body_attrs[0]&.downcase).to include('dir="rtl"')
     end
   end
 
-  context "with a custom template" do
-    before do
-      SiteSetting.email_custom_template = "<body><h1>FOR YOU</h1><div>%{email_content}</div></body>"
-      SiteSetting.email_custom_css = 'h1 { color: red; } div.body { color: #FAB; }'
-      SiteSetting.email_custom_css_compiled = SiteSetting.email_custom_css
+  context 'user_replied' do
+    let(:response_by_user) { Fabricate(:user, name: "John Doe") }
+    let(:category) { Fabricate(:category, name: 'India') }
+    let(:topic) { Fabricate(:topic, category: category, title: "Super cool topic") }
+    let(:post) { Fabricate(:post, topic: topic, raw: 'This is My super duper cool topic') }
+    let(:response) { Fabricate(:basic_reply, topic: post.topic, user: response_by_user) }
+    let(:user) { Fabricate(:user) }
+    let(:notification) { Fabricate(:replied_notification, user: user, post: response) }
+
+    let(:mail) do
+      UserNotifications.user_replied(
+        user,
+        post: response,
+        notification_type: notification.notification_type,
+        notification_data_hash: notification.data_hash
+      )
     end
 
-    after do
-      SiteSetting.remove_override!(:email_custom_template)
-      SiteSetting.remove_override!(:email_custom_css)
+    subject(:mail_html) { Email::Renderer.new(mail).html }
+
+    it "customizations are applied to html part of emails" do
+      expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+      matches = mail_html.match(/<div style="([^"]+)">#{post.raw}/)
+      expect(matches[1]).to include('color: #FAB;') # custom
+      expect(matches[1]).to include('padding-top:5px;') # div.body
     end
 
-    context 'invite' do
-      fab!(:invite) { Fabricate(:invite) }
-      let(:invite_mail) { InviteMailer.send_invite(invite) }
+    # TODO: translation override
+  end
 
-      subject(:mail_html) { Email::Renderer.new(invite_mail).html }
+  context 'signup' do
+    let(:signup_mail) { UserNotifications.signup(Fabricate(:user)) }
+    subject(:mail_html) { Email::Renderer.new(signup_mail).html }
 
-      it 'applies customizations' do
-        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-        expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
-      end
-
-      it 'applies customizations if compiled is missing' do
-        SiteSetting.remove_override!(:email_custom_css_compiled)
-        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-        expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
-      end
-
-      it 'can apply RTL attrs' do
-        SiteSetting.default_locale = 'he'
-        body_attrs = mail_html.match(/<body ([^>])+/)
-        expect(body_attrs[0]&.downcase).to match(/text-align:\s*right/)
-        expect(body_attrs[0]&.downcase).to include('dir="rtl"')
-      end
+    it "customizations are applied to html part of emails" do
+      expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+      expect(mail_html).to include('activate-account')
     end
 
-    context 'user_replied' do
-      let(:response_by_user) { Fabricate(:user, name: "John Doe") }
-      let(:category) { Fabricate(:category, name: 'India') }
-      let(:topic) { Fabricate(:topic, category: category, title: "Super cool topic") }
-      let(:post) { Fabricate(:post, topic: topic, raw: 'This is My super duper cool topic') }
-      let(:response) { Fabricate(:basic_reply, topic: post.topic, user: response_by_user) }
-      let(:user) { Fabricate(:user) }
-      let(:notification) { Fabricate(:replied_notification, user: user, post: response) }
-
-      let(:mail) do
-        UserNotifications.user_replied(
-          user,
-          post: response,
-          notification_type: notification.notification_type,
-          notification_data_hash: notification.data_hash
+    context 'translation override' do
+      before do
+        TranslationOverride.upsert!(
+          'en',
+          'user_notifications.signup.text_body_template',
+          "CLICK THAT LINK: %{base_url}/u/activate-account/%{email_token}"
         )
       end
 
-      subject(:mail_html) { Email::Renderer.new(mail).html }
-
-      it "customizations are applied to html part of emails" do
-        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-        matches = mail_html.match(/<div style="([^"]+)">#{post.raw}/)
-        expect(matches[1]).to include('color: #FAB;') # custom
-        expect(matches[1]).to include('padding-top:5px;') # div.body
+      after do
+        TranslationOverride.revert!('en', ['user_notifications.signup.text_body_template'])
       end
 
-      # TODO: translation override
+      it "applies customizations when translation override exists" do
+        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+        expect(mail_html.scan('CLICK THAT LINK').count).to eq(1)
+      end
     end
 
-    context 'signup' do
-      let(:signup_mail) { UserNotifications.signup(Fabricate(:user)) }
-      subject(:mail_html) { Email::Renderer.new(signup_mail).html }
+    context 'with some bad css' do
+      before do
+        SiteSetting.email_custom_css = '@import "nope.css"; h1 {{{ size: really big; '
+        SiteSetting.email_custom_css_compiled = SiteSetting.email_custom_css
+      end
 
-      it "customizations are applied to html part of emails" do
-        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+      it "can render the html" do
+        expect(mail_html.scan(/<h1\s*(?:style=""){0,1}>FOR YOU<\/h1>/).count).to eq(1)
         expect(mail_html).to include('activate-account')
       end
-
-      context 'translation override' do
-        before do
-          TranslationOverride.upsert!(
-            'en',
-            'user_notifications.signup.text_body_template',
-            "CLICK THAT LINK: %{base_url}/u/activate-account/%{email_token}"
-          )
-        end
-
-        after do
-          TranslationOverride.revert!('en', ['user_notifications.signup.text_body_template'])
-        end
-
-        it "applies customizations when translation override exists" do
-          expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-          expect(mail_html.scan('CLICK THAT LINK').count).to eq(1)
-        end
-      end
-
-      context 'with some bad css' do
-        before do
-          SiteSetting.email_custom_css = '@import "nope.css"; h1 {{{ size: really big; '
-          SiteSetting.email_custom_css_compiled = SiteSetting.email_custom_css
-        end
-
-        it "can render the html" do
-          expect(mail_html.scan(/<h1\s*(?:style=""){0,1}>FOR YOU<\/h1>/).count).to eq(1)
-          expect(mail_html).to include('activate-account')
-        end
-      end
-    end
-
-    context 'digest' do
-      fab!(:popular_topic) { Fabricate(:topic, user: Fabricate(:coding_horror), created_at: 1.hour.ago) }
-      let(:summary_email) { UserNotifications.digest(Fabricate(:user)) }
-      subject(:mail_html) { Email::Renderer.new(summary_email).html }
-
-      it "customizations are applied to html part of emails" do
-        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-        expect(mail_html).to include(popular_topic.title)
-      end
-
-      it "doesn't apply customizations if apply_custom_styles_to_digest is disabled" do
-        SiteSetting.apply_custom_styles_to_digest = false
-        expect(mail_html).to_not include('<h1 style="color: red;">FOR YOU</h1>')
-        expect(mail_html).to_not include('FOR YOU')
-        expect(mail_html).to include(popular_topic.title)
-      end
+    end
+  end
+
+  context 'digest' do
+    fab!(:popular_topic) { Fabricate(:topic, user: Fabricate(:coding_horror), created_at: 1.hour.ago) }
+    let(:summary_email) { UserNotifications.digest(Fabricate(:user)) }
+    subject(:mail_html) { Email::Renderer.new(summary_email).html }
+
+    it "customizations are applied to html part of emails" do
+      expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+      expect(mail_html).to include(popular_topic.title)
+    end
+
+    it "doesn't apply customizations if apply_custom_styles_to_digest is disabled" do
+      SiteSetting.apply_custom_styles_to_digest = false
+      expect(mail_html).to_not include('<h1 style="color: red;">FOR YOU</h1>')
+      expect(mail_html).to_not include('FOR YOU')
+      expect(mail_html).to include(popular_topic.title)
     end
   end
 end
diff --git a/spec/integration/topic_thumbnail_spec.rb b/spec/integration/topic_thumbnail_spec.rb
index dcdbb084d5..9ba35cbe97 100644
--- a/spec/integration/topic_thumbnail_spec.rb
+++ b/spec/integration/topic_thumbnail_spec.rb
@@ -10,7 +10,7 @@ describe "Topic Thumbnails" do
 
   context 'latest' do
     def get_topic
-      Discourse.redis.del(topic.thumbnail_job_redis_key(Topic.thumbnail_sizes))
+      Discourse.redis.del(topic.thumbnail_job_redis_key([]))
       get '/latest.json'
       response.parsed_body["topic_list"]["topics"][0]
     end
@@ -84,38 +84,5 @@ describe "Topic Thumbnails" do
         expect(thumbnails.length).to eq(5)
       end
     end
-
-    context "with a plugin" do
-      before do
-        plugin = Plugin::Instance.new
-        plugin.register_topic_thumbnail_size [512, 512]
-      end
-
-      after do
-        DiscoursePluginRegistry.reset!
-      end
-
-      it "includes the theme specified resolutions" do
-        topic_json = nil
-
-        expect do
-          topic_json = get_topic
-        end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(1)
-
-        # Run the job
-        args = Jobs::GenerateTopicThumbnails.jobs.last["args"].first
-        Jobs::GenerateTopicThumbnails.new.execute(args.with_indifferent_access)
-
-        # Request again
-        expect do
-          topic_json = get_topic
-        end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(0)
-
-        thumbnails = topic_json["thumbnails"]
-
-        # Original + Optimized + 1 plugin request
-        expect(thumbnails.length).to eq(3)
-      end
-    end
   end
 end
diff --git a/spec/jobs/bookmark_reminder_notifications_spec.rb b/spec/jobs/bookmark_reminder_notifications_spec.rb
index 25379d0ba3..0bcfa0b3d2 100644
--- a/spec/jobs/bookmark_reminder_notifications_spec.rb
+++ b/spec/jobs/bookmark_reminder_notifications_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe Jobs::BookmarkReminderNotifications do
     bookmark1.update_column(:reminder_at, five_minutes_ago - 10.minutes)
     bookmark2.update_column(:reminder_at, five_minutes_ago - 5.minutes)
     bookmark3.update_column(:reminder_at, five_minutes_ago)
-    Discourse.redis.flushdb
+    Discourse.redis.flushall
   end
 
   it "sends every reminder and marks the reminder_at to nil for all bookmarks, as well as last sent date" do
diff --git a/spec/lib/bookmark_reminder_notification_handler_spec.rb b/spec/lib/bookmark_reminder_notification_handler_spec.rb
index 3d9a6d77f6..6af860f2f0 100644
--- a/spec/lib/bookmark_reminder_notification_handler_spec.rb
+++ b/spec/lib/bookmark_reminder_notification_handler_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe BookmarkReminderNotificationHandler do
   fab!(:user) { Fabricate(:user) }
 
   before do
-    Discourse.redis.flushdb
+    Discourse.redis.flushall
   end
 
   describe "#send_notification" do
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 5bc5206bce..4cc716d691 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1158,25 +1158,6 @@ describe Post do
     expect(post.custom_fields).to eq("Tommy" => "Hanks", "Vincent" => "Vega")
   end
 
-  describe "#excerpt_for_topic" do
-    it "returns a topic excerpt, defaulting to 220 chars" do
-      expected_excerpt = "This is a sample post with semi-long raw content. The raw content is also more than \ntwo hundred characters to satisfy any test conditions that require content longer \nthan the typical test post raw content. It really is&hellip;"
-      post = Fabricate(:post_with_long_raw_content)
-      post.rebake!
-      excerpt = post.excerpt_for_topic
-      expect(excerpt).to eq(expected_excerpt)
-    end
-
-    it "respects the site setting for topic excerpt" do
-      SiteSetting.topic_excerpt_maxlength = 10
-      expected_excerpt = "This is a &hellip;"
-      post = Fabricate(:post_with_long_raw_content)
-      post.rebake!
-      excerpt = post.excerpt_for_topic
-      expect(excerpt).to eq(expected_excerpt)
-    end
-  end
-
   describe "#rebake!" do
     it "will rebake a post correctly" do
       post = create_post
@@ -1195,25 +1176,6 @@ describe Post do
       expect(post.cooked).to eq(first_cooked)
       expect(result).to eq(true)
     end
-
-    it "updates the topic excerpt at the same time if it is the OP" do
-      post = create_post
-      post.topic.update(excerpt: "test")
-      DB.exec("UPDATE posts SET cooked = 'frogs' WHERE id = ?", [ post.id ])
-      post.reload
-      result = post.rebake!
-      post.topic.reload
-      expect(post.topic.excerpt).not_to eq("test")
-    end
-
-    it "does not update the topic excerpt if the post is not the OP" do
-      post = create_post
-      post2 = create_post
-      post.topic.update(excerpt: "test")
-      result = post2.rebake!
-      post.topic.reload
-      expect(post.topic.excerpt).to eq("test")
-    end
   end
 
   describe "#set_owner" do
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index c91781e6dd..ddfbe115ec 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -308,14 +308,6 @@ describe TopicEmbed do
       end
     end
 
-    context "non-http URL" do
-      let(:url) { '/test.txt' }
-
-      it "throws an error" do
-        expect { TopicEmbed.find_remote(url) }.to raise_error(URI::InvalidURIError)
-      end
-    end
-
     context "emails" do
       let(:url) { 'http://example.com/foo' }
       let(:contents) { '<p><a href="mailto:foo%40example.com">URL encoded @ symbol</a></p><p><a href="mailto:bar@example.com">normal mailto link</a></p>' }
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index d1d5d1cc91..d381579300 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -33,7 +33,7 @@ describe Topic do
 
       describe 'censored words' do
         after do
-          Discourse.redis.flushdb
+          Discourse.redis.flushall
         end
 
         describe 'when title contains censored words' do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 4d2592c788..89d5f62704 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1578,15 +1578,20 @@ describe User do
 
     describe '#number_of_rejected_posts' do
       it 'counts rejected posts' do
-        Fabricate(:reviewable_queued_post, created_by: user, status: Reviewable.statuses[:rejected])
+        post = Fabricate(:post, user: user)
+
+        Fabricate(:reviewable_queued_post, target: post, status: Reviewable.statuses[:rejected])
 
         expect(user.number_of_rejected_posts).to eq(1)
       end
 
       it 'ignore non-rejected posts' do
-        Fabricate(:reviewable_queued_post, created_by: user, status: Reviewable.statuses[:approved])
+        post = Fabricate(:post, user: user)
+
+        Fabricate(:reviewable_queued_post, target: post, status: Reviewable.statuses[:approved])
 
         expect(user.number_of_rejected_posts).to eq(0)
+
       end
     end
   end
diff --git a/spec/multisite/s3_store_spec.rb b/spec/multisite/s3_store_spec.rb
index 064c699a12..922c5f433b 100644
--- a/spec/multisite/s3_store_spec.rb
+++ b/spec/multisite/s3_store_spec.rb
@@ -217,47 +217,4 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
       end
     end
   end
-
-  describe "#has_been_uploaded?" do
-    before do
-      SiteSetting.s3_region = 'us-west-1'
-      SiteSetting.s3_upload_bucket = "s3-upload-bucket/test"
-      SiteSetting.s3_access_key_id = "s3-access-key-id"
-      SiteSetting.s3_secret_access_key = "s3-secret-access-key"
-      SiteSetting.enable_s3_uploads = true
-    end
-
-    let(:store) { FileStore::S3Store.new }
-    let(:client) { Aws::S3::Client.new(stub_responses: true) }
-    let(:resource) { Aws::S3::Resource.new(client: client) }
-    let(:s3_bucket) { resource.bucket(SiteSetting.s3_upload_bucket) }
-    let(:s3_helper) { store.s3_helper }
-
-    it "returns false for blank urls" do
-      url = ""
-      expect(store.has_been_uploaded?(url)).to eq(false)
-    end
-
-    it "returns true if the base hostname is the same for both urls" do
-      url = "https://s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
-      expect(store.has_been_uploaded?(url)).to eq(true)
-    end
-
-    it "returns false if the base hostname is the same for both urls BUT the bucket name is different in the path" do
-      bucket = "someotherbucket"
-      url = "https://s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{bucket}/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
-      expect(store.has_been_uploaded?(url)).to eq(false)
-    end
-
-    it "returns false if the hostnames do not match and the s3_cdn_url is blank" do
-      url = "https://www.someotherhostname.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
-      expect(store.has_been_uploaded?(url)).to eq(false)
-    end
-
-    it "returns true if the s3_cdn_url is present and matches the url hostname" do
-      SiteSetting.s3_cdn_url = "https://www.someotherhostname.com"
-      url = "https://www.someotherhostname.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
-      expect(store.has_been_uploaded?(url)).to eq(true)
-    end
-  end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 256de29658..a0ce4b71b7 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -128,12 +128,6 @@ module TestSetup
     # code that runs inside jobs. run_later! means they are put on the redis
     # queue and never processed.
     Jobs.run_later!
-
-    # Don't track ApplicationRequests in test mode unless opted in
-    ApplicationRequest.disable
-
-    # Don't queue badge grant in test mode
-    BadgeGranter.disable_queue
   end
 end
 
diff --git a/spec/requests/about_controller_spec.rb b/spec/requests/about_controller_spec.rb
index a10b766304..6c58284979 100644
--- a/spec/requests/about_controller_spec.rb
+++ b/spec/requests/about_controller_spec.rb
@@ -36,21 +36,5 @@ describe AboutController do
         expect(response.body).to include("<title>About - Discourse</title>")
       end
     end
-
-    it "serializes stats when 'Guardian#can_see_about_stats?' is true" do
-      Guardian.any_instance.stubs(:can_see_about_stats?).returns(true)
-      get "/about.json"
-
-      expect(response.status).to eq(200)
-      expect(response.parsed_body["about"].keys).to include("stats")
-    end
-
-    it "does not serialize stats when 'Guardian#can_see_about_stats?' is false" do
-      Guardian.any_instance.stubs(:can_see_about_stats?).returns(false)
-      get "/about.json"
-
-      expect(response.status).to eq(200)
-      expect(response.parsed_body["about"].keys).not_to include("stats")
-    end
   end
 end
diff --git a/spec/requests/admin/backups_controller_spec.rb b/spec/requests/admin/backups_controller_spec.rb
index 03b9245744..466d4a938b 100644
--- a/spec/requests/admin/backups_controller_spec.rb
+++ b/spec/requests/admin/backups_controller_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe Admin::BackupsController do
   end
 
   after do
-    Discourse.redis.flushdb
+    Discourse.redis.flushall
 
     @paths&.each { |path| File.delete(path) if File.exists?(path) }
     @paths = nil
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index 099372cad0..f62407d956 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -293,7 +293,7 @@ RSpec.describe Admin::UsersController do
     fab!(:another_user) { Fabricate(:coding_horror) }
 
     after do
-      Discourse.redis.flushdb
+      Discourse.redis.flushall
     end
 
     it "raises an error when the user doesn't have permission" do
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index bc913c58a0..d1238c1f00 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -128,7 +128,7 @@ RSpec.describe ListController do
     let(:moderator) { Fabricate(:moderator) }
     let(:admin) { Fabricate(:admin) }
     let(:tag) { Fabricate(:tag) }
-    let(:private_message) { Fabricate(:private_message_topic, user: admin) }
+    let(:private_message) { Fabricate(:private_message_topic) }
 
     before do
       SiteSetting.tagging_enabled = true
@@ -149,17 +149,6 @@ RSpec.describe ListController do
         expect(response.status).to eq(200)
       end
     end
-
-    it 'should work for tag with unicode name' do
-      unicode_tag = Fabricate(:tag, name: 'hello-🇺🇸')
-      Fabricate(:topic_tag, tag: unicode_tag, topic: private_message)
-
-      sign_in(admin)
-      get "/topics/private-messages-tags/#{admin.username}/#{UrlHelper.encode_component(unicode_tag.name)}.json"
-      expect(response.status).to eq(200)
-      expect(response.parsed_body["topic_list"]["topics"].first["id"])
-        .to eq(private_message.id)
-    end
   end
 
   describe '#private_messages_group' do
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index ff355ada96..909db8c509 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -675,17 +675,6 @@ describe PostsController do
           I18n.t("invalid_params", message: "category")
         )
       end
-
-      it 'will raise an error if specified embed_url is invalid' do
-        user = Fabricate(:admin)
-        master_key = Fabricate(:api_key).key
-
-        post "/posts.json",
-          params: { title: 'this is a test title', raw: 'this is test body', embed_url: '/test.txt' },
-          headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
-
-        expect(response.status).to eq(422)
-      end
     end
 
     describe "when logged in" do
diff --git a/spec/requests/search_controller_spec.rb b/spec/requests/search_controller_spec.rb
index dac11690d3..947bd8754a 100644
--- a/spec/requests/search_controller_spec.rb
+++ b/spec/requests/search_controller_spec.rb
@@ -26,11 +26,11 @@ describe SearchController do
     before do
       # TODO be a bit more strategic here instead of junking
       # all of redis
-      Discourse.redis.flushdb
+      Discourse.redis.flushall
     end
 
     after do
-      Discourse.redis.flushdb
+      Discourse.redis.flushall
     end
 
     context "when overloaded" do
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 9649f57f5b..726b92228f 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -2127,7 +2127,7 @@ RSpec.describe TopicsController do
     let(:topic) { post.topic }
 
     after do
-      Discourse.redis.flushdb
+      Discourse.redis.flushall
     end
 
     it 'returns first post of the topic' do
diff --git a/spec/requests/webhooks_controller_spec.rb b/spec/requests/webhooks_controller_spec.rb
index 580c0c72f0..7772e0eb18 100644
--- a/spec/requests/webhooks_controller_spec.rb
+++ b/spec/requests/webhooks_controller_spec.rb
@@ -3,7 +3,7 @@
 require "rails_helper"
 
 describe WebhooksController do
-  before { Discourse.redis.flushdb }
+  before { Discourse.redis.flushall }
 
   let(:email) { "em@il.com" }
   let(:message_id) { "12345@il.com" }
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index f6249b275b..5da26a674e 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -60,7 +60,7 @@ describe TopicViewSerializer do
       it 'should have thumbnails' do
         SiteSetting.create_thumbnails = true
 
-        Discourse.redis.del(topic.thumbnail_job_redis_key(Topic.thumbnail_sizes))
+        Discourse.redis.del(topic.thumbnail_job_redis_key([]))
         json = nil
 
         expect do
diff --git a/spec/services/word_watcher_spec.rb b/spec/services/word_watcher_spec.rb
index 5cf70b6583..0f6a2b7bb3 100644
--- a/spec/services/word_watcher_spec.rb
+++ b/spec/services/word_watcher_spec.rb
@@ -7,7 +7,7 @@ describe WordWatcher do
   let(:raw) { "Do you like liquorice?\n\nI really like them. One could even say that I am *addicted* to liquorice. Anf if\nyou can mix it up with some anise, then I'm in heaven ;)" }
 
   after do
-    Discourse.redis.flushdb
+    Discourse.redis.flushall
   end
 
   describe '.word_matcher_regexp' do
diff --git a/test/javascripts/acceptance/category-chooser-test.js b/test/javascripts/acceptance/category-chooser-test.js
index 2247c8cbee..b6772ab771 100644
--- a/test/javascripts/acceptance/category-chooser-test.js
+++ b/test/javascripts/acceptance/category-chooser-test.js
@@ -29,19 +29,3 @@ QUnit.test("prefill category when category_id is set", async assert => {
     1
   );
 });
-
-QUnit.test("filter is case insensitive", async assert => {
-  const categoryChooser = selectKit(".category-chooser");
-
-  await visit("/");
-  await click("#create-topic");
-  await categoryChooser.expand();
-  await categoryChooser.fillInFilter("bug");
-
-  assert.ok(categoryChooser.rows().length, 1);
-
-  await categoryChooser.emptyFilter();
-  await categoryChooser.fillInFilter("Bug");
-
-  assert.ok(categoryChooser.rows().length, 1);
-});
diff --git a/test/javascripts/acceptance/emoji-picker-test.js b/test/javascripts/acceptance/emoji-picker-test.js
index a3d8472b53..6a4922ed5c 100644
--- a/test/javascripts/acceptance/emoji-picker-test.js
+++ b/test/javascripts/acceptance/emoji-picker-test.js
@@ -168,6 +168,19 @@ QUnit.test(
   }
 );
 
+QUnit.test("emoji picker lazy loads emojis", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click("#topic-footer-buttons .btn.create");
+
+  await click("button.emoji.btn");
+
+  assert.equal(
+    find('.emoji-picker button[title="massage_woman"]').css("background-image"),
+    "none",
+    "it doesn't load invisible emojis"
+  );
+});
+
 QUnit.test("emoji picker persists state", async assert => {
   await visit("/t/internationalization-localization/280");
   await click("#topic-footer-buttons .btn.create");
diff --git a/test/javascripts/acceptance/preferences-test.js b/test/javascripts/acceptance/preferences-test.js
index 20afdcd167..a9db1f08e5 100644
--- a/test/javascripts/acceptance/preferences-test.js
+++ b/test/javascripts/acceptance/preferences-test.js
@@ -1,6 +1,7 @@
 import I18n from "I18n";
 import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
 import selectKit from "helpers/select-kit-helper";
+
 import User from "discourse/models/user";
 
 acceptance("User Preferences", {
diff --git a/test/javascripts/fixtures/about.js b/test/javascripts/fixtures/about.js
index 4c7de6a87a..7f9f17cbba 100644
--- a/test/javascripts/fixtures/about.js
+++ b/test/javascripts/fixtures/about.js
@@ -1,7 +1,6 @@
 export default {
   "about.json": {
     about: {
-      can_see_about_stats: true,
       stats: {
         topic_count: 27480,
         post_count: 490358,
diff --git a/test/javascripts/helpers/select-kit-helper.js b/test/javascripts/helpers/select-kit-helper.js
index f795991326..5d80b8f0b3 100644
--- a/test/javascripts/helpers/select-kit-helper.js
+++ b/test/javascripts/helpers/select-kit-helper.js
@@ -32,11 +32,6 @@ async function selectKitFillInFilter(filter, selector) {
   );
 }
 
-async function selectKitEmptyFilter(selector) {
-  checkSelectKitIsNotCollapsed(selector);
-  await fillIn(`${selector} .filter-input`, "");
-}
-
 async function selectKitSelectRowByValue(value, selector) {
   checkSelectKitIsNotCollapsed(selector);
   await click(`${selector} .select-kit-row[data-value='${value}']`);
@@ -185,10 +180,6 @@ export default function selectKit(selector) {
       await selectKitFillInFilter(filter, selector);
     },
 
-    async emptyFilter() {
-      await selectKitEmptyFilter(selector);
-    },
-
     async keyboard(value, target) {
       await keyboardHelper(value, target, selector);
     },

From d9a02d1336dd86e7fff4f14735fb0f1970555abd Mon Sep 17 00:00:00 2001
From: Michael Brown <michael.brown@discourse.org>
Date: Sat, 23 May 2020 00:56:13 -0400
Subject: [PATCH 1330/1830] Revert "Revert "Merge branch 'master' of
 https://github.com/discourse/discourse""

This reverts commit 20780a1eeed56b321daf18ee6bbfe681a51d1bf4.

* SECURITY: re-adds accidentally reverted commit:
  03d26cd6: ensure embed_url contains valid http(s) uri
* when the merge commit e62a85cf was reverted, git chose the 2660c2e2 parent to land on
  instead of the 03d26cd6 parent (which contains security fixes)
---
 Gemfile                                       |   6 +-
 Gemfile.lock                                  |  14 +-
 .../javascripts/admin/models/admin-user.js    |   6 -
 .../admin/routes/admin-web-hooks-show.js      |   3 +-
 app/assets/javascripts/application.js         |   2 +-
 app/assets/javascripts/discourse-loader.js    |   1 -
 .../app/controllers/preferences/interface.js  |  30 +--
 .../discourse/app/controllers/topic.js        |   7 +
 .../discourse/app/controllers/user.js         |   4 +-
 .../discourse/app/helpers/page-reloader.js    |  10 +
 .../app/initializers/copy-codeblocks.js       |   3 +-
 .../app/initializers/topic-footer-buttons.js  |  34 ++-
 .../discourse/app/lib/theme-selector.js       |  26 ---
 .../discourse/app/models/nav-item.js          |  23 +-
 .../discourse/app/models/topic-details.js     |  13 +-
 .../discourse/app/templates/about.hbs         |  88 ++++----
 .../app/templates/components/d-navigation.hbs |   3 +
 .../components/topic-footer-buttons.hbs       |   4 +-
 .../app/templates/preferences/interface.hbs   |   4 +-
 .../discourse/app/templates/topic.hbs         |   1 +
 .../discourse/app/widgets/header.js           |   1 +
 .../javascripts/select-kit/addon/.gitkeep     |   0
 .../components/admin-group-selector.js        |   0
 .../components/categories-admin-dropdown.js   |   0
 .../components/category-chooser.js            |   1 +
 .../components/category-drop.js               |   0
 .../category-drop/category-drop-header.js     |   0
 .../category-notifications-button.js          |   0
 .../{app => addon}/components/category-row.js |   0
 .../components/category-selector.js           |   0
 .../components/color-palettes.js              |   0
 .../color-palettes/color-palettes-row.js      |   0
 .../{app => addon}/components/combo-box.js    |   0
 .../components/combo-box/combo-box-header.js  |   0
 .../components/composer-actions.js            |   0
 .../components/create-color-row.js            |   0
 .../components/dropdown-select-box.js         |   0
 .../dropdown-select-box-header.js             |   0
 .../dropdown-select-box-row.js                |   0
 .../components/future-date-input-selector.js  |   0
 .../future-date-input-selector-header.js      |   0
 .../future-date-input-selector-row.js         |   0
 .../future-date-input-selector/mixin.js       |   0
 .../components/group-dropdown.js              |   0
 .../components/group-members-dropdown.js      |   0
 .../components/group-notifications-button.js  |   0
 .../{app => addon}/components/icon-picker.js  |   0
 .../{app => addon}/components/list-setting.js |   0
 .../components/mini-tag-chooser.js            |   0
 .../mini-tag-chooser-header.js                |   0
 .../mini-tag-chooser/selected-collection.js   |   0
 .../{app => addon}/components/multi-select.js |   0
 .../multi-select/multi-select-filter.js       |   0
 .../multi-select/multi-select-header.js       |   0
 .../multi-select/selected-category.js         |   0
 .../components/multi-select/selected-color.js |   0
 .../components/none-category-row.js           |   0
 .../components/notifications-button.js        |   3 +-
 .../notifications-button-row.js               |   0
 .../components/notifications-filter.js        |   0
 .../notifications-filter-header.js            |   0
 .../components/period-chooser.js              |   0
 .../period-chooser/period-chooser-header.js   |   0
 .../period-chooser/period-chooser-row.js      |   0
 .../components/pinned-button.js               |   0
 .../components/pinned-options.js              |   0
 .../search-advanced-category-chooser.js       |   0
 .../{app => addon}/components/select-kit.js   |   6 +-
 .../select-kit/errors-collection.js           |   0
 .../components/select-kit/select-kit-body.js  |   0
 .../select-kit/select-kit-collection.js       |   0
 .../select-kit/select-kit-create-row.js       |   0
 .../select-kit/select-kit-filter.js           |   0
 .../select-kit/select-kit-header.js           |   6 +-
 .../select-kit/select-kit-none-row.js         |   0
 .../components/select-kit/select-kit-row.js   |   0
 .../select-kit/single-select-header.js        |   0
 .../components/selected-color.js              |   0
 .../components/selected-name.js               |   0
 .../components/single-select.js               |   0
 .../components/tag-chooser-row.js             |   0
 .../{app => addon}/components/tag-chooser.js  |   0
 .../{app => addon}/components/tag-drop.js     |   0
 .../components/tag-drop/tag-drop-header.js    |   0
 .../components/tag-group-chooser.js           |   0
 .../components/tag-notifications-button.js    |   0
 .../{app => addon}/components/tag-row.js      |   0
 .../components/timezone-input.js              |   0
 .../components/toolbar-popup-menu-options.js  |   0
 .../toolbar-popup-menu-options-heading.js     |   0
 .../topic-footer-mobile-dropdown.js           |   0
 .../components/topic-notifications-button.js  |  12 +-
 .../components/topic-notifications-options.js |   0
 .../{app => addon}/components/user-chooser.js |   0
 .../components/user-chooser/user-row.js       |   0
 .../components/user-notifications-dropdown.js |   0
 .../{app => addon}/mixins/plugin-api.js       |   0
 .../select-kit/{app => addon}/mixins/tags.js  |   0
 .../select-kit/{app => addon}/mixins/utils.js |   0
 .../category-drop/category-drop-header.hbs    |   0
 .../templates/components/category-row.hbs     |   0
 .../color-palettes/color-palettes-row.hbs     |   0
 .../components/combo-box/combo-box-header.hbs |   0
 .../templates/components/create-color-row.hbs |   0
 .../dropdown-select-box-header.hbs            |   0
 .../dropdown-select-box-row.hbs               |   0
 .../future-date-input-selector-header.hbs     |   0
 .../future-date-input-selector-row.hbs        |   0
 .../mini-tag-chooser-header.hbs               |   0
 .../mini-tag-chooser/selected-collection.hbs  |   0
 .../templates/components/multi-select.hbs     |   0
 .../multi-select/multi-select-header.hbs      |   0
 .../multi-select/selected-category.hbs        |   0
 .../notifications-filter-header.hbs           |   0
 .../period-chooser/period-chooser-header.hbs  |   0
 .../period-chooser/period-chooser-row.hbs     |   0
 .../templates/components/pinned-button.hbs    |   4 +
 .../select-kit/errors-collection.hbs          |   0
 .../components/select-kit/select-kit-body.hbs |   0
 .../select-kit/select-kit-collection.hbs      |   0
 .../select-kit/select-kit-filter.hbs          |   0
 .../components/select-kit/select-kit-row.hbs  |   0
 .../select-kit/single-select-header.hbs       |   0
 .../templates/components/selected-name.hbs    |   0
 .../templates/components/single-select.hbs    |   0
 .../templates/components/tag-chooser-row.hbs  |   0
 .../components/tag-drop/tag-drop-header.hbs   |   0
 .../templates/components/tag-row.hbs          |   0
 .../toolbar-popup-menu-options-heading.hbs    |   0
 .../components/topic-notifications-button.hbs |  30 +++
 .../components/user-chooser/user-row.hbs      |   0
 .../templates/components/pinned-button.hbs    |   5 -
 .../components/topic-notifications-button.hbs |  17 --
 app/assets/javascripts/wizard-application.js  |   2 +-
 .../stylesheets/common/base/_topic-list.scss  |   1 -
 app/assets/stylesheets/common/base/alert.scss |   1 +
 .../common/base/crawler_layout.scss           |  30 +++
 .../stylesheets/common/base/topic-post.scss   |  51 ++++-
 app/assets/stylesheets/common/base/user.scss  |   3 +
 .../stylesheets/common/components/badges.scss |   1 -
 .../common/select-kit/category-row.scss       |   3 +
 .../common/select-kit/pinned-button.scss      |  21 --
 .../common/select-kit/select-kit.scss         |   5 +
 .../topic-notifications-button.scss           |  31 +--
 app/assets/stylesheets/desktop.scss           |  20 +-
 app/assets/stylesheets/desktop/alert.scss     |   3 -
 .../stylesheets/desktop/topic-post.scss       |  17 +-
 app/assets/stylesheets/mobile.scss            |  33 +--
 app/assets/stylesheets/mobile/alert.scss      |   5 +-
 app/assets/stylesheets/mobile/banner.scss     |   7 +-
 app/assets/stylesheets/mobile/discourse.scss  |   5 -
 app/assets/stylesheets/mobile/topic-post.scss |  27 +--
 app/controllers/about_controller.rb           |   2 +-
 app/controllers/list_controller.rb            |   8 +-
 app/controllers/themes_controller.rb          |  31 ---
 app/helpers/email_helper.rb                   |   8 +-
 app/models/application_request.rb             |   7 +-
 app/models/category.rb                        |  26 +--
 app/models/global_setting.rb                  |  24 ++-
 app/models/group_archived_message.rb          |   2 +-
 app/models/post.rb                            |  14 +-
 app/models/topic.rb                           |  15 +-
 app/models/topic_embed.rb                     |   2 +
 app/models/upload.rb                          |   4 -
 app/models/user.rb                            | 129 ++++++-----
 app/models/user_avatar.rb                     |  12 +-
 app/models/web_hook_event_type.rb             |   2 -
 app/serializers/about_serializer.rb           |  11 +-
 app/services/badge_granter.rb                 |   6 +-
 app/views/email/default_template.html         |   2 +
 app/views/layouts/email_template.html.erb     |   5 +-
 app/views/layouts/publish.html.erb            |   7 +-
 app/views/list/list.erb                       |   8 +-
 config/application.rb                         |   6 +-
 config/initializers/001-redis.rb              |  17 +-
 config/locales/client.en.yml                  |   9 +-
 config/locales/server.en.yml                  |   1 +
 config/routes.rb                              |   4 +-
 config/site_settings.yml                      |  11 +-
 db/fixtures/007_web_hook_event_types.rb       |  10 -
 ...te_bookmarks_from_post_action_bookmarks.rb |   1 +
 .../20200514075356_remove_flag_web_hooks.rb   |  21 ++
 ...0514075407_remove_queued_post_web_hooks.rb |  21 ++
 ...0200520001619_remove_fks_from_bookmarks.rb |   9 +
 ...522004855_remove_access_control_post_fk.rb |   7 +
 lib/backup_restore/backup_file_handler.rb     |   7 +-
 lib/discourse_plugin_registry.rb              |   2 +
 lib/discourse_redis.rb                        |   6 -
 lib/file_store/s3_store.rb                    |  27 ++-
 lib/freedom_patches/translate_accelerator.rb  |   2 +-
 lib/guardian.rb                               |   4 +
 lib/plugin/instance.rb                        |  10 +
 lib/plugin_initialization_guard.rb            |  53 +++--
 lib/post_creator.rb                           |   4 +
 lib/post_revisor.rb                           |   6 +-
 lib/tasks/bookmarks.rake                      |   1 +
 lib/topic_query_params.rb                     |   2 +-
 .../db/fixtures/001_discobot.rb               |  25 +--
 ...avatar_download_attempt_on_user_avatars.rb |  15 ++
 plugins/discourse-narrative-bot/plugin.rb     |   6 +
 .../track_selector_spec.rb                    |   2 +-
 .../send_advanced_tutorial_message_spec.rb    |   2 +
 .../default_current_user_provider_spec.rb     |   2 +-
 spec/components/discourse_redis_spec.rb       |   4 +-
 spec/components/email/processor_spec.rb       |   2 +-
 spec/components/file_store/s3_store_spec.rb   |  17 +-
 .../components/guardian/user_guardian_spec.rb |   4 +-
 spec/components/pretty_text_spec.rb           |   4 +-
 spec/components/search_spec.rb                |   2 +-
 spec/fabricators/post_fabricator.rb           |   2 +-
 spec/fabricators/web_hook_fabricator.rb       |  16 --
 spec/integration/email_style_spec.rb          | 203 +++++++++---------
 spec/integration/topic_thumbnail_spec.rb      |  35 ++-
 .../bookmark_reminder_notifications_spec.rb   |   2 +-
 ...mark_reminder_notification_handler_spec.rb |   2 +-
 spec/models/post_spec.rb                      |  38 ++++
 spec/models/topic_embed_spec.rb               |   8 +
 spec/models/topic_spec.rb                     |   2 +-
 spec/models/user_spec.rb                      |   9 +-
 spec/multisite/s3_store_spec.rb               |  43 ++++
 spec/rails_helper.rb                          |   6 +
 spec/requests/about_controller_spec.rb        |  16 ++
 .../requests/admin/backups_controller_spec.rb |   2 +-
 spec/requests/admin/users_controller_spec.rb  |   2 +-
 spec/requests/list_controller_spec.rb         |  13 +-
 spec/requests/posts_controller_spec.rb        |  11 +
 spec/requests/search_controller_spec.rb       |   4 +-
 spec/requests/topics_controller_spec.rb       |   2 +-
 spec/requests/webhooks_controller_spec.rb     |   2 +-
 .../serializers/topic_view_serializer_spec.rb |   2 +-
 spec/services/word_watcher_spec.rb            |   2 +-
 .../acceptance/category-chooser-test.js       |  16 ++
 .../acceptance/emoji-picker-test.js           |  13 --
 .../acceptance/preferences-test.js            |   1 -
 test/javascripts/fixtures/about.js            |   1 +
 test/javascripts/helpers/select-kit-helper.js |   9 +
 236 files changed, 1031 insertions(+), 715 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/helpers/page-reloader.js
 create mode 100644 app/assets/javascripts/select-kit/addon/.gitkeep
 rename app/assets/javascripts/select-kit/{app => addon}/components/admin-group-selector.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/categories-admin-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/category-chooser.js (99%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/category-drop.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/category-drop/category-drop-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/category-notifications-button.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/category-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/category-selector.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/color-palettes.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/color-palettes/color-palettes-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/combo-box.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/combo-box/combo-box-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/composer-actions.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/create-color-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/dropdown-select-box.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/dropdown-select-box/dropdown-select-box-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/dropdown-select-box/dropdown-select-box-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/future-date-input-selector.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/future-date-input-selector/future-date-input-selector-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/future-date-input-selector/future-date-input-selector-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/future-date-input-selector/mixin.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/group-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/group-members-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/group-notifications-button.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/icon-picker.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/list-setting.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/mini-tag-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/mini-tag-chooser/mini-tag-chooser-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/mini-tag-chooser/selected-collection.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/multi-select.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/multi-select/multi-select-filter.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/multi-select/multi-select-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/multi-select/selected-category.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/multi-select/selected-color.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/none-category-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/notifications-button.js (96%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/notifications-button/notifications-button-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/notifications-filter.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/notifications-filter/notifications-filter-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/period-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/period-chooser/period-chooser-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/period-chooser/period-chooser-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/pinned-button.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/pinned-options.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/search-advanced-category-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit.js (99%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/errors-collection.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/select-kit-body.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/select-kit-collection.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/select-kit-create-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/select-kit-filter.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/select-kit-header.js (97%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/select-kit-none-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/select-kit-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/select-kit/single-select-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/selected-color.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/selected-name.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/single-select.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/tag-chooser-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/tag-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/tag-drop.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/tag-drop/tag-drop-header.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/tag-group-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/tag-notifications-button.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/tag-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/timezone-input.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/toolbar-popup-menu-options.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/topic-footer-mobile-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/topic-notifications-button.js (55%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/topic-notifications-options.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/user-chooser.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/user-chooser/user-row.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/components/user-notifications-dropdown.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/mixins/plugin-api.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/mixins/tags.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/mixins/utils.js (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/category-drop/category-drop-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/category-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/color-palettes/color-palettes-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/combo-box/combo-box-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/create-color-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/dropdown-select-box/dropdown-select-box-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/dropdown-select-box/dropdown-select-box-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/future-date-input-selector/future-date-input-selector-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/future-date-input-selector/future-date-input-selector-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/mini-tag-chooser/selected-collection.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/multi-select.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/multi-select/multi-select-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/multi-select/selected-category.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/notifications-filter/notifications-filter-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/period-chooser/period-chooser-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/period-chooser/period-chooser-row.hbs (100%)
 create mode 100644 app/assets/javascripts/select-kit/addon/templates/components/pinned-button.hbs
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/select-kit/errors-collection.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/select-kit/select-kit-body.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/select-kit/select-kit-collection.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/select-kit/select-kit-filter.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/select-kit/select-kit-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/select-kit/single-select-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/selected-name.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/single-select.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/tag-chooser-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/tag-drop/tag-drop-header.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/tag-row.hbs (100%)
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs (100%)
 create mode 100644 app/assets/javascripts/select-kit/addon/templates/components/topic-notifications-button.hbs
 rename app/assets/javascripts/select-kit/{app => addon}/templates/components/user-chooser/user-row.hbs (100%)
 delete mode 100644 app/assets/javascripts/select-kit/app/templates/components/pinned-button.hbs
 delete mode 100644 app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
 delete mode 100644 app/assets/stylesheets/desktop/alert.scss
 delete mode 100644 app/controllers/themes_controller.rb
 create mode 100644 db/migrate/20200514075356_remove_flag_web_hooks.rb
 create mode 100644 db/migrate/20200514075407_remove_queued_post_web_hooks.rb
 create mode 100644 db/post_migrate/20200520001619_remove_fks_from_bookmarks.rb
 create mode 100644 db/post_migrate/20200522004855_remove_access_control_post_fk.rb
 create mode 100644 plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb

diff --git a/Gemfile b/Gemfile
index 6c72e48bab..a80f23dbc0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -127,10 +127,6 @@ gem 'mini_racer'
 # TODO: determine why highline is being held back and upgrade to latest
 gem 'highline', '~> 1.7.0', require: false
 
-# TODO: Upgrading breaks Sidekiq Web
-# This is a bit of a hornets nest cause in an ideal world we much prefer
-# if Sidekiq reused session and CSRF mitigation with Discourse on the
-# _forum_session cookie instead of a rack.session cookie
 gem 'rack', '2.2.2'
 
 gem 'rack-protection' # security
@@ -252,3 +248,5 @@ end
 gem 'webpush', require: false
 gem 'colored2', require: false
 gem 'maxminddb'
+
+gem 'rails_failover', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 752d48c3c9..db4b88d863 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -195,7 +195,7 @@ GEM
     mini_sql (0.2.5)
     mini_suffix (0.3.0)
       ffi (~> 1.9)
-    minitest (5.14.0)
+    minitest (5.14.1)
     mocha (1.11.2)
     mock_redis (0.23.0)
     msgpack (1.3.3)
@@ -262,7 +262,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.5)
-    puma (4.3.3)
+    puma (4.3.5)
       nio4r (~> 2.0)
     r2 (0.2.7)
     rack (2.2.2)
@@ -277,6 +277,8 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
+    rails_failover (0.2.0)
+      redis (~> 4)
     rails_multisite (2.1.2)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
@@ -294,7 +296,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbtrace (0.4.12)
+    rbtrace (0.4.13)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
@@ -341,13 +343,16 @@ GEM
       json-schema (~> 2.2)
       railties (>= 3.1, < 7.0)
     rtlit (0.0.5)
-    rubocop (0.83.0)
+    rubocop (0.84.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
     rubocop-discourse (2.1.2)
       rubocop (>= 0.69.0)
       rubocop-rspec (>= 1.39.0)
@@ -509,6 +514,7 @@ DEPENDENCIES
   rack (= 2.2.2)
   rack-mini-profiler
   rack-protection
+  rails_failover
   rails_multisite
   railties (= 6.0.3)
   rake
diff --git a/app/assets/javascripts/admin/models/admin-user.js b/app/assets/javascripts/admin/models/admin-user.js
index 71b8078f6e..9977fa8dd4 100644
--- a/app/assets/javascripts/admin/models/admin-user.js
+++ b/app/assets/javascripts/admin/models/admin-user.js
@@ -77,12 +77,6 @@ const AdminUser = User.extend({
     });
   },
 
-  revokeApiKey() {
-    return ajax(`/admin/users/${this.id}/revoke_api_key`, {
-      type: "DELETE"
-    }).then(() => this.set("api_key", null));
-  },
-
   deleteAllPosts() {
     let deletedPosts = 0;
     const user = this;
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js
index 34aed775cc..f0860e79f7 100644
--- a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js
@@ -1,5 +1,4 @@
 import { get } from "@ember/object";
-import { isEmpty } from "@ember/utils";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
@@ -15,7 +14,7 @@ export default DiscourseRoute.extend({
   },
 
   setupController(controller, model) {
-    if (model.get("isNew") || isEmpty(model.get("web_hook_event_types"))) {
+    if (model.get("isNew")) {
       model.set("web_hook_event_types", controller.get("defaultEventTypes"));
     }
 
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 4445fd7986..40f1d275bb 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,6 +1,6 @@
 //= require_tree ./discourse-common/addon
 //= require ./polyfills
-//= require_tree ./select-kit/app
+//= require_tree ./select-kit/addon
 //= require ./discourse/app/app
 //= require ./app-boot
 
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index d11217a985..fc829ae12f 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -36,7 +36,6 @@ var define, requirejs;
         default: Ember.Object,
         get: Ember.get,
         getProperties: Ember.getProperties,
-        guidFor: Ember.guidFor,
         set: Ember.set,
         setProperties: Ember.setProperties,
         computed: Ember.computed,
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
index 1ad85b7d7b..2fcc5781c3 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
@@ -2,13 +2,10 @@ import I18n from "I18n";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { setDefaultHomepage } from "discourse/lib/utilities";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import {
-  listThemes,
-  previewTheme,
-  setLocalTheme
-} from "discourse/lib/theme-selector";
+import discourseComputed from "discourse-common/utils/decorators";
+import { listThemes, setLocalTheme } from "discourse/lib/theme-selector";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import pageReloader from "discourse/helpers/page-reloader";
 import {
   safariHacksDisabled,
   isiPad,
@@ -28,6 +25,9 @@ const TEXT_SIZES = ["smaller", "normal", "larger", "largest"];
 const TITLE_COUNT_MODES = ["notifications", "contextual"];
 
 export default Controller.extend({
+  currentThemeId: -1,
+  preferencesController: inject("preferences"),
+
   @discourseComputed("makeThemeDefault")
   saveAttrNames(makeDefault) {
     let attrs = [
@@ -51,8 +51,6 @@ export default Controller.extend({
     return attrs;
   },
 
-  preferencesController: inject("preferences"),
-
   @discourseComputed()
   isiPad() {
     // TODO: remove this preference checkbox when iOS adoption > 90%
@@ -105,10 +103,14 @@ export default Controller.extend({
     return themes && themes.length > 1;
   },
 
-  @observes("themeId")
-  themeIdChanged() {
-    const id = this.themeId;
-    previewTheme([id]);
+  @discourseComputed("themeId")
+  themeIdChanged(themeId) {
+    if (this.currentThemeId === -1) {
+      this.set("currentThemeId", themeId);
+      return false;
+    } else {
+      return this.currentThemeId !== themeId;
+    }
   },
 
   @discourseComputed("model.user_option.theme_ids", "themeId")
@@ -189,6 +191,10 @@ export default Controller.extend({
               this.disableSafariHacks.toString()
             );
           }
+
+          if (this.themeId !== this.currentThemeId) {
+            pageReloader.reload();
+          }
         })
         .catch(popupAjaxError);
     },
diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index 2c2ebdc7fe..ba7caf554d 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -185,6 +185,13 @@ export default Controller.extend(bufferedProperty("model"), {
     );
   },
 
+  @discourseComputed("model.category")
+  minimumRequiredTags(category) {
+    return category && category.minimum_required_tags > 0
+      ? category.minimum_required_tags
+      : null;
+  },
+
   _forceRefreshPostStream() {
     this.appEvents.trigger("post-stream:refresh", { force: true });
   },
diff --git a/app/assets/javascripts/discourse/app/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js
index cc2db042fb..b466f084ed 100644
--- a/app/assets/javascripts/discourse/app/controllers/user.js
+++ b/app/assets/javascripts/discourse/app/controllers/user.js
@@ -51,13 +51,15 @@ export default Controller.extend(CanCheckEmails, {
   hasDeletedPosts: gt("model.number_of_deleted_posts", 0),
   hasBeenSuspended: gt("model.number_of_suspensions", 0),
   hasReceivedWarnings: gt("model.warnings_received_count", 0),
+  hasRejectedPosts: gt("model.number_of_rejected_posts", 0),
 
   showStaffCounters: or(
     "hasGivenFlags",
     "hasFlaggedPosts",
     "hasDeletedPosts",
     "hasBeenSuspended",
-    "hasReceivedWarnings"
+    "hasReceivedWarnings",
+    "hasRejectedPosts"
   ),
 
   showFeaturedTopic: and(
diff --git a/app/assets/javascripts/discourse/app/helpers/page-reloader.js b/app/assets/javascripts/discourse/app/helpers/page-reloader.js
new file mode 100644
index 0000000000..6429be3a3c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/helpers/page-reloader.js
@@ -0,0 +1,10 @@
+import EmberObject from "@ember/object";
+import Ember from "ember";
+
+export default EmberObject.create({
+  reload: function() {
+    if (!Ember.testing) {
+      location.reload();
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js b/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
index a0b0d50962..f6fcef5e17 100644
--- a/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
+++ b/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
@@ -3,6 +3,7 @@ import { cancel, later } from "@ember/runloop";
 import { Promise } from "rsvp";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import I18n from "I18n";
+import { guidFor } from "@ember/object/internals";
 
 // http://github.com/feross/clipboard-copy
 function clipboardCopy(text) {
@@ -90,7 +91,7 @@ export default {
             const state = button.innerHTML;
             button.innerHTML = I18n.t("copy_codeblock.copied");
 
-            const commandId = Ember.guidFor(button);
+            const commandId = guidFor(button);
 
             if (_fadeCopyCodeblocksRunners[commandId]) {
               cancel(_fadeCopyCodeblocksRunners[commandId]);
diff --git a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
index a13ccd2219..a2de76d3e9 100644
--- a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
+++ b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
@@ -3,6 +3,13 @@ import showModal from "discourse/lib/show-modal";
 import { registerTopicFooterButton } from "discourse/lib/register-topic-footer-button";
 import { formattedReminderTime } from "discourse/lib/bookmark";
 
+const SHARE_PRIORITY = 1000;
+const BOOKMARK_PRIORITY = 900;
+const ARCHIVE_PRIORITY = 800;
+const FLAG_PRIORITY = 700;
+const EDIT_MESSAGE_PRIORITY = 600;
+const DEFER_PRIORITY = 500;
+
 export default {
   name: "topic-footer-buttons",
 
@@ -11,8 +18,12 @@ export default {
     registerTopicFooterButton({
       id: "share-and-invite",
       icon: "link",
-      priority: 999,
-      label: "topic.share.title",
+      priority: SHARE_PRIORITY,
+      label() {
+        if (!this.get("topic.isPrivateMessage") || this.site.mobileView) {
+          return "topic.share.title";
+        }
+      },
       title: "topic.share.help",
       action() {
         const panels = [
@@ -67,7 +78,7 @@ export default {
     registerTopicFooterButton({
       id: "flag",
       icon: "flag",
-      priority: 998,
+      priority: FLAG_PRIORITY,
       label: "topic.flag_topic.title",
       title: "topic.flag_topic.help",
       action: "showFlagTopic",
@@ -93,14 +104,16 @@ export default {
         }
         return "bookmark";
       },
-      priority: 1000,
+      priority: BOOKMARK_PRIORITY,
       classNames() {
         const bookmarked = this.get("topic.bookmarked");
         return bookmarked ? ["bookmark", "bookmarked"] : ["bookmark"];
       },
       label() {
-        const bookmarked = this.get("topic.bookmarked");
-        return bookmarked ? "bookmarked.clear_bookmarks" : "bookmarked.title";
+        if (!this.get("topic.isPrivateMessage") || this.site.mobileView) {
+          const bookmarked = this.get("topic.bookmarked");
+          return bookmarked ? "bookmarked.clear_bookmarks" : "bookmarked.title";
+        }
       },
       translatedTitle() {
         const bookmarked = this.get("topic.bookmarked");
@@ -126,7 +139,7 @@ export default {
 
     registerTopicFooterButton({
       id: "archive",
-      priority: 996,
+      priority: ARCHIVE_PRIORITY,
       icon() {
         return this.archiveIcon;
       },
@@ -155,13 +168,16 @@ export default {
 
     registerTopicFooterButton({
       id: "edit-message",
-      priority: 750,
+      priority: EDIT_MESSAGE_PRIORITY,
       icon: "pencil-alt",
       label: "topic.edit_message.title",
       title: "topic.edit_message.help",
       action: "editFirstPost",
       classNames: ["edit-message"],
       dependentKeys: ["editFirstPost", "showEditOnFooter"],
+      dropdown() {
+        return this.site.mobileView && this.get("topic.isPrivateMessage");
+      },
       displayed() {
         return this.showEditOnFooter;
       }
@@ -170,7 +186,7 @@ export default {
     registerTopicFooterButton({
       id: "defer",
       icon: "circle",
-      priority: 300,
+      priority: DEFER_PRIORITY,
       label: "topic.defer.title",
       title: "topic.defer.help",
       action: "deferTopic",
diff --git a/app/assets/javascripts/discourse/app/lib/theme-selector.js b/app/assets/javascripts/discourse/app/lib/theme-selector.js
index 9d293fe312..48f63c31fb 100644
--- a/app/assets/javascripts/discourse/app/lib/theme-selector.js
+++ b/app/assets/javascripts/discourse/app/lib/theme-selector.js
@@ -1,5 +1,4 @@
 import I18n from "I18n";
-import { ajax } from "discourse/lib/ajax";
 import deprecated from "discourse-common/lib/deprecated";
 
 const keySelector = "meta[name=discourse_theme_ids]";
@@ -79,31 +78,6 @@ export function refreshCSS(node, hash, newHref) {
   $orig.data("copy", reloaded);
 }
 
-export function previewTheme(ids = []) {
-  ids = ids.reject(id => !id);
-  if (!ids.includes(currentThemeId())) {
-    Discourse.set("assetVersion", "forceRefresh");
-
-    ajax(`/themes/assets/${ids.length > 0 ? ids.join("-") : "default"}`).then(
-      results => {
-        const elem = _.first($(keySelector));
-        if (elem) {
-          elem.content = ids.join(",");
-        }
-
-        results.themes.forEach(theme => {
-          const node = $(
-            `link[rel=stylesheet][data-target=${theme.target}]`
-          )[0];
-          if (node) {
-            refreshCSS(node, null, theme.new_href);
-          }
-        });
-      }
-    );
-  }
-}
-
 export function listThemes(site) {
   let themes = site.get("user_themes");
 
diff --git a/app/assets/javascripts/discourse/app/models/nav-item.js b/app/assets/javascripts/discourse/app/models/nav-item.js
index 412cd8ec2e..955e536e1e 100644
--- a/app/assets/javascripts/discourse/app/models/nav-item.js
+++ b/app/assets/javascripts/discourse/app/models/nav-item.js
@@ -273,12 +273,17 @@ export function addNavItem(item) {
   NavItem.extraNavItemDescriptors.push(item);
 }
 
-Object.defineProperty(Discourse, "NavItem", {
-  get() {
-    deprecated("Import the NavItem class instead of using Discourse.NavItem", {
-      since: "2.4.0",
-      dropFrom: "2.5.0"
-    });
-    return NavItem;
-  }
-});
+if (typeof Discourse !== "undefined") {
+  Object.defineProperty(Discourse, "NavItem", {
+    get() {
+      deprecated(
+        "Import the NavItem class instead of using Discourse.NavItem",
+        {
+          since: "2.4.0",
+          dropFrom: "2.5.0"
+        }
+      );
+      return NavItem;
+    }
+  });
+}
diff --git a/app/assets/javascripts/discourse/app/models/topic-details.js b/app/assets/javascripts/discourse/app/models/topic-details.js
index 50449aa0e3..d8d5ea0036 100644
--- a/app/assets/javascripts/discourse/app/models/topic-details.js
+++ b/app/assets/javascripts/discourse/app/models/topic-details.js
@@ -61,12 +61,15 @@ const TopicDetails = RestModel.extend({
     }
   },
 
-  updateNotifications(v) {
-    this.set("notification_level", v);
-    this.set("notifications_reason_id", null);
-    return ajax("/t/" + this.get("topic.id") + "/notifications", {
+  updateNotifications(level) {
+    return ajax(`/t/${this.get("topic.id")}/notifications`, {
       type: "POST",
-      data: { notification_level: v }
+      data: { notification_level: level }
+    }).then(() => {
+      this.setProperties({
+        notification_level: level,
+        notifications_reason_id: null
+      });
     });
   },
 
diff --git a/app/assets/javascripts/discourse/app/templates/about.hbs b/app/assets/javascripts/discourse/app/templates/about.hbs
index 63cae2c260..2659b0ebac 100644
--- a/app/assets/javascripts/discourse/app/templates/about.hbs
+++ b/app/assets/javascripts/discourse/app/templates/about.hbs
@@ -64,50 +64,52 @@
           </section>
         {{/each}}
       {{/if}}
-      <section class="about stats">
-        <h3>{{d-icon "far-chart-bar"}}  {{i18n "about.stats"}}</h3>
+      {{#if model.can_see_about_stats}}
+        <section class="about stats">
+          <h3>{{d-icon "far-chart-bar"}}  {{i18n "about.stats"}}</h3>
 
-        <table class="table">
-          <tbody>
-            <tr>
-              <th>&nbsp;</th>
-              <th>{{i18n "about.stat.last_7_days"}}</th>
-              <th>{{i18n "about.stat.last_30_days"}}</th>
-              <th>{{i18n "about.stat.all_time"}}</th>
-            </tr>
-            <tr>
-              <td class="title">{{i18n "about.topic_count"}}</td>
-              <td>{{number model.stats.topics_7_days}}</td>
-              <td>{{number model.stats.topics_30_days}}</td>
-              <td>{{number model.stats.topic_count}}</td>
-            </tr>
-            <tr>
-              <td>{{i18n "about.post_count"}}</td>
-              <td>{{number model.stats.posts_7_days}}</td>
-              <td>{{number model.stats.posts_30_days}}</td>
-              <td>{{number model.stats.post_count}}</td>
-            </tr>
-            <tr>
-              <td>{{i18n "about.user_count"}}</td>
-              <td>{{number model.stats.users_7_days}}</td>
-              <td>{{number model.stats.users_30_days}}</td>
-              <td>{{number model.stats.user_count}}</td>
-            </tr>
-            <tr>
-              <td>{{i18n "about.active_user_count"}}</td>
-              <td>{{number model.stats.active_users_7_days}}</td>
-              <td>{{number model.stats.active_users_30_days}}</td>
-              <td>&mdash;</td>
-            </tr>
-            <tr>
-              <td>{{i18n "about.like_count"}}</td>
-              <td>{{number model.stats.likes_7_days}}</td>
-              <td>{{number model.stats.likes_30_days}}</td>
-              <td>{{number model.stats.like_count}}</td>
-            </tr>
-          </tbody>
-        </table>
-      </section>
+          <table class="table">
+            <tbody>
+              <tr>
+                <th>&nbsp;</th>
+                <th>{{i18n "about.stat.last_7_days"}}</th>
+                <th>{{i18n "about.stat.last_30_days"}}</th>
+                <th>{{i18n "about.stat.all_time"}}</th>
+              </tr>
+              <tr>
+                <td class="title">{{i18n "about.topic_count"}}</td>
+                <td>{{number model.stats.topics_7_days}}</td>
+                <td>{{number model.stats.topics_30_days}}</td>
+                <td>{{number model.stats.topic_count}}</td>
+              </tr>
+              <tr>
+                <td>{{i18n "about.post_count"}}</td>
+                <td>{{number model.stats.posts_7_days}}</td>
+                <td>{{number model.stats.posts_30_days}}</td>
+                <td>{{number model.stats.post_count}}</td>
+              </tr>
+              <tr>
+                <td>{{i18n "about.user_count"}}</td>
+                <td>{{number model.stats.users_7_days}}</td>
+                <td>{{number model.stats.users_30_days}}</td>
+                <td>{{number model.stats.user_count}}</td>
+              </tr>
+              <tr>
+                <td>{{i18n "about.active_user_count"}}</td>
+                <td>{{number model.stats.active_users_7_days}}</td>
+                <td>{{number model.stats.active_users_30_days}}</td>
+                <td>&mdash;</td>
+              </tr>
+              <tr>
+                <td>{{i18n "about.like_count"}}</td>
+                <td>{{number model.stats.likes_7_days}}</td>
+                <td>{{number model.stats.likes_30_days}}</td>
+                <td>{{number model.stats.like_count}}</td>
+              </tr>
+            </tbody>
+          </table>
+        </section>
+      {{/if}}
 
       {{#if contactInfo}}
         <section class="about contact">
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
index e9e0b9a34f..2ac52d5f71 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
@@ -3,6 +3,9 @@
 {{#if showCategoryAdmin}}
   {{categories-admin-dropdown
     onChange=(action "selectCategoryAdminDropdownAction")
+    options=(hash
+      triggerOnChangeOnTab=false
+    )
   }}
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
index 007ec9c19d..aa5b44a716 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
@@ -50,10 +50,10 @@
                   args=(hash topic=topic)
                   tagName=""
                   connectorTagName="span"}}
-
-  {{pinned-button pinned=topic.pinned topic=topic}}
 </div>
 
+{{pinned-button pinned=topic.pinned topic=topic}}
+
 {{#if showNotificationsButton}}
   {{topic-notifications-button
     notificationLevel=topic.details.notification_level
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
index 45607c8cb7..4f1f13c614 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
@@ -5,9 +5,11 @@
       {{combo-box
         content=userSelectableThemes
         value=themeId
-        onChange=(action (mut themeId))
       }}
     </div>
+    {{#if themeIdChanged}}
+      <p class="alert alert-success save-theme-alert">{{i18n "user.save_to_change_theme" save_text=(i18n "save") }}</p>
+    {{/if}}
     {{#if showThemeSetDefault}}
       <div class="controls">
         {{preference-checkbox labelKey="user.theme_default_on_all_devices" checked=makeThemeDefault}}
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index 488970c10e..d5e22f5437 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -36,6 +36,7 @@
                 options=(hash
                   filterable=true
                   categoryId=buffered.category_id
+                  minimum=minimumRequiredTags
                 )
               }}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index ca4d73c925..8e27a15a03 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -125,6 +125,7 @@ createWidget(
           {
             attributes: {
               href: attrs.user.get("path"),
+              title: attrs.user.get("name"),
               "data-auto-route": true
             }
           },
diff --git a/app/assets/javascripts/select-kit/addon/.gitkeep b/app/assets/javascripts/select-kit/addon/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/select-kit/app/components/admin-group-selector.js b/app/assets/javascripts/select-kit/addon/components/admin-group-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/admin-group-selector.js
rename to app/assets/javascripts/select-kit/addon/components/admin-group-selector.js
diff --git a/app/assets/javascripts/select-kit/app/components/categories-admin-dropdown.js b/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/categories-admin-dropdown.js
rename to app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
diff --git a/app/assets/javascripts/select-kit/app/components/category-chooser.js b/app/assets/javascripts/select-kit/addon/components/category-chooser.js
similarity index 99%
rename from app/assets/javascripts/select-kit/app/components/category-chooser.js
rename to app/assets/javascripts/select-kit/addon/components/category-chooser.js
index f36e8be2d3..72d0167ac0 100644
--- a/app/assets/javascripts/select-kit/app/components/category-chooser.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-chooser.js
@@ -67,6 +67,7 @@ export default ComboBoxComponent.extend({
 
   search(filter) {
     if (filter) {
+      filter = filter.toLowerCase();
       return this.content.filter(item => {
         const category = Category.findById(this.getValue(item));
         const categoryName = this.getName(item);
diff --git a/app/assets/javascripts/select-kit/app/components/category-drop.js b/app/assets/javascripts/select-kit/addon/components/category-drop.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/category-drop.js
rename to app/assets/javascripts/select-kit/addon/components/category-drop.js
diff --git a/app/assets/javascripts/select-kit/app/components/category-drop/category-drop-header.js b/app/assets/javascripts/select-kit/addon/components/category-drop/category-drop-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/category-drop/category-drop-header.js
rename to app/assets/javascripts/select-kit/addon/components/category-drop/category-drop-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/category-notifications-button.js b/app/assets/javascripts/select-kit/addon/components/category-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/category-notifications-button.js
rename to app/assets/javascripts/select-kit/addon/components/category-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/app/components/category-row.js b/app/assets/javascripts/select-kit/addon/components/category-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/category-row.js
rename to app/assets/javascripts/select-kit/addon/components/category-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/category-selector.js b/app/assets/javascripts/select-kit/addon/components/category-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/category-selector.js
rename to app/assets/javascripts/select-kit/addon/components/category-selector.js
diff --git a/app/assets/javascripts/select-kit/app/components/color-palettes.js b/app/assets/javascripts/select-kit/addon/components/color-palettes.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/color-palettes.js
rename to app/assets/javascripts/select-kit/addon/components/color-palettes.js
diff --git a/app/assets/javascripts/select-kit/app/components/color-palettes/color-palettes-row.js b/app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/color-palettes/color-palettes-row.js
rename to app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/combo-box.js b/app/assets/javascripts/select-kit/addon/components/combo-box.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/combo-box.js
rename to app/assets/javascripts/select-kit/addon/components/combo-box.js
diff --git a/app/assets/javascripts/select-kit/app/components/combo-box/combo-box-header.js b/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/combo-box/combo-box-header.js
rename to app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/composer-actions.js b/app/assets/javascripts/select-kit/addon/components/composer-actions.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/composer-actions.js
rename to app/assets/javascripts/select-kit/addon/components/composer-actions.js
diff --git a/app/assets/javascripts/select-kit/app/components/create-color-row.js b/app/assets/javascripts/select-kit/addon/components/create-color-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/create-color-row.js
rename to app/assets/javascripts/select-kit/addon/components/create-color-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/dropdown-select-box.js b/app/assets/javascripts/select-kit/addon/components/dropdown-select-box.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/dropdown-select-box.js
rename to app/assets/javascripts/select-kit/addon/components/dropdown-select-box.js
diff --git a/app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-header.js b/app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-header.js
rename to app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-row.js b/app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/dropdown-select-box/dropdown-select-box-row.js
rename to app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/future-date-input-selector.js b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/future-date-input-selector.js
rename to app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js
diff --git a/app/assets/javascripts/select-kit/app/components/future-date-input-selector/future-date-input-selector-header.js b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/future-date-input-selector/future-date-input-selector-header.js
rename to app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/future-date-input-selector/future-date-input-selector-row.js b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/future-date-input-selector/future-date-input-selector-row.js
rename to app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/future-date-input-selector/mixin.js b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/mixin.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/future-date-input-selector/mixin.js
rename to app/assets/javascripts/select-kit/addon/components/future-date-input-selector/mixin.js
diff --git a/app/assets/javascripts/select-kit/app/components/group-dropdown.js b/app/assets/javascripts/select-kit/addon/components/group-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/group-dropdown.js
rename to app/assets/javascripts/select-kit/addon/components/group-dropdown.js
diff --git a/app/assets/javascripts/select-kit/app/components/group-members-dropdown.js b/app/assets/javascripts/select-kit/addon/components/group-members-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/group-members-dropdown.js
rename to app/assets/javascripts/select-kit/addon/components/group-members-dropdown.js
diff --git a/app/assets/javascripts/select-kit/app/components/group-notifications-button.js b/app/assets/javascripts/select-kit/addon/components/group-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/group-notifications-button.js
rename to app/assets/javascripts/select-kit/addon/components/group-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/app/components/icon-picker.js b/app/assets/javascripts/select-kit/addon/components/icon-picker.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/icon-picker.js
rename to app/assets/javascripts/select-kit/addon/components/icon-picker.js
diff --git a/app/assets/javascripts/select-kit/app/components/list-setting.js b/app/assets/javascripts/select-kit/addon/components/list-setting.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/list-setting.js
rename to app/assets/javascripts/select-kit/addon/components/list-setting.js
diff --git a/app/assets/javascripts/select-kit/app/components/mini-tag-chooser.js b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/mini-tag-chooser.js
rename to app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js
diff --git a/app/assets/javascripts/select-kit/app/components/mini-tag-chooser/mini-tag-chooser-header.js b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/mini-tag-chooser-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/mini-tag-chooser/mini-tag-chooser-header.js
rename to app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/mini-tag-chooser-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/mini-tag-chooser/selected-collection.js b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/mini-tag-chooser/selected-collection.js
rename to app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js
diff --git a/app/assets/javascripts/select-kit/app/components/multi-select.js b/app/assets/javascripts/select-kit/addon/components/multi-select.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/multi-select.js
rename to app/assets/javascripts/select-kit/addon/components/multi-select.js
diff --git a/app/assets/javascripts/select-kit/app/components/multi-select/multi-select-filter.js b/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/multi-select/multi-select-filter.js
rename to app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.js
diff --git a/app/assets/javascripts/select-kit/app/components/multi-select/multi-select-header.js b/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/multi-select/multi-select-header.js
rename to app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/multi-select/selected-category.js b/app/assets/javascripts/select-kit/addon/components/multi-select/selected-category.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/multi-select/selected-category.js
rename to app/assets/javascripts/select-kit/addon/components/multi-select/selected-category.js
diff --git a/app/assets/javascripts/select-kit/app/components/multi-select/selected-color.js b/app/assets/javascripts/select-kit/addon/components/multi-select/selected-color.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/multi-select/selected-color.js
rename to app/assets/javascripts/select-kit/addon/components/multi-select/selected-color.js
diff --git a/app/assets/javascripts/select-kit/app/components/none-category-row.js b/app/assets/javascripts/select-kit/addon/components/none-category-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/none-category-row.js
rename to app/assets/javascripts/select-kit/addon/components/none-category-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/notifications-button.js b/app/assets/javascripts/select-kit/addon/components/notifications-button.js
similarity index 96%
rename from app/assets/javascripts/select-kit/app/components/notifications-button.js
rename to app/assets/javascripts/select-kit/addon/components/notifications-button.js
index f5423b9e64..32dc2ad7ba 100644
--- a/app/assets/javascripts/select-kit/app/components/notifications-button.js
+++ b/app/assets/javascripts/select-kit/addon/components/notifications-button.js
@@ -13,8 +13,7 @@ export default DropdownSelectBoxComponent.extend({
     autoFilterable: false,
     filterable: false,
     i18nPrefix: "",
-    i18nPostfix: "",
-    showCaret: true
+    i18nPostfix: ""
   },
 
   modifyComponentForRow() {
diff --git a/app/assets/javascripts/select-kit/app/components/notifications-button/notifications-button-row.js b/app/assets/javascripts/select-kit/addon/components/notifications-button/notifications-button-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/notifications-button/notifications-button-row.js
rename to app/assets/javascripts/select-kit/addon/components/notifications-button/notifications-button-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/notifications-filter.js b/app/assets/javascripts/select-kit/addon/components/notifications-filter.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/notifications-filter.js
rename to app/assets/javascripts/select-kit/addon/components/notifications-filter.js
diff --git a/app/assets/javascripts/select-kit/app/components/notifications-filter/notifications-filter-header.js b/app/assets/javascripts/select-kit/addon/components/notifications-filter/notifications-filter-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/notifications-filter/notifications-filter-header.js
rename to app/assets/javascripts/select-kit/addon/components/notifications-filter/notifications-filter-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/period-chooser.js b/app/assets/javascripts/select-kit/addon/components/period-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/period-chooser.js
rename to app/assets/javascripts/select-kit/addon/components/period-chooser.js
diff --git a/app/assets/javascripts/select-kit/app/components/period-chooser/period-chooser-header.js b/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/period-chooser/period-chooser-header.js
rename to app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/period-chooser/period-chooser-row.js b/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/period-chooser/period-chooser-row.js
rename to app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/pinned-button.js b/app/assets/javascripts/select-kit/addon/components/pinned-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/pinned-button.js
rename to app/assets/javascripts/select-kit/addon/components/pinned-button.js
diff --git a/app/assets/javascripts/select-kit/app/components/pinned-options.js b/app/assets/javascripts/select-kit/addon/components/pinned-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/pinned-options.js
rename to app/assets/javascripts/select-kit/addon/components/pinned-options.js
diff --git a/app/assets/javascripts/select-kit/app/components/search-advanced-category-chooser.js b/app/assets/javascripts/select-kit/addon/components/search-advanced-category-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/search-advanced-category-chooser.js
rename to app/assets/javascripts/select-kit/addon/components/search-advanced-category-chooser.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit.js b/app/assets/javascripts/select-kit/addon/components/select-kit.js
similarity index 99%
rename from app/assets/javascripts/select-kit/app/components/select-kit.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit.js
index f2fbbbf1c2..02acfb5a2e 100644
--- a/app/assets/javascripts/select-kit/app/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit.js
@@ -1,5 +1,6 @@
 import I18n from "I18n";
-import EmberObject, { computed, get, guidFor } from "@ember/object";
+import EmberObject, { computed, get } from "@ember/object";
+import { guidFor } from "@ember/object/internals";
 import Component from "@ember/component";
 import deprecated from "discourse-common/lib/deprecated";
 import { makeArray } from "discourse-common/lib/helpers";
@@ -271,7 +272,8 @@ export default Component.extend(
       selectedNameComponent: "selected-name",
       castInteger: false,
       preventsClickPropagation: false,
-      focusAfterOnChange: true
+      focusAfterOnChange: true,
+      triggerOnChangeOnTab: true
     },
 
     autoFilterable: computed("content.[]", "selectKit.filter", function() {
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/errors-collection.js b/app/assets/javascripts/select-kit/addon/components/select-kit/errors-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/errors-collection.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/errors-collection.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-body.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-body.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/select-kit-body.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-body.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-collection.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/select-kit-collection.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-create-row.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-create-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/select-kit-create-row.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-create-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-filter.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/select-kit-filter.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-header.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
similarity index 97%
rename from app/assets/javascripts/select-kit/app/components/select-kit/select-kit-header.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
index 785b2a4702..5697826f59 100644
--- a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
@@ -140,7 +140,11 @@ export default Component.extend(UtilsMixin, {
       this._focusFilterInput();
     } else if (event.keyCode === 9) {
       // Tab
-      if (this.selectKit.highlighted && this.selectKit.isExpanded) {
+      if (
+        this.selectKit.highlighted &&
+        this.selectKit.isExpanded &&
+        this.selectKit.options.triggerOnChangeOnTab
+      ) {
         this.selectKit.select(
           this.getValue(this.selectKit.highlighted),
           this.selectKit.highlighted
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-none-row.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-none-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/select-kit-none-row.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-none-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/select-kit-row.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/select-kit-row.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit/single-select-header.js b/app/assets/javascripts/select-kit/addon/components/select-kit/single-select-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/select-kit/single-select-header.js
rename to app/assets/javascripts/select-kit/addon/components/select-kit/single-select-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/selected-color.js b/app/assets/javascripts/select-kit/addon/components/selected-color.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/selected-color.js
rename to app/assets/javascripts/select-kit/addon/components/selected-color.js
diff --git a/app/assets/javascripts/select-kit/app/components/selected-name.js b/app/assets/javascripts/select-kit/addon/components/selected-name.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/selected-name.js
rename to app/assets/javascripts/select-kit/addon/components/selected-name.js
diff --git a/app/assets/javascripts/select-kit/app/components/single-select.js b/app/assets/javascripts/select-kit/addon/components/single-select.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/single-select.js
rename to app/assets/javascripts/select-kit/addon/components/single-select.js
diff --git a/app/assets/javascripts/select-kit/app/components/tag-chooser-row.js b/app/assets/javascripts/select-kit/addon/components/tag-chooser-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/tag-chooser-row.js
rename to app/assets/javascripts/select-kit/addon/components/tag-chooser-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/tag-chooser.js b/app/assets/javascripts/select-kit/addon/components/tag-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/tag-chooser.js
rename to app/assets/javascripts/select-kit/addon/components/tag-chooser.js
diff --git a/app/assets/javascripts/select-kit/app/components/tag-drop.js b/app/assets/javascripts/select-kit/addon/components/tag-drop.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/tag-drop.js
rename to app/assets/javascripts/select-kit/addon/components/tag-drop.js
diff --git a/app/assets/javascripts/select-kit/app/components/tag-drop/tag-drop-header.js b/app/assets/javascripts/select-kit/addon/components/tag-drop/tag-drop-header.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/tag-drop/tag-drop-header.js
rename to app/assets/javascripts/select-kit/addon/components/tag-drop/tag-drop-header.js
diff --git a/app/assets/javascripts/select-kit/app/components/tag-group-chooser.js b/app/assets/javascripts/select-kit/addon/components/tag-group-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/tag-group-chooser.js
rename to app/assets/javascripts/select-kit/addon/components/tag-group-chooser.js
diff --git a/app/assets/javascripts/select-kit/app/components/tag-notifications-button.js b/app/assets/javascripts/select-kit/addon/components/tag-notifications-button.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/tag-notifications-button.js
rename to app/assets/javascripts/select-kit/addon/components/tag-notifications-button.js
diff --git a/app/assets/javascripts/select-kit/app/components/tag-row.js b/app/assets/javascripts/select-kit/addon/components/tag-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/tag-row.js
rename to app/assets/javascripts/select-kit/addon/components/tag-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/timezone-input.js b/app/assets/javascripts/select-kit/addon/components/timezone-input.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/timezone-input.js
rename to app/assets/javascripts/select-kit/addon/components/timezone-input.js
diff --git a/app/assets/javascripts/select-kit/app/components/toolbar-popup-menu-options.js b/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/toolbar-popup-menu-options.js
rename to app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options.js
diff --git a/app/assets/javascripts/select-kit/app/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js b/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
rename to app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
diff --git a/app/assets/javascripts/select-kit/app/components/topic-footer-mobile-dropdown.js b/app/assets/javascripts/select-kit/addon/components/topic-footer-mobile-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/topic-footer-mobile-dropdown.js
rename to app/assets/javascripts/select-kit/addon/components/topic-footer-mobile-dropdown.js
diff --git a/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js b/app/assets/javascripts/select-kit/addon/components/topic-notifications-button.js
similarity index 55%
rename from app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
rename to app/assets/javascripts/select-kit/addon/components/topic-notifications-button.js
index 58329393e7..d9c0900182 100644
--- a/app/assets/javascripts/select-kit/app/components/topic-notifications-button.js
+++ b/app/assets/javascripts/select-kit/addon/components/topic-notifications-button.js
@@ -1,20 +1,28 @@
 import Component from "@ember/component";
-import { action } from "@ember/object";
+import { action, computed } from "@ember/object";
 
 export default Component.extend({
   layoutName: "select-kit/templates/components/topic-notifications-button",
   classNames: ["topic-notifications-button"],
+  classNameBindings: ["isLoading"],
   appendReason: true,
   showFullTitle: true,
   placement: "bottom-start",
   notificationLevel: null,
   topic: null,
   showCaret: true,
+  isLoading: false,
+  icon: computed("isLoading", function() {
+    return this.isLoading ? "spinner" : null;
+  }),
 
   @action
   changeTopicNotificationLevel(levelId) {
     if (levelId !== this.notificationLevel) {
-      this.topic.details.updateNotifications(levelId);
+      this.set("isLoading", true);
+      this.topic.details
+        .updateNotifications(levelId)
+        .finally(() => this.set("isLoading", false));
     }
   }
 });
diff --git a/app/assets/javascripts/select-kit/app/components/topic-notifications-options.js b/app/assets/javascripts/select-kit/addon/components/topic-notifications-options.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/topic-notifications-options.js
rename to app/assets/javascripts/select-kit/addon/components/topic-notifications-options.js
diff --git a/app/assets/javascripts/select-kit/app/components/user-chooser.js b/app/assets/javascripts/select-kit/addon/components/user-chooser.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/user-chooser.js
rename to app/assets/javascripts/select-kit/addon/components/user-chooser.js
diff --git a/app/assets/javascripts/select-kit/app/components/user-chooser/user-row.js b/app/assets/javascripts/select-kit/addon/components/user-chooser/user-row.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/user-chooser/user-row.js
rename to app/assets/javascripts/select-kit/addon/components/user-chooser/user-row.js
diff --git a/app/assets/javascripts/select-kit/app/components/user-notifications-dropdown.js b/app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/components/user-notifications-dropdown.js
rename to app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js
diff --git a/app/assets/javascripts/select-kit/app/mixins/plugin-api.js b/app/assets/javascripts/select-kit/addon/mixins/plugin-api.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/mixins/plugin-api.js
rename to app/assets/javascripts/select-kit/addon/mixins/plugin-api.js
diff --git a/app/assets/javascripts/select-kit/app/mixins/tags.js b/app/assets/javascripts/select-kit/addon/mixins/tags.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/mixins/tags.js
rename to app/assets/javascripts/select-kit/addon/mixins/tags.js
diff --git a/app/assets/javascripts/select-kit/app/mixins/utils.js b/app/assets/javascripts/select-kit/addon/mixins/utils.js
similarity index 100%
rename from app/assets/javascripts/select-kit/app/mixins/utils.js
rename to app/assets/javascripts/select-kit/addon/mixins/utils.js
diff --git a/app/assets/javascripts/select-kit/app/templates/components/category-drop/category-drop-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/category-drop/category-drop-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/category-drop/category-drop-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/category-drop/category-drop-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/category-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/color-palettes/color-palettes-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/color-palettes/color-palettes-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/color-palettes/color-palettes-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/color-palettes/color-palettes-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/combo-box/combo-box-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/create-color-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/create-color-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/create-color-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/create-color-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/future-date-input-selector/future-date-input-selector-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/future-date-input-selector/future-date-input-selector-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/mini-tag-chooser/selected-collection.hbs b/app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/selected-collection.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/mini-tag-chooser/selected-collection.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/selected-collection.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/multi-select.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/multi-select.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/multi-select/multi-select-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/multi-select/multi-select-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/multi-select/selected-category.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/multi-select/selected-category.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/notifications-filter/notifications-filter-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/notifications-filter/notifications-filter-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/notifications-filter/notifications-filter-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/notifications-filter/notifications-filter-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/period-chooser/period-chooser-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/period-chooser/period-chooser-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/period-chooser/period-chooser-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/period-chooser/period-chooser-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/pinned-button.hbs b/app/assets/javascripts/select-kit/addon/templates/components/pinned-button.hbs
new file mode 100644
index 0000000000..91bfe147ff
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/templates/components/pinned-button.hbs
@@ -0,0 +1,4 @@
+<p class="reason">
+  {{pinned-options value=pinned topic=topic}}
+  <span class="text">{{html-safe reasonText}}</span>
+</p>
diff --git a/app/assets/javascripts/select-kit/app/templates/components/select-kit/errors-collection.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/errors-collection.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/select-kit/errors-collection.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/select-kit/errors-collection.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-body.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-body.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-body.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-body.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-collection.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-collection.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-collection.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-collection.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-filter.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-filter.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/select-kit/select-kit-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/select-kit/single-select-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/single-select-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/select-kit/single-select-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/select-kit/single-select-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/selected-name.hbs b/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/selected-name.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/single-select.hbs b/app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/single-select.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/tag-chooser-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/tag-chooser-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/tag-chooser-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/tag-chooser-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/tag-drop/tag-drop-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/tag-drop/tag-drop-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/tag-drop/tag-drop-header.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/tag-drop/tag-drop-header.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/tag-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/tag-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/tag-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/tag-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs b/app/assets/javascripts/select-kit/addon/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/addon/templates/components/topic-notifications-button.hbs
new file mode 100644
index 0000000000..f21111ebbd
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/templates/components/topic-notifications-button.hbs
@@ -0,0 +1,30 @@
+{{#if appendReason}}
+  <p class="reason">
+    {{topic-notifications-options
+      value=notificationLevel
+      topic=topic
+      onChange=(action "changeTopicNotificationLevel")
+      options=(hash
+        icon=icon
+        showFullTitle=showFullTitle
+        placement=placement
+        preventsClickPropagation=true
+        showCaret=showCaret
+      )
+    }}
+    <span class="text">{{html-safe topic.details.notificationReasonText}}</span>
+  </p>
+{{else}}
+  {{topic-notifications-options
+    value=notificationLevel
+    topic=topic
+    onChange=(action "changeTopicNotificationLevel")
+    options=(hash
+      icon=icon
+      showFullTitle=showFullTitle
+      placement=placement
+      preventsClickPropagation=true
+      showCaret=showCaret
+    )
+  }}
+{{/if}}
diff --git a/app/assets/javascripts/select-kit/app/templates/components/user-chooser/user-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/user-chooser/user-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/app/templates/components/user-chooser/user-row.hbs
rename to app/assets/javascripts/select-kit/addon/templates/components/user-chooser/user-row.hbs
diff --git a/app/assets/javascripts/select-kit/app/templates/components/pinned-button.hbs b/app/assets/javascripts/select-kit/app/templates/components/pinned-button.hbs
deleted file mode 100644
index f54bdb6b5f..0000000000
--- a/app/assets/javascripts/select-kit/app/templates/components/pinned-button.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{{pinned-options value=pinned topic=topic}}
-
-<p class="reason">
-  {{html-safe reasonText}}
-</p>
diff --git a/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
deleted file mode 100644
index 50dd20e56e..0000000000
--- a/app/assets/javascripts/select-kit/app/templates/components/topic-notifications-button.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-{{topic-notifications-options
-  value=notificationLevel
-  topic=topic
-  onChange=(action "changeTopicNotificationLevel")
-  options=(hash
-    showFullTitle=showFullTitle
-    placement=placement
-    preventsClickPropagation=true
-    showCaret=showCaret
-  )
-}}
-
-{{#if appendReason}}
-  <p class="reason">
-    {{html-safe topic.details.notificationReasonText}}
-  </p>
-{{/if}}
diff --git a/app/assets/javascripts/wizard-application.js b/app/assets/javascripts/wizard-application.js
index b8e8797f0c..4e2a7adc07 100644
--- a/app/assets/javascripts/wizard-application.js
+++ b/app/assets/javascripts/wizard-application.js
@@ -1,6 +1,6 @@
 //= require_tree ./discourse-common/addon
 //= require i18n-patches
-//= require_tree ./select-kit/app
+//= require_tree ./select-kit/addon
 //= require wizard/router
 //= require wizard/wizard
 //= require_tree ./wizard/templates
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index aa51fccce1..a80e54c4fd 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -53,7 +53,6 @@
     color: $primary-medium;
   }
   span.badge-category {
-    font-weight: normal;
     color: $primary-medium;
   }
   a.discourse-tag {
diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss
index d729cdc742..05a2902905 100644
--- a/app/assets/stylesheets/common/base/alert.scss
+++ b/app/assets/stylesheets/common/base/alert.scss
@@ -3,6 +3,7 @@
   background-color: $danger-low;
   color: $primary;
   position: relative;
+  margin-bottom: 1em;
 
   .close {
     font-size: $font-up-3;
diff --git a/app/assets/stylesheets/common/base/crawler_layout.scss b/app/assets/stylesheets/common/base/crawler_layout.scss
index c279aceff4..bff0addac1 100644
--- a/app/assets/stylesheets/common/base/crawler_layout.scss
+++ b/app/assets/stylesheets/common/base/crawler_layout.scss
@@ -27,6 +27,36 @@ body.crawler {
 
   .topic-list {
     margin-bottom: 1em;
+    @media (max-width: 850px) {
+      td {
+        word-break: break-all;
+        &.posters {
+          a:not(:last-of-type) {
+            display: none;
+          }
+          a:last-of-type {
+            display: block;
+          }
+        }
+      }
+
+      td,
+      th {
+        &.views {
+          display: none;
+        }
+      }
+
+      .link-top-line {
+        a.title {
+          padding: 0;
+        }
+      }
+
+      .link-bottom-line {
+        margin-top: 0.25em;
+      }
+    }
   }
 
   footer {
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 6e465bbc6b..48c361c164 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1005,10 +1005,51 @@ a.mention-group {
 }
 
 #topic-footer-buttons {
-  .reason {
-    color: $primary-high;
-    display: inline;
-    margin: 0 0 0 8px;
-    line-height: $line-height-medium;
+  padding: 0.5em 0;
+
+  .topic-footer-main-buttons {
+    margin: 0 0 -0.5em 0;
+    display: flex;
+    flex-wrap: wrap;
+
+    > .btn {
+      margin: 0 0.5em 0.5em 0;
+      display: inline-flex;
+      align-items: center;
+
+      .d-button-label {
+        display: flex;
+        flex: 1 0 auto;
+        align-items: center;
+      }
+    }
+
+    .topic-admin-menu-button-container {
+      display: inline-flex;
+    }
+
+    .topic-admin-menu-button-container > span:not(:empty) {
+      margin: 0 0.5em 0.5em 0;
+    }
+  }
+
+  .pinned-button:not(.is-hidden) + .topic-notifications-button {
+    margin-top: 0;
+  }
+
+  .pinned-button,
+  .topic-notifications-button {
+    margin: 1em 0;
+
+    .reason {
+      color: $primary-high;
+      display: inline-flex;
+      margin: 0;
+      align-items: center;
+
+      .text {
+        margin-left: 0.5em;
+      }
+    }
   }
 }
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 587af3c353..4d5e9f4288 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -653,6 +653,9 @@
     padding: 5px 0;
     font-weight: bold;
   }
+  .save-theme-alert {
+    font-size: $font-down-1;
+  }
 }
 
 .paginated-topics-list {
diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index 3881ee7b70..20ed535931 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -17,7 +17,6 @@
 
 .badge-wrapper {
   font-size: $font-down-1;
-  font-weight: bold;
   white-space: nowrap;
   position: relative;
   display: inline-flex;
diff --git a/app/assets/stylesheets/common/select-kit/category-row.scss b/app/assets/stylesheets/common/select-kit/category-row.scss
index 2bbe33c96e..df43c95603 100644
--- a/app/assets/stylesheets/common/select-kit/category-row.scss
+++ b/app/assets/stylesheets/common/select-kit/category-row.scss
@@ -9,6 +9,9 @@
       -ms-flex: 1 1 auto;
       flex: 1 1 auto;
     }
+    .category-desc p {
+      margin: 0;
+    }
     .category-status {
       .badge-wrapper.box {
         margin-bottom: 1px;
diff --git a/app/assets/stylesheets/common/select-kit/pinned-button.scss b/app/assets/stylesheets/common/select-kit/pinned-button.scss
index f080b8a016..3e51092ae3 100644
--- a/app/assets/stylesheets/common/select-kit/pinned-button.scss
+++ b/app/assets/stylesheets/common/select-kit/pinned-button.scss
@@ -1,28 +1,7 @@
 #topic-footer-buttons {
   .pinned-button {
-    min-width: auto;
-    margin: 1em 0;
-
     &.is-hidden {
       display: none;
     }
-
-    .btn {
-      margin: 0;
-    }
-
-    .reason {
-      display: inline;
-      line-height: $line-height-medium;
-    }
-  }
-}
-
-.pinned-button {
-  margin: 0;
-  min-width: auto;
-
-  .pinned-options {
-    display: inline;
   }
 }
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 130bad52f8..a9769b5971 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -63,6 +63,11 @@
     flex-direction: row;
     min-height: 30px;
 
+    .d-icon-spinner {
+      -webkit-animation: rotate-forever 1s infinite linear;
+      animation: rotate-forever 1s infinite linear;
+    }
+
     .selected-name {
       text-align: left;
       flex: 0 1 auto;
diff --git a/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss b/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
index 1e7c797205..b3808031a1 100644
--- a/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
+++ b/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
@@ -1,27 +1,18 @@
-#topic-footer-buttons {
-  .topic-notifications-button {
-    min-width: auto;
-    margin: 1em 0;
+.topic-notifications-button {
+  &.is-loading {
+    pointer-events: none;
+    user-select: none;
 
-    .btn {
+    .d-icon-spinner {
       margin: 0;
     }
 
-    .reason {
-      display: inline;
-      line-height: $line-height-medium;
+    .selected-name .d-icon {
+      display: none;
+    }
+
+    .topic-notifications-options {
+      opacity: 0.5;
     }
   }
 }
-
-.topic-notifications-button .topic-notifications-options {
-  min-width: auto;
-}
-
-.topic-notifications-button {
-  margin: 0;
-
-  .topic-notifications-options {
-    display: inline-flex;
-  }
-}
diff --git a/app/assets/stylesheets/desktop.scss b/app/assets/stylesheets/desktop.scss
index 70229afbbc..e9213e897b 100644
--- a/app/assets/stylesheets/desktop.scss
+++ b/app/assets/stylesheets/desktop.scss
@@ -1,24 +1,6 @@
 @import "common";
 
-/* @import "desktop/*"; TODO: get this working again */
-
-@import "desktop/alert";
-@import "desktop/banner";
-@import "desktop/compose";
-@import "desktop/discourse";
-@import "desktop/header";
-@import "desktop/login";
-@import "desktop/modal";
-@import "desktop/category-list";
-@import "desktop/latest-topic-list";
-@import "desktop/topic-list";
-@import "desktop/topic-post";
-@import "desktop/topic";
-@import "desktop/upload";
-@import "desktop/user";
-@import "desktop/history";
-@import "desktop/group";
-@import "desktop/admin_customize";
+@import "desktop/*";
 
 // Import all component-specific files
 @import "desktop/components/*";
diff --git a/app/assets/stylesheets/desktop/alert.scss b/app/assets/stylesheets/desktop/alert.scss
deleted file mode 100644
index f3f57eac66..0000000000
--- a/app/assets/stylesheets/desktop/alert.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.alert {
-  margin-bottom: 1em;
-}
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index ca304b8e95..5adc17d3eb 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -451,20 +451,15 @@ pre.copy-codeblocks:hover .copy-cmd {
   }
 }
 
-@mixin topic-footer-button {
-  margin-bottom: 5px;
-  margin-right: 10px;
-}
-
 #topic-footer-buttons {
-  padding: 10px 10px 0 0;
-  float: left;
-  .btn {
-    @include topic-footer-button;
+  max-width: calc(690px + (11px * 2) + 45px);
+
+  .bookmark {
     .d-icon-bookmark.bookmarked {
       color: $tertiary;
     }
   }
+
   .bookmark.bookmarked .d-icon-bookmark,
   .bookmark.bookmarked .d-icon-discourse-bookmark-clock {
     color: $tertiary;
@@ -474,10 +469,6 @@ pre.copy-codeblocks:hover .copy-cmd {
   }
 }
 
-#topic-footer-button {
-  width: 757px;
-}
-
 .suggested-topics {
   clear: left;
   padding: 20px 0 15px 0;
diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss
index ee9c3ed92d..a3202ca43c 100644
--- a/app/assets/stylesheets/mobile.scss
+++ b/app/assets/stylesheets/mobile.scss
@@ -1,37 +1,6 @@
 @import "common";
 
-/* @import "mobile/*"; TODO: get this working again */
-
-@import "mobile/buttons";
-@import "mobile/alert";
-@import "mobile/banner";
-@import "mobile/compose";
-@import "mobile/discourse";
-@import "mobile/header";
-@import "mobile/login";
-@import "mobile/modal";
-@import "mobile/topic-list";
-@import "mobile/topic-post";
-@import "mobile/topic";
-@import "mobile/upload";
-@import "mobile/user";
-@import "mobile/history";
-@import "mobile/lightbox";
-@import "mobile/directory";
-@import "mobile/search";
-@import "mobile/emoji";
-@import "mobile/ring";
-@import "mobile/group";
-@import "mobile/dashboard";
-@import "mobile/admin_badges";
-@import "mobile/admin_customize";
-@import "mobile/admin_reports";
-@import "mobile/admin_report";
-@import "mobile/admin_report_table";
-@import "mobile/admin_report_counters";
-@import "mobile/admin_emojis";
-@import "mobile/menu-panel";
-@import "mobile/reviewables";
+@import "mobile/*";
 
 // Import all component-specific files
 @import "mobile/components/*";
diff --git a/app/assets/stylesheets/mobile/alert.scss b/app/assets/stylesheets/mobile/alert.scss
index 0ee9b44ee0..12e60245e5 100644
--- a/app/assets/stylesheets/mobile/alert.scss
+++ b/app/assets/stylesheets/mobile/alert.scss
@@ -1,7 +1,8 @@
-// there are (n) new or updated topics, click to show
 .alert.alert-info {
-  margin: 0;
+  margin-bottom: 0.5em;
   &.clickable {
+    // there are (n) new or updated topics, click to show
+    margin-bottom: 0;
     padding: 1em;
   }
 }
diff --git a/app/assets/stylesheets/mobile/banner.scss b/app/assets/stylesheets/mobile/banner.scss
index 852b284736..fc308f0588 100644
--- a/app/assets/stylesheets/mobile/banner.scss
+++ b/app/assets/stylesheets/mobile/banner.scss
@@ -3,11 +3,6 @@
 // --------------------------------------------------
 
 #banner {
-  // go full width on mobile, by extending into the 10px wrap
-  // borders on left and right
-  margin: 0 -10px;
   max-height: 180px;
-  @media all and (max-height: 499px) {
-    max-height: 100px;
-  }
+  height: 20vh;
 }
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index 260f8d4b13..c9406abca6 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -63,11 +63,6 @@ blockquote {
   margin-bottom: 9px;
 }
 
-// categories should not be bold on mobile; they fight with the topic title too much
-.badge-wrapper {
-  font-weight: normal;
-}
-
 .mobile-nav {
   margin: 0;
   padding: 0;
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 9cd4931ce8..d84b4a727c 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -36,6 +36,7 @@ span.badge-posts {
     .double-button {
       display: flex;
       flex: 0 1 auto;
+      align-items: center;
       button {
         &.like,
         &.read-indicator,
@@ -235,20 +236,16 @@ a.reply-to-tab {
 }
 
 #topic-footer-buttons {
-  @include clearfix;
-  padding: 20px 0 0 0;
   .d-icon-bookmark.bookmarked,
   .d-icon-discourse-bookmark-clock.bookmarked {
     color: $tertiary;
   }
-  .combobox {
-    margin-right: 0.5em;
-    width: 160px;
-    margin-bottom: 0.5em;
-  }
-}
 
-#topic-footer-buttons {
+  .topic-footer-mobile-dropdown {
+    margin: 0 0.5em 0.5em 0;
+    width: 160px;
+  }
+
   .topic-notifications-button,
   .pinned-button {
     display: flex;
@@ -263,11 +260,6 @@ a.reply-to-tab {
   }
 }
 
-#topic-footer-button {
-  width: 100px;
-  margin: 0 auto;
-}
-
 .suggested-topics {
   clear: left;
   padding: 20px 0 15px 0;
@@ -292,13 +284,6 @@ span.post-count {
   opacity: 0.8;
 }
 
-#topic-footer-buttons {
-  .btn {
-    margin-bottom: 0.5em;
-    margin-right: 0.5em;
-  }
-}
-
 #topic-title {
   z-index: z("base") + 1;
   margin: 0 0 0 0 !important;
diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index fe2d3a2327..3f3f9e15a3 100644
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -16,7 +16,7 @@ class AboutController < ApplicationController
         render :index
       end
       format.json do
-        render_serialized(@about, AboutSerializer)
+        render_json_dump(AboutSerializer.new(@about, scope: guardian))
       end
     end
   end
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 81511387f7..5eadbbcf6d 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -331,7 +331,13 @@ class ListController < ApplicationController
 
     params[:category] = @category.id.to_s
 
-    @description_meta = @category.description_text
+    @description_meta = if @category.uncategorized?
+      I18n.t('category.uncategorized_description', locale: SiteSetting.default_locale)
+    else
+      @category.description_text
+    end
+    @description_meta = SiteSetting.site_description if @description_meta.blank?
+
     if !guardian.can_see?(@category)
       if SiteSetting.detailed_404
         raise Discourse::InvalidAccess
diff --git a/app/controllers/themes_controller.rb b/app/controllers/themes_controller.rb
deleted file mode 100644
index 6520ec7097..0000000000
--- a/app/controllers/themes_controller.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-class ThemesController < ::ApplicationController
-  def assets
-    theme_ids = params[:ids].to_s.split("-").map(&:to_i)
-
-    if params[:ids] == "default"
-      theme_ids = nil
-    else
-      raise Discourse::NotFound unless guardian.allow_themes?(theme_ids)
-    end
-
-    targets = view_context.mobile_view? ? [:mobile, :mobile_theme] : [:desktop, :desktop_theme]
-    targets << :admin if guardian.is_staff?
-    targets.append(*Discourse.find_plugin_css_assets(mobile_view: true, desktop_view: true))
-
-    object = targets.map do |target|
-      Stylesheet::Manager.stylesheet_data(target, theme_ids).map do |hash|
-        next hash unless Rails.env.development?
-
-        dup_hash = hash.dup
-        dup_hash[:new_href] = dup_hash[:new_href].dup
-        dup_hash[:new_href] << (dup_hash[:new_href].include?("?") ? "&" : "?")
-        dup_hash[:new_href] << SecureRandom.hex
-        dup_hash
-      end
-    end.flatten
-
-    render json: object.as_json
-  end
-end
diff --git a/app/helpers/email_helper.rb b/app/helpers/email_helper.rb
index c579473a4d..14364d45c3 100644
--- a/app/helpers/email_helper.rb
+++ b/app/helpers/email_helper.rb
@@ -25,12 +25,8 @@ module EmailHelper
     raw "<a href='#{Discourse.base_url}#{url}' style='color: ##{@anchor_color}'>#{title}</a>"
   end
 
-  def email_html_template(binding_arg)
-    template = EmailStyle.new.html.sub(
-      '%{email_content}',
-      '<%= yield %><% if defined?(html_body) %><%= html_body %><% end %>'
-    )
-    ERB.new(template).result(binding_arg)
+  def email_html_template
+    EmailStyle.new.html.sub('%{email_content}', yield).html_safe
   end
 
   protected
diff --git a/app/models/application_request.rb b/app/models/application_request.rb
index 52a6a8a87e..3d0d8ae905 100644
--- a/app/models/application_request.rb
+++ b/app/models/application_request.rb
@@ -16,15 +16,16 @@ class ApplicationRequest < ActiveRecord::Base
   include CachedCounting
 
   def self.disable
-    @enabled = false
+    @disabled = true
   end
 
   def self.enable
-    @enabled = true
+    @disabled = false
   end
 
   def self.increment!(type, opts = nil)
-    perform_increment!(redis_key(type), opts) if @enabled
+    return if @disabled
+    perform_increment!(redis_key(type), opts)
   end
 
   def self.write_cache!(date = nil)
diff --git a/app/models/category.rb b/app/models/category.rb
index 63db814752..6ecfe9d3af 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -709,37 +709,29 @@ class Category < ActiveRecord::Base
     ].include? id
   end
 
-  @@url_cache = DistributedCache.new('category_url')
+  def full_slug(separator = "-")
+    start_idx = "#{Discourse.base_uri}/c/".size
+    url[start_idx..-1].gsub("/", separator)
+  end
+
+  @@url_cache = DistributedCache.new("category_url")
 
   def clear_url_cache
     @@url_cache.clear
   end
 
-  def full_slug(separator = "-")
-    start_idx = "#{Discourse.base_uri}/c/".length
-    url[start_idx..-1].gsub("/", separator)
-  end
-
   def url
-    url = @@url_cache[self.id]
-    unless url
-      url = "#{Discourse.base_uri}/c/#{slug_path.join('/')}"
-
-      @@url_cache[self.id] = url
-    end
-
-    url
+    @@url_cache[self.id] ||= "#{Discourse.base_uri}/c/#{slug_path.join('/')}"
   end
 
   def url_with_id
     self.parent_category ? "#{url}/#{self.id}" : "#{Discourse.base_uri}/c/#{self.slug}/#{self.id}"
   end
 
-  # If the name changes, try and update the category definition topic too if it's
-  # an exact match
+  # If the name changes, try and update the category definition topic too if it's an exact match
   def rename_category_definition
-    old_name = saved_changes.transform_values(&:first)["name"]
     return unless topic.present?
+    old_name = saved_changes.transform_values(&:first)["name"]
     if topic.title == I18n.t("category.topic_prefix", category: old_name)
       topic.update_attribute(:title, I18n.t("category.topic_prefix", category: name))
     end
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index f4425919ed..21e5a137dc 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -164,9 +164,15 @@ class GlobalSetting
         c[:port] = redis_port if redis_port
 
         if redis_slave_host && redis_slave_port
-          c[:slave_host] = redis_slave_host
-          c[:slave_port] = redis_slave_port
-          c[:connector] = DiscourseRedis::Connector
+          if ENV["RAILS_FAILOVER"]
+            c[:replica_host] = redis_slave_host
+            c[:replica_port] = redis_slave_port
+            c[:connector] = RailsFailover::Redis::Connector
+          else
+            c[:slave_host] = redis_slave_host
+            c[:slave_port] = redis_slave_port
+            c[:connector] = DiscourseRedis::Connector
+          end
         end
 
         c[:password] = redis_password if redis_password.present?
@@ -188,9 +194,15 @@ class GlobalSetting
         c[:port] = message_bus_redis_port if message_bus_redis_port
 
         if message_bus_redis_slave_host && message_bus_redis_slave_port
-          c[:slave_host] = message_bus_redis_slave_host
-          c[:slave_port] = message_bus_redis_slave_port
-          c[:connector] = DiscourseRedis::Connector
+          if ENV["RAILS_FAILOVER"]
+            c[:replica_host] = message_bus_redis_slave_host
+            c[:replica_port] = message_bus_redis_slave_port
+            c[:connector] = RailsFailover::Redis::Connector
+          else
+            c[:slave_host] = message_bus_redis_slave_host
+            c[:slave_port] = message_bus_redis_slave_port
+            c[:connector] = DiscourseRedis::Connector
+          end
         end
 
         c[:password] = message_bus_redis_password if message_bus_redis_password.present?
diff --git a/app/models/group_archived_message.rb b/app/models/group_archived_message.rb
index 1715a57585..8199a53cf6 100644
--- a/app/models/group_archived_message.rb
+++ b/app/models/group_archived_message.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class GroupArchivedMessage < ActiveRecord::Base
-  belongs_to :user
+  belongs_to :group
   belongs_to :topic
 
   def self.move_to_inbox!(group_id, topic)
diff --git a/app/models/post.rb b/app/models/post.rb
index 89dbbcfebb..e1a3a1f391 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -159,14 +159,6 @@ class Post < ActiveRecord::Base
     includes(:post_details).find_by(post_details: { key: key, value: value })
   end
 
-  def self.excerpt_size=(sz)
-    @excerpt_size = sz
-  end
-
-  def self.excerpt_size
-    @excerpt_size || 220
-  end
-
   def whisper?
     post_type == Post.types[:whisper]
   end
@@ -482,7 +474,7 @@ class Post < ActiveRecord::Base
   end
 
   def excerpt_for_topic
-    Post.excerpt(cooked, Post.excerpt_size, strip_links: true, strip_images: true, post: self)
+    Post.excerpt(cooked, SiteSetting.topic_excerpt_maxlength, strip_links: true, strip_images: true, post: self)
   end
 
   def is_first_post?
@@ -658,6 +650,10 @@ class Post < ActiveRecord::Base
       baked_version: BAKED_VERSION
     )
 
+    if is_first_post?
+      topic.update_excerpt(excerpt_for_topic)
+    end
+
     if invalidate_broken_images
       custom_fields.delete(BROKEN_IMAGES)
       save_custom_fields
diff --git a/app/models/topic.rb b/app/models/topic.rb
index d331a30806..38affdb327 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -33,11 +33,11 @@ class Topic < ActiveRecord::Base
   end
 
   def self.thumbnail_sizes
-    [ self.share_thumbnail_size ]
+    [ self.share_thumbnail_size ] + DiscoursePluginRegistry.topic_thumbnail_sizes
   end
 
-  def thumbnail_job_redis_key(extra_sizes)
-    "generate_topic_thumbnail_enqueue_#{id}_#{extra_sizes.inspect}"
+  def thumbnail_job_redis_key(sizes)
+    "generate_topic_thumbnail_enqueue_#{id}_#{sizes.inspect}"
   end
 
   def filtered_topic_thumbnails(extra_sizes: [])
@@ -79,7 +79,7 @@ class Topic < ActiveRecord::Base
     if SiteSetting.create_thumbnails &&
        enqueue_if_missing &&
        records.length < thumbnail_sizes.length &&
-       Discourse.redis.set(thumbnail_job_redis_key(extra_sizes), 1, nx: true, ex: 1.minute)
+       Discourse.redis.set(thumbnail_job_redis_key(thumbnail_sizes), 1, nx: true, ex: 1.minute)
 
       Jobs.enqueue(:generate_topic_thumbnails, { topic_id: id, extra_sizes: extra_sizes })
     end
@@ -1476,6 +1476,13 @@ class Topic < ActiveRecord::Base
     private_topic
   end
 
+  def update_excerpt(excerpt)
+    update_column(:excerpt, excerpt)
+    if archetype == "banner"
+      ApplicationController.banner_json_cache.clear
+    end
+  end
+
   def pm_with_non_human_user?
     sql = <<~SQL
     SELECT 1 FROM topics
diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index a18e5b85de..362ee79f4a 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -109,6 +109,8 @@ class TopicEmbed < ActiveRecord::Base
 
     url = UrlHelper.escape_uri(url)
     original_uri = URI.parse(url)
+    raise URI::InvalidURIError unless original_uri.is_a?(URI::HTTP)
+
     opts = {
       tags: %w[div p code pre h1 h2 h3 b em i strong a img ul li ol blockquote],
       attributes: %w[href src class],
diff --git a/app/models/upload.rb b/app/models/upload.rb
index bb4e7976f5..31c931c172 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -448,7 +448,3 @@ end
 #  index_uploads_on_url                     (url)
 #  index_uploads_on_user_id                 (user_id)
 #
-# Foreign Keys
-#
-#  fk_rails_...  (access_control_post_id => posts.id)
-#
diff --git a/app/models/user.rb b/app/models/user.rb
index 9d682a62bd..d9678d1a1c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -7,102 +7,95 @@ class User < ActiveRecord::Base
   include SecondFactorManager
   include HasDestroyedWebHook
 
+  DEFAULT_FEATURED_BADGE_COUNT = 3
+
+  # not deleted on user delete
   has_many :posts
-  has_many :notifications, dependent: :delete_all
-  has_many :topic_users, dependent: :delete_all
+  has_many :topics
+  has_many :uploads
+
   has_many :category_users, dependent: :destroy
   has_many :tag_users, dependent: :destroy
   has_many :user_api_keys, dependent: :destroy
-  has_many :topics
-  has_many :bookmarks
+  has_many :topic_allowed_users, dependent: :destroy
+  has_many :user_archived_messages, dependent: :destroy
+  has_many :email_change_requests, dependent: :destroy
+  has_many :email_tokens, dependent: :destroy
+  has_many :invites, dependent: :destroy
+  has_many :topic_links, dependent: :destroy
+  has_many :user_uploads, dependent: :destroy
+  has_many :user_emails, dependent: :destroy
+  has_many :user_associated_accounts, dependent: :destroy
+  has_many :oauth2_user_infos, dependent: :destroy
+  has_many :user_second_factors, dependent: :destroy
+  has_many :user_badges, -> { for_enabled_badges }, dependent: :destroy
+  has_many :user_auth_tokens, dependent: :destroy
+  has_many :group_users, dependent: :destroy
+  has_many :user_warnings, dependent: :destroy
+  has_many :api_keys, dependent: :destroy
+  has_many :push_subscriptions, dependent: :destroy
+  has_many :acting_group_histories, dependent: :destroy, foreign_key: :acting_user_id, class_name: 'GroupHistory'
+  has_many :targeted_group_histories, dependent: :destroy, foreign_key: :target_user_id, class_name: 'GroupHistory'
+  has_many :reviewable_scores, dependent: :destroy
 
-  # dependent deleting handled via before_destroy
+  has_one :user_option, dependent: :destroy
+  has_one :user_avatar, dependent: :destroy
+  has_one :github_user_info, dependent: :destroy
+  has_one :primary_email, -> { where(primary: true)  }, class_name: 'UserEmail', dependent: :destroy
+  has_one :user_stat, dependent: :destroy
+  has_one :user_profile, dependent: :destroy, inverse_of: :user
+  has_one :single_sign_on_record, dependent: :destroy
+  has_one :anonymous_user_master, class_name: 'AnonymousUser', dependent: :destroy
+  has_one :anonymous_user_shadow, ->(record) { where(active: true) }, foreign_key: :master_user_id, class_name: 'AnonymousUser', dependent: :destroy
+
+  # delete all is faster but bypasses callbacks
+  has_many :bookmarks, dependent: :delete_all
+  has_many :notifications, dependent: :delete_all
+  has_many :topic_users, dependent: :delete_all
+  has_many :email_logs, dependent: :delete_all
+  has_many :incoming_emails, dependent: :delete_all
+  has_many :user_visits, dependent: :delete_all
+  has_many :user_auth_token_logs, dependent: :delete_all
+  has_many :group_requests, dependent: :delete_all
+  has_many :muted_user_records, class_name: 'MutedUser', dependent: :delete_all
+  has_many :ignored_user_records, class_name: 'IgnoredUser', dependent: :delete_all
+
+  # dependent deleting handled via before_destroy (special cases)
   has_many :user_actions
   has_many :post_actions
+  has_many :post_timings
+  has_many :directory_items
+  has_many :security_keys, -> {
+    where(enabled: true)
+  }, class_name: "UserSecurityKey"
 
-  DEFAULT_FEATURED_BADGE_COUNT = 3
-
-  has_many :user_badges, -> { for_enabled_badges }, dependent: :destroy
   has_many :badges, through: :user_badges
   has_many :default_featured_user_badges,
             -> { for_enabled_badges.grouped_with_count.where("featured_rank <= ?", DEFAULT_FEATURED_BADGE_COUNT) },
             class_name: "UserBadge"
 
-  has_many :email_logs, dependent: :delete_all
-  has_many :incoming_emails, dependent: :delete_all
-  has_many :post_timings
-  has_many :topic_allowed_users, dependent: :destroy
   has_many :topics_allowed, through: :topic_allowed_users, source: :topic
-  has_many :email_tokens, dependent: :destroy
-  has_many :user_visits, dependent: :destroy
-  has_many :invites, dependent: :destroy
-  has_many :topic_links, dependent: :destroy
-  has_many :uploads
-  has_many :user_warnings
-  has_many :user_archived_messages, dependent: :destroy
-  has_many :email_change_requests, dependent: :destroy
-
-  # see before_destroy
-  has_many :directory_items
-  has_many :user_auth_tokens, dependent: :destroy
-  has_many :user_auth_token_logs, dependent: :destroy
-
-  has_many :group_users, dependent: :destroy
   has_many :groups, through: :group_users
-  has_many :group_requests, dependent: :destroy
   has_many :secure_categories, through: :groups, source: :categories
 
-  has_many :user_uploads, dependent: :destroy
-  has_many :user_emails, dependent: :destroy
-
-  has_one :primary_email, -> { where(primary: true)  }, class_name: 'UserEmail', dependent: :destroy
-
-  has_one :user_option, dependent: :destroy
-  has_one :user_avatar, dependent: :destroy
-  has_many :user_associated_accounts, dependent: :destroy
-  has_one :github_user_info, dependent: :destroy
-  has_many :oauth2_user_infos, dependent: :destroy
-  has_many :user_second_factors, dependent: :destroy
-
+  # deleted in user_second_factors relationship
   has_many :totps, -> {
     where(method: UserSecondFactor.methods[:totp], enabled: true)
   }, class_name: "UserSecondFactor"
 
-  has_many :security_keys, -> {
-    where(enabled: true)
-  }, class_name: "UserSecurityKey"
-
-  has_one :anonymous_user_master, class_name: 'AnonymousUser'
-  has_one :anonymous_user_shadow, ->(record) { where(active: true) }, foreign_key: :master_user_id, class_name: 'AnonymousUser'
-
   has_one :master_user, through: :anonymous_user_master
   has_one :shadow_user, through: :anonymous_user_shadow, source: :user
 
-  has_one :user_stat, dependent: :destroy
-  has_one :user_profile, dependent: :destroy, inverse_of: :user
   has_one :profile_background_upload, through: :user_profile
   has_one :card_background_upload, through: :user_profile
-  has_one :single_sign_on_record, dependent: :destroy
   belongs_to :approved_by, class_name: 'User'
   belongs_to :primary_group, class_name: 'Group'
 
-  has_many :muted_user_records, class_name: 'MutedUser'
   has_many :muted_users, through: :muted_user_records
-
-  has_many :ignored_user_records, class_name: 'IgnoredUser'
   has_many :ignored_users, through: :ignored_user_records
 
-  has_many :api_keys, dependent: :destroy
-
-  has_many :push_subscriptions, dependent: :destroy
-
   belongs_to :uploaded_avatar, class_name: 'Upload'
 
-  has_many :acting_group_histories, dependent: :destroy, foreign_key: :acting_user_id, class_name: 'GroupHistory'
-  has_many :targeted_group_histories, dependent: :destroy, foreign_key: :target_user_id, class_name: 'GroupHistory'
-
-  has_many :reviewable_scores, dependent: :destroy
-
   delegate :last_sent_email_address, to: :email_logs
 
   validates_presence_of :username
@@ -164,6 +157,9 @@ class User < ActiveRecord::Base
     DirectoryItem.where(user_id: self.id)
       .where('period_type in (?)', DirectoryItem.period_types.values)
       .delete_all
+
+    # our relationship filters on enabled, this makes sure everything is deleted
+    UserSecurityKey.where(user_id: self.id).delete_all
   end
 
   # Skip validating email, for example from a particular auth provider plugin
@@ -933,7 +929,7 @@ class User < ActiveRecord::Base
 
   def activate
     if email_token = self.email_tokens.active.where(email: self.email).first
-      user = EmailToken.confirm(email_token.token, skip_reviewable: true)
+      EmailToken.confirm(email_token.token, skip_reviewable: true)
     end
     self.update!(active: true)
     create_reviewable
@@ -1119,10 +1115,9 @@ class User < ActiveRecord::Base
   end
 
   def number_of_rejected_posts
-    Post.with_deleted
-      .where(user_id: self.id)
-      .joins('INNER JOIN reviewables r ON posts.id = r.target_id')
-      .where(r: { status: Reviewable.statuses[:rejected], type: ReviewableQueuedPost.name })
+    ReviewableQueuedPost
+      .where(status: Reviewable.statuses[:rejected])
+      .where(created_by_id: self.id)
       .count
   end
 
diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index f6dbf13312..bd2751d6b4 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -5,6 +5,14 @@ class UserAvatar < ActiveRecord::Base
   belongs_to :gravatar_upload, class_name: 'Upload'
   belongs_to :custom_upload, class_name: 'Upload'
 
+  @@custom_user_gravatar_email_hash = {
+    Discourse::SYSTEM_USER_ID => User.email_hash("info@discourse.org")
+  }
+
+  def self.register_custom_user_gravatar_email_hash(user_id, email)
+    @@custom_user_gravatar_email_hash[user_id] = User.email_hash(email)
+  end
+
   def contains_upload?(id)
     gravatar_upload_id == id || custom_upload_id == id
   end
@@ -12,14 +20,14 @@ class UserAvatar < ActiveRecord::Base
   def update_gravatar!
     DistributedMutex.synchronize("update_gravatar_#{user_id}") do
       begin
-        self.update!(last_gravatar_download_attempt: Time.now)
+        self.update!(last_gravatar_download_attempt: Time.zone.now)
 
         max = Discourse.avatar_sizes.max
 
         # The user could be deleted before this executes
         return if user.blank? || user.primary_email.blank?
 
-        email_hash = user_id == Discourse::SYSTEM_USER_ID ? User.email_hash("info@discourse.org") : user.email_hash
+        email_hash = @@custom_user_gravatar_email_hash[user_id] || user.email_hash
         gravatar_url = "https://#{SiteSetting.gravatar_base_url}/avatar/#{email_hash}.png?s=#{max}&d=404&reset_cache=#{SecureRandom.urlsafe_base64(5)}"
 
         # follow redirects in case gravatar change rules on us
diff --git a/app/models/web_hook_event_type.rb b/app/models/web_hook_event_type.rb
index 952c1c2062..442f14cb8c 100644
--- a/app/models/web_hook_event_type.rb
+++ b/app/models/web_hook_event_type.rb
@@ -7,8 +7,6 @@ class WebHookEventType < ActiveRecord::Base
   GROUP = 4
   CATEGORY = 5
   TAG = 6
-  FLAG = 7
-  QUEUED_POST = 8
   REVIEWABLE = 9
   NOTIFICATION = 10
   SOLVED = 11
diff --git a/app/serializers/about_serializer.rb b/app/serializers/about_serializer.rb
index 308f990fd6..8230c590a4 100644
--- a/app/serializers/about_serializer.rb
+++ b/app/serializers/about_serializer.rb
@@ -21,7 +21,16 @@ class AboutSerializer < ApplicationSerializer
              :title,
              :locale,
              :version,
-             :https
+             :https,
+             :can_see_about_stats
+
+  def can_see_about_stats
+    scope.can_see_about_stats?
+  end
+
+  def include_stats?
+    can_see_about_stats
+  end
 
   def stats
     object.class.fetch_cached_stats || Jobs::AboutStats.new.execute({})
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index e402fb880c..a5027c5303 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -3,11 +3,11 @@
 class BadgeGranter
 
   def self.disable_queue
-    @queue_enabled = false
+    @queue_disabled = true
   end
 
   def self.enable_queue
-    @queue_enabled = true
+    @queue_disabled = false
   end
 
   def initialize(badge, user, opts = {})
@@ -124,7 +124,7 @@ class BadgeGranter
   end
 
   def self.queue_badge_grant(type, opt)
-    return if !SiteSetting.enable_badges || !@queue_enabled
+    return if !SiteSetting.enable_badges || @queue_disabled
     payload = nil
 
     case type
diff --git a/app/views/email/default_template.html b/app/views/email/default_template.html
index 382f939273..99b2e94995 100644
--- a/app/views/email/default_template.html
+++ b/app/views/email/default_template.html
@@ -3,6 +3,8 @@
 
 <head>
   <meta http-equiv="Content-type" name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no, width=device-width">
+  <!-- prevent ios zooming + autoscaling -->
+  <meta name="x-apple-disable-message-reformatting" />
   <title></title>
 </head>
 
diff --git a/app/views/layouts/email_template.html.erb b/app/views/layouts/email_template.html.erb
index 80da92efc2..611eba0df4 100644
--- a/app/views/layouts/email_template.html.erb
+++ b/app/views/layouts/email_template.html.erb
@@ -2,5 +2,8 @@
   <%= yield %>
   <% if defined?(html_body) %><%= html_body %><% end %>
 <% else %>
-  <%= email_html_template(binding).html_safe %>
+  <%= email_html_template do %>
+    <%= yield %>
+    <% if defined?(html_body) %><%= html_body %><% end %>
+  <% end %>
 <% end %>
diff --git a/app/views/layouts/publish.html.erb b/app/views/layouts/publish.html.erb
index 5bb0f957c5..4a249e8f32 100644
--- a/app/views/layouts/publish.html.erb
+++ b/app/views/layouts/publish.html.erb
@@ -2,13 +2,8 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, user-scalable=yes, viewport-fit=cover">
-
+    <%= render partial: "layouts/head" %>
     <%= render partial: "common/discourse_publish_stylesheet" %>
-
-    <%- if @canonical_url -%>
-      <link rel="canonical" href="<%= @canonical_url %>" />
-    <%- end -%>
   </head>
   <body class="<%= @body_classes.to_a.join(' ') %>">
     <%= yield %>
diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index 2d32efb77b..2338d39c6a 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -47,8 +47,8 @@
       <tr>
         <th><%= t 'js.topic.title' %></th>
         <th></th>
-        <th><%= t 'js.replies' %></th>
-        <th><%= t 'js.views' %></th>
+        <th class="replies"><%= t 'js.replies' %></th>
+        <th class="views"><%= t 'js.views' %></th>
         <th><%= t 'js.activity' %></th>
       </tr>
     </thead>
@@ -101,10 +101,10 @@
               <% end %>
             <% end %>
           </td>
-          <td>
+          <td class="replies">
             <span class='posts' title='<%= t 'posts' %>'><%= t.posts_count %></span>
           </td>
-          <td>
+          <td class="views">
             <span class='views' title='<%= t 'views' %>'><%= t.views %></span>
           </td>
           <td>
diff --git a/config/application.rb b/config/application.rb
index 43a8bf3091..0157dc8289 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -27,6 +27,10 @@ require_relative '../lib/discourse_plugin_registry'
 
 require_relative '../lib/plugin_gem'
 
+if ENV['RAILS_FAILOVER']
+  require 'rails_failover'
+end
+
 # Global config
 require_relative '../app/models/global_setting'
 GlobalSetting.configure!
@@ -250,7 +254,7 @@ module Discourse
     # Our templates shouldn't start with 'discourse/app/templates'
     config.handlebars.templates_root = {
       'discourse/app/templates' => '',
-      'select-kit/app/templates' => 'select-kit/templates/'
+      'select-kit/addon/templates' => 'select-kit/templates/'
     }
 
     config.handlebars.raw_template_namespace = "__DISCOURSE_RAW_TEMPLATES"
diff --git a/config/initializers/001-redis.rb b/config/initializers/001-redis.rb
index e48441594e..f28c59a3b1 100644
--- a/config/initializers/001-redis.rb
+++ b/config/initializers/001-redis.rb
@@ -2,5 +2,20 @@
 
 if Rails.env.development? && ENV['DISCOURSE_FLUSH_REDIS']
   puts "Flushing redis (development mode)"
-  Discourse.redis.flushall
+  Discourse.redis.flushdb
+end
+
+if ENV['RAILS_FAILOVER']
+  message_bus_keepalive_interval = MessageBus.keepalive_interval
+
+  RailsFailover::Redis.register_master_up_callback do
+    MessageBus.keepalive_interval = message_bus_keepalive_interval
+    Discourse.clear_readonly!
+    Discourse.request_refresh!
+  end
+
+  RailsFailover::Redis.register_master_down_callback do
+    # Disables MessageBus keepalive when Redis is in readonly mode
+    MessageBus.keepalive_interval = 0
+  end
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9746f37f37..3c3618ef96 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -963,6 +963,7 @@ en:
       api_approved: "Approved:"
       api_last_used_at: "Last used at:"
       theme: "Theme"
+      save_to_change_theme: 'Theme will be updated after you click "%{save_text}"'
       home: "Default Home Page"
       staged: "Staged"
 
@@ -2100,7 +2101,7 @@ en:
         help: "Move message back to Inbox"
       edit_message:
         help: "Edit first post of the message"
-        title: "Edit Message"
+        title: "Edit"
       defer:
         help: "Mark as unread"
         title: "Defer"
@@ -3598,12 +3599,6 @@ en:
         tag_event:
           name: "Tag Event"
           details: "When a tag is created, updated or destroyed."
-        flag_event:
-          name: "Flag Event"
-          details: "When a flag is created, agreed, disagreed or ignored."
-        queued_post_event:
-          name: "Post Approval Event"
-          details: "When a new queued post is created, approved or rejected."
         reviewable_event:
           name: "Reviewable Event"
           details: "When a new item is ready for review and when its status is updated."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 06f02313eb..2341f05c72 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1467,6 +1467,7 @@ en:
     exclude_rel_nofollow_domains: "A list of domains where nofollow should not be added to links. example.com will automatically allow sub.example.com as well. As a minimum, you should add the domain of this site to help web crawlers find all content. If other parts of your website are at other domains, add those too."
 
     post_excerpt_maxlength: "Maximum length of a post excerpt / summary."
+    topic_excerpt_maxlength: "Maximum length of a topic excerpt / summary, generated from the first post in a topic."
     show_pinned_excerpt_mobile: "Show excerpt on pinned topics in mobile view."
     show_pinned_excerpt_desktop: "Show excerpt on pinned topics in desktop view."
     post_onebox_maxlength: "Maximum length of a oneboxed Discourse post in characters."
diff --git a/config/routes.rb b/config/routes.rb
index d3a1082d43..69ade71938 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -23,6 +23,7 @@ Discourse::Application.routes.draw do
   post "webhooks/sparkpost" => "webhooks#sparkpost"
 
   scope path: nil, constraints: { format: /.*/ } do
+    Sidekiq::Web.set :sessions, Rails.application.config.session_options
     if Rails.env.development?
       mount Sidekiq::Web => "/sidekiq"
       mount Logster::Web => "/logs"
@@ -120,7 +121,6 @@ Discourse::Application.routes.draw do
       put "unsuspend"
       put "revoke_admin", constraints: AdminConstraint.new
       put "grant_admin", constraints: AdminConstraint.new
-      post "generate_api_key", constraints: AdminConstraint.new
       put "revoke_moderation", constraints: AdminConstraint.new
       put "grant_moderation", constraints: AdminConstraint.new
       put "approve"
@@ -950,8 +950,6 @@ Discourse::Application.routes.draw do
   get "/safe-mode" => "safe_mode#index"
   post "/safe-mode" => "safe_mode#enter", as: "safe_mode_enter"
 
-  get "/themes/assets/:ids" => "themes#assets"
-
   unless Rails.env.production?
     get "/qunit" => "qunit#index"
     get "/wizard/qunit" => "wizard#qunit"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index d49bb0e4cf..6209cc621a 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -394,7 +394,7 @@ login:
     default: false
   github_client_id:
     default: ""
-    regex: "^[a-f0-9]+$"
+    regex: "^[a-zA-Z0-9\\.]+$"
   github_client_secret:
     default: ""
     regex: "^[a-f0-9]+$"
@@ -819,6 +819,12 @@ posting:
       ja: 120
       zh_CN: 120
       zh_TW: 120
+  topic_excerpt_maxlength:
+    default: 220
+    locale_default:
+      ja: 120
+      zh_CN: 120
+      zh_TW: 120
   show_pinned_excerpt_mobile:
     client: true
     default: true
@@ -1382,7 +1388,8 @@ security:
       - Lax
       - Strict
       - Disabled
-    regex: "^(Lax|Strict|Disabled)$"
+      - None
+    regex: "^(Lax|Strict|Disabled|None)$"
   enable_escaped_fragments: true
   allow_index_in_robots_txt: true
   moderators_create_categories: false
diff --git a/db/fixtures/007_web_hook_event_types.rb b/db/fixtures/007_web_hook_event_types.rb
index 8bf8e93805..ec666ec5ad 100644
--- a/db/fixtures/007_web_hook_event_types.rb
+++ b/db/fixtures/007_web_hook_event_types.rb
@@ -30,16 +30,6 @@ WebHookEventType.seed do |b|
   b.name = "tag"
 end
 
-WebHookEventType.seed do |b|
-  b.id = WebHookEventType::FLAG
-  b.name = "flag"
-end
-
-WebHookEventType.seed do |b|
-  b.id = WebHookEventType::QUEUED_POST
-  b.name = "queued_post"
-end
-
 WebHookEventType.seed do |b|
   b.id = WebHookEventType::REVIEWABLE
   b.name = "reviewable"
diff --git a/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb b/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb
index 092a0e7b99..57b1885e35 100644
--- a/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb
+++ b/db/migrate/20200409033412_create_bookmarks_from_post_action_bookmarks.rb
@@ -16,6 +16,7 @@ class CreateBookmarksFromPostActionBookmarks < ActiveRecord::Migration[6.0]
         INNER JOIN posts ON posts.id = post_actions.post_id
         LEFT JOIN bookmarks ON bookmarks.post_id = post_actions.post_id AND bookmarks.user_id = post_actions.user_id
         INNER JOIN topics ON topics.id = posts.topic_id
+        INNER JOIN users ON users.id = post_actions.user_id
         WHERE bookmarks.id IS NULL AND post_action_type_id = :type_id AND post_actions.deleted_at IS NULL AND posts.deleted_at IS NULL
         LIMIT 2000
         SQL
diff --git a/db/migrate/20200514075356_remove_flag_web_hooks.rb b/db/migrate/20200514075356_remove_flag_web_hooks.rb
new file mode 100644
index 0000000000..448b7fb771
--- /dev/null
+++ b/db/migrate/20200514075356_remove_flag_web_hooks.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class RemoveFlagWebHooks < ActiveRecord::Migration[6.0]
+  def up
+    flag_event_type_id = 7
+
+    DB.exec <<~SQL
+    DELETE FROM web_hook_event_types_hooks
+    WHERE web_hook_event_type_id = #{flag_event_type_id}
+    SQL
+
+    DB.exec <<~SQL
+    DELETE FROM web_hook_event_types
+    WHERE id = #{flag_event_type_id}
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20200514075407_remove_queued_post_web_hooks.rb b/db/migrate/20200514075407_remove_queued_post_web_hooks.rb
new file mode 100644
index 0000000000..632e5013dc
--- /dev/null
+++ b/db/migrate/20200514075407_remove_queued_post_web_hooks.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class RemoveQueuedPostWebHooks < ActiveRecord::Migration[6.0]
+  def up
+    queued_post_event_type_id = 8
+
+    DB.exec <<~SQL
+    DELETE FROM web_hook_event_types_hooks
+    WHERE web_hook_event_type_id = #{queued_post_event_type_id}
+    SQL
+
+    DB.exec <<~SQL
+    DELETE FROM web_hook_event_types
+    WHERE id = #{queued_post_event_type_id}
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/post_migrate/20200520001619_remove_fks_from_bookmarks.rb b/db/post_migrate/20200520001619_remove_fks_from_bookmarks.rb
new file mode 100644
index 0000000000..80fee6dab4
--- /dev/null
+++ b/db/post_migrate/20200520001619_remove_fks_from_bookmarks.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveFksFromBookmarks < ActiveRecord::Migration[6.0]
+  def change
+    remove_foreign_key :bookmarks, :topics
+    remove_foreign_key :bookmarks, :posts
+    remove_foreign_key :bookmarks, :users
+  end
+end
diff --git a/db/post_migrate/20200522004855_remove_access_control_post_fk.rb b/db/post_migrate/20200522004855_remove_access_control_post_fk.rb
new file mode 100644
index 0000000000..36c8d0fbb7
--- /dev/null
+++ b/db/post_migrate/20200522004855_remove_access_control_post_fk.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveAccessControlPostFk < ActiveRecord::Migration[6.0]
+  def change
+    remove_foreign_key :uploads, column: :access_control_post_id
+  end
+end
diff --git a/lib/backup_restore/backup_file_handler.rb b/lib/backup_restore/backup_file_handler.rb
index c5e3702488..7b26356989 100644
--- a/lib/backup_restore/backup_file_handler.rb
+++ b/lib/backup_restore/backup_file_handler.rb
@@ -65,9 +65,10 @@ module BackupRestore
       return if !@is_archive
 
       log "Unzipping archive, this may take a while..."
-      pipeline = Compression::Pipeline.new([Compression::Tar.new, Compression::Gzip.new])
-      unzipped_path = pipeline.decompress(@tmp_directory, @archive_path, available_size)
-      pipeline.strip_directory(unzipped_path, @tmp_directory)
+      Discourse::Utils.execute_command(
+        'tar', '--extract', '--gzip', '--file', @archive_path, '--directory', @tmp_directory,
+        failure_message: "Failed to decompress archive."
+      )
     end
 
     def extract_db_dump
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index ae260e2ce1..ab382a4d15 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -75,6 +75,8 @@ class DiscoursePluginRegistry
 
   define_filtered_register :editable_group_custom_fields
 
+  define_filtered_register :topic_thumbnail_sizes
+
   def self.register_auth_provider(auth_provider)
     self.auth_providers << auth_provider
   end
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index ff946cacfb..6b630b7b34 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -266,12 +266,6 @@ class DiscourseRedis
     end
   end
 
-  def flushdb
-    DiscourseRedis.ignore_readonly do
-      keys.each { |k| del(k) }
-    end
-  end
-
   def reconnect
     @redis._client.reconnect
   end
diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index 6a26ebd7ee..f42fa73057 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -79,12 +79,35 @@ module FileStore
     def has_been_uploaded?(url)
       return false if url.blank?
 
+      begin
+        parsed_url = URI.parse(URI.encode(url))
+      rescue URI::InvalidURIError
+        return false
+      end
+
       base_hostname = URI.parse(absolute_base_url).hostname
-      return true if url[base_hostname]
+      if url[base_hostname]
+        # if the hostnames match it means the upload is in the same
+        # bucket on s3. however, the bucket folder path may differ in
+        # some cases, and we do not want to assume the url is uploaded
+        # here. e.g. the path of the current site could be /prod and the
+        # other site could be /staging
+        if s3_bucket_folder_path.present?
+          return parsed_url.path.starts_with?("/#{s3_bucket_folder_path}")
+        else
+          return true
+        end
+        return false
+      end
 
       return false if SiteSetting.Upload.s3_cdn_url.blank?
       cdn_hostname = URI.parse(SiteSetting.Upload.s3_cdn_url || "").hostname
-      cdn_hostname.presence && url[cdn_hostname]
+      return true if cdn_hostname.presence && url[cdn_hostname]
+      false
+    end
+
+    def s3_bucket_folder_path
+      @s3_helper.s3_bucket_folder_path
     end
 
     def s3_bucket_name
diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index ee724d56d1..5a82623f8f 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -164,7 +164,7 @@ module I18n
 
       by_site[locale].with_indifferent_access
     rescue ActiveRecord::StatementInvalid => e
-      if PG::UndefinedTable === e.cause
+      if PG::UndefinedTable === e.cause || PG::UndefinedColumn === e.cause
         {}
       else
         raise
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 00d496e46e..456461fead 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -493,6 +493,10 @@ class Guardian
     is_staff?
   end
 
+  def can_see_about_stats?
+    true
+  end
+
   def auth_token
     if cookie = request&.cookies[Auth::DefaultCurrentUserProvider::TOKEN_COOKIE]
       UserAuthToken.hash_token(cookie)
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index a993ce52f0..ab48f7cbea 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -165,6 +165,16 @@ class Plugin::Instance
     DiscoursePluginRegistry.register_editable_group_custom_field(field, self)
   end
 
+  # Request a new size for topic thumbnails
+  # Will respect plugin enabled setting is enabled
+  # Size should be an array with two elements [max_width, max_height]
+  def register_topic_thumbnail_size(size)
+    if !(size.kind_of?(Array) && size.length == 2)
+      raise ArgumentError.new("Topic thumbnail dimension is not valid")
+    end
+    DiscoursePluginRegistry.register_topic_thumbnail_size(size, self)
+  end
+
   def custom_avatar_column(column)
     reloadable_patch do |plugin|
       AvatarLookup.lookup_columns << column
diff --git a/lib/plugin_initialization_guard.rb b/lib/plugin_initialization_guard.rb
index a5a164e9e2..42c1bda864 100644
--- a/lib/plugin_initialization_guard.rb
+++ b/lib/plugin_initialization_guard.rb
@@ -6,33 +6,44 @@ def plugin_initialization_guard(&block)
   rescue => error
     plugins_directory = Rails.root + 'plugins'
 
-    plugin_path = error.backtrace_locations.lazy.map do |location|
-      Pathname.new(location.absolute_path)
-        .ascend
-        .lazy
-        .find { |path| path.parent == plugins_directory }
-    end.next
+    if error.backtrace && error.backtrace_locations
+      plugin_path = error.backtrace_locations.lazy.map do |location|
+        Pathname.new(location.absolute_path)
+          .ascend
+          .lazy
+          .find { |path| path.parent == plugins_directory }
+      end.next
 
-    raise unless plugin_path
+      raise unless plugin_path
 
-    stack_trace = error.backtrace.each_with_index.inject([]) do |messages, (line, index)|
-      if index == 0
-        messages << "#{line}: #{error} (#{error.class})"
-      else
-        messages << "\t#{index}: from #{line}"
-      end
-    end.reverse.join("\n")
+      stack_trace = error.backtrace.each_with_index.inject([]) do |messages, (line, index)|
+        if index == 0
+          messages << "#{line}: #{error} (#{error.class})"
+        else
+          messages << "\t#{index}: from #{line}"
+        end
+      end.reverse.join("\n")
 
-    STDERR.puts <<~MESSAGE
-      #{stack_trace}
+      STDERR.puts <<~MESSAGE
+        #{stack_trace}
 
-      ** INCOMPATIBLE PLUGIN **
+        ** INCOMPATIBLE PLUGIN **
 
-      You are unable to build Discourse due to errors in the plugin at
-      #{plugin_path}
+        You are unable to build Discourse due to errors in the plugin at
+        #{plugin_path}
 
-      Please try removing this plugin and rebuilding again!
-    MESSAGE
+        Please try removing this plugin and rebuilding again!
+      MESSAGE
+    else
+      STDERR.puts <<~MESSAGE
+        ** PLUGIN FAILURE **
+
+        You are unable to build Discourse due to this error during plugin
+        initialization:
+
+        #{error}
+      MESSAGE
+    end
     exit 1
   end
 end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 8a37e4c9c6..c3b9556df2 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -374,6 +374,10 @@ class PostCreator
   # discourse post.
   def create_embedded_topic
     return unless @opts[:embed_url].present?
+
+    original_uri = URI.parse(@opts[:embed_url])
+    raise Discourse::InvalidParameters.new(:embed_url) unless original_uri.is_a?(URI::HTTP)
+
     embed = TopicEmbed.new(topic_id: @post.topic_id, post_id: @post.id, embed_url: @opts[:embed_url])
     rollback_from_errors!(embed) unless embed.save
   end
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 3c9ec277cd..d610fccf37 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -567,11 +567,7 @@ class PostRevisor
   end
 
   def update_topic_excerpt
-    excerpt = @post.excerpt_for_topic
-    @topic.update_column(:excerpt, excerpt)
-    if @topic.archetype == "banner"
-      ApplicationController.banner_json_cache.clear
-    end
+    @topic.update_excerpt(@post.excerpt_for_topic)
   end
 
   def update_category_description
diff --git a/lib/tasks/bookmarks.rake b/lib/tasks/bookmarks.rake
index d3cf545d2d..87fe005b07 100644
--- a/lib/tasks/bookmarks.rake
+++ b/lib/tasks/bookmarks.rake
@@ -22,6 +22,7 @@ task "bookmarks:sync_to_table" => :environment do |_t, args|
         INNER JOIN posts ON posts.id = post_actions.post_id
         LEFT JOIN bookmarks ON bookmarks.post_id = post_actions.post_id AND bookmarks.user_id = post_actions.user_id
         INNER JOIN topics ON topics.id = posts.topic_id
+        INNER JOIN users ON users.id = post_actions.user_id
         WHERE bookmarks.id IS NULL AND post_action_type_id = :type_id AND post_actions.deleted_at IS NULL AND posts.deleted_at IS NULL
         LIMIT 2000
       SQL
diff --git a/lib/topic_query_params.rb b/lib/topic_query_params.rb
index e1bb23cb9f..bab30135a1 100644
--- a/lib/topic_query_params.rb
+++ b/lib/topic_query_params.rb
@@ -3,7 +3,7 @@
 module TopicQueryParams
   def build_topic_list_options
     options = {}
-    params[:tags] = [params[:tag_id].parameterize] if params[:tag_id].present? && guardian.can_tag_pms?
+    params[:tags] = [params[:tag_id]] if params[:tag_id].present? && guardian.can_tag_pms?
 
     TopicQuery.public_valid_options.each do |key|
       if params.key?(key)
diff --git a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
index 3972a350fb..fda50b4829 100644
--- a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
+++ b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
@@ -4,20 +4,20 @@ discobot_username = 'discobot'
 
 def seed_primary_email
   UserEmail.seed do |ue|
-    ue.id = -2
+    ue.id = DiscourseNarrativeBot::BOT_USER_ID
     ue.email = "discobot_email"
     ue.primary = true
-    ue.user_id = -2
+    ue.user_id = DiscourseNarrativeBot::BOT_USER_ID
   end
 end
 
-unless user = User.find_by(id: -2)
+unless user = User.find_by(id: DiscourseNarrativeBot::BOT_USER_ID)
   suggested_username = UserNameSuggester.suggest(discobot_username)
 
   seed_primary_email
 
   User.seed do |u|
-    u.id = -2
+    u.id = DiscourseNarrativeBot::BOT_USER_ID
     u.name = discobot_username
     u.username = suggested_username
     u.username_lower = suggested_username.downcase
@@ -26,22 +26,9 @@ unless user = User.find_by(id: -2)
     u.approved = true
     u.trust_level = TrustLevel[4]
   end
-
-  # TODO Pull the user avatar from that thread for now. In the future, pull it from a local file or from some central discobot repo.
-  if !Rails.env.test?
-    begin
-      UserAvatar.import_url_for_user(
-        "https://cdn.discourse.org/dev/uploads/default/original/2X/e/edb63d57a720838a7ce6a68f02ba4618787f2299.png",
-        User.find(-2),
-        override_gravatar: true
-      )
-    rescue
-      # In case the avatar can't be downloaded, don't fail seed
-    end
-  end
 end
 
-bot = User.find(-2)
+bot = User.find(DiscourseNarrativeBot::BOT_USER_ID)
 
 # ensure discobot has a primary email
 unless bot.primary_email
@@ -62,4 +49,4 @@ if !bot.user_profile.bio_raw
   )
 end
 
-Group.user_trust_level_change!(-2, TrustLevel[4])
+Group.user_trust_level_change!(DiscourseNarrativeBot::BOT_USER_ID, TrustLevel[4])
diff --git a/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb b/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb
new file mode 100644
index 0000000000..c902973081
--- /dev/null
+++ b/plugins/discourse-narrative-bot/db/post_migrate/20200520015508_clear_last_gravatar_download_attempt_on_user_avatars.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ClearLastGravatarDownloadAttemptOnUserAvatars < ActiveRecord::Migration[6.0]
+  def up
+    execute <<~SQL
+      UPDATE user_avatars
+      SET last_gravatar_download_attempt = null
+      WHERE user_id = -2 AND custom_upload_id IS NULL AND gravatar_upload_id IS NULL
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index a6be5dd056..61047c0e8b 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -55,6 +55,7 @@ after_initialize do
 
   module ::DiscourseNarrativeBot
     PLUGIN_NAME = "discourse-narrative-bot".freeze
+    BOT_USER_ID = -2
 
     class Engine < ::Rails::Engine
       engine_name PLUGIN_NAME
@@ -271,4 +272,9 @@ after_initialize do
       end
     end
   end
+
+  UserAvatar.register_custom_user_gravatar_email_hash(
+    DiscourseNarrativeBot::BOT_USER_ID,
+    "discobot@discourse.org"
+  )
 end
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
index 4e24b9feae..6914dff1d2 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
@@ -472,7 +472,7 @@ describe DiscourseNarrativeBot::TrackSelector do
           let(:post) { Fabricate(:post, topic: topic) }
 
           after do
-            Discourse.redis.flushall
+            Discourse.redis.flushdb
           end
 
           describe 'when random reply massage has been displayed in the last 6 hours' do
diff --git a/plugins/discourse-narrative-bot/spec/jobs/send_advanced_tutorial_message_spec.rb b/plugins/discourse-narrative-bot/spec/jobs/send_advanced_tutorial_message_spec.rb
index 5d3674cae0..874e40cfe8 100644
--- a/plugins/discourse-narrative-bot/spec/jobs/send_advanced_tutorial_message_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/jobs/send_advanced_tutorial_message_spec.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rails_helper'
+
 RSpec.describe Jobs::SendAdvancedTutorialMessage do
   before do
     Jobs.run_immediately!
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index 1b698cbf36..8c14233a5b 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -237,7 +237,7 @@ describe Auth::DefaultCurrentUserProvider do
     end
 
     after do
-      Discourse.redis.flushall
+      Discourse.redis.flushdb
     end
 
     it "should not update last seen for suspended users" do
diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb
index 6d4af1d817..abc9a5917a 100644
--- a/spec/components/discourse_redis_spec.rb
+++ b/spec/components/discourse_redis_spec.rb
@@ -21,11 +21,11 @@ describe DiscourseRedis do
     let(:raw_redis) { Redis.new(DiscourseRedis.config) }
 
     before do
-      raw_redis.flushall
+      raw_redis.flushdb
     end
 
     after do
-      raw_redis.flushall
+      raw_redis.flushdb
     end
 
     describe 'when namespace is enabled' do
diff --git a/spec/components/email/processor_spec.rb b/spec/components/email/processor_spec.rb
index 3fe4ab41b7..606955551a 100644
--- a/spec/components/email/processor_spec.rb
+++ b/spec/components/email/processor_spec.rb
@@ -5,7 +5,7 @@ require "email/processor"
 
 describe Email::Processor do
   after do
-    Discourse.redis.flushall
+    Discourse.redis.flushdb
   end
 
   let(:from) { "foo@bar.com" }
diff --git a/spec/components/file_store/s3_store_spec.rb b/spec/components/file_store/s3_store_spec.rb
index 99f57c7104..15c36b05be 100644
--- a/spec/components/file_store/s3_store_spec.rb
+++ b/spec/components/file_store/s3_store_spec.rb
@@ -251,7 +251,7 @@ describe FileStore::S3Store do
 
       before do
         optimized_image.update!(
-          url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com#{image_path}"
+          url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{image_path}"
         )
       end
 
@@ -272,6 +272,12 @@ describe FileStore::S3Store do
           SiteSetting.s3_upload_bucket = "s3-upload-bucket/discourse-uploads"
         end
 
+        before do
+          optimized_image.update!(
+            url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/discourse-uploads/#{image_path}"
+          )
+        end
+
         it "removes the file from s3 with the right paths" do
           s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
           s3_object = stub
@@ -298,6 +304,15 @@ describe FileStore::S3Store do
 
   describe ".has_been_uploaded?" do
 
+    it "doesn't crash for invalid URLs" do
+      expect(store.has_been_uploaded?("https://site.discourse.com/#bad#6")).to eq(false)
+    end
+
+    it "doesn't crash if URL contains non-ascii characters" do
+      expect(store.has_been_uploaded?("//s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com/漢1337.png")).to eq(true)
+      expect(store.has_been_uploaded?("//s3-upload-bucket.s3.amazonaws.com/漢1337.png")).to eq(false)
+    end
+
     it "identifies S3 uploads" do
       expect(store.has_been_uploaded?("//s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com/1337.png")).to eq(true)
     end
diff --git a/spec/components/guardian/user_guardian_spec.rb b/spec/components/guardian/user_guardian_spec.rb
index b812fa9526..10b6afc941 100644
--- a/spec/components/guardian/user_guardian_spec.rb
+++ b/spec/components/guardian/user_guardian_spec.rb
@@ -25,13 +25,13 @@ describe UserGuardian do
   end
 
   let :already_uploaded do
-    u = Upload.new(user_id: 999, id: 2)
+    u = Upload.new(user_id: 9999, id: 2)
     user_avatar.custom_upload_id = u.id
     u
   end
 
   let :not_my_upload do
-    Upload.new(user_id: 999, id: 3)
+    Upload.new(user_id: 9999, id: 3)
   end
 
   let(:moderator_upload) do
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index 8969a526bd..c5ef73c4d2 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -508,7 +508,7 @@ describe PrettyText do
         ['apple', 'banana'].each { |w| Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor]) }
         expect(PrettyText.cook("# banana")).not_to include('banana')
       ensure
-        Discourse.redis.flushall
+        Discourse.redis.flushdb
       end
     end
   end
@@ -1166,7 +1166,7 @@ HTML
   end
 
   describe "censoring" do
-    after(:all) { Discourse.redis.flushall }
+    after(:all) { Discourse.redis.flushdb }
 
     def expect_cooked_match(raw, expected_cooked)
       expect(PrettyText.cook(raw)).to eq(expected_cooked)
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index a455d81ec1..599ea3c5aa 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -444,7 +444,7 @@ describe Search do
       end
 
       let(:expected_blurb) do
-        "...to satisfy any test conditions that require content longer than the typical test post raw content. elephant"
+        "...quire content longer than the typical test post raw content. It really is some long content, folks. elephant"
       end
 
       it 'returns the post' do
diff --git a/spec/fabricators/post_fabricator.rb b/spec/fabricators/post_fabricator.rb
index 42235cb94f..77a234d981 100644
--- a/spec/fabricators/post_fabricator.rb
+++ b/spec/fabricators/post_fabricator.rb
@@ -10,7 +10,7 @@ end
 Fabricator(:post_with_long_raw_content, from: :post) do
   raw 'This is a sample post with semi-long raw content. The raw content is also more than
       two hundred characters to satisfy any test conditions that require content longer
-      than the typical test post raw content.'
+      than the typical test post raw content. It really is some long content, folks.'
 end
 
 Fabricator(:post_with_youtube, from: :post) do
diff --git a/spec/fabricators/web_hook_fabricator.rb b/spec/fabricators/web_hook_fabricator.rb
index 4647251080..9edc591791 100644
--- a/spec/fabricators/web_hook_fabricator.rb
+++ b/spec/fabricators/web_hook_fabricator.rb
@@ -71,22 +71,6 @@ Fabricator(:tag_web_hook, from: :web_hook) do
   end
 end
 
-Fabricator(:flag_web_hook, from: :web_hook) do
-  transient flag_hook: WebHookEventType.find_by(name: 'flag')
-
-  after_build do |web_hook, transients|
-    web_hook.web_hook_event_types = [transients[:flag_hook]]
-  end
-end
-
-Fabricator(:queued_post_web_hook, from: :web_hook) do
-  transient queued_post_hook: WebHookEventType.find_by(name: 'queued_post')
-
-  after_build do |web_hook, transients|
-    web_hook.web_hook_event_types = [transients[:queued_post_hook]]
-  end
-end
-
 Fabricator(:reviewable_web_hook, from: :web_hook) do
   transient reviewable_hook: WebHookEventType.find_by(name: 'reviewable')
 
diff --git a/spec/integration/email_style_spec.rb b/spec/integration/email_style_spec.rb
index ef69850891..395dd19df1 100644
--- a/spec/integration/email_style_spec.rb
+++ b/spec/integration/email_style_spec.rb
@@ -3,128 +3,139 @@
 require "rails_helper"
 
 describe EmailStyle do
-  before do
-    SiteSetting.email_custom_template = "<body><h1>FOR YOU</h1><div>%{email_content}</div></body>"
-    SiteSetting.email_custom_css = 'h1 { color: red; } div.body { color: #FAB; }'
-    SiteSetting.email_custom_css_compiled = SiteSetting.email_custom_css
-  end
 
-  after do
-    SiteSetting.remove_override!(:email_custom_template)
-    SiteSetting.remove_override!(:email_custom_css)
-  end
-
-  context 'invite' do
-    fab!(:invite) { Fabricate(:invite) }
-    let(:invite_mail) { InviteMailer.send_invite(invite) }
-
-    subject(:mail_html) { Email::Renderer.new(invite_mail).html }
-
-    it 'applies customizations' do
-      expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-      expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
-    end
-
-    it 'applies customizations if compiled is missing' do
-      SiteSetting.remove_override!(:email_custom_css_compiled)
-      expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-      expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
-    end
-
-    it 'can apply RTL attrs' do
-      SiteSetting.default_locale = 'he'
-      body_attrs = mail_html.match(/<body ([^>])+/)
-      expect(body_attrs[0]&.downcase).to match(/text-align:\s*right/)
-      expect(body_attrs[0]&.downcase).to include('dir="rtl"')
+  context "ERB evaluation" do
+    it "does not evaluate ERB outside of the email itself" do
+      SiteSetting.email_custom_template = "<div>%{email_content}</div><%= (111 * 333) %>"
+      html = Email::Renderer.new(UserNotifications.signup(Fabricate(:user))).html
+      expect(html).not_to match("36963")
     end
   end
 
-  context 'user_replied' do
-    let(:response_by_user) { Fabricate(:user, name: "John Doe") }
-    let(:category) { Fabricate(:category, name: 'India') }
-    let(:topic) { Fabricate(:topic, category: category, title: "Super cool topic") }
-    let(:post) { Fabricate(:post, topic: topic, raw: 'This is My super duper cool topic') }
-    let(:response) { Fabricate(:basic_reply, topic: post.topic, user: response_by_user) }
-    let(:user) { Fabricate(:user) }
-    let(:notification) { Fabricate(:replied_notification, user: user, post: response) }
-
-    let(:mail) do
-      UserNotifications.user_replied(
-        user,
-        post: response,
-        notification_type: notification.notification_type,
-        notification_data_hash: notification.data_hash
-      )
+  context "with a custom template" do
+    before do
+      SiteSetting.email_custom_template = "<body><h1>FOR YOU</h1><div>%{email_content}</div></body>"
+      SiteSetting.email_custom_css = 'h1 { color: red; } div.body { color: #FAB; }'
+      SiteSetting.email_custom_css_compiled = SiteSetting.email_custom_css
     end
 
-    subject(:mail_html) { Email::Renderer.new(mail).html }
-
-    it "customizations are applied to html part of emails" do
-      expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-      matches = mail_html.match(/<div style="([^"]+)">#{post.raw}/)
-      expect(matches[1]).to include('color: #FAB;') # custom
-      expect(matches[1]).to include('padding-top:5px;') # div.body
+    after do
+      SiteSetting.remove_override!(:email_custom_template)
+      SiteSetting.remove_override!(:email_custom_css)
     end
 
-    # TODO: translation override
-  end
+    context 'invite' do
+      fab!(:invite) { Fabricate(:invite) }
+      let(:invite_mail) { InviteMailer.send_invite(invite) }
 
-  context 'signup' do
-    let(:signup_mail) { UserNotifications.signup(Fabricate(:user)) }
-    subject(:mail_html) { Email::Renderer.new(signup_mail).html }
+      subject(:mail_html) { Email::Renderer.new(invite_mail).html }
 
-    it "customizations are applied to html part of emails" do
-      expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-      expect(mail_html).to include('activate-account')
+      it 'applies customizations' do
+        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+        expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
+      end
+
+      it 'applies customizations if compiled is missing' do
+        SiteSetting.remove_override!(:email_custom_css_compiled)
+        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+        expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
+      end
+
+      it 'can apply RTL attrs' do
+        SiteSetting.default_locale = 'he'
+        body_attrs = mail_html.match(/<body ([^>])+/)
+        expect(body_attrs[0]&.downcase).to match(/text-align:\s*right/)
+        expect(body_attrs[0]&.downcase).to include('dir="rtl"')
+      end
     end
 
-    context 'translation override' do
-      before do
-        TranslationOverride.upsert!(
-          'en',
-          'user_notifications.signup.text_body_template',
-          "CLICK THAT LINK: %{base_url}/u/activate-account/%{email_token}"
+    context 'user_replied' do
+      let(:response_by_user) { Fabricate(:user, name: "John Doe") }
+      let(:category) { Fabricate(:category, name: 'India') }
+      let(:topic) { Fabricate(:topic, category: category, title: "Super cool topic") }
+      let(:post) { Fabricate(:post, topic: topic, raw: 'This is My super duper cool topic') }
+      let(:response) { Fabricate(:basic_reply, topic: post.topic, user: response_by_user) }
+      let(:user) { Fabricate(:user) }
+      let(:notification) { Fabricate(:replied_notification, user: user, post: response) }
+
+      let(:mail) do
+        UserNotifications.user_replied(
+          user,
+          post: response,
+          notification_type: notification.notification_type,
+          notification_data_hash: notification.data_hash
         )
       end
 
-      after do
-        TranslationOverride.revert!('en', ['user_notifications.signup.text_body_template'])
+      subject(:mail_html) { Email::Renderer.new(mail).html }
+
+      it "customizations are applied to html part of emails" do
+        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+        matches = mail_html.match(/<div style="([^"]+)">#{post.raw}/)
+        expect(matches[1]).to include('color: #FAB;') # custom
+        expect(matches[1]).to include('padding-top:5px;') # div.body
       end
 
-      it "applies customizations when translation override exists" do
-        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-        expect(mail_html.scan('CLICK THAT LINK').count).to eq(1)
-      end
+      # TODO: translation override
     end
 
-    context 'with some bad css' do
-      before do
-        SiteSetting.email_custom_css = '@import "nope.css"; h1 {{{ size: really big; '
-        SiteSetting.email_custom_css_compiled = SiteSetting.email_custom_css
-      end
+    context 'signup' do
+      let(:signup_mail) { UserNotifications.signup(Fabricate(:user)) }
+      subject(:mail_html) { Email::Renderer.new(signup_mail).html }
 
-      it "can render the html" do
-        expect(mail_html.scan(/<h1\s*(?:style=""){0,1}>FOR YOU<\/h1>/).count).to eq(1)
+      it "customizations are applied to html part of emails" do
+        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
         expect(mail_html).to include('activate-account')
       end
-    end
-  end
 
-  context 'digest' do
-    fab!(:popular_topic) { Fabricate(:topic, user: Fabricate(:coding_horror), created_at: 1.hour.ago) }
-    let(:summary_email) { UserNotifications.digest(Fabricate(:user)) }
-    subject(:mail_html) { Email::Renderer.new(summary_email).html }
+      context 'translation override' do
+        before do
+          TranslationOverride.upsert!(
+            'en',
+            'user_notifications.signup.text_body_template',
+            "CLICK THAT LINK: %{base_url}/u/activate-account/%{email_token}"
+          )
+        end
 
-    it "customizations are applied to html part of emails" do
-      expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
-      expect(mail_html).to include(popular_topic.title)
+        after do
+          TranslationOverride.revert!('en', ['user_notifications.signup.text_body_template'])
+        end
+
+        it "applies customizations when translation override exists" do
+          expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+          expect(mail_html.scan('CLICK THAT LINK').count).to eq(1)
+        end
+      end
+
+      context 'with some bad css' do
+        before do
+          SiteSetting.email_custom_css = '@import "nope.css"; h1 {{{ size: really big; '
+          SiteSetting.email_custom_css_compiled = SiteSetting.email_custom_css
+        end
+
+        it "can render the html" do
+          expect(mail_html.scan(/<h1\s*(?:style=""){0,1}>FOR YOU<\/h1>/).count).to eq(1)
+          expect(mail_html).to include('activate-account')
+        end
+      end
     end
 
-    it "doesn't apply customizations if apply_custom_styles_to_digest is disabled" do
-      SiteSetting.apply_custom_styles_to_digest = false
-      expect(mail_html).to_not include('<h1 style="color: red;">FOR YOU</h1>')
-      expect(mail_html).to_not include('FOR YOU')
-      expect(mail_html).to include(popular_topic.title)
+    context 'digest' do
+      fab!(:popular_topic) { Fabricate(:topic, user: Fabricate(:coding_horror), created_at: 1.hour.ago) }
+      let(:summary_email) { UserNotifications.digest(Fabricate(:user)) }
+      subject(:mail_html) { Email::Renderer.new(summary_email).html }
+
+      it "customizations are applied to html part of emails" do
+        expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
+        expect(mail_html).to include(popular_topic.title)
+      end
+
+      it "doesn't apply customizations if apply_custom_styles_to_digest is disabled" do
+        SiteSetting.apply_custom_styles_to_digest = false
+        expect(mail_html).to_not include('<h1 style="color: red;">FOR YOU</h1>')
+        expect(mail_html).to_not include('FOR YOU')
+        expect(mail_html).to include(popular_topic.title)
+      end
     end
   end
 end
diff --git a/spec/integration/topic_thumbnail_spec.rb b/spec/integration/topic_thumbnail_spec.rb
index 9ba35cbe97..dcdbb084d5 100644
--- a/spec/integration/topic_thumbnail_spec.rb
+++ b/spec/integration/topic_thumbnail_spec.rb
@@ -10,7 +10,7 @@ describe "Topic Thumbnails" do
 
   context 'latest' do
     def get_topic
-      Discourse.redis.del(topic.thumbnail_job_redis_key([]))
+      Discourse.redis.del(topic.thumbnail_job_redis_key(Topic.thumbnail_sizes))
       get '/latest.json'
       response.parsed_body["topic_list"]["topics"][0]
     end
@@ -84,5 +84,38 @@ describe "Topic Thumbnails" do
         expect(thumbnails.length).to eq(5)
       end
     end
+
+    context "with a plugin" do
+      before do
+        plugin = Plugin::Instance.new
+        plugin.register_topic_thumbnail_size [512, 512]
+      end
+
+      after do
+        DiscoursePluginRegistry.reset!
+      end
+
+      it "includes the theme specified resolutions" do
+        topic_json = nil
+
+        expect do
+          topic_json = get_topic
+        end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(1)
+
+        # Run the job
+        args = Jobs::GenerateTopicThumbnails.jobs.last["args"].first
+        Jobs::GenerateTopicThumbnails.new.execute(args.with_indifferent_access)
+
+        # Request again
+        expect do
+          topic_json = get_topic
+        end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(0)
+
+        thumbnails = topic_json["thumbnails"]
+
+        # Original + Optimized + 1 plugin request
+        expect(thumbnails.length).to eq(3)
+      end
+    end
   end
 end
diff --git a/spec/jobs/bookmark_reminder_notifications_spec.rb b/spec/jobs/bookmark_reminder_notifications_spec.rb
index 0bcfa0b3d2..25379d0ba3 100644
--- a/spec/jobs/bookmark_reminder_notifications_spec.rb
+++ b/spec/jobs/bookmark_reminder_notifications_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe Jobs::BookmarkReminderNotifications do
     bookmark1.update_column(:reminder_at, five_minutes_ago - 10.minutes)
     bookmark2.update_column(:reminder_at, five_minutes_ago - 5.minutes)
     bookmark3.update_column(:reminder_at, five_minutes_ago)
-    Discourse.redis.flushall
+    Discourse.redis.flushdb
   end
 
   it "sends every reminder and marks the reminder_at to nil for all bookmarks, as well as last sent date" do
diff --git a/spec/lib/bookmark_reminder_notification_handler_spec.rb b/spec/lib/bookmark_reminder_notification_handler_spec.rb
index 6af860f2f0..3d9a6d77f6 100644
--- a/spec/lib/bookmark_reminder_notification_handler_spec.rb
+++ b/spec/lib/bookmark_reminder_notification_handler_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe BookmarkReminderNotificationHandler do
   fab!(:user) { Fabricate(:user) }
 
   before do
-    Discourse.redis.flushall
+    Discourse.redis.flushdb
   end
 
   describe "#send_notification" do
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 4cc716d691..5bc5206bce 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1158,6 +1158,25 @@ describe Post do
     expect(post.custom_fields).to eq("Tommy" => "Hanks", "Vincent" => "Vega")
   end
 
+  describe "#excerpt_for_topic" do
+    it "returns a topic excerpt, defaulting to 220 chars" do
+      expected_excerpt = "This is a sample post with semi-long raw content. The raw content is also more than \ntwo hundred characters to satisfy any test conditions that require content longer \nthan the typical test post raw content. It really is&hellip;"
+      post = Fabricate(:post_with_long_raw_content)
+      post.rebake!
+      excerpt = post.excerpt_for_topic
+      expect(excerpt).to eq(expected_excerpt)
+    end
+
+    it "respects the site setting for topic excerpt" do
+      SiteSetting.topic_excerpt_maxlength = 10
+      expected_excerpt = "This is a &hellip;"
+      post = Fabricate(:post_with_long_raw_content)
+      post.rebake!
+      excerpt = post.excerpt_for_topic
+      expect(excerpt).to eq(expected_excerpt)
+    end
+  end
+
   describe "#rebake!" do
     it "will rebake a post correctly" do
       post = create_post
@@ -1176,6 +1195,25 @@ describe Post do
       expect(post.cooked).to eq(first_cooked)
       expect(result).to eq(true)
     end
+
+    it "updates the topic excerpt at the same time if it is the OP" do
+      post = create_post
+      post.topic.update(excerpt: "test")
+      DB.exec("UPDATE posts SET cooked = 'frogs' WHERE id = ?", [ post.id ])
+      post.reload
+      result = post.rebake!
+      post.topic.reload
+      expect(post.topic.excerpt).not_to eq("test")
+    end
+
+    it "does not update the topic excerpt if the post is not the OP" do
+      post = create_post
+      post2 = create_post
+      post.topic.update(excerpt: "test")
+      result = post2.rebake!
+      post.topic.reload
+      expect(post.topic.excerpt).to eq("test")
+    end
   end
 
   describe "#set_owner" do
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index ddfbe115ec..c91781e6dd 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -308,6 +308,14 @@ describe TopicEmbed do
       end
     end
 
+    context "non-http URL" do
+      let(:url) { '/test.txt' }
+
+      it "throws an error" do
+        expect { TopicEmbed.find_remote(url) }.to raise_error(URI::InvalidURIError)
+      end
+    end
+
     context "emails" do
       let(:url) { 'http://example.com/foo' }
       let(:contents) { '<p><a href="mailto:foo%40example.com">URL encoded @ symbol</a></p><p><a href="mailto:bar@example.com">normal mailto link</a></p>' }
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index d381579300..d1d5d1cc91 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -33,7 +33,7 @@ describe Topic do
 
       describe 'censored words' do
         after do
-          Discourse.redis.flushall
+          Discourse.redis.flushdb
         end
 
         describe 'when title contains censored words' do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 89d5f62704..4d2592c788 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1578,20 +1578,15 @@ describe User do
 
     describe '#number_of_rejected_posts' do
       it 'counts rejected posts' do
-        post = Fabricate(:post, user: user)
-
-        Fabricate(:reviewable_queued_post, target: post, status: Reviewable.statuses[:rejected])
+        Fabricate(:reviewable_queued_post, created_by: user, status: Reviewable.statuses[:rejected])
 
         expect(user.number_of_rejected_posts).to eq(1)
       end
 
       it 'ignore non-rejected posts' do
-        post = Fabricate(:post, user: user)
-
-        Fabricate(:reviewable_queued_post, target: post, status: Reviewable.statuses[:approved])
+        Fabricate(:reviewable_queued_post, created_by: user, status: Reviewable.statuses[:approved])
 
         expect(user.number_of_rejected_posts).to eq(0)
-
       end
     end
   end
diff --git a/spec/multisite/s3_store_spec.rb b/spec/multisite/s3_store_spec.rb
index 922c5f433b..064c699a12 100644
--- a/spec/multisite/s3_store_spec.rb
+++ b/spec/multisite/s3_store_spec.rb
@@ -217,4 +217,47 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
       end
     end
   end
+
+  describe "#has_been_uploaded?" do
+    before do
+      SiteSetting.s3_region = 'us-west-1'
+      SiteSetting.s3_upload_bucket = "s3-upload-bucket/test"
+      SiteSetting.s3_access_key_id = "s3-access-key-id"
+      SiteSetting.s3_secret_access_key = "s3-secret-access-key"
+      SiteSetting.enable_s3_uploads = true
+    end
+
+    let(:store) { FileStore::S3Store.new }
+    let(:client) { Aws::S3::Client.new(stub_responses: true) }
+    let(:resource) { Aws::S3::Resource.new(client: client) }
+    let(:s3_bucket) { resource.bucket(SiteSetting.s3_upload_bucket) }
+    let(:s3_helper) { store.s3_helper }
+
+    it "returns false for blank urls" do
+      url = ""
+      expect(store.has_been_uploaded?(url)).to eq(false)
+    end
+
+    it "returns true if the base hostname is the same for both urls" do
+      url = "https://s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
+      expect(store.has_been_uploaded?(url)).to eq(true)
+    end
+
+    it "returns false if the base hostname is the same for both urls BUT the bucket name is different in the path" do
+      bucket = "someotherbucket"
+      url = "https://s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{bucket}/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
+      expect(store.has_been_uploaded?(url)).to eq(false)
+    end
+
+    it "returns false if the hostnames do not match and the s3_cdn_url is blank" do
+      url = "https://www.someotherhostname.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
+      expect(store.has_been_uploaded?(url)).to eq(false)
+    end
+
+    it "returns true if the s3_cdn_url is present and matches the url hostname" do
+      SiteSetting.s3_cdn_url = "https://www.someotherhostname.com"
+      url = "https://www.someotherhostname.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
+      expect(store.has_been_uploaded?(url)).to eq(true)
+    end
+  end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index a0ce4b71b7..256de29658 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -128,6 +128,12 @@ module TestSetup
     # code that runs inside jobs. run_later! means they are put on the redis
     # queue and never processed.
     Jobs.run_later!
+
+    # Don't track ApplicationRequests in test mode unless opted in
+    ApplicationRequest.disable
+
+    # Don't queue badge grant in test mode
+    BadgeGranter.disable_queue
   end
 end
 
diff --git a/spec/requests/about_controller_spec.rb b/spec/requests/about_controller_spec.rb
index 6c58284979..a10b766304 100644
--- a/spec/requests/about_controller_spec.rb
+++ b/spec/requests/about_controller_spec.rb
@@ -36,5 +36,21 @@ describe AboutController do
         expect(response.body).to include("<title>About - Discourse</title>")
       end
     end
+
+    it "serializes stats when 'Guardian#can_see_about_stats?' is true" do
+      Guardian.any_instance.stubs(:can_see_about_stats?).returns(true)
+      get "/about.json"
+
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["about"].keys).to include("stats")
+    end
+
+    it "does not serialize stats when 'Guardian#can_see_about_stats?' is false" do
+      Guardian.any_instance.stubs(:can_see_about_stats?).returns(false)
+      get "/about.json"
+
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["about"].keys).not_to include("stats")
+    end
   end
 end
diff --git a/spec/requests/admin/backups_controller_spec.rb b/spec/requests/admin/backups_controller_spec.rb
index 466d4a938b..03b9245744 100644
--- a/spec/requests/admin/backups_controller_spec.rb
+++ b/spec/requests/admin/backups_controller_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe Admin::BackupsController do
   end
 
   after do
-    Discourse.redis.flushall
+    Discourse.redis.flushdb
 
     @paths&.each { |path| File.delete(path) if File.exists?(path) }
     @paths = nil
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index f62407d956..099372cad0 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -293,7 +293,7 @@ RSpec.describe Admin::UsersController do
     fab!(:another_user) { Fabricate(:coding_horror) }
 
     after do
-      Discourse.redis.flushall
+      Discourse.redis.flushdb
     end
 
     it "raises an error when the user doesn't have permission" do
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index d1238c1f00..bc913c58a0 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -128,7 +128,7 @@ RSpec.describe ListController do
     let(:moderator) { Fabricate(:moderator) }
     let(:admin) { Fabricate(:admin) }
     let(:tag) { Fabricate(:tag) }
-    let(:private_message) { Fabricate(:private_message_topic) }
+    let(:private_message) { Fabricate(:private_message_topic, user: admin) }
 
     before do
       SiteSetting.tagging_enabled = true
@@ -149,6 +149,17 @@ RSpec.describe ListController do
         expect(response.status).to eq(200)
       end
     end
+
+    it 'should work for tag with unicode name' do
+      unicode_tag = Fabricate(:tag, name: 'hello-🇺🇸')
+      Fabricate(:topic_tag, tag: unicode_tag, topic: private_message)
+
+      sign_in(admin)
+      get "/topics/private-messages-tags/#{admin.username}/#{UrlHelper.encode_component(unicode_tag.name)}.json"
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["topic_list"]["topics"].first["id"])
+        .to eq(private_message.id)
+    end
   end
 
   describe '#private_messages_group' do
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 909db8c509..ff355ada96 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -675,6 +675,17 @@ describe PostsController do
           I18n.t("invalid_params", message: "category")
         )
       end
+
+      it 'will raise an error if specified embed_url is invalid' do
+        user = Fabricate(:admin)
+        master_key = Fabricate(:api_key).key
+
+        post "/posts.json",
+          params: { title: 'this is a test title', raw: 'this is test body', embed_url: '/test.txt' },
+          headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
+
+        expect(response.status).to eq(422)
+      end
     end
 
     describe "when logged in" do
diff --git a/spec/requests/search_controller_spec.rb b/spec/requests/search_controller_spec.rb
index 947bd8754a..dac11690d3 100644
--- a/spec/requests/search_controller_spec.rb
+++ b/spec/requests/search_controller_spec.rb
@@ -26,11 +26,11 @@ describe SearchController do
     before do
       # TODO be a bit more strategic here instead of junking
       # all of redis
-      Discourse.redis.flushall
+      Discourse.redis.flushdb
     end
 
     after do
-      Discourse.redis.flushall
+      Discourse.redis.flushdb
     end
 
     context "when overloaded" do
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 726b92228f..9649f57f5b 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -2127,7 +2127,7 @@ RSpec.describe TopicsController do
     let(:topic) { post.topic }
 
     after do
-      Discourse.redis.flushall
+      Discourse.redis.flushdb
     end
 
     it 'returns first post of the topic' do
diff --git a/spec/requests/webhooks_controller_spec.rb b/spec/requests/webhooks_controller_spec.rb
index 7772e0eb18..580c0c72f0 100644
--- a/spec/requests/webhooks_controller_spec.rb
+++ b/spec/requests/webhooks_controller_spec.rb
@@ -3,7 +3,7 @@
 require "rails_helper"
 
 describe WebhooksController do
-  before { Discourse.redis.flushall }
+  before { Discourse.redis.flushdb }
 
   let(:email) { "em@il.com" }
   let(:message_id) { "12345@il.com" }
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index 5da26a674e..f6249b275b 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -60,7 +60,7 @@ describe TopicViewSerializer do
       it 'should have thumbnails' do
         SiteSetting.create_thumbnails = true
 
-        Discourse.redis.del(topic.thumbnail_job_redis_key([]))
+        Discourse.redis.del(topic.thumbnail_job_redis_key(Topic.thumbnail_sizes))
         json = nil
 
         expect do
diff --git a/spec/services/word_watcher_spec.rb b/spec/services/word_watcher_spec.rb
index 0f6a2b7bb3..5cf70b6583 100644
--- a/spec/services/word_watcher_spec.rb
+++ b/spec/services/word_watcher_spec.rb
@@ -7,7 +7,7 @@ describe WordWatcher do
   let(:raw) { "Do you like liquorice?\n\nI really like them. One could even say that I am *addicted* to liquorice. Anf if\nyou can mix it up with some anise, then I'm in heaven ;)" }
 
   after do
-    Discourse.redis.flushall
+    Discourse.redis.flushdb
   end
 
   describe '.word_matcher_regexp' do
diff --git a/test/javascripts/acceptance/category-chooser-test.js b/test/javascripts/acceptance/category-chooser-test.js
index b6772ab771..2247c8cbee 100644
--- a/test/javascripts/acceptance/category-chooser-test.js
+++ b/test/javascripts/acceptance/category-chooser-test.js
@@ -29,3 +29,19 @@ QUnit.test("prefill category when category_id is set", async assert => {
     1
   );
 });
+
+QUnit.test("filter is case insensitive", async assert => {
+  const categoryChooser = selectKit(".category-chooser");
+
+  await visit("/");
+  await click("#create-topic");
+  await categoryChooser.expand();
+  await categoryChooser.fillInFilter("bug");
+
+  assert.ok(categoryChooser.rows().length, 1);
+
+  await categoryChooser.emptyFilter();
+  await categoryChooser.fillInFilter("Bug");
+
+  assert.ok(categoryChooser.rows().length, 1);
+});
diff --git a/test/javascripts/acceptance/emoji-picker-test.js b/test/javascripts/acceptance/emoji-picker-test.js
index 6a4922ed5c..a3d8472b53 100644
--- a/test/javascripts/acceptance/emoji-picker-test.js
+++ b/test/javascripts/acceptance/emoji-picker-test.js
@@ -168,19 +168,6 @@ QUnit.test(
   }
 );
 
-QUnit.test("emoji picker lazy loads emojis", async assert => {
-  await visit("/t/internationalization-localization/280");
-  await click("#topic-footer-buttons .btn.create");
-
-  await click("button.emoji.btn");
-
-  assert.equal(
-    find('.emoji-picker button[title="massage_woman"]').css("background-image"),
-    "none",
-    "it doesn't load invisible emojis"
-  );
-});
-
 QUnit.test("emoji picker persists state", async assert => {
   await visit("/t/internationalization-localization/280");
   await click("#topic-footer-buttons .btn.create");
diff --git a/test/javascripts/acceptance/preferences-test.js b/test/javascripts/acceptance/preferences-test.js
index a9db1f08e5..20afdcd167 100644
--- a/test/javascripts/acceptance/preferences-test.js
+++ b/test/javascripts/acceptance/preferences-test.js
@@ -1,7 +1,6 @@
 import I18n from "I18n";
 import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
 import selectKit from "helpers/select-kit-helper";
-
 import User from "discourse/models/user";
 
 acceptance("User Preferences", {
diff --git a/test/javascripts/fixtures/about.js b/test/javascripts/fixtures/about.js
index 7f9f17cbba..4c7de6a87a 100644
--- a/test/javascripts/fixtures/about.js
+++ b/test/javascripts/fixtures/about.js
@@ -1,6 +1,7 @@
 export default {
   "about.json": {
     about: {
+      can_see_about_stats: true,
       stats: {
         topic_count: 27480,
         post_count: 490358,
diff --git a/test/javascripts/helpers/select-kit-helper.js b/test/javascripts/helpers/select-kit-helper.js
index 5d80b8f0b3..f795991326 100644
--- a/test/javascripts/helpers/select-kit-helper.js
+++ b/test/javascripts/helpers/select-kit-helper.js
@@ -32,6 +32,11 @@ async function selectKitFillInFilter(filter, selector) {
   );
 }
 
+async function selectKitEmptyFilter(selector) {
+  checkSelectKitIsNotCollapsed(selector);
+  await fillIn(`${selector} .filter-input`, "");
+}
+
 async function selectKitSelectRowByValue(value, selector) {
   checkSelectKitIsNotCollapsed(selector);
   await click(`${selector} .select-kit-row[data-value='${value}']`);
@@ -180,6 +185,10 @@ export default function selectKit(selector) {
       await selectKitFillInFilter(filter, selector);
     },
 
+    async emptyFilter() {
+      await selectKitEmptyFilter(selector);
+    },
+
     async keyboard(value, target) {
       await keyboardHelper(value, target, selector);
     },

From faeb5793baf408fa0ea7fc4425722842e41bc85e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 23 May 2020 19:08:49 +0200
Subject: [PATCH 1331/1830] UI: various tweaks to polls UI on mobile (#9864)

---
 plugins/poll/assets/stylesheets/mobile/poll.scss |  7 +++++--
 plugins/poll/config/locales/client.en.yml        | 14 +++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/plugins/poll/assets/stylesheets/mobile/poll.scss b/plugins/poll/assets/stylesheets/mobile/poll.scss
index 59b3046999..34f8c7dc19 100644
--- a/plugins/poll/assets/stylesheets/mobile/poll.scss
+++ b/plugins/poll/assets/stylesheets/mobile/poll.scss
@@ -1,9 +1,11 @@
 div.poll {
   .poll-buttons {
-    padding: 0.5em 1em 1em 1em;
+    display: inline-flex;
+    flex-wrap: wrap;
+    padding: 0.5em 1em 0.5em 1em;
 
     button {
-      margin-right: 0.5em;
+      margin: 0 0.5em 0.5em 0;
     }
   }
 
@@ -11,6 +13,7 @@ div.poll {
     padding: 0 1em;
     display: flex;
     flex-wrap: wrap;
+    flex-direction: column;
     .info-text {
       display: inline;
     }
diff --git a/plugins/poll/config/locales/client.en.yml b/plugins/poll/config/locales/client.en.yml
index 035630f421..cd721d5381 100644
--- a/plugins/poll/config/locales/client.en.yml
+++ b/plugins/poll/config/locales/client.en.yml
@@ -43,15 +43,15 @@ en:
       multiple:
         help:
           at_least_min_options:
-            one: "Choose at least <strong>%{count}</strong> option"
-            other: "Choose at least <strong>%{count}</strong> options"
+            one: "Choose at least <strong>%{count}</strong> option."
+            other: "Choose at least <strong>%{count}</strong> options."
           up_to_max_options:
-            one: "Choose up to <strong>%{count}</strong> option"
-            other: "Choose up to <strong>%{count}</strong> options"
+            one: "Choose up to <strong>%{count}</strong> option."
+            other: "Choose up to <strong>%{count}</strong> options."
           x_options:
-            one: "Choose <strong>%{count}</strong> option"
-            other: "Choose <strong>%{count}</strong> options"
-          between_min_and_max_options: "Choose between <strong>%{min}</strong> and <strong>%{max}</strong> options"
+            one: "Choose <strong>%{count}</strong> option."
+            other: "Choose <strong>%{count}</strong> options."
+          between_min_and_max_options: "Choose between <strong>%{min}</strong> and <strong>%{max}</strong> options."
 
       cast-votes:
         title: "Cast your votes"

From 60a3110113a19a61bcc6efe9bebe4e43047ede57 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Sun, 24 May 2020 21:58:03 +0530
Subject: [PATCH 1332/1830] FIX: call `getURL` method explicitly to prevent
 `this` context override.

---
 app/assets/javascripts/discourse/app/components/group-post.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/group-post.js b/app/assets/javascripts/discourse/app/components/group-post.js
index 34c83529ef..51bb53f0ea 100644
--- a/app/assets/javascripts/discourse/app/components/group-post.js
+++ b/app/assets/javascripts/discourse/app/components/group-post.js
@@ -3,5 +3,7 @@ import Component from "@ember/component";
 
 export default Component.extend({
   @discourseComputed("post.url")
-  postUrl: Discourse.getURL
+  postUrl(url) {
+    return Discourse.getURL(url);
+  }
 });

From 058bf56b4cffe962af5dcb56b82926e62e15fb32 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Sun, 24 May 2020 23:08:51 +0530
Subject: [PATCH 1333/1830] FIX: group card not showing if user can't see its
 members.

---
 .../discourse/app/components/group-card-contents.js            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/group-card-contents.js b/app/assets/javascripts/discourse/app/components/group-card-contents.js
index c4aafe5df4..2ff80e5b3b 100644
--- a/app/assets/javascripts/discourse/app/components/group-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/group-card-contents.js
@@ -56,7 +56,8 @@ export default Component.extend(CardContentsBase, CleansUp, {
         if (!group.flair_url && !group.flair_bg_color) {
           group.set("flair_url", "fa-users");
         }
-        return group.members.length < maxMembersToDisplay
+        return group.can_see_members &&
+          group.members.length < maxMembersToDisplay
           ? group.findMembers({ limit: maxMembersToDisplay }, true)
           : Promise.resolve();
       })

From 6f03d14c2340397b0ce9d175a2270ebae4180987 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Mon, 25 May 2020 00:04:06 +0530
Subject: [PATCH 1334/1830] FEATURE: category setting for default list filter.

---
 .../app/components/edit-category-settings.js     |  7 +++++++
 .../javascripts/discourse/app/models/category.js |  3 ++-
 .../components/edit-category-settings.hbs        | 16 ++++++++++++++++
 app/controllers/categories_controller.rb         |  1 +
 ...1959_add_default_list_filter_to_categories.rb |  7 +++++++
 5 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20200524181959_add_default_list_filter_to_categories.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 5844e45d0c..c811ce2db6 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-settings.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-settings.js
@@ -68,6 +68,13 @@ export default buildCategoryPanel("settings", {
     );
   },
 
+  @discourseComputed
+  availableListFilters() {
+    return ["all", "none"].map(p => {
+      return { name: I18n.t(`category.list_filters.${p}`), value: p };
+    });
+  },
+
   @discourseComputed
   searchPrioritiesOptions() {
     const options = [];
diff --git a/app/assets/javascripts/discourse/app/models/category.js b/app/assets/javascripts/discourse/app/models/category.js
index 78802cba87..eaca16a29d 100644
--- a/app/assets/javascripts/discourse/app/models/category.js
+++ b/app/assets/javascripts/discourse/app/models/category.js
@@ -187,7 +187,8 @@ const Category = RestModel.extend({
         ),
         search_priority: this.search_priority,
         reviewable_by_group_name: this.reviewable_by_group_name,
-        read_only_banner: this.read_only_banner
+        read_only_banner: this.read_only_banner,
+        default_list_filter: this.default_list_filter
       },
       type: id ? "PUT" : "POST"
     });
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 ab17a307c3..2218fc27fd 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
@@ -196,6 +196,22 @@
       {{/unless}}
     </div>
   </section>
+
+  <section class="field">
+    <label for="category-default-filter">
+      {{i18n "category.default_list_filter"}}
+    </label>
+    <div class="controls">
+      {{combo-box
+        id="category-default-filter"
+        valueProperty="value"
+        content=availableListFilters
+        value=category.default_list_filter
+        none="category.list_filters.all"
+      }}
+    </div>
+  </section>
+
   {{#if isParentCategory}}
     <section class="field show-subcategory-list-field">
       <label>
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 770275a65e..8fc6ad79bf 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -329,6 +329,7 @@ class CategoriesController < ApplicationController
         :required_tag_group_name,
         :min_tags_from_required_group,
         :read_only_banner,
+        :default_list_filter,
         custom_fields: [params[:custom_fields].try(:keys)],
         permissions: [*p.try(:keys)],
         allowed_tags: [],
diff --git a/db/migrate/20200524181959_add_default_list_filter_to_categories.rb b/db/migrate/20200524181959_add_default_list_filter_to_categories.rb
new file mode 100644
index 0000000000..4c43b5ccd3
--- /dev/null
+++ b/db/migrate/20200524181959_add_default_list_filter_to_categories.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDefaultListFilterToCategories < ActiveRecord::Migration[6.0]
+  def change
+    add_column :categories, :default_list_filter, :string, limit: 20, default: 'all'
+  end
+end

From 13d5ccedf5fd8f5350c65766c1a180d23077d2ae Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sun, 24 May 2020 22:12:55 +0200
Subject: [PATCH 1335/1830] FIX: Destroying a user failed when it had title

...because updating the user caused a validation of the primary email and the UserEmail records are already deleted at that time.
---
 app/models/group_user.rb  | 2 +-
 spec/models/group_spec.rb | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/models/group_user.rb b/app/models/group_user.rb
index 664a333e9b..7b8d8652a6 100644
--- a/app/models/group_user.rb
+++ b/app/models/group_user.rb
@@ -38,7 +38,7 @@ class GroupUser < ActiveRecord::Base
 
   def grant_other_available_title
     if group.title.present? && group.title == user.title
-      user.update!(title: user.next_best_title)
+      user.update_attribute(:title, user.next_best_title)
     end
   end
 
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 0cb8362c80..ddc3224e33 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -502,6 +502,14 @@ describe Group do
       expect(user.title).to eq('Different')
       expect(user.primary_group).to eq(primary_group)
     end
+
+    it "doesn't fail when the user gets destroyed" do
+      group.update(title: 'Awesome')
+      group.add(user)
+      user.reload
+
+      UserDestroyer.new(Discourse.system_user).destroy(user)
+    end
   end
 
   it "has custom fields" do

From 8e561977287c133234bd09c43ed75c26abf01420 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Mon, 25 May 2020 11:08:47 +0530
Subject: [PATCH 1336/1830] UX: use "icon-picker" & "image-uploader" fields to
 set group flair. (#9779)

---
 .../app/components/group-flair-inputs.js      | 53 +++++++++----
 .../javascripts/discourse/app/models/group.js |  9 ++-
 .../components/group-flair-inputs.hbs         | 37 +++++++--
 .../discourse/app/widgets/avatar-flair.js     |  2 +-
 app/assets/stylesheets/common/base/group.scss | 16 ++++
 app/controllers/admin/groups_controller.rb    |  3 +-
 app/controllers/groups_controller.rb          |  3 +-
 .../onceoff/migrate_group_flair_images.rb     | 78 +++++++++++++++++++
 app/jobs/scheduled/clean_up_uploads.rb        |  2 +
 app/models/group.rb                           | 12 ++-
 app/serializers/group_show_serializer.rb      | 10 ++-
 config/locales/client.en.yml                  |  6 +-
 ...1043818_add_more_flair_columns_to_group.rb | 36 +++++++++
 lib/primary_group_lookup.rb                   |  4 +-
 lib/svg_sprite/svg_sprite.rb                  |  2 +-
 spec/components/svg_sprite/svg_sprite_spec.rb |  4 +-
 spec/jobs/migrate_group_flair_images_spec.rb  | 26 +++++++
 spec/requests/groups_controller_spec.rb       |  2 +-
 18 files changed, 270 insertions(+), 35 deletions(-)
 create mode 100644 app/jobs/onceoff/migrate_group_flair_images.rb
 create mode 100644 db/migrate/20200511043818_add_more_flair_columns_to_group.rb
 create mode 100644 spec/jobs/migrate_group_flair_images_spec.rb

diff --git a/app/assets/javascripts/discourse/app/components/group-flair-inputs.js b/app/assets/javascripts/discourse/app/components/group-flair-inputs.js
index 7b432e1271..b5ecb07bfc 100644
--- a/app/assets/javascripts/discourse/app/components/group-flair-inputs.js
+++ b/app/assets/javascripts/discourse/app/components/group-flair-inputs.js
@@ -2,11 +2,12 @@ import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { debounce } from "@ember/runloop";
 import Component from "@ember/component";
-import { observes } from "discourse-common/utils/decorators";
+import { on, observes } from "discourse-common/utils/decorators";
 import { escapeExpression } from "discourse/lib/utilities";
 import { convertIconClass } from "discourse-common/lib/icon-library";
 import { ajax } from "discourse/lib/ajax";
 import { htmlSafe } from "@ember/template";
+import { action } from "@ember/object";
 
 export default Component.extend({
   classNames: ["group-flair-inputs"],
@@ -16,23 +17,26 @@ export default Component.extend({
     return Discourse.getURL("/images/avatar.png");
   },
 
-  @discourseComputed("model.flair_url")
-  flairPreviewIcon(flairURL) {
-    return flairURL && /fa(r|b?)-/.test(flairURL);
+  @discourseComputed("model.flair_type")
+  flairPreviewIcon(flairType) {
+    return flairType && flairType === "icon";
   },
 
-  @discourseComputed("model.flair_url", "flairPreviewIcon")
-  flairPreviewIconUrl(flairURL, flairPreviewIcon) {
-    return flairPreviewIcon ? convertIconClass(flairURL) : "";
+  @discourseComputed("model.flair_icon")
+  flairPreviewIconUrl(flairIcon) {
+    return flairIcon ? convertIconClass(flairIcon) : "";
   },
 
-  @observes("model.flair_url")
-  _loadSVGIcon() {
-    debounce(this, this._loadIcon, 1000);
+  @on("didInsertElement")
+  @observes("model.flair_icon")
+  _loadSVGIcon(flairIcon) {
+    if (flairIcon) {
+      debounce(this, this._loadIcon, 1000);
+    }
   },
 
   _loadIcon() {
-    const icon = convertIconClass(this.get("model.flair_url")),
+    const icon = convertIconClass(this.model.flair_icon),
       c = "#svg-sprites",
       h = "ajax-icon-holder",
       singleIconEl = `${c} .${h}`;
@@ -50,9 +54,14 @@ export default Component.extend({
     }
   },
 
-  @discourseComputed("model.flair_url", "flairPreviewIcon")
-  flairPreviewImage(flairURL, flairPreviewIcon) {
-    return flairURL && !flairPreviewIcon;
+  @discourseComputed("model.flair_type")
+  flairPreviewImage(flairType) {
+    return flairType && flairType === "image";
+  },
+
+  @discourseComputed("model.flair_url")
+  flairImageUrl(flairURL) {
+    return flairURL && flairURL.match(/\//) ? flairURL : null;
   },
 
   @discourseComputed(
@@ -91,5 +100,21 @@ export default Component.extend({
   flairPreviewLabel(flairPreviewImage) {
     const key = flairPreviewImage ? "image" : "icon";
     return I18n.t(`groups.flair_preview_${key}`);
+  },
+
+  @action
+  setFlairImage(upload) {
+    this.model.setProperties({
+      flair_url: Discourse.getURL(upload.url),
+      flair_upload_id: upload.id
+    });
+  },
+
+  @action
+  removeFlairImage() {
+    this.model.setProperties({
+      flair_url: null,
+      flair_upload_id: null
+    });
   }
 });
diff --git a/app/assets/javascripts/discourse/app/models/group.js b/app/assets/javascripts/discourse/app/models/group.js
index ea4d03d015..142341499e 100644
--- a/app/assets/javascripts/discourse/app/models/group.js
+++ b/app/assets/javascripts/discourse/app/models/group.js
@@ -188,7 +188,8 @@ const Group = RestModel.extend({
       primary_group: !!this.primary_group,
       grant_trust_level: this.grant_trust_level,
       incoming_email: this.incoming_email,
-      flair_url: this.flair_url,
+      flair_icon: null,
+      flair_upload_id: null,
       flair_bg_color: this.flairBackgroundHexColor,
       flair_color: this.flairHexColor,
       bio_raw: this.bio_raw,
@@ -201,6 +202,12 @@ const Group = RestModel.extend({
       publish_read_state: this.publish_read_state
     };
 
+    if (this.flair_type === "icon") {
+      attrs["flair_icon"] = this.flair_icon;
+    } else if (this.flair_type === "image") {
+      attrs["flair_upload_id"] = this.flair_upload_id;
+    }
+
     if (!this.id) {
       attrs["usernames"] = this.usernames;
       attrs["owner_usernames"] = this.ownerUsernames;
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs
index 36dfc26202..f198b7bb63 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs
@@ -1,13 +1,36 @@
 <div class="control-group">
   <label class="control-label" for="flair_url">{{i18n "groups.flair_url"}}</label>
 
-  {{text-field name="flair_url"
-      class="input-xxlarge"
-      value=model.flair_url
-      placeholderKey="groups.flair_url_placeholder"}}
-  <div class="control-instructions">
-    {{i18n "groups.flair_url_description"}}
+  <div class="radios">
+    <label class="radio-label" for="avatar-flair">
+      {{radio-button name="avatar-flair" value="icon" selection=model.flair_type}}
+      <b>{{i18n "groups.flair_type.icon"}}</b>
+    </label>
+
+    <label class="radio-label" for="avatar-flair">
+      {{radio-button name="avatar-flair" value="image" selection=model.flair_type}}
+      <b>{{i18n "groups.flair_type.image"}}</b>
+    </label>
   </div>
+
+  {{#if flairPreviewIcon}}
+    {{icon-picker
+      name="icon"
+      value=model.flair_icon
+      options=(hash maximum=1)
+      onChange=(action (mut model.flair_icon))
+    }}
+  {{else if flairPreviewImage}}
+    {{image-uploader
+      imageUrl=flairImageUrl
+      onUploadDone=(action "setFlairImage")
+      onUploadDeleted=(action "removeFlairImage")
+      type="group_flair"
+      class="no-repeat contain-image"}}
+    <div class="control-instructions">
+      {{i18n "groups.flair_upload_description"}}
+    </div>
+  {{/if}}
 </div>
 
 <div class="control-group">
@@ -40,7 +63,7 @@
 
     {{#if flairPreviewImage}}
       <div class="avatar-flair demo {{flairPreviewClasses}}" style={{flairPreviewStyle}}></div>
-    {{else}}
+    {{else if flairPreviewIcon}}
       <div class="avatar-flair demo {{flairPreviewClasses}}" style={{flairPreviewStyle}} role="presentation">
         {{d-icon flairPreviewIconUrl}}
       </div>
diff --git a/app/assets/javascripts/discourse/app/widgets/avatar-flair.js b/app/assets/javascripts/discourse/app/widgets/avatar-flair.js
index 0da095de00..94e015fbc4 100644
--- a/app/assets/javascripts/discourse/app/widgets/avatar-flair.js
+++ b/app/assets/javascripts/discourse/app/widgets/avatar-flair.js
@@ -8,7 +8,7 @@ createWidget("avatar-flair", {
   isIcon(attrs) {
     return (
       attrs.primary_group_flair_url &&
-      attrs.primary_group_flair_url.includes("fa-")
+      !attrs.primary_group_flair_url.includes("/")
     );
   },
 
diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss
index 013acd086c..998a82a0e9 100644
--- a/app/assets/stylesheets/common/base/group.scss
+++ b/app/assets/stylesheets/common/base/group.scss
@@ -153,6 +153,22 @@ table.group-members {
       background-color: #f4f4f4;
     }
   }
+
+  .radios {
+    margin-bottom: 5px;
+  }
+
+  .radio-label {
+    display: inline-flex;
+    padding-right: 10px;
+    margin-bottom: 0;
+    align-items: center;
+  }
+
+  .uploaded-image-preview {
+    height: 75px;
+    width: 275px;
+  }
 }
 
 .group-form-save {
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 50cef29164..32114f3369 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -163,7 +163,8 @@ class Admin::GroupsController < Admin::AdminController
       :primary_group,
       :grant_trust_level,
       :incoming_email,
-      :flair_url,
+      :flair_icon,
+      :flair_upload_id,
       :flair_bg_color,
       :flair_color,
       :bio_raw,
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 2716282d6a..3d4b828ad1 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -521,7 +521,8 @@ class GroupsController < ApplicationController
           mentionable_level
           messageable_level
           title
-          flair_url
+          flair_icon
+          flair_upload_id
           flair_bg_color
           flair_color
           bio_raw
diff --git a/app/jobs/onceoff/migrate_group_flair_images.rb b/app/jobs/onceoff/migrate_group_flair_images.rb
new file mode 100644
index 0000000000..d400cfa17d
--- /dev/null
+++ b/app/jobs/onceoff/migrate_group_flair_images.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Jobs
+  class MigrateGroupFlairImages < ::Jobs::Onceoff
+    def execute_onceoff(args)
+      return if Group.column_names.exclude?("flair_url")
+
+      Group.where.not(flair_url: nil).each do |group|
+        if group.flair_upload.present?
+          g.update_column(:flair_url, nil)
+          next
+        end
+
+        old_url = group[:flair_url]
+        group_name = group.name
+
+        count = 0
+        file = nil
+        sleep_interval = 5
+
+        loop do
+          url = UrlHelper.absolute_without_cdn(old_url)
+
+          begin
+            file = FileHelper.download(
+              url,
+              max_file_size: [
+                SiteSetting.max_image_size_kb.kilobytes,
+                20.megabytes
+              ].max,
+              tmp_file_name: 'tmp_group_flair_upload',
+              skip_rate_limit: true,
+              follow_redirect: true
+            )
+          rescue OpenURI::HTTPError,
+                 OpenSSL::SSL::SSLError,
+                 Net::OpenTimeout,
+                 Net::ReadTimeout,
+                 Errno::ECONNREFUSED,
+                 EOFError,
+                 SocketError,
+                 Discourse::InvalidParameters => e
+
+            logger.warn(
+              "Error encountered when trying to download file " +
+              "for group '#{group_name}'.\n#{e.class}: #{e.message}\n#{e.backtrace.join("\n")}"
+            )
+          end
+
+          count += 1
+          break if file || (file.blank? && count >= 3)
+
+          logger.info(
+            "Failed to download upload from #{url} for group '#{group_name}'. Retrying..."
+          )
+
+          sleep(count * sleep_interval)
+        end
+
+        next if file.blank?
+
+        upload = UploadCreator.new(
+          file,
+          "group_#{group_name}",
+          origin: UrlHelper.absolute(old_url)
+        ).create_for(Discourse.system_user.id)
+
+        group.update_columns(flair_upload_id: upload.id, flair_url: nil) if upload.present?
+      end
+    end
+
+    private
+
+    def logger
+      Rails.logger
+    end
+  end
+end
diff --git a/app/jobs/scheduled/clean_up_uploads.rb b/app/jobs/scheduled/clean_up_uploads.rb
index acf986a414..95f528c544 100644
--- a/app/jobs/scheduled/clean_up_uploads.rb
+++ b/app/jobs/scheduled/clean_up_uploads.rb
@@ -68,6 +68,7 @@ module Jobs
         .joins("LEFT JOIN custom_emojis ce ON ce.upload_id = uploads.id")
         .joins("LEFT JOIN theme_fields tf ON tf.upload_id = uploads.id")
         .joins("LEFT JOIN user_exports ue ON ue.upload_id = uploads.id")
+        .joins("LEFT JOIN groups g ON g.flair_upload_id = uploads.id")
         .where("pu.upload_id IS NULL")
         .where("u.uploaded_avatar_id IS NULL")
         .where("ua.gravatar_upload_id IS NULL AND ua.custom_upload_id IS NULL")
@@ -76,6 +77,7 @@ module Jobs
         .where("ce.upload_id IS NULL")
         .where("tf.upload_id IS NULL")
         .where("ue.upload_id IS NULL")
+        .where("g.flair_upload_id IS NULL")
         .where("ss.value IS NULL")
 
       result = result.where("uploads.url NOT IN (?)", ignore_urls) if ignore_urls.present?
diff --git a/app/models/group.rb b/app/models/group.rb
index 80c6080bc1..b2d37283ef 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -27,6 +27,8 @@ class Group < ActiveRecord::Base
   has_many :category_reviews, class_name: 'Category', foreign_key: :reviewable_by_group_id, dependent: :nullify
   has_many :reviewables, foreign_key: :reviewable_by_group_id, dependent: :nullify
 
+  belongs_to :flair_upload, class_name: 'Upload'
+
   has_and_belongs_to_many :web_hooks
 
   before_save :downcase_incoming_email
@@ -62,7 +64,6 @@ class Group < ActiveRecord::Base
   validate :automatic_membership_email_domains_format_validator
   validate :incoming_email_validator
   validate :can_allow_membership_requests, if: :allow_membership_requests
-  validates :flair_url, url: true, if: Proc.new { |g| g.flair_url && g.flair_url.exclude?('fa-') }
   validate :validate_grant_trust_level, if: :will_save_change_to_grant_trust_level?
 
   AUTO_GROUPS = {
@@ -741,6 +742,15 @@ class Group < ActiveRecord::Base
     end
   end
 
+  def flair_type
+    return :icon if flair_icon.present?
+    return :image if flair_upload_id.present?
+  end
+
+  def flair_url
+    flair_icon.presence || flair_upload&.url || self[:flair_url].presence
+  end
+
   protected
 
   def name_format_validator
diff --git a/app/serializers/group_show_serializer.rb b/app/serializers/group_show_serializer.rb
index f1440c1e9d..d3400df658 100644
--- a/app/serializers/group_show_serializer.rb
+++ b/app/serializers/group_show_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class GroupShowSerializer < BasicGroupSerializer
-  attributes :is_group_user, :is_group_owner, :is_group_owner_display, :mentionable, :messageable
+  attributes :is_group_user, :is_group_owner, :is_group_owner_display, :mentionable, :messageable, :flair_icon, :flair_type
 
   def include_is_group_user?
     authenticated?
@@ -43,6 +43,14 @@ class GroupShowSerializer < BasicGroupSerializer
     Group.messageable(scope.user).exists?(id: object.id)
   end
 
+  def include_flair_icon?
+    is_group_owner && flair_icon.present?
+  end
+
+  def include_flair_type?
+    is_group_owner && flair_type.present?
+  end
+
   private
 
   def authenticated?
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 3c3618ef96..673cb43524 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -751,14 +751,16 @@ en:
           title: "Muted"
           description: "You will not be notified of anything about messages in this group."
       flair_url: "Avatar Flair Image"
-      flair_url_placeholder: "(Optional) Image URL or Font Awesome class"
-      flair_url_description: 'Use square images no smaller than 20px by 20px or FontAwesome icons (accepted formats: "fa-icon", "far fa-icon" or "fab fa-icon").'
+      flair_upload_description: "Use square images no smaller than 20px by 20px."
       flair_bg_color: "Avatar Flair Background Color"
       flair_bg_color_placeholder: "(Optional) Hex color value"
       flair_color: "Avatar Flair Color"
       flair_color_placeholder: "(Optional) Hex color value"
       flair_preview_icon: "Preview Icon"
       flair_preview_image: "Preview Image"
+      flair_type:
+        icon: "Select an icon"
+        image: "Upload an image"
 
     user_action_groups:
       "1": "Likes"
diff --git a/db/migrate/20200511043818_add_more_flair_columns_to_group.rb b/db/migrate/20200511043818_add_more_flair_columns_to_group.rb
new file mode 100644
index 0000000000..70c1b53043
--- /dev/null
+++ b/db/migrate/20200511043818_add_more_flair_columns_to_group.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class AddMoreFlairColumnsToGroup < ActiveRecord::Migration[6.0]
+  def change
+    add_column :groups, :flair_icon, :string
+    add_column :groups, :flair_upload_id, :integer
+
+    reversible do |dir|
+      dir.up do
+        DB.exec(
+          <<~SQL
+            UPDATE groups SET flair_icon = REPLACE(REPLACE(flair_url, 'fas fa-', ''), ' fa-', '-')
+            WHERE flair_url LIKE 'fa%'
+          SQL
+        )
+
+        DB.exec(
+          <<~SQL
+            UPDATE groups g1
+            SET flair_upload_id = u.id
+            FROM groups g2
+            INNER JOIN uploads u ON g2.flair_url ~ CONCAT('\/', u.sha1, '[\.\w]*')
+            WHERE g1.id = g2.id
+          SQL
+        )
+
+        DB.exec(
+          <<~SQL
+            UPDATE groups SET flair_url = NULL
+            WHERE flair_icon IS NOT NULL OR flair_upload_id IS NOT NULL
+          SQL
+        )
+      end
+    end
+  end
+end
diff --git a/lib/primary_group_lookup.rb b/lib/primary_group_lookup.rb
index 4dd9ce1020..8110a3792b 100644
--- a/lib/primary_group_lookup.rb
+++ b/lib/primary_group_lookup.rb
@@ -13,7 +13,7 @@ class PrimaryGroupLookup
   private
 
   def self.lookup_columns
-    @lookup_columns ||= %i{id name flair_url flair_bg_color flair_color}
+    @lookup_columns ||= %i{id name flair_icon flair_upload_id flair_bg_color flair_color}
   end
 
   def users
@@ -29,7 +29,7 @@ class PrimaryGroupLookup
     group_ids = users_with_primary_group.map(&:primary_group_id)
     group_ids.uniq!
 
-    Group.where(id: group_ids).select(self.class.lookup_columns)
+    Group.includes(:flair_upload).where(id: group_ids).select(self.class.lookup_columns)
       .each { |g| group_lookup[g.id] = g }
 
     hash = {}
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index 918a28435c..90571781d1 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -388,7 +388,7 @@ License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL
   end
 
   def self.group_icons
-    Group.where("flair_url LIKE '%fa-%'").pluck(:flair_url).uniq
+    Group.pluck(:flair_icon).uniq
   end
 
   def self.theme_icons(theme_ids)
diff --git a/spec/components/svg_sprite/svg_sprite_spec.rb b/spec/components/svg_sprite/svg_sprite_spec.rb
index 34e4d59b13..4a3100a5aa 100644
--- a/spec/components/svg_sprite/svg_sprite_spec.rb
+++ b/spec/components/svg_sprite/svg_sprite_spec.rb
@@ -216,12 +216,12 @@ describe SvgSprite do
   end
 
   it "includes Font Awesome 4.7 icons as group flair" do
-    group = Fabricate(:group, flair_url: "fa-air-freshener")
+    group = Fabricate(:group, flair_icon: "fa-air-freshener")
     expect(SvgSprite.bundle).to match(/air-freshener/)
   end
 
   it "includes Font Awesome 5 icons as group flair" do
-    group = Fabricate(:group, flair_url: "far fa-building")
+    group = Fabricate(:group, flair_icon: "far fa-building")
     expect(SvgSprite.bundle).to match(/building/)
   end
 end
diff --git a/spec/jobs/migrate_group_flair_images_spec.rb b/spec/jobs/migrate_group_flair_images_spec.rb
new file mode 100644
index 0000000000..a06b025d26
--- /dev/null
+++ b/spec/jobs/migrate_group_flair_images_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Jobs::MigrateGroupFlairImages do
+  let(:image_url) { "https://omg.aws.somestack/test.png" }
+  let(:group) { Fabricate(:group, flair_url: image_url) }
+
+  before do
+    stub_request(:get, image_url).to_return(
+      status: 200, body: file_from_fixtures("smallest.png").read
+    )
+  end
+
+  it 'should migrate to the new group `flair_upload_id` column correctly' do
+    group
+
+    expect do
+      described_class.new.execute_onceoff({})
+    end.to change { Upload.count }.by(1)
+
+    group.reload
+    expect(group.flair_upload).to eq(Upload.last)
+    expect(group[:flair_url]).to eq(nil)
+  end
+end
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index ff387a2ff3..862b9a631d 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -674,7 +674,7 @@ describe GroupsController do
               incoming_email: 'test@mail.org',
               flair_bg_color: 'FFF',
               flair_color: 'BBB',
-              flair_url: 'fa-adjust',
+              flair_icon: 'fa-adjust',
               bio_raw: 'testing',
               full_name: 'awesome team',
               public_admission: true,

From 32d13ab97f4abe35daf30f1e29a11f4003371862 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 25 May 2020 15:43:55 +1000
Subject: [PATCH 1337/1830] DEV: Bump rack-mini-profiler from 2.0.1 to 2.0.2
 (#9865)

Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.0.1...v2.0.2)

This is a simple fix to restore client timings in the UI
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index db4b88d863..89f8108e82 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -266,7 +266,7 @@ GEM
       nio4r (~> 2.0)
     r2 (0.2.7)
     rack (2.2.2)
-    rack-mini-profiler (2.0.1)
+    rack-mini-profiler (2.0.2)
       rack (>= 1.2.0)
     rack-protection (2.0.8.1)
       rack

From e31adef32dea0cd614204a10766c2cc2ee0d3974 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Mon, 25 May 2020 08:46:02 +0300
Subject: [PATCH 1338/1830] FIX: Keep composer title and reply when switching
 to PM (#9851)

---
 .../addon/components/composer-actions.js       |  1 +
 .../acceptance/composer-actions-test.js        | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/app/assets/javascripts/select-kit/addon/components/composer-actions.js b/app/assets/javascripts/select-kit/addon/components/composer-actions.js
index adaccf2953..98cb3fc832 100644
--- a/app/assets/javascripts/select-kit/addon/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/addon/components/composer-actions.js
@@ -328,6 +328,7 @@ export default DropdownSelectBoxComponent.extend({
           this.composerModel.getProperties(
             "draftKey",
             "draftSequence",
+            "title",
             "reply",
             "disableScopedCategory"
           ),
diff --git a/test/javascripts/acceptance/composer-actions-test.js b/test/javascripts/acceptance/composer-actions-test.js
index fff2e804f6..95060ba67a 100644
--- a/test/javascripts/acceptance/composer-actions-test.js
+++ b/test/javascripts/acceptance/composer-actions-test.js
@@ -19,6 +19,24 @@ acceptance("Composer Actions", {
   }
 });
 
+QUnit.test(
+  "creating new topic and then reply_as_private_message keeps attributes",
+  async assert => {
+    await visit("/");
+    await click("button#create-topic");
+
+    await fillIn("#reply-title", "this is the title");
+    await fillIn(".d-editor-input", "this is the reply");
+
+    const composerActions = selectKit(".composer-actions");
+    await composerActions.expand();
+    await composerActions.selectRowByValue("reply_as_private_message");
+
+    assert.ok(find("#reply-title").val(), "this is the title");
+    assert.ok(find(".d-editor-input").val(), "this is the reply");
+  }
+);
+
 QUnit.test("replying to post", async assert => {
   const composerActions = selectKit(".composer-actions");
 

From 098c9e595025e776d5bad78b6a69b0a4ff22d17f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 25 May 2020 15:50:56 +1000
Subject: [PATCH 1339/1830] Build(deps-dev): Bump rspec-rails from 4.0.0 to
 4.0.1 (#9804)

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.0...v4.0.1)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 89f8108e82..26cce0e8f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -329,7 +329,7 @@ GEM
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-rails (4.0.0)
+    rspec-rails (4.0.1)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
       railties (>= 4.2)

From c011b817b28c7113c0c1b0880b706cb05721e796 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 25 May 2020 16:25:42 +1000
Subject: [PATCH 1340/1830] FIX: do not fallback to flair_url column

flair_url is not loaded by our query anymore so avoid falling back
to the old value
---
 app/models/group.rb       |  2 +-
 spec/models/group_spec.rb | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/app/models/group.rb b/app/models/group.rb
index b2d37283ef..b71906bb79 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -748,7 +748,7 @@ class Group < ActiveRecord::Base
   end
 
   def flair_url
-    flair_icon.presence || flair_upload&.url || self[:flair_url].presence
+    flair_icon.presence || flair_upload&.url
   end
 
   protected
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index ddc3224e33..42e50cedf4 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -972,24 +972,6 @@ describe Group do
     end
   end
 
-  it "allows Font Awesome 4.7 syntax as group avatar flair" do
-    group = Fabricate(:group)
-    group.flair_url = "fa-air-freshener"
-    group.save
-
-    group = Group.find(group.id)
-    expect(group.flair_url).to eq("fa-air-freshener")
-  end
-
-  it "allows Font Awesome 5 syntax as group avatar flair" do
-    group = Fabricate(:group)
-    group.flair_url = "fab fa-bandcamp"
-    group.save
-
-    group = Group.find(group.id)
-    expect(group.flair_url).to eq("fab fa-bandcamp")
-  end
-
   context "Unicode usernames and group names" do
     before { SiteSetting.unicode_usernames = true }
 

From 505122bb456beaca5bf511de95f3df62077409ec Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Mon, 25 May 2020 13:11:00 +0530
Subject: [PATCH 1341/1830] FIX: skip onceoff job for groups with invalid flair
 URL.

---
 app/jobs/onceoff/migrate_group_flair_images.rb |  5 ++++-
 spec/jobs/migrate_group_flair_images_spec.rb   | 15 +++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/jobs/onceoff/migrate_group_flair_images.rb b/app/jobs/onceoff/migrate_group_flair_images.rb
index d400cfa17d..75616fd745 100644
--- a/app/jobs/onceoff/migrate_group_flair_images.rb
+++ b/app/jobs/onceoff/migrate_group_flair_images.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'uri'
 
 module Jobs
   class MigrateGroupFlairImages < ::Jobs::Onceoff
@@ -12,6 +13,8 @@ module Jobs
         end
 
         old_url = group[:flair_url]
+        next if old_url.blank? || old_url !~ URI::regexp
+
         group_name = group.name
 
         count = 0
@@ -42,7 +45,7 @@ module Jobs
                  Discourse::InvalidParameters => e
 
             logger.warn(
-              "Error encountered when trying to download file " +
+              "Error encountered when trying to download from URL '#{old_url}' " +
               "for group '#{group_name}'.\n#{e.class}: #{e.message}\n#{e.backtrace.join("\n")}"
             )
           end
diff --git a/spec/jobs/migrate_group_flair_images_spec.rb b/spec/jobs/migrate_group_flair_images_spec.rb
index a06b025d26..a1c0c51252 100644
--- a/spec/jobs/migrate_group_flair_images_spec.rb
+++ b/spec/jobs/migrate_group_flair_images_spec.rb
@@ -4,16 +4,21 @@ require 'rails_helper'
 
 RSpec.describe Jobs::MigrateGroupFlairImages do
   let(:image_url) { "https://omg.aws.somestack/test.png" }
-  let(:group) { Fabricate(:group, flair_url: image_url) }
 
   before do
     stub_request(:get, image_url).to_return(
       status: 200, body: file_from_fixtures("smallest.png").read
     )
+    @orig_logger = Rails.logger
+    Rails.logger = @fake_logger = FakeLogger.new
+  end
+
+  after do
+    Rails.logger = @orig_logger
   end
 
   it 'should migrate to the new group `flair_upload_id` column correctly' do
-    group
+    group = Fabricate(:group, flair_url: image_url)
 
     expect do
       described_class.new.execute_onceoff({})
@@ -23,4 +28,10 @@ RSpec.describe Jobs::MigrateGroupFlairImages do
     expect(group.flair_upload).to eq(Upload.last)
     expect(group[:flair_url]).to eq(nil)
   end
+
+  it 'should skip groups with invalid flair URLs' do
+    group = Fabricate(:group, flair_url: "abc")
+    described_class.new.execute_onceoff({})
+    expect(Rails.logger.warnings.count).to eq(0)
+  end
 end

From 48fb354bce974513808198e50154913eebe8431b Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 25 May 2020 18:19:47 +1000
Subject: [PATCH 1342/1830] PERF: avoid traversing DOM in loadScript

Once a script is loaded operation should be very fast.

This optimisation avoids a DOM traverse and call to getURL on
every invocation.
---
 .../discourse/app/lib/load-script.js          | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/load-script.js b/app/assets/javascripts/discourse/app/lib/load-script.js
index 1efec2ea78..7c8dfd851f 100644
--- a/app/assets/javascripts/discourse/app/lib/load-script.js
+++ b/app/assets/javascripts/discourse/app/lib/load-script.js
@@ -45,34 +45,40 @@ export default function loadScript(url, opts) {
 
   opts = opts || {};
 
+  if (_loaded[url]) {
+    return Promise.resolve();
+  }
+
   // Scripts should always load from CDN
   // CSS is type text, to accept it from a CDN we would need to handle CORS
-  url = opts.css ? Discourse.getURL(url) : Discourse.getURLWithCDN(url);
+  const fullUrl = opts.css
+    ? Discourse.getURL(url)
+    : Discourse.getURLWithCDN(url);
 
   $("script").each((i, tag) => {
     const src = tag.getAttribute("src");
 
-    if (src && src !== url && !_loading[src]) {
+    if (src && src !== fullUrl && !_loading[src]) {
       _loaded[src] = true;
     }
   });
 
   return new Promise(function(resolve) {
     // If we already loaded this url
-    if (_loaded[url]) {
+    if (_loaded[fullUrl]) {
       return resolve();
     }
-    if (_loading[url]) {
-      return _loading[url].then(resolve);
+    if (_loading[fullUrl]) {
+      return _loading[fullUrl].then(resolve);
     }
 
     let done;
-    _loading[url] = new Promise(function(_done) {
+    _loading[fullUrl] = new Promise(function(_done) {
       done = _done;
     });
 
-    _loading[url].then(function() {
-      delete _loading[url];
+    _loading[fullUrl].then(function() {
+      delete _loading[fullUrl];
     });
 
     const cb = function(data) {
@@ -82,17 +88,18 @@ export default function loadScript(url, opts) {
       done();
       resolve();
       _loaded[url] = true;
+      _loaded[fullUrl] = true;
     };
 
     if (opts.css) {
       ajax({
-        url: url,
+        url: fullUrl,
         dataType: "text",
         cache: true
       }).then(cb);
     } else {
       // Always load JavaScript with script tag to avoid Content Security Policy inline violations
-      loadWithTag(url, cb);
+      loadWithTag(fullUrl, cb);
     }
   });
 }

From 631024ae5df9c84fe315bbb5b936f99413d7e319 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Mon, 25 May 2020 11:48:54 +0200
Subject: [PATCH 1343/1830] FEATURE: Permalinks for tags

---
 .../admin/components/permalink-form.js        |  1 +
 .../admin/templates/permalinks.hbs            |  3 ++
 .../admin/permalinks_controller.rb            |  5 ++
 app/models/permalink.rb                       |  5 +-
 app/serializers/permalink_serializer.rb       | 11 +++-
 config/locales/client.en.yml                  |  3 +-
 .../20200522204356_add_tag_to_permalink.rb    |  7 +++
 spec/models/permalink_spec.rb                 | 19 +++++++
 .../admin/permalinks_controller_spec.rb       | 54 +++++++++++++++++++
 9 files changed, 105 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20200522204356_add_tag_to_permalink.rb

diff --git a/app/assets/javascripts/admin/components/permalink-form.js b/app/assets/javascripts/admin/components/permalink-form.js
index 0a15f51f57..81e9346d6f 100644
--- a/app/assets/javascripts/admin/components/permalink-form.js
+++ b/app/assets/javascripts/admin/components/permalink-form.js
@@ -17,6 +17,7 @@ export default Component.extend({
       { id: "topic_id", name: I18n.t("admin.permalink.topic_id") },
       { id: "post_id", name: I18n.t("admin.permalink.post_id") },
       { id: "category_id", name: I18n.t("admin.permalink.category_id") },
+      { id: "tag_name", name: I18n.t("admin.permalink.tag_name") },
       { id: "external_url", name: I18n.t("admin.permalink.external_url") }
     ];
   },
diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs
index dcfca2a918..1424e530b9 100644
--- a/app/assets/javascripts/admin/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/templates/permalinks.hbs
@@ -32,6 +32,9 @@
               {{#if pl.category_id}}
                 {{category-link pl.category}}
               {{/if}}
+              {{#if pl.tag_id}}
+                <a href={{pl.tag_url}}>{{pl.tag_name}}</a>
+              {{/if}}
               {{#if pl.external_url}}
                 {{#if pl.linkIsExternal}}
                   {{d-icon "external-link-alt"}}
diff --git a/app/controllers/admin/permalinks_controller.rb b/app/controllers/admin/permalinks_controller.rb
index 4b04249059..4e60a1ad01 100644
--- a/app/controllers/admin/permalinks_controller.rb
+++ b/app/controllers/admin/permalinks_controller.rb
@@ -15,6 +15,11 @@ class Admin::PermalinksController < Admin::AdminController
     params.require(:permalink_type)
     params.require(:permalink_type_value)
 
+    if params[:permalink_type] == "tag_name"
+      params[:permalink_type] = "tag_id"
+      params[:permalink_type_value] = Tag.find_by_name(params[:permalink_type_value])&.id
+    end
+
     permalink = Permalink.new(:url => params[:url], params[:permalink_type] => params[:permalink_type_value])
     if permalink.save
       render_serialized(permalink, PermalinkSerializer)
diff --git a/app/models/permalink.rb b/app/models/permalink.rb
index 925f640f7e..9e1e2d1a4e 100644
--- a/app/models/permalink.rb
+++ b/app/models/permalink.rb
@@ -4,6 +4,7 @@ class Permalink < ActiveRecord::Base
   belongs_to :topic
   belongs_to :post
   belongs_to :category
+  belongs_to :tag
 
   before_validation :normalize_url
 
@@ -80,12 +81,13 @@ class Permalink < ActiveRecord::Base
     return "#{Discourse::base_uri}#{post.url}" if post
     return topic.relative_url if topic
     return "#{category.url}/#{category.id}" if category
+    return tag.full_url if tag
     nil
   end
 
   def self.filter_by(url = nil)
     permalinks = Permalink
-      .includes(:topic, :post, :category)
+      .includes(:topic, :post, :category, :tag)
       .order('permalinks.created_at desc')
 
     permalinks.where!('url ILIKE :url OR external_url ILIKE :url', url: "%#{url}%") if url.present?
@@ -106,6 +108,7 @@ end
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
 #  external_url :string(1000)
+#  tag_id       :integer
 #
 # Indexes
 #
diff --git a/app/serializers/permalink_serializer.rb b/app/serializers/permalink_serializer.rb
index 89189100c4..78b46fd9a7 100644
--- a/app/serializers/permalink_serializer.rb
+++ b/app/serializers/permalink_serializer.rb
@@ -3,7 +3,8 @@
 class PermalinkSerializer < ApplicationSerializer
   attributes :id, :url, :topic_id, :topic_title, :topic_url,
              :post_id, :post_url, :post_number, :post_topic_title,
-             :category_id, :category_name, :category_url, :external_url
+             :category_id, :category_name, :category_url, :external_url,
+             :tag_id, :tag_name, :tag_url
 
   def topic_title
     object&.topic&.title
@@ -33,4 +34,12 @@ class PermalinkSerializer < ApplicationSerializer
   def category_url
     object&.category&.url
   end
+
+  def tag_name
+    object&.tag&.name
+  end
+
+  def tag_url
+    object&.tag&.full_url
+  end
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 673cb43524..a8ff521a7a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -336,7 +336,7 @@ en:
         tomorrow_with_time: "tomorrow at %{time}"
         at_time: "at %{date_time}"
         existing_reminder: "You have a reminder set for this bookmark which will be sent"
-    
+
     copy_codeblock:
       copied: "copied!"
 
@@ -4715,6 +4715,7 @@ en:
         post_title: "Post"
         category_id: "Category ID"
         category_title: "Category"
+        tag_name: "Tag name"
         external_url: "External URL"
         destination: "Destination"
         delete_confirm: Are you sure you want to delete this permalink?
diff --git a/db/migrate/20200522204356_add_tag_to_permalink.rb b/db/migrate/20200522204356_add_tag_to_permalink.rb
new file mode 100644
index 0000000000..d48a3d7fdf
--- /dev/null
+++ b/db/migrate/20200522204356_add_tag_to_permalink.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddTagToPermalink < ActiveRecord::Migration[6.0]
+  def change
+    add_column :permalinks, :tag_id, :integer
+  end
+end
diff --git a/spec/models/permalink_spec.rb b/spec/models/permalink_spec.rb
index 8cd9d30a46..869d38fba5 100644
--- a/spec/models/permalink_spec.rb
+++ b/spec/models/permalink_spec.rb
@@ -32,6 +32,7 @@ describe Permalink do
     let(:topic)           { Fabricate(:topic) }
     let(:post)            { Fabricate(:post, topic: topic) }
     let(:category)        { Fabricate(:category) }
+    let(:tag)             { Fabricate(:tag) }
     subject(:target_url)  { permalink.target_url }
 
     it "returns a topic url when topic_id is set" do
@@ -77,6 +78,24 @@ describe Permalink do
       expect(target_url).to eq(post.url)
     end
 
+    it "returns a tag url when tag_id is set" do
+      permalink.tag_id = tag.id
+      expect(target_url).to eq(tag.full_url)
+    end
+
+    it "returns nil when tag_id is set but tag is not found" do
+      permalink.tag_id = 99999
+      expect(target_url).to eq(nil)
+    end
+
+    it "returns a post url when topic_id, post_id, category_id and tag_id are all set for some reason" do
+      permalink.post_id = post.id
+      permalink.topic_id = topic.id
+      permalink.category_id = category.id
+      permalink.tag_id = tag.id
+      expect(target_url).to eq(post.url)
+    end
+
     it "returns nil when nothing is set" do
       expect(target_url).to eq(nil)
     end
diff --git a/spec/requests/admin/permalinks_controller_spec.rb b/spec/requests/admin/permalinks_controller_spec.rb
index a84a0b2935..ad3344b27a 100644
--- a/spec/requests/admin/permalinks_controller_spec.rb
+++ b/spec/requests/admin/permalinks_controller_spec.rb
@@ -54,4 +54,58 @@ describe Admin::PermalinksController do
       expect(result.length).to eq(3)
     end
   end
+
+  describe "#create" do
+    it "works for topics" do
+      topic = Fabricate(:topic)
+
+      post "/admin/permalinks.json", params: {
+        url: "/topics/771",
+        permalink_type: "topic_id",
+        permalink_type_value: topic.id
+      }
+
+      expect(response.status).to eq(200)
+      expect(Permalink.last).to have_attributes(url: "topics/771", topic_id: topic.id, post_id: nil, category_id: nil, tag_id: nil)
+    end
+
+    it "works for posts" do
+      some_post = Fabricate(:post)
+
+      post "/admin/permalinks.json", params: {
+        url: "/topics/771/8291",
+        permalink_type: "post_id",
+        permalink_type_value: some_post.id
+      }
+
+      expect(response.status).to eq(200)
+      expect(Permalink.last).to have_attributes(url: "topics/771/8291", topic_id: nil, post_id: some_post.id, category_id: nil, tag_id: nil)
+    end
+
+    it "works for categories" do
+      category = Fabricate(:category)
+
+      post "/admin/permalinks.json", params: {
+        url: "/forums/11",
+        permalink_type: "category_id",
+        permalink_type_value: category.id
+      }
+
+      expect(response.status).to eq(200)
+      expect(Permalink.last).to have_attributes(url: "forums/11", topic_id: nil, post_id: nil, category_id: category.id, tag_id: nil)
+    end
+
+    it "works for tags" do
+      tag = Fabricate(:tag)
+
+      post "/admin/permalinks.json", params: {
+        url: "/forums/12",
+        permalink_type: "tag_name",
+        permalink_type_value: tag.name
+      }
+
+      expect(response.status).to eq(200)
+      expect(Permalink.last).to have_attributes(url: "forums/12", topic_id: nil, post_id: nil, category_id: nil, tag_id: tag.id)
+    end
+  end
 end

From 2be79d94f5226099d287aa9c69e5a2814baff420 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 25 May 2020 19:00:56 +0530
Subject: [PATCH 1344/1830] FIX: when creating new PM username/groupname should
 be case-insensitive

https://meta.discourse.org/t/case-sensitivity-in-links-to-groupname/147596
https://meta.discourse.org/t/remove-case-sensitive-in-adding-users-to-a-message/151275
---
 app/controllers/posts_controller.rb    | 4 ++--
 lib/topic_creator.rb                   | 4 ++--
 spec/requests/posts_controller_spec.rb | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index c440d630f5..4830b3b979 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -747,8 +747,8 @@ class PostsController < ApplicationController
     end
 
     if recipients
-      recipients = recipients.split(",")
-      groups = Group.messageable(current_user).where('name in (?)', recipients).pluck('name')
+      recipients = recipients.split(",").map(&:downcase)
+      groups = Group.messageable(current_user).where('lower(name) in (?)', recipients).pluck('name')
       recipients -= groups
       emails = recipients.select { |user| user.match(/@/) }
       recipients -= emails
diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb
index 41558784f3..66108966f2 100644
--- a/lib/topic_creator.rb
+++ b/lib/topic_creator.rb
@@ -208,10 +208,10 @@ class TopicCreator
   def add_users(topic, usernames)
     return unless usernames
 
-    names = usernames.split(',').flatten
+    names = usernames.split(',').map(&:downcase).flatten
     len = 0
 
-    User.includes(:user_option).where(username: names).find_each do |user|
+    User.includes(:user_option).where(username_lower: names).find_each do |user|
       check_can_send_permission!(topic, user)
       @added_users << user
       topic.topic_allowed_users.build(user_id: user.id)
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index ff355ada96..910cb5b95d 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -825,7 +825,7 @@ describe PostsController do
         post "/posts.json", params: {
           raw: 'I can haz a test',
           title: 'I loves my test',
-          target_recipients: group.name,
+          target_recipients: "test_Group",
           archetype: Archetype.private_message
         }
 
@@ -965,13 +965,13 @@ describe PostsController do
 
       it 'creates a private post' do
         user_2 = Fabricate(:user)
-        user_3 = Fabricate(:user)
+        user_3 = Fabricate(:user, username: "foo_bar")
 
         post "/posts.json", params: {
           raw: 'this is the test content',
           archetype: 'private_message',
           title: "this is some post",
-          target_recipients: "#{user_2.username},#{user_3.username}"
+          target_recipients: "#{user_2.username},Foo_Bar"
         }
 
         expect(response.status).to eq(200)

From 30849c8b37508e5f9f473f76f5f7c86bfe3e3179 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 25 May 2020 19:20:15 +0530
Subject: [PATCH 1345/1830] FIX: no need for downcasing second time

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

diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb
index 66108966f2..76ba682cb3 100644
--- a/lib/topic_creator.rb
+++ b/lib/topic_creator.rb
@@ -208,7 +208,7 @@ class TopicCreator
   def add_users(topic, usernames)
     return unless usernames
 
-    names = usernames.split(',').map(&:downcase).flatten
+    names = usernames.split(',').flatten
     len = 0
 
     User.includes(:user_option).where(username_lower: names).find_each do |user|

From 302b37c805c74a255677694d4818d678fc32f761 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 25 May 2020 20:10:14 +0530
Subject: [PATCH 1346/1830] Revert "FIX: when creating new PM
 username/groupname should be case-insensitive"

This reverts commit 2be79d94f5226099d287aa9c69e5a2814baff420.

This is affecting multiple code path. Investigating.
---
 app/controllers/posts_controller.rb    | 4 ++--
 lib/topic_creator.rb                   | 2 +-
 spec/requests/posts_controller_spec.rb | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 4830b3b979..c440d630f5 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -747,8 +747,8 @@ class PostsController < ApplicationController
     end
 
     if recipients
-      recipients = recipients.split(",").map(&:downcase)
-      groups = Group.messageable(current_user).where('lower(name) in (?)', recipients).pluck('name')
+      recipients = recipients.split(",")
+      groups = Group.messageable(current_user).where('name in (?)', recipients).pluck('name')
       recipients -= groups
       emails = recipients.select { |user| user.match(/@/) }
       recipients -= emails
diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb
index 76ba682cb3..41558784f3 100644
--- a/lib/topic_creator.rb
+++ b/lib/topic_creator.rb
@@ -211,7 +211,7 @@ class TopicCreator
     names = usernames.split(',').flatten
     len = 0
 
-    User.includes(:user_option).where(username_lower: names).find_each do |user|
+    User.includes(:user_option).where(username: names).find_each do |user|
       check_can_send_permission!(topic, user)
       @added_users << user
       topic.topic_allowed_users.build(user_id: user.id)
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 910cb5b95d..ff355ada96 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -825,7 +825,7 @@ describe PostsController do
         post "/posts.json", params: {
           raw: 'I can haz a test',
           title: 'I loves my test',
-          target_recipients: "test_Group",
+          target_recipients: group.name,
           archetype: Archetype.private_message
         }
 
@@ -965,13 +965,13 @@ describe PostsController do
 
       it 'creates a private post' do
         user_2 = Fabricate(:user)
-        user_3 = Fabricate(:user, username: "foo_bar")
+        user_3 = Fabricate(:user)
 
         post "/posts.json", params: {
           raw: 'this is the test content',
           archetype: 'private_message',
           title: "this is some post",
-          target_recipients: "#{user_2.username},Foo_Bar"
+          target_recipients: "#{user_2.username},#{user_3.username}"
         }
 
         expect(response.status).to eq(200)

From e8fb9d406667c758cba0f7b1cc779e1ceb352c4c Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 25 May 2020 21:34:05 +0530
Subject: [PATCH 1347/1830] FIX: when creating new PM username/groupname should
 be case-insensitive

(take 2)

https://meta.discourse.org/t/case-sensitivity-in-links-to-groupname/147596
https://meta.discourse.org/t/remove-case-sensitive-in-adding-users-to-a-message/151275
---
 app/controllers/posts_controller.rb    | 4 ++--
 lib/topic_creator.rb                   | 4 ++--
 spec/requests/posts_controller_spec.rb | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index c440d630f5..4830b3b979 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -747,8 +747,8 @@ class PostsController < ApplicationController
     end
 
     if recipients
-      recipients = recipients.split(",")
-      groups = Group.messageable(current_user).where('name in (?)', recipients).pluck('name')
+      recipients = recipients.split(",").map(&:downcase)
+      groups = Group.messageable(current_user).where('lower(name) in (?)', recipients).pluck('name')
       recipients -= groups
       emails = recipients.select { |user| user.match(/@/) }
       recipients -= emails
diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb
index 41558784f3..d86f1c461a 100644
--- a/lib/topic_creator.rb
+++ b/lib/topic_creator.rb
@@ -208,10 +208,10 @@ class TopicCreator
   def add_users(topic, usernames)
     return unless usernames
 
-    names = usernames.split(',').flatten
+    names = usernames.split(',').flatten.map(&:downcase)
     len = 0
 
-    User.includes(:user_option).where(username: names).find_each do |user|
+    User.includes(:user_option).where('lower(username) in (?)', names).find_each do |user|
       check_can_send_permission!(topic, user)
       @added_users << user
       topic.topic_allowed_users.build(user_id: user.id)
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index ff355ada96..910cb5b95d 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -825,7 +825,7 @@ describe PostsController do
         post "/posts.json", params: {
           raw: 'I can haz a test',
           title: 'I loves my test',
-          target_recipients: group.name,
+          target_recipients: "test_Group",
           archetype: Archetype.private_message
         }
 
@@ -965,13 +965,13 @@ describe PostsController do
 
       it 'creates a private post' do
         user_2 = Fabricate(:user)
-        user_3 = Fabricate(:user)
+        user_3 = Fabricate(:user, username: "foo_bar")
 
         post "/posts.json", params: {
           raw: 'this is the test content',
           archetype: 'private_message',
           title: "this is some post",
-          target_recipients: "#{user_2.username},#{user_3.username}"
+          target_recipients: "#{user_2.username},Foo_Bar"
         }
 
         expect(response.status).to eq(200)

From fd2d7ca9928c89ef5c3b8a6ba89a2d49aa81d87c Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 25 May 2020 12:46:44 -0400
Subject: [PATCH 1348/1830] FIX: Email Styles were evaluated out of order

`yield` puts the content in the template right away unless explicitly
`capture`'d.
---
 app/helpers/email_helper.rb          | 2 +-
 spec/integration/email_style_spec.rb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/helpers/email_helper.rb b/app/helpers/email_helper.rb
index 14364d45c3..a1373329b8 100644
--- a/app/helpers/email_helper.rb
+++ b/app/helpers/email_helper.rb
@@ -26,7 +26,7 @@ module EmailHelper
   end
 
   def email_html_template
-    EmailStyle.new.html.sub('%{email_content}', yield).html_safe
+    EmailStyle.new.html.sub('%{email_content}', capture { yield }).html_safe
   end
 
   protected
diff --git a/spec/integration/email_style_spec.rb b/spec/integration/email_style_spec.rb
index 395dd19df1..42203ecdfe 100644
--- a/spec/integration/email_style_spec.rb
+++ b/spec/integration/email_style_spec.rb
@@ -6,9 +6,10 @@ describe EmailStyle do
 
   context "ERB evaluation" do
     it "does not evaluate ERB outside of the email itself" do
-      SiteSetting.email_custom_template = "<div>%{email_content}</div><%= (111 * 333) %>"
+      SiteSetting.email_custom_template = "<hello>%{email_content}</hello><%= (111 * 333) %>"
       html = Email::Renderer.new(UserNotifications.signup(Fabricate(:user))).html
       expect(html).not_to match("36963")
+      expect(html.starts_with?('<hello>')).to eq(true)
     end
   end
 

From 8825395bdca655fd5ff108e06de59393267d5c7d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 25 May 2020 19:09:55 +0200
Subject: [PATCH 1349/1830] DEV: allows to decorate username selector (#9869)

Usage:

```
api.addUsernameSelectorDecorator(username => {
  return iconHTML("calendar-alt");
});
```
---
 .../app/helpers/decorate-username-selector.js | 21 +++++++++++++++++++
 .../discourse/app/lib/plugin-api.js           | 14 +++++++++++++
 .../templates/user-selector-autocomplete.hbr  |  1 +
 test/javascripts/helpers/qunit-helpers.js     |  2 ++
 4 files changed, 38 insertions(+)
 create mode 100644 app/assets/javascripts/discourse/app/helpers/decorate-username-selector.js

diff --git a/app/assets/javascripts/discourse/app/helpers/decorate-username-selector.js b/app/assets/javascripts/discourse/app/helpers/decorate-username-selector.js
new file mode 100644
index 0000000000..6b2da95845
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/helpers/decorate-username-selector.js
@@ -0,0 +1,21 @@
+import { htmlSafe } from "@ember/template";
+import { registerUnbound } from "discourse-common/lib/helpers";
+
+let usernameDecorators = [];
+export function addUsernameSelectorDecorator(decorator) {
+  usernameDecorators.push(decorator);
+}
+
+export function resetUsernameDecorators() {
+  usernameDecorators = [];
+}
+
+export default registerUnbound("decorate-username-selector", username => {
+  const decorations = [];
+
+  usernameDecorators.forEach(decorator => {
+    decorations.push(decorator(username));
+  });
+
+  return decorations.length ? htmlSafe(decorations.join("")) : "";
+});
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index d17fde9235..752b2a2b6a 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -40,6 +40,7 @@ import { replaceFormatter } from "discourse/lib/utilities";
 import { modifySelectKit } from "select-kit/mixins/plugin-api";
 import { addGTMPageChangedCallback } from "discourse/lib/page-tracker";
 import { registerCustomAvatarHelper } from "discourse/helpers/user-avatar";
+import { addUsernameSelectorDecorator } from "discourse/helpers/decorate-username-selector";
 import { disableNameSuppression } from "discourse/widgets/poster-name";
 import { registerCustomPostMessageCallback as registerCustomPostMessageCallback1 } from "discourse/controllers/topic";
 import Sharing from "discourse/lib/sharing";
@@ -927,6 +928,19 @@ class PluginApi {
     addComposerUploadMarkdownResolver(resolver);
   }
 
+  /**
+   * Registers a function to decorate each autocomplete usernames.
+   *
+   * Example:
+   *
+   * api.appendUsernameDecorator(username => {
+   *   return `<span class="status">[is_away]</class>`;
+   * })
+   */
+  addUsernameSelectorDecorator(decorator) {
+    addUsernameSelectorDecorator(decorator);
+  }
+
   /**
    * Registers a "beforeSave" function on the composer. This allows you to
    * implement custom logic that will happen before the user makes a post.
diff --git a/app/assets/javascripts/discourse/app/templates/user-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/templates/user-selector-autocomplete.hbr
index 22de863188..797bd64e35 100644
--- a/app/assets/javascripts/discourse/app/templates/user-selector-autocomplete.hbr
+++ b/app/assets/javascripts/discourse/app/templates/user-selector-autocomplete.hbr
@@ -6,6 +6,7 @@
           {{avatar user imageSize="tiny"}}
           <span class='username'>{{format-username user.username}}</span>
           <span class='name'>{{user.name}}</span>
+          {{decorate-username-selector user.username}}
         </a>
       </li>
     {{/each}}
diff --git a/test/javascripts/helpers/qunit-helpers.js b/test/javascripts/helpers/qunit-helpers.js
index f196bd03bc..3a92b2984e 100644
--- a/test/javascripts/helpers/qunit-helpers.js
+++ b/test/javascripts/helpers/qunit-helpers.js
@@ -19,6 +19,7 @@ import { resetWidgetCleanCallbacks } from "discourse/components/mount-widget";
 import { resetTopicTitleDecorators } from "discourse/components/topic-title";
 import { resetDecorators as resetPostCookedDecorators } from "discourse/widgets/post-cooked";
 import { resetDecorators as resetPluginOutletDecorators } from "discourse/components/plugin-connector";
+import { resetUsernameDecorators } from "discourse/helpers/decorate-username-selector";
 import { resetCache as resetOneboxCache } from "pretty-text/oneboxer";
 import { resetCustomPostMessageCallbacks } from "discourse/controllers/topic";
 import User from "discourse/models/user";
@@ -162,6 +163,7 @@ export function acceptance(name, options) {
       resetPostCookedDecorators();
       resetPluginOutletDecorators();
       resetTopicTitleDecorators();
+      resetUsernameDecorators();
       resetOneboxCache();
       resetCustomPostMessageCallbacks();
       Discourse._runInitializer("instanceInitializers", function(

From 5fb92718787f9564cee064400a5bca8a555f2ed2 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Tue, 26 May 2020 00:43:50 +0530
Subject: [PATCH 1350/1830] DEV: ignore `flair_url` column in group model.
 (#9873)

---
 app/jobs/onceoff/migrate_group_flair_images.rb | 17 +++++++++++++----
 app/models/group.rb                            |  3 ++-
 spec/jobs/migrate_group_flair_images_spec.rb   |  7 +++++--
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/jobs/onceoff/migrate_group_flair_images.rb b/app/jobs/onceoff/migrate_group_flair_images.rb
index 75616fd745..2b862cdf17 100644
--- a/app/jobs/onceoff/migrate_group_flair_images.rb
+++ b/app/jobs/onceoff/migrate_group_flair_images.rb
@@ -4,11 +4,20 @@ require 'uri'
 module Jobs
   class MigrateGroupFlairImages < ::Jobs::Onceoff
     def execute_onceoff(args)
-      return if Group.column_names.exclude?("flair_url")
+      column_exists = DB.exec(<<~SQL) == 1
+        SELECT 1
+        FROM INFORMATION_SCHEMA.COLUMNS
+        WHERE
+          table_schema = 'public' AND
+          table_name = 'groups' AND
+          column_name = 'flair_url'
+      SQL
+      return unless column_exists
 
-      Group.where.not(flair_url: nil).each do |group|
+      groups = Group.where.not(flair_url: nil).select(:id, :flair_url, :flair_upload_id, :name)
+      groups.each do |group|
         if group.flair_upload.present?
-          g.update_column(:flair_url, nil)
+          DB.exec("UPDATE groups SET flair_url = NULL WHERE id = #{group.id}")
           next
         end
 
@@ -68,7 +77,7 @@ module Jobs
           origin: UrlHelper.absolute(old_url)
         ).create_for(Discourse.system_user.id)
 
-        group.update_columns(flair_upload_id: upload.id, flair_url: nil) if upload.present?
+        DB.exec("UPDATE groups SET flair_url = NULL, flair_upload_id = #{upload.id} WHERE id = #{group.id}") if upload.present?
       end
     end
 
diff --git a/app/models/group.rb b/app/models/group.rb
index b71906bb79..6448f46512 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 class Group < ActiveRecord::Base
-  # TODO(2021-04-22): remove
+  # TODO(2021-05-26): remove
   self.ignored_columns = %w{
     automatic_membership_retroactive
+    flair_url
   }
 
   include HasCustomFields
diff --git a/spec/jobs/migrate_group_flair_images_spec.rb b/spec/jobs/migrate_group_flair_images_spec.rb
index a1c0c51252..ff3428fc98 100644
--- a/spec/jobs/migrate_group_flair_images_spec.rb
+++ b/spec/jobs/migrate_group_flair_images_spec.rb
@@ -4,6 +4,7 @@ require 'rails_helper'
 
 RSpec.describe Jobs::MigrateGroupFlairImages do
   let(:image_url) { "https://omg.aws.somestack/test.png" }
+  let(:group) { Fabricate(:group) }
 
   before do
     stub_request(:get, image_url).to_return(
@@ -18,7 +19,9 @@ RSpec.describe Jobs::MigrateGroupFlairImages do
   end
 
   it 'should migrate to the new group `flair_upload_id` column correctly' do
-    group = Fabricate(:group, flair_url: image_url)
+    DB.exec(<<~SQL, flair_url: image_url)
+      UPDATE groups SET flair_url = :flair_url WHERE id = #{group.id}
+    SQL
 
     expect do
       described_class.new.execute_onceoff({})
@@ -30,7 +33,7 @@ RSpec.describe Jobs::MigrateGroupFlairImages do
   end
 
   it 'should skip groups with invalid flair URLs' do
-    group = Fabricate(:group, flair_url: "abc")
+    DB.exec("UPDATE groups SET flair_url = 'abc' WHERE id = #{group.id}")
     described_class.new.execute_onceoff({})
     expect(Rails.logger.warnings.count).to eq(0)
   end

From be162051181c7a12b407b68289df9b2b96f157fb Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 25 May 2020 21:44:15 +0200
Subject: [PATCH 1351/1830] DEV: plugin api should have been bumped for
 #8825395 (#9874)

---
 app/assets/javascripts/discourse/app/lib/plugin-api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index 752b2a2b6a..ae2417f119 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -56,7 +56,7 @@ import { on } from "@ember/object/evented";
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.10.0";
+const PLUGIN_API_VERSION = "0.10.1";
 
 class PluginApi {
   constructor(version, container) {

From d9f915b195718e010a0b8ce00ca38358b50a553a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 25 May 2020 21:55:30 +0200
Subject: [PATCH 1352/1830] FIX: documentation was using incorrect function
 (#9876)

---
 app/assets/javascripts/discourse/app/lib/plugin-api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index ae2417f119..101c97da4b 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -933,7 +933,7 @@ class PluginApi {
    *
    * Example:
    *
-   * api.appendUsernameDecorator(username => {
+   * api.addUsernameSelectorDecorator(username => {
    *   return `<span class="status">[is_away]</class>`;
    * })
    */

From b48299f81c10adb44210ac1e463e5b4eed3fae53 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Mon, 25 May 2020 17:09:34 -0300
Subject: [PATCH 1353/1830] FEATURE: Add setting to disable automatic CORS rule
 install in S3 buckets (#9872)

---
 config/discourse_defaults.conf | 1 +
 config/site_settings.yml       | 3 +++
 lib/s3_helper.rb               | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf
index ac71f6a8b6..39df104204 100644
--- a/config/discourse_defaults.conf
+++ b/config/discourse_defaults.conf
@@ -200,6 +200,7 @@ s3_use_iam_profile =
 s3_cdn_url =
 s3_endpoint =
 s3_http_continue_timeout =
+s3_install_cors_rule =
 
 ### rate limits apply to all sites
 max_user_api_reqs_per_minute = 20
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 6209cc621a..cfeb71108e 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1207,6 +1207,9 @@ files:
   s3_http_continue_timeout:
     default: 1
     hidden: true
+  s3_install_cors_rule:
+    default: true
+    hidden: true
   s3_cdn_url:
     default: ""
     regex: '^https?:\/\/.+[^\/]$'
diff --git a/lib/s3_helper.rb b/lib/s3_helper.rb
index ef3bc7dee1..8021c78185 100644
--- a/lib/s3_helper.rb
+++ b/lib/s3_helper.rb
@@ -90,6 +90,8 @@ class S3Helper
   # make sure we have a cors config for assets
   # otherwise we will have no fonts
   def ensure_cors!(rules = nil)
+    return unless SiteSetting.s3_install_cors_rule
+
     rule = nil
 
     begin

From 979093787f5e49d053865f7824552aae1d6a17e4 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Mon, 25 May 2020 14:24:40 -0700
Subject: [PATCH 1354/1830] FIX: Include lazyYT-container in cooked post HTML
 (#9870)

This applies the new styles without waiting for the JS to run.
---
 plugins/lazy-yt/plugin.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/lazy-yt/plugin.rb b/plugins/lazy-yt/plugin.rb
index 4f5517c22a..06b25ce427 100644
--- a/plugins/lazy-yt/plugin.rb
+++ b/plugins/lazy-yt/plugin.rb
@@ -32,7 +32,7 @@ class Onebox::Engine::YoutubeOnebox
       escaped_title = ERB::Util.html_escape(video_title)
 
       <<~EOF
-      <div class="onebox lazyYT"
+      <div class="onebox lazyYT lazyYT-container"
            data-youtube-id="#{video_id}"
            data-youtube-title="#{escaped_title}"
            data-width="#{video_width}"

From fc97f7e0e73eb86df9701c92ab1a4059ae76d611 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 26 May 2020 10:07:00 +1000
Subject: [PATCH 1355/1830] FIX: properly ban non human users from draft system

Previously we had a partial fix in place where non human users
were not allowed draft sequences, this left edges around where non
human users asked for drafts yet had none.

For example system could already have a few drafts in place.

This also removes and extensibility point we added that is not in use
---
 app/models/draft.rb          |  5 +++++
 app/models/draft_sequence.rb | 18 +++++-------------
 app/models/user.rb           |  6 +++++-
 lib/plugin/instance.rb       |  9 ---------
 spec/models/draft_spec.rb    | 16 ++++++++++++++++
 5 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/app/models/draft.rb b/app/models/draft.rb
index a2fba62fe5..2165a0ad8a 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -10,6 +10,8 @@ class Draft < ActiveRecord::Base
   class OutOfSequence < StandardError; end
 
   def self.set(user, key, sequence, data, owner = nil)
+    return 0 if !User.human_user_id?(user.id)
+
     if SiteSetting.backup_drafts_to_pm_length > 0 && SiteSetting.backup_drafts_to_pm_length < data.length
       backup_draft(user, key, sequence, data)
     end
@@ -94,6 +96,7 @@ class Draft < ActiveRecord::Base
   end
 
   def self.get(user, key, sequence)
+    return if !user || !user.id || !User.human_user_id?(user.id)
 
     opts = {
       user_id: user.id,
@@ -128,6 +131,8 @@ class Draft < ActiveRecord::Base
   end
 
   def self.clear(user, key, sequence)
+    return if !user || !user.id || !User.human_user_id?(user.id)
+
     current_sequence = DraftSequence.current(user, key)
 
     # bad caller is a reason to complain
diff --git a/app/models/draft_sequence.rb b/app/models/draft_sequence.rb
index 681a8bcb2e..b79f3c9256 100644
--- a/app/models/draft_sequence.rb
+++ b/app/models/draft_sequence.rb
@@ -2,10 +2,12 @@
 
 class DraftSequence < ActiveRecord::Base
   def self.next!(user, key)
+    return nil if !user
+
     user_id = user
     user_id = user.id unless user.is_a?(Integer)
 
-    return 0 if invalid_user_id?(user_id)
+    return 0 if !User.human_user_id?(user_id)
 
     h = { user_id: user_id, draft_key: key }
     c = DraftSequence.find_by(h)
@@ -18,27 +20,17 @@ class DraftSequence < ActiveRecord::Base
   end
 
   def self.current(user, key)
-    return nil unless user
+    return nil if !user
 
     user_id = user
     user_id = user.id unless user.is_a?(Integer)
 
-    return 0 if invalid_user_id?(user_id)
+    return 0 if !User.human_user_id?(user_id)
 
     # perf critical path
     r, _ = DB.query_single('select sequence from draft_sequences where user_id = ? and draft_key = ?', user_id, key)
     r.to_i
   end
-
-  cattr_accessor :plugin_ignore_draft_sequence_callbacks
-  self.plugin_ignore_draft_sequence_callbacks = {}
-
-  def self.invalid_user_id?(user_id)
-    user_id < 0 || self.plugin_ignore_draft_sequence_callbacks.any? do |plugin, callback|
-      plugin.enabled? ? callback.call(user_id) : false
-    end
-  end
-  private_class_method :invalid_user_id?
 end
 
 # == Schema Information
diff --git a/app/models/user.rb b/app/models/user.rb
index d9678d1a1c..0147c62b1b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -306,8 +306,12 @@ class User < ActiveRecord::Base
     fields.uniq
   end
 
+  def self.human_user_id?(user_id)
+    user_id > 0
+  end
+
   def human?
-    self.id > 0
+    User.human_user_id?(self.id)
   end
 
   def bot?
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index ab48f7cbea..0390216ebe 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -405,15 +405,6 @@ class Plugin::Instance
     SeedFu.fixture_paths.concat(paths)
   end
 
-  # Applies to all sites in a multisite environment. Block is not called if
-  # plugin is not enabled. Block is called with `user_id` and has to return a
-  # boolean based on whether the given `user_id` should be ignored.
-  def register_ignore_draft_sequence_callback(&block)
-    reloadable_patch do |plugin|
-      ::DraftSequence.plugin_ignore_draft_sequence_callbacks[plugin] = block
-    end
-  end
-
   def listen_for(event_name)
     return unless self.respond_to?(event_name)
     DiscourseEvent.on(event_name, &self.method(event_name))
diff --git a/spec/models/draft_spec.rb b/spec/models/draft_spec.rb
index b2066b048d..980f079599 100644
--- a/spec/models/draft_spec.rb
+++ b/spec/models/draft_spec.rb
@@ -12,6 +12,22 @@ describe Draft do
     Fabricate(:post)
   end
 
+  context 'system user' do
+    it "can not set drafts" do
+      # fake a sequence
+      DraftSequence.create!(user_id: Discourse.system_user.id, draft_key: "abc", sequence: 10)
+
+      seq = Draft.set(Discourse.system_user, "abc", 0, { reply: 'hi' }.to_json)
+      expect(seq).to eq(0)
+
+      draft = Draft.get(Discourse.system_user, "abc", 0)
+      expect(draft).to eq(nil)
+
+      draft = Draft.get(Discourse.system_user, "abc", 1)
+      expect(draft).to eq(nil)
+    end
+  end
+
   context 'backup_drafts_to_pm_length' do
     it "correctly backs up drafts to a personal message" do
       SiteSetting.backup_drafts_to_pm_length = 1

From 878f06f1fe0fb7027f3bb81b00ec145c94bae17a Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 21 May 2020 14:32:41 +0800
Subject: [PATCH 1356/1830] DEV: Remove custom connection reaper.

Rails 6 fixed the reaper to use one thread to reap all the connection pools.
---
 app/models/global_setting.rb          |  3 ++-
 config/application.rb                 |  5 ----
 config/initializers/099-drain_pool.rb |  4 ---
 lib/discourse.rb                      | 35 ---------------------------
 lib/freedom_patches/reaper.rb         | 20 ---------------
 5 files changed, 2 insertions(+), 65 deletions(-)
 delete mode 100644 lib/freedom_patches/reaper.rb

diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index 21e5a137dc..890f5ef06c 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -144,8 +144,9 @@ class GlobalSetting
 
     hash["host_names"] = hostnames
     hash["database"] = db_name
-
     hash["prepared_statements"] = !!self.db_prepared_statements
+    hash["idle_timeout"] = connection_reaper_age if connection_reaper_age.present?
+    hash["reaping_frequency"] = connection_reaper_interval if connection_reaper_interval.present?
 
     { "production" => hash }
   end
diff --git a/config/application.rb b/config/application.rb
index 0157dc8289..808f9e4592 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -360,10 +360,5 @@ module Discourse
     config.generators do |g|
       g.test_framework :rspec, fixture: false
     end
-
-    # we have a monkey_patch we need to require early... prior to connection
-    # init
-    require 'freedom_patches/reaper'
-
   end
 end
diff --git a/config/initializers/099-drain_pool.rb b/config/initializers/099-drain_pool.rb
index cff95339b8..e69de29bb2 100644
--- a/config/initializers/099-drain_pool.rb
+++ b/config/initializers/099-drain_pool.rb
@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-# pg performs inconsistently with large amounts of connections
-Discourse.start_connection_reaper
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 9bdbc2b302..094ca70aec 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -660,7 +660,6 @@ module Discourse
     Sidekiq.redis_pool.shutdown { |c| nil }
     # re-establish
     Sidekiq.redis = sidekiq_redis_config
-    start_connection_reaper
 
     # in case v8 was initialized we want to make sure it is nil
     PrettyText.reset_context
@@ -743,40 +742,6 @@ module Discourse
     STDERR.puts "Failed to report exception #{e} #{message}"
   end
 
-  def self.start_connection_reaper
-    return if GlobalSetting.connection_reaper_age < 1 ||
-              GlobalSetting.connection_reaper_interval < 1
-
-    # this helps keep connection counts in check
-    Thread.new do
-      while true
-        begin
-          sleep GlobalSetting.connection_reaper_interval
-          reap_connections(GlobalSetting.connection_reaper_age)
-        rescue => e
-          Discourse.warn_exception(e, message: "Error reaping connections")
-        end
-      end
-    end
-  end
-
-  def self.reap_connections(idle)
-    pools = []
-    ObjectSpace.each_object(ActiveRecord::ConnectionAdapters::ConnectionPool) { |pool| pools << pool }
-
-    pools.each do |pool|
-      # reap recovers connections that were aborted
-      # eg a thread died or a dev forgot to check it in
-      # flush removes idle connections
-      # after fork we have "deadpools" so ignore them, they have been discarded
-      # so @connections is set to nil
-      if pool.connections
-        pool.reap
-        pool.flush(idle)
-      end
-    end
-  end
-
   def self.deprecate(warning, drop_from: nil, since: nil, raise_error: false, output_in_test: false)
     location = caller_locations[1].yield_self { |l| "#{l.path}:#{l.lineno}:in \`#{l.label}\`" }
     warning = ["Deprecation notice:", warning]
diff --git a/lib/freedom_patches/reaper.rb b/lib/freedom_patches/reaper.rb
deleted file mode 100644
index dc49a528f8..0000000000
--- a/lib/freedom_patches/reaper.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-# Discourse ships with a connection reaper
-# this patch ensures that the connection reaper never runs in Rails
-#
-# In Rails 5.2 the connection reaper is "per-pool" this means it can bloat
-# threads quite a lot in a multisite
-#
-# Note, the "correct" way is to set this in the spec, however due to multisite
-# getting reaper_interval=0 into all the specs is not going to be trivial
-# when we eventually do that we can remove this patch
-
-if !defined? ActiveRecord::ConnectionAdapters::ConnectionPool::Reaper
-  raise "Can not find connection Reaper class, this patch will no longer work!"
-end
-
-class ActiveRecord::ConnectionAdapters::ConnectionPool::Reaper
-  def run
-  end
-end

From 5462fe9462cb2f022b0ccd80dc1e3708eac61846 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Tue, 26 May 2020 08:15:45 +0530
Subject: [PATCH 1357/1830] FIX: do not allow tag with name 'none' (#9867)

https://meta.discourse.org/t/none-tag-is-uneditable/152003
---
 app/models/tag.rb                             | 15 ++++++++++++---
 db/migrate/20200525072638_remove_none_tags.rb | 17 +++++++++++++++++
 spec/models/tag_spec.rb                       |  3 +++
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20200525072638_remove_none_tags.rb

diff --git a/app/models/tag.rb b/app/models/tag.rb
index 825b90d8ad..6ff6afe609 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -5,15 +5,16 @@ class Tag < ActiveRecord::Base
   include HasDestroyedWebHook
 
   RESERVED_TAGS = [
-    'c'
+    'c',
+    'none'
   ]
 
   validates :name,
     presence: true,
-    uniqueness: { case_sensitive: false },
-    exclusion: { in: RESERVED_TAGS }
+    uniqueness: { case_sensitive: false }
 
   validate :target_tag_validator, if: Proc.new { |t| t.new_record? || t.will_save_change_to_target_tag_id? }
+  validate :name_validator
 
   scope :where_name, ->(name) do
     name = Array(name).map(&:downcase)
@@ -181,6 +182,14 @@ class Tag < ActiveRecord::Base
       true
     end
   end
+
+  private
+
+  def name_validator
+    if name.present? && RESERVED_TAGS.include?(self.name.strip.downcase)
+      errors.add(:name, :invalid)
+    end
+  end
 end
 
 # == Schema Information
diff --git a/db/migrate/20200525072638_remove_none_tags.rb b/db/migrate/20200525072638_remove_none_tags.rb
new file mode 100644
index 0000000000..ed50eea490
--- /dev/null
+++ b/db/migrate/20200525072638_remove_none_tags.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class RemoveNoneTags < ActiveRecord::Migration[6.0]
+  def up
+    none_tag_id = DB.query_single("SELECT id FROM tags WHERE lower(name) = 'none'").first
+    if none_tag_id.present?
+      [:tag_users, :topic_tags, :category_tag_stats, :category_tags, :tag_group_memberships].each do |table_name|
+        execute "DELETE FROM #{table_name} WHERE tag_id = #{none_tag_id}"
+      end
+      execute "DELETE FROM tags WHERE id = #{none_tag_id} OR target_tag_id = #{none_tag_id}"
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 441bb734ac..8bf0f7e7fe 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -36,6 +36,9 @@ describe Tag do
       expect { Fabricate.build(:tag, name: "hElLo").save! }.to raise_error(ActiveRecord::RecordInvalid)
     end
 
+    it 'does not allow creation of tag with name in "RESERVED_TAGS"' do
+      expect { Fabricate.build(:tag, name: "None").save! }.to raise_error(ActiveRecord::RecordInvalid)
+    end
   end
 
   describe 'destroy' do

From 2211581a85f50bd458cbf43c4b67c57d3c175b9a Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Tue, 26 May 2020 08:40:09 +0300
Subject: [PATCH 1358/1830] FIX: Don't responde with error 500 if domain is
 invalid when adding automatic membership domain (#9655)

---
 app/controllers/admin/groups_controller.rb    |  2 +-
 app/models/group.rb                           |  8 +++---
 spec/requests/admin/groups_controller_spec.rb | 27 +++++++++++++++++++
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 32114f3369..aa5ddd5d59 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -133,7 +133,7 @@ class Admin::GroupsController < Admin::AdminController
 
         return can_not_modify_automatic if group.automatic
 
-        existing_domains = group.automatic_membership_email_domains.split("|")
+        existing_domains = group.automatic_membership_email_domains&.split("|") || []
         domains -= existing_domains
       end
 
diff --git a/app/models/group.rb b/app/models/group.rb
index 6448f46512..b207f1c02f 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -91,6 +91,8 @@ class Group < ActiveRecord::Base
     everyone: 99
   }
 
+  VALID_DOMAIN_REGEX = /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,24}(:[0-9]{1,5})?(\/.*)?\Z/i
+
   def self.visibility_levels
     @visibility_levels = Enum.new(
       public: 0,
@@ -777,7 +779,7 @@ class Group < ActiveRecord::Base
     return if self.automatic_membership_email_domains.blank?
 
     domains = Group.get_valid_email_domains(self.automatic_membership_email_domains) do |domain|
-      self.errors.add :base, (I18n.t('groups.errors.invalid_domain', domain: domain)) unless domain =~ /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,24}(:[0-9]{1,5})?(\/.*)?\Z/i
+      self.errors.add :base, (I18n.t('groups.errors.invalid_domain', domain: domain))
     end
 
     self.automatic_membership_email_domains = domains.join("|")
@@ -862,10 +864,10 @@ class Group < ActiveRecord::Base
       domain.sub!(/^https?:\/\//, '')
       domain.sub!(/\/.*$/, '')
 
-      if domain =~ /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,24}(:[0-9]{1,5})?(\/.*)?\Z/i
+      if domain =~ Group::VALID_DOMAIN_REGEX
         valid_domains << domain
       else
-        yield domain
+        yield domain if block_given?
       end
     end
 
diff --git a/spec/requests/admin/groups_controller_spec.rb b/spec/requests/admin/groups_controller_spec.rb
index 1279d33ed3..c8cedd06ba 100644
--- a/spec/requests/admin/groups_controller_spec.rb
+++ b/spec/requests/admin/groups_controller_spec.rb
@@ -223,4 +223,31 @@ RSpec.describe Admin::GroupsController do
       end
     end
   end
+
+  describe '#automatic_membership_count' do
+    it 'returns count of users whose emails match the domain' do
+      Fabricate(:user, email: 'user1@somedomain.org')
+      Fabricate(:user, email: 'user1@somedomain.com')
+      Fabricate(:user, email: 'user1@notsomedomain.com')
+      group = Fabricate(:group)
+
+      put "/admin/groups/automatic_membership_count.json", params: {
+        automatic_membership_email_domains: 'somedomain.org|somedomain.com',
+        id: group.id
+      }
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["user_count"]).to eq(2)
+    end
+
+    it "doesn't responde with 500 if domain is invalid" do
+      group = Fabricate(:group)
+
+      put "/admin/groups/automatic_membership_count.json", params: {
+        automatic_membership_email_domains: '@somedomain.org|@somedomain.com',
+        id: group.id
+      }
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["user_count"]).to eq(0)
+    end
+  end
 end

From 337bd9a0f7616414253ffb26472bda59488e6e85 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 26 May 2020 16:10:05 +1000
Subject: [PATCH 1359/1830] FIX: concurrency bug when creating topic thumbnails

We were failing erratically when backfilling topic thumbnails.

This ensures that racing threads/processes will not conflict.
---
 app/models/topic_thumbnail.rb | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/models/topic_thumbnail.rb b/app/models/topic_thumbnail.rb
index 139ddde232..ae8d17be8b 100644
--- a/app/models/topic_thumbnail.rb
+++ b/app/models/topic_thumbnail.rb
@@ -21,7 +21,19 @@ class TopicThumbnail < ActiveRecord::Base
       optimized = OptimizedImage.create_for(original, target_width, target_height)
     end
 
-    create!(upload: original, max_width: max_width, max_height: max_height, optimized_image: optimized)
+    # may have been associated already, bulk insert will skip dupes
+    TopicThumbnail.insert_all([
+      upload_id: original.id,
+      max_width: max_width,
+      max_height: max_height,
+      optimized_image_id: optimized.id
+    ])
+
+    TopicThumbnail.find_by(
+      upload: original,
+      max_width: max_width,
+      max_height: max_height
+    )
   end
 
   def self.ensure_consistency!

From 76c4bc925d2692eb0e258c35f6fdce0b183fb373 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 26 May 2020 16:19:05 +1000
Subject: [PATCH 1360/1830] DEV: followup to prev commit

337bd9a0f7616414 did not account for optimized image being nil
---
 app/models/topic_thumbnail.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/topic_thumbnail.rb b/app/models/topic_thumbnail.rb
index ae8d17be8b..f12161510f 100644
--- a/app/models/topic_thumbnail.rb
+++ b/app/models/topic_thumbnail.rb
@@ -26,7 +26,7 @@ class TopicThumbnail < ActiveRecord::Base
       upload_id: original.id,
       max_width: max_width,
       max_height: max_height,
-      optimized_image_id: optimized.id
+      optimized_image_id: optimized&.id
     ])
 
     TopicThumbnail.find_by(

From 41f742c2f9fbca7260e33133a2b79a8cd7ac581b Mon Sep 17 00:00:00 2001
From: Joshua Rosenfeld <jomaxro@discourse.org>
Date: Tue, 26 May 2020 07:18:36 -0400
Subject: [PATCH 1361/1830] FIX: Copyedit for the dominating topic warning

---
 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 2341f05c72..a190dd46c2 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -483,7 +483,7 @@ en:
 
       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 got other people space to share their points of view, too. Can you invite them over?
+      It could be even better if you gave other people space to share their points of view, too. Can you invite them over?
 
     get_a_room: |
       ### Encourage everyone to get involved in the conversation

From f47400475e1d154c45d5babe6dc4a69784d4b8b9 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Tue, 26 May 2020 16:28:03 +0300
Subject: [PATCH 1362/1830] FEATURE: Send a private message when a group
 membership is accepted (#9822)

* FEATURE: Send a private message when a group membership is accepted

* DEV: Small code improvements

* FIX: Send PM as group owner

* Copy edits
---
 app/controllers/groups_controller.rb    | 18 ++++++++++++++----
 app/models/group.rb                     |  9 ++++-----
 config/locales/server.en.yml            |  4 ++++
 spec/requests/groups_controller_spec.rb | 19 +++++++++++++++++++
 4 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 3d4b828ad1..2e112edd04 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -340,18 +340,28 @@ class GroupsController < ApplicationController
     raise Discourse::InvalidParameters.new(:id) if group.blank?
     guardian.ensure_can_edit!(group)
 
-    ActiveRecord::Base.transaction do
-      user = User.find_by(id: params[:user_id])
-      raise Discourse::InvalidParameters.new(:user_id) if user.blank?
+    user = User.find_by(id: params[:user_id])
+    raise Discourse::InvalidParameters.new(:user_id) if user.blank?
 
+    ActiveRecord::Base.transaction do
       if params[:accept]
-        group.add(user, notify: true)
+        group.add(user)
         GroupActionLogger.new(current_user, group).log_add_user_to_group(user)
       end
 
       GroupRequest.where(group_id: group.id, user_id: user.id).delete_all
     end
 
+    if params[:accept]
+      PostCreator.new(current_user,
+        title: I18n.t('groups.request_accepted_pm.title', group_name: group.name),
+        raw: I18n.t('groups.request_accepted_pm.body', group_name: group.name),
+        archetype: Archetype.private_message,
+        target_usernames: user.username,
+        skip_validations: true
+      ).create!
+    end
+
     render json: success_json
   end
 
diff --git a/app/models/group.rb b/app/models/group.rb
index b207f1c02f..89ce80bbf4 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -616,16 +616,15 @@ class Group < ActiveRecord::Base
   PUBLISH_CATEGORIES_LIMIT = 10
 
   def add(user, notify: false, automatic: false)
-    self.users.push(user) unless self.users.include?(user)
+    return self if self.users.include?(user)
+
+    self.users.push(user)
 
     if notify
       Notification.create!(
         notification_type: Notification.types[:membership_request_accepted],
         user_id: user.id,
-        data: {
-          group_id: id,
-          group_name: name
-        }.to_json
+        data: { group_id: id, group_name: name }.to_json
       )
     end
 
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index a190dd46c2..0433fd08b5 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -431,6 +431,10 @@ en:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "Membership Request for @%{group_name}"
+    request_accepted_pm:
+      title: "You've been accepted into @%{group_name}"
+      body: |
+        Your request to enter @%{group_name} has been accepted and you are now a member.
     view_hidden_topic_request_reason: "I would like to join the group '%{group_name}', so I may access [this topic](%{topic_url})"
 
   education:
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 862b9a631d..11eb7eb0e4 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -1325,6 +1325,25 @@ describe GroupsController do
     end
   end
 
+  describe "#handle_membership_request" do
+    before do
+      group.add_owner(user)
+      sign_in(user)
+    end
+
+    it "sends a private message when accepted" do
+      group_request = GroupRequest.create!(group: group, user: other_user)
+      expect { put "/groups/#{group.id}/handle_membership_request.json", params: { user_id: other_user.id, accept: true } }
+        .to change { Topic.count }.by(1)
+        .and change { Post.count }.by(1)
+
+      topic = Topic.last
+      expect(topic.archetype).to eq(Archetype.private_message)
+      expect(topic.title).to eq(I18n.t('groups.request_accepted_pm.title', group_name: group.name))
+      expect(topic.first_post.raw).to eq(I18n.t('groups.request_accepted_pm.body', group_name: group.name).strip)
+    end
+  end
+
   describe "#histories" do
     context 'when user is not signed in' do
       it 'should raise the right error' do

From b61a291cf3583d5ab5c023cd53459548870b7160 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Tue, 26 May 2020 10:32:48 -0300
Subject: [PATCH 1363/1830] FIX: returns false if the upload url is an invalid
 mailto link (#9877)

---
 lib/file_store/s3_store.rb      | 2 +-
 spec/multisite/s3_store_spec.rb | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index f42fa73057..5007b741e8 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -81,7 +81,7 @@ module FileStore
 
       begin
         parsed_url = URI.parse(URI.encode(url))
-      rescue URI::InvalidURIError
+      rescue URI::InvalidURIError, URI::InvalidComponentError
         return false
       end
 
diff --git a/spec/multisite/s3_store_spec.rb b/spec/multisite/s3_store_spec.rb
index 064c699a12..5681a1df8d 100644
--- a/spec/multisite/s3_store_spec.rb
+++ b/spec/multisite/s3_store_spec.rb
@@ -259,5 +259,11 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
       url = "https://www.someotherhostname.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
       expect(store.has_been_uploaded?(url)).to eq(true)
     end
+
+    it "returns false if the URI is an invalid mailto link" do
+      link = 'mailto: roman;@test.com'
+
+      expect(store.has_been_uploaded?(link)).to eq(false)
+    end
   end
 end

From eb462bfb3daaa0afbc8e2abb3210f430f3682b06 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 26 May 2020 15:38:23 +0200
Subject: [PATCH 1364/1830] FIX: Improve image downsizing script (#9549)

Correctly handles more upload formats in posts, updates post custom fields, fixes more edge cases, adds debugging capabilities. (VERBOSE=1 and INTERACTIVE=1 flags)

Includes these commits and some more:

* DEV: Show the fixed image dimensions
* FIX: Support more upload url formats
* DEV: Remove the old upload after updating posts
* FIX: Use the `process_post_#{id}` mutex
* FIX: Avoid rebaking twice
* DEV: Print out the link to the post
* DEV: Process posts chronologically
* DEV: Do a dry-run before saving, pause on any issue
* FIX: Also process deleted posts
* DEV: Make matchers case-insensitive
* DEV: Pause on "detached" uploads, add more debug info
* DEV: Print out time when finished
* DEV: Add support for WORKER_ID/WORKER_COUNT
* DEV: Fix the onebox in cooked text heuristic
* DEV: Don't report already processed posts
* DEV: Beep when done!
* DEV: Ignore issues with deleted posts
* DEV: Ignore issues with deleted topics
* DEV: Multiline SQL
* DEV: Use the bulk attribute assignment
* DEV: Add ENV["INTERACTIVE"] mode
* DEV: Handle post custom fields
* DEV: Bail on non-S3 sites
* DEV: Allow sizes smaller than 1 mpix
---
 script/downsize_uploads.rb | 362 +++++++++++++++++++++++++++----------
 1 file changed, 270 insertions(+), 92 deletions(-)

diff --git a/script/downsize_uploads.rb b/script/downsize_uploads.rb
index 95d65c2494..dc2e7b2a62 100644
--- a/script/downsize_uploads.rb
+++ b/script/downsize_uploads.rb
@@ -2,80 +2,181 @@
 
 require File.expand_path("../../config/environment", __FILE__)
 
-# no less than 1 megapixel
-max_image_pixels = [ARGV[0].to_i, 1_000_000].max
+# Supported ENV arguments:
+#
+# VERBOSE=1
+# Shows debug information.
+#
+# INTERACTIVE=1
+# Shows debug information and pauses for input on issues.
+#
+# WORKER_ID/WORKER_COUNT
+# When running the script on a single forum in multiple terminals.
+# For example, if you want 4 concurrent scripts use WORKER_COUNT=4
+# and WORKER_ID from 0 to 3
 
-puts "", "Downsizing images to no more than #{max_image_pixels} pixels"
+MIN_IMAGE_PIXELS = 500_000 # 0.5 megapixels
+DEFAULT_IMAGE_PIXELS = 1_000_000 # 1 megapixel
 
-dimensions_count = 0
-downsized_count = 0
+MAX_IMAGE_PIXELS = [
+  ARGV[0]&.to_i || DEFAULT_IMAGE_PIXELS,
+  MIN_IMAGE_PIXELS
+].max
 
-def downsize_upload(upload, path, max_image_pixels)
+ENV["VERBOSE"] = "1" if ENV["INTERACTIVE"]
+
+def log(*args)
+  puts(*args) if ENV["VERBOSE"]
+end
+
+def transform_post(post, upload_before, upload_after)
+  post.raw.gsub!(/upload:\/\/#{upload_before.base62_sha1}(\.#{upload_before.extension})?/i, upload_after.short_url)
+  post.raw.gsub!(Discourse.store.cdn_url(upload_before.url), Discourse.store.cdn_url(upload_after.url))
+  post.raw.gsub!(Discourse.store.url_for(upload_before), Discourse.store.url_for(upload_after))
+  post.raw.gsub!("#{Discourse.base_url}#{upload_before.short_path}", "#{Discourse.base_url}#{upload_after.short_path}")
+
+  path = SiteSetting.Upload.s3_upload_bucket.split("/", 2)[1]
+  post.raw.gsub!(/<img src=\"https:\/\/.+?\/#{path}\/uploads\/default\/optimized\/.+?\/#{upload_before.sha1}_\d_(?<width>\d+)x(?<height>\d+).*?\" alt=\"(?<alt>.*?)\"\/?>/i) do
+    "![#{$~[:alt]}|#{$~[:width]}x#{$~[:height]}](#{upload_after.short_url})"
+  end
+
+  post.raw.gsub!(/!\[(.*?)\]\(\/uploads\/.+?\/#{upload_before.sha1}(\.#{upload_before.extension})?\)/i, "![\\1](#{upload_after.short_url})")
+end
+
+def downsize_upload(upload, path)
   # Make sure the filesize is up to date
   upload.filesize = File.size(path)
 
-  OptimizedImage.downsize(path, path, "#{max_image_pixels}@", filename: upload.original_filename)
+  OptimizedImage.downsize(path, path, "#{MAX_IMAGE_PIXELS}@", filename: upload.original_filename)
   sha1 = Upload.generate_digest(path)
 
   if sha1 == upload.sha1
-    puts "no sha1 change" if ENV["VERBOSE"]
+    log "No sha1 change"
     return
   end
 
-  w, h = FastImage.size(path, timeout: 10, raise_on_failure: true)
+  w, h = FastImage.size(path, timeout: 15, raise_on_failure: true)
 
   if !w || !h
-    puts "invalid image dimensions after resizing" if ENV["VERBOSE"]
+    log "Invalid image dimensions after resizing"
     return
   end
 
   # Neither #dup or #clone provide a complete copy
   original_upload = Upload.find(upload.id)
   ww, hh = ImageSizer.resize(w, h)
-  new_file = true
 
-  if existing_upload = Upload.find_by(sha1: sha1)
-    upload = existing_upload
-    new_file = false
-  end
+  # A different upload record that matches the sha1 of the downsized image
+  existing_upload = Upload.find_by(sha1: sha1)
+  upload = existing_upload if existing_upload
 
-  before = upload.filesize
-  upload.filesize = File.size(path)
+  upload.attributes = {
+    sha1: sha1,
+    width: w,
+    height: h,
+    thumbnail_width: ww,
+    thumbnail_height: hh,
+    filesize: File.size(path)
+  }
 
-  if upload.filesize > before
-    puts "no filesize reduction" if ENV["VERBOSE"]
+  if upload.filesize > upload.filesize_was
+    log "No filesize reduction"
     return
   end
 
-  upload.sha1 = sha1
-  upload.width = w
-  upload.height = h
-  upload.thumbnail_width = ww
-  upload.thumbnail_height = hh
-
-  if new_file
+  unless existing_upload
     url = Discourse.store.store_upload(File.new(path), upload)
 
     unless url
-      puts "couldn't store the upload" if ENV["VERBOSE"]
+      log "Couldn't store the upload"
       return
     end
 
     upload.url = url
   end
 
-  if ENV["VERBOSE"]
-    puts "base62: #{original_upload.base62_sha1} -> #{Upload.base62_sha1(sha1)}"
-    puts "sha1: #{original_upload.sha1} -> #{sha1}"
-    puts "is a new file: #{new_file}"
+  log "base62: #{original_upload.base62_sha1} -> #{Upload.base62_sha1(sha1)}"
+  log "sha: #{original_upload.sha1} -> #{sha1}"
+  log "(an exisiting upload)" if existing_upload
+
+  success = true
+  posts = Post.unscoped.joins(:post_uploads).where(post_uploads: { upload_id: original_upload.id }).uniq.sort_by(&:created_at)
+
+  posts.each do |post|
+    transform_post(post, original_upload, upload)
+
+    if post.custom_fields[Post::DOWNLOADED_IMAGES].present?
+      downloaded_images = JSON.parse(post.custom_fields[Post::DOWNLOADED_IMAGES])
+    end
+
+    if post.raw_changed?
+      log "Updating post"
+    elsif downloaded_images&.has_value?(original_upload.id)
+      log "A hotlinked, unreferenced image"
+    elsif post.raw.include?(upload.short_url)
+      log "Already processed"
+    elsif post.trashed?
+      log "A deleted post"
+    elsif !post.topic || post.topic.trashed?
+      log "A deleted topic"
+    elsif post.cooked.include?(original_upload.sha1)
+      if post.raw.include?("#{Discourse.base_url.sub(/^https?:\/\//i, "")}/t/")
+        log "Updating a topic onebox"
+      else
+        log "Updating an external onebox"
+      end
+    else
+      log "Could not find the upload URL"
+      success = false
+    end
+
+    log "#{Discourse.base_url}/p/#{post.id}"
+  end
+
+  if posts.empty?
+    log "Upload not used in any posts"
+
+    if User.where(uploaded_avatar_id: original_upload.id).count
+      log "Used as a User avatar"
+    elsif UserAvatar.where(gravatar_upload_id: original_upload.id).count
+      log "Used as a UserAvatar gravatar"
+    elsif UserAvatar.where(custom_upload_id: original_upload.id).count
+      log "Used as a UserAvatar custom upload"
+    elsif UserProfile.where(profile_background_upload_id: original_upload.id).count
+      log "Used as a UserProfile profile background"
+    elsif UserProfile.where(card_background_upload_id: original_upload.id).count
+      log "Used as a UserProfile card background"
+    elsif Category.where(uploaded_logo_id: original_upload.id).count
+      log "Used as a Category logo"
+    elsif Category.where(uploaded_background_id: original_upload.id).count
+      log "Used as a Category background"
+    elsif CustomEmoji.where(upload_id: original_upload.id).count
+      log "Used as a CustomEmoji"
+    elsif ThemeField.where(upload_id: original_upload.id).count
+      log "Used as a ThemeField"
+    else
+      success = false
+    end
+  end
+
+  unless success
+    if ENV["INTERACTIVE"]
+      print "Press any key to continue with the upload"
+      STDIN.beep
+      STDIN.getch
+      puts " k"
+    elsif !existing_upload && !Upload.where(url: upload.url).exist?
+      # We're bailing, so clean up the just uploaded file
+      Discourse.store.remove_upload(upload)
+
+      log "⏩ Skipping"
+      return
+    end
   end
 
   upload.save!
 
-  if new_file
-    upload.optimized_images.each(&:destroy!)
-    Discourse.store.remove_upload(original_upload)
-  else
+  if existing_upload
     begin
       PostUpload.where(upload_id: original_upload.id).update_all(upload_id: upload.id)
     rescue ActiveRecord::RecordNotUnique, PG::UniqueViolation
@@ -90,85 +191,162 @@ def downsize_upload(upload, path, max_image_pixels)
     Category.where(uploaded_background_id: original_upload.id).update_all(uploaded_background_id: upload.id)
     CustomEmoji.where(upload_id: original_upload.id).update_all(upload_id: upload.id)
     ThemeField.where(upload_id: original_upload.id).update_all(upload_id: upload.id)
+  else
+    upload.optimized_images.each(&:destroy!)
   end
 
-  original_upload.posts.each do |post|
-    post.raw.gsub!(/upload:\/\/#{original_upload.base62_sha1}(\.#{original_upload.extension})?/, upload.short_url)
-    post.raw.gsub!(Discourse.store.cdn_url(original_upload.url), Discourse.store.cdn_url(upload.url))
+  posts.each do |post|
+    DistributedMutex.synchronize("process_post_#{post.id}") do
+      current_post = Post.unscoped.find(post.id)
 
-    if post.raw_changed?
-      puts "updating post #{post.id}" if ENV["VERBOSE"]
-      post.save!
-    else
-      puts "Could find the upload path in post.raw (post_id: #{post.id})" if ENV["VERBOSE"]
+      # If the post became outdated, reapply changes
+      if current_post.updated_at != post.updated_at
+        transform_post(current_post, original_upload, upload)
+        post = current_post
+      end
+
+      if post.raw_changed?
+        post.update_columns(
+          raw: post.raw,
+          updated_at: Time.zone.now
+        )
+      end
+
+      if existing_upload && post.custom_fields[Post::DOWNLOADED_IMAGES].present?
+        downloaded_images = JSON.parse(post.custom_fields[Post::DOWNLOADED_IMAGES])
+
+        downloaded_images.transform_values! do |upload_id|
+          upload_id == original_upload.id ? upload.id : upload_id
+        end
+
+        post.custom_fields[Post::DOWNLOADED_IMAGES] = downloaded_images.to_json if downloaded_images.present?
+        post.save_custom_fields
+      end
+
+      post.rebake!
     end
-
-    post.rebake!
   end
 
-  original_upload.reload.destroy! unless new_file
-
-  puts "" if ENV["VERBOSE"]
+  if existing_upload
+    original_upload.reload.destroy!
+  else
+    Discourse.store.remove_upload(original_upload)
+  end
 
   true
 end
 
-scope = Upload
-  .where("LOWER(extension) IN ('jpg', 'jpeg', 'gif', 'png')")
-  .where("COALESCE(width, 0) = 0 OR COALESCE(height, 0) = 0 OR COALESCE(thumbnail_width, 0) = 0 OR COALESCE(thumbnail_height, 0) = 0 OR width * height > ?", max_image_pixels)
-
-puts "Uploads to process: #{scope.count}"
-
-scope.find_each do |upload|
-  print "\rFixed dimensions: %8d        Downsized: %8d (upload id: #{upload.id})".freeze % [dimensions_count, downsized_count]
-  puts "\n" if ENV["VERBOSE"]
-
-  source = upload.local? ? Discourse.store.path_for(upload) : "https:#{upload.url}"
-
-  unless source
-    puts "no path or URL" if ENV["VERBOSE"]
-    next
+def process_uploads
+  unless SiteSetting.Upload.enable_s3_uploads
+    puts "This script supports only S3 uploads"
+    return
   end
 
-  w, h = FastImage.size(source, timeout: 10)
+  puts "", "Downsizing images to no more than #{MAX_IMAGE_PIXELS} pixels"
 
-  if !w || !h
-    puts "invalid image dimensions" if ENV["VERBOSE"]
-    next
+  dimensions_count = 0
+  downsized_count = 0
+
+  scope = Upload.where("LOWER(extension) IN ('jpg', 'jpeg', 'gif', 'png')")
+  scope = scope.where(<<-SQL, MAX_IMAGE_PIXELS)
+    COALESCE(width, 0) = 0 OR
+    COALESCE(height, 0) = 0 OR
+    COALESCE(thumbnail_width, 0) = 0 OR
+    COALESCE(thumbnail_height, 0) = 0 OR
+    width * height > ?
+  SQL
+
+  if ENV["WORKER_ID"] && ENV["WORKER_COUNT"]
+    scope = scope.where("id % ? = ?", ENV["WORKER_COUNT"], ENV["WORKER_ID"])
   end
 
-  ww, hh = ImageSizer.resize(w, h)
+  skipped = 0
+  total_count = scope.count
+  puts "Uploads to process: #{total_count}"
 
-  if w == 0 || h == 0 || ww == 0 || hh == 0
-    puts "invalid image dimensions" if ENV["VERBOSE"]
-    next
-  end
+  scope.find_each.with_index do |upload, index|
+    progress = (index * 100.0 / total_count).round(1)
 
-  if upload.read_attribute(:width) != w || upload.read_attribute(:height) != h || upload.read_attribute(:thumbnail_width) != ww || upload.read_attribute(:thumbnail_height) != hh
-    puts "Correcting the upload dimensions" if ENV["VERBOSE"]
-    dimensions_count += 1
+    log "\n"
+    print "\r#{progress}% Fixed dimensions: #{dimensions_count} Downsized: #{downsized_count} Skipped: #{skipped} (upload id: #{upload.id})"
+    log "\n"
 
-    upload.update!(
+    source = upload.local? ? Discourse.store.path_for(upload) : "https:#{upload.url}"
+
+    unless source
+      log "No path or URL"
+      skipped += 1
+      next
+    end
+
+    begin
+      w, h = FastImage.size(source, timeout: 15, raise_on_failure: true)
+    rescue FastImage::ImageFetchFailure
+      log "Retrying image resizing"
+      w, h = FastImage.size(source, timeout: 15)
+    rescue FastImage::UnknownImageType
+      log "Unknown image type"
+      skipped += 1
+      next
+    rescue FastImage::SizeNotFound
+      log "Size not found"
+      skipped += 1
+      next
+    end
+
+    if !w || !h
+      log "Invalid image dimensions"
+      skipped += 1
+      next
+    end
+
+    ww, hh = ImageSizer.resize(w, h)
+
+    if w == 0 || h == 0 || ww == 0 || hh == 0
+      log "Invalid image dimensions"
+      skipped += 1
+      next
+    end
+
+    upload.attributes = {
       width: w,
       height: h,
       thumbnail_width: ww,
-      thumbnail_height: hh,
-    )
+      thumbnail_height: hh
+    }
+
+    if upload.changed?
+      log "Correcting the upload dimensions"
+      log "Before: #{upload.width_was}x#{upload.height_was} #{upload.thumbnail_width_was}x#{upload.thumbnail_height_was}"
+      log "After:  #{w}x#{h} #{ww}x#{hh}"
+
+      dimensions_count += 1
+      upload.save!
+    end
+
+    if w * h < MAX_IMAGE_PIXELS
+      log "Image size within allowed range"
+      skipped += 1
+      next
+    end
+
+    path = upload.local? ? source : (Discourse.store.download(upload) rescue nil)&.path
+
+    unless path
+      log "No image path"
+      skipped += 1
+      next
+    end
+
+    if downsize_upload(upload, path)
+      downsized_count += 1
+    else
+      skipped += 1
+    end
   end
 
-  if w * h < max_image_pixels
-    puts "image size within allowed range" if ENV["VERBOSE"]
-    next
-  end
-
-  path = upload.local? ? source : (Discourse.store.download(upload) rescue nil)&.path
-
-  unless path
-    puts "no image path" if ENV["VERBOSE"]
-    next
-  end
-
-  downsized_count += 1 if downsize_upload(upload, path, max_image_pixels)
+  STDIN.beep
+  puts "", "Done", Time.zone.now
 end
 
-puts "", "Done"
+process_uploads

From 3d20a1143b6d8d27e9c073de257d93b69d2c1529 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Tue, 26 May 2020 10:06:07 -0400
Subject: [PATCH 1365/1830] Update translations

---
 config/locales/client.ar.yml                  |   15 +-
 config/locales/client.be.yml                  |    9 +-
 config/locales/client.bg.yml                  |   23 +-
 config/locales/client.bs_BA.yml               |   27 +-
 config/locales/client.ca.yml                  |   27 +-
 config/locales/client.cs.yml                  |   15 +-
 config/locales/client.da.yml                  |   27 +-
 config/locales/client.de.yml                  |   53 +-
 config/locales/client.el.yml                  |   15 +-
 config/locales/client.es.yml                  |   31 +-
 config/locales/client.et.yml                  |   13 +-
 config/locales/client.fa_IR.yml               |   20 +-
 config/locales/client.fi.yml                  |   77 +-
 config/locales/client.fr.yml                  | 1198 +++++++++--------
 config/locales/client.gl.yml                  |   10 +-
 config/locales/client.he.yml                  |   61 +-
 config/locales/client.hu.yml                  |   17 +-
 config/locales/client.hy.yml                  |  221 ++-
 config/locales/client.id.yml                  |    9 +-
 config/locales/client.it.yml                  |   84 +-
 config/locales/client.ja.yml                  |   17 +-
 config/locales/client.ko.yml                  |   28 +-
 config/locales/client.lt.yml                  |   14 +-
 config/locales/client.lv.yml                  |   15 +-
 config/locales/client.nb_NO.yml               |   21 +-
 config/locales/client.nl.yml                  |   52 +-
 config/locales/client.pl_PL.yml               |   30 +-
 config/locales/client.pt.yml                  |   15 +-
 config/locales/client.pt_BR.yml               |  206 ++-
 config/locales/client.ro.yml                  |   15 +-
 config/locales/client.ru.yml                  |   74 +-
 config/locales/client.sk.yml                  |   14 +-
 config/locales/client.sl.yml                  |   16 +-
 config/locales/client.sq.yml                  |   11 +-
 config/locales/client.sr.yml                  |   10 +-
 config/locales/client.sv.yml                  |   61 +-
 config/locales/client.sw.yml                  |   17 +-
 config/locales/client.te.yml                  |    9 +-
 config/locales/client.th.yml                  |   11 +-
 config/locales/client.tr_TR.yml               |   27 +-
 config/locales/client.uk.yml                  |   27 +-
 config/locales/client.ur.yml                  |   25 +-
 config/locales/client.vi.yml                  |   15 +-
 config/locales/client.zh_CN.yml               |   44 +-
 config/locales/client.zh_TW.yml               |   22 +-
 config/locales/server.ar.yml                  |    1 -
 config/locales/server.be.yml                  |    2 -
 config/locales/server.bs_BA.yml               |    1 -
 config/locales/server.ca.yml                  |    8 -
 config/locales/server.da.yml                  |    1 -
 config/locales/server.de.yml                  |   10 +-
 config/locales/server.el.yml                  |    1 -
 config/locales/server.es.yml                  |    9 -
 config/locales/server.fa_IR.yml               |    2 -
 config/locales/server.fi.yml                  |    9 -
 config/locales/server.fr.yml                  |  698 +++++-----
 config/locales/server.he.yml                  |   23 +-
 config/locales/server.hu.yml                  |    1 -
 config/locales/server.hy.yml                  |    5 +-
 config/locales/server.id.yml                  |    1 -
 config/locales/server.it.yml                  |   26 +-
 config/locales/server.ja.yml                  |    2 -
 config/locales/server.ko.yml                  |    3 -
 config/locales/server.nl.yml                  |   11 +-
 config/locales/server.pl_PL.yml               |    9 -
 config/locales/server.pt.yml                  |    2 -
 config/locales/server.pt_BR.yml               |  177 ++-
 config/locales/server.ro.yml                  |    1 -
 config/locales/server.ru.yml                  |   22 +-
 config/locales/server.sl.yml                  |    1 -
 config/locales/server.sq.yml                  |    1 -
 config/locales/server.sv.yml                  |   25 +-
 config/locales/server.sw.yml                  |    1 -
 config/locales/server.tr_TR.yml               |    4 -
 config/locales/server.uk.yml                  |    9 -
 config/locales/server.ur.yml                  |    8 -
 config/locales/server.vi.yml                  |    3 +-
 config/locales/server.zh_CN.yml               |   12 +-
 config/locales/server.zh_TW.yml               |    8 -
 .../config/locales/server.fr.yml              |    2 +-
 .../config/locales/server.pl_PL.yml           |    2 +-
 plugins/poll/config/locales/client.ar.yml     |   24 -
 plugins/poll/config/locales/client.be.yml     |   12 -
 plugins/poll/config/locales/client.bg.yml     |    6 -
 plugins/poll/config/locales/client.bs_BA.yml  |   15 -
 plugins/poll/config/locales/client.ca.yml     |   12 -
 plugins/poll/config/locales/client.cs.yml     |   18 -
 plugins/poll/config/locales/client.da.yml     |   12 -
 plugins/poll/config/locales/client.de.yml     |   12 -
 plugins/poll/config/locales/client.el.yml     |   12 -
 plugins/poll/config/locales/client.es.yml     |   12 -
 plugins/poll/config/locales/client.et.yml     |   12 -
 plugins/poll/config/locales/client.fa_IR.yml  |   12 -
 plugins/poll/config/locales/client.fi.yml     |   12 -
 plugins/poll/config/locales/client.fr.yml     |   33 +-
 plugins/poll/config/locales/client.he.yml     |   26 +-
 plugins/poll/config/locales/client.hu.yml     |    8 -
 plugins/poll/config/locales/client.hy.yml     |   12 -
 plugins/poll/config/locales/client.id.yml     |    9 -
 plugins/poll/config/locales/client.it.yml     |   12 -
 plugins/poll/config/locales/client.ja.yml     |    9 -
 plugins/poll/config/locales/client.ko.yml     |    9 -
 plugins/poll/config/locales/client.nb_NO.yml  |   12 -
 plugins/poll/config/locales/client.nl.yml     |   14 +-
 plugins/poll/config/locales/client.pl_PL.yml  |   18 -
 plugins/poll/config/locales/client.pt.yml     |   12 -
 plugins/poll/config/locales/client.pt_BR.yml  |   19 +-
 plugins/poll/config/locales/client.ro.yml     |   15 -
 plugins/poll/config/locales/client.ru.yml     |   26 +-
 plugins/poll/config/locales/client.sk.yml     |   18 -
 plugins/poll/config/locales/client.sl.yml     |   18 -
 plugins/poll/config/locales/client.sq.yml     |   12 -
 plugins/poll/config/locales/client.sv.yml     |   14 +-
 plugins/poll/config/locales/client.sw.yml     |   12 -
 plugins/poll/config/locales/client.th.yml     |    9 -
 plugins/poll/config/locales/client.tr_TR.yml  |   12 -
 plugins/poll/config/locales/client.uk.yml     |   18 -
 plugins/poll/config/locales/client.ur.yml     |   12 -
 plugins/poll/config/locales/client.vi.yml     |    9 -
 plugins/poll/config/locales/client.zh_CN.yml  |    9 -
 plugins/poll/config/locales/client.zh_TW.yml  |    9 -
 plugins/poll/config/locales/server.fr.yml     |    2 +
 plugins/poll/config/locales/server.pt_BR.yml  |    2 +
 123 files changed, 2411 insertions(+), 1999 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 759b60b904..85bd88a24f 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -604,7 +604,6 @@ ar:
         muted:
           title: "مكتوم"
       flair_url: "الصورة الرمزية المميزة"
-      flair_url_placeholder: "(إختياري) عنوان الـ URL للصورة أو اسم رمز في Font Awesome"
       flair_bg_color: "لون خلفية الصورة الرمزية"
       flair_bg_color_placeholder: "(إختياري) اللون بترميز Hexadecimal"
       flair_color: "لون الصورة الرمزية"
@@ -814,8 +813,9 @@ ar:
         regenerate: "إعادة إنشاء"
         disable: "عطل"
         enable: "فعل"
-        copied_to_clipboard: "تم نسخه الى لوحة العمل"
+        copy_to_clipboard: "نسخ الى لوحة العمل"
         copy_to_clipboard_error: "خطأ في نسخ البيانات الى لوحة العمل"
+        copied_to_clipboard: "تم نسخه الى لوحة العمل"
       second_factor:
         name: "الإسم"
         label: "كود"
@@ -824,9 +824,11 @@ ar:
         short_description: |
           قم بحماية الحساب الخاص بك مع رمز الامان ذو الاستخدام الواحد.
         oauth_enabled_warning: "يرجى الملاحظة ان تسجيل الدخول عن طريق حسابات مواقع التواصل الاجتماعي سيتم تعطيلها بمجرد تفعيل خاصية التوثيق بعاملين الحساب"
+        disable: "عطل"
+        save: "احفظ"
         edit: "عدّل"
         security_key:
-          delete: "أحذف"
+          save: "احفظ"
       change_about:
         title: "تعديل عني"
         error: "حدث عطل أثناء تغيير هذه القيمة."
@@ -1553,7 +1555,7 @@ ar:
         title: "انقل إلى البريد الوارد"
         help: "انقل الرسالة للبريد الوارد"
       edit_message:
-        title: "تحرير رسالة"
+        title: "عدّل"
       defer:
         title: "تأجيل"
       list: "الموضوعات"
@@ -2396,7 +2398,6 @@ ar:
         this_month: "شهر"
         this_week: "أسبوع"
         today: "يوم"
-        other_periods: "اعرض الاكثر مشاهدة"
     permission_types:
       full: "انشاء / رد / مشاهدة"
       create_post: "رد / مشاهدة"
@@ -2576,6 +2577,10 @@ ar:
       custom_message_placeholder: "ادخل رسالتك المخصصة"
       custom_message_template_forum: "مرحبا. عليك الانضمام إلى هذا المجتمع!"
       custom_message_template_topic: "مرحبا. أظن أن هذا الموضوع سيسعدك!"
+    footer_nav:
+      back: "الى الخلف"
+      share: "شاركها"
+      dismiss: "تجاهل"
     safe_mode:
       enabled: "الوضع الآمن مفعّل، لتخرج منه أغلق نافذة المتصفّح هذه"
   admin_js:
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index 87308e8966..586baf3d27 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -465,10 +465,12 @@ be:
       second_factor:
         title: "Два фактары аўтэнтыфікацыі"
         name: "Імя"
+        disable: "Адключыць"
+        save: "Захаваць"
         edit: "рэдагаваць"
         security_key:
           register: "рэгістрацыя"
-          delete: "выдаліць"
+          save: "Захаваць"
       change_about:
         title: "Змяніць інфу аба мяне"
       change_username:
@@ -891,6 +893,8 @@ be:
         title: "архіў"
       move_to_inbox:
         title: "Перамясціць у тэчцы Уваходныя"
+      edit_message:
+        title: "рэдагаваць"
       list: "тэмы"
       new: "новая тэма"
       unread: "непрачытаныя"
@@ -1261,6 +1265,9 @@ be:
           unread: "Непрачытаныя тэмы скончыліся."
           top: "There are no more top topics."
           bookmarks: "Тэмы ў закладках адсутнічаюць."
+    footer_nav:
+      back: "Назад"
+      share: "Падзяліцца"
   admin_js:
     admin:
       moderator: "Мадэратар"
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index 2dee0c16b7..d7a7eadcb5 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -580,7 +580,6 @@ bg:
         muted:
           title: "Заглушен"
       flair_url: "Добавка към аватара"
-      flair_url_placeholder: "(По желание) Адрес към снимка или Font Awesome клас"
       flair_bg_color: "Фон на добавка към аватара"
       flair_bg_color_placeholder: "(По желание) Шестнадесетична стойност на цвят"
       flair_color: "Цвят на добавка към аватар"
@@ -621,6 +620,13 @@ bg:
       topic_sentence:
         one: "%{count} тема"
         other: "%{count} теми"
+      topic_stat_sentence_week:
+        one: "%{count}нова тема през последната седмица."
+        other: "%{count}нови теми през последната седмица."
+      topic_stat_sentence_month:
+        one: "%{count}нова тема през последния месец."
+        other: "%{count}през последния месец."
+      n_more: "Категории (още %{count}) ..."
     ip_lookup:
       title: Търсене по IP адрес
       hostname: Хост
@@ -636,15 +642,18 @@ bg:
       topics_entered: "добавени теми"
       post_count: "# публикации"
       confirm_delete_other_accounts: "Сигурни ли сте, че искате да изтриете тези профили?"
+      powered_by: "с <a href='https://maxmind.com'>MaxMindDB</a>"
       copied: "копирано"
     user_fields:
       none: "(изберете опция)"
+      required: 'Моля, попълнете "%{name}"'
     user:
       said: "{{username}}:"
       profile: "Профил"
       mute: "Заглуши"
       edit: "Редактирай настройките"
       download_archive:
+        button_text: "Изтегли всичко"
         confirm: "Сигурни ли сте, че искате да свалите своите публикации?"
         success: "Свалянето е инициирано, ще бъдете уведомени чрез съобщение когато процесът е завършен."
         rate_limit_error: "Публикации могат да бъдат сваляни веднъж дневно, моля опитайте отново утре."
@@ -695,6 +704,7 @@ bg:
       dismiss_notifications: "Отмени всички"
       dismiss_notifications_tooltip: "Маркирайте всички непрочетени известия, като прочетени"
       first_notification: "Вашето първо известие! Изберете го за да започнете."
+      theme_default_on_all_devices: "Направи тази тема стандарт на всичките ми устройства"
       external_links_in_new_tab: "Отваряй всички външни връзки в нов раздел."
       enable_quoting: "Включи отговор с цитат при маркиран текст."
       change: "промени"
@@ -790,10 +800,12 @@ bg:
         name: "Име"
         label: "Код"
         use: "Използвайте приложението за удостоверяване"
+        disable: "Деактивиране"
+        save: "Запази"
         edit: "Редактирай"
         security_key:
           register: "Регистриране"
-          delete: "Изтрий"
+          save: "Запази"
       change_about:
         title: "Смяна на За мен"
         error: "Имаше грешка при промяна на тази стойност."
@@ -1407,6 +1419,8 @@ bg:
       move_to_inbox:
         title: "Премести във входящи"
         help: "Премести съобщението обратно във входящи"
+      edit_message:
+        title: "Редактирай"
       defer:
         title: "Отложи "
       list: "Теми"
@@ -2066,7 +2080,6 @@ bg:
         this_month: "Месец"
         this_week: "Седмица"
         today: "Днес"
-        other_periods: "виж отгоре"
     permission_types:
       full: "Създай / Отговори / Виж"
       create_post: "Отговари / Виж"
@@ -2205,6 +2218,10 @@ bg:
       custom_message_placeholder: "Въведете вашето персонализирано съобщение"
       custom_message_template_forum: "Хей, трябва да се присъединиш към този форум!"
       custom_message_template_topic: "Хей, мисля си, че ще се насладиш на тази тема!"
+    footer_nav:
+      back: "Назад"
+      share: "Споделяне"
+      dismiss: "Отмени"
   admin_js:
     type_to_filter: "филтрирай..."
     admin:
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 8dcc016a95..d190699927 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -692,8 +692,6 @@ bs_BA:
           title: "Utišano"
           description: "Nećete biti obaviješteni o bilo kojoj poruci u ovoj grupi."
       flair_url: "Slika Avatara sposobnosti"
-      flair_url_placeholder: "(Opciono) URL slike ili Font Awesome class"
-      flair_url_description: 'Koristite kvadratne slike ne manje od 20px od 20px ili FontAwesome ikone (prihvaćeni formati: "fa-icon", "far fa-icon" ili "fab fa-icon").'
       flair_bg_color: "Boja pozadine Slike Avatara sposobnosti"
       flair_bg_color_placeholder: "(Opciono) Hex broj boje"
       flair_color: "Boja Avatara sposobnosti"
@@ -943,8 +941,9 @@ bs_BA:
         enable: "Omogući"
         enable_long: "Omogućite rezervne kodove"
         manage: "Upravljajte rezervnim kodovima. Imate <strong>preostale</strong> rezervne kodove <strong>{{count}}</strong> ."
-        copied_to_clipboard: "Kopirano u međuspremnik"
+        copy_to_clipboard: "Kopirati u clipboard"
         copy_to_clipboard_error: "Pogreška pri kopiranju podataka u međuspremnik"
+        copied_to_clipboard: "Kopirano u međuspremnik"
         remaining_codes: "Imate <strong>preostale</strong> rezervne kodove <strong>{{count}}</strong> ."
         use: "Koristi backup kod"
         enable_prerequisites: "Morate omogućiti primarni drugi faktor prije generiranja rezervnih kodova."
@@ -970,27 +969,24 @@ bs_BA:
         oauth_enabled_warning: "Imajte na umu da će ulogovanje korištenjem socijalnih mreža biti isključeno u momentu kad uključite two factor authentication (dvofaktorsku ovjeru autentičnosti) na vašem korisničkom računu."
         use: "Koristi Authenticator app?"
         enforced_notice: "Morate omogućiti autentifikaciju s dva faktora prije pristupa ovoj web-lokaciji."
-        disable: "onemogući"
-        disable_title: "Onemogući Drugi Faktor"
+        disable: "Onemogući"
         disable_confirm: "Jeste li sigurni da želite onemogućiti sve druge faktore?"
+        save: "Sačuvaj"
         edit: "Izmijeni"
         edit_title: "Uredi drugi faktor"
         edit_description: "Ime drugog faktora"
-        enable_security_key_description: "Kada ste pripremili vaš fizikalni sigurnosni ključ (physical security key), pritisnite ispod dugme Registriraj."
         totp:
           title: "Autentikatori zasnovani na tokenu"
-          add: "Novi Authenticator"
           default_name: "Moj Authenticator"
         security_key:
           register: "Registriraj"
           title: "Sigurnosni ključevi"
-          add: "Registriraj sigurnosni ključ"
           default_name: "Glavni sigurnosni ključ"
           not_allowed_error: "Proces registracije sigurnosnog ključa je ili vremenski istekao ili je odkazan."
           already_added_error: "Već ste registrovali ovaj sigurnosni ključ. Nemate potrebe da ga ponovo registrujete."
           edit: "Izmijeni sigurnosni ključ"
+          save: "Sačuvaj"
           edit_description: "Ime sigurnosnog ključa"
-          delete: "Izbriši"
       change_about:
         title: "Promjeni O meni"
         error: "Desila se greška prilikom promjene."
@@ -1904,7 +1900,7 @@ bs_BA:
         help: "Premjesti poruke nazad u Sanduče"
       edit_message:
         help: "Izmijeni prvu objavu ove poruke"
-        title: "Izmijeni poruku"
+        title: "Izmijeni"
       defer:
         help: "Označi kao nepročitano"
         title: "Defer"
@@ -2771,7 +2767,6 @@ bs_BA:
         this_month: "Mjesec"
         this_week: "Nedelja"
         today: "Danas"
-        other_periods: "see top"
     permission_types:
       full: "Kreiraj / Odgovori / Vidi"
       create_post: "Odgovori / Vidi"
@@ -3009,6 +3004,10 @@ bs_BA:
       custom_message_template_forum: "Hej, trebalo bi da se pridružiš ovom forumu!"
       custom_message_template_topic: "Hej, mislio sam da ćete uživati u ovoj temi!"
     forced_anonymous: "Zbog ekstremnog opterećenja, ovo se privremeno prikazuje svima, jer bi ga odjavio korisnik."
+    footer_nav:
+      back: "Prethodno"
+      share: "Podijeli"
+      dismiss: "Odpusti"
     safe_mode:
       enabled: "Bezbedan režim je omogućen, da biste izašli iz bezbednog režima, zatvorite ovaj prozor pregledača"
   admin_js:
@@ -3222,12 +3221,6 @@ bs_BA:
         tag_event:
           name: "Oznaći događaj"
           details: "Kada se oznaka kreira, ažurira ili uništava."
-        flag_event:
-          name: "Prijavi event"
-          details: "Kada je prijava kreirana, potvrđena, odbačena ili ignorisana"
-        queued_post_event:
-          name: "Događaj nakon odobrenja"
-          details: "Kada se kreira, odobrava ili odbija novi post u redu čekanja."
         reviewable_event:
           name: "Eventable Event"
           details: "Kada je nova stavka spremna za pregled i kada je njen status ažuriran."
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 1da771ed35..8db7993d27 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -647,8 +647,6 @@ ca:
           title: "Silenciat"
           description: "No sereu notificat de res sobre els missatges d'aquest grup."
       flair_url: "Imatge de l'estil d'avatar"
-      flair_url_placeholder: "(Opcional) Imatge URL o classe Font Awesome "
-      flair_url_description: 'Feu servir imatges quadrades no més petites de 20px per 20 px o icones FontAwesome (formats acceptats: "fa-icon", "far fa-icon" o "fab fa-icon").'
       flair_bg_color: "Color de fons de l'estil d'avatar "
       flair_bg_color_placeholder: "(Opcional) Valor de color hexadecimal"
       flair_color: "Color de l'estil d'avatar"
@@ -890,8 +888,9 @@ ca:
         enable: "Activa"
         enable_long: "Activa els codis de còpia de seguretat"
         manage: "Gestiona els codis de còpia de seguretat. Us resten <strong>{{count}}</strong> codis de còpia de seguretat. "
-        copied_to_clipboard: "Copiat al porta-retalls."
+        copy_to_clipboard: "Copia al porta-retalls"
         copy_to_clipboard_error: "Error copiant dades al porta-retalls"
+        copied_to_clipboard: "Copiat al porta-retalls."
         remaining_codes: "Us resten <strong>{{count}}</strong> codis de còpia de seguretat."
         use: "Utilitza un codi de còpia de seguretat"
         enable_prerequisites: "Cal habilitar un segon factor primari abans de generar codis de còpia de seguretat."
@@ -917,27 +916,24 @@ ca:
         oauth_enabled_warning: "Observeu que els inicis de sessió amb xarxes socials seran deshabilitats quan l'autenticació de dos factors s'hagi activat en el vostre compte. "
         use: "Utilitza l'aplicació Authenticator"
         enforced_notice: "Cal que activeu l'autenticació de dos factors abans d'accedir a aquest lloc web."
-        disable: "deshabilita"
-        disable_title: "Deshabilita el segon factor"
+        disable: "Desactiva"
         disable_confirm: "Esteu segur que voleu deshabilitar tots els factors segons?"
+        save: "Desa"
         edit: "Edita"
         edit_title: "Edita el factor segon"
         edit_description: "Nom del factor segon"
-        enable_security_key_description: "Quan tingueu preparada la vostra clau de seguretat física, premeu el botó Registre."
         totp:
           title: "Autenticadors basats en testimonis"
-          add: "Autenticador nou"
           default_name: "El meu autenticador"
         security_key:
           register: "Registre"
           title: "Claus de seguretat"
-          add: "Registra la clau de seguretat"
           default_name: "Clau de seguretat principal"
           not_allowed_error: "El procés de registre de claus de seguretat ha arribat al límit de temps o s'ha cancel·lat. "
           already_added_error: "Ja heu registrat aquesta clau de seguretat. No cal que la registreu de nou."
           edit: "Edita la clau de seguretat"
+          save: "Desa"
           edit_description: "Nom de la clau de seguretat"
-          delete: "Suprimeix"
       change_about:
         title: "Canvia Quant a mi"
         error: "Hi ha hagut un error en canviar aquest valor"
@@ -1845,7 +1841,7 @@ ca:
         help: "Torna el missatge a la safata d'entrada"
       edit_message:
         help: "Edita la primera publicació del missatge"
-        title: "Edita el missatge"
+        title: "Edita"
       defer:
         help: "Marca com a no llegit"
         title: "Ajorna"
@@ -2688,7 +2684,6 @@ ca:
         this_month: "Mes"
         this_week: "Setmana"
         today: "Avui"
-        other_periods: "mira dalt de tot"
     permission_types:
       full: "Crea / Respon / Mira"
       create_post: "Respon / Mira"
@@ -2893,6 +2888,10 @@ ca:
       custom_message_template_forum: "Ep! Hauríeu d'unir-vos a aquest fòrum!"
       custom_message_template_topic: "Ep! Crec que us pot agradar aquest tema!"
     forced_anonymous: "A causa de la càrrega extrema, això es mostra temporalment a tothom com ho veuria un usuari que no ha iniciat sessió."
+    footer_nav:
+      back: "Enrere"
+      share: "Comparteix"
+      dismiss: "Descarta-ho"
     safe_mode:
       enabled: "El mode segur està activat. Per a sortir-ne tanqueu aquesta finestra del navegador."
   admin_js:
@@ -3136,12 +3135,6 @@ ca:
         tag_event:
           name: "Esdeveniment d'etiqueta"
           details: "Quan una etiqueta és creada, actualitzada o destruïda."
-        flag_event:
-          name: "Marca amb bandera l'esdeveniment"
-          details: "Quan una bandera és creada, s'hi està d'acord, no s'hi està d'acord o és ignorada. "
-        queued_post_event:
-          name: "Esdeveniment posterior a l'aprovació"
-          details: "Quan una nova publicació en cua és creada, aprovada o rebutjada"
         reviewable_event:
           name: "Esdeveniment revisable"
           details: "Quan un nou element està a punt per a revisió i quan el seu estatus és actualitzat."
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index f1edcc8522..ac5ed8e272 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -552,7 +552,6 @@ cs:
         muted:
           title: "Ztišený"
       flair_url: "Avatar Flair obrázek"
-      flair_url_placeholder: "(Volitelné) URL obrázku nebo třída Font Awesome "
       flair_bg_color: "Avatar Flair barva pozadí"
       flair_bg_color_placeholder: "(Volitelné) Hex kód barvy"
       flair_color: "Avatar Flair barva"
@@ -771,8 +770,9 @@ cs:
         disable: "Vypnout"
         enable: "Zapnout"
         enable_long: "Povolit záložní kódy"
-        copied_to_clipboard: "Zkopírováno do schránky"
+        copy_to_clipboard: "Kopírovat do schránky"
         copy_to_clipboard_error: "Chyba při kopírování dat do schránky"
+        copied_to_clipboard: "Zkopírováno do schránky"
         remaining_codes: "Zbývá vám <strong>{{count}}</strong> záložní kód."
         codes:
           title: "Záložní kódy vytvořeny"
@@ -788,9 +788,11 @@ cs:
         extended_description: |
           Dvoufaktorová autentizace přidává další bezpečnostní vrstvu k vašemu účtu, protože vedle hesla vyžaduje ještě i zadání jednorázového kódu, vytvořeného na zařízeních <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a> nebo <a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a>.
         oauth_enabled_warning: "Upozorňujeme, že možnost přihlásit se pomocí účtu ze sociální sítě bude vypnuta, jakmila bude na vašem účtu povolena dvoufaktorová autentizace."
+        disable: "Vypnout"
+        save: "Uložit"
         edit: "Upravit"
         security_key:
-          delete: "Smazat"
+          save: "Uložit"
       change_about:
         title: "Změna o mně"
         error: "Došlo k chybě při pokusu změnit tuto hodnotu."
@@ -1635,7 +1637,7 @@ cs:
         help: "Přesunout zprávu zpět do Přijaté"
       edit_message:
         help: "Upravit první příspěvek zprávy"
-        title: "upravit zprávu"
+        title: "Upravit"
       defer:
         title: "Odložit"
       list: "Témata"
@@ -2473,7 +2475,6 @@ cs:
         this_month: "Měsíc"
         this_week: "Týden"
         today: "Dnes"
-        other_periods: "viz nahoře"
     permission_types:
       full: "Vytvářet / Odpovídat / Prohlížet"
       create_post: "Odpovídat / Prohlížet"
@@ -2663,6 +2664,10 @@ cs:
       custom_message_template_forum: "Ahoj! Měl by se připojit na toto fórum!"
       custom_message_template_topic: "Ahoj, myslím si, že by se ti mohlo tohle téma líbit!"
     forced_anonymous: "Kvůli vysoké zátěži dočasně všichni vidí stránku tak, jak by ji viděli nepřihlášení uživatelé."
+    footer_nav:
+      back: "Zpět"
+      share: "Sdílet"
+      dismiss: "Označit jako přečtené"
     safe_mode:
       enabled: "Bezpečný režim je povolený, k jeho zakázání zavři toto okno prohlížeče"
   admin_js:
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index e4f1031ef2..29ff0441cb 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -646,8 +646,6 @@ da:
           title: "Tavs"
           description: "Du bliver ikke underrettet om noget om beskeder i denne gruppe."
       flair_url: "Avatar Flair-billede"
-      flair_url_placeholder: "(Valgfrit) Billed-URL eller Font Awesome klasse"
-      flair_url_description: 'Brug firkantede billeder, der ikke er mindre end 20px gange 20px eller FontAwesome-ikoner (accepterede formater: "fa-icon", "far fa-icon" eller "fab fa-icon").'
       flair_bg_color: "Avatar Flair-baggrundsfarve"
       flair_bg_color_placeholder: "(Valgfrit) Hex farveværdi"
       flair_color: "Avatar Flair-farve"
@@ -892,8 +890,9 @@ da:
         enable: "Aktiver"
         enable_long: "Aktivér backup koder"
         manage: "Administrér backup koder. Du har <strong>{{count}}</strong> backup koder tilbage."
-        copied_to_clipboard: "Kopierede til udklipsholder"
+        copy_to_clipboard: "Kopiér til udklipsholder"
         copy_to_clipboard_error: "Fejl ved kopiering til udklipsholder"
+        copied_to_clipboard: "Kopierede til udklipsholder"
         remaining_codes: "Du har <strong>{{count}}</strong> backup koder tilbage."
         use: "Brug en backup kode"
         enable_prerequisites: "Du skal aktivere en primær anden faktor, før du genererer backup koder."
@@ -919,22 +918,19 @@ da:
         oauth_enabled_warning: "Bemærk, at sociale logins deaktiveres, når To-faktor godkendelse er aktiveret på din konto."
         use: "Brug Autentificeringsapp"
         enforced_notice: "Du skal aktivere To-faktor godkendelse før du kan gå ind på denne side."
-        disable: "deaktiver"
-        disable_title: "Deaktiver anden faktor"
+        disable: "Deaktivér"
         disable_confirm: "Er du sikker på, at du vil deaktivere alle andre faktorer?"
+        save: "Gem"
         edit: "Rediger"
         edit_title: "Rediger anden faktor"
         edit_description: "Navn på anden faktor"
-        enable_security_key_description: "Når du har din fysiske sikkerhedstast klar, skal du trykke på knappen Registrer nedenfor."
         totp:
           title: "Token-baserede autentificatorer"
-          add: "Ny autentifikator"
           default_name: "Min autentifikator"
         security_key:
           register: "Registrer"
           title: "Sikkerhedsnøgler"
-          add: "Registrer sikkerhedsnøgle"
-          delete: "Slet"
+          save: "Gem"
       change_about:
         title: "Skift “Om mig”"
         error: "Der opstod en fejl i ændringen af denne værdi."
@@ -1815,7 +1811,7 @@ da:
         help: "Flyt beskeder tilbage til Indbakke"
       edit_message:
         help: "Rediger det første indlæg af beskeden"
-        title: "Rediger Besked"
+        title: "Rediger"
       defer:
         help: "Markér som ulæst"
         title: "Udsæt"
@@ -2646,7 +2642,6 @@ da:
         this_month: "Måned"
         this_week: "Uge"
         today: "I dag"
-        other_periods: "se top"
     permission_types:
       full: "Opret / Besvar / Se"
       create_post: "Besvar / Se"
@@ -2850,6 +2845,10 @@ da:
       custom_message_template_forum: "Hej, du burde tilmelde dig dette forum!"
       custom_message_template_topic: "Hej, jeg tænkte du måske ville synes om dette emne!"
     forced_anonymous: "På grund af ekstrem belastning vises dette midlertidigt for alle, da en logget ud bruger bruger også ville se det."
+    footer_nav:
+      back: "Tilbage"
+      share: "Del"
+      dismiss: "Afvis"
     safe_mode:
       enabled: "Sikker tilstand er slået til - for at forlade sikker tilstand, så luk dette browservindue"
   admin_js:
@@ -3076,12 +3075,6 @@ da:
         tag_event:
           name: "Tag begivenhed"
           details: "Når et tag bliver oprettet, opdateret eller ødelagt."
-        flag_event:
-          name: "Markér begivenhed"
-          details: "Når en markering oprettes, aftales, ueniggøres eller ignoreres."
-        queued_post_event:
-          name: "Indlæggodkendelsesbegivenhed"
-          details: "Når en ny indlæg i kø oprettes, godkendes eller afvises."
         reviewable_event:
           name: "Begivenhed, der kan gennemgås"
           details: "Når et nyt punkt er klar til gennemgang, og når dets status opdateres."
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 61159aa31b..0851c90d14 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -260,20 +260,37 @@ de:
       help:
         bookmark: "Klicke hier, um ein Lesezeichen auf den ersten Beitrag in diesem Thema zu setzen."
         unbookmark: "Klicke hier, um alle Lesezeichen in diesem Thema zu entfernen."
+        unbookmark_with_reminder: "Klicke hier um alle Lesezeichen und Erinnerungen in diesem Thema zu löschen. Du hast eine Erinnerung für %{reminder_at} zu diesem Thema."
     bookmarks:
+      created: "du hast ein Lesezeichen für diesen Beitrag %{name} gesetzt"
       not_bookmarked: "Lesezeichen auf diesen Beitrag setzen"
+      created_with_reminder: "Lesezeichen mit Erinnerung für %{date}%{name} gesetz "
+      created_with_at_desktop_reminder: "Du hast ein Lesezeichen für diesen Beitrag gesetzt und wirst das nächste Mal, wenn Du am Rechner sitzt, daran erinnert.%{name}"
       remove: "Lesezeichen entfernen"
+      delete: "Lesezeichen löschen"
+      confirm_delete: "Lesezeichen wirklich löschen? Die Erinnerung daran wird dann auch gelöscht."
       confirm_clear: "Bist du sicher, dass du alle Lesezeichen in diesem Thema entfernen möchtest? "
       save: "Speichern"
       no_timezone: 'Du hast noch keine Zeitzone ausgewählt. Du wirst keine Erinnerungen erstellen können. Stelle eine <a href="%{basePath}/my/preferences/profile">in deinem Profil</a> ein.'
+      invalid_custom_datetime: "Ungültiges Datum und/oder Uhrzeit. Bitte nochmals versuchen.\n "
+      list_permission_denied: "Dir fehlt die Erlaubnis, die Lesezeichen dieses Nutzers gezeigt zu bekommen."
+      delete_when_reminder_sent: "Dieses Lesezeichen nach Versenden einer Erinnerung löschen."
       reminders:
         at_desktop: "Nächstes mal wenn ich an meinem PC bin"
         later_today: "Im Laufe des Tages"
+        next_business_day: "Nächster Werktag"
         tomorrow: "Morgen"
         next_week: "Nächste Woche"
         later_this_week: "Später in dieser Woche"
+        start_of_next_business_week: "Nächster Montag"
         next_month: "Nächster Monat"
         custom: "Eigenes Datum und Zeit"
+        last_custom: "Letzter"
+        none: "Keine Erinnerung nötig"
+        today_with_time: "heute um %{time}"
+        tomorrow_with_time: "morgen um %{time}"
+        at_time: "um %{date_time}"
+        existing_reminder: "Es gibt eine Erinnerung für dieses Lesezeichen, die versendet werden wird"
     drafts:
       resume: "Fortsetzen"
       remove: "Entfernen"
@@ -657,8 +674,6 @@ de:
           title: "Stummgeschaltet"
           description: "Du erhältst keine Benachrichtigungen im Zusammenhang mit Nachrichten in dieser Gruppe."
       flair_url: "Avatar-Hintergrund"
-      flair_url_placeholder: "(Optional) Bild-URL oder Font Awesome-Klasse"
-      flair_url_description: 'Verwende quadratische Bilder, die nicht kleiner als 20x20 Pixel sind oder FontAwesome-Icons (akzeptierte Formate: "fa-icon", "far fa-icon" oder "fab fa-icon").'
       flair_bg_color: "Avatar-Hintergrundfarbe"
       flair_bg_color_placeholder: "(Optional) Hex-Farbwert"
       flair_color: "Avatar-Hintergrundfarbe"
@@ -905,8 +920,9 @@ de:
         enable: "Aktivieren"
         enable_long: "Wiederherstellungscodes aktivieren"
         manage: "Verwalte Sicherungscodes. Du hast noch <strong>{{count}}</strong> Sicherungscodes."
-        copied_to_clipboard: "Wurde in Zwischenablage kopiert"
+        copy_to_clipboard: "In Zwischenablage kopieren"
         copy_to_clipboard_error: "Beim Kopieren in die Zwischenablage trat ein Fehler auf"
+        copied_to_clipboard: "Wurde in Zwischenablage kopiert"
         remaining_codes: "Du hast noch <strong>{{count}}</strong> Wiederherstellungscodes übrig."
         use: "Benutze einen Backup-Code"
         enable_prerequisites: "Du musst vor dem Generieren von Sicherungscodes einen primären zweiten Faktor aktivieren."
@@ -932,27 +948,26 @@ de:
         oauth_enabled_warning: "Beachte bitte, dass soziale Anmelde-Methoden deaktiviert werden, sobald die Zwei-Faktor-Authentifizierung für dein Konto aktiviert ist."
         use: "Benutze die Authentifizierungs-App"
         enforced_notice: "Du musst Zwei-Faktor-Authentifizierung aktivieren, bevor du auf diese Seite zugreifen kannst."
-        disable: "deaktivieren"
-        disable_title: "Zweiten Faktor deaktivieren"
+        disable: "Deaktivieren"
         disable_confirm: "Sollen alle zweiten Faktoren deaktiviert werden?"
+        save: "Speichern"
         edit: "Bearbeiten"
         edit_title: "Zweiten Faktor bearbeiten"
         edit_description: "Name des zweiten Faktors"
-        enable_security_key_description: "Wenn Du deinen physischen Sicherheitsschlüssel vorbereitet hast, klicke unten auf die Schaltfläche Registrieren."
         totp:
           title: "Token-basierte Authentifikatoren"
-          add: "Neuer Authentifikator"
           default_name: "Mein Authentifikator"
         security_key:
           register: "Registrieren"
           title: "Sicherheitsschlüssel"
-          add: "Registriere den Sicherheitsschlüssel"
+          add: "Sicherheitsschlüssel hinzufügen"
           default_name: "Hauptsicherheitsschlüssel"
           not_allowed_error: "Der Registrierungsvorgang für den Sicherheitsschlüssel ist abgelaufen oder wurde abgebrochen."
-          already_added_error: "Du hast diesen Sicherheitsschlüssel bereits registriert. Du musst Ihn nicht erneut registrieren.\e"
+          already_added_error: "Du hast diesen Sicherheitsschlüssel bereits registriert. Du musst Ihn nicht erneut registrieren."
           edit: "Bearbeite den Sicherheitsschlüssel"
+          save: "Speichern"
           edit_description: "Name des Sicherheitsschlüssels"
-          delete: "Löschen"
+          name_required_error: "Ein wird ein Name für den Sicherheitsschlüssel benötigt."
       change_about:
         title: "„Über mich“ ändern"
         error: "Beim Ändern dieses Wertes ist ein Fehler aufgetreten."
@@ -969,6 +984,8 @@ de:
         success_staff: "Wir haben eine E-Mail an deine aktuelle Adresse geschickt. Bitte folge den Bestätigungsanweisungen."
       change_avatar:
         title: "Ändere dein Profilbild"
+        gravatar_title: "Ändere deinen Avatar auf der Website von {{gravatarName}}"
+        gravatar_failed: "{{gravatarName}} zu dieser Email-Adresse nicht gefunden."
         letter_based: "ein vom System zugewiesenes Profilbild"
         uploaded_avatar: "Eigenes Bild"
         uploaded_avatar_empty: "Eigenes Bild hinzufügen"
@@ -1031,6 +1048,9 @@ de:
         any: "(keine Einschränkung)"
       password_confirmation:
         title: "Wiederholung des Passworts"
+      invite_code:
+        title: "Einladungs-Code"
+        instructions: "Zur Registrierung eines Benutzerkontos wird ein Einladungs-Code benötigt."
       auth_tokens:
         title: "Kürzlich benutzte Geräte"
         ip: "IP"
@@ -1867,7 +1887,7 @@ de:
         help: "Nachricht in den Posteingang zurück verschieben"
       edit_message:
         help: "Bearbeite ersten Beitrag dieser Nachricht"
-        title: "Nachricht bearbeiten"
+        title: "Bearbeiten"
       defer:
         help: "Als ungelesen markieren"
         title: "Ignorieren"
@@ -2725,7 +2745,6 @@ de:
         this_month: "Monat"
         this_week: "Woche"
         today: "Heute"
-        other_periods: "zeige angesagte Themen:"
     permission_types:
       full: "Erstellen / Antworten / Ansehen"
       create_post: "Antworten / Ansehen"
@@ -2953,6 +2972,10 @@ de:
       custom_message_template_forum: "Hey, du solltest diesem Forum beitreten!"
       custom_message_template_topic: "Hey, ich dachte, dir könnte dieses Thema gefallen!"
     forced_anonymous: "Aufgrund einer außergewöhnlichen Last wird dies vorübergehend so angezeigt, wie es ein nicht angemeldeter Benutzer sehen würde."
+    footer_nav:
+      back: "Zurück"
+      share: "Teilen"
+      dismiss: "Alles gelesen"
     safe_mode:
       enabled: "Der geschützte Modus ist aktiviert. Schliesse das Browserfenster um ihn zu verlassen."
   admin_js:
@@ -3199,12 +3222,6 @@ de:
         tag_event:
           name: "Schlagwort-Ereignis"
           details: "Wenn ein Schlagwort erstellt, aktualisiert oder gelöscht wird."
-        flag_event:
-          name: "Meldung-Ereignis"
-          details: "Wenn eine Meldung erstellt, akzeptiert, abgelehnt oder ignoriert wird."
-        queued_post_event:
-          name: "Ereignis nach Beitragsgenehmigung"
-          details: "Wenn eine Beitrag in der Warteschlange erstellt, genehmigt oder abgelehnt wird."
         reviewable_event:
           name: "Überpüfbares Ereignis"
           details: "Wenn ein neuer Eintrag zur Überprüfung bereit ist und wenn sich sein Status ändert."
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 96a986d64b..e96527ebe6 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -441,7 +441,6 @@ el:
         muted:
           title: "Σε σιγή"
       flair_url: "Avatar Flair Εικόνα"
-      flair_url_placeholder: "(Προαιρετικό) URL εικόνας ή Font Awesome class "
       flair_bg_color: "Avatar Flair Χρώμα Φόντου"
       flair_bg_color_placeholder: "(Προαιρετικό) Τιμή χρώματος Hex"
       flair_color: "Avatar Flair Χρώμα"
@@ -646,14 +645,17 @@ el:
         regenerate: "Αναδημιουγία"
         disable: "Απενεργοποίηση"
         enable: "Ενεργοποίηση"
-        copied_to_clipboard: "Αντιγράφτηκε στο Clipboard"
+        copy_to_clipboard: "Αντιγραφή στο Clipboard"
         copy_to_clipboard_error: "Σφάλμα αντιγραφής δεδομένων στο Clipboard"
+        copied_to_clipboard: "Αντιγράφτηκε στο Clipboard"
       second_factor:
         name: "Όνομα"
+        disable: "Απενεργοποίηση"
+        save: "Αποθήκευση"
         edit: "Επεξεργασία"
         security_key:
           register: "Εγγραφή"
-          delete: "Σβήσιμο"
+          save: "Αποθήκευση"
       change_about:
         title: "Άλλαξε τα «σχετικά με εμένα»"
         error: "Προέκυψε σφάλμα στην αλλαγή της αξίας."
@@ -1334,6 +1336,8 @@ el:
       move_to_inbox:
         title: "Μετακίνηση στα Εισερχόμενα"
         help: "Μετακίνηση μηνύματος πίσω στα Εισερχόμενα"
+      edit_message:
+        title: "Επεξεργασία"
       defer:
         title: "Αναβολή"
       list: "Νήματα"
@@ -2054,7 +2058,6 @@ el:
         this_month: "Μήνας"
         this_week: "Εβδομάδα"
         today: "Σήμερα"
-        other_periods: "δες τα κορυφαία"
     permission_types:
       full: "Δημιούργησε / Απάντησε / Δες"
       create_post: "Απάντησε / Δες"
@@ -2214,6 +2217,10 @@ el:
       custom_message_placeholder: "Πρόσθεσε το προσαρμοσμένο μήνυμά σου"
       custom_message_template_forum: "Γεια, θα πρέπει να λάβεις μέρος σε αυτό το χώρο συζητήσεων!"
       custom_message_template_topic: "Γεια, νομίζω ότι θα απολαύσεις αυτό το νήμα!"
+    footer_nav:
+      back: "Πίσω"
+      share: "Κοινοποίηση"
+      dismiss: "Απόρριψη"
     safe_mode:
       enabled: "Η λειτουργία ασφαλείας είναι ενεργοποιημένη, για να εξέλθεις από τη λειτουργία ασφαλείας κλείσε το παράθυρο περιήγησης"
   admin_js:
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 3ec3f6d815..08c3703d09 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -672,8 +672,6 @@ es:
           title: "Silenciado"
           description: "No se te notificará nada sobre los mensajes en este grupo."
       flair_url: "Imagen del sub-avatar"
-      flair_url_placeholder: "(Opcional) URL de imagen o clase de Font Awesome"
-      flair_url_description: 'Usa imágenes cuadradas de no menos de 20 px por 20 px o los iconos de FontAwesome (formatos aceptados: «fa-icon», «far fa-icon» o «fab fa-icon»).'
       flair_bg_color: "Color de fondo del sub-avatar"
       flair_bg_color_placeholder: "(Opcional) Valor de color hexadecimal"
       flair_color: "Color del sub-avatar"
@@ -923,8 +921,9 @@ es:
         enable: "Deshabilitar"
         enable_long: "Habilitar códigos de respaldo"
         manage: "Administrar los códigos de respaldo. Tienes <strong>{{count}}</strong> códigos de respaldo restantes."
-        copied_to_clipboard: "Copiado al portapapeles"
+        copy_to_clipboard: "Copiar al portapapeles"
         copy_to_clipboard_error: "Error al copiar datos al portapapeles"
+        copied_to_clipboard: "Copiado al portapapeles"
         remaining_codes: "Tienes <strong>{{count}}</strong> códigos de respaldo restantes."
         use: "Usar un código de respaldo"
         enable_prerequisites: "Debes habilitar un segundo factor primario antes de generar códigos de respaldo."
@@ -950,28 +949,25 @@ es:
         oauth_enabled_warning: "Por favor, ten en cuenta que el acceso a tu cuenta a través de redes sociales se inhabilitará si activas la autenticación en dos pasos."
         use: "Usar app Authenticator"
         enforced_notice: "Se necesita que actives la autenticación en dos pasos antes de acceder a este sitio."
-        disable: "inhabilitar"
-        disable_title: "Inhabilitar segundo factor"
+        disable: "Inhabilitar"
         disable_confirm: "¿Estás seguro de que quieres inhabilitar todos los segundos factores?"
+        save: "Guardar"
         edit: "Editar"
         edit_title: "Editar segundo factor"
         edit_description: "Nombre del segundo factor"
-        enable_security_key_description: "Cuando tengas tu clave de seguridad física preparada, presione el botón de registro que se encuentra debajo."
         totp:
           title: "Autenticación basada en tokens"
-          add: "Nuevo autenticador"
           default_name: "Mi autenticador"
           name_and_code_required_error: "Debes introducir un nombre y un código de tu aplicación de autentificación."
         security_key:
           register: "Registrar"
           title: "Claves de seguridad"
-          add: "Clave de seguridad de registro"
           default_name: "Clave de seguridad principal"
           not_allowed_error: "El proceso de registro de clave de seguridad fue cancelado o se agotó el tiempo."
           already_added_error: "Ya registraste esta clave de seguridad. No tienes que registrarla de nuevo."
           edit: "Editar clave de seguridad"
+          save: "Guardar"
           edit_description: "Nombre de la clave de seguridad"
-          delete: "Eliminar"
           name_required_error: "Debes introducir un nombre para tu llave de seguridad."
       change_about:
         title: "Cambiar «Acerca de mí»"
@@ -1668,9 +1664,6 @@ es:
         message:
           one: "%{count} mensaje sin leer"
           other: "{{count}} mensajes sin leer"
-        high_priority:
-          one: "%{count} notificación de alta prioridad sin leer"
-          other: "%{count} notificaciones de alta prioridad sin leer"
       title: "notificaciones por menciones a tu @nombre, respuestas a tus publicaciones y temas, mensajes, etc"
       none: "No se pudieron cargar las notificaciones en este momento."
       empty: "No se encontraron notificaciones."
@@ -1906,7 +1899,7 @@ es:
         help: "Restaurar mensaje a la bandeja de entrada"
       edit_message:
         help: "Editar la primera publicación del mensaje"
-        title: "Editar Mensaje"
+        title: "Editar"
       defer:
         help: "Marcar como no leído"
         title: "Aplazar"
@@ -2795,7 +2788,6 @@ es:
         this_month: "Mes"
         this_week: "Semana"
         today: "Hoy"
-        other_periods: "ver los destacados"
     permission_types:
       full: "Crear / Responder / Ver"
       create_post: "Responder / Ver"
@@ -3040,6 +3032,10 @@ es:
       custom_message_template_forum: "¡Hey, deberías unirte a este foro!"
       custom_message_template_topic: "¡Hey, creemos que este tema te va a encantar!"
     forced_anonymous: "Debido a una carga extrema, esto se está mostrando temporalmente a todos como lo vería un usuario que no haya iniciado sesión."
+    footer_nav:
+      back: "Atrás"
+      share: "Compartir"
+      dismiss: "Descartar"
     safe_mode:
       enabled: "El modo seguro está activado, para salir del modo seguro cierra esta ventana del navegador"
   admin_js:
@@ -3290,12 +3286,6 @@ es:
         tag_event:
           name: "Evento de etiqueta"
           details: "Cuando se crea, actualiza o destruye una etiqueta."
-        flag_event:
-          name: "Evento de reporte"
-          details: "Cuando se crea, se define como de acuerdo, se define como en  desacuerdo o se ignora un reporte."
-        queued_post_event:
-          name: "Evento de aprobación de publicación"
-          details: "Cuando se crea, aprueba o rechaza una nueva publicación en cola."
         reviewable_event:
           name: "Evento de revisión"
           details: "Cuando un elemento nuevo está disponible para ser revisado y cuando su estado se actualiza."
@@ -4045,7 +4035,6 @@ es:
         anonymize_failed: "Hubo un problema al hacer anónima la cuenta."
         delete: "Eliminar usuario"
         merge:
-          transfer_and_delete: "Transferir y eliminar"
           prompt:
             title: "Transferir y eliminar @%{username}"
             description: |
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 810a34c8be..906304e4fe 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -478,7 +478,6 @@ et:
         muted:
           title: "Vaigistatud"
       flair_url: "Avatari andekuse pilt"
-      flair_url_placeholder: "(Valikuline) Pildi URL või Font Awesome klass"
       flair_bg_color: "Avatari andekuse taustavärv"
       flair_bg_color_placeholder: "(Valikuline) Värvi väärtus heksakoodis"
       flair_color: "Avatari andekuse värv"
@@ -685,6 +684,7 @@ et:
         regenerate: "Genereeri uus"
         disable: "Keela"
         enable: "Luba"
+        copy_to_clipboard: "Kopeeri lõikelauale"
         copied_to_clipboard: "Kopeeritud lõikelauale"
       second_factor:
         confirm_password_description: "Palun kinnita jätkamiseks oma parooli"
@@ -692,10 +692,12 @@ et:
         label: "Kood"
         rate_limit: "Palun oota enne kui proovid mõnda teist autentimise koodi."
         show_key_description: "Sisesta käsitsi"
+        disable: "Keela"
+        save: "Salvesta"
         edit: "Muuda"
         security_key:
           register: "Registreeru"
-          delete: "Kustuta"
+          save: "Salvesta"
       change_about:
         title: "Muuda minu andmeid"
         error: "Välja muutmisel tekkis viga."
@@ -1413,7 +1415,7 @@ et:
         title: "Liiguta Postkasti"
         help: "Liiguta sõnum tagasi Postkasti"
       edit_message:
-        title: "Muuda sõnumit"
+        title: "Muuda"
       defer:
         title: "Lükka edasi"
       list: "Teemad"
@@ -2112,7 +2114,6 @@ et:
         this_month: "Kuu"
         this_week: "Nädal"
         today: "Täna"
-        other_periods: "vaata juhtivaid"
     permission_types:
       full: "Loo / Vasta / Vaata"
       create_post: "Vasta / Vaata"
@@ -2268,6 +2269,10 @@ et:
       custom_message_placeholder: "Sisesta oma individuaalne sõnum"
       custom_message_template_forum: "Kuule, Sa peaksid selle foorumiga liituma!"
       custom_message_template_topic: "Kuule, arvan et see teema meeldiks Sulle!"
+    footer_nav:
+      back: "Tagasi"
+      share: "Jaga"
+      dismiss: "Ignoreeri"
     safe_mode:
       enabled: "Kaitstud režiim on aktiivne, väljumiseks sulge see brauseri aken."
   admin_js:
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index e29e956d0f..3c55bb46ff 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -656,8 +656,6 @@ fa_IR:
           title: "بی‌صدا شد"
           description: "شما برای هر اتفاقی در ارتباط با پیام های این گروه آگاه سازی می‌گیرید."
       flair_url: "تصویر آواتار"
-      flair_url_placeholder: "(اختیاری) URL تصویر و یا کلاس Font Awesome"
-      flair_url_description: 'از تصاویر مربعی بزرگتر از ۲۰پیکسل × ۲۰ پیکسل و یا ایکون های فونت آسام استفاده کنید (فرمت های قابل قبول: "fa-icon", "far fa-icon", "fab fa-icon" ).'
       flair_bg_color: "رنگ پس زمینه آواتار"
       flair_bg_color_placeholder: "(اختیاری) کد HEX رنگ"
       flair_color: "رنگ آواتار"
@@ -904,8 +902,9 @@ fa_IR:
         enable: "فعال کردن"
         enable_long: "کدهای پشتیبان را به کار بگیر"
         manage: "مدیریت کد‌های پشتیبانی، <strong>{{count}}</strong> از کد‌های پشتیبانی شما باقی مانده"
-        copied_to_clipboard: "کپی شد"
+        copy_to_clipboard: "کپی در clipboard"
         copy_to_clipboard_error: "خطا در کپی اطلاعات"
+        copied_to_clipboard: "کپی شد"
         remaining_codes: "شما <strong>{{count}}</strong>کد پشتیبان باقی مانده دارید."
         use: "از کد پشتیبان استفاده کنید"
         enable_prerequisites: "شما باید قبل از ساخت کد‌های پشتیبانی یک تایید هویت دوعاملی اصلی را فعال کنید "
@@ -931,25 +930,23 @@ fa_IR:
         oauth_enabled_warning: "دقت کنید وقتی احراز هویت دوعامله فعال شود، ورود با حساب شبکه های اجتماعی به حساب کاربری شما از کار میفتد."
         use: "از اپلیکیشن احراز هویت استفاده کنید"
         enforced_notice: "شما باید احراز هویت دو عامله را قبل از دسترسی به سایت فعال کنید"
-        disable: "غیرفعال"
-        disable_title: "غیر فعال کردن تایید دوعاملی"
+        disable: "ازکاراندازی"
         disable_confirm: "ایا از غیرفعال‌ سازی تمامی تایید‌های دوعاملی مطمعن‌ هستید؟"
+        save: "ذخیره"
         edit: "ویرایش"
         edit_title: "ویرایش تایید دوعاملی"
         edit_description: "نام تایید دوعاملی"
         totp:
           title: "تایید برپایه توکن"
-          add: "تایید کننده جدید"
           default_name: "تایید‌کننده من"
         security_key:
           register: "ثبت‌نام"
           title: "کلیدهای امنیتی"
-          add: "کلید امنیتی را ثبت کنید"
           default_name: "کلید امنیتی اصلی"
           not_allowed_error: "روند ثبت کلید امنیتی به پایان رسیده است یا لغو شده است."
           edit: "کلید امنیتی را ویرایش کنید"
+          save: "ذخیره"
           edit_description: "نام کلید امنیتی"
-          delete: "حذف"
       change_about:
         title: "تغییر «درباره‌ی من»"
         error: "در فرآیند تغییر این مقدار خطایی روی داد."
@@ -1830,7 +1827,7 @@ fa_IR:
         help: "بازگرداندن پیام به صندوق دریافتی"
       edit_message:
         help: "ویرایش اولین نوشته از پیام"
-        title: "ویرایش پیام"
+        title: "ویرایش"
       defer:
         help: "علامت به عنوان خوانده نشده"
         title: " واگذار کردن"
@@ -2625,7 +2622,6 @@ fa_IR:
         this_month: "ماه"
         this_week: "هفته"
         today: "امروز"
-        other_periods: "دیدن بالاترین مطالب"
     permission_types:
       full: "ساختن / پاسخ دادن / دیدن"
       create_post: "پاسخ دادن / دیدن"
@@ -2815,6 +2811,10 @@ fa_IR:
       custom_message_placeholder: "متن پیام خود را وارد کنید"
       custom_message_template_forum: "سلام، باید عضو این انجمن بشی!"
       custom_message_template_topic: "سلام، فکر کردم از این موضوع لذت می‌بری!"
+    footer_nav:
+      back: "بازگشت"
+      share: "اشتراک‌گذاری"
+      dismiss: "نخواستیم"
     safe_mode:
       enabled: "حالت امن فعال شده، برای خروج از حالت امن این پنجره مرورگر را ببندید."
   admin_js:
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index f19f9d1356..98d9a4a06b 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -264,8 +264,13 @@ fi:
         unbookmark: "Klikkaa poistaaksesi kaikki tämän ketjun kirjanmerkit"
         unbookmark_with_reminder: "Poista kaikki kirjanmerkkisi ja muistutuksesi tästä ketjusta klikkaamalla. Olet asettanut muistutuksen tästä ketjusta ajankohtaan %{reminder_at}."
     bookmarks:
+      created: "olet kirjanmerkinnyt tämän viestin%{name}"
       not_bookmarked: "lisää viesti kirjanmerkkeihin"
+      created_with_reminder: "olet kirjanmerkinnyt tämän viestin muistutuksen kera %{date}%{name}"
+      created_with_at_desktop_reminder: "olet kirjanmerkinnyt tämän viestin ja siitä muistutetaan kun olet seuraavan kerran työpöytäympäristössä%{name}"
       remove: "Poista kirjanmerkki"
+      delete: "Poista kirjanmerkki"
+      confirm_delete: "Oletko varma, että haluat poistaa tämän kirjanmerkin? Muistutus poistetaan myös."
       confirm_clear: "Haluatko varmasti poistaa kaikki kirjanmerkkisi tästä ketjusta?"
       save: "Tallenna"
       no_timezone: 'Et ole valinnut aikavyöhykettä, joten et voi asettaa muistutuksia. Aseta se  <a href="%{basePath}/my/preferences/profile">profiilisivullasi</a>.'
@@ -278,9 +283,15 @@ fi:
         tomorrow: "Huomenna"
         next_week: "Ensi viikolla"
         later_this_week: "Myöhemmin tällä viikolla"
+        start_of_next_business_week: "Ensi maanantaina"
         next_month: "Ensi kuussa"
         custom: "Valitse päivämäärä ja kellonaika"
+        last_custom: "Viimeisin"
         none: "Muistutus ei tarpeen"
+        today_with_time: "tänään klo %{time}"
+        tomorrow_with_time: "huomenna klo %{time}"
+        at_time: "%{date_time}"
+        existing_reminder: "Olet pyytänyt muistutuksen tästä kirjanmerkistä"
     drafts:
       resume: "Jatka"
       remove: "Poista"
@@ -518,6 +529,7 @@ fi:
       days_visited_long: "Päiviä vierailtu"
       posts_read: "Luetut"
       posts_read_long: "Luettuja viestejä"
+      last_updated: "Viimeksi päivitetty:"
       total_rows:
         one: "%{count} käyttäjä"
         other: "%{count} käyttäjää"
@@ -664,8 +676,6 @@ fi:
           title: "Vaimennettu"
           description: "Et saa ilmoituksia ryhmän yksityiskeskusteluista."
       flair_url: "Avatarpinssin kuva"
-      flair_url_placeholder: "(Ei-pakollinen) kuvan URL tai Font Awesome -luokka"
-      flair_url_description: 'Käytä neliönmuotoista, kooltaan vähintään 20px kertaa 20px kuvaa tai FontAwesome ikonia (hyväksytyt muodot: "fa-icon", "far fa-icon" tai "fab fa-icon").'
       flair_bg_color: "Avatar-pinssin taustaväri"
       flair_bg_color_placeholder: "(Ei-pakollinen) värin Hex-arvo"
       flair_color: "Avatarpinssin väri"
@@ -748,6 +758,7 @@ fi:
       private_messages: "Viestit"
       user_notifications:
         filters:
+          filter_by: "Suodata"
           all: "Kaikki"
           read: "Luetut"
           unread: "Lukematta"
@@ -775,6 +786,7 @@ fi:
         clear:
           title: "Tyhjennä"
           warning: "Haluatko varmasti nollata valikoimasi ketjun?"
+      use_current_timezone: "Käytä nykyistä aikavyöhykettäni"
       profile_hidden: "Käyttäjän julkinen profiili ei ole nähtävillä."
       expand_profile: "Laajenna"
       collapse_profile: "Supista"
@@ -902,6 +914,7 @@ fi:
         success: "(sähköposti lähetetty)"
         in_progress: "(lähettää sähköpostia)"
         error: "(virhe)"
+        emoji: "lukkoemoji"
         action: "Lähetä sähköposti salasanan uusimista varten"
         set_password: "Aseta salasana"
         choose_new: "Valitse uusi salasana"
@@ -913,8 +926,10 @@ fi:
         enable: "Ota käyttöön"
         enable_long: "Ota varakoodit käyttöön"
         manage: "Hallinnoi varakoodeja.. <strong>{{count}}</strong> varakoodia on jäljellä."
-        copied_to_clipboard: "Kopioitiin leikepöydälle"
+        copy_to_clipboard: "Kopioi leikepöydälle"
         copy_to_clipboard_error: "Virhe kopioimisessa leikepöydälle"
+        copied_to_clipboard: "Kopioitiin leikepöydälle"
+        download_backup_codes: "Lataa varakoodit"
         remaining_codes: "Sinulla on <strong>{{count}}</strong> varakoodia jäljellä."
         use: "Käytä varakoodi"
         enable_prerequisites: "Ensisijainen metodi, kaksivaiheinen tunnistautuminen täytyy ottaa käyttöön ennen varakoodien luomista."
@@ -940,27 +955,30 @@ fi:
         oauth_enabled_warning: "Huomioi, ettet voi kirjautua some-tilien avulla, jos kaksivaiheinen tunnistautuminen on käytössä."
         use: "Käytä Authenticator-sovellusta"
         enforced_notice: "Kaksivaiheinen tunnistautuminen pitää ottaa käyttöön, jotta voi käyttää sivustoa."
-        disable: "poista käytöstä"
-        disable_title: "Ota kaksivaiheinen tunnistautuminen käytöstä"
+        disable: "Poista käytöstä"
         disable_confirm: "Oletko varma, että haluat ottaa kaikki kaksivaiheiset tunnistautumismuodot käytöstä?"
+        save: "Tallenna"
         edit: "Muokkaa"
         edit_title: "Muokkaa kaksivaiheista tunnistautumista"
         edit_description: "Kaksivaiheisen tunnistautumisen nim"
-        enable_security_key_description: "Kun sinulla on fyysinen tunnistautumislaite kätesi ulottuvilla klikkaa alla olevaa rekisteröitymisnappia."
+        enable_security_key_description: |
+          Kun <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">tunnistautumislaite</a> on valmiina, paina alla olevaaa rekisteröi-nappia.
         totp:
           title: "Välineeseen perustuvat tunnistautumiset"
-          add: "Uusi tunnistautumistapa"
+          add: "Uusi tunnistautumissovellus"
           default_name: "Tunnistautumissovellukseni"
+          name_and_code_required_error: "Anna nimi sekä tunnistautumissovelluksesta löytyvä koodi."
         security_key:
           register: "Rekisteröidy"
           title: "Turva-avaimet"
-          add: "Rekisteröi tunnistautumislaite"
+          add: "Lisää tunnistautumislaite"
           default_name: "Päätunnistautumislaite"
           not_allowed_error: "Tunnistautumislaitteen rekisteröintiprosessi joko vanheni tai peruutettiin."
           already_added_error: "Olet jo rekisteröinyt tämän tunnistautumislaitteen. Sitä ei tarvitse rekisteröidä uudelleen."
           edit: "Muokkaa tunnistautumislaitetta"
+          save: "Tallenna"
           edit_description: "Tunnistautumislaitteen nimi"
-          delete: "Poista"
+          name_required_error: "Tunnistautumislaite tarvitsee nimen."
       change_about:
         title: "Muokkaa kuvaustasi"
         error: "Arvon muuttamisessa tapahtui virhe."
@@ -977,6 +995,9 @@ fi:
         success_staff: "Lähetimme sähköpostia nykyiseen osoitteeseesi. Noudata vahvistusohjeita."
       change_avatar:
         title: "Vaihda profiilikuvasi"
+        gravatar_title: "Muuta avatariasi {{gravatarName}} -sivustolla"
+        gravatar_failed: "{{gravatarName}}-gravataria ei löytynyt sähköpostiosoitteella."
+        refresh_gravatar_title: "Päivitä {{gravatarName}}"
         letter_based: "Sivuston luoma profiilikuva"
         uploaded_avatar: "Oma kuva"
         uploaded_avatar_empty: "Lisää oma kuva"
@@ -1038,6 +1059,9 @@ fi:
         any: "mikä tahansa"
       password_confirmation:
         title: "Salasana uudelleen"
+      invite_code:
+        title: "Kutsukoodi"
+        instructions: "Tarvitaan kutsukoodi, jotta voi luoda tunnuksen"
       auth_tokens:
         title: "Viimeksi käytetyt laitteet"
         ip: "IP"
@@ -1260,6 +1284,7 @@ fi:
         fixed: "Lataa sivu"
     modal:
       close: "sulje"
+      dismiss_error: "Hylkää virhe"
     close: "Sulje"
     assets_changed_confirm: "Sivustolla on tehty päivityksiä. Ladataanko uudelleen?"
     logout: "Sinut kirjattiin ulos."
@@ -1269,6 +1294,12 @@ fi:
       enabled: "Sivusto on vain luku -tilassa. Voit jatkaa selailua, mutta vastaaminen, tykkääminen ja muita toimintoja on toistaiseksi poissa käytöstä."
       login_disabled: "Et voi kirjautua sisään, kun sivusto on vain luku -tilassa."
       logout_disabled: "Et voi kirjautua ulos, kun sivusto on vain luku -tilassa."
+    too_few_topics_and_posts_notice_MF: >-
+      Laitetaanpa <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">keskustelu alulle!</a> Ketjuja {currentTopics, plural, one {on <strong>#</strong>} other {on <strong>#</strong>}} ja viestejä {currentPosts, plural, one {<strong>#</strong>} other {<strong>#</strong>}}. Vierailijoilla tulisi olla enemmän vastauksia innoittavaa luettavaa – suositamme ainakin {requiredTopics, plural, one {<strong>#</strong> ketjua} other {<strong>#</strong> ketjua}} ja {requiredPosts, plural, one {<strong>#</strong> viestiä} other {<strong>#</strong> viestiä}}. Tämä viesti näkyy vain henkilökunnalle.
+    too_few_topics_notice_MF: >-
+      Laitetaanpa <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">keskustelu alulle!</a> Ketjuja {currentTopics, plural, one {on <strong>#</strong>} other {on <strong>#</strong>}}. Vierailijoilla tulisi olla enemmän vastauksia innoittavaa luettavaa – suositamme ainakin {requiredTopics, plural, one {<strong>#</strong> ketjua} other {<strong>#</strong> ketjua}}. Tämä viesti näkyy vain henkilökunnalle.
+    too_few_posts_notice_MF: >-
+      Laitetaanpa <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">keskustelu alulle!</a> Viestejä {currentPosts, plural, one {on <strong>#</strong>} other {are <strong>#</strong>}}. Vierailijoilla tulisi olla enemmän vastauksia innoittavaa luettavaa – suositamme ainakin {requiredPosts, plural, one {<strong>#</strong> viestiä} other {<strong>#</strong> viestiä}}. Tämä viesti näkyy vain henkilökunnalle.
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# virhe/tunti} other {# virhettä/tunti}}</a> saavutti sivustoasetuskynnyksen {limit, plural, one {# virhe/tunti} other {# virhettä/tunti}}."
       reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# virhe/minuutti} other {# virhettä/minuutti}}</a> saavutti sivustoasetuskynnyksen {limit, plural, one {# virhe/minuutti} other {# virhettä/minuutti}}."
@@ -1288,6 +1319,7 @@ fi:
     mute: Vaienna
     unmute: Poista vaimennus
     last_post: Kirjoitti
+    local_time: "Paikallinen aika"
     time_read: Lukenut
     time_read_recently: "%{time_read} viime aikoina"
     time_read_tooltip: "%{time_read} lukenut kaikkiaan"
@@ -1349,6 +1381,7 @@ fi:
     email_login:
       link_label: "Lähetä minulle kirjautumislinkki"
       button_label: "sähköpostilla"
+      emoji: "lukkoemoji"
       complete_username: "Jos on olemassa käyttäjätili käyttäjänimellä <b>%{username}</b>, kirjautumislinkin sisältävän sähköpostiviestin pitäisi saapua sinulle tuota pikaa."
       complete_email: "Jos on olemassa käyttäjätili sähköpostiosoitteella <b>%{email}</b>, kirjautumislinkin sisältävän sähköpostiviestin pitäisi saapua sinulle tuota pikaa."
       complete_username_found: "Käyttäjätili käyttäjänimellä <b>%{username}</b> löytyi. Kirjautumislinkin sisältävän sähköpostiviestin pitäisi saapua sinulle tuota pikaa."
@@ -1426,6 +1459,7 @@ fi:
         backup_code: "Käytä varmuuskoodia tämän sijaan"
     invites:
       accept_title: "Kutsu"
+      emoji: "kuoriemoji"
       welcome_to: "Tervetuloa sivustolle %{site_name}!"
       invited_by: "Sinut kutsui"
       social_login_available: "Voit myös kirjautua some-tilin avulla, joka on saman sähköpostiosoitteen alainen."
@@ -1698,6 +1732,8 @@ fi:
         posted: "uusi viesti"
         moved_post: "viesti siirrettiin"
         linked: "linkitti"
+        bookmark_reminder: "kirjanmerkkimuistutus"
+        bookmark_reminder_with_name: "kirjanmerkkimuistutus - %{name}"
         granted_badge: "ansiomerkki myönnettiin"
         invited_to_topic: "kutsuttiin ketjuun"
         group_mentioned: "ryhmä mainittiin"
@@ -1872,7 +1908,7 @@ fi:
         help: "Siirrä takaisin saapuneisiin."
       edit_message:
         help: "Muokkaa keskustelun ensimmäistä viestiä"
-        title: "Muokkaa viestiä"
+        title: "Muokkaa"
       defer:
         help: "Merkitse lukemattomaksi"
         title: "Lykkää"
@@ -1926,6 +1962,7 @@ fi:
       group_request_sent: "Ryhmän jäsenyyspyyntösi on lähetetty. Saat ilmoituksen, kun se on hyväksytty."
       unread_indicator: "Kukaan jäsen ei ole lukenut ketjun viimeistä viestiä vielä."
       read_more_MF: "Sinulla on { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 ketju</a>, jossa on viestejä } other { <a href='{basePath}/unread'># ketjua</a>, joissa on viestejä }} { NEW, plural, =0 {} one { {BOTH, select, true{ja } false { } other{}} <a href='{basePath}/new'>1 uusi</a> ketju} other { {BOTH, select, true{ja } false { } other{}} <a href='{basePath}/new'># uutta ketjua</a>} } lukematta. Tai {CATEGORY, select, true {selaile aluetta {catLink}} false {katsele {latestLink}.} other {}}"
+      bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Selaa keskustelualueita
       view_latest_topics: tuoreimpia ketjuja
       suggest_create_topic: "Jospa aloittaisit uuden ketjun?"
@@ -1936,6 +1973,7 @@ fi:
         title: "Ketjun ajastin"
         save: "Aseta ajastin"
         num_of_hours: "Kuinka monta tuntia:"
+        num_of_days: "Montako päivää:"
         remove: "Poista ajastin"
         publish_to: "Mihin julkaistaan:"
         when: "Milloin:"
@@ -1978,6 +2016,8 @@ fi:
         title: "Nosta ketjua ajastetusti"
       reminder:
         title: "Muistuta minua"
+      auto_delete_replies:
+        title: "Poista vastaukset automaattisesti"
       status_update_notice:
         auto_open: "Ketju avautuu automaattisesti %{timeLeft}."
         auto_close: "Ketju suljetaan ajastetusti %{timeLeft}."
@@ -1986,6 +2026,7 @@ fi:
         auto_delete: "Ketju poistetaan ajastetusti %{timeLeft}."
         auto_bump: "Ketjua nostetaan ajastetusti %{timeLeft}."
         auto_reminder: "Sinua muistutetaan tästä ketjusta %{timeLeft}."
+        auto_delete_replies: "Tähän ketjuun tulevat vastaukset poistetaan automaattisesti %{duration} kuluttua."
       auto_close_title: "Automaattisen sulkemisen asetukset"
       auto_close_immediate:
         one: "Ketjun viimeisin viesti on jo tunnin vanha, joten ketju suljetaan heti."
@@ -2021,6 +2062,7 @@ fi:
           "2_8": "Näet uusien vastausten määrän, koska olet asettanut tämän alueen seurantaan."
           "2_4": "Näet uusien vastausten määrän, koska olet kirjoittanut ketjuun."
           "2_2": "Näet uusien vastausten määrän, koska olet asettanut ketjun seurantaan."
+          "2": 'Näet uusien vastausten määrän, koska <a href="{{basePath}}/u/{{username}}/preferences/notifications">luit ketjua aiemmin</a>.'
           "1_2": "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle."
           "1": "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle."
           "0_7": "Et saa mitään ilmoituksia tältä alueelta."
@@ -2196,6 +2238,9 @@ fi:
         title: "Yhdistä valitut viestit"
         action: "yhdistä valitut viestit"
         error: "Valittuja viestejä yhdistettäessä tapahtui virhe."
+      publish_page:
+        title: "Sivujulkaisu"
+        publish: "Julkaise"
       change_owner:
         title: "Vaihda omistajaa"
         action: "muokkaa omistajuutta"
@@ -2329,6 +2374,7 @@ fi:
         convert_to_moderator: "Lisää henkilökunnan taustaväri"
         revert_to_regular: "Poista henkilökunnan taustaväri"
         rebake: "Tee HTML uudelleen"
+        publish_page: "Sivujulkaisu"
         unhide: "Poista piilotus"
         change_owner: "Vaihda omistajuutta"
         grant_badge: "Myönnä ansiomerkki"
@@ -2734,7 +2780,6 @@ fi:
         this_month: "Kuukausi"
         this_week: "Viikko"
         today: "Tänään"
-        other_periods: "katso kuumat"
     permission_types:
       full: "Luoda / Vastata / Nähdä"
       create_post: "Vastata / Nähdä"
@@ -2962,6 +3007,10 @@ fi:
       custom_message_template_forum: "Hei, sinun pitäisi liittyä tälle palstalle!"
       custom_message_template_topic: "Hei, ajattelin, että voisit tykätä tästä ketjusta!"
     forced_anonymous: "Rajun kuormituksen vuoksi tämä näytetään väliaikaisesti kaikille niin kuin uloskirjautunut käyttäjä näkee sen."
+    footer_nav:
+      back: "Edellinen"
+      share: "Jaa"
+      dismiss: "Unohda"
     safe_mode:
       enabled: "Vikasietotila on nyt päällä, sulje selainikkuna lopettaaksesi"
   admin_js:
@@ -3208,12 +3257,6 @@ fi:
         tag_event:
           name: "Tunnistetapahtuma"
           details: "Kun tunniste luodaan, päivitetään tai poistetaan."
-        flag_event:
-          name: "Lipputapahtuma"
-          details: "Kun lippu luodaan tai sen kanssa ollaan yhtä tai eri mieltä tai se sivuutetaan."
-        queued_post_event:
-          name: "Viestinhyväksymistapahtuma"
-          details: "Kun uusi viesti ilmaantuu jonoon tai sellainen hyväksytään tai hylätään."
         reviewable_event:
           name: "Käsittelytapahtuma"
           details: "Kun uusi asia tulee käsiteltäväksi tai kun sen tila muuttuu."
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 4471d601c0..d2fbd8cb6c 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -23,22 +23,24 @@ fr:
             mb: Mo
             tb: To
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "{{number}} k"
+        millions: "{{number}} M"
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd [à] HH:mm"
       timeline_date: "MMM YYYY"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
       long_with_year: "DD MMM YYYY H:mm"
       long_with_year_no_time: "DD MMM YYYY"
-      full_with_year_no_time: "Do MMMM, YYYY"
-      long_date_with_year: "D MMM, 'YY LT"
+      full_with_year_no_time: "D MMMM YYYY"
+      long_date_with_year: "D MMM 'YY LT"
       long_date_without_year: "D MMM, LT"
-      long_date_with_year_without_time: "D MMM, 'YY"
+      long_date_with_year_without_time: "D MMM 'YY"
       long_date_without_year_with_linebreak: "D MMM <br/>LT"
-      long_date_with_year_with_linebreak: "D MMM, 'YY <br/>LT"
+      long_date_with_year_with_linebreak: "D MMM 'YY <br/>LT"
       wrap_ago: "il y a %{date}"
       tiny:
         half_a_minute: "< 1m"
@@ -64,14 +66,14 @@ fr:
           one: "%{count} mois"
           other: "%{count} mois"
         about_x_years:
-          one: "%{count}an"
-          other: "%{count}ans"
+          one: "%{count} an"
+          other: "%{count} ans"
         over_x_years:
-          one: "> %{count}an"
-          other: "> %{count}ans"
+          one: "> %{count} an"
+          other: "> %{count} ans"
         almost_x_years:
-          one: "%{count}an"
-          other: "%{count}ans"
+          one: "%{count} an"
+          other: "%{count} ans"
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
@@ -127,7 +129,7 @@ fr:
       split_topic: "a scindé ce sujet %{when}"
       invited_user: "a invité %{who} %{when}"
       invited_group: "a invité %{who} %{when}"
-      user_left: "%{who}a quitté cette conversation %{when}"
+      user_left: "%{who} a quitté cette conversation %{when}"
       removed_user: "a retiré %{who} %{when}"
       removed_group: "a retiré %{who} %{when}"
       autobumped: "remonté automatiquement dans la liste %{when}"
@@ -156,11 +158,11 @@ fr:
     topic_admin_menu: "actions du sujet"
     wizard_required: "Bienvenue sur votre nouveau Discourse ! Démarrons par <a href='%{url}' data-auto-route='true'>l'assistant de configuration</a> ✨"
     emails_are_disabled: "Le courriel sortant a été désactivé par un administrateur. Aucune notification courriel ne sera envoyée."
-    bootstrap_mode_enabled: "Pour rendre le lancement de votre site plus facile, vous êtes en mode 'bootstrap'. Tout nouvel utilisateur sera accordé le niveau de confiance 1 et aura les résumés par courriel hebdomadaires activés. Ceci cessera d'être le cas lorsque %{min_users} utilisateurs auront rejoints le site."
-    bootstrap_mode_disabled: "Le mode Bootstrap sera désactivé dans les prochaines 24 heures."
+    bootstrap_mode_enabled: "Pour faciliter son lancement, votre nouveau site se trouve dans un mode spécial de lancement. Chaque nouvel utilisateur se verra accorder le niveau de confiance 1 et recevra des résumés quotidiens par courriel. Ce mode sera automatiquement désactivé dès que votre site possédera %{min_users} utilisateurs."
+    bootstrap_mode_disabled: "Le mode spécial de lancement sera désactivé dans les prochaines 24 heures."
     themes:
       default_description: "Par défaut"
-      broken_theme_alert: "Votre site pourrait ne pas fonctionner parce que thème/composant %{theme} a des erreurs. Le désactiver ici : %{path}."
+      broken_theme_alert: "Votre site pourrait ne pas fonctionner parce que le thème / composant %{theme} a des erreurs. Voici pouvez le désactiver ici : %{path}."
     s3:
       regions:
         ap_northeast_1: "Asie-Pacifique (Tokyo)"
@@ -185,13 +187,13 @@ fr:
         us_west_2: "États-Unis ouest (Oregon)"
     edit: "modifier le titre et la catégorie de ce sujet"
     expand: "Développer"
-    not_implemented: "Cette fonctionnalité n'a pas encore été implémentée, désolé !"
+    not_implemented: "Cette fonctionnalité n’est pas encore disponible."
     no_value: "Non"
     yes_value: "Oui"
     submit: "Envoyer"
     generic_error: "Désolé, une erreur est survenue."
     generic_error_with_reason: "Une erreur est survenue : %{error}"
-    go_ahead: "Procéder"
+    go_ahead: "Continuer"
     sign_up: "S'inscrire"
     log_in: "Se connecter"
     age: "Âge"
@@ -231,8 +233,8 @@ fr:
       one: "{{count}} caractère"
       other: "{{count}} caractères"
     related_messages:
-      title: "Messages Connexes"
-      see_all: 'Voir <a href="%{path}">tous les messages</a> de @%{username}...'
+      title: "Messages connexes"
+      see_all: 'Voir <a href="%{path}">tous les messages</a> de @%{username}…'
     suggested_topics:
       title: "À lire ensuite"
       pm_title: "À lire ensuite"
@@ -245,8 +247,8 @@ fr:
       moderators: "Modérateurs"
       stat:
         all_time: "Depuis toujours"
-        last_7_days: "Derniers 7"
-        last_30_days: "Derniers 30"
+        last_7_days: "Derniers 7 jours"
+        last_30_days: "Derniers 30 jours"
       like_count: "J'aime"
       topic_count: "Sujets"
       post_count: "Nombre de messages"
@@ -260,21 +262,39 @@ fr:
       help:
         bookmark: "Cliquer pour mettre un signet sur le premier message de ce sujet"
         unbookmark: "Cliquer pour retirer tous les signets de ce sujet"
+        unbookmark_with_reminder: "Cliquez pour supprimer tous les signets et rappels de ce sujet. Vous avez un rappel pour %{reminder_at} sur ce sujet."
     bookmarks:
+      created: "vous avez mis un signet à ce message %{name}"
       not_bookmarked: "mettre un signet à ce message"
+      created_with_reminder: "vous avez épinglé ce message avec un rappel pour %{date} %{name}"
+      created_with_at_desktop_reminder: "vous avez épinglé ce message et vous recevrez un rappel la prochaine fois que vous êtes à votre bureau %{name}"
       remove: "Retirer le signet"
+      delete: "Supprimer le signet"
+      confirm_delete: "Êtes-vous sûr de vouloir supprimer ce signet ? Le rappel sera aussi supprimé."
       confirm_clear: "Êtes-vous sûr de vouloir retirer tous les signets de ce sujet ?"
       save: "Sauvegarder"
-      no_timezone: 'Vous n&#39;avez pas encore défini de fuseau horaire. Vous ne pourrez pas définir de rappels. Configurez-en un <a href="%{basePath}/my/preferences/profile">dans votre profil</a>.'
+      no_timezone: 'Vous n''avez pas encore défini un fuseau horaire. Vous ne pourrez pas définir de rappels. Configurez-en un <a href="%{basePath}/my/preferences/profile">dans votre profil</a>.'
+      invalid_custom_datetime: "La date et l'heure sont invalides, veuillez réessayer."
+      list_permission_denied: "Vous n'avez pas la permission de voir les signets de cet utilisateur."
+      delete_when_reminder_sent: "Supprimer ce signet lorsque la notification de rappel est envoyée."
       reminders:
         at_desktop: "La prochaine fois je suis à mon bureau"
         later_today: "Plus tard aujourd'hui"
+        next_business_day: "Prochain jour ouvré"
         tomorrow: "Demain"
         next_week: "Semaine prochaine"
         later_this_week: "Plus tard cette semaine"
         start_of_next_business_week: "Lundi prochain"
-        next_month: "Mois prochai"
+        next_month: "Mois prochain"
         custom: "Date et heure personnalisés"
+        last_custom: "Dernier"
+        none: "Pas de rappel nécessaire"
+        today_with_time: "aujourd'hui à %{time}"
+        tomorrow_with_time: "demain à %{time}"
+        at_time: "à %{date_time}"
+        existing_reminder: "Vous avez un rappel configuré pour ce signet qui sera envoyé"
+    copy_codeblock:
+      copied: "copié !"
     drafts:
       resume: "Reprendre"
       remove: "Supprimer"
@@ -301,7 +321,7 @@ fr:
     saved: "Sauvegardé !"
     upload: "Joindre un fichier"
     uploading: "Envoi en cours…"
-    uploading_filename: "En cours de transfert : {{filename}}..."
+    uploading_filename: "Envoi en cours : {{filename}}…"
     clipboard: "presse-papiers"
     uploaded: "Envoyé !"
     pasting: "Coller..."
@@ -317,23 +337,23 @@ fr:
       close: "Ignorer cette bannière."
       edit: "Modifier cette bannière >>"
     pwa:
-      install_banner: "Voulez-vous <a href>installer %{title} sur cet appareil?</a>"
+      install_banner: "Voulez-vous <a href>installer %{title} sur cet appareil</a> ?"
     choose_topic:
       none_found: "Aucun sujet trouvé."
       title:
-        search: "Chercher un Sujet"
-        placeholder: "Saisir ici le titre du sujet, son URL ou son id"
+        search: "Rechercher un sujet"
+        placeholder: "saisir ici le titre du sujet, son URL ou son ID"
     choose_message:
       none_found: "Aucun message trouvé."
       title:
-        search: "Chercher un Message"
-        placeholder: "saisir ici l'intitulé du sujet, son URL ou son id"
+        search: "Rechercher un message"
+        placeholder: "entrez ici l'intitulé du sujet, son URL ou son ID"
     review:
       order_by: "Trier par"
       in_reply_to: "en réponse à"
       explain:
         why: "expliquer pourquoi cet élément s'est retrouvé dans la file d'attente"
-        title: "Notation révisable"
+        title: "Notation de l'élément à vérifier"
         formula: "Formule"
         subtotal: "Sous-total"
         total: "Total"
@@ -341,21 +361,21 @@ fr:
         score_to_hide: "Score pour cacher le message"
         take_action_bonus:
           name: "intervenu"
-          title: "Lorsqu'un membre du personnel choisit d'agir, l'indicateur reçoit un bonus."
+          title: "Lorsqu'un responsable choisit d'agir, le signalement reçoit un bonus."
         user_accuracy_bonus:
-          name: "précision de l’utilisateur"
-          title: "Utilisateurs dont les signalements ont généralement été approuvés obtiennent un bonus."
+          name: "fiabilité de l’utilisateur"
+          title: "Les utilisateurs dont les signalements ont généralement été approuvés obtiennent un bonus."
         trust_level_bonus:
           name: "niveau de confiance"
-          title: "Les éléments révisables créés par les utilisateurs ayant un niveau de confiance plus élevé ont un score plus élevé."
+          title: "Les éléments à vérifier créés par les utilisateurs ayant un niveau de confiance plus élevé ont un score plus élevé."
         type_bonus:
           name: "indiquer le bonus"
-          title: "Certains types révisables peuvent se voir attribuer un bonus par les Responsables pour en élever la priorité."
+          title: "Certains types d'éléments à vérifier peuvent se voir attribuer un bonus par les responsables pour en élever la priorité."
       claim_help:
         optional: "Vous pouvez réserver cet élément pour empêcher d'autres de le vérifier."
-        required: "Vous devez réserver des éléments avant des les vérifier."
+        required: "Vous devez réserver des éléments avant de les vérifier."
         claimed_by_you: "Vous avez réservé cet élément et pouvez le vérifier."
-        claimed_by_other: "Cet élément ne peut être vérifier que par <b>{{username}}</b>."
+        claimed_by_other: "Cet élément ne peut être vérifié que par <b>{{username}}</b>."
       claim:
         title: "réserver ce sujet"
       unclaim:
@@ -367,10 +387,10 @@ fr:
         save_changes: "Sauvegarder"
         title: "Paramètres"
         priorities:
-          title: "Priorités vérifications"
+          title: "Priorités des vérifications"
       moderation_history: "Historique de modération"
       view_all: "Tout voir"
-      grouped_by_topic: "Groupé par sujet"
+      grouped_by_topic: "Par sujet"
       none: "Il n'y a pas d'éléments à vérifier."
       view_pending: "voir les messages en attente"
       topic_has_pending:
@@ -386,14 +406,14 @@ fr:
       user:
         bio: "Biographie"
         website: "Site web"
-        username: "Pseudo"
+        username: "Nom d'utilisateur"
         email: "Courriel"
         name: "Nom"
         fields: "Champs"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} signalement total)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} signalements total)"
+          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} signalement en total)"
+          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} signalements en total)"
         agreed:
           one: "{{count}}% accepté"
           other: "{{count}}% acceptés"
@@ -419,7 +439,7 @@ fr:
       edit: "Modifier"
       save: "Sauvegarder"
       cancel: "Annuler"
-      new_topic: "Approuver cet élément créera un nouveau sujet."
+      new_topic: "Approuver cet élément créera un nouveau sujet"
       filters:
         all_categories: "(toutes les catégories)"
         type:
@@ -427,33 +447,33 @@ fr:
           all: "(tous les types)"
         minimum_score: "Score minimum :"
         refresh: "Rafraîchir"
-        status: "Etat"
+        status: "État"
         category: "Catégorie"
         orders:
           priority: "Priorité"
           priority_asc: "Priorité (inverse)"
-          created_at: "Créé à"
-          created_at_asc: "Créé à (inverse)"
+          created_at: "Date de création"
+          created_at_asc: "Date de création (inverse)"
         priority:
           title: "Priorité minimum"
           low: "(tous)"
           medium: "Moyenne"
-          high: "Fort"
+          high: "Élevée"
       conversation:
-        view_full: "voir conversation entière"
+        view_full: "voir la discussion entière"
       scores:
-        about: "Ce score est calculé en fonction du niveau de confiance de l'utilisateur qui a signalé, de l'exactitude de ses indicateurs précédents et de la priorité de l'élément déclaré."
+        about: "Ce score est calculé en fonction du niveau de confiance de l'utilisateur qui a signalé le message, de l'exactitude de ses signalements précédents et de la priorité de l'élément signalé."
         score: "Score"
         date: "Date"
         type: "Type"
-        status: "Etat"
+        status: "État"
         submitted_by: "Soumis par"
         reviewed_by: "Vérifié par"
       statuses:
         pending:
           title: "En attente"
         approved:
-          title: "Acceptés :"
+          title: "Acceptés"
         rejected:
           title: "Rejetés"
         ignored:
@@ -463,7 +483,7 @@ fr:
         reviewed:
           title: "(vérifiés)"
         all:
-          title: "(tout)"
+          title: "(tous)"
       types:
         reviewable_flagged_post:
           title: "Message signalé"
@@ -496,7 +516,7 @@ fr:
       sent_by_user: "Envoyé par <a href='{{userUrl}}'>{{user}}</a>"
       sent_by_you: "Envoyé par <a href='{{userUrl}}'>vous</a>"
     directory:
-      filter_name: "filtrer par pseudo"
+      filter_name: "filtrer par nom d'utilisateur"
       title: "Utilisateurs"
       likes_given: "Donnés"
       likes_received: "Reçus"
@@ -512,6 +532,7 @@ fr:
       days_visited_long: "Jours visités"
       posts_read: "Lus"
       posts_read_long: "Messages lus"
+      last_updated: "Dernière mise à jour :"
       total_rows:
         one: "%{count} utilisateur"
         other: "%{count} utilisateurs"
@@ -524,20 +545,20 @@ fr:
         remove_user_as_group_owner: "Retirer le propriétaire"
     groups:
       member_added: "Ajouté"
-      member_requested: "Requis à"
+      member_requested: "Demandé à"
       add_members:
-        title: "Ajouter membres"
+        title: "Ajouter des membres"
         description: "Gérer les membres de ce groupe"
-        usernames: "Pseudos"
+        usernames: "Noms d'utilisateurs"
       requests:
-        title: "Requêtes"
+        title: "Demandes"
         reason: "Raison"
         accept: "Accepter"
         accepted: "accepté"
         deny: "Refuser"
         denied: "refusé"
-        undone: "requête annulée"
-        handle: "Gérer demande d'adhésion"
+        undone: "demande annulée"
+        handle: "gérer une demande d'adhésion"
       manage:
         title: "Gérer"
         name: "Nom"
@@ -561,7 +582,7 @@ fr:
           target_user: "Utilisateur cible"
           subject: "Sujet"
           details: "Détails"
-          from: "From"
+          from: "De"
           to: "À"
       public_admission: "Autoriser les utilisateurs à rejoindre le groupe librement (nécessite que le groupe soit visible)"
       public_exit: "Autoriser les utilisateurs à quitter librement le groupe"
@@ -576,9 +597,9 @@ fr:
       add: "Ajouter"
       join: "Rejoindre"
       leave: "Quitter"
-      request: "Requête"
+      request: "Demander à rejoindre"
       message: "Message"
-      confirm_leave: "Êtes-vous sûr(e) de vouloir quitter ce groupe ?"
+      confirm_leave: "Êtes-vous sûr de vouloir quitter ce groupe ?"
       allow_membership_requests: "Autoriser les utilisateurs à envoyer des demandes d'adhésion aux propriétaires de groupe (nécessite que le groupe soit visible publiquement)"
       membership_request_template: "Modèle personnalisé à afficher aux utilisateurs lors de l'envoi d'une demande d'adhésion"
       membership_request:
@@ -590,24 +611,24 @@ fr:
       group_name: "Nom du groupe"
       user_count: "Utilisateurs"
       bio: "À propos du groupe"
-      selector_placeholder: "saisir pseudo"
+      selector_placeholder: "entrez un nom d'utilisateur"
       owner: "propriétaire"
       index:
         title: "Groupes"
         all: "Tous les groupes"
         empty: "Il n'y a aucun groupe visible."
         filter: "Filtrer par type de groupe"
-        owner_groups: "Mes groupes"
-        close_groups: "Groupes fermés"
-        automatic_groups: "Groupes automatiques"
+        owner_groups: "Mes groupes (propriétaire)"
+        close_groups: "Fermés"
+        automatic_groups: "Automatiques"
         automatic: "Automatique"
         closed: "Fermé"
         public: "Public"
         private: "Privé"
-        public_groups: "Groupes publics"
+        public_groups: "Publics"
         automatic_group: Groupe automatique
-        close_group: Fermer groupe
-        my_groups: "Mes groupes"
+        close_group: Fermer le groupe
+        my_groups: "Mes groupes (membre)"
         group_type: "Type de groupe"
         is_group_user: "Membre"
         is_group_owner: "Propriétaire"
@@ -617,12 +638,12 @@ fr:
       activity: "Activité"
       members:
         title: "Membres"
-        filter_placeholder_admin: "pseudo ou courriel"
-        filter_placeholder: "pseudo"
-        remove_member: "Enlever membre"
+        filter_placeholder_admin: "nom d'utilisateur ou courriel"
+        filter_placeholder: "nom d'utilisateur"
+        remove_member: "Enlever le membre"
         remove_member_description: "Enlever <b>%{username}</b> de ce groupe"
         make_owner: "Rendre propriétaire"
-        make_owner_description: "Rendre<b>%{username}</b> propriétaire de ce groupe"
+        make_owner_description: "Rendre <b>%{username}</b> propriétaire de ce groupe"
         remove_owner: "Enlever comme propriétaire"
         remove_owner_description: "Enlever <b>%{username}</b> comme propriétaire de ce groupe"
         owner: "Propriétaire"
@@ -639,7 +660,7 @@ fr:
         only_admins: "Seulement les administrateurs "
         mods_and_admins: "Seulement les modérateurs et les administrateurs "
         members_mods_and_admins: "Seulement les membres du groupe, les modérateurs et les administrateurs "
-        owners_mods_and_admins: "Seuls les propriétaires, modérateurs et administrateurs du groupe"
+        owners_mods_and_admins: "Seulement les propriétaires du groupe, les modérateurs et les administrateurs"
         everyone: "Tout le monde"
       notifications:
         watching:
@@ -650,22 +671,24 @@ fr:
           description: "Vous serez averti de nouveaux messages dans ce groupe mais pas de réponses aux messages."
         tracking:
           title: "Suivre"
-          description: "Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond, et le nombre de nouvelles réponses sera affiché."
+          description: "Vous serez notifié si quelqu'un vous mentionne ou vous répond, et le nombre de nouvelles réponses sera affiché."
         regular:
           title: "Normal"
-          description: "Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond."
+          description: "Vous serez notifié si quelqu'un vous mentionne ou vous répond."
         muted:
           title: "Silencieux"
           description: "Nous ne serez jamais notifié de quoi que ce soit à propos des messages dans ce groupe."
       flair_url: "Image de la vignette d'avatar"
-      flair_url_placeholder: "(Facultatif) URL de l'image ou classe Font Awesome"
-      flair_url_description: 'Utiliser des images de minimum 20px fois 20px ou des icônes FontAwesome (formats acceptés : "fa-icon", "far fa-icon" ou "fab fa-icon").'
+      flair_upload_description: "Utilisez des images carrées d'une taille minimum de 20px par 20px."
       flair_bg_color: "Couleur de l'arrière-plan de la vignette d'avatar"
       flair_bg_color_placeholder: "(Facultatif) Couleur en héxadécimal"
       flair_color: "Couleur de la vignette d'avatar"
-      flair_color_placeholder: "(Facultatif) Couleur en héxadécimal"
+      flair_color_placeholder: "(Facultatif) Couleur en hexadécimal"
       flair_preview_icon: "Prévisualiser l'icône"
       flair_preview_image: "Prévisualiser l'image"
+      flair_type:
+        icon: "Sélectionner une icône"
+        image: "Insérer une image"
     user_action_groups:
       "1": "J'aime donnés"
       "2": "J'aime reçus"
@@ -681,7 +704,7 @@ fr:
       "14": "En attente"
       "15": "Brouillons"
     categories:
-      all: "toutes les catégories"
+      all: "catégories"
       all_subcategories: "toutes"
       no_subcategory: "aucune"
       category: "Catégorie"
@@ -702,12 +725,12 @@ fr:
         one: "%{count} sujet"
         other: "%{count} sujets"
       topic_stat_sentence_week:
-        one: "%{count}nouveau sujet dans la dernière semaine."
+        one: "%{count} nouveau sujet dans la dernière semaine."
         other: "%{count} nouveaux sujets dans la dernière semaine."
       topic_stat_sentence_month:
         one: "%{count} nouveau sujet dans le dernier mois."
         other: "%{count} nouveaux sujets dans le dernier mois."
-      n_more: "Catégories (%{count} autres) ..."
+      n_more: "Catégories (%{count} autres) …"
     ip_lookup:
       title: Rechercher l'adresse IP
       hostname: Nom de l'hôte
@@ -717,16 +740,17 @@ fr:
       phone: Téléphone
       other_accounts: "Autres comptes avec cette adresse IP :"
       delete_other_accounts: "Supprimer %{count}"
-      username: "pseudo"
-      trust_level: "NC"
+      username: "nom d'utilisateur"
+      trust_level: "niveau de confiance"
       read_time: "temps de lecture"
       topics_entered: "sujets visités"
       post_count: "# messages"
-      confirm_delete_other_accounts: "Êtes-vous sûr de vouloir supprimer tous ces comptes ?"
+      confirm_delete_other_accounts: "Êtes-vous sûr de vouloir supprimer ces comptes ?"
       powered_by: "utilisant <a href='https://maxmind.com'>MaxMindDB</a>"
       copied: "copié"
     user_fields:
       none: "(choisir une option)"
+      required: 'Veuillez entrer une valeur pour « %{name} »'
     user:
       said: "{{username}} :"
       profile: "Profil"
@@ -742,23 +766,24 @@ fr:
       private_messages: "Messages directs"
       user_notifications:
         filters:
+          filter_by: "Filtrer par"
           all: "Toutes"
           read: "Temps de lecture"
           unread: "Non lus"
         ignore_duration_title: "Ignorer planification"
-        ignore_duration_username: "Pseudo"
+        ignore_duration_username: "Nom d'utilisateur"
         ignore_duration_when: "Durée :"
         ignore_duration_save: "Ignorer"
-        ignore_duration_note: "Noter que tous les 'ignorer' sans supprimés automatiquement après l'échéance de la durée d'ignore."
+        ignore_duration_note: "Veuillez noter que les utilisateurs ne seront plus ignorés une fois le délai passé."
         ignore_duration_time_frame_required: "Veuillez sélectionner un intervalle de temps"
         ignore_no_users: "Vous n'avez aucun utilisateur ignoré."
         ignore_option: "Ignoré"
-        ignore_option_title: "Vous ne recevrez pas de notification en lien avec cet utilisateur et ses messages et réponses seront cachés."
-        add_ignored_user: "Ajouter..."
+        ignore_option_title: "Vous ne recevrez pas de notifications en lien avec cet utilisateur et ses messages et réponses seront cachés."
+        add_ignored_user: "Ajouter…"
         mute_option: "Silencieux"
         mute_option_title: "Vous ne recevrez pas de notifications en lien avec cet utillisateur."
         normal_option: "Normal"
-        normal_option_title: "Vous serez notifié si cet utilisateur vous répond, vous cite, ou mentionne votre @pseudo."
+        normal_option_title: "Vous serez notifié si cet utilisateur vous répond, vous cite ou vous mentionne."
       activity_stream: "Activité"
       preferences: "Préférences"
       feature_topic_on_profile:
@@ -769,7 +794,8 @@ fr:
         clear:
           title: "Vider"
           warning: "Êtes-vous sûr de vouloir effacer ce sujet à la une ?"
-      profile_hidden: "Le profil public de cet usagé est caché."
+      use_current_timezone: "Utiliser le fuseau horaire actuel"
+      profile_hidden: "Le profil public de cet utilisateur est caché."
       expand_profile: "Développer"
       collapse_profile: "Réduire"
       bookmarks: "Signets"
@@ -787,19 +813,19 @@ fr:
         perm_denied_expl: "Vous n'avez pas autorisé les notifications. Autorisez-les depuis les paramètres de votre navigateur."
         disable: "Désactiver les notifications"
         enable: "Activer les notifications"
-        each_browser_note: "Note : Vous devez changer ce paramètre sur chaque navigateur que vous utilisez."
-        consent_prompt: "Souhaitez-vous recevoir des notifications actives quand on répond à vos messages ?"
+        each_browser_note: "Note : vous devez changer ce paramètre sur chaque navigateur que vous utilisez."
+        consent_prompt: "Souhaitez-vous recevoir des notifications en temps réel quand on répond à vos messages ?"
       dismiss: "Ignorer"
       dismiss_notifications: "Tout ignorer"
       dismiss_notifications_tooltip: "Marquer les notifications comme lues"
       first_notification: "Votre première notification ! Cliquez-la pour démarrer."
-      dynamic_favicon: "Faire apparaître le nombre sur l'icône navigateur"
+      dynamic_favicon: "Faire apparaître le compteur sur l'icône du navigateur"
       theme_default_on_all_devices: "En faire mon thème par défaut sur tous mes périphériques"
       text_size_default_on_all_devices: "En faire la taille de texte par défaut sur tous mes périphériques"
       allow_private_messages: "Permettre aux autres utilisateurs de m’envoyer des messages directs"
       external_links_in_new_tab: "Ouvrir tous les liens externes dans un nouvel onglet"
       enable_quoting: "Proposer de citer le texte sélectionné"
-      enable_defer: "Activer reporter pour marquer des sujets non lu"
+      enable_defer: "Activer le bouton pour reporter de sujets à plus tard en les marquant comme non lus"
       change: "modifier"
       featured_topic: "Sujet à la une"
       moderator: "{{user}} est un modérateur"
@@ -824,7 +850,7 @@ fr:
         individual_no_echo: "Envoyer un courriel pour chaque nouveau message sauf les miens"
         many_per_day: "M'envoyer un courriel pour chaque nouveau message (environ {{dailyEmailEstimate}} par jour)"
         few_per_day: "M'envoyer un courriel pour chaque nouveau message (environ 2 par jour)"
-        warning: "Mode liste de diffusion activé. Les paramètres de notification par e-mail sont remplacés."
+        warning: "Mode liste de diffusion activé. Les paramètres de notification par courriel sont remplacés."
       tag_settings: "Étiquettes"
       watched_tags: "Surveillés"
       watched_tags_instructions: "Vous surveillerez automatiquement tous les sujets avec ces étiquettes. Vous serez notifié de tous les nouveaux messages et sujets, et le nombre de nouveaux messages apparaîtra à coté du sujet."
@@ -841,11 +867,11 @@ fr:
       watched_first_post_tags: "Surveiller les nouveaux sujets"
       watched_first_post_tags_instructions: "Vous serez notifié du premier message de chaque sujet avec ces étiquettes."
       muted_categories: "Silencieuses"
-      muted_categories_instructions: "Vous ne serez aucunement notifié à propos de nouveaux sujets dans ces catégories et ils n'apparaîtront pas sur les pages \"Catégories\" ou \"Dernier\"."
-      muted_categories_instructions_dont_hide: "Nous ne serez jamais notifié de quoi que ce soit à propos des nouveaux sujets dans cette catégorie."
+      muted_categories_instructions: "Vous ne serez pas notifié des nouveaux sujets de ces catégories et ils n'apparaîtront pas dans les pages Catégories ou Récents."
+      muted_categories_instructions_dont_hide: "Vous ne serez pas notifié des nouveaux sujets de ces catégories."
       no_category_access: "En tant que modérateur votre accès à la catégorie est limitée, la sauvegarde est désactivée."
       delete_account: "Supprimer mon compte"
-      delete_account_confirm: "Êtes-vous sûr de vouloir supprimer définitivement votre compte ? Cette action ne peut pas être annulée !"
+      delete_account_confirm: "Êtes-vous sûr de vouloir supprimer définitivement votre compte ? Cette action n'est pas réversible !"
       deleted_yourself: "Votre compte a été supprimé avec succès."
       delete_yourself_not_allowed: "Veuiller contacter un responsable si vous souhaiter faire supprimer votre compte."
       unread_message_count: "Messages"
@@ -853,7 +879,7 @@ fr:
       users: "Utilisateurs"
       muted_users: "Silencieux"
       muted_users_instructions: "Cacher toutes les notifications de ces utilisateurs."
-      ignored_users: "Ignoré"
+      ignored_users: "Ignorés"
       ignored_users_instructions: "Cacher toutes les publications et les notifications de ces utilisateurs."
       tracked_topics_link: "Afficher"
       automatically_unpin_topics: "Désépingler automatiquement les sujets quand j'arrive à la fin."
@@ -863,6 +889,7 @@ fr:
       api_approved: "Approuvé :"
       api_last_used_at: "Dernièrement utilisé le :"
       theme: "Thème"
+      save_to_change_theme: 'Le thème sera mis à jour après un clic sur « %{save_text} »'
       home: "Page d'accueil par défaut"
       staged: "Distant"
       staff_counters:
@@ -871,6 +898,7 @@ fr:
         deleted_posts: "messages supprimés"
         suspensions: "suspensions"
         warnings_received: "avertissements"
+        rejected_posts: "messages rejetés"
       messages:
         all: "Tous"
         inbox: "Boîte de réception"
@@ -897,6 +925,7 @@ fr:
         success: "(courriel envoyé)"
         in_progress: "(courriel en cours d'envoi)"
         error: "(erreur)"
+        emoji: "emoji de cadenas"
         action: "Envoyer un courriel de réinitialisation du mot de passe"
         set_password: "Définir le mot de passe"
         choose_new: "Choisissez un nouveau mot de passe"
@@ -908,8 +937,10 @@ fr:
         enable: "Activer"
         enable_long: "Activer les codes de secours"
         manage: "Gérer les codes de sauvegarde. Il vous reste <strong>{{count}}</strong> code(s) de sauvegarde."
-        copied_to_clipboard: "Copié dans le presse-papiers"
+        copy_to_clipboard: "Copier dans le presse-papiers"
         copy_to_clipboard_error: "Erreur en copiant les données dans le presse-papiers"
+        copied_to_clipboard: "Copié dans le presse-papiers"
+        download_backup_codes: "Télécharger les codes de secours"
         remaining_codes: "Vous avez <strong>{{count}}</strong> codes de secours restants."
         use: "Utiliser un code de secours"
         enable_prerequisites: "Vous devez activer un second facteur principal avant de générer des codes de sauvegarde."
@@ -919,7 +950,7 @@ fr:
       second_factor:
         title: "Authentification à deux facteurs"
         enable: "Paramètres d'authentification à deux facteurs"
-        forgot_password: "Mot de passe oublié ?"
+        forgot_password: "Mot de passe oublié ?"
         confirm_password_description: "Merci de confirmer votre mot de passe pour continuer"
         name: "Nom"
         label: "Code"
@@ -930,39 +961,43 @@ fr:
         show_key_description: "Saisir manuellement"
         short_description: |
           Protéger votre compte avec des codes de sécurité à usage unique.
-        extended_description: "L'authentification à deux facteurs ajoute une sécurité supplémentaire à votre compte en exigeant un jeton unique en \nplus de votre mot de passe. Les jetons peuvent être générés sur les appareils <a href=\"https://www.google.com/search?q=authenticator+apps+for+android\" target='_blank'>Android</a> et <a href=\"https://www.google.com/search?q=authenticator+apps+for+ios\">iOS</a>.\n"
+        extended_description: |
+          L'authentification à deux facteurs ajoute une sécurité supplémentaire à votre compte en exigeant un jeton unique en plus de votre mot de passe. Les jetons peuvent être générés sur les appareils <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a> et <a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a>.
         oauth_enabled_warning: "Veuillez noter que les connexions sociales seront désactivées une fois que l'authentification à deux facteurs aura été activée sur votre compte."
         use: "Utiliser l'application Authenticator"
         enforced_notice: "Vous devez activer l'authentification à deux facteurs pour accéder à ce site."
-        disable: "désactiver"
-        disable_title: "Désactiver le second facteur"
-        disable_confirm: "Êtes-vous sûr de vouloir désactiver tous les facteurs secondaires ?"
+        disable: "Désactiver"
+        disable_confirm: "Êtes-vous sûr de vouloir désactiver tous les facteurs secondaires ?"
+        save: "Sauvegarder"
         edit: "Modifier"
         edit_title: "Modifier le second facteur"
         edit_description: "Nom du second facteur"
-        enable_security_key_description: "Dès que votre clé de sécurité physique est prête, appuyer sur le bouton Enregistrer ci-dessous."
+        enable_security_key_description: |
+          Dès que votre <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">clé de sécurité physique</a> est prête, appuyer sur le bouton Enregistrer ci-dessous.
         totp:
           title: "Authentificateurs à base de jetons"
-          add: "Nouveau Authentificateur"
+          add: "Ajouter une application Authentificator"
           default_name: "Mon Authentificateur"
+          name_and_code_required_error: "Vous devez donner un nom et le code de votre application Authentificator."
         security_key:
           register: "Enregistrer"
           title: "Clés de sécurité"
-          add: "Enregistrer une clé de sécurité"
+          add: "Ajouter une clé de sécurité"
           default_name: "Clé de sécurité principale"
           not_allowed_error: "La procédure d'enregistrement de la clé de sécurité a expiré ou a été annulée."
           already_added_error: "Vous avez déjà enregistré cette clé de sécurité. Vous n'avez pas besoin de le faire à nouveau."
           edit: "Modifier la clé de sécurité"
+          save: "Sauvegarder"
           edit_description: "Nom de la clé de sécurité"
-          delete: "Supprimer"
+          name_required_error: "Vous devez donner un nom à votre clé de sécurité."
       change_about:
         title: "Modifier À propos de moi"
         error: "Il y a eu une erreur lors de la modification de cette valeur."
       change_username:
-        title: "Modifier le pseudo"
-        confirm: "Êtes-vous sûr de vouloir modifier votre pseudo ?"
-        taken: "Désolé, ce pseudo est déjà pris."
-        invalid: "Ce pseudo est invalide. Il ne doit être composé que de lettres et de chiffres."
+        title: "Modifier le nom d'utilisateur"
+        confirm: "Êtes-vous sûr de vouloir modifier votre nom d'utilisateur ?"
+        taken: "Désolé, ce nom d'utilisateur est déjà pris."
+        invalid: "Ce nom d'utilisateur est invalide. Il ne doit être composé que de lettres et de chiffres."
       change_email:
         title: "Modifier l'adresse de courriel"
         taken: "Désolé, cette adresse de courriel est indisponible."
@@ -971,6 +1006,10 @@ fr:
         success_staff: "Nous avons envoyé un courriel à votre adresse actuelle. Merci de suivre les instructions."
       change_avatar:
         title: "Modifier votre image de profil"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, associé à"
+        gravatar_title: "Modifier votre avatar sur le site de {{gravatarName}}"
+        gravatar_failed: "Nous n'avons pas trouvé un {{gravatarName}} associé à cette adresse courriel."
+        refresh_gravatar_title: "Actualiser votre {{gravatarName}}"
         letter_based: "Image de profil attribuée par le système"
         uploaded_avatar: "Avatar personnalisé"
         uploaded_avatar_empty: "Ajouter un avatar personnalisé"
@@ -993,6 +1032,7 @@ fr:
         sso_override_instructions: "Le courriel peut être mis à jour à partir du fournisseur SSO."
         instructions: "Jamais visible publiquement."
         ok: "Nous vous enverrons un courriel de confirmation"
+        required: "Veuillez entrer une adresse courriel"
         invalid: "Merci d'entrer une adresse de courriel valide"
         authenticated: "Votre adresse de courriel a été authentifiée par {{provider}}"
         frequency_immediately: "Nous vous enverrons un courriel immédiatement si vous n'avez pas lu le contenu en question."
@@ -1007,48 +1047,53 @@ fr:
         not_connected: "(non connecté)"
         confirm_modal_title: "Connectez le compte %{provider}"
         confirm_description:
-          account_specific: "Votre compte %{provider} '%{account_description}' sera utilisé pour l'authentification."
+          account_specific: "Votre compte %{provider} « %{account_description} » sera utilisé pour l'authentification."
           generic: "Votre compte %{provider} sera utilisé pour l'authentification."
       name:
-        title: "Nom d'utilisateur"
+        title: "Nom"
         instructions: "votre nom complet (facultatif)"
         instructions_required: "Votre nom complet"
+        required: "Veuillez entrer un nom"
         too_short: "Votre nom est trop court"
         ok: "Votre nom a l'air correct"
       username:
-        title: "Pseudo"
+        title: "nom d'utilisateur"
         instructions: "unique, sans espaces, court"
         short_instructions: "Les gens peuvent vous mentionner avec @{{username}}"
-        available: "Votre pseudo est disponible"
+        available: "Votre nom d'utilisateur est disponible"
         not_available: "Indisponible. Essayez {{suggestion}} ?"
         not_available_no_suggestion: "Non disponible"
-        too_short: "Votre pseudo est trop court"
-        too_long: "Votre pseudo est trop long"
-        checking: "Vérification de la disponibilité du pseudo…"
-        prefilled: "L'adresse de courriel correspond à ce pseudo enregistré"
+        too_short: "Votre nom d'utilisateur est trop court"
+        too_long: "Votre nom d'utilisateur est trop long"
+        checking: "Vérification de la disponibilité du nom d'utilisateur…"
+        prefilled: "L'adresse courriel correspond à ce nom d'utilisateur enregistré"
+        required: "Veuillez entrer un nom d'utilisateur"
       locale:
         title: "Langue de l'interface"
-        instructions: "Langue de l'interface utilisateur. Le changement sera pris en compte lorsque vous actualiserez la page."
+        instructions: "Langue de l'interface utilisateur. Le changement sera pris en compte après actualisation de la page."
         default: "(par défaut)"
         any: "tous"
       password_confirmation:
         title: "Confirmation du mot de passe"
+      invite_code:
+        title: "Code d'invitation"
+        instructions: "L'inscription nécessite un code d'invitation"
       auth_tokens:
         title: "Appareils utilisés récemment"
         ip: "IP"
         details: "Détails"
-        log_out_all: "Déconnecter tous"
-        active: "actuellement actif(s)"
-        not_you: "Pas vous ?"
+        log_out_all: "Se déconnecter partout"
+        active: "utilisé actuellement"
+        not_you: "Ce n'est pas vous ?"
         show_all: "Tout afficher ({{count}})"
         show_few: "Afficher moins"
-        was_this_you: "Etait-ce vous ?"
+        was_this_you: "Était-ce vous ?"
         was_this_you_description: "Si ce n'était pas vous, nous vous conseillons de modifier votre mot de passe et de vous déconnecter partout."
         browser_and_device: "{{browser}} sur {{device}}"
         secure_account: "Sécuriser mon compte"
         latest_post: "Votre dernier message..."
       last_posted: "Dernier message"
-      last_emailed: "Dernier courriel"
+      last_emailed: "Dernier courriel reçu"
       last_seen: "Vu"
       created: "Inscrit"
       log_out: "Se déconnecter"
@@ -1064,7 +1109,7 @@ fr:
         larger: "Grand"
         largest: "Plus grand"
       title_count_mode:
-        title: "Titre de page de fond affiche nombre de :"
+        title: "Le titre de la page en arrière-plan affiche le nombre de :"
         notifications: "Nouvelles notifications"
         contextual: "Nouveau contenu de page"
       like_notification_frequency:
@@ -1087,7 +1132,7 @@ fr:
         every_month: "tous les mois"
         every_six_months: "tous les six mois"
       email_level:
-        title: "M'envoyer un courriel quand quelqu'un me cite, répond à l'un de mes messages, mentionne mon @pseudo ou m'invite à rejoindre un sujet."
+        title: "M'envoyer un courriel quand quelqu'un me cite, répond à l'un de mes messages, me mentionne ou m'invite à rejoindre un sujet."
         always: "toujours"
         only_when_away: "seulement si absent"
         never: "jamais"
@@ -1126,7 +1171,7 @@ fr:
           one: "Afficher la première invitation."
           other: "Afficher les {{count}} premières invitations."
         redeemed: "Invitations acceptées"
-        redeemed_tab: "Utilisées"
+        redeemed_tab: "Acceptées"
         redeemed_tab_with_count: "Invitations acceptées ({{count}})"
         redeemed_at: "Acceptée le"
         pending: "Invitations en attente"
@@ -1157,20 +1202,21 @@ fr:
           text: "Invitation massive depuis un fichier"
           success: "Le fichier a été correctement importé. Vous serez notifié par message direct lorsque le traitement sera terminé."
           error: "Désolé, le fichier doit être au format CSV."
-          confirmation_message: "Vous êtes sur le point d'envoyer un courriel à toutes les adresses dans le fichier téléchargé."
+          confirmation_message: "Vous êtes sur le point d'envoyer un courriel à toutes les adresses contenues dans le fichier envoyé."
       password:
         title: "Mot de passe"
         too_short: "Votre mot de passe est trop court."
         common: "Ce mot de passe est trop commun."
-        same_as_username: "Votre mot de passe est le même que votre pseudo."
-        same_as_email: "Votre mot de passe est le même que votre adresse mail."
+        same_as_username: "Votre mot de passe est le même que votre nom d'utilisateur."
+        same_as_email: "Votre mot de passe est le même que votre adresse courriel."
         ok: "Votre mot de passe semble correct."
         instructions: "au moins %{count} caractères."
+        required: "Veuillez entrer un mot de passe"
       summary:
         title: "Résumé"
         stats: "Statistiques"
         time_read: "de lecture"
-        recent_time_read: "temps de lecture récent"
+        recent_time_read: "de lecture récente"
         topic_count:
           one: "sujets créés"
           other: "sujets créés"
@@ -1255,6 +1301,7 @@ fr:
         fixed: "Charger la page"
     modal:
       close: "fermer"
+      dismiss_error: "Ignorer l'erreur"
     close: "Fermer"
     assets_changed_confirm: "Ce site vient d'être mis à jour. Rafraîchir maintenant pour accéder à la nouvelle version ?"
     logout: "Vous avez été déconnecté."
@@ -1283,6 +1330,7 @@ fr:
     mute: Désactiver
     unmute: Activer
     last_post: Dernier message
+    local_time: "Heure locale"
     time_read: Temps de lecture
     time_read_recently: "%{time_read} récemment"
     time_read_tooltip: "%{time_read} temps de lecture total"
@@ -1295,9 +1343,9 @@ fr:
       sign_up: "S'inscrire"
       hide_session: "Me le rappeler demain"
       hide_forever: "non merci"
-      hidden_for_session: "Très bien, je vous demanderai demain. Vous pouvez toujours cliquer sur « Se connecter » pour créer un compte."
+      hidden_for_session: "Très bien, je vous demanderai demain. Vous pouvez toujours cliquer sur « Se connecter » pour créer un compte."
       intro: "Bonjour ! Vous semblez apprécier la discussion, mais n'avez pas encore créé de compte."
-      value_prop: "Quand vous créez votre compte, nous stockons ce que vous avez lu pour qu'à votre retour vous puissiez continuer là on vous vous êtes arrêtés. Vous recevez aussi des notifications, ici et par courriel, dès que quelqu'un vous répond. Et vous pouvez aimer les messages pour partager vos coups de cœurs. :heartpulse:"
+      value_prop: "Quand vous créez un compte, nous retenons ce que vous avez lu pour qu'à votre retour vous puissiez continuer là on vous vous êtes arrêté. Vous recevez aussi des notifications, ici et par courriel, dès que quelqu'un vous répond. Et vous pouvez aimer les messages pour partager vos coups de cœurs. :heartpulse:"
     summary:
       enabled_description: "Vous visualisez un résumé de ce sujet : les messages les plus intéressants choisis par la communauté."
       description: "Il y a <b>{{replyCount}}</b> réponses."
@@ -1317,26 +1365,26 @@ fr:
       remove_allowed_user: "Êtes-vous sûr de vouloir supprimer {{name}} de ce message direct ?"
       remove_allowed_group: "Êtes-vous sûr de vouloir supprimer {{name}} de ce message direct ?"
     email: "Courriel"
-    username: "Pseudo"
+    username: "Nom d'utilisateur"
     last_seen: "Vu"
     created: "Créé"
     created_lowercase: "créé"
     trust_level: "Niveau de confiance"
-    search_hint: "pseudo, courriel ou adresse IP"
+    search_hint: "nom d'utilisateur, courriel ou adresse IP"
     create_account:
       disclaimer: "En vous s'inscrivant, vous acceptez la <a href='{{privacy_link}}' target='blank'>politique de confidentialité</a> et les <a href='{{tos_link}}' target='blank'>conditions générales d'utilisation</a>."
       title: "Créer un nouveau compte"
-      failed: "Quelque chose s'est mal passé, peut-être que cette adresse de courriel est déjà enregistrée, essayez le lien Mot de passe oublié."
+      failed: "Un problème est survenu. Peut-être que cette adresse courriel est déjà enregistrée. Essayez le lien d'oubli du mot de passe."
     forgot_password:
       title: "Réinitialisation du mot de passe"
       action: "J'ai oublié mon mot de passe"
-      invite: "Saisir votre pseudo ou votre adresse de courriel, et vous recevrez un nouveau mot de passe par courriel."
+      invite: "Entrez votre nom d'utilisateur ou votre adresse courriel, et vous recevrez un nouveau mot de passe par courriel."
       reset: "Réinitialiser votre mot de passe"
-      complete_username: "Si un compte correspond au pseudo <b>%{username}</b>, vous devriez recevoir rapidement un courriel avec les instructions pour réinitialiser votre mot de passe."
-      complete_email: "Si un compte correspond à l'adresse de courriel <b>%{email}</b>, vous devriez recevoir rapidement un courriel avec les instructions pour réinitialiser votre mot de passe."
-      complete_username_found: "Nous avons trouvé un compte correspondant au pseudo <b>%{username}</b>. Vous devriez recevoir rapidement un courriel avec les instructions pour réinitialiser votre mot de passe."
+      complete_username: "Si un compte correspond au nom d'utilisateur <b>%{username}</b>, vous devriez recevoir rapidement un courriel avec les instructions pour réinitialiser votre mot de passe."
+      complete_email: "Si un compte correspond à l'adresse courriel <b>%{email}</b>, vous devriez recevoir rapidement un courriel avec les instructions pour réinitialiser votre mot de passe."
+      complete_username_found: "Nous avons trouvé un compte correspondant au nom d'utilisateur <b>%{username}</b>. Vous devriez recevoir rapidement un courriel avec les instructions pour réinitialiser votre mot de passe."
       complete_email_found: "Nous avons trouvé un compte correspondant au courriel <b>%{email}</b>. Vous devriez recevoir rapidement un courriel avec les instructions pour réinitialiser votre mot de passe."
-      complete_username_not_found: "Aucun compte ne correspond au pseudo <b>%{username}</b>"
+      complete_username_not_found: "Aucun compte ne correspond au nom d'utilisateur <b>%{username}</b>"
       complete_email_not_found: "Aucun compte ne correspond à <b>%{email}</b>"
       help: "Le courriel n'est pas arrivé ? Pensez bien à vérifier dans votre dossier de spam.<p>Vous n'êtes pas sûr de l'adresse électronique que vous avez utilisée ? Saisissez ici une adresse électronique, et nous vous dirons si elle existe ici.</p><p>Si vous n'avez plus accès à l'adresse électronique de votre compte, merci de contacter <a href='%{basePath}/about'>nos responsables serviables.</a></p>"
       button_ok: "OK"
@@ -1344,11 +1392,12 @@ fr:
     email_login:
       link_label: "M'envoyer un lien de connexion par courriel"
       button_label: "par courriel"
-      complete_username: "Si un compte correspond au pseudo <b>%{username}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
+      emoji: "emoji de cadenas"
+      complete_username: "Si un compte correspond au nom d'utilisateur <b>%{username}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
       complete_email: "Si un compte correspond à l'adresse de courriel <b>%{email}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
-      complete_username_found: "Nous avons trouvé un compte correspond au pseudo <b>%{username}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
+      complete_username_found: "Nous avons trouvé un compte correspondant au nom d'utilisateur <b>%{username}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
       complete_email_found: "Nous avons trouvé un compte correspond au courriel <b>%{email}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
-      complete_username_not_found: "Aucun compte ne correspond au pseudo <b>%{username}</b>"
+      complete_username_not_found: "Aucun compte ne correspond au nom d'utilisateur <b>%{username}</b>"
       complete_email_not_found: "Aucun compte ne correspond à <b>%{email}</b>"
       confirm_title: "Continuer vers %{site_name}"
       logging_in_as: "Connexion en tant que %{email}"
@@ -1369,13 +1418,13 @@ fr:
       security_key_not_allowed_error: "La procédure d'authentification de la clé de sécurité a expiré ou a été annulée."
       security_key_no_matching_credential_error: "Aucun identifiant correspondant n'a pu être trouvé dans la clé de sécurité donnée."
       security_key_support_missing_error: "Votre appareil ou navigateur actuel ne supporte pas l'utilisation de clés de sécurité. Veuillez utiliser une autre méthode."
-      email_placeholder: "courriel ou pseudo"
+      email_placeholder: "courriel ou nom d'utilisateur"
       caps_lock_warning: "Majuscules vérrouillées"
       error: "Erreur inconnue"
       cookies_error: "Les cookies de votre navigateur semblent désactiver. Vous ne pourrez pas vous connecter sans les activer."
       rate_limit: "Merci de patienter avant de vous reconnecter."
-      blank_username: "Merci de saisir votre courriel ou pseudo."
-      blank_username_or_password: "Merci de saisir votre courriel ou pseudo, et mot de passe."
+      blank_username: "Veuillez saisir votre courriel ou votre nom d'utilisateur."
+      blank_username_or_password: "Veuillez saisir votre courriel ou votre nom d'utilisateur et votre mot de passe."
       reset_password: "Réinitialiser le mot de passe"
       logging_in: "Connexion en cours…"
       or: "ou"
@@ -1383,21 +1432,21 @@ fr:
       awaiting_activation: "Votre compte est en attente d'activation, utilisez le lien mot de passe oublié pour envoyer un autre courriel d'activation."
       awaiting_approval: "Votre compte n'a pas encore été approuvé par un modérateur. Vous recevrez une confirmation par courriel lors de l'activation."
       requires_invite: "Désolé, l'accès à ce forum est sur invitation seulement."
-      not_activated: "Vous ne pouvez pas vous encore vous connecter. Nous avons envoyé un courriel d'activation à <b>{{sentTo}}</b>. Merci de suivre les instructions afin d'activer votre compte."
+      not_activated: "Vous ne pouvez pas vous encore vous connecter. Nous avons envoyé un courriel d'activation à <b>{{sentTo}}</b>. Veuillez suivre les instructions afin d'activer votre compte."
       not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter depuis cette adresse IP."
       admin_not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter comme administrateur depuis cette adresse IP."
       resend_activation_email: "Cliquez ici pour envoyer à nouveau le courriel d'activation."
       omniauth_disallow_totp: "L'authentification à deux facteurs est activée sur votre compte. Veuillez vous connecter avec votre mot de passe."
       resend_title: "Renvoyer le courriel d'activation"
-      change_email: "Changer l'adresse de courriel"
+      change_email: "Changer l'adresse courriel"
       provide_new_email: "Donnez une nouvelle adresse et nous allons renvoyer votre courriel de confirmation."
-      submit_new_email: "Mettre à jour l'adresse de courriel"
+      submit_new_email: "Mettre à jour l'adresse courriel"
       sent_activation_email_again: "Nous venons d'envoyer un nouveau courriel d'activation à <b>{{currentEmail}}</b>. Il peut prendre quelques minutes à arriver ; n'oubliez pas de vérifier votre répertoire spam."
       sent_activation_email_again_generic: "Nous avons envoyé un autre courriel d'activation. Il se peut que cela prenne quelques minutes pour arriver ; vérifier aussi votre spam."
       to_continue: "Veuillez vous connecter"
       preferences: "Vous devez être connecté pour modifier vos préférences utilisateur."
       forgot: "J'ai oublié les détails de mon compte"
-      not_approved: "Votre compte n'a pas encore été approuvé. Vous serez notifié par mail lorsque vous pourrez vous connecter."
+      not_approved: "Votre compte n'a pas encore été approuvé. Vous serez notifié par courriel lorsque vous pourrez vous connecter."
       google_oauth2:
         name: "Google"
         title: "via Google"
@@ -1421,6 +1470,7 @@ fr:
         backup_code: "Utilisez plutôt un code de secours"
     invites:
       accept_title: "Invitation"
+      emoji: "emoji d'enveloppe"
       welcome_to: "Bienvenue sur %{site_name} !"
       invited_by: "Vous avez été invité par :"
       social_login_available: "Vous pourrez aussi vous connecter avec un réseau social utilisant cette adresse."
@@ -1451,7 +1501,7 @@ fr:
       shift: "Maj"
       ctrl: "Ctrl"
       alt: "Alt"
-      enter: "Enter"
+      enter: "Entrée"
     conditional_loading_section:
       loading: Chargement…
     category_row:
@@ -1461,26 +1511,26 @@ fr:
       no_content: Aucune correspondance trouvée
       filter_placeholder: Rechercher...
       filter_placeholder_with_any: Rechercher ou créer…
-      create: "Créer : « {{content}} »"
+      create: "Créer : « {{content}} »"
       max_content_reached:
-        one: "Vous ne pouvez séléctionner que {{count}} élément."
-        other: "Vous ne pouvez séléctionner que {{count}} éléments."
+        one: "Vous ne pouvez sélectionner que {{count}} élément."
+        other: "Vous ne pouvez sélectionner que {{count}} éléments."
       min_content_not_reached:
-        one: "Séléctionner au moins {{count}} élément."
-        other: "Séléctionner au moins {{count}} éléments."
+        one: "Sélectionner au moins {{count}} élément."
+        other: "Sélectionner au moins {{count}} éléments."
       invalid_selection_length: "La sélection doit faire au minimum {{count}} caractères ."
     date_time_picker:
-      from: From
+      from: De
       to: À
       errors:
         to_before_from: "La date de fin doit être postérieure à celle de début."
     emoji_picker:
-      filter_placeholder: Chercher un emoji
-      smileys_&_emotion: Frimousses et Émotions
-      people_&_body: Personnes et Corps
-      animals_&_nature: Animaux et Nature
-      food_&_drink: Nourriture et Boisson
-      travel_&_places: Voyage et Lieux
+      filter_placeholder: Rechercher un emoji
+      smileys_&_emotion: Frimousses et émotions
+      people_&_body: Personnes et corps
+      animals_&_nature: Animaux et nature
+      food_&_drink: Nourriture et boisson
+      travel_&_places: Voyage et lieux
       activities: Activités
       objects: Objets
       symbols: Symboles
@@ -1494,11 +1544,11 @@ fr:
       dark_tone: Teint foncé
       default: Emojis personnalisés
     shared_drafts:
-      title: "Ébauches partagées"
+      title: "Brouillons partagés"
       notice: "Ce sujet n'est visible que pour ceux qui peuvent voir la catégorie <b>{{category}}</b>."
       destination_category: "Catégorie déstinataire"
-      publish: "Publier ébauche partagée"
-      confirm_publish: "Êtes-vous sûr de vouloir publier cette ébauche ?"
+      publish: "Publier le brouillon partagé"
+      confirm_publish: "Êtes-vous sûr de vouloir publier ce brouillon ?"
       publishing: "Sujet en cours de publication..."
     composer:
       emoji: "Emoji :)"
@@ -1523,7 +1573,7 @@ fr:
         category: "Vous avez mentionné {{username}} mais il ne sera pas notifié car il n'a pas accès à cette catégorie. Vous devez ajouter cet utilisateur à un groupe ayant accès à cette catégorie."
         private: "Vous avez mentionné {{username}} mais il ne sera pas notifié car il ne peut pas voir ce message direct. Vous devez inviter cet utilisateur à la discussion."
       duplicate_link: "Il semblerait que votre lien vers <b>{{domain}}</b> a déjà été publié dans le sujet par <b>@{{username}}</b> dans <a href='{{post_url}}'>une réponse de {{ago}}</a> – êtes vous sûr de vouloir le publier à nouveau ?"
-      reference_topic_title: "RE: {{title}}"
+      reference_topic_title: "RE : {{title}}"
       error:
         title_missing: "Le titre est obligatoire."
         title_too_short: "Le titre doit avoir au moins {{min}} caractères"
@@ -1533,9 +1583,9 @@ fr:
         try_like: "Avez-vous essayé le bouton {{heart}} ?"
         category_missing: "Vous devez choisir une catégorie"
         tags_missing: "Vous devez choisir au moins {{count}} étiquettes"
-        topic_template_not_modified: "Veuillez ajouter des détails à votre topic en modifiant le modèle de sujet."
-      save_edit: "Sauvegarder"
-      overwrite_edit: "Ecraser la modification"
+        topic_template_not_modified: "Veuillez ajouter des détails à votre sujet en modifiant le modèle de sujet."
+      save_edit: "Sauvegarder la modification"
+      overwrite_edit: "Écraser la modification"
       reply_original: "Répondre sur le sujet d'origine"
       reply_here: "Répondre ici"
       reply: "Répondre"
@@ -1543,8 +1593,8 @@ fr:
       create_topic: "Créer le sujet"
       create_pm: "Message direct"
       create_whisper: "Murmurer"
-      create_shared_draft: "Créer ébauche partagée"
-      edit_shared_draft: "Modifier ébauche partagée"
+      create_shared_draft: "Créer un brouillon partagé"
+      edit_shared_draft: "Modifier le brouillon partagé"
       title: "ou appuyez sur Ctrl+Entrée"
       users_placeholder: "Ajouter un utilisateur"
       title_placeholder: "Quel est le sujet en une courte phrase ?"
@@ -1552,8 +1602,8 @@ fr:
       edit_reason_placeholder: "pourquoi modifiez-vous le message ?"
       topic_featured_link_placeholder: "Entrez un lien affiché avec le titre."
       remove_featured_link: "Retirer le lien du sujet"
-      reply_placeholder: "Écrivez ici. Utilisez Markdown, BBCode, ou HTML pour mettre en forme. Glissez ou collez des images."
-      reply_placeholder_no_images: "Écrivez ici. Utilisez Markdown, BBCode, ou HTML pour mettre en forme."
+      reply_placeholder: "Écrivez ici. Utilisez du Markdown, BBCode ou HTML pour la mise en forme. Glissez ou collez des images."
+      reply_placeholder_no_images: "Écrivez ici. Utilisez du Markdown, BBCode ou HTML pour la mise en forme."
       reply_placeholder_choose_category: "Sélectionner une catégorie avant de rédiger ici."
       view_new_post: "Voir votre nouveau message."
       saving: "Sauvegarde"
@@ -1584,12 +1634,12 @@ fr:
       olist_title: "Liste numérotée"
       ulist_title: "Liste à puces"
       list_item: "Élément"
-      toggle_direction: "Basculer sens"
-      help: "Aide Markdown"
+      toggle_direction: "Basculer le sens"
+      help: "Aide à l'édition Markdown"
       collapse: "réduire le panneau d'édition"
       open: "ouvrir l'éditeur"
       abandon: "fermer le panneau d'édition et supprimer le brouillon"
-      enter_fullscreen: "utiliser éditeur plein écran"
+      enter_fullscreen: "utiliser l'éditeur plein écran"
       exit_fullscreen: "sortir de l'éditeur plein écran"
       modal_ok: "OK"
       modal_cancel: "Annuler"
@@ -1600,16 +1650,16 @@ fr:
       admin_options_title: "Paramètres optionnels pour ce sujet"
       composer_actions:
         reply: Répondre
-        draft: Ebauche
+        draft: Brouillon
         edit: Modifier
         reply_to_post:
-          label: "Réponse à message %{postNumber} par %{postUsername}"
+          label: "Répondre au message %{postNumber} de %{postUsername}"
           desc: Répondre à un message spécifique
         reply_as_new_topic:
           label: Répondre à un sujet lié
           desc: Créer un nouveau sujet lié à ce sujet
         reply_as_private_message:
-          label: Nouveau message
+          label: Nouveau message direct
           desc: Créer un nouveau message direct
         reply_to_topic:
           label: Répondre au sujet
@@ -1620,10 +1670,10 @@ fr:
         create_topic:
           label: "Nouveau sujet"
         shared_draft:
-          label: "Ebauche partagée"
-          desc: "Créer ébauche d'un sujet qui ne sera visible qu'aux responsables"
+          label: "Brouillon partagé"
+          desc: "Créer un brouillon de sujet qui ne sera visible qu'aux responsables"
         toggle_topic_bump:
-          label: "Basculer l'actualisation des sujets"
+          label: "Basculer l'actualisation du sujet"
           desc: "Répondre sans changer la date de dernière réponse"
     notifications:
       tooltip:
@@ -1633,7 +1683,10 @@ fr:
         message:
           one: "%{count} message non lu"
           other: "{{count}} messages non lus"
-      title: "notifications des mentions de votre @pseudo, des réponses à vos messages, à vos sujets, etc."
+        high_priority:
+          one: "%{count} notification prioritaire non lue"
+          other: "%{count} notifications prioritaires non lues"
+      title: "notifications des mentions de votre nom d'utilisateur, des réponses à vos messages et sujets, etc."
       none: "Impossible de charger les notifications pour le moment."
       empty: "Aucune notification trouvée."
       post_approved: "Votre message a été approuvé"
@@ -1660,45 +1713,47 @@ fr:
       invitee_accepted: "<span>{{username}}</span> a accepté votre invitation"
       moved_post: "<span>{{username}}</span> a deplacé {{description}}"
       linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Vous avez gagné « {{description}} »"
+      granted_badge: "Vous avez gagné « {{description}} »"
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nouveau sujet</span> {{description}}"
-      membership_request_accepted: "Adhésion acceptée dans '{{group_name}}'"
-      membership_request_consolidated: "{{count}} demandes d'adhésion ouvertes pour « {{group_name}} »"
+      membership_request_accepted: "Adhésion acceptée dans « {{group_name}} »"
+      membership_request_consolidated: "{{count}} demandes d'adhésion ouvertes pour « {{group_name}} »"
       group_message_summary:
         one: "{{count}} message dans la boîte de réception de {{group_name}}"
         other: "{{count}} messages dans la boîte de réception de {{group_name}}"
       popup:
-        mentioned: '{{username}} vous a mentionné dans « {{topic}} » - {{site_title}}'
-        group_mentioned: '{{username}} vous a mentionné dans « {{topic}} » - {{site_title}}'
-        quoted: '{{username}} vous a cité dans « {{topic}} » - {{site_title}}'
-        replied: '{{username}} vous a répondu dans « {{topic}} » - {{site_title}}'
-        posted: '{{username}} a posté dans « {{topic}} » - {{site_title}}'
-        private_message: '{{username}} vous a envoyé un message direct dans « {{topic}} » - {{site_title}}'
-        linked: '{{username}} a créé un lien vers votre message posté dans « {{topic}} » - {{site_title}}'
-        watching_first_post: '{{username}} a crée un nouveau sujet « {{topic}} » - {{site_title}}'
+        mentioned: '{{username}} vous a mentionné dans « {{topic}} » - {{site_title}}'
+        group_mentioned: '{{username}} vous a mentionné dans « {{topic}} » - {{site_title}}'
+        quoted: '{{username}} vous a cité dans « {{topic}} » - {{site_title}}'
+        replied: '{{username}} vous a répondu dans « {{topic}} » - {{site_title}}'
+        posted: '{{username}} a posté dans « {{topic}} » - {{site_title}}'
+        private_message: '{{username}} vous a envoyé un message direct dans « {{topic}} » - {{site_title}}'
+        linked: '{{username}} a créé un lien vers votre message posté dans « {{topic}} » - {{site_title}}'
+        watching_first_post: '{{username}} a crée un nouveau sujet « {{topic}} » - {{site_title}}'
         confirm_title: "Notifications activées - %{site_title}"
         confirm_body: "Les notifications ont été activées."
         custom: "Notification de {{username}} sur %{site_title}"
       titles:
-        mentioned: "mentionnés"
+        mentioned: "mentionné"
         replied: "nouvelle réponse"
-        quoted: "cités"
+        quoted: "cité"
         edited: "modifiés"
-        liked: "nouveau j'aime"
+        liked: "nouveau J'aime"
         private_message: "nouveau message direct"
-        invited_to_private_message: "invité au message privé"
+        invited_to_private_message: "invité au message direct"
         invitee_accepted: "invitation acceptée"
         posted: "nouveau message"
         moved_post: "message déplacé"
         linked: "linkés"
+        bookmark_reminder: "rappel de signet"
+        bookmark_reminder_with_name: "rappel de signet - %{name}"
         granted_badge: "badge attribué"
         invited_to_topic: "invité à un sujet"
         group_mentioned: "groupe mentionné"
         group_message_summary: "nouveaux messages de groupe"
         watching_first_post: "nouveau sujet"
         topic_reminder: "rappel de sujet"
-        liked_consolidated: "nouveaux j'aime"
+        liked_consolidated: "nouveaux J'aime"
         post_approved: "message approuvé"
         membership_request_consolidated: "nouvelles demandes d'adhésion"
     upload_selector:
@@ -1734,7 +1789,7 @@ fr:
       no_more_results: "Aucun résultat supplémentaire."
       searching: "Recherche en cours…"
       post_format: "#{{post_number}} par {{username}}"
-      results_page: "Résultats de recherche pour « {{term}} »"
+      results_page: "Résultats de recherche pour « {{term}} »"
       more_results: "Il y a d'autres résultats. Merci de préciser vos critères de recherche."
       cant_find: "Vous ne trouvez pas ce que vous cherchez ?"
       start_new_topic: "Voulez-vous commencer un nouveau sujet ?"
@@ -1743,29 +1798,29 @@ fr:
       search_google_button: "Google"
       search_google_title: "Rechercher dans ce site"
       context:
-        user: "Chercher dans les messages de @{{username}}"
+        user: "Rechercher dans les messages de @{{username}}"
         category: "Rechercher dans la catégorie #{{category}}"
-        tag: "Rechercher l'étiquette #{{tag}}"
+        tag: "Rechercher dans l'étiquette #{{tag}}"
         topic: "Rechercher dans ce sujet"
-        private_messages: "Rechercher des messages directs"
+        private_messages: "Rechercher dans les messages directs"
       advanced:
         title: Recherche avancée
         posted_by:
-          label: Rédigé par
+          label: Auteur
         in_category:
-          label: Dans la catégorie
+          label: Catégorie
         in_group:
-          label: Dans le groupe
+          label: Groupe
         with_badge:
-          label: Avec le badge
+          label: Badge
         with_tags:
-          label: Etiquetté
+          label: Étiquettes
         filters:
-          label: Seulement retourner les sujets/messages...
-          title: Seuls les titres correspondent
-          likes: que j'ai aimé
+          label: Seulement retourner les sujets/messages…
+          title: où seuls les titres correspondent
+          likes: que j'ai aimés
           posted: auxquels j'ai participé
-          created: J'ai créer
+          created: que j'ai créés
           watching: que je surveille
           tracking: que je suis
           private: qui sont dans mes messages directs
@@ -1773,13 +1828,13 @@ fr:
           first: qui sont les premiers messages
           pinned: qui sont épinglés
           unpinned: qui ne sont pas épinglés
-          seen: que j'ai lu
-          unseen: je n'ai pas lu
+          seen: que j'ai lus
+          unseen: que je n'ai pas lus
           wiki: qui sont des wikis
-          images: inclure le(s) images(s)
-          all_tags: Contient toutes les étiquettes
+          images: qui contiennent des images
+          all_tags: Contient toutes ces étiquettes
         statuses:
-          label: Dont les sujets
+          label: et dont les sujets
           open: sont ouverts
           closed: sont fermés
           public: sont publiques
@@ -1790,7 +1845,7 @@ fr:
           count:
             label: Nombre minimum de messages
           time:
-            label: Quand
+            label: Date
             before: avant
             after: après
     hamburger_menu: "aller à une autre catégorie ou liste de sujets"
@@ -1826,7 +1881,7 @@ fr:
           other: "Vous avez sélectionné <b>{{count}}</b> sujets."
         change_tags: "Changer les étiquettes"
         append_tags: "Ajouter les étiquettes"
-        choose_new_tags: "Choisir les nouvelles étiquettes pour ces sujets :"
+        choose_new_tags: "Choisissez de nouvelles étiquettes pour ces sujets :"
         choose_append_tags: "Choisissez de nouvelles étiquettes à ajouter à ces sujets :"
         changed_tags: "Les étiquettes de ces sujets ont été modifiées."
       none:
@@ -1845,10 +1900,10 @@ fr:
         latest: "Il n'y a plus de sujets à lire."
         posted: "Il n'y a plus de sujets à lire."
         read: "Il n'y a plus de sujets à lire."
-        new: "Il n'y a plus de nouveaux sujets."
+        new: "Il n'y a plus de sujets à lire."
         unread: "Il n'y a plus de sujets à lire."
         category: "Il n'y a plus de sujets à lire dans {{category}}."
-        top: "Il n'y a plus de meilleurs sujets."
+        top: "Il n'y a plus de sujets à lire."
         bookmarks: "Il n'y a plus de sujets avec des signets."
     topic:
       filter_to:
@@ -1856,22 +1911,22 @@ fr:
         other: "{{count}} messages dans le sujet"
       create: "Créer un sujet"
       create_long: "Créer un nouveau sujet"
-      open_draft: "Ouvrir ébauche"
+      open_draft: "Ouvrir le brouillon"
       private_message: "Écrire un message"
       archive_message:
         help: "Déplacer le message dans votre archive"
         title: "Archiver"
       move_to_inbox:
         title: "Déplacer dans la boîte de réception"
-        help: "Redéplacer dans la boîte de réception"
+        help: "Déplacer le message dans la boîte de réception"
       edit_message:
-        help: "Modifier premier message"
-        title: "Modifier message"
+        help: "Modifier le premier message du message direct"
+        title: "Modifier"
       defer:
-        help: "Marquer comme non-lu"
-        title: "Reporter"
+        help: "Marquer comme non lu"
+        title: "Reporter à plus tard"
       feature_on_profile:
-        help: "Ajouter un lien vers ce sujet sur votre carte d&#39;utilisateur et votre profil"
+        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 a déjà un sujet en vedette. Si vous continuez, ce sujet le remplacera."
@@ -1912,24 +1967,26 @@ fr:
       back_to_list: "Retour à la liste des sujets"
       options: "Options du sujet"
       show_links: "afficher les liens dans ce sujet"
-      toggle_information: "basculer affichage des détails de ce sujet"
+      toggle_information: "basculer l'affichage des détails du sujet"
       read_more_in_category: "Vous voulez en lire plus ? Découvrez d'autres sujets dans {{catLink}} ou {{latestLink}}."
       read_more: "Vous voulez en lire plus ? {{catLink}} ou {{latestLink}}."
-      group_request: "Effectuez une demande d'adhésion au groupe `{{name}}` pour afficher ce sujet."
-      group_join: "Vous devez rejoindre le groupe `{{name}}` pour voir ce sujet"
+      group_request: "Effectuez une demande d'adhésion au groupe « {{name}} » pour afficher ce sujet"
+      group_join: "Vous devez rejoindre le groupe « {{name}} » pour voir ce sujet"
       group_request_sent: "Votre demande d'adhésion au groupe a été envoyée. Vous serez averti de son acceptation."
-      unread_indicator: "Aucun membre n'a encore lu le dernier message de ce topic."
+      unread_indicator: "Aucun membre n'a encore lu le dernier message de ce sujet."
       read_more_MF: "Il y { UNREAD, plural, =0 {} one { a <a href='{basePath}/unread'>1 sujet non lu</a> } other { a <a href='{basePath}/unread'># sujets non lus</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{et } false {a } other{}} <a href='{basePath}/new'>1 nouveau sujet</a> } other { {BOTH, select, true{et } false {a } other{}} <a href='{basePath}/new'># nouveaux sujets</a> } } restant, ou {CATEGORY, select, true {consulter les autres sujets dans {catLink}} false {{latestLink}} other {}}"
+      bumped_at_title_MF: "{FIRST_POST} : {CREATED_AT}\n{LAST_POST} : {BUMPED_AT}"
       browse_all_categories: Voir toutes les catégories
       view_latest_topics: voir les derniers sujets
       suggest_create_topic: "Pourquoi ne pas créer un sujet ?"
       jump_reply_up: aller à des réponses précédentes
-      jump_reply_down: allez à des réponses ultérieures
+      jump_reply_down: aller à des réponses ultérieures
       deleted: "Ce sujet a été supprimé"
       topic_status_update:
         title: "Action planifiée du sujet"
         save: "Planifier"
         num_of_hours: "Nombre d'heures :"
+        num_of_days: "Nombre de jours :"
         remove: "Supprimer la planification"
         publish_to: "Publier dans :"
         when: "Quand :"
@@ -1944,7 +2001,7 @@ fr:
         this_weekend: "Ce weekend"
         next_week: "Semaine prochaine"
         two_weeks: "Deux semaines"
-        next_month: "Mois prochai"
+        next_month: "Mois prochain"
         two_months: "Deux mois"
         three_months: "Trois mois"
         four_months: "Quatre mois"
@@ -1954,7 +2011,7 @@ fr:
         pick_date_and_time: "Sélectionner une date et heure"
         set_based_on_last_post: "Fermer par rapport au dernier message"
       publish_to_category:
-        title: "Planifier publication"
+        title: "Planifier la publication"
       temp_open:
         title: "Ouvrir temporairement"
       auto_reopen:
@@ -1972,6 +2029,8 @@ fr:
         title: "Remonter automatiquement le sujet"
       reminder:
         title: "Me rappeler"
+      auto_delete_replies:
+        title: "Auto-suppression des réponses"
       status_update_notice:
         auto_open: "Ce sujet sera automatiquement ouvert %{timeLeft}."
         auto_close: "Ce sujet sera automatiquement fermé %{timeLeft}."
@@ -1980,6 +2039,7 @@ fr:
         auto_delete: "Ce sujet sera automatiquement supprimé %{timeLeft}."
         auto_bump: "Ce sujet sera automatiquement remonté %{timeLeft}."
         auto_reminder: "Vous serez rappelé sur ce sujet %{timeLeft}."
+        auto_delete_replies: "Les réponses à ce sujet sont automatiquement supprimées après %{duration}."
       auto_close_title: "Paramètres de fermeture automatique"
       auto_close_immediate:
         one: "Le dernier message dans ce sujet est déjà vieux de %{count} heure donc le sujet sera immédiatement fermé."
@@ -1995,7 +2055,7 @@ fr:
         go: "aller"
         jump_bottom: "aller au dernier message"
         jump_prompt: "aller à…"
-        jump_prompt_of: "de %{count} messages"
+        jump_prompt_of: "sur %{count} messages"
         jump_prompt_long: "Aller à…"
         jump_bottom_with_number: "aller au message %{post_number}"
         jump_prompt_to_date: "à la date"
@@ -2015,8 +2075,9 @@ fr:
           "2_8": "Vous verrez un compteur de nouvelles réponses car vous suivez cette catégorie."
           "2_4": "Vous verrez un compteur de nouvelles réponses car vous avez répondu dans ce sujet."
           "2_2": "Vous verrez un compteur de nouvelles réponses car vous suivez ce sujet."
-          "1_2": "Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond."
-          "1": "Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond."
+          "2": 'Vous verrez un compteur de nouvelles réponses car vous <a href="{{basePath}}/u/{{username}}/preferences/notifications">avez lu ce sujet</a>.'
+          "1_2": "Vous serez notifié si quelqu'un vous mentionne ou vous répond."
+          "1": "Vous serez notifié si quelqu'un vous mentionne ou vous répond."
           "0_7": "Vous ignorez toutes les notifications de cette catégorie."
           "0_2": "Vous ignorez toutes les notifications de ce sujet."
           "0": "Vous ignorez toutes les notifications de ce sujet."
@@ -2028,16 +2089,16 @@ fr:
           description: "Vous serez notifié de chaque nouvelle réponse dans ce sujet, et le nombre de nouvelles réponses apparaîtra."
         tracking_pm:
           title: "Suivi"
-          description: "Le nombre de nouvelles réponses apparaîtra pour ce message. Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond."
+          description: "Le nombre de nouvelles réponses apparaîtra pour ce message. Vous serez notifié si quelqu'un vous mentionne ou vous répond."
         tracking:
           title: "Suivi"
-          description: "Le nombre de nouvelles réponses apparaîtra pour ce sujet. Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond."
+          description: "Le nombre de nouvelles réponses apparaîtra pour ce sujet. Vous serez notifié si quelqu'un vous mentionne ou vous répond."
         regular:
           title: "Normal"
-          description: "Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond."
+          description: "Vous serez notifié si quelqu'un vous mentionne ou vous répond."
         regular_pm:
           title: "Normal"
-          description: "Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond."
+          description: "Vous serez notifié si quelqu'un vous mentionne ou vous répond."
         muted_pm:
           title: "Silencieux"
           description: "Vous ne serez jamais averti de quoi que ce soit à propos de ce message."
@@ -2087,7 +2148,7 @@ fr:
         success_message: "Vous avez signalé ce sujet avec succès."
       make_public:
         title: "Convertir en sujet public"
-        choose_category: "Veuillez choisir une catégorie pour le sujet public :"
+        choose_category: "Veuillez choisir une catégorie pour le sujet public :"
       feature_topic:
         title: "Mettre ce sujet en évidence"
         pin: "Faire apparaître ce sujet en haut de la catégorie {{categoryLink}} jusqu'à"
@@ -2115,11 +2176,11 @@ fr:
         no_banner_exists: "Il n'y a pas de sujet à la une."
         banner_exists: "Il y <strong class='badge badge-notification unread'>a</strong> un sujet à la une."
       inviting: "Invitation en cours…"
-      automatically_add_to_groups: "Cette invitation inclut également l'accès aux groupes suivants :"
+      automatically_add_to_groups: "Cette invitation inclut également l'accès aux groupes suivants :"
       invite_private:
         title: "Inviter dans la discussion"
-        email_or_username: "Adresse de courriel ou @pseudo de l'invité"
-        email_or_username_placeholder: "adresse de courriel ou @pseudo"
+        email_or_username: "Adresse courriel ou nom d'utilisateur de l'invité"
+        email_or_username_placeholder: "adresse courriel ou nom d'utilisateur"
         action: "Inviter"
         success: "Nous avons invité cet utilisateur à participer à cette discussion."
         success_group: "Nous avons invité ce groupe à participer à cette discussion."
@@ -2128,15 +2189,15 @@ fr:
       controls: "Actions sur le sujet"
       invite_reply:
         title: "Inviter"
-        username_placeholder: "pseudo"
+        username_placeholder: "nom d'utilisateur"
         action: "Envoyer une invitation"
-        help: "inviter d'autres personnes sur ce sujet par email ou notifications"
+        help: "inviter d'autres personnes sur ce sujet par courriel ou notifications"
         to_forum: "Nous allons envoyer un courriel à votre ami pour lui permettre de participer au forum juste en cliquant sur un lien, sans avoir à saisir un identifiant."
         sso_enabled: "Entrez le nom d'utilisateur de la personne que vous souhaitez inviter sur ce sujet."
-        to_topic_blank: "Entrez le pseudo ou l'adresse email de la personne que vous souhaitez inviter sur ce sujet."
-        to_topic_email: "Vous avez entré une adresse email. Nous allons envoyer une invitation à votre ami lui permettant de répondre immédiatement à ce sujet."
-        to_topic_username: "Vous avez entré un nom d'utilisateur. Nous allons envoyer une notification avec un lien les invitant sur ce sujet."
-        to_username: "Entrez le nom d'utilisateur de la personne que vous souhaitez inviter. Nous enverrons une notification avec un lien les invitant sur ce sujet."
+        to_topic_blank: "Entrez le nom d'utilisateur ou l'adresse courriel de la personne que vous souhaitez inviter sur ce sujet."
+        to_topic_email: "Vous avez entré une adresse courriel. Nous allons envoyer une invitation à votre ami lui permettant de répondre immédiatement à ce sujet."
+        to_topic_username: "Vous avez entré un nom d'utilisateur. Nous allons lui envoyer une notification avec un lien l'invitant sur ce sujet."
+        to_username: "Entrez le nom d'utilisateur de la personne que vous souhaitez inviter. Nous enverrons une notification avec un lien l'invitant sur ce sujet."
         email_placeholder: "nom@exemple.com"
         success_email: "Nous avons envoyé une invitation à <b>{{emailOrUsername}}</b>. Nous vous avertirons lorsqu'il l'aura acceptée. Suivez l'état de vos invitations dans l'onglet prévu à cet effet sur votre page utilisateur."
         success_username: "Nous avons invité cet utilisateur à participer à ce sujet."
@@ -2167,43 +2228,58 @@ fr:
         error: "Il y a eu une erreur en déplaçant les messages dans ce sujet."
         radio_label: "Sujet existant"
         instructions:
-          one: "Merci de sélectionner le sujet dans lequel vous souhaitez déplacer ce message."
-          other: "Merci de sélectionner le sujet dans lequel vous souhaitez déplacer ces <b>{{count}}</b> messages."
+          one: "Veuillez sélectionner le sujet dans lequel vous souhaitez déplacer ce message."
+          other: "Veuillez sélectionner le sujet dans lequel vous souhaitez déplacer ces <b>{{count}}</b> messages."
       move_to_new_message:
-        title: "Déplacer vers un nouveau message"
-        action: "déplacer vers un nouveau message"
-        message_title: "Titre du nouveau message"
-        radio_label: "Nouveau message"
+        title: "Déplacer vers un nouveau message direct"
+        action: "déplacer vers un nouveau message direct"
+        message_title: "Titre du nouveau message direct"
+        radio_label: "Nouveau message direct"
         participants: "Participants"
         instructions:
-          one: "Vous êtes sur le point de créer un nouveau message avec le message que vous avez sélectionné."
-          other: "Vous êtes sur le point de créer un nouveau message avec les <b>{{count}}</b> messages que vous avez sélectionné."
+          one: "Vous êtes sur le point de créer un nouveau message direct avec le message que vous avez sélectionné."
+          other: "Vous êtes sur le point de créer un nouveau message direct avec les <b>{{count}}</b> messages que vous avez sélectionnés."
       move_to_existing_message:
-        title: "Déplacer vers un message existant"
-        action: "déplacer vers un message existant"
-        radio_label: "Message existant"
+        title: "Déplacer vers un message direct existant"
+        action: "déplacer vers un message direct existant"
+        radio_label: "Message direct existant"
         participants: "Participants"
         instructions:
-          one: "Merci de sélectionner le message dans lequel vous souhaitez déplacer ce message."
-          other: "Merci de sélectionner le message dans lequel vous souhaitez déplacer ces <b>{{count}}</b> messages."
+          one: "Veuillez sélectionner le message direct dans lequel vous souhaitez déplacer ce message."
+          other: "Veuillez sélectionner le message direct dans lequel vous souhaitez déplacer ces <b>{{count}}</b> messages."
       merge_posts:
         title: "Fusionner les messages sélectionnés"
         action: "fusionner les messages sélectionnés"
         error: "Il y a eu une erreur lors de la fusion des messages sélectionnés."
+      publish_page:
+        title: "Publication de pages"
+        publish: "Publier"
+        description: "Lorsqu'un sujet est publié comme page, son URL peut être partagée et il sera affiché avec un style personnalisé."
+        slug: "Identifiant"
+        publish_url: "Votre page a été publiée sur :"
+        topic_published: "Votre sujet a été publié sur :"
+        preview_url: "Votre page sera publiée sur :"
+        invalid_slug: "Désolé, vous ne pouvez pas publier cette page."
+        unpublish: "Annuler la publication"
+        unpublished: "La publication de votre page a été annulée et elle n'est plus accessible."
+        publishing_settings: "Paramètres de publication"
       change_owner:
         title: "Changer de propriétaire"
         action: "modifier l'auteur"
         error: "Il y a eu une erreur lors du changement de l'auteur des messages."
-        placeholder: "pseudo du nouvel auteur"
+        placeholder: "nom d'utilisateur du nouvel auteur"
         instructions:
-          one: "Merci d'indiquer un nouvel auteur pour le message de <b>@{{old_user}}</b>"
-          other: "Merci d'indiquer un nouvel auteur pour {{count}} messages par <b>@{{old_user}}</b>"
+          one: "Veuillez choisir un nouvel auteur pour le message de <b>@{{old_user}}</b>"
+          other: "Veuillez choisir un nouvel auteur pour les {{count}} messages de <b>@{{old_user}}</b>"
+        instructions_without_old_user:
+          one: "Veuillez choisir un nouvel auteur pour le message"
+          other: "Veuillez choisir un nouvel auteur pour les {{count}} messages"
       change_timestamp:
         title: "Modifier la date/heure…"
         action: "modifier la date/heure"
         invalid_timestamp: "La date/heure ne peut être dans le futur"
         error: "Il y a eu une erreur lors de la modification de la date/heure de ce sujet."
-        instructions: "Veuillez sélectionner la nouvelle date/heure du sujet. Les messages dans ce topic seront mis à jour pour maintenir la même différence d'heure."
+        instructions: "Veuillez sélectionner la nouvelle date/heure du sujet. Les messages dans ce sujet seront mis à jour pour maintenir la même différence d'heure."
       multi_select:
         select: "sélectionner"
         selected: "sélectionnés ({{count}})"
@@ -2218,7 +2294,7 @@ fr:
           title: "Ajouter le message et toutes ses réponses à la sélection"
         select_below:
           label: "sélectionner avec suivants"
-          title: "Ajouter un message et tout ceux qui suivent à la sélection"
+          title: "Ajouter le message et tous ceux qui suivent à la sélection"
         delete: supprimer la sélection
         cancel: annuler la sélection
         select_all: tout sélectionner
@@ -2241,13 +2317,13 @@ fr:
       continue_discussion: "Suite du sujet {{postLink}} :"
       follow_quote: "aller au message cité"
       show_full: "Afficher le message complet"
-      show_hidden: "Visualiser contenu ignoré."
+      show_hidden: "Visualiser le contenu ignoré."
       deleted_by_author:
         one: "(message supprimé par son auteur, sera supprimé automatiquement dans %{count} heure à moins qu'il ne soit signalé)"
         other: "(message supprimé par son auteur, sera supprimé automatiquement dans %{count} heures à moins qu'il ne soit signalé)"
       collapse: "réduire"
-      expand_collapse: "étendre/réduire"
-      locked: "un responsable a vérouillé ce message pour empêcher la modification"
+      expand_collapse: "développer/réduire"
+      locked: "un responsable a verrouillé ce message pour empêcher sa modification"
       gap:
         one: "voir %{count} réponse cachée"
         other: "voir {{count}} réponses cachées"
@@ -2266,18 +2342,18 @@ fr:
         one: "vous et %{count} autre personne ont aimé ce message"
         other: "vous et {{count}} autres personnes ont aimé ce message"
       errors:
-        create: "Désolé, il y a eu une erreur lors de la publication de votre message. Merci de réessayer."
-        edit: "Désolé, il y a eu une erreur lors de la modification de votre message. Merci de réessayer."
-        upload: "Désolé, il y a eu une erreur lors de l'envoi du fichier. Merci de réessayer."
-        file_too_large: "Désolé, ce fichier est trop volumineux (la taille maximale autorisée est de {{max_size_kb}} Ko). Pourquoi ne téléchargez-vous pas votre gros fichier sur un service d'hébergement externe, pour ensuite coller le lien ici ?"
+        create: "Désolé, il y a eu une erreur lors de la publication de votre message. Veuillez réessayer."
+        edit: "Désolé, il y a eu une erreur lors de la modification de votre message. Veuillez réessayer."
+        upload: "Désolé, il y a eu une erreur lors de l'envoi du fichier. Veuillez réessayer."
+        file_too_large: "Désolé, ce fichier est trop volumineux (la taille maximale autorisée est de {{max_size_kb}} Ko). Vous pouvez envoyer votre fichier sur un service d'hébergement externe et ensuite coller le lien ici."
         too_many_uploads: "Désolé, vous ne pouvez envoyer qu'un seul fichier à la fois."
-        too_many_dragged_and_dropped_files: "Désolé, vous ne pouvez télécharger que {{max}} fichiers à la fois."
+        too_many_dragged_and_dropped_files: "Désolé, vous ne pouvez envoyer que {{max}} fichiers à la fois."
         upload_not_authorized: "Désolé, le fichier que vous essayez d'envoyer n'est pas autorisé (extensions autorisées : {{authorized_extensions}})."
         image_upload_not_allowed_for_new_user: "Désolé, les nouveaux utilisateurs ne peuvent pas envoyer d'images."
-        attachment_upload_not_allowed_for_new_user: "Désolé, les nouveaux utilisateurs ne peuvent pas envoyer de fichier."
+        attachment_upload_not_allowed_for_new_user: "Désolé, les nouveaux utilisateurs ne peuvent pas envoyer de fichiers."
         attachment_download_requires_login: "Désolé, vous devez être connecté pour télécharger une pièce jointe."
       abandon_edit:
-        confirm: "Êtes-vous sûr de vouloir annuler vos changements ?"
+        confirm: "Êtes-vous sûr de vouloir annuler vos changements ?"
         no_value: "Non, garder"
         no_save_draft: "Non, enregistrer le brouillon"
         yes_value: "Oui, annuler la modification"
@@ -2323,18 +2399,19 @@ fr:
         convert_to_moderator: "Ajouter la couleur modérateur"
         revert_to_regular: "Retirer la couleur modérateur"
         rebake: "Reconstruire l'HTML"
+        publish_page: "Publication de pages"
         unhide: "Ré-afficher"
         change_owner: "Modifier l'auteur"
         grant_badge: "Décerner le badge"
-        lock_post: "Vérouiller message"
-        lock_post_description: "empêcher l'utilisateur de modifier le message"
-        unlock_post: "Déverrouiller message"
+        lock_post: "Verrouiller le message"
+        lock_post_description: "empêcher l'utilisateur de modifier ce message"
+        unlock_post: "Déverrouiller le message"
         unlock_post_description: "permettre l'utilisateur de modifier le message"
         delete_topic_disallowed_modal: "Vous n'avez pas le permission de supprimer ce sujet. Si vous souhaitez vraiment le voir supprimé, signalez-le aux modérateurs avec une explication."
         delete_topic_disallowed: "vous n'avez pas la permission de supprimer ce sujet"
         delete_topic: "supprimer le sujet"
-        add_post_notice: "Ajouter note pour responsables"
-        remove_post_notice: "Retirer le note pour responsables"
+        add_post_notice: "Ajouter une note pour les responsables"
+        remove_post_notice: "Retirer la note pour les responsables"
         remove_timer: "retirer le compteur"
       actions:
         flag: "Signaler"
@@ -2417,12 +2494,18 @@ fr:
             button: "HTML"
       bookmarks:
         create: "Ajouter un signet"
+        edit: "Modifier le signet"
         created: "Créé"
         updated: "Mis à jour"
         name: "Nom"
+        name_placeholder: "À quoi correspond ce signet ?"
         actions:
           delete_bookmark:
             name: "Supprimer le signet"
+            description: "Supprime le signet de votre profile et annule tous les rappels pour ce signet"
+          edit_bookmark:
+            name: "Modifier le signet"
+            description: "Modifier le nom du signet ou changer la date et l'heure du rappel"
     category:
       can: "peut&hellip; "
       none: "(aucune catégorie)"
@@ -2439,25 +2522,25 @@ fr:
       tags_allowed_tag_groups: "Réserver l'utilisation de ces groupes d'étiquettes à cette catégorie :"
       tags_placeholder: "(Facultatif) liste des étiquettes autorisées"
       tags_tab_description: "Les étiquettes et les groupes d'étiquettes spécifiés au dessus ne seront disponibles que dans cette catégorie ainsi que dans toutes les catégories qui contiennent les mêmes spécifications. Ces étiquettes ne pourront pas être utilisées dans d'autres catégories."
-      tag_groups_placeholder: "(Facultatif) liste des groupes de étiquettes autorisées"
+      tag_groups_placeholder: "(Facultatif) liste des groupes d'étiquettes autorisées"
       manage_tag_groups_link: "Gérer les groupes d'étiquettes ici."
       allow_global_tags_label: "Permettre aussi d'autres étiquettes"
       tag_group_selector_placeholder: "(Facultatif) Groupe d'étiquettes"
-      required_tag_group_description: "Exiger que les nouveaux sujets aient des étiquette à partir d'un groupe d’étiquettes :"
-      min_tags_from_required_group_label: "Nombre d'étiquettes :"
-      required_tag_group_label: "Groupe d'étiquettes :"
+      required_tag_group_description: "Exiger que les nouveaux sujets aient des étiquettes d'un groupe d’étiquettes :"
+      min_tags_from_required_group_label: "Nombre d'étiquettes :"
+      required_tag_group_label: "Groupe d'étiquettes :"
       topic_featured_link_allowed: "Autoriser les liens à la une dans cette catégorie"
       delete: "Supprimer la catégorie"
       create: "Nouvelle catégorie"
       create_long: "Créer une nouvelle catégorie"
-      save: "Enregistrer la catégorie"
+      save: "Sauvegarder la catégorie"
       slug: "Identifiant de la catégorie"
       slug_placeholder: "(Facultatif) mots séparés par des tirets pour l'URL"
       creation_error: Il y a eu une erreur lors de la création de la catégorie.
       save_error: Il y a eu une erreur lors de la sauvegarde de la catégorie.
       name: "Nom de la catégorie"
       description: "Description"
-      topic: "catégorie du sujet"
+      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"
@@ -2475,14 +2558,15 @@ fr:
       special_warning: "Avertissement : cette catégorie est une catégorie pré-remplie et les réglages de sécurité ne peuvent pas être modifiés. Si vous ne souhaitez pas utiliser cette catégorie, supprimez là au lieu de détourner sa fonction."
       uncategorized_security_warning: "Cette catégorie est spéciale. Elle sert de zone d'attente pour les sujets qui n'ont pas de catégorie ; vous ne pouvez pas changer ses paramètres de sécurité."
       uncategorized_general_warning: 'Cette catégorie est spéciale. Elle sert de catégorie par défaut pour les nouveaux sujets qui ne sont pas liés à une catégorie. Si vous souhaitez changer cela et forcer la sélection de catégorie, <a href="%{settingLink}">veuillez désactiver ce paramètre</a>. Si vous voulez modifier son nom ou sa description, allez dans <a href="%{customizeLink}">Personnaliser / Contenu</a>.'
-      pending_permission_change_alert: "Vous n'avez pas ajouté %{group} à cette catégorie; cliquez sur ce bouton pour les ajouter."
+      pending_permission_change_alert: "Vous n'avez pas ajouté %{group} à cette catégorie ; cliquez sur ce bouton pour l'ajouter."
       images: "Images"
-      email_in: "Adresse de courriel entrant personnalisée :"
+      email_in: "Adresse courriel entrant personnalisée :"
       email_in_allow_strangers: "Accepter les courriels d'utilisateurs anonymes sans compte"
-      email_in_disabled: "La possibilité de créer des nouveaux sujets via courriel est désactivé dans les Paramètres. Pour l'activer,"
-      email_in_disabled_click: 'activer le paramètre « email in ».'
+      email_in_disabled: "La création de nouveaux sujets par courriel est désactivée dans les paramètres. Pour activer la création de nouveaux sujets par courriel,"
+      email_in_disabled_click: 'activez le paramètre « email in ».'
       mailinglist_mirror: "La catégorie reflète une liste de diffusion"
       show_subcategory_list: "Afficher la liste des sous-catégories au dessus des sujets dans cette catégorie."
+      read_only_banner: "Texte du bandeau à afficher lorsqu'un utilisateur ne peut pas créer un sujet dans cette catégorie :"
       num_featured_topics: "Nombre de sujets affichés sur la page des catégories :"
       subcategory_num_featured_topics: "Nombre de sujets à la une sur la page de la catégorie parente :"
       all_topics_wiki: "Faire des nouveaux sujets des Wikis par défaut"
@@ -2490,7 +2574,7 @@ fr:
       sort_order: "Trier la liste de sujets par :"
       default_view: "Liste de sujets par défaut :"
       default_top_period: "Période des meilleurs sujets par défaut :"
-      allow_badges_label: "Autoriser les badges à être accordé dans cette catégorie"
+      allow_badges_label: "Autoriser les badges à être accordés dans cette catégorie"
       edit_permissions: "Modifier les permissions"
       reviewable_by_group: "En plus des responsables, les messages et signalements dans cette catégorie peuvent aussi être vérifier par :"
       review_group_name: "nom du groupe"
@@ -2500,11 +2584,11 @@ fr:
       position: "Position sur la page des catégories :"
       default_position: "Position par défaut"
       position_disabled: "Les catégories seront affichées dans l'ordre d'activité. Pour contrôler l'ordre des catégories dans la liste,"
-      position_disabled_click: 'activer le paramètre "fixed category positions"'
+      position_disabled_click: 'activez le paramètre « fixed category positions ».'
       minimum_required_tags: "Nombre minimum d'étiquettes requises dans un sujet :"
       parent: "Catégorie parente"
       num_auto_bump_daily: "Nombre de sujets ouverts à remonter dans la liste automatiquement et quotidiennement :"
-      navigate_to_first_post_after_read: "Naviguer vers le premier message après que les sujets sont lus"
+      navigate_to_first_post_after_read: "Naviguer vers le premier message après avoir lu un sujet"
       notifications:
         watching:
           title: "Surveiller"
@@ -2514,10 +2598,10 @@ fr:
           description: "Vous serez averti de nouveaux sujets dans cette catégorie mais pas de réponses aux sujets."
         tracking:
           title: "Suivi"
-          description: "Vous allez suivre automatiquement tous les sujets dans ces catégories. Vous serez notifié lorsque quelqu'un mentionne votre @pseudo ou vous répond, et le nombre de nouvelles réponses sera affiché."
+          description: "Vous allez suivre automatiquement tous les sujets dans ces catégories. Vous serez notifié lorsque quelqu'un vous mentionne ou vous répond, et le nombre de nouvelles réponses sera affiché."
         regular:
           title: "Normal"
-          description: "Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond."
+          description: "Vous serez notifié si quelqu'un vous mentionne ou vous répond."
         muted:
           title: "Silencieux"
           description: "Vous ne serez jamais notifié de rien concernant les nouveaux sujets dans ces catégories, et elles n'apparaîtront pas dans les dernières catégories."
@@ -2526,12 +2610,12 @@ fr:
         options:
           normal: "Normal"
           ignore: "Ignorer"
-          very_low: "Très faible"
-          low: "Faible"
-          high: "Fort"
-          very_high: "Très fort"
+          very_low: "Très basse"
+          low: "Basse"
+          high: "Élevée"
+          very_high: "Très élevée"
       sort_options:
-        default: "standard"
+        default: "par défaut"
         likes: "J'aime"
         op_likes: "J'aime du premier message"
         views: "Vues"
@@ -2553,7 +2637,7 @@ fr:
         appearance: "Apparence"
         email: "Courriel"
     flagging:
-      title: "Merci d'aider à garder notre communauté civilisée !"
+      title: "Merci de nous aider à garder notre communauté civilisée !"
       action: "Signaler ce message"
       take_action: "Intervenir"
       notify_action: "Message"
@@ -2571,7 +2655,7 @@ fr:
         off_topic: "C'est hors-sujet"
         inappropriate: "C'est inapproprié"
         spam: "C'est du spam"
-      custom_placeholder_notify_user: "Soyez précis, constructif, et toujours respectueux."
+      custom_placeholder_notify_user: "Soyez précis, constructif et toujours respectueux."
       custom_placeholder_notify_moderators: "Dites-nous ce qui vous dérange spécifiquement, et fournissez des liens pertinents et exemples si possible."
       custom_message:
         at_least:
@@ -2584,7 +2668,7 @@ fr:
           one: "%{count} restant"
           other: "{{count}} restants"
     flagging_topic:
-      title: "Merci de nous aider à garder notre communauté civilisé !"
+      title: "Merci de nous aider à garder notre communauté civilisée !"
       action: "Signaler le sujet"
       notify_action: "Message"
     topic_map:
@@ -2623,19 +2707,18 @@ fr:
       unlisted:
         help: "Ce sujet n'apparait plus dans la liste des sujets et sera seulement accessible via un lien direct"
       personal_message:
-        title: "Ce sujet est un message personnel"
-        help: "Ce sujet est un message personnel"
+        title: "Ce sujet est un message direct"
+        help: "Ce sujet est un message direct"
     posts: "Messages"
     posts_long: "il y a {{number}} messages dans ce sujet"
-    posts_likes_MF: |2
-
+    posts_likes_MF: |
       Ce sujet a {count, plural, one {1 réponse} other {# réponses}} {ratio, select,
 
-      low {avec un haut ratio J'aime/messages}
+      low {avec un ratio élevé de J'aime par message}
 
-      med {avec un très haut ratio J'aime/messages}
+      med {avec un ratio très élevée de J'aime par message}
 
-      high {avec un énorme ratio J'aime/messages}
+      high {avec un ratio extrêmement élevé de J'aime par message}
 
       other {}}
     original_post: "Message original"
@@ -2700,7 +2783,7 @@ fr:
           other: "Nouveaux ({{count}})"
         help: "sujets créés dans les derniers jours"
       posted:
-        title: "Mes Messages"
+        title: "Mes messages"
         help: "sujets auxquels vous avez participé"
       bookmarks:
         title: "Signets"
@@ -2732,7 +2815,8 @@ fr:
         this_month: "Mois"
         this_week: "Semaine"
         today: "Aujourd'hui"
-        other_periods: "voir le top"
+        other_periods: "voir le top :"
+    browser_update: 'Malheureusement <a href="https://www.discourse.org/faq/#browser">votre navigateur est trop vieux pour ce site</a>. Veuillez <a href="https://browsehappy.com">mettre à jour votre navigateur</a> afin de voir du contenu enrichi, se connecter et répondre.'
     permission_types:
       full: "Créer / Répondre / Voir"
       create_post: "Répondre / Voir"
@@ -2742,9 +2826,9 @@ fr:
       previous: "Précédent (touche flèche gauche)"
       next: "Suivant (touche flèche droite)"
       counter: "%curr% de %total%"
-      close: "Femer (Esc)"
-      content_load_error: '<a href="%url%">Ce contenu</a> ne pouvait pas être chargé.'
-      image_load_error: '<a href="%url%">Cette image</a> ne pouvait pas être chargé.'
+      close: "Femer (Echap)"
+      content_load_error: '<a href="%url%">Ce contenu</a> n''a pas pu être chargé.'
+      image_load_error: '<a href="%url%">Cette image</a> n''a pas pu être chargée.'
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -2762,32 +2846,45 @@ fr:
         top: "%{shortcut} Top"
         bookmarks: "%{shortcut} Signets"
         profile: "%{shortcut} Profil"
-        messages: "%{shortcut} Messages"
+        messages: "%{shortcut} Messages directs"
         drafts: "%{shortcut} Brouillons"
       navigation:
         title: "Navigation"
-        jump: "%{shortcut} Aller au sujet #"
+        jump: "%{shortcut} Aller au message #"
         back: "%{shortcut} Retour"
         up_down: "%{shortcut} Déplacer la sélection &uarr; &darr;"
         open: "%{shortcut} Ouvrir le sujet sélectionné"
         next_prev: "%{shortcut} Section suivante/précédente"
-        go_to_unread_post: "%{shortcut} Voir le premier message non lu"
+        go_to_unread_post: "%{shortcut} Aller au premier message non lu"
       application:
         title: "Application"
         create: "%{shortcut} Créer un nouveau sujet"
         notifications: "%{shortcut} Ouvrir les notifications"
-        hamburger_menu: "%{shortcut} Ouvrir le menu hamburger"
-        user_profile_menu: "%{shortcut}Ouvrir le menu utilisateur"
-        show_incoming_updated_topics: "%{shortcut} Montrer les sujets mis à jour récemment"
+        hamburger_menu: "%{shortcut} Ouvrir le menu latéral"
+        user_profile_menu: "%{shortcut} Ouvrir le menu utilisateur"
+        show_incoming_updated_topics: "%{shortcut} Afficher les sujets mis à jour"
         search: "%{shortcut} Rechercher"
         help: "%{shortcut} Ouvrir l'aide du clavier"
         dismiss_new_posts: "%{shortcut} Ignorer les nouveaux messages"
         dismiss_topics: "%{shortcut} Ignorer les sujets"
         log_out: "%{shortcut} Se déconnecter"
       composing:
-        title: "Edition"
+        title: "Édition"
         return: "%{shortcut} Revenir à l'éditeur"
-        fullscreen: "%{shortcut} Editeur plein écran"
+        fullscreen: "%{shortcut} Éditeur en plein écran"
+      bookmarks:
+        title: "Gestion des signets"
+        enter: "%{shortcut} Sauvegarder et fermer"
+        later_today: "%{shortcut} Plus tard aujourd'hui"
+        later_this_week: "%{shortcut} Plus tard cette semaine"
+        tomorrow: "%{shortcut} Demain"
+        next_week: "%{shortcut} La semaine prochaine"
+        next_month: "%{shortcut} Le mois prochain"
+        next_business_week: "%{shortcut} Début de la semaine prochaine"
+        next_business_day: "%{shortcut} Prochain jour ouvré"
+        custom: "%{shortcut} Date et heure personnalisées"
+        none: "%{shortcut} Pas de rappel"
+        delete: "%{shortcut} Supprimer le signet"
       actions:
         title: "Actions"
         bookmark_topic: "%{shortcut} Modifier le signet du sujet"
@@ -2808,8 +2905,12 @@ fr:
         mark_tracking: "%{shortcut} Suivre le sujet"
         mark_watching: "%{shortcut} Surveiller le sujet"
         print: "%{shortcut} Imprimer le sujet"
-        defer: "%{shortcut} Reporter le sujet"
+        defer: "%{shortcut} Reporter le sujet à plus tard"
         topic_admin_actions: "%{shortcut} Ouvrir les actions d'administration sur ce sujet"
+      search_menu:
+        title: "Menu de recherche"
+        prev_next: "%{shortcut} Déplacer la sélection vers le haut et bas"
+        insert_url: "%{shortcut} Insérer la sélection dans l'éditeur ouvert"
     badges:
       earned_n_times:
         one: "A reçu ce badge %{count} fois"
@@ -2818,7 +2919,7 @@ fr:
       others_count: "Autres utilisateurs avec ce badge (%{count})"
       title: Badges
       allow_title: "Vous pouvez utiliser ce badge comme titre"
-      multiple_grant: "Vous pouvez le gagner de multiples fois"
+      multiple_grant: "Vous pouvez le recevoir plusieurs fois"
       badge_count:
         one: "%{count} badge"
         other: "%{count} badges"
@@ -2845,28 +2946,31 @@ fr:
     tagging:
       all_tags: "Toutes les étiquettes"
       other_tags: "Autres étiquettes"
-      selector_all_tags: "toutes les étiquettes"
+      selector_all_tags: "étiquettes"
       selector_no_tags: "aucune étiquette"
       changed: "étiquettes modifiées :"
       tags: "Étiquettes"
       choose_for_topic: "étiquettes optionnelles"
-      info: "Information"
+      info: "Détails"
       default_info: "Cette étiquette n'est pas limitée à une catégorie et n'a aucun synonyme."
       category_restricted: "Cette étiquette est limitée à des catégories dont vous n'avez pas la permission d'accéder."
       synonyms: "Synonymes"
       synonyms_description: "Quand les étiquettes suivantes sont utilisées, elles seront remplacées par <b>%{base_tag_name}</b>."
       tag_groups_info:
-        one: 'Cette étiquette appartient au groupe « {{tag_groups}} ».'
-        other: "Cette étiquette appartient à ces groupes : {{tag_groups}}."
+        one: 'Cette étiquette appartient au groupe « {{tag_groups}} ».'
+        other: "Cette étiquette appartient aux groupes : {{tag_groups}}."
       category_restrictions:
-        one: "Elle ne peut être utilisée que dans cette catégorie :"
-        other: "Elle ne peut être utilisée que dans ces catégories :"
+        one: "Elle ne peut être utilisée que dans cette catégorie :"
+        other: "Elle ne peut être utilisée que dans ces catégories :"
       edit_synonyms: "Gérer les synonymes"
-      add_synonyms_label: "Ajouter des synonymes :"
+      add_synonyms_label: "Ajoutez des synonymes :"
       add_synonyms: "Ajouter"
-      add_synonyms_failed: "Les étiquettes suivantes n'ont pas pu être ajoutées comme synonymes : <b>%{tag_names}</b>. Assurez-vous qu'elles n'ont pas de synonymes et ne sont pas des synonymes d'une autre étiquette."
+      add_synonyms_explanation:
+        one: "Tous les éléments utilisant cette étiquette seront changés pour utiliser <b>%{tag_name}</b>. Êtes-vous sûr de vouloir faire ce changement ?"
+        other: "Tous les éléments utilisant ces étiquettes seront changés pour utiliser <b>%{tag_name}</b>. Êtes-vous sûr de vouloir faire ce changement ?"
+      add_synonyms_failed: "Les étiquettes suivantes n'ont pas pu être ajoutées comme synonymes : <b>%{tag_names}</b>. Assurez-vous qu'elles n'ont pas de synonymes et ne sont pas des synonymes d'une autre étiquette."
       remove_synonym: "Supprimer le synonyme"
-      delete_synonym_confirm: 'Êtes-vous sur de vouloir supprimer le synonyme « %{tag_name} » ?'
+      delete_synonym_confirm: 'Êtes-vous sur de vouloir supprimer le synonyme « %{tag_name} » ?'
       delete_tag: "Supprimer l'étiquette"
       delete_confirm:
         one: "Êtes-vous sûr de vouloir supprimer cette étiquettes et l'enlever de %{count} sujet auquel elle est assignée ?"
@@ -2876,23 +2980,23 @@ fr:
         one: "Son synonyme sera aussi supprimé."
         other: "Ses {{count}} synonymes seront aussi supprimés."
       rename_tag: "Renommer l'étiquette"
-      rename_instructions: "Choisir un nouveau nom pour cette étiquette :"
+      rename_instructions: "Choisissez un nouveau nom pour l'étiquette :"
       sort_by: "Trier par :"
       sort_by_count: "nombre"
       sort_by_name: "nom"
-      manage_groups: "Gérer les groupes d'étiquette"
+      manage_groups: "Gérer les groupes d'étiquettes"
       manage_groups_description: "Définir des groupes pour organiser les étiquettes"
-      upload: "Télécharger des étiquettes"
-      upload_description: "Télécharger un fichier csv pour créer des étiquettes en masse"
-      upload_instructions: "Un par ligne, avec optionnellement un groupe d'étiquettes sous la forme 'tag_name,tag_group'."
-      upload_successful: "Étiquettes téléchargées avec succès"
+      upload: "Envoyer des étiquettes"
+      upload_description: "Envoyer un fichier CSV pour créer des étiquettes en masse"
+      upload_instructions: "Une par ligne, avec optionnellement un groupe d'étiquettes sous la forme « tag_name,tag_group »."
+      upload_successful: "Étiquettes envoyées avec succès"
       delete_unused_confirmation:
         one: "%{count} étiquette sera supprimée : %{tags}"
         other: "%{count} étiquettes seront supprimées : %{tags}"
       delete_unused_confirmation_more_tags:
-        one: "%{tags} et %{count} plus"
-        other: "%{tags} et %{count} plus"
-      delete_unused: "Supprimer étiquettes inutilisées"
+        one: "%{tags} et %{count} de plus"
+        other: "%{tags} et %{count} de plus"
+      delete_unused: "Supprimer les étiquettes inutilisées"
       delete_unused_description: "Supprimer toutes les étiquettes qui ne sont pas associées à des sujets ou messages directs"
       cancel_delete_unused: "Annuler"
       filters:
@@ -2912,27 +3016,27 @@ fr:
           description: "Vous allez suivre automatiquement tous les sujets avec cette étiquette. Le nombre de messages non lus et nouveaux apparaîtra à côté du sujet."
         regular:
           title: "Normal"
-          description: "Vous serez notifié si un utilisateur mentionne votre @pseudo ou répond à votre message."
+          description: "Vous serez notifié si quelqu'un vous mentionne ou répond à votre message."
         muted:
           title: "Silencieux"
           description: "Vous ne recevrez aucune notification sur des nouveaux sujets avec cette étiquette, et ils n’apparaîtront pas dans l'onglet non lus."
       groups:
-        title: "Groupes d'étiquette"
-        about: "Ajouter des étiquettes aux groupes pour les gérer plus facilement."
+        title: "Groupes d'étiquettes"
+        about: "Ajoutez les étiquettes à des groupes pour les gérer plus facilement."
         new: "Nouveau groupe"
         tags_label: "Étiquettes dans ce groupe :"
         tags_placeholder: "Mots clés"
-        parent_tag_label: "Étiquette parent :"
+        parent_tag_label: "Étiquette parente :"
         parent_tag_placeholder: "Facultatif"
-        parent_tag_description: "Les étiquette de ce groupe ne peuvent pas être utilisées sauf si l'étiquette parent est présente."
+        parent_tag_description: "Les étiquettes de ce groupe ne peuvent pas être utilisées sauf si l'étiquette parente est présente."
         one_per_topic_label: "Limiter à une étiquette de ce groupe par sujet"
         new_name: "Nouveau groupe d'étiquettes"
-        name_placeholder: "Nom du groupe d'étiquette"
+        name_placeholder: "Nom du groupe d'étiquettes"
         save: "Sauvegarder"
         delete: "Supprimer"
         confirm_delete: "Êtes-vous sûr de vouloir supprimer ce groupe d'étiquettes ?"
-        everyone_can_use: "Les étiquette peuvent être utilisées par tout le monde"
-        usable_only_by_staff: "Les étiquette sont visibles à tous, mais seuls les responsables peuvent les utiliser"
+        everyone_can_use: "Les étiquettes peuvent être utilisées par tout le monde"
+        usable_only_by_staff: "Les étiquettes sont visibles à tous, mais seuls les responsables peuvent les utiliser"
         visible_only_to_staff: "Les étiquettes ne sont visibles qu'aux responsables"
       topics:
         none:
@@ -2955,10 +3059,15 @@ fr:
       custom_message: "Rendez votre invitation plus personnelle en écrivant un <a href>message personnalisé</a>."
       custom_message_placeholder: "Entrez votre message personnalisé"
       custom_message_template_forum: "Hey, tu devrais rejoindre ce forum !"
-      custom_message_template_topic: "Hey, je pensais que tu pourrais aimer ce sujet !"
+      custom_message_template_topic: "Hey, je pensais que tu aimerais ce sujet !"
     forced_anonymous: "En raison de la charge extrême, ceci est temporairement montré à tout le monde comme un utilisateur déconnecté le verrait."
+    footer_nav:
+      back: "Revenir en arrière"
+      forward: "Avancer"
+      share: "Partager"
+      dismiss: "Ignorer"
     safe_mode:
-      enabled: "Le mode sans échec est activé ; fermez cette fenêtre de navigateur pour le quitter"
+      enabled: "Le mode sans échec est activé ; fermez cette fenêtre de navigateur pour le quitter"
   admin_js:
     type_to_filter: "commencez à taper pour filtrer…"
     admin:
@@ -2967,14 +3076,14 @@ fr:
       tags:
         remove_muted_tags_from_latest:
           always: "toujours"
-          only_muted: "quand utilisé seul ou avec d'autres étiquettes mises sous silence"
+          only_muted: "quand utilisée seule ou avec d'autres étiquettes mises sous silence"
           never: "jamais"
       reports:
-        title: "Liste de rapports disponibles"
+        title: "Liste des rapports disponibles"
       dashboard:
         title: "Tableau de bord"
-        last_updated: "Tableau de bord actualisé le :"
-        discourse_last_updated: "Discourse mis à jour le :"
+        last_updated: "Dernière actualisation du tableau de bord :"
+        discourse_last_updated: "Dernière mise à jour de Discourse :"
         version: "Version"
         up_to_date: "À jour !"
         critical_available: "Une mise à jour critique est disponible."
@@ -2985,7 +3094,7 @@ fr:
         version_check_pending: "On dirait que vous avez récemment fait une mise à jour. Super !"
         installed_version: "Installée"
         latest_version: "Dernière"
-        problems_found: "Quelques conseils sur la base de vos paramètres actuels"
+        problems_found: "Quelques conseils d'après vos paramètres actuels"
         last_checked: "Dernière vérification"
         refresh_problems: "Rafraîchir"
         no_problems: "Aucun problème n'a été trouvé."
@@ -2996,16 +3105,16 @@ fr:
         private_messages_short: "Msgs"
         private_messages_title: "Messages"
         mobile_title: "Mobile"
-        space_used: "%{usedSize} utilisé"
-        space_used_and_free: "%{usedSize} (%{freeSize} disponibles)"
+        space_used: "%{usedSize} utilisés"
+        space_used_and_free: "%{usedSize} utilisés (%{freeSize} disponibles)"
         uploads: "Fichiers envoyés"
         backups: "Sauvegardes"
         backup_count:
           one: "%{count} sauvegarde sur %{location}"
           other: "%{count} sauvegardes sur %{location}"
-        lastest_backup: "Plus récent : %{date}"
+        lastest_backup: "Dernière sauvegarde : %{date}"
         traffic_short: "Trafic"
-        traffic: "Requêtes Web Application"
+        traffic: "Requêtes d'application Web"
         page_views: "Pages vues"
         page_views_short: "Pages vues"
         show_traffic_report: "Afficher le rapport de trafic détaillé"
@@ -3026,11 +3135,11 @@ fr:
         not_found_error: "Désolé, ce rapport n'existe pas"
         filter_reports: Filtrer les rapports
         reports:
-          trend_title: "%{percent} modifié. Actuellement %{current}, était %{prev} pour la période précédente."
+          trend_title: "Variation de %{percent}. La valeur actuelle est de %{current}. Elle était de %{prev} pour la période précédente."
           today: "Aujourd'hui"
           yesterday: "Hier"
-          last_7_days: "Derniers 7"
-          last_30_days: "Derniers 30"
+          last_7_days: "Derniers 7 jours"
+          last_30_days: "Derniers 30 jours"
           all_time: "Depuis toujours"
           7_days_ago: "il y a 7 jours"
           30_days_ago: "il y a 30 jours"
@@ -3038,6 +3147,7 @@ fr:
           view_table: "tableau"
           view_graph: "graphique"
           refresh_report: "Actualiser le rapport"
+          dates: "Dates (UTC)"
           groups: "Tous les groupes"
           disabled: "Ce rapport est désactivé"
           totals_for_sample: "Totaux pour l'échantillon"
@@ -3046,7 +3156,7 @@ fr:
           no_data: "Aucune donnée à afficher."
           trending_search:
             more: '<a href="%{basePath}/admin/logs/search_logs">Journal des recherches</a>'
-            disabled: 'Rapport sur les tendances de recherche désactivé. Activé <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">journalisation des recherches</a> pour collectioner les données.'
+            disabled: 'Rapport sur les tendances de recherche désactivé. Activez la <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">journalisation des recherches</a> pour collectionner les données.'
           filters:
             file-extension:
               label: Extension de fichier
@@ -3054,6 +3164,8 @@ fr:
               label: Groupe
             category:
               label: Catégorie
+            include-subcategories:
+              label: "Inclure les sous-catégories"
       commits:
         latest_changes: "Dernières modifications : veuillez mettre à jour régulièrement !"
         by: "par"
@@ -3071,14 +3183,14 @@ fr:
         bulk_add:
           title: "Ajouter au groupe en masse"
           complete_users_not_added: "Ces utilisateurs n'ont pas été ajoutés (vérifiez qu'ils ont un compte) :"
-          paste: "Coller une liste de pseudo ou courriel, un par ligne :"
+          paste: "Coller une liste de nom d'utilisateur ou courriel, un par ligne :"
         add_members:
-          as_owner: "Rendre utilisateur(s) propriétaire(s) de ce groupe"
+          as_owner: "Rendre des utilisateurs propriétaires de ce groupe"
         manage:
           interaction:
             email: Courriel
-            incoming_email: "Adresse de courriel entrant personnalisée"
-            incoming_email_placeholder: "Entrer une adresse de courriel"
+            incoming_email: "Adresse courriel entrante personnalisée"
+            incoming_email_placeholder: "entrez une adresse courriel"
             visibility: Visibilité
             visibility_levels:
               title: "Qui peut voir ce groupe ?"
@@ -3089,7 +3201,7 @@ fr:
               owners: "Propriétaires du groupe"
               description: "Les administrateurs peuvent voir tous les groupes."
             members_visibility_levels:
-              title: "Qui peut voir les membres de ce groupe ?"
+              title: "Qui peut voir les membres de ce groupe ?"
               description: "Les administrateurs peuvent voir les membres de tous les groupes."
             publish_read_state: "Publier le statut de lecture du groupe lors des messages directs de groupe"
           membership:
@@ -3098,8 +3210,9 @@ fr:
             effects: Effets
             trust_levels_none: "Aucun"
             automatic_membership_email_domains: "Les utilisateurs qui s'enregistrent avec un domaine courriel qui correspond exactement à un élément de cette liste seront automatiquement ajoutés à ce groupe :"
+            automatic_membership_user_count: "%{count} utilisateurs ont les nouveaux domaines de courriel et seront ajoutés au groupe."
             primary_group: "Définir comme groupe principal automatiquement"
-        name_placeholder: "Nom du groupe, sans espace, mêmes règles que pour les pseudos"
+        name_placeholder: "Nom du groupe (sans espace, mêmes règles que pour les noms d'utilisateurs)"
         primary: "Groupe principal"
         no_primary: "(pas de groupe principal)"
         title: "Groupes"
@@ -3134,7 +3247,7 @@ fr:
         undo_revoke: "Annuler la révocation"
         revoke: "Révoquer"
         all_users: "Tous les utilisateurs"
-        active_keys: "Activer une clé pour l’API"
+        active_keys: "Clés actives pour l’API"
         manage_keys: Gérer les clés
         show_details: Détails
         description: Description
@@ -3143,8 +3256,8 @@ fr:
         user_mode: Niveau de l’utilisateur
         impersonate_all_users: Usurper l’identité d'un utilisateur
         single_user: "Utilisateur unique"
-        user_placeholder: Saisir un pseudo
-        description_placeholder: "À quoi servira cette clé ?"
+        user_placeholder: Entrez un nom d'utilisateur
+        description_placeholder: "À quoi servira cette clé ?"
         save: Sauvegarder
         new_key: Nouvelle clé pour l’API
         revoked: Révoquée
@@ -3181,7 +3294,7 @@ fr:
         categories_filter_instructions: "Les Webhooks appropriés seront uniquement déclenchés si les événements sont liés aux catégories définies. Laisser vide pour les déclencher pour toutes les catégories."
         categories_filter: "Catégories"
         tags_filter_instructions: "Les Webhooks appropriés seront uniquement déclenchés si les événements sont liés aux étiquettes définies. Laisser vide pour les déclencher pour toutes les étiquettes."
-        tags_filter: "Étiquettes déclenchées"
+        tags_filter: "Étiquettes"
         groups_filter_instructions: "Les Webhooks appropriés seront uniquement déclenchés si les événements sont liés aux groupes définis. Laisser vide pour les déclencher pour tous les groupes."
         groups_filter: "Groupes"
         delete_confirm: "Supprimer ce Webhook ?"
@@ -3203,18 +3316,15 @@ fr:
         tag_event:
           name: "Événement d'étiquette"
           details: "Quand une étiquette est créée, mise à jour ou supprimée."
-        flag_event:
-          name: "Evènement de signalement"
-          details: "Quand un signalement est crée, approuvé, désapprouvé ou ignoré."
-        queued_post_event:
-          name: "Événement à l'approbation d'un message"
-          details: "Quand un nouveau message est créé, approuvé ou rejeté"
         reviewable_event:
-          name: "Evènement vérifiable"
+          name: "Événement d'élément à vérifier"
           details: "Quand un nouvel élément est prêt à être vérifié et quand son état est mis à jour."
         notification_event:
-          name: "Notification d'Événement"
+          name: "Événement de notification"
           details: "Lorsqu'un utilisateur reçoit une notification dans son flux."
+        user_badge_event:
+          name: "Événement d'attribution de badge"
+          details: "Lorsqu'un utilisateur reçoit un badge."
         delivery_status:
           title: "État de l'envoi"
           inactive: "Inactif"
@@ -3222,7 +3332,7 @@ fr:
           successful: "Succès"
           disabled: "Désactivé"
         events:
-          none: "Il n'y aucun évènement lié."
+          none: "Il n'y a aucun événement lié."
           redeliver: "Redélivrer"
           incoming:
             one: "Il y a un nouvel événement."
@@ -3257,7 +3367,7 @@ fr:
         change_settings: "Changer les paramètres"
         change_settings_short: "Paramètres"
         howto: "Comment installer des extensions ?"
-        official: "Plugin officiel"
+        official: "Extension officielle"
       backups:
         title: "Sauvegardes"
         menu:
@@ -3271,7 +3381,7 @@ fr:
             confirm: "Êtes-vous sûr de vouloir activer le mode lecture seule ?"
           disable:
             title: "Désactiver le mode lecture seule"
-            label: "Désactiver lecture seule"
+            label: "Désactiver la lecture seule"
         logs:
           none: "Pas de journaux pour l'instant…"
         columns:
@@ -3282,11 +3392,11 @@ fr:
           title: "Envoyer une sauvegarde à cette instance"
           uploading: "Envoi en cours…"
           uploading_progress: "Envoi en cours… {{progress}}%"
-          success: "« {{filename}} » a été envoyé avec succès. Le fichier est en cours de traitement et il faudra jusqu'à une minute pour qu'il apparaisse dans la liste."
+          success: "« {{filename}} » a été envoyé avec succès. Le fichier est en cours de traitement et il faudra jusqu'à une minute pour qu'il apparaisse dans la liste."
           error: "Il y a eu une erreur lors de l'envoi de « {{filename}} » : {{message}}"
         operations:
           is_running: "Une opération est en cours d'exécution…"
-          failed: "Le/La {{operation}} a échoué(e). Veuillez consulter les journaux."
+          failed: "L'opération {{operation}} a échoué. Veuillez consulter les journaux."
           cancel:
             label: "Annuler"
             title: "Annuler l'opération en cours"
@@ -3310,8 +3420,8 @@ fr:
             confirm: "Êtes-vous sûr de vouloir restaurer cette sauvegarde ?"
           rollback:
             label: "Revenir en arrière"
-            title: "Restaurer (RollBack) la base de données à l'état de travail précédent"
-            confirm: "Êtes-vous sûr de vouloir restaurer la base de données à l'état de fonctionnement précédent ?"
+            title: "Restaurer la base de données dans un état précédent"
+            confirm: "Êtes-vous sûr de vouloir restaurer la base de données dans cet état précédent ?"
         location:
           local: "Stockage locale"
           s3: "S3"
@@ -3324,13 +3434,13 @@ fr:
           user: "Exporter la liste des utilisateurs dans un fichier CSV."
           staff_action: "Exporter la liste des actions des responsables dans un fichier CSV."
           screened_email: "Exporter la liste des adresses de courriel sous surveillance dans un fichier CSV."
-          screened_ip: "Exporter la liste complète des adresses IP sous surveillance dans un fichier CSV."
+          screened_ip: "Exporter la liste des adresses IP sous surveillance dans un fichier CSV."
           screened_url: "Exporter toutes les URL sous surveillance vers un fichier CSV"
       export_json:
         button_text: "Exporter"
       invite:
-        button_text: "Envoyer invitations"
-        button_title: "Envoyer invitations"
+        button_text: "Envoyer des invitations"
+        button_title: "Envoyer des invitations"
       customize:
         title: "Personnaliser"
         long_title: "Personnalisations du site"
@@ -3341,7 +3451,7 @@ fr:
         new_style: "Nouveau style"
         install: "Installer"
         delete: "Supprimer"
-        delete_confirm: 'Êtes-vous sûr de vouloir supprimer "%{theme_name}" ?'
+        delete_confirm: 'Êtes-vous sûr de vouloir supprimer « %{theme_name} » ?'
         color: "Couleur"
         opacity: "Opacité"
         copy: "Copier"
@@ -3364,6 +3474,7 @@ fr:
           theme_name: "Nom du thème"
           component_name: "Nom du composant"
           themes_intro: "Sélectionnez un thème existant ou installez-en un nouveau pour commencer"
+          themes_intro_emoji: "emoji de femme artiste"
           beginners_guide_title: "Guide d'utilisation des thèmes de Discourse pour débutants"
           developers_guide_title: "Guide de développement de thèmes pour Discourse"
           browse_themes: "Parcourir les thèmes de la communauté"
@@ -3383,6 +3494,9 @@ fr:
           settings: "Paramètres"
           translations: "Traductions"
           extra_scss: "Extra SCSS"
+          extra_files: "Fichiers supplémentaires"
+          extra_files_upload: "Exportez le thème pour voir ces fichiers."
+          extra_files_remote: "Exportez le thème ou vérifiez le dépôt Git pour voir ces fichiers."
           preview: "Prévisualiser"
           show_advanced: "Afficher les champs avancés"
           hide_advanced: "Cacher les champs avancés"
@@ -3395,30 +3509,30 @@ fr:
           theme_components: "Composants du thème :"
           add_all_themes: "Ajouter tous les thèmes"
           convert: "Convertir"
-          convert_component_alert: "Êtes-vous sûr·e de vouloir convertir ce composant en thème ? Il sera éliminé comme composant de %{relatives}."
+          convert_component_alert: "Êtes-vous sûr·e de vouloir convertir ce composant en thème ? Il ne sera plus un composant de %{relatives}."
           convert_component_tooltip: "Convertir ce composant en thème"
-          convert_theme_alert: "Êtes-vous sûr·e de vouloir convertir ce thème en composant ? Il sera éliminé comme parent de %{relatives}."
+          convert_theme_alert: "Êtes-vous sûr·e de vouloir convertir ce thème en composant ? Il ne sera plus le parent de %{relatives}."
           convert_theme_tooltip: "Convertir ce thème en composant"
           inactive_themes: "Thèmes inactifs : "
-          inactive_components: "Composants non-utilisés :"
+          inactive_components: "Composants non utilisés :"
           broken_theme_tooltip: "Ce thème comporte des erreurs de CSS, HTML ou YAML"
           disabled_component_tooltip: "Ce composant a été désactivé"
           default_theme_tooltip: "Ce thème est celui par défaut du site"
           updates_available_tooltip: "Des mises à jour sont disponibles pour ce thème"
-          and_x_more: "et {{count}} en plus."
+          and_x_more: "et {{count}} de plus."
           collapse: Réduire
-          uploads: "Uploads"
+          uploads: "Fichiers envoyés"
           no_uploads: "Vous pouvez envoyer des ressources associées à votre thème comme des polices ou des images"
           add_upload: "Ajouter un fichier"
-          upload_file_tip: "Choisir un fichier à téléverser (png, woff2, etc.)"
+          upload_file_tip: "Choisissez un fichier à envoyer (png, woff2, etc.)"
           variable_name: "Nom de variable SCSS :"
-          variable_name_invalid: "Nom de variable invalide. Seuls les caractères alphanumériques sont autorisés. Doit commencer par une lettre. Doit être unique."
+          variable_name_invalid: "Nom de variable invalide. Seuls les caractères alphanumériques sont autorisés. Le nom doit commencer par une lettre et être unique."
           variable_name_error:
-            invalid_syntax: "Nom de variable invalide. Seuls les caractères alphanumériques sont autorisés. Doit commencer par une lettre."
-            no_overwrite: "Nom de variable invalide. Ne doit pas écraser une variable existante."
-            must_be_unique: "Nom de variable invalide. Doit être unique."
-          upload: "Upload"
-          select_component: "Sélectionner un composant..."
+            invalid_syntax: "Nom de variable invalide. Seuls les caractères alphanumériques sont autorisés. Le nom doit commencer par une lettre."
+            no_overwrite: "Nom de variable invalide. Le nom ne doit pas écraser une variable existante."
+            must_be_unique: "Nom de variable invalide. Le nom doit être unique."
+          upload: "Envoyer"
+          select_component: "Sélectionner un composant…"
           unsaved_changes_alert: "Vous n'avez pas encore sauvegardé vos modifications, voulez-vous les abandonner et continuer ?"
           unsaved_parent_themes: "Vous n'avez assigné le composant à aucun thème, voulez-vous continuer ?"
           discard: "Abandonner"
@@ -3426,26 +3540,27 @@ fr:
           css_html: "CSS/HTML personnalisé"
           edit_css_html: "Modifier le CSS/HTML"
           edit_css_html_help: "Vous n'avez modifié aucun CSS ou HTML"
-          delete_upload_confirm: "Supprimer cet upload ? (Le thème CSS pourrait ne plus fonctionner !)"
+          delete_upload_confirm: "Supprimer ce fichier envoyé ? (Le thème CSS pourrait ne plus fonctionner !)"
           component_on_themes: "Inclure le composant à ces thèmes"
           included_components: "Composants inclus"
           add_all: "Tout ajouter"
           import_web_tip: "Dépôt contenant le thème"
-          import_web_advanced: "Avancé..."
+          import_web_advanced: "Avancé…"
           import_file_tip: "Fichier .tar.gz, .zip ou .dcstyle.json contenant le thème"
-          is_private: "Le thème est dans un dépôt git privé"
+          is_private: "Le thème est dans un dépôt Git privé"
           remote_branch: "Nom de branche (optionnel)"
-          public_key: "Accorder un accès dépôt à la clef publique suivante :"
+          public_key: "Accorder un accès au dépôt à la clé publique suivante :"
           install: "Installer"
           installed: "Installé"
           install_popular: "Populaire"
           install_upload: "Depuis votre appareil"
-          install_git_repo: "Depuis un dépôt git"
-          install_create: "En créer un nouveau"
+          install_git_repo: "Depuis un dépôt Git"
+          install_create: "Créer un nouveau"
           about_theme: "À propos"
           license: "Licence"
           version: "Version :"
           authors: "Auteur :"
+          creator: "Créé par :"
           source_url: "Source"
           enable: "Activer"
           disable: "Désactiver"
@@ -3453,15 +3568,15 @@ fr:
           disabled_by: "Ce composant a été désactivé par"
           required_version:
             error: "Ce thème a été désactivé automatiquement car il n'est pas compatible avec cette version de Discourse."
-            minimum: "Nécessite version {{version}} ou supérieur de Discourse."
-            maximum: "Nécessite version {{version}} ou inférieur de Discourse."
+            minimum: "Nécessite la version {{version}} ou supérieure de Discourse."
+            maximum: "Nécessite la version {{version}} ou inférieure de Discourse."
           component_of: "Composant de :"
           update_to_latest: "Mettre à jour"
           check_for_updates: "Vérifier les mises à jour"
           updating: "Mise à jour…"
           up_to_date: "Thème à jour, dernière vérification :"
           add: "Ajouter"
-          theme_settings: "Paramètres thème"
+          theme_settings: "Paramètres de thème"
           no_settings: "Ce thème n'a pas de paramètres."
           theme_translations: "Traductions de thème"
           empty: "Aucun élément"
@@ -3469,7 +3584,7 @@ fr:
             one: "Le thème est en retard de %{count} commit !"
             other: "Le thème est en retard de {{count}} commits !"
           compare_commits: "(Voir les nouveaux changements)"
-          repo_unreachable: "Le dépôt Git de ce thème reste inaccessible. Message d'erreur : "
+          repo_unreachable: "Le dépôt Git de ce thème est inaccessible. Message d'erreur : "
           imported_from_archive: "Ce thème a été importé depuis un fichier .zip"
           scss:
             text: "CSS"
@@ -3542,7 +3657,7 @@ fr:
             description: "La couleur du bouton J'aime."
         robots:
           title: "Remplacez le fichier robots.txt de votre site :"
-          warning: "Cela remplacera définitivement tous les paramètres de sites associés."
+          warning: "Cela remplacera définitivement tous les paramètres associés."
           overridden: Le fichier robots.txt par défaut de votre site est remplacé.
         email_style:
           title: "Style du courriel"
@@ -3555,22 +3670,22 @@ fr:
           instructions: "Personnalisez le modèle dans lequel tous les courriels HTML sont générés et stylés à l'aide de CSS."
       email:
         title: "Courriels"
-        settings: "Paramètrage"
+        settings: "Paramètres"
         templates: "Modèles"
         preview_digest: "Prévisualisation du courriel"
         advanced_test:
           title: "Test avancé"
           desc: "Voir comment Discourse gère les courriels reçus. Pour gérer correctement le courriel, merci de coller ci-dessous l'entier du courriel."
           email: "Message d'origine"
-          run: "Exécuter test"
+          run: "Lancer le test"
           text: "Corps de texte sélectionné"
           elided: "Texte élidé"
         sending_test: "Envoi du courriel de test…"
         error: "<b>ERREUR</b> - %{server_error}"
-        test_error: "Il y a eu un problème avec l'envoi du courriel de test. Veuillez vérifier vos paramètres, que votre hébergeur ne bloque pas les connections aux courriels, et réessayer."
+        test_error: "Il y a eu un problème avec l'envoi du courriel de test. Veuillez vérifier vos paramètres et que votre hébergeur ne bloque pas les connections aux courriels, puis réessayer."
         sent: "Envoyés"
         skipped: "Ignorés"
-        bounced: "Rejetés"
+        bounced: "Non délivrés"
         received: "Reçus"
         rejected: "Rejetés"
         sent_at: "Envoyé à"
@@ -3578,7 +3693,7 @@ fr:
         user: "Utilisateur"
         email_type: "Type de courriel"
         to_address: "À l'adresse"
-        test_email_address: "adresse de courriel à tester"
+        test_email_address: "adresse courriel à tester"
         send_test: "Envoyer un courriel de test"
         sent_test: "envoyé !"
         delivery_method: "Méthode d'envoi"
@@ -3590,6 +3705,7 @@ fr:
         format: "Format"
         html: "html"
         text: "texte"
+        html_preview: "Aperçu du contenu du courriel"
         last_seen_user: "Dernier utilisateur vu :"
         no_result: "Aucun résultat trouvé pour le résumé."
         reply_key: "Clé de réponse"
@@ -3618,7 +3734,7 @@ fr:
           none: "Pas de journaux trouvés."
           filters:
             title: "Filtrer"
-            user_placeholder: "pseudo"
+            user_placeholder: "nom d'utilisateur"
             address_placeholder: "nom@exemple.com"
             type_placeholder: "résumé, inscription…"
             reply_key_placeholder: "clé de réponse"
@@ -3626,10 +3742,10 @@ fr:
         performed_by: "Réalisé par"
         no_results: "Il n'y a pas d'historique de modération disponible."
         actions:
-          delete_user: "Utilisateur Supprimé"
-          suspend_user: "Utilisateur Suspendu"
+          delete_user: "Utilisateur supprimé"
+          suspend_user: "Utilisateur suspendu"
           silence_user: "Utilisateur mis sous silence"
-          delete_post: "Message Supprimé"
+          delete_post: "Message supprimé"
           delete_topic: "Sujet supprimé"
           post_approved: "Message approuvé"
       logs:
@@ -3650,7 +3766,7 @@ fr:
           do_nothing: "ne rien faire"
         staff_actions:
           all: "tout"
-          filter: "Filtre :"
+          filter: "Filtrer :"
           title: "Actions des responsables"
           clear_filters: "Tout afficher"
           staff_user: "Utilisateur"
@@ -3669,7 +3785,7 @@ fr:
           actions:
             delete_user: "supprimer l'utilisateur"
             change_trust_level: "modifier le niveau de confiance"
-            change_username: "modifier pseudo"
+            change_username: "modifier le nom d'utilisateur"
             change_site_setting: "modifier les paramètres du site"
             change_theme: "changer le thème"
             delete_theme: "supprimer le thème"
@@ -3682,13 +3798,13 @@ fr:
             revoke_badge: "retirer le badge"
             check_email: "vérifier l'adresse courriel"
             delete_topic: "supprimer le sujet"
-            recover_topic: "Annuler la suppression du sujet"
+            recover_topic: "annuler la suppression du sujet"
             delete_post: "supprimer le message"
             impersonate: "incarner"
             anonymize_user: "rendre l'utilisateur anonyme"
             roll_up: "consolider des blocs d'IP"
             change_category_settings: "modifier les paramètres de la catégorie"
-            delete_category: "supprimer la catégorie"
+            delete_category: "supprimer une catégorie"
             create_category: "créer une catégorie"
             silence_user: "mettre l'utilisateur sous silence"
             unsilence_user: "annuler la mise sous silence de l'utilisateur"
@@ -3696,11 +3812,11 @@ fr:
             removed_unsilence_user: "annuler la mise sous silence de l'utilisateur (enlevé)"
             grant_admin: "accorder les droits d'administration"
             revoke_admin: "révoquer les droits d'administration"
-            grant_moderation: "Accorder les droits de modération"
-            revoke_moderation: "Révoquer les droits de modération"
+            grant_moderation: "accorder les droits de modération"
+            revoke_moderation: "révoquer les droits de modération"
             backup_create: "créer une sauvegarde"
             deleted_tag: "étiquette supprimée"
-            deleted_unused_tags: "supprimer étiquette inutilisées"
+            deleted_unused_tags: "étiquettes inutilisées supprimées"
             renamed_tag: "étiquette renommée"
             revoke_email: "révoquer le courriel"
             lock_trust_level: "verrouiller le niveau de confiance "
@@ -3715,7 +3831,7 @@ fr:
             post_locked: "message vérouillé"
             post_edit: "message modifié"
             post_unlocked: "message dévérouillé"
-            check_personal_message: "contrôler messages directs"
+            check_personal_message: "vérifier un message direct"
             disabled_second_factor: "désactiver l'authentification à deux facteurs"
             topic_published: "sujet publié"
             post_approved: "message approuvé"
@@ -3723,19 +3839,19 @@ fr:
             create_badge: "créer un badge"
             change_badge: "modifier un badge"
             delete_badge: "supprimer un badge"
-            merge_user: "fusionne utilisateur"
+            merge_user: "fusionner un utilisateur"
             entity_export: "exporter l'entité"
-            change_name: "modifier nom"
+            change_name: "modifier le nom"
             topic_timestamps_changed: "date du sujet changée"
             approve_user: "utilisateur approuvé"
-            web_hook_create: "Créer un webhook"
-            web_hook_update: "Mettre à jour le webhook"
-            web_hook_destroy: "Détruire le webhook"
-            web_hook_deactivate: "désactiver webhook"
-            embeddable_host_create: "créer hôte intégré"
-            embeddable_host_update: "mettre à jour hôte intégré"
-            embeddable_host_destroy: "détruire hôte intégré"
-            change_theme_setting: "changer le réglage du thème"
+            web_hook_create: "créer le Webhook"
+            web_hook_update: "mettre à jour le Webhook"
+            web_hook_destroy: "détruire le Webhook"
+            web_hook_deactivate: "désactiver le Webhook"
+            embeddable_host_create: "créer un hôte intégré"
+            embeddable_host_update: "mettre à jour un hôte intégré"
+            embeddable_host_destroy: "détruire un hôte intégré"
+            change_theme_setting: "changer les paramètres du thème"
             disable_theme_component: "désactiver le composant de thème"
             enable_theme_component: "activer le composant de thème"
             revoke_title: "révoquer le titre"
@@ -3744,6 +3860,8 @@ fr:
             api_key_update: "mettre à jour une clé pour l’API"
             api_key_destroy: "détruire une clé pour l’API"
             override_upload_secure_status: "passer outre le statut de téléchargement sécurisé"
+            page_published: "page publiée"
+            page_unpublished: "publication de la page annulée"
         screened_emails:
           title: "Courriels sous surveillance"
           description: "Lorsque quelqu'un essaye de créer un nouveau compte, les adresses de courriel suivantes seront vérifiées et l'inscription sera bloquée, ou une autre action sera réalisée."
@@ -3757,7 +3875,7 @@ fr:
           domain: "Domaine"
         screened_ips:
           title: "IP sous surveillance"
-          description: 'Adresses IP qui sont surveillés. Utiliser "Autoriser" pour ajouter les adresses IP à la liste blanche.'
+          description: 'Adresses IP qui sont surveillés. Utiliser « Autoriser » pour ajouter les adresses IP à la liste blanche.'
           delete_confirm: "Êtes-vous sûr de vouloir supprimer la règle pour %{ip_address} ?"
           roll_up_confirm: "Êtes-vous sûr de vouloir consolider les adresses IP sous surveillance sous forme de plages de sous réseaux ?"
           rolled_up_some_subnets: "Consolidation réussie des adresses IP interdites vers ces plages de sous réseau : %{subnets}."
@@ -3791,24 +3909,24 @@ fr:
         title: "Mots surveillés"
         search: "recherche"
         clear_filter: "Vider"
-        show_words: "Afficher les mots"
+        show_words: "afficher les mots"
         one_word_per_line: "Un mot par ligne"
         download: Télécharger
         clear_all: Tout désélectionner
-        clear_all_confirm_block: "Êtes-vous sûr de vouloir effacer tous les mots observés pour l'action Bloquer ?"
-        clear_all_confirm_censor: "Etes-vous sûr de vouloir effacer tous les mots observés pour l'action Censeur ?"
-        clear_all_confirm_flag: "Etes-vous sûr de vouloir effacer tous les mots observés pour l'action Drapeau ?"
-        clear_all_confirm_require_approval: "Êtes-vous sûr de vouloir effacer tous les mots observés pour l'action Requérir une approbation ?"
+        clear_all_confirm_block: "Êtes-vous sûr de vouloir effacer tous les mots observés pour l'action Bloquer ?"
+        clear_all_confirm_censor: "Êtes-vous sûr de vouloir effacer tous les mots observés pour l'action Censurer ?"
+        clear_all_confirm_flag: "Êtes-vous sûr de vouloir effacer tous les mots observés pour l'action Signaler ?"
+        clear_all_confirm_require_approval: "Êtes-vous sûr de vouloir effacer tous les mots observés pour l'action Nécessiter l'approbation ?"
         word_count:
           one: "%{count} mot"
           other: "%{count} mots"
         actions:
           block: "Bloquer"
           censor: "Censurer"
-          require_approval: "Nécessite l'approbation"
+          require_approval: "Nécessiter l'approbation"
           flag: "Signaler"
         action_descriptions:
-          block: "Empêcher les messages contenant ces mots d'être publiés. L'utilisateur verra un message d'erreur lorsqu'il essaiera de publier son message."
+          block: "Empêchez les messages contenant ces mots d'être publiés. L'utilisateur verra un message d'erreur lorsqu'il essaiera de publier son message."
           censor: "Autoriser les messages contenant ces mots, mais les remplacer par des caractères qui cachent les mots censurés."
           require_approval: "Les messages qui contiennent ces mots devront être approuvés par un responsable avant de pouvoir être publiés."
           flag: "Autoriser les messages contenant ces mots, mais les signaler comme inapproprié pour que les modérateurs puisse les vérifier."
@@ -3822,42 +3940,42 @@ fr:
           upload: "Ajouter depuis un fichier"
           upload_successful: "Envoi réussi. Les mots ont été ajoutés."
         test:
-          button_label: "Test"
-          modal_title: "Test Mot observé '%{action}'"
+          button_label: "Tester"
+          modal_title: "Tester les mots observés pour l'action « %{action} »"
           description: "Entrez le texte ci-dessous pour vérifier les correspondances avec les mots surveillés"
           found_matches: "Correspondances trouvées :"
           no_matches: "Aucune correspondance trouvée"
       impersonate:
         title: "Incarner"
-        help: "Utiliser cet outil pour incarner un compte utilisateur à des fins de tests.\nVous devrez vous déconnecter une fois terminé."
+        help: "Utilisez cet outil pour incarner un compte utilisateur à des fins de tests.\nVous devrez vous déconnecter une fois terminé."
         not_found: "Cet utilisateur n'a pas été trouvé."
         invalid: "Désolé, vous ne pouvez pas vous faire passer pour cet utilisateur."
       users:
         title: "Utilisateurs"
         create: "Ajouter un administateur"
-        last_emailed: "Dernier courriel"
-        not_found: "Désolé ce pseudo n'existe pas dans notre système."
+        last_emailed: "Dernier courriel reçu"
+        not_found: "Désolé, ce nom d'utilisateur n'existe pas dans notre système."
         id_not_found: "Désolé cet identifiant d'utilisateur n'existe pas dans notre système."
         active: "Activé"
-        show_emails: "Afficher les adresses de courriels"
-        hide_emails: "Cacher les e-mails"
+        show_emails: "Afficher les adresses courriels"
+        hide_emails: "Cacher les adresses courriels"
         nav:
           new: "Nouveaux"
           active: "Actifs"
           staff: "Responsables"
           suspended: "Suspendus"
-          silenced: "Sous silence"
-          staged: "Distant"
+          silenced: "Mis sous silence"
+          staged: "Distants"
         approved: "Approuvé ?"
         titles:
           active: "Utilisateurs actifs"
           new: "Nouveaux utilisateurs"
           pending: "Utilisateur en attente"
-          newuser: "Utilisateurs au niveau de confiance 0 (Nouveaux utilisateurs)"
-          basic: "Utilisateurs au niveau de confiance 1 (Utilisateurs de base)"
-          member: "Utilisateurs au Niveau de confiance 2 (Membre)"
-          regular: "Utilisateurs au Niveau de confiance 3 (Habitué)"
-          leader: "Utilisateurs au Niveau de confiance 4 (Meneur)"
+          newuser: "Utilisateurs au niveau de confiance 0 (nouvel utilisateur)"
+          basic: "Utilisateurs au niveau de confiance 1 (utilisateur de base)"
+          member: "Utilisateurs au niveau de confiance 2 (membre)"
+          regular: "Utilisateurs au niveau de confiance 3 (habitué)"
+          leader: "Utilisateurs au niveau de confiance 4 (meneur)"
           staff: "Responsables"
           admins: "Administrateurs"
           moderators: "Modérateurs"
@@ -3872,32 +3990,32 @@ fr:
         suspend_failed: "Il y a eu un problème pendant la suspension de cet utilisateur {{error}}"
         unsuspend_failed: "Il y a eu un problème pendant le retrait de la suspension de cet utilisateur {{error}}"
         suspend_duration: "Combien de temps l'utilisateur sera suspendu ?"
-        suspend_reason_label: "Pourquoi suspendez-vous ? Ce texte <b>sera visible par tout le monde</ b> sur la page du profil de cet utilisateur, et sera affiché à l'utilisateur quand ils essaient de se connecter. Soyez bref."
+        suspend_reason_label: "Pourquoi suspendez-vous ? Ce texte <b>sera visible par tout le monde</b> sur la page du profil de cet utilisateur et sera affiché à l'utilisateur quand il essaie de se connecter. Soyez bref."
         suspend_reason_hidden_label: "Pourquoi le suspendez-vous ? Ce texte sera affiché à l'utilisateur quand il essaie de se connecter. Soyez bref."
         suspend_reason: "Raison"
         suspend_reason_placeholder: "Raison de la suspension"
         suspend_message: "Message courriel"
-        suspend_message_placeholder: "Donner plus d'informations au sujet de la suspension qui seront envoyées à l'utilisateur par courriel."
+        suspend_message_placeholder: "Si besoin, donnez plus d'informations au sujet de cette suspension qui seront envoyées à l'utilisateur par courriel."
         suspended_by: "Suspendu par"
         silence_reason: "Raison"
         silenced_by: "Mis sous silence par"
         silence_modal_title: "Mettre l'utilisateur sous silence"
-        silence_duration: "Combien de temps sera l'utilisateur mis sous silence ?"
-        silence_reason_label: "Pourquoi mettez-vous l'utilisateur sous silence ?"
+        silence_duration: "Combien de temps l'utilisateur sera-t-il mis sous silence ?"
+        silence_reason_label: "Pourquoi mettez-vous cet utilisateur sous silence ?"
         silence_reason_placeholder: "Raison de la mise sous silence"
         silence_message: "Message courriel"
         silence_message_placeholder: "(laisser vide pour envoyer un message par défaut)"
         suspended_until: "(jusqu'à %{until})"
         cant_suspend: "Cet utilisateur ne peut pas être suspendu."
         delete_all_posts: "Supprimer tous les messages"
-        delete_posts_progress: "Messages en cours de suppression..."
+        delete_posts_progress: "Messages en cours de suppression…"
         delete_posts_failed: "Il y a eu un problème lors de la suppression des messages."
-        penalty_post_actions: "Qu'aimeriez-vous faire du message associé ?"
+        penalty_post_actions: "Que souhaitez-vous faire du message associé ?"
         penalty_post_delete: "Supprimer le message"
         penalty_post_delete_replies: "Supprimer le message + réponses"
         penalty_post_edit: "Modifier le message"
         penalty_post_none: "Ne rien faire"
-        penalty_count: "Décompte pénalités"
+        penalty_count: "Nombre de pénalités"
         clear_penalty_history:
           title: "Effacer historique des pénalités"
           description: "les utilisateurs ayant des pénalités ne peuvent pas atteindre le niveau de confiance 3"
@@ -3923,7 +4041,7 @@ fr:
         grant_moderation: "Accorder les droits de modération"
         unsuspend: "Annuler la suspension"
         suspend: "Suspendre"
-        show_flags_received: "Afficher signalements reçus"
+        show_flags_received: "Afficher les signalements reçus"
         flags_received_by: "Signalements reçus par %{username}"
         flags_received_none: "Cet utilisateur n'a pas reçu de signalement."
         reputation: Réputation
@@ -3946,23 +4064,42 @@ fr:
         approve_bulk_success: "Bravo ! Tous les utilisateurs sélectionnés ont été approuvés et notifiés."
         time_read: "Temps de lecture"
         anonymize: "Rendre l'utilisateur anonyme"
-        anonymize_confirm: "Êtes-vous sûr de vouloir rendre ce compte anonyme ? Ceci entraînera la modification du pseudo et de l'adresse courriel, et réinitialisera les informations du profil."
+        anonymize_confirm: "Êtes-vous sûr de vouloir rendre ce compte anonyme ? Ceci entraînera la modification du nom d'utilisateur et de l'adresse courriel, et réinitialisera les informations du profil."
         anonymize_yes: "Oui, rendre ce compte anonyme"
         anonymize_failed: "Il y a eu un problème lors de l'anonymisation de ce compte."
         delete: "Supprimer l'utilisateur"
         merge:
+          button: "Fusionner"
           prompt:
+            title: "Transférer et supprimer @%{username}"
+            description: |
+              <p>Veuillez choisir un nouveau propriétaire pour le contenu de <b>@%{username}</b>.</p>
+
+              <p>Tous les sujets, réponses, messages et autres contenus créés par <b>@%{username}</b> seront transférés.</p>
+            target_username_placeholder: "Nom d'utilisateur du nouveau propriétaire"
+            transfer_and_delete: "Transférer et supprimer @%{username}"
             cancel: "Annuler"
           confirmation:
+            title: "Transférer et supprimer @%{username}"
+            description: |
+              <p>Tout le contenu de <b>@%{username}</b> sera transféré et attribué à <b>@%{targetUsername}</b>. Après le transfert du contenu, le compte de <b>@%{username}</b> sera supprimé.</p>
+
+              <p><b>Cette action n'est pas réversible !</b></p>
+
+              <p>Pour continuer, veuillez saisir le texte : <code>%{text}</code></p>
+            text: "transférer @%{username} vers @%{targetUsername}"
+            transfer_and_delete: "Transférer et supprimer @%{username}"
             cancel: "Annuler"
+        merging_user: "Fusion de l'utilisateur…"
+        merge_failed: "Une erreur s'est produite lors de la fusion des utilisateurs."
         delete_forbidden_because_staff: "Administrateurs et modérateurs ne peuvent pas être supprimés."
         delete_posts_forbidden_because_staff: "Vous ne pouvez pas supprimer tous les messages des administrateurs et des modérateurs."
         delete_forbidden:
-          one: "Les utilisateurs ne peuvent pas être supprimés s'ils ont posté des messages Supprimer tous les messages avant d'essayer de supprimer un utilisateur. (Les messages plus vieux que %{count} jour ne peut pas être supprimé.)"
-          other: "Les utilisateurs ne peuvent pas être supprimés s'ils ont crée des messages. Supprimer tous les messages avant d'essayer de supprimer un utilisateur. (Les messages plus vieux que %{count} jours ne peuvent pas être supprimés.)"
+          one: "Les utilisateurs ne peuvent pas être supprimés s'ils ont posté des messages Supprimez tous les messages avant d'essayer de supprimer un utilisateur. (Les messages plus vieux que %{count} jour ne peuvent pas être supprimés.)"
+          other: "Les utilisateurs ne peuvent pas être supprimés s'ils ont créé des messages. Supprimez tous les messages avant d'essayer de supprimer un utilisateur. (Les messages plus vieux que %{count} jours ne peuvent pas être supprimés.)"
         cant_delete_all_posts:
-          one: "Impossible de supprimer tout les messages. Certains messages sont âgés de plus de %{count} jour. (voir l'option delete_user_max_post_age)"
-          other: "Impossible de supprimer tout les messages. Certains messages sont âgés de plus de %{count} jours. (voir l'option delete_user_max_post_age)"
+          one: "Impossible de supprimer tous les messages. Certains messages  sont plus vieux que %{count} jour. (Voir l'option delete_user_max_post_age.)"
+          other: "Impossible de supprimer tous les messages. Certains messages sont plus vieux que %{count} jours. (Voir l'option delete_user_max_post_age.)"
         cant_delete_all_too_many_posts:
           one: "Impossible de supprimer tous les messages parce que l'utilisateur a plus d'un message. (delete_all_posts_max)"
           other: "Impossible de supprimer tous les messages parce que l'utilisateur a plus de %{count} messages. (delete_all_posts_max)"
@@ -3981,27 +4118,28 @@ fr:
         deactivate_failed: "Il y a eu un problème lors de la désactivation du compte."
         unsilence_failed: "Il y a eu un problème en supprimant la mise sous silence de l'utilisateur."
         silence_failed: "Il y a eu un problème en mettant l'utilisateur sous silence."
-        silence_confirm: "Êtes-vous sûr de vouloir mettre l’utilisateur sous silence ? Il ne sera plus capable de créer de nouveaux sujets ou messages."
+        silence_confirm: "Êtes-vous sûr de vouloir mettre cet utilisateur sous silence ? Il ne sera plus capable de créer de nouveaux sujets ou messages."
         silence_accept: "Oui, mettre cet utilisateur sous silence"
-        bounce_score: "Score de rejet"
+        bounce_score: "Taux de courriels non délivrés"
         reset_bounce_score:
           label: "Réinitialiser"
-          title: "Réinitialiser le score de rejets à 0"
-        visit_profile: "Visiter <a href='%{url}'>la page de préférence de cet utilisateur</a> pour éditer son profil"
+          title: "Réinitialiser le taux de courriels non délivrés à 0"
+        visit_profile: "Visiter <a href='%{url}'>la page de préférence de cet utilisateur</a> pour modifier son profil"
         deactivate_explanation: "Un utilisateur désactivé doit revalider son adresse de courriel."
         suspended_explanation: "Un utilisateur suspendu ne peut pas se connecter."
         silence_explanation: "Un utilisateur mis sous silence ne peut pas créer des messages ou sujets."
         staged_explanation: "Un utilisateur distant ne peut envoyer des messages que par courriel et pour des sujets spécifiques."
         bounce_score_explanation:
-          none: "Aucune rejet récent pour cette adresse courriel."
-          some: "Quelques rejets récents pour cette adresse courriel."
-          threshold_reached: "Trop de rejets récents pour cette adresse courriel."
+          none: "Tous les courriels envoyés à cette adresse ont été délivrés."
+          some: "Quelques courriels envoyés à cette adresse n'ont pas été délivrés."
+          threshold_reached: "Trop de courriels envoyés à cette adresse n'ont pas été délivrés."
         trust_level_change_failed: "Il y a eu un problème lors de la modification du niveau de confiance de l'utilisateur."
         suspend_modal_title: "Suspendre l'utilisateur"
+        confirm_cancel_penalty: "Êtes-vous sûr de vouloir annuler la pénalité ?"
         trust_level_2_users: "Utilisateurs de niveau de confiance 2"
         trust_level_3_requirements: "Pré-requis du niveau de confiance 3"
-        trust_level_locked_tip: "Le niveau de confiance est verrouillé. Le système ne changera plus le niveau de confiance de cet utilisateur."
-        trust_level_unlocked_tip: "les niveaux de confiance sont déverrouillés. Le système pourra promouvoir ou rétrograder des utilisateurs."
+        trust_level_locked_tip: "le niveau de confiance est verrouillé, le système ne changera plus le niveau de confiance de cet utilisateur"
+        trust_level_unlocked_tip: "le niveau de confiance est déverrouillé, le système pourra changer le niveau de confiance de cet utilisateur"
         lock_trust_level: "Verrouiller le niveau de confiance"
         unlock_trust_level: "Déverrouiller le niveau de confiance"
         tl3_requirements:
@@ -4036,13 +4174,13 @@ fr:
         sso:
           title: "Authentification unique (SSO)"
           external_id: "ID Externe"
-          external_username: "Pseudo"
+          external_username: "Nom d'utilisateur"
           external_name: "Nom"
           external_email: "Courriel"
           external_avatar_url: "URL de l'image de profil"
       user_fields:
         title: "Champs utilisateurs"
-        help: "Ajouter des champs que vos utilisateurs pourront remplir."
+        help: "Ajoutez des champs que vos utilisateurs pourront remplir."
         create: "Créer un champ utilisateur"
         untitled: "Sans titre"
         name: "Nom du champ"
@@ -4094,9 +4232,9 @@ fr:
         no_results: "Aucun résultat trouvé."
         more_than_30_results: "Il y a plus de 30 résultats. Veuillez affiner votre recherche ou sélectionner une catégorie."
         clear_filter: "Effacer"
-        add_url: "ajouter URL"
-        add_host: "ajouter hôte"
-        add_group: "ajouter groupe"
+        add_url: "ajouter une URL"
+        add_host: "ajouter un hôte"
+        add_group: "ajouter un groupe"
         uploaded_image_list:
           label: "Modifier la liste"
           empty: "Il n'y a aucune image pour le moment. Veuillez en envoyer une."
@@ -4137,7 +4275,7 @@ fr:
         secret_list:
           invalid_input: "Les champs de saisi ne peuvent pas être vide ou contenir le caractère barre verticale"
         default_categories:
-          modal_description: "Voulez-vous appliquer ce changement rétroactivement ? Cela changera les préférences de %{count} utilisateurs existants."
+          modal_description: "Voulez-vous appliquer ce changement rétroactivement ? Cela changera les préférences de %{count} utilisateurs existants."
           modal_yes: "Oui"
           modal_no: "Non, appliquer ce changement à partir de maintenant"
       badges:
@@ -4170,25 +4308,25 @@ fr:
         no_user_badges: "%{name} ne s'est vu décerné aucun badge."
         no_badges: Il n'y a aucun badge pouvant être décerné.
         none_selected: "Sélectionnez un badge pour commencer"
-        allow_title: Autoriser le badge à être utilisé comme un titre
+        allow_title: Permettre d'utiliser ce badge comme titre sur le profil utilisateur
         multiple_grant: Peut être décerné plusieurs fois
         listable: Afficher le badge sur la page publique des badges
         enabled: Activer le badge
         icon: Icône
         image: Image
-        icon_help: "Entrez un nom d'icône Font Awesome (utilisez le préfixe 'far-' pour les icônes classiques et 'fab-' pour les icônes de la marque)"
+        icon_help: "Entrez un nom d'icône Font Awesome (utilisez le préfixe « far- » pour les icônes classiques et « fab- » pour les icônes de marques)"
         image_help: "Entrez l'URL de l'image (remplace le champ de l'icône si les deux sont définis)"
         query: Requête du badge (SQL)
         target_posts: Requête sur les messages
         auto_revoke: Exécuter la requête de révocation quotidiennement
-        show_posts: Afficher le message concerné par le badge sur la page des badges.
+        show_posts: Afficher le message qui a permis l'obtention de ce badge sur la page des badges.
         trigger: Déclencheur
         trigger_type:
           none: "Mettre à jour quotidiennement"
           post_action: "Lorsqu'un utilisateur agit sur un message"
           post_revision: "Lorsqu'un utilisateur modifie ou crée un message"
           trust_level_change: "Lorsqu'un utilisateur change de niveau de confiance"
-          user_change: "Lorsqu'un utilisateur est modifié ou crée"
+          user_change: "Lorsqu'un utilisateur est modifié ou créé"
           post_processed: "Après qu'un message soit traité"
         preview:
           link_text: "Aperçu du badge accordé"
@@ -4210,25 +4348,30 @@ fr:
             with_post_time: "<span class=\"username\">%{username}</span> pour son message dans %{link} à <span class=\"time\">%{time}</span>"
             with_time: "<span class=\"username\">%{username}</span> à <span class=\"time\">%{time}</span>"
         badge_intro:
-          title: "Choisir un badge existant ou en créer un nouveau pour commencer"
-          what_are_badges_title: "Qu'est-ce que les badges ?"
+          title: "Choisissez un badge existant ou en créer un nouveau pour commencer"
+          emoji: "emoji de femme étudiante"
+          what_are_badges_title: "Que sont les badges ?"
           badge_query_examples_title: "Exemple de requête de badge"
         mass_award:
-          title: Accorder en Masse
-          description: Accorder le même badge à plusieurs utilisateurs à la fois.
-          no_badge_selected: Merci de sélectionner un badge pour commencer.
-          perform: "Accorder un Badge aux Utilisateurs"
+          title: Accorder en masse
+          description: Accordez le même badge à plusieurs utilisateurs à la fois.
+          no_badge_selected: Veuillez sélectionner un badge pour commencer.
+          perform: "Accorder un badge aux utilisateurs"
+          upload_csv: Envoyer un CSV avec les courriels ou les noms d'utilisateurs
+          aborted: Veuillez envoyer un CSV contenant des courriels ou des noms d'utilisateurs
           success: Votre CSV a été envoyé et les utilisateurs recevront leur badge rapidement.
+          replace_owners: Supprimer le badge des détenteurs précédents
       emoji:
         title: "Emoji"
-        help: "Ajouter un nouvel emoji qui sera disponible pour tout le monde. (Conseil : glisser-déposer plusieurs fichiers en même temps)"
+        help: "Ajoutez de nouveaux emojis qui seront disponibles pour tout le monde. (Conseil : glisser-déposer plusieurs fichiers en même temps)"
         add: "Ajouter un nouvel emoji"
         name: "Nom"
         group: "Groupe"
         image: "Image"
-        delete_confirm: "Êtes-vous sûr de vouloir supprimer l'emoji :%{name}: ?"
+        alt: "aperçu de l'emoji personnalisé"
+        delete_confirm: "Êtes-vous sûr de vouloir supprimer l'emoji :%{name}: ?"
       embedding:
-        get_started: "Si vous aimeriez intégrer Discourse dans un autre site, commencez par ajouter l'hôte."
+        get_started: "Si vous souhaitez intégrer Discourse dans un autre site, commencez par ajouter son hôte."
         confirm_delete: "Êtes-vous sûr de vouloir supprimer cet hôte ?"
         sample: "Introduire le code HTML suivant dans votre site pour créer et intégrer des sujets Discourse. Remplacer <b>REPLACE_ME</b> avec l'URL de la page dans laquelle vous l'intégrer."
         title: "Intégration externe"
@@ -4239,26 +4382,29 @@ fr:
         category: "Écrire dans la catégorie"
         add_host: "Ajouter un hôte"
         settings: "Paramètres d'intégration externe"
-        crawling_settings: "Paramètres de robot"
+        crawling_settings: "Paramètres des robots d'indexation"
         crawling_description: "Quand Discourse crée des sujets pour vos messages, si aucun flux RSS/ATOM n'est présent, il essayera d'extraire le contenu à partir du HTML. Parfois, cette extraction peut être difficile alors nous donnons la possibilité de définir des règles CSS pour faciliter l'extraction."
-        embed_by_username: "Pseudo pour création de sujet"
+        embed_by_username: "Nom d'utilisateur pour création de sujet"
         embed_post_limit: "Le nombre maximum de messages à intégrer"
         embed_title_scrubber: "Expression régulière utilisée pour nettoyer le titre des messages"
         embed_truncate: "Tronquer les messages intégrés"
+        embed_unlisted: "Les sujets importés seront délistés jusqu'à la prochaine réponse."
         embed_whitelist_selector: "Sélecteur CSS pour les éléments qui seront autorisés dans les contenus intégrés"
         embed_blacklist_selector: "Sélecteur CSS pour les éléments qui seront interdits dans les contenus intégrés"
         embed_classname_whitelist: "Classes CSS autorisées"
         save: "Sauvegarder les paramètres d'intégration"
       permalink:
         title: "Permaliens"
+        description: "Redirections à appliquer pour les URL non connues par le forum."
         url: "URL"
-        topic_id: "ID sujet"
+        topic_id: "ID du sujet"
         topic_title: "Sujet"
-        post_id: "ID message"
+        post_id: "ID du message"
         post_title: "Message"
-        category_id: "ID catégorie"
+        category_id: "ID de la catégorie"
         category_title: "Catégorie"
         external_url: "URL externe"
+        destination: "Cible"
         delete_confirm: "Êtes-vous sûr de vouloir supprimer ce permalien ?"
         form:
           label: "Nouveau :"
@@ -4266,7 +4412,7 @@ fr:
           filter: "Rechercher (URL ou URL externe)"
       reseed:
         action:
-          label: "Remplacement du texte..."
+          label: "Remplacement du texte…"
           title: "Remplacer le texte des catégories et des sujets avec les traductions"
         modal:
           title: "Remplacer le texte"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 0ec701966a..4185d7c296 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -514,9 +514,11 @@ gl:
         enable: "Activar"
       second_factor:
         name: "Nome"
+        disable: "Desactivar"
+        save: "Gardar"
         edit: "Editar"
         security_key:
-          delete: "Eliminar"
+          save: "Gardar"
       change_about:
         title: "Cambiar «Verbo de min»"
       change_username:
@@ -1010,6 +1012,8 @@ gl:
       move_to_inbox:
         title: "Mover á caixa de entrada"
         help: "Mover mensaxes á caixa de entrada"
+      edit_message:
+        title: "Editar"
       defer:
         title: "Pospor"
       list: "Temas"
@@ -1575,7 +1579,6 @@ gl:
         this_month: "Mes"
         this_week: "Semana"
         today: "Hoxe"
-        other_periods: "ver destacados"
     permission_types:
       full: "Crear / Responder / Ver"
       create_post: "Responder / Ver"
@@ -1677,6 +1680,9 @@ gl:
           unread: "Non hai máis temas sen ler."
           top: "Non hai máis temas destacados."
           bookmarks: "Non hai máis temas marcados."
+    footer_nav:
+      share: "Compartir"
+      dismiss: "Desbotar"
   admin_js:
     type_to_filter: "escribe para filtrar..."
     admin:
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index b5a8001d03..622563183a 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -324,6 +324,7 @@ he:
       no_timezone: 'עדיין לא הגדרת אזור זמן. לא תהיה לך אפשרות להגדיר תזכורות. ניתן להגדיר אותו <a href="%{basePath}/my/preferences/profile">בפרופיל שלך</a>.'
       invalid_custom_datetime: "התאריך והשעה שסיפקת שגויים, נא לנסות שוב."
       list_permission_denied: "אין לך הרשאה לצפות בסימניות של המשתמש הזה."
+      delete_when_reminder_sent: "למחוק את הסימנייה כאשר הודעת התזכורת נשלחת."
       reminders:
         at_desktop: "בשימוש הבא דרך שולחן העבודה"
         later_today: "בהמשך היום"
@@ -340,6 +341,8 @@ he:
         tomorrow_with_time: "מחר ב־%{time}"
         at_time: "ב־%{date_time}"
         existing_reminder: "הגדרת תזכורת שתישלח עבור הסימנייה הזאת"
+    copy_codeblock:
+      copied: "הועתק!"
     drafts:
       resume: "המשך"
       remove: "הסרה"
@@ -750,14 +753,16 @@ he:
           title: "מושתק"
           description: "לא תקבלו הודעה על כל הקשור להודעות בקבוצה זו."
       flair_url: "תמונת תג לדמות"
-      flair_url_placeholder: "(רשות) כתובת של תמונה או מחלקה של Font Awesome"
-      flair_url_description: 'השתמש בתמונות בצורת ריבוע לא קטנות יותר מ20 פיקסלים על 20 פיקסלים או אייקונים של FontAwsome (פורמטים מקובלים: "fa-icon", "far fa-icon" או "fab fa-icon").'
+      flair_upload_description: "יש להשתמש בתמונות ריבועיות שגודלן חורג מ־20 על 20 פיקסלים."
       flair_bg_color: "צבע רקע של תג לדמות"
       flair_bg_color_placeholder: "(רשות) ערך הקסדצימלי של הצבע"
       flair_color: "צבע תג לדמות"
       flair_color_placeholder: "(רשות) ערך הקסדצימלי של הצבע"
       flair_preview_icon: "תצוגה מקדימה של סמל"
       flair_preview_image: "תצוגה מקדימה של תמונה"
+      flair_type:
+        icon: "נא לבחור סמל"
+        image: "העלאת תמונה"
     user_action_groups:
       "1": "לייקים שהוענקו"
       "2": "לייקים שהתקבלו"
@@ -825,6 +830,7 @@ he:
       copied: "הועתק"
     user_fields:
       none: "(בחרו אפשרות)"
+      required: 'נא למלא ערך עבור „%{name}”'
     user:
       said: "{{username}}:"
       profile: "פרופיל"
@@ -840,6 +846,7 @@ he:
       private_messages: "הודעות"
       user_notifications:
         filters:
+          filter_by: "סינון לפי"
           all: "הכל"
           read: "נקרא"
           unread: "לא-נקראו"
@@ -960,6 +967,7 @@ he:
       api_approved: "אושרו:"
       api_last_used_at: "שימוש אחרון:"
       theme: "ערכת עיצוב"
+      save_to_change_theme: 'ערכת העיצוב תעודכן לאחר הלחיצה על „%{save_text}”'
       home: "דף בית ברירת מחדל"
       staged: "מבוים"
       staff_counters:
@@ -1007,8 +1015,10 @@ he:
         enable: "הפעל"
         enable_long: "הפעל קודי גיבוי"
         manage: "ניהול קודים כגיבוי. נותרו לרשותך <strong>{{count}}</strong> קודים כגיבוי."
-        copied_to_clipboard: "הועתק ללוח"
+        copy_to_clipboard: "העתקה ללוח"
         copy_to_clipboard_error: "שגיאה בהעתקת מידע ללוח"
+        copied_to_clipboard: "הועתק ללוח"
+        download_backup_codes: "הורדת קודים לגיבוי"
         remaining_codes: "יש לך <strong>{{count}}</strong> קודי גיבוי נותרים"
         use: "להשתמש בקוד גיבוי"
         enable_prerequisites: "עליך להפעיל אימות דו־שלבי עיקרי בטרם יצירת קודים כגיבוי."
@@ -1034,28 +1044,29 @@ he:
         oauth_enabled_warning: "לידיעתך, כניסות מרשתות חברתיות ינוטרלו לאחר הפעלת אימות בשני שלבים בחשבונך."
         use: "להשתמש ביישומון אימות"
         enforced_notice: "עליך להפעיל אימות דו־שלבי בטרם הגישה לאתר הזה."
-        disable: "נטרול"
-        disable_title: "נטרול אימות דו־שלבי"
+        disable: "בטל"
         disable_confirm: "לנטרל את כל האימותים הדו־שלביים?"
+        save: "שמירה"
         edit: "עריכה"
         edit_title: "עריכת אימות דו־שלבי"
         edit_description: "שם אימות דו־שלבי"
-        enable_security_key_description: "כשמפתח האבטחה הפיזי שלך מוכן יש ללחוץ על כפתור הרישום שלהלן."
+        enable_security_key_description: |
+          כאשר <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">מפתח האבטחה החומרתי</a> שלך מוכן, יש ללחוץ על כפתור הרישום שלהלן.
         totp:
           title: "מאמתים מבוססי אסימונים"
-          add: "מאמת חדש"
+          add: "הוספת מאמת"
           default_name: "המאמת שלי"
           name_and_code_required_error: "עליך לספק שם וקוד מיישומון האימות שלך."
         security_key:
           register: "הרשמה"
           title: "מפתחות אבטחה"
-          add: "רישום מפתח אבטחה"
+          add: "הוספת מפתח אבטחה"
           default_name: "מפתח אבטחה עיקרי"
           not_allowed_error: "זמן תהליך רישום מפתח האבטחה פג או שבוטל."
           already_added_error: "כבר רשמת את מפתח האבטחה הזה. אין צורך לרשום אותו שוב."
           edit: "עריכת מפתח אבטחה"
+          save: "שמירה"
           edit_description: "שם מפתח אבטחה"
-          delete: "מחיקה"
           name_required_error: "עליך לציין שם למפתח האבטחה שלך."
       change_about:
         title: "שינוי בנוגע אליי"
@@ -1099,6 +1110,7 @@ he:
         sso_override_instructions: "ניתן לעדכן את כתובת הדוא״ל דרך ספק ה־SSO."
         instructions: "לעולם לא מוצג לציבור."
         ok: "נשלח אליכם דואר אלקטרוני לאישור"
+        required: "נא למלא כתובת דוא״ל"
         invalid: "בבקשה הכניסו כתובת דואר אלקטרוני תקינה"
         authenticated: "כתובת הדואר האלקטרוני שלך אושרה על ידי {{provider}}"
         frequency_immediately: "נשלח לך הודעה בדוא״ל מיידית אם טרם קראת את מה ששלחנו לך קודם."
@@ -1121,6 +1133,7 @@ he:
         title: "שם"
         instructions: "שמך המלא (רשות)"
         instructions_required: "שמך המלא"
+        required: "נא למלא שם"
         too_short: "השם שלך קצר מידי"
         ok: "השם נראה טוב"
       username:
@@ -1134,6 +1147,7 @@ he:
         too_long: "שם המשתמש שלך ארוך מידי"
         checking: "בודק זמינות שם משתמש..."
         prefilled: "הדואר האלקטרוני תואם לשם משתמש זה"
+        required: "נא למלא שם משתמש"
       locale:
         title: "שפת ממשק"
         instructions: "שפת ממשק המשתמש. היא תתחלף כשתרעננו את העמוד."
@@ -1279,6 +1293,7 @@ he:
         same_as_email: "הססמה שלך זהה לכתובת הדוא״ל שלך."
         ok: "הסיסמה שלך נראית טוב."
         instructions: "לפחות %{count} תווים"
+        required: "נא למלא ססמה"
       summary:
         title: "סיכום"
         stats: "סטטיסטיקות"
@@ -1614,6 +1629,9 @@ he:
         many: "נא לבחור ב־{{count}} פריטים לפחות."
         other: "נא לבחור ב־{{count}} פריטים לפחות."
       invalid_selection_length: "אורך הבחירה חייב להיות {{count}} תווים לפחות."
+      components:
+        categories_admin_dropdown:
+          title: "תפריט קטגוריות ניהול נגלל"
     date_time_picker:
       from: מאת
       to: אל
@@ -1786,7 +1804,7 @@ he:
           many: "{{count}} הודעות שלא נקראו"
           other: "{{count}} הודעות שלא קראו"
         high_priority:
-          one: "הודעה אחת (%{count}) בדחיפות גבוהה שלא נקראה"
+          one: "הודעה %{count} בדחיפות גבוהה שלא נקראה"
           two: "%{count} הודעות בדחיפות גבוהה שלא נקראו"
           many: "%{count} הודעות בדחיפות גבוהה שלא נקראו"
           other: "%{count} הודעות בדחיפות גבוהה שלא נקראו"
@@ -2037,7 +2055,7 @@ he:
         help: "החזרת הודעה לדואר נכנס"
       edit_message:
         help: "ערוך פוסט ראשון של ההודעה"
-        title: "עריכת הודעה"
+        title: "עריכה"
       defer:
         help: "סימון כלא נקראו"
         title: "אחר כך"
@@ -2205,6 +2223,7 @@ he:
           "2_8": "תראו ספירה של תגובות חדשות כיוון שאתם עוקבים אחר קטגוריה זו."
           "2_4": "תראו ספירה של תגובות חדשות כיוון שפרסמתם תגובה לנושא זה."
           "2_2": "תראו ספירה של תגובות חדשות כיוון שאתם עוקבים אחר נושא זה:"
+          "2": 'תופיע בפניך ספירה של תגובות חדשות מכיוון ש<a href="{{basePath}}/u/{{username}}/preferences/notifications">קראת את הנושא הזה</a>.'
           "1_2": "תישלח התראה אם מישהו יזכיר את @שם_המשתמש שלך או ישיב לך."
           "1": "תישלח התראה אם מישהו יזכיר את @שם_המשתמש שלך או ישיב לך."
           "0_7": "אתם מתעלמים מכל ההתראות בקטגוריה זו."
@@ -2743,7 +2762,7 @@ he:
       email_in: "כתובת דואר נכנס מותאמת אישית:"
       email_in_allow_strangers: "קבלת דוא״ל ממשתמשים אלמוניים ללא חשבונות במערכת הפורומים"
       email_in_disabled: "האפשרות לשליחת נושאים חדשים בדוא״ל הושבתה בהגדרות האתר. כדי להפעיל פרסום של נושאים חדשים דרך דוא״ל,"
-      email_in_disabled_click: 'לאפשר את את ההגדרה „דוא״ל נכנס”'
+      email_in_disabled_click: 'הפעל את ההגדרה "דוא"ל נכנס"'
       mailinglist_mirror: "קטגוריה שמשקפת רשימת תפוצה"
       show_subcategory_list: "הצגת רשימת קטגוריות משנה מעל נושאים בקטגוריה זו."
       read_only_banner: "טקסט כרזה כאשר משתמש לא יכול ליצור נושא בקטגוריה הזו:"
@@ -3021,7 +3040,7 @@ he:
         this_month: "חודש"
         this_week: "שבוע"
         today: "היום"
-        other_periods: "ראה חלק עליון"
+        other_periods: "להציג את המובילים:"
     browser_update: 'אתרע מזלך וכי <a href="https://www.discourse.org/faq/#browser">דפדפנך מיושן מכדי להפעיל אתר זה</a>. נא <a href="https://browsehappy.com">לשדרג את דפדפנך</a> כדי לצפות בתוכן עשיר, להיכנס למערכת ולהגיב.'
     permission_types:
       full: "יצירה / תגובה / צפייה"
@@ -3289,6 +3308,11 @@ he:
       custom_message_template_forum: "היי, זה פורום מומלץ, כדאי להצטרף אליו!"
       custom_message_template_topic: "היי, חשבתי שהנושא הזה יעניין אותך!"
     forced_anonymous: "עקב עומס חריג, הודעה זו מוצגת באופן זמני לכולם כפי שתופיע בפני משתמשים שלא נכנסו למערכת."
+    footer_nav:
+      back: "חזרה"
+      forward: "העברה"
+      share: "לשתף"
+      dismiss: "דחייה"
     safe_mode:
       enabled: "מצב בטוח מאופשר, כדי לצאת ממנו סיגרו את חלון הדפדפן הזה"
   admin_js:
@@ -3541,12 +3565,6 @@ he:
         tag_event:
           name: "אירוע תגית"
           details: "כאשר תגית נוצרת, מתעדכנת או מושמדת."
-        flag_event:
-          name: "אירוע דגל"
-          details: "כאשר דגל נוצר, מוסכם, נחלק עליו או שמתעלמים ממנו."
-        queued_post_event:
-          name: "אירוע אישור פוסט"
-          details: "כאשר פוסט שממתין בתור נוצר, מאושר או נדחה."
         reviewable_event:
           name: "אירוע סקירה"
           details: "כאשר פריט חדש ממתין לסקירה וכאשר המצב שלו מתעדכן."
@@ -4308,7 +4326,7 @@ he:
         anonymize_failed: "אירעה תקלה בהפיכת חשבון זה לאלמוני."
         delete: "מחיקת משתמש"
         merge:
-          transfer_and_delete: "העברה ומחיקה"
+          button: "מיזוג"
           prompt:
             title: "העברה ומחיקה של ‎@%{username}‎"
             description: |
@@ -4533,7 +4551,7 @@ he:
         badge: עיטור
         display_name: שם תצוגה
         description: תיאור
-        long_description: תאור ארוך
+        long_description: תיאור ארוך
         badge_type: סוג עיטור
         badge_grouping: קבוצה
         badge_groupings:
@@ -4652,6 +4670,7 @@ he:
         post_title: "פוסט"
         category_id: "מזהה לקטגוריה"
         category_title: "קטגוריה"
+        tag_name: "שם תגית"
         external_url: "כתובת חיצונית"
         destination: "יעד"
         delete_confirm: " להסיר את הקישור הקבוע?"
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index 8f771407d5..e602b1d7ed 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -633,8 +633,6 @@ hu:
           title: "Némítás"
           description: "A csoport üzeneteiről nem fogsz értesítéseket kapni."
       flair_url: "Avatar Flair kép"
-      flair_url_placeholder: "(Opcionális) Kép url címe vagy Font Awesome css osztálya"
-      flair_url_description: 'Használj négyzet alakú, minimum 20x20-as képeket vagy FontAwesome ikonokat (elfogadott formátumok: "fa-icon", "far fa-icon" or "fab fa-icon").'
       flair_bg_color: "Avatar Flair háttér szín"
       flair_bg_color_placeholder: "(Opcionális) Hex színkód érték"
       flair_color: "Avatar Flair szín"
@@ -876,8 +874,9 @@ hu:
         regenerate: "Újragenerálás"
         disable: "Kikapcsol"
         enable: "Engedélyez"
-        copied_to_clipboard: "Vágólapra másolva"
+        copy_to_clipboard: "Vágólapra másolás"
         copy_to_clipboard_error: "Hiba az adat Vágólapra másolása során"
+        copied_to_clipboard: "Vágólapra másolva"
       second_factor:
         title: "Két-faktoros hitelesítés"
         forgot_password: "Elfelejtetted a jelszavad?"
@@ -887,11 +886,12 @@ hu:
         disable_description: "Írd be az azonosító kódodat az alkalmazásból"
         show_key_description: "Manuális beírás"
         oauth_enabled_warning: "A közösségi bejelentkezések nem lesznek elérhetőek a fét-faktoros azonosítás aktiválása után a fiókhoz."
-        disable: "kikapcsolás"
+        disable: "Kikapcsol"
+        save: "Mentés"
         edit: "Szerkesztés"
         security_key:
           register: "Regisztráció"
-          delete: "Törlés"
+          save: "Mentés"
       change_about:
         title: "Rólam megváltoztatása"
         error: "Hiba történt az adat módosításakor."
@@ -1613,7 +1613,7 @@ hu:
       move_to_inbox:
         title: "Áthelyezés a bejövő üzenetek közé"
       edit_message:
-        title: "Üzenet szerkesztése"
+        title: "Szerkesztés"
       list: "Témák"
       new: "új téma"
       unread: "olvasatlan"
@@ -2206,7 +2206,6 @@ hu:
         this_month: "Utolsó 30 nap"
         this_week: "Utolsó 7 nap"
         today: "Utolsó 24 óra"
-        other_periods: "Lásd felül"
     permission_types:
       full: "Létrehozás / Válaszolás / Megtekintés"
       create_post: "Válaszolás / Megtekintés"
@@ -2349,6 +2348,10 @@ hu:
       custom_message_placeholder: "Add meg az egyéni üzenetedet"
       custom_message_template_forum: "Hej, csatlakoznód kéne ehez a fórumhoz"
       custom_message_template_topic: "Hej, úgygondoltam talán élveznéd ezt a témát"
+    footer_nav:
+      back: "Vissza"
+      share: "Megosztás"
+      dismiss: "Elvet"
     safe_mode:
       enabled: "A biztonságos mód be van kapcsolva, hogy kilépj a biztonságos módból lépj ki ebből a keresési lapból"
   admin_js:
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index 8e795a568a..c02df4108a 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -27,7 +27,10 @@ hy:
         millions: "{{number}}մլն"
     dates:
       time: "h:mm"
+      time_with_zone: "HH:mm (տեղական)"
+      time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -179,6 +182,7 @@ hy:
         us_east_1: "US East (N. Virginia)"
         us_east_2: "US East (Ohio)"
         us_gov_east_1: "AWS GovCloud (US-East)"
+        us_gov_west_1: "AWS GovCloud (ԱՄՆ-Արևմուտք)"
         us_west_1: "US West (N. California)"
         us_west_2: "US West (Oregon)"
     edit: "խմբագրել այս թեմայի վերնագիրը և կատեգորիան"
@@ -272,6 +276,7 @@ hy:
       no_timezone: 'Դուք դեռ չեք նշել ձեր ժամային գոտին: Դուք չեք կարողանա հիշեցումներ անել: Տեղադրեք <a href="%{basePath}/my/preferences/profile"> ձեր պրոֆիլում:'
       invalid_custom_datetime: "Ամսաթիվը և ժամանակը ճիշտ չէ նշված, կրկին փորձեք:"
       list_permission_denied: "Դուք իրավունք չունեք դիտելու այս օգտատիրոջ էջանշանները: "
+      delete_when_reminder_sent: "Ջնջել այս էջանշանը՝ հիշեցման ծանուցումն ուղարկելուց հետո: "
       reminders:
         at_desktop: "Հաջորդ այցելությունը ֆորումին, կլինի իմ աշխատանքային սեղանի միջոցով: "
         later_today: "Այսօր, մի փոքր ուշ"
@@ -647,8 +652,6 @@ hy:
           title: "Խլացված"
           description: "Այս խմբի նոր հաղորդագրությունների հետ կապված Դուք երբեք որևէ ծանուցում չեք ստանա:"
       flair_url: "Avatar Flair Նկար"
-      flair_url_placeholder: "(Ընտրովի) Նկարի URL կամ Font Awesome class"
-      flair_url_description: 'Օգտագործեք քառակուսի նկար, ոչ փոքր քան 20պքս x 20պքս չափից կամ FontAwesome պատկերակներ (ընդունելի ֆորմատներ՝ "fa-icon", "far fa-icon" կամ "fab fa-icon"):'
       flair_bg_color: "Avatar Flair Ֆոնի Գույն"
       flair_bg_color_placeholder: "(Ընտրովի) Գույնի Hex արժեք"
       flair_color: "Avatar Flair Գույն"
@@ -886,6 +889,7 @@ hy:
         success: "(էլ. նամակն ուղարկված է)"
         in_progress: "(էլ. նամակն ուղարկվում է)"
         error: "(սխալ)"
+        emoji: "կողպեք էմոջի"
         action: "Ուղարկել Գաղտնաբառի Վերականգման Էլ. Նամակ"
         set_password: "Առաջադրել Գաղտնաբառ"
         choose_new: "Ընտրել նոր գաղտնաբառ"
@@ -897,8 +901,10 @@ hy:
         enable: "Միացնել"
         enable_long: "Միացնել պահուստային կոդերը"
         manage: "Կառավարել պահուստային կոդերով: Ձեզ մնացել է պահուստային <strong>{{count}}</strong> կոդ:"
-        copied_to_clipboard: "Կրնօրինակված է Փոխանակման հարթակում"
+        copy_to_clipboard: "Կրկնօրինակել Փոխանակման Հարթակում"
         copy_to_clipboard_error: "Փոխանակման հարթակում տվյալների կրկնօրինակման սխալ"
+        copied_to_clipboard: "Կրնօրինակված է Փոխանակման հարթակում"
+        download_backup_codes: "Ներբեռնել պահուստային կոդերը"
         remaining_codes: "Ձեզ մնացել է պահուստային <strong>{{count}}</strong> կոդ:"
         use: "Օգտագործել պահուստային կոդը"
         enable_prerequisites: "Դուք պետք է ակտիվացնեք առաջնային երկրորդ գործոնը՝ պահուստային կոդերի գեներացիայից առաջ:"
@@ -924,23 +930,27 @@ hy:
         oauth_enabled_warning: "Խնդրում ենք նկատի ունենալ, որ սոցիալական ցանցերով մուտքը կանջատվի, հենց որ երկգործոն վավերացումը միացվի Ձեր հաշվի համար:"
         use: "Օգտագործեք Նույնականացման հավելվածը՝ ստուգման համար  "
         enforced_notice: "Դուք պարտավոր եք միացնել երկգործոն նույնականացումը՝ մինչ մուտք գործելը այս կայք:"
-        disable: "անջատել"
-        disable_title: "Անջատել Երկրորդ Գործոնը"
+        disable: "Անջատել"
         disable_confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք անջատել բոլոր երկրորդական գործոնները: "
+        save: "Պահպանել"
         edit: "Խմբագրել"
         edit_title: "Խմբագրել Երկրորդ Գործոնը"
         edit_description: "Երկրորդ Գործոնի Անվանումը"
-        enable_security_key_description: "Երբ պատրաստեք ձեր անվտանգության ֆիզիկական բանալին, սեղմեք կոճակը <b> Գրանցվել </b> ներքևում:"
+        totp:
+          title: "Token- Նույնականացումներ"
+          add: "Ավելացնել Նույնականացում"
+          default_name: "Իմ Վավերացումը "
+          name_and_code_required_error: "Դուք պետք է նշեք նույնականացման հավելվածի կոդը և անվանումը:"
         security_key:
           register: "Գրանցվել"
           title: "Անվտանգության Բանալիներ"
-          add: "Գրանցել Անվտանգության Բանալին"
+          add: "Ավելացնել Անվտանգության Բանալին"
           default_name: "Անվտանգության Գլխավոր Բանալին"
           not_allowed_error: "Անվտանգության բանալու գրանցման ժամանակը վերջացել է կամ չեղյալ է հայտարարվել:"
           already_added_error: "Դուք արդեն գրանցել եք այս անվտանգության բանալին: Պետք չէ այն նորից գրանցել:"
           edit: "Խմբագրել Անվտանգության Բանալին"
+          save: "Պահպանել"
           edit_description: "Անվտանգության Բանալիների անվանումը"
-          delete: "Ջնջել"
           name_required_error: "Դուք պետք է նշեք անվտանգության բանալու անվանումը "
       change_about:
         title: "Փոփոխել Իմ Մասին բաժինը"
@@ -958,6 +968,10 @@ hy:
         success_staff: "Մենք ուղարկել ենք էլ. նամակ Ձեր ընթացիկ հասցեին: Խնդրում ենք հետևել հաստատման հրահանգներին:"
       change_avatar:
         title: "Փոխել Ձեր պրոֆիլի նկարը"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a> , հիմնված"
+        gravatar_title: "Փոխեք Ձեր անձնապատրկեը Gravatar-ի կայքում {{gravatarName}} "
+        gravatar_failed: "Մենք չկարողացանք գտնել Gravatar {{gravatarName}} այդ էլ. հասցեով:"
+        refresh_gravatar_title: "Թարմացնել Ձեր Gravatar-ը {{gravatarName}}"
         letter_based: "Համակարգի կողմից դրված պրոֆիլի նկար"
         uploaded_avatar: "Անհատական նկար"
         uploaded_avatar_empty: "Ավելացնել անհատական նկար"
@@ -993,6 +1007,9 @@ hy:
         cancel: "Չեղարկել"
         not_connected: "(չկապակցված)"
         confirm_modal_title: "Միացնել %{provider} Հաշիվը"
+        confirm_description:
+          account_specific: "Ձեր %{provider} հաշիվը '%{account_description}' կօգտագործվի վավերացման համար:"
+          generic: "Ձեր %{provider} հաշիվը կօգտագործվի վավերացման համար:"
       name:
         title: "Անուն"
         instructions: "Ձեր անուն ազգանունը (ընտրովի)"
@@ -1328,6 +1345,7 @@ hy:
     email_login:
       link_label: "Ուղարկեք ինձ մուտքի հղում"
       button_label: "էլ. նամակով"
+      emoji: "կողպեք էմոջի"
       complete_username: "Եթե <b>%{username}</b> օգտանվանը համապատասխանող հաշիվ գոյություն ունի, ապա Դուք շուտով կստանաք էլ-նամակ մուտքի հղումով:"
       complete_email: "Եթե <b>%{email}</b> էլ. հասցեին համապատասխանող հաշիվ գոյություն ունի, ապա Դուք շուտով կստանաք էլ. նամակ մուտքի հղումով:"
       complete_username_found: "Մենք գտել ենք <b>%{username}</b> օգտանվանը համապատասխանող հաշիվ, Դուք շուտով կստանաք մուտքի հղումով էլ. նամակ:"
@@ -1348,6 +1366,7 @@ hy:
       second_factor_backup_description: "Խնդրում ենք մուտքագրել ձեր պահուստային կոդերից որևէ մեկը՝"
       second_factor: "Մուտք գործել օգտագործելով Authenticator հավելվածը"
       security_key_alternative: "Փորձեք ուրիշ տարբերակ"
+      security_key_authenticate: "Վավերացնել Անվտանգության Բանալիով "
       security_key_not_allowed_error: "Անվտանգության բանալու գրանցման ժամանակը վերջացել է կամ չեղյալ է հայտարարվել:"
       security_key_no_matching_credential_error: "Նշված անվտանգության բանալիի մեջ չեն գտնվել համապատասխան հավատարմագրերը: "
       security_key_support_missing_error: "Ձեր ընթացիկ սարքը կամ բրաուզերը չի պահպանում անվտանգության բանալիների  օգտագործումը: Խնդրում ենք օգտագործել ուրիշ մեթոդ:"
@@ -1397,11 +1416,13 @@ hy:
         title: "GitHub-ով"
       discord:
         name: "Discord"
+        title: "Discord-ով"
       second_factor_toggle:
         totp: "Փոխարենը օգտագործել նույնականացման հավելվածը"
         backup_code: "Փոխարենը օգտագործել պահուստային կոդը"
     invites:
       accept_title: "Հրավեր"
+      emoji: "ծրար էմոջի"
       welcome_to: "Բարի Գալուստ %{site_name}!"
       invited_by: "Ձեզ հրավիրել է՝"
       social_login_available: "Դուք նաև կկարողանաք մուտք գործել ցանկացած սոցիալական կայքով՝ օգտագործելով այդ էլ. հասցեն:"
@@ -1417,6 +1438,7 @@ hy:
       apple_international: "Apple/International"
       google: "Google"
       twitter: "Twitter"
+      emoji_one: "JoyPixels (նախկինում EmojiOne)"
       win10: "Win10"
       google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
@@ -1503,6 +1525,7 @@ hy:
         category: "Դուք հիշատակել եք {{username}}-ին, բայց նա ծանուցում չի ստանա, քանի որ այս կատեգորիան նրան հասանելի չէ: Դուք պետք է ավելացնեք նրան որևէ խմբում, որը թուլտվություն ունի այս կատեգորիային:"
         private: "Դուք հիշատակել եք {{username}}-ին, բայց նա ծանուցում չի ստանա, քանի որ չի կարող տեսնել այս անձնական նամակը: Դուք պետք է հրավիրեք նրան այս անձնական նամակագրությանը:"
       duplicate_link: "Կարծես թե դեպի <b>{{domain}}</b> Ձեր հղումն արդեն իսկ հրապարակված է թեմայում <b>@{{username}}</b>-ի <a href='{{post_url}}'>պատասխանում {{ago}}</a>: Դուք համոզվա՞ծ եք, որ ցանկանում եք այն կրկին հրապարակել:"
+      reference_topic_title: "RE: {{title}}"
       error:
         title_missing: "Վերնագիրը պարտադիր է:"
         title_too_short: "Վերնագիրը պետք է լինի առնվազն {{min}} սիմվոլ:"
@@ -1643,6 +1666,8 @@ hy:
       granted_badge: "Վասատկել է '{{description}}'"
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Նոր Թեմա</span> {{description}}"
+      membership_request_accepted: "Անդամակցության հարցումը ընդունվել է՝ '{{group_name}}'"
+      membership_request_consolidated: "{{count}} բաց անդամակցության հարցումներ '{{group_name}}' "
       group_message_summary:
         one: "{{count}} հաղորդագրություն Ձեր {{group_name}} մուտքային արկղում"
         other: "{{count}} հաղորդագրություն Ձեր {{group_name}}-ի մուտքային արկղում"
@@ -1669,6 +1694,7 @@ hy:
         invitee_accepted: "հրավերը ընդունված է"
         posted: "Նոր Գրառում"
         moved_post: "գրառումը տեղափոխված է"
+        linked: "հղված է "
         bookmark_reminder: "էջանշանի հիշեցում"
         bookmark_reminder_with_name: "էջանշանի հիշեցում %{name}"
         granted_badge: "կրծքանշանը հանձնված է"
@@ -1845,12 +1871,13 @@ hy:
         help: "Տեղափոխել հաղորդագրությունը ետ դեպի Մուտքային արկղ"
       edit_message:
         help: "Խմբագրել հաղորդագրության առաջին գրառումը"
-        title: "Խմբագրել Հաղորդագրությունը"
+        title: "Խմբագրել"
       defer:
         help: "նշել որպես չընթերցված "
         title: "Հետաձգել"
       feature_on_profile:
         help: "Այս թեմայի հղումը կավելացվի օգտատիրոջ քարտում և ձեր պրոֆիլում:"
+        title: "Ավելացնել պրոֆիլում"
       remove_from_profile:
         warning: "Ձեր պրոֆիլում արդեն կա ընտրված թեման: Եթե դուք ​​շարունակեք, ապա՝ այդ թեման կփոխարինի առկա թեմային:"
         help: "Հեռացրեք այս թեմայի հղումը ձեր պրոֆիլում "
@@ -1898,6 +1925,7 @@ hy:
       group_request_sent: "Խմբին անդամության ձեր հարցումն ուղարկվել է: Ձեզ կտեղեկացնեն, երբ այն ընդունվի:"
       unread_indicator: "Ոչ մի անդամ դեռ չի կարդացել այս թեմայի մինչև վերջին գրառումը: "
       read_more_MF: " { UNREAD, plural, =0 {} one {<a href='{basePath}/unread'>1 չկարդացած</a> } other { <a href='{basePath}/unread'># չկարդացած</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {Կա} other{}} <a href='{basePath}/new'>1 նոր</a> topic} other { {BOTH, select, true{and } 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: Դիտել բոլոր կատեգորիաները
       view_latest_topics: դիտեք վերջին թեմաները
       suggest_create_topic: Միգուցե՞ չստեղծել նոր թեմա
@@ -1997,6 +2025,7 @@ hy:
           "2_8": "Դուք կտեսնեք նոր պատասխանների քանակը, քանի որ հետևում եք այս կատեգորիային:"
           "2_4": "Դուք կտեսնեք նոր պատասխանների քանակը, քանի որ հրապարակել եք պատասխան այս թեմայում:"
           "2_2": "Դուք կտեսնեք նոր պատասխանների քանակը, քանի որ հետևում եք այս թեմային:"
+          "2": 'Դուք կտեսնեք նոր պատասխանների քանակը, քանի որ Դուք <a href="{{basePath}}/u/{{username}}/preferences/notifications"> կարդացել եք այս թեման </a>.'
           "1_2": "Դուք ծանուցում կստանաք, եթե որևէ մեկը հիշատակի Ձեր @անունը կամ պատասխանի Ձեզ:"
           "1": "Դուք ծանուցում կստանաք, եթե որևէ մեկը հիշատակի Ձեր @անունը կամ պատասխանի Ձեզ:"
           "0_7": "Դուք անտեսում եք այս կատեգորիայի բոլոր ծանուցումները:"
@@ -2403,6 +2432,8 @@ hy:
         created: "Ստեղծված"
         updated: "Թարմացված"
         name: "Անուն"
+        name_placeholder: "Ինչի՞ համար է այս էջանշանը: "
+        set_reminder: "Հիշեցնել ինձ"
         actions:
           delete_bookmark:
             name: "Ջնջել էջանշանը"
@@ -2480,7 +2511,7 @@ hy:
       default_top_period: "Լռելյայն թոփ ժամանակահատվածը՝"
       allow_badges_label: "Այս կատեգորիայում թույլ տալ կրծքանշանների շնորհումը"
       edit_permissions: "Խմբագրել Թույլտվությունները"
-      reviewable_by_group: "Բացի անձնակազմից, այս կատեգորիայի գրառումներն ու դրոշակները կարող են վերանայել նաև."
+      reviewable_by_group: "Բացի անձնակազմից, այս կատեգորիայի գրառումներն ու դրոշակները կարող են վերանայել նաև՝"
       review_group_name: "խմբի անունը"
       require_topic_approval: "Բոլոր նոր թեմաների համար պահանջել մոդերատորի հաստատումը"
       require_reply_approval: "Բոլոր նոր պատասխանների համար պահանջել մոդերատորի հաստատումը "
@@ -2516,7 +2547,7 @@ hy:
           ignore: "Անտեսել"
           very_low: "Շատ Ցածր"
           low: "Բարձր"
-          high: "Ցածր"
+          high: "Բարձր"
           very_high: "Շատ Բարձր"
       sort_options:
         default: "լռելյայն"
@@ -2715,7 +2746,7 @@ hy:
         this_month: "Ամիս"
         this_week: "Շաբաթ"
         today: "Այսօր"
-        other_periods: "տեսնել թոփը"
+        other_periods: "տեսնել թոփը՝ "
     browser_update: 'Ցավոք, <a href="https://www.discourse.org/faq/#browser"> Ձեր բրաուզերը չափազանց հին է այս կայքն օգտագործելու համար </a>: Խնդրում ենք, <a href="https://browsehappy.com"> թարմացնել Ձեր բրաուզերը </a> կայքի լիարժեք աշխատանքի համար:'
     permission_types:
       full: "Ստեղծել/Պատասխանել/Դիտել"
@@ -2723,6 +2754,9 @@ hy:
       readonly: "Դիտել"
     lightbox:
       download: "ներբեռնել"
+      previous: "Նախորդ (սլաքի Ձախ ստեղնը)"
+      next: "Հաջորդ (սլաքի Աջ ստեղնը)"
+      counter: "%curr% %total% -ից"
       close: "Փակել (Esc)"
       content_load_error: '<a href="%url%"> Բովանդակությունը </a> հնարավոր չէ բեռնել:'
       image_load_error: '<a href="%url%"> Պատկերը </a> հնարավոր չէ բեռնել:'
@@ -2853,7 +2887,15 @@ hy:
       category_restricted: "Այս տեգը սահմանափակված է այն կատեգորիաներով, որոնցում մուտքի թույլտվություն չունեք:"
       synonyms: "Հոմանիշներ"
       synonyms_description: "Հետևյալ տեգերի օգտագործման դեպքում, դրանք կփոխարինվեն <b>%{base_tag_name}</b> -ով:"
+      tag_groups_info:
+        one: 'Այս պիտակը պատկանում է «{{tag_groups}}» խմբին:'
+        other: "Այս թեգը պատկանում է այս խմբերին՝ {{tag_groups}}"
+      edit_synonyms: "Կարգավորել Հոմանիշները"
+      add_synonyms_label: "Ավելացնել հոմանիշներ."
       add_synonyms: "Ավելացնել"
+      add_synonyms_failed: "Այս տեգերը չեն կարող ավելացվել որպես հոմանիշներ՝ <b>%{tag_names}</b> : Համոզվեք, որ դրանք հոմանիշներ չունեն և մեկ այլ տեգի հոմանիշներ չեն:"
+      remove_synonym: "Հեռացնել Հոմանիշը"
+      delete_synonym_confirm: 'Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել հոմանիշ <<%{tag_name}>> :'
       delete_tag: "Ջնջել Թեգը"
       delete_confirm:
         one: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս թեգը և հեռացնել այն %{count} թեմայից, որին այն վերագրված է:"
@@ -2905,11 +2947,13 @@ hy:
         about: "Ավելացրեք թեգեր խմբերին՝ դրանք ավելի հեշտ կառավարելու համար:"
         new: "Նոր Խումբ"
         tags_label: "Այս խմբի թեգերը՝ "
+        tags_placeholder: "թեգեր"
         parent_tag_label: "Մայր թեգ՝ "
         parent_tag_placeholder: "Ընտրովի"
         parent_tag_description: "Այս խմբի թեգերը չեն կարող օգտագործվել, քանի դեռ մայր թեգը առկա չէ:"
         one_per_topic_label: "Սահմանափակել այս խմբի յուրաքանչյուր թեման մեկ թեգով:"
         new_name: "Նոր Թեգի Խումբ"
+        name_placeholder: "Տեգի Խմբի Անունը"
         save: "Պահպանել"
         delete: "Ջնջել"
         confirm_delete: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս թեգի խումբը:"
@@ -2939,6 +2983,11 @@ hy:
       custom_message_template_forum: "Հեյ, Դուք պետք է միանաք այս ֆորումին!"
       custom_message_template_topic: "Հեյ, ես կարծում եմ, որ Ձեզ դուր կգա այս թեման!"
     forced_anonymous: "Չափազանց մեծ բեռնման շնորհիվ սա ժամանակավորապես ցուցադրվում է բոլորին այնպես, ինչպես այն կտեսներ դուրս գրված օգտատերը:"
+    footer_nav:
+      back: "Ետ"
+      forward: "Փոխանցել"
+      share: "Կիսվել"
+      dismiss: "Չեղարկել"
     safe_mode:
       enabled: "Անվտանգ ռեժիմը միացված է, փակեք բրաուզերի այս պատուհանը՝ անվտանգ ռեժիմից դուրս գալու համար:"
   admin_js:
@@ -2949,11 +2998,14 @@ hy:
       tags:
         remove_muted_tags_from_latest:
           always: "միշտ"
+          only_muted: "երբ օգտագործվում է ինքնուրույն կամ այլ խլացված տեգերով "
           never: "երբեք"
       reports:
         title: "Հասանելի հաշվետվությունների ցանկը"
       dashboard:
         title: "Կառավարման Հարթակ"
+        last_updated: "Կառավարման Հարթակի վերջին թարմացումը՝"
+        discourse_last_updated: "Discourse վերջին թարմացումը՝"
         version: "Տարբերակ"
         up_to_date: "Դուք ամենավերջին տարբերակն եք օգտագործում!"
         critical_available: "Հասանելի է կրիտիկական թարմացում:"
@@ -3017,19 +3069,25 @@ hy:
           view_table: "աղյուսակ"
           view_graph: "գրաֆիկ"
           refresh_report: "Թարմացնել Հաշվետվությունը"
+          dates: "Ամսաթվեր (UTC)"
           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>՝ տվյալներ հավաքելու համար:'
           filters:
+            file-extension:
+              label: Ֆայլի ընդլայնում
             group:
               label: Խումբ
             category:
               label: Կատեգորիա
+            include-subcategories:
+              label: "Ներառել Ենթակատեգորիաներ"
       commits:
         latest_changes: "Վերջին փոփոխությունները. խնդրում ենք ավելի հաճախ թարմացնել!"
         by: "կողմից"
@@ -3059,12 +3117,22 @@ hy:
             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: "%{count} օգտատերեը կավելացվեն խմբին՝ նոր էլ. հասցեով:"
             primary_group: "Ավտոմատ կիրառել որպես հիմնական խումբ"
         name_placeholder: "Խմբի անունը, առանց բացատների, նույնը, ինչ օգտանվան կանոնը"
         primary: "Հիմնական Խումբ"
@@ -3092,14 +3160,31 @@ hy:
         none: "Ակտիվ API Key այս պահին չկա:"
         user: "Օգտատեր"
         title: "API"
+        key: "Բանալի"
         created: Ստեղծված
         updated: Թարմացված
+        last_used: "Վերջին Օգտագործվածը "
+        never_used: (երբեք)
         generate: "Գեներացնել"
+        undo_revoke: "Ետարկել Հետկանչումը "
         revoke: "Հետ կանչել"
         all_users: "Բոլոր Օգտատերերը"
+        active_keys: "Ակտիվ API Բանալիներ "
+        manage_keys: Կառավարել Բանալիները
         show_details: Մանրամասներ
         description: Նկարագրություն
+        no_description: (նկարագրություն չկա)
+        all_api_keys: Բոլոր API Բանալիները
+        user_mode: Օգտատերերի Մակարդակ
+        impersonate_all_users: "Ներկայանալ որպես օգտատեր "
+        single_user: "Առանձին Օգտատեր "
+        user_placeholder: Մուտքագրեք օգտանունը
+        description_placeholder: "Ինչի՞ համար է օգտագործվելու այս բանալին:"
         save: Պահպանել
+        new_key: Նոր API Key
+        revoked: Հետկանչված
+        delete: Մշտապես Ջնջել
+        not_shown_again: "Այս բանալին՝ էլ երբեք չի ցուցադրվի: Համոզվեք, որ պատճենահանել եք՝ նախքան շարունակելը:"
         continue: Շարունակել
       web_hooks:
         title: "Webhook-ներ"
@@ -3153,12 +3238,15 @@ hy:
         tag_event:
           name: "Թեգի Իրադարձություն"
           details: "Երբ թեգ է ստեղծվում, թարմացվում կամ ջնջվում:"
-        flag_event:
-          name: "Դրոշակի Իրադարձություն"
-          details: "Երբ դրոշակ է ստեղծվում, ընդունվում է, չի ընդունվում կամ անտեսվում:"
-        queued_post_event:
-          name: "Գրառման Հաստատման Իրադարձություն"
-          details: "Երբ նոր սպասող գրառում է ստեղծվում, հաստատվում է կամ մերժվում:"
+        reviewable_event:
+          name: "Ամփոփիչ Իրադարձություն"
+          details: "Երբ նոր էլեմենտը պատրաստ է վերանայման, և երբ դրա կարգավիճակը թարմացվում է:"
+        notification_event:
+          name: "Ծանուցման Իրադարձություն"
+          details: "Երբ օգտատերը ծանուցումների ժապավենին նոր էլեմենտի ավելացման մասին ծանուցում է ստանում:"
+        user_badge_event:
+          name: "Կրծքանշանի Պարգևատրման Իրադարձություն"
+          details: "Երբ օգտատերը ստանում է կրծքանշան:"
         delivery_status:
           title: "Ուղարկման Կարգավիճակը"
           inactive: "Ոչ ակտիվ"
@@ -3285,6 +3373,7 @@ hy:
         new_style: "Նոր Ոճ"
         install: "Տեղադրել"
         delete: "Ջնջել"
+        delete_confirm: 'Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել <<%{theme_name}>> :'
         color: "Գույն"
         opacity: "Թափանցիկություն"
         copy: "Կրկնօրինակել"
@@ -3307,6 +3396,7 @@ hy:
           theme_name: "Թեմայի անվանում"
           component_name: "Բաղադրիչի անուն"
           themes_intro: "Ընտրել գոյություն ունեցող թեմա կամ տեղադրել նորը՝ մեկնարկի համար"
+          themes_intro_emoji: "կին արտիստ էմոջի"
           beginners_guide_title: "Discourse Թեմաների օգտագործման Սկսնակի ուղեցույց"
           developers_guide_title: " Discourse Թեմաների՝ Ծրագրավորողի ուղեցույց"
           browse_themes: "Դիտել համայնքի թեմաները"
@@ -3318,11 +3408,17 @@ hy:
           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: "Թաքցնել ընդլայնված դաշտերը"
@@ -3333,6 +3429,7 @@ hy:
           color_scheme_select: "Ընտրել թեմայի կողմից օգտագործվող գույները"
           custom_sections: "Մասնավոր բաժիններ՝ "
           theme_components: "Թեմայի Բաղադրիչները"
+          add_all_themes: "Ավելացնել բոլոր թեմաները"
           convert: "Փոխակերպել"
           convert_component_alert: "Դուք համոզվա՞ծ եք, որ ցանկանում եք փոխակերպել այս բաղադրիչը թեմայի: Այն որպես կոմպոնենտ կհեռացվի %{relatives} -ից:"
           convert_component_tooltip: "Փոխակերպել այս բաղադրիչը թեմայի"
@@ -3341,6 +3438,7 @@ hy:
           inactive_themes: "Ոչ ակտիվ թեմաներ՝ "
           inactive_components: "Չօգտագործված բաղադրիչներ՝"
           broken_theme_tooltip: "Այս թեման սխալներ ունի իր CSS-ում, HTML-ում կամ YAML-ում:"
+          disabled_component_tooltip: "Այս բաղադրիչը անջատված է"
           default_theme_tooltip: "Այս թեման կայքի լռելյայն թեման է"
           updates_available_tooltip: "Այս թեմայի համար հասանելի են թարմացումներ"
           and_x_more: "և ևս {{count}} հատ:"
@@ -3358,14 +3456,19 @@ hy:
           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: "Թեմա պարունակող ռեպոզիտորիա"
           import_web_advanced: "Ընդլայնված..."
+          import_file_tip: ".tar.gz, .zip, կամ .dcstyle.json ֆայլ, պարունակող թեման"
           is_private: "Թեման մասնավոր git ռեպոզիտորիայում է:"
           remote_branch: "Ճյուղի անունը (ըստ ցանկության)"
           public_key: "Շնորհել հետևյալ public key թույլտվություն ռեպոյին՝ "
@@ -3379,9 +3482,12 @@ hy:
           license: "Լիցենզիա"
           version: "Տարբերակ՝"
           authors: "Հեղինակ՝"
+          creator: "Ստեղծել է՝"
           source_url: "Աղբյուր"
           enable: "Միացնել"
           disable: "Անջատել"
+          disabled: "Այս բաղադրիչը անջատված է"
+          disabled_by: "Այս բաղադրիչը անջատված է եղել"
           required_version:
             error: "Այս թեման ավտոմատ կերպով անջատվել է, քանի որ այն համատեղելի չէ Discourse-ի այս տարբերակի հետ:"
             minimum: "Պահանջում է Discourse-ի {{version}} կամ ավելի բարձր տարբերակ:"
@@ -3401,6 +3507,7 @@ hy:
             other: "Թեման {{count}} commit ետ է!"
           compare_commits: "(Տեսնել նոր commit-ները)"
           repo_unreachable: "Հնարավոր չէ կապ հաստատել այս թեմայի Git ռեպոզիտորիայի հետ: Սխալի հաղորդագրությունը՝ "
+          imported_from_archive: "Այս թեման ներմուծվել է .zip ֆայլից"
           scss:
             text: "CSS"
             title: "Մուտքագրեք մասնավոր CSS, մենք ընդունում ենք բոլոր վավեր CSS և SCSS ոճերը"
@@ -3470,8 +3577,19 @@ hy:
           love:
             name: "սեր"
             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: "Կարգավորումներ"
@@ -3509,6 +3627,7 @@ hy:
         format: "Ֆորմատ"
         html: "html"
         text: "տեքստ"
+        html_preview: "Էլփոստի Բովանդակության Նախադիտում"
         last_seen_user: "Վերջին Այցելությունը՝ "
         no_result: "Ամփոփման համար արդյուքներ չեն գտնվել:"
         reply_key: "Պատասխանի Բանալին"
@@ -3650,6 +3769,21 @@ hy:
             web_hook_create: "webhook -ի ստեղծում"
             web_hook_update: "webhook -ի թարմացում"
             web_hook_destroy: "webhook -ի ոչնչացում"
+            web_hook_deactivate: "webhook -ի ապակտիվացում"
+            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: "էջի հրատարակումը չեղարկված է"
         screened_emails:
           title: "Ցուցադրված Էլ. հասցեները"
           description: "Երբ որևէ մեկը փորձի ստեղծել նոր հաշիվ, հետևյալ էլ. հասցեները կստուգվեն, և գրանցումը կարգելափոկվի, կամ կկատարվի մեկ այլ գործողություն:"
@@ -3698,8 +3832,13 @@ hy:
         search: "որոնում"
         clear_filter: "Ջնջել"
         show_words: "ցուցադրել բառերը"
+        one_word_per_line: "Մեկ բառ յուրաքանչյուր տողի համար"
         download: Ներբեռնել
         clear_all: Ջնջել Բոլորը
+        clear_all_confirm_block: "Համոզվա՞ծ եք, որ ցանկանում եք հեռացնել դիտված բոլոր բառերը, որոնք օգտագործվել են հաղորդագրությունների Արգելափակման ժամանակ:"
+        clear_all_confirm_censor: "Համոզվա՞ծ եք, որ ցանկանում եք հեռացնել դիտված բոլոր բառերը, որոնք օգտագործվել են հաղորդագրությունների Գրաքննության ժամանակ: "
+        clear_all_confirm_flag: "Համոզվա՞ծ եք, որ ցանկանում եք հեռացնել դիտված բոլոր բառերը, որոնք օգտագործվել են հաղորդագրությունների Գնահատման ժամանակ և նշվել որպես անընդունելի: "
+        clear_all_confirm_require_approval: "Համոզվա՞ծ եք, որ ցանկանում եք հեռացնել դիտված բոլոր բառերը, որոնք օգտագործվել են հաղորդագրությունների Գնահատման ժամանակ և Պահանջել Հաստատում:"
         word_count:
           one: "%{count} բառ"
           other: "%{count} բառ"
@@ -3720,9 +3859,13 @@ hy:
           add: "Ավելացնել"
           success: "Հաջողություն"
           exists: "Արդեն գոյություն ունի"
+          upload: "Վերբեռնել ֆայլից"
           upload_successful: "Վերբեռնումը հաջող էր: Բառերն ավելացվել են:"
         test:
           button_label: "Փորձարկել"
+          modal_title: "Թեստ '%{action}' Դիտված Բառեր"
+          description: "Մուտքագրեք տեքստը ներքևում՝ դիտված բառերի համընկնումները ստուգելու համար"
+          found_matches: "Գտնված համընկնումներ՝ "
           no_matches: "Համընկնումներ չեն գտնվել"
       impersonate:
         title: "Նմանակել"
@@ -3791,6 +3934,7 @@ hy:
         delete_posts_failed: "Գրառումները ջնջելիս խնդիր է առաջացել:"
         penalty_post_actions: "Ինչպե՞ս եք ցանկանում վարվել կապակցված գրառման հետ:"
         penalty_post_delete: "Ջնջել գրառումը"
+        penalty_post_delete_replies: "Ջնջել գրառումը + պատասխանները"
         penalty_post_edit: "Խմբագրել գրառումը"
         penalty_post_none: "Ոչինչ չանել"
         penalty_count: "Տուգանքների Քանակը"
@@ -3847,10 +3991,29 @@ hy:
         anonymize_failed: "Հաշիվը անվանազրկելիս առաջացել է խնդիր:"
         delete: "Ջնջել Օգտատիրոջը"
         merge:
+          button: "Միավորել օգտատերերին"
           prompt:
+            title: "Միավորել կայքի բովանդակությունը և Ջնջել օգտատերերին @%{username}"
+            description: |2
+               <p> Խնդրում ենք ընտրել նոր սեփականատեր օգտատիրոջ կայքի բովանդակության համար <b>@%{username}</b>.</p>
+
+              <p> Բոլոր թեմաները, գրառումները, անձնական նամակներն ու կայքի այլ բովանդակությունը, որոնք ստեղծվել են օգտատիրոջ կողմից <b>@%{username}</b> փոխանցվեն նոր սեփականտիրոջը: </p>
+            target_username_placeholder: "նոր սեփականատիրոջ Օգտանունը"
+            transfer_and_delete: "Միավորել կայքի բովանդակությունը և Ջնջել օգտատերերին @%{username}"
             cancel: "Չեղարկել"
           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: "Չհաջողվեց ջնջել ադմինների և մոդերատորների բոլոր գրառումները:"
         delete_forbidden:
@@ -3894,6 +4057,7 @@ hy:
           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: "վստահության մակարդակը արգելափակված է, համակարգը չի խթանի կամ խանգարի օգտատիրոջը"
@@ -3920,6 +4084,8 @@ hy:
           likes_received: "Ստացած Հավանումները"
           likes_received_days: "Ստացված Հավանումները. եզակի օրեր"
           likes_received_users: "Ստացված Հավանումները. եզակի օգտատերեր"
+          suspended: "Սառեցված (վերջին 6 ամսում)"
+          silenced: "Լռեցված (վերջին 6 ամսում)"
           qualifies: "Արժանի է վստահության 3-րդ մակարդակի"
           does_not_qualify: "Արժանի չէ վստահության 3-րդ մակարդակի"
           will_be_promoted: "Շուտով մակարդակը կբարձրացվի"
@@ -3990,6 +4156,7 @@ hy:
         clear_filter: "Ջնջել"
         add_url: "ավելացնել URL"
         add_host: "ավելացնել հոսթ"
+        add_group: "ավելացնել խումբ"
         uploaded_image_list:
           label: "Խմբագրել ցանկը"
           empty: "Նկարներ դեռևս չկան: Խնդրում ենք վերբեռնել:"
@@ -4001,6 +4168,7 @@ hy:
         categories:
           all_results: "Ամբողջը"
           required: "Պարտադիր"
+          branding: "Բրենդինգ"
           basic: "Հիմնական Կարգավորումները"
           users: "Օգտատերեր"
           posting: "Հրապարակում"
@@ -4029,7 +4197,9 @@ hy:
         secret_list:
           invalid_input: "Ներմուծման դաշտերը չեն կարող լինել դատարկ կամ պարունակել ուղղահայաց գիծ ( | ) սիմվոլ:"
         default_categories:
+          modal_description: "Ցանկանաու՞մ եք այս փոփոխությունը կիրառել պատմականորեն: Սա կփոխի կարգավորումը %{count} համար՝ առկա օգտատերերի:"
           modal_yes: "Այո"
+          modal_no: "Ոչ, կիրառել փոփոխություններ միայն՝ ապագայում "
       badges:
         title: Կրծքանշաններ
         new_badge: Նոր Կրծքանշան
@@ -4066,6 +4236,7 @@ hy:
         enabled: Միացնել կրծքանշանը
         icon: Պատկերակ
         image: Նկար
+        icon_help: "Մուտքագրեք Font Awesome պատկերակի անունը (օգտագործեք 'far-' նախածանցը՝ սովորական և 'fab-' ՝ բրենդային պատկերակների համար): \n "
         image_help: "Մուտքագրեք նկարի URL-ը (վերասահմանում է պատկերակի դաշտը, եթե երկուսն ել հաստատված են)"
         query: Կրծքանշանի Հարցում (SQL)
         target_posts: Հարցման նպատակային գրառումներ
@@ -4100,8 +4271,18 @@ hy:
             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: "Վերբեռնեք <b>CSV</b> օգտատիրոջ էլ. հասցեով կամ օգտանունով "
+          aborted: "Խնդրում ենք վերբեռնել <b>CSV</b> , օգտատիրոջ էլ. հասցեով կամ օգտանունով:"
+          success: "CSV վերբեռնվել է, և շուտով օգտատերերը կստանան իրենց կրծքանշանը:"
+          replace_owners: "Հեռացնել նախորդ սեփականատիրոջ կրծքանշանը "
       emoji:
         title: "Էմոջի"
         help: "Ավելացրեք նոր էմոջի, որը հասանելի կլինի բոլորին: (ՀՈՒՇՈՒՄ՝ քաշեք և գցեք բազմակի ֆայլեր միանգամից)"
@@ -4109,6 +4290,7 @@ hy:
         name: "Անուն"
         group: "Խումբ"
         image: "Նկար"
+        alt: "մասնավոր էմոջիի նախնական դիտում "
         delete_confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել :%{name}: էմոջին:"
       embedding:
         get_started: "Եթե Դուք ցանկանում եք զետեղել Discourse-ը մեկ այլ կայքում, սկսեք նրա հոսթի ավելացմամբ:"
@@ -4128,12 +4310,14 @@ hy:
         embed_post_limit: "Զետեղման ենթակա գրառումների առավելագույն քանակը"
         embed_title_scrubber: "Գրառումների վերնագրի զտման համար օգտագործվող regular expression"
         embed_truncate: "Կրճատել զետեղված գրառումները"
+        embed_unlisted: "Ներմուծվող թեմաները կցուցադրվեն թեմաների ցանկում միայն՝ պատասխանն ավելացնելուց հետո: "
         embed_whitelist_selector: "CSS սելեկտոր այն տարրերի համար, որոնք թույլատրված են զետեղումների մեջ"
         embed_blacklist_selector: "CSS սելեկտոր այն տարրերի համար, որոնք հեռացվում են զետեղումներից"
         embed_classname_whitelist: "Թույլատրված CSS կլասների անվանումներ"
         save: "Պահպանել Զետեղման Կարգավորումները"
       permalink:
         title: "Մշտահղումներ"
+        description: "Վերահղումները, որոնք կիրառվում են URL համար, ֆորումին հայտնի չեն: "
         url: "URL"
         topic_id: "Թեմայի ID"
         topic_title: "Թեմա"
@@ -4142,6 +4326,7 @@ hy:
         category_id: "Կատեգորիայի ID"
         category_title: "Կատեգորիա"
         external_url: "Արտաքին URL"
+        destination: "Նպատակներ "
         delete_confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս մշտահղումը:"
         form:
           label: "Նոր՝ "
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 4a0bdca64c..e2a95bc2b6 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -592,7 +592,6 @@ id:
         muted:
           title: "meredam"
           description: "Anda tidak akan diberi tahu apa pun tentang pesan di grup ini."
-      flair_url_placeholder: "(Opsional) URL Gambar atau kelas Font Awesome"
       flair_bg_color_placeholder: "(Opsional) Nilai warna dalam Hex"
       flair_color_placeholder: "(Opsional) Nilai warna dalam Hex"
       flair_preview_icon: "Pratinjau Ikon"
@@ -815,9 +814,11 @@ id:
         name: "Nama"
         label: "Kode"
         show_key_description: "Masukkan secara manual"
+        disable: "Nonaktifkan"
+        save: "Simpan"
         edit: "Ubah"
         security_key:
-          delete: "Hapus"
+          save: "Simpan"
       change_about:
         title: "Ganti Tentang Saya"
         error: "Ada kesalahan saat mengganti nilai ini"
@@ -1327,6 +1328,8 @@ id:
         title: "Arsip"
       move_to_inbox:
         title: "Pindah ke Kotak Masuk"
+      edit_message:
+        title: "Ubah"
       list: "Topik"
       new: "topik baru"
       new_topics:
@@ -1540,6 +1543,8 @@ id:
           new: "Anda tidak memiliki topik baru"
         bottom:
           new: "Tidak ada topik baru lagi"
+    footer_nav:
+      dismiss: "Bubar"
   admin_js:
     type_to_filter: "ketik untuk memfilter..."
     admin:
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index b96275bd04..e376100dd7 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -153,7 +153,7 @@ it:
         disabled: "delistato %{when}"
       banner:
         enabled: "lo ha reso un annuncio il %{when}. Apparirà in cima ad ogni pagina finché non verrà chiuso dall'utente. "
-        disabled: "ha rimosso questo banner il %{when}. Non apparirà più in cima ad ogni pagina."
+        disabled: "ha rimosso questo annuncio il %{when}. Non apparirà più in cima ad ogni pagina."
       forwarded: "inoltrato l'email qui sopra"
     topic_admin_menu: "azioni argomento"
     wizard_required: "Benvenuto al tuo nuovo Discourse! Inizia la <a href='%{url}' data-auto-route='true'>procedura guidata di configurazione</a> ✨"
@@ -264,7 +264,10 @@ it:
         unbookmark: "Clicca per rimuovere tutti i segnalibri a questo argomento"
         unbookmark_with_reminder: "Fare clic per rimuovere tutti i segnalibri e i promemoria in questo argomento. Hai un promemoria impostato %{reminder_at} per questo argomento."
     bookmarks:
+      created: "hai aggiunto questo messaggio ai segnalibri %{name}"
       not_bookmarked: "aggiungi ai segnalibri"
+      created_with_reminder: "hai aggiunto ai segnalibri questo messaggio con un promemoria %{date}%{name}"
+      created_with_at_desktop_reminder: "hai aggiunto ai segnalibri questo messaggio e ti verrà ricordato la prossima volta che sarai sul desktop%{name}"
       remove: "Rimuovi Segnalibro"
       delete: "Cancella Segnalibro"
       confirm_delete: "Sicuro di voler eliminare questo segnalibro? Anche il promemoria verrà eliminato."
@@ -273,6 +276,7 @@ it:
       no_timezone: 'Non hai ancora impostato un fuso orario. Non sarai in grado di impostare promemoria. Creane uno <a href="%{basePath}/my/preferences/profile">nel tuo profilo</a> .'
       invalid_custom_datetime: "La data e l'ora fornite non sono valide, riprova."
       list_permission_denied: "Non sei autorizzato a visualizzare i segnalibri di questo utente."
+      delete_when_reminder_sent: "Elimina questo segnalibro quando viene inviata la notifica del promemoria."
       reminders:
         at_desktop: "La prossima volta che sarò al mio desktop"
         later_today: "Più tardi oggi"
@@ -289,6 +293,8 @@ it:
         tomorrow_with_time: "domani alle %{time}"
         at_time: "a %{date_time}"
         existing_reminder: "È stato impostato un promemoria per questo segnalibro che verrà inviato"
+    copy_codeblock:
+      copied: "copiato!"
     drafts:
       resume: "Riprendi"
       remove: "Rimuovi"
@@ -673,14 +679,16 @@ it:
           title: "Silenziato"
           description: "Non verrai avvertito di nulla riguardo ai messaggi in questo gruppo."
       flair_url: "Immagine Avatar Flair"
-      flair_url_placeholder: "(Facoltativo) URL Immagine o classe Font Awesome"
-      flair_url_description: 'Usa immagini quadrate non più piccole di 20px per 20px o icone FontAwesome (formati accettati: "fa-icon", "far fa-icon" o "fab fa-icon").'
+      flair_upload_description: "Usa immagini quadrate non inferiori a 20px per 20px."
       flair_bg_color: "Colore Sfondo Avatar Flair"
       flair_bg_color_placeholder: "(Facoltativo) Codice esadecimale del colore"
       flair_color: "Colore Avatar Flair"
       flair_color_placeholder: "(Facoltativo) Codice esadecimale del colore"
       flair_preview_icon: "Anteprima Icona"
       flair_preview_image: "Anteprima Immagine"
+      flair_type:
+        icon: "Seleziona un'icona"
+        image: "Carica un'immagine"
     user_action_groups:
       "1": "Mi piace - Assegnati"
       "2": "Mi piace - Ricevuti"
@@ -742,6 +750,7 @@ it:
       copied: "copiato"
     user_fields:
       none: "(scegli un'opzione)"
+      required: 'Inserisci un valore per "%{name}"'
     user:
       said: "{{username}}:"
       profile: "Profilo"
@@ -757,6 +766,7 @@ it:
       private_messages: "Messaggi"
       user_notifications:
         filters:
+          filter_by: "Filtra per"
           all: "Tutti"
           read: "Letti"
           unread: "Non letti"
@@ -877,6 +887,7 @@ it:
       api_approved: "Approvato:"
       api_last_used_at: "Ultimo utilizzo:"
       theme: "Tema"
+      save_to_change_theme: 'Il tema verrà aggiornato dopo aver cliccato su "%{save_text}"'
       home: "Home Page Predefinita"
       staged: "Temporaneo"
       staff_counters:
@@ -924,8 +935,10 @@ it:
         enable: "Abilita"
         enable_long: "Abilita codici di backup"
         manage: "Gestisci i codici di backup. Hai <strong>{{count}}</strong> codici di backup rimanenti."
-        copied_to_clipboard: "Copiato nella Clipboard"
+        copy_to_clipboard: "Copia negli Appunti"
         copy_to_clipboard_error: "Errore durante la copia nella Clipboard"
+        copied_to_clipboard: "Copiato nella Clipboard"
+        download_backup_codes: "Scarica i codici di backup"
         remaining_codes: "Ti sono rimasti <strong>{{count}}</strong> codici di backup."
         use: "Usa un codice di backup"
         enable_prerequisites: "È necessario abilitare un secondo fattore primario prima di generare codici di backup."
@@ -951,29 +964,30 @@ it:
         oauth_enabled_warning: "Tieni presente che gli accessi ai social network saranno disabilitati dopo aver attivato l'autenticazione a due fattori nel tuo account."
         use: "Usa l'app Authenticator"
         enforced_notice: "E' obbligatorio abilitare l'autenticazione a due fattori per accedere a questo sito."
-        disable: "disabilita"
-        disable_title: "Disabilita Secondo Fattore"
+        disable: "Disabilita"
         disable_confirm: "Sei sicuro di voler disabilitare tutti i secondi fattori?"
+        save: "Salva"
         edit: "Modifica"
         edit_title: "Modifica secondo fattore"
         edit_description: "Nome del secondo fattore"
-        enable_security_key_description: "Quando la chiave di sicurezza fisica è pronta, premi il pulsante Registra qui sotto."
+        enable_security_key_description: |
+          Quando <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">la chiave di sicurezza hardware</a> è pronta, premi il pulsante Registra di seguito.
         totp:
           title: "Authenticator basati su Token"
-          add: "Nuovo Authenticator"
+          add: "Aggiungi Authenticator"
           default_name: "Il mio Authenticator"
           name_and_code_required_error: "Devi fornire un nome e il codice dalla tua app di autenticazione."
         security_key:
           register: "Registrare"
-          title: "Security Keys"
-          add: "Registra Security Key"
-          default_name: "Security Key principale"
-          not_allowed_error: "Il processo di registrazione della Security Key è scaduto o è stato annullato."
-          already_added_error: "Hai già registrato questa Security Key. Non è necessario registrarla di nuovo."
-          edit: "Modifica Security Key"
-          edit_description: "Nome Security Key"
-          delete: "Elimina"
-          name_required_error: "Devi fornire un nome per la Security Key"
+          title: "Chiave di Sicurezza"
+          add: "Modifica Chiave di Sicurezza"
+          default_name: "Chiave di Sicurezza principale"
+          not_allowed_error: "Il processo di registrazione della Chiave di Sicurezza è scaduto o è stato annullato."
+          already_added_error: "Hai già registrato questa Chiave di Sicurezza. Non è necessario registrarla di nuovo."
+          edit: "Modifica Chiave di Sicurezza"
+          save: "Salva"
+          edit_description: "Nome Chiave di Sicurezza"
+          name_required_error: "Devi fornire un nome per la Chiave di Sicurezza"
       change_about:
         title: "Modifica i dati personali"
         error: "Si è verificato un errore durante la modifica del valore."
@@ -1016,6 +1030,7 @@ it:
         sso_override_instructions: "L'email può essere aggiornata dal provider SSO."
         instructions: "Mai mostrato pubblicamente"
         ok: "Ti invieremo una email di conferma"
+        required: "Inserisci un indirizzo email"
         invalid: "Inserisci un indirizzo email valido"
         authenticated: "{{provider}} ha autenticato la tua email"
         frequency_immediately: "Ti invieremo immediatamente una email se non hai letto ciò per cui ti stiamo scrivendo."
@@ -1036,6 +1051,7 @@ it:
         title: "Nome"
         instructions: "il tuo nome completo (opzionale)"
         instructions_required: "Il tuo nome completo"
+        required: "Inserisci un nome"
         too_short: "Il nome è troppo breve"
         ok: "Il nome sembra adeguato"
       username:
@@ -1049,6 +1065,7 @@ it:
         too_long: "Il nome utente è troppo lungo"
         checking: "Controllo la disponibilità del nome utente..."
         prefilled: "L'email corrisponde al nome utente registrato"
+        required: "Inserisci un nome utente"
       locale:
         title: "Lingua dell'interfaccia"
         instructions: "Lingua dell'interfaccia utente. Cambierà quando aggiornerai la pagina."
@@ -1192,6 +1209,7 @@ it:
         same_as_email: "La password coincide con l'email."
         ok: "La password è adeguata"
         instructions: "almeno %{count} caratteri"
+        required: "Inserisci una password"
       summary:
         title: "Riepilogo"
         stats: "Statistiche"
@@ -1398,10 +1416,10 @@ it:
       second_factor_backup_title: "Backup Due Fattori"
       second_factor_backup_description: "Per favore, inserisci uno dei tuoi codici di backup:"
       second_factor: "Accedi utilizzando l'app Authenticator"
-      security_key_description: "Quando hai preparato la chiave di sicurezza fisica, premi il pulsante Autentica con Security Key qui sotto."
+      security_key_description: "Quando hai preparato la chiave di sicurezza fisica, premi il pulsante Autentica con Chiave di Sicurezza qui sotto."
       security_key_alternative: "Prova in un altro modo"
-      security_key_authenticate: "Autentica con Security Key"
-      security_key_not_allowed_error: "Il processo di autenticazione con Security Key è scaduto o è stato annullato."
+      security_key_authenticate: "Autentica con Chiave di Sicurezza"
+      security_key_not_allowed_error: "Il processo di autenticazione con Chiave di Sicurezza è scaduto o è stato annullato."
       security_key_no_matching_credential_error: "Non è stato possibile trovare credenziali corrispondenti nella chiave di sicurezza fornita."
       security_key_support_missing_error: "Il tuo dispositivo o browser attuale non supporta l&#39;uso di chiavi di sicurezza. Si prega di utilizzare un altro metodo."
       email_placeholder: "email o nome utente"
@@ -1908,7 +1926,7 @@ it:
         help: "Sposta il messaggio di nuovo nella posta in arrivo"
       edit_message:
         help: "Modifica la prima versione del Messaggio"
-        title: "Modifica Messaggio"
+        title: "Modifica"
       defer:
         help: "Contrassegna come non letto"
         title: "Rinvia"
@@ -2062,6 +2080,7 @@ it:
           "2_8": "Vedrai un conteggio delle nuove risposte perché stai seguendo questa categoria."
           "2_4": "Vedrai un conteggio delle nuove risposte perché hai pubblicato una risposta in questo argomento."
           "2_2": "Vedrai un conteggio delle nuove risposte perché stai seguendo questo argomento."
+          "2": 'Vedrai un conteggio delle nuove risposte perché hai <a href="{{basePath}}/u/{{username}}/preferences/notifications">letto questo argomento</a>.'
           "1_2": "Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde."
           "1": "Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde."
           "0_7": "Stai ignorando tutte le notifiche di questa categoria."
@@ -2156,7 +2175,7 @@ it:
         already_pinned_globally:
           one: "Argomenti attualmente appuntati globalmente: <strong class='badge badge-notification unread'>%{count}</strong>"
           other: "Argomenti attualmente appuntati globalmente: <strong class='badge badge-notification unread'>{{count}}</strong>"
-        make_banner: "Rendi questo argomento uno striscione che apparirà in cima a tutte le pagine."
+        make_banner: "Rendi questo argomento un annuncio che apparirà in cima a tutte le pagine."
         remove_banner: "Rimuovi lo striscione che appare in cima a tutte le pagine."
         banner_note: "Gli utenti possono nascondere l'annuncio chiudendolo. Solo un argomento per volta può diventare un annuncio."
         no_banner_exists: "Non c'è alcun argomento annuncio."
@@ -2553,6 +2572,7 @@ it:
       email_in_disabled_click: 'abilita l''impostazione "email entrante".'
       mailinglist_mirror: "La categoria si comporta come una mailing list"
       show_subcategory_list: "Mostra la lista delle sottocategorie sopra agli argomenti in questa categoria."
+      read_only_banner: "Testo dell'annuncio quando un utente non può creare un argomento in questa categoria:"
       num_featured_topics: "Numero degli argomenti mostrati nella pagina categorie:"
       subcategory_num_featured_topics: "Numero degli argomenti in evidenza nella pagina della categoria superiore"
       all_topics_wiki: "Rendi i nuovi argomenti automaticamente delle wiki"
@@ -2793,7 +2813,7 @@ it:
         this_month: "Mese"
         this_week: "Settimana"
         today: "Oggi"
-        other_periods: "vedi argomenti di punta"
+        other_periods: "vedi argomenti di punta:"
     browser_update: 'Sfortunatamente <a href="https://www.discourse.org/faq/#browser">il tuo browser è troppo obsoleto per funzionare su questo sito</a>. <a href="https://browsehappy.com">Aggiorna il tuo browser</a> per visualizzare contenuti multimediali, accedere e rispondere.'
     permission_types:
       full: "Crea / Rispondi / Visualizza"
@@ -3039,6 +3059,11 @@ it:
       custom_message_template_forum: "Ehi, unisciti a questo forum!"
       custom_message_template_topic: "Ehi, credo che questo argomento ti possa interessare!"
     forced_anonymous: "A causa del carico eccessivo, il sito viene ora mostrato a tutti come lo vedrebbe un utente non connesso."
+    footer_nav:
+      back: "Indietro"
+      forward: "Inoltra"
+      share: "Condividi"
+      dismiss: "Ignora"
     safe_mode:
       enabled: "La modalità sicura è attiva, per disattivarla chiudi il browser"
   admin_js:
@@ -3289,12 +3314,6 @@ it:
         tag_event:
           name: "Evento di Etichetta"
           details: "Quando un'Etichetta viene creata, aggiornata o distrutta."
-        flag_event:
-          name: "Evento di Segnalazione"
-          details: "Quando una segnalazione viene creata, approvata, rifiutata o ignorata."
-        queued_post_event:
-          name: "Evento approvazione messaggio"
-          details: "Quando un nuovo messaggio accodato viene creato, approvato o respinto."
         reviewable_event:
           name: "Evento revisionabile"
           details: "Quando un nuovo elemento è pronto per la revisione e quando il suo stato viene aggiornato."
@@ -3473,6 +3492,9 @@ it:
           settings: "Impostazioni"
           translations: "Traduzioni"
           extra_scss: "Extra SCSS"
+          extra_files: "File extra"
+          extra_files_upload: "Esporta il tema per visualizzare questi file."
+          extra_files_remote: "Esporta il tema o controlla il repository git per visualizzare questi file."
           preview: "Anteprima"
           show_advanced: "Mostra campi avanzati"
           hide_advanced: "Nascondi campi avanzati"
@@ -3536,6 +3558,7 @@ it:
           license: "Licenza"
           version: "Versione:"
           authors: "Creato da:"
+          creator: "Creato da:"
           source_url: "Fonte"
           enable: "Abilita"
           disable: "Disabilita"
@@ -4044,7 +4067,7 @@ it:
         anonymize_failed: "Si è verificato un problema nel rendere anonimo l'account."
         delete: "Cancella utente"
         merge:
-          transfer_and_delete: "Trasferisci ed Elimina"
+          button: "Unisci"
           prompt:
             title: "Trasferisci ed Elimina @%{username}"
             description: |
@@ -4062,6 +4085,7 @@ it:
               <p><b>Questa azione non può essere annullata!</b></p>
 
               <p>Per continuare digitare: <code>%{text}</code></p>
+            text: "trasferire @%{username} a @%{targetUsername}"
             transfer_and_delete: "Trasferisci ed Elimina @%{username}"
             cancel: "Annulla"
         merging_user: "Unione utente in corso..."
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 7b3d2294a7..c433965c4b 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -562,14 +562,14 @@ ja:
           title: "ミュート"
           description: "このグループのすべてのメッセージを通知しません。"
       flair_url: "アバター画像"
-      flair_url_placeholder: "(オプション) 画像URL or Font Awesomeのクラス名"
-      flair_url_description: '20ピクセルx 20ピクセル以上の正方形の画像またはFontAwesomeアイコン（使用可能な形式： "fa-icon"、 "far fa-icon"、または "fab fa-icon"）を使用します。'
       flair_bg_color: "アバターの背景色"
       flair_bg_color_placeholder: "(オプション) HEXカラー値"
       flair_color: "アバター色"
       flair_color_placeholder: "(オプション) HEXカラー値"
       flair_preview_icon: "アイコンプレビュー"
       flair_preview_image: "画像プレビュー"
+      flair_type:
+        image: "画像のアップロード"
     user_action_groups:
       "1": "「いいね！」 "
       "2": "「いいね！」 された"
@@ -791,8 +791,8 @@ ja:
         disable: "利用できません"
         enable: "利用できます"
         enable_long: "バックアップコードを有効にします"
-        copied_to_clipboard: "クリップボードにコピーしました"
         copy_to_clipboard_error: "クリップボードにコピーする際にエラーが発生しました"
+        copied_to_clipboard: "クリップボードにコピーしました"
         remaining_codes: "<strong>{{count}}</strong> 個のバックアップコードが残っています。"
         use: "バックアップコードを使用"
         codes:
@@ -805,9 +805,11 @@ ja:
         show_key_description: "手動入力"
         oauth_enabled_warning: "アカウントで2段階認証が有効になると、ソーシャルログインは無効になります。"
         enforced_notice: "このサイトにアクセスするには2段階認証を有効にする必要があります。"
+        disable: "利用できません"
+        save: "保存"
         edit: "編集"
         security_key:
-          delete: "削除する"
+          save: "保存"
       change_about:
         title: "プロフィールを変更"
         error: "変更中にエラーが発生しました。"
@@ -1550,7 +1552,7 @@ ja:
         help: "受信ボックスへメッセージを戻しました"
       edit_message:
         help: "メッセージの最初の投稿を編集"
-        title: "メッセージを編集"
+        title: "編集"
       defer:
         title: "取り下げる"
       list: "トピック"
@@ -2209,7 +2211,6 @@ ja:
         this_month: "月"
         this_week: "週"
         today: "今日"
-        other_periods: "次の期間のトピックを見る"
     permission_types:
       full: "作成 / 返信 / 閲覧"
       create_post: "返信 / 閲覧"
@@ -2349,6 +2350,10 @@ ja:
     invite:
       custom_message: "<a href>カスタムメッセージ</a>を作成して、あなたの招待状をもう少し個人的なものにします。"
       custom_message_placeholder: "メッセージを入力"
+    footer_nav:
+      back: "戻る"
+      share: "共有"
+      dismiss: "閉じる"
   admin_js:
     type_to_filter: "設定項目を検索..."
     admin:
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 60b18e1aa4..8f6c833367 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -632,8 +632,6 @@ ko:
           title: "알림 : 끔"
           description: "이 그룹의 메시지에 대한 알림을받지 않습니다."
       flair_url: "아바타 플레어 이미지"
-      flair_url_placeholder: "(선택) 이미지 URL 또는 Font Awesome 아이콘 클래스"
-      flair_url_description: '20px x 20px 이상의 FontAwesome 아이콘 (허용되는 형식 : &quot;fa-icon&quot;, &quot;far fa-icon&quot;또는 &quot;fab fa-icon&quot;)을 사용하십시오.'
       flair_bg_color: "아바타 플레어 배경 색상"
       flair_bg_color_placeholder: "(선택사항) 16진수 컬러 값"
       flair_color: "아바타 플레어 색상"
@@ -878,8 +876,9 @@ ko:
         enable: "설정"
         enable_long: "백업 코드 사용"
         manage: "백업 코드를 관리하십시오. 남아있는 <strong>{{count}}</strong> 백업 코드가 있습니다."
-        copied_to_clipboard: "클립보드에 복사됨"
+        copy_to_clipboard: "클립보드에 복사하기"
         copy_to_clipboard_error: "데이터를 클립보드에 복사하는데 오류가 발생했습니다."
+        copied_to_clipboard: "클립보드에 복사됨"
         remaining_codes: "남아있는 <strong>{{count}}</strong> 백업 코드가 있습니다."
         use: "백업 코드 사용"
         enable_prerequisites: "백업 코드를 생성하기 전에 기본 두 번째 요소를 활성화해야합니다."
@@ -899,28 +898,25 @@ ko:
         oauth_enabled_warning: "계정에서 2 단계 인증이 활성화되면 소셜 로그인이 비활성화됩니다."
         use: "인증 기 앱 사용"
         enforced_notice: "이 사이트에 액세스하기 전에 2 단계 인증을 활성화해야합니다."
-        disable: "비활성화"
-        disable_title: "두 번째 요소 비활성화"
+        disable: "해제"
         disable_confirm: "두 번째 요소를 모두 비활성화 하시겠습니까?"
+        save: "저장"
         edit: "수정"
         edit_title: "두 번째 요소 편집"
         edit_description: "두 번째 요인 이름"
-        enable_security_key_description: "물리적 보안 키가 준비되면 아래의 등록 버튼을 누릅니다."
         totp:
           title: "토큰 기반 인증 자"
-          add: "새로운 인증 자"
           default_name: "내 인증 자"
           name_and_code_required_error: "인증 자 앱에서 이름과 코드를 제공해야합니다."
         security_key:
           register: "등록하기"
           title: "보안 키"
-          add: "보안 키 등록"
           default_name: "기본 보안 키"
           not_allowed_error: "보안 키 등록 프로세스가 시간 초과되었거나 취소되었습니다."
           already_added_error: "이 보안 키를 이미 등록했습니다. 다시 등록 할 필요가 없습니다."
           edit: "보안 키 편집"
+          save: "저장"
           edit_description: "보안 키 이름"
-          delete: "삭제"
           name_required_error: "보안 키의 이름을 제공해야합니다."
       change_about:
         title: "내 소개 변경"
@@ -1823,7 +1819,7 @@ ko:
         help: "메시지를 편지함으로 되돌리기"
       edit_message:
         help: "메시지의 첫 번째 게시물 수정"
-        title: "메시지 수정"
+        title: "수정"
       defer:
         help: "읽지 않은 상태로 표시"
         title: "연기"
@@ -2645,7 +2641,6 @@ ko:
         this_month: "월"
         this_week: "주"
         today: "오늘"
-        other_periods: "상단 보기"
     permission_types:
       full: "생성 / 답글 / 보기"
       create_post: "답글 / 보기"
@@ -2864,6 +2859,10 @@ ko:
       custom_message_template_forum: "저기요, 이 포럼에 가입하셔야 해요!"
       custom_message_template_topic: "이 토픽에 흥미 있을 거 같은데요!"
     forced_anonymous: "극단적 인로드로 인해 로그 아웃 한 사용자가 볼 수있는 것처럼 모든 사람에게 일시적으로 표시됩니다."
+    footer_nav:
+      back: "이전"
+      share: "공유"
+      dismiss: "해지"
     safe_mode:
       enabled: "안전모드가 활성화 되었습니다. 안전모드를 종료하려면 이 웹브라우저창을 닫아야 합니다."
   admin_js:
@@ -3111,12 +3110,6 @@ ko:
         tag_event:
           name: "태그 이벤트"
           details: "태그가 생성, 업데이트 또는 파괴 될 때."
-        flag_event:
-          name: "신고 이벤트"
-          details: "플래그가 생성, 동의, 동의 또는 무시 될 때"
-        queued_post_event:
-          name: "승인 후 이벤트"
-          details: "대기중인 새 게시물이 작성되면 승인 또는 거부됩니다."
         reviewable_event:
           name: "검토 가능한 이벤트"
           details: "새 항목을 검토 할 준비가되었고 상태가 업데이트 될 때"
@@ -3862,7 +3855,6 @@ ko:
         anonymize_failed: "There was a problem anonymizing the account."
         delete: "사용자 삭제"
         merge:
-          transfer_and_delete: "전송 및 삭제"
           prompt:
             title: "전송 및 삭제 @ %{username}"
             target_username_placeholder: "새로운 소유자의 사용자 이름"
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 918f0e067c..af21556184 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -526,7 +526,6 @@ lt:
         muted:
           title: "Nutildytos"
       flair_url: "Avatar Flair paveiksliukas"
-      flair_url_placeholder: "(Pasirinktinai) Vaizdo URL arba \"Font Awesome\" klasė"
       flair_bg_color: "Avatar Flair fono splva"
       flair_bg_color_placeholder: "(Pasirinktinai) Hex spalva"
       flair_color: "Avatar Flair spalva"
@@ -734,8 +733,8 @@ lt:
         regenerate: "Pergeneruoti"
         disable: "Išjungti"
         enable: "Įgalinti"
-        copied_to_clipboard: "Nukopijuota į iškirptę"
         copy_to_clipboard_error: "Klaida kopijuojant duomenis į iškarpinę"
+        copied_to_clipboard: "Nukopijuota į iškirptę"
         remaining_codes: "Jūs turite <strong>{{count}}</strong> atsarginiai kodai."
         codes:
           title: "Sukurta atsarginių kopijų kodai"
@@ -745,10 +744,12 @@ lt:
         name: "Vardas"
         label: "Kodas"
         show_key_description: "Įveskite rankiniu būdu"
+        disable: "Išjungti"
+        save: "Saugoti"
         edit: "Redaguoti"
         security_key:
           register: "Registruokis"
-          delete: "Pašalinti"
+          save: "Saugoti"
       change_about:
         title: "Keisti Apie Mane"
         error: "Rasta klaida bandant pakeisti reikšmę. Prašom patikslinti veiksmus."
@@ -1437,7 +1438,7 @@ lt:
         title: "Perkelti į Pranešimų dėžutę"
         help: "Perkelti žinutes atgal į Pranešimų dėžutę"
       edit_message:
-        title: "Redaguoti žinutę"
+        title: "Redaguoti"
       defer:
         title: "Atidėti"
       list: "Temos"
@@ -2162,7 +2163,6 @@ lt:
         this_month: "Per mėnesį"
         this_week: "Per savaitę"
         today: "Šandien"
-        other_periods: "skaityk TOP"
     permission_types:
       full: "Kurti / Atsakyti / Peržiūrėti"
       create_post: "Atsakyti / Peržiūrėti"
@@ -2300,6 +2300,10 @@ lt:
     invite:
       custom_message_placeholder: "Įveskite savo pasirinktinę žinutę"
       custom_message_template_forum: "Labas, užsiregistruok ir tu!\nČia bus vienas geriausių forumų..."
+    footer_nav:
+      back: "Atgal"
+      share: "Dalintis"
+      dismiss: "Praleisti"
   admin_js:
     type_to_filter: "įrašyk kažką dėl filtro..."
     admin:
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index cc1725edd4..2f0e8f8e20 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -463,7 +463,6 @@ lv:
         muted:
           title: "Noklusināts"
       flair_url: "Avatāra attēls"
-      flair_url_placeholder: "(Neobligāti) Saite uz attēlu vai Font Awesome klasi"
       flair_bg_color: "Avatāra attēla fona krāsa"
       flair_bg_color_placeholder: "(Neobligāti) Heksadecimālā krāsas vērtība"
       flair_color: "Avatāra attēla krāsa"
@@ -665,14 +664,17 @@ lv:
         regenerate: "Atkārtoti radīt"
         disable: "Atslēgt"
         enable: "Ieslēgt"
-        copied_to_clipboard: "Nokopēts uz starpliktuvi (clipboard)"
+        copy_to_clipboard: "Kopēt uz starpliktuvi (clipboard)"
         copy_to_clipboard_error: "Radās kļūda, kopējot uz starpliktuvi (clipboard)"
+        copied_to_clipboard: "Nokopēts uz starpliktuvi (clipboard)"
       second_factor:
         name: "Vārds"
         label: "Kods"
+        disable: "Atslēgt"
+        save: "Saglabāt"
         edit: "Labot"
         security_key:
-          delete: "Dzēst"
+          save: "Saglabāt"
       change_about:
         title: "Mainīt aprakstu par mani"
         error: "Mainot šo vērtību, notika kļūda."
@@ -1326,6 +1328,8 @@ lv:
       move_to_inbox:
         title: "Pārvietot uz iesūtni"
         help: "Atgriezt ziņu uz iesūtni "
+      edit_message:
+        title: "Labot"
       defer:
         title: "Nepiekrist"
       list: "Tēmas"
@@ -2048,7 +2052,6 @@ lv:
         this_month: "Mēneša"
         this_week: "Nedēļas"
         today: "Šodienas"
-        other_periods: "skatīt topu"
     permission_types:
       full: "Izveidot / Atbildēt / Skatīt"
       create_post: "Atbildēt / Skatīt"
@@ -2203,6 +2206,10 @@ lv:
       custom_message_placeholder: "Ievadi savu ziņas tekstu"
       custom_message_template_forum: "Sveiks, Tev ir jāpievienojas šim forumam!"
       custom_message_template_topic: "Sveiks, man šķiet, ka Tu varētu izbaudīt šo tēmu!"
+    footer_nav:
+      back: "Atpakaļ"
+      share: "Dalīties"
+      dismiss: "Nerādīt"
     safe_mode:
       enabled: "Ir ieslēgts drošais režīms; lai pamestu drošo režīmu, aizveriet šo pārlūkprogrammas logu"
   admin_js:
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index cc40559e92..a7c35a1273 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -571,7 +571,6 @@ nb_NO:
         muted:
           title: "Ignorert"
       flair_url: "Bilde for gruppetilhørighet på avatar"
-      flair_url_placeholder: "(Valgfritt) Font Awesome-klasse eller URL til bilde"
       flair_bg_color: "Bakgrunnsfarge for gruppetilhørighetsbilde på avatar"
       flair_bg_color_placeholder: "(Valgfritt) Fargekode som hex-verdi"
       flair_color: "Farge på bilde for gruppetilhørighet på avatar"
@@ -784,8 +783,9 @@ nb_NO:
         disable: "Deaktiver"
         enable: "Aktiver"
         enable_long: "Aktiver reservekoder"
-        copied_to_clipboard: "Kopiert til utklippstavlen"
+        copy_to_clipboard: "Kopier til utklippstavle"
         copy_to_clipboard_error: "Feil ved kopiering til utklippstavlen"
+        copied_to_clipboard: "Kopiert til utklippstavlen"
         remaining_codes: "Du har <strong>{{count}}</strong> reservekoder igjen."
         codes:
           title: "Reservekoder opprettet"
@@ -798,10 +798,12 @@ nb_NO:
         disable_description: "Vennligst oppgi autentiseringskoden fra appen"
         show_key_description: "Skriv inn manuelt"
         oauth_enabled_warning: "Vær oppmerksom på at sosiale login-metoder deaktiveres når tofaktor autentisering er aktivert på kontoen din."
+        disable: "Deaktiver"
+        save: "Lagre"
         edit: "Rediger"
         security_key:
           register: "Registrer"
-          delete: "Slett"
+          save: "Lagre"
       change_about:
         title: "Rediger om meg"
         error: "Det oppstod en feil ved endring av denne verdien."
@@ -1584,7 +1586,7 @@ nb_NO:
         help: "Flytt melding tilbake til innboks"
       edit_message:
         help: "Rediger første innlegg i meldingen"
-        title: "Rediger melding"
+        title: "Rediger"
       defer:
         title: "Utsett"
       list: "Emner"
@@ -2342,7 +2344,6 @@ nb_NO:
         this_month: "Den siste måneden"
         this_week: "Den siste uken"
         today: "I dag"
-        other_periods: "se toppen"
     permission_types:
       full: "Opprett / Svar / Se"
       create_post: "Svar / Se"
@@ -2521,6 +2522,10 @@ nb_NO:
       custom_message_template_forum: "Hei, du burde ta del i dette forumet!"
       custom_message_template_topic: "Hei, jeg tenkte du ville like dette emnet!"
     forced_anonymous: "På grunn av ekstrem belastning vises denne siden midlertidig på samme måte som om du var logget ut."
+    footer_nav:
+      back: "Forrige"
+      share: "Del"
+      dismiss: "Avslå"
     safe_mode:
       enabled: "Sikkert modus er påskrudd, for å skru av sikkert modus, lukk dette nettleservinduet"
   admin_js:
@@ -2722,12 +2727,6 @@ nb_NO:
         tag_event:
           name: "Stikkordshandling"
           details: "Når et stikkord lages, oppdateres eller slettes."
-        flag_event:
-          name: "Flagghandling"
-          details: "Når et flagg settes, aksepteres, avvises eller ignoreres."
-        queued_post_event:
-          name: "Hendelse for godkjent innlegg"
-          details: "Når et køet innlegg opprettes, godkjennes eller avvises."
         delivery_status:
           title: "Sendingsstatus"
           inactive: "Inaktiv"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index af96cc75c7..bc89a09cf0 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -276,6 +276,7 @@ nl:
       no_timezone: 'U hebt nog geen tijdzone ingesteld. Hierdoor kunt u geen herinneringen instellen. Stel er een in <a href="%{basePath}/my/preferences/profile">in uw profiel</a>.'
       invalid_custom_datetime: "De datum en tijd die u hebt opgegeven is ongeldig, probeer het opnieuw."
       list_permission_denied: "U hebt geen toestemming om de bladwijzers van deze gebruiker te bekijken."
+      delete_when_reminder_sent: "Deze bladwijzer verwijderen zodra de herinneringsmelding is verstuurd."
       reminders:
         at_desktop: "De volgende keer vanaf mijn computer"
         later_today: "Later vandaag"
@@ -292,6 +293,8 @@ nl:
         tomorrow_with_time: "morgen om %{time}"
         at_time: "op %{date_time}"
         existing_reminder: "U hebt een herinnering voor deze bladwijzer ingesteld die wordt verzonden"
+    copy_codeblock:
+      copied: "gekopieerd!"
     drafts:
       resume: "Hervatten"
       remove: "Verwijderen"
@@ -676,14 +679,16 @@ nl:
           title: "Genegeerd"
           description: "U ontvangt geen enkele melding over berichten in deze groep."
       flair_url: "Afbeelding voor avatar-flair"
-      flair_url_placeholder: "(Optioneel) Afbeeldings-URL of Font Awesome-klasse"
-      flair_url_description: 'Gebruik vierkante afbeeldingen die niet kleiner zijn dan 20 bij 20 pixels of FontAwesome-pictogrammen (geaccepteerde formaten: ''fa-icon'', ''far fa-icon'' of ''fab fa-icon'').'
+      flair_upload_description: "Gebruik vierkante afbeeldingen, niet kleiner dan 20px bij 20px."
       flair_bg_color: "Achtergrondkleur van avatar-flair"
       flair_bg_color_placeholder: "(Optioneel) Hex-kleurwaarde"
       flair_color: "Kleur van avatar-flair"
       flair_color_placeholder: "(Optioneel) Hex-kleurwaarde"
       flair_preview_icon: "Pictogramvoorbeeld"
       flair_preview_image: "Afbeeldingsvoorbeeld"
+      flair_type:
+        icon: "Een pictogram selecteren"
+        image: "Een afbeelding uploaden"
     user_action_groups:
       "1": "Gegeven likes"
       "2": "Ontvangen likes"
@@ -745,6 +750,7 @@ nl:
       copied: "gekopieerd"
     user_fields:
       none: "(selecteer een optie)"
+      required: 'Voer een waarde in voor ''%{name}'''
     user:
       said: "{{username}}:"
       profile: "Profiel"
@@ -760,6 +766,7 @@ nl:
       private_messages: "Berichten"
       user_notifications:
         filters:
+          filter_by: "Filteren op"
           all: "Alle"
           read: "Gelezen"
           unread: "Ongelezen"
@@ -880,6 +887,7 @@ nl:
       api_approved: "Goedgekeurd:"
       api_last_used_at: "Laatst gebruikt op:"
       theme: "Thema"
+      save_to_change_theme: 'Thema wordt bijgewerkt nadat u op ''%{save_text}'' klikt'
       home: "Standaard startpagina"
       staged: "Staged"
       staff_counters:
@@ -927,8 +935,10 @@ nl:
         enable: "Inschakelen"
         enable_long: "Back-upcodes inschakelen"
         manage: "Back-upcodes beheren. U hebt <strong>{{count}}</strong> back-upcodes over."
-        copied_to_clipboard: "Gekopieerd naar klembord"
+        copy_to_clipboard: "Kopiëren naar klembord"
         copy_to_clipboard_error: "Fout bij kopiëren van gegevens naar klembord"
+        copied_to_clipboard: "Gekopieerd naar klembord"
+        download_backup_codes: "Back-upcodes downloaden"
         remaining_codes: "U hebt <strong>{{count}}</strong> back-upcodes over."
         use: "Een back-upcode gebruiken"
         enable_prerequisites: "U moet een primaire tweede factor inschakelen voordat u back-upcodes genereert."
@@ -954,28 +964,29 @@ nl:
         oauth_enabled_warning: "Houd er rekening mee dat sociale aanmeldingen worden uitgeschakeld zodra twee-factor-authenticatie op uw account is ingeschakeld."
         use: "Authenticator-app gebruiken"
         enforced_notice: "U dient twee-factor-authenticatie in te schakelen voordat u deze website bezoekt."
-        disable: "uitschakelen"
-        disable_title: "Tweede factor uitschakelen"
+        disable: "Uitschakelen"
         disable_confirm: "Weet u zeker dat u alle tweede factoren wilt uitschakelen?"
+        save: "Opslaan"
         edit: "Bewerken"
         edit_title: "Tweede factor bewerken"
         edit_description: "Naam van tweede factor"
-        enable_security_key_description: "Houd uw fysieke beveiligingssleutel gereed en klik op de onderstaande knop Registreren."
+        enable_security_key_description: |
+          Druk wanneer u uw <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">hardwarebeveiligingssleutel</a> gereed hebt op de onderstaande knop Registreren.
         totp:
           title: "Op tokens gebaseerde authenticators"
-          add: "Nieuwe authenticator"
+          add: "Authenticator toevoegen"
           default_name: "Mijn authenticator"
           name_and_code_required_error: "U moet een naam en de code van uw authenticator-app opgeven."
         security_key:
           register: "Registreren"
           title: "Beveiligingssleutels"
-          add: "Beveiligingssleutel registreren"
+          add: "Beveiligingssleutel toevoegen"
           default_name: "Hoofdbeveiligingssleutel"
           not_allowed_error: "Het registratieproces van de beveiligingssleutel had een time-out of is geannuleerd."
           already_added_error: "U hebt deze beveiligingssleutel al geregistreerd. U hoeft deze niet opnieuw te registreren."
           edit: "Beveiligingssleutel bewerken"
+          save: "Opslaan"
           edit_description: "Naam van beveiligingssleutel"
-          delete: "Verwijderen"
           name_required_error: "U moet een naam voor uw beveiligingssleutel opgeven."
       change_about:
         title: "Over mij wijzigen"
@@ -1019,6 +1030,7 @@ nl:
         sso_override_instructions: "E-mailadres kan vanaf SSO-provider worden bijgewerkt."
         instructions: "Nooit openbaar zichtbaar."
         ok: "We sturen een e-mail ter bevestiging"
+        required: "Voer een e-mailadres in"
         invalid: "Voer een geldig e-mailadres in "
         authenticated: "Uw e-mailadres is geauthenticeerd door {{provider}}"
         frequency_immediately: "Als u de inhoud in kwestie nog niet hebt gelezen, sturen we u direct een e-mail."
@@ -1039,6 +1051,7 @@ nl:
         title: "Naam"
         instructions: "uw volledige naam (optioneel)"
         instructions_required: "Uw volledige naam"
+        required: "Voer een naam in"
         too_short: "Uw naam is te kort"
         ok: "Uw naam ziet er goed uit"
       username:
@@ -1052,6 +1065,7 @@ nl:
         too_long: "Uw gebruikersnaam is te lang"
         checking: "Beschikbaarheid van gebruikersnaam controleren..."
         prefilled: "E-mailadres komt overeen met deze geregistreerde gebruikersnaam"
+        required: "Voer een gebruikersnaam in"
       locale:
         title: "Taal van interface"
         instructions: "Taal van de gebruikersinterface. Deze verandert zodra u de pagina opnieuw laadt."
@@ -1195,6 +1209,7 @@ nl:
         same_as_email: "Uw wachtwoord is hetzelfde als uw e-mailadres."
         ok: "Uw wachtwoord ziet er goed uit."
         instructions: "minstens %{count} tekens"
+        required: "Voer een wachtwoord in"
       summary:
         title: "Samenvatting "
         stats: "Statistieken "
@@ -1911,7 +1926,7 @@ nl:
         help: "Bericht weer naar Postvak IN verplaatsen"
       edit_message:
         help: "Het eerste bericht van het bericht bewerken"
-        title: "Bericht bewerken"
+        title: "Bewerken"
       defer:
         help: "Markeren als ongelezen"
         title: "Negeren"
@@ -2065,6 +2080,7 @@ nl:
           "2_8": "U ziet het aantal nieuwe antwoorden, omdat u deze categorie volgt."
           "2_4": "U ziet het aantal nieuwe antwoorden, omdat u een antwoord in dit topic hebt geplaatst."
           "2_2": "U ziet het aantal nieuwe antwoorden, omdat u dit topic volgt."
+          "2": 'U ziet het aantal nieuwe antwoorden, omdat u <a href="{{basePath}}/u/{{username}}/preferences/notifications">dit topic hebt gelezen</a>.'
           "1_2": "U ontvangt een melding als iemand uw @naam noemt of een bericht van u beantwoordt."
           "1": "U ontvangt een melding als iemand uw @naam noemt of een bericht van u beantwoordt."
           "0_7": "U negeert alle meldingen in deze categorie."
@@ -2801,7 +2817,7 @@ nl:
         this_month: "Maand"
         this_week: "Week"
         today: "Vandaag"
-        other_periods: "eerste bekijken"
+        other_periods: "eerste bekijken:"
     browser_update: 'Helaas is <a href="https://www.discourse.org/faq/#browser">uw browser te oud om op deze website te kunnen werken</a>. <a href="https://browsehappy.com">Upgrade uw browser</a> om rijke inhoud te kunnen bekijken, u aan te melden, en te antwoorden.'
     permission_types:
       full: "Maken / Antwoorden / Bekijken"
@@ -3047,6 +3063,11 @@ nl:
       custom_message_template_forum: "Hee, u zou aan dit forum moeten deelnemen!"
       custom_message_template_topic: "Hee, dit topic lijkt me wel iets voor u!"
     forced_anonymous: "Vanwege overbelasting wordt dit tijdelijk voor iedereen weergegeven zoals niet-aangemelde gebruikers het zien."
+    footer_nav:
+      back: "Vorige"
+      forward: "Volgende"
+      share: "Delen"
+      dismiss: "Verwijderen"
     safe_mode:
       enabled: "Veilige modus is ingeschakeld; sluit dit browservenster om de veilige modus te verlaten"
   admin_js:
@@ -3297,12 +3318,6 @@ nl:
         tag_event:
           name: "Tag-gebeurtenis"
           details: "Wanneer een tag wordt gemaakt, bijgewerkt of verwijderd."
-        flag_event:
-          name: "Markeringsgebeurtenis"
-          details: "Wanneer een markering wordt gemaakt, geaccordeerd, niet wordt geaccordeerd of wordt genegeerd."
-        queued_post_event:
-          name: "Berichtgoedkeuringsgebeurtenis"
-          details: "Wanneer een nieuw wachtend bericht wordt gemaakt, goedgekeurd of geweigerd."
         reviewable_event:
           name: "Beoordeelbare gebeurtenis"
           details: "Wanneer een nieuw item gereed is voor beoordeling en wanneer de status ervan is bijgewerkt."
@@ -4056,7 +4071,7 @@ nl:
         anonymize_failed: "Er is een probleem opgetreden bij het anonimiseren van de account."
         delete: "Gebruiker verwijderen"
         merge:
-          transfer_and_delete: "Overdragen & verwijderen"
+          button: "Samenvoegen"
           prompt:
             title: "Overdragen & @%{username} verwijderen"
             description: |
@@ -4390,6 +4405,7 @@ nl:
         post_title: "Bericht"
         category_id: "Categorie-ID"
         category_title: "Categorie"
+        tag_name: "Tagnaam"
         external_url: "Externe URL"
         destination: "Bestemming"
         delete_confirm: "Weet u zeker dat u deze permalink wilt verwijderen?"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index fa7950b919..90bb21bc29 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -739,8 +739,6 @@ pl_PL:
           title: "Wyciszony"
           description: "Nie dostaniesz powiadomień na temat wiadomości w tej grupie."
       flair_url: "Awatar "
-      flair_url_placeholder: "(Opcjonalne) Link do obrazka lub klasa Font Awesome"
-      flair_url_description: 'Użyj kwadratowego obrazka mniejszego niż 20px na 20px lub ikony FontAwesome (akceptowane formaty: "fa-icon", "far fa-icon" i "fab fa-icon").'
       flair_bg_color: "Kolor tła odznaki grupowej"
       flair_bg_color_placeholder: "(Opcjonalne) Kolor w formacie Hex"
       flair_color: "Kolor odznaki grupowej "
@@ -994,8 +992,9 @@ pl_PL:
         enable: "Włącz"
         enable_long: "Włącz kody zapasowe"
         manage: "Zarządzaj kodami zapasowymi. Pozostały Ci kody zapasowe <strong>{{count}}</strong> ."
-        copied_to_clipboard: "Skopiowane do schowka"
+        copy_to_clipboard: "Skopiuj do schowka"
         copy_to_clipboard_error: "Wystąpił błąd w trakcie kopiowania do schowka"
+        copied_to_clipboard: "Skopiowane do schowka"
         remaining_codes: "Pozostały Ci kody zapasowe <strong>{{count}}</strong> ."
         use: "Używaj kodu zapasowego"
         enable_prerequisites: "Przed wygenerowaniem kodów zapasowych należy włączyć główny drugi czynnik."
@@ -1020,27 +1019,24 @@ pl_PL:
         use: "Użyj aplikacji Authenticator"
         enforced_notice: "Aby uzyskać dostęp do tej witryny, musisz włączyć uwierzytelnianie dwuskładnikowe."
         disable: "Wyłącz"
-        disable_title: "Wyłącz drugi czynnik"
         disable_confirm: "Czy na pewno chcesz wyłączyć wszystkie drugie czynniki?"
+        save: "Zapisz"
         edit: "Edytuj"
         edit_title: "Edytuj drugi czynnik"
         edit_description: "Nazwa drugiego czynnika"
-        enable_security_key_description: "Po przygotowaniu fizycznego klucza bezpieczeństwa naciśnij przycisk Zarejestruj poniżej."
         totp:
           title: "Uwierzytelnianie oparte na tokenach"
-          add: "Nowy Authenticator"
           default_name: "Mój Authenticator"
           name_and_code_required_error: "Musisz podać nazwę i kod z aplikacji uwierzytelniającej."
         security_key:
           register: "Zarejestruj"
           title: "Klucze bezpieczeństwa"
-          add: "Zarejestruj klucz bezpieczeństwa"
           default_name: "Główny klucz bezpieczeństwa"
           not_allowed_error: "Upłynął limit czasu procesu rejestracji klucza bezpieczeństwa lub został on anulowany."
           already_added_error: "Ten klucz bezpieczeństwa został już zarejestrowany. Nie musisz go ponownie rejestrować."
           edit: "Edytuj Klucz Bezpieczeństwa"
+          save: "Zapisz"
           edit_description: "Nazwa klucza bezpieczeństwa"
-          delete: "Usuń"
           name_required_error: "Musisz podać nazwę swojego klucza bezpieczeństwa."
       change_about:
         title: "Zmień O mnie"
@@ -1767,11 +1763,6 @@ pl_PL:
           few: "Nieodczytane wiadomości: {{count}}"
           many: "Nieodczytane wiadomości: {{count}}"
           other: "Nieodczytane wiadomości: 1"
-        high_priority:
-          one: "%{count} nieprzeczytane powiadomienie o wysokim priorytecie"
-          few: "%{count} nieprzeczytane powiadomienie o wysokim priorytecieis"
-          many: "%{count} nieprzeczytane powiadomienie o wysokim priorytecieis"
-          other: "%{count} nieprzeczytane powiadomienie o wysokim priorytecieis"
       title: "powiadomienia o wywołanej @nazwie, odpowiedzi do twoich wpisów i tematów, prywatne wiadomości, itp"
       none: "Nie udało się załadować listy powiadomień."
       empty: "Nie znaleziono powiadomień."
@@ -2019,7 +2010,7 @@ pl_PL:
         help: "Przenieś wiadomość z powrotem do skrzynki odbiorczej"
       edit_message:
         help: "Edytuj pierwszy post wiadomości"
-        title: "Edytuj wiadomość"
+        title: "Edytuj"
       defer:
         help: "Oznacz jako nieprzeczytane"
         title: "Zignoruj"
@@ -2911,7 +2902,6 @@ pl_PL:
         this_month: "Miesiąc"
         this_week: "Tydzień"
         today: "Dzisiaj"
-        other_periods: "zobacz najważniejsze"
     permission_types:
       full: "tworzyć / odpowiadać / przeglądać"
       create_post: "odpowiadać / przeglądać"
@@ -3119,6 +3109,10 @@ pl_PL:
       custom_message_placeholder: "Wpisz swoją niestandardową wiadomość"
       custom_message_template_forum: "Hej, należy dołączyć do tego forum!"
       custom_message_template_topic: "Hej, pomyślałem że spodoba Ci się ten temat !"
+    footer_nav:
+      back: "Poprzednia"
+      share: "Udostępnij"
+      dismiss: "Wyczyść"
     safe_mode:
       enabled: "Tryb bezpieczny jest włączony, aby z niego wyjść zamknij to okno przeglądrki"
   admin_js:
@@ -3364,12 +3358,6 @@ pl_PL:
         tag_event:
           name: "Zdarzenie tagu"
           details: "Kiedy tag jest tworzony, aktualizowany lub niszczony."
-        flag_event:
-          name: "Zdarzenie flagi"
-          details: "Kiedy flaga jest tworzona, zatwierdzana, odrzucana lub ignorowana."
-        queued_post_event:
-          name: "Zdarzenie zatwierdzania wpisu"
-          details: "Kiedy wpis w kolejce jest tworzony, zatwierdzany lub odrzucany."
         reviewable_event:
           name: "Zdarzenie przeglądania"
           details: "Kiedy nowy element jest gotowy do przejrzenia lub kiedy jego status jest aktualizowany."
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 8387963d2d..6632a055b4 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -516,8 +516,6 @@ pt:
           title: "Silenciado"
           description: "Não vai ser notificado(a) de nenhuma mensagem neste grupo."
       flair_url: "Imagem da Marca de Avatar"
-      flair_url_placeholder: "(Opcional) URL da Imagem ou nome da classe Font Awesome"
-      flair_url_description: 'Use imagens quadradas no mínimo 20px por 20px ou ícones FontAwesome (formatos aceites: "fa-icon", "far fa-icon" ou "fab fa-icon").'
       flair_bg_color: "Cor de Fundo da Marca de Avatar"
       flair_bg_color_placeholder: "(Opcional) Valor hexadecimal da cor"
       flair_color: "Cor da Marca de Avatar"
@@ -748,8 +746,8 @@ pt:
         disable: "Desativar"
         enable: "Ativar"
         enable_long: "Ativar códigos de reserva"
-        copied_to_clipboard: "Copiado para a Área de Transferência"
         copy_to_clipboard_error: "Erro a copiar dados para a Área de Transferência"
+        copied_to_clipboard: "Copiado para a Área de Transferência"
         remaining_codes: "Restam <strong>{{count}}</strong> códigos de reserva."
         codes:
           title: "Códigos de Reserva Gerados"
@@ -766,10 +764,12 @@ pt:
           A autenticação em dois passos adiciona segurança à sua conta ao pedir um código de utilização única além da sua palavra-passe. Os códigos 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: "Note que os logins com contas sociais vão ser desativados depois da autenticação em dois passos ser ativa na sua conta."
         enforced_notice: "É necessário ativar a autenticação em dois passos para aceder a este site."
+        disable: "Desativar"
+        save: "Guardar"
         edit: "Editar"
         security_key:
           register: "Registar"
-          delete: "Eliminar"
+          save: "Guardar"
       change_about:
         title: "Modificar Sobre Mim"
         error: "Ocorreu um erro ao modificar este valor."
@@ -1599,7 +1599,7 @@ pt:
         help: "Mover mensagem de volta para a Caixa de Entrada"
       edit_message:
         help: "Editar primeira publicação da mensagem"
-        title: "Editar Mensagem"
+        title: "Editar"
       defer:
         title: "Diferir"
       list: "Tópicos"
@@ -2310,7 +2310,6 @@ pt:
         this_month: "Mês"
         this_week: "Semana"
         today: "Hoje"
-        other_periods: "ver topo"
     permission_types:
       full: "Criar / Responder / Ver"
       create_post: "Responder / Ver"
@@ -2466,6 +2465,10 @@ pt:
       custom_message_placeholder: "Insira a sua mensagem personalizada"
       custom_message_template_forum: "Olá, devia juntar-se a este fórum!"
       custom_message_template_topic: "Olá, achei que poderia gostar deste tópico!"
+    footer_nav:
+      back: "Retroceder"
+      share: "Partilhar"
+      dismiss: "Marcar como visto"
     safe_mode:
       enabled: "O modo de segurança está activado, para sair do modo de segurança feche esta janela do navegador"
   admin_js:
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 7281d53e48..e2438e65aa 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -27,8 +27,10 @@ pt_BR:
         millions: "{{number}}M"
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D [de] MMMM"
       long_with_year: "D MMM, YYYY H:mm"
@@ -260,23 +262,39 @@ pt_BR:
       help:
         bookmark: "Clique para adicionar o primeiro post deste tópico aos favoritos"
         unbookmark: "Clique para remover todos os favoritos neste tópico"
+        unbookmark_with_reminder: "Clique para remover todos os favoritos e lembretes deste tópico. Você tem um lembrete definido %{reminder_at} para este tópico."
     bookmarks:
+      created: "você favoritou esta postagem %{name}"
       not_bookmarked: "marcar postagem como favorita"
+      created_with_reminder: "você favoritou esta postagem com um lembrete %{date} %{name}"
+      created_with_at_desktop_reminder: "você favoritou esta postagem e será lembrado na próxima vez que estiver em seu desktop %{name}"
       remove: "Remover Favorito"
+      delete: "Excluir Favorito"
+      confirm_delete: "Tem certeza de que deseja excluir este favorito? O lembrete também será excluído."
       confirm_clear: "Você tem certeza de que deseja apagar todos os seus favoritos deste tópico?"
       save: "Salvar"
       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ê forneceu são inválidas, por favor tente novamente."
       list_permission_denied: "Você não tem permissão para visualizar os favoritos deste usuário."
+      delete_when_reminder_sent: "Excluir este favorito quando a notificação do lembrete for enviada."
       reminders:
-        at_desktop: "Da próxima vez que estiver na minha área de trabalho"
+        at_desktop: "Da próxima vez que estiver em meu desktop"
         later_today: "Mais tarde hoje"
+        next_business_day: "Próximo dia útil"
         tomorrow: "Amanhã"
         next_week: "Próxima semana"
         later_this_week: "Mais tarde nesta semana"
+        start_of_next_business_week: "Próxima segunda-feira"
         next_month: "Próximo mês"
         custom: "Data e hora personalizadas"
+        last_custom: "Último"
         none: "Nenhum lembrete necessário"
+        today_with_time: "hoje às %{time}"
+        tomorrow_with_time: "amanhã às %{time}"
+        at_time: "em %{date_time}"
+        existing_reminder: "Você tem um lembrete definido para este favorito que será enviado"
+    copy_codeblock:
+      copied: "copiado!"
     drafts:
       resume: "Resumir"
       remove: "Remova"
@@ -514,6 +532,7 @@ pt_BR:
       days_visited_long: "Dias Visitados"
       posts_read: "Lidos"
       posts_read_long: "Postagens Lidas"
+      last_updated: "Última atualização:"
       total_rows:
         one: "%{count} usuário"
         other: "%{count} usuários"
@@ -660,14 +679,14 @@ pt_BR:
           title: "Silenciado"
           description: "Você não será notificado de nada sobre mensagens neste grupo."
       flair_url: "Imagem do Avatar Flair"
-      flair_url_placeholder: "(Opcional) URL da imagem ou classe do Font Awesome"
-      flair_url_description: 'Use imagens quadradas não menores que 20px por 20px ou ícones FontAwesome (formatos aceitos: "fa-icon", "far fa-icon" ou "fab fa-icon").'
       flair_bg_color: "Cor de Fundo do Avatar Flair"
       flair_bg_color_placeholder: "(Opcional) Valor da cor em hexadecimal"
       flair_color: "Cor do Avatar Flair"
       flair_color_placeholder: "(Opcional) Valor da cor em hexadecimal"
       flair_preview_icon: "Pré-visualizar Ícone"
       flair_preview_image: "Pré-visualizar Imagem"
+      flair_type:
+        image: "Enviar arquivo"
     user_action_groups:
       "1": "Curtidas dadas"
       "2": "Curtidas recebidas"
@@ -729,6 +748,7 @@ pt_BR:
       copied: "copiado"
     user_fields:
       none: "(selecione uma opção)"
+      required: 'Por favor preencha "%{name}"'
     user:
       said: "{{username}}:"
       profile: "Perfil"
@@ -744,6 +764,7 @@ pt_BR:
       private_messages: "Mensagens"
       user_notifications:
         filters:
+          filter_by: "Filtrar por"
           all: "Tudo"
           read: "Lido"
           unread: "Não lidas"
@@ -771,6 +792,7 @@ pt_BR:
         clear:
           title: "Limpo"
           warning: "Tem certeza de que deseja limpar o tópico em destaque?"
+      use_current_timezone: "Usar fuso horário atual"
       profile_hidden: "O perfil público deste usuário está oculto."
       expand_profile: "Expandir"
       collapse_profile: "Recolher"
@@ -863,6 +885,7 @@ pt_BR:
       api_approved: "Aprovada:"
       api_last_used_at: "Usada pela última vez em:"
       theme: "Tema"
+      save_to_change_theme: 'O tema será atualizado quando você clicar em "%{save_text}"'
       home: "Página Inicial Padrão"
       staged: "Fictício"
       staff_counters:
@@ -898,6 +921,7 @@ pt_BR:
         success: "(e-mail enviado)"
         in_progress: "(enviando e-mail)"
         error: "(erro)"
+        emoji: "emoji de cadeado"
         action: "Enviar E-mail de Redefinição de Senha"
         set_password: "Definir Senha"
         choose_new: "Escolha uma nova senha"
@@ -909,8 +933,10 @@ pt_BR:
         enable: "Habilitar"
         enable_long: "Habilitar códigos de backup"
         manage: "Gerenciar códigos de backup. Você tem <strong>{{count}}</strong> códigos de backup restantes."
-        copied_to_clipboard: "Copiado para a Área de Transferência"
+        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: "Copiado para a Área de Transferência"
+        download_backup_codes: "Baixar códigos de backup"
         remaining_codes: "Você tem <strong>{{count}}</strong> códigos de backup restantes."
         use: "Use um código de backup"
         enable_prerequisites: "Você deve habilitar um segundo fator primário antes de gerar códigos de backup."
@@ -937,27 +963,28 @@ pt_BR:
         use: "Use o Aplicativo Autenticador"
         enforced_notice: "Você precisa ativar a autenticação de dois fatores antes de acessar este site."
         disable: "Desabilitar"
-        disable_title: "Desabilitar Segundo Fator"
         disable_confirm: "Tem certeza que você quer desabilitar todos os segundos fatores?"
+        save: "Salvar"
         edit: "Editar"
         edit_title: "Editar Segundo Fator"
         edit_description: "Nome do Segundo Fator"
-        enable_security_key_description: "Quando você tiver sua chave de segurança física preparada, pressione o botão Registrar abaixo."
+        enable_security_key_description: |
+          Quando sua <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">chave de segurança física</a> estiver preparada, pressione o botão Registrar abaixo.
         totp:
           title: "Autenticadores Baseados em Token"
-          add: "Novo Autenticador"
+          add: "Adicionar Autenticador"
           default_name: "Meu Autenticador"
           name_and_code_required_error: "Você deve fornecer um nome e o código do seu aplicativo de autenticação."
         security_key:
-          register: "Registro"
+          register: "Registrar"
           title: "Chaves de Segurança"
-          add: "Registrar Chave de Segurança"
+          add: "Adicionar chave de segurança"
           default_name: "Chave de Segurança Principal"
           not_allowed_error: "O processo de registro da chave de segurança atingiu o tempo limite ou foi cancelado."
           already_added_error: "Você já registrou esta chave de segurança.\nVocê não tem que registrá-la novamente."
           edit: "Editar Chave de Segurança"
+          save: "Salvar"
           edit_description: "Nome da Chave de Segurança"
-          delete: "Excluir"
           name_required_error: "Você deve fornecer um nome para sua chave de segurança."
       change_about:
         title: "Modificar Sobre Mim"
@@ -975,6 +1002,10 @@ pt_BR:
         success_staff: "Enviamos um e-mail para o seu endereço atual. Por favor, siga as instruções de confirmação."
       change_avatar:
         title: "Alterar sua imagem de perfil"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, baseado em"
+        gravatar_title: "Altere seu avatar no site de {{gravatarName}}"
+        gravatar_failed: "Não foi possível encontrar um {{gravatarName}} com esse endereço de e-mail."
+        refresh_gravatar_title: "Recarregar seu {{gravatarName}}"
         letter_based: "Imagem de perfil atribuída pelo sistema"
         uploaded_avatar: "Imagem personalizada"
         uploaded_avatar_empty: "Adicionar uma imagem personalizada"
@@ -997,6 +1028,7 @@ pt_BR:
         sso_override_instructions: "E-mail pode ser atualizado do provedor de SSO."
         instructions: "Nunca visível publicamente."
         ok: "Nós enviaremos um e-mail para confirmar"
+        required: "Por favor preencha um endereço de e-mail"
         invalid: "Por favor, insira um endereço de e-mail válido"
         authenticated: "Seu e-mail foi autenticado por {{provider}}"
         frequency_immediately: "Enviaremos um e-mail imediatamente se você não tiver lido a coisa sobre a qual estamos enviando o e-mail."
@@ -1017,6 +1049,7 @@ pt_BR:
         title: "Nome"
         instructions: "seu nome completo (opcional)"
         instructions_required: "Seu nome completo"
+        required: "Por favor preencha um nome"
         too_short: "Seu nome é muito curto"
         ok: "Seu nome parece bom"
       username:
@@ -1030,6 +1063,7 @@ pt_BR:
         too_long: "Seu nome de usuário é muito longo"
         checking: "Verificando disponibilidade do nome de usuário..."
         prefilled: "E-mail corresponde a este nome de usuário cadastrado"
+        required: "Por favor preencha um nome de usuário"
       locale:
         title: "Idioma da interface"
         instructions: "Idioma da interface do usuário. Será alterado quando você atualizar a página."
@@ -1039,6 +1073,7 @@ pt_BR:
         title: "Senha Novamente"
       invite_code:
         title: "Código de convite"
+        instructions: "A criação de conta requer um código de convite"
       auth_tokens:
         title: "Dispositivos Usados Recentemente"
         ip: "IP"
@@ -1172,6 +1207,7 @@ pt_BR:
         same_as_email: "A sua senha é a mesma que o seu e-mail."
         ok: "A sua senha parece boa."
         instructions: "pelo menos %{count} caracteres"
+        required: "Por favor preencha uma senha"
       summary:
         title: "Resumo"
         stats: "Estatísticas"
@@ -1261,6 +1297,7 @@ pt_BR:
         fixed: "Carregar Página"
     modal:
       close: "fechar"
+      dismiss_error: "Descartar erro"
     close: "Fechar"
     assets_changed_confirm: "Este site acabou de ser atualizado. Atualizar a página agora para ver a última versão?"
     logout: "Você foi desconectado."
@@ -1270,6 +1307,12 @@ pt_BR:
       enabled: "Este site está em modo de somente leitura. Por favor, continue a navegar, mas respostas, curtidas e outras ações estão desabilitadas por enquanto."
       login_disabled: "O login é desabilitado enquanto o site está em modo de somente leitura."
       logout_disabled: "O logout é desabilitado enquanto o site está em modo de somente leitura."
+    too_few_topics_and_posts_notice_MF: >-
+      Vamos <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">começar a discussão!</a> {currentTopics, plural, one {Existe <strong>#</strong> tópico} other {Existem <strong>#</strong> tópicos}} e {currentPosts, plural, one <strong>{#</strong> postagem} other <strong>{#</strong> postagens}}. Os visitantes precisam de mais para ler e responder – recomendamos pelo menos {requiredTopics, plural, one <strong>{#</strong> tópico} other <strong>{#</strong> tópicos}} e {requiredPosts, plural, one <strong>{#</strong> postagem} other <strong>{#</strong> postagens}}. Somente a staff pode ver esta mensagem.
+    too_few_topics_notice_MF: >-
+      Vamos <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">começar a discussão!</a> {currentTopics, plural, one {Existe <strong>#</strong> tópico} other {Existem <strong>#</strong> tópicos}}. Os visitantes precisam de mais para ler e responder – recomendamos pelo menos {requiredTopics, plural, one {<strong>#</strong> tópico} other { <strong>#</strong> tópicos}}. Somente a staff pode ver esta mensagem.
+    too_few_posts_notice_MF: >-
+      Vamos <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">começar a discussão!</a> {currentPosts, plural, one {Existe <strong>#</strong> postagem} other {Existem <strong>#</strong> postagens}}. Os visitantes precisam de mais para ler e responder – recomendamos pelo menos {requiredPosts, plural, one {<strong>#</strong> postagem} other {<strong>#</strong> postagens}}. Somente a staff pode ver esta mensagem.
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# erro/hora} other {# erros/hora}}</a> alcançou o limite de configuração do site de {limit, plural, one {# erro/hora} other {# erros/hora}}."
       reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# erro/minuto} other {# erros/minuto}}</a> alcançou o limite de configuração do site de {limit, plural, one {# erro/minuto} other {# erros/minuto}}."
@@ -1289,6 +1332,7 @@ pt_BR:
     mute: Silenciar
     unmute: Remover Silêncio
     last_post: Postado
+    local_time: "Horário local"
     time_read: Lido
     time_read_recently: "%{time_read} recentemente"
     time_read_tooltip: "%{time_read} tempo total lido"
@@ -1340,6 +1384,8 @@ pt_BR:
       reset: "Redefinir Senha"
       complete_username: "Se uma conta corresponder ao nome de usuário <b>%{username}</b>, você deverá receber um e-mail com instruções de como redefinir sua senha rapidamente."
       complete_email: "Se uma conta corresponder à <b>%{email}</b>, você deverá receber um e-mail com instruções de como redefinir sua senha rapidamente."
+      complete_username_found: "Encontramos uma conta que corresponde ao nome de usuário <b>%{username}</b>. Você deve receber um e-mail com instruções sobre como redefinir sua senha em breve."
+      complete_email_found: "Encontramos uma conta que corresponde a <b>%{email}</b>. Você deve receber um e-mail com instruções sobre como redefinir sua senha em breve."
       complete_username_not_found: "Nenhuma conta corresponde ao nome de usuário <b>%{username}</b>"
       complete_email_not_found: "Nenhuma conta corresponde à <b>%{email}</b>"
       help: "E-mail não está chegando? Certifique-se de verificar sua pasta de spam primeiro.<p>Não tem certeza de qual endereço de e-mail você usou? Digite um endereço de e-mail e informaremos se ele existe aqui.</p><p>Se você não tiver mais acesso ao endereço de e-mail da sua conta, entre em contato com <a href='%{basePath}/about'>nossa prestativa staff.</a></p>"
@@ -1348,6 +1394,7 @@ pt_BR:
     email_login:
       link_label: "Envie-me um link de login"
       button_label: "com e-mail"
+      emoji: "emoji de cadeado"
       complete_username: "Se uma conta corresponder ao nome de usuário <b>%{username}</b>, você deverá receber um e-mail com um link de login em breve."
       complete_email: "Se uma conta corresponder à <b>%{email}</b>, você deverá receber um e-mail com um link de login em breve."
       complete_username_found: "Encontramos uma conta que corresponde ao nome de usuário <b>%{username}</b>, você deverá receber um e-mail com um link de login em breve."
@@ -1425,6 +1472,7 @@ pt_BR:
         backup_code: "Use um código de backup"
     invites:
       accept_title: "Convite"
+      emoji: "emoji de envelope"
       welcome_to: "Bem vindo à %{site_name}!"
       invited_by: "Você foi convidado por:"
       social_login_available: "Você também poderá entrar com qualquer login social usando este e-mail."
@@ -1455,7 +1503,7 @@ pt_BR:
       shift: "Shift"
       ctrl: "Ctrl"
       alt: "Alt"
-      enter: "Inserir"
+      enter: "Enter"
     conditional_loading_section:
       loading: Carregando...
     category_row:
@@ -1472,6 +1520,10 @@ pt_BR:
       min_content_not_reached:
         one: "Selecione pelo menos {{count}} item."
         other: "Selecione pelo menos {{count}} itens."
+      invalid_selection_length: "A seleção deve ter pelo menos {{count}} caracteres."
+      components:
+        categories_admin_dropdown:
+          title: "Categorias na caixa de seleção da administração"
     date_time_picker:
       from: De
       to: Para
@@ -1561,6 +1613,7 @@ pt_BR:
       view_new_post: "Veja a sua nova postagem."
       saving: "Salvando"
       saved: "Salvo!"
+      saved_draft: "Rascunho de postagem em andamento. Toque para retomar."
       uploading: "Enviando..."
       show_preview: "mostrar pré-visualização &raquo;"
       hide_preview: "&laquo; ocultar pré-visualização"
@@ -1610,6 +1663,7 @@ pt_BR:
         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 se você criar um tópico linkado."
         reply_as_private_message:
           label: Nova mensagem
           desc: Criar uma nova mensagem pessoal
@@ -1635,6 +1689,9 @@ pt_BR:
         message:
           one: "%{count} mensagem não lida"
           other: "{{count}} mensagens não lidas"
+        high_priority:
+          one: "%{count} notificação não lida de alta prioridade"
+          other: "%{count} notificações não lidas de alta prioridade"
       title: "notificações de menção de @nome, respostas às suas postagens, tópicos, mensagens, etc"
       none: "Não foi possível carregar notificações no momento."
       empty: "Nenhuma notificação foi encontrada."
@@ -1694,6 +1751,8 @@ pt_BR:
         posted: "nova postagem"
         moved_post: "postagem movida"
         linked: "conectado"
+        bookmark_reminder: "lembrete de favorito"
+        bookmark_reminder_with_name: "lembrete de favorito - %{name}"
         granted_badge: "emblema concedido"
         invited_to_topic: "convidado para o tópico"
         group_mentioned: "grupo mencionado"
@@ -1868,7 +1927,7 @@ pt_BR:
         help: "Mover mensagem de volta para Caixa de Entrada"
       edit_message:
         help: "Editar primeira postagem da mensagem"
-        title: "Editar Mensagem"
+        title: "Editar"
       defer:
         help: "Marcar como não lido"
         title: "Delegar"
@@ -1922,6 +1981,7 @@ pt_BR:
       group_request_sent: "Sua solicitação de filiação ao grupo foi enviada. Você será informado(a) quando ela for aceita."
       unread_indicator: "Nenhum membro leu a última postagem deste tópico ainda."
       read_more_MF: "Há { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 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'>1 novo</a> tópico} other { {BOTH, select, true{e } false {} other{}} <a href='{basePath}/new'># novos</a> tópicos} } restantes, ou {CATEGORY, select, true {veja 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
       view_latest_topics: ver últimos tópicos
       suggest_create_topic: "Por que não criar um tópico?"
@@ -1932,6 +1992,7 @@ pt_BR:
         title: "Temporizador de Tópico"
         save: "Definir Temporizador"
         num_of_hours: "Número de horas:"
+        num_of_days: "Número de dias:"
         remove: "Remover Temporizador"
         publish_to: "Publicar Em:"
         when: "Quando:"
@@ -1974,6 +2035,8 @@ pt_BR:
         title: "Promover Tópico Automaticamente"
       reminder:
         title: "Lembrar-me"
+      auto_delete_replies:
+        title: "Excluir respostas automaticamente"
       status_update_notice:
         auto_open: "Este tópico abrirá automaticamente em %{timeLeft}."
         auto_close: "Este tópico fechará automaticamente em %{timeLeft}."
@@ -1982,6 +2045,7 @@ pt_BR:
         auto_delete: "Este tópico será automaticamente excluído %{timeLeft}."
         auto_bump: "Este tópico será automaticamente promovido %{timeLeft}."
         auto_reminder: "Você será lembrado sobre este tópico %{timeLeft}."
+        auto_delete_replies: "As respostas deste tópico são excluídas automaticamente após %{duration}."
       auto_close_title: "Configurações de Fechamento Automático"
       auto_close_immediate:
         one: "A última postagem no tópico já foi feita há %{count} hora, portanto o tópico será fechado imediatamente."
@@ -2017,6 +2081,7 @@ pt_BR:
           "2_8": "Você verá uma contagem de novas respostas porque está acompanhando esta categoria."
           "2_4": "Você verá uma contagem de novas respostas porque postou uma resposta a este tópico."
           "2_2": "Você verá uma contagem de novas respostas porque está acompanhando este tópico."
+          "2": 'Você verá uma contagem de novas respostas porque <a href="{{basePath}}/u/{{username}}/preferences/notifications">leu este tópico</a>.'
           "1_2": "Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem."
           "1": "Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem."
           "0_7": "Você está ignorando todas as notificações nesta categoria."
@@ -2192,6 +2257,18 @@ pt_BR:
         title: "Unificar as Mensagens Selecionadas"
         action: "unificar as mensagens selecionadas"
         error: "Houve um erro ao unificar as mensagens selecionadas."
+      publish_page:
+        title: "Publicação de páginas"
+        publish: "Publicar"
+        description: "Quando um tópico é publicado como uma página, sua URL pode ser compartilhada e ela será exibida com um estilo personalizado."
+        slug: "Slug"
+        publish_url: "Sua página foi publicada em:"
+        topic_published: "Seu tópico foi publicado em:"
+        preview_url: "Sua página será publicada em:"
+        invalid_slug: "Desculpe, você não pode publicar esta página."
+        unpublish: "Despublicar"
+        unpublished: "Sua página foi despublicada e não está mais acessível."
+        publishing_settings: "Configurações de publicação"
       change_owner:
         title: "Trocar Autor"
         action: "trocar autor"
@@ -2200,6 +2277,9 @@ pt_BR:
         instructions:
           one: "Por favor escolha um novo autor para a postagem de <b>@{{old_user}}</b>"
           other: "Por favor escolha um novo autor para as {{count}} postagens de <b>@{{old_user}}</b>"
+        instructions_without_old_user:
+          one: "Escolha um novo proprietário para a postagem"
+          other: "Escolha um novo proprietário para as {{count}} postagens"
       change_timestamp:
         title: "Alterar o timestamp ..."
         action: "alterar horário"
@@ -2325,6 +2405,7 @@ pt_BR:
         convert_to_moderator: "Converter para Moderação"
         revert_to_regular: "Remover da Moderação"
         rebake: "Reconstruir HTML"
+        publish_page: "Publicação de páginas"
         unhide: "Revelar"
         change_owner: "Trocar Autor"
         grant_badge: "Conceder Emblema"
@@ -2419,9 +2500,19 @@ pt_BR:
             button: "HTML"
       bookmarks:
         create: "Criar marcador"
+        edit: "Editar favorito"
         created: "Criado"
         updated: "Atualizado"
         name: "Nome"
+        name_placeholder: "Para que serve este favorito?"
+        set_reminder: "Lembre-me"
+        actions:
+          delete_bookmark:
+            name: "Excluir favorito"
+            description: "Remove o favorito do seu perfil e interrompe todos os lembretes do favorito"
+          edit_bookmark:
+            name: "Editar favorito"
+            description: "Editar o nome do favorito ou alterar a data e hora do lembrete"
     category:
       can: "pode&hellip; "
       none: "(sem categoria)"
@@ -2482,6 +2573,7 @@ pt_BR:
       email_in_disabled_click: 'habilitar a configuração de "e-mail em".'
       mailinglist_mirror: "Categoria espelha uma lista de discussão"
       show_subcategory_list: "Exibir lista de subcategorias acima dos tópicos nesta categoria."
+      read_only_banner: "Texto para o banner quando um usuário não pode criar um tópico na categoria:"
       num_featured_topics: "Número de tópicos exibidos na página de Categorias:"
       subcategory_num_featured_topics: "Número de tópicos em destaque na página da categoria pai:"
       all_topics_wiki: "Faça novos tópicos wikis por padrão"
@@ -2726,7 +2818,8 @@ pt_BR:
         this_month: "Mês"
         this_week: "Semana"
         today: "Hoje"
-        other_periods: "Veja o topo"
+        other_periods: "ver top:"
+    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 conteúdo rico, fazer login e responder.'
     permission_types:
       full: "Criar / Responder / Ver"
       create_post: "Responder / Ver"
@@ -2782,6 +2875,19 @@ pt_BR:
         title: "Composição"
         return: "%{shortcut} Retornar ao compositor"
         fullscreen: "%{shortcut} Compositor em tela cheia"
+      bookmarks:
+        title: "Favoritos"
+        enter: "%{shortcut} Salvar e fechar"
+        later_today: "%{shortcut} Mais tarde hoje"
+        later_this_week: "%{shortcut} No final desta semana"
+        tomorrow: "%{shortcut} Amanhã"
+        next_week: "%{shortcut} Próxima semana"
+        next_month: "%{shortcut} Próximo mês"
+        next_business_week: "%{shortcut} Início da próxima semana"
+        next_business_day: "%{shortcut} Próximo dia útil"
+        custom: "%{shortcut} Data e hora personalizadas"
+        none: "%{shortcut} Sem lembrete"
+        delete: "%{shortcut} Excluir favorito"
       actions:
         title: "Ações"
         bookmark_topic: "%{shortcut} Favoritar o tópico"
@@ -2804,6 +2910,10 @@ pt_BR:
         print: "%{shortcut} Imprimir tópico"
         defer: "%{shortcut} Adiar tópico"
         topic_admin_actions: "%{shortcut} Abrir ações de administração de tópicos"
+      search_menu:
+        title: "Menu de pesquisa"
+        prev_next: "%{shortcut} Mover seleção para cima e para baixo"
+        insert_url: "%{shortcut} Inserir seleção no compositor aberto"
     badges:
       earned_n_times:
         one: "Emblema adquirido %{count} vez"
@@ -2846,6 +2956,7 @@ pt_BR:
       choose_for_topic: "etiquetas opcionais"
       info: "Informações"
       default_info: "Esta etiqueta não está restrita a nenhuma categorias e não possui sinônimos."
+      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, eles serão substituídas por <b>%{base_tag_name}</b>."
       tag_groups_info:
@@ -2857,6 +2968,9 @@ pt_BR:
       edit_synonyms: "Gerenciar sinônimos"
       add_synonyms_label: "Adicionar sinônimos:"
       add_synonyms: "Adicionar"
+      add_synonyms_explanation:
+        one: "Qualquer local que atualmente use essa tag será alterado para usar <b>%{tag_name}</b> . Tem certeza de que deseja fazer essa alteração?"
+        other: "Qualquer local que atualmente use essas etiquetas será alterado para usar <b>%{tag_name}</b>. Tem certeza de que deseja fazer essa alteração?"
       add_synonyms_failed: "As seguintes etiquetas não podem ser adicionadas como sinônimos: <b>%{tag_names}</b>. Se assegure de que elas não tenham sinônimos e não sejam sinônimos de outras etiquetas."
       remove_synonym: "Remover sinônimo"
       delete_synonym_confirm: 'Você tem certeza que deseja excluir o sinônimo "%{tag_name}"?'
@@ -2950,6 +3064,11 @@ pt_BR:
       custom_message_template_forum: "Ei, você devia entrar neste fórum!"
       custom_message_template_topic: "Ei, eu acho que você vai gostar deste tópico!"
     forced_anonymous: "Devido à carga extrema, isto está sendo exibido temporariamente para todos, visto que um usuário desconectado o veria."
+    footer_nav:
+      back: "Voltar"
+      forward: "Seguinte"
+      share: "Compartilhar"
+      dismiss: "Descartar"
     safe_mode:
       enabled: "O modo seguro está habilitado. Para sair do modo seguro feche esta janela do navegador"
   admin_js:
@@ -3019,7 +3138,7 @@ pt_BR:
         not_found_error: "Desculpe, este relatório não existe"
         filter_reports: Filtrar relatórios
         reports:
-          trend_title: "%{percent} mudança. Atualmente %{current}, estava%{prev} no período anterior."
+          trend_title: "Mudança de %{percent}. Atualmente %{current}, era %{prev} no período anterior."
           today: "Hoje"
           yesterday: "Ontem"
           last_7_days: "Últimos 7"
@@ -3031,6 +3150,7 @@ pt_BR:
           view_table: "tabela"
           view_graph: "gráfico"
           refresh_report: "Atualizar Relatório"
+          dates: "Datas (UTC)"
           groups: "Todos os grupos"
           disabled: "Este relatório está desativado"
           totals_for_sample: "Totais para amostra"
@@ -3039,7 +3159,7 @@ pt_BR:
           no_data: "Nenhum dado para exibir."
           trending_search:
             more: '<a href="%{basePath}/admin/logs/search_logs">Registros de pesquisa</a>'
-            disabled: 'O relatório de pesquisa em alta está desativado. Habilitar<a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">consultas de pesquisa de registro</a> para coletar dados.'
+            disabled: 'O relatório de pesquisa em alta está desativado. Habilitar <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">consultas de pesquisa de registro</a> para coletar dados.'
           filters:
             file-extension:
               label: Extensão de arquivo
@@ -3047,6 +3167,8 @@ pt_BR:
               label: Grupo
             category:
               label: Categoria
+            include-subcategories:
+              label: "Incluir subcategorias"
       commits:
         latest_changes: "Últimas atualizações: atualize com frequência!"
         by: "por"
@@ -3091,6 +3213,7 @@ pt_BR:
             effects: Efeitos
             trust_levels_none: "Nenhum"
             automatic_membership_email_domains: "Os usuários que se registrarem em um domínio de e-mail que corresponda exatamente a um nesta lista serão adicionados automaticamente a este grupo:"
+            automatic_membership_user_count: "%{count} usuários têm os novos domínios de e-mail e serão adicionados ao grupo."
             primary_group: "Definir automaticamente como grupo principal"
         name_placeholder: "Nome do grupo, sem espaços, igual à regra de nome de usuário"
         primary: "Grupo Primário"
@@ -3196,18 +3319,15 @@ pt_BR:
         tag_event:
           name: "Tag Evento"
           details: "Quando uma tag é criada, atualizada ou destruída."
-        flag_event:
-          name: "Evento de sinalização"
-          details: "Quando uma bandeira é criada, aceita, discordada ou ignorada."
-        queued_post_event:
-          name: "Postar evento de aprovação"
-          details: "Quando uma nova postagem na fila é criada, aprovada ou rejeitada."
         reviewable_event:
           name: "Evento Revisável"
           details: "Quando um novo item está pronto para revisão e quando seu status é atualizado."
         notification_event:
           name: "Evento de Notificação"
           details: "Quando um usuário recebe uma notificação no feed dele."
+        user_badge_event:
+          name: "Evento de Concessão de Emblema"
+          details: "Quando um usuário recebe um emblema."
         delivery_status:
           title: "Status de Entrega"
           inactive: "Inativo"
@@ -3357,6 +3477,7 @@ pt_BR:
           theme_name: "Nome do Tema"
           component_name: "Nome do Componente"
           themes_intro: "Selecione um tema existente ou instale um novo para começar"
+          themes_intro_emoji: "emoji de artista mulher"
           beginners_guide_title: "Guia para iniciantes de uso de Temas do Discourse"
           developers_guide_title: "Guia para desenvolvedores de Temas do Discourse"
           browse_themes: "Explore temas da comunidade"
@@ -3376,6 +3497,9 @@ pt_BR:
           settings: "Configurações"
           translations: "Traduções"
           extra_scss: "SCSS Extra"
+          extra_files: "Arquivos extras"
+          extra_files_upload: "Exporte o tema para ver esses arquivos."
+          extra_files_remote: "Exporte o tema ou verifique o repositório git para ver esses arquivos."
           preview: "Prévia"
           show_advanced: "Mostrar campos avançados"
           hide_advanced: "Ocultar campos avançados"
@@ -3439,6 +3563,7 @@ pt_BR:
           license: "Licença"
           version: "Versão:"
           authors: "Autoria:"
+          creator: "Criado por:"
           source_url: "Fonte"
           enable: "Habilitar"
           disable: "Desabilitar"
@@ -3583,6 +3708,7 @@ pt_BR:
         format: "Formato"
         html: "html"
         text: "texto"
+        html_preview: "Prévia do conteúdo do e-mail"
         last_seen_user: "Último Usuário Visto:"
         no_result: "Nenhum resultado encontrado."
         reply_key: "Chave de Resposta"
@@ -3737,6 +3863,8 @@ pt_BR:
             api_key_update: "Atualizar Chave de API"
             api_key_destroy: "Destruir Chave de API"
             override_upload_secure_status: "Sobrescrever o status seguro do upload"
+            page_published: "página publicada"
+            page_unpublished: "página despublicada"
         screened_emails:
           title: "Emails Filtrados"
           description: "Quando alguém tenta cria uma nova conta, os seguintes endereços de e-mail serão verificados e o registro será bloqueado, ou outra ação será executada."
@@ -3944,10 +4072,29 @@ pt_BR:
         anonymize_failed: "Ocorreu um problema ao tornar a conta anônima."
         delete: "Apagar Usuário"
         merge:
+          button: "Mesclar"
           prompt:
+            title: "Transferir e excluir @%{username}"
+            description: |
+              <p>Escolha um novo proprietário para o conteúdo de <b>@%{username}</b>.</p>
+
+              <p>Todos os tópicos, postagens, mensagens e outros conteúdos criados por <b>@%{username}</b> serão transferidos.</p>
+            target_username_placeholder: "Nome de usuário do novo proprietário"
+            transfer_and_delete: "Transferir e excluir @%{username}"
             cancel: "Cancelar"
           confirmation:
+            title: "Transferir e excluir @%{username}"
+            description: |
+              <p>Todo o conteúdo de <b>@%{username}</b> será transferido e atribuído a <b>@%{targetUsername}</b>. Após a transferência do conteúdo, a conta de <b>@%{username}</b> será excluída.</p>
+
+              <p> <b>Isto não pode ser desfeito!</b> </p>
+
+              <p> Para continuar, digite: <code>%{text}</code> </p>
+            text: "transferir @%{username} para @%{targetUsername}"
+            transfer_and_delete: "Transferir e excluir @%{username}"
             cancel: "Cancelar"
+        merging_user: "Mesclando usuário..."
+        merge_failed: "Ocorreu um erro ao mesclar os usuários."
         delete_forbidden_because_staff: "Administradores e moderadores não podem ser excluidos."
         delete_posts_forbidden_because_staff: "Não posso excluir todas as mensagens de administradores e moderadores."
         delete_forbidden:
@@ -3991,6 +4138,7 @@ pt_BR:
           threshold_reached: "Muitas devoluções daquele e-mail foram recebidas."
         trust_level_change_failed: "Houve um problema ao trocar o nível de confiança do usuário."
         suspend_modal_title: "Usuário Suspenso"
+        confirm_cancel_penalty: "Tem certeza de que deseja descartar a penalidade?"
         trust_level_2_users: "Usuários de Nível de Confiança 2"
         trust_level_3_requirements: "Requisitos do Nível de Confiança 3"
         trust_level_locked_tip: "nível de confiança está travado, sistema não irá promover ou demover o usuário"
@@ -4204,8 +4352,18 @@ pt_BR:
             with_time: "<span class=\"username\">%{username}</span> às <span class=\"time\">%{time}</span>"
         badge_intro:
           title: "Selecione um emblema ou crie um novo para começar"
+          emoji: "emoji de estudante mulher"
           what_are_badges_title: "O que são emblemas?"
           badge_query_examples_title: "Exemplos de pesquisas de emblemas"
+        mass_award:
+          title: Concessão em massa
+          description: Conceder o mesmo emblema a vários usuários ao mesmo tempo.
+          no_badge_selected: Selecione um emblema para começar.
+          perform: "Conceder de Emblema aos Usuários"
+          upload_csv: Fazer o upload de um CSV com e-mails ou nomes de usuário
+          aborted: Por favor faça o upload de um CSV contendo e-mails ou nomes de usuário
+          success: Seu CSV foi recebido e os usuários receberão seus emblemas em breve.
+          replace_owners: Remover o emblema dos proprietários anteriores
       emoji:
         title: "Emoji"
         help: "Adicionar novo emoji que estará disponível para todos. (DICA: arraste & solte diversos arquivos de uma vez)"
@@ -4213,6 +4371,7 @@ pt_BR:
         name: "Nome"
         group: "Grupo"
         image: "Imagem"
+        alt: "prévia do emoji personalizado"
         delete_confirm: "Tem certeza que deseja excluir o emoji :%{name}: ?"
       embedding:
         get_started: "Se você deseja incorporar Discourse em outro site, começe adicionando seu host."
@@ -4232,12 +4391,14 @@ pt_BR:
         embed_post_limit: "Número máximo de postagens para incorporar"
         embed_title_scrubber: "Expressão regular usada para higienizar o título das publicações"
         embed_truncate: "Truncar as postagens incorporadas"
+        embed_unlisted: "Os tópicos importados não serão listados até que haja uma resposta."
         embed_whitelist_selector: "Seletor de CSS para elementos que são permitidos na incorporação"
         embed_blacklist_selector: "Seletor de CSS para elementos que são removidos da incorporação"
         embed_classname_whitelist: "Nomes de classes CSS permitidas"
         save: "Salvar Configurações de Incorporação"
       permalink:
         title: "Links permanentes"
+        description: "Redirecionamentos a ser aplicados a URLs que não são conhecidas pelo fórum."
         url: "URL"
         topic_id: "ID do Tópico"
         topic_title: "Tópico"
@@ -4246,6 +4407,7 @@ pt_BR:
         category_id: "ID da Categoria"
         category_title: "Categoria"
         external_url: "URL externa"
+        destination: "Destino"
         delete_confirm: "Você tem certeza que quer apagar este link permanente?"
         form:
           label: "Novo:"
@@ -4274,7 +4436,7 @@ pt_BR:
       quit: "Talvez Depois"
       staff_count:
         one: "Sua comunidade tem %{count} pessoa (você). "
-        other: "Sua comunidade tem%{count} pessoas, incluindo você."
+        other: "Sua comunidade tem %{count} pessoas, incluindo você."
       invites:
         add_user: "adicionar"
         none_added: "Você ainda não convidou ninguém para a equipe. Tem certeza que deseja continuar?"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index ac52c6da86..16999e7b48 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -510,7 +510,6 @@ ro:
         muted:
           title: "Setat pe silențios"
       flair_url: "Imagine avatar cu element distinct"
-      flair_url_placeholder: "(Opțional) URL imagine sau clasă Font Awesome"
       flair_bg_color: "Culoarea de fundal a avatarului cu element distinct"
       flair_bg_color_placeholder: "(Opțional) Valoarea Hex a culorii"
       flair_color: "Culoarea avatarului cu element distinct"
@@ -718,14 +717,17 @@ ro:
         regenerate: "Regenerare"
         disable: "Dezactivează"
         enable: "Activează"
-        copied_to_clipboard: "Copiat în clipboard"
+        copy_to_clipboard: "Copiază în clipboard"
         copy_to_clipboard_error: "Eroare la copierea datelor în clipboard"
+        copied_to_clipboard: "Copiat în clipboard"
       second_factor:
         name: "Nume"
+        disable: "Dezactivează"
+        save: "Salvează"
         edit: "Editează"
         security_key:
           register: "Înregistrare"
-          delete: "Șterge"
+          save: "Salvează"
       change_about:
         title: "Schimbare date personale"
         error: "A apărut o eroare la schimbarea acestei valori."
@@ -1441,6 +1443,8 @@ ro:
       move_to_inbox:
         title: "Mută în Primite"
         help: "Mută mesajul în Primite"
+      edit_message:
+        title: "Editează"
       defer:
         title: "Amânare"
       list: "Subiecte"
@@ -2196,7 +2200,6 @@ ro:
         this_month: "Lună"
         this_week: "Săptămână"
         today: "Astăzi"
-        other_periods: "vezi topul"
     permission_types:
       full: "Creează / Răspunde / Vizualizează"
       create_post: "Răspunde / Vizualizează"
@@ -2365,6 +2368,10 @@ ro:
       custom_message_placeholder: "Introdu mesajul tău personalizat"
       custom_message_template_forum: "Salutare! Ar trebui să te alături acestui forum!"
       custom_message_template_topic: "Salutare! Cred că o să îți placă acest subiect!"
+    footer_nav:
+      back: "Înapoi"
+      share: "Distribuie"
+      dismiss: "Înlătură"
     safe_mode:
       enabled: "Modul sigur este activat, pentru a ieși din modul sigur închide această fereastră de browser"
   admin_js:
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index f37d3bd052..6e453f47e4 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -324,6 +324,7 @@ ru:
       no_timezone: 'Укажите ваш часовой пояс <a href="%{basePath}/my/preferences/profile">в настройках своей учётной записи</a>, чтобы активировать функцию напоминаний.'
       invalid_custom_datetime: "Неверно указаны дата и время, попробуйте ещё раз."
       list_permission_denied: "У вас недостаточно прав для просмотра закладок этого пользователя."
+      delete_when_reminder_sent: "Удалить эту закладку после отправки напоминания."
       reminders:
         at_desktop: "При следующем посещении форума через настольный компьютер"
         later_today: "Сегодня, но позже"
@@ -338,8 +339,10 @@ ru:
         none: "Не настраивать напоминание"
         today_with_time: "сегодня в %{time}"
         tomorrow_with_time: "завтра в %{time}"
-        at_time: "в %{date_time}"
+        at_time: " %{date_time}"
         existing_reminder: "Для этой закладки уже настроено напоминание, которое будет отправлено"
+    copy_codeblock:
+      copied: "скопировано!"
     drafts:
       resume: "Продолжить"
       remove: "Удалить"
@@ -443,7 +446,7 @@ ru:
       view_all: "Посмотреть все"
       grouped_by_topic: "Группировать по темам"
       none: "Нет элементов для премодерации."
-      view_pending: "просмотр в ожидании"
+      view_pending: "Просмотр сообщений, ожидающих подтверждения"
       topic_has_pending:
         one: "В этой теме <b>%{count}</b> сообщение ожидает проверки"
         few: "В этой теме <b>{{count}}</b> сообщения ожидают проверки"
@@ -750,8 +753,7 @@ ru:
           title: "Выключено"
           description: "Вы не будете уведомлены о все о сообщениях в этой группе."
       flair_url: "Изображение аватара"
-      flair_url_placeholder: "(Необязательно) Ссылка на изображение или класс шрифта Font Awesome"
-      flair_url_description: 'Используйте квадратные картинки, размером не менее, чем 20px на 20px или иконки FontAwesome (допустимы форматы: "fa-icon", "far fa-icon" или "fab fa-icon")'
+      flair_upload_description: "Используйте квадратные картинки размером не менее чем 20х20 пикселей."
       flair_bg_color: "Фоновый цвет аватара"
       flair_bg_color_placeholder: "(Необязательно) Hex-код цвета"
       flair_color: "Цвет аватара"
@@ -825,6 +827,7 @@ ru:
       copied: "скопировано"
     user_fields:
       none: "(выберите)"
+      required: 'Пожалуйста, введите значение для "%{name}"'
     user:
       said: "{{username}}:"
       profile: "Профиль"
@@ -840,8 +843,9 @@ ru:
       private_messages: "Личные сообщения"
       user_notifications:
         filters:
-          all: "Всего"
-          read: "Прочитано"
+          filter_by: "Фильтр"
+          all: "Все"
+          read: "Прочитанные"
           unread: "Непрочитанные"
         ignore_duration_title: "Игнорировать таймер"
         ignore_duration_username: "Псевдоним"
@@ -960,6 +964,7 @@ ru:
       api_approved: "Подтверждено"
       api_last_used_at: "Последнее использование:"
       theme: "Стиль"
+      save_to_change_theme: 'Тема будет обновлена после нажатия на кнопку %{save_text}'
       home: "Домашняя страница по умолчанию"
       staged: "Сымитированный"
       staff_counters:
@@ -1001,14 +1006,16 @@ ru:
         choose_new: "Выберите новый пароль"
         choose: "Выберите пароль"
       second_factor_backup:
-        title: "Коды двух-факторного резервного копирования"
+        title: "Резервные коды двухфакторной аутентификации"
         regenerate: "Сгенерировать заново"
         disable: "Отключить"
         enable: "Включить"
-        enable_long: "Включить коды резервного копирования"
+        enable_long: "Включить резервные коды"
         manage: "Управление резервными кодами. У вас осталось <strong>{{count}}</strong> резервных кода."
-        copied_to_clipboard: "Скопировано в буфер"
+        copy_to_clipboard: "Скопировать в буфер"
         copy_to_clipboard_error: "Ошибка при копировании данных в буфер обмена"
+        copied_to_clipboard: "Скопировано в буфер"
+        download_backup_codes: "Скачать резервные коды"
         remaining_codes: "У вас осталось <strong>{{count}}</strong>резервных кодов"
         use: "Используйте резервный код"
         enable_prerequisites: "Вы должны включить первичный второй фактор перед генерацией резервных кодов."
@@ -1034,28 +1041,29 @@ ru:
         oauth_enabled_warning: "Обратите внимание, что социальные логины будут отключены после включения двухфакторной аутентификации в вашей учетной записи."
         use: "Используйте приложение для проверки подлинности "
         enforced_notice: "Вы должны включить двухфакторную аутентификацию перед доступом к этому сайту."
-        disable: "отключить"
-        disable_title: "Отключить второй фактор"
+        disable: "Отключить"
         disable_confirm: "Вы действительно хотите отключить все вторые факторы?"
+        save: "Сохранить"
         edit: "Редактировать"
         edit_title: "Изменение второго фактора"
         edit_description: "Имя второго фактора"
-        enable_security_key_description: "Когда вы подготовите свой физический ключ безопасности, нажмите кнопку <b>Регистрация</b> ниже."
+        enable_security_key_description: |
+          Когда вы подготовите свой <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">физический ключ безопасности</a>, нажмите на кнопку "Регистрация", расположенную  ниже.
         totp:
           title: "Токен-аутентификация"
-          add: "Новый аутентификатор"
+          add: "Добавить аутентификатор"
           default_name: "Мой аутентификатор"
           name_and_code_required_error: "Вы должны указать токен и его имя"
         security_key:
           register: "Зарегистрироваться"
           title: "Ключи безопасности"
-          add: "Зарегистрировать ключ безопасности"
+          add: "Добавить ключ безопасности"
           default_name: "Главный ключ безопасности"
           not_allowed_error: "Время регистрации ключа безопасности истекло или было отменено."
           already_added_error: "Вы уже зарегистрировали этот ключ безопасности. Вам не нужно регистрировать его снова."
           edit: "Изменить ключ безопасности"
+          save: "Сохранить"
           edit_description: "Имя ключа безопасности"
-          delete: "Удалить"
           name_required_error: "Вы должны указать имя ключа безопасности"
       change_about:
         title: "Изменить информацию обо мне"
@@ -1099,6 +1107,7 @@ ru:
         sso_override_instructions: "E-mail может быть переопределен от поставщика SSO."
         instructions: "Не будет опубликован."
         ok: "Мы вышлем вам письмо для подтверждения"
+        required: "Пожалуйста, введите e-mail адрес"
         invalid: "Введите действующий адрес электронной почты"
         authenticated: "Ваш адрес электронной почты подтвержден {{provider}}"
         frequency_immediately: "Получать уведомления о новых непрочитанных сообщениях незамедлительно."
@@ -1121,6 +1130,7 @@ ru:
         title: "Имя"
         instructions: "Ваше полное имя (опционально)"
         instructions_required: "Ваше полное имя"
+        required: "Пожалуйста, введите имя"
         too_short: "Ваше имя слишком короткое"
         ok: "Допустимое имя"
       username:
@@ -1134,6 +1144,7 @@ ru:
         too_long: "Псевдоним слишком длинный"
         checking: "Проверяю доступность псевдонима..."
         prefilled: "Адрес электронной почты совпадает с зарегистрированным псевдонимом"
+        required: "Пожалуйста, введите псевдоним"
       locale:
         title: "Язык интерфейса"
         instructions: "Язык сайта. Необходимо перезагрузить страницу, чтобы изменения вступили в силу."
@@ -1279,6 +1290,7 @@ ru:
         same_as_email: "Ваш пароль такой же, как и ваш email."
         ok: "Допустимый пароль."
         instructions: "не менее %{count} символов"
+        required: "Пожалуйста, введите пароль"
       summary:
         title: "Сводка"
         stats: "Статистика"
@@ -1524,8 +1536,8 @@ ru:
       awaiting_approval: "Ваша учётная запись ещё не одобрена персоналом. Мы вышлем вам письмо, как только это произойдет."
       requires_invite: "Попасть в этот форум можно только по приглашениям."
       not_activated: "Чтобы войти на форум, активируйте свою учетную запись. Мы отправили на почту <b>{{sentTo}}</b> подробные инструкции, как это сделать."
-      not_allowed_from_ip_address: "С этого IP адреса вход запрещен."
-      admin_not_allowed_from_ip_address: "С этого IP адреса вход администраторов запрещен."
+      not_allowed_from_ip_address: "Вход с этого IP-адреса запрещен."
+      admin_not_allowed_from_ip_address: "Вход с этого IP-адреса в качестве администратора запрещен."
       resend_activation_email: "Щелкните здесь, чтобы повторно выслать письмо для активации учетной записи."
       omniauth_disallow_totp: "В вашей учетной записи включена двухфакторная аутентификация. Пожалуйста, войдите под своим паролем."
       resend_title: "Заново выслать активационное письмо"
@@ -1614,6 +1626,9 @@ ru:
         many: "Введите хотя бы {{count}} элементов."
         other: "Введите хотя бы {{count}} элементов."
       invalid_selection_length: "Необходимо выбрать не менее {{count}} символов."
+      components:
+        categories_admin_dropdown:
+          title: "Раскрывающийся список категорий"
     date_time_picker:
       from: От
       to: Кому
@@ -1787,7 +1802,7 @@ ru:
           other: "{{count}} непрочитанных сообщений"
         high_priority:
           one: "%{count} непрочитанное уведомление с высоким приоритетом"
-          few: "%{count} непрочитанных уведомления с высоким приоритетом"
+          few: "%{count} непрочитанных уведомлений с высоким приоритетом"
           many: "%{count} непрочитанных уведомлений с высоким приоритетом"
           other: "%{count} непрочитанных уведомлений с высоким приоритетом"
       title: "уведомления об упоминании вашего @псевдонима, ответах на ваши сообщения и темы, сообщения и т.д."
@@ -2037,7 +2052,7 @@ ru:
         help: "Переместить сообщение во входящие"
       edit_message:
         help: "Изменить первое сообщение"
-        title: "Редактировать сообщение"
+        title: "Редактировать"
       defer:
         help: "Отметить как непрочитанное"
         title: "Отложить"
@@ -2105,7 +2120,7 @@ ru:
       read_more_MF: "У вас осталось { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 непрочитанная</a> } few { <a href='{basePath}/unread'># непрочитанные</a> } other { <a href='{basePath}/unread'># непрочитанных</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'>1 новая</a> тема} few { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'># новые</a> темы} 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: Просмотреть все разделы
-      view_latest_topics: посмотреть последние темы.
+      view_latest_topics: просмотреть последние темы
       suggest_create_topic: "Почему бы вам не создать новую тему?"
       jump_reply_up: Перейти к более ранним ответам
       jump_reply_down: Перейти к более поздним ответам
@@ -2205,6 +2220,7 @@ ru:
           "2_8": "Вы увидите количество новых ответов, поскольку следите за этим разделом."
           "2_4": "Вы увидите количество новых ответов, поскольку вы размещали ответ в этой теме."
           "2_2": "Вы увидите количество новых ответов, поскольку следите за этой темой."
+          "2": 'Вы увидите количество новых ответов, поскольку <a href="{{basePath}}/u/{{username}}/preferences/notifications">читали эту тему</a>.'
           "1_2": "Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам."
           "1": "Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам."
           "0_7": "Не получать уведомлений из этого раздела."
@@ -3021,7 +3037,7 @@ ru:
         this_month: "За месяц"
         this_week: "За неделю"
         today: "За сегодня"
-        other_periods: "показать самые обсуждаемые"
+        other_periods: "просмотреть самые обсуждаемые:"
     browser_update: 'К сожалению, <a href="https://www.discourse.org/faq/#browser">ваш браузер безнадёжно устарел</a> . Пожалуйста, <a href="https://browsehappy.com">обновите его</a> для полноценной работы с сайтом.'
     permission_types:
       full: "Создавать / Отвечать / Просматривать"
@@ -3289,6 +3305,11 @@ ru:
       custom_message_template_forum: "Привет. Подумал, что тебе будет интересно зарегистрироваться на этом форуме!"
       custom_message_template_topic: "Привет! Подумал, что тебя может заинтересовать эта тема!"
     forced_anonymous: "Из-за чрезмерной нагрузки, это временно показывается всем, как если бы пользователь вышел из системы."
+    footer_nav:
+      back: "Назад"
+      forward: "Вперед"
+      share: "Поделиться"
+      dismiss: "Отложить"
     safe_mode:
       enabled: "Включён безопасный режим, чтобы выйти из безопасного режима, закройте текущее окно браузера"
   admin_js:
@@ -3372,6 +3393,7 @@ ru:
           view_table: "Таблица"
           view_graph: "График"
           refresh_report: "Обновить отчет"
+          dates: "Даты (UTC)"
           groups: "Все группы"
           disabled: "Этот отчет отключен"
           totals_for_sample: "Итоги по выборке"
@@ -3486,7 +3508,7 @@ ru:
         new_key: Новый API-ключ
         revoked: Отозвать
         delete: Окончательно удалить
-        not_shown_again: "Эта клавиша больше не будет отображаться. Убедитесь, что вы сделали копию, прежде чем продолжить."
+        not_shown_again: "Этот ключ больше не будет отображаться. Убедитесь, что вы сделали копию, прежде чем продолжить."
         continue: Продолжать
       web_hooks:
         title: "Webhooks"
@@ -3540,12 +3562,6 @@ ru:
         tag_event:
           name: "Событие тега"
           details: "При создании, обновлении или удалении тега."
-        flag_event:
-          name: "Событие жалобы"
-          details: "При создании, согласовании, несогласовании или игнорировании жалобы."
-        queued_post_event:
-          name: "Событие утверждения сообщения"
-          details: "При добавлении нового сообщения в очередь, а затем при его утверждении или отклонении."
         reviewable_event:
           name: "Событие пересмотра"
           details: "При готовности нового элемента к рассмотрению и при обновлении его статуса."
@@ -4307,7 +4323,7 @@ ru:
         anonymize_failed: "Не удалось анонимизировать учетную запись."
         delete: "Удалить пользователя"
         merge:
-          transfer_and_delete: "Объединить пользователей"
+          button: "Объединить пользователей"
           prompt:
             title: "Объединить контент и удалить пользователя @%{username}"
             description: |2
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index c64a0a1316..a98c6ebd58 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -544,7 +544,6 @@ sk:
         muted:
           title: "Ignorované"
       flair_url: "Obrázok pre štítok avataru"
-      flair_url_placeholder: "(Voliteľné) URL obrázka alebo typ Awesome Fontu"
       flair_bg_color: "Farba pozadia štítku avataru"
       flair_bg_color_placeholder: "(Voliteľné) Hexadecimálna hodnota farby"
       flair_color: "Farba štítku avataru"
@@ -763,8 +762,8 @@ sk:
         disable: "Zakázať"
         enable: "Povoliť"
         enable_long: "Povoliť kódy zálohy"
-        copied_to_clipboard: "Skopírované do schránky"
         copy_to_clipboard_error: "Chyba pri kopírovaní dát do schránky"
+        copied_to_clipboard: "Skopírované do schránky"
         remaining_codes: "Zostáva vám <strong>{{count}}</strong> kódov zálohy."
         codes:
           title: "Záložné kódy vygenerované"
@@ -779,9 +778,11 @@ sk:
         show_key_description: "Vložiť ručne"
         extended_description: |
           Dvojfaktorové prihlásenie pridáva dodatočné zabezpečenie Vášho účtu prostredníctvom zadávania jednorázových hesiel. Heslá môžu byť generované na <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a> a<a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a> zariadeniach.
+        disable: "Zakázať"
+        save: "Uložiť"
         edit: "Upraviť"
         security_key:
-          delete: "Odstrániť"
+          save: "Uložiť"
       change_about:
         title: "Upraviť O mne"
         error: "Nastala chyba pri zmene tejto hodnoty."
@@ -1427,6 +1428,8 @@ sk:
       move_to_inbox:
         title: "Presunúť do schránky"
         help: "Presunúť správu späť do schránky"
+      edit_message:
+        title: "Upraviť"
       defer:
         title: "Odložiť"
       list: "Témy"
@@ -2117,7 +2120,6 @@ sk:
         this_month: "Mesiac"
         this_week: "Týždeň"
         today: "Dnes"
-        other_periods: "pozri hore"
     permission_types:
       full: "Vytvor / Odpovedz / Zobraz"
       create_post: "Odpovedz / Zobraz"
@@ -2263,6 +2265,10 @@ sk:
           bookmarks: "Žiadne ďalšie zazáložkované témy."
     invite:
       custom_message_placeholder: "Zadajte Vašu vlastnú správu"
+    footer_nav:
+      back: "Späť"
+      share: "Zdieľať"
+      dismiss: "Zahodiť"
   admin_js:
     type_to_filter: "zadajte, čo chcete filtrovať ..."
     admin:
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index a7331197f2..497fcb5081 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -651,8 +651,6 @@ sl:
           title: "Utišano"
           description: "Obveščeni boste o vsem na sporočilih v tej skupini."
       flair_url: "Avatar Flair slika"
-      flair_url_placeholder: "(neobvezno) URL slike ali Font Awesome razred"
-      flair_url_description: 'Uporabite kvadratne slike velikosti vsaj 20px x 20px ali FontAwesome ikone (sprejeti formati: "fa-icon", "far fa-icon" ali "fab fa-icon").'
       flair_bg_color: "Avatar Flair barva ozadja"
       flair_bg_color_placeholder: "(neobvezno) Hex barvna vrednost"
       flair_color: "Avatar Flair barva"
@@ -899,8 +897,9 @@ sl:
         disable: "Onemogoči"
         enable: "Omogoči"
         enable_long: "Omogočite rezervne potrditvene kode"
-        copied_to_clipboard: "Prenešeno na odlagališče"
+        copy_to_clipboard: "Kopiraj v odložišče"
         copy_to_clipboard_error: "Napaka pri prenosu na odlagališče"
+        copied_to_clipboard: "Prenešeno na odlagališče"
         remaining_codes: "Imate <strong>{{count}}</strong> rezervnih potrditvenih kod."
         codes:
           title: "Rezervne potrditvene kode ustvarjene"
@@ -920,9 +919,11 @@ sl:
           Preverjanje v dveh korakih omogoči dodatno varnost vašega računa saj za prijavo zahteva dodatno enkratno potrditveno kodo poleg vašega gesla. Potrditvene kode se lahko ustvarijo na <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a> ali <a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a> napravah.
         oauth_enabled_warning: "Preverjanje v dveh korakih bo onemogočila prijavo z družabnimi omrežji."
         enforced_notice: "Obvezno morate vklopiti preverjanje v dveh korakih za dostop to tega spletnega mesta."
+        disable: "Onemogoči"
+        save: "Shrani"
         edit: "Uredi"
         security_key:
-          delete: "Izbriši"
+          save: "Shrani"
       change_about:
         title: "Spremeni O meni"
         error: "Prišlo je do napake pri spreminjanju te vrednosti"
@@ -1844,7 +1845,7 @@ sl:
         help: "Prestavi sporočilo nazaj v Prejeto"
       edit_message:
         help: "Uredi prvi prispevek sporočila"
-        title: "Uredi sporočilo"
+        title: "Uredi"
       defer:
         title: "Preloži"
       list: "Teme"
@@ -2762,7 +2763,6 @@ sl:
         this_month: "Mesec"
         this_week: "Teden"
         today: "Danes"
-        other_periods: "poglej najboljše"
     permission_types:
       full: "Ustvari / Odgovori / Vidi"
       create_post: "Odgovori / Vidi"
@@ -2980,6 +2980,10 @@ sl:
       custom_message_template_forum: "Pridruži se našemu forumu!"
       custom_message_template_topic: "Zdi se mi, da vam bo ta tema všeč!"
     forced_anonymous: "Zaradi visoke obremenitve je to prikazano vsem tako kot bi videl neprijavljen uporabnik."
+    footer_nav:
+      back: "Nazaj"
+      share: "Deli"
+      dismiss: "Opusti"
     safe_mode:
       enabled: "Varni način je vklopljen, za izklop varnega načina zaprite okno brskalnika."
   admin_js:
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 1f61668a5f..5abad2f2eb 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -576,9 +576,11 @@ sq:
         enable: "Aktivizo"
       second_factor:
         name: "Emri"
+        disable: "Çaktivizo"
+        save: "Ruaj"
         edit: "Redakto"
         security_key:
-          delete: "Fshij"
+          save: "Ruaj"
       change_about:
         title: "Ndrysho Rreth meje"
         error: "Pati një gabim gjatë ndryshimit të kësaj të dhëne."
@@ -1157,6 +1159,8 @@ sq:
       move_to_inbox:
         title: "Lëviz në Inbox"
         help: "Riktheje mesazhin në inbox"
+      edit_message:
+        title: "Redakto"
       defer:
         title: "Shty"
       list: "Temat"
@@ -1769,7 +1773,6 @@ sq:
         this_month: "Këtë muaj"
         this_week: "Këtë javë"
         today: "Sot"
-        other_periods: "shiko më populloret"
     permission_types:
       full: "Krijo / Përgjigju / Shiko"
       create_post: "Përgjigju / Shiko"
@@ -1923,6 +1926,10 @@ sq:
       custom_message_placeholder: "Vendosni mesazhin"
       custom_message_template_forum: "Hej, hajde bashkoju këtij forumi!"
       custom_message_template_topic: "Hej, besoj se do të të pelqejë kjo temë!"
+    footer_nav:
+      back: "Kthehu mbrapa"
+      share: "Shpërndaje"
+      dismiss: "Hiqe"
   admin_js:
     type_to_filter: "shkruaj për kërkim"
     admin:
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index 10b5d12881..b4a1cb8d45 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -524,9 +524,11 @@ sr:
         enable: "Omogući"
       second_factor:
         name: "Ime foruma"
+        disable: "Onemogući"
+        save: "Sačuvaj"
         edit: "Izmeni"
         security_key:
-          delete: "Obriši"
+          save: "Sačuvaj"
       change_about:
         title: "Promijeni O meni"
       change_username:
@@ -1000,6 +1002,8 @@ sr:
       create_long: "Otvori novu Temu"
       archive_message:
         title: "Arhiviraj"
+      edit_message:
+        title: "Izmeni"
       defer:
         title: "Odloži"
       list: "Teme"
@@ -1485,7 +1489,6 @@ sr:
         this_month: "Mesec"
         this_week: "Nedelja"
         today: "Danas"
-        other_periods: "vidi top teme"
     permission_types:
       full: "Otvoriti / Odgovori / Pogledaj"
       create_post: "Odgovori / Pogledaj"
@@ -1581,6 +1584,9 @@ sr:
           unread: "Nema više nepročitanih tema."
           top: "Nema više glavnih tema."
           bookmarks: "Nema više markiranih tema."
+    footer_nav:
+      back: "Nazad"
+      share: "Podeli"
   admin_js:
     type_to_filter: "upiši za filtriranje"
     admin:
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index ce299b9c5f..7c2d594cfc 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -276,6 +276,7 @@ sv:
       no_timezone: 'Du har ännu inte valt tidszon. Du kommer därför inte kunna sätta påminnelser. Ange en <a href="%{basePath}/my/preferences/profile">i din profil</a>.'
       invalid_custom_datetime: "Datumet och tiden du har angivit är ogiltig, vänligen försök igen."
       list_permission_denied: "Du har inte behörighet att visa bokmärken för denna användare."
+      delete_when_reminder_sent: "Radera detta bokmärke när notifikationen för påminnelsen är skickad."
       reminders:
         at_desktop: "Nästa gång är jag vid datorn"
         later_today: "Senare idag"
@@ -292,6 +293,8 @@ sv:
         tomorrow_with_time: "imorgon vid %{time}"
         at_time: "den %{date_time}"
         existing_reminder: "Du har en påminnelse inställd för detta bokmärke vilken kommer skickas"
+    copy_codeblock:
+      copied: "kopierad!"
     drafts:
       resume: "Återuppta"
       remove: "Ta bort"
@@ -676,14 +679,16 @@ sv:
           title: "Tystad"
           description: "Du kommer inte att bli meddelad om någonting för meddelanden i denna grupp.\n "
       flair_url: "Avatar Flair Bild"
-      flair_url_placeholder: "(Valfritt) Bild-URL eller typ Awesome-klass"
-      flair_url_description: 'Använd fyrkantiga bilder som inte är mindre än 20px gånger 20px eller FontAwesome-ikoner (accepterade format: "fa-icon", "far fa-icon" eller "fab fa-icon").'
+      flair_upload_description: "Använd fyrkantiga bilder som inte är mindre än 20px gånger 20px."
       flair_bg_color: "Avatar Flair Bakgrundsfärg"
       flair_bg_color_placeholder: "Hex färgvärde"
       flair_color: "En Avatar som ändrar färg beroende på ljuset"
       flair_color_placeholder: "(Valfritt) Hex-färgvärde"
       flair_preview_icon: "Förhandsvisa icon"
       flair_preview_image: "förhandsvisa bild"
+      flair_type:
+        icon: "Välj en ikon"
+        image: "Infoga Bild"
     user_action_groups:
       "1": "Gillningar givna"
       "2": "Gillningar mottagna"
@@ -745,6 +750,7 @@ sv:
       copied: "kopierad"
     user_fields:
       none: "(välj ett alternativ)"
+      required: 'Vänligen ange ett värde för "%{name}"'
     user:
       said: "{{username}}:"
       profile: "Profil"
@@ -760,6 +766,7 @@ sv:
       private_messages: "Meddelanden"
       user_notifications:
         filters:
+          filter_by: "Filtrera på"
           all: "Alla"
           read: "Läst"
           unread: "Olästa"
@@ -879,6 +886,7 @@ sv:
       api_approved: "Godkänd:"
       api_last_used_at: "Senast använd vid:"
       theme: "Tema"
+      save_to_change_theme: 'Tema kommer att uppdateras efter att du klickat "%{save_text}"'
       home: "Standard hemsida"
       staged: "Arrangerad"
       staff_counters:
@@ -926,8 +934,10 @@ sv:
         enable: "Aktivera"
         enable_long: "Aktivera reservkoder"
         manage: "Hantera reservkoder. Du har <strong>{{count}}</strong> reservkod kvar."
-        copied_to_clipboard: "Kopierad till urklipp"
+        copy_to_clipboard: "Kopiera till urklipp"
         copy_to_clipboard_error: "Fel vid kopiering av data till urklipp"
+        copied_to_clipboard: "Kopierad till urklipp"
+        download_backup_codes: "Ladda ner säkerhetskoder"
         remaining_codes: "Du har <strong>{{count}}</strong> reservkoder kvar."
         use: "Använd en reservkod"
         enable_prerequisites: "Då måste aktivera en primär andra faktor innan du skapar reservkoder."
@@ -954,28 +964,29 @@ sv:
         oauth_enabled_warning: "Vänligen notera att inloggning genom sociala medier kommer att stängas av när tvåfaktors autentisering har aktiverats för ditt konto."
         use: "Använd autentiseringsappen"
         enforced_notice: "Du behöver aktivera tvåfaktor autentisering innan du kan besöka denna sida."
-        disable: "inaktivera"
-        disable_title: "Inaktivera tvåfaktor"
+        disable: "Inaktivera"
         disable_confirm: "Är du säker på att du vill inaktivera alla tvåfaktorer?"
+        save: "Spara"
         edit: "Redigera"
         edit_title: "Redigera tvåfaktor"
         edit_description: "Tvåfaktor namn"
-        enable_security_key_description: "När du har din fysiska säkerhetsnyckel förberedd, tryck på registrera-knappen nedan."
+        enable_security_key_description: |
+          När du har din <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">säkerhetsnyckel för hårdvara</a> förberedd, tryck på registrera-knappen nedan.
         totp:
-          title: "Bevisbaserade autentiserare"
-          add: "Ny autentiserare"
-          default_name: "Min autentiserare"
+          title: "Bevisbaserade autentisering"
+          add: "Lägg till autentisering"
+          default_name: "Min autentisering"
           name_and_code_required_error: "Du måste ange ett namn samt koden från din app för autentisering."
         security_key:
           register: "Registrera"
           title: "Säkerhetsnycklar"
-          add: "Registrera säkerhetsnyckel"
+          add: "Lägg till säkerhetsnyckel"
           default_name: "Huvud säkerhetsnyckel"
           not_allowed_error: "Registreringsprocessen för säkerhetsnyckel dröjde antingen för länge eller avbröts."
           already_added_error: "Du har redan registrerat denna säkerhetsnyckel.\nDu behöver inte registrera den igen."
           edit: "Ändra säkerhetsnyckel"
+          save: "Spara"
           edit_description: "Namn på säkerhetsnyckel"
-          delete: "Radera"
           name_required_error: "Du måste ange ett namn för din säkerhetsnyckel."
       change_about:
         title: "Ändra Om Mig"
@@ -1019,6 +1030,7 @@ sv:
         sso_override_instructions: "E-post kan uppdateras från SSO leverantören."
         instructions: "Visas aldrig publikt"
         ok: "Vi skickar e-post till dig för bekräftelse"
+        required: "Vänligen ange en e-postadress"
         invalid: "Vänligen ange en giltig e-postadress"
         authenticated: "Din e-postadress har blivit verifierad av {{provider}}"
         frequency_immediately: "Vi kommer att skicka e-post till dig omedelbart om du inte har läst det som vi skickar e-post till dig om."
@@ -1039,6 +1051,7 @@ sv:
         title: "Namn"
         instructions: "ditt fullständiga namn (tillval)"
         instructions_required: "Ditt fullständiga namn"
+        required: "Vänligen ange ett namn"
         too_short: "Ditt namn är för kort"
         ok: "Ditt namn ser bra ut"
       username:
@@ -1052,6 +1065,7 @@ sv:
         too_long: "Ditt användarnamn är för långt"
         checking: "Kollar användarnamnets tillgänglighet..."
         prefilled: "E-postadressen matchar det här registrerade användarnamnet"
+        required: "Vänligen ange ett användarnamn"
       locale:
         title: "Gränssnittsspråk"
         instructions: "Språket som används av forumsgränssnittet. Det kommer att ändras när du laddar om sidan."
@@ -1195,6 +1209,7 @@ sv:
         same_as_email: "Ditt lösenord är detsamma som din e-postadress."
         ok: "Ditt lösenord ser bra ut."
         instructions: "åtminstone %{count} tecken"
+        required: "Vänligen ange ett lösenord"
       summary:
         title: "Sammanfattning"
         stats: "Statistik"
@@ -1508,6 +1523,9 @@ sv:
         one: "Välj åtminstone {{count}} föremål."
         other: "Välj åtminstone {{count}} föremål."
       invalid_selection_length: "Valet måste vara minst {{count}} tecken."
+      components:
+        categories_admin_dropdown:
+          title: "Kategorier i rullgardinsmenyn för administratörer"
     date_time_picker:
       from: Från
       to: Till
@@ -1591,8 +1609,8 @@ sv:
       edit_reason_placeholder: "varför redigerar du?"
       topic_featured_link_placeholder: "Ange länken som visas med titeln"
       remove_featured_link: "Ta bort länk från ämne."
-      reply_placeholder: "Skriv här. Använd Markdown, BBCode eller HTML för formattering. Släpp eller klistra in bilder."
-      reply_placeholder_no_images: "Skriv här. Använd Markdown, BBCode eller HTML för formattering. "
+      reply_placeholder: "Skriv här. Använd Markdown, BBCode eller HTML för formatering. Släpp eller klistra in bilder."
+      reply_placeholder_no_images: "Skriv här. Använd Markdown, BBCode eller HTML för formatering. "
       reply_placeholder_choose_category: "Välj en kategori innan du skriver här."
       view_new_post: "Visa ditt nya inlägg."
       saving: "Sparar"
@@ -1911,7 +1929,7 @@ sv:
         help: "Flytta tillbaka meddelandet till inkorgen"
       edit_message:
         help: "Redigera första inlägget av meddelanden"
-        title: "Ändra meddelande"
+        title: "Redigera"
       defer:
         help: "Märk som oläst"
         title: "Skjut upp"
@@ -2065,6 +2083,7 @@ sv:
           "2_8": "Du kommer se en räknare för nya svar eftersom du följer denna kategorin."
           "2_4": "Du kommer se en räknare för nya svar eftersom du postat ett svar i detta ämne."
           "2_2": "Du kommer se en räknare för nya svar eftersom du följer detta ämne."
+          "2": 'Du kommer se en räknare för nya svar eftersom du <a href="{{basePath}}/u/{{username}}/preferences/notifications">läser detta ämne</a>. '
           "1_2": "Du kommer få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg."
           "1": "Du kommer få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg."
           "0_7": "Du ignorerar alla notifikationer i den här kategorin."
@@ -3047,6 +3066,11 @@ sv:
       custom_message_template_forum: "Hej! Du borde gå med i det här forumet!"
       custom_message_template_topic: "Hej! Jag tror att du kanske skulle uppskatta det här ämnet!"
     forced_anonymous: "På grund av extrem belastning, visas detta för samtliga precis som en utloggad användare skulle se det."
+    footer_nav:
+      back: "Tillbaka"
+      forward: "Framåt"
+      share: "Dela"
+      dismiss: "Avfärda"
     safe_mode:
       enabled: "Säkert läge är aktiverat, för att lämna säkert läge stäng detta webläsarfönster"
   admin_js:
@@ -3297,12 +3321,6 @@ sv:
         tag_event:
           name: "Tagghändelse"
           details: "När en tagg skapas, uppdateras eller förstörs."
-        flag_event:
-          name: "Flagghändelse"
-          details: "När en flagga skapas, motsätts eller ignoreras."
-        queued_post_event:
-          name: "Godkänt inläggshändelse"
-          details: "När ett köat inlägg skapas, godkänns eller nekas. "
         reviewable_event:
           name: "Granskningshändelse"
           details: "När ett föremål är redo för granskning och när dess status är uppdaterad."
@@ -4056,7 +4074,7 @@ sv:
         anonymize_failed: "Ett problem uppstod vid anonymiseringen av kontot"
         delete: "Radera användare"
         merge:
-          transfer_and_delete: "Överför & radera"
+          button: "Slå ihop"
           prompt:
             title: "Överför & radera @%{username}"
             description: |
@@ -4390,6 +4408,7 @@ sv:
         post_title: "Publicera"
         category_id: "Kategori-ID"
         category_title: "Kategori"
+        tag_name: "Namn på tagg"
         external_url: "Extern URL"
         destination: "Mål"
         delete_confirm: "Är du säker på att du vill ta bort den här permalänken?"
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 2b513eeede..fcbcc9a504 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -483,7 +483,6 @@ sw:
         muted:
           title: "Imenyamazishwa"
       flair_url: "Picha ya mtumiaji"
-      flair_url_placeholder: "(Hiari) URL ya Picha au Font Awesome class"
       flair_bg_color: "Rangi ya nyuma kwenye picha ya mtumiaji"
       flair_bg_color_placeholder: "(Hiari) Thamani ya Rangi kwa Hex"
       flair_color: "Rangi ya picha ya mtumiaji"
@@ -693,8 +692,9 @@ sw:
         disable: "Sitisha"
         enable: "Wezesha"
         enable_long: "Wezesha kodi za backup"
-        copied_to_clipboard: "Nakili"
+        copy_to_clipboard: "Umenakili kwenye Ubao Nakili"
         copy_to_clipboard_error: "Makosa kwenye Kunakili"
+        copied_to_clipboard: "Nakili"
         remaining_codes: "Una kodi <strong>{{count}}</strong> za backup zimebaki."
       second_factor:
         title: "Uhalalalishaji wa Viwango Viwili"
@@ -704,10 +704,12 @@ sw:
         disable_description: "Tafadhali andika kodi ya uthibitisho kutoka kwenye app yako"
         show_key_description: "Andika kwa mkono"
         oauth_enabled_warning: "Tafadhali jua kuwa kuingia kupitia mitandao itasitishwa kama uthibitisho wa kiwango cha pili umewezeshwa kwenye akaunti yako."
+        disable: "Sitisha"
+        save: "hifadhi"
         edit: "Hariri"
         security_key:
           register: "Jisajili"
-          delete: "Futa"
+          save: "hifadhi"
       change_about:
         title: "Badilisha Taarifa Zangu"
         error: "Hitilafu imetokea wakati wa kubadilisha namba hii."
@@ -1483,7 +1485,7 @@ sw:
         help: "Hamisha kwenda Kisanduku pokezi"
       edit_message:
         help: "Hariri chapisho la kwanza la ujumbe"
-        title: "Hariri Ujumbe"
+        title: "Hariri"
       list: "Mada"
       new: "mada mpya"
       unread: "haijasomwa"
@@ -2143,7 +2145,6 @@ sw:
         this_month: "Mwezi"
         this_week: "Wiki"
         today: "Leo"
-        other_periods: "tazama juu"
     permission_types:
       full: "Tengeneza / Jibu / Angalia"
       create_post: "Jibu / Angalia"
@@ -2304,6 +2305,10 @@ sw:
       custom_message_placeholder: "Andika ujumbe binafsi"
       custom_message_template_forum: "Habari, jiunge kwenye jumuiya yetu!"
       custom_message_template_topic: "Habari, nadhani utaipenda hii mada!"
+    footer_nav:
+      back: "Nyuma"
+      share: "Shirikisha"
+      dismiss: "Ondosha"
   admin_js:
     type_to_filter: "andika kuchuja..."
     admin:
@@ -2477,8 +2482,6 @@ sw:
         tag_event:
           name: "Lebo Tukio"
           details: "Wakati lebo inapotengenezwa, sasishwa au kufutwa."
-        flag_event:
-          name: "Repoti Tukio"
         delivery_status:
           title: "Hali ya Uwasilishaji"
           inactive: "Isiyo Amilifu"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index 39e4382963..a546d79c94 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -423,9 +423,11 @@ te:
         enable: "చేతనం"
       second_factor:
         name: "పేరు"
+        disable: "అచేతనం"
+        save: "భద్రపరచు"
         edit: "సవరించు"
         security_key:
-          delete: "తొలగించు"
+          save: "భద్రపరచు"
       change_about:
         title: "నా గురించి మార్చు"
       change_username:
@@ -802,6 +804,8 @@ te:
     topic:
       create: "కొత్త విషయం"
       create_long: "కొత్త విషయం సృష్టించు"
+      edit_message:
+        title: "సవరించు"
       defer:
         title: "వాయిదావేయి"
       list: "విషయాలు"
@@ -1324,6 +1328,9 @@ te:
           unread: "ఇంకా చదవని విషయాలు లేవు."
           top: "ఇంకా అగ్ర విషయాలు లేవు."
           bookmarks: "ఇంకా పేజీక విషయాలు లేవు."
+    footer_nav:
+      back: "వెనుకకు"
+      share: "పంచు"
   admin_js:
     type_to_filter: "జల్లించుటకు రాయి..."
     admin:
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 3d9a939289..dabbe4811f 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -546,9 +546,11 @@ th:
         enable: "เปิดใช้งาน"
       second_factor:
         name: "ชื่อ"
+        disable: "ปิดใช้งาน"
+        save: "บันทึก"
         edit: "แก้ไข"
         security_key:
-          delete: "ลบ"
+          save: "บันทึก"
       change_about:
         title: "เปลี่ยนข้อมูลเกี่ยวกับฉัน"
         error: "เกิดความผิดพลาดในการแก้ไขค่านี้"
@@ -1059,6 +1061,8 @@ th:
       move_to_inbox:
         title: "ย้ายไปกล่องขาเข้า"
         help: "ย้ายข้อความกลับไปกล่องข้อความ"
+      edit_message:
+        title: "แก้ไข"
       list: "กระทู้"
       new: "สร้างกระทู้"
       unread: "ยังไม่ได้อ่าน"
@@ -1398,7 +1402,6 @@ th:
         this_month: "เดือน"
         this_week: "อาทิตย์"
         today: "วันนี้"
-        other_periods: "ดูสูงสุด"
     permission_types:
       full: "สร้าง / ตอบ / ดู"
       create_post: "ตอบ / ดู"
@@ -1515,6 +1518,10 @@ th:
           unread: "ไม่มีหัวข้อที่ยังไม่อ่านแล้ว"
           top: "ไม่มีหัวข้อสูงสุดแล้ว"
           bookmarks: "ไม่มีบุ๊คมาร์คในหัวข้อใดอีกแล้ว"
+    footer_nav:
+      back: "กลับ"
+      share: "แบ่งปัน"
+      dismiss: "ซ่อน"
   admin_js:
     type_to_filter: "พิมพ์เพื่อกรอง..."
     admin:
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 9f80b0e39f..db99f641cc 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -656,8 +656,6 @@ tr_TR:
           title: "Sessiz"
           description: "Bu gruptaki bütün mesajlarla ilgili bilgilendirileceksiniz."
       flair_url: "Avatar Resmi"
-      flair_url_placeholder: "(İsteğe bağlı) Resim URL'si veya Font Awesome Class'ı"
-      flair_url_description: 'Kullanılan kare resimler ve FontAwesome ikonu 20x20px''den küçük olamaz (Kabul edilen formatlar: "fa-icon", "far fa-icon" veya "fab fa-icon").'
       flair_bg_color: "Avatar Arkaplan Rengi"
       flair_bg_color_placeholder: "(İsteğe bağlı) Hex renk değeri"
       flair_color: "Avatar Rengi"
@@ -902,8 +900,9 @@ tr_TR:
         enable: "Etkinleştir"
         enable_long: "Yedek kodları etkinleştir"
         manage: "Yedek kodları yönet.  <strong>{{count}}</strong> yedek kod kaldı."
-        copied_to_clipboard: "Panoya kopyalandı"
+        copy_to_clipboard: "Kopyala"
         copy_to_clipboard_error: "Panoya kopyalanırken hata oluştu"
+        copied_to_clipboard: "Panoya kopyalandı"
         remaining_codes: "<strong>{{count}}</strong> yedek kodun kaldı "
         use: "Bir yedekleme kodu kullanın"
         enable_prerequisites: "Yedek kodları oluşturmadan önce birincil ikinci faktörü etkinleştirmelisiniz."
@@ -929,27 +928,24 @@ tr_TR:
         oauth_enabled_warning: "Hesabınızda iki faktörlü kimlik doğrulaması etkinleştirildikten sonra sosyal girişlerin devre dışı bırakılacağını lütfen unutmayın."
         use: "Authenticator uygulamasını kullan"
         enforced_notice: "Bu siteye erişmeden önce iki faktörlü kimlik doğrulamasını etkinleştirmeniz gerekir."
-        disable: "devre dışı bırak"
-        disable_title: "İkinci Faktör İnaktif"
+        disable: "Devre dışı bırak"
         disable_confirm: "Bütün ikinci faktörleri inaktifleştirmek istediğinize emin misiniz?"
+        save: "Kaydet"
         edit: "Düzenle"
         edit_title: "İkinci Faktörü Düzenle"
         edit_description: "İkinci Faktör Adı"
-        enable_security_key_description: "Fiziksel güvenlik anahtarınızı hazırladığınızda, aşağıdaki Kayıt düğmesine basın."
         totp:
           title: "Token Tabanlı Doğrulayıcılar"
-          add: "Yeni Doğrulayıcı"
           default_name: "Benim Doğrulayıcım"
         security_key:
           register: "Kayıt Ol"
           title: "Güvenlik Sözcükleri"
-          add: "Güvenlik Anahtarını Kaydedin"
           default_name: "Ana Güvenlik Anahtarı"
           not_allowed_error: "Güvenlik anahtarı kayıt işlemi zaman aşımına uğradı veya iptal edildi."
           already_added_error: "Bu güvenlik anahtarın daha önce kaydettiğiniz için tekrar kaydetmeniz gerekmez."
           edit: "Güvenlik Anahtarını Düzenle"
+          save: "Kaydet"
           edit_description: "Güvenlik Anahtarı Adı"
-          delete: "Sil"
       change_about:
         title: "\"Hakkımda\"yı Değiştir"
         error: "Bu değeri değiştirirken bir hata oluştu."
@@ -1860,7 +1856,7 @@ tr_TR:
         help: "Mesajı yeniden gelen kutusuna taşı"
       edit_message:
         help: "Mesajın ilk gönderisini düzenle"
-        title: "Gönderiyi düzenle"
+        title: "Düzenle"
       defer:
         help: "okunmamış olarak işaretle"
         title: "Ertele"
@@ -2718,7 +2714,6 @@ tr_TR:
         this_month: "Ay"
         this_week: "Hafta"
         today: "Bugün"
-        other_periods: "yukarı bak"
     permission_types:
       full: "Oluştur / Cevapla / Bak"
       create_post: "Cevapla / Bak"
@@ -2946,6 +2941,10 @@ tr_TR:
       custom_message_template_forum: "Hey, bu foruma katılmalısın!"
       custom_message_template_topic: "Hey, bu konu senin için eğlenceli olabilir!"
     forced_anonymous: "Aşırı yükleme nedeniyle, çıkış yapan bir kullanıcının göreceği şekilde herkese geçici olarak gösteriliyor. "
+    footer_nav:
+      back: "Geri"
+      share: "Paylaş"
+      dismiss: "Yoksay"
     safe_mode:
       enabled: "Güvenli mod etkin, çıkmak için bu tarayıcı penceresini kapat"
   admin_js:
@@ -3192,12 +3191,6 @@ tr_TR:
         tag_event:
           name: "Etiket Etkinliği"
           details: "Bir etiket oluşturulduğunda, güncellendiğinde veya iptal edildiğinde."
-        flag_event:
-          name: "Bayraklı Etkinlik"
-          details: "Bir bayrak oluşturulduğunda, mutabık kalınmış, kalınmamış veya yoksayılmış."
-        queued_post_event:
-          name: "Etkinlik Onayı Gönderisi"
-          details: "Yeni bir kuyruklu posta oluşturulduğunda, onaylanan veya reddedilen."
         reviewable_event:
           name: "Görüntülenebilen Etkinlik"
           details: "Yeni bir öğe incelemeye hazır olduğunda ve durumu güncellendiğinde."
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 827ff0876a..6d77e5b8ce 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -731,8 +731,6 @@ uk:
           title: "Ігнорувати"
           description: "Ви не будете сповіщені ні про що, що стосується повідомлень у цій групі."
       flair_url: "Зображення Avatar Flair"
-      flair_url_placeholder: "(Необов'язково) Посилання зображення або клас Font Awesome"
-      flair_url_description: 'Використовуйте квадратні іконки не менші за 20px на 20px або інконки FontAwesome (прийнятні формати: "fa-icon", "far fa-icon" або "fab fa-icon").'
       flair_bg_color: "Колір тла Avatar Flair"
       flair_bg_color_placeholder: "(Необов'язково) Значення кольору в Hex-код"
       flair_color: "Колір Avatar Flair"
@@ -985,8 +983,9 @@ uk:
         enable: "Увімкнути"
         enable_long: "Увімкнути резервні коди"
         manage: "Керувати резервними кодами. У вас залишилося резервних кодів: <strong>{{count}}</strong>."
-        copied_to_clipboard: "Скопійовано у буфер обміну"
+        copy_to_clipboard: "Скопіювати в буфер"
         copy_to_clipboard_error: "Помилка під час копіювання даних у буфер обміну"
+        copied_to_clipboard: "Скопійовано у буфер обміну"
         remaining_codes: "У вас залишилося резервних кодів: <strong>{{count}}</strong>."
         use: "Використовуйте резервний код"
         enable_prerequisites: "Ви повинні увімкнути основний другий фактор, перш ніж генерувати резервні коди."
@@ -1012,27 +1011,24 @@ uk:
         oauth_enabled_warning: "Будь ласка, зверніть увагу, що вхід через соціальні мережі буде вимкнено, як тільки у вашому обліковому записі буде увімкнена двофакторна автентифікація."
         use: "Використовуйте додаток для перевірки автентифікації "
         enforced_notice: "Ви мусите увімкнути двофакторну автентифікацію, щоб отримати доступ до цього сайту."
-        disable: "вимкнути"
-        disable_title: "Вимкнути другий фактор"
+        disable: "Вимкнути"
         disable_confirm: "Ви впевнені, що бажаєте вимкнути усі другі фактори?"
+        save: "Зберегти"
         edit: "Редагувати"
         edit_title: "Редагувати другий фактор"
         edit_description: "Назва другого фактора"
-        enable_security_key_description: "Коли ви підготуєте свій фізичний ключ безпеки, натисніть кнопку Реєстрація нижче."
         totp:
           title: "Автентифікатори на токенах"
-          add: "Новий автентифікатор"
           default_name: "Мій автентифікатор"
         security_key:
           register: "Зареєструватися"
           title: "Ключі безпеки"
-          add: "Зареєструвати ключ безпеки"
           default_name: "Головний Ключ Безпеки"
           not_allowed_error: "Час реєстрації ключа безпеки минув, або він був скасований."
           already_added_error: "Ви вже зареєстрували цей ключ безпеки. Вам не потрібно реєструвати його знову."
           edit: "Змінити Ключ Безпеки"
+          save: "Зберегти"
           edit_description: "Назва Ключа Безпеки"
-          delete: "Вилучити"
       change_about:
         title: "Змінити інформацію про мене"
         error: "Сталася помилка під час цієї зміни."
@@ -1989,7 +1985,7 @@ uk:
         help: "Перемістити повідомлення у вхідні"
       edit_message:
         help: "Змінити перше повідомлення"
-        title: "Редагувати повідомлення"
+        title: "Редагувати"
       defer:
         help: "Позначити як непрочитане"
         title: "Відкласти"
@@ -2943,7 +2939,6 @@ uk:
         this_month: "Місяць"
         this_week: "Тиждень"
         today: "Today"
-        other_periods: "показати найбільш обговорювані"
     permission_types:
       full: "Створювати / Відповідати / Бачити"
       create_post: "Відповідати / Бачити"
@@ -3193,6 +3188,10 @@ uk:
       custom_message_template_forum: "Вітання. Подумав, що тобі буде цікаво зареєструватися на цьому форумі!"
       custom_message_template_topic: "Вітання! Подумав, що тебе може зацікавити ця тема!"
     forced_anonymous: "Через надмірне навантаження, це тимчасово показується всім, як якщо б користувач вийшов з системи."
+    footer_nav:
+      back: "Назад"
+      share: "Поширити"
+      dismiss: "Відкинути"
     safe_mode:
       enabled: "Включено безпечний режим, щоб вийти з безпечного режиму, закрийте поточне вікно браузера"
   admin_js:
@@ -3441,12 +3440,6 @@ uk:
         tag_event:
           name: "Подія мітки"
           details: "Коли мітка створюється, оновлюється або знищується"
-        flag_event:
-          name: "Відмітити подію"
-          details: "Коли прапор створений, узгоджений, не згоден або ігнорується."
-        queued_post_event:
-          name: "Пост після затвердження"
-          details: "Коли новий запис в черзі створюється, затверджується або відхиляється."
         reviewable_event:
           name: "переглянуті Події"
           details: "Коли новий елемент готовий до розгляду та коли його статус оновлюється."
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 30f50a2862..072bd19ef2 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -642,8 +642,6 @@ ur:
           title: "خاموش کِیا ہوا"
           description: "آپ کو اِس گروپ کے پیغامات کے بارے میں کسی بھی چیز پر مطلع نہیں کیا جائے گا۔"
       flair_url: "اوتار فلیر کی تصویر"
-      flair_url_placeholder: "(اختیاری) تصویر کا URL یا فونٹ اَوسم کلاس"
-      flair_url_description: 'چکور تصاویر جو 20px سے 20px سے کم نہ ہوں، یا فونٹ اَوسم آئیکن (قبول فارمیٹس: "fa-icon"، "far fa-icon" یا "fab fa-icon") استعمال کریں۔'
       flair_bg_color: "اوتار فلیر کے پَسِّ منظر کا رنگ"
       flair_bg_color_placeholder: "(اختیاری) ہیکس رنگ نمبر"
       flair_color: "اوتار فلیر کا رنگ"
@@ -885,8 +883,9 @@ ur:
         enable: "فعال کریں"
         enable_long: "بیک اپ کوڈ فعال کریں"
         manage: "بیک اپ کوڈز کا انتظام کریں۔ آپ کے پاس <strong>{{count}}</strong> بیک اپ کوڈ باقی ہیں۔"
-        copied_to_clipboard: "کلِپ بورڈ میں کاپی کر لیا گیا"
+        copy_to_clipboard: "کلِپ بورڈ میں کاپی کریں"
         copy_to_clipboard_error: "کلِپ بورڈ میں ڈیٹا کاپی کرنے پر خرابی کا سامنا کر نا پرا"
+        copied_to_clipboard: "کلِپ بورڈ میں کاپی کر لیا گیا"
         remaining_codes: "آپ کے پاس <strong>{{count}}</strong> بیک اپ کوڈ باقی ہیں۔"
         enable_prerequisites: "بیک اپ کوڈز تیار کرنے سے پہلے آپ کا ایک بنیادی دوسرا فیکٹر فعال کرنا ضروری ہے۔"
         codes:
@@ -909,19 +908,18 @@ ur:
           دو فیکٹر توثیق پاسوَرڈ کے ساتھ ساتھ ایک دفعہ کے ٹَوکن کو مانگ کر آپ کے اکاؤنٹ کیلئے اضافی سیکورٹی شامل کرتا ہے۔ ٹَوکن <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>اینڈرائڈ</a> اور <a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a> ڈیوائسوں پر تخلیق کیے جا سکتے ہیں۔
         oauth_enabled_warning: "براہ مہربانی نوٹ کریں کہ ایک بار جب آپ کے اکاؤنٹ پر دو فیکٹر توثیق فعال ہو جائے تو سَوشَل لاگ اِن غیر فعال ہوجائیں گے۔"
         enforced_notice: "اِس سائٹ تک رسائی حاصل کرنے کیلئے آپ کا دو فیکٹر توثیق فعال کرنا ضروری ہے۔"
-        disable: "غیر فعال"
-        disable_title: "دوسرا فیکٹر غیر فعال کریں"
+        disable: "غیر فعال کریں"
         disable_confirm: "کیا آپ واقعی تمام دوسرے فیکٹر غیر فعال کرنا چاہتے ہیں؟"
+        save: "محفوظ کریں"
         edit: "ترمیم"
         edit_title: "دوسرا فیکٹر ترمیم کریں"
         edit_description: "دوسرا فیکٹر نام"
         totp:
           title: "ٹوکن کی بنیاد پر تصديق کنندہ"
-          add: "نیا تصديق کنندہ"
           default_name: "میرا تصديق کنندہ"
         security_key:
           register: "رجسٹر"
-          delete: "حذف کریں"
+          save: "محفوظ کریں"
       change_about:
         title: "\"میرے بارے میں\" تبدیل کریں"
         error: "اِس چیز کو تبدیل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
@@ -1802,7 +1800,7 @@ ur:
         help: "پیغام واپس اِنباکس میں منتقل کریں"
       edit_message:
         help: "پیغام کی پہلی اشاعت میں ترمیم کریں"
-        title: "پیغام میں ترمیم کریں"
+        title: "ترمیم"
       defer:
         help: "بغیر پڑھا نشان زد کریں"
         title: "ملتوی کریں"
@@ -2635,7 +2633,6 @@ ur:
         this_month: "مہینہ"
         this_week: "ہفتہ"
         today: "آج"
-        other_periods: "سب سے اوپر دیکھیں"
     permission_types:
       full: "بنائیں / جواب دیں / ملاحظہ کریں"
       create_post: "جواب دیں / ملاحظہ کریں"
@@ -2839,6 +2836,10 @@ ur:
       custom_message_template_forum: "ارے، آپ کو اس فورم میں شامل ہونا چاہیے!"
       custom_message_template_topic: "ارے، میں نے سوچا کہ آپ اِس ٹاپک سے لطف اندوز ہوں گے!"
     forced_anonymous: "انتہائی بوجھ کی وجہ سے، یہ عارضی طور پر سب کو ایسے دکھایا جا رہا ہے جیسے لاگ آؤٹ صارف اِسے دیکھتے ہیں۔"
+    footer_nav:
+      back: "واپس"
+      share: "شیئر"
+      dismiss: "بر خاست کریں"
     safe_mode:
       enabled: "سیف موڈ فعال ہے، سیف موڈ سے باہر نکلنے کے لئے اِس براؤزر وِنڈو کو بند کریں"
   admin_js:
@@ -3066,12 +3067,6 @@ ur:
         tag_event:
           name: "ٹَیگ واقعہ"
           details: "جب ایک ٹَیگ بنایا، اَپ ڈیٹ یا ختم کیا جاتا ہے۔"
-        flag_event:
-          name: "واقعہ فلَیگ کریں"
-          details: "جب ایک فلَیگ پر اتفاق، اختلاف یا اُسے نظر انداز کیا جاتا ہے۔"
-        queued_post_event:
-          name: "منظوری واقعہ شائع کریں"
-          details: "جب ایک نئی قطار شدہ پوسٹ بنائی، منظور یا مسترد کی جاتی ہے۔"
         reviewable_event:
           name: "قابل تجدید واقعہ"
           details: "جب ایک نئی چیز جائزہ کیلئے تیار ہو اور جب اُس کا اسٹیٹس اپ ڈیٹ کیا جائے۔"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index fc4284891e..fab41b115e 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -620,8 +620,6 @@ vi:
           title: "Im lặng"
           description: "Bạn sẽ không được thông báo về bất kì tin nhắn nào trong nhóm này nữa."
       flair_url: "Ảnh đại diện"
-      flair_url_placeholder: "(Tuỳ chọn) Link đến hình ảnh hoặc lớp Font Awesome"
-      flair_url_description: 'Ảnh hình vuông của bạn không được nhỏ hơn 20px x 20px hoặc FontAwesome không hợp lệ (chấp nhận: "fa-icon", "far fa-icon" hoặc "fab fa-icon").'
       flair_bg_color: "Màu nền ảnh đại diện"
       flair_bg_color_placeholder: "(Tuỳ chọn) Giá trị mã màu Hexa"
       flair_color: "Màu ảnh đại diện"
@@ -843,8 +841,8 @@ vi:
         disable: "Vô hiệu hóa"
         enable: "Kích hoạt"
         enable_long: "Bật backup codes"
-        copied_to_clipboard: "Sao chép vào Clipboard"
         copy_to_clipboard_error: "Lỗi sao chép dữ liệu vào Clipboard"
+        copied_to_clipboard: "Sao chép vào Clipboard"
         remaining_codes: "Bạn có <strong>{{count}}</strong> mã sao lưu còn lại."
         use: "Sử dụng mã dự phòng"
       second_factor:
@@ -852,11 +850,13 @@ vi:
         name: "Tên"
         show_key_description: "Nhập thủ công"
         oauth_enabled_warning: "Xin lưu ý rằng thông tin đăng nhập xã hội sẽ bị vô hiệu hóa khi xác thực hai yếu tố đã được bật trên tài khoản của bạn."
+        disable: "Vô hiệu hóa"
+        save: "Lưu"
         edit: "Sửa"
         totp:
           default_name: "Authenticator của bạn"
         security_key:
-          delete: "Xóa"
+          save: "Lưu"
       change_about:
         title: "Thay đổi thông tin về tôi"
         error: "Có lỗi xảy ra khi thay đổi giá trị này."
@@ -1514,6 +1514,8 @@ vi:
       move_to_inbox:
         title: "Chuyển sang hộp thư"
         help: "Chuyển tin nhắn trở lại hộp thư"
+      edit_message:
+        title: "Sửa"
       defer:
         title: "Hoãn"
       list: "Chủ đề"
@@ -2122,7 +2124,6 @@ vi:
         this_month: "Tháng"
         this_week: "Tuần"
         today: "Ngày"
-        other_periods: "xem top"
     permission_types:
       full: "Tạo / Trả lời / Xem"
       create_post: "Trả lời / Xem"
@@ -2252,6 +2253,10 @@ vi:
           unread: "Không còn thêm chủ đề chưa đọc nào nữa."
           top: "Không còn của đề top nào nữa."
           bookmarks: "Không còn thêm chủ đề được đánh dấu nào nữa."
+    footer_nav:
+      back: "Quay lại"
+      share: "Chia sẻ"
+      dismiss: "Hủy bỏ"
   admin_js:
     type_to_filter: "gõ để lọc..."
     admin:
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index ac953c74f1..2fd20b3b61 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -252,6 +252,7 @@ zh_CN:
       no_timezone: '你尚未设置时区。您将无法设置提醒。在 <a href="%{basePath}/my/preferences/profile">你的个人资料中</a>设置。'
       invalid_custom_datetime: "你所提供的日期和时间无效，请重试。"
       list_permission_denied: "你没有权限查看该用户的收藏。"
+      delete_when_reminder_sent: "提醒发出后删除该收藏。"
       reminders:
         at_desktop: "下次我使用桌面设备时"
         later_today: "今天的某个时候"
@@ -268,6 +269,8 @@ zh_CN:
         tomorrow_with_time: "明天%{time}"
         at_time: "于%{date_time}"
         existing_reminder: "你为该收藏所设定的提醒将被发出"
+    copy_codeblock:
+      copied: "已复制！"
     drafts:
       resume: "复位"
       remove: "移除"
@@ -639,8 +642,6 @@ zh_CN:
           title: "静音"
           description: "你不会收到有关此组中消息的任何通知。"
       flair_url: "头像图片"
-      flair_url_placeholder: "（可选）图片 URL 或 Font Awesome class"
-      flair_url_description: '使用不小于20px × 20px的方形图像或FontAwesome图标（可接受的格式：“fa-icon”，“far fa-icon”或“fab fa-icon”）。'
       flair_bg_color: "头像背景颜色"
       flair_bg_color_placeholder: "（可选）十六进制色彩值"
       flair_color: "头像颜色"
@@ -887,8 +888,9 @@ zh_CN:
         enable: "启用"
         enable_long: "启用备份码"
         manage: "管理备份码。你还剩下<strong>{{count}}</strong>个备份码。"
-        copied_to_clipboard: "已复制到剪贴板"
+        copy_to_clipboard: "复制到剪贴板"
         copy_to_clipboard_error: "复制到剪贴板时出错"
+        copied_to_clipboard: "已复制到剪贴板"
         remaining_codes: "你有<strong>{{count}}</strong>个备份码"
         use: "使用备份码"
         enable_prerequisites: "你必须在生成备份代码之前启用主要第二因素。"
@@ -915,27 +917,28 @@ zh_CN:
         use: "使用身份验证器应用"
         enforced_notice: "在访问此站点之前，你需要启用双重身份验证。"
         disable: "停用"
-        disable_title: "禁用次要身份验证器"
         disable_confirm: "确定禁用所有的两步验证吗？"
+        save: "保存"
         edit: "编辑"
         edit_title: "编辑次要身份验证器"
         edit_description: "次要身份验证器名称"
-        enable_security_key_description: "当你准备好物理安全密钥后，请按下面的“注册”按钮。"
+        enable_security_key_description: |
+          当你准备好<a href="https://www.google.com/search?q=hardware+security+key" target="_blank">物理安全密钥</a>后，请按下面的“注册”按钮。
         totp:
           title: "基于凭证的身份验证器"
-          add: "新增身份验证器"
+          add: "添加身份验证器"
           default_name: "我的身份验证器"
           name_and_code_required_error: "你必须提供你的身份验证器应用的名称和代码。"
         security_key:
           register: "注册"
           title: "安全密钥"
-          add: "注册安全密钥"
+          add: "添加安全密钥"
           default_name: "主要安全密钥"
           not_allowed_error: "安全密钥注册过程已超时或被取消。"
           already_added_error: "你已注册此安全密钥，无需再次注册。"
           edit: "编辑安全密钥"
+          save: "保存"
           edit_description: "安全密钥名称"
-          delete: "删除"
           name_required_error: "你必须提供安全密钥的名称。"
       change_about:
         title: "更改个人信息"
@@ -979,6 +982,7 @@ zh_CN:
         sso_override_instructions: "电子邮件地址可以通过SSO登录来更新。"
         instructions: "绝不会被公开显示"
         ok: "将通过邮件验证确认"
+        required: "请输入一个电子邮件地址"
         invalid: "请填写正确的邮箱地址"
         authenticated: "你的邮箱已被{{provider}}验证过了"
         frequency_immediately: "如果你没有阅读过摘要邮件中的相关内容，将立即发送电子邮件给你。"
@@ -998,6 +1002,7 @@ zh_CN:
         title: "昵称"
         instructions: "你的全名（可选）"
         instructions_required: "你的昵称"
+        required: "请输入一个名字"
         too_short: "昵称过短"
         ok: "昵称可用"
       username:
@@ -1153,6 +1158,7 @@ zh_CN:
         same_as_email: "密码不能与邮箱相同"
         ok: "密码符合要求"
         instructions: "至少%{count}个字符"
+        required: "请输入一个密码"
       summary:
         title: "概要"
         stats: "统计"
@@ -1455,6 +1461,9 @@ zh_CN:
       min_content_not_reached:
         other: "选择至少{{count}}条。"
       invalid_selection_length: "选择的字符至少为{{count}}个字符。"
+      components:
+        categories_admin_dropdown:
+          title: "分类管理下拉菜单"
     date_time_picker:
       from: 从
       to: 发至
@@ -1618,7 +1627,7 @@ zh_CN:
         message:
           other: "{{count}} 条未读私信"
         high_priority:
-          other: "%{count}个未读的高优先级通知"
+          other: "%{count} 个未读的高优先级通知"
       title: "使用@提到你，回复你的内容、私信以及其他的通知"
       none: "现在无法载入通知"
       empty: "未发现通知"
@@ -1848,7 +1857,7 @@ zh_CN:
         help: "移动私信到收件箱"
       edit_message:
         help: "编辑消息中的第一帖"
-        title: "编辑消息"
+        title: "编辑"
       defer:
         help: "标记为未读"
         title: "推迟处理"
@@ -1995,6 +2004,7 @@ zh_CN:
           "2_8": "因为你追踪了该分类，所以你会看到新回复的数量。"
           "2_4": "你会看到新回复的数量的原因是你曾经回复过该主题。"
           "2_2": "你会看到新回复数量的原因是你正在追踪该主题。"
+          "2": '你会看到新回复的数量是因为你<a href="{{basePath}}/u/{{username}}/preferences/notifications">阅读过该主题</a>。'
           "1_2": "有人@你或回复你时会通知你。"
           "1": "如果有人@你或回复你，将通知你。"
           "0_7": "你将忽略关于该分类的所有通知。"
@@ -2689,7 +2699,7 @@ zh_CN:
         this_month: "月"
         this_week: "周"
         today: "今天"
-        other_periods: "查看热门"
+        other_periods: "查看热门："
     browser_update: '抱歉，<a href="https://www.discourse.org/faq/#browser">你用于浏览本网站的浏览器太旧了</a>。请<a href="https://browsehappy.com">更新你的浏览器</a>以用于浏览丰富多彩的内容、登录还有回复。'
     permission_types:
       full: "创建 / 回复 / 阅读"
@@ -2924,6 +2934,10 @@ zh_CN:
       custom_message_template_forum: "你好，你应该加入这个论坛！"
       custom_message_template_topic: "你好，我觉得你可能会喜欢这个主题！"
     forced_anonymous: "由于极端负载，暂时向所有人显示，已注销用户会看到它。"
+    footer_nav:
+      back: "返回"
+      share: "分享"
+      dismiss: "忽略"
     safe_mode:
       enabled: "安全模式已经开启，关闭该浏览器窗口以退出安全模式"
   admin_js:
@@ -3173,12 +3187,6 @@ zh_CN:
         tag_event:
           name: "标签事件"
           details: "当标签创建，更新或销毁时。"
-        flag_event:
-          name: "标记事件"
-          details: "当标签创建，审批通过，审批不通过或忽略时。"
-        queued_post_event:
-          name: "帖子审批事件"
-          details: "当新的帖子队列创建，审批通过或拒绝时。"
         reviewable_event:
           name: "需审核事件"
           details: "当新条目准备审核时及其状态更新时。"
@@ -3928,7 +3936,7 @@ zh_CN:
         anonymize_failed: "在匿名化该账户时遇到问题。"
         delete: "删除用户"
         merge:
-          transfer_and_delete: "迁移并删除"
+          button: "合并"
           prompt:
             title: "迁移并删除 @%{username}"
             description: |
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index f82e74325a..28a810d7bf 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -565,8 +565,6 @@ zh_TW:
           title: "靜音"
           description: "您不會收到任何此群組內訊息的推播通知。"
       flair_url: "頭像圖片"
-      flair_url_placeholder: "（可選）圖片網站或 Font Awesome class"
-      flair_url_description: '請用不小於20×20像素的方形圖片或FontAwesome圖標（可接受的格式包含：“fa-icon”，“far fa-icon”或“fab fa-icon”）。'
       flair_bg_color: "頭像背景顏色"
       flair_bg_color_placeholder: "（可選）十六進制色彩值"
       flair_color: "頭像顏色"
@@ -801,8 +799,9 @@ zh_TW:
         disable: "禁用"
         enable: "啟用"
         enable_long: "啟用備用碼"
-        copied_to_clipboard: "複製至剪貼簿"
+        copy_to_clipboard: "複製至剪貼簿"
         copy_to_clipboard_error: "複製至剪貼簿時發生錯誤"
+        copied_to_clipboard: "複製至剪貼簿"
         remaining_codes: "你還剩下 <strong>{{count}}</strong> 個可使用的備用碼"
         codes:
           title: "已產生備用碼"
@@ -823,10 +822,12 @@ zh_TW:
           二步驟驗證使用除了密碼外的一次性代碼來加強帳號安全性。可以使用<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: "請注意，一旦啟用二步驟驗證，將自動關閉社群登入。"
         enforced_notice: "在進入網站前，需啟用兩個步驟驗證以增強帳號安全性"
+        disable: "禁用"
+        save: "儲存"
         edit: "編輯"
         security_key:
           register: "註冊"
-          delete: "刪除"
+          save: "儲存"
       change_about:
         title: "修改關於我"
         error: "修改設定值時發生錯誤"
@@ -1652,7 +1653,7 @@ zh_TW:
         help: "把訊息移動到收件匣"
       edit_message:
         help: "編輯這個訊息的第一篇貼文"
-        title: "編輯訊息"
+        title: "編輯"
       defer:
         title: "延遲"
       list: "話題"
@@ -2425,7 +2426,6 @@ zh_TW:
         this_month: "月"
         this_week: "週"
         today: "今天"
-        other_periods: "前往頂端"
     permission_types:
       full: "建立 / 回覆 / 觀看"
       create_post: "回覆 / 觀看"
@@ -2614,6 +2614,10 @@ zh_TW:
       custom_message_template_forum: "你好，你應該來我們這個論壇！"
       custom_message_template_topic: "你好，我覺得你可能會喜歡這個話題！"
     forced_anonymous: "由於系統資源超過負荷，暫時向所有使用者顯示，包含已登出的使用者。"
+    footer_nav:
+      back: "返回"
+      share: "分享"
+      dismiss: "忽略"
     safe_mode:
       enabled: "安全模式已經開啟，關閉該瀏覽器窗口以退出安全模式"
   admin_js:
@@ -2828,12 +2832,6 @@ zh_TW:
         tag_event:
           name: "標籤事件"
           details: "當標籤被建立、更新或刪除。"
-        flag_event:
-          name: "標記事件"
-          details: "當檢舉被建立、同意、否決或忽略"
-        queued_post_event:
-          name: "話題審核事件"
-          details: "當新的話題正在建立、審核通過或被拒絕核准時"
         reviewable_event:
           name: "可審核的事件"
           details: "當新項目已經準備好審核並狀態已更好時"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index aa62dd02e1..8f34e97958 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -1724,7 +1724,6 @@ ar:
       name: مُحب كبير
     crazy_in_love:
       name: مُحب مجنون
-      description: نشرت 50 اعجابا يوميا لمدة 20 يوم
     thank_you:
       name: شكرًا لك
       description: تم الاعجاب ب(20) منشورا لك و اعجبت ب(10) منشورات
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index 26eb6dfdf9..0be1a79574 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -43,7 +43,6 @@ be:
     other_error: "Нешта пайшло не так тэму абнаўлення"
     import_error:
       generic: Адбылася памылка пры імпарце гэтую тэму
-      about_json: "Памылка імпарту: about.json не існуе, або з'яўляецца несапраўдным"
       about_json_values: "about.json ўтрымлівае недапушчальныя значэння: %{errors}"
       git: "Памылка кланавання рэпазітара Git, доступ забаронены або сховішча не знойдзены"
       unpack_failed: "Не атрымалася распакаваць файл"
@@ -2336,7 +2335,6 @@ be:
       name: вышэйшая Каханне
     crazy_in_love:
       name: Вар'ят ў каханні
-      description: Выкарыстоўваецца 50 падобных у дзень 20 раз
     thank_you:
       name: Дзякуй
       description: Мае 20 спадабалася паведамленні і даў 10 падобных
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index eb32146f5a..dd7c04869a 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -45,7 +45,6 @@ bs_BA:
       unrecognized_extension: "Neprepoznata ekstenzija datoteke: %{extension}"
     import_error:
       generic: Došlo je do pogreške prilikom uvoza te teme
-      about_json: "Greška uvoza: about.json ne postoji ili je nevažeća"
       about_json_values: "o .json sadrži nevažeće vrijednosti: %{errors}"
       git: "Greška prilikom kloniranja git repository-a, pristup je odbijen ili repositroy nije pronađen."
       unpack_failed: "Otpakivanje datoteke nije uspelo"
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 8b13bbd78b..6645e0c719 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -45,7 +45,6 @@ ca:
       unrecognized_extension: "Extensió de fitxer no reconeguda: %{extension}"
     import_error:
       generic: Hi ha hagut un error important l'aparença.
-      about_json: "Error d'importació: about.json no existeix o no és vàlid"
       about_json_values: "about.json conté valors no vàlids: %{errors}"
       git: "S'ha produït un error clonant el dipòsit git, s'ha denegat l'accés o no s'ha trobat el dipòsit."
       unpack_failed: "Error en desempaquetar el fitxer"
@@ -388,12 +387,6 @@ ca:
       Podeu editar la vostra darrera resposta per a afegir una citació. Per a fer-ho, seleccioneu text i premeu el botó de <b>cita resposta</b> que apareixerà.
 
       És més fàcil seguir un tema quan té poques respostes en profunditat que no pas moltes respostes curtes i individuals.
-    dominating_topic: |
-      ### Deixeu que altres s'afegeixin a la conversa
-
-      Aquest tema us resulta clarament important. Heu publicat més del %{percent}% de les respostes aquí.
-
-      Encara seria millor si deixéssiu temps a altres persones per a compartir els seus punts de vista. Els podeu convidar?
     get_a_room: |
       ### Anima tothom a participar en la conversa
 
@@ -3046,7 +3039,6 @@ ca:
         Aquesta insígnia es concedeix quan gasteu tots els %{max_likes_per_day} dels vostres 'M'agrada' diaris durant 5 dies. Gràcies per animar activament les millors converses cada dia.
     crazy_in_love:
       name: Boig d'amor
-      description: Ha fet servir 50 'M'agrada' en un dia 20 vegades
       long_description: |
         Aquesta insígnia es concedeix quan utilitzeu tots els vostres %{max_likes_per_day} 'm'agrada' diaris durant vint dies. Oh! Sou un model per a animar els companys de comunitat!
     thank_you:
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 08daeb2afa..1414b55b2c 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -45,7 +45,6 @@ da:
       unrecognized_extension: "Ikke anerkendt filtypenavn: %{extension}"
     import_error:
       generic: Der opstod en fejl under importen af dette tema
-      about_json: "Importfejl: about.json findes ikke eller er ugyldig"
       about_json_values: "about.json indeholder ugyldige værdier: %{errors}"
       git: "Fejl ved kloning af git repo, adgang nægtes, eller depot findes ikke"
       unpack_failed: "Kunne ikke pakke filen ud"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 1d9b104de1..410ff7eb58 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -45,7 +45,6 @@ de:
       unrecognized_extension: "Unbekannte Dateiendung: %{extension}"
     import_error:
       generic: Beim Importieren dieses Themes ist ein Fehler aufgetreten
-      about_json: "Importfehler: about.json existiert nicht, oder ist ungültig"
       about_json_values: "about.json enthält ungültige Werte: %{errors}"
       git: "Fehler beim Klonen des git-Repository, Zugriff verboten oder Repository nicht gefunden."
       unpack_failed: "Fehler beim Entpacken der Datei"
@@ -325,10 +324,10 @@ de:
   bookmarks:
     errors:
       already_bookmarked_post: "Du kannst denselben Beitrag nicht zweimal zu deinen Lesezeichen hinzufügen."
-      time_must_be_provided: "Zeit muss eingestellt werden für alle Erinnerungen"
     reminders:
       at_desktop: "Nächstes mal wenn ich an meinem PC bin"
       later_today: "Im Laufe des Tages"
+      next_business_day: "Nächster Werktag"
       tomorrow: "Morgen"
       next_week: "Nächste Woche"
       next_month: "Nächster Monat"
@@ -403,12 +402,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</a> klickst.
 
       Es ist für alle einfacher, Themen zu lesen, die wenige tiefgehende Antworten haben statt vielen kleinen und einzelnen Antworten.
-    dominating_topic: |
-      ### Lass auch andere die Konversation mitgestalten
-
-      Dieses Thema ist dir eindeutig wichtig &ndash; du hast mehr als %{percent}% aller Antworten verfasst.
-
-      Es könnte noch besser sein, wenn du anderen Leuten ebenfalls Raum lässt, ihre Sichtweisen darzulegen. Bitte lade sie dazu ein.
     get_a_room: |
       ### Ermutige jeden, bei dieser Konversation mitzumachen.
 
@@ -3728,7 +3721,6 @@ de:
       name: Higher Love
     crazy_in_love:
       name: Crazy in Love
-      description: Hat 20-mal je 50 Likes an einem Tag vergeben
     thank_you:
       name: Dankeschön
       description: Hat 20 Likes für Beiträge erhalten und 10 Likes vergeben
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 2f58de65e0..9e7ed99315 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -2513,7 +2513,6 @@ el:
       name: Πολύ Αγάπη
     crazy_in_love:
       name: Τρελή Αγάπη
-      description: Χρησιμοποίησε 50 "Μου αρέσει" σε μια ημέρα 20 φορές
     thank_you:
       name: Ευχαριστεί
       description: Έχει σε 20 δημοσιεύσεις "Μου αρέσει" και πάτησε 10 "Μου αρέσει"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index cfb25c5694..7ebe54104c 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -45,7 +45,6 @@ es:
       unrecognized_extension: "Extensión de archivo no reconocida: %{extension}"
     import_error:
       generic: Se produjo un error al importar ese tema
-      about_json: "Error de importación: about.json no existe, o es inválido"
       about_json_values: "about.json contiene valores inválidos: %{errors}"
       modifier_values: "los modificadores about.json contienen valores inválidos: %{errors}"
       git: "Error al clonar el repositorio git, se deniega el acceso o no se encuentra el repositorio"
@@ -335,7 +334,6 @@ es:
       already_bookmarked_post: "No puedes guardar la misma publicación en marcadores dos veces."
       cannot_set_past_reminder: "No puedes establecer un recordatorio de marcador en el pasado."
       cannot_set_reminder_in_distant_future: "No puedes establecer un recordatorio de marcador más de 10 años en el futuro."
-      time_must_be_provided: "se debe especificar la hora para todos los recordatorios"
     reminders:
       at_desktop: "La próxima vez que esté en mi ordenador"
       later_today: "Más tarde, hoy"
@@ -414,12 +412,6 @@ es:
       Puedes editar tu respuesta previa para añadir una cita seleccionando el texto y pulsando en el botón <b>citar respuesta</b> que aparecerá.
 
       Es más fácil para todos leer temas con menos respuestas pero más profundas que muchas respuestas pequeñas individuales.
-    dominating_topic: |
-      ### Deja a los demás unirse a la conversación
-
-      Este tema claramente es muy importante para ti &ndash; has publicado más del %{percent}% de las respuestas aquí.
-
-      Podría ser incluso mejor si también le das espacio a otras personas para que compartan sus puntos de vista. ¿Puedes invitarlos?
     get_a_room: |
       ### Anima a todos a participar en la conversación
 
@@ -3938,7 +3930,6 @@ es:
         Esta medalla se concede cuando usas todos los %{max_likes_per_day} me gusta diarios por 5 días. ¡Gracias por tomarte tiempo en incentivar y premiar las mejores conversaciones cada día!
     crazy_in_love:
       name: Magnánimo
-      description: Utilizó 50 me gusta en un día 20 veces
       long_description: |
         Esta medalla se concede cuando usas todos los %{max_likes_per_day}de tus me gusta diarios por 20 días. ¡Wowl! ¡Eres un modelo a seguir por animar a los demás miembros de la comunidad!
     thank_you:
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 44d1f7e920..812f19e0db 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -44,7 +44,6 @@ fa_IR:
       unrecognized_extension: "پرونده افزونه شناسایی نشد:%{extension}"
     import_error:
       generic: خطایی در هنگام وارد کردن پوسته اتفاق افتاده
-      about_json: "خطا در وارد کردن: about.json وجود ندارد یا نامعتبر است"
       about_json_values: "about.json حاوی مقادیر نامعتبر است: %{errors}"
       git: "خطا در  کلون کردن مخزن گیت، دسترسی محدود شده یا مخزن یافت نشد"
   emails:
@@ -2105,7 +2104,6 @@ fa_IR:
       name: مهرورز
     crazy_in_love:
       name: الهه‌ی مهر
-      description: در 20 روز، روزانه 50 نوشته را پسندیده است.
     thank_you:
       name: سپاس‌گزاریم
       description: 20 نوشته پسندیده شده دارد و 10 نوشته را پسندیده است.
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 7fbbb3a1a8..1129ecc1f6 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -45,7 +45,6 @@ fi:
       unrecognized_extension: "Tuntematon tiedostomuoto: %{extension}"
     import_error:
       generic: Teeman tuomisessa tapahtui virhe
-      about_json: "Virhe tuomisessa: about.json -tiedostoa ei ole olemassa tai se ei kelpaa"
       about_json_values: "about.json sisältää arvoja, jotka eivät kelpaa: %{errors}"
       git: "Virhe git-tietovarastoa kloonattaessa: ei ole pääsyoikeutta tai tietovarastoa ei löytynyt"
       unpack_failed: "Tiedoston purku epäonnistui"
@@ -326,7 +325,6 @@ fi:
       already_bookmarked_post: "Samaa viestiä ei voi kirjanmerkitä kahdesti."
       cannot_set_past_reminder: "Kirjanmerkkimuistutusta ei voi asettaa menneisyyteen."
       cannot_set_reminder_in_distant_future: "Kirjanmerkkimuistutusta ei voi asettaa yli 10 vuoden päähän tulevaisuuteen."
-      time_must_be_provided: "kaikkiin muistutuksiin tarvitaan aika"
     reminders:
       at_desktop: "Ensi kerralla kun olen työpöytäympäristössäni"
       later_today: "Myöhemmin tänään"
@@ -405,12 +403,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.
-
-      Oletko varma, että annat muillekin riittävästi aikaa jakaa omia ajatuksiaan? Voisit kutsua heitä tänne?
     get_a_room: |
       ### Rohkaise kaikkia osallistumaan keskusteluun
 
@@ -3664,7 +3656,6 @@ fi:
         Tämä ansiomerkki myönnetään, kun olet käyttänyt kaikki %{max_likes_per_day} päivittäistä tykkäystäsi viitenä päivänä. Kiitos kun vaivaudut aktiivisesti kannustamaan muita hyviin keskusteluihin joka päivä!
     crazy_in_love:
       name: Korviaan myöten rakastunut
-      description: Käytti 50 päivittäistä tykkäystä 20 päivänä
       long_description: |
         Tämä ansiomerkki myönnetään, kun olet käyttänyt kaikki %{max_likes_per_day} päivittäistä tykkäystäsi 20 päivänä. Vau! Esimerkillistä muiden palstan käyttäjien kannustamista!
     thank_you:
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index ee8c5320ae..934a29f6fd 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -45,8 +45,9 @@ fr:
       unrecognized_extension: "Extension de fichier non reconnue : %{extension}"
     import_error:
       generic: "Désolé, une erreur est survenu lors de l'importation du thème"
-      about_json: "Erreur d'importation : about.json n'existe pas, ou pas valide"
+      about_json: "Erreur d'importation : about.json n'existe pas ou est invalide. Êtes-vous sûr qu'il s'agit d'un thème Discourse ?"
       about_json_values: "about.json contient des valeurs invalides : %{errors}"
+      modifier_values: "les modificateurs du fichier about.json contiennent des valeurs invalides : %{errors}"
       git: "Erreur de clonage du dépôt git, l'accès est refusé ou le dépôt n'est pas trouvé."
       unpack_failed: "Impossible de décompresser le fichier"
       file_too_big: "Le fichier non compressé est trop gros."
@@ -59,6 +60,7 @@ fr:
       optimized_link: Les liens optimisés d'images sont éphémères et ne devraient pas être inclus dans le code source d'un thème.
     settings_errors:
       invalid_yaml: "Le YAML est invalide"
+      data_type_not_a_number: "Le type du paramètre `%{name}` n'est pas supporté. Les types supportés sont `integer`, `bool`, `list`, `enum` et `upload`"
       name_too_long: "Il y a un paramètre avec un nom trop long. Longueur maximum 255"
       default_value_missing: "Le paramètre `%{name}` n'a pas de valeur par défaut"
       default_not_match_type: "Le type de la valeur par défaut de paramètre `%{name}` ne correspond pas au type du paramètre."
@@ -98,7 +100,7 @@ fr:
         reply_user_not_matching_error: "Se produit quand une réponse est venue d'une adresse de courriel différente de celle où a été envoyée la notification."
         topic_not_found_error: "Se produit quand quelqu'un répond à un sujet qui a été supprimé."
         topic_closed_error: "Se produit quand quelqu'un répond mais le sujet lié a été fermé."
-        bounced_email_error: "Le courriel est un rapport de courriel rejeté."
+        bounced_email_error: "Le courriel est un rapport de courriel non délivré."
         screened_email_error: "Arrive quand l'adresse courriel de l'expéditeur est déjà sous surveillance."
         unsubscribe_not_allowed: "Se produit lorsque le désabonnement via courriel n'est pas autorisé pour cet utilisateur."
         email_not_allowed: "Se produit quand l'adresse courriel n'est pas dans la liste autorisée ou est dans la liste des indésirables."
@@ -287,6 +289,7 @@ fr:
   max_pm_recipients: "Désolé, vous pouvez envoyer un message à un maximum de %{recipients_limit} destinataires."
   pm_reached_recipients_limit: "Désolé, vous ne pouvez pas avoir plus de %{recipients_limit} destinataires dans un message direct."
   removed_direct_reply_full_quotes: "La citation de l'entier du message précédent a été supprimé automatiquement."
+  secure_upload_not_allowed_in_public_topic: "Désolé, les envois sécurisés suivants ne peuvent pas être utilisés dans un sujet public : %{upload_filenames}."
   just_posted_that: "est trop similaire à ce que vous avez récemment posté"
   invalid_characters: "contient des caractères invalides"
   is_invalid: "ne semble pas clair, est-ce une phrase complète ?"
@@ -297,6 +300,12 @@ fr:
   topics_in_category: "Sujets dans la catégorie « %{category} »"
   rss_posts_in_topic: "Flux RSS de « %{topic} »"
   rss_topics_in_category: "Flux RSS des sujets dans la catégorie « %{category} »"
+  rss_num_posts:
+    one: "%{count} message"
+    other: "%{count} messages"
+  rss_num_participants:
+    one: "%{count} participant"
+    other: "%{count} participants"
   read_full_topic: "Lire le sujet en entier"
   private_message_abbrev: "Msg"
   rss_description:
@@ -324,9 +333,11 @@ fr:
     errors:
       already_bookmarked_post: "Il n'est pas possible de mettre plus d'un signet sur un même message."
       cannot_set_past_reminder: "Vous ne pouvez pas définir un rappel de signet à une date passée."
+      time_must_be_provided: "l'heure doit être réglée pour tous les rappels"
     reminders:
       at_desktop: "La prochaine fois je suis à mon bureau"
       later_today: "Plus tard aujourd'hui"
+      next_business_day: "Prochain jour ouvré"
       tomorrow: "Demain"
       next_week: "Semaine prochaine"
       next_month: "Mois prochai"
@@ -394,19 +405,13 @@ fr:
 
       C'est plus facile de suivre les discussions et de rencontrer des personnes intéressantes dans les conversations lorsque tout le monde a une photo de profil unique !
     sequential_replies: |
-      ### Envisagez de répondre à plusieurs messages en même temps
+      ### Pensez à répondre à plusieurs messages en même temps
 
-      Plutôt que de poster plusieurs messages dans un même sujet, merci d'envisager une seule réponse incluant des citations ou @pseudo en référence à des messages précédents.
+      Plutôt que d'écrire plusieurs messages à la suite dans un même sujet, pensez à écrire une seule réponse contenant des citations ou des mentions faisant référence à des messages précédents.
 
-      Vous pouvez éditer votre dernière réponse et ajouter une citation en sélectionnant le texte à citer et en cliquant sur le bouton <b>Citer</b> qui s'affichera.
+      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> qui s'affichera.
 
       C'est plus facile de lire des discussions avec des réponses approfondies plutôt que plusieurs réponses individuelles courtes.
-    dominating_topic: |
-      ### Laissez d'autres rejoindre la conversation
-
-      Ce sujet est vraiment important pour vous &ndash; vous avez posté plus de %{percent}% des réponses dans cette discussion.
-
-      Ce serait peut-être encore meilleur si vous fournissiez l'espace pour d'autres personnes pour partager leur points de vue aussi ? Est-ce que vous pourriez les inviter à vous rejoindre ici ?
     get_a_room: |
       ### Encourager d'autres à s'ajouter à la conversation
 
@@ -451,6 +456,7 @@ fr:
               no_user_selected: "Vous devez choisir un utilisateur valide."
               reply_by_email_disabled: "Réponse par courriel désactivée."
               target_user_not_found: "Un des utilisateurs à qui vous envoyez ce message n'a pas été retrouvé."
+              unable_to_update: "Il y a eu une erreur en mettant à jour ce sujet."
             featured_link:
               invalid: "est invalide. L'URL doit inclure http:// ou https://."
               invalid_category: "ne peut pas être modifié dans cette catégorie."
@@ -458,7 +464,7 @@ fr:
           attributes:
             password:
               common: "fait partie des 10000 mots de passe les plus utilisés. Veuillez utiliser un mot de passe plus sécurisé."
-              same_as_username: "est aussi votre pseudo. Veuillez utiliser un mot de passe plus sécurisé."
+              same_as_username: "est aussi votre nom d'utilisateur. Veuillez utiliser un mot de passe plus sécurisé."
               same_as_email: "est aussi votre adresse courriel. Veuillez utiliser un mot de passe plus sécurisé."
               same_as_current: "est le même que votre mot de passe actuel."
               same_as_name: "est identique à votre nom."
@@ -504,7 +510,7 @@ fr:
           attributes:
             word:
               too_many: "Trop de mots pour cette action"
-  uncategorized_category_name: "Non-catégorisé"
+  uncategorized_category_name: "Sans catégorie"
   vip_category_name: "Salon"
   vip_category_description: "Une catégorie réservée aux membres avec un niveau de confiance 3 et plus."
   meta_category_name: "Retours sur le site"
@@ -553,23 +559,23 @@ fr:
       (Pour plus d'informations sur les niveaux de confiance, [voir ce sujet][trust]. Notez que seul les utilisateurs qui continuent de remplir les conditions gardent leur statut d'habitués.)
 
       [trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
-  admin_quick_start_title: "A LIRE EN PREMIER : Guide de démarrage pour administrateur"
+  admin_quick_start_title: "À LIRE EN PREMIER : Guide de démarrage pour administrateur"
   category:
     topic_prefix: "À propos de la catégorie %{category}"
-    replace_paragraph: "(Remplacez ce paragraphe par une courte description de votre nouvelle catégorie. Cette information apparaîtra dans la zone de sélection de la catégorie, donc viser en dessous des 200 caractères.)"
+    replace_paragraph: "(Remplacez ce paragraphe par une courte description de votre nouvelle catégorie. Cette information apparaîtra dans la zone de sélection de la catégorie, donc visez en dessous des 200 caractères.)"
     post_template: "%{replace_paragraph}\n\nUtilisez les paragraphes suivants pour une plus longue description ou pour établir des règles :\n\n- À quoi sert cette catégorie ? Pourquoi les utilisateurs choisiraient-ils cette catégorie pour leur discussion ?\n\n- En quoi est-elle différente des autres catégories existantes ?\n\n- Quels sujets devraient figurer dans cette catégorie ?\n\n- Avons-nous besoin de cette catégorie ? Devrions-nous fusionner celle-ci avec une autre catégorie ?\n"
     errors:
       not_found: "Catégorie introuvée !"
-      uncategorized_parent: "Sans catégorie ne peut pas avoir de parent"
+      uncategorized_parent: "La catégorie « Sans catégorie » ne peut pas avoir de parent"
       self_parent: "Le parent d'une sous-catégorie ne peut pas être elle-même"
       depth: "Vous ne pouvez pas imbriquer une sous-catégorie sous une autre"
       invalid_email_in: "« %{email} » n'est pas une adresse de courriel valide."
       email_already_used_in_group: "« %{email} » est déjà utilisé par le groupe « %{group_name} »."
       email_already_used_in_category: "« %{email} » est déjà utilisé par la catégorie « %{category_name} »."
-      description_incomplete: "Le message de description de la catégorie doit avoir au moins un paragraphe."
+      description_incomplete: "Le message de description de la catégorie doit être au moins un paragraphe."
       permission_conflict: "Tout groupe autorisé à accéder à une sous-catégorie doit également avoir accès à la catégorie parente. Les groupes suivants ont accès à une des sous-catégories, mais n'ont pas accès à la catégorie parente : %{group_names}."
       disallowed_topic_tags: "Ce sujet contient des étiquettes qui ne sont pas autorisées dans cette catégorie : %{tags}"
-      disallowed_tags_generic: "Ce sujet contient des étiquettes interdits."
+      disallowed_tags_generic: "Ce sujet contient des étiquettes interdites."
     cannot_delete:
       uncategorized: "Cette catégorie est spéciale. Elle sert de zone d'attente pour les sujets qui n'ont pas de catégorie ; elle ne peut pas être supprimée."
       has_subcategories: "Vous ne pouvez pas supprimer cette catégorie car elle a des sous-catégories."
@@ -589,7 +595,7 @@ fr:
       title: "habitué"
     leader:
       title: "meneur"
-    change_failed_explanation: "Vous avez essayé de rétrograder %{user_name} au niveau '%{new_trust_level}'. Cependant son niveau de confiance est déjà '%{current_trust_level}'. %{user_name} restera au niveau '%{current_trust_level}' - Si vous souhaitez rétrograder un utilisateur vous devez verrouiller le niveau de confiance au préalable"
+    change_failed_explanation: "Vous avez essayé de rétrograder %{user_name} au niveau %{new_trust_level}. Cependant son niveau de confiance est déjà %{current_trust_level}. %{user_name} restera au niveau %{current_trust_level}. Si vous souhaitez rétrograder un utilisateur vous devez verrouiller le niveau de confiance au préalable"
   post:
     image_placeholder:
       broken: "Cette image ne fonctionne pas"
@@ -597,23 +603,23 @@ fr:
       one: "%{count} J'aime"
       other: "%{count} J'aimes"
   rate_limiter:
-    slow_down: "Vous avez réalisé cette action un trop grand nombre de fois, merci d'essayer à nouveau plus tard."
-    too_many_requests: "Vous avez effectué cette action trop de fois. Merci d'attendre %{time_left}avant de ressayer."
+    slow_down: "Vous avez réalisé cette action un trop grand nombre de fois, veuillez réessayer plus tard."
+    too_many_requests: "Vous avez effectué cette action trop de fois. Veuillez attendre %{time_left}avant de réessayer."
     by_type:
-      first_day_replies_per_day: "Vous avez atteint le nombre maximum de réponses qu'un nouvel utilisateur peut créer pour son premier jour. Merci de patienter %{time_left} avant d'essayer à nouveau."
-      first_day_topics_per_day: "Vous avez atteint le nombre maximum de sujets qu'un nouvel utilisateur peut créer pour son premier jour. Merci de patienter %{time_left} avant d'essayer à nouveau."
-      create_topic: "Vous créez des sujets trop rapidement. Merci de patienter %{time_left} avant d'essayer à nouveau."
-      create_post: "Vous répondez trop rapidement. Merci de patienter %{time_left} avant d'essayer à nouveau."
-      delete_post: "Vous effacez des messages trop rapidement. Merci de patienter %{time_left} avant d'essayer à nouveau."
-      public_group_membership: "Vous rejoignez et/ou quittez des groupes trop souvent. Veuillez attendre %{time_left} avant d'essayer à nouveau."
-      topics_per_day: "Vous avez atteint le nombre maximum de nouveaux sujets pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      pms_per_day: "Vous avez atteint le nombre maximum de nouveaux messages. Merci de patienter %{time_left} avant d'essayer à nouveau."
-      create_like: "Vous avez atteint le nombre maximum de J'aime. Merci de patienter %{time_left} avant d'essayer à nouveau."
-      create_bookmark: "Vous avez atteint le nombre maximum de signets. Merci de patienter %{time_left} avant d'essayer à nouveau."
-      edit_post: "Vous avez atteint le nombre maximum de modifications. Merci de patienter %{time_left} avant d'essayer à nouveau."
-      live_post_counts: "Vous demandez le nombre de messages en activité trop rapidement. Veuillez respecter le temps d'attente %{time_left} avant de réessayer."
-      unsubscribe_via_email: "Vous avez atteint le nombre maximum de désinscriptions par courriel. Merci de patienter %{time_left} avant d'essayer à nouveau."
-      topic_invitations_per_day: "Vous avez atteint le nombre maximum d'invitations dans un sujet. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      first_day_replies_per_day: "Vous avez atteint le nombre maximum de réponses qu'un nouvel utilisateur peut créer pour son premier jour. Veuillez patienter %{time_left} avant de réessayer."
+      first_day_topics_per_day: "Vous avez atteint le nombre maximum de sujets qu'un nouvel utilisateur peut créer pour son premier jour. Veuillez patienter %{time_left} avant de réessayer."
+      create_topic: "Vous créez des sujets trop rapidement. Veuillez patienter %{time_left} avant de réessayer."
+      create_post: "Vous répondez trop rapidement. Veuillez patienter %{time_left} avant de réessayer."
+      delete_post: "Vous effacez des messages trop rapidement. Veuillez patienter %{time_left} avant de réessayer."
+      public_group_membership: "Vous rejoignez et/ou quittez des groupes trop souvent. Veuillez patienter %{time_left} avant de réessayer."
+      topics_per_day: "Vous avez atteint le nombre maximum de nouveaux sujets pour aujourd'hui. Veuillez patienter %{time_left} avant de réessayer."
+      pms_per_day: "Vous avez atteint le nombre maximum de nouveaux messages. Veuillez patienter %{time_left} avant de réessayer."
+      create_like: "Vous avez atteint le nombre maximum de J'aime. Veuillez patienter %{time_left} avant de réessayer."
+      create_bookmark: "Vous avez atteint le nombre maximum de signets. Veuillez patienter %{time_left} avant de réessayer."
+      edit_post: "Vous avez atteint le nombre maximum de modifications. Veuillez patienter %{time_left} avant de réessayer."
+      live_post_counts: "Vous demandez le nombre de messages en activité trop rapidement. Veuillez patienter %{time_left} avant de réessayer."
+      unsubscribe_via_email: "Vous avez atteint le nombre maximum de désinscriptions par courriel. Veuillez patienter %{time_left} avant de réessayer."
+      topic_invitations_per_day: "Vous avez atteint le nombre maximum d'invitations dans un sujet. Veuillez patienter %{time_left} avant de réessayer."
     hours:
       one: "%{count} heure"
       other: "%{count} heures"
@@ -716,7 +722,7 @@ fr:
       safari: "Safari"
       unknown: "navigateur inconnu"
     device:
-      android: "Android Device"
+      android: "Appareil Android"
       chromebook: "Chromebook"
       ipad: "iPad"
       iphone: "iPhone"
@@ -735,12 +741,12 @@ fr:
       windows: "Microsoft Windows"
       unknown: "système d'exploitation inconnu"
   change_email:
-    wrong_account_error: "Vous êtes connectés avec le mauvais compte, veuillez vous déconnecter et réessayer à nouveau."
+    wrong_account_error: "Vous êtes connecté avec le mauvais compte, veuillez vous déconnecter et réessayer."
     confirmed: "Votre adresse de courriel a été mise à jour."
     please_continue: "Continuer vers %{site_name}"
-    error: "Il y a eu une erreur lors de la modification de votre adresse de courriel. Elle est peut-être déjà utilisée ?"
+    error: "Il y a eu une erreur lors de la modification de votre adresse courriel. Votre adresse courriel est peut-être déjà utilisée ?"
     error_staged: "Une erreur est survenue lors de la modification de votre adresse courriel. Cette adresse est déjà utilisée par un utilisateur distant."
-    already_done: "Désolé, ce lien de confirmation n'est plus valide. Votre adresse de courriel a peut-être déjà été changée ?"
+    already_done: "Désolé, ce lien de confirmation n'est plus valide. Votre adresse courriel a peut-être déjà été changée ?"
     confirm: "Confirmer"
     authorizing_new:
       title: "Confirmer votre nouvelle adresse courriel"
@@ -748,21 +754,21 @@ fr:
     authorizing_old:
       title: "Changer votre adresse courriel"
       description: "Veuillez confirmer votre changement d'adresse courriel"
-      old_email: "Adresse précédente : %{email}"
-      new_email: "Nouvelle adresse : %{email}"
+      old_email: "Adresse courriel précédente : %{email}"
+      new_email: "Nouvelle adresse courriel : %{email}"
       almost_done_title: "Confirmer une nouvelle adresse courriel"
       almost_done_description: "Nous avons envoyé un courriel à votre nouvelle adresse pour confirmer le changement !"
   associated_accounts:
-    revoke_failed: "Echec de révocation de votre compte avec %{provider_name}."
+    revoke_failed: "Échec de la révocation de votre compte avec %{provider_name}."
     connected: "(connecté)"
   activation:
-    action: "Cliquer ici pour activer votre compte"
+    action: "Cliquez ici pour activer votre compte"
     already_done: "Désolé, ce lien de confirmation n'est plus valide. Votre compte est peut-être déjà activé ?"
     please_continue: "Votre nouveau compte est confirmé ; vous allez être redirigé vers la page d'accueil."
     continue_button: "Continuer vers %{site_name}"
     welcome_to: "Bienvenue sur %{site_name} !"
     approval_required: "Un modérateur doit approuver manuellement votre nouveau compte avant que vous accédiez au forum. Vous recevrez un courriel lorsque que votre compte sera approuvé !"
-    missing_session: "Nous ne pouvons pas détecter si votre compte a été créé, veuillez vérifier que vous avez activé les cookies."
+    missing_session: "Nous ne pouvons pas détecter si votre compte a été créé, veuillez vérifier que les cookies de votre navigateur sont activés."
     activated: "Désolé, ce compte a déjà été activé."
     admin_confirm:
       title: "Confirmer le compte administrateur"
@@ -814,14 +820,14 @@ fr:
       title: "J'aime"
       description: "Aimer ce message"
       short_description: "Aimer ce message"
-      long_form: "a été aimé"
+      long_form: "a aimé"
   draft:
     sequence_conflict_error:
-      title: "erreur d'ébauche"
-      description: "L'ébauche est en train d'être modifiée dans une autre fenêtre. Veuillez recharger cette page."
+      title: "erreur de brouillon"
+      description: "Le brouillon est en train d'être modifié dans une autre fenêtre. Veuillez recharger cette page."
   draft_backup:
-    pm_title: "Sauvegarde des ébauches sur les sujets en cours."
-    pm_body: "Sujet contenant des ébauches sauvegardées"
+    pm_title: "Sauvegarde des brouillons sur les sujets en cours."
+    pm_body: "Sujet contenant des brouillons sauvegardés"
   user_activity:
     no_default:
       self: "Vous n'avez aucune activité pour le moment."
@@ -830,13 +836,13 @@ fr:
       self: "Vous n'avez pas de sujet dans vos signets ; les signets vous permettent de retrouver rapidement des sujets d'intérêt."
       others: "Aucun signet."
     no_likes_given:
-      self: "Vous n'avez aimé aucun message"
-      others: "Aucun message aimé"
+      self: "Vous n'avez aimé aucun message."
+      others: "Aucun message aimé."
     no_replies:
       self: "Vous n'avez répondu à aucun message."
       others: "Aucune réponse."
     no_drafts:
-      self: "Vous n'avez pas d'ébauche ; commencez à répondre à un sujet et la réponse sera automatiquement sauvegardée comme nouvelle ébauche."
+      self: "Vous n'avez pas de brouillons ; commencez à répondre à un sujet et la réponse sera automatiquement sauvegardée comme un nouveau brouillon."
   webauthn:
     validation:
       challenge_mismatch_error: "Le défi fourni ne correspond pas au défi généré par le serveur d'authentification."
@@ -844,6 +850,7 @@ fr:
       malformed_attestation_error: "Une erreur s'est produite pendant le déchiffrage des données d'attestation."
       user_verification_error: "Une vérification de l'utilisateur est requise."
       unsupported_public_key_algorithm_error: "L'algorithme de clé publique fournie n'est pas supporté par le serveur."
+      unsupported_attestation_format_error: "Le format d'attestation n'est pas supporté par le serveur."
       ownership_error: "La clé de sécurité n'appartient pas à l'utilisateur."
       unknown_cose_algorithm_error: "L'algorithme utilisé pour la clé de sécurité n'est pas reconnu."
   topic_flag_types:
@@ -878,8 +885,8 @@ fr:
         make: "Ce sujet est maintenant à la une. Il sera affiché en haut de chaque page jusqu’à ce qu'il soit ignoré par un utilisateur."
         remove: "Ce sujet n'est plus à la une. Il ne sera plus affiché en haut de chaque page."
   unsubscribed:
-    title: "Préférences courriel enregistrées !"
-    description: "les préférences de courriel pour <b>%{email}</b> ont été mises à jour. Pour modifier vos paramètres de messagerie, <a href='%{url}'>consultez vos préférences utilisateur</a> ."
+    title: "Préférences de courriel enregistrées !"
+    description: "les préférences de courriel pour <b>%{email}</b> ont été mises à jour. Pour modifier vos paramètres de messagerie, <a href='%{url}'>consultez vos préférences utilisateur</a>."
     topic_description: "Pour vous ré-abonner à %{link}, utilisez le contrôle des notifications en bas ou à droite du sujet."
     private_topic_description: "Pour vous ré-abonner, utilisez le contrôle des notifications en bas ou à droite du sujet."
   unsubscribe:
@@ -895,7 +902,7 @@ fr:
     submit: "Sauvegarder les préférences"
     digest_frequency:
       title: "Vous recevez des courriels de résumé %{frequency}"
-      select_title: "Définissez la fréquence des e-mails récapitulatifs à :"
+      select_title: "Régler la fréquence des courriels de résumé à :"
       never: "jamais"
       every_30_minutes: "toutes les 30 minutes"
       every_hour: "toutes les heures"
@@ -910,7 +917,7 @@ fr:
     read_write: "lecture/écriture"
     description: '« %{application_name} » demande l''accès suivant à votre compte :'
     instructions: 'Nous venons de générer une nouvelle clé API utilisateur à utiliser avec « %{application_name} », merci de coller cette clé dans votre application :'
-    otp_description: 'Voulez-vous autoriser "%{application_name}" à accèder à ce site ?'
+    otp_description: 'Voulez-vous autoriser « %{application_name} » à accéder à ce site ?'
     otp_confirmation:
       confirm_title: "Continuer vers %{site_name}"
       logging_in_as: "Connexion en tant que %{username}"
@@ -925,8 +932,8 @@ fr:
       read: "Tout lire"
       write: "Tout écrire"
       one_time_password: "Créer un jeton à accès unique"
-    invalid_public_key: "Désolé, la clef publique est invalide"
-    invalid_auth_redirect: "Désolé, cet hôte auth_redirect n'est pas autorisé"
+    invalid_public_key: "Désolé, la clé publique est invalide."
+    invalid_auth_redirect: "Désolé, cet hôte auth_redirect n'est pas autorisé."
     invalid_token: "Jeton manquant, invalid ou échu."
   flags:
     errors:
@@ -963,9 +970,9 @@ fr:
         time_read: Temps de lecture
         topic_count: Sujets créés
         post_count: Messages créés
-        pm_count: Messages privés créés
+        pm_count: Messages directs créés
         revision_count: Révisions
-      description: "Liste d'activités des modérateurs, y compris revues de signalements, temps de lecture, sujets créés, messages créés, messages directs et révisions."
+      description: "Liste des activités des modérateurs, y compris la vérification des signalements, le temps de lecture, les sujets créés, les messages créés, les messages directs créés et les révisions."
     flags_status:
       title: "Statut des signalements"
       values:
@@ -977,7 +984,7 @@ fr:
         flag: Type
         assigned: Affectés
         poster: Auteur
-        flagger: Signalant
+        flagger: Signaleur
         time_to_resolution: Temps de résolution
       description: "Liste de statuts de signalements : type de signalement, auteur, signaleur, et temps de résolution."
     visits:
@@ -996,6 +1003,7 @@ fr:
       yaxis: "Nombre de nouveaux contributeurs"
       description: "Nombre d'utilisateurs qui ont fait leur première contribution durant cette période."
     trust_level_growth:
+      title: "Progression du niveau de confiance"
       xaxis:
         tl1_reached: "Niveau de confiance 1 atteint"
         tl2_reached: "Niveau de confiance 2 atteint"
@@ -1006,41 +1014,41 @@ fr:
     consolidated_page_views:
       title: "Pages vues unifiées"
       xaxis:
-        page_view_crawler: "Crawlers Web"
+        page_view_crawler: "Robots d'indexation"
         page_view_anon: "Utilisateurs anonymes"
         page_view_logged_in: "Utilisateurs connectés"
       yaxis: "Jour"
-      description: "Vues des utilisateurs connectés, anonmyes et les crawler web."
+      description: "Pages vues par les utilisateurs connectés, les utilisateurs anonymes et les robots d'indexation."
       labels:
         post: Message
-        editor: Editeur
+        editor: Éditeur
         author: Auteur
         edit_reason: Raison
     dau_by_mau:
       title: "DAU/MAU"
       xaxis: "Jour"
       yaxis: "DAU/MAU"
-      description: "Nombre d'utilisateurs qui se sont connectés dans la dernière journée, divisé par le nombre d'utilisateurs qui se sont connectés dans le dernier mois – en % qui représente le taux \"d'adhérence\" de la communauté. Viser > 30%."
+      description: "Nombre d'utilisateurs qui se sont connectés dans la dernière journée, divisé par le nombre d'utilisateurs qui se sont connectés dans le dernier mois – en % qui représente le taux d'adhésion de la communauté. Viser > 30%."
     daily_engaged_users:
       title: "Utilisateurs impliqués au quotidien"
       xaxis: "Jour"
       yaxis: "Utilisateurs impliqués"
-      description: "Nombre d'utilisateurs ayant aimé ou publié un message dans les derniers 24h."
+      description: "Nombre d'utilisateurs ayant aimé ou publié un message dans les dernières 24 heures."
     profile_views:
-      title: "Vues des profils d'utilisateurs"
+      title: "Vues des profils d'utilisateur"
       xaxis: "Jour"
-      yaxis: "Nombre de profils utilisateurs consultés"
-      description: "Total des nouvelles vues de profils utilisateur."
+      yaxis: "Nombre de profils d'utilisateur consultés"
+      description: "Total des nouvelles vues des profils d'utilisateur."
     topics:
       title: "Sujets"
       xaxis: "Jour"
       yaxis: "Nombre de nouveaux sujets"
-      description: "Nouveaux sujets crées pour cette période."
+      description: "Nouveaux sujets créés pour cette période."
     posts:
       title: "Messages"
       xaxis: "Jour"
       yaxis: "Nombre de nouveaux messages"
-      description: "Nouveaux messages crées pour cette période"
+      description: "Nouveaux messages créés pour cette période"
     likes:
       title: "J'aime"
       xaxis: "Jour"
@@ -1063,6 +1071,7 @@ fr:
       labels:
         level: Niveau
       description: "Nombre d'utilisateurs groupés par niveau de confiance."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
       title: "Utilisateurs par type"
       xaxis: "Type"
@@ -1074,26 +1083,26 @@ fr:
         moderator: Modérateur
         suspended: Suspendu
         silenced: Sous silence
-      description: "Nombre d'utilisateurs groupés par admin, modérateur, suspendu et mis sous silence."
+      description: "Nombre d'utilisateurs groupés par administrateurs, modérateurs, suspendus et mis sous silence."
     trending_search:
       title: Critères de recherche tendance
       labels:
         term: Terme
         searches: Recherches
         click_through: CTR
-      description: "Les critères de recherche les plus tendance, avec leurs taux de suivi."
+      description: "Les critères de recherche les plus tendances avec leurs taux de suivi."
     emails:
       title: "Courriels envoyés"
       xaxis: "Jour"
       yaxis: "Nombre de courriels"
       description: "Nombre de nouveaux courriels envoyés."
     user_to_user_private_messages:
-      title: "Utilisateur à utilisateur (sans réponses)"
+      title: "Utilisateur à utilisateur (sans les réponses)"
       xaxis: "Jour"
       yaxis: "Nombre de messages"
       description: "Nombre de nouveaux messages directs."
     user_to_user_private_messages_with_replies:
-      title: "Utilisateur à utilisateur (avec réponses)"
+      title: "Utilisateur à utilisateur (avec les réponses)"
       xaxis: "Jour"
       yaxis: "Nombre de messages"
       description: "Nombre de nouveaux messages directs et réponses."
@@ -1103,7 +1112,7 @@ fr:
       yaxis: "Nombre de messages"
       description: "Nombre de messages directs envoyés automatiquement par le système."
     moderator_warning_private_messages:
-      title: "Avertissements aux modérateurs"
+      title: "Avertissements des modérateurs"
       xaxis: "Jour"
       yaxis: "Nombre de messages"
       description: "Nombre d'avertissements envoyés par message direct de la part des modérateurs."
@@ -1118,7 +1127,7 @@ fr:
       yaxis: "Nombre de messages"
       description: "Nombre de fois que les utilisateurs ont été informés d'un signalement par message direct."
     top_referrers:
-      title: "Meilleurs référants"
+      title: "Meilleurs référents"
       xaxis: "Utilisateurs"
       num_clicks: "Clics"
       num_topics: "Sujets"
@@ -1155,10 +1164,10 @@ fr:
       yaxis: "Nombre de vues par les utilisateurs connectés"
       description: "Nombre de nouvelles vues d'utilisateurs connectés."
     page_view_crawler_reqs:
-      title: "Nombre de vues par les Crawler Web"
+      title: "Pages vues par les robots d'indexation"
       xaxis: "Jour"
       yaxis: "Nombre de vues par les robots d'indexation"
-      description: "Nombre de vues par des Crawler Web au fil du temps."
+      description: "Total de pages vues par les robots d'indexation au fil du temps."
     page_view_total_reqs:
       title: "Pages vues"
       xaxis: "Jour"
@@ -1207,23 +1216,23 @@ fr:
       title: "Sujets sans réponses"
       xaxis: "Jour"
       yaxis: "Total"
-      description: "Nombre de nouveaux sujets qui n'ont pas de réponse."
+      description: "Nombre de nouveaux sujets qui n'ont pas de réponses."
     mobile_visits:
       title: "Visites d'utilisateur (mobile)"
       xaxis: "Jour"
       yaxis: "Nombre de visites"
-      description: "Nombre de visites uniques d'utilisateurs sur appareils mobiles."
+      description: "Nombre de visites uniques d'utilisateurs depuis un appareil mobile."
     web_crawlers:
-      title: "Agents utilisateur de crawler web"
+      title: "Agents utilisateurs des robots d'indexation"
       labels:
-        user_agent: "User Agent"
+        user_agent: "Agent utilisateur"
         page_views: "Pages vues"
-      description: "Liste d'agents Web Crawler, par order de vues générées."
+      description: "Liste des agents utilisateurs des robots d'indexation, par ordre de pages vues."
     suspicious_logins:
       title: "Connexions suspectes"
       labels:
         user: Utilisateur
-        client_ip: IP Client
+        client_ip: IP du client
         location: Localisation
         browser: Navigateur
         device: Appareil
@@ -1231,20 +1240,20 @@ fr:
         login_time: Heure de connexion
       description: "Détails de nouveaux identifiants qui ont des différences suspectes avec les précédents."
     staff_logins:
-      title: "Connexions administrateur"
+      title: "Connexions des administrateurs"
       labels:
         user: Utilisateur
         location: Localisation
-        login_at: Connexion à
-      description: "Liste des heures et localisations de connexion des administrateurs."
+        login_at: Heure de connexion
+      description: "Liste des heures et localisations des connexions des administrateurs."
     top_uploads:
-      title: "Principaux téléchargements"
+      title: "Principaux fichiers envoyés"
       labels:
         filename: Nom du fichier
         extension: Extension
         author: Auteur
         filesize: Taille de fichier
-      description: "Liste de tous les envois de fichier, par extension, taille de fichier, et auteur."
+      description: "Liste de tous les fichiers envoyés, par extension, avec la taille des fichiers et leur auteur."
     top_ignored_users:
       title: "Principaux utilisateurs ignorés / mis sous silence"
       labels:
@@ -1279,11 +1288,12 @@ fr:
     unreachable_themes: "Nous n'avons pas pu vérifier les mises à jour pour les thèmes suivants :"
     watched_word_regexp_error: "L'expression régulière pour les mots surveillés %{action} n'est pas valide. Vérifiez vos <a href='%{base_path}/admin/logs/watched_words'>paramètres de mots surveillés</a> ou désactivez le paramètre de site 'watched words regular expressions'"
   site_settings:
+    display_local_time_in_user_card: "Afficher le temps local selon le fuseau horaire de l'utilisateur quand sa carte est ouverte."
     censored_words: "Mots qui seront automatiquement remplacés par &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Supprimer automatiquement les messages cachés plus de 30 jours."
-    default_locale: "La langue par défaut de cette instance de Discourse. Vous pouvez remplacer le texte des catégories et des sujets générés par le système dans <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Personnaliser / Texte</a> ."
+    default_locale: "La langue par défaut de cette instance Discourse. Vous pouvez remplacer le texte des catégories et des sujets générés par le système dans <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Personnaliser / Texte</a> ."
     allow_user_locale: "Autoriser les utilisateurs à choisir la langue de l'interface dans leurs préférences"
-    set_locale_from_accept_language_header: "configurer la langue de l'interface pour les visiteurs à partir des entêtes de langue de leur navigateur. (EXPÉRIMENTAL, ne fonctionne pas avec le cache anonyme)"
+    set_locale_from_accept_language_header: "Configurer la langue de l'interface des visiteurs à partir des entêtes de langue de leur navigateur. (EXPÉRIMENTAL, ne fonctionne pas avec le cache anonyme)"
     support_mixed_text_direction: "Permettre le mélange de textes gauche-droite et droite-gauche."
     min_post_length: "Longueur minimale autorisée des messages en nombre de caractères"
     min_first_post_length: "Longueur minimale d'un premier message (corps de sujet) en nombre de caractères"
@@ -1307,15 +1317,15 @@ fr:
     category_search_priority_low_weight: "Poids appliqué au classement pour basse priorité de recherche catégorie."
     category_search_priority_high_weight: "Poids appliqué au classement pour haute priorité de recherche catégorie."
     category_search_priority_very_high_weight: "Poids appliqué au classement pour très haute priorité de recherche catégorie."
-    allow_uncategorized_topics: "Autorise la création de sujets sans catégorie. ATTENTION : S'il existe des sujets non-catégorisés, vous devez les catégoriser avant de désactiver cette fonction."
+    allow_uncategorized_topics: "Autoriser la création de sujets sans catégorie. ATTENTION : s'il existe des sujets sans catégorie, vous devez les catégoriser avant de désactiver ce paramètre."
     allow_duplicate_topic_titles: "Autoriser la création de sujet avec le même titre."
     unique_posts_mins: "Combien de temps avant qu'un utilisateur puisse poster le même contenu à nouveau"
     educate_until_posts: "Lors de la rédaction des (n) premiers nouveaux sujets de l'utilisateur, afficher le panneau d'aide à la saisie."
-    title: "Le nom du site, utilisé dans le tag du titre."
-    site_description: "Décrivez ce site en une seule phrase, utilisée dans le tag meta description."
-    short_site_description: "Description courte, utilisée dans le tag du titre et la page d'accueil."
-    contact_email: "Adresse de courriel de la personne responsable de ce site. Utilisée pour des notifications critiques et des faits urgents en provenance du formulaire de contact de la page <a href='%{base_path}/about' target='_blank'>À propos</a>."
-    contact_url: "Adresse de courriel de ce site. Utilisée pour des faits urgents en provenance du formulaire de contact de la page <a href='%{base_path}/about' target='_blank'>À propos</a>."
+    title: "Le nom du site, utilisé dans la balise title."
+    site_description: "Décrivez ce site en une seule phrase, utilisée dans la balise meta description."
+    short_site_description: "Description courte, utilisée dans la balise title de la page d'accueil."
+    contact_email: "Adresse de courriel de la personne responsable de ce site. Elle est utilisée pour des notifications critiques et des faits urgents en provenance du formulaire de contact de la page <a href='%{base_path}/about' target='_blank'>À propos</a>."
+    contact_url: "Adresse de courriel de ce site. Elle est utilisée pour des faits urgents en provenance du formulaire de contact de la page <a href='%{base_path}/about' target='_blank'>À propos</a>."
     crawl_images: "Récupérer les images provenant de sources tierces pour y insérer les dimensions correctes (hauteur et largeur)."
     download_remote_images_to_local: "Transformer les images distantes en images locales en les téléchargeant ; cela permet d'éviter les liens morts."
     download_remote_images_threshold: "Quantité minimum d'espace disque requise pour télécharger localement des images distantes (en pourcentage)"
@@ -1326,6 +1336,7 @@ fr:
     editing_grace_period_max_diff_high_trust: "Nombre maximum de changements de caractères autorisés dans le délai de grâce d'édition, si plus de changements, enregistrez une autre révision de poste (niveaux de confiance 2 et plus)."
     staff_edit_locks_post: "Les messages seront vérouillés à la modification si modifiés par des responsables"
     post_edit_time_limit: "Un auteur du niveau de confiance 0 ou 1 peut modifier ses messages pendant (n) minutes après leur publication. Mettre à 0 pour retirer cette limite."
+    tl2_post_edit_time_limit: "Un auteur de niveau de confiance 2 ou supérieur peut modifier ses messages pendant (n) minutes après leur publication. Mettre à 0 pour retirer cette limite."
     edit_history_visible_to_public: "Autoriser tout le monde à voir les versions précédentes d'un message modifié. Quand désactivé, seuls les responsables peuvent voir l'historique."
     delete_removed_posts_after: "Les messages retirés par leur auteur seront automatiquement supprimés après (n) heures. Pour une valeur renseignée à 0, les messages seront supprimés immédiatement."
     max_image_width: "Largeur maximale des images dans un message"
@@ -1336,6 +1347,7 @@ fr:
     add_rel_nofollow_to_user_content: 'Ajouter rel nofollow à tous les contenus des utilisateurs, sauf les liens internes (incluant les domaines parents). Si vous modifiez ceci, vous devez exécuter la commande "rake posts:rebake"'
     exclude_rel_nofollow_domains: "Une liste de domaines pour lesquels l'attribut nofollow ne sera pas ajouté aux liens. tld.com autorisera automatiquement sub.tld.com également. Au minimum, vous devriez ajouter le domaine de premier niveau (TLD) de ce site pour aider les robots d'indexation à trouver tout le contenu. Si d'autres parties du site sont sur d'autre domaines, ajoutez-les aussi."
     post_excerpt_maxlength: "Longueur maximale d'un extrait / résumé de message."
+    topic_excerpt_maxlength: "Longueur maximale d'un extrait / résumé qui est généré depuis le premier message d'un sujet."
     show_pinned_excerpt_mobile: "Afficher les extraits des sujets épinglés en vue mobile."
     show_pinned_excerpt_desktop: "Afficher les extraits des sujets épinglés en vue bureau."
     post_onebox_maxlength: "Longueur maximale d'un message emboîté en nombre de caractères."
@@ -1343,18 +1355,18 @@ fr:
     inline_onebox_domains_whitelist: "Une liste de domaines qui seront transformé en Onebox s'ils ont été liés sans titre"
     enable_inline_onebox_on_all_domains: "Ignorer le paramètre inline_onebox_domain_whitelist et permettre des onebox 'inline' pour tous les domaines."
     max_oneboxes_per_post: "Nombre maximum de Onebox dans un message."
-    logo: "L'image de votre logo situé en haut à gauche de votre site. Utiliser une forme rectangulaire large avec une hauteur de 120 et une largeur de plus que 360. Si vous laissez ce champ vide, le nom de votre site apparaitra."
-    logo_small: "La petite image logo affiché en haut à gauche du site quand la page est défilée vers le bas. Utiliser une image carré de 120 x 120. Si vide, une glyphe 'maison' sera affichée."
-    digest_logo: "L'image alternative de votre logo utilisée en haut du résumé par courriel de votre site. Doit être en forme de rectangle large et ne pas être une image SVG. Si vide, l'image du paramètre `logo` sera utilisé."
-    mobile_logo: "L'image de votre logo utilisé sur la version mobile de votre site. Utiliser une forme rectangulaire large avec une hauteur de 120 et une largeur de plus que 360. Si vide, l'image du paramètre `logo` sera utilisé. "
-    large_icon: "Image utilisée comme base pour d'autres icônes de métadonnées. Devrait idéalement être plus grand que 512 x 512. Si laissé vide, logo_small sera utilisé."
-    manifest_icon: "Image utilisée comme logo / image de démarrage sur Android. Sera automatiquement redimensionné à 512 × 512. Si laissé vide, large_icon sera utilisé."
-    favicon: "Un favicon pour votre site, voir <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://fr.wikipedia.org/wiki/Favicon</a> . Pour fonctionner correctement sur un CDN, il doit s'agir d'un png. Sera redimensionné à 32x32. Si laissé vide, large_icon sera utilisé."
-    apple_touch_icon: "Icône utilisée pour les appareils Apple touch. Sera automatiquement redimensionné à 180x180. Si laissé vide, large_icon sera utilisé."
-    opengraph_image: "Image opengraph par défaut, utilisée lorsque la page n'a pas d'autre image appropriée. Si laissé vide, large_icon sera utilisé"
-    twitter_summary_large_image: "Carte Twitter 'Résumé grande image' (doit être au moins 280 en largeur et au moins 150 en hauteur). Si laissée vide, les métadonnées de carte normales sont générées à l'aide de opengraph_image."
-    notification_email: "L'adresse de courriel dans le champs De qui sera utilisée pour envoyer les courriels systèmes essentiels. Le nom de domaine spécifié doit avoir les informations SPF, DKIM et PTR inversé renseignés correctement pour que le courriel arrive à destination."
-    email_custom_headers: "Une liste délimité par des (|) pipes d'entêtes de courriel"
+    logo: "L'image de votre logo située en haut à gauche de votre site. Utilisez une forme rectangulaire large avec une hauteur de 120 et une largeur de plus que 360. Si vous laissez ce champ vide, le nom de votre site apparaîtra."
+    logo_small: "La petite image logo affichée en haut à gauche du site quand la page est défilée vers le bas. Utilisez une image carrée de 120 x 120. Si vous laissez ce champ vide, une icône de maison sera affichée."
+    digest_logo: "L'image alternative de votre logo utilisée en haut du résumé par courriel de votre site. Utilisez une image rectangulaire et suffisamment large. N'utilisez pas une image SVG. Si vous laissez ce champ vide, l'image du paramètre `logo` sera utilisée."
+    mobile_logo: "L'image de votre logo utilisée sur la version mobile de votre site. Utilisez une image rectangulaire avec une hauteur de 120 et une largeur de plus que 360. Si vous laissez ce champ vide, l'image du paramètre `logo` sera utilisée. "
+    large_icon: "Image utilisée comme base pour d'autres icônes de métadonnées. Elle devrait idéalement être plus grande que 512 x 512. Si vous laissez ce champ vide, logo_small sera utilisé."
+    manifest_icon: "Image utilisée comme logo / image de démarrage sur Android. Elle sera automatiquement redimensionnée en 512 × 512. Si vous laissez ce champ vide, large_icon sera utilisée."
+    favicon: "Un favicon pour votre site, voir <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://fr.wikipedia.org/wiki/Favicon</a> . Pour fonctionner correctement sur un CDN, il doit être au format PNG. Il sera redimensionné en 32x32. Si vous laissez ce champ vide, large_icon sera utilisée."
+    apple_touch_icon: "Icône utilisée pour les appareils Apple touch. Elle sera automatiquement redimensionnée en 180x180. Si vous laissez ce champ vide, large_icon sera utilisée."
+    opengraph_image: "Image opengraph par défaut, utilisée lorsque la page n'a pas d'autre image appropriée. Si vous laissez ce champ vide, large_icon sera utilisée"
+    twitter_summary_large_image: "Carte Twitter « Summary Card with Large Image » (doit être au moins 280 en largeur et au moins 150 en hauteur). Si vous laissez ce champ vide, les métadonnées standards de carte sont générées à l'aide de opengraph_image."
+    notification_email: "L'adresse de courriel utilisée pour envoyer les courriels systèmes essentiels et affichée dans le champs « De ». Le nom de domaine spécifié doit avoir les informations SPF, DKIM et PTR inversé renseignées correctement pour que le courriel arrive à destination."
+    email_custom_headers: "Une liste délimité par des pipes (|) d'entêtes de courriel"
     email_subject: "Format du sujet personnalisable pour les courriels standards. Voir <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>"
     enforce_second_factor: "Forcer les utilisateurs à activer l'authentification à double facteur. Sélectionner « tous » pour l'appliquer à tous les utilisateurs. Sélectionner « responsables » pour l'imposer 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 via réseaux sociaux ainsi que tous les logos / dépendances tiers sont tous compatibles HTTPS eux aussi ?"
@@ -1388,7 +1400,7 @@ fr:
     enable_markdown_typographer: "Utiliser des règles typographiques pour améliorer la lisibilité du texte : remplacer les guillemets simples ' avec les guillemets bouclés ’, (c) (tm) avec les symbôles, -- avec emdash –, etc."
     enable_markdown_linkify: "Traiter automatiquement le texte qui ressemble à un lien comme un lien : www.site.com et https://site.com seront automatiquement liés."
     markdown_linkify_tlds: "Liste des domaines de premier niveau qui sont automatiquement traités comme des liens."
-    markdown_typographer_quotation_marks: "Liste des paires de rechange doubles et simples"
+    markdown_typographer_quotation_marks: "Liste des paires de remplacement des guillemets doubles et simples"
     post_undo_action_window_mins: "Nombre de minutes pendant lesquelles un utilisateur peut annuler une action sur un message (J'aime, signaler, etc.)"
     must_approve_users: "L'équipe du forum doit approuver tous les nouveaux utilisateurs avant qu'il aient accès au site."
     pending_users_reminder_delay: "Avertir les modérateurs si des nouveaux utilisateurs sont en attente d'approbation depuis x heures. Mettre -1 pour désactiver les notifications."
@@ -1404,33 +1416,33 @@ fr:
     blacklist_ip_blocks: "Une liste de blocs IP privés qui ne doivent jamais être crawlés par Discourse"
     whitelist_internal_hosts: "Une liste de domaines internes que Discourse peut crawler en sécurité pour les Onebox et autres"
     allowed_iframes: "Une liste des préfixes du domaine src iframe que Discourse peut autoriser en toute sécurité dans les messages"
-    whitelisted_crawler_user_agents: "Les agents utilisateurs des robots Web qui devraient être autorisés à accéder au site. ATTENTION ! CELUI-CI ANNULERA TOUS LES CRAWLERS NON INSCRITS ICI !"
+    whitelisted_crawler_user_agents: "Les agents utilisateurs des robots d'indexation qui devraient être autorisés à accéder au site. ATTENTION ! CE PARAMÈTRE BLOQUERA TOUS LES ROBOTS D'INDEXATION NON LISTÉS ICI !"
     blacklisted_crawler_user_agents: "Mot unique insensible à la casse dans la chaîne de caractères de l'agent utilisateur identifiant les robots d'exploration Web qui ne devraient pas être autorisés à accéder au site. Ne s'applique pas si une whitelist est définie."
-    slow_down_crawler_user_agents: "Agents de crawlers web qui devrait être limité dans robots.txt avec la commande Crawl-delay."
-    slow_down_crawler_rate: "Si slow_down_crawler_user_agents est spécifié ce taux s'appliquera aux crawlers web (secondes d'attente entre requêtes)"
+    slow_down_crawler_user_agents: "Agents utilisateurs des robots d'indexation qui devraient être limités dans robots.txt avec la commande Crawl-delay"
+    slow_down_crawler_rate: "Si slow_down_crawler_user_agents est défini, ce taux s'appliquera à tous les robots d'indexation (nombre de secondes d'attente entre requêtes)"
     content_security_policy: "Activer Content-Security-Policy"
     content_security_policy_report_only: "Activer Content-Security-Policy-Report-Only"
-    content_security_policy_collect_reports: "Activer collecte de rapports CSP violation à /csp_reports"
-    invalidate_inactive_admin_email_after_days: "Les comptes admin qui n'ont pas visité le site depuis ce nombre de jours devront re-valider leurs adresses courriel avant de se connecter. 0 pour désactiver."
-    top_menu: "Déterminer les éléments qui apparaissent dans la navigation de la page d'accueil, et dans quel ordre. Exemple latest|new|unread|categories|top|read|posted|bookmarks"
-    post_menu: "L'ordre des éléments dans le menu de rédaction. Exemple like|edit|flag|delete|share|bookmark|reply"
+    content_security_policy_collect_reports: "Activer la collecte des rapports de violation CSP sur la page /csp_reports"
+    invalidate_inactive_admin_email_after_days: "Les comptes administrateurs qui n'ont pas visité le site depuis ce nombre de jours devront revalider leur adresse courriel avant de se connecter. Mettre à 0 pour désactiver."
+    top_menu: "Choisissez les éléments qui apparaissent dans la navigation de la page d'accueil, ainsi que leur ordre. Exemple latest|new|unread|categories|top|read|posted|bookmarks"
+    post_menu: "Choisissez les éléments qui apparaissent dans le menu du message, ainsi que leur ordre. Exemple like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Les éléments du menu qui seront cachés par défaut jusqu’à extension du menu."
-    share_links: "Choix des éléments qui doivent apparaître dans la fenêtre de partage, et leur ordre."
-    site_contact_username: "Un pseudo de responsable valide pour envoyer tous les message automatiques. Si laissé vide, le compte système sera utilisé."
+    share_links: "Choisissez les éléments qui apparaissent dans la fenêtre de partage, ainsi que leur ordre."
+    site_contact_username: "Un nom d'utilisateur de responsable valide pour envoyer tous les messages automatiques. Si vous laissez ce champ vide, le compte système par défaut sera utilisé."
     site_contact_group_name: "Un nom de groupe valide à inviter à tous les messages directs automatiques."
     send_welcome_message: "Envoyer à tous les nouveaux utilisateurs un message de bienvenue avec un guide de démarrage rapide."
     send_tl1_welcome_message: "Envoyer à tous les utilisateurs de niveau de confiance 1 un message de bienvenue."
     suppress_reply_directly_below: "Ne pas afficher le panneau extensible des réponses d'un message quand la seule réponse est juste en dessous ce dernier."
-    suppress_reply_directly_above: "Ne pas afficher 'en réponse à' sur un message quand la seule réponse est juste en dessus de ce dernier."
+    suppress_reply_directly_above: "Ne pas afficher « en réponse à » sur un message quand la seule réponse est juste en dessus de ce dernier."
     remove_full_quote: "Supprimer automatiquement la citation dans les réponses directes."
-    suppress_reply_when_quoting: "Ne pas affiché le panneau \"En réponse à\" sur un message qui répond à une citation."
-    max_reply_history: "Nombre maximum de réponses à développer lors du développement d'une \"réponse à\""
+    suppress_reply_when_quoting: "Ne pas afficher « en réponse à » sur un message qui répond avec une citation."
+    max_reply_history: "Nombre maximum de réponses à développer en déroulant « en réponse à »"
     topics_per_period_in_top_summary: "Nombre de meilleurs sujets affichés dans le résumé par défaut des meilleurs sujets."
-    topics_per_period_in_top_page: "Nombre de meilleurs sujets affichés lorsqu'on sélectionne \"Voir plus\" des meilleurs sujets."
+    topics_per_period_in_top_page: "Nombre de meilleurs sujets affichés lorsqu'on sélectionne « Voir plus » des meilleurs sujets."
     redirect_users_to_top_page: "Rediriger automatiquement les nouveaux utilisateurs et les longues absences sur la page Top."
     top_page_default_timeframe: "Période par défaut pour la page la plus vue."
-    moderators_view_emails: "Permettre aux modérateurs de voir les adresses courriel des utilisateurs"
-    prioritize_username_in_ux: "Afficher le pseudonyme en premier sur la page d'un utilisateur, sa carte et ses messages (si désactivé, le nom est affiché en premier)"
+    moderators_view_emails: "Permettre aux modérateurs de voir les adresses courriels des utilisateurs"
+    prioritize_username_in_ux: "Afficher le nom d'utilisateur en premier sur la page d'un utilisateur, sa carte et ses messages (si désactivé, le nom complet est affiché en premier)"
     enable_rich_text_paste: "Permettre la conversion automatique de HTML en Markdown lors que du texte est collé dans l'éditeur. (Expérimental)"
     email_token_valid_hours: "Les jetons (tokens) de Mot de passe oublié / Activation de comptes sont valides (n) jours."
     enable_badges: "Activer le système de badges"
@@ -1438,18 +1450,19 @@ fr:
     allow_index_in_robots_txt: "Spécifiez dans le fichier robots.txt que ce site peut être indexé par les moteurs de recherche Web. Dans des cas exceptionnels, vous pouvez remplacer définitivement le fichier <a href='%{base_path}/admin/customize/robots'>robots.txt</a>."
     email_domains_blacklist: "Liste des domaines de courriel qui ne sont pas autorisés lors de la création de compte, délimitée par des pipes. Exemple : mailinator.com|trashmail.net"
     email_domains_whitelist: "Liste des domaines de courriel avec lesquelles les utilisateurs DOIVENT s'enregistrer, délimités par un pipe. ATTENTION : les utilisateurs ayant une adresse de courriel sur un autre domaine ne pourront pas s'enregistrer !"
+    auto_approve_email_domains: "Les utilisateurs dont le domaine de l'adresse courriel appartient à cette liste seront automatiquement approuvés."
     hide_email_address_taken: "Ne pas informer les utilisateurs qu'un compte existe avec un courriel donné lors de l'inscription ou à partir du formulaire d'oubli du mot de passe."
-    log_out_strict: "Lors de la déconnexion, déconnecter TOUTES les sessions pour l'utilisateur sur tous les appareils"
+    log_out_strict: "Lors de la déconnexion, déconnecter TOUTES les sessions de l'utilisateur sur tous les appareils"
     version_checks: "Ping les serveurs de Discourse afin d'obtenir les mises à jours et affiche les nouveaux messages d'information dans le tableau de bord <a href='%{base_path}/admin' target='_blank'>/admin</a>"
     new_version_emails: "Envoyer un courriel à contact_email quand une nouvelle version de Discourse est disponible."
     invite_expiry_days: "Combien de temps (en jours) les clés d'invitation sont-elles valides"
-    invite_only: "Tous les nouveaux utilisateurs doivent être explicitement invités par des utilisateurs de confiance ou du personnel. L'enregistrement public est désactivé."
-    login_required: "Authentification requise pour lire le contenu du site, interdit l'accès anonyme."
+    invite_only: "Tous les nouveaux utilisateurs doivent être explicitement invités par des utilisateurs de confiance ou des responsables. L'inscription publique est désactivée."
+    login_required: "Exiger l'authentification pour lire le contenu du site et interdire l'accès anonyme."
     min_username_length: "Longueur minimale du nom d'utilisateur en caractères. ATTENTION : si des utilisateurs ou groupes existants ont des noms plus courts que celui-ci, votre site se cassera !"
     max_username_length: "Longueur maximale du nom d'utilisateur en caractères. ATTENTION : si des utilisateurs ou groupes existants ont des noms plus longs que celui-ci, votre site se cassera !"
     unicode_usernames: "Autorisez les noms d'utilisateur et noms de groupes à contenir des lettres et des chiffres Unicode."
     unicode_username_character_whitelist: "Expression régulière pour autoriser uniquement certains caractères Unicode dans les noms d'utilisateur. Les lettres et les chiffres ASCII seront toujours autorisés et n'ont pas besoin d'être inclus dans la liste blanche."
-    reserved_usernames: "Pseudos pour lesquels l'inscription n'est pas autorisée. Le symbole « * » peut être utilisé pour représenter n'importe quel caractère 0 ou plusieurs fois."
+    reserved_usernames: "Noms d'utilisateurs pour lesquels l'inscription n'est pas autorisée. Le symbole « * » peut être utilisé pour représenter n'importe quel caractère 0 ou plusieurs fois."
     min_password_length: "Longueur minimale du mot de passe."
     min_admin_password_length: "Longueur minimale du mot de passe pour l'administrateur."
     password_unique_characters: "Nombre minimum de caractères uniques qu'un mot de passe doit avoir."
@@ -1460,19 +1473,21 @@ fr:
     sso_url: "URL de l'authentification unique SSO (doit inclure http:// ou http://)"
     sso_secret: "Chaîne de caractères secrète utilisée pour authentifier les informations SSO par cryptographie, assurez-vous qu'elle est de 10 caractères ou plus"
     sso_provider_secrets: "Une liste de pairs domaine-secret qui utilise Discourse comme fournisseur SSO. Assurez-vous que le secret SSO fait 10 caractères ou plus. Le symbole * peut être utilisé à la place de n'importe quel domaine, ou partie de domaine (p.ex. *.exemple.com)"
-    sso_overrides_bio: "Écrase la biographie du profil utilisateur et empêche l'utilisateur de le modifier"
+    sso_overrides_bio: "Écrase la biographie du profil utilisateur et empêche l'utilisateur de la modifier"
     sso_overrides_groups: "Synchroniser l'ensemble de adhésions de groupe manuelles avec les groupes spécifiés dans l'attibut sso (ATTENTION : si vous ne spécifiez pas de groupe toutes les adhésions de groupe manuelles seront résiliées pour l'utilisateur)"
-    sso_overrides_email: "Surcharger les emails locaux avec les emails externes d'un SSO à chaque connexion, et prévenir les modifications locales. (ATTENTION : Des écarts peuvent se produire dus aux règles locales sur les emails)"
-    sso_overrides_username: "Surcharger les pseudos locaux avec les pseudos externes d'un SSO à chaque connexion, et prévenir les modifications locales. (ATTENTION : des écarts peuvent se produire dûes aux différences de longueur et d'exigences sur les pseudos)"
-    sso_overrides_name: "Surcharger les noms complets locaux avec les noms complets externes d'un SSO à chaque connexion, et prévenir les modifications locales."
-    sso_overrides_avatar: "Surcharge les avatars des utilisateurs avec les avatars d'un SSO. Si activé, les utilisateurs ne pourront pas télécharger d'avatars sur Discourse."
-    sso_overrides_profile_background: "Remplacer arrière-plan du profil utilisateur avec un avatar d'un site externe à travers SSO payload."
-    sso_overrides_card_background: "Remplacer arrière-plan de la carte de l'utilisateur avec un avatar d'un site externe à travers SSO payload."
+    sso_overrides_email: "Remplace les courriels locaux par les courriels externes du SSO à chaque connexion, et empêcher les modifications locales. (ATTENTION : des écarts peuvent se produire à cause de la normalisation des courriels locaux)"
+    sso_overrides_username: "Remplace les noms d'utilisateurs locaux avec les noms d'utilisateurs externes du SSO à chaque connexion, et empêcher les modifications locales. (ATTENTION : des écarts peuvent se produire à cause des différences de longueur et d'exigences sur les noms d'utilisateurs)"
+    sso_overrides_name: "Remplace les noms complets locaux avec les noms complets externes du SSO à chaque connexion, et empêcher les modifications locales."
+    sso_overrides_avatar: "Remplace les avatars des utilisateurs avec les avatars du SSO. Si activé, les utilisateurs ne pourront pas envoyer leur avatar sur Discourse."
+    sso_overrides_location: "Remplace la localisation des utilisateurs avec celle retournée par le SSO et empêcher les modifications locales."
+    sso_overrides_website: "Remplace le site web de l'utilisateur avec celui retourné par le SSO et empêcher les modifications locales."
+    sso_overrides_profile_background: "Remplace l'arrière-plan du profil utilisateur par l'avatar retourné par le SSO."
+    sso_overrides_card_background: "Remplace l'arrière-plan de la carte de l'utilisateur avec l'avatar retourné par le SSO."
     sso_not_approved_url: "Rediriger les comptes SSO non validés vers cette URL"
     sso_allows_all_return_paths: "Ne pas restreindre le domaine pour les return_paths fournis par le SSO (par défaut, le chemin de retour doit être sur le site actuel)"
-    enable_local_logins: "Activer les comptes locaux avec pseudo et mot de passe. Ceci doit être activé pour que les invitations fonctionnent. ATTENTION : si désactivé, vous ne pourrez peut-être plus vous connecter si vous n'avez pas configuré au préalable au moins une autre méthode de connection."
+    enable_local_logins: "Activer les comptes locaux avec nom d'utilisateur et mot de passe. Ceci doit être activé pour que les invitations fonctionnent. ATTENTION : si désactivé, vous ne pourrez peut-être plus vous connecter si vous n'avez pas configuré au préalable au moins une autre méthode de connection."
     enable_local_logins_via_email: "Permettre aux utilisateurs de demander qu'un lien de connexion en un clic leur soit envoyé par courriel."
-    allow_new_registrations: "Autorise l'inscription des nouveaux utilisateurs. Décocher pour prévenir la création de nouveau compte."
+    allow_new_registrations: "Autoriser l'inscription des nouveaux utilisateurs. Décocher pour empêcher la création de nouveau compte."
     enable_signup_cta: "Afficher un rappel aux visiteurs pour les encourager à créer un compte."
     enable_google_oauth2_logins: "Activer l'authentification Google Oauth2. C'est la méthode d'authentification que Google supporte désormais. Nécessite une clé et une phrase secrète. Voir <a href='https://meta.discourse.org/t/15858' target='_blank'>Comment configurer Google login pour Discourse</a>."
     google_oauth2_client_id: "Identifiante du client de votre application Google."
@@ -1489,8 +1504,8 @@ fr:
     facebook_app_id: "App id pour l'authentification Facebook, enregistré sur <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
     facebook_app_secret: "App secret pour l'authentification Facebook, enregistré sur <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
     enable_github_logins: "Activer l'authentification GitHub, nécessite github_client_id et github_client_secret. Voir <a href='https://meta.discourse.org/t/13745' target='_blank'>Configurer GitHub Login pour Discourse</a>."
-    github_client_id: "Id client pour l'authentification Github, enregistré sur <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
-    github_client_secret: "Secret client pour l'authentification Github, enregistré sur <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    github_client_id: "ID du client pour l'authentification GitHub, enregistré sur <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    github_client_secret: "Clé secrète du client pour l'authentification GitHub, enregistrée sur <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     enable_discord_logins: "Permettre aux utilisateurs de s'authentifier via Discord ?"
     discord_client_id: 'Identifiant de l''utilisateur Discord (en cas de besoin, le créer via <a href="https://discordapp.com/developers/applications/me">le portail de développement Discord</a>)'
     discord_secret: "Clé secrète Discord"
@@ -1499,25 +1514,25 @@ fr:
     allow_restore: "Autoriser la restauration, qui peut remplacer TOUTES les données du site ! Laissez à faux, sauf si vous envisagez de faire restaurer une sauvegarde"
     maximum_backups: "Nombre maximum de sauvegardes à conserver sur le disque. Les anciennes sauvegardes seront automatiquement supprimées"
     automatic_backups_enabled: "Activer les sauvegardes automatiques tels que définis dans les fréquences de sauvegarde"
-    backup_frequency: "Nombre de jours entre sauvegardes"
-    s3_backup_bucket: "Bucket distant qui contiendra les sauvegardes. ATTENTION : Vérifiez que c'est un bucket privé"
-    s3_endpoint: "Le terminal peut être modifié pour être sauvegardé sur un service compatible S3 comme DigitalOcean Spaces ou Minio. ATTENTION : Laisser vide si vous utilisez AWS S3"
-    s3_configure_tombstone_policy: "Activer la suppression automatique des téléchargements non-référencés (?). IMPORTANT : En cas de désactivation, aucun espace disque ne sera récupéré suite à la suppression de téléchargements."
-    s3_disable_cleanup: "Désactiver la suppression des sauvegardes de S3 lors de leur suppression locale."
+    backup_frequency: "Nombre de jours entre chaque sauvegarde"
+    s3_backup_bucket: "Bucket distant qui contiendra les sauvegardes. ATTENTION : vérifiez que le bucket est privé."
+    s3_endpoint: "La destination peut être modifiée pour envoyer les sauvegardes vers un service compatible avec S3, par exemple DigitalOcean Spaces ou Minio. ATTENTION : laisser vide si vous utilisez AWS S3."
+    s3_configure_tombstone_policy: "Activer la suppression automatique des fichiers non utilisés. IMPORTANT : en cas de désactivation, aucun espace disque ne sera récupéré après la suppression des fichiers."
+    s3_disable_cleanup: "Désactiver la suppression des sauvegardes sur S3 lorsqu'elles sont supprimées localement."
     enable_s3_inventory: "Générer des rapports et vérifier les envois avec l'inventaire Amazon S3. IMPORTANT : nécessite un accès valide à S3 (l'identifiant et la clé secrète). "
     backup_time_of_day: "Heure (UTC) de planification de la sauvegarde."
     backup_with_uploads: "Inclure les fichiers envoyés dans les sauvegardes. Si désactivé, seule la base de données sera sauvegardée."
-    backup_location: "Lieu de stockage des archivages. IMPORTANT : S3 reqiuert que des identifiants valides S3 soient saisis dans Files settings."
+    backup_location: "Lieu de stockage des sauvegardes. IMPORTANT : S3 nécessite des identifiants valides dans les paramètres de fichiers."
     backup_gzip_compression_level_for_uploads: "Niveau de compression gzip utilisé pour compresser les envois."
-    include_thumbnails_in_backups: "Inclure les vignettes générées dans les sauvegardes. Si vous désactivez cette option, les sauvegardes seront réduites, mais il faudra réémettre toutes les publications après une restauration."
-    active_user_rate_limit_secs: "A quelle fréquence mettre à jour le champ 'last_seen_at' (Dernière vu à), en secondes."
-    verbose_localization: "Afficher des informations de debug sur l'interface à coté des textes traduits."
+    include_thumbnails_in_backups: "Inclure les vignettes générées dans les sauvegardes. Si vous désactivez cette option, les sauvegardes seront plus petites mais leur restauration nécessitera de régénérer tous les messages."
+    active_user_rate_limit_secs: "À quelle fréquence mettre à jour le champ « last_seen_at », en secondes."
+    verbose_localization: "Afficher des informations supplémentaires sur l'interface des textes à traduire."
     previous_visit_timeout_hours: "Combien d'heures pour qu'une visite soit considérée comme la visite « précédente »."
     top_topics_formula_log_views_multiplier: "formule pour la valeur de multiplicateur de vues de journal (n) dans les sujets tendance : `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: "formule pour la valeur de multiplicateur de premiers J'aime (n) dans les sujets tendance : `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "formule pour la valeur de multiplicateur de moins de J'aime par message (n) dans les sujets tendance: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "Nombre d'anciens messages à être régénéré toutes les 15 minutes."
-    enable_safe_mode: "Permettre aux utilisateurs d'utiliser le mode sans échec pour déboguer les plugins."
+    rebake_old_posts_count: "Nombre d'anciens messages à être régénérés toutes les 15 minutes."
+    enable_safe_mode: "Permettre aux utilisateurs d'utiliser le mode sans échec pour déboguer les extensions."
     rate_limit_create_topic: "Après la création d'un sujet, les utilisateurs doivent attendre (n) secondes avant de pouvoir en créer un nouveau."
     rate_limit_create_post: "Après avoir posté un message, les utilisateurs doivent attendre (n) secondes avant de pouvoir en poster un nouveau."
     rate_limit_new_user_create_topic: "Après la création d'un sujet, les nouveaux utilisateurs doivent attendre (n) secondes avant de pouvoir en créer un nouveau."
@@ -1527,7 +1542,7 @@ fr:
     max_bookmarks_per_day: "Nombre maximum de signets par utilisateur et par jour."
     max_edits_per_day: "Nombre maximum de modifications par utilisateur chaque jour."
     max_topics_per_day: "Nombre maximum de sujet qu'utilisateur peut créer par jour."
-    max_personal_messages_per_day: "Nombre maximum de messages que les utilisateurs peuvent créer chaque jour."
+    max_personal_messages_per_day: "Nombre maximum de messages directs que les utilisateurs peuvent créer chaque jour."
     max_invites_per_day: "Nombre maximum d'invitations qu'un utilisateur peut envoyer par jour."
     max_topic_invitations_per_day: "Nombre maximum d'invitations à un sujet qu'un utilisateur peut envoyer par jour."
     max_logins_per_ip_per_hour: "Nombre maximum de connexions autorisées par adresse IP et par heure"
@@ -1536,6 +1551,7 @@ fr:
     max_post_deletions_per_day: "Nombre maximum de sujet qu'un utilisateur peut supprimer par jour."
     alert_admins_if_errors_per_minute: "Nombre d'erreurs par minute nécessaires pour déclencher une alerte administrateur. Une valeur de 0 désactive cette fonctionnalité. N. B. : nécessite un redémarrage."
     alert_admins_if_errors_per_hour: "Nombre d'erreurs par heure nécessaires pour déclencher une alerte administrateur. Une valeur de 0 désactive cette fonctionnalité. N. B. : nécessite un redémarrage."
+    categories_topics: "Nombre de sujets à afficher dans la page /categories. Si configuré à 0, une valeur automatique sera appliquée pour que les colonnes des catégories et des sujets soient symétriques."
     suggested_topics: "Nombre de sujets suggérés affichés en bas d'un sujet."
     limit_suggested_to_category: "Afficher uniquement les sujets de la catégorie courante dans les sujets similaires."
     suggested_topics_max_days_old: "Les sujets suggérés ne devraient pas être plus anciens que n jours."
@@ -1555,9 +1571,9 @@ fr:
     external_system_avatars_enabled: "Utilisez un service d'avatars externe."
     external_system_avatars_url: "URL du service d'avatars externe. Les remplacements autorisés sont {username} {first_letter} {color} {size}"
     restrict_letter_avatar_colors: "Une liste de codes à 6 chiffres (format hexadécimal) pour les couleurs des avatars à lettres."
-    selectable_avatars_enabled: "Obliger les utilisateurs à choisir un avatar de la liste."
-    selectable_avatars: "Liste d'avatars parmi lesquels les utilisateurs peuvent choisir."
-    allow_all_attachments_for_group_messages: "Autorise toutes les pièces-jointes pour les messages de groupes."
+    selectable_avatars_enabled: "Obliger les utilisateurs à sélectionner un avatar de la liste."
+    selectable_avatars: "Liste d'avatars que les utilisateurs peuvent sélectionnés."
+    allow_all_attachments_for_group_messages: "Autoriser toutes les pièces-jointes pour les messages de groupes."
     png_to_jpg_quality: "Qualité du fichier JPEG converti (1 est la plus faible, 99 est la meilleure, 100 pour désactiver)."
     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."
@@ -1604,9 +1620,9 @@ fr:
     newuser_max_links: "Combien de liens un nouvel utilisateur peut-il ajouter à un message."
     newuser_max_images: "Combien d'images un nouvel utilisateur peut-il ajouter à un message."
     newuser_max_attachments: "Combien de fichiers un nouvel utilisateur peut-il ajouter à un message."
-    newuser_max_mentions_per_post: "Nombre maximum de @pseudo qu'un nouvel utilisateur peut mentionner dans un message."
+    newuser_max_mentions_per_post: "Nombre maximum de noms d'utilisateurs qu'un nouvel utilisateur peut mentionner dans un message."
     newuser_max_replies_per_topic: "Nombre maximum de réponses qu'un nouvel utilisateur peut faire dans une même discussion avant que quelqu'un lui réponde."
-    max_mentions_per_post: "Nombre maximal de @pseudo que tout le monde peut mentionner dans un message."
+    max_mentions_per_post: "Nombre maximal de noms d'utilisateurs que les utilisateurs peuvent mentionner dans un message."
     max_users_notified_per_group_mention: "Nombre maximum d'utilisateurs qui peuvent recevoir une notification si un groupe est mentionné (si le seuil est atteint, aucune notification ne sera envoyée)"
     enable_mentions: "Permettre aux utilisateurs de mentionner d'autres utilisateurs."
     create_thumbnails: "Créer un aperçu pour les images imbriquées qui sont trop large pour le message."
@@ -1624,11 +1640,13 @@ fr:
     desktop_category_page_style: "Style visuel de la page /categories."
     category_colors: "Une liste de couleurs en hexadécimale autorisées pour les catégories."
     category_style: "Style visuel pour les badges de catégorie."
-    max_attachment_size_kb: "La taille maximale des fichiers envoyés en Ko. Doit être configurer dans nginx (client_max_body_size) / apache ou proxy aussi."
+    max_image_size_kb: "La taille maximale des images envoyées en Ko. La valeur doit aussi être configurée dans Nginx (client_max_body_size), Apache ou le proxy. Les images plus grandes que cette taille et plus petites que client_max_body_size seront redimensionnées à l'envoi."
+    max_attachment_size_kb: "La taille maximale des fichiers envoyés en Ko. La valeur doit aussi être configurée dans Nginx (client_max_body_size), Apache ou le proxy."
     authorized_extensions: "Une liste d'extensions de fichier autorisées pour les envois sur le serveur (mettre '*' pour autoriser tous les types)"
     authorized_extensions_for_staff: "Une liste des extensions de fichiers autorisées pour le téléchargement pour les responsables en plus de la liste définie dans le paramètre `authorized_extensions'. (utilisez '*' pour activer tous les types de fichiers)"
     theme_authorized_extensions: "Une liste d'extensions de fichier autorisées pour les envois de thème (mettre « * » pour autoriser tous les types de fichier)"
-    max_similar_results: "Combien de sujets similaires sont afficher lorsqu'un utilisateur est en train de créer un nouveau sujet. La comparaison se base sur le titre et le contenu."
+    max_similar_results: "Combien de sujets similaires sont affichés lors de la création d'un nouveau sujet. La comparaison se base sur le titre et le contenu."
+    max_image_megapixels: "Nombre maximum autorisé de mégapixels pour une image. Les images avec un nombre plus élevé seront rejetées."
     title_prettify: "Corrige les coquilles les plus communes dans les titres (intégralité du titre en majuscule, première lettre en minuscule, de multiples ! et ?, un . inutile à la fin, etc.)"
     title_remove_extraneous_space: "Supprimez les espaces devant les signes de ponctuation de fin."
     automatic_topic_heat_values: 'Mettez à jour automatiquement les paramètres "Sujet affiché" et "Sujet similaire" en fonction de l''activité du site.'
@@ -1666,19 +1684,20 @@ fr:
     auto_silence_fast_typers_max_trust_level: "Niveau de confiance maximum pour automatiquement mettre sous silence les utilisateurs rédigeant des messages trop rapidement."
     auto_silence_first_post_regex: "Regex non sensible à la casse qui, si elle est déclenchée, mettre sous silence le premier message de l'utilisateur et l'enverra dans la file d'attente d'approbation.\nExemple : rageux|a[bc]a mettre sous slience les premiers messages contenant rageux ou aba ou aca."
     reviewable_claiming: "Est-ce que les contenu à vérifier doit être réservé avant qu'on puisse agir dessus ?"
-    reviewable_default_topics: "Afficher le contenu révisable groupé par sujet par défaut"
-    reviewable_default_visibility: "Ne pas afficher les éléments révisables à moins qu'ils répondent à cette priorité"
+    reviewable_default_topics: "Par défaut, afficher le contenu à vérifier par sujet"
+    reviewable_default_visibility: "Ne pas afficher les éléments à vérifier à moins qu'ils ont cette priorité"
     high_trust_flaggers_auto_hide_posts: "Les messages des nouveaux utilisateurs seront automatiquement cachés après avoir été signalés comme spam par un utilisateur d'un niveau de confiance 3 et plus"
+    cooldown_hours_until_reflag: "Combien de temps les utilisateurs doivent attendre avant de pouvoir signaler à nouveau un message"
     reply_by_email_enabled: "Activer les réponses aux sujets via courriel."
     reply_by_email_address: "Modèle pour la réponse par courriel entrant, exemple : %%{reply_key}@reply.example.com ou replies+%%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Liste des templates alternatifs pour les adresses des courriels entrants de la réponse par courriel. Exemple : %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
-    incoming_email_prefer_html: "Utilisez HTML plutôt que du texte pour les courriels entrants."
+    incoming_email_prefer_html: "Utilisez du HTML plutôt que du texte pour les courriels entrants."
     strip_incoming_email_lines: "Supprimez les espaces blancs de début et de fin de chaque ligne de courriel entrants."
-    disable_emails: "Empêcher Discourse d'envoyer tout type de courriels. Sélectionnez 'oui' pour désactiver les courriels pour tous les utilisateurs. Sélectionnez 'non-responsables' pour désactiver les courriels uniquement pour les utilisateurs qui ne sont pas des responsables."
-    strip_images_from_short_emails: "Retirer les images des courriels dont la taille est inférieur à 2800 Octets"
-    short_email_length: "Taille des courriels courts en Octets"
-    display_name_on_email_from: "Affiche les noms complets dans le champ From du courriel."
-    unsubscribe_via_email: "Autorise les utilisateurs à se désinscrire des courriels en envoyant un courriel avec \"unsubscribe\" dans le sujet ou le corps du message."
+    disable_emails: "Empêcher Discourse d'envoyer tout type de courriels. Sélectionnez « oui » pour désactiver les courriels pour tous les utilisateurs. Sélectionnez « non responsables » pour désactiver les courriels uniquement pour les utilisateurs qui ne sont pas des responsables."
+    strip_images_from_short_emails: "Retirer les images des courriels dont la taille est inférieure à 2 800 octets"
+    short_email_length: "Taille des courriels courts en octets"
+    display_name_on_email_from: "Affiche les noms complets dans le champ « De » du courriel"
+    unsubscribe_via_email: "Autoriser les utilisateurs à se désabonner des courriels en envoyant un courriel avec « unsubscribe » dans le sujet ou le corps du message."
     unsubscribe_via_email_footer: "Inclure un lien dans le pied des courriels envoyés pour se désabonner"
     delete_email_logs_after_days: "Efface les journaux de messagerie après (N) jours. 0 pour conserver indéfiniment."
     disallow_reply_by_email_after_days: "Interdire la réponse par courriel après (N) jours. 0 pour permettre indéfiniment."
@@ -1689,10 +1708,10 @@ fr:
     block_auto_generated_emails: "Bloquer les courriels entrants identifiés comme générés automatiquement."
     ignore_by_title: "Ignorer les courriels entrants selon leur titre."
     mailgun_api_key: "Clé API secrète de Mailgun utilisée pour vérifier les messages du webhook."
-    soft_bounce_score: "Score de rejet ajouté à l'utilisateur lorsqu'un rejet temporaire se produit."
-    hard_bounce_score: "Score de rejet ajouté à l'utilisateur lorsqu'un rejet permanent se produit."
-    bounce_score_threshold: "Score de rejet maximum à partir duquel nous arrêterons d'envoyer des courriels à un utilisateur."
-    reset_bounce_score_after_days: "Rétablir automatiquement le score de rejet après X jours."
+    soft_bounce_score: "Valeur ajoutée au taux de courriels non délivrés de l'utilisateur quand un courriel ne peut temporairement pas être délivré."
+    hard_bounce_score: "Valeur ajoutée au taux de courriels non délivrés de l'utilisateur quand plus aucun courriel ne peut être délivré à son adresse."
+    bounce_score_threshold: "Taux maximum de courriels non délivrés à partir duquel nous arrêterons d'envoyer des courriels à un utilisateur."
+    reset_bounce_score_after_days: "Réinitialiser automatiquement le taux de courriels non délivrés après X jours."
     attachment_content_type_blacklist: "Liste des mots-clés utilisés pour filtrer les pièces jointes en fonction du type de contenu."
     attachment_filename_blacklist: "Liste des mots-clés utilisés pour filtrer les pièces jointes en fonction du nom de fichier."
     forwarded_emails_behaviour: "Comment traiter un courriel transféré à Discourse"
@@ -1713,23 +1732,23 @@ fr:
     pop3_polling_username: "Le nom d'utilisateur du compte POP3 pour le pooling des courriels."
     pop3_polling_password: "Le mot de passe du compte POP3 pour le pooling des courriels."
     pop3_polling_delete_from_server: "Courriels supprimés du serveur. NOTE : Si vous désactivez ceci vous devrez vider manuellement votre boîte de réception courriel."
-    log_mail_processing_failures: "Enregistrer tous les problèmes de mails dans <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    email_in: 'Autoriser les utilisateurs à poster de nouveaux sujets par courriel (requêtes manuelles ou via pop3 requises). Configurer les adresses dans l''onglet "Paramètres" de chaque catégorie.'
-    email_in_min_trust: "Le niveau de confiance minimum qu'un utilisateur doit avoir pour être autorisé à poster de nouveaux sujets par courriel."
+    log_mail_processing_failures: "Enregistrer tous les problèmes de courriel dans <a href='%{base_path}/logs' target='_blank'>/logs</a>"
+    email_in: 'Autoriser les utilisateurs à créer de nouveaux sujets par courriel (nécessite une requête manuelle ou via POP3). Configurez les adresses dans l''onglet « Paramètres » de chaque catégorie.'
+    email_in_min_trust: "Le niveau de confiance minimum qu'un utilisateur doit avoir pour être autorisé à créer de nouveaux sujets par courriel."
     email_in_spam_header: "Entête courriel pour détecter du spam."
     email_prefix: "Le [label] qui sera utilisé dans le sujet des courriels. Par défaut il prend la valeur de 'title'."
     email_site_title: "Le titre du site utilisé comme expéditeur pour les courriels du site. Par défaut il prend la valeur de 'title'. Si votre 'title\" utilise des caractères interdits dans les courriels, utiliser ce paramètre."
-    find_related_post_with_key: "N'utilisez que le 'reply key' pour trouver le message auquel on a répondu. ATTENTION : la désactivation de cette option permet l'usurpation d'identité de l'utilisateur sur la base de l'adresse e-mail."
+    find_related_post_with_key: "N'utilisez que la « reply key » pour trouver le message auquel on a répondu. ATTENTION : la désactivation de cette option permet l'usurpation d'identité de l'utilisateur sur la base de l'adresse courriel."
     minimum_topics_similar: "Combien de sujets ont besoin d'exister dans la base de données avant que des sujets similaires soit présentés lors de la rédaction de nouveaux sujets."
     relative_date_duration: "Nombre de jours après la création d'un message à partir desquels les dates seront affichées en absolu (20 Fév) plutôt qu'en relatif (7j)"
     delete_user_max_post_age: "Interdire la suppression des utilisateurs dont le premier message est date de plus de (n) jours."
     delete_all_posts_max: "Le nombre maximum de messages qui peuvent être supprimés en une seule fois avec le bouton Supprimer tous les messages. Si un utilisateur a plus que ce nombre de messages, ses messages ne pourront pas être supprimés en une seule fois et l'utilisateur ne pourra pas être supprimé."
-    username_change_period: "Le nombre de jours maximum après l'enregistrement que l'utilisateur peut encore modifier son pseudo (0 pour empêcher la modification de pseudo)."
+    username_change_period: "Le nombre de jours maximum après l'inscription pendant lequel l'utilisateur peut encore modifier son nom d'utilisateur (0 pour empêcher la modification du nom d'utilisateur)."
     email_editable: "Autoriser les utilisateurs à modifier leur adresse de courriel après l'inscription."
     logout_redirect: "URL vers laquelle rediriger le navigateur après déconnexion (par exemple : https://example.com/deconnexion)"
-    allow_uploaded_avatars: "Autoriser les utilisateurs à télécharger une photo de profil personnalisé."
-    allow_animated_avatars: "Autoriser les utilisateurs à télécharger une photo de profil de type gif animé. ATTENTION : lancer la commande rake avatars:refresh après avoir modifié ceci."
-    allow_animated_thumbnails: "Créer des aperçus animés pour les gifs animés."
+    allow_uploaded_avatars: "Autoriser les utilisateurs à envoyer une photo de profil personnalisée."
+    allow_animated_avatars: "Autoriser les utilisateurs à utiliser une photo de profil de type GIF animé. ATTENTION : lancez la commande rake avatars:refresh après avoir modifié ce paramètre."
+    allow_animated_thumbnails: "Créer des aperçus animés pour les GIF animés."
     default_avatars: "URLs des avatars qui seront utilisés par défaut pour les nouveaux utilisateurs jusqu'à ce qu'ils les modifient."
     automatically_download_gravatars: "Télécharger les gravatars pour les utilisateurs lors de la création de compte ou de la modification de courriel."
     digest_topics: "Le nombre maximum de sujets populaires à afficher dans le résumé par courriel."
@@ -1747,19 +1766,19 @@ fr:
     max_daily_gravatar_crawls: "Nombre maximum de fois que Discourse vérifiera Gravatar pour des avatars personnalisés en une journée."
     public_user_custom_fields: "Une liste de champs personnalisables qui peuvent être récupérés avec l'API."
     staff_user_custom_fields: "Une liste de champs personnalisables qui peuvent être récupérés pour des responsables avec l'API."
-    enable_user_directory: "Fournir un répertoire des utilisateurs"
-    enable_group_directory: "Proposer un répertoire pour parcourir les groupes"
+    enable_user_directory: "Activer le répertoire d'utilisateurs"
+    enable_group_directory: "Activer le répertoire de groupes"
     enable_category_group_review: "Autoriser les groupes à examiner le contenu de catégories spécifiques"
-    group_in_subject: "<a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>Mettre %%{optional_pm} dans le sujet du courriel au nom du premier groupe dans le MD. Voir : Customiser format du sujet pour les mails standards"
+    group_in_subject: "Mettre %%{optional_pm} dans le sujet du courriel au nom du premier groupe du message direct. Voir : <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>personnaliser le format du sujet des courriel standards</a>"
     allow_anonymous_posting: "Permettre aux utilisateurs de passer en mode anonyme"
     anonymous_posting_min_trust_level: "Le niveau de confiance minimum pour passer en mode anonyme."
     anonymous_account_duration_minutes: "Pour protéger l'anonymat, créer un nouveau compte anonyme tous les N minutes pour chaque utilisateur. Exemple : si 600 est choisi, dès 600 minutes après le dernier message ET que l'utilisateur passe en mode anonyme, un nouveau compte anonyme lui sera crée."
     hide_user_profiles_from_public: "Cacher les cartes, les profils et le répertoire d'utilisateurs aux visiteurs."
-    allow_featured_topic_on_user_profiles: "Permet aux utilisateurs de mettre un lien vers un sujet à la une sur leur fiche et leur profil."
+    allow_featured_topic_on_user_profiles: "Permettre aux utilisateurs de mettre un lien vers un sujet à la une sur leur carte et leur profil."
     show_inactive_accounts: "Autoriser les utilisateurs connectés à parcourir les profils de comptes inactifs."
     hide_suspension_reasons: "Ne pas afficher les raisons d'une suspension sur les profils utilisateurs."
-    log_personal_messages_views: "Logguer les vues de messages directs par Admin pour d'autres utilisateurs/groupes."
-    ignored_users_count_message_threshold: "Notifier les modérateur si un utilisateur est ignoré par autant d'utilisateurs."
+    log_personal_messages_views: "Afficher les vues de messages directs par un administrateur pour les autres utilisateurs et groupes."
+    ignored_users_count_message_threshold: "Notifier les modérateurs si un utilisateur est ignoré par ce nombre d'utilisateurs."
     ignored_users_message_gap_days: "Combien de temps faut-il attendre avant de notifier à nouveau les modérateurs d'un utilisateur ignoré par beaucoup d'autres."
     clean_up_inactive_users_after_days: "Nombre de jours avant qu'un utilisateur inactif (niveau de confiance 0 sans aucun messages) soit supprimé. Pour désactiver le nettoyage saisir 0."
     clean_up_unused_staged_users_after_days: "Nombre de jours avant de supprimer un utilisateur distant inutilisé (sans aucun message). 0 pour désactiver le nettoyage."
@@ -1772,14 +1791,14 @@ fr:
     enable_mobile_theme: "Les appareils mobiles utilisent un thème adapté aux mobiles, avec la possibilité de passer à la totalité du site. Désactivez cette option si vous voulez utiliser une feuille de style personnalisée qui répond à tous les types de client."
     dominating_topic_minimum_percent: "Quel est le pourcentage de messages un utilisateur doit poster dans un sujet avant d'être rappelé à l'ordre pour laissé la communauté répondre."
     disable_avatar_education_message: "Désactiver le message incitant à changer l'avatar."
-    suppress_uncategorized_badge: "Ne pas afficher le badge pour les sujets non catégorisés dans les listes des sujets."
-    header_dropdown_category_count: "Nombre de catégories qui peuvent être affiché dans le menu déroulant d'en-tête."
+    suppress_uncategorized_badge: "Ne pas afficher le badge pour les sujets sans catégorie dans les listes de sujets."
+    header_dropdown_category_count: "Nombre de catégories qui peuvent être affichées dans le menu déroulant de l'entête."
     permalink_normalizations: "Appliquer l'expression régulière suivante avant de détecter les permaliens, par exemple /(\\/topic.*)\\?.*/\\1 supprimera les chaînes de requête des chemins de sujet. Le format est regex+string, utilisez \\1 etc. pour capturer des séquences"
     global_notice: "Afficher une bannière de notification globale, d'URGENCE, et qui ne peut pas être ignoré, à tous les visiteurs, vide pour cacher (HTML admis)."
     disable_system_edit_notifications: "Désactiver les notifications de modifications par l'utilisateur système lorsque l'option 'download_remote_images_to_local' est activée."
     automatically_unpin_topics: "Désépingler automatiquement le sujet lorsque l'utilisateur atteint la fin."
     read_time_word_count: "Nombre de mots par minute servant de base de calcul à l'estimation du temps de lecture."
-    topic_page_title_includes_category: "La <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>balise de titre de</a> la page du sujet comprend le nom de la catégorie."
+    topic_page_title_includes_category: "La <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>balise title</a> de la page du sujet comprend le nom de la catégorie."
     native_app_install_banner_ios: "Affiche la bannière de l'application DiscourseHub sur les appareils iOS aux utilisateurs habitués (niveau de confiance supérieur ou égal à 1)."
     native_app_install_banner_android: "Affiche la bannière de l'application DiscourseHub sur les appareils Android aux utilisateurs habitués (niveau de confiance supérieur ou égal à 1)."
     share_anonymized_statistics: "Partager les statistiques d'utilisation anonymes."
@@ -1788,24 +1807,26 @@ fr:
     max_prints_per_hour_per_user: "Nombre maximum d'accès à la page /print (mettre à 0 pour désactiver)"
     full_name_required: "Le nom complet est requis dans le profil utilisateur."
     enable_names: "Autoriser l'affichage des noms complets des utilisateurs dans leur profil, sur leur carte d'utilisateur et dans les courriels. Décocher pour cacher les noms complets partout."
-    display_name_on_posts: "Afficher le nom complet de l'utilisateur dans ses messages en plus de son @pseudo."
+    display_name_on_posts: "Afficher le nom complet de l'utilisateur dans ses messages en plus de son nom d'utilisateur."
     show_time_gap_days: "Si deux messages sont publiés à ce nombre de jours d'écart, affichez cette durée dans le sujet."
     short_progress_text_threshold: "Si le nombre de messages dans un sujet dépasse ce nombre, la barre de progression affichera uniquement le numéro de message actuel. Si vous modifiez la largeur de la barre de progression, vous devrez peut-être modifier cette valeur."
     default_code_lang: "Coloration syntaxique par défaut appliquée à la syntaxe des langages de programmation des blocs de code GitHub (lang-auto, Ruby, Python, etc)"
     warn_reviving_old_topic_age: "Lorsque quelqu'un commence à répondre à un sujet dont la dernière réponse est vielle de plusieurs jours, un avertissement sera affiché. Désactiver la fonctionnalité en indiquant: 0."
-    autohighlight_all_code: "Forcer la mise en évidence de tout les textes dans les balises code, même si ils ne correspondent à aucun langage de programmation."
-    highlighted_languages: "Règles de coloration syntaxique supportées. (Attention : supporter trop de langages peut impacter les performances) voir : <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo/</a> pour une démo"
-    embed_topics_list: "Soutenir l'intégration HTML des listes de sujets"
+    autohighlight_all_code: "Forcer la coloration syntaxique dans tous les blocs de codes même si aucun langage de programmation n'est défini explicitement."
+    highlighted_languages: "Règles de coloration syntaxique supportées. (Attention : supporter trop de langages peut impacter les performances.) Voir : <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo/</a> pour une démonstration."
+    show_copy_button_on_codeblocks: "Ajouter un bouton aux blocs de codes pour copier leur contenu dans le presse-papier de l'utilisateur. Cette fonctionnalité n'est pas disponible avec Internet Explorer."
+    embed_any_origin: "Autoriser le contenu intégré quelque soit son origine. Cela est nécessaire pour les applications mobiles utilisant du HTML statique."
+    embed_topics_list: "Permettre l'intégration HTML des listes de sujets"
     embed_truncate: "Tronquer les messages embarqués."
-    embed_support_markdown: "Prise en charge du formatage Markdown pour les messages intégrés."
+    embed_support_markdown: "Permettre le formatage Markdown pour les messages intégrés."
     embed_whitelist_selector: "Une liste séparée par des virgules des éléments CSS autorisés à être intégrés."
     allowed_href_schemes: "Préfixes autorisés dans les liens en plus de http et https."
-    embed_post_limit: "Nombre maximum de messages à embarquer."
-    embed_username_required: "Un pseudo d'utilisateur pour la création du sujet est nécessaire."
+    embed_post_limit: "Nombre maximum de messages à intégrer."
+    embed_username_required: "Un nom d'utilisateur est nécessaire pour la création du sujet."
     notify_about_flags_after: "S'il y a des signalements qui n'ont pas été gérés après ce nombre d'heures, envoyer un message direct aux modérateurs. 0 pour désactiver."
     show_create_topics_notice: "Si le site contient moins de 5 sujets publics, afficher un message pour demander aux administrateurs de créer d'autres sujets."
-    delete_drafts_older_than_n_days: "Supprimer les ébauches plus vieux que (n) jours."
-    bootstrap_mode_min_users: "Nombre minimum d'utilisateurs nécessaire pour désactiver le mode de démarrage (mettre à 0 pour désactiver)"
+    delete_drafts_older_than_n_days: "Supprimer les brouillons plus vieux que (n) jours."
+    bootstrap_mode_min_users: "Nombre minimum d'utilisateurs nécessaire pour désactiver le mode spécial de lancement (mettre à 0 pour désactiver)"
     prevent_anons_from_downloading_files: "Refuser le téléchargement de pièces jointes aux visiteurs. ATTENTION : cela empêchera de fonctionner les ressources envoyées en pièce jointe qui ne sont pas des images."
     slug_generation_method: "Choisissez une méthode de génération d'identifiant. \"encodé\" générera des chaines de caractères encodées avec des pourcentages. \"aucune\" désactivera complètement les identifiants."
     enable_emoji: "Activer les emojis"
@@ -1841,7 +1862,7 @@ fr:
     default_other_notification_level_when_replying: "Niveau de notification global par défaut quand un utilisateur répond à un sujet."
     default_other_external_links_in_new_tab: "Par défaut, ouvrir tous les liens externes dans un nouvel onglet"
     default_other_enable_quoting: "Par défaut, proposer la citation du texte surligné."
-    default_other_enable_defer: "Activer la fonctionnalité de sujet différé par défaut."
+    default_other_enable_defer: "Par défaut, activer le bouton pour reporter un sujet à plus tard."
     default_other_dynamic_favicon: "Par défaut, faire apparaître le nombre de sujets récemment créés ou mis à jour sur l'icône navigateur."
     default_other_like_notification_frequency: "Par défaut, notifier les utilisateurs d'un J'aime"
     default_topics_automatic_unpin: "Par défaut, désépingler automatiquement le sujet lorsque l'utilisateur atteint la fin."
@@ -1883,15 +1904,20 @@ fr:
     force_lowercase_tags: "Forcer les nouvelles étiquettes à être entièrement en miniscule"
     company_name: "Nom de société"
     governing_law: "Droit applicable"
-    city_for_disputes: "For juridique"
-    shared_drafts_category: "Activez la fonction Ébauches partagées en désignant une catégorie pour les ébauches de sujet. Les sujets dans cette catégorie ne figureront pas dans les listes de sujets des responsables."
+    city_for_disputes: "Ville pour les litiges"
+    shared_drafts_category: "Activez la fonction Brouillons partagés en désignant une catégorie pour les brouillons de sujet. Les sujets dans cette catégorie ne figureront pas dans les listes de sujets pour les responsables."
     push_notifications_prompt: "Afficher la demande de consentement de l'utilisateur"
-    push_notifications_icon: "L'icône de badge qui apparait dans le coin notifications. Taille requise : 96 x 96."
-    short_title: "Le titre court sera utilisé sur la page d'accueil de l'utilisateur, dans le launcheur, ou d'autres endroits ou la place disponible est limitée. Il devrait être limité à 12 caractères."
+    push_notifications_icon: "L'icône du badge qui apparaît dans les notifications. Taille requise : 96 x 96."
+    short_title: "Le titre court sera utilisé sur l'écran d'accueil de l'utilisateur, le lanceur d'applications ou d'autres endroits où la place disponible est limitée. Il devrait être limité à 12 caractères."
+    dashboard_hidden_reports: "Permettre de masquer les rapports du tableau de bord."
+    dashboard_visible_tabs: "Choisissez les onglets visibles sur le tableau de bord."
     dashboard_general_tab_activity_metrics: "Sélectionnez les rapports à afficher comme indicateurs d'activité dans l'onglet général."
+    gravatar_name: "Nom du fournisseur Gravatar"
+    gravatar_base_url: "URL de base de l'API du fournisseur Gravatar"
+    gravatar_login_url: "URL relative à gravatar_base_url qui permet à l'utilisateur de se connecter au service Gravatar"
     errors:
-      invalid_email: "Adresse de courriel invalide."
-      invalid_username: "Il n'y a pas d'utilisateur ayant ce pseudo."
+      invalid_email: "Adresse courriel invalide."
+      invalid_username: "Il n'y a pas d'utilisateur ayant ce nom d'utilisateur."
       invalid_group: "Il n'y a pas de groupe ayant ce nom."
       invalid_integer_min_max: "La valeur doit être comprise entre %{min} et %{max}."
       invalid_integer_min: "La valeur doit être de %{min} ou plus."
@@ -1911,18 +1937,18 @@ fr:
       pop3_polling_authentication_failed: "Echec d'authentication POP3. Veuillez contrôler vos détails POP3."
       reply_by_email_address_is_empty: "Vous devez renseigner une 'adresse de réponse par courriel' avant d'activer la réponse par courriel."
       email_polling_disabled: "Vous devez activer le relevé manuel ou via POP3 avant d'activer les réponses par courriel."
-      user_locale_not_enabled: "Vous devez d'abord activer 'allow user locale' avant d'activer ce paramètre."
+      user_locale_not_enabled: "Vous devez d'abord activer « allow user locale » avant d'activer ce paramètre."
       invalid_regex: "L'expression régulière est invalide ou non autorisée."
-      email_editable_enabled: "Vous devez désactiver 'email editable' avant d'activer ce paramètre."
-      enable_sso_disabled: "Vous devez d'abord activer 'enable sso' avant d'activer ce paramètre."
+      email_editable_enabled: "Vous devez désactiver « email editable » avant d'activer ce paramètre."
+      enable_sso_disabled: "Vous devez d'abord activer « enable sso » avant d'activer ce paramètre."
       staged_users_disabled: "Vous devez d'abord activer 'utilisateurs distants' avant d'activer ce paramètre."
-      reply_by_email_disabled: "Vous devez d'abord activer 'reply by email' avant d'activer ce paramètre."
-      sso_url_is_empty: "Vous devez d'abord configurer un 'sso url' avant d'activer ce paramètre."
-      sso_invite_only: "Vous ne pouvez pas activer sso et 'par invitation seulement' en même temps."
-      enable_local_logins_disabled: "Vous devez d'abord activer 'enable local logins' avant d'activer ce paramètre."
-      min_username_length_exists: "Il n'est pas possible de définir une longeur minimale de pseudo qui soit plus long qu'un pseudo qui existe déjà (%{username})."
+      reply_by_email_disabled: "Vous devez d'abord activer « reply by email » avant d'activer ce paramètre."
+      sso_url_is_empty: "Vous devez d'abord configurer un « sso url » avant d'activer ce paramètre."
+      sso_invite_only: "Vous ne pouvez pas activer en même temps le SSO et l'inscription par invitation uniquement."
+      enable_local_logins_disabled: "Vous devez d'abord activer « enable local logins » avant d'activer ce paramètre."
+      min_username_length_exists: "Il n'est pas possible de définir une longueur minimale de nom d'utilisateur qui soit plus longue qu'un nom d'utilisateur qui existe déjà (%{username})."
       min_username_length_range: "Il n'est pas possible de définir un minimum plus grand qu'un maximum."
-      max_username_length_exists: "Il n'est pas possible de définir une longeur minimale de pseudo qui soit plus court qu'un pseudo qui existe déjà (%{username})."
+      max_username_length_exists: "Il n'est pas possible de définir une longueur maximale de nom d'utilisateur qui soit plus courte qu'un nom d'utilisateur qui existe déjà (%{username})."
       max_username_length_range: "Il n'est pas possible de définir un maximum plus petit que le minimum."
       invalid_hex_value: "Les couleurs doivent être des codes à 6 chiffres au format hexadécimal."
       category_search_priority:
@@ -1932,12 +1958,12 @@ fr:
       unicode_username_whitelist:
         regex_invalid: "L'expression régulière n'est pas valide : %{error}"
         leading_trailing_slash: "L'expression régulière ne doit pas commencer et se terminer par une barre oblique."
-      unicode_usernames_avatars: "Les avatars du système interne ne prennent pas en charge les noms d'utilisateur Unicode."
-      list_value_count: "La liste doit contenir exactement les valeurs %{count}."
+      unicode_usernames_avatars: "Les avatars du système n'acceptent pas les noms d'utilisateurs contenant des caractères Unicode."
+      list_value_count: "La liste doit contenir exactement %{count} valeurs."
     placeholder:
       sso_provider_secrets:
         key: "www.example.com"
-        value: "Secret SSO"
+        value: "Clé secrète du SSO"
   search:
     extreme_load_error: "Le site est soumis à une charge extrême, la recherche est désactivée, réessayez plus tard"
     within_post: "#%{post_number} par %{username}"
@@ -1950,13 +1976,13 @@ fr:
     video: "[vidéo]"
   sso:
     login_error: "Erreur de connexion"
-    not_found: "Votre compte n'a pas été trouvé. Merci de contacter l'administrateur du site."
+    not_found: "Votre compte n'a pas été trouvé. Veuillez contacter l'administrateur du site."
     account_not_approved: "Votre compte est en attente d'approbation. Vous recevrez une notification par courriel lorsque vous êtes approuvé."
-    unknown_error: "Il y a un problème avec votre compte. Merci de contacter l'administrateur du site."
+    unknown_error: "Il y a un problème avec votre compte. Veuillez contacter l'administrateur du site."
     timeout_expired: "La connexion au compte a expiré, veuillez essayer de vous reconnecter."
     no_email: "Aucune adresse de courriel n'a été fournie. Veuillez contacter l'administrateur du site."
-    email_error: "Un compte n'a pas pu être enregistré avec l'adresse de courriel <b>%{email}</b>. Veuillez contacter l'administrateur du site."
-    missing_secret: "L'authentification SSO a échoué en raison d'un secret manquant. Contactez les administrateurs du site pour résoudre ce problème."
+    email_error: "Un compte n'a pas pu être enregistré avec l'adresse courriel <b>%{email}</b>. Veuillez contacter l'administrateur du site."
+    missing_secret: "L'authentification SSO a échoué en raison d'une clé secrète manquante. Contactez les administrateurs du site pour résoudre ce problème."
   original_poster: "Créateur du sujet"
   most_posts: "Le plus de messages"
   most_recent_poster: "Auteur le plus récent"
@@ -1989,6 +2015,7 @@ fr:
   publish_page:
     slug_errors:
       blank: "ne peut être vide"
+      unavailable: "est indisponible"
       invalid: "contient des caractères invalides"
   topic_statuses:
     autoclosed_message_max_posts:
@@ -2045,19 +2072,20 @@ fr:
     security_key_support_missing_error: "Votre appareil ou navigateur actuel ne supporte pas l'utilisation de clés de sécurité. Veuillez utiliser une autre méthode."
     security_key_invalid: "Une erreur est survenue lors de la validation de la clé de sécurité."
     not_approved: "Votre compte n'a pas encore été approuvé. Vous serez notifié par courriel quand cela sera fait."
-    incorrect_username_email_or_password: "pseudo, adresse de courriel ou mot de passe incorrect"
+    incorrect_username_email_or_password: "Nom d'utilisateur, adresse courriel ou mot de passe incorrects"
     incorrect_password: "Mot de passe incorrect"
     wait_approval: "Merci de vous être inscrit. Nous vous informerons lorsque votre compte aura été approuvé."
     active: "Votre compte est activé et prêt à l'emploi."
-    activate_email: "<p>C'est presque terminé ! Nous avons envoyé un email d'activation à <b>%{email}</b>. Merci de suivre les instructions pour activer votre compte.</p><p>Si vous ne le recevez pas, vérifiez le dossier Spam dans votre messagerie.</p>"
+    activate_email: "<p>C'est presque terminé ! Nous avons envoyé un courriel d'activation à <b>%{email}</b>. Merci de suivre les instructions pour activer votre compte.</p><p>Si vous ne le recevez pas, vérifiez le dossier Spam dans votre messagerie.</p>"
     not_activated: "Vous ne pouvez pas vous connecter pour le moment. Nous vous avons envoyé un courriel d'activation. Merci de suivre les instructions qui s'y trouve pour activer votre compte."
     not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter en tant que %{username} depuis cette adresse IP."
     admin_not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter depuis cette adresse IP."
+    reset_not_allowed_from_ip_address: "Vous ne pouvez pas réinitialiser le mot de passe depuis cette adresse IP."
     suspended: "Vous ne pouvez pas vous connecter jusqu'au %{date}."
     suspended_with_reason: "Compte suspendu jusqu'à %{date} : %{reason}"
     errors: "%{errors}"
     not_available: "Indisponible. Essayez %{suggestion} ?"
-    something_already_taken: "Quelque chose c'est mal passé. Peut-être que votre pseudo ou votre adresse de courriel est déjà enregistré ? Essayez le lien : j'ai oublié mon mot de passe."
+    something_already_taken: "Un problème est survenu. Peut-être que votre nom d'utilisateur ou votre adresse courriel sont déjà enregistrés. Essayez le lien d'oubli du mot de passe."
     omniauth_error:
       generic: "Désolé, une erreur s'est produite lors de l'autorisation de votre compte. Veuillez réessayer."
       csrf_detected: "L'autorisation a expiré ou vous avez changé de navigateur. Veuillez réessayer."
@@ -2069,8 +2097,9 @@ fr:
     authenticator_error_no_valid_email: "Aucune adresse courriel associée à %{account}n'est autorisée. Vous devriez configurer votre compte avec une autre adresse."
     new_registrations_disabled: "La création de nouveau compte n'est pas autorisé pour le moment."
     password_too_long: "Les mots de passe sont limités à 200 caractères."
-    email_too_long: "L'email renseigné est trop long. Les noms de boîte ne doivent pas dépasser 254 caractères, et les noms de domaines ne doivent pas dépasser 253 caractères."
-    reserved_username: "Ce pseudo n'est pas autorisé."
+    email_too_long: "Le courriel renseigné est trop long. Les noms de boîte courriel ne doivent pas dépasser 254 caractères, et les noms de domaines ne doivent pas dépasser 253 caractères."
+    wrong_invite_code: "Le code d'invitation est invalide."
+    reserved_username: "Ce nom d'utilisateur n'est pas autorisé."
     missing_user_field: "Vous n'avez pas renseigné l'ensemble des champs utilisateur"
     auth_complete: "Authentification terminée."
     click_to_continue: "Cliquer ici pour continuer."
@@ -2089,14 +2118,17 @@ fr:
     email:
       sent_test: "envoyé !"
   user:
-    deactivated: "A été désactivé à cause de trop de courriels rejetés vers '%{email}'."
+    deactivated: "A été désactivé car trop de courriels envoyés à « %{email} » n'ont pas été délivrés."
     deactivated_by_staff: "Désactivé par un responsable"
+    deactivated_by_inactivity:
+      one: "Désactivé automatiquement après %{count} jour d'inactivité"
+      other: "Désactivé automatiquement après %{count} jours d'inactivité"
     activated_by_staff: "Activé par un responsable"
     new_user_typed_too_fast: "Le nouvel utilisateur écrivait trop rapidement"
     content_matches_auto_block_regex: "Le contenu correspond à l'expression régulière de blocage automatique"
     username:
-      short: "doit être d'au moins %{min} caractères"
-      long: "ne doit pas être supérieur à %{max} caractères"
+      short: "doit contenir au moins %{min} caractères"
+      long: "ne doit pas contenir plus de %{max} caractères"
       too_long: "est trop long"
       characters: "doit uniquement contenir des chiffres, lettres, points, tirets et tirets bas."
       unique: "doit être unique"
@@ -2117,28 +2149,28 @@ fr:
     auto_rejected: "Rejeté automatiquement à cause de l'âge. Voir paramètre auto_handle_queued_age site."
     destroy_reasons:
       unused_staged_user: "Utilisateur distant inutilisé"
-      fixed_primary_email: "Correction de l'email primaire pour utilisateur distant"
+      fixed_primary_email: "Correction du courriel principal pour l'utilisateur distant"
       same_ip_address: "Même adresse IP (%{ip_address}) que d'autres utilisateurs"
       inactive_user: "Utilisateur inactif"
     email_in_spam_header: "Le premier courriel de l'utilisateur a été signalé comme spam"
   reviewables_reminder:
     submitted:
-      one: "Ces éléments ont été soumis il y a plus d'une heure. [Veuillez les passer en revue](%{base_path}/flags)."
-      other: "Ces éléments ont été soumis il y a plus de %{count} heures. [Veuillez les passer en revue](%{base_path}/flags)."
+      one: "Ces éléments ont été soumis il y a plus de %{count} heure. [Veuillez les passer en revue](%{base_path}/review)."
+      other: "Ces éléments ont été soumis il y a plus de %{count} heures. [Veuillez les passer en revue](%{base_path}/review)."
     subject_template:
       one: "Un élément à passer en revue"
       other: "%{count} éléments à passer en revue"
   unsubscribe_mailer:
-    title: "Désinscription"
+    title: "Désabonnement"
     subject_template: "Confirmez que vous ne souhaitez plus recevoir de courriels de mises à jour de %{site_title}"
     text_body_template: |
-      Quelqu'un (peut-être vous ?) a demandé à ne plus recevoir d'emails de mises à jour pour %{site_domain_name} sur cette adresse email.
+      Quelqu'un (peut-être vous ?) a demandé à ne plus recevoir de mises à jour pour %{site_domain_name} sur cette adresse courriel.
 
       Pour le confirmer, merci de cliquer sur ce lien :
 
       %{confirm_unsubscribe_link}
 
-      Si vous souhaitez continuer à recevoir ces emails, vous pouvez ignorer ce message.
+      Si vous souhaitez continuer à recevoir ces courriels, vous pouvez ignorer ce message.
   invite_mailer:
     title: "Invitiation"
     subject_template: "%{inviter_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
@@ -2217,7 +2249,7 @@ fr:
       %{invite_link}
   invite_password_instructions:
     title: "Instructions du mot de passe d'invité"
-    subject_template: "Renseignez le mot de passe pour votre compte utilisateur %{site_name} "
+    subject_template: "Choisissez un mot de passe pour votre compte sur %{site_name} "
     text_body_template: |
       Merci d'avoir accepté l'invitation sur %{site_name} -- Bienvenue !
 
@@ -2228,7 +2260,7 @@ fr:
       (Si le lien est expiré, cliquez sur « J'ai oublié mon mot de passe » au moment de s'identifier avec adresse email)
   download_backup_mailer:
     title: "Téléchargement de la sauvegarde"
-    subject_template: "[%{email_prefix}] Lien Téléchargement Sauvegarde"
+    subject_template: "[%{email_prefix}] Téléchargement de la sauvegarde du site"
     text_body_template: |
       Voici le [téléchargement de la sauvegarde du site](%{backup_file_path}) que vous avez demandé.
 
@@ -2239,7 +2271,7 @@ fr:
 
       Désolé, ce lien de téléchargement a déjà été utilisé ou a expiré.
   admin_confirmation_mailer:
-    title: "Confirmation de l'Administrateur"
+    title: "Confirmation de l'administrateur"
     subject_template: "[%{email_prefix}] Confirmer votre nouveau compte"
     text_body_template: |
       Merci de confirmer que vous souhaitez ajouter **%{target_username} (%{target_email})** comme administrateur à votre forum.
@@ -2249,11 +2281,11 @@ fr:
     title: "Envoyer un courriel de test"
     subject_template: "[%{email_prefix}] Test de délivrabilité courriel"
   new_version_mailer:
-    title: "Avertissement de nouvelle version"
+    title: "Nouvelle version"
     subject_template: "[%{email_prefix}] Nouvelle version de Discourse, mise à jour disponible"
   new_version_mailer_with_notes:
-    title: "Avertissement de nouvelle version avec notes"
-    subject_template: "[%{email_prefix}] mise à jour disponible"
+    title: "Nouvelle version avec notes de modifications"
+    subject_template: "[%{email_prefix}] Mise à jour disponible"
   flag_reasons:
     off_topic: "Votre message a été signalé comme étant **hors sujet** : la communauté considère qu'il ne correspond au sujet en discussion qui est défini par son titre et son premier message."
     inappropriate: "Votre message a été signalé comme étant **inapproprié** : la communauté considère que son contenu est offensif, abusif ou enfreint notre [charte](%{base_path}/guidelines)."
@@ -2266,10 +2298,10 @@ fr:
     ignored: "Merci de nous en informer. Nous travaillons à sa résolution."
     ignored_and_deleted: "Merci de nous en informer. Nous avons supprimé le message."
   temporarily_closed_due_to_flags:
-    one: "This topic is temporarily closed for at least %{count} hour due to a large number of community flags."
-    other: "Ce sujet est fermé pour au moins 1 heure suite à plusieurs signalements de la communauté."
+    one: "Ce sujet est fermé pour au moins %{count} heure suite à plusieurs signalements de la communauté."
+    other: "Ce sujet est fermé pour au moins %{count} heures suite à plusieurs signalements de la communauté."
   system_messages:
-    private_topic_title: "Topic #%{id}"
+    private_topic_title: "Sujet #%{id}"
     contents_hidden: "Veuillez visiter le message pour voir son contenu."
     post_hidden:
       title: "Message caché"
@@ -2293,11 +2325,11 @@ fr:
       subject_template: "Message caché suite à des signalements de la communauté, responsables avertis"
       text_body_template: "Bonjour, Ceci est un message automatisé de %{site_name} pour vous informer que votre message a été caché à nouveau.\n\n <%{base_url}%{url}>\n\n %{flag_reason}\n\nLa communauté a signalé cet article, il est maintenant masqué. ** Ce message ayant été masqué plus d'une fois, votre message le restera jusqu'à ce qu'il soit géré par un membre du personnel. ** \n\nPour plus de précisions, veuillez consulter nos [charte communautaire] (%{base_url}/charte).\n"
     flags_disagreed:
-      title: "Message signalé rétabli par un responsable"
-      subject_template: "Message signalé rétabli par un responsable"
+      title: "Le message signalé a été rétabli par un responsable"
+      subject_template: "Le message signalé a été rétabli par un responsable"
     flags_agreed_and_post_deleted:
-      title: "Message signalé, retiré par un responsable"
-      subject_template: "Message signalé, retiré par un responsable"
+      title: "Le message signalé a été retiré par un responsable"
+      subject_template: "Le message signalé a été retiré par un responsable"
       text_body_template: |
         Bonjour,
 
@@ -2320,7 +2352,7 @@ fr:
 
         Au fur et à mesure que vous participerez ici, nous apprendrons à vous connaître et les limitations temporaires des nouveaux utilisateurs seront levées. Avec le temps, vous gagnerez [des niveaux de confiance](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (en anglais) qui incluent des fonctionnalités spéciales pour nous aider à gérer notre communauté ensemble.
     welcome_user:
-      title: "Bienvenue Utilisateur"
+      title: "Bienvenue utilisateur"
       subject_template: "Bienvenue sur %{site_name} !"
       text_body_template: |
         Merci d'avoir rejoint %{site_name}, et bienvenue !
@@ -2331,7 +2363,7 @@ fr:
 
         Amusez-vous bien !
     welcome_tl1_user:
-      title: "Bienvenue Utilisateur"
+      title: "Bienvenue utilisateur"
       subject_template: "Merci de passer du temps avec nous"
       text_body_template: |
         Salut ! Nous avons vu que vous lisez beaucoup, ce qui est super, alors nous vous avons monté d'un [niveau de confiance !](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)
@@ -2427,7 +2459,14 @@ fr:
     csv_export_succeeded:
       title: "Export CSV réussi"
       subject_template: "[%{export_title}] Exportation des données terminée"
-      text_body_template: "Votre export de données a réussi! : dvd: \n\n%{download_link} \n\nLe lien de téléchargement ci-dessus sera valide pendant 48 heures. \n\nLes données sont compressées sous forme d'archive zip. Si l'archive ne s'extrait pas lorsque vous l'ouvrez, utilisez l'outil recommandé ici: https://www.7-zip.org/\n"
+      text_body_template: |
+        Votre export de données a réussi ! :dvd:
+
+        %{download_link}
+
+        Le lien de téléchargement sera valide pendant 48 heures.
+
+        Les données sont compressées au format ZIP. Si l'archive ne s'extrait pas lorsque vous l'ouvrez, utilisez l'outil recommandé : https://www.7-zip.org/
     csv_export_failed:
       title: "Export CSV échoué"
       subject_template: "Échec de l'exportation des données "
@@ -2483,7 +2522,7 @@ fr:
         Votre réponses nous est parvenue d'une autre adresse courriel que celle attendue, nous ne savons donc pas s'il s'agit de la même personne. Essayez de l'envoyer depuis une autre adresse, ou [contactez un responsable](%{base_url}/about).
     email_reject_empty:
       title: "Courriel rejeté - Vide"
-      subject_template: "[%{email_prefix}] Problème de courriel - Aucun contenu"
+      subject_template: "[%{email_prefix}] Problème de courriel -- Aucun contenu"
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
@@ -2553,7 +2592,7 @@ fr:
         La clé de réponse est invalide ou inconnue et nous ne pouvons pas savoir à quel message s’adresse cette réponse. [Contactez un responsable](%{base_url}/about).
     email_reject_bad_destination_address:
       title: "Courriel rejeté - Mauvaise adresse de destination"
-      subject_template: "[%{email_prefix}] Problème de courriel - Adresse de destinataire inconnue"
+      subject_template: "[%{email_prefix}] Problème de courriel -- Adresse de destinataire inconnue"
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
@@ -2581,7 +2620,7 @@ fr:
         Le sujet à lequel vous répondez est actuellement fermé et n'accepte plus de réponses. Si vous pensez qu'il s'agit d'une erreur, [contactez un responsable](%{base_url}/about).
     email_reject_auto_generated:
       title: "Courriel rejeté - Réponse automatique"
-      subject_template: "[%{email_prefix}] Problème de courriel - Réponse automatique"
+      subject_template: "[%{email_prefix}] Problème de courriel -- Réponse automatique"
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
@@ -2605,7 +2644,7 @@ fr:
         Si vous pensez qu'il s'agit d'une erreur, [contactez un responsable](%{base_url}/about).
     email_reject_reply_not_allowed:
       title: "Courriel rejeté - Réponses interdites"
-      subject_template: "[%{email_prefix}] Problème de courriel - Réponse non autorisée"
+      subject_template: "[%{email_prefix}] Problème de courriel -- Réponse non autorisée"
       text_body_template: "Nous sommes désolés, mais l'envoie de courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. \n\nVous n'êtes pas autorisé à répondre au sujet. Si vous pensez qu'il s'agit d'une erreur, [contactez un responsable] (%{base_url}/about).\n"
     email_error_notification:
       title: "Notification d'erreur courriel"
@@ -2618,13 +2657,13 @@ fr:
         S'il y a une interface web pour le compte POP, vous devrez peut-être vous y connecter pour vérifier les paramètres.
     email_revoked:
       title: "Courriel revoqué"
-      subject_template: "Est-ce que votre adresse courriel est correct ?"
+      subject_template: "Est-ce que votre adresse courriel est correcte ?"
       text_body_template: |
-        Nous sommes désolés, mais nous avons de la difficulté à vous joindre par courriel. Nos derniers courriels vous ont tous été renvoyés comme non livrables.
+        Nous sommes désolés, mais nous avons des difficultés à vous joindre par courriel. Nos derniers courriels n'ont pas été délivrés.
 
-        Pouvez-vous vous assurer que [votre adresse email](%{base_url}/my/preferences/email) est valide et fonctionne ? Vous pouvez également ajouter notre adresse e-mail à votre carnet d'adresses / liste de contacts pour améliorer la délivrabilité.
+        Pouvez-vous vous assurer que [votre adresse courriel](%{base_url}/my/preferences/email) est valide et fonctionne ? Vous pouvez également ajouter notre adresse courriel à votre carnet d'adresses ou liste de contacts pour améliorer la réception de nos courriels.
     email_bounced: |
-      Le courriel envoyé à %{email} a été rejeté.
+      Le courriel envoyé à %{email} n'a pas été délivré .
 
       ### Détails
 
@@ -2648,7 +2687,7 @@ fr:
 
         Pour plus d'informations, merci de vous référer à la [charte de la communauté](%{base_url}/guidelines).
     too_many_tl3_flags:
-      title: "Trop de flags TL3"
+      title: "Trop de signalements en provenance d'utilisateurs de niveau de confiance 3"
       subject_template: "Nouveau compte bloqué"
       text_body_template: |
         Bonjour,
@@ -2728,18 +2767,16 @@ fr:
     queued_posts_reminder:
       title: "Messages dans la file d'attente"
       subject_template:
-        one: "%{count} message en attente de modération"
-        other: "%{count} messages en attention de modération"
+        one: "%{count} message en attente de vérification"
+        other: "%{count} messages en attente de vérification"
       text_body_template: |
         Bonjour,
 
         Des messages de nouveaux utilisateurs sont en attente de modération. [Approuvez ou rejetez-les ici](%{base_url}/review?type=ReviewableQueuedPost).
-  unsubscribe_link: |2
-
-    Pour se désabonner de ces courriels, [cliquer ici](%{unsubscribe_url}).
-  unsubscribe_link_and_mail: |2
-
-    Pour se désabonner de ces courriels, [cliquer ici](%{unsubscribe_url}).
+  unsubscribe_link: |
+    Pour se désabonner de ces courriels, [cliquez ici](%{unsubscribe_url}).
+  unsubscribe_link_and_mail: |
+    Pour se désabonner de ces courriels, [cliquez ici](%{unsubscribe_url}).
   unsubscribe_mailing_list: |
     Vous recevez ce courriel car vous avez activé la liste de diffusion.
 
@@ -2998,6 +3035,7 @@ fr:
       unsubscribe: "Ce résumé est envoyé depuis %{site_link} quand nous ne vous avons plus vu depuis un moment. Changez %{email_preferences_link}, ou %{unsubscribe_link} pour se désabonner."
       your_email_settings: "vos préférences de courriel"
       click_here: "cliquez ici"
+      from: "%{site_name}"
       preheader: "Un bref résumé depuis votre dernière visite le %{last_seen_at}"
     forgot_password:
       title: "Mot de passe oublié"
@@ -3005,7 +3043,7 @@ fr:
       text_body_template: |
         Quelqu'un a demandé la réinitialisation de votre mot de passe sur [%{site_name}](%{base_url}).
 
-        Si ce n'est pas vous, vous pouvez ignorer cet email.
+        Si ce n'est pas vous, vous pouvez ignorer ce courriel.
 
         Cliquez sur le lien suivant pour définir un nouveau mot de passe :
 
@@ -3025,9 +3063,9 @@ fr:
       title: "Définir le mot de passe"
       subject_template: "[%{email_prefix}] Définir le mot de passe"
       text_body_template: |
-        Quelqu'un a demandé un mot de passe pour votre compte sur [%{site_name}](%{base_url}). Vous pouvez vous identifier en utilisant un service en ligne pris en charge (Google, Facebook, etc...) qui est associé avec cette adresse email.
+        Quelqu'un a demandé un mot de passe pour votre compte sur [%{site_name}](%{base_url}). Vous pouvez vous identifier en utilisant un service en ligne pris en charge (Google, Facebook, etc...) qui est associé avec cette adresse courriel.
 
-        Si vous n'avez pas fait cette demande, vous pouvez ignorer cet email.
+        Si vous n'avez pas fait cette demande, vous pouvez ignorer ce courriel.
 
         Cliquez sur le lien suivant pour définir un mot de passe :
 
@@ -3036,7 +3074,7 @@ fr:
       title: "Identifiant Administrateur"
       subject_template: "[%{email_prefix}] Identification"
     account_created:
-      title: "Compte Créé"
+      title: "Compte créé"
       subject_template: "[%{email_prefix}] Votre Nouveau Compte"
       text_body_template: |
         Un nouveau compte a été créé pour vous sur %{site_name}
@@ -3046,19 +3084,19 @@ fr:
         %{base_url}/u/password-reset/%{email_token}
     confirm_new_email:
       title: "Confirmer votre nouvelle adresse courriel"
-      subject_template: "[%{email_prefix}] Confirmez votre nouvelle adresse email"
+      subject_template: "[%{email_prefix}] Confirmez votre nouvelle adresse courriel"
     confirm_old_email:
-      title: "Confirmez votre ancienne adresse email"
-      subject_template: "[%{email_prefix}] Confirmez votre adresse email actuelle"
+      title: "Confirmez votre ancienne adresse courriel"
+      subject_template: "[%{email_prefix}] Confirmez votre adresse courriel actuelle"
       text_body_template: |
-        Avant de pouvoir modifier votre adresse e-mail, nous avons besoin de vous pour confirmer que vous contrôlez bien ce compte de messagerie. Une fois cette étape terminée, nous vous demanderons de confirmer la nouvelle adresse e-mail.
+        Avant de pouvoir modifier votre adresse courriel, nous avons besoin de vous pour confirmer que vous contrôlez bien ce compte de messagerie. Une fois cette étape terminée, nous vous demanderons de confirmer la nouvelle adresse e-mail.
 
-        Merci de confirmer votre adresse e-mail actuelle pour %{site_name} en cliquant sur le lien suivant:
+        Merci de confirmer votre adresse courriel actuelle pour %{site_name} en cliquant sur le lien suivant:
 
         %{base_url}/u/confirm-old-email/%{email_token}
     notify_old_email:
       title: "Notifier l'ancienne adresse courriel"
-      subject_template: "[%{email_prefix}] Votre adresse email a été modifié"
+      subject_template: "[%{email_prefix}] Votre adresse courriel a été modifiée"
       text_body_template: |
         Ceci est un message automatique pour vous informer que votre adresse courriel pour
         %{site_name} a été modifiée. Si c'est une erreur, merci de contacter
@@ -3152,24 +3190,25 @@ fr:
     file_missing: "Désolé, il faut fournir un fichier à envoyer."
     empty: "Désolé, mais le fichier que vous avez fourni est vide."
     png_to_jpg_conversion_failure_message: "Une erreur est survenue lors de la conversion de PNG en JPG."
+    optimize_failure_message: "Une erreur est survenue lors de l'optimisation de l'image envoyée."
     attachments:
       too_large: "Désolé, le fichier que vous essayez d'envoyer est trop gros (taille maximale de %{max_size_kb} Ko)."
     images:
-      too_large: "Désolé, l'image que vous essayez d'envoyer est trop grande (taille maximale de %{max_size_kb} Ko), merci de le redimensionner et de réessayer."
+      too_large: "Désolé, l'image que vous essayez d'envoyer est trop grande (taille maximale de %{max_size_kb} Ko), veuillez la redimensionner puis réessayez."
       larger_than_x_megapixels: "Désolé, l'image que vous essayez d'envoyer est trop grande (la dimension maximale est de %{max_image_megapixels} mégapixels) ; veuillez la redimensionner et réessayer."
       size_not_found: "Désolé, mais nous n'avons pas pu déterminer la taille de votre image. Peut-être est-elle corrompue ?"
     placeholders:
       too_large: "(image plus large que %{max_size_kb} Ko)"
   avatar:
-    missing: "Désolé, nous ne parvenons pas à trouver un avatar associé à cette adresse mail. Pouvez-vous essayer de la télécharger à nouveau ?"
+    missing: "Désolé, nous ne parvenons pas à trouver un avatar associé à cette adresse courriel. Pouvez-vous essayer de la télécharger à nouveau ?"
   flag_reason:
     sockpuppet: "Un nouvel utilisateur a créé un sujet et un autre nouvel utilisateur avec la même adresse IP (%{ip_address}) a répondu. Voir le paramètre <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
   skipped_email_log:
     exceeded_emails_limit: "max_emails_per_day_per_user dépassé"
     exceeded_bounces_limit: "bounce_score_threshold dépassé"
     mailing_list_no_echo_mode: "Notifications de la liste de diffusion désactivées pour les messages de l'utilisateur."
-    user_email_no_user: "Impossible de trouver l'utilisateur avec l'id %{user_id}"
-    user_email_post_not_found: "Impossible de trouver le message avec l'id %{post_id}"
+    user_email_no_user: "Impossible de trouver l'utilisateur avec l'ID %{user_id}"
+    user_email_post_not_found: "Impossible de trouver le message avec l'ID %{post_id}"
     user_email_anonymous_user: "L'utilisateur est anonyme"
     user_email_user_suspended_not_pm: "L'utilisateur est suspendu, pas un message"
     user_email_seen_recently: "L'utilisateur a été vu récemment"
@@ -3186,6 +3225,7 @@ fr:
     sender_body_blank: "sans contenu"
     sender_post_deleted: "le message a été supprimé"
     sender_message_to_invalid: "le destinataire a une adresse courriel invalide"
+    sender_topic_deleted: "le sujet a été supprimé"
   color_schemes:
     base_theme_name: "Base"
     light: "Clair"
@@ -3194,7 +3234,7 @@ fr:
     grey_amber: "Gris ambre"
     shades_of_blue: "Nuances de bleu"
     latte: "Latte"
-    summer: "Eté"
+    summer: "Été"
     dark_rose: "Rose foncé"
     default_theme_name: "Clair"
     light_theme_name: "Clair"
@@ -3203,16 +3243,15 @@ fr:
     grey_amber_theme_name: "Gris ambre"
     shades_of_blue_theme_name: "Nuances de bleu"
     latte_theme_name: "Latte"
-    summer_theme_name: "Eté"
+    summer_theme_name: "Été"
     dark_rose_theme_name: "Rose foncé"
   edit_this_page: "Modifier cette page"
   csv_export:
     boolean_yes: "Oui"
     boolean_no: "Non"
     rate_limit_error: "Les messages peuvent être téléchargés une fois par jour, veuillez ressayer demain."
-  static_topic_first_reply: |2
-
-    Modifier le premier message de ce sujet pour changer le contenu de la page %{page_name}.
+  static_topic_first_reply: |
+    Modifiez le premier message de ce sujet pour changer le contenu de la page %{page_name}.
   guidelines_topic:
     title: "FAQ/Charte"
     body: |2
@@ -3769,11 +3808,12 @@ fr:
         Ce badge est accordé lorsque vous recevez au moins 5 J'aime sur 300 messages différents. Whaou ! La communauté admire vos fréquentes contributions de haute qualité aux conversations.
     out_of_love:
       name: Trop d'amour
+      description: "A utilisé %{max_likes_per_day} J'aime en une journée"
     higher_love:
       name: Amour plus fort
+      description: "A utilisé %{max_likes_per_day} J'aime en un jour 5 fois"
     crazy_in_love:
       name: Fou amoureux
-      description: A utilisé 50 likes en un jour 20 fois
     thank_you:
       name: "Merci "
       description: A 20 messages ayant reçu un J'aime et a donné 10 j'aime
@@ -3797,9 +3837,8 @@ fr:
     first_mention:
       name: Première mention
       description: A mentionné un utilisateur dans un message
-      long_description: |2
-
-        Ce badge est accordé la première fois que vous mentionnez le @pseudo de quelqu'un dans votre message. Chaque mention génère une notification à cette personne pour qu'elle soit informée de votre message. Il suffit de commencer à taper @ (arobase) pour mentionner un utilisateur ou, si autorisé, un groupe – c'est un moyen pratique de porter quelque chose à leur attention.
+      long_description: |
+        Ce badge est accordé la première fois que vous mentionnez un nom d'utilisateur dans votre message. Chaque mention génère une notification à cette personne pour qu'elle soit informée de votre message. Il suffit de commencer à taper @ (arobase) pour mentionner un utilisateur ou, si autorisé, un groupe – c'est un moyen pratique de porter quelque chose à leur attention.
     first_onebox:
       name: Premier onebox
       description: A inséré un lien qui a été transformé en onebox
@@ -3861,14 +3900,18 @@ fr:
         other: '« %{tag_name} » est réservé aux catégories suivantes : %{category_names}'
       synonym: 'Les synonymes ne sont pas autorisés. Utilisez « %{tag_name} ».'
       has_synonyms: '« %{tag_name} » ne peut pas être utilisé car il a des synonymes.'
+    required_tags_from_group:
+      one: "Vous devez inclure au moins %{count} étiquette du groupe %{tag_group_name}."
+      other: "Vous devez inclure au moins %{count} étiquettes du groupe %{tag_group_name}."
     invalid_target_tag: "ne peut pas être un synonyme d'un synonyme"
+    synonyms_exist: "n'est pas autorisé lorsque des synonymes existent"
   rss_by_tag: "Sujets avec l'étiquette %{tag}"
   finish_installation:
     congratulations: "Félicitations, vous avez installé Discourse !"
     register:
       button: "Créer"
       title: "Créer un compte administrateur"
-      help: "créez un nouveau compte pour commencer"
+      help: "créer un nouveau compte pour commencer"
       no_emails: "Malheureusement aucune adresse courriel d'administrateur n'a été définie lors de la configuration. Merci d'ajouter un courriel de développeur dans le fichier de configuration ou de <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>créer un compte administrateur depuis le console</a>."
     confirm_email:
       title: "Confirmer votre adresse courriel"
@@ -3883,7 +3926,7 @@ fr:
     only_official: "Désactiver les extensions non officielles"
     no_plugins: "Désactiver toutes les extensions"
     enter: "Activer le mode sans échec"
-    must_select: "Vous devez sélectionner au moins 1 option pour entre en mode sans échec."
+    must_select: "Vous devez sélectionner au moins une option pour entrer en mode sans échec."
   wizard:
     title: "Configuration de Discourse"
     step:
@@ -3894,7 +3937,7 @@ fr:
             description: "Quelle est la langue par défaut de votre communauté ?"
       forum_title:
         title: "Nom"
-        description: "Votre nom est un signe visible au loin, la <i>first</i> première chose que les visiteurs remarqueront à propos de votre communauté. Que disent votre nom et titre à propos de votre communauté ?"
+        description: "Votre nom est un signe visible au loin, la <i>première</i> chose que les visiteurs remarqueront à propos de votre communauté. Que dit votre nom à propos de votre communauté ?"
         fields:
           title:
             label: "Nom de votre communauté"
@@ -3940,17 +3983,17 @@ fr:
           contact_email:
             label: "Courriel"
             placeholder: "nom@exemple.com"
-            description: "Adresse courriel de la personne ou groupe responsable de cette communauté. Utilisée pour des notifications critiques comme des signalements non réglés, des mises à jour de sécurité et sur la page <a href='%{base_path}/about' target='_blank'>À propos</a> pour des contacts urgents. "
+            description: "Adresse courriel de la personne ou groupe responsable de cette communauté. Elle est utilisée pour des notifications critiques comme des signalements non réglés, des mises à jour de sécurité et sur la page <a href='%{base_path}/about' target='_blank'>À propos</a> pour des contacts urgents."
           contact_url:
-            label: "Page Web"
+            label: "Page web"
             placeholder: "https://www.exemple.com/contacter-nous"
-            description: "Page web pour vous contacter ou votre organisation. Sera affichée dans la page <a href='%{base_path}/about' target='_blank'>À propos</a>."
+            description: "Page web pour vous contacter ou votre organisation. Elle sera affichée sur la page <a href='%{base_path}/about' target='_blank'>À propos</a>."
           site_contact:
             label: "Messages automatiques"
             description: "Tous les messages directs de Discourse seront envoyés de cet utilisateur, tels que les signalements et les notifications de sauvegarde."
       corporate:
         title: "Organisation"
-        description: "Cette information figurera dans vos <a href='%{base_path}/tos' target='blank'>Conditions générales d'utilisation</a>, qui est un sujet que vous pouvez modifier, dans la catégorie Staff. Si vous n'êtes pas une entreprise, vous pouvez sauter cet étape pour l'instant."
+        description: "Cette information figurera dans vos <a href='%{base_path}/tos' target='blank'>Conditions générales d'utilisation</a>, qui est un sujet que vous pouvez modifier dans la catégorie Staff. Si vous n'êtes pas une entreprise, vous pouvez passer cette étape pour l'instant."
         fields:
           company_name:
             label: "Nom de société"
@@ -3959,19 +4002,19 @@ fr:
             label: "Droit applicable"
             placeholder: "Loi californienne"
           city_for_disputes:
-            label: "For juridique"
+            label: "Ville pour les litiges"
             placeholder: "San Francisco, Californie"
       colors:
         title: "Thème"
       themes_further_reading:
         title: "Thèmes"
-        description: "Vous cherchez à customiser Discourse ? Profiter de notre système de thèmes : <ul><li><a href='https://meta.discourse.org/t/63682' target='_blank'>Comment installer un thème ou un composant de thème ?</a></li><li><a href='https://meta.discourse.org/t/110448' target='_blank'>Référence rapide pour développeur de thème</a></li></ul>Composants de thèmes populaires (pour davantage, voir <a href='https://meta.discourse.org/c/theme/l/latest' target='_blank'>#theme</a>)"
+        description: "Vous cherchez à personnaliser Discourse ? Profiter de notre système de thèmes : <ul><li><a href='https://meta.discourse.org/t/63682' target='_blank'>Comment installer un thème ou un composant de thème ?</a></li><li><a href='https://meta.discourse.org/t/110448' target='_blank'>Référence rapide pour développeur de thème</a></li></ul>Composants de thèmes populaires (voir plus dans <a href='https://meta.discourse.org/c/theme/l/latest' target='_blank'>#theme</a>)"
       logos:
         title: "Logos"
         fields:
           logo:
             label: "Logo principal"
-            description: "L'image de votre logo situé en haut à gauche de votre site. Utiliser une forme rectangulaire large avec une hauteur de 120 et une largeur de plus que 360"
+            description: "L'image de votre logo située en haut à gauche de votre site. Utilisez une forme rectangulaire large avec une hauteur de 120 et une largeur de plus que 360"
           logo_small:
             label: "Logo carré"
             description: "Une version carrée de votre logo. Affiché en haut à gauche de votre site lors du défilement vers le bas, dans le navigateur et lors du partage sur des plateformes sociales. Idéalement plus grand que 512x512."
@@ -4035,25 +4078,30 @@ fr:
   staff_action_logs:
     not_found: "non trouvé"
     unknown: "inconnu"
-    user_merged: "%{username} a être fusionné avec ce compte"
-    user_delete_self: "Supprimer par l'utilisateur depuis %{url}"
-    webhook_deactivation_reason: "Votre compte Web a été désactivé automatiquement. Nous avons reçu plusieurs réponses d'échec d'état HTTP '%{status}'."
+    user_merged: "%{username} a été fusionné avec ce compte"
+    user_delete_self: "Supprimé par l'utilisateur depuis %{url}"
+    webhook_deactivation_reason: "Votre Webhook a été désactivé automatiquement. Nous avons reçu plusieurs réponses d'échec avec le code HTTP %{status}."
     api_key:
+      automatic_revoked:
+        one: "Révoquée automatiquement, la dernière activité remonte il y a plus de %{count} jour"
+        other: "Révoquée automatiquement, la dernière activité remonte il y a plus de %{count} jours"
       revoked: Révoquée
+      restored: Rétablie
   reviewables:
+    already_handled: "Merci, mais nous avons déjà vérifié ce message et conclu qu'il n'est pas nécessaire de le signaler à nouveau."
     priorities:
-      low: "Faible"
+      low: "Basse"
       medium: "Moyenne"
-      high: "Fort"
+      high: "Élevée"
     sensitivity:
       disabled: "Désactivé"
-      low: "Faible"
+      low: "Basse"
       medium: "Moyenne"
-      high: "Fort"
+      high: "Élevée"
     must_claim: "Vous devez réserver des éléments avant d'agir dessus."
     user_claimed: "Cet élément a été réservé par un autre utilisateur."
     missing_version: "Vous devez fournir un paramètre de version"
-    conflict: "Un conflit de mise à jour empêche rend cette action impossible."
+    conflict: "Un conflit de mise à jour vous empêche de faire cette action."
     reasons:
       post_count: "Les premiers messages de chaque utilisateur doivent être approuvés par un responsable. Voir `approve_post_count`."
       trust_level: "Les réponses d'utilisateurs dont le niveau de confiance est bas doivent être approuvées par un responsable. Voir `approve_unless_trust_level`."
@@ -4067,13 +4115,13 @@ fr:
       invite_only: "Tous les nouveaux utilisateurs doivent être invités. Voir `invite_only`."
     actions:
       agree:
-        title: "Accepter..."
+        title: "Accepter…"
       agree_and_keep:
         title: "Conserver le message"
         description: "Accepter le signalement et conserver le message tel quel."
       agree_and_keep_hidden:
         title: "Garder le message caché"
-        description: "Acceptez le signalement et laissez le message caché."
+        description: "Accepter le signalement et laisser le message caché."
       agree_and_suspend:
         title: "Suspendre l'utilisateur"
         description: "Accepter le signalement et suspendre l'utilisateur."
@@ -4081,35 +4129,35 @@ fr:
         title: "Mettre l'utilisateur sous silence"
         description: "Accepter le signalement et mettre l'utilisateur sous silence."
       agree_and_restore:
-        title: "Restaurer message"
+        title: "Rétablir le message"
         description: "Rétablir le message afin que tous les utilisateurs puissent le voir."
       agree_and_hide:
-        title: "Cacher message"
+        title: "Cacher le message"
         description: "Cacher le message et envoyer automatiquement un message à l'utilisateur l'incitant à le modifier."
       delete_spammer:
         title: "Supprimer le spammeur"
-        description: "Supprimer cet utilisateur, tous ses messages et sujets."
-        confirm: "Êtes-vous sûr de vouloir supprimer tous les messages et sujets de cet utilisateur, et bloquer son courriel ainsi que son adresse IP ?"
+        description: "Supprimer cet utilisateur et tous ses messages et sujets."
+        confirm: "Êtes-vous sûr de vouloir supprimer tous les messages et sujets de cet utilisateur, et bloquer ses adresses courriel et IP ?"
       delete_single:
         title: "Supprimer"
       delete:
-        title: "Supprimer..."
+        title: "Supprimer…"
       delete_and_ignore:
         title: "Supprimer le message et ignorer"
         description: "Supprimer le message ; si c'est le premier message, le sujet sera supprimé"
       delete_and_ignore_replies:
         title: "Supprimer message + réponses et ignorer"
-        description: "Supprimer le message et toutes les réponses ; si c'est le premier message, supprimez également le sujet"
+        description: "Supprimer le message et toutes les réponses ; si c'est le premier message, le sujet sera supprimé"
         confirm: "Êtes-vous sûr de vouloir aussi supprimer les réponses à ce message ?"
       delete_and_agree:
         title: "Supprimer le message et accepter"
         description: "Supprimer le message ; si c'est le premier message, le sujet sera supprimé"
       delete_and_agree_replies:
         title: "Supprimer message + réponses et accepter"
-        description: "Supprimer le message et toutes les réponses ; si c'est le premier message, supprimez également le sujet"
+        description: "Supprimer le message et toutes les réponses ; si c'est le premier message, le sujet sera supprimé"
         confirm: "Êtes-vous sûr de vouloir aussi supprimer les réponses à ce message ?"
       disagree_and_restore:
-        title: "Rejeter signalement et rétablir message"
+        title: "Rejeter le signalement et rétablir le message"
         description: "Rétablir le message afin que tous les utilisateurs puissent le voir."
       disagree:
         title: "Rejeter"
@@ -4118,25 +4166,25 @@ fr:
       approve:
         title: "Approuver"
       approve_post:
-        title: "Approuver message"
-        confirm_closed: "Ce sujet est fermé. Voulez-vous créer le post quand même?"
+        title: "Approuver le message"
+        confirm_closed: "Ce sujet est fermé. Voulez-vous quand même créer le message ?"
       reject_post:
-        title: "Rejeter message"
+        title: "Rejeter le message"
       approve_user:
         title: "Approuver l'utilisateur"
       reject_user:
-        title: "Supprimer l'utilisateur..."
+        title: "Supprimer l'utilisateur…"
         delete:
           title: "Supprimer l'utilisateur"
           description: "L'utilisateur sera supprimé du forum."
         block:
           title: "Supprimer et bloquer l'utilisateur"
-          description: "L'utilisateur sera supprimé et nous bloquerons son adresse IP et son adresse courriel."
+          description: "L'utilisateur sera supprimé et nous bloquerons ses adresses courriel et IP."
       reject:
         title: "Rejeter"
       delete_user:
         title: "Supprimer l'utilisateur"
-        confirm: "Êtes-vous sûr de vouloir supprimer cet utilisateur ? Cela va retirer tous ses messages et va bloquer son courriel ainsi que son adresse IP."
+        confirm: "Êtes-vous sûr de vouloir supprimer cet utilisateur ? Cela va supprimer tous ses messages et bloquer ses adresses courriel et IP."
         reason: "Supprimé via la liste des messages en attente de validation"
   email_style:
     html_missing_placeholder: "Le modèle HTML doit inclure %{placeholder}"
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 314d2d907c..3522c00fc6 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -45,7 +45,7 @@ he:
       unrecognized_extension: "סיומת הקובץ אינה מוכרת: %{extension}"
     import_error:
       generic: אירעה שגיאה בעת ייבוא ערכת העיצוב הזו
-      about_json: "שגיאת ייבוא: about.json לא קיים או שהוא פגום"
+      about_json: "שגיאת ייבוא: about.json לא קיים או שהוא שגוי. האם אכן מדובר בערכת עיצוב של Discourse?"
       about_json_values: "about.json מכיל ערכים שגויים: %{errors}"
       modifier_values: "המחליפים ב־about.json מכילים ערכים שגויים: %{errors}"
       git: "שגיאה בעת שכפול מאגר git, הגישה נדחיתה או שהמאגר לא נמצא"
@@ -369,7 +369,7 @@ he:
       already_bookmarked_post: "אי אפשר לסמן את אותו הפוסט פעמיים"
       cannot_set_past_reminder: "אי אפשר להגדיר תזכורת סימנייה למועד שעבר."
       cannot_set_reminder_in_distant_future: "לא ניתן להגדיר תזכורת סימנייה למעבר ל־10 שנים בעתיד."
-      time_must_be_provided: "צריך לציין זמן לכל התזכורות"
+      time_must_be_provided: "יש לספק זמן לכל התזכורות"
     reminders:
       at_desktop: "בשימוש הבא דרך שולחן העבודה"
       later_today: "בהמשך היום"
@@ -454,12 +454,6 @@ he:
       ניתן לערוך תגובות קודמות שלך כדי להוסיף ציטוט על ידי סימון טקסט ובחירה בכפתור שנגלה <b>ציטוט תגובה</b>.
 
       יותר קל לכולם לקרוא נושאים שיש בהם פחות תגובות עמוקות מאשר הרבה תגובות קטנות.
-    dominating_topic: |
-      ### לאפשר לזולת לקחת חלק בדיון
-
-      נושא זה בהחלט חשוב בעיניך &ndash; פרסמת בו למעלה מ־%{percent}% מהתגובות.
-
-      הדיון הזה עשוי עוד להשתפר אם יצטרפו אליו אנשים עם גישות שונות בנוסף. למה שלא להזמין אותם?
     get_a_room: |
       ### מומלץ לעודד את כולם להשתתף בדיון
 
@@ -1435,6 +1429,7 @@ he:
     add_rel_nofollow_to_user_content: 'הוספת התווית rel nofollow לכל תוכן שפורסם על ידי המשתמש/ת, פרט לקישורים פנימיים (כולל מתחם הורה parent domains). אם תשנו אפשרות זו, עליכם לאפות מחדש את כל הפרסומים עם: "rake posts:rebake"'
     exclude_rel_nofollow_domains: "רשימת הדומיינים בהם לא צריך להוסיף תווית 'nofollow' לקישורים. example.com יאפשר באופן אוטומטי גם עבור sub.example.com. כמינימום, כדאי להוסיף את הדומיין של האתר הזה כדי לאפשר לזחלני רשת (web crawlers) למצוא את כל התוכן. אם חלקים אחרים של האתר שלכם נמצאים בדומיינים אחרים, כדאי להוסיף גם אותם."
     post_excerpt_maxlength: "אורך מקסימלי של קטע פוסט / סיכום."
+    topic_excerpt_maxlength: "האורך המרבי של מקטע מתוך / סיכום של נושא, נוצר מהפוסט הראשון בנושא."
     show_pinned_excerpt_mobile: "הצגת קטע בנושאים נעוצים במבט ניידים."
     show_pinned_excerpt_desktop: "הצגת קטע בנושאים נעוצים בתצוגת מחשב-שולחני."
     post_onebox_maxlength: "אורך מרבי של פוסט ב־Discourse בתיבת תחימה בתווים."
@@ -2226,6 +2221,7 @@ he:
     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}"
@@ -2889,6 +2885,15 @@ he:
         ההודעה שניסית לשלוח בדוא״ל אל %{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"
@@ -3902,7 +3907,7 @@ he:
         עיטור זה מוענק עקב שימוש בכל %{max_likes_per_day} הלייקים היומיים שלכם במשך 5 ימים. תודה על שהשקעת את הזמן כדי לעודד את הדיונים הטובים ביותר בכל יום!
     crazy_in_love:
       name: מאוהבים בטירוף
-      description: השתמשו ב 50 לייקים ביום 20 פעם
+      description: "שימוש ב־%{max_likes_per_day} לייקים ביום 20 פעמים"
       long_description: |
         עיטור זה מוענק לך לאחר שהשתמשת בכל %{max_likes_per_day} הלייקים היומיים שלך במשך 20 ימים. חבל על הזמן! התנהגותך היא מופת לחברי הקהילה האחרים!
     thank_you:
diff --git a/config/locales/server.hu.yml b/config/locales/server.hu.yml
index 6ae979ebae..ffc8bb61d8 100644
--- a/config/locales/server.hu.yml
+++ b/config/locales/server.hu.yml
@@ -45,7 +45,6 @@ hu:
       unrecognized_extension: "Ismeretlen fájlkiterjesztés: %{extension}"
     import_error:
       generic: Hiba történt a téma importálásákor
-      about_json: "Importálási hiba: az about.json nem létezik vagy érvénytelen"
       about_json_values: "Az about.json érvénytelen értékeket tartalmaz: %{errors}"
       modifier_values: "Az about.json módosítók érvénytelen értékeket tartalmaznak: %{errors}"
       git: "Nem sikerült klónozni a git tárolót, a hozzáférés meg lett tagadva vagy a tároló nem található"
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index 4c6e707724..d680197498 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -43,7 +43,6 @@ hy:
     other_error: "Թեման թարմացնելիս ինչ-որ բան այնպես չէ ընթացել"
     import_error:
       generic: Այդ թեման ներմուծելիս տեղի է ունեցել սխալ
-      about_json: "Ներմուծման Սխալ. about.json -ը գոյություն չունի կամ անվավեր է"
       about_json_values: "about.json -ը պարունակում է անվավեր արժեքներ. %{errors}"
       git: "git ռեպոզիտորիայի կլոնավորման սխալ, հասանելիությունը մերժված է, կամ ռեպոզիտորիան գտնված չէ"
       unpack_failed: "Ֆայլի բացումը ձախողվեց"
@@ -1794,6 +1793,7 @@ hy:
     auto_deleted_by_timer: "Ավտոմատ կերպով ջնջվել է ժամաչափիչի կողմից:"
   login:
     security_key_alternative: "Փորձեք ուրիշ եղանակով"
+    security_key_authenticate: "Վավերացնել Անվտանգության Բանալիով "
     security_key_not_allowed_error: "Անվտանգության բանալու գրանցման ժամանակը վերջացել է կամ չեղյալ է հայտարարվել:"
     security_key_no_matching_credential_error: "Նշված անվտանգության բանալիի մեջ չեն գտնվել համապատասխան հավատարմագրերը: "
     security_key_support_missing_error: "Ձեր ընթացիկ սարքը կամ բրաուզերը չի պահպանում անվտանգության բանալիների  օգտագործումը: Խնդրում ենք օգտագործեք ուրիշ մեթոդ: "
@@ -3072,7 +3072,6 @@ hy:
       name: Ավելի բարձր Սեր
     crazy_in_love:
       name: Սիրուց Խելագար
-      description: Օգտագործել է 50 հավանում մեկ օրում 20 անգամ
     thank_you:
       name: Շնորհակալություն
       description: Ունի 20 հավանած գրառում է տվել է 10 հավանում
@@ -3298,6 +3297,8 @@ hy:
     unknown: "չճանաչված"
     user_merged: "%{username} -ը միավորվել է այս հաշվին"
     user_delete_self: "Ինքն իրեն ջնջել է այստեղից՝ %{url}"
+    api_key:
+      revoked: Հետկանչված
   reviewables:
     priorities:
       low: "Բարձր"
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index e7332d11bb..cc30a4e070 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -39,7 +39,6 @@ id:
       unrecognized_extension: "Ekstensi file tidak dikenal: %{extension}"
     import_error:
       generic: Terjadi kesalahan saat mengimpor tema itu
-      about_json: "Kesalahan Impor: about.json tidak ada, atau tidak valid"
       unpack_failed: "Gagal membongkar berkas"
       file_too_big: "Berkas yang tidak dikompresi terlalu besar."
     settings_errors:
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index e1de966519..965c3ef5b3 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -45,7 +45,6 @@ it:
       unrecognized_extension: "Estensione del file non riconosciuta: %{extension}"
     import_error:
       generic: Errore durante l'importazione del tema
-      about_json: "Errore di importazione: about.json non esiste o non è valido"
       about_json_values: "about.json contiene valori non validi: %{errors}"
       modifier_values: "I modificatori about.json contengono valori non validi: %{errors}"
       git: "Errore nella clonazione del repository git, accesso negato o repository non trovato"
@@ -334,7 +333,6 @@ it:
       already_bookmarked_post: "Non puoi aggiungere due volte lo stesso messaggio nei segnalibri."
       cannot_set_past_reminder: "Non è possibile impostare un promemoria per un segnalibro nel passato."
       cannot_set_reminder_in_distant_future: "Non è possibile impostare un promemoria per un segnalibro per più di 10 anni nel futuro."
-      time_must_be_provided: "l'ora deve essere fornita per tutti i promemoria"
     reminders:
       at_desktop: "La prossima volta che sarò al mio desktop"
       later_today: "Più tardi oggi"
@@ -413,7 +411,6 @@ it:
       Puoi modificare la risposta precedente per aggiungere una citazione evidenziando il testo e selezionando il bottone <b>Cita<b> che comparirà.
 
       E' più facile per chiunque leggere argomenti che hanno poche risposte ma più dettagliate, rispetto a molte brevi risposte individuali.
-    dominating_topic: "### Consenti agli altri di partecipare alla conversazione\n\nQuesto argomento è chiaramente importante per te: hai inviato più dell' %{percent}% delle risposte. \n\nPotrebbe essere ancora meglio se dessi anche ad altri lo spazio per condividere i loro punti di vista. Ti va di invitarli?\n"
     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 privatamente con questo particolare utente, [invia un messaggio personale](%{base_path}/u/%{reply_username}).\n"
     too_many_replies: |
       ### Hai raggiungo il limite di risposte per questo argomento
@@ -879,8 +876,8 @@ it:
     banner:
       title: "Argomento Annuncio"
       message:
-        make: "Questo argomento è ora uno striscione. Apparirà in cima ad ogni pagina finché non viene chiuso dall'utente."
-        remove: "Questo argomento non è più uno striscione. Non apparirà più in cima ad ogni pagina."
+        make: "Questo argomento è ora un annuncio. Apparirà in cima ad ogni pagina finché non verrà chiuso dall'utente."
+        remove: "Questo argomento non è più un annuncio. Non apparirà più in cima ad ogni pagina."
   unsubscribed:
     title: "Preferenze email aggiornate!"
     description: "le preferenze email per <b>%{email}</b> sono state aggiornate. Per cambiare le tue impostazioni email <a href='%{url}'>accedi alle tue preferenze utente</a>."
@@ -2024,10 +2021,10 @@ it:
     autoclosed_disabled_lastpost: "Questo argomento è ora aperto. Sono permesse altre risposte."
     auto_deleted_by_timer: "Eliminato automaticamente dal timer."
   login:
-    security_key_description: "Quando hai preparato la chiave di sicurezza fisica, premi il pulsante Autentica con Security Key qui sotto."
+    security_key_description: "Quando hai preparato la chiave di sicurezza fisica, premi il pulsante Autentica con Chiave di Sicurezza qui sotto."
     security_key_alternative: "Prova in un altro modo"
-    security_key_authenticate: "Autentica con Security Key"
-    security_key_not_allowed_error: "Il processo di autenticazione con Security Key è scaduto o è stato annullato."
+    security_key_authenticate: "Autenticare con Chiave di Sicurezza"
+    security_key_not_allowed_error: "Il processo di autenticazione con Chiave di Sicurezza è scaduto o è stato annullato."
     security_key_no_matching_credential_error: "Non è stato possibile trovare credenziali corrispondenti nella chiave di sicurezza fornita."
     security_key_support_missing_error: "Il tuo dispositivo o browser attuale non supporta l&#39;uso di chiavi di sicurezza. Si prega di utilizzare un altro metodo."
     not_approved: "Il tuo account non è ancora stato approvato. Verrai avvertito via mail quando potrai collegarti."
@@ -2080,6 +2077,7 @@ it:
       short: "deve essere almeno di %{min} caratteri"
       long: "non deve essere più lungo di %{max} caratteri"
       too_long: "è troppo lungo"
+      characters: "deve includere solo numeri, lettere, trattini, puntini e trattini bassi"
       unique: "deve essere univoco"
       blank: "deve essere presente"
       must_begin_with_alphanumeric_or_underscore: "deve iniziare con una lettera, un numero o un underscore"
@@ -2967,6 +2965,12 @@ it:
     confirm_old_email:
       title: "Conferma Vecchia Email"
       subject_template: "[%{email_prefix}] Conferma il tuo attuale indirizzo email"
+      text_body_template: |
+        Prima di poter cambiare il tuo indirizzo email devi confermare di disporre dell'indirizzo email attuale. Dopo aver completato questo passaggio, dovrai confermare il nuovo indirizzo email.
+
+        Conferma il tuo attuale indirizzo email su %{site_name} cliccando il seguente collegamento:
+
+        %{base_url}/u/confirm-old-email/%{email_token}%{email_token}
     notify_old_email:
       title: "Notifica Vecchia Email"
       subject_template: "[%{email_prefix}] Il tuo indirizzo email è stato cambiato"
@@ -3459,9 +3463,13 @@ it:
       name: Amato
     higher_love:
       name: Pieno d'Amore
+      description: "Ha messo %{max_likes_per_day} Mi piace al giorno per 5 volte"
+      long_description: |
+        Questo distintivo è assegnato quando usi tutti i %{max_likes_per_day} mi piace giornalieri per 5 giorni. Grazie per aver dedicato del tempo ad incoraggiare le migliori conversazioni ogni giorno!
     crazy_in_love:
       name: Pazzo d’Amore
-      description: Ha messo 50 mi piace al giorno per 20 volte
+      long_description: |
+        Questo distintivo è assegnato quando usi tutti i %{max_likes_per_day} mi piace giornalieri per 20 giorni. Wow, sei davvero un modello di comportamento per i tuoi compagni di comunità!
     thank_you:
       name: Grazie
       description: Ha ricevuto 20 mi piace sui messaggi e dato 10 mi piace
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 7ee132b35e..dfc90bba15 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -44,7 +44,6 @@ ja:
       unrecognized_extension: "ファイルの拡張子が認識できません。: %{extension}"
     import_error:
       generic: テーマをインポートするときにエラーが起こりました
-      about_json: "重要なエラー: about.json が存在しないか無効です"
       about_json_values: "about.jsonは無効な値があります: %{errors}"
       git: "gitレポジトリのクローニングに失敗しました。アクセスが許可されていないか、レポジトリが見つかりません。"
       unpack_failed: "ファイルの解凍に失敗しました"
@@ -1572,7 +1571,6 @@ ja:
       name: より多くの愛
     crazy_in_love:
       name: 愛
-      description: 50いいね！を20日間
     thank_you:
       name: ありがとう
       description: 20ものいいね！を受け取り10ものいいね！を与えました。
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index dc8ec6212a..9b137f3077 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -45,7 +45,6 @@ ko:
       unrecognized_extension: "인식 할 수없는 파일 확장자 : %{extension}"
     import_error:
       generic: 해당 테마를 가져 오는 중 오류가 발생했습니다
-      about_json: "가져 오기 오류 : about.json이 존재하지 않거나 유효하지 않습니다"
       about_json_values: "about.json에 유효하지 않은 값이 있습니다 : %{errors}"
       modifier_values: "about.json 수정 자에 유효하지 않은 값이 있습니다 : %{errors}"
       git: "자식 저장소 복제 오류, 액세스가 거부되었거나 저장소를 찾을 수 없음"
@@ -302,7 +301,6 @@ ko:
       already_bookmarked_post: "동일한 게시물을 두 번 북마크 할 수 없습니다."
       cannot_set_past_reminder: "과거에는 북마크 미리 알림을 설정할 수 없습니다."
       cannot_set_reminder_in_distant_future: "앞으로 10 년 이상 책갈피 알림을 설정할 수 없습니다."
-      time_must_be_provided: "을 모든 알림에 시간을 제공해야합니다."
     reminders:
       at_desktop: "다음에 저는 데스크탑에 있습니다"
       later_today: "오늘 늦게"
@@ -2715,7 +2713,6 @@ ko:
       description: "중고 %{max_likes_per_day} 좋아하는 하루에 5 번"
     crazy_in_love:
       name: 사랑밖에 모르는 바보
-      description: 20번이나 좋아요 50개를 보냈습니다
     thank_you:
       name: 고마워요
       description: 10개의 포스트를 '좋아요'하고 20개의 '좋아요'를 받았습니다
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 34ffb7558d..215a5223c4 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -45,7 +45,7 @@ nl:
       unrecognized_extension: "Niet-herkende bestandsextensie: %{extension}"
     import_error:
       generic: Er is een fout opgetreden bij het importeren van dat thema
-      about_json: "Fout bij importeren: about.json bestaat niet, of is ongeldig"
+      about_json: "Belangrijke fout: about.json bestaat niet, of is ongeldig. Weet u zeker dat dit een Discourse-thema is?"
       about_json_values: "about.json bevat ongeldige waarden: %{errors}"
       modifier_values: "about.json-modificatoren bevatten ongeldige waarden: %{errors}"
       git: "Fout bij klonen van git-repository; toegang is geweigerd of repository is niet gevonden"
@@ -414,12 +414,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?
     get_a_room: |
       ### Overweeg iedereen aan de conversatie te laten deelnemen
 
@@ -1361,6 +1355,7 @@ nl:
     add_rel_nofollow_to_user_content: '''rel nofollow'' toevoegen aan alle ingediende gebruikersinhoud, behalve voor interne koppelingen (inclusief bovenliggende domeinen). Als u dit wijzigt, moet u alle berichten opnieuw opbouwen met ''rake posts:rebake'''
     exclude_rel_nofollow_domains: "Een lijst van domeinen waarvoor 'nofollow' niet aan koppelingen mag worden toegevoegd. example.com staat ook automatisch sub.example.com toe. Voeg minimaal het domein van deze website toe om webcrawlers alle inhoud te helpen vinden. Als andere onderdelen van uw website zich op andere domeinen bevinden, voeg die dan ook toe."
     post_excerpt_maxlength: "Maximale lengte van een fragment / samenvatting van een bericht."
+    topic_excerpt_maxlength: "Maximale lengte van een fragment / samenvatting van een topic, gegenereerd vanuit het eerste bericht in een topic."
     show_pinned_excerpt_mobile: "Fragment tonen bij vastgemaakte topics in mobiele weergave."
     show_pinned_excerpt_desktop: "Fragment tonen bij vastgemaakte topics in desktopweergave."
     post_onebox_maxlength: "Maximale lengte van een 'oneboxed Discourse'-bericht in tekens."
@@ -2114,6 +2109,7 @@ nl:
     not_activated: "U kunt zich nog niet aanmelden. We hebben u een activeringsmail gestuurd. Volg de instructies in het e-mailbericht om uw account te activeren."
     not_allowed_from_ip_address: "U kunt zich niet als %{username} aanmelden vanaf dat IP-adres."
     admin_not_allowed_from_ip_address: "U kunt zich niet als beheerder aanmelden vanaf dat IP-adres."
+    reset_not_allowed_from_ip_address: "U kunt geen wachtwoordherinitialisatie aanvragen vanaf dat IP-adres."
     suspended: "U kunt zich tot %{date} niet aanmelden."
     suspended_with_reason: "Account geschorst tot %{date}: %{reason}"
     errors: "%{errors}"
@@ -2695,6 +2691,7 @@ nl:
       long_description: |
         Deze badge wordt toegekend wanneer u 5 dagen lang alle %{max_likes_per_day} van uw dagelijkse likes gebruikt. Bedankt dat u de tijd neemt voor het dagelijks actief aanmoedigen van de beste conversaties!
     crazy_in_love:
+      description: "20 keer %{max_likes_per_day} likes op een dag gebruikt"
       long_description: |
         Deze badge wordt toegekend wanneer u 20 dagen lang alle %{max_likes_per_day} van uw dagelijkse likes gebruikt. Wow! U bent een rolmodel voor het aanmoedigen van uw medegemeenschapesleden!
     thank_you:
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 356901790a..270b608e93 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -45,7 +45,6 @@ pl_PL:
       unrecognized_extension: "Nie rozpoznano rozszerzenia pliku: %{extension}"
     import_error:
       generic: Podczas importowania motywu wystąpił błąd.
-      about_json: "Błąd importu: plik about.js nie istnieje albo jest niepoprawny"
       about_json_values: "Plik about.json zawiera niepoprawne wartości: %{errors}"
       modifier_values: "modyfikatory about.json zawierają nieprawidłowe wartości: %{errors}"
       git: "Podczas klonowania repozytorium git wystąpił błąd: dostęp jest zabroniony albo repozytorium nie istnieje"
@@ -352,7 +351,6 @@ pl_PL:
       already_bookmarked_post: "Nie możesz dodać zakładki do tego samego postu dwa razy."
       cannot_set_past_reminder: "W przeszłości nie można ustawić przypomnienia o zakładce."
       cannot_set_reminder_in_distant_future: "Nie możesz ustawić przypomnienia o zakładce na więcej niż 10 lat w przyszłości."
-      time_must_be_provided: "dla wszystkich przypomnień należy przewidzieć czas"
     reminders:
       at_desktop: "Następnym razem będę na swoim pulpicie"
       later_today: "Później dzisiaj"
@@ -438,12 +436,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 dołączyć do rozmowy
-
-      Ten temat jest dla Ciebie istotny  &ndash; napisałeś tu ponad %{percent}% wszystkich odpowiedzi.
-
-      Byłoby nawet lepiej, gdybyś dał innym możliwość podzielenia się ich punktem widzenia. Czy możesz ich tu zaprosić?
     get_a_room: "### Zachęć każdego do zaangażowania się w rozmowę\n\nW tym wątku odpowiedziałaś/łeś %{reply_username} już %{count} razy!\n\nDobra dyskusja uwzględnia wiele głosów i perspektyw. Czy możesz tu zaangażować kogoś jeszcze?\n\nNie zapominaj, że jeśli chciał(a)byś kontynuować rozmowę z tym użytkownikiem bez publiczności, to możesz [wysłać im prywatną wiadomość](%{base_path}/u/{%reply_username}).\n \n"
     too_many_replies: |
       ### Osiągnąłeś limit odpowiedzi w tym temacie
@@ -3067,7 +3059,6 @@ pl_PL:
       name: Wyższa miłość
     crazy_in_love:
       name: Szaleńczo zakochany
-      description: Użyto 50 polubień w dzień 20 razy
     thank_you:
       name: Dziękuje
       description: Ma 20 polubionych postów i dał 10 polubień
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 04cb3a5ecf..a1cb8ac636 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -45,7 +45,6 @@ pt:
       unrecognized_extension: "Extensão de ficheiro desconhecida: %{extension}"
     import_error:
       generic: Ocorreu um erro durante a importação do tema
-      about_json: "Erro de Importação: about.json não existe ou é inválido"
       about_json_values: "about.json possui valores inválidos: %{errors}"
       git: "Erro ao clonar o repositório de git, acesso foi negado ou o repositório não existe"
       unpack_failed: "Falha ao desempacotar o ficheiro"
@@ -1966,7 +1965,6 @@ pt:
       name: Amor superior
     crazy_in_love:
       name: Amando Loucamente
-      description: Utilizou 50 gostos num dia 20 vezes
     thank_you:
       name: Obrigado
       description: Tem 20 publicações gostadas e deu 10 gostos
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index cc69621065..e3964b78e1 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -45,7 +45,6 @@ pt_BR:
       unrecognized_extension: "Extensão de arquivo não reconhecida: %{extension}"
     import_error:
       generic: Ocorreu um erro ao importar esse tema
-      about_json: "Erro de Importação: o about.json não existe ou é inválido"
       about_json_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"
       unpack_failed: "Falha ao descompactar o arquivo"
@@ -174,6 +173,8 @@ pt_BR:
     errors:
       <<: *errors
   invite:
+    not_found: "Seu token de convite é inválido. Entre em <a href='%{base_url}/about'>contato com a staff</a>."
+    not_found_json: "Seu token de convite é inválido. Por favor entre em contato com a staff."
     not_found_template: |
       <p>Seu convite para <a href="%{base_url}">%{site_name}</a>já foi resgatado.
       <p>Se você lembrar de sua senha, você pode <a href="%{base_url}/login">Login</a>.</p>
@@ -212,8 +213,11 @@ pt_BR:
   invalid_whisper_access: "Os sussurros não estão habilitados ou você não tem acesso para criar postagens de sussurro"
   not_in_group:
     title_topic: "Você precisa estar em um grupo para ver este tópico."
+    title_category: "Você deve estar em um grupo para ver esta categoria."
     request_membership: "Pedir para participar"
     join_group: "Entrar no Grupo"
+  deleted_topic: "Ops! Este tópico foi excluído e não está mais disponível."
+  delete_topic_failed: "Ocorreu um erro ao excluir esse tópico. Entre em contato com o administrador do site."
   reading_time: "Tempo de leitura"
   likes: "Curtidas"
   too_many_replies:
@@ -269,6 +273,7 @@ pt_BR:
     one: "Desculpe, usuários novos podem colocar apenas %{count} link nas postagens."
     other: "Desculpe, usuários novos podem colocar apenas %{count} links nas postagens."
   contains_blocked_word: "Sua postagem contém uma palavra que não é permitida:%{word}"
+  contains_blocked_words: "Sua postagem contém várias palavras que não são permitidas: %{words}"
   spamming_host: "Desculpe, você não pode colocar um link para este site."
   user_is_suspended: "Usuários suspensos não tem permissão para postar."
   topic_not_found: "Ocorreu um erro. Talvez este tópico foi fechado ou removido enquanto você estava visualizando?"
@@ -276,6 +281,7 @@ pt_BR:
   max_pm_recipients: "Desculpe, você pode enviar uma mensagem para o 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 todo a postagem anterior."
+  create_pm_on_existing_topic: "Desculpe, você não pode criar uma MP em um tópico existente."
   just_posted_that: "é demasiado similar ao que postaste recentemente"
   invalid_characters: "contém caracteres inválidos"
   is_invalid: "parece pouco claro; é uma frase completa?"
@@ -310,9 +316,15 @@ pt_BR:
   revert_version_same: "A versão atual é a mesma versão para a qual você está tentando reverter."
   excerpt_image: "imagem"
   bookmarks:
+    errors:
+      already_bookmarked_post: "Você não pode favoritar a mesma postagem duas vezes."
+      cannot_set_past_reminder: "Você não pode definir um lembrete de favorito no passado."
+      cannot_set_reminder_in_distant_future: "Você não pode definir um lembrete de favorito mais de 10 anos no futuro."
+      time_must_be_provided: "a hora deve ser fornecida para todos os lembretes"
     reminders:
-      at_desktop: "Da próxima vez que estiver na minha área de trabalho"
+      at_desktop: "Da próxima vez que estiver em meu desktop"
       later_today: "Mais tarde hoje"
+      next_business_day: "Próximo dia útil"
       tomorrow: "Amanhã"
       next_week: "Próxima semana"
       next_month: "Próximo mês"
@@ -346,6 +358,7 @@ pt_BR:
       trust_level_4: "nivel_de_confianca_4"
     request_membership_pm:
       title: "Pedido de associação para @%{group_name}"
+    view_hidden_topic_request_reason: "Gostaria de fazer parte do grupo '%{group_name}' para poder acessar [este tópico](%{topic_url})"
   education:
     until_posts:
       one: "%{count} mensagem"
@@ -386,12 +399,6 @@ 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 todo mundo ler tópicos que possuem poucas respostas com muita informação em vez de muitas respostas individuais com pouca informação cada.
-    dominating_topic: |
-      ### Deixe que outros participem desta conversa
-
-      Este tópico claramente é importante para você &ndash; você postou mais de %{percent}% das respostas aqui.
-
-      Poderia ser ainda melhor se você tivesse outras pessoas para compartilhar seus pontos de vista também. Você pode convidá-las?
     get_a_room: |
       ### Incentive todos a se envolverem na conversa
 
@@ -547,6 +554,7 @@ pt_BR:
       description_incomplete: "A postagem da descrição da categoria deve ter pelo menos um parágrafo."
       permission_conflict: "Qualquer grupo que tenha permissão para acessar uma subcategoria também deve ter permissão para acessar a categoria pai. Os grupos a seguir têm acesso a uma das subcategorias, mas não têm acesso à categoria pai: %{group_names}."
       disallowed_topic_tags: "Este tópico tem etiquetas não permitidas por esta categoria: '%{tags}'"
+      disallowed_tags_generic: "Este tópico não permite etiquetas."
     cannot_delete:
       uncategorized: "Esta categoria é especial. Ela se destina como uma área de espera para tópicos que não têm categoria; ela não pode ser excluída."
       has_subcategories: "Não é possível excluir essa categoria porque tem subcategorias."
@@ -712,6 +720,7 @@ pt_BR:
       windows: "Microsoft Windows"
       unknown: "sistema operacional desconhecido"
   change_email:
+    wrong_account_error: "Você está logado na conta errada, desconecte-se e tente novamente."
     confirmed: "O seu email foi atualizado."
     please_continue: "Continuar no %{site_name}"
     error: "Houve um erro ao alterar o seu endereço de email. Talvez o endereço já esteja sendo utilizado?"
@@ -720,11 +729,14 @@ pt_BR:
     confirm: "Confirmar"
     authorizing_new:
       title: "Confirme seu novo e-mail"
+      description: "Por favor confirme que você deseja que seu novo endereço de e-mail seja alterado para:"
     authorizing_old:
       title: "Troque seu endereço de e-mail"
+      description: "Por favor confirme a alteração do seu endereço de e-mail"
       old_email: "E-mail antigo: %{email}"
       new_email: "Novo e-mail: %{email}"
       almost_done_title: "Confirmando seu novo endereço de e-mail"
+      almost_done_description: "Nós enviamos um e-mail para o seu novo endereço de e-mail para confirmar a alteração!"
   associated_accounts:
     revoke_failed: "Falha ao revogar sua conta com %{provider_name}."
     connected: "(conectado)"
@@ -739,6 +751,7 @@ pt_BR:
     activated: "Desculpe, esta conta já foi ativada."
     admin_confirm:
       title: "Confirmar Conta de Administrador"
+      description: "Tem certeza de que deseja que <b>%{target_username} (%{target_email})</b> seja um administrador?"
       grant: "Conceder acesso de administrador"
       complete: "<b>%{target_username}</b> é agora um administrador."
       back_to: "Retornar para %{title}"
@@ -790,6 +803,7 @@ pt_BR:
   draft:
     sequence_conflict_error:
       title: "erro no rascunho"
+      description: "O rascunho está sendo editado em outra janela. Por favor recarregue esta página."
   draft_backup:
     pm_body: "Tópico contém rascunhos salvos"
   user_activity:
@@ -960,6 +974,7 @@ pt_BR:
       yaxis: "Número de novos colaboradores"
       description: "Número de usuários que fizeram sua primeira postagem durante este período."
     trust_level_growth:
+      title: "Crescimento de nível de confiança"
       yaxis: "Dia"
     consolidated_page_views:
       title: "Visualizações de Página Consolidadas"
@@ -1235,6 +1250,7 @@ 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 assistidas é inválida. Verifique as <a href='%{base_path}/admin/logs/watched_words'>configurações das Palavras Assistidas</a> ou desative a configuração do site 'expressões regulares de palavras assistidas'."
   site_settings:
     censored_words: "Palavras que serão substituídos automaticamente por &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-apagar todas as mensagens ocultas que ficar oculta por mais de 30 dias."
@@ -1874,6 +1890,8 @@ pt_BR:
       topic: "Resultados"
       user: "Utilizadores"
     results_page: "Buscar resultados para '%{term}'"
+    audio: "[áudio]"
+    video: "[vídeo]"
   sso:
     login_error: "Erro de Login"
     not_found: "Sua conta não pode ser encontrada. Por favor, entre em contato com o administrador do site."
@@ -1962,6 +1980,8 @@ pt_BR:
     autoclosed_disabled_lastpost: "Este tópico está aberto agora. Novas respostas estã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 está ativado para sua conta."
     security_key_description: "Quando você tiver uma chave física de segurança preparada, pressione o Anti\n\nQuando sua chave de segurança física estiver pronta, pressione o botão \"Autenticar com Chave de Segurança\" abaixo."
     security_key_alternative: "T"
     security_key_authenticate: "Autenticar com Chave de Segurança"
@@ -1982,7 +2002,12 @@ pt_BR:
     errors: "%{errors}"
     not_available: "Não disponível. Tente %{suggestion}?"
     something_already_taken: "Algo deu errado, talvez o nome de usuário ou o email já estejam registrados. Tente o link Esqueci minha Senha."
+    omniauth_error:
+      generic: "Desculpe, houve um erro ao autorizar sua conta. Por favor, tente novamente."
+      csrf_detected: "A autorização levou tempo demais ou você mudou de navegador. Por favor, tente novamente."
+      request_error: "Ocorreu um erro ao iniciar a autorização. Por favor, tente novamente."
     omniauth_error_unknown: "Algo deu errado no processamento do seu login, por favor tente novamente."
+    omniauth_confirm_title: "Efetuar login usando %{provider}"
     omniauth_confirm_button: "Continuar"
     authenticator_error_no_valid_email: "Nenhum endereço de e-mail associado a%{account} são autorizados. Você pode precisar configurar sua conta com um endereço de e-mail diferente."
     new_registrations_disabled: "Novas contas não são permitidas neste momento."
@@ -1999,6 +2024,7 @@ pt_BR:
     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."
     second_factor_toggle:
+      totp: "Usar um aplicativo autenticador ou chave de segurança"
       backup_code: "Use um código de backup"
   admin:
     email:
@@ -2013,6 +2039,7 @@ pt_BR:
       short: "deve ter no mínimo %{min} caracteres"
       long: "precisa ter não mais que ${max} caracteres"
       too_long: "é muito longo"
+      characters: "deve incluir apenas números, letras, traços, pontos e sublinhados"
       unique: "tem que ser único"
       blank: "tem que ser preenchido"
       must_begin_with_alphanumeric_or_underscore: "deve começar com uma letra, número ou um underline"
@@ -2034,6 +2061,7 @@ pt_BR:
       fixed_primary_email: "E-mail principal fixo para usuário testado"
       same_ip_address: "Mesmo endereço IP (%{ip_address}) como outros usuários"
       inactive_user: "Usuário inativo"
+    email_in_spam_header: "O primeiro e-mail do usuário foi sinalizado como spam"
   reviewables_reminder:
     submitted:
       one: "Itens foram enviados durante %{count} hora atrás. [Por favor, revise-os] (%{base_path}/review)."
@@ -2091,7 +2119,7 @@ pt_BR:
       %{invite_link}
   invite_forum_mailer:
     title: "Convidar remetente do Fórum"
-    subject_template: "%{inviter_name}convidou você para se juntar à %{site_domain_name}"
+    subject_template: "%{inviter_name} convidou você para se juntar à %{site_domain_name}"
     text_body_template: |
       %{inviter_name} convidou você para se juntar
 
@@ -2143,6 +2171,10 @@ pt_BR:
   admin_confirmation_mailer:
     title: "Confirmação do administrador"
     subject_template: "[%{email_prefix}] Confirmar nova conta de administrador"
+    text_body_template: |
+      Por favor confirme que você deseja adicionar **%{target_username} (%{target_email})** como administrador do seu fórum.
+
+      [Confirmar conta de administrador](%{admin_confirm_url})
   test_mailer:
     title: "Teste de remetente"
     subject_template: "[%{email_prefix}] Teste de entrega de e-mail"
@@ -2172,9 +2204,46 @@ pt_BR:
     post_hidden:
       title: "Post oculto"
       subject_template: "Post oculto pelas sinalizações da comunidade"
+      text_body_template: |
+        Olá, esta é uma mensagem automática de %{site_name} para informar que sua postagem foi ocultada.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Esta postagem foi ocultada devido a sinalizações da comunidade; portanto, considere como você pode revisar sua postagem para refletir os comentários deles. **Você pode editar sua postagem após %{edit_delay} minutos e ela será automaticamente mostrada novamente.**
+
+        No entanto, se a postagem for ocultada pela comunidade uma segunda vez, ela permanecerá oculta até ser tratada pela staff.
+
+        Para obter orientações adicionais, consulte nossas [diretrizes da comunidade](%{base_url}/guidelines).
     post_hidden_again:
       title: "Posto oculto novamente"
       subject_template: "Post escondido por sinalizações da comunidade, equipe notificada"
+      text_body_template: |
+        Olá, esta é uma mensagem automática de %{site_name} para informar que sua postagem foi ocultada novamente.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        A comunidade sinalizou esta postagem e agora está oculta. **Como esta postagem foi ocultada mais de uma vez, sua postagem permanecerá oculta até ser tratada por um membro da staff.**
+
+        Para obter orientações adicionais, consulte nossas [diretrizes da comunidade](%{base_url}/guidelines).
+    flags_disagreed:
+      title: "Postagem sinalizada restaurada pela staff"
+      subject_template: "Postagem sinalizada restaurada pela staff"
+      text_body_template: |
+        Olá,
+
+        Esta é uma mensagem automatizada de %{site_name} para informar que [sua postagem](%{base_url}%{url}) foi restaurada.
+
+        Esta postagem foi sinalizada pela comunidade e um membro da staff optou por restaurá-la.
+
+        [details="Clique para expandir a postagem restaurada"]
+        ``` markdown
+        %{flagged_post_raw_content}
+        ```
+        [/details]
     flags_agreed_and_post_deleted:
       title: "Postagem sinalizada removida pela equipe"
       subject_template: "Postagem sinalizada removida pela equipe"
@@ -2217,6 +2286,8 @@ pt_BR:
         Opa, tudo bom? Nós vemos que você tem estado ocupado lendo, o que é fantástico, então nós te promovemos a um [nível de confiança!](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) mais alto.
 
         Estamos realmente felizes por você estar passando tempo conosco 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:
+      subject_template: "Parabéns, você recebeu o status %{role}!"
     welcome_invite:
       title: "Convite de boas-vindas"
       subject_template: "Bem-vindo ao %{site_name}!"
@@ -2255,7 +2326,7 @@ pt_BR:
 
         Aqui está o log:
 
-        `` text
+        ``` text
         %{logs}
         ```
     restore_succeeded:
@@ -2506,6 +2577,12 @@ pt_BR:
     ignored_users_summary:
       title: "Usuário Ignorado passou o limite"
       subject_template: "Um usuário está sendo ignorado por muitos outros usuários"
+      text_body_template: |
+        Olá, esta é uma mensagem automática de %{site_name} para informar que @%{username} foi ignorado por %{ignores_threshold} usuários. Isso pode indicar que um problema está se desenvolvendo em sua comunidade.
+
+        Você pode querer [revisar postagens recentes](%{base_url}/u/%{username}/summary) desse usuário e, possivelmente, outros usuários no [relatório de usuários ignorados e silenciados](%{base_url}/admin/reports/top_ignored_users).
+
+        Para obter orientações adicionais, consulte nossas [diretrizes da comunidade](%{base_url}/guidelines).
     too_many_spam_flags:
       title: "Muitas Sinalizações de Spam"
       subject_template: "Nova conta suspensa"
@@ -2586,6 +2663,12 @@ pt_BR:
     dashboard_problems:
       title: "Problemas do painel"
       subject_template: "Nova recomendação no painel do seu site"
+      text_body_template: |
+        Temos alguns novos conselhos e recomendações para você, com base nas configurações atuais do site.
+
+        [Visite o painel do site](%{base_url}/admin) para vê-los.
+
+        Se nada estiver visível no seu painel, outro membro da equipe pode já ter agido com base neste conselho. Uma lista de ações da staff pode ser encontrada em seus [Logs de ação da staff](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Você é um novo usuário do mês!"
       subject_template: "Você é um novo usuário do mês!"
@@ -2632,6 +2715,48 @@ pt_BR:
     visit_link_to_respond_pm: "[Visite a Mensagem](%{base_url}%{url}) para responder a %{participants}."
     posted_by: "Postado por %{username} em %{post_date}"
     pm_participants: "Participantes: %{participants}"
+    invited_group_to_private_message_body: |
+      %{username} convidou @%{group_name} para uma mensagem
+
+      > **[%{topic_title}](%{topic_url})**
+      >
+      > %{topic_excerpt}
+
+      em
+
+      > %{site_title} - %{site_description}
+
+      Para participar da mensagem, clique no link abaixo:
+
+      %{topic_url}
+    invited_to_private_message_body: |
+      %{username} convidou você para uma mensagem
+
+      > **[%{topic_title}](%{topic_url})**
+      >
+      > %{topic_excerpt}
+
+      em
+
+      > %{site_title} - %{site_description}
+
+      Para participar da mensagem, clique no link abaixo:
+
+      %{topic_url}
+    invited_to_topic_body: |
+      %{username} convidou você para uma discussão
+
+      > **[%{topic_title}](%{topic_url})**
+      >
+      > %{topic_excerpt}
+
+      em
+
+      > %{site_title} -- %{site_description}
+
+      Para participar da discussão, clique no link abaixo:
+
+      %{topic_url}
     user_invited_to_private_message_pm_group:
       title: "Grupo Convidado do Usuário para MP"
       subject_template: "[%{email_prefix}] %{username} convidou @%{group_name} para a mensagem'%{topic_title}'"
@@ -2866,6 +2991,13 @@ pt_BR:
     admin_login:
       title: "Login de administrador"
       subject_template: "[%{email_prefix}] Login"
+      text_body_template: |
+        Alguém pediu para fazer login na sua conta em [%{site_name}](%{base_url}).
+
+        Se você não fez essa solicitação, pode ignorar este e-mail com segurança.
+
+        Clique no link a seguir para fazer login:
+        %{base_url}/session/email-login/%{email_token}
     account_created:
       title: "Conta Criada"
       subject_template: "[%{email_prefix}] Sua Nova Conta"
@@ -2877,9 +3009,11 @@ 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 seu novo endereço de email para %{site_name} clicando no seguinte link: \n\n%{base_url}/u/confirm-new-email/%{email_token}\n"
     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 email 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"
@@ -2984,6 +3118,7 @@ pt_BR:
     missing: "Desculpe! Não conseguimos achar nenhum avatar associado a esse endereço de email. Você pode tentar novamente?"
   flag_reason:
     sockpuppet: "Um novo usuário criou um tópico, e um outro novo usuário no mesmo endereço IP (%{ip_address}) respondeu. Veja a configuração <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> do site."
+    spam_hosts: "Este novo usuário tentou criar várias postagens com links para o mesmo domínio. Todas as postagens deste usuário que incluam links devem ser revisadas. Veja a configuração do site <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "Excedido max_emails_per_day_per_user"
     exceeded_bounces_limit: "Excedido bounce_score_threshold"
@@ -3294,11 +3429,19 @@ pt_BR:
         Esse selo é concedido quando você recebe pelo menos cinco curtidas em 300 postagens diferentes. Uau! A comunidade admira suas contribuições freqüentes e de alta qualidade para as conversas aqui.
     out_of_love:
       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.
     higher_love:
       name: Amor Maior
+      description: "Usou %{max_likes_per_day} curtidas no mesmo dia 5 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!
     crazy_in_love:
       name: Apaixonado
-      description: Deu 50 curtidas no mesmo dia 20 vezes
+      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!
     thank_you:
       name: Obrigado
       description: Teve 20 mensagens curtidas e curtiu 10 mensagens
@@ -3374,10 +3517,20 @@ pt_BR:
       other: "Você precisa selecionar pelo menos %{count} etiquetas."
     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"
       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.'
+    required_tags_from_group:
+      one: "Você deve incluir pelo menos a tag %{count} %{tag_group_name}."
+      other: "Você deve incluir pelo menos %{count} etiquetas %{tag_group_name}."
+    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}"
   finish_installation:
     congratulations: "Parabéns, você instalou o Discourse!"
@@ -3557,6 +3710,7 @@ pt_BR:
     api_key:
       revoked: Regovado
   reviewables:
+    already_handled: "Obrigado, mas já analisamos essa postagem e determinamos que ela não precisa ser sinalizada novamente."
     priorities:
       low: "Baixo"
       medium: "Média"
@@ -3581,6 +3735,7 @@ pt_BR:
       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`."
+      email_spam: "Este e-mail foi sinalizado como spam pelo cabeçalho definido em `email_in_spam_header`."
     actions:
       agree:
         title: "Concordar…"
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 7b25ba8d3d..737145ec6b 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -1877,7 +1877,6 @@ ro:
       name: Înaltă stimă
     crazy_in_love:
       name: Maximă stimă
-      description: Ai folosit de 20 de ori 50 de aprecieri pe zi
     thank_you:
       name: Mulțumesc
       description: Ai 20 de postări apreciate și ai dat 10 apreiceri
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 9289721673..34f4f369b2 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -45,8 +45,9 @@ ru:
       unrecognized_extension: "Нераспознанное расширение файла: %{extension}"
     import_error:
       generic: Произошла ошибка при импорте этой темы
-      about_json: "Ошибка импорта: about.json не существует или является недопустимым"
+      about_json: "Ошибка импорта: файл about.json не существует или имеет неверный формат. Вы действительно импортируете тему Discourse?"
       about_json_values: "about.json содержит недопустимые значения:%{errors}"
+      modifier_values: "модификаторы about.json содержат недопустимые значения: %{errors}"
       git: "Ошибка клонирования git репозитория, доступ запрещен или репозиторий не найден"
       unpack_failed: "Не удалось распаковать файл"
       file_too_big: "Несжатый файл слишком велик."
@@ -311,6 +312,7 @@ ru:
   max_pm_recipients: "Извините, вы можете послать сообщение максимум %{recipients_limit}получателю."
   pm_reached_recipients_limit: "Извините, вы не можете иметь больше, чем %{recipients_limit} получателей в сообщении."
   removed_direct_reply_full_quotes: "Автоматически удаляется цитату из всего предыдущего поста."
+  create_pm_on_existing_topic: "Извините, вы не можете создать PM по существующей теме."
   just_posted_that: "слишком схоже с уже опубликованным вами сообщением"
   invalid_characters: "содержит недопустимые символы"
   is_invalid: "Не совсем ясно, это предложение закончено?"
@@ -359,7 +361,7 @@ ru:
       already_bookmarked_post: "Вы не можете дважды добавить сообщение в закладки"
       cannot_set_past_reminder: "Нельзя указать уже прошедшую дату напоминания."
       cannot_set_reminder_in_distant_future: "Нельзя указать дату напоминания, отличающуюся от текущей более чем на 10 лет. "
-      time_must_be_provided: "время должно быть установлено для всех напоминаний"
+      time_must_be_provided: "Время должно быть установлено для всех напоминаний"
     reminders:
       at_desktop: "При следующем посещении форума"
       later_today: "Сегодня, но позже"
@@ -445,12 +447,6 @@ ru:
       Вместо нового ответа, сейчас можно начать редактировать свой предыдущий ответ и просто добавить в него новые цитаты и ответы та них. Для этого нужно выделить требуемый текст и нажать на появившуюся кнопку <b>ответить цитированием</b>.
 
       Для большинства людей намного проще читать темы, в которых длинные ответы и их мало, чем когда много коротеньких ответов.
-    dominating_topic: |
-      ### Пусть другие присоединятся к разговору
-
-      Эта тема явно важна для вас &ndash; вы опубликовали более %{percent}% ответов здесь.
-
-      Уверены ли вы, что так же даете другим людям возможность высказать свою точку зрения. Можете ли вы пригласить их?
     get_a_room: |
       ### Призовите всех принять участие в разговоре
 
@@ -1531,6 +1527,8 @@ ru:
     min_trust_to_edit_wiki_post: "Минимальный уровень доверия, требуемый для редактирования вики-сообщения."
     min_trust_to_edit_post: "Минимальный уровень доверия, требуемый для редактирования сообщений."
     min_trust_to_allow_self_wiki: "Минимальный уровень доверия, требуемый для создания своего вики-сообщений."
+    min_trust_to_post_links: "Минимальный уровень доверия, необходимый для включения ссылок в посты"
+    min_trust_to_post_images: "Минимальный уровень доверия, необходимый для включения изображений в посты"
     newuser_max_links: "Сколько ссылок новый пользователь может вставлять в сообщение."
     newuser_max_images: "Сколько изображений новый пользователь может вставлять в одно сообщение."
     newuser_max_attachments: "Максимальное количество вложений, которое новый пользователь может прикрепить к одному сообщению."
@@ -1684,6 +1682,7 @@ ru:
     auto_close_messages_post_count: "Максимальное количество постов, разрешенных в сообщении до его автоматического закрытия (0 для отключения)"
     auto_close_topics_post_count: "Максимальное количество постов, разрешенных в теме до ее автоматического закрытия (0 для отключения)"
     max_allowed_message_recipients: "Максимальное число получателей сообщения."
+    enable_page_publishing: "Разрешить сотрудникам публиковать темы на новых URL-адресах с их собственным стилем."
     default_email_mailing_list_mode: "По умолчанию присылать почтовое уведомление, когда появляется новое сообщение."
     default_other_auto_track_topics_after_msecs: "Глобальное время по умолчанию перед автоматическим отслеживанием темы."
     default_other_external_links_in_new_tab: "По умолчанию открывать внешние ссылки в новой вкладке."
@@ -1890,8 +1889,9 @@ ru:
     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 в качестве администратора запрещен."
+    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}"
@@ -1932,6 +1932,7 @@ ru:
       short: "минимум %{min} знаков"
       long: "должно быть более %{max} знаков"
       too_long: "слишком длинное"
+      characters: "должны включать только цифры, буквы, тире, точки и подчеркивания"
       unique: "должно быть уникально"
       blank: "необходимо заполнить"
       must_begin_with_alphanumeric_or_underscore: "должно начинаться с буквы, цифры или нижнего подчёркивания"
@@ -2645,7 +2646,6 @@ ru:
       name: Высшая любовь
     crazy_in_love:
       name: Безумная любовь
-      description: Использовал 50 лайков в день 20 раз
     thank_you:
       name: Благодарный
       description: Имеет 20 понравившихся постов и дал 10 лайков
diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml
index e63e6ecb39..b6c20fbb20 100644
--- a/config/locales/server.sl.yml
+++ b/config/locales/server.sl.yml
@@ -1922,7 +1922,6 @@ sl:
       name: Radodarni v ljubezni
     crazy_in_love:
       name: Trapasto zaljubljen
-      description: 20 krat ste podelili 50 všečkov v enem dnevu
     thank_you:
       name: Zahvala
       description: Za 20 prispevkov ste prejeli všečke in podelili ste 10 všečkov.
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 2a7bcf09cd..9ca3607829 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -1348,7 +1348,6 @@ sq:
       name: Zemërhapur
     crazy_in_love:
       name: Zemërluan
-      description: Ka dhënë 50 pëlqime në ditë mbi 20 herë
     thank_you:
       name: Faleminderit
       description: Ka pëlqyer 20 postime dhe ka dhënë 10 pëlqime
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 6686010862..23b8825601 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -45,7 +45,7 @@ sv:
       unrecognized_extension: "Okänt filnamnstillägg: %{extension}"
     import_error:
       generic: Det uppstod ett fel vid import av det temat
-      about_json: "Importfel: about.json finns inte eller är ogiltig"
+      about_json: "Importfel: about.json finns inte eller är ogiltig. Är du säker på att detta är ett Discourse tema?"
       about_json_values: "about.json innehåller ogiltiga värden: %{errors}"
       modifier_values: "about.json modifierare innehåller ogiltiga värden: %{errors}"
       git: "Fel vid kloning av git-lagringsplats, åtkomst nekas eller lagringsplatsen finns inte"
@@ -335,7 +335,7 @@ sv:
       already_bookmarked_post: "Du kan inte bokmärka samma inlägg två gånger."
       cannot_set_past_reminder: "Du kan inte sätta en påminnelse för bokmärke i det förflutna."
       cannot_set_reminder_in_distant_future: "Du kan inte sätta en påminnelse för bokmärke mer än 10 år framåt i tiden."
-      time_must_be_provided: "tid måste tillhandahållas för alla påminnelser"
+      time_must_be_provided: "tid måste anges för alla påminnelser"
     reminders:
       at_desktop: "Nästa gång är jag vid datorn"
       later_today: "Senare idag"
@@ -414,12 +414,6 @@ 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 gå med i konversationen
-
-      Detta ämne är uppenbarligen viktigt för dig &ndash; du har postat mer än %{percent}% av alla svar här.
-
-      Det kunde vara ännu bättre om du ger andra personer utrymme att dela deras synpunkter, också. Kan du bjuda in dem?
     get_a_room: |
       ### Uppmuntra alla att delta i konversationen
 
@@ -1341,6 +1335,7 @@ sv:
     add_rel_nofollow_to_user_content: 'Lägg till rel nofollow på allt användargenererat innehåll, förutom interna länkar (inklusive förälderdomän). Om du ändrar det här så måste du uppdatera alla inlägg med "rake posts:rebake"'
     exclude_rel_nofollow_domains: "En lista av alla domän där nofollow inte bör läggas till länkarna. exempel.se kommer automatiskt tillåta underdomän.exempel.se också. Du bör lägga till top-level domänen för den här webbplatsen för att hjälpa sökrobotar hitta allt innehåll. Om andra delar av din webbplats finns på andra domäner så bör du lägga till dem också. "
     post_excerpt_maxlength: "Maxlängd på ett inläggs utdrag / sammanfattning."
+    topic_excerpt_maxlength: "Maxlängd på ett inläggs utdrag / sammanfattning, genererat från det första inlägget i ett ämne."
     show_pinned_excerpt_mobile: "Visa inte utdrag för klistrade ämnen i mobilen."
     show_pinned_excerpt_desktop: "Visa inte utdrag för klistrade ämnen på datorn."
     post_onebox_maxlength: "Maximal teckenlängd för ett Discourse-inlägg i onebox."
@@ -1850,7 +1845,7 @@ sv:
     notify_about_queued_posts_after: "Om det finns inlägg som har väntat på att granskas i mer än detta antal timmar, skickas ett meddelande 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)"
-    code_formatting_style: "Kodknappen i redigeraren kommer att använda den här kodformatteringsstilen som standard"
+    code_formatting_style: "Kodknappen i redigeraren kommer att använda den här kodformateringsstilen som standard"
     max_allowed_message_recipients: "Maximalt antal mottagare som tillåts i ett meddelande."
     watched_words_regular_expressions: "Bevakade ord är reguljära uttryck."
     old_post_notice_days: "Dagar tills inläggsmeddelandet blir gammalt"
@@ -2094,6 +2089,7 @@ sv:
     not_activated: "Du kan inte logga in ännu. Vi har skickat ett aktiveringsmejl till dig. Vänligen följ instruktionerna i mejlet för att aktivera ditt konto."
     not_allowed_from_ip_address: "Du kan inte logga in som %{username} från den IP-adressen."
     admin_not_allowed_from_ip_address: "Du kan inte logga in som admin från den IP-adressen."
+    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}"
     errors: "%{errors}"
@@ -2686,6 +2682,15 @@ sv:
         Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
 
         Ditt konto har inte rättigheter att svara på ämnet. Om du tror att det här är ett misstag, [kontakta personal](%{base_url}/about).
+    email_reject_reply_to_digest:
+      title: "E-posten avslås; Svara på summering"
+      subject_template: "[%{email_prefix}] E-postfel --  Svar på summering"
+      text_body_template: |
+        Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
+
+        Du svarade på en summeringsutskick, vilket inte är tillåtet.
+
+        Om du tror att det här är ett misstag, [kontakta personal](%{base_url}/about).
     email_error_notification:
       title: "Email felmeddelanden"
       subject_template: "[%{email_prefix}] E-postfel --  POP autentisieringsfel"
@@ -3462,7 +3467,7 @@ sv:
         Den här utmärkelsen beviljas när du använder alla dina %{max_likes_per_day} gillningar för en dag under 5 dagar. Tack för att du tar dig tiden att aktivt uppmuntra de bästa diskussionerna varje dag!
     crazy_in_love:
       name: Galet kär
-      description: Använde 50 gillningar på en dag 20 gånger
+      description: "Använde %{max_likes_per_day} gillningar på en dag 20 gånger"
       long_description: |
         Den här utmärkelsen beviljas när du använder alla dina %{max_likes_per_day}gillningar för en dag under 20 dagar. Wow! Du är en förebild som regelbundet uppmuntrar medlemmarna på forumet!
     thank_you:
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
index b5ad745f36..568a7d9d54 100644
--- a/config/locales/server.sw.yml
+++ b/config/locales/server.sw.yml
@@ -2042,7 +2042,6 @@ sw:
       name: Upendo wa Hali ya Juu
     crazy_in_love:
       name: Imejaa Upendo
-      description: Umetumia upendo 50 mara 20 ndani ya siku moja
     thank_you:
       name: Asante
       description: ana upendo 20 kwenye machapisho na ametoa upendo 10
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index a9c04b6ca1..a6ea45a2e5 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -45,7 +45,6 @@ tr_TR:
       unrecognized_extension: "Tanınmayan dosya uzantısı: %{extension}"
     import_error:
       generic: Bu temayı içe aktarırken bir hata oluştu
-      about_json: "Alma Hatası: about.json mevcut değil veya geçersiz"
       about_json_values: "about.json geçersiz değerler içeriyor: %{errors}"
       git: "Git deposu klonlanırken hata oluştu, erişim reddedildi veya depo bulunamadı"
       unpack_failed: "Dosya çözülemedi"
@@ -324,7 +323,6 @@ tr_TR:
   bookmarks:
     errors:
       already_bookmarked_post: "Aynı gönderiyi iki kez işaretleyemezsiniz."
-      time_must_be_provided: "Tüm hatırlatıcılara zaman verilmelidir"
     reminders:
       at_desktop: "Bir dahaki sefere masaüstümdeyim"
       later_today: "Bugün ilerleyen saatlerde"
@@ -395,7 +393,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: "### Başkalarının konuya katılmasına izin verin.\nBu geri dönüş alabilmeniz için önemlidir - yanıtların %%{percent} değerinden fazlasını gönderdiniz. \nBaşkalarının fikirlerini paylaşacakları bir yer bulabilmeleri için onları davet edebilir misiniz?\n"
     get_a_room: |
       ### Herkesi sohbete katılmaya teşvik edin
 
@@ -3396,7 +3393,6 @@ tr_TR:
         5 defa günlük %{max_likes_per_day} beğeni kullandığınız zaman bu rozet size verilir. Her gün en iyi sohbetleri aktif olarak teşvik etmek için zaman ayırdığınız için teşekkür ederiz!
     crazy_in_love:
       name: Beğeni Delisi
-      description: "20 gün boyunca, günde 50 beğeni hakkını kullanma "
       long_description: |
         20 gün boyunca günlük beğenilerinizin tümünü %{max_likes_per_day} kullandığınızda bu rozet size verilir. Vay canına! Topluluk üyelerini teşvik etmek için bir rol modelisiniz!
     thank_you:
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index 92e1287ab5..f9b8d304c0 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -45,7 +45,6 @@ uk:
       unrecognized_extension: "Нерозпізнане розширення файлу: %{extension}"
     import_error:
       generic: Виникла помилка при імпорті цієї теми
-      about_json: "Помилка імпорта: about.json не існує або є недійсним"
       about_json_values: "about.json має неприпустимі значення: %{errors}"
       git: "Помилка клонування git репозиторія, доступ заборонено або репозиторій не знайдено"
       unpack_failed: "Не вдалось розпакувати файл"
@@ -354,7 +353,6 @@ uk:
   bookmarks:
     errors:
       already_bookmarked_post: "Ви не можете зробити закладку на одну публікацію двічі."
-      time_must_be_provided: "Для всіх нагадувань повинен бути встановлений час"
     reminders:
       at_desktop: "Наступного разу на мій робочий стіл"
       later_today: "Пізніше сьогодні"
@@ -439,12 +437,6 @@ uk:
       Замість нового відповіді, зараз можна почати редагувати свій попередній відповідь і просто додати в нього нові цитати і відповіді та них. Для цього потрібно виділити необхідний текст і натиснути на кнопку, що з'явилася <b>відповісти цитуванням</b>.
 
       Для більшості людей набагато простіше читати теми, у яких довгі відповіді і їх мало, ніж коли багато коротеньких відповідей.
-    dominating_topic: |
-      ### Нехай інші приєднаються до розмови
-
-      Ця тема явно важлива для вас &ndash; ви опублікували більше %{percent}% відповідей тут.
-
-      Чи впевнені ви, що так само даєте іншим людям можливість висловити свою точку зору. Чи можете ви запросити їх?
     get_a_room: |
       ### Покличте всіх взяти участь в розмові
 
@@ -2759,7 +2751,6 @@ uk:
       name: Вища любов
     crazy_in_love:
       name: Шалене кохання
-      description: Використав 50 лайків протягом дня 20 днів поспіль
     thank_you:
       name: Дякуємо
       description: Отримав лайки у 20 дописах та надав 10 лайків іншим
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index ae91640f4f..f649990899 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -45,7 +45,6 @@ ur:
       unrecognized_extension: "نامعلوم فائل ایکسٹینشن: %{extension}"
     import_error:
       generic: تِھیم درآمد کرتے ہوئے ایک خرابی کا سامنا کرنا پڑا
-      about_json: "درآمد کی خرابی: about.json موجود نہیں ہے، یا غلط ہے"
       about_json_values: "about.json غلط اقدار پر مشتمل ہے: %{errors}"
       git: "گِٹ رِیپَوزِٹَری کلَون کرنے میں خرابی، رسائی کی اجازت نہیں یا رِیپَوزِٹَری موجود نہیں ہے"
       unpack_failed: "فائل کھولنے میں ناکام"
@@ -380,12 +379,6 @@ ur:
       متن کو اُجاگر کر کہ ظاہر ہونے والے <b>جواب اقتباس کریں</b> بٹن منتخب کرنے سے ایک اقتباس شامل کرنے کیلئے آپ اپنے پچھلے جواب میں ترمیم کرسکتے ہیں۔
 
       ہر ایک کیلئے اُن ٹاپکس کو پڑھ نا زیادہ آسان ہے جس میں بہت سے چھوٹے، انفرادی جوابات کے مقابلے میں تفصیلی لیکن کم جوابات ہوں۔
-    dominating_topic: |
-      ### دوسروں کو گفتگو میں شامل ہونے کی اجازت دیں
-
-      یہ ٹاپک آپ کے لئے واضح طور پر اہم ہے&ndash; آپ نے یہاں %{percent}% سے زیادہ جوابات پوسٹ کیے ہیں۔
-
-      یہ مزید بہتر ہوسکتا ہے اگر آپ دوسروں کو اپنے خیالات کا اظہار کرنے کیلئے بھی جگہ دیں۔ کیا آپ انہیں مدعو کرسکتے ہیں؟
     get_a_room: |
       ### بات چیت میں ملوث ہونے کیلئے سب کی حوصلہ افزائی کریں
 
@@ -3465,7 +3458,6 @@ ur:
       name: عظیم تر محبت
     crazy_in_love:
       name: محبت میں دیوانہ
-      description: ایک دن میں 50 لائیکس 20 مرتبہ استعمال کر لیے
     thank_you:
       name: آپ کا شکریہ
       description: 20 لائیک کردہ پوسٹس ہیں اور 10 لائیکس دیے
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index ddfc227886..24c5e3f3e2 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -382,7 +382,7 @@ vi:
       email_title: 'Một bài viết trong "%{title}" cần Ban quản trị lưu ý'
       email_body: "%{link}\n\n %{message}"
     bookmark:
-      title: "Đánh dấu chỉ mục \x1C"
+      title: "Đánh dấu chỉ mục"
       description: "Đánh dấu chỉ mục bài viết này"
       short_description: "Đánh dấu chỉ mục bài viết này"
       long_form: "đã đánh dấu chỉ mục bài viết này"
@@ -1375,7 +1375,6 @@ vi:
       name: Thích nhiều hơn
     crazy_in_love:
       name: Thích nhiệt tình
-      description: Sử dụng 50 like một ngày trong 20 ngày
     thank_you:
       name: Cám ơn bạn
       description: Nhận được 20 like và đã like 10 lần
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index d1f5b7c61f..ec6341374f 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -45,7 +45,6 @@ zh_CN:
       unrecognized_extension: "无法识别的文件扩展名：%{extension}"
     import_error:
       generic: 导入该主题时发生错误
-      about_json: "导入错误：about.json 不存在或无效"
       about_json_values: "about.json 包含无效值：%{errors}"
       modifier_values: "about.json 的修改包含无效值：%{errors}"
       git: "克隆 git 储存库时出错，访问被拒绝或找不到存储库"
@@ -318,7 +317,7 @@ zh_CN:
       already_bookmarked_post: "你不能将同一帖子收藏两次。"
       cannot_set_past_reminder: "你不能在此主题设置收藏提醒。"
       cannot_set_reminder_in_distant_future: "你不能够设置一个大于十年的收藏提醒。"
-      time_must_be_provided: "必须为除提醒提供时间"
+      time_must_be_provided: "必须为所有提醒设置时间"
     reminders:
       at_desktop: "下次我使用桌面设备时"
       later_today: "今天的某个时候"
@@ -394,12 +393,6 @@ zh_CN:
       你可以在你的回复中添加引用。只要选择你想引用的文字，然后点击随后出现的<b>引用回复</b>按钮。
 
       这样其它人会更容易地看一个长的回复，而不是多个分开的回复。
-    dominating_topic: |
-      ### 让其他人加入讨论
-
-      很明显这个主题对你很重要 &ndash; 你已经发表的帖子占该主题 %{percent}% 的回复。
-
-      如果你能留出空间让其他人来分享他们的观点，那可能会更好。你可以邀请他们过来吗？
     get_a_room: |
       ### 鼓励大家参与讨论
 
@@ -2048,6 +2041,7 @@ zh_CN:
     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}"
@@ -3869,7 +3863,7 @@ zh_CN:
         此徽章授予给连续5天用完所有每日 %{max_likes_per_day} “赞”的你。感谢您每天花时间积极鼓励最好的交流！
     crazy_in_love:
       name: 狂热
-      description: 20 天都赞过 50 次
+      description: "一天内送出 %{max_likes_per_day} 个赞达 20 次"
       long_description: |
         此徽章授予给每天都送完所有的每日 %{max_likes_per_day} 赞的你。哇！你是鼓励社区成员的榜样！
     thank_you:
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 799c5774dc..f348a525e4 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -43,7 +43,6 @@ zh_TW:
     other_error: "更新佈景主題時發生了錯誤"
     import_error:
       generic: 匯入佈景主題時發生了錯誤
-      about_json: "匯入錯誤：about.json 不存在或無效"
       about_json_values: "about.json 含有無效的數值：%{errors}"
       git: "複製 git 版本庫時發生錯誤，存取被拒或找不到該版本庫"
       unpack_failed: "解壓縮檔案失敗"
@@ -347,12 +346,6 @@ zh_TW:
       你可以編輯你先前的回應訊息，選擇字句後點選 <b>引用</b> 來回應。
 
       對於大家而言，閱讀包含較多回覆的少量貼文，會比閱讀多篇瑣碎貼文更為輕鬆。
-    dominating_topic: |
-      ### 讓其他人能一起加入討論
-
-      這篇主題真的對你很重要 &ndash; 你在這個討論中已回覆多於 %{percent}% 的回應。
-
-      如果你可以邀請更多人來分享他們的觀點，那可能會更好。 你可以邀請他們過來參與討論嗎？
     get_a_room: |
       ### 考慮回應更多參與者
 
@@ -3227,7 +3220,6 @@ zh_TW:
       name: 激情
     crazy_in_love:
       name: 狂熱
-      description: 20 天都讚過 50 次
     thank_you:
       name: 感謝你
       description: 有 20 個被讚的貼文，給出過 10 個贊
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fr.yml b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
index bc1ffdbaa5..fdb61ea804 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -250,7 +250,7 @@ fr:
           (Si vous êtes sur un périphérique mobile, vous pouvez aussi entrer l'émoji directement depuis votre clavier.)
       mention:
         instructions: |-
-          Parfois vous avez peut-être envie d'attirer l'attention de quelqu'un, même si vous ne lui répondez pas directement. Tapez `@` et complétez son pseudo pour le mentionner.
+          Parfois vous avez peut-être envie d'attirer l'attention de quelqu'un, même si vous ne lui répondez pas directement. Tapez `@` et complétez son nom d'utilisateur pour le mentionner.
 
           Pouvez-vous mentionner **`@%{discobot_username}`** dans votre réponse ?
         reply: |-
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 83ee3a2332..1ba192a70e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
@@ -36,7 +36,7 @@ pl_PL:
 
         Aby kontynuować, odpowiedz mi w dowolnym momencie.
 
-        Aby pominąć ten krok, wyślij wiadomość o treści ``.
+        Aby pominąć ten krok, wyślij wiadomość o treści `%{skip_trigger}`.
 
         Aby rozpocząć od początku, wyślij wiadomość o treści `%{reset_trigger}`.
 
diff --git a/plugins/poll/config/locales/client.ar.yml b/plugins/poll/config/locales/client.ar.yml
index 1bad58de71..035b2df623 100644
--- a/plugins/poll/config/locales/client.ar.yml
+++ b/plugins/poll/config/locales/client.ar.yml
@@ -23,30 +23,6 @@ ar:
         many: "العديد من الأصوات"
         other: "مجموع الأصوات"
       average_rating: "متوسط التقييمات: <strong>%{average}</strong> "
-      multiple:
-        help:
-          at_least_min_options:
-            zero: "لا تختر شيئا"
-            one: "اختر خيارًا واحدًا على الأقل"
-            two: "اختر خيارين إثنين على الأقل"
-            few: "اختر <strong>%{count}</strong> خيارات على الأقل"
-            many: "اختر <strong>%{count}</strong> خيارا على الأقل"
-            other: "اختر <strong>%{count}</strong> خيار على الأقل"
-          up_to_max_options:
-            zero: "لا تختر شيئا"
-            one: "اختر خيارا <strong>واحدا</strong>"
-            two: "اختر ما حدّه <strong>خيارين</strong>"
-            few: "اختر ما حدّه <strong>%{count}</strong> خيارات"
-            many: "اختر ما حدّه <strong>%{count}</strong> خيارا"
-            other: "اختر حتي <strong>%{count}</strong> خيار"
-          x_options:
-            zero: "لا تختر شيئا"
-            one: "اختر خيار <strong>واحد</strong>"
-            two: "اختر <strong>خيارين</strong>"
-            few: "اختر <strong>%{count}</strong> خيارات"
-            many: "اختر <strong>%{count}</strong> خيارا"
-            other: "اختر <strong>%{count}</strong> خيار"
-          between_min_and_max_options: "اختر بين <strong>%{min}</strong> و <strong>%{max}</strong> خيار"
       cast-votes:
         title: "أدلِ بصوتك"
         label: "صوّت اﻵن!"
diff --git a/plugins/poll/config/locales/client.be.yml b/plugins/poll/config/locales/client.be.yml
index d50105fd44..f038c9dc54 100644
--- a/plugins/poll/config/locales/client.be.yml
+++ b/plugins/poll/config/locales/client.be.yml
@@ -19,18 +19,6 @@ be:
         many: "галасоў"
         other: "галасоў"
       average_rating: "Сярэдні рэйтынг: <strong>%{average}strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Абярыце хаця б <strong>%{count}</strong> варыянт адказу"
-            few: "Абярыце хаця б <strong>%{count}</strong> варыянтаў адказаў"
-            many: "Абярыце хаця б <strong>%{count}</strong> варыянтаў адказаў"
-            other: "Абярыце хаця б <strong>%{count}</strong> варыянтаў адказаў"
-          up_to_max_options:
-            one: "Абярыце ня больш за <strong>%{count}</strong> варыянта адказу"
-            few: "Абярыце ня больш за <strong>%{count}</strong> варыянтаў адказаў"
-            many: "Абярыце ня больш за <strong>%{count}</strong> варыянтаў адказаў"
-            other: "Абярыце ня больш за <strong>%{count}</strong> варыянтаў адказаў"
       export-results:
         label: "экспарт"
       close:
diff --git a/plugins/poll/config/locales/client.bg.yml b/plugins/poll/config/locales/client.bg.yml
index d9c519023d..ba2471da75 100644
--- a/plugins/poll/config/locales/client.bg.yml
+++ b/plugins/poll/config/locales/client.bg.yml
@@ -15,12 +15,6 @@ bg:
         one: "общ брой гласове"
         other: "общо гласове"
       average_rating: "Средна отценка: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Избери поне <strong>%{count}</strong> отговора"
-            other: "Избери поне <strong>%{count}</strong> отговора"
-          between_min_and_max_options: "Може да изберете между <strong>%{min}</strong> и <strong>%{max}</strong> възможни отговора."
       cast-votes:
         title: "Изчислете вашите гласове"
         label: "Гласувай сега!"
diff --git a/plugins/poll/config/locales/client.bs_BA.yml b/plugins/poll/config/locales/client.bs_BA.yml
index 379da2075a..d0125eab00 100644
--- a/plugins/poll/config/locales/client.bs_BA.yml
+++ b/plugins/poll/config/locales/client.bs_BA.yml
@@ -28,21 +28,6 @@ bs_BA:
           title: "Rezultati će biti prikazani onda kada glasanje bude <strong>završeno</strong>."
         staff:
           title: "Rezultati su prikazani samo <strong>uredništvu i admin</strong> korisnicima."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Odaberi barem <strong>%{count}</strong> opciju"
-            few: "Odaberi barem <strong>%{count}</strong> opcije"
-            other: "Odaberi barem <strong>%{count}</strong> opcija"
-          up_to_max_options:
-            one: "Odaberi do <strong>%{count}</strong> opciju"
-            few: "Odaberi do <strong>%{count}</strong> opcije"
-            other: "Odaberi do <strong>%{count}</strong> opcija"
-          x_options:
-            one: "Odaberi <strong>%{count}</strong> opciju"
-            few: "Odaberi <strong>%{count}</strong> opcije"
-            other: "Odaberi <strong>%{count}</strong> opcija"
-          between_min_and_max_options: "Odaberi između <strong>%{min}</strong> i <strong>%{max}</strong> opcija"
       cast-votes:
         title: "ukupno glasova"
         label: "Glasaj"
diff --git a/plugins/poll/config/locales/client.ca.yml b/plugins/poll/config/locales/client.ca.yml
index 72c1ce94bd..fcdb125d56 100644
--- a/plugins/poll/config/locales/client.ca.yml
+++ b/plugins/poll/config/locales/client.ca.yml
@@ -24,18 +24,6 @@ ca:
           title: "Els resultats es mostraran una vegada <strong>tancada</strong> la votació."
         staff:
           title: "Els resultats només es mostren als membres de l'<strong>equip responsable</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Trieu com a mínim <strong>%{count}</strong> opció"
-            other: "Trieu com a mínim <strong>%{count}</strong> opcions"
-          up_to_max_options:
-            one: "Trieu fins a <strong>%{count}</strong> opció"
-            other: "Trieu fins a <strong>%{count}</strong> opcions"
-          x_options:
-            one: "Trieu <strong>%{count}</strong> opció"
-            other: "Trieu <strong>%{count}</strong> opcions"
-          between_min_and_max_options: "Trieu entre <strong>%{min}</strong> i <strong>%{max}</strong> opcions"
       cast-votes:
         title: "Repartiu els vostres vots"
         label: "Voteu ara!"
diff --git a/plugins/poll/config/locales/client.cs.yml b/plugins/poll/config/locales/client.cs.yml
index 8114e79955..d4f0bc5e9f 100644
--- a/plugins/poll/config/locales/client.cs.yml
+++ b/plugins/poll/config/locales/client.cs.yml
@@ -19,24 +19,6 @@ cs:
         many: "hlasů celkem"
         other: "hlasů celkem"
       average_rating: "Průměrné hodnocení: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Zvolte alespoň <strong>%{count}</strong> možnost."
-            few: "Zvolte alespoň <strong>%{count}</strong> možnosti."
-            many: "Zvolte alespoň <strong>%{count}</strong> možností."
-            other: "Zvolte alespoň <strong>%{count}</strong> možností."
-          up_to_max_options:
-            one: "Zvolte maximálně <strong>%{count}</strong> možnost."
-            few: "Zvolte maximálně <strong>%{count}</strong> možnosti."
-            many: "Zvolte maximálně <strong>%{count}</strong> možností"
-            other: "Zvolte maximálně <strong>%{count}</strong> možností"
-          x_options:
-            one: "Zvolte <strong>%{count}</strong> možnost."
-            few: "Zvolte <strong>%{count}</strong> možnosti."
-            many: "Zvolte <strong>%{count}</strong> možností"
-            other: "Zvolte <strong>%{count}</strong> možností"
-          between_min_and_max_options: "Zvolte mezi <strong>%{min}</strong> a <strong>%{max}</strong> možnostmi"
       cast-votes:
         title: "Hlasujte"
         label: "Hlasovat nyní!"
diff --git a/plugins/poll/config/locales/client.da.yml b/plugins/poll/config/locales/client.da.yml
index 673e11ad85..40d018839a 100644
--- a/plugins/poll/config/locales/client.da.yml
+++ b/plugins/poll/config/locales/client.da.yml
@@ -15,18 +15,6 @@ da:
         one: "afgiven stemme"
         other: "afgivne stemmer"
       average_rating: "Gennemsnitlig rating: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Vælg mindst <strong>%{count}</strong> mulighed"
-            other: "Vælg mindst <strong>%{count}</strong> muligheder"
-          up_to_max_options:
-            one: "Vælg op til <strong>%{count}</strong> mulighed"
-            other: "Vælg op til <strong>%{count}</strong> muligheder"
-          x_options:
-            one: "Vælg <strong>%{count}</strong> mulighed"
-            other: "Vælg <strong>%{count}</strong> muligheder"
-          between_min_and_max_options: "Vælg imellem <strong>%{min}</strong> og <strong>%{max}</strong> valgmuligheder"
       cast-votes:
         title: "Afgiv dine stemmer"
         label: "Stem nu!"
diff --git a/plugins/poll/config/locales/client.de.yml b/plugins/poll/config/locales/client.de.yml
index 772cd9732c..dd0fb239f6 100644
--- a/plugins/poll/config/locales/client.de.yml
+++ b/plugins/poll/config/locales/client.de.yml
@@ -26,18 +26,6 @@ de:
           title: "Ergebnisse werden angezeigt <strong>nach Ende der Abstimmung</strong>."
         staff:
           title: "Ergebnisse werden nur <strong>Team</strong> Mitgliedern angezeigt."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Du musst mindestens <strong>%{count}</strong> Option auswählen."
-            other: "Du musst mindestens <strong>%{count}</strong> Optionen auswählen."
-          up_to_max_options:
-            one: "Du kannst bis zu <strong>%{count}</strong> Option auswählen."
-            other: "Du kannst bis zu <strong>%{count}</strong> Optionen auswählen."
-          x_options:
-            one: "Bitte wähle <strong>%{count}</strong> Option."
-            other: "Bitte wähle <strong>%{count}</strong> Optionen."
-          between_min_and_max_options: "Bitte wähle zwischen <strong>%{min}</strong> und <strong>%{max}</strong> Optionen."
       cast-votes:
         title: "Gib deine Stimmen ab"
         label: "Jetzt abstimmen!"
diff --git a/plugins/poll/config/locales/client.el.yml b/plugins/poll/config/locales/client.el.yml
index 1abb884bc4..4f69e563eb 100644
--- a/plugins/poll/config/locales/client.el.yml
+++ b/plugins/poll/config/locales/client.el.yml
@@ -15,18 +15,6 @@ el:
         one: "συνολική ψήφος"
         other: "συνολικές ψήφοι"
       average_rating: "Μέση βαθμολογία: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Επιλέξτε τουλάχιστον <strong>%{count}</strong> επιλογή"
-            other: "Επέλεξε τουλάχιστον <strong>%{count}</strong> επιλογές"
-          up_to_max_options:
-            one: "Επιλέξτε μέχρι <strong>%{count}</strong> επιλογή"
-            other: "Επέλεξε μέχρι <strong>%{count}</strong> επιλογές"
-          x_options:
-            one: "Επιλέξτε <strong>%{count}</strong> επιλογή"
-            other: "Επέλεξε <strong>%{count}</strong> επιλογές"
-          between_min_and_max_options: "Επιλέξτε ανάμεσα σε <strong>%{min}</strong> και <strong>%{max}</strong> επιλογές"
       cast-votes:
         title: "Δώσε τις ψήφους σου"
         label: "Ψήφισε τώρα!"
diff --git a/plugins/poll/config/locales/client.es.yml b/plugins/poll/config/locales/client.es.yml
index 38f7411b32..6d0c47d15e 100644
--- a/plugins/poll/config/locales/client.es.yml
+++ b/plugins/poll/config/locales/client.es.yml
@@ -26,18 +26,6 @@ es:
           title: "Los resultados se mostrarán una vez que la encuesta esté <strong>cerrada</strong>."
         staff:
           title: "Los resultados solo se muestran a miembros del <strong>staff</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Elige al menos <strong>%{count}</strong> opción"
-            other: "Elige al menos <strong>%{count}</strong> opciones"
-          up_to_max_options:
-            one: "Elige <strong>%{count}</strong> opción"
-            other: "Elige hasta <strong>%{count}</strong> opciones"
-          x_options:
-            one: "Elige <strong>%{count}</strong> opción"
-            other: "Elige <strong>%{count}</strong> opciones"
-          between_min_and_max_options: "Elige entre <strong>%{min}</strong> y <strong>%{max}</strong> opciones."
       cast-votes:
         title: "Emite tus votos"
         label: "¡Vota ahora!"
diff --git a/plugins/poll/config/locales/client.et.yml b/plugins/poll/config/locales/client.et.yml
index aa12127205..66b1b57f66 100644
--- a/plugins/poll/config/locales/client.et.yml
+++ b/plugins/poll/config/locales/client.et.yml
@@ -15,18 +15,6 @@ et:
         one: "häält kokku"
         other: "hääli kokku"
       average_rating: "Keskmine hinnang: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Tee vähemalt <strong>%{count}</strong> valik"
-            other: "Tee vähemalt <strong>%{count}</strong> valikut"
-          up_to_max_options:
-            one: "Võid teha <strong>%{count}</strong> valiku"
-            other: "Võid teha kuni <strong>%{count}</strong> valikut"
-          x_options:
-            one: "Tee <strong>%{count}</strong> valik"
-            other: "Tee <strong>%{count}</strong> valikut"
-          between_min_and_max_options: "Tee <strong>%{min}</strong> kuni <strong>%{max}</strong> valikut"
       cast-votes:
         title: "Anna oma hääl"
         label: "Hääleta nüüd!"
diff --git a/plugins/poll/config/locales/client.fa_IR.yml b/plugins/poll/config/locales/client.fa_IR.yml
index 9d632c7bed..807a752191 100644
--- a/plugins/poll/config/locales/client.fa_IR.yml
+++ b/plugins/poll/config/locales/client.fa_IR.yml
@@ -17,18 +17,6 @@ fa_IR:
       average_rating: "میانگین امتیاز: <strong>%{average}</strong>."
       public:
         title: "آرا <strong>عمومی</strong> هستند."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "حداقل <strong>%{count}</strong> گزینه انتخاب کنید."
-            other: "حداقل <strong>%{count}</strong> گزینه انتخاب کنید."
-          up_to_max_options:
-            one: "حداکثر <strong>%{count}</strong> گزینه انتخاب کنید"
-            other: "حداکثر <strong>%{count}</strong> گزینه انتخاب کنید"
-          x_options:
-            one: "<strong>%{count}</strong> گزینه انتخاب کنید"
-            other: "<strong>%{count}</strong> گزینه انتخاب کنید"
-          between_min_and_max_options: "بین <strong>%{min}</strong> تا <strong>%{max}</strong> گزینه انتخاب کنید"
       cast-votes:
         title: "انداختن رأی شما"
         label: "رای بدهید!"
diff --git a/plugins/poll/config/locales/client.fi.yml b/plugins/poll/config/locales/client.fi.yml
index 2bf6476b07..101060a52f 100644
--- a/plugins/poll/config/locales/client.fi.yml
+++ b/plugins/poll/config/locales/client.fi.yml
@@ -26,18 +26,6 @@ fi:
           title: "Tulokset näytetään äänestyksen <strong>sulkeuduttua</strong>."
         staff:
           title: "Tulokset näytetään vain <strong>henkilökunnan</strong> jäsenille. "
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Valitse vähintään <strong>%{count}</strong> vaihtoehto"
-            other: "Valotse vähintään <strong>%{count}</strong> vaihtoehtoa"
-          up_to_max_options:
-            one: "Valitse enintään <strong>%{count}</strong> vaihtoehto"
-            other: "Valitse enintään <strong>%{count}</strong> vaihtoehtoa"
-          x_options:
-            one: "Valitse <strong>%{count}</strong> vaihtoehto"
-            other: "Valitse <strong>%{count}</strong> vaihtoehtoa"
-          between_min_and_max_options: "Valitse <strong>%{min}</strong>-<strong>%{max}</strong> vaihtoehtoa"
       cast-votes:
         title: "Antakaa äänenne"
         label: "Äänestä nyt!"
diff --git a/plugins/poll/config/locales/client.fr.yml b/plugins/poll/config/locales/client.fr.yml
index caa4b7c485..94db10620c 100644
--- a/plugins/poll/config/locales/client.fr.yml
+++ b/plugins/poll/config/locales/client.fr.yml
@@ -18,24 +18,26 @@ fr:
       public:
         title: "Les votes sont <strong>publics</strong>."
       results:
+        groups:
+          title: "Vous devez être membre du groupe %{groups} pour voter à ce sondage."
         vote:
-          title: "Les résultats sont affichés après avoir <strong>voté</strong>."
+          title: "Les résultats sont affichés après le <strong>vote</strong>."
         closed:
-          title: "Les résultats sont affichés après avoir <strong>fermé</strong>."
+          title: "Les résultats sont affichés après la <strong>fermeture</strong> du sondage."
         staff:
-          title: "Les résultats ne sont montrés qu'aux membres du <strong>personnel</strong> ."
+          title: "Les résultats ne sont montrés qu'aux <strong>responsables</strong>."
       multiple:
         help:
           at_least_min_options:
-            one: "Choisissez au moins <strong>%{count}</strong> option"
-            other: "Choisissez au moins <strong>%{count}</strong> options"
+            one: "Choisissez au moins <strong>%{count}</strong> option."
+            other: "Choisissez au moins <strong>%{count}</strong> options."
           up_to_max_options:
-            one: "Choisissez jusqu'à <strong>%{count}</strong> option"
-            other: "Choisissez jusqu'à <strong>%{count}</strong> options"
+            one: "Choisissez jusqu'à <strong>%{count}</strong> option."
+            other: "Choisissez jusqu'à <strong>%{count}</strong> options."
           x_options:
-            one: "Choisissez <strong>%{count}</strong> option"
-            other: "Choisissez <strong>%{count}</strong> options"
-          between_min_and_max_options: "Choisissez entre <strong>%{min}</strong> et <strong>%{max}</strong> options"
+            one: "Choisissez <strong>%{count}</strong> option."
+            other: "Choisissez <strong>%{count}</strong> options."
+          between_min_and_max_options: "Choisissez entre <strong>%{min}</strong> et <strong>%{max}</strong> options."
       cast-votes:
         title: "Distribuez vos votes"
         label: "Votez maintenant !"
@@ -73,6 +75,7 @@ fr:
         title: Créer un sondage
         insert: Insérer le sondage
         help:
+          options_count: Entrez au moins 1 option
           invalid_values: La valeur minimum doit être plus petite que la valeur maximum.
           min_step_value: Le valeur minimum du pas est 1
         poll_type:
@@ -84,10 +87,14 @@ fr:
           label: Résultats
           always: Toujours visible
           vote: Lors du vote
-          closed: A la fermeture
-          staff: Personnel seulement
+          closed: À la fermeture
+          staff: Responsables seulement
+        poll_groups:
+          label: Groupes autorisés
         poll_chart_type:
           label: Type de graphique
+          bar: Barre
+          pie: Circulaire
         poll_config:
           max: Max
           min: Min
@@ -97,4 +104,4 @@ fr:
         poll_options:
           label: Entrez une option de sondage par ligne
         automatic_close:
-          label: Fermer sondage automatiquement
+          label: Fermer le sondage automatiquement
diff --git a/plugins/poll/config/locales/client.he.yml b/plugins/poll/config/locales/client.he.yml
index 9362da2ee6..ce29427744 100644
--- a/plugins/poll/config/locales/client.he.yml
+++ b/plugins/poll/config/locales/client.he.yml
@@ -33,21 +33,21 @@ he:
       multiple:
         help:
           at_least_min_options:
-            one: "נא לבחור באפשרות <strong>אחת</strong> לפחות"
-            two: "נא לבחור ב־<strong>%{count}</strong> אפשרויות לפחות"
-            many: "נא לבחור ב־<strong>%{count}</strong> אפשרויות לפחות"
-            other: "נא לבחור ב־<strong>%{count}</strong> אפשרויות לפחות"
+            one: "יש לבחור באפשרות <strong>%{count}</strong> לפחות."
+            two: "יש לבחור <strong>%{count}</strong> אפשרויות לפחות."
+            many: "יש לבחור <strong>%{count}</strong> אפשרויות לפחות."
+            other: "יש לבחור <strong>%{count}</strong> אפשרויות לפחות."
           up_to_max_options:
-            one: "נא לבחור עד אפשרות <strong>אחת</strong>."
-            two: "נא לבחור עד <strong>%{count}</strong> אפשרויות"
-            many: "נא לבחור עד <strong>%{count}</strong> אפשרויות"
-            other: "נא לבחור עד <strong>%{count}</strong> אפשרויות"
+            one: "יש לבחור אפשרות <strong>%{count}</strong> לכל היותר."
+            two: "יש לבחור עד <strong>%{count}</strong> אפשרויות."
+            many: "יש לבחור עד <strong>%{count}</strong> אפשרויות."
+            other: "יש לבחור עד <strong>%{count}</strong> אפשרויות."
           x_options:
-            one: "נא לבחור באפשרות אחת"
-            two: "נא לבחור <strong>%{count}</strong> אפשרויות"
-            many: "נא לבחור <strong>%{count}</strong> אפשרויות"
-            other: "נא לבחור <strong>%{count}</strong> אפשרויות"
-          between_min_and_max_options: "נא לבחור בין <strong>%{min}</strong> ל־<strong>%{max}</strong> אפשרויות"
+            one: "יש לבחור באפשרות <strong>%{count}</strong>."
+            two: "יש לבחור <strong>%{count}</strong> אפשרויות."
+            many: "יש לבחור <strong>%{count}</strong> אפשרויות."
+            other: "יש לבחור <strong>%{count}</strong> אפשרויות."
+          between_min_and_max_options: "נא לבחור בין <strong>%{min}</strong> ל־<strong>%{max}</strong> אפשרויות."
       cast-votes:
         title: "להצביע"
         label: "להצביע עכשיו!"
diff --git a/plugins/poll/config/locales/client.hu.yml b/plugins/poll/config/locales/client.hu.yml
index 9e6cc8f752..c7276c7658 100644
--- a/plugins/poll/config/locales/client.hu.yml
+++ b/plugins/poll/config/locales/client.hu.yml
@@ -15,14 +15,6 @@ hu:
         one: "összes szavazat"
         other: "összes szavazat"
       average_rating: "Átlagos értékelés: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Válassz legalább <strong>%{count}</strong> lehetőséget"
-            other: "Válasst legalább <strong>%{count}</strong> lehetőséget"
-          x_options:
-            one: "Válassz <strong>%{count}</strong> lehetőséget"
-            other: "Válassz <strong>%{count}</strong> lehetőséget"
       cast-votes:
         title: "Szavazatod leadása"
         label: "Szavazz!"
diff --git a/plugins/poll/config/locales/client.hy.yml b/plugins/poll/config/locales/client.hy.yml
index 1eea3dfc08..2b73983c5e 100644
--- a/plugins/poll/config/locales/client.hy.yml
+++ b/plugins/poll/config/locales/client.hy.yml
@@ -22,18 +22,6 @@ hy:
           title: "Արդյունքները կցուցադրվեն ըստ <strong>քվեի</strong>:"
         closed:
           title: "Արդյունքները կցուցադրվեն <strong>փակվելուց</strong> անմիջապես հետո:"
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Ընտրեք առնվազն <strong>%{count}</strong> տարբերակ"
-            other: "Ընտրեք առնվազն <strong>%{count}</strong> տարբերակ"
-          up_to_max_options:
-            one: "Ընտրեք մինչև <strong>%{count}</strong> տարբերակ"
-            other: "Ընտրեք մինչև <strong>%{count}</strong> տարբերակ"
-          x_options:
-            one: "Ընտրեք <strong>%{count}</strong> տարբերակ"
-            other: "Ընտրեք <strong>%{count}</strong> տարբերակ"
-          between_min_and_max_options: "Ընտրեք <strong>%{min}</strong> և <strong>%{max}</strong> տարբերակների միջև"
       cast-votes:
         title: "Քվեարկեք"
         label: "Քվեարկեք հիմա !"
diff --git a/plugins/poll/config/locales/client.id.yml b/plugins/poll/config/locales/client.id.yml
index 644911fa22..4f8997f8c1 100644
--- a/plugins/poll/config/locales/client.id.yml
+++ b/plugins/poll/config/locales/client.id.yml
@@ -13,15 +13,6 @@ id:
       total_votes:
         other: "jumlah suara"
       average_rating: "Rata-rata rating: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            other: "Pilih setidaknya <strong>%{count}</strong> pilihan"
-          up_to_max_options:
-            other: "Pilih sampai <strong<%{count}</strong> pilihan"
-          x_options:
-            other: "Pilih <strong>%{count}</strong> pilihan"
-          between_min_and_max_options: "Pilih antara <strong>%{min}</strong> dan <strong>%{max}</strong> pilihan"
       cast-votes:
         title: "Gunakan suaramu"
         label: "Pilih sekarang!"
diff --git a/plugins/poll/config/locales/client.it.yml b/plugins/poll/config/locales/client.it.yml
index ae32f0db6f..83768a1ec4 100644
--- a/plugins/poll/config/locales/client.it.yml
+++ b/plugins/poll/config/locales/client.it.yml
@@ -26,18 +26,6 @@ it:
           title: "I risultati saranno mostrati a sondaggio <strong>chiuso</strong>."
         staff:
           title: "I risultati saranno mostrati solo ai membri dello <strong>staff</strong>"
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Scegli almeno <strong>%{count}</strong> opzione"
-            other: "Scegli almeno <strong>%{count}</strong> opzioni"
-          up_to_max_options:
-            one: "Scegli fino a <strong>%{count}</strong> opzione"
-            other: "Scegli fino a <strong>%{count}</strong> opzioni"
-          x_options:
-            one: "Scegli <strong>%{count}</strong> opzione"
-            other: "Scegli <strong>%{count}</strong> opzioni"
-          between_min_and_max_options: "Scegli tra <strong>%{min}</strong> e <strong>%{max}</strong> opzioni"
       cast-votes:
         title: "Vota"
         label: "Vota!"
diff --git a/plugins/poll/config/locales/client.ja.yml b/plugins/poll/config/locales/client.ja.yml
index 210fd2598c..5d172db21f 100644
--- a/plugins/poll/config/locales/client.ja.yml
+++ b/plugins/poll/config/locales/client.ja.yml
@@ -20,15 +20,6 @@ ja:
           title: "結果は<strong>投票</strong>したとき表示されます。"
         closed:
           title: "結果は<strong>クローズ</strong>したとき表示されます。"
-      multiple:
-        help:
-          at_least_min_options:
-            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>の選択肢を選んでください"
       cast-votes:
         title: "投票する"
         label: "投票する"
diff --git a/plugins/poll/config/locales/client.ko.yml b/plugins/poll/config/locales/client.ko.yml
index 30ffe031fb..d206754aaf 100644
--- a/plugins/poll/config/locales/client.ko.yml
+++ b/plugins/poll/config/locales/client.ko.yml
@@ -24,15 +24,6 @@ ko:
           title: "결과가 <strong>닫히면 표시</strong> 됩니다."
         staff:
           title: "결과는 <strong>직원</strong> 에게만 표시됩니다."
-      multiple:
-        help:
-          at_least_min_options:
-            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>개까지 선택 가능합니다."
       cast-votes:
         title: "표 던지기"
         label: "지금 투표!"
diff --git a/plugins/poll/config/locales/client.nb_NO.yml b/plugins/poll/config/locales/client.nb_NO.yml
index 87c9adf01c..a1842ac454 100644
--- a/plugins/poll/config/locales/client.nb_NO.yml
+++ b/plugins/poll/config/locales/client.nb_NO.yml
@@ -15,18 +15,6 @@ nb_NO:
         one: "antall stemmer"
         other: "antall stemmer"
       average_rating: "Gjennomsnitt: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Velg minst <strong>%{count}</strong> alternativ"
-            other: "Velg minst <strong>%{count}</strong> alternativer"
-          up_to_max_options:
-            one: "Velg inntil <strong>%{count}</strong> alternativ"
-            other: "Velg inntil <strong>%{count}</strong> alternativer"
-          x_options:
-            one: "Velg <strong>%{count}</strong> alternativ"
-            other: "Velg <strong>%{count}</strong> alternativer"
-          between_min_and_max_options: "Velg mellom <strong>%{min}</strong> og <strong>%{max}</strong> alternativer"
       cast-votes:
         title: "Stem nå"
         label: "Stem!"
diff --git a/plugins/poll/config/locales/client.nl.yml b/plugins/poll/config/locales/client.nl.yml
index 1fdc3c18db..effea1c6cc 100644
--- a/plugins/poll/config/locales/client.nl.yml
+++ b/plugins/poll/config/locales/client.nl.yml
@@ -29,15 +29,15 @@ nl:
       multiple:
         help:
           at_least_min_options:
-            one: "Kies minstens <strong>%{count}</strong> optie"
-            other: "Kies minstens <strong>%{count}</strong> opties"
+            one: "Kies minstens <strong>%{count}</strong> optie."
+            other: "Kies minstens <strong>%{count}</strong> opties."
           up_to_max_options:
-            one: "Kies maximaal <strong>%{count}</string> optie"
-            other: "Kies maximaal <strong>%{count}</string> opties"
+            one: "Kies maximaal <strong>%{count}</strong> optie."
+            other: "Kies maximaal <strong>%{count}</strong> opties."
           x_options:
-            one: "Kies <strong>%{count}</strong> optie"
-            other: "Kies <strong>%{count}</strong> opties"
-          between_min_and_max_options: "Kies <strong>%{min}</strong> tot <strong>%{max}</strong> opties"
+            one: "Kies <strong>%{count}</strong> optie."
+            other: "Kies <strong>%{count}</strong> opties."
+          between_min_and_max_options: "Kies <strong>%{min}</strong> tot <strong>%{max}</strong> opties."
       cast-votes:
         title: "Uw stemmen uitbrengen"
         label: "Nu stemmen!"
diff --git a/plugins/poll/config/locales/client.pl_PL.yml b/plugins/poll/config/locales/client.pl_PL.yml
index 5ea6c061b9..ec6b3a6ee8 100644
--- a/plugins/poll/config/locales/client.pl_PL.yml
+++ b/plugins/poll/config/locales/client.pl_PL.yml
@@ -28,24 +28,6 @@ pl_PL:
           title: "Wyniki pojawią się po <strong>zamknięciu</strong> ankiety."
         staff:
           title: "Wyniki pokazywane są wyłącznie członkom <strong>zespołu</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Wybierz co najmniej <strong>%{count}</strong> opcję"
-            few: "Wybierz co najmniej <strong>%{count}</strong> opcji"
-            many: "Wybierz co najmniej <strong>%{count}</strong> opcji"
-            other: "Wybierz co najmniej <strong>%{count}</strong> opcji"
-          up_to_max_options:
-            one: "Wybierz co najwyżej <strong>%{count}</strong> opcję"
-            few: "Wybierz co najwyżej <strong>%{count}</strong> opcji"
-            many: "Wybierz co najwyżej <strong>%{count}</strong> opcji"
-            other: "Wybierz co najwyżej <strong>%{count}</strong> opcji"
-          x_options:
-            one: "Wybierz <strong>%{count}</strong> opcję"
-            few: "Wybierz <strong>%{count}</strong> opcji"
-            many: "Wybierz <strong>%{count}</strong> opcji"
-            other: "Wybierz <strong>%{count}</strong> opcji"
-          between_min_and_max_options: "Wybierz pomiędzy <strong>%{min}</strong> a <strong>%{max}</strong> opcjami"
       cast-votes:
         title: "Oddaj głos"
         label: "Oddaj głos!"
diff --git a/plugins/poll/config/locales/client.pt.yml b/plugins/poll/config/locales/client.pt.yml
index 0015ac3e5b..128e06ade7 100644
--- a/plugins/poll/config/locales/client.pt.yml
+++ b/plugins/poll/config/locales/client.pt.yml
@@ -17,18 +17,6 @@ pt:
       average_rating: "Classificação média: <strong>%{average}</strong>."
       public:
         title: "Os votos são <strong>públicos</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 no máximo <strong>%{count}</strong> opção"
-            other: "Escolha no máximo <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: "Votar"
         label: "Vote agora!"
diff --git a/plugins/poll/config/locales/client.pt_BR.yml b/plugins/poll/config/locales/client.pt_BR.yml
index 05f94e74b0..1becaa1da6 100644
--- a/plugins/poll/config/locales/client.pt_BR.yml
+++ b/plugins/poll/config/locales/client.pt_BR.yml
@@ -18,24 +18,14 @@ pt_BR:
       public:
         title: "Votos são <strong>públicos</strong>."
       results:
+        groups:
+          title: "Você precisa ser membro de %{groups} para votar nesta votação."
         vote:
           title: "Resultados serão mostrados ao <strong>votar</strong>."
         closed:
           title: "Resultados serão mostrados quando a votação <strong>fechar</strong>."
         staff:
           title: "Resultados são somente mostrados para <strong>funcionários</strong> membros."
-      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: "Você pode escolher entre <strong>%{min}</strong> e <strong>%{max}</strong> opções"
       cast-votes:
         title: "Registre seus votos"
         label: "Votar agora!"
@@ -73,6 +63,7 @@ pt_BR:
         title: Criar Votação
         insert: Inserir Votação
         help:
+          options_count: Insira pelo menos 1 opção
           invalid_values: O valor mínimo precisa ser menor que o valor máximo.
           min_step_value: O valor mínimo de intervalo é 1
         poll_type:
@@ -86,8 +77,12 @@ pt_BR:
           vote: Ao votar
           closed: Quando fechada
           staff: Somente pessoal autorizado
+        poll_groups:
+          label: Grupos permitidos
         poll_chart_type:
           label: Tipo de gráfico
+          bar: Barras
+          pie: Pizza
         poll_config:
           max: Máx
           min: Mín
diff --git a/plugins/poll/config/locales/client.ro.yml b/plugins/poll/config/locales/client.ro.yml
index f239ae1025..8f8658d667 100644
--- a/plugins/poll/config/locales/client.ro.yml
+++ b/plugins/poll/config/locales/client.ro.yml
@@ -17,21 +17,6 @@ ro:
         few: "total voturi"
         other: "total voturi"
       average_rating: "Media: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Trebuie să alegi minim <strong>o</strong> opţiune."
-            few: "Trebuie să alegi cel puțin <strong>%{count}</strong> opțiuni."
-            other: "Trebuie să alegi cel puțin <strong>%{count}</strong> opțiuni."
-          up_to_max_options:
-            one: "Poți alege maximum <strong>o</strong> opțiune."
-            few: "Poți alege până la <strong>%{count}</strong> opțiuni."
-            other: "Poți alege până la <strong>%{count}</strong> de opțiuni."
-          x_options:
-            one: "Trebuie să alegi <strong>o</strong> opțiune."
-            few: "Trebuie să alegi <strong>%{count}</strong> opțiuni."
-            other: "Trebuie să alegi <strong>%{count}</strong> opțiuni."
-          between_min_and_max_options: "Trebuie să alegi între minim <strong>%{min}</strong> și maxim <strong>%{max}</strong> opțiuni"
       cast-votes:
         title: "Exprimă-ți votul"
         label: "Votează acum!"
diff --git a/plugins/poll/config/locales/client.ru.yml b/plugins/poll/config/locales/client.ru.yml
index 9e50d65702..a8fc9946b2 100644
--- a/plugins/poll/config/locales/client.ru.yml
+++ b/plugins/poll/config/locales/client.ru.yml
@@ -33,21 +33,21 @@ ru:
       multiple:
         help:
           at_least_min_options:
-            one: "Выберите хотя бы <strong>%{count}</strong> вариант ответа"
-            few: "Выберите хотя бы <strong>%{count}</strong> варианта ответов"
-            many: "Выберите хотя бы <strong>%{count}</strong> вариантов ответов"
-            other: "Выберите хотя бы <strong>%{count}</strong> вариантов ответов"
+            one: "Выберите как минимум %{count} вариант ответа ."
+            few: "Выберите как минимум %{count} варианта ответа ."
+            many: "Выберите как минимум %{count} вариантов ответа ."
+            other: "Выберите хотя бы <strong>%{count}</strong> вариантов ответа."
           up_to_max_options:
-            one: "Выберите не более <strong>%{count}</strong> варианта ответа"
-            few: "Выберите не более <strong>%{count}</strong> вариантов ответов"
-            many: "Выберите не более <strong>%{count}</strong> вариантов ответов"
-            other: "Выберите не более <strong>%{count}</strong> вариантов ответов"
+            one: "Выберите не более <strong>%{count}</strong> варианта ответа."
+            few: "Выберите не более <strong>%{count}</strong> вариантов ответа."
+            many: "Выберите не более <strong>%{count}</strong> вариантов ответа."
+            other: "Выберите не более <strong>%{count}</strong> вариантов ответа."
           x_options:
-            one: "Выберите <strong>%{count}</strong> вариант ответа"
-            few: "Выберите <strong>%{count}</strong> варианта ответотв"
-            many: "Выберите <strong>%{count}</strong> вариантов ответов"
-            other: "Выберите <strong>%{count}</strong> вариантов ответов"
-          between_min_and_max_options: "Выберите от <strong>%{min}</strong> до <strong>%{max}</strong> вариантов ответов"
+            one: "Выберите <strong>%{count}</strong> вариант ответа."
+            few: "Выберите <strong>%{count}</strong> варианта ответа."
+            many: "Выберите <strong>%{count}</strong> вариантов ответа."
+            other: "Выберите <strong>%{count}</strong> вариантов ответа."
+          between_min_and_max_options: "Выберите варианты ответов в диапазоне от %{min}до %{max}."
       cast-votes:
         title: "Проголосуйте"
         label: "Проголосовать!"
diff --git a/plugins/poll/config/locales/client.sk.yml b/plugins/poll/config/locales/client.sk.yml
index dcc6cb8fd9..d444faf8fd 100644
--- a/plugins/poll/config/locales/client.sk.yml
+++ b/plugins/poll/config/locales/client.sk.yml
@@ -19,24 +19,6 @@ sk:
         many: "hlasov celkom"
         other: "hlasov celkom"
       average_rating: "Priemerné hodnotenie: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Vyberte aspoň <strong>%{count}</strong> možnosť"
-            few: "Vyberte aspoň <strong>%{count}</strong> možnosti"
-            many: "Vyberte aspoň <strong>%{count}</strong> možností"
-            other: "Vyberte aspoň <strong>%{count}</strong> možností"
-          up_to_max_options:
-            one: "Vyberte najviac <strong>%{count}</strong> možnosť"
-            few: "Vyberte najviac <strong>%{count}</strong> možnosti"
-            many: "Vyberte najviac <strong>%{count}</strong> možností"
-            other: "Vyberte najviac <strong>%{count}</strong> možností"
-          x_options:
-            one: "Vyberte <strong>%{count}</strong> možnosť"
-            few: "Vyberte <strong>%{count}</strong> možnosti"
-            many: "Vyberte <strong>%{count}</strong> možností"
-            other: "Vyberte <strong>%{count}</strong> možností"
-          between_min_and_max_options: "Vyberte medzi <strong>%{min}</strong> a <strong>%{max}</strong> možnosťami"
       cast-votes:
         title: "Hlasovať"
         label: "Hlasuj teraz!"
diff --git a/plugins/poll/config/locales/client.sl.yml b/plugins/poll/config/locales/client.sl.yml
index 2f43765438..c0f770e0b0 100644
--- a/plugins/poll/config/locales/client.sl.yml
+++ b/plugins/poll/config/locales/client.sl.yml
@@ -26,24 +26,6 @@ sl:
           title: "Rezultati bodo vidni na <strong>glasovnici</strong>."
         closed:
           title: "Rezultati bodo prikazani, ko se glasovanje <strong>zapre</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Izberite vsaj <strong>%{count}</strong> opcijo"
-            two: "Izberite vsaj <strong>%{count}</strong> opciji"
-            few: "Izberite vsaj <strong>%{count}</strong> opcije"
-            other: "Izberite vsaj <strong>%{count}</strong> opcij"
-          up_to_max_options:
-            one: "Izberite do <strong>%{count}</strong> opcijo"
-            two: "Izberite do <strong>%{count}</strong> opciji"
-            few: "Izberite do <strong>%{count}</strong> opcije"
-            other: "Izberite do <strong>%{count}</strong> opcij"
-          x_options:
-            one: "Izberite <strong>%{count}</strong> opcijo"
-            two: "Izberite <strong>%{count}</strong> opciji"
-            few: "Izberite <strong>%{count}</strong> opcije"
-            other: "Izberite <strong>%{count}</strong> opcij"
-          between_min_and_max_options: "Izberite med <strong>%{min}</strong> in <strong>%{max}</strong> opcijami"
       cast-votes:
         title: "Oddajte svoj glas"
         label: "Glasuj!"
diff --git a/plugins/poll/config/locales/client.sq.yml b/plugins/poll/config/locales/client.sq.yml
index 4cef929e16..809e9cf87f 100644
--- a/plugins/poll/config/locales/client.sq.yml
+++ b/plugins/poll/config/locales/client.sq.yml
@@ -15,18 +15,6 @@ sq:
         one: "total vota"
         other: "totali votave"
       average_rating: "Vlerësimi mesatar: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Zgjidhni të paktën <strong>%{count}</strong> alternativë"
-            other: "Zgjidhni të paktën <strong>%{count}</strong> alternativa"
-          up_to_max_options:
-            one: "Zgjidhni deri në <strong>%{count}</strong> alternativë"
-            other: "Zgjidhni deri në <strong>%{count}</strong> alternativa"
-          x_options:
-            one: "Zgjidhni <strong>%{count}</strong> alternativë"
-            other: "Zgjidhni <strong>%{count}</strong> alternativa"
-          between_min_and_max_options: "Zgjidhni midis <strong>%{min}</strong> dhe <strong>%{max}</strong> alternativash"
       cast-votes:
         title: "Jepni votën tuaj"
         label: "Voto Tani"
diff --git a/plugins/poll/config/locales/client.sv.yml b/plugins/poll/config/locales/client.sv.yml
index ea5d5d65ee..5d295ba9b1 100644
--- a/plugins/poll/config/locales/client.sv.yml
+++ b/plugins/poll/config/locales/client.sv.yml
@@ -29,15 +29,15 @@ sv:
       multiple:
         help:
           at_least_min_options:
-            one: "Välj minst <strong>%{count}</strong> alternativ"
-            other: "Välj minst <strong>%{count}</strong> alternativ"
+            one: "Välj minst <strong>%{count}</strong> alternativ."
+            other: "Välj minst <strong>%{count}</strong> alternativ."
           up_to_max_options:
-            one: "Välj upp till <strong>%{count}</strong> alternativ"
-            other: "Välj upp till <strong>%{count}</strong> alternativ"
+            one: "Välj upp till <strong>%{count}</strong> alternativ."
+            other: "Välj upp till <strong>%{count}</strong> alternativ."
           x_options:
-            one: "Välj <strong>%{count}</strong> alternativ"
-            other: "Välj <strong>%{count}</strong> alternativ"
-          between_min_and_max_options: "Välj mellan <strong>%{min}</strong> och <strong>%{max}</strong> alternativ"
+            one: "Välj <strong>%{count}</strong> alternativ."
+            other: "Välj <strong>%{count}</strong> alternativ."
+          between_min_and_max_options: "Välj mellan <strong>%{min}</strong> och <strong>%{max}</strong> alternativ."
       cast-votes:
         title: "Lägg dina röster"
         label: "Rösta nu!"
diff --git a/plugins/poll/config/locales/client.sw.yml b/plugins/poll/config/locales/client.sw.yml
index 07a7ea3816..ba274a397b 100644
--- a/plugins/poll/config/locales/client.sw.yml
+++ b/plugins/poll/config/locales/client.sw.yml
@@ -17,18 +17,6 @@ sw:
       average_rating: "Wastani wa tathmini:<strong>%{average}</strong>"
       public:
         title: "Kura zina <strong>onwa na kila mtu</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Chagua angalau chaguo <strong>%{count}</strong>"
-            other: "Chagua angalau machaguo <strong>%{count}</strong>."
-          up_to_max_options:
-            one: "Chagua mpaka chaguo <strong>%{count}</strong>"
-            other: "Chagua mpaka machaguo <strong>%{count}</strong>"
-          x_options:
-            one: "Chagua chaguo <strong>%{count}</strong>"
-            other: "Chagua machaguo <strong>%{count}</strong>"
-          between_min_and_max_options: "Chagua kati ya <strong>%{min}</strong> mpaka <strong>%{max}</strong>"
       cast-votes:
         title: "Piga kura zako"
         label: "Piga kura sasa!"
diff --git a/plugins/poll/config/locales/client.th.yml b/plugins/poll/config/locales/client.th.yml
index 0efa542b45..e1937d345b 100644
--- a/plugins/poll/config/locales/client.th.yml
+++ b/plugins/poll/config/locales/client.th.yml
@@ -13,15 +13,6 @@ th:
       total_votes:
         other: "คะแนนโหวตทั้งหมด"
       average_rating: "คะแนนเฉลี่ย: <strong>%{average}</strong>"
-      multiple:
-        help:
-          at_least_min_options:
-            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>ตัวเลือก"
       cast-votes:
         title: "โหวต"
         label: "โหวตเดี๋ยวนี้"
diff --git a/plugins/poll/config/locales/client.tr_TR.yml b/plugins/poll/config/locales/client.tr_TR.yml
index 7f563c551e..7249780d02 100644
--- a/plugins/poll/config/locales/client.tr_TR.yml
+++ b/plugins/poll/config/locales/client.tr_TR.yml
@@ -26,18 +26,6 @@ tr_TR:
           title: "Sonuçlar oylama <strong>kapatıldıktan</strong> sonra gösterilecektir."
         staff:
           title: "Sonuçlar yalnızca <strong>moderatöre</strong> gösterilir."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "En az <strong>%{count}</strong> seçeneği seçin"
-            other: "En az <strong>%{count}</strong> seçecek seçiniz"
-          up_to_max_options:
-            one: "<strong>%{count}</strong> seçeneğe kadar seçebilirsiniz"
-            other: "<strong>%{count}</strong> seçeneğe kadar seçebilirsiniz"
-          x_options:
-            one: "<strong>%{count}</strong> seçenek seçiniz"
-            other: "<strong>%{count}</strong> seçenek seçiniz"
-          between_min_and_max_options: "<strong>%{min}</strong> ve <strong>%{max}</strong> arasında seçenek seçiniz"
       cast-votes:
         title: "Oyunuzu kullanın"
         label: "Şimdi oylayın!"
diff --git a/plugins/poll/config/locales/client.uk.yml b/plugins/poll/config/locales/client.uk.yml
index 58e7644ea6..3ada622bf1 100644
--- a/plugins/poll/config/locales/client.uk.yml
+++ b/plugins/poll/config/locales/client.uk.yml
@@ -28,24 +28,6 @@ uk:
           title: "Результати будуть показані після <strong>закриття</strong> ."
         staff:
           title: "Результати показуються лише <strong>співробітникам</strong> ."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Виберіть хоча б <strong>%{count}</strong> варіант"
-            few: "Виберіть хоча б <strong>%{count}</strong> варіантів"
-            many: "Виберіть хоча б <strong>%{count}</strong> варіанти"
-            other: "Виберіть хоча б <strong>%{count}</strong> варіанти"
-          up_to_max_options:
-            one: "Виберіть варіант <strong>%{count}</strong>"
-            few: "Виберіть до <strong>%{count}</strong> варіантів"
-            many: "Виберіть до <strong>%{count}</strong> варіантів"
-            other: "Виберіть до <strong>%{count}</strong> варіантів"
-          x_options:
-            one: "Виберіть варіант <strong>%{count}</strong>"
-            few: "Виберіть параметри <strong>%{count}</strong>"
-            many: "Виберіть параметри <strong>%{count}</strong>"
-            other: "Виберіть параметри <strong>%{count}</strong>"
-          between_min_and_max_options: "Виберіть параметри від<strong>%{min}</strong> до %{max}</strong>"
       cast-votes:
         title: "Проголосуйте"
         label: "Проголосувати!"
diff --git a/plugins/poll/config/locales/client.ur.yml b/plugins/poll/config/locales/client.ur.yml
index e329def358..b3a9557f52 100644
--- a/plugins/poll/config/locales/client.ur.yml
+++ b/plugins/poll/config/locales/client.ur.yml
@@ -24,18 +24,6 @@ ur:
           title: "نتائج <strong>بند ہونے</strong> پر دکھائے جائیں گے۔"
         staff:
           title: "نتائج صرف <strong>سٹاف</strong> ممبران کو دکھائے جاتے ہیں۔"
-      multiple:
-        help:
-          at_least_min_options:
-            one: "کم از کم <strong>%{count}</strong> آپشن کا انتخاب کریں"
-            other: "کم از کم <strong>%{شمار}</strong> آپشنس کا انتخاب کریں"
-          up_to_max_options:
-            one: "<strong>%{count}</strong> آپشن کا انتخاب کریں"
-            other: "<strong>%{شمار}</strong> تک آپشنس کا انتخاب کریں"
-          x_options:
-            one: "<strong>%{count}</strong> آپشن انتخاب کریں"
-            other: "<strong>%{شمار}</strong> آپشنس انتخاب کریں"
-          between_min_and_max_options: "<strong>%{کم از کم}</strong> سے <strong>%{زیادہ سے زیادہ}</strong> آپشنس کا انتخاب کریں"
       cast-votes:
         title: "اپنے ووٹ دیں۔"
         label: "ابھی ووٹ دیں۔"
diff --git a/plugins/poll/config/locales/client.vi.yml b/plugins/poll/config/locales/client.vi.yml
index ee64967d46..758f82333f 100644
--- a/plugins/poll/config/locales/client.vi.yml
+++ b/plugins/poll/config/locales/client.vi.yml
@@ -15,15 +15,6 @@ vi:
       average_rating: "Trung bình: <strong>%{average}</strong>."
       public:
         title: "Bình chọn <strong>công khai</strong>"
-      multiple:
-        help:
-          at_least_min_options:
-            other: "Chọn ít nhất <strong>%{count}</strong> lựa chọn"
-          up_to_max_options:
-            other: "Chọn tối đa <strong>%{count}</strong> lựa chọn"
-          x_options:
-            other: "Chọn <strong>%{count}</strong> lựa chọn"
-          between_min_and_max_options: "Chọn giữa <strong>%{min}</strong> và <strong>%{max}</strong> lựa chọn."
       cast-votes:
         title: "Thay đổi bình chọn của bạn"
         label: "Bình chọn ngay!"
diff --git a/plugins/poll/config/locales/client.zh_CN.yml b/plugins/poll/config/locales/client.zh_CN.yml
index c7475e3025..f1935abb3f 100644
--- a/plugins/poll/config/locales/client.zh_CN.yml
+++ b/plugins/poll/config/locales/client.zh_CN.yml
@@ -24,15 +24,6 @@ zh_CN:
           title: "结果将显示一次<strong>关闭</strong>。"
         staff:
           title: "结果仅显示给<strong>管理</strong>成员。"
-      multiple:
-        help:
-          at_least_min_options:
-            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> 个选项"
       cast-votes:
         title: "投你的票"
         label: "现在投票！"
diff --git a/plugins/poll/config/locales/client.zh_TW.yml b/plugins/poll/config/locales/client.zh_TW.yml
index 322581893f..39d0948f59 100644
--- a/plugins/poll/config/locales/client.zh_TW.yml
+++ b/plugins/poll/config/locales/client.zh_TW.yml
@@ -13,15 +13,6 @@ zh_TW:
       total_votes:
         other: "總票數"
       average_rating: "平均評分：<strong>%{average}</strong>。"
-      multiple:
-        help:
-          at_least_min_options:
-            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> 個選項"
       cast-votes:
         title: "投你的票"
         label: "現在投票！"
diff --git a/plugins/poll/config/locales/server.fr.yml b/plugins/poll/config/locales/server.fr.yml
index 8ef96a1aa9..2b3f56dd6d 100644
--- a/plugins/poll/config/locales/server.fr.yml
+++ b/plugins/poll/config/locales/server.fr.yml
@@ -18,6 +18,8 @@ fr:
     invalid_argument: "Valeur '%{value}' invalide pour paramètre '%{argument}'."
     multiple_polls_without_name: "Plusieurs sondages n'ont pas de nom. Utilisez l'attribut '<code>name</code>' pour donner un identifiant unique aux sondages."
     multiple_polls_with_same_name: "Plusieurs sondages ont le même nom : <strong>%{name}</strong>. Utilisez l'attribut '<code>name</code>' pour donner un identifiant unique aux sondages."
+    default_poll_must_have_at_least_1_option: "Un sondage doit avoir au moins 1 option."
+    named_poll_must_have_at_least_1_option: "Le sondage <strong>%{name}</strong> doit avoir au moins 1 option."
     default_poll_must_have_less_options:
       one: "Un sondage doit contenir moins que %{count}options."
       other: "Un sondage doit contenir moins que %{count} options."
diff --git a/plugins/poll/config/locales/server.pt_BR.yml b/plugins/poll/config/locales/server.pt_BR.yml
index 952e885406..084f2a131b 100644
--- a/plugins/poll/config/locales/server.pt_BR.yml
+++ b/plugins/poll/config/locales/server.pt_BR.yml
@@ -18,6 +18,8 @@ pt_BR:
     invalid_argument: "Valor inválido '%{value}' para o argumento '%{argument}'."
     multiple_polls_without_name: "Existem várias votações sem um nome. Use o atributo '<code>name</code>' para identificar de forma exclusiva as suas votações."
     multiple_polls_with_same_name: "Existem várias enquetes com o mesmo nome: <strong>%{name}</strong>. Use o atributo '<code>name</code>' para identificar de forma exclusiva as suas votações."
+    default_poll_must_have_at_least_1_option: "A votação deve ter pelo menos 1 opção."
+    named_poll_must_have_at_least_1_option: "A votação denominada <strong>%{name}</strong> deve ter pelo menos 1 opção."
     default_poll_must_have_less_options:
       one: "A votação precisa ter menos de %{count} opção."
       other: "A votação precisa ter menos de %{count} opções."

From 253a185769130630eb80e6c36d08aca37a848037 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 26 May 2020 16:27:02 +0200
Subject: [PATCH 1366/1830] FIX: makes focust text area after complete more
 resilient (#9879)

---
 .../javascripts/discourse/app/components/d-editor.js   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index 4fd5ec4bc2..bfdf021bff 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -898,8 +898,16 @@ export default Component.extend({
 
   // ensures textarea scroll position is correct
   _focusTextArea() {
-    const textarea = this.element.querySelector("textarea.d-editor-input");
     schedule("afterRender", () => {
+      if (!this.element || this.isDestroying || this.isDestroyed) {
+        return;
+      }
+
+      const textarea = this.element.querySelector("textarea.d-editor-input");
+      if (!textarea) {
+        return;
+      }
+
       textarea.blur();
       textarea.focus();
     });

From 26c7fa2c296af64e0e4c5d6332d00aa3e5cb398f Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 26 May 2020 22:43:29 +0800
Subject: [PATCH 1367/1830] FIX: `rescue_from` doesn't bubble up.

See https://github.com/rails/rails/blob/a47e0c19e60b17c3d0dcae240ef85de52113ea57/actionpack/lib/action_controller/metal/rescue.rb#L25
---
 app/controllers/application_controller.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index abde04d24b..2f2b8a9694 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -124,7 +124,7 @@ class ApplicationController < ActionController::Base
   rescue_from PG::ReadOnlySqlTransaction do |e|
     Discourse.received_postgres_readonly!
     Rails.logger.error("#{e.class} #{e.message}: #{e.backtrace.join("\n")}")
-    raise Discourse::ReadOnly
+    rescue_with_handler(Discourse::ReadOnly.new) || raise
   end
 
   rescue_from ActionController::ParameterMissing do |e|
@@ -212,7 +212,9 @@ class ApplicationController < ActionController::Base
   end
 
   rescue_from Discourse::ReadOnly do
-    render_json_error I18n.t('read_only_mode_enabled'), type: :read_only, status: 503
+    unless response_body
+      render_json_error I18n.t('read_only_mode_enabled'), type: :read_only, status: 503
+    end
   end
 
   def redirect_with_client_support(url, options)

From 675e9b81c63494cdb62add81edbd86ac626714e5 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 26 May 2020 16:51:55 +0200
Subject: [PATCH 1368/1830] FIX: document.activeElement can be null on IE11
 (#9880)

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

diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index 4890db311e..f76b948f8c 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -1175,7 +1175,7 @@ export default Controller.extend({
     const elem = document.querySelector("html");
     elem.classList.remove("fullscreen-composer");
 
-    document.activeElement.blur();
+    document.activeElement && document.activeElement.blur();
     this.setProperties({ model: null, lastValidatedAt: null });
   },
 

From 788b8becdee71b80120c36a7a12a11bef4e0a6b7 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Tue, 26 May 2020 11:13:05 -0400
Subject: [PATCH 1369/1830] Version bump to v2.5.0.beta5

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

diff --git a/lib/version.rb b/lib/version.rb
index c4fe771461..1368f623e9 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -9,7 +9,7 @@ module Discourse
       MAJOR = 2
       MINOR = 5
       TINY  = 0
-      PRE   = 'beta4'
+      PRE   = 'beta5'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end

From 4dc650423422f032b3de18befcc677f5550d8496 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Tue, 26 May 2020 08:50:55 -0700
Subject: [PATCH 1370/1830] DEV: Mark fontawesome-pro plugin as official

---
 lib/plugin/metadata.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index 04cb17a57e..597c974755 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -74,7 +74,8 @@ class Plugin::Metadata
     "docker_manager",
     "lazy-yt",
     "poll",
-    "discourse-unsupported-browser"
+    "discourse-unsupported-browser",
+    "discourse-fontawesome-pro"
   ])
 
   FIELDS ||= [:name, :about, :version, :authors, :url, :required_version, :transpile_js]

From 69ee94b526ad6c34cb7721e1192794ada4a454dd Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 26 May 2020 17:07:16 +0200
Subject: [PATCH 1371/1830] FIX: XML files could be detected as SVG files

---
 lib/freedom_patches/fast_image.rb             | 21 ++++++++++
 .../freedom_patches/fast_image_spec.rb        | 40 +++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 lib/freedom_patches/fast_image.rb
 create mode 100644 spec/components/freedom_patches/fast_image_spec.rb

diff --git a/lib/freedom_patches/fast_image.rb b/lib/freedom_patches/fast_image.rb
new file mode 100644
index 0000000000..836791b977
--- /dev/null
+++ b/lib/freedom_patches/fast_image.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# Remove when https://github.com/sdsykes/fastimage/pull/115
+# has been merged. Please remove the specs as well.
+class FastImage
+  attr_reader :original_type
+
+  private
+
+  old_parse_type = instance_method(:parse_type)
+
+  define_method(:parse_type) do
+    @original_type = old_parse_type.bind(self).()
+
+    if @original_type == :svg && @stream.peek(2) == "<s"
+      raise UnknownImageType if @stream.peek(4) != "<svg"
+    end
+
+    @original_type
+  end
+end
diff --git a/spec/components/freedom_patches/fast_image_spec.rb b/spec/components/freedom_patches/fast_image_spec.rb
new file mode 100644
index 0000000000..f8643230be
--- /dev/null
+++ b/spec/components/freedom_patches/fast_image_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe FastImage do
+  let(:svg_file) do
+    StringIO.new(<<~SVG)
+      <svg width="100" height="100">
+        <circle cx="50" cy="50" r="40" stroke="green" stroke-width="4" fill="yellow" />
+      </svg>
+    SVG
+  end
+
+  let(:xml_file) do
+    StringIO.new(<<~XML)
+      <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+        <soap:Body>
+          <foo />
+        </soap:Body>
+      </soap:Envelope>
+    XML
+  end
+
+  it "correctly detects SVG" do
+    expect(FastImage.new(svg_file).type).to eq(:svg)
+  end
+
+  it "doesn't detect XML starting with <s as SVG" do
+    expect(FastImage.new(xml_file).type).to be_nil
+  end
+
+  it "still needs to be monkey patched" do
+    expect(FastImage.new(xml_file).original_type).to eq(:svg), <<~MESSAGE
+      The fast_image monkey patch isn't needed anymore.
+      Please remove the following files:
+        * lib/freedom_patches/fast_image.rb
+        * spec/components/freedom_patches/fast_image_spec.rb
+    MESSAGE
+  end
+end

From d38e571cbaab32c386f4d05ffd2299c9f0c55c7d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 26 May 2020 12:28:28 -0400
Subject: [PATCH 1372/1830] Build(deps): Bump excon from 0.72.0 to 0.73.0
 (#9228)

Bumps [excon](https://github.com/excon/excon) from 0.72.0 to 0.73.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.72.0...v0.73.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 26cce0e8f2..c04b8a25e1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -121,7 +121,7 @@ GEM
       railties (>= 3.1)
     ember-source (2.18.2)
     erubi (1.9.0)
-    excon (0.72.0)
+    excon (0.73.0)
     execjs (2.7.0)
     exifr (1.3.6)
     fabrication (2.21.1)

From a6189c507006f3edc8622e75ed48ea2bbd26f703 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Tue, 26 May 2020 22:01:44 +0530
Subject: [PATCH 1373/1830] Bump onebox version

- use oEmbed for Instagram onebox
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c04b8a25e1..292bc4c742 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -240,7 +240,7 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.9.28.1)
+    onebox (1.9.28.2)
       addressable (~> 2.7.0)
       htmlentities (~> 4.3)
       multi_json (~> 1.11)

From 7820686f7397ea946e16d94f63b679468cc1f7d5 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Tue, 26 May 2020 12:56:36 -0500
Subject: [PATCH 1374/1830] FIX: Wizard previews if color step is excluded
 (#9881)

---
 app/assets/javascripts/wizard/models/wizard.js |  2 +-
 app/serializers/wizard_serializer.rb           | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/wizard/models/wizard.js b/app/assets/javascripts/wizard/models/wizard.js
index e907687e11..69d166bf7a 100644
--- a/app/assets/javascripts/wizard/models/wizard.js
+++ b/app/assets/javascripts/wizard/models/wizard.js
@@ -28,7 +28,7 @@ const Wizard = EmberObject.extend({
   getCurrentColors(schemeId) {
     const colorStep = this.steps.findBy("id", "colors");
     if (!colorStep) {
-      return;
+      return this.current_color_scheme;
     }
 
     const themeChoice = colorStep.get("fieldsById.theme_previews");
diff --git a/app/serializers/wizard_serializer.rb b/app/serializers/wizard_serializer.rb
index d830ad7325..6ffe49a1f9 100644
--- a/app/serializers/wizard_serializer.rb
+++ b/app/serializers/wizard_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class WizardSerializer < ApplicationSerializer
-  attributes :start, :completed
+  attributes :start, :completed, :current_color_scheme
 
   has_many :steps, serializer: WizardStepSerializer, embed: :objects
 
@@ -12,4 +12,14 @@ class WizardSerializer < ApplicationSerializer
   def completed
     object.completed?
   end
+
+  def current_color_scheme
+    color_scheme = Theme.find(SiteSetting.default_theme_id).color_scheme
+    colors = color_scheme ? color_scheme.colors : ColorScheme.base_colors
+
+    # The frontend expects the color hexs to start with '#'
+    colors_with_hash = {}
+    colors.each { |color, hex| colors_with_hash[color] = "##{hex}" }
+    colors_with_hash
+  end
 end

From b1c726be0d33040d2aba0c39e8ea92ae2d86c024 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Tue, 26 May 2020 14:53:32 -0400
Subject: [PATCH 1375/1830] Remove support for FontAwesome 4.7 icon names
 (#9871)

---
 .../addon/lib/icon-library.js                 | 497 ------------------
 .../migrate/20200517140915_fa4_renames.json   |   0
 ...0517140915_update_deprecated_icon_names.rb |  32 ++
 lib/svg_sprite/svg_sprite.rb                  |  10 +-
 spec/components/svg_sprite/svg_sprite_spec.rb |  16 +-
 test/javascripts/lib/icon-library-test.js     |   8 -
 6 files changed, 36 insertions(+), 527 deletions(-)
 rename lib/svg_sprite/fa4-renames.json => db/migrate/20200517140915_fa4_renames.json (100%)
 create mode 100644 db/migrate/20200517140915_update_deprecated_icon_names.rb

diff --git a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js
index decc668180..ef60571cec 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js
@@ -1,8 +1,6 @@
 import I18n from "I18n";
 import { h } from "virtual-dom";
 import attributeHook from "discourse-common/lib/attribute-hook";
-import deprecated from "discourse-common/lib/deprecated";
-import jQuery from "jquery";
 
 const SVG_NAMESPACE = "http://www.w3.org/2000/svg";
 let _renderers = [];
@@ -43,474 +41,6 @@ const REPLACEMENTS = {
   "notification.membership_request_consolidated": "users"
 };
 
-// TODO: use lib/svg_sprite/fa4-renames.json here
-// Note: these should not be edited manually. They define the fa4-fa5 migration
-const fa4Replacements = {
-  "500px": "fab-500px",
-  "address-book-o": "far-address-book",
-  "address-card-o": "far-address-card",
-  adn: "fab-adn",
-  amazon: "fab-amazon",
-  android: "fab-android",
-  angellist: "fab-angellist",
-  apple: "fab-apple",
-  "area-chart": "chart-area",
-  "arrow-circle-o-down": "far-arrow-alt-circle-down",
-  "arrow-circle-o-left": "far-arrow-alt-circle-left",
-  "arrow-circle-o-right": "far-arrow-alt-circle-right",
-  "arrow-circle-o-up": "far-arrow-alt-circle-up",
-  arrows: "arrows-alt",
-  "arrows-alt": "expand-arrows-alt",
-  "arrows-h": "arrows-alt-h",
-  "arrows-v": "arrows-alt-v",
-  "asl-interpreting": "american-sign-language-interpreting",
-  automobile: "car",
-  bandcamp: "fab-bandcamp",
-  bank: "university",
-  "bar-chart": "far-chart-bar",
-  "bar-chart-o": "far-chart-bar",
-  bathtub: "bath",
-  battery: "battery-full",
-  "battery-0": "battery-empty",
-  "battery-1": "battery-quarter",
-  "battery-2": "battery-half",
-  "battery-3": "battery-three-quarters",
-  "battery-4": "battery-full",
-  behance: "fab-behance",
-  "behance-square": "fab-behance-square",
-  "bell-o": "far-bell",
-  "bell-slash-o": "far-bell-slash",
-  bitbucket: "fab-bitbucket",
-  "bitbucket-square": "fab-bitbucket",
-  bitcoin: "fab-btc",
-  "black-tie": "fab-black-tie",
-  bluetooth: "fab-bluetooth",
-  "bluetooth-b": "fab-bluetooth-b",
-  "bookmark-o": "far-bookmark",
-  btc: "fab-btc",
-  "building-o": "far-building",
-  buysellads: "fab-buysellads",
-  cab: "taxi",
-  calendar: "calendar-alt",
-  "calendar-check-o": "far-calendar-check",
-  "calendar-minus-o": "far-calendar-minus",
-  "calendar-o": "far-calendar",
-  "calendar-plus-o": "far-calendar-plus",
-  "calendar-times-o": "far-calendar-times",
-  "caret-square-o-down": "far-caret-square-down",
-  "caret-square-o-left": "far-caret-square-left",
-  "caret-square-o-right": "far-caret-square-right",
-  "caret-square-o-up": "far-caret-square-up",
-  cc: "far-closed-captioning",
-  "cc-amex": "fab-cc-amex",
-  "cc-diners-club": "fab-cc-diners-club",
-  "cc-discover": "fab-cc-discover",
-  "cc-jcb": "fab-cc-jcb",
-  "cc-mastercard": "fab-cc-mastercard",
-  "cc-paypal": "fab-cc-paypal",
-  "cc-stripe": "fab-cc-stripe",
-  "cc-visa": "fab-cc-visa",
-  chain: "link",
-  "chain-broken": "unlink",
-  "check-circle-o": "far-check-circle",
-  "check-square-o": "far-check-square",
-  chrome: "fab-chrome",
-  "circle-o": "far-circle",
-  "circle-o-notch": "circle-notch",
-  "circle-thin": "far-circle",
-  clipboard: "far-clipboard",
-  "clock-o": "far-clock",
-  clone: "far-clone",
-  close: "times",
-  "cloud-download": "cloud-download-alt",
-  "cloud-upload": "cloud-upload-alt",
-  cny: "yen-sign",
-  "code-fork": "code-branch",
-  codepen: "fab-codepen",
-  codiepie: "fab-codiepie",
-  "comment-o": "far-comment",
-  commenting: "far-comment-dots",
-  "commenting-o": "far-comment-dots",
-  "comments-o": "far-comments",
-  compass: "far-compass",
-  connectdevelop: "fab-connectdevelop",
-  contao: "fab-contao",
-  copyright: "far-copyright",
-  "creative-commons": "fab-creative-commons",
-  "credit-card": "far-credit-card",
-  "credit-card-alt": "credit-card",
-  css3: "fab-css3",
-  cutlery: "utensils",
-  dashboard: "tachometer-alt",
-  dashcube: "fab-dashcube",
-  deafness: "deaf",
-  dedent: "outdent",
-  delicious: "fab-delicious",
-  deviantart: "fab-deviantart",
-  diamond: "far-gem",
-  digg: "fab-digg",
-  discord: "fab-discord",
-  dollar: "dollar-sign",
-  "dot-circle-o": "far-dot-circle",
-  dribbble: "fab-dribbble",
-  "drivers-license": "id-card",
-  "drivers-license-o": "far-id-card",
-  dropbox: "fab-dropbox",
-  drupal: "fab-drupal",
-  edge: "fab-edge",
-  eercast: "fab-sellcast",
-  empire: "fab-empire",
-  "envelope-o": "far-envelope",
-  "envelope-open-o": "far-envelope-open",
-  envira: "fab-envira",
-  etsy: "fab-etsy",
-  eur: "euro-sign",
-  euro: "euro-sign",
-  exchange: "exchange-alt",
-  expeditedssl: "fab-expeditedssl",
-  "external-link": "external-link-alt",
-  "external-link-square": "external-link-square-alt",
-  eye: "far-eye",
-  "eye-slash": "far-eye-slash",
-  eyedropper: "eye-dropper",
-  fa: "fab-font-awesome",
-  facebook: "fab-facebook-f",
-  "facebook-f": "fab-facebook-f",
-  "facebook-official": "fab-facebook",
-  "facebook-square": "fab-facebook-square",
-  feed: "rss",
-  "file-archive-o": "far-file-archive",
-  "file-audio-o": "far-file-audio",
-  "file-code-o": "far-file-code",
-  "file-excel-o": "far-file-excel",
-  "file-image-o": "far-file-image",
-  "file-movie-o": "far-file-video",
-  "file-o": "far-file",
-  "file-pdf-o": "far-file-pdf",
-  "file-photo-o": "far-file-image",
-  "file-picture-o": "far-file-image",
-  "file-powerpoint-o": "far-file-powerpoint",
-  "file-sound-o": "far-file-audio",
-  "file-text": "file-alt",
-  "file-text-o": "far-file-alt",
-  "file-video-o": "far-file-video",
-  "file-word-o": "far-file-word",
-  "file-zip-o": "far-file-archive",
-  "files-o": "far-copy",
-  firefox: "fab-firefox",
-  "first-order": "fab-first-order",
-  "flag-o": "far-flag",
-  flash: "bolt",
-  flickr: "fab-flickr",
-  "floppy-o": "far-save",
-  "folder-o": "far-folder",
-  "folder-open-o": "far-folder-open",
-  "font-awesome": "fab-font-awesome",
-  fonticons: "fab-fonticons",
-  "fort-awesome": "fab-fort-awesome",
-  forumbee: "fab-forumbee",
-  foursquare: "fab-foursquare",
-  "free-code-camp": "fab-free-code-camp",
-  "frown-o": "far-frown",
-  "futbol-o": "far-futbol",
-  gbp: "pound-sign",
-  ge: "fab-empire",
-  gear: "cog",
-  gears: "cogs",
-  "get-pocket": "fab-get-pocket",
-  gg: "fab-gg",
-  "gg-circle": "fab-gg-circle",
-  git: "fab-git",
-  "git-square": "fab-git-square",
-  github: "fab-github",
-  "github-alt": "fab-github-alt",
-  "github-square": "fab-github-square",
-  gitlab: "fab-gitlab",
-  gittip: "fab-gratipay",
-  glass: "glass-martini",
-  glide: "fab-glide",
-  "glide-g": "fab-glide-g",
-  google: "fab-google",
-  "google-plus": "fab-google-plus-g",
-  "google-plus-circle": "fab-google-plus",
-  "google-plus-official": "fab-google-plus",
-  "google-plus-square": "fab-google-plus-square",
-  "google-wallet": "fab-google-wallet",
-  gratipay: "fab-gratipay",
-  grav: "fab-grav",
-  group: "users",
-  "hacker-news": "fab-hacker-news",
-  "hand-grab-o": "far-hand-rock",
-  "hand-lizard-o": "far-hand-lizard",
-  "hand-o-down": "far-hand-point-down",
-  "hand-o-left": "far-hand-point-left",
-  "hand-o-right": "far-hand-point-right",
-  "hand-o-up": "far-hand-point-up",
-  "hand-paper-o": "far-hand-paper",
-  "hand-peace-o": "far-hand-peace",
-  "hand-pointer-o": "far-hand-pointer",
-  "hand-rock-o": "far-hand-rock",
-  "hand-scissors-o": "far-hand-scissors",
-  "hand-spock-o": "far-hand-spock",
-  "hand-stop-o": "far-hand-paper",
-  "handshake-o": "far-handshake",
-  "hard-of-hearing": "deaf",
-  "hdd-o": "far-hdd",
-  header: "heading",
-  "heart-o": "far-heart",
-  "hospital-o": "far-hospital",
-  hotel: "bed",
-  "hourglass-1": "hourglass-start",
-  "hourglass-2": "hourglass-half",
-  "hourglass-3": "hourglass-end",
-  "hourglass-o": "far-hourglass",
-  houzz: "fab-houzz",
-  html5: "fab-html5",
-  "id-card-o": "far-id-card",
-  ils: "shekel-sign",
-  image: "far-image",
-  imdb: "fab-imdb",
-  inr: "rupee-sign",
-  instagram: "fab-instagram",
-  institution: "university",
-  "internet-explorer": "fab-internet-explorer",
-  intersex: "transgender",
-  ioxhost: "fab-ioxhost",
-  joomla: "fab-joomla",
-  jpy: "yen-sign",
-  jsfiddle: "fab-jsfiddle",
-  "keyboard-o": "far-keyboard",
-  krw: "won-sign",
-  lastfm: "fab-lastfm",
-  "lastfm-square": "fab-lastfm-square",
-  leanpub: "fab-leanpub",
-  legal: "gavel",
-  "lemon-o": "far-lemon",
-  "level-down": "level-down-alt",
-  "level-up": "level-up-alt",
-  "life-bouy": "far-life-ring",
-  "life-buoy": "far-life-ring",
-  "life-ring": "far-life-ring",
-  "life-saver": "far-life-ring",
-  "lightbulb-o": "far-lightbulb",
-  "line-chart": "chart-line",
-  linkedin: "fab-linkedin-in",
-  "linkedin-square": "fab-linkedin",
-  linode: "fab-linode",
-  linux: "fab-linux",
-  "list-alt": "far-list-alt",
-  "long-arrow-down": "long-arrow-alt-down",
-  "long-arrow-left": "long-arrow-alt-left",
-  "long-arrow-right": "long-arrow-alt-right",
-  "long-arrow-up": "long-arrow-alt-up",
-  "mail-forward": "share",
-  "mail-reply": "reply",
-  "mail-reply-all": "reply-all",
-  "map-marker": "map-marker-alt",
-  "map-o": "far-map",
-  maxcdn: "fab-maxcdn",
-  meanpath: "fab-font-awesome",
-  medium: "fab-medium",
-  meetup: "fab-meetup",
-  "meh-o": "far-meh",
-  "minus-square-o": "far-minus-square",
-  mixcloud: "fab-mixcloud",
-  mobile: "mobile-alt",
-  "mobile-phone": "mobile-alt",
-  modx: "fab-modx",
-  money: "far-money-bill-alt",
-  "moon-o": "far-moon",
-  "mortar-board": "graduation-cap",
-  navicon: "bars",
-  "newspaper-o": "far-newspaper",
-  "object-group": "far-object-group",
-  "object-ungroup": "far-object-ungroup",
-  odnoklassniki: "fab-odnoklassniki",
-  "odnoklassniki-square": "fab-odnoklassniki-square",
-  opencart: "fab-opencart",
-  openid: "fab-openid",
-  opera: "fab-opera",
-  "optin-monster": "fab-optin-monster",
-  pagelines: "fab-pagelines",
-  "paper-plane-o": "far-paper-plane",
-  paste: "far-clipboard",
-  patreon: "fab-patreon",
-  "pause-circle-o": "far-pause-circle",
-  paypal: "fab-paypal",
-  pencil: "pencil-alt",
-  "pencil-square": "pen-square",
-  "pencil-square-o": "far-edit",
-  photo: "far-image",
-  "picture-o": "far-image",
-  "pie-chart": "chart-pie",
-  "pied-piper": "fab-pied-piper",
-  "pied-piper-alt": "fab-pied-piper-alt",
-  "pied-piper-pp": "fab-pied-piper-pp",
-  pinterest: "fab-pinterest",
-  "pinterest-p": "fab-pinterest-p",
-  "pinterest-square": "fab-pinterest-square",
-  "play-circle-o": "far-play-circle",
-  "plus-square-o": "far-plus-square",
-  "product-hunt": "fab-product-hunt",
-  qq: "fab-qq",
-  "question-circle-o": "far-question-circle",
-  quora: "fab-quora",
-  ra: "fab-rebel",
-  ravelry: "fab-ravelry",
-  rebel: "fab-rebel",
-  reddit: "fab-reddit",
-  "reddit-alien": "fab-reddit-alien",
-  "reddit-square": "fab-reddit-square",
-  refresh: "sync",
-  registered: "far-registered",
-  remove: "times",
-  renren: "fab-renren",
-  reorder: "bars",
-  repeat: "redo",
-  resistance: "fab-rebel",
-  rmb: "yen-sign",
-  "rotate-left": "undo",
-  "rotate-right": "redo",
-  rouble: "ruble-sign",
-  rub: "ruble-sign",
-  ruble: "ruble-sign",
-  rupee: "rupee-sign",
-  s15: "bath",
-  safari: "fab-safari",
-  scissors: "cut",
-  scribd: "fab-scribd",
-  sellsy: "fab-sellsy",
-  send: "paper-plane",
-  "send-o": "far-paper-plane",
-  "share-square-o": "far-share-square",
-  shekel: "shekel-sign",
-  sheqel: "shekel-sign",
-  shield: "shield-alt",
-  shirtsinbulk: "fab-shirtsinbulk",
-  "sign-in": "sign-in-alt",
-  "sign-out": "sign-out-alt",
-  signing: "sign-language",
-  simplybuilt: "fab-simplybuilt",
-  skyatlas: "fab-skyatlas",
-  skype: "fab-skype",
-  slack: "fab-slack",
-  sliders: "sliders-h",
-  slideshare: "fab-slideshare",
-  "smile-o": "far-smile",
-  snapchat: "fab-snapchat",
-  "snapchat-ghost": "fab-snapchat-ghost",
-  "snapchat-square": "fab-snapchat-square",
-  "snowflake-o": "far-snowflake",
-  "soccer-ball-o": "far-futbol",
-  "sort-alpha-asc": "sort-alpha-down",
-  "sort-alpha-desc": "sort-alpha-up",
-  "sort-amount-asc": "sort-amount-down",
-  "sort-amount-desc": "sort-amount-up",
-  "sort-asc": "sort-up",
-  "sort-desc": "sort-down",
-  "sort-numeric-asc": "sort-numeric-down",
-  "sort-numeric-desc": "sort-numeric-up",
-  soundcloud: "fab-soundcloud",
-  spoon: "utensil-spoon",
-  spotify: "fab-spotify",
-  "square-o": "far-square",
-  "stack-exchange": "fab-stack-exchange",
-  "stack-overflow": "fab-stack-overflow",
-  "star-half-empty": "far-star-half",
-  "star-half-full": "far-star-half",
-  "star-half-o": "far-star-half",
-  "star-o": "far-star",
-  steam: "fab-steam",
-  "steam-square": "fab-steam-square",
-  "sticky-note-o": "far-sticky-note",
-  "stop-circle-o": "far-stop-circle",
-  stumbleupon: "fab-stumbleupon",
-  "stumbleupon-circle": "fab-stumbleupon-circle",
-  "sun-o": "far-sun",
-  superpowers: "fab-superpowers",
-  support: "far-life-ring",
-  tablet: "tablet-alt",
-  tachometer: "tachometer-alt",
-  telegram: "fab-telegram",
-  television: "tv",
-  "tencent-weibo": "fab-tencent-weibo",
-  themeisle: "fab-themeisle",
-  thermometer: "thermometer-full",
-  "thermometer-0": "thermometer-empty",
-  "thermometer-1": "thermometer-quarter",
-  "thermometer-2": "thermometer-half",
-  "thermometer-3": "thermometer-three-quarters",
-  "thermometer-4": "thermometer-full",
-  "thumb-tack": "thumbtack",
-  "thumbs-o-down": "far-thumbs-down",
-  "thumbs-o-up": "far-thumbs-up",
-  ticket: "ticket-alt",
-  "times-circle-o": "far-times-circle",
-  "times-rectangle": "window-close",
-  "times-rectangle-o": "far-window-close",
-  "toggle-down": "far-caret-square-down",
-  "toggle-left": "far-caret-square-left",
-  "toggle-right": "far-caret-square-right",
-  "toggle-up": "far-caret-square-up",
-  trash: "trash-alt",
-  "trash-o": "far-trash-alt",
-  trello: "fab-trello",
-  tripadvisor: "fab-tripadvisor",
-  try: "lira-sign",
-  tumblr: "fab-tumblr",
-  "tumblr-square": "fab-tumblr-square",
-  "turkish-lira": "lira-sign",
-  twitch: "fab-twitch",
-  twitter: "fab-twitter",
-  "twitter-square": "fab-twitter-square",
-  unsorted: "sort",
-  usb: "fab-usb",
-  usd: "dollar-sign",
-  "user-circle-o": "far-user-circle",
-  "user-o": "far-user",
-  vcard: "address-card",
-  "vcard-o": "far-address-card",
-  viacoin: "fab-viacoin",
-  viadeo: "fab-viadeo",
-  "viadeo-square": "fab-viadeo-square",
-  "video-camera": "video",
-  vimeo: "fab-vimeo-v",
-  "vimeo-square": "fab-vimeo-square",
-  vine: "fab-vine",
-  vk: "fab-vk",
-  vkontakte: "fab-vk",
-  "volume-control-phone": "phone-volume",
-  warning: "exclamation-triangle",
-  wechat: "fab-weixin",
-  weibo: "fab-weibo",
-  weixin: "fab-weixin",
-  whatsapp: "fab-whatsapp",
-  "wheelchair-alt": "fab-accessible-icon",
-  "wikipedia-w": "fab-wikipedia-w",
-  "window-close-o": "far-window-close",
-  "window-maximize": "far-window-maximize",
-  "window-restore": "far-window-restore",
-  windows: "fab-windows",
-  won: "won-sign",
-  wordpress: "fab-wordpress",
-  wpbeginner: "fab-wpbeginner",
-  wpexplorer: "fab-wpexplorer",
-  wpforms: "fab-wpforms",
-  xing: "fab-xing",
-  "xing-square": "fab-xing-square",
-  "y-combinator": "fab-y-combinator",
-  "y-combinator-square": "fab-hacker-news",
-  yahoo: "fab-yahoo",
-  yc: "fab-y-combinator",
-  "yc-square": "fab-hacker-news",
-  yelp: "fab-yelp",
-  yen: "yen-sign",
-  yoast: "fab-yoast",
-  youtube: "fab-youtube",
-  "youtube-play": "fab-youtube",
-  "youtube-square": "fab-youtube-square"
-};
-
 export function replaceIcon(source, destination) {
   REPLACEMENTS[source] = destination;
 }
@@ -584,36 +114,9 @@ function warnIfMissing(id) {
   }
 }
 
-const reportedIcons = [];
-
-function warnIfDeprecated(oldId, newId) {
-  deprecated(
-    `Please replace all occurrences of "${oldId}"" with "${newId}". FontAwesome 4.7 icon names are now deprecated and will be removed in the next release.`
-  );
-  if (!Discourse.testing && !reportedIcons.includes(oldId)) {
-    const errorData = {
-      message: `FA icon deprecation: replace "${oldId}"" with "${newId}".`,
-      stacktrace: Error().stack
-    };
-
-    jQuery.ajax(`${Discourse.BaseUri}/logs/report_js_error`, {
-      data: errorData,
-      type: "POST",
-      cache: false
-    });
-
-    reportedIcons.push(oldId);
-  }
-}
-
 function handleIconId(icon) {
   let id = icon.replacementId || icon.id || "";
 
-  if (fa4Replacements.hasOwnProperty(id)) {
-    warnIfDeprecated(id, fa4Replacements[id]);
-    id = fa4Replacements[id];
-  }
-
   // TODO: clean up "thumbtack unpinned" at source instead of here
   id = id.replace(" unpinned", "");
 
diff --git a/lib/svg_sprite/fa4-renames.json b/db/migrate/20200517140915_fa4_renames.json
similarity index 100%
rename from lib/svg_sprite/fa4-renames.json
rename to db/migrate/20200517140915_fa4_renames.json
diff --git a/db/migrate/20200517140915_update_deprecated_icon_names.rb b/db/migrate/20200517140915_update_deprecated_icon_names.rb
new file mode 100644
index 0000000000..74c07f7c6e
--- /dev/null
+++ b/db/migrate/20200517140915_update_deprecated_icon_names.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class UpdateDeprecatedIconNames < ActiveRecord::Migration[6.0]
+  def up
+    migrate_value("up")
+  end
+
+  def down
+    migrate_value("down")
+  end
+
+  def migrate_value(dir)
+    icons = File.open("#{Rails.root}/db/migrate/20200517140915_fa4_renames.json", "r:UTF-8") { |f| JSON.parse(f.read) }
+
+    icons.each do |key, value|
+      from = dir == "up" ? key : value
+      to = dir == "up" ? value : key
+      execute <<~SQL
+        UPDATE badges
+        SET icon = '#{to}'
+        WHERE icon = '#{from}' OR icon = 'fa-#{from}'
+      SQL
+
+      execute <<~SQL
+        UPDATE groups
+        SET flair_icon = '#{to}'
+        WHERE flair_icon = '#{from}' OR flair_icon = 'fa-#{from}'
+      SQL
+
+    end
+  end
+end
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index 90571781d1..e91acfe138 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -421,18 +421,10 @@ License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL
     icons
   end
 
-  def self.fa4_shim_file
-    "#{Rails.root}/lib/svg_sprite/fa4-renames.json"
-  end
-
-  def self.fa4_to_fa5_names
-    @db ||= File.open(fa4_shim_file, "r:UTF-8") { |f| JSON.parse(f.read) }
-  end
-
   def self.process(icon_name)
     icon_name = icon_name.strip
     FA_ICON_MAP.each { |k, v| icon_name = icon_name.sub(k, v) }
-    fa4_to_fa5_names[icon_name] || icon_name
+    icon_name
   end
 
   def self.get_set_cache(key)
diff --git a/spec/components/svg_sprite/svg_sprite_spec.rb b/spec/components/svg_sprite/svg_sprite_spec.rb
index 4a3100a5aa..298a06dd7b 100644
--- a/spec/components/svg_sprite/svg_sprite_spec.rb
+++ b/spec/components/svg_sprite/svg_sprite_spec.rb
@@ -86,11 +86,6 @@ describe SvgSprite do
     expect(SvgSprite.all_icons).not_to include("  fab-facebook-messenger  ")
   end
 
-  it 'includes Font Awesome 4.7 icons from badges' do
-    Fabricate(:badge, name: 'Custom Icon Badge', icon: 'fa-gamepad')
-    expect(SvgSprite.all_icons).to include("gamepad")
-  end
-
   it 'includes Font Awesome 5 icons from badges' do
     Fabricate(:badge, name: 'Custom Icon Badge', icon: 'far fa-building')
     expect(SvgSprite.all_icons).to include("far-building")
@@ -215,13 +210,8 @@ describe SvgSprite do
     expect(SvgSprite.all_icons).to include("fab-bandcamp")
   end
 
-  it "includes Font Awesome 4.7 icons as group flair" do
-    group = Fabricate(:group, flair_icon: "fa-air-freshener")
-    expect(SvgSprite.bundle).to match(/air-freshener/)
-  end
-
-  it "includes Font Awesome 5 icons as group flair" do
-    group = Fabricate(:group, flair_icon: "far fa-building")
-    expect(SvgSprite.bundle).to match(/building/)
+  it "includes Font Awesome icon from groups" do
+    group = Fabricate(:group, flair_icon: "far-building")
+    expect(SvgSprite.bundle).to match(/far-building/)
   end
 end
diff --git a/test/javascripts/lib/icon-library-test.js b/test/javascripts/lib/icon-library-test.js
index 02055d2e0f..cf59cb7037 100644
--- a/test/javascripts/lib/icon-library-test.js
+++ b/test/javascripts/lib/icon-library-test.js
@@ -18,14 +18,6 @@ QUnit.test("return icon markup", assert => {
 });
 
 QUnit.test("convert icon names", assert => {
-  const fa47Icon = convertIconClass("fa-clock-o");
-  assert.ok(iconHTML(fa47Icon).indexOf("far-clock") > -1, "FA 4.7 syntax");
-
-  assert.ok(
-    iconHTML("area-chart").indexOf("chart-area") > -1,
-    "renamed FA 4.7 icons"
-  );
-
   const fa5Icon = convertIconClass("fab fa-facebook");
   assert.ok(iconHTML(fa5Icon).indexOf("fab-facebook") > -1, "FA 5 syntax");
 

From 2c880b9bf92a1efede9b8516ab9019358a01e879 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Tue, 26 May 2020 16:08:35 -0400
Subject: [PATCH 1376/1830] FIX: wizard fails to start when default_theme_id is
 -1

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

diff --git a/app/serializers/wizard_serializer.rb b/app/serializers/wizard_serializer.rb
index 6ffe49a1f9..76990716e2 100644
--- a/app/serializers/wizard_serializer.rb
+++ b/app/serializers/wizard_serializer.rb
@@ -14,7 +14,7 @@ class WizardSerializer < ApplicationSerializer
   end
 
   def current_color_scheme
-    color_scheme = Theme.find(SiteSetting.default_theme_id).color_scheme
+    color_scheme = Theme.where(id: SiteSetting.default_theme_id).first&.color_scheme
     colors = color_scheme ? color_scheme.colors : ColorScheme.base_colors
 
     # The frontend expects the color hexs to start with '#'

From 349a67bee60aea8a6e6a1bb924b13d7e7b954a9b Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 27 May 2020 08:13:47 +1000
Subject: [PATCH 1377/1830] FEATURE: notify admins about old credentials
 (#9854)

* FEATURE: notify admins about old credentials

Security and API keys should be renewed periodically.
This additional notification should help admins keep their Discourse safe and secure.
---
 app/jobs/scheduled/old_keys_reminder.rb | 62 +++++++++++++++++++++++++
 config/locales/server.en.yml            | 10 ++++
 config/site_settings.yml                |  8 ++++
 spec/jobs/old_keys_reminder_spec.rb     | 55 ++++++++++++++++++++++
 4 files changed, 135 insertions(+)
 create mode 100644 app/jobs/scheduled/old_keys_reminder.rb
 create mode 100644 spec/jobs/old_keys_reminder_spec.rb

diff --git a/app/jobs/scheduled/old_keys_reminder.rb b/app/jobs/scheduled/old_keys_reminder.rb
new file mode 100644
index 0000000000..4355a04366
--- /dev/null
+++ b/app/jobs/scheduled/old_keys_reminder.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Jobs
+  class OldKeysReminder < ::Jobs::Scheduled
+    every 1.month
+
+    def execute(_args)
+      return if SiteSetting.notify_about_secrets_older_than == 'never'
+      return if old_site_settings_keys.blank? && old_api_keys.blank?
+      admins.each do |admin|
+        PostCreator.create!(
+          Discourse.system_user,
+          title: title,
+          raw: body,
+          archetype: Archetype.private_message,
+          target_usernames: admin.username,
+          validate: false
+        )
+      end
+    end
+
+    private
+
+    def old_site_settings_keys
+      @old_site_settings_keys ||= SiteSetting.secret_settings.each_with_object([]) do |secret_name, old_keys|
+        site_setting = SiteSetting.find_by(name: secret_name)
+        next if site_setting&.value.blank?
+        next if site_setting.updated_at + calculate_period > Time.zone.now
+        old_keys << site_setting
+      end.sort_by { |key| key.updated_at }
+    end
+
+    def old_api_keys
+      @old_api_keys ||= ApiKey.all.order(created_at: :asc).each_with_object([]) do |api_key, old_keys|
+        next if api_key.created_at + calculate_period > Time.zone.now
+        old_keys << api_key
+      end
+    end
+
+    def calculate_period
+      SiteSetting.notify_about_secrets_older_than.to_i.years
+    end
+
+    def admins
+      User.real.admins
+    end
+
+    def title
+      I18n.t('old_keys_reminder.title', keys_count: old_site_settings_keys.count + old_api_keys.count)
+    end
+
+    def body
+      I18n.t('old_keys_reminder.body', keys: keys_list)
+    end
+
+    def keys_list
+      messages = old_site_settings_keys.map { |key| "#{key.name} - #{key.updated_at}" }
+      old_api_keys.each_with_object(messages) { |key, array| array << "#{[key.description, key.user&.username, key.created_at].compact.join(" - ")}" }
+      messages.join("\n")
+    end
+  end
+end
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 0433fd08b5..e9918e2f49 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1583,6 +1583,7 @@ en:
     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)"
+    notify_about_secrets_older_than: "Notify about credentials older than"
 
     email_token_valid_hours: "Forgot password / activate account tokens are valid for (n) hours."
 
@@ -4817,3 +4818,12 @@ en:
 
   discord:
     not_in_allowed_guild: "Authentication failed. You are not a member of a permitted Discord guild."
+
+  old_keys_reminder:
+    title: "You have %{keys_count} old credentials"
+    body: |
+      We have detected you have the following credentials that are 2 years or older
+
+      %{keys}
+
+      These credentials are sensitive and we recommend resetting them every 2 years to avoid impact of any future data breaches
diff --git a/config/site_settings.yml b/config/site_settings.yml
index cfeb71108e..265a9977a5 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1458,6 +1458,14 @@ security:
   allow_embedding_site_in_an_iframe:
     default: false
     hidden: true
+  notify_about_secrets_older_than:
+    default: "2 years"
+    type: enum
+    choices:
+      - never
+      - "1 year"
+      - "2 years"
+      - "3 years"
 
 onebox:
   enable_flash_video_onebox: false
diff --git a/spec/jobs/old_keys_reminder_spec.rb b/spec/jobs/old_keys_reminder_spec.rb
new file mode 100644
index 0000000000..850aea2cd6
--- /dev/null
+++ b/spec/jobs/old_keys_reminder_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Jobs::OldKeysReminder do
+  let!(:google_secret) { SiteSetting.create!(name: 'google_oauth2_client_secret', value: '123', data_type: 1) }
+  let!(:instagram_secret) { SiteSetting.create!(name: 'instagram_consumer_secret', value: '123', data_type: 1) }
+  let!(:api_key) { Fabricate(:api_key, description: 'api key description') }
+  let!(:admin) { Fabricate(:admin) }
+
+  let!(:recent_twitter_secret) { SiteSetting.create!(name: 'twitter_consumer_secret', value: '123', data_type: 1, updated_at: 2.years.from_now) }
+  let!(:recent_api_key) { Fabricate(:api_key, description: 'recent api key description', created_at: 2.years.from_now) }
+
+  it 'sends message to admin with old credentials' do
+    freeze_time 2.years.from_now
+    expect { described_class.new.execute({}) }.to change { Post.count }.by(1)
+    post = Post.last
+    expect(post.archetype).to eq(Archetype.private_message)
+    expect(post.topic.topic_allowed_users.map(&:user_id).sort).to eq([Discourse.system_user.id, admin.id].sort)
+    expect(post.topic.title).to eq("You have 3 old credentials")
+    expect(post.raw).to eq(<<-MSG.rstrip)
+We have detected you have the following credentials that are 2 years or older
+
+google_oauth2_client_secret - #{google_secret.updated_at}
+instagram_consumer_secret - #{instagram_secret.updated_at}
+api key description - #{api_key.created_at}
+
+These credentials are sensitive and we recommend resetting them every 2 years to avoid impact of any future data breaches
+    MSG
+
+    freeze_time 4.years.from_now
+    described_class.new.execute({})
+    post = Post.last
+    expect(post.topic.title).to eq("You have 5 old credentials")
+    expect(post.raw).to eq(<<-MSG.rstrip)
+We have detected you have the following credentials that are 2 years or older
+
+google_oauth2_client_secret - #{google_secret.updated_at}
+instagram_consumer_secret - #{instagram_secret.updated_at}
+twitter_consumer_secret - #{recent_twitter_secret.updated_at}
+api key description - #{api_key.created_at}
+recent api key description - #{recent_api_key.created_at}
+
+These credentials are sensitive and we recommend resetting them every 2 years to avoid impact of any future data breaches
+    MSG
+  end
+
+  it 'does not send message when notification set to never or no old keys' do
+    SiteSetting.notify_about_secrets_older_than = "never"
+    freeze_time 2.years.from_now
+    expect { described_class.new.execute({}) }.to change { Post.count }.by(0)
+    SiteSetting.notify_about_secrets_older_than = "3 years"
+    expect { described_class.new.execute({}) }.to change { Post.count }.by(0)
+  end
+end

From 5f61deff805c940e217c5edf9cda6d6dffea15c6 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Tue, 26 May 2020 17:48:35 -0500
Subject: [PATCH 1378/1830] FIX: updates variables for HTML to use `em` instead
 of `px` in font-size (#9883)

---
 app/assets/stylesheets/common/foundation/variables.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index 22da7ac9bc..961a7f181c 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -35,10 +35,10 @@ $bronze: #cd7f32 !default;
 // Fonts
 // --------------------------------------------------
 
-$base-font-size-smaller: 14px !default;
-$base-font-size: 15px !default;
-$base-font-size-larger: 17px !default;
-$base-font-size-largest: 19px !default;
+$base-font-size-smaller: 0.875em !default; // eq. to 14px
+$base-font-size: 0.938em !default; // eq. to 15px
+$base-font-size-larger: 1.063em !default; // eq. to 17px
+$base-font-size-largest: 1.118em !default; // eq. to 19px
 $base-font-family: Helvetica, Arial, sans-serif !default;
 
 // Font-size defintions, multiplier ^ (step / interval)

From 66ec634cb3f325e75ac6f0149f4befd7aa405a99 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 26 May 2020 19:17:09 -0400
Subject: [PATCH 1379/1830] Composer whisper icon missing margin when editing
 replies

---
 app/assets/stylesheets/common/base/compose.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 4d02ef28c6..9c8864333a 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -166,7 +166,7 @@
   }
 
   .whisper {
-    margin-right: 0.25em;
+    margin: 0 0.25em;
   }
 
   .unlist {

From 34e5f0a9a34b1d5176a4554241a7611ad350d0a6 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 27 May 2020 09:52:53 +1000
Subject: [PATCH 1380/1830] Revert "FEATURE: notify admins about old
 credentials (#9854)" (#9886)

This reverts commit 349a67bee60aea8a6e6a1bb924b13d7e7b954a9b.
---
 app/jobs/scheduled/old_keys_reminder.rb | 62 -------------------------
 config/locales/server.en.yml            | 10 ----
 config/site_settings.yml                |  8 ----
 spec/jobs/old_keys_reminder_spec.rb     | 55 ----------------------
 4 files changed, 135 deletions(-)
 delete mode 100644 app/jobs/scheduled/old_keys_reminder.rb
 delete mode 100644 spec/jobs/old_keys_reminder_spec.rb

diff --git a/app/jobs/scheduled/old_keys_reminder.rb b/app/jobs/scheduled/old_keys_reminder.rb
deleted file mode 100644
index 4355a04366..0000000000
--- a/app/jobs/scheduled/old_keys_reminder.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class OldKeysReminder < ::Jobs::Scheduled
-    every 1.month
-
-    def execute(_args)
-      return if SiteSetting.notify_about_secrets_older_than == 'never'
-      return if old_site_settings_keys.blank? && old_api_keys.blank?
-      admins.each do |admin|
-        PostCreator.create!(
-          Discourse.system_user,
-          title: title,
-          raw: body,
-          archetype: Archetype.private_message,
-          target_usernames: admin.username,
-          validate: false
-        )
-      end
-    end
-
-    private
-
-    def old_site_settings_keys
-      @old_site_settings_keys ||= SiteSetting.secret_settings.each_with_object([]) do |secret_name, old_keys|
-        site_setting = SiteSetting.find_by(name: secret_name)
-        next if site_setting&.value.blank?
-        next if site_setting.updated_at + calculate_period > Time.zone.now
-        old_keys << site_setting
-      end.sort_by { |key| key.updated_at }
-    end
-
-    def old_api_keys
-      @old_api_keys ||= ApiKey.all.order(created_at: :asc).each_with_object([]) do |api_key, old_keys|
-        next if api_key.created_at + calculate_period > Time.zone.now
-        old_keys << api_key
-      end
-    end
-
-    def calculate_period
-      SiteSetting.notify_about_secrets_older_than.to_i.years
-    end
-
-    def admins
-      User.real.admins
-    end
-
-    def title
-      I18n.t('old_keys_reminder.title', keys_count: old_site_settings_keys.count + old_api_keys.count)
-    end
-
-    def body
-      I18n.t('old_keys_reminder.body', keys: keys_list)
-    end
-
-    def keys_list
-      messages = old_site_settings_keys.map { |key| "#{key.name} - #{key.updated_at}" }
-      old_api_keys.each_with_object(messages) { |key, array| array << "#{[key.description, key.user&.username, key.created_at].compact.join(" - ")}" }
-      messages.join("\n")
-    end
-  end
-end
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index e9918e2f49..0433fd08b5 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1583,7 +1583,6 @@ en:
     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)"
-    notify_about_secrets_older_than: "Notify about credentials older than"
 
     email_token_valid_hours: "Forgot password / activate account tokens are valid for (n) hours."
 
@@ -4818,12 +4817,3 @@ en:
 
   discord:
     not_in_allowed_guild: "Authentication failed. You are not a member of a permitted Discord guild."
-
-  old_keys_reminder:
-    title: "You have %{keys_count} old credentials"
-    body: |
-      We have detected you have the following credentials that are 2 years or older
-
-      %{keys}
-
-      These credentials are sensitive and we recommend resetting them every 2 years to avoid impact of any future data breaches
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 265a9977a5..cfeb71108e 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1458,14 +1458,6 @@ security:
   allow_embedding_site_in_an_iframe:
     default: false
     hidden: true
-  notify_about_secrets_older_than:
-    default: "2 years"
-    type: enum
-    choices:
-      - never
-      - "1 year"
-      - "2 years"
-      - "3 years"
 
 onebox:
   enable_flash_video_onebox: false
diff --git a/spec/jobs/old_keys_reminder_spec.rb b/spec/jobs/old_keys_reminder_spec.rb
deleted file mode 100644
index 850aea2cd6..0000000000
--- a/spec/jobs/old_keys_reminder_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-
-describe Jobs::OldKeysReminder do
-  let!(:google_secret) { SiteSetting.create!(name: 'google_oauth2_client_secret', value: '123', data_type: 1) }
-  let!(:instagram_secret) { SiteSetting.create!(name: 'instagram_consumer_secret', value: '123', data_type: 1) }
-  let!(:api_key) { Fabricate(:api_key, description: 'api key description') }
-  let!(:admin) { Fabricate(:admin) }
-
-  let!(:recent_twitter_secret) { SiteSetting.create!(name: 'twitter_consumer_secret', value: '123', data_type: 1, updated_at: 2.years.from_now) }
-  let!(:recent_api_key) { Fabricate(:api_key, description: 'recent api key description', created_at: 2.years.from_now) }
-
-  it 'sends message to admin with old credentials' do
-    freeze_time 2.years.from_now
-    expect { described_class.new.execute({}) }.to change { Post.count }.by(1)
-    post = Post.last
-    expect(post.archetype).to eq(Archetype.private_message)
-    expect(post.topic.topic_allowed_users.map(&:user_id).sort).to eq([Discourse.system_user.id, admin.id].sort)
-    expect(post.topic.title).to eq("You have 3 old credentials")
-    expect(post.raw).to eq(<<-MSG.rstrip)
-We have detected you have the following credentials that are 2 years or older
-
-google_oauth2_client_secret - #{google_secret.updated_at}
-instagram_consumer_secret - #{instagram_secret.updated_at}
-api key description - #{api_key.created_at}
-
-These credentials are sensitive and we recommend resetting them every 2 years to avoid impact of any future data breaches
-    MSG
-
-    freeze_time 4.years.from_now
-    described_class.new.execute({})
-    post = Post.last
-    expect(post.topic.title).to eq("You have 5 old credentials")
-    expect(post.raw).to eq(<<-MSG.rstrip)
-We have detected you have the following credentials that are 2 years or older
-
-google_oauth2_client_secret - #{google_secret.updated_at}
-instagram_consumer_secret - #{instagram_secret.updated_at}
-twitter_consumer_secret - #{recent_twitter_secret.updated_at}
-api key description - #{api_key.created_at}
-recent api key description - #{recent_api_key.created_at}
-
-These credentials are sensitive and we recommend resetting them every 2 years to avoid impact of any future data breaches
-    MSG
-  end
-
-  it 'does not send message when notification set to never or no old keys' do
-    SiteSetting.notify_about_secrets_older_than = "never"
-    freeze_time 2.years.from_now
-    expect { described_class.new.execute({}) }.to change { Post.count }.by(0)
-    SiteSetting.notify_about_secrets_older_than = "3 years"
-    expect { described_class.new.execute({}) }.to change { Post.count }.by(0)
-  end
-end

From 2d534bf2e0a835ba04163ebec3d3ba9d4d365ab6 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 27 May 2020 10:05:06 +1000
Subject: [PATCH 1381/1830] FIX: Pass current_user to TopicQuery in for
 categories_and_top_topics (#9885)

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

diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 8fc6ad79bf..20e02ab061 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -57,7 +57,7 @@ class CategoriesController < ApplicationController
           @topic_list = TopicQuery.new(current_user, topic_options).list_latest
           @topic_list.more_topics_url = url_for(public_send("latest_path"))
         elsif style == "categories_and_top_topics"
-          @topic_list = TopicQuery.new(nil, topic_options).list_top_for(SiteSetting.top_page_default_timeframe.to_sym)
+          @topic_list = TopicQuery.new(current_user, topic_options).list_top_for(SiteSetting.top_page_default_timeframe.to_sym)
           @topic_list.more_topics_url = url_for(public_send("top_path"))
         end
 

From 5bfb6830c9724cca719095b368aa9bf714098cb9 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 27 May 2020 10:58:22 +1000
Subject: [PATCH 1382/1830] SECURITY: missing security check prior to redirect

In some rare cases, if a user knows the exact title of a topic
they could possibly determine that it really exists in the system
---
 app/controllers/topics_controller.rb    |  2 ++
 spec/requests/topics_controller_spec.rb | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 211e94ce8d..bca0bde2de 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -945,6 +945,8 @@ class TopicsController < ApplicationController
   end
 
   def redirect_to_correct_topic(topic, post_number = nil)
+    guardian.ensure_can_see!(topic)
+
     url = topic.relative_url
     url << "/#{post_number}" if post_number.to_i > 0
     url << ".json" if request.format.json?
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 9649f57f5b..bc80fa9283 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -1357,6 +1357,17 @@ RSpec.describe TopicsController do
       expect(response).to redirect_to(topic.relative_url)
     end
 
+    it 'will return a 403 if you try to redirect to a topic you have no access to' do
+      category = Fabricate(:category)
+      category.set_permissions(Group::AUTO_GROUPS[:staff] => :full)
+      category.save!
+
+      topic.update!(category_id: category.id)
+      get "/t/#{topic.slug}"
+
+      expect(response.status).to eq(403)
+    end
+
     it 'can find a topic when a slug has a number in front' do
       another_topic = Fabricate(:post).topic
 

From 63b31559832e089048206c1070c393328ad1f645 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 27 May 2020 08:38:16 +0530
Subject: [PATCH 1383/1830] Build(deps): Bump onebox from 1.9.28.2 to 1.9.28.3
 (#9887)

Bumps [onebox](https://github.com/discourse/onebox) from 1.9.28.2 to 1.9.28.3.
- [Release notes](https://github.com/discourse/onebox/releases)
- [Changelog](https://github.com/discourse/onebox/blob/master/CHANGELOG.md)
- [Commits](https://github.com/discourse/onebox/compare/v1.9.28.2...v1.9.28.3)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 292bc4c742..967f197bf7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -240,7 +240,7 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.9.28.2)
+    onebox (1.9.28.3)
       addressable (~> 2.7.0)
       htmlentities (~> 4.3)
       multi_json (~> 1.11)

From f41fcad6c333e25f82bfa3634ec95d122721c541 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 27 May 2020 18:16:48 +1000
Subject: [PATCH 1384/1830] FIX: opening cancel draft dialog broke autosave

cancelComposer would leak a promise that never got resolved if
you aborted cancelling a composer.

This change ensured the promise will always be resolved
---
 .../discourse/app/controllers/composer.js     | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index f76b948f8c..41fb94c910 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -1043,8 +1043,8 @@ export default Controller.extend({
               if (differentDraft) {
                 this.model.clearState();
                 this.close();
-                resolve();
               }
+              resolve();
             }
           },
           {
@@ -1052,22 +1052,30 @@ export default Controller.extend({
             class: "btn-danger",
             callback: result => {
               if (result) {
-                this.destroyDraft().then(() => {
-                  this.model.clearState();
-                  this.close();
-                  resolve();
-                });
+                this.destroyDraft()
+                  .then(() => {
+                    this.model.clearState();
+                    this.close();
+                  })
+                  .finally(() => {
+                    resolve();
+                  });
+              } else {
+                resolve();
               }
             }
           }
         ]);
       } else {
         // it is possible there is some sort of crazy draft with no body ... just give up on it
-        this.destroyDraft().then(() => {
-          this.model.clearState();
-          this.close();
-          resolve();
-        });
+        this.destroyDraft()
+          .then(() => {
+            this.model.clearState();
+            this.close();
+          })
+          .finally(() => {
+            resolve();
+          });
       }
     });
 

From 1cf2d1f9f217a4abf342b3c8dca640fd766baefe Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 27 May 2020 18:46:19 +1000
Subject: [PATCH 1385/1830] FIX: when destroying a draft always ensure saving
 is done

There was a race condition where drafts could be either saving
or queued to be saved and a user canceled draft leading to destroying
it.

This cancels debounce save and waits for save in the pipeline to
be over prior to firing off a DELETE on the draft
---
 .../discourse/app/controllers/composer.js       | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index 41fb94c910..d030c88c3a 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -1,7 +1,7 @@
 import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { and, or, alias, reads } from "@ember/object/computed";
-import { debounce } from "@ember/runloop";
+import { cancel, debounce } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -982,6 +982,10 @@ export default Controller.extend({
         this.send("clearTopicDraft");
       }
 
+      if (this._saveDraftPromise) {
+        return this._saveDraftPromise.then(() => this.destroyDraft());
+      }
+
       return Draft.clear(key, this.get("model.draftSequence")).then(() =>
         this.appEvents.trigger("draft:destroyed", key)
       );
@@ -1028,6 +1032,10 @@ export default Controller.extend({
   cancelComposer(differentDraft = false) {
     this.skipAutoSave = true;
 
+    if (this._saveDraftDebounce) {
+      cancel(this._saveDraftDebounce);
+    }
+
     const keyPrefix =
       this.model.action === "edit" ? "post.abandon_edit" : "post.abandon";
 
@@ -1102,11 +1110,12 @@ export default Controller.extend({
         // in test debounce is Ember.run, this will cause
         // an infinite loop
         if (ENV.environment !== "test") {
-          debounce(this, this._saveDraft, 2000);
+          this._saveDraftDebounce = debounce(this, this._saveDraft, 2000);
         }
       } else {
-        model.saveDraft().finally(() => {
+        this._saveDraftPromise = model.saveDraft().finally(() => {
           this._lastDraftSaved = Date.now();
+          this._saveDraftPromise = null;
         });
       }
     }
@@ -1127,7 +1136,7 @@ export default Controller.extend({
       if (Date.now() - this._lastDraftSaved > 15000) {
         this._saveDraft();
       } else {
-        debounce(this, this._saveDraft, 2000);
+        this._saveDraftDebounce = debounce(this, this._saveDraft, 2000);
       }
     }
   },

From 1d685c22af5e45adc334d5c683178b324f3cb415 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 27 May 2020 12:08:24 +0200
Subject: [PATCH 1386/1830] REVERT: removes translate_emoji (#9889)

This API is actually used in some plugins.
---
 app/models/emoji.rb    |  2 +-
 lib/plugin/instance.rb | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index 7222cafebc..cfd121b76e 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -126,7 +126,7 @@ class Emoji
   end
 
   def self.load_translations
-    db["translations"]
+    db["translations"].merge(Plugin::CustomEmoji.translations)
   end
 
   def self.base_directory
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 0390216ebe..7d48dbbdde 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -30,6 +30,15 @@ class Plugin::CustomEmoji
   def self.unregister(name, group = Emoji::DEFAULT_GROUP)
     emojis[group].delete(name)
   end
+
+  def self.translations
+    @@translations ||= {}
+  end
+
+  def self.translate(from, to)
+    @@cache_key = Digest::SHA1.hexdigest(cache_key + from)[0..10]
+    translations[from] = to
+  end
 end
 
 class Plugin::Instance
@@ -487,6 +496,10 @@ class Plugin::Instance
     Emoji.clear_cache
   end
 
+  def translate_emoji(from, to)
+    Plugin::CustomEmoji.translate(from, to)
+  end
+
   def automatic_assets
     css = styles.join("\n")
     js = javascripts.join("\n")

From f51093dde755737657013f185ff576c87dab0f3b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 27 May 2020 12:10:27 +0200
Subject: [PATCH 1387/1830] FIX: correctly set values and defaults for
 group-form-interaction-fields (#9891)

---
 .../components/groups-form-interaction-fields.js | 16 ++++++++++++++++
 .../groups-form-interaction-fields.hbs           | 15 ++++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js b/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js
index 9f20ed3101..d241176c38 100644
--- a/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js
+++ b/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js
@@ -1,5 +1,6 @@
 import I18n from "I18n";
 import Component from "@ember/component";
+import { or } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
@@ -47,6 +48,21 @@ export default Component.extend({
     ];
   },
 
+  membersVisibilityLevel: or(
+    "model.members_visibility_level",
+    "visibilityLevelOptions.firstObject.value"
+  ),
+
+  messageableLevel: or(
+    "model.messageable_level",
+    "aliasLevelOptions.firstObject.value"
+  ),
+
+  mentionableLevel: or(
+    "model.mentionable_level",
+    "aliasLevelOptions.firstObject.value"
+  ),
+
   @discourseComputed(
     "siteSettings.email_in",
     "model.automatic",
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs
index 1a2c473824..07cf33c540 100644
--- a/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs
@@ -22,11 +22,12 @@
     <label for="visiblity">{{i18n "admin.groups.manage.interaction.members_visibility_levels.title"}}</label>
 
     {{combo-box name="alias"
-        valueProperty="value"
-        value=model.members_visibility_level
-        content=visibilityLevelOptions
-        castInteger=true
-        class="groups-form-members-visibility-level"}}
+      valueProperty="value"
+      value=membersVisibilityLevel
+      content=visibilityLevelOptions
+      class="groups-form-members-visibility-level"
+      onChange=(action (mut model.members_visibility_level))
+    }}
 
     <div class="control-instructions">
       {{i18n "admin.groups.manage.interaction.members_visibility_levels.description"}}
@@ -41,7 +42,7 @@
   {{combo-box
     name="alias"
     valueProperty="value"
-    value=model.mentionable_level
+    value=mentionableLevel
     content=aliasLevelOptions
     class="groups-form-mentionable-level"
     onChange=(action (mut model.mentionable_level))
@@ -54,7 +55,7 @@
   {{combo-box
     name="alias"
     valueProperty="value"
-    value=model.messageable_level
+    value=messageableLevel
     content=aliasLevelOptions
     class="groups-form-messageable-level"
     onChange=(action (mut model.messageable_level))

From 2152e70e0d817fe822f1f0e6ae97c1950a56fa78 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 27 May 2020 19:05:24 +0530
Subject: [PATCH 1388/1830] DEV: annotate models

---
 app/models/bookmark.rb           |  8 +-------
 app/models/category.rb           |  1 +
 app/models/group.rb              |  5 +++--
 app/models/theme_modifier_set.rb | 12 ++++++------
 app/models/topic_custom_field.rb |  1 -
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index 3125f8f9fe..c90af0f147 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -90,7 +90,7 @@ end
 #  updated_at                :datetime         not null
 #  reminder_last_sent_at     :datetime
 #  reminder_set_at           :datetime
-#  delete_when_reminder_sent :boolean          default(FALSE)
+#  delete_when_reminder_sent :boolean          default(FALSE), not null
 #
 # Indexes
 #
@@ -102,9 +102,3 @@ end
 #  index_bookmarks_on_user_id              (user_id)
 #  index_bookmarks_on_user_id_and_post_id  (user_id,post_id) UNIQUE
 #
-# Foreign Keys
-#
-#  fk_rails_...  (post_id => posts.id)
-#  fk_rails_...  (topic_id => topics.id)
-#  fk_rails_...  (user_id => users.id)
-#
diff --git a/app/models/category.rb b/app/models/category.rb
index 6ecfe9d3af..d6375eb714 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -972,6 +972,7 @@ end
 #  required_tag_group_id             :integer
 #  min_tags_from_required_group      :integer          default(1), not null
 #  read_only_banner                  :string
+#  default_list_filter               :string(20)       default("all")
 #
 # Indexes
 #
diff --git a/app/models/group.rb b/app/models/group.rb
index 89ce80bbf4..d99fb25721 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -923,7 +923,6 @@ end
 #  grant_trust_level                  :integer
 #  incoming_email                     :string
 #  has_messages                       :boolean          default(FALSE), not null
-#  flair_url                          :string
 #  flair_bg_color                     :string
 #  flair_color                        :string
 #  bio_raw                            :text
@@ -934,11 +933,13 @@ end
 #  visibility_level                   :integer          default(0), not null
 #  public_exit                        :boolean          default(FALSE), not null
 #  public_admission                   :boolean          default(FALSE), not null
-#  publish_read_state                 :boolean          default(FALSE), not null
 #  membership_request_template        :text
 #  messageable_level                  :integer          default(0)
 #  mentionable_level                  :integer          default(0)
+#  publish_read_state                 :boolean          default(FALSE), not null
 #  members_visibility_level           :integer          default(0), not null
+#  flair_icon                         :string
+#  flair_upload_id                    :integer
 #
 # Indexes
 #
diff --git a/app/models/theme_modifier_set.rb b/app/models/theme_modifier_set.rb
index 9fae7faf54..781ea42f51 100644
--- a/app/models/theme_modifier_set.rb
+++ b/app/models/theme_modifier_set.rb
@@ -98,12 +98,12 @@ end
 #
 # Table name: theme_modifier_sets
 #
-#  id                               :bigint           not null, primary key
-#  theme_id                         :bigint           not null
-#  serialize_topic_excerpts         :boolean
-#  csp_extensions                   :string           is an Array
-#  svg_icons                        :string           is an Array
-#  topic_thumbnail_sizes            :string           is an Array
+#  id                       :bigint           not null, primary key
+#  theme_id                 :bigint           not null
+#  serialize_topic_excerpts :boolean
+#  csp_extensions           :string           is an Array
+#  svg_icons                :string           is an Array
+#  topic_thumbnail_sizes    :string           is an Array
 #
 # Indexes
 #
diff --git a/app/models/topic_custom_field.rb b/app/models/topic_custom_field.rb
index e922b7b26e..ba5767084e 100644
--- a/app/models/topic_custom_field.rb
+++ b/app/models/topic_custom_field.rb
@@ -17,7 +17,6 @@ end
 #
 # Indexes
 #
-#  idx_topic_custom_fields_accepted_answer         (topic_id) UNIQUE WHERE ((name)::text = 'accepted_answer_post_id'::text)
 #  index_topic_custom_fields_on_topic_id_and_name  (topic_id,name)
 #  topic_custom_fields_value_key_idx               (value,name) WHERE ((value IS NOT NULL) AND (char_length(value) < 400))
 #

From 2a4db15544b781e227cdd2452ef16f4b7600ca1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 27 May 2020 17:09:40 +0200
Subject: [PATCH 1389/1830] FIX: don't send digests to users with no primary
 email

It might happen that some User records have no associated primary emails.
In which case we don't ever want to send them a digest.

Also added a new "user_email_no_email" skipped email log to ensure these cases
are properly handled and surfaced.
---
 app/jobs/regular/user_email.rb              | 7 ++++---
 app/jobs/scheduled/enqueue_digest_emails.rb | 8 +++++---
 app/models/skipped_email_log.rb             | 3 ++-
 config/locales/server.en.yml                | 1 +
 spec/jobs/enqueue_digest_emails_spec.rb     | 8 ++++++++
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/jobs/regular/user_email.rb b/app/jobs/regular/user_email.rb
index afa1105e4f..bee715099d 100644
--- a/app/jobs/regular/user_email.rb
+++ b/app/jobs/regular/user_email.rb
@@ -26,16 +26,17 @@ module Jobs
       notification = nil
       type = args[:type]
       user = User.find_by(id: args[:user_id])
-      to_address = args[:to_address].presence || user.try(:email).presence || "no_email_found"
+      to_address = args[:to_address].presence || user&.primary_email&.email.presence || "no_email_found"
 
       set_skip_context(type, args[:user_id], to_address, args[:post_id])
 
-      return skip(SkippedEmailLog.reason_types[:user_email_no_user]) unless user
+      return skip(SkippedEmailLog.reason_types[:user_email_no_user]) if !user
+      return skip(SkippedEmailLog.reason_types[:user_email_no_email]) if to_address == "no_email_found"
 
       if args[:post_id].present?
         post = Post.find_by(id: args[:post_id])
 
-        unless post.present?
+        if post.blank?
           return skip(SkippedEmailLog.reason_types[:user_email_post_not_found])
         end
 
diff --git a/app/jobs/scheduled/enqueue_digest_emails.rb b/app/jobs/scheduled/enqueue_digest_emails.rb
index 18db50135a..b126dc1553 100644
--- a/app/jobs/scheduled/enqueue_digest_emails.rb
+++ b/app/jobs/scheduled/enqueue_digest_emails.rb
@@ -14,13 +14,15 @@ module Jobs
 
     def target_user_ids
       # Users who want to receive digest email within their chosen digest email frequency
-      query = User.real
-        .not_suspended
+      query = User
+        .real
         .activated
+        .not_suspended
         .where(staged: false)
-        .joins(:user_option, :user_stat)
+        .joins(:user_option, :user_stat, :user_emails)
         .where("user_options.email_digests")
         .where("user_stats.bounce_score < #{SiteSetting.bounce_score_threshold}")
+        .where("user_emails.primary")
         .where("COALESCE(last_emailed_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * user_options.digest_after_minutes)")
         .where("COALESCE(last_seen_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * user_options.digest_after_minutes)")
         .where("COALESCE(last_seen_at, '2010-01-01') >= CURRENT_TIMESTAMP - ('1 DAY'::INTERVAL * #{SiteSetting.suppress_digest_email_after_days})")
diff --git a/app/models/skipped_email_log.rb b/app/models/skipped_email_log.rb
index 9ffa2230e9..1a4ec415aa 100644
--- a/app/models/skipped_email_log.rb
+++ b/app/models/skipped_email_log.rb
@@ -37,7 +37,8 @@ class SkippedEmailLog < ActiveRecord::Base
       sender_post_deleted: 20,
       sender_message_to_invalid: 21,
       user_email_access_denied: 22,
-      sender_topic_deleted: 23
+      sender_topic_deleted: 23,
+      user_email_no_email: 24,
       # you need to add the reason in server.en.yml below the "skipped_email_log" key
       # when you add a new enum value
     )
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 0433fd08b5..c62622dbb9 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3803,6 +3803,7 @@ en:
     user_email_user_suspended: "user was suspended"
     user_email_already_read: "user has already read this post"
     user_email_access_denied: "user is not allowed to see this post"
+    user_email_no_email: "No email associated with user id %{user_id}"
     sender_message_blank: "message is blank"
     sender_message_to_blank: "message.to is blank"
     sender_text_part_body_blank: "text_part.body is blank"
diff --git a/spec/jobs/enqueue_digest_emails_spec.rb b/spec/jobs/enqueue_digest_emails_spec.rb
index 029be5a814..3c9fcad5d6 100644
--- a/spec/jobs/enqueue_digest_emails_spec.rb
+++ b/spec/jobs/enqueue_digest_emails_spec.rb
@@ -107,6 +107,14 @@ describe Jobs::EnqueueDigestEmails do
       end
     end
 
+    context "no primary email" do
+      let!(:user) { Fabricate(:active_user, last_seen_at: 2.months.ago) }
+
+      it "doesn't return users with no primary emails" do
+        UserEmail.where(user: user).delete_all
+        expect(Jobs::EnqueueDigestEmails.new.target_user_ids.include?(user.id)).to eq(false)
+      end
+    end
   end
 
   describe '#execute' do

From da839e6d26b9a6cb411e47af3c0062fa508bc921 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Wed, 27 May 2020 09:23:55 -0600
Subject: [PATCH 1390/1830] SECURITY: Use FinalDestination for topic embeds

---
 app/models/topic_embed.rb       |  9 ++++++++-
 spec/models/topic_embed_spec.rb | 16 +++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 362ee79f4a..d8aef83080 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -109,7 +109,14 @@ class TopicEmbed < ActiveRecord::Base
 
     url = UrlHelper.escape_uri(url)
     original_uri = URI.parse(url)
-    raise URI::InvalidURIError unless original_uri.is_a?(URI::HTTP)
+    fd = FinalDestination.new(
+      url,
+      validate_uri: true,
+      max_redirects: 5
+    )
+
+    url = fd.resolve
+    raise URI::InvalidURIError if url.blank?
 
     opts = {
       tags: %w[div p code pre h1 h2 h3 b em i strong a img ul li ol blockquote],
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index c91781e6dd..cfdddd389b 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -166,6 +166,7 @@ describe TopicEmbed do
       before do
         file.stubs(:read).returns contents
         TopicEmbed.stubs(:open).returns file
+        stub_request(:head, url)
       end
 
       it "doesn't scrub the title by default" do
@@ -194,6 +195,7 @@ describe TopicEmbed do
         SiteSetting.embed_classname_whitelist = 'emoji, foo'
         file.stubs(:read).returns contents
         TopicEmbed.stubs(:open).returns file
+        stub_request(:head, url)
         response = TopicEmbed.find_remote(url)
       end
 
@@ -230,6 +232,7 @@ describe TopicEmbed do
       before(:each) do
         file.stubs(:read).returns contents
         TopicEmbed.stubs(:open).returns file
+        stub_request(:head, url)
         response = TopicEmbed.find_remote(url)
       end
 
@@ -252,6 +255,7 @@ describe TopicEmbed do
         SiteSetting.embed_classname_whitelist = ''
         file.stubs(:read).returns contents
         TopicEmbed.stubs(:open).returns file
+        stub_request(:head, url)
         response = TopicEmbed.find_remote(url)
       end
 
@@ -279,9 +283,8 @@ describe TopicEmbed do
       let!(:file) { StringIO.new }
 
       before do
-        file.stubs(:read).returns contents
-        TopicEmbed.stubs(:open)
-          .with('http://eviltrout.com/test/%D9%85%D8%A7%D9%87%DB%8C', allow_redirections: :safe).returns file
+        stub_request(:head, url)
+        stub_request(:get, url).to_return(body: contents).then.to_raise
       end
 
       it "doesn't throw an error" do
@@ -297,9 +300,8 @@ describe TopicEmbed do
       let!(:file) { StringIO.new }
 
       before do
-        file.stubs(:read).returns contents
-        TopicEmbed.stubs(:open)
-          .with('http://example.com/hello%20world', allow_redirections: :safe).returns file
+        stub_request(:head, url)
+        stub_request(:get, url).to_return(body: contents).then.to_raise
       end
 
       it "doesn't throw an error" do
@@ -310,7 +312,6 @@ describe TopicEmbed do
 
     context "non-http URL" do
       let(:url) { '/test.txt' }
-
       it "throws an error" do
         expect { TopicEmbed.find_remote(url) }.to raise_error(URI::InvalidURIError)
       end
@@ -328,6 +329,7 @@ describe TopicEmbed do
       end
 
       it "handles mailto links" do
+        stub_request(:head, url)
         response = TopicEmbed.find_remote(url)
         expect(response.body).to have_tag('a', with: { href: 'mailto:foo%40example.com' })
         expect(response.body).to have_tag('a', with: { href: 'mailto:bar@example.com' })

From 488f8d914af665a54dd29c4f3e4e1ac63e0bb402 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 27 May 2020 17:36:50 +0200
Subject: [PATCH 1391/1830] DEV: skip bunch of failing tests (#9896)

---
 test/javascripts/acceptance/composer-test.js   | 2 +-
 test/javascripts/acceptance/group-card-test.js | 2 +-
 test/javascripts/acceptance/modal-test.js      | 2 +-
 test/javascripts/acceptance/sign-in-test.js    | 4 ++--
 test/javascripts/acceptance/user-card-test.js  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/javascripts/acceptance/composer-test.js b/test/javascripts/acceptance/composer-test.js
index 95fed9f93b..50b698e3ae 100644
--- a/test/javascripts/acceptance/composer-test.js
+++ b/test/javascripts/acceptance/composer-test.js
@@ -18,7 +18,7 @@ acceptance("Composer", {
   }
 });
 
-QUnit.test("Tests the Composer controls", async assert => {
+QUnit.skip("Tests the Composer controls", async assert => {
   await visit("/");
   assert.ok(exists("#create-topic"), "the create button is visible");
 
diff --git a/test/javascripts/acceptance/group-card-test.js b/test/javascripts/acceptance/group-card-test.js
index 54b716d601..06bd0d88c2 100644
--- a/test/javascripts/acceptance/group-card-test.js
+++ b/test/javascripts/acceptance/group-card-test.js
@@ -3,7 +3,7 @@ import DiscourseURL from "discourse/lib/url";
 
 acceptance("Group Card");
 
-QUnit.test("group card", async assert => {
+QUnit.skip("group card", async assert => {
   await visit("/t/-/301/1");
   assert.ok(invisible(".group-card"), "user card is invisible by default");
 
diff --git a/test/javascripts/acceptance/modal-test.js b/test/javascripts/acceptance/modal-test.js
index 4e43be89bb..25e52cd2d6 100644
--- a/test/javascripts/acceptance/modal-test.js
+++ b/test/javascripts/acceptance/modal-test.js
@@ -4,7 +4,7 @@ import showModal from "discourse/lib/show-modal";
 
 acceptance("Modal");
 
-QUnit.test("modal", async function(assert) {
+QUnit.skip("modal", async function(assert) {
   await visit("/");
 
   assert.ok(
diff --git a/test/javascripts/acceptance/sign-in-test.js b/test/javascripts/acceptance/sign-in-test.js
index 5ba70ce4a3..c66ba49637 100644
--- a/test/javascripts/acceptance/sign-in-test.js
+++ b/test/javascripts/acceptance/sign-in-test.js
@@ -68,7 +68,7 @@ QUnit.test("sign in - not activated - edit email", async assert => {
   assert.equal(find(".modal-body b").text(), "different@example.com");
 });
 
-QUnit.test("second factor", async assert => {
+QUnit.skip("second factor", async assert => {
   await visit("/");
   await click("header .login-button");
 
@@ -101,7 +101,7 @@ QUnit.test("second factor", async assert => {
   );
 });
 
-QUnit.test("security key", async assert => {
+QUnit.skip("security key", async assert => {
   await visit("/");
   await click("header .login-button");
 
diff --git a/test/javascripts/acceptance/user-card-test.js b/test/javascripts/acceptance/user-card-test.js
index 36125dee47..c78f791080 100644
--- a/test/javascripts/acceptance/user-card-test.js
+++ b/test/javascripts/acceptance/user-card-test.js
@@ -89,7 +89,7 @@ QUnit.test(
 
 acceptance("User Card", { loggedIn: true });
 
-QUnit.test("user card", async assert => {
+QUnit.skip("user card", async assert => {
   await visit("/t/internationalization-localization/280");
   assert.ok(invisible(".user-card"), "user card is invisible by default");
 

From 461df7d050c0d868770d214d9b1ca7faee08d500 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Wed, 27 May 2020 12:50:28 -0300
Subject: [PATCH 1392/1830] UX: Rename Priority to score for sorting. (#9846)

---
 .../discourse/app/controllers/review-index.js | 20 +++++++++----------
 .../discourse/app/routes/review-index.js      |  2 +-
 app/models/reviewable.rb                      |  2 +-
 config/locales/client.en.yml                  |  4 ++--
 spec/models/reviewable_spec.rb                |  4 ++--
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/review-index.js b/app/assets/javascripts/discourse/app/controllers/review-index.js
index 103edb4f07..28f82624b8 100644
--- a/app/assets/javascripts/discourse/app/controllers/review-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/review-index.js
@@ -57,14 +57,12 @@ export default Controller.extend({
 
   @discourseComputed
   sortOrders() {
-    return ["priority", "priority_asc", "created_at", "created_at_asc"].map(
-      order => {
-        return {
-          id: order,
-          name: I18n.t(`review.filters.orders.${order}`)
-        };
-      }
-    );
+    return ["score", "score_asc", "created_at", "created_at_asc"].map(order => {
+      return {
+        id: order,
+        name: I18n.t(`review.filters.orders.${order}`)
+      };
+    });
   },
 
   @discourseComputed
@@ -129,14 +127,14 @@ export default Controller.extend({
         priorityStatuses.includes(nextStatus) &&
         nextOrder === "created_at"
       ) {
-        nextOrder = "priority";
+        nextOrder = "score";
       }
 
       if (
         priorityStatuses.includes(currentStatus) &&
-        currentOrder === "priority" &&
+        currentOrder === "score" &&
         createdAtStatuses.includes(nextStatus) &&
-        nextOrder === "priority"
+        nextOrder === "score"
       ) {
         nextOrder = "created_at";
       }
diff --git a/app/assets/javascripts/discourse/app/routes/review-index.js b/app/assets/javascripts/discourse/app/routes/review-index.js
index b83a95124c..731167878e 100644
--- a/app/assets/javascripts/discourse/app/routes/review-index.js
+++ b/app/assets/javascripts/discourse/app/routes/review-index.js
@@ -7,7 +7,7 @@ export default DiscourseRoute.extend({
       if (params.status === "reviewed" || params.status === "all") {
         params.sort_order = "created_at";
       } else {
-        params.sort_order = "priority";
+        params.sort_order = "score";
       }
     }
 
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 99c2ad62c0..8e8cbd4b13 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -450,7 +450,7 @@ class Reviewable < ActiveRecord::Base
     min_score = Reviewable.min_score_for_priority(priority)
 
     order = case sort_order
-            when 'priority_asc'
+            when 'score_asc'
               'reviewables.score ASC, reviewables.created_at DESC'
             when 'created_at'
               'reviewables.created_at DESC, reviewables.score DESC'
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a8ff521a7a..1d2615fd6b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -512,8 +512,8 @@ en:
         status: "Status"
         category: "Category"
         orders:
-          priority: "Priority"
-          priority_asc: "Priority (reverse)"
+          score: "Score"
+          score_asc: "Score (reverse)"
           created_at: "Created At"
           created_at_asc: "Created At (reverse)"
 
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index 8d58d6a537..96604b75a8 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -159,11 +159,11 @@ RSpec.describe Reviewable, type: :model do
           r0 = Fabricate(:reviewable, score: 100, created_at: 3.months.ago)
           r1 = Fabricate(:reviewable, score: 999, created_at: 1.month.ago)
 
-          list = Reviewable.list_for(user, sort_order: 'priority')
+          list = Reviewable.list_for(user, sort_order: 'score')
           expect(list[0].id).to eq(r1.id)
           expect(list[1].id).to eq(r0.id)
 
-          list = Reviewable.list_for(user, sort_order: 'priority_asc')
+          list = Reviewable.list_for(user, sort_order: 'score_asc')
           expect(list[0].id).to eq(r0.id)
           expect(list[1].id).to eq(r1.id)
 

From 12544c02c1030738ef41c3b076ccf14b5f2d2c55 Mon Sep 17 00:00:00 2001
From: Artem Vasiliev <artem.job@gmail.com>
Date: Wed, 27 May 2020 18:57:05 +0300
Subject: [PATCH 1393/1830] FIX: add X-Robots-Tag header for check_xhr-covered
 GET actions, too (#9868)

* FIX: add X-Robots-Tag header for check_xhr-covered GET actions, too

see https://meta.discourse.org/t/missing-x-robots-tag/152593/3 for context

* test: a spec making sure X-Robots-Tag header is present when needed

/groups path responds to anonymous requests and doesn't skip `check_xhr` method, so we can use it here.
---
 app/controllers/application_controller.rb | 2 +-
 spec/requests/groups_controller_spec.rb   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2f2b8a9694..a0f0a56630 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -39,12 +39,12 @@ class ApplicationController < ActionController::Base
   before_action :redirect_to_login_if_required
   before_action :block_if_requires_login
   before_action :preload_json
+  before_action :add_noindex_header, if: -> { is_feed_request? || !SiteSetting.allow_index_in_robots_txt }
   before_action :check_xhr
   after_action  :add_readonly_header
   after_action  :perform_refresh_session
   after_action  :dont_cache_page
   after_action  :conditionally_allow_site_embedding
-  after_action  :add_noindex_header, if: -> { is_feed_request? || !SiteSetting.allow_index_in_robots_txt }
 
   layout :set_layout
 
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 11eb7eb0e4..eb6b4d56d5 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -176,6 +176,12 @@ describe GroupsController do
       )
     end
 
+    it 'should return correct X-Robots-Tag header when allow_index_in_robots_txt is set to false' do
+      SiteSetting.allow_index_in_robots_txt = false
+      get "/groups"
+      expect(response.headers['X-Robots-Tag']).to eq('noindex, nofollow')
+    end
+
     context 'viewing groups of another user' do
       describe 'when an invalid username is given' do
         it 'should return the right response' do

From 8d2908dd9e12f309a442bd3a1ae92d48938f5427 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 27 May 2020 21:53:59 +0530
Subject: [PATCH 1394/1830] UX: do not show redundant user count

UX: add spacing between +member_count and "more"
---
 .../app/components/group-card-contents.js     |  5 ----
 .../components/group-card-contents.hbs        | 24 ++-----------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/group-card-contents.js b/app/assets/javascripts/discourse/app/components/group-card-contents.js
index 2ff80e5b3b..5f09b94b18 100644
--- a/app/assets/javascripts/discourse/app/components/group-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/group-card-contents.js
@@ -27,11 +27,6 @@ export default Component.extend(CardContentsBase, CleansUp, {
   viewingTopic: match("currentPath", /^topic\./),
 
   showMoreMembers: gt("moreMembersCount", 0),
-  hasMembersOrIsMember: or(
-    "group.members",
-    "group.is_group_owner_display",
-    "group.is_group_user"
-  ),
 
   group: null,
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
index 3c867903a2..6c07de9a81 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
@@ -49,35 +49,15 @@
       </div>
     {{/if}}
 
-    {{#if hasMembersOrIsMember}}
-      <div class="card-row third-row">
-        <div class="metadata">
-          <h3>
-            <span class="desc">
-              {{i18n "groups.user_count"}}
-            </span>
-            {{group.user_count}}
-          </h3>
-          <h3>
-            {{#if group.is_group_owner_display}}
-              {{i18n "groups.index.is_group_owner"}}
-            {{else if group.is_group_user}}
-              {{i18n "groups.index.is_group_user"}}
-            {{/if}}
-          </h3>
-        </div>
-      </div>
-    {{/if}}
-
     {{#if group.members}}
-      <div class="card-row fourth-row">
+      <div class="card-row third-row">
         <div class="members metadata">
           {{#each group.members as |user|}}
             <a href {{action "showUser" user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
           {{/each}}
           {{#if showMoreMembers}}
             <a href={{groupPath}} {{action "showGroup" group}} class="more-members-link">
-              <span class="more-members-count">+{{moreMembersCount}}{{i18n "more"}}</span>
+              <span class="more-members-count">+{{moreMembersCount}} {{i18n "more"}}</span>
             </a>
           {{/if}}
         </div>

From 68fdfd76f523fd19ab1866603ec1285cdc422974 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 27 May 2020 22:06:45 +0530
Subject: [PATCH 1395/1830] fix the build

---
 .../javascripts/discourse/app/components/group-card-contents.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/group-card-contents.js b/app/assets/javascripts/discourse/app/components/group-card-contents.js
index 5f09b94b18..4820500e73 100644
--- a/app/assets/javascripts/discourse/app/components/group-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/group-card-contents.js
@@ -1,4 +1,4 @@
-import { alias, match, gt, or } from "@ember/object/computed";
+import { alias, match, gt } from "@ember/object/computed";
 import Component from "@ember/component";
 import { setting } from "discourse/lib/computed";
 import discourseComputed from "discourse-common/utils/decorators";

From 7bc496070f744a411f6b8efd111c096d485617a4 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 27 May 2020 12:40:38 -0400
Subject: [PATCH 1396/1830] UX: Keep focus on input after selecting an
 autocomplete option

This is particularly helpful on mobile, now tapping on an item from
the autocomplete dropdown keeps the keyboard visible.
---
 app/assets/javascripts/discourse/app/lib/autocomplete.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/lib/autocomplete.js b/app/assets/javascripts/discourse/app/lib/autocomplete.js
index 03fc408a91..eea9f8e417 100644
--- a/app/assets/javascripts/discourse/app/lib/autocomplete.js
+++ b/app/assets/javascripts/discourse/app/lib/autocomplete.js
@@ -274,6 +274,9 @@ export default function(options) {
     ul.find("li").click(function() {
       selectedOption = ul.find("li").index(this);
       completeTerm(autocompleteOptions[selectedOption]);
+      if (!options.single) {
+        me.focus();
+      }
       return false;
     });
     var pos = null;

From 570b12a903cb226069e3468be4fe24809c11c7a6 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 27 May 2020 20:10:01 +0300
Subject: [PATCH 1397/1830] FEATURE: Show a detailed 404 page for private
 topics (#9894)

---
 app/controllers/application_controller.rb | 20 ++++++++++++++------
 config/locales/server.en.yml              |  3 +++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a0f0a56630..e7f8c9750b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -245,12 +245,20 @@ class ApplicationController < ActionController::Base
       end
     end
 
-    message = opts[:custom_message_translated] || I18n.t(opts[:custom_message] || type)
-    error_page_opts = {
-      title: opts[:custom_message_translated] || I18n.t(opts[:custom_message] || "page_not_found.title"),
-      status: status_code,
-      group: opts[:group]
-    }
+    if opts[:custom_message_translated]
+      title = message = opts[:custom_message_translated]
+    elsif opts[:custom_message]
+      title = message = I18n.t(opts[:custom_message])
+    else
+      message = I18n.t(type)
+      if status_code == 403
+        title = I18n.t("page_forbidden.title")
+      else
+        title = I18n.t("page_not_found.title")
+      end
+    end
+
+    error_page_opts = { title: title, status: status_code, group: opts[:group] }
 
     if show_json_errors
       opts = { type: type, status: status_code }
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index c62622dbb9..ee1d6dde67 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3738,6 +3738,9 @@ en:
 
         If this was not you, please [review your existing sessions](%{base_url}/my/preferences/account) and consider changing your password.
 
+  page_forbidden:
+    title: "Oops! That page is private."
+
   page_not_found:
     title: "Oops! That page doesn’t exist or is private."
     popular_topics: "Popular"

From 207b72ade18c07a5e131217b76722d6e9b926984 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Wed, 27 May 2020 14:50:17 -0300
Subject: [PATCH 1398/1830] UX: Don't show the suspension date if the user is
 permantently suspended. (#9895)

Use the same pattern used in user.hbs
---
 .../app/templates/components/user-card-contents.hbs         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
index 239aadad35..8218fc3735 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
@@ -125,7 +125,11 @@
             <div class="suspended">
               <div class="suspension-date">
                 {{d-icon "ban"}}
-                {{i18n "user.suspended_notice" date=this.user.suspendedTillDate}}
+                {{#if this.user.suspendedForever}}
+                  {{i18n 'user.suspended_permanently'}}
+                {{else}}
+                  {{i18n 'user.suspended_notice' date=this.user.suspendedTillDate}}
+                {{/if}}
               </div>
               <div class="suspension-reason">
                 <span class="suspension-reason-title">{{i18n "user.suspended_reason"}}</span>

From 77801aa9be9268ddbc02dcb2473e466a196b9ed0 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 27 May 2020 20:11:52 +0200
Subject: [PATCH 1399/1830] FIX: allows to have custom emoji translation
 without static file (#9893)

---
 .../discourse/app/components/d-editor.js      | 11 +++++-
 .../javascripts/discourse/app/lib/text.js     |  1 +
 .../javascripts/pretty-text/addon/emoji.js    | 18 +++++++--
 .../addon/engines/discourse-markdown/emoji.js | 39 +++++++++++++++----
 .../pretty-text/addon/pretty-text.js          |  4 +-
 app/models/emoji.rb                           |  2 +-
 app/serializers/site_serializer.rb            |  7 +++-
 lib/plugin/instance.rb                        |  1 +
 lib/pretty_text.rb                            |  5 +++
 lib/pretty_text/shims.js                      |  2 +
 spec/components/pretty_text_spec.rb           | 21 ++++++++++
 11 files changed, 94 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index bfdf021bff..184b7f93a6 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -483,8 +483,15 @@ export default Component.extend({
             }
           }
 
-          if (translations[full]) {
-            return resolve([translations[full]]);
+          // note this will only work for emojis starting with :
+          // eg: :-)
+          const allTranslations = Object.assign(
+            {},
+            translations,
+            this.getWithDefault("site.custom_emoji_translation", {})
+          );
+          if (allTranslations[full]) {
+            return resolve([allTranslations[full]]);
           }
 
           const match = term.match(/^:?(.*?):t([2-6])?$/);
diff --git a/app/assets/javascripts/discourse/app/lib/text.js b/app/assets/javascripts/discourse/app/lib/text.js
index 692e75b9b5..94d33b18d5 100644
--- a/app/assets/javascripts/discourse/app/lib/text.js
+++ b/app/assets/javascripts/discourse/app/lib/text.js
@@ -18,6 +18,7 @@ function getOpts(opts) {
       getURL: getURLWithCDN,
       currentUser: Discourse.__container__.lookup("current-user:main"),
       censoredRegexp: site.censored_regexp,
+      customEmojiTranslation: site.custom_emoji_translation,
       siteSettings,
       formatUsername
     },
diff --git a/app/assets/javascripts/pretty-text/addon/emoji.js b/app/assets/javascripts/pretty-text/addon/emoji.js
index 74af3b90cd..5d9fb762c0 100644
--- a/app/assets/javascripts/pretty-text/addon/emoji.js
+++ b/app/assets/javascripts/pretty-text/addon/emoji.js
@@ -98,13 +98,18 @@ export function performEmojiUnescape(string, opts) {
 
   const inlineEmoji = opts.inlineEmoji;
   const regexp = unicodeRegexp(inlineEmoji);
+  const allTranslations = Object.assign(
+    {},
+    translations,
+    opts.customEmojiTranslation || {}
+  );
 
   return string.replace(regexp, (m, index) => {
-    const isEmoticon = opts.enableEmojiShortcuts && !!translations[m];
+    const isEmoticon = opts.enableEmojiShortcuts && !!allTranslations[m];
     const isUnicodeEmoticon = !!replacements[m];
     let emojiVal;
     if (isEmoticon) {
-      emojiVal = translations[m];
+      emojiVal = allTranslations[m];
     } else if (isUnicodeEmoticon) {
       emojiVal = replacements[m];
     } else {
@@ -131,11 +136,16 @@ export function performEmojiUnescape(string, opts) {
 export function performEmojiEscape(string, opts) {
   const inlineEmoji = opts.inlineEmoji;
   const regexp = unicodeRegexp(inlineEmoji);
+  const allTranslations = Object.assign(
+    {},
+    translations,
+    opts.customEmojiTranslation || {}
+  );
 
   return string.replace(regexp, (m, index) => {
     if (isReplacableInlineEmoji(string, index, inlineEmoji)) {
-      if (!!translations[m]) {
-        return opts.emojiShortcuts ? `:${translations[m]}:` : m;
+      if (!!allTranslations[m]) {
+        return opts.emojiShortcuts ? `:${allTranslations[m]}:` : m;
       } else if (!!replacements[m]) {
         return `:${replacements[m]}:`;
       }
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/emoji.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/emoji.js
index 7b4bee783d..452bb5046d 100644
--- a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/emoji.js
+++ b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/emoji.js
@@ -5,15 +5,25 @@ const MAX_NAME_LENGTH = 60;
 
 let translationTree = null;
 
+export function resetTranslationTree() {
+  translationTree = null;
+}
+
 // This allows us to efficiently search for aliases
 // We build a data structure that allows us to quickly
 // search through our N next chars to see if any match
 // one of our alias emojis.
-function buildTranslationTree() {
+function buildTranslationTree(customEmojiTranslation) {
   let tree = [];
   let lastNode;
 
-  Object.keys(translations).forEach(key => {
+  const allTranslations = Object.assign(
+    {},
+    translations,
+    customEmojiTranslation || {}
+  );
+
+  Object.keys(allTranslations).forEach(key => {
     let node = tree;
 
     for (let i = 0; i < key.length; i++) {
@@ -37,7 +47,7 @@ function buildTranslationTree() {
       }
     }
 
-    lastNode[2] = translations[key];
+    lastNode[2] = allTranslations[key];
   });
 
   return tree;
@@ -114,8 +124,14 @@ function getEmojiTokenByName(name, state) {
   }
 }
 
-function getEmojiTokenByTranslation(content, pos, state) {
-  translationTree = translationTree || buildTranslationTree();
+function getEmojiTokenByTranslation(
+  content,
+  pos,
+  state,
+  customEmojiTranslation
+) {
+  translationTree =
+    translationTree || buildTranslationTree(customEmojiTranslation);
 
   let t = translationTree;
   let start = pos;
@@ -175,7 +191,8 @@ function applyEmoji(
   state,
   emojiUnicodeReplacer,
   enableShortcuts,
-  inlineEmoji
+  inlineEmoji,
+  customEmojiTranslation
 ) {
   let result = null;
   let start = 0;
@@ -201,7 +218,12 @@ function applyEmoji(
 
     if (enableShortcuts && !token) {
       // handle aliases (note: we can't do this in inline cause ; is not a split point)
-      const info = getEmojiTokenByTranslation(content, i, state);
+      const info = getEmojiTokenByTranslation(
+        content,
+        i,
+        state,
+        customEmojiTranslation
+      );
 
       if (info) {
         offset = info.pos - i;
@@ -310,7 +332,8 @@ export function setup(helper) {
           s,
           md.options.discourse.emojiUnicodeReplacer,
           md.options.discourse.features.emojiShortcuts,
-          md.options.discourse.features.inlineEmoji
+          md.options.discourse.features.inlineEmoji,
+          md.options.discourse.customEmojiTranslation
         )
       )
     );
diff --git a/app/assets/javascripts/pretty-text/addon/pretty-text.js b/app/assets/javascripts/pretty-text/addon/pretty-text.js
index 7a867d89c9..d24fb4af6f 100644
--- a/app/assets/javascripts/pretty-text/addon/pretty-text.js
+++ b/app/assets/javascripts/pretty-text/addon/pretty-text.js
@@ -30,7 +30,8 @@ export function buildOptions(state) {
     previewing,
     linkify,
     censoredRegexp,
-    disableEmojis
+    disableEmojis,
+    customEmojiTranslation
   } = state;
 
   let features = {
@@ -68,6 +69,7 @@ export function buildOptions(state) {
     emojiUnicodeReplacer,
     lookupUploadUrls,
     censoredRegexp,
+    customEmojiTranslation,
     allowedHrefSchemes: siteSettings.allowed_href_schemes
       ? siteSettings.allowed_href_schemes.split("|")
       : null,
diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index cfd121b76e..7222cafebc 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -126,7 +126,7 @@ class Emoji
   end
 
   def self.load_translations
-    db["translations"].merge(Plugin::CustomEmoji.translations)
+    db["translations"]
   end
 
   def self.base_directory
diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index 06acfc0c4f..d5bb901346 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -26,7 +26,8 @@ class SiteSerializer < ApplicationSerializer
     :topic_featured_link_allowed_category_ids,
     :user_themes,
     :censored_regexp,
-    :shared_drafts_category_id
+    :shared_drafts_category_id,
+    :custom_emoji_translation
   )
 
   has_many :categories, serializer: SiteCategorySerializer, embed: :objects
@@ -154,6 +155,10 @@ class SiteSerializer < ApplicationSerializer
     WordWatcher.word_matcher_regexp(:censor)&.source
   end
 
+  def custom_emoji_translation
+    Plugin::CustomEmoji.translations
+  end
+
   def shared_drafts_category_id
     SiteSetting.shared_drafts_category.to_i
   end
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 7d48dbbdde..11f866f937 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -18,6 +18,7 @@ class Plugin::CustomEmoji
   def self.clear_cache
     @@cache_key = CACHE_KEY
     @@emojis = {}
+    @@translations = {}
   end
 
   def self.register(name, url, group = Emoji::DEFAULT_GROUP)
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 0f114c5169..642b627c3d 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -126,6 +126,10 @@ module PrettyText
     @ctx
   end
 
+  def self.reset_translations
+    v8.eval("__resetTranslationTree()")
+  end
+
   def self.reset_context
     @ctx_init.synchronize do
       @ctx&.dispose
@@ -159,6 +163,7 @@ module PrettyText
         __optInput.getTopicInfo = __getTopicInfo;
         __optInput.categoryHashtagLookup = __categoryLookup;
         __optInput.customEmoji = #{custom_emoji.to_json};
+        __optInput.customEmojiTranslation = #{Plugin::CustomEmoji.translations.to_json};
         __optInput.emojiUnicodeReplacer = __emojiUnicodeReplacer;
         __optInput.lookupUploadUrls = __lookupUploadUrls;
         __optInput.censoredRegexp = #{WordWatcher.word_matcher_regexp(:censor)&.source.to_json};
diff --git a/lib/pretty_text/shims.js b/lib/pretty_text/shims.js
index cc288ceb40..8e84568ed4 100644
--- a/lib/pretty_text/shims.js
+++ b/lib/pretty_text/shims.js
@@ -3,6 +3,8 @@ __buildOptions = require("pretty-text/pretty-text").buildOptions;
 __performEmojiUnescape = require("pretty-text/emoji").performEmojiUnescape;
 __buildReplacementsList = require("pretty-text/emoji").buildReplacementsList;
 __performEmojiEscape = require("pretty-text/emoji").performEmojiEscape;
+__resetTranslationTree = require("pretty-text/engines/discourse-markdown/emoji")
+  .resetTranslationTree;
 
 I18n = {
   t(a, b) {
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index c5ef73c4d2..49a3ac90ba 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -1040,6 +1040,27 @@ describe PrettyText do
     end
   end
 
+  describe "custom emoji translation" do
+    before do
+      PrettyText.reset_translations
+
+      SiteSetting.enable_emoji = true
+      SiteSetting.enable_emoji_shortcuts = true
+
+      plugin = Plugin::Instance.new
+      plugin.translate_emoji "0:)", "otter"
+    end
+
+    after do
+      Plugin::CustomEmoji.clear_cache
+      PrettyText.reset_translations
+    end
+
+    it "sets the custom translation" do
+      expect(PrettyText.cook("hello 0:)")).to match(/otter/)
+    end
+  end
+
   it "replaces skin toned emoji" do
     expect(PrettyText.cook("hello 👱🏿‍♀️")).to eq("<p>hello <img src=\"/images/emoji/twitter/blonde_woman/6.png?v=#{Emoji::EMOJI_VERSION}\" title=\":blonde_woman:t6:\" class=\"emoji\" alt=\":blonde_woman:t6:\"></p>")
     expect(PrettyText.cook("hello 👩‍🎤")).to eq("<p>hello <img src=\"/images/emoji/twitter/woman_singer.png?v=#{Emoji::EMOJI_VERSION}\" title=\":woman_singer:\" class=\"emoji\" alt=\":woman_singer:\"></p>")

From a9d92f338ef23a5818d171897dc9948b35a5feee Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Wed, 27 May 2020 08:28:38 -1000
Subject: [PATCH 1400/1830] SECURITY: make find topic by slug adhere to
 SiteSetting.detailed_404 (#9898)

---
 app/controllers/topics_controller.rb    | 10 +++++++++-
 spec/requests/topics_controller_spec.rb | 18 +++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index bca0bde2de..ddb750f912 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -945,7 +945,15 @@ class TopicsController < ApplicationController
   end
 
   def redirect_to_correct_topic(topic, post_number = nil)
-    guardian.ensure_can_see!(topic)
+    begin
+      guardian.ensure_can_see!(topic)
+    rescue Discourse::InvalidAccess => ex
+      if !SiteSetting.detailed_404
+        raise Discourse::NotFound
+      else
+        raise ex
+      end
+    end
 
     url = topic.relative_url
     url << "/#{post_number}" if post_number.to_i > 0
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index bc80fa9283..c542f23810 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 
 require 'rails_helper'
@@ -1357,17 +1358,6 @@ RSpec.describe TopicsController do
       expect(response).to redirect_to(topic.relative_url)
     end
 
-    it 'will return a 403 if you try to redirect to a topic you have no access to' do
-      category = Fabricate(:category)
-      category.set_permissions(Group::AUTO_GROUPS[:staff] => :full)
-      category.save!
-
-      topic.update!(category_id: category.id)
-      get "/t/#{topic.slug}"
-
-      expect(response.status).to eq(403)
-    end
-
     it 'can find a topic when a slug has a number in front' do
       another_topic = Fabricate(:post).topic
 
@@ -1463,6 +1453,12 @@ RSpec.describe TopicsController do
             expect(response.status).to eq(value)
           end
         end
+
+        expected_slug_response = expected[:secure_topic] == 200 ? 301 : expected[:secure_topic]
+        it "will return a #{expected_slug_response} when requesting a secure topic by slug" do
+          get "/t/#{secure_topic.slug}"
+          expect(response.status).to eq(expected_slug_response)
+        end
       end
 
       context 'without detailed error pages' do

From a788427b468e4bb14d747ea955401e288bff4357 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Wed, 27 May 2020 12:39:30 -0600
Subject: [PATCH 1401/1830] FIX: broken query if upload id is missing (#9900)

Log warnings if there are any errors trying to upload group flair image
and ensure upload.id exists before trying to use it in a sql query.
---
 app/jobs/onceoff/migrate_group_flair_images.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/jobs/onceoff/migrate_group_flair_images.rb b/app/jobs/onceoff/migrate_group_flair_images.rb
index 2b862cdf17..d613706065 100644
--- a/app/jobs/onceoff/migrate_group_flair_images.rb
+++ b/app/jobs/onceoff/migrate_group_flair_images.rb
@@ -77,7 +77,11 @@ module Jobs
           origin: UrlHelper.absolute(old_url)
         ).create_for(Discourse.system_user.id)
 
-        DB.exec("UPDATE groups SET flair_url = NULL, flair_upload_id = #{upload.id} WHERE id = #{group.id}") if upload.present?
+        if upload.errors.count > 0
+          logger.warn("Failed to create upload for '#{group_name}' group_flair: #{upload.errors.full_messages}")
+        else
+          DB.exec("UPDATE groups SET flair_url = NULL, flair_upload_id = #{upload.id} WHERE id = #{group.id}") if upload&.id.present?
+        end
       end
     end
 

From d3bd4821427ddbbf6a3c647117400aa8f8d56e54 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 27 May 2020 15:56:46 -0400
Subject: [PATCH 1402/1830] DEV: Import `MessageBus` from `message-bus-client`
 instead of globals (#9902)

---
 Gemfile.lock                                              | 2 +-
 app/assets/javascripts/admin/models/backup.js             | 5 +++--
 .../javascripts/{ember-shim.js => discourse-shims.js}     | 4 ++++
 .../app/pre-initializers/inject-discourse-objects.js      | 6 +++---
 app/assets/javascripts/ember_jquery.js                    | 1 -
 app/assets/javascripts/vendor.js                          | 1 +
 app/assets/javascripts/wizard/test/test_helper.js         | 2 +-
 test/javascripts/acceptance/topic-discovery-test.js       | 4 +++-
 test/javascripts/test_helper.js                           | 8 +++++---
 9 files changed, 21 insertions(+), 12 deletions(-)
 rename app/assets/javascripts/{ember-shim.js => discourse-shims.js} (82%)

diff --git a/Gemfile.lock b/Gemfile.lock
index 967f197bf7..f9ecf2ac1c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -183,7 +183,7 @@ GEM
       mini_mime (>= 0.1.1)
     maxminddb (0.1.22)
     memory_profiler (0.9.14)
-    message_bus (3.2.0)
+    message_bus (3.3.0)
       rack (>= 1.1.3)
     method_source (1.0.0)
     mini_mime (1.0.2)
diff --git a/app/assets/javascripts/admin/models/backup.js b/app/assets/javascripts/admin/models/backup.js
index 2c41e1ef9d..45727a28b2 100644
--- a/app/assets/javascripts/admin/models/backup.js
+++ b/app/assets/javascripts/admin/models/backup.js
@@ -2,6 +2,7 @@ import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import { extractError } from "discourse/lib/ajax-error";
 import EmberObject from "@ember/object";
+import MessageBus from "message-bus-client";
 
 const Backup = EmberObject.extend({
   destroy() {
@@ -11,7 +12,7 @@ const Backup = EmberObject.extend({
   restore() {
     return ajax("/admin/backups/" + this.filename + "/restore", {
       type: "POST",
-      data: { client_id: window.MessageBus.clientId }
+      data: { client_id: MessageBus.clientId }
     });
   }
 });
@@ -38,7 +39,7 @@ Backup.reopenClass({
       type: "POST",
       data: {
         with_uploads: withUploads,
-        client_id: window.MessageBus.clientId
+        client_id: MessageBus.clientId
       }
     }).then(result => {
       if (!result.success) {
diff --git a/app/assets/javascripts/ember-shim.js b/app/assets/javascripts/discourse-shims.js
similarity index 82%
rename from app/assets/javascripts/ember-shim.js
rename to app/assets/javascripts/discourse-shims.js
index 1837ae1b98..2cc9a02233 100644
--- a/app/assets/javascripts/ember-shim.js
+++ b/app/assets/javascripts/discourse-shims.js
@@ -12,3 +12,7 @@ define("ember", ["exports"], function(__exports__) {
 
   __exports__.default = Ember;
 });
+
+define("message-bus-client", [], function() {
+  return window.MessageBus;
+});
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
index 30d1fb4e02..045798e6a0 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
@@ -9,6 +9,7 @@ import TopicTrackingState, {
 import ScreenTrack from "discourse/lib/screen-track";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
+import MessageBus from "message-bus-client";
 
 const ALL_TARGETS = ["controller", "component", "route", "model", "adapter"];
 
@@ -27,8 +28,7 @@ export default {
       ALL_TARGETS.forEach(t => app.inject(t, "store", "service:store"));
     }
 
-    const messageBus = window.MessageBus;
-    app.register("message-bus:main", messageBus, { instantiate: false });
+    app.register("message-bus:main", MessageBus, { instantiate: false });
 
     ALL_TARGETS.concat("service").forEach(t =>
       app.inject(t, "messageBus", "message-bus:main")
@@ -39,7 +39,7 @@ export default {
     app.currentUser = currentUser;
 
     const topicTrackingState = TopicTrackingState.create({
-      messageBus,
+      messageBus: MessageBus,
       currentUser
     });
     app.register("topic-tracking-state:main", topicTrackingState, {
diff --git a/app/assets/javascripts/ember_jquery.js b/app/assets/javascripts/ember_jquery.js
index be7d57d802..51f31d5ed3 100644
--- a/app/assets/javascripts/ember_jquery.js
+++ b/app/assets/javascripts/ember_jquery.js
@@ -3,4 +3,3 @@
 //= require jquery
 //= require ember_include
 //= require discourse-loader
-//= require ember-shim
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index 64119c4940..5efe954acb 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -29,3 +29,4 @@
 //= require virtual-dom
 //= require virtual-dom-amd
 //= require intersection-observer
+//= require discourse-shims
diff --git a/app/assets/javascripts/wizard/test/test_helper.js b/app/assets/javascripts/wizard/test/test_helper.js
index c04a59f778..953ba72fda 100644
--- a/app/assets/javascripts/wizard/test/test_helper.js
+++ b/app/assets/javascripts/wizard/test/test_helper.js
@@ -12,7 +12,7 @@
 //= require ember-template-compiler
 //= require qunit/qunit/qunit
 //= require ember-qunit
-//= require ember-shim
+//= require discourse-shims
 //= require wizard-application
 //= require wizard-vendor
 //= require helpers/assertions
diff --git a/test/javascripts/acceptance/topic-discovery-test.js b/test/javascripts/acceptance/topic-discovery-test.js
index b29891853f..262a50c53e 100644
--- a/test/javascripts/acceptance/topic-discovery-test.js
+++ b/test/javascripts/acceptance/topic-discovery-test.js
@@ -1,4 +1,6 @@
 import { acceptance } from "helpers/qunit-helpers";
+import MessageBus from "message-bus-client";
+
 acceptance("Topic Discovery", {
   settings: {
     show_pinned_excerpt_desktop: true
@@ -85,7 +87,7 @@ QUnit.test("Live update unread state", async assert => {
   );
 
   // Mimic a messagebus message
-  window.MessageBus.callbacks.filterBy("channel", "/latest").map(c =>
+  MessageBus.callbacks.filterBy("channel", "/latest").map(c =>
     c.func({
       message_type: "read",
       topic_id: 11995,
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 5646f9847d..5e7c155edd 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -17,7 +17,7 @@
 
 // Stuff we need to load first
 //= require vendor
-//= require ember-shim
+//= require discourse-shims
 //= require pretty-text-bundle
 //= require markdown-it-bundle
 //= require application
@@ -55,8 +55,10 @@ sinon.config = {
 
 window.inTestEnv = true;
 
+let MessageBus = require("message-bus-client").default;
+
 // Stop the message bus so we don't get ajax calls
-window.MessageBus.stop();
+MessageBus.stop();
 
 // Trick JSHint into allow document.write
 var d = document;
@@ -191,7 +193,7 @@ QUnit.testDone(function() {
     window.Discourse.__container__
   );
 
-  window.MessageBus.unsubscribe("*");
+  MessageBus.unsubscribe("*");
   delete window.server;
   window.Mousetrap.reset();
 });

From 0f71d38d3a4b762ba4ad977dad5fcefb4685c87a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 27 May 2020 16:34:30 -0400
Subject: [PATCH 1403/1830] Revert "DEV: Import `MessageBus` from
 `message-bus-client` instead of globals (#9902)"

This reverts commit d3bd4821427ddbbf6a3c647117400aa8f8d56e54.
---
 Gemfile.lock                                              | 2 +-
 app/assets/javascripts/admin/models/backup.js             | 5 ++---
 .../app/pre-initializers/inject-discourse-objects.js      | 6 +++---
 .../javascripts/{discourse-shims.js => ember-shim.js}     | 4 ----
 app/assets/javascripts/ember_jquery.js                    | 1 +
 app/assets/javascripts/vendor.js                          | 1 -
 app/assets/javascripts/wizard/test/test_helper.js         | 2 +-
 test/javascripts/acceptance/topic-discovery-test.js       | 4 +---
 test/javascripts/test_helper.js                           | 8 +++-----
 9 files changed, 12 insertions(+), 21 deletions(-)
 rename app/assets/javascripts/{discourse-shims.js => ember-shim.js} (82%)

diff --git a/Gemfile.lock b/Gemfile.lock
index f9ecf2ac1c..967f197bf7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -183,7 +183,7 @@ GEM
       mini_mime (>= 0.1.1)
     maxminddb (0.1.22)
     memory_profiler (0.9.14)
-    message_bus (3.3.0)
+    message_bus (3.2.0)
       rack (>= 1.1.3)
     method_source (1.0.0)
     mini_mime (1.0.2)
diff --git a/app/assets/javascripts/admin/models/backup.js b/app/assets/javascripts/admin/models/backup.js
index 45727a28b2..2c41e1ef9d 100644
--- a/app/assets/javascripts/admin/models/backup.js
+++ b/app/assets/javascripts/admin/models/backup.js
@@ -2,7 +2,6 @@ import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import { extractError } from "discourse/lib/ajax-error";
 import EmberObject from "@ember/object";
-import MessageBus from "message-bus-client";
 
 const Backup = EmberObject.extend({
   destroy() {
@@ -12,7 +11,7 @@ const Backup = EmberObject.extend({
   restore() {
     return ajax("/admin/backups/" + this.filename + "/restore", {
       type: "POST",
-      data: { client_id: MessageBus.clientId }
+      data: { client_id: window.MessageBus.clientId }
     });
   }
 });
@@ -39,7 +38,7 @@ Backup.reopenClass({
       type: "POST",
       data: {
         with_uploads: withUploads,
-        client_id: MessageBus.clientId
+        client_id: window.MessageBus.clientId
       }
     }).then(result => {
       if (!result.success) {
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
index 045798e6a0..30d1fb4e02 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
@@ -9,7 +9,6 @@ import TopicTrackingState, {
 import ScreenTrack from "discourse/lib/screen-track";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
-import MessageBus from "message-bus-client";
 
 const ALL_TARGETS = ["controller", "component", "route", "model", "adapter"];
 
@@ -28,7 +27,8 @@ export default {
       ALL_TARGETS.forEach(t => app.inject(t, "store", "service:store"));
     }
 
-    app.register("message-bus:main", MessageBus, { instantiate: false });
+    const messageBus = window.MessageBus;
+    app.register("message-bus:main", messageBus, { instantiate: false });
 
     ALL_TARGETS.concat("service").forEach(t =>
       app.inject(t, "messageBus", "message-bus:main")
@@ -39,7 +39,7 @@ export default {
     app.currentUser = currentUser;
 
     const topicTrackingState = TopicTrackingState.create({
-      messageBus: MessageBus,
+      messageBus,
       currentUser
     });
     app.register("topic-tracking-state:main", topicTrackingState, {
diff --git a/app/assets/javascripts/discourse-shims.js b/app/assets/javascripts/ember-shim.js
similarity index 82%
rename from app/assets/javascripts/discourse-shims.js
rename to app/assets/javascripts/ember-shim.js
index 2cc9a02233..1837ae1b98 100644
--- a/app/assets/javascripts/discourse-shims.js
+++ b/app/assets/javascripts/ember-shim.js
@@ -12,7 +12,3 @@ define("ember", ["exports"], function(__exports__) {
 
   __exports__.default = Ember;
 });
-
-define("message-bus-client", [], function() {
-  return window.MessageBus;
-});
diff --git a/app/assets/javascripts/ember_jquery.js b/app/assets/javascripts/ember_jquery.js
index 51f31d5ed3..be7d57d802 100644
--- a/app/assets/javascripts/ember_jquery.js
+++ b/app/assets/javascripts/ember_jquery.js
@@ -3,3 +3,4 @@
 //= require jquery
 //= require ember_include
 //= require discourse-loader
+//= require ember-shim
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index 5efe954acb..64119c4940 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -29,4 +29,3 @@
 //= require virtual-dom
 //= require virtual-dom-amd
 //= require intersection-observer
-//= require discourse-shims
diff --git a/app/assets/javascripts/wizard/test/test_helper.js b/app/assets/javascripts/wizard/test/test_helper.js
index 953ba72fda..c04a59f778 100644
--- a/app/assets/javascripts/wizard/test/test_helper.js
+++ b/app/assets/javascripts/wizard/test/test_helper.js
@@ -12,7 +12,7 @@
 //= require ember-template-compiler
 //= require qunit/qunit/qunit
 //= require ember-qunit
-//= require discourse-shims
+//= require ember-shim
 //= require wizard-application
 //= require wizard-vendor
 //= require helpers/assertions
diff --git a/test/javascripts/acceptance/topic-discovery-test.js b/test/javascripts/acceptance/topic-discovery-test.js
index 262a50c53e..b29891853f 100644
--- a/test/javascripts/acceptance/topic-discovery-test.js
+++ b/test/javascripts/acceptance/topic-discovery-test.js
@@ -1,6 +1,4 @@
 import { acceptance } from "helpers/qunit-helpers";
-import MessageBus from "message-bus-client";
-
 acceptance("Topic Discovery", {
   settings: {
     show_pinned_excerpt_desktop: true
@@ -87,7 +85,7 @@ QUnit.test("Live update unread state", async assert => {
   );
 
   // Mimic a messagebus message
-  MessageBus.callbacks.filterBy("channel", "/latest").map(c =>
+  window.MessageBus.callbacks.filterBy("channel", "/latest").map(c =>
     c.func({
       message_type: "read",
       topic_id: 11995,
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 5e7c155edd..5646f9847d 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -17,7 +17,7 @@
 
 // Stuff we need to load first
 //= require vendor
-//= require discourse-shims
+//= require ember-shim
 //= require pretty-text-bundle
 //= require markdown-it-bundle
 //= require application
@@ -55,10 +55,8 @@ sinon.config = {
 
 window.inTestEnv = true;
 
-let MessageBus = require("message-bus-client").default;
-
 // Stop the message bus so we don't get ajax calls
-MessageBus.stop();
+window.MessageBus.stop();
 
 // Trick JSHint into allow document.write
 var d = document;
@@ -193,7 +191,7 @@ QUnit.testDone(function() {
     window.Discourse.__container__
   );
 
-  MessageBus.unsubscribe("*");
+  window.MessageBus.unsubscribe("*");
   delete window.server;
   window.Mousetrap.reset();
 });

From 9dddbcc00dd1b1f582f31eed756f672e8a56f9f5 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 27 May 2020 15:19:59 -0400
Subject: [PATCH 1404/1830] DEV: Import `MessageBus` from `message-bus-client`
 instead of globals

---
 Gemfile.lock                                              | 2 +-
 app/assets/javascripts/admin/models/backup.js             | 5 +++--
 .../javascripts/{ember-shim.js => discourse-shims.js}     | 4 ++++
 .../app/pre-initializers/inject-discourse-objects.js      | 6 +++---
 app/assets/javascripts/ember_jquery.js                    | 1 -
 app/assets/javascripts/vendor.js                          | 1 +
 app/assets/javascripts/wizard/test/test_helper.js         | 2 +-
 test/javascripts/acceptance/topic-discovery-test.js       | 4 +++-
 test/javascripts/test_helper.js                           | 8 +++++---
 9 files changed, 21 insertions(+), 12 deletions(-)
 rename app/assets/javascripts/{ember-shim.js => discourse-shims.js} (76%)

diff --git a/Gemfile.lock b/Gemfile.lock
index 967f197bf7..f9ecf2ac1c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -183,7 +183,7 @@ GEM
       mini_mime (>= 0.1.1)
     maxminddb (0.1.22)
     memory_profiler (0.9.14)
-    message_bus (3.2.0)
+    message_bus (3.3.0)
       rack (>= 1.1.3)
     method_source (1.0.0)
     mini_mime (1.0.2)
diff --git a/app/assets/javascripts/admin/models/backup.js b/app/assets/javascripts/admin/models/backup.js
index 2c41e1ef9d..45727a28b2 100644
--- a/app/assets/javascripts/admin/models/backup.js
+++ b/app/assets/javascripts/admin/models/backup.js
@@ -2,6 +2,7 @@ import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import { extractError } from "discourse/lib/ajax-error";
 import EmberObject from "@ember/object";
+import MessageBus from "message-bus-client";
 
 const Backup = EmberObject.extend({
   destroy() {
@@ -11,7 +12,7 @@ const Backup = EmberObject.extend({
   restore() {
     return ajax("/admin/backups/" + this.filename + "/restore", {
       type: "POST",
-      data: { client_id: window.MessageBus.clientId }
+      data: { client_id: MessageBus.clientId }
     });
   }
 });
@@ -38,7 +39,7 @@ Backup.reopenClass({
       type: "POST",
       data: {
         with_uploads: withUploads,
-        client_id: window.MessageBus.clientId
+        client_id: MessageBus.clientId
       }
     }).then(result => {
       if (!result.success) {
diff --git a/app/assets/javascripts/ember-shim.js b/app/assets/javascripts/discourse-shims.js
similarity index 76%
rename from app/assets/javascripts/ember-shim.js
rename to app/assets/javascripts/discourse-shims.js
index 1837ae1b98..f790ed9b05 100644
--- a/app/assets/javascripts/ember-shim.js
+++ b/app/assets/javascripts/discourse-shims.js
@@ -12,3 +12,7 @@ define("ember", ["exports"], function(__exports__) {
 
   __exports__.default = Ember;
 });
+
+define("message-bus-client", ["exports"], function(__exports__) {
+  __exports__.default = window.MessageBus;
+});
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
index 30d1fb4e02..045798e6a0 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
@@ -9,6 +9,7 @@ import TopicTrackingState, {
 import ScreenTrack from "discourse/lib/screen-track";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
+import MessageBus from "message-bus-client";
 
 const ALL_TARGETS = ["controller", "component", "route", "model", "adapter"];
 
@@ -27,8 +28,7 @@ export default {
       ALL_TARGETS.forEach(t => app.inject(t, "store", "service:store"));
     }
 
-    const messageBus = window.MessageBus;
-    app.register("message-bus:main", messageBus, { instantiate: false });
+    app.register("message-bus:main", MessageBus, { instantiate: false });
 
     ALL_TARGETS.concat("service").forEach(t =>
       app.inject(t, "messageBus", "message-bus:main")
@@ -39,7 +39,7 @@ export default {
     app.currentUser = currentUser;
 
     const topicTrackingState = TopicTrackingState.create({
-      messageBus,
+      messageBus: MessageBus,
       currentUser
     });
     app.register("topic-tracking-state:main", topicTrackingState, {
diff --git a/app/assets/javascripts/ember_jquery.js b/app/assets/javascripts/ember_jquery.js
index be7d57d802..51f31d5ed3 100644
--- a/app/assets/javascripts/ember_jquery.js
+++ b/app/assets/javascripts/ember_jquery.js
@@ -3,4 +3,3 @@
 //= require jquery
 //= require ember_include
 //= require discourse-loader
-//= require ember-shim
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index 64119c4940..5efe954acb 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -29,3 +29,4 @@
 //= require virtual-dom
 //= require virtual-dom-amd
 //= require intersection-observer
+//= require discourse-shims
diff --git a/app/assets/javascripts/wizard/test/test_helper.js b/app/assets/javascripts/wizard/test/test_helper.js
index c04a59f778..953ba72fda 100644
--- a/app/assets/javascripts/wizard/test/test_helper.js
+++ b/app/assets/javascripts/wizard/test/test_helper.js
@@ -12,7 +12,7 @@
 //= require ember-template-compiler
 //= require qunit/qunit/qunit
 //= require ember-qunit
-//= require ember-shim
+//= require discourse-shims
 //= require wizard-application
 //= require wizard-vendor
 //= require helpers/assertions
diff --git a/test/javascripts/acceptance/topic-discovery-test.js b/test/javascripts/acceptance/topic-discovery-test.js
index b29891853f..262a50c53e 100644
--- a/test/javascripts/acceptance/topic-discovery-test.js
+++ b/test/javascripts/acceptance/topic-discovery-test.js
@@ -1,4 +1,6 @@
 import { acceptance } from "helpers/qunit-helpers";
+import MessageBus from "message-bus-client";
+
 acceptance("Topic Discovery", {
   settings: {
     show_pinned_excerpt_desktop: true
@@ -85,7 +87,7 @@ QUnit.test("Live update unread state", async assert => {
   );
 
   // Mimic a messagebus message
-  window.MessageBus.callbacks.filterBy("channel", "/latest").map(c =>
+  MessageBus.callbacks.filterBy("channel", "/latest").map(c =>
     c.func({
       message_type: "read",
       topic_id: 11995,
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 5646f9847d..5e7c155edd 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -17,7 +17,7 @@
 
 // Stuff we need to load first
 //= require vendor
-//= require ember-shim
+//= require discourse-shims
 //= require pretty-text-bundle
 //= require markdown-it-bundle
 //= require application
@@ -55,8 +55,10 @@ sinon.config = {
 
 window.inTestEnv = true;
 
+let MessageBus = require("message-bus-client").default;
+
 // Stop the message bus so we don't get ajax calls
-window.MessageBus.stop();
+MessageBus.stop();
 
 // Trick JSHint into allow document.write
 var d = document;
@@ -191,7 +193,7 @@ QUnit.testDone(function() {
     window.Discourse.__container__
   );
 
-  window.MessageBus.unsubscribe("*");
+  MessageBus.unsubscribe("*");
   delete window.server;
   window.Mousetrap.reset();
 });

From 75f46ca63238558730cec51cc2814a1e80644e56 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 27 May 2020 22:47:46 +0200
Subject: [PATCH 1405/1830] DEV: Fix a deprecated `ember` import (#9903)

See the following for `Ember.testing` and `@ember/debug isTesting`:

* https://github.com/emberjs/ember.js/blob/8cf29959f76eee822192cb820347113d050b204e/packages/ember/index.js#L372-L376
* https://github.com/emberjs/ember.js/blob/8cf29959f76eee822192cb820347113d050b204e/packages/%40ember/debug/lib/testing.ts
---
 app/assets/javascripts/discourse-loader.js                  | 1 +
 .../javascripts/discourse/app/helpers/page-reloader.js      | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index fc829ae12f..6e36f805b1 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -29,6 +29,7 @@ var define, requirejs;
         inject: Ember.inject.controller
       },
       "@ember/debug": {
+        isTesting: () => Ember.testing,
         warn: Ember.warn
       },
       "@ember/object": {
diff --git a/app/assets/javascripts/discourse/app/helpers/page-reloader.js b/app/assets/javascripts/discourse/app/helpers/page-reloader.js
index 6429be3a3c..ad971590cf 100644
--- a/app/assets/javascripts/discourse/app/helpers/page-reloader.js
+++ b/app/assets/javascripts/discourse/app/helpers/page-reloader.js
@@ -1,9 +1,9 @@
 import EmberObject from "@ember/object";
-import Ember from "ember";
+import { isTesting } from "@ember/debug";
 
 export default EmberObject.create({
-  reload: function() {
-    if (!Ember.testing) {
+  reload() {
+    if (!isTesting()) {
       location.reload();
     }
   }

From 6548cd1a969746b37f505c37a1ba5ff8dd4e774a Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Wed, 27 May 2020 14:49:00 -0600
Subject: [PATCH 1406/1830] FIX: sending messages to groups with non-lowercase
 names

Fixes a regression in

e8fb9d406667c758cba0f7b1cc779e1ceb352c4c

which caused a bug where you couldn't send a message to a group that
contained an Uppercase letter. Added a test case for this.

Bug report: https://meta.discourse.org/t/-/152999
---
 app/controllers/posts_controller.rb    |  2 +-
 lib/topic_creator.rb                   |  4 ++--
 spec/requests/posts_controller_spec.rb | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 4830b3b979..4ee3b294af 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -748,7 +748,7 @@ class PostsController < ApplicationController
 
     if recipients
       recipients = recipients.split(",").map(&:downcase)
-      groups = Group.messageable(current_user).where('lower(name) in (?)', recipients).pluck('name')
+      groups = Group.messageable(current_user).where('lower(name) in (?)', recipients).pluck('lower(name)')
       recipients -= groups
       emails = recipients.select { |user| user.match(/@/) }
       recipients -= emails
diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb
index d86f1c461a..c52396b8f6 100644
--- a/lib/topic_creator.rb
+++ b/lib/topic_creator.rb
@@ -246,10 +246,10 @@ class TopicCreator
 
   def add_groups(topic, groups)
     return unless groups
-    names = groups.split(',').flatten
+    names = groups.split(',').flatten.map(&:downcase)
     len = 0
 
-    Group.where(name: names).each do |group|
+    Group.where('lower(name) in (?)', names).each do |group|
       check_can_send_permission!(topic, group)
       topic.topic_allowed_groups.build(group_id: group.id)
       len += 1
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 910cb5b95d..e9ed6c4d17 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -838,6 +838,30 @@ describe PostsController do
         expect(post.topic.topic_allowed_groups.length).to eq(1)
       end
 
+      it "can send a message to a group with caps" do
+        group = Group.create(name: 'Test_group', messageable_level: Group::ALIAS_LEVELS[:nobody])
+        user1 = user
+        group.add(user1)
+
+        # allow pm to this group
+        group.update_columns(messageable_level: Group::ALIAS_LEVELS[:everyone])
+
+        post "/posts.json", params: {
+          raw: 'I can haz a test',
+          title: 'I loves my test',
+          target_recipients: "test_Group",
+          archetype: Archetype.private_message
+        }
+
+        expect(response.status).to eq(200)
+
+        parsed = response.parsed_body
+        post = Post.find(parsed['id'])
+
+        expect(post.topic.topic_allowed_users.length).to eq(1)
+        expect(post.topic.topic_allowed_groups.length).to eq(1)
+      end
+
       it "returns the nested post with a param" do
         post "/posts.json", params: {
           raw: 'this is the test content',

From b10e995d9d8cf92adffb810f68bce7c3f75dabf0 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Wed, 27 May 2020 16:14:09 -0600
Subject: [PATCH 1407/1830] Revert "DEV: Import `MessageBus` from
 `message-bus-client` instead of globals"

This reverts commit 9dddbcc00dd1b1f582f31eed756f672e8a56f9f5.
---
 Gemfile.lock                                              | 2 +-
 app/assets/javascripts/admin/models/backup.js             | 5 ++---
 .../app/pre-initializers/inject-discourse-objects.js      | 6 +++---
 .../javascripts/{discourse-shims.js => ember-shim.js}     | 4 ----
 app/assets/javascripts/ember_jquery.js                    | 1 +
 app/assets/javascripts/vendor.js                          | 1 -
 app/assets/javascripts/wizard/test/test_helper.js         | 2 +-
 test/javascripts/acceptance/topic-discovery-test.js       | 4 +---
 test/javascripts/test_helper.js                           | 8 +++-----
 9 files changed, 12 insertions(+), 21 deletions(-)
 rename app/assets/javascripts/{discourse-shims.js => ember-shim.js} (76%)

diff --git a/Gemfile.lock b/Gemfile.lock
index f9ecf2ac1c..967f197bf7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -183,7 +183,7 @@ GEM
       mini_mime (>= 0.1.1)
     maxminddb (0.1.22)
     memory_profiler (0.9.14)
-    message_bus (3.3.0)
+    message_bus (3.2.0)
       rack (>= 1.1.3)
     method_source (1.0.0)
     mini_mime (1.0.2)
diff --git a/app/assets/javascripts/admin/models/backup.js b/app/assets/javascripts/admin/models/backup.js
index 45727a28b2..2c41e1ef9d 100644
--- a/app/assets/javascripts/admin/models/backup.js
+++ b/app/assets/javascripts/admin/models/backup.js
@@ -2,7 +2,6 @@ import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import { extractError } from "discourse/lib/ajax-error";
 import EmberObject from "@ember/object";
-import MessageBus from "message-bus-client";
 
 const Backup = EmberObject.extend({
   destroy() {
@@ -12,7 +11,7 @@ const Backup = EmberObject.extend({
   restore() {
     return ajax("/admin/backups/" + this.filename + "/restore", {
       type: "POST",
-      data: { client_id: MessageBus.clientId }
+      data: { client_id: window.MessageBus.clientId }
     });
   }
 });
@@ -39,7 +38,7 @@ Backup.reopenClass({
       type: "POST",
       data: {
         with_uploads: withUploads,
-        client_id: MessageBus.clientId
+        client_id: window.MessageBus.clientId
       }
     }).then(result => {
       if (!result.success) {
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
index 045798e6a0..30d1fb4e02 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
@@ -9,7 +9,6 @@ import TopicTrackingState, {
 import ScreenTrack from "discourse/lib/screen-track";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
-import MessageBus from "message-bus-client";
 
 const ALL_TARGETS = ["controller", "component", "route", "model", "adapter"];
 
@@ -28,7 +27,8 @@ export default {
       ALL_TARGETS.forEach(t => app.inject(t, "store", "service:store"));
     }
 
-    app.register("message-bus:main", MessageBus, { instantiate: false });
+    const messageBus = window.MessageBus;
+    app.register("message-bus:main", messageBus, { instantiate: false });
 
     ALL_TARGETS.concat("service").forEach(t =>
       app.inject(t, "messageBus", "message-bus:main")
@@ -39,7 +39,7 @@ export default {
     app.currentUser = currentUser;
 
     const topicTrackingState = TopicTrackingState.create({
-      messageBus: MessageBus,
+      messageBus,
       currentUser
     });
     app.register("topic-tracking-state:main", topicTrackingState, {
diff --git a/app/assets/javascripts/discourse-shims.js b/app/assets/javascripts/ember-shim.js
similarity index 76%
rename from app/assets/javascripts/discourse-shims.js
rename to app/assets/javascripts/ember-shim.js
index f790ed9b05..1837ae1b98 100644
--- a/app/assets/javascripts/discourse-shims.js
+++ b/app/assets/javascripts/ember-shim.js
@@ -12,7 +12,3 @@ define("ember", ["exports"], function(__exports__) {
 
   __exports__.default = Ember;
 });
-
-define("message-bus-client", ["exports"], function(__exports__) {
-  __exports__.default = window.MessageBus;
-});
diff --git a/app/assets/javascripts/ember_jquery.js b/app/assets/javascripts/ember_jquery.js
index 51f31d5ed3..be7d57d802 100644
--- a/app/assets/javascripts/ember_jquery.js
+++ b/app/assets/javascripts/ember_jquery.js
@@ -3,3 +3,4 @@
 //= require jquery
 //= require ember_include
 //= require discourse-loader
+//= require ember-shim
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index 5efe954acb..64119c4940 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -29,4 +29,3 @@
 //= require virtual-dom
 //= require virtual-dom-amd
 //= require intersection-observer
-//= require discourse-shims
diff --git a/app/assets/javascripts/wizard/test/test_helper.js b/app/assets/javascripts/wizard/test/test_helper.js
index 953ba72fda..c04a59f778 100644
--- a/app/assets/javascripts/wizard/test/test_helper.js
+++ b/app/assets/javascripts/wizard/test/test_helper.js
@@ -12,7 +12,7 @@
 //= require ember-template-compiler
 //= require qunit/qunit/qunit
 //= require ember-qunit
-//= require discourse-shims
+//= require ember-shim
 //= require wizard-application
 //= require wizard-vendor
 //= require helpers/assertions
diff --git a/test/javascripts/acceptance/topic-discovery-test.js b/test/javascripts/acceptance/topic-discovery-test.js
index 262a50c53e..b29891853f 100644
--- a/test/javascripts/acceptance/topic-discovery-test.js
+++ b/test/javascripts/acceptance/topic-discovery-test.js
@@ -1,6 +1,4 @@
 import { acceptance } from "helpers/qunit-helpers";
-import MessageBus from "message-bus-client";
-
 acceptance("Topic Discovery", {
   settings: {
     show_pinned_excerpt_desktop: true
@@ -87,7 +85,7 @@ QUnit.test("Live update unread state", async assert => {
   );
 
   // Mimic a messagebus message
-  MessageBus.callbacks.filterBy("channel", "/latest").map(c =>
+  window.MessageBus.callbacks.filterBy("channel", "/latest").map(c =>
     c.func({
       message_type: "read",
       topic_id: 11995,
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 5e7c155edd..5646f9847d 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -17,7 +17,7 @@
 
 // Stuff we need to load first
 //= require vendor
-//= require discourse-shims
+//= require ember-shim
 //= require pretty-text-bundle
 //= require markdown-it-bundle
 //= require application
@@ -55,10 +55,8 @@ sinon.config = {
 
 window.inTestEnv = true;
 
-let MessageBus = require("message-bus-client").default;
-
 // Stop the message bus so we don't get ajax calls
-MessageBus.stop();
+window.MessageBus.stop();
 
 // Trick JSHint into allow document.write
 var d = document;
@@ -193,7 +191,7 @@ QUnit.testDone(function() {
     window.Discourse.__container__
   );
 
-  MessageBus.unsubscribe("*");
+  window.MessageBus.unsubscribe("*");
   delete window.server;
   window.Mousetrap.reset();
 });

From ee60488e6aca4f9a720c60a1b083a46c365e5b60 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Wed, 27 May 2020 16:57:56 -0700
Subject: [PATCH 1408/1830] DEV: add acceptance test for encoded subcategory

follow-up on 63323bd7a8ff2128abf10c675bcad225dab13cd2

Add acceptance tests on ember routing to ensure that ember can route
to a sub-category via slug-only.

https://github.com/discourse/discourse/commit/63323bd7a8ff2128abf10c675bcad225dab13cd2
---
 .../acceptance/encoded-category-test.js       | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 test/javascripts/acceptance/encoded-category-test.js

diff --git a/test/javascripts/acceptance/encoded-category-test.js b/test/javascripts/acceptance/encoded-category-test.js
new file mode 100644
index 0000000000..bc64c0825c
--- /dev/null
+++ b/test/javascripts/acceptance/encoded-category-test.js
@@ -0,0 +1,56 @@
+import { acceptance } from "helpers/qunit-helpers";
+import DiscoveryFixtures from "fixtures/discovery_fixtures";
+
+acceptance("Encoded Sub Category Discovery", {
+  pretend(server, helper) {
+    server.get(
+      "/c/%E6%BC%A2%E5%AD%97-parent/%E6%BC%A2%E5%AD%97-subcategory/6/l/latest.json",
+      () => {
+        return helper.response(
+          DiscoveryFixtures["/latest_can_create_topic.json"]
+        );
+      }
+    );
+    server.get(
+      "/c/%E6%BC%A2%E5%AD%97-parent/%E6%BC%A2%E5%AD%97-subcategory/find_by_slug.json",
+      () => {
+        //respond with an error here: these tests are to check that ember can route this itself without falling back to rails
+        return helper.response(500, {});
+      }
+    );
+  },
+  settings: {
+    slug_generation_method: "encoded"
+  },
+  site: {
+    categories: [
+      {
+        id: 5,
+        name: "漢字-parent",
+        slug: "%E6%BC%A2%E5%AD%97-parent",
+        permission: null
+      },
+      {
+        id: 6,
+        name: "漢字-subcategory",
+        slug: "%E6%BC%A2%E5%AD%97-subcategory",
+        permission: null,
+        parent_category_id: 5
+      }
+    ]
+  }
+});
+
+QUnit.test("Visit subcategory by slug", async assert => {
+  let bodySelector =
+    "body.category-\\%E6\\%BC\\%A2\\%E5\\%AD\\%97-parent-\\%E6\\%BC\\%A2\\%E5\\%AD\\%97-subcategory";
+  await visit("/c/%E6%BC%A2%E5%AD%97-parent/%E6%BC%A2%E5%AD%97-subcategory");
+  assert.ok($(bodySelector).length, "has the default navigation");
+  assert.ok(exists(".topic-list"), "The list of topics was rendered");
+  assert.ok(exists(".topic-list .topic-list-item"), "has topics");
+
+  await visit("/c/漢字-parent/漢字-subcategory");
+  assert.ok($(bodySelector).length, "has the default navigation");
+  assert.ok(exists(".topic-list"), "The list of topics was rendered");
+  assert.ok(exists(".topic-list .topic-list-item"), "has topics");
+});

From 9841569bba56dd680d0676a07451b8cc1a6daa79 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 28 May 2020 10:04:08 +1000
Subject: [PATCH 1409/1830] Revert "DEV: Fix a deprecated `ember` import
 (#9903)"

This reverts commit 75f46ca63238558730cec51cc2814a1e80644e56.

This unfortunately breaks

`RAILS_ENV=production bin/rake assets:precompile`

I don't think discourse-loader.js is transpiled
---
 app/assets/javascripts/discourse-loader.js                  | 1 -
 .../javascripts/discourse/app/helpers/page-reloader.js      | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 6e36f805b1..fc829ae12f 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -29,7 +29,6 @@ var define, requirejs;
         inject: Ember.inject.controller
       },
       "@ember/debug": {
-        isTesting: () => Ember.testing,
         warn: Ember.warn
       },
       "@ember/object": {
diff --git a/app/assets/javascripts/discourse/app/helpers/page-reloader.js b/app/assets/javascripts/discourse/app/helpers/page-reloader.js
index ad971590cf..6429be3a3c 100644
--- a/app/assets/javascripts/discourse/app/helpers/page-reloader.js
+++ b/app/assets/javascripts/discourse/app/helpers/page-reloader.js
@@ -1,9 +1,9 @@
 import EmberObject from "@ember/object";
-import { isTesting } from "@ember/debug";
+import Ember from "ember";
 
 export default EmberObject.create({
-  reload() {
-    if (!isTesting()) {
+  reload: function() {
+    if (!Ember.testing) {
       location.reload();
     }
   }

From b9d9bbb95f41f688e6a9c2deb3e4651dd1663b46 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 27 May 2020 22:19:00 -0400
Subject: [PATCH 1410/1830] UX: More consistent alignment of topic timer's
 selected datetimes

---
 .../common/select-kit/future-date-input-selector.scss     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss b/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss
index 2f67cf9642..a047c910f7 100644
--- a/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss
+++ b/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss
@@ -10,9 +10,13 @@
       }
 
       .future-date-input-selector-datetime {
-        color: lighten($primary, 40%);
-        margin-left: 5px;
+        color: $primary-medium;
+        margin-left: auto;
         white-space: nowrap;
+
+        + svg {
+          margin-left: 0.25em;
+        }
       }
 
       .future-date-input-selector-icons {

From c8370b9c78df1161aa3db2699bbd53c3e04b9925 Mon Sep 17 00:00:00 2001
From: Michael Brown <michael.brown@discourse.org>
Date: Wed, 27 May 2020 22:31:00 -0400
Subject: [PATCH 1411/1830] DEV: remove objects that do not exist in the repo
 from .git-blame-ignore-revs (#9904)

* a freshly cloned repo does not have these objects
---
 .git-blame-ignore-revs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index e848bdcf4c..4eb8ad5f07 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -11,24 +11,12 @@ dafd3c3b47f116c6c1dc56cb18df614c11747733
 # Rename many `.js.es6` files to `.js`
 032205e2029cbf82dc8f05b459fb93adf2503c60
 
-# Rename admin app es6 -> js
-181758e3248b14ad8b53abe063da8dc6a82d3089
-
 # Rename pretty-text from es6 -> js
 c15056650647e8650288f973d9038500dc9cf7bb
 
-# Rename select kit from es6 -> js
-acc5cbdf8ecb9293a0fa9474ee73baf499c02428
-
 # Rename wizard from es6 -> js
 1ac02422011f89716ab27250d39b0e0212e03892
 
-# Rename some root files
-11938d58d4b1bea1ff43306450da7b24f05db0a
-
-# The last remaining ES6
-aabeb17aab4e73de5ef56753ab22ef5d416d2932
-
 # DEV: enforces block-indentation of ember-template-lint rules
 b66b277dc44bcd2122dc21965dab209c30636214
 

From ecc8e559ecd615542f766d74ded50a6cdbc320eb Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 28 May 2020 15:15:11 +1000
Subject: [PATCH 1412/1830] UX: remove edit PM button

Edit PM button leads to confusion and is uneeded
---
 .../app/initializers/topic-footer-buttons.js   | 18 ------------------
 .../acceptance/personal-message-test.js        | 14 --------------
 2 files changed, 32 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
index a2de76d3e9..121891c229 100644
--- a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
+++ b/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
@@ -7,7 +7,6 @@ const SHARE_PRIORITY = 1000;
 const BOOKMARK_PRIORITY = 900;
 const ARCHIVE_PRIORITY = 800;
 const FLAG_PRIORITY = 700;
-const EDIT_MESSAGE_PRIORITY = 600;
 const DEFER_PRIORITY = 500;
 
 export default {
@@ -166,23 +165,6 @@ export default {
       }
     });
 
-    registerTopicFooterButton({
-      id: "edit-message",
-      priority: EDIT_MESSAGE_PRIORITY,
-      icon: "pencil-alt",
-      label: "topic.edit_message.title",
-      title: "topic.edit_message.help",
-      action: "editFirstPost",
-      classNames: ["edit-message"],
-      dependentKeys: ["editFirstPost", "showEditOnFooter"],
-      dropdown() {
-        return this.site.mobileView && this.get("topic.isPrivateMessage");
-      },
-      displayed() {
-        return this.showEditOnFooter;
-      }
-    });
-
     registerTopicFooterButton({
       id: "defer",
       icon: "circle",
diff --git a/test/javascripts/acceptance/personal-message-test.js b/test/javascripts/acceptance/personal-message-test.js
index 4762d456c3..ba36782eaa 100644
--- a/test/javascripts/acceptance/personal-message-test.js
+++ b/test/javascripts/acceptance/personal-message-test.js
@@ -24,17 +24,3 @@ QUnit.test("suggested messages", async assert => {
     I18n.t("suggested_topics.pm_title")
   );
 });
-
-acceptance("Personal Message Tagging", {
-  loggedIn: true,
-  site: { can_tag_pms: true }
-});
-
-QUnit.test("show footer edit button", async assert => {
-  await visit("/t/pm-for-testing/12");
-
-  assert.ok(
-    exists(".edit-message"),
-    "shows edit first post button on footer when PM tagging is enabled"
-  );
-});

From 08547851756e90599576c03fc465acee5dbe4d36 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 28 May 2020 08:30:31 +0200
Subject: [PATCH 1413/1830] FIX: allows to define label/title properties for
 display instead of name

Usage:

```
const content = [{foo: "FOO", bar: "BAR", value: 1, name: "foo-bar"}];

{{combo-box
  content=content
  value=value
  labelProperty="foo"
  titleProperty="bar"
}}
```
---
 .../admin/templates/user-index.hbs            |  1 +
 .../select-kit/addon/components/select-kit.js |  4 ++
 .../components/select-kit/select-kit-row.js   | 17 +++++---
 .../addon/components/selected-name.js         | 20 +++++++--
 .../select-kit/single-select-test.js          | 42 +++++++++++++++++++
 test/javascripts/helpers/select-kit-helper.js |  8 +++-
 6 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 1353ed0d78..df9a6e196f 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -517,6 +517,7 @@
         {{admin-group-selector
           content=availableGroups
           value=customGroupIdsBuffer
+          labelProperty="name"
           onChange=(action (mut customGroupIdsBuffer))
         }}
       </div>
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit.js b/app/assets/javascripts/select-kit/addon/components/select-kit.js
index 02acfb5a2e..8ad01cc338 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit.js
@@ -57,6 +57,8 @@ export default Component.extend(
     nameProperty: "name",
     singleSelect: false,
     multiSelect: false,
+    labelProperty: null,
+    titleProperty: null,
 
     init() {
       this._super(...arguments);
@@ -76,6 +78,8 @@ export default Component.extend(
           uniqueID: guidFor(this),
           valueProperty: this.valueProperty,
           nameProperty: this.nameProperty,
+          labelProperty: this.labelProperty,
+          titleProperty: this.titleProperty,
           options: EmberObject.create(),
 
           isLoading: false,
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 c3ab6024b0..452e46a2b0 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
@@ -38,13 +38,18 @@ export default Component.extend(UtilsMixin, {
     return this.getProperty(this.item, "ariaLabel") || this.title;
   }),
 
-  title: computed("item.title", "rowName", function() {
-    return this.getProperty(this.item, "title") || this.rowName;
+  title: computed("rowTitle", "item.title", "rowName", function() {
+    return (
+      this.rowTitle || this.getProperty(this.item, "title") || this.rowName
+    );
   }),
 
-  label: computed("item.label", "title", "rowName", function() {
+  label: computed("rowLabel", "item.label", "title", "rowName", function() {
     const label =
-      this.getProperty(this.item, "label") || this.title || this.rowName;
+      this.rowLabel ||
+      this.getProperty(this.item, "label") ||
+      this.title ||
+      this.rowName;
     if (
       this.selectKit.options.allowAny &&
       this.rowValue === this.selectKit.filter &&
@@ -61,7 +66,9 @@ export default Component.extend(UtilsMixin, {
 
     this.setProperties({
       rowName: this.getName(this.item),
-      rowValue: this.getValue(this.item)
+      rowValue: this.getValue(this.item),
+      rowLabel: this.getProperty(this.item, "labelProperty"),
+      rowTitle: this.getProperty(this.item, "titleProperty")
     });
   },
 
diff --git a/app/assets/javascripts/select-kit/addon/components/selected-name.js b/app/assets/javascripts/select-kit/addon/components/selected-name.js
index e1c75a6e5f..fc357bfa35 100644
--- a/app/assets/javascripts/select-kit/addon/components/selected-name.js
+++ b/app/assets/javascripts/select-kit/addon/components/selected-name.js
@@ -22,6 +22,8 @@ export default Component.extend(UtilsMixin, {
 
     // we can't listen on `item.nameProperty` given it's variable
     this.setProperties({
+      headerLabel: this.getProperty(this.item, "labelProperty"),
+      headerTitle: this.getProperty(this.item, "titleProperty"),
       name: this.getName(this.item),
       value:
         this.item === this.selectKit.noneItem ? null : this.getValue(this.item)
@@ -38,12 +40,22 @@ export default Component.extend(UtilsMixin, {
     return String(this.title).replace("&hellip;", "");
   }),
 
-  title: computed("item", function() {
-    return this._safeProperty("title", this.item) || this.name || "";
+  title: computed("headerTitle", "item", function() {
+    return (
+      this.headerTitle ||
+      this._safeProperty("title", this.item) ||
+      this.name ||
+      ""
+    );
   }),
 
-  label: computed("title", "name", function() {
-    return this._safeProperty("label", this.item) || this.title || this.name;
+  label: computed("headerLabel", "title", "name", function() {
+    return (
+      this.headerLabel ||
+      this._safeProperty("label", this.item) ||
+      this.title ||
+      this.name
+    );
   }),
 
   icons: computed("item.{icon,icons}", function() {
diff --git a/test/javascripts/components/select-kit/single-select-test.js b/test/javascripts/components/select-kit/single-select-test.js
index cb89c596b4..022f94eedd 100644
--- a/test/javascripts/components/select-kit/single-select-test.js
+++ b/test/javascripts/components/select-kit/single-select-test.js
@@ -296,3 +296,45 @@ componentTest("focusAfterOnChange", {
     );
   }
 });
+
+componentTest("labelProperty", {
+  template: '{{single-select labelProperty="foo" value=value content=content}}',
+
+  beforeEach() {
+    this.setProperties({
+      content: [{ id: 1, name: "john", foo: "JACKSON" }],
+      value: 1
+    });
+  },
+
+  async test(assert) {
+    assert.equal(this.subject.header().label(), "JACKSON");
+
+    await this.subject.expand();
+
+    const row = this.subject.rowByValue(1);
+
+    assert.equal(row.label(), "JACKSON");
+  }
+});
+
+componentTest("titleProperty", {
+  template: '{{single-select titleProperty="foo" value=value content=content}}',
+
+  beforeEach() {
+    this.setProperties({
+      content: [{ id: 1, name: "john", foo: "JACKSON" }],
+      value: 1
+    });
+  },
+
+  async test(assert) {
+    assert.equal(this.subject.header().title(), "JACKSON");
+
+    await this.subject.expand();
+
+    const row = this.subject.rowByValue(1);
+
+    assert.equal(row.title(), "JACKSON");
+  }
+});
diff --git a/test/javascripts/helpers/select-kit-helper.js b/test/javascripts/helpers/select-kit-helper.js
index f795991326..f470d5c1f2 100644
--- a/test/javascripts/helpers/select-kit-helper.js
+++ b/test/javascripts/helpers/select-kit-helper.js
@@ -95,6 +95,12 @@ function rowHelper(row) {
     title() {
       return row.attr("title");
     },
+    label() {
+      return row
+        .find(".name")
+        .text()
+        .trim();
+    },
     value() {
       const value = row.attr("data-value");
       return isEmpty(value) ? null : value;
@@ -124,7 +130,7 @@ function headerHelper(header) {
       return header.find(".d-icon");
     },
     title() {
-      return header.attr("title");
+      return header.find(".selected-name").attr("title");
     },
     el() {
       return header;

From 8c86a109bbb95896701b17731c625da2e20ee399 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 28 May 2020 15:40:37 +0800
Subject: [PATCH 1414/1830] DEV: Add ENV flag to test out
 `ActiveRecord::Failover`.

---
 Gemfile                                   |  2 +-
 Gemfile.lock                              | 13 +++++++---
 app/models/global_setting.rb              | 30 +++++++++--------------
 config/application.rb                     |  4 +--
 config/initializers/001-redis.rb          | 15 ------------
 config/initializers/002-rails_failover.rb | 17 +++++++++++++
 6 files changed, 41 insertions(+), 40 deletions(-)
 create mode 100644 config/initializers/002-rails_failover.rb

diff --git a/Gemfile b/Gemfile
index a80f23dbc0..9cfaff2d88 100644
--- a/Gemfile
+++ b/Gemfile
@@ -249,4 +249,4 @@ gem 'webpush', require: false
 gem 'colored2', require: false
 gem 'maxminddb'
 
-gem 'rails_failover', require: false
+gem 'rails_failover', require: false, git: 'https://github.com/discourse/rails_failover'
diff --git a/Gemfile.lock b/Gemfile.lock
index 967f197bf7..ba0aba295a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,12 @@
+GIT
+  remote: https://github.com/discourse/rails_failover
+  revision: ba904987444b96a3fb627ed0b145059ff9f1cf6c
+  specs:
+    rails_failover (0.4.0)
+      activerecord (~> 6.0)
+      listen (~> 3.2)
+      railties (~> 6.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -277,8 +286,6 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails_failover (0.2.0)
-      redis (~> 4)
     rails_multisite (2.1.2)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
@@ -514,7 +521,7 @@ DEPENDENCIES
   rack (= 2.2.2)
   rack-mini-profiler
   rack-protection
-  rails_failover
+  rails_failover!
   rails_multisite
   railties (= 6.0.3)
   rake
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index 890f5ef06c..a31df606eb 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -134,7 +134,11 @@ class GlobalSetting
       end
     end
 
-    hash["adapter"] = "postgresql_fallback" if hash["replica_host"]
+    if hash["replica_host"]
+      if !ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
+        hash["adapter"] = "postgresql_fallback"
+      end
+    end
 
     hostnames = [ hostname ]
     hostnames << backup_hostname if backup_hostname.present?
@@ -165,15 +169,9 @@ class GlobalSetting
         c[:port] = redis_port if redis_port
 
         if redis_slave_host && redis_slave_port
-          if ENV["RAILS_FAILOVER"]
-            c[:replica_host] = redis_slave_host
-            c[:replica_port] = redis_slave_port
-            c[:connector] = RailsFailover::Redis::Connector
-          else
-            c[:slave_host] = redis_slave_host
-            c[:slave_port] = redis_slave_port
-            c[:connector] = DiscourseRedis::Connector
-          end
+          c[:slave_host] = redis_slave_host
+          c[:slave_port] = redis_slave_port
+          c[:connector] = DiscourseRedis::Connector
         end
 
         c[:password] = redis_password if redis_password.present?
@@ -195,15 +193,9 @@ class GlobalSetting
         c[:port] = message_bus_redis_port if message_bus_redis_port
 
         if message_bus_redis_slave_host && message_bus_redis_slave_port
-          if ENV["RAILS_FAILOVER"]
-            c[:replica_host] = message_bus_redis_slave_host
-            c[:replica_port] = message_bus_redis_slave_port
-            c[:connector] = RailsFailover::Redis::Connector
-          else
-            c[:slave_host] = message_bus_redis_slave_host
-            c[:slave_port] = message_bus_redis_slave_port
-            c[:connector] = DiscourseRedis::Connector
-          end
+          c[:slave_host] = message_bus_redis_slave_host
+          c[:slave_port] = message_bus_redis_slave_port
+          c[:connector] = DiscourseRedis::Connector
         end
 
         c[:password] = message_bus_redis_password if message_bus_redis_password.present?
diff --git a/config/application.rb b/config/application.rb
index 808f9e4592..3f0f558f03 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -27,8 +27,8 @@ require_relative '../lib/discourse_plugin_registry'
 
 require_relative '../lib/plugin_gem'
 
-if ENV['RAILS_FAILOVER']
-  require 'rails_failover'
+if ENV['ACTIVE_RECORD_RAILS_FAILOVER']
+  require 'rails_failover/active_record'
 end
 
 # Global config
diff --git a/config/initializers/001-redis.rb b/config/initializers/001-redis.rb
index f28c59a3b1..d11303a9d5 100644
--- a/config/initializers/001-redis.rb
+++ b/config/initializers/001-redis.rb
@@ -4,18 +4,3 @@ if Rails.env.development? && ENV['DISCOURSE_FLUSH_REDIS']
   puts "Flushing redis (development mode)"
   Discourse.redis.flushdb
 end
-
-if ENV['RAILS_FAILOVER']
-  message_bus_keepalive_interval = MessageBus.keepalive_interval
-
-  RailsFailover::Redis.register_master_up_callback do
-    MessageBus.keepalive_interval = message_bus_keepalive_interval
-    Discourse.clear_readonly!
-    Discourse.request_refresh!
-  end
-
-  RailsFailover::Redis.register_master_down_callback do
-    # Disables MessageBus keepalive when Redis is in readonly mode
-    MessageBus.keepalive_interval = 0
-  end
-end
diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
new file mode 100644
index 0000000000..e4bb24e928
--- /dev/null
+++ b/config/initializers/002-rails_failover.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
+  RailsFailover::ActiveRecord.on_failover do
+    Discourse.enable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+    Sidekiq.pause!("pg_failover") if !Sidekiq.paused?
+  end
+
+  RailsFailover::ActiveRecord.on_fallback do
+    Discourse.disable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+    Sidekiq.unpause!
+  end
+
+  RailsFailover::ActiveRecord.register_force_reading_role_callback do
+    Discourse.pg_readonly_mode?
+  end
+end

From 6491db579b5a2ce27ee8d6b6055ad19237f1c86a Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 28 May 2020 16:43:15 +0800
Subject: [PATCH 1415/1830] DEV: Add `discourse-staff-alias` to official plugin
 list.

---
 lib/plugin/metadata.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index 597c974755..07072f7827 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -75,7 +75,8 @@ class Plugin::Metadata
     "lazy-yt",
     "poll",
     "discourse-unsupported-browser",
-    "discourse-fontawesome-pro"
+    "discourse-fontawesome-pro",
+    "discourse-staff-alias",
   ])
 
   FIELDS ||= [:name, :about, :version, :authors, :url, :required_version, :transpile_js]

From 8a3d9d70363bed7839dfa2349be1288e1f543df5 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 28 May 2020 12:52:27 +0100
Subject: [PATCH 1416/1830] DEV: Run jobs sequentially in test mode (#9897)

When running jobs in tests, we use `Jobs.run_immediately!`. This means that jobs are run synchronously when they are enqueued. Jobs sometimes enqueue other jobs, which are also executed synchronously. This means that the outermost job will block until the inner jobs have finished executing. In some cases (e.g. process_post with hotlinked images) this can lead to a deadlock.

This commit changes the behavior slightly. Now we will never run jobs inside other jobs. Instead, we will queue them up and run them sequentially in the order they were enqueued. As a whole, they are still executed synchronously. Consider the example

```ruby
class Jobs::InnerJob < Jobs::Base
  def execute(args)
    puts "Running inner job"
  end
end

class Jobs::OuterJob < Jobs::Base
  def execute(args)
    puts "Starting outer job"
    Jobs.enqueue(:inner_job)
    puts "Finished outer job"
  end
end

Jobs.enqueue(:outer_job)
puts "All jobs complete"
```

The old behavior would result in:

```
Starting outer job
Running inner job
Finished outer job
All jobs complete
```

The new behavior will result in:
```
Starting outer job
Finished outer job
Running inner job
All jobs complete
```
---
 app/jobs/base.rb            | 33 ++++++++++++++++++++++++++++++---
 spec/jobs/jobs_base_spec.rb | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/app/jobs/base.rb b/app/jobs/base.rb
index b4e1f2e77b..da1623f816 100644
--- a/app/jobs/base.rb
+++ b/app/jobs/base.rb
@@ -281,8 +281,12 @@ module Jobs
     end
   end
 
-  def self.enqueue(job_name, opts = {})
-    klass = "::Jobs::#{job_name.to_s.camelcase}".constantize
+  def self.enqueue(job, opts = {})
+    if job.instance_of?(Class)
+      klass = job
+    else
+      klass = "::Jobs::#{job.to_s.camelcase}".constantize
+    end
 
     # Unless we want to work on all sites
     unless opts.delete(:all_sites)
@@ -319,7 +323,30 @@ module Jobs
           klass.new.perform(opts)
         end
       else
-        klass.new.perform(opts)
+        # Run the job synchronously
+        # But never run a job inside another job
+        # That could cause deadlocks during test runs
+        queue = Thread.current[:discourse_nested_job_queue]
+        outermost_job = !queue
+
+        if outermost_job
+          queue = Queue.new
+          Thread.current[:discourse_nested_job_queue] = queue
+        end
+
+        queue.push([klass, opts])
+
+        if outermost_job
+          # responsible for executing the queue
+          begin
+            until queue.empty?
+              queued_klass, queued_opts = queue.pop(true)
+              queued_klass.new.perform(queued_opts)
+            end
+          ensure
+            Thread.current[:discourse_nested_job_queue] = nil
+          end
+        end
       end
     end
 
diff --git a/spec/jobs/jobs_base_spec.rb b/spec/jobs/jobs_base_spec.rb
index 473710ba4b..0779666865 100644
--- a/spec/jobs/jobs_base_spec.rb
+++ b/spec/jobs/jobs_base_spec.rb
@@ -47,4 +47,41 @@ describe ::Jobs::Base do
     ::Jobs::Base.new.perform('hello' => 'world', 'sync_exec' => true)
   end
 
+  context "with fake jobs" do
+    let(:common_state) { [] }
+
+    let(:test_job_1) {
+      Class.new(Jobs::Base).tap do |klass|
+        state = common_state
+        klass.define_method(:execute) do |args|
+          state << "job_1_executed"
+        end
+      end
+    }
+
+    let(:test_job_2) {
+      Class.new(Jobs::Base).tap do |klass|
+        state = common_state
+        job_1 = test_job_1
+        klass.define_method(:execute) do |args|
+          state << "job_2_started"
+          Jobs.enqueue(job_1)
+          state << "job_2_finished"
+        end
+      end
+    }
+
+    it "runs jobs synchronously sequentially in tests" do
+      Jobs.run_immediately!
+      Jobs.enqueue(test_job_2)
+
+      expect(common_state).to eq([
+        "job_2_started",
+        "job_2_finished",
+        "job_1_executed"
+      ])
+    end
+
+  end
+
 end

From 2033c3ec9c245139488d7063807aebba4bd96c8b Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 28 May 2020 08:42:36 -0400
Subject: [PATCH 1417/1830] Revert "Revert "DEV: Import `MessageBus` from
 `message-bus-client` instead of globals""

This reverts commit b10e995d9d8cf92adffb810f68bce7c3f75dabf0.
---
 Gemfile.lock                                              | 2 +-
 app/assets/javascripts/admin/models/backup.js             | 5 +++--
 .../javascripts/{ember-shim.js => discourse-shims.js}     | 4 ++++
 .../app/pre-initializers/inject-discourse-objects.js      | 6 +++---
 app/assets/javascripts/ember_jquery.js                    | 1 -
 app/assets/javascripts/vendor.js                          | 1 +
 app/assets/javascripts/wizard/test/test_helper.js         | 2 +-
 test/javascripts/acceptance/topic-discovery-test.js       | 4 +++-
 test/javascripts/test_helper.js                           | 8 +++++---
 9 files changed, 21 insertions(+), 12 deletions(-)
 rename app/assets/javascripts/{ember-shim.js => discourse-shims.js} (76%)

diff --git a/Gemfile.lock b/Gemfile.lock
index ba0aba295a..ed3cd4da2c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -192,7 +192,7 @@ GEM
       mini_mime (>= 0.1.1)
     maxminddb (0.1.22)
     memory_profiler (0.9.14)
-    message_bus (3.2.0)
+    message_bus (3.3.0)
       rack (>= 1.1.3)
     method_source (1.0.0)
     mini_mime (1.0.2)
diff --git a/app/assets/javascripts/admin/models/backup.js b/app/assets/javascripts/admin/models/backup.js
index 2c41e1ef9d..45727a28b2 100644
--- a/app/assets/javascripts/admin/models/backup.js
+++ b/app/assets/javascripts/admin/models/backup.js
@@ -2,6 +2,7 @@ import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import { extractError } from "discourse/lib/ajax-error";
 import EmberObject from "@ember/object";
+import MessageBus from "message-bus-client";
 
 const Backup = EmberObject.extend({
   destroy() {
@@ -11,7 +12,7 @@ const Backup = EmberObject.extend({
   restore() {
     return ajax("/admin/backups/" + this.filename + "/restore", {
       type: "POST",
-      data: { client_id: window.MessageBus.clientId }
+      data: { client_id: MessageBus.clientId }
     });
   }
 });
@@ -38,7 +39,7 @@ Backup.reopenClass({
       type: "POST",
       data: {
         with_uploads: withUploads,
-        client_id: window.MessageBus.clientId
+        client_id: MessageBus.clientId
       }
     }).then(result => {
       if (!result.success) {
diff --git a/app/assets/javascripts/ember-shim.js b/app/assets/javascripts/discourse-shims.js
similarity index 76%
rename from app/assets/javascripts/ember-shim.js
rename to app/assets/javascripts/discourse-shims.js
index 1837ae1b98..f790ed9b05 100644
--- a/app/assets/javascripts/ember-shim.js
+++ b/app/assets/javascripts/discourse-shims.js
@@ -12,3 +12,7 @@ define("ember", ["exports"], function(__exports__) {
 
   __exports__.default = Ember;
 });
+
+define("message-bus-client", ["exports"], function(__exports__) {
+  __exports__.default = window.MessageBus;
+});
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
index 30d1fb4e02..045798e6a0 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
@@ -9,6 +9,7 @@ import TopicTrackingState, {
 import ScreenTrack from "discourse/lib/screen-track";
 import Site from "discourse/models/site";
 import User from "discourse/models/user";
+import MessageBus from "message-bus-client";
 
 const ALL_TARGETS = ["controller", "component", "route", "model", "adapter"];
 
@@ -27,8 +28,7 @@ export default {
       ALL_TARGETS.forEach(t => app.inject(t, "store", "service:store"));
     }
 
-    const messageBus = window.MessageBus;
-    app.register("message-bus:main", messageBus, { instantiate: false });
+    app.register("message-bus:main", MessageBus, { instantiate: false });
 
     ALL_TARGETS.concat("service").forEach(t =>
       app.inject(t, "messageBus", "message-bus:main")
@@ -39,7 +39,7 @@ export default {
     app.currentUser = currentUser;
 
     const topicTrackingState = TopicTrackingState.create({
-      messageBus,
+      messageBus: MessageBus,
       currentUser
     });
     app.register("topic-tracking-state:main", topicTrackingState, {
diff --git a/app/assets/javascripts/ember_jquery.js b/app/assets/javascripts/ember_jquery.js
index be7d57d802..51f31d5ed3 100644
--- a/app/assets/javascripts/ember_jquery.js
+++ b/app/assets/javascripts/ember_jquery.js
@@ -3,4 +3,3 @@
 //= require jquery
 //= require ember_include
 //= require discourse-loader
-//= require ember-shim
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index 64119c4940..5efe954acb 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -29,3 +29,4 @@
 //= require virtual-dom
 //= require virtual-dom-amd
 //= require intersection-observer
+//= require discourse-shims
diff --git a/app/assets/javascripts/wizard/test/test_helper.js b/app/assets/javascripts/wizard/test/test_helper.js
index c04a59f778..953ba72fda 100644
--- a/app/assets/javascripts/wizard/test/test_helper.js
+++ b/app/assets/javascripts/wizard/test/test_helper.js
@@ -12,7 +12,7 @@
 //= require ember-template-compiler
 //= require qunit/qunit/qunit
 //= require ember-qunit
-//= require ember-shim
+//= require discourse-shims
 //= require wizard-application
 //= require wizard-vendor
 //= require helpers/assertions
diff --git a/test/javascripts/acceptance/topic-discovery-test.js b/test/javascripts/acceptance/topic-discovery-test.js
index b29891853f..262a50c53e 100644
--- a/test/javascripts/acceptance/topic-discovery-test.js
+++ b/test/javascripts/acceptance/topic-discovery-test.js
@@ -1,4 +1,6 @@
 import { acceptance } from "helpers/qunit-helpers";
+import MessageBus from "message-bus-client";
+
 acceptance("Topic Discovery", {
   settings: {
     show_pinned_excerpt_desktop: true
@@ -85,7 +87,7 @@ QUnit.test("Live update unread state", async assert => {
   );
 
   // Mimic a messagebus message
-  window.MessageBus.callbacks.filterBy("channel", "/latest").map(c =>
+  MessageBus.callbacks.filterBy("channel", "/latest").map(c =>
     c.func({
       message_type: "read",
       topic_id: 11995,
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 5646f9847d..5e7c155edd 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -17,7 +17,7 @@
 
 // Stuff we need to load first
 //= require vendor
-//= require ember-shim
+//= require discourse-shims
 //= require pretty-text-bundle
 //= require markdown-it-bundle
 //= require application
@@ -55,8 +55,10 @@ sinon.config = {
 
 window.inTestEnv = true;
 
+let MessageBus = require("message-bus-client").default;
+
 // Stop the message bus so we don't get ajax calls
-window.MessageBus.stop();
+MessageBus.stop();
 
 // Trick JSHint into allow document.write
 var d = document;
@@ -191,7 +193,7 @@ QUnit.testDone(function() {
     window.Discourse.__container__
   );
 
-  window.MessageBus.unsubscribe("*");
+  MessageBus.unsubscribe("*");
   delete window.server;
   window.Mousetrap.reset();
 });

From 0e9a380b13181c11c6234f5b7bc9afc4c1ef31a5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 28 May 2020 10:00:57 -0400
Subject: [PATCH 1418/1830] Build(deps): Bump parser from 2.7.1.2 to 2.7.1.3
 (#9884)

Bumps [parser](https://github.com/whitequark/parser) from 2.7.1.2 to 2.7.1.3.
- [Release notes](https://github.com/whitequark/parser/releases)
- [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/whitequark/parser/compare/v2.7.1.2...v2.7.1.3)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index ed3cd4da2c..14a1ef3051 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -261,7 +261,7 @@ GEM
     parallel (1.19.1)
     parallel_tests (2.32.0)
       parallel
-    parser (2.7.1.2)
+    parser (2.7.1.3)
       ast (~> 2.4.0)
     pg (1.2.3)
     progress (3.5.2)

From a41476800b37e8f9ad467940d154b3c8ba58788c Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Thu, 28 May 2020 11:59:20 -0300
Subject: [PATCH 1419/1830] FIX: Don't raise an exception if a topic cannot be
 retrieved (#9906)

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

diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index d8aef83080..7529e98353 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -116,7 +116,7 @@ class TopicEmbed < ActiveRecord::Base
     )
 
     url = fd.resolve
-    raise URI::InvalidURIError if url.blank?
+    return if url.blank?
 
     opts = {
       tags: %w[div p code pre h1 h2 h3 b em i strong a img ul li ol blockquote],
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index cfdddd389b..bc061ddcbe 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -311,9 +311,10 @@ describe TopicEmbed do
     end
 
     context "non-http URL" do
-      let(:url) { '/test.txt' }
       it "throws an error" do
-        expect { TopicEmbed.find_remote(url) }.to raise_error(URI::InvalidURIError)
+        url = '/test.txt'
+
+        expect(TopicEmbed.find_remote(url)).to be_nil
       end
     end
 

From a98182debfe5279986f3c1aa7d661ca63740f373 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 28 May 2020 11:24:24 -0400
Subject: [PATCH 1420/1830] UX: Fix activity column display in wizard homepage
 step

Followup to f8f281cdad6574be88fa0c429e51363ae30b42a8, thanks @jjafeux
---
 app/assets/javascripts/wizard/components/homepage-preview.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/wizard/components/homepage-preview.js b/app/assets/javascripts/wizard/components/homepage-preview.js
index c0de35c55a..4e61aac8b1 100644
--- a/app/assets/javascripts/wizard/components/homepage-preview.js
+++ b/app/assets/javascripts/wizard/components/homepage-preview.js
@@ -429,7 +429,7 @@ export default createPreviewComponent(659, 320, {
       ctx.font = `${bodyFontSize}em 'Arial'`;
       for (let j = 2; j <= 4; j++) {
         ctx.fillText(
-          j === 5 ? "1h" : Math.floor(Math.random() * 90) + 10,
+          j === 4 ? "1h" : Math.floor(Math.random() * 90) + 10,
           cols[j] + margin,
           y + rowHeight * 0.6
         );

From f1d5630d79097a3106708dab5b84d1fffe8a435e Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 28 May 2020 12:15:13 -0400
Subject: [PATCH 1421/1830] Update javascripts (#9907)

---
 .../highlightjs/languages/1c.min.js           |   2 +-
 .../highlightjs/languages/abnf.min.js         |   2 +-
 .../highlightjs/languages/accesslog.min.js    |   2 +-
 .../highlightjs/languages/actionscript.min.js |   2 +-
 .../highlightjs/languages/ada.min.js          |   2 +-
 .../highlightjs/languages/angelscript.min.js  |   2 +-
 .../highlightjs/languages/apache.min.js       |   2 +-
 .../highlightjs/languages/applescript.min.js  |   2 +-
 .../highlightjs/languages/arcade.min.js       |   2 +-
 .../highlightjs/languages/arduino.min.js      |   2 +-
 .../highlightjs/languages/armasm.min.js       |   2 +-
 .../highlightjs/languages/asciidoc.min.js     |   2 +-
 .../highlightjs/languages/aspectj.min.js      |   2 +-
 .../highlightjs/languages/autohotkey.min.js   |   2 +-
 .../highlightjs/languages/autoit.min.js       |   2 +-
 .../highlightjs/languages/avrasm.min.js       |   2 +-
 .../highlightjs/languages/awk.min.js          |   2 +-
 .../highlightjs/languages/axapta.min.js       |   2 +-
 .../highlightjs/languages/bash.min.js         |   2 +-
 .../highlightjs/languages/basic.min.js        |   2 +-
 .../highlightjs/languages/bnf.min.js          |   2 +-
 .../highlightjs/languages/brainfuck.min.js    |   2 +-
 .../highlightjs/languages/c-like.min.js       |   1 +
 .../highlightjs/languages/c.min.js            |   1 +
 .../highlightjs/languages/cal.min.js          |   2 +-
 .../highlightjs/languages/capnproto.min.js    |   2 +-
 .../highlightjs/languages/ceylon.min.js       |   2 +-
 .../highlightjs/languages/clean.min.js        |   2 +-
 .../highlightjs/languages/clojure-repl.min.js |   2 +-
 .../highlightjs/languages/clojure.min.js      |   2 +-
 .../highlightjs/languages/cmake.min.js        |   2 +-
 .../highlightjs/languages/coffeescript.min.js |   2 +-
 .../highlightjs/languages/coq.min.js          |   2 +-
 .../highlightjs/languages/cos.min.js          |   2 +-
 .../highlightjs/languages/cpp.min.js          |   2 +-
 .../highlightjs/languages/crmsh.min.js        |   2 +-
 .../highlightjs/languages/crystal.min.js      |   2 +-
 .../highlightjs/languages/csharp.min.js       |   1 +
 .../highlightjs/languages/csp.min.js          |   2 +-
 .../highlightjs/languages/css.min.js          |   2 +-
 .../highlightjs/languages/d.min.js            |   2 +-
 .../highlightjs/languages/dart.min.js         |   2 +-
 .../highlightjs/languages/delphi.min.js       |   2 +-
 .../highlightjs/languages/diff.min.js         |   2 +-
 .../highlightjs/languages/django.min.js       |   2 +-
 .../highlightjs/languages/dns.min.js          |   2 +-
 .../highlightjs/languages/dockerfile.min.js   |   2 +-
 .../highlightjs/languages/dos.min.js          |   2 +-
 .../highlightjs/languages/dsconfig.min.js     |   2 +-
 .../highlightjs/languages/dts.min.js          |   2 +-
 .../highlightjs/languages/dust.min.js         |   2 +-
 .../highlightjs/languages/ebnf.min.js         |   2 +-
 .../highlightjs/languages/elixir.min.js       |   2 +-
 .../highlightjs/languages/elm.min.js          |   2 +-
 .../highlightjs/languages/erb.min.js          |   2 +-
 .../highlightjs/languages/erlang-repl.min.js  |   2 +-
 .../highlightjs/languages/erlang.min.js       |   2 +-
 .../highlightjs/languages/excel.min.js        |   2 +-
 .../highlightjs/languages/fix.min.js          |   2 +-
 .../highlightjs/languages/flix.min.js         |   2 +-
 .../highlightjs/languages/fortran.min.js      |   2 +-
 .../highlightjs/languages/fsharp.min.js       |   2 +-
 .../highlightjs/languages/gams.min.js         |   2 +-
 .../highlightjs/languages/gauss.min.js        |   2 +-
 .../highlightjs/languages/gcode.min.js        |   2 +-
 .../highlightjs/languages/gherkin.min.js      |   2 +-
 .../highlightjs/languages/glsl.min.js         |   2 +-
 .../highlightjs/languages/gml.min.js          |   3 +-
 .../highlightjs/languages/go.min.js           |   2 +-
 .../highlightjs/languages/golo.min.js         |   2 +-
 .../highlightjs/languages/gradle.min.js       |   2 +-
 .../highlightjs/languages/groovy.min.js       |   2 +-
 .../highlightjs/languages/haml.min.js         |   2 +-
 .../highlightjs/languages/handlebars.min.js   |   2 +-
 .../highlightjs/languages/haskell.min.js      |   2 +-
 .../highlightjs/languages/haxe.min.js         |   2 +-
 .../highlightjs/languages/hsp.min.js          |   2 +-
 .../highlightjs/languages/htmlbars.min.js     |   2 +-
 .../highlightjs/languages/http.min.js         |   2 +-
 .../highlightjs/languages/hy.min.js           |   2 +-
 .../highlightjs/languages/inform7.min.js      |   2 +-
 .../highlightjs/languages/ini.min.js          |   2 +-
 .../highlightjs/languages/irpf90.min.js       |   2 +-
 .../highlightjs/languages/isbl.min.js         |   2 -
 .../highlightjs/languages/java.min.js         |   2 +-
 .../highlightjs/languages/javascript.min.js   |   2 +-
 .../highlightjs/languages/jboss-cli.min.js    |   2 +-
 .../highlightjs/languages/json.min.js         |   2 +-
 .../highlightjs/languages/julia-repl.min.js   |   2 +-
 .../highlightjs/languages/julia.min.js        |   2 +-
 .../highlightjs/languages/kotlin.min.js       |   2 +-
 .../highlightjs/languages/lasso.min.js        |   2 +-
 .../highlightjs/languages/latex.min.js        |   1 +
 .../highlightjs/languages/ldif.min.js         |   2 +-
 .../highlightjs/languages/leaf.min.js         |   2 +-
 .../highlightjs/languages/less.min.js         |   2 +-
 .../highlightjs/languages/lisp.min.js         |   2 +-
 .../languages/livecodeserver.min.js           |   2 +-
 .../highlightjs/languages/livescript.min.js   |   2 +-
 .../highlightjs/languages/llvm.min.js         |   2 +-
 .../highlightjs/languages/lsl.min.js          |   2 +-
 .../highlightjs/languages/lua.min.js          |   2 +-
 .../highlightjs/languages/makefile.min.js     |   2 +-
 .../highlightjs/languages/markdown.min.js     |   2 +-
 .../highlightjs/languages/mathematica.min.js  |   3 +-
 .../highlightjs/languages/matlab.min.js       |   2 +-
 .../highlightjs/languages/maxima.min.js       |   2 +-
 .../highlightjs/languages/mel.min.js          |   2 +-
 .../highlightjs/languages/mercury.min.js      |   2 +-
 .../highlightjs/languages/mipsasm.min.js      |   2 +-
 .../highlightjs/languages/mizar.min.js        |   2 +-
 .../highlightjs/languages/mojolicious.min.js  |   2 +-
 .../highlightjs/languages/monkey.min.js       |   2 +-
 .../highlightjs/languages/moonscript.min.js   |   2 +-
 .../highlightjs/languages/n1ql.min.js         |   2 +-
 .../highlightjs/languages/nginx.min.js        |   2 +-
 .../highlightjs/languages/nim.min.js          |   1 +
 .../highlightjs/languages/nix.min.js          |   2 +-
 .../highlightjs/languages/nsis.min.js         |   2 +-
 .../highlightjs/languages/objectivec.min.js   |   2 +-
 .../highlightjs/languages/ocaml.min.js        |   2 +-
 .../highlightjs/languages/openscad.min.js     |   2 +-
 .../highlightjs/languages/oxygene.min.js      |   2 +-
 .../highlightjs/languages/parser3.min.js      |   2 +-
 .../highlightjs/languages/perl.min.js         |   2 +-
 .../highlightjs/languages/pf.min.js           |   2 +-
 .../highlightjs/languages/pgsql.min.js        |   2 +-
 .../highlightjs/languages/php-template.min.js |   1 +
 .../highlightjs/languages/php.min.js          |   2 +-
 .../highlightjs/languages/plaintext.min.js    |   2 +-
 .../highlightjs/languages/pony.min.js         |   2 +-
 .../highlightjs/languages/powershell.min.js   |   2 +-
 .../highlightjs/languages/processing.min.js   |   2 +-
 .../highlightjs/languages/profile.min.js      |   2 +-
 .../highlightjs/languages/prolog.min.js       |   2 +-
 .../highlightjs/languages/properties.min.js   |   2 +-
 .../highlightjs/languages/protobuf.min.js     |   2 +-
 .../highlightjs/languages/puppet.min.js       |   2 +-
 .../highlightjs/languages/purebasic.min.js    |   2 +-
 .../highlightjs/languages/python-repl.min.js  |   1 +
 .../highlightjs/languages/python.min.js       |   2 +-
 .../highlightjs/languages/q.min.js            |   2 +-
 .../highlightjs/languages/qml.min.js          |   2 +-
 .../highlightjs/languages/r.min.js            |   2 +-
 .../highlightjs/languages/reasonml.min.js     |   2 +-
 .../highlightjs/languages/rib.min.js          |   2 +-
 .../highlightjs/languages/roboconf.min.js     |   2 +-
 .../highlightjs/languages/routeros.min.js     |   2 +-
 .../highlightjs/languages/rsl.min.js          |   2 +-
 .../highlightjs/languages/ruby.min.js         |   2 +-
 .../languages/ruleslanguage.min.js            |   2 +-
 .../highlightjs/languages/rust.min.js         |   2 +-
 .../highlightjs/languages/sas.min.js          |   2 +-
 .../highlightjs/languages/scala.min.js        |   2 +-
 .../highlightjs/languages/scheme.min.js       |   2 +-
 .../highlightjs/languages/scilab.min.js       |   2 +-
 .../highlightjs/languages/scss.min.js         |   2 +-
 .../highlightjs/languages/shell.min.js        |   2 +-
 .../highlightjs/languages/smali.min.js        |   2 +-
 .../highlightjs/languages/smalltalk.min.js    |   2 +-
 .../highlightjs/languages/sml.min.js          |   2 +-
 .../highlightjs/languages/sqf.min.js          |   2 +-
 .../highlightjs/languages/sql.min.js          |   2 +-
 .../highlightjs/languages/stan.min.js         |   2 +-
 .../highlightjs/languages/stata.min.js        |   2 +-
 .../highlightjs/languages/step21.min.js       |   2 +-
 .../highlightjs/languages/stylus.min.js       |   2 +-
 .../highlightjs/languages/subunit.min.js      |   2 +-
 .../highlightjs/languages/swift.min.js        |   2 +-
 .../highlightjs/languages/taggerscript.min.js |   2 +-
 .../highlightjs/languages/tap.min.js          |   2 +-
 .../highlightjs/languages/tcl.min.js          |   2 +-
 .../highlightjs/languages/thrift.min.js       |   2 +-
 .../highlightjs/languages/tp.min.js           |   2 +-
 .../highlightjs/languages/twig.min.js         |   2 +-
 .../highlightjs/languages/typescript.min.js   |   2 +-
 .../highlightjs/languages/vala.min.js         |   2 +-
 .../highlightjs/languages/vbnet.min.js        |   2 +-
 .../languages/vbscript-html.min.js            |   2 +-
 .../highlightjs/languages/vbscript.min.js     |   2 +-
 .../highlightjs/languages/verilog.min.js      |   2 +-
 .../highlightjs/languages/vhdl.min.js         |   2 +-
 .../highlightjs/languages/vim.min.js          |   2 +-
 .../highlightjs/languages/x86asm.min.js       |   2 +-
 .../highlightjs/languages/xl.min.js           |   2 +-
 .../highlightjs/languages/xml.min.js          |   2 +-
 .../highlightjs/languages/xquery.min.js       |   2 +-
 .../highlightjs/languages/yaml.min.js         |   2 +-
 .../highlightjs/languages/zephir.min.js       |   2 +-
 .../javascripts/mousetrap-global-bind.js      |   5 +-
 vendor/assets/javascripts/mousetrap.js        |   2 +-
 yarn.lock                                     | 612 ++++++++----------
 192 files changed, 470 insertions(+), 522 deletions(-)
 create mode 100644 vendor/assets/javascripts/highlightjs/languages/c-like.min.js
 create mode 100644 vendor/assets/javascripts/highlightjs/languages/c.min.js
 create mode 100644 vendor/assets/javascripts/highlightjs/languages/csharp.min.js
 create mode 100644 vendor/assets/javascripts/highlightjs/languages/latex.min.js
 create mode 100644 vendor/assets/javascripts/highlightjs/languages/nim.min.js
 create mode 100644 vendor/assets/javascripts/highlightjs/languages/php-template.min.js
 create mode 100644 vendor/assets/javascripts/highlightjs/languages/python-repl.min.js

diff --git a/vendor/assets/javascripts/highlightjs/languages/1c.min.js b/vendor/assets/javascripts/highlightjs/languages/1c.min.js
index 420d11124a..119eb326df 100644
--- a/vendor/assets/javascripts/highlightjs/languages/1c.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/1c.min.js
@@ -1 +1 @@
-hljs.registerLanguage("1c",function(s){var x="[A-Za-zА-Яа-яёЁ_][A-Za-zА-Яа-яёЁ_0-9]+",o="далее ",m="возврат вызватьисключение выполнить для если и из или иначе иначеесли исключение каждого конецесли конецпопытки конеццикла не новый перейти перем по пока попытка прервать продолжить тогда цикл экспорт ",t=o+m,l="загрузитьизфайла ",e="вебклиент вместо внешнеесоединение клиент конецобласти мобильноеприложениеклиент мобильноеприложениесервер наклиенте наклиентенасервере наклиентенасерверебезконтекста насервере насерверебезконтекста область перед после сервер толстыйклиентобычноеприложение толстыйклиентуправляемоеприложение тонкийклиент ",n=l+e,a="разделительстраниц разделительстрок символтабуляции ",d="ansitooem oemtoansi ввестивидсубконто ввестиперечисление ввестипериод ввестиплансчетов выбранныйплансчетов датагод датамесяц датачисло заголовоксистемы значениевстроку значениеизстроки каталогиб каталогпользователя кодсимв конгода конецпериодаби конецрассчитанногопериодаби конецстандартногоинтервала конквартала конмесяца коннедели лог лог10 максимальноеколичествосубконто названиеинтерфейса названиенабораправ назначитьвид назначитьсчет найтиссылки началопериодаби началостандартногоинтервала начгода начквартала начмесяца начнедели номерднягода номерднянедели номернеделигода обработкаожидания основнойжурналрасчетов основнойплансчетов основнойязык очиститьокносообщений периодстр получитьвремята получитьдатута получитьдокументта получитьзначенияотбора получитьпозициюта получитьпустоезначение получитьта префиксавтонумерации пропись пустоезначение разм разобратьпозициюдокумента рассчитатьрегистрына рассчитатьрегистрыпо симв создатьобъект статусвозврата стрколичествострок сформироватьпозициюдокумента счетпокоду текущеевремя типзначения типзначениястр установитьтана установитьтапо фиксшаблон шаблон ",i="acos asin atan base64значение base64строка cos exp log log10 pow sin sqrt tan xmlзначение xmlстрока xmlтип xmlтипзнч активноеокно безопасныйрежим безопасныйрежимразделенияданных булево ввестидату ввестизначение ввестистроку ввестичисло возможностьчтенияxml вопрос восстановитьзначение врег выгрузитьжурналрегистрации выполнитьобработкуоповещения выполнитьпроверкуправдоступа вычислить год данныеформывзначение дата день деньгода деньнедели добавитьмесяц заблокироватьданныедляредактирования заблокироватьработупользователя завершитьработусистемы загрузитьвнешнююкомпоненту закрытьсправку записатьjson записатьxml записатьдатуjson записьжурналарегистрации заполнитьзначениясвойств запроситьразрешениепользователя запуститьприложение запуститьсистему зафиксироватьтранзакцию значениевданныеформы значениевстрокувнутр значениевфайл значениезаполнено значениеизстрокивнутр значениеизфайла изxmlтипа импортмоделиxdto имякомпьютера имяпользователя инициализироватьпредопределенныеданные информацияобошибке каталогбиблиотекимобильногоустройства каталогвременныхфайлов каталогдокументов каталогпрограммы кодироватьстроку кодлокализацииинформационнойбазы кодсимвола командасистемы конецгода конецдня конецквартала конецмесяца конецминуты конецнедели конецчаса конфигурациябазыданныхизмененадинамически конфигурацияизменена копироватьданныеформы копироватьфайл краткоепредставлениеошибки лев макс местноевремя месяц мин минута монопольныйрежим найти найтинедопустимыесимволыxml найтиокнопонавигационнойссылке найтипомеченныенаудаление найтипоссылкам найтифайлы началогода началодня началоквартала началомесяца началоминуты началонедели началочаса начатьзапросразрешенияпользователя начатьзапускприложения начатькопированиефайла начатьперемещениефайла начатьподключениевнешнейкомпоненты начатьподключениерасширенияработыскриптографией начатьподключениерасширенияработысфайлами начатьпоискфайлов начатьполучениекаталогавременныхфайлов начатьполучениекаталогадокументов начатьполучениерабочегокаталогаданныхпользователя начатьполучениефайлов начатьпомещениефайла начатьпомещениефайлов начатьсозданиедвоичныхданныхизфайла начатьсозданиекаталога начатьтранзакцию начатьудалениефайлов начатьустановкувнешнейкомпоненты начатьустановкурасширенияработыскриптографией начатьустановкурасширенияработысфайлами неделягода необходимостьзавершениясоединения номерсеансаинформационнойбазы номерсоединенияинформационнойбазы нрег нстр обновитьинтерфейс обновитьнумерациюобъектов обновитьповторноиспользуемыезначения обработкапрерыванияпользователя объединитьфайлы окр описаниеошибки оповестить оповеститьобизменении отключитьобработчикзапросанастроекклиенталицензирования отключитьобработчикожидания отключитьобработчикоповещения открытьзначение открытьиндекссправки открытьсодержаниесправки открытьсправку открытьформу открытьформумодально отменитьтранзакцию очиститьжурналрегистрации очиститьнастройкипользователя очиститьсообщения параметрыдоступа перейтипонавигационнойссылке переместитьфайл подключитьвнешнююкомпоненту подключитьобработчикзапросанастроекклиенталицензирования подключитьобработчикожидания подключитьобработчикоповещения подключитьрасширениеработыскриптографией подключитьрасширениеработысфайлами подробноепредставлениеошибки показатьвводдаты показатьвводзначения показатьвводстроки показатьвводчисла показатьвопрос показатьзначение показатьинформациюобошибке показатьнакарте показатьоповещениепользователя показатьпредупреждение полноеимяпользователя получитьcomобъект получитьxmlтип получитьадреспоместоположению получитьблокировкусеансов получитьвремязавершенияспящегосеанса получитьвремязасыпанияпассивногосеанса получитьвремяожиданияблокировкиданных получитьданныевыбора получитьдополнительныйпараметрклиенталицензирования получитьдопустимыекодылокализации получитьдопустимыечасовыепояса получитьзаголовокклиентскогоприложения получитьзаголовоксистемы получитьзначенияотборажурналарегистрации получитьидентификаторконфигурации получитьизвременногохранилища получитьимявременногофайла получитьимяклиенталицензирования получитьинформациюэкрановклиента получитьиспользованиежурналарегистрации получитьиспользованиесобытияжурналарегистрации получитькраткийзаголовокприложения получитьмакетоформления получитьмаскувсефайлы получитьмаскувсефайлыклиента получитьмаскувсефайлысервера получитьместоположениепоадресу получитьминимальнуюдлинупаролейпользователей получитьнавигационнуюссылку получитьнавигационнуюссылкуинформационнойбазы получитьобновлениеконфигурациибазыданных получитьобновлениепредопределенныхданныхинформационнойбазы получитьобщиймакет получитьобщуюформу получитьокна получитьоперативнуюотметкувремени получитьотключениебезопасногорежима получитьпараметрыфункциональныхопцийинтерфейса получитьполноеимяпредопределенногозначения получитьпредставлениянавигационныхссылок получитьпроверкусложностипаролейпользователей получитьразделительпути получитьразделительпутиклиента получитьразделительпутисервера получитьсеансыинформационнойбазы получитьскоростьклиентскогосоединения получитьсоединенияинформационнойбазы получитьсообщенияпользователю получитьсоответствиеобъектаиформы получитьсоставстандартногоинтерфейсаodata получитьструктурухранениябазыданных получитьтекущийсеансинформационнойбазы получитьфайл получитьфайлы получитьформу получитьфункциональнуюопцию получитьфункциональнуюопциюинтерфейса получитьчасовойпоясинформационнойбазы пользователиос поместитьвовременноехранилище поместитьфайл поместитьфайлы прав праводоступа предопределенноезначение представлениекодалокализации представлениепериода представлениеправа представлениеприложения представлениесобытияжурналарегистрации представлениечасовогопояса предупреждение прекратитьработусистемы привилегированныйрежим продолжитьвызов прочитатьjson прочитатьxml прочитатьдатуjson пустаястрока рабочийкаталогданныхпользователя разблокироватьданныедляредактирования разделитьфайл разорватьсоединениесвнешнимисточникомданных раскодироватьстроку рольдоступна секунда сигнал символ скопироватьжурналрегистрации смещениелетнеговремени смещениестандартноговремени соединитьбуферыдвоичныхданных создатькаталог создатьфабрикуxdto сокрл сокрлп сокрп сообщить состояние сохранитьзначение сохранитьнастройкипользователя сред стрдлина стрзаканчиваетсяна стрзаменить стрнайти стрначинаетсяс строка строкасоединенияинформационнойбазы стрполучитьстроку стрразделить стрсоединить стрсравнить стрчисловхождений стрчислострок стршаблон текущаядата текущаядатасеанса текущаяуниверсальнаядата текущаяуниверсальнаядатавмиллисекундах текущийвариантинтерфейсаклиентскогоприложения текущийвариантосновногошрифтаклиентскогоприложения текущийкодлокализации текущийрежимзапуска текущийязык текущийязыксистемы тип типзнч транзакцияактивна трег удалитьданныеинформационнойбазы удалитьизвременногохранилища удалитьобъекты удалитьфайлы универсальноевремя установитьбезопасныйрежим установитьбезопасныйрежимразделенияданных установитьблокировкусеансов установитьвнешнююкомпоненту установитьвремязавершенияспящегосеанса установитьвремязасыпанияпассивногосеанса установитьвремяожиданияблокировкиданных установитьзаголовокклиентскогоприложения установитьзаголовоксистемы установитьиспользованиежурналарегистрации установитьиспользованиесобытияжурналарегистрации установитькраткийзаголовокприложения установитьминимальнуюдлинупаролейпользователей установитьмонопольныйрежим установитьнастройкиклиенталицензирования установитьобновлениепредопределенныхданныхинформационнойбазы установитьотключениебезопасногорежима установитьпараметрыфункциональныхопцийинтерфейса установитьпривилегированныйрежим установитьпроверкусложностипаролейпользователей установитьрасширениеработыскриптографией установитьрасширениеработысфайлами установитьсоединениесвнешнимисточникомданных установитьсоответствиеобъектаиформы установитьсоставстандартногоинтерфейсаodata установитьчасовойпоясинформационнойбазы установитьчасовойпояссеанса формат цел час часовойпояс часовойпояссеанса число числопрописью этоадресвременногохранилища ",c="wsссылки библиотекакартинок библиотекамакетовоформлениякомпоновкиданных библиотекастилей бизнеспроцессы внешниеисточникиданных внешниеобработки внешниеотчеты встроенныепокупки главныйинтерфейс главныйстиль документы доставляемыеуведомления журналыдокументов задачи информацияобинтернетсоединении использованиерабочейдаты историяработыпользователя константы критерииотбора метаданные обработки отображениерекламы отправкадоставляемыхуведомлений отчеты панельзадачос параметрзапуска параметрысеанса перечисления планывидоврасчета планывидовхарактеристик планыобмена планысчетов полнотекстовыйпоиск пользователиинформационнойбазы последовательности проверкавстроенныхпокупок рабочаядата расширенияконфигурации регистрыбухгалтерии регистрынакопления регистрырасчета регистрысведений регламентныезадания сериализаторxdto справочники средствагеопозиционирования средствакриптографии средствамультимедиа средстваотображениярекламы средствапочты средствателефонии фабрикаxdto файловыепотоки фоновыезадания хранилищанастроек хранилищевариантовотчетов хранилищенастроекданныхформ хранилищеобщихнастроек хранилищепользовательскихнастроекдинамическихсписков хранилищепользовательскихнастроекотчетов хранилищесистемныхнастроек ",r=a+d+i+c,p="webцвета windowsцвета windowsшрифты библиотекакартинок рамкистиля символы цветастиля шрифтыстиля ",b="автоматическоесохранениеданныхформывнастройках автонумерациявформе автораздвижениесерий анимациядиаграммы вариантвыравниванияэлементовизаголовков вариантуправлениявысотойтаблицы вертикальнаяпрокруткаформы вертикальноеположение вертикальноеположениеэлемента видгруппыформы виддекорацииформы виддополненияэлементаформы видизмененияданных видкнопкиформы видпереключателя видподписейкдиаграмме видполяформы видфлажка влияниеразмеранапузырекдиаграммы горизонтальноеположение горизонтальноеположениеэлемента группировкаколонок группировкаподчиненныхэлементовформы группыиэлементы действиеперетаскивания дополнительныйрежимотображения допустимыедействияперетаскивания интервалмеждуэлементамиформы использованиевывода использованиеполосыпрокрутки используемоезначениеточкибиржевойдиаграммы историявыборапривводе источникзначенийоситочекдиаграммы источникзначенияразмерапузырькадиаграммы категориягруппыкоманд максимумсерий начальноеотображениедерева начальноеотображениесписка обновлениетекстаредактирования ориентациядендрограммы ориентациядиаграммы ориентацияметокдиаграммы ориентацияметоксводнойдиаграммы ориентацияэлементаформы отображениевдиаграмме отображениевлегендедиаграммы отображениегруппыкнопок отображениезаголовкашкалыдиаграммы отображениезначенийсводнойдиаграммы отображениезначенияизмерительнойдиаграммы отображениеинтерваладиаграммыганта отображениекнопки отображениекнопкивыбора отображениеобсужденийформы отображениеобычнойгруппы отображениеотрицательныхзначенийпузырьковойдиаграммы отображениепанелипоиска отображениеподсказки отображениепредупрежденияприредактировании отображениеразметкиполосырегулирования отображениестраницформы отображениетаблицы отображениетекстазначениядиаграммыганта отображениеуправленияобычнойгруппы отображениефигурыкнопки палитрацветовдиаграммы поведениеобычнойгруппы поддержкамасштабадендрограммы поддержкамасштабадиаграммыганта поддержкамасштабасводнойдиаграммы поисквтаблицепривводе положениезаголовкаэлементаформы положениекартинкикнопкиформы положениекартинкиэлементаграфическойсхемы положениекоманднойпанелиформы положениекоманднойпанелиэлементаформы положениеопорнойточкиотрисовки положениеподписейкдиаграмме положениеподписейшкалызначенийизмерительнойдиаграммы положениесостоянияпросмотра положениестрокипоиска положениетекстасоединительнойлинии положениеуправленияпоиском положениешкалывремени порядокотображенияточекгоризонтальнойгистограммы порядоксерийвлегендедиаграммы размеркартинки расположениезаголовкашкалыдиаграммы растягиваниеповертикалидиаграммыганта режимавтоотображениясостояния режимвводастроктаблицы режимвыборанезаполненного режимвыделениядаты режимвыделениястрокитаблицы режимвыделениятаблицы режимизмененияразмера режимизменениясвязанногозначения режимиспользованиядиалогапечати режимиспользованияпараметракоманды режиммасштабированияпросмотра режимосновногоокнаклиентскогоприложения режимоткрытияокнаформы режимотображениявыделения режимотображениягеографическойсхемы режимотображениязначенийсерии режимотрисовкисеткиграфическойсхемы режимполупрозрачностидиаграммы режимпробеловдиаграммы режимразмещениянастранице режимредактированияколонки режимсглаживаниядиаграммы режимсглаживанияиндикатора режимсписказадач сквозноевыравнивание сохранениеданныхформывнастройках способзаполнениятекстазаголовкашкалыдиаграммы способопределенияограничивающегозначениядиаграммы стандартнаягруппакоманд стандартноеоформление статусоповещенияпользователя стильстрелки типаппроксимациилиниитрендадиаграммы типдиаграммы типединицышкалывремени типимпортасерийслоягеографическойсхемы типлиниигеографическойсхемы типлиниидиаграммы типмаркерагеографическойсхемы типмаркерадиаграммы типобластиоформления типорганизацииисточникаданныхгеографическойсхемы типотображениясериислоягеографическойсхемы типотображенияточечногообъектагеографическойсхемы типотображенияшкалыэлементалегендыгеографическойсхемы типпоискаобъектовгеографическойсхемы типпроекциигеографическойсхемы типразмещенияизмерений типразмещенияреквизитовизмерений типрамкиэлементауправления типсводнойдиаграммы типсвязидиаграммыганта типсоединениязначенийпосериямдиаграммы типсоединенияточекдиаграммы типсоединительнойлинии типстороныэлементаграфическойсхемы типформыотчета типшкалырадарнойдиаграммы факторлиниитрендадиаграммы фигуракнопки фигурыграфическойсхемы фиксациявтаблице форматдняшкалывремени форматкартинки ширинаподчиненныхэлементовформы ",w="виддвижениябухгалтерии виддвижениянакопления видпериодарегистрарасчета видсчета видточкимаршрутабизнеспроцесса использованиеагрегатарегистранакопления использованиегруппиэлементов использованиережимапроведения использованиесреза периодичностьагрегатарегистранакопления режимавтовремя режимзаписидокумента режимпроведениядокумента ",h="авторегистрацияизменений допустимыйномерсообщения отправкаэлементаданных получениеэлементаданных ",j="использованиерасшифровкитабличногодокумента ориентациястраницы положениеитоговколоноксводнойтаблицы положениеитоговстроксводнойтаблицы положениетекстаотносительнокартинки расположениезаголовкагруппировкитабличногодокумента способчтениязначенийтабличногодокумента типдвустороннейпечати типзаполненияобластитабличногодокумента типкурсоровтабличногодокумента типлиниирисункатабличногодокумента типлинииячейкитабличногодокумента типнаправленияпереходатабличногодокумента типотображениявыделениятабличногодокумента типотображениялинийсводнойтаблицы типразмещениятекстатабличногодокумента типрисункатабличногодокумента типсмещениятабличногодокумента типузоратабличногодокумента типфайлатабличногодокумента точностьпечати чередованиерасположениястраниц ",z="отображениевремениэлементовпланировщика ",f="типфайлаформатированногодокумента ",k="обходрезультатазапроса типзаписизапроса ",u="видзаполнениярасшифровкипостроителяотчета типдобавленияпредставлений типизмеренияпостроителяотчета типразмещенияитогов ",y="доступкфайлу режимдиалогавыборафайла режимоткрытияфайла ",N="типизмеренияпостроителязапроса ",g="видданныханализа методкластеризации типединицыинтервалавременианализаданных типзаполнениятаблицырезультатаанализаданных типиспользованиячисловыхзначенийанализаданных типисточникаданныхпоискаассоциаций типколонкианализаданныхдереворешений типколонкианализаданныхкластеризация типколонкианализаданныхобщаястатистика типколонкианализаданныхпоискассоциаций типколонкианализаданныхпоискпоследовательностей типколонкимоделипрогноза типмерырасстоянияанализаданных типотсеченияправилассоциации типполяанализаданных типстандартизациианализаданных типупорядочиванияправилассоциациианализаданных типупорядочиванияшаблоновпоследовательностейанализаданных типупрощениядереварешений ",E="wsнаправлениепараметра вариантxpathxs вариантзаписидатыjson вариантпростоготипаxs видгруппымоделиxs видфасетаxdto действиепостроителяdom завершенностьпростоготипаxs завершенностьсоставноготипаxs завершенностьсхемыxs запрещенныеподстановкиxs исключениягруппподстановкиxs категорияиспользованияатрибутаxs категорияограниченияидентичностиxs категорияограниченияпространствименxs методнаследованияxs модельсодержимогоxs назначениетипаxml недопустимыеподстановкиxs обработкапробельныхсимволовxs обработкасодержимогоxs ограничениезначенияxs параметрыотбораузловdom переносстрокjson позициявдокументеdom пробельныесимволыxml типатрибутаxml типзначенияjson типканоническогоxml типкомпонентыxs типпроверкиxml типрезультатаdomxpath типузлаdom типузлаxml формаxml формапредставленияxs форматдатыjson экранированиесимволовjson ",M="видсравнениякомпоновкиданных действиеобработкирасшифровкикомпоновкиданных направлениесортировкикомпоновкиданных расположениевложенныхэлементоврезультатакомпоновкиданных расположениеитоговкомпоновкиданных расположениегруппировкикомпоновкиданных расположениеполейгруппировкикомпоновкиданных расположениеполякомпоновкиданных расположениереквизитовкомпоновкиданных расположениересурсовкомпоновкиданных типбухгалтерскогоостаткакомпоновкиданных типвыводатекстакомпоновкиданных типгруппировкикомпоновкиданных типгруппыэлементовотборакомпоновкиданных типдополненияпериодакомпоновкиданных типзаголовкаполейкомпоновкиданных типмакетагруппировкикомпоновкиданных типмакетаобластикомпоновкиданных типостаткакомпоновкиданных типпериодакомпоновкиданных типразмещениятекстакомпоновкиданных типсвязинаборовданныхкомпоновкиданных типэлементарезультатакомпоновкиданных расположениелегендыдиаграммыкомпоновкиданных типпримененияотборакомпоновкиданных режимотображенияэлементанастройкикомпоновкиданных режимотображениянастроеккомпоновкиданных состояниеэлементанастройкикомпоновкиданных способвосстановлениянастроеккомпоновкиданных режимкомпоновкирезультата использованиепараметракомпоновкиданных автопозицияресурсовкомпоновкиданных вариантиспользованиягруппировкикомпоновкиданных расположениересурсоввдиаграммекомпоновкиданных фиксациякомпоновкиданных использованиеусловногооформлениякомпоновкиданных ",_="важностьинтернетпочтовогосообщения обработкатекстаинтернетпочтовогосообщения способкодированияинтернетпочтовоговложения способкодированиянеasciiсимволовинтернетпочтовогосообщения типтекстапочтовогосообщения протоколинтернетпочты статусразборапочтовогосообщения ",v="режимтранзакциизаписижурналарегистрации статустранзакциизаписижурналарегистрации уровеньжурналарегистрации ",A="расположениехранилищасертификатовкриптографии режимвключениясертификатовкриптографии режимпроверкисертификатакриптографии типхранилищасертификатовкриптографии ",C="кодировкаименфайловвzipфайле методсжатияzip методшифрованияzip режимвосстановленияпутейфайловzip режимобработкиподкаталоговzip режимсохраненияпутейzip уровеньсжатияzip ",L="звуковоеоповещение направлениепереходакстроке позициявпотоке порядокбайтов режимблокировкиданных режимуправленияблокировкойданных сервисвстроенныхпокупок состояниефоновогозадания типподписчикадоставляемыхуведомлений уровеньиспользованиязащищенногосоединенияftp ",Z="направлениепорядкасхемызапроса типдополненияпериодамисхемызапроса типконтрольнойточкисхемызапроса типобъединениясхемызапроса типпараметрадоступнойтаблицысхемызапроса типсоединениясхемызапроса ",$="httpметод автоиспользованиеобщегореквизита автопрефиксномеразадачи вариантвстроенногоязыка видиерархии видрегистранакопления видтаблицывнешнегоисточникаданных записьдвиженийприпроведении заполнениепоследовательностей индексирование использованиебазыпланавидоврасчета использованиебыстроговыбора использованиеобщегореквизита использованиеподчинения использованиеполнотекстовогопоиска использованиеразделяемыхданныхобщегореквизита использованиереквизита назначениеиспользованияприложения назначениерасширенияконфигурации направлениепередачи обновлениепредопределенныхданных оперативноепроведение основноепредставлениевидарасчета основноепредставлениевидахарактеристики основноепредставлениезадачи основноепредставлениепланаобмена основноепредставлениесправочника основноепредставлениесчета перемещениеграницыприпроведении периодичностьномерабизнеспроцесса периодичностьномерадокумента периодичностьрегистрарасчета периодичностьрегистрасведений повторноеиспользованиевозвращаемыхзначений полнотекстовыйпоискпривводепостроке принадлежностьобъекта проведение разделениеаутентификацииобщегореквизита разделениеданныхобщегореквизита разделениерасширенийконфигурацииобщегореквизита режимавтонумерацииобъектов режимзаписирегистра режимиспользованиямодальности режимиспользованиясинхронныхвызововрасширенийплатформыивнешнихкомпонент режимповторногоиспользованиясеансов режимполученияданныхвыборапривводепостроке режимсовместимости режимсовместимостиинтерфейса режимуправленияблокировкойданныхпоумолчанию сериикодовпланавидовхарактеристик сериикодовпланасчетов сериикодовсправочника созданиепривводе способвыбора способпоискастрокипривводепостроке способредактирования типданныхтаблицывнешнегоисточникаданных типкодапланавидоврасчета типкодасправочника типмакета типномерабизнеспроцесса типномерадокумента типномеразадачи типформы удалениедвижений ",q="важностьпроблемыприменениярасширенияконфигурации вариантинтерфейсаклиентскогоприложения вариантмасштабаформклиентскогоприложения вариантосновногошрифтаклиентскогоприложения вариантстандартногопериода вариантстандартнойдатыначала видграницы видкартинки видотображенияполнотекстовогопоиска видрамки видсравнения видцвета видчисловогозначения видшрифта допустимаядлина допустимыйзнак использованиеbyteordermark использованиеметаданныхполнотекстовогопоиска источникрасширенийконфигурации клавиша кодвозвратадиалога кодировкаxbase кодировкатекста направлениепоиска направлениесортировки обновлениепредопределенныхданных обновлениеприизмененииданных отображениепанелиразделов проверказаполнения режимдиалогавопрос режимзапускаклиентскогоприложения режимокругления режимоткрытияформприложения режимполнотекстовогопоиска скоростьклиентскогосоединения состояниевнешнегоисточникаданных состояниеобновленияконфигурациибазыданных способвыборасертификатаwindows способкодированиястроки статуссообщения типвнешнейкомпоненты типплатформы типповеденияклавишиenter типэлементаинформацииовыполненииобновленияконфигурациибазыданных уровеньизоляциитранзакций хешфункция частидаты",B=p+b+w+h+j+z+f+k+u+y+N+g+E+M+_+v+A+C+L+Z+$+q,I="comобъект ftpсоединение httpзапрос httpсервисответ httpсоединение wsопределения wsпрокси xbase анализданных аннотацияxs блокировкаданных буфердвоичныхданных включениеxs выражениекомпоновкиданных генераторслучайныхчисел географическаясхема географическиекоординаты графическаясхема группамоделиxs данныерасшифровкикомпоновкиданных двоичныеданные дендрограмма диаграмма диаграммаганта диалогвыборафайла диалогвыборацвета диалогвыборашрифта диалограсписаниярегламентногозадания диалогредактированиястандартногопериода диапазон документdom документhtml документацияxs доставляемоеуведомление записьdom записьfastinfoset записьhtml записьjson записьxml записьzipфайла записьданных записьтекста записьузловdom запрос защищенноесоединениеopenssl значенияполейрасшифровкикомпоновкиданных извлечениетекста импортxs интернетпочта интернетпочтовоесообщение интернетпочтовыйпрофиль интернетпрокси интернетсоединение информациядляприложенияxs использованиеатрибутаxs использованиесобытияжурналарегистрации источникдоступныхнастроеккомпоновкиданных итераторузловdom картинка квалификаторыдаты квалификаторыдвоичныхданных квалификаторыстроки квалификаторычисла компоновщикмакетакомпоновкиданных компоновщикнастроеккомпоновкиданных конструктормакетаоформлениякомпоновкиданных конструкторнастроеккомпоновкиданных конструкторформатнойстроки линия макеткомпоновкиданных макетобластикомпоновкиданных макетоформлениякомпоновкиданных маскаxs менеджеркриптографии наборсхемxml настройкикомпоновкиданных настройкисериализацииjson обработкакартинок обработкарасшифровкикомпоновкиданных обходдереваdom объявлениеатрибутаxs объявлениенотацииxs объявлениеэлементаxs описаниеиспользованиясобытиядоступжурналарегистрации описаниеиспользованиясобытияотказвдоступежурналарегистрации описаниеобработкирасшифровкикомпоновкиданных описаниепередаваемогофайла описаниетипов определениегруппыатрибутовxs определениегруппымоделиxs определениеограниченияидентичностиxs определениепростоготипаxs определениесоставноготипаxs определениетипадокументаdom определенияxpathxs отборкомпоновкиданных пакетотображаемыхдокументов параметрвыбора параметркомпоновкиданных параметрызаписиjson параметрызаписиxml параметрычтенияxml переопределениеxs планировщик полеанализаданных полекомпоновкиданных построительdom построительзапроса построительотчета построительотчетаанализаданных построительсхемxml поток потоквпамяти почта почтовоесообщение преобразованиеxsl преобразованиекканоническомуxml процессорвыводарезультатакомпоновкиданныхвколлекциюзначений процессорвыводарезультатакомпоновкиданныхвтабличныйдокумент процессоркомпоновкиданных разыменовательпространствименdom рамка расписаниерегламентногозадания расширенноеимяxml результатчтенияданных своднаядиаграмма связьпараметравыбора связьпотипу связьпотипукомпоновкиданных сериализаторxdto сертификатклиентаwindows сертификатклиентафайл сертификаткриптографии сертификатыудостоверяющихцентровwindows сертификатыудостоверяющихцентровфайл сжатиеданных системнаяинформация сообщениепользователю сочетаниеклавиш сравнениезначений стандартнаядатаначала стандартныйпериод схемаxml схемакомпоновкиданных табличныйдокумент текстовыйдокумент тестируемоеприложение типданныхxml уникальныйидентификатор фабрикаxdto файл файловыйпоток фасетдлиныxs фасетколичестваразрядовдробнойчастиxs фасетмаксимальноговключающегозначенияxs фасетмаксимальногоисключающегозначенияxs фасетмаксимальнойдлиныxs фасетминимальноговключающегозначенияxs фасетминимальногоисключающегозначенияxs фасетминимальнойдлиныxs фасетобразцаxs фасетобщегоколичестваразрядовxs фасетперечисленияxs фасетпробельныхсимволовxs фильтрузловdom форматированнаястрока форматированныйдокумент фрагментxs хешированиеданных хранилищезначения цвет чтениеfastinfoset чтениеhtml чтениеjson чтениеxml чтениеzipфайла чтениеданных чтениетекста чтениеузловdom шрифт элементрезультатакомпоновкиданных ",P="comsafearray деревозначений массив соответствие списокзначений структура таблицазначений фиксированнаяструктура фиксированноесоответствие фиксированныймассив ",T=I+P,W="null истина ложь неопределено",D=s.inherit(s.NM),F={cN:"string",b:'"|\\|',e:'"|$',c:[{b:'""'}]},G={b:"'",e:"'",eB:!0,eE:!0,c:[{cN:"number",b:"\\d{4}([\\.\\\\/:-]?\\d{2}){0,5}"}]},H=s.inherit(s.CLCM),J={cN:"meta",l:x,b:"#|&",e:"$",k:{"meta-keyword":t+n},c:[H]},K={cN:"symbol",b:"~",e:";|:",eE:!0},O={cN:"function",l:x,v:[{b:"процедура|функция",e:"\\)",k:"процедура функция"},{b:"конецпроцедуры|конецфункции",k:"конецпроцедуры конецфункции"}],c:[{b:"\\(",e:"\\)",endsParent:!0,c:[{cN:"params",l:x,b:x,e:",",eE:!0,eW:!0,k:{keyword:"знач",literal:W},c:[D,F,G]},H]},s.inherit(s.TM,{b:x})]};return{cI:!0,l:x,k:{keyword:t,built_in:r,"class":B,type:T,literal:W},c:[J,O,H,K,D,F,G]}});
\ No newline at end of file
+hljs.registerLanguage("1c",function(){"use strict";return function(s){var x="[A-Za-zА-Яа-яёЁ_][A-Za-zА-Яа-яёЁ_0-9]+",n="далее возврат вызватьисключение выполнить для если и из или иначе иначеесли исключение каждого конецесли конецпопытки конеццикла не новый перейти перем по пока попытка прервать продолжить тогда цикл экспорт ",e="null истина ложь неопределено",o=s.inherit(s.NUMBER_MODE),t={className:"string",begin:'"|\\|',end:'"|$',contains:[{begin:'""'}]},a={begin:"'",end:"'",excludeBegin:!0,excludeEnd:!0,contains:[{className:"number",begin:"\\d{4}([\\.\\\\/:-]?\\d{2}){0,5}"}]},i=s.inherit(s.C_LINE_COMMENT_MODE);return{name:"1C:Enterprise",case_insensitive:!0,keywords:{$pattern:x,keyword:n,built_in:"разделительстраниц разделительстрок символтабуляции ansitooem oemtoansi ввестивидсубконто ввестиперечисление ввестипериод ввестиплансчетов выбранныйплансчетов датагод датамесяц датачисло заголовоксистемы значениевстроку значениеизстроки каталогиб каталогпользователя кодсимв конгода конецпериодаби конецрассчитанногопериодаби конецстандартногоинтервала конквартала конмесяца коннедели лог лог10 максимальноеколичествосубконто названиеинтерфейса названиенабораправ назначитьвид назначитьсчет найтиссылки началопериодаби началостандартногоинтервала начгода начквартала начмесяца начнедели номерднягода номерднянедели номернеделигода обработкаожидания основнойжурналрасчетов основнойплансчетов основнойязык очиститьокносообщений периодстр получитьвремята получитьдатута получитьдокументта получитьзначенияотбора получитьпозициюта получитьпустоезначение получитьта префиксавтонумерации пропись пустоезначение разм разобратьпозициюдокумента рассчитатьрегистрына рассчитатьрегистрыпо симв создатьобъект статусвозврата стрколичествострок сформироватьпозициюдокумента счетпокоду текущеевремя типзначения типзначениястр установитьтана установитьтапо фиксшаблон шаблон acos asin atan base64значение base64строка cos exp log log10 pow sin sqrt tan xmlзначение xmlстрока xmlтип xmlтипзнч активноеокно безопасныйрежим безопасныйрежимразделенияданных булево ввестидату ввестизначение ввестистроку ввестичисло возможностьчтенияxml вопрос восстановитьзначение врег выгрузитьжурналрегистрации выполнитьобработкуоповещения выполнитьпроверкуправдоступа вычислить год данныеформывзначение дата день деньгода деньнедели добавитьмесяц заблокироватьданныедляредактирования заблокироватьработупользователя завершитьработусистемы загрузитьвнешнююкомпоненту закрытьсправку записатьjson записатьxml записатьдатуjson записьжурналарегистрации заполнитьзначениясвойств запроситьразрешениепользователя запуститьприложение запуститьсистему зафиксироватьтранзакцию значениевданныеформы значениевстрокувнутр значениевфайл значениезаполнено значениеизстрокивнутр значениеизфайла изxmlтипа импортмоделиxdto имякомпьютера имяпользователя инициализироватьпредопределенныеданные информацияобошибке каталогбиблиотекимобильногоустройства каталогвременныхфайлов каталогдокументов каталогпрограммы кодироватьстроку кодлокализацииинформационнойбазы кодсимвола командасистемы конецгода конецдня конецквартала конецмесяца конецминуты конецнедели конецчаса конфигурациябазыданныхизмененадинамически конфигурацияизменена копироватьданныеформы копироватьфайл краткоепредставлениеошибки лев макс местноевремя месяц мин минута монопольныйрежим найти найтинедопустимыесимволыxml найтиокнопонавигационнойссылке найтипомеченныенаудаление найтипоссылкам найтифайлы началогода началодня началоквартала началомесяца началоминуты началонедели началочаса начатьзапросразрешенияпользователя начатьзапускприложения начатькопированиефайла начатьперемещениефайла начатьподключениевнешнейкомпоненты начатьподключениерасширенияработыскриптографией начатьподключениерасширенияработысфайлами начатьпоискфайлов начатьполучениекаталогавременныхфайлов начатьполучениекаталогадокументов начатьполучениерабочегокаталогаданныхпользователя начатьполучениефайлов начатьпомещениефайла начатьпомещениефайлов начатьсозданиедвоичныхданныхизфайла начатьсозданиекаталога начатьтранзакцию начатьудалениефайлов начатьустановкувнешнейкомпоненты начатьустановкурасширенияработыскриптографией начатьустановкурасширенияработысфайлами неделягода необходимостьзавершениясоединения номерсеансаинформационнойбазы номерсоединенияинформационнойбазы нрег нстр обновитьинтерфейс обновитьнумерациюобъектов обновитьповторноиспользуемыезначения обработкапрерыванияпользователя объединитьфайлы окр описаниеошибки оповестить оповеститьобизменении отключитьобработчикзапросанастроекклиенталицензирования отключитьобработчикожидания отключитьобработчикоповещения открытьзначение открытьиндекссправки открытьсодержаниесправки открытьсправку открытьформу открытьформумодально отменитьтранзакцию очиститьжурналрегистрации очиститьнастройкипользователя очиститьсообщения параметрыдоступа перейтипонавигационнойссылке переместитьфайл подключитьвнешнююкомпоненту подключитьобработчикзапросанастроекклиенталицензирования подключитьобработчикожидания подключитьобработчикоповещения подключитьрасширениеработыскриптографией подключитьрасширениеработысфайлами подробноепредставлениеошибки показатьвводдаты показатьвводзначения показатьвводстроки показатьвводчисла показатьвопрос показатьзначение показатьинформациюобошибке показатьнакарте показатьоповещениепользователя показатьпредупреждение полноеимяпользователя получитьcomобъект получитьxmlтип получитьадреспоместоположению получитьблокировкусеансов получитьвремязавершенияспящегосеанса получитьвремязасыпанияпассивногосеанса получитьвремяожиданияблокировкиданных получитьданныевыбора получитьдополнительныйпараметрклиенталицензирования получитьдопустимыекодылокализации получитьдопустимыечасовыепояса получитьзаголовокклиентскогоприложения получитьзаголовоксистемы получитьзначенияотборажурналарегистрации получитьидентификаторконфигурации получитьизвременногохранилища получитьимявременногофайла получитьимяклиенталицензирования получитьинформациюэкрановклиента получитьиспользованиежурналарегистрации получитьиспользованиесобытияжурналарегистрации получитькраткийзаголовокприложения получитьмакетоформления получитьмаскувсефайлы получитьмаскувсефайлыклиента получитьмаскувсефайлысервера получитьместоположениепоадресу получитьминимальнуюдлинупаролейпользователей получитьнавигационнуюссылку получитьнавигационнуюссылкуинформационнойбазы получитьобновлениеконфигурациибазыданных получитьобновлениепредопределенныхданныхинформационнойбазы получитьобщиймакет получитьобщуюформу получитьокна получитьоперативнуюотметкувремени получитьотключениебезопасногорежима получитьпараметрыфункциональныхопцийинтерфейса получитьполноеимяпредопределенногозначения получитьпредставлениянавигационныхссылок получитьпроверкусложностипаролейпользователей получитьразделительпути получитьразделительпутиклиента получитьразделительпутисервера получитьсеансыинформационнойбазы получитьскоростьклиентскогосоединения получитьсоединенияинформационнойбазы получитьсообщенияпользователю получитьсоответствиеобъектаиформы получитьсоставстандартногоинтерфейсаodata получитьструктурухранениябазыданных получитьтекущийсеансинформационнойбазы получитьфайл получитьфайлы получитьформу получитьфункциональнуюопцию получитьфункциональнуюопциюинтерфейса получитьчасовойпоясинформационнойбазы пользователиос поместитьвовременноехранилище поместитьфайл поместитьфайлы прав праводоступа предопределенноезначение представлениекодалокализации представлениепериода представлениеправа представлениеприложения представлениесобытияжурналарегистрации представлениечасовогопояса предупреждение прекратитьработусистемы привилегированныйрежим продолжитьвызов прочитатьjson прочитатьxml прочитатьдатуjson пустаястрока рабочийкаталогданныхпользователя разблокироватьданныедляредактирования разделитьфайл разорватьсоединениесвнешнимисточникомданных раскодироватьстроку рольдоступна секунда сигнал символ скопироватьжурналрегистрации смещениелетнеговремени смещениестандартноговремени соединитьбуферыдвоичныхданных создатькаталог создатьфабрикуxdto сокрл сокрлп сокрп сообщить состояние сохранитьзначение сохранитьнастройкипользователя сред стрдлина стрзаканчиваетсяна стрзаменить стрнайти стрначинаетсяс строка строкасоединенияинформационнойбазы стрполучитьстроку стрразделить стрсоединить стрсравнить стрчисловхождений стрчислострок стршаблон текущаядата текущаядатасеанса текущаяуниверсальнаядата текущаяуниверсальнаядатавмиллисекундах текущийвариантинтерфейсаклиентскогоприложения текущийвариантосновногошрифтаклиентскогоприложения текущийкодлокализации текущийрежимзапуска текущийязык текущийязыксистемы тип типзнч транзакцияактивна трег удалитьданныеинформационнойбазы удалитьизвременногохранилища удалитьобъекты удалитьфайлы универсальноевремя установитьбезопасныйрежим установитьбезопасныйрежимразделенияданных установитьблокировкусеансов установитьвнешнююкомпоненту установитьвремязавершенияспящегосеанса установитьвремязасыпанияпассивногосеанса установитьвремяожиданияблокировкиданных установитьзаголовокклиентскогоприложения установитьзаголовоксистемы установитьиспользованиежурналарегистрации установитьиспользованиесобытияжурналарегистрации установитькраткийзаголовокприложения установитьминимальнуюдлинупаролейпользователей установитьмонопольныйрежим установитьнастройкиклиенталицензирования установитьобновлениепредопределенныхданныхинформационнойбазы установитьотключениебезопасногорежима установитьпараметрыфункциональныхопцийинтерфейса установитьпривилегированныйрежим установитьпроверкусложностипаролейпользователей установитьрасширениеработыскриптографией установитьрасширениеработысфайлами установитьсоединениесвнешнимисточникомданных установитьсоответствиеобъектаиформы установитьсоставстандартногоинтерфейсаodata установитьчасовойпоясинформационнойбазы установитьчасовойпояссеанса формат цел час часовойпояс часовойпояссеанса число числопрописью этоадресвременногохранилища wsссылки библиотекакартинок библиотекамакетовоформлениякомпоновкиданных библиотекастилей бизнеспроцессы внешниеисточникиданных внешниеобработки внешниеотчеты встроенныепокупки главныйинтерфейс главныйстиль документы доставляемыеуведомления журналыдокументов задачи информацияобинтернетсоединении использованиерабочейдаты историяработыпользователя константы критерииотбора метаданные обработки отображениерекламы отправкадоставляемыхуведомлений отчеты панельзадачос параметрзапуска параметрысеанса перечисления планывидоврасчета планывидовхарактеристик планыобмена планысчетов полнотекстовыйпоиск пользователиинформационнойбазы последовательности проверкавстроенныхпокупок рабочаядата расширенияконфигурации регистрыбухгалтерии регистрынакопления регистрырасчета регистрысведений регламентныезадания сериализаторxdto справочники средствагеопозиционирования средствакриптографии средствамультимедиа средстваотображениярекламы средствапочты средствателефонии фабрикаxdto файловыепотоки фоновыезадания хранилищанастроек хранилищевариантовотчетов хранилищенастроекданныхформ хранилищеобщихнастроек хранилищепользовательскихнастроекдинамическихсписков хранилищепользовательскихнастроекотчетов хранилищесистемныхнастроек ",class:"webцвета windowsцвета windowsшрифты библиотекакартинок рамкистиля символы цветастиля шрифтыстиля автоматическоесохранениеданныхформывнастройках автонумерациявформе автораздвижениесерий анимациядиаграммы вариантвыравниванияэлементовизаголовков вариантуправлениявысотойтаблицы вертикальнаяпрокруткаформы вертикальноеположение вертикальноеположениеэлемента видгруппыформы виддекорацииформы виддополненияэлементаформы видизмененияданных видкнопкиформы видпереключателя видподписейкдиаграмме видполяформы видфлажка влияниеразмеранапузырекдиаграммы горизонтальноеположение горизонтальноеположениеэлемента группировкаколонок группировкаподчиненныхэлементовформы группыиэлементы действиеперетаскивания дополнительныйрежимотображения допустимыедействияперетаскивания интервалмеждуэлементамиформы использованиевывода использованиеполосыпрокрутки используемоезначениеточкибиржевойдиаграммы историявыборапривводе источникзначенийоситочекдиаграммы источникзначенияразмерапузырькадиаграммы категориягруппыкоманд максимумсерий начальноеотображениедерева начальноеотображениесписка обновлениетекстаредактирования ориентациядендрограммы ориентациядиаграммы ориентацияметокдиаграммы ориентацияметоксводнойдиаграммы ориентацияэлементаформы отображениевдиаграмме отображениевлегендедиаграммы отображениегруппыкнопок отображениезаголовкашкалыдиаграммы отображениезначенийсводнойдиаграммы отображениезначенияизмерительнойдиаграммы отображениеинтерваладиаграммыганта отображениекнопки отображениекнопкивыбора отображениеобсужденийформы отображениеобычнойгруппы отображениеотрицательныхзначенийпузырьковойдиаграммы отображениепанелипоиска отображениеподсказки отображениепредупрежденияприредактировании отображениеразметкиполосырегулирования отображениестраницформы отображениетаблицы отображениетекстазначениядиаграммыганта отображениеуправленияобычнойгруппы отображениефигурыкнопки палитрацветовдиаграммы поведениеобычнойгруппы поддержкамасштабадендрограммы поддержкамасштабадиаграммыганта поддержкамасштабасводнойдиаграммы поисквтаблицепривводе положениезаголовкаэлементаформы положениекартинкикнопкиформы положениекартинкиэлементаграфическойсхемы положениекоманднойпанелиформы положениекоманднойпанелиэлементаформы положениеопорнойточкиотрисовки положениеподписейкдиаграмме положениеподписейшкалызначенийизмерительнойдиаграммы положениесостоянияпросмотра положениестрокипоиска положениетекстасоединительнойлинии положениеуправленияпоиском положениешкалывремени порядокотображенияточекгоризонтальнойгистограммы порядоксерийвлегендедиаграммы размеркартинки расположениезаголовкашкалыдиаграммы растягиваниеповертикалидиаграммыганта режимавтоотображениясостояния режимвводастроктаблицы режимвыборанезаполненного режимвыделениядаты режимвыделениястрокитаблицы режимвыделениятаблицы режимизмененияразмера режимизменениясвязанногозначения режимиспользованиядиалогапечати режимиспользованияпараметракоманды режиммасштабированияпросмотра режимосновногоокнаклиентскогоприложения режимоткрытияокнаформы режимотображениявыделения режимотображениягеографическойсхемы режимотображениязначенийсерии режимотрисовкисеткиграфическойсхемы режимполупрозрачностидиаграммы режимпробеловдиаграммы режимразмещениянастранице режимредактированияколонки режимсглаживаниядиаграммы режимсглаживанияиндикатора режимсписказадач сквозноевыравнивание сохранениеданныхформывнастройках способзаполнениятекстазаголовкашкалыдиаграммы способопределенияограничивающегозначениядиаграммы стандартнаягруппакоманд стандартноеоформление статусоповещенияпользователя стильстрелки типаппроксимациилиниитрендадиаграммы типдиаграммы типединицышкалывремени типимпортасерийслоягеографическойсхемы типлиниигеографическойсхемы типлиниидиаграммы типмаркерагеографическойсхемы типмаркерадиаграммы типобластиоформления типорганизацииисточникаданныхгеографическойсхемы типотображениясериислоягеографическойсхемы типотображенияточечногообъектагеографическойсхемы типотображенияшкалыэлементалегендыгеографическойсхемы типпоискаобъектовгеографическойсхемы типпроекциигеографическойсхемы типразмещенияизмерений типразмещенияреквизитовизмерений типрамкиэлементауправления типсводнойдиаграммы типсвязидиаграммыганта типсоединениязначенийпосериямдиаграммы типсоединенияточекдиаграммы типсоединительнойлинии типстороныэлементаграфическойсхемы типформыотчета типшкалырадарнойдиаграммы факторлиниитрендадиаграммы фигуракнопки фигурыграфическойсхемы фиксациявтаблице форматдняшкалывремени форматкартинки ширинаподчиненныхэлементовформы виддвижениябухгалтерии виддвижениянакопления видпериодарегистрарасчета видсчета видточкимаршрутабизнеспроцесса использованиеагрегатарегистранакопления использованиегруппиэлементов использованиережимапроведения использованиесреза периодичностьагрегатарегистранакопления режимавтовремя режимзаписидокумента режимпроведениядокумента авторегистрацияизменений допустимыйномерсообщения отправкаэлементаданных получениеэлементаданных использованиерасшифровкитабличногодокумента ориентациястраницы положениеитоговколоноксводнойтаблицы положениеитоговстроксводнойтаблицы положениетекстаотносительнокартинки расположениезаголовкагруппировкитабличногодокумента способчтениязначенийтабличногодокумента типдвустороннейпечати типзаполненияобластитабличногодокумента типкурсоровтабличногодокумента типлиниирисункатабличногодокумента типлинииячейкитабличногодокумента типнаправленияпереходатабличногодокумента типотображениявыделениятабличногодокумента типотображениялинийсводнойтаблицы типразмещениятекстатабличногодокумента типрисункатабличногодокумента типсмещениятабличногодокумента типузоратабличногодокумента типфайлатабличногодокумента точностьпечати чередованиерасположениястраниц отображениевремениэлементовпланировщика типфайлаформатированногодокумента обходрезультатазапроса типзаписизапроса видзаполнениярасшифровкипостроителяотчета типдобавленияпредставлений типизмеренияпостроителяотчета типразмещенияитогов доступкфайлу режимдиалогавыборафайла режимоткрытияфайла типизмеренияпостроителязапроса видданныханализа методкластеризации типединицыинтервалавременианализаданных типзаполнениятаблицырезультатаанализаданных типиспользованиячисловыхзначенийанализаданных типисточникаданныхпоискаассоциаций типколонкианализаданныхдереворешений типколонкианализаданныхкластеризация типколонкианализаданныхобщаястатистика типколонкианализаданныхпоискассоциаций типколонкианализаданныхпоискпоследовательностей типколонкимоделипрогноза типмерырасстоянияанализаданных типотсеченияправилассоциации типполяанализаданных типстандартизациианализаданных типупорядочиванияправилассоциациианализаданных типупорядочиванияшаблоновпоследовательностейанализаданных типупрощениядереварешений wsнаправлениепараметра вариантxpathxs вариантзаписидатыjson вариантпростоготипаxs видгруппымоделиxs видфасетаxdto действиепостроителяdom завершенностьпростоготипаxs завершенностьсоставноготипаxs завершенностьсхемыxs запрещенныеподстановкиxs исключениягруппподстановкиxs категорияиспользованияатрибутаxs категорияограниченияидентичностиxs категорияограниченияпространствименxs методнаследованияxs модельсодержимогоxs назначениетипаxml недопустимыеподстановкиxs обработкапробельныхсимволовxs обработкасодержимогоxs ограничениезначенияxs параметрыотбораузловdom переносстрокjson позициявдокументеdom пробельныесимволыxml типатрибутаxml типзначенияjson типканоническогоxml типкомпонентыxs типпроверкиxml типрезультатаdomxpath типузлаdom типузлаxml формаxml формапредставленияxs форматдатыjson экранированиесимволовjson видсравнениякомпоновкиданных действиеобработкирасшифровкикомпоновкиданных направлениесортировкикомпоновкиданных расположениевложенныхэлементоврезультатакомпоновкиданных расположениеитоговкомпоновкиданных расположениегруппировкикомпоновкиданных расположениеполейгруппировкикомпоновкиданных расположениеполякомпоновкиданных расположениереквизитовкомпоновкиданных расположениересурсовкомпоновкиданных типбухгалтерскогоостаткакомпоновкиданных типвыводатекстакомпоновкиданных типгруппировкикомпоновкиданных типгруппыэлементовотборакомпоновкиданных типдополненияпериодакомпоновкиданных типзаголовкаполейкомпоновкиданных типмакетагруппировкикомпоновкиданных типмакетаобластикомпоновкиданных типостаткакомпоновкиданных типпериодакомпоновкиданных типразмещениятекстакомпоновкиданных типсвязинаборовданныхкомпоновкиданных типэлементарезультатакомпоновкиданных расположениелегендыдиаграммыкомпоновкиданных типпримененияотборакомпоновкиданных режимотображенияэлементанастройкикомпоновкиданных режимотображениянастроеккомпоновкиданных состояниеэлементанастройкикомпоновкиданных способвосстановлениянастроеккомпоновкиданных режимкомпоновкирезультата использованиепараметракомпоновкиданных автопозицияресурсовкомпоновкиданных вариантиспользованиягруппировкикомпоновкиданных расположениересурсоввдиаграммекомпоновкиданных фиксациякомпоновкиданных использованиеусловногооформлениякомпоновкиданных важностьинтернетпочтовогосообщения обработкатекстаинтернетпочтовогосообщения способкодированияинтернетпочтовоговложения способкодированиянеasciiсимволовинтернетпочтовогосообщения типтекстапочтовогосообщения протоколинтернетпочты статусразборапочтовогосообщения режимтранзакциизаписижурналарегистрации статустранзакциизаписижурналарегистрации уровеньжурналарегистрации расположениехранилищасертификатовкриптографии режимвключениясертификатовкриптографии режимпроверкисертификатакриптографии типхранилищасертификатовкриптографии кодировкаименфайловвzipфайле методсжатияzip методшифрованияzip режимвосстановленияпутейфайловzip режимобработкиподкаталоговzip режимсохраненияпутейzip уровеньсжатияzip звуковоеоповещение направлениепереходакстроке позициявпотоке порядокбайтов режимблокировкиданных режимуправленияблокировкойданных сервисвстроенныхпокупок состояниефоновогозадания типподписчикадоставляемыхуведомлений уровеньиспользованиязащищенногосоединенияftp направлениепорядкасхемызапроса типдополненияпериодамисхемызапроса типконтрольнойточкисхемызапроса типобъединениясхемызапроса типпараметрадоступнойтаблицысхемызапроса типсоединениясхемызапроса httpметод автоиспользованиеобщегореквизита автопрефиксномеразадачи вариантвстроенногоязыка видиерархии видрегистранакопления видтаблицывнешнегоисточникаданных записьдвиженийприпроведении заполнениепоследовательностей индексирование использованиебазыпланавидоврасчета использованиебыстроговыбора использованиеобщегореквизита использованиеподчинения использованиеполнотекстовогопоиска использованиеразделяемыхданныхобщегореквизита использованиереквизита назначениеиспользованияприложения назначениерасширенияконфигурации направлениепередачи обновлениепредопределенныхданных оперативноепроведение основноепредставлениевидарасчета основноепредставлениевидахарактеристики основноепредставлениезадачи основноепредставлениепланаобмена основноепредставлениесправочника основноепредставлениесчета перемещениеграницыприпроведении периодичностьномерабизнеспроцесса периодичностьномерадокумента периодичностьрегистрарасчета периодичностьрегистрасведений повторноеиспользованиевозвращаемыхзначений полнотекстовыйпоискпривводепостроке принадлежностьобъекта проведение разделениеаутентификацииобщегореквизита разделениеданныхобщегореквизита разделениерасширенийконфигурацииобщегореквизита режимавтонумерацииобъектов режимзаписирегистра режимиспользованиямодальности режимиспользованиясинхронныхвызововрасширенийплатформыивнешнихкомпонент режимповторногоиспользованиясеансов режимполученияданныхвыборапривводепостроке режимсовместимости режимсовместимостиинтерфейса режимуправленияблокировкойданныхпоумолчанию сериикодовпланавидовхарактеристик сериикодовпланасчетов сериикодовсправочника созданиепривводе способвыбора способпоискастрокипривводепостроке способредактирования типданныхтаблицывнешнегоисточникаданных типкодапланавидоврасчета типкодасправочника типмакета типномерабизнеспроцесса типномерадокумента типномеразадачи типформы удалениедвижений важностьпроблемыприменениярасширенияконфигурации вариантинтерфейсаклиентскогоприложения вариантмасштабаформклиентскогоприложения вариантосновногошрифтаклиентскогоприложения вариантстандартногопериода вариантстандартнойдатыначала видграницы видкартинки видотображенияполнотекстовогопоиска видрамки видсравнения видцвета видчисловогозначения видшрифта допустимаядлина допустимыйзнак использованиеbyteordermark использованиеметаданныхполнотекстовогопоиска источникрасширенийконфигурации клавиша кодвозвратадиалога кодировкаxbase кодировкатекста направлениепоиска направлениесортировки обновлениепредопределенныхданных обновлениеприизмененииданных отображениепанелиразделов проверказаполнения режимдиалогавопрос режимзапускаклиентскогоприложения режимокругления режимоткрытияформприложения режимполнотекстовогопоиска скоростьклиентскогосоединения состояниевнешнегоисточникаданных состояниеобновленияконфигурациибазыданных способвыборасертификатаwindows способкодированиястроки статуссообщения типвнешнейкомпоненты типплатформы типповеденияклавишиenter типэлементаинформацииовыполненииобновленияконфигурациибазыданных уровеньизоляциитранзакций хешфункция частидаты",type:"comобъект ftpсоединение httpзапрос httpсервисответ httpсоединение wsопределения wsпрокси xbase анализданных аннотацияxs блокировкаданных буфердвоичныхданных включениеxs выражениекомпоновкиданных генераторслучайныхчисел географическаясхема географическиекоординаты графическаясхема группамоделиxs данныерасшифровкикомпоновкиданных двоичныеданные дендрограмма диаграмма диаграммаганта диалогвыборафайла диалогвыборацвета диалогвыборашрифта диалограсписаниярегламентногозадания диалогредактированиястандартногопериода диапазон документdom документhtml документацияxs доставляемоеуведомление записьdom записьfastinfoset записьhtml записьjson записьxml записьzipфайла записьданных записьтекста записьузловdom запрос защищенноесоединениеopenssl значенияполейрасшифровкикомпоновкиданных извлечениетекста импортxs интернетпочта интернетпочтовоесообщение интернетпочтовыйпрофиль интернетпрокси интернетсоединение информациядляприложенияxs использованиеатрибутаxs использованиесобытияжурналарегистрации источникдоступныхнастроеккомпоновкиданных итераторузловdom картинка квалификаторыдаты квалификаторыдвоичныхданных квалификаторыстроки квалификаторычисла компоновщикмакетакомпоновкиданных компоновщикнастроеккомпоновкиданных конструктормакетаоформлениякомпоновкиданных конструкторнастроеккомпоновкиданных конструкторформатнойстроки линия макеткомпоновкиданных макетобластикомпоновкиданных макетоформлениякомпоновкиданных маскаxs менеджеркриптографии наборсхемxml настройкикомпоновкиданных настройкисериализацииjson обработкакартинок обработкарасшифровкикомпоновкиданных обходдереваdom объявлениеатрибутаxs объявлениенотацииxs объявлениеэлементаxs описаниеиспользованиясобытиядоступжурналарегистрации описаниеиспользованиясобытияотказвдоступежурналарегистрации описаниеобработкирасшифровкикомпоновкиданных описаниепередаваемогофайла описаниетипов определениегруппыатрибутовxs определениегруппымоделиxs определениеограниченияидентичностиxs определениепростоготипаxs определениесоставноготипаxs определениетипадокументаdom определенияxpathxs отборкомпоновкиданных пакетотображаемыхдокументов параметрвыбора параметркомпоновкиданных параметрызаписиjson параметрызаписиxml параметрычтенияxml переопределениеxs планировщик полеанализаданных полекомпоновкиданных построительdom построительзапроса построительотчета построительотчетаанализаданных построительсхемxml поток потоквпамяти почта почтовоесообщение преобразованиеxsl преобразованиекканоническомуxml процессорвыводарезультатакомпоновкиданныхвколлекциюзначений процессорвыводарезультатакомпоновкиданныхвтабличныйдокумент процессоркомпоновкиданных разыменовательпространствименdom рамка расписаниерегламентногозадания расширенноеимяxml результатчтенияданных своднаядиаграмма связьпараметравыбора связьпотипу связьпотипукомпоновкиданных сериализаторxdto сертификатклиентаwindows сертификатклиентафайл сертификаткриптографии сертификатыудостоверяющихцентровwindows сертификатыудостоверяющихцентровфайл сжатиеданных системнаяинформация сообщениепользователю сочетаниеклавиш сравнениезначений стандартнаядатаначала стандартныйпериод схемаxml схемакомпоновкиданных табличныйдокумент текстовыйдокумент тестируемоеприложение типданныхxml уникальныйидентификатор фабрикаxdto файл файловыйпоток фасетдлиныxs фасетколичестваразрядовдробнойчастиxs фасетмаксимальноговключающегозначенияxs фасетмаксимальногоисключающегозначенияxs фасетмаксимальнойдлиныxs фасетминимальноговключающегозначенияxs фасетминимальногоисключающегозначенияxs фасетминимальнойдлиныxs фасетобразцаxs фасетобщегоколичестваразрядовxs фасетперечисленияxs фасетпробельныхсимволовxs фильтрузловdom форматированнаястрока форматированныйдокумент фрагментxs хешированиеданных хранилищезначения цвет чтениеfastinfoset чтениеhtml чтениеjson чтениеxml чтениеzipфайла чтениеданных чтениетекста чтениеузловdom шрифт элементрезультатакомпоновкиданных comsafearray деревозначений массив соответствие списокзначений структура таблицазначений фиксированнаяструктура фиксированноесоответствие фиксированныймассив ",literal:e},contains:[{className:"meta",begin:"#|&",end:"$",keywords:{$pattern:x,"meta-keyword":n+"загрузитьизфайла вебклиент вместо внешнеесоединение клиент конецобласти мобильноеприложениеклиент мобильноеприложениесервер наклиенте наклиентенасервере наклиентенасерверебезконтекста насервере насерверебезконтекста область перед после сервер толстыйклиентобычноеприложение толстыйклиентуправляемоеприложение тонкийклиент "},contains:[i]},{className:"function",variants:[{begin:"процедура|функция",end:"\\)",keywords:"процедура функция"},{begin:"конецпроцедуры|конецфункции",keywords:"конецпроцедуры конецфункции"}],contains:[{begin:"\\(",end:"\\)",endsParent:!0,contains:[{className:"params",begin:x,end:",",excludeEnd:!0,endsWithParent:!0,keywords:{$pattern:x,keyword:"знач",literal:e},contains:[o,t,a]},i]},s.inherit(s.TITLE_MODE,{begin:x})]},i,{className:"symbol",begin:"~",end:";|:",excludeEnd:!0},o,t,a]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/abnf.min.js b/vendor/assets/javascripts/highlightjs/languages/abnf.min.js
index bfb5119099..a5c1990ade 100644
--- a/vendor/assets/javascripts/highlightjs/languages/abnf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/abnf.min.js
@@ -1 +1 @@
-hljs.registerLanguage("abnf",function(e){var r={ruleDeclaration:"^[a-zA-Z][a-zA-Z0-9-]*",unexpectedChars:"[!@#$^&',?+~`|:]"},a=["ALPHA","BIT","CHAR","CR","CRLF","CTL","DIGIT","DQUOTE","HEXDIG","HTAB","LF","LWSP","OCTET","SP","VCHAR","WSP"],b=e.C(";","$"),c={cN:"symbol",b:/%b[0-1]+(-[0-1]+|(\.[0-1]+)+){0,1}/},l={cN:"symbol",b:/%d[0-9]+(-[0-9]+|(\.[0-9]+)+){0,1}/},n={cN:"symbol",b:/%x[0-9A-F]+(-[0-9A-F]+|(\.[0-9A-F]+)+){0,1}/},t={cN:"symbol",b:/%[si]/},s={b:r.ruleDeclaration+"\\s*=",rB:!0,e:/=/,r:0,c:[{cN:"attribute",b:r.ruleDeclaration}]};return{i:r.unexpectedChars,k:a.join(" "),c:[s,b,c,l,n,t,e.QSM,e.NM]}});
\ No newline at end of file
+hljs.registerLanguage("abnf",function(){"use strict";return function(s){return{name:"Augmented Backus-Naur Form",illegal:"[!@#$^&',?+~`|:]",keywords:"ALPHA BIT CHAR CR CRLF CTL DIGIT DQUOTE HEXDIG HTAB LF LWSP OCTET SP VCHAR WSP",contains:[{className:"attribute",begin:"^[a-zA-Z][a-zA-Z0-9-]*(?=\\s*=)"},s.COMMENT(";","$"),{className:"symbol",begin:/%b[0-1]+(-[0-1]+|(\.[0-1]+)+){0,1}/},{className:"symbol",begin:/%d[0-9]+(-[0-9]+|(\.[0-9]+)+){0,1}/},{className:"symbol",begin:/%x[0-9A-F]+(-[0-9A-F]+|(\.[0-9A-F]+)+){0,1}/},{className:"symbol",begin:/%[si]/},s.QUOTE_STRING_MODE,s.NUMBER_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/accesslog.min.js b/vendor/assets/javascripts/highlightjs/languages/accesslog.min.js
index 02ee5f15ba..ff272f62af 100644
--- a/vendor/assets/javascripts/highlightjs/languages/accesslog.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/accesslog.min.js
@@ -1 +1 @@
-hljs.registerLanguage("accesslog",function(T){return{c:[{cN:"number",b:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{cN:"number",b:"\\b\\d+\\b",r:0},{cN:"string",b:'"(GET|POST|HEAD|PUT|DELETE|CONNECT|OPTIONS|PATCH|TRACE)',e:'"',k:"GET POST HEAD PUT DELETE CONNECT OPTIONS PATCH TRACE",i:"\\n",r:10},{cN:"string",b:/\[/,e:/\]/,i:"\\n"},{cN:"string",b:'"',e:'"',i:"\\n"}]}});
\ No newline at end of file
+hljs.registerLanguage("accesslog",function(){"use strict";return function(e){var n=["GET","POST","HEAD","PUT","DELETE","CONNECT","OPTIONS","PATCH","TRACE"];return{name:"Apache Access Log",contains:[{className:"number",begin:"^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b",relevance:5},{className:"number",begin:"\\b\\d+\\b",relevance:0},{className:"string",begin:'"('+n.join("|")+")",end:'"',keywords:n.join(" "),illegal:"\\n",relevance:5,contains:[{begin:"HTTP/[12]\\.\\d",relevance:5}]},{className:"string",begin:/\[\d[^\]\n]{8,}\]/,illegal:"\\n",relevance:1},{className:"string",begin:/\[/,end:/\]/,illegal:"\\n",relevance:0},{className:"string",begin:'"Mozilla/\\d\\.\\d \\(',end:'"',illegal:"\\n",relevance:3},{className:"string",begin:'"',end:'"',illegal:"\\n",relevance:0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/actionscript.min.js b/vendor/assets/javascripts/highlightjs/languages/actionscript.min.js
index 40e2a305b4..df9c5c2049 100644
--- a/vendor/assets/javascripts/highlightjs/languages/actionscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/actionscript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("actionscript",function(e){var a="[a-zA-Z_$][a-zA-Z0-9_$]*",t="([*]|[a-zA-Z_$][a-zA-Z0-9_$]*)",c={cN:"rest_arg",b:"[.]{3}",e:a,r:10};return{aliases:["as"],k:{keyword:"as break case catch class const continue default delete do dynamic each else extends final finally for function get if implements import in include instanceof interface internal is namespace native new override package private protected public return set static super switch this throw try typeof use var void while with",literal:"true false null undefined"},c:[e.ASM,e.QSM,e.CLCM,e.CBCM,e.CNM,{cN:"class",bK:"package",e:"{",c:[e.TM]},{cN:"class",bK:"class interface",e:"{",eE:!0,c:[{bK:"extends implements"},e.TM]},{cN:"meta",bK:"import include",e:";",k:{"meta-keyword":"import include"}},{cN:"function",bK:"function",e:"[{;]",eE:!0,i:"\\S",c:[e.TM,{cN:"params",b:"\\(",e:"\\)",c:[e.ASM,e.QSM,e.CLCM,e.CBCM,c]},{b:":\\s*"+t}]},e.METHOD_GUARD],i:/#/}});
\ No newline at end of file
+hljs.registerLanguage("actionscript",function(){"use strict";return function(e){return{name:"ActionScript",aliases:["as"],keywords:{keyword:"as break case catch class const continue default delete do dynamic each else extends final finally for function get if implements import in include instanceof interface internal is namespace native new override package private protected public return set static super switch this throw try typeof use var void while with",literal:"true false null undefined"},contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.C_NUMBER_MODE,{className:"class",beginKeywords:"package",end:"{",contains:[e.TITLE_MODE]},{className:"class",beginKeywords:"class interface",end:"{",excludeEnd:!0,contains:[{beginKeywords:"extends implements"},e.TITLE_MODE]},{className:"meta",beginKeywords:"import include",end:";",keywords:{"meta-keyword":"import include"}},{className:"function",beginKeywords:"function",end:"[{;]",excludeEnd:!0,illegal:"\\S",contains:[e.TITLE_MODE,{className:"params",begin:"\\(",end:"\\)",contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"rest_arg",begin:"[.]{3}",end:"[a-zA-Z_$][a-zA-Z0-9_$]*",relevance:10}]},{begin:":\\s*([*]|[a-zA-Z_$][a-zA-Z0-9_$]*)"}]},e.METHOD_GUARD],illegal:/#/}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ada.min.js b/vendor/assets/javascripts/highlightjs/languages/ada.min.js
index 80173739de..e03496b8bb 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ada.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ada.min.js
@@ -1 +1 @@
-hljs.registerLanguage("ada",function(e){var r="\\d(_|\\d)*",t="[eE][-+]?"+r,s=r+"(\\."+r+")?("+t+")?",n="\\w+",a=r+"#"+n+"(\\."+n+")?#("+t+")?",i="\\b("+a+"|"+s+")",c="[A-Za-z](_?[A-Za-z0-9.])*",o="[]{}%#'\"",b=e.C("--","$"),d={b:"\\s+:\\s+",e:"\\s*(:=|;|\\)|=>|$)",i:o,c:[{bK:"loop for declare others",endsParent:!0},{cN:"keyword",bK:"not null constant access function procedure in out aliased exception"},{cN:"type",b:c,endsParent:!0,r:0}]};return{cI:!0,k:{keyword:"abort else new return abs elsif not reverse abstract end accept entry select access exception of separate aliased exit or some all others subtype and for out synchronized array function overriding at tagged generic package task begin goto pragma terminate body private then if procedure type case in protected constant interface is raise use declare range delay limited record when delta loop rem while digits renames with do mod requeue xor",literal:"True False"},c:[b,{cN:"string",b:/"/,e:/"/,c:[{b:/""/,r:0}]},{cN:"string",b:/'.'/},{cN:"number",b:i,r:0},{cN:"symbol",b:"'"+c},{cN:"title",b:"(\\bwith\\s+)?(\\bprivate\\s+)?\\bpackage\\s+(\\bbody\\s+)?",e:"(is|$)",k:"package body",eB:!0,eE:!0,i:o},{b:"(\\b(with|overriding)\\s+)?\\b(function|procedure)\\s+",e:"(\\bis|\\bwith|\\brenames|\\)\\s*;)",k:"overriding function procedure with is renames return",rB:!0,c:[b,{cN:"title",b:"(\\bwith\\s+)?\\b(function|procedure)\\s+",e:"(\\(|\\s+|$)",eB:!0,eE:!0,i:o},d,{cN:"type",b:"\\breturn\\s+",e:"(\\s+|;|$)",k:"return",eB:!0,eE:!0,endsParent:!0,i:o}]},{cN:"type",b:"\\b(sub)?type\\s+",e:"\\s+",k:"type",eB:!0,i:o},d]}});
\ No newline at end of file
+hljs.registerLanguage("ada",function(){"use strict";return function(e){var n="[A-Za-z](_?[A-Za-z0-9.])*",s=e.COMMENT("--","$"),a={begin:"\\s+:\\s+",end:"\\s*(:=|;|\\)|=>|$)",illegal:"[]{}%#'\"",contains:[{beginKeywords:"loop for declare others",endsParent:!0},{className:"keyword",beginKeywords:"not null constant access function procedure in out aliased exception"},{className:"type",begin:n,endsParent:!0,relevance:0}]};return{name:"Ada",case_insensitive:!0,keywords:{keyword:"abort else new return abs elsif not reverse abstract end accept entry select access exception of separate aliased exit or some all others subtype and for out synchronized array function overriding at tagged generic package task begin goto pragma terminate body private then if procedure type case in protected constant interface is raise use declare range delay limited record when delta loop rem while digits renames with do mod requeue xor",literal:"True False"},contains:[s,{className:"string",begin:/"/,end:/"/,contains:[{begin:/""/,relevance:0}]},{className:"string",begin:/'.'/},{className:"number",begin:"\\b(\\d(_|\\d)*#\\w+(\\.\\w+)?#([eE][-+]?\\d(_|\\d)*)?|\\d(_|\\d)*(\\.\\d(_|\\d)*)?([eE][-+]?\\d(_|\\d)*)?)",relevance:0},{className:"symbol",begin:"'"+n},{className:"title",begin:"(\\bwith\\s+)?(\\bprivate\\s+)?\\bpackage\\s+(\\bbody\\s+)?",end:"(is|$)",keywords:"package body",excludeBegin:!0,excludeEnd:!0,illegal:"[]{}%#'\""},{begin:"(\\b(with|overriding)\\s+)?\\b(function|procedure)\\s+",end:"(\\bis|\\bwith|\\brenames|\\)\\s*;)",keywords:"overriding function procedure with is renames return",returnBegin:!0,contains:[s,{className:"title",begin:"(\\bwith\\s+)?\\b(function|procedure)\\s+",end:"(\\(|\\s+|$)",excludeBegin:!0,excludeEnd:!0,illegal:"[]{}%#'\""},a,{className:"type",begin:"\\breturn\\s+",end:"(\\s+|;|$)",keywords:"return",excludeBegin:!0,excludeEnd:!0,endsParent:!0,illegal:"[]{}%#'\""}]},{className:"type",begin:"\\b(sub)?type\\s+",end:"\\s+",keywords:"type",excludeBegin:!0,illegal:"[]{}%#'\""},a]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/angelscript.min.js b/vendor/assets/javascripts/highlightjs/languages/angelscript.min.js
index ea3f37960c..181eca4999 100644
--- a/vendor/assets/javascripts/highlightjs/languages/angelscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/angelscript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("angelscript",function(e){var i={cN:"built_in",b:"\\b(void|bool|int|int8|int16|int32|int64|uint|uint8|uint16|uint32|uint64|string|ref|array|double|float|auto|dictionary)"},t={cN:"symbol",b:"[a-zA-Z0-9_]+@"},n={cN:"keyword",b:"<",e:">",c:[i,t]};return i.c=[n],t.c=[n],{aliases:["asc"],k:"for in|0 break continue while do|0 return if else case switch namespace is cast or and xor not get|0 in inout|10 out override set|0 private public const default|0 final shared external mixin|10 enum typedef funcdef this super import from interface abstract|0 try catch protected explicit",i:"(^using\\s+[A-Za-z0-9_\\.]+;$|\\bfunctions*[^\\(])",c:[{cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE],r:0},{cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE],r:0},{cN:"string",b:'"""',e:'"""'},e.CLCM,e.CBCM,{bK:"interface namespace",e:"{",i:"[;.\\-]",c:[{cN:"symbol",b:"[a-zA-Z0-9_]+"}]},{bK:"class",e:"{",i:"[;.\\-]",c:[{cN:"symbol",b:"[a-zA-Z0-9_]+",c:[{b:"[:,]\\s*",c:[{cN:"symbol",b:"[a-zA-Z0-9_]+"}]}]}]},i,t,{cN:"literal",b:"\\b(null|true|false)"},{cN:"number",b:"(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?f?|\\.\\d+f?)([eE][-+]?\\d+f?)?)"}]}});
\ No newline at end of file
+hljs.registerLanguage("angelscript",function(){"use strict";return function(e){var n={className:"built_in",begin:"\\b(void|bool|int|int8|int16|int32|int64|uint|uint8|uint16|uint32|uint64|string|ref|array|double|float|auto|dictionary)"},a={className:"symbol",begin:"[a-zA-Z0-9_]+@"},i={className:"keyword",begin:"<",end:">",contains:[n,a]};return n.contains=[i],a.contains=[i],{name:"AngelScript",aliases:["asc"],keywords:"for in|0 break continue while do|0 return if else case switch namespace is cast or and xor not get|0 in inout|10 out override set|0 private public const default|0 final shared external mixin|10 enum typedef funcdef this super import from interface abstract|0 try catch protected explicit property",illegal:"(^using\\s+[A-Za-z0-9_\\.]+;$|\\bfunctions*[^\\(])",contains:[{className:"string",begin:"'",end:"'",illegal:"\\n",contains:[e.BACKSLASH_ESCAPE],relevance:0},{className:"string",begin:'"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE],relevance:0},{className:"string",begin:'"""',end:'"""'},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{beginKeywords:"interface namespace",end:"{",illegal:"[;.\\-]",contains:[{className:"symbol",begin:"[a-zA-Z0-9_]+"}]},{beginKeywords:"class",end:"{",illegal:"[;.\\-]",contains:[{className:"symbol",begin:"[a-zA-Z0-9_]+",contains:[{begin:"[:,]\\s*",contains:[{className:"symbol",begin:"[a-zA-Z0-9_]+"}]}]}]},n,a,{className:"literal",begin:"\\b(null|true|false)"},{className:"number",begin:"(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?f?|\\.\\d+f?)([eE][-+]?\\d+f?)?)"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/apache.min.js b/vendor/assets/javascripts/highlightjs/languages/apache.min.js
index 9de481dd37..e1db119832 100644
--- a/vendor/assets/javascripts/highlightjs/languages/apache.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/apache.min.js
@@ -1 +1 @@
-hljs.registerLanguage("apache",function(e){var r={cN:"number",b:"[\\$%]\\d+"};return{aliases:["apacheconf"],cI:!0,c:[e.HCM,{cN:"section",b:"</?",e:">"},{cN:"attribute",b:/\w+/,r:0,k:{nomarkup:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{e:/$/,r:0,k:{literal:"on off all"},c:[{cN:"meta",b:"\\s\\[",e:"\\]$"},{cN:"variable",b:"[\\$%]\\{",e:"\\}",c:["self",r]},r,e.QSM]}}],i:/\S/}});
\ No newline at end of file
+hljs.registerLanguage("apache",function(){"use strict";return function(e){var n={className:"number",begin:"\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?"};return{name:"Apache config",aliases:["apacheconf"],case_insensitive:!0,contains:[e.HASH_COMMENT_MODE,{className:"section",begin:"</?",end:">",contains:[n,{className:"number",begin:":\\d{1,5}"},e.inherit(e.QUOTE_STRING_MODE,{relevance:0})]},{className:"attribute",begin:/\w+/,relevance:0,keywords:{nomarkup:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{end:/$/,relevance:0,keywords:{literal:"on off all deny allow"},contains:[{className:"meta",begin:"\\s\\[",end:"\\]$"},{className:"variable",begin:"[\\$%]\\{",end:"\\}",contains:["self",{className:"number",begin:"[\\$%]\\d+"}]},n,{className:"number",begin:"\\d+"},e.QUOTE_STRING_MODE]}}],illegal:/\S/}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/applescript.min.js b/vendor/assets/javascripts/highlightjs/languages/applescript.min.js
index be3489866c..c3954e7148 100644
--- a/vendor/assets/javascripts/highlightjs/languages/applescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/applescript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("applescript",function(e){var t=e.inherit(e.QSM,{i:""}),r={cN:"params",b:"\\(",e:"\\)",c:["self",e.CNM,t]},i=e.C("--","$"),o=e.C("\\(\\*","\\*\\)",{c:["self",i]}),n=[i,o,e.HCM];return{aliases:["osascript"],k:{keyword:"about above after against and around as at back before beginning behind below beneath beside between but by considering contain contains continue copy div does eighth else end equal equals error every exit fifth first for fourth from front get given global if ignoring in into is it its last local me middle mod my ninth not of on onto or over prop property put ref reference repeat returning script second set seventh since sixth some tell tenth that the|0 then third through thru timeout times to transaction try until where while whose with without",literal:"AppleScript false linefeed return pi quote result space tab true",built_in:"alias application boolean class constant date file integer list number real record string text activate beep count delay launch log offset read round run say summarize write character characters contents day frontmost id item length month name paragraph paragraphs rest reverse running time version weekday word words year"},c:[t,e.CNM,{cN:"built_in",b:"\\b(clipboard info|the clipboard|info for|list (disks|folder)|mount volume|path to|(close|open for) access|(get|set) eof|current date|do shell script|get volume settings|random number|set volume|system attribute|system info|time to GMT|(load|run|store) script|scripting components|ASCII (character|number)|localized string|choose (application|color|file|file name|folder|from list|remote application|URL)|display (alert|dialog))\\b|^\\s*return\\b"},{cN:"literal",b:"\\b(text item delimiters|current application|missing value)\\b"},{cN:"keyword",b:"\\b(apart from|aside from|instead of|out of|greater than|isn't|(doesn't|does not) (equal|come before|come after|contain)|(greater|less) than( or equal)?|(starts?|ends|begins?) with|contained by|comes (before|after)|a (ref|reference)|POSIX file|POSIX path|(date|time) string|quoted form)\\b"},{bK:"on",i:"[${=;\\n]",c:[e.UTM,r]}].concat(n),i:"//|->|=>|\\[\\["}});
\ No newline at end of file
+hljs.registerLanguage("applescript",function(){"use strict";return function(e){var t=e.inherit(e.QUOTE_STRING_MODE,{illegal:""}),r={className:"params",begin:"\\(",end:"\\)",contains:["self",e.C_NUMBER_MODE,t]},n=e.COMMENT("--","$"),i=[n,e.COMMENT("\\(\\*","\\*\\)",{contains:["self",n]}),e.HASH_COMMENT_MODE];return{name:"AppleScript",aliases:["osascript"],keywords:{keyword:"about above after against and around as at back before beginning behind below beneath beside between but by considering contain contains continue copy div does eighth else end equal equals error every exit fifth first for fourth from front get given global if ignoring in into is it its last local me middle mod my ninth not of on onto or over prop property put ref reference repeat returning script second set seventh since sixth some tell tenth that the|0 then third through thru timeout times to transaction try until where while whose with without",literal:"AppleScript false linefeed return pi quote result space tab true",built_in:"alias application boolean class constant date file integer list number real record string text activate beep count delay launch log offset read round run say summarize write character characters contents day frontmost id item length month name paragraph paragraphs rest reverse running time version weekday word words year"},contains:[t,e.C_NUMBER_MODE,{className:"built_in",begin:"\\b(clipboard info|the clipboard|info for|list (disks|folder)|mount volume|path to|(close|open for) access|(get|set) eof|current date|do shell script|get volume settings|random number|set volume|system attribute|system info|time to GMT|(load|run|store) script|scripting components|ASCII (character|number)|localized string|choose (application|color|file|file name|folder|from list|remote application|URL)|display (alert|dialog))\\b|^\\s*return\\b"},{className:"literal",begin:"\\b(text item delimiters|current application|missing value)\\b"},{className:"keyword",begin:"\\b(apart from|aside from|instead of|out of|greater than|isn't|(doesn't|does not) (equal|come before|come after|contain)|(greater|less) than( or equal)?|(starts?|ends|begins?) with|contained by|comes (before|after)|a (ref|reference)|POSIX file|POSIX path|(date|time) string|quoted form)\\b"},{beginKeywords:"on",illegal:"[${=;\\n]",contains:[e.UNDERSCORE_TITLE_MODE,r]}].concat(i),illegal:"//|->|=>|\\[\\["}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/arcade.min.js b/vendor/assets/javascripts/highlightjs/languages/arcade.min.js
index dd37b35f94..f53c988840 100644
--- a/vendor/assets/javascripts/highlightjs/languages/arcade.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/arcade.min.js
@@ -1 +1 @@
-hljs.registerLanguage("arcade",function(e){var t="[A-Za-z_][0-9A-Za-z_]*",n={keyword:"if for while var new function do return void else break",literal:"true false null undefined NaN Infinity PI BackSlash DoubleQuote ForwardSlash NewLine SingleQuote Tab",built_in:"Abs Acos Area AreaGeodetic Asin Atan Atan2 Average Boolean Buffer BufferGeodetic Ceil Centroid Clip Console Constrain Contains Cos Count Crosses Cut Date DateAdd DateDiff Day Decode DefaultValue Dictionary Difference Disjoint Distance Distinct DomainCode DomainName Equals Exp Extent Feature FeatureSet FeatureSetById FeatureSetByTitle FeatureSetByUrl Filter First Floor Geometry Guid HasKey Hour IIf IndexOf Intersection Intersects IsEmpty Length LengthGeodetic Log Max Mean Millisecond Min Minute Month MultiPartToSinglePart Multipoint NextSequenceValue Now Number OrderBy Overlaps Point Polygon Polyline Pow Random Relate Reverse Round Second SetGeometry Sin Sort Sqrt Stdev Sum SymmetricDifference Tan Text Timestamp Today ToLocal Top Touches ToUTC TypeOf Union Variance Weekday When Within Year "},a={cN:"symbol",b:"\\$[feature|layer|map|value|view]+"},r={cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],r:0},i={cN:"subst",b:"\\$\\{",e:"\\}",k:n,c:[]},o={cN:"string",b:"`",e:"`",c:[e.BE,i]};i.c=[e.ASM,e.QSM,o,r,e.RM];var c=i.c.concat([e.CBCM,e.CLCM]);return{aliases:["arcade"],k:n,c:[e.ASM,e.QSM,o,e.CLCM,e.CBCM,a,r,{b:/[{,]\s*/,r:0,c:[{b:t+"\\s*:",rB:!0,r:0,c:[{cN:"attr",b:t,r:0}]}]},{b:"("+e.RSR+"|\\b(return)\\b)\\s*",k:"return",c:[e.CLCM,e.CBCM,e.RM,{cN:"function",b:"(\\(.*?\\)|"+t+")\\s*=>",rB:!0,e:"\\s*=>",c:[{cN:"params",v:[{b:t},{b:/\(\s*\)/},{b:/\(/,e:/\)/,eB:!0,eE:!0,k:n,c:c}]}]}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:t}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:c}],i:/\[|%/},{b:/\$[(.]/}],i:/#(?!!)/}});
\ No newline at end of file
+hljs.registerLanguage("arcade",function(){"use strict";return function(e){var n="[A-Za-z_][0-9A-Za-z_]*",a={keyword:"if for while var new function do return void else break",literal:"BackSlash DoubleQuote false ForwardSlash Infinity NaN NewLine null PI SingleQuote Tab TextFormatting true undefined",built_in:"Abs Acos Angle Attachments Area AreaGeodetic Asin Atan Atan2 Average Bearing Boolean Buffer BufferGeodetic Ceil Centroid Clip Console Constrain Contains Cos Count Crosses Cut Date DateAdd DateDiff Day Decode DefaultValue Dictionary Difference Disjoint Distance DistanceGeodetic Distinct DomainCode DomainName Equals Exp Extent Feature FeatureSet FeatureSetByAssociation FeatureSetById FeatureSetByPortalItem FeatureSetByRelationshipName FeatureSetByTitle FeatureSetByUrl Filter First Floor Geometry GroupBy Guid HasKey Hour IIf IndexOf Intersection Intersects IsEmpty IsNan IsSelfIntersecting Length LengthGeodetic Log Max Mean Millisecond Min Minute Month MultiPartToSinglePart Multipoint NextSequenceValue Now Number OrderBy Overlaps Point Polygon Polyline Portal Pow Random Relate Reverse RingIsClockWise Round Second SetGeometry Sin Sort Sqrt Stdev Sum SymmetricDifference Tan Text Timestamp Today ToLocal Top Touches ToUTC TrackCurrentTime TrackGeometryWindow TrackIndex TrackStartTime TrackWindow TypeOf Union UrlEncode Variance Weekday When Within Year "},t={className:"number",variants:[{begin:"\\b(0[bB][01]+)"},{begin:"\\b(0[oO][0-7]+)"},{begin:e.C_NUMBER_RE}],relevance:0},i={className:"subst",begin:"\\$\\{",end:"\\}",keywords:a,contains:[]},r={className:"string",begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE,i]};i.contains=[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,r,t,e.REGEXP_MODE];var o=i.contains.concat([e.C_BLOCK_COMMENT_MODE,e.C_LINE_COMMENT_MODE]);return{name:"ArcGIS Arcade",aliases:["arcade"],keywords:a,contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"symbol",begin:"\\$[datastore|feature|layer|map|measure|sourcefeature|sourcelayer|targetfeature|targetlayer|value|view]+"},t,{begin:/[{,]\s*/,relevance:0,contains:[{begin:n+"\\s*:",returnBegin:!0,relevance:0,contains:[{className:"attr",begin:n,relevance:0}]}]},{begin:"("+e.RE_STARTERS_RE+"|\\b(return)\\b)\\s*",keywords:"return",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.REGEXP_MODE,{className:"function",begin:"(\\(.*?\\)|"+n+")\\s*=>",returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{begin:n},{begin:/\(\s*\)/},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:a,contains:o}]}]}],relevance:0},{className:"function",beginKeywords:"function",end:/\{/,excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:n}),{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:o}],illegal:/\[|%/},{begin:/\$[(.]/}],illegal:/#(?!!)/}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/arduino.min.js b/vendor/assets/javascripts/highlightjs/languages/arduino.min.js
index 588bfe2c96..cfc1fe5ada 100644
--- a/vendor/assets/javascripts/highlightjs/languages/arduino.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/arduino.min.js
@@ -1 +1 @@
-hljs.registerLanguage("arduino",function(e){var t=e.getLanguage("cpp").exports;return{k:{keyword:"boolean byte word string String array "+t.k.keyword,built_in:"setup loop while catch for if do goto try switch case else default break continue return KeyboardController MouseController SoftwareSerial EthernetServer EthernetClient LiquidCrystal RobotControl GSMVoiceCall EthernetUDP EsploraTFT HttpClient RobotMotor WiFiClient GSMScanner FileSystem Scheduler GSMServer YunClient YunServer IPAddress GSMClient GSMModem Keyboard Ethernet Console GSMBand Esplora Stepper Process WiFiUDP GSM_SMS Mailbox USBHost Firmata PImage Client Server GSMPIN FileIO Bridge Serial EEPROM Stream Mouse Audio Servo File Task GPRS WiFi Wire TFT GSM SPI SD runShellCommandAsynchronously analogWriteResolution retrieveCallingNumber printFirmwareVersion analogReadResolution sendDigitalPortPair noListenOnLocalhost readJoystickButton setFirmwareVersion readJoystickSwitch scrollDisplayRight getVoiceCallStatus scrollDisplayLeft writeMicroseconds delayMicroseconds beginTransmission getSignalStrength runAsynchronously getAsynchronously listenOnLocalhost getCurrentCarrier readAccelerometer messageAvailable sendDigitalPorts lineFollowConfig countryNameWrite runShellCommand readStringUntil rewindDirectory readTemperature setClockDivider readLightSensor endTransmission analogReference detachInterrupt countryNameRead attachInterrupt encryptionType readBytesUntil robotNameWrite readMicrophone robotNameRead cityNameWrite userNameWrite readJoystickY readJoystickX mouseReleased openNextFile scanNetworks noInterrupts digitalWrite beginSpeaker mousePressed isActionDone mouseDragged displayLogos noAutoscroll addParameter remoteNumber getModifiers keyboardRead userNameRead waitContinue processInput parseCommand printVersion readNetworks writeMessage blinkVersion cityNameRead readMessage setDataMode parsePacket isListening setBitOrder beginPacket isDirectory motorsWrite drawCompass digitalRead clearScreen serialEvent rightToLeft setTextSize leftToRight requestFrom keyReleased compassRead analogWrite interrupts WiFiServer disconnect playMelody parseFloat autoscroll getPINUsed setPINUsed setTimeout sendAnalog readSlider analogRead beginWrite createChar motorsStop keyPressed tempoWrite readButton subnetMask debugPrint macAddress writeGreen randomSeed attachGPRS readString sendString remotePort releaseAll mouseMoved background getXChange getYChange answerCall getResult voiceCall endPacket constrain getSocket writeJSON getButton available connected findUntil readBytes exitValue readGreen writeBlue startLoop IPAddress isPressed sendSysex pauseMode gatewayIP setCursor getOemKey tuneWrite noDisplay loadImage switchPIN onRequest onReceive changePIN playFile noBuffer parseInt overflow checkPIN knobRead beginTFT bitClear updateIR bitWrite position writeRGB highByte writeRed setSpeed readBlue noStroke remoteIP transfer shutdown hangCall beginSMS endWrite attached maintain noCursor checkReg checkPUK shiftOut isValid shiftIn pulseIn connect println localIP pinMode getIMEI display noBlink process getBand running beginSD drawBMP lowByte setBand release bitRead prepare pointTo readRed setMode noFill remove listen stroke detach attach noTone exists buffer height bitSet circle config cursor random IRread setDNS endSMS getKey micros millis begin print write ready flush width isPIN blink clear press mkdir rmdir close point yield image BSSID click delay read text move peek beep rect line open seek fill size turn stop home find step tone sqrt RSSI SSID end bit tan cos sin pow map abs max min get run put",literal:"DIGITAL_MESSAGE FIRMATA_STRING ANALOG_MESSAGE REPORT_DIGITAL REPORT_ANALOG INPUT_PULLUP SET_PIN_MODE INTERNAL2V56 SYSTEM_RESET LED_BUILTIN INTERNAL1V1 SYSEX_START INTERNAL EXTERNAL DEFAULT OUTPUT INPUT HIGH LOW"},c:[t.preprocessor,e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM]}});
\ No newline at end of file
+hljs.registerLanguage("arduino",function(){"use strict";return function(e){var t=e.requireLanguage("cpp").rawDefinition(),r=t.keywords;return r.keyword+=" boolean byte word String",r.literal+=" DIGITAL_MESSAGE FIRMATA_STRING ANALOG_MESSAGE REPORT_DIGITAL REPORT_ANALOG INPUT_PULLUP SET_PIN_MODE INTERNAL2V56 SYSTEM_RESET LED_BUILTIN INTERNAL1V1 SYSEX_START INTERNAL EXTERNAL DEFAULT OUTPUT INPUT HIGH LOW",r.built_in+=" setup loop KeyboardController MouseController SoftwareSerial EthernetServer EthernetClient LiquidCrystal RobotControl GSMVoiceCall EthernetUDP EsploraTFT HttpClient RobotMotor WiFiClient GSMScanner FileSystem Scheduler GSMServer YunClient YunServer IPAddress GSMClient GSMModem Keyboard Ethernet Console GSMBand Esplora Stepper Process WiFiUDP GSM_SMS Mailbox USBHost Firmata PImage Client Server GSMPIN FileIO Bridge Serial EEPROM Stream Mouse Audio Servo File Task GPRS WiFi Wire TFT GSM SPI SD runShellCommandAsynchronously analogWriteResolution retrieveCallingNumber printFirmwareVersion analogReadResolution sendDigitalPortPair noListenOnLocalhost readJoystickButton setFirmwareVersion readJoystickSwitch scrollDisplayRight getVoiceCallStatus scrollDisplayLeft writeMicroseconds delayMicroseconds beginTransmission getSignalStrength runAsynchronously getAsynchronously listenOnLocalhost getCurrentCarrier readAccelerometer messageAvailable sendDigitalPorts lineFollowConfig countryNameWrite runShellCommand readStringUntil rewindDirectory readTemperature setClockDivider readLightSensor endTransmission analogReference detachInterrupt countryNameRead attachInterrupt encryptionType readBytesUntil robotNameWrite readMicrophone robotNameRead cityNameWrite userNameWrite readJoystickY readJoystickX mouseReleased openNextFile scanNetworks noInterrupts digitalWrite beginSpeaker mousePressed isActionDone mouseDragged displayLogos noAutoscroll addParameter remoteNumber getModifiers keyboardRead userNameRead waitContinue processInput parseCommand printVersion readNetworks writeMessage blinkVersion cityNameRead readMessage setDataMode parsePacket isListening setBitOrder beginPacket isDirectory motorsWrite drawCompass digitalRead clearScreen serialEvent rightToLeft setTextSize leftToRight requestFrom keyReleased compassRead analogWrite interrupts WiFiServer disconnect playMelody parseFloat autoscroll getPINUsed setPINUsed setTimeout sendAnalog readSlider analogRead beginWrite createChar motorsStop keyPressed tempoWrite readButton subnetMask debugPrint macAddress writeGreen randomSeed attachGPRS readString sendString remotePort releaseAll mouseMoved background getXChange getYChange answerCall getResult voiceCall endPacket constrain getSocket writeJSON getButton available connected findUntil readBytes exitValue readGreen writeBlue startLoop IPAddress isPressed sendSysex pauseMode gatewayIP setCursor getOemKey tuneWrite noDisplay loadImage switchPIN onRequest onReceive changePIN playFile noBuffer parseInt overflow checkPIN knobRead beginTFT bitClear updateIR bitWrite position writeRGB highByte writeRed setSpeed readBlue noStroke remoteIP transfer shutdown hangCall beginSMS endWrite attached maintain noCursor checkReg checkPUK shiftOut isValid shiftIn pulseIn connect println localIP pinMode getIMEI display noBlink process getBand running beginSD drawBMP lowByte setBand release bitRead prepare pointTo readRed setMode noFill remove listen stroke detach attach noTone exists buffer height bitSet circle config cursor random IRread setDNS endSMS getKey micros millis begin print write ready flush width isPIN blink clear press mkdir rmdir close point yield image BSSID click delay read text move peek beep rect line open seek fill size turn stop home find step tone sqrt RSSI SSID end bit tan cos sin pow map abs max min get run put",t.name="Arduino",t}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/armasm.min.js b/vendor/assets/javascripts/highlightjs/languages/armasm.min.js
index f019f56c40..f4a9c77416 100644
--- a/vendor/assets/javascripts/highlightjs/languages/armasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/armasm.min.js
@@ -1 +1 @@
-hljs.registerLanguage("armasm",function(s){return{cI:!0,aliases:["arm"],l:"\\.?"+s.IR,k:{meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .arm .thumb .code16 .code32 .force_thumb .thumb_func .ltorg ALIAS ALIGN ARM AREA ASSERT ATTR CN CODE CODE16 CODE32 COMMON CP DATA DCB DCD DCDU DCDO DCFD DCFDU DCI DCQ DCQU DCW DCWU DN ELIF ELSE END ENDFUNC ENDIF ENDP ENTRY EQU EXPORT EXPORTAS EXTERN FIELD FILL FUNCTION GBLA GBLL GBLS GET GLOBAL IF IMPORT INCBIN INCLUDE INFO KEEP LCLA LCLL LCLS LTORG MACRO MAP MEND MEXIT NOFP OPT PRESERVE8 PROC QN READONLY RELOC REQUIRE REQUIRE8 RLIST FN ROUT SETA SETL SETS SN SPACE SUBT THUMB THUMBX TTL WHILE WEND ",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 pc lr sp ip sl sb fp a1 a2 a3 a4 v1 v2 v3 v4 v5 v6 v7 v8 f0 f1 f2 f3 f4 f5 f6 f7 p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 q0 q1 q2 q3 q4 q5 q6 q7 q8 q9 q10 q11 q12 q13 q14 q15 cpsr_c cpsr_x cpsr_s cpsr_f cpsr_cx cpsr_cxs cpsr_xs cpsr_xsf cpsr_sf cpsr_cxsf spsr_c spsr_x spsr_s spsr_f spsr_cx spsr_cxs spsr_xs spsr_xsf spsr_sf spsr_cxsf s0 s1 s2 s3 s4 s5 s6 s7 s8 s9 s10 s11 s12 s13 s14 s15 s16 s17 s18 s19 s20 s21 s22 s23 s24 s25 s26 s27 s28 s29 s30 s31 d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 d10 d11 d12 d13 d14 d15 d16 d17 d18 d19 d20 d21 d22 d23 d24 d25 d26 d27 d28 d29 d30 d31 {PC} {VAR} {TRUE} {FALSE} {OPT} {CONFIG} {ENDIAN} {CODESIZE} {CPU} {FPU} {ARCHITECTURE} {PCSTOREOFFSET} {ARMASM_VERSION} {INTER} {ROPI} {RWPI} {SWST} {NOSWST} . @"},c:[{cN:"keyword",b:"\\b(adc|(qd?|sh?|u[qh]?)?add(8|16)?|usada?8|(q|sh?|u[qh]?)?(as|sa)x|and|adrl?|sbc|rs[bc]|asr|b[lx]?|blx|bxj|cbn?z|tb[bh]|bic|bfc|bfi|[su]bfx|bkpt|cdp2?|clz|clrex|cmp|cmn|cpsi[ed]|cps|setend|dbg|dmb|dsb|eor|isb|it[te]{0,3}|lsl|lsr|ror|rrx|ldm(([id][ab])|f[ds])?|ldr((s|ex)?[bhd])?|movt?|mvn|mra|mar|mul|[us]mull|smul[bwt][bt]|smu[as]d|smmul|smmla|mla|umlaal|smlal?([wbt][bt]|d)|mls|smlsl?[ds]|smc|svc|sev|mia([bt]{2}|ph)?|mrr?c2?|mcrr2?|mrs|msr|orr|orn|pkh(tb|bt)|rbit|rev(16|sh)?|sel|[su]sat(16)?|nop|pop|push|rfe([id][ab])?|stm([id][ab])?|str(ex)?[bhd]?|(qd?)?sub|(sh?|q|u[qh]?)?sub(8|16)|[su]xt(a?h|a?b(16)?)|srs([id][ab])?|swpb?|swi|smi|tst|teq|wfe|wfi|yield)(eq|ne|cs|cc|mi|pl|vs|vc|hi|ls|ge|lt|gt|le|al|hs|lo)?[sptrx]?",e:"\\s"},s.C("[;@]","$",{r:0}),s.CBCM,s.QSM,{cN:"string",b:"'",e:"[^\\\\]'",r:0},{cN:"title",b:"\\|",e:"\\|",i:"\\n",r:0},{cN:"number",v:[{b:"[#$=]?0x[0-9a-f]+"},{b:"[#$=]?0b[01]+"},{b:"[#$=]\\d+"},{b:"\\b\\d+"}],r:0},{cN:"symbol",v:[{b:"^[a-z_\\.\\$][a-z0-9_\\.\\$]+"},{b:"^\\s*[a-z_\\.\\$][a-z0-9_\\.\\$]+:"},{b:"[=#]\\w+"}],r:0}]}});
\ No newline at end of file
+hljs.registerLanguage("armasm",function(){"use strict";return function(s){const e={variants:[s.COMMENT("^[ \\t]*(?=#)","$",{relevance:0,excludeBegin:!0}),s.COMMENT("[;@]","$",{relevance:0}),s.C_LINE_COMMENT_MODE,s.C_BLOCK_COMMENT_MODE]};return{name:"ARM Assembly",case_insensitive:!0,aliases:["arm"],keywords:{$pattern:"\\.?"+s.IDENT_RE,meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .arm .thumb .code16 .code32 .force_thumb .thumb_func .ltorg ALIAS ALIGN ARM AREA ASSERT ATTR CN CODE CODE16 CODE32 COMMON CP DATA DCB DCD DCDU DCDO DCFD DCFDU DCI DCQ DCQU DCW DCWU DN ELIF ELSE END ENDFUNC ENDIF ENDP ENTRY EQU EXPORT EXPORTAS EXTERN FIELD FILL FUNCTION GBLA GBLL GBLS GET GLOBAL IF IMPORT INCBIN INCLUDE INFO KEEP LCLA LCLL LCLS LTORG MACRO MAP MEND MEXIT NOFP OPT PRESERVE8 PROC QN READONLY RELOC REQUIRE REQUIRE8 RLIST FN ROUT SETA SETL SETS SN SPACE SUBT THUMB THUMBX TTL WHILE WEND ",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 pc lr sp ip sl sb fp a1 a2 a3 a4 v1 v2 v3 v4 v5 v6 v7 v8 f0 f1 f2 f3 f4 f5 f6 f7 p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 q0 q1 q2 q3 q4 q5 q6 q7 q8 q9 q10 q11 q12 q13 q14 q15 cpsr_c cpsr_x cpsr_s cpsr_f cpsr_cx cpsr_cxs cpsr_xs cpsr_xsf cpsr_sf cpsr_cxsf spsr_c spsr_x spsr_s spsr_f spsr_cx spsr_cxs spsr_xs spsr_xsf spsr_sf spsr_cxsf s0 s1 s2 s3 s4 s5 s6 s7 s8 s9 s10 s11 s12 s13 s14 s15 s16 s17 s18 s19 s20 s21 s22 s23 s24 s25 s26 s27 s28 s29 s30 s31 d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 d10 d11 d12 d13 d14 d15 d16 d17 d18 d19 d20 d21 d22 d23 d24 d25 d26 d27 d28 d29 d30 d31 {PC} {VAR} {TRUE} {FALSE} {OPT} {CONFIG} {ENDIAN} {CODESIZE} {CPU} {FPU} {ARCHITECTURE} {PCSTOREOFFSET} {ARMASM_VERSION} {INTER} {ROPI} {RWPI} {SWST} {NOSWST} . @"},contains:[{className:"keyword",begin:"\\b(adc|(qd?|sh?|u[qh]?)?add(8|16)?|usada?8|(q|sh?|u[qh]?)?(as|sa)x|and|adrl?|sbc|rs[bc]|asr|b[lx]?|blx|bxj|cbn?z|tb[bh]|bic|bfc|bfi|[su]bfx|bkpt|cdp2?|clz|clrex|cmp|cmn|cpsi[ed]|cps|setend|dbg|dmb|dsb|eor|isb|it[te]{0,3}|lsl|lsr|ror|rrx|ldm(([id][ab])|f[ds])?|ldr((s|ex)?[bhd])?|movt?|mvn|mra|mar|mul|[us]mull|smul[bwt][bt]|smu[as]d|smmul|smmla|mla|umlaal|smlal?([wbt][bt]|d)|mls|smlsl?[ds]|smc|svc|sev|mia([bt]{2}|ph)?|mrr?c2?|mcrr2?|mrs|msr|orr|orn|pkh(tb|bt)|rbit|rev(16|sh)?|sel|[su]sat(16)?|nop|pop|push|rfe([id][ab])?|stm([id][ab])?|str(ex)?[bhd]?|(qd?)?sub|(sh?|q|u[qh]?)?sub(8|16)|[su]xt(a?h|a?b(16)?)|srs([id][ab])?|swpb?|swi|smi|tst|teq|wfe|wfi|yield)(eq|ne|cs|cc|mi|pl|vs|vc|hi|ls|ge|lt|gt|le|al|hs|lo)?[sptrx]?(?=\\s)"},e,s.QUOTE_STRING_MODE,{className:"string",begin:"'",end:"[^\\\\]'",relevance:0},{className:"title",begin:"\\|",end:"\\|",illegal:"\\n",relevance:0},{className:"number",variants:[{begin:"[#$=]?0x[0-9a-f]+"},{begin:"[#$=]?0b[01]+"},{begin:"[#$=]\\d+"},{begin:"\\b\\d+"}],relevance:0},{className:"symbol",variants:[{begin:"^[ \\t]*[a-z_\\.\\$][a-z0-9_\\.\\$]+:"},{begin:"^[a-z_\\.\\$][a-z0-9_\\.\\$]+"},{begin:"[=#]\\w+"}],relevance:0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/asciidoc.min.js b/vendor/assets/javascripts/highlightjs/languages/asciidoc.min.js
index 88081dc84f..8f409e3aba 100644
--- a/vendor/assets/javascripts/highlightjs/languages/asciidoc.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/asciidoc.min.js
@@ -1 +1 @@
-hljs.registerLanguage("asciidoc",function(e){return{aliases:["adoc"],c:[e.C("^/{4,}\\n","\\n/{4,}$",{r:10}),e.C("^//","$",{r:0}),{cN:"title",b:"^\\.\\w.*$"},{b:"^[=\\*]{4,}\\n",e:"\\n^[=\\*]{4,}$",r:10},{cN:"section",r:10,v:[{b:"^(={1,5}) .+?( \\1)?$"},{b:"^[^\\[\\]\\n]+?\\n[=\\-~\\^\\+]{2,}$"}]},{cN:"meta",b:"^:.+?:",e:"\\s",eE:!0,r:10},{cN:"meta",b:"^\\[.+?\\]$",r:0},{cN:"quote",b:"^_{4,}\\n",e:"\\n_{4,}$",r:10},{cN:"code",b:"^[\\-\\.]{4,}\\n",e:"\\n[\\-\\.]{4,}$",r:10},{b:"^\\+{4,}\\n",e:"\\n\\+{4,}$",c:[{b:"<",e:">",sL:"xml",r:0}],r:10},{cN:"bullet",b:"^(\\*+|\\-+|\\.+|[^\\n]+?::)\\s+"},{cN:"symbol",b:"^(NOTE|TIP|IMPORTANT|WARNING|CAUTION):\\s+",r:10},{cN:"strong",b:"\\B\\*(?![\\*\\s])",e:"(\\n{2}|\\*)",c:[{b:"\\\\*\\w",r:0}]},{cN:"emphasis",b:"\\B'(?!['\\s])",e:"(\\n{2}|')",c:[{b:"\\\\'\\w",r:0}],r:0},{cN:"emphasis",b:"_(?![_\\s])",e:"(\\n{2}|_)",r:0},{cN:"string",v:[{b:"``.+?''"},{b:"`.+?'"}]},{cN:"code",b:"(`.+?`|\\+.+?\\+)",r:0},{cN:"code",b:"^[ \\t]",e:"$",r:0},{b:"^'{3,}[ \\t]*$",r:10},{b:"(link:)?(http|https|ftp|file|irc|image:?):\\S+\\[.*?\\]",rB:!0,c:[{b:"(link|image:?):",r:0},{cN:"link",b:"\\w",e:"[^\\[]+",r:0},{cN:"string",b:"\\[",e:"\\]",eB:!0,eE:!0,r:0}],r:10}]}});
\ No newline at end of file
+hljs.registerLanguage("asciidoc",function(){"use strict";return function(e){return{name:"AsciiDoc",aliases:["adoc"],contains:[e.COMMENT("^/{4,}\\n","\\n/{4,}$",{relevance:10}),e.COMMENT("^//","$",{relevance:0}),{className:"title",begin:"^\\.\\w.*$"},{begin:"^[=\\*]{4,}\\n",end:"\\n^[=\\*]{4,}$",relevance:10},{className:"section",relevance:10,variants:[{begin:"^(={1,5}) .+?( \\1)?$"},{begin:"^[^\\[\\]\\n]+?\\n[=\\-~\\^\\+]{2,}$"}]},{className:"meta",begin:"^:.+?:",end:"\\s",excludeEnd:!0,relevance:10},{className:"meta",begin:"^\\[.+?\\]$",relevance:0},{className:"quote",begin:"^_{4,}\\n",end:"\\n_{4,}$",relevance:10},{className:"code",begin:"^[\\-\\.]{4,}\\n",end:"\\n[\\-\\.]{4,}$",relevance:10},{begin:"^\\+{4,}\\n",end:"\\n\\+{4,}$",contains:[{begin:"<",end:">",subLanguage:"xml",relevance:0}],relevance:10},{className:"bullet",begin:"^(\\*+|\\-+|\\.+|[^\\n]+?::)\\s+"},{className:"symbol",begin:"^(NOTE|TIP|IMPORTANT|WARNING|CAUTION):\\s+",relevance:10},{className:"strong",begin:"\\B\\*(?![\\*\\s])",end:"(\\n{2}|\\*)",contains:[{begin:"\\\\*\\w",relevance:0}]},{className:"emphasis",begin:"\\B'(?!['\\s])",end:"(\\n{2}|')",contains:[{begin:"\\\\'\\w",relevance:0}],relevance:0},{className:"emphasis",begin:"_(?![_\\s])",end:"(\\n{2}|_)",relevance:0},{className:"string",variants:[{begin:"``.+?''"},{begin:"`.+?'"}]},{className:"code",begin:"(`.+?`|\\+.+?\\+)",relevance:0},{className:"code",begin:"^[ \\t]",end:"$",relevance:0},{begin:"^'{3,}[ \\t]*$",relevance:10},{begin:"(link:)?(http|https|ftp|file|irc|image:?):\\S+\\[.*?\\]",returnBegin:!0,contains:[{begin:"(link|image:?):",relevance:0},{className:"link",begin:"\\w",end:"[^\\[]+",relevance:0},{className:"string",begin:"\\[",end:"\\]",excludeBegin:!0,excludeEnd:!0,relevance:0}],relevance:10}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/aspectj.min.js b/vendor/assets/javascripts/highlightjs/languages/aspectj.min.js
index 23e86c5cb8..ce0c916346 100644
--- a/vendor/assets/javascripts/highlightjs/languages/aspectj.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/aspectj.min.js
@@ -1 +1 @@
-hljs.registerLanguage("aspectj",function(e){var t="false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else extends implements break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws privileged aspectOf adviceexecution proceed cflowbelow cflow initialization preinitialization staticinitialization withincode target within execution getWithinTypeName handler thisJoinPoint thisJoinPointStaticPart thisEnclosingJoinPointStaticPart declare parents warning error soft precedence thisAspectInstance",i="get set args call";return{k:t,i:/<\/|#/,c:[e.C("/\\*\\*","\\*/",{r:0,c:[{b:/\w+@/,r:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,e.ASM,e.QSM,{cN:"class",bK:"aspect",e:/[{;=]/,eE:!0,i:/[:;"\[\]]/,c:[{bK:"extends implements pertypewithin perthis pertarget percflowbelow percflow issingleton"},e.UTM,{b:/\([^\)]*/,e:/[)]+/,k:t+" "+i,eE:!1}]},{cN:"class",bK:"class interface",e:/[{;=]/,eE:!0,r:0,k:"class interface",i:/[:"\[\]]/,c:[{bK:"extends implements"},e.UTM]},{bK:"pointcut after before around throwing returning",e:/[)]/,eE:!1,i:/["\[\]]/,c:[{b:e.UIR+"\\s*\\(",rB:!0,c:[e.UTM]}]},{b:/[:]/,rB:!0,e:/[{;]/,r:0,eE:!1,k:t,i:/["\[\]]/,c:[{b:e.UIR+"\\s*\\(",k:t+" "+i,r:0},e.QSM]},{bK:"new throw",r:0},{cN:"function",b:/\w+ +\w+(\.)?\w+\s*\([^\)]*\)\s*((throws)[\w\s,]+)?[\{;]/,rB:!0,e:/[{;=]/,k:t,eE:!0,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"params",b:/\(/,e:/\)/,r:0,k:t,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]},e.CNM,{cN:"meta",b:"@[A-Za-z]+"}]}});
\ No newline at end of file
+hljs.registerLanguage("aspectj",function(){"use strict";return function(e){var n="false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else extends implements break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws privileged aspectOf adviceexecution proceed cflowbelow cflow initialization preinitialization staticinitialization withincode target within execution getWithinTypeName handler thisJoinPoint thisJoinPointStaticPart thisEnclosingJoinPointStaticPart declare parents warning error soft precedence thisAspectInstance";return{name:"AspectJ",keywords:n,illegal:/<\/|#/,contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0},{className:"doctag",begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"class",beginKeywords:"aspect",end:/[{;=]/,excludeEnd:!0,illegal:/[:;"\[\]]/,contains:[{beginKeywords:"extends implements pertypewithin perthis pertarget percflowbelow percflow issingleton"},e.UNDERSCORE_TITLE_MODE,{begin:/\([^\)]*/,end:/[)]+/,keywords:n+" get set args call",excludeEnd:!1}]},{className:"class",beginKeywords:"class interface",end:/[{;=]/,excludeEnd:!0,relevance:0,keywords:"class interface",illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"pointcut after before around throwing returning",end:/[)]/,excludeEnd:!1,illegal:/["\[\]]/,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,contains:[e.UNDERSCORE_TITLE_MODE]}]},{begin:/[:]/,returnBegin:!0,end:/[{;]/,relevance:0,excludeEnd:!1,keywords:n,illegal:/["\[\]]/,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",keywords:n+" get set args call",relevance:0},e.QUOTE_STRING_MODE]},{beginKeywords:"new throw",relevance:0},{className:"function",begin:/\w+ +\w+(\.)?\w+\s*\([^\)]*\)\s*((throws)[\w\s,]+)?[\{;]/,returnBegin:!0,end:/[{;=]/,keywords:n,excludeEnd:!0,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/,relevance:0,keywords:n,contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},e.C_NUMBER_MODE,{className:"meta",begin:"@[A-Za-z]+"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/autohotkey.min.js b/vendor/assets/javascripts/highlightjs/languages/autohotkey.min.js
index 58d677329a..57309ec504 100644
--- a/vendor/assets/javascripts/highlightjs/languages/autohotkey.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/autohotkey.min.js
@@ -1 +1 @@
-hljs.registerLanguage("autohotkey",function(e){var r={b:"`[\\s\\S]"};return{cI:!0,aliases:["ahk"],k:{keyword:"Break Continue Critical Exit ExitApp Gosub Goto New OnExit Pause return SetBatchLines SetTimer Suspend Thread Throw Until ahk_id ahk_class ahk_pid ahk_exe ahk_group",literal:"A|0 true false NOT AND OR",built_in:"ComSpec Clipboard ClipboardAll ErrorLevel"},c:[{cN:"built_in",b:"A_[a-zA-Z0-9]+"},r,e.inherit(e.QSM,{c:[r]}),e.C(";","$",{r:0}),e.CBCM,{cN:"number",b:e.NR,r:0},{cN:"subst",b:"%(?=[a-zA-Z0-9#_$@])",e:"%",i:"[^a-zA-Z0-9#_$@]"},{cN:"built_in",b:"^\\s*\\w+\\s*,"},{cN:"meta",b:"^\\s*#w+",e:"$",r:0},{cN:"symbol",c:[r],v:[{b:'^[^\\n";]+::(?!=)'},{b:'^[^\\n";]+:(?!=)',r:0}]},{b:",\\s*,"}]}});
\ No newline at end of file
+hljs.registerLanguage("autohotkey",function(){"use strict";return function(e){var a={begin:"`[\\s\\S]"};return{name:"AutoHotkey",case_insensitive:!0,aliases:["ahk"],keywords:{keyword:"Break Continue Critical Exit ExitApp Gosub Goto New OnExit Pause return SetBatchLines SetTimer Suspend Thread Throw Until ahk_id ahk_class ahk_pid ahk_exe ahk_group",literal:"true false NOT AND OR",built_in:"ComSpec Clipboard ClipboardAll ErrorLevel"},contains:[a,e.inherit(e.QUOTE_STRING_MODE,{contains:[a]}),e.COMMENT(";","$",{relevance:0}),e.C_BLOCK_COMMENT_MODE,{className:"number",begin:e.NUMBER_RE,relevance:0},{className:"variable",begin:"%[a-zA-Z0-9#_$@]+%"},{className:"built_in",begin:"^\\s*\\w+\\s*(,|%)"},{className:"title",variants:[{begin:'^[^\\n";]+::(?!=)'},{begin:'^[^\\n";]+:(?!=)',relevance:0}]},{className:"meta",begin:"^\\s*#\\w+",end:"$",relevance:0},{className:"built_in",begin:"A_[a-zA-Z0-9]+"},{begin:",\\s*,"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/autoit.min.js b/vendor/assets/javascripts/highlightjs/languages/autoit.min.js
index 805f8f76fb..0a764db5d3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/autoit.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/autoit.min.js
@@ -1 +1 @@
-hljs.registerLanguage("autoit",function(e){var t="ByRef Case Const ContinueCase ContinueLoop Default Dim Do Else ElseIf EndFunc EndIf EndSelect EndSwitch EndWith Enum Exit ExitLoop For Func Global If In Local Next ReDim Return Select Static Step Switch Then To Until Volatile WEnd While With",r="True False And Null Not Or",i="Abs ACos AdlibRegister AdlibUnRegister Asc AscW ASin Assign ATan AutoItSetOption AutoItWinGetTitle AutoItWinSetTitle Beep Binary BinaryLen BinaryMid BinaryToString BitAND BitNOT BitOR BitRotate BitShift BitXOR BlockInput Break Call CDTray Ceiling Chr ChrW ClipGet ClipPut ConsoleRead ConsoleWrite ConsoleWriteError ControlClick ControlCommand ControlDisable ControlEnable ControlFocus ControlGetFocus ControlGetHandle ControlGetPos ControlGetText ControlHide ControlListView ControlMove ControlSend ControlSetText ControlShow ControlTreeView Cos Dec DirCopy DirCreate DirGetSize DirMove DirRemove DllCall DllCallAddress DllCallbackFree DllCallbackGetPtr DllCallbackRegister DllClose DllOpen DllStructCreate DllStructGetData DllStructGetPtr DllStructGetSize DllStructSetData DriveGetDrive DriveGetFileSystem DriveGetLabel DriveGetSerial DriveGetType DriveMapAdd DriveMapDel DriveMapGet DriveSetLabel DriveSpaceFree DriveSpaceTotal DriveStatus EnvGet EnvSet EnvUpdate Eval Execute Exp FileChangeDir FileClose FileCopy FileCreateNTFSLink FileCreateShortcut FileDelete FileExists FileFindFirstFile FileFindNextFile FileFlush FileGetAttrib FileGetEncoding FileGetLongName FileGetPos FileGetShortcut FileGetShortName FileGetSize FileGetTime FileGetVersion FileInstall FileMove FileOpen FileOpenDialog FileRead FileReadLine FileReadToArray FileRecycle FileRecycleEmpty FileSaveDialog FileSelectFolder FileSetAttrib FileSetEnd FileSetPos FileSetTime FileWrite FileWriteLine Floor FtpSetProxy FuncName GUICreate GUICtrlCreateAvi GUICtrlCreateButton GUICtrlCreateCheckbox GUICtrlCreateCombo GUICtrlCreateContextMenu GUICtrlCreateDate GUICtrlCreateDummy GUICtrlCreateEdit GUICtrlCreateGraphic GUICtrlCreateGroup GUICtrlCreateIcon GUICtrlCreateInput GUICtrlCreateLabel GUICtrlCreateList GUICtrlCreateListView GUICtrlCreateListViewItem GUICtrlCreateMenu GUICtrlCreateMenuItem GUICtrlCreateMonthCal GUICtrlCreateObj GUICtrlCreatePic GUICtrlCreateProgress GUICtrlCreateRadio GUICtrlCreateSlider GUICtrlCreateTab GUICtrlCreateTabItem GUICtrlCreateTreeView GUICtrlCreateTreeViewItem GUICtrlCreateUpdown GUICtrlDelete GUICtrlGetHandle GUICtrlGetState GUICtrlRead GUICtrlRecvMsg GUICtrlRegisterListViewSort GUICtrlSendMsg GUICtrlSendToDummy GUICtrlSetBkColor GUICtrlSetColor GUICtrlSetCursor GUICtrlSetData GUICtrlSetDefBkColor GUICtrlSetDefColor GUICtrlSetFont GUICtrlSetGraphic GUICtrlSetImage GUICtrlSetLimit GUICtrlSetOnEvent GUICtrlSetPos GUICtrlSetResizing GUICtrlSetState GUICtrlSetStyle GUICtrlSetTip GUIDelete GUIGetCursorInfo GUIGetMsg GUIGetStyle GUIRegisterMsg GUISetAccelerators GUISetBkColor GUISetCoord GUISetCursor GUISetFont GUISetHelp GUISetIcon GUISetOnEvent GUISetState GUISetStyle GUIStartGroup GUISwitch Hex HotKeySet HttpSetProxy HttpSetUserAgent HWnd InetClose InetGet InetGetInfo InetGetSize InetRead IniDelete IniRead IniReadSection IniReadSectionNames IniRenameSection IniWrite IniWriteSection InputBox Int IsAdmin IsArray IsBinary IsBool IsDeclared IsDllStruct IsFloat IsFunc IsHWnd IsInt IsKeyword IsNumber IsObj IsPtr IsString Log MemGetStats Mod MouseClick MouseClickDrag MouseDown MouseGetCursor MouseGetPos MouseMove MouseUp MouseWheel MsgBox Number ObjCreate ObjCreateInterface ObjEvent ObjGet ObjName OnAutoItExitRegister OnAutoItExitUnRegister Ping PixelChecksum PixelGetColor PixelSearch ProcessClose ProcessExists ProcessGetStats ProcessList ProcessSetPriority ProcessWait ProcessWaitClose ProgressOff ProgressOn ProgressSet Ptr Random RegDelete RegEnumKey RegEnumVal RegRead RegWrite Round Run RunAs RunAsWait RunWait Send SendKeepActive SetError SetExtended ShellExecute ShellExecuteWait Shutdown Sin Sleep SoundPlay SoundSetWaveVolume SplashImageOn SplashOff SplashTextOn Sqrt SRandom StatusbarGetText StderrRead StdinWrite StdioClose StdoutRead String StringAddCR StringCompare StringFormat StringFromASCIIArray StringInStr StringIsAlNum StringIsAlpha StringIsASCII StringIsDigit StringIsFloat StringIsInt StringIsLower StringIsSpace StringIsUpper StringIsXDigit StringLeft StringLen StringLower StringMid StringRegExp StringRegExpReplace StringReplace StringReverse StringRight StringSplit StringStripCR StringStripWS StringToASCIIArray StringToBinary StringTrimLeft StringTrimRight StringUpper Tan TCPAccept TCPCloseSocket TCPConnect TCPListen TCPNameToIP TCPRecv TCPSend TCPShutdown, UDPShutdown TCPStartup, UDPStartup TimerDiff TimerInit ToolTip TrayCreateItem TrayCreateMenu TrayGetMsg TrayItemDelete TrayItemGetHandle TrayItemGetState TrayItemGetText TrayItemSetOnEvent TrayItemSetState TrayItemSetText TraySetClick TraySetIcon TraySetOnEvent TraySetPauseIcon TraySetState TraySetToolTip TrayTip UBound UDPBind UDPCloseSocket UDPOpen UDPRecv UDPSend VarGetType WinActivate WinActive WinClose WinExists WinFlash WinGetCaretPos WinGetClassList WinGetClientSize WinGetHandle WinGetPos WinGetProcess WinGetState WinGetText WinGetTitle WinKill WinList WinMenuSelectItem WinMinimizeAll WinMinimizeAllUndo WinMove WinSetOnTop WinSetState WinSetTitle WinSetTrans WinWait",l={v:[e.C(";","$",{r:0}),e.C("#cs","#ce"),e.C("#comments-start","#comments-end")]},n={b:"\\$[A-z0-9_]+"},o={cN:"string",v:[{b:/"/,e:/"/,c:[{b:/""/,r:0}]},{b:/'/,e:/'/,c:[{b:/''/,r:0}]}]},a={v:[e.BNM,e.CNM]},S={cN:"meta",b:"#",e:"$",k:{"meta-keyword":"comments include include-once NoTrayIcon OnAutoItStartRegister pragma compile RequireAdmin"},c:[{b:/\\\n/,r:0},{bK:"include",k:{"meta-keyword":"include"},e:"$",c:[o,{cN:"meta-string",v:[{b:"<",e:">"},{b:/"/,e:/"/,c:[{b:/""/,r:0}]},{b:/'/,e:/'/,c:[{b:/''/,r:0}]}]}]},o,l]},C={cN:"symbol",b:"@[A-z0-9_]+"},s={cN:"function",bK:"Func",e:"$",i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:[n,o,a]}]};return{cI:!0,i:/\/\*/,k:{keyword:t,built_in:i,literal:r},c:[l,n,o,a,S,C,s]}});
\ No newline at end of file
+hljs.registerLanguage("autoit",function(){"use strict";return function(e){var t={variants:[e.COMMENT(";","$",{relevance:0}),e.COMMENT("#cs","#ce"),e.COMMENT("#comments-start","#comments-end")]},r={begin:"\\$[A-z0-9_]+"},i={className:"string",variants:[{begin:/"/,end:/"/,contains:[{begin:/""/,relevance:0}]},{begin:/'/,end:/'/,contains:[{begin:/''/,relevance:0}]}]},n={variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]};return{name:"AutoIt",case_insensitive:!0,illegal:/\/\*/,keywords:{keyword:"ByRef Case Const ContinueCase ContinueLoop Default Dim Do Else ElseIf EndFunc EndIf EndSelect EndSwitch EndWith Enum Exit ExitLoop For Func Global If In Local Next ReDim Return Select Static Step Switch Then To Until Volatile WEnd While With",built_in:"Abs ACos AdlibRegister AdlibUnRegister Asc AscW ASin Assign ATan AutoItSetOption AutoItWinGetTitle AutoItWinSetTitle Beep Binary BinaryLen BinaryMid BinaryToString BitAND BitNOT BitOR BitRotate BitShift BitXOR BlockInput Break Call CDTray Ceiling Chr ChrW ClipGet ClipPut ConsoleRead ConsoleWrite ConsoleWriteError ControlClick ControlCommand ControlDisable ControlEnable ControlFocus ControlGetFocus ControlGetHandle ControlGetPos ControlGetText ControlHide ControlListView ControlMove ControlSend ControlSetText ControlShow ControlTreeView Cos Dec DirCopy DirCreate DirGetSize DirMove DirRemove DllCall DllCallAddress DllCallbackFree DllCallbackGetPtr DllCallbackRegister DllClose DllOpen DllStructCreate DllStructGetData DllStructGetPtr DllStructGetSize DllStructSetData DriveGetDrive DriveGetFileSystem DriveGetLabel DriveGetSerial DriveGetType DriveMapAdd DriveMapDel DriveMapGet DriveSetLabel DriveSpaceFree DriveSpaceTotal DriveStatus EnvGet EnvSet EnvUpdate Eval Execute Exp FileChangeDir FileClose FileCopy FileCreateNTFSLink FileCreateShortcut FileDelete FileExists FileFindFirstFile FileFindNextFile FileFlush FileGetAttrib FileGetEncoding FileGetLongName FileGetPos FileGetShortcut FileGetShortName FileGetSize FileGetTime FileGetVersion FileInstall FileMove FileOpen FileOpenDialog FileRead FileReadLine FileReadToArray FileRecycle FileRecycleEmpty FileSaveDialog FileSelectFolder FileSetAttrib FileSetEnd FileSetPos FileSetTime FileWrite FileWriteLine Floor FtpSetProxy FuncName GUICreate GUICtrlCreateAvi GUICtrlCreateButton GUICtrlCreateCheckbox GUICtrlCreateCombo GUICtrlCreateContextMenu GUICtrlCreateDate GUICtrlCreateDummy GUICtrlCreateEdit GUICtrlCreateGraphic GUICtrlCreateGroup GUICtrlCreateIcon GUICtrlCreateInput GUICtrlCreateLabel GUICtrlCreateList GUICtrlCreateListView GUICtrlCreateListViewItem GUICtrlCreateMenu GUICtrlCreateMenuItem GUICtrlCreateMonthCal GUICtrlCreateObj GUICtrlCreatePic GUICtrlCreateProgress GUICtrlCreateRadio GUICtrlCreateSlider GUICtrlCreateTab GUICtrlCreateTabItem GUICtrlCreateTreeView GUICtrlCreateTreeViewItem GUICtrlCreateUpdown GUICtrlDelete GUICtrlGetHandle GUICtrlGetState GUICtrlRead GUICtrlRecvMsg GUICtrlRegisterListViewSort GUICtrlSendMsg GUICtrlSendToDummy GUICtrlSetBkColor GUICtrlSetColor GUICtrlSetCursor GUICtrlSetData GUICtrlSetDefBkColor GUICtrlSetDefColor GUICtrlSetFont GUICtrlSetGraphic GUICtrlSetImage GUICtrlSetLimit GUICtrlSetOnEvent GUICtrlSetPos GUICtrlSetResizing GUICtrlSetState GUICtrlSetStyle GUICtrlSetTip GUIDelete GUIGetCursorInfo GUIGetMsg GUIGetStyle GUIRegisterMsg GUISetAccelerators GUISetBkColor GUISetCoord GUISetCursor GUISetFont GUISetHelp GUISetIcon GUISetOnEvent GUISetState GUISetStyle GUIStartGroup GUISwitch Hex HotKeySet HttpSetProxy HttpSetUserAgent HWnd InetClose InetGet InetGetInfo InetGetSize InetRead IniDelete IniRead IniReadSection IniReadSectionNames IniRenameSection IniWrite IniWriteSection InputBox Int IsAdmin IsArray IsBinary IsBool IsDeclared IsDllStruct IsFloat IsFunc IsHWnd IsInt IsKeyword IsNumber IsObj IsPtr IsString Log MemGetStats Mod MouseClick MouseClickDrag MouseDown MouseGetCursor MouseGetPos MouseMove MouseUp MouseWheel MsgBox Number ObjCreate ObjCreateInterface ObjEvent ObjGet ObjName OnAutoItExitRegister OnAutoItExitUnRegister Ping PixelChecksum PixelGetColor PixelSearch ProcessClose ProcessExists ProcessGetStats ProcessList ProcessSetPriority ProcessWait ProcessWaitClose ProgressOff ProgressOn ProgressSet Ptr Random RegDelete RegEnumKey RegEnumVal RegRead RegWrite Round Run RunAs RunAsWait RunWait Send SendKeepActive SetError SetExtended ShellExecute ShellExecuteWait Shutdown Sin Sleep SoundPlay SoundSetWaveVolume SplashImageOn SplashOff SplashTextOn Sqrt SRandom StatusbarGetText StderrRead StdinWrite StdioClose StdoutRead String StringAddCR StringCompare StringFormat StringFromASCIIArray StringInStr StringIsAlNum StringIsAlpha StringIsASCII StringIsDigit StringIsFloat StringIsInt StringIsLower StringIsSpace StringIsUpper StringIsXDigit StringLeft StringLen StringLower StringMid StringRegExp StringRegExpReplace StringReplace StringReverse StringRight StringSplit StringStripCR StringStripWS StringToASCIIArray StringToBinary StringTrimLeft StringTrimRight StringUpper Tan TCPAccept TCPCloseSocket TCPConnect TCPListen TCPNameToIP TCPRecv TCPSend TCPShutdown, UDPShutdown TCPStartup, UDPStartup TimerDiff TimerInit ToolTip TrayCreateItem TrayCreateMenu TrayGetMsg TrayItemDelete TrayItemGetHandle TrayItemGetState TrayItemGetText TrayItemSetOnEvent TrayItemSetState TrayItemSetText TraySetClick TraySetIcon TraySetOnEvent TraySetPauseIcon TraySetState TraySetToolTip TrayTip UBound UDPBind UDPCloseSocket UDPOpen UDPRecv UDPSend VarGetType WinActivate WinActive WinClose WinExists WinFlash WinGetCaretPos WinGetClassList WinGetClientSize WinGetHandle WinGetPos WinGetProcess WinGetState WinGetText WinGetTitle WinKill WinList WinMenuSelectItem WinMinimizeAll WinMinimizeAllUndo WinMove WinSetOnTop WinSetState WinSetTitle WinSetTrans WinWait",literal:"True False And Null Not Or"},contains:[t,r,i,n,{className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"comments include include-once NoTrayIcon OnAutoItStartRegister pragma compile RequireAdmin"},contains:[{begin:/\\\n/,relevance:0},{beginKeywords:"include",keywords:{"meta-keyword":"include"},end:"$",contains:[i,{className:"meta-string",variants:[{begin:"<",end:">"},{begin:/"/,end:/"/,contains:[{begin:/""/,relevance:0}]},{begin:/'/,end:/'/,contains:[{begin:/''/,relevance:0}]}]}]},i,t]},{className:"symbol",begin:"@[A-z0-9_]+"},{className:"function",beginKeywords:"Func",end:"$",illegal:"\\$|\\[|%",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",begin:"\\(",end:"\\)",contains:[r,i,n]}]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/avrasm.min.js b/vendor/assets/javascripts/highlightjs/languages/avrasm.min.js
index d741bd0e29..c76e16efc9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/avrasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/avrasm.min.js
@@ -1 +1 @@
-hljs.registerLanguage("avrasm",function(r){return{cI:!0,l:"\\.?"+r.IR,k:{keyword:"adc add adiw and andi asr bclr bld brbc brbs brcc brcs break breq brge brhc brhs brid brie brlo brlt brmi brne brpl brsh brtc brts brvc brvs bset bst call cbi cbr clc clh cli cln clr cls clt clv clz com cp cpc cpi cpse dec eicall eijmp elpm eor fmul fmuls fmulsu icall ijmp in inc jmp ld ldd ldi lds lpm lsl lsr mov movw mul muls mulsu neg nop or ori out pop push rcall ret reti rjmp rol ror sbc sbr sbrc sbrs sec seh sbi sbci sbic sbis sbiw sei sen ser ses set sev sez sleep spm st std sts sub subi swap tst wdr",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 r16 r17 r18 r19 r20 r21 r22 r23 r24 r25 r26 r27 r28 r29 r30 r31 x|0 xh xl y|0 yh yl z|0 zh zl ucsr1c udr1 ucsr1a ucsr1b ubrr1l ubrr1h ucsr0c ubrr0h tccr3c tccr3a tccr3b tcnt3h tcnt3l ocr3ah ocr3al ocr3bh ocr3bl ocr3ch ocr3cl icr3h icr3l etimsk etifr tccr1c ocr1ch ocr1cl twcr twdr twar twsr twbr osccal xmcra xmcrb eicra spmcsr spmcr portg ddrg ping portf ddrf sreg sph spl xdiv rampz eicrb eimsk gimsk gicr eifr gifr timsk tifr mcucr mcucsr tccr0 tcnt0 ocr0 assr tccr1a tccr1b tcnt1h tcnt1l ocr1ah ocr1al ocr1bh ocr1bl icr1h icr1l tccr2 tcnt2 ocr2 ocdr wdtcr sfior eearh eearl eedr eecr porta ddra pina portb ddrb pinb portc ddrc pinc portd ddrd pind spdr spsr spcr udr0 ucsr0a ucsr0b ubrr0l acsr admux adcsr adch adcl porte ddre pine pinf",meta:".byte .cseg .db .def .device .dseg .dw .endmacro .equ .eseg .exit .include .list .listmac .macro .nolist .org .set"},c:[r.CBCM,r.C(";","$",{r:0}),r.CNM,r.BNM,{cN:"number",b:"\\b(\\$[a-zA-Z0-9]+|0o[0-7]+)"},r.QSM,{cN:"string",b:"'",e:"[^\\\\]'",i:"[^\\\\][^']"},{cN:"symbol",b:"^[A-Za-z0-9_.$]+:"},{cN:"meta",b:"#",e:"$"},{cN:"subst",b:"@[0-9]+"}]}});
\ No newline at end of file
+hljs.registerLanguage("avrasm",function(){"use strict";return function(r){return{name:"AVR Assembly",case_insensitive:!0,keywords:{$pattern:"\\.?"+r.IDENT_RE,keyword:"adc add adiw and andi asr bclr bld brbc brbs brcc brcs break breq brge brhc brhs brid brie brlo brlt brmi brne brpl brsh brtc brts brvc brvs bset bst call cbi cbr clc clh cli cln clr cls clt clv clz com cp cpc cpi cpse dec eicall eijmp elpm eor fmul fmuls fmulsu icall ijmp in inc jmp ld ldd ldi lds lpm lsl lsr mov movw mul muls mulsu neg nop or ori out pop push rcall ret reti rjmp rol ror sbc sbr sbrc sbrs sec seh sbi sbci sbic sbis sbiw sei sen ser ses set sev sez sleep spm st std sts sub subi swap tst wdr",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 r16 r17 r18 r19 r20 r21 r22 r23 r24 r25 r26 r27 r28 r29 r30 r31 x|0 xh xl y|0 yh yl z|0 zh zl ucsr1c udr1 ucsr1a ucsr1b ubrr1l ubrr1h ucsr0c ubrr0h tccr3c tccr3a tccr3b tcnt3h tcnt3l ocr3ah ocr3al ocr3bh ocr3bl ocr3ch ocr3cl icr3h icr3l etimsk etifr tccr1c ocr1ch ocr1cl twcr twdr twar twsr twbr osccal xmcra xmcrb eicra spmcsr spmcr portg ddrg ping portf ddrf sreg sph spl xdiv rampz eicrb eimsk gimsk gicr eifr gifr timsk tifr mcucr mcucsr tccr0 tcnt0 ocr0 assr tccr1a tccr1b tcnt1h tcnt1l ocr1ah ocr1al ocr1bh ocr1bl icr1h icr1l tccr2 tcnt2 ocr2 ocdr wdtcr sfior eearh eearl eedr eecr porta ddra pina portb ddrb pinb portc ddrc pinc portd ddrd pind spdr spsr spcr udr0 ucsr0a ucsr0b ubrr0l acsr admux adcsr adch adcl porte ddre pine pinf",meta:".byte .cseg .db .def .device .dseg .dw .endmacro .equ .eseg .exit .include .list .listmac .macro .nolist .org .set"},contains:[r.C_BLOCK_COMMENT_MODE,r.COMMENT(";","$",{relevance:0}),r.C_NUMBER_MODE,r.BINARY_NUMBER_MODE,{className:"number",begin:"\\b(\\$[a-zA-Z0-9]+|0o[0-7]+)"},r.QUOTE_STRING_MODE,{className:"string",begin:"'",end:"[^\\\\]'",illegal:"[^\\\\][^']"},{className:"symbol",begin:"^[A-Za-z0-9_.$]+:"},{className:"meta",begin:"#",end:"$"},{className:"subst",begin:"@[0-9]+"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/awk.min.js b/vendor/assets/javascripts/highlightjs/languages/awk.min.js
index a4fb557339..bbba29d899 100644
--- a/vendor/assets/javascripts/highlightjs/languages/awk.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/awk.min.js
@@ -1 +1 @@
-hljs.registerLanguage("awk",function(e){var r={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},b="BEGIN END if else while do for in break continue delete next nextfile function func exit|10",n={cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,r:10},{b:/(u|b)?r?"""/,e:/"""/,r:10},{b:/(u|r|ur)'/,e:/'/,r:10},{b:/(u|r|ur)"/,e:/"/,r:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},e.ASM,e.QSM]};return{k:{keyword:b},c:[r,n,e.RM,e.HCM,e.NM]}});
\ No newline at end of file
+hljs.registerLanguage("awk",function(){"use strict";return function(e){return{name:"Awk",keywords:{keyword:"BEGIN END if else while do for in break continue delete next nextfile function func exit|10"},contains:[{className:"variable",variants:[{begin:/\$[\w\d#@][\w\d_]*/},{begin:/\$\{(.*?)}/}]},{className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:/(u|b)?r?'''/,end:/'''/,relevance:10},{begin:/(u|b)?r?"""/,end:/"""/,relevance:10},{begin:/(u|r|ur)'/,end:/'/,relevance:10},{begin:/(u|r|ur)"/,end:/"/,relevance:10},{begin:/(b|br)'/,end:/'/},{begin:/(b|br)"/,end:/"/},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},e.REGEXP_MODE,e.HASH_COMMENT_MODE,e.NUMBER_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/axapta.min.js b/vendor/assets/javascripts/highlightjs/languages/axapta.min.js
index 016d5a2897..0d3cb32ea5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/axapta.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/axapta.min.js
@@ -1 +1 @@
-hljs.registerLanguage("axapta",function(e){return{k:"false int abstract private char boolean static null if for true while long throw finally protected final return void enum else break new catch byte super case short default double public try this switch continue reverse firstfast firstonly forupdate nofetch sum avg minof maxof count order group by asc desc index hint like dispaly edit client server ttsbegin ttscommit str real date container anytype common div mod",c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM,{cN:"meta",b:"#",e:"$"},{cN:"class",bK:"class interface",e:"{",eE:!0,i:":",c:[{bK:"extends implements"},e.UTM]}]}});
\ No newline at end of file
+hljs.registerLanguage("axapta",function(){"use strict";return function(e){return{name:"Dynamics 365",keywords:"false int abstract private char boolean static null if for true while long throw finally protected final return void enum else break new catch byte super case short default double public try this switch continue reverse firstfast firstonly forupdate nofetch sum avg minof maxof count order group by asc desc index hint like dispaly edit client server ttsbegin ttscommit str real date container anytype common div mod",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,{className:"meta",begin:"#",end:"$"},{className:"class",beginKeywords:"class interface",end:"{",excludeEnd:!0,illegal:":",contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/bash.min.js b/vendor/assets/javascripts/highlightjs/languages/bash.min.js
index da88c0dc66..c5f460cf3b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/bash.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/bash.min.js
@@ -1 +1 @@
-hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/\b-?[a-z\._]+\b/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}});
\ No newline at end of file
+hljs.registerLanguage("bash",function(){"use strict";return function(e){const s={};Object.assign(s,{className:"variable",variants:[{begin:/\$[\w\d#@][\w\d_]*/},{begin:/\$\{/,end:/\}/,contains:[{begin:/:-/,contains:[s]}]}]});const t={className:"subst",begin:/\$\(/,end:/\)/,contains:[e.BACKSLASH_ESCAPE]},n={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,t]};t.contains.push(n);const a={begin:/\$\(\(/,end:/\)\)/,contains:[{begin:/\d+#[0-9a-f]+/,className:"number"},e.NUMBER_MODE,s]},i=e.SHEBANG({binary:"(fish|bash|zsh|sh|csh|ksh|tcsh|dash|scsh)",relevance:10}),c={className:"function",begin:/\w[\w\d_]*\s*\(\s*\)\s*\{/,returnBegin:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/\w[\w\d_]*/})],relevance:0};return{name:"Bash",aliases:["sh","zsh"],keywords:{$pattern:/\b-?[a-z\._]+\b/,keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},contains:[i,e.SHEBANG(),c,a,e.HASH_COMMENT_MODE,n,{className:"",begin:/\\"/},{className:"string",begin:/'/,end:/'/},s]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/basic.min.js b/vendor/assets/javascripts/highlightjs/languages/basic.min.js
index 7aca8079b1..7a3d0df1ab 100644
--- a/vendor/assets/javascripts/highlightjs/languages/basic.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/basic.min.js
@@ -1 +1 @@
-hljs.registerLanguage("basic",function(E){return{cI:!0,i:"^.",l:"[a-zA-Z][a-zA-Z0-9_$%!#]*",k:{keyword:"ABS ASC AND ATN AUTO|0 BEEP BLOAD|10 BSAVE|10 CALL CALLS CDBL CHAIN CHDIR CHR$|10 CINT CIRCLE CLEAR CLOSE CLS COLOR COM COMMON CONT COS CSNG CSRLIN CVD CVI CVS DATA DATE$ DEFDBL DEFINT DEFSNG DEFSTR DEF|0 SEG USR DELETE DIM DRAW EDIT END ENVIRON ENVIRON$ EOF EQV ERASE ERDEV ERDEV$ ERL ERR ERROR EXP FIELD FILES FIX FOR|0 FRE GET GOSUB|10 GOTO HEX$ IF|0 THEN ELSE|0 INKEY$ INP INPUT INPUT# INPUT$ INSTR IMP INT IOCTL IOCTL$ KEY ON OFF LIST KILL LEFT$ LEN LET LINE LLIST LOAD LOC LOCATE LOF LOG LPRINT USING LSET MERGE MID$ MKDIR MKD$ MKI$ MKS$ MOD NAME NEW NEXT NOISE NOT OCT$ ON OR PEN PLAY STRIG OPEN OPTION BASE OUT PAINT PALETTE PCOPY PEEK PMAP POINT POKE POS PRINT PRINT] PSET PRESET PUT RANDOMIZE READ REM RENUM RESET|0 RESTORE RESUME RETURN|0 RIGHT$ RMDIR RND RSET RUN SAVE SCREEN SGN SHELL SIN SOUND SPACE$ SPC SQR STEP STICK STOP STR$ STRING$ SWAP SYSTEM TAB TAN TIME$ TIMER TROFF TRON TO USR VAL VARPTR VARPTR$ VIEW WAIT WHILE WEND WIDTH WINDOW WRITE XOR"},c:[E.QSM,E.C("REM","$",{r:10}),E.C("'","$",{r:0}),{cN:"symbol",b:"^[0-9]+ ",r:10},{cN:"number",b:"\\b([0-9]+[0-9edED.]*[#!]?)",r:0},{cN:"number",b:"(&[hH][0-9a-fA-F]{1,4})"},{cN:"number",b:"(&[oO][0-7]{1,6})"}]}});
\ No newline at end of file
+hljs.registerLanguage("basic",function(){"use strict";return function(E){return{name:"BASIC",case_insensitive:!0,illegal:"^.",keywords:{$pattern:"[a-zA-Z][a-zA-Z0-9_$%!#]*",keyword:"ABS ASC AND ATN AUTO|0 BEEP BLOAD|10 BSAVE|10 CALL CALLS CDBL CHAIN CHDIR CHR$|10 CINT CIRCLE CLEAR CLOSE CLS COLOR COM COMMON CONT COS CSNG CSRLIN CVD CVI CVS DATA DATE$ DEFDBL DEFINT DEFSNG DEFSTR DEF|0 SEG USR DELETE DIM DRAW EDIT END ENVIRON ENVIRON$ EOF EQV ERASE ERDEV ERDEV$ ERL ERR ERROR EXP FIELD FILES FIX FOR|0 FRE GET GOSUB|10 GOTO HEX$ IF THEN ELSE|0 INKEY$ INP INPUT INPUT# INPUT$ INSTR IMP INT IOCTL IOCTL$ KEY ON OFF LIST KILL LEFT$ LEN LET LINE LLIST LOAD LOC LOCATE LOF LOG LPRINT USING LSET MERGE MID$ MKDIR MKD$ MKI$ MKS$ MOD NAME NEW NEXT NOISE NOT OCT$ ON OR PEN PLAY STRIG OPEN OPTION BASE OUT PAINT PALETTE PCOPY PEEK PMAP POINT POKE POS PRINT PRINT] PSET PRESET PUT RANDOMIZE READ REM RENUM RESET|0 RESTORE RESUME RETURN|0 RIGHT$ RMDIR RND RSET RUN SAVE SCREEN SGN SHELL SIN SOUND SPACE$ SPC SQR STEP STICK STOP STR$ STRING$ SWAP SYSTEM TAB TAN TIME$ TIMER TROFF TRON TO USR VAL VARPTR VARPTR$ VIEW WAIT WHILE WEND WIDTH WINDOW WRITE XOR"},contains:[E.QUOTE_STRING_MODE,E.COMMENT("REM","$",{relevance:10}),E.COMMENT("'","$",{relevance:0}),{className:"symbol",begin:"^[0-9]+ ",relevance:10},{className:"number",begin:"\\b([0-9]+[0-9edED.]*[#!]?)",relevance:0},{className:"number",begin:"(&[hH][0-9a-fA-F]{1,4})"},{className:"number",begin:"(&[oO][0-7]{1,6})"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/bnf.min.js b/vendor/assets/javascripts/highlightjs/languages/bnf.min.js
index 93e05653e9..4bd045fa1f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/bnf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/bnf.min.js
@@ -1 +1 @@
-hljs.registerLanguage("bnf",function(e){return{c:[{cN:"attribute",b:/</,e:/>/},{b:/::=/,starts:{e:/$/,c:[{b:/</,e:/>/},e.CLCM,e.CBCM,e.ASM,e.QSM]}}]}});
\ No newline at end of file
+hljs.registerLanguage("bnf",function(){"use strict";return function(n){return{name:"Backus–Naur Form",contains:[{className:"attribute",begin:/</,end:/>/},{begin:/::=/,end:/$/,contains:[{begin:/</,end:/>/},n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE,n.APOS_STRING_MODE,n.QUOTE_STRING_MODE]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/brainfuck.min.js b/vendor/assets/javascripts/highlightjs/languages/brainfuck.min.js
index b1a4c509fc..4f9ddaf023 100644
--- a/vendor/assets/javascripts/highlightjs/languages/brainfuck.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/brainfuck.min.js
@@ -1 +1 @@
-hljs.registerLanguage("brainfuck",function(r){var n={cN:"literal",b:"[\\+\\-]",r:0};return{aliases:["bf"],c:[r.C("[^\\[\\]\\.,\\+\\-<> \r\n]","[\\[\\]\\.,\\+\\-<> \r\n]",{rE:!0,r:0}),{cN:"title",b:"[\\[\\]]",r:0},{cN:"string",b:"[\\.,]",r:0},{b:/\+\+|\-\-/,rB:!0,c:[n]},n]}});
\ No newline at end of file
+hljs.registerLanguage("brainfuck",function(){"use strict";return function(e){var n={className:"literal",begin:"[\\+\\-]",relevance:0};return{name:"Brainfuck",aliases:["bf"],contains:[e.COMMENT("[^\\[\\]\\.,\\+\\-<> \r\n]","[\\[\\]\\.,\\+\\-<> \r\n]",{returnEnd:!0,relevance:0}),{className:"title",begin:"[\\[\\]]",relevance:0},{className:"string",begin:"[\\.,]",relevance:0},{begin:/(?:\+\+|\-\-)/,contains:[n]},n]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/c-like.min.js b/vendor/assets/javascripts/highlightjs/languages/c-like.min.js
new file mode 100644
index 0000000000..976c759529
--- /dev/null
+++ b/vendor/assets/javascripts/highlightjs/languages/c-like.min.js
@@ -0,0 +1 @@
+hljs.registerLanguage("c-like",function(){"use strict";return function(e){function t(e){return"(?:"+e+")?"}var n="(decltype\\(auto\\)|"+t("[a-zA-Z_]\\w*::")+"[a-zA-Z_]\\w*"+t("<.*?>")+")",r={className:"keyword",begin:"\\b[a-z\\d_]*_t\\b"},a={className:"string",variants:[{begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",end:"'",illegal:"."},e.END_SAME_AS_BEGIN({begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},i={className:"number",variants:[{begin:"\\b(0b[01']+)"},{begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},s={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{"meta-keyword":"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"},contains:[{begin:/\\\n/,relevance:0},e.inherit(a,{className:"meta-string"}),{className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},o={className:"title",begin:t("[a-zA-Z_]\\w*::")+e.IDENT_RE,relevance:0},c=t("[a-zA-Z_]\\w*::")+e.IDENT_RE+"\\s*\\(",l={keyword:"int float while private char char8_t char16_t char32_t catch import module export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using asm case typeid wchar_t short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignas alignof constexpr consteval constinit decltype concept co_await co_return co_yield requires noexcept static_assert thread_local restrict final override atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return and and_eq bitand bitor compl not not_eq or or_eq xor xor_eq",built_in:"std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set pair bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap priority_queue make_pair array shared_ptr abort terminate abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr _Bool complex _Complex imaginary _Imaginary",literal:"true false nullptr NULL"},d=[r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,i,a],_={variants:[{begin:/=/,end:/;/},{begin:/\(/,end:/\)/},{beginKeywords:"new throw return else",end:/;/}],keywords:l,contains:d.concat([{begin:/\(/,end:/\)/,keywords:l,contains:d.concat(["self"]),relevance:0}]),relevance:0},u={className:"function",begin:"("+n+"[\\*&\\s]+)+"+c,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:l,illegal:/[^\w\s\*&:<>]/,contains:[{begin:"decltype\\(auto\\)",keywords:l,relevance:0},{begin:c,returnBegin:!0,contains:[o],relevance:0},{className:"params",begin:/\(/,end:/\)/,keywords:l,relevance:0,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,i,r,{begin:/\(/,end:/\)/,keywords:l,relevance:0,contains:["self",e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,i,r]}]},r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s]};return{aliases:["c","cc","h","c++","h++","hpp","hh","hxx","cxx"],keywords:l,disableAutodetect:!0,illegal:"</",contains:[].concat(_,u,d,[s,{begin:"\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",end:">",keywords:l,contains:["self",r]},{begin:e.IDENT_RE+"::",keywords:l},{className:"class",beginKeywords:"class struct",end:/[{;:]/,contains:[{begin:/</,end:/>/,contains:["self"]},e.TITLE_MODE]}]),exports:{preprocessor:s,strings:a,keywords:l}}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/c.min.js b/vendor/assets/javascripts/highlightjs/languages/c.min.js
new file mode 100644
index 0000000000..1700f3b435
--- /dev/null
+++ b/vendor/assets/javascripts/highlightjs/languages/c.min.js
@@ -0,0 +1 @@
+hljs.registerLanguage("c",function(){"use strict";return function(e){var n=e.getLanguage("c-like").rawDefinition();return n.name="C",n.aliases=["c","h"],n}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/cal.min.js b/vendor/assets/javascripts/highlightjs/languages/cal.min.js
index c67fd244ce..f11b799811 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cal.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cal.min.js
@@ -1 +1 @@
-hljs.registerLanguage("cal",function(e){var r="div mod in and or not xor asserterror begin case do downto else end exit for if of repeat then to until while with var",t="false true",c=[e.CLCM,e.C(/\{/,/\}/,{r:0}),e.C(/\(\*/,/\*\)/,{r:10})],n={cN:"string",b:/'/,e:/'/,c:[{b:/''/}]},o={cN:"string",b:/(#\d+)+/},a={cN:"number",b:"\\b\\d+(\\.\\d+)?(DT|D|T)",r:0},i={cN:"string",b:'"',e:'"'},d={cN:"function",bK:"procedure",e:/[:;]/,k:"procedure|10",c:[e.TM,{cN:"params",b:/\(/,e:/\)/,k:r,c:[n,o]}].concat(c)},s={cN:"class",b:"OBJECT (Table|Form|Report|Dataport|Codeunit|XMLport|MenuSuite|Page|Query) (\\d+) ([^\\r\\n]+)",rB:!0,c:[e.TM,d]};return{cI:!0,k:{keyword:r,literal:t},i:/\/\*/,c:[n,o,a,i,e.NM,s,d]}});
\ No newline at end of file
+hljs.registerLanguage("cal",function(){"use strict";return function(e){var n="div mod in and or not xor asserterror begin case do downto else end exit for if of repeat then to until while with var",a=[e.C_LINE_COMMENT_MODE,e.COMMENT(/\{/,/\}/,{relevance:0}),e.COMMENT(/\(\*/,/\*\)/,{relevance:10})],r={className:"string",begin:/'/,end:/'/,contains:[{begin:/''/}]},s={className:"string",begin:/(#\d+)+/},i={className:"function",beginKeywords:"procedure",end:/[:;]/,keywords:"procedure|10",contains:[e.TITLE_MODE,{className:"params",begin:/\(/,end:/\)/,keywords:n,contains:[r,s]}].concat(a)},t={className:"class",begin:"OBJECT (Table|Form|Report|Dataport|Codeunit|XMLport|MenuSuite|Page|Query) (\\d+) ([^\\r\\n]+)",returnBegin:!0,contains:[e.TITLE_MODE,i]};return{name:"C/AL",case_insensitive:!0,keywords:{keyword:n,literal:"false true"},illegal:/\/\*/,contains:[r,s,{className:"number",begin:"\\b\\d+(\\.\\d+)?(DT|D|T)",relevance:0},{className:"string",begin:'"',end:'"'},e.NUMBER_MODE,t,i]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/capnproto.min.js b/vendor/assets/javascripts/highlightjs/languages/capnproto.min.js
index 3728f16f0f..8e6a795cbf 100644
--- a/vendor/assets/javascripts/highlightjs/languages/capnproto.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/capnproto.min.js
@@ -1 +1 @@
-hljs.registerLanguage("capnproto",function(t){return{aliases:["capnp"],k:{keyword:"struct enum interface union group import using const annotation extends in of on as with from fixed",built_in:"Void Bool Int8 Int16 Int32 Int64 UInt8 UInt16 UInt32 UInt64 Float32 Float64 Text Data AnyPointer AnyStruct Capability List",literal:"true false"},c:[t.QSM,t.NM,t.HCM,{cN:"meta",b:/@0x[\w\d]{16};/,i:/\n/},{cN:"symbol",b:/@\d+\b/},{cN:"class",bK:"struct enum",e:/\{/,i:/\n/,c:[t.inherit(t.TM,{starts:{eW:!0,eE:!0}})]},{cN:"class",bK:"interface",e:/\{/,i:/\n/,c:[t.inherit(t.TM,{starts:{eW:!0,eE:!0}})]}]}});
\ No newline at end of file
+hljs.registerLanguage("capnproto",function(){"use strict";return function(n){return{name:"Cap’n Proto",aliases:["capnp"],keywords:{keyword:"struct enum interface union group import using const annotation extends in of on as with from fixed",built_in:"Void Bool Int8 Int16 Int32 Int64 UInt8 UInt16 UInt32 UInt64 Float32 Float64 Text Data AnyPointer AnyStruct Capability List",literal:"true false"},contains:[n.QUOTE_STRING_MODE,n.NUMBER_MODE,n.HASH_COMMENT_MODE,{className:"meta",begin:/@0x[\w\d]{16};/,illegal:/\n/},{className:"symbol",begin:/@\d+\b/},{className:"class",beginKeywords:"struct enum",end:/\{/,illegal:/\n/,contains:[n.inherit(n.TITLE_MODE,{starts:{endsWithParent:!0,excludeEnd:!0}})]},{className:"class",beginKeywords:"interface",end:/\{/,illegal:/\n/,contains:[n.inherit(n.TITLE_MODE,{starts:{endsWithParent:!0,excludeEnd:!0}})]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ceylon.min.js b/vendor/assets/javascripts/highlightjs/languages/ceylon.min.js
index 951e03677b..054140701b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ceylon.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ceylon.min.js
@@ -1 +1 @@
-hljs.registerLanguage("ceylon",function(e){var a="assembly module package import alias class interface object given value assign void function new of extends satisfies abstracts in out return break continue throw assert dynamic if else switch case for while try catch finally then let this outer super is exists nonempty",t="shared abstract formal default actual variable late native deprecatedfinal sealed annotation suppressWarnings small",s="doc by license see throws tagged",n={cN:"subst",eB:!0,eE:!0,b:/``/,e:/``/,k:a,r:10},r=[{cN:"string",b:'"""',e:'"""',r:10},{cN:"string",b:'"',e:'"',c:[n]},{cN:"string",b:"'",e:"'"},{cN:"number",b:"#[0-9a-fA-F_]+|\\$[01_]+|[0-9_]+(?:\\.[0-9_](?:[eE][+-]?\\d+)?)?[kMGTPmunpf]?",r:0}];return n.c=r,{k:{keyword:a+" "+t,meta:s},i:"\\$[^01]|#[^0-9a-fA-F]",c:[e.CLCM,e.C("/\\*","\\*/",{c:["self"]}),{cN:"meta",b:'@[a-z]\\w*(?:\\:"[^"]*")?'}].concat(r)}});
\ No newline at end of file
+hljs.registerLanguage("ceylon",function(){"use strict";return function(e){var a="assembly module package import alias class interface object given value assign void function new of extends satisfies abstracts in out return break continue throw assert dynamic if else switch case for while try catch finally then let this outer super is exists nonempty",n={className:"subst",excludeBegin:!0,excludeEnd:!0,begin:/``/,end:/``/,keywords:a,relevance:10},s=[{className:"string",begin:'"""',end:'"""',relevance:10},{className:"string",begin:'"',end:'"',contains:[n]},{className:"string",begin:"'",end:"'"},{className:"number",begin:"#[0-9a-fA-F_]+|\\$[01_]+|[0-9_]+(?:\\.[0-9_](?:[eE][+-]?\\d+)?)?[kMGTPmunpf]?",relevance:0}];return n.contains=s,{name:"Ceylon",keywords:{keyword:a+" shared abstract formal default actual variable late native deprecated final sealed annotation suppressWarnings small",meta:"doc by license see throws tagged"},illegal:"\\$[^01]|#[^0-9a-fA-F]",contains:[e.C_LINE_COMMENT_MODE,e.COMMENT("/\\*","\\*/",{contains:["self"]}),{className:"meta",begin:'@[a-z]\\w*(?:\\:"[^"]*")?'}].concat(s)}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/clean.min.js b/vendor/assets/javascripts/highlightjs/languages/clean.min.js
index b54a29f954..4fa620e6cd 100644
--- a/vendor/assets/javascripts/highlightjs/languages/clean.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/clean.min.js
@@ -1 +1 @@
-hljs.registerLanguage("clean",function(e){return{aliases:["clean","icl","dcl"],k:{keyword:"if let in with where case of class instance otherwise implementation definition system module from import qualified as special code inline foreign export ccall stdcall generic derive infix infixl infixr",built_in:"Int Real Char Bool",literal:"True False"},c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM,{b:"->|<-[|:]?|#!?|>>=|\\{\\||\\|\\}|:==|=:|<>"}]}});
\ No newline at end of file
+hljs.registerLanguage("clean",function(){"use strict";return function(e){return{name:"Clean",aliases:["clean","icl","dcl"],keywords:{keyword:"if let in with where case of class instance otherwise implementation definition system module from import qualified as special code inline foreign export ccall stdcall generic derive infix infixl infixr",built_in:"Int Real Char Bool",literal:"True False"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,{begin:"->|<-[|:]?|#!?|>>=|\\{\\||\\|\\}|:==|=:|<>"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/clojure-repl.min.js b/vendor/assets/javascripts/highlightjs/languages/clojure-repl.min.js
index 6fa30020cb..25dff78bc6 100644
--- a/vendor/assets/javascripts/highlightjs/languages/clojure-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/clojure-repl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("clojure-repl",function(e){return{c:[{cN:"meta",b:/^([\w.-]+|\s*#_)?=>/,starts:{e:/$/,sL:"clojure"}}]}});
\ No newline at end of file
+hljs.registerLanguage("clojure-repl",function(){"use strict";return function(e){return{name:"Clojure REPL",contains:[{className:"meta",begin:/^([\w.-]+|\s*#_)?=>/,starts:{end:/$/,subLanguage:"clojure"}}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/clojure.min.js b/vendor/assets/javascripts/highlightjs/languages/clojure.min.js
index 94f93598fc..1aec1783da 100644
--- a/vendor/assets/javascripts/highlightjs/languages/clojure.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/clojure.min.js
@@ -1 +1 @@
-hljs.registerLanguage("clojure",function(e){var t={"builtin-name":"def defonce cond apply if-not if-let if not not= = < > <= >= == + / * - rem quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? string? map? nil? contains? zero? instance? not-every? not-any? libspec? -> ->> .. . inc compare do dotimes mapcat take remove take-while drop letfn drop-last take-last drop-while while intern condp case reduced cycle split-at split-with repeat replicate iterate range merge zipmap declare line-seq sort comparator sort-by dorun doall nthnext nthrest partition eval doseq await await-for let agent atom send send-off release-pending-sends add-watch mapv filterv remove-watch agent-error restart-agent set-error-handler error-handler set-error-mode! error-mode shutdown-agents quote var fn loop recur throw try monitor-enter monitor-exit defmacro defn defn- macroexpand macroexpand-1 for dosync and or when when-not when-let comp juxt partial sequence memoize constantly complement identity assert peek pop doto proxy defstruct first rest cons defprotocol cast coll deftype defrecord last butlast sigs reify second ffirst fnext nfirst nnext defmulti defmethod meta with-meta ns in-ns create-ns import refer keys select-keys vals key val rseq name namespace promise into transient persistent! conj! assoc! dissoc! pop! disj! use class type num float double short byte boolean bigint biginteger bigdec print-method print-dup throw-if printf format load compile get-in update-in pr pr-on newline flush read slurp read-line subvec with-open memfn time re-find re-groups rand-int rand mod locking assert-valid-fdecl alias resolve ref deref refset swap! reset! set-validator! compare-and-set! alter-meta! reset-meta! commute get-validator alter ref-set ref-history-count ref-min-history ref-max-history ensure sync io! new next conj set! to-array future future-call into-array aset gen-class reduce map filter find empty hash-map hash-set sorted-map sorted-map-by sorted-set sorted-set-by vec vector seq flatten reverse assoc dissoc list disj get union difference intersection extend extend-type extend-protocol int nth delay count concat chunk chunk-buffer chunk-append chunk-first chunk-rest max min dec unchecked-inc-int unchecked-inc unchecked-dec-inc unchecked-dec unchecked-negate unchecked-add-int unchecked-add unchecked-subtract-int unchecked-subtract chunk-next chunk-cons chunked-seq? prn vary-meta lazy-seq spread list* str find-keyword keyword symbol gensym force rationalize"},r="a-zA-Z_\\-!.?+*=<>&#'",n="["+r+"]["+r+"0-9/;:]*",a="[-+]?\\d+(\\.\\d+)?",o={b:n,r:0},s={cN:"number",b:a,r:0},c=e.inherit(e.QSM,{i:null}),i=e.C(";","$",{r:0}),d={cN:"literal",b:/\b(true|false|nil)\b/},l={b:"[\\[\\{]",e:"[\\]\\}]"},m={cN:"comment",b:"\\^"+n},p=e.C("\\^\\{","\\}"),u={cN:"symbol",b:"[:]{1,2}"+n},f={b:"\\(",e:"\\)"},h={eW:!0,r:0},y={k:t,l:n,cN:"name",b:n,starts:h},b=[f,c,m,p,i,u,l,s,d,o];return f.c=[e.C("comment",""),y,h],h.c=b,l.c=b,p.c=[l],{aliases:["clj"],i:/\S/,c:[f,c,m,p,i,u,l,s,d]}});
\ No newline at end of file
+hljs.registerLanguage("clojure",function(){"use strict";return function(e){var t="[a-zA-Z_\\-!.?+*=<>&#'][a-zA-Z_\\-!.?+*=<>&#'0-9/;:]*",n="def defonce defprotocol defstruct defmulti defmethod defn- defn defmacro deftype defrecord",r={$pattern:t,"builtin-name":n+" cond apply if-not if-let if not not= = < > <= >= == + / * - rem quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? string? map? nil? contains? zero? instance? not-every? not-any? libspec? -> ->> .. . inc compare do dotimes mapcat take remove take-while drop letfn drop-last take-last drop-while while intern condp case reduced cycle split-at split-with repeat replicate iterate range merge zipmap declare line-seq sort comparator sort-by dorun doall nthnext nthrest partition eval doseq await await-for let agent atom send send-off release-pending-sends add-watch mapv filterv remove-watch agent-error restart-agent set-error-handler error-handler set-error-mode! error-mode shutdown-agents quote var fn loop recur throw try monitor-enter monitor-exit macroexpand macroexpand-1 for dosync and or when when-not when-let comp juxt partial sequence memoize constantly complement identity assert peek pop doto proxy first rest cons cast coll last butlast sigs reify second ffirst fnext nfirst nnext meta with-meta ns in-ns create-ns import refer keys select-keys vals key val rseq name namespace promise into transient persistent! conj! assoc! dissoc! pop! disj! use class type num float double short byte boolean bigint biginteger bigdec print-method print-dup throw-if printf format load compile get-in update-in pr pr-on newline flush read slurp read-line subvec with-open memfn time re-find re-groups rand-int rand mod locking assert-valid-fdecl alias resolve ref deref refset swap! reset! set-validator! compare-and-set! alter-meta! reset-meta! commute get-validator alter ref-set ref-history-count ref-min-history ref-max-history ensure sync io! new next conj set! to-array future future-call into-array aset gen-class reduce map filter find empty hash-map hash-set sorted-map sorted-map-by sorted-set sorted-set-by vec vector seq flatten reverse assoc dissoc list disj get union difference intersection extend extend-type extend-protocol int nth delay count concat chunk chunk-buffer chunk-append chunk-first chunk-rest max min dec unchecked-inc-int unchecked-inc unchecked-dec-inc unchecked-dec unchecked-negate unchecked-add-int unchecked-add unchecked-subtract-int unchecked-subtract chunk-next chunk-cons chunked-seq? prn vary-meta lazy-seq spread list* str find-keyword keyword symbol gensym force rationalize"},a={begin:t,relevance:0},s={className:"number",begin:"[-+]?\\d+(\\.\\d+)?",relevance:0},o=e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),i=e.COMMENT(";","$",{relevance:0}),c={className:"literal",begin:/\b(true|false|nil)\b/},d={begin:"[\\[\\{]",end:"[\\]\\}]"},l={className:"comment",begin:"\\^"+t},m=e.COMMENT("\\^\\{","\\}"),u={className:"symbol",begin:"[:]{1,2}"+t},p={begin:"\\(",end:"\\)"},f={endsWithParent:!0,relevance:0},h={keywords:r,className:"name",begin:t,starts:f},y=[p,o,l,m,i,u,d,s,c,a],g={beginKeywords:n,lexemes:t,end:'(\\[|\\#|\\d|"|:|\\{|\\)|\\(|$)',contains:[{className:"title",begin:t,relevance:0,excludeEnd:!0,endsParent:!0}].concat(y)};return p.contains=[e.COMMENT("comment",""),g,h,f],f.contains=y,d.contains=y,m.contains=[d],{name:"Clojure",aliases:["clj"],illegal:/\S/,contains:[p,o,l,m,i,u,d,s,c]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/cmake.min.js b/vendor/assets/javascripts/highlightjs/languages/cmake.min.js
index 70aa6629f0..6178a73d95 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cmake.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cmake.min.js
@@ -1 +1 @@
-hljs.registerLanguage("cmake",function(e){return{aliases:["cmake.in"],cI:!0,k:{keyword:"break cmake_host_system_information cmake_minimum_required cmake_parse_arguments cmake_policy configure_file continue elseif else endforeach endfunction endif endmacro endwhile execute_process file find_file find_library find_package find_path find_program foreach function get_cmake_property get_directory_property get_filename_component get_property if include include_guard list macro mark_as_advanced math message option return separate_arguments set_directory_properties set_property set site_name string unset variable_watch while add_compile_definitions add_compile_options add_custom_command add_custom_target add_definitions add_dependencies add_executable add_library add_link_options add_subdirectory add_test aux_source_directory build_command create_test_sourcelist define_property enable_language enable_testing export fltk_wrap_ui get_source_file_property get_target_property get_test_property include_directories include_external_msproject include_regular_expression install link_directories link_libraries load_cache project qt_wrap_cpp qt_wrap_ui remove_definitions set_source_files_properties set_target_properties set_tests_properties source_group target_compile_definitions target_compile_features target_compile_options target_include_directories target_link_directories target_link_libraries target_link_options target_sources try_compile try_run ctest_build ctest_configure ctest_coverage ctest_empty_binary_directory ctest_memcheck ctest_read_custom_files ctest_run_script ctest_sleep ctest_start ctest_submit ctest_test ctest_update ctest_upload build_name exec_program export_library_dependencies install_files install_programs install_targets load_command make_directory output_required_files remove subdir_depends subdirs use_mangled_mesa utility_source variable_requires write_file qt5_use_modules qt5_use_package qt5_wrap_cpp on off true false and or not command policy target test exists is_newer_than is_directory is_symlink is_absolute matches less greater equal less_equal greater_equal strless strgreater strequal strless_equal strgreater_equal version_less version_greater version_equal version_less_equal version_greater_equal in_list defined"},c:[{cN:"variable",b:"\\${",e:"}"},e.HCM,e.QSM,e.NM]}});
\ No newline at end of file
+hljs.registerLanguage("cmake",function(){"use strict";return function(e){return{name:"CMake",aliases:["cmake.in"],case_insensitive:!0,keywords:{keyword:"break cmake_host_system_information cmake_minimum_required cmake_parse_arguments cmake_policy configure_file continue elseif else endforeach endfunction endif endmacro endwhile execute_process file find_file find_library find_package find_path find_program foreach function get_cmake_property get_directory_property get_filename_component get_property if include include_guard list macro mark_as_advanced math message option return separate_arguments set_directory_properties set_property set site_name string unset variable_watch while add_compile_definitions add_compile_options add_custom_command add_custom_target add_definitions add_dependencies add_executable add_library add_link_options add_subdirectory add_test aux_source_directory build_command create_test_sourcelist define_property enable_language enable_testing export fltk_wrap_ui get_source_file_property get_target_property get_test_property include_directories include_external_msproject include_regular_expression install link_directories link_libraries load_cache project qt_wrap_cpp qt_wrap_ui remove_definitions set_source_files_properties set_target_properties set_tests_properties source_group target_compile_definitions target_compile_features target_compile_options target_include_directories target_link_directories target_link_libraries target_link_options target_sources try_compile try_run ctest_build ctest_configure ctest_coverage ctest_empty_binary_directory ctest_memcheck ctest_read_custom_files ctest_run_script ctest_sleep ctest_start ctest_submit ctest_test ctest_update ctest_upload build_name exec_program export_library_dependencies install_files install_programs install_targets load_command make_directory output_required_files remove subdir_depends subdirs use_mangled_mesa utility_source variable_requires write_file qt5_use_modules qt5_use_package qt5_wrap_cpp on off true false and or not command policy target test exists is_newer_than is_directory is_symlink is_absolute matches less greater equal less_equal greater_equal strless strgreater strequal strless_equal strgreater_equal version_less version_greater version_equal version_less_equal version_greater_equal in_list defined"},contains:[{className:"variable",begin:"\\${",end:"}"},e.HASH_COMMENT_MODE,e.QUOTE_STRING_MODE,e.NUMBER_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/coffeescript.min.js b/vendor/assets/javascripts/highlightjs/languages/coffeescript.min.js
index 50ce0728e6..e686acc5b9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/coffeescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/coffeescript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("coffeescript",function(e){var c={keyword:"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger super yield import export from as default await then unless until loop of by when and or is isnt not",literal:"true false null undefined yes no on off",built_in:"npm require console print module global window document"},n="[A-Za-z$_][0-9A-Za-z$_]*",r={cN:"subst",b:/#\{/,e:/}/,k:c},i=[e.BNM,e.inherit(e.CNM,{starts:{e:"(\\s*/)?",r:0}}),{cN:"string",v:[{b:/'''/,e:/'''/,c:[e.BE]},{b:/'/,e:/'/,c:[e.BE]},{b:/"""/,e:/"""/,c:[e.BE,r]},{b:/"/,e:/"/,c:[e.BE,r]}]},{cN:"regexp",v:[{b:"///",e:"///",c:[r,e.HCM]},{b:"//[gim]*",r:0},{b:/\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W|$)/}]},{b:"@"+n},{sL:"javascript",eB:!0,eE:!0,v:[{b:"```",e:"```"},{b:"`",e:"`"}]}];r.c=i;var s=e.inherit(e.TM,{b:n}),t="(\\(.*\\))?\\s*\\B[-=]>",o={cN:"params",b:"\\([^\\(]",rB:!0,c:[{b:/\(/,e:/\)/,k:c,c:["self"].concat(i)}]};return{aliases:["coffee","cson","iced"],k:c,i:/\/\*/,c:i.concat([e.C("###","###"),e.HCM,{cN:"function",b:"^\\s*"+n+"\\s*=\\s*"+t,e:"[-=]>",rB:!0,c:[s,o]},{b:/[:\(,=]\s*/,r:0,c:[{cN:"function",b:t,e:"[-=]>",rB:!0,c:[o]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[s]},s]},{b:n+":",e:":",rB:!0,rE:!0,r:0}])}});
\ No newline at end of file
+hljs.registerLanguage("coffeescript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);return function(r){var t,i={keyword:e.concat(["then","unless","until","loop","by","when","and","or","is","isnt","not"]).filter((t=["var","const","let","function","static"],e=>!t.includes(e))).join(" "),literal:n.concat(["yes","no","on","off"]).join(" "),built_in:a.concat(["npm","print"]).join(" ")},s="[A-Za-z$_][0-9A-Za-z$_]*",o={className:"subst",begin:/#\{/,end:/}/,keywords:i},c=[r.BINARY_NUMBER_MODE,r.inherit(r.C_NUMBER_MODE,{starts:{end:"(\\s*/)?",relevance:0}}),{className:"string",variants:[{begin:/'''/,end:/'''/,contains:[r.BACKSLASH_ESCAPE]},{begin:/'/,end:/'/,contains:[r.BACKSLASH_ESCAPE]},{begin:/"""/,end:/"""/,contains:[r.BACKSLASH_ESCAPE,o]},{begin:/"/,end:/"/,contains:[r.BACKSLASH_ESCAPE,o]}]},{className:"regexp",variants:[{begin:"///",end:"///",contains:[o,r.HASH_COMMENT_MODE]},{begin:"//[gim]{0,3}(?=\\W)",relevance:0},{begin:/\/(?![ *]).*?(?![\\]).\/[gim]{0,3}(?=\W)/}]},{begin:"@"+s},{subLanguage:"javascript",excludeBegin:!0,excludeEnd:!0,variants:[{begin:"```",end:"```"},{begin:"`",end:"`"}]}];o.contains=c;var l=r.inherit(r.TITLE_MODE,{begin:s}),d={className:"params",begin:"\\([^\\(]",returnBegin:!0,contains:[{begin:/\(/,end:/\)/,keywords:i,contains:["self"].concat(c)}]};return{name:"CoffeeScript",aliases:["coffee","cson","iced"],keywords:i,illegal:/\/\*/,contains:c.concat([r.COMMENT("###","###"),r.HASH_COMMENT_MODE,{className:"function",begin:"^\\s*"+s+"\\s*=\\s*(\\(.*\\))?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[l,d]},{begin:/[:\(,=]\s*/,relevance:0,contains:[{className:"function",begin:"(\\(.*\\))?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[d]}]},{className:"class",beginKeywords:"class",end:"$",illegal:/[:="\[\]]/,contains:[{beginKeywords:"extends",endsWithParent:!0,illegal:/[:="\[\]]/,contains:[l]},l]},{begin:s+":",end:":",returnBegin:!0,returnEnd:!0,relevance:0}])}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/coq.min.js b/vendor/assets/javascripts/highlightjs/languages/coq.min.js
index 35ec7c8021..964f7b41e4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/coq.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/coq.min.js
@@ -1 +1 @@
-hljs.registerLanguage("coq",function(e){return{k:{keyword:"_ as at cofix else end exists exists2 fix for forall fun if IF in let match mod Prop return Set then Type using where with Abort About Add Admit Admitted All Arguments Assumptions Axiom Back BackTo Backtrack Bind Blacklist Canonical Cd Check Class Classes Close Coercion Coercions CoFixpoint CoInductive Collection Combined Compute Conjecture Conjectures Constant constr Constraint Constructors Context Corollary CreateHintDb Cut Declare Defined Definition Delimit Dependencies DependentDerive Drop eauto End Equality Eval Example Existential Existentials Existing Export exporting Extern Extract Extraction Fact Field Fields File Fixpoint Focus for From Function Functional Generalizable Global Goal Grab Grammar Graph Guarded Heap Hint HintDb Hints Hypotheses Hypothesis ident Identity If Immediate Implicit Import Include Inductive Infix Info Initial Inline Inspect Instance Instances Intro Intros Inversion Inversion_clear Language Left Lemma Let Libraries Library Load LoadPath Local Locate Ltac ML Mode Module Modules Monomorphic Morphism Next NoInline Notation Obligation Obligations Opaque Open Optimize Options Parameter Parameters Parametric Path Paths pattern Polymorphic Preterm Print Printing Program Projections Proof Proposition Pwd Qed Quit Rec Record Recursive Redirect Relation Remark Remove Require Reserved Reset Resolve Restart Rewrite Right Ring Rings Save Scheme Scope Scopes Script Search SearchAbout SearchHead SearchPattern SearchRewrite Section Separate Set Setoid Show Solve Sorted Step Strategies Strategy Structure SubClass Table Tables Tactic Term Test Theorem Time Timeout Transparent Type Typeclasses Types Undelimit Undo Unfocus Unfocused Unfold Universe Universes Unset Unshelve using Variable Variables Variant Verbose Visibility where with",built_in:"abstract absurd admit after apply as assert assumption at auto autorewrite autounfold before bottom btauto by case case_eq cbn cbv change classical_left classical_right clear clearbody cofix compare compute congruence constr_eq constructor contradict contradiction cut cutrewrite cycle decide decompose dependent destruct destruction dintuition discriminate discrR do double dtauto eapply eassumption eauto ecase econstructor edestruct ediscriminate eelim eexact eexists einduction einjection eleft elim elimtype enough equality erewrite eright esimplify_eq esplit evar exact exactly_once exfalso exists f_equal fail field field_simplify field_simplify_eq first firstorder fix fold fourier functional generalize generalizing gfail give_up has_evar hnf idtac in induction injection instantiate intro intro_pattern intros intuition inversion inversion_clear is_evar is_var lapply lazy left lia lra move native_compute nia nsatz omega once pattern pose progress proof psatz quote record red refine reflexivity remember rename repeat replace revert revgoals rewrite rewrite_strat right ring ring_simplify rtauto set setoid_reflexivity setoid_replace setoid_rewrite setoid_symmetry setoid_transitivity shelve shelve_unifiable simpl simple simplify_eq solve specialize split split_Rabs split_Rmult stepl stepr subst sum swap symmetry tactic tauto time timeout top transitivity trivial try tryif unfold unify until using vm_compute with"},c:[e.QSM,e.C("\\(\\*","\\*\\)"),e.CNM,{cN:"type",eB:!0,b:"\\|\\s*",e:"\\w+"},{b:/[-=]>/}]}});
\ No newline at end of file
+hljs.registerLanguage("coq",function(){"use strict";return function(e){return{name:"Coq",keywords:{keyword:"_|0 as at cofix else end exists exists2 fix for forall fun if IF in let match mod Prop return Set then Type using where with Abort About Add Admit Admitted All Arguments Assumptions Axiom Back BackTo Backtrack Bind Blacklist Canonical Cd Check Class Classes Close Coercion Coercions CoFixpoint CoInductive Collection Combined Compute Conjecture Conjectures Constant constr Constraint Constructors Context Corollary CreateHintDb Cut Declare Defined Definition Delimit Dependencies Dependent Derive Drop eauto End Equality Eval Example Existential Existentials Existing Export exporting Extern Extract Extraction Fact Field Fields File Fixpoint Focus for From Function Functional Generalizable Global Goal Grab Grammar Graph Guarded Heap Hint HintDb Hints Hypotheses Hypothesis ident Identity If Immediate Implicit Import Include Inductive Infix Info Initial Inline Inspect Instance Instances Intro Intros Inversion Inversion_clear Language Left Lemma Let Libraries Library Load LoadPath Local Locate Ltac ML Mode Module Modules Monomorphic Morphism Next NoInline Notation Obligation Obligations Opaque Open Optimize Options Parameter Parameters Parametric Path Paths pattern Polymorphic Preterm Print Printing Program Projections Proof Proposition Pwd Qed Quit Rec Record Recursive Redirect Relation Remark Remove Require Reserved Reset Resolve Restart Rewrite Right Ring Rings Save Scheme Scope Scopes Script Search SearchAbout SearchHead SearchPattern SearchRewrite Section Separate Set Setoid Show Solve Sorted Step Strategies Strategy Structure SubClass Table Tables Tactic Term Test Theorem Time Timeout Transparent Type Typeclasses Types Undelimit Undo Unfocus Unfocused Unfold Universe Universes Unset Unshelve using Variable Variables Variant Verbose Visibility where with",built_in:"abstract absurd admit after apply as assert assumption at auto autorewrite autounfold before bottom btauto by case case_eq cbn cbv change classical_left classical_right clear clearbody cofix compare compute congruence constr_eq constructor contradict contradiction cut cutrewrite cycle decide decompose dependent destruct destruction dintuition discriminate discrR do double dtauto eapply eassumption eauto ecase econstructor edestruct ediscriminate eelim eexact eexists einduction einjection eleft elim elimtype enough equality erewrite eright esimplify_eq esplit evar exact exactly_once exfalso exists f_equal fail field field_simplify field_simplify_eq first firstorder fix fold fourier functional generalize generalizing gfail give_up has_evar hnf idtac in induction injection instantiate intro intro_pattern intros intuition inversion inversion_clear is_evar is_var lapply lazy left lia lra move native_compute nia nsatz omega once pattern pose progress proof psatz quote record red refine reflexivity remember rename repeat replace revert revgoals rewrite rewrite_strat right ring ring_simplify rtauto set setoid_reflexivity setoid_replace setoid_rewrite setoid_symmetry setoid_transitivity shelve shelve_unifiable simpl simple simplify_eq solve specialize split split_Rabs split_Rmult stepl stepr subst sum swap symmetry tactic tauto time timeout top transitivity trivial try tryif unfold unify until using vm_compute with"},contains:[e.QUOTE_STRING_MODE,e.COMMENT("\\(\\*","\\*\\)"),e.C_NUMBER_MODE,{className:"type",excludeBegin:!0,begin:"\\|\\s*",end:"\\w+"},{begin:/[-=]>/}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/cos.min.js b/vendor/assets/javascripts/highlightjs/languages/cos.min.js
index bee8aefd51..266e69da04 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cos.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cos.min.js
@@ -1 +1 @@
-hljs.registerLanguage("cos",function(e){var t={cN:"string",v:[{b:'"',e:'"',c:[{b:'""',r:0}]}]},r={cN:"number",b:"\\b(\\d+(\\.\\d*)?|\\.\\d+)",r:0},s="property parameter class classmethod clientmethod extends as break catch close continue do d|0 else elseif for goto halt hang h|0 if job j|0 kill k|0 lock l|0 merge new open quit q|0 read r|0 return set s|0 tcommit throw trollback try tstart use view while write w|0 xecute x|0 zkill znspace zn ztrap zwrite zw zzdump zzwrite print zbreak zinsert zload zprint zremove zsave zzprint mv mvcall mvcrt mvdim mvprint zquit zsync ascii";return{cI:!0,aliases:["cos","cls"],k:s,c:[r,t,e.CLCM,e.CBCM,{cN:"comment",b:/;/,e:"$",r:0},{cN:"built_in",b:/(?:\$\$?|\.\.)\^?[a-zA-Z]+/},{cN:"built_in",b:/\$\$\$[a-zA-Z]+/},{cN:"built_in",b:/%[a-z]+(?:\.[a-z]+)*/},{cN:"symbol",b:/\^%?[a-zA-Z][\w]*/},{cN:"keyword",b:/##class|##super|#define|#dim/},{b:/&sql\(/,e:/\)/,eB:!0,eE:!0,sL:"sql"},{b:/&(js|jscript|javascript)</,e:/>/,eB:!0,eE:!0,sL:"javascript"},{b:/&html<\s*</,e:/>\s*>/,sL:"xml"}]}});
\ No newline at end of file
+hljs.registerLanguage("cos",function(){"use strict";return function(e){return{name:"Caché Object Script",case_insensitive:!0,aliases:["cos","cls"],keywords:"property parameter class classmethod clientmethod extends as break catch close continue do d|0 else elseif for goto halt hang h|0 if job j|0 kill k|0 lock l|0 merge new open quit q|0 read r|0 return set s|0 tcommit throw trollback try tstart use view while write w|0 xecute x|0 zkill znspace zn ztrap zwrite zw zzdump zzwrite print zbreak zinsert zload zprint zremove zsave zzprint mv mvcall mvcrt mvdim mvprint zquit zsync ascii",contains:[{className:"number",begin:"\\b(\\d+(\\.\\d*)?|\\.\\d+)",relevance:0},{className:"string",variants:[{begin:'"',end:'"',contains:[{begin:'""',relevance:0}]}]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"comment",begin:/;/,end:"$",relevance:0},{className:"built_in",begin:/(?:\$\$?|\.\.)\^?[a-zA-Z]+/},{className:"built_in",begin:/\$\$\$[a-zA-Z]+/},{className:"built_in",begin:/%[a-z]+(?:\.[a-z]+)*/},{className:"symbol",begin:/\^%?[a-zA-Z][\w]*/},{className:"keyword",begin:/##class|##super|#define|#dim/},{begin:/&sql\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,subLanguage:"sql"},{begin:/&(js|jscript|javascript)</,end:/>/,excludeBegin:!0,excludeEnd:!0,subLanguage:"javascript"},{begin:/&html<\s*</,end:/>\s*>/,subLanguage:"xml"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/cpp.min.js b/vendor/assets/javascripts/highlightjs/languages/cpp.min.js
index 8b8d5ca6bb..822dd02a9b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cpp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cpp.min.js
@@ -1 +1 @@
-hljs.registerLanguage("cpp",function(t){var e={cN:"keyword",b:"\\b[a-z\\d_]*_t\\b"},r={cN:"string",v:[{b:'(u8?|U|L)?"',e:'"',i:"\\n",c:[t.BE]},{b:'(u8?|U|L)?R"\\(',e:'\\)"'},{b:"'\\\\?.",e:"'",i:"."}]},s={cN:"number",v:[{b:"\\b(0b[01']+)"},{b:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{b:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],r:0},i={cN:"meta",b:/#\s*[a-z]+\b/,e:/$/,k:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef include"},c:[{b:/\\\n/,r:0},t.inherit(r,{cN:"meta-string"}),{cN:"meta-string",b:/<[^\n>]*>/,e:/$/,i:"\\n"},t.CLCM,t.CBCM]},a=t.IR+"\\s*\\(",c={keyword:"int float while private char catch import module export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using asm case typeid short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignof constexpr decltype noexcept static_assert thread_local restrict _Bool complex _Complex _Imaginary atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return and or not",built_in:"std string cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr abort abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr",literal:"true false nullptr NULL"},n=[e,t.CLCM,t.CBCM,s,r];return{aliases:["c","cc","h","c++","h++","hpp"],k:c,i:"</",c:n.concat([i,{b:"\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",e:">",k:c,c:["self",e]},{b:t.IR+"::",k:c},{v:[{b:/=/,e:/;/},{b:/\(/,e:/\)/},{bK:"new throw return else",e:/;/}],k:c,c:n.concat([{b:/\(/,e:/\)/,k:c,c:n.concat(["self"]),r:0}]),r:0},{cN:"function",b:"("+t.IR+"[\\*&\\s]+)+"+a,rB:!0,e:/[{;=]/,eE:!0,k:c,i:/[^\w\s\*&]/,c:[{b:a,rB:!0,c:[t.TM],r:0},{cN:"params",b:/\(/,e:/\)/,k:c,r:0,c:[t.CLCM,t.CBCM,r,s,e,{b:/\(/,e:/\)/,k:c,r:0,c:["self",t.CLCM,t.CBCM,r,s,e]}]},t.CLCM,t.CBCM,i]},{cN:"class",bK:"class struct",e:/[{;:]/,c:[{b:/</,e:/>/,c:["self"]},t.TM]}]),exports:{preprocessor:i,strings:r,k:c}}});
\ No newline at end of file
+hljs.registerLanguage("cpp",function(){"use strict";return function(e){var t=e.getLanguage("c-like").rawDefinition();return t.disableAutodetect=!1,t.name="C++",t.aliases=["cc","c++","h++","hpp","hh","hxx","cxx"],t}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/crmsh.min.js b/vendor/assets/javascripts/highlightjs/languages/crmsh.min.js
index 902468b895..a57859d4eb 100644
--- a/vendor/assets/javascripts/highlightjs/languages/crmsh.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/crmsh.min.js
@@ -1 +1 @@
-hljs.registerLanguage("crmsh",function(t){var e="primitive rsc_template",r="group clone ms master location colocation order fencing_topology rsc_ticket acl_target acl_group user role tag xml",s="property rsc_defaults op_defaults",a="params meta operations op rule attributes utilization",i="read write deny defined not_defined in_range date spec in ref reference attribute type xpath version and or lt gt tag lte gte eq ne \\",o="number string",n="Master Started Slave Stopped start promote demote stop monitor true false";return{aliases:["crm","pcmk"],cI:!0,k:{keyword:a+" "+i+" "+o,literal:n},c:[t.HCM,{bK:"node",starts:{e:"\\s*([\\w_-]+:)?",starts:{cN:"title",e:"\\s*[\\$\\w_][\\w_-]*"}}},{bK:e,starts:{cN:"title",e:"\\s*[\\$\\w_][\\w_-]*",starts:{e:"\\s*@?[\\w_][\\w_\\.:-]*"}}},{b:"\\b("+r.split(" ").join("|")+")\\s+",k:r,starts:{cN:"title",e:"[\\$\\w_][\\w_-]*"}},{bK:s,starts:{cN:"title",e:"\\s*([\\w_-]+:)?"}},t.QSM,{cN:"meta",b:"(ocf|systemd|service|lsb):[\\w_:-]+",r:0},{cN:"number",b:"\\b\\d+(\\.\\d+)?(ms|s|h|m)?",r:0},{cN:"literal",b:"[-]?(infinity|inf)",r:0},{cN:"attr",b:/([A-Za-z\$_\#][\w_-]+)=/,r:0},{cN:"tag",b:"</?",e:"/?>",r:0}]}});
\ No newline at end of file
+hljs.registerLanguage("crmsh",function(){"use strict";return function(e){var t="group clone ms master location colocation order fencing_topology rsc_ticket acl_target acl_group user role tag xml";return{name:"crmsh",aliases:["crm","pcmk"],case_insensitive:!0,keywords:{keyword:"params meta operations op rule attributes utilization read write deny defined not_defined in_range date spec in ref reference attribute type xpath version and or lt gt tag lte gte eq ne \\ number string",literal:"Master Started Slave Stopped start promote demote stop monitor true false"},contains:[e.HASH_COMMENT_MODE,{beginKeywords:"node",starts:{end:"\\s*([\\w_-]+:)?",starts:{className:"title",end:"\\s*[\\$\\w_][\\w_-]*"}}},{beginKeywords:"primitive rsc_template",starts:{className:"title",end:"\\s*[\\$\\w_][\\w_-]*",starts:{end:"\\s*@?[\\w_][\\w_\\.:-]*"}}},{begin:"\\b("+t.split(" ").join("|")+")\\s+",keywords:t,starts:{className:"title",end:"[\\$\\w_][\\w_-]*"}},{beginKeywords:"property rsc_defaults op_defaults",starts:{className:"title",end:"\\s*([\\w_-]+:)?"}},e.QUOTE_STRING_MODE,{className:"meta",begin:"(ocf|systemd|service|lsb):[\\w_:-]+",relevance:0},{className:"number",begin:"\\b\\d+(\\.\\d+)?(ms|s|h|m)?",relevance:0},{className:"literal",begin:"[-]?(infinity|inf)",relevance:0},{className:"attr",begin:/([A-Za-z\$_\#][\w_-]+)=/,relevance:0},{className:"tag",begin:"</?",end:"/?>",relevance:0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/crystal.min.js b/vendor/assets/javascripts/highlightjs/languages/crystal.min.js
index 6e4a887f25..6979ccbe6e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/crystal.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/crystal.min.js
@@ -1 +1 @@
-hljs.registerLanguage("crystal",function(e){function b(e,b){var c=[{b:e,e:b}];return c[0].c=c,c}var c="(_*[ui](8|16|32|64|128))?",i="(_*f(32|64))?",n="[a-zA-Z_]\\w*[!?=]?",r="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~|]|//|//=|&[-+*]=?|&\\*\\*|\\[\\][=?]?",s="[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?",t={keyword:"abstract alias annotation as as? asm begin break case class def do else elsif end ensure enum extend for fun if include instance_sizeof is_a? lib macro module next nil? of out pointerof private protected rescue responds_to? return require select self sizeof struct super then type typeof union uninitialized unless until verbatim when while with yield __DIR__ __END_LINE__ __FILE__ __LINE__",literal:"false nil true"},a={cN:"subst",b:"#{",e:"}",k:t},l={cN:"template-variable",v:[{b:"\\{\\{",e:"\\}\\}"},{b:"\\{%",e:"%\\}"}],k:t},u={cN:"string",c:[e.BE,a],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[Qwi]?\\(",e:"\\)",c:b("\\(","\\)")},{b:"%[Qwi]?\\[",e:"\\]",c:b("\\[","\\]")},{b:"%[Qwi]?{",e:"}",c:b("{","}")},{b:"%[Qwi]?<",e:">",c:b("<",">")},{b:"%[Qwi]?\\|",e:"\\|"},{b:/<<-\w+$/,e:/^\s*\w+$/}],r:0},_={cN:"string",v:[{b:"%q\\(",e:"\\)",c:b("\\(","\\)")},{b:"%q\\[",e:"\\]",c:b("\\[","\\]")},{b:"%q{",e:"}",c:b("{","}")},{b:"%q<",e:">",c:b("<",">")},{b:"%q\\|",e:"\\|"},{b:/<<-'\w+'$/,e:/^\s*\w+$/}],r:0},o={b:"(?!%})("+e.RSR+"|\\n|\\b(case|if|select|unless|until|when|while)\\b)\\s*",k:"case if select unless until when while",c:[{cN:"regexp",c:[e.BE,a],v:[{b:"//[a-z]*",r:0},{b:"/(?!\\/)",e:"/[a-z]*"}]}],r:0},f={cN:"regexp",c:[e.BE,a],v:[{b:"%r\\(",e:"\\)",c:b("\\(","\\)")},{b:"%r\\[",e:"\\]",c:b("\\[","\\]")},{b:"%r{",e:"}",c:b("{","}")},{b:"%r<",e:">",c:b("<",">")},{b:"%r\\|",e:"\\|"}],r:0},w={cN:"meta",b:"@\\[",e:"\\]",c:[e.inherit(e.QSM,{cN:"meta-string"})]},N=[l,u,_,f,o,w,e.HCM,{cN:"class",bK:"class module struct",e:"$|;",i:/=/,c:[e.HCM,e.inherit(e.TM,{b:s}),{b:"<"}]},{cN:"class",bK:"lib enum union",e:"$|;",i:/=/,c:[e.HCM,e.inherit(e.TM,{b:s})],r:10},{bK:"annotation",e:"$|;",i:/=/,c:[e.HCM,e.inherit(e.TM,{b:s})],r:10},{cN:"function",bK:"def",e:/\B\b/,c:[e.inherit(e.TM,{b:r,endsParent:!0})]},{cN:"function",bK:"fun macro",e:/\B\b/,c:[e.inherit(e.TM,{b:r,endsParent:!0})],r:5},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":",c:[u,{b:r}],r:0},{cN:"number",v:[{b:"\\b0b([01_]+)"+c},{b:"\\b0o([0-7_]+)"+c},{b:"\\b0x([A-Fa-f0-9_]+)"+c},{b:"\\b([1-9][0-9_]*[0-9]|[0-9])(\\.[0-9][0-9_]*)?([eE]_*[-+]?[0-9_]*)?"+i+"(?!_)"},{b:"\\b([1-9][0-9_]*|0)"+c}],r:0}];return a.c=N,l.c=N.slice(1),{aliases:["cr"],l:n,k:t,c:N}});
\ No newline at end of file
+hljs.registerLanguage("crystal",function(){"use strict";return function(e){var n="(_*[ui](8|16|32|64|128))?",i="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|[=!]~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~|]|//|//=|&[-+*]=?|&\\*\\*|\\[\\][=?]?",a={$pattern:"[a-zA-Z_]\\w*[!?=]?",keyword:"abstract alias annotation as as? asm begin break case class def do else elsif end ensure enum extend for fun if include instance_sizeof is_a? lib macro module next nil? of out pointerof private protected rescue responds_to? return require select self sizeof struct super then type typeof union uninitialized unless until verbatim when while with yield __DIR__ __END_LINE__ __FILE__ __LINE__",literal:"false nil true"},s={className:"subst",begin:"#{",end:"}",keywords:a},t={className:"template-variable",variants:[{begin:"\\{\\{",end:"\\}\\}"},{begin:"\\{%",end:"%\\}"}],keywords:a};function r(e,n){var i=[{begin:e,end:n}];return i[0].contains=i,i}var c={className:"string",contains:[e.BACKSLASH_ESCAPE,s],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/`/,end:/`/},{begin:"%[Qwi]?\\(",end:"\\)",contains:r("\\(","\\)")},{begin:"%[Qwi]?\\[",end:"\\]",contains:r("\\[","\\]")},{begin:"%[Qwi]?{",end:"}",contains:r("{","}")},{begin:"%[Qwi]?<",end:">",contains:r("<",">")},{begin:"%[Qwi]?\\|",end:"\\|"},{begin:/<<-\w+$/,end:/^\s*\w+$/}],relevance:0},l={className:"string",variants:[{begin:"%q\\(",end:"\\)",contains:r("\\(","\\)")},{begin:"%q\\[",end:"\\]",contains:r("\\[","\\]")},{begin:"%q{",end:"}",contains:r("{","}")},{begin:"%q<",end:">",contains:r("<",">")},{begin:"%q\\|",end:"\\|"},{begin:/<<-'\w+'$/,end:/^\s*\w+$/}],relevance:0},b={begin:"(?!%})("+e.RE_STARTERS_RE+"|\\n|\\b(case|if|select|unless|until|when|while)\\b)\\s*",keywords:"case if select unless until when while",contains:[{className:"regexp",contains:[e.BACKSLASH_ESCAPE,s],variants:[{begin:"//[a-z]*",relevance:0},{begin:"/(?!\\/)",end:"/[a-z]*"}]}],relevance:0},o=[t,c,l,{className:"regexp",contains:[e.BACKSLASH_ESCAPE,s],variants:[{begin:"%r\\(",end:"\\)",contains:r("\\(","\\)")},{begin:"%r\\[",end:"\\]",contains:r("\\[","\\]")},{begin:"%r{",end:"}",contains:r("{","}")},{begin:"%r<",end:">",contains:r("<",">")},{begin:"%r\\|",end:"\\|"}],relevance:0},b,{className:"meta",begin:"@\\[",end:"\\]",contains:[e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"})]},e.HASH_COMMENT_MODE,{className:"class",beginKeywords:"class module struct",end:"$|;",illegal:/=/,contains:[e.HASH_COMMENT_MODE,e.inherit(e.TITLE_MODE,{begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{begin:"<"}]},{className:"class",beginKeywords:"lib enum union",end:"$|;",illegal:/=/,contains:[e.HASH_COMMENT_MODE,e.inherit(e.TITLE_MODE,{begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"})],relevance:10},{beginKeywords:"annotation",end:"$|;",illegal:/=/,contains:[e.HASH_COMMENT_MODE,e.inherit(e.TITLE_MODE,{begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"})],relevance:10},{className:"function",beginKeywords:"def",end:/\B\b/,contains:[e.inherit(e.TITLE_MODE,{begin:i,endsParent:!0})]},{className:"function",beginKeywords:"fun macro",end:/\B\b/,contains:[e.inherit(e.TITLE_MODE,{begin:i,endsParent:!0})],relevance:5},{className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"(\\!|\\?)?:",relevance:0},{className:"symbol",begin:":",contains:[c,{begin:i}],relevance:0},{className:"number",variants:[{begin:"\\b0b([01_]+)"+n},{begin:"\\b0o([0-7_]+)"+n},{begin:"\\b0x([A-Fa-f0-9_]+)"+n},{begin:"\\b([1-9][0-9_]*[0-9]|[0-9])(\\.[0-9][0-9_]*)?([eE]_*[-+]?[0-9_]*)?(_*f(32|64))?(?!_)"},{begin:"\\b([1-9][0-9_]*|0)"+n}],relevance:0}];return s.contains=o,t.contains=o.slice(1),{name:"Crystal",aliases:["cr"],keywords:a,contains:o}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/csharp.min.js b/vendor/assets/javascripts/highlightjs/languages/csharp.min.js
new file mode 100644
index 0000000000..e3eeb0e5df
--- /dev/null
+++ b/vendor/assets/javascripts/highlightjs/languages/csharp.min.js
@@ -0,0 +1 @@
+hljs.registerLanguage("csharp",function(){"use strict";return function(e){var n={keyword:"abstract as base bool break byte case catch char checked const continue decimal default delegate do double enum event explicit extern finally fixed float for foreach goto if implicit in int interface internal is lock long object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this try typeof uint ulong unchecked unsafe ushort using virtual void volatile while add alias ascending async await by descending dynamic equals from get global group into join let nameof on orderby partial remove select set value var when where yield",literal:"null false true"},i=e.inherit(e.TITLE_MODE,{begin:"[a-zA-Z](\\.?\\w)*"}),a={className:"number",variants:[{begin:"\\b(0b[01']+)"},{begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},s={className:"string",begin:'@"',end:'"',contains:[{begin:'""'}]},t=e.inherit(s,{illegal:/\n/}),l={className:"subst",begin:"{",end:"}",keywords:n},r=e.inherit(l,{illegal:/\n/}),c={className:"string",begin:/\$"/,end:'"',illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},e.BACKSLASH_ESCAPE,r]},o={className:"string",begin:/\$@"/,end:'"',contains:[{begin:"{{"},{begin:"}}"},{begin:'""'},l]},g=e.inherit(o,{illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},{begin:'""'},r]});l.contains=[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.C_BLOCK_COMMENT_MODE],r.contains=[g,c,t,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.inherit(e.C_BLOCK_COMMENT_MODE,{illegal:/\n/})];var d={variants:[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},E=e.IDENT_RE+"(<"+e.IDENT_RE+"(\\s*,\\s*"+e.IDENT_RE+")*>)?(\\[\\])?",_={begin:"@"+e.IDENT_RE,relevance:0};return{name:"C#",aliases:["cs","c#"],keywords:n,illegal:/::/,contains:[e.COMMENT("///","$",{returnBegin:!0,contains:[{className:"doctag",variants:[{begin:"///",relevance:0},{begin:"\x3c!--|--\x3e"},{begin:"</?",end:">"}]}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum"}},d,a,{beginKeywords:"class interface",end:/[{;=]/,illegal:/[^\s:,]/,contains:[{beginKeywords:"where class"},i,{begin:"<",end:">",keywords:"in out"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{beginKeywords:"namespace",end:/[{;=]/,illegal:/[^\s:]/,contains:[i,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"meta",begin:"^\\s*\\[",excludeBegin:!0,end:"\\]",excludeEnd:!0,contains:[{className:"meta-string",begin:/"/,end:/"/}]},{beginKeywords:"new return throw await else",relevance:0},{className:"function",begin:"("+E+"\\s+)+"+e.IDENT_RE+"\\s*\\(",returnBegin:!0,end:/\s*[{;=]/,excludeEnd:!0,keywords:n,contains:[{begin:e.IDENT_RE+"\\s*\\(",returnBegin:!0,contains:[e.TITLE_MODE],relevance:0},{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:n,relevance:0,contains:[d,a,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},_]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/csp.min.js b/vendor/assets/javascripts/highlightjs/languages/csp.min.js
index e9d12e05e8..04ec297ea7 100644
--- a/vendor/assets/javascripts/highlightjs/languages/csp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/csp.min.js
@@ -1 +1 @@
-hljs.registerLanguage("csp",function(r){return{cI:!1,l:"[a-zA-Z][a-zA-Z0-9_-]*",k:{keyword:"base-uri child-src connect-src default-src font-src form-action frame-ancestors frame-src img-src media-src object-src plugin-types report-uri sandbox script-src style-src"},c:[{cN:"string",b:"'",e:"'"},{cN:"attribute",b:"^Content",e:":",eE:!0}]}});
\ No newline at end of file
+hljs.registerLanguage("csp",function(){"use strict";return function(e){return{name:"CSP",case_insensitive:!1,keywords:{$pattern:"[a-zA-Z][a-zA-Z0-9_-]*",keyword:"base-uri child-src connect-src default-src font-src form-action frame-ancestors frame-src img-src media-src object-src plugin-types report-uri sandbox script-src style-src"},contains:[{className:"string",begin:"'",end:"'"},{className:"attribute",begin:"^Content",end:":",excludeEnd:!0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/css.min.js b/vendor/assets/javascripts/highlightjs/languages/css.min.js
index ce758e0486..0e944b0cee 100644
--- a/vendor/assets/javascripts/highlightjs/languages/css.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/css.min.js
@@ -1 +1 @@
-hljs.registerLanguage("css",function(e){var c="[a-zA-Z-][a-zA-Z0-9_-]*",t={b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{eW:!0,eE:!0,c:[{b:/[\w-]+\(/,rB:!0,c:[{cN:"built_in",b:/[\w-]+/},{b:/\(/,e:/\)/,c:[e.ASM,e.QSM]}]},e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"number",b:"#[0-9A-Fa-f]+"},{cN:"meta",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"selector-id",b:/#[A-Za-z0-9_-]+/},{cN:"selector-class",b:/\.[A-Za-z0-9_-]+/},{cN:"selector-attr",b:/\[/,e:/\]/,i:"$"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{b:"@",e:"[{;]",i:/:/,c:[{cN:"keyword",b:/\w+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[e.ASM,e.QSM,e.CSSNM]}]},{cN:"selector-tag",b:c,r:0},{b:"{",e:"}",i:/\S/,c:[e.CBCM,t]}]}});
\ No newline at end of file
+hljs.registerLanguage("css",function(){"use strict";return function(e){var n={begin:/(?:[A-Z\_\.\-]+|--[a-zA-Z0-9_-]+)\s*:/,returnBegin:!0,end:";",endsWithParent:!0,contains:[{className:"attribute",begin:/\S/,end:":",excludeEnd:!0,starts:{endsWithParent:!0,excludeEnd:!0,contains:[{begin:/[\w-]+\(/,returnBegin:!0,contains:[{className:"built_in",begin:/[\w-]+/},{begin:/\(/,end:/\)/,contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE]}]},e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_BLOCK_COMMENT_MODE,{className:"number",begin:"#[0-9A-Fa-f]+"},{className:"meta",begin:"!important"}]}}]};return{name:"CSS",case_insensitive:!0,illegal:/[=\/|'\$]/,contains:[e.C_BLOCK_COMMENT_MODE,{className:"selector-id",begin:/#[A-Za-z0-9_-]+/},{className:"selector-class",begin:/\.[A-Za-z0-9_-]+/},{className:"selector-attr",begin:/\[/,end:/\]/,illegal:"$",contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},{className:"selector-pseudo",begin:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{begin:"@(page|font-face)",lexemes:"@[a-z-]+",keywords:"@page @font-face"},{begin:"@",end:"[{;]",illegal:/:/,returnBegin:!0,contains:[{className:"keyword",begin:/@\-?\w[\w]*(\-\w+)*/},{begin:/\s/,endsWithParent:!0,excludeEnd:!0,relevance:0,keywords:"and or not only",contains:[{begin:/[a-z-]+:/,className:"attribute"},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE]}]},{className:"selector-tag",begin:"[a-zA-Z-][a-zA-Z0-9_-]*",relevance:0},{begin:"{",end:"}",illegal:/\S/,contains:[e.C_BLOCK_COMMENT_MODE,n]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/d.min.js b/vendor/assets/javascripts/highlightjs/languages/d.min.js
index 9e34711e0e..633b0d7fae 100644
--- a/vendor/assets/javascripts/highlightjs/languages/d.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/d.min.js
@@ -1 +1 @@
-hljs.registerLanguage("d",function(e){var t={keyword:"abstract alias align asm assert auto body break byte case cast catch class const continue debug default delete deprecated do else enum export extern final finally for foreach foreach_reverse|10 goto if immutable import in inout int interface invariant is lazy macro mixin module new nothrow out override package pragma private protected public pure ref return scope shared static struct super switch synchronized template this throw try typedef typeid typeof union unittest version void volatile while with __FILE__ __LINE__ __gshared|10 __thread __traits __DATE__ __EOF__ __TIME__ __TIMESTAMP__ __VENDOR__ __VERSION__",built_in:"bool cdouble cent cfloat char creal dchar delegate double dstring float function idouble ifloat ireal long real short string ubyte ucent uint ulong ushort wchar wstring",literal:"false null true"},r="(0|[1-9][\\d_]*)",a="(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)",i="0[bB][01_]+",n="([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)",_="0[xX]"+n,c="([eE][+-]?"+a+")",d="("+a+"(\\.\\d*|"+c+")|\\d+\\."+a+a+"|\\."+r+c+"?)",o="(0[xX]("+n+"\\."+n+"|\\.?"+n+")[pP][+-]?"+a+")",s="("+r+"|"+i+"|"+_+")",l="("+o+"|"+d+")",u="\\\\(['\"\\?\\\\abfnrtv]|u[\\dA-Fa-f]{4}|[0-7]{1,3}|x[\\dA-Fa-f]{2}|U[\\dA-Fa-f]{8})|&[a-zA-Z\\d]{2,};",b={cN:"number",b:"\\b"+s+"(L|u|U|Lu|LU|uL|UL)?",r:0},f={cN:"number",b:"\\b("+l+"([fF]|L|i|[fF]i|Li)?|"+s+"(i|[fF]i|Li))",r:0},g={cN:"string",b:"'("+u+"|.)",e:"'",i:"."},h={b:u,r:0},p={cN:"string",b:'"',c:[h],e:'"[cwd]?'},m={cN:"string",b:'[rq]"',e:'"[cwd]?',r:5},w={cN:"string",b:"`",e:"`[cwd]?"},N={cN:"string",b:'x"[\\da-fA-F\\s\\n\\r]*"[cwd]?',r:10},A={cN:"string",b:'q"\\{',e:'\\}"'},F={cN:"meta",b:"^#!",e:"$",r:5},y={cN:"meta",b:"#(line)",e:"$",r:5},L={cN:"keyword",b:"@[a-zA-Z_][a-zA-Z_\\d]*"},v=e.C("\\/\\+","\\+\\/",{c:["self"],r:10});return{l:e.UIR,k:t,c:[e.CLCM,e.CBCM,v,N,p,m,w,A,f,b,g,F,y,L]}});
\ No newline at end of file
+hljs.registerLanguage("d",function(){"use strict";return function(e){var a={$pattern:e.UNDERSCORE_IDENT_RE,keyword:"abstract alias align asm assert auto body break byte case cast catch class const continue debug default delete deprecated do else enum export extern final finally for foreach foreach_reverse|10 goto if immutable import in inout int interface invariant is lazy macro mixin module new nothrow out override package pragma private protected public pure ref return scope shared static struct super switch synchronized template this throw try typedef typeid typeof union unittest version void volatile while with __FILE__ __LINE__ __gshared|10 __thread __traits __DATE__ __EOF__ __TIME__ __TIMESTAMP__ __VENDOR__ __VERSION__",built_in:"bool cdouble cent cfloat char creal dchar delegate double dstring float function idouble ifloat ireal long real short string ubyte ucent uint ulong ushort wchar wstring",literal:"false null true"},d="((0|[1-9][\\d_]*)|0[bB][01_]+|0[xX]([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))",n="\\\\(['\"\\?\\\\abfnrtv]|u[\\dA-Fa-f]{4}|[0-7]{1,3}|x[\\dA-Fa-f]{2}|U[\\dA-Fa-f]{8})|&[a-zA-Z\\d]{2,};",t={className:"number",begin:"\\b"+d+"(L|u|U|Lu|LU|uL|UL)?",relevance:0},_={className:"number",begin:"\\b(((0[xX](([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)\\.([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)|\\.?([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))[pP][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))|((0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(\\.\\d*|([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)))|\\d+\\.(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)|\\.(0|[1-9][\\d_]*)([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))?))([fF]|L|i|[fF]i|Li)?|"+d+"(i|[fF]i|Li))",relevance:0},r={className:"string",begin:"'("+n+"|.)",end:"'",illegal:"."},i={className:"string",begin:'"',contains:[{begin:n,relevance:0}],end:'"[cwd]?'},s=e.COMMENT("\\/\\+","\\+\\/",{contains:["self"],relevance:10});return{name:"D",keywords:a,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s,{className:"string",begin:'x"[\\da-fA-F\\s\\n\\r]*"[cwd]?',relevance:10},i,{className:"string",begin:'[rq]"',end:'"[cwd]?',relevance:5},{className:"string",begin:"`",end:"`[cwd]?"},{className:"string",begin:'q"\\{',end:'\\}"'},_,t,r,{className:"meta",begin:"^#!",end:"$",relevance:5},{className:"meta",begin:"#(line)",end:"$",relevance:5},{className:"keyword",begin:"@[a-zA-Z_][a-zA-Z_\\d]*"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/dart.min.js b/vendor/assets/javascripts/highlightjs/languages/dart.min.js
index 805613d8e8..fa3ee5d80b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dart.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dart.min.js
@@ -1 +1 @@
-hljs.registerLanguage("dart",function(e){var t={cN:"subst",v:[{b:"\\${",e:"}"},{b:"\\$[A-Za-z0-9_]+"}],k:"true false null this is new super"},r={cN:"string",v:[{b:"r'''",e:"'''"},{b:'r"""',e:'"""'},{b:"r'",e:"'",i:"\\n"},{b:'r"',e:'"',i:"\\n"},{b:"'''",e:"'''",c:[e.BE,t]},{b:'"""',e:'"""',c:[e.BE,t]},{b:"'",e:"'",i:"\\n",c:[e.BE,t]},{b:'"',e:'"',i:"\\n",c:[e.BE,t]}]};t.c=[e.CNM,r];var n={keyword:"assert async await break case catch class const continue default do else enum extends false final finally for if in is new null rethrow return super switch sync this throw true try var void while with yield abstract as dynamic export external factory get implements import library operator part set static typedef",built_in:"print Comparable DateTime Duration Function Iterable Iterator List Map Match Null Object Pattern RegExp Set Stopwatch String StringBuffer StringSink Symbol Type Uri bool double int num document window querySelector querySelectorAll Element ElementList"};return{k:n,c:[r,e.C("/\\*\\*","\\*/",{sL:"markdown"}),e.C("///","$",{sL:"markdown"}),e.CLCM,e.CBCM,{cN:"class",bK:"class interface",e:"{",eE:!0,c:[{bK:"extends implements"},e.UTM]},e.CNM,{cN:"meta",b:"@[A-Za-z]+"},{b:"=>"}]}});
\ No newline at end of file
+hljs.registerLanguage("dart",function(){"use strict";return function(e){var n={className:"subst",variants:[{begin:"\\$[A-Za-z0-9_]+"}]},t={className:"subst",variants:[{begin:"\\${",end:"}"}],keywords:"true false null this is new super"},a={className:"string",variants:[{begin:"r'''",end:"'''"},{begin:'r"""',end:'"""'},{begin:"r'",end:"'",illegal:"\\n"},{begin:'r"',end:'"',illegal:"\\n"},{begin:"'''",end:"'''",contains:[e.BACKSLASH_ESCAPE,n,t]},{begin:'"""',end:'"""',contains:[e.BACKSLASH_ESCAPE,n,t]},{begin:"'",end:"'",illegal:"\\n",contains:[e.BACKSLASH_ESCAPE,n,t]},{begin:'"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE,n,t]}]};return t.contains=[e.C_NUMBER_MODE,a],{name:"Dart",keywords:{keyword:"abstract as assert async await break case catch class const continue covariant default deferred do dynamic else enum export extends extension external factory false final finally for Function get hide if implements import in inferface is late library mixin new null on operator part required rethrow return set show static super switch sync this throw true try typedef var void while with yield",built_in:"Comparable DateTime Duration Function Iterable Iterator List Map Match Never Null Object Pattern RegExp Set Stopwatch String StringBuffer StringSink Symbol Type Uri bool double dynamic int num print Element ElementList document querySelector querySelectorAll window"},contains:[a,e.COMMENT("/\\*\\*","\\*/",{subLanguage:"markdown",relevance:0}),e.COMMENT("///+\\s*","$",{contains:[{subLanguage:"markdown",begin:".",end:"$",relevance:0}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"class",beginKeywords:"class interface",end:"{",excludeEnd:!0,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},e.C_NUMBER_MODE,{className:"meta",begin:"@[A-Za-z]+"},{begin:"=>"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/delphi.min.js b/vendor/assets/javascripts/highlightjs/languages/delphi.min.js
index 89000076c7..6ea2a6f275 100644
--- a/vendor/assets/javascripts/highlightjs/languages/delphi.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/delphi.min.js
@@ -1 +1 @@
-hljs.registerLanguage("delphi",function(e){var r="exports register file shl array record property for mod while set ally label uses raise not stored class safecall var interface or private static exit index inherited to else stdcall override shr asm far resourcestring finalization packed virtual out and protected library do xorwrite goto near function end div overload object unit begin string on inline repeat until destructor write message program with read initialization except default nil if case cdecl in downto threadvar of try pascal const external constructor type public then implementation finally published procedure absolute reintroduce operator as is abstract alias assembler bitpacked break continue cppdecl cvar enumerator experimental platform deprecated unimplemented dynamic export far16 forward generic helper implements interrupt iochecks local name nodefault noreturn nostackframe oldfpccall otherwise saveregisters softfloat specialize strict unaligned varargs ",t=[e.CLCM,e.C(/\{/,/\}/,{r:0}),e.C(/\(\*/,/\*\)/,{r:10})],a={cN:"meta",v:[{b:/\{\$/,e:/\}/},{b:/\(\*\$/,e:/\*\)/}]},c={cN:"string",b:/'/,e:/'/,c:[{b:/''/}]},i={cN:"string",b:/(#\d+)+/},o={b:e.IR+"\\s*=\\s*class\\s*\\(",rB:!0,c:[e.TM]},n={cN:"function",bK:"function constructor destructor procedure",e:/[:;]/,k:"function constructor|10 destructor|10 procedure|10",c:[e.TM,{cN:"params",b:/\(/,e:/\)/,k:r,c:[c,i,a].concat(t)},a].concat(t)};return{aliases:["dpr","dfm","pas","pascal","freepascal","lazarus","lpr","lfm"],cI:!0,k:r,i:/"|\$[G-Zg-z]|\/\*|<\/|\|/,c:[c,i,e.NM,o,n,a].concat(t)}});
\ No newline at end of file
+hljs.registerLanguage("delphi",function(){"use strict";return function(e){var r="exports register file shl array record property for mod while set ally label uses raise not stored class safecall var interface or private static exit index inherited to else stdcall override shr asm far resourcestring finalization packed virtual out and protected library do xorwrite goto near function end div overload object unit begin string on inline repeat until destructor write message program with read initialization except default nil if case cdecl in downto threadvar of try pascal const external constructor type public then implementation finally published procedure absolute reintroduce operator as is abstract alias assembler bitpacked break continue cppdecl cvar enumerator experimental platform deprecated unimplemented dynamic export far16 forward generic helper implements interrupt iochecks local name nodefault noreturn nostackframe oldfpccall otherwise saveregisters softfloat specialize strict unaligned varargs ",a=[e.C_LINE_COMMENT_MODE,e.COMMENT(/\{/,/\}/,{relevance:0}),e.COMMENT(/\(\*/,/\*\)/,{relevance:10})],n={className:"meta",variants:[{begin:/\{\$/,end:/\}/},{begin:/\(\*\$/,end:/\*\)/}]},t={className:"string",begin:/'/,end:/'/,contains:[{begin:/''/}]},i={className:"string",begin:/(#\d+)+/},s={begin:e.IDENT_RE+"\\s*=\\s*class\\s*\\(",returnBegin:!0,contains:[e.TITLE_MODE]},c={className:"function",beginKeywords:"function constructor destructor procedure",end:/[:;]/,keywords:"function constructor|10 destructor|10 procedure|10",contains:[e.TITLE_MODE,{className:"params",begin:/\(/,end:/\)/,keywords:r,contains:[t,i,n].concat(a)},n].concat(a)};return{name:"Delphi",aliases:["dpr","dfm","pas","pascal","freepascal","lazarus","lpr","lfm"],case_insensitive:!0,keywords:r,illegal:/"|\$[G-Zg-z]|\/\*|<\/|\|/,contains:[t,i,e.NUMBER_MODE,{className:"number",relevance:0,variants:[{begin:"\\$[0-9A-Fa-f]+"},{begin:"&[0-7]+"},{begin:"%[01]+"}]},s,c,n].concat(a)}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/diff.min.js b/vendor/assets/javascripts/highlightjs/languages/diff.min.js
index 501c2be749..e0dcabc804 100644
--- a/vendor/assets/javascripts/highlightjs/languages/diff.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/diff.min.js
@@ -1 +1 @@
-hljs.registerLanguage("diff",function(e){return{aliases:["patch"],c:[{cN:"meta",r:10,v:[{b:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"comment",v:[{b:/Index: /,e:/$/},{b:/={3,}/,e:/$/},{b:/^\-{3}/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+{3}/,e:/$/},{b:/\*{5}/,e:/\*{5}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"addition",b:"^\\!",e:"$"}]}});
\ No newline at end of file
+hljs.registerLanguage("diff",function(){"use strict";return function(e){return{name:"Diff",aliases:["patch"],contains:[{className:"meta",relevance:10,variants:[{begin:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{begin:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{begin:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{className:"comment",variants:[{begin:/Index: /,end:/$/},{begin:/={3,}/,end:/$/},{begin:/^\-{3}/,end:/$/},{begin:/^\*{3} /,end:/$/},{begin:/^\+{3}/,end:/$/},{begin:/^\*{15}$/}]},{className:"addition",begin:"^\\+",end:"$"},{className:"deletion",begin:"^\\-",end:"$"},{className:"addition",begin:"^\\!",end:"$"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/django.min.js b/vendor/assets/javascripts/highlightjs/languages/django.min.js
index b41e5b93f1..13036d19f0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/django.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/django.min.js
@@ -1 +1 @@
-hljs.registerLanguage("django",function(e){var t={b:/\|[A-Za-z]+:?/,k:{name:"truncatewords removetags linebreaksbr yesno get_digit timesince random striptags filesizeformat escape linebreaks length_is ljust rjust cut urlize fix_ampersands title floatformat capfirst pprint divisibleby add make_list unordered_list urlencode timeuntil urlizetrunc wordcount stringformat linenumbers slice date dictsort dictsortreversed default_if_none pluralize lower join center default truncatewords_html upper length phone2numeric wordwrap time addslashes slugify first escapejs force_escape iriencode last safe safeseq truncatechars localize unlocalize localtime utc timezone"},c:[e.QSM,e.ASM]};return{aliases:["jinja"],cI:!0,sL:"xml",c:[e.C(/\{%\s*comment\s*%}/,/\{%\s*endcomment\s*%}/),e.C(/\{#/,/#}/),{cN:"template-tag",b:/\{%/,e:/%}/,c:[{cN:"name",b:/\w+/,k:{name:"comment endcomment load templatetag ifchanged endifchanged if endif firstof for endfor ifnotequal endifnotequal widthratio extends include spaceless endspaceless regroup ifequal endifequal ssi now with cycle url filter endfilter debug block endblock else autoescape endautoescape csrf_token empty elif endwith static trans blocktrans endblocktrans get_static_prefix get_media_prefix plural get_current_language language get_available_languages get_current_language_bidi get_language_info get_language_info_list localize endlocalize localtime endlocaltime timezone endtimezone get_current_timezone verbatim"},starts:{eW:!0,k:"in by as",c:[t],r:0}}]},{cN:"template-variable",b:/\{\{/,e:/}}/,c:[t]}]}});
\ No newline at end of file
+hljs.registerLanguage("django",function(){"use strict";return function(e){var t={begin:/\|[A-Za-z]+:?/,keywords:{name:"truncatewords removetags linebreaksbr yesno get_digit timesince random striptags filesizeformat escape linebreaks length_is ljust rjust cut urlize fix_ampersands title floatformat capfirst pprint divisibleby add make_list unordered_list urlencode timeuntil urlizetrunc wordcount stringformat linenumbers slice date dictsort dictsortreversed default_if_none pluralize lower join center default truncatewords_html upper length phone2numeric wordwrap time addslashes slugify first escapejs force_escape iriencode last safe safeseq truncatechars localize unlocalize localtime utc timezone"},contains:[e.QUOTE_STRING_MODE,e.APOS_STRING_MODE]};return{name:"Django",aliases:["jinja"],case_insensitive:!0,subLanguage:"xml",contains:[e.COMMENT(/\{%\s*comment\s*%}/,/\{%\s*endcomment\s*%}/),e.COMMENT(/\{#/,/#}/),{className:"template-tag",begin:/\{%/,end:/%}/,contains:[{className:"name",begin:/\w+/,keywords:{name:"comment endcomment load templatetag ifchanged endifchanged if endif firstof for endfor ifnotequal endifnotequal widthratio extends include spaceless endspaceless regroup ifequal endifequal ssi now with cycle url filter endfilter debug block endblock else autoescape endautoescape csrf_token empty elif endwith static trans blocktrans endblocktrans get_static_prefix get_media_prefix plural get_current_language language get_available_languages get_current_language_bidi get_language_info get_language_info_list localize endlocalize localtime endlocaltime timezone endtimezone get_current_timezone verbatim"},starts:{endsWithParent:!0,keywords:"in by as",contains:[t],relevance:0}}]},{className:"template-variable",begin:/\{\{/,end:/}}/,contains:[t]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/dns.min.js b/vendor/assets/javascripts/highlightjs/languages/dns.min.js
index 3472aed00b..f9f29359a1 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dns.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dns.min.js
@@ -1 +1 @@
-hljs.registerLanguage("dns",function(d){return{aliases:["bind","zone"],k:{keyword:"IN A AAAA AFSDB APL CAA CDNSKEY CDS CERT CNAME DHCID DLV DNAME DNSKEY DS HIP IPSECKEY KEY KX LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM PTR RRSIG RP SIG SOA SRV SSHFP TA TKEY TLSA TSIG TXT"},c:[d.C(";","$",{r:0}),{cN:"meta",b:/^\$(TTL|GENERATE|INCLUDE|ORIGIN)\b/},{cN:"number",b:"((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))\\b"},{cN:"number",b:"((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\b"},d.inherit(d.NM,{b:/\b\d+[dhwm]?/})]}});
\ No newline at end of file
+hljs.registerLanguage("dns",function(){"use strict";return function(d){return{name:"DNS Zone",aliases:["bind","zone"],keywords:{keyword:"IN A AAAA AFSDB APL CAA CDNSKEY CDS CERT CNAME DHCID DLV DNAME DNSKEY DS HIP IPSECKEY KEY KX LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM PTR RRSIG RP SIG SOA SRV SSHFP TA TKEY TLSA TSIG TXT"},contains:[d.COMMENT(";","$",{relevance:0}),{className:"meta",begin:/^\$(TTL|GENERATE|INCLUDE|ORIGIN)\b/},{className:"number",begin:"((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))\\b"},{className:"number",begin:"((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\b"},d.inherit(d.NUMBER_MODE,{begin:/\b\d+[dhwm]?/})]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/dockerfile.min.js b/vendor/assets/javascripts/highlightjs/languages/dockerfile.min.js
index b266b029ce..2bb92c9b3c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dockerfile.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dockerfile.min.js
@@ -1 +1 @@
-hljs.registerLanguage("dockerfile",function(e){return{aliases:["docker"],cI:!0,k:"from maintainer expose env arg user onbuild stopsignal",c:[e.HCM,e.ASM,e.QSM,e.NM,{bK:"run cmd entrypoint volume add copy workdir label healthcheck shell",starts:{e:/[^\\]$/,sL:"bash"}}],i:"</"}});
\ No newline at end of file
+hljs.registerLanguage("dockerfile",function(){"use strict";return function(e){return{name:"Dockerfile",aliases:["docker"],case_insensitive:!0,keywords:"from maintainer expose env arg user onbuild stopsignal",contains:[e.HASH_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.NUMBER_MODE,{beginKeywords:"run cmd entrypoint volume add copy workdir label healthcheck shell",starts:{end:/[^\\]$/,subLanguage:"bash"}}],illegal:"</"}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/dos.min.js b/vendor/assets/javascripts/highlightjs/languages/dos.min.js
index a27b45e46c..5b17c1536e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dos.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dos.min.js
@@ -1 +1 @@
-hljs.registerLanguage("dos",function(e){var r=e.C(/^\s*@?rem\b/,/$/,{r:10}),t={cN:"symbol",b:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)",r:0};return{aliases:["bat","cmd"],cI:!0,i:/\/\*/,k:{keyword:"if else goto for in do call exit not exist errorlevel defined equ neq lss leq gtr geq",built_in:"prn nul lpt3 lpt2 lpt1 con com4 com3 com2 com1 aux shift cd dir echo setlocal endlocal set pause copy append assoc at attrib break cacls cd chcp chdir chkdsk chkntfs cls cmd color comp compact convert date dir diskcomp diskcopy doskey erase fs find findstr format ftype graftabl help keyb label md mkdir mode more move path pause print popd pushd promt rd recover rem rename replace restore rmdir shiftsort start subst time title tree type ver verify vol ping net ipconfig taskkill xcopy ren del"},c:[{cN:"variable",b:/%%[^ ]|%[^ ]+?%|![^ ]+?!/},{cN:"function",b:t.b,e:"goto:eof",c:[e.inherit(e.TM,{b:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),r]},{cN:"number",b:"\\b\\d+",r:0},r]}});
\ No newline at end of file
+hljs.registerLanguage("dos",function(){"use strict";return function(e){var t=e.COMMENT(/^\s*@?rem\b/,/$/,{relevance:10});return{name:"Batch file (DOS)",aliases:["bat","cmd"],case_insensitive:!0,illegal:/\/\*/,keywords:{keyword:"if else goto for in do call exit not exist errorlevel defined equ neq lss leq gtr geq",built_in:"prn nul lpt3 lpt2 lpt1 con com4 com3 com2 com1 aux shift cd dir echo setlocal endlocal set pause copy append assoc at attrib break cacls cd chcp chdir chkdsk chkntfs cls cmd color comp compact convert date dir diskcomp diskcopy doskey erase fs find findstr format ftype graftabl help keyb label md mkdir mode more move path pause print popd pushd promt rd recover rem rename replace restore rmdir shift sort start subst time title tree type ver verify vol ping net ipconfig taskkill xcopy ren del"},contains:[{className:"variable",begin:/%%[^ ]|%[^ ]+?%|![^ ]+?!/},{className:"function",begin:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)",end:"goto:eof",contains:[e.inherit(e.TITLE_MODE,{begin:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),t]},{className:"number",begin:"\\b\\d+",relevance:0},t]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/dsconfig.min.js b/vendor/assets/javascripts/highlightjs/languages/dsconfig.min.js
index 60ec5ea014..625e2491ee 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dsconfig.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dsconfig.min.js
@@ -1 +1 @@
-hljs.registerLanguage("dsconfig",function(e){var i={cN:"string",b:/"/,e:/"/},r={cN:"string",b:/'/,e:/'/},s={cN:"string",b:"[\\w-?]+:\\w+",e:"\\W",r:0},t={cN:"string",b:"\\w+-?\\w+",e:"\\W",r:0};return{k:"dsconfig",c:[{cN:"keyword",b:"^dsconfig",e:"\\s",eE:!0,r:10},{cN:"built_in",b:"(list|create|get|set|delete)-(\\w+)",e:"\\s",eE:!0,i:"!@#$%^&*()",r:10},{cN:"built_in",b:"--(\\w+)",e:"\\s",eE:!0},i,r,s,t,e.HCM]}});
\ No newline at end of file
+hljs.registerLanguage("dsconfig",function(){"use strict";return function(e){return{keywords:"dsconfig",contains:[{className:"keyword",begin:"^dsconfig",end:"\\s",excludeEnd:!0,relevance:10},{className:"built_in",begin:"(list|create|get|set|delete)-(\\w+)",end:"\\s",excludeEnd:!0,illegal:"!@#$%^&*()",relevance:10},{className:"built_in",begin:"--(\\w+)",end:"\\s",excludeEnd:!0},{className:"string",begin:/"/,end:/"/},{className:"string",begin:/'/,end:/'/},{className:"string",begin:"[\\w-?]+:\\w+",end:"\\W",relevance:0},{className:"string",begin:"\\w+-?\\w+",end:"\\W",relevance:0},e.HASH_COMMENT_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/dts.min.js b/vendor/assets/javascripts/highlightjs/languages/dts.min.js
index 1cdb447f03..99ade5e8f2 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dts.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dts.min.js
@@ -1 +1 @@
-hljs.registerLanguage("dts",function(e){var a={cN:"string",v:[e.inherit(e.QSM,{b:'((u8?|U)|L)?"'}),{b:'(u8?|U)?R"',e:'"',c:[e.BE]},{b:"'\\\\?.",e:"'",i:"."}]},c={cN:"number",v:[{b:"\\b(\\d+(\\.\\d*)?|\\.\\d+)(u|U|l|L|ul|UL|f|F)"},{b:e.CNR}],r:0},b={cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elif endif define undef ifdef ifndef"},c:[{b:/\\\n/,r:0},{bK:"include",e:"$",k:{"meta-keyword":"include"},c:[e.inherit(a,{cN:"meta-string"}),{cN:"meta-string",b:"<",e:">",i:"\\n"}]},a,e.CLCM,e.CBCM]},i={cN:"variable",b:"\\&[a-z\\d_]*\\b"},r={cN:"meta-keyword",b:"/[a-z][a-z\\d-]*/"},d={cN:"symbol",b:"^\\s*[a-zA-Z_][a-zA-Z\\d_]*:"},n={cN:"params",b:"<",e:">",c:[c,i]},s={cN:"class",b:/[a-zA-Z_][a-zA-Z\d_@]*\s{/,e:/[{;=]/,rB:!0,eE:!0},t={cN:"class",b:"/\\s*{",e:"};",r:10,c:[i,r,d,s,n,e.CLCM,e.CBCM,c,a]};return{k:"",c:[t,i,r,d,s,n,e.CLCM,e.CBCM,c,a,b,{b:e.IR+"::",k:""}]}});
\ No newline at end of file
+hljs.registerLanguage("dts",function(){"use strict";return function(e){var n={className:"string",variants:[e.inherit(e.QUOTE_STRING_MODE,{begin:'((u8?|U)|L)?"'}),{begin:'(u8?|U)?R"',end:'"',contains:[e.BACKSLASH_ESCAPE]},{begin:"'\\\\?.",end:"'",illegal:"."}]},a={className:"number",variants:[{begin:"\\b(\\d+(\\.\\d*)?|\\.\\d+)(u|U|l|L|ul|UL|f|F)"},{begin:e.C_NUMBER_RE}],relevance:0},s={className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"if else elif endif define undef ifdef ifndef"},contains:[{begin:/\\\n/,relevance:0},{beginKeywords:"include",end:"$",keywords:{"meta-keyword":"include"},contains:[e.inherit(n,{className:"meta-string"}),{className:"meta-string",begin:"<",end:">",illegal:"\\n"}]},n,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},i={className:"variable",begin:"\\&[a-z\\d_]*\\b"},d={className:"meta-keyword",begin:"/[a-z][a-z\\d-]*/"},l={className:"symbol",begin:"^\\s*[a-zA-Z_][a-zA-Z\\d_]*:"},r={className:"params",begin:"<",end:">",contains:[a,i]},c={className:"class",begin:/[a-zA-Z_][a-zA-Z\d_@]*\s{/,end:/[{;=]/,returnBegin:!0,excludeEnd:!0};return{name:"Device Tree",keywords:"",contains:[{className:"class",begin:"/\\s*{",end:"};",relevance:10,contains:[i,d,l,c,r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,n]},i,d,l,c,r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,n,s,{begin:e.IDENT_RE+"::",keywords:""}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/dust.min.js b/vendor/assets/javascripts/highlightjs/languages/dust.min.js
index e7d5b0ca05..57896b00ce 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dust.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dust.min.js
@@ -1 +1 @@
-hljs.registerLanguage("dust",function(e){var t="if eq ne lt lte gt gte select default math sep";return{aliases:["dst"],cI:!0,sL:"xml",c:[{cN:"template-tag",b:/\{[#\/]/,e:/\}/,i:/;/,c:[{cN:"name",b:/[a-zA-Z\.-]+/,starts:{eW:!0,r:0,c:[e.QSM]}}]},{cN:"template-variable",b:/\{/,e:/\}/,i:/;/,k:t}]}});
\ No newline at end of file
+hljs.registerLanguage("dust",function(){"use strict";return function(e){return{name:"Dust",aliases:["dst"],case_insensitive:!0,subLanguage:"xml",contains:[{className:"template-tag",begin:/\{[#\/]/,end:/\}/,illegal:/;/,contains:[{className:"name",begin:/[a-zA-Z\.-]+/,starts:{endsWithParent:!0,relevance:0,contains:[e.QUOTE_STRING_MODE]}}]},{className:"template-variable",begin:/\{/,end:/\}/,illegal:/;/,keywords:"if eq ne lt lte gt gte select default math sep"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ebnf.min.js b/vendor/assets/javascripts/highlightjs/languages/ebnf.min.js
index af700f9808..2610d604f1 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ebnf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ebnf.min.js
@@ -1 +1 @@
-hljs.registerLanguage("ebnf",function(a){var e=a.C(/\(\*/,/\*\)/),t={cN:"attribute",b:/^[ ]*[a-zA-Z][a-zA-Z-]*([\s-]+[a-zA-Z][a-zA-Z]*)*/},r={cN:"meta",b:/\?.*\?/},b={b:/=/,e:/;/,c:[e,r,a.ASM,a.QSM]};return{i:/\S/,c:[e,t,b]}});
\ No newline at end of file
+hljs.registerLanguage("ebnf",function(){"use strict";return function(a){var e=a.COMMENT(/\(\*/,/\*\)/);return{name:"Extended Backus-Naur Form",illegal:/\S/,contains:[e,{className:"attribute",begin:/^[ ]*[a-zA-Z][a-zA-Z-_]*([\s-_]+[a-zA-Z][a-zA-Z]*)*/},{begin:/=/,end:/[.;]/,contains:[e,{className:"meta",begin:/\?.*\?/},{className:"string",variants:[a.APOS_STRING_MODE,a.QUOTE_STRING_MODE,{begin:"`",end:"`"}]}]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/elixir.min.js b/vendor/assets/javascripts/highlightjs/languages/elixir.min.js
index a3b15a7ea7..a4ad84d10e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/elixir.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/elixir.min.js
@@ -1 +1 @@
-hljs.registerLanguage("elixir",function(e){var r="[a-zA-Z_][a-zA-Z0-9_.]*(\\!|\\?)?",b="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",n="and false then defined module in return redo retry end for true self when next until do begin unless nil break not case cond alias while ensure or include use alias fn quote require import with|0",c={cN:"subst",b:"#\\{",e:"}",l:r,k:n},i={cN:"string",c:[e.BE,c],v:[{b:/'/,e:/'/},{b:/"/,e:/"/}]},a={cN:"function",bK:"def defp defmacro",e:/\B\b/,c:[e.inherit(e.TM,{b:r,endsParent:!0})]},l=e.inherit(a,{cN:"class",bK:"defimpl defmodule defprotocol defrecord",e:/\bdo\b|$|;/}),s=[i,e.HCM,l,a,{b:"::"},{cN:"symbol",b:":(?![\\s:])",c:[i,{b:b}],r:0},{cN:"symbol",b:r+":(?!:)",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"->"},{b:"("+e.RSR+")\\s*",c:[e.HCM,{cN:"regexp",i:"\\n",c:[e.BE,c],v:[{b:"/",e:"/[a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}],r:0}];return c.c=s,{l:r,k:n,c:s}});
\ No newline at end of file
+hljs.registerLanguage("elixir",function(){"use strict";return function(e){var n="[a-zA-Z_][a-zA-Z0-9_.]*(\\!|\\?)?",i={$pattern:n,keyword:"and false then defined module in return redo retry end for true self when next until do begin unless nil break not case cond alias while ensure or include use alias fn quote require import with|0"},a={className:"subst",begin:"#\\{",end:"}",keywords:i},s={className:"number",begin:"(\\b0o[0-7_]+)|(\\b0b[01_]+)|(\\b0x[0-9a-fA-F_]+)|(-?\\b[1-9][0-9_]*(.[0-9_]+([eE][-+]?[0-9]+)?)?)",relevance:0},b={className:"string",begin:"~[a-z](?=[/|([{<\"'])",contains:[{endsParent:!0,contains:[{contains:[e.BACKSLASH_ESCAPE,a],variants:[{begin:/"/,end:/"/},{begin:/'/,end:/'/},{begin:/\//,end:/\//},{begin:/\|/,end:/\|/},{begin:/\(/,end:/\)/},{begin:/\[/,end:/\]/},{begin:/\{/,end:/\}/},{begin:/</,end:/>/}]}]}]},d={className:"string",contains:[e.BACKSLASH_ESCAPE,a],variants:[{begin:/"""/,end:/"""/},{begin:/'''/,end:/'''/},{begin:/~S"""/,end:/"""/,contains:[]},{begin:/~S"/,end:/"/,contains:[]},{begin:/~S'''/,end:/'''/,contains:[]},{begin:/~S'/,end:/'/,contains:[]},{begin:/'/,end:/'/},{begin:/"/,end:/"/}]},r={className:"function",beginKeywords:"def defp defmacro",end:/\B\b/,contains:[e.inherit(e.TITLE_MODE,{begin:n,endsParent:!0})]},g=e.inherit(r,{className:"class",beginKeywords:"defimpl defmodule defprotocol defrecord",end:/\bdo\b|$|;/}),t=[d,{className:"string",begin:"~[A-Z](?=[/|([{<\"'])",contains:[{begin:/"/,end:/"/},{begin:/'/,end:/'/},{begin:/\//,end:/\//},{begin:/\|/,end:/\|/},{begin:/\(/,end:/\)/},{begin:/\[/,end:/\]/},{begin:/\{/,end:/\}/},{begin:/\</,end:/\>/}]},b,e.HASH_COMMENT_MODE,g,r,{begin:"::"},{className:"symbol",begin:":(?![\\s:])",contains:[d,{begin:"[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?"}],relevance:0},{className:"symbol",begin:n+":(?!:)",relevance:0},s,{className:"variable",begin:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{begin:"->"},{begin:"("+e.RE_STARTERS_RE+")\\s*",contains:[e.HASH_COMMENT_MODE,{begin:/\/: (?=\d+\s*[,\]])/,relevance:0,contains:[s]},{className:"regexp",illegal:"\\n",contains:[e.BACKSLASH_ESCAPE,a],variants:[{begin:"/",end:"/[a-z]*"},{begin:"%r\\[",end:"\\][a-z]*"}]}],relevance:0}];return a.contains=t,{name:"Elixir",keywords:i,contains:t}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/elm.min.js b/vendor/assets/javascripts/highlightjs/languages/elm.min.js
index bb98a437e7..61eeb765c6 100644
--- a/vendor/assets/javascripts/highlightjs/languages/elm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/elm.min.js
@@ -1 +1 @@
-hljs.registerLanguage("elm",function(e){var i={v:[e.C("--","$"),e.C("{-","-}",{c:["self"]})]},t={cN:"type",b:"\\b[A-Z][\\w']*",r:0},c={b:"\\(",e:"\\)",i:'"',c:[{cN:"type",b:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},i]},n={b:"{",e:"}",c:c.c},r={cN:"string",b:"'\\\\?.",e:"'",i:"."};return{k:"let in if then else case of where module import exposing type alias as infix infixl infixr port effect command subscription",c:[{bK:"port effect module",e:"exposing",k:"port effect module where command subscription exposing",c:[c,i],i:"\\W\\.|;"},{b:"import",e:"$",k:"import as exposing",c:[c,i],i:"\\W\\.|;"},{b:"type",e:"$",k:"type alias",c:[t,c,n,i]},{bK:"infix infixl infixr",e:"$",c:[e.CNM,i]},{b:"port",e:"$",k:"port",c:[i]},r,e.QSM,e.CNM,t,e.inherit(e.TM,{b:"^[_a-z][\\w']*"}),i,{b:"->|<-"}],i:/;/}});
\ No newline at end of file
+hljs.registerLanguage("elm",function(){"use strict";return function(e){var n={variants:[e.COMMENT("--","$"),e.COMMENT("{-","-}",{contains:["self"]})]},i={className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},s={begin:"\\(",end:"\\)",illegal:'"',contains:[{className:"type",begin:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},n]};return{name:"Elm",keywords:"let in if then else case of where module import exposing type alias as infix infixl infixr port effect command subscription",contains:[{beginKeywords:"port effect module",end:"exposing",keywords:"port effect module where command subscription exposing",contains:[s,n],illegal:"\\W\\.|;"},{begin:"import",end:"$",keywords:"import as exposing",contains:[s,n],illegal:"\\W\\.|;"},{begin:"type",end:"$",keywords:"type alias",contains:[i,s,{begin:"{",end:"}",contains:s.contains},n]},{beginKeywords:"infix infixl infixr",end:"$",contains:[e.C_NUMBER_MODE,n]},{begin:"port",end:"$",keywords:"port",contains:[n]},{className:"string",begin:"'\\\\?.",end:"'",illegal:"."},e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,i,e.inherit(e.TITLE_MODE,{begin:"^[_a-z][\\w']*"}),n,{begin:"->|<-"}],illegal:/;/}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/erb.min.js b/vendor/assets/javascripts/highlightjs/languages/erb.min.js
index a77c7a2734..f6f09f120a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/erb.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/erb.min.js
@@ -1 +1 @@
-hljs.registerLanguage("erb",function(e){return{sL:"xml",c:[e.C("<%#","%>"),{b:"<%[%=-]?",e:"[%-]?%>",sL:"ruby",eB:!0,eE:!0}]}});
\ No newline at end of file
+hljs.registerLanguage("erb",function(){"use strict";return function(e){return{name:"ERB",subLanguage:"xml",contains:[e.COMMENT("<%#","%>"),{begin:"<%[%=-]?",end:"[%-]?%>",subLanguage:"ruby",excludeBegin:!0,excludeEnd:!0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/erlang-repl.min.js b/vendor/assets/javascripts/highlightjs/languages/erlang-repl.min.js
index 4799733c40..0289bf52e3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/erlang-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/erlang-repl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("erlang-repl",function(e){return{k:{built_in:"spawn spawn_link self",keyword:"after and andalso|10 band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse|10 query receive rem try when xor"},c:[{cN:"meta",b:"^[0-9]+> ",r:10},e.C("%","$"),{cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",r:0},e.ASM,e.QSM,{b:"\\?(::)?([A-Z]\\w*(::)?)+"},{b:"->"},{b:"ok"},{b:"!"},{b:"(\\b[a-z'][a-zA-Z0-9_']*:[a-z'][a-zA-Z0-9_']*)|(\\b[a-z'][a-zA-Z0-9_']*)",r:0},{b:"[A-Z][a-zA-Z0-9_']*",r:0}]}});
\ No newline at end of file
+hljs.registerLanguage("erlang-repl",function(){"use strict";return function(e){return{name:"Erlang REPL",keywords:{built_in:"spawn spawn_link self",keyword:"after and andalso|10 band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse|10 query receive rem try when xor"},contains:[{className:"meta",begin:"^[0-9]+> ",relevance:10},e.COMMENT("%","$"),{className:"number",begin:"\\b(\\d+(_\\d+)*#[a-fA-F0-9]+(_[a-fA-F0-9]+)*|\\d+(_\\d+)*(\\.\\d+(_\\d+)*)?([eE][-+]?\\d+)?)",relevance:0},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{begin:"\\?(::)?([A-Z]\\w*(::)?)+"},{begin:"->"},{begin:"ok"},{begin:"!"},{begin:"(\\b[a-z'][a-zA-Z0-9_']*:[a-z'][a-zA-Z0-9_']*)|(\\b[a-z'][a-zA-Z0-9_']*)",relevance:0},{begin:"[A-Z][a-zA-Z0-9_']*",relevance:0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/erlang.min.js b/vendor/assets/javascripts/highlightjs/languages/erlang.min.js
index 38ced08c9a..3ab6a9cb8a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/erlang.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/erlang.min.js
@@ -1 +1 @@
-hljs.registerLanguage("erlang",function(e){var r="[a-z'][a-zA-Z0-9_']*",c="("+r+":"+r+"|"+r+")",b={keyword:"after and andalso|10 band begin bnot bor bsl bzr bxor case catch cond div end fun if let not of orelse|10 query receive rem try when xor",literal:"false true"},i=e.C("%","$"),n={cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",r:0},a={b:"fun\\s+"+r+"/\\d+"},d={b:c+"\\(",e:"\\)",rB:!0,r:0,c:[{b:c,r:0},{b:"\\(",e:"\\)",eW:!0,rE:!0,r:0}]},o={b:"{",e:"}",r:0},t={b:"\\b_([A-Z][A-Za-z0-9_]*)?",r:0},f={b:"[A-Z][a-zA-Z0-9_]*",r:0},l={b:"#"+e.UIR,r:0,rB:!0,c:[{b:"#"+e.UIR,r:0},{b:"{",e:"}",r:0}]},s={bK:"fun receive if try case",e:"end",k:b};s.c=[i,a,e.inherit(e.ASM,{cN:""}),s,d,e.QSM,n,o,t,f,l];var u=[i,a,s,d,e.QSM,n,o,t,f,l];d.c[1].c=u,o.c=u,l.c[1].c=u;var h={cN:"params",b:"\\(",e:"\\)",c:u};return{aliases:["erl"],k:b,i:"(</|\\*=|\\+=|-=|/\\*|\\*/|\\(\\*|\\*\\))",c:[{cN:"function",b:"^"+r+"\\s*\\(",e:"->",rB:!0,i:"\\(|#|//|/\\*|\\\\|:|;",c:[h,e.inherit(e.TM,{b:r})],starts:{e:";|\\.",k:b,c:u}},i,{b:"^-",e:"\\.",r:0,eE:!0,rB:!0,l:"-"+e.IR,k:"-module -record -undef -export -ifdef -ifndef -author -copyright -doc -vsn -import -include -include_lib -compile -define -else -endif -file -behaviour -behavior -spec",c:[h]},n,e.QSM,l,t,f,o,{b:/\.$/}]}});
\ No newline at end of file
+hljs.registerLanguage("erlang",function(){"use strict";return function(e){var n="[a-z'][a-zA-Z0-9_']*",r="("+n+":"+n+"|"+n+")",a={keyword:"after and andalso|10 band begin bnot bor bsl bzr bxor case catch cond div end fun if let not of orelse|10 query receive rem try when xor",literal:"false true"},i=e.COMMENT("%","$"),c={className:"number",begin:"\\b(\\d+(_\\d+)*#[a-fA-F0-9]+(_[a-fA-F0-9]+)*|\\d+(_\\d+)*(\\.\\d+(_\\d+)*)?([eE][-+]?\\d+)?)",relevance:0},s={begin:"fun\\s+"+n+"/\\d+"},t={begin:r+"\\(",end:"\\)",returnBegin:!0,relevance:0,contains:[{begin:r,relevance:0},{begin:"\\(",end:"\\)",endsWithParent:!0,returnEnd:!0,relevance:0}]},d={begin:"{",end:"}",relevance:0},o={begin:"\\b_([A-Z][A-Za-z0-9_]*)?",relevance:0},l={begin:"[A-Z][a-zA-Z0-9_]*",relevance:0},b={begin:"#"+e.UNDERSCORE_IDENT_RE,relevance:0,returnBegin:!0,contains:[{begin:"#"+e.UNDERSCORE_IDENT_RE,relevance:0},{begin:"{",end:"}",relevance:0}]},g={beginKeywords:"fun receive if try case",end:"end",keywords:a};g.contains=[i,s,e.inherit(e.APOS_STRING_MODE,{className:""}),g,t,e.QUOTE_STRING_MODE,c,d,o,l,b];var u=[i,s,g,t,e.QUOTE_STRING_MODE,c,d,o,l,b];t.contains[1].contains=u,d.contains=u,b.contains[1].contains=u;var E={className:"params",begin:"\\(",end:"\\)",contains:u};return{name:"Erlang",aliases:["erl"],keywords:a,illegal:"(</|\\*=|\\+=|-=|/\\*|\\*/|\\(\\*|\\*\\))",contains:[{className:"function",begin:"^"+n+"\\s*\\(",end:"->",returnBegin:!0,illegal:"\\(|#|//|/\\*|\\\\|:|;",contains:[E,e.inherit(e.TITLE_MODE,{begin:n})],starts:{end:";|\\.",keywords:a,contains:u}},i,{begin:"^-",end:"\\.",relevance:0,excludeEnd:!0,returnBegin:!0,keywords:{$pattern:"-"+e.IDENT_RE,keyword:"-module -record -undef -export -ifdef -ifndef -author -copyright -doc -vsn -import -include -include_lib -compile -define -else -endif -file -behaviour -behavior -spec"},contains:[E]},c,e.QUOTE_STRING_MODE,b,o,l,d,{begin:/\.$/}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/excel.min.js b/vendor/assets/javascripts/highlightjs/languages/excel.min.js
index c023dadba5..88f1939ebf 100644
--- a/vendor/assets/javascripts/highlightjs/languages/excel.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/excel.min.js
@@ -1 +1 @@
-hljs.registerLanguage("excel",function(E){return{aliases:["xlsx","xls"],cI:!0,l:/[a-zA-Z][\w\.]*/,k:{built_in:"ABS ACCRINT ACCRINTM ACOS ACOSH ACOT ACOTH AGGREGATE ADDRESS AMORDEGRC AMORLINC AND ARABIC AREAS ASC ASIN ASINH ATAN ATAN2 ATANH AVEDEV AVERAGE AVERAGEA AVERAGEIF AVERAGEIFS BAHTTEXT BASE BESSELI BESSELJ BESSELK BESSELY BETADIST BETA.DIST BETAINV BETA.INV BIN2DEC BIN2HEX BIN2OCT BINOMDIST BINOM.DIST BINOM.DIST.RANGE BINOM.INV BITAND BITLSHIFT BITOR BITRSHIFT BITXOR CALL CEILING CEILING.MATH CEILING.PRECISE CELL CHAR CHIDIST CHIINV CHITEST CHISQ.DIST CHISQ.DIST.RT CHISQ.INV CHISQ.INV.RT CHISQ.TEST CHOOSE CLEAN CODE COLUMN COLUMNS COMBIN COMBINA COMPLEX CONCAT CONCATENATE CONFIDENCE CONFIDENCE.NORM CONFIDENCE.T CONVERT CORREL COS COSH COT COTH COUNT COUNTA COUNTBLANK COUNTIF COUNTIFS COUPDAYBS COUPDAYS COUPDAYSNC COUPNCD COUPNUM COUPPCD COVAR COVARIANCE.P COVARIANCE.S CRITBINOM CSC CSCH CUBEKPIMEMBER CUBEMEMBER CUBEMEMBERPROPERTY CUBERANKEDMEMBER CUBESET CUBESETCOUNT CUBEVALUE CUMIPMT CUMPRINC DATE DATEDIF DATEVALUE DAVERAGE DAY DAYS DAYS360 DB DBCS DCOUNT DCOUNTA DDB DEC2BIN DEC2HEX DEC2OCT DECIMAL DEGREES DELTA DEVSQ DGET DISC DMAX DMIN DOLLAR DOLLARDE DOLLARFR DPRODUCT DSTDEV DSTDEVP DSUM DURATION DVAR DVARP EDATE EFFECT ENCODEURL EOMONTH ERF ERF.PRECISE ERFC ERFC.PRECISE ERROR.TYPE EUROCONVERT EVEN EXACT EXP EXPON.DIST EXPONDIST FACT FACTDOUBLE FALSE|0 F.DIST FDIST F.DIST.RT FILTERXML FIND FINDB F.INV F.INV.RT FINV FISHER FISHERINV FIXED FLOOR FLOOR.MATH FLOOR.PRECISE FORECAST FORECAST.ETS FORECAST.ETS.CONFINT FORECAST.ETS.SEASONALITY FORECAST.ETS.STAT FORECAST.LINEAR FORMULATEXT FREQUENCY F.TEST FTEST FV FVSCHEDULE GAMMA GAMMA.DIST GAMMADIST GAMMA.INV GAMMAINV GAMMALN GAMMALN.PRECISE GAUSS GCD GEOMEAN GESTEP GETPIVOTDATA GROWTH HARMEAN HEX2BIN HEX2DEC HEX2OCT HLOOKUP HOUR HYPERLINK HYPGEOM.DIST HYPGEOMDIST IF|0 IFERROR IFNA IFS IMABS IMAGINARY IMARGUMENT IMCONJUGATE IMCOS IMCOSH IMCOT IMCSC IMCSCH IMDIV IMEXP IMLN IMLOG10 IMLOG2 IMPOWER IMPRODUCT IMREAL IMSEC IMSECH IMSIN IMSINH IMSQRT IMSUB IMSUM IMTAN INDEX INDIRECT INFO INT INTERCEPT INTRATE IPMT IRR ISBLANK ISERR ISERROR ISEVEN ISFORMULA ISLOGICAL ISNA ISNONTEXT ISNUMBER ISODD ISREF ISTEXT ISO.CEILING ISOWEEKNUM ISPMT JIS KURT LARGE LCM LEFT LEFTB LEN LENB LINEST LN LOG LOG10 LOGEST LOGINV LOGNORM.DIST LOGNORMDIST LOGNORM.INV LOOKUP LOWER MATCH MAX MAXA MAXIFS MDETERM MDURATION MEDIAN MID MIDBs MIN MINIFS MINA MINUTE MINVERSE MIRR MMULT MOD MODE MODE.MULT MODE.SNGL MONTH MROUND MULTINOMIAL MUNIT N NA NEGBINOM.DIST NEGBINOMDIST NETWORKDAYS NETWORKDAYS.INTL NOMINAL NORM.DIST NORMDIST NORMINV NORM.INV NORM.S.DIST NORMSDIST NORM.S.INV NORMSINV NOT NOW NPER NPV NUMBERVALUE OCT2BIN OCT2DEC OCT2HEX ODD ODDFPRICE ODDFYIELD ODDLPRICE ODDLYIELD OFFSET OR PDURATION PEARSON PERCENTILE.EXC PERCENTILE.INC PERCENTILE PERCENTRANK.EXC PERCENTRANK.INC PERCENTRANK PERMUT PERMUTATIONA PHI PHONETIC PI PMT POISSON.DIST POISSON POWER PPMT PRICE PRICEDISC PRICEMAT PROB PRODUCT PROPER PV QUARTILE QUARTILE.EXC QUARTILE.INC QUOTIENT RADIANS RAND RANDBETWEEN RANK.AVG RANK.EQ RANK RATE RECEIVED REGISTER.ID REPLACE REPLACEB REPT RIGHT RIGHTB ROMAN ROUND ROUNDDOWN ROUNDUP ROW ROWS RRI RSQ RTD SEARCH SEARCHB SEC SECH SECOND SERIESSUM SHEET SHEETS SIGN SIN SINH SKEW SKEW.P SLN SLOPE SMALL SQL.REQUEST SQRT SQRTPI STANDARDIZE STDEV STDEV.P STDEV.S STDEVA STDEVP STDEVPA STEYX SUBSTITUTE SUBTOTAL SUM SUMIF SUMIFS SUMPRODUCT SUMSQ SUMX2MY2 SUMX2PY2 SUMXMY2 SWITCH SYD T TAN TANH TBILLEQ TBILLPRICE TBILLYIELD T.DIST T.DIST.2T T.DIST.RT TDIST TEXT TEXTJOIN TIME TIMEVALUE T.INV T.INV.2T TINV TODAY TRANSPOSE TREND TRIM TRIMMEAN TRUE|0 TRUNC T.TEST TTEST TYPE UNICHAR UNICODE UPPER VALUE VAR VAR.P VAR.S VARA VARP VARPA VDB VLOOKUP WEBSERVICE WEEKDAY WEEKNUM WEIBULL WEIBULL.DIST WORKDAY WORKDAY.INTL XIRR XNPV XOR YEAR YEARFRAC YIELD YIELDDISC YIELDMAT Z.TEST ZTEST"},c:[{b:/^=/,e:/[^=]/,rE:!0,i:/=/,r:10},{cN:"symbol",b:/\b[A-Z]{1,2}\d+\b/,e:/[^\d]/,eE:!0,r:0},{cN:"symbol",b:/[A-Z]{0,2}\d*:[A-Z]{0,2}\d*/,r:0},E.BE,E.QSM,{cN:"number",b:E.NR+"(%)?",r:0},E.C(/\bN\(/,/\)/,{eB:!0,eE:!0,i:/\n/})]}});
\ No newline at end of file
+hljs.registerLanguage("excel",function(){"use strict";return function(E){return{name:"Excel formulae",aliases:["xlsx","xls"],case_insensitive:!0,keywords:{$pattern:/[a-zA-Z][\w\.]*/,built_in:"ABS ACCRINT ACCRINTM ACOS ACOSH ACOT ACOTH AGGREGATE ADDRESS AMORDEGRC AMORLINC AND ARABIC AREAS ASC ASIN ASINH ATAN ATAN2 ATANH AVEDEV AVERAGE AVERAGEA AVERAGEIF AVERAGEIFS BAHTTEXT BASE BESSELI BESSELJ BESSELK BESSELY BETADIST BETA.DIST BETAINV BETA.INV BIN2DEC BIN2HEX BIN2OCT BINOMDIST BINOM.DIST BINOM.DIST.RANGE BINOM.INV BITAND BITLSHIFT BITOR BITRSHIFT BITXOR CALL CEILING CEILING.MATH CEILING.PRECISE CELL CHAR CHIDIST CHIINV CHITEST CHISQ.DIST CHISQ.DIST.RT CHISQ.INV CHISQ.INV.RT CHISQ.TEST CHOOSE CLEAN CODE COLUMN COLUMNS COMBIN COMBINA COMPLEX CONCAT CONCATENATE CONFIDENCE CONFIDENCE.NORM CONFIDENCE.T CONVERT CORREL COS COSH COT COTH COUNT COUNTA COUNTBLANK COUNTIF COUNTIFS COUPDAYBS COUPDAYS COUPDAYSNC COUPNCD COUPNUM COUPPCD COVAR COVARIANCE.P COVARIANCE.S CRITBINOM CSC CSCH CUBEKPIMEMBER CUBEMEMBER CUBEMEMBERPROPERTY CUBERANKEDMEMBER CUBESET CUBESETCOUNT CUBEVALUE CUMIPMT CUMPRINC DATE DATEDIF DATEVALUE DAVERAGE DAY DAYS DAYS360 DB DBCS DCOUNT DCOUNTA DDB DEC2BIN DEC2HEX DEC2OCT DECIMAL DEGREES DELTA DEVSQ DGET DISC DMAX DMIN DOLLAR DOLLARDE DOLLARFR DPRODUCT DSTDEV DSTDEVP DSUM DURATION DVAR DVARP EDATE EFFECT ENCODEURL EOMONTH ERF ERF.PRECISE ERFC ERFC.PRECISE ERROR.TYPE EUROCONVERT EVEN EXACT EXP EXPON.DIST EXPONDIST FACT FACTDOUBLE FALSE|0 F.DIST FDIST F.DIST.RT FILTERXML FIND FINDB F.INV F.INV.RT FINV FISHER FISHERINV FIXED FLOOR FLOOR.MATH FLOOR.PRECISE FORECAST FORECAST.ETS FORECAST.ETS.CONFINT FORECAST.ETS.SEASONALITY FORECAST.ETS.STAT FORECAST.LINEAR FORMULATEXT FREQUENCY F.TEST FTEST FV FVSCHEDULE GAMMA GAMMA.DIST GAMMADIST GAMMA.INV GAMMAINV GAMMALN GAMMALN.PRECISE GAUSS GCD GEOMEAN GESTEP GETPIVOTDATA GROWTH HARMEAN HEX2BIN HEX2DEC HEX2OCT HLOOKUP HOUR HYPERLINK HYPGEOM.DIST HYPGEOMDIST IF IFERROR IFNA IFS IMABS IMAGINARY IMARGUMENT IMCONJUGATE IMCOS IMCOSH IMCOT IMCSC IMCSCH IMDIV IMEXP IMLN IMLOG10 IMLOG2 IMPOWER IMPRODUCT IMREAL IMSEC IMSECH IMSIN IMSINH IMSQRT IMSUB IMSUM IMTAN INDEX INDIRECT INFO INT INTERCEPT INTRATE IPMT IRR ISBLANK ISERR ISERROR ISEVEN ISFORMULA ISLOGICAL ISNA ISNONTEXT ISNUMBER ISODD ISREF ISTEXT ISO.CEILING ISOWEEKNUM ISPMT JIS KURT LARGE LCM LEFT LEFTB LEN LENB LINEST LN LOG LOG10 LOGEST LOGINV LOGNORM.DIST LOGNORMDIST LOGNORM.INV LOOKUP LOWER MATCH MAX MAXA MAXIFS MDETERM MDURATION MEDIAN MID MIDBs MIN MINIFS MINA MINUTE MINVERSE MIRR MMULT MOD MODE MODE.MULT MODE.SNGL MONTH MROUND MULTINOMIAL MUNIT N NA NEGBINOM.DIST NEGBINOMDIST NETWORKDAYS NETWORKDAYS.INTL NOMINAL NORM.DIST NORMDIST NORMINV NORM.INV NORM.S.DIST NORMSDIST NORM.S.INV NORMSINV NOT NOW NPER NPV NUMBERVALUE OCT2BIN OCT2DEC OCT2HEX ODD ODDFPRICE ODDFYIELD ODDLPRICE ODDLYIELD OFFSET OR PDURATION PEARSON PERCENTILE.EXC PERCENTILE.INC PERCENTILE PERCENTRANK.EXC PERCENTRANK.INC PERCENTRANK PERMUT PERMUTATIONA PHI PHONETIC PI PMT POISSON.DIST POISSON POWER PPMT PRICE PRICEDISC PRICEMAT PROB PRODUCT PROPER PV QUARTILE QUARTILE.EXC QUARTILE.INC QUOTIENT RADIANS RAND RANDBETWEEN RANK.AVG RANK.EQ RANK RATE RECEIVED REGISTER.ID REPLACE REPLACEB REPT RIGHT RIGHTB ROMAN ROUND ROUNDDOWN ROUNDUP ROW ROWS RRI RSQ RTD SEARCH SEARCHB SEC SECH SECOND SERIESSUM SHEET SHEETS SIGN SIN SINH SKEW SKEW.P SLN SLOPE SMALL SQL.REQUEST SQRT SQRTPI STANDARDIZE STDEV STDEV.P STDEV.S STDEVA STDEVP STDEVPA STEYX SUBSTITUTE SUBTOTAL SUM SUMIF SUMIFS SUMPRODUCT SUMSQ SUMX2MY2 SUMX2PY2 SUMXMY2 SWITCH SYD T TAN TANH TBILLEQ TBILLPRICE TBILLYIELD T.DIST T.DIST.2T T.DIST.RT TDIST TEXT TEXTJOIN TIME TIMEVALUE T.INV T.INV.2T TINV TODAY TRANSPOSE TREND TRIM TRIMMEAN TRUE|0 TRUNC T.TEST TTEST TYPE UNICHAR UNICODE UPPER VALUE VAR VAR.P VAR.S VARA VARP VARPA VDB VLOOKUP WEBSERVICE WEEKDAY WEEKNUM WEIBULL WEIBULL.DIST WORKDAY WORKDAY.INTL XIRR XNPV XOR YEAR YEARFRAC YIELD YIELDDISC YIELDMAT Z.TEST ZTEST"},contains:[{begin:/^=/,end:/[^=]/,returnEnd:!0,illegal:/=/,relevance:10},{className:"symbol",begin:/\b[A-Z]{1,2}\d+\b/,end:/[^\d]/,excludeEnd:!0,relevance:0},{className:"symbol",begin:/[A-Z]{0,2}\d*:[A-Z]{0,2}\d*/,relevance:0},E.BACKSLASH_ESCAPE,E.QUOTE_STRING_MODE,{className:"number",begin:E.NUMBER_RE+"(%)?",relevance:0},E.COMMENT(/\bN\(/,/\)/,{excludeBegin:!0,excludeEnd:!0,illegal:/\n/})]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/fix.min.js b/vendor/assets/javascripts/highlightjs/languages/fix.min.js
index f07d5bbd78..0474876a72 100644
--- a/vendor/assets/javascripts/highlightjs/languages/fix.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/fix.min.js
@@ -1 +1 @@
-hljs.registerLanguage("fix",function(u){return{c:[{b:/[^\u2401\u0001]+/,e:/[\u2401\u0001]/,eE:!0,rB:!0,rE:!1,c:[{b:/([^\u2401\u0001=]+)/,e:/=([^\u2401\u0001=]+)/,rE:!0,rB:!1,cN:"attr"},{b:/=/,e:/([\u2401\u0001])/,eE:!0,eB:!0,cN:"string"}]}],cI:!0}});
\ No newline at end of file
+hljs.registerLanguage("fix",function(){"use strict";return function(n){return{name:"FIX",contains:[{begin:/[^\u2401\u0001]+/,end:/[\u2401\u0001]/,excludeEnd:!0,returnBegin:!0,returnEnd:!1,contains:[{begin:/([^\u2401\u0001=]+)/,end:/=([^\u2401\u0001=]+)/,returnEnd:!0,returnBegin:!1,className:"attr"},{begin:/=/,end:/([\u2401\u0001])/,excludeEnd:!0,excludeBegin:!0,className:"string"}]}],case_insensitive:!0}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/flix.min.js b/vendor/assets/javascripts/highlightjs/languages/flix.min.js
index b4f320d0de..a8ef06d91b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/flix.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/flix.min.js
@@ -1 +1 @@
-hljs.registerLanguage("flix",function(e){var t={cN:"string",b:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},i={cN:"string",v:[{b:'"',e:'"'}]},n={cN:"title",b:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/},c={cN:"function",bK:"def",e:/[:={\[(\n;]/,eE:!0,c:[n]};return{k:{literal:"true false",keyword:"case class def else enum if impl import in lat rel index let match namespace switch type yield with"},c:[e.CLCM,e.CBCM,t,i,c,e.CNM]}});
\ No newline at end of file
+hljs.registerLanguage("flix",function(){"use strict";return function(e){return{name:"Flix",keywords:{literal:"true false",keyword:"case class def else enum if impl import in lat rel index let match namespace switch type yield with"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"string",begin:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},{className:"string",variants:[{begin:'"',end:'"'}]},{className:"function",beginKeywords:"def",end:/[:={\[(\n;]/,excludeEnd:!0,contains:[{className:"title",begin:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/}]},e.C_NUMBER_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/fortran.min.js b/vendor/assets/javascripts/highlightjs/languages/fortran.min.js
index 1bea831365..d17f2be3d1 100644
--- a/vendor/assets/javascripts/highlightjs/languages/fortran.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/fortran.min.js
@@ -1 +1 @@
-hljs.registerLanguage("fortran",function(e){var t={cN:"params",b:"\\(",e:"\\)"},n={literal:".False. .True.",keyword:"kind do while private call intrinsic where elsewhere type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then public subroutine|10 function program .and. .or. .not. .le. .eq. .ge. .gt. .lt. goto save else use module select case access blank direct exist file fmt form formatted iostat name named nextrec number opened rec recl sequential status unformatted unit continue format pause cycle exit c_null_char c_alert c_backspace c_form_feed flush wait decimal round iomsg synchronous nopass non_overridable pass protected volatile abstract extends import non_intrinsic value deferred generic final enumerator class associate bind enum c_int c_short c_long c_long_long c_signed_char c_size_t c_int8_t c_int16_t c_int32_t c_int64_t c_int_least8_t c_int_least16_t c_int_least32_t c_int_least64_t c_int_fast8_t c_int_fast16_t c_int_fast32_t c_int_fast64_t c_intmax_t C_intptr_t c_float c_double c_long_double c_float_complex c_double_complex c_long_double_complex c_bool c_char c_null_ptr c_null_funptr c_new_line c_carriage_return c_horizontal_tab c_vertical_tab iso_c_binding c_loc c_funloc c_associated  c_f_pointer c_ptr c_funptr iso_fortran_env character_storage_size error_unit file_storage_size input_unit iostat_end iostat_eor numeric_storage_size output_unit c_f_procpointer ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode newunit contiguous recursive pad position action delim readwrite eor advance nml interface procedure namelist include sequence elemental pure integer real character complex logical dimension allocatable|10 parameter external implicit|10 none double precision assign intent optional pointer target in out common equivalence data",built_in:"alog alog10 amax0 amax1 amin0 amin1 amod cabs ccos cexp clog csin csqrt dabs dacos dasin datan datan2 dcos dcosh ddim dexp dint dlog dlog10 dmax1 dmin1 dmod dnint dsign dsin dsinh dsqrt dtan dtanh float iabs idim idint idnint ifix isign max0 max1 min0 min1 sngl algama cdabs cdcos cdexp cdlog cdsin cdsqrt cqabs cqcos cqexp cqlog cqsin cqsqrt dcmplx dconjg derf derfc dfloat dgamma dimag dlgama iqint qabs qacos qasin qatan qatan2 qcmplx qconjg qcos qcosh qdim qerf qerfc qexp qgamma qimag qlgama qlog qlog10 qmax1 qmin1 qmod qnint qsign qsin qsinh qsqrt qtan qtanh abs acos aimag aint anint asin atan atan2 char cmplx conjg cos cosh exp ichar index int log log10 max min nint sign sin sinh sqrt tan tanh print write dim lge lgt lle llt mod nullify allocate deallocate adjustl adjustr all allocated any associated bit_size btest ceiling count cshift date_and_time digits dot_product eoshift epsilon exponent floor fraction huge iand ibclr ibits ibset ieor ior ishft ishftc lbound len_trim matmul maxexponent maxloc maxval merge minexponent minloc minval modulo mvbits nearest pack present product radix random_number random_seed range repeat reshape rrspacing scale scan selected_int_kind selected_real_kind set_exponent shape size spacing spread sum system_clock tiny transpose trim ubound unpack verify achar iachar transfer dble entry dprod cpu_time command_argument_count get_command get_command_argument get_environment_variable is_iostat_end ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode is_iostat_eor move_alloc new_line selected_char_kind same_type_as extends_type_ofacosh asinh atanh bessel_j0 bessel_j1 bessel_jn bessel_y0 bessel_y1 bessel_yn erf erfc erfc_scaled gamma log_gamma hypot norm2 atomic_define atomic_ref execute_command_line leadz trailz storage_size merge_bits bge bgt ble blt dshiftl dshiftr findloc iall iany iparity image_index lcobound ucobound maskl maskr num_images parity popcnt poppar shifta shiftl shiftr this_image"};return{cI:!0,aliases:["f90","f95"],k:n,i:/\/\*/,c:[e.inherit(e.ASM,{cN:"string",r:0}),e.inherit(e.QSM,{cN:"string",r:0}),{cN:"function",bK:"subroutine function program",i:"[${=\\n]",c:[e.UTM,t]},e.C("!","$",{r:0}),{cN:"number",b:"(?=\\b|\\+|\\-|\\.)(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*)(?:[de][+-]?\\d+)?\\b\\.?",r:0}]}});
\ No newline at end of file
+hljs.registerLanguage("fortran",function(){"use strict";return function(e){const n={variants:[e.COMMENT("!","$",{relevance:0}),e.COMMENT("^C","$",{relevance:0})]},a={className:"function",beginKeywords:"subroutine function program",illegal:"[${=\\n]",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",begin:"\\(",end:"\\)"}]};return{name:"Fortran",case_insensitive:!0,aliases:["f90","f95"],keywords:{literal:".False. .True.",keyword:"kind do concurrent local shared while private call intrinsic where elsewhere type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then block endblock endassociate public subroutine|10 function program .and. .or. .not. .le. .eq. .ge. .gt. .lt. goto save else use module select case access blank direct exist file fmt form formatted iostat name named nextrec number opened rec recl sequential status unformatted unit continue format pause cycle exit c_null_char c_alert c_backspace c_form_feed flush wait decimal round iomsg synchronous nopass non_overridable pass protected volatile abstract extends import non_intrinsic value deferred generic final enumerator class associate bind enum c_int c_short c_long c_long_long c_signed_char c_size_t c_int8_t c_int16_t c_int32_t c_int64_t c_int_least8_t c_int_least16_t c_int_least32_t c_int_least64_t c_int_fast8_t c_int_fast16_t c_int_fast32_t c_int_fast64_t c_intmax_t C_intptr_t c_float c_double c_long_double c_float_complex c_double_complex c_long_double_complex c_bool c_char c_null_ptr c_null_funptr c_new_line c_carriage_return c_horizontal_tab c_vertical_tab iso_c_binding c_loc c_funloc c_associated  c_f_pointer c_ptr c_funptr iso_fortran_env character_storage_size error_unit file_storage_size input_unit iostat_end iostat_eor numeric_storage_size output_unit c_f_procpointer ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode newunit contiguous recursive pad position action delim readwrite eor advance nml interface procedure namelist include sequence elemental pure impure integer real character complex logical codimension dimension allocatable|10 parameter external implicit|10 none double precision assign intent optional pointer target in out common equivalence data",built_in:"alog alog10 amax0 amax1 amin0 amin1 amod cabs ccos cexp clog csin csqrt dabs dacos dasin datan datan2 dcos dcosh ddim dexp dint dlog dlog10 dmax1 dmin1 dmod dnint dsign dsin dsinh dsqrt dtan dtanh float iabs idim idint idnint ifix isign max0 max1 min0 min1 sngl algama cdabs cdcos cdexp cdlog cdsin cdsqrt cqabs cqcos cqexp cqlog cqsin cqsqrt dcmplx dconjg derf derfc dfloat dgamma dimag dlgama iqint qabs qacos qasin qatan qatan2 qcmplx qconjg qcos qcosh qdim qerf qerfc qexp qgamma qimag qlgama qlog qlog10 qmax1 qmin1 qmod qnint qsign qsin qsinh qsqrt qtan qtanh abs acos aimag aint anint asin atan atan2 char cmplx conjg cos cosh exp ichar index int log log10 max min nint sign sin sinh sqrt tan tanh print write dim lge lgt lle llt mod nullify allocate deallocate adjustl adjustr all allocated any associated bit_size btest ceiling count cshift date_and_time digits dot_product eoshift epsilon exponent floor fraction huge iand ibclr ibits ibset ieor ior ishft ishftc lbound len_trim matmul maxexponent maxloc maxval merge minexponent minloc minval modulo mvbits nearest pack present product radix random_number random_seed range repeat reshape rrspacing scale scan selected_int_kind selected_real_kind set_exponent shape size spacing spread sum system_clock tiny transpose trim ubound unpack verify achar iachar transfer dble entry dprod cpu_time command_argument_count get_command get_command_argument get_environment_variable is_iostat_end ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode is_iostat_eor move_alloc new_line selected_char_kind same_type_as extends_type_of acosh asinh atanh bessel_j0 bessel_j1 bessel_jn bessel_y0 bessel_y1 bessel_yn erf erfc erfc_scaled gamma log_gamma hypot norm2 atomic_define atomic_ref execute_command_line leadz trailz storage_size merge_bits bge bgt ble blt dshiftl dshiftr findloc iall iany iparity image_index lcobound ucobound maskl maskr num_images parity popcnt poppar shifta shiftl shiftr this_image sync change team co_broadcast co_max co_min co_sum co_reduce"},illegal:/\/\*/,contains:[{className:"string",relevance:0,variants:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},a,{begin:/^C\s*=(?!=)/,relevance:0},n,{className:"number",begin:"(?=\\b|\\+|\\-|\\.)(?:\\.|\\d+\\.?)\\d*([de][+-]?\\d+)?(_[a-z_\\d]+)?",relevance:0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/fsharp.min.js b/vendor/assets/javascripts/highlightjs/languages/fsharp.min.js
index 2cafa53d84..c52d6fb044 100644
--- a/vendor/assets/javascripts/highlightjs/languages/fsharp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/fsharp.min.js
@@ -1 +1 @@
-hljs.registerLanguage("fsharp",function(e){var t={b:"<",e:">",c:[e.inherit(e.TM,{b:/'[a-zA-Z0-9_]+/})]};return{aliases:["fs"],k:"abstract and as assert base begin class default delegate do done downcast downto elif else end exception extern false finally for fun function global if in inherit inline interface internal lazy let match member module mutable namespace new null of open or override private public rec return sig static struct then to true try type upcast use val void when while with yield",i:/\/\*/,c:[{cN:"keyword",b:/\b(yield|return|let|do)!/},{cN:"string",b:'@"',e:'"',c:[{b:'""'}]},{cN:"string",b:'"""',e:'"""'},e.C("\\(\\*","\\*\\)"),{cN:"class",bK:"type",e:"\\(|=|$",eE:!0,c:[e.UTM,t]},{cN:"meta",b:"\\[<",e:">\\]",r:10},{cN:"symbol",b:"\\B('[A-Za-z])\\b",c:[e.BE]},e.CLCM,e.inherit(e.QSM,{i:null}),e.CNM]}});
\ No newline at end of file
+hljs.registerLanguage("fsharp",function(){"use strict";return function(e){var n={begin:"<",end:">",contains:[e.inherit(e.TITLE_MODE,{begin:/'[a-zA-Z0-9_]+/})]};return{name:"F#",aliases:["fs"],keywords:"abstract and as assert base begin class default delegate do done downcast downto elif else end exception extern false finally for fun function global if in inherit inline interface internal lazy let match member module mutable namespace new null of open or override private public rec return sig static struct then to true try type upcast use val void when while with yield",illegal:/\/\*/,contains:[{className:"keyword",begin:/\b(yield|return|let|do)!/},{className:"string",begin:'@"',end:'"',contains:[{begin:'""'}]},{className:"string",begin:'"""',end:'"""'},e.COMMENT("\\(\\*","\\*\\)"),{className:"class",beginKeywords:"type",end:"\\(|=|$",excludeEnd:!0,contains:[e.UNDERSCORE_TITLE_MODE,n]},{className:"meta",begin:"\\[<",end:">\\]",relevance:10},{className:"symbol",begin:"\\B('[A-Za-z])\\b",contains:[e.BACKSLASH_ESCAPE]},e.C_LINE_COMMENT_MODE,e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),e.C_NUMBER_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/gams.min.js b/vendor/assets/javascripts/highlightjs/languages/gams.min.js
index 652e69836e..a25e7316b3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gams.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gams.min.js
@@ -1 +1 @@
-hljs.registerLanguage("gams",function(e){var a={keyword:"abort acronym acronyms alias all and assign binary card diag display else eq file files for free ge gt if integer le loop lt maximizing minimizing model models ne negative no not option options or ord positive prod put putpage puttl repeat sameas semicont semiint smax smin solve sos1 sos2 sum system table then until using while xor yes",literal:"eps inf na","built-in":"abs arccos arcsin arctan arctan2 Beta betaReg binomial ceil centropy cos cosh cvPower div div0 eDist entropy errorf execSeed exp fact floor frac gamma gammaReg log logBeta logGamma log10 log2 mapVal max min mod ncpCM ncpF ncpVUpow ncpVUsin normal pi poly power randBinomial randLinear randTriangle round rPower sigmoid sign signPower sin sinh slexp sllog10 slrec sqexp sqlog10 sqr sqrec sqrt tan tanh trunc uniform uniformInt vcPower bool_and bool_eqv bool_imp bool_not bool_or bool_xor ifThen rel_eq rel_ge rel_gt rel_le rel_lt rel_ne gday gdow ghour gleap gmillisec gminute gmonth gsecond gyear jdate jnow jstart jtime errorLevel execError gamsRelease gamsVersion handleCollect handleDelete handleStatus handleSubmit heapFree heapLimit heapSize jobHandle jobKill jobStatus jobTerminate licenseLevel licenseStatus maxExecError sleep timeClose timeComp timeElapsed timeExec timeStart"},o={cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0},r={cN:"symbol",v:[{b:/\=[lgenxc]=/},{b:/\$/}]},t={cN:"comment",v:[{b:"'",e:"'"},{b:'"',e:'"'}],i:"\\n",c:[e.BE]},i={b:"/",e:"/",k:a,c:[t,e.CLCM,e.CBCM,e.QSM,e.ASM,e.CNM]},l={b:/[a-z][a-z0-9_]*(\([a-z0-9_, ]*\))?[ \t]+/,eB:!0,e:"$",eW:!0,c:[t,i,{cN:"comment",b:/([ ]*[a-z0-9&#*=?@>\\<:\-,()$\[\]_.{}!+%^]+)+/,r:0}]};return{aliases:["gms"],cI:!0,k:a,c:[e.C(/^\$ontext/,/^\$offtext/),{cN:"meta",b:"^\\$[a-z0-9]+",e:"$",rB:!0,c:[{cN:"meta-keyword",b:"^\\$[a-z0-9]+"}]},e.C("^\\*","$"),e.CLCM,e.CBCM,e.QSM,e.ASM,{bK:"set sets parameter parameters variable variables scalar scalars equation equations",e:";",c:[e.C("^\\*","$"),e.CLCM,e.CBCM,e.QSM,e.ASM,i,l]},{bK:"table",e:";",rB:!0,c:[{bK:"table",e:"$",c:[l]},e.C("^\\*","$"),e.CLCM,e.CBCM,e.QSM,e.ASM,e.CNM]},{cN:"function",b:/^[a-z][a-z0-9_,\-+' ()$]+\.{2}/,rB:!0,c:[{cN:"title",b:/^[a-z0-9_]+/},o,r]},e.CNM,r]}});
\ No newline at end of file
+hljs.registerLanguage("gams",function(){"use strict";return function(e){var a={keyword:"abort acronym acronyms alias all and assign binary card diag display else eq file files for free ge gt if integer le loop lt maximizing minimizing model models ne negative no not option options or ord positive prod put putpage puttl repeat sameas semicont semiint smax smin solve sos1 sos2 sum system table then until using while xor yes",literal:"eps inf na",built_in:"abs arccos arcsin arctan arctan2 Beta betaReg binomial ceil centropy cos cosh cvPower div div0 eDist entropy errorf execSeed exp fact floor frac gamma gammaReg log logBeta logGamma log10 log2 mapVal max min mod ncpCM ncpF ncpVUpow ncpVUsin normal pi poly power randBinomial randLinear randTriangle round rPower sigmoid sign signPower sin sinh slexp sllog10 slrec sqexp sqlog10 sqr sqrec sqrt tan tanh trunc uniform uniformInt vcPower bool_and bool_eqv bool_imp bool_not bool_or bool_xor ifThen rel_eq rel_ge rel_gt rel_le rel_lt rel_ne gday gdow ghour gleap gmillisec gminute gmonth gsecond gyear jdate jnow jstart jtime errorLevel execError gamsRelease gamsVersion handleCollect handleDelete handleStatus handleSubmit heapFree heapLimit heapSize jobHandle jobKill jobStatus jobTerminate licenseLevel licenseStatus maxExecError sleep timeClose timeComp timeElapsed timeExec timeStart"},n={className:"symbol",variants:[{begin:/\=[lgenxc]=/},{begin:/\$/}]},i={className:"comment",variants:[{begin:"'",end:"'"},{begin:'"',end:'"'}],illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},s={begin:"/",end:"/",keywords:a,contains:[i,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_NUMBER_MODE]},o={begin:/[a-z][a-z0-9_]*(\([a-z0-9_, ]*\))?[ \t]+/,excludeBegin:!0,end:"$",endsWithParent:!0,contains:[i,s,{className:"comment",begin:/([ ]*[a-z0-9&#*=?@>\\<:\-,()$\[\]_.{}!+%^]+)+/,relevance:0}]};return{name:"GAMS",aliases:["gms"],case_insensitive:!0,keywords:a,contains:[e.COMMENT(/^\$ontext/,/^\$offtext/),{className:"meta",begin:"^\\$[a-z0-9]+",end:"$",returnBegin:!0,contains:[{className:"meta-keyword",begin:"^\\$[a-z0-9]+"}]},e.COMMENT("^\\*","$"),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{beginKeywords:"set sets parameter parameters variable variables scalar scalars equation equations",end:";",contains:[e.COMMENT("^\\*","$"),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,s,o]},{beginKeywords:"table",end:";",returnBegin:!0,contains:[{beginKeywords:"table",end:"$",contains:[o]},e.COMMENT("^\\*","$"),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_NUMBER_MODE]},{className:"function",begin:/^[a-z][a-z0-9_,\-+' ()$]+\.{2}/,returnBegin:!0,contains:[{className:"title",begin:/^[a-z0-9_]+/},{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0},n]},e.C_NUMBER_MODE,n]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/gauss.min.js b/vendor/assets/javascripts/highlightjs/languages/gauss.min.js
index 698fe7116e..2364ef6a23 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gauss.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gauss.min.js
@@ -1 +1 @@
-hljs.registerLanguage("gauss",function(e){var t={keyword:"bool break call callexe checkinterrupt clear clearg closeall cls comlog compile continue create debug declare delete disable dlibrary dllcall do dos ed edit else elseif enable end endfor endif endp endo errorlog errorlogat expr external fn for format goto gosub graph if keyword let lib library line load loadarray loadexe loadf loadk loadm loadp loads loadx local locate loopnextindex lprint lpwidth lshow matrix msym ndpclex new open output outwidth plot plotsym pop prcsn print printdos proc push retp return rndcon rndmod rndmult rndseed run save saveall screen scroll setarray show sparse stop string struct system trace trap threadfor threadendfor threadbegin threadjoin threadstat threadend until use while winprint ne ge le gt lt and xor or not eq eqv",built_in:"abs acf aconcat aeye amax amean AmericanBinomCall AmericanBinomCall_Greeks AmericanBinomCall_ImpVol AmericanBinomPut AmericanBinomPut_Greeks AmericanBinomPut_ImpVol AmericanBSCall AmericanBSCall_Greeks AmericanBSCall_ImpVol AmericanBSPut AmericanBSPut_Greeks AmericanBSPut_ImpVol amin amult annotationGetDefaults annotationSetBkd annotationSetFont annotationSetLineColor annotationSetLineStyle annotationSetLineThickness annualTradingDays arccos arcsin areshape arrayalloc arrayindex arrayinit arraytomat asciiload asclabel astd astds asum atan atan2 atranspose axmargin balance band bandchol bandcholsol bandltsol bandrv bandsolpd bar base10 begwind besselj bessely beta box boxcox cdfBeta cdfBetaInv cdfBinomial cdfBinomialInv cdfBvn cdfBvn2 cdfBvn2e cdfCauchy cdfCauchyInv cdfChic cdfChii cdfChinc cdfChincInv cdfExp cdfExpInv cdfFc cdfFnc cdfFncInv cdfGam cdfGenPareto cdfHyperGeo cdfLaplace cdfLaplaceInv cdfLogistic cdfLogisticInv cdfmControlCreate cdfMvn cdfMvn2e cdfMvnce cdfMvne cdfMvt2e cdfMvtce cdfMvte cdfN cdfN2 cdfNc cdfNegBinomial cdfNegBinomialInv cdfNi cdfPoisson cdfPoissonInv cdfRayleigh cdfRayleighInv cdfTc cdfTci cdfTnc cdfTvn cdfWeibull cdfWeibullInv cdir ceil ChangeDir chdir chiBarSquare chol choldn cholsol cholup chrs close code cols colsf combinate combinated complex con cond conj cons ConScore contour conv convertsatostr convertstrtosa corrm corrms corrvc corrx corrxs cos cosh counts countwts crossprd crout croutp csrcol csrlin csvReadM csvReadSA cumprodc cumsumc curve cvtos datacreate datacreatecomplex datalist dataload dataloop dataopen datasave date datestr datestring datestrymd dayinyr dayofweek dbAddDatabase dbClose dbCommit dbCreateQuery dbExecQuery dbGetConnectOptions dbGetDatabaseName dbGetDriverName dbGetDrivers dbGetHostName dbGetLastErrorNum dbGetLastErrorText dbGetNumericalPrecPolicy dbGetPassword dbGetPort dbGetTableHeaders dbGetTables dbGetUserName dbHasFeature dbIsDriverAvailable dbIsOpen dbIsOpenError dbOpen dbQueryBindValue dbQueryClear dbQueryCols dbQueryExecPrepared dbQueryFetchAllM dbQueryFetchAllSA dbQueryFetchOneM dbQueryFetchOneSA dbQueryFinish dbQueryGetBoundValue dbQueryGetBoundValues dbQueryGetField dbQueryGetLastErrorNum dbQueryGetLastErrorText dbQueryGetLastInsertID dbQueryGetLastQuery dbQueryGetPosition dbQueryIsActive dbQueryIsForwardOnly dbQueryIsNull dbQueryIsSelect dbQueryIsValid dbQueryPrepare dbQueryRows dbQuerySeek dbQuerySeekFirst dbQuerySeekLast dbQuerySeekNext dbQuerySeekPrevious dbQuerySetForwardOnly dbRemoveDatabase dbRollback dbSetConnectOptions dbSetDatabaseName dbSetHostName dbSetNumericalPrecPolicy dbSetPort dbSetUserName dbTransaction DeleteFile delif delrows denseToSp denseToSpRE denToZero design det detl dfft dffti diag diagrv digamma doswin DOSWinCloseall DOSWinOpen dotfeq dotfeqmt dotfge dotfgemt dotfgt dotfgtmt dotfle dotflemt dotflt dotfltmt dotfne dotfnemt draw drop dsCreate dstat dstatmt dstatmtControlCreate dtdate dtday dttime dttodtv dttostr dttoutc dtvnormal dtvtodt dtvtoutc dummy dummybr dummydn eig eigh eighv eigv elapsedTradingDays endwind envget eof eqSolve eqSolvemt eqSolvemtControlCreate eqSolvemtOutCreate eqSolveset erf erfc erfccplx erfcplx error etdays ethsec etstr EuropeanBinomCall EuropeanBinomCall_Greeks EuropeanBinomCall_ImpVol EuropeanBinomPut EuropeanBinomPut_Greeks EuropeanBinomPut_ImpVol EuropeanBSCall EuropeanBSCall_Greeks EuropeanBSCall_ImpVol EuropeanBSPut EuropeanBSPut_Greeks EuropeanBSPut_ImpVol exctsmpl exec execbg exp extern eye fcheckerr fclearerr feq feqmt fflush fft ffti fftm fftmi fftn fge fgemt fgets fgetsa fgetsat fgetst fgt fgtmt fileinfo filesa fle flemt floor flt fltmt fmod fne fnemt fonts fopen formatcv formatnv fputs fputst fseek fstrerror ftell ftocv ftos ftostrC gamma gammacplx gammaii gausset gdaAppend gdaCreate gdaDStat gdaDStatMat gdaGetIndex gdaGetName gdaGetNames gdaGetOrders gdaGetType gdaGetTypes gdaGetVarInfo gdaIsCplx gdaLoad gdaPack gdaRead gdaReadByIndex gdaReadSome gdaReadSparse gdaReadStruct gdaReportVarInfo gdaSave gdaUpdate gdaUpdateAndPack gdaVars gdaWrite gdaWrite32 gdaWriteSome getarray getdims getf getGAUSShome getmatrix getmatrix4D getname getnamef getNextTradingDay getNextWeekDay getnr getorders getpath getPreviousTradingDay getPreviousWeekDay getRow getscalar3D getscalar4D getTrRow getwind glm gradcplx gradMT gradMTm gradMTT gradMTTm gradp graphprt graphset hasimag header headermt hess hessMT hessMTg hessMTgw hessMTm hessMTmw hessMTT hessMTTg hessMTTgw hessMTTm hessMTw hessp hist histf histp hsec imag indcv indexcat indices indices2 indicesf indicesfn indnv indsav integrate1d integrateControlCreate intgrat2 intgrat3 inthp1 inthp2 inthp3 inthp4 inthpControlCreate intquad1 intquad2 intquad3 intrleav intrleavsa intrsect intsimp inv invpd invswp iscplx iscplxf isden isinfnanmiss ismiss key keyav keyw lag lag1 lagn lapEighb lapEighi lapEighvb lapEighvi lapgEig lapgEigh lapgEighv lapgEigv lapgSchur lapgSvdcst lapgSvds lapgSvdst lapSvdcusv lapSvds lapSvdusv ldlp ldlsol linSolve listwise ln lncdfbvn lncdfbvn2 lncdfmvn lncdfn lncdfn2 lncdfnc lnfact lngammacplx lnpdfmvn lnpdfmvt lnpdfn lnpdft loadd loadstruct loadwind loess loessmt loessmtControlCreate log loglog logx logy lower lowmat lowmat1 ltrisol lu lusol machEpsilon make makevars makewind margin matalloc matinit mattoarray maxbytes maxc maxindc maxv maxvec mbesselei mbesselei0 mbesselei1 mbesseli mbesseli0 mbesseli1 meanc median mergeby mergevar minc minindc minv miss missex missrv moment momentd movingave movingaveExpwgt movingaveWgt nextindex nextn nextnevn nextwind ntos null null1 numCombinations ols olsmt olsmtControlCreate olsqr olsqr2 olsqrmt ones optn optnevn orth outtyp pacf packedToSp packr parse pause pdfCauchy pdfChi pdfExp pdfGenPareto pdfHyperGeo pdfLaplace pdfLogistic pdfn pdfPoisson pdfRayleigh pdfWeibull pi pinv pinvmt plotAddArrow plotAddBar plotAddBox plotAddHist plotAddHistF plotAddHistP plotAddPolar plotAddScatter plotAddShape plotAddTextbox plotAddTS plotAddXY plotArea plotBar plotBox plotClearLayout plotContour plotCustomLayout plotGetDefaults plotHist plotHistF plotHistP plotLayout plotLogLog plotLogX plotLogY plotOpenWindow plotPolar plotSave plotScatter plotSetAxesPen plotSetBar plotSetBarFill plotSetBarStacked plotSetBkdColor plotSetFill plotSetGrid plotSetLegend plotSetLineColor plotSetLineStyle plotSetLineSymbol plotSetLineThickness plotSetNewWindow plotSetTitle plotSetWhichYAxis plotSetXAxisShow plotSetXLabel plotSetXRange plotSetXTicInterval plotSetXTicLabel plotSetYAxisShow plotSetYLabel plotSetYRange plotSetZAxisShow plotSetZLabel plotSurface plotTS plotXY polar polychar polyeval polygamma polyint polymake polymat polymroot polymult polyroot pqgwin previousindex princomp printfm printfmt prodc psi putarray putf putvals pvCreate pvGetIndex pvGetParNames pvGetParVector pvLength pvList pvPack pvPacki pvPackm pvPackmi pvPacks pvPacksi pvPacksm pvPacksmi pvPutParVector pvTest pvUnpack QNewton QNewtonmt QNewtonmtControlCreate QNewtonmtOutCreate QNewtonSet QProg QProgmt QProgmtInCreate qqr qqre qqrep qr qre qrep qrsol qrtsol qtyr qtyre qtyrep quantile quantiled qyr qyre qyrep qz rank rankindx readr real reclassify reclassifyCuts recode recserar recsercp recserrc rerun rescale reshape rets rev rfft rffti rfftip rfftn rfftnp rfftp rndBernoulli rndBeta rndBinomial rndCauchy rndChiSquare rndCon rndCreateState rndExp rndGamma rndGeo rndGumbel rndHyperGeo rndi rndKMbeta rndKMgam rndKMi rndKMn rndKMnb rndKMp rndKMu rndKMvm rndLaplace rndLCbeta rndLCgam rndLCi rndLCn rndLCnb rndLCp rndLCu rndLCvm rndLogNorm rndMTu rndMVn rndMVt rndn rndnb rndNegBinomial rndp rndPoisson rndRayleigh rndStateSkip rndu rndvm rndWeibull rndWishart rotater round rows rowsf rref sampleData satostrC saved saveStruct savewind scale scale3d scalerr scalinfnanmiss scalmiss schtoc schur searchsourcepath seekr select selif seqa seqm setdif setdifsa setvars setvwrmode setwind shell shiftr sin singleindex sinh sleep solpd sortc sortcc sortd sorthc sorthcc sortind sortindc sortmc sortr sortrc spBiconjGradSol spChol spConjGradSol spCreate spDenseSubmat spDiagRvMat spEigv spEye spLDL spline spLU spNumNZE spOnes spreadSheetReadM spreadSheetReadSA spreadSheetWrite spScale spSubmat spToDense spTrTDense spTScalar spZeros sqpSolve sqpSolveMT sqpSolveMTControlCreate sqpSolveMTlagrangeCreate sqpSolveMToutCreate sqpSolveSet sqrt statements stdc stdsc stocv stof strcombine strindx strlen strput strrindx strsect strsplit strsplitPad strtodt strtof strtofcplx strtriml strtrimr strtrunc strtruncl strtruncpad strtruncr submat subscat substute subvec sumc sumr surface svd svd1 svd2 svdcusv svds svdusv sysstate tab tan tanh tempname time timedt timestr timeutc title tkf2eps tkf2ps tocart todaydt toeplitz token topolar trapchk trigamma trimr trunc type typecv typef union unionsa uniqindx uniqindxsa unique uniquesa upmat upmat1 upper utctodt utctodtv utrisol vals varCovMS varCovXS varget vargetl varmall varmares varput varputl vartypef vcm vcms vcx vcxs vec vech vecr vector vget view viewxyz vlist vnamecv volume vput vread vtypecv wait waitc walkindex where window writer xlabel xlsGetSheetCount xlsGetSheetSize xlsGetSheetTypes xlsMakeRange xlsReadM xlsReadSA xlsWrite xlsWriteM xlsWriteSA xpnd xtics xy xyz ylabel ytics zeros zeta zlabel ztics cdfEmpirical dot h5create h5open h5read h5readAttribute h5write h5writeAttribute ldl plotAddErrorBar plotAddSurface plotCDFEmpirical plotSetColormap plotSetContourLabels plotSetLegendFont plotSetTextInterpreter plotSetXTicCount plotSetYTicCount plotSetZLevels powerm strjoin sylvester strtrim",literal:"DB_AFTER_LAST_ROW DB_ALL_TABLES DB_BATCH_OPERATIONS DB_BEFORE_FIRST_ROW DB_BLOB DB_EVENT_NOTIFICATIONS DB_FINISH_QUERY DB_HIGH_PRECISION DB_LAST_INSERT_ID DB_LOW_PRECISION_DOUBLE DB_LOW_PRECISION_INT32 DB_LOW_PRECISION_INT64 DB_LOW_PRECISION_NUMBERS DB_MULTIPLE_RESULT_SETS DB_NAMED_PLACEHOLDERS DB_POSITIONAL_PLACEHOLDERS DB_PREPARED_QUERIES DB_QUERY_SIZE DB_SIMPLE_LOCKING DB_SYSTEM_TABLES DB_TABLES DB_TRANSACTIONS DB_UNICODE DB_VIEWS __STDIN __STDOUT __STDERR __FILE_DIR"};return AT_COMMENT_MODE=e.C("@","@"),PREPROCESSOR={cN:"meta",b:"#",e:"$",k:{"meta-keyword":"define definecs|10 undef ifdef ifndef iflight ifdllcall ifmac ifos2win ifunix else endif lineson linesoff srcfile srcline"},c:[{b:/\\\n/,r:0},{bK:"include",e:"$",k:{"meta-keyword":"include"},c:[{cN:"meta-string",b:'"',e:'"',i:"\\n"}]},e.CLCM,e.CBCM,AT_COMMENT_MODE]},STRUCT_TYPE={b:/\bstruct\s+/,e:/\s/,k:"struct",c:[{cN:"type",b:e.UIR,r:0}]},PARSE_PARAMS=[{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,eW:!0,r:0,c:[{cN:"literal",b:/\.\.\./},e.CNM,e.CBCM,AT_COMMENT_MODE,STRUCT_TYPE]}],FUNCTION_DEF={cN:"title",b:e.UIR,r:0},DEFINITION=function(t,r,a){var o=e.inherit({cN:"function",bK:t,e:r,eE:!0,c:[].concat(PARSE_PARAMS)},a||{});return o.c.push(FUNCTION_DEF),o.c.push(e.CNM),o.c.push(e.CBCM),o.c.push(AT_COMMENT_MODE),o},BUILT_IN_REF={cN:"built_in",b:"\\b("+t.built_in.split(" ").join("|")+")\\b"},STRING_REF={cN:"string",b:'"',e:'"',c:[e.BE],r:0},FUNCTION_REF={b:e.UIR+"\\s*\\(",rB:!0,k:t,r:0,c:[{bK:t.keyword},BUILT_IN_REF,{cN:"built_in",b:e.UIR,r:0}]},FUNCTION_REF_PARAMS={b:/\(/,e:/\)/,r:0,k:{built_in:t.built_in,literal:t.literal},c:[e.CNM,e.CBCM,AT_COMMENT_MODE,BUILT_IN_REF,FUNCTION_REF,STRING_REF,"self"]},FUNCTION_REF.c.push(FUNCTION_REF_PARAMS),{aliases:["gss"],cI:!0,k:t,i:/(\{[%#]|[%#]\}| <- )/,c:[e.CNM,e.CLCM,e.CBCM,AT_COMMENT_MODE,STRING_REF,PREPROCESSOR,{cN:"keyword",b:/\bexternal (matrix|string|array|sparse matrix|struct|proc|keyword|fn)/},DEFINITION("proc keyword",";"),DEFINITION("fn","="),{bK:"for threadfor",e:/;/,r:0,c:[e.CBCM,AT_COMMENT_MODE,FUNCTION_REF_PARAMS]},{v:[{b:e.UIR+"\\."+e.UIR},{b:e.UIR+"\\s*="}],r:0},FUNCTION_REF,STRUCT_TYPE]}});
\ No newline at end of file
+hljs.registerLanguage("gauss",function(){"use strict";return function(e){var t={keyword:"bool break call callexe checkinterrupt clear clearg closeall cls comlog compile continue create debug declare delete disable dlibrary dllcall do dos ed edit else elseif enable end endfor endif endp endo errorlog errorlogat expr external fn for format goto gosub graph if keyword let lib library line load loadarray loadexe loadf loadk loadm loadp loads loadx local locate loopnextindex lprint lpwidth lshow matrix msym ndpclex new open output outwidth plot plotsym pop prcsn print printdos proc push retp return rndcon rndmod rndmult rndseed run save saveall screen scroll setarray show sparse stop string struct system trace trap threadfor threadendfor threadbegin threadjoin threadstat threadend until use while winprint ne ge le gt lt and xor or not eq eqv",built_in:"abs acf aconcat aeye amax amean AmericanBinomCall AmericanBinomCall_Greeks AmericanBinomCall_ImpVol AmericanBinomPut AmericanBinomPut_Greeks AmericanBinomPut_ImpVol AmericanBSCall AmericanBSCall_Greeks AmericanBSCall_ImpVol AmericanBSPut AmericanBSPut_Greeks AmericanBSPut_ImpVol amin amult annotationGetDefaults annotationSetBkd annotationSetFont annotationSetLineColor annotationSetLineStyle annotationSetLineThickness annualTradingDays arccos arcsin areshape arrayalloc arrayindex arrayinit arraytomat asciiload asclabel astd astds asum atan atan2 atranspose axmargin balance band bandchol bandcholsol bandltsol bandrv bandsolpd bar base10 begwind besselj bessely beta box boxcox cdfBeta cdfBetaInv cdfBinomial cdfBinomialInv cdfBvn cdfBvn2 cdfBvn2e cdfCauchy cdfCauchyInv cdfChic cdfChii cdfChinc cdfChincInv cdfExp cdfExpInv cdfFc cdfFnc cdfFncInv cdfGam cdfGenPareto cdfHyperGeo cdfLaplace cdfLaplaceInv cdfLogistic cdfLogisticInv cdfmControlCreate cdfMvn cdfMvn2e cdfMvnce cdfMvne cdfMvt2e cdfMvtce cdfMvte cdfN cdfN2 cdfNc cdfNegBinomial cdfNegBinomialInv cdfNi cdfPoisson cdfPoissonInv cdfRayleigh cdfRayleighInv cdfTc cdfTci cdfTnc cdfTvn cdfWeibull cdfWeibullInv cdir ceil ChangeDir chdir chiBarSquare chol choldn cholsol cholup chrs close code cols colsf combinate combinated complex con cond conj cons ConScore contour conv convertsatostr convertstrtosa corrm corrms corrvc corrx corrxs cos cosh counts countwts crossprd crout croutp csrcol csrlin csvReadM csvReadSA cumprodc cumsumc curve cvtos datacreate datacreatecomplex datalist dataload dataloop dataopen datasave date datestr datestring datestrymd dayinyr dayofweek dbAddDatabase dbClose dbCommit dbCreateQuery dbExecQuery dbGetConnectOptions dbGetDatabaseName dbGetDriverName dbGetDrivers dbGetHostName dbGetLastErrorNum dbGetLastErrorText dbGetNumericalPrecPolicy dbGetPassword dbGetPort dbGetTableHeaders dbGetTables dbGetUserName dbHasFeature dbIsDriverAvailable dbIsOpen dbIsOpenError dbOpen dbQueryBindValue dbQueryClear dbQueryCols dbQueryExecPrepared dbQueryFetchAllM dbQueryFetchAllSA dbQueryFetchOneM dbQueryFetchOneSA dbQueryFinish dbQueryGetBoundValue dbQueryGetBoundValues dbQueryGetField dbQueryGetLastErrorNum dbQueryGetLastErrorText dbQueryGetLastInsertID dbQueryGetLastQuery dbQueryGetPosition dbQueryIsActive dbQueryIsForwardOnly dbQueryIsNull dbQueryIsSelect dbQueryIsValid dbQueryPrepare dbQueryRows dbQuerySeek dbQuerySeekFirst dbQuerySeekLast dbQuerySeekNext dbQuerySeekPrevious dbQuerySetForwardOnly dbRemoveDatabase dbRollback dbSetConnectOptions dbSetDatabaseName dbSetHostName dbSetNumericalPrecPolicy dbSetPort dbSetUserName dbTransaction DeleteFile delif delrows denseToSp denseToSpRE denToZero design det detl dfft dffti diag diagrv digamma doswin DOSWinCloseall DOSWinOpen dotfeq dotfeqmt dotfge dotfgemt dotfgt dotfgtmt dotfle dotflemt dotflt dotfltmt dotfne dotfnemt draw drop dsCreate dstat dstatmt dstatmtControlCreate dtdate dtday dttime dttodtv dttostr dttoutc dtvnormal dtvtodt dtvtoutc dummy dummybr dummydn eig eigh eighv eigv elapsedTradingDays endwind envget eof eqSolve eqSolvemt eqSolvemtControlCreate eqSolvemtOutCreate eqSolveset erf erfc erfccplx erfcplx error etdays ethsec etstr EuropeanBinomCall EuropeanBinomCall_Greeks EuropeanBinomCall_ImpVol EuropeanBinomPut EuropeanBinomPut_Greeks EuropeanBinomPut_ImpVol EuropeanBSCall EuropeanBSCall_Greeks EuropeanBSCall_ImpVol EuropeanBSPut EuropeanBSPut_Greeks EuropeanBSPut_ImpVol exctsmpl exec execbg exp extern eye fcheckerr fclearerr feq feqmt fflush fft ffti fftm fftmi fftn fge fgemt fgets fgetsa fgetsat fgetst fgt fgtmt fileinfo filesa fle flemt floor flt fltmt fmod fne fnemt fonts fopen formatcv formatnv fputs fputst fseek fstrerror ftell ftocv ftos ftostrC gamma gammacplx gammaii gausset gdaAppend gdaCreate gdaDStat gdaDStatMat gdaGetIndex gdaGetName gdaGetNames gdaGetOrders gdaGetType gdaGetTypes gdaGetVarInfo gdaIsCplx gdaLoad gdaPack gdaRead gdaReadByIndex gdaReadSome gdaReadSparse gdaReadStruct gdaReportVarInfo gdaSave gdaUpdate gdaUpdateAndPack gdaVars gdaWrite gdaWrite32 gdaWriteSome getarray getdims getf getGAUSShome getmatrix getmatrix4D getname getnamef getNextTradingDay getNextWeekDay getnr getorders getpath getPreviousTradingDay getPreviousWeekDay getRow getscalar3D getscalar4D getTrRow getwind glm gradcplx gradMT gradMTm gradMTT gradMTTm gradp graphprt graphset hasimag header headermt hess hessMT hessMTg hessMTgw hessMTm hessMTmw hessMTT hessMTTg hessMTTgw hessMTTm hessMTw hessp hist histf histp hsec imag indcv indexcat indices indices2 indicesf indicesfn indnv indsav integrate1d integrateControlCreate intgrat2 intgrat3 inthp1 inthp2 inthp3 inthp4 inthpControlCreate intquad1 intquad2 intquad3 intrleav intrleavsa intrsect intsimp inv invpd invswp iscplx iscplxf isden isinfnanmiss ismiss key keyav keyw lag lag1 lagn lapEighb lapEighi lapEighvb lapEighvi lapgEig lapgEigh lapgEighv lapgEigv lapgSchur lapgSvdcst lapgSvds lapgSvdst lapSvdcusv lapSvds lapSvdusv ldlp ldlsol linSolve listwise ln lncdfbvn lncdfbvn2 lncdfmvn lncdfn lncdfn2 lncdfnc lnfact lngammacplx lnpdfmvn lnpdfmvt lnpdfn lnpdft loadd loadstruct loadwind loess loessmt loessmtControlCreate log loglog logx logy lower lowmat lowmat1 ltrisol lu lusol machEpsilon make makevars makewind margin matalloc matinit mattoarray maxbytes maxc maxindc maxv maxvec mbesselei mbesselei0 mbesselei1 mbesseli mbesseli0 mbesseli1 meanc median mergeby mergevar minc minindc minv miss missex missrv moment momentd movingave movingaveExpwgt movingaveWgt nextindex nextn nextnevn nextwind ntos null null1 numCombinations ols olsmt olsmtControlCreate olsqr olsqr2 olsqrmt ones optn optnevn orth outtyp pacf packedToSp packr parse pause pdfCauchy pdfChi pdfExp pdfGenPareto pdfHyperGeo pdfLaplace pdfLogistic pdfn pdfPoisson pdfRayleigh pdfWeibull pi pinv pinvmt plotAddArrow plotAddBar plotAddBox plotAddHist plotAddHistF plotAddHistP plotAddPolar plotAddScatter plotAddShape plotAddTextbox plotAddTS plotAddXY plotArea plotBar plotBox plotClearLayout plotContour plotCustomLayout plotGetDefaults plotHist plotHistF plotHistP plotLayout plotLogLog plotLogX plotLogY plotOpenWindow plotPolar plotSave plotScatter plotSetAxesPen plotSetBar plotSetBarFill plotSetBarStacked plotSetBkdColor plotSetFill plotSetGrid plotSetLegend plotSetLineColor plotSetLineStyle plotSetLineSymbol plotSetLineThickness plotSetNewWindow plotSetTitle plotSetWhichYAxis plotSetXAxisShow plotSetXLabel plotSetXRange plotSetXTicInterval plotSetXTicLabel plotSetYAxisShow plotSetYLabel plotSetYRange plotSetZAxisShow plotSetZLabel plotSurface plotTS plotXY polar polychar polyeval polygamma polyint polymake polymat polymroot polymult polyroot pqgwin previousindex princomp printfm printfmt prodc psi putarray putf putvals pvCreate pvGetIndex pvGetParNames pvGetParVector pvLength pvList pvPack pvPacki pvPackm pvPackmi pvPacks pvPacksi pvPacksm pvPacksmi pvPutParVector pvTest pvUnpack QNewton QNewtonmt QNewtonmtControlCreate QNewtonmtOutCreate QNewtonSet QProg QProgmt QProgmtInCreate qqr qqre qqrep qr qre qrep qrsol qrtsol qtyr qtyre qtyrep quantile quantiled qyr qyre qyrep qz rank rankindx readr real reclassify reclassifyCuts recode recserar recsercp recserrc rerun rescale reshape rets rev rfft rffti rfftip rfftn rfftnp rfftp rndBernoulli rndBeta rndBinomial rndCauchy rndChiSquare rndCon rndCreateState rndExp rndGamma rndGeo rndGumbel rndHyperGeo rndi rndKMbeta rndKMgam rndKMi rndKMn rndKMnb rndKMp rndKMu rndKMvm rndLaplace rndLCbeta rndLCgam rndLCi rndLCn rndLCnb rndLCp rndLCu rndLCvm rndLogNorm rndMTu rndMVn rndMVt rndn rndnb rndNegBinomial rndp rndPoisson rndRayleigh rndStateSkip rndu rndvm rndWeibull rndWishart rotater round rows rowsf rref sampleData satostrC saved saveStruct savewind scale scale3d scalerr scalinfnanmiss scalmiss schtoc schur searchsourcepath seekr select selif seqa seqm setdif setdifsa setvars setvwrmode setwind shell shiftr sin singleindex sinh sleep solpd sortc sortcc sortd sorthc sorthcc sortind sortindc sortmc sortr sortrc spBiconjGradSol spChol spConjGradSol spCreate spDenseSubmat spDiagRvMat spEigv spEye spLDL spline spLU spNumNZE spOnes spreadSheetReadM spreadSheetReadSA spreadSheetWrite spScale spSubmat spToDense spTrTDense spTScalar spZeros sqpSolve sqpSolveMT sqpSolveMTControlCreate sqpSolveMTlagrangeCreate sqpSolveMToutCreate sqpSolveSet sqrt statements stdc stdsc stocv stof strcombine strindx strlen strput strrindx strsect strsplit strsplitPad strtodt strtof strtofcplx strtriml strtrimr strtrunc strtruncl strtruncpad strtruncr submat subscat substute subvec sumc sumr surface svd svd1 svd2 svdcusv svds svdusv sysstate tab tan tanh tempname time timedt timestr timeutc title tkf2eps tkf2ps tocart todaydt toeplitz token topolar trapchk trigamma trimr trunc type typecv typef union unionsa uniqindx uniqindxsa unique uniquesa upmat upmat1 upper utctodt utctodtv utrisol vals varCovMS varCovXS varget vargetl varmall varmares varput varputl vartypef vcm vcms vcx vcxs vec vech vecr vector vget view viewxyz vlist vnamecv volume vput vread vtypecv wait waitc walkindex where window writer xlabel xlsGetSheetCount xlsGetSheetSize xlsGetSheetTypes xlsMakeRange xlsReadM xlsReadSA xlsWrite xlsWriteM xlsWriteSA xpnd xtics xy xyz ylabel ytics zeros zeta zlabel ztics cdfEmpirical dot h5create h5open h5read h5readAttribute h5write h5writeAttribute ldl plotAddErrorBar plotAddSurface plotCDFEmpirical plotSetColormap plotSetContourLabels plotSetLegendFont plotSetTextInterpreter plotSetXTicCount plotSetYTicCount plotSetZLevels powerm strjoin sylvester strtrim",literal:"DB_AFTER_LAST_ROW DB_ALL_TABLES DB_BATCH_OPERATIONS DB_BEFORE_FIRST_ROW DB_BLOB DB_EVENT_NOTIFICATIONS DB_FINISH_QUERY DB_HIGH_PRECISION DB_LAST_INSERT_ID DB_LOW_PRECISION_DOUBLE DB_LOW_PRECISION_INT32 DB_LOW_PRECISION_INT64 DB_LOW_PRECISION_NUMBERS DB_MULTIPLE_RESULT_SETS DB_NAMED_PLACEHOLDERS DB_POSITIONAL_PLACEHOLDERS DB_PREPARED_QUERIES DB_QUERY_SIZE DB_SIMPLE_LOCKING DB_SYSTEM_TABLES DB_TABLES DB_TRANSACTIONS DB_UNICODE DB_VIEWS __STDIN __STDOUT __STDERR __FILE_DIR"},a=e.COMMENT("@","@"),r={className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"define definecs|10 undef ifdef ifndef iflight ifdllcall ifmac ifos2win ifunix else endif lineson linesoff srcfile srcline"},contains:[{begin:/\\\n/,relevance:0},{beginKeywords:"include",end:"$",keywords:{"meta-keyword":"include"},contains:[{className:"meta-string",begin:'"',end:'"',illegal:"\\n"}]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a]},n={begin:/\bstruct\s+/,end:/\s/,keywords:"struct",contains:[{className:"type",begin:e.UNDERSCORE_IDENT_RE,relevance:0}]},s=[{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,endsWithParent:!0,relevance:0,contains:[{className:"literal",begin:/\.\.\./},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,a,n]}],o={className:"title",begin:e.UNDERSCORE_IDENT_RE,relevance:0},d=function(t,r,n){var d=e.inherit({className:"function",beginKeywords:t,end:r,excludeEnd:!0,contains:[].concat(s)},n||{});return d.contains.push(o),d.contains.push(e.C_NUMBER_MODE),d.contains.push(e.C_BLOCK_COMMENT_MODE),d.contains.push(a),d},l={className:"built_in",begin:"\\b("+t.built_in.split(" ").join("|")+")\\b"},i={className:"string",begin:'"',end:'"',contains:[e.BACKSLASH_ESCAPE],relevance:0},c={begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,keywords:t,relevance:0,contains:[{beginKeywords:t.keyword},l,{className:"built_in",begin:e.UNDERSCORE_IDENT_RE,relevance:0}]},p={begin:/\(/,end:/\)/,relevance:0,keywords:{built_in:t.built_in,literal:t.literal},contains:[e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,a,l,c,i,"self"]};return c.contains.push(p),{name:"GAUSS",aliases:["gss"],case_insensitive:!0,keywords:t,illegal:/(\{[%#]|[%#]\}| <- )/,contains:[e.C_NUMBER_MODE,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,i,r,{className:"keyword",begin:/\bexternal (matrix|string|array|sparse matrix|struct|proc|keyword|fn)/},d("proc keyword",";"),d("fn","="),{beginKeywords:"for threadfor",end:/;/,relevance:0,contains:[e.C_BLOCK_COMMENT_MODE,a,p]},{variants:[{begin:e.UNDERSCORE_IDENT_RE+"\\."+e.UNDERSCORE_IDENT_RE},{begin:e.UNDERSCORE_IDENT_RE+"\\s*="}],relevance:0},c,n]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/gcode.min.js b/vendor/assets/javascripts/highlightjs/languages/gcode.min.js
index 898c3832ec..60c6c3988e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gcode.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gcode.min.js
@@ -1 +1 @@
-hljs.registerLanguage("gcode",function(N){var e="[A-Z_][A-Z0-9_.]*",c="\\%",E="IF DO WHILE ENDWHILE CALL ENDIF SUB ENDSUB GOTO REPEAT ENDREPEAT EQ LT GT NE GE LE OR XOR",i={cN:"meta",b:"([O])([0-9]+)"},n=[N.CLCM,N.CBCM,N.C(/\(/,/\)/),N.inherit(N.CNM,{b:"([-+]?([0-9]*\\.?[0-9]+\\.?))|"+N.CNR}),N.inherit(N.ASM,{i:null}),N.inherit(N.QSM,{i:null}),{cN:"name",b:"([G])([0-9]+\\.?[0-9]?)"},{cN:"name",b:"([M])([0-9]+\\.?[0-9]?)"},{cN:"attr",b:"(VC|VS|#)",e:"(\\d+)"},{cN:"attr",b:"(VZOFX|VZOFY|VZOFZ)"},{cN:"built_in",b:"(ATAN|ABS|ACOS|ASIN|SIN|COS|EXP|FIX|FUP|ROUND|LN|TAN)(\\[)",e:"([-+]?([0-9]*\\.?[0-9]+\\.?))(\\])"},{cN:"symbol",v:[{b:"N",e:"\\d+",i:"\\W"}]}];return{aliases:["nc"],cI:!0,l:e,k:E,c:[{cN:"meta",b:c},i].concat(n)}});
\ No newline at end of file
+hljs.registerLanguage("gcode",function(){"use strict";return function(e){var a=[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.COMMENT(/\(/,/\)/),e.inherit(e.C_NUMBER_MODE,{begin:"([-+]?([0-9]*\\.?[0-9]+\\.?))|"+e.C_NUMBER_RE}),e.inherit(e.APOS_STRING_MODE,{illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),{className:"name",begin:"([G])([0-9]+\\.?[0-9]?)"},{className:"name",begin:"([M])([0-9]+\\.?[0-9]?)"},{className:"attr",begin:"(VC|VS|#)",end:"(\\d+)"},{className:"attr",begin:"(VZOFX|VZOFY|VZOFZ)"},{className:"built_in",begin:"(ATAN|ABS|ACOS|ASIN|SIN|COS|EXP|FIX|FUP|ROUND|LN|TAN)(\\[)",end:"([-+]?([0-9]*\\.?[0-9]+\\.?))(\\])"},{className:"symbol",variants:[{begin:"N",end:"\\d+",illegal:"\\W"}]}];return{name:"G-code (ISO 6983)",aliases:["nc"],case_insensitive:!0,keywords:{$pattern:"[A-Z_][A-Z0-9_.]*",keyword:"IF DO WHILE ENDWHILE CALL ENDIF SUB ENDSUB GOTO REPEAT ENDREPEAT EQ LT GT NE GE LE OR XOR"},contains:[{className:"meta",begin:"\\%"},{className:"meta",begin:"([O])([0-9]+)"}].concat(a)}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/gherkin.min.js b/vendor/assets/javascripts/highlightjs/languages/gherkin.min.js
index 10cc38b26d..61f134b98c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gherkin.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gherkin.min.js
@@ -1 +1 @@
-hljs.registerLanguage("gherkin",function(e){return{aliases:["feature"],k:"Feature Background Ability Business Need Scenario Scenarios Scenario Outline Scenario Template Examples Given And Then But When",c:[{cN:"symbol",b:"\\*",r:0},{cN:"meta",b:"@[^@\\s]+"},{b:"\\|",e:"\\|\\w*$",c:[{cN:"string",b:"[^|]+"}]},{cN:"variable",b:"<",e:">"},e.HCM,{cN:"string",b:'"""',e:'"""'},e.QSM]}});
\ No newline at end of file
+hljs.registerLanguage("gherkin",function(){"use strict";return function(e){return{name:"Gherkin",aliases:["feature"],keywords:"Feature Background Ability Business Need Scenario Scenarios Scenario Outline Scenario Template Examples Given And Then But When",contains:[{className:"symbol",begin:"\\*",relevance:0},{className:"meta",begin:"@[^@\\s]+"},{begin:"\\|",end:"\\|\\w*$",contains:[{className:"string",begin:"[^|]+"}]},{className:"variable",begin:"<",end:">"},e.HASH_COMMENT_MODE,{className:"string",begin:'"""',end:'"""'},e.QUOTE_STRING_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/glsl.min.js b/vendor/assets/javascripts/highlightjs/languages/glsl.min.js
index 20b7046010..e5746faa20 100644
--- a/vendor/assets/javascripts/highlightjs/languages/glsl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/glsl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("glsl",function(e){return{k:{keyword:"break continue discard do else for if return while switch case default attribute binding buffer ccw centroid centroid varying coherent column_major const cw depth_any depth_greater depth_less depth_unchanged early_fragment_tests equal_spacing flat fractional_even_spacing fractional_odd_spacing highp in index inout invariant invocations isolines layout line_strip lines lines_adjacency local_size_x local_size_y local_size_z location lowp max_vertices mediump noperspective offset origin_upper_left out packed patch pixel_center_integer point_mode points precise precision quads r11f_g11f_b10f r16 r16_snorm r16f r16i r16ui r32f r32i r32ui r8 r8_snorm r8i r8ui readonly restrict rg16 rg16_snorm rg16f rg16i rg16ui rg32f rg32i rg32ui rg8 rg8_snorm rg8i rg8ui rgb10_a2 rgb10_a2ui rgba16 rgba16_snorm rgba16f rgba16i rgba16ui rgba32f rgba32i rgba32ui rgba8 rgba8_snorm rgba8i rgba8ui row_major sample shared smooth std140 std430 stream triangle_strip triangles triangles_adjacency uniform varying vertices volatile writeonly",type:"atomic_uint bool bvec2 bvec3 bvec4 dmat2 dmat2x2 dmat2x3 dmat2x4 dmat3 dmat3x2 dmat3x3 dmat3x4 dmat4 dmat4x2 dmat4x3 dmat4x4 double dvec2 dvec3 dvec4 float iimage1D iimage1DArray iimage2D iimage2DArray iimage2DMS iimage2DMSArray iimage2DRect iimage3D iimageBufferiimageCube iimageCubeArray image1D image1DArray image2D image2DArray image2DMS image2DMSArray image2DRect image3D imageBuffer imageCube imageCubeArray int isampler1D isampler1DArray isampler2D isampler2DArray isampler2DMS isampler2DMSArray isampler2DRect isampler3D isamplerBuffer isamplerCube isamplerCubeArray ivec2 ivec3 ivec4 mat2 mat2x2 mat2x3 mat2x4 mat3 mat3x2 mat3x3 mat3x4 mat4 mat4x2 mat4x3 mat4x4 sampler1D sampler1DArray sampler1DArrayShadow sampler1DShadow sampler2D sampler2DArray sampler2DArrayShadow sampler2DMS sampler2DMSArray sampler2DRect sampler2DRectShadow sampler2DShadow sampler3D samplerBuffer samplerCube samplerCubeArray samplerCubeArrayShadow samplerCubeShadow image1D uimage1DArray uimage2D uimage2DArray uimage2DMS uimage2DMSArray uimage2DRect uimage3D uimageBuffer uimageCube uimageCubeArray uint usampler1D usampler1DArray usampler2D usampler2DArray usampler2DMS usampler2DMSArray usampler2DRect usampler3D samplerBuffer usamplerCube usamplerCubeArray uvec2 uvec3 uvec4 vec2 vec3 vec4 void",built_in:"gl_MaxAtomicCounterBindings gl_MaxAtomicCounterBufferSize gl_MaxClipDistances gl_MaxClipPlanes gl_MaxCombinedAtomicCounterBuffers gl_MaxCombinedAtomicCounters gl_MaxCombinedImageUniforms gl_MaxCombinedImageUnitsAndFragmentOutputs gl_MaxCombinedTextureImageUnits gl_MaxComputeAtomicCounterBuffers gl_MaxComputeAtomicCounters gl_MaxComputeImageUniforms gl_MaxComputeTextureImageUnits gl_MaxComputeUniformComponents gl_MaxComputeWorkGroupCount gl_MaxComputeWorkGroupSize gl_MaxDrawBuffers gl_MaxFragmentAtomicCounterBuffers gl_MaxFragmentAtomicCounters gl_MaxFragmentImageUniforms gl_MaxFragmentInputComponents gl_MaxFragmentInputVectors gl_MaxFragmentUniformComponents gl_MaxFragmentUniformVectors gl_MaxGeometryAtomicCounterBuffers gl_MaxGeometryAtomicCounters gl_MaxGeometryImageUniforms gl_MaxGeometryInputComponents gl_MaxGeometryOutputComponents gl_MaxGeometryOutputVertices gl_MaxGeometryTextureImageUnits gl_MaxGeometryTotalOutputComponents gl_MaxGeometryUniformComponents gl_MaxGeometryVaryingComponents gl_MaxImageSamples gl_MaxImageUnits gl_MaxLights gl_MaxPatchVertices gl_MaxProgramTexelOffset gl_MaxTessControlAtomicCounterBuffers gl_MaxTessControlAtomicCounters gl_MaxTessControlImageUniforms gl_MaxTessControlInputComponents gl_MaxTessControlOutputComponents gl_MaxTessControlTextureImageUnits gl_MaxTessControlTotalOutputComponents gl_MaxTessControlUniformComponents gl_MaxTessEvaluationAtomicCounterBuffers gl_MaxTessEvaluationAtomicCounters gl_MaxTessEvaluationImageUniforms gl_MaxTessEvaluationInputComponents gl_MaxTessEvaluationOutputComponents gl_MaxTessEvaluationTextureImageUnits gl_MaxTessEvaluationUniformComponents gl_MaxTessGenLevel gl_MaxTessPatchComponents gl_MaxTextureCoords gl_MaxTextureImageUnits gl_MaxTextureUnits gl_MaxVaryingComponents gl_MaxVaryingFloats gl_MaxVaryingVectors gl_MaxVertexAtomicCounterBuffers gl_MaxVertexAtomicCounters gl_MaxVertexAttribs gl_MaxVertexImageUniforms gl_MaxVertexOutputComponents gl_MaxVertexOutputVectors gl_MaxVertexTextureImageUnits gl_MaxVertexUniformComponents gl_MaxVertexUniformVectors gl_MaxViewports gl_MinProgramTexelOffset gl_BackColor gl_BackLightModelProduct gl_BackLightProduct gl_BackMaterial gl_BackSecondaryColor gl_ClipDistance gl_ClipPlane gl_ClipVertex gl_Color gl_DepthRange gl_EyePlaneQ gl_EyePlaneR gl_EyePlaneS gl_EyePlaneT gl_Fog gl_FogCoord gl_FogFragCoord gl_FragColor gl_FragCoord gl_FragData gl_FragDepth gl_FrontColor gl_FrontFacing gl_FrontLightModelProduct gl_FrontLightProduct gl_FrontMaterial gl_FrontSecondaryColor gl_GlobalInvocationID gl_InstanceID gl_InvocationID gl_Layer gl_LightModel gl_LightSource gl_LocalInvocationID gl_LocalInvocationIndex gl_ModelViewMatrix gl_ModelViewMatrixInverse gl_ModelViewMatrixInverseTranspose gl_ModelViewMatrixTranspose gl_ModelViewProjectionMatrix gl_ModelViewProjectionMatrixInverse gl_ModelViewProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixTranspose gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_Normal gl_NormalMatrix gl_NormalScale gl_NumSamples gl_NumWorkGroups gl_ObjectPlaneQ gl_ObjectPlaneR gl_ObjectPlaneS gl_ObjectPlaneT gl_PatchVerticesIn gl_Point gl_PointCoord gl_PointSize gl_Position gl_PrimitiveID gl_PrimitiveIDIn gl_ProjectionMatrix gl_ProjectionMatrixInverse gl_ProjectionMatrixInverseTranspose gl_ProjectionMatrixTranspose gl_SampleID gl_SampleMask gl_SampleMaskIn gl_SamplePosition gl_SecondaryColor gl_TessCoord gl_TessLevelInner gl_TessLevelOuter gl_TexCoord gl_TextureEnvColor gl_TextureMatrix gl_TextureMatrixInverse gl_TextureMatrixInverseTranspose gl_TextureMatrixTranspose gl_Vertex gl_VertexID gl_ViewportIndex gl_WorkGroupID gl_WorkGroupSize gl_in gl_out EmitStreamVertex EmitVertex EndPrimitive EndStreamPrimitive abs acos acosh all any asin asinh atan atanh atomicAdd atomicAnd atomicCompSwap atomicCounter atomicCounterDecrement atomicCounterIncrement atomicExchange atomicMax atomicMin atomicOr atomicXor barrier bitCount bitfieldExtract bitfieldInsert bitfieldReverse ceil clamp cos cosh cross dFdx dFdy degrees determinant distance dot equal exp exp2 faceforward findLSB findMSB floatBitsToInt floatBitsToUint floor fma fract frexp ftransform fwidth greaterThan greaterThanEqual groupMemoryBarrier imageAtomicAdd imageAtomicAnd imageAtomicCompSwap imageAtomicExchange imageAtomicMax imageAtomicMin imageAtomicOr imageAtomicXor imageLoad imageSize imageStore imulExtended intBitsToFloat interpolateAtCentroid interpolateAtOffset interpolateAtSample inverse inversesqrt isinf isnan ldexp length lessThan lessThanEqual log log2 matrixCompMult max memoryBarrier memoryBarrierAtomicCounter memoryBarrierBuffer memoryBarrierImage memoryBarrierShared min mix mod modf noise1 noise2 noise3 noise4 normalize not notEqual outerProduct packDouble2x32 packHalf2x16 packSnorm2x16 packSnorm4x8 packUnorm2x16 packUnorm4x8 pow radians reflect refract round roundEven shadow1D shadow1DLod shadow1DProj shadow1DProjLod shadow2D shadow2DLod shadow2DProj shadow2DProjLod sign sin sinh smoothstep sqrt step tan tanh texelFetch texelFetchOffset texture texture1D texture1DLod texture1DProj texture1DProjLod texture2D texture2DLod texture2DProj texture2DProjLod texture3D texture3DLod texture3DProj texture3DProjLod textureCube textureCubeLod textureGather textureGatherOffset textureGatherOffsets textureGrad textureGradOffset textureLod textureLodOffset textureOffset textureProj textureProjGrad textureProjGradOffset textureProjLod textureProjLodOffset textureProjOffset textureQueryLevels textureQueryLod textureSize transpose trunc uaddCarry uintBitsToFloat umulExtended unpackDouble2x32 unpackHalf2x16 unpackSnorm2x16 unpackSnorm4x8 unpackUnorm2x16 unpackUnorm4x8 usubBorrow",literal:"true false"},i:'"',c:[e.CLCM,e.CBCM,e.CNM,{cN:"meta",b:"#",e:"$"}]}});
\ No newline at end of file
+hljs.registerLanguage("glsl",function(){"use strict";return function(e){return{name:"GLSL",keywords:{keyword:"break continue discard do else for if return while switch case default attribute binding buffer ccw centroid centroid varying coherent column_major const cw depth_any depth_greater depth_less depth_unchanged early_fragment_tests equal_spacing flat fractional_even_spacing fractional_odd_spacing highp in index inout invariant invocations isolines layout line_strip lines lines_adjacency local_size_x local_size_y local_size_z location lowp max_vertices mediump noperspective offset origin_upper_left out packed patch pixel_center_integer point_mode points precise precision quads r11f_g11f_b10f r16 r16_snorm r16f r16i r16ui r32f r32i r32ui r8 r8_snorm r8i r8ui readonly restrict rg16 rg16_snorm rg16f rg16i rg16ui rg32f rg32i rg32ui rg8 rg8_snorm rg8i rg8ui rgb10_a2 rgb10_a2ui rgba16 rgba16_snorm rgba16f rgba16i rgba16ui rgba32f rgba32i rgba32ui rgba8 rgba8_snorm rgba8i rgba8ui row_major sample shared smooth std140 std430 stream triangle_strip triangles triangles_adjacency uniform varying vertices volatile writeonly",type:"atomic_uint bool bvec2 bvec3 bvec4 dmat2 dmat2x2 dmat2x3 dmat2x4 dmat3 dmat3x2 dmat3x3 dmat3x4 dmat4 dmat4x2 dmat4x3 dmat4x4 double dvec2 dvec3 dvec4 float iimage1D iimage1DArray iimage2D iimage2DArray iimage2DMS iimage2DMSArray iimage2DRect iimage3D iimageBuffer iimageCube iimageCubeArray image1D image1DArray image2D image2DArray image2DMS image2DMSArray image2DRect image3D imageBuffer imageCube imageCubeArray int isampler1D isampler1DArray isampler2D isampler2DArray isampler2DMS isampler2DMSArray isampler2DRect isampler3D isamplerBuffer isamplerCube isamplerCubeArray ivec2 ivec3 ivec4 mat2 mat2x2 mat2x3 mat2x4 mat3 mat3x2 mat3x3 mat3x4 mat4 mat4x2 mat4x3 mat4x4 sampler1D sampler1DArray sampler1DArrayShadow sampler1DShadow sampler2D sampler2DArray sampler2DArrayShadow sampler2DMS sampler2DMSArray sampler2DRect sampler2DRectShadow sampler2DShadow sampler3D samplerBuffer samplerCube samplerCubeArray samplerCubeArrayShadow samplerCubeShadow image1D uimage1DArray uimage2D uimage2DArray uimage2DMS uimage2DMSArray uimage2DRect uimage3D uimageBuffer uimageCube uimageCubeArray uint usampler1D usampler1DArray usampler2D usampler2DArray usampler2DMS usampler2DMSArray usampler2DRect usampler3D samplerBuffer usamplerCube usamplerCubeArray uvec2 uvec3 uvec4 vec2 vec3 vec4 void",built_in:"gl_MaxAtomicCounterBindings gl_MaxAtomicCounterBufferSize gl_MaxClipDistances gl_MaxClipPlanes gl_MaxCombinedAtomicCounterBuffers gl_MaxCombinedAtomicCounters gl_MaxCombinedImageUniforms gl_MaxCombinedImageUnitsAndFragmentOutputs gl_MaxCombinedTextureImageUnits gl_MaxComputeAtomicCounterBuffers gl_MaxComputeAtomicCounters gl_MaxComputeImageUniforms gl_MaxComputeTextureImageUnits gl_MaxComputeUniformComponents gl_MaxComputeWorkGroupCount gl_MaxComputeWorkGroupSize gl_MaxDrawBuffers gl_MaxFragmentAtomicCounterBuffers gl_MaxFragmentAtomicCounters gl_MaxFragmentImageUniforms gl_MaxFragmentInputComponents gl_MaxFragmentInputVectors gl_MaxFragmentUniformComponents gl_MaxFragmentUniformVectors gl_MaxGeometryAtomicCounterBuffers gl_MaxGeometryAtomicCounters gl_MaxGeometryImageUniforms gl_MaxGeometryInputComponents gl_MaxGeometryOutputComponents gl_MaxGeometryOutputVertices gl_MaxGeometryTextureImageUnits gl_MaxGeometryTotalOutputComponents gl_MaxGeometryUniformComponents gl_MaxGeometryVaryingComponents gl_MaxImageSamples gl_MaxImageUnits gl_MaxLights gl_MaxPatchVertices gl_MaxProgramTexelOffset gl_MaxTessControlAtomicCounterBuffers gl_MaxTessControlAtomicCounters gl_MaxTessControlImageUniforms gl_MaxTessControlInputComponents gl_MaxTessControlOutputComponents gl_MaxTessControlTextureImageUnits gl_MaxTessControlTotalOutputComponents gl_MaxTessControlUniformComponents gl_MaxTessEvaluationAtomicCounterBuffers gl_MaxTessEvaluationAtomicCounters gl_MaxTessEvaluationImageUniforms gl_MaxTessEvaluationInputComponents gl_MaxTessEvaluationOutputComponents gl_MaxTessEvaluationTextureImageUnits gl_MaxTessEvaluationUniformComponents gl_MaxTessGenLevel gl_MaxTessPatchComponents gl_MaxTextureCoords gl_MaxTextureImageUnits gl_MaxTextureUnits gl_MaxVaryingComponents gl_MaxVaryingFloats gl_MaxVaryingVectors gl_MaxVertexAtomicCounterBuffers gl_MaxVertexAtomicCounters gl_MaxVertexAttribs gl_MaxVertexImageUniforms gl_MaxVertexOutputComponents gl_MaxVertexOutputVectors gl_MaxVertexTextureImageUnits gl_MaxVertexUniformComponents gl_MaxVertexUniformVectors gl_MaxViewports gl_MinProgramTexelOffset gl_BackColor gl_BackLightModelProduct gl_BackLightProduct gl_BackMaterial gl_BackSecondaryColor gl_ClipDistance gl_ClipPlane gl_ClipVertex gl_Color gl_DepthRange gl_EyePlaneQ gl_EyePlaneR gl_EyePlaneS gl_EyePlaneT gl_Fog gl_FogCoord gl_FogFragCoord gl_FragColor gl_FragCoord gl_FragData gl_FragDepth gl_FrontColor gl_FrontFacing gl_FrontLightModelProduct gl_FrontLightProduct gl_FrontMaterial gl_FrontSecondaryColor gl_GlobalInvocationID gl_InstanceID gl_InvocationID gl_Layer gl_LightModel gl_LightSource gl_LocalInvocationID gl_LocalInvocationIndex gl_ModelViewMatrix gl_ModelViewMatrixInverse gl_ModelViewMatrixInverseTranspose gl_ModelViewMatrixTranspose gl_ModelViewProjectionMatrix gl_ModelViewProjectionMatrixInverse gl_ModelViewProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixTranspose gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_Normal gl_NormalMatrix gl_NormalScale gl_NumSamples gl_NumWorkGroups gl_ObjectPlaneQ gl_ObjectPlaneR gl_ObjectPlaneS gl_ObjectPlaneT gl_PatchVerticesIn gl_Point gl_PointCoord gl_PointSize gl_Position gl_PrimitiveID gl_PrimitiveIDIn gl_ProjectionMatrix gl_ProjectionMatrixInverse gl_ProjectionMatrixInverseTranspose gl_ProjectionMatrixTranspose gl_SampleID gl_SampleMask gl_SampleMaskIn gl_SamplePosition gl_SecondaryColor gl_TessCoord gl_TessLevelInner gl_TessLevelOuter gl_TexCoord gl_TextureEnvColor gl_TextureMatrix gl_TextureMatrixInverse gl_TextureMatrixInverseTranspose gl_TextureMatrixTranspose gl_Vertex gl_VertexID gl_ViewportIndex gl_WorkGroupID gl_WorkGroupSize gl_in gl_out EmitStreamVertex EmitVertex EndPrimitive EndStreamPrimitive abs acos acosh all any asin asinh atan atanh atomicAdd atomicAnd atomicCompSwap atomicCounter atomicCounterDecrement atomicCounterIncrement atomicExchange atomicMax atomicMin atomicOr atomicXor barrier bitCount bitfieldExtract bitfieldInsert bitfieldReverse ceil clamp cos cosh cross dFdx dFdy degrees determinant distance dot equal exp exp2 faceforward findLSB findMSB floatBitsToInt floatBitsToUint floor fma fract frexp ftransform fwidth greaterThan greaterThanEqual groupMemoryBarrier imageAtomicAdd imageAtomicAnd imageAtomicCompSwap imageAtomicExchange imageAtomicMax imageAtomicMin imageAtomicOr imageAtomicXor imageLoad imageSize imageStore imulExtended intBitsToFloat interpolateAtCentroid interpolateAtOffset interpolateAtSample inverse inversesqrt isinf isnan ldexp length lessThan lessThanEqual log log2 matrixCompMult max memoryBarrier memoryBarrierAtomicCounter memoryBarrierBuffer memoryBarrierImage memoryBarrierShared min mix mod modf noise1 noise2 noise3 noise4 normalize not notEqual outerProduct packDouble2x32 packHalf2x16 packSnorm2x16 packSnorm4x8 packUnorm2x16 packUnorm4x8 pow radians reflect refract round roundEven shadow1D shadow1DLod shadow1DProj shadow1DProjLod shadow2D shadow2DLod shadow2DProj shadow2DProjLod sign sin sinh smoothstep sqrt step tan tanh texelFetch texelFetchOffset texture texture1D texture1DLod texture1DProj texture1DProjLod texture2D texture2DLod texture2DProj texture2DProjLod texture3D texture3DLod texture3DProj texture3DProjLod textureCube textureCubeLod textureGather textureGatherOffset textureGatherOffsets textureGrad textureGradOffset textureLod textureLodOffset textureOffset textureProj textureProjGrad textureProjGradOffset textureProjLod textureProjLodOffset textureProjOffset textureQueryLevels textureQueryLod textureSize transpose trunc uaddCarry uintBitsToFloat umulExtended unpackDouble2x32 unpackHalf2x16 unpackSnorm2x16 unpackSnorm4x8 unpackUnorm2x16 unpackUnorm4x8 usubBorrow",literal:"true false"},illegal:'"',contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.C_NUMBER_MODE,{className:"meta",begin:"#",end:"$"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/gml.min.js b/vendor/assets/javascripts/highlightjs/languages/gml.min.js
index cc6dac4afd..fdf7734990 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gml.min.js
@@ -1,2 +1 @@
-hljs.registerLanguage("gml",function(e){var _={k:"begin end if then else while do for break continue with until repeat exit and or xor not return mod div switch case default var globalvar enum #macro #region #endregion",built_in:"is_real is_string is_array is_undefined is_int32 is_int64 is_ptr is_vec3 is_vec4 is_matrix is_bool typeof variable_global_exists variable_global_get variable_global_set variable_instance_exists variable_instance_get variable_instance_set variable_instance_get_names array_length_1d array_length_2d array_height_2d array_equals array_create array_copy random random_range irandom irandom_range random_set_seed random_get_seed randomize randomise choose abs round floor ceil sign frac sqrt sqr exp ln log2 log10 sin cos tan arcsin arccos arctan arctan2 dsin dcos dtan darcsin darccos darctan darctan2 degtorad radtodeg power logn min max mean median clamp lerp dot_product dot_product_3d dot_product_normalised dot_product_3d_normalised dot_product_normalized dot_product_3d_normalized math_set_epsilon math_get_epsilon angle_difference point_distance_3d point_distance point_direction lengthdir_x lengthdir_y real string int64 ptr string_format chr ansi_char ord string_length string_byte_length string_pos string_copy string_char_at string_ord_at string_byte_at string_set_byte_at string_delete string_insert string_lower string_upper string_repeat string_letters string_digits string_lettersdigits string_replace string_replace_all string_count string_hash_to_newline clipboard_has_text clipboard_set_text clipboard_get_text date_current_datetime date_create_datetime date_valid_datetime date_inc_year date_inc_month date_inc_week date_inc_day date_inc_hour date_inc_minute date_inc_second date_get_year date_get_month date_get_week date_get_day date_get_hour date_get_minute date_get_second date_get_weekday date_get_day_of_year date_get_hour_of_year date_get_minute_of_year date_get_second_of_year date_year_span date_month_span date_week_span date_day_span date_hour_span date_minute_span date_second_span date_compare_datetime date_compare_date date_compare_time date_date_of date_time_of date_datetime_string date_date_string date_time_string date_days_in_month date_days_in_year date_leap_year date_is_today date_set_timezone date_get_timezone game_set_speed game_get_speed motion_set motion_add place_free place_empty place_meeting place_snapped move_random move_snap move_towards_point move_contact_solid move_contact_all move_outside_solid move_outside_all move_bounce_solid move_bounce_all move_wrap distance_to_point distance_to_object position_empty position_meeting path_start path_end mp_linear_step mp_potential_step mp_linear_step_object mp_potential_step_object mp_potential_settings mp_linear_path mp_potential_path mp_linear_path_object mp_potential_path_object mp_grid_create mp_grid_destroy mp_grid_clear_all mp_grid_clear_cell mp_grid_clear_rectangle mp_grid_add_cell mp_grid_get_cell mp_grid_add_rectangle mp_grid_add_instances mp_grid_path mp_grid_draw mp_grid_to_ds_grid collision_point collision_rectangle collision_circle collision_ellipse collision_line collision_point_list collision_rectangle_list collision_circle_list collision_ellipse_list collision_line_list instance_position_list instance_place_list point_in_rectangle point_in_triangle point_in_circle rectangle_in_rectangle rectangle_in_triangle rectangle_in_circle instance_find instance_exists instance_number instance_position instance_nearest instance_furthest instance_place instance_create_depth instance_create_layer instance_copy instance_change instance_destroy position_destroy position_change instance_id_get instance_deactivate_all instance_deactivate_object instance_deactivate_region instance_activate_all instance_activate_object instance_activate_region room_goto room_goto_previous room_goto_next room_previous room_next room_restart game_end game_restart game_load game_save game_save_buffer game_load_buffer event_perform event_user event_perform_object event_inherited show_debug_message show_debug_overlay debug_event debug_get_callstack alarm_get alarm_set font_texture_page_size keyboard_set_map keyboard_get_map keyboard_unset_map keyboard_check keyboard_check_pressed keyboard_check_released keyboard_check_direct keyboard_get_numlock keyboard_set_numlock keyboard_key_press keyboard_key_release keyboard_clear io_clear mouse_check_button mouse_check_button_pressed mouse_check_button_released mouse_wheel_up mouse_wheel_down mouse_clear draw_self draw_sprite draw_sprite_pos draw_sprite_ext draw_sprite_stretched draw_sprite_stretched_ext draw_sprite_tiled draw_sprite_tiled_ext draw_sprite_part draw_sprite_part_ext draw_sprite_general draw_clear draw_clear_alpha draw_point draw_line draw_line_width draw_rectangle draw_roundrect draw_roundrect_ext draw_triangle draw_circle draw_ellipse draw_set_circle_precision draw_arrow draw_button draw_path draw_healthbar draw_getpixel draw_getpixel_ext draw_set_colour draw_set_color draw_set_alpha draw_get_colour draw_get_color draw_get_alpha merge_colour make_colour_rgb make_colour_hsv colour_get_red colour_get_green colour_get_blue colour_get_hue colour_get_saturation colour_get_value merge_color make_color_rgb make_color_hsv color_get_red color_get_green color_get_blue color_get_hue color_get_saturation color_get_value merge_color screen_save screen_save_part draw_set_font draw_set_halign draw_set_valign draw_text draw_text_ext string_width string_height string_width_ext string_height_ext draw_text_transformed draw_text_ext_transformed draw_text_colour draw_text_ext_colour draw_text_transformed_colour draw_text_ext_transformed_colour draw_text_color draw_text_ext_color draw_text_transformed_color draw_text_ext_transformed_color draw_point_colour draw_line_colour draw_line_width_colour draw_rectangle_colour draw_roundrect_colour draw_roundrect_colour_ext draw_triangle_colour draw_circle_colour draw_ellipse_colour draw_point_color draw_line_color draw_line_width_color draw_rectangle_color draw_roundrect_color draw_roundrect_color_ext draw_triangle_color draw_circle_color draw_ellipse_color draw_primitive_begin draw_vertex draw_vertex_colour draw_vertex_color draw_primitive_end sprite_get_uvs font_get_uvs sprite_get_texture font_get_texture texture_get_width texture_get_height texture_get_uvs draw_primitive_begin_texture draw_vertex_texture draw_vertex_texture_colour draw_vertex_texture_color texture_global_scale surface_create surface_create_ext surface_resize surface_free surface_exists surface_get_width surface_get_height surface_get_texture surface_set_target surface_set_target_ext surface_reset_target surface_depth_disable surface_get_depth_disable draw_surface draw_surface_stretched draw_surface_tiled draw_surface_part draw_surface_ext draw_surface_stretched_ext draw_surface_tiled_ext draw_surface_part_ext draw_surface_general surface_getpixel surface_getpixel_ext surface_save surface_save_part surface_copy surface_copy_part application_surface_draw_enable application_get_position application_surface_enable application_surface_is_enabled display_get_width display_get_height display_get_orientation display_get_gui_width display_get_gui_height display_reset display_mouse_get_x display_mouse_get_y display_mouse_set display_set_ui_visibility window_set_fullscreen window_get_fullscreen window_set_caption window_set_min_width window_set_max_width window_set_min_height window_set_max_height window_get_visible_rects window_get_caption window_set_cursor window_get_cursor window_set_colour window_get_colour window_set_color window_get_color window_set_position window_set_size window_set_rectangle window_center window_get_x window_get_y window_get_width window_get_height window_mouse_get_x window_mouse_get_y window_mouse_set window_view_mouse_get_x window_view_mouse_get_y window_views_mouse_get_x window_views_mouse_get_y audio_listener_position audio_listener_velocity audio_listener_orientation audio_emitter_position audio_emitter_create audio_emitter_free audio_emitter_exists audio_emitter_pitch audio_emitter_velocity audio_emitter_falloff audio_emitter_gain audio_play_sound audio_play_sound_on audio_play_sound_at audio_stop_sound audio_resume_music audio_music_is_playing audio_resume_sound audio_pause_sound audio_pause_music audio_channel_num audio_sound_length audio_get_type audio_falloff_set_model audio_play_music audio_stop_music audio_master_gain audio_music_gain audio_sound_gain audio_sound_pitch audio_stop_all audio_resume_all audio_pause_all audio_is_playing audio_is_paused audio_exists audio_sound_set_track_position audio_sound_get_track_position audio_emitter_get_gain audio_emitter_get_pitch audio_emitter_get_x audio_emitter_get_y audio_emitter_get_z audio_emitter_get_vx audio_emitter_get_vy audio_emitter_get_vz audio_listener_set_position audio_listener_set_velocity audio_listener_set_orientation audio_listener_get_data audio_set_master_gain audio_get_master_gain audio_sound_get_gain audio_sound_get_pitch audio_get_name audio_sound_set_track_position audio_sound_get_track_position audio_create_stream audio_destroy_stream audio_create_sync_group audio_destroy_sync_group audio_play_in_sync_group audio_start_sync_group audio_stop_sync_group audio_pause_sync_group audio_resume_sync_group audio_sync_group_get_track_pos audio_sync_group_debug audio_sync_group_is_playing audio_debug audio_group_load audio_group_unload audio_group_is_loaded audio_group_load_progress audio_group_name audio_group_stop_all audio_group_set_gain audio_create_buffer_sound audio_free_buffer_sound audio_create_play_queue audio_free_play_queue audio_queue_sound audio_get_recorder_count audio_get_recorder_info audio_start_recording audio_stop_recording audio_sound_get_listener_mask audio_emitter_get_listener_mask audio_get_listener_mask audio_sound_set_listener_mask audio_emitter_set_listener_mask audio_set_listener_mask audio_get_listener_count audio_get_listener_info audio_system show_message show_message_async clickable_add clickable_add_ext clickable_change clickable_change_ext clickable_delete clickable_exists clickable_set_style show_question show_question_async get_integer get_string get_integer_async get_string_async get_login_async get_open_filename get_save_filename get_open_filename_ext get_save_filename_ext show_error highscore_clear highscore_add highscore_value highscore_name draw_highscore sprite_exists sprite_get_name sprite_get_number sprite_get_width sprite_get_height sprite_get_xoffset sprite_get_yoffset sprite_get_bbox_left sprite_get_bbox_right sprite_get_bbox_top sprite_get_bbox_bottom sprite_save sprite_save_strip sprite_set_cache_size sprite_set_cache_size_ext sprite_get_tpe sprite_prefetch sprite_prefetch_multi sprite_flush sprite_flush_multi sprite_set_speed sprite_get_speed_type sprite_get_speed font_exists font_get_name font_get_fontname font_get_bold font_get_italic font_get_first font_get_last font_get_size font_set_cache_size path_exists path_get_name path_get_length path_get_time path_get_kind path_get_closed path_get_precision path_get_number path_get_point_x path_get_point_y path_get_point_speed path_get_x path_get_y path_get_speed script_exists script_get_name timeline_add timeline_delete timeline_clear timeline_exists timeline_get_name timeline_moment_clear timeline_moment_add_script timeline_size timeline_max_moment object_exists object_get_name object_get_sprite object_get_solid object_get_visible object_get_persistent object_get_mask object_get_parent object_get_physics object_is_ancestor room_exists room_get_name sprite_set_offset sprite_duplicate sprite_assign sprite_merge sprite_add sprite_replace sprite_create_from_surface sprite_add_from_surface sprite_delete sprite_set_alpha_from_sprite sprite_collision_mask font_add_enable_aa font_add_get_enable_aa font_add font_add_sprite font_add_sprite_ext font_replace font_replace_sprite font_replace_sprite_ext font_delete path_set_kind path_set_closed path_set_precision path_add path_assign path_duplicate path_append path_delete path_add_point path_insert_point path_change_point path_delete_point path_clear_points path_reverse path_mirror path_flip path_rotate path_rescale path_shift script_execute object_set_sprite object_set_solid object_set_visible object_set_persistent object_set_mask room_set_width room_set_height room_set_persistent room_set_background_colour room_set_background_color room_set_view room_set_viewport room_get_viewport room_set_view_enabled room_add room_duplicate room_assign room_instance_add room_instance_clear room_get_camera room_set_camera asset_get_index asset_get_type file_text_open_from_string file_text_open_read file_text_open_write file_text_open_append file_text_close file_text_write_string file_text_write_real file_text_writeln file_text_read_string file_text_read_real file_text_readln file_text_eof file_text_eoln file_exists file_delete file_rename file_copy directory_exists directory_create directory_destroy file_find_first file_find_next file_find_close file_attributes filename_name filename_path filename_dir filename_drive filename_ext filename_change_ext file_bin_open file_bin_rewrite file_bin_close file_bin_position file_bin_size file_bin_seek file_bin_write_byte file_bin_read_byte parameter_count parameter_string environment_get_variable ini_open_from_string ini_open ini_close ini_read_string ini_read_real ini_write_string ini_write_real ini_key_exists ini_section_exists ini_key_delete ini_section_delete ds_set_precision ds_exists ds_stack_create ds_stack_destroy ds_stack_clear ds_stack_copy ds_stack_size ds_stack_empty ds_stack_push ds_stack_pop ds_stack_top ds_stack_write ds_stack_read ds_queue_create ds_queue_destroy ds_queue_clear ds_queue_copy ds_queue_size ds_queue_empty ds_queue_enqueue ds_queue_dequeue ds_queue_head ds_queue_tail ds_queue_write ds_queue_read ds_list_create ds_list_destroy ds_list_clear ds_list_copy ds_list_size ds_list_empty ds_list_add ds_list_insert ds_list_replace ds_list_delete ds_list_find_index ds_list_find_value ds_list_mark_as_list ds_list_mark_as_map ds_list_sort ds_list_shuffle ds_list_write ds_list_read ds_list_set ds_map_create ds_map_destroy ds_map_clear ds_map_copy ds_map_size ds_map_empty ds_map_add ds_map_add_list ds_map_add_map ds_map_replace ds_map_replace_map ds_map_replace_list ds_map_delete ds_map_exists ds_map_find_value ds_map_find_previous ds_map_find_next ds_map_find_first ds_map_find_last ds_map_write ds_map_read ds_map_secure_save ds_map_secure_load ds_map_secure_load_buffer ds_map_secure_save_buffer ds_map_set ds_priority_create ds_priority_destroy ds_priority_clear ds_priority_copy ds_priority_size ds_priority_empty ds_priority_add ds_priority_change_priority ds_priority_find_priority ds_priority_delete_value ds_priority_delete_min ds_priority_find_min ds_priority_delete_max ds_priority_find_max ds_priority_write ds_priority_read ds_grid_create ds_grid_destroy ds_grid_copy ds_grid_resize ds_grid_width ds_grid_height ds_grid_clear ds_grid_set ds_grid_add ds_grid_multiply ds_grid_set_region ds_grid_add_region ds_grid_multiply_region ds_grid_set_disk ds_grid_add_disk ds_grid_multiply_disk ds_grid_set_grid_region ds_grid_add_grid_region ds_grid_multiply_grid_region ds_grid_get ds_grid_get_sum ds_grid_get_max ds_grid_get_min ds_grid_get_mean ds_grid_get_disk_sum ds_grid_get_disk_min ds_grid_get_disk_max ds_grid_get_disk_mean ds_grid_value_exists ds_grid_value_x ds_grid_value_y ds_grid_value_disk_exists ds_grid_value_disk_x ds_grid_value_disk_y ds_grid_shuffle ds_grid_write ds_grid_read ds_grid_sort ds_grid_set ds_grid_get effect_create_below effect_create_above effect_clear part_type_create part_type_destroy part_type_exists part_type_clear part_type_shape part_type_sprite part_type_size part_type_scale part_type_orientation part_type_life part_type_step part_type_death part_type_speed part_type_direction part_type_gravity part_type_colour1 part_type_colour2 part_type_colour3 part_type_colour_mix part_type_colour_rgb part_type_colour_hsv part_type_color1 part_type_color2 part_type_color3 part_type_color_mix part_type_color_rgb part_type_color_hsv part_type_alpha1 part_type_alpha2 part_type_alpha3 part_type_blend part_system_create part_system_create_layer part_system_destroy part_system_exists part_system_clear part_system_draw_order part_system_depth part_system_position part_system_automatic_update part_system_automatic_draw part_system_update part_system_drawit part_system_get_layer part_system_layer part_particles_create part_particles_create_colour part_particles_create_color part_particles_clear part_particles_count part_emitter_create part_emitter_destroy part_emitter_destroy_all part_emitter_exists part_emitter_clear part_emitter_region part_emitter_burst part_emitter_stream external_call external_define external_free window_handle window_device matrix_get matrix_set matrix_build_identity matrix_build matrix_build_lookat matrix_build_projection_ortho matrix_build_projection_perspective matrix_build_projection_perspective_fov matrix_multiply matrix_transform_vertex matrix_stack_push matrix_stack_pop matrix_stack_multiply matrix_stack_set matrix_stack_clear matrix_stack_top matrix_stack_is_empty browser_input_capture os_get_config os_get_info os_get_language os_get_region os_lock_orientation display_get_dpi_x display_get_dpi_y display_set_gui_size display_set_gui_maximise display_set_gui_maximize device_mouse_dbclick_enable display_set_timing_method display_get_timing_method display_set_sleep_margin display_get_sleep_margin virtual_key_add virtual_key_hide virtual_key_delete virtual_key_show draw_enable_drawevent draw_enable_swf_aa draw_set_swf_aa_level draw_get_swf_aa_level draw_texture_flush draw_flush gpu_set_blendenable gpu_set_ztestenable gpu_set_zfunc gpu_set_zwriteenable gpu_set_lightingenable gpu_set_fog gpu_set_cullmode gpu_set_blendmode gpu_set_blendmode_ext gpu_set_blendmode_ext_sepalpha gpu_set_colorwriteenable gpu_set_colourwriteenable gpu_set_alphatestenable gpu_set_alphatestref gpu_set_alphatestfunc gpu_set_texfilter gpu_set_texfilter_ext gpu_set_texrepeat gpu_set_texrepeat_ext gpu_set_tex_filter gpu_set_tex_filter_ext gpu_set_tex_repeat gpu_set_tex_repeat_ext gpu_set_tex_mip_filter gpu_set_tex_mip_filter_ext gpu_set_tex_mip_bias gpu_set_tex_mip_bias_ext gpu_set_tex_min_mip gpu_set_tex_min_mip_ext gpu_set_tex_max_mip gpu_set_tex_max_mip_ext gpu_set_tex_max_aniso gpu_set_tex_max_aniso_ext gpu_set_tex_mip_enable gpu_set_tex_mip_enable_ext gpu_get_blendenable gpu_get_ztestenable gpu_get_zfunc gpu_get_zwriteenable gpu_get_lightingenable gpu_get_fog gpu_get_cullmode gpu_get_blendmode gpu_get_blendmode_ext gpu_get_blendmode_ext_sepalpha gpu_get_blendmode_src gpu_get_blendmode_dest gpu_get_blendmode_srcalpha gpu_get_blendmode_destalpha gpu_get_colorwriteenable gpu_get_colourwriteenable gpu_get_alphatestenable gpu_get_alphatestref gpu_get_alphatestfunc gpu_get_texfilter gpu_get_texfilter_ext gpu_get_texrepeat gpu_get_texrepeat_ext gpu_get_tex_filter gpu_get_tex_filter_ext gpu_get_tex_repeat gpu_get_tex_repeat_ext gpu_get_tex_mip_filter gpu_get_tex_mip_filter_ext gpu_get_tex_mip_bias gpu_get_tex_mip_bias_ext gpu_get_tex_min_mip gpu_get_tex_min_mip_ext gpu_get_tex_max_mip gpu_get_tex_max_mip_ext gpu_get_tex_max_aniso gpu_get_tex_max_aniso_ext gpu_get_tex_mip_enable gpu_get_tex_mip_enable_ext gpu_push_state gpu_pop_state gpu_get_state gpu_set_state draw_light_define_ambient draw_light_define_direction draw_light_define_point draw_light_enable draw_set_lighting draw_light_get_ambient draw_light_get draw_get_lighting shop_leave_rating url_get_domain url_open url_open_ext url_open_full get_timer achievement_login achievement_logout achievement_post achievement_increment achievement_post_score achievement_available achievement_show_achievements achievement_show_leaderboards achievement_load_friends achievement_load_leaderboard achievement_send_challenge achievement_load_progress achievement_reset achievement_login_status achievement_get_pic achievement_show_challenge_notifications achievement_get_challenges achievement_event achievement_show achievement_get_info cloud_file_save cloud_string_save cloud_synchronise ads_enable ads_disable ads_setup ads_engagement_launch ads_engagement_available ads_engagement_active ads_event ads_event_preload ads_set_reward_callback ads_get_display_height ads_get_display_width ads_move ads_interstitial_available ads_interstitial_display device_get_tilt_x device_get_tilt_y device_get_tilt_z device_is_keypad_open device_mouse_check_button device_mouse_check_button_pressed device_mouse_check_button_released device_mouse_x device_mouse_y device_mouse_raw_x device_mouse_raw_y device_mouse_x_to_gui device_mouse_y_to_gui iap_activate iap_status iap_enumerate_products iap_restore_all iap_acquire iap_consume iap_product_details iap_purchase_details facebook_init facebook_login facebook_status facebook_graph_request facebook_dialog facebook_logout facebook_launch_offerwall facebook_post_message facebook_send_invite facebook_user_id facebook_accesstoken facebook_check_permission facebook_request_read_permissions facebook_request_publish_permissions gamepad_is_supported gamepad_get_device_count gamepad_is_connected gamepad_get_description gamepad_get_button_threshold gamepad_set_button_threshold gamepad_get_axis_deadzone gamepad_set_axis_deadzone gamepad_button_count gamepad_button_check gamepad_button_check_pressed gamepad_button_check_released gamepad_button_value gamepad_axis_count gamepad_axis_value gamepad_set_vibration gamepad_set_colour gamepad_set_color os_is_paused window_has_focus code_is_compiled http_get http_get_file http_post_string http_request json_encode json_decode zip_unzip load_csv base64_encode base64_decode md5_string_unicode md5_string_utf8 md5_file os_is_network_connected sha1_string_unicode sha1_string_utf8 sha1_file os_powersave_enable analytics_event analytics_event_ext win8_livetile_tile_notification win8_livetile_tile_clear win8_livetile_badge_notification win8_livetile_badge_clear win8_livetile_queue_enable win8_secondarytile_pin win8_secondarytile_badge_notification win8_secondarytile_delete win8_livetile_notification_begin win8_livetile_notification_secondary_begin win8_livetile_notification_expiry win8_livetile_notification_tag win8_livetile_notification_text_add win8_livetile_notification_image_add win8_livetile_notification_end win8_appbar_enable win8_appbar_add_element win8_appbar_remove_element win8_settingscharm_add_entry win8_settingscharm_add_html_entry win8_settingscharm_add_xaml_entry win8_settingscharm_set_xaml_property win8_settingscharm_get_xaml_property win8_settingscharm_remove_entry win8_share_image win8_share_screenshot win8_share_file win8_share_url win8_share_text win8_search_enable win8_search_disable win8_search_add_suggestions win8_device_touchscreen_available win8_license_initialize_sandbox win8_license_trial_version winphone_license_trial_version winphone_tile_title winphone_tile_count winphone_tile_back_title winphone_tile_back_content winphone_tile_back_content_wide winphone_tile_front_image winphone_tile_front_image_small winphone_tile_front_image_wide winphone_tile_back_image winphone_tile_back_image_wide winphone_tile_background_colour winphone_tile_background_color winphone_tile_icon_image winphone_tile_small_icon_image winphone_tile_wide_content winphone_tile_cycle_images winphone_tile_small_background_image physics_world_create physics_world_gravity physics_world_update_speed physics_world_update_iterations physics_world_draw_debug physics_pause_enable physics_fixture_create physics_fixture_set_kinematic physics_fixture_set_density physics_fixture_set_awake physics_fixture_set_restitution physics_fixture_set_friction physics_fixture_set_collision_group physics_fixture_set_sensor physics_fixture_set_linear_damping physics_fixture_set_angular_damping physics_fixture_set_circle_shape physics_fixture_set_box_shape physics_fixture_set_edge_shape physics_fixture_set_polygon_shape physics_fixture_set_chain_shape physics_fixture_add_point physics_fixture_bind physics_fixture_bind_ext physics_fixture_delete physics_apply_force physics_apply_impulse physics_apply_angular_impulse physics_apply_local_force physics_apply_local_impulse physics_apply_torque physics_mass_properties physics_draw_debug physics_test_overlap physics_remove_fixture physics_set_friction physics_set_density physics_set_restitution physics_get_friction physics_get_density physics_get_restitution physics_joint_distance_create physics_joint_rope_create physics_joint_revolute_create physics_joint_prismatic_create physics_joint_pulley_create physics_joint_wheel_create physics_joint_weld_create physics_joint_friction_create physics_joint_gear_create physics_joint_enable_motor physics_joint_get_value physics_joint_set_value physics_joint_delete physics_particle_create physics_particle_delete physics_particle_delete_region_circle physics_particle_delete_region_box physics_particle_delete_region_poly physics_particle_set_flags physics_particle_set_category_flags physics_particle_draw physics_particle_draw_ext physics_particle_count physics_particle_get_data physics_particle_get_data_particle physics_particle_group_begin physics_particle_group_circle physics_particle_group_box physics_particle_group_polygon physics_particle_group_add_point physics_particle_group_end physics_particle_group_join physics_particle_group_delete physics_particle_group_count physics_particle_group_get_data physics_particle_group_get_mass physics_particle_group_get_inertia physics_particle_group_get_centre_x physics_particle_group_get_centre_y physics_particle_group_get_vel_x physics_particle_group_get_vel_y physics_particle_group_get_ang_vel physics_particle_group_get_x physics_particle_group_get_y physics_particle_group_get_angle physics_particle_set_group_flags physics_particle_get_group_flags physics_particle_get_max_count physics_particle_get_radius physics_particle_get_density physics_particle_get_damping physics_particle_get_gravity_scale physics_particle_set_max_count physics_particle_set_radius physics_particle_set_density physics_particle_set_damping physics_particle_set_gravity_scale network_create_socket network_create_socket_ext network_create_server network_create_server_raw network_connect network_connect_raw network_send_packet network_send_raw network_send_broadcast network_send_udp network_send_udp_raw network_set_timeout network_set_config network_resolve network_destroy buffer_create buffer_write buffer_read buffer_seek buffer_get_surface buffer_set_surface buffer_delete buffer_exists buffer_get_type buffer_get_alignment buffer_poke buffer_peek buffer_save buffer_save_ext buffer_load buffer_load_ext buffer_load_partial buffer_copy buffer_fill buffer_get_size buffer_tell buffer_resize buffer_md5 buffer_sha1 buffer_base64_encode buffer_base64_decode buffer_base64_decode_ext buffer_sizeof buffer_get_address buffer_create_from_vertex_buffer buffer_create_from_vertex_buffer_ext buffer_copy_from_vertex_buffer buffer_async_group_begin buffer_async_group_option buffer_async_group_end buffer_load_async buffer_save_async gml_release_mode gml_pragma steam_activate_overlay steam_is_overlay_enabled steam_is_overlay_activated steam_get_persona_name steam_initialised steam_is_cloud_enabled_for_app steam_is_cloud_enabled_for_account steam_file_persisted steam_get_quota_total steam_get_quota_free steam_file_write steam_file_write_file steam_file_read steam_file_delete steam_file_exists steam_file_size steam_file_share steam_is_screenshot_requested steam_send_screenshot steam_is_user_logged_on steam_get_user_steam_id steam_user_owns_dlc steam_user_installed_dlc steam_set_achievement steam_get_achievement steam_clear_achievement steam_set_stat_int steam_set_stat_float steam_set_stat_avg_rate steam_get_stat_int steam_get_stat_float steam_get_stat_avg_rate steam_reset_all_stats steam_reset_all_stats_achievements steam_stats_ready steam_create_leaderboard steam_upload_score steam_upload_score_ext steam_download_scores_around_user steam_download_scores steam_download_friends_scores steam_upload_score_buffer steam_upload_score_buffer_ext steam_current_game_language steam_available_languages steam_activate_overlay_browser steam_activate_overlay_user steam_activate_overlay_store steam_get_user_persona_name steam_get_app_id steam_get_user_account_id steam_ugc_download steam_ugc_create_item steam_ugc_start_item_update steam_ugc_set_item_title steam_ugc_set_item_description steam_ugc_set_item_visibility steam_ugc_set_item_tags steam_ugc_set_item_content steam_ugc_set_item_preview steam_ugc_submit_item_update steam_ugc_get_item_update_progress steam_ugc_subscribe_item steam_ugc_unsubscribe_item steam_ugc_num_subscribed_items steam_ugc_get_subscribed_items steam_ugc_get_item_install_info steam_ugc_get_item_update_info steam_ugc_request_item_details steam_ugc_create_query_user steam_ugc_create_query_user_ex steam_ugc_create_query_all steam_ugc_create_query_all_ex steam_ugc_query_set_cloud_filename_filter steam_ugc_query_set_match_any_tag steam_ugc_query_set_search_text steam_ugc_query_set_ranked_by_trend_days steam_ugc_query_add_required_tag steam_ugc_query_add_excluded_tag steam_ugc_query_set_return_long_description steam_ugc_query_set_return_total_only steam_ugc_query_set_allow_cached_response steam_ugc_send_query shader_set shader_get_name shader_reset shader_current shader_is_compiled shader_get_sampler_index shader_get_uniform shader_set_uniform_i shader_set_uniform_i_array shader_set_uniform_f shader_set_uniform_f_array shader_set_uniform_matrix shader_set_uniform_matrix_array shader_enable_corner_id texture_set_stage texture_get_texel_width texture_get_texel_height shaders_are_supported vertex_format_begin vertex_format_end vertex_format_delete vertex_format_add_position vertex_format_add_position_3d vertex_format_add_colour vertex_format_add_color vertex_format_add_normal vertex_format_add_texcoord vertex_format_add_textcoord vertex_format_add_custom vertex_create_buffer vertex_create_buffer_ext vertex_delete_buffer vertex_begin vertex_end vertex_position vertex_position_3d vertex_colour vertex_color vertex_argb vertex_texcoord vertex_normal vertex_float1 vertex_float2 vertex_float3 vertex_float4 vertex_ubyte4 vertex_submit vertex_freeze vertex_get_number vertex_get_buffer_size vertex_create_buffer_from_buffer vertex_create_buffer_from_buffer_ext push_local_notification push_get_first_local_notification push_get_next_local_notification push_cancel_local_notification skeleton_animation_set skeleton_animation_get skeleton_animation_mix skeleton_animation_set_ext skeleton_animation_get_ext skeleton_animation_get_duration skeleton_animation_get_frames skeleton_animation_clear skeleton_skin_set skeleton_skin_get skeleton_attachment_set skeleton_attachment_get skeleton_attachment_create skeleton_collision_draw_set skeleton_bone_data_get skeleton_bone_data_set skeleton_bone_state_get skeleton_bone_state_set skeleton_get_minmax skeleton_get_num_bounds skeleton_get_bounds skeleton_animation_get_frame skeleton_animation_set_frame draw_skeleton draw_skeleton_time draw_skeleton_instance draw_skeleton_collision skeleton_animation_list skeleton_skin_list skeleton_slot_data layer_get_id layer_get_id_at_depth layer_get_depth layer_create layer_destroy layer_destroy_instances layer_add_instance layer_has_instance layer_set_visible layer_get_visible layer_exists layer_x layer_y layer_get_x layer_get_y layer_hspeed layer_vspeed layer_get_hspeed layer_get_vspeed layer_script_begin layer_script_end layer_shader layer_get_script_begin layer_get_script_end layer_get_shader layer_set_target_room layer_get_target_room layer_reset_target_room layer_get_all layer_get_all_elements layer_get_name layer_depth layer_get_element_layer layer_get_element_type layer_element_move layer_force_draw_depth layer_is_draw_depth_forced layer_get_forced_depth layer_background_get_id layer_background_exists layer_background_create layer_background_destroy layer_background_visible layer_background_change layer_background_sprite layer_background_htiled layer_background_vtiled layer_background_stretch layer_background_yscale layer_background_xscale layer_background_blend layer_background_alpha layer_background_index layer_background_speed layer_background_get_visible layer_background_get_sprite layer_background_get_htiled layer_background_get_vtiled layer_background_get_stretch layer_background_get_yscale layer_background_get_xscale layer_background_get_blend layer_background_get_alpha layer_background_get_index layer_background_get_speed layer_sprite_get_id layer_sprite_exists layer_sprite_create layer_sprite_destroy layer_sprite_change layer_sprite_index layer_sprite_speed layer_sprite_xscale layer_sprite_yscale layer_sprite_angle layer_sprite_blend layer_sprite_alpha layer_sprite_x layer_sprite_y layer_sprite_get_sprite layer_sprite_get_index layer_sprite_get_speed layer_sprite_get_xscale layer_sprite_get_yscale layer_sprite_get_angle layer_sprite_get_blend layer_sprite_get_alpha layer_sprite_get_x layer_sprite_get_y layer_tilemap_get_id layer_tilemap_exists layer_tilemap_create layer_tilemap_destroy tilemap_tileset tilemap_x tilemap_y tilemap_set tilemap_set_at_pixel tilemap_get_tileset tilemap_get_tile_width tilemap_get_tile_height tilemap_get_width tilemap_get_height tilemap_get_x tilemap_get_y tilemap_get tilemap_get_at_pixel tilemap_get_cell_x_at_pixel tilemap_get_cell_y_at_pixel tilemap_clear draw_tilemap draw_tile tilemap_set_global_mask tilemap_get_global_mask tilemap_set_mask tilemap_get_mask tilemap_get_frame tile_set_empty tile_set_index tile_set_flip tile_set_mirror tile_set_rotate tile_get_empty tile_get_index tile_get_flip tile_get_mirror tile_get_rotate layer_tile_exists layer_tile_create layer_tile_destroy layer_tile_change layer_tile_xscale layer_tile_yscale layer_tile_blend layer_tile_alpha layer_tile_x layer_tile_y layer_tile_region layer_tile_visible layer_tile_get_sprite layer_tile_get_xscale layer_tile_get_yscale layer_tile_get_blend layer_tile_get_alpha layer_tile_get_x layer_tile_get_y layer_tile_get_region layer_tile_get_visible layer_instance_get_instance instance_activate_layer instance_deactivate_layer camera_create camera_create_view camera_destroy camera_apply camera_get_active camera_get_default camera_set_default camera_set_view_mat camera_set_proj_mat camera_set_update_script camera_set_begin_script camera_set_end_script camera_set_view_pos camera_set_view_size camera_set_view_speed camera_set_view_border camera_set_view_angle camera_set_view_target camera_get_view_mat camera_get_proj_mat camera_get_update_script camera_get_begin_script camera_get_end_script camera_get_view_x camera_get_view_y camera_get_view_width camera_get_view_height camera_get_view_speed_x camera_get_view_speed_y camera_get_view_border_x camera_get_view_border_y camera_get_view_angle camera_get_view_target view_get_camera view_get_visible view_get_xport view_get_yport view_get_wport view_get_hport view_get_surface_id view_set_camera view_set_visible view_set_xport view_set_yport view_set_wport view_set_hport view_set_surface_id gesture_drag_time gesture_drag_distance gesture_flick_speed gesture_double_tap_time gesture_double_tap_distance gesture_pinch_distance gesture_pinch_angle_towards gesture_pinch_angle_away gesture_rotate_time gesture_rotate_angle gesture_tap_count gesture_get_drag_time gesture_get_drag_distance gesture_get_flick_speed gesture_get_double_tap_time gesture_get_double_tap_distance gesture_get_pinch_distance gesture_get_pinch_angle_towards gesture_get_pinch_angle_away gesture_get_rotate_time gesture_get_rotate_angle gesture_get_tap_count keyboard_virtual_show keyboard_virtual_hide keyboard_virtual_status keyboard_virtual_height",
-literal:"self other all noone global local undefined pointer_invalid pointer_null path_action_stop path_action_restart path_action_continue path_action_reverse true false pi GM_build_date GM_version GM_runtime_version  timezone_local timezone_utc gamespeed_fps gamespeed_microseconds  ev_create ev_destroy ev_step ev_alarm ev_keyboard ev_mouse ev_collision ev_other ev_draw ev_draw_begin ev_draw_end ev_draw_pre ev_draw_post ev_keypress ev_keyrelease ev_trigger ev_left_button ev_right_button ev_middle_button ev_no_button ev_left_press ev_right_press ev_middle_press ev_left_release ev_right_release ev_middle_release ev_mouse_enter ev_mouse_leave ev_mouse_wheel_up ev_mouse_wheel_down ev_global_left_button ev_global_right_button ev_global_middle_button ev_global_left_press ev_global_right_press ev_global_middle_press ev_global_left_release ev_global_right_release ev_global_middle_release ev_joystick1_left ev_joystick1_right ev_joystick1_up ev_joystick1_down ev_joystick1_button1 ev_joystick1_button2 ev_joystick1_button3 ev_joystick1_button4 ev_joystick1_button5 ev_joystick1_button6 ev_joystick1_button7 ev_joystick1_button8 ev_joystick2_left ev_joystick2_right ev_joystick2_up ev_joystick2_down ev_joystick2_button1 ev_joystick2_button2 ev_joystick2_button3 ev_joystick2_button4 ev_joystick2_button5 ev_joystick2_button6 ev_joystick2_button7 ev_joystick2_button8 ev_outside ev_boundary ev_game_start ev_game_end ev_room_start ev_room_end ev_no_more_lives ev_animation_end ev_end_of_path ev_no_more_health ev_close_button ev_user0 ev_user1 ev_user2 ev_user3 ev_user4 ev_user5 ev_user6 ev_user7 ev_user8 ev_user9 ev_user10 ev_user11 ev_user12 ev_user13 ev_user14 ev_user15 ev_step_normal ev_step_begin ev_step_end ev_gui ev_gui_begin ev_gui_end ev_cleanup ev_gesture ev_gesture_tap ev_gesture_double_tap ev_gesture_drag_start ev_gesture_dragging ev_gesture_drag_end ev_gesture_flick ev_gesture_pinch_start ev_gesture_pinch_in ev_gesture_pinch_out ev_gesture_pinch_end ev_gesture_rotate_start ev_gesture_rotating ev_gesture_rotate_end ev_global_gesture_tap ev_global_gesture_double_tap ev_global_gesture_drag_start ev_global_gesture_dragging ev_global_gesture_drag_end ev_global_gesture_flick ev_global_gesture_pinch_start ev_global_gesture_pinch_in ev_global_gesture_pinch_out ev_global_gesture_pinch_end ev_global_gesture_rotate_start ev_global_gesture_rotating ev_global_gesture_rotate_end vk_nokey vk_anykey vk_enter vk_return vk_shift vk_control vk_alt vk_escape vk_space vk_backspace vk_tab vk_pause vk_printscreen vk_left vk_right vk_up vk_down vk_home vk_end vk_delete vk_insert vk_pageup vk_pagedown vk_f1 vk_f2 vk_f3 vk_f4 vk_f5 vk_f6 vk_f7 vk_f8 vk_f9 vk_f10 vk_f11 vk_f12 vk_numpad0 vk_numpad1 vk_numpad2 vk_numpad3 vk_numpad4 vk_numpad5 vk_numpad6 vk_numpad7 vk_numpad8 vk_numpad9 vk_divide vk_multiply vk_subtract vk_add vk_decimal vk_lshift vk_lcontrol vk_lalt vk_rshift vk_rcontrol vk_ralt  mb_any mb_none mb_left mb_right mb_middle c_aqua c_black c_blue c_dkgray c_fuchsia c_gray c_green c_lime c_ltgray c_maroon c_navy c_olive c_purple c_red c_silver c_teal c_white c_yellow c_orange fa_left fa_center fa_right fa_top fa_middle fa_bottom pr_pointlist pr_linelist pr_linestrip pr_trianglelist pr_trianglestrip pr_trianglefan bm_complex bm_normal bm_add bm_max bm_subtract bm_zero bm_one bm_src_colour bm_inv_src_colour bm_src_color bm_inv_src_color bm_src_alpha bm_inv_src_alpha bm_dest_alpha bm_inv_dest_alpha bm_dest_colour bm_inv_dest_colour bm_dest_color bm_inv_dest_color bm_src_alpha_sat tf_point tf_linear tf_anisotropic mip_off mip_on mip_markedonly audio_falloff_none audio_falloff_inverse_distance audio_falloff_inverse_distance_clamped audio_falloff_linear_distance audio_falloff_linear_distance_clamped audio_falloff_exponent_distance audio_falloff_exponent_distance_clamped audio_old_system audio_new_system audio_mono audio_stereo audio_3d cr_default cr_none cr_arrow cr_cross cr_beam cr_size_nesw cr_size_ns cr_size_nwse cr_size_we cr_uparrow cr_hourglass cr_drag cr_appstart cr_handpoint cr_size_all spritespeed_framespersecond spritespeed_framespergameframe asset_object asset_unknown asset_sprite asset_sound asset_room asset_path asset_script asset_font asset_timeline asset_tiles asset_shader fa_readonly fa_hidden fa_sysfile fa_volumeid fa_directory fa_archive  ds_type_map ds_type_list ds_type_stack ds_type_queue ds_type_grid ds_type_priority ef_explosion ef_ring ef_ellipse ef_firework ef_smoke ef_smokeup ef_star ef_spark ef_flare ef_cloud ef_rain ef_snow pt_shape_pixel pt_shape_disk pt_shape_square pt_shape_line pt_shape_star pt_shape_circle pt_shape_ring pt_shape_sphere pt_shape_flare pt_shape_spark pt_shape_explosion pt_shape_cloud pt_shape_smoke pt_shape_snow ps_distr_linear ps_distr_gaussian ps_distr_invgaussian ps_shape_rectangle ps_shape_ellipse ps_shape_diamond ps_shape_line ty_real ty_string dll_cdecl dll_stdcall matrix_view matrix_projection matrix_world os_win32 os_windows os_macosx os_ios os_android os_symbian os_linux os_unknown os_winphone os_tizen os_win8native os_wiiu os_3ds  os_psvita os_bb10 os_ps4 os_xboxone os_ps3 os_xbox360 os_uwp os_tvos os_switch browser_not_a_browser browser_unknown browser_ie browser_firefox browser_chrome browser_safari browser_safari_mobile browser_opera browser_tizen browser_edge browser_windows_store browser_ie_mobile  device_ios_unknown device_ios_iphone device_ios_iphone_retina device_ios_ipad device_ios_ipad_retina device_ios_iphone5 device_ios_iphone6 device_ios_iphone6plus device_emulator device_tablet display_landscape display_landscape_flipped display_portrait display_portrait_flipped tm_sleep tm_countvsyncs of_challenge_win of_challen ge_lose of_challenge_tie leaderboard_type_number leaderboard_type_time_mins_secs cmpfunc_never cmpfunc_less cmpfunc_equal cmpfunc_lessequal cmpfunc_greater cmpfunc_notequal cmpfunc_greaterequal cmpfunc_always cull_noculling cull_clockwise cull_counterclockwise lighttype_dir lighttype_point iap_ev_storeload iap_ev_product iap_ev_purchase iap_ev_consume iap_ev_restore iap_storeload_ok iap_storeload_failed iap_status_uninitialised iap_status_unavailable iap_status_loading iap_status_available iap_status_processing iap_status_restoring iap_failed iap_unavailable iap_available iap_purchased iap_canceled iap_refunded fb_login_default fb_login_fallback_to_webview fb_login_no_fallback_to_webview fb_login_forcing_webview fb_login_use_system_account fb_login_forcing_safari  phy_joint_anchor_1_x phy_joint_anchor_1_y phy_joint_anchor_2_x phy_joint_anchor_2_y phy_joint_reaction_force_x phy_joint_reaction_force_y phy_joint_reaction_torque phy_joint_motor_speed phy_joint_angle phy_joint_motor_torque phy_joint_max_motor_torque phy_joint_translation phy_joint_speed phy_joint_motor_force phy_joint_max_motor_force phy_joint_length_1 phy_joint_length_2 phy_joint_damping_ratio phy_joint_frequency phy_joint_lower_angle_limit phy_joint_upper_angle_limit phy_joint_angle_limits phy_joint_max_length phy_joint_max_torque phy_joint_max_force phy_debug_render_aabb phy_debug_render_collision_pairs phy_debug_render_coms phy_debug_render_core_shapes phy_debug_render_joints phy_debug_render_obb phy_debug_render_shapes  phy_particle_flag_water phy_particle_flag_zombie phy_particle_flag_wall phy_particle_flag_spring phy_particle_flag_elastic phy_particle_flag_viscous phy_particle_flag_powder phy_particle_flag_tensile phy_particle_flag_colourmixing phy_particle_flag_colormixing phy_particle_group_flag_solid phy_particle_group_flag_rigid phy_particle_data_flag_typeflags phy_particle_data_flag_position phy_particle_data_flag_velocity phy_particle_data_flag_colour phy_particle_data_flag_color phy_particle_data_flag_category  achievement_our_info achievement_friends_info achievement_leaderboard_info achievement_achievement_info achievement_filter_all_players achievement_filter_friends_only achievement_filter_favorites_only achievement_type_achievement_challenge achievement_type_score_challenge achievement_pic_loaded  achievement_show_ui achievement_show_profile achievement_show_leaderboard achievement_show_achievement achievement_show_bank achievement_show_friend_picker achievement_show_purchase_prompt network_socket_tcp network_socket_udp network_socket_bluetooth network_type_connect network_type_disconnect network_type_data network_type_non_blocking_connect network_config_connect_timeout network_config_use_non_blocking_socket network_config_enable_reliable_udp network_config_disable_reliable_udp buffer_fixed buffer_grow buffer_wrap buffer_fast buffer_vbuffer buffer_network buffer_u8 buffer_s8 buffer_u16 buffer_s16 buffer_u32 buffer_s32 buffer_u64 buffer_f16 buffer_f32 buffer_f64 buffer_bool buffer_text buffer_string buffer_surface_copy buffer_seek_start buffer_seek_relative buffer_seek_end buffer_generalerror buffer_outofspace buffer_outofbounds buffer_invalidtype  text_type button_type input_type ANSI_CHARSET DEFAULT_CHARSET EASTEUROPE_CHARSET RUSSIAN_CHARSET SYMBOL_CHARSET SHIFTJIS_CHARSET HANGEUL_CHARSET GB2312_CHARSET CHINESEBIG5_CHARSET JOHAB_CHARSET HEBREW_CHARSET ARABIC_CHARSET GREEK_CHARSET TURKISH_CHARSET VIETNAMESE_CHARSET THAI_CHARSET MAC_CHARSET BALTIC_CHARSET OEM_CHARSET  gp_face1 gp_face2 gp_face3 gp_face4 gp_shoulderl gp_shoulderr gp_shoulderlb gp_shoulderrb gp_select gp_start gp_stickl gp_stickr gp_padu gp_padd gp_padl gp_padr gp_axislh gp_axislv gp_axisrh gp_axisrv ov_friends ov_community ov_players ov_settings ov_gamegroup ov_achievements lb_sort_none lb_sort_ascending lb_sort_descending lb_disp_none lb_disp_numeric lb_disp_time_sec lb_disp_time_ms ugc_result_success ugc_filetype_community ugc_filetype_microtrans ugc_visibility_public ugc_visibility_friends_only ugc_visibility_private ugc_query_RankedByVote ugc_query_RankedByPublicationDate ugc_query_AcceptedForGameRankedByAcceptanceDate ugc_query_RankedByTrend ugc_query_FavoritedByFriendsRankedByPublicationDate ugc_query_CreatedByFriendsRankedByPublicationDate ugc_query_RankedByNumTimesReported ugc_query_CreatedByFollowedUsersRankedByPublicationDate ugc_query_NotYetRated ugc_query_RankedByTotalVotesAsc ugc_query_RankedByVotesUp ugc_query_RankedByTextSearch ugc_sortorder_CreationOrderDesc ugc_sortorder_CreationOrderAsc ugc_sortorder_TitleAsc ugc_sortorder_LastUpdatedDesc ugc_sortorder_SubscriptionDateDesc ugc_sortorder_VoteScoreDesc ugc_sortorder_ForModeration ugc_list_Published ugc_list_VotedOn ugc_list_VotedUp ugc_list_VotedDown ugc_list_WillVoteLater ugc_list_Favorited ugc_list_Subscribed ugc_list_UsedOrPlayed ugc_list_Followed ugc_match_Items ugc_match_Items_Mtx ugc_match_Items_ReadyToUse ugc_match_Collections ugc_match_Artwork ugc_match_Videos ugc_match_Screenshots ugc_match_AllGuides ugc_match_WebGuides ugc_match_IntegratedGuides ugc_match_UsableInGame ugc_match_ControllerBindings  vertex_usage_position vertex_usage_colour vertex_usage_color vertex_usage_normal vertex_usage_texcoord vertex_usage_textcoord vertex_usage_blendweight vertex_usage_blendindices vertex_usage_psize vertex_usage_tangent vertex_usage_binormal vertex_usage_fog vertex_usage_depth vertex_usage_sample vertex_type_float1 vertex_type_float2 vertex_type_float3 vertex_type_float4 vertex_type_colour vertex_type_color vertex_type_ubyte4 layerelementtype_undefined layerelementtype_background layerelementtype_instance layerelementtype_oldtilemap layerelementtype_sprite layerelementtype_tilemap layerelementtype_particlesystem layerelementtype_tile tile_rotate tile_flip tile_mirror tile_index_mask kbv_type_default kbv_type_ascii kbv_type_url kbv_type_email kbv_type_numbers kbv_type_phone kbv_type_phone_name kbv_returnkey_default kbv_returnkey_go kbv_returnkey_google kbv_returnkey_join kbv_returnkey_next kbv_returnkey_route kbv_returnkey_search kbv_returnkey_send kbv_returnkey_yahoo kbv_returnkey_done kbv_returnkey_continue kbv_returnkey_emergency kbv_autocapitalize_none kbv_autocapitalize_words kbv_autocapitalize_sentences kbv_autocapitalize_characters",symbol:"argument_relative argument argument0 argument1 argument2 argument3 argument4 argument5 argument6 argument7 argument8 argument9 argument10 argument11 argument12 argument13 argument14 argument15 argument_count x y xprevious yprevious xstart ystart hspeed vspeed direction speed friction gravity gravity_direction path_index path_position path_positionprevious path_speed path_scale path_orientation path_endaction object_index id solid persistent mask_index instance_count instance_id room_speed fps fps_real current_time current_year current_month current_day current_weekday current_hour current_minute current_second alarm timeline_index timeline_position timeline_speed timeline_running timeline_loop room room_first room_last room_width room_height room_caption room_persistent score lives health show_score show_lives show_health caption_score caption_lives caption_health event_type event_number event_object event_action application_surface gamemaker_pro gamemaker_registered gamemaker_version error_occurred error_last debug_mode keyboard_key keyboard_lastkey keyboard_lastchar keyboard_string mouse_x mouse_y mouse_button mouse_lastbutton cursor_sprite visible sprite_index sprite_width sprite_height sprite_xoffset sprite_yoffset image_number image_index image_speed depth image_xscale image_yscale image_angle image_alpha image_blend bbox_left bbox_right bbox_top bbox_bottom layer background_colour  background_showcolour background_color background_showcolor view_enabled view_current view_visible view_xview view_yview view_wview view_hview view_xport view_yport view_wport view_hport view_angle view_hborder view_vborder view_hspeed view_vspeed view_object view_surface_id view_camera game_id game_display_name game_project_name game_save_id working_directory temp_directory program_directory browser_width browser_height os_type os_device os_browser os_version display_aa async_load delta_time webgl_enabled event_data iap_data phy_rotation phy_position_x phy_position_y phy_angular_velocity phy_linear_velocity_x phy_linear_velocity_y phy_speed_x phy_speed_y phy_speed phy_angular_damping phy_linear_damping phy_bullet phy_fixed_rotation phy_active phy_mass phy_inertia phy_com_x phy_com_y phy_dynamic phy_kinematic phy_sleeping phy_collision_points phy_collision_x phy_collision_y phy_col_normal_x phy_col_normal_y phy_position_xprevious phy_position_yprevious"};return{aliases:["gml","GML"],cI:!1,k:_,c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM]}});
\ No newline at end of file
+hljs.registerLanguage("gml",function(){"use strict";return function(e){return{name:"GML",aliases:["gml","GML"],case_insensitive:!1,keywords:{keyword:"begin end if then else while do for break continue with until repeat exit and or xor not return mod div switch case default var globalvar enum #macro #region #endregion",built_in:"is_real is_string is_array is_undefined is_int32 is_int64 is_ptr is_vec3 is_vec4 is_matrix is_bool typeof variable_global_exists variable_global_get variable_global_set variable_instance_exists variable_instance_get variable_instance_set variable_instance_get_names array_length_1d array_length_2d array_height_2d array_equals array_create array_copy random random_range irandom irandom_range random_set_seed random_get_seed randomize randomise choose abs round floor ceil sign frac sqrt sqr exp ln log2 log10 sin cos tan arcsin arccos arctan arctan2 dsin dcos dtan darcsin darccos darctan darctan2 degtorad radtodeg power logn min max mean median clamp lerp dot_product dot_product_3d dot_product_normalised dot_product_3d_normalised dot_product_normalized dot_product_3d_normalized math_set_epsilon math_get_epsilon angle_difference point_distance_3d point_distance point_direction lengthdir_x lengthdir_y real string int64 ptr string_format chr ansi_char ord string_length string_byte_length string_pos string_copy string_char_at string_ord_at string_byte_at string_set_byte_at string_delete string_insert string_lower string_upper string_repeat string_letters string_digits string_lettersdigits string_replace string_replace_all string_count string_hash_to_newline clipboard_has_text clipboard_set_text clipboard_get_text date_current_datetime date_create_datetime date_valid_datetime date_inc_year date_inc_month date_inc_week date_inc_day date_inc_hour date_inc_minute date_inc_second date_get_year date_get_month date_get_week date_get_day date_get_hour date_get_minute date_get_second date_get_weekday date_get_day_of_year date_get_hour_of_year date_get_minute_of_year date_get_second_of_year date_year_span date_month_span date_week_span date_day_span date_hour_span date_minute_span date_second_span date_compare_datetime date_compare_date date_compare_time date_date_of date_time_of date_datetime_string date_date_string date_time_string date_days_in_month date_days_in_year date_leap_year date_is_today date_set_timezone date_get_timezone game_set_speed game_get_speed motion_set motion_add place_free place_empty place_meeting place_snapped move_random move_snap move_towards_point move_contact_solid move_contact_all move_outside_solid move_outside_all move_bounce_solid move_bounce_all move_wrap distance_to_point distance_to_object position_empty position_meeting path_start path_end mp_linear_step mp_potential_step mp_linear_step_object mp_potential_step_object mp_potential_settings mp_linear_path mp_potential_path mp_linear_path_object mp_potential_path_object mp_grid_create mp_grid_destroy mp_grid_clear_all mp_grid_clear_cell mp_grid_clear_rectangle mp_grid_add_cell mp_grid_get_cell mp_grid_add_rectangle mp_grid_add_instances mp_grid_path mp_grid_draw mp_grid_to_ds_grid collision_point collision_rectangle collision_circle collision_ellipse collision_line collision_point_list collision_rectangle_list collision_circle_list collision_ellipse_list collision_line_list instance_position_list instance_place_list point_in_rectangle point_in_triangle point_in_circle rectangle_in_rectangle rectangle_in_triangle rectangle_in_circle instance_find instance_exists instance_number instance_position instance_nearest instance_furthest instance_place instance_create_depth instance_create_layer instance_copy instance_change instance_destroy position_destroy position_change instance_id_get instance_deactivate_all instance_deactivate_object instance_deactivate_region instance_activate_all instance_activate_object instance_activate_region room_goto room_goto_previous room_goto_next room_previous room_next room_restart game_end game_restart game_load game_save game_save_buffer game_load_buffer event_perform event_user event_perform_object event_inherited show_debug_message show_debug_overlay debug_event debug_get_callstack alarm_get alarm_set font_texture_page_size keyboard_set_map keyboard_get_map keyboard_unset_map keyboard_check keyboard_check_pressed keyboard_check_released keyboard_check_direct keyboard_get_numlock keyboard_set_numlock keyboard_key_press keyboard_key_release keyboard_clear io_clear mouse_check_button mouse_check_button_pressed mouse_check_button_released mouse_wheel_up mouse_wheel_down mouse_clear draw_self draw_sprite draw_sprite_pos draw_sprite_ext draw_sprite_stretched draw_sprite_stretched_ext draw_sprite_tiled draw_sprite_tiled_ext draw_sprite_part draw_sprite_part_ext draw_sprite_general draw_clear draw_clear_alpha draw_point draw_line draw_line_width draw_rectangle draw_roundrect draw_roundrect_ext draw_triangle draw_circle draw_ellipse draw_set_circle_precision draw_arrow draw_button draw_path draw_healthbar draw_getpixel draw_getpixel_ext draw_set_colour draw_set_color draw_set_alpha draw_get_colour draw_get_color draw_get_alpha merge_colour make_colour_rgb make_colour_hsv colour_get_red colour_get_green colour_get_blue colour_get_hue colour_get_saturation colour_get_value merge_color make_color_rgb make_color_hsv color_get_red color_get_green color_get_blue color_get_hue color_get_saturation color_get_value merge_color screen_save screen_save_part draw_set_font draw_set_halign draw_set_valign draw_text draw_text_ext string_width string_height string_width_ext string_height_ext draw_text_transformed draw_text_ext_transformed draw_text_colour draw_text_ext_colour draw_text_transformed_colour draw_text_ext_transformed_colour draw_text_color draw_text_ext_color draw_text_transformed_color draw_text_ext_transformed_color draw_point_colour draw_line_colour draw_line_width_colour draw_rectangle_colour draw_roundrect_colour draw_roundrect_colour_ext draw_triangle_colour draw_circle_colour draw_ellipse_colour draw_point_color draw_line_color draw_line_width_color draw_rectangle_color draw_roundrect_color draw_roundrect_color_ext draw_triangle_color draw_circle_color draw_ellipse_color draw_primitive_begin draw_vertex draw_vertex_colour draw_vertex_color draw_primitive_end sprite_get_uvs font_get_uvs sprite_get_texture font_get_texture texture_get_width texture_get_height texture_get_uvs draw_primitive_begin_texture draw_vertex_texture draw_vertex_texture_colour draw_vertex_texture_color texture_global_scale surface_create surface_create_ext surface_resize surface_free surface_exists surface_get_width surface_get_height surface_get_texture surface_set_target surface_set_target_ext surface_reset_target surface_depth_disable surface_get_depth_disable draw_surface draw_surface_stretched draw_surface_tiled draw_surface_part draw_surface_ext draw_surface_stretched_ext draw_surface_tiled_ext draw_surface_part_ext draw_surface_general surface_getpixel surface_getpixel_ext surface_save surface_save_part surface_copy surface_copy_part application_surface_draw_enable application_get_position application_surface_enable application_surface_is_enabled display_get_width display_get_height display_get_orientation display_get_gui_width display_get_gui_height display_reset display_mouse_get_x display_mouse_get_y display_mouse_set display_set_ui_visibility window_set_fullscreen window_get_fullscreen window_set_caption window_set_min_width window_set_max_width window_set_min_height window_set_max_height window_get_visible_rects window_get_caption window_set_cursor window_get_cursor window_set_colour window_get_colour window_set_color window_get_color window_set_position window_set_size window_set_rectangle window_center window_get_x window_get_y window_get_width window_get_height window_mouse_get_x window_mouse_get_y window_mouse_set window_view_mouse_get_x window_view_mouse_get_y window_views_mouse_get_x window_views_mouse_get_y audio_listener_position audio_listener_velocity audio_listener_orientation audio_emitter_position audio_emitter_create audio_emitter_free audio_emitter_exists audio_emitter_pitch audio_emitter_velocity audio_emitter_falloff audio_emitter_gain audio_play_sound audio_play_sound_on audio_play_sound_at audio_stop_sound audio_resume_music audio_music_is_playing audio_resume_sound audio_pause_sound audio_pause_music audio_channel_num audio_sound_length audio_get_type audio_falloff_set_model audio_play_music audio_stop_music audio_master_gain audio_music_gain audio_sound_gain audio_sound_pitch audio_stop_all audio_resume_all audio_pause_all audio_is_playing audio_is_paused audio_exists audio_sound_set_track_position audio_sound_get_track_position audio_emitter_get_gain audio_emitter_get_pitch audio_emitter_get_x audio_emitter_get_y audio_emitter_get_z audio_emitter_get_vx audio_emitter_get_vy audio_emitter_get_vz audio_listener_set_position audio_listener_set_velocity audio_listener_set_orientation audio_listener_get_data audio_set_master_gain audio_get_master_gain audio_sound_get_gain audio_sound_get_pitch audio_get_name audio_sound_set_track_position audio_sound_get_track_position audio_create_stream audio_destroy_stream audio_create_sync_group audio_destroy_sync_group audio_play_in_sync_group audio_start_sync_group audio_stop_sync_group audio_pause_sync_group audio_resume_sync_group audio_sync_group_get_track_pos audio_sync_group_debug audio_sync_group_is_playing audio_debug audio_group_load audio_group_unload audio_group_is_loaded audio_group_load_progress audio_group_name audio_group_stop_all audio_group_set_gain audio_create_buffer_sound audio_free_buffer_sound audio_create_play_queue audio_free_play_queue audio_queue_sound audio_get_recorder_count audio_get_recorder_info audio_start_recording audio_stop_recording audio_sound_get_listener_mask audio_emitter_get_listener_mask audio_get_listener_mask audio_sound_set_listener_mask audio_emitter_set_listener_mask audio_set_listener_mask audio_get_listener_count audio_get_listener_info audio_system show_message show_message_async clickable_add clickable_add_ext clickable_change clickable_change_ext clickable_delete clickable_exists clickable_set_style show_question show_question_async get_integer get_string get_integer_async get_string_async get_login_async get_open_filename get_save_filename get_open_filename_ext get_save_filename_ext show_error highscore_clear highscore_add highscore_value highscore_name draw_highscore sprite_exists sprite_get_name sprite_get_number sprite_get_width sprite_get_height sprite_get_xoffset sprite_get_yoffset sprite_get_bbox_left sprite_get_bbox_right sprite_get_bbox_top sprite_get_bbox_bottom sprite_save sprite_save_strip sprite_set_cache_size sprite_set_cache_size_ext sprite_get_tpe sprite_prefetch sprite_prefetch_multi sprite_flush sprite_flush_multi sprite_set_speed sprite_get_speed_type sprite_get_speed font_exists font_get_name font_get_fontname font_get_bold font_get_italic font_get_first font_get_last font_get_size font_set_cache_size path_exists path_get_name path_get_length path_get_time path_get_kind path_get_closed path_get_precision path_get_number path_get_point_x path_get_point_y path_get_point_speed path_get_x path_get_y path_get_speed script_exists script_get_name timeline_add timeline_delete timeline_clear timeline_exists timeline_get_name timeline_moment_clear timeline_moment_add_script timeline_size timeline_max_moment object_exists object_get_name object_get_sprite object_get_solid object_get_visible object_get_persistent object_get_mask object_get_parent object_get_physics object_is_ancestor room_exists room_get_name sprite_set_offset sprite_duplicate sprite_assign sprite_merge sprite_add sprite_replace sprite_create_from_surface sprite_add_from_surface sprite_delete sprite_set_alpha_from_sprite sprite_collision_mask font_add_enable_aa font_add_get_enable_aa font_add font_add_sprite font_add_sprite_ext font_replace font_replace_sprite font_replace_sprite_ext font_delete path_set_kind path_set_closed path_set_precision path_add path_assign path_duplicate path_append path_delete path_add_point path_insert_point path_change_point path_delete_point path_clear_points path_reverse path_mirror path_flip path_rotate path_rescale path_shift script_execute object_set_sprite object_set_solid object_set_visible object_set_persistent object_set_mask room_set_width room_set_height room_set_persistent room_set_background_colour room_set_background_color room_set_view room_set_viewport room_get_viewport room_set_view_enabled room_add room_duplicate room_assign room_instance_add room_instance_clear room_get_camera room_set_camera asset_get_index asset_get_type file_text_open_from_string file_text_open_read file_text_open_write file_text_open_append file_text_close file_text_write_string file_text_write_real file_text_writeln file_text_read_string file_text_read_real file_text_readln file_text_eof file_text_eoln file_exists file_delete file_rename file_copy directory_exists directory_create directory_destroy file_find_first file_find_next file_find_close file_attributes filename_name filename_path filename_dir filename_drive filename_ext filename_change_ext file_bin_open file_bin_rewrite file_bin_close file_bin_position file_bin_size file_bin_seek file_bin_write_byte file_bin_read_byte parameter_count parameter_string environment_get_variable ini_open_from_string ini_open ini_close ini_read_string ini_read_real ini_write_string ini_write_real ini_key_exists ini_section_exists ini_key_delete ini_section_delete ds_set_precision ds_exists ds_stack_create ds_stack_destroy ds_stack_clear ds_stack_copy ds_stack_size ds_stack_empty ds_stack_push ds_stack_pop ds_stack_top ds_stack_write ds_stack_read ds_queue_create ds_queue_destroy ds_queue_clear ds_queue_copy ds_queue_size ds_queue_empty ds_queue_enqueue ds_queue_dequeue ds_queue_head ds_queue_tail ds_queue_write ds_queue_read ds_list_create ds_list_destroy ds_list_clear ds_list_copy ds_list_size ds_list_empty ds_list_add ds_list_insert ds_list_replace ds_list_delete ds_list_find_index ds_list_find_value ds_list_mark_as_list ds_list_mark_as_map ds_list_sort ds_list_shuffle ds_list_write ds_list_read ds_list_set ds_map_create ds_map_destroy ds_map_clear ds_map_copy ds_map_size ds_map_empty ds_map_add ds_map_add_list ds_map_add_map ds_map_replace ds_map_replace_map ds_map_replace_list ds_map_delete ds_map_exists ds_map_find_value ds_map_find_previous ds_map_find_next ds_map_find_first ds_map_find_last ds_map_write ds_map_read ds_map_secure_save ds_map_secure_load ds_map_secure_load_buffer ds_map_secure_save_buffer ds_map_set ds_priority_create ds_priority_destroy ds_priority_clear ds_priority_copy ds_priority_size ds_priority_empty ds_priority_add ds_priority_change_priority ds_priority_find_priority ds_priority_delete_value ds_priority_delete_min ds_priority_find_min ds_priority_delete_max ds_priority_find_max ds_priority_write ds_priority_read ds_grid_create ds_grid_destroy ds_grid_copy ds_grid_resize ds_grid_width ds_grid_height ds_grid_clear ds_grid_set ds_grid_add ds_grid_multiply ds_grid_set_region ds_grid_add_region ds_grid_multiply_region ds_grid_set_disk ds_grid_add_disk ds_grid_multiply_disk ds_grid_set_grid_region ds_grid_add_grid_region ds_grid_multiply_grid_region ds_grid_get ds_grid_get_sum ds_grid_get_max ds_grid_get_min ds_grid_get_mean ds_grid_get_disk_sum ds_grid_get_disk_min ds_grid_get_disk_max ds_grid_get_disk_mean ds_grid_value_exists ds_grid_value_x ds_grid_value_y ds_grid_value_disk_exists ds_grid_value_disk_x ds_grid_value_disk_y ds_grid_shuffle ds_grid_write ds_grid_read ds_grid_sort ds_grid_set ds_grid_get effect_create_below effect_create_above effect_clear part_type_create part_type_destroy part_type_exists part_type_clear part_type_shape part_type_sprite part_type_size part_type_scale part_type_orientation part_type_life part_type_step part_type_death part_type_speed part_type_direction part_type_gravity part_type_colour1 part_type_colour2 part_type_colour3 part_type_colour_mix part_type_colour_rgb part_type_colour_hsv part_type_color1 part_type_color2 part_type_color3 part_type_color_mix part_type_color_rgb part_type_color_hsv part_type_alpha1 part_type_alpha2 part_type_alpha3 part_type_blend part_system_create part_system_create_layer part_system_destroy part_system_exists part_system_clear part_system_draw_order part_system_depth part_system_position part_system_automatic_update part_system_automatic_draw part_system_update part_system_drawit part_system_get_layer part_system_layer part_particles_create part_particles_create_colour part_particles_create_color part_particles_clear part_particles_count part_emitter_create part_emitter_destroy part_emitter_destroy_all part_emitter_exists part_emitter_clear part_emitter_region part_emitter_burst part_emitter_stream external_call external_define external_free window_handle window_device matrix_get matrix_set matrix_build_identity matrix_build matrix_build_lookat matrix_build_projection_ortho matrix_build_projection_perspective matrix_build_projection_perspective_fov matrix_multiply matrix_transform_vertex matrix_stack_push matrix_stack_pop matrix_stack_multiply matrix_stack_set matrix_stack_clear matrix_stack_top matrix_stack_is_empty browser_input_capture os_get_config os_get_info os_get_language os_get_region os_lock_orientation display_get_dpi_x display_get_dpi_y display_set_gui_size display_set_gui_maximise display_set_gui_maximize device_mouse_dbclick_enable display_set_timing_method display_get_timing_method display_set_sleep_margin display_get_sleep_margin virtual_key_add virtual_key_hide virtual_key_delete virtual_key_show draw_enable_drawevent draw_enable_swf_aa draw_set_swf_aa_level draw_get_swf_aa_level draw_texture_flush draw_flush gpu_set_blendenable gpu_set_ztestenable gpu_set_zfunc gpu_set_zwriteenable gpu_set_lightingenable gpu_set_fog gpu_set_cullmode gpu_set_blendmode gpu_set_blendmode_ext gpu_set_blendmode_ext_sepalpha gpu_set_colorwriteenable gpu_set_colourwriteenable gpu_set_alphatestenable gpu_set_alphatestref gpu_set_alphatestfunc gpu_set_texfilter gpu_set_texfilter_ext gpu_set_texrepeat gpu_set_texrepeat_ext gpu_set_tex_filter gpu_set_tex_filter_ext gpu_set_tex_repeat gpu_set_tex_repeat_ext gpu_set_tex_mip_filter gpu_set_tex_mip_filter_ext gpu_set_tex_mip_bias gpu_set_tex_mip_bias_ext gpu_set_tex_min_mip gpu_set_tex_min_mip_ext gpu_set_tex_max_mip gpu_set_tex_max_mip_ext gpu_set_tex_max_aniso gpu_set_tex_max_aniso_ext gpu_set_tex_mip_enable gpu_set_tex_mip_enable_ext gpu_get_blendenable gpu_get_ztestenable gpu_get_zfunc gpu_get_zwriteenable gpu_get_lightingenable gpu_get_fog gpu_get_cullmode gpu_get_blendmode gpu_get_blendmode_ext gpu_get_blendmode_ext_sepalpha gpu_get_blendmode_src gpu_get_blendmode_dest gpu_get_blendmode_srcalpha gpu_get_blendmode_destalpha gpu_get_colorwriteenable gpu_get_colourwriteenable gpu_get_alphatestenable gpu_get_alphatestref gpu_get_alphatestfunc gpu_get_texfilter gpu_get_texfilter_ext gpu_get_texrepeat gpu_get_texrepeat_ext gpu_get_tex_filter gpu_get_tex_filter_ext gpu_get_tex_repeat gpu_get_tex_repeat_ext gpu_get_tex_mip_filter gpu_get_tex_mip_filter_ext gpu_get_tex_mip_bias gpu_get_tex_mip_bias_ext gpu_get_tex_min_mip gpu_get_tex_min_mip_ext gpu_get_tex_max_mip gpu_get_tex_max_mip_ext gpu_get_tex_max_aniso gpu_get_tex_max_aniso_ext gpu_get_tex_mip_enable gpu_get_tex_mip_enable_ext gpu_push_state gpu_pop_state gpu_get_state gpu_set_state draw_light_define_ambient draw_light_define_direction draw_light_define_point draw_light_enable draw_set_lighting draw_light_get_ambient draw_light_get draw_get_lighting shop_leave_rating url_get_domain url_open url_open_ext url_open_full get_timer achievement_login achievement_logout achievement_post achievement_increment achievement_post_score achievement_available achievement_show_achievements achievement_show_leaderboards achievement_load_friends achievement_load_leaderboard achievement_send_challenge achievement_load_progress achievement_reset achievement_login_status achievement_get_pic achievement_show_challenge_notifications achievement_get_challenges achievement_event achievement_show achievement_get_info cloud_file_save cloud_string_save cloud_synchronise ads_enable ads_disable ads_setup ads_engagement_launch ads_engagement_available ads_engagement_active ads_event ads_event_preload ads_set_reward_callback ads_get_display_height ads_get_display_width ads_move ads_interstitial_available ads_interstitial_display device_get_tilt_x device_get_tilt_y device_get_tilt_z device_is_keypad_open device_mouse_check_button device_mouse_check_button_pressed device_mouse_check_button_released device_mouse_x device_mouse_y device_mouse_raw_x device_mouse_raw_y device_mouse_x_to_gui device_mouse_y_to_gui iap_activate iap_status iap_enumerate_products iap_restore_all iap_acquire iap_consume iap_product_details iap_purchase_details facebook_init facebook_login facebook_status facebook_graph_request facebook_dialog facebook_logout facebook_launch_offerwall facebook_post_message facebook_send_invite facebook_user_id facebook_accesstoken facebook_check_permission facebook_request_read_permissions facebook_request_publish_permissions gamepad_is_supported gamepad_get_device_count gamepad_is_connected gamepad_get_description gamepad_get_button_threshold gamepad_set_button_threshold gamepad_get_axis_deadzone gamepad_set_axis_deadzone gamepad_button_count gamepad_button_check gamepad_button_check_pressed gamepad_button_check_released gamepad_button_value gamepad_axis_count gamepad_axis_value gamepad_set_vibration gamepad_set_colour gamepad_set_color os_is_paused window_has_focus code_is_compiled http_get http_get_file http_post_string http_request json_encode json_decode zip_unzip load_csv base64_encode base64_decode md5_string_unicode md5_string_utf8 md5_file os_is_network_connected sha1_string_unicode sha1_string_utf8 sha1_file os_powersave_enable analytics_event analytics_event_ext win8_livetile_tile_notification win8_livetile_tile_clear win8_livetile_badge_notification win8_livetile_badge_clear win8_livetile_queue_enable win8_secondarytile_pin win8_secondarytile_badge_notification win8_secondarytile_delete win8_livetile_notification_begin win8_livetile_notification_secondary_begin win8_livetile_notification_expiry win8_livetile_notification_tag win8_livetile_notification_text_add win8_livetile_notification_image_add win8_livetile_notification_end win8_appbar_enable win8_appbar_add_element win8_appbar_remove_element win8_settingscharm_add_entry win8_settingscharm_add_html_entry win8_settingscharm_add_xaml_entry win8_settingscharm_set_xaml_property win8_settingscharm_get_xaml_property win8_settingscharm_remove_entry win8_share_image win8_share_screenshot win8_share_file win8_share_url win8_share_text win8_search_enable win8_search_disable win8_search_add_suggestions win8_device_touchscreen_available win8_license_initialize_sandbox win8_license_trial_version winphone_license_trial_version winphone_tile_title winphone_tile_count winphone_tile_back_title winphone_tile_back_content winphone_tile_back_content_wide winphone_tile_front_image winphone_tile_front_image_small winphone_tile_front_image_wide winphone_tile_back_image winphone_tile_back_image_wide winphone_tile_background_colour winphone_tile_background_color winphone_tile_icon_image winphone_tile_small_icon_image winphone_tile_wide_content winphone_tile_cycle_images winphone_tile_small_background_image physics_world_create physics_world_gravity physics_world_update_speed physics_world_update_iterations physics_world_draw_debug physics_pause_enable physics_fixture_create physics_fixture_set_kinematic physics_fixture_set_density physics_fixture_set_awake physics_fixture_set_restitution physics_fixture_set_friction physics_fixture_set_collision_group physics_fixture_set_sensor physics_fixture_set_linear_damping physics_fixture_set_angular_damping physics_fixture_set_circle_shape physics_fixture_set_box_shape physics_fixture_set_edge_shape physics_fixture_set_polygon_shape physics_fixture_set_chain_shape physics_fixture_add_point physics_fixture_bind physics_fixture_bind_ext physics_fixture_delete physics_apply_force physics_apply_impulse physics_apply_angular_impulse physics_apply_local_force physics_apply_local_impulse physics_apply_torque physics_mass_properties physics_draw_debug physics_test_overlap physics_remove_fixture physics_set_friction physics_set_density physics_set_restitution physics_get_friction physics_get_density physics_get_restitution physics_joint_distance_create physics_joint_rope_create physics_joint_revolute_create physics_joint_prismatic_create physics_joint_pulley_create physics_joint_wheel_create physics_joint_weld_create physics_joint_friction_create physics_joint_gear_create physics_joint_enable_motor physics_joint_get_value physics_joint_set_value physics_joint_delete physics_particle_create physics_particle_delete physics_particle_delete_region_circle physics_particle_delete_region_box physics_particle_delete_region_poly physics_particle_set_flags physics_particle_set_category_flags physics_particle_draw physics_particle_draw_ext physics_particle_count physics_particle_get_data physics_particle_get_data_particle physics_particle_group_begin physics_particle_group_circle physics_particle_group_box physics_particle_group_polygon physics_particle_group_add_point physics_particle_group_end physics_particle_group_join physics_particle_group_delete physics_particle_group_count physics_particle_group_get_data physics_particle_group_get_mass physics_particle_group_get_inertia physics_particle_group_get_centre_x physics_particle_group_get_centre_y physics_particle_group_get_vel_x physics_particle_group_get_vel_y physics_particle_group_get_ang_vel physics_particle_group_get_x physics_particle_group_get_y physics_particle_group_get_angle physics_particle_set_group_flags physics_particle_get_group_flags physics_particle_get_max_count physics_particle_get_radius physics_particle_get_density physics_particle_get_damping physics_particle_get_gravity_scale physics_particle_set_max_count physics_particle_set_radius physics_particle_set_density physics_particle_set_damping physics_particle_set_gravity_scale network_create_socket network_create_socket_ext network_create_server network_create_server_raw network_connect network_connect_raw network_send_packet network_send_raw network_send_broadcast network_send_udp network_send_udp_raw network_set_timeout network_set_config network_resolve network_destroy buffer_create buffer_write buffer_read buffer_seek buffer_get_surface buffer_set_surface buffer_delete buffer_exists buffer_get_type buffer_get_alignment buffer_poke buffer_peek buffer_save buffer_save_ext buffer_load buffer_load_ext buffer_load_partial buffer_copy buffer_fill buffer_get_size buffer_tell buffer_resize buffer_md5 buffer_sha1 buffer_base64_encode buffer_base64_decode buffer_base64_decode_ext buffer_sizeof buffer_get_address buffer_create_from_vertex_buffer buffer_create_from_vertex_buffer_ext buffer_copy_from_vertex_buffer buffer_async_group_begin buffer_async_group_option buffer_async_group_end buffer_load_async buffer_save_async gml_release_mode gml_pragma steam_activate_overlay steam_is_overlay_enabled steam_is_overlay_activated steam_get_persona_name steam_initialised steam_is_cloud_enabled_for_app steam_is_cloud_enabled_for_account steam_file_persisted steam_get_quota_total steam_get_quota_free steam_file_write steam_file_write_file steam_file_read steam_file_delete steam_file_exists steam_file_size steam_file_share steam_is_screenshot_requested steam_send_screenshot steam_is_user_logged_on steam_get_user_steam_id steam_user_owns_dlc steam_user_installed_dlc steam_set_achievement steam_get_achievement steam_clear_achievement steam_set_stat_int steam_set_stat_float steam_set_stat_avg_rate steam_get_stat_int steam_get_stat_float steam_get_stat_avg_rate steam_reset_all_stats steam_reset_all_stats_achievements steam_stats_ready steam_create_leaderboard steam_upload_score steam_upload_score_ext steam_download_scores_around_user steam_download_scores steam_download_friends_scores steam_upload_score_buffer steam_upload_score_buffer_ext steam_current_game_language steam_available_languages steam_activate_overlay_browser steam_activate_overlay_user steam_activate_overlay_store steam_get_user_persona_name steam_get_app_id steam_get_user_account_id steam_ugc_download steam_ugc_create_item steam_ugc_start_item_update steam_ugc_set_item_title steam_ugc_set_item_description steam_ugc_set_item_visibility steam_ugc_set_item_tags steam_ugc_set_item_content steam_ugc_set_item_preview steam_ugc_submit_item_update steam_ugc_get_item_update_progress steam_ugc_subscribe_item steam_ugc_unsubscribe_item steam_ugc_num_subscribed_items steam_ugc_get_subscribed_items steam_ugc_get_item_install_info steam_ugc_get_item_update_info steam_ugc_request_item_details steam_ugc_create_query_user steam_ugc_create_query_user_ex steam_ugc_create_query_all steam_ugc_create_query_all_ex steam_ugc_query_set_cloud_filename_filter steam_ugc_query_set_match_any_tag steam_ugc_query_set_search_text steam_ugc_query_set_ranked_by_trend_days steam_ugc_query_add_required_tag steam_ugc_query_add_excluded_tag steam_ugc_query_set_return_long_description steam_ugc_query_set_return_total_only steam_ugc_query_set_allow_cached_response steam_ugc_send_query shader_set shader_get_name shader_reset shader_current shader_is_compiled shader_get_sampler_index shader_get_uniform shader_set_uniform_i shader_set_uniform_i_array shader_set_uniform_f shader_set_uniform_f_array shader_set_uniform_matrix shader_set_uniform_matrix_array shader_enable_corner_id texture_set_stage texture_get_texel_width texture_get_texel_height shaders_are_supported vertex_format_begin vertex_format_end vertex_format_delete vertex_format_add_position vertex_format_add_position_3d vertex_format_add_colour vertex_format_add_color vertex_format_add_normal vertex_format_add_texcoord vertex_format_add_textcoord vertex_format_add_custom vertex_create_buffer vertex_create_buffer_ext vertex_delete_buffer vertex_begin vertex_end vertex_position vertex_position_3d vertex_colour vertex_color vertex_argb vertex_texcoord vertex_normal vertex_float1 vertex_float2 vertex_float3 vertex_float4 vertex_ubyte4 vertex_submit vertex_freeze vertex_get_number vertex_get_buffer_size vertex_create_buffer_from_buffer vertex_create_buffer_from_buffer_ext push_local_notification push_get_first_local_notification push_get_next_local_notification push_cancel_local_notification skeleton_animation_set skeleton_animation_get skeleton_animation_mix skeleton_animation_set_ext skeleton_animation_get_ext skeleton_animation_get_duration skeleton_animation_get_frames skeleton_animation_clear skeleton_skin_set skeleton_skin_get skeleton_attachment_set skeleton_attachment_get skeleton_attachment_create skeleton_collision_draw_set skeleton_bone_data_get skeleton_bone_data_set skeleton_bone_state_get skeleton_bone_state_set skeleton_get_minmax skeleton_get_num_bounds skeleton_get_bounds skeleton_animation_get_frame skeleton_animation_set_frame draw_skeleton draw_skeleton_time draw_skeleton_instance draw_skeleton_collision skeleton_animation_list skeleton_skin_list skeleton_slot_data layer_get_id layer_get_id_at_depth layer_get_depth layer_create layer_destroy layer_destroy_instances layer_add_instance layer_has_instance layer_set_visible layer_get_visible layer_exists layer_x layer_y layer_get_x layer_get_y layer_hspeed layer_vspeed layer_get_hspeed layer_get_vspeed layer_script_begin layer_script_end layer_shader layer_get_script_begin layer_get_script_end layer_get_shader layer_set_target_room layer_get_target_room layer_reset_target_room layer_get_all layer_get_all_elements layer_get_name layer_depth layer_get_element_layer layer_get_element_type layer_element_move layer_force_draw_depth layer_is_draw_depth_forced layer_get_forced_depth layer_background_get_id layer_background_exists layer_background_create layer_background_destroy layer_background_visible layer_background_change layer_background_sprite layer_background_htiled layer_background_vtiled layer_background_stretch layer_background_yscale layer_background_xscale layer_background_blend layer_background_alpha layer_background_index layer_background_speed layer_background_get_visible layer_background_get_sprite layer_background_get_htiled layer_background_get_vtiled layer_background_get_stretch layer_background_get_yscale layer_background_get_xscale layer_background_get_blend layer_background_get_alpha layer_background_get_index layer_background_get_speed layer_sprite_get_id layer_sprite_exists layer_sprite_create layer_sprite_destroy layer_sprite_change layer_sprite_index layer_sprite_speed layer_sprite_xscale layer_sprite_yscale layer_sprite_angle layer_sprite_blend layer_sprite_alpha layer_sprite_x layer_sprite_y layer_sprite_get_sprite layer_sprite_get_index layer_sprite_get_speed layer_sprite_get_xscale layer_sprite_get_yscale layer_sprite_get_angle layer_sprite_get_blend layer_sprite_get_alpha layer_sprite_get_x layer_sprite_get_y layer_tilemap_get_id layer_tilemap_exists layer_tilemap_create layer_tilemap_destroy tilemap_tileset tilemap_x tilemap_y tilemap_set tilemap_set_at_pixel tilemap_get_tileset tilemap_get_tile_width tilemap_get_tile_height tilemap_get_width tilemap_get_height tilemap_get_x tilemap_get_y tilemap_get tilemap_get_at_pixel tilemap_get_cell_x_at_pixel tilemap_get_cell_y_at_pixel tilemap_clear draw_tilemap draw_tile tilemap_set_global_mask tilemap_get_global_mask tilemap_set_mask tilemap_get_mask tilemap_get_frame tile_set_empty tile_set_index tile_set_flip tile_set_mirror tile_set_rotate tile_get_empty tile_get_index tile_get_flip tile_get_mirror tile_get_rotate layer_tile_exists layer_tile_create layer_tile_destroy layer_tile_change layer_tile_xscale layer_tile_yscale layer_tile_blend layer_tile_alpha layer_tile_x layer_tile_y layer_tile_region layer_tile_visible layer_tile_get_sprite layer_tile_get_xscale layer_tile_get_yscale layer_tile_get_blend layer_tile_get_alpha layer_tile_get_x layer_tile_get_y layer_tile_get_region layer_tile_get_visible layer_instance_get_instance instance_activate_layer instance_deactivate_layer camera_create camera_create_view camera_destroy camera_apply camera_get_active camera_get_default camera_set_default camera_set_view_mat camera_set_proj_mat camera_set_update_script camera_set_begin_script camera_set_end_script camera_set_view_pos camera_set_view_size camera_set_view_speed camera_set_view_border camera_set_view_angle camera_set_view_target camera_get_view_mat camera_get_proj_mat camera_get_update_script camera_get_begin_script camera_get_end_script camera_get_view_x camera_get_view_y camera_get_view_width camera_get_view_height camera_get_view_speed_x camera_get_view_speed_y camera_get_view_border_x camera_get_view_border_y camera_get_view_angle camera_get_view_target view_get_camera view_get_visible view_get_xport view_get_yport view_get_wport view_get_hport view_get_surface_id view_set_camera view_set_visible view_set_xport view_set_yport view_set_wport view_set_hport view_set_surface_id gesture_drag_time gesture_drag_distance gesture_flick_speed gesture_double_tap_time gesture_double_tap_distance gesture_pinch_distance gesture_pinch_angle_towards gesture_pinch_angle_away gesture_rotate_time gesture_rotate_angle gesture_tap_count gesture_get_drag_time gesture_get_drag_distance gesture_get_flick_speed gesture_get_double_tap_time gesture_get_double_tap_distance gesture_get_pinch_distance gesture_get_pinch_angle_towards gesture_get_pinch_angle_away gesture_get_rotate_time gesture_get_rotate_angle gesture_get_tap_count keyboard_virtual_show keyboard_virtual_hide keyboard_virtual_status keyboard_virtual_height",literal:"self other all noone global local undefined pointer_invalid pointer_null path_action_stop path_action_restart path_action_continue path_action_reverse true false pi GM_build_date GM_version GM_runtime_version  timezone_local timezone_utc gamespeed_fps gamespeed_microseconds  ev_create ev_destroy ev_step ev_alarm ev_keyboard ev_mouse ev_collision ev_other ev_draw ev_draw_begin ev_draw_end ev_draw_pre ev_draw_post ev_keypress ev_keyrelease ev_trigger ev_left_button ev_right_button ev_middle_button ev_no_button ev_left_press ev_right_press ev_middle_press ev_left_release ev_right_release ev_middle_release ev_mouse_enter ev_mouse_leave ev_mouse_wheel_up ev_mouse_wheel_down ev_global_left_button ev_global_right_button ev_global_middle_button ev_global_left_press ev_global_right_press ev_global_middle_press ev_global_left_release ev_global_right_release ev_global_middle_release ev_joystick1_left ev_joystick1_right ev_joystick1_up ev_joystick1_down ev_joystick1_button1 ev_joystick1_button2 ev_joystick1_button3 ev_joystick1_button4 ev_joystick1_button5 ev_joystick1_button6 ev_joystick1_button7 ev_joystick1_button8 ev_joystick2_left ev_joystick2_right ev_joystick2_up ev_joystick2_down ev_joystick2_button1 ev_joystick2_button2 ev_joystick2_button3 ev_joystick2_button4 ev_joystick2_button5 ev_joystick2_button6 ev_joystick2_button7 ev_joystick2_button8 ev_outside ev_boundary ev_game_start ev_game_end ev_room_start ev_room_end ev_no_more_lives ev_animation_end ev_end_of_path ev_no_more_health ev_close_button ev_user0 ev_user1 ev_user2 ev_user3 ev_user4 ev_user5 ev_user6 ev_user7 ev_user8 ev_user9 ev_user10 ev_user11 ev_user12 ev_user13 ev_user14 ev_user15 ev_step_normal ev_step_begin ev_step_end ev_gui ev_gui_begin ev_gui_end ev_cleanup ev_gesture ev_gesture_tap ev_gesture_double_tap ev_gesture_drag_start ev_gesture_dragging ev_gesture_drag_end ev_gesture_flick ev_gesture_pinch_start ev_gesture_pinch_in ev_gesture_pinch_out ev_gesture_pinch_end ev_gesture_rotate_start ev_gesture_rotating ev_gesture_rotate_end ev_global_gesture_tap ev_global_gesture_double_tap ev_global_gesture_drag_start ev_global_gesture_dragging ev_global_gesture_drag_end ev_global_gesture_flick ev_global_gesture_pinch_start ev_global_gesture_pinch_in ev_global_gesture_pinch_out ev_global_gesture_pinch_end ev_global_gesture_rotate_start ev_global_gesture_rotating ev_global_gesture_rotate_end vk_nokey vk_anykey vk_enter vk_return vk_shift vk_control vk_alt vk_escape vk_space vk_backspace vk_tab vk_pause vk_printscreen vk_left vk_right vk_up vk_down vk_home vk_end vk_delete vk_insert vk_pageup vk_pagedown vk_f1 vk_f2 vk_f3 vk_f4 vk_f5 vk_f6 vk_f7 vk_f8 vk_f9 vk_f10 vk_f11 vk_f12 vk_numpad0 vk_numpad1 vk_numpad2 vk_numpad3 vk_numpad4 vk_numpad5 vk_numpad6 vk_numpad7 vk_numpad8 vk_numpad9 vk_divide vk_multiply vk_subtract vk_add vk_decimal vk_lshift vk_lcontrol vk_lalt vk_rshift vk_rcontrol vk_ralt  mb_any mb_none mb_left mb_right mb_middle c_aqua c_black c_blue c_dkgray c_fuchsia c_gray c_green c_lime c_ltgray c_maroon c_navy c_olive c_purple c_red c_silver c_teal c_white c_yellow c_orange fa_left fa_center fa_right fa_top fa_middle fa_bottom pr_pointlist pr_linelist pr_linestrip pr_trianglelist pr_trianglestrip pr_trianglefan bm_complex bm_normal bm_add bm_max bm_subtract bm_zero bm_one bm_src_colour bm_inv_src_colour bm_src_color bm_inv_src_color bm_src_alpha bm_inv_src_alpha bm_dest_alpha bm_inv_dest_alpha bm_dest_colour bm_inv_dest_colour bm_dest_color bm_inv_dest_color bm_src_alpha_sat tf_point tf_linear tf_anisotropic mip_off mip_on mip_markedonly audio_falloff_none audio_falloff_inverse_distance audio_falloff_inverse_distance_clamped audio_falloff_linear_distance audio_falloff_linear_distance_clamped audio_falloff_exponent_distance audio_falloff_exponent_distance_clamped audio_old_system audio_new_system audio_mono audio_stereo audio_3d cr_default cr_none cr_arrow cr_cross cr_beam cr_size_nesw cr_size_ns cr_size_nwse cr_size_we cr_uparrow cr_hourglass cr_drag cr_appstart cr_handpoint cr_size_all spritespeed_framespersecond spritespeed_framespergameframe asset_object asset_unknown asset_sprite asset_sound asset_room asset_path asset_script asset_font asset_timeline asset_tiles asset_shader fa_readonly fa_hidden fa_sysfile fa_volumeid fa_directory fa_archive  ds_type_map ds_type_list ds_type_stack ds_type_queue ds_type_grid ds_type_priority ef_explosion ef_ring ef_ellipse ef_firework ef_smoke ef_smokeup ef_star ef_spark ef_flare ef_cloud ef_rain ef_snow pt_shape_pixel pt_shape_disk pt_shape_square pt_shape_line pt_shape_star pt_shape_circle pt_shape_ring pt_shape_sphere pt_shape_flare pt_shape_spark pt_shape_explosion pt_shape_cloud pt_shape_smoke pt_shape_snow ps_distr_linear ps_distr_gaussian ps_distr_invgaussian ps_shape_rectangle ps_shape_ellipse ps_shape_diamond ps_shape_line ty_real ty_string dll_cdecl dll_stdcall matrix_view matrix_projection matrix_world os_win32 os_windows os_macosx os_ios os_android os_symbian os_linux os_unknown os_winphone os_tizen os_win8native os_wiiu os_3ds  os_psvita os_bb10 os_ps4 os_xboxone os_ps3 os_xbox360 os_uwp os_tvos os_switch browser_not_a_browser browser_unknown browser_ie browser_firefox browser_chrome browser_safari browser_safari_mobile browser_opera browser_tizen browser_edge browser_windows_store browser_ie_mobile  device_ios_unknown device_ios_iphone device_ios_iphone_retina device_ios_ipad device_ios_ipad_retina device_ios_iphone5 device_ios_iphone6 device_ios_iphone6plus device_emulator device_tablet display_landscape display_landscape_flipped display_portrait display_portrait_flipped tm_sleep tm_countvsyncs of_challenge_win of_challen ge_lose of_challenge_tie leaderboard_type_number leaderboard_type_time_mins_secs cmpfunc_never cmpfunc_less cmpfunc_equal cmpfunc_lessequal cmpfunc_greater cmpfunc_notequal cmpfunc_greaterequal cmpfunc_always cull_noculling cull_clockwise cull_counterclockwise lighttype_dir lighttype_point iap_ev_storeload iap_ev_product iap_ev_purchase iap_ev_consume iap_ev_restore iap_storeload_ok iap_storeload_failed iap_status_uninitialised iap_status_unavailable iap_status_loading iap_status_available iap_status_processing iap_status_restoring iap_failed iap_unavailable iap_available iap_purchased iap_canceled iap_refunded fb_login_default fb_login_fallback_to_webview fb_login_no_fallback_to_webview fb_login_forcing_webview fb_login_use_system_account fb_login_forcing_safari  phy_joint_anchor_1_x phy_joint_anchor_1_y phy_joint_anchor_2_x phy_joint_anchor_2_y phy_joint_reaction_force_x phy_joint_reaction_force_y phy_joint_reaction_torque phy_joint_motor_speed phy_joint_angle phy_joint_motor_torque phy_joint_max_motor_torque phy_joint_translation phy_joint_speed phy_joint_motor_force phy_joint_max_motor_force phy_joint_length_1 phy_joint_length_2 phy_joint_damping_ratio phy_joint_frequency phy_joint_lower_angle_limit phy_joint_upper_angle_limit phy_joint_angle_limits phy_joint_max_length phy_joint_max_torque phy_joint_max_force phy_debug_render_aabb phy_debug_render_collision_pairs phy_debug_render_coms phy_debug_render_core_shapes phy_debug_render_joints phy_debug_render_obb phy_debug_render_shapes  phy_particle_flag_water phy_particle_flag_zombie phy_particle_flag_wall phy_particle_flag_spring phy_particle_flag_elastic phy_particle_flag_viscous phy_particle_flag_powder phy_particle_flag_tensile phy_particle_flag_colourmixing phy_particle_flag_colormixing phy_particle_group_flag_solid phy_particle_group_flag_rigid phy_particle_data_flag_typeflags phy_particle_data_flag_position phy_particle_data_flag_velocity phy_particle_data_flag_colour phy_particle_data_flag_color phy_particle_data_flag_category  achievement_our_info achievement_friends_info achievement_leaderboard_info achievement_achievement_info achievement_filter_all_players achievement_filter_friends_only achievement_filter_favorites_only achievement_type_achievement_challenge achievement_type_score_challenge achievement_pic_loaded  achievement_show_ui achievement_show_profile achievement_show_leaderboard achievement_show_achievement achievement_show_bank achievement_show_friend_picker achievement_show_purchase_prompt network_socket_tcp network_socket_udp network_socket_bluetooth network_type_connect network_type_disconnect network_type_data network_type_non_blocking_connect network_config_connect_timeout network_config_use_non_blocking_socket network_config_enable_reliable_udp network_config_disable_reliable_udp buffer_fixed buffer_grow buffer_wrap buffer_fast buffer_vbuffer buffer_network buffer_u8 buffer_s8 buffer_u16 buffer_s16 buffer_u32 buffer_s32 buffer_u64 buffer_f16 buffer_f32 buffer_f64 buffer_bool buffer_text buffer_string buffer_surface_copy buffer_seek_start buffer_seek_relative buffer_seek_end buffer_generalerror buffer_outofspace buffer_outofbounds buffer_invalidtype  text_type button_type input_type ANSI_CHARSET DEFAULT_CHARSET EASTEUROPE_CHARSET RUSSIAN_CHARSET SYMBOL_CHARSET SHIFTJIS_CHARSET HANGEUL_CHARSET GB2312_CHARSET CHINESEBIG5_CHARSET JOHAB_CHARSET HEBREW_CHARSET ARABIC_CHARSET GREEK_CHARSET TURKISH_CHARSET VIETNAMESE_CHARSET THAI_CHARSET MAC_CHARSET BALTIC_CHARSET OEM_CHARSET  gp_face1 gp_face2 gp_face3 gp_face4 gp_shoulderl gp_shoulderr gp_shoulderlb gp_shoulderrb gp_select gp_start gp_stickl gp_stickr gp_padu gp_padd gp_padl gp_padr gp_axislh gp_axislv gp_axisrh gp_axisrv ov_friends ov_community ov_players ov_settings ov_gamegroup ov_achievements lb_sort_none lb_sort_ascending lb_sort_descending lb_disp_none lb_disp_numeric lb_disp_time_sec lb_disp_time_ms ugc_result_success ugc_filetype_community ugc_filetype_microtrans ugc_visibility_public ugc_visibility_friends_only ugc_visibility_private ugc_query_RankedByVote ugc_query_RankedByPublicationDate ugc_query_AcceptedForGameRankedByAcceptanceDate ugc_query_RankedByTrend ugc_query_FavoritedByFriendsRankedByPublicationDate ugc_query_CreatedByFriendsRankedByPublicationDate ugc_query_RankedByNumTimesReported ugc_query_CreatedByFollowedUsersRankedByPublicationDate ugc_query_NotYetRated ugc_query_RankedByTotalVotesAsc ugc_query_RankedByVotesUp ugc_query_RankedByTextSearch ugc_sortorder_CreationOrderDesc ugc_sortorder_CreationOrderAsc ugc_sortorder_TitleAsc ugc_sortorder_LastUpdatedDesc ugc_sortorder_SubscriptionDateDesc ugc_sortorder_VoteScoreDesc ugc_sortorder_ForModeration ugc_list_Published ugc_list_VotedOn ugc_list_VotedUp ugc_list_VotedDown ugc_list_WillVoteLater ugc_list_Favorited ugc_list_Subscribed ugc_list_UsedOrPlayed ugc_list_Followed ugc_match_Items ugc_match_Items_Mtx ugc_match_Items_ReadyToUse ugc_match_Collections ugc_match_Artwork ugc_match_Videos ugc_match_Screenshots ugc_match_AllGuides ugc_match_WebGuides ugc_match_IntegratedGuides ugc_match_UsableInGame ugc_match_ControllerBindings  vertex_usage_position vertex_usage_colour vertex_usage_color vertex_usage_normal vertex_usage_texcoord vertex_usage_textcoord vertex_usage_blendweight vertex_usage_blendindices vertex_usage_psize vertex_usage_tangent vertex_usage_binormal vertex_usage_fog vertex_usage_depth vertex_usage_sample vertex_type_float1 vertex_type_float2 vertex_type_float3 vertex_type_float4 vertex_type_colour vertex_type_color vertex_type_ubyte4 layerelementtype_undefined layerelementtype_background layerelementtype_instance layerelementtype_oldtilemap layerelementtype_sprite layerelementtype_tilemap layerelementtype_particlesystem layerelementtype_tile tile_rotate tile_flip tile_mirror tile_index_mask kbv_type_default kbv_type_ascii kbv_type_url kbv_type_email kbv_type_numbers kbv_type_phone kbv_type_phone_name kbv_returnkey_default kbv_returnkey_go kbv_returnkey_google kbv_returnkey_join kbv_returnkey_next kbv_returnkey_route kbv_returnkey_search kbv_returnkey_send kbv_returnkey_yahoo kbv_returnkey_done kbv_returnkey_continue kbv_returnkey_emergency kbv_autocapitalize_none kbv_autocapitalize_words kbv_autocapitalize_sentences kbv_autocapitalize_characters",symbol:"argument_relative argument argument0 argument1 argument2 argument3 argument4 argument5 argument6 argument7 argument8 argument9 argument10 argument11 argument12 argument13 argument14 argument15 argument_count x y xprevious yprevious xstart ystart hspeed vspeed direction speed friction gravity gravity_direction path_index path_position path_positionprevious path_speed path_scale path_orientation path_endaction object_index id solid persistent mask_index instance_count instance_id room_speed fps fps_real current_time current_year current_month current_day current_weekday current_hour current_minute current_second alarm timeline_index timeline_position timeline_speed timeline_running timeline_loop room room_first room_last room_width room_height room_caption room_persistent score lives health show_score show_lives show_health caption_score caption_lives caption_health event_type event_number event_object event_action application_surface gamemaker_pro gamemaker_registered gamemaker_version error_occurred error_last debug_mode keyboard_key keyboard_lastkey keyboard_lastchar keyboard_string mouse_x mouse_y mouse_button mouse_lastbutton cursor_sprite visible sprite_index sprite_width sprite_height sprite_xoffset sprite_yoffset image_number image_index image_speed depth image_xscale image_yscale image_angle image_alpha image_blend bbox_left bbox_right bbox_top bbox_bottom layer background_colour  background_showcolour background_color background_showcolor view_enabled view_current view_visible view_xview view_yview view_wview view_hview view_xport view_yport view_wport view_hport view_angle view_hborder view_vborder view_hspeed view_vspeed view_object view_surface_id view_camera game_id game_display_name game_project_name game_save_id working_directory temp_directory program_directory browser_width browser_height os_type os_device os_browser os_version display_aa async_load delta_time webgl_enabled event_data iap_data phy_rotation phy_position_x phy_position_y phy_angular_velocity phy_linear_velocity_x phy_linear_velocity_y phy_speed_x phy_speed_y phy_speed phy_angular_damping phy_linear_damping phy_bullet phy_fixed_rotation phy_active phy_mass phy_inertia phy_com_x phy_com_y phy_dynamic phy_kinematic phy_sleeping phy_collision_points phy_collision_x phy_collision_y phy_col_normal_x phy_col_normal_y phy_position_xprevious phy_position_yprevious"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/go.min.js b/vendor/assets/javascripts/highlightjs/languages/go.min.js
index cf58a7e0e1..9f78f66105 100644
--- a/vendor/assets/javascripts/highlightjs/languages/go.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/go.min.js
@@ -1 +1 @@
-hljs.registerLanguage("go",function(e){var t={keyword:"break default func interface select case map struct chan else goto package switch const fallthrough if range type continue for import return var go defer bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 uint16 uint32 uint64 int uint uintptr rune",literal:"true false iota nil",built_in:"append cap close complex copy imag len make new panic print println real recover delete"};return{aliases:["golang"],k:t,i:"</",c:[e.CLCM,e.CBCM,{cN:"string",v:[e.QSM,{b:"'",e:"[^\\\\]'"},{b:"`",e:"`"}]},{cN:"number",v:[{b:e.CNR+"[dflsi]",r:1},e.CNM]},{b:/:=/},{cN:"function",bK:"func",e:/\s*\{/,eE:!0,c:[e.TM,{cN:"params",b:/\(/,e:/\)/,k:t,i:/["']/}]}]}});
\ No newline at end of file
+hljs.registerLanguage("go",function(){"use strict";return function(e){var n={keyword:"break default func interface select case map struct chan else goto package switch const fallthrough if range type continue for import return var go defer bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 uint16 uint32 uint64 int uint uintptr rune",literal:"true false iota nil",built_in:"append cap close complex copy imag len make new panic print println real recover delete"};return{name:"Go",aliases:["golang"],keywords:n,illegal:"</",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"string",variants:[e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{begin:"`",end:"`"}]},{className:"number",variants:[{begin:e.C_NUMBER_RE+"[i]",relevance:1},e.C_NUMBER_MODE]},{begin:/:=/},{className:"function",beginKeywords:"func",end:"\\s*(\\{|$)",excludeEnd:!0,contains:[e.TITLE_MODE,{className:"params",begin:/\(/,end:/\)/,keywords:n,illegal:/["']/}]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/golo.min.js b/vendor/assets/javascripts/highlightjs/languages/golo.min.js
index 75b223c747..a56cf56665 100644
--- a/vendor/assets/javascripts/highlightjs/languages/golo.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/golo.min.js
@@ -1 +1 @@
-hljs.registerLanguage("golo",function(e){return{k:{keyword:"println readln print import module function local return let var while for foreach times in case when match with break continue augment augmentation each find filter reduce if then else otherwise try catch finally raise throw orIfNull DynamicObject|10 DynamicVariable struct Observable map set vector list array",literal:"true false null"},c:[e.HCM,e.QSM,e.CNM,{cN:"meta",b:"@[A-Za-z]+"}]}});
\ No newline at end of file
+hljs.registerLanguage("golo",function(){"use strict";return function(e){return{name:"Golo",keywords:{keyword:"println readln print import module function local return let var while for foreach times in case when match with break continue augment augmentation each find filter reduce if then else otherwise try catch finally raise throw orIfNull DynamicObject|10 DynamicVariable struct Observable map set vector list array",literal:"true false null"},contains:[e.HASH_COMMENT_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,{className:"meta",begin:"@[A-Za-z]+"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/gradle.min.js b/vendor/assets/javascripts/highlightjs/languages/gradle.min.js
index 498f21d0ff..9d39fb6dd5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gradle.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gradle.min.js
@@ -1 +1 @@
-hljs.registerLanguage("gradle",function(e){return{cI:!0,k:{keyword:"task project allprojects subprojects artifacts buildscript configurations dependencies repositories sourceSets description delete from into include exclude source classpath destinationDir includes options sourceCompatibility targetCompatibility group flatDir doLast doFirst flatten todir fromdir ant def abstract break case catch continue default do else extends final finally for if implements instanceof native new private protected public return static switch synchronized throw throws transient try volatile while strictfp package import false null super this true antlrtask checkstyle codenarc copy boolean byte char class double float int interface long short void compile runTime file fileTree abs any append asList asWritable call collect compareTo count div dump each eachByte eachFile eachLine every find findAll flatten getAt getErr getIn getOut getText grep immutable inject inspect intersect invokeMethods isCase join leftShift minus multiply newInputStream newOutputStream newPrintWriter newReader newWriter next plus pop power previous print println push putAt read readBytes readLines reverse reverseEach round size sort splitEachLine step subMap times toInteger toList tokenize upto waitForOrKill withPrintWriter withReader withStream withWriter withWriterAppend write writeLine"},c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.NM,e.RM]}});
\ No newline at end of file
+hljs.registerLanguage("gradle",function(){"use strict";return function(e){return{name:"Gradle",case_insensitive:!0,keywords:{keyword:"task project allprojects subprojects artifacts buildscript configurations dependencies repositories sourceSets description delete from into include exclude source classpath destinationDir includes options sourceCompatibility targetCompatibility group flatDir doLast doFirst flatten todir fromdir ant def abstract break case catch continue default do else extends final finally for if implements instanceof native new private protected public return static switch synchronized throw throws transient try volatile while strictfp package import false null super this true antlrtask checkstyle codenarc copy boolean byte char class double float int interface long short void compile runTime file fileTree abs any append asList asWritable call collect compareTo count div dump each eachByte eachFile eachLine every find findAll flatten getAt getErr getIn getOut getText grep immutable inject inspect intersect invokeMethods isCase join leftShift minus multiply newInputStream newOutputStream newPrintWriter newReader newWriter next plus pop power previous print println push putAt read readBytes readLines reverse reverseEach round size sort splitEachLine step subMap times toInteger toList tokenize upto waitForOrKill withPrintWriter withReader withStream withWriter withWriterAppend write writeLine"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.NUMBER_MODE,e.REGEXP_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/groovy.min.js b/vendor/assets/javascripts/highlightjs/languages/groovy.min.js
index c7f763b896..31821980b6 100644
--- a/vendor/assets/javascripts/highlightjs/languages/groovy.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/groovy.min.js
@@ -1 +1 @@
-hljs.registerLanguage("groovy",function(e){return{k:{literal:"true false null",keyword:"byte short char int long boolean float double void def as in assert trait super this abstract static volatile transient public private protected synchronized final class interface enum if else for while switch case break default continue throw throws try catch finally implements extends new import package return instanceof"},c:[e.C("/\\*\\*","\\*/",{r:0,c:[{b:/\w+@/,r:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,{cN:"string",b:'"""',e:'"""'},{cN:"string",b:"'''",e:"'''"},{cN:"string",b:"\\$/",e:"/\\$",r:10},e.ASM,{cN:"regexp",b:/~?\/[^\/\n]+\//,c:[e.BE]},e.QSM,{cN:"meta",b:"^#!/usr/bin/env",e:"$",i:"\n"},e.BNM,{cN:"class",bK:"class interface trait enum",e:"{",i:":",c:[{bK:"extends implements"},e.UTM]},e.CNM,{cN:"meta",b:"@[A-Za-z]+"},{cN:"string",b:/[^\?]{0}[A-Za-z0-9_$]+ *:/},{b:/\?/,e:/\:/},{cN:"symbol",b:"^\\s*[A-Za-z0-9_$]+:",r:0}],i:/#|<\//}});
\ No newline at end of file
+hljs.registerLanguage("groovy",function(){"use strict";function e(e,n={}){return n.variants=e,n}return function(n){const a=e([n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE,n.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0},{className:"doctag",begin:"@[A-Za-z]+"}]})]),t={className:"regexp",begin:/~?\/[^\/\n]+\//,contains:[n.BACKSLASH_ESCAPE]},s=e([n.BINARY_NUMBER_MODE,n.C_NUMBER_MODE]),i=e([{begin:/"""/,end:/"""/},{begin:/'''/,end:/'''/},{begin:"\\$/",end:"/\\$",relevance:10},n.APOS_STRING_MODE,n.QUOTE_STRING_MODE],{className:"string"});return{name:"Groovy",keywords:{built_in:"this super",literal:"true false null",keyword:"byte short char int long boolean float double void def as in assert trait abstract static volatile transient public private protected synchronized final class interface enum if else for while switch case break default continue throw throws try catch finally implements extends new import package return instanceof"},contains:[n.SHEBANG(),a,i,t,s,{className:"class",beginKeywords:"class interface trait enum",end:"{",illegal:":",contains:[{beginKeywords:"extends implements"},n.UNDERSCORE_TITLE_MODE]},{className:"meta",begin:"@[A-Za-z]+"},{className:"attr",begin:"[A-Za-z0-9_$]+[ \t]*:"},{begin:/\?/,end:/:/,contains:[a,i,t,s,"self"]},{className:"symbol",begin:"^[ \t]*"+(r="[A-Za-z0-9_$]+:",function(...e){return e.map(e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n}).join("")}("(?=",r,")")),excludeBegin:!0,end:"[A-Za-z0-9_$]+:",relevance:0}],illegal:/#|<\//};var r}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/haml.min.js b/vendor/assets/javascripts/highlightjs/languages/haml.min.js
index e73ea82014..614f2519f9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/haml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/haml.min.js
@@ -1 +1 @@
-hljs.registerLanguage("haml",function(s){return{cI:!0,c:[{cN:"meta",b:"^!!!( (5|1\\.1|Strict|Frameset|Basic|Mobile|RDFa|XML\\b.*))?$",r:10},s.C("^\\s*(!=#|=#|-#|/).*$",!1,{r:0}),{b:"^\\s*(-|=|!=)(?!#)",starts:{e:"\\n",sL:"ruby"}},{cN:"tag",b:"^\\s*%",c:[{cN:"selector-tag",b:"\\w+"},{cN:"selector-id",b:"#[\\w-]+"},{cN:"selector-class",b:"\\.[\\w-]+"},{b:"{\\s*",e:"\\s*}",c:[{b:":\\w+\\s*=>",e:",\\s+",rB:!0,eW:!0,c:[{cN:"attr",b:":\\w+"},s.ASM,s.QSM,{b:"\\w+",r:0}]}]},{b:"\\(\\s*",e:"\\s*\\)",eE:!0,c:[{b:"\\w+\\s*=",e:"\\s+",rB:!0,eW:!0,c:[{cN:"attr",b:"\\w+",r:0},s.ASM,s.QSM,{b:"\\w+",r:0}]}]}]},{b:"^\\s*[=~]\\s*"},{b:"#{",starts:{e:"}",sL:"ruby"}}]}});
\ No newline at end of file
+hljs.registerLanguage("haml",function(){"use strict";return function(e){return{name:"HAML",case_insensitive:!0,contains:[{className:"meta",begin:"^!!!( (5|1\\.1|Strict|Frameset|Basic|Mobile|RDFa|XML\\b.*))?$",relevance:10},e.COMMENT("^\\s*(!=#|=#|-#|/).*$",!1,{relevance:0}),{begin:"^\\s*(-|=|!=)(?!#)",starts:{end:"\\n",subLanguage:"ruby"}},{className:"tag",begin:"^\\s*%",contains:[{className:"selector-tag",begin:"\\w+"},{className:"selector-id",begin:"#[\\w-]+"},{className:"selector-class",begin:"\\.[\\w-]+"},{begin:"{\\s*",end:"\\s*}",contains:[{begin:":\\w+\\s*=>",end:",\\s+",returnBegin:!0,endsWithParent:!0,contains:[{className:"attr",begin:":\\w+"},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{begin:"\\w+",relevance:0}]}]},{begin:"\\(\\s*",end:"\\s*\\)",excludeEnd:!0,contains:[{begin:"\\w+\\s*=",end:"\\s+",returnBegin:!0,endsWithParent:!0,contains:[{className:"attr",begin:"\\w+",relevance:0},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{begin:"\\w+",relevance:0}]}]}]},{begin:"^\\s*[=~]\\s*"},{begin:"#{",starts:{end:"}",subLanguage:"ruby"}}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/handlebars.min.js b/vendor/assets/javascripts/highlightjs/languages/handlebars.min.js
index a3c1c859c1..a0fee8b64b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/handlebars.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/handlebars.min.js
@@ -1 +1 @@
-hljs.registerLanguage("handlebars",function(e){var a={"builtin-name":"each in with if else unless bindattr action collection debugger log outlet template unbound view yield"};return{aliases:["hbs","html.hbs","html.handlebars"],cI:!0,sL:"xml",c:[e.C("{{!(--)?","(--)?}}"),{cN:"template-tag",b:/\{\{[#\/]/,e:/\}\}/,c:[{cN:"name",b:/[a-zA-Z\.-]+/,k:a,starts:{eW:!0,r:0,c:[e.QSM]}}]},{cN:"template-variable",b:/\{\{/,e:/\}\}/,k:a}]}});
\ No newline at end of file
+hljs.registerLanguage("handlebars",function(){"use strict";function e(...e){return e.map(e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n}).join("")}return function(n){const a={"builtin-name":"action bindattr collection component concat debugger each each-in get hash if in input link-to loc log lookup mut outlet partial query-params render template textarea unbound unless view with yield"},t=/\[.*?\]/,s=/[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/,i=e("(",/'.*?'/,"|",/".*?"/,"|",t,"|",s,"|",/\.|\//,")+"),r=e("(",t,"|",s,")(?==)"),l={begin:i,lexemes:/[\w.\/]+/},c=n.inherit(l,{keywords:{literal:"true false undefined null"}}),o={begin:/\(/,end:/\)/},m={className:"attr",begin:r,relevance:0,starts:{begin:/=/,end:/=/,starts:{contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,c,o]}}},d={contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,{begin:/as\s+\|/,keywords:{keyword:"as"},end:/\|/,contains:[{begin:/\w+/}]},m,c,o],returnEnd:!0},g=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/\)/})});o.contains=[g];const u=n.inherit(l,{keywords:a,className:"name",starts:n.inherit(d,{end:/}}/})}),b=n.inherit(l,{keywords:a,className:"name"}),h=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/}}/})});return{name:"Handlebars",aliases:["hbs","html.hbs","html.handlebars","htmlbars"],case_insensitive:!0,subLanguage:"xml",contains:[{begin:/\\\{\{/,skip:!0},{begin:/\\\\(?=\{\{)/,skip:!0},n.COMMENT(/\{\{!--/,/--\}\}/),n.COMMENT(/\{\{!/,/\}\}/),{className:"template-tag",begin:/\{\{\{\{(?!\/)/,end:/\}\}\}\}/,contains:[u],starts:{end:/\{\{\{\{\//,returnEnd:!0,subLanguage:"xml"}},{className:"template-tag",begin:/\{\{\{\{\//,end:/\}\}\}\}/,contains:[b]},{className:"template-tag",begin:/\{\{#/,end:/\}\}/,contains:[u]},{className:"template-tag",begin:/\{\{(?=else\}\})/,end:/\}\}/,keywords:"else"},{className:"template-tag",begin:/\{\{\//,end:/\}\}/,contains:[b]},{className:"template-variable",begin:/\{\{\{/,end:/\}\}\}/,contains:[h]},{className:"template-variable",begin:/\{\{/,end:/\}\}/,contains:[h]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/haskell.min.js b/vendor/assets/javascripts/highlightjs/languages/haskell.min.js
index 334d56325d..c92c641b11 100644
--- a/vendor/assets/javascripts/highlightjs/languages/haskell.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/haskell.min.js
@@ -1 +1 @@
-hljs.registerLanguage("haskell",function(e){var i={v:[e.C("--","$"),e.C("{-","-}",{c:["self"]})]},a={cN:"meta",b:"{-#",e:"#-}"},l={cN:"meta",b:"^#",e:"$"},c={cN:"type",b:"\\b[A-Z][\\w']*",r:0},n={b:"\\(",e:"\\)",i:'"',c:[a,l,{cN:"type",b:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},e.inherit(e.TM,{b:"[_a-z][\\w']*"}),i]},s={b:"{",e:"}",c:n.c};return{aliases:["hs"],k:"let in if then else case of where do module import hiding qualified type data newtype deriving class instance as default infix infixl infixr foreign export ccall stdcall cplusplus jvm dotnet safe unsafe family forall mdo proc rec",c:[{bK:"module",e:"where",k:"module where",c:[n,i],i:"\\W\\.|;"},{b:"\\bimport\\b",e:"$",k:"import qualified as hiding",c:[n,i],i:"\\W\\.|;"},{cN:"class",b:"^(\\s*)?(class|instance)\\b",e:"where",k:"class family instance where",c:[c,n,i]},{cN:"class",b:"\\b(data|(new)?type)\\b",e:"$",k:"data family type newtype deriving",c:[a,c,n,s,i]},{bK:"default",e:"$",c:[c,n,i]},{bK:"infix infixl infixr",e:"$",c:[e.CNM,i]},{b:"\\bforeign\\b",e:"$",k:"foreign import export ccall stdcall cplusplus jvm dotnet safe unsafe",c:[c,e.QSM,i]},{cN:"meta",b:"#!\\/usr\\/bin\\/env runhaskell",e:"$"},a,l,e.QSM,e.CNM,c,e.inherit(e.TM,{b:"^[_a-z][\\w']*"}),i,{b:"->|<-"}]}});
\ No newline at end of file
+hljs.registerLanguage("haskell",function(){"use strict";return function(e){var n={variants:[e.COMMENT("--","$"),e.COMMENT("{-","-}",{contains:["self"]})]},i={className:"meta",begin:"{-#",end:"#-}"},a={className:"meta",begin:"^#",end:"$"},s={className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},l={begin:"\\(",end:"\\)",illegal:'"',contains:[i,a,{className:"type",begin:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},e.inherit(e.TITLE_MODE,{begin:"[_a-z][\\w']*"}),n]};return{name:"Haskell",aliases:["hs"],keywords:"let in if then else case of where do module import hiding qualified type data newtype deriving class instance as default infix infixl infixr foreign export ccall stdcall cplusplus jvm dotnet safe unsafe family forall mdo proc rec",contains:[{beginKeywords:"module",end:"where",keywords:"module where",contains:[l,n],illegal:"\\W\\.|;"},{begin:"\\bimport\\b",end:"$",keywords:"import qualified as hiding",contains:[l,n],illegal:"\\W\\.|;"},{className:"class",begin:"^(\\s*)?(class|instance)\\b",end:"where",keywords:"class family instance where",contains:[s,l,n]},{className:"class",begin:"\\b(data|(new)?type)\\b",end:"$",keywords:"data family type newtype deriving",contains:[i,s,l,{begin:"{",end:"}",contains:l.contains},n]},{beginKeywords:"default",end:"$",contains:[s,l,n]},{beginKeywords:"infix infixl infixr",end:"$",contains:[e.C_NUMBER_MODE,n]},{begin:"\\bforeign\\b",end:"$",keywords:"foreign import export ccall stdcall cplusplus jvm dotnet safe unsafe",contains:[s,e.QUOTE_STRING_MODE,n]},{className:"meta",begin:"#!\\/usr\\/bin\\/env runhaskell",end:"$"},i,a,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,s,e.inherit(e.TITLE_MODE,{begin:"^[_a-z][\\w']*"}),n,{begin:"->|<-"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/haxe.min.js b/vendor/assets/javascripts/highlightjs/languages/haxe.min.js
index ab88585bf2..9e1612ee9e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/haxe.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/haxe.min.js
@@ -1 +1 @@
-hljs.registerLanguage("haxe",function(e){var t="Int Float String Bool Dynamic Void Array ";return{aliases:["hx"],k:{keyword:"break case cast catch continue default do dynamic else enum extern for function here if import in inline never new override package private get set public return static super switch this throw trace try typedef untyped using var while "+t,built_in:"trace this",literal:"true false null _"},c:[{cN:"string",b:"'",e:"'",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"},{cN:"subst",b:"\\$",e:"\\W}"}]},e.QSM,e.CLCM,e.CBCM,e.CNM,{cN:"meta",b:"@:",e:"$"},{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elseif end error"}},{cN:"type",b:":[ 	]*",e:"[^A-Za-z0-9_ 	\\->]",eB:!0,eE:!0,r:0},{cN:"type",b:":[ 	]*",e:"\\W",eB:!0,eE:!0},{cN:"type",b:"new *",e:"\\W",eB:!0,eE:!0},{cN:"class",bK:"enum",e:"\\{",c:[e.TM]},{cN:"class",bK:"abstract",e:"[\\{$]",c:[{cN:"type",b:"\\(",e:"\\)",eB:!0,eE:!0},{cN:"type",b:"from +",e:"\\W",eB:!0,eE:!0},{cN:"type",b:"to +",e:"\\W",eB:!0,eE:!0},e.TM],k:{keyword:"abstract from to"}},{cN:"class",b:"\\b(class|interface) +",e:"[\\{$]",eE:!0,k:"class interface",c:[{cN:"keyword",b:"\\b(extends|implements) +",k:"extends implements",c:[{cN:"type",b:e.IR,r:0}]},e.TM]},{cN:"function",bK:"function",e:"\\(",eE:!0,i:"\\S",c:[e.TM]}],i:/<\//}});
\ No newline at end of file
+hljs.registerLanguage("haxe",function(){"use strict";return function(e){return{name:"Haxe",aliases:["hx"],keywords:{keyword:"break case cast catch continue default do dynamic else enum extern for function here if import in inline never new override package private get set public return static super switch this throw trace try typedef untyped using var while Int Float String Bool Dynamic Void Array ",built_in:"trace this",literal:"true false null _"},contains:[{className:"string",begin:"'",end:"'",contains:[e.BACKSLASH_ESCAPE,{className:"subst",begin:"\\$\\{",end:"\\}"},{className:"subst",begin:"\\$",end:"\\W}"}]},e.QUOTE_STRING_MODE,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.C_NUMBER_MODE,{className:"meta",begin:"@:",end:"$"},{className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"if else elseif end error"}},{className:"type",begin:":[ \t]*",end:"[^A-Za-z0-9_ \t\\->]",excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:":[ \t]*",end:"\\W",excludeBegin:!0,excludeEnd:!0},{className:"type",begin:"new *",end:"\\W",excludeBegin:!0,excludeEnd:!0},{className:"class",beginKeywords:"enum",end:"\\{",contains:[e.TITLE_MODE]},{className:"class",beginKeywords:"abstract",end:"[\\{$]",contains:[{className:"type",begin:"\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0},{className:"type",begin:"from +",end:"\\W",excludeBegin:!0,excludeEnd:!0},{className:"type",begin:"to +",end:"\\W",excludeBegin:!0,excludeEnd:!0},e.TITLE_MODE],keywords:{keyword:"abstract from to"}},{className:"class",begin:"\\b(class|interface) +",end:"[\\{$]",excludeEnd:!0,keywords:"class interface",contains:[{className:"keyword",begin:"\\b(extends|implements) +",keywords:"extends implements",contains:[{className:"type",begin:e.IDENT_RE,relevance:0}]},e.TITLE_MODE]},{className:"function",beginKeywords:"function",end:"\\(",excludeEnd:!0,illegal:"\\S",contains:[e.TITLE_MODE]}],illegal:/<\//}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/hsp.min.js b/vendor/assets/javascripts/highlightjs/languages/hsp.min.js
index 2b5c2db455..3846f5113f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/hsp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/hsp.min.js
@@ -1 +1 @@
-hljs.registerLanguage("hsp",function(e){return{cI:!0,l:/[\w\._]+/,k:"goto gosub return break repeat loop continue wait await dim sdim foreach dimtype dup dupptr end stop newmod delmod mref run exgoto on mcall assert logmes newlab resume yield onexit onerror onkey onclick oncmd exist delete mkdir chdir dirlist bload bsave bcopy memfile if else poke wpoke lpoke getstr chdpm memexpand memcpy memset notesel noteadd notedel noteload notesave randomize noteunsel noteget split strrep setease button chgdisp exec dialog mmload mmplay mmstop mci pset pget syscolor mes print title pos circle cls font sysfont objsize picload color palcolor palette redraw width gsel gcopy gzoom gmode bmpsave hsvcolor getkey listbox chkbox combox input mesbox buffer screen bgscr mouse objsel groll line clrobj boxf objprm objmode stick grect grotate gsquare gradf objimage objskip objenable celload celdiv celput newcom querycom delcom cnvstow comres axobj winobj sendmsg comevent comevarg sarrayconv callfunc cnvwtos comevdisp libptr system hspstat hspver stat cnt err strsize looplev sublev iparam wparam lparam refstr refdval int rnd strlen length length2 length3 length4 vartype gettime peek wpeek lpeek varptr varuse noteinfo instr abs limit getease str strmid strf getpath strtrim sin cos tan atan sqrt double absf expf logf limitf powf geteasef mousex mousey mousew hwnd hinstance hdc ginfo objinfo dirinfo sysinfo thismod __hspver__ __hsp30__ __date__ __time__ __line__ __file__ _debug __hspdef__ and or xor not screen_normal screen_palette screen_hide screen_fixedsize screen_tool screen_frame gmode_gdi gmode_mem gmode_rgb0 gmode_alpha gmode_rgb0alpha gmode_add gmode_sub gmode_pixela ginfo_mx ginfo_my ginfo_act ginfo_sel ginfo_wx1 ginfo_wy1 ginfo_wx2 ginfo_wy2 ginfo_vx ginfo_vy ginfo_sizex ginfo_sizey ginfo_winx ginfo_winy ginfo_mesx ginfo_mesy ginfo_r ginfo_g ginfo_b ginfo_paluse ginfo_dispx ginfo_dispy ginfo_cx ginfo_cy ginfo_intid ginfo_newid ginfo_sx ginfo_sy objinfo_mode objinfo_bmscr objinfo_hwnd notemax notesize dir_cur dir_exe dir_win dir_sys dir_cmdline dir_desktop dir_mydoc dir_tv font_normal font_bold font_italic font_underline font_strikeout font_antialias objmode_normal objmode_guifont objmode_usefont gsquare_grad msgothic msmincho do until while wend for next _break _continue switch case default swbreak swend ddim ldim alloc m_pi rad2deg deg2rad ease_linear ease_quad_in ease_quad_out ease_quad_inout ease_cubic_in ease_cubic_out ease_cubic_inout ease_quartic_in ease_quartic_out ease_quartic_inout ease_bounce_in ease_bounce_out ease_bounce_inout ease_shake_in ease_shake_out ease_shake_inout ease_loop",c:[e.CLCM,e.CBCM,e.QSM,e.ASM,{cN:"string",b:'{"',e:'"}',c:[e.BE]},e.C(";","$",{r:0}),{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"addion cfunc cmd cmpopt comfunc const defcfunc deffunc define else endif enum epack func global if ifdef ifndef include modcfunc modfunc modinit modterm module pack packopt regcmd runtime undef usecom uselib"},c:[e.inherit(e.QSM,{cN:"meta-string"}),e.NM,e.CNM,e.CLCM,e.CBCM]},{cN:"symbol",b:"^\\*(\\w+|@)"},e.NM,e.CNM]}});
\ No newline at end of file
+hljs.registerLanguage("hsp",function(){"use strict";return function(e){return{name:"HSP",case_insensitive:!0,keywords:{$pattern:/[\w._]+/,keyword:"goto gosub return break repeat loop continue wait await dim sdim foreach dimtype dup dupptr end stop newmod delmod mref run exgoto on mcall assert logmes newlab resume yield onexit onerror onkey onclick oncmd exist delete mkdir chdir dirlist bload bsave bcopy memfile if else poke wpoke lpoke getstr chdpm memexpand memcpy memset notesel noteadd notedel noteload notesave randomize noteunsel noteget split strrep setease button chgdisp exec dialog mmload mmplay mmstop mci pset pget syscolor mes print title pos circle cls font sysfont objsize picload color palcolor palette redraw width gsel gcopy gzoom gmode bmpsave hsvcolor getkey listbox chkbox combox input mesbox buffer screen bgscr mouse objsel groll line clrobj boxf objprm objmode stick grect grotate gsquare gradf objimage objskip objenable celload celdiv celput newcom querycom delcom cnvstow comres axobj winobj sendmsg comevent comevarg sarrayconv callfunc cnvwtos comevdisp libptr system hspstat hspver stat cnt err strsize looplev sublev iparam wparam lparam refstr refdval int rnd strlen length length2 length3 length4 vartype gettime peek wpeek lpeek varptr varuse noteinfo instr abs limit getease str strmid strf getpath strtrim sin cos tan atan sqrt double absf expf logf limitf powf geteasef mousex mousey mousew hwnd hinstance hdc ginfo objinfo dirinfo sysinfo thismod __hspver__ __hsp30__ __date__ __time__ __line__ __file__ _debug __hspdef__ and or xor not screen_normal screen_palette screen_hide screen_fixedsize screen_tool screen_frame gmode_gdi gmode_mem gmode_rgb0 gmode_alpha gmode_rgb0alpha gmode_add gmode_sub gmode_pixela ginfo_mx ginfo_my ginfo_act ginfo_sel ginfo_wx1 ginfo_wy1 ginfo_wx2 ginfo_wy2 ginfo_vx ginfo_vy ginfo_sizex ginfo_sizey ginfo_winx ginfo_winy ginfo_mesx ginfo_mesy ginfo_r ginfo_g ginfo_b ginfo_paluse ginfo_dispx ginfo_dispy ginfo_cx ginfo_cy ginfo_intid ginfo_newid ginfo_sx ginfo_sy objinfo_mode objinfo_bmscr objinfo_hwnd notemax notesize dir_cur dir_exe dir_win dir_sys dir_cmdline dir_desktop dir_mydoc dir_tv font_normal font_bold font_italic font_underline font_strikeout font_antialias objmode_normal objmode_guifont objmode_usefont gsquare_grad msgothic msmincho do until while wend for next _break _continue switch case default swbreak swend ddim ldim alloc m_pi rad2deg deg2rad ease_linear ease_quad_in ease_quad_out ease_quad_inout ease_cubic_in ease_cubic_out ease_cubic_inout ease_quartic_in ease_quartic_out ease_quartic_inout ease_bounce_in ease_bounce_out ease_bounce_inout ease_shake_in ease_shake_out ease_shake_inout ease_loop"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{className:"string",begin:'{"',end:'"}',contains:[e.BACKSLASH_ESCAPE]},e.COMMENT(";","$",{relevance:0}),{className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"addion cfunc cmd cmpopt comfunc const defcfunc deffunc define else endif enum epack func global if ifdef ifndef include modcfunc modfunc modinit modterm module pack packopt regcmd runtime undef usecom uselib"},contains:[e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),e.NUMBER_MODE,e.C_NUMBER_MODE,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"symbol",begin:"^\\*(\\w+|@)"},e.NUMBER_MODE,e.C_NUMBER_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/htmlbars.min.js b/vendor/assets/javascripts/highlightjs/languages/htmlbars.min.js
index fb5eb1dca5..f735d0618e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/htmlbars.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/htmlbars.min.js
@@ -1 +1 @@
-hljs.registerLanguage("htmlbars",function(e){var a="action collection component concat debugger each each-in else get hash if input link-to loc log mut outlet partial query-params render textarea unbound unless with yield view",t={i:/\}\}/,b:/[a-zA-Z0-9_]+=/,rB:!0,r:0,c:[{cN:"attr",b:/[a-zA-Z0-9_]+/}]},i=({i:/\}\}/,b:/\)/,e:/\)/,c:[{b:/[a-zA-Z\.\-]+/,k:{built_in:a},starts:{eW:!0,r:0,c:[e.QSM]}}]},{eW:!0,r:0,k:{keyword:"as",built_in:a},c:[e.QSM,t,e.NM]});return{cI:!0,sL:"xml",c:[e.C("{{!(--)?","(--)?}}"),{cN:"template-tag",b:/\{\{[#\/]/,e:/\}\}/,c:[{cN:"name",b:/[a-zA-Z\.\-]+/,k:{"builtin-name":a},starts:i}]},{cN:"template-variable",b:/\{\{[a-zA-Z][a-zA-Z\-]+/,e:/\}\}/,k:{keyword:"as",built_in:a},c:[e.QSM]}]}});
\ No newline at end of file
+hljs.registerLanguage("htmlbars",function(){"use strict";function e(...e){return e.map(e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n}).join("")}return function(n){const a=function(n){const a={"builtin-name":"action bindattr collection component concat debugger each each-in get hash if in input link-to loc log lookup mut outlet partial query-params render template textarea unbound unless view with yield"},t=/\[.*?\]/,s=/[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/,i=e("(",/'.*?'/,"|",/".*?"/,"|",t,"|",s,"|",/\.|\//,")+"),r=e("(",t,"|",s,")(?==)"),l={begin:i,lexemes:/[\w.\/]+/},c=n.inherit(l,{keywords:{literal:"true false undefined null"}}),o={begin:/\(/,end:/\)/},m={className:"attr",begin:r,relevance:0,starts:{begin:/=/,end:/=/,starts:{contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,c,o]}}},d={contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,{begin:/as\s+\|/,keywords:{keyword:"as"},end:/\|/,contains:[{begin:/\w+/}]},m,c,o],returnEnd:!0},g=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/\)/})});o.contains=[g];const u=n.inherit(l,{keywords:a,className:"name",starts:n.inherit(d,{end:/}}/})}),b=n.inherit(l,{keywords:a,className:"name"}),h=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/}}/})});return{name:"Handlebars",aliases:["hbs","html.hbs","html.handlebars","htmlbars"],case_insensitive:!0,subLanguage:"xml",contains:[{begin:/\\\{\{/,skip:!0},{begin:/\\\\(?=\{\{)/,skip:!0},n.COMMENT(/\{\{!--/,/--\}\}/),n.COMMENT(/\{\{!/,/\}\}/),{className:"template-tag",begin:/\{\{\{\{(?!\/)/,end:/\}\}\}\}/,contains:[u],starts:{end:/\{\{\{\{\//,returnEnd:!0,subLanguage:"xml"}},{className:"template-tag",begin:/\{\{\{\{\//,end:/\}\}\}\}/,contains:[b]},{className:"template-tag",begin:/\{\{#/,end:/\}\}/,contains:[u]},{className:"template-tag",begin:/\{\{(?=else\}\})/,end:/\}\}/,keywords:"else"},{className:"template-tag",begin:/\{\{\//,end:/\}\}/,contains:[b]},{className:"template-variable",begin:/\{\{\{/,end:/\}\}\}/,contains:[h]},{className:"template-variable",begin:/\{\{/,end:/\}\}/,contains:[h]}]}}(n);return a.name="HTMLbars",n.getLanguage("handlebars")&&(a.disableAutodetect=!0),a}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/http.min.js b/vendor/assets/javascripts/highlightjs/languages/http.min.js
index 9f017165ab..e7ea1b0a78 100644
--- a/vendor/assets/javascripts/highlightjs/languages/http.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/http.min.js
@@ -1 +1 @@
-hljs.registerLanguage("http",function(e){var t="HTTP/[0-9\\.]+";return{aliases:["https"],i:"\\S",c:[{b:"^"+t,e:"$",c:[{cN:"number",b:"\\b\\d{3}\\b"}]},{b:"^[A-Z]+ (.*?) "+t+"$",rB:!0,e:"$",c:[{cN:"string",b:" ",e:" ",eB:!0,eE:!0},{b:t},{cN:"keyword",b:"[A-Z]+"}]},{cN:"attribute",b:"^\\w",e:": ",eE:!0,i:"\\n|\\s|=",starts:{e:"$",r:0}},{b:"\\n\\n",starts:{sL:[],eW:!0}}]}});
\ No newline at end of file
+hljs.registerLanguage("http",function(){"use strict";return function(e){return{name:"HTTP",aliases:["https"],illegal:"\\S",contains:[{begin:"^HTTP/[0-9\\.]+",end:"$",contains:[{className:"number",begin:"\\b\\d{3}\\b"}]},{begin:"^[A-Z]+ (.*?) HTTP/[0-9\\.]+$",returnBegin:!0,end:"$",contains:[{className:"string",begin:" ",end:" ",excludeBegin:!0,excludeEnd:!0},{begin:"HTTP/[0-9\\.]+"},{className:"keyword",begin:"[A-Z]+"}]},{className:"attribute",begin:"^\\w",end:": ",excludeEnd:!0,illegal:"\\n|\\s|=",starts:{end:"$",relevance:0}},{begin:"\\n\\n",starts:{subLanguage:[],endsWithParent:!0}}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/hy.min.js b/vendor/assets/javascripts/highlightjs/languages/hy.min.js
index 5d9f3747cb..a494906d31 100644
--- a/vendor/assets/javascripts/highlightjs/languages/hy.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/hy.min.js
@@ -1 +1 @@
-hljs.registerLanguage("hy",function(e){var t={"builtin-name":"!= % %= & &= * ** **= *= *map + += , --build-class-- --import-- -= . / // //= /= < << <<= <= = > >= >> >>= @ @= ^ ^= abs accumulate all and any ap-compose ap-dotimes ap-each ap-each-while ap-filter ap-first ap-if ap-last ap-map ap-map-when ap-pipe ap-reduce ap-reject apply as-> ascii assert assoc bin break butlast callable calling-module-name car case cdr chain chr coll? combinations compile compress cond cons cons? continue count curry cut cycle dec def default-method defclass defmacro defmacro-alias defmacro/g! defmain defmethod defmulti defn defn-alias defnc defnr defreader defseq del delattr delete-route dict-comp dir disassemble dispatch-reader-macro distinct divmod do doto drop drop-last drop-while empty? end-sequence eval eval-and-compile eval-when-compile even? every? except exec filter first flatten float? fn fnc fnr for for* format fraction genexpr gensym get getattr global globals group-by hasattr hash hex id identity if if* if-not if-python2 import in inc input instance? integer integer-char? integer? interleave interpose is is-coll is-cons is-empty is-even is-every is-float is-instance is-integer is-integer-char is-iterable is-iterator is-keyword is-neg is-none is-not is-numeric is-odd is-pos is-string is-symbol is-zero isinstance islice issubclass iter iterable? iterate iterator? keyword keyword? lambda last len let lif lif-not list* list-comp locals loop macro-error macroexpand macroexpand-1 macroexpand-all map max merge-with method-decorator min multi-decorator multicombinations name neg? next none? nonlocal not not-in not? nth numeric? oct odd? open or ord partition permutations pos? post-route postwalk pow prewalk print product profile/calls profile/cpu put-route quasiquote quote raise range read read-str recursive-replace reduce remove repeat repeatedly repr require rest round route route-with-methods rwm second seq set-comp setattr setv some sorted string string? sum switch symbol? take take-nth take-while tee try unless unquote unquote-splicing vars walk when while with with* with-decorator with-gensyms xi xor yield yield-from zero? zip zip-longest | |= ~"},i="a-zA-Z_\\-!.?+*=<>&#'",a="["+i+"]["+i+"0-9/;:]*",r="[-+]?\\d+(\\.\\d+)?",o={cN:"meta",b:"^#!",e:"$"},s={b:a,r:0},n={cN:"number",b:r,r:0},l=e.inherit(e.QSM,{i:null}),c=e.C(";","$",{r:0}),d={cN:"literal",b:/\b([Tt]rue|[Ff]alse|nil|None)\b/},p={b:"[\\[\\{]",e:"[\\]\\}]"},m={cN:"comment",b:"\\^"+a},u=e.C("\\^\\{","\\}"),f={cN:"symbol",b:"[:]{1,2}"+a},h={b:"\\(",e:"\\)"},b={eW:!0,r:0},g={k:t,l:a,cN:"name",b:a,starts:b},y=[h,l,m,u,c,f,p,n,d,s];return h.c=[e.C("comment",""),g,b],b.c=y,p.c=y,{aliases:["hylang"],i:/\S/,c:[o,h,l,m,u,c,f,p,n,d]}});
\ No newline at end of file
+hljs.registerLanguage("hy",function(){"use strict";return function(e){var a="[a-zA-Z_\\-!.?+*=<>&#'][a-zA-Z_\\-!.?+*=<>&#'0-9/;:]*",t={$pattern:a,"builtin-name":"!= % %= & &= * ** **= *= *map + += , --build-class-- --import-- -= . / // //= /= < << <<= <= = > >= >> >>= @ @= ^ ^= abs accumulate all and any ap-compose ap-dotimes ap-each ap-each-while ap-filter ap-first ap-if ap-last ap-map ap-map-when ap-pipe ap-reduce ap-reject apply as-> ascii assert assoc bin break butlast callable calling-module-name car case cdr chain chr coll? combinations compile compress cond cons cons? continue count curry cut cycle dec def default-method defclass defmacro defmacro-alias defmacro/g! defmain defmethod defmulti defn defn-alias defnc defnr defreader defseq del delattr delete-route dict-comp dir disassemble dispatch-reader-macro distinct divmod do doto drop drop-last drop-while empty? end-sequence eval eval-and-compile eval-when-compile even? every? except exec filter first flatten float? fn fnc fnr for for* format fraction genexpr gensym get getattr global globals group-by hasattr hash hex id identity if if* if-not if-python2 import in inc input instance? integer integer-char? integer? interleave interpose is is-coll is-cons is-empty is-even is-every is-float is-instance is-integer is-integer-char is-iterable is-iterator is-keyword is-neg is-none is-not is-numeric is-odd is-pos is-string is-symbol is-zero isinstance islice issubclass iter iterable? iterate iterator? keyword keyword? lambda last len let lif lif-not list* list-comp locals loop macro-error macroexpand macroexpand-1 macroexpand-all map max merge-with method-decorator min multi-decorator multicombinations name neg? next none? nonlocal not not-in not? nth numeric? oct odd? open or ord partition permutations pos? post-route postwalk pow prewalk print product profile/calls profile/cpu put-route quasiquote quote raise range read read-str recursive-replace reduce remove repeat repeatedly repr require rest round route route-with-methods rwm second seq set-comp setattr setv some sorted string string? sum switch symbol? take take-nth take-while tee try unless unquote unquote-splicing vars walk when while with with* with-decorator with-gensyms xi xor yield yield-from zero? zip zip-longest | |= ~"},i={begin:a,relevance:0},n={className:"number",begin:"[-+]?\\d+(\\.\\d+)?",relevance:0},r=e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),s=e.COMMENT(";","$",{relevance:0}),o={className:"literal",begin:/\b([Tt]rue|[Ff]alse|nil|None)\b/},l={begin:"[\\[\\{]",end:"[\\]\\}]"},c={className:"comment",begin:"\\^"+a},d=e.COMMENT("\\^\\{","\\}"),m={className:"symbol",begin:"[:]{1,2}"+a},p={begin:"\\(",end:"\\)"},u={endsWithParent:!0,relevance:0},f={keywords:t,className:"name",begin:a,starts:u},g=[p,r,c,d,s,m,l,n,o,i];return p.contains=[e.COMMENT("comment",""),f,u],u.contains=g,l.contains=g,{name:"Hy",aliases:["hylang"],illegal:/\S/,contains:[e.SHEBANG(),p,r,c,d,s,m,l,n,o]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/inform7.min.js b/vendor/assets/javascripts/highlightjs/languages/inform7.min.js
index bb827d4e27..9816383e73 100644
--- a/vendor/assets/javascripts/highlightjs/languages/inform7.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/inform7.min.js
@@ -1 +1 @@
-hljs.registerLanguage("inform7",function(e){var r="\\[",o="\\]";return{aliases:["i7"],cI:!0,k:{keyword:"thing room person man woman animal container supporter backdrop door scenery open closed locked inside gender is are say understand kind of rule"},c:[{cN:"string",b:'"',e:'"',r:0,c:[{cN:"subst",b:r,e:o}]},{cN:"section",b:/^(Volume|Book|Part|Chapter|Section|Table)\b/,e:"$"},{b:/^(Check|Carry out|Report|Instead of|To|Rule|When|Before|After)\b/,e:":",c:[{b:"\\(This",e:"\\)"}]},{cN:"comment",b:r,e:o,c:["self"]}]}});
\ No newline at end of file
+hljs.registerLanguage("inform7",function(){"use strict";return function(e){return{name:"Inform 7",aliases:["i7"],case_insensitive:!0,keywords:{keyword:"thing room person man woman animal container supporter backdrop door scenery open closed locked inside gender is are say understand kind of rule"},contains:[{className:"string",begin:'"',end:'"',relevance:0,contains:[{className:"subst",begin:"\\[",end:"\\]"}]},{className:"section",begin:/^(Volume|Book|Part|Chapter|Section|Table)\b/,end:"$"},{begin:/^(Check|Carry out|Report|Instead of|To|Rule|When|Before|After)\b/,end:":",contains:[{begin:"\\(This",end:"\\)"}]},{className:"comment",begin:"\\[",end:"\\]",contains:["self"]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ini.min.js b/vendor/assets/javascripts/highlightjs/languages/ini.min.js
index 28e99fb8a2..80541dca3c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ini.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ini.min.js
@@ -1 +1 @@
-hljs.registerLanguage("ini",function(e){var b={cN:"string",c:[e.BE],v:[{b:"'''",e:"'''",r:10},{b:'"""',e:'"""',r:10},{b:'"',e:'"'},{b:"'",e:"'"}]};return{aliases:["toml"],cI:!0,i:/\S/,c:[e.C(";","$"),e.HCM,{cN:"section",b:/^\s*\[+/,e:/\]+/},{b:/^[a-z0-9\[\]_-]+\s*=\s*/,e:"$",rB:!0,c:[{cN:"attr",b:/[a-z0-9\[\]_-]+/},{b:/=/,eW:!0,r:0,c:[{cN:"literal",b:/\bon|off|true|false|yes|no\b/},{cN:"variable",v:[{b:/\$[\w\d"][\w\d_]*/},{b:/\$\{(.*?)}/}]},b,{cN:"number",b:/([\+\-]+)?[\d]+_[\d_]+/},e.NM]}]}]}});
\ No newline at end of file
+hljs.registerLanguage("ini",function(){"use strict";return function(e){var n={className:"number",relevance:0,variants:[{begin:/([\+\-]+)?[\d]+_[\d_]+/},{begin:e.NUMBER_RE}]},a=e.COMMENT();a.variants=[{begin:/;/,end:/$/},{begin:/#/,end:/$/}];var s={className:"variable",variants:[{begin:/\$[\w\d"][\w\d_]*/},{begin:/\$\{(.*?)}/}]},i={className:"literal",begin:/\bon|off|true|false|yes|no\b/},t={className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:"'''",end:"'''",relevance:10},{begin:'"""',end:'"""',relevance:10},{begin:'"',end:'"'},{begin:"'",end:"'"}]};return{name:"TOML, also INI",aliases:["toml"],case_insensitive:!0,illegal:/\S/,contains:[a,{className:"section",begin:/\[+/,end:/\]+/},{begin:/^[a-z0-9\[\]_\.-]+(?=\s*=\s*)/,className:"attr",starts:{end:/$/,contains:[a,{begin:/\[/,end:/\]/,contains:[a,i,s,t,n,"self"],relevance:0},i,s,t,n]}}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/irpf90.min.js b/vendor/assets/javascripts/highlightjs/languages/irpf90.min.js
index c6efe97819..e0e369d14c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/irpf90.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/irpf90.min.js
@@ -1 +1 @@
-hljs.registerLanguage("irpf90",function(e){var t={cN:"params",b:"\\(",e:"\\)"},n={literal:".False. .True.",keyword:"kind do while private call intrinsic where elsewhere type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then public subroutine|10 function program .and. .or. .not. .le. .eq. .ge. .gt. .lt. goto save else use module select case access blank direct exist file fmt form formatted iostat name named nextrec number opened rec recl sequential status unformatted unit continue format pause cycle exit c_null_char c_alert c_backspace c_form_feed flush wait decimal round iomsg synchronous nopass non_overridable pass protected volatile abstract extends import non_intrinsic value deferred generic final enumerator class associate bind enum c_int c_short c_long c_long_long c_signed_char c_size_t c_int8_t c_int16_t c_int32_t c_int64_t c_int_least8_t c_int_least16_t c_int_least32_t c_int_least64_t c_int_fast8_t c_int_fast16_t c_int_fast32_t c_int_fast64_t c_intmax_t C_intptr_t c_float c_double c_long_double c_float_complex c_double_complex c_long_double_complex c_bool c_char c_null_ptr c_null_funptr c_new_line c_carriage_return c_horizontal_tab c_vertical_tab iso_c_binding c_loc c_funloc c_associated  c_f_pointer c_ptr c_funptr iso_fortran_env character_storage_size error_unit file_storage_size input_unit iostat_end iostat_eor numeric_storage_size output_unit c_f_procpointer ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode newunit contiguous recursive pad position action delim readwrite eor advance nml interface procedure namelist include sequence elemental pure integer real character complex logical dimension allocatable|10 parameter external implicit|10 none double precision assign intent optional pointer target in out common equivalence data begin_provider &begin_provider end_provider begin_shell end_shell begin_template end_template subst assert touch soft_touch provide no_dep free irp_if irp_else irp_endif irp_write irp_read",built_in:"alog alog10 amax0 amax1 amin0 amin1 amod cabs ccos cexp clog csin csqrt dabs dacos dasin datan datan2 dcos dcosh ddim dexp dint dlog dlog10 dmax1 dmin1 dmod dnint dsign dsin dsinh dsqrt dtan dtanh float iabs idim idint idnint ifix isign max0 max1 min0 min1 sngl algama cdabs cdcos cdexp cdlog cdsin cdsqrt cqabs cqcos cqexp cqlog cqsin cqsqrt dcmplx dconjg derf derfc dfloat dgamma dimag dlgama iqint qabs qacos qasin qatan qatan2 qcmplx qconjg qcos qcosh qdim qerf qerfc qexp qgamma qimag qlgama qlog qlog10 qmax1 qmin1 qmod qnint qsign qsin qsinh qsqrt qtan qtanh abs acos aimag aint anint asin atan atan2 char cmplx conjg cos cosh exp ichar index int log log10 max min nint sign sin sinh sqrt tan tanh print write dim lge lgt lle llt mod nullify allocate deallocate adjustl adjustr all allocated any associated bit_size btest ceiling count cshift date_and_time digits dot_product eoshift epsilon exponent floor fraction huge iand ibclr ibits ibset ieor ior ishft ishftc lbound len_trim matmul maxexponent maxloc maxval merge minexponent minloc minval modulo mvbits nearest pack present product radix random_number random_seed range repeat reshape rrspacing scale scan selected_int_kind selected_real_kind set_exponent shape size spacing spread sum system_clock tiny transpose trim ubound unpack verify achar iachar transfer dble entry dprod cpu_time command_argument_count get_command get_command_argument get_environment_variable is_iostat_end ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode is_iostat_eor move_alloc new_line selected_char_kind same_type_as extends_type_ofacosh asinh atanh bessel_j0 bessel_j1 bessel_jn bessel_y0 bessel_y1 bessel_yn erf erfc erfc_scaled gamma log_gamma hypot norm2 atomic_define atomic_ref execute_command_line leadz trailz storage_size merge_bits bge bgt ble blt dshiftl dshiftr findloc iall iany iparity image_index lcobound ucobound maskl maskr num_images parity popcnt poppar shifta shiftl shiftr this_image IRP_ALIGN irp_here"};return{cI:!0,k:n,i:/\/\*/,c:[e.inherit(e.ASM,{cN:"string",r:0}),e.inherit(e.QSM,{cN:"string",r:0}),{cN:"function",bK:"subroutine function program",i:"[${=\\n]",c:[e.UTM,t]},e.C("!","$",{r:0}),e.C("begin_doc","end_doc",{r:10}),{cN:"number",b:"(?=\\b|\\+|\\-|\\.)(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*)(?:[de][+-]?\\d+)?\\b\\.?",r:0}]}});
\ No newline at end of file
+hljs.registerLanguage("irpf90",function(){"use strict";return function(e){return{name:"IRPF90",case_insensitive:!0,keywords:{literal:".False. .True.",keyword:"kind do while private call intrinsic where elsewhere type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then public subroutine|10 function program .and. .or. .not. .le. .eq. .ge. .gt. .lt. goto save else use module select case access blank direct exist file fmt form formatted iostat name named nextrec number opened rec recl sequential status unformatted unit continue format pause cycle exit c_null_char c_alert c_backspace c_form_feed flush wait decimal round iomsg synchronous nopass non_overridable pass protected volatile abstract extends import non_intrinsic value deferred generic final enumerator class associate bind enum c_int c_short c_long c_long_long c_signed_char c_size_t c_int8_t c_int16_t c_int32_t c_int64_t c_int_least8_t c_int_least16_t c_int_least32_t c_int_least64_t c_int_fast8_t c_int_fast16_t c_int_fast32_t c_int_fast64_t c_intmax_t C_intptr_t c_float c_double c_long_double c_float_complex c_double_complex c_long_double_complex c_bool c_char c_null_ptr c_null_funptr c_new_line c_carriage_return c_horizontal_tab c_vertical_tab iso_c_binding c_loc c_funloc c_associated  c_f_pointer c_ptr c_funptr iso_fortran_env character_storage_size error_unit file_storage_size input_unit iostat_end iostat_eor numeric_storage_size output_unit c_f_procpointer ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode newunit contiguous recursive pad position action delim readwrite eor advance nml interface procedure namelist include sequence elemental pure integer real character complex logical dimension allocatable|10 parameter external implicit|10 none double precision assign intent optional pointer target in out common equivalence data begin_provider &begin_provider end_provider begin_shell end_shell begin_template end_template subst assert touch soft_touch provide no_dep free irp_if irp_else irp_endif irp_write irp_read",built_in:"alog alog10 amax0 amax1 amin0 amin1 amod cabs ccos cexp clog csin csqrt dabs dacos dasin datan datan2 dcos dcosh ddim dexp dint dlog dlog10 dmax1 dmin1 dmod dnint dsign dsin dsinh dsqrt dtan dtanh float iabs idim idint idnint ifix isign max0 max1 min0 min1 sngl algama cdabs cdcos cdexp cdlog cdsin cdsqrt cqabs cqcos cqexp cqlog cqsin cqsqrt dcmplx dconjg derf derfc dfloat dgamma dimag dlgama iqint qabs qacos qasin qatan qatan2 qcmplx qconjg qcos qcosh qdim qerf qerfc qexp qgamma qimag qlgama qlog qlog10 qmax1 qmin1 qmod qnint qsign qsin qsinh qsqrt qtan qtanh abs acos aimag aint anint asin atan atan2 char cmplx conjg cos cosh exp ichar index int log log10 max min nint sign sin sinh sqrt tan tanh print write dim lge lgt lle llt mod nullify allocate deallocate adjustl adjustr all allocated any associated bit_size btest ceiling count cshift date_and_time digits dot_product eoshift epsilon exponent floor fraction huge iand ibclr ibits ibset ieor ior ishft ishftc lbound len_trim matmul maxexponent maxloc maxval merge minexponent minloc minval modulo mvbits nearest pack present product radix random_number random_seed range repeat reshape rrspacing scale scan selected_int_kind selected_real_kind set_exponent shape size spacing spread sum system_clock tiny transpose trim ubound unpack verify achar iachar transfer dble entry dprod cpu_time command_argument_count get_command get_command_argument get_environment_variable is_iostat_end ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode is_iostat_eor move_alloc new_line selected_char_kind same_type_as extends_type_of acosh asinh atanh bessel_j0 bessel_j1 bessel_jn bessel_y0 bessel_y1 bessel_yn erf erfc erfc_scaled gamma log_gamma hypot norm2 atomic_define atomic_ref execute_command_line leadz trailz storage_size merge_bits bge bgt ble blt dshiftl dshiftr findloc iall iany iparity image_index lcobound ucobound maskl maskr num_images parity popcnt poppar shifta shiftl shiftr this_image IRP_ALIGN irp_here"},illegal:/\/\*/,contains:[e.inherit(e.APOS_STRING_MODE,{className:"string",relevance:0}),e.inherit(e.QUOTE_STRING_MODE,{className:"string",relevance:0}),{className:"function",beginKeywords:"subroutine function program",illegal:"[${=\\n]",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",begin:"\\(",end:"\\)"}]},e.COMMENT("!","$",{relevance:0}),e.COMMENT("begin_doc","end_doc",{relevance:10}),{className:"number",begin:"(?=\\b|\\+|\\-|\\.)(?:\\.|\\d+\\.?)\\d*([de][+-]?\\d+)?(_[a-z_\\d]+)?",relevance:0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/isbl.min.js b/vendor/assets/javascripts/highlightjs/languages/isbl.min.js
index 4589bdfad0..e69de29bb2 100644
--- a/vendor/assets/javascripts/highlightjs/languages/isbl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/isbl.min.js
@@ -1,2 +0,0 @@
-hljs.registerLanguage("isbl",function(S){var E="[A-Za-zА-Яа-яёЁ_!][A-Za-zА-Яа-яёЁ_0-9]*",_="[A-Za-zА-Яа-яёЁ_][A-Za-zА-Яа-яёЁ_0-9]*",T="and и else иначе endexcept endfinally endforeach конецвсе endif конецесли endwhile конецпока except exitfor finally foreach все if если in в not не or или try while пока ",R="SYSRES_CONST_ACCES_RIGHT_TYPE_EDIT SYSRES_CONST_ACCES_RIGHT_TYPE_FULL SYSRES_CONST_ACCES_RIGHT_TYPE_VIEW SYSRES_CONST_ACCESS_MODE_REQUISITE_CODE SYSRES_CONST_ACCESS_NO_ACCESS_VIEW SYSRES_CONST_ACCESS_NO_ACCESS_VIEW_CODE SYSRES_CONST_ACCESS_RIGHTS_ADD_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_ADD_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_CHANGE_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_CHANGE_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_DELETE_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_DELETE_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_EXECUTE_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_EXECUTE_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_NO_ACCESS_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_NO_ACCESS_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_RATIFY_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_RATIFY_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_VIEW SYSRES_CONST_ACCESS_RIGHTS_VIEW_CODE SYSRES_CONST_ACCESS_RIGHTS_VIEW_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_VIEW_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_TYPE_CHANGE SYSRES_CONST_ACCESS_TYPE_CHANGE_CODE SYSRES_CONST_ACCESS_TYPE_EXISTS SYSRES_CONST_ACCESS_TYPE_EXISTS_CODE SYSRES_CONST_ACCESS_TYPE_FULL SYSRES_CONST_ACCESS_TYPE_FULL_CODE SYSRES_CONST_ACCESS_TYPE_VIEW SYSRES_CONST_ACCESS_TYPE_VIEW_CODE SYSRES_CONST_ACTION_TYPE_ABORT SYSRES_CONST_ACTION_TYPE_ACCEPT SYSRES_CONST_ACTION_TYPE_ACCESS_RIGHTS SYSRES_CONST_ACTION_TYPE_ADD_ATTACHMENT SYSRES_CONST_ACTION_TYPE_CHANGE_CARD SYSRES_CONST_ACTION_TYPE_CHANGE_KIND SYSRES_CONST_ACTION_TYPE_CHANGE_STORAGE SYSRES_CONST_ACTION_TYPE_CONTINUE SYSRES_CONST_ACTION_TYPE_COPY SYSRES_CONST_ACTION_TYPE_CREATE SYSRES_CONST_ACTION_TYPE_CREATE_VERSION SYSRES_CONST_ACTION_TYPE_DELETE SYSRES_CONST_ACTION_TYPE_DELETE_ATTACHMENT SYSRES_CONST_ACTION_TYPE_DELETE_VERSION SYSRES_CONST_ACTION_TYPE_DISABLE_DELEGATE_ACCESS_RIGHTS SYSRES_CONST_ACTION_TYPE_ENABLE_DELEGATE_ACCESS_RIGHTS SYSRES_CONST_ACTION_TYPE_ENCRYPTION_BY_CERTIFICATE SYSRES_CONST_ACTION_TYPE_ENCRYPTION_BY_CERTIFICATE_AND_PASSWORD SYSRES_CONST_ACTION_TYPE_ENCRYPTION_BY_PASSWORD SYSRES_CONST_ACTION_TYPE_EXPORT_WITH_LOCK SYSRES_CONST_ACTION_TYPE_EXPORT_WITHOUT_LOCK SYSRES_CONST_ACTION_TYPE_IMPORT_WITH_UNLOCK SYSRES_CONST_ACTION_TYPE_IMPORT_WITHOUT_UNLOCK SYSRES_CONST_ACTION_TYPE_LIFE_CYCLE_STAGE SYSRES_CONST_ACTION_TYPE_LOCK SYSRES_CONST_ACTION_TYPE_LOCK_FOR_SERVER SYSRES_CONST_ACTION_TYPE_LOCK_MODIFY SYSRES_CONST_ACTION_TYPE_MARK_AS_READED SYSRES_CONST_ACTION_TYPE_MARK_AS_UNREADED SYSRES_CONST_ACTION_TYPE_MODIFY SYSRES_CONST_ACTION_TYPE_MODIFY_CARD SYSRES_CONST_ACTION_TYPE_MOVE_TO_ARCHIVE SYSRES_CONST_ACTION_TYPE_OFF_ENCRYPTION SYSRES_CONST_ACTION_TYPE_PASSWORD_CHANGE SYSRES_CONST_ACTION_TYPE_PERFORM SYSRES_CONST_ACTION_TYPE_RECOVER_FROM_LOCAL_COPY SYSRES_CONST_ACTION_TYPE_RESTART SYSRES_CONST_ACTION_TYPE_RESTORE_FROM_ARCHIVE SYSRES_CONST_ACTION_TYPE_REVISION SYSRES_CONST_ACTION_TYPE_SEND_BY_MAIL SYSRES_CONST_ACTION_TYPE_SIGN SYSRES_CONST_ACTION_TYPE_START SYSRES_CONST_ACTION_TYPE_UNLOCK SYSRES_CONST_ACTION_TYPE_UNLOCK_FROM_SERVER SYSRES_CONST_ACTION_TYPE_VERSION_STATE SYSRES_CONST_ACTION_TYPE_VERSION_VISIBILITY SYSRES_CONST_ACTION_TYPE_VIEW SYSRES_CONST_ACTION_TYPE_VIEW_SHADOW_COPY SYSRES_CONST_ACTION_TYPE_WORKFLOW_DESCRIPTION_MODIFY SYSRES_CONST_ACTION_TYPE_WRITE_HISTORY SYSRES_CONST_ACTIVE_VERSION_STATE_PICK_VALUE SYSRES_CONST_ADD_REFERENCE_MODE_NAME SYSRES_CONST_ADDITION_REQUISITE_CODE SYSRES_CONST_ADDITIONAL_PARAMS_REQUISITE_CODE SYSRES_CONST_ADITIONAL_JOB_END_DATE_REQUISITE_NAME SYSRES_CONST_ADITIONAL_JOB_READ_REQUISITE_NAME SYSRES_CONST_ADITIONAL_JOB_START_DATE_REQUISITE_NAME SYSRES_CONST_ADITIONAL_JOB_STATE_REQUISITE_NAME SYSRES_CONST_ADMINISTRATION_HISTORY_ADDING_USER_TO_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_ADDING_USER_TO_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_COMP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_COMP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_USER_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_USER_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_DATABASE_USER_CREATION SYSRES_CONST_ADMINISTRATION_HISTORY_DATABASE_USER_CREATION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DATABASE_USER_DELETION SYSRES_CONST_ADMINISTRATION_HISTORY_DATABASE_USER_DELETION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_COMP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_COMP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_USER_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_USER_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_USER_FROM_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_USER_FROM_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_FILTERER_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_FILTERER_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_FILTERER_RESTRICTION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_FILTERER_RESTRICTION_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_PRIVILEGE_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_PRIVILEGE_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_RIGHTS_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_RIGHTS_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_IS_MAIN_SERVER_CHANGED_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_IS_MAIN_SERVER_CHANGED_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_IS_PUBLIC_CHANGED_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_IS_PUBLIC_CHANGED_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_FILTERER_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_FILTERER_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_FILTERER_RESTRICTION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_FILTERER_RESTRICTION_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_PRIVILEGE_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_PRIVILEGE_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_RIGHTS_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_RIGHTS_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_SERVER_LOGIN_CREATION SYSRES_CONST_ADMINISTRATION_HISTORY_SERVER_LOGIN_CREATION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_SERVER_LOGIN_DELETION SYSRES_CONST_ADMINISTRATION_HISTORY_SERVER_LOGIN_DELETION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_CATEGORY_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_CATEGORY_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_COMP_TITLE_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_COMP_TITLE_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_FULL_NAME_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_FULL_NAME_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_PARENT_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_PARENT_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_AUTH_TYPE_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_AUTH_TYPE_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_LOGIN_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_LOGIN_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_STATUS_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_STATUS_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_USER_PASSWORD_CHANGE SYSRES_CONST_ADMINISTRATION_HISTORY_USER_PASSWORD_CHANGE_ACTION SYSRES_CONST_ALL_ACCEPT_CONDITION_RUS SYSRES_CONST_ALL_USERS_GROUP SYSRES_CONST_ALL_USERS_GROUP_NAME SYSRES_CONST_ALL_USERS_SERVER_GROUP_NAME SYSRES_CONST_ALLOWED_ACCESS_TYPE_CODE SYSRES_CONST_ALLOWED_ACCESS_TYPE_NAME SYSRES_CONST_APP_VIEWER_TYPE_REQUISITE_CODE SYSRES_CONST_APPROVING_SIGNATURE_NAME SYSRES_CONST_APPROVING_SIGNATURE_REQUISITE_CODE SYSRES_CONST_ASSISTANT_SUBSTITUE_TYPE SYSRES_CONST_ASSISTANT_SUBSTITUE_TYPE_CODE SYSRES_CONST_ATTACH_TYPE_COMPONENT_TOKEN SYSRES_CONST_ATTACH_TYPE_DOC SYSRES_CONST_ATTACH_TYPE_EDOC SYSRES_CONST_ATTACH_TYPE_FOLDER SYSRES_CONST_ATTACH_TYPE_JOB SYSRES_CONST_ATTACH_TYPE_REFERENCE SYSRES_CONST_ATTACH_TYPE_TASK SYSRES_CONST_AUTH_ENCODED_PASSWORD SYSRES_CONST_AUTH_ENCODED_PASSWORD_CODE SYSRES_CONST_AUTH_NOVELL SYSRES_CONST_AUTH_PASSWORD SYSRES_CONST_AUTH_PASSWORD_CODE SYSRES_CONST_AUTH_WINDOWS SYSRES_CONST_AUTHENTICATING_SIGNATURE_NAME SYSRES_CONST_AUTHENTICATING_SIGNATURE_REQUISITE_CODE SYSRES_CONST_AUTO_ENUM_METHOD_FLAG SYSRES_CONST_AUTO_NUMERATION_CODE SYSRES_CONST_AUTO_STRONG_ENUM_METHOD_FLAG SYSRES_CONST_AUTOTEXT_NAME_REQUISITE_CODE SYSRES_CONST_AUTOTEXT_TEXT_REQUISITE_CODE SYSRES_CONST_AUTOTEXT_USAGE_ALL SYSRES_CONST_AUTOTEXT_USAGE_ALL_CODE SYSRES_CONST_AUTOTEXT_USAGE_SIGN SYSRES_CONST_AUTOTEXT_USAGE_SIGN_CODE SYSRES_CONST_AUTOTEXT_USAGE_WORK SYSRES_CONST_AUTOTEXT_USAGE_WORK_CODE SYSRES_CONST_AUTOTEXT_USE_ANYWHERE_CODE SYSRES_CONST_AUTOTEXT_USE_ON_SIGNING_CODE SYSRES_CONST_AUTOTEXT_USE_ON_WORK_CODE SYSRES_CONST_BEGIN_DATE_REQUISITE_CODE SYSRES_CONST_BLACK_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_BLUE_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_BTN_PART SYSRES_CONST_CALCULATED_ROLE_TYPE_CODE SYSRES_CONST_CALL_TYPE_VARIABLE_BUTTON_VALUE SYSRES_CONST_CALL_TYPE_VARIABLE_PROGRAM_VALUE SYSRES_CONST_CANCEL_MESSAGE_FUNCTION_RESULT SYSRES_CONST_CARD_PART SYSRES_CONST_CARD_REFERENCE_MODE_NAME SYSRES_CONST_CERTIFICATE_TYPE_REQUISITE_ENCRYPT_VALUE SYSRES_CONST_CERTIFICATE_TYPE_REQUISITE_SIGN_AND_ENCRYPT_VALUE SYSRES_CONST_CERTIFICATE_TYPE_REQUISITE_SIGN_VALUE SYSRES_CONST_CHECK_PARAM_VALUE_DATE_PARAM_TYPE SYSRES_CONST_CHECK_PARAM_VALUE_FLOAT_PARAM_TYPE SYSRES_CONST_CHECK_PARAM_VALUE_INTEGER_PARAM_TYPE SYSRES_CONST_CHECK_PARAM_VALUE_PICK_PARAM_TYPE SYSRES_CONST_CHECK_PARAM_VALUE_REEFRENCE_PARAM_TYPE SYSRES_CONST_CLOSED_RECORD_FLAG_VALUE_FEMININE SYSRES_CONST_CLOSED_RECORD_FLAG_VALUE_MASCULINE SYSRES_CONST_CODE_COMPONENT_TYPE_ADMIN SYSRES_CONST_CODE_COMPONENT_TYPE_DEVELOPER SYSRES_CONST_CODE_COMPONENT_TYPE_DOCS SYSRES_CONST_CODE_COMPONENT_TYPE_EDOC_CARDS SYSRES_CONST_CODE_COMPONENT_TYPE_EXTERNAL_EXECUTABLE SYSRES_CONST_CODE_COMPONENT_TYPE_OTHER SYSRES_CONST_CODE_COMPONENT_TYPE_REFERENCE SYSRES_CONST_CODE_COMPONENT_TYPE_REPORT SYSRES_CONST_CODE_COMPONENT_TYPE_SCRIPT SYSRES_CONST_CODE_COMPONENT_TYPE_URL SYSRES_CONST_CODE_REQUISITE_ACCESS SYSRES_CONST_CODE_REQUISITE_CODE SYSRES_CONST_CODE_REQUISITE_COMPONENT SYSRES_CONST_CODE_REQUISITE_DESCRIPTION SYSRES_CONST_CODE_REQUISITE_EXCLUDE_COMPONENT SYSRES_CONST_CODE_REQUISITE_RECORD SYSRES_CONST_COMMENT_REQ_CODE SYSRES_CONST_COMMON_SETTINGS_REQUISITE_CODE SYSRES_CONST_COMP_CODE_GRD SYSRES_CONST_COMPONENT_GROUP_TYPE_REQUISITE_CODE SYSRES_CONST_COMPONENT_TYPE_ADMIN_COMPONENTS SYSRES_CONST_COMPONENT_TYPE_DEVELOPER_COMPONENTS SYSRES_CONST_COMPONENT_TYPE_DOCS SYSRES_CONST_COMPONENT_TYPE_EDOC_CARDS SYSRES_CONST_COMPONENT_TYPE_EDOCS SYSRES_CONST_COMPONENT_TYPE_EXTERNAL_EXECUTABLE SYSRES_CONST_COMPONENT_TYPE_OTHER SYSRES_CONST_COMPONENT_TYPE_REFERENCE_TYPES SYSRES_CONST_COMPONENT_TYPE_REFERENCES SYSRES_CONST_COMPONENT_TYPE_REPORTS SYSRES_CONST_COMPONENT_TYPE_SCRIPTS SYSRES_CONST_COMPONENT_TYPE_URL SYSRES_CONST_COMPONENTS_REMOTE_SERVERS_VIEW_CODE SYSRES_CONST_CONDITION_BLOCK_DESCRIPTION SYSRES_CONST_CONST_FIRM_STATUS_COMMON SYSRES_CONST_CONST_FIRM_STATUS_INDIVIDUAL SYSRES_CONST_CONST_NEGATIVE_VALUE SYSRES_CONST_CONST_POSITIVE_VALUE SYSRES_CONST_CONST_SERVER_STATUS_DONT_REPLICATE SYSRES_CONST_CONST_SERVER_STATUS_REPLICATE SYSRES_CONST_CONTENTS_REQUISITE_CODE SYSRES_CONST_DATA_TYPE_BOOLEAN SYSRES_CONST_DATA_TYPE_DATE SYSRES_CONST_DATA_TYPE_FLOAT SYSRES_CONST_DATA_TYPE_INTEGER SYSRES_CONST_DATA_TYPE_PICK SYSRES_CONST_DATA_TYPE_REFERENCE SYSRES_CONST_DATA_TYPE_STRING SYSRES_CONST_DATA_TYPE_TEXT SYSRES_CONST_DATA_TYPE_VARIANT SYSRES_CONST_DATE_CLOSE_REQ_CODE SYSRES_CONST_DATE_FORMAT_DATE_ONLY_CHAR SYSRES_CONST_DATE_OPEN_REQ_CODE SYSRES_CONST_DATE_REQUISITE SYSRES_CONST_DATE_REQUISITE_CODE SYSRES_CONST_DATE_REQUISITE_NAME SYSRES_CONST_DATE_REQUISITE_TYPE SYSRES_CONST_DATE_TYPE_CHAR SYSRES_CONST_DATETIME_FORMAT_VALUE SYSRES_CONST_DEA_ACCESS_RIGHTS_ACTION_CODE SYSRES_CONST_DESCRIPTION_LOCALIZE_ID_REQUISITE_CODE SYSRES_CONST_DESCRIPTION_REQUISITE_CODE SYSRES_CONST_DET1_PART SYSRES_CONST_DET2_PART SYSRES_CONST_DET3_PART SYSRES_CONST_DET4_PART SYSRES_CONST_DET5_PART SYSRES_CONST_DET6_PART SYSRES_CONST_DETAIL_DATASET_KEY_REQUISITE_CODE SYSRES_CONST_DETAIL_PICK_REQUISITE_CODE SYSRES_CONST_DETAIL_REQ_CODE SYSRES_CONST_DO_NOT_USE_ACCESS_TYPE_CODE SYSRES_CONST_DO_NOT_USE_ACCESS_TYPE_NAME SYSRES_CONST_DO_NOT_USE_ON_VIEW_ACCESS_TYPE_CODE SYSRES_CONST_DO_NOT_USE_ON_VIEW_ACCESS_TYPE_NAME SYSRES_CONST_DOCUMENT_STORAGES_CODE SYSRES_CONST_DOCUMENT_TEMPLATES_TYPE_NAME SYSRES_CONST_DOUBLE_REQUISITE_CODE SYSRES_CONST_EDITOR_CLOSE_FILE_OBSERV_TYPE_CODE SYSRES_CONST_EDITOR_CLOSE_PROCESS_OBSERV_TYPE_CODE SYSRES_CONST_EDITOR_TYPE_REQUISITE_CODE SYSRES_CONST_EDITORS_APPLICATION_NAME_REQUISITE_CODE SYSRES_CONST_EDITORS_CREATE_SEVERAL_PROCESSES_REQUISITE_CODE SYSRES_CONST_EDITORS_EXTENSION_REQUISITE_CODE SYSRES_CONST_EDITORS_OBSERVER_BY_PROCESS_TYPE SYSRES_CONST_EDITORS_REFERENCE_CODE SYSRES_CONST_EDITORS_REPLACE_SPEC_CHARS_REQUISITE_CODE SYSRES_CONST_EDITORS_USE_PLUGINS_REQUISITE_CODE SYSRES_CONST_EDITORS_VIEW_DOCUMENT_OPENED_TO_EDIT_CODE SYSRES_CONST_EDOC_CARD_TYPE_REQUISITE_CODE SYSRES_CONST_EDOC_CARD_TYPES_LINK_REQUISITE_CODE SYSRES_CONST_EDOC_CERTIFICATE_AND_PASSWORD_ENCODE_CODE SYSRES_CONST_EDOC_CERTIFICATE_ENCODE_CODE SYSRES_CONST_EDOC_DATE_REQUISITE_CODE SYSRES_CONST_EDOC_KIND_REFERENCE_CODE SYSRES_CONST_EDOC_KINDS_BY_TEMPLATE_ACTION_CODE SYSRES_CONST_EDOC_MANAGE_ACCESS_CODE SYSRES_CONST_EDOC_NONE_ENCODE_CODE SYSRES_CONST_EDOC_NUMBER_REQUISITE_CODE SYSRES_CONST_EDOC_PASSWORD_ENCODE_CODE SYSRES_CONST_EDOC_READONLY_ACCESS_CODE SYSRES_CONST_EDOC_SHELL_LIFE_TYPE_VIEW_VALUE SYSRES_CONST_EDOC_SIZE_RESTRICTION_PRIORITY_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_CHECK_ACCESS_RIGHTS_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_COMPUTER_NAME_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_DATABASE_NAME_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_EDIT_IN_STORAGE_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_LOCAL_PATH_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_SHARED_SOURCE_NAME_REQUISITE_CODE SYSRES_CONST_EDOC_TEMPLATE_REQUISITE_CODE SYSRES_CONST_EDOC_TYPES_REFERENCE_CODE SYSRES_CONST_EDOC_VERSION_ACTIVE_STAGE_CODE SYSRES_CONST_EDOC_VERSION_DESIGN_STAGE_CODE SYSRES_CONST_EDOC_VERSION_OBSOLETE_STAGE_CODE SYSRES_CONST_EDOC_WRITE_ACCES_CODE SYSRES_CONST_EDOCUMENT_CARD_REQUISITES_REFERENCE_CODE_SELECTED_REQUISITE SYSRES_CONST_ENCODE_CERTIFICATE_TYPE_CODE SYSRES_CONST_END_DATE_REQUISITE_CODE SYSRES_CONST_ENUMERATION_TYPE_REQUISITE_CODE SYSRES_CONST_EXECUTE_ACCESS_RIGHTS_TYPE_CODE SYSRES_CONST_EXECUTIVE_FILE_STORAGE_TYPE SYSRES_CONST_EXIST_CONST SYSRES_CONST_EXIST_VALUE SYSRES_CONST_EXPORT_LOCK_TYPE_ASK SYSRES_CONST_EXPORT_LOCK_TYPE_WITH_LOCK SYSRES_CONST_EXPORT_LOCK_TYPE_WITHOUT_LOCK SYSRES_CONST_EXPORT_VERSION_TYPE_ASK SYSRES_CONST_EXPORT_VERSION_TYPE_LAST SYSRES_CONST_EXPORT_VERSION_TYPE_LAST_ACTIVE SYSRES_CONST_EXTENSION_REQUISITE_CODE SYSRES_CONST_FILTER_NAME_REQUISITE_CODE SYSRES_CONST_FILTER_REQUISITE_CODE SYSRES_CONST_FILTER_TYPE_COMMON_CODE SYSRES_CONST_FILTER_TYPE_COMMON_NAME SYSRES_CONST_FILTER_TYPE_USER_CODE SYSRES_CONST_FILTER_TYPE_USER_NAME SYSRES_CONST_FILTER_VALUE_REQUISITE_NAME SYSRES_CONST_FLOAT_NUMBER_FORMAT_CHAR SYSRES_CONST_FLOAT_REQUISITE_TYPE SYSRES_CONST_FOLDER_AUTHOR_VALUE SYSRES_CONST_FOLDER_KIND_ANY_OBJECTS SYSRES_CONST_FOLDER_KIND_COMPONENTS SYSRES_CONST_FOLDER_KIND_EDOCS SYSRES_CONST_FOLDER_KIND_JOBS SYSRES_CONST_FOLDER_KIND_TASKS SYSRES_CONST_FOLDER_TYPE_COMMON SYSRES_CONST_FOLDER_TYPE_COMPONENT SYSRES_CONST_FOLDER_TYPE_FAVORITES SYSRES_CONST_FOLDER_TYPE_INBOX SYSRES_CONST_FOLDER_TYPE_OUTBOX SYSRES_CONST_FOLDER_TYPE_QUICK_LAUNCH SYSRES_CONST_FOLDER_TYPE_SEARCH SYSRES_CONST_FOLDER_TYPE_SHORTCUTS SYSRES_CONST_FOLDER_TYPE_USER SYSRES_CONST_FROM_DICTIONARY_ENUM_METHOD_FLAG SYSRES_CONST_FULL_SUBSTITUTE_TYPE SYSRES_CONST_FULL_SUBSTITUTE_TYPE_CODE SYSRES_CONST_FUNCTION_CANCEL_RESULT SYSRES_CONST_FUNCTION_CATEGORY_SYSTEM SYSRES_CONST_FUNCTION_CATEGORY_USER SYSRES_CONST_FUNCTION_FAILURE_RESULT SYSRES_CONST_FUNCTION_SAVE_RESULT SYSRES_CONST_GENERATED_REQUISITE SYSRES_CONST_GREEN_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_GROUP_ACCOUNT_TYPE_VALUE_CODE SYSRES_CONST_GROUP_CATEGORY_NORMAL_CODE SYSRES_CONST_GROUP_CATEGORY_NORMAL_NAME SYSRES_CONST_GROUP_CATEGORY_SERVICE_CODE SYSRES_CONST_GROUP_CATEGORY_SERVICE_NAME SYSRES_CONST_GROUP_COMMON_CATEGORY_FIELD_VALUE SYSRES_CONST_GROUP_FULL_NAME_REQUISITE_CODE SYSRES_CONST_GROUP_NAME_REQUISITE_CODE SYSRES_CONST_GROUP_RIGHTS_T_REQUISITE_CODE SYSRES_CONST_GROUP_SERVER_CODES_REQUISITE_CODE SYSRES_CONST_GROUP_SERVER_NAME_REQUISITE_CODE SYSRES_CONST_GROUP_SERVICE_CATEGORY_FIELD_VALUE SYSRES_CONST_GROUP_USER_REQUISITE_CODE SYSRES_CONST_GROUPS_REFERENCE_CODE SYSRES_CONST_GROUPS_REQUISITE_CODE SYSRES_CONST_HIDDEN_MODE_NAME SYSRES_CONST_HIGH_LVL_REQUISITE_CODE SYSRES_CONST_HISTORY_ACTION_CREATE_CODE SYSRES_CONST_HISTORY_ACTION_DELETE_CODE SYSRES_CONST_HISTORY_ACTION_EDIT_CODE SYSRES_CONST_HOUR_CHAR SYSRES_CONST_ID_REQUISITE_CODE SYSRES_CONST_IDSPS_REQUISITE_CODE SYSRES_CONST_IMAGE_MODE_COLOR SYSRES_CONST_IMAGE_MODE_GREYSCALE SYSRES_CONST_IMAGE_MODE_MONOCHROME SYSRES_CONST_IMPORTANCE_HIGH SYSRES_CONST_IMPORTANCE_LOW SYSRES_CONST_IMPORTANCE_NORMAL SYSRES_CONST_IN_DESIGN_VERSION_STATE_PICK_VALUE SYSRES_CONST_INCOMING_WORK_RULE_TYPE_CODE SYSRES_CONST_INT_REQUISITE SYSRES_CONST_INT_REQUISITE_TYPE SYSRES_CONST_INTEGER_NUMBER_FORMAT_CHAR SYSRES_CONST_INTEGER_TYPE_CHAR SYSRES_CONST_IS_GENERATED_REQUISITE_NEGATIVE_VALUE SYSRES_CONST_IS_PUBLIC_ROLE_REQUISITE_CODE SYSRES_CONST_IS_REMOTE_USER_NEGATIVE_VALUE SYSRES_CONST_IS_REMOTE_USER_POSITIVE_VALUE SYSRES_CONST_IS_STORED_REQUISITE_NEGATIVE_VALUE SYSRES_CONST_IS_STORED_REQUISITE_STORED_VALUE SYSRES_CONST_ITALIC_LIFE_CYCLE_STAGE_DRAW_STYLE SYSRES_CONST_JOB_BLOCK_DESCRIPTION SYSRES_CONST_JOB_KIND_CONTROL_JOB SYSRES_CONST_JOB_KIND_JOB SYSRES_CONST_JOB_KIND_NOTICE SYSRES_CONST_JOB_STATE_ABORTED SYSRES_CONST_JOB_STATE_COMPLETE SYSRES_CONST_JOB_STATE_WORKING SYSRES_CONST_KIND_REQUISITE_CODE SYSRES_CONST_KIND_REQUISITE_NAME SYSRES_CONST_KINDS_CREATE_SHADOW_COPIES_REQUISITE_CODE SYSRES_CONST_KINDS_DEFAULT_EDOC_LIFE_STAGE_REQUISITE_CODE SYSRES_CONST_KINDS_EDOC_ALL_TEPLATES_ALLOWED_REQUISITE_CODE SYSRES_CONST_KINDS_EDOC_ALLOW_LIFE_CYCLE_STAGE_CHANGING_REQUISITE_CODE SYSRES_CONST_KINDS_EDOC_ALLOW_MULTIPLE_ACTIVE_VERSIONS_REQUISITE_CODE SYSRES_CONST_KINDS_EDOC_SHARE_ACCES_RIGHTS_BY_DEFAULT_CODE SYSRES_CONST_KINDS_EDOC_TEMPLATE_REQUISITE_CODE SYSRES_CONST_KINDS_EDOC_TYPE_REQUISITE_CODE SYSRES_CONST_KINDS_SIGNERS_REQUISITES_CODE SYSRES_CONST_KOD_INPUT_TYPE SYSRES_CONST_LAST_UPDATE_DATE_REQUISITE_CODE SYSRES_CONST_LIFE_CYCLE_START_STAGE_REQUISITE_CODE SYSRES_CONST_LILAC_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_LINK_OBJECT_KIND_COMPONENT SYSRES_CONST_LINK_OBJECT_KIND_DOCUMENT SYSRES_CONST_LINK_OBJECT_KIND_EDOC SYSRES_CONST_LINK_OBJECT_KIND_FOLDER SYSRES_CONST_LINK_OBJECT_KIND_JOB SYSRES_CONST_LINK_OBJECT_KIND_REFERENCE SYSRES_CONST_LINK_OBJECT_KIND_TASK SYSRES_CONST_LINK_REF_TYPE_REQUISITE_CODE SYSRES_CONST_LIST_REFERENCE_MODE_NAME SYSRES_CONST_LOCALIZATION_DICTIONARY_MAIN_VIEW_CODE SYSRES_CONST_MAIN_VIEW_CODE SYSRES_CONST_MANUAL_ENUM_METHOD_FLAG SYSRES_CONST_MASTER_COMP_TYPE_REQUISITE_CODE SYSRES_CONST_MASTER_TABLE_REC_ID_REQUISITE_CODE SYSRES_CONST_MAXIMIZED_MODE_NAME SYSRES_CONST_ME_VALUE SYSRES_CONST_MESSAGE_ATTENTION_CAPTION SYSRES_CONST_MESSAGE_CONFIRMATION_CAPTION SYSRES_CONST_MESSAGE_ERROR_CAPTION SYSRES_CONST_MESSAGE_INFORMATION_CAPTION SYSRES_CONST_MINIMIZED_MODE_NAME SYSRES_CONST_MINUTE_CHAR SYSRES_CONST_MODULE_REQUISITE_CODE SYSRES_CONST_MONITORING_BLOCK_DESCRIPTION SYSRES_CONST_MONTH_FORMAT_VALUE SYSRES_CONST_NAME_LOCALIZE_ID_REQUISITE_CODE SYSRES_CONST_NAME_REQUISITE_CODE SYSRES_CONST_NAME_SINGULAR_REQUISITE_CODE SYSRES_CONST_NAMEAN_INPUT_TYPE SYSRES_CONST_NEGATIVE_PICK_VALUE SYSRES_CONST_NEGATIVE_VALUE SYSRES_CONST_NO SYSRES_CONST_NO_PICK_VALUE SYSRES_CONST_NO_SIGNATURE_REQUISITE_CODE SYSRES_CONST_NO_VALUE SYSRES_CONST_NONE_ACCESS_RIGHTS_TYPE_CODE SYSRES_CONST_NONOPERATING_RECORD_FLAG_VALUE SYSRES_CONST_NONOPERATING_RECORD_FLAG_VALUE_MASCULINE SYSRES_CONST_NORMAL_ACCESS_RIGHTS_TYPE_CODE SYSRES_CONST_NORMAL_LIFE_CYCLE_STAGE_DRAW_STYLE SYSRES_CONST_NORMAL_MODE_NAME SYSRES_CONST_NOT_ALLOWED_ACCESS_TYPE_CODE SYSRES_CONST_NOT_ALLOWED_ACCESS_TYPE_NAME SYSRES_CONST_NOTE_REQUISITE_CODE SYSRES_CONST_NOTICE_BLOCK_DESCRIPTION SYSRES_CONST_NUM_REQUISITE SYSRES_CONST_NUM_STR_REQUISITE_CODE SYSRES_CONST_NUMERATION_AUTO_NOT_STRONG SYSRES_CONST_NUMERATION_AUTO_STRONG SYSRES_CONST_NUMERATION_FROM_DICTONARY SYSRES_CONST_NUMERATION_MANUAL SYSRES_CONST_NUMERIC_TYPE_CHAR SYSRES_CONST_NUMREQ_REQUISITE_CODE SYSRES_CONST_OBSOLETE_VERSION_STATE_PICK_VALUE SYSRES_CONST_OPERATING_RECORD_FLAG_VALUE SYSRES_CONST_OPERATING_RECORD_FLAG_VALUE_CODE SYSRES_CONST_OPERATING_RECORD_FLAG_VALUE_FEMININE SYSRES_CONST_OPERATING_RECORD_FLAG_VALUE_MASCULINE SYSRES_CONST_OPTIONAL_FORM_COMP_REQCODE_PREFIX SYSRES_CONST_ORANGE_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_ORIGINALREF_REQUISITE_CODE SYSRES_CONST_OURFIRM_REF_CODE SYSRES_CONST_OURFIRM_REQUISITE_CODE SYSRES_CONST_OURFIRM_VAR SYSRES_CONST_OUTGOING_WORK_RULE_TYPE_CODE SYSRES_CONST_PICK_NEGATIVE_RESULT SYSRES_CONST_PICK_POSITIVE_RESULT SYSRES_CONST_PICK_REQUISITE SYSRES_CONST_PICK_REQUISITE_TYPE SYSRES_CONST_PICK_TYPE_CHAR SYSRES_CONST_PLAN_STATUS_REQUISITE_CODE SYSRES_CONST_PLATFORM_VERSION_COMMENT SYSRES_CONST_PLUGINS_SETTINGS_DESCRIPTION_REQUISITE_CODE SYSRES_CONST_POSITIVE_PICK_VALUE SYSRES_CONST_POWER_TO_CREATE_ACTION_CODE SYSRES_CONST_POWER_TO_SIGN_ACTION_CODE SYSRES_CONST_PRIORITY_REQUISITE_CODE SYSRES_CONST_QUALIFIED_TASK_TYPE SYSRES_CONST_QUALIFIED_TASK_TYPE_CODE SYSRES_CONST_RECSTAT_REQUISITE_CODE SYSRES_CONST_RED_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_REF_ID_T_REF_TYPE_REQUISITE_CODE SYSRES_CONST_REF_REQUISITE SYSRES_CONST_REF_REQUISITE_TYPE SYSRES_CONST_REF_REQUISITES_REFERENCE_CODE_SELECTED_REQUISITE SYSRES_CONST_REFERENCE_RECORD_HISTORY_CREATE_ACTION_CODE SYSRES_CONST_REFERENCE_RECORD_HISTORY_DELETE_ACTION_CODE SYSRES_CONST_REFERENCE_RECORD_HISTORY_MODIFY_ACTION_CODE SYSRES_CONST_REFERENCE_TYPE_CHAR SYSRES_CONST_REFERENCE_TYPE_REQUISITE_NAME SYSRES_CONST_REFERENCES_ADD_PARAMS_REQUISITE_CODE SYSRES_CONST_REFERENCES_DISPLAY_REQUISITE_REQUISITE_CODE SYSRES_CONST_REMOTE_SERVER_STATUS_WORKING SYSRES_CONST_REMOTE_SERVER_TYPE_MAIN SYSRES_CONST_REMOTE_SERVER_TYPE_SECONDARY SYSRES_CONST_REMOTE_USER_FLAG_VALUE_CODE SYSRES_CONST_REPORT_APP_EDITOR_INTERNAL SYSRES_CONST_REPORT_BASE_REPORT_ID_REQUISITE_CODE SYSRES_CONST_REPORT_BASE_REPORT_REQUISITE_CODE SYSRES_CONST_REPORT_SCRIPT_REQUISITE_CODE SYSRES_CONST_REPORT_TEMPLATE_REQUISITE_CODE SYSRES_CONST_REPORT_VIEWER_CODE_REQUISITE_CODE SYSRES_CONST_REQ_ALLOW_COMPONENT_DEFAULT_VALUE SYSRES_CONST_REQ_ALLOW_RECORD_DEFAULT_VALUE SYSRES_CONST_REQ_ALLOW_SERVER_COMPONENT_DEFAULT_VALUE SYSRES_CONST_REQ_MODE_AVAILABLE_CODE SYSRES_CONST_REQ_MODE_EDIT_CODE SYSRES_CONST_REQ_MODE_HIDDEN_CODE SYSRES_CONST_REQ_MODE_NOT_AVAILABLE_CODE SYSRES_CONST_REQ_MODE_VIEW_CODE SYSRES_CONST_REQ_NUMBER_REQUISITE_CODE SYSRES_CONST_REQ_SECTION_VALUE SYSRES_CONST_REQ_TYPE_VALUE SYSRES_CONST_REQUISITE_FORMAT_BY_UNIT SYSRES_CONST_REQUISITE_FORMAT_DATE_FULL SYSRES_CONST_REQUISITE_FORMAT_DATE_TIME SYSRES_CONST_REQUISITE_FORMAT_LEFT SYSRES_CONST_REQUISITE_FORMAT_RIGHT SYSRES_CONST_REQUISITE_FORMAT_WITHOUT_UNIT SYSRES_CONST_REQUISITE_NUMBER_REQUISITE_CODE SYSRES_CONST_REQUISITE_SECTION_ACTIONS SYSRES_CONST_REQUISITE_SECTION_BUTTON SYSRES_CONST_REQUISITE_SECTION_BUTTONS SYSRES_CONST_REQUISITE_SECTION_CARD SYSRES_CONST_REQUISITE_SECTION_TABLE SYSRES_CONST_REQUISITE_SECTION_TABLE10 SYSRES_CONST_REQUISITE_SECTION_TABLE11 SYSRES_CONST_REQUISITE_SECTION_TABLE12 SYSRES_CONST_REQUISITE_SECTION_TABLE13 SYSRES_CONST_REQUISITE_SECTION_TABLE14 SYSRES_CONST_REQUISITE_SECTION_TABLE15 SYSRES_CONST_REQUISITE_SECTION_TABLE16 SYSRES_CONST_REQUISITE_SECTION_TABLE17 SYSRES_CONST_REQUISITE_SECTION_TABLE18 SYSRES_CONST_REQUISITE_SECTION_TABLE19 SYSRES_CONST_REQUISITE_SECTION_TABLE2 SYSRES_CONST_REQUISITE_SECTION_TABLE20 SYSRES_CONST_REQUISITE_SECTION_TABLE21 SYSRES_CONST_REQUISITE_SECTION_TABLE22 SYSRES_CONST_REQUISITE_SECTION_TABLE23 SYSRES_CONST_REQUISITE_SECTION_TABLE24 SYSRES_CONST_REQUISITE_SECTION_TABLE3 SYSRES_CONST_REQUISITE_SECTION_TABLE4 SYSRES_CONST_REQUISITE_SECTION_TABLE5 SYSRES_CONST_REQUISITE_SECTION_TABLE6 SYSRES_CONST_REQUISITE_SECTION_TABLE7 SYSRES_CONST_REQUISITE_SECTION_TABLE8 SYSRES_CONST_REQUISITE_SECTION_TABLE9 SYSRES_CONST_REQUISITES_PSEUDOREFERENCE_REQUISITE_NUMBER_REQUISITE_CODE SYSRES_CONST_RIGHT_ALIGNMENT_CODE SYSRES_CONST_ROLES_REFERENCE_CODE SYSRES_CONST_ROUTE_STEP_AFTER_RUS SYSRES_CONST_ROUTE_STEP_AND_CONDITION_RUS SYSRES_CONST_ROUTE_STEP_OR_CONDITION_RUS SYSRES_CONST_ROUTE_TYPE_COMPLEX SYSRES_CONST_ROUTE_TYPE_PARALLEL SYSRES_CONST_ROUTE_TYPE_SERIAL SYSRES_CONST_SBDATASETDESC_NEGATIVE_VALUE SYSRES_CONST_SBDATASETDESC_POSITIVE_VALUE SYSRES_CONST_SBVIEWSDESC_POSITIVE_VALUE SYSRES_CONST_SCRIPT_BLOCK_DESCRIPTION SYSRES_CONST_SEARCH_BY_TEXT_REQUISITE_CODE SYSRES_CONST_SEARCHES_COMPONENT_CONTENT SYSRES_CONST_SEARCHES_CRITERIA_ACTION_NAME SYSRES_CONST_SEARCHES_EDOC_CONTENT SYSRES_CONST_SEARCHES_FOLDER_CONTENT SYSRES_CONST_SEARCHES_JOB_CONTENT SYSRES_CONST_SEARCHES_REFERENCE_CODE SYSRES_CONST_SEARCHES_TASK_CONTENT SYSRES_CONST_SECOND_CHAR SYSRES_CONST_SECTION_REQUISITE_ACTIONS_VALUE SYSRES_CONST_SECTION_REQUISITE_CARD_VALUE SYSRES_CONST_SECTION_REQUISITE_CODE SYSRES_CONST_SECTION_REQUISITE_DETAIL_1_VALUE SYSRES_CONST_SECTION_REQUISITE_DETAIL_2_VALUE SYSRES_CONST_SECTION_REQUISITE_DETAIL_3_VALUE SYSRES_CONST_SECTION_REQUISITE_DETAIL_4_VALUE SYSRES_CONST_SECTION_REQUISITE_DETAIL_5_VALUE SYSRES_CONST_SECTION_REQUISITE_DETAIL_6_VALUE SYSRES_CONST_SELECT_REFERENCE_MODE_NAME SYSRES_CONST_SELECT_TYPE_SELECTABLE SYSRES_CONST_SELECT_TYPE_SELECTABLE_ONLY_CHILD SYSRES_CONST_SELECT_TYPE_SELECTABLE_WITH_CHILD SYSRES_CONST_SELECT_TYPE_UNSLECTABLE SYSRES_CONST_SERVER_TYPE_MAIN SYSRES_CONST_SERVICE_USER_CATEGORY_FIELD_VALUE SYSRES_CONST_SETTINGS_USER_REQUISITE_CODE SYSRES_CONST_SIGNATURE_AND_ENCODE_CERTIFICATE_TYPE_CODE SYSRES_CONST_SIGNATURE_CERTIFICATE_TYPE_CODE SYSRES_CONST_SINGULAR_TITLE_REQUISITE_CODE SYSRES_CONST_SQL_SERVER_AUTHENTIFICATION_FLAG_VALUE_CODE SYSRES_CONST_SQL_SERVER_ENCODE_AUTHENTIFICATION_FLAG_VALUE_CODE SYSRES_CONST_STANDART_ROUTE_REFERENCE_CODE SYSRES_CONST_STANDART_ROUTE_REFERENCE_COMMENT_REQUISITE_CODE SYSRES_CONST_STANDART_ROUTES_GROUPS_REFERENCE_CODE SYSRES_CONST_STATE_REQ_NAME SYSRES_CONST_STATE_REQUISITE_ACTIVE_VALUE SYSRES_CONST_STATE_REQUISITE_CLOSED_VALUE SYSRES_CONST_STATE_REQUISITE_CODE SYSRES_CONST_STATIC_ROLE_TYPE_CODE SYSRES_CONST_STATUS_PLAN_DEFAULT_VALUE SYSRES_CONST_STATUS_VALUE_AUTOCLEANING SYSRES_CONST_STATUS_VALUE_BLUE_SQUARE SYSRES_CONST_STATUS_VALUE_COMPLETE SYSRES_CONST_STATUS_VALUE_GREEN_SQUARE SYSRES_CONST_STATUS_VALUE_ORANGE_SQUARE SYSRES_CONST_STATUS_VALUE_PURPLE_SQUARE SYSRES_CONST_STATUS_VALUE_RED_SQUARE SYSRES_CONST_STATUS_VALUE_SUSPEND SYSRES_CONST_STATUS_VALUE_YELLOW_SQUARE SYSRES_CONST_STDROUTE_SHOW_TO_USERS_REQUISITE_CODE SYSRES_CONST_STORAGE_TYPE_FILE SYSRES_CONST_STORAGE_TYPE_SQL_SERVER SYSRES_CONST_STR_REQUISITE SYSRES_CONST_STRIKEOUT_LIFE_CYCLE_STAGE_DRAW_STYLE SYSRES_CONST_STRING_FORMAT_LEFT_ALIGN_CHAR SYSRES_CONST_STRING_FORMAT_RIGHT_ALIGN_CHAR SYSRES_CONST_STRING_REQUISITE_CODE SYSRES_CONST_STRING_REQUISITE_TYPE SYSRES_CONST_STRING_TYPE_CHAR SYSRES_CONST_SUBSTITUTES_PSEUDOREFERENCE_CODE SYSRES_CONST_SUBTASK_BLOCK_DESCRIPTION SYSRES_CONST_SYSTEM_SETTING_CURRENT_USER_PARAM_VALUE SYSRES_CONST_SYSTEM_SETTING_EMPTY_VALUE_PARAM_VALUE SYSRES_CONST_SYSTEM_VERSION_COMMENT SYSRES_CONST_TASK_ACCESS_TYPE_ALL SYSRES_CONST_TASK_ACCESS_TYPE_ALL_MEMBERS SYSRES_CONST_TASK_ACCESS_TYPE_MANUAL SYSRES_CONST_TASK_ENCODE_TYPE_CERTIFICATION SYSRES_CONST_TASK_ENCODE_TYPE_CERTIFICATION_AND_PASSWORD SYSRES_CONST_TASK_ENCODE_TYPE_NONE SYSRES_CONST_TASK_ENCODE_TYPE_PASSWORD SYSRES_CONST_TASK_ROUTE_ALL_CONDITION SYSRES_CONST_TASK_ROUTE_AND_CONDITION SYSRES_CONST_TASK_ROUTE_OR_CONDITION SYSRES_CONST_TASK_STATE_ABORTED SYSRES_CONST_TASK_STATE_COMPLETE SYSRES_CONST_TASK_STATE_CONTINUED SYSRES_CONST_TASK_STATE_CONTROL SYSRES_CONST_TASK_STATE_INIT SYSRES_CONST_TASK_STATE_WORKING SYSRES_CONST_TASK_TITLE SYSRES_CONST_TASK_TYPES_GROUPS_REFERENCE_CODE SYSRES_CONST_TASK_TYPES_REFERENCE_CODE SYSRES_CONST_TEMPLATES_REFERENCE_CODE SYSRES_CONST_TEST_DATE_REQUISITE_NAME SYSRES_CONST_TEST_DEV_DATABASE_NAME SYSRES_CONST_TEST_DEV_SYSTEM_CODE SYSRES_CONST_TEST_EDMS_DATABASE_NAME SYSRES_CONST_TEST_EDMS_MAIN_CODE SYSRES_CONST_TEST_EDMS_MAIN_DB_NAME SYSRES_CONST_TEST_EDMS_SECOND_CODE SYSRES_CONST_TEST_EDMS_SECOND_DB_NAME SYSRES_CONST_TEST_EDMS_SYSTEM_CODE SYSRES_CONST_TEST_NUMERIC_REQUISITE_NAME SYSRES_CONST_TEXT_REQUISITE SYSRES_CONST_TEXT_REQUISITE_CODE SYSRES_CONST_TEXT_REQUISITE_TYPE SYSRES_CONST_TEXT_TYPE_CHAR SYSRES_CONST_TYPE_CODE_REQUISITE_CODE SYSRES_CONST_TYPE_REQUISITE_CODE SYSRES_CONST_UNDEFINED_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_UNITS_SECTION_ID_REQUISITE_CODE SYSRES_CONST_UNITS_SECTION_REQUISITE_CODE SYSRES_CONST_UNOPERATING_RECORD_FLAG_VALUE_CODE SYSRES_CONST_UNSTORED_DATA_REQUISITE_CODE SYSRES_CONST_UNSTORED_DATA_REQUISITE_NAME SYSRES_CONST_USE_ACCESS_TYPE_CODE SYSRES_CONST_USE_ACCESS_TYPE_NAME SYSRES_CONST_USER_ACCOUNT_TYPE_VALUE_CODE SYSRES_CONST_USER_ADDITIONAL_INFORMATION_REQUISITE_CODE SYSRES_CONST_USER_AND_GROUP_ID_FROM_PSEUDOREFERENCE_REQUISITE_CODE SYSRES_CONST_USER_CATEGORY_NORMAL SYSRES_CONST_USER_CERTIFICATE_REQUISITE_CODE SYSRES_CONST_USER_CERTIFICATE_STATE_REQUISITE_CODE SYSRES_CONST_USER_CERTIFICATE_SUBJECT_NAME_REQUISITE_CODE SYSRES_CONST_USER_CERTIFICATE_THUMBPRINT_REQUISITE_CODE SYSRES_CONST_USER_COMMON_CATEGORY SYSRES_CONST_USER_COMMON_CATEGORY_CODE SYSRES_CONST_USER_FULL_NAME_REQUISITE_CODE SYSRES_CONST_USER_GROUP_TYPE_REQUISITE_CODE SYSRES_CONST_USER_LOGIN_REQUISITE_CODE SYSRES_CONST_USER_REMOTE_CONTROLLER_REQUISITE_CODE SYSRES_CONST_USER_REMOTE_SYSTEM_REQUISITE_CODE SYSRES_CONST_USER_RIGHTS_T_REQUISITE_CODE SYSRES_CONST_USER_SERVER_NAME_REQUISITE_CODE SYSRES_CONST_USER_SERVICE_CATEGORY SYSRES_CONST_USER_SERVICE_CATEGORY_CODE SYSRES_CONST_USER_STATUS_ADMINISTRATOR_CODE SYSRES_CONST_USER_STATUS_ADMINISTRATOR_NAME SYSRES_CONST_USER_STATUS_DEVELOPER_CODE SYSRES_CONST_USER_STATUS_DEVELOPER_NAME SYSRES_CONST_USER_STATUS_DISABLED_CODE SYSRES_CONST_USER_STATUS_DISABLED_NAME SYSRES_CONST_USER_STATUS_SYSTEM_DEVELOPER_CODE SYSRES_CONST_USER_STATUS_USER_CODE SYSRES_CONST_USER_STATUS_USER_NAME SYSRES_CONST_USER_STATUS_USER_NAME_DEPRECATED SYSRES_CONST_USER_TYPE_FIELD_VALUE_USER SYSRES_CONST_USER_TYPE_REQUISITE_CODE SYSRES_CONST_USERS_CONTROLLER_REQUISITE_CODE SYSRES_CONST_USERS_IS_MAIN_SERVER_REQUISITE_CODE SYSRES_CONST_USERS_REFERENCE_CODE SYSRES_CONST_USERS_REGISTRATION_CERTIFICATES_ACTION_NAME SYSRES_CONST_USERS_REQUISITE_CODE SYSRES_CONST_USERS_SYSTEM_REQUISITE_CODE SYSRES_CONST_USERS_USER_ACCESS_RIGHTS_TYPR_REQUISITE_CODE SYSRES_CONST_USERS_USER_AUTHENTICATION_REQUISITE_CODE SYSRES_CONST_USERS_USER_COMPONENT_REQUISITE_CODE SYSRES_CONST_USERS_USER_GROUP_REQUISITE_CODE SYSRES_CONST_USERS_VIEW_CERTIFICATES_ACTION_NAME SYSRES_CONST_VIEW_DEFAULT_CODE SYSRES_CONST_VIEW_DEFAULT_NAME SYSRES_CONST_VIEWER_REQUISITE_CODE SYSRES_CONST_WAITING_BLOCK_DESCRIPTION SYSRES_CONST_WIZARD_FORM_LABEL_TEST_STRING  SYSRES_CONST_WIZARD_QUERY_PARAM_HEIGHT_ETALON_STRING SYSRES_CONST_WIZARD_REFERENCE_COMMENT_REQUISITE_CODE SYSRES_CONST_WORK_RULES_DESCRIPTION_REQUISITE_CODE SYSRES_CONST_WORK_TIME_CALENDAR_REFERENCE_CODE SYSRES_CONST_WORK_WORKFLOW_HARD_ROUTE_TYPE_VALUE SYSRES_CONST_WORK_WORKFLOW_HARD_ROUTE_TYPE_VALUE_CODE SYSRES_CONST_WORK_WORKFLOW_HARD_ROUTE_TYPE_VALUE_CODE_RUS SYSRES_CONST_WORK_WORKFLOW_SOFT_ROUTE_TYPE_VALUE_CODE_RUS SYSRES_CONST_WORKFLOW_ROUTE_TYPR_HARD SYSRES_CONST_WORKFLOW_ROUTE_TYPR_SOFT SYSRES_CONST_XML_ENCODING SYSRES_CONST_XREC_STAT_REQUISITE_CODE SYSRES_CONST_XRECID_FIELD_NAME SYSRES_CONST_YES SYSRES_CONST_YES_NO_2_REQUISITE_CODE SYSRES_CONST_YES_NO_REQUISITE_CODE SYSRES_CONST_YES_NO_T_REF_TYPE_REQUISITE_CODE SYSRES_CONST_YES_PICK_VALUE SYSRES_CONST_YES_VALUE ",O="CR FALSE nil NO_VALUE NULL TAB TRUE YES_VALUE ",C="ADMINISTRATORS_GROUP_NAME CUSTOMIZERS_GROUP_NAME DEVELOPERS_GROUP_NAME SERVICE_USERS_GROUP_NAME ",I="DECISION_BLOCK_FIRST_OPERAND_PROPERTY DECISION_BLOCK_NAME_PROPERTY DECISION_BLOCK_OPERATION_PROPERTY DECISION_BLOCK_RESULT_TYPE_PROPERTY DECISION_BLOCK_SECOND_OPERAND_PROPERTY ",N="ANY_FILE_EXTENTION COMPRESSED_DOCUMENT_EXTENSION EXTENDED_DOCUMENT_EXTENSION SHORT_COMPRESSED_DOCUMENT_EXTENSION SHORT_EXTENDED_DOCUMENT_EXTENSION ",A="JOB_BLOCK_ABORT_DEADLINE_PROPERTY JOB_BLOCK_AFTER_FINISH_EVENT JOB_BLOCK_AFTER_QUERY_PARAMETERS_EVENT JOB_BLOCK_ATTACHMENT_PROPERTY JOB_BLOCK_ATTACHMENTS_RIGHTS_GROUP_PROPERTY JOB_BLOCK_ATTACHMENTS_RIGHTS_TYPE_PROPERTY JOB_BLOCK_BEFORE_QUERY_PARAMETERS_EVENT JOB_BLOCK_BEFORE_START_EVENT JOB_BLOCK_CREATED_JOBS_PROPERTY JOB_BLOCK_DEADLINE_PROPERTY JOB_BLOCK_EXECUTION_RESULTS_PROPERTY JOB_BLOCK_IS_PARALLEL_PROPERTY JOB_BLOCK_IS_RELATIVE_ABORT_DEADLINE_PROPERTY JOB_BLOCK_IS_RELATIVE_DEADLINE_PROPERTY JOB_BLOCK_JOB_TEXT_PROPERTY JOB_BLOCK_NAME_PROPERTY JOB_BLOCK_NEED_SIGN_ON_PERFORM_PROPERTY JOB_BLOCK_PERFORMER_PROPERTY JOB_BLOCK_RELATIVE_ABORT_DEADLINE_TYPE_PROPERTY JOB_BLOCK_RELATIVE_DEADLINE_TYPE_PROPERTY JOB_BLOCK_SUBJECT_PROPERTY ",e="ENGLISH_LANGUAGE_CODE RUSSIAN_LANGUAGE_CODE ",Y="smHidden smMaximized smMinimized smNormal wmNo wmYes ",D="COMPONENT_TOKEN_LINK_KIND DOCUMENT_LINK_KIND EDOCUMENT_LINK_KIND FOLDER_LINK_KIND JOB_LINK_KIND REFERENCE_LINK_KIND TASK_LINK_KIND ",t="COMPONENT_TOKEN_LOCK_TYPE EDOCUMENT_VERSION_LOCK_TYPE ",U="MONITOR_BLOCK_AFTER_FINISH_EVENT MONITOR_BLOCK_BEFORE_START_EVENT MONITOR_BLOCK_DEADLINE_PROPERTY MONITOR_BLOCK_INTERVAL_PROPERTY MONITOR_BLOCK_INTERVAL_TYPE_PROPERTY MONITOR_BLOCK_IS_RELATIVE_DEADLINE_PROPERTY MONITOR_BLOCK_NAME_PROPERTY MONITOR_BLOCK_RELATIVE_DEADLINE_TYPE_PROPERTY MONITOR_BLOCK_SEARCH_SCRIPT_PROPERTY ",L="NOTICE_BLOCK_AFTER_FINISH_EVENT NOTICE_BLOCK_ATTACHMENT_PROPERTY NOTICE_BLOCK_ATTACHMENTS_RIGHTS_GROUP_PROPERTY NOTICE_BLOCK_ATTACHMENTS_RIGHTS_TYPE_PROPERTY NOTICE_BLOCK_BEFORE_START_EVENT NOTICE_BLOCK_CREATED_NOTICES_PROPERTY NOTICE_BLOCK_DEADLINE_PROPERTY NOTICE_BLOCK_IS_RELATIVE_DEADLINE_PROPERTY NOTICE_BLOCK_NAME_PROPERTY NOTICE_BLOCK_NOTICE_TEXT_PROPERTY NOTICE_BLOCK_PERFORMER_PROPERTY NOTICE_BLOCK_RELATIVE_DEADLINE_TYPE_PROPERTY NOTICE_BLOCK_SUBJECT_PROPERTY ",P="dseAfterCancel dseAfterClose dseAfterDelete dseAfterDeleteOutOfTransaction dseAfterInsert dseAfterOpen dseAfterScroll dseAfterUpdate dseAfterUpdateOutOfTransaction dseBeforeCancel dseBeforeClose dseBeforeDelete dseBeforeDetailUpdate dseBeforeInsert dseBeforeOpen dseBeforeUpdate dseOnAnyRequisiteChange dseOnCloseRecord dseOnDeleteError dseOnOpenRecord dseOnPrepareUpdate dseOnUpdateError dseOnUpdateRatifiedRecord dseOnValidDelete dseOnValidUpdate reOnChange reOnChangeValues SELECTION_BEGIN_ROUTE_EVENT SELECTION_END_ROUTE_EVENT ",r="CURRENT_PERIOD_IS_REQUIRED PREVIOUS_CARD_TYPE_NAME SHOW_RECORD_PROPERTIES_FORM ",o="ACCESS_RIGHTS_SETTING_DIALOG_CODE ADMINISTRATOR_USER_CODE ANALYTIC_REPORT_TYPE asrtHideLocal asrtHideRemote CALCULATED_ROLE_TYPE_CODE COMPONENTS_REFERENCE_DEVELOPER_VIEW_CODE DCTS_TEST_PROTOCOLS_FOLDER_PATH E_EDOC_VERSION_ALREADY_APPROVINGLY_SIGNED E_EDOC_VERSION_ALREADY_APPROVINGLY_SIGNED_BY_USER E_EDOC_VERSION_ALREDY_SIGNED E_EDOC_VERSION_ALREDY_SIGNED_BY_USER EDOC_TYPES_CODE_REQUISITE_FIELD_NAME EDOCUMENTS_ALIAS_NAME FILES_FOLDER_PATH FILTER_OPERANDS_DELIMITER FILTER_OPERATIONS_DELIMITER FORMCARD_NAME FORMLIST_NAME GET_EXTENDED_DOCUMENT_EXTENSION_CREATION_MODE GET_EXTENDED_DOCUMENT_EXTENSION_IMPORT_MODE INTEGRATED_REPORT_TYPE IS_BUILDER_APPLICATION_ROLE IS_BUILDER_APPLICATION_ROLE2 IS_BUILDER_USERS ISBSYSDEV LOG_FOLDER_PATH mbCancel mbNo mbNoToAll mbOK mbYes mbYesToAll MEMORY_DATASET_DESRIPTIONS_FILENAME mrNo mrNoToAll mrYes mrYesToAll MULTIPLE_SELECT_DIALOG_CODE NONOPERATING_RECORD_FLAG_FEMININE NONOPERATING_RECORD_FLAG_MASCULINE OPERATING_RECORD_FLAG_FEMININE OPERATING_RECORD_FLAG_MASCULINE PROFILING_SETTINGS_COMMON_SETTINGS_CODE_VALUE PROGRAM_INITIATED_LOOKUP_ACTION ratDelete ratEdit ratInsert REPORT_TYPE REQUIRED_PICK_VALUES_VARIABLE rmCard rmList SBRTE_PROGID_DEV SBRTE_PROGID_RELEASE STATIC_ROLE_TYPE_CODE SUPPRESS_EMPTY_TEMPLATE_CREATION SYSTEM_USER_CODE UPDATE_DIALOG_DATASET USED_IN_OBJECT_HINT_PARAM USER_INITIATED_LOOKUP_ACTION USER_NAME_FORMAT USER_SELECTION_RESTRICTIONS WORKFLOW_TEST_PROTOCOLS_FOLDER_PATH ELS_SUBTYPE_CONTROL_NAME ELS_FOLDER_KIND_CONTROL_NAME REPEAT_PROCESS_CURRENT_OBJECT_EXCEPTION_NAME ",i="PRIVILEGE_COMPONENT_FULL_ACCESS PRIVILEGE_DEVELOPMENT_EXPORT PRIVILEGE_DEVELOPMENT_IMPORT PRIVILEGE_DOCUMENT_DELETE PRIVILEGE_ESD PRIVILEGE_FOLDER_DELETE PRIVILEGE_MANAGE_ACCESS_RIGHTS PRIVILEGE_MANAGE_REPLICATION PRIVILEGE_MANAGE_SESSION_SERVER PRIVILEGE_OBJECT_FULL_ACCESS PRIVILEGE_OBJECT_VIEW PRIVILEGE_RESERVE_LICENSE PRIVILEGE_SYSTEM_CUSTOMIZE PRIVILEGE_SYSTEM_DEVELOP PRIVILEGE_SYSTEM_INSTALL PRIVILEGE_TASK_DELETE PRIVILEGE_USER_PLUGIN_SETTINGS_CUSTOMIZE PRIVILEGES_PSEUDOREFERENCE_CODE ",n="ACCESS_TYPES_PSEUDOREFERENCE_CODE ALL_AVAILABLE_COMPONENTS_PSEUDOREFERENCE_CODE ALL_AVAILABLE_PRIVILEGES_PSEUDOREFERENCE_CODE ALL_REPLICATE_COMPONENTS_PSEUDOREFERENCE_CODE AVAILABLE_DEVELOPERS_COMPONENTS_PSEUDOREFERENCE_CODE COMPONENTS_PSEUDOREFERENCE_CODE FILTRATER_SETTINGS_CONFLICTS_PSEUDOREFERENCE_CODE GROUPS_PSEUDOREFERENCE_CODE RECEIVE_PROTOCOL_PSEUDOREFERENCE_CODE REFERENCE_REQUISITE_PSEUDOREFERENCE_CODE REFERENCE_REQUISITES_PSEUDOREFERENCE_CODE REFTYPES_PSEUDOREFERENCE_CODE REPLICATION_SEANCES_DIARY_PSEUDOREFERENCE_CODE SEND_PROTOCOL_PSEUDOREFERENCE_CODE SUBSTITUTES_PSEUDOREFERENCE_CODE SYSTEM_SETTINGS_PSEUDOREFERENCE_CODE UNITS_PSEUDOREFERENCE_CODE USERS_PSEUDOREFERENCE_CODE VIEWERS_PSEUDOREFERENCE_CODE ",a="CERTIFICATE_TYPE_ENCRYPT CERTIFICATE_TYPE_SIGN CERTIFICATE_TYPE_SIGN_AND_ENCRYPT ",M="STORAGE_TYPE_FILE STORAGE_TYPE_NAS_CIFS STORAGE_TYPE_SAPERION STORAGE_TYPE_SQL_SERVER ",F="COMPTYPE2_REQUISITE_DOCUMENTS_VALUE COMPTYPE2_REQUISITE_TASKS_VALUE COMPTYPE2_REQUISITE_FOLDERS_VALUE COMPTYPE2_REQUISITE_REFERENCES_VALUE ",c="SYSREQ_CODE SYSREQ_COMPTYPE2 SYSREQ_CONST_AVAILABLE_FOR_WEB SYSREQ_CONST_COMMON_CODE SYSREQ_CONST_COMMON_VALUE SYSREQ_CONST_FIRM_CODE SYSREQ_CONST_FIRM_STATUS SYSREQ_CONST_FIRM_VALUE SYSREQ_CONST_SERVER_STATUS SYSREQ_CONTENTS SYSREQ_DATE_OPEN SYSREQ_DATE_CLOSE SYSREQ_DESCRIPTION SYSREQ_DESCRIPTION_LOCALIZE_ID SYSREQ_DOUBLE SYSREQ_EDOC_ACCESS_TYPE SYSREQ_EDOC_AUTHOR SYSREQ_EDOC_CREATED SYSREQ_EDOC_DELEGATE_RIGHTS_REQUISITE_CODE SYSREQ_EDOC_EDITOR SYSREQ_EDOC_ENCODE_TYPE SYSREQ_EDOC_ENCRYPTION_PLUGIN_NAME SYSREQ_EDOC_ENCRYPTION_PLUGIN_VERSION SYSREQ_EDOC_EXPORT_DATE SYSREQ_EDOC_EXPORTER SYSREQ_EDOC_KIND SYSREQ_EDOC_LIFE_STAGE_NAME SYSREQ_EDOC_LOCKED_FOR_SERVER_CODE SYSREQ_EDOC_MODIFIED SYSREQ_EDOC_NAME SYSREQ_EDOC_NOTE SYSREQ_EDOC_QUALIFIED_ID SYSREQ_EDOC_SESSION_KEY SYSREQ_EDOC_SESSION_KEY_ENCRYPTION_PLUGIN_NAME SYSREQ_EDOC_SESSION_KEY_ENCRYPTION_PLUGIN_VERSION SYSREQ_EDOC_SIGNATURE_TYPE SYSREQ_EDOC_SIGNED SYSREQ_EDOC_STORAGE SYSREQ_EDOC_STORAGES_ARCHIVE_STORAGE SYSREQ_EDOC_STORAGES_CHECK_RIGHTS SYSREQ_EDOC_STORAGES_COMPUTER_NAME SYSREQ_EDOC_STORAGES_EDIT_IN_STORAGE SYSREQ_EDOC_STORAGES_EXECUTIVE_STORAGE SYSREQ_EDOC_STORAGES_FUNCTION SYSREQ_EDOC_STORAGES_INITIALIZED SYSREQ_EDOC_STORAGES_LOCAL_PATH SYSREQ_EDOC_STORAGES_SAPERION_DATABASE_NAME SYSREQ_EDOC_STORAGES_SEARCH_BY_TEXT SYSREQ_EDOC_STORAGES_SERVER_NAME SYSREQ_EDOC_STORAGES_SHARED_SOURCE_NAME SYSREQ_EDOC_STORAGES_TYPE SYSREQ_EDOC_TEXT_MODIFIED SYSREQ_EDOC_TYPE_ACT_CODE SYSREQ_EDOC_TYPE_ACT_DESCRIPTION SYSREQ_EDOC_TYPE_ACT_DESCRIPTION_LOCALIZE_ID SYSREQ_EDOC_TYPE_ACT_ON_EXECUTE SYSREQ_EDOC_TYPE_ACT_ON_EXECUTE_EXISTS SYSREQ_EDOC_TYPE_ACT_SECTION SYSREQ_EDOC_TYPE_ADD_PARAMS SYSREQ_EDOC_TYPE_COMMENT SYSREQ_EDOC_TYPE_EVENT_TEXT SYSREQ_EDOC_TYPE_NAME_IN_SINGULAR SYSREQ_EDOC_TYPE_NAME_IN_SINGULAR_LOCALIZE_ID SYSREQ_EDOC_TYPE_NAME_LOCALIZE_ID SYSREQ_EDOC_TYPE_NUMERATION_METHOD SYSREQ_EDOC_TYPE_PSEUDO_REQUISITE_CODE SYSREQ_EDOC_TYPE_REQ_CODE SYSREQ_EDOC_TYPE_REQ_DESCRIPTION SYSREQ_EDOC_TYPE_REQ_DESCRIPTION_LOCALIZE_ID SYSREQ_EDOC_TYPE_REQ_IS_LEADING SYSREQ_EDOC_TYPE_REQ_IS_REQUIRED SYSREQ_EDOC_TYPE_REQ_NUMBER SYSREQ_EDOC_TYPE_REQ_ON_CHANGE SYSREQ_EDOC_TYPE_REQ_ON_CHANGE_EXISTS SYSREQ_EDOC_TYPE_REQ_ON_SELECT SYSREQ_EDOC_TYPE_REQ_ON_SELECT_KIND SYSREQ_EDOC_TYPE_REQ_SECTION SYSREQ_EDOC_TYPE_VIEW_CARD SYSREQ_EDOC_TYPE_VIEW_CODE SYSREQ_EDOC_TYPE_VIEW_COMMENT SYSREQ_EDOC_TYPE_VIEW_IS_MAIN SYSREQ_EDOC_TYPE_VIEW_NAME SYSREQ_EDOC_TYPE_VIEW_NAME_LOCALIZE_ID SYSREQ_EDOC_VERSION_AUTHOR SYSREQ_EDOC_VERSION_CRC SYSREQ_EDOC_VERSION_DATA SYSREQ_EDOC_VERSION_EDITOR SYSREQ_EDOC_VERSION_EXPORT_DATE SYSREQ_EDOC_VERSION_EXPORTER SYSREQ_EDOC_VERSION_HIDDEN SYSREQ_EDOC_VERSION_LIFE_STAGE SYSREQ_EDOC_VERSION_MODIFIED SYSREQ_EDOC_VERSION_NOTE SYSREQ_EDOC_VERSION_SIGNATURE_TYPE SYSREQ_EDOC_VERSION_SIGNED SYSREQ_EDOC_VERSION_SIZE SYSREQ_EDOC_VERSION_SOURCE SYSREQ_EDOC_VERSION_TEXT_MODIFIED SYSREQ_EDOCKIND_DEFAULT_VERSION_STATE_CODE SYSREQ_FOLDER_KIND SYSREQ_FUNC_CATEGORY SYSREQ_FUNC_COMMENT SYSREQ_FUNC_GROUP SYSREQ_FUNC_GROUP_COMMENT SYSREQ_FUNC_GROUP_NUMBER SYSREQ_FUNC_HELP SYSREQ_FUNC_PARAM_DEF_VALUE SYSREQ_FUNC_PARAM_IDENT SYSREQ_FUNC_PARAM_NUMBER SYSREQ_FUNC_PARAM_TYPE SYSREQ_FUNC_TEXT SYSREQ_GROUP_CATEGORY SYSREQ_ID SYSREQ_LAST_UPDATE SYSREQ_LEADER_REFERENCE SYSREQ_LINE_NUMBER SYSREQ_MAIN_RECORD_ID SYSREQ_NAME SYSREQ_NAME_LOCALIZE_ID SYSREQ_NOTE SYSREQ_ORIGINAL_RECORD SYSREQ_OUR_FIRM SYSREQ_PROFILING_SETTINGS_BATCH_LOGING SYSREQ_PROFILING_SETTINGS_BATCH_SIZE SYSREQ_PROFILING_SETTINGS_PROFILING_ENABLED SYSREQ_PROFILING_SETTINGS_SQL_PROFILING_ENABLED SYSREQ_PROFILING_SETTINGS_START_LOGGED SYSREQ_RECORD_STATUS SYSREQ_REF_REQ_FIELD_NAME SYSREQ_REF_REQ_FORMAT SYSREQ_REF_REQ_GENERATED SYSREQ_REF_REQ_LENGTH SYSREQ_REF_REQ_PRECISION SYSREQ_REF_REQ_REFERENCE SYSREQ_REF_REQ_SECTION SYSREQ_REF_REQ_STORED SYSREQ_REF_REQ_TOKENS SYSREQ_REF_REQ_TYPE SYSREQ_REF_REQ_VIEW SYSREQ_REF_TYPE_ACT_CODE SYSREQ_REF_TYPE_ACT_DESCRIPTION SYSREQ_REF_TYPE_ACT_DESCRIPTION_LOCALIZE_ID SYSREQ_REF_TYPE_ACT_ON_EXECUTE SYSREQ_REF_TYPE_ACT_ON_EXECUTE_EXISTS SYSREQ_REF_TYPE_ACT_SECTION SYSREQ_REF_TYPE_ADD_PARAMS SYSREQ_REF_TYPE_COMMENT SYSREQ_REF_TYPE_COMMON_SETTINGS SYSREQ_REF_TYPE_DISPLAY_REQUISITE_NAME SYSREQ_REF_TYPE_EVENT_TEXT SYSREQ_REF_TYPE_MAIN_LEADING_REF SYSREQ_REF_TYPE_NAME_IN_SINGULAR SYSREQ_REF_TYPE_NAME_IN_SINGULAR_LOCALIZE_ID SYSREQ_REF_TYPE_NAME_LOCALIZE_ID SYSREQ_REF_TYPE_NUMERATION_METHOD SYSREQ_REF_TYPE_REQ_CODE SYSREQ_REF_TYPE_REQ_DESCRIPTION SYSREQ_REF_TYPE_REQ_DESCRIPTION_LOCALIZE_ID SYSREQ_REF_TYPE_REQ_IS_CONTROL SYSREQ_REF_TYPE_REQ_IS_FILTER SYSREQ_REF_TYPE_REQ_IS_LEADING SYSREQ_REF_TYPE_REQ_IS_REQUIRED SYSREQ_REF_TYPE_REQ_NUMBER SYSREQ_REF_TYPE_REQ_ON_CHANGE SYSREQ_REF_TYPE_REQ_ON_CHANGE_EXISTS SYSREQ_REF_TYPE_REQ_ON_SELECT SYSREQ_REF_TYPE_REQ_ON_SELECT_KIND SYSREQ_REF_TYPE_REQ_SECTION SYSREQ_REF_TYPE_VIEW_CARD SYSREQ_REF_TYPE_VIEW_CODE SYSREQ_REF_TYPE_VIEW_COMMENT SYSREQ_REF_TYPE_VIEW_IS_MAIN SYSREQ_REF_TYPE_VIEW_NAME SYSREQ_REF_TYPE_VIEW_NAME_LOCALIZE_ID SYSREQ_REFERENCE_TYPE_ID SYSREQ_STATE SYSREQ_STATЕ SYSREQ_SYSTEM_SETTINGS_VALUE SYSREQ_TYPE SYSREQ_UNIT SYSREQ_UNIT_ID SYSREQ_USER_GROUPS_GROUP_FULL_NAME SYSREQ_USER_GROUPS_GROUP_NAME SYSREQ_USER_GROUPS_GROUP_SERVER_NAME SYSREQ_USERS_ACCESS_RIGHTS SYSREQ_USERS_AUTHENTICATION SYSREQ_USERS_CATEGORY SYSREQ_USERS_COMPONENT SYSREQ_USERS_COMPONENT_USER_IS_PUBLIC SYSREQ_USERS_DOMAIN SYSREQ_USERS_FULL_USER_NAME SYSREQ_USERS_GROUP SYSREQ_USERS_IS_MAIN_SERVER SYSREQ_USERS_LOGIN SYSREQ_USERS_REFERENCE_USER_IS_PUBLIC SYSREQ_USERS_STATUS SYSREQ_USERS_USER_CERTIFICATE SYSREQ_USERS_USER_CERTIFICATE_INFO SYSREQ_USERS_USER_CERTIFICATE_PLUGIN_NAME SYSREQ_USERS_USER_CERTIFICATE_PLUGIN_VERSION SYSREQ_USERS_USER_CERTIFICATE_STATE SYSREQ_USERS_USER_CERTIFICATE_SUBJECT_NAME SYSREQ_USERS_USER_CERTIFICATE_THUMBPRINT SYSREQ_USERS_USER_DEFAULT_CERTIFICATE SYSREQ_USERS_USER_DESCRIPTION SYSREQ_USERS_USER_GLOBAL_NAME SYSREQ_USERS_USER_LOGIN SYSREQ_USERS_USER_MAIN_SERVER SYSREQ_USERS_USER_TYPE SYSREQ_WORK_RULES_FOLDER_ID ",s="RESULT_VAR_NAME RESULT_VAR_NAME_ENG ",G="AUTO_NUMERATION_RULE_ID CANT_CHANGE_ID_REQUISITE_RULE_ID CANT_CHANGE_OURFIRM_REQUISITE_RULE_ID CHECK_CHANGING_REFERENCE_RECORD_USE_RULE_ID CHECK_CODE_REQUISITE_RULE_ID CHECK_DELETING_REFERENCE_RECORD_USE_RULE_ID CHECK_FILTRATER_CHANGES_RULE_ID CHECK_RECORD_INTERVAL_RULE_ID CHECK_REFERENCE_INTERVAL_RULE_ID CHECK_REQUIRED_DATA_FULLNESS_RULE_ID CHECK_REQUIRED_REQUISITES_FULLNESS_RULE_ID MAKE_RECORD_UNRATIFIED_RULE_ID RESTORE_AUTO_NUMERATION_RULE_ID SET_FIRM_CONTEXT_FROM_RECORD_RULE_ID SET_FIRST_RECORD_IN_LIST_FORM_RULE_ID SET_IDSPS_VALUE_RULE_ID SET_NEXT_CODE_VALUE_RULE_ID SET_OURFIRM_BOUNDS_RULE_ID SET_OURFIRM_REQUISITE_RULE_ID ",Q="SCRIPT_BLOCK_AFTER_FINISH_EVENT SCRIPT_BLOCK_BEFORE_START_EVENT SCRIPT_BLOCK_EXECUTION_RESULTS_PROPERTY SCRIPT_BLOCK_NAME_PROPERTY SCRIPT_BLOCK_SCRIPT_PROPERTY ",l="SUBTASK_BLOCK_ABORT_DEADLINE_PROPERTY SUBTASK_BLOCK_AFTER_FINISH_EVENT SUBTASK_BLOCK_ASSIGN_PARAMS_EVENT SUBTASK_BLOCK_ATTACHMENTS_PROPERTY SUBTASK_BLOCK_ATTACHMENTS_RIGHTS_GROUP_PROPERTY SUBTASK_BLOCK_ATTACHMENTS_RIGHTS_TYPE_PROPERTY SUBTASK_BLOCK_BEFORE_START_EVENT SUBTASK_BLOCK_CREATED_TASK_PROPERTY SUBTASK_BLOCK_CREATION_EVENT SUBTASK_BLOCK_DEADLINE_PROPERTY SUBTASK_BLOCK_IMPORTANCE_PROPERTY SUBTASK_BLOCK_INITIATOR_PROPERTY SUBTASK_BLOCK_IS_RELATIVE_ABORT_DEADLINE_PROPERTY SUBTASK_BLOCK_IS_RELATIVE_DEADLINE_PROPERTY SUBTASK_BLOCK_JOBS_TYPE_PROPERTY SUBTASK_BLOCK_NAME_PROPERTY SUBTASK_BLOCK_PARALLEL_ROUTE_PROPERTY SUBTASK_BLOCK_PERFORMERS_PROPERTY SUBTASK_BLOCK_RELATIVE_ABORT_DEADLINE_TYPE_PROPERTY SUBTASK_BLOCK_RELATIVE_DEADLINE_TYPE_PROPERTY SUBTASK_BLOCK_REQUIRE_SIGN_PROPERTY SUBTASK_BLOCK_STANDARD_ROUTE_PROPERTY SUBTASK_BLOCK_START_EVENT SUBTASK_BLOCK_STEP_CONTROL_PROPERTY SUBTASK_BLOCK_SUBJECT_PROPERTY SUBTASK_BLOCK_TASK_CONTROL_PROPERTY SUBTASK_BLOCK_TEXT_PROPERTY SUBTASK_BLOCK_UNLOCK_ATTACHMENTS_ON_STOP_PROPERTY SUBTASK_BLOCK_USE_STANDARD_ROUTE_PROPERTY SUBTASK_BLOCK_WAIT_FOR_TASK_COMPLETE_PROPERTY ",d="SYSCOMP_CONTROL_JOBS SYSCOMP_FOLDERS SYSCOMP_JOBS SYSCOMP_NOTICES SYSCOMP_TASKS ",B="SYSDLG_CREATE_EDOCUMENT SYSDLG_CREATE_EDOCUMENT_VERSION SYSDLG_CURRENT_PERIOD SYSDLG_EDIT_FUNCTION_HELP SYSDLG_EDOCUMENT_KINDS_FOR_TEMPLATE SYSDLG_EXPORT_MULTIPLE_EDOCUMENTS SYSDLG_EXPORT_SINGLE_EDOCUMENT SYSDLG_IMPORT_EDOCUMENT SYSDLG_MULTIPLE_SELECT SYSDLG_SETUP_ACCESS_RIGHTS SYSDLG_SETUP_DEFAULT_RIGHTS SYSDLG_SETUP_FILTER_CONDITION SYSDLG_SETUP_SIGN_RIGHTS SYSDLG_SETUP_TASK_OBSERVERS SYSDLG_SETUP_TASK_ROUTE SYSDLG_SETUP_USERS_LIST SYSDLG_SIGN_EDOCUMENT SYSDLG_SIGN_MULTIPLE_EDOCUMENTS ",V="SYSREF_ACCESS_RIGHTS_TYPES SYSREF_ADMINISTRATION_HISTORY SYSREF_ALL_AVAILABLE_COMPONENTS SYSREF_ALL_AVAILABLE_PRIVILEGES SYSREF_ALL_REPLICATING_COMPONENTS SYSREF_AVAILABLE_DEVELOPERS_COMPONENTS SYSREF_CALENDAR_EVENTS SYSREF_COMPONENT_TOKEN_HISTORY SYSREF_COMPONENT_TOKENS SYSREF_COMPONENTS SYSREF_CONSTANTS SYSREF_DATA_RECEIVE_PROTOCOL SYSREF_DATA_SEND_PROTOCOL SYSREF_DIALOGS SYSREF_DIALOGS_REQUISITES SYSREF_EDITORS SYSREF_EDOC_CARDS SYSREF_EDOC_TYPES SYSREF_EDOCUMENT_CARD_REQUISITES SYSREF_EDOCUMENT_CARD_TYPES SYSREF_EDOCUMENT_CARD_TYPES_REFERENCE SYSREF_EDOCUMENT_CARDS SYSREF_EDOCUMENT_HISTORY SYSREF_EDOCUMENT_KINDS SYSREF_EDOCUMENT_REQUISITES SYSREF_EDOCUMENT_SIGNATURES SYSREF_EDOCUMENT_TEMPLATES SYSREF_EDOCUMENT_TEXT_STORAGES SYSREF_EDOCUMENT_VIEWS SYSREF_FILTERER_SETUP_CONFLICTS SYSREF_FILTRATER_SETTING_CONFLICTS SYSREF_FOLDER_HISTORY SYSREF_FOLDERS SYSREF_FUNCTION_GROUPS SYSREF_FUNCTION_PARAMS SYSREF_FUNCTIONS SYSREF_JOB_HISTORY SYSREF_LINKS SYSREF_LOCALIZATION_DICTIONARY SYSREF_LOCALIZATION_LANGUAGES SYSREF_MODULES SYSREF_PRIVILEGES SYSREF_RECORD_HISTORY SYSREF_REFERENCE_REQUISITES SYSREF_REFERENCE_TYPE_VIEWS SYSREF_REFERENCE_TYPES SYSREF_REFERENCES SYSREF_REFERENCES_REQUISITES SYSREF_REMOTE_SERVERS SYSREF_REPLICATION_SESSIONS_LOG SYSREF_REPLICATION_SESSIONS_PROTOCOL SYSREF_REPORTS SYSREF_ROLES SYSREF_ROUTE_BLOCK_GROUPS SYSREF_ROUTE_BLOCKS SYSREF_SCRIPTS SYSREF_SEARCHES SYSREF_SERVER_EVENTS SYSREF_SERVER_EVENTS_HISTORY SYSREF_STANDARD_ROUTE_GROUPS SYSREF_STANDARD_ROUTES SYSREF_STATUSES SYSREF_SYSTEM_SETTINGS SYSREF_TASK_HISTORY SYSREF_TASK_KIND_GROUPS SYSREF_TASK_KINDS SYSREF_TASK_RIGHTS SYSREF_TASK_SIGNATURES SYSREF_TASKS SYSREF_UNITS SYSREF_USER_GROUPS SYSREF_USER_GROUPS_REFERENCE SYSREF_USER_SUBSTITUTION SYSREF_USERS SYSREF_USERS_REFERENCE SYSREF_VIEWERS SYSREF_WORKING_TIME_CALENDARS ",H="ACCESS_RIGHTS_TABLE_NAME EDMS_ACCESS_TABLE_NAME EDOC_TYPES_TABLE_NAME ",K="TEST_DEV_DB_NAME TEST_DEV_SYSTEM_CODE TEST_EDMS_DB_NAME TEST_EDMS_MAIN_CODE TEST_EDMS_MAIN_DB_NAME TEST_EDMS_SECOND_CODE TEST_EDMS_SECOND_DB_NAME TEST_EDMS_SYSTEM_CODE TEST_ISB5_MAIN_CODE TEST_ISB5_SECOND_CODE TEST_SQL_SERVER_2005_NAME TEST_SQL_SERVER_NAME ",m="ATTENTION_CAPTION cbsCommandLinks cbsDefault CONFIRMATION_CAPTION ERROR_CAPTION INFORMATION_CAPTION mrCancel mrOk ",u="EDOC_VERSION_ACTIVE_STAGE_CODE EDOC_VERSION_DESIGN_STAGE_CODE EDOC_VERSION_OBSOLETE_STAGE_CODE ",p="cpDataEnciphermentEnabled cpDigitalSignatureEnabled cpID cpIssuer cpPluginVersion cpSerial cpSubjectName cpSubjSimpleName cpValidFromDate cpValidToDate ",f="ISBL_SYNTAX NO_SYNTAX XML_SYNTAX ",g="WAIT_BLOCK_AFTER_FINISH_EVENT WAIT_BLOCK_BEFORE_START_EVENT WAIT_BLOCK_DEADLINE_PROPERTY WAIT_BLOCK_IS_RELATIVE_DEADLINE_PROPERTY WAIT_BLOCK_NAME_PROPERTY WAIT_BLOCK_RELATIVE_DEADLINE_TYPE_PROPERTY ",W="SYSRES_COMMON SYSRES_CONST SYSRES_MBFUNC SYSRES_SBDATA SYSRES_SBGUI SYSRES_SBINTF SYSRES_SBREFDSC SYSRES_SQLERRORS SYSRES_SYSCOMP ",w=R+O+C+I+N+A+e+Y+D+t+U+L+P+r+o+i+n+a+M+F+c+s+G+Q+l+d+B+V+H+K+m+u+p+f+g+W,k="atUser atGroup atRole ",b="aemEnabledAlways aemDisabledAlways aemEnabledOnBrowse aemEnabledOnEdit aemDisabledOnBrowseEmpty ",h="apBegin apEnd ",v="alLeft alRight ",y="asmNever asmNoButCustomize asmAsLastTime asmYesButCustomize asmAlways ",X="cirCommon cirRevoked ",x="ctSignature ctEncode ctSignatureEncode ",J="clbUnchecked clbChecked clbGrayed ",q="ceISB ceAlways ceNever ",Z="ctDocument ctReference ctScript ctUnknown ctReport ctDialog ctFunction ctFolder ctEDocument ctTask ctJob ctNotice ctControlJob ",z="cfInternal cfDisplay ",j="ciUnspecified ciWrite ciRead ",$="ckFolder ckEDocument ckTask ckJob ckComponentToken ckAny ckReference ckScript ckReport ckDialog ",SS="ctISBLEditor ctBevel ctButton ctCheckListBox ctComboBox ctComboEdit ctGrid ctDBCheckBox ctDBComboBox ctDBEdit ctDBEllipsis ctDBMemo ctDBNavigator ctDBRadioGroup ctDBStatusLabel ctEdit ctGroupBox ctInplaceHint ctMemo ctPanel ctListBox ctRadioButton ctRichEdit ctTabSheet ctWebBrowser ctImage ctHyperLink ctLabel ctDBMultiEllipsis ctRibbon ctRichView ctInnerPanel ctPanelGroup ctBitButton ",ES="cctDate cctInteger cctNumeric cctPick cctReference cctString cctText ",_S="cltInternal cltPrimary cltGUI ",TS="dseBeforeOpen dseAfterOpen dseBeforeClose dseAfterClose dseOnValidDelete dseBeforeDelete dseAfterDelete dseAfterDeleteOutOfTransaction dseOnDeleteError dseBeforeInsert dseAfterInsert dseOnValidUpdate dseBeforeUpdate dseOnUpdateRatifiedRecord dseAfterUpdate dseAfterUpdateOutOfTransaction dseOnUpdateError dseAfterScroll dseOnOpenRecord dseOnCloseRecord dseBeforeCancel dseAfterCancel dseOnUpdateDeadlockError dseBeforeDetailUpdate dseOnPrepareUpdate dseOnAnyRequisiteChange ",RS="dssEdit dssInsert dssBrowse dssInActive ",OS="dftDate dftShortDate dftDateTime dftTimeStamp ",CS="dotDays dotHours dotMinutes dotSeconds ",IS="dtkndLocal dtkndUTC ",NS="arNone arView arEdit arFull ",AS="ddaView ddaEdit ",eS="emLock emEdit emSign emExportWithLock emImportWithUnlock emChangeVersionNote emOpenForModify emChangeLifeStage emDelete emCreateVersion emImport emUnlockExportedWithLock emStart emAbort emReInit emMarkAsReaded emMarkAsUnreaded emPerform emAccept emResume emChangeRights emEditRoute emEditObserver emRecoveryFromLocalCopy emChangeWorkAccessType emChangeEncodeTypeToCertificate emChangeEncodeTypeToPassword emChangeEncodeTypeToNone emChangeEncodeTypeToCertificatePassword emChangeStandardRoute emGetText emOpenForView emMoveToStorage emCreateObject emChangeVersionHidden emDeleteVersion emChangeLifeCycleStage emApprovingSign emExport emContinue emLockFromEdit emUnLockForEdit emLockForServer emUnlockFromServer emDelegateAccessRights emReEncode ",YS="ecotFile ecotProcess ",DS="eaGet eaCopy eaCreate eaCreateStandardRoute ",tS="edltAll edltNothing edltQuery ",US="essmText essmCard ",LS="esvtLast esvtLastActive esvtSpecified ",PS="edsfExecutive edsfArchive ",rS="edstSQLServer edstFile ",oS="edvstNone edvstEDocumentVersionCopy edvstFile edvstTemplate edvstScannedFile ",iS="vsDefault vsDesign vsActive vsObsolete ",nS="etNone etCertificate etPassword etCertificatePassword ",aS="ecException ecWarning ecInformation ",MS="estAll estApprovingOnly ",FS="evtLast evtLastActive evtQuery ",cS="fdtString fdtNumeric fdtInteger fdtDate fdtText fdtUnknown fdtWideString fdtLargeInteger ",sS="ftInbox ftOutbox ftFavorites ftCommonFolder ftUserFolder ftComponents ftQuickLaunch ftShortcuts ftSearch ",GS="grhAuto grhX1 grhX2 grhX3 ",QS="hltText hltRTF hltHTML ",lS="iffBMP iffJPEG iffMultiPageTIFF iffSinglePageTIFF iffTIFF iffPNG ",dS="im8bGrayscale im24bRGB im1bMonochrome ",BS="itBMP itJPEG itWMF itPNG ",VS="ikhInformation ikhWarning ikhError ikhNoIcon ",HS="icUnknown icScript icFunction icIntegratedReport icAnalyticReport icDataSetEventHandler icActionHandler icFormEventHandler icLookUpEventHandler icRequisiteChangeEventHandler icBeforeSearchEventHandler icRoleCalculation icSelectRouteEventHandler icBlockPropertyCalculation icBlockQueryParamsEventHandler icChangeSearchResultEventHandler icBlockEventHandler icSubTaskInitEventHandler icEDocDataSetEventHandler icEDocLookUpEventHandler icEDocActionHandler icEDocFormEventHandler icEDocRequisiteChangeEventHandler icStructuredConversionRule icStructuredConversionEventBefore icStructuredConversionEventAfter icWizardEventHandler icWizardFinishEventHandler icWizardStepEventHandler icWizardStepFinishEventHandler icWizardActionEnableEventHandler icWizardActionExecuteEventHandler icCreateJobsHandler icCreateNoticesHandler icBeforeLookUpEventHandler icAfterLookUpEventHandler icTaskAbortEventHandler icWorkflowBlockActionHandler icDialogDataSetEventHandler icDialogActionHandler icDialogLookUpEventHandler icDialogRequisiteChangeEventHandler icDialogFormEventHandler icDialogValidCloseEventHandler icBlockFormEventHandler icTaskFormEventHandler icReferenceMethod icEDocMethod icDialogMethod icProcessMessageHandler ",KS="isShow isHide isByUserSettings ",mS="jkJob jkNotice jkControlJob ",uS="jtInner jtLeft jtRight jtFull jtCross ",pS="lbpAbove lbpBelow lbpLeft lbpRight ",fS="eltPerConnection eltPerUser ",gS="sfcUndefined sfcBlack sfcGreen sfcRed sfcBlue sfcOrange sfcLilac ",WS="sfsItalic sfsStrikeout sfsNormal ",wS="ldctStandardRoute ldctWizard ldctScript ldctFunction ldctRouteBlock ldctIntegratedReport ldctAnalyticReport ldctReferenceType ldctEDocumentType ldctDialog ldctServerEvents ",kS="mrcrtNone mrcrtUser mrcrtMaximal mrcrtCustom ",bS="vtEqual vtGreaterOrEqual vtLessOrEqual vtRange ",hS="rdYesterday rdToday rdTomorrow rdThisWeek rdThisMonth rdThisYear rdNextMonth rdNextWeek rdLastWeek rdLastMonth ",vS="rdWindow rdFile rdPrinter ",yS="rdtString rdtNumeric rdtInteger rdtDate rdtReference rdtAccount rdtText rdtPick rdtUnknown rdtLargeInteger rdtDocument ",XS="reOnChange reOnChangeValues ",xS="ttGlobal ttLocal ttUser ttSystem ",JS="ssmBrowse ssmSelect ssmMultiSelect ssmBrowseModal ",qS="smSelect smLike smCard ",ZS="stNone stAuthenticating stApproving ",zS="sctString sctStream ",jS="sstAnsiSort sstNaturalSort ",$S="svtEqual svtContain ",SE="soatString soatNumeric soatInteger soatDatetime soatReferenceRecord soatText soatPick soatBoolean soatEDocument soatAccount soatIntegerCollection soatNumericCollection soatStringCollection soatPickCollection soatDatetimeCollection soatBooleanCollection soatReferenceRecordCollection soatEDocumentCollection soatAccountCollection soatContents soatUnknown ",EE="tarAbortByUser tarAbortByWorkflowException ",_E="tvtAllWords tvtExactPhrase tvtAnyWord ",TE="usNone usCompleted usRedSquare usBlueSquare usYellowSquare usGreenSquare usOrangeSquare usPurpleSquare usFollowUp ",RE="utUnknown utUser utDeveloper utAdministrator utSystemDeveloper utDisconnected ",OE="btAnd btDetailAnd btOr btNotOr btOnly ",CE="vmView vmSelect vmNavigation ",IE="vsmSingle vsmMultiple vsmMultipleCheck vsmNoSelection ",NE="wfatPrevious wfatNext wfatCancel wfatFinish ",AE="wfepUndefined wfepText3 wfepText6 wfepText9 wfepSpinEdit wfepDropDown wfepRadioGroup wfepFlag wfepText12 wfepText15 wfepText18 wfepText21 wfepText24 wfepText27 wfepText30 wfepRadioGroupColumn1 wfepRadioGroupColumn2 wfepRadioGroupColumn3 ",eE="wfetQueryParameter wfetText wfetDelimiter wfetLabel ",YE="wptString wptInteger wptNumeric wptBoolean wptDateTime wptPick wptText wptUser wptUserList wptEDocumentInfo wptEDocumentInfoList wptReferenceRecordInfo wptReferenceRecordInfoList wptFolderInfo wptTaskInfo wptContents wptFileName wptDate ",DE="wsrComplete wsrGoNext wsrGoPrevious wsrCustom wsrCancel wsrGoFinal ",tE="wstForm wstEDocument wstTaskCard wstReferenceRecordCard wstFinal ",UE="waAll waPerformers waManual ",LE="wsbStart wsbFinish wsbNotice wsbStep wsbDecision wsbWait wsbMonitor wsbScript wsbConnector wsbSubTask wsbLifeCycleStage wsbPause ",PE="wdtInteger wdtFloat wdtString wdtPick wdtDateTime wdtBoolean wdtTask wdtJob wdtFolder wdtEDocument wdtReferenceRecord wdtUser wdtGroup wdtRole wdtIntegerCollection wdtFloatCollection wdtStringCollection wdtPickCollection wdtDateTimeCollection wdtBooleanCollection wdtTaskCollection wdtJobCollection wdtFolderCollection wdtEDocumentCollection wdtReferenceRecordCollection wdtUserCollection wdtGroupCollection wdtRoleCollection wdtContents wdtUserList wdtSearchDescription wdtDeadLine wdtPickSet wdtAccountCollection ",rE="wiLow wiNormal wiHigh ",oE="wrtSoft wrtHard ",iE="wsInit wsRunning wsDone wsControlled wsAborted wsContinued ",nE="wtmFull wtmFromCurrent wtmOnlyCurrent ",aE=k+b+h+v+y+X+x+J+q+Z+z+j+$+SS+ES+_S+TS+RS+OS+CS+IS+NS+AS+eS+YS+DS+tS+US+LS+PS+rS+oS+iS+nS+aS+MS+FS+cS+sS+GS+QS+lS+dS+BS+VS+HS+KS+mS+uS+pS+fS+gS+WS+wS+kS+bS+hS+vS+yS+XS+xS+JS+qS+ZS+zS+jS+$S+SE+EE+_E+TE+RE+OE+CE+IE+NE+AE+eE+YE+DE+tE+UE+LE+PE+rE+oE+iE+nE,ME="AddSubString AdjustLineBreaks AmountInWords Analysis ArrayDimCount ArrayHighBound ArrayLowBound ArrayOf ArrayReDim Assert Assigned BeginOfMonth BeginOfPeriod BuildProfilingOperationAnalysis CallProcedure CanReadFile CArrayElement CDataSetRequisite ChangeDate ChangeReferenceDataset Char CharPos CheckParam CheckParamValue CompareStrings ConstantExists ControlState ConvertDateStr Copy CopyFile CreateArray CreateCachedReference CreateConnection CreateDialog CreateDualListDialog CreateEditor CreateException CreateFile CreateFolderDialog CreateInputDialog CreateLinkFile CreateList CreateLock CreateMemoryDataSet CreateObject CreateOpenDialog CreateProgress CreateQuery CreateReference CreateReport CreateSaveDialog CreateScript CreateSQLPivotFunction CreateStringList CreateTreeListSelectDialog CSelectSQL CSQL CSubString CurrentUserID CurrentUserName CurrentVersion DataSetLocateEx DateDiff DateTimeDiff DateToStr DayOfWeek DeleteFile DirectoryExists DisableCheckAccessRights DisableCheckFullShowingRestriction DisableMassTaskSendingRestrictions DropTable DupeString EditText EnableCheckAccessRights EnableCheckFullShowingRestriction EnableMassTaskSendingRestrictions EndOfMonth EndOfPeriod ExceptionExists ExceptionsOff ExceptionsOn Execute ExecuteProcess Exit ExpandEnvironmentVariables ExtractFileDrive ExtractFileExt ExtractFileName ExtractFilePath ExtractParams FileExists FileSize FindFile FindSubString FirmContext ForceDirectories Format FormatDate FormatNumeric FormatSQLDate FormatString FreeException GetComponent GetComponentLaunchParam GetConstant GetLastException GetReferenceRecord GetRefTypeByRefID GetTableID GetTempFolder IfThen In IndexOf InputDialog InputDialogEx InteractiveMode IsFileLocked IsGraphicFile IsNumeric Length LoadString LoadStringFmt LocalTimeToUTC LowerCase Max MessageBox MessageBoxEx MimeDecodeBinary MimeDecodeString MimeEncodeBinary MimeEncodeString Min MoneyInWords MoveFile NewID Now OpenFile Ord Precision Raise ReadCertificateFromFile ReadFile ReferenceCodeByID ReferenceNumber ReferenceRequisiteMode ReferenceRequisiteValue RegionDateSettings RegionNumberSettings RegionTimeSettings RegRead RegWrite RenameFile Replace Round SelectServerCode SelectSQL ServerDateTime SetConstant SetManagedFolderFieldsState ShowConstantsInputDialog ShowMessage Sleep Split SQL SQL2XLSTAB SQLProfilingSendReport StrToDate SubString SubStringCount SystemSetting Time TimeDiff Today Transliterate Trim UpperCase UserStatus UTCToLocalTime ValidateXML VarIsClear VarIsEmpty VarIsNull WorkTimeDiff WriteFile WriteFileEx WriteObjectHistory Анализ БазаДанных БлокЕсть БлокЕстьРасш БлокИнфо БлокСнять БлокСнятьРасш БлокУстановить Ввод ВводМеню ВедС ВедСпр ВерхняяГраницаМассива ВнешПрогр Восст ВременнаяПапка Время ВыборSQL ВыбратьЗапись ВыделитьСтр Вызвать Выполнить ВыпПрогр ГрафическийФайл ГруппаДополнительно ДатаВремяСерв ДеньНедели ДиалогДаНет ДлинаСтр ДобПодстр ЕПусто ЕслиТо ЕЧисло ЗамПодстр ЗаписьСправочника ЗначПоляСпр ИДТипСпр ИзвлечьДиск ИзвлечьИмяФайла ИзвлечьПуть ИзвлечьРасширение ИзмДат ИзменитьРазмерМассива ИзмеренийМассива ИмяОрг ИмяПоляСпр Индекс ИндикаторЗакрыть ИндикаторОткрыть ИндикаторШаг ИнтерактивныйРежим ИтогТблСпр КодВидВедСпр КодВидСпрПоИД КодПоAnalit КодСимвола КодСпр КолПодстр КолПроп КонМес Конст КонстЕсть КонстЗнач КонТран КопироватьФайл КопияСтр КПериод КСтрТблСпр Макс МаксСтрТблСпр Массив Меню МенюРасш Мин НаборДанныхНайтиРасш НаимВидСпр НаимПоAnalit НаимСпр НастроитьПереводыСтрок НачМес НачТран НижняяГраницаМассива НомерСпр НПериод Окно Окр Окружение ОтлИнфДобавить ОтлИнфУдалить Отчет ОтчетАнал ОтчетИнт ПапкаСуществует Пауза ПВыборSQL ПереименоватьФайл Переменные ПереместитьФайл Подстр ПоискПодстр ПоискСтр ПолучитьИДТаблицы ПользовательДополнительно ПользовательИД ПользовательИмя ПользовательСтатус Прервать ПроверитьПараметр ПроверитьПараметрЗнач ПроверитьУсловие РазбСтр РазнВремя РазнДат РазнДатаВремя РазнРабВремя РегУстВрем РегУстДат РегУстЧсл РедТекст РеестрЗапись РеестрСписокИменПарам РеестрЧтение РеквСпр РеквСпрПр Сегодня Сейчас Сервер СерверПроцессИД СертификатФайлСчитать СжПроб Символ СистемаДиректумКод СистемаИнформация СистемаКод Содержит СоединениеЗакрыть СоединениеОткрыть СоздатьДиалог СоздатьДиалогВыбораИзДвухСписков СоздатьДиалогВыбораПапки СоздатьДиалогОткрытияФайла СоздатьДиалогСохраненияФайла СоздатьЗапрос СоздатьИндикатор СоздатьИсключение СоздатьКэшированныйСправочник СоздатьМассив СоздатьНаборДанных СоздатьОбъект СоздатьОтчет СоздатьПапку СоздатьРедактор СоздатьСоединение СоздатьСписок СоздатьСписокСтрок СоздатьСправочник СоздатьСценарий СоздСпр СостСпр Сохр СохрСпр СписокСистем Спр Справочник СпрБлокЕсть СпрБлокСнять СпрБлокСнятьРасш СпрБлокУстановить СпрИзмНабДан СпрКод СпрНомер СпрОбновить СпрОткрыть СпрОтменить СпрПарам СпрПолеЗнач СпрПолеИмя СпрРекв СпрРеквВведЗн СпрРеквНовые СпрРеквПр СпрРеквПредЗн СпрРеквРежим СпрРеквТипТекст СпрСоздать СпрСост СпрСохранить СпрТблИтог СпрТблСтр СпрТблСтрКол СпрТблСтрМакс СпрТблСтрМин СпрТблСтрПред СпрТблСтрСлед СпрТблСтрСозд СпрТблСтрУд СпрТекПредст СпрУдалить СравнитьСтр СтрВерхРегистр СтрНижнРегистр СтрТблСпр СумПроп Сценарий СценарийПарам ТекВерсия ТекОрг Точн Тран Транслитерация УдалитьТаблицу УдалитьФайл УдСпр УдСтрТблСпр Уст УстановкиКонстант ФайлАтрибутСчитать ФайлАтрибутУстановить ФайлВремя ФайлВремяУстановить ФайлВыбрать ФайлЗанят ФайлЗаписать ФайлИскать ФайлКопировать ФайлМожноЧитать ФайлОткрыть ФайлПереименовать ФайлПерекодировать ФайлПереместить ФайлПросмотреть ФайлРазмер ФайлСоздать ФайлСсылкаСоздать ФайлСуществует ФайлСчитать ФайлУдалить ФмтSQLДат ФмтДат ФмтСтр ФмтЧсл Формат ЦМассивЭлемент ЦНаборДанныхРеквизит ЦПодстр ",FE="AltState Application CallType ComponentTokens CreatedJobs CreatedNotices ControlState DialogResult Dialogs EDocuments EDocumentVersionSource Folders GlobalIDs Job Jobs InputValue LookUpReference LookUpRequisiteNames LookUpSearch Object ParentComponent Processes References Requisite ReportName Reports Result Scripts Searches SelectedAttachments SelectedItems SelectMode Sender ServerEvents ServiceFactory ShiftState SubTask SystemDialogs Tasks Wizard Wizards Work ВызовСпособ ИмяОтчета РеквЗнач ",cE="IApplication IAccessRights IAccountRepository IAccountSelectionRestrictions IAction IActionList IAdministrationHistoryDescription IAnchors IApplication IArchiveInfo IAttachment IAttachmentList ICheckListBox ICheckPointedList IColumn IComponent IComponentDescription IComponentToken IComponentTokenFactory IComponentTokenInfo ICompRecordInfo IConnection IContents IControl IControlJob IControlJobInfo IControlList ICrypto ICrypto2 ICustomJob ICustomJobInfo ICustomListBox ICustomObjectWizardStep ICustomWork ICustomWorkInfo IDataSet IDataSetAccessInfo IDataSigner IDateCriterion IDateRequisite IDateRequisiteDescription IDateValue IDeaAccessRights IDeaObjectInfo IDevelopmentComponentLock IDialog IDialogFactory IDialogPickRequisiteItems IDialogsFactory IDICSFactory IDocRequisite IDocumentInfo IDualListDialog IECertificate IECertificateInfo IECertificates IEditControl IEditorForm IEdmsExplorer IEdmsObject IEdmsObjectDescription IEdmsObjectFactory IEdmsObjectInfo IEDocument IEDocumentAccessRights IEDocumentDescription IEDocumentEditor IEDocumentFactory IEDocumentInfo IEDocumentStorage IEDocumentVersion IEDocumentVersionListDialog IEDocumentVersionSource IEDocumentWizardStep IEDocVerSignature IEDocVersionState IEnabledMode IEncodeProvider IEncrypter IEvent IEventList IException IExternalEvents IExternalHandler IFactory IField IFileDialog IFolder IFolderDescription IFolderDialog IFolderFactory IFolderInfo IForEach IForm IFormTitle IFormWizardStep IGlobalIDFactory IGlobalIDInfo IGrid IHasher IHistoryDescription IHyperLinkControl IImageButton IImageControl IInnerPanel IInplaceHint IIntegerCriterion IIntegerList IIntegerRequisite IIntegerValue IISBLEditorForm IJob IJobDescription IJobFactory IJobForm IJobInfo ILabelControl ILargeIntegerCriterion ILargeIntegerRequisite ILargeIntegerValue ILicenseInfo ILifeCycleStage IList IListBox ILocalIDInfo ILocalization ILock IMemoryDataSet IMessagingFactory IMetadataRepository INotice INoticeInfo INumericCriterion INumericRequisite INumericValue IObject IObjectDescription IObjectImporter IObjectInfo IObserver IPanelGroup IPickCriterion IPickProperty IPickRequisite IPickRequisiteDescription IPickRequisiteItem IPickRequisiteItems IPickValue IPrivilege IPrivilegeList IProcess IProcessFactory IProcessMessage IProgress IProperty IPropertyChangeEvent IQuery IReference IReferenceCriterion IReferenceEnabledMode IReferenceFactory IReferenceHistoryDescription IReferenceInfo IReferenceRecordCardWizardStep IReferenceRequisiteDescription IReferencesFactory IReferenceValue IRefRequisite IReport IReportFactory IRequisite IRequisiteDescription IRequisiteDescriptionList IRequisiteFactory IRichEdit IRouteStep IRule IRuleList ISchemeBlock IScript IScriptFactory ISearchCriteria ISearchCriterion ISearchDescription ISearchFactory ISearchFolderInfo ISearchForObjectDescription ISearchResultRestrictions ISecuredContext ISelectDialog IServerEvent IServerEventFactory IServiceDialog IServiceFactory ISignature ISignProvider ISignProvider2 ISignProvider3 ISimpleCriterion IStringCriterion IStringList IStringRequisite IStringRequisiteDescription IStringValue ISystemDialogsFactory ISystemInfo ITabSheet ITask ITaskAbortReasonInfo ITaskCardWizardStep ITaskDescription ITaskFactory ITaskInfo ITaskRoute ITextCriterion ITextRequisite ITextValue ITreeListSelectDialog IUser IUserList IValue IView IWebBrowserControl IWizard IWizardAction IWizardFactory IWizardFormElement IWizardParam IWizardPickParam IWizardReferenceParam IWizardStep IWorkAccessRights IWorkDescription IWorkflowAskableParam IWorkflowAskableParams IWorkflowBlock IWorkflowBlockResult IWorkflowEnabledMode IWorkflowParam IWorkflowPickParam IWorkflowReferenceParam IWorkState IWorkTreeCustomNode IWorkTreeJobNode IWorkTreeTaskNode IXMLEditorForm SBCrypto ",sE=w+aE,GE=FE,QE="null true false nil ",lE={
-cN:"number",b:S.NR,r:0},dE={cN:"string",v:[{b:'"',e:'"'},{b:"'",e:"'"}]},BE={cN:"doctag",b:"\\b(?:TODO|DONE|BEGIN|END|STUB|CHG|FIXME|NOTE|BUG|XXX)\\b",r:0},VE={cN:"comment",b:"//",e:"$",r:0,c:[S.PWM,BE]},HE={cN:"comment",b:"/\\*",e:"\\*/",r:0,c:[S.PWM,BE]},KE={v:[VE,HE]},mE={keyword:T,built_in:sE,"class":GE,literal:QE},uE={b:"\\.\\s*"+S.UIR,k:mE,r:0},pE={cN:"type",b:":[ \\t]*("+cE.trim().replace(/\s/g,"|")+")",e:"[ \\t]*=",eE:!0},fE={cN:"variable",l:E,k:mE,b:E,r:0,containts:[pE,uE]},gE=_+"\\(",WE={cN:"title",l:E,k:{built_in:ME},b:gE,e:"\\(",rB:!0,eE:!0},wE={cN:"function",b:gE,e:"\\)$",rB:!0,l:E,k:mE,i:"[\\[\\]\\|\\$\\?%,~#@]",c:[WE,uE,fE,dE,lE,KE]};return{aliases:["isbl"],cI:!0,l:E,k:mE,i:"\\$|\\?|%|,|;$|~|#|@|</",c:[wE,pE,uE,fE,dE,lE,KE]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/java.min.js b/vendor/assets/javascripts/highlightjs/languages/java.min.js
index c089aa488b..4b416c23f5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/java.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/java.min.js
@@ -1 +1 @@
-hljs.registerLanguage("java",function(e){var a="[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*",t=a+"(<"+a+"(\\s*,\\s*"+a+")*>)?",r="false synchronized int abstract float private char boolean var static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports do",s="\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",c={cN:"number",b:s,r:0};return{aliases:["jsp"],k:r,i:/<\/|#/,c:[e.C("/\\*\\*","\\*/",{r:0,c:[{b:/\w+@/,r:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,e.ASM,e.QSM,{cN:"class",bK:"class interface",e:/[{;=]/,eE:!0,k:"class interface",i:/[:"\[\]]/,c:[{bK:"extends implements"},e.UTM]},{bK:"new throw return else",r:0},{cN:"function",b:"("+t+"\\s+)+"+e.UIR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:r,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"params",b:/\(/,e:/\)/,k:r,r:0,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]},c,{cN:"meta",b:"@[A-Za-z]+"}]}});
\ No newline at end of file
+hljs.registerLanguage("java",function(){"use strict";return function(e){var a="false synchronized int abstract float private char boolean var static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports do",n={className:"meta",begin:"@[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*",contains:[{begin:/\(/,end:/\)/,contains:["self"]}]};return{name:"Java",aliases:["jsp"],keywords:a,illegal:/<\/|#/,contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0},{className:"doctag",begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"class",beginKeywords:"class interface",end:/[{;=]/,excludeEnd:!0,keywords:"class interface",illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"new throw return else",relevance:0},{className:"function",begin:"([À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(<[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(\\s*,\\s*[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*)*>)?\\s+)+"+e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:a,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/,keywords:a,relevance:0,contains:[n,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"number",begin:"\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",relevance:0},n]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/javascript.min.js b/vendor/assets/javascripts/highlightjs/languages/javascript.min.js
index 9eadc0a1ed..d3399d335f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/javascript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/javascript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("javascript",function(e){var r="[A-Za-z$_][0-9A-Za-z$_]*",t={keyword:"in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await static import from as",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise"},a={cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],r:0},n={cN:"subst",b:"\\$\\{",e:"\\}",k:t,c:[]},c={cN:"string",b:"`",e:"`",c:[e.BE,n]};n.c=[e.ASM,e.QSM,c,a,e.RM];var s=n.c.concat([e.CBCM,e.CLCM]);return{aliases:["js","jsx"],k:t,c:[{cN:"meta",r:10,b:/^\s*['"]use (strict|asm)['"]/},{cN:"meta",b:/^#!/,e:/$/},e.ASM,e.QSM,c,e.CLCM,e.CBCM,a,{b:/[{,]\s*/,r:0,c:[{b:r+"\\s*:",rB:!0,r:0,c:[{cN:"attr",b:r,r:0}]}]},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{cN:"function",b:"(\\(.*?\\)|"+r+")\\s*=>",rB:!0,e:"\\s*=>",c:[{cN:"params",v:[{b:r},{b:/\(\s*\)/},{b:/\(/,e:/\)/,eB:!0,eE:!0,k:t,c:s}]}]},{b:/</,e:/(\/\w+|\w+\/)>/,sL:"xml",c:[{b:/<\w+\s*\/>/,skip:!0},{b:/<\w+/,e:/(\/\w+|\w+\/)>/,skip:!0,c:[{b:/<\w+\s*\/>/,skip:!0},"self"]}]}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:r}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:s}],i:/\[|%/},{b:/\$[(.]/},e.METHOD_GUARD,{cN:"class",bK:"class",e:/[{;=]/,eE:!0,i:/[:"\[\]]/,c:[{bK:"extends"},e.UTM]},{bK:"constructor",e:/\{/,eE:!0}],i:/#(?!!)/}});
\ No newline at end of file
+hljs.registerLanguage("javascript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);function s(e){return r("(?=",e,")")}function r(...e){return e.map(e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n}).join("")}return function(t){var i="[A-Za-z$_][0-9A-Za-z$_]*",c={begin:/<[A-Za-z0-9\\._:-]+/,end:/\/[A-Za-z0-9\\._:-]+>|\/>/},o={$pattern:"[A-Za-z$_][0-9A-Za-z$_]*",keyword:e.join(" "),literal:n.join(" "),built_in:a.join(" ")},l={className:"number",variants:[{begin:"\\b(0[bB][01]+)n?"},{begin:"\\b(0[oO][0-7]+)n?"},{begin:t.C_NUMBER_RE+"n?"}],relevance:0},E={className:"subst",begin:"\\$\\{",end:"\\}",keywords:o,contains:[]},d={begin:"html`",end:"",starts:{end:"`",returnEnd:!1,contains:[t.BACKSLASH_ESCAPE,E],subLanguage:"xml"}},g={begin:"css`",end:"",starts:{end:"`",returnEnd:!1,contains:[t.BACKSLASH_ESCAPE,E],subLanguage:"css"}},u={className:"string",begin:"`",end:"`",contains:[t.BACKSLASH_ESCAPE,E]};E.contains=[t.APOS_STRING_MODE,t.QUOTE_STRING_MODE,d,g,u,l,t.REGEXP_MODE];var b=E.contains.concat([{begin:/\(/,end:/\)/,contains:["self"].concat(E.contains,[t.C_BLOCK_COMMENT_MODE,t.C_LINE_COMMENT_MODE])},t.C_BLOCK_COMMENT_MODE,t.C_LINE_COMMENT_MODE]),_={className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:b};return{name:"JavaScript",aliases:["js","jsx","mjs","cjs"],keywords:o,contains:[t.SHEBANG({binary:"node",relevance:5}),{className:"meta",relevance:10,begin:/^\s*['"]use (strict|asm)['"]/},t.APOS_STRING_MODE,t.QUOTE_STRING_MODE,d,g,u,t.C_LINE_COMMENT_MODE,t.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{className:"doctag",begin:"@[A-Za-z]+",contains:[{className:"type",begin:"\\{",end:"\\}",relevance:0},{className:"variable",begin:i+"(?=\\s*(-)|$)",endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]}),t.C_BLOCK_COMMENT_MODE,l,{begin:r(/[{,\n]\s*/,s(r(/(((\/\/.*)|(\/\*(.|\n)*\*\/))\s*)*/,i+"\\s*:"))),relevance:0,contains:[{className:"attr",begin:i+s("\\s*:"),relevance:0}]},{begin:"("+t.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",keywords:"return throw case",contains:[t.C_LINE_COMMENT_MODE,t.C_BLOCK_COMMENT_MODE,t.REGEXP_MODE,{className:"function",begin:"(\\([^(]*(\\([^(]*(\\([^(]*\\))?\\))?\\)|"+t.UNDERSCORE_IDENT_RE+")\\s*=>",returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{begin:t.UNDERSCORE_IDENT_RE},{className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:o,contains:b}]}]},{begin:/,/,relevance:0},{className:"",begin:/\s/,end:/\s*/,skip:!0},{variants:[{begin:"<>",end:"</>"},{begin:c.begin,end:c.end}],subLanguage:"xml",contains:[{begin:c.begin,end:c.end,skip:!0,contains:["self"]}]}],relevance:0},{className:"function",beginKeywords:"function",end:/\{/,excludeEnd:!0,contains:[t.inherit(t.TITLE_MODE,{begin:i}),_],illegal:/\[|%/},{begin:/\$[(.]/},t.METHOD_GUARD,{className:"class",beginKeywords:"class",end:/[{;=]/,excludeEnd:!0,illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends"},t.UNDERSCORE_TITLE_MODE]},{beginKeywords:"constructor",end:/\{/,excludeEnd:!0},{begin:"(get|set)\\s+(?="+i+"\\()",end:/{/,keywords:"get set",contains:[t.inherit(t.TITLE_MODE,{begin:i}),{begin:/\(\)/},_]}],illegal:/#(?!!)/}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/jboss-cli.min.js b/vendor/assets/javascripts/highlightjs/languages/jboss-cli.min.js
index 429b95ddf9..4743d33219 100644
--- a/vendor/assets/javascripts/highlightjs/languages/jboss-cli.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/jboss-cli.min.js
@@ -1 +1 @@
-hljs.registerLanguage("jboss-cli",function(e){var a={b:/[\w-]+ *=/,rB:!0,r:0,c:[{cN:"attr",b:/[\w-]+/}]},r={cN:"params",b:/\(/,e:/\)/,c:[a],r:0},o={cN:"function",b:/:[\w\-.]+/,r:0},t={cN:"string",b:/\B(([\/.])[\w\-.\/=]+)+/},c={cN:"params",b:/--[\w\-=\/]+/};return{aliases:["wildfly-cli"],l:"[a-z-]+",k:{keyword:"alias batch cd clear command connect connection-factory connection-info data-source deploy deployment-info deployment-overlay echo echo-dmr help history if jdbc-driver-info jms-queue|20 jms-topic|20 ls patch pwd quit read-attribute read-operation reload rollout-plan run-batch set shutdown try unalias undeploy unset version xa-data-source",literal:"true false"},c:[e.HCM,e.QSM,c,o,t,r]}});
\ No newline at end of file
+hljs.registerLanguage("jboss-cli",function(){"use strict";return function(e){return{name:"JBoss CLI",aliases:["wildfly-cli"],keywords:{$pattern:"[a-z-]+",keyword:"alias batch cd clear command connect connection-factory connection-info data-source deploy deployment-info deployment-overlay echo echo-dmr help history if jdbc-driver-info jms-queue|20 jms-topic|20 ls patch pwd quit read-attribute read-operation reload rollout-plan run-batch set shutdown try unalias undeploy unset version xa-data-source",literal:"true false"},contains:[e.HASH_COMMENT_MODE,e.QUOTE_STRING_MODE,{className:"params",begin:/--[\w\-=\/]+/},{className:"function",begin:/:[\w\-.]+/,relevance:0},{className:"string",begin:/\B(([\/.])[\w\-.\/=]+)+/},{className:"params",begin:/\(/,end:/\)/,contains:[{begin:/[\w-]+ *=/,returnBegin:!0,relevance:0,contains:[{className:"attr",begin:/[\w-]+/}]}],relevance:0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/json.min.js b/vendor/assets/javascripts/highlightjs/languages/json.min.js
index ffcb329c51..4a4f63c40f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/json.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/json.min.js
@@ -1 +1 @@
-hljs.registerLanguage("json",function(e){var i={literal:"true false null"},n=[e.QSM,e.CNM],r={e:",",eW:!0,eE:!0,c:n,k:i},t={b:"{",e:"}",c:[{cN:"attr",b:/"/,e:/"/,c:[e.BE],i:"\\n"},e.inherit(r,{b:/:/})],i:"\\S"},c={b:"\\[",e:"\\]",c:[e.inherit(r)],i:"\\S"};return n.splice(n.length,0,t,c),{c:n,k:i,i:"\\S"}});
\ No newline at end of file
+hljs.registerLanguage("json",function(){"use strict";return function(n){var e={literal:"true false null"},i=[n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE],t=[n.QUOTE_STRING_MODE,n.C_NUMBER_MODE],a={end:",",endsWithParent:!0,excludeEnd:!0,contains:t,keywords:e},l={begin:"{",end:"}",contains:[{className:"attr",begin:/"/,end:/"/,contains:[n.BACKSLASH_ESCAPE],illegal:"\\n"},n.inherit(a,{begin:/:/})].concat(i),illegal:"\\S"},s={begin:"\\[",end:"\\]",contains:[n.inherit(a)],illegal:"\\S"};return t.push(l,s),i.forEach((function(n){t.push(n)})),{name:"JSON",contains:t,keywords:e,illegal:"\\S"}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/julia-repl.min.js b/vendor/assets/javascripts/highlightjs/languages/julia-repl.min.js
index 26bb10c2be..02cd223a50 100644
--- a/vendor/assets/javascripts/highlightjs/languages/julia-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/julia-repl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("julia-repl",function(a){return{c:[{cN:"meta",b:/^julia>/,r:10,starts:{e:/^(?![ ]{6})/,sL:"julia"},aliases:["jldoctest"]}]}});
\ No newline at end of file
+hljs.registerLanguage("julia-repl",function(){"use strict";return function(e){return{name:"Julia REPL",contains:[{className:"meta",begin:/^julia>/,relevance:10,starts:{end:/^(?![ ]{6})/,subLanguage:"julia"},aliases:["jldoctest"]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/julia.min.js b/vendor/assets/javascripts/highlightjs/languages/julia.min.js
index 0cc7351281..0df157736b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/julia.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/julia.min.js
@@ -1 +1 @@
-hljs.registerLanguage("julia",function(e){var r={keyword:"in isa where baremodule begin break catch ccall const continue do else elseif end export false finally for function global if import importall let local macro module quote return true try using while type immutable abstract bitstype typealias ",literal:"true false ARGS C_NULL DevNull ENDIAN_BOM ENV I Inf Inf16 Inf32 Inf64 InsertionSort JULIA_HOME LOAD_PATH MergeSort NaN NaN16 NaN32 NaN64 PROGRAM_FILE QuickSort RoundDown RoundFromZero RoundNearest RoundNearestTiesAway RoundNearestTiesUp RoundToZero RoundUp STDERR STDIN STDOUT VERSION catalan e|0 eu|0 eulergamma golden im nothing pi γ π φ ",built_in:"ANY AbstractArray AbstractChannel AbstractFloat AbstractMatrix AbstractRNG AbstractSerializer AbstractSet AbstractSparseArray AbstractSparseMatrix AbstractSparseVector AbstractString AbstractUnitRange AbstractVecOrMat AbstractVector Any ArgumentError Array AssertionError Associative Base64DecodePipe Base64EncodePipe Bidiagonal BigFloat BigInt BitArray BitMatrix BitVector Bool BoundsError BufferStream CachingPool CapturedException CartesianIndex CartesianRange Cchar Cdouble Cfloat Channel Char Cint Cintmax_t Clong Clonglong ClusterManager Cmd CodeInfo Colon Complex Complex128 Complex32 Complex64 CompositeException Condition ConjArray ConjMatrix ConjVector Cptrdiff_t Cshort Csize_t Cssize_t Cstring Cuchar Cuint Cuintmax_t Culong Culonglong Cushort Cwchar_t Cwstring DataType Date DateFormat DateTime DenseArray DenseMatrix DenseVecOrMat DenseVector Diagonal Dict DimensionMismatch Dims DirectIndexString Display DivideError DomainError EOFError EachLine Enum Enumerate ErrorException Exception ExponentialBackOff Expr Factorization FileMonitor Float16 Float32 Float64 Function Future GlobalRef GotoNode HTML Hermitian IO IOBuffer IOContext IOStream IPAddr IPv4 IPv6 IndexCartesian IndexLinear IndexStyle InexactError InitError Int Int128 Int16 Int32 Int64 Int8 IntSet Integer InterruptException InvalidStateException Irrational KeyError LabelNode LinSpace LineNumberNode LoadError LowerTriangular MIME Matrix MersenneTwister Method MethodError MethodTable Module NTuple NewvarNode NullException Nullable Number ObjectIdDict OrdinalRange OutOfMemoryError OverflowError Pair ParseError PartialQuickSort PermutedDimsArray Pipe PollingFileWatcher ProcessExitedException Ptr QuoteNode RandomDevice Range RangeIndex Rational RawFD ReadOnlyMemoryError Real ReentrantLock Ref Regex RegexMatch RemoteChannel RemoteException RevString RoundingMode RowVector SSAValue SegmentationFault SerializationState Set SharedArray SharedMatrix SharedVector Signed SimpleVector Slot SlotNumber SparseMatrixCSC SparseVector StackFrame StackOverflowError StackTrace StepRange StepRangeLen StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubString SymTridiagonal Symbol Symmetric SystemError TCPSocket Task Text TextDisplay Timer Tridiagonal Tuple Type TypeError TypeMapEntry TypeMapLevel TypeName TypeVar TypedSlot UDPSocket UInt UInt128 UInt16 UInt32 UInt64 UInt8 UndefRefError UndefVarError UnicodeError UniformScaling Union UnionAll UnitRange Unsigned UpperTriangular Val Vararg VecElement VecOrMat Vector VersionNumber Void WeakKeyDict WeakRef WorkerConfig WorkerPool "},t="[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*",a={l:t,k:r,i:/<\//},n={cN:"number",b:/(\b0x[\d_]*(\.[\d_]*)?|0x\.\d[\d_]*)p[-+]?\d+|\b0[box][a-fA-F0-9][a-fA-F0-9_]*|(\b\d[\d_]*(\.[\d_]*)?|\.\d[\d_]*)([eEfF][-+]?\d+)?/,r:0},o={cN:"string",b:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},i={cN:"subst",b:/\$\(/,e:/\)/,k:r},l={cN:"variable",b:"\\$"+t},c={cN:"string",c:[e.BE,i,l],v:[{b:/\w*"""/,e:/"""\w*/,r:10},{b:/\w*"/,e:/"\w*/}]},s={cN:"string",c:[e.BE,i,l],b:"`",e:"`"},d={cN:"meta",b:"@"+t},u={cN:"comment",v:[{b:"#=",e:"=#",r:10},{b:"#",e:"$"}]};return a.c=[n,o,c,s,d,u,e.HCM,{cN:"keyword",b:"\\b(((abstract|primitive)\\s+)type|(mutable\\s+)?struct)\\b"},{b:/<:/}],i.c=a.c,a});
\ No newline at end of file
+hljs.registerLanguage("julia",function(){"use strict";return function(e){var r="[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*",t={$pattern:r,keyword:"in isa where baremodule begin break catch ccall const continue do else elseif end export false finally for function global if import importall let local macro module quote return true try using while type immutable abstract bitstype typealias ",literal:"true false ARGS C_NULL DevNull ENDIAN_BOM ENV I Inf Inf16 Inf32 Inf64 InsertionSort JULIA_HOME LOAD_PATH MergeSort NaN NaN16 NaN32 NaN64 PROGRAM_FILE QuickSort RoundDown RoundFromZero RoundNearest RoundNearestTiesAway RoundNearestTiesUp RoundToZero RoundUp STDERR STDIN STDOUT VERSION catalan e|0 eu|0 eulergamma golden im nothing pi γ π φ ",built_in:"ANY AbstractArray AbstractChannel AbstractFloat AbstractMatrix AbstractRNG AbstractSerializer AbstractSet AbstractSparseArray AbstractSparseMatrix AbstractSparseVector AbstractString AbstractUnitRange AbstractVecOrMat AbstractVector Any ArgumentError Array AssertionError Associative Base64DecodePipe Base64EncodePipe Bidiagonal BigFloat BigInt BitArray BitMatrix BitVector Bool BoundsError BufferStream CachingPool CapturedException CartesianIndex CartesianRange Cchar Cdouble Cfloat Channel Char Cint Cintmax_t Clong Clonglong ClusterManager Cmd CodeInfo Colon Complex Complex128 Complex32 Complex64 CompositeException Condition ConjArray ConjMatrix ConjVector Cptrdiff_t Cshort Csize_t Cssize_t Cstring Cuchar Cuint Cuintmax_t Culong Culonglong Cushort Cwchar_t Cwstring DataType Date DateFormat DateTime DenseArray DenseMatrix DenseVecOrMat DenseVector Diagonal Dict DimensionMismatch Dims DirectIndexString Display DivideError DomainError EOFError EachLine Enum Enumerate ErrorException Exception ExponentialBackOff Expr Factorization FileMonitor Float16 Float32 Float64 Function Future GlobalRef GotoNode HTML Hermitian IO IOBuffer IOContext IOStream IPAddr IPv4 IPv6 IndexCartesian IndexLinear IndexStyle InexactError InitError Int Int128 Int16 Int32 Int64 Int8 IntSet Integer InterruptException InvalidStateException Irrational KeyError LabelNode LinSpace LineNumberNode LoadError LowerTriangular MIME Matrix MersenneTwister Method MethodError MethodTable Module NTuple NewvarNode NullException Nullable Number ObjectIdDict OrdinalRange OutOfMemoryError OverflowError Pair ParseError PartialQuickSort PermutedDimsArray Pipe PollingFileWatcher ProcessExitedException Ptr QuoteNode RandomDevice Range RangeIndex Rational RawFD ReadOnlyMemoryError Real ReentrantLock Ref Regex RegexMatch RemoteChannel RemoteException RevString RoundingMode RowVector SSAValue SegmentationFault SerializationState Set SharedArray SharedMatrix SharedVector Signed SimpleVector Slot SlotNumber SparseMatrixCSC SparseVector StackFrame StackOverflowError StackTrace StepRange StepRangeLen StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubString SymTridiagonal Symbol Symmetric SystemError TCPSocket Task Text TextDisplay Timer Tridiagonal Tuple Type TypeError TypeMapEntry TypeMapLevel TypeName TypeVar TypedSlot UDPSocket UInt UInt128 UInt16 UInt32 UInt64 UInt8 UndefRefError UndefVarError UnicodeError UniformScaling Union UnionAll UnitRange Unsigned UpperTriangular Val Vararg VecElement VecOrMat Vector VersionNumber Void WeakKeyDict WeakRef WorkerConfig WorkerPool "},a={keywords:t,illegal:/<\//},n={className:"subst",begin:/\$\(/,end:/\)/,keywords:t},o={className:"variable",begin:"\\$"+r},i={className:"string",contains:[e.BACKSLASH_ESCAPE,n,o],variants:[{begin:/\w*"""/,end:/"""\w*/,relevance:10},{begin:/\w*"/,end:/"\w*/}]},l={className:"string",contains:[e.BACKSLASH_ESCAPE,n,o],begin:"`",end:"`"},s={className:"meta",begin:"@"+r};return a.name="Julia",a.contains=[{className:"number",begin:/(\b0x[\d_]*(\.[\d_]*)?|0x\.\d[\d_]*)p[-+]?\d+|\b0[box][a-fA-F0-9][a-fA-F0-9_]*|(\b\d[\d_]*(\.[\d_]*)?|\.\d[\d_]*)([eEfF][-+]?\d+)?/,relevance:0},{className:"string",begin:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},i,l,s,{className:"comment",variants:[{begin:"#=",end:"=#",relevance:10},{begin:"#",end:"$"}]},e.HASH_COMMENT_MODE,{className:"keyword",begin:"\\b(((abstract|primitive)\\s+)type|(mutable\\s+)?struct)\\b"},{begin:/<:/}],n.contains=a.contains,a}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/kotlin.min.js b/vendor/assets/javascripts/highlightjs/languages/kotlin.min.js
index f5bef33709..0dd71d7a53 100644
--- a/vendor/assets/javascripts/highlightjs/languages/kotlin.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/kotlin.min.js
@@ -1 +1 @@
-hljs.registerLanguage("kotlin",function(e){var t={keyword:"abstract as val var vararg get set class object open private protected public noinline crossinline dynamic final enum if else do while for when throw try catch finally import package is in fun override companion reified inline lateinit init interface annotation data sealed internal infix operator out by constructor super tailrec where const inner suspend typealias external expect actual trait volatile transient native default",built_in:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",literal:"true false null"},r={cN:"keyword",b:/\b(break|continue|return|this)\b/,starts:{c:[{cN:"symbol",b:/@\w+/}]}},a={cN:"symbol",b:e.UIR+"@"},i={cN:"subst",b:"\\${",e:"}",c:[e.ASM,e.CNM]},n={cN:"variable",b:"\\$"+e.UIR},c={cN:"string",v:[{b:'"""',e:'"""',c:[n,i]},{b:"'",e:"'",i:/\n/,c:[e.BE]},{b:'"',e:'"',i:/\n/,c:[e.BE,n,i]}]},s={cN:"meta",b:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UIR+")?"},l={cN:"meta",b:"@"+e.UIR,c:[{b:/\(/,e:/\)/,c:[e.inherit(c,{cN:"meta-string"})]}]},b="\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",o={cN:"number",b:b,r:0};return{aliases:["kt"],k:t,c:[e.C("/\\*\\*","\\*/",{r:0,c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,r,a,s,l,{cN:"function",bK:"fun",e:"[(]|$",rB:!0,eE:!0,k:t,i:/fun\s+(<.*>)?[^\s\(]+(\s+[^\s\(]+)\s*=/,r:5,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"type",b:/</,e:/>/,k:"reified",r:0},{cN:"params",b:/\(/,e:/\)/,endsParent:!0,k:t,r:0,c:[{b:/:/,e:/[=,\/]/,eW:!0,c:[{cN:"type",b:e.UIR},e.CLCM,e.CBCM],r:0},e.CLCM,e.CBCM,s,l,c,e.CNM]},e.CBCM]},{cN:"class",bK:"class interface trait",e:/[:\{(]|$/,eE:!0,i:"extends implements",c:[{bK:"public protected internal private constructor"},e.UTM,{cN:"type",b:/</,e:/>/,eB:!0,eE:!0,r:0},{cN:"type",b:/[,:]\s*/,e:/[<\(,]|$/,eB:!0,rE:!0},s,l]},c,{cN:"meta",b:"^#!/usr/bin/env",e:"$",i:"\n"},o]}});
\ No newline at end of file
+hljs.registerLanguage("kotlin",function(){"use strict";return function(e){var n={keyword:"abstract as val var vararg get set class object open private protected public noinline crossinline dynamic final enum if else do while for when throw try catch finally import package is in fun override companion reified inline lateinit init interface annotation data sealed internal infix operator out by constructor super tailrec where const inner suspend typealias external expect actual trait volatile transient native default",built_in:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",literal:"true false null"},a={className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"@"},i={className:"subst",begin:"\\${",end:"}",contains:[e.C_NUMBER_MODE]},s={className:"variable",begin:"\\$"+e.UNDERSCORE_IDENT_RE},t={className:"string",variants:[{begin:'"""',end:'"""(?=[^"])',contains:[s,i]},{begin:"'",end:"'",illegal:/\n/,contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"',illegal:/\n/,contains:[e.BACKSLASH_ESCAPE,s,i]}]};i.contains.push(t);var r={className:"meta",begin:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UNDERSCORE_IDENT_RE+")?"},l={className:"meta",begin:"@"+e.UNDERSCORE_IDENT_RE,contains:[{begin:/\(/,end:/\)/,contains:[e.inherit(t,{className:"meta-string"})]}]},c=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),o={variants:[{className:"type",begin:e.UNDERSCORE_IDENT_RE},{begin:/\(/,end:/\)/,contains:[]}]},d=o;return d.variants[1].contains=[o],o.variants[1].contains=[d],{name:"Kotlin",aliases:["kt"],keywords:n,contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{className:"doctag",begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,c,{className:"keyword",begin:/\b(break|continue|return|this)\b/,starts:{contains:[{className:"symbol",begin:/@\w+/}]}},a,r,l,{className:"function",beginKeywords:"fun",end:"[(]|$",returnBegin:!0,excludeEnd:!0,keywords:n,illegal:/fun\s+(<.*>)?[^\s\(]+(\s+[^\s\(]+)\s*=/,relevance:5,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"type",begin:/</,end:/>/,keywords:"reified",relevance:0},{className:"params",begin:/\(/,end:/\)/,endsParent:!0,keywords:n,relevance:0,contains:[{begin:/:/,end:/[=,\/]/,endsWithParent:!0,contains:[o,e.C_LINE_COMMENT_MODE,c],relevance:0},e.C_LINE_COMMENT_MODE,c,r,l,t,e.C_NUMBER_MODE]},c]},{className:"class",beginKeywords:"class interface trait",end:/[:\{(]|$/,excludeEnd:!0,illegal:"extends implements",contains:[{beginKeywords:"public protected internal private constructor"},e.UNDERSCORE_TITLE_MODE,{className:"type",begin:/</,end:/>/,excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:/[,:]\s*/,end:/[<\(,]|$/,excludeBegin:!0,returnEnd:!0},r,l]},t,{className:"meta",begin:"^#!/usr/bin/env",end:"$",illegal:"\n"},{className:"number",begin:"\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",relevance:0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/lasso.min.js b/vendor/assets/javascripts/highlightjs/languages/lasso.min.js
index f8f570f6eb..c6c4aac7c7 100644
--- a/vendor/assets/javascripts/highlightjs/languages/lasso.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/lasso.min.js
@@ -1 +1 @@
-hljs.registerLanguage("lasso",function(e){var r="[a-zA-Z_][\\w.]*",a="<\\?(lasso(script)?|=)",t="\\]|\\?>",n={literal:"true false none minimal full all void and or not bw nbw ew new cn ncn lt lte gt gte eq neq rx nrx ft",built_in:"array date decimal duration integer map pair string tag xml null boolean bytes keyword list locale queue set stack staticarray local var variable global data self inherited currentcapture givenblock",keyword:"cache database_names database_schemanames database_tablenames define_tag define_type email_batch encode_set html_comment handle handle_error header if inline iterate ljax_target link link_currentaction link_currentgroup link_currentrecord link_detail link_firstgroup link_firstrecord link_lastgroup link_lastrecord link_nextgroup link_nextrecord link_prevgroup link_prevrecord log loop namespace_using output_none portal private protect records referer referrer repeating resultset rows search_args search_arguments select sort_args sort_arguments thread_atomic value_list while abort case else fail_if fail_ifnot fail if_empty if_false if_null if_true loop_abort loop_continue loop_count params params_up return return_value run_children soap_definetag soap_lastrequest soap_lastresponse tag_name ascending average by define descending do equals frozen group handle_failure import in into join let match max min on order parent protected provide public require returnhome skip split_thread sum take thread to trait type where with yield yieldhome"},i=e.C("<!--","-->",{r:0}),s={cN:"meta",b:"\\[noprocess\\]",starts:{e:"\\[/noprocess\\]",rE:!0,c:[i]}},l={cN:"meta",b:"\\[/noprocess|"+a},o={cN:"symbol",b:"'"+r+"'"},c=[e.CLCM,e.CBCM,e.inherit(e.CNM,{b:e.CNR+"|(-?infinity|NaN)\\b"}),e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null}),{cN:"string",b:"`",e:"`"},{v:[{b:"[#$]"+r},{b:"#",e:"\\d+",i:"\\W"}]},{cN:"type",b:"::\\s*",e:r,i:"\\W"},{cN:"params",v:[{b:"-(?!infinity)"+r,r:0},{b:"(\\.\\.\\.)"}]},{b:/(->|\.)\s*/,r:0,c:[o]},{cN:"class",bK:"define",rE:!0,e:"\\(|=>",c:[e.inherit(e.TM,{b:r+"(=(?!>))?|[-+*/%](?!>)"})]}];return{aliases:["ls","lassoscript"],cI:!0,l:r+"|&[lg]t;",k:n,c:[{cN:"meta",b:t,r:0,starts:{e:"\\[|"+a,rE:!0,r:0,c:[i]}},s,l,{cN:"meta",b:"\\[no_square_brackets",starts:{e:"\\[/no_square_brackets\\]",l:r+"|&[lg]t;",k:n,c:[{cN:"meta",b:t,r:0,starts:{e:"\\[noprocess\\]|"+a,rE:!0,c:[i]}},s,l].concat(c)}},{cN:"meta",b:"\\[",r:0},{cN:"meta",b:"^#!",e:"lasso9$",r:10}].concat(c)}});
\ No newline at end of file
+hljs.registerLanguage("lasso",function(){"use strict";return function(e){var a="\\]|\\?>",n={$pattern:"[a-zA-Z_][\\w.]*|&[lg]t;",literal:"true false none minimal full all void and or not bw nbw ew new cn ncn lt lte gt gte eq neq rx nrx ft",built_in:"array date decimal duration integer map pair string tag xml null boolean bytes keyword list locale queue set stack staticarray local var variable global data self inherited currentcapture givenblock",keyword:"cache database_names database_schemanames database_tablenames define_tag define_type email_batch encode_set html_comment handle handle_error header if inline iterate ljax_target link link_currentaction link_currentgroup link_currentrecord link_detail link_firstgroup link_firstrecord link_lastgroup link_lastrecord link_nextgroup link_nextrecord link_prevgroup link_prevrecord log loop namespace_using output_none portal private protect records referer referrer repeating resultset rows search_args search_arguments select sort_args sort_arguments thread_atomic value_list while abort case else fail_if fail_ifnot fail if_empty if_false if_null if_true loop_abort loop_continue loop_count params params_up return return_value run_children soap_definetag soap_lastrequest soap_lastresponse tag_name ascending average by define descending do equals frozen group handle_failure import in into join let match max min on order parent protected provide public require returnhome skip split_thread sum take thread to trait type where with yield yieldhome"},r=e.COMMENT("\x3c!--","--\x3e",{relevance:0}),t={className:"meta",begin:"\\[noprocess\\]",starts:{end:"\\[/noprocess\\]",returnEnd:!0,contains:[r]}},s={className:"meta",begin:"\\[/noprocess|<\\?(lasso(script)?|=)"},i=[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.inherit(e.C_NUMBER_MODE,{begin:e.C_NUMBER_RE+"|(-?infinity|NaN)\\b"}),e.inherit(e.APOS_STRING_MODE,{illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),{className:"string",begin:"`",end:"`"},{variants:[{begin:"[#$][a-zA-Z_][\\w.]*"},{begin:"#",end:"\\d+",illegal:"\\W"}]},{className:"type",begin:"::\\s*",end:"[a-zA-Z_][\\w.]*",illegal:"\\W"},{className:"params",variants:[{begin:"-(?!infinity)[a-zA-Z_][\\w.]*",relevance:0},{begin:"(\\.\\.\\.)"}]},{begin:/(->|\.)\s*/,relevance:0,contains:[{className:"symbol",begin:"'[a-zA-Z_][\\w.]*'"}]},{className:"class",beginKeywords:"define",returnEnd:!0,end:"\\(|=>",contains:[e.inherit(e.TITLE_MODE,{begin:"[a-zA-Z_][\\w.]*(=(?!>))?|[-+*/%](?!>)"})]}];return{name:"Lasso",aliases:["ls","lassoscript"],case_insensitive:!0,keywords:n,contains:[{className:"meta",begin:a,relevance:0,starts:{end:"\\[|<\\?(lasso(script)?|=)",returnEnd:!0,relevance:0,contains:[r]}},t,s,{className:"meta",begin:"\\[no_square_brackets",starts:{end:"\\[/no_square_brackets\\]",keywords:n,contains:[{className:"meta",begin:a,relevance:0,starts:{end:"\\[noprocess\\]|<\\?(lasso(script)?|=)",returnEnd:!0,contains:[r]}},t,s].concat(i)}},{className:"meta",begin:"\\[",relevance:0},{className:"meta",begin:"^#!",end:"lasso9$",relevance:10}].concat(i)}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/latex.min.js b/vendor/assets/javascripts/highlightjs/languages/latex.min.js
new file mode 100644
index 0000000000..aa36ad2b37
--- /dev/null
+++ b/vendor/assets/javascripts/highlightjs/languages/latex.min.js
@@ -0,0 +1 @@
+hljs.registerLanguage("latex",function(){"use strict";return function(e){var n={className:"tag",begin:/\\/,relevance:0,contains:[{className:"name",variants:[{begin:/[a-zA-Z\u0430-\u044f\u0410-\u042f]+[*]?/},{begin:/[^a-zA-Z\u0430-\u044f\u0410-\u042f0-9]/}],starts:{endsWithParent:!0,relevance:0,contains:[{className:"string",variants:[{begin:/\[/,end:/\]/},{begin:/\{/,end:/\}/}]},{begin:/\s*=\s*/,endsWithParent:!0,relevance:0,contains:[{className:"number",begin:/-?\d*\.?\d+(pt|pc|mm|cm|in|dd|cc|ex|em)?/}]}]}}]};return{name:"LaTeX",aliases:["tex"],contains:[n,{className:"formula",contains:[n],relevance:0,variants:[{begin:/\$\$/,end:/\$\$/},{begin:/\$/,end:/\$/}]},e.COMMENT("%","$",{relevance:0})]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ldif.min.js b/vendor/assets/javascripts/highlightjs/languages/ldif.min.js
index 40ed37144e..7f4fff9f0e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ldif.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ldif.min.js
@@ -1 +1 @@
-hljs.registerLanguage("ldif",function(e){return{c:[{cN:"attribute",b:"^dn",e:": ",eE:!0,starts:{e:"$",r:0},r:10},{cN:"attribute",b:"^\\w",e:": ",eE:!0,starts:{e:"$",r:0}},{cN:"literal",b:"^-",e:"$"},e.HCM]}});
\ No newline at end of file
+hljs.registerLanguage("ldif",function(){"use strict";return function(e){return{name:"LDIF",contains:[{className:"attribute",begin:"^dn",end:": ",excludeEnd:!0,starts:{end:"$",relevance:0},relevance:10},{className:"attribute",begin:"^\\w",end:": ",excludeEnd:!0,starts:{end:"$",relevance:0}},{className:"literal",begin:"^-",end:"$"},e.HASH_COMMENT_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/leaf.min.js b/vendor/assets/javascripts/highlightjs/languages/leaf.min.js
index b75f1048b8..36c2625447 100644
--- a/vendor/assets/javascripts/highlightjs/languages/leaf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/leaf.min.js
@@ -1 +1 @@
-hljs.registerLanguage("leaf",function(e){return{c:[{cN:"function",b:"#+[A-Za-z_0-9]*\\(",e:" {",rB:!0,eE:!0,c:[{cN:"keyword",b:"#+"},{cN:"title",b:"[A-Za-z_][A-Za-z_0-9]*"},{cN:"params",b:"\\(",e:"\\)",endsParent:!0,c:[{cN:"string",b:'"',e:'"'},{cN:"variable",b:"[A-Za-z_][A-Za-z_0-9]*"}]}]}]}});
\ No newline at end of file
+hljs.registerLanguage("leaf",function(){"use strict";return function(e){return{name:"Leaf",contains:[{className:"function",begin:"#+[A-Za-z_0-9]*\\(",end:" {",returnBegin:!0,excludeEnd:!0,contains:[{className:"keyword",begin:"#+"},{className:"title",begin:"[A-Za-z_][A-Za-z_0-9]*"},{className:"params",begin:"\\(",end:"\\)",endsParent:!0,contains:[{className:"string",begin:'"',end:'"'},{className:"variable",begin:"[A-Za-z_][A-Za-z_0-9]*"}]}]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/less.min.js b/vendor/assets/javascripts/highlightjs/languages/less.min.js
index f368e40e8a..878011f1cd 100644
--- a/vendor/assets/javascripts/highlightjs/languages/less.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/less.min.js
@@ -1 +1 @@
-hljs.registerLanguage("less",function(e){var r="[\\w-]+",t="("+r+"|@{"+r+"})",a=[],c=[],s=function(e){return{cN:"string",b:"~?"+e+".*?"+e}},b=function(e,r,t){return{cN:e,b:r,r:t}},n={b:"\\(",e:"\\)",c:c,r:0};c.push(e.CLCM,e.CBCM,s("'"),s('"'),e.CSSNM,{b:"(url|data-uri)\\(",starts:{cN:"string",e:"[\\)\\n]",eE:!0}},b("number","#[0-9A-Fa-f]+\\b"),n,b("variable","@@?"+r,10),b("variable","@{"+r+"}"),b("built_in","~?`[^`]*?`"),{cN:"attribute",b:r+"\\s*:",e:":",rB:!0,eE:!0},{cN:"meta",b:"!important"});var i=c.concat({b:"{",e:"}",c:a}),o={bK:"when",eW:!0,c:[{bK:"and not"}].concat(c)},u={b:t+"\\s*:",rB:!0,e:"[;}]",r:0,c:[{cN:"attribute",b:t,e:":",eE:!0,starts:{eW:!0,i:"[<=$]",r:0,c:c}}]},l={cN:"keyword",b:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",starts:{e:"[;{}]",rE:!0,c:c,r:0}},C={cN:"variable",v:[{b:"@"+r+"\\s*:",r:15},{b:"@"+r}],starts:{e:"[;}]",rE:!0,c:i}},p={v:[{b:"[\\.#:&\\[>]",e:"[;{}]"},{b:t,e:"{"}],rB:!0,rE:!0,i:"[<='$\"]",r:0,c:[e.CLCM,e.CBCM,o,b("keyword","all\\b"),b("variable","@{"+r+"}"),b("selector-tag",t+"%?",0),b("selector-id","#"+t),b("selector-class","\\."+t,0),b("selector-tag","&",0),{cN:"selector-attr",b:"\\[",e:"\\]"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"\\(",e:"\\)",c:i},{b:"!important"}]};return a.push(e.CLCM,e.CBCM,l,C,u,p),{cI:!0,i:"[=>'/<($\"]",c:a}});
\ No newline at end of file
+hljs.registerLanguage("less",function(){"use strict";return function(e){var n=[],a=[],s=function(e){return{className:"string",begin:"~?"+e+".*?"+e}},t=function(e,n,a){return{className:e,begin:n,relevance:a}},r={begin:"\\(",end:"\\)",contains:a,relevance:0};a.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s("'"),s('"'),e.CSS_NUMBER_MODE,{begin:"(url|data-uri)\\(",starts:{className:"string",end:"[\\)\\n]",excludeEnd:!0}},t("number","#[0-9A-Fa-f]+\\b"),r,t("variable","@@?[\\w-]+",10),t("variable","@{[\\w-]+}"),t("built_in","~?`[^`]*?`"),{className:"attribute",begin:"[\\w-]+\\s*:",end:":",returnBegin:!0,excludeEnd:!0},{className:"meta",begin:"!important"});var i=a.concat({begin:"{",end:"}",contains:n}),c={beginKeywords:"when",endsWithParent:!0,contains:[{beginKeywords:"and not"}].concat(a)},l={begin:"([\\w-]+|@{[\\w-]+})\\s*:",returnBegin:!0,end:"[;}]",relevance:0,contains:[{className:"attribute",begin:"([\\w-]+|@{[\\w-]+})",end:":",excludeEnd:!0,starts:{endsWithParent:!0,illegal:"[<=$]",relevance:0,contains:a}}]},o={className:"keyword",begin:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",starts:{end:"[;{}]",returnEnd:!0,contains:a,relevance:0}},g={className:"variable",variants:[{begin:"@[\\w-]+\\s*:",relevance:15},{begin:"@[\\w-]+"}],starts:{end:"[;}]",returnEnd:!0,contains:i}},d={variants:[{begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:"([\\w-]+|@{[\\w-]+})",end:"{"}],returnBegin:!0,returnEnd:!0,illegal:"[<='$\"]",relevance:0,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,c,t("keyword","all\\b"),t("variable","@{[\\w-]+}"),t("selector-tag","([\\w-]+|@{[\\w-]+})%?",0),t("selector-id","#([\\w-]+|@{[\\w-]+})"),t("selector-class","\\.([\\w-]+|@{[\\w-]+})",0),t("selector-tag","&",0),{className:"selector-attr",begin:"\\[",end:"\\]"},{className:"selector-pseudo",begin:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{begin:"\\(",end:"\\)",contains:i},{begin:"!important"}]};return n.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,o,g,l,d),{name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:n}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/lisp.min.js b/vendor/assets/javascripts/highlightjs/languages/lisp.min.js
index b2747ab3d7..28a6668273 100644
--- a/vendor/assets/javascripts/highlightjs/languages/lisp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/lisp.min.js
@@ -1 +1 @@
-hljs.registerLanguage("lisp",function(b){var e="[a-zA-Z_\\-\\+\\*\\/\\<\\=\\>\\&\\#][a-zA-Z0-9_\\-\\+\\*\\/\\<\\=\\>\\&\\#!]*",c="\\|[^]*?\\|",r="(\\-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s|D|E|F|L|S)(\\+|\\-)?\\d+)?",a={cN:"meta",b:"^#!",e:"$"},l={cN:"literal",b:"\\b(t{1}|nil)\\b"},n={cN:"number",v:[{b:r,r:0},{b:"#(b|B)[0-1]+(/[0-1]+)?"},{b:"#(o|O)[0-7]+(/[0-7]+)?"},{b:"#(x|X)[0-9a-fA-F]+(/[0-9a-fA-F]+)?"},{b:"#(c|C)\\("+r+" +"+r,e:"\\)"}]},i=b.inherit(b.QSM,{i:null}),t=b.C(";","$",{r:0}),s={b:"\\*",e:"\\*"},u={cN:"symbol",b:"[:&]"+e},d={b:e,r:0},f={b:c},m={b:"\\(",e:"\\)",c:["self",l,i,n,d]},o={c:[n,i,s,u,m,d],v:[{b:"['`]\\(",e:"\\)"},{b:"\\(quote ",e:"\\)",k:{name:"quote"}},{b:"'"+c}]},v={v:[{b:"'"+e},{b:"#'"+e+"(::"+e+")*"}]},N={b:"\\(\\s*",e:"\\)"},A={eW:!0,r:0};return N.c=[{cN:"name",v:[{b:e},{b:c}]},A],A.c=[o,v,N,l,n,i,t,s,u,f,d],{i:/\S/,c:[n,a,l,i,t,o,v,N,d]}});
\ No newline at end of file
+hljs.registerLanguage("lisp",function(){"use strict";return function(e){var n="[a-zA-Z_\\-\\+\\*\\/\\<\\=\\>\\&\\#][a-zA-Z0-9_\\-\\+\\*\\/\\<\\=\\>\\&\\#!]*",i="(\\-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s|D|E|F|L|S)(\\+|\\-)?\\d+)?",a={className:"literal",begin:"\\b(t{1}|nil)\\b"},s={className:"number",variants:[{begin:i,relevance:0},{begin:"#(b|B)[0-1]+(/[0-1]+)?"},{begin:"#(o|O)[0-7]+(/[0-7]+)?"},{begin:"#(x|X)[0-9a-fA-F]+(/[0-9a-fA-F]+)?"},{begin:"#(c|C)\\("+i+" +"+i,end:"\\)"}]},b=e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),g=e.COMMENT(";","$",{relevance:0}),l={begin:"\\*",end:"\\*"},t={className:"symbol",begin:"[:&]"+n},r={begin:n,relevance:0},c={contains:[s,b,l,t,{begin:"\\(",end:"\\)",contains:["self",a,b,s,r]},r],variants:[{begin:"['`]\\(",end:"\\)"},{begin:"\\(quote ",end:"\\)",keywords:{name:"quote"}},{begin:"'\\|[^]*?\\|"}]},d={variants:[{begin:"'"+n},{begin:"#'"+n+"(::"+n+")*"}]},o={begin:"\\(\\s*",end:"\\)"},u={endsWithParent:!0,relevance:0};return o.contains=[{className:"name",variants:[{begin:n},{begin:"\\|[^]*?\\|"}]},u],u.contains=[c,d,o,a,s,b,g,l,t,{begin:"\\|[^]*?\\|"},r],{name:"Lisp",illegal:/\S/,contains:[s,e.SHEBANG(),a,b,g,c,d,o,r]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/livecodeserver.min.js b/vendor/assets/javascripts/highlightjs/languages/livecodeserver.min.js
index 65e89e4d26..cda2207a9b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/livecodeserver.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/livecodeserver.min.js
@@ -1 +1 @@
-hljs.registerLanguage("livecodeserver",function(e){var r={b:"\\b[gtps][A-Z]+[A-Za-z0-9_\\-]*\\b|\\$_[A-Z]+",r:0},t=[e.CBCM,e.HCM,e.C("--","$"),e.C("[^:]//","$")],a=e.inherit(e.TM,{v:[{b:"\\b_*rig[A-Z]+[A-Za-z0-9_\\-]*"},{b:"\\b_[a-z0-9\\-]+"}]}),o=e.inherit(e.TM,{b:"\\b([A-Za-z0-9_\\-]+)\\b"});return{cI:!1,k:{keyword:"$_COOKIE $_FILES $_GET $_GET_BINARY $_GET_RAW $_POST $_POST_BINARY $_POST_RAW $_SESSION $_SERVER codepoint codepoints segment segments codeunit codeunits sentence sentences trueWord trueWords paragraph after byte bytes english the until http forever descending using line real8 with seventh for stdout finally element word words fourth before black ninth sixth characters chars stderr uInt1 uInt1s uInt2 uInt2s stdin string lines relative rel any fifth items from middle mid at else of catch then third it file milliseconds seconds second secs sec int1 int1s int4 int4s internet int2 int2s normal text item last long detailed effective uInt4 uInt4s repeat end repeat URL in try into switch to words https token binfile each tenth as ticks tick system real4 by dateItems without char character ascending eighth whole dateTime numeric short first ftp integer abbreviated abbr abbrev private case while if div mod wrap and or bitAnd bitNot bitOr bitXor among not in a an within contains ends with begins the keys of keys",literal:"SIX TEN FORMFEED NINE ZERO NONE SPACE FOUR FALSE COLON CRLF PI COMMA ENDOFFILE EOF EIGHT FIVE QUOTE EMPTY ONE TRUE RETURN CR LINEFEED RIGHT BACKSLASH NULL SEVEN TAB THREE TWO six ten formfeed nine zero none space four false colon crlf pi comma endoffile eof eight five quote empty one true return cr linefeed right backslash null seven tab three two RIVERSION RISTATE FILE_READ_MODE FILE_WRITE_MODE FILE_WRITE_MODE DIR_WRITE_MODE FILE_READ_UMASK FILE_WRITE_UMASK DIR_READ_UMASK DIR_WRITE_UMASK",built_in:"put abs acos aliasReference annuity arrayDecode arrayEncode asin atan atan2 average avg avgDev base64Decode base64Encode baseConvert binaryDecode binaryEncode byteOffset byteToNum cachedURL cachedURLs charToNum cipherNames codepointOffset codepointProperty codepointToNum codeunitOffset commandNames compound compress constantNames cos date dateFormat decompress directories diskSpace DNSServers exp exp1 exp2 exp10 extents files flushEvents folders format functionNames geometricMean global globals hasMemory harmonicMean hostAddress hostAddressToName hostName hostNameToAddress isNumber ISOToMac itemOffset keys len length libURLErrorData libUrlFormData libURLftpCommand libURLLastHTTPHeaders libURLLastRHHeaders libUrlMultipartFormAddPart libUrlMultipartFormData libURLVersion lineOffset ln ln1 localNames log log2 log10 longFilePath lower macToISO matchChunk matchText matrixMultiply max md5Digest median merge millisec millisecs millisecond milliseconds min monthNames nativeCharToNum normalizeText num number numToByte numToChar numToCodepoint numToNativeChar offset open openfiles openProcesses openProcessIDs openSockets paragraphOffset paramCount param params peerAddress pendingMessages platform popStdDev populationStandardDeviation populationVariance popVariance processID random randomBytes replaceText result revCreateXMLTree revCreateXMLTreeFromFile revCurrentRecord revCurrentRecordIsFirst revCurrentRecordIsLast revDatabaseColumnCount revDatabaseColumnIsNull revDatabaseColumnLengths revDatabaseColumnNames revDatabaseColumnNamed revDatabaseColumnNumbered revDatabaseColumnTypes revDatabaseConnectResult revDatabaseCursors revDatabaseID revDatabaseTableNames revDatabaseType revDataFromQuery revdb_closeCursor revdb_columnbynumber revdb_columncount revdb_columnisnull revdb_columnlengths revdb_columnnames revdb_columntypes revdb_commit revdb_connect revdb_connections revdb_connectionerr revdb_currentrecord revdb_cursorconnection revdb_cursorerr revdb_cursors revdb_dbtype revdb_disconnect revdb_execute revdb_iseof revdb_isbof revdb_movefirst revdb_movelast revdb_movenext revdb_moveprev revdb_query revdb_querylist revdb_recordcount revdb_rollback revdb_tablenames revGetDatabaseDriverPath revNumberOfRecords revOpenDatabase revOpenDatabases revQueryDatabase revQueryDatabaseBlob revQueryResult revQueryIsAtStart revQueryIsAtEnd revUnixFromMacPath revXMLAttribute revXMLAttributes revXMLAttributeValues revXMLChildContents revXMLChildNames revXMLCreateTreeFromFileWithNamespaces revXMLCreateTreeWithNamespaces revXMLDataFromXPathQuery revXMLEvaluateXPath revXMLFirstChild revXMLMatchingNode revXMLNextSibling revXMLNodeContents revXMLNumberOfChildren revXMLParent revXMLPreviousSibling revXMLRootNode revXMLRPC_CreateRequest revXMLRPC_Documents revXMLRPC_Error revXMLRPC_GetHost revXMLRPC_GetMethod revXMLRPC_GetParam revXMLText revXMLRPC_Execute revXMLRPC_GetParamCount revXMLRPC_GetParamNode revXMLRPC_GetParamType revXMLRPC_GetPath revXMLRPC_GetPort revXMLRPC_GetProtocol revXMLRPC_GetRequest revXMLRPC_GetResponse revXMLRPC_GetSocket revXMLTree revXMLTrees revXMLValidateDTD revZipDescribeItem revZipEnumerateItems revZipOpenArchives round sampVariance sec secs seconds sentenceOffset sha1Digest shell shortFilePath sin specialFolderPath sqrt standardDeviation statRound stdDev sum sysError systemVersion tan tempName textDecode textEncode tick ticks time to tokenOffset toLower toUpper transpose truewordOffset trunc uniDecode uniEncode upper URLDecode URLEncode URLStatus uuid value variableNames variance version waitDepth weekdayNames wordOffset xsltApplyStylesheet xsltApplyStylesheetFromFile xsltLoadStylesheet xsltLoadStylesheetFromFile add breakpoint cancel clear local variable file word line folder directory URL close socket process combine constant convert create new alias folder directory decrypt delete variable word line folder directory URL dispatch divide do encrypt filter get include intersect kill libURLDownloadToFile libURLFollowHttpRedirects libURLftpUpload libURLftpUploadFile libURLresetAll libUrlSetAuthCallback libURLSetCustomHTTPHeaders libUrlSetExpect100 libURLSetFTPListCommand libURLSetFTPMode libURLSetFTPStopTime libURLSetStatusCallback load multiply socket prepare process post seek rel relative read from process rename replace require resetAll resolve revAddXMLNode revAppendXML revCloseCursor revCloseDatabase revCommitDatabase revCopyFile revCopyFolder revCopyXMLNode revDeleteFolder revDeleteXMLNode revDeleteAllXMLTrees revDeleteXMLTree revExecuteSQL revGoURL revInsertXMLNode revMoveFolder revMoveToFirstRecord revMoveToLastRecord revMoveToNextRecord revMoveToPreviousRecord revMoveToRecord revMoveXMLNode revPutIntoXMLNode revRollBackDatabase revSetDatabaseDriverPath revSetXMLAttribute revXMLRPC_AddParam revXMLRPC_DeleteAllDocuments revXMLAddDTD revXMLRPC_Free revXMLRPC_FreeAll revXMLRPC_DeleteDocument revXMLRPC_DeleteParam revXMLRPC_SetHost revXMLRPC_SetMethod revXMLRPC_SetPort revXMLRPC_SetProtocol revXMLRPC_SetSocket revZipAddItemWithData revZipAddItemWithFile revZipAddUncompressedItemWithData revZipAddUncompressedItemWithFile revZipCancel revZipCloseArchive revZipDeleteItem revZipExtractItemToFile revZipExtractItemToVariable revZipSetProgressCallback revZipRenameItem revZipReplaceItemWithData revZipReplaceItemWithFile revZipOpenArchive send set sort split start stop subtract union unload wait write"},c:[r,{cN:"keyword",b:"\\bend\\sif\\b"},{cN:"function",bK:"function",e:"$",c:[r,o,e.ASM,e.QSM,e.BNM,e.CNM,a]},{cN:"function",b:"\\bend\\s+",e:"$",k:"end",c:[o,a],r:0},{bK:"command on",e:"$",c:[r,o,e.ASM,e.QSM,e.BNM,e.CNM,a]},{cN:"meta",v:[{b:"<\\?(rev|lc|livecode)",r:10},{b:"<\\?"},{b:"\\?>"}]},e.ASM,e.QSM,e.BNM,e.CNM,a].concat(t),i:";$|^\\[|^=|&|{"}});
\ No newline at end of file
+hljs.registerLanguage("livecodeserver",function(){"use strict";return function(e){var r={className:"variable",variants:[{begin:"\\b([gtps][A-Z]{1}[a-zA-Z0-9]*)(\\[.+\\])?(?:\\s*?)"},{begin:"\\$_[A-Z]+"}],relevance:0},t=[e.C_BLOCK_COMMENT_MODE,e.HASH_COMMENT_MODE,e.COMMENT("--","$"),e.COMMENT("[^:]//","$")],a=e.inherit(e.TITLE_MODE,{variants:[{begin:"\\b_*rig[A-Z]+[A-Za-z0-9_\\-]*"},{begin:"\\b_[a-z0-9\\-]+"}]}),o=e.inherit(e.TITLE_MODE,{begin:"\\b([A-Za-z0-9_\\-]+)\\b"});return{name:"LiveCode",case_insensitive:!1,keywords:{keyword:"$_COOKIE $_FILES $_GET $_GET_BINARY $_GET_RAW $_POST $_POST_BINARY $_POST_RAW $_SESSION $_SERVER codepoint codepoints segment segments codeunit codeunits sentence sentences trueWord trueWords paragraph after byte bytes english the until http forever descending using line real8 with seventh for stdout finally element word words fourth before black ninth sixth characters chars stderr uInt1 uInt1s uInt2 uInt2s stdin string lines relative rel any fifth items from middle mid at else of catch then third it file milliseconds seconds second secs sec int1 int1s int4 int4s internet int2 int2s normal text item last long detailed effective uInt4 uInt4s repeat end repeat URL in try into switch to words https token binfile each tenth as ticks tick system real4 by dateItems without char character ascending eighth whole dateTime numeric short first ftp integer abbreviated abbr abbrev private case while if div mod wrap and or bitAnd bitNot bitOr bitXor among not in a an within contains ends with begins the keys of keys",literal:"SIX TEN FORMFEED NINE ZERO NONE SPACE FOUR FALSE COLON CRLF PI COMMA ENDOFFILE EOF EIGHT FIVE QUOTE EMPTY ONE TRUE RETURN CR LINEFEED RIGHT BACKSLASH NULL SEVEN TAB THREE TWO six ten formfeed nine zero none space four false colon crlf pi comma endoffile eof eight five quote empty one true return cr linefeed right backslash null seven tab three two RIVERSION RISTATE FILE_READ_MODE FILE_WRITE_MODE FILE_WRITE_MODE DIR_WRITE_MODE FILE_READ_UMASK FILE_WRITE_UMASK DIR_READ_UMASK DIR_WRITE_UMASK",built_in:"put abs acos aliasReference annuity arrayDecode arrayEncode asin atan atan2 average avg avgDev base64Decode base64Encode baseConvert binaryDecode binaryEncode byteOffset byteToNum cachedURL cachedURLs charToNum cipherNames codepointOffset codepointProperty codepointToNum codeunitOffset commandNames compound compress constantNames cos date dateFormat decompress difference directories diskSpace DNSServers exp exp1 exp2 exp10 extents files flushEvents folders format functionNames geometricMean global globals hasMemory harmonicMean hostAddress hostAddressToName hostName hostNameToAddress isNumber ISOToMac itemOffset keys len length libURLErrorData libUrlFormData libURLftpCommand libURLLastHTTPHeaders libURLLastRHHeaders libUrlMultipartFormAddPart libUrlMultipartFormData libURLVersion lineOffset ln ln1 localNames log log2 log10 longFilePath lower macToISO matchChunk matchText matrixMultiply max md5Digest median merge messageAuthenticationCode messageDigest millisec millisecs millisecond milliseconds min monthNames nativeCharToNum normalizeText num number numToByte numToChar numToCodepoint numToNativeChar offset open openfiles openProcesses openProcessIDs openSockets paragraphOffset paramCount param params peerAddress pendingMessages platform popStdDev populationStandardDeviation populationVariance popVariance processID random randomBytes replaceText result revCreateXMLTree revCreateXMLTreeFromFile revCurrentRecord revCurrentRecordIsFirst revCurrentRecordIsLast revDatabaseColumnCount revDatabaseColumnIsNull revDatabaseColumnLengths revDatabaseColumnNames revDatabaseColumnNamed revDatabaseColumnNumbered revDatabaseColumnTypes revDatabaseConnectResult revDatabaseCursors revDatabaseID revDatabaseTableNames revDatabaseType revDataFromQuery revdb_closeCursor revdb_columnbynumber revdb_columncount revdb_columnisnull revdb_columnlengths revdb_columnnames revdb_columntypes revdb_commit revdb_connect revdb_connections revdb_connectionerr revdb_currentrecord revdb_cursorconnection revdb_cursorerr revdb_cursors revdb_dbtype revdb_disconnect revdb_execute revdb_iseof revdb_isbof revdb_movefirst revdb_movelast revdb_movenext revdb_moveprev revdb_query revdb_querylist revdb_recordcount revdb_rollback revdb_tablenames revGetDatabaseDriverPath revNumberOfRecords revOpenDatabase revOpenDatabases revQueryDatabase revQueryDatabaseBlob revQueryResult revQueryIsAtStart revQueryIsAtEnd revUnixFromMacPath revXMLAttribute revXMLAttributes revXMLAttributeValues revXMLChildContents revXMLChildNames revXMLCreateTreeFromFileWithNamespaces revXMLCreateTreeWithNamespaces revXMLDataFromXPathQuery revXMLEvaluateXPath revXMLFirstChild revXMLMatchingNode revXMLNextSibling revXMLNodeContents revXMLNumberOfChildren revXMLParent revXMLPreviousSibling revXMLRootNode revXMLRPC_CreateRequest revXMLRPC_Documents revXMLRPC_Error revXMLRPC_GetHost revXMLRPC_GetMethod revXMLRPC_GetParam revXMLText revXMLRPC_Execute revXMLRPC_GetParamCount revXMLRPC_GetParamNode revXMLRPC_GetParamType revXMLRPC_GetPath revXMLRPC_GetPort revXMLRPC_GetProtocol revXMLRPC_GetRequest revXMLRPC_GetResponse revXMLRPC_GetSocket revXMLTree revXMLTrees revXMLValidateDTD revZipDescribeItem revZipEnumerateItems revZipOpenArchives round sampVariance sec secs seconds sentenceOffset sha1Digest shell shortFilePath sin specialFolderPath sqrt standardDeviation statRound stdDev sum sysError systemVersion tan tempName textDecode textEncode tick ticks time to tokenOffset toLower toUpper transpose truewordOffset trunc uniDecode uniEncode upper URLDecode URLEncode URLStatus uuid value variableNames variance version waitDepth weekdayNames wordOffset xsltApplyStylesheet xsltApplyStylesheetFromFile xsltLoadStylesheet xsltLoadStylesheetFromFile add breakpoint cancel clear local variable file word line folder directory URL close socket process combine constant convert create new alias folder directory decrypt delete variable word line folder directory URL dispatch divide do encrypt filter get include intersect kill libURLDownloadToFile libURLFollowHttpRedirects libURLftpUpload libURLftpUploadFile libURLresetAll libUrlSetAuthCallback libURLSetDriver libURLSetCustomHTTPHeaders libUrlSetExpect100 libURLSetFTPListCommand libURLSetFTPMode libURLSetFTPStopTime libURLSetStatusCallback load extension loadedExtensions multiply socket prepare process post seek rel relative read from process rename replace require resetAll resolve revAddXMLNode revAppendXML revCloseCursor revCloseDatabase revCommitDatabase revCopyFile revCopyFolder revCopyXMLNode revDeleteFolder revDeleteXMLNode revDeleteAllXMLTrees revDeleteXMLTree revExecuteSQL revGoURL revInsertXMLNode revMoveFolder revMoveToFirstRecord revMoveToLastRecord revMoveToNextRecord revMoveToPreviousRecord revMoveToRecord revMoveXMLNode revPutIntoXMLNode revRollBackDatabase revSetDatabaseDriverPath revSetXMLAttribute revXMLRPC_AddParam revXMLRPC_DeleteAllDocuments revXMLAddDTD revXMLRPC_Free revXMLRPC_FreeAll revXMLRPC_DeleteDocument revXMLRPC_DeleteParam revXMLRPC_SetHost revXMLRPC_SetMethod revXMLRPC_SetPort revXMLRPC_SetProtocol revXMLRPC_SetSocket revZipAddItemWithData revZipAddItemWithFile revZipAddUncompressedItemWithData revZipAddUncompressedItemWithFile revZipCancel revZipCloseArchive revZipDeleteItem revZipExtractItemToFile revZipExtractItemToVariable revZipSetProgressCallback revZipRenameItem revZipReplaceItemWithData revZipReplaceItemWithFile revZipOpenArchive send set sort split start stop subtract symmetric union unload vectorDotProduct wait write"},contains:[r,{className:"keyword",begin:"\\bend\\sif\\b"},{className:"function",beginKeywords:"function",end:"$",contains:[r,o,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE,a]},{className:"function",begin:"\\bend\\s+",end:"$",keywords:"end",contains:[o,a],relevance:0},{beginKeywords:"command on",end:"$",contains:[r,o,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE,a]},{className:"meta",variants:[{begin:"<\\?(rev|lc|livecode)",relevance:10},{begin:"<\\?"},{begin:"\\?>"}]},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE,a].concat(t),illegal:";$|^\\[|^=|&|{"}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/livescript.min.js b/vendor/assets/javascripts/highlightjs/languages/livescript.min.js
index b3227f89e6..9c8962db59 100644
--- a/vendor/assets/javascripts/highlightjs/languages/livescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/livescript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("livescript",function(e){var t={keyword:"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger case default function var with then unless until loop of by when and or is isnt not it that otherwise from to til fallthrough super case default function var void const let enum export import native __hasProp __extends __slice __bind __indexOf",literal:"true false null undefined yes no on off it that void",built_in:"npm require console print module global window document"},s="[A-Za-z$_](?:-[0-9A-Za-z$_]|[0-9A-Za-z$_])*",n=e.inherit(e.TM,{b:s}),i={cN:"subst",b:/#\{/,e:/}/,k:t},r={cN:"subst",b:/#[A-Za-z$_]/,e:/(?:\-[0-9A-Za-z$_]|[0-9A-Za-z$_])*/,k:t},c=[e.BNM,{cN:"number",b:"(\\b0[xX][a-fA-F0-9_]+)|(\\b\\d(\\d|_\\d)*(\\.(\\d(\\d|_\\d)*)?)?(_*[eE]([-+]\\d(_\\d|\\d)*)?)?[_a-z]*)",r:0,starts:{e:"(\\s*/)?",r:0}},{cN:"string",v:[{b:/'''/,e:/'''/,c:[e.BE]},{b:/'/,e:/'/,c:[e.BE]},{b:/"""/,e:/"""/,c:[e.BE,i,r]},{b:/"/,e:/"/,c:[e.BE,i,r]},{b:/\\/,e:/(\s|$)/,eE:!0}]},{cN:"regexp",v:[{b:"//",e:"//[gim]*",c:[i,e.HCM]},{b:/\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W|$)/}]},{b:"@"+s},{b:"``",e:"``",eB:!0,eE:!0,sL:"javascript"}];i.c=c;var a={cN:"params",b:"\\(",rB:!0,c:[{b:/\(/,e:/\)/,k:t,c:["self"].concat(c)}]};return{aliases:["ls"],k:t,i:/\/\*/,c:c.concat([e.C("\\/\\*","\\*\\/"),e.HCM,{cN:"function",c:[n,a],rB:!0,v:[{b:"("+s+"\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B\\->\\*?",e:"\\->\\*?"},{b:"("+s+"\\s*(?:=|:=)\\s*)?!?(\\(.*\\))?\\s*\\B[-~]{1,2}>\\*?",e:"[-~]{1,2}>\\*?"},{b:"("+s+"\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B!?[-~]{1,2}>\\*?",e:"!?[-~]{1,2}>\\*?"}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[n]},n]},{b:s+":",e:":",rB:!0,rE:!0,r:0}])}});
\ No newline at end of file
+hljs.registerLanguage("livescript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);return function(t){var r={keyword:e.concat(["then","unless","until","loop","of","by","when","and","or","is","isnt","not","it","that","otherwise","from","to","til","fallthrough","case","enum","native","list","map","__hasProp","__extends","__slice","__bind","__indexOf"]).join(" "),literal:n.concat(["yes","no","on","off","it","that","void"]).join(" "),built_in:a.concat(["npm","print"]).join(" ")},i="[A-Za-z$_](?:-[0-9A-Za-z$_]|[0-9A-Za-z$_])*",s=t.inherit(t.TITLE_MODE,{begin:i}),o={className:"subst",begin:/#\{/,end:/}/,keywords:r},c={className:"subst",begin:/#[A-Za-z$_]/,end:/(?:\-[0-9A-Za-z$_]|[0-9A-Za-z$_])*/,keywords:r},l=[t.BINARY_NUMBER_MODE,{className:"number",begin:"(\\b0[xX][a-fA-F0-9_]+)|(\\b\\d(\\d|_\\d)*(\\.(\\d(\\d|_\\d)*)?)?(_*[eE]([-+]\\d(_\\d|\\d)*)?)?[_a-z]*)",relevance:0,starts:{end:"(\\s*/)?",relevance:0}},{className:"string",variants:[{begin:/'''/,end:/'''/,contains:[t.BACKSLASH_ESCAPE]},{begin:/'/,end:/'/,contains:[t.BACKSLASH_ESCAPE]},{begin:/"""/,end:/"""/,contains:[t.BACKSLASH_ESCAPE,o,c]},{begin:/"/,end:/"/,contains:[t.BACKSLASH_ESCAPE,o,c]},{begin:/\\/,end:/(\s|$)/,excludeEnd:!0}]},{className:"regexp",variants:[{begin:"//",end:"//[gim]*",contains:[o,t.HASH_COMMENT_MODE]},{begin:/\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W)/}]},{begin:"@"+i},{begin:"``",end:"``",excludeBegin:!0,excludeEnd:!0,subLanguage:"javascript"}];o.contains=l;var d={className:"params",begin:"\\(",returnBegin:!0,contains:[{begin:/\(/,end:/\)/,keywords:r,contains:["self"].concat(l)}]};return{name:"LiveScript",aliases:["ls"],keywords:r,illegal:/\/\*/,contains:l.concat([t.COMMENT("\\/\\*","\\*\\/"),t.HASH_COMMENT_MODE,{begin:"(#=>|=>|\\|>>|-?->|\\!->)"},{className:"function",contains:[s,d],returnBegin:!0,variants:[{begin:"("+i+"\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B\\->\\*?",end:"\\->\\*?"},{begin:"("+i+"\\s*(?:=|:=)\\s*)?!?(\\(.*\\))?\\s*\\B[-~]{1,2}>\\*?",end:"[-~]{1,2}>\\*?"},{begin:"("+i+"\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B!?[-~]{1,2}>\\*?",end:"!?[-~]{1,2}>\\*?"}]},{className:"class",beginKeywords:"class",end:"$",illegal:/[:="\[\]]/,contains:[{beginKeywords:"extends",endsWithParent:!0,illegal:/[:="\[\]]/,contains:[s]},s]},{begin:i+":",end:":",returnBegin:!0,returnEnd:!0,relevance:0}])}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/llvm.min.js b/vendor/assets/javascripts/highlightjs/languages/llvm.min.js
index 306dc398fe..75ca9d2b42 100644
--- a/vendor/assets/javascripts/highlightjs/languages/llvm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/llvm.min.js
@@ -1 +1 @@
-hljs.registerLanguage("llvm",function(e){var n="([-a-zA-Z$._][\\w\\-$.]*)";return{k:"begin end true false declare define global constant private linker_private internal available_externally linkonce linkonce_odr weak weak_odr appending dllimport dllexport common default hidden protected extern_weak external thread_local zeroinitializer undef null to tail target triple datalayout volatile nuw nsw nnan ninf nsz arcp fast exact inbounds align addrspace section alias module asm sideeffect gc dbg linker_private_weak attributes blockaddress initialexec localdynamic localexec prefix unnamed_addr ccc fastcc coldcc x86_stdcallcc x86_fastcallcc arm_apcscc arm_aapcscc arm_aapcs_vfpcc ptx_device ptx_kernel intel_ocl_bicc msp430_intrcc spir_func spir_kernel x86_64_sysvcc x86_64_win64cc x86_thiscallcc cc c signext zeroext inreg sret nounwind noreturn noalias nocapture byval nest readnone readonly inlinehint noinline alwaysinline optsize ssp sspreq noredzone noimplicitfloat naked builtin cold nobuiltin noduplicate nonlazybind optnone returns_twice sanitize_address sanitize_memory sanitize_thread sspstrong uwtable returned type opaque eq ne slt sgt sle sge ult ugt ule uge oeq one olt ogt ole oge ord uno ueq une x acq_rel acquire alignstack atomic catch cleanup filter inteldialect max min monotonic nand personality release seq_cst singlethread umax umin unordered xchg add fadd sub fsub mul fmul udiv sdiv fdiv urem srem frem shl lshr ashr and or xor icmp fcmp phi call trunc zext sext fptrunc fpext uitofp sitofp fptoui fptosi inttoptr ptrtoint bitcast addrspacecast select va_arg ret br switch invoke unwind unreachable indirectbr landingpad resume malloc alloca free load store getelementptr extractelement insertelement shufflevector getresult extractvalue insertvalue atomicrmw cmpxchg fence argmemonly double",c:[{cN:"keyword",b:"i\\d+"},e.C(";","\\n",{r:0}),e.QSM,{cN:"string",v:[{b:'"',e:'[^\\\\]"'}],r:0},{cN:"title",v:[{b:"@"+n},{b:"@\\d+"},{b:"!"+n},{b:"!\\d+"+n}]},{cN:"symbol",v:[{b:"%"+n},{b:"%\\d+"},{b:"#\\d+"}]},{cN:"number",v:[{b:"0[xX][a-fA-F0-9]+"},{b:"-?\\d+(?:[.]\\d+)?(?:[eE][-+]?\\d+(?:[.]\\d+)?)?"}],r:0}]}});
\ No newline at end of file
+hljs.registerLanguage("llvm",function(){"use strict";return function(e){var n="([-a-zA-Z$._][\\w\\-$.]*)";return{name:"LLVM IR",keywords:"begin end true false declare define global constant private linker_private internal available_externally linkonce linkonce_odr weak weak_odr appending dllimport dllexport common default hidden protected extern_weak external thread_local zeroinitializer undef null to tail target triple datalayout volatile nuw nsw nnan ninf nsz arcp fast exact inbounds align addrspace section alias module asm sideeffect gc dbg linker_private_weak attributes blockaddress initialexec localdynamic localexec prefix unnamed_addr ccc fastcc coldcc x86_stdcallcc x86_fastcallcc arm_apcscc arm_aapcscc arm_aapcs_vfpcc ptx_device ptx_kernel intel_ocl_bicc msp430_intrcc spir_func spir_kernel x86_64_sysvcc x86_64_win64cc x86_thiscallcc cc c signext zeroext inreg sret nounwind noreturn noalias nocapture byval nest readnone readonly inlinehint noinline alwaysinline optsize ssp sspreq noredzone noimplicitfloat naked builtin cold nobuiltin noduplicate nonlazybind optnone returns_twice sanitize_address sanitize_memory sanitize_thread sspstrong uwtable returned type opaque eq ne slt sgt sle sge ult ugt ule uge oeq one olt ogt ole oge ord uno ueq une x acq_rel acquire alignstack atomic catch cleanup filter inteldialect max min monotonic nand personality release seq_cst singlethread umax umin unordered xchg add fadd sub fsub mul fmul udiv sdiv fdiv urem srem frem shl lshr ashr and or xor icmp fcmp phi call trunc zext sext fptrunc fpext uitofp sitofp fptoui fptosi inttoptr ptrtoint bitcast addrspacecast select va_arg ret br switch invoke unwind unreachable indirectbr landingpad resume malloc alloca free load store getelementptr extractelement insertelement shufflevector getresult extractvalue insertvalue atomicrmw cmpxchg fence argmemonly double",contains:[{className:"keyword",begin:"i\\d+"},e.COMMENT(";","\\n",{relevance:0}),e.QUOTE_STRING_MODE,{className:"string",variants:[{begin:'"',end:'[^\\\\]"'}],relevance:0},{className:"title",variants:[{begin:"@"+n},{begin:"@\\d+"},{begin:"!"+n},{begin:"!\\d+"+n}]},{className:"symbol",variants:[{begin:"%"+n},{begin:"%\\d+"},{begin:"#\\d+"}]},{className:"number",variants:[{begin:"0[xX][a-fA-F0-9]+"},{begin:"-?\\d+(?:[.]\\d+)?(?:[eE][-+]?\\d+(?:[.]\\d+)?)?"}],relevance:0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/lsl.min.js b/vendor/assets/javascripts/highlightjs/languages/lsl.min.js
index 61a8b3b513..e55634d20b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/lsl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/lsl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("lsl",function(E){var T={cN:"subst",b:/\\[tn"\\]/},e={cN:"string",b:'"',e:'"',c:[T]},A={cN:"number",b:E.CNR},R={cN:"literal",v:[{b:"\\b(?:PI|TWO_PI|PI_BY_TWO|DEG_TO_RAD|RAD_TO_DEG|SQRT2)\\b"},{b:"\\b(?:XP_ERROR_(?:EXPERIENCES_DISABLED|EXPERIENCE_(?:DISABLED|SUSPENDED)|INVALID_(?:EXPERIENCE|PARAMETERS)|KEY_NOT_FOUND|MATURITY_EXCEEDED|NONE|NOT_(?:FOUND|PERMITTED(?:_LAND)?)|NO_EXPERIENCE|QUOTA_EXCEEDED|RETRY_UPDATE|STORAGE_EXCEPTION|STORE_DISABLED|THROTTLED|UNKNOWN_ERROR)|JSON_APPEND|STATUS_(?:PHYSICS|ROTATE_[XYZ]|PHANTOM|SANDBOX|BLOCK_GRAB(?:_OBJECT)?|(?:DIE|RETURN)_AT_EDGE|CAST_SHADOWS|OK|MALFORMED_PARAMS|TYPE_MISMATCH|BOUNDS_ERROR|NOT_(?:FOUND|SUPPORTED)|INTERNAL_ERROR|WHITELIST_FAILED)|AGENT(?:_(?:BY_(?:LEGACY_|USER)NAME|FLYING|ATTACHMENTS|SCRIPTED|MOUSELOOK|SITTING|ON_OBJECT|AWAY|WALKING|IN_AIR|TYPING|CROUCHING|BUSY|ALWAYS_RUN|AUTOPILOT|LIST_(?:PARCEL(?:_OWNER)?|REGION)))?|CAMERA_(?:PITCH|DISTANCE|BEHINDNESS_(?:ANGLE|LAG)|(?:FOCUS|POSITION)(?:_(?:THRESHOLD|LOCKED|LAG))?|FOCUS_OFFSET|ACTIVE)|ANIM_ON|LOOP|REVERSE|PING_PONG|SMOOTH|ROTATE|SCALE|ALL_SIDES|LINK_(?:ROOT|SET|ALL_(?:OTHERS|CHILDREN)|THIS)|ACTIVE|PASS(?:IVE|_(?:ALWAYS|IF_NOT_HANDLED|NEVER))|SCRIPTED|CONTROL_(?:FWD|BACK|(?:ROT_)?(?:LEFT|RIGHT)|UP|DOWN|(?:ML_)?LBUTTON)|PERMISSION_(?:RETURN_OBJECTS|DEBIT|OVERRIDE_ANIMATIONS|SILENT_ESTATE_MANAGEMENT|TAKE_CONTROLS|TRIGGER_ANIMATION|ATTACH|CHANGE_LINKS|(?:CONTROL|TRACK)_CAMERA|TELEPORT)|INVENTORY_(?:TEXTURE|SOUND|OBJECT|SCRIPT|LANDMARK|CLOTHING|NOTECARD|BODYPART|ANIMATION|GESTURE|ALL|NONE)|CHANGED_(?:INVENTORY|COLOR|SHAPE|SCALE|TEXTURE|LINK|ALLOWED_DROP|OWNER|REGION(?:_START)?|TELEPORT|MEDIA)|OBJECT_(?:CLICK_ACTION|HOVER_HEIGHT|LAST_OWNER_ID|(?:PHYSICS|SERVER|STREAMING)_COST|UNKNOWN_DETAIL|CHARACTER_TIME|PHANTOM|PHYSICS|TEMP_ON_REZ|NAME|DESC|POS|PRIM_(?:COUNT|EQUIVALENCE)|RETURN_(?:PARCEL(?:_OWNER)?|REGION)|REZZER_KEY|ROO?T|VELOCITY|OMEGA|OWNER|GROUP|CREATOR|ATTACHED_POINT|RENDER_WEIGHT|(?:BODY_SHAPE|PATHFINDING)_TYPE|(?:RUNNING|TOTAL)_SCRIPT_COUNT|TOTAL_INVENTORY_COUNT|SCRIPT_(?:MEMORY|TIME))|TYPE_(?:INTEGER|FLOAT|STRING|KEY|VECTOR|ROTATION|INVALID)|(?:DEBUG|PUBLIC)_CHANNEL|ATTACH_(?:AVATAR_CENTER|CHEST|HEAD|BACK|PELVIS|MOUTH|CHIN|NECK|NOSE|BELLY|[LR](?:SHOULDER|HAND|FOOT|EAR|EYE|[UL](?:ARM|LEG)|HIP)|(?:LEFT|RIGHT)_PEC|HUD_(?:CENTER_[12]|TOP_(?:RIGHT|CENTER|LEFT)|BOTTOM(?:_(?:RIGHT|LEFT))?)|[LR]HAND_RING1|TAIL_(?:BASE|TIP)|[LR]WING|FACE_(?:JAW|[LR]EAR|[LR]EYE|TOUNGE)|GROIN|HIND_[LR]FOOT)|LAND_(?:LEVEL|RAISE|LOWER|SMOOTH|NOISE|REVERT)|DATA_(?:ONLINE|NAME|BORN|SIM_(?:POS|STATUS|RATING)|PAYINFO)|PAYMENT_INFO_(?:ON_FILE|USED)|REMOTE_DATA_(?:CHANNEL|REQUEST|REPLY)|PSYS_(?:PART_(?:BF_(?:ZERO|ONE(?:_MINUS_(?:DEST_COLOR|SOURCE_(ALPHA|COLOR)))?|DEST_COLOR|SOURCE_(ALPHA|COLOR))|BLEND_FUNC_(DEST|SOURCE)|FLAGS|(?:START|END)_(?:COLOR|ALPHA|SCALE|GLOW)|MAX_AGE|(?:RIBBON|WIND|INTERP_(?:COLOR|SCALE)|BOUNCE|FOLLOW_(?:SRC|VELOCITY)|TARGET_(?:POS|LINEAR)|EMISSIVE)_MASK)|SRC_(?:MAX_AGE|PATTERN|ANGLE_(?:BEGIN|END)|BURST_(?:RATE|PART_COUNT|RADIUS|SPEED_(?:MIN|MAX))|ACCEL|TEXTURE|TARGET_KEY|OMEGA|PATTERN_(?:DROP|EXPLODE|ANGLE(?:_CONE(?:_EMPTY)?)?)))|VEHICLE_(?:REFERENCE_FRAME|TYPE_(?:NONE|SLED|CAR|BOAT|AIRPLANE|BALLOON)|(?:LINEAR|ANGULAR)_(?:FRICTION_TIMESCALE|MOTOR_DIRECTION)|LINEAR_MOTOR_OFFSET|HOVER_(?:HEIGHT|EFFICIENCY|TIMESCALE)|BUOYANCY|(?:LINEAR|ANGULAR)_(?:DEFLECTION_(?:EFFICIENCY|TIMESCALE)|MOTOR_(?:DECAY_)?TIMESCALE)|VERTICAL_ATTRACTION_(?:EFFICIENCY|TIMESCALE)|BANKING_(?:EFFICIENCY|MIX|TIMESCALE)|FLAG_(?:NO_DEFLECTION_UP|LIMIT_(?:ROLL_ONLY|MOTOR_UP)|HOVER_(?:(?:WATER|TERRAIN|UP)_ONLY|GLOBAL_HEIGHT)|MOUSELOOK_(?:STEER|BANK)|CAMERA_DECOUPLED))|PRIM_(?:ALPHA_MODE(?:_(?:BLEND|EMISSIVE|MASK|NONE))?|NORMAL|SPECULAR|TYPE(?:_(?:BOX|CYLINDER|PRISM|SPHERE|TORUS|TUBE|RING|SCULPT))?|HOLE_(?:DEFAULT|CIRCLE|SQUARE|TRIANGLE)|MATERIAL(?:_(?:STONE|METAL|GLASS|WOOD|FLESH|PLASTIC|RUBBER))?|SHINY_(?:NONE|LOW|MEDIUM|HIGH)|BUMP_(?:NONE|BRIGHT|DARK|WOOD|BARK|BRICKS|CHECKER|CONCRETE|TILE|STONE|DISKS|GRAVEL|BLOBS|SIDING|LARGETILE|STUCCO|SUCTION|WEAVE)|TEXGEN_(?:DEFAULT|PLANAR)|SCULPT_(?:TYPE_(?:SPHERE|TORUS|PLANE|CYLINDER|MASK)|FLAG_(?:MIRROR|INVERT))|PHYSICS(?:_(?:SHAPE_(?:CONVEX|NONE|PRIM|TYPE)))?|(?:POS|ROT)_LOCAL|SLICE|TEXT|FLEXIBLE|POINT_LIGHT|TEMP_ON_REZ|PHANTOM|POSITION|SIZE|ROTATION|TEXTURE|NAME|OMEGA|DESC|LINK_TARGET|COLOR|BUMP_SHINY|FULLBRIGHT|TEXGEN|GLOW|MEDIA_(?:ALT_IMAGE_ENABLE|CONTROLS|(?:CURRENT|HOME)_URL|AUTO_(?:LOOP|PLAY|SCALE|ZOOM)|FIRST_CLICK_INTERACT|(?:WIDTH|HEIGHT)_PIXELS|WHITELIST(?:_ENABLE)?|PERMS_(?:INTERACT|CONTROL)|PARAM_MAX|CONTROLS_(?:STANDARD|MINI)|PERM_(?:NONE|OWNER|GROUP|ANYONE)|MAX_(?:URL_LENGTH|WHITELIST_(?:SIZE|COUNT)|(?:WIDTH|HEIGHT)_PIXELS)))|MASK_(?:BASE|OWNER|GROUP|EVERYONE|NEXT)|PERM_(?:TRANSFER|MODIFY|COPY|MOVE|ALL)|PARCEL_(?:MEDIA_COMMAND_(?:STOP|PAUSE|PLAY|LOOP|TEXTURE|URL|TIME|AGENT|UNLOAD|AUTO_ALIGN|TYPE|SIZE|DESC|LOOP_SET)|FLAG_(?:ALLOW_(?:FLY|(?:GROUP_)?SCRIPTS|LANDMARK|TERRAFORM|DAMAGE|CREATE_(?:GROUP_)?OBJECTS)|USE_(?:ACCESS_(?:GROUP|LIST)|BAN_LIST|LAND_PASS_LIST)|LOCAL_SOUND_ONLY|RESTRICT_PUSHOBJECT|ALLOW_(?:GROUP|ALL)_OBJECT_ENTRY)|COUNT_(?:TOTAL|OWNER|GROUP|OTHER|SELECTED|TEMP)|DETAILS_(?:NAME|DESC|OWNER|GROUP|AREA|ID|SEE_AVATARS))|LIST_STAT_(?:MAX|MIN|MEAN|MEDIAN|STD_DEV|SUM(?:_SQUARES)?|NUM_COUNT|GEOMETRIC_MEAN|RANGE)|PAY_(?:HIDE|DEFAULT)|REGION_FLAG_(?:ALLOW_DAMAGE|FIXED_SUN|BLOCK_TERRAFORM|SANDBOX|DISABLE_(?:COLLISIONS|PHYSICS)|BLOCK_FLY|ALLOW_DIRECT_TELEPORT|RESTRICT_PUSHOBJECT)|HTTP_(?:METHOD|MIMETYPE|BODY_(?:MAXLENGTH|TRUNCATED)|CUSTOM_HEADER|PRAGMA_NO_CACHE|VERBOSE_THROTTLE|VERIFY_CERT)|STRING_(?:TRIM(?:_(?:HEAD|TAIL))?)|CLICK_ACTION_(?:NONE|TOUCH|SIT|BUY|PAY|OPEN(?:_MEDIA)?|PLAY|ZOOM)|TOUCH_INVALID_FACE|PROFILE_(?:NONE|SCRIPT_MEMORY)|RC_(?:DATA_FLAGS|DETECT_PHANTOM|GET_(?:LINK_NUM|NORMAL|ROOT_KEY)|MAX_HITS|REJECT_(?:TYPES|AGENTS|(?:NON)?PHYSICAL|LAND))|RCERR_(?:CAST_TIME_EXCEEDED|SIM_PERF_LOW|UNKNOWN)|ESTATE_ACCESS_(?:ALLOWED_(?:AGENT|GROUP)_(?:ADD|REMOVE)|BANNED_AGENT_(?:ADD|REMOVE))|DENSITY|FRICTION|RESTITUTION|GRAVITY_MULTIPLIER|KFM_(?:COMMAND|CMD_(?:PLAY|STOP|PAUSE)|MODE|FORWARD|LOOP|PING_PONG|REVERSE|DATA|ROTATION|TRANSLATION)|ERR_(?:GENERIC|PARCEL_PERMISSIONS|MALFORMED_PARAMS|RUNTIME_PERMISSIONS|THROTTLED)|CHARACTER_(?:CMD_(?:(?:SMOOTH_)?STOP|JUMP)|DESIRED_(?:TURN_)?SPEED|RADIUS|STAY_WITHIN_PARCEL|LENGTH|ORIENTATION|ACCOUNT_FOR_SKIPPED_FRAMES|AVOIDANCE_MODE|TYPE(?:_(?:[ABCD]|NONE))?|MAX_(?:DECEL|TURN_RADIUS|(?:ACCEL|SPEED)))|PURSUIT_(?:OFFSET|FUZZ_FACTOR|GOAL_TOLERANCE|INTERCEPT)|REQUIRE_LINE_OF_SIGHT|FORCE_DIRECT_PATH|VERTICAL|HORIZONTAL|AVOID_(?:CHARACTERS|DYNAMIC_OBSTACLES|NONE)|PU_(?:EVADE_(?:HIDDEN|SPOTTED)|FAILURE_(?:DYNAMIC_PATHFINDING_DISABLED|INVALID_(?:GOAL|START)|NO_(?:NAVMESH|VALID_DESTINATION)|OTHER|TARGET_GONE|(?:PARCEL_)?UNREACHABLE)|(?:GOAL|SLOWDOWN_DISTANCE)_REACHED)|TRAVERSAL_TYPE(?:_(?:FAST|NONE|SLOW))?|CONTENT_TYPE_(?:ATOM|FORM|HTML|JSON|LLSD|RSS|TEXT|XHTML|XML)|GCNP_(?:RADIUS|STATIC)|(?:PATROL|WANDER)_PAUSE_AT_WAYPOINTS|OPT_(?:AVATAR|CHARACTER|EXCLUSION_VOLUME|LEGACY_LINKSET|MATERIAL_VOLUME|OTHER|STATIC_OBSTACLE|WALKABLE)|SIM_STAT_PCT_CHARS_STEPPED)\\b"},{b:"\\b(?:FALSE|TRUE)\\b"},{b:"\\b(?:ZERO_ROTATION)\\b"},{b:"\\b(?:EOF|JSON_(?:ARRAY|DELETE|FALSE|INVALID|NULL|NUMBER|OBJECT|STRING|TRUE)|NULL_KEY|TEXTURE_(?:BLANK|DEFAULT|MEDIA|PLYWOOD|TRANSPARENT)|URL_REQUEST_(?:GRANTED|DENIED))\\b"},{b:"\\b(?:ZERO_VECTOR|TOUCH_INVALID_(?:TEXCOORD|VECTOR))\\b"}]},O={cN:"built_in",b:"\\b(?:ll(?:AgentInExperience|(?:Create|DataSize|Delete|KeyCount|Keys|Read|Update)KeyValue|GetExperience(?:Details|ErrorMessage)|ReturnObjectsBy(?:ID|Owner)|Json(?:2List|[GS]etValue|ValueType)|Sin|Cos|Tan|Atan2|Sqrt|Pow|Abs|Fabs|Frand|Floor|Ceil|Round|Vec(?:Mag|Norm|Dist)|Rot(?:Between|2(?:Euler|Fwd|Left|Up))|(?:Euler|Axes)2Rot|Whisper|(?:Region|Owner)?Say|Shout|Listen(?:Control|Remove)?|Sensor(?:Repeat|Remove)?|Detected(?:Name|Key|Owner|Type|Pos|Vel|Grab|Rot|Group|LinkNumber)|Die|Ground|Wind|(?:[GS]et)(?:AnimationOverride|MemoryLimit|PrimMediaParams|ParcelMusicURL|Object(?:Desc|Name)|PhysicsMaterial|Status|Scale|Color|Alpha|Texture|Pos|Rot|Force|Torque)|ResetAnimationOverride|(?:Scale|Offset|Rotate)Texture|(?:Rot)?Target(?:Remove)?|(?:Stop)?MoveToTarget|Apply(?:Rotational)?Impulse|Set(?:KeyframedMotion|ContentType|RegionPos|(?:Angular)?Velocity|Buoyancy|HoverHeight|ForceAndTorque|TimerEvent|ScriptState|Damage|TextureAnim|Sound(?:Queueing|Radius)|Vehicle(?:Type|(?:Float|Vector|Rotation)Param)|(?:Touch|Sit)?Text|Camera(?:Eye|At)Offset|PrimitiveParams|ClickAction|Link(?:Alpha|Color|PrimitiveParams(?:Fast)?|Texture(?:Anim)?|Camera|Media)|RemoteScriptAccessPin|PayPrice|LocalRot)|ScaleByFactor|Get(?:(?:Max|Min)ScaleFactor|ClosestNavPoint|StaticPath|SimStats|Env|PrimitiveParams|Link(?:PrimitiveParams|Number(?:OfSides)?|Key|Name|Media)|HTTPHeader|FreeURLs|Object(?:Details|PermMask|PrimCount)|Parcel(?:MaxPrims|Details|Prim(?:Count|Owners))|Attached(?:List)?|(?:SPMax|Free|Used)Memory|Region(?:Name|TimeDilation|FPS|Corner|AgentCount)|Root(?:Position|Rotation)|UnixTime|(?:Parcel|Region)Flags|(?:Wall|GMT)clock|SimulatorHostname|BoundingBox|GeometricCenter|Creator|NumberOf(?:Prims|NotecardLines|Sides)|Animation(?:List)?|(?:Camera|Local)(?:Pos|Rot)|Vel|Accel|Omega|Time(?:stamp|OfDay)|(?:Object|CenterOf)?Mass|MassMKS|Energy|Owner|(?:Owner)?Key|SunDirection|Texture(?:Offset|Scale|Rot)|Inventory(?:Number|Name|Key|Type|Creator|PermMask)|Permissions(?:Key)?|StartParameter|List(?:Length|EntryType)|Date|Agent(?:Size|Info|Language|List)|LandOwnerAt|NotecardLine|Script(?:Name|State))|(?:Get|Reset|GetAndReset)Time|PlaySound(?:Slave)?|LoopSound(?:Master|Slave)?|(?:Trigger|Stop|Preload)Sound|(?:(?:Get|Delete)Sub|Insert)String|To(?:Upper|Lower)|Give(?:InventoryList|Money)|RezObject|(?:Stop)?LookAt|Sleep|CollisionFilter|(?:Take|Release)Controls|DetachFromAvatar|AttachToAvatar(?:Temp)?|InstantMessage|(?:GetNext)?Email|StopHover|MinEventDelay|RotLookAt|String(?:Length|Trim)|(?:Start|Stop)Animation|TargetOmega|Request(?:Experience)?Permissions|(?:Create|Break)Link|BreakAllLinks|(?:Give|Remove)Inventory|Water|PassTouches|Request(?:Agent|Inventory)Data|TeleportAgent(?:Home|GlobalCoords)?|ModifyLand|CollisionSound|ResetScript|MessageLinked|PushObject|PassCollisions|AxisAngle2Rot|Rot2(?:Axis|Angle)|A(?:cos|sin)|AngleBetween|AllowInventoryDrop|SubStringIndex|List2(?:CSV|Integer|Json|Float|String|Key|Vector|Rot|List(?:Strided)?)|DeleteSubList|List(?:Statistics|Sort|Randomize|(?:Insert|Find|Replace)List)|EdgeOfWorld|AdjustSoundVolume|Key2Name|TriggerSoundLimited|EjectFromLand|(?:CSV|ParseString)2List|OverMyLand|SameGroup|UnSit|Ground(?:Slope|Normal|Contour)|GroundRepel|(?:Set|Remove)VehicleFlags|(?:AvatarOn)?(?:Link)?SitTarget|Script(?:Danger|Profiler)|Dialog|VolumeDetect|ResetOtherScript|RemoteLoadScriptPin|(?:Open|Close)RemoteDataChannel|SendRemoteData|RemoteDataReply|(?:Integer|String)ToBase64|XorBase64|Log(?:10)?|Base64To(?:String|Integer)|ParseStringKeepNulls|RezAtRoot|RequestSimulatorData|ForceMouselook|(?:Load|Release|(?:E|Une)scape)URL|ParcelMedia(?:CommandList|Query)|ModPow|MapDestination|(?:RemoveFrom|AddTo|Reset)Land(?:Pass|Ban)List|(?:Set|Clear)CameraParams|HTTP(?:Request|Response)|TextBox|DetectedTouch(?:UV|Face|Pos|(?:N|Bin)ormal|ST)|(?:MD5|SHA1|DumpList2)String|Request(?:Secure)?URL|Clear(?:Prim|Link)Media|(?:Link)?ParticleSystem|(?:Get|Request)(?:Username|DisplayName)|RegionSayTo|CastRay|GenerateKey|TransferLindenDollars|ManageEstateAccess|(?:Create|Delete)Character|ExecCharacterCmd|Evade|FleeFrom|NavigateTo|PatrolPoints|Pursue|UpdateCharacter|WanderWithin))\\b"};return{i:":",c:[e,{cN:"comment",v:[E.C("//","$"),E.C("/\\*","\\*/")]},A,{cN:"section",v:[{b:"\\b(?:state|default)\\b"},{b:"\\b(?:state_(?:entry|exit)|touch(?:_(?:start|end))?|(?:land_)?collision(?:_(?:start|end))?|timer|listen|(?:no_)?sensor|control|(?:not_)?at_(?:rot_)?target|money|email|experience_permissions(?:_denied)?|run_time_permissions|changed|attach|dataserver|moving_(?:start|end)|link_message|(?:on|object)_rez|remote_data|http_re(?:sponse|quest)|path_update|transaction_result)\\b"}]},O,R,{cN:"type",b:"\\b(?:integer|float|string|key|vector|quaternion|rotation|list)\\b"}]}});
\ No newline at end of file
+hljs.registerLanguage("lsl",function(){"use strict";return function(E){var T={className:"number",begin:E.C_NUMBER_RE};return{name:"LSL (Linden Scripting Language)",illegal:":",contains:[{className:"string",begin:'"',end:'"',contains:[{className:"subst",begin:/\\[tn"\\]/}]},{className:"comment",variants:[E.COMMENT("//","$"),E.COMMENT("/\\*","\\*/")],relevance:0},T,{className:"section",variants:[{begin:"\\b(?:state|default)\\b"},{begin:"\\b(?:state_(?:entry|exit)|touch(?:_(?:start|end))?|(?:land_)?collision(?:_(?:start|end))?|timer|listen|(?:no_)?sensor|control|(?:not_)?at_(?:rot_)?target|money|email|experience_permissions(?:_denied)?|run_time_permissions|changed|attach|dataserver|moving_(?:start|end)|link_message|(?:on|object)_rez|remote_data|http_re(?:sponse|quest)|path_update|transaction_result)\\b"}]},{className:"built_in",begin:"\\b(?:ll(?:AgentInExperience|(?:Create|DataSize|Delete|KeyCount|Keys|Read|Update)KeyValue|GetExperience(?:Details|ErrorMessage)|ReturnObjectsBy(?:ID|Owner)|Json(?:2List|[GS]etValue|ValueType)|Sin|Cos|Tan|Atan2|Sqrt|Pow|Abs|Fabs|Frand|Floor|Ceil|Round|Vec(?:Mag|Norm|Dist)|Rot(?:Between|2(?:Euler|Fwd|Left|Up))|(?:Euler|Axes)2Rot|Whisper|(?:Region|Owner)?Say|Shout|Listen(?:Control|Remove)?|Sensor(?:Repeat|Remove)?|Detected(?:Name|Key|Owner|Type|Pos|Vel|Grab|Rot|Group|LinkNumber)|Die|Ground|Wind|(?:[GS]et)(?:AnimationOverride|MemoryLimit|PrimMediaParams|ParcelMusicURL|Object(?:Desc|Name)|PhysicsMaterial|Status|Scale|Color|Alpha|Texture|Pos|Rot|Force|Torque)|ResetAnimationOverride|(?:Scale|Offset|Rotate)Texture|(?:Rot)?Target(?:Remove)?|(?:Stop)?MoveToTarget|Apply(?:Rotational)?Impulse|Set(?:KeyframedMotion|ContentType|RegionPos|(?:Angular)?Velocity|Buoyancy|HoverHeight|ForceAndTorque|TimerEvent|ScriptState|Damage|TextureAnim|Sound(?:Queueing|Radius)|Vehicle(?:Type|(?:Float|Vector|Rotation)Param)|(?:Touch|Sit)?Text|Camera(?:Eye|At)Offset|PrimitiveParams|ClickAction|Link(?:Alpha|Color|PrimitiveParams(?:Fast)?|Texture(?:Anim)?|Camera|Media)|RemoteScriptAccessPin|PayPrice|LocalRot)|ScaleByFactor|Get(?:(?:Max|Min)ScaleFactor|ClosestNavPoint|StaticPath|SimStats|Env|PrimitiveParams|Link(?:PrimitiveParams|Number(?:OfSides)?|Key|Name|Media)|HTTPHeader|FreeURLs|Object(?:Details|PermMask|PrimCount)|Parcel(?:MaxPrims|Details|Prim(?:Count|Owners))|Attached(?:List)?|(?:SPMax|Free|Used)Memory|Region(?:Name|TimeDilation|FPS|Corner|AgentCount)|Root(?:Position|Rotation)|UnixTime|(?:Parcel|Region)Flags|(?:Wall|GMT)clock|SimulatorHostname|BoundingBox|GeometricCenter|Creator|NumberOf(?:Prims|NotecardLines|Sides)|Animation(?:List)?|(?:Camera|Local)(?:Pos|Rot)|Vel|Accel|Omega|Time(?:stamp|OfDay)|(?:Object|CenterOf)?Mass|MassMKS|Energy|Owner|(?:Owner)?Key|SunDirection|Texture(?:Offset|Scale|Rot)|Inventory(?:Number|Name|Key|Type|Creator|PermMask)|Permissions(?:Key)?|StartParameter|List(?:Length|EntryType)|Date|Agent(?:Size|Info|Language|List)|LandOwnerAt|NotecardLine|Script(?:Name|State))|(?:Get|Reset|GetAndReset)Time|PlaySound(?:Slave)?|LoopSound(?:Master|Slave)?|(?:Trigger|Stop|Preload)Sound|(?:(?:Get|Delete)Sub|Insert)String|To(?:Upper|Lower)|Give(?:InventoryList|Money)|RezObject|(?:Stop)?LookAt|Sleep|CollisionFilter|(?:Take|Release)Controls|DetachFromAvatar|AttachToAvatar(?:Temp)?|InstantMessage|(?:GetNext)?Email|StopHover|MinEventDelay|RotLookAt|String(?:Length|Trim)|(?:Start|Stop)Animation|TargetOmega|Request(?:Experience)?Permissions|(?:Create|Break)Link|BreakAllLinks|(?:Give|Remove)Inventory|Water|PassTouches|Request(?:Agent|Inventory)Data|TeleportAgent(?:Home|GlobalCoords)?|ModifyLand|CollisionSound|ResetScript|MessageLinked|PushObject|PassCollisions|AxisAngle2Rot|Rot2(?:Axis|Angle)|A(?:cos|sin)|AngleBetween|AllowInventoryDrop|SubStringIndex|List2(?:CSV|Integer|Json|Float|String|Key|Vector|Rot|List(?:Strided)?)|DeleteSubList|List(?:Statistics|Sort|Randomize|(?:Insert|Find|Replace)List)|EdgeOfWorld|AdjustSoundVolume|Key2Name|TriggerSoundLimited|EjectFromLand|(?:CSV|ParseString)2List|OverMyLand|SameGroup|UnSit|Ground(?:Slope|Normal|Contour)|GroundRepel|(?:Set|Remove)VehicleFlags|SitOnLink|(?:AvatarOn)?(?:Link)?SitTarget|Script(?:Danger|Profiler)|Dialog|VolumeDetect|ResetOtherScript|RemoteLoadScriptPin|(?:Open|Close)RemoteDataChannel|SendRemoteData|RemoteDataReply|(?:Integer|String)ToBase64|XorBase64|Log(?:10)?|Base64To(?:String|Integer)|ParseStringKeepNulls|RezAtRoot|RequestSimulatorData|ForceMouselook|(?:Load|Release|(?:E|Une)scape)URL|ParcelMedia(?:CommandList|Query)|ModPow|MapDestination|(?:RemoveFrom|AddTo|Reset)Land(?:Pass|Ban)List|(?:Set|Clear)CameraParams|HTTP(?:Request|Response)|TextBox|DetectedTouch(?:UV|Face|Pos|(?:N|Bin)ormal|ST)|(?:MD5|SHA1|DumpList2)String|Request(?:Secure)?URL|Clear(?:Prim|Link)Media|(?:Link)?ParticleSystem|(?:Get|Request)(?:Username|DisplayName)|RegionSayTo|CastRay|GenerateKey|TransferLindenDollars|ManageEstateAccess|(?:Create|Delete)Character|ExecCharacterCmd|Evade|FleeFrom|NavigateTo|PatrolPoints|Pursue|UpdateCharacter|WanderWithin))\\b"},{className:"literal",variants:[{begin:"\\b(?:PI|TWO_PI|PI_BY_TWO|DEG_TO_RAD|RAD_TO_DEG|SQRT2)\\b"},{begin:"\\b(?:XP_ERROR_(?:EXPERIENCES_DISABLED|EXPERIENCE_(?:DISABLED|SUSPENDED)|INVALID_(?:EXPERIENCE|PARAMETERS)|KEY_NOT_FOUND|MATURITY_EXCEEDED|NONE|NOT_(?:FOUND|PERMITTED(?:_LAND)?)|NO_EXPERIENCE|QUOTA_EXCEEDED|RETRY_UPDATE|STORAGE_EXCEPTION|STORE_DISABLED|THROTTLED|UNKNOWN_ERROR)|JSON_APPEND|STATUS_(?:PHYSICS|ROTATE_[XYZ]|PHANTOM|SANDBOX|BLOCK_GRAB(?:_OBJECT)?|(?:DIE|RETURN)_AT_EDGE|CAST_SHADOWS|OK|MALFORMED_PARAMS|TYPE_MISMATCH|BOUNDS_ERROR|NOT_(?:FOUND|SUPPORTED)|INTERNAL_ERROR|WHITELIST_FAILED)|AGENT(?:_(?:BY_(?:LEGACY_|USER)NAME|FLYING|ATTACHMENTS|SCRIPTED|MOUSELOOK|SITTING|ON_OBJECT|AWAY|WALKING|IN_AIR|TYPING|CROUCHING|BUSY|ALWAYS_RUN|AUTOPILOT|LIST_(?:PARCEL(?:_OWNER)?|REGION)))?|CAMERA_(?:PITCH|DISTANCE|BEHINDNESS_(?:ANGLE|LAG)|(?:FOCUS|POSITION)(?:_(?:THRESHOLD|LOCKED|LAG))?|FOCUS_OFFSET|ACTIVE)|ANIM_ON|LOOP|REVERSE|PING_PONG|SMOOTH|ROTATE|SCALE|ALL_SIDES|LINK_(?:ROOT|SET|ALL_(?:OTHERS|CHILDREN)|THIS)|ACTIVE|PASS(?:IVE|_(?:ALWAYS|IF_NOT_HANDLED|NEVER))|SCRIPTED|CONTROL_(?:FWD|BACK|(?:ROT_)?(?:LEFT|RIGHT)|UP|DOWN|(?:ML_)?LBUTTON)|PERMISSION_(?:RETURN_OBJECTS|DEBIT|OVERRIDE_ANIMATIONS|SILENT_ESTATE_MANAGEMENT|TAKE_CONTROLS|TRIGGER_ANIMATION|ATTACH|CHANGE_LINKS|(?:CONTROL|TRACK)_CAMERA|TELEPORT)|INVENTORY_(?:TEXTURE|SOUND|OBJECT|SCRIPT|LANDMARK|CLOTHING|NOTECARD|BODYPART|ANIMATION|GESTURE|ALL|NONE)|CHANGED_(?:INVENTORY|COLOR|SHAPE|SCALE|TEXTURE|LINK|ALLOWED_DROP|OWNER|REGION(?:_START)?|TELEPORT|MEDIA)|OBJECT_(?:CLICK_ACTION|HOVER_HEIGHT|LAST_OWNER_ID|(?:PHYSICS|SERVER|STREAMING)_COST|UNKNOWN_DETAIL|CHARACTER_TIME|PHANTOM|PHYSICS|TEMP_(?:ATTACHED|ON_REZ)|NAME|DESC|POS|PRIM_(?:COUNT|EQUIVALENCE)|RETURN_(?:PARCEL(?:_OWNER)?|REGION)|REZZER_KEY|ROO?T|VELOCITY|OMEGA|OWNER|GROUP(?:_TAG)?|CREATOR|ATTACHED_(?:POINT|SLOTS_AVAILABLE)|RENDER_WEIGHT|(?:BODY_SHAPE|PATHFINDING)_TYPE|(?:RUNNING|TOTAL)_SCRIPT_COUNT|TOTAL_INVENTORY_COUNT|SCRIPT_(?:MEMORY|TIME))|TYPE_(?:INTEGER|FLOAT|STRING|KEY|VECTOR|ROTATION|INVALID)|(?:DEBUG|PUBLIC)_CHANNEL|ATTACH_(?:AVATAR_CENTER|CHEST|HEAD|BACK|PELVIS|MOUTH|CHIN|NECK|NOSE|BELLY|[LR](?:SHOULDER|HAND|FOOT|EAR|EYE|[UL](?:ARM|LEG)|HIP)|(?:LEFT|RIGHT)_PEC|HUD_(?:CENTER_[12]|TOP_(?:RIGHT|CENTER|LEFT)|BOTTOM(?:_(?:RIGHT|LEFT))?)|[LR]HAND_RING1|TAIL_(?:BASE|TIP)|[LR]WING|FACE_(?:JAW|[LR]EAR|[LR]EYE|TOUNGE)|GROIN|HIND_[LR]FOOT)|LAND_(?:LEVEL|RAISE|LOWER|SMOOTH|NOISE|REVERT)|DATA_(?:ONLINE|NAME|BORN|SIM_(?:POS|STATUS|RATING)|PAYINFO)|PAYMENT_INFO_(?:ON_FILE|USED)|REMOTE_DATA_(?:CHANNEL|REQUEST|REPLY)|PSYS_(?:PART_(?:BF_(?:ZERO|ONE(?:_MINUS_(?:DEST_COLOR|SOURCE_(ALPHA|COLOR)))?|DEST_COLOR|SOURCE_(ALPHA|COLOR))|BLEND_FUNC_(DEST|SOURCE)|FLAGS|(?:START|END)_(?:COLOR|ALPHA|SCALE|GLOW)|MAX_AGE|(?:RIBBON|WIND|INTERP_(?:COLOR|SCALE)|BOUNCE|FOLLOW_(?:SRC|VELOCITY)|TARGET_(?:POS|LINEAR)|EMISSIVE)_MASK)|SRC_(?:MAX_AGE|PATTERN|ANGLE_(?:BEGIN|END)|BURST_(?:RATE|PART_COUNT|RADIUS|SPEED_(?:MIN|MAX))|ACCEL|TEXTURE|TARGET_KEY|OMEGA|PATTERN_(?:DROP|EXPLODE|ANGLE(?:_CONE(?:_EMPTY)?)?)))|VEHICLE_(?:REFERENCE_FRAME|TYPE_(?:NONE|SLED|CAR|BOAT|AIRPLANE|BALLOON)|(?:LINEAR|ANGULAR)_(?:FRICTION_TIMESCALE|MOTOR_DIRECTION)|LINEAR_MOTOR_OFFSET|HOVER_(?:HEIGHT|EFFICIENCY|TIMESCALE)|BUOYANCY|(?:LINEAR|ANGULAR)_(?:DEFLECTION_(?:EFFICIENCY|TIMESCALE)|MOTOR_(?:DECAY_)?TIMESCALE)|VERTICAL_ATTRACTION_(?:EFFICIENCY|TIMESCALE)|BANKING_(?:EFFICIENCY|MIX|TIMESCALE)|FLAG_(?:NO_DEFLECTION_UP|LIMIT_(?:ROLL_ONLY|MOTOR_UP)|HOVER_(?:(?:WATER|TERRAIN|UP)_ONLY|GLOBAL_HEIGHT)|MOUSELOOK_(?:STEER|BANK)|CAMERA_DECOUPLED))|PRIM_(?:ALLOW_UNSIT|ALPHA_MODE(?:_(?:BLEND|EMISSIVE|MASK|NONE))?|NORMAL|SPECULAR|TYPE(?:_(?:BOX|CYLINDER|PRISM|SPHERE|TORUS|TUBE|RING|SCULPT))?|HOLE_(?:DEFAULT|CIRCLE|SQUARE|TRIANGLE)|MATERIAL(?:_(?:STONE|METAL|GLASS|WOOD|FLESH|PLASTIC|RUBBER))?|SHINY_(?:NONE|LOW|MEDIUM|HIGH)|BUMP_(?:NONE|BRIGHT|DARK|WOOD|BARK|BRICKS|CHECKER|CONCRETE|TILE|STONE|DISKS|GRAVEL|BLOBS|SIDING|LARGETILE|STUCCO|SUCTION|WEAVE)|TEXGEN_(?:DEFAULT|PLANAR)|SCRIPTED_SIT_ONLY|SCULPT_(?:TYPE_(?:SPHERE|TORUS|PLANE|CYLINDER|MASK)|FLAG_(?:MIRROR|INVERT))|PHYSICS(?:_(?:SHAPE_(?:CONVEX|NONE|PRIM|TYPE)))?|(?:POS|ROT)_LOCAL|SLICE|TEXT|FLEXIBLE|POINT_LIGHT|TEMP_ON_REZ|PHANTOM|POSITION|SIT_TARGET|SIZE|ROTATION|TEXTURE|NAME|OMEGA|DESC|LINK_TARGET|COLOR|BUMP_SHINY|FULLBRIGHT|TEXGEN|GLOW|MEDIA_(?:ALT_IMAGE_ENABLE|CONTROLS|(?:CURRENT|HOME)_URL|AUTO_(?:LOOP|PLAY|SCALE|ZOOM)|FIRST_CLICK_INTERACT|(?:WIDTH|HEIGHT)_PIXELS|WHITELIST(?:_ENABLE)?|PERMS_(?:INTERACT|CONTROL)|PARAM_MAX|CONTROLS_(?:STANDARD|MINI)|PERM_(?:NONE|OWNER|GROUP|ANYONE)|MAX_(?:URL_LENGTH|WHITELIST_(?:SIZE|COUNT)|(?:WIDTH|HEIGHT)_PIXELS)))|MASK_(?:BASE|OWNER|GROUP|EVERYONE|NEXT)|PERM_(?:TRANSFER|MODIFY|COPY|MOVE|ALL)|PARCEL_(?:MEDIA_COMMAND_(?:STOP|PAUSE|PLAY|LOOP|TEXTURE|URL|TIME|AGENT|UNLOAD|AUTO_ALIGN|TYPE|SIZE|DESC|LOOP_SET)|FLAG_(?:ALLOW_(?:FLY|(?:GROUP_)?SCRIPTS|LANDMARK|TERRAFORM|DAMAGE|CREATE_(?:GROUP_)?OBJECTS)|USE_(?:ACCESS_(?:GROUP|LIST)|BAN_LIST|LAND_PASS_LIST)|LOCAL_SOUND_ONLY|RESTRICT_PUSHOBJECT|ALLOW_(?:GROUP|ALL)_OBJECT_ENTRY)|COUNT_(?:TOTAL|OWNER|GROUP|OTHER|SELECTED|TEMP)|DETAILS_(?:NAME|DESC|OWNER|GROUP|AREA|ID|SEE_AVATARS))|LIST_STAT_(?:MAX|MIN|MEAN|MEDIAN|STD_DEV|SUM(?:_SQUARES)?|NUM_COUNT|GEOMETRIC_MEAN|RANGE)|PAY_(?:HIDE|DEFAULT)|REGION_FLAG_(?:ALLOW_DAMAGE|FIXED_SUN|BLOCK_TERRAFORM|SANDBOX|DISABLE_(?:COLLISIONS|PHYSICS)|BLOCK_FLY|ALLOW_DIRECT_TELEPORT|RESTRICT_PUSHOBJECT)|HTTP_(?:METHOD|MIMETYPE|BODY_(?:MAXLENGTH|TRUNCATED)|CUSTOM_HEADER|PRAGMA_NO_CACHE|VERBOSE_THROTTLE|VERIFY_CERT)|SIT_(?:INVALID_(?:AGENT|LINK_OBJECT)|NO(?:T_EXPERIENCE|_(?:ACCESS|EXPERIENCE_PERMISSION|SIT_TARGET)))|STRING_(?:TRIM(?:_(?:HEAD|TAIL))?)|CLICK_ACTION_(?:NONE|TOUCH|SIT|BUY|PAY|OPEN(?:_MEDIA)?|PLAY|ZOOM)|TOUCH_INVALID_FACE|PROFILE_(?:NONE|SCRIPT_MEMORY)|RC_(?:DATA_FLAGS|DETECT_PHANTOM|GET_(?:LINK_NUM|NORMAL|ROOT_KEY)|MAX_HITS|REJECT_(?:TYPES|AGENTS|(?:NON)?PHYSICAL|LAND))|RCERR_(?:CAST_TIME_EXCEEDED|SIM_PERF_LOW|UNKNOWN)|ESTATE_ACCESS_(?:ALLOWED_(?:AGENT|GROUP)_(?:ADD|REMOVE)|BANNED_AGENT_(?:ADD|REMOVE))|DENSITY|FRICTION|RESTITUTION|GRAVITY_MULTIPLIER|KFM_(?:COMMAND|CMD_(?:PLAY|STOP|PAUSE)|MODE|FORWARD|LOOP|PING_PONG|REVERSE|DATA|ROTATION|TRANSLATION)|ERR_(?:GENERIC|PARCEL_PERMISSIONS|MALFORMED_PARAMS|RUNTIME_PERMISSIONS|THROTTLED)|CHARACTER_(?:CMD_(?:(?:SMOOTH_)?STOP|JUMP)|DESIRED_(?:TURN_)?SPEED|RADIUS|STAY_WITHIN_PARCEL|LENGTH|ORIENTATION|ACCOUNT_FOR_SKIPPED_FRAMES|AVOIDANCE_MODE|TYPE(?:_(?:[ABCD]|NONE))?|MAX_(?:DECEL|TURN_RADIUS|(?:ACCEL|SPEED)))|PURSUIT_(?:OFFSET|FUZZ_FACTOR|GOAL_TOLERANCE|INTERCEPT)|REQUIRE_LINE_OF_SIGHT|FORCE_DIRECT_PATH|VERTICAL|HORIZONTAL|AVOID_(?:CHARACTERS|DYNAMIC_OBSTACLES|NONE)|PU_(?:EVADE_(?:HIDDEN|SPOTTED)|FAILURE_(?:DYNAMIC_PATHFINDING_DISABLED|INVALID_(?:GOAL|START)|NO_(?:NAVMESH|VALID_DESTINATION)|OTHER|TARGET_GONE|(?:PARCEL_)?UNREACHABLE)|(?:GOAL|SLOWDOWN_DISTANCE)_REACHED)|TRAVERSAL_TYPE(?:_(?:FAST|NONE|SLOW))?|CONTENT_TYPE_(?:ATOM|FORM|HTML|JSON|LLSD|RSS|TEXT|XHTML|XML)|GCNP_(?:RADIUS|STATIC)|(?:PATROL|WANDER)_PAUSE_AT_WAYPOINTS|OPT_(?:AVATAR|CHARACTER|EXCLUSION_VOLUME|LEGACY_LINKSET|MATERIAL_VOLUME|OTHER|STATIC_OBSTACLE|WALKABLE)|SIM_STAT_PCT_CHARS_STEPPED)\\b"},{begin:"\\b(?:FALSE|TRUE)\\b"},{begin:"\\b(?:ZERO_ROTATION)\\b"},{begin:"\\b(?:EOF|JSON_(?:ARRAY|DELETE|FALSE|INVALID|NULL|NUMBER|OBJECT|STRING|TRUE)|NULL_KEY|TEXTURE_(?:BLANK|DEFAULT|MEDIA|PLYWOOD|TRANSPARENT)|URL_REQUEST_(?:GRANTED|DENIED))\\b"},{begin:"\\b(?:ZERO_VECTOR|TOUCH_INVALID_(?:TEXCOORD|VECTOR))\\b"}]},{className:"type",begin:"\\b(?:integer|float|string|key|vector|quaternion|rotation|list)\\b"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/lua.min.js b/vendor/assets/javascripts/highlightjs/languages/lua.min.js
index c478a7a889..8073263fbb 100644
--- a/vendor/assets/javascripts/highlightjs/languages/lua.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/lua.min.js
@@ -1 +1 @@
-hljs.registerLanguage("lua",function(e){var t="\\[=*\\[",a="\\]=*\\]",r={b:t,e:a,c:["self"]},n=[e.C("--(?!"+t+")","$"),e.C("--"+t,a,{c:[r],r:10})];return{l:e.UIR,k:{literal:"true false nil",keyword:"and break do else elseif end for goto if in local not or repeat return then until while",built_in:"_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len __gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstringmodule next pairs pcall print rawequal rawget rawset require select setfenvsetmetatable tonumber tostring type unpack xpcall arg selfcoroutine resume yield status wrap create running debug getupvalue debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv io lines write close flush open output type read stderr stdin input stdout popen tmpfile math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower table setn insert getn foreachi maxn foreach concat sort remove"},c:n.concat([{cN:"function",bK:"function",e:"\\)",c:[e.inherit(e.TM,{b:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),{cN:"params",b:"\\(",eW:!0,c:n}].concat(n)},e.CNM,e.ASM,e.QSM,{cN:"string",b:t,e:a,c:[r],r:5}])}});
\ No newline at end of file
+hljs.registerLanguage("lua",function(){"use strict";return function(e){var t={begin:"\\[=*\\[",end:"\\]=*\\]",contains:["self"]},a=[e.COMMENT("--(?!\\[=*\\[)","$"),e.COMMENT("--\\[=*\\[","\\]=*\\]",{contains:[t],relevance:10})];return{name:"Lua",keywords:{$pattern:e.UNDERSCORE_IDENT_RE,literal:"true false nil",keyword:"and break do else elseif end for goto if in local not or repeat return then until while",built_in:"_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len __gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall arg self coroutine resume yield status wrap create running debug getupvalue debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv io lines write close flush open output type read stderr stdin input stdout popen tmpfile math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower table setn insert getn foreachi maxn foreach concat sort remove"},contains:a.concat([{className:"function",beginKeywords:"function",end:"\\)",contains:[e.inherit(e.TITLE_MODE,{begin:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),{className:"params",begin:"\\(",endsWithParent:!0,contains:a}].concat(a)},e.C_NUMBER_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"string",begin:"\\[=*\\[",end:"\\]=*\\]",contains:[t],relevance:5}])}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/makefile.min.js b/vendor/assets/javascripts/highlightjs/languages/makefile.min.js
index d36bb172b9..0644db0972 100644
--- a/vendor/assets/javascripts/highlightjs/languages/makefile.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/makefile.min.js
@@ -1 +1 @@
-hljs.registerLanguage("makefile",function(e){var i={cN:"variable",v:[{b:"\\$\\("+e.UIR+"\\)",c:[e.BE]},{b:/\$[@%<?\^\+\*]/}]},r={cN:"string",b:/"/,e:/"/,c:[e.BE,i]},a={cN:"variable",b:/\$\([\w-]+\s/,e:/\)/,k:{built_in:"subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value"},c:[i]},n={b:"^"+e.UIR+"\\s*[:+?]?=",i:"\\n",rB:!0,c:[{b:"^"+e.UIR,e:"[:+?]?=",eE:!0}]},t={cN:"meta",b:/^\.PHONY:/,e:/$/,k:{"meta-keyword":".PHONY"},l:/[\.\w]+/},l={cN:"section",b:/^[^\s]+:/,e:/$/,c:[i]};return{aliases:["mk","mak"],k:"define endef undefine ifdef ifndef ifeq ifneq else endif include -include sinclude override export unexport private vpath",l:/[\w-]+/,c:[e.HCM,i,r,a,n,t,l]}});
\ No newline at end of file
+hljs.registerLanguage("makefile",function(){"use strict";return function(e){var i={className:"variable",variants:[{begin:"\\$\\("+e.UNDERSCORE_IDENT_RE+"\\)",contains:[e.BACKSLASH_ESCAPE]},{begin:/\$[@%<?\^\+\*]/}]},n={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,i]},a={className:"variable",begin:/\$\([\w-]+\s/,end:/\)/,keywords:{built_in:"subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value"},contains:[i]},r={begin:"^"+e.UNDERSCORE_IDENT_RE+"\\s*(?=[:+?]?=)"},s={className:"section",begin:/^[^\s]+:/,end:/$/,contains:[i]};return{name:"Makefile",aliases:["mk","mak"],keywords:{$pattern:/[\w-]+/,keyword:"define endef undefine ifdef ifndef ifeq ifneq else endif include -include sinclude override export unexport private vpath"},contains:[e.HASH_COMMENT_MODE,i,n,a,r,{className:"meta",begin:/^\.PHONY:/,end:/$/,keywords:{$pattern:/[\.\w]+/,"meta-keyword":".PHONY"}},s]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/markdown.min.js b/vendor/assets/javascripts/highlightjs/languages/markdown.min.js
index da7a989fad..7c5c0e3da2 100644
--- a/vendor/assets/javascripts/highlightjs/languages/markdown.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/markdown.min.js
@@ -1 +1 @@
-hljs.registerLanguage("markdown",function(e){return{aliases:["md","mkdown","mkd"],c:[{cN:"section",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"quote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"^```w*s*$",e:"^```s*$"},{b:"`.+?`"},{b:"^( {4}|	)",e:"$",r:0}]},{b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"string",b:"\\[",e:"\\]",eB:!0,rE:!0,r:0},{cN:"link",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"symbol",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],r:10},{b:/^\[[^\n]+\]:/,rB:!0,c:[{cN:"symbol",b:/\[/,e:/\]/,eB:!0,eE:!0},{cN:"link",b:/:\s*/,e:/$/,eB:!0}]}]}});
\ No newline at end of file
+hljs.registerLanguage("markdown",function(){"use strict";return function(n){const e={begin:"<",end:">",subLanguage:"xml",relevance:0},a={begin:"\\[.+?\\][\\(\\[].*?[\\)\\]]",returnBegin:!0,contains:[{className:"string",begin:"\\[",end:"\\]",excludeBegin:!0,returnEnd:!0,relevance:0},{className:"link",begin:"\\]\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0},{className:"symbol",begin:"\\]\\[",end:"\\]",excludeBegin:!0,excludeEnd:!0}],relevance:10},i={className:"strong",contains:[],variants:[{begin:/_{2}/,end:/_{2}/},{begin:/\*{2}/,end:/\*{2}/}]},s={className:"emphasis",contains:[],variants:[{begin:/\*(?!\*)/,end:/\*/},{begin:/_(?!_)/,end:/_/,relevance:0}]};i.contains.push(s),s.contains.push(i);var c=[e,a];return i.contains=i.contains.concat(c),s.contains=s.contains.concat(c),{name:"Markdown",aliases:["md","mkdown","mkd"],contains:[{className:"section",variants:[{begin:"^#{1,6}",end:"$",contains:c=c.concat(i,s)},{begin:"(?=^.+?\\n[=-]{2,}$)",contains:[{begin:"^[=-]*$"},{begin:"^",end:"\\n",contains:c}]}]},e,{className:"bullet",begin:"^[ \t]*([*+-]|(\\d+\\.))(?=\\s+)",end:"\\s+",excludeEnd:!0},i,s,{className:"quote",begin:"^>\\s+",contains:c,end:"$"},{className:"code",variants:[{begin:"(`{3,})(.|\\n)*?\\1`*[ ]*"},{begin:"(~{3,})(.|\\n)*?\\1~*[ ]*"},{begin:"```",end:"```+[ ]*$"},{begin:"~~~",end:"~~~+[ ]*$"},{begin:"`.+?`"},{begin:"(?=^( {4}|\\t))",contains:[{begin:"^( {4}|\\t)",end:"(\\n)$"}],relevance:0}]},{begin:"^[-\\*]{3,}",end:"$"},a,{begin:/^\[[^\n]+\]:/,returnBegin:!0,contains:[{className:"symbol",begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0},{className:"link",begin:/:\s*/,end:/$/,excludeBegin:!0}]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/mathematica.min.js b/vendor/assets/javascripts/highlightjs/languages/mathematica.min.js
index d5f6b2ec04..0b1217918f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mathematica.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mathematica.min.js
@@ -1,2 +1 @@
-hljs.registerLanguage("mathematica",function(e){return{aliases:["mma"],l:"(\\$|\\b)"+e.IR+"\\b",k:"AbelianGroup Abort AbortKernels AbortProtect Above Abs Absolute AbsoluteCorrelation AbsoluteCorrelationFunction AbsoluteCurrentValue AbsoluteDashing AbsoluteFileName AbsoluteOptions AbsolutePointSize AbsoluteThickness AbsoluteTime AbsoluteTiming AccountingForm Accumulate Accuracy AccuracyGoal ActionDelay ActionMenu ActionMenuBox ActionMenuBoxOptions Active ActiveItem ActiveStyle AcyclicGraphQ AddOnHelpPath AddTo AdjacencyGraph AdjacencyList AdjacencyMatrix AdjustmentBox AdjustmentBoxOptions AdjustTimeSeriesForecast AffineTransform After AiryAi AiryAiPrime AiryAiZero AiryBi AiryBiPrime AiryBiZero AlgebraicIntegerQ AlgebraicNumber AlgebraicNumberDenominator AlgebraicNumberNorm AlgebraicNumberPolynomial AlgebraicNumberTrace AlgebraicRules AlgebraicRulesData Algebraics AlgebraicUnitQ Alignment AlignmentMarker AlignmentPoint All AllowedDimensions AllowGroupClose AllowInlineCells AllowKernelInitialization AllowReverseGroupClose AllowScriptLevelChange AlphaChannel AlternatingGroup AlternativeHypothesis Alternatives AmbientLight Analytic AnchoredSearch And AndersonDarlingTest AngerJ AngleBracket AngularGauge Animate AnimationCycleOffset AnimationCycleRepetitions AnimationDirection AnimationDisplayTime AnimationRate AnimationRepetitions AnimationRunning Animator AnimatorBox AnimatorBoxOptions AnimatorElements Annotation Annuity AnnuityDue Antialiasing Antisymmetric Apart ApartSquareFree Appearance AppearanceElements AppellF1 Append AppendTo Apply ArcCos ArcCosh ArcCot ArcCoth ArcCsc ArcCsch ArcSec ArcSech ArcSin ArcSinDistribution ArcSinh ArcTan ArcTanh Arg ArgMax ArgMin ArgumentCountQ ARIMAProcess ArithmeticGeometricMean ARMAProcess ARProcess Array ArrayComponents ArrayDepth ArrayFlatten ArrayPad ArrayPlot ArrayQ ArrayReshape ArrayRules Arrays Arrow Arrow3DBox ArrowBox Arrowheads AspectRatio AspectRatioFixed Assert Assuming Assumptions AstronomicalData Asynchronous AsynchronousTaskObject AsynchronousTasks AtomQ Attributes AugmentedSymmetricPolynomial AutoAction AutoDelete AutoEvaluateEvents AutoGeneratedPackage AutoIndent AutoIndentSpacings AutoItalicWords AutoloadPath AutoMatch Automatic AutomaticImageSize AutoMultiplicationSymbol AutoNumberFormatting AutoOpenNotebooks AutoOpenPalettes AutorunSequencing AutoScaling AutoScroll AutoSpacing AutoStyleOptions AutoStyleWords Axes AxesEdge AxesLabel AxesOrigin AxesStyle Axis BabyMonsterGroupB Back Background BackgroundTasksSettings Backslash Backsubstitution Backward Band BandpassFilter BandstopFilter BarabasiAlbertGraphDistribution BarChart BarChart3D BarLegend BarlowProschanImportance BarnesG BarOrigin BarSpacing BartlettHannWindow BartlettWindow BaseForm Baseline BaselinePosition BaseStyle BatesDistribution BattleLemarieWavelet Because BeckmannDistribution Beep Before Begin BeginDialogPacket BeginFrontEndInteractionPacket BeginPackage BellB BellY Below BenfordDistribution BeniniDistribution BenktanderGibratDistribution BenktanderWeibullDistribution BernoulliB BernoulliDistribution BernoulliGraphDistribution BernoulliProcess BernsteinBasis BesselFilterModel BesselI BesselJ BesselJZero BesselK BesselY BesselYZero Beta BetaBinomialDistribution BetaDistribution BetaNegativeBinomialDistribution BetaPrimeDistribution BetaRegularized BetweennessCentrality BezierCurve BezierCurve3DBox BezierCurve3DBoxOptions BezierCurveBox BezierCurveBoxOptions BezierFunction BilateralFilter Binarize BinaryFormat BinaryImageQ BinaryRead BinaryReadList BinaryWrite BinCounts BinLists Binomial BinomialDistribution BinomialProcess BinormalDistribution BiorthogonalSplineWavelet BipartiteGraphQ BirnbaumImportance BirnbaumSaundersDistribution BitAnd BitClear BitGet BitLength BitNot BitOr BitSet BitShiftLeft BitShiftRight BitXor Black BlackmanHarrisWindow BlackmanNuttallWindow BlackmanWindow Blank BlankForm BlankNullSequence BlankSequence Blend Block BlockRandom BlomqvistBeta BlomqvistBetaTest Blue Blur BodePlot BohmanWindow Bold Bookmarks Boole BooleanConsecutiveFunction BooleanConvert BooleanCountingFunction BooleanFunction BooleanGraph BooleanMaxterms BooleanMinimize BooleanMinterms Booleans BooleanTable BooleanVariables BorderDimensions BorelTannerDistribution Bottom BottomHatTransform BoundaryStyle Bounds Box BoxBaselineShift BoxData BoxDimensions Boxed Boxes BoxForm BoxFormFormatTypes BoxFrame BoxID BoxMargins BoxMatrix BoxRatios BoxRotation BoxRotationPoint BoxStyle BoxWhiskerChart Bra BracketingBar BraKet BrayCurtisDistance BreadthFirstScan Break Brown BrownForsytheTest BrownianBridgeProcess BrowserCategory BSplineBasis BSplineCurve BSplineCurve3DBox BSplineCurveBox BSplineCurveBoxOptions BSplineFunction BSplineSurface BSplineSurface3DBox BubbleChart BubbleChart3D BubbleScale BubbleSizes BulletGauge BusinessDayQ ButterflyGraph ButterworthFilterModel Button ButtonBar ButtonBox ButtonBoxOptions ButtonCell ButtonContents ButtonData ButtonEvaluator ButtonExpandable ButtonFrame ButtonFunction ButtonMargins ButtonMinHeight ButtonNote ButtonNotebook ButtonSource ButtonStyle ButtonStyleMenuListing Byte ByteCount ByteOrdering C CachedValue CacheGraphics CalendarData CalendarType CallPacket CanberraDistance Cancel CancelButton CandlestickChart Cap CapForm CapitalDifferentialD CardinalBSplineBasis CarmichaelLambda Cases Cashflow Casoratian Catalan CatalanNumber Catch CauchyDistribution CauchyWindow CayleyGraph CDF CDFDeploy CDFInformation CDFWavelet Ceiling Cell CellAutoOverwrite CellBaseline CellBoundingBox CellBracketOptions CellChangeTimes CellContents CellContext CellDingbat CellDynamicExpression CellEditDuplicate CellElementsBoundingBox CellElementSpacings CellEpilog CellEvaluationDuplicate CellEvaluationFunction CellEventActions CellFrame CellFrameColor CellFrameLabelMargins CellFrameLabels CellFrameMargins CellGroup CellGroupData CellGrouping CellGroupingRules CellHorizontalScrolling CellID CellLabel CellLabelAutoDelete CellLabelMargins CellLabelPositioning CellMargins CellObject CellOpen CellPrint CellProlog Cells CellSize CellStyle CellTags CellularAutomaton CensoredDistribution Censoring Center CenterDot CentralMoment CentralMomentGeneratingFunction CForm ChampernowneNumber ChanVeseBinarize Character CharacterEncoding CharacterEncodingsPath CharacteristicFunction CharacteristicPolynomial CharacterRange Characters ChartBaseStyle ChartElementData ChartElementDataFunction ChartElementFunction ChartElements ChartLabels ChartLayout ChartLegends ChartStyle Chebyshev1FilterModel Chebyshev2FilterModel ChebyshevDistance ChebyshevT ChebyshevU Check CheckAbort CheckAll Checkbox CheckboxBar CheckboxBox CheckboxBoxOptions ChemicalData ChessboardDistance ChiDistribution ChineseRemainder ChiSquareDistribution ChoiceButtons ChoiceDialog CholeskyDecomposition Chop Circle CircleBox CircleDot CircleMinus CirclePlus CircleTimes CirculantGraph CityData Clear ClearAll ClearAttributes ClearSystemCache ClebschGordan ClickPane Clip ClipboardNotebook ClipFill ClippingStyle ClipPlanes ClipRange Clock ClockGauge ClockwiseContourIntegral Close Closed CloseKernels ClosenessCentrality Closing ClosingAutoSave ClosingEvent ClusteringComponents CMYKColor Coarse Coefficient CoefficientArrays CoefficientDomain CoefficientList CoefficientRules CoifletWavelet Collect Colon ColonForm ColorCombine ColorConvert ColorData ColorDataFunction ColorFunction ColorFunctionScaling Colorize ColorNegate ColorOutput ColorProfileData ColorQuantize ColorReplace ColorRules ColorSelectorSettings ColorSeparate ColorSetter ColorSetterBox ColorSetterBoxOptions ColorSlider ColorSpace Column ColumnAlignments ColumnBackgrounds ColumnForm ColumnLines ColumnsEqual ColumnSpacings ColumnWidths CommonDefaultFormatTypes Commonest CommonestFilter CommonUnits CommunityBoundaryStyle CommunityGraphPlot CommunityLabels CommunityRegionStyle CompatibleUnitQ CompilationOptions CompilationTarget Compile Compiled CompiledFunction Complement CompleteGraph CompleteGraphQ CompleteKaryTree CompletionsListPacket Complex Complexes ComplexExpand ComplexInfinity ComplexityFunction ComponentMeasurements ComponentwiseContextMenu Compose ComposeList ComposeSeries Composition CompoundExpression CompoundPoissonDistribution CompoundPoissonProcess CompoundRenewalProcess Compress CompressedData Condition ConditionalExpression Conditioned Cone ConeBox ConfidenceLevel ConfidenceRange ConfidenceTransform ConfigurationPath Congruent Conjugate ConjugateTranspose Conjunction Connect ConnectedComponents ConnectedGraphQ ConnesWindow ConoverTest ConsoleMessage ConsoleMessagePacket ConsolePrint Constant ConstantArray Constants ConstrainedMax ConstrainedMin ContentPadding ContentsBoundingBox ContentSelectable ContentSize Context ContextMenu Contexts ContextToFilename ContextToFileName Continuation Continue ContinuedFraction ContinuedFractionK ContinuousAction ContinuousMarkovProcess ContinuousTimeModelQ ContinuousWaveletData ContinuousWaveletTransform ContourDetect ContourGraphics ContourIntegral ContourLabels ContourLines ContourPlot ContourPlot3D Contours ContourShading ContourSmoothing ContourStyle ContraharmonicMean Control ControlActive ControlAlignment ControllabilityGramian ControllabilityMatrix ControllableDecomposition ControllableModelQ ControllerDuration ControllerInformation ControllerInformationData ControllerLinking ControllerManipulate ControllerMethod ControllerPath ControllerState ControlPlacement ControlsRendering ControlType Convergents ConversionOptions ConversionRules ConvertToBitmapPacket ConvertToPostScript ConvertToPostScriptPacket Convolve ConwayGroupCo1 ConwayGroupCo2 ConwayGroupCo3 CoordinateChartData CoordinatesToolOptions CoordinateTransform CoordinateTransformData CoprimeQ Coproduct CopulaDistribution Copyable CopyDirectory CopyFile CopyTag CopyToClipboard CornerFilter CornerNeighbors Correlation CorrelationDistance CorrelationFunction CorrelationTest Cos Cosh CoshIntegral CosineDistance CosineWindow CosIntegral Cot Coth Count CounterAssignments CounterBox CounterBoxOptions CounterClockwiseContourIntegral CounterEvaluator CounterFunction CounterIncrements CounterStyle CounterStyleMenuListing CountRoots CountryData Covariance CovarianceEstimatorFunction CovarianceFunction CoxianDistribution CoxIngersollRossProcess CoxModel CoxModelFit CramerVonMisesTest CreateArchive CreateDialog CreateDirectory CreateDocument CreateIntermediateDirectories CreatePalette CreatePalettePacket CreateScheduledTask CreateTemporary CreateWindow CriticalityFailureImportance CriticalitySuccessImportance CriticalSection Cross CrossingDetect CrossMatrix Csc Csch CubeRoot Cubics Cuboid CuboidBox Cumulant CumulantGeneratingFunction Cup CupCap Curl CurlyDoubleQuote CurlyQuote CurrentImage CurrentlySpeakingPacket CurrentValue CurvatureFlowFilter CurveClosed Cyan CycleGraph CycleIndexPolynomial Cycles CyclicGroup Cyclotomic Cylinder CylinderBox CylindricalDecomposition D DagumDistribution DamerauLevenshteinDistance DampingFactor Darker Dashed Dashing DataCompression DataDistribution DataRange DataReversed Date DateDelimiters DateDifference DateFunction DateList DateListLogPlot DateListPlot DatePattern DatePlus DateRange DateString DateTicksFormat DaubechiesWavelet DavisDistribution DawsonF DayCount DayCountConvention DayMatchQ DayName DayPlus DayRange DayRound DeBruijnGraph Debug DebugTag Decimal DeclareKnownSymbols DeclarePackage Decompose Decrement DedekindEta Default DefaultAxesStyle DefaultBaseStyle DefaultBoxStyle DefaultButton DefaultColor DefaultControlPlacement DefaultDuplicateCellStyle DefaultDuration DefaultElement DefaultFaceGridsStyle DefaultFieldHintStyle DefaultFont DefaultFontProperties DefaultFormatType DefaultFormatTypeForStyle DefaultFrameStyle DefaultFrameTicksStyle DefaultGridLinesStyle DefaultInlineFormatType DefaultInputFormatType DefaultLabelStyle DefaultMenuStyle DefaultNaturalLanguage DefaultNewCellStyle DefaultNewInlineCellStyle DefaultNotebook DefaultOptions DefaultOutputFormatType DefaultStyle DefaultStyleDefinitions DefaultTextFormatType DefaultTextInlineFormatType DefaultTicksStyle DefaultTooltipStyle DefaultValues Defer DefineExternal DefineInputStreamMethod DefineOutputStreamMethod Definition Degree DegreeCentrality DegreeGraphDistribution DegreeLexicographic DegreeReverseLexicographic Deinitialization Del Deletable Delete DeleteBorderComponents DeleteCases DeleteContents DeleteDirectory DeleteDuplicates DeleteFile DeleteSmallComponents DeleteWithContents DeletionWarning Delimiter DelimiterFlashTime DelimiterMatching Delimiters Denominator DensityGraphics DensityHistogram DensityPlot DependentVariables Deploy Deployed Depth DepthFirstScan Derivative DerivativeFilter DescriptorStateSpace DesignMatrix Det DGaussianWavelet DiacriticalPositioning Diagonal DiagonalMatrix Dialog DialogIndent DialogInput DialogLevel DialogNotebook DialogProlog DialogReturn DialogSymbols Diamond DiamondMatrix DiceDissimilarity DictionaryLookup DifferenceDelta DifferenceOrder DifferenceRoot DifferenceRootReduce Differences DifferentialD DifferentialRoot DifferentialRootReduce DifferentiatorFilter DigitBlock DigitBlockMinimum DigitCharacter DigitCount DigitQ DihedralGroup Dilation Dimensions DiracComb DiracDelta DirectedEdge DirectedEdges DirectedGraph DirectedGraphQ DirectedInfinity Direction Directive Directory DirectoryName DirectoryQ DirectoryStack DirichletCharacter DirichletConvolve DirichletDistribution DirichletL DirichletTransform DirichletWindow DisableConsolePrintPacket DiscreteChirpZTransform DiscreteConvolve DiscreteDelta DiscreteHadamardTransform DiscreteIndicator DiscreteLQEstimatorGains DiscreteLQRegulatorGains DiscreteLyapunovSolve DiscreteMarkovProcess DiscretePlot DiscretePlot3D DiscreteRatio DiscreteRiccatiSolve DiscreteShift DiscreteTimeModelQ DiscreteUniformDistribution DiscreteVariables DiscreteWaveletData DiscreteWaveletPacketTransform DiscreteWaveletTransform Discriminant Disjunction Disk DiskBox DiskMatrix Dispatch DispersionEstimatorFunction Display DisplayAllSteps DisplayEndPacket DisplayFlushImagePacket DisplayForm DisplayFunction DisplayPacket DisplayRules DisplaySetSizePacket DisplayString DisplayTemporary DisplayWith DisplayWithRef DisplayWithVariable DistanceFunction DistanceTransform Distribute Distributed DistributedContexts DistributeDefinitions DistributionChart DistributionDomain DistributionFitTest DistributionParameterAssumptions DistributionParameterQ Dithering Div Divergence Divide DivideBy Dividers Divisible Divisors DivisorSigma DivisorSum DMSList DMSString Do DockedCells DocumentNotebook DominantColors DOSTextFormat Dot DotDashed DotEqual Dotted DoubleBracketingBar DoubleContourIntegral DoubleDownArrow DoubleLeftArrow DoubleLeftRightArrow DoubleLeftTee DoubleLongLeftArrow DoubleLongLeftRightArrow DoubleLongRightArrow DoubleRightArrow DoubleRightTee DoubleUpArrow DoubleUpDownArrow DoubleVerticalBar DoublyInfinite Down DownArrow DownArrowBar DownArrowUpArrow DownLeftRightVector DownLeftTeeVector DownLeftVector DownLeftVectorBar DownRightTeeVector DownRightVector DownRightVectorBar Downsample DownTee DownTeeArrow DownValues DragAndDrop DrawEdges DrawFrontFaces DrawHighlighted Drop DSolve Dt DualLinearProgramming DualSystemsModel DumpGet DumpSave DuplicateFreeQ Dynamic DynamicBox DynamicBoxOptions DynamicEvaluationTimeout DynamicLocation DynamicModule DynamicModuleBox DynamicModuleBoxOptions DynamicModuleParent DynamicModuleValues DynamicName DynamicNamespace DynamicReference DynamicSetting DynamicUpdating DynamicWrapper DynamicWrapperBox DynamicWrapperBoxOptions E EccentricityCentrality EdgeAdd EdgeBetweennessCentrality EdgeCapacity EdgeCapForm EdgeColor EdgeConnectivity EdgeCost EdgeCount EdgeCoverQ EdgeDashing EdgeDelete EdgeDetect EdgeForm EdgeIndex EdgeJoinForm EdgeLabeling EdgeLabels EdgeLabelStyle EdgeList EdgeOpacity EdgeQ EdgeRenderingFunction EdgeRules EdgeShapeFunction EdgeStyle EdgeThickness EdgeWeight Editable EditButtonSettings EditCellTagsSettings EditDistance EffectiveInterest Eigensystem Eigenvalues EigenvectorCentrality Eigenvectors Element ElementData Eliminate EliminationOrder EllipticE EllipticExp EllipticExpPrime EllipticF EllipticFilterModel EllipticK EllipticLog EllipticNomeQ EllipticPi EllipticReducedHalfPeriods EllipticTheta EllipticThetaPrime EmitSound EmphasizeSyntaxErrors EmpiricalDistribution Empty EmptyGraphQ EnableConsolePrintPacket Enabled Encode End EndAdd EndDialogPacket EndFrontEndInteractionPacket EndOfFile EndOfLine EndOfString EndPackage EngineeringForm Enter EnterExpressionPacket EnterTextPacket Entropy EntropyFilter Environment Epilog Equal EqualColumns EqualRows EqualTilde EquatedTo Equilibrium EquirippleFilterKernel Equivalent Erf Erfc Erfi ErlangB ErlangC ErlangDistribution Erosion ErrorBox ErrorBoxOptions ErrorNorm ErrorPacket ErrorsDialogSettings EstimatedDistribution EstimatedProcess EstimatorGains EstimatorRegulator EuclideanDistance EulerE EulerGamma EulerianGraphQ EulerPhi Evaluatable Evaluate Evaluated EvaluatePacket EvaluationCell EvaluationCompletionAction EvaluationElements EvaluationMode EvaluationMonitor EvaluationNotebook EvaluationObject EvaluationOrder Evaluator EvaluatorNames EvenQ EventData EventEvaluator EventHandler EventHandlerTag EventLabels ExactBlackmanWindow ExactNumberQ ExactRootIsolation ExampleData Except ExcludedForms ExcludePods Exclusions ExclusionsStyle Exists Exit ExitDialog Exp Expand ExpandAll ExpandDenominator ExpandFileName ExpandNumerator Expectation ExpectationE ExpectedValue ExpGammaDistribution ExpIntegralE ExpIntegralEi Exponent ExponentFunction ExponentialDistribution ExponentialFamily ExponentialGeneratingFunction ExponentialMovingAverage ExponentialPowerDistribution ExponentPosition ExponentStep Export ExportAutoReplacements ExportPacket ExportString Expression ExpressionCell ExpressionPacket ExpToTrig ExtendedGCD Extension ExtentElementFunction ExtentMarkers ExtentSize ExternalCall ExternalDataCharacterEncoding Extract ExtractArchive ExtremeValueDistribution FaceForm FaceGrids FaceGridsStyle Factor FactorComplete Factorial Factorial2 FactorialMoment FactorialMomentGeneratingFunction FactorialPower FactorInteger FactorList FactorSquareFree FactorSquareFreeList FactorTerms FactorTermsList Fail FailureDistribution False FARIMAProcess FEDisableConsolePrintPacket FeedbackSector FeedbackSectorStyle FeedbackType FEEnableConsolePrintPacket Fibonacci FieldHint FieldHintStyle FieldMasked FieldSize File FileBaseName FileByteCount FileDate FileExistsQ FileExtension FileFormat FileHash FileInformation FileName FileNameDepth FileNameDialogSettings FileNameDrop FileNameJoin FileNames FileNameSetter FileNameSplit FileNameTake FilePrint FileType FilledCurve FilledCurveBox Filling FillingStyle FillingTransform FilterRules FinancialBond FinancialData FinancialDerivative FinancialIndicator Find FindArgMax FindArgMin FindClique FindClusters FindCurvePath FindDistributionParameters FindDivisions FindEdgeCover FindEdgeCut FindEulerianCycle FindFaces FindFile FindFit FindGeneratingFunction FindGeoLocation FindGeometricTransform FindGraphCommunities FindGraphIsomorphism FindGraphPartition FindHamiltonianCycle FindIndependentEdgeSet FindIndependentVertexSet FindInstance FindIntegerNullVector FindKClan FindKClique FindKClub FindKPlex FindLibrary FindLinearRecurrence FindList FindMaximum FindMaximumFlow FindMaxValue FindMinimum FindMinimumCostFlow FindMinimumCut FindMinValue FindPermutation FindPostmanTour FindProcessParameters FindRoot FindSequenceFunction FindSettings FindShortestPath FindShortestTour FindThreshold FindVertexCover FindVertexCut Fine FinishDynamic FiniteAbelianGroupCount FiniteGroupCount FiniteGroupData First FirstPassageTimeDistribution FischerGroupFi22 FischerGroupFi23 FischerGroupFi24Prime FisherHypergeometricDistribution FisherRatioTest FisherZDistribution Fit FitAll FittedModel FixedPoint FixedPointList FlashSelection Flat Flatten FlattenAt FlatTopWindow FlipView Floor FlushPrintOutputPacket Fold FoldList Font FontColor FontFamily FontForm FontName FontOpacity FontPostScriptName FontProperties FontReencoding FontSize FontSlant FontSubstitutions FontTracking FontVariations FontWeight For ForAll Format FormatRules FormatType FormatTypeAutoConvert FormatValues FormBox FormBoxOptions FortranForm Forward ForwardBackward Fourier FourierCoefficient FourierCosCoefficient FourierCosSeries FourierCosTransform FourierDCT FourierDCTFilter FourierDCTMatrix FourierDST FourierDSTMatrix FourierMatrix FourierParameters FourierSequenceTransform FourierSeries FourierSinCoefficient FourierSinSeries FourierSinTransform FourierTransform FourierTrigSeries FractionalBrownianMotionProcess FractionalPart FractionBox FractionBoxOptions FractionLine Frame FrameBox FrameBoxOptions Framed FrameInset FrameLabel Frameless FrameMargins FrameStyle FrameTicks FrameTicksStyle FRatioDistribution FrechetDistribution FreeQ FrequencySamplingFilterKernel FresnelC FresnelS Friday FrobeniusNumber FrobeniusSolve FromCharacterCode FromCoefficientRules FromContinuedFraction FromDate FromDigits FromDMS Front FrontEndDynamicExpression FrontEndEventActions FrontEndExecute FrontEndObject FrontEndResource FrontEndResourceString FrontEndStackSize FrontEndToken FrontEndTokenExecute FrontEndValueCache FrontEndVersion FrontFaceColor FrontFaceOpacity Full FullAxes FullDefinition FullForm FullGraphics FullOptions FullSimplify Function FunctionExpand FunctionInterpolation FunctionSpace FussellVeselyImportance GaborFilter GaborMatrix GaborWavelet GainMargins GainPhaseMargins Gamma GammaDistribution GammaRegularized GapPenalty Gather GatherBy GaugeFaceElementFunction GaugeFaceStyle GaugeFrameElementFunction GaugeFrameSize GaugeFrameStyle GaugeLabels GaugeMarkers GaugeStyle GaussianFilter GaussianIntegers GaussianMatrix GaussianWindow GCD GegenbauerC General GeneralizedLinearModelFit GenerateConditions GeneratedCell GeneratedParameters GeneratingFunction Generic GenericCylindricalDecomposition GenomeData GenomeLookup GeodesicClosing GeodesicDilation GeodesicErosion GeodesicOpening GeoDestination GeodesyData GeoDirection GeoDistance GeoGridPosition GeometricBrownianMotionProcess GeometricDistribution GeometricMean GeometricMeanFilter GeometricTransformation GeometricTransformation3DBox GeometricTransformation3DBoxOptions GeometricTransformationBox GeometricTransformationBoxOptions GeoPosition GeoPositionENU GeoPositionXYZ GeoProjectionData GestureHandler GestureHandlerTag Get GetBoundingBoxSizePacket GetContext GetEnvironment GetFileName GetFrontEndOptionsDataPacket GetLinebreakInformationPacket GetMenusPacket GetPageBreakInformationPacket Glaisher GlobalClusteringCoefficient GlobalPreferences GlobalSession Glow GoldenRatio GompertzMakehamDistribution GoodmanKruskalGamma GoodmanKruskalGammaTest Goto Grad Gradient GradientFilter GradientOrientationFilter Graph GraphAssortativity GraphCenter GraphComplement GraphData GraphDensity GraphDiameter GraphDifference GraphDisjointUnion GraphDistance GraphDistanceMatrix GraphElementData GraphEmbedding GraphHighlight GraphHighlightStyle GraphHub Graphics Graphics3D Graphics3DBox Graphics3DBoxOptions GraphicsArray GraphicsBaseline GraphicsBox GraphicsBoxOptions GraphicsColor GraphicsColumn GraphicsComplex GraphicsComplex3DBox GraphicsComplex3DBoxOptions GraphicsComplexBox GraphicsComplexBoxOptions GraphicsContents GraphicsData GraphicsGrid GraphicsGridBox GraphicsGroup GraphicsGroup3DBox GraphicsGroup3DBoxOptions GraphicsGroupBox GraphicsGroupBoxOptions GraphicsGrouping GraphicsHighlightColor GraphicsRow GraphicsSpacing GraphicsStyle GraphIntersection GraphLayout GraphLinkEfficiency GraphPeriphery GraphPlot GraphPlot3D GraphPower GraphPropertyDistribution GraphQ GraphRadius GraphReciprocity GraphRoot GraphStyle GraphUnion Gray GrayLevel GreatCircleDistance Greater GreaterEqual GreaterEqualLess GreaterFullEqual GreaterGreater GreaterLess GreaterSlantEqual GreaterTilde Green Grid GridBaseline GridBox GridBoxAlignment GridBoxBackground GridBoxDividers GridBoxFrame GridBoxItemSize GridBoxItemStyle GridBoxOptions GridBoxSpacings GridCreationSettings GridDefaultElement GridElementStyleOptions GridFrame GridFrameMargins GridGraph GridLines GridLinesStyle GroebnerBasis GroupActionBase GroupCentralizer GroupElementFromWord GroupElementPosition GroupElementQ GroupElements GroupElementToWord GroupGenerators GroupMultiplicationTable GroupOrbits GroupOrder GroupPageBreakWithin GroupSetwiseStabilizer GroupStabilizer GroupStabilizerChain Gudermannian GumbelDistribution HaarWavelet HadamardMatrix HalfNormalDistribution HamiltonianGraphQ HammingDistance HammingWindow HankelH1 HankelH2 HankelMatrix HannPoissonWindow HannWindow HaradaNortonGroupHN HararyGraph HarmonicMean HarmonicMeanFilter HarmonicNumber Hash HashTable Haversine HazardFunction Head HeadCompose Heads HeavisideLambda HeavisidePi HeavisideTheta HeldGroupHe HeldPart HelpBrowserLookup HelpBrowserNotebook HelpBrowserSettings HermiteDecomposition HermiteH HermitianMatrixQ HessenbergDecomposition Hessian HexadecimalCharacter Hexahedron HexahedronBox HexahedronBoxOptions HiddenSurface HighlightGraph HighlightImage HighpassFilter HigmanSimsGroupHS HilbertFilter HilbertMatrix Histogram Histogram3D HistogramDistribution HistogramList HistogramTransform HistogramTransformInterpolation HitMissTransform HITSCentrality HodgeDual HoeffdingD HoeffdingDTest Hold HoldAll HoldAllComplete HoldComplete HoldFirst HoldForm HoldPattern HoldRest HolidayCalendar HomeDirectory HomePage Horizontal HorizontalForm HorizontalGauge HorizontalScrollPosition HornerForm HotellingTSquareDistribution HoytDistribution HTMLSave Hue HumpDownHump HumpEqual HurwitzLerchPhi HurwitzZeta HyperbolicDistribution HypercubeGraph HyperexponentialDistribution Hyperfactorial Hypergeometric0F1 Hypergeometric0F1Regularized Hypergeometric1F1 Hypergeometric1F1Regularized Hypergeometric2F1 Hypergeometric2F1Regularized HypergeometricDistribution HypergeometricPFQ HypergeometricPFQRegularized HypergeometricU Hyperlink HyperlinkCreationSettings Hyphenation HyphenationOptions HypoexponentialDistribution HypothesisTestData I Identity IdentityMatrix If IgnoreCase Im Image Image3D Image3DSlices ImageAccumulate ImageAdd ImageAdjust ImageAlign ImageApply ImageAspectRatio ImageAssemble ImageCache ImageCacheValid ImageCapture ImageChannels ImageClip ImageColorSpace ImageCompose ImageConvolve ImageCooccurrence ImageCorners ImageCorrelate ImageCorrespondingPoints ImageCrop ImageData ImageDataPacket ImageDeconvolve ImageDemosaic ImageDifference ImageDimensions ImageDistance ImageEffect ImageFeatureTrack ImageFileApply ImageFileFilter ImageFileScan ImageFilter ImageForestingComponents ImageForwardTransformation ImageHistogram ImageKeypoints ImageLevels ImageLines ImageMargins ImageMarkers ImageMeasurements ImageMultiply ImageOffset ImagePad ImagePadding ImagePartition ImagePeriodogram ImagePerspectiveTransformation ImageQ ImageRangeCache ImageReflect ImageRegion ImageResize ImageResolution ImageRotate ImageRotated ImageScaled ImageScan ImageSize ImageSizeAction ImageSizeCache ImageSizeMultipliers ImageSizeRaw ImageSubtract ImageTake ImageTransformation ImageTrim ImageType ImageValue ImageValuePositions Implies Import ImportAutoReplacements ImportString ImprovementImportance In IncidenceGraph IncidenceList IncidenceMatrix IncludeConstantBasis IncludeFileExtension IncludePods IncludeSingularTerm Increment Indent IndentingNewlineSpacings IndentMaxFraction IndependenceTest IndependentEdgeSetQ IndependentUnit IndependentVertexSetQ Indeterminate IndexCreationOptions Indexed IndexGraph IndexTag Inequality InexactNumberQ InexactNumbers Infinity Infix Information Inherited InheritScope Initialization InitializationCell InitializationCellEvaluation InitializationCellWarning InlineCounterAssignments InlineCounterIncrements InlineRules Inner Inpaint Input InputAliases InputAssumptions InputAutoReplacements InputField InputFieldBox InputFieldBoxOptions InputForm InputGrouping InputNamePacket InputNotebook InputPacket InputSettings InputStream InputString InputStringPacket InputToBoxFormPacket Insert InsertionPointObject InsertResults Inset Inset3DBox Inset3DBoxOptions InsetBox InsetBoxOptions Install InstallService InString Integer IntegerDigits IntegerExponent IntegerLength IntegerPart IntegerPartitions IntegerQ Integers IntegerString Integral Integrate Interactive InteractiveTradingChart Interlaced Interleaving InternallyBalancedDecomposition InterpolatingFunction InterpolatingPolynomial Interpolation InterpolationOrder InterpolationPoints InterpolationPrecision Interpretation InterpretationBox InterpretationBoxOptions InterpretationFunction InterpretTemplate InterquartileRange Interrupt InterruptSettings Intersection Interval IntervalIntersection IntervalMemberQ IntervalUnion Inverse InverseBetaRegularized InverseCDF InverseChiSquareDistribution InverseContinuousWaveletTransform InverseDistanceTransform InverseEllipticNomeQ InverseErf InverseErfc InverseFourier InverseFourierCosTransform InverseFourierSequenceTransform InverseFourierSinTransform InverseFourierTransform InverseFunction InverseFunctions InverseGammaDistribution InverseGammaRegularized InverseGaussianDistribution InverseGudermannian InverseHaversine InverseJacobiCD InverseJacobiCN InverseJacobiCS InverseJacobiDC InverseJacobiDN InverseJacobiDS InverseJacobiNC InverseJacobiND InverseJacobiNS InverseJacobiSC InverseJacobiSD InverseJacobiSN InverseLaplaceTransform InversePermutation InverseRadon InverseSeries InverseSurvivalFunction InverseWaveletTransform InverseWeierstrassP InverseZTransform Invisible InvisibleApplication InvisibleTimes IrreduciblePolynomialQ IsolatingInterval IsomorphicGraphQ IsotopeData Italic Item ItemBox ItemBoxOptions ItemSize ItemStyle ItoProcess JaccardDissimilarity JacobiAmplitude Jacobian JacobiCD JacobiCN JacobiCS JacobiDC JacobiDN JacobiDS JacobiNC JacobiND JacobiNS JacobiP JacobiSC JacobiSD JacobiSN JacobiSymbol JacobiZeta JankoGroupJ1 JankoGroupJ2 JankoGroupJ3 JankoGroupJ4 JarqueBeraALMTest JohnsonDistribution Join Joined JoinedCurve JoinedCurveBox JoinForm JordanDecomposition JordanModelDecomposition K KagiChart KaiserBesselWindow KaiserWindow KalmanEstimator KalmanFilter KarhunenLoeveDecomposition KaryTree KatzCentrality KCoreComponents KDistribution KelvinBei KelvinBer KelvinKei KelvinKer KendallTau KendallTauTest KernelExecute KernelMixtureDistribution KernelObject Kernels Ket Khinchin KirchhoffGraph KirchhoffMatrix KleinInvariantJ KnightTourGraph KnotData KnownUnitQ KolmogorovSmirnovTest KroneckerDelta KroneckerModelDecomposition KroneckerProduct KroneckerSymbol KuiperTest KumaraswamyDistribution Kurtosis KuwaharaFilter Label Labeled LabeledSlider LabelingFunction LabelStyle LaguerreL LambdaComponents LambertW LanczosWindow LandauDistribution Language LanguageCategory LaplaceDistribution LaplaceTransform Laplacian LaplacianFilter LaplacianGaussianFilter Large Larger Last Latitude LatitudeLongitude LatticeData LatticeReduce Launch LaunchKernels LayeredGraphPlot LayerSizeFunction LayoutInformation LCM LeafCount LeapYearQ LeastSquares LeastSquaresFilterKernel Left LeftArrow LeftArrowBar LeftArrowRightArrow LeftDownTeeVector LeftDownVector LeftDownVectorBar LeftRightArrow LeftRightVector LeftTee LeftTeeArrow LeftTeeVector LeftTriangle LeftTriangleBar LeftTriangleEqual LeftUpDownVector LeftUpTeeVector LeftUpVector LeftUpVectorBar LeftVector LeftVectorBar LegendAppearance Legended LegendFunction LegendLabel LegendLayout LegendMargins LegendMarkers LegendMarkerSize LegendreP LegendreQ LegendreType Length LengthWhile LerchPhi Less LessEqual LessEqualGreater LessFullEqual LessGreater LessLess LessSlantEqual LessTilde LetterCharacter LetterQ Level LeveneTest LeviCivitaTensor LevyDistribution Lexicographic LibraryFunction LibraryFunctionError LibraryFunctionInformation LibraryFunctionLoad LibraryFunctionUnload LibraryLoad LibraryUnload LicenseID LiftingFilterData LiftingWaveletTransform LightBlue LightBrown LightCyan Lighter LightGray LightGreen Lighting LightingAngle LightMagenta LightOrange LightPink LightPurple LightRed LightSources LightYellow Likelihood Limit LimitsPositioning LimitsPositioningTokens LindleyDistribution Line Line3DBox LinearFilter LinearFractionalTransform LinearModelFit LinearOffsetFunction LinearProgramming LinearRecurrence LinearSolve LinearSolveFunction LineBox LineBreak LinebreakAdjustments LineBreakChart LineBreakWithin LineColor LineForm LineGraph LineIndent LineIndentMaxFraction LineIntegralConvolutionPlot LineIntegralConvolutionScale LineLegend LineOpacity LineSpacing LineWrapParts LinkActivate LinkClose LinkConnect LinkConnectedQ LinkCreate LinkError LinkFlush LinkFunction LinkHost LinkInterrupt LinkLaunch LinkMode LinkObject LinkOpen LinkOptions LinkPatterns LinkProtocol LinkRead LinkReadHeld LinkReadyQ Links LinkWrite LinkWriteHeld LiouvilleLambda List Listable ListAnimate ListContourPlot ListContourPlot3D ListConvolve ListCorrelate ListCurvePathPlot ListDeconvolve ListDensityPlot Listen ListFourierSequenceTransform ListInterpolation ListLineIntegralConvolutionPlot ListLinePlot ListLogLinearPlot ListLogLogPlot ListLogPlot ListPicker ListPickerBox ListPickerBoxBackground ListPickerBoxOptions ListPlay ListPlot ListPlot3D ListPointPlot3D ListPolarPlot ListQ ListStreamDensityPlot ListStreamPlot ListSurfacePlot3D ListVectorDensityPlot ListVectorPlot ListVectorPlot3D ListZTransform Literal LiteralSearch LocalClusteringCoefficient LocalizeVariables LocationEquivalenceTest LocationTest Locator LocatorAutoCreate LocatorBox LocatorBoxOptions LocatorCentering LocatorPane LocatorPaneBox LocatorPaneBoxOptions LocatorRegion Locked Log Log10 Log2 LogBarnesG LogGamma LogGammaDistribution LogicalExpand LogIntegral LogisticDistribution LogitModelFit LogLikelihood LogLinearPlot LogLogisticDistribution LogLogPlot LogMultinormalDistribution LogNormalDistribution LogPlot LogRankTest LogSeriesDistribution LongEqual Longest LongestAscendingSequence LongestCommonSequence LongestCommonSequencePositions LongestCommonSubsequence LongestCommonSubsequencePositions LongestMatch LongForm Longitude LongLeftArrow LongLeftRightArrow LongRightArrow Loopback LoopFreeGraphQ LowerCaseQ LowerLeftArrow LowerRightArrow LowerTriangularize LowpassFilter LQEstimatorGains LQGRegulator LQOutputRegulatorGains LQRegulatorGains LUBackSubstitution LucasL LuccioSamiComponents LUDecomposition LyapunovSolve LyonsGroupLy MachineID MachineName MachineNumberQ MachinePrecision MacintoshSystemPageSetup Magenta Magnification Magnify MainSolve MaintainDynamicCaches Majority MakeBoxes MakeExpression MakeRules MangoldtLambda ManhattanDistance Manipulate Manipulator MannWhitneyTest MantissaExponent Manual Map MapAll MapAt MapIndexed MAProcess MapThread MarcumQ MardiaCombinedTest MardiaKurtosisTest MardiaSkewnessTest MarginalDistribution MarkovProcessProperties Masking MatchingDissimilarity MatchLocalNameQ MatchLocalNames MatchQ Material MathematicaNotation MathieuC MathieuCharacteristicA MathieuCharacteristicB MathieuCharacteristicExponent MathieuCPrime MathieuGroupM11 MathieuGroupM12 MathieuGroupM22 MathieuGroupM23 MathieuGroupM24 MathieuS MathieuSPrime MathMLForm MathMLText Matrices MatrixExp MatrixForm MatrixFunction MatrixLog MatrixPlot MatrixPower MatrixQ MatrixRank Max MaxBend MaxDetect MaxExtraBandwidths MaxExtraConditions MaxFeatures MaxFilter Maximize MaxIterations MaxMemoryUsed MaxMixtureKernels MaxPlotPoints MaxPoints MaxRecursion MaxStableDistribution MaxStepFraction MaxSteps MaxStepSize MaxValue MaxwellDistribution McLaughlinGroupMcL Mean MeanClusteringCoefficient MeanDegreeConnectivity MeanDeviation MeanFilter MeanGraphDistance MeanNeighborDegree MeanShift MeanShiftFilter Median MedianDeviation MedianFilter Medium MeijerG MeixnerDistribution MemberQ MemoryConstrained MemoryInUse Menu MenuAppearance MenuCommandKey MenuEvaluator MenuItem MenuPacket MenuSortingValue MenuStyle MenuView MergeDifferences Mesh MeshFunctions MeshRange MeshShading MeshStyle Message MessageDialog MessageList MessageName MessageOptions MessagePacket Messages MessagesNotebook MetaCharacters MetaInformation Method MethodOptions MexicanHatWavelet MeyerWavelet Min MinDetect MinFilter MinimalPolynomial MinimalStateSpaceModel Minimize Minors MinRecursion MinSize MinStableDistribution Minus MinusPlus MinValue Missing MissingDataMethod MittagLefflerE MixedRadix MixedRadixQuantity MixtureDistribution Mod Modal Mode Modular ModularLambda Module Modulus MoebiusMu Moment Momentary MomentConvert MomentEvaluate MomentGeneratingFunction Monday Monitor MonomialList MonomialOrder MonsterGroupM MorletWavelet MorphologicalBinarize MorphologicalBranchPoints MorphologicalComponents MorphologicalEulerNumber MorphologicalGraph MorphologicalPerimeter MorphologicalTransform Most MouseAnnotation MouseAppearance MouseAppearanceTag MouseButtons Mouseover MousePointerNote MousePosition MovingAverage MovingMedian MoyalDistribution MultiedgeStyle MultilaunchWarning MultiLetterItalics MultiLetterStyle MultilineFunction Multinomial MultinomialDistribution MultinormalDistribution MultiplicativeOrder Multiplicity Multiselection MultivariateHypergeometricDistribution MultivariatePoissonDistribution MultivariateTDistribution N NakagamiDistribution NameQ Names NamespaceBox Nand NArgMax NArgMin NBernoulliB NCache NDSolve NDSolveValue Nearest NearestFunction NeedCurrentFrontEndPackagePacket NeedCurrentFrontEndSymbolsPacket NeedlemanWunschSimilarity Needs Negative NegativeBinomialDistribution NegativeMultinomialDistribution NeighborhoodGraph Nest NestedGreaterGreater NestedLessLess NestedScriptRules NestList NestWhile NestWhileList NevilleThetaC NevilleThetaD NevilleThetaN NevilleThetaS NewPrimitiveStyle NExpectation Next NextPrime NHoldAll NHoldFirst NHoldRest NicholsGridLines NicholsPlot NIntegrate NMaximize NMaxValue NMinimize NMinValue NominalVariables NonAssociative NoncentralBetaDistribution NoncentralChiSquareDistribution NoncentralFRatioDistribution NoncentralStudentTDistribution NonCommutativeMultiply NonConstants None NonlinearModelFit NonlocalMeansFilter NonNegative NonPositive Nor NorlundB Norm Normal NormalDistribution NormalGrouping Normalize NormalizedSquaredEuclideanDistance NormalsFunction NormFunction Not NotCongruent NotCupCap NotDoubleVerticalBar Notebook NotebookApply NotebookAutoSave NotebookClose NotebookConvertSettings NotebookCreate NotebookCreateReturnObject NotebookDefault NotebookDelete NotebookDirectory NotebookDynamicExpression NotebookEvaluate NotebookEventActions NotebookFileName NotebookFind NotebookFindReturnObject NotebookGet NotebookGetLayoutInformationPacket NotebookGetMisspellingsPacket NotebookInformation NotebookInterfaceObject NotebookLocate NotebookObject NotebookOpen NotebookOpenReturnObject NotebookPath NotebookPrint NotebookPut NotebookPutReturnObject NotebookRead NotebookResetGeneratedCells Notebooks NotebookSave NotebookSaveAs NotebookSelection NotebookSetupLayoutInformationPacket NotebooksMenu NotebookWrite NotElement NotEqualTilde NotExists NotGreater NotGreaterEqual NotGreaterFullEqual NotGreaterGreater NotGreaterLess NotGreaterSlantEqual NotGreaterTilde NotHumpDownHump NotHumpEqual NotLeftTriangle NotLeftTriangleBar NotLeftTriangleEqual NotLess NotLessEqual NotLessFullEqual NotLessGreater NotLessLess NotLessSlantEqual NotLessTilde NotNestedGreaterGreater NotNestedLessLess NotPrecedes NotPrecedesEqual NotPrecedesSlantEqual NotPrecedesTilde NotReverseElement NotRightTriangle NotRightTriangleBar NotRightTriangleEqual NotSquareSubset NotSquareSubsetEqual NotSquareSuperset NotSquareSupersetEqual NotSubset NotSubsetEqual NotSucceeds NotSucceedsEqual NotSucceedsSlantEqual NotSucceedsTilde NotSuperset NotSupersetEqual NotTilde NotTildeEqual NotTildeFullEqual NotTildeTilde NotVerticalBar NProbability NProduct NProductFactors NRoots NSolve NSum NSumTerms Null NullRecords NullSpace NullWords Number NumberFieldClassNumber NumberFieldDiscriminant NumberFieldFundamentalUnits NumberFieldIntegralBasis NumberFieldNormRepresentatives NumberFieldRegulator NumberFieldRootsOfUnity NumberFieldSignature NumberForm NumberFormat NumberMarks NumberMultiplier NumberPadding NumberPoint NumberQ NumberSeparator NumberSigns NumberString Numerator NumericFunction NumericQ NuttallWindow NValues NyquistGridLines NyquistPlot O ObservabilityGramian ObservabilityMatrix ObservableDecomposition ObservableModelQ OddQ Off Offset OLEData On ONanGroupON OneIdentity Opacity Open OpenAppend Opener OpenerBox OpenerBoxOptions OpenerView OpenFunctionInspectorPacket Opening OpenRead OpenSpecialOptions OpenTemporary OpenWrite Operate OperatingSystem OptimumFlowData Optional OptionInspectorSettings OptionQ Options OptionsPacket OptionsPattern OptionValue OptionValueBox OptionValueBoxOptions Or Orange Order OrderDistribution OrderedQ Ordering Orderless OrnsteinUhlenbeckProcess Orthogonalize Out Outer OutputAutoOverwrite OutputControllabilityMatrix OutputControllableModelQ OutputForm OutputFormData OutputGrouping OutputMathEditExpression OutputNamePacket OutputResponse OutputSizeLimit OutputStream Over OverBar OverDot Overflow OverHat Overlaps Overlay OverlayBox OverlayBoxOptions Overscript OverscriptBox OverscriptBoxOptions OverTilde OverVector OwenT OwnValues PackingMethod PaddedForm Padding PadeApproximant PadLeft PadRight PageBreakAbove PageBreakBelow PageBreakWithin PageFooterLines PageFooters PageHeaderLines PageHeaders PageHeight PageRankCentrality PageWidth PairedBarChart PairedHistogram PairedSmoothHistogram PairedTTest PairedZTest PaletteNotebook PalettePath Pane PaneBox PaneBoxOptions Panel PanelBox PanelBoxOptions Paneled PaneSelector PaneSelectorBox PaneSelectorBoxOptions PaperWidth ParabolicCylinderD ParagraphIndent ParagraphSpacing ParallelArray ParallelCombine ParallelDo ParallelEvaluate Parallelization Parallelize ParallelMap ParallelNeeds ParallelProduct ParallelSubmit ParallelSum ParallelTable ParallelTry Parameter ParameterEstimator ParameterMixtureDistribution ParameterVariables ParametricFunction ParametricNDSolve ParametricNDSolveValue ParametricPlot ParametricPlot3D ParentConnect ParentDirectory ParentForm Parenthesize ParentList ParetoDistribution Part PartialCorrelationFunction PartialD ParticleData Partition PartitionsP PartitionsQ ParzenWindow PascalDistribution PassEventsDown PassEventsUp Paste PasteBoxFormInlineCells PasteButton Path PathGraph PathGraphQ Pattern PatternSequence PatternTest PauliMatrix PaulWavelet Pause PausedTime PDF PearsonChiSquareTest PearsonCorrelationTest PearsonDistribution PerformanceGoal PeriodicInterpolation Periodogram PeriodogramArray PermutationCycles PermutationCyclesQ PermutationGroup PermutationLength PermutationList PermutationListQ PermutationMax PermutationMin PermutationOrder PermutationPower PermutationProduct PermutationReplace Permutations PermutationSupport Permute PeronaMalikFilter Perpendicular PERTDistribution PetersenGraph PhaseMargins Pi Pick PIDData PIDDerivativeFilter PIDFeedforward PIDTune Piecewise PiecewiseExpand PieChart PieChart3D PillaiTrace PillaiTraceTest Pink Pivoting PixelConstrained PixelValue PixelValuePositions Placed Placeholder PlaceholderReplace Plain PlanarGraphQ Play PlayRange Plot Plot3D Plot3Matrix PlotDivision PlotJoined PlotLabel PlotLayout PlotLegends PlotMarkers PlotPoints PlotRange PlotRangeClipping PlotRangePadding PlotRegion PlotStyle Plus PlusMinus Pochhammer PodStates PodWidth Point Point3DBox PointBox PointFigureChart PointForm PointLegend PointSize PoissonConsulDistribution PoissonDistribution PoissonProcess PoissonWindow PolarAxes PolarAxesOrigin PolarGridLines PolarPlot PolarTicks PoleZeroMarkers PolyaAeppliDistribution PolyGamma Polygon Polygon3DBox Polygon3DBoxOptions PolygonBox PolygonBoxOptions PolygonHoleScale PolygonIntersections PolygonScale PolyhedronData PolyLog PolynomialExtendedGCD PolynomialForm PolynomialGCD PolynomialLCM PolynomialMod PolynomialQ PolynomialQuotient PolynomialQuotientRemainder PolynomialReduce PolynomialRemainder Polynomials PopupMenu PopupMenuBox PopupMenuBoxOptions PopupView PopupWindow Position Positive PositiveDefiniteMatrixQ PossibleZeroQ Postfix PostScript Power PowerDistribution PowerExpand PowerMod PowerModList PowerSpectralDensity PowersRepresentations PowerSymmetricPolynomial Precedence PrecedenceForm Precedes PrecedesEqual PrecedesSlantEqual PrecedesTilde Precision PrecisionGoal PreDecrement PredictionRoot PreemptProtect PreferencesPath Prefix PreIncrement Prepend PrependTo PreserveImageOptions Previous PriceGraphDistribution PrimaryPlaceholder Prime PrimeNu PrimeOmega PrimePi PrimePowerQ PrimeQ Primes PrimeZetaP PrimitiveRoot PrincipalComponents PrincipalValue Print PrintAction PrintForm PrintingCopies PrintingOptions PrintingPageRange PrintingStartingPageNumber PrintingStyleEnvironment PrintPrecision PrintTemporary Prism PrismBox PrismBoxOptions PrivateCellOptions PrivateEvaluationOptions PrivateFontOptions PrivateFrontEndOptions PrivateNotebookOptions PrivatePaths Probability ProbabilityDistribution ProbabilityPlot ProbabilityPr ProbabilityScalePlot ProbitModelFit ProcessEstimator ProcessParameterAssumptions ProcessParameterQ ProcessStateDomain ProcessTimeDomain Product ProductDistribution ProductLog ProgressIndicator ProgressIndicatorBox ProgressIndicatorBoxOptions Projection Prolog PromptForm Properties Property PropertyList PropertyValue Proportion Proportional Protect Protected ProteinData Pruning PseudoInverse Purple Put PutAppend Pyramid PyramidBox PyramidBoxOptions QBinomial QFactorial QGamma QHypergeometricPFQ QPochhammer QPolyGamma QRDecomposition QuadraticIrrationalQ Quantile QuantilePlot Quantity QuantityForm QuantityMagnitude QuantityQ QuantityUnit Quartics QuartileDeviation Quartiles QuartileSkewness QueueingNetworkProcess QueueingProcess QueueProperties Quiet Quit Quotient QuotientRemainder RadialityCentrality RadicalBox RadicalBoxOptions RadioButton RadioButtonBar RadioButtonBox RadioButtonBoxOptions Radon RamanujanTau RamanujanTauL RamanujanTauTheta RamanujanTauZ Random RandomChoice RandomComplex RandomFunction RandomGraph RandomImage RandomInteger RandomPermutation RandomPrime RandomReal RandomSample RandomSeed RandomVariate RandomWalkProcess Range RangeFilter RangeSpecification RankedMax RankedMin Raster Raster3D Raster3DBox Raster3DBoxOptions RasterArray RasterBox RasterBoxOptions Rasterize RasterSize Rational RationalFunctions Rationalize Rationals Ratios Raw RawArray RawBoxes RawData RawMedium RayleighDistribution Re Read ReadList ReadProtected Real RealBlockDiagonalForm RealDigits RealExponent Reals Reap Record RecordLists RecordSeparators Rectangle RectangleBox RectangleBoxOptions RectangleChart RectangleChart3D RecurrenceFilter RecurrenceTable RecurringDigitsForm Red Reduce RefBox ReferenceLineStyle ReferenceMarkers ReferenceMarkerStyle Refine ReflectionMatrix ReflectionTransform Refresh RefreshRate RegionBinarize RegionFunction RegionPlot RegionPlot3D RegularExpression Regularization Reinstall Release ReleaseHold ReliabilityDistribution ReliefImage ReliefPlot Remove RemoveAlphaChannel RemoveAsynchronousTask Removed RemoveInputStreamMethod RemoveOutputStreamMethod RemoveProperty RemoveScheduledTask RenameDirectory RenameFile RenderAll RenderingOptions RenewalProcess RenkoChart Repeated RepeatedNull RepeatedString Replace ReplaceAll ReplaceHeldPart ReplaceImageValue ReplaceList ReplacePart ReplacePixelValue ReplaceRepeated Resampling Rescale RescalingTransform ResetDirectory ResetMenusPacket ResetScheduledTask Residue Resolve Rest Resultant ResumePacket Return ReturnExpressionPacket ReturnInputFormPacket ReturnPacket ReturnTextPacket Reverse ReverseBiorthogonalSplineWavelet ReverseElement ReverseEquilibrium ReverseGraph ReverseUpEquilibrium RevolutionAxis RevolutionPlot3D RGBColor RiccatiSolve RiceDistribution RidgeFilter RiemannR RiemannSiegelTheta RiemannSiegelZ Riffle Right RightArrow RightArrowBar RightArrowLeftArrow RightCosetRepresentative RightDownTeeVector RightDownVector RightDownVectorBar RightTee RightTeeArrow RightTeeVector RightTriangle RightTriangleBar RightTriangleEqual RightUpDownVector RightUpTeeVector RightUpVector RightUpVectorBar RightVector RightVectorBar RiskAchievementImportance RiskReductionImportance RogersTanimotoDissimilarity Root RootApproximant RootIntervals RootLocusPlot RootMeanSquare RootOfUnityQ RootReduce Roots RootSum Rotate RotateLabel RotateLeft RotateRight RotationAction RotationBox RotationBoxOptions RotationMatrix RotationTransform Round RoundImplies RoundingRadius Row RowAlignments RowBackgrounds RowBox RowHeights RowLines RowMinHeight RowReduce RowsEqual RowSpacings RSolve RudvalisGroupRu Rule RuleCondition RuleDelayed RuleForm RulerUnits Run RunScheduledTask RunThrough RuntimeAttributes RuntimeOptions RussellRaoDissimilarity SameQ SameTest SampleDepth SampledSoundFunction SampledSoundList SampleRate SamplingPeriod SARIMAProcess SARMAProcess SatisfiabilityCount SatisfiabilityInstances SatisfiableQ Saturday Save Saveable SaveAutoDelete SaveDefinitions SawtoothWave Scale Scaled ScaleDivisions ScaledMousePosition ScaleOrigin ScalePadding ScaleRanges ScaleRangeStyle ScalingFunctions ScalingMatrix ScalingTransform Scan ScheduledTaskActiveQ ScheduledTaskData ScheduledTaskObject ScheduledTasks SchurDecomposition ScientificForm ScreenRectangle ScreenStyleEnvironment ScriptBaselineShifts ScriptLevel ScriptMinSize ScriptRules ScriptSizeMultipliers Scrollbars ScrollingOptions ScrollPosition Sec Sech SechDistribution SectionGrouping SectorChart SectorChart3D SectorOrigin SectorSpacing SeedRandom Select Selectable SelectComponents SelectedCells SelectedNotebook Selection SelectionAnimate SelectionCell SelectionCellCreateCell SelectionCellDefaultStyle SelectionCellParentStyle SelectionCreateCell SelectionDebuggerTag SelectionDuplicateCell SelectionEvaluate SelectionEvaluateCreateCell SelectionMove SelectionPlaceholder SelectionSetStyle SelectWithContents SelfLoops SelfLoopStyle SemialgebraicComponentInstances SendMail Sequence SequenceAlignment SequenceForm SequenceHold SequenceLimit Series SeriesCoefficient SeriesData SessionTime Set SetAccuracy SetAlphaChannel SetAttributes Setbacks SetBoxFormNamesPacket SetDelayed SetDirectory SetEnvironment SetEvaluationNotebook SetFileDate SetFileLoadingContext SetNotebookStatusLine SetOptions SetOptionsPacket SetPrecision SetProperty SetSelectedNotebook SetSharedFunction SetSharedVariable SetSpeechParametersPacket SetStreamPosition SetSystemOptions Setter SetterBar SetterBox SetterBoxOptions Setting SetValue Shading Shallow ShannonWavelet ShapiroWilkTest Share Sharpen ShearingMatrix ShearingTransform ShenCastanMatrix Short ShortDownArrow Shortest ShortestMatch ShortestPathFunction ShortLeftArrow ShortRightArrow ShortUpArrow Show ShowAutoStyles ShowCellBracket ShowCellLabel ShowCellTags ShowClosedCellArea ShowContents ShowControls ShowCursorTracker ShowGroupOpenCloseIcon ShowGroupOpener ShowInvisibleCharacters ShowPageBreaks ShowPredictiveInterface ShowSelection ShowShortBoxForm ShowSpecialCharacters ShowStringCharacters ShowSyntaxStyles ShrinkingDelay ShrinkWrapBoundingBox SiegelTheta SiegelTukeyTest Sign Signature SignedRankTest SignificanceLevel SignPadding SignTest SimilarityRules SimpleGraph SimpleGraphQ Simplify Sin Sinc SinghMaddalaDistribution SingleEvaluation SingleLetterItalics SingleLetterStyle SingularValueDecomposition SingularValueList SingularValuePlot SingularValues Sinh SinhIntegral SinIntegral SixJSymbol Skeleton SkeletonTransform SkellamDistribution Skewness SkewNormalDistribution Skip SliceDistribution Slider Slider2D Slider2DBox Slider2DBoxOptions SliderBox SliderBoxOptions SlideView Slot SlotSequence Small SmallCircle Smaller SmithDelayCompensator SmithWatermanSimilarity SmoothDensityHistogram SmoothHistogram SmoothHistogram3D SmoothKernelDistribution SocialMediaData Socket SokalSneathDissimilarity Solve SolveAlways SolveDelayed Sort SortBy Sound SoundAndGraphics SoundNote SoundVolume Sow Space SpaceForm Spacer Spacings Span SpanAdjustments SpanCharacterRounding SpanFromAbove SpanFromBoth SpanFromLeft SpanLineThickness SpanMaxSize SpanMinSize SpanningCharacters SpanSymmetric SparseArray SpatialGraphDistribution Speak SpeakTextPacket SpearmanRankTest SpearmanRho Spectrogram SpectrogramArray Specularity SpellingCorrection SpellingDictionaries SpellingDictionariesPath SpellingOptions SpellingSuggestionsPacket Sphere SphereBox SphericalBesselJ SphericalBesselY SphericalHankelH1 SphericalHankelH2 SphericalHarmonicY SphericalPlot3D SphericalRegion SpheroidalEigenvalue SpheroidalJoiningFactor SpheroidalPS SpheroidalPSPrime SpheroidalQS SpheroidalQSPrime SpheroidalRadialFactor SpheroidalS1 SpheroidalS1Prime SpheroidalS2 SpheroidalS2Prime Splice SplicedDistribution SplineClosed SplineDegree SplineKnots SplineWeights Split SplitBy SpokenString Sqrt SqrtBox SqrtBoxOptions Square SquaredEuclideanDistance SquareFreeQ SquareIntersection SquaresR SquareSubset SquareSubsetEqual SquareSuperset SquareSupersetEqual SquareUnion SquareWave StabilityMargins StabilityMarginsStyle StableDistribution Stack StackBegin StackComplete StackInhibit StandardDeviation StandardDeviationFilter StandardForm Standardize StandbyDistribution Star StarGraph StartAsynchronousTask StartingStepSize StartOfLine StartOfString StartScheduledTask StartupSound StateDimensions StateFeedbackGains StateOutputEstimator StateResponse StateSpaceModel StateSpaceRealization StateSpaceTransform StationaryDistribution StationaryWaveletPacketTransform StationaryWaveletTransform StatusArea StatusCentrality StepMonitor StieltjesGamma StirlingS1 StirlingS2 StopAsynchronousTask StopScheduledTask StrataVariables StratonovichProcess StreamColorFunction StreamColorFunctionScaling StreamDensityPlot StreamPlot StreamPoints StreamPosition Streams StreamScale StreamStyle String StringBreak StringByteCount StringCases StringCount StringDrop StringExpression StringForm StringFormat StringFreeQ StringInsert StringJoin StringLength StringMatchQ StringPosition StringQ StringReplace StringReplaceList StringReplacePart StringReverse StringRotateLeft StringRotateRight StringSkeleton StringSplit StringTake StringToStream StringTrim StripBoxes StripOnInput StripWrapperBoxes StrokeForm StructuralImportance StructuredArray StructuredSelection StruveH StruveL Stub StudentTDistribution Style StyleBox StyleBoxAutoDelete StyleBoxOptions StyleData StyleDefinitions StyleForm StyleKeyMapping StyleMenuListing StyleNameDialogSettings StyleNames StylePrint StyleSheetPath Subfactorial Subgraph SubMinus SubPlus SubresultantPolynomialRemainders SubresultantPolynomials Subresultants Subscript SubscriptBox SubscriptBoxOptions Subscripted Subset SubsetEqual Subsets SubStar Subsuperscript SubsuperscriptBox SubsuperscriptBoxOptions Subtract SubtractFrom SubValues Succeeds SucceedsEqual SucceedsSlantEqual SucceedsTilde SuchThat Sum SumConvergence Sunday SuperDagger SuperMinus SuperPlus Superscript SuperscriptBox SuperscriptBoxOptions Superset SupersetEqual SuperStar Surd SurdForm SurfaceColor SurfaceGraphics SurvivalDistribution SurvivalFunction SurvivalModel SurvivalModelFit SuspendPacket SuzukiDistribution SuzukiGroupSuz SwatchLegend Switch Symbol SymbolName SymletWavelet Symmetric SymmetricGroup SymmetricMatrixQ SymmetricPolynomial SymmetricReduction Symmetrize SymmetrizedArray SymmetrizedArrayRules SymmetrizedDependentComponents SymmetrizedIndependentComponents SymmetrizedReplacePart SynchronousInitialization SynchronousUpdating Syntax SyntaxForm SyntaxInformation SyntaxLength SyntaxPacket SyntaxQ SystemDialogInput SystemException SystemHelpPath SystemInformation SystemInformationData SystemOpen SystemOptions SystemsModelDelay SystemsModelDelayApproximate SystemsModelDelete SystemsModelDimensions SystemsModelExtract SystemsModelFeedbackConnect SystemsModelLabels SystemsModelOrder SystemsModelParallelConnect SystemsModelSeriesConnect SystemsModelStateFeedbackConnect SystemStub Tab TabFilling Table TableAlignments TableDepth TableDirections TableForm TableHeadings TableSpacing TableView TableViewBox TabSpacings TabView TabViewBox TabViewBoxOptions TagBox TagBoxNote TagBoxOptions TaggingRules TagSet TagSetDelayed TagStyle TagUnset Take TakeWhile Tally Tan Tanh TargetFunctions TargetUnits TautologyQ TelegraphProcess TemplateBox TemplateBoxOptions TemplateSlotSequence TemporalData Temporary TemporaryVariable TensorContract TensorDimensions TensorExpand TensorProduct TensorQ TensorRank TensorReduce TensorSymmetry TensorTranspose TensorWedge Tetrahedron TetrahedronBox TetrahedronBoxOptions TeXForm TeXSave Text Text3DBox Text3DBoxOptions TextAlignment TextBand TextBoundingBox TextBox TextCell TextClipboardType TextData TextForm TextJustification TextLine TextPacket TextParagraph TextRecognize TextRendering TextStyle Texture TextureCoordinateFunction TextureCoordinateScaling Therefore ThermometerGauge Thick Thickness Thin Thinning ThisLink ThompsonGroupTh Thread ThreeJSymbol Threshold Through Throw Thumbnail Thursday Ticks TicksStyle Tilde TildeEqual TildeFullEqual TildeTilde TimeConstrained TimeConstraint Times TimesBy TimeSeriesForecast TimeSeriesInvertibility TimeUsed TimeValue TimeZone Timing Tiny TitleGrouping TitsGroupT ToBoxes ToCharacterCode ToColor ToContinuousTimeModel ToDate ToDiscreteTimeModel ToeplitzMatrix ToExpression ToFileName Together Toggle ToggleFalse Toggler TogglerBar TogglerBox TogglerBoxOptions ToHeldExpression ToInvertibleTimeSeries TokenWords Tolerance ToLowerCase ToNumberField TooBig Tooltip TooltipBox TooltipBoxOptions TooltipDelay TooltipStyle Top TopHatTransform TopologicalSort ToRadicals ToRules ToString Total TotalHeight TotalVariationFilter TotalWidth TouchscreenAutoZoom TouchscreenControlPlacement ToUpperCase Tr Trace TraceAbove TraceAction TraceBackward TraceDepth TraceDialog TraceForward TraceInternal TraceLevel TraceOff TraceOn TraceOriginal TracePrint TraceScan TrackedSymbols TradingChart TraditionalForm TraditionalFunctionNotation TraditionalNotation TraditionalOrder TransferFunctionCancel TransferFunctionExpand TransferFunctionFactor TransferFunctionModel TransferFunctionPoles TransferFunctionTransform TransferFunctionZeros TransformationFunction TransformationFunctions TransformationMatrix TransformedDistribution TransformedField Translate TranslationTransform TransparentColor Transpose TreeForm TreeGraph TreeGraphQ TreePlot TrendStyle TriangleWave TriangularDistribution Trig TrigExpand TrigFactor TrigFactorList Trigger TrigReduce TrigToExp TrimmedMean True TrueQ TruncatedDistribution TsallisQExponentialDistribution TsallisQGaussianDistribution TTest Tube TubeBezierCurveBox TubeBezierCurveBoxOptions TubeBox TubeBSplineCurveBox TubeBSplineCurveBoxOptions Tuesday TukeyLambdaDistribution TukeyWindow Tuples TuranGraph TuringMachine Transparent UnateQ Uncompress Undefined UnderBar Underflow Underlined Underoverscript UnderoverscriptBox UnderoverscriptBoxOptions Underscript UnderscriptBox UnderscriptBoxOptions UndirectedEdge UndirectedGraph UndirectedGraphQ UndocumentedTestFEParserPacket UndocumentedTestGetSelectionPacket Unequal Unevaluated UniformDistribution UniformGraphDistribution UniformSumDistribution Uninstall Union UnionPlus Unique UnitBox UnitConvert UnitDimensions Unitize UnitRootTest UnitSimplify UnitStep UnitTriangle UnitVector Unprotect UnsameQ UnsavedVariables Unset UnsetShared UntrackedVariables Up UpArrow UpArrowBar UpArrowDownArrow Update UpdateDynamicObjects UpdateDynamicObjectsSynchronous UpdateInterval UpDownArrow UpEquilibrium UpperCaseQ UpperLeftArrow UpperRightArrow UpperTriangularize Upsample UpSet UpSetDelayed UpTee UpTeeArrow UpValues URL URLFetch URLFetchAsynchronous URLSave URLSaveAsynchronous UseGraphicsRange Using UsingFrontEnd V2Get ValidationLength Value ValueBox ValueBoxOptions ValueForm ValueQ ValuesData Variables Variance VarianceEquivalenceTest VarianceEstimatorFunction VarianceGammaDistribution VarianceTest VectorAngle VectorColorFunction VectorColorFunctionScaling VectorDensityPlot VectorGlyphData VectorPlot VectorPlot3D VectorPoints VectorQ Vectors VectorScale VectorStyle Vee Verbatim Verbose VerboseConvertToPostScriptPacket VerifyConvergence VerifySolutions VerifyTestAssumptions Version VersionNumber VertexAdd VertexCapacity VertexColors VertexComponent VertexConnectivity VertexCoordinateRules VertexCoordinates VertexCorrelationSimilarity VertexCosineSimilarity VertexCount VertexCoverQ VertexDataCoordinates VertexDegree VertexDelete VertexDiceSimilarity VertexEccentricity VertexInComponent VertexInDegree VertexIndex VertexJaccardSimilarity VertexLabeling VertexLabels VertexLabelStyle VertexList VertexNormals VertexOutComponent VertexOutDegree VertexQ VertexRenderingFunction VertexReplace VertexShape VertexShapeFunction VertexSize VertexStyle VertexTextureCoordinates VertexWeight Vertical VerticalBar VerticalForm VerticalGauge VerticalSeparator VerticalSlider VerticalTilde ViewAngle ViewCenter ViewMatrix ViewPoint ViewPointSelectorSettings ViewPort ViewRange ViewVector ViewVertical VirtualGroupData Visible VisibleCell VoigtDistribution VonMisesDistribution WaitAll WaitAsynchronousTask WaitNext WaitUntil WakebyDistribution WalleniusHypergeometricDistribution WaringYuleDistribution WatershedComponents WatsonUSquareTest WattsStrogatzGraphDistribution WaveletBestBasis WaveletFilterCoefficients WaveletImagePlot WaveletListPlot WaveletMapIndexed WaveletMatrixPlot WaveletPhi WaveletPsi WaveletScale WaveletScalogram WaveletThreshold WeaklyConnectedComponents WeaklyConnectedGraphQ WeakStationarity WeatherData WeberE Wedge Wednesday WeibullDistribution WeierstrassHalfPeriods WeierstrassInvariants WeierstrassP WeierstrassPPrime WeierstrassSigma WeierstrassZeta WeightedAdjacencyGraph WeightedAdjacencyMatrix WeightedData WeightedGraphQ Weights WelchWindow WheelGraph WhenEvent Which While White Whitespace WhitespaceCharacter WhittakerM WhittakerW WienerFilter WienerProcess WignerD WignerSemicircleDistribution WilksW WilksWTest WindowClickSelect WindowElements WindowFloating WindowFrame WindowFrameElements WindowMargins WindowMovable WindowOpacity WindowSelected WindowSize WindowStatusArea WindowTitle WindowToolbars WindowWidth With WolframAlpha WolframAlphaDate WolframAlphaQuantity WolframAlphaResult Word WordBoundary WordCharacter WordData WordSearch WordSeparators WorkingPrecision Write WriteString Wronskian XMLElement XMLObject Xnor Xor Yellow YuleDissimilarity ZernikeR ZeroSymmetric ZeroTest ZeroWidthTimes Zeta ZetaZero ZipfDistribution ZTest ZTransform $Aborted $ActivationGroupID $ActivationKey $ActivationUserRegistered $AddOnsDirectory $AssertFunction $Assumptions $AsynchronousTask $BaseDirectory $BatchInput $BatchOutput $BoxForms $ByteOrdering $Canceled $CharacterEncoding $CharacterEncodings $CommandLine $CompilationTarget $ConditionHold $ConfiguredKernels $Context $ContextPath $ControlActiveSetting $CreationDate $CurrentLink $DateStringFormat $DefaultFont $DefaultFrontEnd $DefaultImagingDevice $DefaultPath $Display $DisplayFunction $DistributedContexts $DynamicEvaluation $Echo $Epilog $ExportFormats $Failed $FinancialDataSource $FormatType $FrontEnd $FrontEndSession $GeoLocation $HistoryLength $HomeDirectory $HTTPCookies $IgnoreEOF $ImagingDevices $ImportFormats $InitialDirectory $Input $InputFileName $InputStreamMethods $Inspector $InstallationDate $InstallationDirectory $InterfaceEnvironment $IterationLimit $KernelCount $KernelID $Language $LaunchDirectory $LibraryPath $LicenseExpirationDate $LicenseID $LicenseProcesses $LicenseServer $LicenseSubprocesses $LicenseType $Line $Linked $LinkSupported $LoadedFiles $MachineAddresses $MachineDomain $MachineDomains $MachineEpsilon $MachineID $MachineName $MachinePrecision $MachineType $MaxExtraPrecision $MaxLicenseProcesses $MaxLicenseSubprocesses $MaxMachineNumber $MaxNumber $MaxPiecewiseCases $MaxPrecision $MaxRootDegree $MessageGroups $MessageList $MessagePrePrint $Messages $MinMachineNumber $MinNumber $MinorReleaseNumber $MinPrecision $ModuleNumber $NetworkLicense $NewMessage $NewSymbol $Notebooks $NumberMarks $Off $OperatingSystem $Output $OutputForms $OutputSizeLimit $OutputStreamMethods $Packages $ParentLink $ParentProcessID $PasswordFile $PatchLevelID $Path $PathnameSeparator $PerformanceGoal $PipeSupported $Post $Pre $PreferencesDirectory $PrePrint $PreRead $PrintForms $PrintLiteral $ProcessID $ProcessorCount $ProcessorType $ProductInformation $ProgramName $RandomState $RecursionLimit $ReleaseNumber $RootDirectory $ScheduledTask $ScriptCommandLine $SessionID $SetParentLink $SharedFunctions $SharedVariables $SoundDisplay $SoundDisplayFunction $SuppressInputFormHeads $SynchronousEvaluation $SyntaxHandler $System $SystemCharacterEncoding $SystemID $SystemWordLength $TemporaryDirectory $TemporaryPrefix $TextStyle $TimedOut $TimeUnit $TimeZone $TopDirectory $TraceOff $TraceOn $TracePattern $TracePostAction $TracePreAction $Urgent $UserAddOnsDirectory $UserBaseDirectory $UserDocumentsDirectory $UserName $Version $VersionNumber",
-c:[{cN:"comment",b:/\(\*/,e:/\*\)/},e.ASM,e.QSM,e.CNM,{b:/\{/,e:/\}/,i:/:/}]}});
\ No newline at end of file
+hljs.registerLanguage("mathematica",function(){"use strict";return function(e){return{name:"Mathematica",aliases:["mma","wl"],keywords:{$pattern:"(\\$|\\b)"+e.IDENT_RE+"\\b",keyword:"AASTriangle AbelianGroup Abort AbortKernels AbortProtect AbortScheduledTask Above Abs AbsArg AbsArgPlot Absolute AbsoluteCorrelation AbsoluteCorrelationFunction AbsoluteCurrentValue AbsoluteDashing AbsoluteFileName AbsoluteOptions AbsolutePointSize AbsoluteThickness AbsoluteTime AbsoluteTiming AcceptanceThreshold AccountingForm Accumulate Accuracy AccuracyGoal ActionDelay ActionMenu ActionMenuBox ActionMenuBoxOptions Activate Active ActiveClassification ActiveClassificationObject ActiveItem ActivePrediction ActivePredictionObject ActiveStyle AcyclicGraphQ AddOnHelpPath AddSides AddTo AddToSearchIndex AddUsers AdjacencyGraph AdjacencyList AdjacencyMatrix AdjustmentBox AdjustmentBoxOptions AdjustTimeSeriesForecast AdministrativeDivisionData AffineHalfSpace AffineSpace AffineStateSpaceModel AffineTransform After AggregatedEntityClass AggregationLayer AircraftData AirportData AirPressureData AirTemperatureData AiryAi AiryAiPrime AiryAiZero AiryBi AiryBiPrime AiryBiZero AlgebraicIntegerQ AlgebraicNumber AlgebraicNumberDenominator AlgebraicNumberNorm AlgebraicNumberPolynomial AlgebraicNumberTrace AlgebraicRules AlgebraicRulesData Algebraics AlgebraicUnitQ Alignment AlignmentMarker AlignmentPoint All AllowAdultContent AllowedCloudExtraParameters AllowedCloudParameterExtensions AllowedDimensions AllowedFrequencyRange AllowedHeads AllowGroupClose AllowIncomplete AllowInlineCells AllowKernelInitialization AllowLooseGrammar AllowReverseGroupClose AllowScriptLevelChange AllTrue Alphabet AlphabeticOrder AlphabeticSort AlphaChannel AlternateImage AlternatingFactorial AlternatingGroup AlternativeHypothesis Alternatives AltitudeMethod AmbientLight AmbiguityFunction AmbiguityList Analytic AnatomyData AnatomyForm AnatomyPlot3D AnatomySkinStyle AnatomyStyling AnchoredSearch And AndersonDarlingTest AngerJ AngleBisector AngleBracket AnglePath AnglePath3D AngleVector AngularGauge Animate AnimationCycleOffset AnimationCycleRepetitions AnimationDirection AnimationDisplayTime AnimationRate AnimationRepetitions AnimationRunning AnimationRunTime AnimationTimeIndex Animator AnimatorBox AnimatorBoxOptions AnimatorElements Annotate Annotation AnnotationDelete AnnotationNames AnnotationRules AnnotationValue Annuity AnnuityDue Annulus AnomalyDetection AnomalyDetectorFunction Anonymous Antialiasing AntihermitianMatrixQ Antisymmetric AntisymmetricMatrixQ Antonyms AnyOrder AnySubset AnyTrue Apart ApartSquareFree APIFunction Appearance AppearanceElements AppearanceRules AppellF1 Append AppendCheck AppendLayer AppendTo ApplicationIdentificationKey Apply ApplySides ArcCos ArcCosh ArcCot ArcCoth ArcCsc ArcCsch ArcCurvature ARCHProcess ArcLength ArcSec ArcSech ArcSin ArcSinDistribution ArcSinh ArcTan ArcTanh Area Arg ArgMax ArgMin ArgumentCountQ ARIMAProcess ArithmeticGeometricMean ARMAProcess Around AroundReplace ARProcess Array ArrayComponents ArrayDepth ArrayFilter ArrayFlatten ArrayMesh ArrayPad ArrayPlot ArrayQ ArrayResample ArrayReshape ArrayRules Arrays Arrow Arrow3DBox ArrowBox Arrowheads ASATriangle Ask AskAppend AskConfirm AskDisplay AskedQ AskedValue AskFunction AskState AskTemplateDisplay AspectRatio AspectRatioFixed Assert AssociateTo Association AssociationFormat AssociationMap AssociationQ AssociationThread AssumeDeterministic Assuming Assumptions AstronomicalData AsymptoticDSolveValue AsymptoticEqual AsymptoticEquivalent AsymptoticGreater AsymptoticGreaterEqual AsymptoticIntegrate AsymptoticLess AsymptoticLessEqual AsymptoticOutputTracker AsymptoticRSolveValue AsymptoticSolve AsymptoticSum Asynchronous AsynchronousTaskObject AsynchronousTasks Atom AtomCoordinates AtomCount AtomDiagramCoordinates AtomList AtomQ AttentionLayer Attributes Audio AudioAmplify AudioAnnotate AudioAnnotationLookup AudioBlockMap AudioCapture AudioChannelAssignment AudioChannelCombine AudioChannelMix AudioChannels AudioChannelSeparate AudioData AudioDelay AudioDelete AudioDevice AudioDistance AudioFade AudioFrequencyShift AudioGenerator AudioIdentify AudioInputDevice AudioInsert AudioIntervals AudioJoin AudioLabel AudioLength AudioLocalMeasurements AudioLooping AudioLoudness AudioMeasurements AudioNormalize AudioOutputDevice AudioOverlay AudioPad AudioPan AudioPartition AudioPause AudioPitchShift AudioPlay AudioPlot AudioQ AudioRecord AudioReplace AudioResample AudioReverb AudioSampleRate AudioSpectralMap AudioSpectralTransformation AudioSplit AudioStop AudioStream AudioStreams AudioTimeStretch AudioTrim AudioType AugmentedPolyhedron AugmentedSymmetricPolynomial Authenticate Authentication AuthenticationDialog AutoAction Autocomplete AutocompletionFunction AutoCopy AutocorrelationTest AutoDelete AutoEvaluateEvents AutoGeneratedPackage AutoIndent AutoIndentSpacings AutoItalicWords AutoloadPath AutoMatch Automatic AutomaticImageSize AutoMultiplicationSymbol AutoNumberFormatting AutoOpenNotebooks AutoOpenPalettes AutoQuoteCharacters AutoRefreshed AutoRemove AutorunSequencing AutoScaling AutoScroll AutoSpacing AutoStyleOptions AutoStyleWords AutoSubmitting Axes AxesEdge AxesLabel AxesOrigin AxesStyle AxiomaticTheory Axis BabyMonsterGroupB Back Background BackgroundAppearance BackgroundTasksSettings Backslash Backsubstitution Backward Ball Band BandpassFilter BandstopFilter BarabasiAlbertGraphDistribution BarChart BarChart3D BarcodeImage BarcodeRecognize BaringhausHenzeTest BarLegend BarlowProschanImportance BarnesG BarOrigin BarSpacing BartlettHannWindow BartlettWindow BaseDecode BaseEncode BaseForm Baseline BaselinePosition BaseStyle BasicRecurrentLayer BatchNormalizationLayer BatchSize BatesDistribution BattleLemarieWavelet BayesianMaximization BayesianMaximizationObject BayesianMinimization BayesianMinimizationObject Because BeckmannDistribution Beep Before Begin BeginDialogPacket BeginFrontEndInteractionPacket BeginPackage BellB BellY Below BenfordDistribution BeniniDistribution BenktanderGibratDistribution BenktanderWeibullDistribution BernoulliB BernoulliDistribution BernoulliGraphDistribution BernoulliProcess BernsteinBasis BesselFilterModel BesselI BesselJ BesselJZero BesselK BesselY BesselYZero Beta BetaBinomialDistribution BetaDistribution BetaNegativeBinomialDistribution BetaPrimeDistribution BetaRegularized Between BetweennessCentrality BeveledPolyhedron BezierCurve BezierCurve3DBox BezierCurve3DBoxOptions BezierCurveBox BezierCurveBoxOptions BezierFunction BilateralFilter Binarize BinaryDeserialize BinaryDistance BinaryFormat BinaryImageQ BinaryRead BinaryReadList BinarySerialize BinaryWrite BinCounts BinLists Binomial BinomialDistribution BinomialProcess BinormalDistribution BiorthogonalSplineWavelet BipartiteGraphQ BiquadraticFilterModel BirnbaumImportance BirnbaumSaundersDistribution BitAnd BitClear BitGet BitLength BitNot BitOr BitSet BitShiftLeft BitShiftRight BitXor BiweightLocation BiweightMidvariance Black BlackmanHarrisWindow BlackmanNuttallWindow BlackmanWindow Blank BlankForm BlankNullSequence BlankSequence Blend Block BlockchainAddressData BlockchainBase BlockchainBlockData BlockchainContractValue BlockchainData BlockchainGet BlockchainKeyEncode BlockchainPut BlockchainTokenData BlockchainTransaction BlockchainTransactionData BlockchainTransactionSign BlockchainTransactionSubmit BlockMap BlockRandom BlomqvistBeta BlomqvistBetaTest Blue Blur BodePlot BohmanWindow Bold Bond BondCount BondList BondQ Bookmarks Boole BooleanConsecutiveFunction BooleanConvert BooleanCountingFunction BooleanFunction BooleanGraph BooleanMaxterms BooleanMinimize BooleanMinterms BooleanQ BooleanRegion Booleans BooleanStrings BooleanTable BooleanVariables BorderDimensions BorelTannerDistribution Bottom BottomHatTransform BoundaryDiscretizeGraphics BoundaryDiscretizeRegion BoundaryMesh BoundaryMeshRegion BoundaryMeshRegionQ BoundaryStyle BoundedRegionQ BoundingRegion Bounds Box BoxBaselineShift BoxData BoxDimensions Boxed Boxes BoxForm BoxFormFormatTypes BoxFrame BoxID BoxMargins BoxMatrix BoxObject BoxRatios BoxRotation BoxRotationPoint BoxStyle BoxWhiskerChart Bra BracketingBar BraKet BrayCurtisDistance BreadthFirstScan Break BridgeData BrightnessEqualize BroadcastStationData Brown BrownForsytheTest BrownianBridgeProcess BrowserCategory BSplineBasis BSplineCurve BSplineCurve3DBox BSplineCurve3DBoxOptions BSplineCurveBox BSplineCurveBoxOptions BSplineFunction BSplineSurface BSplineSurface3DBox BSplineSurface3DBoxOptions BubbleChart BubbleChart3D BubbleScale BubbleSizes BuildingData BulletGauge BusinessDayQ ButterflyGraph ButterworthFilterModel Button ButtonBar ButtonBox ButtonBoxOptions ButtonCell ButtonContents ButtonData ButtonEvaluator ButtonExpandable ButtonFrame ButtonFunction ButtonMargins ButtonMinHeight ButtonNote ButtonNotebook ButtonSource ButtonStyle ButtonStyleMenuListing Byte ByteArray ByteArrayFormat ByteArrayQ ByteArrayToString ByteCount ByteOrdering C CachedValue CacheGraphics CachePersistence CalendarConvert CalendarData CalendarType Callout CalloutMarker CalloutStyle CallPacket CanberraDistance Cancel CancelButton CandlestickChart CanonicalGraph CanonicalizePolygon CanonicalizePolyhedron CanonicalName CanonicalWarpingCorrespondence CanonicalWarpingDistance CantorMesh CantorStaircase Cap CapForm CapitalDifferentialD Capitalize CapsuleShape CaptureRunning CardinalBSplineBasis CarlemanLinearize CarmichaelLambda CaseOrdering Cases CaseSensitive Cashflow Casoratian Catalan CatalanNumber Catch Catenate CatenateLayer CauchyDistribution CauchyWindow CayleyGraph CDF CDFDeploy CDFInformation CDFWavelet Ceiling CelestialSystem Cell CellAutoOverwrite CellBaseline CellBoundingBox CellBracketOptions CellChangeTimes CellContents CellContext CellDingbat CellDynamicExpression CellEditDuplicate CellElementsBoundingBox CellElementSpacings CellEpilog CellEvaluationDuplicate CellEvaluationFunction CellEvaluationLanguage CellEventActions CellFrame CellFrameColor CellFrameLabelMargins CellFrameLabels CellFrameMargins CellGroup CellGroupData CellGrouping CellGroupingRules CellHorizontalScrolling CellID CellLabel CellLabelAutoDelete CellLabelMargins CellLabelPositioning CellLabelStyle CellLabelTemplate CellMargins CellObject CellOpen CellPrint CellProlog Cells CellSize CellStyle CellTags CellularAutomaton CensoredDistribution Censoring Center CenterArray CenterDot CentralFeature CentralMoment CentralMomentGeneratingFunction Cepstrogram CepstrogramArray CepstrumArray CForm ChampernowneNumber ChangeOptions ChannelBase ChannelBrokerAction ChannelDatabin ChannelHistoryLength ChannelListen ChannelListener ChannelListeners ChannelListenerWait ChannelObject ChannelPreSendFunction ChannelReceiverFunction ChannelSend ChannelSubscribers ChanVeseBinarize Character CharacterCounts CharacterEncoding CharacterEncodingsPath CharacteristicFunction CharacteristicPolynomial CharacterName CharacterRange Characters ChartBaseStyle ChartElementData ChartElementDataFunction ChartElementFunction ChartElements ChartLabels ChartLayout ChartLegends ChartStyle Chebyshev1FilterModel Chebyshev2FilterModel ChebyshevDistance ChebyshevT ChebyshevU Check CheckAbort CheckAll Checkbox CheckboxBar CheckboxBox CheckboxBoxOptions ChemicalData ChessboardDistance ChiDistribution ChineseRemainder ChiSquareDistribution ChoiceButtons ChoiceDialog CholeskyDecomposition Chop ChromaticityPlot ChromaticityPlot3D ChromaticPolynomial Circle CircleBox CircleDot CircleMinus CirclePlus CirclePoints CircleThrough CircleTimes CirculantGraph CircularOrthogonalMatrixDistribution CircularQuaternionMatrixDistribution CircularRealMatrixDistribution CircularSymplecticMatrixDistribution CircularUnitaryMatrixDistribution Circumsphere CityData ClassifierFunction ClassifierInformation ClassifierMeasurements ClassifierMeasurementsObject Classify ClassPriors Clear ClearAll ClearAttributes ClearCookies ClearPermissions ClearSystemCache ClebschGordan ClickPane Clip ClipboardNotebook ClipFill ClippingStyle ClipPlanes ClipPlanesStyle ClipRange Clock ClockGauge ClockwiseContourIntegral Close Closed CloseKernels ClosenessCentrality Closing ClosingAutoSave ClosingEvent CloudAccountData CloudBase CloudConnect CloudDeploy CloudDirectory CloudDisconnect CloudEvaluate CloudExport CloudExpression CloudExpressions CloudFunction CloudGet CloudImport CloudLoggingData CloudObject CloudObjectInformation CloudObjectInformationData CloudObjectNameFormat CloudObjects CloudObjectURLType CloudPublish CloudPut CloudRenderingMethod CloudSave CloudShare CloudSubmit CloudSymbol CloudUnshare ClusterClassify ClusterDissimilarityFunction ClusteringComponents ClusteringTree CMYKColor Coarse CodeAssistOptions Coefficient CoefficientArrays CoefficientDomain CoefficientList CoefficientRules CoifletWavelet Collect Colon ColonForm ColorBalance ColorCombine ColorConvert ColorCoverage ColorData ColorDataFunction ColorDetect ColorDistance ColorFunction ColorFunctionScaling Colorize ColorNegate ColorOutput ColorProfileData ColorQ ColorQuantize ColorReplace ColorRules ColorSelectorSettings ColorSeparate ColorSetter ColorSetterBox ColorSetterBoxOptions ColorSlider ColorsNear ColorSpace ColorToneMapping Column ColumnAlignments ColumnBackgrounds ColumnForm ColumnLines ColumnsEqual ColumnSpacings ColumnWidths CombinedEntityClass CombinerFunction CometData CommonDefaultFormatTypes Commonest CommonestFilter CommonName CommonUnits CommunityBoundaryStyle CommunityGraphPlot CommunityLabels CommunityRegionStyle CompanyData CompatibleUnitQ CompilationOptions CompilationTarget Compile Compiled CompiledCodeFunction CompiledFunction CompilerOptions Complement CompleteGraph CompleteGraphQ CompleteKaryTree CompletionsListPacket Complex Complexes ComplexExpand ComplexInfinity ComplexityFunction ComplexListPlot ComplexPlot ComplexPlot3D ComponentMeasurements ComponentwiseContextMenu Compose ComposeList ComposeSeries CompositeQ Composition CompoundElement CompoundExpression CompoundPoissonDistribution CompoundPoissonProcess CompoundRenewalProcess Compress CompressedData ComputeUncertainty Condition ConditionalExpression Conditioned Cone ConeBox ConfidenceLevel ConfidenceRange ConfidenceTransform ConfigurationPath ConformAudio ConformImages Congruent ConicHullRegion ConicHullRegion3DBox ConicHullRegionBox ConicOptimization Conjugate ConjugateTranspose Conjunction Connect ConnectedComponents ConnectedGraphComponents ConnectedGraphQ ConnectedMeshComponents ConnectedMoleculeComponents ConnectedMoleculeQ ConnectionSettings ConnectLibraryCallbackFunction ConnectSystemModelComponents ConnesWindow ConoverTest ConsoleMessage ConsoleMessagePacket ConsolePrint Constant ConstantArray ConstantArrayLayer ConstantImage ConstantPlusLayer ConstantRegionQ Constants ConstantTimesLayer ConstellationData ConstrainedMax ConstrainedMin Construct Containing ContainsAll ContainsAny ContainsExactly ContainsNone ContainsOnly ContentFieldOptions ContentLocationFunction ContentObject ContentPadding ContentsBoundingBox ContentSelectable ContentSize Context ContextMenu Contexts ContextToFileName Continuation Continue ContinuedFraction ContinuedFractionK ContinuousAction ContinuousMarkovProcess ContinuousTask ContinuousTimeModelQ ContinuousWaveletData ContinuousWaveletTransform ContourDetect ContourGraphics ContourIntegral ContourLabels ContourLines ContourPlot ContourPlot3D Contours ContourShading ContourSmoothing ContourStyle ContraharmonicMean ContrastiveLossLayer Control ControlActive ControlAlignment ControlGroupContentsBox ControllabilityGramian ControllabilityMatrix ControllableDecomposition ControllableModelQ ControllerDuration ControllerInformation ControllerInformationData ControllerLinking ControllerManipulate ControllerMethod ControllerPath ControllerState ControlPlacement ControlsRendering ControlType Convergents ConversionOptions ConversionRules ConvertToBitmapPacket ConvertToPostScript ConvertToPostScriptPacket ConvexHullMesh ConvexPolygonQ ConvexPolyhedronQ ConvolutionLayer Convolve ConwayGroupCo1 ConwayGroupCo2 ConwayGroupCo3 CookieFunction Cookies CoordinateBoundingBox CoordinateBoundingBoxArray CoordinateBounds CoordinateBoundsArray CoordinateChartData CoordinatesToolOptions CoordinateTransform CoordinateTransformData CoprimeQ Coproduct CopulaDistribution Copyable CopyDatabin CopyDirectory CopyFile CopyTag CopyToClipboard CornerFilter CornerNeighbors Correlation CorrelationDistance Correl
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/matlab.min.js b/vendor/assets/javascripts/highlightjs/languages/matlab.min.js
index e60e322694..8ed3108db3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/matlab.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/matlab.min.js
@@ -1 +1 @@
-hljs.registerLanguage("matlab",function(e){var a="('|\\.')+",s={r:0,c:[{b:a}]};return{k:{keyword:"break case catch classdef continue else elseif end enumerated events for function global if methods otherwise parfor persistent properties return spmd switch try while",built_in:"sin sind sinh asin asind asinh cos cosd cosh acos acosd acosh tan tand tanh atan atand atan2 atanh sec secd sech asec asecd asech csc cscd csch acsc acscd acsch cot cotd coth acot acotd acoth hypot exp expm1 log log1p log10 log2 pow2 realpow reallog realsqrt sqrt nthroot nextpow2 abs angle complex conj imag real unwrap isreal cplxpair fix floor ceil round mod rem sign airy besselj bessely besselh besseli besselk beta betainc betaln ellipj ellipke erf erfc erfcx erfinv expint gamma gammainc gammaln psi legendre cross dot factor isprime primes gcd lcm rat rats perms nchoosek factorial cart2sph cart2pol pol2cart sph2cart hsv2rgb rgb2hsv zeros ones eye repmat rand randn linspace logspace freqspace meshgrid accumarray size length ndims numel disp isempty isequal isequalwithequalnans cat reshape diag blkdiag tril triu fliplr flipud flipdim rot90 find sub2ind ind2sub bsxfun ndgrid permute ipermute shiftdim circshift squeeze isscalar isvector ans eps realmax realmin pi i inf nan isnan isinf isfinite j why compan gallery hadamard hankel hilb invhilb magic pascal rosser toeplitz vander wilkinson max min nanmax nanmin mean nanmean type table readtable writetable sortrows sort figure plot plot3 scatter scatter3 cellfun legend intersect ismember procrustes hold num2cell "},i:'(//|"|#|/\\*|\\s+/\\w+)',c:[{cN:"function",bK:"function",e:"$",c:[e.UTM,{cN:"params",v:[{b:"\\(",e:"\\)"},{b:"\\[",e:"\\]"}]}]},{cN:"built_in",b:/true|false/,r:0,starts:s},{b:"[a-zA-Z][a-zA-Z_0-9]*"+a,r:0},{cN:"number",b:e.CNR,r:0,starts:s},{cN:"string",b:"'",e:"'",c:[e.BE,{b:"''"}]},{b:/\]|}|\)/,r:0,starts:s},{cN:"string",b:'"',e:'"',c:[e.BE,{b:'""'}],starts:s},e.C("^\\s*\\%\\{\\s*$","^\\s*\\%\\}\\s*$"),e.C("\\%","$")]}});
\ No newline at end of file
+hljs.registerLanguage("matlab",function(){"use strict";return function(e){var a={relevance:0,contains:[{begin:"('|\\.')+"}]};return{name:"Matlab",keywords:{keyword:"break case catch classdef continue else elseif end enumerated events for function global if methods otherwise parfor persistent properties return spmd switch try while",built_in:"sin sind sinh asin asind asinh cos cosd cosh acos acosd acosh tan tand tanh atan atand atan2 atanh sec secd sech asec asecd asech csc cscd csch acsc acscd acsch cot cotd coth acot acotd acoth hypot exp expm1 log log1p log10 log2 pow2 realpow reallog realsqrt sqrt nthroot nextpow2 abs angle complex conj imag real unwrap isreal cplxpair fix floor ceil round mod rem sign airy besselj bessely besselh besseli besselk beta betainc betaln ellipj ellipke erf erfc erfcx erfinv expint gamma gammainc gammaln psi legendre cross dot factor isprime primes gcd lcm rat rats perms nchoosek factorial cart2sph cart2pol pol2cart sph2cart hsv2rgb rgb2hsv zeros ones eye repmat rand randn linspace logspace freqspace meshgrid accumarray size length ndims numel disp isempty isequal isequalwithequalnans cat reshape diag blkdiag tril triu fliplr flipud flipdim rot90 find sub2ind ind2sub bsxfun ndgrid permute ipermute shiftdim circshift squeeze isscalar isvector ans eps realmax realmin pi i inf nan isnan isinf isfinite j why compan gallery hadamard hankel hilb invhilb magic pascal rosser toeplitz vander wilkinson max min nanmax nanmin mean nanmean type table readtable writetable sortrows sort figure plot plot3 scatter scatter3 cellfun legend intersect ismember procrustes hold num2cell "},illegal:'(//|"|#|/\\*|\\s+/\\w+)',contains:[{className:"function",beginKeywords:"function",end:"$",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",variants:[{begin:"\\(",end:"\\)"},{begin:"\\[",end:"\\]"}]}]},{className:"built_in",begin:/true|false/,relevance:0,starts:a},{begin:"[a-zA-Z][a-zA-Z_0-9]*('|\\.')+",relevance:0},{className:"number",begin:e.C_NUMBER_RE,relevance:0,starts:a},{className:"string",begin:"'",end:"'",contains:[e.BACKSLASH_ESCAPE,{begin:"''"}]},{begin:/\]|}|\)/,relevance:0,starts:a},{className:"string",begin:'"',end:'"',contains:[e.BACKSLASH_ESCAPE,{begin:'""'}],starts:a},e.COMMENT("^\\s*\\%\\{\\s*$","^\\s*\\%\\}\\s*$"),e.COMMENT("\\%","$")]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/maxima.min.js b/vendor/assets/javascripts/highlightjs/languages/maxima.min.js
index 7a288b18cc..45ef823e58 100644
--- a/vendor/assets/javascripts/highlightjs/languages/maxima.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/maxima.min.js
@@ -1 +1 @@
-hljs.registerLanguage("maxima",function(e){var t="if then else elseif for thru do while unless step in and or not",a="true false unknown inf minf ind und %e %i %pi %phi %gamma",r=" abasep abs absint absolute_real_time acos acosh acot acoth acsc acsch activate addcol add_edge add_edges addmatrices addrow add_vertex add_vertices adjacency_matrix adjoin adjoint af agd airy airy_ai airy_bi airy_dai airy_dbi algsys alg_type alias allroots alphacharp alphanumericp amortization %and annuity_fv annuity_pv antid antidiff AntiDifference append appendfile apply apply1 apply2 applyb1 apropos args arit_amortization arithmetic arithsum array arrayapply arrayinfo arraymake arraysetapply ascii asec asech asin asinh askinteger asksign assoc assoc_legendre_p assoc_legendre_q assume assume_external_byte_order asympa at atan atan2 atanh atensimp atom atvalue augcoefmatrix augmented_lagrangian_method av average_degree backtrace bars barsplot barsplot_description base64 base64_decode bashindices batch batchload bc2 bdvac belln benefit_cost bern bernpoly bernstein_approx bernstein_expand bernstein_poly bessel bessel_i bessel_j bessel_k bessel_simplify bessel_y beta beta_incomplete beta_incomplete_generalized beta_incomplete_regularized bezout bfallroots bffac bf_find_root bf_fmin_cobyla bfhzeta bfloat bfloatp bfpsi bfpsi0 bfzeta biconnected_components bimetric binomial bipartition block blockmatrixp bode_gain bode_phase bothcoef box boxplot boxplot_description break bug_report build_info|10 buildq build_sample burn cabs canform canten cardinality carg cartan cartesian_product catch cauchy_matrix cbffac cdf_bernoulli cdf_beta cdf_binomial cdf_cauchy cdf_chi2 cdf_continuous_uniform cdf_discrete_uniform cdf_exp cdf_f cdf_gamma cdf_general_finite_discrete cdf_geometric cdf_gumbel cdf_hypergeometric cdf_laplace cdf_logistic cdf_lognormal cdf_negative_binomial cdf_noncentral_chi2 cdf_noncentral_student_t cdf_normal cdf_pareto cdf_poisson cdf_rank_sum cdf_rayleigh cdf_signed_rank cdf_student_t cdf_weibull cdisplay ceiling central_moment cequal cequalignore cf cfdisrep cfexpand cgeodesic cgreaterp cgreaterpignore changename changevar chaosgame charat charfun charfun2 charlist charp charpoly chdir chebyshev_t chebyshev_u checkdiv check_overlaps chinese cholesky christof chromatic_index chromatic_number cint circulant_graph clear_edge_weight clear_rules clear_vertex_label clebsch_gordan clebsch_graph clessp clesspignore close closefile cmetric coeff coefmatrix cograd col collapse collectterms columnop columnspace columnswap columnvector combination combine comp2pui compare compfile compile compile_file complement_graph complete_bipartite_graph complete_graph complex_number_p components compose_functions concan concat conjugate conmetderiv connected_components connect_vertices cons constant constantp constituent constvalue cont2part content continuous_freq contortion contour_plot contract contract_edge contragrad contrib_ode convert coord copy copy_file copy_graph copylist copymatrix cor cos cosh cot coth cov cov1 covdiff covect covers crc24sum create_graph create_list csc csch csetup cspline ctaylor ct_coordsys ctransform ctranspose cube_graph cuboctahedron_graph cunlisp cv cycle_digraph cycle_graph cylindrical days360 dblint deactivate declare declare_constvalue declare_dimensions declare_fundamental_dimensions declare_fundamental_units declare_qty declare_translated declare_unit_conversion declare_units declare_weights decsym defcon define define_alt_display define_variable defint defmatch defrule defstruct deftaylor degree_sequence del delete deleten delta demo demoivre denom depends derivdegree derivlist describe desolve determinant dfloat dgauss_a dgauss_b dgeev dgemm dgeqrf dgesv dgesvd diag diagmatrix diag_matrix diagmatrixp diameter diff digitcharp dimacs_export dimacs_import dimension dimensionless dimensions dimensions_as_list direct directory discrete_freq disjoin disjointp disolate disp dispcon dispform dispfun dispJordan display disprule dispterms distrib divide divisors divsum dkummer_m dkummer_u dlange dodecahedron_graph dotproduct dotsimp dpart draw draw2d draw3d drawdf draw_file draw_graph dscalar echelon edge_coloring edge_connectivity edges eigens_by_jacobi eigenvalues eigenvectors eighth einstein eivals eivects elapsed_real_time elapsed_run_time ele2comp ele2polynome ele2pui elem elementp elevation_grid elim elim_allbut eliminate eliminate_using ellipse elliptic_e elliptic_ec elliptic_eu elliptic_f elliptic_kc elliptic_pi ematrix empty_graph emptyp endcons entermatrix entertensor entier equal equalp equiv_classes erf erfc erf_generalized erfi errcatch error errormsg errors euler ev eval_string evenp every evolution evolution2d evundiff example exp expand expandwrt expandwrt_factored expint expintegral_chi expintegral_ci expintegral_e expintegral_e1 expintegral_ei expintegral_e_simplify expintegral_li expintegral_shi expintegral_si explicit explose exponentialize express expt exsec extdiff extract_linear_equations extremal_subset ezgcd %f f90 facsum factcomb factor factorfacsum factorial factorout factorsum facts fast_central_elements fast_linsolve fasttimes featurep fernfale fft fib fibtophi fifth filename_merge file_search file_type fillarray findde find_root find_root_abs find_root_error find_root_rel first fix flatten flength float floatnump floor flower_snark flush flush1deriv flushd flushnd flush_output fmin_cobyla forget fortran fourcos fourexpand fourier fourier_elim fourint fourintcos fourintsin foursimp foursin fourth fposition frame_bracket freeof freshline fresnel_c fresnel_s from_adjacency_matrix frucht_graph full_listify fullmap fullmapl fullratsimp fullratsubst fullsetify funcsolve fundamental_dimensions fundamental_units fundef funmake funp fv g0 g1 gamma gamma_greek gamma_incomplete gamma_incomplete_generalized gamma_incomplete_regularized gauss gauss_a gauss_b gaussprob gcd gcdex gcdivide gcfac gcfactor gd generalized_lambert_w genfact gen_laguerre genmatrix gensym geo_amortization geo_annuity_fv geo_annuity_pv geomap geometric geometric_mean geosum get getcurrentdirectory get_edge_weight getenv get_lu_factors get_output_stream_string get_pixel get_plot_option get_tex_environment get_tex_environment_default get_vertex_label gfactor gfactorsum ggf girth global_variances gn gnuplot_close gnuplot_replot gnuplot_reset gnuplot_restart gnuplot_start go Gosper GosperSum gr2d gr3d gradef gramschmidt graph6_decode graph6_encode graph6_export graph6_import graph_center graph_charpoly graph_eigenvalues graph_flow graph_order graph_periphery graph_product graph_size graph_union great_rhombicosidodecahedron_graph great_rhombicuboctahedron_graph grid_graph grind grobner_basis grotzch_graph hamilton_cycle hamilton_path hankel hankel_1 hankel_2 harmonic harmonic_mean hav heawood_graph hermite hessian hgfred hilbertmap hilbert_matrix hipow histogram histogram_description hodge horner hypergeometric i0 i1 %ibes ic1 ic2 ic_convert ichr1 ichr2 icosahedron_graph icosidodecahedron_graph icurvature ident identfor identity idiff idim idummy ieqn %if ifactors iframes ifs igcdex igeodesic_coords ilt image imagpart imetric implicit implicit_derivative implicit_plot indexed_tensor indices induced_subgraph inferencep inference_result infix info_display init_atensor init_ctensor in_neighbors innerproduct inpart inprod inrt integerp integer_partitions integrate intersect intersection intervalp intopois intosum invariant1 invariant2 inverse_fft inverse_jacobi_cd inverse_jacobi_cn inverse_jacobi_cs inverse_jacobi_dc inverse_jacobi_dn inverse_jacobi_ds inverse_jacobi_nc inverse_jacobi_nd inverse_jacobi_ns inverse_jacobi_sc inverse_jacobi_sd inverse_jacobi_sn invert invert_by_adjoint invert_by_lu inv_mod irr is is_biconnected is_bipartite is_connected is_digraph is_edge_in_graph is_graph is_graph_or_digraph ishow is_isomorphic isolate isomorphism is_planar isqrt isreal_p is_sconnected is_tree is_vertex_in_graph items_inference %j j0 j1 jacobi jacobian jacobi_cd jacobi_cn jacobi_cs jacobi_dc jacobi_dn jacobi_ds jacobi_nc jacobi_nd jacobi_ns jacobi_p jacobi_sc jacobi_sd jacobi_sn JF jn join jordan julia julia_set julia_sin %k kdels kdelta kill killcontext kostka kron_delta kronecker_product kummer_m kummer_u kurtosis kurtosis_bernoulli kurtosis_beta kurtosis_binomial kurtosis_chi2 kurtosis_continuous_uniform kurtosis_discrete_uniform kurtosis_exp kurtosis_f kurtosis_gamma kurtosis_general_finite_discrete kurtosis_geometric kurtosis_gumbel kurtosis_hypergeometric kurtosis_laplace kurtosis_logistic kurtosis_lognormal kurtosis_negative_binomial kurtosis_noncentral_chi2 kurtosis_noncentral_student_t kurtosis_normal kurtosis_pareto kurtosis_poisson kurtosis_rayleigh kurtosis_student_t kurtosis_weibull label labels lagrange laguerre lambda lambert_w laplace laplacian_matrix last lbfgs lc2kdt lcharp lc_l lcm lc_u ldefint ldisp ldisplay legendre_p legendre_q leinstein length let letrules letsimp levi_civita lfreeof lgtreillis lhs li liediff limit Lindstedt linear linearinterpol linear_program linear_regression line_graph linsolve listarray list_correlations listify list_matrix_entries list_nc_monomials listoftens listofvars listp lmax lmin load loadfile local locate_matrix_entry log logcontract log_gamma lopow lorentz_gauge lowercasep lpart lratsubst lreduce lriemann lsquares_estimates lsquares_estimates_approximate lsquares_estimates_exact lsquares_mse lsquares_residual_mse lsquares_residuals lsum ltreillis lu_backsub lucas lu_factor %m macroexpand macroexpand1 make_array makebox makefact makegamma make_graph make_level_picture makelist makeOrders make_poly_continent make_poly_country make_polygon make_random_state make_rgb_picture makeset make_string_input_stream make_string_output_stream make_transform mandelbrot mandelbrot_set map mapatom maplist matchdeclare matchfix mat_cond mat_fullunblocker mat_function mathml_display mat_norm matrix matrixmap matrixp matrix_size mattrace mat_trace mat_unblocker max max_clique max_degree max_flow maximize_lp max_independent_set max_matching maybe md5sum mean mean_bernoulli mean_beta mean_binomial mean_chi2 mean_continuous_uniform mean_deviation mean_discrete_uniform mean_exp mean_f mean_gamma mean_general_finite_discrete mean_geometric mean_gumbel mean_hypergeometric mean_laplace mean_logistic mean_lognormal mean_negative_binomial mean_noncentral_chi2 mean_noncentral_student_t mean_normal mean_pareto mean_poisson mean_rayleigh mean_student_t mean_weibull median median_deviation member mesh metricexpandall mgf1_sha1 min min_degree min_edge_cut minfactorial minimalPoly minimize_lp minimum_spanning_tree minor minpack_lsquares minpack_solve min_vertex_cover min_vertex_cut mkdir mnewton mod mode_declare mode_identity ModeMatrix moebius mon2schur mono monomial_dimensions multibernstein_poly multi_display_for_texinfo multi_elem multinomial multinomial_coeff multi_orbit multiplot_mode multi_pui multsym multthru mycielski_graph nary natural_unit nc_degree ncexpt ncharpoly negative_picture neighbors new newcontext newdet new_graph newline newton new_variable next_prime nicedummies niceindices ninth nofix nonarray noncentral_moment nonmetricity nonnegintegerp nonscalarp nonzeroandfreeof notequal nounify nptetrad npv nroots nterms ntermst nthroot nullity nullspace num numbered_boundaries numberp number_to_octets num_distinct_partitions numerval numfactor num_partitions nusum nzeta nzetai nzetar octets_to_number octets_to_oid odd_girth oddp ode2 ode_check odelin oid_to_octets op opena opena_binary openr openr_binary openw openw_binary operatorp opsubst optimize %or orbit orbits ordergreat ordergreatp orderless orderlessp orthogonal_complement orthopoly_recur orthopoly_weight outermap out_neighbors outofpois pade parabolic_cylinder_d parametric parametric_surface parg parGosper parse_string parse_timedate part part2cont partfrac partition partition_set partpol path_digraph path_graph pathname_directory pathname_name pathname_type pdf_bernoulli pdf_beta pdf_binomial pdf_cauchy pdf_chi2 pdf_continuous_uniform pdf_discrete_uniform pdf_exp pdf_f pdf_gamma pdf_general_finite_discrete pdf_geometric pdf_gumbel pdf_hypergeometric pdf_laplace pdf_logistic pdf_lognormal pdf_negative_binomial pdf_noncentral_chi2 pdf_noncentral_student_t pdf_normal pdf_pareto pdf_poisson pdf_rank_sum pdf_rayleigh pdf_signed_rank pdf_student_t pdf_weibull pearson_skewness permanent permut permutation permutations petersen_graph petrov pickapart picture_equalp picturep piechart piechart_description planar_embedding playback plog plot2d plot3d plotdf ploteq plsquares pochhammer points poisdiff poisexpt poisint poismap poisplus poissimp poissubst poistimes poistrim polar polarform polartorect polar_to_xy poly_add poly_buchberger poly_buchberger_criterion poly_colon_ideal poly_content polydecomp poly_depends_p poly_elimination_ideal poly_exact_divide poly_expand poly_expt poly_gcd polygon poly_grobner poly_grobner_equal poly_grobner_member poly_grobner_subsetp poly_ideal_intersection poly_ideal_polysaturation poly_ideal_polysaturation1 poly_ideal_saturation poly_ideal_saturation1 poly_lcm poly_minimization polymod poly_multiply polynome2ele polynomialp poly_normal_form poly_normalize poly_normalize_list poly_polysaturation_extension poly_primitive_part poly_pseudo_divide poly_reduced_grobner poly_reduction poly_saturation_extension poly_s_polynomial poly_subtract polytocompanion pop postfix potential power_mod powerseries powerset prefix prev_prime primep primes principal_components print printf printfile print_graph printpois printprops prodrac product properties propvars psi psubst ptriangularize pui pui2comp pui2ele pui2polynome pui_direct puireduc push put pv qput qrange qty quad_control quad_qag quad_qagi quad_qagp quad_qags quad_qawc quad_qawf quad_qawo quad_qaws quadrilateral quantile quantile_bernoulli quantile_beta quantile_binomial quantile_cauchy quantile_chi2 quantile_continuous_uniform quantile_discrete_uniform quantile_exp quantile_f quantile_gamma quantile_general_finite_discrete quantile_geometric quantile_gumbel quantile_hypergeometric quantile_laplace quantile_logistic quantile_lognormal quantile_negative_binomial quantile_noncentral_chi2 quantile_noncentral_student_t quantile_normal quantile_pareto quantile_poisson quantile_rayleigh quantile_student_t quantile_weibull quartile_skewness quit qunit quotient racah_v racah_w radcan radius random random_bernoulli random_beta random_binomial random_bipartite_graph random_cauchy random_chi2 random_continuous_uniform random_digraph random_discrete_uniform random_exp random_f random_gamma random_general_finite_discrete random_geometric random_graph random_graph1 random_gumbel random_hypergeometric random_laplace random_logistic random_lognormal random_negative_binomial random_network random_noncentral_chi2 random_noncentral_student_t random_normal random_pareto random_permutation random_poisson random_rayleigh random_regular_graph random_student_t random_tournament random_tree random_weibull range rank rat ratcoef ratdenom ratdiff ratdisrep ratexpand ratinterpol rational rationalize ratnumer ratnump ratp ratsimp ratsubst ratvars ratweight read read_array read_binary_array read_binary_list read_binary_matrix readbyte readchar read_hashed_array readline read_list read_matrix read_nested_list readonly read_xpm real_imagpart_to_conjugate realpart realroots rearray rectangle rectform rectform_log_if_constant recttopolar rediff reduce_consts reduce_order region region_boundaries region_boundaries_plus rem remainder remarray rembox remcomps remcon remcoord remfun remfunction remlet remove remove_constvalue remove_dimensions remove_edge remove_fundamental_dimensions remove_fundamental_units remove_plot_option remove_vertex rempart remrule remsym remvalue rename rename_file reset reset_displays residue resolvante resolvante_alternee1 resolvante_bipartite resolvante_diedrale resolvante_klein resolvante_klein3 resolvante_produit_sym resolvante_unitaire resolvante_vierer rest resultant return reveal reverse revert revert2 rgb2level rhs ricci riemann rinvariant risch rk rmdir rncombine romberg room rootscontract round row rowop rowswap rreduce run_testsuite %s save saving scalarp scaled_bessel_i scaled_bessel_i0 scaled_bessel_i1 scalefactors scanmap scatterplot scatterplot_description scene schur2comp sconcat scopy scsimp scurvature sdowncase sec sech second sequal sequalignore set_alt_display setdifference set_draw_defaults set_edge_weight setelmx setequalp setify setp set_partitions set_plot_option set_prompt set_random_state set_tex_environment set_tex_environment_default setunits setup_autoload set_up_dot_simplifications set_vertex_label seventh sexplode sf sha1sum sha256sum shortest_path shortest_weighted_path show showcomps showratvars sierpinskiale sierpinskimap sign signum similaritytransform simp_inequality simplify_sum simplode simpmetderiv simtran sin sinh sinsert sinvertcase sixth skewness skewness_bernoulli skewness_beta skewness_binomial skewness_chi2 skewness_continuous_uniform skewness_discrete_uniform skewness_exp skewness_f skewness_gamma skewness_general_finite_discrete skewness_geometric skewness_gumbel skewness_hypergeometric skewness_laplace skewness_logistic skewness_lognormal skewness_negative_binomial skewness_noncentral_chi2 skewness_noncentral_student_t skewness_normal skewness_pareto skewness_poisson skewness_rayleigh skewness_student_t skewness_weibull slength smake small_rhombicosidodecahedron_graph small_rhombicuboctahedron_graph smax smin smismatch snowmap snub_cube_graph snub_dodecahedron_graph solve solve_rec solve_rec_rat some somrac sort sparse6_decode sparse6_encode sparse6_export sparse6_import specint spherical spherical_bessel_j spherical_bessel_y spherical_hankel1 spherical_hankel2 spherical_harmonic spherical_to_xyz splice split sposition sprint sqfr sqrt sqrtdenest sremove sremovefirst sreverse ssearch ssort sstatus ssubst ssubstfirst staircase standardize standardize_inverse_trig starplot starplot_description status std std1 std_bernoulli std_beta std_binomial std_chi2 std_continuous_uniform std_discrete_uniform std_exp std_f std_gamma std_general_finite_discrete std_geometric std_gumbel std_hypergeometric std_laplace std_logistic std_lognormal std_negative_binomial std_noncentral_chi2 std_noncentral_student_t std_normal std_pareto std_poisson std_rayleigh std_student_t std_weibull stemplot stirling stirling1 stirling2 strim striml strimr string stringout stringp strong_components struve_h struve_l sublis sublist sublist_indices submatrix subsample subset subsetp subst substinpart subst_parallel substpart substring subvar subvarp sum sumcontract summand_to_rec supcase supcontext symbolp symmdifference symmetricp system take_channel take_inference tan tanh taylor taylorinfo taylorp taylor_simplifier taytorat tcl_output tcontract tellrat tellsimp tellsimpafter tentex tenth test_mean test_means_difference test_normality test_proportion test_proportions_difference test_rank_sum test_sign test_signed_rank test_variance test_variance_ratio tex tex1 tex_display texput %th third throw time timedate timer timer_info tldefint tlimit todd_coxeter toeplitz tokens to_lisp topological_sort to_poly to_poly_solve totaldisrep totalfourier totient tpartpol trace tracematrix trace_options transform_sample translate translate_file transpose treefale tree_reduce treillis treinat triangle triangularize trigexpand trigrat trigreduce trigsimp trunc truncate truncated_cube_graph truncated_dodecahedron_graph truncated_icosahedron_graph truncated_tetrahedron_graph tr_warnings_get tube tutte_graph ueivects uforget ultraspherical underlying_graph undiff union unique uniteigenvectors unitp units unit_step unitvector unorder unsum untellrat untimer untrace uppercasep uricci uriemann uvect vandermonde_matrix var var1 var_bernoulli var_beta var_binomial var_chi2 var_continuous_uniform var_discrete_uniform var_exp var_f var_gamma var_general_finite_discrete var_geometric var_gumbel var_hypergeometric var_laplace var_logistic var_lognormal var_negative_binomial var_noncentral_chi2 var_noncentral_student_t var_normal var_pareto var_poisson var_rayleigh var_student_t var_weibull vector vectorpotential vectorsimp verbify vers vertex_coloring vertex_connectivity vertex_degree vertex_distance vertex_eccentricity vertex_in_degree vertex_out_degree vertices vertices_to_cycle vertices_to_path %w weyl wheel_graph wiener_index wigner_3j wigner_6j wigner_9j with_stdout write_binary_data writebyte write_data writefile wronskian xreduce xthru %y Zeilberger zeroequiv zerofor zeromatrix zeromatrixp zeta zgeev zheev zlange zn_add_table zn_carmichael_lambda zn_characteristic_factors zn_determinant zn_factor_generators zn_invert_by_lu zn_log zn_mult_table absboxchar activecontexts adapt_depth additive adim aform algebraic algepsilon algexact aliases allbut all_dotsimp_denoms allocation allsym alphabetic animation antisymmetric arrays askexp assume_pos assume_pos_pred assumescalar asymbol atomgrad atrig1 axes axis_3d axis_bottom axis_left axis_right axis_top azimuth background background_color backsubst berlefact bernstein_explicit besselexpand beta_args_sum_to_integer beta_expand bftorat bftrunc bindtest border boundaries_array box boxchar breakup %c capping cauchysum cbrange cbtics center cflength cframe_flag cnonmet_flag color color_bar color_bar_tics colorbox columns commutative complex cone context contexts contour contour_levels cosnpiflag ctaypov ctaypt ctayswitch ctayvar ct_coords ctorsion_flag ctrgsimp cube current_let_rule_package cylinder data_file_name debugmode decreasing default_let_rule_package delay dependencies derivabbrev derivsubst detout diagmetric diff dim dimensions dispflag display2d|10 display_format_internal distribute_over doallmxops domain domxexpt domxmxops domxnctimes dontfactor doscmxops doscmxplus dot0nscsimp dot0simp dot1simp dotassoc dotconstrules dotdistrib dotexptsimp dotident dotscrules draw_graph_program draw_realpart edge_color edge_coloring edge_partition edge_type edge_width %edispflag elevation %emode endphi endtheta engineering_format_floats enhanced3d %enumer epsilon_lp erfflag erf_representation errormsg error_size error_syms error_type %e_to_numlog eval even evenfun evflag evfun ev_point expandwrt_denom expintexpand expintrep expon expop exptdispflag exptisolate exptsubst facexpand facsum_combine factlim factorflag factorial_expand factors_only fb feature features file_name file_output_append file_search_demo file_search_lisp file_search_maxima|10 file_search_tests file_search_usage file_type_lisp file_type_maxima|10 fill_color fill_density filled_func fixed_vertices flipflag float2bf font font_size fortindent fortspaces fpprec fpprintprec functions gamma_expand gammalim gdet genindex gensumnum GGFCFMAX GGFINFINITY globalsolve gnuplot_command gnuplot_curve_styles gnuplot_curve_titles gnuplot_default_term_command gnuplot_dumb_term_command gnuplot_file_args gnuplot_file_name gnuplot_out_file gnuplot_pdf_term_command gnuplot_pm3d gnuplot_png_term_command gnuplot_postamble gnuplot_preamble gnuplot_ps_term_command gnuplot_svg_term_command gnuplot_term gnuplot_view_args Gosper_in_Zeilberger gradefs grid grid2d grind halfangles head_angle head_both head_length head_type height hypergeometric_representation %iargs ibase icc1 icc2 icounter idummyx ieqnprint ifb ifc1 ifc2 ifg ifgi ifr iframe_bracket_form ifri igeowedge_flag ikt1 ikt2 imaginary inchar increasing infeval infinity inflag infolists inm inmc1 inmc2 intanalysis integer integervalued integrate_use_rootsof integration_constant integration_constant_counter interpolate_color intfaclim ip_grid ip_grid_in irrational isolate_wrt_times iterations itr julia_parameter %k1 %k2 keepfloat key key_pos kinvariant kt label label_alignment label_orientation labels lassociative lbfgs_ncorrections lbfgs_nfeval_max leftjust legend letrat let_rule_packages lfg lg lhospitallim limsubst linear linear_solver linechar linel|10 linenum line_type linewidth line_width linsolve_params linsolvewarn lispdisp listarith listconstvars listdummyvars lmxchar load_pathname loadprint logabs logarc logcb logconcoeffp logexpand lognegint logsimp logx logx_secondary logy logy_secondary logz lriem m1pbranch macroexpansion macros mainvar manual_demo maperror mapprint matrix_element_add matrix_element_mult matrix_element_transpose maxapplydepth maxapplyheight maxima_tempdir|10 maxima_userdir|10 maxnegex MAX_ORD maxposex maxpsifracdenom maxpsifracnum maxpsinegint maxpsiposint maxtayorder mesh_lines_color method mod_big_prime mode_check_errorp mode_checkp mode_check_warnp mod_test mod_threshold modular_linear_solver modulus multiplicative multiplicities myoptions nary negdistrib negsumdispflag newline newtonepsilon newtonmaxiter nextlayerfactor niceindicespref nm nmc noeval nolabels nonegative_lp noninteger nonscalar noun noundisp nouns np npi nticks ntrig numer numer_pbranch obase odd oddfun opacity opproperties opsubst optimprefix optionset orientation origin orthopoly_returns_intervals outative outchar packagefile palette partswitch pdf_file pfeformat phiresolution %piargs piece pivot_count_sx pivot_max_sx plot_format plot_options plot_realpart png_file pochhammer_max_index points pointsize point_size points_joined point_type poislim poisson poly_coefficient_ring poly_elimination_order polyfactor poly_grobner_algorithm poly_grobner_debug poly_monomial_order poly_primary_elimination_order poly_return_term_list poly_secondary_elimination_order poly_top_reduction_only posfun position powerdisp pred prederror primep_number_of_tests product_use_gamma program programmode promote_float_to_bigfloat prompt proportional_axes props psexpand ps_file radexpand radius radsubstflag rassociative ratalgdenom ratchristof ratdenomdivide rateinstein ratepsilon ratfac rational ratmx ratprint ratriemann ratsimpexpons ratvarswitch ratweights ratweyl ratwtlvl real realonly redraw refcheck resolution restart resultant ric riem rmxchar %rnum_list rombergabs rombergit rombergmin rombergtol rootsconmode rootsepsilon run_viewer same_xy same_xyz savedef savefactors scalar scalarmatrixp scale scale_lp setcheck setcheckbreak setval show_edge_color show_edges show_edge_type show_edge_width show_id show_label showtime show_vertex_color show_vertex_size show_vertex_type show_vertices show_weight simp simplified_output simplify_products simpproduct simpsum sinnpiflag solvedecomposes solveexplicit solvefactors solvenullwarn solveradcan solvetrigwarn space sparse sphere spring_embedding_depth sqrtdispflag stardisp startphi starttheta stats_numer stringdisp structures style sublis_apply_lambda subnumsimp sumexpand sumsplitfact surface surface_hide svg_file symmetric tab taylordepth taylor_logexpand taylor_order_coefficients taylor_truncate_polynomials tensorkill terminal testsuite_files thetaresolution timer_devalue title tlimswitch tr track transcompile transform transform_xy translate_fast_arrays transparent transrun tr_array_as_ref tr_bound_function_applyp tr_file_tty_messagesp tr_float_can_branch_complex tr_function_call_default trigexpandplus trigexpandtimes triginverses trigsign trivial_solutions tr_numer tr_optimize_max_loop tr_semicompile tr_state_vars tr_warn_bad_function_calls tr_warn_fexpr tr_warn_meval tr_warn_mode tr_warn_undeclared tr_warn_undefined_variable tstep ttyoff tube_extremes ufg ug %unitexpand unit_vectors uric uriem use_fast_arrays user_preamble usersetunits values vect_cross verbose vertex_color vertex_coloring vertex_partition vertex_size vertex_type view warnings weyl width windowname windowtitle wired_surface wireframe xaxis xaxis_color xaxis_secondary xaxis_type xaxis_width xlabel xlabel_secondary xlength xrange xrange_secondary xtics xtics_axis xtics_rotate xtics_rotate_secondary xtics_secondary xtics_secondary_axis xu_grid x_voxel xy_file xyplane xy_scale yaxis yaxis_color yaxis_secondary yaxis_type yaxis_width ylabel ylabel_secondary ylength yrange yrange_secondary ytics ytics_axis ytics_rotate ytics_rotate_secondary ytics_secondary ytics_secondary_axis yv_grid y_voxel yx_ratio zaxis zaxis_color zaxis_type zaxis_width zeroa zerob zerobern zeta%pi zlabel zlabel_rotate zlength zmin zn_primroot_limit zn_primroot_pretest",i="_ __ %|0 %%|0";return{l:"[A-Za-z_%][0-9A-Za-z_%]*",k:{keyword:t,literal:a,built_in:r,symbol:i},c:[{cN:"comment",b:"/\\*",e:"\\*/",c:["self"]},e.QSM,{cN:"number",r:0,v:[{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Ee][-+]?\\d+\\b"},{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Bb][-+]?\\d+\\b",r:10},{b:"\\b(\\.\\d+|\\d+\\.\\d+)\\b"},{b:"\\b(\\d+|0[0-9A-Za-z]+)\\.?\\b"}]}],i:/@/}});
\ No newline at end of file
+hljs.registerLanguage("maxima",function(){"use strict";return function(e){return{name:"Maxima",keywords:{$pattern:"[A-Za-z_%][0-9A-Za-z_%]*",keyword:"if then else elseif for thru do while unless step in and or not",literal:"true false unknown inf minf ind und %e %i %pi %phi %gamma",built_in:" abasep abs absint absolute_real_time acos acosh acot acoth acsc acsch activate addcol add_edge add_edges addmatrices addrow add_vertex add_vertices adjacency_matrix adjoin adjoint af agd airy airy_ai airy_bi airy_dai airy_dbi algsys alg_type alias allroots alphacharp alphanumericp amortization %and annuity_fv annuity_pv antid antidiff AntiDifference append appendfile apply apply1 apply2 applyb1 apropos args arit_amortization arithmetic arithsum array arrayapply arrayinfo arraymake arraysetapply ascii asec asech asin asinh askinteger asksign assoc assoc_legendre_p assoc_legendre_q assume assume_external_byte_order asympa at atan atan2 atanh atensimp atom atvalue augcoefmatrix augmented_lagrangian_method av average_degree backtrace bars barsplot barsplot_description base64 base64_decode bashindices batch batchload bc2 bdvac belln benefit_cost bern bernpoly bernstein_approx bernstein_expand bernstein_poly bessel bessel_i bessel_j bessel_k bessel_simplify bessel_y beta beta_incomplete beta_incomplete_generalized beta_incomplete_regularized bezout bfallroots bffac bf_find_root bf_fmin_cobyla bfhzeta bfloat bfloatp bfpsi bfpsi0 bfzeta biconnected_components bimetric binomial bipartition block blockmatrixp bode_gain bode_phase bothcoef box boxplot boxplot_description break bug_report build_info|10 buildq build_sample burn cabs canform canten cardinality carg cartan cartesian_product catch cauchy_matrix cbffac cdf_bernoulli cdf_beta cdf_binomial cdf_cauchy cdf_chi2 cdf_continuous_uniform cdf_discrete_uniform cdf_exp cdf_f cdf_gamma cdf_general_finite_discrete cdf_geometric cdf_gumbel cdf_hypergeometric cdf_laplace cdf_logistic cdf_lognormal cdf_negative_binomial cdf_noncentral_chi2 cdf_noncentral_student_t cdf_normal cdf_pareto cdf_poisson cdf_rank_sum cdf_rayleigh cdf_signed_rank cdf_student_t cdf_weibull cdisplay ceiling central_moment cequal cequalignore cf cfdisrep cfexpand cgeodesic cgreaterp cgreaterpignore changename changevar chaosgame charat charfun charfun2 charlist charp charpoly chdir chebyshev_t chebyshev_u checkdiv check_overlaps chinese cholesky christof chromatic_index chromatic_number cint circulant_graph clear_edge_weight clear_rules clear_vertex_label clebsch_gordan clebsch_graph clessp clesspignore close closefile cmetric coeff coefmatrix cograd col collapse collectterms columnop columnspace columnswap columnvector combination combine comp2pui compare compfile compile compile_file complement_graph complete_bipartite_graph complete_graph complex_number_p components compose_functions concan concat conjugate conmetderiv connected_components connect_vertices cons constant constantp constituent constvalue cont2part content continuous_freq contortion contour_plot contract contract_edge contragrad contrib_ode convert coord copy copy_file copy_graph copylist copymatrix cor cos cosh cot coth cov cov1 covdiff covect covers crc24sum create_graph create_list csc csch csetup cspline ctaylor ct_coordsys ctransform ctranspose cube_graph cuboctahedron_graph cunlisp cv cycle_digraph cycle_graph cylindrical days360 dblint deactivate declare declare_constvalue declare_dimensions declare_fundamental_dimensions declare_fundamental_units declare_qty declare_translated declare_unit_conversion declare_units declare_weights decsym defcon define define_alt_display define_variable defint defmatch defrule defstruct deftaylor degree_sequence del delete deleten delta demo demoivre denom depends derivdegree derivlist describe desolve determinant dfloat dgauss_a dgauss_b dgeev dgemm dgeqrf dgesv dgesvd diag diagmatrix diag_matrix diagmatrixp diameter diff digitcharp dimacs_export dimacs_import dimension dimensionless dimensions dimensions_as_list direct directory discrete_freq disjoin disjointp disolate disp dispcon dispform dispfun dispJordan display disprule dispterms distrib divide divisors divsum dkummer_m dkummer_u dlange dodecahedron_graph dotproduct dotsimp dpart draw draw2d draw3d drawdf draw_file draw_graph dscalar echelon edge_coloring edge_connectivity edges eigens_by_jacobi eigenvalues eigenvectors eighth einstein eivals eivects elapsed_real_time elapsed_run_time ele2comp ele2polynome ele2pui elem elementp elevation_grid elim elim_allbut eliminate eliminate_using ellipse elliptic_e elliptic_ec elliptic_eu elliptic_f elliptic_kc elliptic_pi ematrix empty_graph emptyp endcons entermatrix entertensor entier equal equalp equiv_classes erf erfc erf_generalized erfi errcatch error errormsg errors euler ev eval_string evenp every evolution evolution2d evundiff example exp expand expandwrt expandwrt_factored expint expintegral_chi expintegral_ci expintegral_e expintegral_e1 expintegral_ei expintegral_e_simplify expintegral_li expintegral_shi expintegral_si explicit explose exponentialize express expt exsec extdiff extract_linear_equations extremal_subset ezgcd %f f90 facsum factcomb factor factorfacsum factorial factorout factorsum facts fast_central_elements fast_linsolve fasttimes featurep fernfale fft fib fibtophi fifth filename_merge file_search file_type fillarray findde find_root find_root_abs find_root_error find_root_rel first fix flatten flength float floatnump floor flower_snark flush flush1deriv flushd flushnd flush_output fmin_cobyla forget fortran fourcos fourexpand fourier fourier_elim fourint fourintcos fourintsin foursimp foursin fourth fposition frame_bracket freeof freshline fresnel_c fresnel_s from_adjacency_matrix frucht_graph full_listify fullmap fullmapl fullratsimp fullratsubst fullsetify funcsolve fundamental_dimensions fundamental_units fundef funmake funp fv g0 g1 gamma gamma_greek gamma_incomplete gamma_incomplete_generalized gamma_incomplete_regularized gauss gauss_a gauss_b gaussprob gcd gcdex gcdivide gcfac gcfactor gd generalized_lambert_w genfact gen_laguerre genmatrix gensym geo_amortization geo_annuity_fv geo_annuity_pv geomap geometric geometric_mean geosum get getcurrentdirectory get_edge_weight getenv get_lu_factors get_output_stream_string get_pixel get_plot_option get_tex_environment get_tex_environment_default get_vertex_label gfactor gfactorsum ggf girth global_variances gn gnuplot_close gnuplot_replot gnuplot_reset gnuplot_restart gnuplot_start go Gosper GosperSum gr2d gr3d gradef gramschmidt graph6_decode graph6_encode graph6_export graph6_import graph_center graph_charpoly graph_eigenvalues graph_flow graph_order graph_periphery graph_product graph_size graph_union great_rhombicosidodecahedron_graph great_rhombicuboctahedron_graph grid_graph grind grobner_basis grotzch_graph hamilton_cycle hamilton_path hankel hankel_1 hankel_2 harmonic harmonic_mean hav heawood_graph hermite hessian hgfred hilbertmap hilbert_matrix hipow histogram histogram_description hodge horner hypergeometric i0 i1 %ibes ic1 ic2 ic_convert ichr1 ichr2 icosahedron_graph icosidodecahedron_graph icurvature ident identfor identity idiff idim idummy ieqn %if ifactors iframes ifs igcdex igeodesic_coords ilt image imagpart imetric implicit implicit_derivative implicit_plot indexed_tensor indices induced_subgraph inferencep inference_result infix info_display init_atensor init_ctensor in_neighbors innerproduct inpart inprod inrt integerp integer_partitions integrate intersect intersection intervalp intopois intosum invariant1 invariant2 inverse_fft inverse_jacobi_cd inverse_jacobi_cn inverse_jacobi_cs inverse_jacobi_dc inverse_jacobi_dn inverse_jacobi_ds inverse_jacobi_nc inverse_jacobi_nd inverse_jacobi_ns inverse_jacobi_sc inverse_jacobi_sd inverse_jacobi_sn invert invert_by_adjoint invert_by_lu inv_mod irr is is_biconnected is_bipartite is_connected is_digraph is_edge_in_graph is_graph is_graph_or_digraph ishow is_isomorphic isolate isomorphism is_planar isqrt isreal_p is_sconnected is_tree is_vertex_in_graph items_inference %j j0 j1 jacobi jacobian jacobi_cd jacobi_cn jacobi_cs jacobi_dc jacobi_dn jacobi_ds jacobi_nc jacobi_nd jacobi_ns jacobi_p jacobi_sc jacobi_sd jacobi_sn JF jn join jordan julia julia_set julia_sin %k kdels kdelta kill killcontext kostka kron_delta kronecker_product kummer_m kummer_u kurtosis kurtosis_bernoulli kurtosis_beta kurtosis_binomial kurtosis_chi2 kurtosis_continuous_uniform kurtosis_discrete_uniform kurtosis_exp kurtosis_f kurtosis_gamma kurtosis_general_finite_discrete kurtosis_geometric kurtosis_gumbel kurtosis_hypergeometric kurtosis_laplace kurtosis_logistic kurtosis_lognormal kurtosis_negative_binomial kurtosis_noncentral_chi2 kurtosis_noncentral_student_t kurtosis_normal kurtosis_pareto kurtosis_poisson kurtosis_rayleigh kurtosis_student_t kurtosis_weibull label labels lagrange laguerre lambda lambert_w laplace laplacian_matrix last lbfgs lc2kdt lcharp lc_l lcm lc_u ldefint ldisp ldisplay legendre_p legendre_q leinstein length let letrules letsimp levi_civita lfreeof lgtreillis lhs li liediff limit Lindstedt linear linearinterpol linear_program linear_regression line_graph linsolve listarray list_correlations listify list_matrix_entries list_nc_monomials listoftens listofvars listp lmax lmin load loadfile local locate_matrix_entry log logcontract log_gamma lopow lorentz_gauge lowercasep lpart lratsubst lreduce lriemann lsquares_estimates lsquares_estimates_approximate lsquares_estimates_exact lsquares_mse lsquares_residual_mse lsquares_residuals lsum ltreillis lu_backsub lucas lu_factor %m macroexpand macroexpand1 make_array makebox makefact makegamma make_graph make_level_picture makelist makeOrders make_poly_continent make_poly_country make_polygon make_random_state make_rgb_picture makeset make_string_input_stream make_string_output_stream make_transform mandelbrot mandelbrot_set map mapatom maplist matchdeclare matchfix mat_cond mat_fullunblocker mat_function mathml_display mat_norm matrix matrixmap matrixp matrix_size mattrace mat_trace mat_unblocker max max_clique max_degree max_flow maximize_lp max_independent_set max_matching maybe md5sum mean mean_bernoulli mean_beta mean_binomial mean_chi2 mean_continuous_uniform mean_deviation mean_discrete_uniform mean_exp mean_f mean_gamma mean_general_finite_discrete mean_geometric mean_gumbel mean_hypergeometric mean_laplace mean_logistic mean_lognormal mean_negative_binomial mean_noncentral_chi2 mean_noncentral_student_t mean_normal mean_pareto mean_poisson mean_rayleigh mean_student_t mean_weibull median median_deviation member mesh metricexpandall mgf1_sha1 min min_degree min_edge_cut minfactorial minimalPoly minimize_lp minimum_spanning_tree minor minpack_lsquares minpack_solve min_vertex_cover min_vertex_cut mkdir mnewton mod mode_declare mode_identity ModeMatrix moebius mon2schur mono monomial_dimensions multibernstein_poly multi_display_for_texinfo multi_elem multinomial multinomial_coeff multi_orbit multiplot_mode multi_pui multsym multthru mycielski_graph nary natural_unit nc_degree ncexpt ncharpoly negative_picture neighbors new newcontext newdet new_graph newline newton new_variable next_prime nicedummies niceindices ninth nofix nonarray noncentral_moment nonmetricity nonnegintegerp nonscalarp nonzeroandfreeof notequal nounify nptetrad npv nroots nterms ntermst nthroot nullity nullspace num numbered_boundaries numberp number_to_octets num_distinct_partitions numerval numfactor num_partitions nusum nzeta nzetai nzetar octets_to_number octets_to_oid odd_girth oddp ode2 ode_check odelin oid_to_octets op opena opena_binary openr openr_binary openw openw_binary operatorp opsubst optimize %or orbit orbits ordergreat ordergreatp orderless orderlessp orthogonal_complement orthopoly_recur orthopoly_weight outermap out_neighbors outofpois pade parabolic_cylinder_d parametric parametric_surface parg parGosper parse_string parse_timedate part part2cont partfrac partition partition_set partpol path_digraph path_graph pathname_directory pathname_name pathname_type pdf_bernoulli pdf_beta pdf_binomial pdf_cauchy pdf_chi2 pdf_continuous_uniform pdf_discrete_uniform pdf_exp pdf_f pdf_gamma pdf_general_finite_discrete pdf_geometric pdf_gumbel pdf_hypergeometric pdf_laplace pdf_logistic pdf_lognormal pdf_negative_binomial pdf_noncentral_chi2 pdf_noncentral_student_t pdf_normal pdf_pareto pdf_poisson pdf_rank_sum pdf_rayleigh pdf_signed_rank pdf_student_t pdf_weibull pearson_skewness permanent permut permutation permutations petersen_graph petrov pickapart picture_equalp picturep piechart piechart_description planar_embedding playback plog plot2d plot3d plotdf ploteq plsquares pochhammer points poisdiff poisexpt poisint poismap poisplus poissimp poissubst poistimes poistrim polar polarform polartorect polar_to_xy poly_add poly_buchberger poly_buchberger_criterion poly_colon_ideal poly_content polydecomp poly_depends_p poly_elimination_ideal poly_exact_divide poly_expand poly_expt poly_gcd polygon poly_grobner poly_grobner_equal poly_grobner_member poly_grobner_subsetp poly_ideal_intersection poly_ideal_polysaturation poly_ideal_polysaturation1 poly_ideal_saturation poly_ideal_saturation1 poly_lcm poly_minimization polymod poly_multiply polynome2ele polynomialp poly_normal_form poly_normalize poly_normalize_list poly_polysaturation_extension poly_primitive_part poly_pseudo_divide poly_reduced_grobner poly_reduction poly_saturation_extension poly_s_polynomial poly_subtract polytocompanion pop postfix potential power_mod powerseries powerset prefix prev_prime primep primes principal_components print printf printfile print_graph printpois printprops prodrac product properties propvars psi psubst ptriangularize pui pui2comp pui2ele pui2polynome pui_direct puireduc push put pv qput qrange qty quad_control quad_qag quad_qagi quad_qagp quad_qags quad_qawc quad_qawf quad_qawo quad_qaws quadrilateral quantile quantile_bernoulli quantile_beta quantile_binomial quantile_cauchy quantile_chi2 quantile_continuous_uniform quantile_discrete_uniform quantile_exp quantile_f quantile_gamma quantile_general_finite_discrete quantile_geometric quantile_gumbel quantile_hypergeometric quantile_laplace quantile_logistic quantile_lognormal quantile_negative_binomial quantile_noncentral_chi2 quantile_noncentral_student_t quantile_normal quantile_pareto quantile_poisson quantile_rayleigh quantile_student_t quantile_weibull quartile_skewness quit qunit quotient racah_v racah_w radcan radius random random_bernoulli random_beta random_binomial random_bipartite_graph random_cauchy random_chi2 random_continuous_uniform random_digraph random_discrete_uniform random_exp random_f random_gamma random_general_finite_discrete random_geometric random_graph random_graph1 random_gumbel random_hypergeometric random_laplace random_logistic random_lognormal random_negative_binomial random_network random_noncentral_chi2 random_noncentral_student_t random_normal random_pareto random_permutation random_poisson random_rayleigh random_regular_graph random_student_t random_tournament random_tree random_weibull range rank rat ratcoef ratdenom ratdiff ratdisrep ratexpand ratinterpol rational rationalize ratnumer ratnump ratp ratsimp ratsubst ratvars ratweight read read_array read_binary_array read_binary_list read_binary_matrix readbyte readchar read_hashed_array readline read_list read_matrix read_nested_list readonly read_xpm real_imagpart_to_conjugate realpart realroots rearray rectangle rectform rectform_log_if_constant recttopolar rediff reduce_consts reduce_order region region_boundaries region_boundaries_plus rem remainder remarray rembox remcomps remcon remcoord remfun remfunction remlet remove remove_constvalue remove_dimensions remove_edge remove_fundamental_dimensions remove_fundamental_units remove_plot_option remove_vertex rempart remrule remsym remvalue rename rename_file reset reset_displays residue resolvante resolvante_alternee1 resolvante_bipartite resolvante_diedrale resolvante_klein resolvante_klein3 resolvante_produit_sym resolvante_unitaire resolvante_vierer rest resultant return reveal reverse revert revert2 rgb2level rhs ricci riemann rinvariant risch rk rmdir rncombine romberg room rootscontract round row rowop rowswap rreduce run_testsuite %s save saving scalarp scaled_bessel_i scaled_bessel_i0 scaled_bessel_i1 scalefactors scanmap scatterplot scatterplot_description scene schur2comp sconcat scopy scsimp scurvature sdowncase sec sech second sequal sequalignore set_alt_display setdifference set_draw_defaults set_edge_weight setelmx setequalp setify setp set_partitions set_plot_option set_prompt set_random_state set_tex_environment set_tex_environment_default setunits setup_autoload set_up_dot_simplifications set_vertex_label seventh sexplode sf sha1sum sha256sum shortest_path shortest_weighted_path show showcomps showratvars sierpinskiale sierpinskimap sign signum similaritytransform simp_inequality simplify_sum simplode simpmetderiv simtran sin sinh sinsert sinvertcase sixth skewness skewness_bernoulli skewness_beta skewness_binomial skewness_chi2 skewness_continuous_uniform skewness_discrete_uniform skewness_exp skewness_f skewness_gamma skewness_general_finite_discrete skewness_geometric skewness_gumbel skewness_hypergeometric skewness_laplace skewness_logistic skewness_lognormal skewness_negative_binomial skewness_noncentral_chi2 skewness_noncentral_student_t skewness_normal skewness_pareto skewness_poisson skewness_rayleigh skewness_student_t skewness_weibull slength smake small_rhombicosidodecahedron_graph small_rhombicuboctahedron_graph smax smin smismatch snowmap snub_cube_graph snub_dodecahedron_graph solve solve_rec solve_rec_rat some somrac sort sparse6_decode sparse6_encode sparse6_export sparse6_import specint spherical spherical_bessel_j spherical_bessel_y spherical_hankel1 spherical_hankel2 spherical_harmonic spherical_to_xyz splice split sposition sprint sqfr sqrt sqrtdenest sremove sremovefirst sreverse ssearch ssort sstatus ssubst ssubstfirst staircase standardize standardize_inverse_trig starplot starplot_description status std std1 std_bernoulli std_beta std_binomial std_chi2 std_continuous_uniform std_discrete_uniform std_exp std_f std_gamma std_general_finite_discrete std_geometric std_gumbel std_hypergeometric std_laplace std_logistic std_lognormal std_negative_binomial std_noncentral_chi2 std_noncentral_student_t std_normal std_pareto std_poisson std_rayleigh std_student_t std_weibull stemplot stirling stirling1 stirling2 strim striml strimr string stringout stringp strong_components struve_h struve_l sublis sublist sublist_indices submatrix subsample subset subsetp subst substinpart subst_parallel substpart substring subvar subvarp sum sumcontract summand_to_rec supcase supcontext symbolp symmdifference symmetricp system take_channel take_inference tan tanh taylor taylorinfo taylorp taylor_simplifier taytorat tcl_output tcontract tellrat tellsimp tellsimpafter tentex tenth test_mean test_means_difference test_normality test_proportion test_proportions_difference test_rank_sum test_sign test_signed_rank test_variance test_variance_ratio tex tex1 tex_display texput %th third throw time timedate timer timer_info tldefint tlimit todd_coxeter toeplitz tokens to_lisp topological_sort to_poly to_poly_solve totaldisrep totalfourier totient tpartpol trace tracematrix trace_options transform_sample translate translate_file transpose treefale tree_reduce treillis treinat triangle triangularize trigexpand trigrat trigreduce trigsimp trunc truncate truncated_cube_graph truncated_dodecahedron_graph truncated_icosahedron_graph truncated_tetrahedron_graph tr_warnings_get tube tutte_graph ueivects uforget ultraspherical underlying_graph undiff union unique uniteigenvectors unitp units unit_step unitvector unorder unsum untellrat untimer untrace uppercasep uricci uriemann uvect vandermonde_matrix var var1 var_bernoulli var_beta var_binomial var_chi2 var_continuous_uniform var_discrete_uniform var_exp var_f var_gamma var_general_finite_discrete var_geometric var_gumbel var_hypergeometric var_laplace var_logistic var_lognormal var_negative_binomial var_noncentral_chi2 var_noncentral_student_t var_normal var_pareto var_poisson var_rayleigh var_student_t var_weibull vector vectorpotential vectorsimp verbify vers vertex_coloring vertex_connectivity vertex_degree vertex_distance vertex_eccentricity vertex_in_degree vertex_out_degree vertices vertices_to_cycle vertices_to_path %w weyl wheel_graph wiener_index wigner_3j wigner_6j wigner_9j with_stdout write_binary_data writebyte write_data writefile wronskian xreduce xthru %y Zeilberger zeroequiv zerofor zeromatrix zeromatrixp zeta zgeev zheev zlange zn_add_table zn_carmichael_lambda zn_characteristic_factors zn_determinant zn_factor_generators zn_invert_by_lu zn_log zn_mult_table absboxchar activecontexts adapt_depth additive adim aform algebraic algepsilon algexact aliases allbut all_dotsimp_denoms allocation allsym alphabetic animation antisymmetric arrays askexp assume_pos assume_pos_pred assumescalar asymbol atomgrad atrig1 axes axis_3d axis_bottom axis_left axis_right axis_top azimuth background background_color backsubst berlefact bernstein_explicit besselexpand beta_args_sum_to_integer beta_expand bftorat bftrunc bindtest border boundaries_array box boxchar breakup %c capping cauchysum cbrange cbtics center cflength cframe_flag cnonmet_flag color color_bar color_bar_tics colorbox columns commutative complex cone context contexts contour contour_levels cosnpiflag ctaypov ctaypt ctayswitch ctayvar ct_coords ctorsion_flag ctrgsimp cube current_let_rule_package cylinder data_file_name debugmode decreasing default_let_rule_package delay dependencies derivabbrev derivsubst detout diagmetric diff dim dimensions dispflag display2d|10 display_format_internal distribute_over doallmxops domain domxexpt domxmxops domxnctimes dontfactor doscmxops doscmxplus dot0nscsimp dot0simp dot1simp dotassoc dotconstrules dotdistrib dotexptsimp dotident dotscrules draw_graph_program draw_realpart edge_color edge_coloring edge_partition edge_type edge_width %edispflag elevation %emode endphi endtheta engineering_format_floats enhanced3d %enumer epsilon_lp erfflag erf_representation errormsg error_size error_syms error_type %e_to_numlog eval even evenfun evflag evfun ev_point expandwrt_denom expintexpand expintrep expon expop exptdispflag exptisolate exptsubst facexpand facsum_combine factlim factorflag factorial_expand factors_only fb feature features file_name file_output_append file_search_demo file_search_lisp file_search_maxima|10 file_search_tests file_search_usage file_type_lisp file_type_maxima|10 fill_color fill_density filled_func fixed_vertices flipflag float2bf font font_size fortindent fortspaces fpprec fpprintprec functions gamma_expand gammalim gdet genindex gensumnum GGFCFMAX GGFINFINITY globalsolve gnuplot_command gnuplot_curve_styles gnuplot_curve_titles gnuplot_default_term_command gnuplot_dumb_term_command gnuplot_file_args gnuplot_file_name gnuplot_out_file gnuplot_pdf_term_command gnuplot_pm3d gnuplot_png_term_command gnuplot_postamble gnuplot_preamble gnuplot_ps_term_command gnuplot_svg_term_command gnuplot_term gnuplot_view_args Gosper_in_Zeilberger gradefs grid grid2d grind halfangles head_angle head_both head_length head_type height hypergeometric_representation %iargs ibase icc1 icc2 icounter idummyx ieqnprint ifb ifc1 ifc2 ifg ifgi ifr iframe_bracket_form ifri igeowedge_flag ikt1 ikt2 imaginary inchar increasing infeval infinity inflag infolists inm inmc1 inmc2 intanalysis integer integervalued integrate_use_rootsof integration_constant integration_constant_counter interpolate_color intfaclim ip_grid ip_grid_in irrational isolate_wrt_times iterations itr julia_parameter %k1 %k2 keepfloat key key_pos kinvariant kt label label_alignment label_orientation labels lassociative lbfgs_ncorrections lbfgs_nfeval_max leftjust legend letrat let_rule_packages lfg lg lhospitallim limsubst linear linear_solver linechar linel|10 linenum line_type linewidth line_width linsolve_params linsolvewarn lispdisp listarith listconstvars listdummyvars lmxchar load_pathname loadprint logabs logarc logcb logconcoeffp logexpand lognegint logsimp logx logx_secondary logy logy_secondary logz lriem m1pbranch macroexpansion macros mainvar manual_demo maperror mapprint matrix_element_add matrix_element_mult matrix_element_transpose maxapplydepth maxapplyheight maxima_tempdir|10 maxima_userdir|10 maxnegex MAX_ORD maxposex maxpsifracdenom maxpsifracnum maxpsinegint maxpsiposint maxtayorder mesh_lines_color method mod_big_prime mode_check_errorp mode_checkp mode_check_warnp mod_test mod_threshold modular_linear_solver modulus multiplicative multiplicities myoptions nary negdistrib negsumdispflag newline newtonepsilon newtonmaxiter nextlayerfactor niceindicespref nm nmc noeval nolabels nonegative_lp noninteger nonscalar noun noundisp nouns np npi nticks ntrig numer numer_pbranch obase odd oddfun opacity opproperties opsubst optimprefix optionset orientation origin orthopoly_returns_intervals outative outchar packagefile palette partswitch pdf_file pfeformat phiresolution %piargs piece pivot_count_sx pivot_max_sx plot_format plot_options plot_realpart png_file pochhammer_max_index points pointsize point_size points_joined point_type poislim poisson poly_coefficient_ring poly_elimination_order polyfactor poly_grobner_algorithm poly_grobner_debug poly_monomial_order poly_primary_elimination_order poly_return_term_list poly_secondary_elimination_order poly_top_reduction_only posfun position powerdisp pred prederror primep_number_of_tests product_use_gamma program programmode promote_float_to_bigfloat prompt proportional_axes props psexpand ps_file radexpand radius radsubstflag rassociative ratalgdenom ratchristof ratdenomdivide rateinstein ratepsilon ratfac rational ratmx ratprint ratriemann ratsimpexpons ratvarswitch ratweights ratweyl ratwtlvl real realonly redraw refcheck resolution restart resultant ric riem rmxchar %rnum_list rombergabs rombergit rombergmin rombergtol rootsconmode rootsepsilon run_viewer same_xy same_xyz savedef savefactors scalar scalarmatrixp scale scale_lp setcheck setcheckbreak setval show_edge_color show_edges show_edge_type show_edge_width show_id show_label showtime show_vertex_color show_vertex_size show_vertex_type show_vertices show_weight simp simplified_output simplify_products simpproduct simpsum sinnpiflag solvedecomposes solveexplicit solvefactors solvenullwarn solveradcan solvetrigwarn space sparse sphere spring_embedding_depth sqrtdispflag stardisp startphi starttheta stats_numer stringdisp structures style sublis_apply_lambda subnumsimp sumexpand sumsplitfact surface surface_hide svg_file symmetric tab taylordepth taylor_logexpand taylor_order_coefficients taylor_truncate_polynomials tensorkill terminal testsuite_files thetaresolution timer_devalue title tlimswitch tr track transcompile transform transform_xy translate_fast_arrays transparent transrun tr_array_as_ref tr_bound_function_applyp tr_file_tty_messagesp tr_float_can_branch_complex tr_function_call_default trigexpandplus trigexpandtimes triginverses trigsign trivial_solutions tr_numer tr_optimize_max_loop tr_semicompile tr_state_vars tr_warn_bad_function_calls tr_warn_fexpr tr_warn_meval tr_warn_mode tr_warn_undeclared tr_warn_undefined_variable tstep ttyoff tube_extremes ufg ug %unitexpand unit_vectors uric uriem use_fast_arrays user_preamble usersetunits values vect_cross verbose vertex_color vertex_coloring vertex_partition vertex_size vertex_type view warnings weyl width windowname windowtitle wired_surface wireframe xaxis xaxis_color xaxis_secondary xaxis_type xaxis_width xlabel xlabel_secondary xlength xrange xrange_secondary xtics xtics_axis xtics_rotate xtics_rotate_secondary xtics_secondary xtics_secondary_axis xu_grid x_voxel xy_file xyplane xy_scale yaxis yaxis_color yaxis_secondary yaxis_type yaxis_width ylabel ylabel_secondary ylength yrange yrange_secondary ytics ytics_axis ytics_rotate ytics_rotate_secondary ytics_secondary ytics_secondary_axis yv_grid y_voxel yx_ratio zaxis zaxis_color zaxis_type zaxis_width zeroa zerob zerobern zeta%pi zlabel zlabel_rotate zlength zmin zn_primroot_limit zn_primroot_pretest",symbol:"_ __ %|0 %%|0"},contains:[{className:"comment",begin:"/\\*",end:"\\*/",contains:["self"]},e.QUOTE_STRING_MODE,{className:"number",relevance:0,variants:[{begin:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Ee][-+]?\\d+\\b"},{begin:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Bb][-+]?\\d+\\b",relevance:10},{begin:"\\b(\\.\\d+|\\d+\\.\\d+)\\b"},{begin:"\\b(\\d+|0[0-9A-Za-z]+)\\.?\\b"}]}],illegal:/@/}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/mel.min.js b/vendor/assets/javascripts/highlightjs/languages/mel.min.js
index cb5f45347d..881a207921 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mel.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mel.min.js
@@ -1 +1 @@
-hljs.registerLanguage("mel",function(e){return{k:"int float string vector matrix if else switch case default while do for in break continue global proc return about abs addAttr addAttributeEditorNodeHelp addDynamic addNewShelfTab addPP addPanelCategory addPrefixToName advanceToNextDrivenKey affectedNet affects aimConstraint air alias aliasAttr align alignCtx alignCurve alignSurface allViewFit ambientLight angle angleBetween animCone animCurveEditor animDisplay animView annotate appendStringArray applicationName applyAttrPreset applyTake arcLenDimContext arcLengthDimension arclen arrayMapper art3dPaintCtx artAttrCtx artAttrPaintVertexCtx artAttrSkinPaintCtx artAttrTool artBuildPaintMenu artFluidAttrCtx artPuttyCtx artSelectCtx artSetPaintCtx artUserPaintCtx assignCommand assignInputDevice assignViewportFactories attachCurve attachDeviceAttr attachSurface attrColorSliderGrp attrCompatibility attrControlGrp attrEnumOptionMenu attrEnumOptionMenuGrp attrFieldGrp attrFieldSliderGrp attrNavigationControlGrp attrPresetEditWin attributeExists attributeInfo attributeMenu attributeQuery autoKeyframe autoPlace bakeClip bakeFluidShading bakePartialHistory bakeResults bakeSimulation basename basenameEx batchRender bessel bevel bevelPlus binMembership bindSkin blend2 blendShape blendShapeEditor blendShapePanel blendTwoAttr blindDataType boneLattice boundary boxDollyCtx boxZoomCtx bufferCurve buildBookmarkMenu buildKeyframeMenu button buttonManip CBG cacheFile cacheFileCombine cacheFileMerge cacheFileTrack camera cameraView canCreateManip canvas capitalizeString catch catchQuiet ceil changeSubdivComponentDisplayLevel changeSubdivRegion channelBox character characterMap characterOutlineEditor characterize chdir checkBox checkBoxGrp checkDefaultRenderGlobals choice circle circularFillet clamp clear clearCache clip clipEditor clipEditorCurrentTimeCtx clipSchedule clipSchedulerOutliner clipTrimBefore closeCurve closeSurface cluster cmdFileOutput cmdScrollFieldExecuter cmdScrollFieldReporter cmdShell coarsenSubdivSelectionList collision color colorAtPoint colorEditor colorIndex colorIndexSliderGrp colorSliderButtonGrp colorSliderGrp columnLayout commandEcho commandLine commandPort compactHairSystem componentEditor compositingInterop computePolysetVolume condition cone confirmDialog connectAttr connectControl connectDynamic connectJoint connectionInfo constrain constrainValue constructionHistory container containsMultibyte contextInfo control convertFromOldLayers convertIffToPsd convertLightmap convertSolidTx convertTessellation convertUnit copyArray copyFlexor copyKey copySkinWeights cos cpButton cpCache cpClothSet cpCollision cpConstraint cpConvClothToMesh cpForces cpGetSolverAttr cpPanel cpProperty cpRigidCollisionFilter cpSeam cpSetEdit cpSetSolverAttr cpSolver cpSolverTypes cpTool cpUpdateClothUVs createDisplayLayer createDrawCtx createEditor createLayeredPsdFile createMotionField createNewShelf createNode createRenderLayer createSubdivRegion cross crossProduct ctxAbort ctxCompletion ctxEditMode ctxTraverse currentCtx currentTime currentTimeCtx currentUnit curve curveAddPtCtx curveCVCtx curveEPCtx curveEditorCtx curveIntersect curveMoveEPCtx curveOnSurface curveSketchCtx cutKey cycleCheck cylinder dagPose date defaultLightListCheckBox defaultNavigation defineDataServer defineVirtualDevice deformer deg_to_rad delete deleteAttr deleteShadingGroupsAndMaterials deleteShelfTab deleteUI deleteUnusedBrushes delrandstr detachCurve detachDeviceAttr detachSurface deviceEditor devicePanel dgInfo dgdirty dgeval dgtimer dimWhen directKeyCtx directionalLight dirmap dirname disable disconnectAttr disconnectJoint diskCache displacementToPoly displayAffected displayColor displayCull displayLevelOfDetail displayPref displayRGBColor displaySmoothness displayStats displayString displaySurface distanceDimContext distanceDimension doBlur dolly dollyCtx dopeSheetEditor dot dotProduct doubleProfileBirailSurface drag dragAttrContext draggerContext dropoffLocator duplicate duplicateCurve duplicateSurface dynCache dynControl dynExport dynExpression dynGlobals dynPaintEditor dynParticleCtx dynPref dynRelEdPanel dynRelEditor dynamicLoad editAttrLimits editDisplayLayerGlobals editDisplayLayerMembers editRenderLayerAdjustment editRenderLayerGlobals editRenderLayerMembers editor editorTemplate effector emit emitter enableDevice encodeString endString endsWith env equivalent equivalentTol erf error eval evalDeferred evalEcho event exactWorldBoundingBox exclusiveLightCheckBox exec executeForEachObject exists exp expression expressionEditorListen extendCurve extendSurface extrude fcheck fclose feof fflush fgetline fgetword file fileBrowserDialog fileDialog fileExtension fileInfo filetest filletCurve filter filterCurve filterExpand filterStudioImport findAllIntersections findAnimCurves findKeyframe findMenuItem findRelatedSkinCluster finder firstParentOf fitBspline flexor floatEq floatField floatFieldGrp floatScrollBar floatSlider floatSlider2 floatSliderButtonGrp floatSliderGrp floor flow fluidCacheInfo fluidEmitter fluidVoxelInfo flushUndo fmod fontDialog fopen formLayout format fprint frameLayout fread freeFormFillet frewind fromNativePath fwrite gamma gauss geometryConstraint getApplicationVersionAsFloat getAttr getClassification getDefaultBrush getFileList getFluidAttr getInputDeviceRange getMayaPanelTypes getModifiers getPanel getParticleAttr getPluginResource getenv getpid glRender glRenderEditor globalStitch gmatch goal gotoBindPose grabColor gradientControl gradientControlNoAttr graphDollyCtx graphSelectContext graphTrackCtx gravity grid gridLayout group groupObjectsByName HfAddAttractorToAS HfAssignAS HfBuildEqualMap HfBuildFurFiles HfBuildFurImages HfCancelAFR HfConnectASToHF HfCreateAttractor HfDeleteAS HfEditAS HfPerformCreateAS HfRemoveAttractorFromAS HfSelectAttached HfSelectAttractors HfUnAssignAS hardenPointCurve hardware hardwareRenderPanel headsUpDisplay headsUpMessage help helpLine hermite hide hilite hitTest hotBox hotkey hotkeyCheck hsv_to_rgb hudButton hudSlider hudSliderButton hwReflectionMap hwRender hwRenderLoad hyperGraph hyperPanel hyperShade hypot iconTextButton iconTextCheckBox iconTextRadioButton iconTextRadioCollection iconTextScrollList iconTextStaticLabel ikHandle ikHandleCtx ikHandleDisplayScale ikSolver ikSplineHandleCtx ikSystem ikSystemInfo ikfkDisplayMethod illustratorCurves image imfPlugins inheritTransform insertJoint insertJointCtx insertKeyCtx insertKnotCurve insertKnotSurface instance instanceable instancer intField intFieldGrp intScrollBar intSlider intSliderGrp interToUI internalVar intersect iprEngine isAnimCurve isConnected isDirty isParentOf isSameObject isTrue isValidObjectName isValidString isValidUiName isolateSelect itemFilter itemFilterAttr itemFilterRender itemFilterType joint jointCluster jointCtx jointDisplayScale jointLattice keyTangent keyframe keyframeOutliner keyframeRegionCurrentTimeCtx keyframeRegionDirectKeyCtx keyframeRegionDollyCtx keyframeRegionInsertKeyCtx keyframeRegionMoveKeyCtx keyframeRegionScaleKeyCtx keyframeRegionSelectKeyCtx keyframeRegionSetKeyCtx keyframeRegionTrackCtx keyframeStats lassoContext lattice latticeDeformKeyCtx launch launchImageEditor layerButton layeredShaderPort layeredTexturePort layout layoutDialog lightList lightListEditor lightListPanel lightlink lineIntersection linearPrecision linstep listAnimatable listAttr listCameras listConnections listDeviceAttachments listHistory listInputDeviceAxes listInputDeviceButtons listInputDevices listMenuAnnotation listNodeTypes listPanelCategories listRelatives listSets listTransforms listUnselected listerEditor loadFluid loadNewShelf loadPlugin loadPluginLanguageResources loadPrefObjects localizedPanelLabel lockNode loft log longNameOf lookThru ls lsThroughFilter lsType lsUI Mayatomr mag makeIdentity makeLive makePaintable makeRoll makeSingleSurface makeTubeOn makebot manipMoveContext manipMoveLimitsCtx manipOptions manipRotateContext manipRotateLimitsCtx manipScaleContext manipScaleLimitsCtx marker match max memory menu menuBarLayout menuEditor menuItem menuItemToShelf menuSet menuSetPref messageLine min minimizeApp mirrorJoint modelCurrentTimeCtx modelEditor modelPanel mouse movIn movOut move moveIKtoFK moveKeyCtx moveVertexAlongDirection multiProfileBirailSurface mute nParticle nameCommand nameField namespace namespaceInfo newPanelItems newton nodeCast nodeIconButton nodeOutliner nodePreset nodeType noise nonLinear normalConstraint normalize nurbsBoolean nurbsCopyUVSet nurbsCube nurbsEditUV nurbsPlane nurbsSelect nurbsSquare nurbsToPoly nurbsToPolygonsPref nurbsToSubdiv nurbsToSubdivPref nurbsUVSet nurbsViewDirectionVector objExists objectCenter objectLayer objectType objectTypeUI obsoleteProc oceanNurbsPreviewPlane offsetCurve offsetCurveOnSurface offsetSurface openGLExtension openMayaPref optionMenu optionMenuGrp optionVar orbit orbitCtx orientConstraint outlinerEditor outlinerPanel overrideModifier paintEffectsDisplay pairBlend palettePort paneLayout panel panelConfiguration panelHistory paramDimContext paramDimension paramLocator parent parentConstraint particle particleExists particleInstancer particleRenderInfo partition pasteKey pathAnimation pause pclose percent performanceOptions pfxstrokes pickWalk picture pixelMove planarSrf plane play playbackOptions playblast plugAttr plugNode pluginInfo pluginResourceUtil pointConstraint pointCurveConstraint pointLight pointMatrixMult pointOnCurve pointOnSurface pointPosition poleVectorConstraint polyAppend polyAppendFacetCtx polyAppendVertex polyAutoProjection polyAverageNormal polyAverageVertex polyBevel polyBlendColor polyBlindData polyBoolOp polyBridgeEdge polyCacheMonitor polyCheck polyChipOff polyClipboard polyCloseBorder polyCollapseEdge polyCollapseFacet polyColorBlindData polyColorDel polyColorPerVertex polyColorSet polyCompare polyCone polyCopyUV polyCrease polyCreaseCtx polyCreateFacet polyCreateFacetCtx polyCube polyCut polyCutCtx polyCylinder polyCylindricalProjection polyDelEdge polyDelFacet polyDelVertex polyDuplicateAndConnect polyDuplicateEdge polyEditUV polyEditUVShell polyEvaluate polyExtrudeEdge polyExtrudeFacet polyExtrudeVertex polyFlipEdge polyFlipUV polyForceUV polyGeoSampler polyHelix polyInfo polyInstallAction polyLayoutUV polyListComponentConversion polyMapCut polyMapDel polyMapSew polyMapSewMove polyMergeEdge polyMergeEdgeCtx polyMergeFacet polyMergeFacetCtx polyMergeUV polyMergeVertex polyMirrorFace polyMoveEdge polyMoveFacet polyMoveFacetUV polyMoveUV polyMoveVertex polyNormal polyNormalPerVertex polyNormalizeUV polyOptUvs polyOptions polyOutput polyPipe polyPlanarProjection polyPlane polyPlatonicSolid polyPoke polyPrimitive polyPrism polyProjection polyPyramid polyQuad polyQueryBlindData polyReduce polySelect polySelectConstraint polySelectConstraintMonitor polySelectCtx polySelectEditCtx polySeparate polySetToFaceNormal polySewEdge polyShortestPathCtx polySmooth polySoftEdge polySphere polySphericalProjection polySplit polySplitCtx polySplitEdge polySplitRing polySplitVertex polyStraightenUVBorder polySubdivideEdge polySubdivideFacet polyToSubdiv polyTorus polyTransfer polyTriangulate polyUVSet polyUnite polyWedgeFace popen popupMenu pose pow preloadRefEd print progressBar progressWindow projFileViewer projectCurve projectTangent projectionContext projectionManip promptDialog propModCtx propMove psdChannelOutliner psdEditTextureFile psdExport psdTextureFile putenv pwd python querySubdiv quit rad_to_deg radial radioButton radioButtonGrp radioCollection radioMenuItemCollection rampColorPort rand randomizeFollicles randstate rangeControl readTake rebuildCurve rebuildSurface recordAttr recordDevice redo reference referenceEdit referenceQuery refineSubdivSelectionList refresh refreshAE registerPluginResource rehash reloadImage removeJoint removeMultiInstance removePanelCategory rename renameAttr renameSelectionList renameUI render renderGlobalsNode renderInfo renderLayerButton renderLayerParent renderLayerPostProcess renderLayerUnparent renderManip renderPartition renderQualityNode renderSettings renderThumbnailUpdate renderWindowEditor renderWindowSelectContext renderer reorder reorderDeformers requires reroot resampleFluid resetAE resetPfxToPolyCamera resetTool resolutionNode retarget reverseCurve reverseSurface revolve rgb_to_hsv rigidBody rigidSolver roll rollCtx rootOf rot rotate rotationInterpolation roundConstantRadius rowColumnLayout rowLayout runTimeCommand runup sampleImage saveAllShelves saveAttrPreset saveFluid saveImage saveInitialState saveMenu savePrefObjects savePrefs saveShelf saveToolSettings scale scaleBrushBrightness scaleComponents scaleConstraint scaleKey scaleKeyCtx sceneEditor sceneUIReplacement scmh scriptCtx scriptEditorInfo scriptJob scriptNode scriptTable scriptToShelf scriptedPanel scriptedPanelType scrollField scrollLayout sculpt searchPathArray seed selLoadSettings select selectContext selectCurveCV selectKey selectKeyCtx selectKeyframeRegionCtx selectMode selectPref selectPriority selectType selectedNodes selectionConnection separator setAttr setAttrEnumResource setAttrMapping setAttrNiceNameResource setConstraintRestPosition setDefaultShadingGroup setDrivenKeyframe setDynamic setEditCtx setEditor setFluidAttr setFocus setInfinity setInputDeviceMapping setKeyCtx setKeyPath setKeyframe setKeyframeBlendshapeTargetWts setMenuMode setNodeNiceNameResource setNodeTypeFlag setParent setParticleAttr setPfxToPolyCamera setPluginResource setProject setStampDensity setStartupMessage setState setToolTo setUITemplate setXformManip sets shadingConnection shadingGeometryRelCtx shadingLightRelCtx shadingNetworkCompare shadingNode shapeCompare shelfButton shelfLayout shelfTabLayout shellField shortNameOf showHelp showHidden showManipCtx showSelectionInTitle showShadingGroupAttrEditor showWindow sign simplify sin singleProfileBirailSurface size sizeBytes skinCluster skinPercent smoothCurve smoothTangentSurface smoothstep snap2to2 snapKey snapMode snapTogetherCtx snapshot soft softMod softModCtx sort sound soundControl source spaceLocator sphere sphrand spotLight spotLightPreviewPort spreadSheetEditor spring sqrt squareSurface srtContext stackTrace startString startsWith stitchAndExplodeShell stitchSurface stitchSurfacePoints strcmp stringArrayCatenate stringArrayContains stringArrayCount stringArrayInsertAtIndex stringArrayIntersector stringArrayRemove stringArrayRemoveAtIndex stringArrayRemoveDuplicates stringArrayRemoveExact stringArrayToString stringToStringArray strip stripPrefixFromName stroke subdAutoProjection subdCleanTopology subdCollapse subdDuplicateAndConnect subdEditUV subdListComponentConversion subdMapCut subdMapSewMove subdMatchTopology subdMirror subdToBlind subdToPoly subdTransferUVsToCache subdiv subdivCrease subdivDisplaySmoothness substitute substituteAllString substituteGeometry substring surface surfaceSampler surfaceShaderList swatchDisplayPort switchTable symbolButton symbolCheckBox sysFile system tabLayout tan tangentConstraint texLatticeDeformContext texManipContext texMoveContext texMoveUVShellContext texRotateContext texScaleContext texSelectContext texSelectShortestPathCtx texSmudgeUVContext texWinToolCtx text textCurves textField textFieldButtonGrp textFieldGrp textManip textScrollList textToShelf textureDisplacePlane textureHairColor texturePlacementContext textureWindow threadCount threePointArcCtx timeControl timePort timerX toNativePath toggle toggleAxis toggleWindowVisibility tokenize tokenizeList tolerance tolower toolButton toolCollection toolDropped toolHasOptions toolPropertyWindow torus toupper trace track trackCtx transferAttributes transformCompare transformLimits translator trim trunc truncateFluidCache truncateHairCache tumble tumbleCtx turbulence twoPointArcCtx uiRes uiTemplate unassignInputDevice undo undoInfo ungroup uniform unit unloadPlugin untangleUV untitledFileName untrim upAxis updateAE userCtx uvLink uvSnapshot validateShelfName vectorize view2dToolCtx viewCamera viewClipPlane viewFit viewHeadOn viewLookAt viewManip viewPlace viewSet visor volumeAxis vortex waitCursor warning webBrowser webBrowserPrefs whatIs window windowPref wire wireContext workspace wrinkle wrinkleContext writeTake xbmLangPathList xform",i:"</",c:[e.CNM,e.ASM,e.QSM,{cN:"string",b:"`",e:"`",c:[e.BE]},{b:"[\\$\\%\\@](\\^\\w\\b|#\\w+|[^\\s\\w{]|{\\w+}|\\w+)"},e.CLCM,e.CBCM]}});
\ No newline at end of file
+hljs.registerLanguage("mel",function(){"use strict";return function(e){return{name:"MEL",keywords:"int float string vector matrix if else switch case default while do for in break continue global proc return about abs addAttr addAttributeEditorNodeHelp addDynamic addNewShelfTab addPP addPanelCategory addPrefixToName advanceToNextDrivenKey affectedNet affects aimConstraint air alias aliasAttr align alignCtx alignCurve alignSurface allViewFit ambientLight angle angleBetween animCone animCurveEditor animDisplay animView annotate appendStringArray applicationName applyAttrPreset applyTake arcLenDimContext arcLengthDimension arclen arrayMapper art3dPaintCtx artAttrCtx artAttrPaintVertexCtx artAttrSkinPaintCtx artAttrTool artBuildPaintMenu artFluidAttrCtx artPuttyCtx artSelectCtx artSetPaintCtx artUserPaintCtx assignCommand assignInputDevice assignViewportFactories attachCurve attachDeviceAttr attachSurface attrColorSliderGrp attrCompatibility attrControlGrp attrEnumOptionMenu attrEnumOptionMenuGrp attrFieldGrp attrFieldSliderGrp attrNavigationControlGrp attrPresetEditWin attributeExists attributeInfo attributeMenu attributeQuery autoKeyframe autoPlace bakeClip bakeFluidShading bakePartialHistory bakeResults bakeSimulation basename basenameEx batchRender bessel bevel bevelPlus binMembership bindSkin blend2 blendShape blendShapeEditor blendShapePanel blendTwoAttr blindDataType boneLattice boundary boxDollyCtx boxZoomCtx bufferCurve buildBookmarkMenu buildKeyframeMenu button buttonManip CBG cacheFile cacheFileCombine cacheFileMerge cacheFileTrack camera cameraView canCreateManip canvas capitalizeString catch catchQuiet ceil changeSubdivComponentDisplayLevel changeSubdivRegion channelBox character characterMap characterOutlineEditor characterize chdir checkBox checkBoxGrp checkDefaultRenderGlobals choice circle circularFillet clamp clear clearCache clip clipEditor clipEditorCurrentTimeCtx clipSchedule clipSchedulerOutliner clipTrimBefore closeCurve closeSurface cluster cmdFileOutput cmdScrollFieldExecuter cmdScrollFieldReporter cmdShell coarsenSubdivSelectionList collision color colorAtPoint colorEditor colorIndex colorIndexSliderGrp colorSliderButtonGrp colorSliderGrp columnLayout commandEcho commandLine commandPort compactHairSystem componentEditor compositingInterop computePolysetVolume condition cone confirmDialog connectAttr connectControl connectDynamic connectJoint connectionInfo constrain constrainValue constructionHistory container containsMultibyte contextInfo control convertFromOldLayers convertIffToPsd convertLightmap convertSolidTx convertTessellation convertUnit copyArray copyFlexor copyKey copySkinWeights cos cpButton cpCache cpClothSet cpCollision cpConstraint cpConvClothToMesh cpForces cpGetSolverAttr cpPanel cpProperty cpRigidCollisionFilter cpSeam cpSetEdit cpSetSolverAttr cpSolver cpSolverTypes cpTool cpUpdateClothUVs createDisplayLayer createDrawCtx createEditor createLayeredPsdFile createMotionField createNewShelf createNode createRenderLayer createSubdivRegion cross crossProduct ctxAbort ctxCompletion ctxEditMode ctxTraverse currentCtx currentTime currentTimeCtx currentUnit curve curveAddPtCtx curveCVCtx curveEPCtx curveEditorCtx curveIntersect curveMoveEPCtx curveOnSurface curveSketchCtx cutKey cycleCheck cylinder dagPose date defaultLightListCheckBox defaultNavigation defineDataServer defineVirtualDevice deformer deg_to_rad delete deleteAttr deleteShadingGroupsAndMaterials deleteShelfTab deleteUI deleteUnusedBrushes delrandstr detachCurve detachDeviceAttr detachSurface deviceEditor devicePanel dgInfo dgdirty dgeval dgtimer dimWhen directKeyCtx directionalLight dirmap dirname disable disconnectAttr disconnectJoint diskCache displacementToPoly displayAffected displayColor displayCull displayLevelOfDetail displayPref displayRGBColor displaySmoothness displayStats displayString displaySurface distanceDimContext distanceDimension doBlur dolly dollyCtx dopeSheetEditor dot dotProduct doubleProfileBirailSurface drag dragAttrContext draggerContext dropoffLocator duplicate duplicateCurve duplicateSurface dynCache dynControl dynExport dynExpression dynGlobals dynPaintEditor dynParticleCtx dynPref dynRelEdPanel dynRelEditor dynamicLoad editAttrLimits editDisplayLayerGlobals editDisplayLayerMembers editRenderLayerAdjustment editRenderLayerGlobals editRenderLayerMembers editor editorTemplate effector emit emitter enableDevice encodeString endString endsWith env equivalent equivalentTol erf error eval evalDeferred evalEcho event exactWorldBoundingBox exclusiveLightCheckBox exec executeForEachObject exists exp expression expressionEditorListen extendCurve extendSurface extrude fcheck fclose feof fflush fgetline fgetword file fileBrowserDialog fileDialog fileExtension fileInfo filetest filletCurve filter filterCurve filterExpand filterStudioImport findAllIntersections findAnimCurves findKeyframe findMenuItem findRelatedSkinCluster finder firstParentOf fitBspline flexor floatEq floatField floatFieldGrp floatScrollBar floatSlider floatSlider2 floatSliderButtonGrp floatSliderGrp floor flow fluidCacheInfo fluidEmitter fluidVoxelInfo flushUndo fmod fontDialog fopen formLayout format fprint frameLayout fread freeFormFillet frewind fromNativePath fwrite gamma gauss geometryConstraint getApplicationVersionAsFloat getAttr getClassification getDefaultBrush getFileList getFluidAttr getInputDeviceRange getMayaPanelTypes getModifiers getPanel getParticleAttr getPluginResource getenv getpid glRender glRenderEditor globalStitch gmatch goal gotoBindPose grabColor gradientControl gradientControlNoAttr graphDollyCtx graphSelectContext graphTrackCtx gravity grid gridLayout group groupObjectsByName HfAddAttractorToAS HfAssignAS HfBuildEqualMap HfBuildFurFiles HfBuildFurImages HfCancelAFR HfConnectASToHF HfCreateAttractor HfDeleteAS HfEditAS HfPerformCreateAS HfRemoveAttractorFromAS HfSelectAttached HfSelectAttractors HfUnAssignAS hardenPointCurve hardware hardwareRenderPanel headsUpDisplay headsUpMessage help helpLine hermite hide hilite hitTest hotBox hotkey hotkeyCheck hsv_to_rgb hudButton hudSlider hudSliderButton hwReflectionMap hwRender hwRenderLoad hyperGraph hyperPanel hyperShade hypot iconTextButton iconTextCheckBox iconTextRadioButton iconTextRadioCollection iconTextScrollList iconTextStaticLabel ikHandle ikHandleCtx ikHandleDisplayScale ikSolver ikSplineHandleCtx ikSystem ikSystemInfo ikfkDisplayMethod illustratorCurves image imfPlugins inheritTransform insertJoint insertJointCtx insertKeyCtx insertKnotCurve insertKnotSurface instance instanceable instancer intField intFieldGrp intScrollBar intSlider intSliderGrp interToUI internalVar intersect iprEngine isAnimCurve isConnected isDirty isParentOf isSameObject isTrue isValidObjectName isValidString isValidUiName isolateSelect itemFilter itemFilterAttr itemFilterRender itemFilterType joint jointCluster jointCtx jointDisplayScale jointLattice keyTangent keyframe keyframeOutliner keyframeRegionCurrentTimeCtx keyframeRegionDirectKeyCtx keyframeRegionDollyCtx keyframeRegionInsertKeyCtx keyframeRegionMoveKeyCtx keyframeRegionScaleKeyCtx keyframeRegionSelectKeyCtx keyframeRegionSetKeyCtx keyframeRegionTrackCtx keyframeStats lassoContext lattice latticeDeformKeyCtx launch launchImageEditor layerButton layeredShaderPort layeredTexturePort layout layoutDialog lightList lightListEditor lightListPanel lightlink lineIntersection linearPrecision linstep listAnimatable listAttr listCameras listConnections listDeviceAttachments listHistory listInputDeviceAxes listInputDeviceButtons listInputDevices listMenuAnnotation listNodeTypes listPanelCategories listRelatives listSets listTransforms listUnselected listerEditor loadFluid loadNewShelf loadPlugin loadPluginLanguageResources loadPrefObjects localizedPanelLabel lockNode loft log longNameOf lookThru ls lsThroughFilter lsType lsUI Mayatomr mag makeIdentity makeLive makePaintable makeRoll makeSingleSurface makeTubeOn makebot manipMoveContext manipMoveLimitsCtx manipOptions manipRotateContext manipRotateLimitsCtx manipScaleContext manipScaleLimitsCtx marker match max memory menu menuBarLayout menuEditor menuItem menuItemToShelf menuSet menuSetPref messageLine min minimizeApp mirrorJoint modelCurrentTimeCtx modelEditor modelPanel mouse movIn movOut move moveIKtoFK moveKeyCtx moveVertexAlongDirection multiProfileBirailSurface mute nParticle nameCommand nameField namespace namespaceInfo newPanelItems newton nodeCast nodeIconButton nodeOutliner nodePreset nodeType noise nonLinear normalConstraint normalize nurbsBoolean nurbsCopyUVSet nurbsCube nurbsEditUV nurbsPlane nurbsSelect nurbsSquare nurbsToPoly nurbsToPolygonsPref nurbsToSubdiv nurbsToSubdivPref nurbsUVSet nurbsViewDirectionVector objExists objectCenter objectLayer objectType objectTypeUI obsoleteProc oceanNurbsPreviewPlane offsetCurve offsetCurveOnSurface offsetSurface openGLExtension openMayaPref optionMenu optionMenuGrp optionVar orbit orbitCtx orientConstraint outlinerEditor outlinerPanel overrideModifier paintEffectsDisplay pairBlend palettePort paneLayout panel panelConfiguration panelHistory paramDimContext paramDimension paramLocator parent parentConstraint particle particleExists particleInstancer particleRenderInfo partition pasteKey pathAnimation pause pclose percent performanceOptions pfxstrokes pickWalk picture pixelMove planarSrf plane play playbackOptions playblast plugAttr plugNode pluginInfo pluginResourceUtil pointConstraint pointCurveConstraint pointLight pointMatrixMult pointOnCurve pointOnSurface pointPosition poleVectorConstraint polyAppend polyAppendFacetCtx polyAppendVertex polyAutoProjection polyAverageNormal polyAverageVertex polyBevel polyBlendColor polyBlindData polyBoolOp polyBridgeEdge polyCacheMonitor polyCheck polyChipOff polyClipboard polyCloseBorder polyCollapseEdge polyCollapseFacet polyColorBlindData polyColorDel polyColorPerVertex polyColorSet polyCompare polyCone polyCopyUV polyCrease polyCreaseCtx polyCreateFacet polyCreateFacetCtx polyCube polyCut polyCutCtx polyCylinder polyCylindricalProjection polyDelEdge polyDelFacet polyDelVertex polyDuplicateAndConnect polyDuplicateEdge polyEditUV polyEditUVShell polyEvaluate polyExtrudeEdge polyExtrudeFacet polyExtrudeVertex polyFlipEdge polyFlipUV polyForceUV polyGeoSampler polyHelix polyInfo polyInstallAction polyLayoutUV polyListComponentConversion polyMapCut polyMapDel polyMapSew polyMapSewMove polyMergeEdge polyMergeEdgeCtx polyMergeFacet polyMergeFacetCtx polyMergeUV polyMergeVertex polyMirrorFace polyMoveEdge polyMoveFacet polyMoveFacetUV polyMoveUV polyMoveVertex polyNormal polyNormalPerVertex polyNormalizeUV polyOptUvs polyOptions polyOutput polyPipe polyPlanarProjection polyPlane polyPlatonicSolid polyPoke polyPrimitive polyPrism polyProjection polyPyramid polyQuad polyQueryBlindData polyReduce polySelect polySelectConstraint polySelectConstraintMonitor polySelectCtx polySelectEditCtx polySeparate polySetToFaceNormal polySewEdge polyShortestPathCtx polySmooth polySoftEdge polySphere polySphericalProjection polySplit polySplitCtx polySplitEdge polySplitRing polySplitVertex polyStraightenUVBorder polySubdivideEdge polySubdivideFacet polyToSubdiv polyTorus polyTransfer polyTriangulate polyUVSet polyUnite polyWedgeFace popen popupMenu pose pow preloadRefEd print progressBar progressWindow projFileViewer projectCurve projectTangent projectionContext projectionManip promptDialog propModCtx propMove psdChannelOutliner psdEditTextureFile psdExport psdTextureFile putenv pwd python querySubdiv quit rad_to_deg radial radioButton radioButtonGrp radioCollection radioMenuItemCollection rampColorPort rand randomizeFollicles randstate rangeControl readTake rebuildCurve rebuildSurface recordAttr recordDevice redo reference referenceEdit referenceQuery refineSubdivSelectionList refresh refreshAE registerPluginResource rehash reloadImage removeJoint removeMultiInstance removePanelCategory rename renameAttr renameSelectionList renameUI render renderGlobalsNode renderInfo renderLayerButton renderLayerParent renderLayerPostProcess renderLayerUnparent renderManip renderPartition renderQualityNode renderSettings renderThumbnailUpdate renderWindowEditor renderWindowSelectContext renderer reorder reorderDeformers requires reroot resampleFluid resetAE resetPfxToPolyCamera resetTool resolutionNode retarget reverseCurve reverseSurface revolve rgb_to_hsv rigidBody rigidSolver roll rollCtx rootOf rot rotate rotationInterpolation roundConstantRadius rowColumnLayout rowLayout runTimeCommand runup sampleImage saveAllShelves saveAttrPreset saveFluid saveImage saveInitialState saveMenu savePrefObjects savePrefs saveShelf saveToolSettings scale scaleBrushBrightness scaleComponents scaleConstraint scaleKey scaleKeyCtx sceneEditor sceneUIReplacement scmh scriptCtx scriptEditorInfo scriptJob scriptNode scriptTable scriptToShelf scriptedPanel scriptedPanelType scrollField scrollLayout sculpt searchPathArray seed selLoadSettings select selectContext selectCurveCV selectKey selectKeyCtx selectKeyframeRegionCtx selectMode selectPref selectPriority selectType selectedNodes selectionConnection separator setAttr setAttrEnumResource setAttrMapping setAttrNiceNameResource setConstraintRestPosition setDefaultShadingGroup setDrivenKeyframe setDynamic setEditCtx setEditor setFluidAttr setFocus setInfinity setInputDeviceMapping setKeyCtx setKeyPath setKeyframe setKeyframeBlendshapeTargetWts setMenuMode setNodeNiceNameResource setNodeTypeFlag setParent setParticleAttr setPfxToPolyCamera setPluginResource setProject setStampDensity setStartupMessage setState setToolTo setUITemplate setXformManip sets shadingConnection shadingGeometryRelCtx shadingLightRelCtx shadingNetworkCompare shadingNode shapeCompare shelfButton shelfLayout shelfTabLayout shellField shortNameOf showHelp showHidden showManipCtx showSelectionInTitle showShadingGroupAttrEditor showWindow sign simplify sin singleProfileBirailSurface size sizeBytes skinCluster skinPercent smoothCurve smoothTangentSurface smoothstep snap2to2 snapKey snapMode snapTogetherCtx snapshot soft softMod softModCtx sort sound soundControl source spaceLocator sphere sphrand spotLight spotLightPreviewPort spreadSheetEditor spring sqrt squareSurface srtContext stackTrace startString startsWith stitchAndExplodeShell stitchSurface stitchSurfacePoints strcmp stringArrayCatenate stringArrayContains stringArrayCount stringArrayInsertAtIndex stringArrayIntersector stringArrayRemove stringArrayRemoveAtIndex stringArrayRemoveDuplicates stringArrayRemoveExact stringArrayToString stringToStringArray strip stripPrefixFromName stroke subdAutoProjection subdCleanTopology subdCollapse subdDuplicateAndConnect subdEditUV subdListComponentConversion subdMapCut subdMapSewMove subdMatchTopology subdMirror subdToBlind subdToPoly subdTransferUVsToCache subdiv subdivCrease subdivDisplaySmoothness substitute substituteAllString substituteGeometry substring surface surfaceSampler surfaceShaderList swatchDisplayPort switchTable symbolButton symbolCheckBox sysFile system tabLayout tan tangentConstraint texLatticeDeformContext texManipContext texMoveContext texMoveUVShellContext texRotateContext texScaleContext texSelectContext texSelectShortestPathCtx texSmudgeUVContext texWinToolCtx text textCurves textField textFieldButtonGrp textFieldGrp textManip textScrollList textToShelf textureDisplacePlane textureHairColor texturePlacementContext textureWindow threadCount threePointArcCtx timeControl timePort timerX toNativePath toggle toggleAxis toggleWindowVisibility tokenize tokenizeList tolerance tolower toolButton toolCollection toolDropped toolHasOptions toolPropertyWindow torus toupper trace track trackCtx transferAttributes transformCompare transformLimits translator trim trunc truncateFluidCache truncateHairCache tumble tumbleCtx turbulence twoPointArcCtx uiRes uiTemplate unassignInputDevice undo undoInfo ungroup uniform unit unloadPlugin untangleUV untitledFileName untrim upAxis updateAE userCtx uvLink uvSnapshot validateShelfName vectorize view2dToolCtx viewCamera viewClipPlane viewFit viewHeadOn viewLookAt viewManip viewPlace viewSet visor volumeAxis vortex waitCursor warning webBrowser webBrowserPrefs whatIs window windowPref wire wireContext workspace wrinkle wrinkleContext writeTake xbmLangPathList xform",illegal:"</",contains:[e.C_NUMBER_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"string",begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE]},{begin:"[\\$\\%\\@](\\^\\w\\b|#\\w+|[^\\s\\w{]|{\\w+}|\\w+)"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/mercury.min.js b/vendor/assets/javascripts/highlightjs/languages/mercury.min.js
index cd1d45ad3e..e1dae67331 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mercury.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mercury.min.js
@@ -1 +1 @@
-hljs.registerLanguage("mercury",function(e){var i={keyword:"module use_module import_module include_module end_module initialise mutable initialize finalize finalise interface implementation pred mode func type inst solver any_pred any_func is semidet det nondet multi erroneous failure cc_nondet cc_multi typeclass instance where pragma promise external trace atomic or_else require_complete_switch require_det require_semidet require_multi require_nondet require_cc_multi require_cc_nondet require_erroneous require_failure",meta:"inline no_inline type_spec source_file fact_table obsolete memo loop_check minimal_model terminates does_not_terminate check_termination promise_equivalent_clauses foreign_proc foreign_decl foreign_code foreign_type foreign_import_module foreign_export_enum foreign_export foreign_enum may_call_mercury will_not_call_mercury thread_safe not_thread_safe maybe_thread_safe promise_pure promise_semipure tabled_for_io local untrailed trailed attach_to_io_state can_pass_as_mercury_type stable will_not_throw_exception may_modify_trail will_not_modify_trail may_duplicate may_not_duplicate affects_liveness does_not_affect_liveness doesnt_affect_liveness no_sharing unknown_sharing sharing",built_in:"some all not if then else true fail false try catch catch_any semidet_true semidet_false semidet_fail impure_true impure semipure"},r=e.C("%","$"),t={cN:"number",b:"0'.\\|0[box][0-9a-fA-F]*"},_=e.inherit(e.ASM,{r:0}),n=e.inherit(e.QSM,{r:0}),a={cN:"subst",b:"\\\\[abfnrtv]\\|\\\\x[0-9a-fA-F]*\\\\\\|%[-+# *.0-9]*[dioxXucsfeEgGp]",r:0};n.c.push(a);var o={cN:"built_in",v:[{b:"<=>"},{b:"<=",r:0},{b:"=>",r:0},{b:"/\\\\"},{b:"\\\\/"}]},l={cN:"built_in",v:[{b:":-\\|-->"},{b:"=",r:0}]};return{aliases:["m","moo"],k:i,c:[o,l,r,e.CBCM,t,e.NM,_,n,{b:/:-/}]}});
\ No newline at end of file
+hljs.registerLanguage("mercury",function(){"use strict";return function(e){var i=e.COMMENT("%","$"),n=e.inherit(e.APOS_STRING_MODE,{relevance:0}),r=e.inherit(e.QUOTE_STRING_MODE,{relevance:0});return r.contains=r.contains.slice(),r.contains.push({className:"subst",begin:"\\\\[abfnrtv]\\|\\\\x[0-9a-fA-F]*\\\\\\|%[-+# *.0-9]*[dioxXucsfeEgGp]",relevance:0}),{name:"Mercury",aliases:["m","moo"],keywords:{keyword:"module use_module import_module include_module end_module initialise mutable initialize finalize finalise interface implementation pred mode func type inst solver any_pred any_func is semidet det nondet multi erroneous failure cc_nondet cc_multi typeclass instance where pragma promise external trace atomic or_else require_complete_switch require_det require_semidet require_multi require_nondet require_cc_multi require_cc_nondet require_erroneous require_failure",meta:"inline no_inline type_spec source_file fact_table obsolete memo loop_check minimal_model terminates does_not_terminate check_termination promise_equivalent_clauses foreign_proc foreign_decl foreign_code foreign_type foreign_import_module foreign_export_enum foreign_export foreign_enum may_call_mercury will_not_call_mercury thread_safe not_thread_safe maybe_thread_safe promise_pure promise_semipure tabled_for_io local untrailed trailed attach_to_io_state can_pass_as_mercury_type stable will_not_throw_exception may_modify_trail will_not_modify_trail may_duplicate may_not_duplicate affects_liveness does_not_affect_liveness doesnt_affect_liveness no_sharing unknown_sharing sharing",built_in:"some all not if then else true fail false try catch catch_any semidet_true semidet_false semidet_fail impure_true impure semipure"},contains:[{className:"built_in",variants:[{begin:"<=>"},{begin:"<=",relevance:0},{begin:"=>",relevance:0},{begin:"/\\\\"},{begin:"\\\\/"}]},{className:"built_in",variants:[{begin:":-\\|--\x3e"},{begin:"=",relevance:0}]},i,e.C_BLOCK_COMMENT_MODE,{className:"number",begin:"0'.\\|0[box][0-9a-fA-F]*"},e.NUMBER_MODE,n,r,{begin:/:-/},{begin:/\.$/}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/mipsasm.min.js b/vendor/assets/javascripts/highlightjs/languages/mipsasm.min.js
index 0662193ff1..7d7591939d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mipsasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mipsasm.min.js
@@ -1 +1 @@
-hljs.registerLanguage("mipsasm",function(s){return{cI:!0,aliases:["mips"],l:"\\.?"+s.IR,k:{meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .ltorg ",built_in:"$0 $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 $17 $18 $19 $20 $21 $22 $23 $24 $25 $26 $27 $28 $29 $30 $31 zero at v0 v1 a0 a1 a2 a3 a4 a5 a6 a7 t0 t1 t2 t3 t4 t5 t6 t7 t8 t9 s0 s1 s2 s3 s4 s5 s6 s7 s8 k0 k1 gp sp fp ra $f0 $f1 $f2 $f2 $f4 $f5 $f6 $f7 $f8 $f9 $f10 $f11 $f12 $f13 $f14 $f15 $f16 $f17 $f18 $f19 $f20 $f21 $f22 $f23 $f24 $f25 $f26 $f27 $f28 $f29 $f30 $f31 Context Random EntryLo0 EntryLo1 Context PageMask Wired EntryHi HWREna BadVAddr Count Compare SR IntCtl SRSCtl SRSMap Cause EPC PRId EBase Config Config1 Config2 Config3 LLAddr Debug DEPC DESAVE CacheErr ECC ErrorEPC TagLo DataLo TagHi DataHi WatchLo WatchHi PerfCtl PerfCnt "},c:[{cN:"keyword",b:"\\b(addi?u?|andi?|b(al)?|beql?|bgez(al)?l?|bgtzl?|blezl?|bltz(al)?l?|bnel?|cl[oz]|divu?|ext|ins|j(al)?|jalr(.hb)?|jr(.hb)?|lbu?|lhu?|ll|lui|lw[lr]?|maddu?|mfhi|mflo|movn|movz|move|msubu?|mthi|mtlo|mul|multu?|nop|nor|ori?|rotrv?|sb|sc|se[bh]|sh|sllv?|slti?u?|srav?|srlv?|subu?|sw[lr]?|xori?|wsbh|abs.[sd]|add.[sd]|alnv.ps|bc1[ft]l?|c.(s?f|un|u?eq|[ou]lt|[ou]le|ngle?|seq|l[et]|ng[et]).[sd]|(ceil|floor|round|trunc).[lw].[sd]|cfc1|cvt.d.[lsw]|cvt.l.[dsw]|cvt.ps.s|cvt.s.[dlw]|cvt.s.p[lu]|cvt.w.[dls]|div.[ds]|ldx?c1|luxc1|lwx?c1|madd.[sd]|mfc1|mov[fntz]?.[ds]|msub.[sd]|mth?c1|mul.[ds]|neg.[ds]|nmadd.[ds]|nmsub.[ds]|p[lu][lu].ps|recip.fmt|r?sqrt.[ds]|sdx?c1|sub.[ds]|suxc1|swx?c1|break|cache|d?eret|[de]i|ehb|mfc0|mtc0|pause|prefx?|rdhwr|rdpgpr|sdbbp|ssnop|synci?|syscall|teqi?|tgei?u?|tlb(p|r|w[ir])|tlti?u?|tnei?|wait|wrpgpr)",e:"\\s"},s.C("[;#]","$"),s.CBCM,s.QSM,{cN:"string",b:"'",e:"[^\\\\]'",r:0},{cN:"title",b:"\\|",e:"\\|",i:"\\n",r:0},{cN:"number",v:[{b:"0x[0-9a-f]+"},{b:"\\b-?\\d+"}],r:0},{cN:"symbol",v:[{b:"^\\s*[a-z_\\.\\$][a-z0-9_\\.\\$]+:"},{b:"^\\s*[0-9]+:"},{b:"[0-9]+[bf]"}],r:0}],i:"/"}});
\ No newline at end of file
+hljs.registerLanguage("mipsasm",function(){"use strict";return function(e){return{name:"MIPS Assembly",case_insensitive:!0,aliases:["mips"],keywords:{$pattern:"\\.?"+e.IDENT_RE,meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .ltorg ",built_in:"$0 $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 $17 $18 $19 $20 $21 $22 $23 $24 $25 $26 $27 $28 $29 $30 $31 zero at v0 v1 a0 a1 a2 a3 a4 a5 a6 a7 t0 t1 t2 t3 t4 t5 t6 t7 t8 t9 s0 s1 s2 s3 s4 s5 s6 s7 s8 k0 k1 gp sp fp ra $f0 $f1 $f2 $f2 $f4 $f5 $f6 $f7 $f8 $f9 $f10 $f11 $f12 $f13 $f14 $f15 $f16 $f17 $f18 $f19 $f20 $f21 $f22 $f23 $f24 $f25 $f26 $f27 $f28 $f29 $f30 $f31 Context Random EntryLo0 EntryLo1 Context PageMask Wired EntryHi HWREna BadVAddr Count Compare SR IntCtl SRSCtl SRSMap Cause EPC PRId EBase Config Config1 Config2 Config3 LLAddr Debug DEPC DESAVE CacheErr ECC ErrorEPC TagLo DataLo TagHi DataHi WatchLo WatchHi PerfCtl PerfCnt "},contains:[{className:"keyword",begin:"\\b(addi?u?|andi?|b(al)?|beql?|bgez(al)?l?|bgtzl?|blezl?|bltz(al)?l?|bnel?|cl[oz]|divu?|ext|ins|j(al)?|jalr(.hb)?|jr(.hb)?|lbu?|lhu?|ll|lui|lw[lr]?|maddu?|mfhi|mflo|movn|movz|move|msubu?|mthi|mtlo|mul|multu?|nop|nor|ori?|rotrv?|sb|sc|se[bh]|sh|sllv?|slti?u?|srav?|srlv?|subu?|sw[lr]?|xori?|wsbh|abs.[sd]|add.[sd]|alnv.ps|bc1[ft]l?|c.(s?f|un|u?eq|[ou]lt|[ou]le|ngle?|seq|l[et]|ng[et]).[sd]|(ceil|floor|round|trunc).[lw].[sd]|cfc1|cvt.d.[lsw]|cvt.l.[dsw]|cvt.ps.s|cvt.s.[dlw]|cvt.s.p[lu]|cvt.w.[dls]|div.[ds]|ldx?c1|luxc1|lwx?c1|madd.[sd]|mfc1|mov[fntz]?.[ds]|msub.[sd]|mth?c1|mul.[ds]|neg.[ds]|nmadd.[ds]|nmsub.[ds]|p[lu][lu].ps|recip.fmt|r?sqrt.[ds]|sdx?c1|sub.[ds]|suxc1|swx?c1|break|cache|d?eret|[de]i|ehb|mfc0|mtc0|pause|prefx?|rdhwr|rdpgpr|sdbbp|ssnop|synci?|syscall|teqi?|tgei?u?|tlb(p|r|w[ir])|tlti?u?|tnei?|wait|wrpgpr)",end:"\\s"},e.COMMENT("[;#](?!s*$)","$"),e.C_BLOCK_COMMENT_MODE,e.QUOTE_STRING_MODE,{className:"string",begin:"'",end:"[^\\\\]'",relevance:0},{className:"title",begin:"\\|",end:"\\|",illegal:"\\n",relevance:0},{className:"number",variants:[{begin:"0x[0-9a-f]+"},{begin:"\\b-?\\d+"}],relevance:0},{className:"symbol",variants:[{begin:"^\\s*[a-z_\\.\\$][a-z0-9_\\.\\$]+:"},{begin:"^\\s*[0-9]+:"},{begin:"[0-9]+[bf]"}],relevance:0}],illegal:"/"}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/mizar.min.js b/vendor/assets/javascripts/highlightjs/languages/mizar.min.js
index 05e21b096e..a899554444 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mizar.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mizar.min.js
@@ -1 +1 @@
-hljs.registerLanguage("mizar",function(e){return{k:"environ vocabularies notations constructors definitions registrations theorems schemes requirements begin end definition registration cluster existence pred func defpred deffunc theorem proof let take assume then thus hence ex for st holds consider reconsider such that and in provided of as from be being by means equals implies iff redefine define now not or attr is mode suppose per cases set thesis contradiction scheme reserve struct correctness compatibility coherence symmetry assymetry reflexivity irreflexivity connectedness uniqueness commutativity idempotence involutiveness projectivity",c:[e.C("::","$")]}});
\ No newline at end of file
+hljs.registerLanguage("mizar",function(){"use strict";return function(e){return{name:"Mizar",keywords:"environ vocabularies notations constructors definitions registrations theorems schemes requirements begin end definition registration cluster existence pred func defpred deffunc theorem proof let take assume then thus hence ex for st holds consider reconsider such that and in provided of as from be being by means equals implies iff redefine define now not or attr is mode suppose per cases set thesis contradiction scheme reserve struct correctness compatibility coherence symmetry assymetry reflexivity irreflexivity connectedness uniqueness commutativity idempotence involutiveness projectivity",contains:[e.COMMENT("::","$")]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/mojolicious.min.js b/vendor/assets/javascripts/highlightjs/languages/mojolicious.min.js
index 5c76a546de..96b75d3188 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mojolicious.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mojolicious.min.js
@@ -1 +1 @@
-hljs.registerLanguage("mojolicious",function(e){return{sL:"xml",c:[{cN:"meta",b:"^__(END|DATA)__$"},{b:"^\\s*%{1,2}={0,2}",e:"$",sL:"perl"},{b:"<%{1,2}={0,2}",e:"={0,1}%>",sL:"perl",eB:!0,eE:!0}]}});
\ No newline at end of file
+hljs.registerLanguage("mojolicious",function(){"use strict";return function(e){return{name:"Mojolicious",subLanguage:"xml",contains:[{className:"meta",begin:"^__(END|DATA)__$"},{begin:"^\\s*%{1,2}={0,2}",end:"$",subLanguage:"perl"},{begin:"<%{1,2}={0,2}",end:"={0,1}%>",subLanguage:"perl",excludeBegin:!0,excludeEnd:!0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/monkey.min.js b/vendor/assets/javascripts/highlightjs/languages/monkey.min.js
index 6bef9e1838..2e41eb5c04 100644
--- a/vendor/assets/javascripts/highlightjs/languages/monkey.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/monkey.min.js
@@ -1 +1 @@
-hljs.registerLanguage("monkey",function(e){var n={cN:"number",r:0,v:[{b:"[$][a-fA-F0-9]+"},e.NM]};return{cI:!0,k:{keyword:"public private property continue exit extern new try catch eachin not abstract final select case default const local global field end if then else elseif endif while wend repeat until forever for to step next return module inline throw import",built_in:"DebugLog DebugStop Error Print ACos ACosr ASin ASinr ATan ATan2 ATan2r ATanr Abs Abs Ceil Clamp Clamp Cos Cosr Exp Floor Log Max Max Min Min Pow Sgn Sgn Sin Sinr Sqrt Tan Tanr Seed PI HALFPI TWOPI",literal:"true false null and or shl shr mod"},i:/\/\*/,c:[e.C("#rem","#end"),e.C("'","$",{r:0}),{cN:"function",bK:"function method",e:"[(=:]|$",i:/\n/,c:[e.UTM]},{cN:"class",bK:"class interface",e:"$",c:[{bK:"extends implements"},e.UTM]},{cN:"built_in",b:"\\b(self|super)\\b"},{cN:"meta",b:"\\s*#",e:"$",k:{"meta-keyword":"if else elseif endif end then"}},{cN:"meta",b:"^\\s*strict\\b"},{bK:"alias",e:"=",c:[e.UTM]},e.QSM,n]}});
\ No newline at end of file
+hljs.registerLanguage("monkey",function(){"use strict";return function(e){var n={className:"number",relevance:0,variants:[{begin:"[$][a-fA-F0-9]+"},e.NUMBER_MODE]};return{name:"Monkey",case_insensitive:!0,keywords:{keyword:"public private property continue exit extern new try catch eachin not abstract final select case default const local global field end if then else elseif endif while wend repeat until forever for to step next return module inline throw import",built_in:"DebugLog DebugStop Error Print ACos ACosr ASin ASinr ATan ATan2 ATan2r ATanr Abs Abs Ceil Clamp Clamp Cos Cosr Exp Floor Log Max Max Min Min Pow Sgn Sgn Sin Sinr Sqrt Tan Tanr Seed PI HALFPI TWOPI",literal:"true false null and or shl shr mod"},illegal:/\/\*/,contains:[e.COMMENT("#rem","#end"),e.COMMENT("'","$",{relevance:0}),{className:"function",beginKeywords:"function method",end:"[(=:]|$",illegal:/\n/,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"class",beginKeywords:"class interface",end:"$",contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{className:"built_in",begin:"\\b(self|super)\\b"},{className:"meta",begin:"\\s*#",end:"$",keywords:{"meta-keyword":"if else elseif endif end then"}},{className:"meta",begin:"^\\s*strict\\b"},{beginKeywords:"alias",end:"=",contains:[e.UNDERSCORE_TITLE_MODE]},e.QUOTE_STRING_MODE,n]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/moonscript.min.js b/vendor/assets/javascripts/highlightjs/languages/moonscript.min.js
index 2655fef521..e3be4ead57 100644
--- a/vendor/assets/javascripts/highlightjs/languages/moonscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/moonscript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("moonscript",function(e){var t={keyword:"if then not for in while do return else elseif break continue switch and or unless when class extends super local import export from using",literal:"true false nil",built_in:"_G _VERSION assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall coroutine debug io math os package string table"},r="[A-Za-z$_][0-9A-Za-z$_]*",s={cN:"subst",b:/#\{/,e:/}/,k:t},a=[e.inherit(e.CNM,{starts:{e:"(\\s*/)?",r:0}}),{cN:"string",v:[{b:/'/,e:/'/,c:[e.BE]},{b:/"/,e:/"/,c:[e.BE,s]}]},{cN:"built_in",b:"@__"+e.IR},{b:"@"+e.IR},{b:e.IR+"\\\\"+e.IR}];s.c=a;var c=e.inherit(e.TM,{b:r}),n="(\\(.*\\))?\\s*\\B[-=]>",i={cN:"params",b:"\\([^\\(]",rB:!0,c:[{b:/\(/,e:/\)/,k:t,c:["self"].concat(a)}]};return{aliases:["moon"],k:t,i:/\/\*/,c:a.concat([e.C("--","$"),{cN:"function",b:"^\\s*"+r+"\\s*=\\s*"+n,e:"[-=]>",rB:!0,c:[c,i]},{b:/[\(,:=]\s*/,r:0,c:[{cN:"function",b:n,e:"[-=]>",rB:!0,c:[i]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[c]},c]},{cN:"name",b:r+":",e:":",rB:!0,rE:!0,r:0}])}});
\ No newline at end of file
+hljs.registerLanguage("moonscript",function(){"use strict";return function(e){var n={keyword:"if then not for in while do return else elseif break continue switch and or unless when class extends super local import export from using",literal:"true false nil",built_in:"_G _VERSION assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall coroutine debug io math os package string table"},s="[A-Za-z$_][0-9A-Za-z$_]*",a={className:"subst",begin:/#\{/,end:/}/,keywords:n},i=[e.inherit(e.C_NUMBER_MODE,{starts:{end:"(\\s*/)?",relevance:0}}),{className:"string",variants:[{begin:/'/,end:/'/,contains:[e.BACKSLASH_ESCAPE]},{begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,a]}]},{className:"built_in",begin:"@__"+e.IDENT_RE},{begin:"@"+e.IDENT_RE},{begin:e.IDENT_RE+"\\\\"+e.IDENT_RE}];a.contains=i;var t=e.inherit(e.TITLE_MODE,{begin:s}),r={className:"params",begin:"\\([^\\(]",returnBegin:!0,contains:[{begin:/\(/,end:/\)/,keywords:n,contains:["self"].concat(i)}]};return{name:"MoonScript",aliases:["moon"],keywords:n,illegal:/\/\*/,contains:i.concat([e.COMMENT("--","$"),{className:"function",begin:"^\\s*"+s+"\\s*=\\s*(\\(.*\\))?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[t,r]},{begin:/[\(,:=]\s*/,relevance:0,contains:[{className:"function",begin:"(\\(.*\\))?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[r]}]},{className:"class",beginKeywords:"class",end:"$",illegal:/[:="\[\]]/,contains:[{beginKeywords:"extends",endsWithParent:!0,illegal:/[:="\[\]]/,contains:[t]},t]},{className:"name",begin:s+":",end:":",returnBegin:!0,returnEnd:!0,relevance:0}])}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/n1ql.min.js b/vendor/assets/javascripts/highlightjs/languages/n1ql.min.js
index 0ee80670e6..cd7e12d6f9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/n1ql.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/n1ql.min.js
@@ -1 +1 @@
-hljs.registerLanguage("n1ql",function(e){return{cI:!0,c:[{bK:"build create index delete drop explain infer|10 insert merge prepare select update upsert|10",e:/;/,eW:!0,k:{keyword:"all alter analyze and any array as asc begin between binary boolean break bucket build by call case cast cluster collate collection commit connect continue correlate cover create database dataset datastore declare decrement delete derived desc describe distinct do drop each element else end every except exclude execute exists explain fetch first flatten for force from function grant group gsi having if ignore ilike in include increment index infer inline inner insert intersect into is join key keys keyspace known last left let letting like limit lsm map mapping matched materialized merge minus namespace nest not number object offset on option or order outer over parse partition password path pool prepare primary private privilege procedure public raw realm reduce rename return returning revoke right role rollback satisfies schema select self semi set show some start statistics string system then to transaction trigger truncate under union unique unknown unnest unset update upsert use user using validate value valued values via view when where while with within work xor",literal:"true false null missing|5",built_in:"array_agg array_append array_concat array_contains array_count array_distinct array_ifnull array_length array_max array_min array_position array_prepend array_put array_range array_remove array_repeat array_replace array_reverse array_sort array_sum avg count max min sum greatest least ifmissing ifmissingornull ifnull missingif nullif ifinf ifnan ifnanorinf naninf neginfif posinfif clock_millis clock_str date_add_millis date_add_str date_diff_millis date_diff_str date_part_millis date_part_str date_trunc_millis date_trunc_str duration_to_str millis str_to_millis millis_to_str millis_to_utc millis_to_zone_name now_millis now_str str_to_duration str_to_utc str_to_zone_name decode_json encode_json encoded_size poly_length base64 base64_encode base64_decode meta uuid abs acos asin atan atan2 ceil cos degrees e exp ln log floor pi power radians random round sign sin sqrt tan trunc object_length object_names object_pairs object_inner_pairs object_values object_inner_values object_add object_put object_remove object_unwrap regexp_contains regexp_like regexp_position regexp_replace contains initcap length lower ltrim position repeat replace rtrim split substr title trim upper isarray isatom isboolean isnumber isobject isstring type toarray toatom toboolean tonumber toobject tostring"},c:[{cN:"string",b:"'",e:"'",c:[e.BE],r:0},{cN:"string",b:'"',e:'"',c:[e.BE],r:0},{cN:"symbol",b:"`",e:"`",c:[e.BE],r:2},e.CNM,e.CBCM]},e.CBCM]}});
\ No newline at end of file
+hljs.registerLanguage("n1ql",function(){"use strict";return function(e){return{name:"N1QL",case_insensitive:!0,contains:[{beginKeywords:"build create index delete drop explain infer|10 insert merge prepare select update upsert|10",end:/;/,endsWithParent:!0,keywords:{keyword:"all alter analyze and any array as asc begin between binary boolean break bucket build by call case cast cluster collate collection commit connect continue correlate cover create database dataset datastore declare decrement delete derived desc describe distinct do drop each element else end every except exclude execute exists explain fetch first flatten for force from function grant group gsi having if ignore ilike in include increment index infer inline inner insert intersect into is join key keys keyspace known last left let letting like limit lsm map mapping matched materialized merge minus namespace nest not number object offset on option or order outer over parse partition password path pool prepare primary private privilege procedure public raw realm reduce rename return returning revoke right role rollback satisfies schema select self semi set show some start statistics string system then to transaction trigger truncate under union unique unknown unnest unset update upsert use user using validate value valued values via view when where while with within work xor",literal:"true false null missing|5",built_in:"array_agg array_append array_concat array_contains array_count array_distinct array_ifnull array_length array_max array_min array_position array_prepend array_put array_range array_remove array_repeat array_replace array_reverse array_sort array_sum avg count max min sum greatest least ifmissing ifmissingornull ifnull missingif nullif ifinf ifnan ifnanorinf naninf neginfif posinfif clock_millis clock_str date_add_millis date_add_str date_diff_millis date_diff_str date_part_millis date_part_str date_trunc_millis date_trunc_str duration_to_str millis str_to_millis millis_to_str millis_to_utc millis_to_zone_name now_millis now_str str_to_duration str_to_utc str_to_zone_name decode_json encode_json encoded_size poly_length base64 base64_encode base64_decode meta uuid abs acos asin atan atan2 ceil cos degrees e exp ln log floor pi power radians random round sign sin sqrt tan trunc object_length object_names object_pairs object_inner_pairs object_values object_inner_values object_add object_put object_remove object_unwrap regexp_contains regexp_like regexp_position regexp_replace contains initcap length lower ltrim position repeat replace rtrim split substr title trim upper isarray isatom isboolean isnumber isobject isstring type toarray toatom toboolean tonumber toobject tostring"},contains:[{className:"string",begin:"'",end:"'",contains:[e.BACKSLASH_ESCAPE],relevance:0},{className:"string",begin:'"',end:'"',contains:[e.BACKSLASH_ESCAPE],relevance:0},{className:"symbol",begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE],relevance:2},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE]},e.C_BLOCK_COMMENT_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/nginx.min.js b/vendor/assets/javascripts/highlightjs/languages/nginx.min.js
index 9e2df57c1f..bdccaae572 100644
--- a/vendor/assets/javascripts/highlightjs/languages/nginx.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/nginx.min.js
@@ -1 +1 @@
-hljs.registerLanguage("nginx",function(e){var r={cN:"variable",v:[{b:/\$\d+/},{b:/\$\{/,e:/}/},{b:"[\\$\\@]"+e.UIR}]},b={eW:!0,l:"[a-z/_]+",k:{literal:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},r:0,i:"=>",c:[e.HCM,{cN:"string",c:[e.BE,r],v:[{b:/"/,e:/"/},{b:/'/,e:/'/}]},{b:"([a-z]+):/",e:"\\s",eW:!0,eE:!0,c:[r]},{cN:"regexp",c:[e.BE,r],v:[{b:"\\s\\^",e:"\\s|{|;",rE:!0},{b:"~\\*?\\s+",e:"\\s|{|;",rE:!0},{b:"\\*(\\.[a-z\\-]+)+"},{b:"([a-z\\-]+\\.)+\\*"}]},{cN:"number",b:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{cN:"number",b:"\\b\\d+[kKmMgGdshdwy]*\\b",r:0},r]};return{aliases:["nginxconf"],c:[e.HCM,{b:e.UIR+"\\s+{",rB:!0,e:"{",c:[{cN:"section",b:e.UIR}],r:0},{b:e.UIR+"\\s",e:";|{",rB:!0,c:[{cN:"attribute",b:e.UIR,starts:b}],r:0}],i:"[^\\s\\}]"}});
\ No newline at end of file
+hljs.registerLanguage("nginx",function(){"use strict";return function(e){var n={className:"variable",variants:[{begin:/\$\d+/},{begin:/\$\{/,end:/}/},{begin:"[\\$\\@]"+e.UNDERSCORE_IDENT_RE}]},a={endsWithParent:!0,keywords:{$pattern:"[a-z/_]+",literal:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},relevance:0,illegal:"=>",contains:[e.HASH_COMMENT_MODE,{className:"string",contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:/"/,end:/"/},{begin:/'/,end:/'/}]},{begin:"([a-z]+):/",end:"\\s",endsWithParent:!0,excludeEnd:!0,contains:[n]},{className:"regexp",contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:"\\s\\^",end:"\\s|{|;",returnEnd:!0},{begin:"~\\*?\\s+",end:"\\s|{|;",returnEnd:!0},{begin:"\\*(\\.[a-z\\-]+)+"},{begin:"([a-z\\-]+\\.)+\\*"}]},{className:"number",begin:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{className:"number",begin:"\\b\\d+[kKmMgGdshdwy]*\\b",relevance:0},n]};return{name:"Nginx config",aliases:["nginxconf"],contains:[e.HASH_COMMENT_MODE,{begin:e.UNDERSCORE_IDENT_RE+"\\s+{",returnBegin:!0,end:"{",contains:[{className:"section",begin:e.UNDERSCORE_IDENT_RE}],relevance:0},{begin:e.UNDERSCORE_IDENT_RE+"\\s",end:";|{",returnBegin:!0,contains:[{className:"attribute",begin:e.UNDERSCORE_IDENT_RE,starts:a}],relevance:0}],illegal:"[^\\s\\}]"}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/nim.min.js b/vendor/assets/javascripts/highlightjs/languages/nim.min.js
new file mode 100644
index 0000000000..b1a83ffd0d
--- /dev/null
+++ b/vendor/assets/javascripts/highlightjs/languages/nim.min.js
@@ -0,0 +1 @@
+hljs.registerLanguage("nim",function(){"use strict";return function(e){return{name:"Nim",aliases:["nim"],keywords:{keyword:"addr and as asm bind block break case cast const continue converter discard distinct div do elif else end enum except export finally for from func generic if import in include interface is isnot iterator let macro method mixin mod nil not notin object of or out proc ptr raise ref return shl shr static template try tuple type using var when while with without xor yield",literal:"shared guarded stdin stdout stderr result true false",built_in:"int int8 int16 int32 int64 uint uint8 uint16 uint32 uint64 float float32 float64 bool char string cstring pointer expr stmt void auto any range array openarray varargs seq set clong culong cchar cschar cshort cint csize clonglong cfloat cdouble clongdouble cuchar cushort cuint culonglong cstringarray semistatic"},contains:[{className:"meta",begin:/{\./,end:/\.}/,relevance:10},{className:"string",begin:/[a-zA-Z]\w*"/,end:/"/,contains:[{begin:/""/}]},{className:"string",begin:/([a-zA-Z]\w*)?"""/,end:/"""/},e.QUOTE_STRING_MODE,{className:"type",begin:/\b[A-Z]\w+\b/,relevance:0},{className:"number",relevance:0,variants:[{begin:/\b(0[xX][0-9a-fA-F][_0-9a-fA-F]*)('?[iIuU](8|16|32|64))?/},{begin:/\b(0o[0-7][_0-7]*)('?[iIuUfF](8|16|32|64))?/},{begin:/\b(0(b|B)[01][_01]*)('?[iIuUfF](8|16|32|64))?/},{begin:/\b(\d[_\d]*)('?[iIuUfF](8|16|32|64))?/}]},e.HASH_COMMENT_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/nix.min.js b/vendor/assets/javascripts/highlightjs/languages/nix.min.js
index 984f0d2966..9fdc5b3b8f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/nix.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/nix.min.js
@@ -1 +1 @@
-hljs.registerLanguage("nix",function(e){var r={keyword:"rec with let in inherit assert if else then",literal:"true false or and null",built_in:"import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation"},t={cN:"subst",b:/\$\{/,e:/}/,k:r},i={b:/[a-zA-Z0-9-_]+(\s*=)/,rB:!0,r:0,c:[{cN:"attr",b:/\S+/}]},s={cN:"string",c:[t],v:[{b:"''",e:"''"},{b:'"',e:'"'}]},a=[e.NM,e.HCM,e.CBCM,s,i];return t.c=a,{aliases:["nixos"],k:r,c:a}});
\ No newline at end of file
+hljs.registerLanguage("nix",function(){"use strict";return function(e){var n={keyword:"rec with let in inherit assert if else then",literal:"true false or and null",built_in:"import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation"},i={className:"subst",begin:/\$\{/,end:/}/,keywords:n},t={className:"string",contains:[i],variants:[{begin:"''",end:"''"},{begin:'"',end:'"'}]},s=[e.NUMBER_MODE,e.HASH_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,t,{begin:/[a-zA-Z0-9-_]+(\s*=)/,returnBegin:!0,relevance:0,contains:[{className:"attr",begin:/\S+/}]}];return i.contains=s,{name:"Nix",aliases:["nixos"],keywords:n,contains:s}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/nsis.min.js b/vendor/assets/javascripts/highlightjs/languages/nsis.min.js
index 6648cf84f3..746b381801 100644
--- a/vendor/assets/javascripts/highlightjs/languages/nsis.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/nsis.min.js
@@ -1 +1 @@
-hljs.registerLanguage("nsis",function(e){var t={cN:"variable",b:/\$(ADMINTOOLS|APPDATA|CDBURN_AREA|CMDLINE|COMMONFILES32|COMMONFILES64|COMMONFILES|COOKIES|DESKTOP|DOCUMENTS|EXEDIR|EXEFILE|EXEPATH|FAVORITES|FONTS|HISTORY|HWNDPARENT|INSTDIR|INTERNET_CACHE|LANGUAGE|LOCALAPPDATA|MUSIC|NETHOOD|OUTDIR|PICTURES|PLUGINSDIR|PRINTHOOD|PROFILE|PROGRAMFILES32|PROGRAMFILES64|PROGRAMFILES|QUICKLAUNCH|RECENT|RESOURCES_LOCALIZED|RESOURCES|SENDTO|SMPROGRAMS|SMSTARTUP|STARTMENU|SYSDIR|TEMP|TEMPLATES|VIDEOS|WINDIR)/},n={cN:"variable",b:/\$+{[\w\.:-]+}/},i={cN:"variable",b:/\$+\w+/,i:/\(\){}/},r={cN:"variable",b:/\$+\([\w\^\.:-]+\)/},o={cN:"params",b:"(ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)"},l={cN:"keyword",b:/\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversion|gettlbversion|if|ifdef|ifmacrodef|ifmacrondef|ifndef|include|insertmacro|macro|macroend|makensis|packhdr|searchparse|searchreplace|system|tempfile|undef|verbose|warning)/},a={cN:"meta",b:/\$(\\[nrt]|\$)/},S={cN:"class",b:/\w+\:\:\w+/},s={cN:"string",v:[{b:'"',e:'"'},{b:"'",e:"'"},{b:"`",e:"`"}],i:/\n/,c:[a,t,n,i,r]};return{cI:!1,k:{keyword:"Abort AddBrandingImage AddSize AllowRootDirInstall AllowSkipFiles AutoCloseWindow BGFont BGGradient BrandingText BringToFront Call CallInstDLL Caption ChangeUI CheckBitmap ClearErrors CompletedText ComponentText CopyFiles CRCCheck CreateDirectory CreateFont CreateShortCut Delete DeleteINISec DeleteINIStr DeleteRegKey DeleteRegValue DetailPrint DetailsButtonText DirText DirVar DirVerify EnableWindow EnumRegKey EnumRegValue Exch Exec ExecShell ExecShellWait ExecWait ExpandEnvStrings File FileBufSize FileClose FileErrorText FileOpen FileRead FileReadByte FileReadUTF16LE FileReadWord FileSeek FileWrite FileWriteByte FileWriteUTF16LE FileWriteWord FindClose FindFirst FindNext FindWindow FlushINI FunctionEnd GetCurInstType GetCurrentAddress GetDlgItem GetDLLVersion GetDLLVersionLocal GetErrorLevel GetFileTime GetFileTimeLocal GetFullPathName GetFunctionAddress GetInstDirError GetLabelAddress GetTempFileName Goto HideWindow Icon IfAbort IfErrors IfFileExists IfRebootFlag IfSilent InitPluginsDir InstallButtonText InstallColors InstallDir InstallDirRegKey InstProgressFlags InstType InstTypeGetText InstTypeSetText Int64Cmp Int64CmpU Int64Fmt IntCmp IntCmpU IntFmt IntOp IntPtrCmp IntPtrCmpU IntPtrOp IsWindow LangString LicenseBkColor LicenseData LicenseForceSelection LicenseLangString LicenseText LoadLanguageFile LockWindow LogSet LogText ManifestDPIAware ManifestSupportedOS MessageBox MiscButtonText Name Nop OutFile Page PageCallbacks PageExEnd Pop Push Quit ReadEnvStr ReadINIStr ReadRegDWORD ReadRegStr Reboot RegDLL Rename RequestExecutionLevel ReserveFile Return RMDir SearchPath SectionEnd SectionGetFlags SectionGetInstTypes SectionGetSize SectionGetText SectionGroupEnd SectionIn SectionSetFlags SectionSetInstTypes SectionSetSize SectionSetText SendMessage SetAutoClose SetBrandingImage SetCompress SetCompressor SetCompressorDictSize SetCtlColors SetCurInstType SetDatablockOptimize SetDateSave SetDetailsPrint SetDetailsView SetErrorLevel SetErrors SetFileAttributes SetFont SetOutPath SetOverwrite SetRebootFlag SetRegView SetShellVarContext SetSilent ShowInstDetails ShowUninstDetails ShowWindow SilentInstall SilentUnInstall Sleep SpaceTexts StrCmp StrCmpS StrCpy StrLen SubCaption Unicode UninstallButtonText UninstallCaption UninstallIcon UninstallSubCaption UninstallText UninstPage UnRegDLL Var VIAddVersionKey VIFileVersion VIProductVersion WindowIcon WriteINIStr WriteRegBin WriteRegDWORD WriteRegExpandStr WriteRegMultiStr WriteRegNone WriteRegStr WriteUninstaller XPStyle",literal:"admin all auto both bottom bzip2 colored components current custom directory false force hide highest ifdiff ifnewer instfiles lastused leave left license listonly lzma nevershow none normal notset off on open print right show silent silentlog smooth textonly top true try un.components un.custom un.directory un.instfiles un.license uninstConfirm user Win10 Win7 Win8 WinVista zlib"},c:[e.HCM,e.CBCM,e.C(";","$",{r:0}),{cN:"function",bK:"Function PageEx Section SectionGroup",e:"$"},s,l,n,i,r,o,S,e.NM]}});
\ No newline at end of file
+hljs.registerLanguage("nsis",function(){"use strict";return function(e){var t={className:"variable",begin:/\$+{[\w\.:-]+}/},n={className:"variable",begin:/\$+\w+/,illegal:/\(\){}/},i={className:"variable",begin:/\$+\([\w\^\.:-]+\)/},r={className:"string",variants:[{begin:'"',end:'"'},{begin:"'",end:"'"},{begin:"`",end:"`"}],illegal:/\n/,contains:[{className:"meta",begin:/\$(\\[nrt]|\$)/},{className:"variable",begin:/\$(ADMINTOOLS|APPDATA|CDBURN_AREA|CMDLINE|COMMONFILES32|COMMONFILES64|COMMONFILES|COOKIES|DESKTOP|DOCUMENTS|EXEDIR|EXEFILE|EXEPATH|FAVORITES|FONTS|HISTORY|HWNDPARENT|INSTDIR|INTERNET_CACHE|LANGUAGE|LOCALAPPDATA|MUSIC|NETHOOD|OUTDIR|PICTURES|PLUGINSDIR|PRINTHOOD|PROFILE|PROGRAMFILES32|PROGRAMFILES64|PROGRAMFILES|QUICKLAUNCH|RECENT|RESOURCES_LOCALIZED|RESOURCES|SENDTO|SMPROGRAMS|SMSTARTUP|STARTMENU|SYSDIR|TEMP|TEMPLATES|VIDEOS|WINDIR)/},t,n,i]};return{name:"NSIS",case_insensitive:!1,keywords:{keyword:"Abort AddBrandingImage AddSize AllowRootDirInstall AllowSkipFiles AutoCloseWindow BGFont BGGradient BrandingText BringToFront Call CallInstDLL Caption ChangeUI CheckBitmap ClearErrors CompletedText ComponentText CopyFiles CRCCheck CreateDirectory CreateFont CreateShortCut Delete DeleteINISec DeleteINIStr DeleteRegKey DeleteRegValue DetailPrint DetailsButtonText DirText DirVar DirVerify EnableWindow EnumRegKey EnumRegValue Exch Exec ExecShell ExecShellWait ExecWait ExpandEnvStrings File FileBufSize FileClose FileErrorText FileOpen FileRead FileReadByte FileReadUTF16LE FileReadWord FileSeek FileWrite FileWriteByte FileWriteUTF16LE FileWriteWord FindClose FindFirst FindNext FindWindow FlushINI FunctionEnd GetCurInstType GetCurrentAddress GetDlgItem GetDLLVersion GetDLLVersionLocal GetErrorLevel GetFileTime GetFileTimeLocal GetFullPathName GetFunctionAddress GetInstDirError GetLabelAddress GetTempFileName Goto HideWindow Icon IfAbort IfErrors IfFileExists IfRebootFlag IfSilent InitPluginsDir InstallButtonText InstallColors InstallDir InstallDirRegKey InstProgressFlags InstType InstTypeGetText InstTypeSetText Int64Cmp Int64CmpU Int64Fmt IntCmp IntCmpU IntFmt IntOp IntPtrCmp IntPtrCmpU IntPtrOp IsWindow LangString LicenseBkColor LicenseData LicenseForceSelection LicenseLangString LicenseText LoadLanguageFile LockWindow LogSet LogText ManifestDPIAware ManifestSupportedOS MessageBox MiscButtonText Name Nop OutFile Page PageCallbacks PageExEnd Pop Push Quit ReadEnvStr ReadINIStr ReadRegDWORD ReadRegStr Reboot RegDLL Rename RequestExecutionLevel ReserveFile Return RMDir SearchPath SectionEnd SectionGetFlags SectionGetInstTypes SectionGetSize SectionGetText SectionGroupEnd SectionIn SectionSetFlags SectionSetInstTypes SectionSetSize SectionSetText SendMessage SetAutoClose SetBrandingImage SetCompress SetCompressor SetCompressorDictSize SetCtlColors SetCurInstType SetDatablockOptimize SetDateSave SetDetailsPrint SetDetailsView SetErrorLevel SetErrors SetFileAttributes SetFont SetOutPath SetOverwrite SetRebootFlag SetRegView SetShellVarContext SetSilent ShowInstDetails ShowUninstDetails ShowWindow SilentInstall SilentUnInstall Sleep SpaceTexts StrCmp StrCmpS StrCpy StrLen SubCaption Unicode UninstallButtonText UninstallCaption UninstallIcon UninstallSubCaption UninstallText UninstPage UnRegDLL Var VIAddVersionKey VIFileVersion VIProductVersion WindowIcon WriteINIStr WriteRegBin WriteRegDWORD WriteRegExpandStr WriteRegMultiStr WriteRegNone WriteRegStr WriteUninstaller XPStyle",literal:"admin all auto both bottom bzip2 colored components current custom directory false force hide highest ifdiff ifnewer instfiles lastused leave left license listonly lzma nevershow none normal notset off on open print right show silent silentlog smooth textonly top true try un.components un.custom un.directory un.instfiles un.license uninstConfirm user Win10 Win7 Win8 WinVista zlib"},contains:[e.HASH_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.COMMENT(";","$",{relevance:0}),{className:"function",beginKeywords:"Function PageEx Section SectionGroup",end:"$"},r,{className:"keyword",begin:/\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversion|gettlbversion|if|ifdef|ifmacrodef|ifmacrondef|ifndef|include|insertmacro|macro|macroend|makensis|packhdr|searchparse|searchreplace|system|tempfile|undef|verbose|warning)/},t,n,i,{className:"params",begin:"(ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)"},{className:"class",begin:/\w+\:\:\w+/},e.NUMBER_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/objectivec.min.js b/vendor/assets/javascripts/highlightjs/languages/objectivec.min.js
index 7dacffd3ad..af62322b3d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/objectivec.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/objectivec.min.js
@@ -1 +1 @@
-hljs.registerLanguage("objectivec",function(e){var t={cN:"built_in",b:"\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+"},_={keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required @encode @package @import @defs @compatibility_alias __bridge __bridge_transfer __bridge_retained __bridge_retain __covariant __contravariant __kindof _Nonnull _Nullable _Null_unspecified __FUNCTION__ __PRETTY_FUNCTION__ __attribute__ getter setter retain unsafe_unretained nonnull nullable null_unspecified null_resettable class instancetype NS_DESIGNATED_INITIALIZER NS_UNAVAILABLE NS_REQUIRES_SUPER NS_RETURNS_INNER_POINTER NS_INLINE NS_AVAILABLE NS_DEPRECATED NS_ENUM NS_OPTIONS NS_SWIFT_UNAVAILABLE NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_REFINED_FOR_SWIFT NS_SWIFT_NAME NS_SWIFT_NOTHROW NS_DURING NS_HANDLER NS_ENDHANDLER NS_VALUERETURN NS_VOIDRETURN",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},i=/[a-zA-Z@][a-zA-Z0-9_]*/,n="@interface @class @protocol @implementation";return{aliases:["mm","objc","obj-c"],k:_,l:i,i:"</",c:[t,e.CLCM,e.CBCM,e.CNM,e.QSM,{cN:"string",v:[{b:'@"',e:'"',i:"\\n",c:[e.BE]},{b:"'",e:"[^\\\\]'",i:"[^\\\\][^']"}]},{cN:"meta",b:"#",e:"$",c:[{cN:"meta-string",v:[{b:'"',e:'"'},{b:"<",e:">"}]}]},{cN:"class",b:"("+n.split(" ").join("|")+")\\b",e:"({|$)",eE:!0,k:n,l:i,c:[e.UTM]},{b:"\\."+e.UIR,r:0}]}});
\ No newline at end of file
+hljs.registerLanguage("objectivec",function(){"use strict";return function(e){var n=/[a-zA-Z@][a-zA-Z0-9_]*/,_={$pattern:n,keyword:"@interface @class @protocol @implementation"};return{name:"Objective-C",aliases:["mm","objc","obj-c"],keywords:{$pattern:n,keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required @encode @package @import @defs @compatibility_alias __bridge __bridge_transfer __bridge_retained __bridge_retain __covariant __contravariant __kindof _Nonnull _Nullable _Null_unspecified __FUNCTION__ __PRETTY_FUNCTION__ __attribute__ getter setter retain unsafe_unretained nonnull nullable null_unspecified null_resettable class instancetype NS_DESIGNATED_INITIALIZER NS_UNAVAILABLE NS_REQUIRES_SUPER NS_RETURNS_INNER_POINTER NS_INLINE NS_AVAILABLE NS_DEPRECATED NS_ENUM NS_OPTIONS NS_SWIFT_UNAVAILABLE NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_REFINED_FOR_SWIFT NS_SWIFT_NAME NS_SWIFT_NOTHROW NS_DURING NS_HANDLER NS_ENDHANDLER NS_VALUERETURN NS_VOIDRETURN",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},illegal:"</",contains:[{className:"built_in",begin:"\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.C_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{className:"string",variants:[{begin:'@"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]}]},{className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef include"},contains:[{begin:/\\\n/,relevance:0},e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),{className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"class",begin:"("+_.keyword.split(" ").join("|")+")\\b",end:"({|$)",excludeEnd:!0,keywords:_,contains:[e.UNDERSCORE_TITLE_MODE]},{begin:"\\."+e.UNDERSCORE_IDENT_RE,relevance:0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ocaml.min.js b/vendor/assets/javascripts/highlightjs/languages/ocaml.min.js
index 05162084a7..6093d9e1fc 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ocaml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ocaml.min.js
@@ -1 +1 @@
-hljs.registerLanguage("ocaml",function(e){return{aliases:["ml"],k:{keyword:"and as assert asr begin class constraint do done downto else end exception external for fun function functor if in include inherit! inherit initializer land lazy let lor lsl lsr lxor match method!|10 method mod module mutable new object of open! open or private rec sig struct then to try type val! val virtual when while with parser value",built_in:"array bool bytes char exn|5 float int int32 int64 list lazy_t|5 nativeint|5 string unit in_channel out_channel ref",literal:"true false"},i:/\/\/|>>/,l:"[a-z_]\\w*!?",c:[{cN:"literal",b:"\\[(\\|\\|)?\\]|\\(\\)",r:0},e.C("\\(\\*","\\*\\)",{c:["self"]}),{cN:"symbol",b:"'[A-Za-z_](?!')[\\w']*"},{cN:"type",b:"`[A-Z][\\w']*"},{cN:"type",b:"\\b[A-Z][\\w']*",r:0},{b:"[a-z_]\\w*'[\\w']*",r:0},e.inherit(e.ASM,{cN:"string",r:0}),e.inherit(e.QSM,{i:null}),{cN:"number",b:"\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",r:0},{b:/[-=]>/}]}});
\ No newline at end of file
+hljs.registerLanguage("ocaml",function(){"use strict";return function(e){return{name:"OCaml",aliases:["ml"],keywords:{$pattern:"[a-z_]\\w*!?",keyword:"and as assert asr begin class constraint do done downto else end exception external for fun function functor if in include inherit! inherit initializer land lazy let lor lsl lsr lxor match method!|10 method mod module mutable new object of open! open or private rec sig struct then to try type val! val virtual when while with parser value",built_in:"array bool bytes char exn|5 float int int32 int64 list lazy_t|5 nativeint|5 string unit in_channel out_channel ref",literal:"true false"},illegal:/\/\/|>>/,contains:[{className:"literal",begin:"\\[(\\|\\|)?\\]|\\(\\)",relevance:0},e.COMMENT("\\(\\*","\\*\\)",{contains:["self"]}),{className:"symbol",begin:"'[A-Za-z_](?!')[\\w']*"},{className:"type",begin:"`[A-Z][\\w']*"},{className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},{begin:"[a-z_]\\w*'[\\w']*",relevance:0},e.inherit(e.APOS_STRING_MODE,{className:"string",relevance:0}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),{className:"number",begin:"\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",relevance:0},{begin:/[-=]>/}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/openscad.min.js b/vendor/assets/javascripts/highlightjs/languages/openscad.min.js
index 9cd2f5b2b8..65b62f3e06 100644
--- a/vendor/assets/javascripts/highlightjs/languages/openscad.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/openscad.min.js
@@ -1 +1 @@
-hljs.registerLanguage("openscad",function(e){var r={cN:"keyword",b:"\\$(f[asn]|t|vp[rtd]|children)"},n={cN:"literal",b:"false|true|PI|undef"},o={cN:"number",b:"\\b\\d+(\\.\\d+)?(e-?\\d+)?",r:0},i=e.inherit(e.QSM,{i:null}),t={cN:"meta",k:{"meta-keyword":"include use"},b:"include|use <",e:">"},s={cN:"params",b:"\\(",e:"\\)",c:["self",o,i,r,n]},c={b:"[*!#%]",r:0},a={cN:"function",bK:"module function",e:"\\=|\\{",c:[s,e.UTM]};return{aliases:["scad"],k:{keyword:"function module include use for intersection_for if else \\%",literal:"false true PI undef",built_in:"circle square polygon text sphere cube cylinder polyhedron translate rotate scale resize mirror multmatrix color offset hull minkowski union difference intersection abs sign sin cos tan acos asin atan atan2 floor round ceil ln log pow sqrt exp rands min max concat lookup str chr search version version_num norm cross parent_module echo import import_dxf dxf_linear_extrude linear_extrude rotate_extrude surface projection render children dxf_cross dxf_dim let assign"},c:[e.CLCM,e.CBCM,o,t,i,r,c,a]}});
\ No newline at end of file
+hljs.registerLanguage("openscad",function(){"use strict";return function(e){var n={className:"keyword",begin:"\\$(f[asn]|t|vp[rtd]|children)"},r={className:"number",begin:"\\b\\d+(\\.\\d+)?(e-?\\d+)?",relevance:0},s=e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),a={className:"function",beginKeywords:"module function",end:"\\=|\\{",contains:[{className:"params",begin:"\\(",end:"\\)",contains:["self",r,s,n,{className:"literal",begin:"false|true|PI|undef"}]},e.UNDERSCORE_TITLE_MODE]};return{name:"OpenSCAD",aliases:["scad"],keywords:{keyword:"function module include use for intersection_for if else \\%",literal:"false true PI undef",built_in:"circle square polygon text sphere cube cylinder polyhedron translate rotate scale resize mirror multmatrix color offset hull minkowski union difference intersection abs sign sin cos tan acos asin atan atan2 floor round ceil ln log pow sqrt exp rands min max concat lookup str chr search version version_num norm cross parent_module echo import import_dxf dxf_linear_extrude linear_extrude rotate_extrude surface projection render children dxf_cross dxf_dim let assign"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,r,{className:"meta",keywords:{"meta-keyword":"include use"},begin:"include|use <",end:">"},s,n,{begin:"[*!#%]",relevance:0},a]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/oxygene.min.js b/vendor/assets/javascripts/highlightjs/languages/oxygene.min.js
index 3fc383e610..d5fd001b5e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/oxygene.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/oxygene.min.js
@@ -1 +1 @@
-hljs.registerLanguage("oxygene",function(e){var r="abstract add and array as asc aspect assembly async begin break block by case class concat const copy constructor continue create default delegate desc distinct div do downto dynamic each else empty end ensure enum equals event except exit extension external false final finalize finalizer finally flags for forward from function future global group has if implementation implements implies in index inherited inline interface into invariants is iterator join locked locking loop matching method mod module namespace nested new nil not notify nullable of old on operator or order out override parallel params partial pinned private procedure property protected public queryable raise read readonly record reintroduce remove repeat require result reverse sealed select self sequence set shl shr skip static step soft take then to true try tuple type union unit unsafe until uses using var virtual raises volatile where while with write xor yield await mapped deprecated stdcall cdecl pascal register safecall overload library platform reference packed strict published autoreleasepool selector strong weak unretained",t=e.C("{","}",{r:0}),a=e.C("\\(\\*","\\*\\)",{r:10}),n={cN:"string",b:"'",e:"'",c:[{b:"''"}]},o={cN:"string",b:"(#\\d+)+"},i={cN:"function",bK:"function constructor destructor procedure method",e:"[:;]",k:"function constructor|10 destructor|10 procedure|10 method|10",c:[e.TM,{cN:"params",b:"\\(",e:"\\)",k:r,c:[n,o]},t,a]};return{cI:!0,l:/\.?\w+/,k:r,i:'("|\\$[G-Zg-z]|\\/\\*|</|=>|->)',c:[t,a,e.CLCM,n,o,e.NM,i,{cN:"class",b:"=\\bclass\\b",e:"end;",k:r,c:[n,o,t,a,e.CLCM,i]}]}});
\ No newline at end of file
+hljs.registerLanguage("oxygene",function(){"use strict";return function(e){var n={$pattern:/\.?\w+/,keyword:"abstract add and array as asc aspect assembly async begin break block by case class concat const copy constructor continue create default delegate desc distinct div do downto dynamic each else empty end ensure enum equals event except exit extension external false final finalize finalizer finally flags for forward from function future global group has if implementation implements implies in index inherited inline interface into invariants is iterator join locked locking loop matching method mod module namespace nested new nil not notify nullable of old on operator or order out override parallel params partial pinned private procedure property protected public queryable raise read readonly record reintroduce remove repeat require result reverse sealed select self sequence set shl shr skip static step soft take then to true try tuple type union unit unsafe until uses using var virtual raises volatile where while with write xor yield await mapped deprecated stdcall cdecl pascal register safecall overload library platform reference packed strict published autoreleasepool selector strong weak unretained"},r=e.COMMENT("{","}",{relevance:0}),a=e.COMMENT("\\(\\*","\\*\\)",{relevance:10}),t={className:"string",begin:"'",end:"'",contains:[{begin:"''"}]},s={className:"string",begin:"(#\\d+)+"},i={className:"function",beginKeywords:"function constructor destructor procedure method",end:"[:;]",keywords:"function constructor|10 destructor|10 procedure|10 method|10",contains:[e.TITLE_MODE,{className:"params",begin:"\\(",end:"\\)",keywords:n,contains:[t,s]},r,a]};return{name:"Oxygene",case_insensitive:!0,keywords:n,illegal:'("|\\$[G-Zg-z]|\\/\\*|</|=>|->)',contains:[r,a,e.C_LINE_COMMENT_MODE,t,s,e.NUMBER_MODE,i,{className:"class",begin:"=\\bclass\\b",end:"end;",keywords:n,contains:[t,s,r,a,e.C_LINE_COMMENT_MODE,i]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/parser3.min.js b/vendor/assets/javascripts/highlightjs/languages/parser3.min.js
index f388ab0294..0aac1441d2 100644
--- a/vendor/assets/javascripts/highlightjs/languages/parser3.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/parser3.min.js
@@ -1 +1 @@
-hljs.registerLanguage("parser3",function(r){var e=r.C("{","}",{c:["self"]});return{sL:"xml",r:0,c:[r.C("^#","$"),r.C("\\^rem{","}",{r:10,c:[e]}),{cN:"meta",b:"^@(?:BASE|USE|CLASS|OPTIONS)$",r:10},{cN:"title",b:"@[\\w\\-]+\\[[\\w^;\\-]*\\](?:\\[[\\w^;\\-]*\\])?(?:.*)$"},{cN:"variable",b:"\\$\\{?[\\w\\-\\.\\:]+\\}?"},{cN:"keyword",b:"\\^[\\w\\-\\.\\:]+"},{cN:"number",b:"\\^#[0-9a-fA-F]+"},r.CNM]}});
\ No newline at end of file
+hljs.registerLanguage("parser3",function(){"use strict";return function(e){var a=e.COMMENT("{","}",{contains:["self"]});return{name:"Parser3",subLanguage:"xml",relevance:0,contains:[e.COMMENT("^#","$"),e.COMMENT("\\^rem{","}",{relevance:10,contains:[a]}),{className:"meta",begin:"^@(?:BASE|USE|CLASS|OPTIONS)$",relevance:10},{className:"title",begin:"@[\\w\\-]+\\[[\\w^;\\-]*\\](?:\\[[\\w^;\\-]*\\])?(?:.*)$"},{className:"variable",begin:"\\$\\{?[\\w\\-\\.\\:]+\\}?"},{className:"keyword",begin:"\\^[\\w\\-\\.\\:]+"},{className:"number",begin:"\\^#[0-9a-fA-F]+"},e.C_NUMBER_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/perl.min.js b/vendor/assets/javascripts/highlightjs/languages/perl.min.js
index ba10cd2d54..b3cb6332ac 100644
--- a/vendor/assets/javascripts/highlightjs/languages/perl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/perl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("perl",function(e){var t="getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qqfileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmgetsub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedirioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when",r={cN:"subst",b:"[$@]\\{",e:"\\}",k:t},s={b:"->{",e:"}"},n={v:[{b:/\$\d/},{b:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{b:/[\$%@][^\s\w{]/,r:0}]},i=[e.BE,r,n],o=[n,e.HCM,e.C("^\\=\\w","\\=cut",{eW:!0}),s,{cN:"string",c:i,v:[{b:"q[qwxr]?\\s*\\(",e:"\\)",r:5},{b:"q[qwxr]?\\s*\\[",e:"\\]",r:5},{b:"q[qwxr]?\\s*\\{",e:"\\}",r:5},{b:"q[qwxr]?\\s*\\|",e:"\\|",r:5},{b:"q[qwxr]?\\s*\\<",e:"\\>",r:5},{b:"qw\\s+q",e:"q",r:5},{b:"'",e:"'",c:[e.BE]},{b:'"',e:'"'},{b:"`",e:"`",c:[e.BE]},{b:"{\\w+}",c:[],r:0},{b:"-?\\w+\\s*\\=\\>",c:[],r:0}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\/\\/|"+e.RSR+"|\\b(split|return|print|reverse|grep)\\b)\\s*",k:"split return print reverse grep",r:0,c:[e.HCM,{cN:"regexp",b:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",r:10},{cN:"regexp",b:"(m|qr)?/",e:"/[a-z]*",c:[e.BE],r:0}]},{cN:"function",bK:"sub",e:"(\\s*\\(.*?\\))?[;{]",eE:!0,r:5,c:[e.TM]},{b:"-\\w\\b",r:0},{b:"^__DATA__$",e:"^__END__$",sL:"mojolicious",c:[{b:"^@@.*",e:"$",cN:"comment"}]}];return r.c=o,s.c=o,{aliases:["pl","pm"],l:/[\w\.]+/,k:t,c:o}});
\ No newline at end of file
+hljs.registerLanguage("perl",function(){"use strict";return function(e){var n={$pattern:/[\w.]+/,keyword:"getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qq fileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmget sub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedir ioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when"},t={className:"subst",begin:"[$@]\\{",end:"\\}",keywords:n},s={begin:"->{",end:"}"},r={variants:[{begin:/\$\d/},{begin:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{begin:/[\$%@][^\s\w{]/,relevance:0}]},i=[e.BACKSLASH_ESCAPE,t,r],a=[r,e.HASH_COMMENT_MODE,e.COMMENT("^\\=\\w","\\=cut",{endsWithParent:!0}),s,{className:"string",contains:i,variants:[{begin:"q[qwxr]?\\s*\\(",end:"\\)",relevance:5},{begin:"q[qwxr]?\\s*\\[",end:"\\]",relevance:5},{begin:"q[qwxr]?\\s*\\{",end:"\\}",relevance:5},{begin:"q[qwxr]?\\s*\\|",end:"\\|",relevance:5},{begin:"q[qwxr]?\\s*\\<",end:"\\>",relevance:5},{begin:"qw\\s+q",end:"q",relevance:5},{begin:"'",end:"'",contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"'},{begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE]},{begin:"{\\w+}",contains:[],relevance:0},{begin:"-?\\w+\\s*\\=\\>",contains:[],relevance:0}]},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{begin:"(\\/\\/|"+e.RE_STARTERS_RE+"|\\b(split|return|print|reverse|grep)\\b)\\s*",keywords:"split return print reverse grep",relevance:0,contains:[e.HASH_COMMENT_MODE,{className:"regexp",begin:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",relevance:10},{className:"regexp",begin:"(m|qr)?/",end:"/[a-z]*",contains:[e.BACKSLASH_ESCAPE],relevance:0}]},{className:"function",beginKeywords:"sub",end:"(\\s*\\(.*?\\))?[;{]",excludeEnd:!0,relevance:5,contains:[e.TITLE_MODE]},{begin:"-\\w\\b",relevance:0},{begin:"^__DATA__$",end:"^__END__$",subLanguage:"mojolicious",contains:[{begin:"^@@.*",end:"$",className:"comment"}]}];return t.contains=a,s.contains=a,{name:"Perl",aliases:["pl","pm"],keywords:n,contains:a}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/pf.min.js b/vendor/assets/javascripts/highlightjs/languages/pf.min.js
index 78324487ca..e8c255dac9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/pf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/pf.min.js
@@ -1 +1 @@
-hljs.registerLanguage("pf",function(t){var o={cN:"variable",b:/\$[\w\d#@][\w\d_]*/},e={cN:"variable",b:/<(?!\/)/,e:/>/};return{aliases:["pf.conf"],l:/[a-z0-9_<>-]+/,k:{built_in:"block match pass load anchor|5 antispoof|10 set table",keyword:"in out log quick on rdomain inet inet6 proto from port os to routeallow-opts divert-packet divert-reply divert-to flags group icmp-typeicmp6-type label once probability recieved-on rtable prio queuetos tag tagged user keep fragment for os dropaf-to|10 binat-to|10 nat-to|10 rdr-to|10 bitmask least-stats random round-robinsource-hash static-portdup-to reply-to route-toparent bandwidth default min max qlimitblock-policy debug fingerprints hostid limit loginterface optimizationreassemble ruleset-optimization basic none profile skip state-defaultsstate-policy timeoutconst counters persistno modulate synproxy state|5 floating if-bound no-sync pflow|10 sloppysource-track global rule max-src-nodes max-src-states max-src-connmax-src-conn-rate overload flushscrub|5 max-mss min-ttl no-df|10 random-id",literal:"all any no-route self urpf-failed egress|5 unknown"},c:[t.HCM,t.NM,t.QSM,o,e]}});
\ No newline at end of file
+hljs.registerLanguage("pf",function(){"use strict";return function(t){return{name:"Packet Filter config",aliases:["pf.conf"],keywords:{$pattern:/[a-z0-9_<>-]+/,built_in:"block match pass load anchor|5 antispoof|10 set table",keyword:"in out log quick on rdomain inet inet6 proto from port os to route allow-opts divert-packet divert-reply divert-to flags group icmp-type icmp6-type label once probability recieved-on rtable prio queue tos tag tagged user keep fragment for os drop af-to|10 binat-to|10 nat-to|10 rdr-to|10 bitmask least-stats random round-robin source-hash static-port dup-to reply-to route-to parent bandwidth default min max qlimit block-policy debug fingerprints hostid limit loginterface optimization reassemble ruleset-optimization basic none profile skip state-defaults state-policy timeout const counters persist no modulate synproxy state|5 floating if-bound no-sync pflow|10 sloppy source-track global rule max-src-nodes max-src-states max-src-conn max-src-conn-rate overload flush scrub|5 max-mss min-ttl no-df|10 random-id",literal:"all any no-route self urpf-failed egress|5 unknown"},contains:[t.HASH_COMMENT_MODE,t.NUMBER_MODE,t.QUOTE_STRING_MODE,{className:"variable",begin:/\$[\w\d#@][\w\d_]*/},{className:"variable",begin:/<(?!\/)/,end:/>/}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/pgsql.min.js b/vendor/assets/javascripts/highlightjs/languages/pgsql.min.js
index 2d65acc898..df4d4fd6e3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/pgsql.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/pgsql.min.js
@@ -1 +1 @@
-hljs.registerLanguage("pgsql",function(E){var T=E.C("--","$"),N="[a-zA-Z_][a-zA-Z_0-9$]*",A="\\$([a-zA-Z_]?|[a-zA-Z_][a-zA-Z_0-9]*)\\$",R="<<\\s*"+N+"\\s*>>",I="ABORT ALTER ANALYZE BEGIN CALL CHECKPOINT|10 CLOSE CLUSTER COMMENT COMMIT COPY CREATE DEALLOCATE DECLARE DELETE DISCARD DO DROP END EXECUTE EXPLAIN FETCH GRANT IMPORT INSERT LISTEN LOAD LOCK MOVE NOTIFY PREPARE REASSIGN|10 REFRESH REINDEX RELEASE RESET REVOKE ROLLBACK SAVEPOINT SECURITY SELECT SET SHOW START TRUNCATE UNLISTEN|10 UPDATE VACUUM|10 VALUES AGGREGATE COLLATION CONVERSION|10 DATABASE DEFAULT PRIVILEGES DOMAIN TRIGGER EXTENSION FOREIGN WRAPPER|10 TABLE FUNCTION GROUP LANGUAGE LARGE OBJECT MATERIALIZED VIEW OPERATOR CLASS FAMILY POLICY PUBLICATION|10 ROLE RULE SCHEMA SEQUENCE SERVER STATISTICS SUBSCRIPTION SYSTEM TABLESPACE CONFIGURATION DICTIONARY PARSER TEMPLATE TYPE USER MAPPING PREPARED ACCESS METHOD CAST AS TRANSFORM TRANSACTION OWNED TO INTO SESSION AUTHORIZATION INDEX PROCEDURE ASSERTION ALL ANALYSE AND ANY ARRAY ASC ASYMMETRIC|10 BOTH CASE CHECK COLLATE COLUMN CONCURRENTLY|10 CONSTRAINT CROSS DEFERRABLE RANGE DESC DISTINCT ELSE EXCEPT FOR FREEZE|10 FROM FULL HAVING ILIKE IN INITIALLY INNER INTERSECT IS ISNULL JOIN LATERAL LEADING LIKE LIMIT NATURAL NOT NOTNULL NULL OFFSET ON ONLY OR ORDER OUTER OVERLAPS PLACING PRIMARY REFERENCES RETURNING SIMILAR SOME SYMMETRIC TABLESAMPLE THEN TRAILING UNION UNIQUE USING VARIADIC|10 VERBOSE WHEN WHERE WINDOW WITH BY RETURNS INOUT OUT SETOF|10 IF STRICT CURRENT CONTINUE OWNER LOCATION OVER PARTITION WITHIN BETWEEN ESCAPE EXTERNAL INVOKER DEFINER WORK RENAME VERSION CONNECTION CONNECT TABLES TEMP TEMPORARY FUNCTIONS SEQUENCES TYPES SCHEMAS OPTION CASCADE RESTRICT ADD ADMIN EXISTS VALID VALIDATE ENABLE DISABLE REPLICA|10 ALWAYS PASSING COLUMNS PATH REF VALUE OVERRIDING IMMUTABLE STABLE VOLATILE BEFORE AFTER EACH ROW PROCEDURAL ROUTINE NO HANDLER VALIDATOR OPTIONS STORAGE OIDS|10 WITHOUT INHERIT DEPENDS CALLED INPUT LEAKPROOF|10 COST ROWS NOWAIT SEARCH UNTIL ENCRYPTED|10 PASSWORD CONFLICT|10 INSTEAD INHERITS CHARACTERISTICS WRITE CURSOR ALSO STATEMENT SHARE EXCLUSIVE INLINE ISOLATION REPEATABLE READ COMMITTED SERIALIZABLE UNCOMMITTED LOCAL GLOBAL SQL PROCEDURES RECURSIVE SNAPSHOT ROLLUP CUBE TRUSTED|10 INCLUDE FOLLOWING PRECEDING UNBOUNDED RANGE GROUPS UNENCRYPTED|10 SYSID FORMAT DELIMITER HEADER QUOTE ENCODING FILTER OFF FORCE_QUOTE FORCE_NOT_NULL FORCE_NULL COSTS BUFFERS TIMING SUMMARY DISABLE_PAGE_SKIPPING RESTART CYCLE GENERATED IDENTITY DEFERRED IMMEDIATE LEVEL LOGGED UNLOGGED OF NOTHING NONE EXCLUDE ATTRIBUTE USAGE ROUTINES TRUE FALSE NAN INFINITY ",O="SUPERUSER NOSUPERUSER CREATEDB NOCREATEDB CREATEROLE NOCREATEROLE INHERIT NOINHERIT LOGIN NOLOGIN REPLICATION NOREPLICATION BYPASSRLS NOBYPASSRLS ",_="ALIAS BEGIN CONSTANT DECLARE END EXCEPTION RETURN PERFORM|10 RAISE GET DIAGNOSTICS STACKED|10 FOREACH LOOP ELSIF EXIT WHILE REVERSE SLICE DEBUG LOG INFO NOTICE WARNING ASSERT OPEN ",S="BIGINT INT8 BIGSERIAL SERIAL8 BIT VARYING VARBIT BOOLEAN BOOL BOX BYTEA CHARACTER CHAR VARCHAR CIDR CIRCLE DATE DOUBLE PRECISION FLOAT8 FLOAT INET INTEGER INT INT4 INTERVAL JSON JSONB LINE LSEG|10 MACADDR MACADDR8 MONEY NUMERIC DEC DECIMAL PATH POINT POLYGON REAL FLOAT4 SMALLINT INT2 SMALLSERIAL|10 SERIAL2|10 SERIAL|10 SERIAL4|10 TEXT TIME ZONE TIMETZ|10 TIMESTAMP TIMESTAMPTZ|10 TSQUERY|10 TSVECTOR|10 TXID_SNAPSHOT|10 UUID XML NATIONAL NCHAR INT4RANGE|10 INT8RANGE|10 NUMRANGE|10 TSRANGE|10 TSTZRANGE|10 DATERANGE|10 ANYELEMENT ANYARRAY ANYNONARRAY ANYENUM ANYRANGE CSTRING INTERNAL RECORD PG_DDL_COMMAND VOID UNKNOWN OPAQUE REFCURSOR NAME OID REGPROC|10 REGPROCEDURE|10 REGOPER|10 REGOPERATOR|10 REGCLASS|10 REGTYPE|10 REGROLE|10 REGNAMESPACE|10 REGCONFIG|10 REGDICTIONARY|10 ",L=S.trim().split(" ").map(function(E){return E.split("|")[0]}).join("|"),C="CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER CURRENT_CATALOG|10 CURRENT_DATE LOCALTIME LOCALTIMESTAMP CURRENT_ROLE|10 CURRENT_SCHEMA|10 SESSION_USER PUBLIC ",D="FOUND NEW OLD TG_NAME|10 TG_WHEN|10 TG_LEVEL|10 TG_OP|10 TG_RELID|10 TG_RELNAME|10 TG_TABLE_NAME|10 TG_TABLE_SCHEMA|10 TG_NARGS|10 TG_ARGV|10 TG_EVENT|10 TG_TAG|10 ROW_COUNT RESULT_OID|10 PG_CONTEXT|10 RETURNED_SQLSTATE COLUMN_NAME CONSTRAINT_NAME PG_DATATYPE_NAME|10 MESSAGE_TEXT TABLE_NAME SCHEMA_NAME PG_EXCEPTION_DETAIL|10 PG_EXCEPTION_HINT|10 PG_EXCEPTION_CONTEXT|10 ",M="SQLSTATE SQLERRM|10 SUCCESSFUL_COMPLETION WARNING DYNAMIC_RESULT_SETS_RETURNED IMPLICIT_ZERO_BIT_PADDING NULL_VALUE_ELIMINATED_IN_SET_FUNCTION PRIVILEGE_NOT_GRANTED PRIVILEGE_NOT_REVOKED STRING_DATA_RIGHT_TRUNCATION DEPRECATED_FEATURE NO_DATA NO_ADDITIONAL_DYNAMIC_RESULT_SETS_RETURNED SQL_STATEMENT_NOT_YET_COMPLETE CONNECTION_EXCEPTION CONNECTION_DOES_NOT_EXIST CONNECTION_FAILURE SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION SQLSERVER_REJECTED_ESTABLISHMENT_OF_SQLCONNECTION TRANSACTION_RESOLUTION_UNKNOWN PROTOCOL_VIOLATION TRIGGERED_ACTION_EXCEPTION FEATURE_NOT_SUPPORTED INVALID_TRANSACTION_INITIATION LOCATOR_EXCEPTION INVALID_LOCATOR_SPECIFICATION INVALID_GRANTOR INVALID_GRANT_OPERATION INVALID_ROLE_SPECIFICATION DIAGNOSTICS_EXCEPTION STACKED_DIAGNOSTICS_ACCESSED_WITHOUT_ACTIVE_HANDLER CASE_NOT_FOUND CARDINALITY_VIOLATION DATA_EXCEPTION ARRAY_SUBSCRIPT_ERROR CHARACTER_NOT_IN_REPERTOIRE DATETIME_FIELD_OVERFLOW DIVISION_BY_ZERO ERROR_IN_ASSIGNMENT ESCAPE_CHARACTER_CONFLICT INDICATOR_OVERFLOW INTERVAL_FIELD_OVERFLOW INVALID_ARGUMENT_FOR_LOGARITHM INVALID_ARGUMENT_FOR_NTILE_FUNCTION INVALID_ARGUMENT_FOR_NTH_VALUE_FUNCTION INVALID_ARGUMENT_FOR_POWER_FUNCTION INVALID_ARGUMENT_FOR_WIDTH_BUCKET_FUNCTION INVALID_CHARACTER_VALUE_FOR_CAST INVALID_DATETIME_FORMAT INVALID_ESCAPE_CHARACTER INVALID_ESCAPE_OCTET INVALID_ESCAPE_SEQUENCE NONSTANDARD_USE_OF_ESCAPE_CHARACTER INVALID_INDICATOR_PARAMETER_VALUE INVALID_PARAMETER_VALUE INVALID_REGULAR_EXPRESSION INVALID_ROW_COUNT_IN_LIMIT_CLAUSE INVALID_ROW_COUNT_IN_RESULT_OFFSET_CLAUSE INVALID_TABLESAMPLE_ARGUMENT INVALID_TABLESAMPLE_REPEAT INVALID_TIME_ZONE_DISPLACEMENT_VALUE INVALID_USE_OF_ESCAPE_CHARACTER MOST_SPECIFIC_TYPE_MISMATCH NULL_VALUE_NOT_ALLOWED NULL_VALUE_NO_INDICATOR_PARAMETER NUMERIC_VALUE_OUT_OF_RANGE SEQUENCE_GENERATOR_LIMIT_EXCEEDED STRING_DATA_LENGTH_MISMATCH STRING_DATA_RIGHT_TRUNCATION SUBSTRING_ERROR TRIM_ERROR UNTERMINATED_C_STRING ZERO_LENGTH_CHARACTER_STRING FLOATING_POINT_EXCEPTION INVALID_TEXT_REPRESENTATION INVALID_BINARY_REPRESENTATION BAD_COPY_FILE_FORMAT UNTRANSLATABLE_CHARACTER NOT_AN_XML_DOCUMENT INVALID_XML_DOCUMENT INVALID_XML_CONTENT INVALID_XML_COMMENT INVALID_XML_PROCESSING_INSTRUCTION INTEGRITY_CONSTRAINT_VIOLATION RESTRICT_VIOLATION NOT_NULL_VIOLATION FOREIGN_KEY_VIOLATION UNIQUE_VIOLATION CHECK_VIOLATION EXCLUSION_VIOLATION INVALID_CURSOR_STATE INVALID_TRANSACTION_STATE ACTIVE_SQL_TRANSACTION BRANCH_TRANSACTION_ALREADY_ACTIVE HELD_CURSOR_REQUIRES_SAME_ISOLATION_LEVEL INAPPROPRIATE_ACCESS_MODE_FOR_BRANCH_TRANSACTION INAPPROPRIATE_ISOLATION_LEVEL_FOR_BRANCH_TRANSACTION NO_ACTIVE_SQL_TRANSACTION_FOR_BRANCH_TRANSACTION READ_ONLY_SQL_TRANSACTION SCHEMA_AND_DATA_STATEMENT_MIXING_NOT_SUPPORTED NO_ACTIVE_SQL_TRANSACTION IN_FAILED_SQL_TRANSACTION IDLE_IN_TRANSACTION_SESSION_TIMEOUT INVALID_SQL_STATEMENT_NAME TRIGGERED_DATA_CHANGE_VIOLATION INVALID_AUTHORIZATION_SPECIFICATION INVALID_PASSWORD DEPENDENT_PRIVILEGE_DESCRIPTORS_STILL_EXIST DEPENDENT_OBJECTS_STILL_EXIST INVALID_TRANSACTION_TERMINATION SQL_ROUTINE_EXCEPTION FUNCTION_EXECUTED_NO_RETURN_STATEMENT MODIFYING_SQL_DATA_NOT_PERMITTED PROHIBITED_SQL_STATEMENT_ATTEMPTED READING_SQL_DATA_NOT_PERMITTED INVALID_CURSOR_NAME EXTERNAL_ROUTINE_EXCEPTION CONTAINING_SQL_NOT_PERMITTED MODIFYING_SQL_DATA_NOT_PERMITTED PROHIBITED_SQL_STATEMENT_ATTEMPTED READING_SQL_DATA_NOT_PERMITTED EXTERNAL_ROUTINE_INVOCATION_EXCEPTION INVALID_SQLSTATE_RETURNED NULL_VALUE_NOT_ALLOWED TRIGGER_PROTOCOL_VIOLATED SRF_PROTOCOL_VIOLATED EVENT_TRIGGER_PROTOCOL_VIOLATED SAVEPOINT_EXCEPTION INVALID_SAVEPOINT_SPECIFICATION INVALID_CATALOG_NAME INVALID_SCHEMA_NAME TRANSACTION_ROLLBACK TRANSACTION_INTEGRITY_CONSTRAINT_VIOLATION SERIALIZATION_FAILURE STATEMENT_COMPLETION_UNKNOWN DEADLOCK_DETECTED SYNTAX_ERROR_OR_ACCESS_RULE_VIOLATION SYNTAX_ERROR INSUFFICIENT_PRIVILEGE CANNOT_COERCE GROUPING_ERROR WINDOWING_ERROR INVALID_RECURSION INVALID_FOREIGN_KEY INVALID_NAME NAME_TOO_LONG RESERVED_NAME DATATYPE_MISMATCH INDETERMINATE_DATATYPE COLLATION_MISMATCH INDETERMINATE_COLLATION WRONG_OBJECT_TYPE GENERATED_ALWAYS UNDEFINED_COLUMN UNDEFINED_FUNCTION UNDEFINED_TABLE UNDEFINED_PARAMETER UNDEFINED_OBJECT DUPLICATE_COLUMN DUPLICATE_CURSOR DUPLICATE_DATABASE DUPLICATE_FUNCTION DUPLICATE_PREPARED_STATEMENT DUPLICATE_SCHEMA DUPLICATE_TABLE DUPLICATE_ALIAS DUPLICATE_OBJECT AMBIGUOUS_COLUMN AMBIGUOUS_FUNCTION AMBIGUOUS_PARAMETER AMBIGUOUS_ALIAS INVALID_COLUMN_REFERENCE INVALID_COLUMN_DEFINITION INVALID_CURSOR_DEFINITION INVALID_DATABASE_DEFINITION INVALID_FUNCTION_DEFINITION INVALID_PREPARED_STATEMENT_DEFINITION INVALID_SCHEMA_DEFINITION INVALID_TABLE_DEFINITION INVALID_OBJECT_DEFINITION WITH_CHECK_OPTION_VIOLATION INSUFFICIENT_RESOURCES DISK_FULL OUT_OF_MEMORY TOO_MANY_CONNECTIONS CONFIGURATION_LIMIT_EXCEEDED PROGRAM_LIMIT_EXCEEDED STATEMENT_TOO_COMPLEX TOO_MANY_COLUMNS TOO_MANY_ARGUMENTS OBJECT_NOT_IN_PREREQUISITE_STATE OBJECT_IN_USE CANT_CHANGE_RUNTIME_PARAM LOCK_NOT_AVAILABLE OPERATOR_INTERVENTION QUERY_CANCELED ADMIN_SHUTDOWN CRASH_SHUTDOWN CANNOT_CONNECT_NOW DATABASE_DROPPED SYSTEM_ERROR IO_ERROR UNDEFINED_FILE DUPLICATE_FILE SNAPSHOT_TOO_OLD CONFIG_FILE_ERROR LOCK_FILE_EXISTS FDW_ERROR FDW_COLUMN_NAME_NOT_FOUND FDW_DYNAMIC_PARAMETER_VALUE_NEEDED FDW_FUNCTION_SEQUENCE_ERROR FDW_INCONSISTENT_DESCRIPTOR_INFORMATION FDW_INVALID_ATTRIBUTE_VALUE FDW_INVALID_COLUMN_NAME FDW_INVALID_COLUMN_NUMBER FDW_INVALID_DATA_TYPE FDW_INVALID_DATA_TYPE_DESCRIPTORS FDW_INVALID_DESCRIPTOR_FIELD_IDENTIFIER FDW_INVALID_HANDLE FDW_INVALID_OPTION_INDEX FDW_INVALID_OPTION_NAME FDW_INVALID_STRING_LENGTH_OR_BUFFER_LENGTH FDW_INVALID_STRING_FORMAT FDW_INVALID_USE_OF_NULL_POINTER FDW_TOO_MANY_HANDLES FDW_OUT_OF_MEMORY FDW_NO_SCHEMAS FDW_OPTION_NAME_NOT_FOUND FDW_REPLY_HANDLE FDW_SCHEMA_NOT_FOUND FDW_TABLE_NOT_FOUND FDW_UNABLE_TO_CREATE_EXECUTION FDW_UNABLE_TO_CREATE_REPLY FDW_UNABLE_TO_ESTABLISH_CONNECTION PLPGSQL_ERROR RAISE_EXCEPTION NO_DATA_FOUND TOO_MANY_ROWS ASSERT_FAILURE INTERNAL_ERROR DATA_CORRUPTED INDEX_CORRUPTED ",U="ARRAY_AGG AVG BIT_AND BIT_OR BOOL_AND BOOL_OR COUNT EVERY JSON_AGG JSONB_AGG JSON_OBJECT_AGG JSONB_OBJECT_AGG MAX MIN MODE STRING_AGG SUM XMLAGG CORR COVAR_POP COVAR_SAMP REGR_AVGX REGR_AVGY REGR_COUNT REGR_INTERCEPT REGR_R2 REGR_SLOPE REGR_SXX REGR_SXY REGR_SYY STDDEV STDDEV_POP STDDEV_SAMP VARIANCE VAR_POP VAR_SAMP PERCENTILE_CONT PERCENTILE_DISC ROW_NUMBER RANK DENSE_RANK PERCENT_RANK CUME_DIST NTILE LAG LEAD FIRST_VALUE LAST_VALUE NTH_VALUE NUM_NONNULLS NUM_NULLS ABS CBRT CEIL CEILING DEGREES DIV EXP FLOOR LN LOG MOD PI POWER RADIANS ROUND SCALE SIGN SQRT TRUNC WIDTH_BUCKET RANDOM SETSEED ACOS ACOSD ASIN ASIND ATAN ATAND ATAN2 ATAN2D COS COSD COT COTD SIN SIND TAN TAND BIT_LENGTH CHAR_LENGTH CHARACTER_LENGTH LOWER OCTET_LENGTH OVERLAY POSITION SUBSTRING TREAT TRIM UPPER ASCII BTRIM CHR CONCAT CONCAT_WS CONVERT CONVERT_FROM CONVERT_TO DECODE ENCODE INITCAPLEFT LENGTH LPAD LTRIM MD5 PARSE_IDENT PG_CLIENT_ENCODING QUOTE_IDENT|10 QUOTE_LITERAL|10 QUOTE_NULLABLE|10 REGEXP_MATCH REGEXP_MATCHES REGEXP_REPLACE REGEXP_SPLIT_TO_ARRAY REGEXP_SPLIT_TO_TABLE REPEAT REPLACE REVERSE RIGHT RPAD RTRIM SPLIT_PART STRPOS SUBSTR TO_ASCII TO_HEX TRANSLATE OCTET_LENGTH GET_BIT GET_BYTE SET_BIT SET_BYTE TO_CHAR TO_DATE TO_NUMBER TO_TIMESTAMP AGE CLOCK_TIMESTAMP|10 DATE_PART DATE_TRUNC ISFINITE JUSTIFY_DAYS JUSTIFY_HOURS JUSTIFY_INTERVAL MAKE_DATE MAKE_INTERVAL|10 MAKE_TIME MAKE_TIMESTAMP|10 MAKE_TIMESTAMPTZ|10 NOW STATEMENT_TIMESTAMP|10 TIMEOFDAY TRANSACTION_TIMESTAMP|10 ENUM_FIRST ENUM_LAST ENUM_RANGE AREA CENTER DIAMETER HEIGHT ISCLOSED ISOPEN NPOINTS PCLOSE POPEN RADIUS WIDTH BOX BOUND_BOX CIRCLE LINE LSEG PATH POLYGON ABBREV BROADCAST HOST HOSTMASK MASKLEN NETMASK NETWORK SET_MASKLEN TEXT INET_SAME_FAMILYINET_MERGE MACADDR8_SET7BIT ARRAY_TO_TSVECTOR GET_CURRENT_TS_CONFIG NUMNODE PLAINTO_TSQUERY PHRASETO_TSQUERY WEBSEARCH_TO_TSQUERY QUERYTREE SETWEIGHT STRIP TO_TSQUERY TO_TSVECTOR JSON_TO_TSVECTOR JSONB_TO_TSVECTOR TS_DELETE TS_FILTER TS_HEADLINE TS_RANK TS_RANK_CD TS_REWRITE TSQUERY_PHRASE TSVECTOR_TO_ARRAY TSVECTOR_UPDATE_TRIGGER TSVECTOR_UPDATE_TRIGGER_COLUMN XMLCOMMENT XMLCONCAT XMLELEMENT XMLFOREST XMLPI XMLROOT XMLEXISTS XML_IS_WELL_FORMED XML_IS_WELL_FORMED_DOCUMENT XML_IS_WELL_FORMED_CONTENT XPATH XPATH_EXISTS XMLTABLE XMLNAMESPACES TABLE_TO_XML TABLE_TO_XMLSCHEMA TABLE_TO_XML_AND_XMLSCHEMA QUERY_TO_XML QUERY_TO_XMLSCHEMA QUERY_TO_XML_AND_XMLSCHEMA CURSOR_TO_XML CURSOR_TO_XMLSCHEMA SCHEMA_TO_XML SCHEMA_TO_XMLSCHEMA SCHEMA_TO_XML_AND_XMLSCHEMA DATABASE_TO_XML DATABASE_TO_XMLSCHEMA DATABASE_TO_XML_AND_XMLSCHEMA XMLATTRIBUTES TO_JSON TO_JSONB ARRAY_TO_JSON ROW_TO_JSON JSON_BUILD_ARRAY JSONB_BUILD_ARRAY JSON_BUILD_OBJECT JSONB_BUILD_OBJECT JSON_OBJECT JSONB_OBJECT JSON_ARRAY_LENGTH JSONB_ARRAY_LENGTH JSON_EACH JSONB_EACH JSON_EACH_TEXT JSONB_EACH_TEXT JSON_EXTRACT_PATH JSONB_EXTRACT_PATH JSON_OBJECT_KEYS JSONB_OBJECT_KEYS JSON_POPULATE_RECORD JSONB_POPULATE_RECORD JSON_POPULATE_RECORDSET JSONB_POPULATE_RECORDSET JSON_ARRAY_ELEMENTS JSONB_ARRAY_ELEMENTS JSON_ARRAY_ELEMENTS_TEXT JSONB_ARRAY_ELEMENTS_TEXT JSON_TYPEOF JSONB_TYPEOF JSON_TO_RECORD JSONB_TO_RECORD JSON_TO_RECORDSET JSONB_TO_RECORDSET JSON_STRIP_NULLS JSONB_STRIP_NULLS JSONB_SET JSONB_INSERT JSONB_PRETTY CURRVAL LASTVAL NEXTVAL SETVAL COALESCE NULLIF GREATEST LEAST ARRAY_APPEND ARRAY_CAT ARRAY_NDIMS ARRAY_DIMS ARRAY_FILL ARRAY_LENGTH ARRAY_LOWER ARRAY_POSITION ARRAY_POSITIONS ARRAY_PREPEND ARRAY_REMOVE ARRAY_REPLACE ARRAY_TO_STRING ARRAY_UPPER CARDINALITY STRING_TO_ARRAY UNNEST ISEMPTY LOWER_INC UPPER_INC LOWER_INF UPPER_INF RANGE_MERGE GENERATE_SERIES GENERATE_SUBSCRIPTS CURRENT_DATABASE CURRENT_QUERY CURRENT_SCHEMA|10 CURRENT_SCHEMAS|10 INET_CLIENT_ADDR INET_CLIENT_PORT INET_SERVER_ADDR INET_SERVER_PORT ROW_SECURITY_ACTIVE FORMAT_TYPE TO_REGCLASS TO_REGPROC TO_REGPROCEDURE TO_REGOPER TO_REGOPERATOR TO_REGTYPE TO_REGNAMESPACE TO_REGROLE COL_DESCRIPTION OBJ_DESCRIPTION SHOBJ_DESCRIPTION TXID_CURRENT TXID_CURRENT_IF_ASSIGNED TXID_CURRENT_SNAPSHOT TXID_SNAPSHOT_XIP TXID_SNAPSHOT_XMAX TXID_SNAPSHOT_XMIN TXID_VISIBLE_IN_SNAPSHOT TXID_STATUS CURRENT_SETTING SET_CONFIG BRIN_SUMMARIZE_NEW_VALUES BRIN_SUMMARIZE_RANGE BRIN_DESUMMARIZE_RANGE GIN_CLEAN_PENDING_LIST SUPPRESS_REDUNDANT_UPDATES_TRIGGER LO_FROM_BYTEA LO_PUT LO_GET LO_CREAT LO_CREATE LO_UNLINK LO_IMPORT LO_EXPORT LOREAD LOWRITE GROUPING CAST ",P=U.trim().split(" ").map(function(E){return E.split("|")[0]}).join("|");return{aliases:["postgres","postgresql"],cI:!0,k:{keyword:I+_+O,built_in:C+D+M},i:/:==|\W\s*\(\*|(^|\s)\$[a-z]|{{|[a-z]:\s*$|\.\.\.|TO:|DO:/,c:[{cN:"keyword",v:[{b:/\bTEXT\s*SEARCH\b/},{b:/\b(PRIMARY|FOREIGN|FOR(\s+NO)?)\s+KEY\b/},{b:/\bPARALLEL\s+(UNSAFE|RESTRICTED|SAFE)\b/},{b:/\bSTORAGE\s+(PLAIN|EXTERNAL|EXTENDED|MAIN)\b/},{b:/\bMATCH\s+(FULL|PARTIAL|SIMPLE)\b/},{b:/\bNULLS\s+(FIRST|LAST)\b/},{b:/\bEVENT\s+TRIGGER\b/},{b:/\b(MAPPING|OR)\s+REPLACE\b/},{b:/\b(FROM|TO)\s+(PROGRAM|STDIN|STDOUT)\b/},{b:/\b(SHARE|EXCLUSIVE)\s+MODE\b/},{b:/\b(LEFT|RIGHT)\s+(OUTER\s+)?JOIN\b/},{b:/\b(FETCH|MOVE)\s+(NEXT|PRIOR|FIRST|LAST|ABSOLUTE|RELATIVE|FORWARD|BACKWARD)\b/},{b:/\bPRESERVE\s+ROWS\b/},{b:/\bDISCARD\s+PLANS\b/},{b:/\bREFERENCING\s+(OLD|NEW)\b/},{b:/\bSKIP\s+LOCKED\b/},{b:/\bGROUPING\s+SETS\b/},{b:/\b(BINARY|INSENSITIVE|SCROLL|NO\s+SCROLL)\s+(CURSOR|FOR)\b/},{b:/\b(WITH|WITHOUT)\s+HOLD\b/},{b:/\bWITH\s+(CASCADED|LOCAL)\s+CHECK\s+OPTION\b/},{b:/\bEXCLUDE\s+(TIES|NO\s+OTHERS)\b/},{b:/\bFORMAT\s+(TEXT|XML|JSON|YAML)\b/},{b:/\bSET\s+((SESSION|LOCAL)\s+)?NAMES\b/},{b:/\bIS\s+(NOT\s+)?UNKNOWN\b/},{b:/\bSECURITY\s+LABEL\b/},{b:/\bSTANDALONE\s+(YES|NO|NO\s+VALUE)\b/},{b:/\bWITH\s+(NO\s+)?DATA\b/},{b:/\b(FOREIGN|SET)\s+DATA\b/},{b:/\bSET\s+(CATALOG|CONSTRAINTS)\b/},{b:/\b(WITH|FOR)\s+ORDINALITY\b/},{b:/\bIS\s+(NOT\s+)?DOCUMENT\b/},{b:/\bXML\s+OPTION\s+(DOCUMENT|CONTENT)\b/},{b:/\b(STRIP|PRESERVE)\s+WHITESPACE\b/},{b:/\bNO\s+(ACTION|MAXVALUE|MINVALUE)\b/},{b:/\bPARTITION\s+BY\s+(RANGE|LIST|HASH)\b/},{b:/\bAT\s+TIME\s+ZONE\b/},{b:/\bGRANTED\s+BY\b/},{b:/\bRETURN\s+(QUERY|NEXT)\b/},{b:/\b(ATTACH|DETACH)\s+PARTITION\b/},{b:/\bFORCE\s+ROW\s+LEVEL\s+SECURITY\b/},{b:/\b(INCLUDING|EXCLUDING)\s+(COMMENTS|CONSTRAINTS|DEFAULTS|IDENTITY|INDEXES|STATISTICS|STORAGE|ALL)\b/},{b:/\bAS\s+(ASSIGNMENT|IMPLICIT|PERMISSIVE|RESTRICTIVE|ENUM|RANGE)\b/}]},{b:/\b(FORMAT|FAMILY|VERSION)\s*\(/},{b:/\bINCLUDE\s*\(/,k:"INCLUDE"},{b:/\bRANGE(?!\s*(BETWEEN|UNBOUNDED|CURRENT|[-0-9]+))/},{b:/\b(VERSION|OWNER|TEMPLATE|TABLESPACE|CONNECTION\s+LIMIT|PROCEDURE|RESTRICT|JOIN|PARSER|COPY|START|END|COLLATION|INPUT|ANALYZE|STORAGE|LIKE|DEFAULT|DELIMITER|ENCODING|COLUMN|CONSTRAINT|TABLE|SCHEMA)\s*=/},{b:/\b(PG_\w+?|HAS_[A-Z_]+_PRIVILEGE)\b/,r:10},{b:/\bEXTRACT\s*\(/,e:/\bFROM\b/,rE:!0,k:{type:"CENTURY DAY DECADE DOW DOY EPOCH HOUR ISODOW ISOYEAR MICROSECONDS MILLENNIUM MILLISECONDS MINUTE MONTH QUARTER SECOND TIMEZONE TIMEZONE_HOUR TIMEZONE_MINUTE WEEK YEAR"}},{b:/\b(XMLELEMENT|XMLPI)\s*\(\s*NAME/,k:{keyword:"NAME"}},{b:/\b(XMLPARSE|XMLSERIALIZE)\s*\(\s*(DOCUMENT|CONTENT)/,k:{keyword:"DOCUMENT CONTENT"}},{bK:"CACHE INCREMENT MAXVALUE MINVALUE",e:E.CNR,rE:!0,k:"BY CACHE INCREMENT MAXVALUE MINVALUE"},{cN:"type",b:/\b(WITH|WITHOUT)\s+TIME\s+ZONE\b/},{cN:"type",b:/\bINTERVAL\s+(YEAR|MONTH|DAY|HOUR|MINUTE|SECOND)(\s+TO\s+(MONTH|HOUR|MINUTE|SECOND))?\b/},{b:/\bRETURNS\s+(LANGUAGE_HANDLER|TRIGGER|EVENT_TRIGGER|FDW_HANDLER|INDEX_AM_HANDLER|TSM_HANDLER)\b/,k:{keyword:"RETURNS",type:"LANGUAGE_HANDLER TRIGGER EVENT_TRIGGER FDW_HANDLER INDEX_AM_HANDLER TSM_HANDLER"}},{b:"\\b("+P+")\\s*\\("},{b:"\\.("+L+")\\b"},{b:"\\b("+L+")\\s+PATH\\b",k:{keyword:"PATH",type:S.replace("PATH ","")}},{cN:"type",b:"\\b("+L+")\\b"},{cN:"string",b:"'",e:"'",c:[{b:"''"}]},{cN:"string",b:"(e|E|u&|U&)'",e:"'",c:[{b:"\\\\."}],r:10},{b:A,endSameAsBegin:!0,c:[{sL:["pgsql","perl","python","tcl","r","lua","java","php","ruby","bash","scheme","xml","json"],eW:!0}]},{b:'"',e:'"',c:[{b:'""'}]},E.CNM,E.CBCM,T,{cN:"meta",v:[{b:"%(ROW)?TYPE",r:10},{b:"\\$\\d+"},{b:"^#\\w",e:"$"}]},{cN:"symbol",b:R,r:10}]}});
\ No newline at end of file
+hljs.registerLanguage("pgsql",function(){"use strict";return function(E){var T=E.COMMENT("--","$"),N="BIGINT INT8 BIGSERIAL SERIAL8 BIT VARYING VARBIT BOOLEAN BOOL BOX BYTEA CHARACTER CHAR VARCHAR CIDR CIRCLE DATE DOUBLE PRECISION FLOAT8 FLOAT INET INTEGER INT INT4 INTERVAL JSON JSONB LINE LSEG|10 MACADDR MACADDR8 MONEY NUMERIC DEC DECIMAL PATH POINT POLYGON REAL FLOAT4 SMALLINT INT2 SMALLSERIAL|10 SERIAL2|10 SERIAL|10 SERIAL4|10 TEXT TIME ZONE TIMETZ|10 TIMESTAMP TIMESTAMPTZ|10 TSQUERY|10 TSVECTOR|10 TXID_SNAPSHOT|10 UUID XML NATIONAL NCHAR INT4RANGE|10 INT8RANGE|10 NUMRANGE|10 TSRANGE|10 TSTZRANGE|10 DATERANGE|10 ANYELEMENT ANYARRAY ANYNONARRAY ANYENUM ANYRANGE CSTRING INTERNAL RECORD PG_DDL_COMMAND VOID UNKNOWN OPAQUE REFCURSOR NAME OID REGPROC|10 REGPROCEDURE|10 REGOPER|10 REGOPERATOR|10 REGCLASS|10 REGTYPE|10 REGROLE|10 REGNAMESPACE|10 REGCONFIG|10 REGDICTIONARY|10 ",A=N.trim().split(" ").map((function(E){return E.split("|")[0]})).join("|"),R="ARRAY_AGG AVG BIT_AND BIT_OR BOOL_AND BOOL_OR COUNT EVERY JSON_AGG JSONB_AGG JSON_OBJECT_AGG JSONB_OBJECT_AGG MAX MIN MODE STRING_AGG SUM XMLAGG CORR COVAR_POP COVAR_SAMP REGR_AVGX REGR_AVGY REGR_COUNT REGR_INTERCEPT REGR_R2 REGR_SLOPE REGR_SXX REGR_SXY REGR_SYY STDDEV STDDEV_POP STDDEV_SAMP VARIANCE VAR_POP VAR_SAMP PERCENTILE_CONT PERCENTILE_DISC ROW_NUMBER RANK DENSE_RANK PERCENT_RANK CUME_DIST NTILE LAG LEAD FIRST_VALUE LAST_VALUE NTH_VALUE NUM_NONNULLS NUM_NULLS ABS CBRT CEIL CEILING DEGREES DIV EXP FLOOR LN LOG MOD PI POWER RADIANS ROUND SCALE SIGN SQRT TRUNC WIDTH_BUCKET RANDOM SETSEED ACOS ACOSD ASIN ASIND ATAN ATAND ATAN2 ATAN2D COS COSD COT COTD SIN SIND TAN TAND BIT_LENGTH CHAR_LENGTH CHARACTER_LENGTH LOWER OCTET_LENGTH OVERLAY POSITION SUBSTRING TREAT TRIM UPPER ASCII BTRIM CHR CONCAT CONCAT_WS CONVERT CONVERT_FROM CONVERT_TO DECODE ENCODE INITCAP LEFT LENGTH LPAD LTRIM MD5 PARSE_IDENT PG_CLIENT_ENCODING QUOTE_IDENT|10 QUOTE_LITERAL|10 QUOTE_NULLABLE|10 REGEXP_MATCH REGEXP_MATCHES REGEXP_REPLACE REGEXP_SPLIT_TO_ARRAY REGEXP_SPLIT_TO_TABLE REPEAT REPLACE REVERSE RIGHT RPAD RTRIM SPLIT_PART STRPOS SUBSTR TO_ASCII TO_HEX TRANSLATE OCTET_LENGTH GET_BIT GET_BYTE SET_BIT SET_BYTE TO_CHAR TO_DATE TO_NUMBER TO_TIMESTAMP AGE CLOCK_TIMESTAMP|10 DATE_PART DATE_TRUNC ISFINITE JUSTIFY_DAYS JUSTIFY_HOURS JUSTIFY_INTERVAL MAKE_DATE MAKE_INTERVAL|10 MAKE_TIME MAKE_TIMESTAMP|10 MAKE_TIMESTAMPTZ|10 NOW STATEMENT_TIMESTAMP|10 TIMEOFDAY TRANSACTION_TIMESTAMP|10 ENUM_FIRST ENUM_LAST ENUM_RANGE AREA CENTER DIAMETER HEIGHT ISCLOSED ISOPEN NPOINTS PCLOSE POPEN RADIUS WIDTH BOX BOUND_BOX CIRCLE LINE LSEG PATH POLYGON ABBREV BROADCAST HOST HOSTMASK MASKLEN NETMASK NETWORK SET_MASKLEN TEXT INET_SAME_FAMILY INET_MERGE MACADDR8_SET7BIT ARRAY_TO_TSVECTOR GET_CURRENT_TS_CONFIG NUMNODE PLAINTO_TSQUERY PHRASETO_TSQUERY WEBSEARCH_TO_TSQUERY QUERYTREE SETWEIGHT STRIP TO_TSQUERY TO_TSVECTOR JSON_TO_TSVECTOR JSONB_TO_TSVECTOR TS_DELETE TS_FILTER TS_HEADLINE TS_RANK TS_RANK_CD TS_REWRITE TSQUERY_PHRASE TSVECTOR_TO_ARRAY TSVECTOR_UPDATE_TRIGGER TSVECTOR_UPDATE_TRIGGER_COLUMN XMLCOMMENT XMLCONCAT XMLELEMENT XMLFOREST XMLPI XMLROOT XMLEXISTS XML_IS_WELL_FORMED XML_IS_WELL_FORMED_DOCUMENT XML_IS_WELL_FORMED_CONTENT XPATH XPATH_EXISTS XMLTABLE XMLNAMESPACES TABLE_TO_XML TABLE_TO_XMLSCHEMA TABLE_TO_XML_AND_XMLSCHEMA QUERY_TO_XML QUERY_TO_XMLSCHEMA QUERY_TO_XML_AND_XMLSCHEMA CURSOR_TO_XML CURSOR_TO_XMLSCHEMA SCHEMA_TO_XML SCHEMA_TO_XMLSCHEMA SCHEMA_TO_XML_AND_XMLSCHEMA DATABASE_TO_XML DATABASE_TO_XMLSCHEMA DATABASE_TO_XML_AND_XMLSCHEMA XMLATTRIBUTES TO_JSON TO_JSONB ARRAY_TO_JSON ROW_TO_JSON JSON_BUILD_ARRAY JSONB_BUILD_ARRAY JSON_BUILD_OBJECT JSONB_BUILD_OBJECT JSON_OBJECT JSONB_OBJECT JSON_ARRAY_LENGTH JSONB_ARRAY_LENGTH JSON_EACH JSONB_EACH JSON_EACH_TEXT JSONB_EACH_TEXT JSON_EXTRACT_PATH JSONB_EXTRACT_PATH JSON_OBJECT_KEYS JSONB_OBJECT_KEYS JSON_POPULATE_RECORD JSONB_POPULATE_RECORD JSON_POPULATE_RECORDSET JSONB_POPULATE_RECORDSET JSON_ARRAY_ELEMENTS JSONB_ARRAY_ELEMENTS JSON_ARRAY_ELEMENTS_TEXT JSONB_ARRAY_ELEMENTS_TEXT JSON_TYPEOF JSONB_TYPEOF JSON_TO_RECORD JSONB_TO_RECORD JSON_TO_RECORDSET JSONB_TO_RECORDSET JSON_STRIP_NULLS JSONB_STRIP_NULLS JSONB_SET JSONB_INSERT JSONB_PRETTY CURRVAL LASTVAL NEXTVAL SETVAL COALESCE NULLIF GREATEST LEAST ARRAY_APPEND ARRAY_CAT ARRAY_NDIMS ARRAY_DIMS ARRAY_FILL ARRAY_LENGTH ARRAY_LOWER ARRAY_POSITION ARRAY_POSITIONS ARRAY_PREPEND ARRAY_REMOVE ARRAY_REPLACE ARRAY_TO_STRING ARRAY_UPPER CARDINALITY STRING_TO_ARRAY UNNEST ISEMPTY LOWER_INC UPPER_INC LOWER_INF UPPER_INF RANGE_MERGE GENERATE_SERIES GENERATE_SUBSCRIPTS CURRENT_DATABASE CURRENT_QUERY CURRENT_SCHEMA|10 CURRENT_SCHEMAS|10 INET_CLIENT_ADDR INET_CLIENT_PORT INET_SERVER_ADDR INET_SERVER_PORT ROW_SECURITY_ACTIVE FORMAT_TYPE TO_REGCLASS TO_REGPROC TO_REGPROCEDURE TO_REGOPER TO_REGOPERATOR TO_REGTYPE TO_REGNAMESPACE TO_REGROLE COL_DESCRIPTION OBJ_DESCRIPTION SHOBJ_DESCRIPTION TXID_CURRENT TXID_CURRENT_IF_ASSIGNED TXID_CURRENT_SNAPSHOT TXID_SNAPSHOT_XIP TXID_SNAPSHOT_XMAX TXID_SNAPSHOT_XMIN TXID_VISIBLE_IN_SNAPSHOT TXID_STATUS CURRENT_SETTING SET_CONFIG BRIN_SUMMARIZE_NEW_VALUES BRIN_SUMMARIZE_RANGE BRIN_DESUMMARIZE_RANGE GIN_CLEAN_PENDING_LIST SUPPRESS_REDUNDANT_UPDATES_TRIGGER LO_FROM_BYTEA LO_PUT LO_GET LO_CREAT LO_CREATE LO_UNLINK LO_IMPORT LO_EXPORT LOREAD LOWRITE GROUPING CAST".split(" ").map((function(E){return E.split("|")[0]})).join("|");return{name:"PostgreSQL",aliases:["postgres","postgresql"],case_insensitive:!0,keywords:{keyword:"ABORT ALTER ANALYZE BEGIN CALL CHECKPOINT|10 CLOSE CLUSTER COMMENT COMMIT COPY CREATE DEALLOCATE DECLARE DELETE DISCARD DO DROP END EXECUTE EXPLAIN FETCH GRANT IMPORT INSERT LISTEN LOAD LOCK MOVE NOTIFY PREPARE REASSIGN|10 REFRESH REINDEX RELEASE RESET REVOKE ROLLBACK SAVEPOINT SECURITY SELECT SET SHOW START TRUNCATE UNLISTEN|10 UPDATE VACUUM|10 VALUES AGGREGATE COLLATION CONVERSION|10 DATABASE DEFAULT PRIVILEGES DOMAIN TRIGGER EXTENSION FOREIGN WRAPPER|10 TABLE FUNCTION GROUP LANGUAGE LARGE OBJECT MATERIALIZED VIEW OPERATOR CLASS FAMILY POLICY PUBLICATION|10 ROLE RULE SCHEMA SEQUENCE SERVER STATISTICS SUBSCRIPTION SYSTEM TABLESPACE CONFIGURATION DICTIONARY PARSER TEMPLATE TYPE USER MAPPING PREPARED ACCESS METHOD CAST AS TRANSFORM TRANSACTION OWNED TO INTO SESSION AUTHORIZATION INDEX PROCEDURE ASSERTION ALL ANALYSE AND ANY ARRAY ASC ASYMMETRIC|10 BOTH CASE CHECK COLLATE COLUMN CONCURRENTLY|10 CONSTRAINT CROSS DEFERRABLE RANGE DESC DISTINCT ELSE EXCEPT FOR FREEZE|10 FROM FULL HAVING ILIKE IN INITIALLY INNER INTERSECT IS ISNULL JOIN LATERAL LEADING LIKE LIMIT NATURAL NOT NOTNULL NULL OFFSET ON ONLY OR ORDER OUTER OVERLAPS PLACING PRIMARY REFERENCES RETURNING SIMILAR SOME SYMMETRIC TABLESAMPLE THEN TRAILING UNION UNIQUE USING VARIADIC|10 VERBOSE WHEN WHERE WINDOW WITH BY RETURNS INOUT OUT SETOF|10 IF STRICT CURRENT CONTINUE OWNER LOCATION OVER PARTITION WITHIN BETWEEN ESCAPE EXTERNAL INVOKER DEFINER WORK RENAME VERSION CONNECTION CONNECT TABLES TEMP TEMPORARY FUNCTIONS SEQUENCES TYPES SCHEMAS OPTION CASCADE RESTRICT ADD ADMIN EXISTS VALID VALIDATE ENABLE DISABLE REPLICA|10 ALWAYS PASSING COLUMNS PATH REF VALUE OVERRIDING IMMUTABLE STABLE VOLATILE BEFORE AFTER EACH ROW PROCEDURAL ROUTINE NO HANDLER VALIDATOR OPTIONS STORAGE OIDS|10 WITHOUT INHERIT DEPENDS CALLED INPUT LEAKPROOF|10 COST ROWS NOWAIT SEARCH UNTIL ENCRYPTED|10 PASSWORD CONFLICT|10 INSTEAD INHERITS CHARACTERISTICS WRITE CURSOR ALSO STATEMENT SHARE EXCLUSIVE INLINE ISOLATION REPEATABLE READ COMMITTED SERIALIZABLE UNCOMMITTED LOCAL GLOBAL SQL PROCEDURES RECURSIVE SNAPSHOT ROLLUP CUBE TRUSTED|10 INCLUDE FOLLOWING PRECEDING UNBOUNDED RANGE GROUPS UNENCRYPTED|10 SYSID FORMAT DELIMITER HEADER QUOTE ENCODING FILTER OFF FORCE_QUOTE FORCE_NOT_NULL FORCE_NULL COSTS BUFFERS TIMING SUMMARY DISABLE_PAGE_SKIPPING RESTART CYCLE GENERATED IDENTITY DEFERRED IMMEDIATE LEVEL LOGGED UNLOGGED OF NOTHING NONE EXCLUDE ATTRIBUTE USAGE ROUTINES TRUE FALSE NAN INFINITY ALIAS BEGIN CONSTANT DECLARE END EXCEPTION RETURN PERFORM|10 RAISE GET DIAGNOSTICS STACKED|10 FOREACH LOOP ELSIF EXIT WHILE REVERSE SLICE DEBUG LOG INFO NOTICE WARNING ASSERT OPEN SUPERUSER NOSUPERUSER CREATEDB NOCREATEDB CREATEROLE NOCREATEROLE INHERIT NOINHERIT LOGIN NOLOGIN REPLICATION NOREPLICATION BYPASSRLS NOBYPASSRLS ",built_in:"CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER CURRENT_CATALOG|10 CURRENT_DATE LOCALTIME LOCALTIMESTAMP CURRENT_ROLE|10 CURRENT_SCHEMA|10 SESSION_USER PUBLIC FOUND NEW OLD TG_NAME|10 TG_WHEN|10 TG_LEVEL|10 TG_OP|10 TG_RELID|10 TG_RELNAME|10 TG_TABLE_NAME|10 TG_TABLE_SCHEMA|10 TG_NARGS|10 TG_ARGV|10 TG_EVENT|10 TG_TAG|10 ROW_COUNT RESULT_OID|10 PG_CONTEXT|10 RETURNED_SQLSTATE COLUMN_NAME CONSTRAINT_NAME PG_DATATYPE_NAME|10 MESSAGE_TEXT TABLE_NAME SCHEMA_NAME PG_EXCEPTION_DETAIL|10 PG_EXCEPTION_HINT|10 PG_EXCEPTION_CONTEXT|10 SQLSTATE SQLERRM|10 SUCCESSFUL_COMPLETION WARNING DYNAMIC_RESULT_SETS_RETURNED IMPLICIT_ZERO_BIT_PADDING NULL_VALUE_ELIMINATED_IN_SET_FUNCTION PRIVILEGE_NOT_GRANTED PRIVILEGE_NOT_REVOKED STRING_DATA_RIGHT_TRUNCATION DEPRECATED_FEATURE NO_DATA NO_ADDITIONAL_DYNAMIC_RESULT_SETS_RETURNED SQL_STATEMENT_NOT_YET_COMPLETE CONNECTION_EXCEPTION CONNECTION_DOES_NOT_EXIST CONNECTION_FAILURE SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION SQLSERVER_REJECTED_ESTABLISHMENT_OF_SQLCONNECTION TRANSACTION_RESOLUTION_UNKNOWN PROTOCOL_VIOLATION TRIGGERED_ACTION_EXCEPTION FEATURE_NOT_SUPPORTED INVALID_TRANSACTION_INITIATION LOCATOR_EXCEPTION INVALID_LOCATOR_SPECIFICATION INVALID_GRANTOR INVALID_GRANT_OPERATION INVALID_ROLE_SPECIFICATION DIAGNOSTICS_EXCEPTION STACKED_DIAGNOSTICS_ACCESSED_WITHOUT_ACTIVE_HANDLER CASE_NOT_FOUND CARDINALITY_VIOLATION DATA_EXCEPTION ARRAY_SUBSCRIPT_ERROR CHARACTER_NOT_IN_REPERTOIRE DATETIME_FIELD_OVERFLOW DIVISION_BY_ZERO ERROR_IN_ASSIGNMENT ESCAPE_CHARACTER_CONFLICT INDICATOR_OVERFLOW INTERVAL_FIELD_OVERFLOW INVALID_ARGUMENT_FOR_LOGARITHM INVALID_ARGUMENT_FOR_NTILE_FUNCTION INVALID_ARGUMENT_FOR_NTH_VALUE_FUNCTION INVALID_ARGUMENT_FOR_POWER_FUNCTION INVALID_ARGUMENT_FOR_WIDTH_BUCKET_FUNCTION INVALID_CHARACTER_VALUE_FOR_CAST INVALID_DATETIME_FORMAT INVALID_ESCAPE_CHARACTER INVALID_ESCAPE_OCTET INVALID_ESCAPE_SEQUENCE NONSTANDARD_USE_OF_ESCAPE_CHARACTER INVALID_INDICATOR_PARAMETER_VALUE INVALID_PARAMETER_VALUE INVALID_REGULAR_EXPRESSION INVALID_ROW_COUNT_IN_LIMIT_CLAUSE INVALID_ROW_COUNT_IN_RESULT_OFFSET_CLAUSE INVALID_TABLESAMPLE_ARGUMENT INVALID_TABLESAMPLE_REPEAT INVALID_TIME_ZONE_DISPLACEMENT_VALUE INVALID_USE_OF_ESCAPE_CHARACTER MOST_SPECIFIC_TYPE_MISMATCH NULL_VALUE_NOT_ALLOWED NULL_VALUE_NO_INDICATOR_PARAMETER NUMERIC_VALUE_OUT_OF_RANGE SEQUENCE_GENERATOR_LIMIT_EXCEEDED STRING_DATA_LENGTH_MISMATCH STRING_DATA_RIGHT_TRUNCATION SUBSTRING_ERROR TRIM_ERROR UNTERMINATED_C_STRING ZERO_LENGTH_CHARACTER_STRING FLOATING_POINT_EXCEPTION INVALID_TEXT_REPRESENTATION INVALID_BINARY_REPRESENTATION BAD_COPY_FILE_FORMAT UNTRANSLATABLE_CHARACTER NOT_AN_XML_DOCUMENT INVALID_XML_DOCUMENT INVALID_XML_CONTENT INVALID_XML_COMMENT INVALID_XML_PROCESSING_INSTRUCTION INTEGRITY_CONSTRAINT_VIOLATION RESTRICT_VIOLATION NOT_NULL_VIOLATION FOREIGN_KEY_VIOLATION UNIQUE_VIOLATION CHECK_VIOLATION EXCLUSION_VIOLATION INVALID_CURSOR_STATE INVALID_TRANSACTION_STATE ACTIVE_SQL_TRANSACTION BRANCH_TRANSACTION_ALREADY_ACTIVE HELD_CURSOR_REQUIRES_SAME_ISOLATION_LEVEL INAPPROPRIATE_ACCESS_MODE_FOR_BRANCH_TRANSACTION INAPPROPRIATE_ISOLATION_LEVEL_FOR_BRANCH_TRANSACTION NO_ACTIVE_SQL_TRANSACTION_FOR_BRANCH_TRANSACTION READ_ONLY_SQL_TRANSACTION SCHEMA_AND_DATA_STATEMENT_MIXING_NOT_SUPPORTED NO_ACTIVE_SQL_TRANSACTION IN_FAILED_SQL_TRANSACTION IDLE_IN_TRANSACTION_SESSION_TIMEOUT INVALID_SQL_STATEMENT_NAME TRIGGERED_DATA_CHANGE_VIOLATION INVALID_AUTHORIZATION_SPECIFICATION INVALID_PASSWORD DEPENDENT_PRIVILEGE_DESCRIPTORS_STILL_EXIST DEPENDENT_OBJECTS_STILL_EXIST INVALID_TRANSACTION_TERMINATION SQL_ROUTINE_EXCEPTION FUNCTION_EXECUTED_NO_RETURN_STATEMENT MODIFYING_SQL_DATA_NOT_PERMITTED PROHIBITED_SQL_STATEMENT_ATTEMPTED READING_SQL_DATA_NOT_PERMITTED INVALID_CURSOR_NAME EXTERNAL_ROUTINE_EXCEPTION CONTAINING_SQL_NOT_PERMITTED MODIFYING_SQL_DATA_NOT_PERMITTED PROHIBITED_SQL_STATEMENT_ATTEMPTED READING_SQL_DATA_NOT_PERMITTED EXTERNAL_ROUTINE_INVOCATION_EXCEPTION INVALID_SQLSTATE_RETURNED NULL_VALUE_NOT_ALLOWED TRIGGER_PROTOCOL_VIOLATED SRF_PROTOCOL_VIOLATED EVENT_TRIGGER_PROTOCOL_VIOLATED SAVEPOINT_EXCEPTION INVALID_SAVEPOINT_SPECIFICATION INVALID_CATALOG_NAME INVALID_SCHEMA_NAME TRANSACTION_ROLLBACK TRANSACTION_INTEGRITY_CONSTRAINT_VIOLATION SERIALIZATION_FAILURE STATEMENT_COMPLETION_UNKNOWN DEADLOCK_DETECTED SYNTAX_ERROR_OR_ACCESS_RULE_VIOLATION SYNTAX_ERROR INSUFFICIENT_PRIVILEGE CANNOT_COERCE GROUPING_ERROR WINDOWING_ERROR INVALID_RECURSION INVALID_FOREIGN_KEY INVALID_NAME NAME_TOO_LONG RESERVED_NAME DATATYPE_MISMATCH INDETERMINATE_DATATYPE COLLATION_MISMATCH INDETERMINATE_COLLATION WRONG_OBJECT_TYPE GENERATED_ALWAYS UNDEFINED_COLUMN UNDEFINED_FUNCTION UNDEFINED_TABLE UNDEFINED_PARAMETER UNDEFINED_OBJECT DUPLICATE_COLUMN DUPLICATE_CURSOR DUPLICATE_DATABASE DUPLICATE_FUNCTION DUPLICATE_PREPARED_STATEMENT DUPLICATE_SCHEMA DUPLICATE_TABLE DUPLICATE_ALIAS DUPLICATE_OBJECT AMBIGUOUS_COLUMN AMBIGUOUS_FUNCTION AMBIGUOUS_PARAMETER AMBIGUOUS_ALIAS INVALID_COLUMN_REFERENCE INVALID_COLUMN_DEFINITION INVALID_CURSOR_DEFINITION INVALID_DATABASE_DEFINITION INVALID_FUNCTION_DEFINITION INVALID_PREPARED_STATEMENT_DEFINITION INVALID_SCHEMA_DEFINITION INVALID_TABLE_DEFINITION INVALID_OBJECT_DEFINITION WITH_CHECK_OPTION_VIOLATION INSUFFICIENT_RESOURCES DISK_FULL OUT_OF_MEMORY TOO_MANY_CONNECTIONS CONFIGURATION_LIMIT_EXCEEDED PROGRAM_LIMIT_EXCEEDED STATEMENT_TOO_COMPLEX TOO_MANY_COLUMNS TOO_MANY_ARGUMENTS OBJECT_NOT_IN_PREREQUISITE_STATE OBJECT_IN_USE CANT_CHANGE_RUNTIME_PARAM LOCK_NOT_AVAILABLE OPERATOR_INTERVENTION QUERY_CANCELED ADMIN_SHUTDOWN CRASH_SHUTDOWN CANNOT_CONNECT_NOW DATABASE_DROPPED SYSTEM_ERROR IO_ERROR UNDEFINED_FILE DUPLICATE_FILE SNAPSHOT_TOO_OLD CONFIG_FILE_ERROR LOCK_FILE_EXISTS FDW_ERROR FDW_COLUMN_NAME_NOT_FOUND FDW_DYNAMIC_PARAMETER_VALUE_NEEDED FDW_FUNCTION_SEQUENCE_ERROR FDW_INCONSISTENT_DESCRIPTOR_INFORMATION FDW_INVALID_ATTRIBUTE_VALUE FDW_INVALID_COLUMN_NAME FDW_INVALID_COLUMN_NUMBER FDW_INVALID_DATA_TYPE FDW_INVALID_DATA_TYPE_DESCRIPTORS FDW_INVALID_DESCRIPTOR_FIELD_IDENTIFIER FDW_INVALID_HANDLE FDW_INVALID_OPTION_INDEX FDW_INVALID_OPTION_NAME FDW_INVALID_STRING_LENGTH_OR_BUFFER_LENGTH FDW_INVALID_STRING_FORMAT FDW_INVALID_USE_OF_NULL_POINTER FDW_TOO_MANY_HANDLES FDW_OUT_OF_MEMORY FDW_NO_SCHEMAS FDW_OPTION_NAME_NOT_FOUND FDW_REPLY_HANDLE FDW_SCHEMA_NOT_FOUND FDW_TABLE_NOT_FOUND FDW_UNABLE_TO_CREATE_EXECUTION FDW_UNABLE_TO_CREATE_REPLY FDW_UNABLE_TO_ESTABLISH_CONNECTION PLPGSQL_ERROR RAISE_EXCEPTION NO_DATA_FOUND TOO_MANY_ROWS ASSERT_FAILURE INTERNAL_ERROR DATA_CORRUPTED INDEX_CORRUPTED "},illegal:/:==|\W\s*\(\*|(^|\s)\$[a-z]|{{|[a-z]:\s*$|\.\.\.|TO:|DO:/,contains:[{className:"keyword",variants:[{begin:/\bTEXT\s*SEARCH\b/},{begin:/\b(PRIMARY|FOREIGN|FOR(\s+NO)?)\s+KEY\b/},{begin:/\bPARALLEL\s+(UNSAFE|RESTRICTED|SAFE)\b/},{begin:/\bSTORAGE\s+(PLAIN|EXTERNAL|EXTENDED|MAIN)\b/},{begin:/\bMATCH\s+(FULL|PARTIAL|SIMPLE)\b/},{begin:/\bNULLS\s+(FIRST|LAST)\b/},{begin:/\bEVENT\s+TRIGGER\b/},{begin:/\b(MAPPING|OR)\s+REPLACE\b/},{begin:/\b(FROM|TO)\s+(PROGRAM|STDIN|STDOUT)\b/},{begin:/\b(SHARE|EXCLUSIVE)\s+MODE\b/},{begin:/\b(LEFT|RIGHT)\s+(OUTER\s+)?JOIN\b/},{begin:/\b(FETCH|MOVE)\s+(NEXT|PRIOR|FIRST|LAST|ABSOLUTE|RELATIVE|FORWARD|BACKWARD)\b/},{begin:/\bPRESERVE\s+ROWS\b/},{begin:/\bDISCARD\s+PLANS\b/},{begin:/\bREFERENCING\s+(OLD|NEW)\b/},{begin:/\bSKIP\s+LOCKED\b/},{begin:/\bGROUPING\s+SETS\b/},{begin:/\b(BINARY|INSENSITIVE|SCROLL|NO\s+SCROLL)\s+(CURSOR|FOR)\b/},{begin:/\b(WITH|WITHOUT)\s+HOLD\b/},{begin:/\bWITH\s+(CASCADED|LOCAL)\s+CHECK\s+OPTION\b/},{begin:/\bEXCLUDE\s+(TIES|NO\s+OTHERS)\b/},{begin:/\bFORMAT\s+(TEXT|XML|JSON|YAML)\b/},{begin:/\bSET\s+((SESSION|LOCAL)\s+)?NAMES\b/},{begin:/\bIS\s+(NOT\s+)?UNKNOWN\b/},{begin:/\bSECURITY\s+LABEL\b/},{begin:/\bSTANDALONE\s+(YES|NO|NO\s+VALUE)\b/},{begin:/\bWITH\s+(NO\s+)?DATA\b/},{begin:/\b(FOREIGN|SET)\s+DATA\b/},{begin:/\bSET\s+(CATALOG|CONSTRAINTS)\b/},{begin:/\b(WITH|FOR)\s+ORDINALITY\b/},{begin:/\bIS\s+(NOT\s+)?DOCUMENT\b/},{begin:/\bXML\s+OPTION\s+(DOCUMENT|CONTENT)\b/},{begin:/\b(STRIP|PRESERVE)\s+WHITESPACE\b/},{begin:/\bNO\s+(ACTION|MAXVALUE|MINVALUE)\b/},{begin:/\bPARTITION\s+BY\s+(RANGE|LIST|HASH)\b/},{begin:/\bAT\s+TIME\s+ZONE\b/},{begin:/\bGRANTED\s+BY\b/},{begin:/\bRETURN\s+(QUERY|NEXT)\b/},{begin:/\b(ATTACH|DETACH)\s+PARTITION\b/},{begin:/\bFORCE\s+ROW\s+LEVEL\s+SECURITY\b/},{begin:/\b(INCLUDING|EXCLUDING)\s+(COMMENTS|CONSTRAINTS|DEFAULTS|IDENTITY|INDEXES|STATISTICS|STORAGE|ALL)\b/},{begin:/\bAS\s+(ASSIGNMENT|IMPLICIT|PERMISSIVE|RESTRICTIVE|ENUM|RANGE)\b/}]},{begin:/\b(FORMAT|FAMILY|VERSION)\s*\(/},{begin:/\bINCLUDE\s*\(/,keywords:"INCLUDE"},{begin:/\bRANGE(?!\s*(BETWEEN|UNBOUNDED|CURRENT|[-0-9]+))/},{begin:/\b(VERSION|OWNER|TEMPLATE|TABLESPACE|CONNECTION\s+LIMIT|PROCEDURE|RESTRICT|JOIN|PARSER|COPY|START|END|COLLATION|INPUT|ANALYZE|STORAGE|LIKE|DEFAULT|DELIMITER|ENCODING|COLUMN|CONSTRAINT|TABLE|SCHEMA)\s*=/},{begin:/\b(PG_\w+?|HAS_[A-Z_]+_PRIVILEGE)\b/,relevance:10},{begin:/\bEXTRACT\s*\(/,end:/\bFROM\b/,returnEnd:!0,keywords:{type:"CENTURY DAY DECADE DOW DOY EPOCH HOUR ISODOW ISOYEAR MICROSECONDS MILLENNIUM MILLISECONDS MINUTE MONTH QUARTER SECOND TIMEZONE TIMEZONE_HOUR TIMEZONE_MINUTE WEEK YEAR"}},{begin:/\b(XMLELEMENT|XMLPI)\s*\(\s*NAME/,keywords:{keyword:"NAME"}},{begin:/\b(XMLPARSE|XMLSERIALIZE)\s*\(\s*(DOCUMENT|CONTENT)/,keywords:{keyword:"DOCUMENT CONTENT"}},{beginKeywords:"CACHE INCREMENT MAXVALUE MINVALUE",end:E.C_NUMBER_RE,returnEnd:!0,keywords:"BY CACHE INCREMENT MAXVALUE MINVALUE"},{className:"type",begin:/\b(WITH|WITHOUT)\s+TIME\s+ZONE\b/},{className:"type",begin:/\bINTERVAL\s+(YEAR|MONTH|DAY|HOUR|MINUTE|SECOND)(\s+TO\s+(MONTH|HOUR|MINUTE|SECOND))?\b/},{begin:/\bRETURNS\s+(LANGUAGE_HANDLER|TRIGGER|EVENT_TRIGGER|FDW_HANDLER|INDEX_AM_HANDLER|TSM_HANDLER)\b/,keywords:{keyword:"RETURNS",type:"LANGUAGE_HANDLER TRIGGER EVENT_TRIGGER FDW_HANDLER INDEX_AM_HANDLER TSM_HANDLER"}},{begin:"\\b("+R+")\\s*\\("},{begin:"\\.("+A+")\\b"},{begin:"\\b("+A+")\\s+PATH\\b",keywords:{keyword:"PATH",type:N.replace("PATH ","")}},{className:"type",begin:"\\b("+A+")\\b"},{className:"string",begin:"'",end:"'",contains:[{begin:"''"}]},{className:"string",begin:"(e|E|u&|U&)'",end:"'",contains:[{begin:"\\\\."}],relevance:10},E.END_SAME_AS_BEGIN({begin:"\\$([a-zA-Z_]?|[a-zA-Z_][a-zA-Z_0-9]*)\\$",end:"\\$([a-zA-Z_]?|[a-zA-Z_][a-zA-Z_0-9]*)\\$",contains:[{subLanguage:["pgsql","perl","python","tcl","r","lua","java","php","ruby","bash","scheme","xml","json"],endsWithParent:!0}]}),{begin:'"',end:'"',contains:[{begin:'""'}]},E.C_NUMBER_MODE,E.C_BLOCK_COMMENT_MODE,T,{className:"meta",variants:[{begin:"%(ROW)?TYPE",relevance:10},{begin:"\\$\\d+"},{begin:"^#\\w",end:"$"}]},{className:"symbol",begin:"<<\\s*[a-zA-Z_][a-zA-Z_0-9$]*\\s*>>",relevance:10}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/php-template.min.js b/vendor/assets/javascripts/highlightjs/languages/php-template.min.js
new file mode 100644
index 0000000000..9cca0e2ab4
--- /dev/null
+++ b/vendor/assets/javascripts/highlightjs/languages/php-template.min.js
@@ -0,0 +1 @@
+hljs.registerLanguage("php-template",function(){"use strict";return function(n){return{name:"PHP template",subLanguage:"xml",contains:[{begin:/<\?(php|=)?/,end:/\?>/,subLanguage:"php",contains:[{begin:"/\\*",end:"\\*/",skip:!0},{begin:'b"',end:'"',skip:!0},{begin:"b'",end:"'",skip:!0},n.inherit(n.APOS_STRING_MODE,{illegal:null,className:null,contains:null,skip:!0}),n.inherit(n.QUOTE_STRING_MODE,{illegal:null,className:null,contains:null,skip:!0})]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/php.min.js b/vendor/assets/javascripts/highlightjs/languages/php.min.js
index 266e58b590..cf6da276c0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/php.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/php.min.js
@@ -1 +1 @@
-hljs.registerLanguage("php",function(e){var c={b:"\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"},i={cN:"meta",b:/<\?(php)?|\?>/},t={cN:"string",c:[e.BE,i],v:[{b:'b"',e:'"'},{b:"b'",e:"'"},e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null})]},a={v:[e.BNM,e.CNM]};return{aliases:["php","php3","php4","php5","php6","php7"],cI:!0,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try switch continue endfor endif declare unset true false trait goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally",c:[e.HCM,e.C("//","$",{c:[i]}),e.C("/\\*","\\*/",{c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.C("__halt_compiler.+?;",!1,{eW:!0,k:"__halt_compiler",l:e.UIR}),{cN:"string",b:/<<<['"]?\w+['"]?$/,e:/^\w+;?$/,c:[e.BE,{cN:"subst",v:[{b:/\$\w+/},{b:/\{\$/,e:/\}/}]}]},i,{cN:"keyword",b:/\$this\b/},c,{b:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{cN:"function",bK:"function",e:/[;{]/,eE:!0,i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:["self",c,e.CBCM,t,a]}]},{cN:"class",bK:"class interface",e:"{",eE:!0,i:/[:\(\$"]/,c:[{bK:"extends implements"},e.UTM]},{bK:"namespace",e:";",i:/[\.']/,c:[e.UTM]},{bK:"use",e:";",c:[e.UTM]},{b:"=>"},t,a]}});
\ No newline at end of file
+hljs.registerLanguage("php",function(){"use strict";return function(e){var r={begin:"\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"},t={className:"meta",variants:[{begin:/<\?php/,relevance:10},{begin:/<\?[=]?/},{begin:/\?>/}]},a={className:"string",contains:[e.BACKSLASH_ESCAPE,t],variants:[{begin:'b"',end:'"'},{begin:"b'",end:"'"},e.inherit(e.APOS_STRING_MODE,{illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null})]},n={variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]},i={keyword:"__CLASS__ __DIR__ __FILE__ __FUNCTION__ __LINE__ __METHOD__ __NAMESPACE__ __TRAIT__ die echo exit include include_once print require require_once array abstract and as binary bool boolean break callable case catch class clone const continue declare default do double else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval extends final finally float for foreach from global goto if implements instanceof insteadof int integer interface isset iterable list new object or private protected public real return string switch throw trait try unset use var void while xor yield",literal:"false null true",built_in:"Error|0 AppendIterator ArgumentCountError ArithmeticError ArrayIterator ArrayObject AssertionError BadFunctionCallException BadMethodCallException CachingIterator CallbackFilterIterator CompileError Countable DirectoryIterator DivisionByZeroError DomainException EmptyIterator ErrorException Exception FilesystemIterator FilterIterator GlobIterator InfiniteIterator InvalidArgumentException IteratorIterator LengthException LimitIterator LogicException MultipleIterator NoRewindIterator OutOfBoundsException OutOfRangeException OuterIterator OverflowException ParentIterator ParseError RangeException RecursiveArrayIterator RecursiveCachingIterator RecursiveCallbackFilterIterator RecursiveDirectoryIterator RecursiveFilterIterator RecursiveIterator RecursiveIteratorIterator RecursiveRegexIterator RecursiveTreeIterator RegexIterator RuntimeException SeekableIterator SplDoublyLinkedList SplFileInfo SplFileObject SplFixedArray SplHeap SplMaxHeap SplMinHeap SplObjectStorage SplObserver SplObserver SplPriorityQueue SplQueue SplStack SplSubject SplSubject SplTempFileObject TypeError UnderflowException UnexpectedValueException ArrayAccess Closure Generator Iterator IteratorAggregate Serializable Throwable Traversable WeakReference Directory __PHP_Incomplete_Class parent php_user_filter self static stdClass"};return{aliases:["php","php3","php4","php5","php6","php7"],case_insensitive:!0,keywords:i,contains:[e.HASH_COMMENT_MODE,e.COMMENT("//","$",{contains:[t]}),e.COMMENT("/\\*","\\*/",{contains:[{className:"doctag",begin:"@[A-Za-z]+"}]}),e.COMMENT("__halt_compiler.+?;",!1,{endsWithParent:!0,keywords:"__halt_compiler"}),{className:"string",begin:/<<<['"]?\w+['"]?$/,end:/^\w+;?$/,contains:[e.BACKSLASH_ESCAPE,{className:"subst",variants:[{begin:/\$\w+/},{begin:/\{\$/,end:/\}/}]}]},t,{className:"keyword",begin:/\$this\b/},r,{begin:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{className:"function",beginKeywords:"fn function",end:/[;{]/,excludeEnd:!0,illegal:"[$%\\[]",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",begin:"\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0,keywords:i,contains:["self",r,e.C_BLOCK_COMMENT_MODE,a,n]}]},{className:"class",beginKeywords:"class interface",end:"{",excludeEnd:!0,illegal:/[:\(\$"]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"namespace",end:";",illegal:/[\.']/,contains:[e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"use",end:";",contains:[e.UNDERSCORE_TITLE_MODE]},{begin:"=>"},a,n]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/plaintext.min.js b/vendor/assets/javascripts/highlightjs/languages/plaintext.min.js
index 6b51b1c861..4eb6a8e5c8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/plaintext.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/plaintext.min.js
@@ -1 +1 @@
-hljs.registerLanguage("plaintext",function(e){return{disableAutodetect:!0}});
\ No newline at end of file
+hljs.registerLanguage("plaintext",function(){"use strict";return function(t){return{name:"Plain text",aliases:["text","txt"],disableAutodetect:!0}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/pony.min.js b/vendor/assets/javascripts/highlightjs/languages/pony.min.js
index 1dc12e97a1..a795161ba9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/pony.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/pony.min.js
@@ -1 +1 @@
-hljs.registerLanguage("pony",function(e){var r={keyword:"actor addressof and as be break class compile_error compile_intrinsicconsume continue delegate digestof do else elseif embed end errorfor fun if ifdef in interface is isnt lambda let match new not objector primitive recover repeat return struct then trait try type until use var where while with xor",meta:"iso val tag trn box ref",literal:"this false true"},t={cN:"string",b:'"""',e:'"""',r:10},c={cN:"string",b:'"',e:'"',c:[e.BE]},i={cN:"string",b:"'",e:"'",c:[e.BE],r:0},n={cN:"type",b:"\\b_?[A-Z][\\w]*",r:0},s={b:e.IR+"'",r:0},a={cN:"class",bK:"class actor object",e:"$",c:[e.TM,e.CLCM]},o={cN:"function",bK:"new fun",e:"=>",c:[e.TM,{b:/\(/,e:/\)/,c:[n,s,e.CNM,e.CBCM]},{b:/:/,eW:!0,c:[n]},e.CLCM]};return{k:r,c:[a,o,n,t,c,i,s,e.CNM,e.CLCM,e.CBCM]}});
\ No newline at end of file
+hljs.registerLanguage("pony",function(){"use strict";return function(e){return{name:"Pony",keywords:{keyword:"actor addressof and as be break class compile_error compile_intrinsic consume continue delegate digestof do else elseif embed end error for fun if ifdef in interface is isnt lambda let match new not object or primitive recover repeat return struct then trait try type until use var where while with xor",meta:"iso val tag trn box ref",literal:"this false true"},contains:[{className:"type",begin:"\\b_?[A-Z][\\w]*",relevance:0},{className:"string",begin:'"""',end:'"""',relevance:10},{className:"string",begin:'"',end:'"',contains:[e.BACKSLASH_ESCAPE]},{className:"string",begin:"'",end:"'",contains:[e.BACKSLASH_ESCAPE],relevance:0},{begin:e.IDENT_RE+"'",relevance:0},{className:"number",begin:"(-?)(\\b0[xX][a-fA-F0-9]+|\\b0[bB][01]+|(\\b\\d+(_\\d+)?(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",relevance:0},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/powershell.min.js b/vendor/assets/javascripts/highlightjs/languages/powershell.min.js
index d1b8efa83b..4893b16070 100644
--- a/vendor/assets/javascripts/highlightjs/languages/powershell.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/powershell.min.js
@@ -1 +1 @@
-hljs.registerLanguage("powershell",function(e){var t={b:"`[\\s\\S]",r:0},o={cN:"variable",v:[{b:/\$[\w\d][\w\d_:]*/}]},r={cN:"literal",b:/\$(null|true|false)\b/},n={cN:"string",v:[{b:/"/,e:/"/},{b:/@"/,e:/^"@/}],c:[t,o,{cN:"variable",b:/\$[A-z]/,e:/[^A-z]/}]},a={cN:"string",v:[{b:/'/,e:/'/},{b:/@'/,e:/^'@/}]},i={cN:"doctag",v:[{b:/\.(synopsis|description|example|inputs|outputs|notes|link|component|role|functionality)/},{b:/\.(parameter|forwardhelptargetname|forwardhelpcategory|remotehelprunspace|externalhelp)\s+\S+/}]},s=e.inherit(e.C(null,null),{v:[{b:/#/,e:/$/},{b:/<#/,e:/#>/}],c:[i]});return{aliases:["ps"],l:/-?[A-z\.\-]+/,cI:!0,k:{keyword:"if else foreach return function do while until elseif begin for trap data dynamicparam end break throw param continue finally in switch exit filter try process catch",built_in:"Add-Computer Add-Content Add-History Add-JobTrigger Add-Member Add-PSSnapin Add-Type Checkpoint-Computer Clear-Content Clear-EventLog Clear-History Clear-Host Clear-Item Clear-ItemProperty Clear-Variable Compare-Object Complete-Transaction Connect-PSSession Connect-WSMan Convert-Path ConvertFrom-Csv ConvertFrom-Json ConvertFrom-SecureString ConvertFrom-StringData ConvertTo-Csv ConvertTo-Html ConvertTo-Json ConvertTo-SecureString ConvertTo-Xml Copy-Item Copy-ItemProperty Debug-Process Disable-ComputerRestore Disable-JobTrigger Disable-PSBreakpoint Disable-PSRemoting Disable-PSSessionConfiguration Disable-WSManCredSSP Disconnect-PSSession Disconnect-WSMan Disable-ScheduledJob Enable-ComputerRestore Enable-JobTrigger Enable-PSBreakpoint Enable-PSRemoting Enable-PSSessionConfiguration Enable-ScheduledJob Enable-WSManCredSSP Enter-PSSession Exit-PSSession Export-Alias Export-Clixml Export-Console Export-Counter Export-Csv Export-FormatData Export-ModuleMember Export-PSSession ForEach-Object Format-Custom Format-List Format-Table Format-Wide Get-Acl Get-Alias Get-AuthenticodeSignature Get-ChildItem Get-Command Get-ComputerRestorePoint Get-Content Get-ControlPanelItem Get-Counter Get-Credential Get-Culture Get-Date Get-Event Get-EventLog Get-EventSubscriber Get-ExecutionPolicy Get-FormatData Get-Host Get-HotFix Get-Help Get-History Get-IseSnippet Get-Item Get-ItemProperty Get-Job Get-JobTrigger Get-Location Get-Member Get-Module Get-PfxCertificate Get-Process Get-PSBreakpoint Get-PSCallStack Get-PSDrive Get-PSProvider Get-PSSession Get-PSSessionConfiguration Get-PSSnapin Get-Random Get-ScheduledJob Get-ScheduledJobOption Get-Service Get-TraceSource Get-Transaction Get-TypeData Get-UICulture Get-Unique Get-Variable Get-Verb Get-WinEvent Get-WmiObject Get-WSManCredSSP Get-WSManInstance Group-Object Import-Alias Import-Clixml Import-Counter Import-Csv Import-IseSnippet Import-LocalizedData Import-PSSession Import-Module Invoke-AsWorkflow Invoke-Command Invoke-Expression Invoke-History Invoke-Item Invoke-RestMethod Invoke-WebRequest Invoke-WmiMethod Invoke-WSManAction Join-Path Limit-EventLog Measure-Command Measure-Object Move-Item Move-ItemProperty New-Alias New-Event New-EventLog New-IseSnippet New-Item New-ItemProperty New-JobTrigger New-Object New-Module New-ModuleManifest New-PSDrive New-PSSession New-PSSessionConfigurationFile New-PSSessionOption New-PSTransportOption New-PSWorkflowExecutionOption New-PSWorkflowSession New-ScheduledJobOption New-Service New-TimeSpan New-Variable New-WebServiceProxy New-WinEvent New-WSManInstance New-WSManSessionOption Out-Default Out-File Out-GridView Out-Host Out-Null Out-Printer Out-String Pop-Location Push-Location Read-Host Receive-Job Register-EngineEvent Register-ObjectEvent Register-PSSessionConfiguration Register-ScheduledJob Register-WmiEvent Remove-Computer Remove-Event Remove-EventLog Remove-Item Remove-ItemProperty Remove-Job Remove-JobTrigger Remove-Module Remove-PSBreakpoint Remove-PSDrive Remove-PSSession Remove-PSSnapin Remove-TypeData Remove-Variable Remove-WmiObject Remove-WSManInstance Rename-Computer Rename-Item Rename-ItemProperty Reset-ComputerMachinePassword Resolve-Path Restart-Computer Restart-Service Restore-Computer Resume-Job Resume-Service Save-Help Select-Object Select-String Select-Xml Send-MailMessage Set-Acl Set-Alias Set-AuthenticodeSignature Set-Content Set-Date Set-ExecutionPolicy Set-Item Set-ItemProperty Set-JobTrigger Set-Location Set-PSBreakpoint Set-PSDebug Set-PSSessionConfiguration Set-ScheduledJob Set-ScheduledJobOption Set-Service Set-StrictMode Set-TraceSource Set-Variable Set-WmiInstance Set-WSManInstance Set-WSManQuickConfig Show-Command Show-ControlPanelItem Show-EventLog Sort-Object Split-Path Start-Job Start-Process Start-Service Start-Sleep Start-Transaction Start-Transcript Stop-Computer Stop-Job Stop-Process Stop-Service Stop-Transcript Suspend-Job Suspend-Service Tee-Object Test-ComputerSecureChannel Test-Connection Test-ModuleManifest Test-Path Test-PSSessionConfigurationFile Trace-Command Unblock-File Undo-Transaction Unregister-Event Unregister-PSSessionConfiguration Unregister-ScheduledJob Update-FormatData Update-Help Update-List Update-TypeData Use-Transaction Wait-Event Wait-Job Wait-Process Where-Object Write-Debug Write-Error Write-EventLog Write-Host Write-Output Write-Progress Write-Verbose Write-Warning Add-MDTPersistentDrive Disable-MDTMonitorService Enable-MDTMonitorService Get-MDTDeploymentShareStatistics Get-MDTMonitorData Get-MDTOperatingSystemCatalog Get-MDTPersistentDrive Import-MDTApplication Import-MDTDriver Import-MDTOperatingSystem Import-MDTPackage Import-MDTTaskSequence New-MDTDatabase Remove-MDTMonitorData Remove-MDTPersistentDrive Restore-MDTPersistentDrive Set-MDTMonitorData Test-MDTDeploymentShare Test-MDTMonitorData Update-MDTDatabaseSchema Update-MDTDeploymentShare Update-MDTLinkedDS Update-MDTMedia Update-MDTMedia Add-VamtProductKey Export-VamtData Find-VamtManagedMachine Get-VamtConfirmationId Get-VamtProduct Get-VamtProductKey Import-VamtData Initialize-VamtData Install-VamtConfirmationId Install-VamtProductActivation Install-VamtProductKey Update-VamtProduct",nomarkup:"-ne -eq -lt -gt -ge -le -not -like -notlike -match -notmatch -contains -notcontains -in -notin -replace"},c:[t,e.NM,n,a,r,o,s]}});
\ No newline at end of file
+hljs.registerLanguage("powershell",function(){"use strict";return function(e){var n={$pattern:/-?[A-z\.\-]+\b/,keyword:"if else foreach return do while until elseif begin for trap data dynamicparam end break throw param continue finally in switch exit filter try process catch hidden static parameter",built_in:"ac asnp cat cd CFS chdir clc clear clhy cli clp cls clv cnsn compare copy cp cpi cpp curl cvpa dbp del diff dir dnsn ebp echo|0 epal epcsv epsn erase etsn exsn fc fhx fl ft fw gal gbp gc gcb gci gcm gcs gdr gerr ghy gi gin gjb gl gm gmo gp gps gpv group gsn gsnp gsv gtz gu gv gwmi h history icm iex ihy ii ipal ipcsv ipmo ipsn irm ise iwmi iwr kill lp ls man md measure mi mount move mp mv nal ndr ni nmo npssc nsn nv ogv oh popd ps pushd pwd r rbp rcjb rcsn rd rdr ren ri rjb rm rmdir rmo rni rnp rp rsn rsnp rujb rv rvpa rwmi sajb sal saps sasv sbp sc scb select set shcm si sl sleep sls sort sp spjb spps spsv start stz sujb sv swmi tee trcm type wget where wjb write"},s={begin:"`[\\s\\S]",relevance:0},i={className:"variable",variants:[{begin:/\$\B/},{className:"keyword",begin:/\$this/},{begin:/\$[\w\d][\w\d_:]*/}]},a={className:"string",variants:[{begin:/"/,end:/"/},{begin:/@"/,end:/^"@/}],contains:[s,i,{className:"variable",begin:/\$[A-z]/,end:/[^A-z]/}]},t={className:"string",variants:[{begin:/'/,end:/'/},{begin:/@'/,end:/^'@/}]},r=e.inherit(e.COMMENT(null,null),{variants:[{begin:/#/,end:/$/},{begin:/<#/,end:/#>/}],contains:[{className:"doctag",variants:[{begin:/\.(synopsis|description|example|inputs|outputs|notes|link|component|role|functionality)/},{begin:/\.(parameter|forwardhelptargetname|forwardhelpcategory|remotehelprunspace|externalhelp)\s+\S+/}]}]}),c={className:"class",beginKeywords:"class enum",end:/\s*[{]/,excludeEnd:!0,relevance:0,contains:[e.TITLE_MODE]},l={className:"function",begin:/function\s+/,end:/\s*\{|$/,excludeEnd:!0,returnBegin:!0,relevance:0,contains:[{begin:"function",relevance:0,className:"keyword"},{className:"title",begin:/\w[\w\d]*((-)[\w\d]+)*/,relevance:0},{begin:/\(/,end:/\)/,className:"params",relevance:0,contains:[i]}]},o={begin:/using\s/,end:/$/,returnBegin:!0,contains:[a,t,{className:"keyword",begin:/(using|assembly|command|module|namespace|type)/}]},p={className:"function",begin:/\[.*\]\s*[\w]+[ ]??\(/,end:/$/,returnBegin:!0,relevance:0,contains:[{className:"keyword",begin:"(".concat(n.keyword.toString().replace(/\s/g,"|"),")\\b"),endsParent:!0,relevance:0},e.inherit(e.TITLE_MODE,{endsParent:!0})]},g=[p,r,s,e.NUMBER_MODE,a,t,{className:"built_in",variants:[{begin:"(Add|Clear|Close|Copy|Enter|Exit|Find|Format|Get|Hide|Join|Lock|Move|New|Open|Optimize|Pop|Push|Redo|Remove|Rename|Reset|Resize|Search|Select|Set|Show|Skip|Split|Step|Switch|Undo|Unlock|Watch|Backup|Checkpoint|Compare|Compress|Convert|ConvertFrom|ConvertTo|Dismount|Edit|Expand|Export|Group|Import|Initialize|Limit|Merge|New|Out|Publish|Restore|Save|Sync|Unpublish|Update|Approve|Assert|Complete|Confirm|Deny|Disable|Enable|Install|Invoke|Register|Request|Restart|Resume|Start|Stop|Submit|Suspend|Uninstall|Unregister|Wait|Debug|Measure|Ping|Repair|Resolve|Test|Trace|Connect|Disconnect|Read|Receive|Send|Write|Block|Grant|Protect|Revoke|Unblock|Unprotect|Use|ForEach|Sort|Tee|Where)+(-)[\\w\\d]+"}]},i,{className:"literal",begin:/\$(null|true|false)\b/},{className:"selector-tag",begin:/\@\B/,relevance:0}],m={begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0,relevance:0,contains:[].concat("self",g,{begin:"(string|char|byte|int|long|bool|decimal|single|double|DateTime|xml|array|hashtable|void)",className:"built_in",relevance:0},{className:"type",begin:/[\.\w\d]+/,relevance:0})};return p.contains.unshift(m),{name:"PowerShell",aliases:["ps","ps1"],case_insensitive:!0,keywords:n,contains:g.concat(c,l,o,{variants:[{className:"operator",begin:"(-and|-as|-band|-bnot|-bor|-bxor|-casesensitive|-ccontains|-ceq|-cge|-cgt|-cle|-clike|-clt|-cmatch|-cne|-cnotcontains|-cnotlike|-cnotmatch|-contains|-creplace|-csplit|-eq|-exact|-f|-file|-ge|-gt|-icontains|-ieq|-ige|-igt|-ile|-ilike|-ilt|-imatch|-in|-ine|-inotcontains|-inotlike|-inotmatch|-ireplace|-is|-isnot|-isplit|-join|-le|-like|-lt|-match|-ne|-not|-notcontains|-notin|-notlike|-notmatch|-or|-regex|-replace|-shl|-shr|-split|-wildcard|-xor)\\b"},{className:"literal",begin:/(-)[\w\d]+/,relevance:0}]},m)}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/processing.min.js b/vendor/assets/javascripts/highlightjs/languages/processing.min.js
index ddd7bb1913..577ee7daf8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/processing.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/processing.min.js
@@ -1 +1 @@
-hljs.registerLanguage("processing",function(e){return{k:{keyword:"BufferedReader PVector PFont PImage PGraphics HashMap boolean byte char color double float int long String Array FloatDict FloatList IntDict IntList JSONArray JSONObject Object StringDict StringList Table TableRow XML false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private",literal:"P2D P3D HALF_PI PI QUARTER_PI TAU TWO_PI",title:"setup draw",built_in:"displayHeight displayWidth mouseY mouseX mousePressed pmouseX pmouseY key keyCode pixels focused frameCount frameRate height width size createGraphics beginDraw createShape loadShape PShape arc ellipse line point quad rect triangle bezier bezierDetail bezierPoint bezierTangent curve curveDetail curvePoint curveTangent curveTightness shape shapeMode beginContour beginShape bezierVertex curveVertex endContour endShape quadraticVertex vertex ellipseMode noSmooth rectMode smooth strokeCap strokeJoin strokeWeight mouseClicked mouseDragged mouseMoved mousePressed mouseReleased mouseWheel keyPressed keyPressedkeyReleased keyTyped print println save saveFrame day hour millis minute month second year background clear colorMode fill noFill noStroke stroke alpha blue brightness color green hue lerpColor red saturation modelX modelY modelZ screenX screenY screenZ ambient emissive shininess specular add createImage beginCamera camera endCamera frustum ortho perspective printCamera printProjection cursor frameRate noCursor exit loop noLoop popStyle pushStyle redraw binary boolean byte char float hex int str unbinary unhex join match matchAll nf nfc nfp nfs split splitTokens trim append arrayCopy concat expand reverse shorten sort splice subset box sphere sphereDetail createInput createReader loadBytes loadJSONArray loadJSONObject loadStrings loadTable loadXML open parseXML saveTable selectFolder selectInput beginRaw beginRecord createOutput createWriter endRaw endRecord PrintWritersaveBytes saveJSONArray saveJSONObject saveStream saveStrings saveXML selectOutput popMatrix printMatrix pushMatrix resetMatrix rotate rotateX rotateY rotateZ scale shearX shearY translate ambientLight directionalLight lightFalloff lights lightSpecular noLights normal pointLight spotLight image imageMode loadImage noTint requestImage tint texture textureMode textureWrap blend copy filter get loadPixels set updatePixels blendMode loadShader PShaderresetShader shader createFont loadFont text textFont textAlign textLeading textMode textSize textWidth textAscent textDescent abs ceil constrain dist exp floor lerp log mag map max min norm pow round sq sqrt acos asin atan atan2 cos degrees radians sin tan noise noiseDetail noiseSeed random randomGaussian randomSeed"},c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM]}});
\ No newline at end of file
+hljs.registerLanguage("processing",function(){"use strict";return function(e){return{name:"Processing",keywords:{keyword:"BufferedReader PVector PFont PImage PGraphics HashMap boolean byte char color double float int long String Array FloatDict FloatList IntDict IntList JSONArray JSONObject Object StringDict StringList Table TableRow XML false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private",literal:"P2D P3D HALF_PI PI QUARTER_PI TAU TWO_PI",title:"setup draw",built_in:"displayHeight displayWidth mouseY mouseX mousePressed pmouseX pmouseY key keyCode pixels focused frameCount frameRate height width size createGraphics beginDraw createShape loadShape PShape arc ellipse line point quad rect triangle bezier bezierDetail bezierPoint bezierTangent curve curveDetail curvePoint curveTangent curveTightness shape shapeMode beginContour beginShape bezierVertex curveVertex endContour endShape quadraticVertex vertex ellipseMode noSmooth rectMode smooth strokeCap strokeJoin strokeWeight mouseClicked mouseDragged mouseMoved mousePressed mouseReleased mouseWheel keyPressed keyPressedkeyReleased keyTyped print println save saveFrame day hour millis minute month second year background clear colorMode fill noFill noStroke stroke alpha blue brightness color green hue lerpColor red saturation modelX modelY modelZ screenX screenY screenZ ambient emissive shininess specular add createImage beginCamera camera endCamera frustum ortho perspective printCamera printProjection cursor frameRate noCursor exit loop noLoop popStyle pushStyle redraw binary boolean byte char float hex int str unbinary unhex join match matchAll nf nfc nfp nfs split splitTokens trim append arrayCopy concat expand reverse shorten sort splice subset box sphere sphereDetail createInput createReader loadBytes loadJSONArray loadJSONObject loadStrings loadTable loadXML open parseXML saveTable selectFolder selectInput beginRaw beginRecord createOutput createWriter endRaw endRecord PrintWritersaveBytes saveJSONArray saveJSONObject saveStream saveStrings saveXML selectOutput popMatrix printMatrix pushMatrix resetMatrix rotate rotateX rotateY rotateZ scale shearX shearY translate ambientLight directionalLight lightFalloff lights lightSpecular noLights normal pointLight spotLight image imageMode loadImage noTint requestImage tint texture textureMode textureWrap blend copy filter get loadPixels set updatePixels blendMode loadShader PShaderresetShader shader createFont loadFont text textFont textAlign textLeading textMode textSize textWidth textAscent textDescent abs ceil constrain dist exp floor lerp log mag map max min norm pow round sq sqrt acos asin atan atan2 cos degrees radians sin tan noise noiseDetail noiseSeed random randomGaussian randomSeed"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/profile.min.js b/vendor/assets/javascripts/highlightjs/languages/profile.min.js
index b6882324e7..94d6c5557e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/profile.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/profile.min.js
@@ -1 +1 @@
-hljs.registerLanguage("profile",function(e){return{c:[e.CNM,{b:"[a-zA-Z_][\\da-zA-Z_]+\\.[\\da-zA-Z_]{1,3}",e:":",eE:!0},{b:"(ncalls|tottime|cumtime)",e:"$",k:"ncalls tottime|10 cumtime|10 filename",r:10},{b:"function calls",e:"$",c:[e.CNM],r:10},e.ASM,e.QSM,{cN:"string",b:"\\(",e:"\\)$",eB:!0,eE:!0,r:0}]}});
\ No newline at end of file
+hljs.registerLanguage("profile",function(){"use strict";return function(e){return{name:"Python profiler",contains:[e.C_NUMBER_MODE,{begin:"[a-zA-Z_][\\da-zA-Z_]+\\.[\\da-zA-Z_]{1,3}",end:":",excludeEnd:!0},{begin:"(ncalls|tottime|cumtime)",end:"$",keywords:"ncalls tottime|10 cumtime|10 filename",relevance:10},{begin:"function calls",end:"$",contains:[e.C_NUMBER_MODE],relevance:10},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"string",begin:"\\(",end:"\\)$",excludeBegin:!0,excludeEnd:!0,relevance:0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/prolog.min.js b/vendor/assets/javascripts/highlightjs/languages/prolog.min.js
index ece562e606..0a06c993dd 100644
--- a/vendor/assets/javascripts/highlightjs/languages/prolog.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/prolog.min.js
@@ -1 +1 @@
-hljs.registerLanguage("prolog",function(c){var b={b:/[a-z][A-Za-z0-9_]*/,r:0},r={cN:"symbol",v:[{b:/[A-Z][a-zA-Z0-9_]*/},{b:/_[A-Za-z0-9_]*/}],r:0},e={b:/\(/,e:/\)/,r:0},n={b:/\[/,e:/\]/},a={cN:"comment",b:/%/,e:/$/,c:[c.PWM]},t={cN:"string",b:/`/,e:/`/,c:[c.BE]},g={cN:"string",b:/0\'(\\\'|.)/},s={cN:"string",b:/0\'\\s/},o={b:/:-/},N=[b,r,e,o,n,a,c.CBCM,c.QSM,c.ASM,t,g,s,c.CNM];return e.c=N,n.c=N,{c:N.concat([{b:/\.$/}])}});
\ No newline at end of file
+hljs.registerLanguage("prolog",function(){"use strict";return function(n){var e={begin:/\(/,end:/\)/,relevance:0},a={begin:/\[/,end:/\]/},s={className:"comment",begin:/%/,end:/$/,contains:[n.PHRASAL_WORDS_MODE]},i={className:"string",begin:/`/,end:/`/,contains:[n.BACKSLASH_ESCAPE]},c=[{begin:/[a-z][A-Za-z0-9_]*/,relevance:0},{className:"symbol",variants:[{begin:/[A-Z][a-zA-Z0-9_]*/},{begin:/_[A-Za-z0-9_]*/}],relevance:0},e,{begin:/:-/},a,s,n.C_BLOCK_COMMENT_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,i,{className:"string",begin:/0\'(\\\'|.)/},{className:"string",begin:/0\'\\s/},n.C_NUMBER_MODE];return e.contains=c,a.contains=c,{name:"Prolog",contains:c.concat([{begin:/\.$/}])}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/properties.min.js b/vendor/assets/javascripts/highlightjs/languages/properties.min.js
index b53e9bf390..16c77ffc26 100644
--- a/vendor/assets/javascripts/highlightjs/languages/properties.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/properties.min.js
@@ -1 +1 @@
-hljs.registerLanguage("properties",function(r){var t="[ \\t\\f]*",e="[ \\t\\f]+",s="("+t+"[:=]"+t+"|"+e+")",n="([^\\\\\\W:= \\t\\f\\n]|\\\\.)+",a="([^\\\\:= \\t\\f\\n]|\\\\.)+",c={e:s,r:0,starts:{cN:"string",e:/$/,r:0,c:[{b:"\\\\\\n"}]}};return{cI:!0,i:/\S/,c:[r.C("^\\s*[!#]","$"),{b:n+s,rB:!0,c:[{cN:"attr",b:n,endsParent:!0,r:0}],starts:c},{b:a+s,rB:!0,r:0,c:[{cN:"meta",b:a,endsParent:!0,r:0}],starts:c},{cN:"attr",r:0,b:a+t+"$"}]}});
\ No newline at end of file
+hljs.registerLanguage("properties",function(){"use strict";return function(e){var n="[ \\t\\f]*",t="("+n+"[:=]"+n+"|[ \\t\\f]+)",a="([^\\\\:= \\t\\f\\n]|\\\\.)+",s={end:t,relevance:0,starts:{className:"string",end:/$/,relevance:0,contains:[{begin:"\\\\\\n"}]}};return{name:".properties",case_insensitive:!0,illegal:/\S/,contains:[e.COMMENT("^\\s*[!#]","$"),{begin:"([^\\\\\\W:= \\t\\f\\n]|\\\\.)+"+t,returnBegin:!0,contains:[{className:"attr",begin:"([^\\\\\\W:= \\t\\f\\n]|\\\\.)+",endsParent:!0,relevance:0}],starts:s},{begin:a+t,returnBegin:!0,relevance:0,contains:[{className:"meta",begin:a,endsParent:!0,relevance:0}],starts:s},{className:"attr",relevance:0,begin:a+n+"$"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/protobuf.min.js b/vendor/assets/javascripts/highlightjs/languages/protobuf.min.js
index 74085a9dbd..1a569a17e6 100644
--- a/vendor/assets/javascripts/highlightjs/languages/protobuf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/protobuf.min.js
@@ -1 +1 @@
-hljs.registerLanguage("protobuf",function(e){return{k:{keyword:"package import option optional required repeated group oneof",built_in:"double float int32 int64 uint32 uint64 sint32 sint64 fixed32 fixed64 sfixed32 sfixed64 bool string bytes",literal:"true false"},c:[e.QSM,e.NM,e.CLCM,{cN:"class",bK:"message enum service",e:/\{/,i:/\n/,c:[e.inherit(e.TM,{starts:{eW:!0,eE:!0}})]},{cN:"function",bK:"rpc",e:/;/,eE:!0,k:"rpc returns"},{b:/^\s*[A-Z_]+/,e:/\s*=/,eE:!0}]}});
\ No newline at end of file
+hljs.registerLanguage("protobuf",function(){"use strict";return function(e){return{name:"Protocol Buffers",keywords:{keyword:"package import option optional required repeated group oneof",built_in:"double float int32 int64 uint32 uint64 sint32 sint64 fixed32 fixed64 sfixed32 sfixed64 bool string bytes",literal:"true false"},contains:[e.QUOTE_STRING_MODE,e.NUMBER_MODE,e.C_LINE_COMMENT_MODE,{className:"class",beginKeywords:"message enum service",end:/\{/,illegal:/\n/,contains:[e.inherit(e.TITLE_MODE,{starts:{endsWithParent:!0,excludeEnd:!0}})]},{className:"function",beginKeywords:"rpc",end:/[{;]/,excludeEnd:!0,keywords:"rpc returns"},{begin:/^\s*[A-Z_]+/,end:/\s*=/,excludeEnd:!0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/puppet.min.js b/vendor/assets/javascripts/highlightjs/languages/puppet.min.js
index 8b0987beaa..9f785f24b9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/puppet.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/puppet.min.js
@@ -1 +1 @@
-hljs.registerLanguage("puppet",function(e){var s={keyword:"and case default else elsif false if in import enherits node or true undef unless main settings $string ",literal:"alias audit before loglevel noop require subscribe tag owner ensure group mode name|0 changes context force incl lens load_path onlyif provider returns root show_diff type_check en_address ip_address realname command environment hour monute month monthday special target weekday creates cwd ogoutput refresh refreshonly tries try_sleep umask backup checksum content ctime force ignore links mtime purge recurse recurselimit replace selinux_ignore_defaults selrange selrole seltype seluser source souirce_permissions sourceselect validate_cmd validate_replacement allowdupe attribute_membership auth_membership forcelocal gid ia_load_module members system host_aliases ip allowed_trunk_vlans description device_url duplex encapsulation etherchannel native_vlan speed principals allow_root auth_class auth_type authenticate_user k_of_n mechanisms rule session_owner shared options device fstype enable hasrestart directory present absent link atboot blockdevice device dump pass remounts poller_tag use message withpath adminfile allow_virtual allowcdrom category configfiles flavor install_options instance package_settings platform responsefile status uninstall_options vendor unless_system_user unless_uid binary control flags hasstatus manifest pattern restart running start stop allowdupe auths expiry gid groups home iterations key_membership keys managehome membership password password_max_age password_min_age profile_membership profiles project purge_ssh_keys role_membership roles salt shell uid baseurl cost descr enabled enablegroups exclude failovermethod gpgcheck gpgkey http_caching include includepkgs keepalive metadata_expire metalink mirrorlist priority protect proxy proxy_password proxy_username repo_gpgcheck s3_enabled skip_if_unavailable sslcacert sslclientcert sslclientkey sslverify mounted",built_in:"architecture augeasversion blockdevices boardmanufacturer boardproductname boardserialnumber cfkey dhcp_servers domain ec2_ ec2_userdata facterversion filesystems ldom fqdn gid hardwareisa hardwaremodel hostname id|0 interfaces ipaddress ipaddress_ ipaddress6 ipaddress6_ iphostnumber is_virtual kernel kernelmajversion kernelrelease kernelversion kernelrelease kernelversion lsbdistcodename lsbdistdescription lsbdistid lsbdistrelease lsbmajdistrelease lsbminordistrelease lsbrelease macaddress macaddress_ macosx_buildversion macosx_productname macosx_productversion macosx_productverson_major macosx_productversion_minor manufacturer memoryfree memorysize netmask metmask_ network_ operatingsystem operatingsystemmajrelease operatingsystemrelease osfamily partitions path physicalprocessorcount processor processorcount productname ps puppetversion rubysitedir rubyversion selinux selinux_config_mode selinux_config_policy selinux_current_mode selinux_current_mode selinux_enforced selinux_policyversion serialnumber sp_ sshdsakey sshecdsakey sshrsakey swapencrypted swapfree swapsize timezone type uniqueid uptime uptime_days uptime_hours uptime_seconds uuid virtual vlans xendomains zfs_version zonenae zones zpool_version"},r=e.C("#","$"),a="([A-Za-z_]|::)(\\w|::)*",i=e.inherit(e.TM,{b:a}),o={cN:"variable",b:"\\$"+a},t={cN:"string",c:[e.BE,o],v:[{b:/'/,e:/'/},{b:/"/,e:/"/}]};return{aliases:["pp"],c:[r,o,t,{bK:"class",e:"\\{|;",i:/=/,c:[i,r]},{bK:"define",e:/\{/,c:[{cN:"section",b:e.IR,endsParent:!0}]},{b:e.IR+"\\s+\\{",rB:!0,e:/\S/,c:[{cN:"keyword",b:e.IR},{b:/\{/,e:/\}/,k:s,r:0,c:[t,r,{b:"[a-zA-Z_]+\\s*=>",rB:!0,e:"=>",c:[{cN:"attr",b:e.IR}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},o]}],r:0}]}});
\ No newline at end of file
+hljs.registerLanguage("puppet",function(){"use strict";return function(e){var s=e.COMMENT("#","$"),r=e.inherit(e.TITLE_MODE,{begin:"([A-Za-z_]|::)(\\w|::)*"}),a={className:"variable",begin:"\\$([A-Za-z_]|::)(\\w|::)*"},n={className:"string",contains:[e.BACKSLASH_ESCAPE,a],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/}]};return{name:"Puppet",aliases:["pp"],contains:[s,a,n,{beginKeywords:"class",end:"\\{|;",illegal:/=/,contains:[r,s]},{beginKeywords:"define",end:/\{/,contains:[{className:"section",begin:e.IDENT_RE,endsParent:!0}]},{begin:e.IDENT_RE+"\\s+\\{",returnBegin:!0,end:/\S/,contains:[{className:"keyword",begin:e.IDENT_RE},{begin:/\{/,end:/\}/,keywords:{keyword:"and case default else elsif false if in import enherits node or true undef unless main settings $string ",literal:"alias audit before loglevel noop require subscribe tag owner ensure group mode name|0 changes context force incl lens load_path onlyif provider returns root show_diff type_check en_address ip_address realname command environment hour monute month monthday special target weekday creates cwd ogoutput refresh refreshonly tries try_sleep umask backup checksum content ctime force ignore links mtime purge recurse recurselimit replace selinux_ignore_defaults selrange selrole seltype seluser source souirce_permissions sourceselect validate_cmd validate_replacement allowdupe attribute_membership auth_membership forcelocal gid ia_load_module members system host_aliases ip allowed_trunk_vlans description device_url duplex encapsulation etherchannel native_vlan speed principals allow_root auth_class auth_type authenticate_user k_of_n mechanisms rule session_owner shared options device fstype enable hasrestart directory present absent link atboot blockdevice device dump pass remounts poller_tag use message withpath adminfile allow_virtual allowcdrom category configfiles flavor install_options instance package_settings platform responsefile status uninstall_options vendor unless_system_user unless_uid binary control flags hasstatus manifest pattern restart running start stop allowdupe auths expiry gid groups home iterations key_membership keys managehome membership password password_max_age password_min_age profile_membership profiles project purge_ssh_keys role_membership roles salt shell uid baseurl cost descr enabled enablegroups exclude failovermethod gpgcheck gpgkey http_caching include includepkgs keepalive metadata_expire metalink mirrorlist priority protect proxy proxy_password proxy_username repo_gpgcheck s3_enabled skip_if_unavailable sslcacert sslclientcert sslclientkey sslverify mounted",built_in:"architecture augeasversion blockdevices boardmanufacturer boardproductname boardserialnumber cfkey dhcp_servers domain ec2_ ec2_userdata facterversion filesystems ldom fqdn gid hardwareisa hardwaremodel hostname id|0 interfaces ipaddress ipaddress_ ipaddress6 ipaddress6_ iphostnumber is_virtual kernel kernelmajversion kernelrelease kernelversion kernelrelease kernelversion lsbdistcodename lsbdistdescription lsbdistid lsbdistrelease lsbmajdistrelease lsbminordistrelease lsbrelease macaddress macaddress_ macosx_buildversion macosx_productname macosx_productversion macosx_productverson_major macosx_productversion_minor manufacturer memoryfree memorysize netmask metmask_ network_ operatingsystem operatingsystemmajrelease operatingsystemrelease osfamily partitions path physicalprocessorcount processor processorcount productname ps puppetversion rubysitedir rubyversion selinux selinux_config_mode selinux_config_policy selinux_current_mode selinux_current_mode selinux_enforced selinux_policyversion serialnumber sp_ sshdsakey sshecdsakey sshrsakey swapencrypted swapfree swapsize timezone type uniqueid uptime uptime_days uptime_hours uptime_seconds uuid virtual vlans xendomains zfs_version zonenae zones zpool_version"},relevance:0,contains:[n,s,{begin:"[a-zA-Z_]+\\s*=>",returnBegin:!0,end:"=>",contains:[{className:"attr",begin:e.IDENT_RE}]},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},a]}],relevance:0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/purebasic.min.js b/vendor/assets/javascripts/highlightjs/languages/purebasic.min.js
index 41bef569f2..5faaa2116a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/purebasic.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/purebasic.min.js
@@ -1 +1 @@
-hljs.registerLanguage("purebasic",function(e){var r={cN:"string",b:'(~)?"',e:'"',i:"\\n"},t={cN:"symbol",b:"#[a-zA-Z_]\\w*\\$?"};return{aliases:["pb","pbi"],k:"And As Break CallDebugger Case CompilerCase CompilerDefault CompilerElse CompilerEndIf CompilerEndSelect CompilerError CompilerIf CompilerSelect Continue Data DataSection EndDataSection Debug DebugLevel Default Define Dim DisableASM DisableDebugger DisableExplicit Else ElseIf EnableASM EnableDebugger EnableExplicit End EndEnumeration EndIf EndImport EndInterface EndMacro EndProcedure EndSelect EndStructure EndStructureUnion EndWith Enumeration Extends FakeReturn For Next ForEach ForEver Global Gosub Goto If Import ImportC IncludeBinary IncludeFile IncludePath Interface Macro NewList Not Or ProcedureReturn Protected Prototype PrototypeC Read ReDim Repeat Until Restore Return Select Shared Static Step Structure StructureUnion Swap To Wend While With XIncludeFile XOr Procedure ProcedureC ProcedureCDLL ProcedureDLL Declare DeclareC DeclareCDLL DeclareDLL",c:[e.C(";","$",{r:0}),{cN:"function",b:"\\b(Procedure|Declare)(C|CDLL|DLL)?\\b",e:"\\(",eE:!0,rB:!0,c:[{cN:"keyword",b:"(Procedure|Declare)(C|CDLL|DLL)?",eE:!0},{cN:"type",b:"\\.\\w*"},e.UTM]},r,t]}});
\ No newline at end of file
+hljs.registerLanguage("purebasic",function(){"use strict";return function(e){return{name:"PureBASIC",aliases:["pb","pbi"],keywords:"Align And Array As Break CallDebugger Case CompilerCase CompilerDefault CompilerElse CompilerElseIf CompilerEndIf CompilerEndSelect CompilerError CompilerIf CompilerSelect CompilerWarning Continue Data DataSection Debug DebugLevel Declare DeclareC DeclareCDLL DeclareDLL DeclareModule Default Define Dim DisableASM DisableDebugger DisableExplicit Else ElseIf EnableASM EnableDebugger EnableExplicit End EndDataSection EndDeclareModule EndEnumeration EndIf EndImport EndInterface EndMacro EndModule EndProcedure EndSelect EndStructure EndStructureUnion EndWith Enumeration EnumerationBinary Extends FakeReturn For ForEach ForEver Global Gosub Goto If Import ImportC IncludeBinary IncludeFile IncludePath Interface List Macro MacroExpandedCount Map Module NewList NewMap Next Not Or Procedure ProcedureC ProcedureCDLL ProcedureDLL ProcedureReturn Protected Prototype PrototypeC ReDim Read Repeat Restore Return Runtime Select Shared Static Step Structure StructureUnion Swap Threaded To UndefineMacro Until Until  UnuseModule UseModule Wend While With XIncludeFile XOr",contains:[e.COMMENT(";","$",{relevance:0}),{className:"function",begin:"\\b(Procedure|Declare)(C|CDLL|DLL)?\\b",end:"\\(",excludeEnd:!0,returnBegin:!0,contains:[{className:"keyword",begin:"(Procedure|Declare)(C|CDLL|DLL)?",excludeEnd:!0},{className:"type",begin:"\\.\\w*"},e.UNDERSCORE_TITLE_MODE]},{className:"string",begin:'(~)?"',end:'"',illegal:"\\n"},{className:"symbol",begin:"#[a-zA-Z_]\\w*\\$?"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/python-repl.min.js b/vendor/assets/javascripts/highlightjs/languages/python-repl.min.js
new file mode 100644
index 0000000000..3b6ef2323c
--- /dev/null
+++ b/vendor/assets/javascripts/highlightjs/languages/python-repl.min.js
@@ -0,0 +1 @@
+hljs.registerLanguage("python-repl",function(){"use strict";return function(n){return{aliases:["pycon"],contains:[{className:"meta",starts:{end:/ |$/,starts:{end:"$",subLanguage:"python"}},variants:[{begin:/^>>>(?=[ ]|$)/},{begin:/^\.\.\.(?=[ ]|$)/}]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/python.min.js b/vendor/assets/javascripts/highlightjs/languages/python.min.js
index 6c72090d5c..c74071fa2f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/python.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/python.min.js
@@ -1 +1 @@
-hljs.registerLanguage("python",function(e){var r={keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10 None True False",built_in:"Ellipsis NotImplemented"},b={cN:"meta",b:/^(>>>|\.\.\.) /},c={cN:"subst",b:/\{/,e:/\}/,k:r,i:/#/},a={cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,c:[e.BE,b],r:10},{b:/(u|b)?r?"""/,e:/"""/,c:[e.BE,b],r:10},{b:/(fr|rf|f)'''/,e:/'''/,c:[e.BE,b,c]},{b:/(fr|rf|f)"""/,e:/"""/,c:[e.BE,b,c]},{b:/(u|r|ur)'/,e:/'/,r:10},{b:/(u|r|ur)"/,e:/"/,r:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},{b:/(fr|rf|f)'/,e:/'/,c:[e.BE,c]},{b:/(fr|rf|f)"/,e:/"/,c:[e.BE,c]},e.ASM,e.QSM]},i={cN:"number",r:0,v:[{b:e.BNR+"[lLjJ]?"},{b:"\\b(0o[0-7]+)[lLjJ]?"},{b:e.CNR+"[lLjJ]?"}]},n={cN:"params",b:/\(/,e:/\)/,c:["self",b,i,a]};return c.c=[a,i,b],{aliases:["py","gyp","ipython"],k:r,i:/(<\/|->|\?)|=>/,c:[b,i,a,e.HCM,{v:[{cN:"function",bK:"def"},{cN:"class",bK:"class"}],e:/:/,i:/[${=;\n,]/,c:[e.UTM,n,{b:/->/,eW:!0,k:"None"}]},{cN:"meta",b:/^[\t ]*@/,e:/$/},{b:/\b(print|exec)\(/}]}});
\ No newline at end of file
+hljs.registerLanguage("python",function(){"use strict";return function(e){var n={keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10",built_in:"Ellipsis NotImplemented",literal:"False None True"},a={className:"meta",begin:/^(>>>|\.\.\.) /},i={className:"subst",begin:/\{/,end:/\}/,keywords:n,illegal:/#/},s={begin:/\{\{/,relevance:0},r={className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:/(u|b)?r?'''/,end:/'''/,contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{begin:/(u|b)?r?"""/,end:/"""/,contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{begin:/(fr|rf|f)'''/,end:/'''/,contains:[e.BACKSLASH_ESCAPE,a,s,i]},{begin:/(fr|rf|f)"""/,end:/"""/,contains:[e.BACKSLASH_ESCAPE,a,s,i]},{begin:/(u|r|ur)'/,end:/'/,relevance:10},{begin:/(u|r|ur)"/,end:/"/,relevance:10},{begin:/(b|br)'/,end:/'/},{begin:/(b|br)"/,end:/"/},{begin:/(fr|rf|f)'/,end:/'/,contains:[e.BACKSLASH_ESCAPE,s,i]},{begin:/(fr|rf|f)"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,i]},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},l={className:"number",relevance:0,variants:[{begin:e.BINARY_NUMBER_RE+"[lLjJ]?"},{begin:"\\b(0o[0-7]+)[lLjJ]?"},{begin:e.C_NUMBER_RE+"[lLjJ]?"}]},t={className:"params",variants:[{begin:/\(\s*\)/,skip:!0,className:null},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:["self",a,l,r,e.HASH_COMMENT_MODE]}]};return i.contains=[r,l,a],{name:"Python",aliases:["py","gyp","ipython"],keywords:n,illegal:/(<\/|->|\?)|=>/,contains:[a,l,{beginKeywords:"if",relevance:0},r,e.HASH_COMMENT_MODE,{variants:[{className:"function",beginKeywords:"def"},{className:"class",beginKeywords:"class"}],end:/:/,illegal:/[${=;\n,]/,contains:[e.UNDERSCORE_TITLE_MODE,t,{begin:/->/,endsWithParent:!0,keywords:"None"}]},{className:"meta",begin:/^[\t ]*@/,end:/$/},{begin:/\b(print|exec)\(/}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/q.min.js b/vendor/assets/javascripts/highlightjs/languages/q.min.js
index f6b87d9f84..94da55353e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/q.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/q.min.js
@@ -1 +1 @@
-hljs.registerLanguage("q",function(e){var s={keyword:"do while select delete by update from",literal:"0b 1b",built_in:"neg not null string reciprocal floor ceiling signum mod xbar xlog and or each scan over prior mmu lsq inv md5 ltime gtime count first var dev med cov cor all any rand sums prds mins maxs fills deltas ratios avgs differ prev next rank reverse iasc idesc asc desc msum mcount mavg mdev xrank mmin mmax xprev rotate distinct group where flip type key til get value attr cut set upsert raze union inter except cross sv vs sublist enlist read0 read1 hopen hclose hdel hsym hcount peach system ltrim rtrim trim lower upper ssr view tables views cols xcols keys xkey xcol xasc xdesc fkeys meta lj aj aj0 ij pj asof uj ww wj wj1 fby xgroup ungroup ej save load rsave rload show csv parse eval min max avg wavg wsum sin cos tan sum",type:"`float `double int `timestamp `timespan `datetime `time `boolean `symbol `char `byte `short `long `real `month `date `minute `second `guid"};return{aliases:["k","kdb"],k:s,l:/(`?)[A-Za-z0-9_]+\b/,c:[e.CLCM,e.QSM,e.CNM]}});
\ No newline at end of file
+hljs.registerLanguage("q",function(){"use strict";return function(e){return{name:"Q",aliases:["k","kdb"],keywords:{$pattern:/(`?)[A-Za-z0-9_]+\b/,keyword:"do while select delete by update from",literal:"0b 1b",built_in:"neg not null string reciprocal floor ceiling signum mod xbar xlog and or each scan over prior mmu lsq inv md5 ltime gtime count first var dev med cov cor all any rand sums prds mins maxs fills deltas ratios avgs differ prev next rank reverse iasc idesc asc desc msum mcount mavg mdev xrank mmin mmax xprev rotate distinct group where flip type key til get value attr cut set upsert raze union inter except cross sv vs sublist enlist read0 read1 hopen hclose hdel hsym hcount peach system ltrim rtrim trim lower upper ssr view tables views cols xcols keys xkey xcol xasc xdesc fkeys meta lj aj aj0 ij pj asof uj ww wj wj1 fby xgroup ungroup ej save load rsave rload show csv parse eval min max avg wavg wsum sin cos tan sum",type:"`float `double int `timestamp `timespan `datetime `time `boolean `symbol `char `byte `short `long `real `month `date `minute `second `guid"},contains:[e.C_LINE_COMMENT_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/qml.min.js b/vendor/assets/javascripts/highlightjs/languages/qml.min.js
index 01d36c1343..de27c0b92f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/qml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/qml.min.js
@@ -1 +1 @@
-hljs.registerLanguage("qml",function(r){var e={keyword:"in of on if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await import",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Behavior bool color coordinate date double enumeration font geocircle georectangle geoshape int list matrix4x4 parent point quaternion real rect size string url variant vector2d vector3d vector4dPromise"},t="[a-zA-Z_][a-zA-Z0-9\\._]*",a={cN:"keyword",b:"\\bproperty\\b",starts:{cN:"string",e:"(:|=|;|,|//|/\\*|$)",rE:!0}},n={cN:"keyword",b:"\\bsignal\\b",starts:{cN:"string",e:"(\\(|:|=|;|,|//|/\\*|$)",rE:!0}},o={cN:"attribute",b:"\\bid\\s*:",starts:{cN:"string",e:t,rE:!1}},i={b:t+"\\s*:",rB:!0,c:[{cN:"attribute",b:t,e:"\\s*:",eE:!0,r:0}],r:0},c={b:t+"\\s*{",e:"{",rB:!0,r:0,c:[r.inherit(r.TM,{b:t})]};return{aliases:["qt"],cI:!1,k:e,c:[{cN:"meta",b:/^\s*['"]use (strict|asm)['"]/},r.ASM,r.QSM,{cN:"string",b:"`",e:"`",c:[r.BE,{cN:"subst",b:"\\$\\{",e:"\\}"}]},r.CLCM,r.CBCM,{cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:r.CNR}],r:0},{b:"("+r.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[r.CLCM,r.CBCM,r.RM,{b:/</,e:/>\s*[);\]]/,r:0,sL:"xml"}],r:0},n,a,{cN:"function",bK:"function",e:/\{/,eE:!0,c:[r.inherit(r.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:[r.CLCM,r.CBCM]}],i:/\[|%/},{b:"\\."+r.IR,r:0},o,i,c],i:/#/}});
\ No newline at end of file
+hljs.registerLanguage("qml",function(){"use strict";return function(e){var n="[a-zA-Z_][a-zA-Z0-9\\._]*",r={className:"attribute",begin:"\\bid\\s*:",starts:{className:"string",end:n,returnEnd:!1}},a={begin:n+"\\s*:",returnBegin:!0,contains:[{className:"attribute",begin:n,end:"\\s*:",excludeEnd:!0,relevance:0}],relevance:0},t={begin:n+"\\s*{",end:"{",returnBegin:!0,relevance:0,contains:[e.inherit(e.TITLE_MODE,{begin:n})]};return{name:"QML",aliases:["qt"],case_insensitive:!1,keywords:{keyword:"in of on if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await import",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Behavior bool color coordinate date double enumeration font geocircle georectangle geoshape int list matrix4x4 parent point quaternion real rect size string url variant vector2d vector3d vector4d Promise"},contains:[{className:"meta",begin:/^\s*['"]use (strict|asm)['"]/},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"string",begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE,{className:"subst",begin:"\\$\\{",end:"\\}"}]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"number",variants:[{begin:"\\b(0[bB][01]+)"},{begin:"\\b(0[oO][0-7]+)"},{begin:e.C_NUMBER_RE}],relevance:0},{begin:"("+e.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",keywords:"return throw case",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.REGEXP_MODE,{begin:/</,end:/>\s*[);\]]/,relevance:0,subLanguage:"xml"}],relevance:0},{className:"keyword",begin:"\\bsignal\\b",starts:{className:"string",end:"(\\(|:|=|;|,|//|/\\*|$)",returnEnd:!0}},{className:"keyword",begin:"\\bproperty\\b",starts:{className:"string",end:"(:|=|;|,|//|/\\*|$)",returnEnd:!0}},{className:"function",beginKeywords:"function",end:/\{/,excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][0-9A-Za-z$_]*/}),{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]}],illegal:/\[|%/},{begin:"\\."+e.IDENT_RE,relevance:0},r,a,t],illegal:/#/}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/r.min.js b/vendor/assets/javascripts/highlightjs/languages/r.min.js
index bdbaaa1e46..fbf4dc2861 100644
--- a/vendor/assets/javascripts/highlightjs/languages/r.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/r.min.js
@@ -1 +1 @@
-hljs.registerLanguage("r",function(e){var r="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";return{c:[e.HCM,{b:r,l:r,k:{keyword:"function if in break next repeat else for return switch while try tryCatch stop warning require library attach detach source setMethod setGeneric setGroupGeneric setClass ...",literal:"NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10"},r:0},{cN:"number",b:"0[xX][0-9a-fA-F]+[Li]?\\b",r:0},{cN:"number",b:"\\d+(?:[eE][+\\-]?\\d*)?L\\b",r:0},{cN:"number",b:"\\d+\\.(?!\\d)(?:i\\b)?",r:0},{cN:"number",b:"\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d*)?i?\\b",r:0},{cN:"number",b:"\\.\\d+(?:[eE][+\\-]?\\d*)?i?\\b",r:0},{b:"`",e:"`",r:0},{cN:"string",c:[e.BE],v:[{b:'"',e:'"'},{b:"'",e:"'"}]}]}});
\ No newline at end of file
+hljs.registerLanguage("r",function(){"use strict";return function(e){var n="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";return{name:"R",contains:[e.HASH_COMMENT_MODE,{begin:n,keywords:{$pattern:n,keyword:"function if in break next repeat else for return switch while try tryCatch stop warning require library attach detach source setMethod setGeneric setGroupGeneric setClass ...",literal:"NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10"},relevance:0},{className:"number",begin:"0[xX][0-9a-fA-F]+[Li]?\\b",relevance:0},{className:"number",begin:"\\d+(?:[eE][+\\-]?\\d*)?L\\b",relevance:0},{className:"number",begin:"\\d+\\.(?!\\d)(?:i\\b)?",relevance:0},{className:"number",begin:"\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{className:"number",begin:"\\.\\d+(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{begin:"`",end:"`",relevance:0},{className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:'"',end:'"'},{begin:"'",end:"'"}]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/reasonml.min.js b/vendor/assets/javascripts/highlightjs/languages/reasonml.min.js
index 8259d79abf..7ca98fe16a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/reasonml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/reasonml.min.js
@@ -1 +1 @@
-hljs.registerLanguage("reasonml",function(r){function e(r){return r.map(function(r){return r.split("").map(function(r){return"\\"+r}).join("")}).join("|")}var n="~?[a-z$_][0-9a-zA-Z$_]*",t="`?[A-Z$_][0-9a-zA-Z$_]*",c="'?[a-z$_][0-9a-z$_]*",i="s*:s*[a-z$_][0-9a-z$_]*((s*("+c+"s*(,"+c+")*)?s*))?",a=n+"("+i+")?("+i+")?",s="("+e(["||","&&","++","**","+.","*","/","*.","/.","...","|>"])+"|==|===)",o="\\s+"+s+"\\s+",b={keyword:"and as asr assert begin class constraint do done downto else end exception externalfor fun function functor if in include inherit initializerland lazy let lor lsl lsr lxor match method mod module mutable new nonrecobject of open or private rec sig struct then to try type val virtual when while with",built_in:"array bool bytes char exn|5 float int int32 int64 list lazy_t|5 nativeint|5 ref string unit ",literal:"true false"},l="\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",u={cN:"number",r:0,v:[{b:l},{b:"\\(\\-"+l+"\\)"}]},N={cN:"operator",r:0,b:s},d=[{cN:"identifier",r:0,b:n},N,u],f=[r.QSM,N,{cN:"module",b:"\\b"+t,rB:!0,e:".",c:[{cN:"identifier",b:t,r:0}]}],m=[{cN:"module",b:"\\b"+t,rB:!0,e:".",r:0,c:[{cN:"identifier",b:t,r:0}]}],p={b:n,e:"(,|\\n|\\))",r:0,c:[N,{cN:"typing",b:":",e:"(,|\\n)",rB:!0,r:0,c:m}]},_={cN:"function",r:0,k:b,v:[{b:"\\s(\\(\\.?.*?\\)|"+n+")\\s*=>",e:"\\s*=>",rB:!0,r:0,c:[{cN:"params",v:[{b:n},{b:a},{b:/\(\s*\)/}]}]},{b:"\\s\\(\\.?[^;\\|]*\\)\\s*=>",e:"\\s=>",rB:!0,r:0,c:[{cN:"params",r:0,v:[p]}]},{b:"\\(\\.\\s"+n+"\\)\\s*=>"}]};f.push(_);var h={cN:"constructor",b:t+"\\(",e:"\\)",i:"\\n",k:b,c:[r.QSM,N,{cN:"params",b:"\\b"+n}]},v={cN:"pattern-match",b:"\\|",rB:!0,k:b,e:"=>",r:0,c:[h,N,{r:0,cN:"constructor",b:t}]},z={cN:"module-access",k:b,rB:!0,v:[{b:"\\b("+t+"\\.)+"+n},{b:"\\b("+t+"\\.)+\\(",e:"\\)",rB:!0,c:[_,{b:"\\(",e:"\\)",skip:!0}].concat(f)},{b:"\\b("+t+"\\.)+{",e:"}"}],c:f};return m.push(z),{aliases:["re"],k:b,i:"(:\\-|:=|\\${|\\+=)",c:[r.C("/\\*","\\*/",{i:"^(\\#,\\/\\/)"}),{cN:"character",b:"'(\\\\[^']+|[^'])'",i:"\\n",r:0},r.QSM,{cN:"literal",b:"\\(\\)",r:0},{cN:"literal",b:"\\[\\|",e:"\\|\\]",r:0,c:d},{cN:"literal",b:"\\[",e:"\\]",r:0,c:d},h,{cN:"operator",b:o,i:"\\-\\->",r:0},u,r.CLCM,v,_,{cN:"module-def",b:"\\bmodule\\s+"+n+"\\s+"+t+"\\s+=\\s+{",e:"}",rB:!0,k:b,r:0,c:[{cN:"module",r:0,b:t},{b:"{",e:"}",skip:!0}].concat(f)},z]}});
\ No newline at end of file
+hljs.registerLanguage("reasonml",function(){"use strict";return function(e){var n="~?[a-z$_][0-9a-zA-Z$_]*",a="`?[A-Z$_][0-9a-zA-Z$_]*",s="("+["||","&&","++","**","+.","*","/","*.","/.","...","|>"].map((function(e){return e.split("").map((function(e){return"\\"+e})).join("")})).join("|")+"|==|===)",i="\\s+"+s+"\\s+",r={keyword:"and as asr assert begin class constraint do done downto else end exception external for fun function functor if in include inherit initializer land lazy let lor lsl lsr lxor match method mod module mutable new nonrec object of open or private rec sig struct then to try type val virtual when while with",built_in:"array bool bytes char exn|5 float int int32 int64 list lazy_t|5 nativeint|5 ref string unit ",literal:"true false"},l="\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",t={className:"number",relevance:0,variants:[{begin:l},{begin:"\\(\\-"+l+"\\)"}]},c={className:"operator",relevance:0,begin:s},o=[{className:"identifier",relevance:0,begin:n},c,t],g=[e.QUOTE_STRING_MODE,c,{className:"module",begin:"\\b"+a,returnBegin:!0,end:".",contains:[{className:"identifier",begin:a,relevance:0}]}],b=[{className:"module",begin:"\\b"+a,returnBegin:!0,end:".",relevance:0,contains:[{className:"identifier",begin:a,relevance:0}]}],m={className:"function",relevance:0,keywords:r,variants:[{begin:"\\s(\\(\\.?.*?\\)|"+n+")\\s*=>",end:"\\s*=>",returnBegin:!0,relevance:0,contains:[{className:"params",variants:[{begin:n},{begin:"~?[a-z$_][0-9a-zA-Z$_]*(s*:s*[a-z$_][0-9a-z$_]*((s*('?[a-z$_][0-9a-z$_]*s*(,'?[a-z$_][0-9a-z$_]*)*)?s*))?)?(s*:s*[a-z$_][0-9a-z$_]*((s*('?[a-z$_][0-9a-z$_]*s*(,'?[a-z$_][0-9a-z$_]*)*)?s*))?)?"},{begin:/\(\s*\)/}]}]},{begin:"\\s\\(\\.?[^;\\|]*\\)\\s*=>",end:"\\s=>",returnBegin:!0,relevance:0,contains:[{className:"params",relevance:0,variants:[{begin:n,end:"(,|\\n|\\))",relevance:0,contains:[c,{className:"typing",begin:":",end:"(,|\\n)",returnBegin:!0,relevance:0,contains:b}]}]}]},{begin:"\\(\\.\\s"+n+"\\)\\s*=>"}]};g.push(m);var d={className:"constructor",begin:a+"\\(",end:"\\)",illegal:"\\n",keywords:r,contains:[e.QUOTE_STRING_MODE,c,{className:"params",begin:"\\b"+n}]},u={className:"pattern-match",begin:"\\|",returnBegin:!0,keywords:r,end:"=>",relevance:0,contains:[d,c,{relevance:0,className:"constructor",begin:a}]},_={className:"module-access",keywords:r,returnBegin:!0,variants:[{begin:"\\b("+a+"\\.)+"+n},{begin:"\\b("+a+"\\.)+\\(",end:"\\)",returnBegin:!0,contains:[m,{begin:"\\(",end:"\\)",skip:!0}].concat(g)},{begin:"\\b("+a+"\\.)+{",end:"}"}],contains:g};return b.push(_),{name:"ReasonML",aliases:["re"],keywords:r,illegal:"(:\\-|:=|\\${|\\+=)",contains:[e.COMMENT("/\\*","\\*/",{illegal:"^(\\#,\\/\\/)"}),{className:"character",begin:"'(\\\\[^']+|[^'])'",illegal:"\\n",relevance:0},e.QUOTE_STRING_MODE,{className:"literal",begin:"\\(\\)",relevance:0},{className:"literal",begin:"\\[\\|",end:"\\|\\]",relevance:0,contains:o},{className:"literal",begin:"\\[",end:"\\]",relevance:0,contains:o},d,{className:"operator",begin:i,illegal:"\\-\\->",relevance:0},t,e.C_LINE_COMMENT_MODE,u,m,{className:"module-def",begin:"\\bmodule\\s+"+n+"\\s+"+a+"\\s+=\\s+{",end:"}",returnBegin:!0,keywords:r,relevance:0,contains:[{className:"module",relevance:0,begin:a},{begin:"{",end:"}",skip:!0}].concat(g)},_]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/rib.min.js b/vendor/assets/javascripts/highlightjs/languages/rib.min.js
index e79ffce7ad..c4b62d6e67 100644
--- a/vendor/assets/javascripts/highlightjs/languages/rib.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/rib.min.js
@@ -1 +1 @@
-hljs.registerLanguage("rib",function(e){return{k:"ArchiveRecord AreaLightSource Atmosphere Attribute AttributeBegin AttributeEnd Basis Begin Blobby Bound Clipping ClippingPlane Color ColorSamples ConcatTransform Cone CoordinateSystem CoordSysTransform CropWindow Curves Cylinder DepthOfField Detail DetailRange Disk Displacement Display End ErrorHandler Exposure Exterior Format FrameAspectRatio FrameBegin FrameEnd GeneralPolygon GeometricApproximation Geometry Hider Hyperboloid Identity Illuminate Imager Interior LightSource MakeCubeFaceEnvironment MakeLatLongEnvironment MakeShadow MakeTexture Matte MotionBegin MotionEnd NuPatch ObjectBegin ObjectEnd ObjectInstance Opacity Option Orientation Paraboloid Patch PatchMesh Perspective PixelFilter PixelSamples PixelVariance Points PointsGeneralPolygons PointsPolygons Polygon Procedural Projection Quantize ReadArchive RelativeDetail ReverseOrientation Rotate Scale ScreenWindow ShadingInterpolation ShadingRate Shutter Sides Skew SolidBegin SolidEnd Sphere SubdivisionMesh Surface TextureCoordinates Torus Transform TransformBegin TransformEnd TransformPoints Translate TrimCurve WorldBegin WorldEnd",i:"</",c:[e.HCM,e.CNM,e.ASM,e.QSM]}});
\ No newline at end of file
+hljs.registerLanguage("rib",function(){"use strict";return function(e){return{name:"RenderMan RIB",keywords:"ArchiveRecord AreaLightSource Atmosphere Attribute AttributeBegin AttributeEnd Basis Begin Blobby Bound Clipping ClippingPlane Color ColorSamples ConcatTransform Cone CoordinateSystem CoordSysTransform CropWindow Curves Cylinder DepthOfField Detail DetailRange Disk Displacement Display End ErrorHandler Exposure Exterior Format FrameAspectRatio FrameBegin FrameEnd GeneralPolygon GeometricApproximation Geometry Hider Hyperboloid Identity Illuminate Imager Interior LightSource MakeCubeFaceEnvironment MakeLatLongEnvironment MakeShadow MakeTexture Matte MotionBegin MotionEnd NuPatch ObjectBegin ObjectEnd ObjectInstance Opacity Option Orientation Paraboloid Patch PatchMesh Perspective PixelFilter PixelSamples PixelVariance Points PointsGeneralPolygons PointsPolygons Polygon Procedural Projection Quantize ReadArchive RelativeDetail ReverseOrientation Rotate Scale ScreenWindow ShadingInterpolation ShadingRate Shutter Sides Skew SolidBegin SolidEnd Sphere SubdivisionMesh Surface TextureCoordinates Torus Transform TransformBegin TransformEnd TransformPoints Translate TrimCurve WorldBegin WorldEnd",illegal:"</",contains:[e.HASH_COMMENT_MODE,e.C_NUMBER_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/roboconf.min.js b/vendor/assets/javascripts/highlightjs/languages/roboconf.min.js
index 185875baba..4606eeaff1 100644
--- a/vendor/assets/javascripts/highlightjs/languages/roboconf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/roboconf.min.js
@@ -1 +1 @@
-hljs.registerLanguage("roboconf",function(a){var e="[a-zA-Z-_][^\\n{]+\\{",n={cN:"attribute",b:/[a-zA-Z-_]+/,e:/\s*:/,eE:!0,starts:{e:";",r:0,c:[{cN:"variable",b:/\.[a-zA-Z-_]+/},{cN:"keyword",b:/\(optional\)/}]}};return{aliases:["graph","instances"],cI:!0,k:"import",c:[{b:"^facet "+e,e:"}",k:"facet",c:[n,a.HCM]},{b:"^\\s*instance of "+e,e:"}",k:"name count channels instance-data instance-state instance of",i:/\S/,c:["self",n,a.HCM]},{b:"^"+e,e:"}",c:[n,a.HCM]},a.HCM]}});
\ No newline at end of file
+hljs.registerLanguage("roboconf",function(){"use strict";return function(n){var e={className:"attribute",begin:/[a-zA-Z-_]+/,end:/\s*:/,excludeEnd:!0,starts:{end:";",relevance:0,contains:[{className:"variable",begin:/\.[a-zA-Z-_]+/},{className:"keyword",begin:/\(optional\)/}]}};return{name:"Roboconf",aliases:["graph","instances"],case_insensitive:!0,keywords:"import",contains:[{begin:"^facet [a-zA-Z-_][^\\n{]+\\{",end:"}",keywords:"facet",contains:[e,n.HASH_COMMENT_MODE]},{begin:"^\\s*instance of [a-zA-Z-_][^\\n{]+\\{",end:"}",keywords:"name count channels instance-data instance-state instance of",illegal:/\S/,contains:["self",e,n.HASH_COMMENT_MODE]},{begin:"^[a-zA-Z-_][^\\n{]+\\{",end:"}",contains:[e,n.HASH_COMMENT_MODE]},n.HASH_COMMENT_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/routeros.min.js b/vendor/assets/javascripts/highlightjs/languages/routeros.min.js
index 5ecbcb6d01..af2cf1aa59 100644
--- a/vendor/assets/javascripts/highlightjs/languages/routeros.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/routeros.min.js
@@ -1 +1 @@
-hljs.registerLanguage("routeros",function(e){var r="foreach do while for if from to step else on-error and or not in",i="global local beep delay put len typeof pick log time set find environment terminal error execute parse resolve toarray tobool toid toip toip6 tonum tostr totime",o="add remove enable disable set get print export edit find run debug error info warning",t="true false yes no nothing nil null",s="traffic-flow traffic-generator firewall scheduler aaa accounting address-list address align area bandwidth-server bfd bgp bridge client clock community config connection console customer default dhcp-client dhcp-server discovery dns e-mail ethernet filter firewall firmware gps graphing group hardware health hotspot identity igmp-proxy incoming instance interface ip ipsec ipv6 irq l2tp-server lcd ldp logging mac-server mac-winbox mangle manual mirror mme mpls nat nd neighbor network note ntp ospf ospf-v3 ovpn-server page peer pim ping policy pool port ppp pppoe-client pptp-server prefix profile proposal proxy queue radius resource rip ripng route routing screen script security-profiles server service service-port settings shares smb sms sniffer snmp snooper socks sstp-server system tool tracking type upgrade upnp user-manager users user vlan secret vrrp watchdog web-access wireless pptp pppoe lan wan layer7-protocol lease simple raw",n={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},p={cN:"string",b:/"/,e:/"/,c:[e.BE,n,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["routeros","mikrotik"],cI:!0,l:/:?[\w-]+/,k:{literal:t,keyword:r+" :"+r.split(" ").join(" :")+" :"+i.split(" ").join(" :")},c:[{v:[{b:/^@/,e:/$/},{b:/\/\*/,e:/\*\//},{b:/%%/,e:/$/},{b:/^'/,e:/$/},{b:/^\s*\/[\w-]+=/,e:/$/},{b:/\/\//,e:/$/},{b:/^\[\</,e:/\>\]$/},{b:/<\//,e:/>/},{b:/^facet /,e:/\}/},{b:"^1\\.\\.(\\d+)$",e:/$/}],i:/./},e.C("^#","$"),p,a,n,{b:/[\w-]+\=([^\s\{\}\[\]\(\)]+)/,r:0,rB:!0,c:[{cN:"attribute",b:/[^=]+/},{b:/=/,eW:!0,r:0,c:[p,a,n,{cN:"literal",b:"\\b("+t.split(" ").join("|")+")\\b"},{b:/("[^"]*"|[^\s\{\}\[\]]+)/}]}]},{cN:"number",b:/\*[0-9a-fA-F]+/},{b:"\\b("+o.split(" ").join("|")+")([\\s[(]|])",rB:!0,c:[{cN:"builtin-name",b:/\w+/}]},{cN:"built_in",v:[{b:"(\\.\\./|/|\\s)(("+s.split(" ").join("|")+");?\\s)+",r:10},{b:/\.\./}]}]}});
\ No newline at end of file
+hljs.registerLanguage("routeros",function(){"use strict";return function(e){var n="foreach do while for if from to step else on-error and or not in",r="true false yes no nothing nil null",i={className:"variable",variants:[{begin:/\$[\w\d#@][\w\d_]*/},{begin:/\$\{(.*?)}/}]},s={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,i,{className:"variable",begin:/\$\(/,end:/\)/,contains:[e.BACKSLASH_ESCAPE]}]},t={className:"string",begin:/'/,end:/'/};return{name:"Microtik RouterOS script",aliases:["routeros","mikrotik"],case_insensitive:!0,keywords:{$pattern:/:?[\w-]+/,literal:r,keyword:n+" :"+n.split(" ").join(" :")+" :"+"global local beep delay put len typeof pick log time set find environment terminal error execute parse resolve toarray tobool toid toip toip6 tonum tostr totime".split(" ").join(" :")},contains:[{variants:[{begin:/^@/,end:/$/},{begin:/\/\*/,end:/\*\//},{begin:/%%/,end:/$/},{begin:/^'/,end:/$/},{begin:/^\s*\/[\w-]+=/,end:/$/},{begin:/\/\//,end:/$/},{begin:/^\[\</,end:/\>\]$/},{begin:/<\//,end:/>/},{begin:/^facet /,end:/\}/},{begin:"^1\\.\\.(\\d+)$",end:/$/}],illegal:/./},e.COMMENT("^#","$"),s,t,i,{begin:/[\w-]+\=([^\s\{\}\[\]\(\)]+)/,relevance:0,returnBegin:!0,contains:[{className:"attribute",begin:/[^=]+/},{begin:/=/,endsWithParent:!0,relevance:0,contains:[s,t,i,{className:"literal",begin:"\\b("+r.split(" ").join("|")+")\\b"},{begin:/("[^"]*"|[^\s\{\}\[\]]+)/}]}]},{className:"number",begin:/\*[0-9a-fA-F]+/},{begin:"\\b(add|remove|enable|disable|set|get|print|export|edit|find|run|debug|error|info|warning)([\\s[(]|])",returnBegin:!0,contains:[{className:"builtin-name",begin:/\w+/}]},{className:"built_in",variants:[{begin:"(\\.\\./|/|\\s)((traffic-flow|traffic-generator|firewall|scheduler|aaa|accounting|address-list|address|align|area|bandwidth-server|bfd|bgp|bridge|client|clock|community|config|connection|console|customer|default|dhcp-client|dhcp-server|discovery|dns|e-mail|ethernet|filter|firewall|firmware|gps|graphing|group|hardware|health|hotspot|identity|igmp-proxy|incoming|instance|interface|ip|ipsec|ipv6|irq|l2tp-server|lcd|ldp|logging|mac-server|mac-winbox|mangle|manual|mirror|mme|mpls|nat|nd|neighbor|network|note|ntp|ospf|ospf-v3|ovpn-server|page|peer|pim|ping|policy|pool|port|ppp|pppoe-client|pptp-server|prefix|profile|proposal|proxy|queue|radius|resource|rip|ripng|route|routing|screen|script|security-profiles|server|service|service-port|settings|shares|smb|sms|sniffer|snmp|snooper|socks|sstp-server|system|tool|tracking|type|upgrade|upnp|user-manager|users|user|vlan|secret|vrrp|watchdog|web-access|wireless|pptp|pppoe|lan|wan|layer7-protocol|lease|simple|raw);?\\s)+",relevance:10},{begin:/\.\./}]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/rsl.min.js b/vendor/assets/javascripts/highlightjs/languages/rsl.min.js
index 3f33a6f13c..e579481403 100644
--- a/vendor/assets/javascripts/highlightjs/languages/rsl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/rsl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("rsl",function(e){return{k:{keyword:"float color point normal vector matrix while for if do return else break extern continue",built_in:"abs acos ambient area asin atan atmosphere attribute calculatenormal ceil cellnoise clamp comp concat cos degrees depth Deriv diffuse distance Du Dv environment exp faceforward filterstep floor format fresnel incident length lightsource log match max min mod noise normalize ntransform opposite option phong pnoise pow printf ptlined radians random reflect refract renderinfo round setcomp setxcomp setycomp setzcomp shadow sign sin smoothstep specular specularbrdf spline sqrt step tan texture textureinfo trace transform vtransform xcomp ycomp zcomp"},i:"</",c:[e.CLCM,e.CBCM,e.QSM,e.ASM,e.CNM,{cN:"meta",b:"#",e:"$"},{cN:"class",bK:"surface displacement light volume imager",e:"\\("},{bK:"illuminate illuminance gather",e:"\\("}]}});
\ No newline at end of file
+hljs.registerLanguage("rsl",function(){"use strict";return function(e){return{name:"RenderMan RSL",keywords:{keyword:"float color point normal vector matrix while for if do return else break extern continue",built_in:"abs acos ambient area asin atan atmosphere attribute calculatenormal ceil cellnoise clamp comp concat cos degrees depth Deriv diffuse distance Du Dv environment exp faceforward filterstep floor format fresnel incident length lightsource log match max min mod noise normalize ntransform opposite option phong pnoise pow printf ptlined radians random reflect refract renderinfo round setcomp setxcomp setycomp setzcomp shadow sign sin smoothstep specular specularbrdf spline sqrt step tan texture textureinfo trace transform vtransform xcomp ycomp zcomp"},illegal:"</",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_NUMBER_MODE,{className:"meta",begin:"#",end:"$"},{className:"class",beginKeywords:"surface displacement light volume imager",end:"\\("},{beginKeywords:"illuminate illuminance gather",end:"\\("}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ruby.min.js b/vendor/assets/javascripts/highlightjs/languages/ruby.min.js
index 7b5a93e66d..4b52defe67 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ruby.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ruby.min.js
@@ -1 +1 @@
-hljs.registerLanguage("ruby",function(e){var b="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",r={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},c={cN:"doctag",b:"@[A-Za-z]+"},a={b:"#<",e:">"},s=[e.C("#","$",{c:[c]}),e.C("^\\=begin","^\\=end",{c:[c],r:10}),e.C("^__END__","\\n$")],n={cN:"subst",b:"#\\{",e:"}",k:r},t={cN:"string",c:[e.BE,n],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[qQwWx]?\\(",e:"\\)"},{b:"%[qQwWx]?\\[",e:"\\]"},{b:"%[qQwWx]?{",e:"}"},{b:"%[qQwWx]?<",e:">"},{b:"%[qQwWx]?/",e:"/"},{b:"%[qQwWx]?%",e:"%"},{b:"%[qQwWx]?-",e:"-"},{b:"%[qQwWx]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{b:/<<(-?)\w+$/,e:/^\s*\w+$/}]},i={cN:"params",b:"\\(",e:"\\)",endsParent:!0,k:r},d=[t,a,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{b:"<\\s*",c:[{b:"("+e.IR+"::)?"+e.IR}]}].concat(s)},{cN:"function",bK:"def",e:"$|;",c:[e.inherit(e.TM,{b:b}),i].concat(s)},{b:e.IR+"::"},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":(?!\\s)",c:[t,{b:b}],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{cN:"params",b:/\|/,e:/\|/,k:r},{b:"("+e.RSR+"|unless)\\s*",k:"unless",c:[a,{cN:"regexp",c:[e.BE,n],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}].concat(s),r:0}].concat(s);n.c=d,i.c=d;var l="[>?]>",o="[\\w#]+\\(\\w+\\):\\d+:\\d+>",u="(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>",w=[{b:/^\s*=>/,starts:{e:"$",c:d}},{cN:"meta",b:"^("+l+"|"+o+"|"+u+")",starts:{e:"$",c:d}}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:r,i:/\/\*/,c:s.concat(w).concat(d)}});
\ No newline at end of file
+hljs.registerLanguage("ruby",function(){"use strict";return function(e){var n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",a={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},s={className:"doctag",begin:"@[A-Za-z]+"},i={begin:"#<",end:">"},r=[e.COMMENT("#","$",{contains:[s]}),e.COMMENT("^\\=begin","^\\=end",{contains:[s],relevance:10}),e.COMMENT("^__END__","\\n$")],c={className:"subst",begin:"#\\{",end:"}",keywords:a},t={className:"string",contains:[e.BACKSLASH_ESCAPE,c],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/`/,end:/`/},{begin:"%[qQwWx]?\\(",end:"\\)"},{begin:"%[qQwWx]?\\[",end:"\\]"},{begin:"%[qQwWx]?{",end:"}"},{begin:"%[qQwWx]?<",end:">"},{begin:"%[qQwWx]?/",end:"/"},{begin:"%[qQwWx]?%",end:"%"},{begin:"%[qQwWx]?-",end:"-"},{begin:"%[qQwWx]?\\|",end:"\\|"},{begin:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{begin:/<<[-~]?'?(\w+)(?:.|\n)*?\n\s*\1\b/,returnBegin:!0,contains:[{begin:/<<[-~]?'?/},e.END_SAME_AS_BEGIN({begin:/(\w+)/,end:/(\w+)/,contains:[e.BACKSLASH_ESCAPE,c]})]}]},b={className:"params",begin:"\\(",end:"\\)",endsParent:!0,keywords:a},d=[t,i,{className:"class",beginKeywords:"class module",end:"$|;",illegal:/=/,contains:[e.inherit(e.TITLE_MODE,{begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{begin:"<\\s*",contains:[{begin:"("+e.IDENT_RE+"::)?"+e.IDENT_RE}]}].concat(r)},{className:"function",beginKeywords:"def",end:"$|;",contains:[e.inherit(e.TITLE_MODE,{begin:n}),b].concat(r)},{begin:e.IDENT_RE+"::"},{className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"(\\!|\\?)?:",relevance:0},{className:"symbol",begin:":(?!\\s)",contains:[t,{begin:n}],relevance:0},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{begin:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{className:"params",begin:/\|/,end:/\|/,keywords:a},{begin:"("+e.RE_STARTERS_RE+"|unless)\\s*",keywords:"unless",contains:[i,{className:"regexp",contains:[e.BACKSLASH_ESCAPE,c],illegal:/\n/,variants:[{begin:"/",end:"/[a-z]*"},{begin:"%r{",end:"}[a-z]*"},{begin:"%r\\(",end:"\\)[a-z]*"},{begin:"%r!",end:"![a-z]*"},{begin:"%r\\[",end:"\\][a-z]*"}]}].concat(r),relevance:0}].concat(r);c.contains=d,b.contains=d;var g=[{begin:/^\s*=>/,starts:{end:"$",contains:d}},{className:"meta",begin:"^([>?]>|[\\w#]+\\(\\w+\\):\\d+:\\d+>|(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>)",starts:{end:"$",contains:d}}];return{name:"Ruby",aliases:["rb","gemspec","podspec","thor","irb"],keywords:a,illegal:/\/\*/,contains:r.concat(g).concat(d)}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ruleslanguage.min.js b/vendor/assets/javascripts/highlightjs/languages/ruleslanguage.min.js
index 62bcd2f341..66b3a74280 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ruleslanguage.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ruleslanguage.min.js
@@ -1 +1 @@
-hljs.registerLanguage("ruleslanguage",function(T){return{k:{keyword:"BILL_PERIOD BILL_START BILL_STOP RS_EFFECTIVE_START RS_EFFECTIVE_STOP RS_JURIS_CODE RS_OPCO_CODE INTDADDATTRIBUTE|5 INTDADDVMSG|5 INTDBLOCKOP|5 INTDBLOCKOPNA|5 INTDCLOSE|5 INTDCOUNT|5 INTDCOUNTSTATUSCODE|5 INTDCREATEMASK|5 INTDCREATEDAYMASK|5 INTDCREATEFACTORMASK|5 INTDCREATEHANDLE|5 INTDCREATEOVERRIDEDAYMASK|5 INTDCREATEOVERRIDEMASK|5 INTDCREATESTATUSCODEMASK|5 INTDCREATETOUPERIOD|5 INTDDELETE|5 INTDDIPTEST|5 INTDEXPORT|5 INTDGETERRORCODE|5 INTDGETERRORMESSAGE|5 INTDISEQUAL|5 INTDJOIN|5 INTDLOAD|5 INTDLOADACTUALCUT|5 INTDLOADDATES|5 INTDLOADHIST|5 INTDLOADLIST|5 INTDLOADLISTDATES|5 INTDLOADLISTENERGY|5 INTDLOADLISTHIST|5 INTDLOADRELATEDCHANNEL|5 INTDLOADSP|5 INTDLOADSTAGING|5 INTDLOADUOM|5 INTDLOADUOMDATES|5 INTDLOADUOMHIST|5 INTDLOADVERSION|5 INTDOPEN|5 INTDREADFIRST|5 INTDREADNEXT|5 INTDRECCOUNT|5 INTDRELEASE|5 INTDREPLACE|5 INTDROLLAVG|5 INTDROLLPEAK|5 INTDSCALAROP|5 INTDSCALE|5 INTDSETATTRIBUTE|5 INTDSETDSTPARTICIPANT|5 INTDSETSTRING|5 INTDSETVALUE|5 INTDSETVALUESTATUS|5 INTDSHIFTSTARTTIME|5 INTDSMOOTH|5 INTDSORT|5 INTDSPIKETEST|5 INTDSUBSET|5 INTDTOU|5 INTDTOURELEASE|5 INTDTOUVALUE|5 INTDUPDATESTATS|5 INTDVALUE|5 STDEV INTDDELETEEX|5 INTDLOADEXACTUAL|5 INTDLOADEXCUT|5 INTDLOADEXDATES|5 INTDLOADEX|5 INTDLOADEXRELATEDCHANNEL|5 INTDSAVEEX|5 MVLOAD|5 MVLOADACCT|5 MVLOADACCTDATES|5 MVLOADACCTHIST|5 MVLOADDATES|5 MVLOADHIST|5 MVLOADLIST|5 MVLOADLISTDATES|5 MVLOADLISTHIST|5 IF FOR NEXT DONE SELECT END CALL ABORT CLEAR CHANNEL FACTOR LIST NUMBER OVERRIDE SET WEEK DISTRIBUTIONNODE ELSE WHEN THEN OTHERWISE IENUM CSV INCLUDE LEAVE RIDER SAVE DELETE NOVALUE SECTION WARN SAVE_UPDATE DETERMINANT LABEL REPORT REVENUE EACH IN FROM TOTAL CHARGE BLOCK AND OR CSV_FILE RATE_CODE AUXILIARY_DEMAND UIDACCOUNT RS BILL_PERIOD_SELECT HOURS_PER_MONTH INTD_ERROR_STOP SEASON_SCHEDULE_NAME ACCOUNTFACTOR ARRAYUPPERBOUND CALLSTOREDPROC GETADOCONNECTION GETCONNECT GETDATASOURCE GETQUALIFIER GETUSERID HASVALUE LISTCOUNT LISTOP LISTUPDATE LISTVALUE PRORATEFACTOR RSPRORATE SETBINPATH SETDBMONITOR WQ_OPEN BILLINGHOURS DATE DATEFROMFLOAT DATETIMEFROMSTRING DATETIMETOSTRING DATETOFLOAT DAY DAYDIFF DAYNAME DBDATETIME HOUR MINUTE MONTH MONTHDIFF MONTHHOURS MONTHNAME ROUNDDATE SAMEWEEKDAYLASTYEAR SECOND WEEKDAY WEEKDIFF YEAR YEARDAY YEARSTR COMPSUM HISTCOUNT HISTMAX HISTMIN HISTMINNZ HISTVALUE MAXNRANGE MAXRANGE MINRANGE COMPIKVA COMPKVA COMPKVARFROMKQKW COMPLF IDATTR FLAG LF2KW LF2KWH MAXKW POWERFACTOR READING2USAGE AVGSEASON MAXSEASON MONTHLYMERGE SEASONVALUE SUMSEASON ACCTREADDATES ACCTTABLELOAD CONFIGADD CONFIGGET CREATEOBJECT CREATEREPORT EMAILCLIENT EXPBLKMDMUSAGE EXPMDMUSAGE EXPORT_USAGE FACTORINEFFECT GETUSERSPECIFIEDSTOP INEFFECT ISHOLIDAY RUNRATE SAVE_PROFILE SETREPORTTITLE USEREXIT WATFORRUNRATE TO TABLE ACOS ASIN ATAN ATAN2 BITAND CEIL COS COSECANT COSH COTANGENT DIVQUOT DIVREM EXP FABS FLOOR FMOD FREPM FREXPN LOG LOG10 MAX MAXN MIN MINNZ MODF POW ROUND ROUND2VALUE ROUNDINT SECANT SIN SINH SQROOT TAN TANH FLOAT2STRING FLOAT2STRINGNC INSTR LEFT LEN LTRIM MID RIGHT RTRIM STRING STRINGNC TOLOWER TOUPPER TRIM NUMDAYS READ_DATE STAGING",built_in:"IDENTIFIER OPTIONS XML_ELEMENT XML_OP XML_ELEMENT_OF DOMDOCCREATE DOMDOCLOADFILE DOMDOCLOADXML DOMDOCSAVEFILE DOMDOCGETROOT DOMDOCADDPI DOMNODEGETNAME DOMNODEGETTYPE DOMNODEGETVALUE DOMNODEGETCHILDCT DOMNODEGETFIRSTCHILD DOMNODEGETSIBLING DOMNODECREATECHILDELEMENT DOMNODESETATTRIBUTE DOMNODEGETCHILDELEMENTCT DOMNODEGETFIRSTCHILDELEMENT DOMNODEGETSIBLINGELEMENT DOMNODEGETATTRIBUTECT DOMNODEGETATTRIBUTEI DOMNODEGETATTRIBUTEBYNAME DOMNODEGETBYNAME"},c:[T.CLCM,T.CBCM,T.ASM,T.QSM,T.CNM,{cN:"literal",v:[{b:"#\\s+[a-zA-Z\\ \\.]*",r:0},{b:"#[a-zA-Z\\ \\.]+"}]}]}});
\ No newline at end of file
+hljs.registerLanguage("ruleslanguage",function(){"use strict";return function(T){return{name:"Oracle Rules Language",keywords:{keyword:"BILL_PERIOD BILL_START BILL_STOP RS_EFFECTIVE_START RS_EFFECTIVE_STOP RS_JURIS_CODE RS_OPCO_CODE INTDADDATTRIBUTE|5 INTDADDVMSG|5 INTDBLOCKOP|5 INTDBLOCKOPNA|5 INTDCLOSE|5 INTDCOUNT|5 INTDCOUNTSTATUSCODE|5 INTDCREATEMASK|5 INTDCREATEDAYMASK|5 INTDCREATEFACTORMASK|5 INTDCREATEHANDLE|5 INTDCREATEOVERRIDEDAYMASK|5 INTDCREATEOVERRIDEMASK|5 INTDCREATESTATUSCODEMASK|5 INTDCREATETOUPERIOD|5 INTDDELETE|5 INTDDIPTEST|5 INTDEXPORT|5 INTDGETERRORCODE|5 INTDGETERRORMESSAGE|5 INTDISEQUAL|5 INTDJOIN|5 INTDLOAD|5 INTDLOADACTUALCUT|5 INTDLOADDATES|5 INTDLOADHIST|5 INTDLOADLIST|5 INTDLOADLISTDATES|5 INTDLOADLISTENERGY|5 INTDLOADLISTHIST|5 INTDLOADRELATEDCHANNEL|5 INTDLOADSP|5 INTDLOADSTAGING|5 INTDLOADUOM|5 INTDLOADUOMDATES|5 INTDLOADUOMHIST|5 INTDLOADVERSION|5 INTDOPEN|5 INTDREADFIRST|5 INTDREADNEXT|5 INTDRECCOUNT|5 INTDRELEASE|5 INTDREPLACE|5 INTDROLLAVG|5 INTDROLLPEAK|5 INTDSCALAROP|5 INTDSCALE|5 INTDSETATTRIBUTE|5 INTDSETDSTPARTICIPANT|5 INTDSETSTRING|5 INTDSETVALUE|5 INTDSETVALUESTATUS|5 INTDSHIFTSTARTTIME|5 INTDSMOOTH|5 INTDSORT|5 INTDSPIKETEST|5 INTDSUBSET|5 INTDTOU|5 INTDTOURELEASE|5 INTDTOUVALUE|5 INTDUPDATESTATS|5 INTDVALUE|5 STDEV INTDDELETEEX|5 INTDLOADEXACTUAL|5 INTDLOADEXCUT|5 INTDLOADEXDATES|5 INTDLOADEX|5 INTDLOADEXRELATEDCHANNEL|5 INTDSAVEEX|5 MVLOAD|5 MVLOADACCT|5 MVLOADACCTDATES|5 MVLOADACCTHIST|5 MVLOADDATES|5 MVLOADHIST|5 MVLOADLIST|5 MVLOADLISTDATES|5 MVLOADLISTHIST|5 IF FOR NEXT DONE SELECT END CALL ABORT CLEAR CHANNEL FACTOR LIST NUMBER OVERRIDE SET WEEK DISTRIBUTIONNODE ELSE WHEN THEN OTHERWISE IENUM CSV INCLUDE LEAVE RIDER SAVE DELETE NOVALUE SECTION WARN SAVE_UPDATE DETERMINANT LABEL REPORT REVENUE EACH IN FROM TOTAL CHARGE BLOCK AND OR CSV_FILE RATE_CODE AUXILIARY_DEMAND UIDACCOUNT RS BILL_PERIOD_SELECT HOURS_PER_MONTH INTD_ERROR_STOP SEASON_SCHEDULE_NAME ACCOUNTFACTOR ARRAYUPPERBOUND CALLSTOREDPROC GETADOCONNECTION GETCONNECT GETDATASOURCE GETQUALIFIER GETUSERID HASVALUE LISTCOUNT LISTOP LISTUPDATE LISTVALUE PRORATEFACTOR RSPRORATE SETBINPATH SETDBMONITOR WQ_OPEN BILLINGHOURS DATE DATEFROMFLOAT DATETIMEFROMSTRING DATETIMETOSTRING DATETOFLOAT DAY DAYDIFF DAYNAME DBDATETIME HOUR MINUTE MONTH MONTHDIFF MONTHHOURS MONTHNAME ROUNDDATE SAMEWEEKDAYLASTYEAR SECOND WEEKDAY WEEKDIFF YEAR YEARDAY YEARSTR COMPSUM HISTCOUNT HISTMAX HISTMIN HISTMINNZ HISTVALUE MAXNRANGE MAXRANGE MINRANGE COMPIKVA COMPKVA COMPKVARFROMKQKW COMPLF IDATTR FLAG LF2KW LF2KWH MAXKW POWERFACTOR READING2USAGE AVGSEASON MAXSEASON MONTHLYMERGE SEASONVALUE SUMSEASON ACCTREADDATES ACCTTABLELOAD CONFIGADD CONFIGGET CREATEOBJECT CREATEREPORT EMAILCLIENT EXPBLKMDMUSAGE EXPMDMUSAGE EXPORT_USAGE FACTORINEFFECT GETUSERSPECIFIEDSTOP INEFFECT ISHOLIDAY RUNRATE SAVE_PROFILE SETREPORTTITLE USEREXIT WATFORRUNRATE TO TABLE ACOS ASIN ATAN ATAN2 BITAND CEIL COS COSECANT COSH COTANGENT DIVQUOT DIVREM EXP FABS FLOOR FMOD FREPM FREXPN LOG LOG10 MAX MAXN MIN MINNZ MODF POW ROUND ROUND2VALUE ROUNDINT SECANT SIN SINH SQROOT TAN TANH FLOAT2STRING FLOAT2STRINGNC INSTR LEFT LEN LTRIM MID RIGHT RTRIM STRING STRINGNC TOLOWER TOUPPER TRIM NUMDAYS READ_DATE STAGING",built_in:"IDENTIFIER OPTIONS XML_ELEMENT XML_OP XML_ELEMENT_OF DOMDOCCREATE DOMDOCLOADFILE DOMDOCLOADXML DOMDOCSAVEFILE DOMDOCGETROOT DOMDOCADDPI DOMNODEGETNAME DOMNODEGETTYPE DOMNODEGETVALUE DOMNODEGETCHILDCT DOMNODEGETFIRSTCHILD DOMNODEGETSIBLING DOMNODECREATECHILDELEMENT DOMNODESETATTRIBUTE DOMNODEGETCHILDELEMENTCT DOMNODEGETFIRSTCHILDELEMENT DOMNODEGETSIBLINGELEMENT DOMNODEGETATTRIBUTECT DOMNODEGETATTRIBUTEI DOMNODEGETATTRIBUTEBYNAME DOMNODEGETBYNAME"},contains:[T.C_LINE_COMMENT_MODE,T.C_BLOCK_COMMENT_MODE,T.APOS_STRING_MODE,T.QUOTE_STRING_MODE,T.C_NUMBER_MODE,{className:"literal",variants:[{begin:"#\\s+[a-zA-Z\\ \\.]*",relevance:0},{begin:"#[a-zA-Z\\ \\.]+"}]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/rust.min.js b/vendor/assets/javascripts/highlightjs/languages/rust.min.js
index 776c7e429d..37ec123f25 100644
--- a/vendor/assets/javascripts/highlightjs/languages/rust.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/rust.min.js
@@ -1 +1 @@
-hljs.registerLanguage("rust",function(e){var t="([ui](8|16|32|64|128|size)|f(32|64))?",r="alignof as be box break const continue crate do else enum extern false fn for if impl in let loop match mod mut offsetof once priv proc pub pure ref return self Self sizeof static struct super trait true type typeof unsafe unsized use virtual while where yield move default",n="drop i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize f32 f64 str char bool Box Option Result String Vec Copy Send Sized Sync Drop Fn FnMut FnOnce ToOwned Clone Debug PartialEq PartialOrd Eq Ord AsRef AsMut Into From Default Iterator Extend IntoIterator DoubleEndedIterator ExactSizeIterator SliceConcatExt ToString assert! assert_eq! bitflags! bytes! cfg! col! concat! concat_idents! debug_assert! debug_assert_eq! env! panic! file! format! format_args! include_bin! include_str! line! local_data_key! module_path! option_env! print! println! select! stringify! try! unimplemented! unreachable! vec! write! writeln! macro_rules! assert_ne! debug_assert_ne!";return{aliases:["rs"],k:{keyword:r,literal:"true false Some None Ok Err",built_in:n},l:e.IR+"!?",i:"</",c:[e.CLCM,e.C("/\\*","\\*/",{c:["self"]}),e.inherit(e.QSM,{b:/b?"/,i:null}),{cN:"string",v:[{b:/r(#*)"(.|\n)*?"\1(?!#)/},{b:/b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/}]},{cN:"symbol",b:/'[a-zA-Z_][a-zA-Z0-9_]*/},{cN:"number",v:[{b:"\\b0b([01_]+)"+t},{b:"\\b0o([0-7_]+)"+t},{b:"\\b0x([A-Fa-f0-9_]+)"+t},{b:"\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)"+t}],r:0},{cN:"function",bK:"fn",e:"(\\(|<)",eE:!0,c:[e.UTM]},{cN:"meta",b:"#\\!?\\[",e:"\\]",c:[{cN:"meta-string",b:/"/,e:/"/}]},{cN:"class",bK:"type",e:";",c:[e.inherit(e.UTM,{endsParent:!0})],i:"\\S"},{cN:"class",bK:"trait enum struct union",e:"{",c:[e.inherit(e.UTM,{endsParent:!0})],i:"[\\w\\d]"},{b:e.IR+"::",k:{built_in:n}},{b:"->"}]}});
\ No newline at end of file
+hljs.registerLanguage("rust",function(){"use strict";return function(e){var n="([ui](8|16|32|64|128|size)|f(32|64))?",t="drop i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize f32 f64 str char bool Box Option Result String Vec Copy Send Sized Sync Drop Fn FnMut FnOnce ToOwned Clone Debug PartialEq PartialOrd Eq Ord AsRef AsMut Into From Default Iterator Extend IntoIterator DoubleEndedIterator ExactSizeIterator SliceConcatExt ToString assert! assert_eq! bitflags! bytes! cfg! col! concat! concat_idents! debug_assert! debug_assert_eq! env! panic! file! format! format_args! include_bin! include_str! line! local_data_key! module_path! option_env! print! println! select! stringify! try! unimplemented! unreachable! vec! write! writeln! macro_rules! assert_ne! debug_assert_ne!";return{name:"Rust",aliases:["rs"],keywords:{$pattern:e.IDENT_RE+"!?",keyword:"abstract as async await become box break const continue crate do dyn else enum extern false final fn for if impl in let loop macro match mod move mut override priv pub ref return self Self static struct super trait true try type typeof unsafe unsized use virtual where while yield",literal:"true false Some None Ok Err",built_in:t},illegal:"</",contains:[e.C_LINE_COMMENT_MODE,e.COMMENT("/\\*","\\*/",{contains:["self"]}),e.inherit(e.QUOTE_STRING_MODE,{begin:/b?"/,illegal:null}),{className:"string",variants:[{begin:/r(#*)"(.|\n)*?"\1(?!#)/},{begin:/b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/}]},{className:"symbol",begin:/'[a-zA-Z_][a-zA-Z0-9_]*/},{className:"number",variants:[{begin:"\\b0b([01_]+)"+n},{begin:"\\b0o([0-7_]+)"+n},{begin:"\\b0x([A-Fa-f0-9_]+)"+n},{begin:"\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)"+n}],relevance:0},{className:"function",beginKeywords:"fn",end:"(\\(|<)",excludeEnd:!0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"meta",begin:"#\\!?\\[",end:"\\]",contains:[{className:"meta-string",begin:/"/,end:/"/}]},{className:"class",beginKeywords:"type",end:";",contains:[e.inherit(e.UNDERSCORE_TITLE_MODE,{endsParent:!0})],illegal:"\\S"},{className:"class",beginKeywords:"trait enum struct union",end:"{",contains:[e.inherit(e.UNDERSCORE_TITLE_MODE,{endsParent:!0})],illegal:"[\\w\\d]"},{begin:e.IDENT_RE+"::",keywords:{built_in:t}},{begin:"->"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/sas.min.js b/vendor/assets/javascripts/highlightjs/languages/sas.min.js
index f577e91acd..5c03807171 100644
--- a/vendor/assets/javascripts/highlightjs/languages/sas.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/sas.min.js
@@ -1 +1 @@
-hljs.registerLanguage("sas",function(e){var t="do if then else end until while abort array attrib by call cards cards4 catname continue datalines datalines4 delete delim delimiter display dm drop endsas error file filename footnote format goto in infile informat input keep label leave length libname link list lostcard merge missing modify options output out page put redirect remove rename replace retain return select set skip startsas stop title update waitsas where window x systask add and alter as cascade check create delete describe distinct drop foreign from group having index insert into in key like message modify msgtype not null on or order primary references reset restrict select set table unique update validate view where",a="abs|addr|airy|arcos|arsin|atan|attrc|attrn|band|betainv|blshift|bnot|bor|brshift|bxor|byte|cdf|ceil|cexist|cinv|close|cnonct|collate|compbl|compound|compress|cos|cosh|css|curobs|cv|daccdb|daccdbsl|daccsl|daccsyd|dacctab|dairy|date|datejul|datepart|datetime|day|dclose|depdb|depdbsl|depdbsl|depsl|depsl|depsyd|depsyd|deptab|deptab|dequote|dhms|dif|digamma|dim|dinfo|dnum|dopen|doptname|doptnum|dread|dropnote|dsname|erf|erfc|exist|exp|fappend|fclose|fcol|fdelete|fetch|fetchobs|fexist|fget|fileexist|filename|fileref|finfo|finv|fipname|fipnamel|fipstate|floor|fnonct|fnote|fopen|foptname|foptnum|fpoint|fpos|fput|fread|frewind|frlen|fsep|fuzz|fwrite|gaminv|gamma|getoption|getvarc|getvarn|hbound|hms|hosthelp|hour|ibessel|index|indexc|indexw|input|inputc|inputn|int|intck|intnx|intrr|irr|jbessel|juldate|kurtosis|lag|lbound|left|length|lgamma|libname|libref|log|log10|log2|logpdf|logpmf|logsdf|lowcase|max|mdy|mean|min|minute|mod|month|mopen|mort|n|netpv|nmiss|normal|note|npv|open|ordinal|pathname|pdf|peek|peekc|pmf|point|poisson|poke|probbeta|probbnml|probchi|probf|probgam|probhypr|probit|probnegb|probnorm|probt|put|putc|putn|qtr|quote|ranbin|rancau|ranexp|rangam|range|rank|rannor|ranpoi|rantbl|rantri|ranuni|repeat|resolve|reverse|rewind|right|round|saving|scan|sdf|second|sign|sin|sinh|skewness|soundex|spedis|sqrt|std|stderr|stfips|stname|stnamel|substr|sum|symget|sysget|sysmsg|sysprod|sysrc|system|tan|tanh|time|timepart|tinv|tnonct|today|translate|tranwrd|trigamma|trim|trimn|trunc|uniform|upcase|uss|var|varfmt|varinfmt|varlabel|varlen|varname|varnum|varray|varrayx|vartype|verify|vformat|vformatd|vformatdx|vformatn|vformatnx|vformatw|vformatwx|vformatx|vinarray|vinarrayx|vinformat|vinformatd|vinformatdx|vinformatn|vinformatnx|vinformatw|vinformatwx|vinformatx|vlabel|vlabelx|vlength|vlengthx|vname|vnamex|vtype|vtypex|weekday|year|yyq|zipfips|zipname|zipnamel|zipstate",n="bquote|nrbquote|cmpres|qcmpres|compstor|datatyp|display|do|else|end|eval|global|goto|if|index|input|keydef|label|left|length|let|local|lowcase|macro|mend|nrbquote|nrquote|nrstr|put|qcmpres|qleft|qlowcase|qscan|qsubstr|qsysfunc|qtrim|quote|qupcase|scan|str|substr|superq|syscall|sysevalf|sysexec|sysfunc|sysget|syslput|sysprod|sysrc|sysrput|then|to|trim|unquote|until|upcase|verify|while|window";return{aliases:["sas","SAS"],cI:!0,k:{literal:"null missing _all_ _automatic_ _character_ _infile_ _n_ _name_ _null_ _numeric_ _user_ _webout_",meta:t},c:[{cN:"keyword",b:/^\s*(proc [\w\d_]+|data|run|quit)[\s\;]/},{cN:"variable",b:/\&[a-zA-Z_\&][a-zA-Z0-9_]*\.?/},{cN:"emphasis",b:/^\s*datalines|cards.*;/,e:/^\s*;\s*$/},{cN:"built_in",b:"%("+n+")"},{cN:"name",b:/%[a-zA-Z_][a-zA-Z_0-9]*/},{cN:"meta",b:"[^%]("+a+")[(]"},{cN:"string",v:[e.ASM,e.QSM]},e.C("\\*",";"),e.CBCM]}});
\ No newline at end of file
+hljs.registerLanguage("sas",function(){"use strict";return function(e){return{name:"SAS",aliases:["sas","SAS"],case_insensitive:!0,keywords:{literal:"null missing _all_ _automatic_ _character_ _infile_ _n_ _name_ _null_ _numeric_ _user_ _webout_",meta:"do if then else end until while abort array attrib by call cards cards4 catname continue datalines datalines4 delete delim delimiter display dm drop endsas error file filename footnote format goto in infile informat input keep label leave length libname link list lostcard merge missing modify options output out page put redirect remove rename replace retain return select set skip startsas stop title update waitsas where window x systask add and alter as cascade check create delete describe distinct drop foreign from group having index insert into in key like message modify msgtype not null on or order primary references reset restrict select set table unique update validate view where"},contains:[{className:"keyword",begin:/^\s*(proc [\w\d_]+|data|run|quit)[\s\;]/},{className:"variable",begin:/\&[a-zA-Z_\&][a-zA-Z0-9_]*\.?/},{className:"emphasis",begin:/^\s*datalines|cards.*;/,end:/^\s*;\s*$/},{className:"built_in",begin:"%(bquote|nrbquote|cmpres|qcmpres|compstor|datatyp|display|do|else|end|eval|global|goto|if|index|input|keydef|label|left|length|let|local|lowcase|macro|mend|nrbquote|nrquote|nrstr|put|qcmpres|qleft|qlowcase|qscan|qsubstr|qsysfunc|qtrim|quote|qupcase|scan|str|substr|superq|syscall|sysevalf|sysexec|sysfunc|sysget|syslput|sysprod|sysrc|sysrput|then|to|trim|unquote|until|upcase|verify|while|window)"},{className:"name",begin:/%[a-zA-Z_][a-zA-Z_0-9]*/},{className:"meta",begin:"[^%](abs|addr|airy|arcos|arsin|atan|attrc|attrn|band|betainv|blshift|bnot|bor|brshift|bxor|byte|cdf|ceil|cexist|cinv|close|cnonct|collate|compbl|compound|compress|cos|cosh|css|curobs|cv|daccdb|daccdbsl|daccsl|daccsyd|dacctab|dairy|date|datejul|datepart|datetime|day|dclose|depdb|depdbsl|depdbsl|depsl|depsl|depsyd|depsyd|deptab|deptab|dequote|dhms|dif|digamma|dim|dinfo|dnum|dopen|doptname|doptnum|dread|dropnote|dsname|erf|erfc|exist|exp|fappend|fclose|fcol|fdelete|fetch|fetchobs|fexist|fget|fileexist|filename|fileref|finfo|finv|fipname|fipnamel|fipstate|floor|fnonct|fnote|fopen|foptname|foptnum|fpoint|fpos|fput|fread|frewind|frlen|fsep|fuzz|fwrite|gaminv|gamma|getoption|getvarc|getvarn|hbound|hms|hosthelp|hour|ibessel|index|indexc|indexw|input|inputc|inputn|int|intck|intnx|intrr|irr|jbessel|juldate|kurtosis|lag|lbound|left|length|lgamma|libname|libref|log|log10|log2|logpdf|logpmf|logsdf|lowcase|max|mdy|mean|min|minute|mod|month|mopen|mort|n|netpv|nmiss|normal|note|npv|open|ordinal|pathname|pdf|peek|peekc|pmf|point|poisson|poke|probbeta|probbnml|probchi|probf|probgam|probhypr|probit|probnegb|probnorm|probt|put|putc|putn|qtr|quote|ranbin|rancau|ranexp|rangam|range|rank|rannor|ranpoi|rantbl|rantri|ranuni|repeat|resolve|reverse|rewind|right|round|saving|scan|sdf|second|sign|sin|sinh|skewness|soundex|spedis|sqrt|std|stderr|stfips|stname|stnamel|substr|sum|symget|sysget|sysmsg|sysprod|sysrc|system|tan|tanh|time|timepart|tinv|tnonct|today|translate|tranwrd|trigamma|trim|trimn|trunc|uniform|upcase|uss|var|varfmt|varinfmt|varlabel|varlen|varname|varnum|varray|varrayx|vartype|verify|vformat|vformatd|vformatdx|vformatn|vformatnx|vformatw|vformatwx|vformatx|vinarray|vinarrayx|vinformat|vinformatd|vinformatdx|vinformatn|vinformatnx|vinformatw|vinformatwx|vinformatx|vlabel|vlabelx|vlength|vlengthx|vname|vnamex|vtype|vtypex|weekday|year|yyq|zipfips|zipname|zipnamel|zipstate)[(]"},{className:"string",variants:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},e.COMMENT("\\*",";"),e.C_BLOCK_COMMENT_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/scala.min.js b/vendor/assets/javascripts/highlightjs/languages/scala.min.js
index 4b593356f7..2ab49f3af8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/scala.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/scala.min.js
@@ -1 +1 @@
-hljs.registerLanguage("scala",function(e){var t={cN:"meta",b:"@[A-Za-z]+"},a={cN:"subst",v:[{b:"\\$[A-Za-z0-9_]+"},{b:"\\${",e:"}"}]},r={cN:"string",v:[{b:'"',e:'"',i:"\\n",c:[e.BE]},{b:'"""',e:'"""',r:10},{b:'[a-z]+"',e:'"',i:"\\n",c:[e.BE,a]},{cN:"string",b:'[a-z]+"""',e:'"""',c:[a],r:10}]},c={cN:"symbol",b:"'\\w[\\w\\d_]*(?!')"},i={cN:"type",b:"\\b[A-Z][A-Za-z0-9_]*",r:0},s={cN:"title",b:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/,r:0},n={cN:"class",bK:"class object trait type",e:/[:={\[\n;]/,eE:!0,c:[{bK:"extends with",r:10},{b:/\[/,e:/\]/,eB:!0,eE:!0,r:0,c:[i]},{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,r:0,c:[i]},s]},l={cN:"function",bK:"def",e:/[:={\[(\n;]/,eE:!0,c:[s]};return{k:{literal:"true false null",keyword:"type yield lazy override def with val var sealed abstract private trait object if forSome for while throw finally protected extends import final return else break new catch super class case package default try this match continue throws implicit"},c:[e.CLCM,e.CBCM,r,c,i,l,n,e.CNM,t]}});
\ No newline at end of file
+hljs.registerLanguage("scala",function(){"use strict";return function(e){var n={className:"subst",variants:[{begin:"\\$[A-Za-z0-9_]+"},{begin:"\\${",end:"}"}]},a={className:"string",variants:[{begin:'"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{begin:'"""',end:'"""',relevance:10},{begin:'[a-z]+"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE,n]},{className:"string",begin:'[a-z]+"""',end:'"""',contains:[n],relevance:10}]},s={className:"type",begin:"\\b[A-Z][A-Za-z0-9_]*",relevance:0},t={className:"title",begin:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/,relevance:0},i={className:"class",beginKeywords:"class object trait type",end:/[:={\[\n;]/,excludeEnd:!0,contains:[{beginKeywords:"extends with",relevance:10},{begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0,relevance:0,contains:[s]},{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,relevance:0,contains:[s]},t]},l={className:"function",beginKeywords:"def",end:/[:={\[(\n;]/,excludeEnd:!0,contains:[t]};return{name:"Scala",keywords:{literal:"true false null",keyword:"type yield lazy override def with val var sealed abstract private trait object if forSome for while throw finally protected extends import final return else break new catch super class case package default try this match continue throws implicit"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,{className:"symbol",begin:"'\\w[\\w\\d_]*(?!')"},s,l,i,e.C_NUMBER_MODE,{className:"meta",begin:"@[A-Za-z]+"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/scheme.min.js b/vendor/assets/javascripts/highlightjs/languages/scheme.min.js
index a5e82d1164..9ab4af08d4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/scheme.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/scheme.min.js
@@ -1 +1 @@
-hljs.registerLanguage("scheme",function(e){var t="[^\\(\\)\\[\\]\\{\\}\",'`;#|\\\\\\s]+",r="(\\-|\\+)?\\d+([./]\\d+)?",a=r+"[+\\-]"+r+"i",i={"builtin-name":"case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules ' * + , ,@ - ... / ; < <= = => > >= ` abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"},n={cN:"meta",b:"^#!",e:"$"},c={cN:"literal",b:"(#t|#f|#\\\\"+t+"|#\\\\.)"},l={cN:"number",v:[{b:r,r:0},{b:a,r:0},{b:"#b[0-1]+(/[0-1]+)?"},{b:"#o[0-7]+(/[0-7]+)?"},{b:"#x[0-9a-f]+(/[0-9a-f]+)?"}]},s=e.QSM,o=[e.C(";","$",{r:0}),e.C("#\\|","\\|#")],u={b:t,r:0},p={cN:"symbol",b:"'"+t},d={eW:!0,r:0},m={v:[{b:/'/},{b:"`"}],c:[{b:"\\(",e:"\\)",c:["self",c,s,l,u,p]}]},g={cN:"name",b:t,l:t,k:i},h={b:/lambda/,eW:!0,rB:!0,c:[g,{b:/\(/,e:/\)/,endsParent:!0,c:[u]}]},b={v:[{b:"\\(",e:"\\)"},{b:"\\[",e:"\\]"}],c:[h,g,d]};return d.c=[c,l,s,u,p,m,b].concat(o),{i:/\S/,c:[n,l,s,p,m,b].concat(o)}});
\ No newline at end of file
+hljs.registerLanguage("scheme",function(){"use strict";return function(e){var t="[^\\(\\)\\[\\]\\{\\}\",'`;#|\\\\\\s]+",n={$pattern:t,"builtin-name":"case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules ' * + , ,@ - ... / ; < <= = => > >= ` abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"},r={className:"literal",begin:"(#t|#f|#\\\\"+t+"|#\\\\.)"},a={className:"number",variants:[{begin:"(\\-|\\+)?\\d+([./]\\d+)?",relevance:0},{begin:"(\\-|\\+)?\\d+([./]\\d+)?[+\\-](\\-|\\+)?\\d+([./]\\d+)?i",relevance:0},{begin:"#b[0-1]+(/[0-1]+)?"},{begin:"#o[0-7]+(/[0-7]+)?"},{begin:"#x[0-9a-f]+(/[0-9a-f]+)?"}]},i=e.QUOTE_STRING_MODE,c=[e.COMMENT(";","$",{relevance:0}),e.COMMENT("#\\|","\\|#")],s={begin:t,relevance:0},l={className:"symbol",begin:"'"+t},o={endsWithParent:!0,relevance:0},u={variants:[{begin:/'/},{begin:"`"}],contains:[{begin:"\\(",end:"\\)",contains:["self",r,i,a,s,l]}]},g={className:"name",begin:t,keywords:n},d={variants:[{begin:"\\(",end:"\\)"},{begin:"\\[",end:"\\]"}],contains:[{begin:/lambda/,endsWithParent:!0,returnBegin:!0,contains:[g,{begin:/\(/,end:/\)/,endsParent:!0,contains:[s]}]},g,o]};return o.contains=[r,a,i,s,l,u,d].concat(c),{name:"Scheme",illegal:/\S/,contains:[e.SHEBANG(),a,i,l,u,d].concat(c)}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/scilab.min.js b/vendor/assets/javascripts/highlightjs/languages/scilab.min.js
index 9e15e7e0c2..00fe529eef 100644
--- a/vendor/assets/javascripts/highlightjs/languages/scilab.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/scilab.min.js
@@ -1 +1 @@
-hljs.registerLanguage("scilab",function(e){var s=[e.CNM,{cN:"string",b:"'|\"",e:"'|\"",c:[e.BE,{b:"''"}]}];return{aliases:["sci"],l:/%?\w+/,k:{keyword:"abort break case clear catch continue do elseif else endfunction end for function global if pause return resume select try then while",literal:"%f %F %t %T %pi %eps %inf %nan %e %i %z %s",built_in:"abs and acos asin atan ceil cd chdir clearglobal cosh cos cumprod deff disp error exec execstr exists exp eye gettext floor fprintf fread fsolve imag isdef isempty isinfisnan isvector lasterror length load linspace list listfiles log10 log2 log max min msprintf mclose mopen ones or pathconvert poly printf prod pwd rand real round sinh sin size gsort sprintf sqrt strcat strcmps tring sum system tanh tan type typename warning zeros matrix"},i:'("|#|/\\*|\\s+/\\w+)',c:[{cN:"function",bK:"function",e:"$",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)"}]},{b:"[a-zA-Z_][a-zA-Z_0-9]*('+[\\.']*|[\\.']+)",e:"",r:0},{b:"\\[",e:"\\]'*[\\.']*",r:0,c:s},e.C("//","$")].concat(s)}});
\ No newline at end of file
+hljs.registerLanguage("scilab",function(){"use strict";return function(e){var n=[e.C_NUMBER_MODE,{className:"string",begin:"'|\"",end:"'|\"",contains:[e.BACKSLASH_ESCAPE,{begin:"''"}]}];return{name:"Scilab",aliases:["sci"],keywords:{$pattern:/%?\w+/,keyword:"abort break case clear catch continue do elseif else endfunction end for function global if pause return resume select try then while",literal:"%f %F %t %T %pi %eps %inf %nan %e %i %z %s",built_in:"abs and acos asin atan ceil cd chdir clearglobal cosh cos cumprod deff disp error exec execstr exists exp eye gettext floor fprintf fread fsolve imag isdef isempty isinfisnan isvector lasterror length load linspace list listfiles log10 log2 log max min msprintf mclose mopen ones or pathconvert poly printf prod pwd rand real round sinh sin size gsort sprintf sqrt strcat strcmps tring sum system tanh tan type typename warning zeros matrix"},illegal:'("|#|/\\*|\\s+/\\w+)',contains:[{className:"function",beginKeywords:"function",end:"$",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",begin:"\\(",end:"\\)"}]},{begin:"[a-zA-Z_][a-zA-Z_0-9]*('+[\\.']*|[\\.']+)",end:"",relevance:0},{begin:"\\[",end:"\\]'*[\\.']*",relevance:0,contains:n},e.COMMENT("//","$")].concat(n)}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/scss.min.js b/vendor/assets/javascripts/highlightjs/languages/scss.min.js
index 9420f760c0..96d9774934 100644
--- a/vendor/assets/javascripts/highlightjs/languages/scss.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/scss.min.js
@@ -1 +1 @@
-hljs.registerLanguage("scss",function(e){var t="[a-zA-Z-][a-zA-Z0-9_-]*",i={cN:"variable",b:"(\\$"+t+")\\b"},r={cN:"number",b:"#[0-9A-Fa-f]+"};({cN:"attribute",b:"[A-Z\\_\\.\\-]+",e:":",eE:!0,i:"[^\\s]",starts:{eW:!0,eE:!0,c:[r,e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"meta",b:"!important"}]}});return{cI:!0,i:"[=/|']",c:[e.CLCM,e.CBCM,{cN:"selector-id",b:"\\#[A-Za-z0-9_-]+",r:0},{cN:"selector-class",b:"\\.[A-Za-z0-9_-]+",r:0},{cN:"selector-attr",b:"\\[",e:"\\]",i:"$"},{cN:"selector-tag",b:"\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b",r:0},{b:":(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)"},{b:"::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)"},i,{cN:"attribute",b:"\\b(z-index|word-wrap|word-spacing|word-break|width|widows|white-space|visibility|vertical-align|unicode-bidi|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform|top|text-underline-position|text-transform|text-shadow|text-rendering|text-overflow|text-indent|text-decoration-style|text-decoration-line|text-decoration-color|text-decoration|text-align-last|text-align|tab-size|table-layout|right|resize|quotes|position|pointer-events|perspective-origin|perspective|page-break-inside|page-break-before|page-break-after|padding-top|padding-right|padding-left|padding-bottom|padding|overflow-y|overflow-x|overflow-wrap|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|order|opacity|object-position|object-fit|normal|none|nav-up|nav-right|nav-left|nav-index|nav-down|min-width|min-height|max-width|max-height|mask|marks|margin-top|margin-right|margin-left|margin-bottom|margin|list-style-type|list-style-position|list-style-image|list-style|line-height|letter-spacing|left|justify-content|initial|inherit|ime-mode|image-orientation|image-resolution|image-rendering|icon|hyphens|height|font-weight|font-variant-ligatures|font-variant|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|float|flex-wrap|flex-shrink|flex-grow|flex-flow|flex-direction|flex-basis|flex|filter|empty-cells|display|direction|cursor|counter-reset|counter-increment|content|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|columns|color|clip-path|clip|clear|caption-side|break-inside|break-before|break-after|box-sizing|box-shadow|box-decoration-break|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-left-width|border-left-style|border-left-color|border-left|border-image-width|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-attachment|background-blend-mode|background|backface-visibility|auto|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|align-self|align-items|align-content)\\b",i:"[^\\s]"},{b:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"},{b:":",e:";",c:[i,r,e.CSSNM,e.QSM,e.ASM,{cN:"meta",b:"!important"}]},{b:"@",e:"[{;]",k:"mixin include extend for if else each while charset import debug media page content font-face namespace warn",c:[i,e.QSM,e.ASM,r,e.CSSNM,{b:"\\s[A-Za-z0-9_.-]+",r:0}]}]}});
\ No newline at end of file
+hljs.registerLanguage("scss",function(){"use strict";return function(e){var t={className:"variable",begin:"(\\$[a-zA-Z-][a-zA-Z0-9_-]*)\\b"},i={className:"number",begin:"#[0-9A-Fa-f]+"};return e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_BLOCK_COMMENT_MODE,{name:"SCSS",case_insensitive:!0,illegal:"[=/|']",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"selector-id",begin:"\\#[A-Za-z0-9_-]+",relevance:0},{className:"selector-class",begin:"\\.[A-Za-z0-9_-]+",relevance:0},{className:"selector-attr",begin:"\\[",end:"\\]",illegal:"$"},{className:"selector-tag",begin:"\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b",relevance:0},{className:"selector-pseudo",begin:":(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)"},{className:"selector-pseudo",begin:"::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)"},t,{className:"attribute",begin:"\\b(src|z-index|word-wrap|word-spacing|word-break|width|widows|white-space|visibility|vertical-align|unicode-bidi|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform|top|text-underline-position|text-transform|text-shadow|text-rendering|text-overflow|text-indent|text-decoration-style|text-decoration-line|text-decoration-color|text-decoration|text-align-last|text-align|tab-size|table-layout|right|resize|quotes|position|pointer-events|perspective-origin|perspective|page-break-inside|page-break-before|page-break-after|padding-top|padding-right|padding-left|padding-bottom|padding|overflow-y|overflow-x|overflow-wrap|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|order|opacity|object-position|object-fit|normal|none|nav-up|nav-right|nav-left|nav-index|nav-down|min-width|min-height|max-width|max-height|mask|marks|margin-top|margin-right|margin-left|margin-bottom|margin|list-style-type|list-style-position|list-style-image|list-style|line-height|letter-spacing|left|justify-content|initial|inherit|ime-mode|image-orientation|image-resolution|image-rendering|icon|hyphens|height|font-weight|font-variant-ligatures|font-variant|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|float|flex-wrap|flex-shrink|flex-grow|flex-flow|flex-direction|flex-basis|flex|filter|empty-cells|display|direction|cursor|counter-reset|counter-increment|content|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|columns|color|clip-path|clip|clear|caption-side|break-inside|break-before|break-after|box-sizing|box-shadow|box-decoration-break|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-left-width|border-left-style|border-left-color|border-left|border-image-width|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-attachment|background-blend-mode|background|backface-visibility|auto|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|align-self|align-items|align-content)\\b",illegal:"[^\\s]"},{begin:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"},{begin:":",end:";",contains:[t,i,e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{className:"meta",begin:"!important"}]},{begin:"@(page|font-face)",lexemes:"@[a-z-]+",keywords:"@page @font-face"},{begin:"@",end:"[{;]",returnBegin:!0,keywords:"and or not only",contains:[{begin:"@[a-z-]+",className:"keyword"},t,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,i,e.CSS_NUMBER_MODE]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/shell.min.js b/vendor/assets/javascripts/highlightjs/languages/shell.min.js
index 5ebb125ddc..713ebe819e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/shell.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/shell.min.js
@@ -1 +1 @@
-hljs.registerLanguage("shell",function(s){return{aliases:["console"],c:[{cN:"meta",b:"^\\s{0,3}[\\w\\d\\[\\]()@-]*[>%$#]",starts:{e:"$",sL:"bash"}}]}});
\ No newline at end of file
+hljs.registerLanguage("shell",function(){"use strict";return function(s){return{name:"Shell Session",aliases:["console"],contains:[{className:"meta",begin:"^\\s{0,3}[/\\w\\d\\[\\]()@-]*[>%$#]",starts:{end:"$",subLanguage:"bash"}}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/smali.min.js b/vendor/assets/javascripts/highlightjs/languages/smali.min.js
index 4f459a2f9b..d280e6ce9d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/smali.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/smali.min.js
@@ -1 +1 @@
-hljs.registerLanguage("smali",function(t){var s=["add","and","cmp","cmpg","cmpl","const","div","double","float","goto","if","int","long","move","mul","neg","new","nop","not","or","rem","return","shl","shr","sput","sub","throw","ushr","xor"],e=["aget","aput","array","check","execute","fill","filled","goto/16","goto/32","iget","instance","invoke","iput","monitor","packed","sget","sparse"],r=["transient","constructor","abstract","final","synthetic","public","private","protected","static","bridge","system"];return{aliases:["smali"],c:[{cN:"string",b:'"',e:'"',r:0},t.C("#","$",{r:0}),{cN:"keyword",v:[{b:"\\s*\\.end\\s[a-zA-Z0-9]*"},{b:"^[ ]*\\.[a-zA-Z]*",r:0},{b:"\\s:[a-zA-Z_0-9]*",r:0},{b:"\\s("+r.join("|")+")"}]},{cN:"built_in",v:[{b:"\\s("+s.join("|")+")\\s"},{b:"\\s("+s.join("|")+")((\\-|/)[a-zA-Z0-9]+)+\\s",r:10},{b:"\\s("+e.join("|")+")((\\-|/)[a-zA-Z0-9]+)*\\s",r:10}]},{cN:"class",b:"L[^(;:\n]*;",r:0},{b:"[vp][0-9]+"}]}});
\ No newline at end of file
+hljs.registerLanguage("smali",function(){"use strict";return function(e){var n=["add","and","cmp","cmpg","cmpl","const","div","double","float","goto","if","int","long","move","mul","neg","new","nop","not","or","rem","return","shl","shr","sput","sub","throw","ushr","xor"];return{name:"Smali",aliases:["smali"],contains:[{className:"string",begin:'"',end:'"',relevance:0},e.COMMENT("#","$",{relevance:0}),{className:"keyword",variants:[{begin:"\\s*\\.end\\s[a-zA-Z0-9]*"},{begin:"^[ ]*\\.[a-zA-Z]*",relevance:0},{begin:"\\s:[a-zA-Z_0-9]*",relevance:0},{begin:"\\s(transient|constructor|abstract|final|synthetic|public|private|protected|static|bridge|system)"}]},{className:"built_in",variants:[{begin:"\\s("+n.join("|")+")\\s"},{begin:"\\s("+n.join("|")+")((\\-|/)[a-zA-Z0-9]+)+\\s",relevance:10},{begin:"\\s(aget|aput|array|check|execute|fill|filled|goto/16|goto/32|iget|instance|invoke|iput|monitor|packed|sget|sparse)((\\-|/)[a-zA-Z0-9]+)*\\s",relevance:10}]},{className:"class",begin:"L[^(;:\n]*;",relevance:0},{begin:"[vp][0-9]+"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/smalltalk.min.js b/vendor/assets/javascripts/highlightjs/languages/smalltalk.min.js
index 46a1b9a567..05ef50cf30 100644
--- a/vendor/assets/javascripts/highlightjs/languages/smalltalk.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/smalltalk.min.js
@@ -1 +1 @@
-hljs.registerLanguage("smalltalk",function(e){var s="[a-z][a-zA-Z0-9_]*",a={cN:"string",b:"\\$.{1}"},r={cN:"symbol",b:"#"+e.UIR};return{aliases:["st"],k:"self super nil true false thisContext",c:[e.C('"','"'),e.ASM,{cN:"type",b:"\\b[A-Z][A-Za-z0-9_]*",r:0},{b:s+":",r:0},e.CNM,r,a,{b:"\\|[ ]*"+s+"([ ]+"+s+")*[ ]*\\|",rB:!0,e:/\|/,i:/\S/,c:[{b:"(\\|[ ]*)?"+s}]},{b:"\\#\\(",e:"\\)",c:[e.ASM,a,e.CNM,r]}]}});
\ No newline at end of file
+hljs.registerLanguage("smalltalk",function(){"use strict";return function(e){var a={className:"string",begin:"\\$.{1}"},n={className:"symbol",begin:"#"+e.UNDERSCORE_IDENT_RE};return{name:"Smalltalk",aliases:["st"],keywords:"self super nil true false thisContext",contains:[e.COMMENT('"','"'),e.APOS_STRING_MODE,{className:"type",begin:"\\b[A-Z][A-Za-z0-9_]*",relevance:0},{begin:"[a-z][a-zA-Z0-9_]*:",relevance:0},e.C_NUMBER_MODE,n,a,{begin:"\\|[ ]*[a-z][a-zA-Z0-9_]*([ ]+[a-z][a-zA-Z0-9_]*)*[ ]*\\|",returnBegin:!0,end:/\|/,illegal:/\S/,contains:[{begin:"(\\|[ ]*)?[a-z][a-zA-Z0-9_]*"}]},{begin:"\\#\\(",end:"\\)",contains:[e.APOS_STRING_MODE,a,e.C_NUMBER_MODE,n]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/sml.min.js b/vendor/assets/javascripts/highlightjs/languages/sml.min.js
index 7716c0d413..67fb6d8323 100644
--- a/vendor/assets/javascripts/highlightjs/languages/sml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/sml.min.js
@@ -1 +1 @@
-hljs.registerLanguage("sml",function(e){return{aliases:["ml"],k:{keyword:"abstype and andalso as case datatype do else end eqtype exception fn fun functor handle if in include infix infixr let local nonfix of op open orelse raise rec sharing sig signature struct structure then type val with withtype where while",built_in:"array bool char exn int list option order real ref string substring vector unit word",literal:"true false NONE SOME LESS EQUAL GREATER nil"},i:/\/\/|>>/,l:"[a-z_]\\w*!?",c:[{cN:"literal",b:/\[(\|\|)?\]|\(\)/,r:0},e.C("\\(\\*","\\*\\)",{c:["self"]}),{cN:"symbol",b:"'[A-Za-z_](?!')[\\w']*"},{cN:"type",b:"`[A-Z][\\w']*"},{cN:"type",b:"\\b[A-Z][\\w']*",r:0},{b:"[a-z_]\\w*'[\\w']*"},e.inherit(e.ASM,{cN:"string",r:0}),e.inherit(e.QSM,{i:null}),{cN:"number",b:"\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",r:0},{b:/[-=]>/}]}});
\ No newline at end of file
+hljs.registerLanguage("sml",function(){"use strict";return function(e){return{name:"SML (Standard ML)",aliases:["ml"],keywords:{$pattern:"[a-z_]\\w*!?",keyword:"abstype and andalso as case datatype do else end eqtype exception fn fun functor handle if in include infix infixr let local nonfix of op open orelse raise rec sharing sig signature struct structure then type val with withtype where while",built_in:"array bool char exn int list option order real ref string substring vector unit word",literal:"true false NONE SOME LESS EQUAL GREATER nil"},illegal:/\/\/|>>/,contains:[{className:"literal",begin:/\[(\|\|)?\]|\(\)/,relevance:0},e.COMMENT("\\(\\*","\\*\\)",{contains:["self"]}),{className:"symbol",begin:"'[A-Za-z_](?!')[\\w']*"},{className:"type",begin:"`[A-Z][\\w']*"},{className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},{begin:"[a-z_]\\w*'[\\w']*"},e.inherit(e.APOS_STRING_MODE,{className:"string",relevance:0}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),{className:"number",begin:"\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",relevance:0},{begin:/[-=]>/}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/sqf.min.js b/vendor/assets/javascripts/highlightjs/languages/sqf.min.js
index 96734329aa..730aacd285 100644
--- a/vendor/assets/javascripts/highlightjs/languages/sqf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/sqf.min.js
@@ -1 +1 @@
-hljs.registerLanguage("sqf",function(e){var t=e.getLanguage("cpp").exports,a={cN:"variable",b:/\b_+[a-zA-Z_]\w*/},o={cN:"title",b:/[a-zA-Z][a-zA-Z0-9]+_fnc_\w*/},r={cN:"string",v:[{b:'"',e:'"',c:[{b:'""',r:0}]},{b:"'",e:"'",c:[{b:"''",r:0}]}]};return{aliases:["sqf"],cI:!0,k:{keyword:"case catch default do else exit exitWith for forEach from if private switch then throw to try waitUntil while with",built_in:"abs accTime acos action actionIDs actionKeys actionKeysImages actionKeysNames actionKeysNamesArray actionName actionParams activateAddons activatedAddons activateKey add3DENConnection add3DENEventHandler add3DENLayer addAction addBackpack addBackpackCargo addBackpackCargoGlobal addBackpackGlobal addCamShake addCuratorAddons addCuratorCameraArea addCuratorEditableObjects addCuratorEditingArea addCuratorPoints addEditorObject addEventHandler addForce addGoggles addGroupIcon addHandgunItem addHeadgear addItem addItemCargo addItemCargoGlobal addItemPool addItemToBackpack addItemToUniform addItemToVest addLiveStats addMagazine addMagazineAmmoCargo addMagazineCargo addMagazineCargoGlobal addMagazineGlobal addMagazinePool addMagazines addMagazineTurret addMenu addMenuItem addMissionEventHandler addMPEventHandler addMusicEventHandler addOwnedMine addPlayerScores addPrimaryWeaponItem addPublicVariableEventHandler addRating addResources addScore addScoreSide addSecondaryWeaponItem addSwitchableUnit addTeamMember addToRemainsCollector addTorque addUniform addVehicle addVest addWaypoint addWeapon addWeaponCargo addWeaponCargoGlobal addWeaponGlobal addWeaponItem addWeaponPool addWeaponTurret admin agent agents AGLToASL aimedAtTarget aimPos airDensityRTD airplaneThrottle airportSide AISFinishHeal alive all3DENEntities allAirports allControls allCurators allCutLayers allDead allDeadMen allDisplays allGroups allMapMarkers allMines allMissionObjects allow3DMode allowCrewInImmobile allowCuratorLogicIgnoreAreas allowDamage allowDammage allowFileOperations allowFleeing allowGetIn allowSprint allPlayers allSimpleObjects allSites allTurrets allUnits allUnitsUAV allVariables ammo ammoOnPylon and animate animateBay animateDoor animatePylon animateSource animationNames animationPhase animationSourcePhase animationState append apply armoryPoints arrayIntersect asin ASLToAGL ASLToATL assert assignAsCargo assignAsCargoIndex assignAsCommander assignAsDriver assignAsGunner assignAsTurret assignCurator assignedCargo assignedCommander assignedDriver assignedGunner assignedItems assignedTarget assignedTeam assignedVehicle assignedVehicleRole assignItem assignTeam assignToAirport atan atan2 atg ATLToASL attachedObject attachedObjects attachedTo attachObject attachTo attackEnabled backpack backpackCargo backpackContainer backpackItems backpackMagazines backpackSpaceFor behaviour benchmark binocular boundingBox boundingBoxReal boundingCenter breakOut breakTo briefingName buildingExit buildingPos buttonAction buttonSetAction cadetMode call callExtension camCommand camCommit camCommitPrepared camCommitted camConstuctionSetParams camCreate camDestroy cameraEffect cameraEffectEnableHUD cameraInterest cameraOn cameraView campaignConfigFile camPreload camPreloaded camPrepareBank camPrepareDir camPrepareDive camPrepareFocus camPrepareFov camPrepareFovRange camPreparePos camPrepareRelPos camPrepareTarget camSetBank camSetDir camSetDive camSetFocus camSetFov camSetFovRange camSetPos camSetRelPos camSetTarget camTarget camUseNVG canAdd canAddItemToBackpack canAddItemToUniform canAddItemToVest cancelSimpleTaskDestination canFire canMove canSlingLoad canStand canSuspend canTriggerDynamicSimulation canUnloadInCombat canVehicleCargo captive captiveNum cbChecked cbSetChecked ceil channelEnabled cheatsEnabled checkAIFeature checkVisibility className clearAllItemsFromBackpack clearBackpackCargo clearBackpackCargoGlobal clearGroupIcons clearItemCargo clearItemCargoGlobal clearItemPool clearMagazineCargo clearMagazineCargoGlobal clearMagazinePool clearOverlay clearRadio clearWeaponCargo clearWeaponCargoGlobal clearWeaponPool clientOwner closeDialog closeDisplay closeOverlay collapseObjectTree collect3DENHistory collectiveRTD combatMode commandArtilleryFire commandChat commander commandFire commandFollow commandFSM commandGetOut commandingMenu commandMove commandRadio commandStop commandSuppressiveFire commandTarget commandWatch comment commitOverlay compile compileFinal completedFSM composeText configClasses configFile configHierarchy configName configProperties configSourceAddonList configSourceMod configSourceModList confirmSensorTarget connectTerminalToUAV controlsGroupCtrl copyFromClipboard copyToClipboard copyWaypoints cos count countEnemy countFriendly countSide countType countUnknown create3DENComposition create3DENEntity createAgent createCenter createDialog createDiaryLink createDiaryRecord createDiarySubject createDisplay createGearDialog createGroup createGuardedPoint createLocation createMarker createMarkerLocal createMenu createMine createMissionDisplay createMPCampaignDisplay createSimpleObject createSimpleTask createSite createSoundSource createTask createTeam createTrigger createUnit createVehicle createVehicleCrew createVehicleLocal crew ctAddHeader ctAddRow ctClear ctCurSel ctData ctFindHeaderRows ctFindRowHeader ctHeaderControls ctHeaderCount ctRemoveHeaders ctRemoveRows ctrlActivate ctrlAddEventHandler ctrlAngle ctrlAutoScrollDelay ctrlAutoScrollRewind ctrlAutoScrollSpeed ctrlChecked ctrlClassName ctrlCommit ctrlCommitted ctrlCreate ctrlDelete ctrlEnable ctrlEnabled ctrlFade ctrlHTMLLoaded ctrlIDC ctrlIDD ctrlMapAnimAdd ctrlMapAnimClear ctrlMapAnimCommit ctrlMapAnimDone ctrlMapCursor ctrlMapMouseOver ctrlMapScale ctrlMapScreenToWorld ctrlMapWorldToScreen ctrlModel ctrlModelDirAndUp ctrlModelScale ctrlParent ctrlParentControlsGroup ctrlPosition ctrlRemoveAllEventHandlers ctrlRemoveEventHandler ctrlScale ctrlSetActiveColor ctrlSetAngle ctrlSetAutoScrollDelay ctrlSetAutoScrollRewind ctrlSetAutoScrollSpeed ctrlSetBackgroundColor ctrlSetChecked ctrlSetEventHandler ctrlSetFade ctrlSetFocus ctrlSetFont ctrlSetFontH1 ctrlSetFontH1B ctrlSetFontH2 ctrlSetFontH2B ctrlSetFontH3 ctrlSetFontH3B ctrlSetFontH4 ctrlSetFontH4B ctrlSetFontH5 ctrlSetFontH5B ctrlSetFontH6 ctrlSetFontH6B ctrlSetFontHeight ctrlSetFontHeightH1 ctrlSetFontHeightH2 ctrlSetFontHeightH3 ctrlSetFontHeightH4 ctrlSetFontHeightH5 ctrlSetFontHeightH6 ctrlSetFontHeightSecondary ctrlSetFontP ctrlSetFontPB ctrlSetFontSecondary ctrlSetForegroundColor ctrlSetModel ctrlSetModelDirAndUp ctrlSetModelScale ctrlSetPixelPrecision ctrlSetPosition ctrlSetScale ctrlSetStructuredText ctrlSetText ctrlSetTextColor ctrlSetTooltip ctrlSetTooltipColorBox ctrlSetTooltipColorShade ctrlSetTooltipColorText ctrlShow ctrlShown ctrlText ctrlTextHeight ctrlTextWidth ctrlType ctrlVisible ctRowControls ctRowCount ctSetCurSel ctSetData ctSetHeaderTemplate ctSetRowTemplate ctSetValue ctValue curatorAddons curatorCamera curatorCameraArea curatorCameraAreaCeiling curatorCoef curatorEditableObjects curatorEditingArea curatorEditingAreaType curatorMouseOver curatorPoints curatorRegisteredObjects curatorSelected curatorWaypointCost current3DENOperation currentChannel currentCommand currentMagazine currentMagazineDetail currentMagazineDetailTurret currentMagazineTurret currentMuzzle currentNamespace currentTask currentTasks currentThrowable currentVisionMode currentWaypoint currentWeapon currentWeaponMode currentWeaponTurret currentZeroing cursorObject cursorTarget customChat customRadio cutFadeOut cutObj cutRsc cutText damage date dateToNumber daytime deActivateKey debriefingText debugFSM debugLog deg delete3DENEntities deleteAt deleteCenter deleteCollection deleteEditorObject deleteGroup deleteGroupWhenEmpty deleteIdentity deleteLocation deleteMarker deleteMarkerLocal deleteRange deleteResources deleteSite deleteStatus deleteTeam deleteVehicle deleteVehicleCrew deleteWaypoint detach detectedMines diag_activeMissionFSMs diag_activeScripts diag_activeSQFScripts diag_activeSQSScripts diag_captureFrame diag_captureFrameToFile diag_captureSlowFrame diag_codePerformance diag_drawMode diag_enable diag_enabled diag_fps diag_fpsMin diag_frameNo diag_lightNewLoad diag_list diag_log diag_logSlowFrame diag_mergeConfigFile diag_recordTurretLimits diag_setLightNew diag_tickTime diag_toggle dialog diarySubjectExists didJIP didJIPOwner difficulty difficultyEnabled difficultyEnabledRTD difficultyOption direction directSay disableAI disableCollisionWith disableConversation disableDebriefingStats disableMapIndicators disableNVGEquipment disableRemoteSensors disableSerialization disableTIEquipment disableUAVConnectability disableUserInput displayAddEventHandler displayCtrl displayParent displayRemoveAllEventHandlers displayRemoveEventHandler displaySetEventHandler dissolveTeam distance distance2D distanceSqr distributionRegion do3DENAction doArtilleryFire doFire doFollow doFSM doGetOut doMove doorPhase doStop doSuppressiveFire doTarget doWatch drawArrow drawEllipse drawIcon drawIcon3D drawLine drawLine3D drawLink drawLocation drawPolygon drawRectangle drawTriangle driver drop dynamicSimulationDistance dynamicSimulationDistanceCoef dynamicSimulationEnabled dynamicSimulationSystemEnabled echo edit3DENMissionAttributes editObject editorSetEventHandler effectiveCommander emptyPositions enableAI enableAIFeature enableAimPrecision enableAttack enableAudioFeature enableAutoStartUpRTD enableAutoTrimRTD enableCamShake enableCaustics enableChannel enableCollisionWith enableCopilot enableDebriefingStats enableDiagLegend enableDynamicSimulation enableDynamicSimulationSystem enableEndDialog enableEngineArtillery enableEnvironment enableFatigue enableGunLights enableInfoPanelComponent enableIRLasers enableMimics enablePersonTurret enableRadio enableReload enableRopeAttach enableSatNormalOnDetail enableSaving enableSentences enableSimulation enableSimulationGlobal enableStamina enableTeamSwitch enableTraffic enableUAVConnectability enableUAVWaypoints enableVehicleCargo enableVehicleSensor enableWeaponDisassembly endLoadingScreen endMission engineOn enginesIsOnRTD enginesRpmRTD enginesTorqueRTD entities environmentEnabled estimatedEndServerTime estimatedTimeLeft evalObjectArgument everyBackpack everyContainer exec execEditorScript execFSM execVM exp expectedDestination exportJIPMessages eyeDirection eyePos face faction fadeMusic fadeRadio fadeSound fadeSpeech failMission fillWeaponsFromPool find findCover findDisplay findEditorObject findEmptyPosition findEmptyPositionReady findIf findNearestEnemy finishMissionInit finite fire fireAtTarget firstBackpack flag flagAnimationPhase flagOwner flagSide flagTexture fleeing floor flyInHeight flyInHeightASL fog fogForecast fogParams forceAddUniform forcedMap forceEnd forceFlagTexture forceFollowRoad forceMap forceRespawn forceSpeed forceWalk forceWeaponFire forceWeatherChange forEachMember forEachMemberAgent forEachMemberTeam forgetTarget format formation formationDirection formationLeader formationMembers formationPosition formationTask formatText formLeader freeLook fromEditor fuel fullCrew gearIDCAmmoCount gearSlotAmmoCount gearSlotData get3DENActionState get3DENAttribute get3DENCamera get3DENConnections get3DENEntity get3DENEntityID get3DENGrid get3DENIconsVisible get3DENLayerEntities get3DENLinesVisible get3DENMissionAttribute get3DENMouseOver get3DENSelected getAimingCoef getAllEnvSoundControllers getAllHitPointsDamage getAllOwnedMines getAllSoundControllers getAmmoCargo getAnimAimPrecision getAnimSpeedCoef getArray getArtilleryAmmo getArtilleryComputerSettings getArtilleryETA getAssignedCuratorLogic getAssignedCuratorUnit getBackpackCargo getBleedingRemaining getBurningValue getCameraViewDirection getCargoIndex getCenterOfMass getClientState getClientStateNumber getCompatiblePylonMagazines getConnectedUAV getContainerMaxLoad getCursorObjectParams getCustomAimCoef getDammage getDescription getDir getDirVisual getDLCAssetsUsage getDLCAssetsUsageByName getDLCs getEditorCamera getEditorMode getEditorObjectScope getElevationOffset getEnvSoundController getFatigue getForcedFlagTexture getFriend getFSMVariable getFuelCargo getGroupIcon getGroupIconParams getGroupIcons getHideFrom getHit getHitIndex getHitPointDamage getItemCargo getMagazineCargo getMarkerColor getMarkerPos getMarkerSize getMarkerType getMass getMissionConfig getMissionConfigValue getMissionDLCs getMissionLayerEntities getModelInfo getMousePosition getMusicPlayedTime getNumber getObjectArgument getObjectChildren getObjectDLC getObjectMaterials getObjectProxy getObjectTextures getObjectType getObjectViewDistance getOxygenRemaining getPersonUsedDLCs getPilotCameraDirection getPilotCameraPosition getPilotCameraRotation getPilotCameraTarget getPlateNumber getPlayerChannel getPlayerScores getPlayerUID getPos getPosASL getPosASLVisual getPosASLW getPosATL getPosATLVisual getPosVisual getPosWorld getPylonMagazines getRelDir getRelPos getRemoteSensorsDisabled getRepairCargo getResolution getShadowDistance getShotParents getSlingLoad getSoundController getSoundControllerResult getSpeed getStamina getStatValue getSuppression getTerrainGrid getTerrainHeightASL getText getTotalDLCUsageTime getUnitLoadout getUnitTrait getUserMFDText getUserMFDvalue getVariable getVehicleCargo getWeaponCargo getWeaponSway getWingsOrientationRTD getWingsPositionRTD getWPPos glanceAt globalChat globalRadio goggles goto group groupChat groupFromNetId groupIconSelectable groupIconsVisible groupId groupOwner groupRadio groupSelectedUnits groupSelectUnit gunner gusts halt handgunItems handgunMagazine handgunWeapon handsHit hasInterface hasPilotCamera hasWeapon hcAllGroups hcGroupParams hcLeader hcRemoveAllGroups hcRemoveGroup hcSelected hcSelectGroup hcSetGroup hcShowBar hcShownBar headgear hideBody hideObject hideObjectGlobal hideSelection hint hintC hintCadet hintSilent hmd hostMission htmlLoad HUDMovementLevels humidity image importAllGroups importance in inArea inAreaArray incapacitatedState inflame inflamed infoPanel infoPanelComponentEnabled infoPanelComponents infoPanels inGameUISetEventHandler inheritsFrom initAmbientLife inPolygon inputAction inRangeOfArtillery insertEditorObject intersect is3DEN is3DENMultiplayer isAbleToBreathe isAgent isArray isAutoHoverOn isAutonomous isAutotest isBleeding isBurning isClass isCollisionLightOn isCopilotEnabled isDamageAllowed isDedicated isDLCAvailable isEngineOn isEqualTo isEqualType isEqualTypeAll isEqualTypeAny isEqualTypeArray isEqualTypeParams isFilePatchingEnabled isFlashlightOn isFlatEmpty isForcedWalk isFormationLeader isGroupDeletedWhenEmpty isHidden isInRemainsCollector isInstructorFigureEnabled isIRLaserOn isKeyActive isKindOf isLaserOn isLightOn isLocalized isManualFire isMarkedForCollection isMultiplayer isMultiplayerSolo isNil isNull isNumber isObjectHidden isObjectRTD isOnRoad isPipEnabled isPlayer isRealTime isRemoteExecuted isRemoteExecutedJIP isServer isShowing3DIcons isSimpleObject isSprintAllowed isStaminaEnabled isSteamMission isStreamFriendlyUIEnabled isText isTouchingGround isTurnedOut isTutHintsEnabled isUAVConnectable isUAVConnected isUIContext isUniformAllowed isVehicleCargo isVehicleRadarOn isVehicleSensorEnabled isWalking isWeaponDeployed isWeaponRested itemCargo items itemsWithMagazines join joinAs joinAsSilent joinSilent joinString kbAddDatabase kbAddDatabaseTargets kbAddTopic kbHasTopic kbReact kbRemoveTopic kbTell kbWasSaid keyImage keyName knowsAbout land landAt landResult language laserTarget lbAdd lbClear lbColor lbColorRight lbCurSel lbData lbDelete lbIsSelected lbPicture lbPictureRight lbSelection lbSetColor lbSetColorRight lbSetCurSel lbSetData lbSetPicture lbSetPictureColor lbSetPictureColorDisabled lbSetPictureColorSelected lbSetPictureRight lbSetPictureRightColor lbSetPictureRightColorDisabled lbSetPictureRightColorSelected lbSetSelectColor lbSetSelectColorRight lbSetSelected lbSetText lbSetTextRight lbSetTooltip lbSetValue lbSize lbSort lbSortByValue lbText lbTextRight lbValue leader leaderboardDeInit leaderboardGetRows leaderboardInit leaderboardRequestRowsFriends leaderboardsRequestUploadScore leaderboardsRequestUploadScoreKeepBest leaderboardState leaveVehicle libraryCredits libraryDisclaimers lifeState lightAttachObject lightDetachObject lightIsOn lightnings limitSpeed linearConversion lineIntersects lineIntersectsObjs lineIntersectsSurfaces lineIntersectsWith linkItem list listObjects listRemoteTargets listVehicleSensors ln lnbAddArray lnbAddColumn lnbAddRow lnbClear lnbColor lnbCurSelRow lnbData lnbDeleteColumn lnbDeleteRow lnbGetColumnsPosition lnbPicture lnbSetColor lnbSetColumnsPos lnbSetCurSelRow lnbSetData lnbSetPicture lnbSetText lnbSetValue lnbSize lnbSort lnbSortByValue lnbText lnbValue load loadAbs loadBackpack loadFile loadGame loadIdentity loadMagazine loadOverlay loadStatus loadUniform loadVest local localize locationPosition lock lockCameraTo lockCargo lockDriver locked lockedCargo lockedDriver lockedTurret lockIdentity lockTurret lockWP log logEntities logNetwork logNetworkTerminate lookAt lookAtPos magazineCargo magazines magazinesAllTurrets magazinesAmmo magazinesAmmoCargo magazinesAmmoFull magazinesDetail magazinesDetailBackpack magazinesDetailUniform magazinesDetailVest magazinesTurret magazineTurretAmmo mapAnimAdd mapAnimClear mapAnimCommit mapAnimDone mapCenterOnCamera mapGridPosition markAsFinishedOnSteam markerAlpha markerBrush markerColor markerDir markerPos markerShape markerSize markerText markerType max members menuAction menuAdd menuChecked menuClear menuCollapse menuData menuDelete menuEnable menuEnabled menuExpand menuHover menuPicture menuSetAction menuSetCheck menuSetData menuSetPicture menuSetValue menuShortcut menuShortcutText menuSize menuSort menuText menuURL menuValue min mineActive mineDetectedBy missionConfigFile missionDifficulty missionName missionNamespace missionStart missionVersion mod modelToWorld modelToWorldVisual modelToWorldVisualWorld modelToWorldWorld modParams moonIntensity moonPhase morale move move3DENCamera moveInAny moveInCargo moveInCommander moveInDriver moveInGunner moveInTurret moveObjectToEnd moveOut moveTime moveTo moveToCompleted moveToFailed musicVolume name nameSound nearEntities nearestBuilding nearestLocation nearestLocations nearestLocationWithDubbing nearestObject nearestObjects nearestTerrainObjects nearObjects nearObjectsReady nearRoads nearSupplies nearTargets needReload netId netObjNull newOverlay nextMenuItemIndex nextWeatherChange nMenuItems not numberOfEnginesRTD numberToDate objectCurators objectFromNetId objectParent objStatus onBriefingGroup onBriefingNotes onBriefingPlan onBriefingTeamSwitch onCommandModeChanged onDoubleClick onEachFrame onGroupIconClick onGroupIconOverEnter onGroupIconOverLeave onHCGroupSelectionChanged onMapSingleClick onPlayerConnected onPlayerDisconnected onPreloadFinished onPreloadStarted onShowNewObject onTeamSwitch openCuratorInterface openDLCPage openMap openSteamApp openYoutubeVideo or orderGetIn overcast overcastForecast owner param params parseNumber parseSimpleArray parseText parsingNamespace particlesQuality pickWeaponPool pitch pixelGrid pixelGridBase pixelGridNoUIScale pixelH pixelW playableSlotsNumber playableUnits playAction playActionNow player playerRespawnTime playerSide playersNumber playGesture playMission playMove playMoveNow playMusic playScriptedMission playSound playSound3D position positionCameraToWorld posScreenToWorld posWorldToScreen ppEffectAdjust ppEffectCommit ppEffectCommitted ppEffectCreate ppEffectDestroy ppEffectEnable ppEffectEnabled ppEffectForceInNVG precision preloadCamera preloadObject preloadSound preloadTitleObj preloadTitleRsc preprocessFile preprocessFileLineNumbers primaryWeapon primaryWeaponItems primaryWeaponMagazine priority processDiaryLink productVersion profileName profileNamespace profileNameSteam progressLoadingScreen progressPosition progressSetPosition publicVariable publicVariableClient publicVariableServer pushBack pushBackUnique putWeaponPool queryItemsPool queryMagazinePool queryWeaponPool rad radioChannelAdd radioChannelCreate radioChannelRemove radioChannelSetCallSign radioChannelSetLabel radioVolume rain rainbow random rank rankId rating rectangular registeredTasks registerTask reload reloadEnabled remoteControl remoteExec remoteExecCall remoteExecutedOwner remove3DENConnection remove3DENEventHandler remove3DENLayer removeAction removeAll3DENEventHandlers removeAllActions removeAllAssignedItems removeAllContainers removeAllCuratorAddons removeAllCuratorCameraAreas removeAllCuratorEditingAreas removeAllEventHandlers removeAllHandgunItems removeAllItems removeAllItemsWithMagazines removeAllMissionEventHandlers removeAllMPEventHandlers removeAllMusicEventHandlers removeAllOwnedMines removeAllPrimaryWeaponItems removeAllWeapons removeBackpack removeBackpackGlobal removeCuratorAddons removeCuratorCameraArea removeCuratorEditableObjects removeCuratorEditingArea removeDrawIcon removeDrawLinks removeEventHandler removeFromRemainsCollector removeGoggles removeGroupIcon removeHandgunItem removeHeadgear removeItem removeItemFromBackpack removeItemFromUniform removeItemFromVest removeItems removeMagazine removeMagazineGlobal removeMagazines removeMagazinesTurret removeMagazineTurret removeMenuItem removeMissionEventHandler removeMPEventHandler removeMusicEventHandler removeOwnedMine removePrimaryWeaponItem removeSecondaryWeaponItem removeSimpleTask removeSwitchableUnit removeTeamMember removeUniform removeVest removeWeapon removeWeaponAttachmentCargo removeWeaponCargo removeWeaponGlobal removeWeaponTurret reportRemoteTarget requiredVersion resetCamShake resetSubgroupDirection resize resources respawnVehicle restartEditorCamera reveal revealMine reverse reversedMouseY roadAt roadsConnectedTo roleDescription ropeAttachedObjects ropeAttachedTo ropeAttachEnabled ropeAttachTo ropeCreate ropeCut ropeDestroy ropeDetach ropeEndPosition ropeLength ropes ropeUnwind ropeUnwound rotorsForcesRTD rotorsRpmRTD round runInitScript safeZoneH safeZoneW safeZoneWAbs safeZoneX safeZoneXAbs safeZoneY save3DENInventory saveGame saveIdentity saveJoysticks saveOverlay saveProfileNamespace saveStatus saveVar savingEnabled say say2D say3D scopeName score scoreSide screenshot screenToWorld scriptDone scriptName scudState secondaryWeapon secondaryWeaponItems secondaryWeaponMagazine select selectBestPlaces selectDiarySubject selectedEditorObjects selectEditorObject selectionNames selectionPosition selectLeader selectMax selectMin selectNoPlayer selectPlayer selectRandom selectRandomWeighted selectWeapon selectWeaponTurret sendAUMessage sendSimpleCommand sendTask sendTaskResult sendUDPMessage serverCommand serverCommandAvailable serverCommandExecutable serverName serverTime set set3DENAttribute set3DENAttributes set3DENGrid set3DENIconsVisible set3DENLayer set3DENLinesVisible set3DENLogicType set3DENMissionAttribute set3DENMissionAttributes set3DENModelsVisible set3DENObjectType set3DENSelected setAccTime setActualCollectiveRTD setAirplaneThrottle setAirportSide setAmmo setAmmoCargo setAmmoOnPylon setAnimSpeedCoef setAperture setApertureNew setArmoryPoints setAttributes setAutonomous setBehaviour setBleedingRemaining setBrakesRTD setCameraInterest setCamShakeDefParams setCamShakeParams setCamUseTI setCaptive setCenterOfMass setCollisionLight setCombatMode setCompassOscillation setConvoySeparation setCuratorCameraAreaCeiling setCuratorCoef setCuratorEditingAreaType setCuratorWaypointCost setCurrentChannel setCurrentTask setCurrentWaypoint setCustomAimCoef setCustomWeightRTD setDamage setDammage setDate setDebriefingText setDefaultCamera setDestination setDetailMapBlendPars setDir setDirection setDrawIcon setDriveOnPath setDropInterval setDynamicSimulationDistance setDynamicSimulationDistanceCoef setEditorMode setEditorObjectScope setEffectCondition setEngineRPMRTD setFace setFaceAnimation setFatigue setFeatureType setFlagAnimationPhase setFlagOwner setFlagSide setFlagTexture setFog setFormation setFormationTask setFormDir setFriend setFromEditor setFSMVariable setFuel setFuelCargo setGroupIcon setGroupIconParams setGroupIconsSelectable setGroupIconsVisible setGroupId setGroupIdGlobal setGroupOwner setGusts setHideBehind setHit setHitIndex setHitPointDamage setHorizonParallaxCoef setHUDMovementLevels setIdentity setImportance setInfoPanel setLeader setLightAmbient setLightAttenuation setLightBrightness setLightColor setLightDayLight setLightFlareMaxDistance setLightFlareSize setLightIntensity setLightnings setLightUseFlare setLocalWindParams setMagazineTurretAmmo setMarkerAlpha setMarkerAlphaLocal setMarkerBrush setMarkerBrushLocal setMarkerColor setMarkerColorLocal setMarkerDir setMarkerDirLocal setMarkerPos setMarkerPosLocal setMarkerShape setMarkerShapeLocal setMarkerSize setMarkerSizeLocal setMarkerText setMarkerTextLocal setMarkerType setMarkerTypeLocal setMass setMimic setMousePosition setMusicEffect setMusicEventHandler setName setNameSound setObjectArguments setObjectMaterial setObjectMaterialGlobal setObjectProxy setObjectTexture setObjectTextureGlobal setObjectViewDistance setOvercast setOwner setOxygenRemaining setParticleCircle setParticleClass setParticleFire setParticleParams setParticleRandom setPilotCameraDirection setPilotCameraRotation setPilotCameraTarget setPilotLight setPiPEffect setPitch setPlateNumber setPlayable setPlayerRespawnTime setPos setPosASL setPosASL2 setPosASLW setPosATL setPosition setPosWorld setPylonLoadOut setPylonsPriority setRadioMsg setRain setRainbow setRandomLip setRank setRectangular setRepairCargo setRotorBrakeRTD setShadowDistance setShotParents setSide setSimpleTaskAlwaysVisible setSimpleTaskCustomData setSimpleTaskDescription setSimpleTaskDestination setSimpleTaskTarget setSimpleTaskType setSimulWeatherLayers setSize setSkill setSlingLoad setSoundEffect setSpeaker setSpeech setSpeedMode setStamina setStaminaScheme setStatValue setSuppression setSystemOfUnits setTargetAge setTaskMarkerOffset setTaskResult setTaskState setTerrainGrid setText setTimeMultiplier setTitleEffect setTrafficDensity setTrafficDistance setTrafficGap setTrafficSpeed setTriggerActivation setTriggerArea setTriggerStatements setTriggerText setTriggerTimeout setTriggerType setType setUnconscious setUnitAbility setUnitLoadout setUnitPos setUnitPosWeak setUnitRank setUnitRecoilCoefficient setUnitTrait setUnloadInCombat setUserActionText setUserMFDText setUserMFDvalue setVariable setVectorDir setVectorDirAndUp setVectorUp setVehicleAmmo setVehicleAmmoDef setVehicleArmor setVehicleCargo setVehicleId setVehicleLock setVehiclePosition setVehicleRadar setVehicleReceiveRemoteTargets setVehicleReportOwnPosition setVehicleReportRemoteTargets setVehicleTIPars setVehicleVarName setVelocity setVelocityModelSpace setVelocityTransformation setViewDistance setVisibleIfTreeCollapsed setWantedRPMRTD setWaves setWaypointBehaviour setWaypointCombatMode setWaypointCompletionRadius setWaypointDescription setWaypointForceBehaviour setWaypointFormation setWaypointHousePosition setWaypointLoiterRadius setWaypointLoiterType setWaypointName setWaypointPosition setWaypointScript setWaypointSpeed setWaypointStatements setWaypointTimeout setWaypointType setWaypointVisible setWeaponReloadingTime setWind setWindDir setWindForce setWindStr setWingForceScaleRTD setWPPos show3DIcons showChat showCinemaBorder showCommandingMenu showCompass showCuratorCompass showGPS showHUD showLegend showMap shownArtilleryComputer shownChat shownCompass shownCuratorCompass showNewEditorObject shownGPS shownHUD shownMap shownPad shownRadio shownScoretable shownUAVFeed shownWarrant shownWatch showPad showRadio showScoretable showSubtitles showUAVFeed showWarrant showWatch showWaypoint showWaypoints side sideChat sideEnemy sideFriendly sideRadio simpleTasks simulationEnabled simulCloudDensity simulCloudOcclusion simulInClouds simulWeatherSync sin size sizeOf skill skillFinal skipTime sleep sliderPosition sliderRange sliderSetPosition sliderSetRange sliderSetSpeed sliderSpeed slingLoadAssistantShown soldierMagazines someAmmo sort soundVolume spawn speaker speed speedMode splitString sqrt squadParams stance startLoadingScreen step stop stopEngineRTD stopped str sunOrMoon supportInfo suppressFor surfaceIsWater surfaceNormal surfaceType swimInDepth switchableUnits switchAction switchCamera switchGesture switchLight switchMove synchronizedObjects synchronizedTriggers synchronizedWaypoints synchronizeObjectsAdd synchronizeObjectsRemove synchronizeTrigger synchronizeWaypoint systemChat systemOfUnits tan targetKnowledge targets targetsAggregate targetsQuery taskAlwaysVisible taskChildren taskCompleted taskCustomData taskDescription taskDestination taskHint taskMarkerOffset taskParent taskResult taskState taskType teamMember teamName teams teamSwitch teamSwitchEnabled teamType terminate terrainIntersect terrainIntersectASL terrainIntersectAtASL text textLog textLogFormat tg time timeMultiplier titleCut titleFadeOut titleObj titleRsc titleText toArray toFixed toLower toString toUpper triggerActivated triggerActivation triggerArea triggerAttachedVehicle triggerAttachObject triggerAttachVehicle triggerDynamicSimulation triggerStatements triggerText triggerTimeout triggerTimeoutCurrent triggerType turretLocal turretOwner turretUnit tvAdd tvClear tvCollapse tvCollapseAll tvCount tvCurSel tvData tvDelete tvExpand tvExpandAll tvPicture tvSetColor tvSetCurSel tvSetData tvSetPicture tvSetPictureColor tvSetPictureColorDisabled tvSetPictureColorSelected tvSetPictureRight tvSetPictureRightColor tvSetPictureRightColorDisabled tvSetPictureRightColorSelected tvSetText tvSetTooltip tvSetValue tvSort tvSortByValue tvText tvTooltip tvValue type typeName typeOf UAVControl uiNamespace uiSleep unassignCurator unassignItem unassignTeam unassignVehicle underwater uniform uniformContainer uniformItems uniformMagazines unitAddons unitAimPosition unitAimPositionVisual unitBackpack unitIsUAV unitPos unitReady unitRecoilCoefficient units unitsBelowHeight unlinkItem unlockAchievement unregisterTask updateDrawIcon updateMenuItem updateObjectTree useAISteeringComponent useAudioTimeForMoves userInputDisabled vectorAdd vectorCos vectorCrossProduct vectorDiff vectorDir vectorDirVisual vectorDistance vectorDistanceSqr vectorDotProduct vectorFromTo vectorMagnitude vectorMagnitudeSqr vectorModelToWorld vectorModelToWorldVisual vectorMultiply vectorNormalized vectorUp vectorUpVisual vectorWorldToModel vectorWorldToModelVisual vehicle vehicleCargoEnabled vehicleChat vehicleRadio vehicleReceiveRemoteTargets vehicleReportOwnPosition vehicleReportRemoteTargets vehicles vehicleVarName velocity velocityModelSpace verifySignature vest vestContainer vestItems vestMagazines viewDistance visibleCompass visibleGPS visibleMap visiblePosition visiblePositionASL visibleScoretable visibleWatch waves waypointAttachedObject waypointAttachedVehicle waypointAttachObject waypointAttachVehicle waypointBehaviour waypointCombatMode waypointCompletionRadius waypointDescription waypointForceBehaviour waypointFormation waypointHousePosition waypointLoiterRadius waypointLoiterType waypointName waypointPosition waypoints waypointScript waypointsEnabledUAV waypointShow waypointSpeed waypointStatements waypointTimeout waypointTimeoutCurrent waypointType waypointVisible weaponAccessories weaponAccessoriesCargo weaponCargo weaponDirection weaponInertia weaponLowered weapons weaponsItems weaponsItemsCargo weaponState weaponsTurret weightRTD WFSideText wind ",literal:"blufor civilian configNull controlNull displayNull east endl false grpNull independent lineBreak locationNull nil objNull opfor pi resistance scriptNull sideAmbientLife sideEmpty sideLogic sideUnknown taskNull teamMemberNull true west"},c:[e.CLCM,e.CBCM,e.NM,a,o,r,t.preprocessor],i:/#|^\$ /}});
\ No newline at end of file
+hljs.registerLanguage("sqf",function(){"use strict";return function(e){var t={className:"string",variants:[{begin:'"',end:'"',contains:[{begin:'""',relevance:0}]},{begin:"'",end:"'",contains:[{begin:"''",relevance:0}]}]},a={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{"meta-keyword":"define undef ifdef ifndef else endif include"},contains:[{begin:/\\\n/,relevance:0},e.inherit(t,{className:"meta-string"}),{className:"meta-string",begin:/<[^\n>]*>/,end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]};return{name:"SQF",aliases:["sqf"],case_insensitive:!0,keywords:{keyword:"case catch default do else exit exitWith for forEach from if private switch then throw to try waitUntil while with",built_in:"abs accTime acos action actionIDs actionKeys actionKeysImages actionKeysNames actionKeysNamesArray actionName actionParams activateAddons activatedAddons activateKey add3DENConnection add3DENEventHandler add3DENLayer addAction addBackpack addBackpackCargo addBackpackCargoGlobal addBackpackGlobal addCamShake addCuratorAddons addCuratorCameraArea addCuratorEditableObjects addCuratorEditingArea addCuratorPoints addEditorObject addEventHandler addForce addGoggles addGroupIcon addHandgunItem addHeadgear addItem addItemCargo addItemCargoGlobal addItemPool addItemToBackpack addItemToUniform addItemToVest addLiveStats addMagazine addMagazineAmmoCargo addMagazineCargo addMagazineCargoGlobal addMagazineGlobal addMagazinePool addMagazines addMagazineTurret addMenu addMenuItem addMissionEventHandler addMPEventHandler addMusicEventHandler addOwnedMine addPlayerScores addPrimaryWeaponItem addPublicVariableEventHandler addRating addResources addScore addScoreSide addSecondaryWeaponItem addSwitchableUnit addTeamMember addToRemainsCollector addTorque addUniform addVehicle addVest addWaypoint addWeapon addWeaponCargo addWeaponCargoGlobal addWeaponGlobal addWeaponItem addWeaponPool addWeaponTurret admin agent agents AGLToASL aimedAtTarget aimPos airDensityRTD airplaneThrottle airportSide AISFinishHeal alive all3DENEntities allAirports allControls allCurators allCutLayers allDead allDeadMen allDisplays allGroups allMapMarkers allMines allMissionObjects allow3DMode allowCrewInImmobile allowCuratorLogicIgnoreAreas allowDamage allowDammage allowFileOperations allowFleeing allowGetIn allowSprint allPlayers allSimpleObjects allSites allTurrets allUnits allUnitsUAV allVariables ammo ammoOnPylon and animate animateBay animateDoor animatePylon animateSource animationNames animationPhase animationSourcePhase animationState append apply armoryPoints arrayIntersect asin ASLToAGL ASLToATL assert assignAsCargo assignAsCargoIndex assignAsCommander assignAsDriver assignAsGunner assignAsTurret assignCurator assignedCargo assignedCommander assignedDriver assignedGunner assignedItems assignedTarget assignedTeam assignedVehicle assignedVehicleRole assignItem assignTeam assignToAirport atan atan2 atg ATLToASL attachedObject attachedObjects attachedTo attachObject attachTo attackEnabled backpack backpackCargo backpackContainer backpackItems backpackMagazines backpackSpaceFor behaviour benchmark binocular boundingBox boundingBoxReal boundingCenter breakOut breakTo briefingName buildingExit buildingPos buttonAction buttonSetAction cadetMode call callExtension camCommand camCommit camCommitPrepared camCommitted camConstuctionSetParams camCreate camDestroy cameraEffect cameraEffectEnableHUD cameraInterest cameraOn cameraView campaignConfigFile camPreload camPreloaded camPrepareBank camPrepareDir camPrepareDive camPrepareFocus camPrepareFov camPrepareFovRange camPreparePos camPrepareRelPos camPrepareTarget camSetBank camSetDir camSetDive camSetFocus camSetFov camSetFovRange camSetPos camSetRelPos camSetTarget camTarget camUseNVG canAdd canAddItemToBackpack canAddItemToUniform canAddItemToVest cancelSimpleTaskDestination canFire canMove canSlingLoad canStand canSuspend canTriggerDynamicSimulation canUnloadInCombat canVehicleCargo captive captiveNum cbChecked cbSetChecked ceil channelEnabled cheatsEnabled checkAIFeature checkVisibility className clearAllItemsFromBackpack clearBackpackCargo clearBackpackCargoGlobal clearGroupIcons clearItemCargo clearItemCargoGlobal clearItemPool clearMagazineCargo clearMagazineCargoGlobal clearMagazinePool clearOverlay clearRadio clearWeaponCargo clearWeaponCargoGlobal clearWeaponPool clientOwner closeDialog closeDisplay closeOverlay collapseObjectTree collect3DENHistory collectiveRTD combatMode commandArtilleryFire commandChat commander commandFire commandFollow commandFSM commandGetOut commandingMenu commandMove commandRadio commandStop commandSuppressiveFire commandTarget commandWatch comment commitOverlay compile compileFinal completedFSM composeText configClasses configFile configHierarchy configName configProperties configSourceAddonList configSourceMod configSourceModList confirmSensorTarget connectTerminalToUAV controlsGroupCtrl copyFromClipboard copyToClipboard copyWaypoints cos count countEnemy countFriendly countSide countType countUnknown create3DENComposition create3DENEntity createAgent createCenter createDialog createDiaryLink createDiaryRecord createDiarySubject createDisplay createGearDialog createGroup createGuardedPoint createLocation createMarker createMarkerLocal createMenu createMine createMissionDisplay createMPCampaignDisplay createSimpleObject createSimpleTask createSite createSoundSource createTask createTeam createTrigger createUnit createVehicle createVehicleCrew createVehicleLocal crew ctAddHeader ctAddRow ctClear ctCurSel ctData ctFindHeaderRows ctFindRowHeader ctHeaderControls ctHeaderCount ctRemoveHeaders ctRemoveRows ctrlActivate ctrlAddEventHandler ctrlAngle ctrlAutoScrollDelay ctrlAutoScrollRewind ctrlAutoScrollSpeed ctrlChecked ctrlClassName ctrlCommit ctrlCommitted ctrlCreate ctrlDelete ctrlEnable ctrlEnabled ctrlFade ctrlHTMLLoaded ctrlIDC ctrlIDD ctrlMapAnimAdd ctrlMapAnimClear ctrlMapAnimCommit ctrlMapAnimDone ctrlMapCursor ctrlMapMouseOver ctrlMapScale ctrlMapScreenToWorld ctrlMapWorldToScreen ctrlModel ctrlModelDirAndUp ctrlModelScale ctrlParent ctrlParentControlsGroup ctrlPosition ctrlRemoveAllEventHandlers ctrlRemoveEventHandler ctrlScale ctrlSetActiveColor ctrlSetAngle ctrlSetAutoScrollDelay ctrlSetAutoScrollRewind ctrlSetAutoScrollSpeed ctrlSetBackgroundColor ctrlSetChecked ctrlSetEventHandler ctrlSetFade ctrlSetFocus ctrlSetFont ctrlSetFontH1 ctrlSetFontH1B ctrlSetFontH2 ctrlSetFontH2B ctrlSetFontH3 ctrlSetFontH3B ctrlSetFontH4 ctrlSetFontH4B ctrlSetFontH5 ctrlSetFontH5B ctrlSetFontH6 ctrlSetFontH6B ctrlSetFontHeight ctrlSetFontHeightH1 ctrlSetFontHeightH2 ctrlSetFontHeightH3 ctrlSetFontHeightH4 ctrlSetFontHeightH5 ctrlSetFontHeightH6 ctrlSetFontHeightSecondary ctrlSetFontP ctrlSetFontPB ctrlSetFontSecondary ctrlSetForegroundColor ctrlSetModel ctrlSetModelDirAndUp ctrlSetModelScale ctrlSetPixelPrecision ctrlSetPosition ctrlSetScale ctrlSetStructuredText ctrlSetText ctrlSetTextColor ctrlSetTooltip ctrlSetTooltipColorBox ctrlSetTooltipColorShade ctrlSetTooltipColorText ctrlShow ctrlShown ctrlText ctrlTextHeight ctrlTextWidth ctrlType ctrlVisible ctRowControls ctRowCount ctSetCurSel ctSetData ctSetHeaderTemplate ctSetRowTemplate ctSetValue ctValue curatorAddons curatorCamera curatorCameraArea curatorCameraAreaCeiling curatorCoef curatorEditableObjects curatorEditingArea curatorEditingAreaType curatorMouseOver curatorPoints curatorRegisteredObjects curatorSelected curatorWaypointCost current3DENOperation currentChannel currentCommand currentMagazine currentMagazineDetail currentMagazineDetailTurret currentMagazineTurret currentMuzzle currentNamespace currentTask currentTasks currentThrowable currentVisionMode currentWaypoint currentWeapon currentWeaponMode currentWeaponTurret currentZeroing cursorObject cursorTarget customChat customRadio cutFadeOut cutObj cutRsc cutText damage date dateToNumber daytime deActivateKey debriefingText debugFSM debugLog deg delete3DENEntities deleteAt deleteCenter deleteCollection deleteEditorObject deleteGroup deleteGroupWhenEmpty deleteIdentity deleteLocation deleteMarker deleteMarkerLocal deleteRange deleteResources deleteSite deleteStatus deleteTeam deleteVehicle deleteVehicleCrew deleteWaypoint detach detectedMines diag_activeMissionFSMs diag_activeScripts diag_activeSQFScripts diag_activeSQSScripts diag_captureFrame diag_captureFrameToFile diag_captureSlowFrame diag_codePerformance diag_drawMode diag_enable diag_enabled diag_fps diag_fpsMin diag_frameNo diag_lightNewLoad diag_list diag_log diag_logSlowFrame diag_mergeConfigFile diag_recordTurretLimits diag_setLightNew diag_tickTime diag_toggle dialog diarySubjectExists didJIP didJIPOwner difficulty difficultyEnabled difficultyEnabledRTD difficultyOption direction directSay disableAI disableCollisionWith disableConversation disableDebriefingStats disableMapIndicators disableNVGEquipment disableRemoteSensors disableSerialization disableTIEquipment disableUAVConnectability disableUserInput displayAddEventHandler displayCtrl displayParent displayRemoveAllEventHandlers displayRemoveEventHandler displaySetEventHandler dissolveTeam distance distance2D distanceSqr distributionRegion do3DENAction doArtilleryFire doFire doFollow doFSM doGetOut doMove doorPhase doStop doSuppressiveFire doTarget doWatch drawArrow drawEllipse drawIcon drawIcon3D drawLine drawLine3D drawLink drawLocation drawPolygon drawRectangle drawTriangle driver drop dynamicSimulationDistance dynamicSimulationDistanceCoef dynamicSimulationEnabled dynamicSimulationSystemEnabled echo edit3DENMissionAttributes editObject editorSetEventHandler effectiveCommander emptyPositions enableAI enableAIFeature enableAimPrecision enableAttack enableAudioFeature enableAutoStartUpRTD enableAutoTrimRTD enableCamShake enableCaustics enableChannel enableCollisionWith enableCopilot enableDebriefingStats enableDiagLegend enableDynamicSimulation enableDynamicSimulationSystem enableEndDialog enableEngineArtillery enableEnvironment enableFatigue enableGunLights enableInfoPanelComponent enableIRLasers enableMimics enablePersonTurret enableRadio enableReload enableRopeAttach enableSatNormalOnDetail enableSaving enableSentences enableSimulation enableSimulationGlobal enableStamina enableTeamSwitch enableTraffic enableUAVConnectability enableUAVWaypoints enableVehicleCargo enableVehicleSensor enableWeaponDisassembly endLoadingScreen endMission engineOn enginesIsOnRTD enginesRpmRTD enginesTorqueRTD entities environmentEnabled estimatedEndServerTime estimatedTimeLeft evalObjectArgument everyBackpack everyContainer exec execEditorScript execFSM execVM exp expectedDestination exportJIPMessages eyeDirection eyePos face faction fadeMusic fadeRadio fadeSound fadeSpeech failMission fillWeaponsFromPool find findCover findDisplay findEditorObject findEmptyPosition findEmptyPositionReady findIf findNearestEnemy finishMissionInit finite fire fireAtTarget firstBackpack flag flagAnimationPhase flagOwner flagSide flagTexture fleeing floor flyInHeight flyInHeightASL fog fogForecast fogParams forceAddUniform forcedMap forceEnd forceFlagTexture forceFollowRoad forceMap forceRespawn forceSpeed forceWalk forceWeaponFire forceWeatherChange forEachMember forEachMemberAgent forEachMemberTeam forgetTarget format formation formationDirection formationLeader formationMembers formationPosition formationTask formatText formLeader freeLook fromEditor fuel fullCrew gearIDCAmmoCount gearSlotAmmoCount gearSlotData get3DENActionState get3DENAttribute get3DENCamera get3DENConnections get3DENEntity get3DENEntityID get3DENGrid get3DENIconsVisible get3DENLayerEntities get3DENLinesVisible get3DENMissionAttribute get3DENMouseOver get3DENSelected getAimingCoef getAllEnvSoundControllers getAllHitPointsDamage getAllOwnedMines getAllSoundControllers getAmmoCargo getAnimAimPrecision getAnimSpeedCoef getArray getArtilleryAmmo getArtilleryComputerSettings getArtilleryETA getAssignedCuratorLogic getAssignedCuratorUnit getBackpackCargo getBleedingRemaining getBurningValue getCameraViewDirection getCargoIndex getCenterOfMass getClientState getClientStateNumber getCompatiblePylonMagazines getConnectedUAV getContainerMaxLoad getCursorObjectParams getCustomAimCoef getDammage getDescription getDir getDirVisual getDLCAssetsUsage getDLCAssetsUsageByName getDLCs getEditorCamera getEditorMode getEditorObjectScope getElevationOffset getEnvSoundController getFatigue getForcedFlagTexture getFriend getFSMVariable getFuelCargo getGroupIcon getGroupIconParams getGroupIcons getHideFrom getHit getHitIndex getHitPointDamage getItemCargo getMagazineCargo getMarkerColor getMarkerPos getMarkerSize getMarkerType getMass getMissionConfig getMissionConfigValue getMissionDLCs getMissionLayerEntities getModelInfo getMousePosition getMusicPlayedTime getNumber getObjectArgument getObjectChildren getObjectDLC getObjectMaterials getObjectProxy getObjectTextures getObjectType getObjectViewDistance getOxygenRemaining getPersonUsedDLCs getPilotCameraDirection getPilotCameraPosition getPilotCameraRotation getPilotCameraTarget getPlateNumber getPlayerChannel getPlayerScores getPlayerUID getPos getPosASL getPosASLVisual getPosASLW getPosATL getPosATLVisual getPosVisual getPosWorld getPylonMagazines getRelDir getRelPos getRemoteSensorsDisabled getRepairCargo getResolution getShadowDistance getShotParents getSlingLoad getSoundController getSoundControllerResult getSpeed getStamina getStatValue getSuppression getTerrainGrid getTerrainHeightASL getText getTotalDLCUsageTime getUnitLoadout getUnitTrait getUserMFDText getUserMFDvalue getVariable getVehicleCargo getWeaponCargo getWeaponSway getWingsOrientationRTD getWingsPositionRTD getWPPos glanceAt globalChat globalRadio goggles goto group groupChat groupFromNetId groupIconSelectable groupIconsVisible groupId groupOwner groupRadio groupSelectedUnits groupSelectUnit gunner gusts halt handgunItems handgunMagazine handgunWeapon handsHit hasInterface hasPilotCamera hasWeapon hcAllGroups hcGroupParams hcLeader hcRemoveAllGroups hcRemoveGroup hcSelected hcSelectGroup hcSetGroup hcShowBar hcShownBar headgear hideBody hideObject hideObjectGlobal hideSelection hint hintC hintCadet hintSilent hmd hostMission htmlLoad HUDMovementLevels humidity image importAllGroups importance in inArea inAreaArray incapacitatedState inflame inflamed infoPanel infoPanelComponentEnabled infoPanelComponents infoPanels inGameUISetEventHandler inheritsFrom initAmbientLife inPolygon inputAction inRangeOfArtillery insertEditorObject intersect is3DEN is3DENMultiplayer isAbleToBreathe isAgent isArray isAutoHoverOn isAutonomous isAutotest isBleeding isBurning isClass isCollisionLightOn isCopilotEnabled isDamageAllowed isDedicated isDLCAvailable isEngineOn isEqualTo isEqualType isEqualTypeAll isEqualTypeAny isEqualTypeArray isEqualTypeParams isFilePatchingEnabled isFlashlightOn isFlatEmpty isForcedWalk isFormationLeader isGroupDeletedWhenEmpty isHidden isInRemainsCollector isInstructorFigureEnabled isIRLaserOn isKeyActive isKindOf isLaserOn isLightOn isLocalized isManualFire isMarkedForCollection isMultiplayer isMultiplayerSolo isNil isNull isNumber isObjectHidden isObjectRTD isOnRoad isPipEnabled isPlayer isRealTime isRemoteExecuted isRemoteExecutedJIP isServer isShowing3DIcons isSimpleObject isSprintAllowed isStaminaEnabled isSteamMission isStreamFriendlyUIEnabled isText isTouchingGround isTurnedOut isTutHintsEnabled isUAVConnectable isUAVConnected isUIContext isUniformAllowed isVehicleCargo isVehicleRadarOn isVehicleSensorEnabled isWalking isWeaponDeployed isWeaponRested itemCargo items itemsWithMagazines join joinAs joinAsSilent joinSilent joinString kbAddDatabase kbAddDatabaseTargets kbAddTopic kbHasTopic kbReact kbRemoveTopic kbTell kbWasSaid keyImage keyName knowsAbout land landAt landResult language laserTarget lbAdd lbClear lbColor lbColorRight lbCurSel lbData lbDelete lbIsSelected lbPicture lbPictureRight lbSelection lbSetColor lbSetColorRight lbSetCurSel lbSetData lbSetPicture lbSetPictureColor lbSetPictureColorDisabled lbSetPictureColorSelected lbSetPictureRight lbSetPictureRightColor lbSetPictureRightColorDisabled lbSetPictureRightColorSelected lbSetSelectColor lbSetSelectColorRight lbSetSelected lbSetText lbSetTextRight lbSetTooltip lbSetValue lbSize lbSort lbSortByValue lbText lbTextRight lbValue leader leaderboardDeInit leaderboardGetRows leaderboardInit leaderboardRequestRowsFriends leaderboardsRequestUploadScore leaderboardsRequestUploadScoreKeepBest leaderboardState leaveVehicle libraryCredits libraryDisclaimers lifeState lightAttachObject lightDetachObject lightIsOn lightnings limitSpeed linearConversion lineIntersects lineIntersectsObjs lineIntersectsSurfaces lineIntersectsWith linkItem list listObjects listRemoteTargets listVehicleSensors ln lnbAddArray lnbAddColumn lnbAddRow lnbClear lnbColor lnbCurSelRow lnbData lnbDeleteColumn lnbDeleteRow lnbGetColumnsPosition lnbPicture lnbSetColor lnbSetColumnsPos lnbSetCurSelRow lnbSetData lnbSetPicture lnbSetText lnbSetValue lnbSize lnbSort lnbSortByValue lnbText lnbValue load loadAbs loadBackpack loadFile loadGame loadIdentity loadMagazine loadOverlay loadStatus loadUniform loadVest local localize locationPosition lock lockCameraTo lockCargo lockDriver locked lockedCargo lockedDriver lockedTurret lockIdentity lockTurret lockWP log logEntities logNetwork logNetworkTerminate lookAt lookAtPos magazineCargo magazines magazinesAllTurrets magazinesAmmo magazinesAmmoCargo magazinesAmmoFull magazinesDetail magazinesDetailBackpack magazinesDetailUniform magazinesDetailVest magazinesTurret magazineTurretAmmo mapAnimAdd mapAnimClear mapAnimCommit mapAnimDone mapCenterOnCamera mapGridPosition markAsFinishedOnSteam markerAlpha markerBrush markerColor markerDir markerPos markerShape markerSize markerText markerType max members menuAction menuAdd menuChecked menuClear menuCollapse menuData menuDelete menuEnable menuEnabled menuExpand menuHover menuPicture menuSetAction menuSetCheck menuSetData menuSetPicture menuSetValue menuShortcut menuShortcutText menuSize menuSort menuText menuURL menuValue min mineActive mineDetectedBy missionConfigFile missionDifficulty missionName missionNamespace missionStart missionVersion mod modelToWorld modelToWorldVisual modelToWorldVisualWorld modelToWorldWorld modParams moonIntensity moonPhase morale move move3DENCamera moveInAny moveInCargo moveInCommander moveInDriver moveInGunner moveInTurret moveObjectToEnd moveOut moveTime moveTo moveToCompleted moveToFailed musicVolume name nameSound nearEntities nearestBuilding nearestLocation nearestLocations nearestLocationWithDubbing nearestObject nearestObjects nearestTerrainObjects nearObjects nearObjectsReady nearRoads nearSupplies nearTargets needReload netId netObjNull newOverlay nextMenuItemIndex nextWeatherChange nMenuItems not numberOfEnginesRTD numberToDate objectCurators objectFromNetId objectParent objStatus onBriefingGroup onBriefingNotes onBriefingPlan onBriefingTeamSwitch onCommandModeChanged onDoubleClick onEachFrame onGroupIconClick onGroupIconOverEnter onGroupIconOverLeave onHCGroupSelectionChanged onMapSingleClick onPlayerConnected onPlayerDisconnected onPreloadFinished onPreloadStarted onShowNewObject onTeamSwitch openCuratorInterface openDLCPage openMap openSteamApp openYoutubeVideo or orderGetIn overcast overcastForecast owner param params parseNumber parseSimpleArray parseText parsingNamespace particlesQuality pickWeaponPool pitch pixelGrid pixelGridBase pixelGridNoUIScale pixelH pixelW playableSlotsNumber playableUnits playAction playActionNow player playerRespawnTime playerSide playersNumber playGesture playMission playMove playMoveNow playMusic playScriptedMission playSound playSound3D position positionCameraToWorld posScreenToWorld posWorldToScreen ppEffectAdjust ppEffectCommit ppEffectCommitted ppEffectCreate ppEffectDestroy ppEffectEnable ppEffectEnabled ppEffectForceInNVG precision preloadCamera preloadObject preloadSound preloadTitleObj preloadTitleRsc preprocessFile preprocessFileLineNumbers primaryWeapon primaryWeaponItems primaryWeaponMagazine priority processDiaryLink productVersion profileName profileNamespace profileNameSteam progressLoadingScreen progressPosition progressSetPosition publicVariable publicVariableClient publicVariableServer pushBack pushBackUnique putWeaponPool queryItemsPool queryMagazinePool queryWeaponPool rad radioChannelAdd radioChannelCreate radioChannelRemove radioChannelSetCallSign radioChannelSetLabel radioVolume rain rainbow random rank rankId rating rectangular registeredTasks registerTask reload reloadEnabled remoteControl remoteExec remoteExecCall remoteExecutedOwner remove3DENConnection remove3DENEventHandler remove3DENLayer removeAction removeAll3DENEventHandlers removeAllActions removeAllAssignedItems removeAllContainers removeAllCuratorAddons removeAllCuratorCameraAreas removeAllCuratorEditingAreas removeAllEventHandlers removeAllHandgunItems removeAllItems removeAllItemsWithMagazines removeAllMissionEventHandlers removeAllMPEventHandlers removeAllMusicEventHandlers removeAllOwnedMines removeAllPrimaryWeaponItems removeAllWeapons removeBackpack removeBackpackGlobal removeCuratorAddons removeCuratorCameraArea removeCuratorEditableObjects removeCuratorEditingArea removeDrawIcon removeDrawLinks removeEventHandler removeFromRemainsCollector removeGoggles removeGroupIcon removeHandgunItem removeHeadgear removeItem removeItemFromBackpack removeItemFromUniform removeItemFromVest removeItems removeMagazine removeMagazineGlobal removeMagazines removeMagazinesTurret removeMagazineTurret removeMenuItem removeMissionEventHandler removeMPEventHandler removeMusicEventHandler removeOwnedMine removePrimaryWeaponItem removeSecondaryWeaponItem removeSimpleTask removeSwitchableUnit removeTeamMember removeUniform removeVest removeWeapon removeWeaponAttachmentCargo removeWeaponCargo removeWeaponGlobal removeWeaponTurret reportRemoteTarget requiredVersion resetCamShake resetSubgroupDirection resize resources respawnVehicle restartEditorCamera reveal revealMine reverse reversedMouseY roadAt roadsConnectedTo roleDescription ropeAttachedObjects ropeAttachedTo ropeAttachEnabled ropeAttachTo ropeCreate ropeCut ropeDestroy ropeDetach ropeEndPosition ropeLength ropes ropeUnwind ropeUnwound rotorsForcesRTD rotorsRpmRTD round runInitScript safeZoneH safeZoneW safeZoneWAbs safeZoneX safeZoneXAbs safeZoneY save3DENInventory saveGame saveIdentity saveJoysticks saveOverlay saveProfileNamespace saveStatus saveVar savingEnabled say say2D say3D scopeName score scoreSide screenshot screenToWorld scriptDone scriptName scudState secondaryWeapon secondaryWeaponItems secondaryWeaponMagazine select selectBestPlaces selectDiarySubject selectedEditorObjects selectEditorObject selectionNames selectionPosition selectLeader selectMax selectMin selectNoPlayer selectPlayer selectRandom selectRandomWeighted selectWeapon selectWeaponTurret sendAUMessage sendSimpleCommand sendTask sendTaskResult sendUDPMessage serverCommand serverCommandAvailable serverCommandExecutable serverName serverTime set set3DENAttribute set3DENAttributes set3DENGrid set3DENIconsVisible set3DENLayer set3DENLinesVisible set3DENLogicType set3DENMissionAttribute set3DENMissionAttributes set3DENModelsVisible set3DENObjectType set3DENSelected setAccTime setActualCollectiveRTD setAirplaneThrottle setAirportSide setAmmo setAmmoCargo setAmmoOnPylon setAnimSpeedCoef setAperture setApertureNew setArmoryPoints setAttributes setAutonomous setBehaviour setBleedingRemaining setBrakesRTD setCameraInterest setCamShakeDefParams setCamShakeParams setCamUseTI setCaptive setCenterOfMass setCollisionLight setCombatMode setCompassOscillation setConvoySeparation setCuratorCameraAreaCeiling setCuratorCoef setCuratorEditingAreaType setCuratorWaypointCost setCurrentChannel setCurrentTask setCurrentWaypoint setCustomAimCoef setCustomWeightRTD setDamage setDammage setDate setDebriefingText setDefaultCamera setDestination setDetailMapBlendPars setDir setDirection setDrawIcon setDriveOnPath setDropInterval setDynamicSimulationDistance setDynamicSimulationDistanceCoef setEditorMode setEditorObjectScope setEffectCondition setEngineRPMRTD setFace setFaceAnimation setFatigue setFeatureType setFlagAnimationPhase setFlagOwner setFlagSide setFlagTexture setFog setFormation setFormationTask setFormDir setFriend setFromEditor setFSMVariable setFuel setFuelCargo setGroupIcon setGroupIconParams setGroupIconsSelectable setGroupIconsVisible setGroupId setGroupIdGlobal setGroupOwner setGusts setHideBehind setHit setHitIndex setHitPointDamage setHorizonParallaxCoef setHUDMovementLevels setIdentity setImportance setInfoPanel setLeader setLightAmbient setLightAttenuation setLightBrightness setLightColor setLightDayLight setLightFlareMaxDistance setLightFlareSize setLightIntensity setLightnings setLightUseFlare setLocalWindParams setMagazineTurretAmmo setMarkerAlpha setMarkerAlphaLocal setMarkerBrush setMarkerBrushLocal setMarkerColor setMarkerColorLocal setMarkerDir setMarkerDirLocal setMarkerPos setMarkerPosLocal setMarkerShape setMarkerShapeLocal setMarkerSize setMarkerSizeLocal setMarkerText setMarkerTextLocal setMarkerType setMarkerTypeLocal setMass setMimic setMousePosition setMusicEffect setMusicEventHandler setName setNameSound setObjectArguments setObjectMaterial setObjectMaterialGlobal setObjectProxy setObjectTexture setObjectTextureGlobal setObjectViewDistance setOvercast setOwner setOxygenRemaining setParticleCircle setParticleClass setParticleFire setParticleParams setParticleRandom setPilotCameraDirection setPilotCameraRotation setPilotCameraTarget setPilotLight setPiPEffect setPitch setPlateNumber setPlayable setPlayerRespawnTime setPos setPosASL setPosASL2 setPosASLW setPosATL setPosition setPosWorld setPylonLoadOut setPylonsPriority setRadioMsg setRain setRainbow setRandomLip setRank setRectangular setRepairCargo setRotorBrakeRTD setShadowDistance setShotParents setSide setSimpleTaskAlwaysVisible setSimpleTaskCustomData setSimpleTaskDescription setSimpleTaskDestination setSimpleTaskTarget setSimpleTaskType setSimulWeatherLayers setSize setSkill setSlingLoad setSoundEffect setSpeaker setSpeech setSpeedMode setStamina setStaminaScheme setStatValue setSuppression setSystemOfUnits setTargetAge setTaskMarkerOffset setTaskResult setTaskState setTerrainGrid setText setTimeMultiplier setTitleEffect setTrafficDensity setTrafficDistance setTrafficGap setTrafficSpeed setTriggerActivation setTriggerArea setTriggerStatements setTriggerText setTriggerTimeout setTriggerType setType setUnconscious setUnitAbility setUnitLoadout setUnitPos setUnitPosWeak setUnitRank setUnitRecoilCoefficient setUnitTrait setUnloadInCombat setUserActionText setUserMFDText setUserMFDvalue setVariable setVectorDir setVectorDirAndUp setVectorUp setVehicleAmmo setVehicleAmmoDef setVehicleArmor setVehicleCargo setVehicleId setVehicleLock setVehiclePosition setVehicleRadar setVehicleReceiveRemoteTargets setVehicleReportOwnPosition setVehicleReportRemoteTargets setVehicleTIPars setVehicleVarName setVelocity setVelocityModelSpace setVelocityTransformation setViewDistance setVisibleIfTreeCollapsed setWantedRPMRTD setWaves setWaypointBehaviour setWaypointCombatMode setWaypointCompletionRadius setWaypointDescription setWaypointForceBehaviour setWaypointFormation setWaypointHousePosition setWaypointLoiterRadius setWaypointLoiterType setWaypointName setWaypointPosition setWaypointScript setWaypointSpeed setWaypointStatements setWaypointTimeout setWaypointType setWaypointVisible setWeaponReloadingTime setWind setWindDir setWindForce setWindStr setWingForceScaleRTD setWPPos show3DIcons showChat showCinemaBorder showCommandingMenu showCompass showCuratorCompass showGPS showHUD showLegend showMap shownArtilleryComputer shownChat shownCompass shownCuratorCompass showNewEditorObject shownGPS shownHUD shownMap shownPad shownRadio shownScoretable shownUAVFeed shownWarrant shownWatch showPad showRadio showScoretable showSubtitles showUAVFeed showWarrant showWatch showWaypoint showWaypoints side sideChat sideEnemy sideFriendly sideRadio simpleTasks simulationEnabled simulCloudDensity simulCloudOcclusion simulInClouds simulWeatherSync sin size sizeOf skill skillFinal skipTime sleep sliderPosition sliderRange sliderSetPosition sliderSetRange sliderSetSpeed sliderSpeed slingLoadAssistantShown soldierMagazines someAmmo sort soundVolume spawn speaker speed speedMode splitString sqrt squadParams stance startLoadingScreen step stop stopEngineRTD stopped str sunOrMoon supportInfo suppressFor surfaceIsWater surfaceNormal surfaceType swimInDepth switchableUnits switchAction switchCamera switchGesture switchLight switchMove synchronizedObjects synchronizedTriggers synchronizedWaypoints synchronizeObjectsAdd synchronizeObjectsRemove synchronizeTrigger synchronizeWaypoint systemChat systemOfUnits tan targetKnowledge targets targetsAggregate targetsQuery taskAlwaysVisible taskChildren taskCompleted taskCustomData taskDescription taskDestination taskHint taskMarkerOffset taskParent taskResult taskState taskType teamMember teamName teams teamSwitch teamSwitchEnabled teamType terminate terrainIntersect terrainIntersectASL terrainIntersectAtASL text textLog textLogFormat tg time timeMultiplier titleCut titleFadeOut titleObj titleRsc titleText toArray toFixed toLower toString toUpper triggerActivated triggerActivation triggerArea triggerAttachedVehicle triggerAttachObject triggerAttachVehicle triggerDynamicSimulation triggerStatements triggerText triggerTimeout triggerTimeoutCurrent triggerType turretLocal turretOwner turretUnit tvAdd tvClear tvCollapse tvCollapseAll tvCount tvCurSel tvData tvDelete tvExpand tvExpandAll tvPicture tvSetColor tvSetCurSel tvSetData tvSetPicture tvSetPictureColor tvSetPictureColorDisabled tvSetPictureColorSelected tvSetPictureRight tvSetPictureRightColor tvSetPictureRightColorDisabled tvSetPictureRightColorSelected tvSetText tvSetTooltip tvSetValue tvSort tvSortByValue tvText tvTooltip tvValue type typeName typeOf UAVControl uiNamespace uiSleep unassignCurator unassignItem unassignTeam unassignVehicle underwater uniform uniformContainer uniformItems uniformMagazines unitAddons unitAimPosition unitAimPositionVisual unitBackpack unitIsUAV unitPos unitReady unitRecoilCoefficient units unitsBelowHeight unlinkItem unlockAchievement unregisterTask updateDrawIcon updateMenuItem updateObjectTree useAISteeringComponent useAudioTimeForMoves userInputDisabled vectorAdd vectorCos vectorCrossProduct vectorDiff vectorDir vectorDirVisual vectorDistance vectorDistanceSqr vectorDotProduct vectorFromTo vectorMagnitude vectorMagnitudeSqr vectorModelToWorld vectorModelToWorldVisual vectorMultiply vectorNormalized vectorUp vectorUpVisual vectorWorldToModel vectorWorldToModelVisual vehicle vehicleCargoEnabled vehicleChat vehicleRadio vehicleReceiveRemoteTargets vehicleReportOwnPosition vehicleReportRemoteTargets vehicles vehicleVarName velocity velocityModelSpace verifySignature vest vestContainer vestItems vestMagazines viewDistance visibleCompass visibleGPS visibleMap visiblePosition visiblePositionASL visibleScoretable visibleWatch waves waypointAttachedObject waypointAttachedVehicle waypointAttachObject waypointAttachVehicle waypointBehaviour waypointCombatMode waypointCompletionRadius waypointDescription waypointForceBehaviour waypointFormation waypointHousePosition waypointLoiterRadius waypointLoiterType waypointName waypointPosition waypoints waypointScript waypointsEnabledUAV waypointShow waypointSpeed waypointStatements waypointTimeout waypointTimeoutCurrent waypointType waypointVisible weaponAccessories weaponAccessoriesCargo weaponCargo weaponDirection weaponInertia weaponLowered weapons weaponsItems weaponsItemsCargo weaponState weaponsTurret weightRTD WFSideText wind ",literal:"blufor civilian configNull controlNull displayNull east endl false grpNull independent lineBreak locationNull nil objNull opfor pi resistance scriptNull sideAmbientLife sideEmpty sideLogic sideUnknown taskNull teamMemberNull true west"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.NUMBER_MODE,{className:"variable",begin:/\b_+[a-zA-Z_]\w*/},{className:"title",begin:/[a-zA-Z][a-zA-Z0-9]+_fnc_\w*/},t,a],illegal:/#|^\$ /}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/sql.min.js b/vendor/assets/javascripts/highlightjs/languages/sql.min.js
index 6ba57aabe5..3e49bf82ea 100644
--- a/vendor/assets/javascripts/highlightjs/languages/sql.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/sql.min.js
@@ -1 +1 @@
-hljs.registerLanguage("sql",function(e){var t=e.C("--","$");return{cI:!0,i:/[<>{}*]/,c:[{bK:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke comment values with",e:/;/,eW:!0,l:/[\w\.]+/,k:{keyword:"as abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias all allocate allow alter always analyze ancillary and anti any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound bucket buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain explode export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force foreign form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour hours http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lateral lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minutes minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notnull notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second seconds section securefile security seed segment select self semi sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tablesample tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unnest unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace window with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek",literal:"true false null unknown",built_in:"array bigint binary bit blob bool boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text time timestamp tinyint varchar varying void"},c:[{cN:"string",b:"'",e:"'",c:[e.BE,{b:"''"}]},{cN:"string",b:'"',e:'"',c:[e.BE,{b:'""'}]},{cN:"string",b:"`",e:"`",c:[e.BE]},e.CNM,e.CBCM,t,e.HCM]},e.CBCM,t,e.HCM]}});
\ No newline at end of file
+hljs.registerLanguage("sql",function(){"use strict";return function(e){var t=e.COMMENT("--","$");return{name:"SQL",case_insensitive:!0,illegal:/[<>{}*]/,contains:[{beginKeywords:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke comment values with",end:/;/,endsWithParent:!0,keywords:{$pattern:/[\w\.]+/,keyword:"as abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias all allocate allow alter always analyze ancillary and anti any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound bucket buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain explode export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force foreign form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour hours http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lateral lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minutes minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notnull notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second seconds section securefile security seed segment select self semi sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tablesample tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unnest unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace window with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek",literal:"true false null unknown",built_in:"array bigint binary bit blob bool boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text time timestamp tinyint varchar varchar2 varying void"},contains:[{className:"string",begin:"'",end:"'",contains:[{begin:"''"}]},{className:"string",begin:'"',end:'"',contains:[{begin:'""'}]},{className:"string",begin:"`",end:"`"},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,e.HASH_COMMENT_MODE]},e.C_BLOCK_COMMENT_MODE,t,e.HASH_COMMENT_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/stan.min.js b/vendor/assets/javascripts/highlightjs/languages/stan.min.js
index 96c736ddc4..1dcb6b78e6 100644
--- a/vendor/assets/javascripts/highlightjs/languages/stan.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/stan.min.js
@@ -1 +1 @@
-hljs.registerLanguage("stan",function(e){return{c:[e.HCM,e.CLCM,e.CBCM,{b:e.UIR,l:e.UIR,k:{name:"for in while repeat until if then else",symbol:"bernoulli bernoulli_logit binomial binomial_logit beta_binomial hypergeometric categorical categorical_logit ordered_logistic neg_binomial neg_binomial_2 neg_binomial_2_log poisson poisson_log multinomial normal exp_mod_normal skew_normal student_t cauchy double_exponential logistic gumbel lognormal chi_square inv_chi_square scaled_inv_chi_square exponential inv_gamma weibull frechet rayleigh wiener pareto pareto_type_2 von_mises uniform multi_normal multi_normal_prec multi_normal_cholesky multi_gp multi_gp_cholesky multi_student_t gaussian_dlm_obs dirichlet lkj_corr lkj_corr_cholesky wishart inv_wishart","selector-tag":"int real vector simplex unit_vector ordered positive_ordered row_vector matrix cholesky_factor_corr cholesky_factor_cov corr_matrix cov_matrix",title:"functions model data parameters quantities transformed generated",literal:"true false"},r:0},{cN:"number",b:"0[xX][0-9a-fA-F]+[Li]?\\b",r:0},{cN:"number",b:"0[xX][0-9a-fA-F]+[Li]?\\b",r:0},{cN:"number",b:"\\d+(?:[eE][+\\-]?\\d*)?L\\b",r:0},{cN:"number",b:"\\d+\\.(?!\\d)(?:i\\b)?",r:0},{cN:"number",b:"\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d*)?i?\\b",r:0},{cN:"number",b:"\\.\\d+(?:[eE][+\\-]?\\d*)?i?\\b",r:0}]}});
\ No newline at end of file
+hljs.registerLanguage("stan",function(){"use strict";return function(_){return{name:"Stan",aliases:["stanfuncs"],keywords:{$pattern:_.IDENT_RE,title:"functions model data parameters quantities transformed generated",keyword:["for","in","if","else","while","break","continue","return"].concat(["int","real","vector","ordered","positive_ordered","simplex","unit_vector","row_vector","matrix","cholesky_factor_corr|10","cholesky_factor_cov|10","corr_matrix|10","cov_matrix|10","void"]).concat(["print","reject","increment_log_prob|10","integrate_ode|10","integrate_ode_rk45|10","integrate_ode_bdf|10","algebra_solver"]).join(" "),built_in:"Phi Phi_approx abs acos acosh algebra_solver append_array append_col append_row asin asinh atan atan2 atanh bernoulli_cdf bernoulli_lccdf bernoulli_lcdf bernoulli_logit_lpmf bernoulli_logit_rng bernoulli_lpmf bernoulli_rng bessel_first_kind bessel_second_kind beta_binomial_cdf beta_binomial_lccdf beta_binomial_lcdf beta_binomial_lpmf beta_binomial_rng beta_cdf beta_lccdf beta_lcdf beta_lpdf beta_rng binary_log_loss binomial_cdf binomial_coefficient_log binomial_lccdf binomial_lcdf binomial_logit_lpmf binomial_lpmf binomial_rng block categorical_logit_lpmf categorical_logit_rng categorical_lpmf categorical_rng cauchy_cdf cauchy_lccdf cauchy_lcdf cauchy_lpdf cauchy_rng cbrt ceil chi_square_cdf chi_square_lccdf chi_square_lcdf chi_square_lpdf chi_square_rng cholesky_decompose choose col cols columns_dot_product columns_dot_self cos cosh cov_exp_quad crossprod csr_extract_u csr_extract_v csr_extract_w csr_matrix_times_vector csr_to_dense_matrix cumulative_sum determinant diag_matrix diag_post_multiply diag_pre_multiply diagonal digamma dims dirichlet_lpdf dirichlet_rng distance dot_product dot_self double_exponential_cdf double_exponential_lccdf double_exponential_lcdf double_exponential_lpdf double_exponential_rng e eigenvalues_sym eigenvectors_sym erf erfc exp exp2 exp_mod_normal_cdf exp_mod_normal_lccdf exp_mod_normal_lcdf exp_mod_normal_lpdf exp_mod_normal_rng expm1 exponential_cdf exponential_lccdf exponential_lcdf exponential_lpdf exponential_rng fabs falling_factorial fdim floor fma fmax fmin fmod frechet_cdf frechet_lccdf frechet_lcdf frechet_lpdf frechet_rng gamma_cdf gamma_lccdf gamma_lcdf gamma_lpdf gamma_p gamma_q gamma_rng gaussian_dlm_obs_lpdf get_lp gumbel_cdf gumbel_lccdf gumbel_lcdf gumbel_lpdf gumbel_rng head hypergeometric_lpmf hypergeometric_rng hypot inc_beta int_step integrate_ode integrate_ode_bdf integrate_ode_rk45 inv inv_Phi inv_chi_square_cdf inv_chi_square_lccdf inv_chi_square_lcdf inv_chi_square_lpdf inv_chi_square_rng inv_cloglog inv_gamma_cdf inv_gamma_lccdf inv_gamma_lcdf inv_gamma_lpdf inv_gamma_rng inv_logit inv_sqrt inv_square inv_wishart_lpdf inv_wishart_rng inverse inverse_spd is_inf is_nan lbeta lchoose lgamma lkj_corr_cholesky_lpdf lkj_corr_cholesky_rng lkj_corr_lpdf lkj_corr_rng lmgamma lmultiply log log10 log1m log1m_exp log1m_inv_logit log1p log1p_exp log2 log_determinant log_diff_exp log_falling_factorial log_inv_logit log_mix log_rising_factorial log_softmax log_sum_exp logistic_cdf logistic_lccdf logistic_lcdf logistic_lpdf logistic_rng logit lognormal_cdf lognormal_lccdf lognormal_lcdf lognormal_lpdf lognormal_rng machine_precision matrix_exp max mdivide_left_spd mdivide_left_tri_low mdivide_right_spd mdivide_right_tri_low mean min modified_bessel_first_kind modified_bessel_second_kind multi_gp_cholesky_lpdf multi_gp_lpdf multi_normal_cholesky_lpdf multi_normal_cholesky_rng multi_normal_lpdf multi_normal_prec_lpdf multi_normal_rng multi_student_t_lpdf multi_student_t_rng multinomial_lpmf multinomial_rng multiply_log multiply_lower_tri_self_transpose neg_binomial_2_cdf neg_binomial_2_lccdf neg_binomial_2_lcdf neg_binomial_2_log_lpmf neg_binomial_2_log_rng neg_binomial_2_lpmf neg_binomial_2_rng neg_binomial_cdf neg_binomial_lccdf neg_binomial_lcdf neg_binomial_lpmf neg_binomial_rng negative_infinity normal_cdf normal_lccdf normal_lcdf normal_lpdf normal_rng not_a_number num_elements ordered_logistic_lpmf ordered_logistic_rng owens_t pareto_cdf pareto_lccdf pareto_lcdf pareto_lpdf pareto_rng pareto_type_2_cdf pareto_type_2_lccdf pareto_type_2_lcdf pareto_type_2_lpdf pareto_type_2_rng pi poisson_cdf poisson_lccdf poisson_lcdf poisson_log_lpmf poisson_log_rng poisson_lpmf poisson_rng positive_infinity pow print prod qr_Q qr_R quad_form quad_form_diag quad_form_sym rank rayleigh_cdf rayleigh_lccdf rayleigh_lcdf rayleigh_lpdf rayleigh_rng reject rep_array rep_matrix rep_row_vector rep_vector rising_factorial round row rows rows_dot_product rows_dot_self scaled_inv_chi_square_cdf scaled_inv_chi_square_lccdf scaled_inv_chi_square_lcdf scaled_inv_chi_square_lpdf scaled_inv_chi_square_rng sd segment sin singular_values sinh size skew_normal_cdf skew_normal_lccdf skew_normal_lcdf skew_normal_lpdf skew_normal_rng softmax sort_asc sort_desc sort_indices_asc sort_indices_desc sqrt sqrt2 square squared_distance step student_t_cdf student_t_lccdf student_t_lcdf student_t_lpdf student_t_rng sub_col sub_row sum tail tan tanh target tcrossprod tgamma to_array_1d to_array_2d to_matrix to_row_vector to_vector trace trace_gen_quad_form trace_quad_form trigamma trunc uniform_cdf uniform_lccdf uniform_lcdf uniform_lpdf uniform_rng variance von_mises_lpdf von_mises_rng weibull_cdf weibull_lccdf weibull_lcdf weibull_lpdf weibull_rng wiener_lpdf wishart_lpdf wishart_rng"},contains:[_.C_LINE_COMMENT_MODE,_.COMMENT(/#/,/$/,{relevance:0,keywords:{"meta-keyword":"include"}}),_.COMMENT(/\/\*/,/\*\//,{relevance:0,contains:[{className:"doctag",begin:/@(return|param)/}]}),{begin:/<\s*lower\s*=/,keywords:"lower"},{begin:/[<,]\s*upper\s*=/,keywords:"upper"},{className:"keyword",begin:/\btarget\s*\+=/,relevance:10},{begin:"~\\s*("+_.IDENT_RE+")\\s*\\(",keywords:"bernoulli bernoulli_logit beta beta_binomial binomial binomial_logit categorical categorical_logit cauchy chi_square dirichlet double_exponential exp_mod_normal exponential frechet gamma gaussian_dlm_obs gumbel hypergeometric inv_chi_square inv_gamma inv_wishart lkj_corr lkj_corr_cholesky logistic lognormal multi_gp multi_gp_cholesky multi_normal multi_normal_cholesky multi_normal_prec multi_student_t multinomial neg_binomial neg_binomial_2 neg_binomial_2_log normal ordered_logistic pareto pareto_type_2 poisson poisson_log rayleigh scaled_inv_chi_square skew_normal student_t uniform von_mises weibull wiener wishart"},{className:"number",variants:[{begin:/\b\d+(?:\.\d*)?(?:[eE][+-]?\d+)?/},{begin:/\.\d+(?:[eE][+-]?\d+)?\b/}],relevance:0},{className:"string",begin:'"',end:'"',relevance:0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/stata.min.js b/vendor/assets/javascripts/highlightjs/languages/stata.min.js
index 9c55eeff3a..6ad1868312 100644
--- a/vendor/assets/javascripts/highlightjs/languages/stata.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/stata.min.js
@@ -1 +1 @@
-hljs.registerLanguage("stata",function(e){return{aliases:["do","ado"],cI:!0,k:"if else in foreach for forv forva forval forvalu forvalue forvalues by bys bysort xi quietly qui capture about ac ac_7 acprplot acprplot_7 adjust ado adopath adoupdate alpha ameans an ano anov anova anova_estat anova_terms anovadef aorder ap app appe appen append arch arch_dr arch_estat arch_p archlm areg areg_p args arima arima_dr arima_estat arima_p as asmprobit asmprobit_estat asmprobit_lf asmprobit_mfx__dlg asmprobit_p ass asse asser assert avplot avplot_7 avplots avplots_7 bcskew0 bgodfrey binreg bip0_lf biplot bipp_lf bipr_lf bipr_p biprobit bitest bitesti bitowt blogit bmemsize boot bootsamp bootstrap bootstrap_8 boxco_l boxco_p boxcox boxcox_6 boxcox_p bprobit br break brier bro brow brows browse brr brrstat bs bs_7 bsampl_w bsample bsample_7 bsqreg bstat bstat_7 bstat_8 bstrap bstrap_7 ca ca_estat ca_p cabiplot camat canon canon_8 canon_8_p canon_estat canon_p cap caprojection capt captu captur capture cat cc cchart cchart_7 cci cd censobs_table centile cf char chdir checkdlgfiles checkestimationsample checkhlpfiles checksum chelp ci cii cl class classutil clear cli clis clist clo clog clog_lf clog_p clogi clogi_sw clogit clogit_lf clogit_p clogitp clogl_sw cloglog clonevar clslistarray cluster cluster_measures cluster_stop cluster_tree cluster_tree_8 clustermat cmdlog cnr cnre cnreg cnreg_p cnreg_sw cnsreg codebook collaps4 collapse colormult_nb colormult_nw compare compress conf confi confir confirm conren cons const constr constra constrai constrain constraint continue contract copy copyright copysource cor corc corr corr2data corr_anti corr_kmo corr_smc corre correl correla correlat correlate corrgram cou coun count cox cox_p cox_sw coxbase coxhaz coxvar cprplot cprplot_7 crc cret cretu cretur creturn cross cs cscript cscript_log csi ct ct_is ctset ctst_5 ctst_st cttost cumsp cumsp_7 cumul cusum cusum_7 cutil d|0 datasig datasign datasigna datasignat datasignatu datasignatur datasignature datetof db dbeta de dec deco decod decode deff des desc descr descri describ describe destring dfbeta dfgls dfuller di di_g dir dirstats dis discard disp disp_res disp_s displ displa display distinct do doe doed doedi doedit dotplot dotplot_7 dprobit drawnorm drop ds ds_util dstdize duplicates durbina dwstat dydx e|0 ed edi edit egen eivreg emdef en enc enco encod encode eq erase ereg ereg_lf ereg_p ereg_sw ereghet ereghet_glf ereghet_glf_sh ereghet_gp ereghet_ilf ereghet_ilf_sh ereghet_ip eret eretu eretur ereturn err erro error est est_cfexist est_cfname est_clickable est_expand est_hold est_table est_unhold est_unholdok estat estat_default estat_summ estat_vce_only esti estimates etodow etof etomdy ex exi exit expand expandcl fac fact facto factor factor_estat factor_p factor_pca_rotated factor_rotate factormat fcast fcast_compute fcast_graph fdades fdadesc fdadescr fdadescri fdadescrib fdadescribe fdasav fdasave fdause fh_st file open file read file close file filefilter fillin find_hlp_file findfile findit findit_7 fit fl fli flis flist for5_0 form forma format fpredict frac_154 frac_adj frac_chk frac_cox frac_ddp frac_dis frac_dv frac_in frac_mun frac_pp frac_pq frac_pv frac_wgt frac_xo fracgen fracplot fracplot_7 fracpoly fracpred fron_ex fron_hn fron_p fron_tn fron_tn2 frontier ftodate ftoe ftomdy ftowdate g|0 gamhet_glf gamhet_gp gamhet_ilf gamhet_ip gamma gamma_d2 gamma_p gamma_sw gammahet gdi_hexagon gdi_spokes ge gen gene gener genera generat generate genrank genstd genvmean gettoken gl gladder gladder_7 glim_l01 glim_l02 glim_l03 glim_l04 glim_l05 glim_l06 glim_l07 glim_l08 glim_l09 glim_l10 glim_l11 glim_l12 glim_lf glim_mu glim_nw1 glim_nw2 glim_nw3 glim_p glim_v1 glim_v2 glim_v3 glim_v4 glim_v5 glim_v6 glim_v7 glm glm_6 glm_p glm_sw glmpred glo glob globa global glogit glogit_8 glogit_p gmeans gnbre_lf gnbreg gnbreg_5 gnbreg_p gomp_lf gompe_sw gomper_p gompertz gompertzhet gomphet_glf gomphet_glf_sh gomphet_gp gomphet_ilf gomphet_ilf_sh gomphet_ip gphdot gphpen gphprint gprefs gprobi_p gprobit gprobit_8 gr gr7 gr_copy gr_current gr_db gr_describe gr_dir gr_draw gr_draw_replay gr_drop gr_edit gr_editviewopts gr_example gr_example2 gr_export gr_print gr_qscheme gr_query gr_read gr_rename gr_replay gr_save gr_set gr_setscheme gr_table gr_undo gr_use graph graph7 grebar greigen greigen_7 greigen_8 grmeanby grmeanby_7 gs_fileinfo gs_filetype gs_graphinfo gs_stat gsort gwood h|0 hadimvo hareg hausman haver he heck_d2 heckma_p heckman heckp_lf heckpr_p heckprob hel help hereg hetpr_lf hetpr_p hetprob hettest hexdump hilite hist hist_7 histogram hlogit hlu hmeans hotel hotelling hprobit hreg hsearch icd9 icd9_ff icd9p iis impute imtest inbase include inf infi infil infile infix inp inpu input ins insheet insp inspe inspec inspect integ inten intreg intreg_7 intreg_p intrg2_ll intrg_ll intrg_ll2 ipolate iqreg ir irf irf_create irfm iri is_svy is_svysum isid istdize ivprob_1_lf ivprob_lf ivprobit ivprobit_p ivreg ivreg_footnote ivtob_1_lf ivtob_lf ivtobit ivtobit_p jackknife jacknife jknife jknife_6 jknife_8 jkstat joinby kalarma1 kap kap_3 kapmeier kappa kapwgt kdensity kdensity_7 keep ksm ksmirnov ktau kwallis l|0 la lab labe label labelbook ladder levels levelsof leverage lfit lfit_p li lincom line linktest lis list lloghet_glf lloghet_glf_sh lloghet_gp lloghet_ilf lloghet_ilf_sh lloghet_ip llogi_sw llogis_p llogist llogistic llogistichet lnorm_lf lnorm_sw lnorma_p lnormal lnormalhet lnormhet_glf lnormhet_glf_sh lnormhet_gp lnormhet_ilf lnormhet_ilf_sh lnormhet_ip lnskew0 loadingplot loc loca local log logi logis_lf logistic logistic_p logit logit_estat logit_p loglogs logrank loneway lookfor lookup lowess lowess_7 lpredict lrecomp lroc lroc_7 lrtest ls lsens lsens_7 lsens_x lstat ltable ltable_7 ltriang lv lvr2plot lvr2plot_7 m|0 ma mac macr macro makecns man manova manova_estat manova_p manovatest mantel mark markin markout marksample mat mat_capp mat_order mat_put_rr mat_rapp mata mata_clear mata_describe mata_drop mata_matdescribe mata_matsave mata_matuse mata_memory mata_mlib mata_mosave mata_rename mata_which matalabel matcproc matlist matname matr matri matrix matrix_input__dlg matstrik mcc mcci md0_ md1_ md1debug_ md2_ md2debug_ mds mds_estat mds_p mdsconfig mdslong mdsmat mdsshepard mdytoe mdytof me_derd mean means median memory memsize meqparse mer merg merge mfp mfx mhelp mhodds minbound mixed_ll mixed_ll_reparm mkassert mkdir mkmat mkspline ml ml_5 ml_adjs ml_bhhhs ml_c_d ml_check ml_clear ml_cnt ml_debug ml_defd ml_e0 ml_e0_bfgs ml_e0_cycle ml_e0_dfp ml_e0i ml_e1 ml_e1_bfgs ml_e1_bhhh ml_e1_cycle ml_e1_dfp ml_e2 ml_e2_cycle ml_ebfg0 ml_ebfr0 ml_ebfr1 ml_ebh0q ml_ebhh0 ml_ebhr0 ml_ebr0i ml_ecr0i ml_edfp0 ml_edfr0 ml_edfr1 ml_edr0i ml_eds ml_eer0i ml_egr0i ml_elf ml_elf_bfgs ml_elf_bhhh ml_elf_cycle ml_elf_dfp ml_elfi ml_elfs ml_enr0i ml_enrr0 ml_erdu0 ml_erdu0_bfgs ml_erdu0_bhhh ml_erdu0_bhhhq ml_erdu0_cycle ml_erdu0_dfp ml_erdu0_nrbfgs ml_exde ml_footnote ml_geqnr ml_grad0 ml_graph ml_hbhhh ml_hd0 ml_hold ml_init ml_inv ml_log ml_max ml_mlout ml_mlout_8 ml_model ml_nb0 ml_opt ml_p ml_plot ml_query ml_rdgrd ml_repor ml_s_e ml_score ml_searc ml_technique ml_unhold mleval mlf_ mlmatbysum mlmatsum mlog mlogi mlogit mlogit_footnote mlogit_p mlopts mlsum mlvecsum mnl0_ mor more mov move mprobit mprobit_lf mprobit_p mrdu0_ mrdu1_ mvdecode mvencode mvreg mvreg_estat n|0 nbreg nbreg_al nbreg_lf nbreg_p nbreg_sw nestreg net newey newey_7 newey_p news nl nl_7 nl_9 nl_9_p nl_p nl_p_7 nlcom nlcom_p nlexp2 nlexp2_7 nlexp2a nlexp2a_7 nlexp3 nlexp3_7 nlgom3 nlgom3_7 nlgom4 nlgom4_7 nlinit nllog3 nllog3_7 nllog4 nllog4_7 nlog_rd nlogit nlogit_p nlogitgen nlogittree nlpred no nobreak noi nois noisi noisil noisily note notes notes_dlg nptrend numlabel numlist odbc old_ver olo olog ologi ologi_sw ologit ologit_p ologitp on one onew onewa oneway op_colnm op_comp op_diff op_inv op_str opr opro oprob oprob_sw oprobi oprobi_p oprobit oprobitp opts_exclusive order orthog orthpoly ou out outf outfi outfil outfile outs outsh outshe outshee outsheet ovtest pac pac_7 palette parse parse_dissim pause pca pca_8 pca_display pca_estat pca_p pca_rotate pcamat pchart pchart_7 pchi pchi_7 pcorr pctile pentium pergram pergram_7 permute permute_8 personal peto_st pkcollapse pkcross pkequiv pkexamine pkexamine_7 pkshape pksumm pksumm_7 pl plo plot plugin pnorm pnorm_7 poisgof poiss_lf poiss_sw poisso_p poisson poisson_estat post postclose postfile postutil pperron pr prais prais_e prais_e2 prais_p predict predictnl preserve print pro prob probi probit probit_estat probit_p proc_time procoverlay procrustes procrustes_estat procrustes_p profiler prog progr progra program prop proportion prtest prtesti pwcorr pwd q\\s qby qbys qchi qchi_7 qladder qladder_7 qnorm qnorm_7 qqplot qqplot_7 qreg qreg_c qreg_p qreg_sw qu quadchk quantile quantile_7 que quer query range ranksum ratio rchart rchart_7 rcof recast reclink recode reg reg3 reg3_p regdw regr regre regre_p2 regres regres_p regress regress_estat regriv_p remap ren rena renam rename renpfix repeat replace report reshape restore ret retu retur return rm rmdir robvar roccomp roccomp_7 roccomp_8 rocf_lf rocfit rocfit_8 rocgold rocplot rocplot_7 roctab roctab_7 rolling rologit rologit_p rot rota rotat rotate rotatemat rreg rreg_p ru run runtest rvfplot rvfplot_7 rvpplot rvpplot_7 sa safesum sample sampsi sav save savedresults saveold sc sca scal scala scalar scatter scm_mine sco scob_lf scob_p scobi_sw scobit scor score scoreplot scoreplot_help scree screeplot screeplot_help sdtest sdtesti se search separate seperate serrbar serrbar_7 serset set set_defaults sfrancia sh she shel shell shewhart shewhart_7 signestimationsample signrank signtest simul simul_7 simulate simulate_8 sktest sleep slogit slogit_d2 slogit_p smooth snapspan so sor sort spearman spikeplot spikeplot_7 spikeplt spline_x split sqreg sqreg_p sret sretu sretur sreturn ssc st st_ct st_hc st_hcd st_hcd_sh st_is st_issys st_note st_promo st_set st_show st_smpl st_subid stack statsby statsby_8 stbase stci stci_7 stcox stcox_estat stcox_fr stcox_fr_ll stcox_p stcox_sw stcoxkm stcoxkm_7 stcstat stcurv stcurve stcurve_7 stdes stem stepwise stereg stfill stgen stir stjoin stmc stmh stphplot stphplot_7 stphtest stphtest_7 stptime strate strate_7 streg streg_sw streset sts sts_7 stset stsplit stsum sttocc sttoct stvary stweib su suest suest_8 sum summ summa summar summari summariz summarize sunflower sureg survcurv survsum svar svar_p svmat svy svy_disp svy_dreg svy_est svy_est_7 svy_estat svy_get svy_gnbreg_p svy_head svy_header svy_heckman_p svy_heckprob_p svy_intreg_p svy_ivreg_p svy_logistic_p svy_logit_p svy_mlogit_p svy_nbreg_p svy_ologit_p svy_oprobit_p svy_poisson_p svy_probit_p svy_regress_p svy_sub svy_sub_7 svy_x svy_x_7 svy_x_p svydes svydes_8 svygen svygnbreg svyheckman svyheckprob svyintreg svyintreg_7 svyintrg svyivreg svylc svylog_p svylogit svymarkout svymarkout_8 svymean svymlog svymlogit svynbreg svyolog svyologit svyoprob svyoprobit svyopts svypois svypois_7 svypoisson svyprobit svyprobt svyprop svyprop_7 svyratio svyreg svyreg_p svyregress svyset svyset_7 svyset_8 svytab svytab_7 svytest svytotal sw sw_8 swcnreg swcox swereg swilk swlogis swlogit swologit swoprbt swpois swprobit swqreg swtobit swweib symmetry symmi symplot symplot_7 syntax sysdescribe sysdir sysuse szroeter ta tab tab1 tab2 tab_or tabd tabdi tabdis tabdisp tabi table tabodds tabodds_7 tabstat tabu tabul tabula tabulat tabulate te tempfile tempname tempvar tes test testnl testparm teststd tetrachoric time_it timer tis tob tobi tobit tobit_p tobit_sw token tokeni tokeniz tokenize tostring total translate translator transmap treat_ll treatr_p treatreg trim trnb_cons trnb_mean trpoiss_d2 trunc_ll truncr_p truncreg tsappend tset tsfill tsline tsline_ex tsreport tsrevar tsrline tsset tssmooth tsunab ttest ttesti tut_chk tut_wait tutorial tw tware_st two twoway twoway__fpfit_serset twoway__function_gen twoway__histogram_gen twoway__ipoint_serset twoway__ipoints_serset twoway__kdensity_gen twoway__lfit_serset twoway__normgen_gen twoway__pci_serset twoway__qfit_serset twoway__scatteri_serset twoway__sunflower_gen twoway_ksm_serset ty typ type typeof u|0 unab unabbrev unabcmd update us use uselabel var var_mkcompanion var_p varbasic varfcast vargranger varirf varirf_add varirf_cgraph varirf_create varirf_ctable varirf_describe varirf_dir varirf_drop varirf_erase varirf_graph varirf_ograph varirf_rename varirf_set varirf_table varlist varlmar varnorm varsoc varstable varstable_w varstable_w2 varwle vce vec vec_fevd vec_mkphi vec_p vec_p_w vecirf_create veclmar veclmar_w vecnorm vecnorm_w vecrank vecstable verinst vers versi versio version view viewsource vif vwls wdatetof webdescribe webseek webuse weib1_lf weib2_lf weib_lf weib_lf0 weibhet_glf weibhet_glf_sh weibhet_glfa weibhet_glfa_sh weibhet_gp weibhet_ilf weibhet_ilf_sh weibhet_ilfa weibhet_ilfa_sh weibhet_ip weibu_sw weibul_p weibull weibull_c weibull_s weibullhet wh whelp whi which whil while wilc_st wilcoxon win wind windo window winexec wntestb wntestb_7 wntestq xchart xchart_7 xcorr xcorr_7 xi xi_6 xmlsav xmlsave xmluse xpose xsh xshe xshel xshell xt_iis xt_tis xtab_p xtabond xtbin_p xtclog xtcloglog xtcloglog_8 xtcloglog_d2 xtcloglog_pa_p xtcloglog_re_p xtcnt_p xtcorr xtdata xtdes xtfront_p xtfrontier xtgee xtgee_elink xtgee_estat xtgee_makeivar xtgee_p xtgee_plink xtgls xtgls_p xthaus xthausman xtht_p xthtaylor xtile xtint_p xtintreg xtintreg_8 xtintreg_d2 xtintreg_p xtivp_1 xtivp_2 xtivreg xtline xtline_ex xtlogit xtlogit_8 xtlogit_d2 xtlogit_fe_p xtlogit_pa_p xtlogit_re_p xtmixed xtmixed_estat xtmixed_p xtnb_fe xtnb_lf xtnbreg xtnbreg_pa_p xtnbreg_refe_p xtpcse xtpcse_p xtpois xtpoisson xtpoisson_d2 xtpoisson_pa_p xtpoisson_refe_p xtpred xtprobit xtprobit_8 xtprobit_d2 xtprobit_re_p xtps_fe xtps_lf xtps_ren xtps_ren_8 xtrar_p xtrc xtrc_p xtrchh xtrefe_p xtreg xtreg_be xtreg_fe xtreg_ml xtreg_pa_p xtreg_re xtregar xtrere_p xtset xtsf_ll xtsf_llti xtsum xttab xttest0 xttobit xttobit_8 xttobit_p xttrans yx yxview__barlike_draw yxview_area_draw yxview_bar_draw yxview_dot_draw yxview_dropline_draw yxview_function_draw yxview_iarrow_draw yxview_ilabels_draw yxview_normal_draw yxview_pcarrow_draw yxview_pcbarrow_draw yxview_pccapsym_draw yxview_pcscatter_draw yxview_pcspike_draw yxview_rarea_draw yxview_rbar_draw yxview_rbarm_draw yxview_rcap_draw yxview_rcapsym_draw yxview_rconnected_draw yxview_rline_draw yxview_rscatter_draw yxview_rspike_draw yxview_spike_draw yxview_sunflower_draw zap_s zinb zinb_llf zinb_plf zip zip_llf zip_p zip_plf zt_ct_5 zt_hc_5 zt_hcd_5 zt_is_5 zt_iss_5 zt_sho_5 zt_smp_5 ztbase_5 ztcox_5 ztdes_5 ztereg_5 ztfill_5 ztgen_5 ztir_5 ztjoin_5 ztnb ztnb_p ztp ztp_p zts_5 ztset_5 ztspli_5 ztsum_5 zttoct_5 ztvary_5 ztweib_5",c:[{cN:"symbol",b:/`[a-zA-Z0-9_]+'/},{cN:"variable",b:/\$\{?[a-zA-Z0-9_]+\}?/},{cN:"string",v:[{b:'`"[^\r\n]*?"\''},{b:'"[^\r\n"]*"'}]},{cN:"built_in",v:[{b:"\\b(abs|acos|asin|atan|atan2|atanh|ceil|cloglog|comb|cos|digamma|exp|floor|invcloglog|invlogit|ln|lnfact|lnfactorial|lngamma|log|log10|max|min|mod|reldif|round|sign|sin|sqrt|sum|tan|tanh|trigamma|trunc|betaden|Binomial|binorm|binormal|chi2|chi2tail|dgammapda|dgammapdada|dgammapdadx|dgammapdx|dgammapdxdx|F|Fden|Ftail|gammaden|gammap|ibeta|invbinomial|invchi2|invchi2tail|invF|invFtail|invgammap|invibeta|invnchi2|invnFtail|invnibeta|invnorm|invnormal|invttail|nbetaden|nchi2|nFden|nFtail|nibeta|norm|normal|normalden|normd|npnchi2|tden|ttail|uniform|abbrev|char|index|indexnot|length|lower|ltrim|match|plural|proper|real|regexm|regexr|regexs|reverse|rtrim|string|strlen|strlower|strltrim|strmatch|strofreal|strpos|strproper|strreverse|strrtrim|strtrim|strupper|subinstr|subinword|substr|trim|upper|word|wordcount|_caller|autocode|byteorder|chop|clip|cond|e|epsdouble|epsfloat|group|inlist|inrange|irecode|matrix|maxbyte|maxdouble|maxfloat|maxint|maxlong|mi|minbyte|mindouble|minfloat|minint|minlong|missing|r|recode|replay|return|s|scalar|d|date|day|dow|doy|halfyear|mdy|month|quarter|week|year|d|daily|dofd|dofh|dofm|dofq|dofw|dofy|h|halfyearly|hofd|m|mofd|monthly|q|qofd|quarterly|tin|twithin|w|weekly|wofd|y|yearly|yh|ym|yofd|yq|yw|cholesky|colnumb|colsof|corr|det|diag|diag0cnt|el|get|hadamard|I|inv|invsym|issym|issymmetric|J|matmissing|matuniform|mreldif|nullmat|rownumb|rowsof|sweep|syminv|trace|vec|vecdiag)(?=\\(|$)"}]},e.C("^[ 	]*\\*.*$",!1),e.CLCM,e.CBCM]}});
\ No newline at end of file
+hljs.registerLanguage("stata",function(){"use strict";return function(e){return{name:"Stata",aliases:["do","ado"],case_insensitive:!0,keywords:"if else in foreach for forv forva forval forvalu forvalue forvalues by bys bysort xi quietly qui capture about ac ac_7 acprplot acprplot_7 adjust ado adopath adoupdate alpha ameans an ano anov anova anova_estat anova_terms anovadef aorder ap app appe appen append arch arch_dr arch_estat arch_p archlm areg areg_p args arima arima_dr arima_estat arima_p as asmprobit asmprobit_estat asmprobit_lf asmprobit_mfx__dlg asmprobit_p ass asse asser assert avplot avplot_7 avplots avplots_7 bcskew0 bgodfrey bias binreg bip0_lf biplot bipp_lf bipr_lf bipr_p biprobit bitest bitesti bitowt blogit bmemsize boot bootsamp bootstrap bootstrap_8 boxco_l boxco_p boxcox boxcox_6 boxcox_p bprobit br break brier bro brow brows browse brr brrstat bs bs_7 bsampl_w bsample bsample_7 bsqreg bstat bstat_7 bstat_8 bstrap bstrap_7 bubble bubbleplot ca ca_estat ca_p cabiplot camat canon canon_8 canon_8_p canon_estat canon_p cap caprojection capt captu captur capture cat cc cchart cchart_7 cci cd censobs_table centile cf char chdir checkdlgfiles checkestimationsample checkhlpfiles checksum chelp ci cii cl class classutil clear cli clis clist clo clog clog_lf clog_p clogi clogi_sw clogit clogit_lf clogit_p clogitp clogl_sw cloglog clonevar clslistarray cluster cluster_measures cluster_stop cluster_tree cluster_tree_8 clustermat cmdlog cnr cnre cnreg cnreg_p cnreg_sw cnsreg codebook collaps4 collapse colormult_nb colormult_nw compare compress conf confi confir confirm conren cons const constr constra constrai constrain constraint continue contract copy copyright copysource cor corc corr corr2data corr_anti corr_kmo corr_smc corre correl correla correlat correlate corrgram cou coun count cox cox_p cox_sw coxbase coxhaz coxvar cprplot cprplot_7 crc cret cretu cretur creturn cross cs cscript cscript_log csi ct ct_is ctset ctst_5 ctst_st cttost cumsp cumsp_7 cumul cusum cusum_7 cutil d|0 datasig datasign datasigna datasignat datasignatu datasignatur datasignature datetof db dbeta de dec deco decod decode deff des desc descr descri describ describe destring dfbeta dfgls dfuller di di_g dir dirstats dis discard disp disp_res disp_s displ displa display distinct do doe doed doedi doedit dotplot dotplot_7 dprobit drawnorm drop ds ds_util dstdize duplicates durbina dwstat dydx e|0 ed edi edit egen eivreg emdef en enc enco encod encode eq erase ereg ereg_lf ereg_p ereg_sw ereghet ereghet_glf ereghet_glf_sh ereghet_gp ereghet_ilf ereghet_ilf_sh ereghet_ip eret eretu eretur ereturn err erro error esize est est_cfexist est_cfname est_clickable est_expand est_hold est_table est_unhold est_unholdok estat estat_default estat_summ estat_vce_only esti estimates etodow etof etomdy ex exi exit expand expandcl fac fact facto factor factor_estat factor_p factor_pca_rotated factor_rotate factormat fcast fcast_compute fcast_graph fdades fdadesc fdadescr fdadescri fdadescrib fdadescribe fdasav fdasave fdause fh_st file open file read file close file filefilter fillin find_hlp_file findfile findit findit_7 fit fl fli flis flist for5_0 forest forestplot form forma format fpredict frac_154 frac_adj frac_chk frac_cox frac_ddp frac_dis frac_dv frac_in frac_mun frac_pp frac_pq frac_pv frac_wgt frac_xo fracgen fracplot fracplot_7 fracpoly fracpred fron_ex fron_hn fron_p fron_tn fron_tn2 frontier ftodate ftoe ftomdy ftowdate funnel funnelplot g|0 gamhet_glf gamhet_gp gamhet_ilf gamhet_ip gamma gamma_d2 gamma_p gamma_sw gammahet gdi_hexagon gdi_spokes ge gen gene gener genera generat generate genrank genstd genvmean gettoken gl gladder gladder_7 glim_l01 glim_l02 glim_l03 glim_l04 glim_l05 glim_l06 glim_l07 glim_l08 glim_l09 glim_l10 glim_l11 glim_l12 glim_lf glim_mu glim_nw1 glim_nw2 glim_nw3 glim_p glim_v1 glim_v2 glim_v3 glim_v4 glim_v5 glim_v6 glim_v7 glm glm_6 glm_p glm_sw glmpred glo glob globa global glogit glogit_8 glogit_p gmeans gnbre_lf gnbreg gnbreg_5 gnbreg_p gomp_lf gompe_sw gomper_p gompertz gompertzhet gomphet_glf gomphet_glf_sh gomphet_gp gomphet_ilf gomphet_ilf_sh gomphet_ip gphdot gphpen gphprint gprefs gprobi_p gprobit gprobit_8 gr gr7 gr_copy gr_current gr_db gr_describe gr_dir gr_draw gr_draw_replay gr_drop gr_edit gr_editviewopts gr_example gr_example2 gr_export gr_print gr_qscheme gr_query gr_read gr_rename gr_replay gr_save gr_set gr_setscheme gr_table gr_undo gr_use graph graph7 grebar greigen greigen_7 greigen_8 grmeanby grmeanby_7 gs_fileinfo gs_filetype gs_graphinfo gs_stat gsort gwood h|0 hadimvo hareg hausman haver he heck_d2 heckma_p heckman heckp_lf heckpr_p heckprob hel help hereg hetpr_lf hetpr_p hetprob hettest hexdump hilite hist hist_7 histogram hlogit hlu hmeans hotel hotelling hprobit hreg hsearch icd9 icd9_ff icd9p iis impute imtest inbase include inf infi infil infile infix inp inpu input ins insheet insp inspe inspec inspect integ inten intreg intreg_7 intreg_p intrg2_ll intrg_ll intrg_ll2 ipolate iqreg ir irf irf_create irfm iri is_svy is_svysum isid istdize ivprob_1_lf ivprob_lf ivprobit ivprobit_p ivreg ivreg_footnote ivtob_1_lf ivtob_lf ivtobit ivtobit_p jackknife jacknife jknife jknife_6 jknife_8 jkstat joinby kalarma1 kap kap_3 kapmeier kappa kapwgt kdensity kdensity_7 keep ksm ksmirnov ktau kwallis l|0 la lab labbe labbeplot labe label labelbook ladder levels levelsof leverage lfit lfit_p li lincom line linktest lis list lloghet_glf lloghet_glf_sh lloghet_gp lloghet_ilf lloghet_ilf_sh lloghet_ip llogi_sw llogis_p llogist llogistic llogistichet lnorm_lf lnorm_sw lnorma_p lnormal lnormalhet lnormhet_glf lnormhet_glf_sh lnormhet_gp lnormhet_ilf lnormhet_ilf_sh lnormhet_ip lnskew0 loadingplot loc loca local log logi logis_lf logistic logistic_p logit logit_estat logit_p loglogs logrank loneway lookfor lookup lowess lowess_7 lpredict lrecomp lroc lroc_7 lrtest ls lsens lsens_7 lsens_x lstat ltable ltable_7 ltriang lv lvr2plot lvr2plot_7 m|0 ma mac macr macro makecns man manova manova_estat manova_p manovatest mantel mark markin markout marksample mat mat_capp mat_order mat_put_rr mat_rapp mata mata_clear mata_describe mata_drop mata_matdescribe mata_matsave mata_matuse mata_memory mata_mlib mata_mosave mata_rename mata_which matalabel matcproc matlist matname matr matri matrix matrix_input__dlg matstrik mcc mcci md0_ md1_ md1debug_ md2_ md2debug_ mds mds_estat mds_p mdsconfig mdslong mdsmat mdsshepard mdytoe mdytof me_derd mean means median memory memsize menl meqparse mer merg merge meta mfp mfx mhelp mhodds minbound mixed_ll mixed_ll_reparm mkassert mkdir mkmat mkspline ml ml_5 ml_adjs ml_bhhhs ml_c_d ml_check ml_clear ml_cnt ml_debug ml_defd ml_e0 ml_e0_bfgs ml_e0_cycle ml_e0_dfp ml_e0i ml_e1 ml_e1_bfgs ml_e1_bhhh ml_e1_cycle ml_e1_dfp ml_e2 ml_e2_cycle ml_ebfg0 ml_ebfr0 ml_ebfr1 ml_ebh0q ml_ebhh0 ml_ebhr0 ml_ebr0i ml_ecr0i ml_edfp0 ml_edfr0 ml_edfr1 ml_edr0i ml_eds ml_eer0i ml_egr0i ml_elf ml_elf_bfgs ml_elf_bhhh ml_elf_cycle ml_elf_dfp ml_elfi ml_elfs ml_enr0i ml_enrr0 ml_erdu0 ml_erdu0_bfgs ml_erdu0_bhhh ml_erdu0_bhhhq ml_erdu0_cycle ml_erdu0_dfp ml_erdu0_nrbfgs ml_exde ml_footnote ml_geqnr ml_grad0 ml_graph ml_hbhhh ml_hd0 ml_hold ml_init ml_inv ml_log ml_max ml_mlout ml_mlout_8 ml_model ml_nb0 ml_opt ml_p ml_plot ml_query ml_rdgrd ml_repor ml_s_e ml_score ml_searc ml_technique ml_unhold mleval mlf_ mlmatbysum mlmatsum mlog mlogi mlogit mlogit_footnote mlogit_p mlopts mlsum mlvecsum mnl0_ mor more mov move mprobit mprobit_lf mprobit_p mrdu0_ mrdu1_ mvdecode mvencode mvreg mvreg_estat n|0 nbreg nbreg_al nbreg_lf nbreg_p nbreg_sw nestreg net newey newey_7 newey_p news nl nl_7 nl_9 nl_9_p nl_p nl_p_7 nlcom nlcom_p nlexp2 nlexp2_7 nlexp2a nlexp2a_7 nlexp3 nlexp3_7 nlgom3 nlgom3_7 nlgom4 nlgom4_7 nlinit nllog3 nllog3_7 nllog4 nllog4_7 nlog_rd nlogit nlogit_p nlogitgen nlogittree nlpred no nobreak noi nois noisi noisil noisily note notes notes_dlg nptrend numlabel numlist odbc old_ver olo olog ologi ologi_sw ologit ologit_p ologitp on one onew onewa oneway op_colnm op_comp op_diff op_inv op_str opr opro oprob oprob_sw oprobi oprobi_p oprobit oprobitp opts_exclusive order orthog orthpoly ou out outf outfi outfil outfile outs outsh outshe outshee outsheet ovtest pac pac_7 palette parse parse_dissim pause pca pca_8 pca_display pca_estat pca_p pca_rotate pcamat pchart pchart_7 pchi pchi_7 pcorr pctile pentium pergram pergram_7 permute permute_8 personal peto_st pkcollapse pkcross pkequiv pkexamine pkexamine_7 pkshape pksumm pksumm_7 pl plo plot plugin pnorm pnorm_7 poisgof poiss_lf poiss_sw poisso_p poisson poisson_estat post postclose postfile postutil pperron pr prais prais_e prais_e2 prais_p predict predictnl preserve print pro prob probi probit probit_estat probit_p proc_time procoverlay procrustes procrustes_estat procrustes_p profiler prog progr progra program prop proportion prtest prtesti pwcorr pwd q\\s qby qbys qchi qchi_7 qladder qladder_7 qnorm qnorm_7 qqplot qqplot_7 qreg qreg_c qreg_p qreg_sw qu quadchk quantile quantile_7 que quer query range ranksum ratio rchart rchart_7 rcof recast reclink recode reg reg3 reg3_p regdw regr regre regre_p2 regres regres_p regress regress_estat regriv_p remap ren rena renam rename renpfix repeat replace report reshape restore ret retu retur return rm rmdir robvar roccomp roccomp_7 roccomp_8 rocf_lf rocfit rocfit_8 rocgold rocplot rocplot_7 roctab roctab_7 rolling rologit rologit_p rot rota rotat rotate rotatemat rreg rreg_p ru run runtest rvfplot rvfplot_7 rvpplot rvpplot_7 sa safesum sample sampsi sav save savedresults saveold sc sca scal scala scalar scatter scm_mine sco scob_lf scob_p scobi_sw scobit scor score scoreplot scoreplot_help scree screeplot screeplot_help sdtest sdtesti se search separate seperate serrbar serrbar_7 serset set set_defaults sfrancia sh she shel shell shewhart shewhart_7 signestimationsample signrank signtest simul simul_7 simulate simulate_8 sktest sleep slogit slogit_d2 slogit_p smooth snapspan so sor sort spearman spikeplot spikeplot_7 spikeplt spline_x split sqreg sqreg_p sret sretu sretur sreturn ssc st st_ct st_hc st_hcd st_hcd_sh st_is st_issys st_note st_promo st_set st_show st_smpl st_subid stack statsby statsby_8 stbase stci stci_7 stcox stcox_estat stcox_fr stcox_fr_ll stcox_p stcox_sw stcoxkm stcoxkm_7 stcstat stcurv stcurve stcurve_7 stdes stem stepwise stereg stfill stgen stir stjoin stmc stmh stphplot stphplot_7 stphtest stphtest_7 stptime strate strate_7 streg streg_sw streset sts sts_7 stset stsplit stsum sttocc sttoct stvary stweib su suest suest_8 sum summ summa summar summari summariz summarize sunflower sureg survcurv survsum svar svar_p svmat svy svy_disp svy_dreg svy_est svy_est_7 svy_estat svy_get svy_gnbreg_p svy_head svy_header svy_heckman_p svy_heckprob_p svy_intreg_p svy_ivreg_p svy_logistic_p svy_logit_p svy_mlogit_p svy_nbreg_p svy_ologit_p svy_oprobit_p svy_poisson_p svy_probit_p svy_regress_p svy_sub svy_sub_7 svy_x svy_x_7 svy_x_p svydes svydes_8 svygen svygnbreg svyheckman svyheckprob svyintreg svyintreg_7 svyintrg svyivreg svylc svylog_p svylogit svymarkout svymarkout_8 svymean svymlog svymlogit svynbreg svyolog svyologit svyoprob svyoprobit svyopts svypois svypois_7 svypoisson svyprobit svyprobt svyprop svyprop_7 svyratio svyreg svyreg_p svyregress svyset svyset_7 svyset_8 svytab svytab_7 svytest svytotal sw sw_8 swcnreg swcox swereg swilk swlogis swlogit swologit swoprbt swpois swprobit swqreg swtobit swweib symmetry symmi symplot symplot_7 syntax sysdescribe sysdir sysuse szroeter ta tab tab1 tab2 tab_or tabd tabdi tabdis tabdisp tabi table tabodds tabodds_7 tabstat tabu tabul tabula tabulat tabulate te tempfile tempname tempvar tes test testnl testparm teststd tetrachoric time_it timer tis tob tobi tobit tobit_p tobit_sw token tokeni tokeniz tokenize tostring total translate translator transmap treat_ll treatr_p treatreg trim trimfill trnb_cons trnb_mean trpoiss_d2 trunc_ll truncr_p truncreg tsappend tset tsfill tsline tsline_ex tsreport tsrevar tsrline tsset tssmooth tsunab ttest ttesti tut_chk tut_wait tutorial tw tware_st two twoway twoway__fpfit_serset twoway__function_gen twoway__histogram_gen twoway__ipoint_serset twoway__ipoints_serset twoway__kdensity_gen twoway__lfit_serset twoway__normgen_gen twoway__pci_serset twoway__qfit_serset twoway__scatteri_serset twoway__sunflower_gen twoway_ksm_serset ty typ type typeof u|0 unab unabbrev unabcmd update us use uselabel var var_mkcompanion var_p varbasic varfcast vargranger varirf varirf_add varirf_cgraph varirf_create varirf_ctable varirf_describe varirf_dir varirf_drop varirf_erase varirf_graph varirf_ograph varirf_rename varirf_set varirf_table varlist varlmar varnorm varsoc varstable varstable_w varstable_w2 varwle vce vec vec_fevd vec_mkphi vec_p vec_p_w vecirf_create veclmar veclmar_w vecnorm vecnorm_w vecrank vecstable verinst vers versi versio version view viewsource vif vwls wdatetof webdescribe webseek webuse weib1_lf weib2_lf weib_lf weib_lf0 weibhet_glf weibhet_glf_sh weibhet_glfa weibhet_glfa_sh weibhet_gp weibhet_ilf weibhet_ilf_sh weibhet_ilfa weibhet_ilfa_sh weibhet_ip weibu_sw weibul_p weibull weibull_c weibull_s weibullhet wh whelp whi which whil while wilc_st wilcoxon win wind windo window winexec wntestb wntestb_7 wntestq xchart xchart_7 xcorr xcorr_7 xi xi_6 xmlsav xmlsave xmluse xpose xsh xshe xshel xshell xt_iis xt_tis xtab_p xtabond xtbin_p xtclog xtcloglog xtcloglog_8 xtcloglog_d2 xtcloglog_pa_p xtcloglog_re_p xtcnt_p xtcorr xtdata xtdes xtfront_p xtfrontier xtgee xtgee_elink xtgee_estat xtgee_makeivar xtgee_p xtgee_plink xtgls xtgls_p xthaus xthausman xtht_p xthtaylor xtile xtint_p xtintreg xtintreg_8 xtintreg_d2 xtintreg_p xtivp_1 xtivp_2 xtivreg xtline xtline_ex xtlogit xtlogit_8 xtlogit_d2 xtlogit_fe_p xtlogit_pa_p xtlogit_re_p xtmixed xtmixed_estat xtmixed_p xtnb_fe xtnb_lf xtnbreg xtnbreg_pa_p xtnbreg_refe_p xtpcse xtpcse_p xtpois xtpoisson xtpoisson_d2 xtpoisson_pa_p xtpoisson_refe_p xtpred xtprobit xtprobit_8 xtprobit_d2 xtprobit_re_p xtps_fe xtps_lf xtps_ren xtps_ren_8 xtrar_p xtrc xtrc_p xtrchh xtrefe_p xtreg xtreg_be xtreg_fe xtreg_ml xtreg_pa_p xtreg_re xtregar xtrere_p xtset xtsf_ll xtsf_llti xtsum xttab xttest0 xttobit xttobit_8 xttobit_p xttrans yx yxview__barlike_draw yxview_area_draw yxview_bar_draw yxview_dot_draw yxview_dropline_draw yxview_function_draw yxview_iarrow_draw yxview_ilabels_draw yxview_normal_draw yxview_pcarrow_draw yxview_pcbarrow_draw yxview_pccapsym_draw yxview_pcscatter_draw yxview_pcspike_draw yxview_rarea_draw yxview_rbar_draw yxview_rbarm_draw yxview_rcap_draw yxview_rcapsym_draw yxview_rconnected_draw yxview_rline_draw yxview_rscatter_draw yxview_rspike_draw yxview_spike_draw yxview_sunflower_draw zap_s zinb zinb_llf zinb_plf zip zip_llf zip_p zip_plf zt_ct_5 zt_hc_5 zt_hcd_5 zt_is_5 zt_iss_5 zt_sho_5 zt_smp_5 ztbase_5 ztcox_5 ztdes_5 ztereg_5 ztfill_5 ztgen_5 ztir_5 ztjoin_5 ztnb ztnb_p ztp ztp_p zts_5 ztset_5 ztspli_5 ztsum_5 zttoct_5 ztvary_5 ztweib_5",contains:[{className:"symbol",begin:/`[a-zA-Z0-9_]+'/},{className:"variable",begin:/\$\{?[a-zA-Z0-9_]+\}?/},{className:"string",variants:[{begin:'`"[^\r\n]*?"\''},{begin:'"[^\r\n"]*"'}]},{className:"built_in",variants:[{begin:"\\b(abs|acos|asin|atan|atan2|atanh|ceil|cloglog|comb|cos|digamma|exp|floor|invcloglog|invlogit|ln|lnfact|lnfactorial|lngamma|log|log10|max|min|mod|reldif|round|sign|sin|sqrt|sum|tan|tanh|trigamma|trunc|betaden|Binomial|binorm|binormal|chi2|chi2tail|dgammapda|dgammapdada|dgammapdadx|dgammapdx|dgammapdxdx|F|Fden|Ftail|gammaden|gammap|ibeta|invbinomial|invchi2|invchi2tail|invF|invFtail|invgammap|invibeta|invnchi2|invnFtail|invnibeta|invnorm|invnormal|invttail|nbetaden|nchi2|nFden|nFtail|nibeta|norm|normal|normalden|normd|npnchi2|tden|ttail|uniform|abbrev|char|index|indexnot|length|lower|ltrim|match|plural|proper|real|regexm|regexr|regexs|reverse|rtrim|string|strlen|strlower|strltrim|strmatch|strofreal|strpos|strproper|strreverse|strrtrim|strtrim|strupper|subinstr|subinword|substr|trim|upper|word|wordcount|_caller|autocode|byteorder|chop|clip|cond|e|epsdouble|epsfloat|group|inlist|inrange|irecode|matrix|maxbyte|maxdouble|maxfloat|maxint|maxlong|mi|minbyte|mindouble|minfloat|minint|minlong|missing|r|recode|replay|return|s|scalar|d|date|day|dow|doy|halfyear|mdy|month|quarter|week|year|d|daily|dofd|dofh|dofm|dofq|dofw|dofy|h|halfyearly|hofd|m|mofd|monthly|q|qofd|quarterly|tin|twithin|w|weekly|wofd|y|yearly|yh|ym|yofd|yq|yw|cholesky|colnumb|colsof|corr|det|diag|diag0cnt|el|get|hadamard|I|inv|invsym|issym|issymmetric|J|matmissing|matuniform|mreldif|nullmat|rownumb|rowsof|sweep|syminv|trace|vec|vecdiag)(?=\\()"}]},e.COMMENT("^[ \t]*\\*.*$",!1),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/step21.min.js b/vendor/assets/javascripts/highlightjs/languages/step21.min.js
index 052b8297a1..b46e0e0ac9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/step21.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/step21.min.js
@@ -1 +1 @@
-hljs.registerLanguage("step21",function(e){var i="[A-Z_][A-Z0-9_.]*",r={keyword:"HEADER ENDSEC DATA"},t={cN:"meta",b:"ISO-10303-21;",r:10},n={cN:"meta",b:"END-ISO-10303-21;",r:10};return{aliases:["p21","step","stp"],cI:!0,l:i,k:r,c:[t,n,e.CLCM,e.CBCM,e.C("/\\*\\*!","\\*/"),e.CNM,e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null}),{cN:"string",b:"'",e:"'"},{cN:"symbol",v:[{b:"#",e:"\\d+",i:"\\W"}]}]}});
\ No newline at end of file
+hljs.registerLanguage("step21",function(){"use strict";return function(e){return{name:"STEP Part 21",aliases:["p21","step","stp"],case_insensitive:!0,keywords:{$pattern:"[A-Z_][A-Z0-9_.]*",keyword:"HEADER ENDSEC DATA"},contains:[{className:"meta",begin:"ISO-10303-21;",relevance:10},{className:"meta",begin:"END-ISO-10303-21;",relevance:10},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.COMMENT("/\\*\\*!","\\*/"),e.C_NUMBER_MODE,e.inherit(e.APOS_STRING_MODE,{illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),{className:"string",begin:"'",end:"'"},{className:"symbol",variants:[{begin:"#",end:"\\d+",illegal:"\\W"}]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/stylus.min.js b/vendor/assets/javascripts/highlightjs/languages/stylus.min.js
index 4f676a3070..96c0aa18f4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/stylus.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/stylus.min.js
@@ -1 +1 @@
-hljs.registerLanguage("stylus",function(e){var t={cN:"variable",b:"\\$"+e.IR},o={cN:"number",b:"#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})"},i=["charset","css","debug","extend","font-face","for","import","include","media","mixin","page","warn","while"],r=["after","before","first-letter","first-line","active","first-child","focus","hover","lang","link","visited"],n=["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"],a="[\\.\\s\\n\\[\\:,]",l=["align-content","align-items","align-self","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","auto","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","clip-path","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","font","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-variant-ligatures","font-weight","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inherit","initial","justify-content","left","letter-spacing","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marks","mask","max-height","max-width","min-height","min-width","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","perspective","perspective-origin","pointer-events","position","quotes","resize","right","tab-size","table-layout","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-indent","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","white-space","widows","width","word-break","word-spacing","word-wrap","z-index"],d=["\\?","(\\bReturn\\b)","(\\bEnd\\b)","(\\bend\\b)","(\\bdef\\b)",";","#\\s","\\*\\s","===\\s","\\|","%"];return{aliases:["styl"],cI:!1,k:"if else for in",i:"("+d.join("|")+")",c:[e.QSM,e.ASM,e.CLCM,e.CBCM,o,{b:"\\.[a-zA-Z][a-zA-Z0-9_-]*"+a,rB:!0,c:[{cN:"selector-class",b:"\\.[a-zA-Z][a-zA-Z0-9_-]*"}]},{b:"\\#[a-zA-Z][a-zA-Z0-9_-]*"+a,rB:!0,c:[{cN:"selector-id",b:"\\#[a-zA-Z][a-zA-Z0-9_-]*"}]},{b:"\\b("+n.join("|")+")"+a,rB:!0,c:[{cN:"selector-tag",b:"\\b[a-zA-Z][a-zA-Z0-9_-]*"}]},{b:"&?:?:\\b("+r.join("|")+")"+a},{b:"@("+i.join("|")+")\\b"},t,e.CSSNM,e.NM,{cN:"function",b:"^[a-zA-Z][a-zA-Z0-9_-]*\\(.*\\)",i:"[\\n]",rB:!0,c:[{cN:"title",b:"\\b[a-zA-Z][a-zA-Z0-9_-]*"},{cN:"params",b:/\(/,e:/\)/,c:[o,t,e.ASM,e.CSSNM,e.NM,e.QSM]}]},{cN:"attribute",b:"\\b("+l.reverse().join("|")+")\\b",starts:{e:/;|$/,c:[o,t,e.ASM,e.QSM,e.CSSNM,e.NM,e.CBCM],i:/\./,r:0}}]}});
\ No newline at end of file
+hljs.registerLanguage("stylus",function(){"use strict";return function(e){var t={className:"variable",begin:"\\$"+e.IDENT_RE},i={className:"number",begin:"#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})"};return{name:"Stylus",aliases:["styl"],case_insensitive:!1,keywords:"if else for in",illegal:"(\\?|(\\bReturn\\b)|(\\bEnd\\b)|(\\bend\\b)|(\\bdef\\b)|;|#\\s|\\*\\s|===\\s|\\||%)",contains:[e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,i,{begin:"\\.[a-zA-Z][a-zA-Z0-9_-]*(?=[\\.\\s\\n\\[\\:,])",className:"selector-class"},{begin:"\\#[a-zA-Z][a-zA-Z0-9_-]*(?=[\\.\\s\\n\\[\\:,])",className:"selector-id"},{begin:"\\b(a|abbr|address|article|aside|audio|b|blockquote|body|button|canvas|caption|cite|code|dd|del|details|dfn|div|dl|dt|em|fieldset|figcaption|figure|footer|form|h1|h2|h3|h4|h5|h6|header|hgroup|html|i|iframe|img|input|ins|kbd|label|legend|li|mark|menu|nav|object|ol|p|q|quote|samp|section|span|strong|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|tr|ul|var|video)(?=[\\.\\s\\n\\[\\:,])",className:"selector-tag"},{begin:"&?:?:\\b(after|before|first-letter|first-line|active|first-child|focus|hover|lang|link|visited)(?=[\\.\\s\\n\\[\\:,])"},{begin:"@(charset|css|debug|extend|font-face|for|import|include|media|mixin|page|warn|while)\\b"},t,e.CSS_NUMBER_MODE,e.NUMBER_MODE,{className:"function",begin:"^[a-zA-Z][a-zA-Z0-9_-]*\\(.*\\)",illegal:"[\\n]",returnBegin:!0,contains:[{className:"title",begin:"\\b[a-zA-Z][a-zA-Z0-9_-]*"},{className:"params",begin:/\(/,end:/\)/,contains:[i,t,e.APOS_STRING_MODE,e.CSS_NUMBER_MODE,e.NUMBER_MODE,e.QUOTE_STRING_MODE]}]},{className:"attribute",begin:"\\b("+["align-content","align-items","align-self","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","auto","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","clip-path","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","font","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-variant-ligatures","font-weight","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inherit","initial","justify-content","left","letter-spacing","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marks","mask","max-height","max-width","min-height","min-width","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","perspective","perspective-origin","pointer-events","position","quotes","resize","right","tab-size","table-layout","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-indent","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","white-space","widows","width","word-break","word-spacing","word-wrap","z-index"].reverse().join("|")+")\\b",starts:{end:/;|$/,contains:[i,t,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE,e.NUMBER_MODE,e.C_BLOCK_COMMENT_MODE],illegal:/\./,relevance:0}}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/subunit.min.js b/vendor/assets/javascripts/highlightjs/languages/subunit.min.js
index 7f22dcbc88..5796a4fa37 100644
--- a/vendor/assets/javascripts/highlightjs/languages/subunit.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/subunit.min.js
@@ -1 +1 @@
-hljs.registerLanguage("subunit",function(s){var r={cN:"string",b:"\\[\n(multipart)?",e:"\\]\n"},t={cN:"string",b:"\\d{4}-\\d{2}-\\d{2}(\\s+)\\d{2}:\\d{2}:\\d{2}.\\d+Z"},e={cN:"string",b:"(\\+|-)\\d+"},c={cN:"keyword",r:10,v:[{b:"^(test|testing|success|successful|failure|error|skip|xfail|uxsuccess)(:?)\\s+(test)?"},{b:"^progress(:?)(\\s+)?(pop|push)?"},{b:"^tags:"},{b:"^time:"}]};return{cI:!0,c:[r,t,e,c]}});
\ No newline at end of file
+hljs.registerLanguage("subunit",function(){"use strict";return function(s){return{name:"SubUnit",case_insensitive:!0,contains:[{className:"string",begin:"\\[\n(multipart)?",end:"\\]\n"},{className:"string",begin:"\\d{4}-\\d{2}-\\d{2}(\\s+)\\d{2}:\\d{2}:\\d{2}.\\d+Z"},{className:"string",begin:"(\\+|-)\\d+"},{className:"keyword",relevance:10,variants:[{begin:"^(test|testing|success|successful|failure|error|skip|xfail|uxsuccess)(:?)\\s+(test)?"},{begin:"^progress(:?)(\\s+)?(pop|push)?"},{begin:"^tags:"},{begin:"^time:"}]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/swift.min.js b/vendor/assets/javascripts/highlightjs/languages/swift.min.js
index ca853757d1..584096ba69 100644
--- a/vendor/assets/javascripts/highlightjs/languages/swift.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/swift.min.js
@@ -1 +1 @@
-hljs.registerLanguage("swift",function(e){var i={keyword:"#available #colorLiteral #column #else #elseif #endif #file #fileLiteral #function #if #imageLiteral #line #selector #sourceLocation _ __COLUMN__ __FILE__ __FUNCTION__ __LINE__ Any as as! as? associatedtype associativity break case catch class continue convenience default defer deinit didSet do dynamic dynamicType else enum extension fallthrough false fileprivate final for func get guard if import in indirect infix init inout internal is lazy left let mutating nil none nonmutating open operator optional override postfix precedence prefix private protocol Protocol public repeat required rethrows return right self Self set static struct subscript super switch throw throws true try try! try? Type typealias unowned var weak where while willSet",literal:"true false nil",built_in:"abs advance alignof alignofValue anyGenerator assert assertionFailure bridgeFromObjectiveC bridgeFromObjectiveCUnconditional bridgeToObjectiveC bridgeToObjectiveCUnconditional c contains count countElements countLeadingZeros debugPrint debugPrintln distance dropFirst dropLast dump encodeBitsAsWords enumerate equal fatalError filter find getBridgedObjectiveCType getVaList indices insertionSort isBridgedToObjectiveC isBridgedVerbatimToObjectiveC isUniquelyReferenced isUniquelyReferencedNonObjC join lazy lexicographicalCompare map max maxElement min minElement numericCast overlaps partition posix precondition preconditionFailure print println quickSort readLine reduce reflect reinterpretCast reverse roundUpToAlignment sizeof sizeofValue sort split startsWith stride strideof strideofValue swap toString transcode underestimateCount unsafeAddressOf unsafeBitCast unsafeDowncast unsafeUnwrap unsafeReflect withExtendedLifetime withObjectAtPlusZero withUnsafePointer withUnsafePointerToObject withUnsafeMutablePointer withUnsafeMutablePointers withUnsafePointer withUnsafePointers withVaList zip"},t={cN:"type",b:"\\b[A-Z][\\wÀ-ʸ']*",r:0},n=e.C("/\\*","\\*/",{c:["self"]}),r={cN:"subst",b:/\\\(/,e:"\\)",k:i,c:[]},a={cN:"string",c:[e.BE,r],v:[{b:/"""/,e:/"""/},{b:/"/,e:/"/}]},o={cN:"number",b:"\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b",r:0};return r.c=[o],{k:i,c:[a,e.CLCM,n,t,o,{cN:"function",bK:"func",e:"{",eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{b:/</,e:/>/},{cN:"params",b:/\(/,e:/\)/,endsParent:!0,k:i,c:["self",o,a,e.CBCM,{b:":"}],i:/["']/}],i:/\[|%/},{cN:"class",bK:"struct protocol class extension enum",k:i,e:"\\{",eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/})]},{cN:"meta",b:"(@discardableResult|@warn_unused_result|@exported|@lazy|@noescape|@NSCopying|@NSManaged|@objc|@objcMembers|@convention|@required|@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|@infix|@prefix|@postfix|@autoclosure|@testable|@available|@nonobjc|@NSApplicationMain|@UIApplicationMain)"},{bK:"import",e:/$/,c:[e.CLCM,n]}]}});
\ No newline at end of file
+hljs.registerLanguage("swift",function(){"use strict";return function(e){var i={keyword:"#available #colorLiteral #column #else #elseif #endif #file #fileLiteral #function #if #imageLiteral #line #selector #sourceLocation _ __COLUMN__ __FILE__ __FUNCTION__ __LINE__ Any as as! as? associatedtype associativity break case catch class continue convenience default defer deinit didSet do dynamic dynamicType else enum extension fallthrough false fileprivate final for func get guard if import in indirect infix init inout internal is lazy left let mutating nil none nonmutating open operator optional override postfix precedence prefix private protocol Protocol public repeat required rethrows return right self Self set static struct subscript super switch throw throws true try try! try? Type typealias unowned var weak where while willSet",literal:"true false nil",built_in:"abs advance alignof alignofValue anyGenerator assert assertionFailure bridgeFromObjectiveC bridgeFromObjectiveCUnconditional bridgeToObjectiveC bridgeToObjectiveCUnconditional c compactMap contains count countElements countLeadingZeros debugPrint debugPrintln distance dropFirst dropLast dump encodeBitsAsWords enumerate equal fatalError filter find getBridgedObjectiveCType getVaList indices insertionSort isBridgedToObjectiveC isBridgedVerbatimToObjectiveC isUniquelyReferenced isUniquelyReferencedNonObjC join lazy lexicographicalCompare map max maxElement min minElement numericCast overlaps partition posix precondition preconditionFailure print println quickSort readLine reduce reflect reinterpretCast reverse roundUpToAlignment sizeof sizeofValue sort split startsWith stride strideof strideofValue swap toString transcode underestimateCount unsafeAddressOf unsafeBitCast unsafeDowncast unsafeUnwrap unsafeReflect withExtendedLifetime withObjectAtPlusZero withUnsafePointer withUnsafePointerToObject withUnsafeMutablePointer withUnsafeMutablePointers withUnsafePointer withUnsafePointers withVaList zip"},n=e.COMMENT("/\\*","\\*/",{contains:["self"]}),t={className:"subst",begin:/\\\(/,end:"\\)",keywords:i,contains:[]},a={className:"string",contains:[e.BACKSLASH_ESCAPE,t],variants:[{begin:/"""/,end:/"""/},{begin:/"/,end:/"/}]},r={className:"number",begin:"\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b",relevance:0};return t.contains=[r],{name:"Swift",keywords:i,contains:[a,e.C_LINE_COMMENT_MODE,n,{className:"type",begin:"\\b[A-Z][\\wÀ-ʸ']*[!?]"},{className:"type",begin:"\\b[A-Z][\\wÀ-ʸ']*",relevance:0},r,{className:"function",beginKeywords:"func",end:"{",excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][0-9A-Za-z$_]*/}),{begin:/</,end:/>/},{className:"params",begin:/\(/,end:/\)/,endsParent:!0,keywords:i,contains:["self",r,a,e.C_BLOCK_COMMENT_MODE,{begin:":"}],illegal:/["']/}],illegal:/\[|%/},{className:"class",beginKeywords:"struct protocol class extension enum",keywords:i,end:"\\{",excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/})]},{className:"meta",begin:"(@discardableResult|@warn_unused_result|@exported|@lazy|@noescape|@NSCopying|@NSManaged|@objc|@objcMembers|@convention|@required|@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|@infix|@prefix|@postfix|@autoclosure|@testable|@available|@nonobjc|@NSApplicationMain|@UIApplicationMain|@dynamicMemberLookup|@propertyWrapper)\\b"},{beginKeywords:"import",end:/$/,contains:[e.C_LINE_COMMENT_MODE,n]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/taggerscript.min.js b/vendor/assets/javascripts/highlightjs/languages/taggerscript.min.js
index e85841b1dc..238c151995 100644
--- a/vendor/assets/javascripts/highlightjs/languages/taggerscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/taggerscript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("taggerscript",function(e){var c={cN:"comment",b:/\$noop\(/,e:/\)/,c:[{b:/\(/,e:/\)/,c:["self",{b:/\\./}]}],r:10},r={cN:"keyword",b:/\$(?!noop)[a-zA-Z][_a-zA-Z0-9]*/,e:/\(/,eE:!0},a={cN:"variable",b:/%[_a-zA-Z0-9:]*/,e:"%"},b={cN:"symbol",b:/\\./};return{c:[c,r,a,b]}});
\ No newline at end of file
+hljs.registerLanguage("taggerscript",function(){"use strict";return function(e){return{name:"Tagger Script",contains:[{className:"comment",begin:/\$noop\(/,end:/\)/,contains:[{begin:/\(/,end:/\)/,contains:["self",{begin:/\\./}]}],relevance:10},{className:"keyword",begin:/\$(?!noop)[a-zA-Z][_a-zA-Z0-9]*/,end:/\(/,excludeEnd:!0},{className:"variable",begin:/%[_a-zA-Z0-9:]*/,end:"%"},{className:"symbol",begin:/\\./}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/tap.min.js b/vendor/assets/javascripts/highlightjs/languages/tap.min.js
index 51ffc9ab5b..148836811d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/tap.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/tap.min.js
@@ -1 +1 @@
-hljs.registerLanguage("tap",function(b){return{cI:!0,c:[b.HCM,{cN:"meta",v:[{b:"^TAP version (\\d+)$"},{b:"^1\\.\\.(\\d+)$"}]},{b:"(s+)?---$",e:"\\.\\.\\.$",sL:"yaml",r:0},{cN:"number",b:" (\\d+) "},{cN:"symbol",v:[{b:"^ok"},{b:"^not ok"}]}]}});
\ No newline at end of file
+hljs.registerLanguage("tap",function(){"use strict";return function(e){return{name:"Test Anything Protocol",case_insensitive:!0,contains:[e.HASH_COMMENT_MODE,{className:"meta",variants:[{begin:"^TAP version (\\d+)$"},{begin:"^1\\.\\.(\\d+)$"}]},{begin:"(s+)?---$",end:"\\.\\.\\.$",subLanguage:"yaml",relevance:0},{className:"number",begin:" (\\d+) "},{className:"symbol",variants:[{begin:"^ok"},{begin:"^not ok"}]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/tcl.min.js b/vendor/assets/javascripts/highlightjs/languages/tcl.min.js
index 0a74b0789e..f49662b24f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/tcl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/tcl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("tcl",function(e){return{aliases:["tk"],k:"after append apply array auto_execok auto_import auto_load auto_mkindex auto_mkindex_old auto_qualify auto_reset bgerror binary break catch cd chan clock close concat continue dde dict encoding eof error eval exec exit expr fblocked fconfigure fcopy file fileevent filename flush for foreach format gets glob global history http if incr info interp join lappend|10 lassign|10 lindex|10 linsert|10 list llength|10 load lrange|10 lrepeat|10 lreplace|10 lreverse|10 lsearch|10 lset|10 lsort|10 mathfunc mathop memory msgcat namespace open package parray pid pkg::create pkg_mkIndex platform platform::shell proc puts pwd read refchan regexp registry regsub|10 rename return safe scan seek set socket source split string subst switch tcl_endOfWord tcl_findLibrary tcl_startOfNextWord tcl_startOfPreviousWord tcl_wordBreakAfter tcl_wordBreakBefore tcltest tclvars tell time tm trace unknown unload unset update uplevel upvar variable vwait while",c:[e.C(";[ \\t]*#","$"),e.C("^[ \\t]*#","$"),{bK:"proc",e:"[\\{]",eE:!0,c:[{cN:"title",b:"[ \\t\\n\\r]+(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*",e:"[ \\t\\n\\r]",eW:!0,eE:!0}]},{eE:!0,v:[{b:"\\$(\\{)?(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*\\(([a-zA-Z0-9_])*\\)",e:"[^a-zA-Z0-9_\\}\\$]"},{b:"\\$(\\{)?(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*",e:"(\\))?[^a-zA-Z0-9_\\}\\$]"}]},{cN:"string",c:[e.BE],v:[e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null})]},{cN:"number",v:[e.BNM,e.CNM]}]}});
\ No newline at end of file
+hljs.registerLanguage("tcl",function(){"use strict";return function(e){return{name:"Tcl",aliases:["tk"],keywords:"after append apply array auto_execok auto_import auto_load auto_mkindex auto_mkindex_old auto_qualify auto_reset bgerror binary break catch cd chan clock close concat continue dde dict encoding eof error eval exec exit expr fblocked fconfigure fcopy file fileevent filename flush for foreach format gets glob global history http if incr info interp join lappend|10 lassign|10 lindex|10 linsert|10 list llength|10 load lrange|10 lrepeat|10 lreplace|10 lreverse|10 lsearch|10 lset|10 lsort|10 mathfunc mathop memory msgcat namespace open package parray pid pkg::create pkg_mkIndex platform platform::shell proc puts pwd read refchan regexp registry regsub|10 rename return safe scan seek set socket source split string subst switch tcl_endOfWord tcl_findLibrary tcl_startOfNextWord tcl_startOfPreviousWord tcl_wordBreakAfter tcl_wordBreakBefore tcltest tclvars tell time tm trace unknown unload unset update uplevel upvar variable vwait while",contains:[e.COMMENT(";[ \\t]*#","$"),e.COMMENT("^[ \\t]*#","$"),{beginKeywords:"proc",end:"[\\{]",excludeEnd:!0,contains:[{className:"title",begin:"[ \\t\\n\\r]+(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*",end:"[ \\t\\n\\r]",endsWithParent:!0,excludeEnd:!0}]},{excludeEnd:!0,variants:[{begin:"\\$(\\{)?(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*\\(([a-zA-Z0-9_])*\\)",end:"[^a-zA-Z0-9_\\}\\$]"},{begin:"\\$(\\{)?(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*",end:"(\\))?[^a-zA-Z0-9_\\}\\$]"}]},{className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[e.inherit(e.QUOTE_STRING_MODE,{illegal:null})]},{className:"number",variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/thrift.min.js b/vendor/assets/javascripts/highlightjs/languages/thrift.min.js
index 4c97db0fe5..7b89a56e9b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/thrift.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/thrift.min.js
@@ -1 +1 @@
-hljs.registerLanguage("thrift",function(e){var t="bool byte i16 i32 i64 double string binary";return{k:{keyword:"namespace const typedef struct enum service exception void oneway set list map required optional",built_in:t,literal:"true false"},c:[e.QSM,e.NM,e.CLCM,e.CBCM,{cN:"class",bK:"struct enum service exception",e:/\{/,i:/\n/,c:[e.inherit(e.TM,{starts:{eW:!0,eE:!0}})]},{b:"\\b(set|list|map)\\s*<",e:">",k:t,c:["self"]}]}});
\ No newline at end of file
+hljs.registerLanguage("thrift",function(){"use strict";return function(e){return{name:"Thrift",keywords:{keyword:"namespace const typedef struct enum service exception void oneway set list map required optional",built_in:"bool byte i16 i32 i64 double string binary",literal:"true false"},contains:[e.QUOTE_STRING_MODE,e.NUMBER_MODE,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"class",beginKeywords:"struct enum service exception",end:/\{/,illegal:/\n/,contains:[e.inherit(e.TITLE_MODE,{starts:{endsWithParent:!0,excludeEnd:!0}})]},{begin:"\\b(set|list|map)\\s*<",end:">",keywords:"bool byte i16 i32 i64 double string binary",contains:["self"]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/tp.min.js b/vendor/assets/javascripts/highlightjs/languages/tp.min.js
index 855b7be69d..9da6d9f3ff 100644
--- a/vendor/assets/javascripts/highlightjs/languages/tp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/tp.min.js
@@ -1 +1 @@
-hljs.registerLanguage("tp",function(O){var R={cN:"number",b:"[1-9][0-9]*",r:0},E={cN:"symbol",b:":[^\\]]+"},T={cN:"built_in",b:"(AR|P|PAYLOAD|PR|R|SR|RSR|LBL|VR|UALM|MESSAGE|UTOOL|UFRAME|TIMER|TIMER_OVERFLOW|JOINT_MAX_SPEED|RESUME_PROG|DIAG_REC)\\[",e:"\\]",c:["self",R,E]},N={cN:"built_in",b:"(AI|AO|DI|DO|F|RI|RO|UI|UO|GI|GO|SI|SO)\\[",e:"\\]",c:["self",R,O.QSM,E]};return{k:{keyword:"ABORT ACC ADJUST AND AP_LD BREAK CALL CNT COL CONDITION CONFIG DA DB DIV DETECT ELSE END ENDFOR ERR_NUM ERROR_PROG FINE FOR GP GUARD INC IF JMP LINEAR_MAX_SPEED LOCK MOD MONITOR OFFSET Offset OR OVERRIDE PAUSE PREG PTH RT_LD RUN SELECT SKIP Skip TA TB TO TOOL_OFFSET Tool_Offset UF UT UFRAME_NUM UTOOL_NUM UNLOCK WAIT X Y Z W P R STRLEN SUBSTR FINDSTR VOFFSET PROG ATTR MN POS",literal:"ON OFF max_speed LPOS JPOS ENABLE DISABLE START STOP RESET"},c:[T,N,{cN:"keyword",b:"/(PROG|ATTR|MN|POS|END)\\b"},{cN:"keyword",b:"(CALL|RUN|POINT_LOGIC|LBL)\\b"},{cN:"keyword",b:"\\b(ACC|CNT|Skip|Offset|PSPD|RT_LD|AP_LD|Tool_Offset)"},{cN:"number",b:"\\d+(sec|msec|mm/sec|cm/min|inch/min|deg/sec|mm|in|cm)?\\b",r:0},O.C("//","[;$]"),O.C("!","[;$]"),O.C("--eg:","$"),O.QSM,{cN:"string",b:"'",e:"'"},O.CNM,{cN:"variable",b:"\\$[A-Za-z0-9_]+"}]}});
\ No newline at end of file
+hljs.registerLanguage("tp",function(){"use strict";return function(O){var e={className:"number",begin:"[1-9][0-9]*",relevance:0},R={className:"symbol",begin:":[^\\]]+"};return{name:"TP",keywords:{keyword:"ABORT ACC ADJUST AND AP_LD BREAK CALL CNT COL CONDITION CONFIG DA DB DIV DETECT ELSE END ENDFOR ERR_NUM ERROR_PROG FINE FOR GP GUARD INC IF JMP LINEAR_MAX_SPEED LOCK MOD MONITOR OFFSET Offset OR OVERRIDE PAUSE PREG PTH RT_LD RUN SELECT SKIP Skip TA TB TO TOOL_OFFSET Tool_Offset UF UT UFRAME_NUM UTOOL_NUM UNLOCK WAIT X Y Z W P R STRLEN SUBSTR FINDSTR VOFFSET PROG ATTR MN POS",literal:"ON OFF max_speed LPOS JPOS ENABLE DISABLE START STOP RESET"},contains:[{className:"built_in",begin:"(AR|P|PAYLOAD|PR|R|SR|RSR|LBL|VR|UALM|MESSAGE|UTOOL|UFRAME|TIMER|TIMER_OVERFLOW|JOINT_MAX_SPEED|RESUME_PROG|DIAG_REC)\\[",end:"\\]",contains:["self",e,R]},{className:"built_in",begin:"(AI|AO|DI|DO|F|RI|RO|UI|UO|GI|GO|SI|SO)\\[",end:"\\]",contains:["self",e,O.QUOTE_STRING_MODE,R]},{className:"keyword",begin:"/(PROG|ATTR|MN|POS|END)\\b"},{className:"keyword",begin:"(CALL|RUN|POINT_LOGIC|LBL)\\b"},{className:"keyword",begin:"\\b(ACC|CNT|Skip|Offset|PSPD|RT_LD|AP_LD|Tool_Offset)"},{className:"number",begin:"\\d+(sec|msec|mm/sec|cm/min|inch/min|deg/sec|mm|in|cm)?\\b",relevance:0},O.COMMENT("//","[;$]"),O.COMMENT("!","[;$]"),O.COMMENT("--eg:","$"),O.QUOTE_STRING_MODE,{className:"string",begin:"'",end:"'"},O.C_NUMBER_MODE,{className:"variable",begin:"\\$[A-Za-z0-9_]+"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/twig.min.js b/vendor/assets/javascripts/highlightjs/languages/twig.min.js
index 7b117ba239..5dd66f42c8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/twig.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/twig.min.js
@@ -1 +1 @@
-hljs.registerLanguage("twig",function(e){var t={cN:"params",b:"\\(",e:"\\)"},a="attribute block constant cycle date dump include max min parent random range source template_from_string",r={bK:a,k:{name:a},r:0,c:[t]},c={b:/\|[A-Za-z_]+:?/,k:"abs batch capitalize convert_encoding date date_modify default escape first format join json_encode keys last length lower merge nl2br number_format raw replace reverse round slice sort split striptags title trim upper url_encode",c:[r]},s="autoescape block do embed extends filter flush for if import include macro sandbox set spaceless use verbatim";return s=s+" "+s.split(" ").map(function(e){return"end"+e}).join(" "),{aliases:["craftcms"],cI:!0,sL:"xml",c:[e.C(/\{#/,/#}/),{cN:"template-tag",b:/\{%/,e:/%}/,c:[{cN:"name",b:/\w+/,k:s,starts:{eW:!0,c:[c,r],r:0}}]},{cN:"template-variable",b:/\{\{/,e:/}}/,c:["self",c,r]}]}});
\ No newline at end of file
+hljs.registerLanguage("twig",function(){"use strict";return function(e){var a="attribute block constant cycle date dump include max min parent random range source template_from_string",n={beginKeywords:a,keywords:{name:a},relevance:0,contains:[{className:"params",begin:"\\(",end:"\\)"}]},t={begin:/\|[A-Za-z_]+:?/,keywords:"abs batch capitalize column convert_encoding date date_modify default escape filter first format inky_to_html inline_css join json_encode keys last length lower map markdown merge nl2br number_format raw reduce replace reverse round slice sort spaceless split striptags title trim upper url_encode",contains:[n]},s="apply autoescape block deprecated do embed extends filter flush for from if import include macro sandbox set use verbatim with";return s=s+" "+s.split(" ").map((function(e){return"end"+e})).join(" "),{name:"Twig",aliases:["craftcms"],case_insensitive:!0,subLanguage:"xml",contains:[e.COMMENT(/\{#/,/#}/),{className:"template-tag",begin:/\{%/,end:/%}/,contains:[{className:"name",begin:/\w+/,keywords:s,starts:{endsWithParent:!0,contains:[t,n],relevance:0}}]},{className:"template-variable",begin:/\{\{/,end:/}}/,contains:["self",t,n]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/typescript.min.js b/vendor/assets/javascripts/highlightjs/languages/typescript.min.js
index e9b968dbd4..636139370c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/typescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/typescript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("typescript",function(e){var r="[A-Za-z$_][0-9A-Za-z$_]*",t={keyword:"in if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const class public private protected get set super static implements enum export import declare type namespace abstract as from extends async await",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document any number boolean string void Promise"},n={cN:"meta",b:"@"+r},a={b:"\\(",e:/\)/,k:t,c:["self",e.QSM,e.ASM,e.NM]},o={cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:t,c:[e.CLCM,e.CBCM,n,a]};return{aliases:["ts"],k:t,c:[{cN:"meta",b:/^\s*['"]use strict['"]/},e.ASM,e.QSM,{cN:"string",b:"`",e:"`",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"}]},e.CLCM,e.CBCM,{cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],r:0},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{cN:"function",b:"(\\(.*?\\)|"+e.IR+")\\s*=>",rB:!0,e:"\\s*=>",c:[{cN:"params",v:[{b:e.IR},{b:/\(\s*\)/},{b:/\(/,e:/\)/,eB:!0,eE:!0,k:t,c:["self",e.CLCM,e.CBCM]}]}]}],r:0},{cN:"function",b:"function",e:/[\{;]/,eE:!0,k:t,c:["self",e.inherit(e.TM,{b:r}),o],i:/%/,r:0},{bK:"constructor",e:/\{/,eE:!0,c:["self",o]},{b:/module\./,k:{built_in:"module"},r:0},{bK:"module",e:/\{/,eE:!0},{bK:"interface",e:/\{/,eE:!0,k:"interface extends"},{b:/\$[(.]/},{b:"\\."+e.IR,r:0},n,a]}});
\ No newline at end of file
+hljs.registerLanguage("typescript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);return function(r){var t={$pattern:"[A-Za-z$_][0-9A-Za-z$_]*",keyword:e.concat(["type","namespace","typedef","interface","public","private","protected","implements","declare","abstract","readonly"]).join(" "),literal:n.join(" "),built_in:a.concat(["any","void","number","boolean","string","object","never","enum"]).join(" ")},s={className:"meta",begin:"@[A-Za-z$_][0-9A-Za-z$_]*"},i={className:"number",variants:[{begin:"\\b(0[bB][01]+)n?"},{begin:"\\b(0[oO][0-7]+)n?"},{begin:r.C_NUMBER_RE+"n?"}],relevance:0},o={className:"subst",begin:"\\$\\{",end:"\\}",keywords:t,contains:[]},c={begin:"html`",end:"",starts:{end:"`",returnEnd:!1,contains:[r.BACKSLASH_ESCAPE,o],subLanguage:"xml"}},l={begin:"css`",end:"",starts:{end:"`",returnEnd:!1,contains:[r.BACKSLASH_ESCAPE,o],subLanguage:"css"}},E={className:"string",begin:"`",end:"`",contains:[r.BACKSLASH_ESCAPE,o]};o.contains=[r.APOS_STRING_MODE,r.QUOTE_STRING_MODE,c,l,E,i,r.REGEXP_MODE];var d={begin:"\\(",end:/\)/,keywords:t,contains:["self",r.QUOTE_STRING_MODE,r.APOS_STRING_MODE,r.NUMBER_MODE]},u={className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:t,contains:[r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,s,d]};return{name:"TypeScript",aliases:["ts"],keywords:t,contains:[r.SHEBANG(),{className:"meta",begin:/^\s*['"]use strict['"]/},r.APOS_STRING_MODE,r.QUOTE_STRING_MODE,c,l,E,r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,i,{begin:"("+r.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",keywords:"return throw case",contains:[r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,r.REGEXP_MODE,{className:"function",begin:"(\\([^(]*(\\([^(]*(\\([^(]*\\))?\\))?\\)|"+r.UNDERSCORE_IDENT_RE+")\\s*=>",returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{begin:r.UNDERSCORE_IDENT_RE},{className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:t,contains:d.contains}]}]}],relevance:0},{className:"function",beginKeywords:"function",end:/[\{;]/,excludeEnd:!0,keywords:t,contains:["self",r.inherit(r.TITLE_MODE,{begin:"[A-Za-z$_][0-9A-Za-z$_]*"}),u],illegal:/%/,relevance:0},{beginKeywords:"constructor",end:/[\{;]/,excludeEnd:!0,contains:["self",u]},{begin:/module\./,keywords:{built_in:"module"},relevance:0},{beginKeywords:"module",end:/\{/,excludeEnd:!0},{beginKeywords:"interface",end:/\{/,excludeEnd:!0,keywords:"interface extends"},{begin:/\$[(.]/},{begin:"\\."+r.IDENT_RE,relevance:0},s,d]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/vala.min.js b/vendor/assets/javascripts/highlightjs/languages/vala.min.js
index 3502d78666..51a45d67d3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vala.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vala.min.js
@@ -1 +1 @@
-hljs.registerLanguage("vala",function(t){return{k:{keyword:"char uchar unichar int uint long ulong short ushort int8 int16 int32 int64 uint8 uint16 uint32 uint64 float double bool struct enum string void weak unowned owned async signal static abstract interface override virtual delegate if while do for foreach else switch case break default return try catch public private protected internal using new this get set const stdout stdin stderr var",built_in:"DBus GLib CCode Gee Object Gtk Posix",literal:"false true null"},c:[{cN:"class",bK:"class interface namespace",e:"{",eE:!0,i:"[^,:\\n\\s\\.]",c:[t.UTM]},t.CLCM,t.CBCM,{cN:"string",b:'"""',e:'"""',r:5},t.ASM,t.QSM,t.CNM,{cN:"meta",b:"^#",e:"$",r:2}]}});
\ No newline at end of file
+hljs.registerLanguage("vala",function(){"use strict";return function(e){return{name:"Vala",keywords:{keyword:"char uchar unichar int uint long ulong short ushort int8 int16 int32 int64 uint8 uint16 uint32 uint64 float double bool struct enum string void weak unowned owned async signal static abstract interface override virtual delegate if while do for foreach else switch case break default return try catch public private protected internal using new this get set const stdout stdin stderr var",built_in:"DBus GLib CCode Gee Object Gtk Posix",literal:"false true null"},contains:[{className:"class",beginKeywords:"class interface namespace",end:"{",excludeEnd:!0,illegal:"[^,:\\n\\s\\.]",contains:[e.UNDERSCORE_TITLE_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"string",begin:'"""',end:'"""',relevance:5},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,{className:"meta",begin:"^#",end:"$",relevance:2}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/vbnet.min.js b/vendor/assets/javascripts/highlightjs/languages/vbnet.min.js
index fb54a7a5cf..93630f628b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vbnet.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vbnet.min.js
@@ -1 +1 @@
-hljs.registerLanguage("vbnet",function(e){return{aliases:["vb"],cI:!0,k:{keyword:"addhandler addressof alias and andalso aggregate ansi as assembly auto binary by byref byval call case catch class compare const continue custom declare default delegate dim distinct do each equals else elseif end enum erase error event exit explicit finally for friend from function get global goto group handles if implements imports in inherits interface into is isfalse isnot istrue join key let lib like loop me mid mod module mustinherit mustoverride mybase myclass namespace narrowing new next not notinheritable notoverridable of off on operator option optional or order orelse overloads overridable overrides paramarray partial preserve private property protected public raiseevent readonly redim rem removehandler resume return select set shadows shared skip static step stop structure strict sub synclock take text then throw to try unicode until using when where while widening with withevents writeonly xor",built_in:"boolean byte cbool cbyte cchar cdate cdec cdbl char cint clng cobj csbyte cshort csng cstr ctype date decimal directcast double gettype getxmlnamespace iif integer long object sbyte short single string trycast typeof uinteger ulong ushort",literal:"true false nothing"},i:"//|{|}|endif|gosub|variant|wend|^\\$ ",c:[e.inherit(e.QSM,{c:[{b:'""'}]}),e.C("'","$",{rB:!0,c:[{cN:"doctag",b:"'''|<!--|-->",c:[e.PWM]},{cN:"doctag",b:"</?",e:">",c:[e.PWM]}]}),e.CNM,{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elseif end region externalsource"}}]}});
\ No newline at end of file
+hljs.registerLanguage("vbnet",function(){"use strict";return function(e){return{name:"Visual Basic .NET",aliases:["vb"],case_insensitive:!0,keywords:{keyword:"addhandler addressof alias and andalso aggregate ansi as async assembly auto await binary by byref byval call case catch class compare const continue custom declare default delegate dim distinct do each equals else elseif end enum erase error event exit explicit finally for friend from function get global goto group handles if implements imports in inherits interface into is isfalse isnot istrue iterator join key let lib like loop me mid mod module mustinherit mustoverride mybase myclass nameof namespace narrowing new next not notinheritable notoverridable of off on operator option optional or order orelse overloads overridable overrides paramarray partial preserve private property protected public raiseevent readonly redim rem removehandler resume return select set shadows shared skip static step stop structure strict sub synclock take text then throw to try unicode until using when where while widening with withevents writeonly xor yield",built_in:"boolean byte cbool cbyte cchar cdate cdec cdbl char cint clng cobj csbyte cshort csng cstr ctype date decimal directcast double gettype getxmlnamespace iif integer long object sbyte short single string trycast typeof uinteger ulong ushort",literal:"true false nothing"},illegal:"//|{|}|endif|gosub|variant|wend|^\\$ ",contains:[e.inherit(e.QUOTE_STRING_MODE,{contains:[{begin:'""'}]}),e.COMMENT("'","$",{returnBegin:!0,contains:[{className:"doctag",begin:"'''|\x3c!--|--\x3e",contains:[e.PHRASAL_WORDS_MODE]},{className:"doctag",begin:"</?",end:">",contains:[e.PHRASAL_WORDS_MODE]}]}),e.C_NUMBER_MODE,{className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"if else elseif end region externalsource"}}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/vbscript-html.min.js b/vendor/assets/javascripts/highlightjs/languages/vbscript-html.min.js
index eb52b324e6..b2375eb3ff 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vbscript-html.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vbscript-html.min.js
@@ -1 +1 @@
-hljs.registerLanguage("vbscript-html",function(r){return{sL:"xml",c:[{b:"<%",e:"%>",sL:"vbscript"}]}});
\ No newline at end of file
+hljs.registerLanguage("vbscript-html",function(){"use strict";return function(n){return{name:"VBScript in HTML",subLanguage:"xml",contains:[{begin:"<%",end:"%>",subLanguage:"vbscript"}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/vbscript.min.js b/vendor/assets/javascripts/highlightjs/languages/vbscript.min.js
index 71a645ba42..0825dfce62 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vbscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vbscript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("vbscript",function(e){return{aliases:["vbs"],cI:!0,k:{keyword:"call class const dim do loop erase execute executeglobal exit for each next function if then else on error option explicit new private property let get public randomize redim rem select case set stop sub while wend with end to elseif is or xor and not class_initialize class_terminate default preserve in me byval byref step resume goto",built_in:"lcase month vartype instrrev ubound setlocale getobject rgb getref string weekdayname rnd dateadd monthname now day minute isarray cbool round formatcurrency conversions csng timevalue second year space abs clng timeserial fixs len asc isempty maths dateserial atn timer isobject filter weekday datevalue ccur isdate instr datediff formatdatetime replace isnull right sgn array snumeric log cdbl hex chr lbound msgbox ucase getlocale cos cdate cbyte rtrim join hour oct typename trim strcomp int createobject loadpicture tan formatnumber mid scriptenginebuildversion scriptengine split scriptengineminorversion cint sin datepart ltrim sqr scriptenginemajorversion time derived eval date formatpercent exp inputbox left ascw chrw regexp server response request cstr err",literal:"true false null nothing empty"},i:"//",c:[e.inherit(e.QSM,{c:[{b:'""'}]}),e.C(/'/,/$/,{r:0}),e.CNM]}});
\ No newline at end of file
+hljs.registerLanguage("vbscript",function(){"use strict";return function(e){return{name:"VBScript",aliases:["vbs"],case_insensitive:!0,keywords:{keyword:"call class const dim do loop erase execute executeglobal exit for each next function if then else on error option explicit new private property let get public randomize redim rem select case set stop sub while wend with end to elseif is or xor and not class_initialize class_terminate default preserve in me byval byref step resume goto",built_in:"lcase month vartype instrrev ubound setlocale getobject rgb getref string weekdayname rnd dateadd monthname now day minute isarray cbool round formatcurrency conversions csng timevalue second year space abs clng timeserial fixs len asc isempty maths dateserial atn timer isobject filter weekday datevalue ccur isdate instr datediff formatdatetime replace isnull right sgn array snumeric log cdbl hex chr lbound msgbox ucase getlocale cos cdate cbyte rtrim join hour oct typename trim strcomp int createobject loadpicture tan formatnumber mid scriptenginebuildversion scriptengine split scriptengineminorversion cint sin datepart ltrim sqr scriptenginemajorversion time derived eval date formatpercent exp inputbox left ascw chrw regexp server response request cstr err",literal:"true false null nothing empty"},illegal:"//",contains:[e.inherit(e.QUOTE_STRING_MODE,{contains:[{begin:'""'}]}),e.COMMENT(/'/,/$/,{relevance:0}),e.C_NUMBER_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/verilog.min.js b/vendor/assets/javascripts/highlightjs/languages/verilog.min.js
index 538e658f93..7ffd5be95a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/verilog.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/verilog.min.js
@@ -1 +1 @@
-hljs.registerLanguage("verilog",function(e){var n={keyword:"accept_on alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind bins binsof bit break buf|0 bufif0 bufif1 byte case casex casez cell chandle checker class clocking cmos config const constraint context continue cover covergroup coverpoint cross deassign default defparam design disable dist do edge else end endcase endchecker endclass endclocking endconfig endfunction endgenerate endgroup endinterface endmodule endpackage endprimitive endprogram endproperty endspecify endsequence endtable endtask enum event eventually expect export extends extern final first_match for force foreach forever fork forkjoin function generate|5 genvar global highz0 highz1 if iff ifnone ignore_bins illegal_bins implements implies import incdir include initial inout input inside instance int integer interconnect interface intersect join join_any join_none large let liblist library local localparam logic longint macromodule matches medium modport module nand negedge nettype new nexttime nmos nor noshowcancelled not notif0 notif1 or output package packed parameter pmos posedge primitive priority program property protected pull0 pull1 pulldown pullup pulsestyle_ondetect pulsestyle_onevent pure rand randc randcase randsequence rcmos real realtime ref reg reject_on release repeat restrict return rnmos rpmos rtran rtranif0 rtranif1 s_always s_eventually s_nexttime s_until s_until_with scalared sequence shortint shortreal showcancelled signed small soft solve specify specparam static string strong strong0 strong1 struct super supply0 supply1 sync_accept_on sync_reject_on table tagged task this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 triand trior trireg type typedef union unique unique0 unsigned until until_with untyped use uwire var vectored virtual void wait wait_order wand weak weak0 weak1 while wildcard wire with within wor xnor xor",literal:"null",built_in:"$finish $stop $exit $fatal $error $warning $info $realtime $time $printtimescale $bitstoreal $bitstoshortreal $itor $signed $cast $bits $stime $timeformat $realtobits $shortrealtobits $rtoi $unsigned $asserton $assertkill $assertpasson $assertfailon $assertnonvacuouson $assertoff $assertcontrol $assertpassoff $assertfailoff $assertvacuousoff $isunbounded $sampled $fell $changed $past_gclk $fell_gclk $changed_gclk $rising_gclk $steady_gclk $coverage_control $coverage_get $coverage_save $set_coverage_db_name $rose $stable $past $rose_gclk $stable_gclk $future_gclk $falling_gclk $changing_gclk $display $coverage_get_max $coverage_merge $get_coverage $load_coverage_db $typename $unpacked_dimensions $left $low $increment $clog2 $ln $log10 $exp $sqrt $pow $floor $ceil $sin $cos $tan $countbits $onehot $isunknown $fatal $warning $dimensions $right $high $size $asin $acos $atan $atan2 $hypot $sinh $cosh $tanh $asinh $acosh $atanh $countones $onehot0 $error $info $random $dist_chi_square $dist_erlang $dist_exponential $dist_normal $dist_poisson $dist_t $dist_uniform $q_initialize $q_remove $q_exam $async$and$array $async$nand$array $async$or$array $async$nor$array $sync$and$array $sync$nand$array $sync$or$array $sync$nor$array $q_add $q_full $psprintf $async$and$plane $async$nand$plane $async$or$plane $async$nor$plane $sync$and$plane $sync$nand$plane $sync$or$plane $sync$nor$plane $system $display $displayb $displayh $displayo $strobe $strobeb $strobeh $strobeo $write $readmemb $readmemh $writememh $value$plusargs $dumpvars $dumpon $dumplimit $dumpports $dumpportson $dumpportslimit $writeb $writeh $writeo $monitor $monitorb $monitorh $monitoro $writememb $dumpfile $dumpoff $dumpall $dumpflush $dumpportsoff $dumpportsall $dumpportsflush $fclose $fdisplay $fdisplayb $fdisplayh $fdisplayo $fstrobe $fstrobeb $fstrobeh $fstrobeo $swrite $swriteb $swriteh $swriteo $fscanf $fread $fseek $fflush $feof $fopen $fwrite $fwriteb $fwriteh $fwriteo $fmonitor $fmonitorb $fmonitorh $fmonitoro $sformat $sformatf $fgetc $ungetc $fgets $sscanf $rewind $ftell $ferror"};return{aliases:["v","sv","svh"],cI:!1,k:n,l:/[\w\$]+/,c:[e.CBCM,e.CLCM,e.QSM,{cN:"number",c:[e.BE],v:[{b:"\\b((\\d+'(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+)"},{b:"\\B(('(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+)"},{b:"\\b([0-9_])+",r:0}]},{cN:"variable",v:[{b:"#\\((?!parameter).+\\)"},{b:"\\.\\w+",r:0}]},{cN:"meta",b:"`",e:"$",k:{"meta-keyword":"define __FILE__ __LINE__ begin_keywords celldefine default_nettype define else elsif end_keywords endcelldefine endif ifdef ifndef include line nounconnected_drive pragma resetall timescale unconnected_drive undef undefineall"},r:0}]}});
\ No newline at end of file
+hljs.registerLanguage("verilog",function(){"use strict";return function(e){return{name:"Verilog",aliases:["v","sv","svh"],case_insensitive:!1,keywords:{$pattern:/[\w\$]+/,keyword:"accept_on alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind bins binsof bit break buf|0 bufif0 bufif1 byte case casex casez cell chandle checker class clocking cmos config const constraint context continue cover covergroup coverpoint cross deassign default defparam design disable dist do edge else end endcase endchecker endclass endclocking endconfig endfunction endgenerate endgroup endinterface endmodule endpackage endprimitive endprogram endproperty endspecify endsequence endtable endtask enum event eventually expect export extends extern final first_match for force foreach forever fork forkjoin function generate|5 genvar global highz0 highz1 if iff ifnone ignore_bins illegal_bins implements implies import incdir include initial inout input inside instance int integer interconnect interface intersect join join_any join_none large let liblist library local localparam logic longint macromodule matches medium modport module nand negedge nettype new nexttime nmos nor noshowcancelled not notif0 notif1 or output package packed parameter pmos posedge primitive priority program property protected pull0 pull1 pulldown pullup pulsestyle_ondetect pulsestyle_onevent pure rand randc randcase randsequence rcmos real realtime ref reg reject_on release repeat restrict return rnmos rpmos rtran rtranif0 rtranif1 s_always s_eventually s_nexttime s_until s_until_with scalared sequence shortint shortreal showcancelled signed small soft solve specify specparam static string strong strong0 strong1 struct super supply0 supply1 sync_accept_on sync_reject_on table tagged task this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 triand trior trireg type typedef union unique unique0 unsigned until until_with untyped use uwire var vectored virtual void wait wait_order wand weak weak0 weak1 while wildcard wire with within wor xnor xor",literal:"null",built_in:"$finish $stop $exit $fatal $error $warning $info $realtime $time $printtimescale $bitstoreal $bitstoshortreal $itor $signed $cast $bits $stime $timeformat $realtobits $shortrealtobits $rtoi $unsigned $asserton $assertkill $assertpasson $assertfailon $assertnonvacuouson $assertoff $assertcontrol $assertpassoff $assertfailoff $assertvacuousoff $isunbounded $sampled $fell $changed $past_gclk $fell_gclk $changed_gclk $rising_gclk $steady_gclk $coverage_control $coverage_get $coverage_save $set_coverage_db_name $rose $stable $past $rose_gclk $stable_gclk $future_gclk $falling_gclk $changing_gclk $display $coverage_get_max $coverage_merge $get_coverage $load_coverage_db $typename $unpacked_dimensions $left $low $increment $clog2 $ln $log10 $exp $sqrt $pow $floor $ceil $sin $cos $tan $countbits $onehot $isunknown $fatal $warning $dimensions $right $high $size $asin $acos $atan $atan2 $hypot $sinh $cosh $tanh $asinh $acosh $atanh $countones $onehot0 $error $info $random $dist_chi_square $dist_erlang $dist_exponential $dist_normal $dist_poisson $dist_t $dist_uniform $q_initialize $q_remove $q_exam $async$and$array $async$nand$array $async$or$array $async$nor$array $sync$and$array $sync$nand$array $sync$or$array $sync$nor$array $q_add $q_full $psprintf $async$and$plane $async$nand$plane $async$or$plane $async$nor$plane $sync$and$plane $sync$nand$plane $sync$or$plane $sync$nor$plane $system $display $displayb $displayh $displayo $strobe $strobeb $strobeh $strobeo $write $readmemb $readmemh $writememh $value$plusargs $dumpvars $dumpon $dumplimit $dumpports $dumpportson $dumpportslimit $writeb $writeh $writeo $monitor $monitorb $monitorh $monitoro $writememb $dumpfile $dumpoff $dumpall $dumpflush $dumpportsoff $dumpportsall $dumpportsflush $fclose $fdisplay $fdisplayb $fdisplayh $fdisplayo $fstrobe $fstrobeb $fstrobeh $fstrobeo $swrite $swriteb $swriteh $swriteo $fscanf $fread $fseek $fflush $feof $fopen $fwrite $fwriteb $fwriteh $fwriteo $fmonitor $fmonitorb $fmonitorh $fmonitoro $sformat $sformatf $fgetc $ungetc $fgets $sscanf $rewind $ftell $ferror"},contains:[e.C_BLOCK_COMMENT_MODE,e.C_LINE_COMMENT_MODE,e.QUOTE_STRING_MODE,{className:"number",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:"\\b((\\d+'(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+)"},{begin:"\\B(('(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+)"},{begin:"\\b([0-9_])+",relevance:0}]},{className:"variable",variants:[{begin:"#\\((?!parameter).+\\)"},{begin:"\\.\\w+",relevance:0}]},{className:"meta",begin:"`",end:"$",keywords:{"meta-keyword":"define __FILE__ __LINE__ begin_keywords celldefine default_nettype define else elsif end_keywords endcelldefine endif ifdef ifndef include line nounconnected_drive pragma resetall timescale unconnected_drive undef undefineall"},relevance:0}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/vhdl.min.js b/vendor/assets/javascripts/highlightjs/languages/vhdl.min.js
index 6a8005435d..ef95aa3196 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vhdl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vhdl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("vhdl",function(e){var r="\\d(_|\\d)*",t="[eE][-+]?"+r,n=r+"(\\."+r+")?("+t+")?",i="\\w+",o=r+"#"+i+"(\\."+i+")?#("+t+")?",a="\\b("+o+"|"+n+")";return{cI:!0,k:{keyword:"abs access after alias all and architecture array assert assume assume_guarantee attribute begin block body buffer bus case component configuration constant context cover disconnect downto default else elsif end entity exit fairness file for force function generate generic group guarded if impure in inertial inout is label library linkage literal loop map mod nand new next nor not null of on open or others out package parameter port postponed procedure process property protected pure range record register reject release rem report restrict restrict_guarantee return rol ror select sequence severity shared signal sla sll sra srl strong subtype then to transport type unaffected units until use variable view vmode vprop vunit wait when while with xnor xor",built_in:"boolean bit character integer time delay_length natural positive string bit_vector file_open_kind file_open_status std_logic std_logic_vector unsigned signed boolean_vector integer_vector std_ulogic std_ulogic_vector unresolved_unsigned u_unsigned unresolved_signed u_signed real_vector time_vector",literal:"false true note warning error failure line text side width"},i:"{",c:[e.CBCM,e.C("--","$"),e.QSM,{cN:"number",b:a,r:0},{cN:"string",b:"'(U|X|0|1|Z|W|L|H|-)'",c:[e.BE]},{cN:"symbol",b:"'[A-Za-z](_?[A-Za-z0-9])*",c:[e.BE]}]}});
\ No newline at end of file
+hljs.registerLanguage("vhdl",function(){"use strict";return function(e){return{name:"VHDL",case_insensitive:!0,keywords:{keyword:"abs access after alias all and architecture array assert assume assume_guarantee attribute begin block body buffer bus case component configuration constant context cover disconnect downto default else elsif end entity exit fairness file for force function generate generic group guarded if impure in inertial inout is label library linkage literal loop map mod nand new next nor not null of on open or others out package parameter port postponed procedure process property protected pure range record register reject release rem report restrict restrict_guarantee return rol ror select sequence severity shared signal sla sll sra srl strong subtype then to transport type unaffected units until use variable view vmode vprop vunit wait when while with xnor xor",built_in:"boolean bit character integer time delay_length natural positive string bit_vector file_open_kind file_open_status std_logic std_logic_vector unsigned signed boolean_vector integer_vector std_ulogic std_ulogic_vector unresolved_unsigned u_unsigned unresolved_signed u_signed real_vector time_vector",literal:"false true note warning error failure line text side width"},illegal:"{",contains:[e.C_BLOCK_COMMENT_MODE,e.COMMENT("--","$"),e.QUOTE_STRING_MODE,{className:"number",begin:"\\b(\\d(_|\\d)*#\\w+(\\.\\w+)?#([eE][-+]?\\d(_|\\d)*)?|\\d(_|\\d)*(\\.\\d(_|\\d)*)?([eE][-+]?\\d(_|\\d)*)?)",relevance:0},{className:"string",begin:"'(U|X|0|1|Z|W|L|H|-)'",contains:[e.BACKSLASH_ESCAPE]},{className:"symbol",begin:"'[A-Za-z](_?[A-Za-z0-9])*",contains:[e.BACKSLASH_ESCAPE]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/vim.min.js b/vendor/assets/javascripts/highlightjs/languages/vim.min.js
index f38bea551c..49269bf56e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vim.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vim.min.js
@@ -1 +1 @@
-hljs.registerLanguage("vim",function(e){return{l:/[!#@\w]+/,k:{keyword:"N|0 P|0 X|0 a|0 ab abc abo al am an|0 ar arga argd arge argdo argg argl argu as au aug aun b|0 bN ba bad bd be bel bf bl bm bn bo bp br brea breaka breakd breakl bro bufdo buffers bun bw c|0 cN cNf ca cabc caddb cad caddf cal cat cb cc ccl cd ce cex cf cfir cgetb cgete cg changes chd che checkt cl cla clo cm cmapc cme cn cnew cnf cno cnorea cnoreme co col colo com comc comp con conf cope cp cpf cq cr cs cst cu cuna cunme cw delm deb debugg delc delf dif diffg diffo diffp diffpu diffs diffthis dig di dl dell dj dli do doautoa dp dr ds dsp e|0 ea ec echoe echoh echom echon el elsei em en endfo endf endt endw ene ex exe exi exu f|0 files filet fin fina fini fir fix fo foldc foldd folddoc foldo for fu go gr grepa gu gv ha helpf helpg helpt hi hid his ia iabc if ij il im imapc ime ino inorea inoreme int is isp iu iuna iunme j|0 ju k|0 keepa kee keepj lN lNf l|0 lad laddb laddf la lan lat lb lc lch lcl lcs le lefta let lex lf lfir lgetb lgete lg lgr lgrepa lh ll lla lli lmak lm lmapc lne lnew lnf ln loadk lo loc lockv lol lope lp lpf lr ls lt lu lua luad luaf lv lvimgrepa lw m|0 ma mak map mapc marks mat me menut mes mk mks mksp mkv mkvie mod mz mzf nbc nb nbs new nm nmapc nme nn nnoreme noa no noh norea noreme norm nu nun nunme ol o|0 om omapc ome on ono onoreme opt ou ounme ow p|0 profd prof pro promptr pc ped pe perld po popu pp pre prev ps pt ptN ptf ptj ptl ptn ptp ptr pts pu pw py3 python3 py3d py3f py pyd pyf quita qa rec red redi redr redraws reg res ret retu rew ri rightb rub rubyd rubyf rund ru rv sN san sa sal sav sb sbN sba sbf sbl sbm sbn sbp sbr scrip scripte scs se setf setg setl sf sfir sh sim sig sil sl sla sm smap smapc sme sn sni sno snor snoreme sor so spelld spe spelli spellr spellu spellw sp spr sre st sta startg startr star stopi stj sts sun sunm sunme sus sv sw sy synti sync tN tabN tabc tabdo tabe tabf tabfir tabl tabm tabnew tabn tabo tabp tabr tabs tab ta tags tc tcld tclf te tf th tj tl tm tn to tp tr try ts tu u|0 undoj undol una unh unl unlo unm unme uns up ve verb vert vim vimgrepa vi viu vie vm vmapc vme vne vn vnoreme vs vu vunme windo w|0 wN wa wh wi winc winp wn wp wq wqa ws wu wv x|0 xa xmapc xm xme xn xnoreme xu xunme y|0 z|0 ~ Next Print append abbreviate abclear aboveleft all amenu anoremenu args argadd argdelete argedit argglobal arglocal argument ascii autocmd augroup aunmenu buffer bNext ball badd bdelete behave belowright bfirst blast bmodified bnext botright bprevious brewind break breakadd breakdel breaklist browse bunload bwipeout change cNext cNfile cabbrev cabclear caddbuffer caddexpr caddfile call catch cbuffer cclose center cexpr cfile cfirst cgetbuffer cgetexpr cgetfile chdir checkpath checktime clist clast close cmap cmapclear cmenu cnext cnewer cnfile cnoremap cnoreabbrev cnoremenu copy colder colorscheme command comclear compiler continue confirm copen cprevious cpfile cquit crewind cscope cstag cunmap cunabbrev cunmenu cwindow delete delmarks debug debuggreedy delcommand delfunction diffupdate diffget diffoff diffpatch diffput diffsplit digraphs display deletel djump dlist doautocmd doautoall deletep drop dsearch dsplit edit earlier echo echoerr echohl echomsg else elseif emenu endif endfor endfunction endtry endwhile enew execute exit exusage file filetype find finally finish first fixdel fold foldclose folddoopen folddoclosed foldopen function global goto grep grepadd gui gvim hardcopy help helpfind helpgrep helptags highlight hide history insert iabbrev iabclear ijump ilist imap imapclear imenu inoremap inoreabbrev inoremenu intro isearch isplit iunmap iunabbrev iunmenu join jumps keepalt keepmarks keepjumps lNext lNfile list laddexpr laddbuffer laddfile last language later lbuffer lcd lchdir lclose lcscope left leftabove lexpr lfile lfirst lgetbuffer lgetexpr lgetfile lgrep lgrepadd lhelpgrep llast llist lmake lmap lmapclear lnext lnewer lnfile lnoremap loadkeymap loadview lockmarks lockvar lolder lopen lprevious lpfile lrewind ltag lunmap luado luafile lvimgrep lvimgrepadd lwindow move mark make mapclear match menu menutranslate messages mkexrc mksession mkspell mkvimrc mkview mode mzscheme mzfile nbclose nbkey nbsart next nmap nmapclear nmenu nnoremap nnoremenu noautocmd noremap nohlsearch noreabbrev noremenu normal number nunmap nunmenu oldfiles open omap omapclear omenu only onoremap onoremenu options ounmap ounmenu ownsyntax print profdel profile promptfind promptrepl pclose pedit perl perldo pop popup ppop preserve previous psearch ptag ptNext ptfirst ptjump ptlast ptnext ptprevious ptrewind ptselect put pwd py3do py3file python pydo pyfile quit quitall qall read recover redo redir redraw redrawstatus registers resize retab return rewind right rightbelow ruby rubydo rubyfile rundo runtime rviminfo substitute sNext sandbox sargument sall saveas sbuffer sbNext sball sbfirst sblast sbmodified sbnext sbprevious sbrewind scriptnames scriptencoding scscope set setfiletype setglobal setlocal sfind sfirst shell simalt sign silent sleep slast smagic smapclear smenu snext sniff snomagic snoremap snoremenu sort source spelldump spellgood spellinfo spellrepall spellundo spellwrong split sprevious srewind stop stag startgreplace startreplace startinsert stopinsert stjump stselect sunhide sunmap sunmenu suspend sview swapname syntax syntime syncbind tNext tabNext tabclose tabedit tabfind tabfirst tablast tabmove tabnext tabonly tabprevious tabrewind tag tcl tcldo tclfile tearoff tfirst throw tjump tlast tmenu tnext topleft tprevious trewind tselect tunmenu undo undojoin undolist unabbreviate unhide unlet unlockvar unmap unmenu unsilent update vglobal version verbose vertical vimgrep vimgrepadd visual viusage view vmap vmapclear vmenu vnew vnoremap vnoremenu vsplit vunmap vunmenu write wNext wall while winsize wincmd winpos wnext wprevious wqall wsverb wundo wviminfo xit xall xmapclear xmap xmenu xnoremap xnoremenu xunmap xunmenu yank",built_in:"synIDtrans atan2 range matcharg did_filetype asin feedkeys xor argv complete_check add getwinposx getqflist getwinposy screencol clearmatches empty extend getcmdpos mzeval garbagecollect setreg ceil sqrt diff_hlID inputsecret get getfperm getpid filewritable shiftwidth max sinh isdirectory synID system inputrestore winline atan visualmode inputlist tabpagewinnr round getregtype mapcheck hasmapto histdel argidx findfile sha256 exists toupper getcmdline taglist string getmatches bufnr strftime winwidth bufexists strtrans tabpagebuflist setcmdpos remote_read printf setloclist getpos getline bufwinnr float2nr len getcmdtype diff_filler luaeval resolve libcallnr foldclosedend reverse filter has_key bufname str2float strlen setline getcharmod setbufvar index searchpos shellescape undofile foldclosed setqflist buflisted strchars str2nr virtcol floor remove undotree remote_expr winheight gettabwinvar reltime cursor tabpagenr finddir localtime acos getloclist search tanh matchend rename gettabvar strdisplaywidth type abs py3eval setwinvar tolower wildmenumode log10 spellsuggest bufloaded synconcealed nextnonblank server2client complete settabwinvar executable input wincol setmatches getftype hlID inputsave searchpair or screenrow line settabvar histadd deepcopy strpart remote_peek and eval getftime submatch screenchar winsaveview matchadd mkdir screenattr getfontname libcall reltimestr getfsize winnr invert pow getbufline byte2line soundfold repeat fnameescape tagfiles sin strwidth spellbadword trunc maparg log lispindent hostname setpos globpath remote_foreground getchar synIDattr fnamemodify cscope_connection stridx winbufnr indent min complete_add nr2char searchpairpos inputdialog values matchlist items hlexists strridx browsedir expand fmod pathshorten line2byte argc count getwinvar glob foldtextresult getreg foreground cosh matchdelete has char2nr simplify histget searchdecl iconv winrestcmd pumvisible writefile foldlevel haslocaldir keys cos matchstr foldtext histnr tan tempname getcwd byteidx getbufvar islocked escape eventhandler remote_send serverlist winrestview synstack pyeval prevnonblank readfile cindent filereadable changenr exp"},i:/;/,c:[e.NM,{cN:"string",b:"'",e:"'",i:"\\n"},{cN:"string",b:/"(\\"|\n\\|[^"\n])*"/},e.C('"',"$"),{cN:"variable",b:/[bwtglsav]:[\w\d_]*/},{cN:"function",bK:"function function!",e:"$",r:0,c:[e.TM,{cN:"params",b:"\\(",e:"\\)"}]},{cN:"symbol",b:/<[\w-]+>/}]}});
\ No newline at end of file
+hljs.registerLanguage("vim",function(){"use strict";return function(e){return{name:"Vim Script",keywords:{$pattern:/[!#@\w]+/,keyword:"N|0 P|0 X|0 a|0 ab abc abo al am an|0 ar arga argd arge argdo argg argl argu as au aug aun b|0 bN ba bad bd be bel bf bl bm bn bo bp br brea breaka breakd breakl bro bufdo buffers bun bw c|0 cN cNf ca cabc caddb cad caddf cal cat cb cc ccl cd ce cex cf cfir cgetb cgete cg changes chd che checkt cl cla clo cm cmapc cme cn cnew cnf cno cnorea cnoreme co col colo com comc comp con conf cope cp cpf cq cr cs cst cu cuna cunme cw delm deb debugg delc delf dif diffg diffo diffp diffpu diffs diffthis dig di dl dell dj dli do doautoa dp dr ds dsp e|0 ea ec echoe echoh echom echon el elsei em en endfo endf endt endw ene ex exe exi exu f|0 files filet fin fina fini fir fix fo foldc foldd folddoc foldo for fu go gr grepa gu gv ha helpf helpg helpt hi hid his ia iabc if ij il im imapc ime ino inorea inoreme int is isp iu iuna iunme j|0 ju k|0 keepa kee keepj lN lNf l|0 lad laddb laddf la lan lat lb lc lch lcl lcs le lefta let lex lf lfir lgetb lgete lg lgr lgrepa lh ll lla lli lmak lm lmapc lne lnew lnf ln loadk lo loc lockv lol lope lp lpf lr ls lt lu lua luad luaf lv lvimgrepa lw m|0 ma mak map mapc marks mat me menut mes mk mks mksp mkv mkvie mod mz mzf nbc nb nbs new nm nmapc nme nn nnoreme noa no noh norea noreme norm nu nun nunme ol o|0 om omapc ome on ono onoreme opt ou ounme ow p|0 profd prof pro promptr pc ped pe perld po popu pp pre prev ps pt ptN ptf ptj ptl ptn ptp ptr pts pu pw py3 python3 py3d py3f py pyd pyf quita qa rec red redi redr redraws reg res ret retu rew ri rightb rub rubyd rubyf rund ru rv sN san sa sal sav sb sbN sba sbf sbl sbm sbn sbp sbr scrip scripte scs se setf setg setl sf sfir sh sim sig sil sl sla sm smap smapc sme sn sni sno snor snoreme sor so spelld spe spelli spellr spellu spellw sp spr sre st sta startg startr star stopi stj sts sun sunm sunme sus sv sw sy synti sync tN tabN tabc tabdo tabe tabf tabfir tabl tabm tabnew tabn tabo tabp tabr tabs tab ta tags tc tcld tclf te tf th tj tl tm tn to tp tr try ts tu u|0 undoj undol una unh unl unlo unm unme uns up ve verb vert vim vimgrepa vi viu vie vm vmapc vme vne vn vnoreme vs vu vunme windo w|0 wN wa wh wi winc winp wn wp wq wqa ws wu wv x|0 xa xmapc xm xme xn xnoreme xu xunme y|0 z|0 ~ Next Print append abbreviate abclear aboveleft all amenu anoremenu args argadd argdelete argedit argglobal arglocal argument ascii autocmd augroup aunmenu buffer bNext ball badd bdelete behave belowright bfirst blast bmodified bnext botright bprevious brewind break breakadd breakdel breaklist browse bunload bwipeout change cNext cNfile cabbrev cabclear caddbuffer caddexpr caddfile call catch cbuffer cclose center cexpr cfile cfirst cgetbuffer cgetexpr cgetfile chdir checkpath checktime clist clast close cmap cmapclear cmenu cnext cnewer cnfile cnoremap cnoreabbrev cnoremenu copy colder colorscheme command comclear compiler continue confirm copen cprevious cpfile cquit crewind cscope cstag cunmap cunabbrev cunmenu cwindow delete delmarks debug debuggreedy delcommand delfunction diffupdate diffget diffoff diffpatch diffput diffsplit digraphs display deletel djump dlist doautocmd doautoall deletep drop dsearch dsplit edit earlier echo echoerr echohl echomsg else elseif emenu endif endfor endfunction endtry endwhile enew execute exit exusage file filetype find finally finish first fixdel fold foldclose folddoopen folddoclosed foldopen function global goto grep grepadd gui gvim hardcopy help helpfind helpgrep helptags highlight hide history insert iabbrev iabclear ijump ilist imap imapclear imenu inoremap inoreabbrev inoremenu intro isearch isplit iunmap iunabbrev iunmenu join jumps keepalt keepmarks keepjumps lNext lNfile list laddexpr laddbuffer laddfile last language later lbuffer lcd lchdir lclose lcscope left leftabove lexpr lfile lfirst lgetbuffer lgetexpr lgetfile lgrep lgrepadd lhelpgrep llast llist lmake lmap lmapclear lnext lnewer lnfile lnoremap loadkeymap loadview lockmarks lockvar lolder lopen lprevious lpfile lrewind ltag lunmap luado luafile lvimgrep lvimgrepadd lwindow move mark make mapclear match menu menutranslate messages mkexrc mksession mkspell mkvimrc mkview mode mzscheme mzfile nbclose nbkey nbsart next nmap nmapclear nmenu nnoremap nnoremenu noautocmd noremap nohlsearch noreabbrev noremenu normal number nunmap nunmenu oldfiles open omap omapclear omenu only onoremap onoremenu options ounmap ounmenu ownsyntax print profdel profile promptfind promptrepl pclose pedit perl perldo pop popup ppop preserve previous psearch ptag ptNext ptfirst ptjump ptlast ptnext ptprevious ptrewind ptselect put pwd py3do py3file python pydo pyfile quit quitall qall read recover redo redir redraw redrawstatus registers resize retab return rewind right rightbelow ruby rubydo rubyfile rundo runtime rviminfo substitute sNext sandbox sargument sall saveas sbuffer sbNext sball sbfirst sblast sbmodified sbnext sbprevious sbrewind scriptnames scriptencoding scscope set setfiletype setglobal setlocal sfind sfirst shell simalt sign silent sleep slast smagic smapclear smenu snext sniff snomagic snoremap snoremenu sort source spelldump spellgood spellinfo spellrepall spellundo spellwrong split sprevious srewind stop stag startgreplace startreplace startinsert stopinsert stjump stselect sunhide sunmap sunmenu suspend sview swapname syntax syntime syncbind tNext tabNext tabclose tabedit tabfind tabfirst tablast tabmove tabnext tabonly tabprevious tabrewind tag tcl tcldo tclfile tearoff tfirst throw tjump tlast tmenu tnext topleft tprevious trewind tselect tunmenu undo undojoin undolist unabbreviate unhide unlet unlockvar unmap unmenu unsilent update vglobal version verbose vertical vimgrep vimgrepadd visual viusage view vmap vmapclear vmenu vnew vnoremap vnoremenu vsplit vunmap vunmenu write wNext wall while winsize wincmd winpos wnext wprevious wqall wsverb wundo wviminfo xit xall xmapclear xmap xmenu xnoremap xnoremenu xunmap xunmenu yank",built_in:"synIDtrans atan2 range matcharg did_filetype asin feedkeys xor argv complete_check add getwinposx getqflist getwinposy screencol clearmatches empty extend getcmdpos mzeval garbagecollect setreg ceil sqrt diff_hlID inputsecret get getfperm getpid filewritable shiftwidth max sinh isdirectory synID system inputrestore winline atan visualmode inputlist tabpagewinnr round getregtype mapcheck hasmapto histdel argidx findfile sha256 exists toupper getcmdline taglist string getmatches bufnr strftime winwidth bufexists strtrans tabpagebuflist setcmdpos remote_read printf setloclist getpos getline bufwinnr float2nr len getcmdtype diff_filler luaeval resolve libcallnr foldclosedend reverse filter has_key bufname str2float strlen setline getcharmod setbufvar index searchpos shellescape undofile foldclosed setqflist buflisted strchars str2nr virtcol floor remove undotree remote_expr winheight gettabwinvar reltime cursor tabpagenr finddir localtime acos getloclist search tanh matchend rename gettabvar strdisplaywidth type abs py3eval setwinvar tolower wildmenumode log10 spellsuggest bufloaded synconcealed nextnonblank server2client complete settabwinvar executable input wincol setmatches getftype hlID inputsave searchpair or screenrow line settabvar histadd deepcopy strpart remote_peek and eval getftime submatch screenchar winsaveview matchadd mkdir screenattr getfontname libcall reltimestr getfsize winnr invert pow getbufline byte2line soundfold repeat fnameescape tagfiles sin strwidth spellbadword trunc maparg log lispindent hostname setpos globpath remote_foreground getchar synIDattr fnamemodify cscope_connection stridx winbufnr indent min complete_add nr2char searchpairpos inputdialog values matchlist items hlexists strridx browsedir expand fmod pathshorten line2byte argc count getwinvar glob foldtextresult getreg foreground cosh matchdelete has char2nr simplify histget searchdecl iconv winrestcmd pumvisible writefile foldlevel haslocaldir keys cos matchstr foldtext histnr tan tempname getcwd byteidx getbufvar islocked escape eventhandler remote_send serverlist winrestview synstack pyeval prevnonblank readfile cindent filereadable changenr exp"},illegal:/;/,contains:[e.NUMBER_MODE,{className:"string",begin:"'",end:"'",illegal:"\\n"},{className:"string",begin:/"(\\"|\n\\|[^"\n])*"/},e.COMMENT('"',"$"),{className:"variable",begin:/[bwtglsav]:[\w\d_]*/},{className:"function",beginKeywords:"function function!",end:"$",relevance:0,contains:[e.TITLE_MODE,{className:"params",begin:"\\(",end:"\\)"}]},{className:"symbol",begin:/<[\w-]+>/}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/x86asm.min.js b/vendor/assets/javascripts/highlightjs/languages/x86asm.min.js
index e73566d2eb..f062a8f340 100644
--- a/vendor/assets/javascripts/highlightjs/languages/x86asm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/x86asm.min.js
@@ -1 +1 @@
-hljs.registerLanguage("x86asm",function(s){return{cI:!0,l:"[.%]?"+s.IR,k:{keyword:"lock rep repe repz repne repnz xaquire xrelease bnd nobnd aaa aad aam aas adc add and arpl bb0_reset bb1_reset bound bsf bsr bswap bt btc btr bts call cbw cdq cdqe clc cld cli clts cmc cmp cmpsb cmpsd cmpsq cmpsw cmpxchg cmpxchg486 cmpxchg8b cmpxchg16b cpuid cpu_read cpu_write cqo cwd cwde daa das dec div dmint emms enter equ f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcmovb fcmovbe fcmove fcmovnb fcmovnbe fcmovne fcmovnu fcmovu fcom fcomi fcomip fcomp fcompp fcos fdecstp fdisi fdiv fdivp fdivr fdivrp femms feni ffree ffreep fiadd ficom ficomp fidiv fidivr fild fimul fincstp finit fist fistp fisttp fisub fisubr fld fld1 fldcw fldenv fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul fmulp fnclex fndisi fneni fninit fnop fnsave fnstcw fnstenv fnstsw fpatan fprem fprem1 fptan frndint frstor fsave fscale fsetpm fsin fsincos fsqrt fst fstcw fstenv fstp fstsw fsub fsubp fsubr fsubrp ftst fucom fucomi fucomip fucomp fucompp fxam fxch fxtract fyl2x fyl2xp1 hlt ibts icebp idiv imul in inc incbin insb insd insw int int01 int1 int03 int3 into invd invpcid invlpg invlpga iret iretd iretq iretw jcxz jecxz jrcxz jmp jmpe lahf lar lds lea leave les lfence lfs lgdt lgs lidt lldt lmsw loadall loadall286 lodsb lodsd lodsq lodsw loop loope loopne loopnz loopz lsl lss ltr mfence monitor mov movd movq movsb movsd movsq movsw movsx movsxd movzx mul mwait neg nop not or out outsb outsd outsw packssdw packsswb packuswb paddb paddd paddsb paddsiw paddsw paddusb paddusw paddw pand pandn pause paveb pavgusb pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw pdistib pf2id pfacc pfadd pfcmpeq pfcmpge pfcmpgt pfmax pfmin pfmul pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt pfsub pfsubr pi2fd pmachriw pmaddwd pmagw pmulhriw pmulhrwa pmulhrwc pmulhw pmullw pmvgezb pmvlzb pmvnzb pmvzb pop popa popad popaw popf popfd popfq popfw por prefetch prefetchw pslld psllq psllw psrad psraw psrld psrlq psrlw psubb psubd psubsb psubsiw psubsw psubusb psubusw psubw punpckhbw punpckhdq punpckhwd punpcklbw punpckldq punpcklwd push pusha pushad pushaw pushf pushfd pushfq pushfw pxor rcl rcr rdshr rdmsr rdpmc rdtsc rdtscp ret retf retn rol ror rdm rsdc rsldt rsm rsts sahf sal salc sar sbb scasb scasd scasq scasw sfence sgdt shl shld shr shrd sidt sldt skinit smi smint smintold smsw stc std sti stosb stosd stosq stosw str sub svdc svldt svts swapgs syscall sysenter sysexit sysret test ud0 ud1 ud2b ud2 ud2a umov verr verw fwait wbinvd wrshr wrmsr xadd xbts xchg xlatb xlat xor cmove cmovz cmovne cmovnz cmova cmovnbe cmovae cmovnb cmovb cmovnae cmovbe cmovna cmovg cmovnle cmovge cmovnl cmovl cmovnge cmovle cmovng cmovc cmovnc cmovo cmovno cmovs cmovns cmovp cmovpe cmovnp cmovpo je jz jne jnz ja jnbe jae jnb jb jnae jbe jna jg jnle jge jnl jl jnge jle jng jc jnc jo jno js jns jpo jnp jpe jp sete setz setne setnz seta setnbe setae setnb setnc setb setnae setcset setbe setna setg setnle setge setnl setl setnge setle setng sets setns seto setno setpe setp setpo setnp addps addss andnps andps cmpeqps cmpeqss cmpleps cmpless cmpltps cmpltss cmpneqps cmpneqss cmpnleps cmpnless cmpnltps cmpnltss cmpordps cmpordss cmpunordps cmpunordss cmpps cmpss comiss cvtpi2ps cvtps2pi cvtsi2ss cvtss2si cvttps2pi cvttss2si divps divss ldmxcsr maxps maxss minps minss movaps movhps movlhps movlps movhlps movmskps movntps movss movups mulps mulss orps rcpps rcpss rsqrtps rsqrtss shufps sqrtps sqrtss stmxcsr subps subss ucomiss unpckhps unpcklps xorps fxrstor fxrstor64 fxsave fxsave64 xgetbv xsetbv xsave xsave64 xsaveopt xsaveopt64 xrstor xrstor64 prefetchnta prefetcht0 prefetcht1 prefetcht2 maskmovq movntq pavgb pavgw pextrw pinsrw pmaxsw pmaxub pminsw pminub pmovmskb pmulhuw psadbw pshufw pf2iw pfnacc pfpnacc pi2fw pswapd maskmovdqu clflush movntdq movnti movntpd movdqa movdqu movdq2q movq2dq paddq pmuludq pshufd pshufhw pshuflw pslldq psrldq psubq punpckhqdq punpcklqdq addpd addsd andnpd andpd cmpeqpd cmpeqsd cmplepd cmplesd cmpltpd cmpltsd cmpneqpd cmpneqsd cmpnlepd cmpnlesd cmpnltpd cmpnltsd cmpordpd cmpordsd cmpunordpd cmpunordsd cmppd comisd cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi cvtpd2ps cvtpi2pd cvtps2dq cvtps2pd cvtsd2si cvtsd2ss cvtsi2sd cvtss2sd cvttpd2pi cvttpd2dq cvttps2dq cvttsd2si divpd divsd maxpd maxsd minpd minsd movapd movhpd movlpd movmskpd movupd mulpd mulsd orpd shufpd sqrtpd sqrtsd subpd subsd ucomisd unpckhpd unpcklpd xorpd addsubpd addsubps haddpd haddps hsubpd hsubps lddqu movddup movshdup movsldup clgi stgi vmcall vmclear vmfunc vmlaunch vmload vmmcall vmptrld vmptrst vmread vmresume vmrun vmsave vmwrite vmxoff vmxon invept invvpid pabsb pabsw pabsd palignr phaddw phaddd phaddsw phsubw phsubd phsubsw pmaddubsw pmulhrsw pshufb psignb psignw psignd extrq insertq movntsd movntss lzcnt blendpd blendps blendvpd blendvps dppd dpps extractps insertps movntdqa mpsadbw packusdw pblendvb pblendw pcmpeqq pextrb pextrd pextrq phminposuw pinsrb pinsrd pinsrq pmaxsb pmaxsd pmaxud pmaxuw pminsb pminsd pminud pminuw pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq pmuldq pmulld ptest roundpd roundps roundsd roundss crc32 pcmpestri pcmpestrm pcmpistri pcmpistrm pcmpgtq popcnt getsec pfrcpv pfrsqrtv movbe aesenc aesenclast aesdec aesdeclast aesimc aeskeygenassist vaesenc vaesenclast vaesdec vaesdeclast vaesimc vaeskeygenassist vaddpd vaddps vaddsd vaddss vaddsubpd vaddsubps vandpd vandps vandnpd vandnps vblendpd vblendps vblendvpd vblendvps vbroadcastss vbroadcastsd vbroadcastf128 vcmpeq_ospd vcmpeqpd vcmplt_ospd vcmpltpd vcmple_ospd vcmplepd vcmpunord_qpd vcmpunordpd vcmpneq_uqpd vcmpneqpd vcmpnlt_uspd vcmpnltpd vcmpnle_uspd vcmpnlepd vcmpord_qpd vcmpordpd vcmpeq_uqpd vcmpnge_uspd vcmpngepd vcmpngt_uspd vcmpngtpd vcmpfalse_oqpd vcmpfalsepd vcmpneq_oqpd vcmpge_ospd vcmpgepd vcmpgt_ospd vcmpgtpd vcmptrue_uqpd vcmptruepd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd vcmppd vcmpeq_osps vcmpeqps vcmplt_osps vcmpltps vcmple_osps vcmpleps vcmpunord_qps vcmpunordps vcmpneq_uqps vcmpneqps vcmpnlt_usps vcmpnltps vcmpnle_usps vcmpnleps vcmpord_qps vcmpordps vcmpeq_uqps vcmpnge_usps vcmpngeps vcmpngt_usps vcmpngtps vcmpfalse_oqps vcmpfalseps vcmpneq_oqps vcmpge_osps vcmpgeps vcmpgt_osps vcmpgtps vcmptrue_uqps vcmptrueps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps vcmpps vcmpeq_ossd vcmpeqsd vcmplt_ossd vcmpltsd vcmple_ossd vcmplesd vcmpunord_qsd vcmpunordsd vcmpneq_uqsd vcmpneqsd vcmpnlt_ussd vcmpnltsd vcmpnle_ussd vcmpnlesd vcmpord_qsd vcmpordsd vcmpeq_uqsd vcmpnge_ussd vcmpngesd vcmpngt_ussd vcmpngtsd vcmpfalse_oqsd vcmpfalsesd vcmpneq_oqsd vcmpge_ossd vcmpgesd vcmpgt_ossd vcmpgtsd vcmptrue_uqsd vcmptruesd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd vcmpsd vcmpeq_osss vcmpeqss vcmplt_osss vcmpltss vcmple_osss vcmpless vcmpunord_qss vcmpunordss vcmpneq_uqss vcmpneqss vcmpnlt_usss vcmpnltss vcmpnle_usss vcmpnless vcmpord_qss vcmpordss vcmpeq_uqss vcmpnge_usss vcmpngess vcmpngt_usss vcmpngtss vcmpfalse_oqss vcmpfalsess vcmpneq_oqss vcmpge_osss vcmpgess vcmpgt_osss vcmpgtss vcmptrue_uqss vcmptruess vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss vcmpss vcomisd vcomiss vcvtdq2pd vcvtdq2ps vcvtpd2dq vcvtpd2ps vcvtps2dq vcvtps2pd vcvtsd2si vcvtsd2ss vcvtsi2sd vcvtsi2ss vcvtss2sd vcvtss2si vcvttpd2dq vcvttps2dq vcvttsd2si vcvttss2si vdivpd vdivps vdivsd vdivss vdppd vdpps vextractf128 vextractps vhaddpd vhaddps vhsubpd vhsubps vinsertf128 vinsertps vlddqu vldqqu vldmxcsr vmaskmovdqu vmaskmovps vmaskmovpd vmaxpd vmaxps vmaxsd vmaxss vminpd vminps vminsd vminss vmovapd vmovaps vmovd vmovq vmovddup vmovdqa vmovqqa vmovdqu vmovqqu vmovhlps vmovhpd vmovhps vmovlhps vmovlpd vmovlps vmovmskpd vmovmskps vmovntdq vmovntqq vmovntdqa vmovntpd vmovntps vmovsd vmovshdup vmovsldup vmovss vmovupd vmovups vmpsadbw vmulpd vmulps vmulsd vmulss vorpd vorps vpabsb vpabsw vpabsd vpacksswb vpackssdw vpackuswb vpackusdw vpaddb vpaddw vpaddd vpaddq vpaddsb vpaddsw vpaddusb vpaddusw vpalignr vpand vpandn vpavgb vpavgw vpblendvb vpblendw vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq vpermilpd vpermilps vperm2f128 vpextrb vpextrw vpextrd vpextrq vphaddw vphaddd vphaddsw vphminposuw vphsubw vphsubd vphsubsw vpinsrb vpinsrw vpinsrd vpinsrq vpmaddwd vpmaddubsw vpmaxsb vpmaxsw vpmaxsd vpmaxub vpmaxuw vpmaxud vpminsb vpminsw vpminsd vpminub vpminuw vpminud vpmovmskb vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq vpmulhuw vpmulhrsw vpmulhw vpmullw vpmulld vpmuludq vpmuldq vpor vpsadbw vpshufb vpshufd vpshufhw vpshuflw vpsignb vpsignw vpsignd vpslldq vpsrldq vpsllw vpslld vpsllq vpsraw vpsrad vpsrlw vpsrld vpsrlq vptest vpsubb vpsubw vpsubd vpsubq vpsubsb vpsubsw vpsubusb vpsubusw vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq vpxor vrcpps vrcpss vrsqrtps vrsqrtss vroundpd vroundps vroundsd vroundss vshufpd vshufps vsqrtpd vsqrtps vsqrtsd vsqrtss vstmxcsr vsubpd vsubps vsubsd vsubss vtestps vtestpd vucomisd vucomiss vunpckhpd vunpckhps vunpcklpd vunpcklps vxorpd vxorps vzeroall vzeroupper pclmullqlqdq pclmulhqlqdq pclmullqhqdq pclmulhqhqdq pclmulqdq vpclmullqlqdq vpclmulhqlqdq vpclmullqhqdq vpclmulhqhqdq vpclmulqdq vfmadd132ps vfmadd132pd vfmadd312ps vfmadd312pd vfmadd213ps vfmadd213pd vfmadd123ps vfmadd123pd vfmadd231ps vfmadd231pd vfmadd321ps vfmadd321pd vfmaddsub132ps vfmaddsub132pd vfmaddsub312ps vfmaddsub312pd vfmaddsub213ps vfmaddsub213pd vfmaddsub123ps vfmaddsub123pd vfmaddsub231ps vfmaddsub231pd vfmaddsub321ps vfmaddsub321pd vfmsub132ps vfmsub132pd vfmsub312ps vfmsub312pd vfmsub213ps vfmsub213pd vfmsub123ps vfmsub123pd vfmsub231ps vfmsub231pd vfmsub321ps vfmsub321pd vfmsubadd132ps vfmsubadd132pd vfmsubadd312ps vfmsubadd312pd vfmsubadd213ps vfmsubadd213pd vfmsubadd123ps vfmsubadd123pd vfmsubadd231ps vfmsubadd231pd vfmsubadd321ps vfmsubadd321pd vfnmadd132ps vfnmadd132pd vfnmadd312ps vfnmadd312pd vfnmadd213ps vfnmadd213pd vfnmadd123ps vfnmadd123pd vfnmadd231ps vfnmadd231pd vfnmadd321ps vfnmadd321pd vfnmsub132ps vfnmsub132pd vfnmsub312ps vfnmsub312pd vfnmsub213ps vfnmsub213pd vfnmsub123ps vfnmsub123pd vfnmsub231ps vfnmsub231pd vfnmsub321ps vfnmsub321pd vfmadd132ss vfmadd132sd vfmadd312ss vfmadd312sd vfmadd213ss vfmadd213sd vfmadd123ss vfmadd123sd vfmadd231ss vfmadd231sd vfmadd321ss vfmadd321sd vfmsub132ss vfmsub132sd vfmsub312ss vfmsub312sd vfmsub213ss vfmsub213sd vfmsub123ss vfmsub123sd vfmsub231ss vfmsub231sd vfmsub321ss vfmsub321sd vfnmadd132ss vfnmadd132sd vfnmadd312ss vfnmadd312sd vfnmadd213ss vfnmadd213sd vfnmadd123ss vfnmadd123sd vfnmadd231ss vfnmadd231sd vfnmadd321ss vfnmadd321sd vfnmsub132ss vfnmsub132sd vfnmsub312ss vfnmsub312sd vfnmsub213ss vfnmsub213sd vfnmsub123ss vfnmsub123sd vfnmsub231ss vfnmsub231sd vfnmsub321ss vfnmsub321sd rdfsbase rdgsbase rdrand wrfsbase wrgsbase vcvtph2ps vcvtps2ph adcx adox rdseed clac stac xstore xcryptecb xcryptcbc xcryptctr xcryptcfb xcryptofb montmul xsha1 xsha256 llwpcb slwpcb lwpval lwpins vfmaddpd vfmaddps vfmaddsd vfmaddss vfmaddsubpd vfmaddsubps vfmsubaddpd vfmsubaddps vfmsubpd vfmsubps vfmsubsd vfmsubss vfnmaddpd vfnmaddps vfnmaddsd vfnmaddss vfnmsubpd vfnmsubps vfnmsubsd vfnmsubss vfrczpd vfrczps vfrczsd vfrczss vpcmov vpcomb vpcomd vpcomq vpcomub vpcomud vpcomuq vpcomuw vpcomw vphaddbd vphaddbq vphaddbw vphadddq vphaddubd vphaddubq vphaddubw vphaddudq vphadduwd vphadduwq vphaddwd vphaddwq vphsubbw vphsubdq vphsubwd vpmacsdd vpmacsdqh vpmacsdql vpmacssdd vpmacssdqh vpmacssdql vpmacsswd vpmacssww vpmacswd vpmacsww vpmadcsswd vpmadcswd vpperm vprotb vprotd vprotq vprotw vpshab vpshad vpshaq vpshaw vpshlb vpshld vpshlq vpshlw vbroadcasti128 vpblendd vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq vpermd vpermpd vpermps vpermq vperm2i128 vextracti128 vinserti128 vpmaskmovd vpmaskmovq vpsllvd vpsllvq vpsravd vpsrlvd vpsrlvq vgatherdpd vgatherqpd vgatherdps vgatherqps vpgatherdd vpgatherqd vpgatherdq vpgatherqq xabort xbegin xend xtest andn bextr blci blcic blsi blsic blcfill blsfill blcmsk blsmsk blsr blcs bzhi mulx pdep pext rorx sarx shlx shrx tzcnt tzmsk t1mskc valignd valignq vblendmpd vblendmps vbroadcastf32x4 vbroadcastf64x4 vbroadcasti32x4 vbroadcasti64x4 vcompresspd vcompressps vcvtpd2udq vcvtps2udq vcvtsd2usi vcvtss2usi vcvttpd2udq vcvttps2udq vcvttsd2usi vcvttss2usi vcvtudq2pd vcvtudq2ps vcvtusi2sd vcvtusi2ss vexpandpd vexpandps vextractf32x4 vextractf64x4 vextracti32x4 vextracti64x4 vfixupimmpd vfixupimmps vfixupimmsd vfixupimmss vgetexppd vgetexpps vgetexpsd vgetexpss vgetmantpd vgetmantps vgetmantsd vgetmantss vinsertf32x4 vinsertf64x4 vinserti32x4 vinserti64x4 vmovdqa32 vmovdqa64 vmovdqu32 vmovdqu64 vpabsq vpandd vpandnd vpandnq vpandq vpblendmd vpblendmq vpcmpltd vpcmpled vpcmpneqd vpcmpnltd vpcmpnled vpcmpd vpcmpltq vpcmpleq vpcmpneqq vpcmpnltq vpcmpnleq vpcmpq vpcmpequd vpcmpltud vpcmpleud vpcmpnequd vpcmpnltud vpcmpnleud vpcmpud vpcmpequq vpcmpltuq vpcmpleuq vpcmpnequq vpcmpnltuq vpcmpnleuq vpcmpuq vpcompressd vpcompressq vpermi2d vpermi2pd vpermi2ps vpermi2q vpermt2d vpermt2pd vpermt2ps vpermt2q vpexpandd vpexpandq vpmaxsq vpmaxuq vpminsq vpminuq vpmovdb vpmovdw vpmovqb vpmovqd vpmovqw vpmovsdb vpmovsdw vpmovsqb vpmovsqd vpmovsqw vpmovusdb vpmovusdw vpmovusqb vpmovusqd vpmovusqw vpord vporq vprold vprolq vprolvd vprolvq vprord vprorq vprorvd vprorvq vpscatterdd vpscatterdq vpscatterqd vpscatterqq vpsraq vpsravq vpternlogd vpternlogq vptestmd vptestmq vptestnmd vptestnmq vpxord vpxorq vrcp14pd vrcp14ps vrcp14sd vrcp14ss vrndscalepd vrndscaleps vrndscalesd vrndscaless vrsqrt14pd vrsqrt14ps vrsqrt14sd vrsqrt14ss vscalefpd vscalefps vscalefsd vscalefss vscatterdpd vscatterdps vscatterqpd vscatterqps vshuff32x4 vshuff64x2 vshufi32x4 vshufi64x2 kandnw kandw kmovw knotw kortestw korw kshiftlw kshiftrw kunpckbw kxnorw kxorw vpbroadcastmb2q vpbroadcastmw2d vpconflictd vpconflictq vplzcntd vplzcntq vexp2pd vexp2ps vrcp28pd vrcp28ps vrcp28sd vrcp28ss vrsqrt28pd vrsqrt28ps vrsqrt28sd vrsqrt28ss vgatherpf0dpd vgatherpf0dps vgatherpf0qpd vgatherpf0qps vgatherpf1dpd vgatherpf1dps vgatherpf1qpd vgatherpf1qps vscatterpf0dpd vscatterpf0dps vscatterpf0qpd vscatterpf0qps vscatterpf1dpd vscatterpf1dps vscatterpf1qpd vscatterpf1qps prefetchwt1 bndmk bndcl bndcu bndcn bndmov bndldx bndstx sha1rnds4 sha1nexte sha1msg1 sha1msg2 sha256rnds2 sha256msg1 sha256msg2 hint_nop0 hint_nop1 hint_nop2 hint_nop3 hint_nop4 hint_nop5 hint_nop6 hint_nop7 hint_nop8 hint_nop9 hint_nop10 hint_nop11 hint_nop12 hint_nop13 hint_nop14 hint_nop15 hint_nop16 hint_nop17 hint_nop18 hint_nop19 hint_nop20 hint_nop21 hint_nop22 hint_nop23 hint_nop24 hint_nop25 hint_nop26 hint_nop27 hint_nop28 hint_nop29 hint_nop30 hint_nop31 hint_nop32 hint_nop33 hint_nop34 hint_nop35 hint_nop36 hint_nop37 hint_nop38 hint_nop39 hint_nop40 hint_nop41 hint_nop42 hint_nop43 hint_nop44 hint_nop45 hint_nop46 hint_nop47 hint_nop48 hint_nop49 hint_nop50 hint_nop51 hint_nop52 hint_nop53 hint_nop54 hint_nop55 hint_nop56 hint_nop57 hint_nop58 hint_nop59 hint_nop60 hint_nop61 hint_nop62 hint_nop63",built_in:"ip eip rip al ah bl bh cl ch dl dh sil dil bpl spl r8b r9b r10b r11b r12b r13b r14b r15b ax bx cx dx si di bp sp r8w r9w r10w r11w r12w r13w r14w r15w eax ebx ecx edx esi edi ebp esp eip r8d r9d r10d r11d r12d r13d r14d r15d rax rbx rcx rdx rsi rdi rbp rsp r8 r9 r10 r11 r12 r13 r14 r15 cs ds es fs gs ss st st0 st1 st2 st3 st4 st5 st6 st7 mm0 mm1 mm2 mm3 mm4 mm5 mm6 mm7 xmm0  xmm1  xmm2  xmm3  xmm4  xmm5  xmm6  xmm7  xmm8  xmm9 xmm10  xmm11 xmm12 xmm13 xmm14 xmm15 xmm16 xmm17 xmm18 xmm19 xmm20 xmm21 xmm22 xmm23 xmm24 xmm25 xmm26 xmm27 xmm28 xmm29 xmm30 xmm31 ymm0  ymm1  ymm2  ymm3  ymm4  ymm5  ymm6  ymm7  ymm8  ymm9 ymm10  ymm11 ymm12 ymm13 ymm14 ymm15 ymm16 ymm17 ymm18 ymm19 ymm20 ymm21 ymm22 ymm23 ymm24 ymm25 ymm26 ymm27 ymm28 ymm29 ymm30 ymm31 zmm0  zmm1  zmm2  zmm3  zmm4  zmm5  zmm6  zmm7  zmm8  zmm9 zmm10  zmm11 zmm12 zmm13 zmm14 zmm15 zmm16 zmm17 zmm18 zmm19 zmm20 zmm21 zmm22 zmm23 zmm24 zmm25 zmm26 zmm27 zmm28 zmm29 zmm30 zmm31 k0 k1 k2 k3 k4 k5 k6 k7 bnd0 bnd1 bnd2 bnd3 cr0 cr1 cr2 cr3 cr4 cr8 dr0 dr1 dr2 dr3 dr8 tr3 tr4 tr5 tr6 tr7 r0 r1 r2 r3 r4 r5 r6 r7 r0b r1b r2b r3b r4b r5b r6b r7b r0w r1w r2w r3w r4w r5w r6w r7w r0d r1d r2d r3d r4d r5d r6d r7d r0h r1h r2h r3h r0l r1l r2l r3l r4l r5l r6l r7l r8l r9l r10l r11l r12l r13l r14l r15l db dw dd dq dt ddq do dy dz resb resw resd resq rest resdq reso resy resz incbin equ times byte word dword qword nosplit rel abs seg wrt strict near far a32 ptr",meta:"%define %xdefine %+ %undef %defstr %deftok %assign %strcat %strlen %substr %rotate %elif %else %endif %if %ifmacro %ifctx %ifidn %ifidni %ifid %ifnum %ifstr %iftoken %ifempty %ifenv %error %warning %fatal %rep %endrep %include %push %pop %repl %pathsearch %depend %use %arg %stacksize %local %line %comment %endcomment .nolist __FILE__ __LINE__ __SECT__  __BITS__ __OUTPUT_FORMAT__ __DATE__ __TIME__ __DATE_NUM__ __TIME_NUM__ __UTC_DATE__ __UTC_TIME__ __UTC_DATE_NUM__ __UTC_TIME_NUM__  __PASS__ struc endstruc istruc at iend align alignb sectalign daz nodaz up down zero default option assume public bits use16 use32 use64 default section segment absolute extern global common cpu float __utf16__ __utf16le__ __utf16be__ __utf32__ __utf32le__ __utf32be__ __float8__ __float16__ __float32__ __float64__ __float80m__ __float80e__ __float128l__ __float128h__ __Infinity__ __QNaN__ __SNaN__ Inf NaN QNaN SNaN float8 float16 float32 float64 float80m float80e float128l float128h __FLOAT_DAZ__ __FLOAT_ROUND__ __FLOAT__"},c:[s.C(";","$",{r:0}),{cN:"number",v:[{b:"\\b(?:([0-9][0-9_]*)?\\.[0-9_]*(?:[eE][+-]?[0-9_]+)?|(0[Xx])?[0-9][0-9_]*\\.?[0-9_]*(?:[pP](?:[+-]?[0-9_]+)?)?)\\b",r:0},{b:"\\$[0-9][0-9A-Fa-f]*",r:0},{b:"\\b(?:[0-9A-Fa-f][0-9A-Fa-f_]*[Hh]|[0-9][0-9_]*[DdTt]?|[0-7][0-7_]*[QqOo]|[0-1][0-1_]*[BbYy])\\b"},{b:"\\b(?:0[Xx][0-9A-Fa-f_]+|0[DdTt][0-9_]+|0[QqOo][0-7_]+|0[BbYy][0-1_]+)\\b"}]},s.QSM,{cN:"string",v:[{b:"'",e:"[^\\\\]'"},{b:"`",e:"[^\\\\]`"}],r:0},{cN:"symbol",v:[{b:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)"},{b:"^\\s*%%[A-Za-z0-9_$#@~.?]*:"}],r:0},{cN:"subst",b:"%[0-9]+",r:0},{cN:"subst",b:"%!S+",r:0},{cN:"meta",b:/^\s*\.[\w_-]+/}]}});
\ No newline at end of file
+hljs.registerLanguage("x86asm",function(){"use strict";return function(s){return{name:"Intel x86 Assembly",case_insensitive:!0,keywords:{$pattern:"[.%]?"+s.IDENT_RE,keyword:"lock rep repe repz repne repnz xaquire xrelease bnd nobnd aaa aad aam aas adc add and arpl bb0_reset bb1_reset bound bsf bsr bswap bt btc btr bts call cbw cdq cdqe clc cld cli clts cmc cmp cmpsb cmpsd cmpsq cmpsw cmpxchg cmpxchg486 cmpxchg8b cmpxchg16b cpuid cpu_read cpu_write cqo cwd cwde daa das dec div dmint emms enter equ f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcmovb fcmovbe fcmove fcmovnb fcmovnbe fcmovne fcmovnu fcmovu fcom fcomi fcomip fcomp fcompp fcos fdecstp fdisi fdiv fdivp fdivr fdivrp femms feni ffree ffreep fiadd ficom ficomp fidiv fidivr fild fimul fincstp finit fist fistp fisttp fisub fisubr fld fld1 fldcw fldenv fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul fmulp fnclex fndisi fneni fninit fnop fnsave fnstcw fnstenv fnstsw fpatan fprem fprem1 fptan frndint frstor fsave fscale fsetpm fsin fsincos fsqrt fst fstcw fstenv fstp fstsw fsub fsubp fsubr fsubrp ftst fucom fucomi fucomip fucomp fucompp fxam fxch fxtract fyl2x fyl2xp1 hlt ibts icebp idiv imul in inc incbin insb insd insw int int01 int1 int03 int3 into invd invpcid invlpg invlpga iret iretd iretq iretw jcxz jecxz jrcxz jmp jmpe lahf lar lds lea leave les lfence lfs lgdt lgs lidt lldt lmsw loadall loadall286 lodsb lodsd lodsq lodsw loop loope loopne loopnz loopz lsl lss ltr mfence monitor mov movd movq movsb movsd movsq movsw movsx movsxd movzx mul mwait neg nop not or out outsb outsd outsw packssdw packsswb packuswb paddb paddd paddsb paddsiw paddsw paddusb paddusw paddw pand pandn pause paveb pavgusb pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw pdistib pf2id pfacc pfadd pfcmpeq pfcmpge pfcmpgt pfmax pfmin pfmul pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt pfsub pfsubr pi2fd pmachriw pmaddwd pmagw pmulhriw pmulhrwa pmulhrwc pmulhw pmullw pmvgezb pmvlzb pmvnzb pmvzb pop popa popad popaw popf popfd popfq popfw por prefetch prefetchw pslld psllq psllw psrad psraw psrld psrlq psrlw psubb psubd psubsb psubsiw psubsw psubusb psubusw psubw punpckhbw punpckhdq punpckhwd punpcklbw punpckldq punpcklwd push pusha pushad pushaw pushf pushfd pushfq pushfw pxor rcl rcr rdshr rdmsr rdpmc rdtsc rdtscp ret retf retn rol ror rdm rsdc rsldt rsm rsts sahf sal salc sar sbb scasb scasd scasq scasw sfence sgdt shl shld shr shrd sidt sldt skinit smi smint smintold smsw stc std sti stosb stosd stosq stosw str sub svdc svldt svts swapgs syscall sysenter sysexit sysret test ud0 ud1 ud2b ud2 ud2a umov verr verw fwait wbinvd wrshr wrmsr xadd xbts xchg xlatb xlat xor cmove cmovz cmovne cmovnz cmova cmovnbe cmovae cmovnb cmovb cmovnae cmovbe cmovna cmovg cmovnle cmovge cmovnl cmovl cmovnge cmovle cmovng cmovc cmovnc cmovo cmovno cmovs cmovns cmovp cmovpe cmovnp cmovpo je jz jne jnz ja jnbe jae jnb jb jnae jbe jna jg jnle jge jnl jl jnge jle jng jc jnc jo jno js jns jpo jnp jpe jp sete setz setne setnz seta setnbe setae setnb setnc setb setnae setcset setbe setna setg setnle setge setnl setl setnge setle setng sets setns seto setno setpe setp setpo setnp addps addss andnps andps cmpeqps cmpeqss cmpleps cmpless cmpltps cmpltss cmpneqps cmpneqss cmpnleps cmpnless cmpnltps cmpnltss cmpordps cmpordss cmpunordps cmpunordss cmpps cmpss comiss cvtpi2ps cvtps2pi cvtsi2ss cvtss2si cvttps2pi cvttss2si divps divss ldmxcsr maxps maxss minps minss movaps movhps movlhps movlps movhlps movmskps movntps movss movups mulps mulss orps rcpps rcpss rsqrtps rsqrtss shufps sqrtps sqrtss stmxcsr subps subss ucomiss unpckhps unpcklps xorps fxrstor fxrstor64 fxsave fxsave64 xgetbv xsetbv xsave xsave64 xsaveopt xsaveopt64 xrstor xrstor64 prefetchnta prefetcht0 prefetcht1 prefetcht2 maskmovq movntq pavgb pavgw pextrw pinsrw pmaxsw pmaxub pminsw pminub pmovmskb pmulhuw psadbw pshufw pf2iw pfnacc pfpnacc pi2fw pswapd maskmovdqu clflush movntdq movnti movntpd movdqa movdqu movdq2q movq2dq paddq pmuludq pshufd pshufhw pshuflw pslldq psrldq psubq punpckhqdq punpcklqdq addpd addsd andnpd andpd cmpeqpd cmpeqsd cmplepd cmplesd cmpltpd cmpltsd cmpneqpd cmpneqsd cmpnlepd cmpnlesd cmpnltpd cmpnltsd cmpordpd cmpordsd cmpunordpd cmpunordsd cmppd comisd cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi cvtpd2ps cvtpi2pd cvtps2dq cvtps2pd cvtsd2si cvtsd2ss cvtsi2sd cvtss2sd cvttpd2pi cvttpd2dq cvttps2dq cvttsd2si divpd divsd maxpd maxsd minpd minsd movapd movhpd movlpd movmskpd movupd mulpd mulsd orpd shufpd sqrtpd sqrtsd subpd subsd ucomisd unpckhpd unpcklpd xorpd addsubpd addsubps haddpd haddps hsubpd hsubps lddqu movddup movshdup movsldup clgi stgi vmcall vmclear vmfunc vmlaunch vmload vmmcall vmptrld vmptrst vmread vmresume vmrun vmsave vmwrite vmxoff vmxon invept invvpid pabsb pabsw pabsd palignr phaddw phaddd phaddsw phsubw phsubd phsubsw pmaddubsw pmulhrsw pshufb psignb psignw psignd extrq insertq movntsd movntss lzcnt blendpd blendps blendvpd blendvps dppd dpps extractps insertps movntdqa mpsadbw packusdw pblendvb pblendw pcmpeqq pextrb pextrd pextrq phminposuw pinsrb pinsrd pinsrq pmaxsb pmaxsd pmaxud pmaxuw pminsb pminsd pminud pminuw pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq pmuldq pmulld ptest roundpd roundps roundsd roundss crc32 pcmpestri pcmpestrm pcmpistri pcmpistrm pcmpgtq popcnt getsec pfrcpv pfrsqrtv movbe aesenc aesenclast aesdec aesdeclast aesimc aeskeygenassist vaesenc vaesenclast vaesdec vaesdeclast vaesimc vaeskeygenassist vaddpd vaddps vaddsd vaddss vaddsubpd vaddsubps vandpd vandps vandnpd vandnps vblendpd vblendps vblendvpd vblendvps vbroadcastss vbroadcastsd vbroadcastf128 vcmpeq_ospd vcmpeqpd vcmplt_ospd vcmpltpd vcmple_ospd vcmplepd vcmpunord_qpd vcmpunordpd vcmpneq_uqpd vcmpneqpd vcmpnlt_uspd vcmpnltpd vcmpnle_uspd vcmpnlepd vcmpord_qpd vcmpordpd vcmpeq_uqpd vcmpnge_uspd vcmpngepd vcmpngt_uspd vcmpngtpd vcmpfalse_oqpd vcmpfalsepd vcmpneq_oqpd vcmpge_ospd vcmpgepd vcmpgt_ospd vcmpgtpd vcmptrue_uqpd vcmptruepd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd vcmppd vcmpeq_osps vcmpeqps vcmplt_osps vcmpltps vcmple_osps vcmpleps vcmpunord_qps vcmpunordps vcmpneq_uqps vcmpneqps vcmpnlt_usps vcmpnltps vcmpnle_usps vcmpnleps vcmpord_qps vcmpordps vcmpeq_uqps vcmpnge_usps vcmpngeps vcmpngt_usps vcmpngtps vcmpfalse_oqps vcmpfalseps vcmpneq_oqps vcmpge_osps vcmpgeps vcmpgt_osps vcmpgtps vcmptrue_uqps vcmptrueps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps vcmpps vcmpeq_ossd vcmpeqsd vcmplt_ossd vcmpltsd vcmple_ossd vcmplesd vcmpunord_qsd vcmpunordsd vcmpneq_uqsd vcmpneqsd vcmpnlt_ussd vcmpnltsd vcmpnle_ussd vcmpnlesd vcmpord_qsd vcmpordsd vcmpeq_uqsd vcmpnge_ussd vcmpngesd vcmpngt_ussd vcmpngtsd vcmpfalse_oqsd vcmpfalsesd vcmpneq_oqsd vcmpge_ossd vcmpgesd vcmpgt_ossd vcmpgtsd vcmptrue_uqsd vcmptruesd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd vcmpsd vcmpeq_osss vcmpeqss vcmplt_osss vcmpltss vcmple_osss vcmpless vcmpunord_qss vcmpunordss vcmpneq_uqss vcmpneqss vcmpnlt_usss vcmpnltss vcmpnle_usss vcmpnless vcmpord_qss vcmpordss vcmpeq_uqss vcmpnge_usss vcmpngess vcmpngt_usss vcmpngtss vcmpfalse_oqss vcmpfalsess vcmpneq_oqss vcmpge_osss vcmpgess vcmpgt_osss vcmpgtss vcmptrue_uqss vcmptruess vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss vcmpss vcomisd vcomiss vcvtdq2pd vcvtdq2ps vcvtpd2dq vcvtpd2ps vcvtps2dq vcvtps2pd vcvtsd2si vcvtsd2ss vcvtsi2sd vcvtsi2ss vcvtss2sd vcvtss2si vcvttpd2dq vcvttps2dq vcvttsd2si vcvttss2si vdivpd vdivps vdivsd vdivss vdppd vdpps vextractf128 vextractps vhaddpd vhaddps vhsubpd vhsubps vinsertf128 vinsertps vlddqu vldqqu vldmxcsr vmaskmovdqu vmaskmovps vmaskmovpd vmaxpd vmaxps vmaxsd vmaxss vminpd vminps vminsd vminss vmovapd vmovaps vmovd vmovq vmovddup vmovdqa vmovqqa vmovdqu vmovqqu vmovhlps vmovhpd vmovhps vmovlhps vmovlpd vmovlps vmovmskpd vmovmskps vmovntdq vmovntqq vmovntdqa vmovntpd vmovntps vmovsd vmovshdup vmovsldup vmovss vmovupd vmovups vmpsadbw vmulpd vmulps vmulsd vmulss vorpd vorps vpabsb vpabsw vpabsd vpacksswb vpackssdw vpackuswb vpackusdw vpaddb vpaddw vpaddd vpaddq vpaddsb vpaddsw vpaddusb vpaddusw vpalignr vpand vpandn vpavgb vpavgw vpblendvb vpblendw vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq vpermilpd vpermilps vperm2f128 vpextrb vpextrw vpextrd vpextrq vphaddw vphaddd vphaddsw vphminposuw vphsubw vphsubd vphsubsw vpinsrb vpinsrw vpinsrd vpinsrq vpmaddwd vpmaddubsw vpmaxsb vpmaxsw vpmaxsd vpmaxub vpmaxuw vpmaxud vpminsb vpminsw vpminsd vpminub vpminuw vpminud vpmovmskb vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq vpmulhuw vpmulhrsw vpmulhw vpmullw vpmulld vpmuludq vpmuldq vpor vpsadbw vpshufb vpshufd vpshufhw vpshuflw vpsignb vpsignw vpsignd vpslldq vpsrldq vpsllw vpslld vpsllq vpsraw vpsrad vpsrlw vpsrld vpsrlq vptest vpsubb vpsubw vpsubd vpsubq vpsubsb vpsubsw vpsubusb vpsubusw vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq vpxor vrcpps vrcpss vrsqrtps vrsqrtss vroundpd vroundps vroundsd vroundss vshufpd vshufps vsqrtpd vsqrtps vsqrtsd vsqrtss vstmxcsr vsubpd vsubps vsubsd vsubss vtestps vtestpd vucomisd vucomiss vunpckhpd vunpckhps vunpcklpd vunpcklps vxorpd vxorps vzeroall vzeroupper pclmullqlqdq pclmulhqlqdq pclmullqhqdq pclmulhqhqdq pclmulqdq vpclmullqlqdq vpclmulhqlqdq vpclmullqhqdq vpclmulhqhqdq vpclmulqdq vfmadd132ps vfmadd132pd vfmadd312ps vfmadd312pd vfmadd213ps vfmadd213pd vfmadd123ps vfmadd123pd vfmadd231ps vfmadd231pd vfmadd321ps vfmadd321pd vfmaddsub132ps vfmaddsub132pd vfmaddsub312ps vfmaddsub312pd vfmaddsub213ps vfmaddsub213pd vfmaddsub123ps vfmaddsub123pd vfmaddsub231ps vfmaddsub231pd vfmaddsub321ps vfmaddsub321pd vfmsub132ps vfmsub132pd vfmsub312ps vfmsub312pd vfmsub213ps vfmsub213pd vfmsub123ps vfmsub123pd vfmsub231ps vfmsub231pd vfmsub321ps vfmsub321pd vfmsubadd132ps vfmsubadd132pd vfmsubadd312ps vfmsubadd312pd vfmsubadd213ps vfmsubadd213pd vfmsubadd123ps vfmsubadd123pd vfmsubadd231ps vfmsubadd231pd vfmsubadd321ps vfmsubadd321pd vfnmadd132ps vfnmadd132pd vfnmadd312ps vfnmadd312pd vfnmadd213ps vfnmadd213pd vfnmadd123ps vfnmadd123pd vfnmadd231ps vfnmadd231pd vfnmadd321ps vfnmadd321pd vfnmsub132ps vfnmsub132pd vfnmsub312ps vfnmsub312pd vfnmsub213ps vfnmsub213pd vfnmsub123ps vfnmsub123pd vfnmsub231ps vfnmsub231pd vfnmsub321ps vfnmsub321pd vfmadd132ss vfmadd132sd vfmadd312ss vfmadd312sd vfmadd213ss vfmadd213sd vfmadd123ss vfmadd123sd vfmadd231ss vfmadd231sd vfmadd321ss vfmadd321sd vfmsub132ss vfmsub132sd vfmsub312ss vfmsub312sd vfmsub213ss vfmsub213sd vfmsub123ss vfmsub123sd vfmsub231ss vfmsub231sd vfmsub321ss vfmsub321sd vfnmadd132ss vfnmadd132sd vfnmadd312ss vfnmadd312sd vfnmadd213ss vfnmadd213sd vfnmadd123ss vfnmadd123sd vfnmadd231ss vfnmadd231sd vfnmadd321ss vfnmadd321sd vfnmsub132ss vfnmsub132sd vfnmsub312ss vfnmsub312sd vfnmsub213ss vfnmsub213sd vfnmsub123ss vfnmsub123sd vfnmsub231ss vfnmsub231sd vfnmsub321ss vfnmsub321sd rdfsbase rdgsbase rdrand wrfsbase wrgsbase vcvtph2ps vcvtps2ph adcx adox rdseed clac stac xstore xcryptecb xcryptcbc xcryptctr xcryptcfb xcryptofb montmul xsha1 xsha256 llwpcb slwpcb lwpval lwpins vfmaddpd vfmaddps vfmaddsd vfmaddss vfmaddsubpd vfmaddsubps vfmsubaddpd vfmsubaddps vfmsubpd vfmsubps vfmsubsd vfmsubss vfnmaddpd vfnmaddps vfnmaddsd vfnmaddss vfnmsubpd vfnmsubps vfnmsubsd vfnmsubss vfrczpd vfrczps vfrczsd vfrczss vpcmov vpcomb vpcomd vpcomq vpcomub vpcomud vpcomuq vpcomuw vpcomw vphaddbd vphaddbq vphaddbw vphadddq vphaddubd vphaddubq vphaddubw vphaddudq vphadduwd vphadduwq vphaddwd vphaddwq vphsubbw vphsubdq vphsubwd vpmacsdd vpmacsdqh vpmacsdql vpmacssdd vpmacssdqh vpmacssdql vpmacsswd vpmacssww vpmacswd vpmacsww vpmadcsswd vpmadcswd vpperm vprotb vprotd vprotq vprotw vpshab vpshad vpshaq vpshaw vpshlb vpshld vpshlq vpshlw vbroadcasti128 vpblendd vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq vpermd vpermpd vpermps vpermq vperm2i128 vextracti128 vinserti128 vpmaskmovd vpmaskmovq vpsllvd vpsllvq vpsravd vpsrlvd vpsrlvq vgatherdpd vgatherqpd vgatherdps vgatherqps vpgatherdd vpgatherqd vpgatherdq vpgatherqq xabort xbegin xend xtest andn bextr blci blcic blsi blsic blcfill blsfill blcmsk blsmsk blsr blcs bzhi mulx pdep pext rorx sarx shlx shrx tzcnt tzmsk t1mskc valignd valignq vblendmpd vblendmps vbroadcastf32x4 vbroadcastf64x4 vbroadcasti32x4 vbroadcasti64x4 vcompresspd vcompressps vcvtpd2udq vcvtps2udq vcvtsd2usi vcvtss2usi vcvttpd2udq vcvttps2udq vcvttsd2usi vcvttss2usi vcvtudq2pd vcvtudq2ps vcvtusi2sd vcvtusi2ss vexpandpd vexpandps vextractf32x4 vextractf64x4 vextracti32x4 vextracti64x4 vfixupimmpd vfixupimmps vfixupimmsd vfixupimmss vgetexppd vgetexpps vgetexpsd vgetexpss vgetmantpd vgetmantps vgetmantsd vgetmantss vinsertf32x4 vinsertf64x4 vinserti32x4 vinserti64x4 vmovdqa32 vmovdqa64 vmovdqu32 vmovdqu64 vpabsq vpandd vpandnd vpandnq vpandq vpblendmd vpblendmq vpcmpltd vpcmpled vpcmpneqd vpcmpnltd vpcmpnled vpcmpd vpcmpltq vpcmpleq vpcmpneqq vpcmpnltq vpcmpnleq vpcmpq vpcmpequd vpcmpltud vpcmpleud vpcmpnequd vpcmpnltud vpcmpnleud vpcmpud vpcmpequq vpcmpltuq vpcmpleuq vpcmpnequq vpcmpnltuq vpcmpnleuq vpcmpuq vpcompressd vpcompressq vpermi2d vpermi2pd vpermi2ps vpermi2q vpermt2d vpermt2pd vpermt2ps vpermt2q vpexpandd vpexpandq vpmaxsq vpmaxuq vpminsq vpminuq vpmovdb vpmovdw vpmovqb vpmovqd vpmovqw vpmovsdb vpmovsdw vpmovsqb vpmovsqd vpmovsqw vpmovusdb vpmovusdw vpmovusqb vpmovusqd vpmovusqw vpord vporq vprold vprolq vprolvd vprolvq vprord vprorq vprorvd vprorvq vpscatterdd vpscatterdq vpscatterqd vpscatterqq vpsraq vpsravq vpternlogd vpternlogq vptestmd vptestmq vptestnmd vptestnmq vpxord vpxorq vrcp14pd vrcp14ps vrcp14sd vrcp14ss vrndscalepd vrndscaleps vrndscalesd vrndscaless vrsqrt14pd vrsqrt14ps vrsqrt14sd vrsqrt14ss vscalefpd vscalefps vscalefsd vscalefss vscatterdpd vscatterdps vscatterqpd vscatterqps vshuff32x4 vshuff64x2 vshufi32x4 vshufi64x2 kandnw kandw kmovw knotw kortestw korw kshiftlw kshiftrw kunpckbw kxnorw kxorw vpbroadcastmb2q vpbroadcastmw2d vpconflictd vpconflictq vplzcntd vplzcntq vexp2pd vexp2ps vrcp28pd vrcp28ps vrcp28sd vrcp28ss vrsqrt28pd vrsqrt28ps vrsqrt28sd vrsqrt28ss vgatherpf0dpd vgatherpf0dps vgatherpf0qpd vgatherpf0qps vgatherpf1dpd vgatherpf1dps vgatherpf1qpd vgatherpf1qps vscatterpf0dpd vscatterpf0dps vscatterpf0qpd vscatterpf0qps vscatterpf1dpd vscatterpf1dps vscatterpf1qpd vscatterpf1qps prefetchwt1 bndmk bndcl bndcu bndcn bndmov bndldx bndstx sha1rnds4 sha1nexte sha1msg1 sha1msg2 sha256rnds2 sha256msg1 sha256msg2 hint_nop0 hint_nop1 hint_nop2 hint_nop3 hint_nop4 hint_nop5 hint_nop6 hint_nop7 hint_nop8 hint_nop9 hint_nop10 hint_nop11 hint_nop12 hint_nop13 hint_nop14 hint_nop15 hint_nop16 hint_nop17 hint_nop18 hint_nop19 hint_nop20 hint_nop21 hint_nop22 hint_nop23 hint_nop24 hint_nop25 hint_nop26 hint_nop27 hint_nop28 hint_nop29 hint_nop30 hint_nop31 hint_nop32 hint_nop33 hint_nop34 hint_nop35 hint_nop36 hint_nop37 hint_nop38 hint_nop39 hint_nop40 hint_nop41 hint_nop42 hint_nop43 hint_nop44 hint_nop45 hint_nop46 hint_nop47 hint_nop48 hint_nop49 hint_nop50 hint_nop51 hint_nop52 hint_nop53 hint_nop54 hint_nop55 hint_nop56 hint_nop57 hint_nop58 hint_nop59 hint_nop60 hint_nop61 hint_nop62 hint_nop63",built_in:"ip eip rip al ah bl bh cl ch dl dh sil dil bpl spl r8b r9b r10b r11b r12b r13b r14b r15b ax bx cx dx si di bp sp r8w r9w r10w r11w r12w r13w r14w r15w eax ebx ecx edx esi edi ebp esp eip r8d r9d r10d r11d r12d r13d r14d r15d rax rbx rcx rdx rsi rdi rbp rsp r8 r9 r10 r11 r12 r13 r14 r15 cs ds es fs gs ss st st0 st1 st2 st3 st4 st5 st6 st7 mm0 mm1 mm2 mm3 mm4 mm5 mm6 mm7 xmm0  xmm1  xmm2  xmm3  xmm4  xmm5  xmm6  xmm7  xmm8  xmm9 xmm10  xmm11 xmm12 xmm13 xmm14 xmm15 xmm16 xmm17 xmm18 xmm19 xmm20 xmm21 xmm22 xmm23 xmm24 xmm25 xmm26 xmm27 xmm28 xmm29 xmm30 xmm31 ymm0  ymm1  ymm2  ymm3  ymm4  ymm5  ymm6  ymm7  ymm8  ymm9 ymm10  ymm11 ymm12 ymm13 ymm14 ymm15 ymm16 ymm17 ymm18 ymm19 ymm20 ymm21 ymm22 ymm23 ymm24 ymm25 ymm26 ymm27 ymm28 ymm29 ymm30 ymm31 zmm0  zmm1  zmm2  zmm3  zmm4  zmm5  zmm6  zmm7  zmm8  zmm9 zmm10  zmm11 zmm12 zmm13 zmm14 zmm15 zmm16 zmm17 zmm18 zmm19 zmm20 zmm21 zmm22 zmm23 zmm24 zmm25 zmm26 zmm27 zmm28 zmm29 zmm30 zmm31 k0 k1 k2 k3 k4 k5 k6 k7 bnd0 bnd1 bnd2 bnd3 cr0 cr1 cr2 cr3 cr4 cr8 dr0 dr1 dr2 dr3 dr8 tr3 tr4 tr5 tr6 tr7 r0 r1 r2 r3 r4 r5 r6 r7 r0b r1b r2b r3b r4b r5b r6b r7b r0w r1w r2w r3w r4w r5w r6w r7w r0d r1d r2d r3d r4d r5d r6d r7d r0h r1h r2h r3h r0l r1l r2l r3l r4l r5l r6l r7l r8l r9l r10l r11l r12l r13l r14l r15l db dw dd dq dt ddq do dy dz resb resw resd resq rest resdq reso resy resz incbin equ times byte word dword qword nosplit rel abs seg wrt strict near far a32 ptr",meta:"%define %xdefine %+ %undef %defstr %deftok %assign %strcat %strlen %substr %rotate %elif %else %endif %if %ifmacro %ifctx %ifidn %ifidni %ifid %ifnum %ifstr %iftoken %ifempty %ifenv %error %warning %fatal %rep %endrep %include %push %pop %repl %pathsearch %depend %use %arg %stacksize %local %line %comment %endcomment .nolist __FILE__ __LINE__ __SECT__  __BITS__ __OUTPUT_FORMAT__ __DATE__ __TIME__ __DATE_NUM__ __TIME_NUM__ __UTC_DATE__ __UTC_TIME__ __UTC_DATE_NUM__ __UTC_TIME_NUM__  __PASS__ struc endstruc istruc at iend align alignb sectalign daz nodaz up down zero default option assume public bits use16 use32 use64 default section segment absolute extern global common cpu float __utf16__ __utf16le__ __utf16be__ __utf32__ __utf32le__ __utf32be__ __float8__ __float16__ __float32__ __float64__ __float80m__ __float80e__ __float128l__ __float128h__ __Infinity__ __QNaN__ __SNaN__ Inf NaN QNaN SNaN float8 float16 float32 float64 float80m float80e float128l float128h __FLOAT_DAZ__ __FLOAT_ROUND__ __FLOAT__"},contains:[s.COMMENT(";","$",{relevance:0}),{className:"number",variants:[{begin:"\\b(?:([0-9][0-9_]*)?\\.[0-9_]*(?:[eE][+-]?[0-9_]+)?|(0[Xx])?[0-9][0-9_]*\\.?[0-9_]*(?:[pP](?:[+-]?[0-9_]+)?)?)\\b",relevance:0},{begin:"\\$[0-9][0-9A-Fa-f]*",relevance:0},{begin:"\\b(?:[0-9A-Fa-f][0-9A-Fa-f_]*[Hh]|[0-9][0-9_]*[DdTt]?|[0-7][0-7_]*[QqOo]|[0-1][0-1_]*[BbYy])\\b"},{begin:"\\b(?:0[Xx][0-9A-Fa-f_]+|0[DdTt][0-9_]+|0[QqOo][0-7_]+|0[BbYy][0-1_]+)\\b"}]},s.QUOTE_STRING_MODE,{className:"string",variants:[{begin:"'",end:"[^\\\\]'"},{begin:"`",end:"[^\\\\]`"}],relevance:0},{className:"symbol",variants:[{begin:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)"},{begin:"^\\s*%%[A-Za-z0-9_$#@~.?]*:"}],relevance:0},{className:"subst",begin:"%[0-9]+",relevance:0},{className:"subst",begin:"%!S+",relevance:0},{className:"meta",begin:/^\s*\.[\w_-]+/}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/xl.min.js b/vendor/assets/javascripts/highlightjs/languages/xl.min.js
index d08b3853a9..2eb49c06ee 100644
--- a/vendor/assets/javascripts/highlightjs/languages/xl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/xl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("xl",function(e){var t="ObjectLoader Animate MovieCredits Slides Filters Shading Materials LensFlare Mapping VLCAudioVideo StereoDecoder PointCloud NetworkAccess RemoteControl RegExp ChromaKey Snowfall NodeJS Speech Charts",o={keyword:"if then else do while until for loop import with is as where when by data constant integer real text name boolean symbol infix prefix postfix block tree",literal:"true false nil",built_in:"in mod rem and or xor not abs sign floor ceil sqrt sin cos tan asin acos atan exp expm1 log log2 log10 log1p pi at text_length text_range text_find text_replace contains page slide basic_slide title_slide title subtitle fade_in fade_out fade_at clear_color color line_color line_width texture_wrap texture_transform texture scale_?x scale_?y scale_?z? translate_?x translate_?y translate_?z? rotate_?x rotate_?y rotate_?z? rectangle circle ellipse sphere path line_to move_to quad_to curve_to theme background contents locally time mouse_?x mouse_?y mouse_buttons "+t},a={cN:"string",b:'"',e:'"',i:"\\n"},r={cN:"string",b:"'",e:"'",i:"\\n"},i={cN:"string",b:"<<",e:">>"},l={cN:"number",b:"[0-9]+#[0-9A-Z_]+(\\.[0-9-A-Z_]+)?#?([Ee][+-]?[0-9]+)?"},n={bK:"import",e:"$",k:o,c:[a]},s={cN:"function",b:/[a-z][^\n]*->/,rB:!0,e:/->/,c:[e.inherit(e.TM,{starts:{eW:!0,k:o}})]};return{aliases:["tao"],l:/[a-zA-Z][a-zA-Z0-9_?]*/,k:o,c:[e.CLCM,e.CBCM,a,r,i,s,n,l,e.NM]}});
\ No newline at end of file
+hljs.registerLanguage("xl",function(){"use strict";return function(e){var t={$pattern:/[a-zA-Z][a-zA-Z0-9_?]*/,keyword:"if then else do while until for loop import with is as where when by data constant integer real text name boolean symbol infix prefix postfix block tree",literal:"true false nil",built_in:"in mod rem and or xor not abs sign floor ceil sqrt sin cos tan asin acos atan exp expm1 log log2 log10 log1p pi at text_length text_range text_find text_replace contains page slide basic_slide title_slide title subtitle fade_in fade_out fade_at clear_color color line_color line_width texture_wrap texture_transform texture scale_?x scale_?y scale_?z? translate_?x translate_?y translate_?z? rotate_?x rotate_?y rotate_?z? rectangle circle ellipse sphere path line_to move_to quad_to curve_to theme background contents locally time mouse_?x mouse_?y mouse_buttons ObjectLoader Animate MovieCredits Slides Filters Shading Materials LensFlare Mapping VLCAudioVideo StereoDecoder PointCloud NetworkAccess RemoteControl RegExp ChromaKey Snowfall NodeJS Speech Charts"},a={className:"string",begin:'"',end:'"',illegal:"\\n"},n={beginKeywords:"import",end:"$",keywords:t,contains:[a]},o={className:"function",begin:/[a-z][^\n]*->/,returnBegin:!0,end:/->/,contains:[e.inherit(e.TITLE_MODE,{starts:{endsWithParent:!0,keywords:t}})]};return{name:"XL",aliases:["tao"],keywords:t,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,{className:"string",begin:"'",end:"'",illegal:"\\n"},{className:"string",begin:"<<",end:">>"},o,n,{className:"number",begin:"[0-9]+#[0-9A-Z_]+(\\.[0-9-A-Z_]+)?#?([Ee][+-]?[0-9]+)?"},e.NUMBER_MODE]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/xml.min.js b/vendor/assets/javascripts/highlightjs/languages/xml.min.js
index 51a8e8a8fc..abe4a6d0a5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/xml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/xml.min.js
@@ -1 +1 @@
-hljs.registerLanguage("xml",function(s){var e="[A-Za-z0-9\\._:-]+",t={eW:!0,i:/</,r:0,c:[{cN:"attr",b:e,r:0},{b:/=\s*/,r:0,c:[{cN:"string",endsParent:!0,v:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/[^\s"'=<>`]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist"],cI:!0,c:[{cN:"meta",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},s.C("<!--","-->",{r:10}),{b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"meta",b:/<\?xml/,e:/\?>/,r:10},{b:/<\?(php)?/,e:/\?>/,sL:"php",c:[{b:"/\\*",e:"\\*/",skip:!0},{b:'b"',e:'"',skip:!0},{b:"b'",e:"'",skip:!0},s.inherit(s.ASM,{i:null,cN:null,c:null,skip:!0}),s.inherit(s.QSM,{i:null,cN:null,c:null,skip:!0})]},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{name:"style"},c:[t],starts:{e:"</style>",rE:!0,sL:["css","xml"]}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{name:"script"},c:[t],starts:{e:"</script>",rE:!0,sL:["actionscript","javascript","handlebars","xml"]}},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"name",b:/[^\/><\s]+/,r:0},t]}]}});
\ No newline at end of file
+hljs.registerLanguage("xml",function(){"use strict";return function(e){var n={className:"symbol",begin:"&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;"},a={begin:"\\s",contains:[{className:"meta-keyword",begin:"#?[a-z_][a-z1-9_-]+",illegal:"\\n"}]},s=e.inherit(a,{begin:"\\(",end:"\\)"}),t=e.inherit(e.APOS_STRING_MODE,{className:"meta-string"}),i=e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),c={endsWithParent:!0,illegal:/</,relevance:0,contains:[{className:"attr",begin:"[A-Za-z0-9\\._:-]+",relevance:0},{begin:/=\s*/,relevance:0,contains:[{className:"string",endsParent:!0,variants:[{begin:/"/,end:/"/,contains:[n]},{begin:/'/,end:/'/,contains:[n]},{begin:/[^\s"'=<>`]+/}]}]}]};return{name:"HTML, XML",aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist","wsf","svg"],case_insensitive:!0,contains:[{className:"meta",begin:"<![a-z]",end:">",relevance:10,contains:[a,i,t,s,{begin:"\\[",end:"\\]",contains:[{className:"meta",begin:"<![a-z]",end:">",contains:[a,s,i,t]}]}]},e.COMMENT("\x3c!--","--\x3e",{relevance:10}),{begin:"<\\!\\[CDATA\\[",end:"\\]\\]>",relevance:10},n,{className:"meta",begin:/<\?xml/,end:/\?>/,relevance:10},{className:"tag",begin:"<style(?=\\s|>)",end:">",keywords:{name:"style"},contains:[c],starts:{end:"</style>",returnEnd:!0,subLanguage:["css","xml"]}},{className:"tag",begin:"<script(?=\\s|>)",end:">",keywords:{name:"script"},contains:[c],starts:{end:"<\/script>",returnEnd:!0,subLanguage:["javascript","handlebars","xml"]}},{className:"tag",begin:"</?",end:"/?>",contains:[{className:"name",begin:/[^\/><\s]+/,relevance:0},c]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/xquery.min.js b/vendor/assets/javascripts/highlightjs/languages/xquery.min.js
index 59e4a3e2cc..26e65d2a46 100644
--- a/vendor/assets/javascripts/highlightjs/languages/xquery.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/xquery.min.js
@@ -1 +1 @@
-hljs.registerLanguage("xquery",function(e){var t="module schema namespace boundary-space preserve no-preserve strip default collation base-uri ordering context decimal-format decimal-separator copy-namespaces empty-sequence except exponent-separator external grouping-separator inherit no-inherit lax minus-sign per-mille percent schema-attribute schema-element strict unordered zero-digit declare import option function validate variable for at in let where order group by return if then else tumbling sliding window start when only end previous next stable ascending descending allowing empty greatest least some every satisfies switch case typeswitch try catch and or to union intersect instance of treat as castable cast map array delete insert into replace value rename copy modify update",a="item document-node node attribute document element comment namespace namespace-node processing-instruction text construction xs:anyAtomicType xs:untypedAtomic xs:duration xs:time xs:decimal xs:float xs:double xs:gYearMonth xs:gYear xs:gMonthDay xs:gMonth xs:gDay xs:boolean xs:base64Binary xs:hexBinary xs:anyURI xs:QName xs:NOTATION xs:dateTime xs:dateTimeStamp xs:date xs:string xs:normalizedString xs:token xs:language xs:NMTOKEN xs:Name xs:NCName xs:ID xs:IDREF xs:ENTITY xs:integer xs:nonPositiveInteger xs:negativeInteger xs:long xs:int xs:short xs:byte xs:nonNegativeInteger xs:unisignedLong xs:unsignedInt xs:unsignedShort xs:unsignedByte xs:positiveInteger xs:yearMonthDuration xs:dayTimeDuration",n="eq ne lt le gt ge is self:: child:: descendant:: descendant-or-self:: attribute:: following:: following-sibling:: parent:: ancestor:: ancestor-or-self:: preceding:: preceding-sibling:: NaN",r={cN:"built_in",v:[{b:/\barray\:/,e:/(?:append|filter|flatten|fold\-(?:left|right)|for-each(?:\-pair)?|get|head|insert\-before|join|put|remove|reverse|size|sort|subarray|tail)\b/},{b:/\bmap\:/,e:/(?:contains|entry|find|for\-each|get|keys|merge|put|remove|size)\b/},{b:/\bmath\:/,e:/(?:a(?:cos|sin|tan[2]?)|cos|exp(?:10)?|log(?:10)?|pi|pow|sin|sqrt|tan)\b/},{b:/\bop\:/,e:/\(/,eE:!0},{b:/\bfn\:/,e:/\(/,eE:!0},{b:/[^<\/\$\:'"-]\b(?:abs|accumulator\-(?:after|before)|adjust\-(?:date(?:Time)?|time)\-to\-timezone|analyze\-string|apply|available\-(?:environment\-variables|system\-properties)|avg|base\-uri|boolean|ceiling|codepoints?\-(?:equal|to\-string)|collation\-key|collection|compare|concat|contains(?:\-token)?|copy\-of|count|current(?:\-)?(?:date(?:Time)?|time|group(?:ing\-key)?|output\-uri|merge\-(?:group|key))?data|dateTime|days?\-from\-(?:date(?:Time)?|duration)|deep\-equal|default\-(?:collation|language)|distinct\-values|document(?:\-uri)?|doc(?:\-available)?|element\-(?:available|with\-id)|empty|encode\-for\-uri|ends\-with|environment\-variable|error|escape\-html\-uri|exactly\-one|exists|false|filter|floor|fold\-(?:left|right)|for\-each(?:\-pair)?|format\-(?:date(?:Time)?|time|integer|number)|function\-(?:arity|available|lookup|name)|generate\-id|has\-children|head|hours\-from\-(?:dateTime|duration|time)|id(?:ref)?|implicit\-timezone|in\-scope\-prefixes|index\-of|innermost|insert\-before|iri\-to\-uri|json\-(?:doc|to\-xml)|key|lang|last|load\-xquery\-module|local\-name(?:\-from\-QName)?|(?:lower|upper)\-case|matches|max|minutes\-from\-(?:dateTime|duration|time)|min|months?\-from\-(?:date(?:Time)?|duration)|name(?:space\-uri\-?(?:for\-prefix|from\-QName)?)?|nilled|node\-name|normalize\-(?:space|unicode)|not|number|one\-or\-more|outermost|parse\-(?:ietf\-date|json)|path|position|(?:prefix\-from\-)?QName|random\-number\-generator|regex\-group|remove|replace|resolve\-(?:QName|uri)|reverse|root|round(?:\-half\-to\-even)?|seconds\-from\-(?:dateTime|duration|time)|snapshot|sort|starts\-with|static\-base\-uri|stream\-available|string\-?(?:join|length|to\-codepoints)?|subsequence|substring\-?(?:after|before)?|sum|system\-property|tail|timezone\-from\-(?:date(?:Time)?|time)|tokenize|trace|trans(?:form|late)|true|type\-available|unordered|unparsed\-(?:entity|text)?\-?(?:public\-id|uri|available|lines)?|uri\-collection|xml\-to\-json|years?\-from\-(?:date(?:Time)?|duration)|zero\-or\-one)\b/},{b:/\blocal\:/,e:/\(/,eE:!0},{b:/\bzip\:/,e:/(?:zip\-file|(?:xml|html|text|binary)\-entry| (?:update\-)?entries)\b/},{b:/\b(?:util|db|functx|app|xdmp|xmldb)\:/,e:/\(/,eE:!0}]},i={cN:"title",b:/\bxquery version "[13]\.[01]"\s?(?:encoding ".+")?/,e:/;/},o={cN:"variable",b:/[\$][\w-:]+/},s={cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},l={cN:"string",v:[{b:/"/,e:/"/,c:[{b:/""/,r:0}]},{b:/'/,e:/'/,c:[{b:/''/,r:0}]}]},m={cN:"meta",b:/%[\w-:]+/},c={cN:"comment",b:"\\(:",e:":\\)",r:10,c:[{cN:"doctag",b:"@\\w+"}]},d={bK:"element attribute comment document processing-instruction",e:"{",eE:!0},u={b:/<([\w\._:\-]+)((\s*.*)=('|").*('|"))?>/,e:/(\/[\w\._:\-]+>)/,sL:"xml",c:[{b:"{",e:"}",sL:"xquery"},"self"]},p=[o,r,l,s,c,m,i,d,u];return{aliases:["xpath","xq"],cI:!1,l:/[a-zA-Z\$][a-zA-Z0-9_:\-]*/,i:/(proc)|(abstract)|(extends)|(until)|(#)/,k:{keyword:t,type:a,literal:n},c:p}});
\ No newline at end of file
+hljs.registerLanguage("xquery",function(){"use strict";return function(e){return{name:"XQuery",aliases:["xpath","xq"],case_insensitive:!1,illegal:/(proc)|(abstract)|(extends)|(until)|(#)/,keywords:{$pattern:/[a-zA-Z\$][a-zA-Z0-9_:\-]*/,keyword:"module schema namespace boundary-space preserve no-preserve strip default collation base-uri ordering context decimal-format decimal-separator copy-namespaces empty-sequence except exponent-separator external grouping-separator inherit no-inherit lax minus-sign per-mille percent schema-attribute schema-element strict unordered zero-digit declare import option function validate variable for at in let where order group by return if then else tumbling sliding window start when only end previous next stable ascending descending allowing empty greatest least some every satisfies switch case typeswitch try catch and or to union intersect instance of treat as castable cast map array delete insert into replace value rename copy modify update",type:"item document-node node attribute document element comment namespace namespace-node processing-instruction text construction xs:anyAtomicType xs:untypedAtomic xs:duration xs:time xs:decimal xs:float xs:double xs:gYearMonth xs:gYear xs:gMonthDay xs:gMonth xs:gDay xs:boolean xs:base64Binary xs:hexBinary xs:anyURI xs:QName xs:NOTATION xs:dateTime xs:dateTimeStamp xs:date xs:string xs:normalizedString xs:token xs:language xs:NMTOKEN xs:Name xs:NCName xs:ID xs:IDREF xs:ENTITY xs:integer xs:nonPositiveInteger xs:negativeInteger xs:long xs:int xs:short xs:byte xs:nonNegativeInteger xs:unisignedLong xs:unsignedInt xs:unsignedShort xs:unsignedByte xs:positiveInteger xs:yearMonthDuration xs:dayTimeDuration",literal:"eq ne lt le gt ge is self:: child:: descendant:: descendant-or-self:: attribute:: following:: following-sibling:: parent:: ancestor:: ancestor-or-self:: preceding:: preceding-sibling:: NaN"},contains:[{className:"variable",begin:/[\$][\w-:]+/},{className:"built_in",variants:[{begin:/\barray\:/,end:/(?:append|filter|flatten|fold\-(?:left|right)|for-each(?:\-pair)?|get|head|insert\-before|join|put|remove|reverse|size|sort|subarray|tail)\b/},{begin:/\bmap\:/,end:/(?:contains|entry|find|for\-each|get|keys|merge|put|remove|size)\b/},{begin:/\bmath\:/,end:/(?:a(?:cos|sin|tan[2]?)|cos|exp(?:10)?|log(?:10)?|pi|pow|sin|sqrt|tan)\b/},{begin:/\bop\:/,end:/\(/,excludeEnd:!0},{begin:/\bfn\:/,end:/\(/,excludeEnd:!0},{begin:/[^<\/\$\:'"-]\b(?:abs|accumulator\-(?:after|before)|adjust\-(?:date(?:Time)?|time)\-to\-timezone|analyze\-string|apply|available\-(?:environment\-variables|system\-properties)|avg|base\-uri|boolean|ceiling|codepoints?\-(?:equal|to\-string)|collation\-key|collection|compare|concat|contains(?:\-token)?|copy\-of|count|current(?:\-)?(?:date(?:Time)?|time|group(?:ing\-key)?|output\-uri|merge\-(?:group|key))?data|dateTime|days?\-from\-(?:date(?:Time)?|duration)|deep\-equal|default\-(?:collation|language)|distinct\-values|document(?:\-uri)?|doc(?:\-available)?|element\-(?:available|with\-id)|empty|encode\-for\-uri|ends\-with|environment\-variable|error|escape\-html\-uri|exactly\-one|exists|false|filter|floor|fold\-(?:left|right)|for\-each(?:\-pair)?|format\-(?:date(?:Time)?|time|integer|number)|function\-(?:arity|available|lookup|name)|generate\-id|has\-children|head|hours\-from\-(?:dateTime|duration|time)|id(?:ref)?|implicit\-timezone|in\-scope\-prefixes|index\-of|innermost|insert\-before|iri\-to\-uri|json\-(?:doc|to\-xml)|key|lang|last|load\-xquery\-module|local\-name(?:\-from\-QName)?|(?:lower|upper)\-case|matches|max|minutes\-from\-(?:dateTime|duration|time)|min|months?\-from\-(?:date(?:Time)?|duration)|name(?:space\-uri\-?(?:for\-prefix|from\-QName)?)?|nilled|node\-name|normalize\-(?:space|unicode)|not|number|one\-or\-more|outermost|parse\-(?:ietf\-date|json)|path|position|(?:prefix\-from\-)?QName|random\-number\-generator|regex\-group|remove|replace|resolve\-(?:QName|uri)|reverse|root|round(?:\-half\-to\-even)?|seconds\-from\-(?:dateTime|duration|time)|snapshot|sort|starts\-with|static\-base\-uri|stream\-available|string\-?(?:join|length|to\-codepoints)?|subsequence|substring\-?(?:after|before)?|sum|system\-property|tail|timezone\-from\-(?:date(?:Time)?|time)|tokenize|trace|trans(?:form|late)|true|type\-available|unordered|unparsed\-(?:entity|text)?\-?(?:public\-id|uri|available|lines)?|uri\-collection|xml\-to\-json|years?\-from\-(?:date(?:Time)?|duration)|zero\-or\-one)\b/},{begin:/\blocal\:/,end:/\(/,excludeEnd:!0},{begin:/\bzip\:/,end:/(?:zip\-file|(?:xml|html|text|binary)\-entry| (?:update\-)?entries)\b/},{begin:/\b(?:util|db|functx|app|xdmp|xmldb)\:/,end:/\(/,excludeEnd:!0}]},{className:"string",variants:[{begin:/"/,end:/"/,contains:[{begin:/""/,relevance:0}]},{begin:/'/,end:/'/,contains:[{begin:/''/,relevance:0}]}]},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{className:"comment",begin:"\\(:",end:":\\)",relevance:10,contains:[{className:"doctag",begin:"@\\w+"}]},{className:"meta",begin:/%[\w-:]+/},{className:"title",begin:/\bxquery version "[13]\.[01]"\s?(?:encoding ".+")?/,end:/;/},{beginKeywords:"element attribute comment document processing-instruction",end:"{",excludeEnd:!0},{begin:/<([\w\._:\-]+)((\s*.*)=('|").*('|"))?>/,end:/(\/[\w\._:\-]+>)/,subLanguage:"xml",contains:[{begin:"{",end:"}",subLanguage:"xquery"},"self"]}]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/yaml.min.js b/vendor/assets/javascripts/highlightjs/languages/yaml.min.js
index 5495252cf9..587b8795ff 100644
--- a/vendor/assets/javascripts/highlightjs/languages/yaml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/yaml.min.js
@@ -1 +1 @@
-hljs.registerLanguage("yaml",function(e){var b="true false yes no null",a="^[ \\-]*",r="[a-zA-Z_][\\w\\-]*",t={cN:"attr",v:[{b:a+r+":"},{b:a+'"'+r+'":'},{b:a+"'"+r+"':"}]},c={cN:"template-variable",v:[{b:"{{",e:"}}"},{b:"%{",e:"}"}]},l={cN:"string",r:0,v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/\S+/}],c:[e.BE,c]};return{cI:!0,aliases:["yml","YAML","yaml"],c:[t,{cN:"meta",b:"^---s*$",r:10},{cN:"string",b:"[\\|>] *$",rE:!0,c:l.c,e:t.v[0].b},{b:"<%[%=-]?",e:"[%-]?%>",sL:"ruby",eB:!0,eE:!0,r:0},{cN:"type",b:"!"+e.UIR},{cN:"type",b:"!!"+e.UIR},{cN:"meta",b:"&"+e.UIR+"$"},{cN:"meta",b:"\\*"+e.UIR+"$"},{cN:"bullet",b:"^ *-",r:0},e.HCM,{bK:b,k:{literal:b}},e.CNM,l]}});
\ No newline at end of file
+hljs.registerLanguage("yaml",function(){"use strict";return function(e){var n="true false yes no null",a="[\\w#;/?:@&=+$,.~*\\'()[\\]]+",s={className:"string",relevance:0,variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/\S+/}],contains:[e.BACKSLASH_ESCAPE,{className:"template-variable",variants:[{begin:"{{",end:"}}"},{begin:"%{",end:"}"}]}]},i=e.inherit(s,{variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/[^\s,{}[\]]+/}]}),l={end:",",endsWithParent:!0,excludeEnd:!0,contains:[],keywords:n,relevance:0},t={begin:"{",end:"}",contains:[l],illegal:"\\n",relevance:0},g={begin:"\\[",end:"\\]",contains:[l],illegal:"\\n",relevance:0},b=[{className:"attr",variants:[{begin:"\\w[\\w :\\/.-]*:(?=[ \t]|$)"},{begin:'"\\w[\\w :\\/.-]*":(?=[ \t]|$)'},{begin:"'\\w[\\w :\\/.-]*':(?=[ \t]|$)"}]},{className:"meta",begin:"^---s*$",relevance:10},{className:"string",begin:"[\\|>]([0-9]?[+-])?[ ]*\\n( *)[\\S ]+\\n(\\2[\\S ]+\\n?)*"},{begin:"<%[%=-]?",end:"[%-]?%>",subLanguage:"ruby",excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:"!\\w+!"+a},{className:"type",begin:"!<"+a+">"},{className:"type",begin:"!"+a},{className:"type",begin:"!!"+a},{className:"meta",begin:"&"+e.UNDERSCORE_IDENT_RE+"$"},{className:"meta",begin:"\\*"+e.UNDERSCORE_IDENT_RE+"$"},{className:"bullet",begin:"\\-(?=[ ]|$)",relevance:0},e.HASH_COMMENT_MODE,{beginKeywords:n,keywords:{literal:n}},{className:"number",begin:"\\b[0-9]{4}(-[0-9][0-9]){0,2}([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?(\\.[0-9]*)?([ \\t])*(Z|[-+][0-9][0-9]?(:[0-9][0-9])?)?\\b"},{className:"number",begin:e.C_NUMBER_RE+"\\b"},t,g,s],c=[...b];return c.pop(),c.push(i),l.contains=c,{name:"YAML",case_insensitive:!0,aliases:["yml","YAML"],contains:b}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/zephir.min.js b/vendor/assets/javascripts/highlightjs/languages/zephir.min.js
index 6581543412..a375158d37 100644
--- a/vendor/assets/javascripts/highlightjs/languages/zephir.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/zephir.min.js
@@ -1 +1 @@
-hljs.registerLanguage("zephir",function(e){var i={cN:"string",c:[e.BE],v:[{b:'b"',e:'"'},{b:"b'",e:"'"},e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null})]},n={v:[e.BNM,e.CNM]};return{aliases:["zep"],cI:!0,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var let while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try switch continue endfor endif declare unset true false trait goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally int uint long ulong char uchar double float bool boolean stringlikely unlikely",c:[e.CLCM,e.HCM,e.C("/\\*","\\*/",{c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.C("__halt_compiler.+?;",!1,{eW:!0,k:"__halt_compiler",l:e.UIR}),{cN:"string",b:"<<<['\"]?\\w+['\"]?$",e:"^\\w+;",c:[e.BE]},{b:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{cN:"function",bK:"function",e:/[;{]/,eE:!0,i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:["self",e.CBCM,i,n]}]},{cN:"class",bK:"class interface",e:"{",eE:!0,i:/[:\(\$"]/,c:[{bK:"extends implements"},e.UTM]},{bK:"namespace",e:";",i:/[\.']/,c:[e.UTM]},{bK:"use",e:";",c:[e.UTM]},{b:"=>"},i,n]}});
\ No newline at end of file
+hljs.registerLanguage("zephir",function(){"use strict";return function(e){var n={className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[e.inherit(e.APOS_STRING_MODE,{illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null})]},a=e.UNDERSCORE_TITLE_MODE,s={variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]},i="namespace class interface use extends function return abstract final public protected private static deprecated throw try catch Exception echo empty isset instanceof unset let var new const self require if else elseif switch case default do while loop for continue break likely unlikely __LINE__ __FILE__ __DIR__ __FUNCTION__ __CLASS__ __TRAIT__ __METHOD__ __NAMESPACE__ array boolean float double integer object resource string char long unsigned bool int uint ulong uchar true false null undefined";return{name:"Zephir",aliases:["zep"],keywords:i,contains:[e.C_LINE_COMMENT_MODE,e.COMMENT("/\\*","\\*/",{contains:[{className:"doctag",begin:"@[A-Za-z]+"}]}),{className:"string",begin:"<<<['\"]?\\w+['\"]?$",end:"^\\w+;",contains:[e.BACKSLASH_ESCAPE]},{begin:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{className:"function",beginKeywords:"function fn",end:/[;{]/,excludeEnd:!0,illegal:"\\$|\\[|%",contains:[a,{className:"params",begin:"\\(",end:"\\)",keywords:i,contains:["self",e.C_BLOCK_COMMENT_MODE,n,s]}]},{className:"class",beginKeywords:"class interface",end:"{",excludeEnd:!0,illegal:/[:\(\$"]/,contains:[{beginKeywords:"extends implements"},a]},{beginKeywords:"namespace",end:";",illegal:/[\.']/,contains:[a]},{beginKeywords:"use",end:";",contains:[a]},{begin:"=>"},n,s]}}}());
\ No newline at end of file
diff --git a/vendor/assets/javascripts/mousetrap-global-bind.js b/vendor/assets/javascripts/mousetrap-global-bind.js
index 1c4ac1487a..6b86a99fbf 100644
--- a/vendor/assets/javascripts/mousetrap-global-bind.js
+++ b/vendor/assets/javascripts/mousetrap-global-bind.js
@@ -8,6 +8,9 @@
  */
 /* global Mousetrap:true */
 (function(Mousetrap) {
+    if (! Mousetrap) {
+        return;
+    }
     var _globalCallbacks = {};
     var _originalStopCallback = Mousetrap.prototype.stopCallback;
 
@@ -40,4 +43,4 @@
     };
 
     Mousetrap.init();
-}) (Mousetrap);
+}) (typeof Mousetrap !== "undefined" ? Mousetrap : undefined);
diff --git a/vendor/assets/javascripts/mousetrap.js b/vendor/assets/javascripts/mousetrap.js
index 0479677e5f..bd469fcea8 100644
--- a/vendor/assets/javascripts/mousetrap.js
+++ b/vendor/assets/javascripts/mousetrap.js
@@ -17,7 +17,7 @@
  * Mousetrap is a simple keyboard shortcut library for Javascript with
  * no external dependencies
  *
- * @version 1.6.3
+ * @version 1.6.5
  * @url craig.is/killing/mice
  */
 (function(window, document, undefined) {
diff --git a/yarn.lock b/yarn.lock
index 4d96747e62..5ba938d8e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -92,6 +92,14 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
+"@cnakazawa/watch@^1.0.3":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
+  integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
+  dependencies:
+    exec-sh "^0.3.2"
+    minimist "^1.2.0"
+
 "@fortawesome/fontawesome-free@5.11.2":
   version "5.11.2"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.11.2.tgz#8644bc25b19475779a7b7c1fc104bc0a794f4465"
@@ -102,30 +110,30 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/interfaces@^0.50.2":
-  version "0.50.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.50.2.tgz#5637beb45242b9c23b1b82b404ad085f1827ce16"
-  integrity sha512-SbrEspWDHQ6j0DI0inYpg29SMlfEEUS895apZWxMzC2RyGHy5SKmZJ4xjishaq7A0E1AaTfDKYnE/wfWrQZSsw==
+"@glimmer/interfaces@^0.51.1":
+  version "0.51.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.51.1.tgz#c5637669ff83c630d91c700598b9963225d656f2"
+  integrity sha512-ImwkFNj92RaeANQPlnSQ5kTtK18JzkY2FPE7N7Ktn3AvdXgM4P3puQzPuXhTn4UCBl6NZtN8YqCAy7kQ6eRC0w==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.50.0":
-  version "0.50.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.50.2.tgz#e69731df2fb9069d30469c700eb9bae79e51c257"
-  integrity sha512-kmMZK4bN674sUhphLuads1RQNm3pzEuNcW7SHQiDJJz3zDsMFQ69YPtgYBrpJZtPgF6Oj/QgwUcD0d+ql5/cpw==
+"@glimmer/syntax@^0.51.1":
+  version "0.51.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.51.1.tgz#24cb4f01693bd934075d03087bdc76ab6bff0524"
+  integrity sha512-z5XSbLgMKGU8tgSm9Ju4mimSAJ6/SZrY2Xw2znEAmUJOIPte+tmkdpggpgj7lAjD5u2YVBVHDbz6RaZDhYASsw==
   dependencies:
-    "@glimmer/interfaces" "^0.50.2"
-    "@glimmer/util" "^0.50.2"
-    handlebars "^4.5.1"
+    "@glimmer/interfaces" "^0.51.1"
+    "@glimmer/util" "^0.51.1"
+    handlebars "^4.7.4"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.50.2":
-  version "0.50.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.50.2.tgz#1519064c2722143871964a183ceb825b5c24f5d3"
-  integrity sha512-FG3gWONYZWUBwZojvuYdPALu6DWKzc2QGBzb6zBgY5vO2otAqLsi8WlfGP8ekkFsEHUtlPGeUAOqr+lSox+DQw==
+"@glimmer/util@^0.51.1":
+  version "0.51.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.51.1.tgz#db27afd2ee7191e8e399c272b9f7fbe05cc26691"
+  integrity sha512-MCwUvV3z4pqLpeXcv5Mbchdgw0GeEPH8jUEkUTG837b5XlC2M/NO893E5A8AZbGNSP7CDsYibDExz7mjaLqq/A==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.50.2"
+    "@glimmer/interfaces" "^0.51.1"
     "@simple-dom/interface" "^1.4.0"
 
 "@nodelib/fs.scandir@2.1.3":
@@ -159,17 +167,10 @@
   resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f"
   integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA==
 
-"@sinonjs/commons@^1":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.3.0.tgz#50a2754016b6f30a994ceda6d9a0a8c36adda849"
-  integrity sha512-j4ZwhaHmwsCb4DlDOIWnI5YyKDNMoNThsmwEpfHx6a1EpsGZ9qYLxP++LMlmBRjtGptGHFsGItJ768snllFWpA==
-  dependencies:
-    type-detect "4.0.8"
-
-"@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.7.2":
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2"
-  integrity sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw==
+"@sinonjs/commons@^1", "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.7.2":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d"
+  integrity sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q==
   dependencies:
     type-detect "4.0.8"
 
@@ -208,9 +209,9 @@
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
 "@types/node@*":
-  version "12.12.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.6.tgz#a47240c10d86a9a57bb0c633f0b2e0aea9ce9253"
-  integrity sha512-FjsYUPzEJdGXjwKqSpE0/9QEh6kzhTAeObA54rn6j3rR4C/mzpI9L0KNfoeASSPMMdxIsoJuCLDWcM/rVjIsSA==
+  version "14.0.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.5.tgz#3d03acd3b3414cf67faf999aed11682ed121f22b"
+  integrity sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA==
 
 ace-builds@1.4.2:
   version "1.4.2"
@@ -230,9 +231,9 @@ acorn@^3.0.4:
   integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
 
 acorn@^5.5.0:
-  version "5.7.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
-  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+  version "5.7.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
+  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
 agent-base@^4.3.0:
   version "4.3.0"
@@ -351,9 +352,9 @@ assign-symbols@^1.0.0:
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 async-limiter@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
-  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
 async-promise-queue@^1.0.5:
   version "1.0.5"
@@ -375,7 +376,7 @@ async@~0.2.6:
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
   integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E=
 
-atob@^2.1.1:
+atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
@@ -425,9 +426,9 @@ base@^0.11.1:
     pascalcase "^0.1.1"
 
 blueimp-canvas-to-blob@3:
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.19.0.tgz#842a30605c59ec12b1219bb3d8969160e27b6f8e"
-  integrity sha512-WlLp3GOEdpyQr5hqyPaRoFHGdzMcf6T5Wr8ZjjGl1MM4tit6+rCsJcw7psXFvgoIk69uCGEhyvZOWXU2b4bDcQ==
+  version "3.27.0"
+  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.27.0.tgz#a2bd5c43587b95dedf0f6998603452d1bfcc9b9e"
+  integrity sha512-AcIj+hCw6WquxzJuzC6KzgYmqxLFeTWe88KuY2BEIsW1zbEOfoinDAGlhyvFNGt+U3JElkVSK7anA1FaSdmmfA==
 
 blueimp-file-upload@10.13.0:
   version "10.13.0"
@@ -444,9 +445,9 @@ blueimp-load-image@3:
   integrity sha512-Q9rFbd4ZUNvzSFmRXx9MoG0RwWwJeMjjEUbG7WIOJgUg22Jgkow0wL5b35B6qwiBscxACW9OHdrP5s2vQ3x8DQ==
 
 blueimp-tmpl@3:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/blueimp-tmpl/-/blueimp-tmpl-3.14.0.tgz#4951cf03a127521fa88922db616949d75cbbd5c3"
-  integrity sha512-mA8iwfEVkvpjtBXpRp25DxGqW2YOZqC9FVLLOa03Qwdsd6J4kVyL1noC04arAm0CNsu3Y0FmxkAOt+x2MoxpYA==
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/blueimp-tmpl/-/blueimp-tmpl-3.17.0.tgz#0179fb2a475b3891a9745f12818f10d76ff0df51"
+  integrity sha512-rqj27a+sA+HFMK+96MXSnhoFhQ+sbI7/6ktcEZ1Z0wXQ6Z9Tr2NJm6W1OUQs20CBxuGeMhWtcHIHS/bHeE0B3Q==
 
 bootbox@3.2.0:
   version "3.2.0"
@@ -489,13 +490,18 @@ braces@^3.0.1:
   dependencies:
     fill-range "^7.0.1"
 
-bser@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
-  integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=
+bser@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
   dependencies:
     node-int64 "^0.4.0"
 
+buffer-crc32@~0.2.3:
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -538,12 +544,12 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-capture-exit@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
-  integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=
+capture-exit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
   dependencies:
-    rsvp "^3.3.3"
+    rsvp "^4.8.4"
 
 center-align@^0.1.1:
   version "0.1.3"
@@ -602,20 +608,20 @@ chart.js@2.9.3:
     chartjs-color "^2.1.0"
     moment "^2.10.2"
 
-chartjs-color-string@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz#8d3752d8581d86687c35bfe2cb80ac5213ceb8c1"
-  integrity sha512-amWNvCOXlOUYxZVDSa0YOab5K/lmEhbFNKI55PWc4mlv28BDzA7zaoQTGxSBgJMHIW+hGX8YUrvw/FH4LyhwSQ==
+chartjs-color-string@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
+  integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
   dependencies:
     color-name "^1.0.0"
 
 chartjs-color@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.2.0.tgz#84a2fb755787ed85c39dd6dd8c7b1d88429baeae"
-  integrity sha1-hKL7dVeH7YXDndbdjHsdiEKbrq4=
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0"
+  integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==
   dependencies:
-    chartjs-color-string "^0.5.0"
-    color-convert "^0.5.3"
+    chartjs-color-string "^0.6.0"
+    color-convert "^1.9.3"
 
 chrome-launcher@^0.12.0:
   version "0.12.0"
@@ -671,9 +677,9 @@ cli-spinners@^2.2.0:
   integrity sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==
 
 cli-width@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
 
 cliui@^2.1.0:
   version "2.1.0"
@@ -718,12 +724,7 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-color-convert@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
-  integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=
-
-color-convert@^1.9.0:
+color-convert@^1.9.0, color-convert@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -762,10 +763,10 @@ commander@2.12.2:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
   integrity sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==
 
-commander@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-5.0.0.tgz#dbf1909b49e5044f8fdaf0adc809f0c0722bdfd0"
-  integrity sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==
+commander@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
+  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
 
 commander@~2.20.3:
   version "2.20.3"
@@ -773,16 +774,16 @@ commander@~2.20.3:
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
 component-emitter@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@1.6.2, concat-stream@^1.6.0:
+concat-stream@^1.6.0, concat-stream@^1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -822,7 +823,7 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
+debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -912,29 +913,31 @@ doctrine@^2.1.0:
     esutils "^2.0.2"
 
 ember-template-lint@^2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-2.5.2.tgz#f1f9c3b1f3355f1a82870fbc81f672ae80e375fe"
-  integrity sha512-IwZziVgoWzqbfLCAQiCkwQ3jv6ZsPF2/pvu7ep3giAdNWbQKVx5NFrktQ+cy8tOG+QYmgrN9v7+8BkMgmE+21Q==
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-2.8.0.tgz#01ddc6daf9c8497fe5cfcc55cde25f203a7d8bd3"
+  integrity sha512-tK4aJewdmtVUGSnX/1MR6TuSFAhmIL/CUsUeW33pQsf324l96XzhPP+66G06vjWw8iLW2zK2Rbh5HnEL+IDZsA==
   dependencies:
     chalk "^4.0.0"
-    ember-template-recast "^4.1.2"
+    ember-template-recast "^4.1.4"
     find-up "^4.1.0"
+    get-stdin "^8.0.0"
     globby "^11.0.0"
+    is-valid-glob "^1.0.0"
     micromatch "^4.0.2"
-    resolve "^1.15.1"
+    resolve "^1.17.0"
     yargs "^15.3.1"
 
-ember-template-recast@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-4.1.2.tgz#1999c49df482a042fe3ad02712d62b6d3566addd"
-  integrity sha512-ySBuPVKnGPvJ+y+5MEZ7qHE1p2LunM2CV9RUES0CP4O+fksPNwl79HPV+8rL0gJvN2nUOfkatNF6pcWNxxXaxg==
+ember-template-recast@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-4.1.4.tgz#0552f4f27d33b17ac05a48107f369032eb45fb97"
+  integrity sha512-jw38ncM5uJu7INVWYCmm4GNIEdGVLkjABWbj451A83Ag4lBfXIbIHq+5IM7rFzUlw/Ho39WxeKhKZ5KTvIVljQ==
   dependencies:
-    "@glimmer/syntax" "^0.50.0"
+    "@glimmer/syntax" "^0.51.1"
     async-promise-queue "^1.0.5"
     colors "^1.4.0"
-    commander "^5.0.0"
+    commander "^5.1.0"
     globby "^11.0.0"
-    ora "^4.0.3"
+    ora "^4.0.4"
     slash "^3.0.0"
     tmp "^0.1.0"
     workerpool "^5.0.4"
@@ -945,21 +948,21 @@ emoji-regex@^8.0.0:
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 end-of-stream@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
 ensure-posix-path@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz#a65b3e42d0b71cfc585eb774f9943c8d9b91b0c2"
-  integrity sha1-pls+QtC3HPxYXrd0+ZQ8jZuRsMI=
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce"
+  integrity sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==
 
 entities@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
-  integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.2.tgz#ac74db0bba8d33808bbf36809c3a5c3683531436"
+  integrity sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==
 
 es6-promise@^4.0.3:
   version "4.2.8"
@@ -1080,11 +1083,11 @@ esprima@^4.0.0:
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
-  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
   dependencies:
-    estraverse "^4.0.0"
+    estraverse "^5.1.0"
 
 esrecurse@^4.1.0:
   version "4.2.1"
@@ -1093,27 +1096,25 @@ esrecurse@^4.1.0:
   dependencies:
     estraverse "^4.1.0"
 
-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
+estraverse@^4.1.0, estraverse@^4.1.1:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
+estraverse@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
+  integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
+
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-exec-sh@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
-  integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==
-  dependencies:
-    merge "^1.2.0"
-
 exec-sh@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"
-  integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
+  integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
 
 execa@^1.0.0:
   version "1.0.0"
@@ -1192,14 +1193,14 @@ extglob@^2.0.4:
     to-regex "^3.0.1"
 
 extract-zip@^1.6.6:
-  version "1.6.7"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9"
-  integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
+  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
   dependencies:
-    concat-stream "1.6.2"
-    debug "2.6.9"
-    mkdirp "0.5.1"
-    yauzl "2.4.1"
+    concat-stream "^1.6.2"
+    debug "^2.6.9"
+    mkdirp "^0.5.4"
+    yauzl "^2.10.0"
 
 fake-xml-http-request@^1.6.0:
   version "1.6.0"
@@ -1224,19 +1225,19 @@ fast-glob@^3.1.1:
     picomatch "^2.2.1"
 
 fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@~2.0.4:
+fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fastq@^1.6.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.7.0.tgz#fcd79a08c5bd7ec5b55cd3f5c4720db551929801"
-  integrity sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz#550e1f9f59bbc65fe185cb6a9b4d95357107f481"
+  integrity sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==
   dependencies:
     reusify "^1.0.4"
 
@@ -1245,16 +1246,16 @@ fastq@^1.6.0:
   resolved "https://github.com/chrishunt/favcount#d053eac5ce33e2e299363ab927103e2ff6c7361e"
 
 fb-watchman@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
-  integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
   dependencies:
-    bser "^2.0.0"
+    bser "2.1.1"
 
-fd-slicer@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
-  integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=
+fd-slicer@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
+  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
   dependencies:
     pend "~1.2.0"
 
@@ -1345,6 +1346,11 @@ get-caller-file@^2.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-stdin@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
+  integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
+
 get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -1376,22 +1382,10 @@ glob@7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.5:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^7.1.2, glob@^7.1.3:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -1443,22 +1437,11 @@ google-closure-compiler@20150901.x:
   integrity sha1-PQHGyt5leQqb+04wshWLdjWsut4=
 
 graceful-fs@^4.1.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
-  integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-handlebars@^4.5.1:
-  version "4.7.3"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.3.tgz#8ece2797826886cf8082d1726ff21d2a022550ee"
-  integrity sha512-SRGwSYuNfx8DwHD/6InAPzD6RgeruWLT+B8e8a7gGs8FWgHzlExpTFMEq2IA6QpAfOClpKHy6+8IqTjeBCu6Kg==
-  dependencies:
-    neo-async "^2.6.0"
-    optimist "^0.6.1"
-    source-map "^0.6.1"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
-handlebars@^4.7.0:
+handlebars@^4.7.0, handlebars@^4.7.4:
   version "4.7.6"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
   integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
@@ -1519,13 +1502,13 @@ has-values@^1.0.0:
     kind-of "^4.0.0"
 
 "highlight.js@https://github.com/highlightjs/highlight.js":
-  version "9.13.1"
-  resolved "https://github.com/highlightjs/highlight.js#1b10552510a1ec13a3d30d46281dc268553ad157"
+  version "10.0.0"
+  resolved "https://github.com/highlightjs/highlight.js#f30dbf774a1cb4c9644b6e97b0b853812e434038"
 
 homedir-polyfill@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
-  integrity sha1-TCu8inWJmP7r9e1oWA921GdotLw=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
   dependencies:
     parse-passwd "^1.0.0"
 
@@ -1554,9 +1537,9 @@ ignore@^3.3.3:
   integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
 
 ignore@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
-  integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.6.tgz#643194ad4bf2712f37852e386b6998eff0db2106"
+  integrity sha512-cgXgkypZBcCnOgSihyeqbo6gjIaIyDqPQB7Ra4vhE9m6kigdGoQDMHjviFhRZo3IMlRy6yElosoviMs5YxZXUA==
 
 imurmurhash@^0.1.4:
   version "0.1.4"
@@ -1572,9 +1555,9 @@ inflight@^1.0.4:
     wrappy "1"
 
 inherits@2, inherits@^2.0.3, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 ini@^1.3.4:
   version "1.3.5"
@@ -1664,6 +1647,11 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
 
+is-docker@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz#2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b"
+  integrity sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -1729,11 +1717,6 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-promise@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
-
 is-resolvable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
@@ -1744,15 +1727,22 @@ is-stream@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
+is-valid-glob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
+  integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=
+
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 is-wsl@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d"
-  integrity sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+  dependencies:
+    is-docker "^2.0.0"
 
 isarray@0.0.1:
   version "0.0.1"
@@ -1825,9 +1815,9 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^3.9.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
+  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -1848,9 +1838,9 @@ json-stable-stringify-without-jsonify@^1.0.1:
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
 just-extend@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.0.2.tgz#f3f47f7dfca0f989c55410a7ebc8854b07108afc"
-  integrity sha512-FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.0.tgz#7278a4027d889601640ee0ce0e5a00b992467da4"
+  integrity sha512-ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
@@ -1872,9 +1862,9 @@ kind-of@^5.0.0:
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 lazy-cache@^1.0.3:
   version "1.0.4"
@@ -1898,9 +1888,9 @@ lighthouse-logger@^1.0.0:
     marky "^1.2.0"
 
 linkify-it@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.0.3.tgz#d94a4648f9b1c179d64fa97291268bdb6ce9434f"
-  integrity sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
+  integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==
   dependencies:
     uc.micro "^1.0.1"
 
@@ -1999,9 +1989,9 @@ marky@^1.2.0:
   integrity sha512-md9k+Gxa3qLH6sUKpeC2CNkJK/Ld+bEz5X96nYwloqphQE0CKCVEKco/6jxEZixinqNdz5RFi/KaCyfbMDMAXQ==
 
 matcher-collection@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.0.5.tgz#2ee095438372cb8884f058234138c05c644ec339"
-  integrity sha512-nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.1.2.tgz#1076f506f10ca85897b53d14ef54f90a5c426838"
+  integrity sha512-YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g==
   dependencies:
     minimatch "^3.0.2"
 
@@ -2015,11 +2005,6 @@ merge2@^1.3.0:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
   integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
 
-merge@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
-  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
-
 micromatch@^3.0.4, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -2048,9 +2033,9 @@ micromatch@^4.0.2:
     picomatch "^2.0.5"
 
 mime@^2.0.3:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
-  integrity sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==
+  version "2.4.6"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
+  integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
@@ -2074,21 +2059,11 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@^1.1.1, minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-minimist@^1.2.5:
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
-
 mixin-deep@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
@@ -2097,13 +2072,20 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.1, mkdirp@^0.5.1:
+mkdirp@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
+mkdirp@^0.5.1, mkdirp@^0.5.4:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  dependencies:
+    minimist "^1.2.5"
+
 "moment-timezone-names-translations@https://github.com/discourse/moment-timezone-names-translations":
   version "0.0.0"
   resolved "https://github.com/discourse/moment-timezone-names-translations#5f576fc6355d8e636783bfb7b0214a5d74a5399d"
@@ -2115,15 +2097,15 @@ moment-timezone@0.5.25:
   dependencies:
     moment ">= 2.9.0"
 
-moment@2.24.0, "moment@>= 2.9.0":
+moment@2.24.0:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
-moment@^2.10.2:
-  version "2.22.2"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
-  integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
+"moment@>= 2.9.0", moment@^2.10.2:
+  version "2.26.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.26.0.tgz#5e1f82c6bafca6e83e808b30c8705eed0dcbd39a"
+  integrity sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw==
 
 "mousetrap@https://github.com/discourse/mousetrap#firefox-alt-key":
   version "1.6.5"
@@ -2260,30 +2242,22 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-optimist@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
-  dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
-
 optionator@^0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
   dependencies:
     deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
+    fast-levenshtein "~2.0.6"
     levn "~0.3.0"
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
-    wordwrap "~1.0.0"
+    word-wrap "~1.2.3"
 
-ora@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.3.tgz#752a1b7b4be4825546a7a3d59256fa523b6b6d05"
-  integrity sha512-fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg==
+ora@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.4.tgz#e8da697cc5b6a47266655bf68e0fb588d29a545d"
+  integrity sha512-77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww==
   dependencies:
     chalk "^3.0.0"
     cli-cursor "^3.1.0"
@@ -2359,9 +2333,9 @@ path-parse@^1.0.5, path-parse@^1.0.6:
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
 path-to-regexp@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
-  integrity sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
+  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
   dependencies:
     isarray "0.0.1"
 
@@ -2414,9 +2388,9 @@ prettier@^1.19.1:
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
 process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
 progress@^2.0.0, progress@^2.0.1:
   version "2.0.3"
@@ -2424,9 +2398,9 @@ progress@^2.0.0, progress@^2.0.1:
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
 proxy-from-env@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
-  integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
 pseudomap@^1.0.2:
   version "1.0.2"
@@ -2469,9 +2443,9 @@ qunit@2.8.0:
     walk-sync "0.3.2"
 
 readable-stream@^2.2.2:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -2557,10 +2531,10 @@ resolve@1.5.0:
   dependencies:
     path-parse "^1.0.5"
 
-resolve@^1.15.1:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
-  integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
+resolve@^1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
+  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
   dependencies:
     path-parse "^1.0.6"
 
@@ -2602,14 +2576,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
-  dependencies:
-    glob "^7.0.5"
-
-rimraf@^2.6.3:
+rimraf@^2.6.1, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -2628,17 +2595,15 @@ route-recognizer@^0.3.3:
   resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
   integrity sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==
 
-rsvp@^3.3.3:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
-  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
+rsvp@^4.8.4:
+  version "4.8.5"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
 run-async@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
-  dependencies:
-    is-promise "^2.1.0"
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
 run-parallel@^1.1.9:
   version "1.1.9"
@@ -2675,51 +2640,36 @@ safe-regex@^1.1.0:
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sane@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-4.0.2.tgz#5bd4a3f1268fd7a921a2dc657047de635c8f8f25"
-  integrity sha512-/3STCUfNSgMVpoREJc1i6ajKFlYZ5OflzZTOhlqPLa+01Ey+QR9iGZK7K5/qIRsQbEDCvqEJH/PL7yZywmnWsA==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
   dependencies:
+    "@cnakazawa/watch" "^1.0.3"
     anymatch "^2.0.0"
-    capture-exit "^1.2.0"
+    capture-exit "^2.0.0"
     exec-sh "^0.3.2"
     execa "^1.0.0"
     fb-watchman "^2.0.0"
     micromatch "^3.1.4"
     minimist "^1.1.1"
     walker "~1.0.5"
-    watch "~0.18.0"
 
 semver@5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
   integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
 
-semver@^5.3.0:
+semver@^5.3.0, semver@^5.5.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^5.5.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
-
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
-
-set-value@^2.0.1:
+set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
   integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
@@ -2742,9 +2692,9 @@ shebang-regex@^1.0.0:
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
 simple-html-tokenizer@^0.5.9:
   version "0.5.9"
@@ -2807,11 +2757,11 @@ snapdragon@^0.8.1:
     use "^3.1.0"
 
 source-map-resolve@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
-  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
   dependencies:
-    atob "^2.1.1"
+    atob "^2.1.2"
     decode-uri-component "^0.2.0"
     resolve-url "^0.2.1"
     source-map-url "^0.4.0"
@@ -2827,7 +2777,7 @@ source-map@^0.5.0, source-map@^0.5.6, source-map@~0.5.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -3032,9 +2982,9 @@ typedarray@^0.0.6:
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376"
-  integrity sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
+  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
 uglify-js@2.7.5:
   version "2.7.5"
@@ -3047,12 +2997,11 @@ uglify-js@2.7.5:
     yargs "~3.10.0"
 
 uglify-js@^3.1.4:
-  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.4.tgz#e6d83a1aa32ff448bd1679359ab13d8db0fe0743"
-  integrity sha512-tinYWE8X1QfCHxS1lBS8yiDekyhSXOO6R66yNOCdUJeojxxw+PX2BHAz/BWyW7PQ7pkiWVxJfIEbiDxyLWvUGg==
+  version "3.9.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.4.tgz#867402377e043c1fc7b102253a22b64e5862401b"
+  integrity sha512-8RZBJq5smLOa7KslsNsVcSH+KOXf1uDU8yqLeNuVKwmT0T3FA0ZoXlinQfRad7SDcbZZRZE4ov+2v71EnxNyCA==
   dependencies:
     commander "~2.20.3"
-    source-map "~0.6.1"
 
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
@@ -3112,14 +3061,6 @@ walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
-watch@~0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
-  integrity sha1-KAlUdsbffJDJYxOJkMClQj60uYY=
-  dependencies:
-    exec-sh "^0.2.0"
-    minimist "^1.2.0"
-
 wcwidth@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
@@ -3144,21 +3085,21 @@ window-size@0.1.0:
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
   integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
 
+word-wrap@~1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
   integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
 
-wordwrap@^1.0.0, wordwrap@~1.0.0:
+wordwrap@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
-
 workbox-core@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-4.3.1.tgz#005d2c6a06a171437afd6ca2904a5727ecd73be6"
@@ -3243,9 +3184,9 @@ yallist@^2.1.2:
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yargs-parser@^18.1.1:
-  version "18.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1"
-  integrity sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -3277,9 +3218,10 @@ yargs@~3.10.0:
     decamelize "^1.0.0"
     window-size "0.1.0"
 
-yauzl@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
-  integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=
+yauzl@^2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
+  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
   dependencies:
-    fd-slicer "~1.0.1"
+    buffer-crc32 "~0.2.3"
+    fd-slicer "~1.1.0"

From cae839ca96a0da968d8203b9c76fdb4619e8bd31 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 28 May 2020 13:13:10 -0400
Subject: [PATCH 1422/1830] DEV: Update gems to latest versions (#9909)

---
 Gemfile      | 14 +++++------
 Gemfile.lock | 66 ++++++++++++++++++++++++++--------------------------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9cfaff2d88..da983fa8c7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,13 +18,13 @@ else
   # this allows us to include the bits of rails we use without pieces we do not.
   #
   # To issue a rails update bump the version number here
-  gem 'actionmailer', '6.0.3'
-  gem 'actionpack', '6.0.3'
-  gem 'actionview', '6.0.3'
-  gem 'activemodel', '6.0.3'
-  gem 'activerecord', '6.0.3'
-  gem 'activesupport', '6.0.3'
-  gem 'railties', '6.0.3'
+  gem 'actionmailer', '6.0.3.1'
+  gem 'actionpack', '6.0.3.1'
+  gem 'actionview', '6.0.3.1'
+  gem 'activemodel', '6.0.3.1'
+  gem 'activerecord', '6.0.3.1'
+  gem 'activesupport', '6.0.3.1'
+  gem 'railties', '6.0.3.1'
   gem 'sprockets-rails'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 14a1ef3051..2451d913df 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,21 +10,21 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (6.0.3)
-      actionpack (= 6.0.3)
-      actionview (= 6.0.3)
-      activejob (= 6.0.3)
+    actionmailer (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      actionview (= 6.0.3.1)
+      activejob (= 6.0.3.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3)
-      actionview (= 6.0.3)
-      activesupport (= 6.0.3)
+    actionpack (6.0.3.1)
+      actionview (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.3)
-      activesupport (= 6.0.3)
+    actionview (6.0.3.1)
+      activesupport (= 6.0.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -33,15 +33,15 @@ GEM
       actionview (>= 6.0.a)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (6.0.3)
-      activesupport (= 6.0.3)
+    activejob (6.0.3.1)
+      activesupport (= 6.0.3.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.3)
-      activesupport (= 6.0.3)
-    activerecord (6.0.3)
-      activemodel (= 6.0.3)
-      activesupport (= 6.0.3)
-    activesupport (6.0.3)
+    activemodel (6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activerecord (6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -54,20 +54,20 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.298.0)
-    aws-sdk-core (3.94.0)
+    aws-partitions (1.322.0)
+    aws-sdk-core (3.96.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.30.0)
+    aws-sdk-kms (1.31.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.62.0)
-      aws-sdk-core (~> 3, >= 3.83.0)
+    aws-sdk-s3 (1.66.0)
+      aws-sdk-core (~> 3, >= 3.96.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.22.0)
+    aws-sdk-sns (1.23.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.3)
@@ -289,9 +289,9 @@ GEM
     rails_multisite (2.1.2)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
-    railties (6.0.3)
-      actionpack (= 6.0.3)
-      activesupport (= 6.0.3)
+    railties (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -438,14 +438,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (= 6.0.3)
-  actionpack (= 6.0.3)
-  actionview (= 6.0.3)
+  actionmailer (= 6.0.3.1)
+  actionpack (= 6.0.3.1)
+  actionview (= 6.0.3.1)
   actionview_precompiler
   active_model_serializers (~> 0.8.3)
-  activemodel (= 6.0.3)
-  activerecord (= 6.0.3)
-  activesupport (= 6.0.3)
+  activemodel (= 6.0.3.1)
+  activerecord (= 6.0.3.1)
+  activesupport (= 6.0.3.1)
   addressable
   annotate
   aws-sdk-s3
@@ -523,7 +523,7 @@ DEPENDENCIES
   rack-protection
   rails_failover!
   rails_multisite
-  railties (= 6.0.3)
+  railties (= 6.0.3.1)
   rake
   rb-fsevent
   rb-inotify (~> 0.9)

From 1509afefba96af6b334ae295641320c13e7dc53c Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Thu, 28 May 2020 10:29:36 -0700
Subject: [PATCH 1423/1830] DEV: simplify detailed_404 logic

---
 app/controllers/topics_controller.rb | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index ddb750f912..22edbcfe00 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -87,11 +87,7 @@ class TopicsController < ApplicationController
 
       raise ex
     rescue Discourse::NotLoggedIn => ex
-      if !SiteSetting.detailed_404
-        raise Discourse::NotFound
-      else
-        raise ex
-      end
+      raise(SiteSetting.detailed_404 ? ex : Discourse::NotFound)
     rescue Discourse::InvalidAccess => ex
       # If the user can't see the topic, clean up notifications for it.
       Notification.remove_for(current_user.id, params[:topic_id]) if current_user
@@ -948,11 +944,7 @@ class TopicsController < ApplicationController
     begin
       guardian.ensure_can_see!(topic)
     rescue Discourse::InvalidAccess => ex
-      if !SiteSetting.detailed_404
-        raise Discourse::NotFound
-      else
-        raise ex
-      end
+      raise(SiteSetting.detailed_404 ? ex : Discourse::NotFound)
     end
 
     url = topic.relative_url

From 74d28a43d13e615171a2be05d90bc82b0ea97bce Mon Sep 17 00:00:00 2001
From: Andrew Schleifer <me@andrewschleifer.name>
Date: Fri, 29 May 2020 02:58:23 +0800
Subject: [PATCH 1424/1830] new S3 backup layout (#9830)

* DEV: new S3 backup layout

Currently, with $S3_BACKUP_BUCKET of "bucket/backups", multisite backups
end up in "bucket/backups/backups/dbname/" and single-site will be in
"bucket/backups/".

Both _should_ be in "bucket/backups/dbname/"

- remove MULTISITE_PREFIX,
- always include dbname,
- method to move to the new prefix
- job to call the method

* SPEC: add tests for `VacateLegacyPrefixBackups` onceoff job.

Co-authored-by: Vinoth Kannan <vinothkannan@vinkas.com>
---
 .../onceoff/vacate_legacy_prefix_backups.rb   | 10 ++++
 lib/backup_restore/s3_backup_store.rb         | 27 +++++++--
 lib/s3_helper.rb                              |  7 ++-
 .../jobs/vacate_legacy_prefix_backups_spec.rb | 56 +++++++++++++++++++
 .../backup_restore/s3_backup_store_spec.rb    | 25 ++++-----
 5 files changed, 104 insertions(+), 21 deletions(-)
 create mode 100644 app/jobs/onceoff/vacate_legacy_prefix_backups.rb
 create mode 100644 spec/jobs/vacate_legacy_prefix_backups_spec.rb

diff --git a/app/jobs/onceoff/vacate_legacy_prefix_backups.rb b/app/jobs/onceoff/vacate_legacy_prefix_backups.rb
new file mode 100644
index 0000000000..0791a01c0d
--- /dev/null
+++ b/app/jobs/onceoff/vacate_legacy_prefix_backups.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Jobs
+  class VacateLegacyPrefixBackups < ::Jobs::Onceoff
+    def execute_onceoff(args)
+      args ||= {}
+      BackupRestore::S3BackupStore.create(s3_options: args[:s3_options]).vacate_legacy_prefix if SiteSetting.backup_location == BackupLocationSiteSetting::S3
+    end
+  end
+end
diff --git a/lib/backup_restore/s3_backup_store.rb b/lib/backup_restore/s3_backup_store.rb
index 2c1bfc0c6d..108cb661ba 100644
--- a/lib/backup_restore/s3_backup_store.rb
+++ b/lib/backup_restore/s3_backup_store.rb
@@ -3,12 +3,11 @@
 module BackupRestore
   class S3BackupStore < BackupStore
     UPLOAD_URL_EXPIRES_AFTER_SECONDS ||= 21_600 # 6 hours
-    MULTISITE_PREFIX = "backups"
 
     def initialize(opts = {})
-      s3_options = S3Helper.s3_options(SiteSetting)
-      s3_options.merge!(opts[:s3_options]) if opts[:s3_options]
-      @s3_helper = S3Helper.new(s3_bucket_name_with_prefix, '', s3_options)
+      @s3_options = S3Helper.s3_options(SiteSetting)
+      @s3_options.merge!(opts[:s3_options]) if opts[:s3_options]
+      @s3_helper = S3Helper.new(s3_bucket_name_with_prefix, '', @s3_options.clone)
     end
 
     def remote?
@@ -52,6 +51,20 @@ module BackupRestore
       raise StorageError
     end
 
+    def vacate_legacy_prefix
+      legacy_s3_helper = S3Helper.new(s3_bucket_name_with_legacy_prefix, '', @s3_options.clone)
+      legacy_keys = legacy_s3_helper.list.map { |o| o.key }
+      legacy_keys.each do |legacy_key|
+        bucket, prefix = s3_bucket_name_with_prefix.split('/', 2)
+        @s3_helper.s3_client.copy_object({
+          copy_source: File.join(bucket, legacy_key),
+          bucket: bucket,
+          key: File.join(prefix, legacy_key.split('/').last)
+        })
+        legacy_s3_helper.delete_object(legacy_key)
+      end
+    end
+
     private
 
     def unsorted_files
@@ -99,8 +112,12 @@ module BackupRestore
     end
 
     def s3_bucket_name_with_prefix
+      File.join(SiteSetting.s3_backup_bucket, RailsMultisite::ConnectionManagement.current_db)
+    end
+
+    def s3_bucket_name_with_legacy_prefix
       if Rails.configuration.multisite
-        File.join(SiteSetting.s3_backup_bucket, MULTISITE_PREFIX, RailsMultisite::ConnectionManagement.current_db)
+        File.join(SiteSetting.s3_backup_bucket, "backups", RailsMultisite::ConnectionManagement.current_db)
       else
         SiteSetting.s3_backup_bucket
       end
diff --git a/lib/s3_helper.rb b/lib/s3_helper.rb
index 8021c78185..865e9b4e6f 100644
--- a/lib/s3_helper.rb
+++ b/lib/s3_helper.rb
@@ -63,7 +63,12 @@ class S3Helper
 
     # delete the file
     s3_filename.prepend(multisite_upload_path) if Rails.configuration.multisite
-    s3_bucket.object(get_path_for_s3_upload(s3_filename)).delete
+    delete_object(get_path_for_s3_upload(s3_filename))
+  rescue Aws::S3::Errors::NoSuchKey
+  end
+
+  def delete_object(key)
+    s3_bucket.object(key).delete
   rescue Aws::S3::Errors::NoSuchKey
   end
 
diff --git a/spec/jobs/vacate_legacy_prefix_backups_spec.rb b/spec/jobs/vacate_legacy_prefix_backups_spec.rb
new file mode 100644
index 0000000000..dc759792b5
--- /dev/null
+++ b/spec/jobs/vacate_legacy_prefix_backups_spec.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "s3_helper"
+require 'rails_helper'
+
+describe Jobs::VacateLegacyPrefixBackups, type: :multisite do
+  let(:bucket_name) { "backupbucket" }
+
+  before(:all) do
+    @s3_client = Aws::S3::Client.new(stub_responses: true)
+    @s3_options = { client: @s3_client }
+    @objects = []
+    create_backups
+
+    @s3_client.stub_responses(:list_objects_v2, -> (context) do
+      { contents: objects_with_prefix(context) }
+    end)
+  end
+
+  before do
+    SiteSetting.enable_s3_uploads = true
+    SiteSetting.s3_access_key_id = "abc"
+    SiteSetting.s3_secret_access_key = "def"
+    SiteSetting.s3_backup_bucket = bucket_name
+    SiteSetting.backup_location = BackupLocationSiteSetting::S3
+  end
+
+  it "copies the backups from legacy path to new path" do
+    @objects.each do |object|
+      legacy_key = object[:key]
+      legacy_object = @s3_client.get_object(bucket: bucket_name, key: legacy_key)
+
+      @s3_client.expects(:copy_object).with({
+        copy_source: File.join(bucket_name, legacy_key),
+        bucket: bucket_name,
+        key: legacy_key.sub(/^backups\//, "")
+      })
+
+      @s3_client.expects(:delete_object).with(bucket: bucket_name, key: legacy_key).returns(legacy_object)
+    end
+
+    described_class.new.execute_onceoff(s3_options: @s3_options)
+  end
+
+  def objects_with_prefix(context)
+    prefix = context.params[:prefix]
+    @objects.select { |obj| obj[:key].start_with?(prefix) }
+  end
+
+  def create_backups
+    @objects.clear
+
+    @objects << { key: "backups/default/b.tar.gz", size: 17, last_modified: Time.parse("2018-09-13T15:10:00Z") }
+    @objects << { key: "backups/default/filename.tar.gz", size: 17, last_modified: Time.parse("2019-10-18T17:20:00Z") }
+  end
+end
diff --git a/spec/lib/backup_restore/s3_backup_store_spec.rb b/spec/lib/backup_restore/s3_backup_store_spec.rb
index af5a7ca19c..5f6745ff15 100644
--- a/spec/lib/backup_restore/s3_backup_store_spec.rb
+++ b/spec/lib/backup_restore/s3_backup_store_spec.rb
@@ -13,7 +13,7 @@ describe BackupRestore::S3BackupStore do
     @objects = []
 
     def expected_prefix
-      Rails.configuration.multisite ? "backups/#{RailsMultisite::ConnectionManagement.current_db}/" : ""
+      "#{RailsMultisite::ConnectionManagement.current_db}/"
     end
 
     def check_context(context)
@@ -102,26 +102,21 @@ describe BackupRestore::S3BackupStore do
 
   def objects_with_prefix(context)
     prefix = context.params[:prefix]
-
-    if prefix.blank?
-      @objects.reject { |obj| obj[:key].include?("backups/") }
-    else
-      @objects.select { |obj| obj[:key].start_with?(prefix) }
-    end
+    @objects.select { |obj| obj[:key].start_with?(prefix) }
   end
 
   def create_backups
     @objects.clear
 
-    @objects << { key: "b.tar.gz", size: 17, last_modified: Time.parse("2018-09-13T15:10:00Z") }
-    @objects << { key: "a.tgz", size: 29, last_modified: Time.parse("2018-02-11T09:27:00Z") }
-    @objects << { key: "r.sql.gz", size: 11, last_modified: Time.parse("2017-12-20T03:48:00Z") }
-    @objects << { key: "no-backup.txt", size: 12, last_modified: Time.parse("2018-09-05T14:27:00Z") }
-    @objects << { key: "subfolder/c.tar.gz", size: 23, last_modified: Time.parse("2019-01-24T18:44:00Z") }
+    @objects << { key: "default/b.tar.gz", size: 17, last_modified: Time.parse("2018-09-13T15:10:00Z") }
+    @objects << { key: "default/a.tgz", size: 29, last_modified: Time.parse("2018-02-11T09:27:00Z") }
+    @objects << { key: "default/r.sql.gz", size: 11, last_modified: Time.parse("2017-12-20T03:48:00Z") }
+    @objects << { key: "default/no-backup.txt", size: 12, last_modified: Time.parse("2018-09-05T14:27:00Z") }
+    @objects << { key: "default/subfolder/c.tar.gz", size: 23, last_modified: Time.parse("2019-01-24T18:44:00Z") }
 
-    @objects << { key: "backups/second/multi-2.tar.gz", size: 19, last_modified: Time.parse("2018-11-27T03:16:54Z") }
-    @objects << { key: "backups/second/multi-1.tar.gz", size: 22, last_modified: Time.parse("2018-11-26T03:17:09Z") }
-    @objects << { key: "backups/second/subfolder/multi-3.tar.gz", size: 23, last_modified: Time.parse("2019-01-24T18:44:00Z") }
+    @objects << { key: "second/multi-2.tar.gz", size: 19, last_modified: Time.parse("2018-11-27T03:16:54Z") }
+    @objects << { key: "second/multi-1.tar.gz", size: 22, last_modified: Time.parse("2018-11-26T03:17:09Z") }
+    @objects << { key: "second/subfolder/multi-3.tar.gz", size: 23, last_modified: Time.parse("2019-01-24T18:44:00Z") }
   end
 
   def remove_backups

From ce1491e830293891ce0b12bd2a203e6dab31bd9f Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 29 May 2020 00:47:28 +0530
Subject: [PATCH 1425/1830] UX: remove `in:unpinned` filter from advanced
 search page. (#9911)

---
 .../discourse/app/components/search-advanced-options.js   | 3 +--
 config/locales/client.en.yml                              | 1 -
 lib/search.rb                                             | 8 --------
 spec/components/search_spec.rb                            | 7 +------
 test/javascripts/acceptance/search-test.js                | 2 --
 5 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/search-advanced-options.js b/app/assets/javascripts/discourse/app/components/search-advanced-options.js
index a2f6fcfd6a..1be07440d5 100644
--- a/app/assets/javascripts/discourse/app/components/search-advanced-options.js
+++ b/app/assets/javascripts/discourse/app/components/search-advanced-options.js
@@ -21,7 +21,7 @@ const REGEXP_MIN_POST_COUNT_PREFIX = /^min_post_count:/gi;
 const REGEXP_POST_TIME_PREFIX = /^(before|after):/gi;
 const REGEXP_TAGS_REPLACE = /(^(tags?:|#(?=[a-z0-9\-]+::tag))|::tag\s?$)/gi;
 
-const REGEXP_IN_MATCH = /^(in|with):(posted|created|watching|tracking|bookmarks|first|pinned|unpinned|wiki|unseen|image)/gi;
+const REGEXP_IN_MATCH = /^(in|with):(posted|created|watching|tracking|bookmarks|first|pinned|wiki|unseen|image)/gi;
 const REGEXP_SPECIAL_IN_LIKES_MATCH = /^in:likes/gi;
 const REGEXP_SPECIAL_IN_TITLE_MATCH = /^in:title/gi;
 const REGEXP_SPECIAL_IN_PERSONAL_MATCH = /^in:personal/gi;
@@ -51,7 +51,6 @@ export default Component.extend({
     this.inOptionsForAll = [
       { name: I18n.t("search.advanced.filters.first"), value: "first" },
       { name: I18n.t("search.advanced.filters.pinned"), value: "pinned" },
-      { name: I18n.t("search.advanced.filters.unpinned"), value: "unpinned" },
       { name: I18n.t("search.advanced.filters.wiki"), value: "wiki" },
       { name: I18n.t("search.advanced.filters.images"), value: "images" }
     ];
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 1d2615fd6b..3c85e215fb 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2005,7 +2005,6 @@ en:
           bookmarks: I bookmarked
           first: are the very first post
           pinned: are pinned
-          unpinned: are not pinned
           seen: I read
           unseen: I've not read
           wiki: are wiki
diff --git a/lib/search.rb b/lib/search.rb
index 8d76057fc9..fa0a0d769d 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -354,14 +354,6 @@ class Search
     posts.where("topics.pinned_at IS NOT NULL")
   end
 
-  advanced_filter(/^in:unpinned$/) do |posts|
-    if @guardian.user
-      posts.where("topics.pinned_at IS NOT NULL AND topics.id IN (
-                  SELECT topic_id FROM topic_users WHERE user_id = ? AND cleared_pinned_at IS NOT NULL
-                 )", @guardian.user.id)
-    end
-  end
-
   advanced_filter(/^in:wiki$/) do |posts, match|
     posts.where(wiki: true)
   end
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index 599ea3c5aa..1df963bbf9 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -946,7 +946,7 @@ describe Search do
 
   describe 'Advanced search' do
 
-    it 'supports pinned and unpinned' do
+    it 'supports pinned' do
       topic = Fabricate(:topic)
       Fabricate(:post, raw: 'hi this is a test 123 123', topic: topic)
       _post = Fabricate(:post, raw: 'boom boom shake the room', topic: topic)
@@ -957,11 +957,6 @@ describe Search do
       guardian = Guardian.new(user)
 
       expect(Search.execute('boom in:pinned').posts.length).to eq(1)
-      expect(Search.execute('boom in:unpinned', guardian: guardian).posts.length).to eq(0)
-
-      topic.clear_pin_for(user)
-
-      expect(Search.execute('boom in:unpinned', guardian: guardian).posts.length).to eq(1)
     end
 
     it 'supports wiki' do
diff --git a/test/javascripts/acceptance/search-test.js b/test/javascripts/acceptance/search-test.js
index 018e3a08c7..f252bdc5d8 100644
--- a/test/javascripts/acceptance/search-test.js
+++ b/test/javascripts/acceptance/search-test.js
@@ -135,7 +135,6 @@ QUnit.test("Right filters are shown to anonymous users", async assert => {
 
   assert.ok(inSelector.rowByValue("first").exists());
   assert.ok(inSelector.rowByValue("pinned").exists());
-  assert.ok(inSelector.rowByValue("unpinned").exists());
   assert.ok(inSelector.rowByValue("wiki").exists());
   assert.ok(inSelector.rowByValue("images").exists());
 
@@ -161,7 +160,6 @@ QUnit.test("Right filters are shown to logged-in users", async assert => {
 
   assert.ok(inSelector.rowByValue("first").exists());
   assert.ok(inSelector.rowByValue("pinned").exists());
-  assert.ok(inSelector.rowByValue("unpinned").exists());
   assert.ok(inSelector.rowByValue("wiki").exists());
   assert.ok(inSelector.rowByValue("images").exists());
 

From c7d75bc3a0ff6f9052f4cfe3654ab4afe160cf12 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 28 May 2020 18:40:22 -0400
Subject: [PATCH 1426/1830] Minor adjustment to menu-links-header spacing to
 avoid some wrapping

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

diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 24fa749aeb..1e9a0579e4 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -279,8 +279,8 @@ div.menu-links-header {
 
         a {
           // Expand the click area a bit.
-          padding-left: 0.6em;
-          padding-right: 0.6em;
+          padding-left: 0.55em;
+          padding-right: 0.55em;
         }
       }
 
@@ -327,7 +327,7 @@ div.menu-links-header {
     align-items: center;
     display: flex;
     margin: -0.5em 0;
-    max-width: 130px;
+    max-width: 120px;
 
     // `overflow: hidden` on `.user-activity-link` would hide the `::after`
     // pseudo element (used to create the tab-looking effect). Sets `overflow:

From 3b311f6b15be595135aefc87c3754bc62428263e Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 29 May 2020 09:02:34 +0800
Subject: [PATCH 1427/1830] DEV: Bump `rails_failover`.

---
 Gemfile.lock     | 2 +-
 lib/discourse.rb | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2451d913df..6144799fb4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/discourse/rails_failover
-  revision: ba904987444b96a3fb627ed0b145059ff9f1cf6c
+  revision: ab8fd97f4507a09a2084beb13cf96e77f3fcfb6e
   specs:
     rails_failover (0.4.0)
       activerecord (~> 6.0)
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 094ca70aec..66c459da67 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -661,6 +661,10 @@ module Discourse
     # re-establish
     Sidekiq.redis = sidekiq_redis_config
 
+    if ENV['ACTIVE_RECORD_RAILS_FAILOVER']
+      RailsFailover::ActiveRecord.after_fork
+    end
+
     # in case v8 was initialized we want to make sure it is nil
     PrettyText.reset_context
 

From ca28ad8f9ac175d9b8f3b50af647350ae8980c86 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 29 May 2020 10:48:29 +0800
Subject: [PATCH 1428/1830] DEV: Remove `db_id` from sample multisite config.

See https://github.com/discourse/rails_multisite/commit/2bb4d5170cbf462708eb32bb85c035fb1700f7b4
---
 config/multisite.yml.production-sample | 2 --
 1 file changed, 2 deletions(-)

diff --git a/config/multisite.yml.production-sample b/config/multisite.yml.production-sample
index 9c7accece6..752a12d664 100644
--- a/config/multisite.yml.production-sample
+++ b/config/multisite.yml.production-sample
@@ -6,7 +6,6 @@ mlp:
   host: dbhost
   pool: 5
   timeout: 5000
-  db_id: 1	# ensure db_id is unique for each site
   ### If you change this setting you will need to
   ###   - restart sidekiq if you change this setting
   ###   - rebake all to posts using: `RAILS_ENV=production bundle exec rake posts:rebake`
@@ -22,7 +21,6 @@ drwho:
   host: dbhost
   pool: 5
   timeout: 5000
-  db_id: 	# ensure db_id is unique for each site
   ### If you change this setting you will need to
   ###   - restart sidekiq if you change this setting
   ###   - rebake all to posts using: `RAILS_ENV=production bundle exec rake posts:rebake`

From 136835370c414d2836e71d1253fa9e2a20d0db0a Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 29 May 2020 12:57:46 +1000
Subject: [PATCH 1429/1830] FEATURE: optionally allow tags in topic tracking
 state

This feature allows certain plugins to output tag information
to topic tracking state, this allows per tag stats which can be
used by sidebars and other plugins that need per tag stats

Not enabled by default cause this would add cost to a critical
query
---
 app/models/topic_tracking_state.rb       | 20 ++++++++++++++
 spec/models/topic_tracking_state_spec.rb | 35 ++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index 244ce472b9..eb926671b1 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -186,6 +186,14 @@ class TopicTrackingState
               ).where_clause.send(:predicates)[0]
   end
 
+  def self.include_tags_in_report?
+    @include_tags_in_report
+  end
+
+  def self.include_tags_in_report=(v)
+    @include_tags_in_report = v
+  end
+
   def self.report(user, topic_id = nil)
     # Sam: this is a hairy report, in particular I need custom joins and fancy conditions
     #  Dropping to sql_builder so I can make sense of it.
@@ -220,6 +228,18 @@ class TopicTrackingState
       muted_tag_ids: tag_ids
     )
 
+    if SiteSetting.tagging_enabled && TopicTrackingState.include_tags_in_report?
+      sql = <<~SQL
+        WITH X AS (#{sql})
+        SELECT *, (
+          SELECT ARRAY_AGG(name) from topic_tags
+             JOIN tags on tags.id = topic_tags.tag_id
+             WHERE topic_id = X.topic_id
+          ) tags
+        FROM X
+      SQL
+    end
+
     DB.query(
       sql,
         user_id: user.id,
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index db0a13f7d2..3ac528268d 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/spec/models/topic_tracking_state_spec.rb
@@ -548,6 +548,41 @@ describe TopicTrackingState do
 
   end
 
+  context "tag support" do
+    after do
+      # this is a bit of an odd hook, but this is a global change
+      # used by plugins that leverage tagging heavily and need
+      # tag information in topic tracking state
+      TopicTrackingState.include_tags_in_report = false
+    end
+
+    it "correctly handles tags" do
+      SiteSetting.tagging_enabled = true
+
+      post.topic.notifier.watch_topic!(post.topic.user_id)
+
+      DiscourseTagging.tag_topic_by_names(
+        post.topic,
+        Guardian.new(Discourse.system_user),
+        ['bananas', 'apples']
+      )
+
+      TopicTrackingState.include_tags_in_report = true
+
+      report = TopicTrackingState.report(user)
+      expect(report.length).to eq(1)
+      row = report[0]
+      expect(row.tags).to contain_exactly("apples", "bananas")
+
+      TopicTrackingState.include_tags_in_report = false
+
+      report = TopicTrackingState.report(user)
+      expect(report.length).to eq(1)
+      row = report[0]
+      expect(row.respond_to? :tags).to eq(false)
+    end
+  end
+
   it "correctly gets the tracking state" do
     report = TopicTrackingState.report(user)
     expect(report.length).to eq(0)

From 2acec4370bc8b7bbecf297237c590b1f9d8a8f81 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 29 May 2020 12:59:34 +1000
Subject: [PATCH 1430/1830] FIX: muted tags removed topics with no tags from
 counts

We previously did not account for completely untagged topics when
looking at muted tags, this caused new/unread counts to be off if

1. You had muted tags
2. You had an unread/new topic
3. This topic had no tags
---
 app/models/topic_tracking_state.rb       | 26 ++++++++++++++++--------
 spec/models/topic_tracking_state_spec.rb | 10 +++++++++
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index eb926671b1..867961e19d 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -315,18 +315,26 @@ class TopicTrackingState
         "(topics.visible #{append}) AND"
       end
 
-    tags_filter =
-      if opts[:muted_tag_ids].present? && SiteSetting.remove_muted_tags_from_latest == 'always'
-        <<~SQL
-          NOT ((select array_agg(tag_id) from topic_tags where topic_tags.topic_id = topics.id) && ARRAY[#{opts[:muted_tag_ids].join(',')}]) AND
+    tags_filter = ""
+
+    if (muted_tag_ids = opts[:muted_tag_ids]).present? && ['always', 'only_muted'].include?(SiteSetting.remove_muted_tags_from_latest)
+      existing_tags_sql = "(select array_agg(tag_id) from topic_tags where topic_tags.topic_id = topics.id)"
+      muted_tags_array_sql = "ARRAY[#{opts[:muted_tag_ids].join(',')}]"
+
+      if SiteSetting.remove_muted_tags_from_latest == 'always'
+        tags_filter = <<~SQL
+          NOT (
+            COALESCE(#{existing_tags_sql}, ARRAY[]::int[]) && #{muted_tags_array_sql}
+          ) AND
         SQL
-      elsif opts[:muted_tag_ids].present? && SiteSetting.remove_muted_tags_from_latest == 'only_muted'
-        <<~SQL
-          NOT ((select array_agg(tag_id) from topic_tags where topic_tags.topic_id = topics.id) <@ ARRAY[#{opts[:muted_tag_ids].join(',')}]) AND
+      else # only muted
+        tags_filter = <<~SQL
+          NOT (
+            COALESCE(#{existing_tags_sql}, ARRAY[-999]) <@ #{muted_tags_array_sql}
+          ) AND
         SQL
-      else
-        ""
       end
+    end
 
     sql = +<<~SQL
     SELECT #{select}
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index 3ac528268d..ae0f852d63 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/spec/models/topic_tracking_state_spec.rb
@@ -446,6 +446,11 @@ describe TopicTrackingState do
 
       report = TopicTrackingState.report(user)
       expect(report.length).to eq(0)
+
+      TopicTag.where(topic_id: topic.id).delete_all
+
+      report = TopicTrackingState.report(user)
+      expect(report.length).to eq(1)
     end
 
     it "remove_muted_tags_from_latest is set to only_muted" do
@@ -475,6 +480,11 @@ describe TopicTrackingState do
 
       report = TopicTrackingState.report(user)
       expect(report.length).to eq(0)
+
+      TopicTag.where(topic_id: topic.id).delete_all
+
+      report = TopicTrackingState.report(user)
+      expect(report.length).to eq(1)
     end
 
     it "remove_muted_tags_from_latest is set to never" do

From ef5320dd47c328cc105d32f2fd70bffb4e706411 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 29 May 2020 09:06:26 +0530
Subject: [PATCH 1431/1830] FIX: don't rerender whole users page while typing
 on input.

---
 .../discourse/app/controllers/users.js        | 21 +++++++++++++++++++
 .../javascripts/discourse/app/routes/users.js | 16 +++-----------
 .../discourse/app/templates/users.hbs         |  2 +-
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/users.js b/app/assets/javascripts/discourse/app/controllers/users.js
index 89c20efa69..89ddd8f3a1 100644
--- a/app/assets/javascripts/discourse/app/controllers/users.js
+++ b/app/assets/javascripts/discourse/app/controllers/users.js
@@ -2,6 +2,7 @@ import { equal } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
+import { longDate } from "discourse/lib/formatter";
 
 export default Controller.extend({
   application: controller(),
@@ -12,9 +13,29 @@ export default Controller.extend({
   name: "",
   group: null,
   exclude_usernames: null,
+  isLoading: false,
 
   showTimeRead: equal("period", "all"),
 
+  loadUsers(params) {
+    this.set("isLoading", true);
+
+    this.store
+      .find("directoryItem", params)
+      .then(model => {
+        const lastUpdatedAt = model.get("resultSetMeta.last_updated_at");
+        this.setProperties({
+          model,
+          lastUpdatedAt: lastUpdatedAt ? longDate(lastUpdatedAt) : null,
+          period: params.period,
+          nameInput: params.name
+        });
+      })
+      .finally(() => {
+        this.set("isLoading", false);
+      });
+  },
+
   @observes("nameInput")
   _setName: discourseDebounce(function() {
     this.set("name", this.nameInput);
diff --git a/app/assets/javascripts/discourse/app/routes/users.js b/app/assets/javascripts/discourse/app/routes/users.js
index a67e287e44..1e3729d022 100644
--- a/app/assets/javascripts/discourse/app/routes/users.js
+++ b/app/assets/javascripts/discourse/app/routes/users.js
@@ -1,6 +1,5 @@
 import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
-import { longDate } from "discourse/lib/formatter";
 
 export default DiscourseRoute.extend({
   queryParams: {
@@ -37,20 +36,11 @@ export default DiscourseRoute.extend({
   },
 
   model(params) {
-    // If we refresh via `refreshModel` set the old model to loading
-    this._params = params;
-    return this.store.find("directoryItem", params);
+    return params;
   },
 
-  setupController(controller, model) {
-    const params = this._params;
-    const lastUpdatedAt = model.get("resultSetMeta.last_updated_at");
-    controller.setProperties({
-      model,
-      lastUpdatedAt: lastUpdatedAt ? longDate(lastUpdatedAt) : null,
-      period: params.period,
-      nameInput: params.name
-    });
+  setupController(controller, params) {
+    controller.loadUsers(params);
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/app/templates/users.hbs b/app/assets/javascripts/discourse/app/templates/users.hbs
index 1d3450d0f8..0766928a14 100644
--- a/app/assets/javascripts/discourse/app/templates/users.hbs
+++ b/app/assets/javascripts/discourse/app/templates/users.hbs
@@ -16,7 +16,7 @@
           {{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name no-blur"}}
         </div>
 
-        {{#conditional-loading-spinner condition=model.loading}}
+        {{#conditional-loading-spinner condition=isLoading}}
           {{#if model.length}}
 
             <table>

From 31d146892273bc97607cde58b059157de6fd785f Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 29 May 2020 08:05:21 +0200
Subject: [PATCH 1432/1830] UX: reworks various menus to homogenize them
 (#9905)

- bookmark modal menu
- topic-footer-mobile-dropdown
- post-admin-menu
- topic-admin-menu
- quick-access menus
- toolbar-popup-menu
---
 .../app/templates/components/d-editor.hbs     |   1 -
 .../discourse/app/widgets/post-admin-menu.js  |  42 ++-
 .../discourse/app/widgets/topic-admin-menu.js |  87 +++--
 .../discourse/app/widgets/topic-timeline.js   |   2 +-
 .../components/toolbar-popup-menu-options.js  |  20 --
 .../toolbar-popup-menu-options-heading.js     |  10 -
 .../stylesheets/common/base/menu-panel.scss   |  42 ++-
 .../stylesheets/common/base/popup-menu.scss   |  59 ++++
 .../stylesheets/common/base/search-menu.scss  |   4 +
 .../common/base/topic-admin-menu.scss         |  58 +---
 .../stylesheets/common/base/topic-post.scss   |  18 +-
 .../common/components/bookmark-modal.scss     |   1 +
 .../common/components/tap-tile.scss           |  13 +-
 .../toolbar-popup-menu-options.scss           |  40 +--
 .../stylesheets/common/topic-timeline.scss    |   6 +-
 .../stylesheets/desktop/topic-post.scss       | 320 ++++++++----------
 .../topic-footer-mobile-dropdown.scss         |  20 +-
 app/assets/stylesheets/mobile/menu-panel.scss |  11 +-
 app/assets/stylesheets/mobile/topic-post.scss | 154 +++------
 19 files changed, 428 insertions(+), 480 deletions(-)
 delete mode 100644 app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
 create mode 100644 app/assets/stylesheets/common/base/popup-menu.scss

diff --git a/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
index 369acfdd34..0c7cdebded 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
@@ -10,7 +10,6 @@
               onOpen=(action b.action b)
               class=b.className
               options=(hash
-                popupTitle=b.title
                 icon=b.icon
                 focusAfterOnChange=false
               )
diff --git a/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
index fbe2994b3c..072f2166eb 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
@@ -1,4 +1,3 @@
-import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 import { ButtonClass } from "discourse/widgets/button";
@@ -8,6 +7,20 @@ createWidget(
   jQuery.extend(ButtonClass, { tagName: "li.btn" })
 );
 
+createWidget("post-admin-menu-button", {
+  tagName: "li",
+
+  html(attrs) {
+    return this.attach("button", {
+      className: attrs.className,
+      action: attrs.action,
+      icon: attrs.icon,
+      label: attrs.label,
+      secondaryAction: attrs.secondaryAction
+    });
+  }
+});
+
 export function buildManageButtons(attrs, currentUser, siteSettings) {
   if (!currentUser) {
     return [];
@@ -27,7 +40,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
     const buttonAtts = {
       action: "togglePostType",
       icon: "shield-alt",
-      className: "btn-default toggle-post-type"
+      className: "popup-menu-button toggle-post-type"
     };
 
     if (attrs.isModeratorAction) {
@@ -44,14 +57,14 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
         icon: "user-shield",
         label: "post.controls.remove_post_notice",
         action: "removeNotice",
-        className: "btn-default remove-notice"
+        className: "popup-menu-button remove-notice"
       });
     } else {
       contents.push({
         icon: "user-shield",
         label: "post.controls.add_post_notice",
         action: "addNotice",
-        className: "btn-default add-notice"
+        className: "popup-menu-button add-notice"
       });
     }
   }
@@ -61,7 +74,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
       icon: "far-eye",
       label: "post.controls.unhide",
       action: "unhidePost",
-      className: "btn-default unhide-post"
+      className: "popup-menu-button unhide-post"
     });
   }
 
@@ -70,7 +83,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
       icon: "user",
       label: "post.controls.change_owner",
       action: "changePostOwner",
-      className: "btn-default change-owner"
+      className: "popup-menu-button change-owner"
     });
   }
 
@@ -80,7 +93,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
         icon: "certificate",
         label: "post.controls.grant_badge",
         action: "grantBadge",
-        className: "btn-default grant-badge"
+        className: "popup-menu-button grant-badge"
       });
     }
 
@@ -90,7 +103,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
         label: "post.controls.unlock_post",
         action: "unlockPost",
         title: "post.controls.unlock_post_description",
-        className: "btn-default unlock-post"
+        className: "popup-menu-button unlock-post"
       });
     } else {
       contents.push({
@@ -98,7 +111,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
         label: "post.controls.lock_post",
         action: "lockPost",
         title: "post.controls.lock_post_description",
-        className: "btn-default lock-post"
+        className: "popup-menu-button lock-post"
       });
     }
   }
@@ -109,14 +122,14 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
         action: "toggleWiki",
         label: "post.controls.unwiki",
         icon: "far-edit",
-        className: "btn-default wiki wikied"
+        className: "popup-menu-button wiki wikied"
       });
     } else {
       contents.push({
         action: "toggleWiki",
         label: "post.controls.wiki",
         icon: "far-edit",
-        className: "btn-default wiki"
+        className: "popup-menu-button wiki"
       });
     }
   }
@@ -126,7 +139,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
       icon: "file",
       label: "post.controls.publish_page",
       action: "showPagePublish",
-      className: "btn-default publish-page"
+      className: "popup-menu-button publish-page"
     });
   }
 
@@ -135,7 +148,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
       icon: "cog",
       label: "post.controls.rebake",
       action: "rebakePost",
-      className: "btn-default rebuild-html"
+      className: "popup-menu-button rebuild-html"
     });
   }
 
@@ -147,7 +160,6 @@ export default createWidget("post-admin-menu", {
 
   html() {
     const contents = [];
-    contents.push(h("h3", I18n.t("admin_title")));
 
     buildManageButtons(this.attrs, this.currentUser, this.siteSettings).forEach(
       b => {
@@ -156,7 +168,7 @@ export default createWidget("post-admin-menu", {
       }
     );
 
-    return contents;
+    return h("ul", contents);
   },
 
   clickOutside() {
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
index 8e140d0c07..4d0ea65734 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
@@ -1,32 +1,33 @@
-import I18n from "I18n";
 import { createWidget, applyDecorators } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 
 createWidget("admin-menu-button", {
+  tagName: "li",
+
+  buildClasses(attrs) {
+    return attrs.className;
+  },
+
   html(attrs) {
     let className;
     if (attrs.buttonClass) {
       className = attrs.buttonClass;
     }
 
-    return h(
-      "li",
-      { className: attrs.className },
-      this.attach("button", {
-        className,
-        action: attrs.action,
-        url: attrs.url,
-        icon: attrs.icon,
-        label: attrs.fullLabel || `topic.${attrs.label}`,
-        secondaryAction: "hideAdminMenu"
-      })
-    );
+    return this.attach("button", {
+      className,
+      action: attrs.action,
+      url: attrs.url,
+      icon: attrs.icon,
+      label: attrs.fullLabel || `topic.${attrs.label}`,
+      secondaryAction: "hideAdminMenu"
+    });
   }
 });
 
 createWidget("topic-admin-menu-button", {
   tagName: "span",
-  buildKey: () => `topic-admin-menu-button`,
+  buildKey: () => "topic-admin-menu-button",
 
   defaultState() {
     return { expanded: false, position: null };
@@ -52,7 +53,7 @@ createWidget("topic-admin-menu-button", {
       result.push(
         this.attach("button", {
           className:
-            "btn-default toggle-admin-menu" +
+            "popup-menu-button toggle-admin-menu" +
             (attrs.fixed ? " show-topic-admin" : "") +
             (attrs.addKeyboardTargetClass ? " keyboard-target-admin-menu" : ""),
           title: "topic_admin_menu",
@@ -103,7 +104,8 @@ createWidget("topic-admin-menu-button", {
     }
 
     if (this.site.mobileView && !this.attrs.rightSide) {
-      $(".header-cloak").css("display", "block");
+      const headerCloak = document.querySelector(".header-cloak");
+      if (headerCloak) headerCloak.style.display = "block";
     }
 
     this.state.position = position;
@@ -134,7 +136,7 @@ export default createWidget("topic-admin-menu", {
     if (this.currentUser && this.currentUser.get("canManageTopic")) {
       this.addActionButton({
         className: "topic-admin-multi-select",
-        buttonClass: "btn-default",
+        buttonClass: "popup-menu-btn",
         action: "toggleMultiSelect",
         icon: "tasks",
         label: "actions.multi_select"
@@ -143,7 +145,7 @@ export default createWidget("topic-admin-menu", {
       if (details.get("can_delete")) {
         this.addActionButton({
           className: "topic-admin-delete",
-          buttonClass: "btn-danger",
+          buttonClass: "popup-menu-btn-danger",
           action: "deleteTopic",
           icon: "far-trash-alt",
           label: "actions.delete"
@@ -153,7 +155,7 @@ export default createWidget("topic-admin-menu", {
       if (topic.get("deleted") && details.get("can_recover")) {
         this.addActionButton({
           className: "topic-admin-recover",
-          buttonClass: "btn-default",
+          buttonClass: "popup-menu-btn",
           action: "recoverTopic",
           icon: "undo",
           label: "actions.recover"
@@ -163,7 +165,7 @@ export default createWidget("topic-admin-menu", {
       if (topic.get("closed")) {
         this.addActionButton({
           className: "topic-admin-open",
-          buttonClass: "btn-default",
+          buttonClass: "popup-menu-btn",
           action: "toggleClosed",
           icon: "unlock",
           label: "actions.open"
@@ -171,7 +173,7 @@ export default createWidget("topic-admin-menu", {
       } else {
         this.addActionButton({
           className: "topic-admin-close",
-          buttonClass: "btn-default",
+          buttonClass: "popup-menu-btn",
           action: "toggleClosed",
           icon: "lock",
           label: "actions.close"
@@ -180,7 +182,7 @@ export default createWidget("topic-admin-menu", {
 
       this.addActionButton({
         className: "topic-admin-status-update",
-        buttonClass: "btn-default",
+        buttonClass: "popup-menu-btn",
         action: "showTopicStatusUpdate",
         icon: "far-clock",
         label: "actions.timed_update"
@@ -189,7 +191,7 @@ export default createWidget("topic-admin-menu", {
       if (!isPrivateMessage && (topic.get("visible") || featured)) {
         this.addActionButton({
           className: "topic-admin-pin",
-          buttonClass: "btn-default",
+          buttonClass: "popup-menu-btn",
           action: "showFeatureTopic",
           icon: "thumbtack",
           label: featured ? "actions.unpin" : "actions.pin"
@@ -199,7 +201,7 @@ export default createWidget("topic-admin-menu", {
       if (this.currentUser.get("staff")) {
         this.addActionButton({
           className: "topic-admin-change-timestamp",
-          buttonClass: "btn-default",
+          buttonClass: "popup-menu-btn",
           action: "showChangeTimestamp",
           icon: "calendar-alt",
           label: "change_timestamp.title"
@@ -208,7 +210,7 @@ export default createWidget("topic-admin-menu", {
 
       this.addActionButton({
         className: "topic-admin-reset-bump-date",
-        buttonClass: "btn-default",
+        buttonClass: "popup-menu-btn",
         action: "resetBumpDate",
         icon: "anchor",
         label: "actions.reset_bump_date"
@@ -217,7 +219,7 @@ export default createWidget("topic-admin-menu", {
       if (!isPrivateMessage) {
         this.addActionButton({
           className: "topic-admin-archive",
-          buttonClass: "btn-default",
+          buttonClass: "popup-menu-btn",
           action: "toggleArchived",
           icon: "folder",
           label: topic.get("archived") ? "actions.unarchive" : "actions.archive"
@@ -226,7 +228,7 @@ export default createWidget("topic-admin-menu", {
 
       this.addActionButton({
         className: "topic-admin-visible",
-        buttonClass: "btn-default",
+        buttonClass: "popup-menu-btn",
         action: "toggleVisibility",
         icon: visible ? "far-eye-slash" : "far-eye",
         label: visible ? "actions.invisible" : "actions.visible"
@@ -235,7 +237,7 @@ export default createWidget("topic-admin-menu", {
       if (details.get("can_convert_topic")) {
         this.addActionButton({
           className: "topic-admin-convert",
-          buttonClass: "btn-default",
+          buttonClass: "popup-menu-btn",
           action: isPrivateMessage
             ? "convertToPublicTopic"
             : "convertToPrivateMessage",
@@ -249,7 +251,7 @@ export default createWidget("topic-admin-menu", {
       if (this.currentUser.get("staff")) {
         this.addActionButton({
           icon: "list",
-          buttonClass: "btn-default",
+          buttonClass: "popup-menu-btn",
           fullLabel: "review.moderation_history",
           url: `/review?topic_id=${topic.id}&status=all`
         });
@@ -300,26 +302,13 @@ export default createWidget("topic-admin-menu", {
       this.attrs,
       this.state
     );
-    return [
-      h("div.header", [
-        h("h3", I18n.t("topic.actions.title")),
-        h(
-          "div",
-          this.attach("button", {
-            action: "clickOutside",
-            icon: "times",
-            className: "close-button"
-          })
-        )
-      ]),
-      h(
-        "ul",
-        attrs.actionButtons
-          .concat(extraButtons)
-          .filter(Boolean)
-          .map(b => this.attach("admin-menu-button", b))
-      )
-    ];
+    return h(
+      "ul",
+      attrs.actionButtons
+        .concat(extraButtons)
+        .filter(Boolean)
+        .map(b => this.attach("admin-menu-button", b))
+    );
   },
 
   clickOutside() {
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-timeline.js b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
index 55dcafa553..cc3785acca 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
@@ -359,7 +359,7 @@ createWidget("timeline-footer-controls", {
       if (topic.get("details.can_create_post")) {
         controls.push(
           this.attach("button", {
-            className: "btn-default create",
+            className: "btn-default create reply-to-post",
             icon: "reply",
             title: "topic.reply.help",
             action: "replyToPost"
diff --git a/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options.js b/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options.js
index 2fffef964c..287d54824a 100644
--- a/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options.js
+++ b/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options.js
@@ -1,36 +1,16 @@
 import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 
-const HEADING_COLLECTION = "HEADING_COLLECTION";
-
 export default DropdownSelectBoxComponent.extend({
   pluginApiIdentifiers: ["toolbar-popup-menu-options"],
   classNames: ["toolbar-popup-menu-options"],
 
-  init() {
-    this._super(...arguments);
-
-    this.prependCollection(HEADING_COLLECTION);
-  },
-
   selectKitOptions: {
     showFullTitle: false,
     filterable: false,
     autoFilterable: false
   },
 
-  modifyContentForCollection(collection) {
-    if (collection === HEADING_COLLECTION) {
-      return { title: this.selectKit.options.popupTitle };
-    }
-  },
-
-  modifyComponentForCollection(collection) {
-    if (collection === HEADING_COLLECTION) {
-      return "toolbar-popup-menu-options/toolbar-popup-menu-options-heading";
-    }
-  },
-
   modifyContent(contents) {
     return contents
       .map(content => {
diff --git a/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js b/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
deleted file mode 100644
index 1625cf3e5b..0000000000
--- a/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import Component from "@ember/component";
-import { reads } from "@ember/object/computed";
-
-export default Component.extend({
-  tagName: "h3",
-  layoutName:
-    "select-kit/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading",
-  classNames: ["toolbar-popup-menu-options-heading"],
-  heading: reads("collection.content.title")
-});
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 1e9a0579e4..e07095f500 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -66,14 +66,20 @@
 .menu-panel {
   li,
   li.heading {
-    a.widget-link {
+    a.widget-link,
+    a.categories-link {
       padding: 0.25em 0.5em;
       display: block;
+      color: $primary;
       &:hover,
       &:focus {
         background-color: $highlight-medium;
         outline: none;
       }
+
+      .d-icon {
+        color: $primary-medium;
+      }
     }
 
     .new {
@@ -83,11 +89,6 @@
     }
   }
 
-  .categories-link {
-    display: block;
-    padding: 0.25em 0.5em;
-  }
-
   li.category-link {
     float: left;
     background-color: transparent;
@@ -101,6 +102,10 @@
       &:hover,
       &:focus {
         background: transparent;
+
+        .category-name {
+          color: $primary;
+        }
       }
     }
     .badge-notification {
@@ -163,6 +168,7 @@
     .icon {
       color: $primary-high;
     }
+
     li {
       background-color: $tertiary-low;
 
@@ -184,6 +190,7 @@
 
       a {
         padding: 0;
+
         > div {
           overflow: hidden; // clears the text from wrapping below icons
           overflow-wrap: anywhere;
@@ -204,11 +211,14 @@
       }
     }
     li:not(.show-all) {
-      padding: 0.25em 0.5em;
+      padding: 0;
+      a {
+        display: flex;
+        align-items: center;
+        padding: 0.25em 0.5em;
+      }
       .d-icon {
-        float: left;
-        margin-right: 5px;
-        padding-top: 0.2em;
+        margin-right: 0.5em;
       }
     }
     .is-warning {
@@ -246,6 +256,18 @@
     }
     /* as a big ol' click target, don't let text inside be selected */
     @include unselectable;
+
+    &.quick-access-profile {
+      li:not(.show-all) a {
+        color: $primary;
+        .d-icon {
+          color: $primary-medium;
+        }
+
+        // accounts for menu "ears" 4px + border 1px
+        padding: 0.25em calc(0.5em + 4px + 1px);
+      }
+    }
   }
 
   .dismiss-link {
diff --git a/app/assets/stylesheets/common/base/popup-menu.scss b/app/assets/stylesheets/common/base/popup-menu.scss
new file mode 100644
index 0000000000..2df35b5a4c
--- /dev/null
+++ b/app/assets/stylesheets/common/base/popup-menu.scss
@@ -0,0 +1,59 @@
+.popup-menu {
+  background-color: $secondary;
+  width: 215px;
+  border: 1px solid $primary-low;
+  z-index: z("dropdown");
+  box-shadow: shadow("card");
+
+  ul {
+    margin: 0;
+    list-style: none;
+
+    li {
+      border-bottom: 1px solid rgba($primary-low, 0.5);
+
+      &:last-child {
+        border: none;
+      }
+    }
+  }
+
+  .btn {
+    text-align: left;
+    background: none;
+    width: 100%;
+    padding: 0.75em;
+    border-radius: 0;
+
+    .d-icon {
+      color: $primary-medium;
+    }
+
+    &:hover {
+      color: $primary;
+      background: $tertiary-low;
+
+      .d-icon {
+        color: $primary-medium;
+      }
+    }
+
+    &.popup-menu-btn-danger {
+      .d-icon {
+        color: $danger;
+      }
+
+      .d-button-label {
+        color: $primary;
+      }
+
+      &:hover {
+        .d-icon,
+        .d-button-label {
+          color: $danger;
+        }
+        background: $danger-low;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss
index c3b6813e2c..530a13333c 100644
--- a/app/assets/stylesheets/common/base/search-menu.scss
+++ b/app/assets/stylesheets/common/base/search-menu.scss
@@ -68,6 +68,10 @@
           display: contents;
         }
       }
+
+      a.widget-link {
+        color: $tertiary;
+      }
     }
 
     .main-results {
diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss
index f310bc76e2..3af52a2793 100644
--- a/app/assets/stylesheets/common/base/topic-admin-menu.scss
+++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss
@@ -1,41 +1,6 @@
 // Styles for the topic admin menu
 
-.show-topic-admin {
-  position: fixed;
-  top: 120px;
-  right: 10px;
-  z-index: z("dropdown");
-  height: 35px;
-}
-
-.popup-menu {
-  background-color: $secondary;
-  width: 215px;
-  padding: 10px;
-  border: 1px solid $primary-low;
-  z-index: z("dropdown");
-  box-shadow: shadow("card");
-
-  ul {
-    list-style: none;
-    margin: 10px 0 0 0;
-  }
-
-  .btn {
-    text-align: left;
-  }
-
-  button {
-    width: 100%;
-    margin-bottom: 5px;
-  }
-
-  .header {
-    .close-button {
-      display: none;
-    }
-  }
-
+.topic-admin-popup-menu {
   @include breakpoint(mobile-extra-large) {
     width: 100%;
     padding: 0;
@@ -51,19 +16,6 @@
       }
     }
     animation: slideUp 0.3s;
-
-    .header {
-      padding: 10px 0 0 10px;
-      display: flex;
-      justify-content: space-between;
-      .close-button {
-        display: block;
-        background: transparent;
-      }
-    }
-    ul {
-      margin-top: 0;
-    }
   }
 
   .mobile-view & {
@@ -71,6 +23,14 @@
   }
 }
 
+.show-topic-admin {
+  position: fixed;
+  top: 120px;
+  right: 10px;
+  z-index: z("dropdown");
+  height: 35px;
+}
+
 .modal-body.feature-topic {
   max-height: 500px;
   input.date-picker {
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 48c361c164..1efad4f214 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -833,12 +833,6 @@ a.mention-group {
   }
 }
 
-.popup-menu {
-  h3 {
-    margin-top: 0;
-  }
-}
-
 .suggested-topics {
   .topics {
     padding-bottom: 15px;
@@ -1053,3 +1047,15 @@ a.mention-group {
     }
   }
 }
+
+.post-admin-menu {
+  display: inline-flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  width: auto;
+  max-width: 320px;
+  position: absolute;
+  text-align: left;
+  bottom: -2px;
+  right: 15px;
+}
diff --git a/app/assets/stylesheets/common/components/bookmark-modal.scss b/app/assets/stylesheets/common/components/bookmark-modal.scss
index bf81e4ddfe..8d65fb4866 100644
--- a/app/assets/stylesheets/common/components/bookmark-modal.scss
+++ b/app/assets/stylesheets/common/components/bookmark-modal.scss
@@ -15,6 +15,7 @@
     }
 
     .ember-text-field.bookmark-name {
+      min-width: 220px;
       width: 100%;
       margin-bottom: 0.5em;
     }
diff --git a/app/assets/stylesheets/common/components/tap-tile.scss b/app/assets/stylesheets/common/components/tap-tile.scss
index e558b7adbf..51f2264fac 100644
--- a/app/assets/stylesheets/common/components/tap-tile.scss
+++ b/app/assets/stylesheets/common/components/tap-tile.scss
@@ -4,14 +4,17 @@
 
   .tap-tile {
     color: $primary-high;
-    padding: 0.75em;
+    padding: 0.75em 0.25em;
     display: flex;
     flex-wrap: wrap;
     align-items: center;
-    border: 1px solid $primary-low;
-    margin: 0 0 0.5em;
+    border-bottom: 1px solid $primary-low;
     cursor: pointer;
 
+    &:first-child {
+      border-top: 1px solid $primary-low;
+    }
+
     &:hover {
       background-color: $tertiary-low;
     }
@@ -21,12 +24,12 @@
     }
 
     .d-icon {
-      color: $primary-medium;
+      color: $primary-high;
       margin: 0 0.5em 0 0;
     }
 
     .tap-tile-title {
-      font-weight: bold;
+      color: $primary;
       margin-right: auto;
     }
 
diff --git a/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss b/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
index 1077358f9b..3b52aecd12 100644
--- a/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
+++ b/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
@@ -3,52 +3,32 @@
     &.toolbar-popup-menu-options {
       .select-kit-body {
         box-shadow: none;
-        padding: 0.5em 0.5em 0.25em 0.5em;
         width: 230px;
-      }
-
-      .toolbar-popup-menu-options-heading {
-        width: 100%;
+        border-radius: 0;
       }
 
       .select-kit-row {
-        margin-bottom: 0.25em;
-        padding: 0.5em 0.25em;
-        background: $primary-low;
-        transition: all 0.25s;
+        padding: 0.75em 0.5em;
+        border-bottom: 1px solid rgba($primary-low, 0.5);
+
+        &:last-child {
+          border: none;
+        }
 
         .texts .name,
         .icons .d-icon {
           font-size: $font-0;
           font-weight: normal;
-          color: $primary;
         }
 
         .d-icon {
-          opacity: 0.7;
-        }
-
-        &.is-highlighted {
-          background: $primary-medium;
-
-          .name,
-          .d-icon {
-            color: $secondary;
-          }
+          color: $primary-high;
         }
 
+        &.is-highlighted,
+        &.is-selected,
         &:hover {
-          background: $primary-medium;
-          color: $secondary;
-        }
-
-        &.is-selected {
-          color: $primary;
           background: $primary-low;
-        }
-
-        &.is-selected.is-highlighted {
-          background: $primary-medium;
           color: $primary;
         }
       }
diff --git a/app/assets/stylesheets/common/topic-timeline.scss b/app/assets/stylesheets/common/topic-timeline.scss
index 2d13a8a5de..80d3ab37e8 100644
--- a/app/assets/stylesheets/common/topic-timeline.scss
+++ b/app/assets/stylesheets/common/topic-timeline.scss
@@ -178,10 +178,6 @@
 
     .timeline-controls {
       margin-bottom: 1em;
-
-      button {
-        margin-right: 0.5em;
-      }
     }
 
     .timeline-footer-controls {
@@ -189,7 +185,7 @@
       transition: opacity 0.2s ease-in;
       display: flex;
 
-      button {
+      .reply-to-post {
         margin-right: 0.5em;
       }
 
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 5adc17d3eb..8a395b5301 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -53,93 +53,6 @@ section.post-menu-area {
 nav.post-controls {
   padding: 0;
 
-  // Some buttons can be doubled up, like likes or flags
-  .double-button {
-    display: inline-flex;
-    color: $primary-low-mid;
-    margin-right: 0.15em;
-    &:hover {
-      button {
-        background: $primary-low;
-        color: $primary-medium;
-      }
-    }
-    button {
-      // It looks really confusing when one half a double button has an inner shadow on click.
-      &:active {
-        box-shadow: none;
-      }
-      margin-left: 0;
-      margin-right: 0;
-      &.my-likes,
-      &.read-indicator,
-      &.regular-likes {
-        // Like count on posts
-        .d-icon {
-          color: $primary-low-mid;
-          padding-left: 0.45em;
-        }
-      }
-      &.like {
-        // Like button with 0 likes
-        &.d-hover {
-          background: $love-low;
-          .d-icon {
-            color: $love;
-          }
-        }
-      }
-      &.has-like {
-        // Like button after I've liked
-        .d-icon {
-          color: $love;
-        }
-        &.d-hover {
-          background: $primary-low;
-          .d-icon {
-            color: $primary-medium;
-          }
-        }
-      }
-      &[disabled] {
-        // Disabled like button
-        cursor: not-allowed;
-      }
-      &.button-count {
-        // Like count button
-        &:not(.my-likes) {
-          padding-right: 0;
-        }
-        &.d-hover {
-          color: $primary;
-        }
-        + .toggle-like {
-          // Like button when like count is present
-          padding-left: 0.45em;
-          &.d-hover {
-            background: $primary-low;
-          }
-        }
-      }
-    }
-  }
-  a,
-  button {
-    color: dark-light-choose($primary-low-mid, $secondary-high);
-    .d-icon {
-      opacity: 1;
-    }
-    margin-right: 2px;
-    display: inline-block;
-  }
-  a.toggle-likes {
-    padding: 8px 0;
-    margin-right: -3px;
-  }
-  span.badge-posts {
-    margin-right: 5px;
-    transition: all linear 0.15s;
-  }
   .actions {
     text-align: right;
     float: right;
@@ -148,100 +61,157 @@ nav.post-controls {
       display: none;
       overflow: hidden;
     }
-  }
-  .show-replies {
-    margin-left: -10px;
-    font-size: inherit;
-    span.badge-posts {
-      color: dark-light-choose($primary-medium, $secondary-high);
+
+    // Some buttons can be doubled up, like likes or flags
+    .double-button {
+      display: inline-flex;
+      color: $primary-low-mid;
+      margin-right: 0.15em;
+      &:hover {
+        button {
+          background: $primary-low;
+          color: $primary-medium;
+        }
+      }
+      button {
+        // It looks really confusing when one half a double button has an inner shadow on click.
+        &:active {
+          box-shadow: none;
+        }
+        margin-left: 0;
+        margin-right: 0;
+        &.my-likes,
+        &.read-indicator,
+        &.regular-likes {
+          // Like count on posts
+          .d-icon {
+            color: $primary-low-mid;
+            padding-left: 0.45em;
+          }
+        }
+        &.like {
+          // Like button with 0 likes
+          &.d-hover {
+            background: $love-low;
+            .d-icon {
+              color: $love;
+            }
+          }
+        }
+        &.has-like {
+          // Like button after I've liked
+          .d-icon {
+            color: $love;
+          }
+          &.d-hover {
+            background: $primary-low;
+            .d-icon {
+              color: $primary-medium;
+            }
+          }
+        }
+        &[disabled] {
+          // Disabled like button
+          cursor: not-allowed;
+        }
+        &.button-count {
+          // Like count button
+          &:not(.my-likes) {
+            padding-right: 0;
+          }
+          &.d-hover {
+            color: $primary;
+          }
+          + .toggle-like {
+            // Like button when like count is present
+            padding-left: 0.45em;
+            &.d-hover {
+              background: $primary-low;
+            }
+          }
+        }
+      }
     }
-    &:hover {
-      background: $primary-low;
+    a,
+    button {
+      color: dark-light-choose($primary-low-mid, $secondary-high);
+      .d-icon {
+        opacity: 1;
+      }
+      margin-right: 2px;
+      display: inline-block;
+    }
+    a.toggle-likes {
+      padding: 8px 0;
+      margin-right: -3px;
+    }
+    span.badge-posts {
+      margin-right: 5px;
+      transition: all linear 0.15s;
+    }
+    .show-replies {
+      margin-left: -10px;
+      font-size: inherit;
       span.badge-posts {
+        color: dark-light-choose($primary-medium, $secondary-high);
+      }
+      &:hover {
+        background: $primary-low;
+        span.badge-posts {
+          color: $primary;
+        }
+      }
+      .d-icon {
+        margin-left: 5px;
+        font-size: $font-down-1;
+      }
+    }
+    button.create {
+      margin-right: 0;
+      color: dark-light-choose($primary-high, $secondary-low);
+      margin-left: 10px;
+      .d-icon {
+        color: dark-light-choose($primary-high, $secondary-low);
+      }
+    }
+    .create .d-icon {
+      margin-right: 5px;
+    }
+    button {
+      font-size: $font-up-1;
+      padding: 8px 10px;
+      vertical-align: top;
+      background: transparent;
+      border: none;
+      margin-left: 3px;
+      &.d-hover,
+      &:focus {
+        background: $primary-low;
         color: $primary;
       }
-    }
-    .d-icon {
-      margin-left: 5px;
-      font-size: $font-down-1;
-    }
-  }
-  button.create {
-    margin-right: 0;
-    color: dark-light-choose($primary-high, $secondary-low);
-    margin-left: 10px;
-    .d-icon {
-      color: dark-light-choose($primary-high, $secondary-low);
-    }
-  }
-  .create .d-icon {
-    margin-right: 5px;
-  }
-  button {
-    font-size: $font-up-1;
-    padding: 8px 10px;
-    vertical-align: top;
-    background: transparent;
-    border: none;
-    margin-left: 3px;
-    &.d-hover,
-    &:focus {
-      background: $primary-low;
-      color: $primary;
-    }
-    &:active {
-      box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.4);
-    }
-    &.hidden {
-      display: none;
-    }
-    &.admin {
-      position: relative;
-    }
-    &.delete.d-hover,
-    &.delete:hover,
-    &.delete:focus {
-      background: $danger;
-      color: $secondary;
-      .d-icon {
+      &:active {
+        box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.4);
+      }
+      &.hidden {
+        display: none;
+      }
+      &.admin {
+        position: relative;
+      }
+      &.delete.d-hover,
+      &.delete:hover,
+      &.delete:focus {
+        background: $danger;
         color: $secondary;
+        .d-icon {
+          color: $secondary;
+        }
       }
-    }
-    &.bookmark {
-      padding: 8px 11px;
-      &.bookmarked .d-icon {
-        color: $tertiary;
-      }
-    }
-  }
-  .post-admin-menu {
-    display: inline-flex;
-    flex-direction: column;
-    box-sizing: border-box;
-    background-color: $secondary;
-    width: auto;
-    max-width: 320px;
-    padding: 10px;
-    border: 1px solid $primary-low;
-    position: absolute;
-    text-align: left;
-    bottom: -2px;
-    right: 15px;
-    z-index: z("dropdown");
-    h3 {
-      margin-top: 0;
-      color: $primary;
-      font-size: $font-0;
-    }
-    ul {
-      list-style: none;
-      margin: 10px 0 0 0;
-    }
-    li {
-      margin-bottom: 5px;
-      .d-icon {
-        width: 14px;
-        margin-right: 10px;
+      &.bookmark {
+        padding: 8px 11px;
+        &.bookmarked .d-icon {
+          color: $tertiary;
+        }
       }
     }
   }
diff --git a/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss b/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss
index 932ddf346f..5900201eba 100644
--- a/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss
+++ b/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss
@@ -2,9 +2,25 @@
   &.combo-box {
     &.topic-footer-mobile-dropdown {
       .select-kit-row {
-        .svg-icon-title {
-          margin-right: 0.5em;
+        padding: 0.75em 0.5em;
+        border-bottom: 1px solid rgba($primary-low, 0.5);
+
+        &:last-child {
+          border: none;
         }
+
+        .d-icon {
+          color: $primary-high;
+        }
+
+        &.is-highlighted {
+          background: $primary-low;
+
+          .name {
+            color: $primary;
+          }
+        }
+
         &.bookmarked {
           .d-icon {
             color: $tertiary;
diff --git a/app/assets/stylesheets/mobile/menu-panel.scss b/app/assets/stylesheets/mobile/menu-panel.scss
index ab6a5e33cc..d3cb727d86 100644
--- a/app/assets/stylesheets/mobile/menu-panel.scss
+++ b/app/assets/stylesheets/mobile/menu-panel.scss
@@ -16,8 +16,11 @@
   }
 }
 
-.user-menu .quick-access-profile li:not(.show-all) {
-  margin: 0.5em 0 0.75em;
-  padding: 0.75em;
-  border: 1px solid $primary-low;
+.user-menu .quick-access-panel.quick-access-profile li:not(.show-all) {
+  border-bottom: 1px solid $primary-low;
+
+  a {
+    // accounts for menu "ears" 4px + border 1px
+    padding: 0.75em calc(0.5em + 4px + 1px);
+  }
 }
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index d84b4a727c..3f8729739a 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -31,69 +31,70 @@ span.badge-posts {
     color: dark-light-choose($primary-low-mid, $secondary-high);
     .actions {
       display: flex;
-    }
-    // Handles the like and flag buttons in the post menu.
-    .double-button {
-      display: flex;
-      flex: 0 1 auto;
-      align-items: center;
-      button {
-        &.like,
-        &.read-indicator,
-        &.create-flag {
-          flex: 1 1 auto;
-        }
-        &.button-count {
-          padding: 8px 4px 8px 8px;
-          + .toggle-like,
-          + .create-flag {
-            padding: 8px 8px 8px 4px;
+
+      // Handles the like and flag buttons in the post menu.
+      .double-button {
+        display: flex;
+        flex: 0 1 auto;
+        align-items: center;
+        button {
+          &.like,
+          &.read-indicator,
+          &.create-flag {
+            flex: 1 1 auto;
           }
-          &.my-likes,
-          &.regular-likes {
-            display: flex;
-            max-width: unset;
-            padding: 8px;
-            .d-icon {
-              padding-left: 8px;
+          &.button-count {
+            padding: 8px 4px 8px 8px;
+            + .toggle-like,
+            + .create-flag {
+              padding: 8px 8px 8px 4px;
+            }
+            &.my-likes,
+            &.regular-likes {
+              display: flex;
+              max-width: unset;
+              padding: 8px;
+              .d-icon {
+                padding-left: 8px;
+              }
             }
           }
         }
       }
-    }
-    .d-icon {
-      opacity: 1;
-    }
-    button {
-      border: none;
-      font-size: $font-up-1;
-      padding: 10px 8px;
-      background: transparent;
-      flex: 1 1 auto;
-      max-width: 45px;
-      &.hidden {
-        display: none;
+      .d-icon {
+        opacity: 1;
       }
-      &.admin {
-        position: relative;
-      }
-      &.expand-post {
-        margin: 10px 0 10px 0;
-      }
-      &.reply {
-        .d-icon {
-          color: $primary-high;
+      button {
+        border: none;
+        font-size: $font-up-1;
+        padding: 10px 8px;
+        background: transparent;
+        flex: 1 1 auto;
+        max-width: 45px;
+        &.hidden {
+          display: none;
         }
-        margin-left: auto;
-      }
-      &.has-like {
-        .d-icon {
-          color: $love;
+        &.admin {
+          position: relative;
         }
-      }
-      &.bookmarked {
-        .d-icon {
-          color: $tertiary;
+        &.expand-post {
+          margin: 10px 0 10px 0;
+        }
+        &.reply {
+          .d-icon {
+            color: $primary-high;
+          }
+          margin-left: auto;
+        }
+        &.has-like {
+          .d-icon {
+            color: $love;
+          }
+        }
+        &.bookmarked {
+          .d-icon {
+            color: $tertiary;
+          }
         }
       }
     }
@@ -101,38 +102,11 @@ span.badge-posts {
 }
 
 .post-admin-menu {
-  display: inline-flex;
-  flex-direction: column;
-  box-sizing: border-box;
-  background-color: $secondary;
-  width: auto;
-  max-width: 320px;
-  padding: 10px;
-  border: 1px solid $primary-low;
-  position: absolute;
-  text-align: left;
   bottom: -50px;
   left: 135px;
   @media screen and (max-width: 374px) {
     left: 50px;
   }
-  z-index: z("dropdown");
-  h3 {
-    margin-top: 0;
-    color: $primary;
-    font-size: $font-0;
-  }
-  ul {
-    list-style: none;
-    margin: 10px 0 0 0;
-  }
-  li {
-    margin-bottom: 5px;
-    .d-icon {
-      width: 14px;
-      margin-right: 10px;
-    }
-  }
 }
 
 .embedded-posts {
@@ -466,22 +440,6 @@ span.highlighted {
   }
 }
 
-.popup-menu,
-#topic-footer-buttons .popup-menu {
-  h3 {
-    margin-bottom: 0;
-  }
-
-  ul div li {
-    border-bottom: 0.25em solid transparent;
-    border-top: 0.25em solid transparent;
-
-    button.btn {
-      margin-bottom: 0;
-    }
-  }
-}
-
 .post-notice {
   margin-bottom: 1em;
   &.old {

From 4be45bec7e4fc0f895907ce09222ae865e01098e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 29 May 2020 08:34:19 +0200
Subject: [PATCH 1433/1830] UI: homogenise topic-footer-mobile-dropdown styles
 (#9919)

---
 .../mobile/components/topic-footer-mobile-dropdown.scss       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss b/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss
index 5900201eba..54b2567fca 100644
--- a/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss
+++ b/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss
@@ -10,11 +10,11 @@
         }
 
         .d-icon {
-          color: $primary-high;
+          color: $primary-medium;
         }
 
         &.is-highlighted {
-          background: $primary-low;
+          background: $tertiary-low;
 
           .name {
             color: $primary;

From d7d5bb4454c2e707b658778bffac306bf8c1a604 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 29 May 2020 09:35:43 +0200
Subject: [PATCH 1434/1830] UX: homogenises sk row padding and topic-admin-menu
 (#9920)

---
 .../stylesheets/common/base/topic-admin-menu.scss    |  3 ++-
 .../stylesheets/common/select-kit/combo-box.scss     |  4 ++--
 .../common/select-kit/dropdown-select-box.scss       |  1 -
 .../common/select-kit/mini-tag-chooser.scss          |  8 +++++++-
 .../stylesheets/common/select-kit/select-kit.scss    |  2 +-
 .../mobile/select-kit/dropdown-select-box.scss       |  4 ----
 app/assets/stylesheets/mobile/topic.scss             | 12 ++----------
 7 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss
index 3af52a2793..a12e65fe0c 100644
--- a/app/assets/stylesheets/common/base/topic-admin-menu.scss
+++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss
@@ -2,7 +2,8 @@
 
 .topic-admin-popup-menu {
   @include breakpoint(mobile-extra-large) {
-    width: 100%;
+    width: calc(100% - 20px);
+    margin: 0 10px;
     padding: 0;
     padding-bottom: env(safe-area-inset-bottom);
     z-index: z("modal", "popover");
diff --git a/app/assets/stylesheets/common/select-kit/combo-box.scss b/app/assets/stylesheets/common/select-kit/combo-box.scss
index 863e9fc336..d592023138 100644
--- a/app/assets/stylesheets/common/select-kit/combo-box.scss
+++ b/app/assets/stylesheets/common/select-kit/combo-box.scss
@@ -8,7 +8,7 @@
     .select-kit-row {
       margin: 0;
       min-height: 1px;
-      padding: 6px 10px;
+
       &.no-content {
         font-weight: normal;
       }
@@ -53,7 +53,7 @@
           line-height: $line-height-medium;
           font-weight: bold;
           display: block;
-          padding: 6px 10px;
+          padding: 0.75em;
           color: $tertiary;
 
           &:hover {
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index 5221072afa..fa6e12dea5 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -21,7 +21,6 @@
 
     .select-kit-row {
       margin: 0;
-      padding: 10px 5px;
 
       .icons {
         display: -webkit-box;
diff --git a/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss b/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
index 27c302e868..b167d54095 100644
--- a/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
@@ -46,8 +46,14 @@
           background: $tertiary-low;
         }
 
+        .discourse-tag {
+          &:hover {
+            color: $primary;
+          }
+        }
+
         .discourse-tag-count {
-          margin-left: 5px;
+          margin-left: 0.5em;
         }
       }
 
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index a9769b5971..f1c61c019a 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -139,13 +139,13 @@
 
   .select-kit-row {
     cursor: pointer;
-    line-height: $line-height-medium;
     outline: none;
     display: flex;
     flex: 1 0 auto;
     box-sizing: border-box;
     align-items: center;
     justify-content: flex-start;
+    padding: 0.75em;
 
     .name {
       margin: 0;
diff --git a/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss
index 294b4a8b0e..5d4c46832b 100644
--- a/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss
@@ -6,7 +6,3 @@
     }
   }
 }
-
-.select-kit.combo-box .select-kit-row {
-  padding: 10px;
-}
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index ae82843411..f2fcdfd7ba 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -241,16 +241,8 @@ sub sub {
       @media screen and (max-width: 550px) {
         grid-template-columns: 1fr 1fr;
       }
-      > div {
-        margin-right: 0.5em;
-        overflow: hidden;
-        &:nth-of-type(2) {
-          // move delete further from modal close
-          order: 12;
-        }
-        button {
-          @include ellipsis;
-        }
+      .popup-menu-btn {
+        @include ellipsis;
       }
     }
   }

From 81de59280448f8571d33aa7fd0856e3ee8481a9e Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 29 May 2020 15:46:12 +0800
Subject: [PATCH 1435/1830] PERF: Use more efficient query when checking for
 existence.

---
 app/controllers/invites_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index a1bbedc5ce..a21b3af346 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -84,7 +84,7 @@ class InvitesController < ApplicationController
     guardian.ensure_can_invite_to_forum!(groups)
     group_ids = groups.map(&:id)
 
-    invite_exists = Invite.where(email: params[:email], invited_by_id: current_user.id).first
+    invite_exists = Invite.exists?(email: params[:email], invited_by_id: current_user.id)
     if invite_exists && !guardian.can_send_multiple_invites?(current_user)
       return render json: failed_json, status: 422
     end
@@ -114,7 +114,7 @@ class InvitesController < ApplicationController
 
     group_ids = groups.map(&:id)
 
-    invite_exists = Invite.where(email: params[:email], invited_by_id: current_user.id).first
+    invite_exists = Invite.exists?(email: params[:email], invited_by_id: current_user.id)
     if invite_exists && !guardian.can_send_multiple_invites?(current_user)
       return render json: failed_json, status: 422
     end

From f3dee5863ff6b9038426541d36c1a13ccfc39a46 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 29 May 2020 10:21:21 +0200
Subject: [PATCH 1436/1830] FIX: pins down highlight.js to the last commit of
 the v9 tree (#9921)

The 10+ version has actually a bug with bash. We will wait a little bit before upgrading to 10, we should also make sure any of the breaking changes listed here https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_BREAKING_CHANGES.md are not impacting us.
---
 package.json                                                | 2 +-
 vendor/assets/javascripts/highlightjs/highlight.min.js      | 4 ++--
 vendor/assets/javascripts/highlightjs/languages/1c.min.js   | 2 +-
 vendor/assets/javascripts/highlightjs/languages/abnf.min.js | 2 +-
 .../javascripts/highlightjs/languages/accesslog.min.js      | 2 +-
 .../javascripts/highlightjs/languages/actionscript.min.js   | 2 +-
 vendor/assets/javascripts/highlightjs/languages/ada.min.js  | 2 +-
 .../javascripts/highlightjs/languages/angelscript.min.js    | 2 +-
 .../assets/javascripts/highlightjs/languages/apache.min.js  | 2 +-
 .../javascripts/highlightjs/languages/applescript.min.js    | 2 +-
 .../assets/javascripts/highlightjs/languages/arcade.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/arduino.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/armasm.min.js  | 2 +-
 .../javascripts/highlightjs/languages/asciidoc.min.js       | 2 +-
 .../assets/javascripts/highlightjs/languages/aspectj.min.js | 2 +-
 .../javascripts/highlightjs/languages/autohotkey.min.js     | 2 +-
 .../assets/javascripts/highlightjs/languages/autoit.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/avrasm.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/awk.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/axapta.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/bash.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/basic.min.js   | 2 +-
 vendor/assets/javascripts/highlightjs/languages/bnf.min.js  | 2 +-
 .../javascripts/highlightjs/languages/brainfuck.min.js      | 2 +-
 vendor/assets/javascripts/highlightjs/languages/cal.min.js  | 2 +-
 .../javascripts/highlightjs/languages/capnproto.min.js      | 2 +-
 .../assets/javascripts/highlightjs/languages/ceylon.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/clean.min.js   | 2 +-
 .../javascripts/highlightjs/languages/clojure-repl.min.js   | 2 +-
 .../assets/javascripts/highlightjs/languages/clojure.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/cmake.min.js   | 2 +-
 .../javascripts/highlightjs/languages/coffeescript.min.js   | 2 +-
 vendor/assets/javascripts/highlightjs/languages/coq.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/cos.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/cpp.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/crmsh.min.js   | 2 +-
 .../assets/javascripts/highlightjs/languages/crystal.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/cs.min.js   | 2 +-
 vendor/assets/javascripts/highlightjs/languages/csp.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/css.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/d.min.js    | 2 +-
 vendor/assets/javascripts/highlightjs/languages/dart.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/delphi.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/diff.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/django.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/dns.min.js  | 2 +-
 .../javascripts/highlightjs/languages/dockerfile.min.js     | 2 +-
 vendor/assets/javascripts/highlightjs/languages/dos.min.js  | 2 +-
 .../javascripts/highlightjs/languages/dsconfig.min.js       | 2 +-
 vendor/assets/javascripts/highlightjs/languages/dts.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/dust.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/ebnf.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/elixir.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/elm.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/erb.min.js  | 2 +-
 .../javascripts/highlightjs/languages/erlang-repl.min.js    | 2 +-
 .../assets/javascripts/highlightjs/languages/erlang.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/excel.min.js   | 2 +-
 vendor/assets/javascripts/highlightjs/languages/fix.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/flix.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/fortran.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/fsharp.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/gams.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/gauss.min.js   | 2 +-
 .../assets/javascripts/highlightjs/languages/gcode.min.js   | 2 +-
 .../assets/javascripts/highlightjs/languages/gherkin.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/glsl.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/gml.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/go.min.js   | 2 +-
 vendor/assets/javascripts/highlightjs/languages/golo.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/gradle.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/groovy.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/haml.min.js | 2 +-
 .../javascripts/highlightjs/languages/handlebars.min.js     | 2 +-
 .../assets/javascripts/highlightjs/languages/haskell.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/haxe.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/hsp.min.js  | 2 +-
 .../javascripts/highlightjs/languages/htmlbars.min.js       | 2 +-
 vendor/assets/javascripts/highlightjs/languages/http.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/hy.min.js   | 2 +-
 .../assets/javascripts/highlightjs/languages/inform7.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/ini.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/irpf90.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/isbl.min.js | 1 +
 vendor/assets/javascripts/highlightjs/languages/java.min.js | 2 +-
 .../javascripts/highlightjs/languages/javascript.min.js     | 2 +-
 .../javascripts/highlightjs/languages/jboss-cli.min.js      | 2 +-
 vendor/assets/javascripts/highlightjs/languages/json.min.js | 2 +-
 .../javascripts/highlightjs/languages/julia-repl.min.js     | 2 +-
 .../assets/javascripts/highlightjs/languages/julia.min.js   | 2 +-
 .../assets/javascripts/highlightjs/languages/kotlin.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/lasso.min.js   | 2 +-
 vendor/assets/javascripts/highlightjs/languages/ldif.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/leaf.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/less.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/lisp.min.js | 2 +-
 .../javascripts/highlightjs/languages/livecodeserver.min.js | 2 +-
 .../javascripts/highlightjs/languages/livescript.min.js     | 2 +-
 vendor/assets/javascripts/highlightjs/languages/llvm.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/lsl.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/lua.min.js  | 2 +-
 .../javascripts/highlightjs/languages/makefile.min.js       | 2 +-
 .../javascripts/highlightjs/languages/markdown.min.js       | 2 +-
 .../javascripts/highlightjs/languages/mathematica.min.js    | 2 +-
 .../assets/javascripts/highlightjs/languages/matlab.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/maxima.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/mel.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/mercury.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/mipsasm.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/mizar.min.js   | 2 +-
 .../javascripts/highlightjs/languages/mojolicious.min.js    | 2 +-
 .../assets/javascripts/highlightjs/languages/monkey.min.js  | 2 +-
 .../javascripts/highlightjs/languages/moonscript.min.js     | 2 +-
 vendor/assets/javascripts/highlightjs/languages/n1ql.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/nginx.min.js   | 2 +-
 .../assets/javascripts/highlightjs/languages/nimrod.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/nix.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/nsis.min.js | 2 +-
 .../javascripts/highlightjs/languages/objectivec.min.js     | 2 +-
 .../assets/javascripts/highlightjs/languages/ocaml.min.js   | 2 +-
 .../javascripts/highlightjs/languages/openscad.min.js       | 2 +-
 .../assets/javascripts/highlightjs/languages/oxygene.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/parser3.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/perl.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/pf.min.js   | 2 +-
 .../assets/javascripts/highlightjs/languages/pgsql.min.js   | 2 +-
 vendor/assets/javascripts/highlightjs/languages/php.min.js  | 2 +-
 .../javascripts/highlightjs/languages/plaintext.min.js      | 2 +-
 vendor/assets/javascripts/highlightjs/languages/pony.min.js | 2 +-
 .../javascripts/highlightjs/languages/powershell.min.js     | 2 +-
 .../javascripts/highlightjs/languages/processing.min.js     | 2 +-
 .../assets/javascripts/highlightjs/languages/profile.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/prolog.min.js  | 2 +-
 .../javascripts/highlightjs/languages/properties.min.js     | 2 +-
 .../javascripts/highlightjs/languages/protobuf.min.js       | 2 +-
 .../assets/javascripts/highlightjs/languages/puppet.min.js  | 2 +-
 .../javascripts/highlightjs/languages/purebasic.min.js      | 2 +-
 .../assets/javascripts/highlightjs/languages/python.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/q.min.js    | 2 +-
 vendor/assets/javascripts/highlightjs/languages/qml.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/r.min.js    | 2 +-
 .../javascripts/highlightjs/languages/reasonml.min.js       | 2 +-
 vendor/assets/javascripts/highlightjs/languages/rib.min.js  | 2 +-
 .../javascripts/highlightjs/languages/roboconf.min.js       | 2 +-
 .../javascripts/highlightjs/languages/routeros.min.js       | 2 +-
 vendor/assets/javascripts/highlightjs/languages/rsl.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/ruby.min.js | 2 +-
 .../javascripts/highlightjs/languages/ruleslanguage.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/rust.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/sas.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/scala.min.js   | 2 +-
 .../assets/javascripts/highlightjs/languages/scheme.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/scilab.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/scss.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/shell.min.js   | 2 +-
 .../assets/javascripts/highlightjs/languages/smali.min.js   | 2 +-
 .../javascripts/highlightjs/languages/smalltalk.min.js      | 2 +-
 vendor/assets/javascripts/highlightjs/languages/sml.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/sqf.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/sql.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/stan.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/stata.min.js   | 2 +-
 .../assets/javascripts/highlightjs/languages/step21.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/stylus.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/subunit.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/swift.min.js   | 2 +-
 .../javascripts/highlightjs/languages/taggerscript.min.js   | 2 +-
 vendor/assets/javascripts/highlightjs/languages/tap.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/tcl.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/tex.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/thrift.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/tp.min.js   | 2 +-
 vendor/assets/javascripts/highlightjs/languages/twig.min.js | 2 +-
 .../javascripts/highlightjs/languages/typescript.min.js     | 2 +-
 vendor/assets/javascripts/highlightjs/languages/vala.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/vbnet.min.js   | 2 +-
 .../javascripts/highlightjs/languages/vbscript-html.min.js  | 2 +-
 .../javascripts/highlightjs/languages/vbscript.min.js       | 2 +-
 .../assets/javascripts/highlightjs/languages/verilog.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/vhdl.min.js | 2 +-
 vendor/assets/javascripts/highlightjs/languages/vim.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/x86asm.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/xl.min.js   | 2 +-
 vendor/assets/javascripts/highlightjs/languages/xml.min.js  | 2 +-
 .../assets/javascripts/highlightjs/languages/xquery.min.js  | 2 +-
 vendor/assets/javascripts/highlightjs/languages/yaml.min.js | 2 +-
 .../assets/javascripts/highlightjs/languages/zephir.min.js  | 2 +-
 yarn.lock                                                   | 6 +++---
 188 files changed, 191 insertions(+), 190 deletions(-)

diff --git a/package.json b/package.json
index 29a464c677..2df8b474e8 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "eslint-plugin-lodash": "^6.0.0",
     "favcount": "https://github.com/chrishunt/favcount",
     "handlebars": "^4.7.0",
-    "highlight.js": "https://github.com/highlightjs/highlight.js",
+    "highlight.js": "https://github.com/highlightjs/highlight.js#d72f0817aaab8187711fca7c608f5272ea5147f6",
     "htmlparser": "https://github.com/tautologistics/node-htmlparser",
     "intersection-observer": "^0.5.1",
     "jquery": "3.5.0",
diff --git a/vendor/assets/javascripts/highlightjs/highlight.min.js b/vendor/assets/javascripts/highlightjs/highlight.min.js
index a7fd82e816..bc0f11cf67 100644
--- a/vendor/assets/javascripts/highlightjs/highlight.min.js
+++ b/vendor/assets/javascripts/highlightjs/highlight.min.js
@@ -1,2 +1,2 @@
-/*! highlight.js v9.13.1 | BSD3 License | git.io/hljslicense */
-!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=M.exec(o))return w(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||w(i))return i}function o(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function c(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function u(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset<r[0].offset?e:r:"start"===r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value).replace('"',"&quot;")+'"'}l+="<"+t(e)+E.map.call(e.attributes,r).join("")+">"}function c(e){l+="</"+t(e)+">"}function u(e){("start"===e.event?o:c)(e.node)}for(var s=0,l="",f=[];e.length||r.length;){var g=i();if(l+=n(a.substring(s,g[0].offset)),s=g[0].offset,g===e){f.reverse().forEach(c);do u(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===s);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),u(g.splice(0,1)[0])}return l+n(a.substr(s))}function s(e){return e.v&&!e.cached_variants&&(e.cached_variants=e.v.map(function(n){return o(e,{v:null},n)})),e.cached_variants||e.eW&&[o(e)]||[e]}function l(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},c=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?c("keyword",a.k):B(a.k).forEach(function(e){c(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.endSameAsBegin&&(a.e=a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]),a.c=Array.prototype.concat.apply([],a.c.map(function(e){return s("self"===e?a:e)})),a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var u=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=u.length?t(u.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e){return new RegExp(e.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&"),"m")}function c(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t].endSameAsBegin&&(n.c[t].eR=o(n.c[t].bR.exec(e)[0])),n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function s(e,n){return!a&&r(n.iR,e)}function p(e,n){var t=R.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function d(e,n,t,r){var a=r?"":j.classPrefix,i='<span class="'+a,o=t?"":I;return i+=e+'">',i+n+o}function h(){var e,t,r,a;if(!E.k)return n(k);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(k);r;)a+=n(k.substring(t,r.index)),e=p(E,r),e?(M+=e[1],a+=d(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(k);return a+n(k.substr(t))}function b(){var e="string"==typeof E.sL;if(e&&!L[E.sL])return n(k);var t=e?f(E.sL,k,!0,B[E.sL]):g(k,E.sL.length?E.sL:void 0);return E.r>0&&(M+=t.r),e&&(B[E.sL]=t.top),d(t.language,t.value,!1,!0)}function v(){y+=null!=E.sL?b():h(),k=""}function m(e){y+=e.cN?d(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function N(e,n){if(k+=e,null==n)return v(),0;var t=c(n,E);if(t)return t.skip?k+=n:(t.eB&&(k+=n),v(),t.rB||t.eB||(k=n)),m(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?k+=n:(a.rE||a.eE||(k+=n),v(),a.eE&&(k=n));do E.cN&&(y+=I),E.skip||E.sL||(M+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&(r.endSameAsBegin&&(r.starts.eR=r.eR),m(r.starts,"")),a.rE?0:n.length}if(s(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"<unnamed>")+'"');return k+=n,n.length||1}var R=w(e);if(!R)throw new Error('Unknown language: "'+e+'"');l(R);var x,E=i||R,B={},y="";for(x=E;x!==R;x=x.parent)x.cN&&(y=d(x.cN,"",!0)+y);var k="",M=0;try{for(var C,A,S=0;;){if(E.t.lastIndex=S,C=E.t.exec(t),!C)break;A=N(t.substring(S,C.index),C[0]),S=C.index+A}for(N(t.substr(S)),x=E;x.parent;x=x.parent)x.cN&&(y+=I);return{r:M,value:y,language:e,top:E}}catch(O){if(O.message&&-1!==O.message.indexOf("Illegal"))return{r:0,value:n(t)};throw O}}function g(e,t){t=t||j.languages||B(L);var r={r:0,value:n(e)},a=r;return t.filter(w).filter(x).forEach(function(n){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function p(e){return j.tabReplace||j.useBR?e.replace(C,function(e,n){return j.useBR&&"\n"===e?"<br>":j.tabReplace?n.replace(/\t/g,j.tabReplace):""}):e}function d(e,n,t){var r=n?y[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function h(e){var n,t,r,o,s,l=i(e);a(l)||(j.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):n=e,s=n.textContent,r=l?f(l,s,!0):g(s),t=c(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=u(t,c(o),s)),r.value=p(r.value),e.innerHTML=r.value,e.className=d(e.className,l,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function b(e){j=o(j,e)}function v(){if(!v.called){v.called=!0;var e=document.querySelectorAll("pre code");E.forEach.call(e,h)}}function m(){addEventListener("DOMContentLoaded",v,!1),addEventListener("load",v,!1)}function N(n,t){var r=L[n]=t(e);r.aliases&&r.aliases.forEach(function(e){y[e]=n})}function R(){return B(L)}function w(e){return e=(e||"").toLowerCase(),L[e]||L[y[e]]}function x(e){var n=w(e);return n&&!n.disableAutodetect}var E=[],B=Object.keys,L={},y={},k=/^(no-?highlight|plain|text)$/i,M=/\blang(?:uage)?-([\w-]+)\b/i,C=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,I="</span>",j={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0};return e.highlight=f,e.highlightAuto=g,e.fixMarkup=p,e.highlightBlock=h,e.configure=b,e.initHighlighting=v,e.initHighlightingOnLoad=m,e.registerLanguage=N,e.listLanguages=R,e.getLanguage=w,e.autoDetection=x,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});
\ No newline at end of file
+/*! highlight.js v9.18.1 | BSD3 License | git.io/hljslicense */
+!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"==typeof exports||exports.nodeType?n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs})):e(exports)}(function(a){var f=[],o=Object.keys,C={},g={},m=!0,n=/^(no-?highlight|plain|text)$/i,E=/\blang(?:uage)?-([\w-]+)\b/i,t=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,r={case_insensitive:"cI",lexemes:"l",contains:"c",keywords:"k",subLanguage:"sL",className:"cN",begin:"b",beginKeywords:"bK",end:"e",endsWithParent:"eW",illegal:"i",excludeBegin:"eB",excludeEnd:"eE",returnBegin:"rB",returnEnd:"rE",variants:"v",IDENT_RE:"IR",UNDERSCORE_IDENT_RE:"UIR",NUMBER_RE:"NR",C_NUMBER_RE:"CNR",BINARY_NUMBER_RE:"BNR",RE_STARTERS_RE:"RSR",BACKSLASH_ESCAPE:"BE",APOS_STRING_MODE:"ASM",QUOTE_STRING_MODE:"QSM",PHRASAL_WORDS_MODE:"PWM",C_LINE_COMMENT_MODE:"CLCM",C_BLOCK_COMMENT_MODE:"CBCM",HASH_COMMENT_MODE:"HCM",NUMBER_MODE:"NM",C_NUMBER_MODE:"CNM",BINARY_NUMBER_MODE:"BNM",CSS_NUMBER_MODE:"CSSNM",REGEXP_MODE:"RM",TITLE_MODE:"TM",UNDERSCORE_TITLE_MODE:"UTM",COMMENT:"C",beginRe:"bR",endRe:"eR",illegalRe:"iR",lexemesRe:"lR",terminators:"t",terminator_end:"tE"},O="</span>",B="Could not find the language '{}', did you forget to load/include a language module?",x={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0},c="of and for in not or if then".split(" ");function S(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}function d(e){return e.nodeName.toLowerCase()}function R(e){return n.test(e)}function i(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function p(e){var a=[];return function e(n,t){for(var r=n.firstChild;r;r=r.nextSibling)3===r.nodeType?t+=r.nodeValue.length:1===r.nodeType&&(a.push({event:"start",offset:t,node:r}),t=e(r,t),d(r).match(/br|hr|img|input/)||a.push({event:"stop",offset:t,node:r}));return t}(e,0),a}function v(e,n,t){var r=0,a="",i=[];function o(){return e.length&&n.length?e[0].offset!==n[0].offset?e[0].offset<n[0].offset?e:n:"start"===n[0].event?e:n:e.length?e:n}function c(e){a+="<"+d(e)+f.map.call(e.attributes,function(e){return" "+e.nodeName+'="'+S(e.value).replace(/"/g,"&quot;")+'"'}).join("")+">"}function l(e){a+="</"+d(e)+">"}function u(e){("start"===e.event?c:l)(e.node)}for(;e.length||n.length;){var s=o();if(a+=S(t.substring(r,s[0].offset)),r=s[0].offset,s===e){for(i.reverse().forEach(l);u(s.splice(0,1)[0]),(s=o())===e&&s.length&&s[0].offset===r;);i.reverse().forEach(c)}else"start"===s[0].event?i.push(s[0].node):i.pop(),u(s.splice(0,1)[0])}return a+S(t.substr(r))}function l(n){return n.v&&!n.cached_variants&&(n.cached_variants=n.v.map(function(e){return i(n,{v:null},e)})),n.cached_variants?n.cached_variants:function e(n){return!!n&&(n.eW||e(n.starts))}(n)?[i(n,{starts:n.starts?i(n.starts):null})]:Object.isFrozen(n)?[i(n)]:[n]}function u(e){if(r&&!e.langApiRestored){for(var n in e.langApiRestored=!0,r)e[n]&&(e[r[n]]=e[n]);(e.c||[]).concat(e.v||[]).forEach(u)}}function M(n,t){var i={};return"string"==typeof n?r("keyword",n):o(n).forEach(function(e){r(e,n[e])}),i;function r(a,e){t&&(e=e.toLowerCase()),e.split(" ").forEach(function(e){var n,t,r=e.split("|");i[r[0]]=[a,(n=r[0],(t=r[1])?Number(t):function(e){return-1!=c.indexOf(e.toLowerCase())}(n)?0:1)]})}}function T(r){function s(e){return e&&e.source||e}function f(e,n){return new RegExp(s(e),"m"+(r.cI?"i":"")+(n?"g":""))}function a(a){var i={},o=[],c={},t=1;function e(e,n){i[t]=e,o.push([e,n]),t+=new RegExp(n.toString()+"|").exec("").length-1+1}for(var n=0;n<a.c.length;n++){var r,l=(r=a.c[n]).bK?"\\.?(?:"+r.b+")\\.?":r.b;e(r,l)}a.tE&&e("end",a.tE),a.i&&e("illegal",a.i);var u=f(function(e,n){for(var t=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./,r=0,a="",i=0;i<e.length;i++){var o=r+=1,c=s(e[i]);for(0<i&&(a+=n),a+="(";0<c.length;){var l=t.exec(c);if(null==l){a+=c;break}a+=c.substring(0,l.index),c=c.substring(l.index+l[0].length),"\\"==l[0][0]&&l[1]?a+="\\"+String(Number(l[1])+o):(a+=l[0],"("==l[0]&&r++)}a+=")"}return a}(o.map(function(e){return e[1]}),"|"),!0);return c.lastIndex=0,c.exec=function(e){var n;if(0===o.length)return null;u.lastIndex=c.lastIndex;var t=u.exec(e);if(!t)return null;for(var r=0;r<t.length;r++)if(null!=t[r]&&null!=i[""+r]){n=i[""+r];break}return"string"==typeof n?(t.type=n,t.extra=[a.i,a.tE]):(t.type="begin",t.rule=n),t},c}if(r.c&&-1!=r.c.indexOf("self")){if(!m)throw new Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.");r.c=r.c.filter(function(e){return"self"!=e})}!function n(t,e){t.compiled||(t.compiled=!0,t.k=t.k||t.bK,t.k&&(t.k=M(t.k,r.cI)),t.lR=f(t.l||/\w+/,!0),e&&(t.bK&&(t.b="\\b("+t.bK.split(" ").join("|")+")\\b"),t.b||(t.b=/\B|\b/),t.bR=f(t.b),t.endSameAsBegin&&(t.e=t.b),t.e||t.eW||(t.e=/\B|\b/),t.e&&(t.eR=f(t.e)),t.tE=s(t.e)||"",t.eW&&e.tE&&(t.tE+=(t.e?"|":"")+e.tE)),t.i&&(t.iR=f(t.i)),null==t.relevance&&(t.relevance=1),t.c||(t.c=[]),t.c=Array.prototype.concat.apply([],t.c.map(function(e){return l("self"===e?t:e)})),t.c.forEach(function(e){n(e,t)}),t.starts&&n(t.starts,e),t.t=a(t))}(r)}function w(n,e,a,t){var i=e;function c(e,n,t,r){if(!t&&""===n)return"";if(!e)return n;var a='<span class="'+(r?"":x.classPrefix);return(a+=e+'">')+n+(t?"":O)}function r(){var e,n,t,r,a,i,o;if(!d.k)return S(M);for(r="",n=0,d.lR.lastIndex=0,t=d.lR.exec(M);t;)r+=S(M.substring(n,t.index)),a=d,i=t,o=E.cI?i[0].toLowerCase():i[0],(e=a.k.hasOwnProperty(o)&&a.k[o])?(b+=e[1],r+=c(e[0],S(t[0]))):r+=S(t[0]),n=d.lR.lastIndex,t=d.lR.exec(M);return r+S(M.substr(n))}function o(){p+=(null!=d.sL?function(){var e="string"==typeof d.sL;if(e&&!C[d.sL])return S(M);var n=e?w(d.sL,M,!0,R[d.sL]):D(M,d.sL.length?d.sL:void 0);return 0<d.relevance&&(b+=n.relevance),e&&(R[d.sL]=n.top),c(n.language,n.value,!1,!0)}:r)(),M=""}function l(e){p+=e.cN?c(e.cN,"",!0):"",d=Object.create(e,{parent:{value:d}})}function u(e){var n=e[0],t=e.rule;return t&&t.endSameAsBegin&&(t.eR=new RegExp(n.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&"),"m")),t.skip?M+=n:(t.eB&&(M+=n),o(),t.rB||t.eB||(M=n)),l(t),t.rB?0:n.length}function s(e){var n=e[0],t=i.substr(e.index),r=function e(n,t){if(r=n.eR,a=t,(i=r&&r.exec(a))&&0===i.index){for(;n.endsParent&&n.parent;)n=n.parent;return n}var r,a,i;if(n.eW)return e(n.parent,t)}(d,t);if(r){var a=d;for(a.skip?M+=n:(a.rE||a.eE||(M+=n),o(),a.eE&&(M=n));d.cN&&(p+=O),d.skip||d.sL||(b+=d.relevance),(d=d.parent)!==r.parent;);return r.starts&&(r.endSameAsBegin&&(r.starts.eR=r.eR),l(r.starts)),a.rE?0:n.length}}var f={};function g(e,n){var t=n&&n[0];if(M+=e,null==t)return o(),0;if("begin"==f.type&&"end"==n.type&&f.index==n.index&&""===t)return M+=i.slice(n.index,n.index+1),1;if("begin"===(f=n).type)return u(n);if("illegal"===n.type&&!a)throw new Error('Illegal lexeme "'+t+'" for mode "'+(d.cN||"<unnamed>")+'"');if("end"===n.type){var r=s(n);if(null!=r)return r}return M+=t,t.length}var E=L(n);if(!E)throw console.error(B.replace("{}",n)),new Error('Unknown language: "'+n+'"');T(E);for(var d=t||E,R={},p="",v=d;v!==E;v=v.parent)v.cN&&(p=c(v.cN,"",!0)+p);var M="",b=0;try{for(var h,N,_=0;d.t.lastIndex=_,h=d.t.exec(i);)N=g(i.substring(_,h.index),h),_=h.index+N;for(g(i.substr(_)),v=d;v.parent;v=v.parent)v.cN&&(p+=O);return{relevance:b,value:p,i:!1,language:n,top:d}}catch(e){if(e.message&&-1!==e.message.indexOf("Illegal"))return{i:!0,relevance:0,value:S(i)};if(m)return{relevance:0,value:S(i),language:n,top:d,errorRaised:e};throw e}}function D(t,e){e=e||x.languages||o(C);var r={relevance:0,value:S(t)},a=r;return e.filter(L).filter(_).forEach(function(e){var n=w(e,t,!1);n.language=e,n.relevance>a.relevance&&(a=n),n.relevance>r.relevance&&(a=r,r=n)}),a.language&&(r.second_best=a),r}function b(e){return x.tabReplace||x.useBR?e.replace(t,function(e,n){return x.useBR&&"\n"===e?"<br>":x.tabReplace?n.replace(/\t/g,x.tabReplace):""}):e}function s(e){var n,t,r,a,i,o,c,l,u,s,f=function(e){var n,t,r,a,i=e.className+" ";if(i+=e.parentNode?e.parentNode.className:"",t=E.exec(i)){var o=L(t[1]);return o||(console.warn(B.replace("{}",t[1])),console.warn("Falling back to no-highlight mode for this block.",e)),o?t[1]:"no-highlight"}for(n=0,r=(i=i.split(/\s+/)).length;n<r;n++)if(R(a=i[n])||L(a))return a}(e);R(f)||(x.useBR?(n=document.createElement("div")).innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n"):n=e,i=n.textContent,r=f?w(f,i,!0):D(i),(t=p(n)).length&&((a=document.createElement("div")).innerHTML=r.value,r.value=v(t,p(a),i)),r.value=b(r.value),e.innerHTML=r.value,e.className=(o=e.className,c=f,l=r.language,u=c?g[c]:l,s=[o.trim()],o.match(/\bhljs\b/)||s.push("hljs"),-1===o.indexOf(u)&&s.push(u),s.join(" ").trim()),e.result={language:r.language,re:r.relevance},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.relevance}))}function h(){var e;h.called||(h.called=!0,e=document.querySelectorAll("pre code"),f.forEach.call(e,s))}var N={disableAutodetect:!0};function L(e){return e=(e||"").toLowerCase(),C[e]||C[g[e]]}function _(e){var n=L(e);return n&&!n.disableAutodetect}return a.highlight=w,a.highlightAuto=D,a.fixMarkup=b,a.highlightBlock=s,a.configure=function(e){x=i(x,e)},a.initHighlighting=h,a.initHighlightingOnLoad=function(){window.addEventListener("DOMContentLoaded",h,!1),window.addEventListener("load",h,!1)},a.registerLanguage=function(n,e){var t;try{t=e(a)}catch(e){if(console.error("Language definition for '{}' could not be registered.".replace("{}",n)),!m)throw e;console.error(e),t=N}u(C[n]=t),t.rawDefinition=e.bind(null,a),t.aliases&&t.aliases.forEach(function(e){g[e]=n})},a.listLanguages=function(){return o(C)},a.getLanguage=L,a.requireLanguage=function(e){var n=L(e);if(n)return n;throw new Error("The '{}' language is required, but not loaded.".replace("{}",e))},a.autoDetection=_,a.inherit=i,a.debugMode=function(){m=!1},a.IR=a.IDENT_RE="[a-zA-Z]\\w*",a.UIR=a.UNDERSCORE_IDENT_RE="[a-zA-Z_]\\w*",a.NR=a.NUMBER_RE="\\b\\d+(\\.\\d+)?",a.CNR=a.C_NUMBER_RE="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",a.BNR=a.BINARY_NUMBER_RE="\\b(0b[01]+)",a.RSR=a.RE_STARTERS_RE="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",a.BE=a.BACKSLASH_ESCAPE={b:"\\\\[\\s\\S]",relevance:0},a.ASM=a.APOS_STRING_MODE={cN:"string",b:"'",e:"'",i:"\\n",c:[a.BE]},a.QSM=a.QUOTE_STRING_MODE={cN:"string",b:'"',e:'"',i:"\\n",c:[a.BE]},a.PWM=a.PHRASAL_WORDS_MODE={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},a.C=a.COMMENT=function(e,n,t){var r=a.inherit({cN:"comment",b:e,e:n,c:[]},t||{});return r.c.push(a.PWM),r.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",relevance:0}),r},a.CLCM=a.C_LINE_COMMENT_MODE=a.C("//","$"),a.CBCM=a.C_BLOCK_COMMENT_MODE=a.C("/\\*","\\*/"),a.HCM=a.HASH_COMMENT_MODE=a.C("#","$"),a.NM=a.NUMBER_MODE={cN:"number",b:a.NR,relevance:0},a.CNM=a.C_NUMBER_MODE={cN:"number",b:a.CNR,relevance:0},a.BNM=a.BINARY_NUMBER_MODE={cN:"number",b:a.BNR,relevance:0},a.CSSNM=a.CSS_NUMBER_MODE={cN:"number",b:a.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",relevance:0},a.RM=a.REGEXP_MODE={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[a.BE,{b:/\[/,e:/\]/,relevance:0,c:[a.BE]}]},a.TM=a.TITLE_MODE={cN:"title",b:a.IR,relevance:0},a.UTM=a.UNDERSCORE_TITLE_MODE={cN:"title",b:a.UIR,relevance:0},a.METHOD_GUARD={b:"\\.\\s*"+a.UIR,relevance:0},[a.BE,a.ASM,a.QSM,a.PWM,a.C,a.CLCM,a.CBCM,a.HCM,a.NM,a.CNM,a.BNM,a.CSSNM,a.RM,a.TM,a.UTM,a.METHOD_GUARD].forEach(function(e){!function n(t){Object.freeze(t);var r="function"==typeof t;Object.getOwnPropertyNames(t).forEach(function(e){!t.hasOwnProperty(e)||null===t[e]||"object"!=typeof t[e]&&"function"!=typeof t[e]||r&&("caller"===e||"callee"===e||"arguments"===e)||Object.isFrozen(t[e])||n(t[e])});return t}(e)}),a});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/1c.min.js b/vendor/assets/javascripts/highlightjs/languages/1c.min.js
index 119eb326df..d55412b071 100644
--- a/vendor/assets/javascripts/highlightjs/languages/1c.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/1c.min.js
@@ -1 +1 @@
-hljs.registerLanguage("1c",function(){"use strict";return function(s){var x="[A-Za-zА-Яа-яёЁ_][A-Za-zА-Яа-яёЁ_0-9]+",n="далее возврат вызватьисключение выполнить для если и из или иначе иначеесли исключение каждого конецесли конецпопытки конеццикла не новый перейти перем по пока попытка прервать продолжить тогда цикл экспорт ",e="null истина ложь неопределено",o=s.inherit(s.NUMBER_MODE),t={className:"string",begin:'"|\\|',end:'"|$',contains:[{begin:'""'}]},a={begin:"'",end:"'",excludeBegin:!0,excludeEnd:!0,contains:[{className:"number",begin:"\\d{4}([\\.\\\\/:-]?\\d{2}){0,5}"}]},i=s.inherit(s.C_LINE_COMMENT_MODE);return{name:"1C:Enterprise",case_insensitive:!0,keywords:{$pattern:x,keyword:n,built_in:"разделительстраниц разделительстрок символтабуляции ansitooem oemtoansi ввестивидсубконто ввестиперечисление ввестипериод ввестиплансчетов выбранныйплансчетов датагод датамесяц датачисло заголовоксистемы значениевстроку значениеизстроки каталогиб каталогпользователя кодсимв конгода конецпериодаби конецрассчитанногопериодаби конецстандартногоинтервала конквартала конмесяца коннедели лог лог10 максимальноеколичествосубконто названиеинтерфейса названиенабораправ назначитьвид назначитьсчет найтиссылки началопериодаби началостандартногоинтервала начгода начквартала начмесяца начнедели номерднягода номерднянедели номернеделигода обработкаожидания основнойжурналрасчетов основнойплансчетов основнойязык очиститьокносообщений периодстр получитьвремята получитьдатута получитьдокументта получитьзначенияотбора получитьпозициюта получитьпустоезначение получитьта префиксавтонумерации пропись пустоезначение разм разобратьпозициюдокумента рассчитатьрегистрына рассчитатьрегистрыпо симв создатьобъект статусвозврата стрколичествострок сформироватьпозициюдокумента счетпокоду текущеевремя типзначения типзначениястр установитьтана установитьтапо фиксшаблон шаблон acos asin atan base64значение base64строка cos exp log log10 pow sin sqrt tan xmlзначение xmlстрока xmlтип xmlтипзнч активноеокно безопасныйрежим безопасныйрежимразделенияданных булево ввестидату ввестизначение ввестистроку ввестичисло возможностьчтенияxml вопрос восстановитьзначение врег выгрузитьжурналрегистрации выполнитьобработкуоповещения выполнитьпроверкуправдоступа вычислить год данныеформывзначение дата день деньгода деньнедели добавитьмесяц заблокироватьданныедляредактирования заблокироватьработупользователя завершитьработусистемы загрузитьвнешнююкомпоненту закрытьсправку записатьjson записатьxml записатьдатуjson записьжурналарегистрации заполнитьзначениясвойств запроситьразрешениепользователя запуститьприложение запуститьсистему зафиксироватьтранзакцию значениевданныеформы значениевстрокувнутр значениевфайл значениезаполнено значениеизстрокивнутр значениеизфайла изxmlтипа импортмоделиxdto имякомпьютера имяпользователя инициализироватьпредопределенныеданные информацияобошибке каталогбиблиотекимобильногоустройства каталогвременныхфайлов каталогдокументов каталогпрограммы кодироватьстроку кодлокализацииинформационнойбазы кодсимвола командасистемы конецгода конецдня конецквартала конецмесяца конецминуты конецнедели конецчаса конфигурациябазыданныхизмененадинамически конфигурацияизменена копироватьданныеформы копироватьфайл краткоепредставлениеошибки лев макс местноевремя месяц мин минута монопольныйрежим найти найтинедопустимыесимволыxml найтиокнопонавигационнойссылке найтипомеченныенаудаление найтипоссылкам найтифайлы началогода началодня началоквартала началомесяца началоминуты началонедели началочаса начатьзапросразрешенияпользователя начатьзапускприложения начатькопированиефайла начатьперемещениефайла начатьподключениевнешнейкомпоненты начатьподключениерасширенияработыскриптографией начатьподключениерасширенияработысфайлами начатьпоискфайлов начатьполучениекаталогавременныхфайлов начатьполучениекаталогадокументов начатьполучениерабочегокаталогаданныхпользователя начатьполучениефайлов начатьпомещениефайла начатьпомещениефайлов начатьсозданиедвоичныхданныхизфайла начатьсозданиекаталога начатьтранзакцию начатьудалениефайлов начатьустановкувнешнейкомпоненты начатьустановкурасширенияработыскриптографией начатьустановкурасширенияработысфайлами неделягода необходимостьзавершениясоединения номерсеансаинформационнойбазы номерсоединенияинформационнойбазы нрег нстр обновитьинтерфейс обновитьнумерациюобъектов обновитьповторноиспользуемыезначения обработкапрерыванияпользователя объединитьфайлы окр описаниеошибки оповестить оповеститьобизменении отключитьобработчикзапросанастроекклиенталицензирования отключитьобработчикожидания отключитьобработчикоповещения открытьзначение открытьиндекссправки открытьсодержаниесправки открытьсправку открытьформу открытьформумодально отменитьтранзакцию очиститьжурналрегистрации очиститьнастройкипользователя очиститьсообщения параметрыдоступа перейтипонавигационнойссылке переместитьфайл подключитьвнешнююкомпоненту подключитьобработчикзапросанастроекклиенталицензирования подключитьобработчикожидания подключитьобработчикоповещения подключитьрасширениеработыскриптографией подключитьрасширениеработысфайлами подробноепредставлениеошибки показатьвводдаты показатьвводзначения показатьвводстроки показатьвводчисла показатьвопрос показатьзначение показатьинформациюобошибке показатьнакарте показатьоповещениепользователя показатьпредупреждение полноеимяпользователя получитьcomобъект получитьxmlтип получитьадреспоместоположению получитьблокировкусеансов получитьвремязавершенияспящегосеанса получитьвремязасыпанияпассивногосеанса получитьвремяожиданияблокировкиданных получитьданныевыбора получитьдополнительныйпараметрклиенталицензирования получитьдопустимыекодылокализации получитьдопустимыечасовыепояса получитьзаголовокклиентскогоприложения получитьзаголовоксистемы получитьзначенияотборажурналарегистрации получитьидентификаторконфигурации получитьизвременногохранилища получитьимявременногофайла получитьимяклиенталицензирования получитьинформациюэкрановклиента получитьиспользованиежурналарегистрации получитьиспользованиесобытияжурналарегистрации получитькраткийзаголовокприложения получитьмакетоформления получитьмаскувсефайлы получитьмаскувсефайлыклиента получитьмаскувсефайлысервера получитьместоположениепоадресу получитьминимальнуюдлинупаролейпользователей получитьнавигационнуюссылку получитьнавигационнуюссылкуинформационнойбазы получитьобновлениеконфигурациибазыданных получитьобновлениепредопределенныхданныхинформационнойбазы получитьобщиймакет получитьобщуюформу получитьокна получитьоперативнуюотметкувремени получитьотключениебезопасногорежима получитьпараметрыфункциональныхопцийинтерфейса получитьполноеимяпредопределенногозначения получитьпредставлениянавигационныхссылок получитьпроверкусложностипаролейпользователей получитьразделительпути получитьразделительпутиклиента получитьразделительпутисервера получитьсеансыинформационнойбазы получитьскоростьклиентскогосоединения получитьсоединенияинформационнойбазы получитьсообщенияпользователю получитьсоответствиеобъектаиформы получитьсоставстандартногоинтерфейсаodata получитьструктурухранениябазыданных получитьтекущийсеансинформационнойбазы получитьфайл получитьфайлы получитьформу получитьфункциональнуюопцию получитьфункциональнуюопциюинтерфейса получитьчасовойпоясинформационнойбазы пользователиос поместитьвовременноехранилище поместитьфайл поместитьфайлы прав праводоступа предопределенноезначение представлениекодалокализации представлениепериода представлениеправа представлениеприложения представлениесобытияжурналарегистрации представлениечасовогопояса предупреждение прекратитьработусистемы привилегированныйрежим продолжитьвызов прочитатьjson прочитатьxml прочитатьдатуjson пустаястрока рабочийкаталогданныхпользователя разблокироватьданныедляредактирования разделитьфайл разорватьсоединениесвнешнимисточникомданных раскодироватьстроку рольдоступна секунда сигнал символ скопироватьжурналрегистрации смещениелетнеговремени смещениестандартноговремени соединитьбуферыдвоичныхданных создатькаталог создатьфабрикуxdto сокрл сокрлп сокрп сообщить состояние сохранитьзначение сохранитьнастройкипользователя сред стрдлина стрзаканчиваетсяна стрзаменить стрнайти стрначинаетсяс строка строкасоединенияинформационнойбазы стрполучитьстроку стрразделить стрсоединить стрсравнить стрчисловхождений стрчислострок стршаблон текущаядата текущаядатасеанса текущаяуниверсальнаядата текущаяуниверсальнаядатавмиллисекундах текущийвариантинтерфейсаклиентскогоприложения текущийвариантосновногошрифтаклиентскогоприложения текущийкодлокализации текущийрежимзапуска текущийязык текущийязыксистемы тип типзнч транзакцияактивна трег удалитьданныеинформационнойбазы удалитьизвременногохранилища удалитьобъекты удалитьфайлы универсальноевремя установитьбезопасныйрежим установитьбезопасныйрежимразделенияданных установитьблокировкусеансов установитьвнешнююкомпоненту установитьвремязавершенияспящегосеанса установитьвремязасыпанияпассивногосеанса установитьвремяожиданияблокировкиданных установитьзаголовокклиентскогоприложения установитьзаголовоксистемы установитьиспользованиежурналарегистрации установитьиспользованиесобытияжурналарегистрации установитькраткийзаголовокприложения установитьминимальнуюдлинупаролейпользователей установитьмонопольныйрежим установитьнастройкиклиенталицензирования установитьобновлениепредопределенныхданныхинформационнойбазы установитьотключениебезопасногорежима установитьпараметрыфункциональныхопцийинтерфейса установитьпривилегированныйрежим установитьпроверкусложностипаролейпользователей установитьрасширениеработыскриптографией установитьрасширениеработысфайлами установитьсоединениесвнешнимисточникомданных установитьсоответствиеобъектаиформы установитьсоставстандартногоинтерфейсаodata установитьчасовойпоясинформационнойбазы установитьчасовойпояссеанса формат цел час часовойпояс часовойпояссеанса число числопрописью этоадресвременногохранилища wsссылки библиотекакартинок библиотекамакетовоформлениякомпоновкиданных библиотекастилей бизнеспроцессы внешниеисточникиданных внешниеобработки внешниеотчеты встроенныепокупки главныйинтерфейс главныйстиль документы доставляемыеуведомления журналыдокументов задачи информацияобинтернетсоединении использованиерабочейдаты историяработыпользователя константы критерииотбора метаданные обработки отображениерекламы отправкадоставляемыхуведомлений отчеты панельзадачос параметрзапуска параметрысеанса перечисления планывидоврасчета планывидовхарактеристик планыобмена планысчетов полнотекстовыйпоиск пользователиинформационнойбазы последовательности проверкавстроенныхпокупок рабочаядата расширенияконфигурации регистрыбухгалтерии регистрынакопления регистрырасчета регистрысведений регламентныезадания сериализаторxdto справочники средствагеопозиционирования средствакриптографии средствамультимедиа средстваотображениярекламы средствапочты средствателефонии фабрикаxdto файловыепотоки фоновыезадания хранилищанастроек хранилищевариантовотчетов хранилищенастроекданныхформ хранилищеобщихнастроек хранилищепользовательскихнастроекдинамическихсписков хранилищепользовательскихнастроекотчетов хранилищесистемныхнастроек ",class:"webцвета windowsцвета windowsшрифты библиотекакартинок рамкистиля символы цветастиля шрифтыстиля автоматическоесохранениеданныхформывнастройках автонумерациявформе автораздвижениесерий анимациядиаграммы вариантвыравниванияэлементовизаголовков вариантуправлениявысотойтаблицы вертикальнаяпрокруткаформы вертикальноеположение вертикальноеположениеэлемента видгруппыформы виддекорацииформы виддополненияэлементаформы видизмененияданных видкнопкиформы видпереключателя видподписейкдиаграмме видполяформы видфлажка влияниеразмеранапузырекдиаграммы горизонтальноеположение горизонтальноеположениеэлемента группировкаколонок группировкаподчиненныхэлементовформы группыиэлементы действиеперетаскивания дополнительныйрежимотображения допустимыедействияперетаскивания интервалмеждуэлементамиформы использованиевывода использованиеполосыпрокрутки используемоезначениеточкибиржевойдиаграммы историявыборапривводе источникзначенийоситочекдиаграммы источникзначенияразмерапузырькадиаграммы категориягруппыкоманд максимумсерий начальноеотображениедерева начальноеотображениесписка обновлениетекстаредактирования ориентациядендрограммы ориентациядиаграммы ориентацияметокдиаграммы ориентацияметоксводнойдиаграммы ориентацияэлементаформы отображениевдиаграмме отображениевлегендедиаграммы отображениегруппыкнопок отображениезаголовкашкалыдиаграммы отображениезначенийсводнойдиаграммы отображениезначенияизмерительнойдиаграммы отображениеинтерваладиаграммыганта отображениекнопки отображениекнопкивыбора отображениеобсужденийформы отображениеобычнойгруппы отображениеотрицательныхзначенийпузырьковойдиаграммы отображениепанелипоиска отображениеподсказки отображениепредупрежденияприредактировании отображениеразметкиполосырегулирования отображениестраницформы отображениетаблицы отображениетекстазначениядиаграммыганта отображениеуправленияобычнойгруппы отображениефигурыкнопки палитрацветовдиаграммы поведениеобычнойгруппы поддержкамасштабадендрограммы поддержкамасштабадиаграммыганта поддержкамасштабасводнойдиаграммы поисквтаблицепривводе положениезаголовкаэлементаформы положениекартинкикнопкиформы положениекартинкиэлементаграфическойсхемы положениекоманднойпанелиформы положениекоманднойпанелиэлементаформы положениеопорнойточкиотрисовки положениеподписейкдиаграмме положениеподписейшкалызначенийизмерительнойдиаграммы положениесостоянияпросмотра положениестрокипоиска положениетекстасоединительнойлинии положениеуправленияпоиском положениешкалывремени порядокотображенияточекгоризонтальнойгистограммы порядоксерийвлегендедиаграммы размеркартинки расположениезаголовкашкалыдиаграммы растягиваниеповертикалидиаграммыганта режимавтоотображениясостояния режимвводастроктаблицы режимвыборанезаполненного режимвыделениядаты режимвыделениястрокитаблицы режимвыделениятаблицы режимизмененияразмера режимизменениясвязанногозначения режимиспользованиядиалогапечати режимиспользованияпараметракоманды режиммасштабированияпросмотра режимосновногоокнаклиентскогоприложения режимоткрытияокнаформы режимотображениявыделения режимотображениягеографическойсхемы режимотображениязначенийсерии режимотрисовкисеткиграфическойсхемы режимполупрозрачностидиаграммы режимпробеловдиаграммы режимразмещениянастранице режимредактированияколонки режимсглаживаниядиаграммы режимсглаживанияиндикатора режимсписказадач сквозноевыравнивание сохранениеданныхформывнастройках способзаполнениятекстазаголовкашкалыдиаграммы способопределенияограничивающегозначениядиаграммы стандартнаягруппакоманд стандартноеоформление статусоповещенияпользователя стильстрелки типаппроксимациилиниитрендадиаграммы типдиаграммы типединицышкалывремени типимпортасерийслоягеографическойсхемы типлиниигеографическойсхемы типлиниидиаграммы типмаркерагеографическойсхемы типмаркерадиаграммы типобластиоформления типорганизацииисточникаданныхгеографическойсхемы типотображениясериислоягеографическойсхемы типотображенияточечногообъектагеографическойсхемы типотображенияшкалыэлементалегендыгеографическойсхемы типпоискаобъектовгеографическойсхемы типпроекциигеографическойсхемы типразмещенияизмерений типразмещенияреквизитовизмерений типрамкиэлементауправления типсводнойдиаграммы типсвязидиаграммыганта типсоединениязначенийпосериямдиаграммы типсоединенияточекдиаграммы типсоединительнойлинии типстороныэлементаграфическойсхемы типформыотчета типшкалырадарнойдиаграммы факторлиниитрендадиаграммы фигуракнопки фигурыграфическойсхемы фиксациявтаблице форматдняшкалывремени форматкартинки ширинаподчиненныхэлементовформы виддвижениябухгалтерии виддвижениянакопления видпериодарегистрарасчета видсчета видточкимаршрутабизнеспроцесса использованиеагрегатарегистранакопления использованиегруппиэлементов использованиережимапроведения использованиесреза периодичностьагрегатарегистранакопления режимавтовремя режимзаписидокумента режимпроведениядокумента авторегистрацияизменений допустимыйномерсообщения отправкаэлементаданных получениеэлементаданных использованиерасшифровкитабличногодокумента ориентациястраницы положениеитоговколоноксводнойтаблицы положениеитоговстроксводнойтаблицы положениетекстаотносительнокартинки расположениезаголовкагруппировкитабличногодокумента способчтениязначенийтабличногодокумента типдвустороннейпечати типзаполненияобластитабличногодокумента типкурсоровтабличногодокумента типлиниирисункатабличногодокумента типлинииячейкитабличногодокумента типнаправленияпереходатабличногодокумента типотображениявыделениятабличногодокумента типотображениялинийсводнойтаблицы типразмещениятекстатабличногодокумента типрисункатабличногодокумента типсмещениятабличногодокумента типузоратабличногодокумента типфайлатабличногодокумента точностьпечати чередованиерасположениястраниц отображениевремениэлементовпланировщика типфайлаформатированногодокумента обходрезультатазапроса типзаписизапроса видзаполнениярасшифровкипостроителяотчета типдобавленияпредставлений типизмеренияпостроителяотчета типразмещенияитогов доступкфайлу режимдиалогавыборафайла режимоткрытияфайла типизмеренияпостроителязапроса видданныханализа методкластеризации типединицыинтервалавременианализаданных типзаполнениятаблицырезультатаанализаданных типиспользованиячисловыхзначенийанализаданных типисточникаданныхпоискаассоциаций типколонкианализаданныхдереворешений типколонкианализаданныхкластеризация типколонкианализаданныхобщаястатистика типколонкианализаданныхпоискассоциаций типколонкианализаданныхпоискпоследовательностей типколонкимоделипрогноза типмерырасстоянияанализаданных типотсеченияправилассоциации типполяанализаданных типстандартизациианализаданных типупорядочиванияправилассоциациианализаданных типупорядочиванияшаблоновпоследовательностейанализаданных типупрощениядереварешений wsнаправлениепараметра вариантxpathxs вариантзаписидатыjson вариантпростоготипаxs видгруппымоделиxs видфасетаxdto действиепостроителяdom завершенностьпростоготипаxs завершенностьсоставноготипаxs завершенностьсхемыxs запрещенныеподстановкиxs исключениягруппподстановкиxs категорияиспользованияатрибутаxs категорияограниченияидентичностиxs категорияограниченияпространствименxs методнаследованияxs модельсодержимогоxs назначениетипаxml недопустимыеподстановкиxs обработкапробельныхсимволовxs обработкасодержимогоxs ограничениезначенияxs параметрыотбораузловdom переносстрокjson позициявдокументеdom пробельныесимволыxml типатрибутаxml типзначенияjson типканоническогоxml типкомпонентыxs типпроверкиxml типрезультатаdomxpath типузлаdom типузлаxml формаxml формапредставленияxs форматдатыjson экранированиесимволовjson видсравнениякомпоновкиданных действиеобработкирасшифровкикомпоновкиданных направлениесортировкикомпоновкиданных расположениевложенныхэлементоврезультатакомпоновкиданных расположениеитоговкомпоновкиданных расположениегруппировкикомпоновкиданных расположениеполейгруппировкикомпоновкиданных расположениеполякомпоновкиданных расположениереквизитовкомпоновкиданных расположениересурсовкомпоновкиданных типбухгалтерскогоостаткакомпоновкиданных типвыводатекстакомпоновкиданных типгруппировкикомпоновкиданных типгруппыэлементовотборакомпоновкиданных типдополненияпериодакомпоновкиданных типзаголовкаполейкомпоновкиданных типмакетагруппировкикомпоновкиданных типмакетаобластикомпоновкиданных типостаткакомпоновкиданных типпериодакомпоновкиданных типразмещениятекстакомпоновкиданных типсвязинаборовданныхкомпоновкиданных типэлементарезультатакомпоновкиданных расположениелегендыдиаграммыкомпоновкиданных типпримененияотборакомпоновкиданных режимотображенияэлементанастройкикомпоновкиданных режимотображениянастроеккомпоновкиданных состояниеэлементанастройкикомпоновкиданных способвосстановлениянастроеккомпоновкиданных режимкомпоновкирезультата использованиепараметракомпоновкиданных автопозицияресурсовкомпоновкиданных вариантиспользованиягруппировкикомпоновкиданных расположениересурсоввдиаграммекомпоновкиданных фиксациякомпоновкиданных использованиеусловногооформлениякомпоновкиданных важностьинтернетпочтовогосообщения обработкатекстаинтернетпочтовогосообщения способкодированияинтернетпочтовоговложения способкодированиянеasciiсимволовинтернетпочтовогосообщения типтекстапочтовогосообщения протоколинтернетпочты статусразборапочтовогосообщения режимтранзакциизаписижурналарегистрации статустранзакциизаписижурналарегистрации уровеньжурналарегистрации расположениехранилищасертификатовкриптографии режимвключениясертификатовкриптографии режимпроверкисертификатакриптографии типхранилищасертификатовкриптографии кодировкаименфайловвzipфайле методсжатияzip методшифрованияzip режимвосстановленияпутейфайловzip режимобработкиподкаталоговzip режимсохраненияпутейzip уровеньсжатияzip звуковоеоповещение направлениепереходакстроке позициявпотоке порядокбайтов режимблокировкиданных режимуправленияблокировкойданных сервисвстроенныхпокупок состояниефоновогозадания типподписчикадоставляемыхуведомлений уровеньиспользованиязащищенногосоединенияftp направлениепорядкасхемызапроса типдополненияпериодамисхемызапроса типконтрольнойточкисхемызапроса типобъединениясхемызапроса типпараметрадоступнойтаблицысхемызапроса типсоединениясхемызапроса httpметод автоиспользованиеобщегореквизита автопрефиксномеразадачи вариантвстроенногоязыка видиерархии видрегистранакопления видтаблицывнешнегоисточникаданных записьдвиженийприпроведении заполнениепоследовательностей индексирование использованиебазыпланавидоврасчета использованиебыстроговыбора использованиеобщегореквизита использованиеподчинения использованиеполнотекстовогопоиска использованиеразделяемыхданныхобщегореквизита использованиереквизита назначениеиспользованияприложения назначениерасширенияконфигурации направлениепередачи обновлениепредопределенныхданных оперативноепроведение основноепредставлениевидарасчета основноепредставлениевидахарактеристики основноепредставлениезадачи основноепредставлениепланаобмена основноепредставлениесправочника основноепредставлениесчета перемещениеграницыприпроведении периодичностьномерабизнеспроцесса периодичностьномерадокумента периодичностьрегистрарасчета периодичностьрегистрасведений повторноеиспользованиевозвращаемыхзначений полнотекстовыйпоискпривводепостроке принадлежностьобъекта проведение разделениеаутентификацииобщегореквизита разделениеданныхобщегореквизита разделениерасширенийконфигурацииобщегореквизита режимавтонумерацииобъектов режимзаписирегистра режимиспользованиямодальности режимиспользованиясинхронныхвызововрасширенийплатформыивнешнихкомпонент режимповторногоиспользованиясеансов режимполученияданныхвыборапривводепостроке режимсовместимости режимсовместимостиинтерфейса режимуправленияблокировкойданныхпоумолчанию сериикодовпланавидовхарактеристик сериикодовпланасчетов сериикодовсправочника созданиепривводе способвыбора способпоискастрокипривводепостроке способредактирования типданныхтаблицывнешнегоисточникаданных типкодапланавидоврасчета типкодасправочника типмакета типномерабизнеспроцесса типномерадокумента типномеразадачи типформы удалениедвижений важностьпроблемыприменениярасширенияконфигурации вариантинтерфейсаклиентскогоприложения вариантмасштабаформклиентскогоприложения вариантосновногошрифтаклиентскогоприложения вариантстандартногопериода вариантстандартнойдатыначала видграницы видкартинки видотображенияполнотекстовогопоиска видрамки видсравнения видцвета видчисловогозначения видшрифта допустимаядлина допустимыйзнак использованиеbyteordermark использованиеметаданныхполнотекстовогопоиска источникрасширенийконфигурации клавиша кодвозвратадиалога кодировкаxbase кодировкатекста направлениепоиска направлениесортировки обновлениепредопределенныхданных обновлениеприизмененииданных отображениепанелиразделов проверказаполнения режимдиалогавопрос режимзапускаклиентскогоприложения режимокругления режимоткрытияформприложения режимполнотекстовогопоиска скоростьклиентскогосоединения состояниевнешнегоисточникаданных состояниеобновленияконфигурациибазыданных способвыборасертификатаwindows способкодированиястроки статуссообщения типвнешнейкомпоненты типплатформы типповеденияклавишиenter типэлементаинформацииовыполненииобновленияконфигурациибазыданных уровеньизоляциитранзакций хешфункция частидаты",type:"comобъект ftpсоединение httpзапрос httpсервисответ httpсоединение wsопределения wsпрокси xbase анализданных аннотацияxs блокировкаданных буфердвоичныхданных включениеxs выражениекомпоновкиданных генераторслучайныхчисел географическаясхема географическиекоординаты графическаясхема группамоделиxs данныерасшифровкикомпоновкиданных двоичныеданные дендрограмма диаграмма диаграммаганта диалогвыборафайла диалогвыборацвета диалогвыборашрифта диалограсписаниярегламентногозадания диалогредактированиястандартногопериода диапазон документdom документhtml документацияxs доставляемоеуведомление записьdom записьfastinfoset записьhtml записьjson записьxml записьzipфайла записьданных записьтекста записьузловdom запрос защищенноесоединениеopenssl значенияполейрасшифровкикомпоновкиданных извлечениетекста импортxs интернетпочта интернетпочтовоесообщение интернетпочтовыйпрофиль интернетпрокси интернетсоединение информациядляприложенияxs использованиеатрибутаxs использованиесобытияжурналарегистрации источникдоступныхнастроеккомпоновкиданных итераторузловdom картинка квалификаторыдаты квалификаторыдвоичныхданных квалификаторыстроки квалификаторычисла компоновщикмакетакомпоновкиданных компоновщикнастроеккомпоновкиданных конструктормакетаоформлениякомпоновкиданных конструкторнастроеккомпоновкиданных конструкторформатнойстроки линия макеткомпоновкиданных макетобластикомпоновкиданных макетоформлениякомпоновкиданных маскаxs менеджеркриптографии наборсхемxml настройкикомпоновкиданных настройкисериализацииjson обработкакартинок обработкарасшифровкикомпоновкиданных обходдереваdom объявлениеатрибутаxs объявлениенотацииxs объявлениеэлементаxs описаниеиспользованиясобытиядоступжурналарегистрации описаниеиспользованиясобытияотказвдоступежурналарегистрации описаниеобработкирасшифровкикомпоновкиданных описаниепередаваемогофайла описаниетипов определениегруппыатрибутовxs определениегруппымоделиxs определениеограниченияидентичностиxs определениепростоготипаxs определениесоставноготипаxs определениетипадокументаdom определенияxpathxs отборкомпоновкиданных пакетотображаемыхдокументов параметрвыбора параметркомпоновкиданных параметрызаписиjson параметрызаписиxml параметрычтенияxml переопределениеxs планировщик полеанализаданных полекомпоновкиданных построительdom построительзапроса построительотчета построительотчетаанализаданных построительсхемxml поток потоквпамяти почта почтовоесообщение преобразованиеxsl преобразованиекканоническомуxml процессорвыводарезультатакомпоновкиданныхвколлекциюзначений процессорвыводарезультатакомпоновкиданныхвтабличныйдокумент процессоркомпоновкиданных разыменовательпространствименdom рамка расписаниерегламентногозадания расширенноеимяxml результатчтенияданных своднаядиаграмма связьпараметравыбора связьпотипу связьпотипукомпоновкиданных сериализаторxdto сертификатклиентаwindows сертификатклиентафайл сертификаткриптографии сертификатыудостоверяющихцентровwindows сертификатыудостоверяющихцентровфайл сжатиеданных системнаяинформация сообщениепользователю сочетаниеклавиш сравнениезначений стандартнаядатаначала стандартныйпериод схемаxml схемакомпоновкиданных табличныйдокумент текстовыйдокумент тестируемоеприложение типданныхxml уникальныйидентификатор фабрикаxdto файл файловыйпоток фасетдлиныxs фасетколичестваразрядовдробнойчастиxs фасетмаксимальноговключающегозначенияxs фасетмаксимальногоисключающегозначенияxs фасетмаксимальнойдлиныxs фасетминимальноговключающегозначенияxs фасетминимальногоисключающегозначенияxs фасетминимальнойдлиныxs фасетобразцаxs фасетобщегоколичестваразрядовxs фасетперечисленияxs фасетпробельныхсимволовxs фильтрузловdom форматированнаястрока форматированныйдокумент фрагментxs хешированиеданных хранилищезначения цвет чтениеfastinfoset чтениеhtml чтениеjson чтениеxml чтениеzipфайла чтениеданных чтениетекста чтениеузловdom шрифт элементрезультатакомпоновкиданных comsafearray деревозначений массив соответствие списокзначений структура таблицазначений фиксированнаяструктура фиксированноесоответствие фиксированныймассив ",literal:e},contains:[{className:"meta",begin:"#|&",end:"$",keywords:{$pattern:x,"meta-keyword":n+"загрузитьизфайла вебклиент вместо внешнеесоединение клиент конецобласти мобильноеприложениеклиент мобильноеприложениесервер наклиенте наклиентенасервере наклиентенасерверебезконтекста насервере насерверебезконтекста область перед после сервер толстыйклиентобычноеприложение толстыйклиентуправляемоеприложение тонкийклиент "},contains:[i]},{className:"function",variants:[{begin:"процедура|функция",end:"\\)",keywords:"процедура функция"},{begin:"конецпроцедуры|конецфункции",keywords:"конецпроцедуры конецфункции"}],contains:[{begin:"\\(",end:"\\)",endsParent:!0,contains:[{className:"params",begin:x,end:",",excludeEnd:!0,endsWithParent:!0,keywords:{$pattern:x,keyword:"знач",literal:e},contains:[o,t,a]},i]},s.inherit(s.TITLE_MODE,{begin:x})]},i,{className:"symbol",begin:"~",end:";|:",excludeEnd:!0},o,t,a]}}}());
\ No newline at end of file
+hljs.registerLanguage("1c",function(s){var x="[A-Za-zА-Яа-яёЁ_][A-Za-zА-Яа-яёЁ_0-9]+",o="далее возврат вызватьисключение выполнить для если и из или иначе иначеесли исключение каждого конецесли конецпопытки конеццикла не новый перейти перем по пока попытка прервать продолжить тогда цикл экспорт ",m="null истина ложь неопределено",t=s.inherit(s.NM),l={cN:"string",b:'"|\\|',e:'"|$',c:[{b:'""'}]},e={b:"'",e:"'",eB:!0,eE:!0,c:[{cN:"number",b:"\\d{4}([\\.\\\\/:-]?\\d{2}){0,5}"}]},n=s.inherit(s.CLCM);return{cI:!0,l:x,k:{keyword:o,built_in:"разделительстраниц разделительстрок символтабуляции ansitooem oemtoansi ввестивидсубконто ввестиперечисление ввестипериод ввестиплансчетов выбранныйплансчетов датагод датамесяц датачисло заголовоксистемы значениевстроку значениеизстроки каталогиб каталогпользователя кодсимв конгода конецпериодаби конецрассчитанногопериодаби конецстандартногоинтервала конквартала конмесяца коннедели лог лог10 максимальноеколичествосубконто названиеинтерфейса названиенабораправ назначитьвид назначитьсчет найтиссылки началопериодаби началостандартногоинтервала начгода начквартала начмесяца начнедели номерднягода номерднянедели номернеделигода обработкаожидания основнойжурналрасчетов основнойплансчетов основнойязык очиститьокносообщений периодстр получитьвремята получитьдатута получитьдокументта получитьзначенияотбора получитьпозициюта получитьпустоезначение получитьта префиксавтонумерации пропись пустоезначение разм разобратьпозициюдокумента рассчитатьрегистрына рассчитатьрегистрыпо симв создатьобъект статусвозврата стрколичествострок сформироватьпозициюдокумента счетпокоду текущеевремя типзначения типзначениястр установитьтана установитьтапо фиксшаблон шаблон acos asin atan base64значение base64строка cos exp log log10 pow sin sqrt tan xmlзначение xmlстрока xmlтип xmlтипзнч активноеокно безопасныйрежим безопасныйрежимразделенияданных булево ввестидату ввестизначение ввестистроку ввестичисло возможностьчтенияxml вопрос восстановитьзначение врег выгрузитьжурналрегистрации выполнитьобработкуоповещения выполнитьпроверкуправдоступа вычислить год данныеформывзначение дата день деньгода деньнедели добавитьмесяц заблокироватьданныедляредактирования заблокироватьработупользователя завершитьработусистемы загрузитьвнешнююкомпоненту закрытьсправку записатьjson записатьxml записатьдатуjson записьжурналарегистрации заполнитьзначениясвойств запроситьразрешениепользователя запуститьприложение запуститьсистему зафиксироватьтранзакцию значениевданныеформы значениевстрокувнутр значениевфайл значениезаполнено значениеизстрокивнутр значениеизфайла изxmlтипа импортмоделиxdto имякомпьютера имяпользователя инициализироватьпредопределенныеданные информацияобошибке каталогбиблиотекимобильногоустройства каталогвременныхфайлов каталогдокументов каталогпрограммы кодироватьстроку кодлокализацииинформационнойбазы кодсимвола командасистемы конецгода конецдня конецквартала конецмесяца конецминуты конецнедели конецчаса конфигурациябазыданныхизмененадинамически конфигурацияизменена копироватьданныеформы копироватьфайл краткоепредставлениеошибки лев макс местноевремя месяц мин минута монопольныйрежим найти найтинедопустимыесимволыxml найтиокнопонавигационнойссылке найтипомеченныенаудаление найтипоссылкам найтифайлы началогода началодня началоквартала началомесяца началоминуты началонедели началочаса начатьзапросразрешенияпользователя начатьзапускприложения начатькопированиефайла начатьперемещениефайла начатьподключениевнешнейкомпоненты начатьподключениерасширенияработыскриптографией начатьподключениерасширенияработысфайлами начатьпоискфайлов начатьполучениекаталогавременныхфайлов начатьполучениекаталогадокументов начатьполучениерабочегокаталогаданныхпользователя начатьполучениефайлов начатьпомещениефайла начатьпомещениефайлов начатьсозданиедвоичныхданныхизфайла начатьсозданиекаталога начатьтранзакцию начатьудалениефайлов начатьустановкувнешнейкомпоненты начатьустановкурасширенияработыскриптографией начатьустановкурасширенияработысфайлами неделягода необходимостьзавершениясоединения номерсеансаинформационнойбазы номерсоединенияинформационнойбазы нрег нстр обновитьинтерфейс обновитьнумерациюобъектов обновитьповторноиспользуемыезначения обработкапрерыванияпользователя объединитьфайлы окр описаниеошибки оповестить оповеститьобизменении отключитьобработчикзапросанастроекклиенталицензирования отключитьобработчикожидания отключитьобработчикоповещения открытьзначение открытьиндекссправки открытьсодержаниесправки открытьсправку открытьформу открытьформумодально отменитьтранзакцию очиститьжурналрегистрации очиститьнастройкипользователя очиститьсообщения параметрыдоступа перейтипонавигационнойссылке переместитьфайл подключитьвнешнююкомпоненту подключитьобработчикзапросанастроекклиенталицензирования подключитьобработчикожидания подключитьобработчикоповещения подключитьрасширениеработыскриптографией подключитьрасширениеработысфайлами подробноепредставлениеошибки показатьвводдаты показатьвводзначения показатьвводстроки показатьвводчисла показатьвопрос показатьзначение показатьинформациюобошибке показатьнакарте показатьоповещениепользователя показатьпредупреждение полноеимяпользователя получитьcomобъект получитьxmlтип получитьадреспоместоположению получитьблокировкусеансов получитьвремязавершенияспящегосеанса получитьвремязасыпанияпассивногосеанса получитьвремяожиданияблокировкиданных получитьданныевыбора получитьдополнительныйпараметрклиенталицензирования получитьдопустимыекодылокализации получитьдопустимыечасовыепояса получитьзаголовокклиентскогоприложения получитьзаголовоксистемы получитьзначенияотборажурналарегистрации получитьидентификаторконфигурации получитьизвременногохранилища получитьимявременногофайла получитьимяклиенталицензирования получитьинформациюэкрановклиента получитьиспользованиежурналарегистрации получитьиспользованиесобытияжурналарегистрации получитькраткийзаголовокприложения получитьмакетоформления получитьмаскувсефайлы получитьмаскувсефайлыклиента получитьмаскувсефайлысервера получитьместоположениепоадресу получитьминимальнуюдлинупаролейпользователей получитьнавигационнуюссылку получитьнавигационнуюссылкуинформационнойбазы получитьобновлениеконфигурациибазыданных получитьобновлениепредопределенныхданныхинформационнойбазы получитьобщиймакет получитьобщуюформу получитьокна получитьоперативнуюотметкувремени получитьотключениебезопасногорежима получитьпараметрыфункциональныхопцийинтерфейса получитьполноеимяпредопределенногозначения получитьпредставлениянавигационныхссылок получитьпроверкусложностипаролейпользователей получитьразделительпути получитьразделительпутиклиента получитьразделительпутисервера получитьсеансыинформационнойбазы получитьскоростьклиентскогосоединения получитьсоединенияинформационнойбазы получитьсообщенияпользователю получитьсоответствиеобъектаиформы получитьсоставстандартногоинтерфейсаodata получитьструктурухранениябазыданных получитьтекущийсеансинформационнойбазы получитьфайл получитьфайлы получитьформу получитьфункциональнуюопцию получитьфункциональнуюопциюинтерфейса получитьчасовойпоясинформационнойбазы пользователиос поместитьвовременноехранилище поместитьфайл поместитьфайлы прав праводоступа предопределенноезначение представлениекодалокализации представлениепериода представлениеправа представлениеприложения представлениесобытияжурналарегистрации представлениечасовогопояса предупреждение прекратитьработусистемы привилегированныйрежим продолжитьвызов прочитатьjson прочитатьxml прочитатьдатуjson пустаястрока рабочийкаталогданныхпользователя разблокироватьданныедляредактирования разделитьфайл разорватьсоединениесвнешнимисточникомданных раскодироватьстроку рольдоступна секунда сигнал символ скопироватьжурналрегистрации смещениелетнеговремени смещениестандартноговремени соединитьбуферыдвоичныхданных создатькаталог создатьфабрикуxdto сокрл сокрлп сокрп сообщить состояние сохранитьзначение сохранитьнастройкипользователя сред стрдлина стрзаканчиваетсяна стрзаменить стрнайти стрначинаетсяс строка строкасоединенияинформационнойбазы стрполучитьстроку стрразделить стрсоединить стрсравнить стрчисловхождений стрчислострок стршаблон текущаядата текущаядатасеанса текущаяуниверсальнаядата текущаяуниверсальнаядатавмиллисекундах текущийвариантинтерфейсаклиентскогоприложения текущийвариантосновногошрифтаклиентскогоприложения текущийкодлокализации текущийрежимзапуска текущийязык текущийязыксистемы тип типзнч транзакцияактивна трег удалитьданныеинформационнойбазы удалитьизвременногохранилища удалитьобъекты удалитьфайлы универсальноевремя установитьбезопасныйрежим установитьбезопасныйрежимразделенияданных установитьблокировкусеансов установитьвнешнююкомпоненту установитьвремязавершенияспящегосеанса установитьвремязасыпанияпассивногосеанса установитьвремяожиданияблокировкиданных установитьзаголовокклиентскогоприложения установитьзаголовоксистемы установитьиспользованиежурналарегистрации установитьиспользованиесобытияжурналарегистрации установитькраткийзаголовокприложения установитьминимальнуюдлинупаролейпользователей установитьмонопольныйрежим установитьнастройкиклиенталицензирования установитьобновлениепредопределенныхданныхинформационнойбазы установитьотключениебезопасногорежима установитьпараметрыфункциональныхопцийинтерфейса установитьпривилегированныйрежим установитьпроверкусложностипаролейпользователей установитьрасширениеработыскриптографией установитьрасширениеработысфайлами установитьсоединениесвнешнимисточникомданных установитьсоответствиеобъектаиформы установитьсоставстандартногоинтерфейсаodata установитьчасовойпоясинформационнойбазы установитьчасовойпояссеанса формат цел час часовойпояс часовойпояссеанса число числопрописью этоадресвременногохранилища wsссылки библиотекакартинок библиотекамакетовоформлениякомпоновкиданных библиотекастилей бизнеспроцессы внешниеисточникиданных внешниеобработки внешниеотчеты встроенныепокупки главныйинтерфейс главныйстиль документы доставляемыеуведомления журналыдокументов задачи информацияобинтернетсоединении использованиерабочейдаты историяработыпользователя константы критерииотбора метаданные обработки отображениерекламы отправкадоставляемыхуведомлений отчеты панельзадачос параметрзапуска параметрысеанса перечисления планывидоврасчета планывидовхарактеристик планыобмена планысчетов полнотекстовыйпоиск пользователиинформационнойбазы последовательности проверкавстроенныхпокупок рабочаядата расширенияконфигурации регистрыбухгалтерии регистрынакопления регистрырасчета регистрысведений регламентныезадания сериализаторxdto справочники средствагеопозиционирования средствакриптографии средствамультимедиа средстваотображениярекламы средствапочты средствателефонии фабрикаxdto файловыепотоки фоновыезадания хранилищанастроек хранилищевариантовотчетов хранилищенастроекданныхформ хранилищеобщихнастроек хранилищепользовательскихнастроекдинамическихсписков хранилищепользовательскихнастроекотчетов хранилищесистемныхнастроек ",class:"webцвета windowsцвета windowsшрифты библиотекакартинок рамкистиля символы цветастиля шрифтыстиля автоматическоесохранениеданныхформывнастройках автонумерациявформе автораздвижениесерий анимациядиаграммы вариантвыравниванияэлементовизаголовков вариантуправлениявысотойтаблицы вертикальнаяпрокруткаформы вертикальноеположение вертикальноеположениеэлемента видгруппыформы виддекорацииформы виддополненияэлементаформы видизмененияданных видкнопкиформы видпереключателя видподписейкдиаграмме видполяформы видфлажка влияниеразмеранапузырекдиаграммы горизонтальноеположение горизонтальноеположениеэлемента группировкаколонок группировкаподчиненныхэлементовформы группыиэлементы действиеперетаскивания дополнительныйрежимотображения допустимыедействияперетаскивания интервалмеждуэлементамиформы использованиевывода использованиеполосыпрокрутки используемоезначениеточкибиржевойдиаграммы историявыборапривводе источникзначенийоситочекдиаграммы источникзначенияразмерапузырькадиаграммы категориягруппыкоманд максимумсерий начальноеотображениедерева начальноеотображениесписка обновлениетекстаредактирования ориентациядендрограммы ориентациядиаграммы ориентацияметокдиаграммы ориентацияметоксводнойдиаграммы ориентацияэлементаформы отображениевдиаграмме отображениевлегендедиаграммы отображениегруппыкнопок отображениезаголовкашкалыдиаграммы отображениезначенийсводнойдиаграммы отображениезначенияизмерительнойдиаграммы отображениеинтерваладиаграммыганта отображениекнопки отображениекнопкивыбора отображениеобсужденийформы отображениеобычнойгруппы отображениеотрицательныхзначенийпузырьковойдиаграммы отображениепанелипоиска отображениеподсказки отображениепредупрежденияприредактировании отображениеразметкиполосырегулирования отображениестраницформы отображениетаблицы отображениетекстазначениядиаграммыганта отображениеуправленияобычнойгруппы отображениефигурыкнопки палитрацветовдиаграммы поведениеобычнойгруппы поддержкамасштабадендрограммы поддержкамасштабадиаграммыганта поддержкамасштабасводнойдиаграммы поисквтаблицепривводе положениезаголовкаэлементаформы положениекартинкикнопкиформы положениекартинкиэлементаграфическойсхемы положениекоманднойпанелиформы положениекоманднойпанелиэлементаформы положениеопорнойточкиотрисовки положениеподписейкдиаграмме положениеподписейшкалызначенийизмерительнойдиаграммы положениесостоянияпросмотра положениестрокипоиска положениетекстасоединительнойлинии положениеуправленияпоиском положениешкалывремени порядокотображенияточекгоризонтальнойгистограммы порядоксерийвлегендедиаграммы размеркартинки расположениезаголовкашкалыдиаграммы растягиваниеповертикалидиаграммыганта режимавтоотображениясостояния режимвводастроктаблицы режимвыборанезаполненного режимвыделениядаты режимвыделениястрокитаблицы режимвыделениятаблицы режимизмененияразмера режимизменениясвязанногозначения режимиспользованиядиалогапечати режимиспользованияпараметракоманды режиммасштабированияпросмотра режимосновногоокнаклиентскогоприложения режимоткрытияокнаформы режимотображениявыделения режимотображениягеографическойсхемы режимотображениязначенийсерии режимотрисовкисеткиграфическойсхемы режимполупрозрачностидиаграммы режимпробеловдиаграммы режимразмещениянастранице режимредактированияколонки режимсглаживаниядиаграммы режимсглаживанияиндикатора режимсписказадач сквозноевыравнивание сохранениеданныхформывнастройках способзаполнениятекстазаголовкашкалыдиаграммы способопределенияограничивающегозначениядиаграммы стандартнаягруппакоманд стандартноеоформление статусоповещенияпользователя стильстрелки типаппроксимациилиниитрендадиаграммы типдиаграммы типединицышкалывремени типимпортасерийслоягеографическойсхемы типлиниигеографическойсхемы типлиниидиаграммы типмаркерагеографическойсхемы типмаркерадиаграммы типобластиоформления типорганизацииисточникаданныхгеографическойсхемы типотображениясериислоягеографическойсхемы типотображенияточечногообъектагеографическойсхемы типотображенияшкалыэлементалегендыгеографическойсхемы типпоискаобъектовгеографическойсхемы типпроекциигеографическойсхемы типразмещенияизмерений типразмещенияреквизитовизмерений типрамкиэлементауправления типсводнойдиаграммы типсвязидиаграммыганта типсоединениязначенийпосериямдиаграммы типсоединенияточекдиаграммы типсоединительнойлинии типстороныэлементаграфическойсхемы типформыотчета типшкалырадарнойдиаграммы факторлиниитрендадиаграммы фигуракнопки фигурыграфическойсхемы фиксациявтаблице форматдняшкалывремени форматкартинки ширинаподчиненныхэлементовформы виддвижениябухгалтерии виддвижениянакопления видпериодарегистрарасчета видсчета видточкимаршрутабизнеспроцесса использованиеагрегатарегистранакопления использованиегруппиэлементов использованиережимапроведения использованиесреза периодичностьагрегатарегистранакопления режимавтовремя режимзаписидокумента режимпроведениядокумента авторегистрацияизменений допустимыйномерсообщения отправкаэлементаданных получениеэлементаданных использованиерасшифровкитабличногодокумента ориентациястраницы положениеитоговколоноксводнойтаблицы положениеитоговстроксводнойтаблицы положениетекстаотносительнокартинки расположениезаголовкагруппировкитабличногодокумента способчтениязначенийтабличногодокумента типдвустороннейпечати типзаполненияобластитабличногодокумента типкурсоровтабличногодокумента типлиниирисункатабличногодокумента типлинииячейкитабличногодокумента типнаправленияпереходатабличногодокумента типотображениявыделениятабличногодокумента типотображениялинийсводнойтаблицы типразмещениятекстатабличногодокумента типрисункатабличногодокумента типсмещениятабличногодокумента типузоратабличногодокумента типфайлатабличногодокумента точностьпечати чередованиерасположениястраниц отображениевремениэлементовпланировщика типфайлаформатированногодокумента обходрезультатазапроса типзаписизапроса видзаполнениярасшифровкипостроителяотчета типдобавленияпредставлений типизмеренияпостроителяотчета типразмещенияитогов доступкфайлу режимдиалогавыборафайла режимоткрытияфайла типизмеренияпостроителязапроса видданныханализа методкластеризации типединицыинтервалавременианализаданных типзаполнениятаблицырезультатаанализаданных типиспользованиячисловыхзначенийанализаданных типисточникаданныхпоискаассоциаций типколонкианализаданныхдереворешений типколонкианализаданныхкластеризация типколонкианализаданныхобщаястатистика типколонкианализаданныхпоискассоциаций типколонкианализаданныхпоискпоследовательностей типколонкимоделипрогноза типмерырасстоянияанализаданных типотсеченияправилассоциации типполяанализаданных типстандартизациианализаданных типупорядочиванияправилассоциациианализаданных типупорядочиванияшаблоновпоследовательностейанализаданных типупрощениядереварешений wsнаправлениепараметра вариантxpathxs вариантзаписидатыjson вариантпростоготипаxs видгруппымоделиxs видфасетаxdto действиепостроителяdom завершенностьпростоготипаxs завершенностьсоставноготипаxs завершенностьсхемыxs запрещенныеподстановкиxs исключениягруппподстановкиxs категорияиспользованияатрибутаxs категорияограниченияидентичностиxs категорияограниченияпространствименxs методнаследованияxs модельсодержимогоxs назначениетипаxml недопустимыеподстановкиxs обработкапробельныхсимволовxs обработкасодержимогоxs ограничениезначенияxs параметрыотбораузловdom переносстрокjson позициявдокументеdom пробельныесимволыxml типатрибутаxml типзначенияjson типканоническогоxml типкомпонентыxs типпроверкиxml типрезультатаdomxpath типузлаdom типузлаxml формаxml формапредставленияxs форматдатыjson экранированиесимволовjson видсравнениякомпоновкиданных действиеобработкирасшифровкикомпоновкиданных направлениесортировкикомпоновкиданных расположениевложенныхэлементоврезультатакомпоновкиданных расположениеитоговкомпоновкиданных расположениегруппировкикомпоновкиданных расположениеполейгруппировкикомпоновкиданных расположениеполякомпоновкиданных расположениереквизитовкомпоновкиданных расположениересурсовкомпоновкиданных типбухгалтерскогоостаткакомпоновкиданных типвыводатекстакомпоновкиданных типгруппировкикомпоновкиданных типгруппыэлементовотборакомпоновкиданных типдополненияпериодакомпоновкиданных типзаголовкаполейкомпоновкиданных типмакетагруппировкикомпоновкиданных типмакетаобластикомпоновкиданных типостаткакомпоновкиданных типпериодакомпоновкиданных типразмещениятекстакомпоновкиданных типсвязинаборовданныхкомпоновкиданных типэлементарезультатакомпоновкиданных расположениелегендыдиаграммыкомпоновкиданных типпримененияотборакомпоновкиданных режимотображенияэлементанастройкикомпоновкиданных режимотображениянастроеккомпоновкиданных состояниеэлементанастройкикомпоновкиданных способвосстановлениянастроеккомпоновкиданных режимкомпоновкирезультата использованиепараметракомпоновкиданных автопозицияресурсовкомпоновкиданных вариантиспользованиягруппировкикомпоновкиданных расположениересурсоввдиаграммекомпоновкиданных фиксациякомпоновкиданных использованиеусловногооформлениякомпоновкиданных важностьинтернетпочтовогосообщения обработкатекстаинтернетпочтовогосообщения способкодированияинтернетпочтовоговложения способкодированиянеasciiсимволовинтернетпочтовогосообщения типтекстапочтовогосообщения протоколинтернетпочты статусразборапочтовогосообщения режимтранзакциизаписижурналарегистрации статустранзакциизаписижурналарегистрации уровеньжурналарегистрации расположениехранилищасертификатовкриптографии режимвключениясертификатовкриптографии режимпроверкисертификатакриптографии типхранилищасертификатовкриптографии кодировкаименфайловвzipфайле методсжатияzip методшифрованияzip режимвосстановленияпутейфайловzip режимобработкиподкаталоговzip режимсохраненияпутейzip уровеньсжатияzip звуковоеоповещение направлениепереходакстроке позициявпотоке порядокбайтов режимблокировкиданных режимуправленияблокировкойданных сервисвстроенныхпокупок состояниефоновогозадания типподписчикадоставляемыхуведомлений уровеньиспользованиязащищенногосоединенияftp направлениепорядкасхемызапроса типдополненияпериодамисхемызапроса типконтрольнойточкисхемызапроса типобъединениясхемызапроса типпараметрадоступнойтаблицысхемызапроса типсоединениясхемызапроса httpметод автоиспользованиеобщегореквизита автопрефиксномеразадачи вариантвстроенногоязыка видиерархии видрегистранакопления видтаблицывнешнегоисточникаданных записьдвиженийприпроведении заполнениепоследовательностей индексирование использованиебазыпланавидоврасчета использованиебыстроговыбора использованиеобщегореквизита использованиеподчинения использованиеполнотекстовогопоиска использованиеразделяемыхданныхобщегореквизита использованиереквизита назначениеиспользованияприложения назначениерасширенияконфигурации направлениепередачи обновлениепредопределенныхданных оперативноепроведение основноепредставлениевидарасчета основноепредставлениевидахарактеристики основноепредставлениезадачи основноепредставлениепланаобмена основноепредставлениесправочника основноепредставлениесчета перемещениеграницыприпроведении периодичностьномерабизнеспроцесса периодичностьномерадокумента периодичностьрегистрарасчета периодичностьрегистрасведений повторноеиспользованиевозвращаемыхзначений полнотекстовыйпоискпривводепостроке принадлежностьобъекта проведение разделениеаутентификацииобщегореквизита разделениеданныхобщегореквизита разделениерасширенийконфигурацииобщегореквизита режимавтонумерацииобъектов режимзаписирегистра режимиспользованиямодальности режимиспользованиясинхронныхвызововрасширенийплатформыивнешнихкомпонент режимповторногоиспользованиясеансов режимполученияданныхвыборапривводепостроке режимсовместимости режимсовместимостиинтерфейса режимуправленияблокировкойданныхпоумолчанию сериикодовпланавидовхарактеристик сериикодовпланасчетов сериикодовсправочника созданиепривводе способвыбора способпоискастрокипривводепостроке способредактирования типданныхтаблицывнешнегоисточникаданных типкодапланавидоврасчета типкодасправочника типмакета типномерабизнеспроцесса типномерадокумента типномеразадачи типформы удалениедвижений важностьпроблемыприменениярасширенияконфигурации вариантинтерфейсаклиентскогоприложения вариантмасштабаформклиентскогоприложения вариантосновногошрифтаклиентскогоприложения вариантстандартногопериода вариантстандартнойдатыначала видграницы видкартинки видотображенияполнотекстовогопоиска видрамки видсравнения видцвета видчисловогозначения видшрифта допустимаядлина допустимыйзнак использованиеbyteordermark использованиеметаданныхполнотекстовогопоиска источникрасширенийконфигурации клавиша кодвозвратадиалога кодировкаxbase кодировкатекста направлениепоиска направлениесортировки обновлениепредопределенныхданных обновлениеприизмененииданных отображениепанелиразделов проверказаполнения режимдиалогавопрос режимзапускаклиентскогоприложения режимокругления режимоткрытияформприложения режимполнотекстовогопоиска скоростьклиентскогосоединения состояниевнешнегоисточникаданных состояниеобновленияконфигурациибазыданных способвыборасертификатаwindows способкодированиястроки статуссообщения типвнешнейкомпоненты типплатформы типповеденияклавишиenter типэлементаинформацииовыполненииобновленияконфигурациибазыданных уровеньизоляциитранзакций хешфункция частидаты",type:"comобъект ftpсоединение httpзапрос httpсервисответ httpсоединение wsопределения wsпрокси xbase анализданных аннотацияxs блокировкаданных буфердвоичныхданных включениеxs выражениекомпоновкиданных генераторслучайныхчисел географическаясхема географическиекоординаты графическаясхема группамоделиxs данныерасшифровкикомпоновкиданных двоичныеданные дендрограмма диаграмма диаграммаганта диалогвыборафайла диалогвыборацвета диалогвыборашрифта диалограсписаниярегламентногозадания диалогредактированиястандартногопериода диапазон документdom документhtml документацияxs доставляемоеуведомление записьdom записьfastinfoset записьhtml записьjson записьxml записьzipфайла записьданных записьтекста записьузловdom запрос защищенноесоединениеopenssl значенияполейрасшифровкикомпоновкиданных извлечениетекста импортxs интернетпочта интернетпочтовоесообщение интернетпочтовыйпрофиль интернетпрокси интернетсоединение информациядляприложенияxs использованиеатрибутаxs использованиесобытияжурналарегистрации источникдоступныхнастроеккомпоновкиданных итераторузловdom картинка квалификаторыдаты квалификаторыдвоичныхданных квалификаторыстроки квалификаторычисла компоновщикмакетакомпоновкиданных компоновщикнастроеккомпоновкиданных конструктормакетаоформлениякомпоновкиданных конструкторнастроеккомпоновкиданных конструкторформатнойстроки линия макеткомпоновкиданных макетобластикомпоновкиданных макетоформлениякомпоновкиданных маскаxs менеджеркриптографии наборсхемxml настройкикомпоновкиданных настройкисериализацииjson обработкакартинок обработкарасшифровкикомпоновкиданных обходдереваdom объявлениеатрибутаxs объявлениенотацииxs объявлениеэлементаxs описаниеиспользованиясобытиядоступжурналарегистрации описаниеиспользованиясобытияотказвдоступежурналарегистрации описаниеобработкирасшифровкикомпоновкиданных описаниепередаваемогофайла описаниетипов определениегруппыатрибутовxs определениегруппымоделиxs определениеограниченияидентичностиxs определениепростоготипаxs определениесоставноготипаxs определениетипадокументаdom определенияxpathxs отборкомпоновкиданных пакетотображаемыхдокументов параметрвыбора параметркомпоновкиданных параметрызаписиjson параметрызаписиxml параметрычтенияxml переопределениеxs планировщик полеанализаданных полекомпоновкиданных построительdom построительзапроса построительотчета построительотчетаанализаданных построительсхемxml поток потоквпамяти почта почтовоесообщение преобразованиеxsl преобразованиекканоническомуxml процессорвыводарезультатакомпоновкиданныхвколлекциюзначений процессорвыводарезультатакомпоновкиданныхвтабличныйдокумент процессоркомпоновкиданных разыменовательпространствименdom рамка расписаниерегламентногозадания расширенноеимяxml результатчтенияданных своднаядиаграмма связьпараметравыбора связьпотипу связьпотипукомпоновкиданных сериализаторxdto сертификатклиентаwindows сертификатклиентафайл сертификаткриптографии сертификатыудостоверяющихцентровwindows сертификатыудостоверяющихцентровфайл сжатиеданных системнаяинформация сообщениепользователю сочетаниеклавиш сравнениезначений стандартнаядатаначала стандартныйпериод схемаxml схемакомпоновкиданных табличныйдокумент текстовыйдокумент тестируемоеприложение типданныхxml уникальныйидентификатор фабрикаxdto файл файловыйпоток фасетдлиныxs фасетколичестваразрядовдробнойчастиxs фасетмаксимальноговключающегозначенияxs фасетмаксимальногоисключающегозначенияxs фасетмаксимальнойдлиныxs фасетминимальноговключающегозначенияxs фасетминимальногоисключающегозначенияxs фасетминимальнойдлиныxs фасетобразцаxs фасетобщегоколичестваразрядовxs фасетперечисленияxs фасетпробельныхсимволовxs фильтрузловdom форматированнаястрока форматированныйдокумент фрагментxs хешированиеданных хранилищезначения цвет чтениеfastinfoset чтениеhtml чтениеjson чтениеxml чтениеzipфайла чтениеданных чтениетекста чтениеузловdom шрифт элементрезультатакомпоновкиданных comsafearray деревозначений массив соответствие списокзначений структура таблицазначений фиксированнаяструктура фиксированноесоответствие фиксированныймассив ",literal:m},c:[{cN:"meta",l:x,b:"#|&",e:"$",k:{"meta-keyword":o+"загрузитьизфайла вебклиент вместо внешнеесоединение клиент конецобласти мобильноеприложениеклиент мобильноеприложениесервер наклиенте наклиентенасервере наклиентенасерверебезконтекста насервере насерверебезконтекста область перед после сервер толстыйклиентобычноеприложение толстыйклиентуправляемоеприложение тонкийклиент "},c:[n]},{cN:"function",l:x,v:[{b:"процедура|функция",e:"\\)",k:"процедура функция"},{b:"конецпроцедуры|конецфункции",k:"конецпроцедуры конецфункции"}],c:[{b:"\\(",e:"\\)",endsParent:!0,c:[{cN:"params",l:x,b:x,e:",",eE:!0,eW:!0,k:{keyword:"знач",literal:m},c:[t,l,e]},n]},s.inherit(s.TM,{b:x})]},n,{cN:"symbol",b:"~",e:";|:",eE:!0},t,l,e]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/abnf.min.js b/vendor/assets/javascripts/highlightjs/languages/abnf.min.js
index a5c1990ade..aa6242c3dc 100644
--- a/vendor/assets/javascripts/highlightjs/languages/abnf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/abnf.min.js
@@ -1 +1 @@
-hljs.registerLanguage("abnf",function(){"use strict";return function(s){return{name:"Augmented Backus-Naur Form",illegal:"[!@#$^&',?+~`|:]",keywords:"ALPHA BIT CHAR CR CRLF CTL DIGIT DQUOTE HEXDIG HTAB LF LWSP OCTET SP VCHAR WSP",contains:[{className:"attribute",begin:"^[a-zA-Z][a-zA-Z0-9-]*(?=\\s*=)"},s.COMMENT(";","$"),{className:"symbol",begin:/%b[0-1]+(-[0-1]+|(\.[0-1]+)+){0,1}/},{className:"symbol",begin:/%d[0-9]+(-[0-9]+|(\.[0-9]+)+){0,1}/},{className:"symbol",begin:/%x[0-9A-F]+(-[0-9A-F]+|(\.[0-9A-F]+)+){0,1}/},{className:"symbol",begin:/%[si]/},s.QUOTE_STRING_MODE,s.NUMBER_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("abnf",function(b){var A="^[a-zA-Z][a-zA-Z0-9-]*",s="[!@#$^&',?+~`|:]",a=b.C(";","$"),c={cN:"attribute",b:A+"(?=\\s*=)"};return{i:s,k:["ALPHA","BIT","CHAR","CR","CRLF","CTL","DIGIT","DQUOTE","HEXDIG","HTAB","LF","LWSP","OCTET","SP","VCHAR","WSP"].join(" "),c:[c,a,{cN:"symbol",b:/%b[0-1]+(-[0-1]+|(\.[0-1]+)+){0,1}/},{cN:"symbol",b:/%d[0-9]+(-[0-9]+|(\.[0-9]+)+){0,1}/},{cN:"symbol",b:/%x[0-9A-F]+(-[0-9A-F]+|(\.[0-9A-F]+)+){0,1}/},{cN:"symbol",b:/%[si]/},b.QSM,b.NM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/accesslog.min.js b/vendor/assets/javascripts/highlightjs/languages/accesslog.min.js
index ff272f62af..8d5eb45f7f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/accesslog.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/accesslog.min.js
@@ -1 +1 @@
-hljs.registerLanguage("accesslog",function(){"use strict";return function(e){var n=["GET","POST","HEAD","PUT","DELETE","CONNECT","OPTIONS","PATCH","TRACE"];return{name:"Apache Access Log",contains:[{className:"number",begin:"^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b",relevance:5},{className:"number",begin:"\\b\\d+\\b",relevance:0},{className:"string",begin:'"('+n.join("|")+")",end:'"',keywords:n.join(" "),illegal:"\\n",relevance:5,contains:[{begin:"HTTP/[12]\\.\\d",relevance:5}]},{className:"string",begin:/\[\d[^\]\n]{8,}\]/,illegal:"\\n",relevance:1},{className:"string",begin:/\[/,end:/\]/,illegal:"\\n",relevance:0},{className:"string",begin:'"Mozilla/\\d\\.\\d \\(',end:'"',illegal:"\\n",relevance:3},{className:"string",begin:'"',end:'"',illegal:"\\n",relevance:0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("accesslog",function(e){var n=["GET","POST","HEAD","PUT","DELETE","CONNECT","OPTIONS","PATCH","TRACE"];return{c:[{cN:"number",b:"^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b",relevance:5},{cN:"number",b:"\\b\\d+\\b",relevance:0},{cN:"string",b:'"('+n.join("|")+")",e:'"',k:n.join(" "),i:"\\n",relevance:5,c:[{b:"HTTP/[12]\\.\\d",relevance:5}]},{cN:"string",b:/\[\d[^\]\n]{8,}\]/,i:"\\n",relevance:1},{cN:"string",b:/\[/,e:/\]/,i:"\\n",relevance:0},{cN:"string",b:'"Mozilla/\\d\\.\\d \\(',e:'"',i:"\\n",relevance:3},{cN:"string",b:'"',e:'"',i:"\\n",relevance:0}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/actionscript.min.js b/vendor/assets/javascripts/highlightjs/languages/actionscript.min.js
index df9c5c2049..c34b7c9a56 100644
--- a/vendor/assets/javascripts/highlightjs/languages/actionscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/actionscript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("actionscript",function(){"use strict";return function(e){return{name:"ActionScript",aliases:["as"],keywords:{keyword:"as break case catch class const continue default delete do dynamic each else extends final finally for function get if implements import in include instanceof interface internal is namespace native new override package private protected public return set static super switch this throw try typeof use var void while with",literal:"true false null undefined"},contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.C_NUMBER_MODE,{className:"class",beginKeywords:"package",end:"{",contains:[e.TITLE_MODE]},{className:"class",beginKeywords:"class interface",end:"{",excludeEnd:!0,contains:[{beginKeywords:"extends implements"},e.TITLE_MODE]},{className:"meta",beginKeywords:"import include",end:";",keywords:{"meta-keyword":"import include"}},{className:"function",beginKeywords:"function",end:"[{;]",excludeEnd:!0,illegal:"\\S",contains:[e.TITLE_MODE,{className:"params",begin:"\\(",end:"\\)",contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"rest_arg",begin:"[.]{3}",end:"[a-zA-Z_$][a-zA-Z0-9_$]*",relevance:10}]},{begin:":\\s*([*]|[a-zA-Z_$][a-zA-Z0-9_$]*)"}]},e.METHOD_GUARD],illegal:/#/}}}());
\ No newline at end of file
+hljs.registerLanguage("actionscript",function(e){var a={cN:"rest_arg",b:"[.]{3}",e:"[a-zA-Z_$][a-zA-Z0-9_$]*",relevance:10};return{aliases:["as"],k:{keyword:"as break case catch class const continue default delete do dynamic each else extends final finally for function get if implements import in include instanceof interface internal is namespace native new override package private protected public return set static super switch this throw try typeof use var void while with",literal:"true false null undefined"},c:[e.ASM,e.QSM,e.CLCM,e.CBCM,e.CNM,{cN:"class",bK:"package",e:"{",c:[e.TM]},{cN:"class",bK:"class interface",e:"{",eE:!0,c:[{bK:"extends implements"},e.TM]},{cN:"meta",bK:"import include",e:";",k:{"meta-keyword":"import include"}},{cN:"function",bK:"function",e:"[{;]",eE:!0,i:"\\S",c:[e.TM,{cN:"params",b:"\\(",e:"\\)",c:[e.ASM,e.QSM,e.CLCM,e.CBCM,a]},{b:":\\s*([*]|[a-zA-Z_$][a-zA-Z0-9_$]*)"}]},e.METHOD_GUARD],i:/#/}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ada.min.js b/vendor/assets/javascripts/highlightjs/languages/ada.min.js
index e03496b8bb..6029e45da5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ada.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ada.min.js
@@ -1 +1 @@
-hljs.registerLanguage("ada",function(){"use strict";return function(e){var n="[A-Za-z](_?[A-Za-z0-9.])*",s=e.COMMENT("--","$"),a={begin:"\\s+:\\s+",end:"\\s*(:=|;|\\)|=>|$)",illegal:"[]{}%#'\"",contains:[{beginKeywords:"loop for declare others",endsParent:!0},{className:"keyword",beginKeywords:"not null constant access function procedure in out aliased exception"},{className:"type",begin:n,endsParent:!0,relevance:0}]};return{name:"Ada",case_insensitive:!0,keywords:{keyword:"abort else new return abs elsif not reverse abstract end accept entry select access exception of separate aliased exit or some all others subtype and for out synchronized array function overriding at tagged generic package task begin goto pragma terminate body private then if procedure type case in protected constant interface is raise use declare range delay limited record when delta loop rem while digits renames with do mod requeue xor",literal:"True False"},contains:[s,{className:"string",begin:/"/,end:/"/,contains:[{begin:/""/,relevance:0}]},{className:"string",begin:/'.'/},{className:"number",begin:"\\b(\\d(_|\\d)*#\\w+(\\.\\w+)?#([eE][-+]?\\d(_|\\d)*)?|\\d(_|\\d)*(\\.\\d(_|\\d)*)?([eE][-+]?\\d(_|\\d)*)?)",relevance:0},{className:"symbol",begin:"'"+n},{className:"title",begin:"(\\bwith\\s+)?(\\bprivate\\s+)?\\bpackage\\s+(\\bbody\\s+)?",end:"(is|$)",keywords:"package body",excludeBegin:!0,excludeEnd:!0,illegal:"[]{}%#'\""},{begin:"(\\b(with|overriding)\\s+)?\\b(function|procedure)\\s+",end:"(\\bis|\\bwith|\\brenames|\\)\\s*;)",keywords:"overriding function procedure with is renames return",returnBegin:!0,contains:[s,{className:"title",begin:"(\\bwith\\s+)?\\b(function|procedure)\\s+",end:"(\\(|\\s+|$)",excludeBegin:!0,excludeEnd:!0,illegal:"[]{}%#'\""},a,{className:"type",begin:"\\breturn\\s+",end:"(\\s+|;|$)",keywords:"return",excludeBegin:!0,excludeEnd:!0,endsParent:!0,illegal:"[]{}%#'\""}]},{className:"type",begin:"\\b(sub)?type\\s+",end:"\\s+",keywords:"type",excludeBegin:!0,illegal:"[]{}%#'\""},a]}}}());
\ No newline at end of file
+hljs.registerLanguage("ada",function(e){var r="[A-Za-z](_?[A-Za-z0-9.])*",t="[]{}%#'\"",n=e.C("--","$"),a={b:"\\s+:\\s+",e:"\\s*(:=|;|\\)|=>|$)",i:t,c:[{bK:"loop for declare others",endsParent:!0},{cN:"keyword",bK:"not null constant access function procedure in out aliased exception"},{cN:"type",b:r,endsParent:!0,relevance:0}]};return{cI:!0,k:{keyword:"abort else new return abs elsif not reverse abstract end accept entry select access exception of separate aliased exit or some all others subtype and for out synchronized array function overriding at tagged generic package task begin goto pragma terminate body private then if procedure type case in protected constant interface is raise use declare range delay limited record when delta loop rem while digits renames with do mod requeue xor",literal:"True False"},c:[n,{cN:"string",b:/"/,e:/"/,c:[{b:/""/,relevance:0}]},{cN:"string",b:/'.'/},{cN:"number",b:"\\b(\\d(_|\\d)*#\\w+(\\.\\w+)?#([eE][-+]?\\d(_|\\d)*)?|\\d(_|\\d)*(\\.\\d(_|\\d)*)?([eE][-+]?\\d(_|\\d)*)?)",relevance:0},{cN:"symbol",b:"'"+r},{cN:"title",b:"(\\bwith\\s+)?(\\bprivate\\s+)?\\bpackage\\s+(\\bbody\\s+)?",e:"(is|$)",k:"package body",eB:!0,eE:!0,i:t},{b:"(\\b(with|overriding)\\s+)?\\b(function|procedure)\\s+",e:"(\\bis|\\bwith|\\brenames|\\)\\s*;)",k:"overriding function procedure with is renames return",rB:!0,c:[n,{cN:"title",b:"(\\bwith\\s+)?\\b(function|procedure)\\s+",e:"(\\(|\\s+|$)",eB:!0,eE:!0,i:t},a,{cN:"type",b:"\\breturn\\s+",e:"(\\s+|;|$)",k:"return",eB:!0,eE:!0,endsParent:!0,i:t}]},{cN:"type",b:"\\b(sub)?type\\s+",e:"\\s+",k:"type",eB:!0,i:t},a]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/angelscript.min.js b/vendor/assets/javascripts/highlightjs/languages/angelscript.min.js
index 181eca4999..f5a9ede3f1 100644
--- a/vendor/assets/javascripts/highlightjs/languages/angelscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/angelscript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("angelscript",function(){"use strict";return function(e){var n={className:"built_in",begin:"\\b(void|bool|int|int8|int16|int32|int64|uint|uint8|uint16|uint32|uint64|string|ref|array|double|float|auto|dictionary)"},a={className:"symbol",begin:"[a-zA-Z0-9_]+@"},i={className:"keyword",begin:"<",end:">",contains:[n,a]};return n.contains=[i],a.contains=[i],{name:"AngelScript",aliases:["asc"],keywords:"for in|0 break continue while do|0 return if else case switch namespace is cast or and xor not get|0 in inout|10 out override set|0 private public const default|0 final shared external mixin|10 enum typedef funcdef this super import from interface abstract|0 try catch protected explicit property",illegal:"(^using\\s+[A-Za-z0-9_\\.]+;$|\\bfunctions*[^\\(])",contains:[{className:"string",begin:"'",end:"'",illegal:"\\n",contains:[e.BACKSLASH_ESCAPE],relevance:0},{className:"string",begin:'"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE],relevance:0},{className:"string",begin:'"""',end:'"""'},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{beginKeywords:"interface namespace",end:"{",illegal:"[;.\\-]",contains:[{className:"symbol",begin:"[a-zA-Z0-9_]+"}]},{beginKeywords:"class",end:"{",illegal:"[;.\\-]",contains:[{className:"symbol",begin:"[a-zA-Z0-9_]+",contains:[{begin:"[:,]\\s*",contains:[{className:"symbol",begin:"[a-zA-Z0-9_]+"}]}]}]},n,a,{className:"literal",begin:"\\b(null|true|false)"},{className:"number",begin:"(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?f?|\\.\\d+f?)([eE][-+]?\\d+f?)?)"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("angelscript",function(e){var i={cN:"built_in",b:"\\b(void|bool|int|int8|int16|int32|int64|uint|uint8|uint16|uint32|uint64|string|ref|array|double|float|auto|dictionary)"},t={cN:"symbol",b:"[a-zA-Z0-9_]+@"},n={cN:"keyword",b:"<",e:">",c:[i,t]};return i.c=[n],t.c=[n],{aliases:["asc"],k:"for in|0 break continue while do|0 return if else case switch namespace is cast or and xor not get|0 in inout|10 out override set|0 private public const default|0 final shared external mixin|10 enum typedef funcdef this super import from interface abstract|0 try catch protected explicit property",i:"(^using\\s+[A-Za-z0-9_\\.]+;$|\\bfunctions*[^\\(])",c:[{cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE],relevance:0},{cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE],relevance:0},{cN:"string",b:'"""',e:'"""'},e.CLCM,e.CBCM,{bK:"interface namespace",e:"{",i:"[;.\\-]",c:[{cN:"symbol",b:"[a-zA-Z0-9_]+"}]},{bK:"class",e:"{",i:"[;.\\-]",c:[{cN:"symbol",b:"[a-zA-Z0-9_]+",c:[{b:"[:,]\\s*",c:[{cN:"symbol",b:"[a-zA-Z0-9_]+"}]}]}]},i,t,{cN:"literal",b:"\\b(null|true|false)"},{cN:"number",b:"(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?f?|\\.\\d+f?)([eE][-+]?\\d+f?)?)"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/apache.min.js b/vendor/assets/javascripts/highlightjs/languages/apache.min.js
index e1db119832..250aaafff5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/apache.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/apache.min.js
@@ -1 +1 @@
-hljs.registerLanguage("apache",function(){"use strict";return function(e){var n={className:"number",begin:"\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?"};return{name:"Apache config",aliases:["apacheconf"],case_insensitive:!0,contains:[e.HASH_COMMENT_MODE,{className:"section",begin:"</?",end:">",contains:[n,{className:"number",begin:":\\d{1,5}"},e.inherit(e.QUOTE_STRING_MODE,{relevance:0})]},{className:"attribute",begin:/\w+/,relevance:0,keywords:{nomarkup:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{end:/$/,relevance:0,keywords:{literal:"on off all deny allow"},contains:[{className:"meta",begin:"\\s\\[",end:"\\]$"},{className:"variable",begin:"[\\$%]\\{",end:"\\}",contains:["self",{className:"number",begin:"[\\$%]\\d+"}]},n,{className:"number",begin:"\\d+"},e.QUOTE_STRING_MODE]}}],illegal:/\S/}}}());
\ No newline at end of file
+hljs.registerLanguage("apache",function(e){var r={cN:"number",b:"[\\$%]\\d+"};return{aliases:["apacheconf"],cI:!0,c:[e.HCM,{cN:"section",b:"</?",e:">"},{cN:"attribute",b:/\w+/,relevance:0,k:{nomarkup:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{e:/$/,relevance:0,k:{literal:"on off all"},c:[{cN:"meta",b:"\\s\\[",e:"\\]$"},{cN:"variable",b:"[\\$%]\\{",e:"\\}",c:["self",r]},r,e.QSM]}}],i:/\S/}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/applescript.min.js b/vendor/assets/javascripts/highlightjs/languages/applescript.min.js
index c3954e7148..dd20048ff6 100644
--- a/vendor/assets/javascripts/highlightjs/languages/applescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/applescript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("applescript",function(){"use strict";return function(e){var t=e.inherit(e.QUOTE_STRING_MODE,{illegal:""}),r={className:"params",begin:"\\(",end:"\\)",contains:["self",e.C_NUMBER_MODE,t]},n=e.COMMENT("--","$"),i=[n,e.COMMENT("\\(\\*","\\*\\)",{contains:["self",n]}),e.HASH_COMMENT_MODE];return{name:"AppleScript",aliases:["osascript"],keywords:{keyword:"about above after against and around as at back before beginning behind below beneath beside between but by considering contain contains continue copy div does eighth else end equal equals error every exit fifth first for fourth from front get given global if ignoring in into is it its last local me middle mod my ninth not of on onto or over prop property put ref reference repeat returning script second set seventh since sixth some tell tenth that the|0 then third through thru timeout times to transaction try until where while whose with without",literal:"AppleScript false linefeed return pi quote result space tab true",built_in:"alias application boolean class constant date file integer list number real record string text activate beep count delay launch log offset read round run say summarize write character characters contents day frontmost id item length month name paragraph paragraphs rest reverse running time version weekday word words year"},contains:[t,e.C_NUMBER_MODE,{className:"built_in",begin:"\\b(clipboard info|the clipboard|info for|list (disks|folder)|mount volume|path to|(close|open for) access|(get|set) eof|current date|do shell script|get volume settings|random number|set volume|system attribute|system info|time to GMT|(load|run|store) script|scripting components|ASCII (character|number)|localized string|choose (application|color|file|file name|folder|from list|remote application|URL)|display (alert|dialog))\\b|^\\s*return\\b"},{className:"literal",begin:"\\b(text item delimiters|current application|missing value)\\b"},{className:"keyword",begin:"\\b(apart from|aside from|instead of|out of|greater than|isn't|(doesn't|does not) (equal|come before|come after|contain)|(greater|less) than( or equal)?|(starts?|ends|begins?) with|contained by|comes (before|after)|a (ref|reference)|POSIX file|POSIX path|(date|time) string|quoted form)\\b"},{beginKeywords:"on",illegal:"[${=;\\n]",contains:[e.UNDERSCORE_TITLE_MODE,r]}].concat(i),illegal:"//|->|=>|\\[\\["}}}());
\ No newline at end of file
+hljs.registerLanguage("applescript",function(e){var t=e.inherit(e.QSM,{i:""}),r={cN:"params",b:"\\(",e:"\\)",c:["self",e.CNM,t]},i=e.C("--","$"),o=[i,e.C("\\(\\*","\\*\\)",{c:["self",i]}),e.HCM];return{aliases:["osascript"],k:{keyword:"about above after against and around as at back before beginning behind below beneath beside between but by considering contain contains continue copy div does eighth else end equal equals error every exit fifth first for fourth from front get given global if ignoring in into is it its last local me middle mod my ninth not of on onto or over prop property put ref reference repeat returning script second set seventh since sixth some tell tenth that the|0 then third through thru timeout times to transaction try until where while whose with without",literal:"AppleScript false linefeed return pi quote result space tab true",built_in:"alias application boolean class constant date file integer list number real record string text activate beep count delay launch log offset read round run say summarize write character characters contents day frontmost id item length month name paragraph paragraphs rest reverse running time version weekday word words year"},c:[t,e.CNM,{cN:"built_in",b:"\\b(clipboard info|the clipboard|info for|list (disks|folder)|mount volume|path to|(close|open for) access|(get|set) eof|current date|do shell script|get volume settings|random number|set volume|system attribute|system info|time to GMT|(load|run|store) script|scripting components|ASCII (character|number)|localized string|choose (application|color|file|file name|folder|from list|remote application|URL)|display (alert|dialog))\\b|^\\s*return\\b"},{cN:"literal",b:"\\b(text item delimiters|current application|missing value)\\b"},{cN:"keyword",b:"\\b(apart from|aside from|instead of|out of|greater than|isn't|(doesn't|does not) (equal|come before|come after|contain)|(greater|less) than( or equal)?|(starts?|ends|begins?) with|contained by|comes (before|after)|a (ref|reference)|POSIX file|POSIX path|(date|time) string|quoted form)\\b"},{bK:"on",i:"[${=;\\n]",c:[e.UTM,r]}].concat(o),i:"//|->|=>|\\[\\["}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/arcade.min.js b/vendor/assets/javascripts/highlightjs/languages/arcade.min.js
index f53c988840..5a3e17545b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/arcade.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/arcade.min.js
@@ -1 +1 @@
-hljs.registerLanguage("arcade",function(){"use strict";return function(e){var n="[A-Za-z_][0-9A-Za-z_]*",a={keyword:"if for while var new function do return void else break",literal:"BackSlash DoubleQuote false ForwardSlash Infinity NaN NewLine null PI SingleQuote Tab TextFormatting true undefined",built_in:"Abs Acos Angle Attachments Area AreaGeodetic Asin Atan Atan2 Average Bearing Boolean Buffer BufferGeodetic Ceil Centroid Clip Console Constrain Contains Cos Count Crosses Cut Date DateAdd DateDiff Day Decode DefaultValue Dictionary Difference Disjoint Distance DistanceGeodetic Distinct DomainCode DomainName Equals Exp Extent Feature FeatureSet FeatureSetByAssociation FeatureSetById FeatureSetByPortalItem FeatureSetByRelationshipName FeatureSetByTitle FeatureSetByUrl Filter First Floor Geometry GroupBy Guid HasKey Hour IIf IndexOf Intersection Intersects IsEmpty IsNan IsSelfIntersecting Length LengthGeodetic Log Max Mean Millisecond Min Minute Month MultiPartToSinglePart Multipoint NextSequenceValue Now Number OrderBy Overlaps Point Polygon Polyline Portal Pow Random Relate Reverse RingIsClockWise Round Second SetGeometry Sin Sort Sqrt Stdev Sum SymmetricDifference Tan Text Timestamp Today ToLocal Top Touches ToUTC TrackCurrentTime TrackGeometryWindow TrackIndex TrackStartTime TrackWindow TypeOf Union UrlEncode Variance Weekday When Within Year "},t={className:"number",variants:[{begin:"\\b(0[bB][01]+)"},{begin:"\\b(0[oO][0-7]+)"},{begin:e.C_NUMBER_RE}],relevance:0},i={className:"subst",begin:"\\$\\{",end:"\\}",keywords:a,contains:[]},r={className:"string",begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE,i]};i.contains=[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,r,t,e.REGEXP_MODE];var o=i.contains.concat([e.C_BLOCK_COMMENT_MODE,e.C_LINE_COMMENT_MODE]);return{name:"ArcGIS Arcade",aliases:["arcade"],keywords:a,contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"symbol",begin:"\\$[datastore|feature|layer|map|measure|sourcefeature|sourcelayer|targetfeature|targetlayer|value|view]+"},t,{begin:/[{,]\s*/,relevance:0,contains:[{begin:n+"\\s*:",returnBegin:!0,relevance:0,contains:[{className:"attr",begin:n,relevance:0}]}]},{begin:"("+e.RE_STARTERS_RE+"|\\b(return)\\b)\\s*",keywords:"return",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.REGEXP_MODE,{className:"function",begin:"(\\(.*?\\)|"+n+")\\s*=>",returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{begin:n},{begin:/\(\s*\)/},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:a,contains:o}]}]}],relevance:0},{className:"function",beginKeywords:"function",end:/\{/,excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:n}),{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:o}],illegal:/\[|%/},{begin:/\$[(.]/}],illegal:/#(?!!)/}}}());
\ No newline at end of file
+hljs.registerLanguage("arcade",function(e){var t="[A-Za-z_][0-9A-Za-z_]*",a={keyword:"if for while var new function do return void else break",literal:"BackSlash DoubleQuote false ForwardSlash Infinity NaN NewLine null PI SingleQuote Tab TextFormatting true undefined",built_in:"Abs Acos Angle Attachments Area AreaGeodetic Asin Atan Atan2 Average Bearing Boolean Buffer BufferGeodetic Ceil Centroid Clip Console Constrain Contains Cos Count Crosses Cut Date DateAdd DateDiff Day Decode DefaultValue Dictionary Difference Disjoint Distance DistanceGeodetic Distinct DomainCode DomainName Equals Exp Extent Feature FeatureSet FeatureSetByAssociation FeatureSetById FeatureSetByPortalItem FeatureSetByRelationshipName FeatureSetByTitle FeatureSetByUrl Filter First Floor Geometry GroupBy Guid HasKey Hour IIf IndexOf Intersection Intersects IsEmpty IsNan IsSelfIntersecting Length LengthGeodetic Log Max Mean Millisecond Min Minute Month MultiPartToSinglePart Multipoint NextSequenceValue Now Number OrderBy Overlaps Point Polygon Polyline Portal Pow Random Relate Reverse RingIsClockWise Round Second SetGeometry Sin Sort Sqrt Stdev Sum SymmetricDifference Tan Text Timestamp Today ToLocal Top Touches ToUTC TrackCurrentTime TrackGeometryWindow TrackIndex TrackStartTime TrackWindow TypeOf Union UrlEncode Variance Weekday When Within Year "},r={cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],relevance:0},n={cN:"subst",b:"\\$\\{",e:"\\}",k:a,c:[]},i={cN:"string",b:"`",e:"`",c:[e.BE,n]};n.c=[e.ASM,e.QSM,i,r,e.RM];var o=n.c.concat([e.CBCM,e.CLCM]);return{aliases:["arcade"],k:a,c:[e.ASM,e.QSM,i,e.CLCM,e.CBCM,{cN:"symbol",b:"\\$[datastore|feature|layer|map|measure|sourcefeature|sourcelayer|targetfeature|targetlayer|value|view]+"},r,{b:/[{,]\s*/,relevance:0,c:[{b:t+"\\s*:",rB:!0,relevance:0,c:[{cN:"attr",b:t,relevance:0}]}]},{b:"("+e.RSR+"|\\b(return)\\b)\\s*",k:"return",c:[e.CLCM,e.CBCM,e.RM,{cN:"function",b:"(\\(.*?\\)|"+t+")\\s*=>",rB:!0,e:"\\s*=>",c:[{cN:"params",v:[{b:t},{b:/\(\s*\)/},{b:/\(/,e:/\)/,eB:!0,eE:!0,k:a,c:o}]}]}],relevance:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:t}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:o}],i:/\[|%/},{b:/\$[(.]/}],i:/#(?!!)/}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/arduino.min.js b/vendor/assets/javascripts/highlightjs/languages/arduino.min.js
index cfc1fe5ada..1a60627f41 100644
--- a/vendor/assets/javascripts/highlightjs/languages/arduino.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/arduino.min.js
@@ -1 +1 @@
-hljs.registerLanguage("arduino",function(){"use strict";return function(e){var t=e.requireLanguage("cpp").rawDefinition(),r=t.keywords;return r.keyword+=" boolean byte word String",r.literal+=" DIGITAL_MESSAGE FIRMATA_STRING ANALOG_MESSAGE REPORT_DIGITAL REPORT_ANALOG INPUT_PULLUP SET_PIN_MODE INTERNAL2V56 SYSTEM_RESET LED_BUILTIN INTERNAL1V1 SYSEX_START INTERNAL EXTERNAL DEFAULT OUTPUT INPUT HIGH LOW",r.built_in+=" setup loop KeyboardController MouseController SoftwareSerial EthernetServer EthernetClient LiquidCrystal RobotControl GSMVoiceCall EthernetUDP EsploraTFT HttpClient RobotMotor WiFiClient GSMScanner FileSystem Scheduler GSMServer YunClient YunServer IPAddress GSMClient GSMModem Keyboard Ethernet Console GSMBand Esplora Stepper Process WiFiUDP GSM_SMS Mailbox USBHost Firmata PImage Client Server GSMPIN FileIO Bridge Serial EEPROM Stream Mouse Audio Servo File Task GPRS WiFi Wire TFT GSM SPI SD runShellCommandAsynchronously analogWriteResolution retrieveCallingNumber printFirmwareVersion analogReadResolution sendDigitalPortPair noListenOnLocalhost readJoystickButton setFirmwareVersion readJoystickSwitch scrollDisplayRight getVoiceCallStatus scrollDisplayLeft writeMicroseconds delayMicroseconds beginTransmission getSignalStrength runAsynchronously getAsynchronously listenOnLocalhost getCurrentCarrier readAccelerometer messageAvailable sendDigitalPorts lineFollowConfig countryNameWrite runShellCommand readStringUntil rewindDirectory readTemperature setClockDivider readLightSensor endTransmission analogReference detachInterrupt countryNameRead attachInterrupt encryptionType readBytesUntil robotNameWrite readMicrophone robotNameRead cityNameWrite userNameWrite readJoystickY readJoystickX mouseReleased openNextFile scanNetworks noInterrupts digitalWrite beginSpeaker mousePressed isActionDone mouseDragged displayLogos noAutoscroll addParameter remoteNumber getModifiers keyboardRead userNameRead waitContinue processInput parseCommand printVersion readNetworks writeMessage blinkVersion cityNameRead readMessage setDataMode parsePacket isListening setBitOrder beginPacket isDirectory motorsWrite drawCompass digitalRead clearScreen serialEvent rightToLeft setTextSize leftToRight requestFrom keyReleased compassRead analogWrite interrupts WiFiServer disconnect playMelody parseFloat autoscroll getPINUsed setPINUsed setTimeout sendAnalog readSlider analogRead beginWrite createChar motorsStop keyPressed tempoWrite readButton subnetMask debugPrint macAddress writeGreen randomSeed attachGPRS readString sendString remotePort releaseAll mouseMoved background getXChange getYChange answerCall getResult voiceCall endPacket constrain getSocket writeJSON getButton available connected findUntil readBytes exitValue readGreen writeBlue startLoop IPAddress isPressed sendSysex pauseMode gatewayIP setCursor getOemKey tuneWrite noDisplay loadImage switchPIN onRequest onReceive changePIN playFile noBuffer parseInt overflow checkPIN knobRead beginTFT bitClear updateIR bitWrite position writeRGB highByte writeRed setSpeed readBlue noStroke remoteIP transfer shutdown hangCall beginSMS endWrite attached maintain noCursor checkReg checkPUK shiftOut isValid shiftIn pulseIn connect println localIP pinMode getIMEI display noBlink process getBand running beginSD drawBMP lowByte setBand release bitRead prepare pointTo readRed setMode noFill remove listen stroke detach attach noTone exists buffer height bitSet circle config cursor random IRread setDNS endSMS getKey micros millis begin print write ready flush width isPIN blink clear press mkdir rmdir close point yield image BSSID click delay read text move peek beep rect line open seek fill size turn stop home find step tone sqrt RSSI SSID end bit tan cos sin pow map abs max min get run put",t.name="Arduino",t}}());
\ No newline at end of file
+hljs.registerLanguage("arduino",function(e){var t="boolean byte word String",r="setup loopKeyboardController MouseController SoftwareSerial EthernetServer EthernetClient LiquidCrystal RobotControl GSMVoiceCall EthernetUDP EsploraTFT HttpClient RobotMotor WiFiClient GSMScanner FileSystem Scheduler GSMServer YunClient YunServer IPAddress GSMClient GSMModem Keyboard Ethernet Console GSMBand Esplora Stepper Process WiFiUDP GSM_SMS Mailbox USBHost Firmata PImage Client Server GSMPIN FileIO Bridge Serial EEPROM Stream Mouse Audio Servo File Task GPRS WiFi Wire TFT GSM SPI SD runShellCommandAsynchronously analogWriteResolution retrieveCallingNumber printFirmwareVersion analogReadResolution sendDigitalPortPair noListenOnLocalhost readJoystickButton setFirmwareVersion readJoystickSwitch scrollDisplayRight getVoiceCallStatus scrollDisplayLeft writeMicroseconds delayMicroseconds beginTransmission getSignalStrength runAsynchronously getAsynchronously listenOnLocalhost getCurrentCarrier readAccelerometer messageAvailable sendDigitalPorts lineFollowConfig countryNameWrite runShellCommand readStringUntil rewindDirectory readTemperature setClockDivider readLightSensor endTransmission analogReference detachInterrupt countryNameRead attachInterrupt encryptionType readBytesUntil robotNameWrite readMicrophone robotNameRead cityNameWrite userNameWrite readJoystickY readJoystickX mouseReleased openNextFile scanNetworks noInterrupts digitalWrite beginSpeaker mousePressed isActionDone mouseDragged displayLogos noAutoscroll addParameter remoteNumber getModifiers keyboardRead userNameRead waitContinue processInput parseCommand printVersion readNetworks writeMessage blinkVersion cityNameRead readMessage setDataMode parsePacket isListening setBitOrder beginPacket isDirectory motorsWrite drawCompass digitalRead clearScreen serialEvent rightToLeft setTextSize leftToRight requestFrom keyReleased compassRead analogWrite interrupts WiFiServer disconnect playMelody parseFloat autoscroll getPINUsed setPINUsed setTimeout sendAnalog readSlider analogRead beginWrite createChar motorsStop keyPressed tempoWrite readButton subnetMask debugPrint macAddress writeGreen randomSeed attachGPRS readString sendString remotePort releaseAll mouseMoved background getXChange getYChange answerCall getResult voiceCall endPacket constrain getSocket writeJSON getButton available connected findUntil readBytes exitValue readGreen writeBlue startLoop IPAddress isPressed sendSysex pauseMode gatewayIP setCursor getOemKey tuneWrite noDisplay loadImage switchPIN onRequest onReceive changePIN playFile noBuffer parseInt overflow checkPIN knobRead beginTFT bitClear updateIR bitWrite position writeRGB highByte writeRed setSpeed readBlue noStroke remoteIP transfer shutdown hangCall beginSMS endWrite attached maintain noCursor checkReg checkPUK shiftOut isValid shiftIn pulseIn connect println localIP pinMode getIMEI display noBlink process getBand running beginSD drawBMP lowByte setBand release bitRead prepare pointTo readRed setMode noFill remove listen stroke detach attach noTone exists buffer height bitSet circle config cursor random IRread setDNS endSMS getKey micros millis begin print write ready flush width isPIN blink clear press mkdir rmdir close point yield image BSSID click delay read text move peek beep rect line open seek fill size turn stop home find step tone sqrt RSSI SSID end bit tan cos sin pow map abs max min get run put",i="DIGITAL_MESSAGE FIRMATA_STRING ANALOG_MESSAGE REPORT_DIGITAL REPORT_ANALOG INPUT_PULLUP SET_PIN_MODE INTERNAL2V56 SYSTEM_RESET LED_BUILTIN INTERNAL1V1 SYSEX_START INTERNAL EXTERNAL DEFAULT OUTPUT INPUT HIGH LOW",o=e.requireLanguage("cpp").rawDefinition(),a=o.k;return a.keyword+=" "+t,a.literal+=" "+i,a.built_in+=" "+r,o});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/armasm.min.js b/vendor/assets/javascripts/highlightjs/languages/armasm.min.js
index f4a9c77416..b561129ec8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/armasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/armasm.min.js
@@ -1 +1 @@
-hljs.registerLanguage("armasm",function(){"use strict";return function(s){const e={variants:[s.COMMENT("^[ \\t]*(?=#)","$",{relevance:0,excludeBegin:!0}),s.COMMENT("[;@]","$",{relevance:0}),s.C_LINE_COMMENT_MODE,s.C_BLOCK_COMMENT_MODE]};return{name:"ARM Assembly",case_insensitive:!0,aliases:["arm"],keywords:{$pattern:"\\.?"+s.IDENT_RE,meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .arm .thumb .code16 .code32 .force_thumb .thumb_func .ltorg ALIAS ALIGN ARM AREA ASSERT ATTR CN CODE CODE16 CODE32 COMMON CP DATA DCB DCD DCDU DCDO DCFD DCFDU DCI DCQ DCQU DCW DCWU DN ELIF ELSE END ENDFUNC ENDIF ENDP ENTRY EQU EXPORT EXPORTAS EXTERN FIELD FILL FUNCTION GBLA GBLL GBLS GET GLOBAL IF IMPORT INCBIN INCLUDE INFO KEEP LCLA LCLL LCLS LTORG MACRO MAP MEND MEXIT NOFP OPT PRESERVE8 PROC QN READONLY RELOC REQUIRE REQUIRE8 RLIST FN ROUT SETA SETL SETS SN SPACE SUBT THUMB THUMBX TTL WHILE WEND ",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 pc lr sp ip sl sb fp a1 a2 a3 a4 v1 v2 v3 v4 v5 v6 v7 v8 f0 f1 f2 f3 f4 f5 f6 f7 p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 q0 q1 q2 q3 q4 q5 q6 q7 q8 q9 q10 q11 q12 q13 q14 q15 cpsr_c cpsr_x cpsr_s cpsr_f cpsr_cx cpsr_cxs cpsr_xs cpsr_xsf cpsr_sf cpsr_cxsf spsr_c spsr_x spsr_s spsr_f spsr_cx spsr_cxs spsr_xs spsr_xsf spsr_sf spsr_cxsf s0 s1 s2 s3 s4 s5 s6 s7 s8 s9 s10 s11 s12 s13 s14 s15 s16 s17 s18 s19 s20 s21 s22 s23 s24 s25 s26 s27 s28 s29 s30 s31 d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 d10 d11 d12 d13 d14 d15 d16 d17 d18 d19 d20 d21 d22 d23 d24 d25 d26 d27 d28 d29 d30 d31 {PC} {VAR} {TRUE} {FALSE} {OPT} {CONFIG} {ENDIAN} {CODESIZE} {CPU} {FPU} {ARCHITECTURE} {PCSTOREOFFSET} {ARMASM_VERSION} {INTER} {ROPI} {RWPI} {SWST} {NOSWST} . @"},contains:[{className:"keyword",begin:"\\b(adc|(qd?|sh?|u[qh]?)?add(8|16)?|usada?8|(q|sh?|u[qh]?)?(as|sa)x|and|adrl?|sbc|rs[bc]|asr|b[lx]?|blx|bxj|cbn?z|tb[bh]|bic|bfc|bfi|[su]bfx|bkpt|cdp2?|clz|clrex|cmp|cmn|cpsi[ed]|cps|setend|dbg|dmb|dsb|eor|isb|it[te]{0,3}|lsl|lsr|ror|rrx|ldm(([id][ab])|f[ds])?|ldr((s|ex)?[bhd])?|movt?|mvn|mra|mar|mul|[us]mull|smul[bwt][bt]|smu[as]d|smmul|smmla|mla|umlaal|smlal?([wbt][bt]|d)|mls|smlsl?[ds]|smc|svc|sev|mia([bt]{2}|ph)?|mrr?c2?|mcrr2?|mrs|msr|orr|orn|pkh(tb|bt)|rbit|rev(16|sh)?|sel|[su]sat(16)?|nop|pop|push|rfe([id][ab])?|stm([id][ab])?|str(ex)?[bhd]?|(qd?)?sub|(sh?|q|u[qh]?)?sub(8|16)|[su]xt(a?h|a?b(16)?)|srs([id][ab])?|swpb?|swi|smi|tst|teq|wfe|wfi|yield)(eq|ne|cs|cc|mi|pl|vs|vc|hi|ls|ge|lt|gt|le|al|hs|lo)?[sptrx]?(?=\\s)"},e,s.QUOTE_STRING_MODE,{className:"string",begin:"'",end:"[^\\\\]'",relevance:0},{className:"title",begin:"\\|",end:"\\|",illegal:"\\n",relevance:0},{className:"number",variants:[{begin:"[#$=]?0x[0-9a-f]+"},{begin:"[#$=]?0b[01]+"},{begin:"[#$=]\\d+"},{begin:"\\b\\d+"}],relevance:0},{className:"symbol",variants:[{begin:"^[ \\t]*[a-z_\\.\\$][a-z0-9_\\.\\$]+:"},{begin:"^[a-z_\\.\\$][a-z0-9_\\.\\$]+"},{begin:"[=#]\\w+"}],relevance:0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("armasm",function(s){return{cI:!0,aliases:["arm"],l:"\\.?"+s.IR,k:{meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .arm .thumb .code16 .code32 .force_thumb .thumb_func .ltorg ALIAS ALIGN ARM AREA ASSERT ATTR CN CODE CODE16 CODE32 COMMON CP DATA DCB DCD DCDU DCDO DCFD DCFDU DCI DCQ DCQU DCW DCWU DN ELIF ELSE END ENDFUNC ENDIF ENDP ENTRY EQU EXPORT EXPORTAS EXTERN FIELD FILL FUNCTION GBLA GBLL GBLS GET GLOBAL IF IMPORT INCBIN INCLUDE INFO KEEP LCLA LCLL LCLS LTORG MACRO MAP MEND MEXIT NOFP OPT PRESERVE8 PROC QN READONLY RELOC REQUIRE REQUIRE8 RLIST FN ROUT SETA SETL SETS SN SPACE SUBT THUMB THUMBX TTL WHILE WEND ",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 pc lr sp ip sl sb fp a1 a2 a3 a4 v1 v2 v3 v4 v5 v6 v7 v8 f0 f1 f2 f3 f4 f5 f6 f7 p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 q0 q1 q2 q3 q4 q5 q6 q7 q8 q9 q10 q11 q12 q13 q14 q15 cpsr_c cpsr_x cpsr_s cpsr_f cpsr_cx cpsr_cxs cpsr_xs cpsr_xsf cpsr_sf cpsr_cxsf spsr_c spsr_x spsr_s spsr_f spsr_cx spsr_cxs spsr_xs spsr_xsf spsr_sf spsr_cxsf s0 s1 s2 s3 s4 s5 s6 s7 s8 s9 s10 s11 s12 s13 s14 s15 s16 s17 s18 s19 s20 s21 s22 s23 s24 s25 s26 s27 s28 s29 s30 s31 d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 d10 d11 d12 d13 d14 d15 d16 d17 d18 d19 d20 d21 d22 d23 d24 d25 d26 d27 d28 d29 d30 d31 {PC} {VAR} {TRUE} {FALSE} {OPT} {CONFIG} {ENDIAN} {CODESIZE} {CPU} {FPU} {ARCHITECTURE} {PCSTOREOFFSET} {ARMASM_VERSION} {INTER} {ROPI} {RWPI} {SWST} {NOSWST} . @"},c:[{cN:"keyword",b:"\\b(adc|(qd?|sh?|u[qh]?)?add(8|16)?|usada?8|(q|sh?|u[qh]?)?(as|sa)x|and|adrl?|sbc|rs[bc]|asr|b[lx]?|blx|bxj|cbn?z|tb[bh]|bic|bfc|bfi|[su]bfx|bkpt|cdp2?|clz|clrex|cmp|cmn|cpsi[ed]|cps|setend|dbg|dmb|dsb|eor|isb|it[te]{0,3}|lsl|lsr|ror|rrx|ldm(([id][ab])|f[ds])?|ldr((s|ex)?[bhd])?|movt?|mvn|mra|mar|mul|[us]mull|smul[bwt][bt]|smu[as]d|smmul|smmla|mla|umlaal|smlal?([wbt][bt]|d)|mls|smlsl?[ds]|smc|svc|sev|mia([bt]{2}|ph)?|mrr?c2?|mcrr2?|mrs|msr|orr|orn|pkh(tb|bt)|rbit|rev(16|sh)?|sel|[su]sat(16)?|nop|pop|push|rfe([id][ab])?|stm([id][ab])?|str(ex)?[bhd]?|(qd?)?sub|(sh?|q|u[qh]?)?sub(8|16)|[su]xt(a?h|a?b(16)?)|srs([id][ab])?|swpb?|swi|smi|tst|teq|wfe|wfi|yield)(eq|ne|cs|cc|mi|pl|vs|vc|hi|ls|ge|lt|gt|le|al|hs|lo)?[sptrx]?",e:"\\s"},s.C("[;@]","$",{relevance:0}),s.CBCM,s.QSM,{cN:"string",b:"'",e:"[^\\\\]'",relevance:0},{cN:"title",b:"\\|",e:"\\|",i:"\\n",relevance:0},{cN:"number",v:[{b:"[#$=]?0x[0-9a-f]+"},{b:"[#$=]?0b[01]+"},{b:"[#$=]\\d+"},{b:"\\b\\d+"}],relevance:0},{cN:"symbol",v:[{b:"^[a-z_\\.\\$][a-z0-9_\\.\\$]+"},{b:"^\\s*[a-z_\\.\\$][a-z0-9_\\.\\$]+:"},{b:"[=#]\\w+"}],relevance:0}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/asciidoc.min.js b/vendor/assets/javascripts/highlightjs/languages/asciidoc.min.js
index 8f409e3aba..5fce265278 100644
--- a/vendor/assets/javascripts/highlightjs/languages/asciidoc.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/asciidoc.min.js
@@ -1 +1 @@
-hljs.registerLanguage("asciidoc",function(){"use strict";return function(e){return{name:"AsciiDoc",aliases:["adoc"],contains:[e.COMMENT("^/{4,}\\n","\\n/{4,}$",{relevance:10}),e.COMMENT("^//","$",{relevance:0}),{className:"title",begin:"^\\.\\w.*$"},{begin:"^[=\\*]{4,}\\n",end:"\\n^[=\\*]{4,}$",relevance:10},{className:"section",relevance:10,variants:[{begin:"^(={1,5}) .+?( \\1)?$"},{begin:"^[^\\[\\]\\n]+?\\n[=\\-~\\^\\+]{2,}$"}]},{className:"meta",begin:"^:.+?:",end:"\\s",excludeEnd:!0,relevance:10},{className:"meta",begin:"^\\[.+?\\]$",relevance:0},{className:"quote",begin:"^_{4,}\\n",end:"\\n_{4,}$",relevance:10},{className:"code",begin:"^[\\-\\.]{4,}\\n",end:"\\n[\\-\\.]{4,}$",relevance:10},{begin:"^\\+{4,}\\n",end:"\\n\\+{4,}$",contains:[{begin:"<",end:">",subLanguage:"xml",relevance:0}],relevance:10},{className:"bullet",begin:"^(\\*+|\\-+|\\.+|[^\\n]+?::)\\s+"},{className:"symbol",begin:"^(NOTE|TIP|IMPORTANT|WARNING|CAUTION):\\s+",relevance:10},{className:"strong",begin:"\\B\\*(?![\\*\\s])",end:"(\\n{2}|\\*)",contains:[{begin:"\\\\*\\w",relevance:0}]},{className:"emphasis",begin:"\\B'(?!['\\s])",end:"(\\n{2}|')",contains:[{begin:"\\\\'\\w",relevance:0}],relevance:0},{className:"emphasis",begin:"_(?![_\\s])",end:"(\\n{2}|_)",relevance:0},{className:"string",variants:[{begin:"``.+?''"},{begin:"`.+?'"}]},{className:"code",begin:"(`.+?`|\\+.+?\\+)",relevance:0},{className:"code",begin:"^[ \\t]",end:"$",relevance:0},{begin:"^'{3,}[ \\t]*$",relevance:10},{begin:"(link:)?(http|https|ftp|file|irc|image:?):\\S+\\[.*?\\]",returnBegin:!0,contains:[{begin:"(link|image:?):",relevance:0},{className:"link",begin:"\\w",end:"[^\\[]+",relevance:0},{className:"string",begin:"\\[",end:"\\]",excludeBegin:!0,excludeEnd:!0,relevance:0}],relevance:10}]}}}());
\ No newline at end of file
+hljs.registerLanguage("asciidoc",function(e){return{aliases:["adoc"],c:[e.C("^/{4,}\\n","\\n/{4,}$",{relevance:10}),e.C("^//","$",{relevance:0}),{cN:"title",b:"^\\.\\w.*$"},{b:"^[=\\*]{4,}\\n",e:"\\n^[=\\*]{4,}$",relevance:10},{cN:"section",relevance:10,v:[{b:"^(={1,5}) .+?( \\1)?$"},{b:"^[^\\[\\]\\n]+?\\n[=\\-~\\^\\+]{2,}$"}]},{cN:"meta",b:"^:.+?:",e:"\\s",eE:!0,relevance:10},{cN:"meta",b:"^\\[.+?\\]$",relevance:0},{cN:"quote",b:"^_{4,}\\n",e:"\\n_{4,}$",relevance:10},{cN:"code",b:"^[\\-\\.]{4,}\\n",e:"\\n[\\-\\.]{4,}$",relevance:10},{b:"^\\+{4,}\\n",e:"\\n\\+{4,}$",c:[{b:"<",e:">",sL:"xml",relevance:0}],relevance:10},{cN:"bullet",b:"^(\\*+|\\-+|\\.+|[^\\n]+?::)\\s+"},{cN:"symbol",b:"^(NOTE|TIP|IMPORTANT|WARNING|CAUTION):\\s+",relevance:10},{cN:"strong",b:"\\B\\*(?![\\*\\s])",e:"(\\n{2}|\\*)",c:[{b:"\\\\*\\w",relevance:0}]},{cN:"emphasis",b:"\\B'(?!['\\s])",e:"(\\n{2}|')",c:[{b:"\\\\'\\w",relevance:0}],relevance:0},{cN:"emphasis",b:"_(?![_\\s])",e:"(\\n{2}|_)",relevance:0},{cN:"string",v:[{b:"``.+?''"},{b:"`.+?'"}]},{cN:"code",b:"(`.+?`|\\+.+?\\+)",relevance:0},{cN:"code",b:"^[ \\t]",e:"$",relevance:0},{b:"^'{3,}[ \\t]*$",relevance:10},{b:"(link:)?(http|https|ftp|file|irc|image:?):\\S+\\[.*?\\]",rB:!0,c:[{b:"(link|image:?):",relevance:0},{cN:"link",b:"\\w",e:"[^\\[]+",relevance:0},{cN:"string",b:"\\[",e:"\\]",eB:!0,eE:!0,relevance:0}],relevance:10}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/aspectj.min.js b/vendor/assets/javascripts/highlightjs/languages/aspectj.min.js
index ce0c916346..ea048f617c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/aspectj.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/aspectj.min.js
@@ -1 +1 @@
-hljs.registerLanguage("aspectj",function(){"use strict";return function(e){var n="false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else extends implements break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws privileged aspectOf adviceexecution proceed cflowbelow cflow initialization preinitialization staticinitialization withincode target within execution getWithinTypeName handler thisJoinPoint thisJoinPointStaticPart thisEnclosingJoinPointStaticPart declare parents warning error soft precedence thisAspectInstance";return{name:"AspectJ",keywords:n,illegal:/<\/|#/,contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0},{className:"doctag",begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"class",beginKeywords:"aspect",end:/[{;=]/,excludeEnd:!0,illegal:/[:;"\[\]]/,contains:[{beginKeywords:"extends implements pertypewithin perthis pertarget percflowbelow percflow issingleton"},e.UNDERSCORE_TITLE_MODE,{begin:/\([^\)]*/,end:/[)]+/,keywords:n+" get set args call",excludeEnd:!1}]},{className:"class",beginKeywords:"class interface",end:/[{;=]/,excludeEnd:!0,relevance:0,keywords:"class interface",illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"pointcut after before around throwing returning",end:/[)]/,excludeEnd:!1,illegal:/["\[\]]/,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,contains:[e.UNDERSCORE_TITLE_MODE]}]},{begin:/[:]/,returnBegin:!0,end:/[{;]/,relevance:0,excludeEnd:!1,keywords:n,illegal:/["\[\]]/,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",keywords:n+" get set args call",relevance:0},e.QUOTE_STRING_MODE]},{beginKeywords:"new throw",relevance:0},{className:"function",begin:/\w+ +\w+(\.)?\w+\s*\([^\)]*\)\s*((throws)[\w\s,]+)?[\{;]/,returnBegin:!0,end:/[{;=]/,keywords:n,excludeEnd:!0,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/,relevance:0,keywords:n,contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},e.C_NUMBER_MODE,{className:"meta",begin:"@[A-Za-z]+"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("aspectj",function(e){var t="false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else extends implements break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws privileged aspectOf adviceexecution proceed cflowbelow cflow initialization preinitialization staticinitialization withincode target within execution getWithinTypeName handler thisJoinPoint thisJoinPointStaticPart thisEnclosingJoinPointStaticPart declare parents warning error soft precedence thisAspectInstance",i="get set args call";return{k:t,i:/<\/|#/,c:[e.C("/\\*\\*","\\*/",{relevance:0,c:[{b:/\w+@/,relevance:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,e.ASM,e.QSM,{cN:"class",bK:"aspect",e:/[{;=]/,eE:!0,i:/[:;"\[\]]/,c:[{bK:"extends implements pertypewithin perthis pertarget percflowbelow percflow issingleton"},e.UTM,{b:/\([^\)]*/,e:/[)]+/,k:t+" "+i,eE:!1}]},{cN:"class",bK:"class interface",e:/[{;=]/,eE:!0,relevance:0,k:"class interface",i:/[:"\[\]]/,c:[{bK:"extends implements"},e.UTM]},{bK:"pointcut after before around throwing returning",e:/[)]/,eE:!1,i:/["\[\]]/,c:[{b:e.UIR+"\\s*\\(",rB:!0,c:[e.UTM]}]},{b:/[:]/,rB:!0,e:/[{;]/,relevance:0,eE:!1,k:t,i:/["\[\]]/,c:[{b:e.UIR+"\\s*\\(",k:t+" "+i,relevance:0},e.QSM]},{bK:"new throw",relevance:0},{cN:"function",b:/\w+ +\w+(\.)?\w+\s*\([^\)]*\)\s*((throws)[\w\s,]+)?[\{;]/,rB:!0,e:/[{;=]/,k:t,eE:!0,c:[{b:e.UIR+"\\s*\\(",rB:!0,relevance:0,c:[e.UTM]},{cN:"params",b:/\(/,e:/\)/,relevance:0,k:t,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]},e.CNM,{cN:"meta",b:"@[A-Za-z]+"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/autohotkey.min.js b/vendor/assets/javascripts/highlightjs/languages/autohotkey.min.js
index 57309ec504..3ed4eb0bc5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/autohotkey.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/autohotkey.min.js
@@ -1 +1 @@
-hljs.registerLanguage("autohotkey",function(){"use strict";return function(e){var a={begin:"`[\\s\\S]"};return{name:"AutoHotkey",case_insensitive:!0,aliases:["ahk"],keywords:{keyword:"Break Continue Critical Exit ExitApp Gosub Goto New OnExit Pause return SetBatchLines SetTimer Suspend Thread Throw Until ahk_id ahk_class ahk_pid ahk_exe ahk_group",literal:"true false NOT AND OR",built_in:"ComSpec Clipboard ClipboardAll ErrorLevel"},contains:[a,e.inherit(e.QUOTE_STRING_MODE,{contains:[a]}),e.COMMENT(";","$",{relevance:0}),e.C_BLOCK_COMMENT_MODE,{className:"number",begin:e.NUMBER_RE,relevance:0},{className:"variable",begin:"%[a-zA-Z0-9#_$@]+%"},{className:"built_in",begin:"^\\s*\\w+\\s*(,|%)"},{className:"title",variants:[{begin:'^[^\\n";]+::(?!=)'},{begin:'^[^\\n";]+:(?!=)',relevance:0}]},{className:"meta",begin:"^\\s*#\\w+",end:"$",relevance:0},{className:"built_in",begin:"A_[a-zA-Z0-9]+"},{begin:",\\s*,"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("autohotkey",function(e){var a={b:"`[\\s\\S]"};return{cI:!0,aliases:["ahk"],k:{keyword:"Break Continue Critical Exit ExitApp Gosub Goto New OnExit Pause return SetBatchLines SetTimer Suspend Thread Throw Until ahk_id ahk_class ahk_pid ahk_exe ahk_group",literal:"true false NOT AND OR",built_in:"ComSpec Clipboard ClipboardAll ErrorLevel"},c:[a,e.inherit(e.QSM,{c:[a]}),e.C(";","$",{relevance:0}),e.CBCM,{cN:"number",b:e.NR,relevance:0},{cN:"variable",b:"%[a-zA-Z0-9#_$@]+%"},{cN:"built_in",b:"^\\s*\\w+\\s*(,|%)"},{cN:"title",v:[{b:'^[^\\n";]+::(?!=)'},{b:'^[^\\n";]+:(?!=)',relevance:0}]},{cN:"meta",b:"^\\s*#\\w+",e:"$",relevance:0},{cN:"built_in",b:"A_[a-zA-Z0-9]+"},{b:",\\s*,"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/autoit.min.js b/vendor/assets/javascripts/highlightjs/languages/autoit.min.js
index 0a764db5d3..c18b9d4a3f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/autoit.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/autoit.min.js
@@ -1 +1 @@
-hljs.registerLanguage("autoit",function(){"use strict";return function(e){var t={variants:[e.COMMENT(";","$",{relevance:0}),e.COMMENT("#cs","#ce"),e.COMMENT("#comments-start","#comments-end")]},r={begin:"\\$[A-z0-9_]+"},i={className:"string",variants:[{begin:/"/,end:/"/,contains:[{begin:/""/,relevance:0}]},{begin:/'/,end:/'/,contains:[{begin:/''/,relevance:0}]}]},n={variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]};return{name:"AutoIt",case_insensitive:!0,illegal:/\/\*/,keywords:{keyword:"ByRef Case Const ContinueCase ContinueLoop Default Dim Do Else ElseIf EndFunc EndIf EndSelect EndSwitch EndWith Enum Exit ExitLoop For Func Global If In Local Next ReDim Return Select Static Step Switch Then To Until Volatile WEnd While With",built_in:"Abs ACos AdlibRegister AdlibUnRegister Asc AscW ASin Assign ATan AutoItSetOption AutoItWinGetTitle AutoItWinSetTitle Beep Binary BinaryLen BinaryMid BinaryToString BitAND BitNOT BitOR BitRotate BitShift BitXOR BlockInput Break Call CDTray Ceiling Chr ChrW ClipGet ClipPut ConsoleRead ConsoleWrite ConsoleWriteError ControlClick ControlCommand ControlDisable ControlEnable ControlFocus ControlGetFocus ControlGetHandle ControlGetPos ControlGetText ControlHide ControlListView ControlMove ControlSend ControlSetText ControlShow ControlTreeView Cos Dec DirCopy DirCreate DirGetSize DirMove DirRemove DllCall DllCallAddress DllCallbackFree DllCallbackGetPtr DllCallbackRegister DllClose DllOpen DllStructCreate DllStructGetData DllStructGetPtr DllStructGetSize DllStructSetData DriveGetDrive DriveGetFileSystem DriveGetLabel DriveGetSerial DriveGetType DriveMapAdd DriveMapDel DriveMapGet DriveSetLabel DriveSpaceFree DriveSpaceTotal DriveStatus EnvGet EnvSet EnvUpdate Eval Execute Exp FileChangeDir FileClose FileCopy FileCreateNTFSLink FileCreateShortcut FileDelete FileExists FileFindFirstFile FileFindNextFile FileFlush FileGetAttrib FileGetEncoding FileGetLongName FileGetPos FileGetShortcut FileGetShortName FileGetSize FileGetTime FileGetVersion FileInstall FileMove FileOpen FileOpenDialog FileRead FileReadLine FileReadToArray FileRecycle FileRecycleEmpty FileSaveDialog FileSelectFolder FileSetAttrib FileSetEnd FileSetPos FileSetTime FileWrite FileWriteLine Floor FtpSetProxy FuncName GUICreate GUICtrlCreateAvi GUICtrlCreateButton GUICtrlCreateCheckbox GUICtrlCreateCombo GUICtrlCreateContextMenu GUICtrlCreateDate GUICtrlCreateDummy GUICtrlCreateEdit GUICtrlCreateGraphic GUICtrlCreateGroup GUICtrlCreateIcon GUICtrlCreateInput GUICtrlCreateLabel GUICtrlCreateList GUICtrlCreateListView GUICtrlCreateListViewItem GUICtrlCreateMenu GUICtrlCreateMenuItem GUICtrlCreateMonthCal GUICtrlCreateObj GUICtrlCreatePic GUICtrlCreateProgress GUICtrlCreateRadio GUICtrlCreateSlider GUICtrlCreateTab GUICtrlCreateTabItem GUICtrlCreateTreeView GUICtrlCreateTreeViewItem GUICtrlCreateUpdown GUICtrlDelete GUICtrlGetHandle GUICtrlGetState GUICtrlRead GUICtrlRecvMsg GUICtrlRegisterListViewSort GUICtrlSendMsg GUICtrlSendToDummy GUICtrlSetBkColor GUICtrlSetColor GUICtrlSetCursor GUICtrlSetData GUICtrlSetDefBkColor GUICtrlSetDefColor GUICtrlSetFont GUICtrlSetGraphic GUICtrlSetImage GUICtrlSetLimit GUICtrlSetOnEvent GUICtrlSetPos GUICtrlSetResizing GUICtrlSetState GUICtrlSetStyle GUICtrlSetTip GUIDelete GUIGetCursorInfo GUIGetMsg GUIGetStyle GUIRegisterMsg GUISetAccelerators GUISetBkColor GUISetCoord GUISetCursor GUISetFont GUISetHelp GUISetIcon GUISetOnEvent GUISetState GUISetStyle GUIStartGroup GUISwitch Hex HotKeySet HttpSetProxy HttpSetUserAgent HWnd InetClose InetGet InetGetInfo InetGetSize InetRead IniDelete IniRead IniReadSection IniReadSectionNames IniRenameSection IniWrite IniWriteSection InputBox Int IsAdmin IsArray IsBinary IsBool IsDeclared IsDllStruct IsFloat IsFunc IsHWnd IsInt IsKeyword IsNumber IsObj IsPtr IsString Log MemGetStats Mod MouseClick MouseClickDrag MouseDown MouseGetCursor MouseGetPos MouseMove MouseUp MouseWheel MsgBox Number ObjCreate ObjCreateInterface ObjEvent ObjGet ObjName OnAutoItExitRegister OnAutoItExitUnRegister Ping PixelChecksum PixelGetColor PixelSearch ProcessClose ProcessExists ProcessGetStats ProcessList ProcessSetPriority ProcessWait ProcessWaitClose ProgressOff ProgressOn ProgressSet Ptr Random RegDelete RegEnumKey RegEnumVal RegRead RegWrite Round Run RunAs RunAsWait RunWait Send SendKeepActive SetError SetExtended ShellExecute ShellExecuteWait Shutdown Sin Sleep SoundPlay SoundSetWaveVolume SplashImageOn SplashOff SplashTextOn Sqrt SRandom StatusbarGetText StderrRead StdinWrite StdioClose StdoutRead String StringAddCR StringCompare StringFormat StringFromASCIIArray StringInStr StringIsAlNum StringIsAlpha StringIsASCII StringIsDigit StringIsFloat StringIsInt StringIsLower StringIsSpace StringIsUpper StringIsXDigit StringLeft StringLen StringLower StringMid StringRegExp StringRegExpReplace StringReplace StringReverse StringRight StringSplit StringStripCR StringStripWS StringToASCIIArray StringToBinary StringTrimLeft StringTrimRight StringUpper Tan TCPAccept TCPCloseSocket TCPConnect TCPListen TCPNameToIP TCPRecv TCPSend TCPShutdown, UDPShutdown TCPStartup, UDPStartup TimerDiff TimerInit ToolTip TrayCreateItem TrayCreateMenu TrayGetMsg TrayItemDelete TrayItemGetHandle TrayItemGetState TrayItemGetText TrayItemSetOnEvent TrayItemSetState TrayItemSetText TraySetClick TraySetIcon TraySetOnEvent TraySetPauseIcon TraySetState TraySetToolTip TrayTip UBound UDPBind UDPCloseSocket UDPOpen UDPRecv UDPSend VarGetType WinActivate WinActive WinClose WinExists WinFlash WinGetCaretPos WinGetClassList WinGetClientSize WinGetHandle WinGetPos WinGetProcess WinGetState WinGetText WinGetTitle WinKill WinList WinMenuSelectItem WinMinimizeAll WinMinimizeAllUndo WinMove WinSetOnTop WinSetState WinSetTitle WinSetTrans WinWait",literal:"True False And Null Not Or"},contains:[t,r,i,n,{className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"comments include include-once NoTrayIcon OnAutoItStartRegister pragma compile RequireAdmin"},contains:[{begin:/\\\n/,relevance:0},{beginKeywords:"include",keywords:{"meta-keyword":"include"},end:"$",contains:[i,{className:"meta-string",variants:[{begin:"<",end:">"},{begin:/"/,end:/"/,contains:[{begin:/""/,relevance:0}]},{begin:/'/,end:/'/,contains:[{begin:/''/,relevance:0}]}]}]},i,t]},{className:"symbol",begin:"@[A-z0-9_]+"},{className:"function",beginKeywords:"Func",end:"$",illegal:"\\$|\\[|%",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",begin:"\\(",end:"\\)",contains:[r,i,n]}]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("autoit",function(e){var t={v:[e.C(";","$",{relevance:0}),e.C("#cs","#ce"),e.C("#comments-start","#comments-end")]},r={b:"\\$[A-z0-9_]+"},i={cN:"string",v:[{b:/"/,e:/"/,c:[{b:/""/,relevance:0}]},{b:/'/,e:/'/,c:[{b:/''/,relevance:0}]}]},l={v:[e.BNM,e.CNM]};return{cI:!0,i:/\/\*/,k:{keyword:"ByRef Case Const ContinueCase ContinueLoop Default Dim Do Else ElseIf EndFunc EndIf EndSelect EndSwitch EndWith Enum Exit ExitLoop For Func Global If In Local Next ReDim Return Select Static Step Switch Then To Until Volatile WEnd While With",built_in:"Abs ACos AdlibRegister AdlibUnRegister Asc AscW ASin Assign ATan AutoItSetOption AutoItWinGetTitle AutoItWinSetTitle Beep Binary BinaryLen BinaryMid BinaryToString BitAND BitNOT BitOR BitRotate BitShift BitXOR BlockInput Break Call CDTray Ceiling Chr ChrW ClipGet ClipPut ConsoleRead ConsoleWrite ConsoleWriteError ControlClick ControlCommand ControlDisable ControlEnable ControlFocus ControlGetFocus ControlGetHandle ControlGetPos ControlGetText ControlHide ControlListView ControlMove ControlSend ControlSetText ControlShow ControlTreeView Cos Dec DirCopy DirCreate DirGetSize DirMove DirRemove DllCall DllCallAddress DllCallbackFree DllCallbackGetPtr DllCallbackRegister DllClose DllOpen DllStructCreate DllStructGetData DllStructGetPtr DllStructGetSize DllStructSetData DriveGetDrive DriveGetFileSystem DriveGetLabel DriveGetSerial DriveGetType DriveMapAdd DriveMapDel DriveMapGet DriveSetLabel DriveSpaceFree DriveSpaceTotal DriveStatus EnvGet EnvSet EnvUpdate Eval Execute Exp FileChangeDir FileClose FileCopy FileCreateNTFSLink FileCreateShortcut FileDelete FileExists FileFindFirstFile FileFindNextFile FileFlush FileGetAttrib FileGetEncoding FileGetLongName FileGetPos FileGetShortcut FileGetShortName FileGetSize FileGetTime FileGetVersion FileInstall FileMove FileOpen FileOpenDialog FileRead FileReadLine FileReadToArray FileRecycle FileRecycleEmpty FileSaveDialog FileSelectFolder FileSetAttrib FileSetEnd FileSetPos FileSetTime FileWrite FileWriteLine Floor FtpSetProxy FuncName GUICreate GUICtrlCreateAvi GUICtrlCreateButton GUICtrlCreateCheckbox GUICtrlCreateCombo GUICtrlCreateContextMenu GUICtrlCreateDate GUICtrlCreateDummy GUICtrlCreateEdit GUICtrlCreateGraphic GUICtrlCreateGroup GUICtrlCreateIcon GUICtrlCreateInput GUICtrlCreateLabel GUICtrlCreateList GUICtrlCreateListView GUICtrlCreateListViewItem GUICtrlCreateMenu GUICtrlCreateMenuItem GUICtrlCreateMonthCal GUICtrlCreateObj GUICtrlCreatePic GUICtrlCreateProgress GUICtrlCreateRadio GUICtrlCreateSlider GUICtrlCreateTab GUICtrlCreateTabItem GUICtrlCreateTreeView GUICtrlCreateTreeViewItem GUICtrlCreateUpdown GUICtrlDelete GUICtrlGetHandle GUICtrlGetState GUICtrlRead GUICtrlRecvMsg GUICtrlRegisterListViewSort GUICtrlSendMsg GUICtrlSendToDummy GUICtrlSetBkColor GUICtrlSetColor GUICtrlSetCursor GUICtrlSetData GUICtrlSetDefBkColor GUICtrlSetDefColor GUICtrlSetFont GUICtrlSetGraphic GUICtrlSetImage GUICtrlSetLimit GUICtrlSetOnEvent GUICtrlSetPos GUICtrlSetResizing GUICtrlSetState GUICtrlSetStyle GUICtrlSetTip GUIDelete GUIGetCursorInfo GUIGetMsg GUIGetStyle GUIRegisterMsg GUISetAccelerators GUISetBkColor GUISetCoord GUISetCursor GUISetFont GUISetHelp GUISetIcon GUISetOnEvent GUISetState GUISetStyle GUIStartGroup GUISwitch Hex HotKeySet HttpSetProxy HttpSetUserAgent HWnd InetClose InetGet InetGetInfo InetGetSize InetRead IniDelete IniRead IniReadSection IniReadSectionNames IniRenameSection IniWrite IniWriteSection InputBox Int IsAdmin IsArray IsBinary IsBool IsDeclared IsDllStruct IsFloat IsFunc IsHWnd IsInt IsKeyword IsNumber IsObj IsPtr IsString Log MemGetStats Mod MouseClick MouseClickDrag MouseDown MouseGetCursor MouseGetPos MouseMove MouseUp MouseWheel MsgBox Number ObjCreate ObjCreateInterface ObjEvent ObjGet ObjName OnAutoItExitRegister OnAutoItExitUnRegister Ping PixelChecksum PixelGetColor PixelSearch ProcessClose ProcessExists ProcessGetStats ProcessList ProcessSetPriority ProcessWait ProcessWaitClose ProgressOff ProgressOn ProgressSet Ptr Random RegDelete RegEnumKey RegEnumVal RegRead RegWrite Round Run RunAs RunAsWait RunWait Send SendKeepActive SetError SetExtended ShellExecute ShellExecuteWait Shutdown Sin Sleep SoundPlay SoundSetWaveVolume SplashImageOn SplashOff SplashTextOn Sqrt SRandom StatusbarGetText StderrRead StdinWrite StdioClose StdoutRead String StringAddCR StringCompare StringFormat StringFromASCIIArray StringInStr StringIsAlNum StringIsAlpha StringIsASCII StringIsDigit StringIsFloat StringIsInt StringIsLower StringIsSpace StringIsUpper StringIsXDigit StringLeft StringLen StringLower StringMid StringRegExp StringRegExpReplace StringReplace StringReverse StringRight StringSplit StringStripCR StringStripWS StringToASCIIArray StringToBinary StringTrimLeft StringTrimRight StringUpper Tan TCPAccept TCPCloseSocket TCPConnect TCPListen TCPNameToIP TCPRecv TCPSend TCPShutdown, UDPShutdown TCPStartup, UDPStartup TimerDiff TimerInit ToolTip TrayCreateItem TrayCreateMenu TrayGetMsg TrayItemDelete TrayItemGetHandle TrayItemGetState TrayItemGetText TrayItemSetOnEvent TrayItemSetState TrayItemSetText TraySetClick TraySetIcon TraySetOnEvent TraySetPauseIcon TraySetState TraySetToolTip TrayTip UBound UDPBind UDPCloseSocket UDPOpen UDPRecv UDPSend VarGetType WinActivate WinActive WinClose WinExists WinFlash WinGetCaretPos WinGetClassList WinGetClientSize WinGetHandle WinGetPos WinGetProcess WinGetState WinGetText WinGetTitle WinKill WinList WinMenuSelectItem WinMinimizeAll WinMinimizeAllUndo WinMove WinSetOnTop WinSetState WinSetTitle WinSetTrans WinWait",literal:"True False And Null Not Or"},c:[t,r,i,l,{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"comments include include-once NoTrayIcon OnAutoItStartRegister pragma compile RequireAdmin"},c:[{b:/\\\n/,relevance:0},{bK:"include",k:{"meta-keyword":"include"},e:"$",c:[i,{cN:"meta-string",v:[{b:"<",e:">"},{b:/"/,e:/"/,c:[{b:/""/,relevance:0}]},{b:/'/,e:/'/,c:[{b:/''/,relevance:0}]}]}]},i,t]},{cN:"symbol",b:"@[A-z0-9_]+"},{cN:"function",bK:"Func",e:"$",i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:[r,i,l]}]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/avrasm.min.js b/vendor/assets/javascripts/highlightjs/languages/avrasm.min.js
index c76e16efc9..56c5786bf4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/avrasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/avrasm.min.js
@@ -1 +1 @@
-hljs.registerLanguage("avrasm",function(){"use strict";return function(r){return{name:"AVR Assembly",case_insensitive:!0,keywords:{$pattern:"\\.?"+r.IDENT_RE,keyword:"adc add adiw and andi asr bclr bld brbc brbs brcc brcs break breq brge brhc brhs brid brie brlo brlt brmi brne brpl brsh brtc brts brvc brvs bset bst call cbi cbr clc clh cli cln clr cls clt clv clz com cp cpc cpi cpse dec eicall eijmp elpm eor fmul fmuls fmulsu icall ijmp in inc jmp ld ldd ldi lds lpm lsl lsr mov movw mul muls mulsu neg nop or ori out pop push rcall ret reti rjmp rol ror sbc sbr sbrc sbrs sec seh sbi sbci sbic sbis sbiw sei sen ser ses set sev sez sleep spm st std sts sub subi swap tst wdr",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 r16 r17 r18 r19 r20 r21 r22 r23 r24 r25 r26 r27 r28 r29 r30 r31 x|0 xh xl y|0 yh yl z|0 zh zl ucsr1c udr1 ucsr1a ucsr1b ubrr1l ubrr1h ucsr0c ubrr0h tccr3c tccr3a tccr3b tcnt3h tcnt3l ocr3ah ocr3al ocr3bh ocr3bl ocr3ch ocr3cl icr3h icr3l etimsk etifr tccr1c ocr1ch ocr1cl twcr twdr twar twsr twbr osccal xmcra xmcrb eicra spmcsr spmcr portg ddrg ping portf ddrf sreg sph spl xdiv rampz eicrb eimsk gimsk gicr eifr gifr timsk tifr mcucr mcucsr tccr0 tcnt0 ocr0 assr tccr1a tccr1b tcnt1h tcnt1l ocr1ah ocr1al ocr1bh ocr1bl icr1h icr1l tccr2 tcnt2 ocr2 ocdr wdtcr sfior eearh eearl eedr eecr porta ddra pina portb ddrb pinb portc ddrc pinc portd ddrd pind spdr spsr spcr udr0 ucsr0a ucsr0b ubrr0l acsr admux adcsr adch adcl porte ddre pine pinf",meta:".byte .cseg .db .def .device .dseg .dw .endmacro .equ .eseg .exit .include .list .listmac .macro .nolist .org .set"},contains:[r.C_BLOCK_COMMENT_MODE,r.COMMENT(";","$",{relevance:0}),r.C_NUMBER_MODE,r.BINARY_NUMBER_MODE,{className:"number",begin:"\\b(\\$[a-zA-Z0-9]+|0o[0-7]+)"},r.QUOTE_STRING_MODE,{className:"string",begin:"'",end:"[^\\\\]'",illegal:"[^\\\\][^']"},{className:"symbol",begin:"^[A-Za-z0-9_.$]+:"},{className:"meta",begin:"#",end:"$"},{className:"subst",begin:"@[0-9]+"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("avrasm",function(r){return{cI:!0,l:"\\.?"+r.IR,k:{keyword:"adc add adiw and andi asr bclr bld brbc brbs brcc brcs break breq brge brhc brhs brid brie brlo brlt brmi brne brpl brsh brtc brts brvc brvs bset bst call cbi cbr clc clh cli cln clr cls clt clv clz com cp cpc cpi cpse dec eicall eijmp elpm eor fmul fmuls fmulsu icall ijmp in inc jmp ld ldd ldi lds lpm lsl lsr mov movw mul muls mulsu neg nop or ori out pop push rcall ret reti rjmp rol ror sbc sbr sbrc sbrs sec seh sbi sbci sbic sbis sbiw sei sen ser ses set sev sez sleep spm st std sts sub subi swap tst wdr",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 r16 r17 r18 r19 r20 r21 r22 r23 r24 r25 r26 r27 r28 r29 r30 r31 x|0 xh xl y|0 yh yl z|0 zh zl ucsr1c udr1 ucsr1a ucsr1b ubrr1l ubrr1h ucsr0c ubrr0h tccr3c tccr3a tccr3b tcnt3h tcnt3l ocr3ah ocr3al ocr3bh ocr3bl ocr3ch ocr3cl icr3h icr3l etimsk etifr tccr1c ocr1ch ocr1cl twcr twdr twar twsr twbr osccal xmcra xmcrb eicra spmcsr spmcr portg ddrg ping portf ddrf sreg sph spl xdiv rampz eicrb eimsk gimsk gicr eifr gifr timsk tifr mcucr mcucsr tccr0 tcnt0 ocr0 assr tccr1a tccr1b tcnt1h tcnt1l ocr1ah ocr1al ocr1bh ocr1bl icr1h icr1l tccr2 tcnt2 ocr2 ocdr wdtcr sfior eearh eearl eedr eecr porta ddra pina portb ddrb pinb portc ddrc pinc portd ddrd pind spdr spsr spcr udr0 ucsr0a ucsr0b ubrr0l acsr admux adcsr adch adcl porte ddre pine pinf",meta:".byte .cseg .db .def .device .dseg .dw .endmacro .equ .eseg .exit .include .list .listmac .macro .nolist .org .set"},c:[r.CBCM,r.C(";","$",{relevance:0}),r.CNM,r.BNM,{cN:"number",b:"\\b(\\$[a-zA-Z0-9]+|0o[0-7]+)"},r.QSM,{cN:"string",b:"'",e:"[^\\\\]'",i:"[^\\\\][^']"},{cN:"symbol",b:"^[A-Za-z0-9_.$]+:"},{cN:"meta",b:"#",e:"$"},{cN:"subst",b:"@[0-9]+"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/awk.min.js b/vendor/assets/javascripts/highlightjs/languages/awk.min.js
index bbba29d899..87e7f2a079 100644
--- a/vendor/assets/javascripts/highlightjs/languages/awk.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/awk.min.js
@@ -1 +1 @@
-hljs.registerLanguage("awk",function(){"use strict";return function(e){return{name:"Awk",keywords:{keyword:"BEGIN END if else while do for in break continue delete next nextfile function func exit|10"},contains:[{className:"variable",variants:[{begin:/\$[\w\d#@][\w\d_]*/},{begin:/\$\{(.*?)}/}]},{className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:/(u|b)?r?'''/,end:/'''/,relevance:10},{begin:/(u|b)?r?"""/,end:/"""/,relevance:10},{begin:/(u|r|ur)'/,end:/'/,relevance:10},{begin:/(u|r|ur)"/,end:/"/,relevance:10},{begin:/(b|br)'/,end:/'/},{begin:/(b|br)"/,end:/"/},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},e.REGEXP_MODE,e.HASH_COMMENT_MODE,e.NUMBER_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("awk",function(e){return{k:{keyword:"BEGIN END if else while do for in break continue delete next nextfile function func exit|10"},c:[{cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},{cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,relevance:10},{b:/(u|b)?r?"""/,e:/"""/,relevance:10},{b:/(u|r|ur)'/,e:/'/,relevance:10},{b:/(u|r|ur)"/,e:/"/,relevance:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},e.ASM,e.QSM]},e.RM,e.HCM,e.NM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/axapta.min.js b/vendor/assets/javascripts/highlightjs/languages/axapta.min.js
index 0d3cb32ea5..016d5a2897 100644
--- a/vendor/assets/javascripts/highlightjs/languages/axapta.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/axapta.min.js
@@ -1 +1 @@
-hljs.registerLanguage("axapta",function(){"use strict";return function(e){return{name:"Dynamics 365",keywords:"false int abstract private char boolean static null if for true while long throw finally protected final return void enum else break new catch byte super case short default double public try this switch continue reverse firstfast firstonly forupdate nofetch sum avg minof maxof count order group by asc desc index hint like dispaly edit client server ttsbegin ttscommit str real date container anytype common div mod",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,{className:"meta",begin:"#",end:"$"},{className:"class",beginKeywords:"class interface",end:"{",excludeEnd:!0,illegal:":",contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("axapta",function(e){return{k:"false int abstract private char boolean static null if for true while long throw finally protected final return void enum else break new catch byte super case short default double public try this switch continue reverse firstfast firstonly forupdate nofetch sum avg minof maxof count order group by asc desc index hint like dispaly edit client server ttsbegin ttscommit str real date container anytype common div mod",c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM,{cN:"meta",b:"#",e:"$"},{cN:"class",bK:"class interface",e:"{",eE:!0,i:":",c:[{bK:"extends implements"},e.UTM]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/bash.min.js b/vendor/assets/javascripts/highlightjs/languages/bash.min.js
index c5f460cf3b..d9a015208c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/bash.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/bash.min.js
@@ -1 +1 @@
-hljs.registerLanguage("bash",function(){"use strict";return function(e){const s={};Object.assign(s,{className:"variable",variants:[{begin:/\$[\w\d#@][\w\d_]*/},{begin:/\$\{/,end:/\}/,contains:[{begin:/:-/,contains:[s]}]}]});const t={className:"subst",begin:/\$\(/,end:/\)/,contains:[e.BACKSLASH_ESCAPE]},n={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,t]};t.contains.push(n);const a={begin:/\$\(\(/,end:/\)\)/,contains:[{begin:/\d+#[0-9a-f]+/,className:"number"},e.NUMBER_MODE,s]},i=e.SHEBANG({binary:"(fish|bash|zsh|sh|csh|ksh|tcsh|dash|scsh)",relevance:10}),c={className:"function",begin:/\w[\w\d_]*\s*\(\s*\)\s*\{/,returnBegin:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/\w[\w\d_]*/})],relevance:0};return{name:"Bash",aliases:["sh","zsh"],keywords:{$pattern:/\b-?[a-z\._]+\b/,keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},contains:[i,e.SHEBANG(),c,a,e.HASH_COMMENT_MODE,n,{className:"",begin:/\\"/},{className:"string",begin:/'/,end:/'/},s]}}}());
\ No newline at end of file
+hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},a={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]};return{aliases:["sh","zsh"],l:/\b-?[a-z\._]+\b/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,relevance:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],relevance:0},e.HCM,a,{cN:"",b:/\\"/},{cN:"string",b:/'/,e:/'/},t]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/basic.min.js b/vendor/assets/javascripts/highlightjs/languages/basic.min.js
index 7a3d0df1ab..2f9a2453e0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/basic.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/basic.min.js
@@ -1 +1 @@
-hljs.registerLanguage("basic",function(){"use strict";return function(E){return{name:"BASIC",case_insensitive:!0,illegal:"^.",keywords:{$pattern:"[a-zA-Z][a-zA-Z0-9_$%!#]*",keyword:"ABS ASC AND ATN AUTO|0 BEEP BLOAD|10 BSAVE|10 CALL CALLS CDBL CHAIN CHDIR CHR$|10 CINT CIRCLE CLEAR CLOSE CLS COLOR COM COMMON CONT COS CSNG CSRLIN CVD CVI CVS DATA DATE$ DEFDBL DEFINT DEFSNG DEFSTR DEF|0 SEG USR DELETE DIM DRAW EDIT END ENVIRON ENVIRON$ EOF EQV ERASE ERDEV ERDEV$ ERL ERR ERROR EXP FIELD FILES FIX FOR|0 FRE GET GOSUB|10 GOTO HEX$ IF THEN ELSE|0 INKEY$ INP INPUT INPUT# INPUT$ INSTR IMP INT IOCTL IOCTL$ KEY ON OFF LIST KILL LEFT$ LEN LET LINE LLIST LOAD LOC LOCATE LOF LOG LPRINT USING LSET MERGE MID$ MKDIR MKD$ MKI$ MKS$ MOD NAME NEW NEXT NOISE NOT OCT$ ON OR PEN PLAY STRIG OPEN OPTION BASE OUT PAINT PALETTE PCOPY PEEK PMAP POINT POKE POS PRINT PRINT] PSET PRESET PUT RANDOMIZE READ REM RENUM RESET|0 RESTORE RESUME RETURN|0 RIGHT$ RMDIR RND RSET RUN SAVE SCREEN SGN SHELL SIN SOUND SPACE$ SPC SQR STEP STICK STOP STR$ STRING$ SWAP SYSTEM TAB TAN TIME$ TIMER TROFF TRON TO USR VAL VARPTR VARPTR$ VIEW WAIT WHILE WEND WIDTH WINDOW WRITE XOR"},contains:[E.QUOTE_STRING_MODE,E.COMMENT("REM","$",{relevance:10}),E.COMMENT("'","$",{relevance:0}),{className:"symbol",begin:"^[0-9]+ ",relevance:10},{className:"number",begin:"\\b([0-9]+[0-9edED.]*[#!]?)",relevance:0},{className:"number",begin:"(&[hH][0-9a-fA-F]{1,4})"},{className:"number",begin:"(&[oO][0-7]{1,6})"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("basic",function(E){return{cI:!0,i:"^.",l:"[a-zA-Z][a-zA-Z0-9_$%!#]*",k:{keyword:"ABS ASC AND ATN AUTO|0 BEEP BLOAD|10 BSAVE|10 CALL CALLS CDBL CHAIN CHDIR CHR$|10 CINT CIRCLE CLEAR CLOSE CLS COLOR COM COMMON CONT COS CSNG CSRLIN CVD CVI CVS DATA DATE$ DEFDBL DEFINT DEFSNG DEFSTR DEF|0 SEG USR DELETE DIM DRAW EDIT END ENVIRON ENVIRON$ EOF EQV ERASE ERDEV ERDEV$ ERL ERR ERROR EXP FIELD FILES FIX FOR|0 FRE GET GOSUB|10 GOTO HEX$ IF THEN ELSE|0 INKEY$ INP INPUT INPUT# INPUT$ INSTR IMP INT IOCTL IOCTL$ KEY ON OFF LIST KILL LEFT$ LEN LET LINE LLIST LOAD LOC LOCATE LOF LOG LPRINT USING LSET MERGE MID$ MKDIR MKD$ MKI$ MKS$ MOD NAME NEW NEXT NOISE NOT OCT$ ON OR PEN PLAY STRIG OPEN OPTION BASE OUT PAINT PALETTE PCOPY PEEK PMAP POINT POKE POS PRINT PRINT] PSET PRESET PUT RANDOMIZE READ REM RENUM RESET|0 RESTORE RESUME RETURN|0 RIGHT$ RMDIR RND RSET RUN SAVE SCREEN SGN SHELL SIN SOUND SPACE$ SPC SQR STEP STICK STOP STR$ STRING$ SWAP SYSTEM TAB TAN TIME$ TIMER TROFF TRON TO USR VAL VARPTR VARPTR$ VIEW WAIT WHILE WEND WIDTH WINDOW WRITE XOR"},c:[E.QSM,E.C("REM","$",{relevance:10}),E.C("'","$",{relevance:0}),{cN:"symbol",b:"^[0-9]+ ",relevance:10},{cN:"number",b:"\\b([0-9]+[0-9edED.]*[#!]?)",relevance:0},{cN:"number",b:"(&[hH][0-9a-fA-F]{1,4})"},{cN:"number",b:"(&[oO][0-7]{1,6})"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/bnf.min.js b/vendor/assets/javascripts/highlightjs/languages/bnf.min.js
index 4bd045fa1f..93e05653e9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/bnf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/bnf.min.js
@@ -1 +1 @@
-hljs.registerLanguage("bnf",function(){"use strict";return function(n){return{name:"Backus–Naur Form",contains:[{className:"attribute",begin:/</,end:/>/},{begin:/::=/,end:/$/,contains:[{begin:/</,end:/>/},n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE,n.APOS_STRING_MODE,n.QUOTE_STRING_MODE]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("bnf",function(e){return{c:[{cN:"attribute",b:/</,e:/>/},{b:/::=/,starts:{e:/$/,c:[{b:/</,e:/>/},e.CLCM,e.CBCM,e.ASM,e.QSM]}}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/brainfuck.min.js b/vendor/assets/javascripts/highlightjs/languages/brainfuck.min.js
index 4f9ddaf023..23e835dc76 100644
--- a/vendor/assets/javascripts/highlightjs/languages/brainfuck.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/brainfuck.min.js
@@ -1 +1 @@
-hljs.registerLanguage("brainfuck",function(){"use strict";return function(e){var n={className:"literal",begin:"[\\+\\-]",relevance:0};return{name:"Brainfuck",aliases:["bf"],contains:[e.COMMENT("[^\\[\\]\\.,\\+\\-<> \r\n]","[\\[\\]\\.,\\+\\-<> \r\n]",{returnEnd:!0,relevance:0}),{className:"title",begin:"[\\[\\]]",relevance:0},{className:"string",begin:"[\\.,]",relevance:0},{begin:/(?:\+\+|\-\-)/,contains:[n]},n]}}}());
\ No newline at end of file
+hljs.registerLanguage("brainfuck",function(e){var r={cN:"literal",b:"[\\+\\-]",relevance:0};return{aliases:["bf"],c:[e.C("[^\\[\\]\\.,\\+\\-<> \r\n]","[\\[\\]\\.,\\+\\-<> \r\n]",{rE:!0,relevance:0}),{cN:"title",b:"[\\[\\]]",relevance:0},{cN:"string",b:"[\\.,]",relevance:0},{b:/(?:\+\+|\-\-)/,c:[r]},r]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/cal.min.js b/vendor/assets/javascripts/highlightjs/languages/cal.min.js
index f11b799811..d6d643689f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cal.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cal.min.js
@@ -1 +1 @@
-hljs.registerLanguage("cal",function(){"use strict";return function(e){var n="div mod in and or not xor asserterror begin case do downto else end exit for if of repeat then to until while with var",a=[e.C_LINE_COMMENT_MODE,e.COMMENT(/\{/,/\}/,{relevance:0}),e.COMMENT(/\(\*/,/\*\)/,{relevance:10})],r={className:"string",begin:/'/,end:/'/,contains:[{begin:/''/}]},s={className:"string",begin:/(#\d+)+/},i={className:"function",beginKeywords:"procedure",end:/[:;]/,keywords:"procedure|10",contains:[e.TITLE_MODE,{className:"params",begin:/\(/,end:/\)/,keywords:n,contains:[r,s]}].concat(a)},t={className:"class",begin:"OBJECT (Table|Form|Report|Dataport|Codeunit|XMLport|MenuSuite|Page|Query) (\\d+) ([^\\r\\n]+)",returnBegin:!0,contains:[e.TITLE_MODE,i]};return{name:"C/AL",case_insensitive:!0,keywords:{keyword:n,literal:"false true"},illegal:/\/\*/,contains:[r,s,{className:"number",begin:"\\b\\d+(\\.\\d+)?(DT|D|T)",relevance:0},{className:"string",begin:'"',end:'"'},e.NUMBER_MODE,t,i]}}}());
\ No newline at end of file
+hljs.registerLanguage("cal",function(e){var r="div mod in and or not xor asserterror begin case do downto else end exit for if of repeat then to until while with var",c=[e.CLCM,e.C(/\{/,/\}/,{relevance:0}),e.C(/\(\*/,/\*\)/,{relevance:10})],n={cN:"string",b:/'/,e:/'/,c:[{b:/''/}]},t={cN:"string",b:/(#\d+)+/},a={cN:"function",bK:"procedure",e:/[:;]/,k:"procedure|10",c:[e.TM,{cN:"params",b:/\(/,e:/\)/,k:r,c:[n,t]}].concat(c)},o={cN:"class",b:"OBJECT (Table|Form|Report|Dataport|Codeunit|XMLport|MenuSuite|Page|Query) (\\d+) ([^\\r\\n]+)",rB:!0,c:[e.TM,a]};return{cI:!0,k:{keyword:r,literal:"false true"},i:/\/\*/,c:[n,t,{cN:"number",b:"\\b\\d+(\\.\\d+)?(DT|D|T)",relevance:0},{cN:"string",b:'"',e:'"'},e.NM,o,a]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/capnproto.min.js b/vendor/assets/javascripts/highlightjs/languages/capnproto.min.js
index 8e6a795cbf..3728f16f0f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/capnproto.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/capnproto.min.js
@@ -1 +1 @@
-hljs.registerLanguage("capnproto",function(){"use strict";return function(n){return{name:"Cap’n Proto",aliases:["capnp"],keywords:{keyword:"struct enum interface union group import using const annotation extends in of on as with from fixed",built_in:"Void Bool Int8 Int16 Int32 Int64 UInt8 UInt16 UInt32 UInt64 Float32 Float64 Text Data AnyPointer AnyStruct Capability List",literal:"true false"},contains:[n.QUOTE_STRING_MODE,n.NUMBER_MODE,n.HASH_COMMENT_MODE,{className:"meta",begin:/@0x[\w\d]{16};/,illegal:/\n/},{className:"symbol",begin:/@\d+\b/},{className:"class",beginKeywords:"struct enum",end:/\{/,illegal:/\n/,contains:[n.inherit(n.TITLE_MODE,{starts:{endsWithParent:!0,excludeEnd:!0}})]},{className:"class",beginKeywords:"interface",end:/\{/,illegal:/\n/,contains:[n.inherit(n.TITLE_MODE,{starts:{endsWithParent:!0,excludeEnd:!0}})]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("capnproto",function(t){return{aliases:["capnp"],k:{keyword:"struct enum interface union group import using const annotation extends in of on as with from fixed",built_in:"Void Bool Int8 Int16 Int32 Int64 UInt8 UInt16 UInt32 UInt64 Float32 Float64 Text Data AnyPointer AnyStruct Capability List",literal:"true false"},c:[t.QSM,t.NM,t.HCM,{cN:"meta",b:/@0x[\w\d]{16};/,i:/\n/},{cN:"symbol",b:/@\d+\b/},{cN:"class",bK:"struct enum",e:/\{/,i:/\n/,c:[t.inherit(t.TM,{starts:{eW:!0,eE:!0}})]},{cN:"class",bK:"interface",e:/\{/,i:/\n/,c:[t.inherit(t.TM,{starts:{eW:!0,eE:!0}})]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ceylon.min.js b/vendor/assets/javascripts/highlightjs/languages/ceylon.min.js
index 054140701b..26eb0716c4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ceylon.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ceylon.min.js
@@ -1 +1 @@
-hljs.registerLanguage("ceylon",function(){"use strict";return function(e){var a="assembly module package import alias class interface object given value assign void function new of extends satisfies abstracts in out return break continue throw assert dynamic if else switch case for while try catch finally then let this outer super is exists nonempty",n={className:"subst",excludeBegin:!0,excludeEnd:!0,begin:/``/,end:/``/,keywords:a,relevance:10},s=[{className:"string",begin:'"""',end:'"""',relevance:10},{className:"string",begin:'"',end:'"',contains:[n]},{className:"string",begin:"'",end:"'"},{className:"number",begin:"#[0-9a-fA-F_]+|\\$[01_]+|[0-9_]+(?:\\.[0-9_](?:[eE][+-]?\\d+)?)?[kMGTPmunpf]?",relevance:0}];return n.contains=s,{name:"Ceylon",keywords:{keyword:a+" shared abstract formal default actual variable late native deprecated final sealed annotation suppressWarnings small",meta:"doc by license see throws tagged"},illegal:"\\$[^01]|#[^0-9a-fA-F]",contains:[e.C_LINE_COMMENT_MODE,e.COMMENT("/\\*","\\*/",{contains:["self"]}),{className:"meta",begin:'@[a-z]\\w*(?:\\:"[^"]*")?'}].concat(s)}}}());
\ No newline at end of file
+hljs.registerLanguage("ceylon",function(e){var a="assembly module package import alias class interface object given value assign void function new of extends satisfies abstracts in out return break continue throw assert dynamic if else switch case for while try catch finally then let this outer super is exists nonempty",t={cN:"subst",eB:!0,eE:!0,b:/``/,e:/``/,k:a,relevance:10},s=[{cN:"string",b:'"""',e:'"""',relevance:10},{cN:"string",b:'"',e:'"',c:[t]},{cN:"string",b:"'",e:"'"},{cN:"number",b:"#[0-9a-fA-F_]+|\\$[01_]+|[0-9_]+(?:\\.[0-9_](?:[eE][+-]?\\d+)?)?[kMGTPmunpf]?",relevance:0}];return t.c=s,{k:{keyword:a+" shared abstract formal default actual variable late native deprecatedfinal sealed annotation suppressWarnings small",meta:"doc by license see throws tagged"},i:"\\$[^01]|#[^0-9a-fA-F]",c:[e.CLCM,e.C("/\\*","\\*/",{c:["self"]}),{cN:"meta",b:'@[a-z]\\w*(?:\\:"[^"]*")?'}].concat(s)}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/clean.min.js b/vendor/assets/javascripts/highlightjs/languages/clean.min.js
index 4fa620e6cd..b54a29f954 100644
--- a/vendor/assets/javascripts/highlightjs/languages/clean.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/clean.min.js
@@ -1 +1 @@
-hljs.registerLanguage("clean",function(){"use strict";return function(e){return{name:"Clean",aliases:["clean","icl","dcl"],keywords:{keyword:"if let in with where case of class instance otherwise implementation definition system module from import qualified as special code inline foreign export ccall stdcall generic derive infix infixl infixr",built_in:"Int Real Char Bool",literal:"True False"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,{begin:"->|<-[|:]?|#!?|>>=|\\{\\||\\|\\}|:==|=:|<>"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("clean",function(e){return{aliases:["clean","icl","dcl"],k:{keyword:"if let in with where case of class instance otherwise implementation definition system module from import qualified as special code inline foreign export ccall stdcall generic derive infix infixl infixr",built_in:"Int Real Char Bool",literal:"True False"},c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM,{b:"->|<-[|:]?|#!?|>>=|\\{\\||\\|\\}|:==|=:|<>"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/clojure-repl.min.js b/vendor/assets/javascripts/highlightjs/languages/clojure-repl.min.js
index 25dff78bc6..6fa30020cb 100644
--- a/vendor/assets/javascripts/highlightjs/languages/clojure-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/clojure-repl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("clojure-repl",function(){"use strict";return function(e){return{name:"Clojure REPL",contains:[{className:"meta",begin:/^([\w.-]+|\s*#_)?=>/,starts:{end:/$/,subLanguage:"clojure"}}]}}}());
\ No newline at end of file
+hljs.registerLanguage("clojure-repl",function(e){return{c:[{cN:"meta",b:/^([\w.-]+|\s*#_)?=>/,starts:{e:/$/,sL:"clojure"}}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/clojure.min.js b/vendor/assets/javascripts/highlightjs/languages/clojure.min.js
index 1aec1783da..4b27d5a8f6 100644
--- a/vendor/assets/javascripts/highlightjs/languages/clojure.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/clojure.min.js
@@ -1 +1 @@
-hljs.registerLanguage("clojure",function(){"use strict";return function(e){var t="[a-zA-Z_\\-!.?+*=<>&#'][a-zA-Z_\\-!.?+*=<>&#'0-9/;:]*",n="def defonce defprotocol defstruct defmulti defmethod defn- defn defmacro deftype defrecord",r={$pattern:t,"builtin-name":n+" cond apply if-not if-let if not not= = < > <= >= == + / * - rem quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? string? map? nil? contains? zero? instance? not-every? not-any? libspec? -> ->> .. . inc compare do dotimes mapcat take remove take-while drop letfn drop-last take-last drop-while while intern condp case reduced cycle split-at split-with repeat replicate iterate range merge zipmap declare line-seq sort comparator sort-by dorun doall nthnext nthrest partition eval doseq await await-for let agent atom send send-off release-pending-sends add-watch mapv filterv remove-watch agent-error restart-agent set-error-handler error-handler set-error-mode! error-mode shutdown-agents quote var fn loop recur throw try monitor-enter monitor-exit macroexpand macroexpand-1 for dosync and or when when-not when-let comp juxt partial sequence memoize constantly complement identity assert peek pop doto proxy first rest cons cast coll last butlast sigs reify second ffirst fnext nfirst nnext meta with-meta ns in-ns create-ns import refer keys select-keys vals key val rseq name namespace promise into transient persistent! conj! assoc! dissoc! pop! disj! use class type num float double short byte boolean bigint biginteger bigdec print-method print-dup throw-if printf format load compile get-in update-in pr pr-on newline flush read slurp read-line subvec with-open memfn time re-find re-groups rand-int rand mod locking assert-valid-fdecl alias resolve ref deref refset swap! reset! set-validator! compare-and-set! alter-meta! reset-meta! commute get-validator alter ref-set ref-history-count ref-min-history ref-max-history ensure sync io! new next conj set! to-array future future-call into-array aset gen-class reduce map filter find empty hash-map hash-set sorted-map sorted-map-by sorted-set sorted-set-by vec vector seq flatten reverse assoc dissoc list disj get union difference intersection extend extend-type extend-protocol int nth delay count concat chunk chunk-buffer chunk-append chunk-first chunk-rest max min dec unchecked-inc-int unchecked-inc unchecked-dec-inc unchecked-dec unchecked-negate unchecked-add-int unchecked-add unchecked-subtract-int unchecked-subtract chunk-next chunk-cons chunked-seq? prn vary-meta lazy-seq spread list* str find-keyword keyword symbol gensym force rationalize"},a={begin:t,relevance:0},s={className:"number",begin:"[-+]?\\d+(\\.\\d+)?",relevance:0},o=e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),i=e.COMMENT(";","$",{relevance:0}),c={className:"literal",begin:/\b(true|false|nil)\b/},d={begin:"[\\[\\{]",end:"[\\]\\}]"},l={className:"comment",begin:"\\^"+t},m=e.COMMENT("\\^\\{","\\}"),u={className:"symbol",begin:"[:]{1,2}"+t},p={begin:"\\(",end:"\\)"},f={endsWithParent:!0,relevance:0},h={keywords:r,className:"name",begin:t,starts:f},y=[p,o,l,m,i,u,d,s,c,a],g={beginKeywords:n,lexemes:t,end:'(\\[|\\#|\\d|"|:|\\{|\\)|\\(|$)',contains:[{className:"title",begin:t,relevance:0,excludeEnd:!0,endsParent:!0}].concat(y)};return p.contains=[e.COMMENT("comment",""),g,h,f],f.contains=y,d.contains=y,m.contains=[d],{name:"Clojure",aliases:["clj"],illegal:/\S/,contains:[p,o,l,m,i,u,d,s,c]}}}());
\ No newline at end of file
+hljs.registerLanguage("clojure",function(e){var t="a-zA-Z_\\-!.?+*=<>&#'",n="["+t+"]["+t+"0-9/;:]*",r={b:n,relevance:0},a={cN:"number",b:"[-+]?\\d+(\\.\\d+)?",relevance:0},o=e.inherit(e.QSM,{i:null}),s=e.C(";","$",{relevance:0}),c={cN:"literal",b:/\b(true|false|nil)\b/},i={b:"[\\[\\{]",e:"[\\]\\}]"},d={cN:"comment",b:"\\^"+n},l=e.C("\\^\\{","\\}"),m={cN:"symbol",b:"[:]{1,2}"+n},p={b:"\\(",e:"\\)"},u={eW:!0,relevance:0},f={k:{"builtin-name":"def defonce cond apply if-not if-let if not not= = < > <= >= == + / * - rem quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? string? map? nil? contains? zero? instance? not-every? not-any? libspec? -> ->> .. . inc compare do dotimes mapcat take remove take-while drop letfn drop-last take-last drop-while while intern condp case reduced cycle split-at split-with repeat replicate iterate range merge zipmap declare line-seq sort comparator sort-by dorun doall nthnext nthrest partition eval doseq await await-for let agent atom send send-off release-pending-sends add-watch mapv filterv remove-watch agent-error restart-agent set-error-handler error-handler set-error-mode! error-mode shutdown-agents quote var fn loop recur throw try monitor-enter monitor-exit defmacro defn defn- macroexpand macroexpand-1 for dosync and or when when-not when-let comp juxt partial sequence memoize constantly complement identity assert peek pop doto proxy defstruct first rest cons defprotocol cast coll deftype defrecord last butlast sigs reify second ffirst fnext nfirst nnext defmulti defmethod meta with-meta ns in-ns create-ns import refer keys select-keys vals key val rseq name namespace promise into transient persistent! conj! assoc! dissoc! pop! disj! use class type num float double short byte boolean bigint biginteger bigdec print-method print-dup throw-if printf format load compile get-in update-in pr pr-on newline flush read slurp read-line subvec with-open memfn time re-find re-groups rand-int rand mod locking assert-valid-fdecl alias resolve ref deref refset swap! reset! set-validator! compare-and-set! alter-meta! reset-meta! commute get-validator alter ref-set ref-history-count ref-min-history ref-max-history ensure sync io! new next conj set! to-array future future-call into-array aset gen-class reduce map filter find empty hash-map hash-set sorted-map sorted-map-by sorted-set sorted-set-by vec vector seq flatten reverse assoc dissoc list disj get union difference intersection extend extend-type extend-protocol int nth delay count concat chunk chunk-buffer chunk-append chunk-first chunk-rest max min dec unchecked-inc-int unchecked-inc unchecked-dec-inc unchecked-dec unchecked-negate unchecked-add-int unchecked-add unchecked-subtract-int unchecked-subtract chunk-next chunk-cons chunked-seq? prn vary-meta lazy-seq spread list* str find-keyword keyword symbol gensym force rationalize"},l:n,cN:"name",b:n,starts:u},h=[p,o,d,l,s,m,i,a,c,r];return p.c=[e.C("comment",""),f,u],u.c=h,i.c=h,l.c=[i],{aliases:["clj"],i:/\S/,c:[p,o,d,l,s,m,i,a,c]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/cmake.min.js b/vendor/assets/javascripts/highlightjs/languages/cmake.min.js
index 6178a73d95..70aa6629f0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cmake.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cmake.min.js
@@ -1 +1 @@
-hljs.registerLanguage("cmake",function(){"use strict";return function(e){return{name:"CMake",aliases:["cmake.in"],case_insensitive:!0,keywords:{keyword:"break cmake_host_system_information cmake_minimum_required cmake_parse_arguments cmake_policy configure_file continue elseif else endforeach endfunction endif endmacro endwhile execute_process file find_file find_library find_package find_path find_program foreach function get_cmake_property get_directory_property get_filename_component get_property if include include_guard list macro mark_as_advanced math message option return separate_arguments set_directory_properties set_property set site_name string unset variable_watch while add_compile_definitions add_compile_options add_custom_command add_custom_target add_definitions add_dependencies add_executable add_library add_link_options add_subdirectory add_test aux_source_directory build_command create_test_sourcelist define_property enable_language enable_testing export fltk_wrap_ui get_source_file_property get_target_property get_test_property include_directories include_external_msproject include_regular_expression install link_directories link_libraries load_cache project qt_wrap_cpp qt_wrap_ui remove_definitions set_source_files_properties set_target_properties set_tests_properties source_group target_compile_definitions target_compile_features target_compile_options target_include_directories target_link_directories target_link_libraries target_link_options target_sources try_compile try_run ctest_build ctest_configure ctest_coverage ctest_empty_binary_directory ctest_memcheck ctest_read_custom_files ctest_run_script ctest_sleep ctest_start ctest_submit ctest_test ctest_update ctest_upload build_name exec_program export_library_dependencies install_files install_programs install_targets load_command make_directory output_required_files remove subdir_depends subdirs use_mangled_mesa utility_source variable_requires write_file qt5_use_modules qt5_use_package qt5_wrap_cpp on off true false and or not command policy target test exists is_newer_than is_directory is_symlink is_absolute matches less greater equal less_equal greater_equal strless strgreater strequal strless_equal strgreater_equal version_less version_greater version_equal version_less_equal version_greater_equal in_list defined"},contains:[{className:"variable",begin:"\\${",end:"}"},e.HASH_COMMENT_MODE,e.QUOTE_STRING_MODE,e.NUMBER_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("cmake",function(e){return{aliases:["cmake.in"],cI:!0,k:{keyword:"break cmake_host_system_information cmake_minimum_required cmake_parse_arguments cmake_policy configure_file continue elseif else endforeach endfunction endif endmacro endwhile execute_process file find_file find_library find_package find_path find_program foreach function get_cmake_property get_directory_property get_filename_component get_property if include include_guard list macro mark_as_advanced math message option return separate_arguments set_directory_properties set_property set site_name string unset variable_watch while add_compile_definitions add_compile_options add_custom_command add_custom_target add_definitions add_dependencies add_executable add_library add_link_options add_subdirectory add_test aux_source_directory build_command create_test_sourcelist define_property enable_language enable_testing export fltk_wrap_ui get_source_file_property get_target_property get_test_property include_directories include_external_msproject include_regular_expression install link_directories link_libraries load_cache project qt_wrap_cpp qt_wrap_ui remove_definitions set_source_files_properties set_target_properties set_tests_properties source_group target_compile_definitions target_compile_features target_compile_options target_include_directories target_link_directories target_link_libraries target_link_options target_sources try_compile try_run ctest_build ctest_configure ctest_coverage ctest_empty_binary_directory ctest_memcheck ctest_read_custom_files ctest_run_script ctest_sleep ctest_start ctest_submit ctest_test ctest_update ctest_upload build_name exec_program export_library_dependencies install_files install_programs install_targets load_command make_directory output_required_files remove subdir_depends subdirs use_mangled_mesa utility_source variable_requires write_file qt5_use_modules qt5_use_package qt5_wrap_cpp on off true false and or not command policy target test exists is_newer_than is_directory is_symlink is_absolute matches less greater equal less_equal greater_equal strless strgreater strequal strless_equal strgreater_equal version_less version_greater version_equal version_less_equal version_greater_equal in_list defined"},c:[{cN:"variable",b:"\\${",e:"}"},e.HCM,e.QSM,e.NM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/coffeescript.min.js b/vendor/assets/javascripts/highlightjs/languages/coffeescript.min.js
index e686acc5b9..5ba2692102 100644
--- a/vendor/assets/javascripts/highlightjs/languages/coffeescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/coffeescript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("coffeescript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);return function(r){var t,i={keyword:e.concat(["then","unless","until","loop","by","when","and","or","is","isnt","not"]).filter((t=["var","const","let","function","static"],e=>!t.includes(e))).join(" "),literal:n.concat(["yes","no","on","off"]).join(" "),built_in:a.concat(["npm","print"]).join(" ")},s="[A-Za-z$_][0-9A-Za-z$_]*",o={className:"subst",begin:/#\{/,end:/}/,keywords:i},c=[r.BINARY_NUMBER_MODE,r.inherit(r.C_NUMBER_MODE,{starts:{end:"(\\s*/)?",relevance:0}}),{className:"string",variants:[{begin:/'''/,end:/'''/,contains:[r.BACKSLASH_ESCAPE]},{begin:/'/,end:/'/,contains:[r.BACKSLASH_ESCAPE]},{begin:/"""/,end:/"""/,contains:[r.BACKSLASH_ESCAPE,o]},{begin:/"/,end:/"/,contains:[r.BACKSLASH_ESCAPE,o]}]},{className:"regexp",variants:[{begin:"///",end:"///",contains:[o,r.HASH_COMMENT_MODE]},{begin:"//[gim]{0,3}(?=\\W)",relevance:0},{begin:/\/(?![ *]).*?(?![\\]).\/[gim]{0,3}(?=\W)/}]},{begin:"@"+s},{subLanguage:"javascript",excludeBegin:!0,excludeEnd:!0,variants:[{begin:"```",end:"```"},{begin:"`",end:"`"}]}];o.contains=c;var l=r.inherit(r.TITLE_MODE,{begin:s}),d={className:"params",begin:"\\([^\\(]",returnBegin:!0,contains:[{begin:/\(/,end:/\)/,keywords:i,contains:["self"].concat(c)}]};return{name:"CoffeeScript",aliases:["coffee","cson","iced"],keywords:i,illegal:/\/\*/,contains:c.concat([r.COMMENT("###","###"),r.HASH_COMMENT_MODE,{className:"function",begin:"^\\s*"+s+"\\s*=\\s*(\\(.*\\))?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[l,d]},{begin:/[:\(,=]\s*/,relevance:0,contains:[{className:"function",begin:"(\\(.*\\))?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[d]}]},{className:"class",beginKeywords:"class",end:"$",illegal:/[:="\[\]]/,contains:[{beginKeywords:"extends",endsWithParent:!0,illegal:/[:="\[\]]/,contains:[l]},l]},{begin:s+":",end:":",returnBegin:!0,returnEnd:!0,relevance:0}])}}}());
\ No newline at end of file
+hljs.registerLanguage("coffeescript",function(e){var c={keyword:"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger super yield import export from as default await then unless until loop of by when and or is isnt not",literal:"true false null undefined yes no on off",built_in:"npm require console print module global window document"},n="[A-Za-z$_][0-9A-Za-z$_]*",r={cN:"subst",b:/#\{/,e:/}/,k:c},i=[e.BNM,e.inherit(e.CNM,{starts:{e:"(\\s*/)?",relevance:0}}),{cN:"string",v:[{b:/'''/,e:/'''/,c:[e.BE]},{b:/'/,e:/'/,c:[e.BE]},{b:/"""/,e:/"""/,c:[e.BE,r]},{b:/"/,e:/"/,c:[e.BE,r]}]},{cN:"regexp",v:[{b:"///",e:"///",c:[r,e.HCM]},{b:"//[gim]{0,3}(?=\\W)",relevance:0},{b:/\/(?![ *]).*?(?![\\]).\/[gim]{0,3}(?=\W)/}]},{b:"@"+n},{sL:"javascript",eB:!0,eE:!0,v:[{b:"```",e:"```"},{b:"`",e:"`"}]}];r.c=i;var s=e.inherit(e.TM,{b:n}),t="(\\(.*\\))?\\s*\\B[-=]>",a={cN:"params",b:"\\([^\\(]",rB:!0,c:[{b:/\(/,e:/\)/,k:c,c:["self"].concat(i)}]};return{aliases:["coffee","cson","iced"],k:c,i:/\/\*/,c:i.concat([e.C("###","###"),e.HCM,{cN:"function",b:"^\\s*"+n+"\\s*=\\s*"+t,e:"[-=]>",rB:!0,c:[s,a]},{b:/[:\(,=]\s*/,relevance:0,c:[{cN:"function",b:t,e:"[-=]>",rB:!0,c:[a]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[s]},s]},{b:n+":",e:":",rB:!0,rE:!0,relevance:0}])}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/coq.min.js b/vendor/assets/javascripts/highlightjs/languages/coq.min.js
index 964f7b41e4..d3098ed2fe 100644
--- a/vendor/assets/javascripts/highlightjs/languages/coq.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/coq.min.js
@@ -1 +1 @@
-hljs.registerLanguage("coq",function(){"use strict";return function(e){return{name:"Coq",keywords:{keyword:"_|0 as at cofix else end exists exists2 fix for forall fun if IF in let match mod Prop return Set then Type using where with Abort About Add Admit Admitted All Arguments Assumptions Axiom Back BackTo Backtrack Bind Blacklist Canonical Cd Check Class Classes Close Coercion Coercions CoFixpoint CoInductive Collection Combined Compute Conjecture Conjectures Constant constr Constraint Constructors Context Corollary CreateHintDb Cut Declare Defined Definition Delimit Dependencies Dependent Derive Drop eauto End Equality Eval Example Existential Existentials Existing Export exporting Extern Extract Extraction Fact Field Fields File Fixpoint Focus for From Function Functional Generalizable Global Goal Grab Grammar Graph Guarded Heap Hint HintDb Hints Hypotheses Hypothesis ident Identity If Immediate Implicit Import Include Inductive Infix Info Initial Inline Inspect Instance Instances Intro Intros Inversion Inversion_clear Language Left Lemma Let Libraries Library Load LoadPath Local Locate Ltac ML Mode Module Modules Monomorphic Morphism Next NoInline Notation Obligation Obligations Opaque Open Optimize Options Parameter Parameters Parametric Path Paths pattern Polymorphic Preterm Print Printing Program Projections Proof Proposition Pwd Qed Quit Rec Record Recursive Redirect Relation Remark Remove Require Reserved Reset Resolve Restart Rewrite Right Ring Rings Save Scheme Scope Scopes Script Search SearchAbout SearchHead SearchPattern SearchRewrite Section Separate Set Setoid Show Solve Sorted Step Strategies Strategy Structure SubClass Table Tables Tactic Term Test Theorem Time Timeout Transparent Type Typeclasses Types Undelimit Undo Unfocus Unfocused Unfold Universe Universes Unset Unshelve using Variable Variables Variant Verbose Visibility where with",built_in:"abstract absurd admit after apply as assert assumption at auto autorewrite autounfold before bottom btauto by case case_eq cbn cbv change classical_left classical_right clear clearbody cofix compare compute congruence constr_eq constructor contradict contradiction cut cutrewrite cycle decide decompose dependent destruct destruction dintuition discriminate discrR do double dtauto eapply eassumption eauto ecase econstructor edestruct ediscriminate eelim eexact eexists einduction einjection eleft elim elimtype enough equality erewrite eright esimplify_eq esplit evar exact exactly_once exfalso exists f_equal fail field field_simplify field_simplify_eq first firstorder fix fold fourier functional generalize generalizing gfail give_up has_evar hnf idtac in induction injection instantiate intro intro_pattern intros intuition inversion inversion_clear is_evar is_var lapply lazy left lia lra move native_compute nia nsatz omega once pattern pose progress proof psatz quote record red refine reflexivity remember rename repeat replace revert revgoals rewrite rewrite_strat right ring ring_simplify rtauto set setoid_reflexivity setoid_replace setoid_rewrite setoid_symmetry setoid_transitivity shelve shelve_unifiable simpl simple simplify_eq solve specialize split split_Rabs split_Rmult stepl stepr subst sum swap symmetry tactic tauto time timeout top transitivity trivial try tryif unfold unify until using vm_compute with"},contains:[e.QUOTE_STRING_MODE,e.COMMENT("\\(\\*","\\*\\)"),e.C_NUMBER_MODE,{className:"type",excludeBegin:!0,begin:"\\|\\s*",end:"\\w+"},{begin:/[-=]>/}]}}}());
\ No newline at end of file
+hljs.registerLanguage("coq",function(e){return{k:{keyword:"_|0 as at cofix else end exists exists2 fix for forall fun if IF in let match mod Prop return Set then Type using where with Abort About Add Admit Admitted All Arguments Assumptions Axiom Back BackTo Backtrack Bind Blacklist Canonical Cd Check Class Classes Close Coercion Coercions CoFixpoint CoInductive Collection Combined Compute Conjecture Conjectures Constant constr Constraint Constructors Context Corollary CreateHintDb Cut Declare Defined Definition Delimit Dependencies DependentDerive Drop eauto End Equality Eval Example Existential Existentials Existing Export exporting Extern Extract Extraction Fact Field Fields File Fixpoint Focus for From Function Functional Generalizable Global Goal Grab Grammar Graph Guarded Heap Hint HintDb Hints Hypotheses Hypothesis ident Identity If Immediate Implicit Import Include Inductive Infix Info Initial Inline Inspect Instance Instances Intro Intros Inversion Inversion_clear Language Left Lemma Let Libraries Library Load LoadPath Local Locate Ltac ML Mode Module Modules Monomorphic Morphism Next NoInline Notation Obligation Obligations Opaque Open Optimize Options Parameter Parameters Parametric Path Paths pattern Polymorphic Preterm Print Printing Program Projections Proof Proposition Pwd Qed Quit Rec Record Recursive Redirect Relation Remark Remove Require Reserved Reset Resolve Restart Rewrite Right Ring Rings Save Scheme Scope Scopes Script Search SearchAbout SearchHead SearchPattern SearchRewrite Section Separate Set Setoid Show Solve Sorted Step Strategies Strategy Structure SubClass Table Tables Tactic Term Test Theorem Time Timeout Transparent Type Typeclasses Types Undelimit Undo Unfocus Unfocused Unfold Universe Universes Unset Unshelve using Variable Variables Variant Verbose Visibility where with",built_in:"abstract absurd admit after apply as assert assumption at auto autorewrite autounfold before bottom btauto by case case_eq cbn cbv change classical_left classical_right clear clearbody cofix compare compute congruence constr_eq constructor contradict contradiction cut cutrewrite cycle decide decompose dependent destruct destruction dintuition discriminate discrR do double dtauto eapply eassumption eauto ecase econstructor edestruct ediscriminate eelim eexact eexists einduction einjection eleft elim elimtype enough equality erewrite eright esimplify_eq esplit evar exact exactly_once exfalso exists f_equal fail field field_simplify field_simplify_eq first firstorder fix fold fourier functional generalize generalizing gfail give_up has_evar hnf idtac in induction injection instantiate intro intro_pattern intros intuition inversion inversion_clear is_evar is_var lapply lazy left lia lra move native_compute nia nsatz omega once pattern pose progress proof psatz quote record red refine reflexivity remember rename repeat replace revert revgoals rewrite rewrite_strat right ring ring_simplify rtauto set setoid_reflexivity setoid_replace setoid_rewrite setoid_symmetry setoid_transitivity shelve shelve_unifiable simpl simple simplify_eq solve specialize split split_Rabs split_Rmult stepl stepr subst sum swap symmetry tactic tauto time timeout top transitivity trivial try tryif unfold unify until using vm_compute with"},c:[e.QSM,e.C("\\(\\*","\\*\\)"),e.CNM,{cN:"type",eB:!0,b:"\\|\\s*",e:"\\w+"},{b:/[-=]>/}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/cos.min.js b/vendor/assets/javascripts/highlightjs/languages/cos.min.js
index 266e69da04..ec64c6a902 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cos.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cos.min.js
@@ -1 +1 @@
-hljs.registerLanguage("cos",function(){"use strict";return function(e){return{name:"Caché Object Script",case_insensitive:!0,aliases:["cos","cls"],keywords:"property parameter class classmethod clientmethod extends as break catch close continue do d|0 else elseif for goto halt hang h|0 if job j|0 kill k|0 lock l|0 merge new open quit q|0 read r|0 return set s|0 tcommit throw trollback try tstart use view while write w|0 xecute x|0 zkill znspace zn ztrap zwrite zw zzdump zzwrite print zbreak zinsert zload zprint zremove zsave zzprint mv mvcall mvcrt mvdim mvprint zquit zsync ascii",contains:[{className:"number",begin:"\\b(\\d+(\\.\\d*)?|\\.\\d+)",relevance:0},{className:"string",variants:[{begin:'"',end:'"',contains:[{begin:'""',relevance:0}]}]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"comment",begin:/;/,end:"$",relevance:0},{className:"built_in",begin:/(?:\$\$?|\.\.)\^?[a-zA-Z]+/},{className:"built_in",begin:/\$\$\$[a-zA-Z]+/},{className:"built_in",begin:/%[a-z]+(?:\.[a-z]+)*/},{className:"symbol",begin:/\^%?[a-zA-Z][\w]*/},{className:"keyword",begin:/##class|##super|#define|#dim/},{begin:/&sql\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,subLanguage:"sql"},{begin:/&(js|jscript|javascript)</,end:/>/,excludeBegin:!0,excludeEnd:!0,subLanguage:"javascript"},{begin:/&html<\s*</,end:/>\s*>/,subLanguage:"xml"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("cos",function(e){return{cI:!0,aliases:["cos","cls"],k:"property parameter class classmethod clientmethod extends as break catch close continue do d|0 else elseif for goto halt hang h|0 if job j|0 kill k|0 lock l|0 merge new open quit q|0 read r|0 return set s|0 tcommit throw trollback try tstart use view while write w|0 xecute x|0 zkill znspace zn ztrap zwrite zw zzdump zzwrite print zbreak zinsert zload zprint zremove zsave zzprint mv mvcall mvcrt mvdim mvprint zquit zsync ascii",c:[{cN:"number",b:"\\b(\\d+(\\.\\d*)?|\\.\\d+)",relevance:0},{cN:"string",v:[{b:'"',e:'"',c:[{b:'""',relevance:0}]}]},e.CLCM,e.CBCM,{cN:"comment",b:/;/,e:"$",relevance:0},{cN:"built_in",b:/(?:\$\$?|\.\.)\^?[a-zA-Z]+/},{cN:"built_in",b:/\$\$\$[a-zA-Z]+/},{cN:"built_in",b:/%[a-z]+(?:\.[a-z]+)*/},{cN:"symbol",b:/\^%?[a-zA-Z][\w]*/},{cN:"keyword",b:/##class|##super|#define|#dim/},{b:/&sql\(/,e:/\)/,eB:!0,eE:!0,sL:"sql"},{b:/&(js|jscript|javascript)</,e:/>/,eB:!0,eE:!0,sL:"javascript"},{b:/&html<\s*</,e:/>\s*>/,sL:"xml"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/cpp.min.js b/vendor/assets/javascripts/highlightjs/languages/cpp.min.js
index 822dd02a9b..3bd3cd9cc3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cpp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cpp.min.js
@@ -1 +1 @@
-hljs.registerLanguage("cpp",function(){"use strict";return function(e){var t=e.getLanguage("c-like").rawDefinition();return t.disableAutodetect=!1,t.name="C++",t.aliases=["cc","c++","h++","hpp","hh","hxx","cxx"],t}}());
\ No newline at end of file
+hljs.registerLanguage("cpp",function(e){function t(e){return"(?:"+e+")?"}var r="decltype\\(auto\\)",a="[a-zA-Z_]\\w*::",i=(t(a),t("<.*?>"),{cN:"keyword",b:"\\b[a-z\\d_]*_t\\b"}),c={cN:"string",v:[{b:'(u8?|U|L)?"',e:'"',i:"\\n",c:[e.BE]},{b:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",e:"'",i:"."},{b:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\((?:.|\n)*?\)\1"/}]},s={cN:"number",v:[{b:"\\b(0b[01']+)"},{b:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{b:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},n={cN:"meta",b:/#\s*[a-z]+\b/,e:/$/,k:{"meta-keyword":"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"},c:[{b:/\\\n/,relevance:0},e.inherit(c,{cN:"meta-string"}),{cN:"meta-string",b:/<.*?>/,e:/$/,i:"\\n"},e.CLCM,e.CBCM]},o={cN:"title",b:t(a)+e.IR,relevance:0},l=t(a)+e.IR+"\\s*\\(",u={keyword:"int float while private char char8_t char16_t char32_t catch import module export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using asm case typeid wchar_tshort reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignas alignof constexpr consteval constinit decltype concept co_await co_return co_yield requires noexcept static_assert thread_local restrict final override atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return and and_eq bitand bitor compl not not_eq or or_eq xor xor_eq",built_in:"std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr abort terminate abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr _Bool complex _Complex imaginary _Imaginary",literal:"true false nullptr NULL"},p=[i,e.CLCM,e.CBCM,s,c],m={v:[{b:/=/,e:/;/},{b:/\(/,e:/\)/},{bK:"new throw return else",e:/;/}],k:u,c:p.concat([{b:/\(/,e:/\)/,k:u,c:p.concat(["self"]),relevance:0}]),relevance:0},d={cN:"function",b:"((decltype\\(auto\\)|(?:[a-zA-Z_]\\w*::)?[a-zA-Z_]\\w*(?:<.*?>)?)[\\*&\\s]+)+"+l,rB:!0,e:/[{;=]/,eE:!0,k:u,i:/[^\w\s\*&:<>]/,c:[{b:r,k:u,relevance:0},{b:l,rB:!0,c:[o],relevance:0},{cN:"params",b:/\(/,e:/\)/,k:u,relevance:0,c:[e.CLCM,e.CBCM,c,s,i,{b:/\(/,e:/\)/,k:u,relevance:0,c:["self",e.CLCM,e.CBCM,c,s,i]}]},i,e.CLCM,e.CBCM,n]};return{aliases:["c","cc","h","c++","h++","hpp","hh","hxx","cxx"],k:u,i:"</",c:[].concat(m,d,p,[n,{b:"\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",e:">",k:u,c:["self",i]},{b:e.IR+"::",k:u},{cN:"class",bK:"class struct",e:/[{;:]/,c:[{b:/</,e:/>/,c:["self"]},e.TM]}]),exports:{preprocessor:n,strings:c,k:u}}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/crmsh.min.js b/vendor/assets/javascripts/highlightjs/languages/crmsh.min.js
index a57859d4eb..82bb72f375 100644
--- a/vendor/assets/javascripts/highlightjs/languages/crmsh.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/crmsh.min.js
@@ -1 +1 @@
-hljs.registerLanguage("crmsh",function(){"use strict";return function(e){var t="group clone ms master location colocation order fencing_topology rsc_ticket acl_target acl_group user role tag xml";return{name:"crmsh",aliases:["crm","pcmk"],case_insensitive:!0,keywords:{keyword:"params meta operations op rule attributes utilization read write deny defined not_defined in_range date spec in ref reference attribute type xpath version and or lt gt tag lte gte eq ne \\ number string",literal:"Master Started Slave Stopped start promote demote stop monitor true false"},contains:[e.HASH_COMMENT_MODE,{beginKeywords:"node",starts:{end:"\\s*([\\w_-]+:)?",starts:{className:"title",end:"\\s*[\\$\\w_][\\w_-]*"}}},{beginKeywords:"primitive rsc_template",starts:{className:"title",end:"\\s*[\\$\\w_][\\w_-]*",starts:{end:"\\s*@?[\\w_][\\w_\\.:-]*"}}},{begin:"\\b("+t.split(" ").join("|")+")\\s+",keywords:t,starts:{className:"title",end:"[\\$\\w_][\\w_-]*"}},{beginKeywords:"property rsc_defaults op_defaults",starts:{className:"title",end:"\\s*([\\w_-]+:)?"}},e.QUOTE_STRING_MODE,{className:"meta",begin:"(ocf|systemd|service|lsb):[\\w_:-]+",relevance:0},{className:"number",begin:"\\b\\d+(\\.\\d+)?(ms|s|h|m)?",relevance:0},{className:"literal",begin:"[-]?(infinity|inf)",relevance:0},{className:"attr",begin:/([A-Za-z\$_\#][\w_-]+)=/,relevance:0},{className:"tag",begin:"</?",end:"/?>",relevance:0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("crmsh",function(e){var t="group clone ms master location colocation order fencing_topology rsc_ticket acl_target acl_group user role tag xml";return{aliases:["crm","pcmk"],cI:!0,k:{keyword:"params meta operations op rule attributes utilization read write deny defined not_defined in_range date spec in ref reference attribute type xpath version and or lt gt tag lte gte eq ne \\ number string",literal:"Master Started Slave Stopped start promote demote stop monitor true false"},c:[e.HCM,{bK:"node",starts:{e:"\\s*([\\w_-]+:)?",starts:{cN:"title",e:"\\s*[\\$\\w_][\\w_-]*"}}},{bK:"primitive rsc_template",starts:{cN:"title",e:"\\s*[\\$\\w_][\\w_-]*",starts:{e:"\\s*@?[\\w_][\\w_\\.:-]*"}}},{b:"\\b("+t.split(" ").join("|")+")\\s+",k:t,starts:{cN:"title",e:"[\\$\\w_][\\w_-]*"}},{bK:"property rsc_defaults op_defaults",starts:{cN:"title",e:"\\s*([\\w_-]+:)?"}},e.QSM,{cN:"meta",b:"(ocf|systemd|service|lsb):[\\w_:-]+",relevance:0},{cN:"number",b:"\\b\\d+(\\.\\d+)?(ms|s|h|m)?",relevance:0},{cN:"literal",b:"[-]?(infinity|inf)",relevance:0},{cN:"attr",b:/([A-Za-z\$_\#][\w_-]+)=/,relevance:0},{cN:"tag",b:"</?",e:"/?>",relevance:0}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/crystal.min.js b/vendor/assets/javascripts/highlightjs/languages/crystal.min.js
index 6979ccbe6e..71fc59ab69 100644
--- a/vendor/assets/javascripts/highlightjs/languages/crystal.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/crystal.min.js
@@ -1 +1 @@
-hljs.registerLanguage("crystal",function(){"use strict";return function(e){var n="(_*[ui](8|16|32|64|128))?",i="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|[=!]~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~|]|//|//=|&[-+*]=?|&\\*\\*|\\[\\][=?]?",a={$pattern:"[a-zA-Z_]\\w*[!?=]?",keyword:"abstract alias annotation as as? asm begin break case class def do else elsif end ensure enum extend for fun if include instance_sizeof is_a? lib macro module next nil? of out pointerof private protected rescue responds_to? return require select self sizeof struct super then type typeof union uninitialized unless until verbatim when while with yield __DIR__ __END_LINE__ __FILE__ __LINE__",literal:"false nil true"},s={className:"subst",begin:"#{",end:"}",keywords:a},t={className:"template-variable",variants:[{begin:"\\{\\{",end:"\\}\\}"},{begin:"\\{%",end:"%\\}"}],keywords:a};function r(e,n){var i=[{begin:e,end:n}];return i[0].contains=i,i}var c={className:"string",contains:[e.BACKSLASH_ESCAPE,s],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/`/,end:/`/},{begin:"%[Qwi]?\\(",end:"\\)",contains:r("\\(","\\)")},{begin:"%[Qwi]?\\[",end:"\\]",contains:r("\\[","\\]")},{begin:"%[Qwi]?{",end:"}",contains:r("{","}")},{begin:"%[Qwi]?<",end:">",contains:r("<",">")},{begin:"%[Qwi]?\\|",end:"\\|"},{begin:/<<-\w+$/,end:/^\s*\w+$/}],relevance:0},l={className:"string",variants:[{begin:"%q\\(",end:"\\)",contains:r("\\(","\\)")},{begin:"%q\\[",end:"\\]",contains:r("\\[","\\]")},{begin:"%q{",end:"}",contains:r("{","}")},{begin:"%q<",end:">",contains:r("<",">")},{begin:"%q\\|",end:"\\|"},{begin:/<<-'\w+'$/,end:/^\s*\w+$/}],relevance:0},b={begin:"(?!%})("+e.RE_STARTERS_RE+"|\\n|\\b(case|if|select|unless|until|when|while)\\b)\\s*",keywords:"case if select unless until when while",contains:[{className:"regexp",contains:[e.BACKSLASH_ESCAPE,s],variants:[{begin:"//[a-z]*",relevance:0},{begin:"/(?!\\/)",end:"/[a-z]*"}]}],relevance:0},o=[t,c,l,{className:"regexp",contains:[e.BACKSLASH_ESCAPE,s],variants:[{begin:"%r\\(",end:"\\)",contains:r("\\(","\\)")},{begin:"%r\\[",end:"\\]",contains:r("\\[","\\]")},{begin:"%r{",end:"}",contains:r("{","}")},{begin:"%r<",end:">",contains:r("<",">")},{begin:"%r\\|",end:"\\|"}],relevance:0},b,{className:"meta",begin:"@\\[",end:"\\]",contains:[e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"})]},e.HASH_COMMENT_MODE,{className:"class",beginKeywords:"class module struct",end:"$|;",illegal:/=/,contains:[e.HASH_COMMENT_MODE,e.inherit(e.TITLE_MODE,{begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{begin:"<"}]},{className:"class",beginKeywords:"lib enum union",end:"$|;",illegal:/=/,contains:[e.HASH_COMMENT_MODE,e.inherit(e.TITLE_MODE,{begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"})],relevance:10},{beginKeywords:"annotation",end:"$|;",illegal:/=/,contains:[e.HASH_COMMENT_MODE,e.inherit(e.TITLE_MODE,{begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"})],relevance:10},{className:"function",beginKeywords:"def",end:/\B\b/,contains:[e.inherit(e.TITLE_MODE,{begin:i,endsParent:!0})]},{className:"function",beginKeywords:"fun macro",end:/\B\b/,contains:[e.inherit(e.TITLE_MODE,{begin:i,endsParent:!0})],relevance:5},{className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"(\\!|\\?)?:",relevance:0},{className:"symbol",begin:":",contains:[c,{begin:i}],relevance:0},{className:"number",variants:[{begin:"\\b0b([01_]+)"+n},{begin:"\\b0o([0-7_]+)"+n},{begin:"\\b0x([A-Fa-f0-9_]+)"+n},{begin:"\\b([1-9][0-9_]*[0-9]|[0-9])(\\.[0-9][0-9_]*)?([eE]_*[-+]?[0-9_]*)?(_*f(32|64))?(?!_)"},{begin:"\\b([1-9][0-9_]*|0)"+n}],relevance:0}];return s.contains=o,t.contains=o.slice(1),{name:"Crystal",aliases:["cr"],keywords:a,contains:o}}}());
\ No newline at end of file
+hljs.registerLanguage("crystal",function(e){var c="(_*[ui](8|16|32|64|128))?",n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|[=!]~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~|]|//|//=|&[-+*]=?|&\\*\\*|\\[\\][=?]?",b="[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?",i={keyword:"abstract alias annotation as as? asm begin break case class def do else elsif end ensure enum extend for fun if include instance_sizeof is_a? lib macro module next nil? of out pointerof private protected rescue responds_to? return require select self sizeof struct super then type typeof union uninitialized unless until verbatim when while with yield __DIR__ __END_LINE__ __FILE__ __LINE__",literal:"false nil true"},r={cN:"subst",b:"#{",e:"}",k:i},a={cN:"template-variable",v:[{b:"\\{\\{",e:"\\}\\}"},{b:"\\{%",e:"%\\}"}],k:i};function s(e,c){var n=[{b:e,e:c}];return n[0].c=n}var t={cN:"string",c:[e.BE,r],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[Qwi]?\\(",e:"\\)",c:s("\\(","\\)")},{b:"%[Qwi]?\\[",e:"\\]",c:s("\\[","\\]")},{b:"%[Qwi]?{",e:"}",c:s("{","}")},{b:"%[Qwi]?<",e:">",c:s("<",">")},{b:"%[Qwi]?\\|",e:"\\|"},{b:/<<-\w+$/,e:/^\s*\w+$/}],relevance:0},l={cN:"string",v:[{b:"%q\\(",e:"\\)",c:s("\\(","\\)")},{b:"%q\\[",e:"\\]",c:s("\\[","\\]")},{b:"%q{",e:"}",c:s("{","}")},{b:"%q<",e:">",c:s("<",">")},{b:"%q\\|",e:"\\|"},{b:/<<-'\w+'$/,e:/^\s*\w+$/}],relevance:0},u={b:"(?!%})("+e.RSR+"|\\n|\\b(case|if|select|unless|until|when|while)\\b)\\s*",k:"case if select unless until when while",c:[{cN:"regexp",c:[e.BE,r],v:[{b:"//[a-z]*",relevance:0},{b:"/(?!\\/)",e:"/[a-z]*"}]}],relevance:0},_=[a,t,l,{cN:"regexp",c:[e.BE,r],v:[{b:"%r\\(",e:"\\)",c:s("\\(","\\)")},{b:"%r\\[",e:"\\]",c:s("\\[","\\]")},{b:"%r{",e:"}",c:s("{","}")},{b:"%r<",e:">",c:s("<",">")},{b:"%r\\|",e:"\\|"}],relevance:0},u,{cN:"meta",b:"@\\[",e:"\\]",c:[e.inherit(e.QSM,{cN:"meta-string"})]},e.HCM,{cN:"class",bK:"class module struct",e:"$|;",i:/=/,c:[e.HCM,e.inherit(e.TM,{b:b}),{b:"<"}]},{cN:"class",bK:"lib enum union",e:"$|;",i:/=/,c:[e.HCM,e.inherit(e.TM,{b:b})],relevance:10},{bK:"annotation",e:"$|;",i:/=/,c:[e.HCM,e.inherit(e.TM,{b:b})],relevance:10},{cN:"function",bK:"def",e:/\B\b/,c:[e.inherit(e.TM,{b:n,endsParent:!0})]},{cN:"function",bK:"fun macro",e:/\B\b/,c:[e.inherit(e.TM,{b:n,endsParent:!0})],relevance:5},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",relevance:0},{cN:"symbol",b:":",c:[t,{b:n}],relevance:0},{cN:"number",v:[{b:"\\b0b([01_]+)"+c},{b:"\\b0o([0-7_]+)"+c},{b:"\\b0x([A-Fa-f0-9_]+)"+c},{b:"\\b([1-9][0-9_]*[0-9]|[0-9])(\\.[0-9][0-9_]*)?([eE]_*[-+]?[0-9_]*)?(_*f(32|64))?(?!_)"},{b:"\\b([1-9][0-9_]*|0)"+c}],relevance:0}];return r.c=_,a.c=_.slice(1),{aliases:["cr"],l:"[a-zA-Z_]\\w*[!?=]?",k:i,c:_}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/cs.min.js b/vendor/assets/javascripts/highlightjs/languages/cs.min.js
index be1cbea0a5..f2253e5562 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cs.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cs.min.js
@@ -1 +1 @@
-hljs.registerLanguage("cs",function(e){var i={keyword:"abstract as base bool break byte case catch char checked const continue decimal default delegate do double enum event explicit extern finally fixed float for foreach goto if implicit in int interface internal is lock long nameof object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this try typeof uint ulong unchecked unsafe ushort using virtual void volatile while add alias ascending async await by descending dynamic equals from get global group into join let on orderby partial remove select set value var where yield",literal:"null false true"},r={cN:"number",v:[{b:"\\b(0b[01']+)"},{b:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{b:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],r:0},t={cN:"string",b:'@"',e:'"',c:[{b:'""'}]},a=e.inherit(t,{i:/\n/}),c={cN:"subst",b:"{",e:"}",k:i},n=e.inherit(c,{i:/\n/}),s={cN:"string",b:/\$"/,e:'"',i:/\n/,c:[{b:"{{"},{b:"}}"},e.BE,n]},b={cN:"string",b:/\$@"/,e:'"',c:[{b:"{{"},{b:"}}"},{b:'""'},c]},l=e.inherit(b,{i:/\n/,c:[{b:"{{"},{b:"}}"},{b:'""'},n]});c.c=[b,s,t,e.ASM,e.QSM,r,e.CBCM],n.c=[l,s,a,e.ASM,e.QSM,r,e.inherit(e.CBCM,{i:/\n/})];var o={v:[b,s,t,e.ASM,e.QSM]},d=e.IR+"(<"+e.IR+"(\\s*,\\s*"+e.IR+")*>)?(\\[\\])?";return{aliases:["csharp","c#"],k:i,i:/::/,c:[e.C("///","$",{rB:!0,c:[{cN:"doctag",v:[{b:"///",r:0},{b:"<!--|-->"},{b:"</?",e:">"}]}]}),e.CLCM,e.CBCM,{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum"}},o,r,{bK:"class interface",e:/[{;=]/,i:/[^\s:,]/,c:[e.TM,e.CLCM,e.CBCM]},{bK:"namespace",e:/[{;=]/,i:/[^\s:]/,c:[e.inherit(e.TM,{b:"[a-zA-Z](\\.?\\w)*"}),e.CLCM,e.CBCM]},{cN:"meta",b:"^\\s*\\[",eB:!0,e:"\\]",eE:!0,c:[{cN:"meta-string",b:/"/,e:/"/}]},{bK:"new return throw await else",r:0},{cN:"function",b:"("+d+"\\s+)+"+e.IR+"\\s*\\(",rB:!0,e:/\s*[{;=]/,eE:!0,k:i,c:[{b:e.IR+"\\s*\\(",rB:!0,c:[e.TM],r:0},{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:i,r:0,c:[o,r,e.CBCM]},e.CLCM,e.CBCM]}]}});
\ No newline at end of file
+hljs.registerLanguage("cs",function(e){var a={keyword:"abstract as base bool break byte case catch char checked const continue decimal default delegate do double enum event explicit extern finally fixed float for foreach goto if implicit in int interface internal is lock long object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this try typeof uint ulong unchecked unsafe ushort using virtual void volatile while add alias ascending async await by descending dynamic equals from get global group into join let nameof on orderby partial remove select set value var when where yield",literal:"null false true"},i={cN:"number",v:[{b:"\\b(0b[01']+)"},{b:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{b:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},c={cN:"string",b:'@"',e:'"',c:[{b:'""'}]},r=e.inherit(c,{i:/\n/}),n={cN:"subst",b:"{",e:"}",k:a},t=e.inherit(n,{i:/\n/}),s={cN:"string",b:/\$"/,e:'"',i:/\n/,c:[{b:"{{"},{b:"}}"},e.BE,t]},l={cN:"string",b:/\$@"/,e:'"',c:[{b:"{{"},{b:"}}"},{b:'""'},n]},b=e.inherit(l,{i:/\n/,c:[{b:"{{"},{b:"}}"},{b:'""'},t]});n.c=[l,s,c,e.ASM,e.QSM,i,e.CBCM],t.c=[b,s,r,e.ASM,e.QSM,i,e.inherit(e.CBCM,{i:/\n/})];var o={v:[l,s,c,e.ASM,e.QSM]},d=e.IR+"(<"+e.IR+"(\\s*,\\s*"+e.IR+")*>)?(\\[\\])?";return{aliases:["csharp","c#"],k:a,i:/::/,c:[e.C("///","$",{rB:!0,c:[{cN:"doctag",v:[{b:"///",relevance:0},{b:"\x3c!--|--\x3e"},{b:"</?",e:">"}]}]}),e.CLCM,e.CBCM,{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum"}},o,i,{bK:"class interface",e:/[{;=]/,i:/[^\s:,]/,c:[e.TM,e.CLCM,e.CBCM]},{bK:"namespace",e:/[{;=]/,i:/[^\s:]/,c:[e.inherit(e.TM,{b:"[a-zA-Z](\\.?\\w)*"}),e.CLCM,e.CBCM]},{cN:"meta",b:"^\\s*\\[",eB:!0,e:"\\]",eE:!0,c:[{cN:"meta-string",b:/"/,e:/"/}]},{bK:"new return throw await else",relevance:0},{cN:"function",b:"("+d+"\\s+)+"+e.IR+"\\s*\\(",rB:!0,e:/\s*[{;=]/,eE:!0,k:a,c:[{b:e.IR+"\\s*\\(",rB:!0,c:[e.TM],relevance:0},{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:a,relevance:0,c:[o,i,e.CBCM]},e.CLCM,e.CBCM]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/csp.min.js b/vendor/assets/javascripts/highlightjs/languages/csp.min.js
index 04ec297ea7..e9d12e05e8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/csp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/csp.min.js
@@ -1 +1 @@
-hljs.registerLanguage("csp",function(){"use strict";return function(e){return{name:"CSP",case_insensitive:!1,keywords:{$pattern:"[a-zA-Z][a-zA-Z0-9_-]*",keyword:"base-uri child-src connect-src default-src font-src form-action frame-ancestors frame-src img-src media-src object-src plugin-types report-uri sandbox script-src style-src"},contains:[{className:"string",begin:"'",end:"'"},{className:"attribute",begin:"^Content",end:":",excludeEnd:!0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("csp",function(r){return{cI:!1,l:"[a-zA-Z][a-zA-Z0-9_-]*",k:{keyword:"base-uri child-src connect-src default-src font-src form-action frame-ancestors frame-src img-src media-src object-src plugin-types report-uri sandbox script-src style-src"},c:[{cN:"string",b:"'",e:"'"},{cN:"attribute",b:"^Content",e:":",eE:!0}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/css.min.js b/vendor/assets/javascripts/highlightjs/languages/css.min.js
index 0e944b0cee..0de4bf8427 100644
--- a/vendor/assets/javascripts/highlightjs/languages/css.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/css.min.js
@@ -1 +1 @@
-hljs.registerLanguage("css",function(){"use strict";return function(e){var n={begin:/(?:[A-Z\_\.\-]+|--[a-zA-Z0-9_-]+)\s*:/,returnBegin:!0,end:";",endsWithParent:!0,contains:[{className:"attribute",begin:/\S/,end:":",excludeEnd:!0,starts:{endsWithParent:!0,excludeEnd:!0,contains:[{begin:/[\w-]+\(/,returnBegin:!0,contains:[{className:"built_in",begin:/[\w-]+/},{begin:/\(/,end:/\)/,contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE]}]},e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_BLOCK_COMMENT_MODE,{className:"number",begin:"#[0-9A-Fa-f]+"},{className:"meta",begin:"!important"}]}}]};return{name:"CSS",case_insensitive:!0,illegal:/[=\/|'\$]/,contains:[e.C_BLOCK_COMMENT_MODE,{className:"selector-id",begin:/#[A-Za-z0-9_-]+/},{className:"selector-class",begin:/\.[A-Za-z0-9_-]+/},{className:"selector-attr",begin:/\[/,end:/\]/,illegal:"$",contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},{className:"selector-pseudo",begin:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{begin:"@(page|font-face)",lexemes:"@[a-z-]+",keywords:"@page @font-face"},{begin:"@",end:"[{;]",illegal:/:/,returnBegin:!0,contains:[{className:"keyword",begin:/@\-?\w[\w]*(\-\w+)*/},{begin:/\s/,endsWithParent:!0,excludeEnd:!0,relevance:0,keywords:"and or not only",contains:[{begin:/[a-z-]+:/,className:"attribute"},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE]}]},{className:"selector-tag",begin:"[a-zA-Z-][a-zA-Z0-9_-]*",relevance:0},{begin:"{",end:"}",illegal:/\S/,contains:[e.C_BLOCK_COMMENT_MODE,n]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("css",function(e){var c={b:/(?:[A-Z\_\.\-]+|--[a-zA-Z0-9_-]+)\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{eW:!0,eE:!0,c:[{b:/[\w-]+\(/,rB:!0,c:[{cN:"built_in",b:/[\w-]+/},{b:/\(/,e:/\)/,c:[e.ASM,e.QSM,e.CSSNM]}]},e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"number",b:"#[0-9A-Fa-f]+"},{cN:"meta",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"selector-id",b:/#[A-Za-z0-9_-]+/},{cN:"selector-class",b:/\.[A-Za-z0-9_-]+/},{cN:"selector-attr",b:/\[/,e:/\]/,i:"$",c:[e.ASM,e.QSM]},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"@(page|font-face)",l:"@[a-z-]+",k:"@page @font-face"},{b:"@",e:"[{;]",i:/:/,rB:!0,c:[{cN:"keyword",b:/@\-?\w[\w]*(\-\w+)*/},{b:/\s/,eW:!0,eE:!0,relevance:0,k:"and or not only",c:[{b:/[a-z-]+:/,cN:"attribute"},e.ASM,e.QSM,e.CSSNM]}]},{cN:"selector-tag",b:"[a-zA-Z-][a-zA-Z0-9_-]*",relevance:0},{b:"{",e:"}",i:/\S/,c:[e.CBCM,c]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/d.min.js b/vendor/assets/javascripts/highlightjs/languages/d.min.js
index 633b0d7fae..342084f682 100644
--- a/vendor/assets/javascripts/highlightjs/languages/d.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/d.min.js
@@ -1 +1 @@
-hljs.registerLanguage("d",function(){"use strict";return function(e){var a={$pattern:e.UNDERSCORE_IDENT_RE,keyword:"abstract alias align asm assert auto body break byte case cast catch class const continue debug default delete deprecated do else enum export extern final finally for foreach foreach_reverse|10 goto if immutable import in inout int interface invariant is lazy macro mixin module new nothrow out override package pragma private protected public pure ref return scope shared static struct super switch synchronized template this throw try typedef typeid typeof union unittest version void volatile while with __FILE__ __LINE__ __gshared|10 __thread __traits __DATE__ __EOF__ __TIME__ __TIMESTAMP__ __VENDOR__ __VERSION__",built_in:"bool cdouble cent cfloat char creal dchar delegate double dstring float function idouble ifloat ireal long real short string ubyte ucent uint ulong ushort wchar wstring",literal:"false null true"},d="((0|[1-9][\\d_]*)|0[bB][01_]+|0[xX]([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))",n="\\\\(['\"\\?\\\\abfnrtv]|u[\\dA-Fa-f]{4}|[0-7]{1,3}|x[\\dA-Fa-f]{2}|U[\\dA-Fa-f]{8})|&[a-zA-Z\\d]{2,};",t={className:"number",begin:"\\b"+d+"(L|u|U|Lu|LU|uL|UL)?",relevance:0},_={className:"number",begin:"\\b(((0[xX](([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)\\.([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)|\\.?([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))[pP][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))|((0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(\\.\\d*|([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)))|\\d+\\.(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)|\\.(0|[1-9][\\d_]*)([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))?))([fF]|L|i|[fF]i|Li)?|"+d+"(i|[fF]i|Li))",relevance:0},r={className:"string",begin:"'("+n+"|.)",end:"'",illegal:"."},i={className:"string",begin:'"',contains:[{begin:n,relevance:0}],end:'"[cwd]?'},s=e.COMMENT("\\/\\+","\\+\\/",{contains:["self"],relevance:10});return{name:"D",keywords:a,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s,{className:"string",begin:'x"[\\da-fA-F\\s\\n\\r]*"[cwd]?',relevance:10},i,{className:"string",begin:'[rq]"',end:'"[cwd]?',relevance:5},{className:"string",begin:"`",end:"`[cwd]?"},{className:"string",begin:'q"\\{',end:'\\}"'},_,t,r,{className:"meta",begin:"^#!",end:"$",relevance:5},{className:"meta",begin:"#(line)",end:"$",relevance:5},{className:"keyword",begin:"@[a-zA-Z_][a-zA-Z_\\d]*"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("d",function(e){var a="(0|[1-9][\\d_]*)",d="("+a+"|0[bB][01_]+|0[xX]([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))",t="\\\\(['\"\\?\\\\abfnrtv]|u[\\dA-Fa-f]{4}|[0-7]{1,3}|x[\\dA-Fa-f]{2}|U[\\dA-Fa-f]{8})|&[a-zA-Z\\d]{2,};",_={cN:"number",b:"\\b"+d+"(L|u|U|Lu|LU|uL|UL)?",relevance:0},r={cN:"number",b:"\\b(((0[xX](([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)\\.([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)|\\.?([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))[pP][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))|((0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(\\.\\d*|([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)))|\\d+\\.(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)|\\.(0|[1-9][\\d_]*)([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))?))([fF]|L|i|[fF]i|Li)?|"+d+"(i|[fF]i|Li))",relevance:0},i={cN:"string",b:"'("+t+"|.)",e:"'",i:"."},n={cN:"string",b:'"',c:[{b:t,relevance:0}],e:'"[cwd]?'},c=e.C("\\/\\+","\\+\\/",{c:["self"],relevance:10});return{l:e.UIR,k:{keyword:"abstract alias align asm assert auto body break byte case cast catch class const continue debug default delete deprecated do else enum export extern final finally for foreach foreach_reverse|10 goto if immutable import in inout int interface invariant is lazy macro mixin module new nothrow out override package pragma private protected public pure ref return scope shared static struct super switch synchronized template this throw try typedef typeid typeof union unittest version void volatile while with __FILE__ __LINE__ __gshared|10 __thread __traits __DATE__ __EOF__ __TIME__ __TIMESTAMP__ __VENDOR__ __VERSION__",built_in:"bool cdouble cent cfloat char creal dchar delegate double dstring float function idouble ifloat ireal long real short string ubyte ucent uint ulong ushort wchar wstring",literal:"false null true"},c:[e.CLCM,e.CBCM,c,{cN:"string",b:'x"[\\da-fA-F\\s\\n\\r]*"[cwd]?',relevance:10},n,{cN:"string",b:'[rq]"',e:'"[cwd]?',relevance:5},{cN:"string",b:"`",e:"`[cwd]?"},{cN:"string",b:'q"\\{',e:'\\}"'},r,_,i,{cN:"meta",b:"^#!",e:"$",relevance:5},{cN:"meta",b:"#(line)",e:"$",relevance:5},{cN:"keyword",b:"@[a-zA-Z_][a-zA-Z_\\d]*"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/dart.min.js b/vendor/assets/javascripts/highlightjs/languages/dart.min.js
index fa3ee5d80b..5ac976e241 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dart.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dart.min.js
@@ -1 +1 @@
-hljs.registerLanguage("dart",function(){"use strict";return function(e){var n={className:"subst",variants:[{begin:"\\$[A-Za-z0-9_]+"}]},t={className:"subst",variants:[{begin:"\\${",end:"}"}],keywords:"true false null this is new super"},a={className:"string",variants:[{begin:"r'''",end:"'''"},{begin:'r"""',end:'"""'},{begin:"r'",end:"'",illegal:"\\n"},{begin:'r"',end:'"',illegal:"\\n"},{begin:"'''",end:"'''",contains:[e.BACKSLASH_ESCAPE,n,t]},{begin:'"""',end:'"""',contains:[e.BACKSLASH_ESCAPE,n,t]},{begin:"'",end:"'",illegal:"\\n",contains:[e.BACKSLASH_ESCAPE,n,t]},{begin:'"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE,n,t]}]};return t.contains=[e.C_NUMBER_MODE,a],{name:"Dart",keywords:{keyword:"abstract as assert async await break case catch class const continue covariant default deferred do dynamic else enum export extends extension external factory false final finally for Function get hide if implements import in inferface is late library mixin new null on operator part required rethrow return set show static super switch sync this throw true try typedef var void while with yield",built_in:"Comparable DateTime Duration Function Iterable Iterator List Map Match Never Null Object Pattern RegExp Set Stopwatch String StringBuffer StringSink Symbol Type Uri bool double dynamic int num print Element ElementList document querySelector querySelectorAll window"},contains:[a,e.COMMENT("/\\*\\*","\\*/",{subLanguage:"markdown",relevance:0}),e.COMMENT("///+\\s*","$",{contains:[{subLanguage:"markdown",begin:".",end:"$",relevance:0}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"class",beginKeywords:"class interface",end:"{",excludeEnd:!0,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},e.C_NUMBER_MODE,{className:"meta",begin:"@[A-Za-z]+"},{begin:"=>"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("dart",function(e){var t={cN:"subst",v:[{b:"\\$[A-Za-z0-9_]+"}]},r={cN:"subst",v:[{b:"\\${",e:"}"}],k:"true false null this is new super"},n={cN:"string",v:[{b:"r'''",e:"'''"},{b:'r"""',e:'"""'},{b:"r'",e:"'",i:"\\n"},{b:'r"',e:'"',i:"\\n"},{b:"'''",e:"'''",c:[e.BE,t,r]},{b:'"""',e:'"""',c:[e.BE,t,r]},{b:"'",e:"'",i:"\\n",c:[e.BE,t,r]},{b:'"',e:'"',i:"\\n",c:[e.BE,t,r]}]};r.c=[e.CNM,n];return{k:{keyword:"abstract as assert async await break case catch class const continue covariant default deferred do dynamic else enum export extends extension external factory false final finally for Function get hide if implements import in inferface is library mixin new null on operator part rethrow return set show static super switch sync this throw true try typedef var void while with yield",built_in:"Comparable DateTime Duration Function Iterable Iterator List Map Match Null Object Pattern RegExp Set Stopwatch String StringBuffer StringSink Symbol Type Uri bool double dynamic int num print Element ElementList document querySelector querySelectorAll window"},c:[n,e.C("/\\*\\*","\\*/",{sL:"markdown"}),e.C("///+\\s*","$",{c:[{sL:"markdown",b:".",e:"$"}]}),e.CLCM,e.CBCM,{cN:"class",bK:"class interface",e:"{",eE:!0,c:[{bK:"extends implements"},e.UTM]},e.CNM,{cN:"meta",b:"@[A-Za-z]+"},{b:"=>"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/delphi.min.js b/vendor/assets/javascripts/highlightjs/languages/delphi.min.js
index 6ea2a6f275..7cf4145524 100644
--- a/vendor/assets/javascripts/highlightjs/languages/delphi.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/delphi.min.js
@@ -1 +1 @@
-hljs.registerLanguage("delphi",function(){"use strict";return function(e){var r="exports register file shl array record property for mod while set ally label uses raise not stored class safecall var interface or private static exit index inherited to else stdcall override shr asm far resourcestring finalization packed virtual out and protected library do xorwrite goto near function end div overload object unit begin string on inline repeat until destructor write message program with read initialization except default nil if case cdecl in downto threadvar of try pascal const external constructor type public then implementation finally published procedure absolute reintroduce operator as is abstract alias assembler bitpacked break continue cppdecl cvar enumerator experimental platform deprecated unimplemented dynamic export far16 forward generic helper implements interrupt iochecks local name nodefault noreturn nostackframe oldfpccall otherwise saveregisters softfloat specialize strict unaligned varargs ",a=[e.C_LINE_COMMENT_MODE,e.COMMENT(/\{/,/\}/,{relevance:0}),e.COMMENT(/\(\*/,/\*\)/,{relevance:10})],n={className:"meta",variants:[{begin:/\{\$/,end:/\}/},{begin:/\(\*\$/,end:/\*\)/}]},t={className:"string",begin:/'/,end:/'/,contains:[{begin:/''/}]},i={className:"string",begin:/(#\d+)+/},s={begin:e.IDENT_RE+"\\s*=\\s*class\\s*\\(",returnBegin:!0,contains:[e.TITLE_MODE]},c={className:"function",beginKeywords:"function constructor destructor procedure",end:/[:;]/,keywords:"function constructor|10 destructor|10 procedure|10",contains:[e.TITLE_MODE,{className:"params",begin:/\(/,end:/\)/,keywords:r,contains:[t,i,n].concat(a)},n].concat(a)};return{name:"Delphi",aliases:["dpr","dfm","pas","pascal","freepascal","lazarus","lpr","lfm"],case_insensitive:!0,keywords:r,illegal:/"|\$[G-Zg-z]|\/\*|<\/|\|/,contains:[t,i,e.NUMBER_MODE,{className:"number",relevance:0,variants:[{begin:"\\$[0-9A-Fa-f]+"},{begin:"&[0-7]+"},{begin:"%[01]+"}]},s,c,n].concat(a)}}}());
\ No newline at end of file
+hljs.registerLanguage("delphi",function(e){var r="exports register file shl array record property for mod while set ally label uses raise not stored class safecall var interface or private static exit index inherited to else stdcall override shr asm far resourcestring finalization packed virtual out and protected library do xorwrite goto near function end div overload object unit begin string on inline repeat until destructor write message program with read initialization except default nil if case cdecl in downto threadvar of try pascal const external constructor type public then implementation finally published procedure absolute reintroduce operator as is abstract alias assembler bitpacked break continue cppdecl cvar enumerator experimental platform deprecated unimplemented dynamic export far16 forward generic helper implements interrupt iochecks local name nodefault noreturn nostackframe oldfpccall otherwise saveregisters softfloat specialize strict unaligned varargs ",t=[e.CLCM,e.C(/\{/,/\}/,{relevance:0}),e.C(/\(\*/,/\*\)/,{relevance:10})],a={cN:"meta",v:[{b:/\{\$/,e:/\}/},{b:/\(\*\$/,e:/\*\)/}]},c={cN:"string",b:/'/,e:/'/,c:[{b:/''/}]},i={cN:"string",b:/(#\d+)+/},n={b:e.IR+"\\s*=\\s*class\\s*\\(",rB:!0,c:[e.TM]},o={cN:"function",bK:"function constructor destructor procedure",e:/[:;]/,k:"function constructor|10 destructor|10 procedure|10",c:[e.TM,{cN:"params",b:/\(/,e:/\)/,k:r,c:[c,i,a].concat(t)},a].concat(t)};return{aliases:["dpr","dfm","pas","pascal","freepascal","lazarus","lpr","lfm"],cI:!0,k:r,i:/"|\$[G-Zg-z]|\/\*|<\/|\|/,c:[c,i,e.NM,n,o,a].concat(t)}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/diff.min.js b/vendor/assets/javascripts/highlightjs/languages/diff.min.js
index e0dcabc804..73e7f2268d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/diff.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/diff.min.js
@@ -1 +1 @@
-hljs.registerLanguage("diff",function(){"use strict";return function(e){return{name:"Diff",aliases:["patch"],contains:[{className:"meta",relevance:10,variants:[{begin:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{begin:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{begin:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{className:"comment",variants:[{begin:/Index: /,end:/$/},{begin:/={3,}/,end:/$/},{begin:/^\-{3}/,end:/$/},{begin:/^\*{3} /,end:/$/},{begin:/^\+{3}/,end:/$/},{begin:/^\*{15}$/}]},{className:"addition",begin:"^\\+",end:"$"},{className:"deletion",begin:"^\\-",end:"$"},{className:"addition",begin:"^\\!",end:"$"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("diff",function(e){return{aliases:["patch"],c:[{cN:"meta",relevance:10,v:[{b:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"comment",v:[{b:/Index: /,e:/$/},{b:/={3,}/,e:/$/},{b:/^\-{3}/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+{3}/,e:/$/},{b:/^\*{15}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"addition",b:"^\\!",e:"$"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/django.min.js b/vendor/assets/javascripts/highlightjs/languages/django.min.js
index 13036d19f0..6c26f70565 100644
--- a/vendor/assets/javascripts/highlightjs/languages/django.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/django.min.js
@@ -1 +1 @@
-hljs.registerLanguage("django",function(){"use strict";return function(e){var t={begin:/\|[A-Za-z]+:?/,keywords:{name:"truncatewords removetags linebreaksbr yesno get_digit timesince random striptags filesizeformat escape linebreaks length_is ljust rjust cut urlize fix_ampersands title floatformat capfirst pprint divisibleby add make_list unordered_list urlencode timeuntil urlizetrunc wordcount stringformat linenumbers slice date dictsort dictsortreversed default_if_none pluralize lower join center default truncatewords_html upper length phone2numeric wordwrap time addslashes slugify first escapejs force_escape iriencode last safe safeseq truncatechars localize unlocalize localtime utc timezone"},contains:[e.QUOTE_STRING_MODE,e.APOS_STRING_MODE]};return{name:"Django",aliases:["jinja"],case_insensitive:!0,subLanguage:"xml",contains:[e.COMMENT(/\{%\s*comment\s*%}/,/\{%\s*endcomment\s*%}/),e.COMMENT(/\{#/,/#}/),{className:"template-tag",begin:/\{%/,end:/%}/,contains:[{className:"name",begin:/\w+/,keywords:{name:"comment endcomment load templatetag ifchanged endifchanged if endif firstof for endfor ifnotequal endifnotequal widthratio extends include spaceless endspaceless regroup ifequal endifequal ssi now with cycle url filter endfilter debug block endblock else autoescape endautoescape csrf_token empty elif endwith static trans blocktrans endblocktrans get_static_prefix get_media_prefix plural get_current_language language get_available_languages get_current_language_bidi get_language_info get_language_info_list localize endlocalize localtime endlocaltime timezone endtimezone get_current_timezone verbatim"},starts:{endsWithParent:!0,keywords:"in by as",contains:[t],relevance:0}}]},{className:"template-variable",begin:/\{\{/,end:/}}/,contains:[t]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("django",function(e){var t={b:/\|[A-Za-z]+:?/,k:{name:"truncatewords removetags linebreaksbr yesno get_digit timesince random striptags filesizeformat escape linebreaks length_is ljust rjust cut urlize fix_ampersands title floatformat capfirst pprint divisibleby add make_list unordered_list urlencode timeuntil urlizetrunc wordcount stringformat linenumbers slice date dictsort dictsortreversed default_if_none pluralize lower join center default truncatewords_html upper length phone2numeric wordwrap time addslashes slugify first escapejs force_escape iriencode last safe safeseq truncatechars localize unlocalize localtime utc timezone"},c:[e.QSM,e.ASM]};return{aliases:["jinja"],cI:!0,sL:"xml",c:[e.C(/\{%\s*comment\s*%}/,/\{%\s*endcomment\s*%}/),e.C(/\{#/,/#}/),{cN:"template-tag",b:/\{%/,e:/%}/,c:[{cN:"name",b:/\w+/,k:{name:"comment endcomment load templatetag ifchanged endifchanged if endif firstof for endfor ifnotequal endifnotequal widthratio extends include spaceless endspaceless regroup ifequal endifequal ssi now with cycle url filter endfilter debug block endblock else autoescape endautoescape csrf_token empty elif endwith static trans blocktrans endblocktrans get_static_prefix get_media_prefix plural get_current_language language get_available_languages get_current_language_bidi get_language_info get_language_info_list localize endlocalize localtime endlocaltime timezone endtimezone get_current_timezone verbatim"},starts:{eW:!0,k:"in by as",c:[t],relevance:0}}]},{cN:"template-variable",b:/\{\{/,e:/}}/,c:[t]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/dns.min.js b/vendor/assets/javascripts/highlightjs/languages/dns.min.js
index f9f29359a1..c5405b51c0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dns.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dns.min.js
@@ -1 +1 @@
-hljs.registerLanguage("dns",function(){"use strict";return function(d){return{name:"DNS Zone",aliases:["bind","zone"],keywords:{keyword:"IN A AAAA AFSDB APL CAA CDNSKEY CDS CERT CNAME DHCID DLV DNAME DNSKEY DS HIP IPSECKEY KEY KX LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM PTR RRSIG RP SIG SOA SRV SSHFP TA TKEY TLSA TSIG TXT"},contains:[d.COMMENT(";","$",{relevance:0}),{className:"meta",begin:/^\$(TTL|GENERATE|INCLUDE|ORIGIN)\b/},{className:"number",begin:"((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))\\b"},{className:"number",begin:"((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\b"},d.inherit(d.NUMBER_MODE,{begin:/\b\d+[dhwm]?/})]}}}());
\ No newline at end of file
+hljs.registerLanguage("dns",function(d){return{aliases:["bind","zone"],k:{keyword:"IN A AAAA AFSDB APL CAA CDNSKEY CDS CERT CNAME DHCID DLV DNAME DNSKEY DS HIP IPSECKEY KEY KX LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM PTR RRSIG RP SIG SOA SRV SSHFP TA TKEY TLSA TSIG TXT"},c:[d.C(";","$",{relevance:0}),{cN:"meta",b:/^\$(TTL|GENERATE|INCLUDE|ORIGIN)\b/},{cN:"number",b:"((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))\\b"},{cN:"number",b:"((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\b"},d.inherit(d.NM,{b:/\b\d+[dhwm]?/})]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/dockerfile.min.js b/vendor/assets/javascripts/highlightjs/languages/dockerfile.min.js
index 2bb92c9b3c..b266b029ce 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dockerfile.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dockerfile.min.js
@@ -1 +1 @@
-hljs.registerLanguage("dockerfile",function(){"use strict";return function(e){return{name:"Dockerfile",aliases:["docker"],case_insensitive:!0,keywords:"from maintainer expose env arg user onbuild stopsignal",contains:[e.HASH_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.NUMBER_MODE,{beginKeywords:"run cmd entrypoint volume add copy workdir label healthcheck shell",starts:{end:/[^\\]$/,subLanguage:"bash"}}],illegal:"</"}}}());
\ No newline at end of file
+hljs.registerLanguage("dockerfile",function(e){return{aliases:["docker"],cI:!0,k:"from maintainer expose env arg user onbuild stopsignal",c:[e.HCM,e.ASM,e.QSM,e.NM,{bK:"run cmd entrypoint volume add copy workdir label healthcheck shell",starts:{e:/[^\\]$/,sL:"bash"}}],i:"</"}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/dos.min.js b/vendor/assets/javascripts/highlightjs/languages/dos.min.js
index 5b17c1536e..4bd8b93968 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dos.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dos.min.js
@@ -1 +1 @@
-hljs.registerLanguage("dos",function(){"use strict";return function(e){var t=e.COMMENT(/^\s*@?rem\b/,/$/,{relevance:10});return{name:"Batch file (DOS)",aliases:["bat","cmd"],case_insensitive:!0,illegal:/\/\*/,keywords:{keyword:"if else goto for in do call exit not exist errorlevel defined equ neq lss leq gtr geq",built_in:"prn nul lpt3 lpt2 lpt1 con com4 com3 com2 com1 aux shift cd dir echo setlocal endlocal set pause copy append assoc at attrib break cacls cd chcp chdir chkdsk chkntfs cls cmd color comp compact convert date dir diskcomp diskcopy doskey erase fs find findstr format ftype graftabl help keyb label md mkdir mode more move path pause print popd pushd promt rd recover rem rename replace restore rmdir shift sort start subst time title tree type ver verify vol ping net ipconfig taskkill xcopy ren del"},contains:[{className:"variable",begin:/%%[^ ]|%[^ ]+?%|![^ ]+?!/},{className:"function",begin:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)",end:"goto:eof",contains:[e.inherit(e.TITLE_MODE,{begin:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),t]},{className:"number",begin:"\\b\\d+",relevance:0},t]}}}());
\ No newline at end of file
+hljs.registerLanguage("dos",function(e){var r=e.C(/^\s*@?rem\b/,/$/,{relevance:10});return{aliases:["bat","cmd"],cI:!0,i:/\/\*/,k:{keyword:"if else goto for in do call exit not exist errorlevel defined equ neq lss leq gtr geq",built_in:"prn nul lpt3 lpt2 lpt1 con com4 com3 com2 com1 aux shift cd dir echo setlocal endlocal set pause copy append assoc at attrib break cacls cd chcp chdir chkdsk chkntfs cls cmd color comp compact convert date dir diskcomp diskcopy doskey erase fs find findstr format ftype graftabl help keyb label md mkdir mode more move path pause print popd pushd promt rd recover rem rename replace restore rmdir shiftsort start subst time title tree type ver verify vol ping net ipconfig taskkill xcopy ren del"},c:[{cN:"variable",b:/%%[^ ]|%[^ ]+?%|![^ ]+?!/},{cN:"function",b:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)",e:"goto:eof",c:[e.inherit(e.TM,{b:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),r]},{cN:"number",b:"\\b\\d+",relevance:0},r]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/dsconfig.min.js b/vendor/assets/javascripts/highlightjs/languages/dsconfig.min.js
index 625e2491ee..9a736f2270 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dsconfig.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dsconfig.min.js
@@ -1 +1 @@
-hljs.registerLanguage("dsconfig",function(){"use strict";return function(e){return{keywords:"dsconfig",contains:[{className:"keyword",begin:"^dsconfig",end:"\\s",excludeEnd:!0,relevance:10},{className:"built_in",begin:"(list|create|get|set|delete)-(\\w+)",end:"\\s",excludeEnd:!0,illegal:"!@#$%^&*()",relevance:10},{className:"built_in",begin:"--(\\w+)",end:"\\s",excludeEnd:!0},{className:"string",begin:/"/,end:/"/},{className:"string",begin:/'/,end:/'/},{className:"string",begin:"[\\w-?]+:\\w+",end:"\\W",relevance:0},{className:"string",begin:"\\w+-?\\w+",end:"\\W",relevance:0},e.HASH_COMMENT_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("dsconfig",function(e){return{k:"dsconfig",c:[{cN:"keyword",b:"^dsconfig",e:"\\s",eE:!0,relevance:10},{cN:"built_in",b:"(list|create|get|set|delete)-(\\w+)",e:"\\s",eE:!0,i:"!@#$%^&*()",relevance:10},{cN:"built_in",b:"--(\\w+)",e:"\\s",eE:!0},{cN:"string",b:/"/,e:/"/},{cN:"string",b:/'/,e:/'/},{cN:"string",b:"[\\w-?]+:\\w+",e:"\\W",relevance:0},{cN:"string",b:"\\w+-?\\w+",e:"\\W",relevance:0},e.HCM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/dts.min.js b/vendor/assets/javascripts/highlightjs/languages/dts.min.js
index 99ade5e8f2..beba01a264 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dts.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dts.min.js
@@ -1 +1 @@
-hljs.registerLanguage("dts",function(){"use strict";return function(e){var n={className:"string",variants:[e.inherit(e.QUOTE_STRING_MODE,{begin:'((u8?|U)|L)?"'}),{begin:'(u8?|U)?R"',end:'"',contains:[e.BACKSLASH_ESCAPE]},{begin:"'\\\\?.",end:"'",illegal:"."}]},a={className:"number",variants:[{begin:"\\b(\\d+(\\.\\d*)?|\\.\\d+)(u|U|l|L|ul|UL|f|F)"},{begin:e.C_NUMBER_RE}],relevance:0},s={className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"if else elif endif define undef ifdef ifndef"},contains:[{begin:/\\\n/,relevance:0},{beginKeywords:"include",end:"$",keywords:{"meta-keyword":"include"},contains:[e.inherit(n,{className:"meta-string"}),{className:"meta-string",begin:"<",end:">",illegal:"\\n"}]},n,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},i={className:"variable",begin:"\\&[a-z\\d_]*\\b"},d={className:"meta-keyword",begin:"/[a-z][a-z\\d-]*/"},l={className:"symbol",begin:"^\\s*[a-zA-Z_][a-zA-Z\\d_]*:"},r={className:"params",begin:"<",end:">",contains:[a,i]},c={className:"class",begin:/[a-zA-Z_][a-zA-Z\d_@]*\s{/,end:/[{;=]/,returnBegin:!0,excludeEnd:!0};return{name:"Device Tree",keywords:"",contains:[{className:"class",begin:"/\\s*{",end:"};",relevance:10,contains:[i,d,l,c,r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,n]},i,d,l,c,r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,n,s,{begin:e.IDENT_RE+"::",keywords:""}]}}}());
\ No newline at end of file
+hljs.registerLanguage("dts",function(e){var a={cN:"string",v:[e.inherit(e.QSM,{b:'((u8?|U)|L)?"'}),{b:'(u8?|U)?R"',e:'"',c:[e.BE]},{b:"'\\\\?.",e:"'",i:"."}]},c={cN:"number",v:[{b:"\\b(\\d+(\\.\\d*)?|\\.\\d+)(u|U|l|L|ul|UL|f|F)"},{b:e.CNR}],relevance:0},b={cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elif endif define undef ifdef ifndef"},c:[{b:/\\\n/,relevance:0},{bK:"include",e:"$",k:{"meta-keyword":"include"},c:[e.inherit(a,{cN:"meta-string"}),{cN:"meta-string",b:"<",e:">",i:"\\n"}]},a,e.CLCM,e.CBCM]},n={cN:"variable",b:"\\&[a-z\\d_]*\\b"},i={cN:"meta-keyword",b:"/[a-z][a-z\\d-]*/"},r={cN:"symbol",b:"^\\s*[a-zA-Z_][a-zA-Z\\d_]*:"},d={cN:"params",b:"<",e:">",c:[c,n]},s={cN:"class",b:/[a-zA-Z_][a-zA-Z\d_@]*\s{/,e:/[{;=]/,rB:!0,eE:!0};return{k:"",c:[{cN:"class",b:"/\\s*{",e:"};",relevance:10,c:[n,i,r,s,d,e.CLCM,e.CBCM,c,a]},n,i,r,s,d,e.CLCM,e.CBCM,c,a,b,{b:e.IR+"::",k:""}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/dust.min.js b/vendor/assets/javascripts/highlightjs/languages/dust.min.js
index 57896b00ce..fe13573248 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dust.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dust.min.js
@@ -1 +1 @@
-hljs.registerLanguage("dust",function(){"use strict";return function(e){return{name:"Dust",aliases:["dst"],case_insensitive:!0,subLanguage:"xml",contains:[{className:"template-tag",begin:/\{[#\/]/,end:/\}/,illegal:/;/,contains:[{className:"name",begin:/[a-zA-Z\.-]+/,starts:{endsWithParent:!0,relevance:0,contains:[e.QUOTE_STRING_MODE]}}]},{className:"template-variable",begin:/\{/,end:/\}/,illegal:/;/,keywords:"if eq ne lt lte gt gte select default math sep"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("dust",function(e){return{aliases:["dst"],cI:!0,sL:"xml",c:[{cN:"template-tag",b:/\{[#\/]/,e:/\}/,i:/;/,c:[{cN:"name",b:/[a-zA-Z\.-]+/,starts:{eW:!0,relevance:0,c:[e.QSM]}}]},{cN:"template-variable",b:/\{/,e:/\}/,i:/;/,k:"if eq ne lt lte gt gte select default math sep"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ebnf.min.js b/vendor/assets/javascripts/highlightjs/languages/ebnf.min.js
index 2610d604f1..7c22492859 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ebnf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ebnf.min.js
@@ -1 +1 @@
-hljs.registerLanguage("ebnf",function(){"use strict";return function(a){var e=a.COMMENT(/\(\*/,/\*\)/);return{name:"Extended Backus-Naur Form",illegal:/\S/,contains:[e,{className:"attribute",begin:/^[ ]*[a-zA-Z][a-zA-Z-_]*([\s-_]+[a-zA-Z][a-zA-Z]*)*/},{begin:/=/,end:/[.;]/,contains:[e,{className:"meta",begin:/\?.*\?/},{className:"string",variants:[a.APOS_STRING_MODE,a.QUOTE_STRING_MODE,{begin:"`",end:"`"}]}]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("ebnf",function(a){var e=a.C(/\(\*/,/\*\)/);return{i:/\S/,c:[e,{cN:"attribute",b:/^[ ]*[a-zA-Z][a-zA-Z-_]*([\s-_]+[a-zA-Z][a-zA-Z]*)*/},{b:/=/,e:/[.;]/,c:[e,{cN:"meta",b:/\?.*\?/},{cN:"string",v:[a.ASM,a.QSM,{b:"`",e:"`"}]}]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/elixir.min.js b/vendor/assets/javascripts/highlightjs/languages/elixir.min.js
index a4ad84d10e..7ad445c6fe 100644
--- a/vendor/assets/javascripts/highlightjs/languages/elixir.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/elixir.min.js
@@ -1 +1 @@
-hljs.registerLanguage("elixir",function(){"use strict";return function(e){var n="[a-zA-Z_][a-zA-Z0-9_.]*(\\!|\\?)?",i={$pattern:n,keyword:"and false then defined module in return redo retry end for true self when next until do begin unless nil break not case cond alias while ensure or include use alias fn quote require import with|0"},a={className:"subst",begin:"#\\{",end:"}",keywords:i},s={className:"number",begin:"(\\b0o[0-7_]+)|(\\b0b[01_]+)|(\\b0x[0-9a-fA-F_]+)|(-?\\b[1-9][0-9_]*(.[0-9_]+([eE][-+]?[0-9]+)?)?)",relevance:0},b={className:"string",begin:"~[a-z](?=[/|([{<\"'])",contains:[{endsParent:!0,contains:[{contains:[e.BACKSLASH_ESCAPE,a],variants:[{begin:/"/,end:/"/},{begin:/'/,end:/'/},{begin:/\//,end:/\//},{begin:/\|/,end:/\|/},{begin:/\(/,end:/\)/},{begin:/\[/,end:/\]/},{begin:/\{/,end:/\}/},{begin:/</,end:/>/}]}]}]},d={className:"string",contains:[e.BACKSLASH_ESCAPE,a],variants:[{begin:/"""/,end:/"""/},{begin:/'''/,end:/'''/},{begin:/~S"""/,end:/"""/,contains:[]},{begin:/~S"/,end:/"/,contains:[]},{begin:/~S'''/,end:/'''/,contains:[]},{begin:/~S'/,end:/'/,contains:[]},{begin:/'/,end:/'/},{begin:/"/,end:/"/}]},r={className:"function",beginKeywords:"def defp defmacro",end:/\B\b/,contains:[e.inherit(e.TITLE_MODE,{begin:n,endsParent:!0})]},g=e.inherit(r,{className:"class",beginKeywords:"defimpl defmodule defprotocol defrecord",end:/\bdo\b|$|;/}),t=[d,{className:"string",begin:"~[A-Z](?=[/|([{<\"'])",contains:[{begin:/"/,end:/"/},{begin:/'/,end:/'/},{begin:/\//,end:/\//},{begin:/\|/,end:/\|/},{begin:/\(/,end:/\)/},{begin:/\[/,end:/\]/},{begin:/\{/,end:/\}/},{begin:/\</,end:/\>/}]},b,e.HASH_COMMENT_MODE,g,r,{begin:"::"},{className:"symbol",begin:":(?![\\s:])",contains:[d,{begin:"[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?"}],relevance:0},{className:"symbol",begin:n+":(?!:)",relevance:0},s,{className:"variable",begin:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{begin:"->"},{begin:"("+e.RE_STARTERS_RE+")\\s*",contains:[e.HASH_COMMENT_MODE,{begin:/\/: (?=\d+\s*[,\]])/,relevance:0,contains:[s]},{className:"regexp",illegal:"\\n",contains:[e.BACKSLASH_ESCAPE,a],variants:[{begin:"/",end:"/[a-z]*"},{begin:"%r\\[",end:"\\][a-z]*"}]}],relevance:0}];return a.contains=t,{name:"Elixir",keywords:i,contains:t}}}());
\ No newline at end of file
+hljs.registerLanguage("elixir",function(e){var b="[a-zA-Z_][a-zA-Z0-9_.]*(\\!|\\?)?",c="and false then defined module in return redo retry end for true self when next until do begin unless nil break not case cond alias while ensure or include use alias fn quote require import with|0",n={cN:"subst",b:"#\\{",e:"}",l:b,k:c},r="[/|([{<\"']",a={cN:"string",b:"~[a-z](?="+r+")",c:[{endsParent:!0,c:[{c:[e.BE,n],v:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/\//,e:/\//},{b:/\|/,e:/\|/},{b:/\(/,e:/\)/},{b:/\[/,e:/\]/},{b:/\{/,e:/\}/},{b:/</,e:/>/}]}]}]},i={cN:"string",b:"~[A-Z](?="+r+")",c:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/\//,e:/\//},{b:/\|/,e:/\|/},{b:/\(/,e:/\)/},{b:/\[/,e:/\]/},{b:/\{/,e:/\}/},{b:/\</,e:/\>/}]},l={cN:"string",c:[e.BE,n],v:[{b:/"""/,e:/"""/},{b:/'''/,e:/'''/},{b:/~S"""/,e:/"""/,c:[]},{b:/~S"/,e:/"/,c:[]},{b:/~S'''/,e:/'''/,c:[]},{b:/~S'/,e:/'/,c:[]},{b:/'/,e:/'/},{b:/"/,e:/"/}]},s={cN:"function",bK:"def defp defmacro",e:/\B\b/,c:[e.inherit(e.TM,{b:b,endsParent:!0})]},t=e.inherit(s,{cN:"class",bK:"defimpl defmodule defprotocol defrecord",e:/\bdo\b|$|;/}),d=[l,i,a,e.HCM,t,s,{b:"::"},{cN:"symbol",b:":(?![\\s:])",c:[l,{b:"[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?"}],relevance:0},{cN:"symbol",b:b+":(?!:)",relevance:0},{cN:"number",b:"(\\b0o[0-7_]+)|(\\b0b[01_]+)|(\\b0x[0-9a-fA-F_]+)|(-?\\b[1-9][0-9_]*(.[0-9_]+([eE][-+]?[0-9]+)?)?)",relevance:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"->"},{b:"("+e.RSR+")\\s*",c:[e.HCM,{cN:"regexp",i:"\\n",c:[e.BE,n],v:[{b:"/",e:"/[a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}],relevance:0}];return{l:b,k:c,c:n.c=d}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/elm.min.js b/vendor/assets/javascripts/highlightjs/languages/elm.min.js
index 61eeb765c6..2e9c928940 100644
--- a/vendor/assets/javascripts/highlightjs/languages/elm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/elm.min.js
@@ -1 +1 @@
-hljs.registerLanguage("elm",function(){"use strict";return function(e){var n={variants:[e.COMMENT("--","$"),e.COMMENT("{-","-}",{contains:["self"]})]},i={className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},s={begin:"\\(",end:"\\)",illegal:'"',contains:[{className:"type",begin:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},n]};return{name:"Elm",keywords:"let in if then else case of where module import exposing type alias as infix infixl infixr port effect command subscription",contains:[{beginKeywords:"port effect module",end:"exposing",keywords:"port effect module where command subscription exposing",contains:[s,n],illegal:"\\W\\.|;"},{begin:"import",end:"$",keywords:"import as exposing",contains:[s,n],illegal:"\\W\\.|;"},{begin:"type",end:"$",keywords:"type alias",contains:[i,s,{begin:"{",end:"}",contains:s.contains},n]},{beginKeywords:"infix infixl infixr",end:"$",contains:[e.C_NUMBER_MODE,n]},{begin:"port",end:"$",keywords:"port",contains:[n]},{className:"string",begin:"'\\\\?.",end:"'",illegal:"."},e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,i,e.inherit(e.TITLE_MODE,{begin:"^[_a-z][\\w']*"}),n,{begin:"->|<-"}],illegal:/;/}}}());
\ No newline at end of file
+hljs.registerLanguage("elm",function(e){var i={v:[e.C("--","$"),e.C("{-","-}",{c:["self"]})]},t={cN:"type",b:"\\b[A-Z][\\w']*",relevance:0},c={b:"\\(",e:"\\)",i:'"',c:[{cN:"type",b:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},i]};return{k:"let in if then else case of where module import exposing type alias as infix infixl infixr port effect command subscription",c:[{bK:"port effect module",e:"exposing",k:"port effect module where command subscription exposing",c:[c,i],i:"\\W\\.|;"},{b:"import",e:"$",k:"import as exposing",c:[c,i],i:"\\W\\.|;"},{b:"type",e:"$",k:"type alias",c:[t,c,{b:"{",e:"}",c:c.c},i]},{bK:"infix infixl infixr",e:"$",c:[e.CNM,i]},{b:"port",e:"$",k:"port",c:[i]},{cN:"string",b:"'\\\\?.",e:"'",i:"."},e.QSM,e.CNM,t,e.inherit(e.TM,{b:"^[_a-z][\\w']*"}),i,{b:"->|<-"}],i:/;/}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/erb.min.js b/vendor/assets/javascripts/highlightjs/languages/erb.min.js
index f6f09f120a..a77c7a2734 100644
--- a/vendor/assets/javascripts/highlightjs/languages/erb.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/erb.min.js
@@ -1 +1 @@
-hljs.registerLanguage("erb",function(){"use strict";return function(e){return{name:"ERB",subLanguage:"xml",contains:[e.COMMENT("<%#","%>"),{begin:"<%[%=-]?",end:"[%-]?%>",subLanguage:"ruby",excludeBegin:!0,excludeEnd:!0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("erb",function(e){return{sL:"xml",c:[e.C("<%#","%>"),{b:"<%[%=-]?",e:"[%-]?%>",sL:"ruby",eB:!0,eE:!0}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/erlang-repl.min.js b/vendor/assets/javascripts/highlightjs/languages/erlang-repl.min.js
index 0289bf52e3..b91232e6bb 100644
--- a/vendor/assets/javascripts/highlightjs/languages/erlang-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/erlang-repl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("erlang-repl",function(){"use strict";return function(e){return{name:"Erlang REPL",keywords:{built_in:"spawn spawn_link self",keyword:"after and andalso|10 band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse|10 query receive rem try when xor"},contains:[{className:"meta",begin:"^[0-9]+> ",relevance:10},e.COMMENT("%","$"),{className:"number",begin:"\\b(\\d+(_\\d+)*#[a-fA-F0-9]+(_[a-fA-F0-9]+)*|\\d+(_\\d+)*(\\.\\d+(_\\d+)*)?([eE][-+]?\\d+)?)",relevance:0},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{begin:"\\?(::)?([A-Z]\\w*(::)?)+"},{begin:"->"},{begin:"ok"},{begin:"!"},{begin:"(\\b[a-z'][a-zA-Z0-9_']*:[a-z'][a-zA-Z0-9_']*)|(\\b[a-z'][a-zA-Z0-9_']*)",relevance:0},{begin:"[A-Z][a-zA-Z0-9_']*",relevance:0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("erlang-repl",function(e){return{k:{built_in:"spawn spawn_link self",keyword:"after and andalso|10 band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse|10 query receive rem try when xor"},c:[{cN:"meta",b:"^[0-9]+> ",relevance:10},e.C("%","$"),{cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",relevance:0},e.ASM,e.QSM,{b:"\\?(::)?([A-Z]\\w*(::)?)+"},{b:"->"},{b:"ok"},{b:"!"},{b:"(\\b[a-z'][a-zA-Z0-9_']*:[a-z'][a-zA-Z0-9_']*)|(\\b[a-z'][a-zA-Z0-9_']*)",relevance:0},{b:"[A-Z][a-zA-Z0-9_']*",relevance:0}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/erlang.min.js b/vendor/assets/javascripts/highlightjs/languages/erlang.min.js
index 3ab6a9cb8a..0de38e2737 100644
--- a/vendor/assets/javascripts/highlightjs/languages/erlang.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/erlang.min.js
@@ -1 +1 @@
-hljs.registerLanguage("erlang",function(){"use strict";return function(e){var n="[a-z'][a-zA-Z0-9_']*",r="("+n+":"+n+"|"+n+")",a={keyword:"after and andalso|10 band begin bnot bor bsl bzr bxor case catch cond div end fun if let not of orelse|10 query receive rem try when xor",literal:"false true"},i=e.COMMENT("%","$"),c={className:"number",begin:"\\b(\\d+(_\\d+)*#[a-fA-F0-9]+(_[a-fA-F0-9]+)*|\\d+(_\\d+)*(\\.\\d+(_\\d+)*)?([eE][-+]?\\d+)?)",relevance:0},s={begin:"fun\\s+"+n+"/\\d+"},t={begin:r+"\\(",end:"\\)",returnBegin:!0,relevance:0,contains:[{begin:r,relevance:0},{begin:"\\(",end:"\\)",endsWithParent:!0,returnEnd:!0,relevance:0}]},d={begin:"{",end:"}",relevance:0},o={begin:"\\b_([A-Z][A-Za-z0-9_]*)?",relevance:0},l={begin:"[A-Z][a-zA-Z0-9_]*",relevance:0},b={begin:"#"+e.UNDERSCORE_IDENT_RE,relevance:0,returnBegin:!0,contains:[{begin:"#"+e.UNDERSCORE_IDENT_RE,relevance:0},{begin:"{",end:"}",relevance:0}]},g={beginKeywords:"fun receive if try case",end:"end",keywords:a};g.contains=[i,s,e.inherit(e.APOS_STRING_MODE,{className:""}),g,t,e.QUOTE_STRING_MODE,c,d,o,l,b];var u=[i,s,g,t,e.QUOTE_STRING_MODE,c,d,o,l,b];t.contains[1].contains=u,d.contains=u,b.contains[1].contains=u;var E={className:"params",begin:"\\(",end:"\\)",contains:u};return{name:"Erlang",aliases:["erl"],keywords:a,illegal:"(</|\\*=|\\+=|-=|/\\*|\\*/|\\(\\*|\\*\\))",contains:[{className:"function",begin:"^"+n+"\\s*\\(",end:"->",returnBegin:!0,illegal:"\\(|#|//|/\\*|\\\\|:|;",contains:[E,e.inherit(e.TITLE_MODE,{begin:n})],starts:{end:";|\\.",keywords:a,contains:u}},i,{begin:"^-",end:"\\.",relevance:0,excludeEnd:!0,returnBegin:!0,keywords:{$pattern:"-"+e.IDENT_RE,keyword:"-module -record -undef -export -ifdef -ifndef -author -copyright -doc -vsn -import -include -include_lib -compile -define -else -endif -file -behaviour -behavior -spec"},contains:[E]},c,e.QUOTE_STRING_MODE,b,o,l,d,{begin:/\.$/}]}}}());
\ No newline at end of file
+hljs.registerLanguage("erlang",function(e){var r="[a-z'][a-zA-Z0-9_']*",c="("+r+":"+r+"|"+r+")",n={keyword:"after and andalso|10 band begin bnot bor bsl bzr bxor case catch cond div end fun if let not of orelse|10 query receive rem try when xor",literal:"false true"},a=e.C("%","$"),b={cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",relevance:0},i={b:"fun\\s+"+r+"/\\d+"},l={b:c+"\\(",e:"\\)",rB:!0,relevance:0,c:[{b:c,relevance:0},{b:"\\(",e:"\\)",eW:!0,rE:!0,relevance:0}]},d={b:"{",e:"}",relevance:0},o={b:"\\b_([A-Z][A-Za-z0-9_]*)?",relevance:0},t={b:"[A-Z][a-zA-Z0-9_]*",relevance:0},v={b:"#"+e.UIR,relevance:0,rB:!0,c:[{b:"#"+e.UIR,relevance:0},{b:"{",e:"}",relevance:0}]},f={bK:"fun receive if try case",e:"end",k:n};f.c=[a,i,e.inherit(e.ASM,{cN:""}),f,l,e.QSM,b,d,o,t,v];var s=[a,i,f,l,e.QSM,b,d,o,t,v];l.c[1].c=s,d.c=s;var u={cN:"params",b:"\\(",e:"\\)",c:v.c[1].c=s};return{aliases:["erl"],k:n,i:"(</|\\*=|\\+=|-=|/\\*|\\*/|\\(\\*|\\*\\))",c:[{cN:"function",b:"^"+r+"\\s*\\(",e:"->",rB:!0,i:"\\(|#|//|/\\*|\\\\|:|;",c:[u,e.inherit(e.TM,{b:r})],starts:{e:";|\\.",k:n,c:s}},a,{b:"^-",e:"\\.",relevance:0,eE:!0,rB:!0,l:"-"+e.IR,k:"-module -record -undef -export -ifdef -ifndef -author -copyright -doc -vsn -import -include -include_lib -compile -define -else -endif -file -behaviour -behavior -spec",c:[u]},b,e.QSM,v,o,t,d,{b:/\.$/}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/excel.min.js b/vendor/assets/javascripts/highlightjs/languages/excel.min.js
index 88f1939ebf..920e839d74 100644
--- a/vendor/assets/javascripts/highlightjs/languages/excel.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/excel.min.js
@@ -1 +1 @@
-hljs.registerLanguage("excel",function(){"use strict";return function(E){return{name:"Excel formulae",aliases:["xlsx","xls"],case_insensitive:!0,keywords:{$pattern:/[a-zA-Z][\w\.]*/,built_in:"ABS ACCRINT ACCRINTM ACOS ACOSH ACOT ACOTH AGGREGATE ADDRESS AMORDEGRC AMORLINC AND ARABIC AREAS ASC ASIN ASINH ATAN ATAN2 ATANH AVEDEV AVERAGE AVERAGEA AVERAGEIF AVERAGEIFS BAHTTEXT BASE BESSELI BESSELJ BESSELK BESSELY BETADIST BETA.DIST BETAINV BETA.INV BIN2DEC BIN2HEX BIN2OCT BINOMDIST BINOM.DIST BINOM.DIST.RANGE BINOM.INV BITAND BITLSHIFT BITOR BITRSHIFT BITXOR CALL CEILING CEILING.MATH CEILING.PRECISE CELL CHAR CHIDIST CHIINV CHITEST CHISQ.DIST CHISQ.DIST.RT CHISQ.INV CHISQ.INV.RT CHISQ.TEST CHOOSE CLEAN CODE COLUMN COLUMNS COMBIN COMBINA COMPLEX CONCAT CONCATENATE CONFIDENCE CONFIDENCE.NORM CONFIDENCE.T CONVERT CORREL COS COSH COT COTH COUNT COUNTA COUNTBLANK COUNTIF COUNTIFS COUPDAYBS COUPDAYS COUPDAYSNC COUPNCD COUPNUM COUPPCD COVAR COVARIANCE.P COVARIANCE.S CRITBINOM CSC CSCH CUBEKPIMEMBER CUBEMEMBER CUBEMEMBERPROPERTY CUBERANKEDMEMBER CUBESET CUBESETCOUNT CUBEVALUE CUMIPMT CUMPRINC DATE DATEDIF DATEVALUE DAVERAGE DAY DAYS DAYS360 DB DBCS DCOUNT DCOUNTA DDB DEC2BIN DEC2HEX DEC2OCT DECIMAL DEGREES DELTA DEVSQ DGET DISC DMAX DMIN DOLLAR DOLLARDE DOLLARFR DPRODUCT DSTDEV DSTDEVP DSUM DURATION DVAR DVARP EDATE EFFECT ENCODEURL EOMONTH ERF ERF.PRECISE ERFC ERFC.PRECISE ERROR.TYPE EUROCONVERT EVEN EXACT EXP EXPON.DIST EXPONDIST FACT FACTDOUBLE FALSE|0 F.DIST FDIST F.DIST.RT FILTERXML FIND FINDB F.INV F.INV.RT FINV FISHER FISHERINV FIXED FLOOR FLOOR.MATH FLOOR.PRECISE FORECAST FORECAST.ETS FORECAST.ETS.CONFINT FORECAST.ETS.SEASONALITY FORECAST.ETS.STAT FORECAST.LINEAR FORMULATEXT FREQUENCY F.TEST FTEST FV FVSCHEDULE GAMMA GAMMA.DIST GAMMADIST GAMMA.INV GAMMAINV GAMMALN GAMMALN.PRECISE GAUSS GCD GEOMEAN GESTEP GETPIVOTDATA GROWTH HARMEAN HEX2BIN HEX2DEC HEX2OCT HLOOKUP HOUR HYPERLINK HYPGEOM.DIST HYPGEOMDIST IF IFERROR IFNA IFS IMABS IMAGINARY IMARGUMENT IMCONJUGATE IMCOS IMCOSH IMCOT IMCSC IMCSCH IMDIV IMEXP IMLN IMLOG10 IMLOG2 IMPOWER IMPRODUCT IMREAL IMSEC IMSECH IMSIN IMSINH IMSQRT IMSUB IMSUM IMTAN INDEX INDIRECT INFO INT INTERCEPT INTRATE IPMT IRR ISBLANK ISERR ISERROR ISEVEN ISFORMULA ISLOGICAL ISNA ISNONTEXT ISNUMBER ISODD ISREF ISTEXT ISO.CEILING ISOWEEKNUM ISPMT JIS KURT LARGE LCM LEFT LEFTB LEN LENB LINEST LN LOG LOG10 LOGEST LOGINV LOGNORM.DIST LOGNORMDIST LOGNORM.INV LOOKUP LOWER MATCH MAX MAXA MAXIFS MDETERM MDURATION MEDIAN MID MIDBs MIN MINIFS MINA MINUTE MINVERSE MIRR MMULT MOD MODE MODE.MULT MODE.SNGL MONTH MROUND MULTINOMIAL MUNIT N NA NEGBINOM.DIST NEGBINOMDIST NETWORKDAYS NETWORKDAYS.INTL NOMINAL NORM.DIST NORMDIST NORMINV NORM.INV NORM.S.DIST NORMSDIST NORM.S.INV NORMSINV NOT NOW NPER NPV NUMBERVALUE OCT2BIN OCT2DEC OCT2HEX ODD ODDFPRICE ODDFYIELD ODDLPRICE ODDLYIELD OFFSET OR PDURATION PEARSON PERCENTILE.EXC PERCENTILE.INC PERCENTILE PERCENTRANK.EXC PERCENTRANK.INC PERCENTRANK PERMUT PERMUTATIONA PHI PHONETIC PI PMT POISSON.DIST POISSON POWER PPMT PRICE PRICEDISC PRICEMAT PROB PRODUCT PROPER PV QUARTILE QUARTILE.EXC QUARTILE.INC QUOTIENT RADIANS RAND RANDBETWEEN RANK.AVG RANK.EQ RANK RATE RECEIVED REGISTER.ID REPLACE REPLACEB REPT RIGHT RIGHTB ROMAN ROUND ROUNDDOWN ROUNDUP ROW ROWS RRI RSQ RTD SEARCH SEARCHB SEC SECH SECOND SERIESSUM SHEET SHEETS SIGN SIN SINH SKEW SKEW.P SLN SLOPE SMALL SQL.REQUEST SQRT SQRTPI STANDARDIZE STDEV STDEV.P STDEV.S STDEVA STDEVP STDEVPA STEYX SUBSTITUTE SUBTOTAL SUM SUMIF SUMIFS SUMPRODUCT SUMSQ SUMX2MY2 SUMX2PY2 SUMXMY2 SWITCH SYD T TAN TANH TBILLEQ TBILLPRICE TBILLYIELD T.DIST T.DIST.2T T.DIST.RT TDIST TEXT TEXTJOIN TIME TIMEVALUE T.INV T.INV.2T TINV TODAY TRANSPOSE TREND TRIM TRIMMEAN TRUE|0 TRUNC T.TEST TTEST TYPE UNICHAR UNICODE UPPER VALUE VAR VAR.P VAR.S VARA VARP VARPA VDB VLOOKUP WEBSERVICE WEEKDAY WEEKNUM WEIBULL WEIBULL.DIST WORKDAY WORKDAY.INTL XIRR XNPV XOR YEAR YEARFRAC YIELD YIELDDISC YIELDMAT Z.TEST ZTEST"},contains:[{begin:/^=/,end:/[^=]/,returnEnd:!0,illegal:/=/,relevance:10},{className:"symbol",begin:/\b[A-Z]{1,2}\d+\b/,end:/[^\d]/,excludeEnd:!0,relevance:0},{className:"symbol",begin:/[A-Z]{0,2}\d*:[A-Z]{0,2}\d*/,relevance:0},E.BACKSLASH_ESCAPE,E.QUOTE_STRING_MODE,{className:"number",begin:E.NUMBER_RE+"(%)?",relevance:0},E.COMMENT(/\bN\(/,/\)/,{excludeBegin:!0,excludeEnd:!0,illegal:/\n/})]}}}());
\ No newline at end of file
+hljs.registerLanguage("excel",function(E){return{aliases:["xlsx","xls"],cI:!0,l:/[a-zA-Z][\w\.]*/,k:{built_in:"ABS ACCRINT ACCRINTM ACOS ACOSH ACOT ACOTH AGGREGATE ADDRESS AMORDEGRC AMORLINC AND ARABIC AREAS ASC ASIN ASINH ATAN ATAN2 ATANH AVEDEV AVERAGE AVERAGEA AVERAGEIF AVERAGEIFS BAHTTEXT BASE BESSELI BESSELJ BESSELK BESSELY BETADIST BETA.DIST BETAINV BETA.INV BIN2DEC BIN2HEX BIN2OCT BINOMDIST BINOM.DIST BINOM.DIST.RANGE BINOM.INV BITAND BITLSHIFT BITOR BITRSHIFT BITXOR CALL CEILING CEILING.MATH CEILING.PRECISE CELL CHAR CHIDIST CHIINV CHITEST CHISQ.DIST CHISQ.DIST.RT CHISQ.INV CHISQ.INV.RT CHISQ.TEST CHOOSE CLEAN CODE COLUMN COLUMNS COMBIN COMBINA COMPLEX CONCAT CONCATENATE CONFIDENCE CONFIDENCE.NORM CONFIDENCE.T CONVERT CORREL COS COSH COT COTH COUNT COUNTA COUNTBLANK COUNTIF COUNTIFS COUPDAYBS COUPDAYS COUPDAYSNC COUPNCD COUPNUM COUPPCD COVAR COVARIANCE.P COVARIANCE.S CRITBINOM CSC CSCH CUBEKPIMEMBER CUBEMEMBER CUBEMEMBERPROPERTY CUBERANKEDMEMBER CUBESET CUBESETCOUNT CUBEVALUE CUMIPMT CUMPRINC DATE DATEDIF DATEVALUE DAVERAGE DAY DAYS DAYS360 DB DBCS DCOUNT DCOUNTA DDB DEC2BIN DEC2HEX DEC2OCT DECIMAL DEGREES DELTA DEVSQ DGET DISC DMAX DMIN DOLLAR DOLLARDE DOLLARFR DPRODUCT DSTDEV DSTDEVP DSUM DURATION DVAR DVARP EDATE EFFECT ENCODEURL EOMONTH ERF ERF.PRECISE ERFC ERFC.PRECISE ERROR.TYPE EUROCONVERT EVEN EXACT EXP EXPON.DIST EXPONDIST FACT FACTDOUBLE FALSE|0 F.DIST FDIST F.DIST.RT FILTERXML FIND FINDB F.INV F.INV.RT FINV FISHER FISHERINV FIXED FLOOR FLOOR.MATH FLOOR.PRECISE FORECAST FORECAST.ETS FORECAST.ETS.CONFINT FORECAST.ETS.SEASONALITY FORECAST.ETS.STAT FORECAST.LINEAR FORMULATEXT FREQUENCY F.TEST FTEST FV FVSCHEDULE GAMMA GAMMA.DIST GAMMADIST GAMMA.INV GAMMAINV GAMMALN GAMMALN.PRECISE GAUSS GCD GEOMEAN GESTEP GETPIVOTDATA GROWTH HARMEAN HEX2BIN HEX2DEC HEX2OCT HLOOKUP HOUR HYPERLINK HYPGEOM.DIST HYPGEOMDIST IF IFERROR IFNA IFS IMABS IMAGINARY IMARGUMENT IMCONJUGATE IMCOS IMCOSH IMCOT IMCSC IMCSCH IMDIV IMEXP IMLN IMLOG10 IMLOG2 IMPOWER IMPRODUCT IMREAL IMSEC IMSECH IMSIN IMSINH IMSQRT IMSUB IMSUM IMTAN INDEX INDIRECT INFO INT INTERCEPT INTRATE IPMT IRR ISBLANK ISERR ISERROR ISEVEN ISFORMULA ISLOGICAL ISNA ISNONTEXT ISNUMBER ISODD ISREF ISTEXT ISO.CEILING ISOWEEKNUM ISPMT JIS KURT LARGE LCM LEFT LEFTB LEN LENB LINEST LN LOG LOG10 LOGEST LOGINV LOGNORM.DIST LOGNORMDIST LOGNORM.INV LOOKUP LOWER MATCH MAX MAXA MAXIFS MDETERM MDURATION MEDIAN MID MIDBs MIN MINIFS MINA MINUTE MINVERSE MIRR MMULT MOD MODE MODE.MULT MODE.SNGL MONTH MROUND MULTINOMIAL MUNIT N NA NEGBINOM.DIST NEGBINOMDIST NETWORKDAYS NETWORKDAYS.INTL NOMINAL NORM.DIST NORMDIST NORMINV NORM.INV NORM.S.DIST NORMSDIST NORM.S.INV NORMSINV NOT NOW NPER NPV NUMBERVALUE OCT2BIN OCT2DEC OCT2HEX ODD ODDFPRICE ODDFYIELD ODDLPRICE ODDLYIELD OFFSET OR PDURATION PEARSON PERCENTILE.EXC PERCENTILE.INC PERCENTILE PERCENTRANK.EXC PERCENTRANK.INC PERCENTRANK PERMUT PERMUTATIONA PHI PHONETIC PI PMT POISSON.DIST POISSON POWER PPMT PRICE PRICEDISC PRICEMAT PROB PRODUCT PROPER PV QUARTILE QUARTILE.EXC QUARTILE.INC QUOTIENT RADIANS RAND RANDBETWEEN RANK.AVG RANK.EQ RANK RATE RECEIVED REGISTER.ID REPLACE REPLACEB REPT RIGHT RIGHTB ROMAN ROUND ROUNDDOWN ROUNDUP ROW ROWS RRI RSQ RTD SEARCH SEARCHB SEC SECH SECOND SERIESSUM SHEET SHEETS SIGN SIN SINH SKEW SKEW.P SLN SLOPE SMALL SQL.REQUEST SQRT SQRTPI STANDARDIZE STDEV STDEV.P STDEV.S STDEVA STDEVP STDEVPA STEYX SUBSTITUTE SUBTOTAL SUM SUMIF SUMIFS SUMPRODUCT SUMSQ SUMX2MY2 SUMX2PY2 SUMXMY2 SWITCH SYD T TAN TANH TBILLEQ TBILLPRICE TBILLYIELD T.DIST T.DIST.2T T.DIST.RT TDIST TEXT TEXTJOIN TIME TIMEVALUE T.INV T.INV.2T TINV TODAY TRANSPOSE TREND TRIM TRIMMEAN TRUE|0 TRUNC T.TEST TTEST TYPE UNICHAR UNICODE UPPER VALUE VAR VAR.P VAR.S VARA VARP VARPA VDB VLOOKUP WEBSERVICE WEEKDAY WEEKNUM WEIBULL WEIBULL.DIST WORKDAY WORKDAY.INTL XIRR XNPV XOR YEAR YEARFRAC YIELD YIELDDISC YIELDMAT Z.TEST ZTEST"},c:[{b:/^=/,e:/[^=]/,rE:!0,i:/=/,relevance:10},{cN:"symbol",b:/\b[A-Z]{1,2}\d+\b/,e:/[^\d]/,eE:!0,relevance:0},{cN:"symbol",b:/[A-Z]{0,2}\d*:[A-Z]{0,2}\d*/,relevance:0},E.BE,E.QSM,{cN:"number",b:E.NR+"(%)?",relevance:0},E.C(/\bN\(/,/\)/,{eB:!0,eE:!0,i:/\n/})]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/fix.min.js b/vendor/assets/javascripts/highlightjs/languages/fix.min.js
index 0474876a72..f07d5bbd78 100644
--- a/vendor/assets/javascripts/highlightjs/languages/fix.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/fix.min.js
@@ -1 +1 @@
-hljs.registerLanguage("fix",function(){"use strict";return function(n){return{name:"FIX",contains:[{begin:/[^\u2401\u0001]+/,end:/[\u2401\u0001]/,excludeEnd:!0,returnBegin:!0,returnEnd:!1,contains:[{begin:/([^\u2401\u0001=]+)/,end:/=([^\u2401\u0001=]+)/,returnEnd:!0,returnBegin:!1,className:"attr"},{begin:/=/,end:/([\u2401\u0001])/,excludeEnd:!0,excludeBegin:!0,className:"string"}]}],case_insensitive:!0}}}());
\ No newline at end of file
+hljs.registerLanguage("fix",function(u){return{c:[{b:/[^\u2401\u0001]+/,e:/[\u2401\u0001]/,eE:!0,rB:!0,rE:!1,c:[{b:/([^\u2401\u0001=]+)/,e:/=([^\u2401\u0001=]+)/,rE:!0,rB:!1,cN:"attr"},{b:/=/,e:/([\u2401\u0001])/,eE:!0,eB:!0,cN:"string"}]}],cI:!0}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/flix.min.js b/vendor/assets/javascripts/highlightjs/languages/flix.min.js
index a8ef06d91b..9e4d9f66b2 100644
--- a/vendor/assets/javascripts/highlightjs/languages/flix.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/flix.min.js
@@ -1 +1 @@
-hljs.registerLanguage("flix",function(){"use strict";return function(e){return{name:"Flix",keywords:{literal:"true false",keyword:"case class def else enum if impl import in lat rel index let match namespace switch type yield with"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"string",begin:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},{className:"string",variants:[{begin:'"',end:'"'}]},{className:"function",beginKeywords:"def",end:/[:={\[(\n;]/,excludeEnd:!0,contains:[{className:"title",begin:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/}]},e.C_NUMBER_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("flix",function(e){var t={cN:"function",bK:"def",e:/[:={\[(\n;]/,eE:!0,c:[{cN:"title",b:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/}]};return{k:{literal:"true false",keyword:"case class def else enum if impl import in lat rel index let match namespace switch type yield with"},c:[e.CLCM,e.CBCM,{cN:"string",b:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},{cN:"string",v:[{b:'"',e:'"'}]},t,e.CNM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/fortran.min.js b/vendor/assets/javascripts/highlightjs/languages/fortran.min.js
index d17f2be3d1..3bd59ef986 100644
--- a/vendor/assets/javascripts/highlightjs/languages/fortran.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/fortran.min.js
@@ -1 +1 @@
-hljs.registerLanguage("fortran",function(){"use strict";return function(e){const n={variants:[e.COMMENT("!","$",{relevance:0}),e.COMMENT("^C","$",{relevance:0})]},a={className:"function",beginKeywords:"subroutine function program",illegal:"[${=\\n]",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",begin:"\\(",end:"\\)"}]};return{name:"Fortran",case_insensitive:!0,aliases:["f90","f95"],keywords:{literal:".False. .True.",keyword:"kind do concurrent local shared while private call intrinsic where elsewhere type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then block endblock endassociate public subroutine|10 function program .and. .or. .not. .le. .eq. .ge. .gt. .lt. goto save else use module select case access blank direct exist file fmt form formatted iostat name named nextrec number opened rec recl sequential status unformatted unit continue format pause cycle exit c_null_char c_alert c_backspace c_form_feed flush wait decimal round iomsg synchronous nopass non_overridable pass protected volatile abstract extends import non_intrinsic value deferred generic final enumerator class associate bind enum c_int c_short c_long c_long_long c_signed_char c_size_t c_int8_t c_int16_t c_int32_t c_int64_t c_int_least8_t c_int_least16_t c_int_least32_t c_int_least64_t c_int_fast8_t c_int_fast16_t c_int_fast32_t c_int_fast64_t c_intmax_t C_intptr_t c_float c_double c_long_double c_float_complex c_double_complex c_long_double_complex c_bool c_char c_null_ptr c_null_funptr c_new_line c_carriage_return c_horizontal_tab c_vertical_tab iso_c_binding c_loc c_funloc c_associated  c_f_pointer c_ptr c_funptr iso_fortran_env character_storage_size error_unit file_storage_size input_unit iostat_end iostat_eor numeric_storage_size output_unit c_f_procpointer ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode newunit contiguous recursive pad position action delim readwrite eor advance nml interface procedure namelist include sequence elemental pure impure integer real character complex logical codimension dimension allocatable|10 parameter external implicit|10 none double precision assign intent optional pointer target in out common equivalence data",built_in:"alog alog10 amax0 amax1 amin0 amin1 amod cabs ccos cexp clog csin csqrt dabs dacos dasin datan datan2 dcos dcosh ddim dexp dint dlog dlog10 dmax1 dmin1 dmod dnint dsign dsin dsinh dsqrt dtan dtanh float iabs idim idint idnint ifix isign max0 max1 min0 min1 sngl algama cdabs cdcos cdexp cdlog cdsin cdsqrt cqabs cqcos cqexp cqlog cqsin cqsqrt dcmplx dconjg derf derfc dfloat dgamma dimag dlgama iqint qabs qacos qasin qatan qatan2 qcmplx qconjg qcos qcosh qdim qerf qerfc qexp qgamma qimag qlgama qlog qlog10 qmax1 qmin1 qmod qnint qsign qsin qsinh qsqrt qtan qtanh abs acos aimag aint anint asin atan atan2 char cmplx conjg cos cosh exp ichar index int log log10 max min nint sign sin sinh sqrt tan tanh print write dim lge lgt lle llt mod nullify allocate deallocate adjustl adjustr all allocated any associated bit_size btest ceiling count cshift date_and_time digits dot_product eoshift epsilon exponent floor fraction huge iand ibclr ibits ibset ieor ior ishft ishftc lbound len_trim matmul maxexponent maxloc maxval merge minexponent minloc minval modulo mvbits nearest pack present product radix random_number random_seed range repeat reshape rrspacing scale scan selected_int_kind selected_real_kind set_exponent shape size spacing spread sum system_clock tiny transpose trim ubound unpack verify achar iachar transfer dble entry dprod cpu_time command_argument_count get_command get_command_argument get_environment_variable is_iostat_end ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode is_iostat_eor move_alloc new_line selected_char_kind same_type_as extends_type_of acosh asinh atanh bessel_j0 bessel_j1 bessel_jn bessel_y0 bessel_y1 bessel_yn erf erfc erfc_scaled gamma log_gamma hypot norm2 atomic_define atomic_ref execute_command_line leadz trailz storage_size merge_bits bge bgt ble blt dshiftl dshiftr findloc iall iany iparity image_index lcobound ucobound maskl maskr num_images parity popcnt poppar shifta shiftl shiftr this_image sync change team co_broadcast co_max co_min co_sum co_reduce"},illegal:/\/\*/,contains:[{className:"string",relevance:0,variants:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},a,{begin:/^C\s*=(?!=)/,relevance:0},n,{className:"number",begin:"(?=\\b|\\+|\\-|\\.)(?:\\.|\\d+\\.?)\\d*([de][+-]?\\d+)?(_[a-z_\\d]+)?",relevance:0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("fortran",function(e){return{cI:!0,aliases:["f90","f95"],k:{literal:".False. .True.",keyword:"kind do while private call intrinsic where elsewhere type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then block endblock public subroutine|10 function program .and. .or. .not. .le. .eq. .ge. .gt. .lt. goto save else use module select case access blank direct exist file fmt form formatted iostat name named nextrec number opened rec recl sequential status unformatted unit continue format pause cycle exit c_null_char c_alert c_backspace c_form_feed flush wait decimal round iomsg synchronous nopass non_overridable pass protected volatile abstract extends import non_intrinsic value deferred generic final enumerator class associate bind enum c_int c_short c_long c_long_long c_signed_char c_size_t c_int8_t c_int16_t c_int32_t c_int64_t c_int_least8_t c_int_least16_t c_int_least32_t c_int_least64_t c_int_fast8_t c_int_fast16_t c_int_fast32_t c_int_fast64_t c_intmax_t C_intptr_t c_float c_double c_long_double c_float_complex c_double_complex c_long_double_complex c_bool c_char c_null_ptr c_null_funptr c_new_line c_carriage_return c_horizontal_tab c_vertical_tab iso_c_binding c_loc c_funloc c_associated  c_f_pointer c_ptr c_funptr iso_fortran_env character_storage_size error_unit file_storage_size input_unit iostat_end iostat_eor numeric_storage_size output_unit c_f_procpointer ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode newunit contiguous recursive pad position action delim readwrite eor advance nml interface procedure namelist include sequence elemental pure integer real character complex logical dimension allocatable|10 parameter external implicit|10 none double precision assign intent optional pointer target in out common equivalence data",built_in:"alog alog10 amax0 amax1 amin0 amin1 amod cabs ccos cexp clog csin csqrt dabs dacos dasin datan datan2 dcos dcosh ddim dexp dint dlog dlog10 dmax1 dmin1 dmod dnint dsign dsin dsinh dsqrt dtan dtanh float iabs idim idint idnint ifix isign max0 max1 min0 min1 sngl algama cdabs cdcos cdexp cdlog cdsin cdsqrt cqabs cqcos cqexp cqlog cqsin cqsqrt dcmplx dconjg derf derfc dfloat dgamma dimag dlgama iqint qabs qacos qasin qatan qatan2 qcmplx qconjg qcos qcosh qdim qerf qerfc qexp qgamma qimag qlgama qlog qlog10 qmax1 qmin1 qmod qnint qsign qsin qsinh qsqrt qtan qtanh abs acos aimag aint anint asin atan atan2 char cmplx conjg cos cosh exp ichar index int log log10 max min nint sign sin sinh sqrt tan tanh print write dim lge lgt lle llt mod nullify allocate deallocate adjustl adjustr all allocated any associated bit_size btest ceiling count cshift date_and_time digits dot_product eoshift epsilon exponent floor fraction huge iand ibclr ibits ibset ieor ior ishft ishftc lbound len_trim matmul maxexponent maxloc maxval merge minexponent minloc minval modulo mvbits nearest pack present product radix random_number random_seed range repeat reshape rrspacing scale scan selected_int_kind selected_real_kind set_exponent shape size spacing spread sum system_clock tiny transpose trim ubound unpack verify achar iachar transfer dble entry dprod cpu_time command_argument_count get_command get_command_argument get_environment_variable is_iostat_end ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode is_iostat_eor move_alloc new_line selected_char_kind same_type_as extends_type_ofacosh asinh atanh bessel_j0 bessel_j1 bessel_jn bessel_y0 bessel_y1 bessel_yn erf erfc erfc_scaled gamma log_gamma hypot norm2 atomic_define atomic_ref execute_command_line leadz trailz storage_size merge_bits bge bgt ble blt dshiftl dshiftr findloc iall iany iparity image_index lcobound ucobound maskl maskr num_images parity popcnt poppar shifta shiftl shiftr this_image"},i:/\/\*/,c:[e.inherit(e.ASM,{cN:"string",relevance:0}),e.inherit(e.QSM,{cN:"string",relevance:0}),{cN:"function",bK:"subroutine function program",i:"[${=\\n]",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)"}]},e.C("!","$",{relevance:0}),{cN:"number",b:"(?=\\b|\\+|\\-|\\.)(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*)(?:[de][+-]?\\d+)?\\b\\.?",relevance:0}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/fsharp.min.js b/vendor/assets/javascripts/highlightjs/languages/fsharp.min.js
index c52d6fb044..36c2529009 100644
--- a/vendor/assets/javascripts/highlightjs/languages/fsharp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/fsharp.min.js
@@ -1 +1 @@
-hljs.registerLanguage("fsharp",function(){"use strict";return function(e){var n={begin:"<",end:">",contains:[e.inherit(e.TITLE_MODE,{begin:/'[a-zA-Z0-9_]+/})]};return{name:"F#",aliases:["fs"],keywords:"abstract and as assert base begin class default delegate do done downcast downto elif else end exception extern false finally for fun function global if in inherit inline interface internal lazy let match member module mutable namespace new null of open or override private public rec return sig static struct then to true try type upcast use val void when while with yield",illegal:/\/\*/,contains:[{className:"keyword",begin:/\b(yield|return|let|do)!/},{className:"string",begin:'@"',end:'"',contains:[{begin:'""'}]},{className:"string",begin:'"""',end:'"""'},e.COMMENT("\\(\\*","\\*\\)"),{className:"class",beginKeywords:"type",end:"\\(|=|$",excludeEnd:!0,contains:[e.UNDERSCORE_TITLE_MODE,n]},{className:"meta",begin:"\\[<",end:">\\]",relevance:10},{className:"symbol",begin:"\\B('[A-Za-z])\\b",contains:[e.BACKSLASH_ESCAPE]},e.C_LINE_COMMENT_MODE,e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),e.C_NUMBER_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("fsharp",function(e){var t={b:"<",e:">",c:[e.inherit(e.TM,{b:/'[a-zA-Z0-9_]+/})]};return{aliases:["fs"],k:"abstract and as assert base begin class default delegate do done downcast downto elif else end exception extern false finally for fun function global if in inherit inline interface internal lazy let match member module mutable namespace new null of open or override private public rec return sig static struct then to true try type upcast use val void when while with yield",i:/\/\*/,c:[{cN:"keyword",b:/\b(yield|return|let|do)!/},{cN:"string",b:'@"',e:'"',c:[{b:'""'}]},{cN:"string",b:'"""',e:'"""'},e.C("\\(\\*","\\*\\)"),{cN:"class",bK:"type",e:"\\(|=|$",eE:!0,c:[e.UTM,t]},{cN:"meta",b:"\\[<",e:">\\]",relevance:10},{cN:"symbol",b:"\\B('[A-Za-z])\\b",c:[e.BE]},e.CLCM,e.inherit(e.QSM,{i:null}),e.CNM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/gams.min.js b/vendor/assets/javascripts/highlightjs/languages/gams.min.js
index a25e7316b3..e1a3ac97eb 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gams.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gams.min.js
@@ -1 +1 @@
-hljs.registerLanguage("gams",function(){"use strict";return function(e){var a={keyword:"abort acronym acronyms alias all and assign binary card diag display else eq file files for free ge gt if integer le loop lt maximizing minimizing model models ne negative no not option options or ord positive prod put putpage puttl repeat sameas semicont semiint smax smin solve sos1 sos2 sum system table then until using while xor yes",literal:"eps inf na",built_in:"abs arccos arcsin arctan arctan2 Beta betaReg binomial ceil centropy cos cosh cvPower div div0 eDist entropy errorf execSeed exp fact floor frac gamma gammaReg log logBeta logGamma log10 log2 mapVal max min mod ncpCM ncpF ncpVUpow ncpVUsin normal pi poly power randBinomial randLinear randTriangle round rPower sigmoid sign signPower sin sinh slexp sllog10 slrec sqexp sqlog10 sqr sqrec sqrt tan tanh trunc uniform uniformInt vcPower bool_and bool_eqv bool_imp bool_not bool_or bool_xor ifThen rel_eq rel_ge rel_gt rel_le rel_lt rel_ne gday gdow ghour gleap gmillisec gminute gmonth gsecond gyear jdate jnow jstart jtime errorLevel execError gamsRelease gamsVersion handleCollect handleDelete handleStatus handleSubmit heapFree heapLimit heapSize jobHandle jobKill jobStatus jobTerminate licenseLevel licenseStatus maxExecError sleep timeClose timeComp timeElapsed timeExec timeStart"},n={className:"symbol",variants:[{begin:/\=[lgenxc]=/},{begin:/\$/}]},i={className:"comment",variants:[{begin:"'",end:"'"},{begin:'"',end:'"'}],illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},s={begin:"/",end:"/",keywords:a,contains:[i,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_NUMBER_MODE]},o={begin:/[a-z][a-z0-9_]*(\([a-z0-9_, ]*\))?[ \t]+/,excludeBegin:!0,end:"$",endsWithParent:!0,contains:[i,s,{className:"comment",begin:/([ ]*[a-z0-9&#*=?@>\\<:\-,()$\[\]_.{}!+%^]+)+/,relevance:0}]};return{name:"GAMS",aliases:["gms"],case_insensitive:!0,keywords:a,contains:[e.COMMENT(/^\$ontext/,/^\$offtext/),{className:"meta",begin:"^\\$[a-z0-9]+",end:"$",returnBegin:!0,contains:[{className:"meta-keyword",begin:"^\\$[a-z0-9]+"}]},e.COMMENT("^\\*","$"),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{beginKeywords:"set sets parameter parameters variable variables scalar scalars equation equations",end:";",contains:[e.COMMENT("^\\*","$"),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,s,o]},{beginKeywords:"table",end:";",returnBegin:!0,contains:[{beginKeywords:"table",end:"$",contains:[o]},e.COMMENT("^\\*","$"),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_NUMBER_MODE]},{className:"function",begin:/^[a-z][a-z0-9_,\-+' ()$]+\.{2}/,returnBegin:!0,contains:[{className:"title",begin:/^[a-z0-9_]+/},{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0},n]},e.C_NUMBER_MODE,n]}}}());
\ No newline at end of file
+hljs.registerLanguage("gams",function(e){var a={keyword:"abort acronym acronyms alias all and assign binary card diag display else eq file files for free ge gt if integer le loop lt maximizing minimizing model models ne negative no not option options or ord positive prod put putpage puttl repeat sameas semicont semiint smax smin solve sos1 sos2 sum system table then until using while xor yes",literal:"eps inf na","built-in":"abs arccos arcsin arctan arctan2 Beta betaReg binomial ceil centropy cos cosh cvPower div div0 eDist entropy errorf execSeed exp fact floor frac gamma gammaReg log logBeta logGamma log10 log2 mapVal max min mod ncpCM ncpF ncpVUpow ncpVUsin normal pi poly power randBinomial randLinear randTriangle round rPower sigmoid sign signPower sin sinh slexp sllog10 slrec sqexp sqlog10 sqr sqrec sqrt tan tanh trunc uniform uniformInt vcPower bool_and bool_eqv bool_imp bool_not bool_or bool_xor ifThen rel_eq rel_ge rel_gt rel_le rel_lt rel_ne gday gdow ghour gleap gmillisec gminute gmonth gsecond gyear jdate jnow jstart jtime errorLevel execError gamsRelease gamsVersion handleCollect handleDelete handleStatus handleSubmit heapFree heapLimit heapSize jobHandle jobKill jobStatus jobTerminate licenseLevel licenseStatus maxExecError sleep timeClose timeComp timeElapsed timeExec timeStart"},o={cN:"symbol",v:[{b:/\=[lgenxc]=/},{b:/\$/}]},r={cN:"comment",v:[{b:"'",e:"'"},{b:'"',e:'"'}],i:"\\n",c:[e.BE]},t={b:"/",e:"/",k:a,c:[r,e.CLCM,e.CBCM,e.QSM,e.ASM,e.CNM]},l={b:/[a-z][a-z0-9_]*(\([a-z0-9_, ]*\))?[ \t]+/,eB:!0,e:"$",eW:!0,c:[r,t,{cN:"comment",b:/([ ]*[a-z0-9&#*=?@>\\<:\-,()$\[\]_.{}!+%^]+)+/,relevance:0}]};return{aliases:["gms"],cI:!0,k:a,c:[e.C(/^\$ontext/,/^\$offtext/),{cN:"meta",b:"^\\$[a-z0-9]+",e:"$",rB:!0,c:[{cN:"meta-keyword",b:"^\\$[a-z0-9]+"}]},e.C("^\\*","$"),e.CLCM,e.CBCM,e.QSM,e.ASM,{bK:"set sets parameter parameters variable variables scalar scalars equation equations",e:";",c:[e.C("^\\*","$"),e.CLCM,e.CBCM,e.QSM,e.ASM,t,l]},{bK:"table",e:";",rB:!0,c:[{bK:"table",e:"$",c:[l]},e.C("^\\*","$"),e.CLCM,e.CBCM,e.QSM,e.ASM,e.CNM]},{cN:"function",b:/^[a-z][a-z0-9_,\-+' ()$]+\.{2}/,rB:!0,c:[{cN:"title",b:/^[a-z0-9_]+/},{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0},o]},e.CNM,o]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/gauss.min.js b/vendor/assets/javascripts/highlightjs/languages/gauss.min.js
index 2364ef6a23..e8d8683803 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gauss.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gauss.min.js
@@ -1 +1 @@
-hljs.registerLanguage("gauss",function(){"use strict";return function(e){var t={keyword:"bool break call callexe checkinterrupt clear clearg closeall cls comlog compile continue create debug declare delete disable dlibrary dllcall do dos ed edit else elseif enable end endfor endif endp endo errorlog errorlogat expr external fn for format goto gosub graph if keyword let lib library line load loadarray loadexe loadf loadk loadm loadp loads loadx local locate loopnextindex lprint lpwidth lshow matrix msym ndpclex new open output outwidth plot plotsym pop prcsn print printdos proc push retp return rndcon rndmod rndmult rndseed run save saveall screen scroll setarray show sparse stop string struct system trace trap threadfor threadendfor threadbegin threadjoin threadstat threadend until use while winprint ne ge le gt lt and xor or not eq eqv",built_in:"abs acf aconcat aeye amax amean AmericanBinomCall AmericanBinomCall_Greeks AmericanBinomCall_ImpVol AmericanBinomPut AmericanBinomPut_Greeks AmericanBinomPut_ImpVol AmericanBSCall AmericanBSCall_Greeks AmericanBSCall_ImpVol AmericanBSPut AmericanBSPut_Greeks AmericanBSPut_ImpVol amin amult annotationGetDefaults annotationSetBkd annotationSetFont annotationSetLineColor annotationSetLineStyle annotationSetLineThickness annualTradingDays arccos arcsin areshape arrayalloc arrayindex arrayinit arraytomat asciiload asclabel astd astds asum atan atan2 atranspose axmargin balance band bandchol bandcholsol bandltsol bandrv bandsolpd bar base10 begwind besselj bessely beta box boxcox cdfBeta cdfBetaInv cdfBinomial cdfBinomialInv cdfBvn cdfBvn2 cdfBvn2e cdfCauchy cdfCauchyInv cdfChic cdfChii cdfChinc cdfChincInv cdfExp cdfExpInv cdfFc cdfFnc cdfFncInv cdfGam cdfGenPareto cdfHyperGeo cdfLaplace cdfLaplaceInv cdfLogistic cdfLogisticInv cdfmControlCreate cdfMvn cdfMvn2e cdfMvnce cdfMvne cdfMvt2e cdfMvtce cdfMvte cdfN cdfN2 cdfNc cdfNegBinomial cdfNegBinomialInv cdfNi cdfPoisson cdfPoissonInv cdfRayleigh cdfRayleighInv cdfTc cdfTci cdfTnc cdfTvn cdfWeibull cdfWeibullInv cdir ceil ChangeDir chdir chiBarSquare chol choldn cholsol cholup chrs close code cols colsf combinate combinated complex con cond conj cons ConScore contour conv convertsatostr convertstrtosa corrm corrms corrvc corrx corrxs cos cosh counts countwts crossprd crout croutp csrcol csrlin csvReadM csvReadSA cumprodc cumsumc curve cvtos datacreate datacreatecomplex datalist dataload dataloop dataopen datasave date datestr datestring datestrymd dayinyr dayofweek dbAddDatabase dbClose dbCommit dbCreateQuery dbExecQuery dbGetConnectOptions dbGetDatabaseName dbGetDriverName dbGetDrivers dbGetHostName dbGetLastErrorNum dbGetLastErrorText dbGetNumericalPrecPolicy dbGetPassword dbGetPort dbGetTableHeaders dbGetTables dbGetUserName dbHasFeature dbIsDriverAvailable dbIsOpen dbIsOpenError dbOpen dbQueryBindValue dbQueryClear dbQueryCols dbQueryExecPrepared dbQueryFetchAllM dbQueryFetchAllSA dbQueryFetchOneM dbQueryFetchOneSA dbQueryFinish dbQueryGetBoundValue dbQueryGetBoundValues dbQueryGetField dbQueryGetLastErrorNum dbQueryGetLastErrorText dbQueryGetLastInsertID dbQueryGetLastQuery dbQueryGetPosition dbQueryIsActive dbQueryIsForwardOnly dbQueryIsNull dbQueryIsSelect dbQueryIsValid dbQueryPrepare dbQueryRows dbQuerySeek dbQuerySeekFirst dbQuerySeekLast dbQuerySeekNext dbQuerySeekPrevious dbQuerySetForwardOnly dbRemoveDatabase dbRollback dbSetConnectOptions dbSetDatabaseName dbSetHostName dbSetNumericalPrecPolicy dbSetPort dbSetUserName dbTransaction DeleteFile delif delrows denseToSp denseToSpRE denToZero design det detl dfft dffti diag diagrv digamma doswin DOSWinCloseall DOSWinOpen dotfeq dotfeqmt dotfge dotfgemt dotfgt dotfgtmt dotfle dotflemt dotflt dotfltmt dotfne dotfnemt draw drop dsCreate dstat dstatmt dstatmtControlCreate dtdate dtday dttime dttodtv dttostr dttoutc dtvnormal dtvtodt dtvtoutc dummy dummybr dummydn eig eigh eighv eigv elapsedTradingDays endwind envget eof eqSolve eqSolvemt eqSolvemtControlCreate eqSolvemtOutCreate eqSolveset erf erfc erfccplx erfcplx error etdays ethsec etstr EuropeanBinomCall EuropeanBinomCall_Greeks EuropeanBinomCall_ImpVol EuropeanBinomPut EuropeanBinomPut_Greeks EuropeanBinomPut_ImpVol EuropeanBSCall EuropeanBSCall_Greeks EuropeanBSCall_ImpVol EuropeanBSPut EuropeanBSPut_Greeks EuropeanBSPut_ImpVol exctsmpl exec execbg exp extern eye fcheckerr fclearerr feq feqmt fflush fft ffti fftm fftmi fftn fge fgemt fgets fgetsa fgetsat fgetst fgt fgtmt fileinfo filesa fle flemt floor flt fltmt fmod fne fnemt fonts fopen formatcv formatnv fputs fputst fseek fstrerror ftell ftocv ftos ftostrC gamma gammacplx gammaii gausset gdaAppend gdaCreate gdaDStat gdaDStatMat gdaGetIndex gdaGetName gdaGetNames gdaGetOrders gdaGetType gdaGetTypes gdaGetVarInfo gdaIsCplx gdaLoad gdaPack gdaRead gdaReadByIndex gdaReadSome gdaReadSparse gdaReadStruct gdaReportVarInfo gdaSave gdaUpdate gdaUpdateAndPack gdaVars gdaWrite gdaWrite32 gdaWriteSome getarray getdims getf getGAUSShome getmatrix getmatrix4D getname getnamef getNextTradingDay getNextWeekDay getnr getorders getpath getPreviousTradingDay getPreviousWeekDay getRow getscalar3D getscalar4D getTrRow getwind glm gradcplx gradMT gradMTm gradMTT gradMTTm gradp graphprt graphset hasimag header headermt hess hessMT hessMTg hessMTgw hessMTm hessMTmw hessMTT hessMTTg hessMTTgw hessMTTm hessMTw hessp hist histf histp hsec imag indcv indexcat indices indices2 indicesf indicesfn indnv indsav integrate1d integrateControlCreate intgrat2 intgrat3 inthp1 inthp2 inthp3 inthp4 inthpControlCreate intquad1 intquad2 intquad3 intrleav intrleavsa intrsect intsimp inv invpd invswp iscplx iscplxf isden isinfnanmiss ismiss key keyav keyw lag lag1 lagn lapEighb lapEighi lapEighvb lapEighvi lapgEig lapgEigh lapgEighv lapgEigv lapgSchur lapgSvdcst lapgSvds lapgSvdst lapSvdcusv lapSvds lapSvdusv ldlp ldlsol linSolve listwise ln lncdfbvn lncdfbvn2 lncdfmvn lncdfn lncdfn2 lncdfnc lnfact lngammacplx lnpdfmvn lnpdfmvt lnpdfn lnpdft loadd loadstruct loadwind loess loessmt loessmtControlCreate log loglog logx logy lower lowmat lowmat1 ltrisol lu lusol machEpsilon make makevars makewind margin matalloc matinit mattoarray maxbytes maxc maxindc maxv maxvec mbesselei mbesselei0 mbesselei1 mbesseli mbesseli0 mbesseli1 meanc median mergeby mergevar minc minindc minv miss missex missrv moment momentd movingave movingaveExpwgt movingaveWgt nextindex nextn nextnevn nextwind ntos null null1 numCombinations ols olsmt olsmtControlCreate olsqr olsqr2 olsqrmt ones optn optnevn orth outtyp pacf packedToSp packr parse pause pdfCauchy pdfChi pdfExp pdfGenPareto pdfHyperGeo pdfLaplace pdfLogistic pdfn pdfPoisson pdfRayleigh pdfWeibull pi pinv pinvmt plotAddArrow plotAddBar plotAddBox plotAddHist plotAddHistF plotAddHistP plotAddPolar plotAddScatter plotAddShape plotAddTextbox plotAddTS plotAddXY plotArea plotBar plotBox plotClearLayout plotContour plotCustomLayout plotGetDefaults plotHist plotHistF plotHistP plotLayout plotLogLog plotLogX plotLogY plotOpenWindow plotPolar plotSave plotScatter plotSetAxesPen plotSetBar plotSetBarFill plotSetBarStacked plotSetBkdColor plotSetFill plotSetGrid plotSetLegend plotSetLineColor plotSetLineStyle plotSetLineSymbol plotSetLineThickness plotSetNewWindow plotSetTitle plotSetWhichYAxis plotSetXAxisShow plotSetXLabel plotSetXRange plotSetXTicInterval plotSetXTicLabel plotSetYAxisShow plotSetYLabel plotSetYRange plotSetZAxisShow plotSetZLabel plotSurface plotTS plotXY polar polychar polyeval polygamma polyint polymake polymat polymroot polymult polyroot pqgwin previousindex princomp printfm printfmt prodc psi putarray putf putvals pvCreate pvGetIndex pvGetParNames pvGetParVector pvLength pvList pvPack pvPacki pvPackm pvPackmi pvPacks pvPacksi pvPacksm pvPacksmi pvPutParVector pvTest pvUnpack QNewton QNewtonmt QNewtonmtControlCreate QNewtonmtOutCreate QNewtonSet QProg QProgmt QProgmtInCreate qqr qqre qqrep qr qre qrep qrsol qrtsol qtyr qtyre qtyrep quantile quantiled qyr qyre qyrep qz rank rankindx readr real reclassify reclassifyCuts recode recserar recsercp recserrc rerun rescale reshape rets rev rfft rffti rfftip rfftn rfftnp rfftp rndBernoulli rndBeta rndBinomial rndCauchy rndChiSquare rndCon rndCreateState rndExp rndGamma rndGeo rndGumbel rndHyperGeo rndi rndKMbeta rndKMgam rndKMi rndKMn rndKMnb rndKMp rndKMu rndKMvm rndLaplace rndLCbeta rndLCgam rndLCi rndLCn rndLCnb rndLCp rndLCu rndLCvm rndLogNorm rndMTu rndMVn rndMVt rndn rndnb rndNegBinomial rndp rndPoisson rndRayleigh rndStateSkip rndu rndvm rndWeibull rndWishart rotater round rows rowsf rref sampleData satostrC saved saveStruct savewind scale scale3d scalerr scalinfnanmiss scalmiss schtoc schur searchsourcepath seekr select selif seqa seqm setdif setdifsa setvars setvwrmode setwind shell shiftr sin singleindex sinh sleep solpd sortc sortcc sortd sorthc sorthcc sortind sortindc sortmc sortr sortrc spBiconjGradSol spChol spConjGradSol spCreate spDenseSubmat spDiagRvMat spEigv spEye spLDL spline spLU spNumNZE spOnes spreadSheetReadM spreadSheetReadSA spreadSheetWrite spScale spSubmat spToDense spTrTDense spTScalar spZeros sqpSolve sqpSolveMT sqpSolveMTControlCreate sqpSolveMTlagrangeCreate sqpSolveMToutCreate sqpSolveSet sqrt statements stdc stdsc stocv stof strcombine strindx strlen strput strrindx strsect strsplit strsplitPad strtodt strtof strtofcplx strtriml strtrimr strtrunc strtruncl strtruncpad strtruncr submat subscat substute subvec sumc sumr surface svd svd1 svd2 svdcusv svds svdusv sysstate tab tan tanh tempname time timedt timestr timeutc title tkf2eps tkf2ps tocart todaydt toeplitz token topolar trapchk trigamma trimr trunc type typecv typef union unionsa uniqindx uniqindxsa unique uniquesa upmat upmat1 upper utctodt utctodtv utrisol vals varCovMS varCovXS varget vargetl varmall varmares varput varputl vartypef vcm vcms vcx vcxs vec vech vecr vector vget view viewxyz vlist vnamecv volume vput vread vtypecv wait waitc walkindex where window writer xlabel xlsGetSheetCount xlsGetSheetSize xlsGetSheetTypes xlsMakeRange xlsReadM xlsReadSA xlsWrite xlsWriteM xlsWriteSA xpnd xtics xy xyz ylabel ytics zeros zeta zlabel ztics cdfEmpirical dot h5create h5open h5read h5readAttribute h5write h5writeAttribute ldl plotAddErrorBar plotAddSurface plotCDFEmpirical plotSetColormap plotSetContourLabels plotSetLegendFont plotSetTextInterpreter plotSetXTicCount plotSetYTicCount plotSetZLevels powerm strjoin sylvester strtrim",literal:"DB_AFTER_LAST_ROW DB_ALL_TABLES DB_BATCH_OPERATIONS DB_BEFORE_FIRST_ROW DB_BLOB DB_EVENT_NOTIFICATIONS DB_FINISH_QUERY DB_HIGH_PRECISION DB_LAST_INSERT_ID DB_LOW_PRECISION_DOUBLE DB_LOW_PRECISION_INT32 DB_LOW_PRECISION_INT64 DB_LOW_PRECISION_NUMBERS DB_MULTIPLE_RESULT_SETS DB_NAMED_PLACEHOLDERS DB_POSITIONAL_PLACEHOLDERS DB_PREPARED_QUERIES DB_QUERY_SIZE DB_SIMPLE_LOCKING DB_SYSTEM_TABLES DB_TABLES DB_TRANSACTIONS DB_UNICODE DB_VIEWS __STDIN __STDOUT __STDERR __FILE_DIR"},a=e.COMMENT("@","@"),r={className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"define definecs|10 undef ifdef ifndef iflight ifdllcall ifmac ifos2win ifunix else endif lineson linesoff srcfile srcline"},contains:[{begin:/\\\n/,relevance:0},{beginKeywords:"include",end:"$",keywords:{"meta-keyword":"include"},contains:[{className:"meta-string",begin:'"',end:'"',illegal:"\\n"}]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a]},n={begin:/\bstruct\s+/,end:/\s/,keywords:"struct",contains:[{className:"type",begin:e.UNDERSCORE_IDENT_RE,relevance:0}]},s=[{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,endsWithParent:!0,relevance:0,contains:[{className:"literal",begin:/\.\.\./},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,a,n]}],o={className:"title",begin:e.UNDERSCORE_IDENT_RE,relevance:0},d=function(t,r,n){var d=e.inherit({className:"function",beginKeywords:t,end:r,excludeEnd:!0,contains:[].concat(s)},n||{});return d.contains.push(o),d.contains.push(e.C_NUMBER_MODE),d.contains.push(e.C_BLOCK_COMMENT_MODE),d.contains.push(a),d},l={className:"built_in",begin:"\\b("+t.built_in.split(" ").join("|")+")\\b"},i={className:"string",begin:'"',end:'"',contains:[e.BACKSLASH_ESCAPE],relevance:0},c={begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,keywords:t,relevance:0,contains:[{beginKeywords:t.keyword},l,{className:"built_in",begin:e.UNDERSCORE_IDENT_RE,relevance:0}]},p={begin:/\(/,end:/\)/,relevance:0,keywords:{built_in:t.built_in,literal:t.literal},contains:[e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,a,l,c,i,"self"]};return c.contains.push(p),{name:"GAUSS",aliases:["gss"],case_insensitive:!0,keywords:t,illegal:/(\{[%#]|[%#]\}| <- )/,contains:[e.C_NUMBER_MODE,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,i,r,{className:"keyword",begin:/\bexternal (matrix|string|array|sparse matrix|struct|proc|keyword|fn)/},d("proc keyword",";"),d("fn","="),{beginKeywords:"for threadfor",end:/;/,relevance:0,contains:[e.C_BLOCK_COMMENT_MODE,a,p]},{variants:[{begin:e.UNDERSCORE_IDENT_RE+"\\."+e.UNDERSCORE_IDENT_RE},{begin:e.UNDERSCORE_IDENT_RE+"\\s*="}],relevance:0},c,n]}}}());
\ No newline at end of file
+hljs.registerLanguage("gauss",function(o){function e(e,t,a){var r=o.inherit({cN:"function",bK:e,e:t,eE:!0,c:[].concat(d)},a||{});return r.c.push(l),r.c.push(o.CNM),r.c.push(o.CBCM),r.c.push(n),r}var t={keyword:"bool break call callexe checkinterrupt clear clearg closeall cls comlog compile continue create debug declare delete disable dlibrary dllcall do dos ed edit else elseif enable end endfor endif endp endo errorlog errorlogat expr external fn for format goto gosub graph if keyword let lib library line load loadarray loadexe loadf loadk loadm loadp loads loadx local locate loopnextindex lprint lpwidth lshow matrix msym ndpclex new open output outwidth plot plotsym pop prcsn print printdos proc push retp return rndcon rndmod rndmult rndseed run save saveall screen scroll setarray show sparse stop string struct system trace trap threadfor threadendfor threadbegin threadjoin threadstat threadend until use while winprint ne ge le gt lt and xor or not eq eqv",built_in:"abs acf aconcat aeye amax amean AmericanBinomCall AmericanBinomCall_Greeks AmericanBinomCall_ImpVol AmericanBinomPut AmericanBinomPut_Greeks AmericanBinomPut_ImpVol AmericanBSCall AmericanBSCall_Greeks AmericanBSCall_ImpVol AmericanBSPut AmericanBSPut_Greeks AmericanBSPut_ImpVol amin amult annotationGetDefaults annotationSetBkd annotationSetFont annotationSetLineColor annotationSetLineStyle annotationSetLineThickness annualTradingDays arccos arcsin areshape arrayalloc arrayindex arrayinit arraytomat asciiload asclabel astd astds asum atan atan2 atranspose axmargin balance band bandchol bandcholsol bandltsol bandrv bandsolpd bar base10 begwind besselj bessely beta box boxcox cdfBeta cdfBetaInv cdfBinomial cdfBinomialInv cdfBvn cdfBvn2 cdfBvn2e cdfCauchy cdfCauchyInv cdfChic cdfChii cdfChinc cdfChincInv cdfExp cdfExpInv cdfFc cdfFnc cdfFncInv cdfGam cdfGenPareto cdfHyperGeo cdfLaplace cdfLaplaceInv cdfLogistic cdfLogisticInv cdfmControlCreate cdfMvn cdfMvn2e cdfMvnce cdfMvne cdfMvt2e cdfMvtce cdfMvte cdfN cdfN2 cdfNc cdfNegBinomial cdfNegBinomialInv cdfNi cdfPoisson cdfPoissonInv cdfRayleigh cdfRayleighInv cdfTc cdfTci cdfTnc cdfTvn cdfWeibull cdfWeibullInv cdir ceil ChangeDir chdir chiBarSquare chol choldn cholsol cholup chrs close code cols colsf combinate combinated complex con cond conj cons ConScore contour conv convertsatostr convertstrtosa corrm corrms corrvc corrx corrxs cos cosh counts countwts crossprd crout croutp csrcol csrlin csvReadM csvReadSA cumprodc cumsumc curve cvtos datacreate datacreatecomplex datalist dataload dataloop dataopen datasave date datestr datestring datestrymd dayinyr dayofweek dbAddDatabase dbClose dbCommit dbCreateQuery dbExecQuery dbGetConnectOptions dbGetDatabaseName dbGetDriverName dbGetDrivers dbGetHostName dbGetLastErrorNum dbGetLastErrorText dbGetNumericalPrecPolicy dbGetPassword dbGetPort dbGetTableHeaders dbGetTables dbGetUserName dbHasFeature dbIsDriverAvailable dbIsOpen dbIsOpenError dbOpen dbQueryBindValue dbQueryClear dbQueryCols dbQueryExecPrepared dbQueryFetchAllM dbQueryFetchAllSA dbQueryFetchOneM dbQueryFetchOneSA dbQueryFinish dbQueryGetBoundValue dbQueryGetBoundValues dbQueryGetField dbQueryGetLastErrorNum dbQueryGetLastErrorText dbQueryGetLastInsertID dbQueryGetLastQuery dbQueryGetPosition dbQueryIsActive dbQueryIsForwardOnly dbQueryIsNull dbQueryIsSelect dbQueryIsValid dbQueryPrepare dbQueryRows dbQuerySeek dbQuerySeekFirst dbQuerySeekLast dbQuerySeekNext dbQuerySeekPrevious dbQuerySetForwardOnly dbRemoveDatabase dbRollback dbSetConnectOptions dbSetDatabaseName dbSetHostName dbSetNumericalPrecPolicy dbSetPort dbSetUserName dbTransaction DeleteFile delif delrows denseToSp denseToSpRE denToZero design det detl dfft dffti diag diagrv digamma doswin DOSWinCloseall DOSWinOpen dotfeq dotfeqmt dotfge dotfgemt dotfgt dotfgtmt dotfle dotflemt dotflt dotfltmt dotfne dotfnemt draw drop dsCreate dstat dstatmt dstatmtControlCreate dtdate dtday dttime dttodtv dttostr dttoutc dtvnormal dtvtodt dtvtoutc dummy dummybr dummydn eig eigh eighv eigv elapsedTradingDays endwind envget eof eqSolve eqSolvemt eqSolvemtControlCreate eqSolvemtOutCreate eqSolveset erf erfc erfccplx erfcplx error etdays ethsec etstr EuropeanBinomCall EuropeanBinomCall_Greeks EuropeanBinomCall_ImpVol EuropeanBinomPut EuropeanBinomPut_Greeks EuropeanBinomPut_ImpVol EuropeanBSCall EuropeanBSCall_Greeks EuropeanBSCall_ImpVol EuropeanBSPut EuropeanBSPut_Greeks EuropeanBSPut_ImpVol exctsmpl exec execbg exp extern eye fcheckerr fclearerr feq feqmt fflush fft ffti fftm fftmi fftn fge fgemt fgets fgetsa fgetsat fgetst fgt fgtmt fileinfo filesa fle flemt floor flt fltmt fmod fne fnemt fonts fopen formatcv formatnv fputs fputst fseek fstrerror ftell ftocv ftos ftostrC gamma gammacplx gammaii gausset gdaAppend gdaCreate gdaDStat gdaDStatMat gdaGetIndex gdaGetName gdaGetNames gdaGetOrders gdaGetType gdaGetTypes gdaGetVarInfo gdaIsCplx gdaLoad gdaPack gdaRead gdaReadByIndex gdaReadSome gdaReadSparse gdaReadStruct gdaReportVarInfo gdaSave gdaUpdate gdaUpdateAndPack gdaVars gdaWrite gdaWrite32 gdaWriteSome getarray getdims getf getGAUSShome getmatrix getmatrix4D getname getnamef getNextTradingDay getNextWeekDay getnr getorders getpath getPreviousTradingDay getPreviousWeekDay getRow getscalar3D getscalar4D getTrRow getwind glm gradcplx gradMT gradMTm gradMTT gradMTTm gradp graphprt graphset hasimag header headermt hess hessMT hessMTg hessMTgw hessMTm hessMTmw hessMTT hessMTTg hessMTTgw hessMTTm hessMTw hessp hist histf histp hsec imag indcv indexcat indices indices2 indicesf indicesfn indnv indsav integrate1d integrateControlCreate intgrat2 intgrat3 inthp1 inthp2 inthp3 inthp4 inthpControlCreate intquad1 intquad2 intquad3 intrleav intrleavsa intrsect intsimp inv invpd invswp iscplx iscplxf isden isinfnanmiss ismiss key keyav keyw lag lag1 lagn lapEighb lapEighi lapEighvb lapEighvi lapgEig lapgEigh lapgEighv lapgEigv lapgSchur lapgSvdcst lapgSvds lapgSvdst lapSvdcusv lapSvds lapSvdusv ldlp ldlsol linSolve listwise ln lncdfbvn lncdfbvn2 lncdfmvn lncdfn lncdfn2 lncdfnc lnfact lngammacplx lnpdfmvn lnpdfmvt lnpdfn lnpdft loadd loadstruct loadwind loess loessmt loessmtControlCreate log loglog logx logy lower lowmat lowmat1 ltrisol lu lusol machEpsilon make makevars makewind margin matalloc matinit mattoarray maxbytes maxc maxindc maxv maxvec mbesselei mbesselei0 mbesselei1 mbesseli mbesseli0 mbesseli1 meanc median mergeby mergevar minc minindc minv miss missex missrv moment momentd movingave movingaveExpwgt movingaveWgt nextindex nextn nextnevn nextwind ntos null null1 numCombinations ols olsmt olsmtControlCreate olsqr olsqr2 olsqrmt ones optn optnevn orth outtyp pacf packedToSp packr parse pause pdfCauchy pdfChi pdfExp pdfGenPareto pdfHyperGeo pdfLaplace pdfLogistic pdfn pdfPoisson pdfRayleigh pdfWeibull pi pinv pinvmt plotAddArrow plotAddBar plotAddBox plotAddHist plotAddHistF plotAddHistP plotAddPolar plotAddScatter plotAddShape plotAddTextbox plotAddTS plotAddXY plotArea plotBar plotBox plotClearLayout plotContour plotCustomLayout plotGetDefaults plotHist plotHistF plotHistP plotLayout plotLogLog plotLogX plotLogY plotOpenWindow plotPolar plotSave plotScatter plotSetAxesPen plotSetBar plotSetBarFill plotSetBarStacked plotSetBkdColor plotSetFill plotSetGrid plotSetLegend plotSetLineColor plotSetLineStyle plotSetLineSymbol plotSetLineThickness plotSetNewWindow plotSetTitle plotSetWhichYAxis plotSetXAxisShow plotSetXLabel plotSetXRange plotSetXTicInterval plotSetXTicLabel plotSetYAxisShow plotSetYLabel plotSetYRange plotSetZAxisShow plotSetZLabel plotSurface plotTS plotXY polar polychar polyeval polygamma polyint polymake polymat polymroot polymult polyroot pqgwin previousindex princomp printfm printfmt prodc psi putarray putf putvals pvCreate pvGetIndex pvGetParNames pvGetParVector pvLength pvList pvPack pvPacki pvPackm pvPackmi pvPacks pvPacksi pvPacksm pvPacksmi pvPutParVector pvTest pvUnpack QNewton QNewtonmt QNewtonmtControlCreate QNewtonmtOutCreate QNewtonSet QProg QProgmt QProgmtInCreate qqr qqre qqrep qr qre qrep qrsol qrtsol qtyr qtyre qtyrep quantile quantiled qyr qyre qyrep qz rank rankindx readr real reclassify reclassifyCuts recode recserar recsercp recserrc rerun rescale reshape rets rev rfft rffti rfftip rfftn rfftnp rfftp rndBernoulli rndBeta rndBinomial rndCauchy rndChiSquare rndCon rndCreateState rndExp rndGamma rndGeo rndGumbel rndHyperGeo rndi rndKMbeta rndKMgam rndKMi rndKMn rndKMnb rndKMp rndKMu rndKMvm rndLaplace rndLCbeta rndLCgam rndLCi rndLCn rndLCnb rndLCp rndLCu rndLCvm rndLogNorm rndMTu rndMVn rndMVt rndn rndnb rndNegBinomial rndp rndPoisson rndRayleigh rndStateSkip rndu rndvm rndWeibull rndWishart rotater round rows rowsf rref sampleData satostrC saved saveStruct savewind scale scale3d scalerr scalinfnanmiss scalmiss schtoc schur searchsourcepath seekr select selif seqa seqm setdif setdifsa setvars setvwrmode setwind shell shiftr sin singleindex sinh sleep solpd sortc sortcc sortd sorthc sorthcc sortind sortindc sortmc sortr sortrc spBiconjGradSol spChol spConjGradSol spCreate spDenseSubmat spDiagRvMat spEigv spEye spLDL spline spLU spNumNZE spOnes spreadSheetReadM spreadSheetReadSA spreadSheetWrite spScale spSubmat spToDense spTrTDense spTScalar spZeros sqpSolve sqpSolveMT sqpSolveMTControlCreate sqpSolveMTlagrangeCreate sqpSolveMToutCreate sqpSolveSet sqrt statements stdc stdsc stocv stof strcombine strindx strlen strput strrindx strsect strsplit strsplitPad strtodt strtof strtofcplx strtriml strtrimr strtrunc strtruncl strtruncpad strtruncr submat subscat substute subvec sumc sumr surface svd svd1 svd2 svdcusv svds svdusv sysstate tab tan tanh tempname time timedt timestr timeutc title tkf2eps tkf2ps tocart todaydt toeplitz token topolar trapchk trigamma trimr trunc type typecv typef union unionsa uniqindx uniqindxsa unique uniquesa upmat upmat1 upper utctodt utctodtv utrisol vals varCovMS varCovXS varget vargetl varmall varmares varput varputl vartypef vcm vcms vcx vcxs vec vech vecr vector vget view viewxyz vlist vnamecv volume vput vread vtypecv wait waitc walkindex where window writer xlabel xlsGetSheetCount xlsGetSheetSize xlsGetSheetTypes xlsMakeRange xlsReadM xlsReadSA xlsWrite xlsWriteM xlsWriteSA xpnd xtics xy xyz ylabel ytics zeros zeta zlabel ztics cdfEmpirical dot h5create h5open h5read h5readAttribute h5write h5writeAttribute ldl plotAddErrorBar plotAddSurface plotCDFEmpirical plotSetColormap plotSetContourLabels plotSetLegendFont plotSetTextInterpreter plotSetXTicCount plotSetYTicCount plotSetZLevels powerm strjoin sylvester strtrim",literal:"DB_AFTER_LAST_ROW DB_ALL_TABLES DB_BATCH_OPERATIONS DB_BEFORE_FIRST_ROW DB_BLOB DB_EVENT_NOTIFICATIONS DB_FINISH_QUERY DB_HIGH_PRECISION DB_LAST_INSERT_ID DB_LOW_PRECISION_DOUBLE DB_LOW_PRECISION_INT32 DB_LOW_PRECISION_INT64 DB_LOW_PRECISION_NUMBERS DB_MULTIPLE_RESULT_SETS DB_NAMED_PLACEHOLDERS DB_POSITIONAL_PLACEHOLDERS DB_PREPARED_QUERIES DB_QUERY_SIZE DB_SIMPLE_LOCKING DB_SYSTEM_TABLES DB_TABLES DB_TRANSACTIONS DB_UNICODE DB_VIEWS __STDIN __STDOUT __STDERR __FILE_DIR"},n=o.C("@","@"),a={cN:"meta",b:"#",e:"$",k:{"meta-keyword":"define definecs|10 undef ifdef ifndef iflight ifdllcall ifmac ifos2win ifunix else endif lineson linesoff srcfile srcline"},c:[{b:/\\\n/,relevance:0},{bK:"include",e:"$",k:{"meta-keyword":"include"},c:[{cN:"meta-string",b:'"',e:'"',i:"\\n"}]},o.CLCM,o.CBCM,n]},r={b:/\bstruct\s+/,e:/\s/,k:"struct",c:[{cN:"type",b:o.UIR,relevance:0}]},d=[{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,eW:!0,relevance:0,c:[{cN:"literal",b:/\.\.\./},o.CNM,o.CBCM,n,r]}],l={cN:"title",b:o.UIR,relevance:0},s={cN:"built_in",b:"\\b("+t.built_in.split(" ").join("|")+")\\b"},i={cN:"string",b:'"',e:'"',c:[o.BE],relevance:0},c={b:o.UIR+"\\s*\\(",rB:!0,k:t,relevance:0,c:[{bK:t.keyword},s,{cN:"built_in",b:o.UIR,relevance:0}]},p={b:/\(/,e:/\)/,relevance:0,k:{built_in:t.built_in,literal:t.literal},c:[o.CNM,o.CBCM,n,s,c,i,"self"]};return c.c.push(p),{aliases:["gss"],cI:!0,k:t,i:/(\{[%#]|[%#]\}| <- )/,c:[o.CNM,o.CLCM,o.CBCM,n,i,a,{cN:"keyword",b:/\bexternal (matrix|string|array|sparse matrix|struct|proc|keyword|fn)/},e("proc keyword",";"),e("fn","="),{bK:"for threadfor",e:/;/,relevance:0,c:[o.CBCM,n,p]},{v:[{b:o.UIR+"\\."+o.UIR},{b:o.UIR+"\\s*="}],relevance:0},c,r]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/gcode.min.js b/vendor/assets/javascripts/highlightjs/languages/gcode.min.js
index 60c6c3988e..a3b2fdf87f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gcode.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gcode.min.js
@@ -1 +1 @@
-hljs.registerLanguage("gcode",function(){"use strict";return function(e){var a=[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.COMMENT(/\(/,/\)/),e.inherit(e.C_NUMBER_MODE,{begin:"([-+]?([0-9]*\\.?[0-9]+\\.?))|"+e.C_NUMBER_RE}),e.inherit(e.APOS_STRING_MODE,{illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),{className:"name",begin:"([G])([0-9]+\\.?[0-9]?)"},{className:"name",begin:"([M])([0-9]+\\.?[0-9]?)"},{className:"attr",begin:"(VC|VS|#)",end:"(\\d+)"},{className:"attr",begin:"(VZOFX|VZOFY|VZOFZ)"},{className:"built_in",begin:"(ATAN|ABS|ACOS|ASIN|SIN|COS|EXP|FIX|FUP|ROUND|LN|TAN)(\\[)",end:"([-+]?([0-9]*\\.?[0-9]+\\.?))(\\])"},{className:"symbol",variants:[{begin:"N",end:"\\d+",illegal:"\\W"}]}];return{name:"G-code (ISO 6983)",aliases:["nc"],case_insensitive:!0,keywords:{$pattern:"[A-Z_][A-Z0-9_.]*",keyword:"IF DO WHILE ENDWHILE CALL ENDIF SUB ENDSUB GOTO REPEAT ENDREPEAT EQ LT GT NE GE LE OR XOR"},contains:[{className:"meta",begin:"\\%"},{className:"meta",begin:"([O])([0-9]+)"}].concat(a)}}}());
\ No newline at end of file
+hljs.registerLanguage("gcode",function(N){var e=[N.CLCM,N.CBCM,N.C(/\(/,/\)/),N.inherit(N.CNM,{b:"([-+]?([0-9]*\\.?[0-9]+\\.?))|"+N.CNR}),N.inherit(N.ASM,{i:null}),N.inherit(N.QSM,{i:null}),{cN:"name",b:"([G])([0-9]+\\.?[0-9]?)"},{cN:"name",b:"([M])([0-9]+\\.?[0-9]?)"},{cN:"attr",b:"(VC|VS|#)",e:"(\\d+)"},{cN:"attr",b:"(VZOFX|VZOFY|VZOFZ)"},{cN:"built_in",b:"(ATAN|ABS|ACOS|ASIN|SIN|COS|EXP|FIX|FUP|ROUND|LN|TAN)(\\[)",e:"([-+]?([0-9]*\\.?[0-9]+\\.?))(\\])"},{cN:"symbol",v:[{b:"N",e:"\\d+",i:"\\W"}]}];return{aliases:["nc"],cI:!0,l:"[A-Z_][A-Z0-9_.]*",k:"IF DO WHILE ENDWHILE CALL ENDIF SUB ENDSUB GOTO REPEAT ENDREPEAT EQ LT GT NE GE LE OR XOR",c:[{cN:"meta",b:"\\%"},{cN:"meta",b:"([O])([0-9]+)"}].concat(e)}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/gherkin.min.js b/vendor/assets/javascripts/highlightjs/languages/gherkin.min.js
index 61f134b98c..bc370945db 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gherkin.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gherkin.min.js
@@ -1 +1 @@
-hljs.registerLanguage("gherkin",function(){"use strict";return function(e){return{name:"Gherkin",aliases:["feature"],keywords:"Feature Background Ability Business Need Scenario Scenarios Scenario Outline Scenario Template Examples Given And Then But When",contains:[{className:"symbol",begin:"\\*",relevance:0},{className:"meta",begin:"@[^@\\s]+"},{begin:"\\|",end:"\\|\\w*$",contains:[{className:"string",begin:"[^|]+"}]},{className:"variable",begin:"<",end:">"},e.HASH_COMMENT_MODE,{className:"string",begin:'"""',end:'"""'},e.QUOTE_STRING_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("gherkin",function(e){return{aliases:["feature"],k:"Feature Background Ability Business Need Scenario Scenarios Scenario Outline Scenario Template Examples Given And Then But When",c:[{cN:"symbol",b:"\\*",relevance:0},{cN:"meta",b:"@[^@\\s]+"},{b:"\\|",e:"\\|\\w*$",c:[{cN:"string",b:"[^|]+"}]},{cN:"variable",b:"<",e:">"},e.HCM,{cN:"string",b:'"""',e:'"""'},e.QSM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/glsl.min.js b/vendor/assets/javascripts/highlightjs/languages/glsl.min.js
index e5746faa20..20b7046010 100644
--- a/vendor/assets/javascripts/highlightjs/languages/glsl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/glsl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("glsl",function(){"use strict";return function(e){return{name:"GLSL",keywords:{keyword:"break continue discard do else for if return while switch case default attribute binding buffer ccw centroid centroid varying coherent column_major const cw depth_any depth_greater depth_less depth_unchanged early_fragment_tests equal_spacing flat fractional_even_spacing fractional_odd_spacing highp in index inout invariant invocations isolines layout line_strip lines lines_adjacency local_size_x local_size_y local_size_z location lowp max_vertices mediump noperspective offset origin_upper_left out packed patch pixel_center_integer point_mode points precise precision quads r11f_g11f_b10f r16 r16_snorm r16f r16i r16ui r32f r32i r32ui r8 r8_snorm r8i r8ui readonly restrict rg16 rg16_snorm rg16f rg16i rg16ui rg32f rg32i rg32ui rg8 rg8_snorm rg8i rg8ui rgb10_a2 rgb10_a2ui rgba16 rgba16_snorm rgba16f rgba16i rgba16ui rgba32f rgba32i rgba32ui rgba8 rgba8_snorm rgba8i rgba8ui row_major sample shared smooth std140 std430 stream triangle_strip triangles triangles_adjacency uniform varying vertices volatile writeonly",type:"atomic_uint bool bvec2 bvec3 bvec4 dmat2 dmat2x2 dmat2x3 dmat2x4 dmat3 dmat3x2 dmat3x3 dmat3x4 dmat4 dmat4x2 dmat4x3 dmat4x4 double dvec2 dvec3 dvec4 float iimage1D iimage1DArray iimage2D iimage2DArray iimage2DMS iimage2DMSArray iimage2DRect iimage3D iimageBuffer iimageCube iimageCubeArray image1D image1DArray image2D image2DArray image2DMS image2DMSArray image2DRect image3D imageBuffer imageCube imageCubeArray int isampler1D isampler1DArray isampler2D isampler2DArray isampler2DMS isampler2DMSArray isampler2DRect isampler3D isamplerBuffer isamplerCube isamplerCubeArray ivec2 ivec3 ivec4 mat2 mat2x2 mat2x3 mat2x4 mat3 mat3x2 mat3x3 mat3x4 mat4 mat4x2 mat4x3 mat4x4 sampler1D sampler1DArray sampler1DArrayShadow sampler1DShadow sampler2D sampler2DArray sampler2DArrayShadow sampler2DMS sampler2DMSArray sampler2DRect sampler2DRectShadow sampler2DShadow sampler3D samplerBuffer samplerCube samplerCubeArray samplerCubeArrayShadow samplerCubeShadow image1D uimage1DArray uimage2D uimage2DArray uimage2DMS uimage2DMSArray uimage2DRect uimage3D uimageBuffer uimageCube uimageCubeArray uint usampler1D usampler1DArray usampler2D usampler2DArray usampler2DMS usampler2DMSArray usampler2DRect usampler3D samplerBuffer usamplerCube usamplerCubeArray uvec2 uvec3 uvec4 vec2 vec3 vec4 void",built_in:"gl_MaxAtomicCounterBindings gl_MaxAtomicCounterBufferSize gl_MaxClipDistances gl_MaxClipPlanes gl_MaxCombinedAtomicCounterBuffers gl_MaxCombinedAtomicCounters gl_MaxCombinedImageUniforms gl_MaxCombinedImageUnitsAndFragmentOutputs gl_MaxCombinedTextureImageUnits gl_MaxComputeAtomicCounterBuffers gl_MaxComputeAtomicCounters gl_MaxComputeImageUniforms gl_MaxComputeTextureImageUnits gl_MaxComputeUniformComponents gl_MaxComputeWorkGroupCount gl_MaxComputeWorkGroupSize gl_MaxDrawBuffers gl_MaxFragmentAtomicCounterBuffers gl_MaxFragmentAtomicCounters gl_MaxFragmentImageUniforms gl_MaxFragmentInputComponents gl_MaxFragmentInputVectors gl_MaxFragmentUniformComponents gl_MaxFragmentUniformVectors gl_MaxGeometryAtomicCounterBuffers gl_MaxGeometryAtomicCounters gl_MaxGeometryImageUniforms gl_MaxGeometryInputComponents gl_MaxGeometryOutputComponents gl_MaxGeometryOutputVertices gl_MaxGeometryTextureImageUnits gl_MaxGeometryTotalOutputComponents gl_MaxGeometryUniformComponents gl_MaxGeometryVaryingComponents gl_MaxImageSamples gl_MaxImageUnits gl_MaxLights gl_MaxPatchVertices gl_MaxProgramTexelOffset gl_MaxTessControlAtomicCounterBuffers gl_MaxTessControlAtomicCounters gl_MaxTessControlImageUniforms gl_MaxTessControlInputComponents gl_MaxTessControlOutputComponents gl_MaxTessControlTextureImageUnits gl_MaxTessControlTotalOutputComponents gl_MaxTessControlUniformComponents gl_MaxTessEvaluationAtomicCounterBuffers gl_MaxTessEvaluationAtomicCounters gl_MaxTessEvaluationImageUniforms gl_MaxTessEvaluationInputComponents gl_MaxTessEvaluationOutputComponents gl_MaxTessEvaluationTextureImageUnits gl_MaxTessEvaluationUniformComponents gl_MaxTessGenLevel gl_MaxTessPatchComponents gl_MaxTextureCoords gl_MaxTextureImageUnits gl_MaxTextureUnits gl_MaxVaryingComponents gl_MaxVaryingFloats gl_MaxVaryingVectors gl_MaxVertexAtomicCounterBuffers gl_MaxVertexAtomicCounters gl_MaxVertexAttribs gl_MaxVertexImageUniforms gl_MaxVertexOutputComponents gl_MaxVertexOutputVectors gl_MaxVertexTextureImageUnits gl_MaxVertexUniformComponents gl_MaxVertexUniformVectors gl_MaxViewports gl_MinProgramTexelOffset gl_BackColor gl_BackLightModelProduct gl_BackLightProduct gl_BackMaterial gl_BackSecondaryColor gl_ClipDistance gl_ClipPlane gl_ClipVertex gl_Color gl_DepthRange gl_EyePlaneQ gl_EyePlaneR gl_EyePlaneS gl_EyePlaneT gl_Fog gl_FogCoord gl_FogFragCoord gl_FragColor gl_FragCoord gl_FragData gl_FragDepth gl_FrontColor gl_FrontFacing gl_FrontLightModelProduct gl_FrontLightProduct gl_FrontMaterial gl_FrontSecondaryColor gl_GlobalInvocationID gl_InstanceID gl_InvocationID gl_Layer gl_LightModel gl_LightSource gl_LocalInvocationID gl_LocalInvocationIndex gl_ModelViewMatrix gl_ModelViewMatrixInverse gl_ModelViewMatrixInverseTranspose gl_ModelViewMatrixTranspose gl_ModelViewProjectionMatrix gl_ModelViewProjectionMatrixInverse gl_ModelViewProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixTranspose gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_Normal gl_NormalMatrix gl_NormalScale gl_NumSamples gl_NumWorkGroups gl_ObjectPlaneQ gl_ObjectPlaneR gl_ObjectPlaneS gl_ObjectPlaneT gl_PatchVerticesIn gl_Point gl_PointCoord gl_PointSize gl_Position gl_PrimitiveID gl_PrimitiveIDIn gl_ProjectionMatrix gl_ProjectionMatrixInverse gl_ProjectionMatrixInverseTranspose gl_ProjectionMatrixTranspose gl_SampleID gl_SampleMask gl_SampleMaskIn gl_SamplePosition gl_SecondaryColor gl_TessCoord gl_TessLevelInner gl_TessLevelOuter gl_TexCoord gl_TextureEnvColor gl_TextureMatrix gl_TextureMatrixInverse gl_TextureMatrixInverseTranspose gl_TextureMatrixTranspose gl_Vertex gl_VertexID gl_ViewportIndex gl_WorkGroupID gl_WorkGroupSize gl_in gl_out EmitStreamVertex EmitVertex EndPrimitive EndStreamPrimitive abs acos acosh all any asin asinh atan atanh atomicAdd atomicAnd atomicCompSwap atomicCounter atomicCounterDecrement atomicCounterIncrement atomicExchange atomicMax atomicMin atomicOr atomicXor barrier bitCount bitfieldExtract bitfieldInsert bitfieldReverse ceil clamp cos cosh cross dFdx dFdy degrees determinant distance dot equal exp exp2 faceforward findLSB findMSB floatBitsToInt floatBitsToUint floor fma fract frexp ftransform fwidth greaterThan greaterThanEqual groupMemoryBarrier imageAtomicAdd imageAtomicAnd imageAtomicCompSwap imageAtomicExchange imageAtomicMax imageAtomicMin imageAtomicOr imageAtomicXor imageLoad imageSize imageStore imulExtended intBitsToFloat interpolateAtCentroid interpolateAtOffset interpolateAtSample inverse inversesqrt isinf isnan ldexp length lessThan lessThanEqual log log2 matrixCompMult max memoryBarrier memoryBarrierAtomicCounter memoryBarrierBuffer memoryBarrierImage memoryBarrierShared min mix mod modf noise1 noise2 noise3 noise4 normalize not notEqual outerProduct packDouble2x32 packHalf2x16 packSnorm2x16 packSnorm4x8 packUnorm2x16 packUnorm4x8 pow radians reflect refract round roundEven shadow1D shadow1DLod shadow1DProj shadow1DProjLod shadow2D shadow2DLod shadow2DProj shadow2DProjLod sign sin sinh smoothstep sqrt step tan tanh texelFetch texelFetchOffset texture texture1D texture1DLod texture1DProj texture1DProjLod texture2D texture2DLod texture2DProj texture2DProjLod texture3D texture3DLod texture3DProj texture3DProjLod textureCube textureCubeLod textureGather textureGatherOffset textureGatherOffsets textureGrad textureGradOffset textureLod textureLodOffset textureOffset textureProj textureProjGrad textureProjGradOffset textureProjLod textureProjLodOffset textureProjOffset textureQueryLevels textureQueryLod textureSize transpose trunc uaddCarry uintBitsToFloat umulExtended unpackDouble2x32 unpackHalf2x16 unpackSnorm2x16 unpackSnorm4x8 unpackUnorm2x16 unpackUnorm4x8 usubBorrow",literal:"true false"},illegal:'"',contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.C_NUMBER_MODE,{className:"meta",begin:"#",end:"$"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("glsl",function(e){return{k:{keyword:"break continue discard do else for if return while switch case default attribute binding buffer ccw centroid centroid varying coherent column_major const cw depth_any depth_greater depth_less depth_unchanged early_fragment_tests equal_spacing flat fractional_even_spacing fractional_odd_spacing highp in index inout invariant invocations isolines layout line_strip lines lines_adjacency local_size_x local_size_y local_size_z location lowp max_vertices mediump noperspective offset origin_upper_left out packed patch pixel_center_integer point_mode points precise precision quads r11f_g11f_b10f r16 r16_snorm r16f r16i r16ui r32f r32i r32ui r8 r8_snorm r8i r8ui readonly restrict rg16 rg16_snorm rg16f rg16i rg16ui rg32f rg32i rg32ui rg8 rg8_snorm rg8i rg8ui rgb10_a2 rgb10_a2ui rgba16 rgba16_snorm rgba16f rgba16i rgba16ui rgba32f rgba32i rgba32ui rgba8 rgba8_snorm rgba8i rgba8ui row_major sample shared smooth std140 std430 stream triangle_strip triangles triangles_adjacency uniform varying vertices volatile writeonly",type:"atomic_uint bool bvec2 bvec3 bvec4 dmat2 dmat2x2 dmat2x3 dmat2x4 dmat3 dmat3x2 dmat3x3 dmat3x4 dmat4 dmat4x2 dmat4x3 dmat4x4 double dvec2 dvec3 dvec4 float iimage1D iimage1DArray iimage2D iimage2DArray iimage2DMS iimage2DMSArray iimage2DRect iimage3D iimageBufferiimageCube iimageCubeArray image1D image1DArray image2D image2DArray image2DMS image2DMSArray image2DRect image3D imageBuffer imageCube imageCubeArray int isampler1D isampler1DArray isampler2D isampler2DArray isampler2DMS isampler2DMSArray isampler2DRect isampler3D isamplerBuffer isamplerCube isamplerCubeArray ivec2 ivec3 ivec4 mat2 mat2x2 mat2x3 mat2x4 mat3 mat3x2 mat3x3 mat3x4 mat4 mat4x2 mat4x3 mat4x4 sampler1D sampler1DArray sampler1DArrayShadow sampler1DShadow sampler2D sampler2DArray sampler2DArrayShadow sampler2DMS sampler2DMSArray sampler2DRect sampler2DRectShadow sampler2DShadow sampler3D samplerBuffer samplerCube samplerCubeArray samplerCubeArrayShadow samplerCubeShadow image1D uimage1DArray uimage2D uimage2DArray uimage2DMS uimage2DMSArray uimage2DRect uimage3D uimageBuffer uimageCube uimageCubeArray uint usampler1D usampler1DArray usampler2D usampler2DArray usampler2DMS usampler2DMSArray usampler2DRect usampler3D samplerBuffer usamplerCube usamplerCubeArray uvec2 uvec3 uvec4 vec2 vec3 vec4 void",built_in:"gl_MaxAtomicCounterBindings gl_MaxAtomicCounterBufferSize gl_MaxClipDistances gl_MaxClipPlanes gl_MaxCombinedAtomicCounterBuffers gl_MaxCombinedAtomicCounters gl_MaxCombinedImageUniforms gl_MaxCombinedImageUnitsAndFragmentOutputs gl_MaxCombinedTextureImageUnits gl_MaxComputeAtomicCounterBuffers gl_MaxComputeAtomicCounters gl_MaxComputeImageUniforms gl_MaxComputeTextureImageUnits gl_MaxComputeUniformComponents gl_MaxComputeWorkGroupCount gl_MaxComputeWorkGroupSize gl_MaxDrawBuffers gl_MaxFragmentAtomicCounterBuffers gl_MaxFragmentAtomicCounters gl_MaxFragmentImageUniforms gl_MaxFragmentInputComponents gl_MaxFragmentInputVectors gl_MaxFragmentUniformComponents gl_MaxFragmentUniformVectors gl_MaxGeometryAtomicCounterBuffers gl_MaxGeometryAtomicCounters gl_MaxGeometryImageUniforms gl_MaxGeometryInputComponents gl_MaxGeometryOutputComponents gl_MaxGeometryOutputVertices gl_MaxGeometryTextureImageUnits gl_MaxGeometryTotalOutputComponents gl_MaxGeometryUniformComponents gl_MaxGeometryVaryingComponents gl_MaxImageSamples gl_MaxImageUnits gl_MaxLights gl_MaxPatchVertices gl_MaxProgramTexelOffset gl_MaxTessControlAtomicCounterBuffers gl_MaxTessControlAtomicCounters gl_MaxTessControlImageUniforms gl_MaxTessControlInputComponents gl_MaxTessControlOutputComponents gl_MaxTessControlTextureImageUnits gl_MaxTessControlTotalOutputComponents gl_MaxTessControlUniformComponents gl_MaxTessEvaluationAtomicCounterBuffers gl_MaxTessEvaluationAtomicCounters gl_MaxTessEvaluationImageUniforms gl_MaxTessEvaluationInputComponents gl_MaxTessEvaluationOutputComponents gl_MaxTessEvaluationTextureImageUnits gl_MaxTessEvaluationUniformComponents gl_MaxTessGenLevel gl_MaxTessPatchComponents gl_MaxTextureCoords gl_MaxTextureImageUnits gl_MaxTextureUnits gl_MaxVaryingComponents gl_MaxVaryingFloats gl_MaxVaryingVectors gl_MaxVertexAtomicCounterBuffers gl_MaxVertexAtomicCounters gl_MaxVertexAttribs gl_MaxVertexImageUniforms gl_MaxVertexOutputComponents gl_MaxVertexOutputVectors gl_MaxVertexTextureImageUnits gl_MaxVertexUniformComponents gl_MaxVertexUniformVectors gl_MaxViewports gl_MinProgramTexelOffset gl_BackColor gl_BackLightModelProduct gl_BackLightProduct gl_BackMaterial gl_BackSecondaryColor gl_ClipDistance gl_ClipPlane gl_ClipVertex gl_Color gl_DepthRange gl_EyePlaneQ gl_EyePlaneR gl_EyePlaneS gl_EyePlaneT gl_Fog gl_FogCoord gl_FogFragCoord gl_FragColor gl_FragCoord gl_FragData gl_FragDepth gl_FrontColor gl_FrontFacing gl_FrontLightModelProduct gl_FrontLightProduct gl_FrontMaterial gl_FrontSecondaryColor gl_GlobalInvocationID gl_InstanceID gl_InvocationID gl_Layer gl_LightModel gl_LightSource gl_LocalInvocationID gl_LocalInvocationIndex gl_ModelViewMatrix gl_ModelViewMatrixInverse gl_ModelViewMatrixInverseTranspose gl_ModelViewMatrixTranspose gl_ModelViewProjectionMatrix gl_ModelViewProjectionMatrixInverse gl_ModelViewProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixTranspose gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_Normal gl_NormalMatrix gl_NormalScale gl_NumSamples gl_NumWorkGroups gl_ObjectPlaneQ gl_ObjectPlaneR gl_ObjectPlaneS gl_ObjectPlaneT gl_PatchVerticesIn gl_Point gl_PointCoord gl_PointSize gl_Position gl_PrimitiveID gl_PrimitiveIDIn gl_ProjectionMatrix gl_ProjectionMatrixInverse gl_ProjectionMatrixInverseTranspose gl_ProjectionMatrixTranspose gl_SampleID gl_SampleMask gl_SampleMaskIn gl_SamplePosition gl_SecondaryColor gl_TessCoord gl_TessLevelInner gl_TessLevelOuter gl_TexCoord gl_TextureEnvColor gl_TextureMatrix gl_TextureMatrixInverse gl_TextureMatrixInverseTranspose gl_TextureMatrixTranspose gl_Vertex gl_VertexID gl_ViewportIndex gl_WorkGroupID gl_WorkGroupSize gl_in gl_out EmitStreamVertex EmitVertex EndPrimitive EndStreamPrimitive abs acos acosh all any asin asinh atan atanh atomicAdd atomicAnd atomicCompSwap atomicCounter atomicCounterDecrement atomicCounterIncrement atomicExchange atomicMax atomicMin atomicOr atomicXor barrier bitCount bitfieldExtract bitfieldInsert bitfieldReverse ceil clamp cos cosh cross dFdx dFdy degrees determinant distance dot equal exp exp2 faceforward findLSB findMSB floatBitsToInt floatBitsToUint floor fma fract frexp ftransform fwidth greaterThan greaterThanEqual groupMemoryBarrier imageAtomicAdd imageAtomicAnd imageAtomicCompSwap imageAtomicExchange imageAtomicMax imageAtomicMin imageAtomicOr imageAtomicXor imageLoad imageSize imageStore imulExtended intBitsToFloat interpolateAtCentroid interpolateAtOffset interpolateAtSample inverse inversesqrt isinf isnan ldexp length lessThan lessThanEqual log log2 matrixCompMult max memoryBarrier memoryBarrierAtomicCounter memoryBarrierBuffer memoryBarrierImage memoryBarrierShared min mix mod modf noise1 noise2 noise3 noise4 normalize not notEqual outerProduct packDouble2x32 packHalf2x16 packSnorm2x16 packSnorm4x8 packUnorm2x16 packUnorm4x8 pow radians reflect refract round roundEven shadow1D shadow1DLod shadow1DProj shadow1DProjLod shadow2D shadow2DLod shadow2DProj shadow2DProjLod sign sin sinh smoothstep sqrt step tan tanh texelFetch texelFetchOffset texture texture1D texture1DLod texture1DProj texture1DProjLod texture2D texture2DLod texture2DProj texture2DProjLod texture3D texture3DLod texture3DProj texture3DProjLod textureCube textureCubeLod textureGather textureGatherOffset textureGatherOffsets textureGrad textureGradOffset textureLod textureLodOffset textureOffset textureProj textureProjGrad textureProjGradOffset textureProjLod textureProjLodOffset textureProjOffset textureQueryLevels textureQueryLod textureSize transpose trunc uaddCarry uintBitsToFloat umulExtended unpackDouble2x32 unpackHalf2x16 unpackSnorm2x16 unpackSnorm4x8 unpackUnorm2x16 unpackUnorm4x8 usubBorrow",literal:"true false"},i:'"',c:[e.CLCM,e.CBCM,e.CNM,{cN:"meta",b:"#",e:"$"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/gml.min.js b/vendor/assets/javascripts/highlightjs/languages/gml.min.js
index fdf7734990..0237af27d3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gml.min.js
@@ -1 +1 @@
-hljs.registerLanguage("gml",function(){"use strict";return function(e){return{name:"GML",aliases:["gml","GML"],case_insensitive:!1,keywords:{keyword:"begin end if then else while do for break continue with until repeat exit and or xor not return mod div switch case default var globalvar enum #macro #region #endregion",built_in:"is_real is_string is_array is_undefined is_int32 is_int64 is_ptr is_vec3 is_vec4 is_matrix is_bool typeof variable_global_exists variable_global_get variable_global_set variable_instance_exists variable_instance_get variable_instance_set variable_instance_get_names array_length_1d array_length_2d array_height_2d array_equals array_create array_copy random random_range irandom irandom_range random_set_seed random_get_seed randomize randomise choose abs round floor ceil sign frac sqrt sqr exp ln log2 log10 sin cos tan arcsin arccos arctan arctan2 dsin dcos dtan darcsin darccos darctan darctan2 degtorad radtodeg power logn min max mean median clamp lerp dot_product dot_product_3d dot_product_normalised dot_product_3d_normalised dot_product_normalized dot_product_3d_normalized math_set_epsilon math_get_epsilon angle_difference point_distance_3d point_distance point_direction lengthdir_x lengthdir_y real string int64 ptr string_format chr ansi_char ord string_length string_byte_length string_pos string_copy string_char_at string_ord_at string_byte_at string_set_byte_at string_delete string_insert string_lower string_upper string_repeat string_letters string_digits string_lettersdigits string_replace string_replace_all string_count string_hash_to_newline clipboard_has_text clipboard_set_text clipboard_get_text date_current_datetime date_create_datetime date_valid_datetime date_inc_year date_inc_month date_inc_week date_inc_day date_inc_hour date_inc_minute date_inc_second date_get_year date_get_month date_get_week date_get_day date_get_hour date_get_minute date_get_second date_get_weekday date_get_day_of_year date_get_hour_of_year date_get_minute_of_year date_get_second_of_year date_year_span date_month_span date_week_span date_day_span date_hour_span date_minute_span date_second_span date_compare_datetime date_compare_date date_compare_time date_date_of date_time_of date_datetime_string date_date_string date_time_string date_days_in_month date_days_in_year date_leap_year date_is_today date_set_timezone date_get_timezone game_set_speed game_get_speed motion_set motion_add place_free place_empty place_meeting place_snapped move_random move_snap move_towards_point move_contact_solid move_contact_all move_outside_solid move_outside_all move_bounce_solid move_bounce_all move_wrap distance_to_point distance_to_object position_empty position_meeting path_start path_end mp_linear_step mp_potential_step mp_linear_step_object mp_potential_step_object mp_potential_settings mp_linear_path mp_potential_path mp_linear_path_object mp_potential_path_object mp_grid_create mp_grid_destroy mp_grid_clear_all mp_grid_clear_cell mp_grid_clear_rectangle mp_grid_add_cell mp_grid_get_cell mp_grid_add_rectangle mp_grid_add_instances mp_grid_path mp_grid_draw mp_grid_to_ds_grid collision_point collision_rectangle collision_circle collision_ellipse collision_line collision_point_list collision_rectangle_list collision_circle_list collision_ellipse_list collision_line_list instance_position_list instance_place_list point_in_rectangle point_in_triangle point_in_circle rectangle_in_rectangle rectangle_in_triangle rectangle_in_circle instance_find instance_exists instance_number instance_position instance_nearest instance_furthest instance_place instance_create_depth instance_create_layer instance_copy instance_change instance_destroy position_destroy position_change instance_id_get instance_deactivate_all instance_deactivate_object instance_deactivate_region instance_activate_all instance_activate_object instance_activate_region room_goto room_goto_previous room_goto_next room_previous room_next room_restart game_end game_restart game_load game_save game_save_buffer game_load_buffer event_perform event_user event_perform_object event_inherited show_debug_message show_debug_overlay debug_event debug_get_callstack alarm_get alarm_set font_texture_page_size keyboard_set_map keyboard_get_map keyboard_unset_map keyboard_check keyboard_check_pressed keyboard_check_released keyboard_check_direct keyboard_get_numlock keyboard_set_numlock keyboard_key_press keyboard_key_release keyboard_clear io_clear mouse_check_button mouse_check_button_pressed mouse_check_button_released mouse_wheel_up mouse_wheel_down mouse_clear draw_self draw_sprite draw_sprite_pos draw_sprite_ext draw_sprite_stretched draw_sprite_stretched_ext draw_sprite_tiled draw_sprite_tiled_ext draw_sprite_part draw_sprite_part_ext draw_sprite_general draw_clear draw_clear_alpha draw_point draw_line draw_line_width draw_rectangle draw_roundrect draw_roundrect_ext draw_triangle draw_circle draw_ellipse draw_set_circle_precision draw_arrow draw_button draw_path draw_healthbar draw_getpixel draw_getpixel_ext draw_set_colour draw_set_color draw_set_alpha draw_get_colour draw_get_color draw_get_alpha merge_colour make_colour_rgb make_colour_hsv colour_get_red colour_get_green colour_get_blue colour_get_hue colour_get_saturation colour_get_value merge_color make_color_rgb make_color_hsv color_get_red color_get_green color_get_blue color_get_hue color_get_saturation color_get_value merge_color screen_save screen_save_part draw_set_font draw_set_halign draw_set_valign draw_text draw_text_ext string_width string_height string_width_ext string_height_ext draw_text_transformed draw_text_ext_transformed draw_text_colour draw_text_ext_colour draw_text_transformed_colour draw_text_ext_transformed_colour draw_text_color draw_text_ext_color draw_text_transformed_color draw_text_ext_transformed_color draw_point_colour draw_line_colour draw_line_width_colour draw_rectangle_colour draw_roundrect_colour draw_roundrect_colour_ext draw_triangle_colour draw_circle_colour draw_ellipse_colour draw_point_color draw_line_color draw_line_width_color draw_rectangle_color draw_roundrect_color draw_roundrect_color_ext draw_triangle_color draw_circle_color draw_ellipse_color draw_primitive_begin draw_vertex draw_vertex_colour draw_vertex_color draw_primitive_end sprite_get_uvs font_get_uvs sprite_get_texture font_get_texture texture_get_width texture_get_height texture_get_uvs draw_primitive_begin_texture draw_vertex_texture draw_vertex_texture_colour draw_vertex_texture_color texture_global_scale surface_create surface_create_ext surface_resize surface_free surface_exists surface_get_width surface_get_height surface_get_texture surface_set_target surface_set_target_ext surface_reset_target surface_depth_disable surface_get_depth_disable draw_surface draw_surface_stretched draw_surface_tiled draw_surface_part draw_surface_ext draw_surface_stretched_ext draw_surface_tiled_ext draw_surface_part_ext draw_surface_general surface_getpixel surface_getpixel_ext surface_save surface_save_part surface_copy surface_copy_part application_surface_draw_enable application_get_position application_surface_enable application_surface_is_enabled display_get_width display_get_height display_get_orientation display_get_gui_width display_get_gui_height display_reset display_mouse_get_x display_mouse_get_y display_mouse_set display_set_ui_visibility window_set_fullscreen window_get_fullscreen window_set_caption window_set_min_width window_set_max_width window_set_min_height window_set_max_height window_get_visible_rects window_get_caption window_set_cursor window_get_cursor window_set_colour window_get_colour window_set_color window_get_color window_set_position window_set_size window_set_rectangle window_center window_get_x window_get_y window_get_width window_get_height window_mouse_get_x window_mouse_get_y window_mouse_set window_view_mouse_get_x window_view_mouse_get_y window_views_mouse_get_x window_views_mouse_get_y audio_listener_position audio_listener_velocity audio_listener_orientation audio_emitter_position audio_emitter_create audio_emitter_free audio_emitter_exists audio_emitter_pitch audio_emitter_velocity audio_emitter_falloff audio_emitter_gain audio_play_sound audio_play_sound_on audio_play_sound_at audio_stop_sound audio_resume_music audio_music_is_playing audio_resume_sound audio_pause_sound audio_pause_music audio_channel_num audio_sound_length audio_get_type audio_falloff_set_model audio_play_music audio_stop_music audio_master_gain audio_music_gain audio_sound_gain audio_sound_pitch audio_stop_all audio_resume_all audio_pause_all audio_is_playing audio_is_paused audio_exists audio_sound_set_track_position audio_sound_get_track_position audio_emitter_get_gain audio_emitter_get_pitch audio_emitter_get_x audio_emitter_get_y audio_emitter_get_z audio_emitter_get_vx audio_emitter_get_vy audio_emitter_get_vz audio_listener_set_position audio_listener_set_velocity audio_listener_set_orientation audio_listener_get_data audio_set_master_gain audio_get_master_gain audio_sound_get_gain audio_sound_get_pitch audio_get_name audio_sound_set_track_position audio_sound_get_track_position audio_create_stream audio_destroy_stream audio_create_sync_group audio_destroy_sync_group audio_play_in_sync_group audio_start_sync_group audio_stop_sync_group audio_pause_sync_group audio_resume_sync_group audio_sync_group_get_track_pos audio_sync_group_debug audio_sync_group_is_playing audio_debug audio_group_load audio_group_unload audio_group_is_loaded audio_group_load_progress audio_group_name audio_group_stop_all audio_group_set_gain audio_create_buffer_sound audio_free_buffer_sound audio_create_play_queue audio_free_play_queue audio_queue_sound audio_get_recorder_count audio_get_recorder_info audio_start_recording audio_stop_recording audio_sound_get_listener_mask audio_emitter_get_listener_mask audio_get_listener_mask audio_sound_set_listener_mask audio_emitter_set_listener_mask audio_set_listener_mask audio_get_listener_count audio_get_listener_info audio_system show_message show_message_async clickable_add clickable_add_ext clickable_change clickable_change_ext clickable_delete clickable_exists clickable_set_style show_question show_question_async get_integer get_string get_integer_async get_string_async get_login_async get_open_filename get_save_filename get_open_filename_ext get_save_filename_ext show_error highscore_clear highscore_add highscore_value highscore_name draw_highscore sprite_exists sprite_get_name sprite_get_number sprite_get_width sprite_get_height sprite_get_xoffset sprite_get_yoffset sprite_get_bbox_left sprite_get_bbox_right sprite_get_bbox_top sprite_get_bbox_bottom sprite_save sprite_save_strip sprite_set_cache_size sprite_set_cache_size_ext sprite_get_tpe sprite_prefetch sprite_prefetch_multi sprite_flush sprite_flush_multi sprite_set_speed sprite_get_speed_type sprite_get_speed font_exists font_get_name font_get_fontname font_get_bold font_get_italic font_get_first font_get_last font_get_size font_set_cache_size path_exists path_get_name path_get_length path_get_time path_get_kind path_get_closed path_get_precision path_get_number path_get_point_x path_get_point_y path_get_point_speed path_get_x path_get_y path_get_speed script_exists script_get_name timeline_add timeline_delete timeline_clear timeline_exists timeline_get_name timeline_moment_clear timeline_moment_add_script timeline_size timeline_max_moment object_exists object_get_name object_get_sprite object_get_solid object_get_visible object_get_persistent object_get_mask object_get_parent object_get_physics object_is_ancestor room_exists room_get_name sprite_set_offset sprite_duplicate sprite_assign sprite_merge sprite_add sprite_replace sprite_create_from_surface sprite_add_from_surface sprite_delete sprite_set_alpha_from_sprite sprite_collision_mask font_add_enable_aa font_add_get_enable_aa font_add font_add_sprite font_add_sprite_ext font_replace font_replace_sprite font_replace_sprite_ext font_delete path_set_kind path_set_closed path_set_precision path_add path_assign path_duplicate path_append path_delete path_add_point path_insert_point path_change_point path_delete_point path_clear_points path_reverse path_mirror path_flip path_rotate path_rescale path_shift script_execute object_set_sprite object_set_solid object_set_visible object_set_persistent object_set_mask room_set_width room_set_height room_set_persistent room_set_background_colour room_set_background_color room_set_view room_set_viewport room_get_viewport room_set_view_enabled room_add room_duplicate room_assign room_instance_add room_instance_clear room_get_camera room_set_camera asset_get_index asset_get_type file_text_open_from_string file_text_open_read file_text_open_write file_text_open_append file_text_close file_text_write_string file_text_write_real file_text_writeln file_text_read_string file_text_read_real file_text_readln file_text_eof file_text_eoln file_exists file_delete file_rename file_copy directory_exists directory_create directory_destroy file_find_first file_find_next file_find_close file_attributes filename_name filename_path filename_dir filename_drive filename_ext filename_change_ext file_bin_open file_bin_rewrite file_bin_close file_bin_position file_bin_size file_bin_seek file_bin_write_byte file_bin_read_byte parameter_count parameter_string environment_get_variable ini_open_from_string ini_open ini_close ini_read_string ini_read_real ini_write_string ini_write_real ini_key_exists ini_section_exists ini_key_delete ini_section_delete ds_set_precision ds_exists ds_stack_create ds_stack_destroy ds_stack_clear ds_stack_copy ds_stack_size ds_stack_empty ds_stack_push ds_stack_pop ds_stack_top ds_stack_write ds_stack_read ds_queue_create ds_queue_destroy ds_queue_clear ds_queue_copy ds_queue_size ds_queue_empty ds_queue_enqueue ds_queue_dequeue ds_queue_head ds_queue_tail ds_queue_write ds_queue_read ds_list_create ds_list_destroy ds_list_clear ds_list_copy ds_list_size ds_list_empty ds_list_add ds_list_insert ds_list_replace ds_list_delete ds_list_find_index ds_list_find_value ds_list_mark_as_list ds_list_mark_as_map ds_list_sort ds_list_shuffle ds_list_write ds_list_read ds_list_set ds_map_create ds_map_destroy ds_map_clear ds_map_copy ds_map_size ds_map_empty ds_map_add ds_map_add_list ds_map_add_map ds_map_replace ds_map_replace_map ds_map_replace_list ds_map_delete ds_map_exists ds_map_find_value ds_map_find_previous ds_map_find_next ds_map_find_first ds_map_find_last ds_map_write ds_map_read ds_map_secure_save ds_map_secure_load ds_map_secure_load_buffer ds_map_secure_save_buffer ds_map_set ds_priority_create ds_priority_destroy ds_priority_clear ds_priority_copy ds_priority_size ds_priority_empty ds_priority_add ds_priority_change_priority ds_priority_find_priority ds_priority_delete_value ds_priority_delete_min ds_priority_find_min ds_priority_delete_max ds_priority_find_max ds_priority_write ds_priority_read ds_grid_create ds_grid_destroy ds_grid_copy ds_grid_resize ds_grid_width ds_grid_height ds_grid_clear ds_grid_set ds_grid_add ds_grid_multiply ds_grid_set_region ds_grid_add_region ds_grid_multiply_region ds_grid_set_disk ds_grid_add_disk ds_grid_multiply_disk ds_grid_set_grid_region ds_grid_add_grid_region ds_grid_multiply_grid_region ds_grid_get ds_grid_get_sum ds_grid_get_max ds_grid_get_min ds_grid_get_mean ds_grid_get_disk_sum ds_grid_get_disk_min ds_grid_get_disk_max ds_grid_get_disk_mean ds_grid_value_exists ds_grid_value_x ds_grid_value_y ds_grid_value_disk_exists ds_grid_value_disk_x ds_grid_value_disk_y ds_grid_shuffle ds_grid_write ds_grid_read ds_grid_sort ds_grid_set ds_grid_get effect_create_below effect_create_above effect_clear part_type_create part_type_destroy part_type_exists part_type_clear part_type_shape part_type_sprite part_type_size part_type_scale part_type_orientation part_type_life part_type_step part_type_death part_type_speed part_type_direction part_type_gravity part_type_colour1 part_type_colour2 part_type_colour3 part_type_colour_mix part_type_colour_rgb part_type_colour_hsv part_type_color1 part_type_color2 part_type_color3 part_type_color_mix part_type_color_rgb part_type_color_hsv part_type_alpha1 part_type_alpha2 part_type_alpha3 part_type_blend part_system_create part_system_create_layer part_system_destroy part_system_exists part_system_clear part_system_draw_order part_system_depth part_system_position part_system_automatic_update part_system_automatic_draw part_system_update part_system_drawit part_system_get_layer part_system_layer part_particles_create part_particles_create_colour part_particles_create_color part_particles_clear part_particles_count part_emitter_create part_emitter_destroy part_emitter_destroy_all part_emitter_exists part_emitter_clear part_emitter_region part_emitter_burst part_emitter_stream external_call external_define external_free window_handle window_device matrix_get matrix_set matrix_build_identity matrix_build matrix_build_lookat matrix_build_projection_ortho matrix_build_projection_perspective matrix_build_projection_perspective_fov matrix_multiply matrix_transform_vertex matrix_stack_push matrix_stack_pop matrix_stack_multiply matrix_stack_set matrix_stack_clear matrix_stack_top matrix_stack_is_empty browser_input_capture os_get_config os_get_info os_get_language os_get_region os_lock_orientation display_get_dpi_x display_get_dpi_y display_set_gui_size display_set_gui_maximise display_set_gui_maximize device_mouse_dbclick_enable display_set_timing_method display_get_timing_method display_set_sleep_margin display_get_sleep_margin virtual_key_add virtual_key_hide virtual_key_delete virtual_key_show draw_enable_drawevent draw_enable_swf_aa draw_set_swf_aa_level draw_get_swf_aa_level draw_texture_flush draw_flush gpu_set_blendenable gpu_set_ztestenable gpu_set_zfunc gpu_set_zwriteenable gpu_set_lightingenable gpu_set_fog gpu_set_cullmode gpu_set_blendmode gpu_set_blendmode_ext gpu_set_blendmode_ext_sepalpha gpu_set_colorwriteenable gpu_set_colourwriteenable gpu_set_alphatestenable gpu_set_alphatestref gpu_set_alphatestfunc gpu_set_texfilter gpu_set_texfilter_ext gpu_set_texrepeat gpu_set_texrepeat_ext gpu_set_tex_filter gpu_set_tex_filter_ext gpu_set_tex_repeat gpu_set_tex_repeat_ext gpu_set_tex_mip_filter gpu_set_tex_mip_filter_ext gpu_set_tex_mip_bias gpu_set_tex_mip_bias_ext gpu_set_tex_min_mip gpu_set_tex_min_mip_ext gpu_set_tex_max_mip gpu_set_tex_max_mip_ext gpu_set_tex_max_aniso gpu_set_tex_max_aniso_ext gpu_set_tex_mip_enable gpu_set_tex_mip_enable_ext gpu_get_blendenable gpu_get_ztestenable gpu_get_zfunc gpu_get_zwriteenable gpu_get_lightingenable gpu_get_fog gpu_get_cullmode gpu_get_blendmode gpu_get_blendmode_ext gpu_get_blendmode_ext_sepalpha gpu_get_blendmode_src gpu_get_blendmode_dest gpu_get_blendmode_srcalpha gpu_get_blendmode_destalpha gpu_get_colorwriteenable gpu_get_colourwriteenable gpu_get_alphatestenable gpu_get_alphatestref gpu_get_alphatestfunc gpu_get_texfilter gpu_get_texfilter_ext gpu_get_texrepeat gpu_get_texrepeat_ext gpu_get_tex_filter gpu_get_tex_filter_ext gpu_get_tex_repeat gpu_get_tex_repeat_ext gpu_get_tex_mip_filter gpu_get_tex_mip_filter_ext gpu_get_tex_mip_bias gpu_get_tex_mip_bias_ext gpu_get_tex_min_mip gpu_get_tex_min_mip_ext gpu_get_tex_max_mip gpu_get_tex_max_mip_ext gpu_get_tex_max_aniso gpu_get_tex_max_aniso_ext gpu_get_tex_mip_enable gpu_get_tex_mip_enable_ext gpu_push_state gpu_pop_state gpu_get_state gpu_set_state draw_light_define_ambient draw_light_define_direction draw_light_define_point draw_light_enable draw_set_lighting draw_light_get_ambient draw_light_get draw_get_lighting shop_leave_rating url_get_domain url_open url_open_ext url_open_full get_timer achievement_login achievement_logout achievement_post achievement_increment achievement_post_score achievement_available achievement_show_achievements achievement_show_leaderboards achievement_load_friends achievement_load_leaderboard achievement_send_challenge achievement_load_progress achievement_reset achievement_login_status achievement_get_pic achievement_show_challenge_notifications achievement_get_challenges achievement_event achievement_show achievement_get_info cloud_file_save cloud_string_save cloud_synchronise ads_enable ads_disable ads_setup ads_engagement_launch ads_engagement_available ads_engagement_active ads_event ads_event_preload ads_set_reward_callback ads_get_display_height ads_get_display_width ads_move ads_interstitial_available ads_interstitial_display device_get_tilt_x device_get_tilt_y device_get_tilt_z device_is_keypad_open device_mouse_check_button device_mouse_check_button_pressed device_mouse_check_button_released device_mouse_x device_mouse_y device_mouse_raw_x device_mouse_raw_y device_mouse_x_to_gui device_mouse_y_to_gui iap_activate iap_status iap_enumerate_products iap_restore_all iap_acquire iap_consume iap_product_details iap_purchase_details facebook_init facebook_login facebook_status facebook_graph_request facebook_dialog facebook_logout facebook_launch_offerwall facebook_post_message facebook_send_invite facebook_user_id facebook_accesstoken facebook_check_permission facebook_request_read_permissions facebook_request_publish_permissions gamepad_is_supported gamepad_get_device_count gamepad_is_connected gamepad_get_description gamepad_get_button_threshold gamepad_set_button_threshold gamepad_get_axis_deadzone gamepad_set_axis_deadzone gamepad_button_count gamepad_button_check gamepad_button_check_pressed gamepad_button_check_released gamepad_button_value gamepad_axis_count gamepad_axis_value gamepad_set_vibration gamepad_set_colour gamepad_set_color os_is_paused window_has_focus code_is_compiled http_get http_get_file http_post_string http_request json_encode json_decode zip_unzip load_csv base64_encode base64_decode md5_string_unicode md5_string_utf8 md5_file os_is_network_connected sha1_string_unicode sha1_string_utf8 sha1_file os_powersave_enable analytics_event analytics_event_ext win8_livetile_tile_notification win8_livetile_tile_clear win8_livetile_badge_notification win8_livetile_badge_clear win8_livetile_queue_enable win8_secondarytile_pin win8_secondarytile_badge_notification win8_secondarytile_delete win8_livetile_notification_begin win8_livetile_notification_secondary_begin win8_livetile_notification_expiry win8_livetile_notification_tag win8_livetile_notification_text_add win8_livetile_notification_image_add win8_livetile_notification_end win8_appbar_enable win8_appbar_add_element win8_appbar_remove_element win8_settingscharm_add_entry win8_settingscharm_add_html_entry win8_settingscharm_add_xaml_entry win8_settingscharm_set_xaml_property win8_settingscharm_get_xaml_property win8_settingscharm_remove_entry win8_share_image win8_share_screenshot win8_share_file win8_share_url win8_share_text win8_search_enable win8_search_disable win8_search_add_suggestions win8_device_touchscreen_available win8_license_initialize_sandbox win8_license_trial_version winphone_license_trial_version winphone_tile_title winphone_tile_count winphone_tile_back_title winphone_tile_back_content winphone_tile_back_content_wide winphone_tile_front_image winphone_tile_front_image_small winphone_tile_front_image_wide winphone_tile_back_image winphone_tile_back_image_wide winphone_tile_background_colour winphone_tile_background_color winphone_tile_icon_image winphone_tile_small_icon_image winphone_tile_wide_content winphone_tile_cycle_images winphone_tile_small_background_image physics_world_create physics_world_gravity physics_world_update_speed physics_world_update_iterations physics_world_draw_debug physics_pause_enable physics_fixture_create physics_fixture_set_kinematic physics_fixture_set_density physics_fixture_set_awake physics_fixture_set_restitution physics_fixture_set_friction physics_fixture_set_collision_group physics_fixture_set_sensor physics_fixture_set_linear_damping physics_fixture_set_angular_damping physics_fixture_set_circle_shape physics_fixture_set_box_shape physics_fixture_set_edge_shape physics_fixture_set_polygon_shape physics_fixture_set_chain_shape physics_fixture_add_point physics_fixture_bind physics_fixture_bind_ext physics_fixture_delete physics_apply_force physics_apply_impulse physics_apply_angular_impulse physics_apply_local_force physics_apply_local_impulse physics_apply_torque physics_mass_properties physics_draw_debug physics_test_overlap physics_remove_fixture physics_set_friction physics_set_density physics_set_restitution physics_get_friction physics_get_density physics_get_restitution physics_joint_distance_create physics_joint_rope_create physics_joint_revolute_create physics_joint_prismatic_create physics_joint_pulley_create physics_joint_wheel_create physics_joint_weld_create physics_joint_friction_create physics_joint_gear_create physics_joint_enable_motor physics_joint_get_value physics_joint_set_value physics_joint_delete physics_particle_create physics_particle_delete physics_particle_delete_region_circle physics_particle_delete_region_box physics_particle_delete_region_poly physics_particle_set_flags physics_particle_set_category_flags physics_particle_draw physics_particle_draw_ext physics_particle_count physics_particle_get_data physics_particle_get_data_particle physics_particle_group_begin physics_particle_group_circle physics_particle_group_box physics_particle_group_polygon physics_particle_group_add_point physics_particle_group_end physics_particle_group_join physics_particle_group_delete physics_particle_group_count physics_particle_group_get_data physics_particle_group_get_mass physics_particle_group_get_inertia physics_particle_group_get_centre_x physics_particle_group_get_centre_y physics_particle_group_get_vel_x physics_particle_group_get_vel_y physics_particle_group_get_ang_vel physics_particle_group_get_x physics_particle_group_get_y physics_particle_group_get_angle physics_particle_set_group_flags physics_particle_get_group_flags physics_particle_get_max_count physics_particle_get_radius physics_particle_get_density physics_particle_get_damping physics_particle_get_gravity_scale physics_particle_set_max_count physics_particle_set_radius physics_particle_set_density physics_particle_set_damping physics_particle_set_gravity_scale network_create_socket network_create_socket_ext network_create_server network_create_server_raw network_connect network_connect_raw network_send_packet network_send_raw network_send_broadcast network_send_udp network_send_udp_raw network_set_timeout network_set_config network_resolve network_destroy buffer_create buffer_write buffer_read buffer_seek buffer_get_surface buffer_set_surface buffer_delete buffer_exists buffer_get_type buffer_get_alignment buffer_poke buffer_peek buffer_save buffer_save_ext buffer_load buffer_load_ext buffer_load_partial buffer_copy buffer_fill buffer_get_size buffer_tell buffer_resize buffer_md5 buffer_sha1 buffer_base64_encode buffer_base64_decode buffer_base64_decode_ext buffer_sizeof buffer_get_address buffer_create_from_vertex_buffer buffer_create_from_vertex_buffer_ext buffer_copy_from_vertex_buffer buffer_async_group_begin buffer_async_group_option buffer_async_group_end buffer_load_async buffer_save_async gml_release_mode gml_pragma steam_activate_overlay steam_is_overlay_enabled steam_is_overlay_activated steam_get_persona_name steam_initialised steam_is_cloud_enabled_for_app steam_is_cloud_enabled_for_account steam_file_persisted steam_get_quota_total steam_get_quota_free steam_file_write steam_file_write_file steam_file_read steam_file_delete steam_file_exists steam_file_size steam_file_share steam_is_screenshot_requested steam_send_screenshot steam_is_user_logged_on steam_get_user_steam_id steam_user_owns_dlc steam_user_installed_dlc steam_set_achievement steam_get_achievement steam_clear_achievement steam_set_stat_int steam_set_stat_float steam_set_stat_avg_rate steam_get_stat_int steam_get_stat_float steam_get_stat_avg_rate steam_reset_all_stats steam_reset_all_stats_achievements steam_stats_ready steam_create_leaderboard steam_upload_score steam_upload_score_ext steam_download_scores_around_user steam_download_scores steam_download_friends_scores steam_upload_score_buffer steam_upload_score_buffer_ext steam_current_game_language steam_available_languages steam_activate_overlay_browser steam_activate_overlay_user steam_activate_overlay_store steam_get_user_persona_name steam_get_app_id steam_get_user_account_id steam_ugc_download steam_ugc_create_item steam_ugc_start_item_update steam_ugc_set_item_title steam_ugc_set_item_description steam_ugc_set_item_visibility steam_ugc_set_item_tags steam_ugc_set_item_content steam_ugc_set_item_preview steam_ugc_submit_item_update steam_ugc_get_item_update_progress steam_ugc_subscribe_item steam_ugc_unsubscribe_item steam_ugc_num_subscribed_items steam_ugc_get_subscribed_items steam_ugc_get_item_install_info steam_ugc_get_item_update_info steam_ugc_request_item_details steam_ugc_create_query_user steam_ugc_create_query_user_ex steam_ugc_create_query_all steam_ugc_create_query_all_ex steam_ugc_query_set_cloud_filename_filter steam_ugc_query_set_match_any_tag steam_ugc_query_set_search_text steam_ugc_query_set_ranked_by_trend_days steam_ugc_query_add_required_tag steam_ugc_query_add_excluded_tag steam_ugc_query_set_return_long_description steam_ugc_query_set_return_total_only steam_ugc_query_set_allow_cached_response steam_ugc_send_query shader_set shader_get_name shader_reset shader_current shader_is_compiled shader_get_sampler_index shader_get_uniform shader_set_uniform_i shader_set_uniform_i_array shader_set_uniform_f shader_set_uniform_f_array shader_set_uniform_matrix shader_set_uniform_matrix_array shader_enable_corner_id texture_set_stage texture_get_texel_width texture_get_texel_height shaders_are_supported vertex_format_begin vertex_format_end vertex_format_delete vertex_format_add_position vertex_format_add_position_3d vertex_format_add_colour vertex_format_add_color vertex_format_add_normal vertex_format_add_texcoord vertex_format_add_textcoord vertex_format_add_custom vertex_create_buffer vertex_create_buffer_ext vertex_delete_buffer vertex_begin vertex_end vertex_position vertex_position_3d vertex_colour vertex_color vertex_argb vertex_texcoord vertex_normal vertex_float1 vertex_float2 vertex_float3 vertex_float4 vertex_ubyte4 vertex_submit vertex_freeze vertex_get_number vertex_get_buffer_size vertex_create_buffer_from_buffer vertex_create_buffer_from_buffer_ext push_local_notification push_get_first_local_notification push_get_next_local_notification push_cancel_local_notification skeleton_animation_set skeleton_animation_get skeleton_animation_mix skeleton_animation_set_ext skeleton_animation_get_ext skeleton_animation_get_duration skeleton_animation_get_frames skeleton_animation_clear skeleton_skin_set skeleton_skin_get skeleton_attachment_set skeleton_attachment_get skeleton_attachment_create skeleton_collision_draw_set skeleton_bone_data_get skeleton_bone_data_set skeleton_bone_state_get skeleton_bone_state_set skeleton_get_minmax skeleton_get_num_bounds skeleton_get_bounds skeleton_animation_get_frame skeleton_animation_set_frame draw_skeleton draw_skeleton_time draw_skeleton_instance draw_skeleton_collision skeleton_animation_list skeleton_skin_list skeleton_slot_data layer_get_id layer_get_id_at_depth layer_get_depth layer_create layer_destroy layer_destroy_instances layer_add_instance layer_has_instance layer_set_visible layer_get_visible layer_exists layer_x layer_y layer_get_x layer_get_y layer_hspeed layer_vspeed layer_get_hspeed layer_get_vspeed layer_script_begin layer_script_end layer_shader layer_get_script_begin layer_get_script_end layer_get_shader layer_set_target_room layer_get_target_room layer_reset_target_room layer_get_all layer_get_all_elements layer_get_name layer_depth layer_get_element_layer layer_get_element_type layer_element_move layer_force_draw_depth layer_is_draw_depth_forced layer_get_forced_depth layer_background_get_id layer_background_exists layer_background_create layer_background_destroy layer_background_visible layer_background_change layer_background_sprite layer_background_htiled layer_background_vtiled layer_background_stretch layer_background_yscale layer_background_xscale layer_background_blend layer_background_alpha layer_background_index layer_background_speed layer_background_get_visible layer_background_get_sprite layer_background_get_htiled layer_background_get_vtiled layer_background_get_stretch layer_background_get_yscale layer_background_get_xscale layer_background_get_blend layer_background_get_alpha layer_background_get_index layer_background_get_speed layer_sprite_get_id layer_sprite_exists layer_sprite_create layer_sprite_destroy layer_sprite_change layer_sprite_index layer_sprite_speed layer_sprite_xscale layer_sprite_yscale layer_sprite_angle layer_sprite_blend layer_sprite_alpha layer_sprite_x layer_sprite_y layer_sprite_get_sprite layer_sprite_get_index layer_sprite_get_speed layer_sprite_get_xscale layer_sprite_get_yscale layer_sprite_get_angle layer_sprite_get_blend layer_sprite_get_alpha layer_sprite_get_x layer_sprite_get_y layer_tilemap_get_id layer_tilemap_exists layer_tilemap_create layer_tilemap_destroy tilemap_tileset tilemap_x tilemap_y tilemap_set tilemap_set_at_pixel tilemap_get_tileset tilemap_get_tile_width tilemap_get_tile_height tilemap_get_width tilemap_get_height tilemap_get_x tilemap_get_y tilemap_get tilemap_get_at_pixel tilemap_get_cell_x_at_pixel tilemap_get_cell_y_at_pixel tilemap_clear draw_tilemap draw_tile tilemap_set_global_mask tilemap_get_global_mask tilemap_set_mask tilemap_get_mask tilemap_get_frame tile_set_empty tile_set_index tile_set_flip tile_set_mirror tile_set_rotate tile_get_empty tile_get_index tile_get_flip tile_get_mirror tile_get_rotate layer_tile_exists layer_tile_create layer_tile_destroy layer_tile_change layer_tile_xscale layer_tile_yscale layer_tile_blend layer_tile_alpha layer_tile_x layer_tile_y layer_tile_region layer_tile_visible layer_tile_get_sprite layer_tile_get_xscale layer_tile_get_yscale layer_tile_get_blend layer_tile_get_alpha layer_tile_get_x layer_tile_get_y layer_tile_get_region layer_tile_get_visible layer_instance_get_instance instance_activate_layer instance_deactivate_layer camera_create camera_create_view camera_destroy camera_apply camera_get_active camera_get_default camera_set_default camera_set_view_mat camera_set_proj_mat camera_set_update_script camera_set_begin_script camera_set_end_script camera_set_view_pos camera_set_view_size camera_set_view_speed camera_set_view_border camera_set_view_angle camera_set_view_target camera_get_view_mat camera_get_proj_mat camera_get_update_script camera_get_begin_script camera_get_end_script camera_get_view_x camera_get_view_y camera_get_view_width camera_get_view_height camera_get_view_speed_x camera_get_view_speed_y camera_get_view_border_x camera_get_view_border_y camera_get_view_angle camera_get_view_target view_get_camera view_get_visible view_get_xport view_get_yport view_get_wport view_get_hport view_get_surface_id view_set_camera view_set_visible view_set_xport view_set_yport view_set_wport view_set_hport view_set_surface_id gesture_drag_time gesture_drag_distance gesture_flick_speed gesture_double_tap_time gesture_double_tap_distance gesture_pinch_distance gesture_pinch_angle_towards gesture_pinch_angle_away gesture_rotate_time gesture_rotate_angle gesture_tap_count gesture_get_drag_time gesture_get_drag_distance gesture_get_flick_speed gesture_get_double_tap_time gesture_get_double_tap_distance gesture_get_pinch_distance gesture_get_pinch_angle_towards gesture_get_pinch_angle_away gesture_get_rotate_time gesture_get_rotate_angle gesture_get_tap_count keyboard_virtual_show keyboard_virtual_hide keyboard_virtual_status keyboard_virtual_height",literal:"self other all noone global local undefined pointer_invalid pointer_null path_action_stop path_action_restart path_action_continue path_action_reverse true false pi GM_build_date GM_version GM_runtime_version  timezone_local timezone_utc gamespeed_fps gamespeed_microseconds  ev_create ev_destroy ev_step ev_alarm ev_keyboard ev_mouse ev_collision ev_other ev_draw ev_draw_begin ev_draw_end ev_draw_pre ev_draw_post ev_keypress ev_keyrelease ev_trigger ev_left_button ev_right_button ev_middle_button ev_no_button ev_left_press ev_right_press ev_middle_press ev_left_release ev_right_release ev_middle_release ev_mouse_enter ev_mouse_leave ev_mouse_wheel_up ev_mouse_wheel_down ev_global_left_button ev_global_right_button ev_global_middle_button ev_global_left_press ev_global_right_press ev_global_middle_press ev_global_left_release ev_global_right_release ev_global_middle_release ev_joystick1_left ev_joystick1_right ev_joystick1_up ev_joystick1_down ev_joystick1_button1 ev_joystick1_button2 ev_joystick1_button3 ev_joystick1_button4 ev_joystick1_button5 ev_joystick1_button6 ev_joystick1_button7 ev_joystick1_button8 ev_joystick2_left ev_joystick2_right ev_joystick2_up ev_joystick2_down ev_joystick2_button1 ev_joystick2_button2 ev_joystick2_button3 ev_joystick2_button4 ev_joystick2_button5 ev_joystick2_button6 ev_joystick2_button7 ev_joystick2_button8 ev_outside ev_boundary ev_game_start ev_game_end ev_room_start ev_room_end ev_no_more_lives ev_animation_end ev_end_of_path ev_no_more_health ev_close_button ev_user0 ev_user1 ev_user2 ev_user3 ev_user4 ev_user5 ev_user6 ev_user7 ev_user8 ev_user9 ev_user10 ev_user11 ev_user12 ev_user13 ev_user14 ev_user15 ev_step_normal ev_step_begin ev_step_end ev_gui ev_gui_begin ev_gui_end ev_cleanup ev_gesture ev_gesture_tap ev_gesture_double_tap ev_gesture_drag_start ev_gesture_dragging ev_gesture_drag_end ev_gesture_flick ev_gesture_pinch_start ev_gesture_pinch_in ev_gesture_pinch_out ev_gesture_pinch_end ev_gesture_rotate_start ev_gesture_rotating ev_gesture_rotate_end ev_global_gesture_tap ev_global_gesture_double_tap ev_global_gesture_drag_start ev_global_gesture_dragging ev_global_gesture_drag_end ev_global_gesture_flick ev_global_gesture_pinch_start ev_global_gesture_pinch_in ev_global_gesture_pinch_out ev_global_gesture_pinch_end ev_global_gesture_rotate_start ev_global_gesture_rotating ev_global_gesture_rotate_end vk_nokey vk_anykey vk_enter vk_return vk_shift vk_control vk_alt vk_escape vk_space vk_backspace vk_tab vk_pause vk_printscreen vk_left vk_right vk_up vk_down vk_home vk_end vk_delete vk_insert vk_pageup vk_pagedown vk_f1 vk_f2 vk_f3 vk_f4 vk_f5 vk_f6 vk_f7 vk_f8 vk_f9 vk_f10 vk_f11 vk_f12 vk_numpad0 vk_numpad1 vk_numpad2 vk_numpad3 vk_numpad4 vk_numpad5 vk_numpad6 vk_numpad7 vk_numpad8 vk_numpad9 vk_divide vk_multiply vk_subtract vk_add vk_decimal vk_lshift vk_lcontrol vk_lalt vk_rshift vk_rcontrol vk_ralt  mb_any mb_none mb_left mb_right mb_middle c_aqua c_black c_blue c_dkgray c_fuchsia c_gray c_green c_lime c_ltgray c_maroon c_navy c_olive c_purple c_red c_silver c_teal c_white c_yellow c_orange fa_left fa_center fa_right fa_top fa_middle fa_bottom pr_pointlist pr_linelist pr_linestrip pr_trianglelist pr_trianglestrip pr_trianglefan bm_complex bm_normal bm_add bm_max bm_subtract bm_zero bm_one bm_src_colour bm_inv_src_colour bm_src_color bm_inv_src_color bm_src_alpha bm_inv_src_alpha bm_dest_alpha bm_inv_dest_alpha bm_dest_colour bm_inv_dest_colour bm_dest_color bm_inv_dest_color bm_src_alpha_sat tf_point tf_linear tf_anisotropic mip_off mip_on mip_markedonly audio_falloff_none audio_falloff_inverse_distance audio_falloff_inverse_distance_clamped audio_falloff_linear_distance audio_falloff_linear_distance_clamped audio_falloff_exponent_distance audio_falloff_exponent_distance_clamped audio_old_system audio_new_system audio_mono audio_stereo audio_3d cr_default cr_none cr_arrow cr_cross cr_beam cr_size_nesw cr_size_ns cr_size_nwse cr_size_we cr_uparrow cr_hourglass cr_drag cr_appstart cr_handpoint cr_size_all spritespeed_framespersecond spritespeed_framespergameframe asset_object asset_unknown asset_sprite asset_sound asset_room asset_path asset_script asset_font asset_timeline asset_tiles asset_shader fa_readonly fa_hidden fa_sysfile fa_volumeid fa_directory fa_archive  ds_type_map ds_type_list ds_type_stack ds_type_queue ds_type_grid ds_type_priority ef_explosion ef_ring ef_ellipse ef_firework ef_smoke ef_smokeup ef_star ef_spark ef_flare ef_cloud ef_rain ef_snow pt_shape_pixel pt_shape_disk pt_shape_square pt_shape_line pt_shape_star pt_shape_circle pt_shape_ring pt_shape_sphere pt_shape_flare pt_shape_spark pt_shape_explosion pt_shape_cloud pt_shape_smoke pt_shape_snow ps_distr_linear ps_distr_gaussian ps_distr_invgaussian ps_shape_rectangle ps_shape_ellipse ps_shape_diamond ps_shape_line ty_real ty_string dll_cdecl dll_stdcall matrix_view matrix_projection matrix_world os_win32 os_windows os_macosx os_ios os_android os_symbian os_linux os_unknown os_winphone os_tizen os_win8native os_wiiu os_3ds  os_psvita os_bb10 os_ps4 os_xboxone os_ps3 os_xbox360 os_uwp os_tvos os_switch browser_not_a_browser browser_unknown browser_ie browser_firefox browser_chrome browser_safari browser_safari_mobile browser_opera browser_tizen browser_edge browser_windows_store browser_ie_mobile  device_ios_unknown device_ios_iphone device_ios_iphone_retina device_ios_ipad device_ios_ipad_retina device_ios_iphone5 device_ios_iphone6 device_ios_iphone6plus device_emulator device_tablet display_landscape display_landscape_flipped display_portrait display_portrait_flipped tm_sleep tm_countvsyncs of_challenge_win of_challen ge_lose of_challenge_tie leaderboard_type_number leaderboard_type_time_mins_secs cmpfunc_never cmpfunc_less cmpfunc_equal cmpfunc_lessequal cmpfunc_greater cmpfunc_notequal cmpfunc_greaterequal cmpfunc_always cull_noculling cull_clockwise cull_counterclockwise lighttype_dir lighttype_point iap_ev_storeload iap_ev_product iap_ev_purchase iap_ev_consume iap_ev_restore iap_storeload_ok iap_storeload_failed iap_status_uninitialised iap_status_unavailable iap_status_loading iap_status_available iap_status_processing iap_status_restoring iap_failed iap_unavailable iap_available iap_purchased iap_canceled iap_refunded fb_login_default fb_login_fallback_to_webview fb_login_no_fallback_to_webview fb_login_forcing_webview fb_login_use_system_account fb_login_forcing_safari  phy_joint_anchor_1_x phy_joint_anchor_1_y phy_joint_anchor_2_x phy_joint_anchor_2_y phy_joint_reaction_force_x phy_joint_reaction_force_y phy_joint_reaction_torque phy_joint_motor_speed phy_joint_angle phy_joint_motor_torque phy_joint_max_motor_torque phy_joint_translation phy_joint_speed phy_joint_motor_force phy_joint_max_motor_force phy_joint_length_1 phy_joint_length_2 phy_joint_damping_ratio phy_joint_frequency phy_joint_lower_angle_limit phy_joint_upper_angle_limit phy_joint_angle_limits phy_joint_max_length phy_joint_max_torque phy_joint_max_force phy_debug_render_aabb phy_debug_render_collision_pairs phy_debug_render_coms phy_debug_render_core_shapes phy_debug_render_joints phy_debug_render_obb phy_debug_render_shapes  phy_particle_flag_water phy_particle_flag_zombie phy_particle_flag_wall phy_particle_flag_spring phy_particle_flag_elastic phy_particle_flag_viscous phy_particle_flag_powder phy_particle_flag_tensile phy_particle_flag_colourmixing phy_particle_flag_colormixing phy_particle_group_flag_solid phy_particle_group_flag_rigid phy_particle_data_flag_typeflags phy_particle_data_flag_position phy_particle_data_flag_velocity phy_particle_data_flag_colour phy_particle_data_flag_color phy_particle_data_flag_category  achievement_our_info achievement_friends_info achievement_leaderboard_info achievement_achievement_info achievement_filter_all_players achievement_filter_friends_only achievement_filter_favorites_only achievement_type_achievement_challenge achievement_type_score_challenge achievement_pic_loaded  achievement_show_ui achievement_show_profile achievement_show_leaderboard achievement_show_achievement achievement_show_bank achievement_show_friend_picker achievement_show_purchase_prompt network_socket_tcp network_socket_udp network_socket_bluetooth network_type_connect network_type_disconnect network_type_data network_type_non_blocking_connect network_config_connect_timeout network_config_use_non_blocking_socket network_config_enable_reliable_udp network_config_disable_reliable_udp buffer_fixed buffer_grow buffer_wrap buffer_fast buffer_vbuffer buffer_network buffer_u8 buffer_s8 buffer_u16 buffer_s16 buffer_u32 buffer_s32 buffer_u64 buffer_f16 buffer_f32 buffer_f64 buffer_bool buffer_text buffer_string buffer_surface_copy buffer_seek_start buffer_seek_relative buffer_seek_end buffer_generalerror buffer_outofspace buffer_outofbounds buffer_invalidtype  text_type button_type input_type ANSI_CHARSET DEFAULT_CHARSET EASTEUROPE_CHARSET RUSSIAN_CHARSET SYMBOL_CHARSET SHIFTJIS_CHARSET HANGEUL_CHARSET GB2312_CHARSET CHINESEBIG5_CHARSET JOHAB_CHARSET HEBREW_CHARSET ARABIC_CHARSET GREEK_CHARSET TURKISH_CHARSET VIETNAMESE_CHARSET THAI_CHARSET MAC_CHARSET BALTIC_CHARSET OEM_CHARSET  gp_face1 gp_face2 gp_face3 gp_face4 gp_shoulderl gp_shoulderr gp_shoulderlb gp_shoulderrb gp_select gp_start gp_stickl gp_stickr gp_padu gp_padd gp_padl gp_padr gp_axislh gp_axislv gp_axisrh gp_axisrv ov_friends ov_community ov_players ov_settings ov_gamegroup ov_achievements lb_sort_none lb_sort_ascending lb_sort_descending lb_disp_none lb_disp_numeric lb_disp_time_sec lb_disp_time_ms ugc_result_success ugc_filetype_community ugc_filetype_microtrans ugc_visibility_public ugc_visibility_friends_only ugc_visibility_private ugc_query_RankedByVote ugc_query_RankedByPublicationDate ugc_query_AcceptedForGameRankedByAcceptanceDate ugc_query_RankedByTrend ugc_query_FavoritedByFriendsRankedByPublicationDate ugc_query_CreatedByFriendsRankedByPublicationDate ugc_query_RankedByNumTimesReported ugc_query_CreatedByFollowedUsersRankedByPublicationDate ugc_query_NotYetRated ugc_query_RankedByTotalVotesAsc ugc_query_RankedByVotesUp ugc_query_RankedByTextSearch ugc_sortorder_CreationOrderDesc ugc_sortorder_CreationOrderAsc ugc_sortorder_TitleAsc ugc_sortorder_LastUpdatedDesc ugc_sortorder_SubscriptionDateDesc ugc_sortorder_VoteScoreDesc ugc_sortorder_ForModeration ugc_list_Published ugc_list_VotedOn ugc_list_VotedUp ugc_list_VotedDown ugc_list_WillVoteLater ugc_list_Favorited ugc_list_Subscribed ugc_list_UsedOrPlayed ugc_list_Followed ugc_match_Items ugc_match_Items_Mtx ugc_match_Items_ReadyToUse ugc_match_Collections ugc_match_Artwork ugc_match_Videos ugc_match_Screenshots ugc_match_AllGuides ugc_match_WebGuides ugc_match_IntegratedGuides ugc_match_UsableInGame ugc_match_ControllerBindings  vertex_usage_position vertex_usage_colour vertex_usage_color vertex_usage_normal vertex_usage_texcoord vertex_usage_textcoord vertex_usage_blendweight vertex_usage_blendindices vertex_usage_psize vertex_usage_tangent vertex_usage_binormal vertex_usage_fog vertex_usage_depth vertex_usage_sample vertex_type_float1 vertex_type_float2 vertex_type_float3 vertex_type_float4 vertex_type_colour vertex_type_color vertex_type_ubyte4 layerelementtype_undefined layerelementtype_background layerelementtype_instance layerelementtype_oldtilemap layerelementtype_sprite layerelementtype_tilemap layerelementtype_particlesystem layerelementtype_tile tile_rotate tile_flip tile_mirror tile_index_mask kbv_type_default kbv_type_ascii kbv_type_url kbv_type_email kbv_type_numbers kbv_type_phone kbv_type_phone_name kbv_returnkey_default kbv_returnkey_go kbv_returnkey_google kbv_returnkey_join kbv_returnkey_next kbv_returnkey_route kbv_returnkey_search kbv_returnkey_send kbv_returnkey_yahoo kbv_returnkey_done kbv_returnkey_continue kbv_returnkey_emergency kbv_autocapitalize_none kbv_autocapitalize_words kbv_autocapitalize_sentences kbv_autocapitalize_characters",symbol:"argument_relative argument argument0 argument1 argument2 argument3 argument4 argument5 argument6 argument7 argument8 argument9 argument10 argument11 argument12 argument13 argument14 argument15 argument_count x y xprevious yprevious xstart ystart hspeed vspeed direction speed friction gravity gravity_direction path_index path_position path_positionprevious path_speed path_scale path_orientation path_endaction object_index id solid persistent mask_index instance_count instance_id room_speed fps fps_real current_time current_year current_month current_day current_weekday current_hour current_minute current_second alarm timeline_index timeline_position timeline_speed timeline_running timeline_loop room room_first room_last room_width room_height room_caption room_persistent score lives health show_score show_lives show_health caption_score caption_lives caption_health event_type event_number event_object event_action application_surface gamemaker_pro gamemaker_registered gamemaker_version error_occurred error_last debug_mode keyboard_key keyboard_lastkey keyboard_lastchar keyboard_string mouse_x mouse_y mouse_button mouse_lastbutton cursor_sprite visible sprite_index sprite_width sprite_height sprite_xoffset sprite_yoffset image_number image_index image_speed depth image_xscale image_yscale image_angle image_alpha image_blend bbox_left bbox_right bbox_top bbox_bottom layer background_colour  background_showcolour background_color background_showcolor view_enabled view_current view_visible view_xview view_yview view_wview view_hview view_xport view_yport view_wport view_hport view_angle view_hborder view_vborder view_hspeed view_vspeed view_object view_surface_id view_camera game_id game_display_name game_project_name game_save_id working_directory temp_directory program_directory browser_width browser_height os_type os_device os_browser os_version display_aa async_load delta_time webgl_enabled event_data iap_data phy_rotation phy_position_x phy_position_y phy_angular_velocity phy_linear_velocity_x phy_linear_velocity_y phy_speed_x phy_speed_y phy_speed phy_angular_damping phy_linear_damping phy_bullet phy_fixed_rotation phy_active phy_mass phy_inertia phy_com_x phy_com_y phy_dynamic phy_kinematic phy_sleeping phy_collision_points phy_collision_x phy_collision_y phy_col_normal_x phy_col_normal_y phy_position_xprevious phy_position_yprevious"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("gml",function(e){return{aliases:["gml","GML"],cI:!1,k:{keyword:"begin end if then else while do for break continue with until repeat exit and or xor not return mod div switch case default var globalvar enum #macro #region #endregion",built_in:"is_real is_string is_array is_undefined is_int32 is_int64 is_ptr is_vec3 is_vec4 is_matrix is_bool typeof variable_global_exists variable_global_get variable_global_set variable_instance_exists variable_instance_get variable_instance_set variable_instance_get_names array_length_1d array_length_2d array_height_2d array_equals array_create array_copy random random_range irandom irandom_range random_set_seed random_get_seed randomize randomise choose abs round floor ceil sign frac sqrt sqr exp ln log2 log10 sin cos tan arcsin arccos arctan arctan2 dsin dcos dtan darcsin darccos darctan darctan2 degtorad radtodeg power logn min max mean median clamp lerp dot_product dot_product_3d dot_product_normalised dot_product_3d_normalised dot_product_normalized dot_product_3d_normalized math_set_epsilon math_get_epsilon angle_difference point_distance_3d point_distance point_direction lengthdir_x lengthdir_y real string int64 ptr string_format chr ansi_char ord string_length string_byte_length string_pos string_copy string_char_at string_ord_at string_byte_at string_set_byte_at string_delete string_insert string_lower string_upper string_repeat string_letters string_digits string_lettersdigits string_replace string_replace_all string_count string_hash_to_newline clipboard_has_text clipboard_set_text clipboard_get_text date_current_datetime date_create_datetime date_valid_datetime date_inc_year date_inc_month date_inc_week date_inc_day date_inc_hour date_inc_minute date_inc_second date_get_year date_get_month date_get_week date_get_day date_get_hour date_get_minute date_get_second date_get_weekday date_get_day_of_year date_get_hour_of_year date_get_minute_of_year date_get_second_of_year date_year_span date_month_span date_week_span date_day_span date_hour_span date_minute_span date_second_span date_compare_datetime date_compare_date date_compare_time date_date_of date_time_of date_datetime_string date_date_string date_time_string date_days_in_month date_days_in_year date_leap_year date_is_today date_set_timezone date_get_timezone game_set_speed game_get_speed motion_set motion_add place_free place_empty place_meeting place_snapped move_random move_snap move_towards_point move_contact_solid move_contact_all move_outside_solid move_outside_all move_bounce_solid move_bounce_all move_wrap distance_to_point distance_to_object position_empty position_meeting path_start path_end mp_linear_step mp_potential_step mp_linear_step_object mp_potential_step_object mp_potential_settings mp_linear_path mp_potential_path mp_linear_path_object mp_potential_path_object mp_grid_create mp_grid_destroy mp_grid_clear_all mp_grid_clear_cell mp_grid_clear_rectangle mp_grid_add_cell mp_grid_get_cell mp_grid_add_rectangle mp_grid_add_instances mp_grid_path mp_grid_draw mp_grid_to_ds_grid collision_point collision_rectangle collision_circle collision_ellipse collision_line collision_point_list collision_rectangle_list collision_circle_list collision_ellipse_list collision_line_list instance_position_list instance_place_list point_in_rectangle point_in_triangle point_in_circle rectangle_in_rectangle rectangle_in_triangle rectangle_in_circle instance_find instance_exists instance_number instance_position instance_nearest instance_furthest instance_place instance_create_depth instance_create_layer instance_copy instance_change instance_destroy position_destroy position_change instance_id_get instance_deactivate_all instance_deactivate_object instance_deactivate_region instance_activate_all instance_activate_object instance_activate_region room_goto room_goto_previous room_goto_next room_previous room_next room_restart game_end game_restart game_load game_save game_save_buffer game_load_buffer event_perform event_user event_perform_object event_inherited show_debug_message show_debug_overlay debug_event debug_get_callstack alarm_get alarm_set font_texture_page_size keyboard_set_map keyboard_get_map keyboard_unset_map keyboard_check keyboard_check_pressed keyboard_check_released keyboard_check_direct keyboard_get_numlock keyboard_set_numlock keyboard_key_press keyboard_key_release keyboard_clear io_clear mouse_check_button mouse_check_button_pressed mouse_check_button_released mouse_wheel_up mouse_wheel_down mouse_clear draw_self draw_sprite draw_sprite_pos draw_sprite_ext draw_sprite_stretched draw_sprite_stretched_ext draw_sprite_tiled draw_sprite_tiled_ext draw_sprite_part draw_sprite_part_ext draw_sprite_general draw_clear draw_clear_alpha draw_point draw_line draw_line_width draw_rectangle draw_roundrect draw_roundrect_ext draw_triangle draw_circle draw_ellipse draw_set_circle_precision draw_arrow draw_button draw_path draw_healthbar draw_getpixel draw_getpixel_ext draw_set_colour draw_set_color draw_set_alpha draw_get_colour draw_get_color draw_get_alpha merge_colour make_colour_rgb make_colour_hsv colour_get_red colour_get_green colour_get_blue colour_get_hue colour_get_saturation colour_get_value merge_color make_color_rgb make_color_hsv color_get_red color_get_green color_get_blue color_get_hue color_get_saturation color_get_value merge_color screen_save screen_save_part draw_set_font draw_set_halign draw_set_valign draw_text draw_text_ext string_width string_height string_width_ext string_height_ext draw_text_transformed draw_text_ext_transformed draw_text_colour draw_text_ext_colour draw_text_transformed_colour draw_text_ext_transformed_colour draw_text_color draw_text_ext_color draw_text_transformed_color draw_text_ext_transformed_color draw_point_colour draw_line_colour draw_line_width_colour draw_rectangle_colour draw_roundrect_colour draw_roundrect_colour_ext draw_triangle_colour draw_circle_colour draw_ellipse_colour draw_point_color draw_line_color draw_line_width_color draw_rectangle_color draw_roundrect_color draw_roundrect_color_ext draw_triangle_color draw_circle_color draw_ellipse_color draw_primitive_begin draw_vertex draw_vertex_colour draw_vertex_color draw_primitive_end sprite_get_uvs font_get_uvs sprite_get_texture font_get_texture texture_get_width texture_get_height texture_get_uvs draw_primitive_begin_texture draw_vertex_texture draw_vertex_texture_colour draw_vertex_texture_color texture_global_scale surface_create surface_create_ext surface_resize surface_free surface_exists surface_get_width surface_get_height surface_get_texture surface_set_target surface_set_target_ext surface_reset_target surface_depth_disable surface_get_depth_disable draw_surface draw_surface_stretched draw_surface_tiled draw_surface_part draw_surface_ext draw_surface_stretched_ext draw_surface_tiled_ext draw_surface_part_ext draw_surface_general surface_getpixel surface_getpixel_ext surface_save surface_save_part surface_copy surface_copy_part application_surface_draw_enable application_get_position application_surface_enable application_surface_is_enabled display_get_width display_get_height display_get_orientation display_get_gui_width display_get_gui_height display_reset display_mouse_get_x display_mouse_get_y display_mouse_set display_set_ui_visibility window_set_fullscreen window_get_fullscreen window_set_caption window_set_min_width window_set_max_width window_set_min_height window_set_max_height window_get_visible_rects window_get_caption window_set_cursor window_get_cursor window_set_colour window_get_colour window_set_color window_get_color window_set_position window_set_size window_set_rectangle window_center window_get_x window_get_y window_get_width window_get_height window_mouse_get_x window_mouse_get_y window_mouse_set window_view_mouse_get_x window_view_mouse_get_y window_views_mouse_get_x window_views_mouse_get_y audio_listener_position audio_listener_velocity audio_listener_orientation audio_emitter_position audio_emitter_create audio_emitter_free audio_emitter_exists audio_emitter_pitch audio_emitter_velocity audio_emitter_falloff audio_emitter_gain audio_play_sound audio_play_sound_on audio_play_sound_at audio_stop_sound audio_resume_music audio_music_is_playing audio_resume_sound audio_pause_sound audio_pause_music audio_channel_num audio_sound_length audio_get_type audio_falloff_set_model audio_play_music audio_stop_music audio_master_gain audio_music_gain audio_sound_gain audio_sound_pitch audio_stop_all audio_resume_all audio_pause_all audio_is_playing audio_is_paused audio_exists audio_sound_set_track_position audio_sound_get_track_position audio_emitter_get_gain audio_emitter_get_pitch audio_emitter_get_x audio_emitter_get_y audio_emitter_get_z audio_emitter_get_vx audio_emitter_get_vy audio_emitter_get_vz audio_listener_set_position audio_listener_set_velocity audio_listener_set_orientation audio_listener_get_data audio_set_master_gain audio_get_master_gain audio_sound_get_gain audio_sound_get_pitch audio_get_name audio_sound_set_track_position audio_sound_get_track_position audio_create_stream audio_destroy_stream audio_create_sync_group audio_destroy_sync_group audio_play_in_sync_group audio_start_sync_group audio_stop_sync_group audio_pause_sync_group audio_resume_sync_group audio_sync_group_get_track_pos audio_sync_group_debug audio_sync_group_is_playing audio_debug audio_group_load audio_group_unload audio_group_is_loaded audio_group_load_progress audio_group_name audio_group_stop_all audio_group_set_gain audio_create_buffer_sound audio_free_buffer_sound audio_create_play_queue audio_free_play_queue audio_queue_sound audio_get_recorder_count audio_get_recorder_info audio_start_recording audio_stop_recording audio_sound_get_listener_mask audio_emitter_get_listener_mask audio_get_listener_mask audio_sound_set_listener_mask audio_emitter_set_listener_mask audio_set_listener_mask audio_get_listener_count audio_get_listener_info audio_system show_message show_message_async clickable_add clickable_add_ext clickable_change clickable_change_ext clickable_delete clickable_exists clickable_set_style show_question show_question_async get_integer get_string get_integer_async get_string_async get_login_async get_open_filename get_save_filename get_open_filename_ext get_save_filename_ext show_error highscore_clear highscore_add highscore_value highscore_name draw_highscore sprite_exists sprite_get_name sprite_get_number sprite_get_width sprite_get_height sprite_get_xoffset sprite_get_yoffset sprite_get_bbox_left sprite_get_bbox_right sprite_get_bbox_top sprite_get_bbox_bottom sprite_save sprite_save_strip sprite_set_cache_size sprite_set_cache_size_ext sprite_get_tpe sprite_prefetch sprite_prefetch_multi sprite_flush sprite_flush_multi sprite_set_speed sprite_get_speed_type sprite_get_speed font_exists font_get_name font_get_fontname font_get_bold font_get_italic font_get_first font_get_last font_get_size font_set_cache_size path_exists path_get_name path_get_length path_get_time path_get_kind path_get_closed path_get_precision path_get_number path_get_point_x path_get_point_y path_get_point_speed path_get_x path_get_y path_get_speed script_exists script_get_name timeline_add timeline_delete timeline_clear timeline_exists timeline_get_name timeline_moment_clear timeline_moment_add_script timeline_size timeline_max_moment object_exists object_get_name object_get_sprite object_get_solid object_get_visible object_get_persistent object_get_mask object_get_parent object_get_physics object_is_ancestor room_exists room_get_name sprite_set_offset sprite_duplicate sprite_assign sprite_merge sprite_add sprite_replace sprite_create_from_surface sprite_add_from_surface sprite_delete sprite_set_alpha_from_sprite sprite_collision_mask font_add_enable_aa font_add_get_enable_aa font_add font_add_sprite font_add_sprite_ext font_replace font_replace_sprite font_replace_sprite_ext font_delete path_set_kind path_set_closed path_set_precision path_add path_assign path_duplicate path_append path_delete path_add_point path_insert_point path_change_point path_delete_point path_clear_points path_reverse path_mirror path_flip path_rotate path_rescale path_shift script_execute object_set_sprite object_set_solid object_set_visible object_set_persistent object_set_mask room_set_width room_set_height room_set_persistent room_set_background_colour room_set_background_color room_set_view room_set_viewport room_get_viewport room_set_view_enabled room_add room_duplicate room_assign room_instance_add room_instance_clear room_get_camera room_set_camera asset_get_index asset_get_type file_text_open_from_string file_text_open_read file_text_open_write file_text_open_append file_text_close file_text_write_string file_text_write_real file_text_writeln file_text_read_string file_text_read_real file_text_readln file_text_eof file_text_eoln file_exists file_delete file_rename file_copy directory_exists directory_create directory_destroy file_find_first file_find_next file_find_close file_attributes filename_name filename_path filename_dir filename_drive filename_ext filename_change_ext file_bin_open file_bin_rewrite file_bin_close file_bin_position file_bin_size file_bin_seek file_bin_write_byte file_bin_read_byte parameter_count parameter_string environment_get_variable ini_open_from_string ini_open ini_close ini_read_string ini_read_real ini_write_string ini_write_real ini_key_exists ini_section_exists ini_key_delete ini_section_delete ds_set_precision ds_exists ds_stack_create ds_stack_destroy ds_stack_clear ds_stack_copy ds_stack_size ds_stack_empty ds_stack_push ds_stack_pop ds_stack_top ds_stack_write ds_stack_read ds_queue_create ds_queue_destroy ds_queue_clear ds_queue_copy ds_queue_size ds_queue_empty ds_queue_enqueue ds_queue_dequeue ds_queue_head ds_queue_tail ds_queue_write ds_queue_read ds_list_create ds_list_destroy ds_list_clear ds_list_copy ds_list_size ds_list_empty ds_list_add ds_list_insert ds_list_replace ds_list_delete ds_list_find_index ds_list_find_value ds_list_mark_as_list ds_list_mark_as_map ds_list_sort ds_list_shuffle ds_list_write ds_list_read ds_list_set ds_map_create ds_map_destroy ds_map_clear ds_map_copy ds_map_size ds_map_empty ds_map_add ds_map_add_list ds_map_add_map ds_map_replace ds_map_replace_map ds_map_replace_list ds_map_delete ds_map_exists ds_map_find_value ds_map_find_previous ds_map_find_next ds_map_find_first ds_map_find_last ds_map_write ds_map_read ds_map_secure_save ds_map_secure_load ds_map_secure_load_buffer ds_map_secure_save_buffer ds_map_set ds_priority_create ds_priority_destroy ds_priority_clear ds_priority_copy ds_priority_size ds_priority_empty ds_priority_add ds_priority_change_priority ds_priority_find_priority ds_priority_delete_value ds_priority_delete_min ds_priority_find_min ds_priority_delete_max ds_priority_find_max ds_priority_write ds_priority_read ds_grid_create ds_grid_destroy ds_grid_copy ds_grid_resize ds_grid_width ds_grid_height ds_grid_clear ds_grid_set ds_grid_add ds_grid_multiply ds_grid_set_region ds_grid_add_region ds_grid_multiply_region ds_grid_set_disk ds_grid_add_disk ds_grid_multiply_disk ds_grid_set_grid_region ds_grid_add_grid_region ds_grid_multiply_grid_region ds_grid_get ds_grid_get_sum ds_grid_get_max ds_grid_get_min ds_grid_get_mean ds_grid_get_disk_sum ds_grid_get_disk_min ds_grid_get_disk_max ds_grid_get_disk_mean ds_grid_value_exists ds_grid_value_x ds_grid_value_y ds_grid_value_disk_exists ds_grid_value_disk_x ds_grid_value_disk_y ds_grid_shuffle ds_grid_write ds_grid_read ds_grid_sort ds_grid_set ds_grid_get effect_create_below effect_create_above effect_clear part_type_create part_type_destroy part_type_exists part_type_clear part_type_shape part_type_sprite part_type_size part_type_scale part_type_orientation part_type_life part_type_step part_type_death part_type_speed part_type_direction part_type_gravity part_type_colour1 part_type_colour2 part_type_colour3 part_type_colour_mix part_type_colour_rgb part_type_colour_hsv part_type_color1 part_type_color2 part_type_color3 part_type_color_mix part_type_color_rgb part_type_color_hsv part_type_alpha1 part_type_alpha2 part_type_alpha3 part_type_blend part_system_create part_system_create_layer part_system_destroy part_system_exists part_system_clear part_system_draw_order part_system_depth part_system_position part_system_automatic_update part_system_automatic_draw part_system_update part_system_drawit part_system_get_layer part_system_layer part_particles_create part_particles_create_colour part_particles_create_color part_particles_clear part_particles_count part_emitter_create part_emitter_destroy part_emitter_destroy_all part_emitter_exists part_emitter_clear part_emitter_region part_emitter_burst part_emitter_stream external_call external_define external_free window_handle window_device matrix_get matrix_set matrix_build_identity matrix_build matrix_build_lookat matrix_build_projection_ortho matrix_build_projection_perspective matrix_build_projection_perspective_fov matrix_multiply matrix_transform_vertex matrix_stack_push matrix_stack_pop matrix_stack_multiply matrix_stack_set matrix_stack_clear matrix_stack_top matrix_stack_is_empty browser_input_capture os_get_config os_get_info os_get_language os_get_region os_lock_orientation display_get_dpi_x display_get_dpi_y display_set_gui_size display_set_gui_maximise display_set_gui_maximize device_mouse_dbclick_enable display_set_timing_method display_get_timing_method display_set_sleep_margin display_get_sleep_margin virtual_key_add virtual_key_hide virtual_key_delete virtual_key_show draw_enable_drawevent draw_enable_swf_aa draw_set_swf_aa_level draw_get_swf_aa_level draw_texture_flush draw_flush gpu_set_blendenable gpu_set_ztestenable gpu_set_zfunc gpu_set_zwriteenable gpu_set_lightingenable gpu_set_fog gpu_set_cullmode gpu_set_blendmode gpu_set_blendmode_ext gpu_set_blendmode_ext_sepalpha gpu_set_colorwriteenable gpu_set_colourwriteenable gpu_set_alphatestenable gpu_set_alphatestref gpu_set_alphatestfunc gpu_set_texfilter gpu_set_texfilter_ext gpu_set_texrepeat gpu_set_texrepeat_ext gpu_set_tex_filter gpu_set_tex_filter_ext gpu_set_tex_repeat gpu_set_tex_repeat_ext gpu_set_tex_mip_filter gpu_set_tex_mip_filter_ext gpu_set_tex_mip_bias gpu_set_tex_mip_bias_ext gpu_set_tex_min_mip gpu_set_tex_min_mip_ext gpu_set_tex_max_mip gpu_set_tex_max_mip_ext gpu_set_tex_max_aniso gpu_set_tex_max_aniso_ext gpu_set_tex_mip_enable gpu_set_tex_mip_enable_ext gpu_get_blendenable gpu_get_ztestenable gpu_get_zfunc gpu_get_zwriteenable gpu_get_lightingenable gpu_get_fog gpu_get_cullmode gpu_get_blendmode gpu_get_blendmode_ext gpu_get_blendmode_ext_sepalpha gpu_get_blendmode_src gpu_get_blendmode_dest gpu_get_blendmode_srcalpha gpu_get_blendmode_destalpha gpu_get_colorwriteenable gpu_get_colourwriteenable gpu_get_alphatestenable gpu_get_alphatestref gpu_get_alphatestfunc gpu_get_texfilter gpu_get_texfilter_ext gpu_get_texrepeat gpu_get_texrepeat_ext gpu_get_tex_filter gpu_get_tex_filter_ext gpu_get_tex_repeat gpu_get_tex_repeat_ext gpu_get_tex_mip_filter gpu_get_tex_mip_filter_ext gpu_get_tex_mip_bias gpu_get_tex_mip_bias_ext gpu_get_tex_min_mip gpu_get_tex_min_mip_ext gpu_get_tex_max_mip gpu_get_tex_max_mip_ext gpu_get_tex_max_aniso gpu_get_tex_max_aniso_ext gpu_get_tex_mip_enable gpu_get_tex_mip_enable_ext gpu_push_state gpu_pop_state gpu_get_state gpu_set_state draw_light_define_ambient draw_light_define_direction draw_light_define_point draw_light_enable draw_set_lighting draw_light_get_ambient draw_light_get draw_get_lighting shop_leave_rating url_get_domain url_open url_open_ext url_open_full get_timer achievement_login achievement_logout achievement_post achievement_increment achievement_post_score achievement_available achievement_show_achievements achievement_show_leaderboards achievement_load_friends achievement_load_leaderboard achievement_send_challenge achievement_load_progress achievement_reset achievement_login_status achievement_get_pic achievement_show_challenge_notifications achievement_get_challenges achievement_event achievement_show achievement_get_info cloud_file_save cloud_string_save cloud_synchronise ads_enable ads_disable ads_setup ads_engagement_launch ads_engagement_available ads_engagement_active ads_event ads_event_preload ads_set_reward_callback ads_get_display_height ads_get_display_width ads_move ads_interstitial_available ads_interstitial_display device_get_tilt_x device_get_tilt_y device_get_tilt_z device_is_keypad_open device_mouse_check_button device_mouse_check_button_pressed device_mouse_check_button_released device_mouse_x device_mouse_y device_mouse_raw_x device_mouse_raw_y device_mouse_x_to_gui device_mouse_y_to_gui iap_activate iap_status iap_enumerate_products iap_restore_all iap_acquire iap_consume iap_product_details iap_purchase_details facebook_init facebook_login facebook_status facebook_graph_request facebook_dialog facebook_logout facebook_launch_offerwall facebook_post_message facebook_send_invite facebook_user_id facebook_accesstoken facebook_check_permission facebook_request_read_permissions facebook_request_publish_permissions gamepad_is_supported gamepad_get_device_count gamepad_is_connected gamepad_get_description gamepad_get_button_threshold gamepad_set_button_threshold gamepad_get_axis_deadzone gamepad_set_axis_deadzone gamepad_button_count gamepad_button_check gamepad_button_check_pressed gamepad_button_check_released gamepad_button_value gamepad_axis_count gamepad_axis_value gamepad_set_vibration gamepad_set_colour gamepad_set_color os_is_paused window_has_focus code_is_compiled http_get http_get_file http_post_string http_request json_encode json_decode zip_unzip load_csv base64_encode base64_decode md5_string_unicode md5_string_utf8 md5_file os_is_network_connected sha1_string_unicode sha1_string_utf8 sha1_file os_powersave_enable analytics_event analytics_event_ext win8_livetile_tile_notification win8_livetile_tile_clear win8_livetile_badge_notification win8_livetile_badge_clear win8_livetile_queue_enable win8_secondarytile_pin win8_secondarytile_badge_notification win8_secondarytile_delete win8_livetile_notification_begin win8_livetile_notification_secondary_begin win8_livetile_notification_expiry win8_livetile_notification_tag win8_livetile_notification_text_add win8_livetile_notification_image_add win8_livetile_notification_end win8_appbar_enable win8_appbar_add_element win8_appbar_remove_element win8_settingscharm_add_entry win8_settingscharm_add_html_entry win8_settingscharm_add_xaml_entry win8_settingscharm_set_xaml_property win8_settingscharm_get_xaml_property win8_settingscharm_remove_entry win8_share_image win8_share_screenshot win8_share_file win8_share_url win8_share_text win8_search_enable win8_search_disable win8_search_add_suggestions win8_device_touchscreen_available win8_license_initialize_sandbox win8_license_trial_version winphone_license_trial_version winphone_tile_title winphone_tile_count winphone_tile_back_title winphone_tile_back_content winphone_tile_back_content_wide winphone_tile_front_image winphone_tile_front_image_small winphone_tile_front_image_wide winphone_tile_back_image winphone_tile_back_image_wide winphone_tile_background_colour winphone_tile_background_color winphone_tile_icon_image winphone_tile_small_icon_image winphone_tile_wide_content winphone_tile_cycle_images winphone_tile_small_background_image physics_world_create physics_world_gravity physics_world_update_speed physics_world_update_iterations physics_world_draw_debug physics_pause_enable physics_fixture_create physics_fixture_set_kinematic physics_fixture_set_density physics_fixture_set_awake physics_fixture_set_restitution physics_fixture_set_friction physics_fixture_set_collision_group physics_fixture_set_sensor physics_fixture_set_linear_damping physics_fixture_set_angular_damping physics_fixture_set_circle_shape physics_fixture_set_box_shape physics_fixture_set_edge_shape physics_fixture_set_polygon_shape physics_fixture_set_chain_shape physics_fixture_add_point physics_fixture_bind physics_fixture_bind_ext physics_fixture_delete physics_apply_force physics_apply_impulse physics_apply_angular_impulse physics_apply_local_force physics_apply_local_impulse physics_apply_torque physics_mass_properties physics_draw_debug physics_test_overlap physics_remove_fixture physics_set_friction physics_set_density physics_set_restitution physics_get_friction physics_get_density physics_get_restitution physics_joint_distance_create physics_joint_rope_create physics_joint_revolute_create physics_joint_prismatic_create physics_joint_pulley_create physics_joint_wheel_create physics_joint_weld_create physics_joint_friction_create physics_joint_gear_create physics_joint_enable_motor physics_joint_get_value physics_joint_set_value physics_joint_delete physics_particle_create physics_particle_delete physics_particle_delete_region_circle physics_particle_delete_region_box physics_particle_delete_region_poly physics_particle_set_flags physics_particle_set_category_flags physics_particle_draw physics_particle_draw_ext physics_particle_count physics_particle_get_data physics_particle_get_data_particle physics_particle_group_begin physics_particle_group_circle physics_particle_group_box physics_particle_group_polygon physics_particle_group_add_point physics_particle_group_end physics_particle_group_join physics_particle_group_delete physics_particle_group_count physics_particle_group_get_data physics_particle_group_get_mass physics_particle_group_get_inertia physics_particle_group_get_centre_x physics_particle_group_get_centre_y physics_particle_group_get_vel_x physics_particle_group_get_vel_y physics_particle_group_get_ang_vel physics_particle_group_get_x physics_particle_group_get_y physics_particle_group_get_angle physics_particle_set_group_flags physics_particle_get_group_flags physics_particle_get_max_count physics_particle_get_radius physics_particle_get_density physics_particle_get_damping physics_particle_get_gravity_scale physics_particle_set_max_count physics_particle_set_radius physics_particle_set_density physics_particle_set_damping physics_particle_set_gravity_scale network_create_socket network_create_socket_ext network_create_server network_create_server_raw network_connect network_connect_raw network_send_packet network_send_raw network_send_broadcast network_send_udp network_send_udp_raw network_set_timeout network_set_config network_resolve network_destroy buffer_create buffer_write buffer_read buffer_seek buffer_get_surface buffer_set_surface buffer_delete buffer_exists buffer_get_type buffer_get_alignment buffer_poke buffer_peek buffer_save buffer_save_ext buffer_load buffer_load_ext buffer_load_partial buffer_copy buffer_fill buffer_get_size buffer_tell buffer_resize buffer_md5 buffer_sha1 buffer_base64_encode buffer_base64_decode buffer_base64_decode_ext buffer_sizeof buffer_get_address buffer_create_from_vertex_buffer buffer_create_from_vertex_buffer_ext buffer_copy_from_vertex_buffer buffer_async_group_begin buffer_async_group_option buffer_async_group_end buffer_load_async buffer_save_async gml_release_mode gml_pragma steam_activate_overlay steam_is_overlay_enabled steam_is_overlay_activated steam_get_persona_name steam_initialised steam_is_cloud_enabled_for_app steam_is_cloud_enabled_for_account steam_file_persisted steam_get_quota_total steam_get_quota_free steam_file_write steam_file_write_file steam_file_read steam_file_delete steam_file_exists steam_file_size steam_file_share steam_is_screenshot_requested steam_send_screenshot steam_is_user_logged_on steam_get_user_steam_id steam_user_owns_dlc steam_user_installed_dlc steam_set_achievement steam_get_achievement steam_clear_achievement steam_set_stat_int steam_set_stat_float steam_set_stat_avg_rate steam_get_stat_int steam_get_stat_float steam_get_stat_avg_rate steam_reset_all_stats steam_reset_all_stats_achievements steam_stats_ready steam_create_leaderboard steam_upload_score steam_upload_score_ext steam_download_scores_around_user steam_download_scores steam_download_friends_scores steam_upload_score_buffer steam_upload_score_buffer_ext steam_current_game_language steam_available_languages steam_activate_overlay_browser steam_activate_overlay_user steam_activate_overlay_store steam_get_user_persona_name steam_get_app_id steam_get_user_account_id steam_ugc_download steam_ugc_create_item steam_ugc_start_item_update steam_ugc_set_item_title steam_ugc_set_item_description steam_ugc_set_item_visibility steam_ugc_set_item_tags steam_ugc_set_item_content steam_ugc_set_item_preview steam_ugc_submit_item_update steam_ugc_get_item_update_progress steam_ugc_subscribe_item steam_ugc_unsubscribe_item steam_ugc_num_subscribed_items steam_ugc_get_subscribed_items steam_ugc_get_item_install_info steam_ugc_get_item_update_info steam_ugc_request_item_details steam_ugc_create_query_user steam_ugc_create_query_user_ex steam_ugc_create_query_all steam_ugc_create_query_all_ex steam_ugc_query_set_cloud_filename_filter steam_ugc_query_set_match_any_tag steam_ugc_query_set_search_text steam_ugc_query_set_ranked_by_trend_days steam_ugc_query_add_required_tag steam_ugc_query_add_excluded_tag steam_ugc_query_set_return_long_description steam_ugc_query_set_return_total_only steam_ugc_query_set_allow_cached_response steam_ugc_send_query shader_set shader_get_name shader_reset shader_current shader_is_compiled shader_get_sampler_index shader_get_uniform shader_set_uniform_i shader_set_uniform_i_array shader_set_uniform_f shader_set_uniform_f_array shader_set_uniform_matrix shader_set_uniform_matrix_array shader_enable_corner_id texture_set_stage texture_get_texel_width texture_get_texel_height shaders_are_supported vertex_format_begin vertex_format_end vertex_format_delete vertex_format_add_position vertex_format_add_position_3d vertex_format_add_colour vertex_format_add_color vertex_format_add_normal vertex_format_add_texcoord vertex_format_add_textcoord vertex_format_add_custom vertex_create_buffer vertex_create_buffer_ext vertex_delete_buffer vertex_begin vertex_end vertex_position vertex_position_3d vertex_colour vertex_color vertex_argb vertex_texcoord vertex_normal vertex_float1 vertex_float2 vertex_float3 vertex_float4 vertex_ubyte4 vertex_submit vertex_freeze vertex_get_number vertex_get_buffer_size vertex_create_buffer_from_buffer vertex_create_buffer_from_buffer_ext push_local_notification push_get_first_local_notification push_get_next_local_notification push_cancel_local_notification skeleton_animation_set skeleton_animation_get skeleton_animation_mix skeleton_animation_set_ext skeleton_animation_get_ext skeleton_animation_get_duration skeleton_animation_get_frames skeleton_animation_clear skeleton_skin_set skeleton_skin_get skeleton_attachment_set skeleton_attachment_get skeleton_attachment_create skeleton_collision_draw_set skeleton_bone_data_get skeleton_bone_data_set skeleton_bone_state_get skeleton_bone_state_set skeleton_get_minmax skeleton_get_num_bounds skeleton_get_bounds skeleton_animation_get_frame skeleton_animation_set_frame draw_skeleton draw_skeleton_time draw_skeleton_instance draw_skeleton_collision skeleton_animation_list skeleton_skin_list skeleton_slot_data layer_get_id layer_get_id_at_depth layer_get_depth layer_create layer_destroy layer_destroy_instances layer_add_instance layer_has_instance layer_set_visible layer_get_visible layer_exists layer_x layer_y layer_get_x layer_get_y layer_hspeed layer_vspeed layer_get_hspeed layer_get_vspeed layer_script_begin layer_script_end layer_shader layer_get_script_begin layer_get_script_end layer_get_shader layer_set_target_room layer_get_target_room layer_reset_target_room layer_get_all layer_get_all_elements layer_get_name layer_depth layer_get_element_layer layer_get_element_type layer_element_move layer_force_draw_depth layer_is_draw_depth_forced layer_get_forced_depth layer_background_get_id layer_background_exists layer_background_create layer_background_destroy layer_background_visible layer_background_change layer_background_sprite layer_background_htiled layer_background_vtiled layer_background_stretch layer_background_yscale layer_background_xscale layer_background_blend layer_background_alpha layer_background_index layer_background_speed layer_background_get_visible layer_background_get_sprite layer_background_get_htiled layer_background_get_vtiled layer_background_get_stretch layer_background_get_yscale layer_background_get_xscale layer_background_get_blend layer_background_get_alpha layer_background_get_index layer_background_get_speed layer_sprite_get_id layer_sprite_exists layer_sprite_create layer_sprite_destroy layer_sprite_change layer_sprite_index layer_sprite_speed layer_sprite_xscale layer_sprite_yscale layer_sprite_angle layer_sprite_blend layer_sprite_alpha layer_sprite_x layer_sprite_y layer_sprite_get_sprite layer_sprite_get_index layer_sprite_get_speed layer_sprite_get_xscale layer_sprite_get_yscale layer_sprite_get_angle layer_sprite_get_blend layer_sprite_get_alpha layer_sprite_get_x layer_sprite_get_y layer_tilemap_get_id layer_tilemap_exists layer_tilemap_create layer_tilemap_destroy tilemap_tileset tilemap_x tilemap_y tilemap_set tilemap_set_at_pixel tilemap_get_tileset tilemap_get_tile_width tilemap_get_tile_height tilemap_get_width tilemap_get_height tilemap_get_x tilemap_get_y tilemap_get tilemap_get_at_pixel tilemap_get_cell_x_at_pixel tilemap_get_cell_y_at_pixel tilemap_clear draw_tilemap draw_tile tilemap_set_global_mask tilemap_get_global_mask tilemap_set_mask tilemap_get_mask tilemap_get_frame tile_set_empty tile_set_index tile_set_flip tile_set_mirror tile_set_rotate tile_get_empty tile_get_index tile_get_flip tile_get_mirror tile_get_rotate layer_tile_exists layer_tile_create layer_tile_destroy layer_tile_change layer_tile_xscale layer_tile_yscale layer_tile_blend layer_tile_alpha layer_tile_x layer_tile_y layer_tile_region layer_tile_visible layer_tile_get_sprite layer_tile_get_xscale layer_tile_get_yscale layer_tile_get_blend layer_tile_get_alpha layer_tile_get_x layer_tile_get_y layer_tile_get_region layer_tile_get_visible layer_instance_get_instance instance_activate_layer instance_deactivate_layer camera_create camera_create_view camera_destroy camera_apply camera_get_active camera_get_default camera_set_default camera_set_view_mat camera_set_proj_mat camera_set_update_script camera_set_begin_script camera_set_end_script camera_set_view_pos camera_set_view_size camera_set_view_speed camera_set_view_border camera_set_view_angle camera_set_view_target camera_get_view_mat camera_get_proj_mat camera_get_update_script camera_get_begin_script camera_get_end_script camera_get_view_x camera_get_view_y camera_get_view_width camera_get_view_height camera_get_view_speed_x camera_get_view_speed_y camera_get_view_border_x camera_get_view_border_y camera_get_view_angle camera_get_view_target view_get_camera view_get_visible view_get_xport view_get_yport view_get_wport view_get_hport view_get_surface_id view_set_camera view_set_visible view_set_xport view_set_yport view_set_wport view_set_hport view_set_surface_id gesture_drag_time gesture_drag_distance gesture_flick_speed gesture_double_tap_time gesture_double_tap_distance gesture_pinch_distance gesture_pinch_angle_towards gesture_pinch_angle_away gesture_rotate_time gesture_rotate_angle gesture_tap_count gesture_get_drag_time gesture_get_drag_distance gesture_get_flick_speed gesture_get_double_tap_time gesture_get_double_tap_distance gesture_get_pinch_distance gesture_get_pinch_angle_towards gesture_get_pinch_angle_away gesture_get_rotate_time gesture_get_rotate_angle gesture_get_tap_count keyboard_virtual_show keyboard_virtual_hide keyboard_virtual_status keyboard_virtual_height",literal:"self other all noone global local undefined pointer_invalid pointer_null path_action_stop path_action_restart path_action_continue path_action_reverse true false pi GM_build_date GM_version GM_runtime_version  timezone_local timezone_utc gamespeed_fps gamespeed_microseconds  ev_create ev_destroy ev_step ev_alarm ev_keyboard ev_mouse ev_collision ev_other ev_draw ev_draw_begin ev_draw_end ev_draw_pre ev_draw_post ev_keypress ev_keyrelease ev_trigger ev_left_button ev_right_button ev_middle_button ev_no_button ev_left_press ev_right_press ev_middle_press ev_left_release ev_right_release ev_middle_release ev_mouse_enter ev_mouse_leave ev_mouse_wheel_up ev_mouse_wheel_down ev_global_left_button ev_global_right_button ev_global_middle_button ev_global_left_press ev_global_right_press ev_global_middle_press ev_global_left_release ev_global_right_release ev_global_middle_release ev_joystick1_left ev_joystick1_right ev_joystick1_up ev_joystick1_down ev_joystick1_button1 ev_joystick1_button2 ev_joystick1_button3 ev_joystick1_button4 ev_joystick1_button5 ev_joystick1_button6 ev_joystick1_button7 ev_joystick1_button8 ev_joystick2_left ev_joystick2_right ev_joystick2_up ev_joystick2_down ev_joystick2_button1 ev_joystick2_button2 ev_joystick2_button3 ev_joystick2_button4 ev_joystick2_button5 ev_joystick2_button6 ev_joystick2_button7 ev_joystick2_button8 ev_outside ev_boundary ev_game_start ev_game_end ev_room_start ev_room_end ev_no_more_lives ev_animation_end ev_end_of_path ev_no_more_health ev_close_button ev_user0 ev_user1 ev_user2 ev_user3 ev_user4 ev_user5 ev_user6 ev_user7 ev_user8 ev_user9 ev_user10 ev_user11 ev_user12 ev_user13 ev_user14 ev_user15 ev_step_normal ev_step_begin ev_step_end ev_gui ev_gui_begin ev_gui_end ev_cleanup ev_gesture ev_gesture_tap ev_gesture_double_tap ev_gesture_drag_start ev_gesture_dragging ev_gesture_drag_end ev_gesture_flick ev_gesture_pinch_start ev_gesture_pinch_in ev_gesture_pinch_out ev_gesture_pinch_end ev_gesture_rotate_start ev_gesture_rotating ev_gesture_rotate_end ev_global_gesture_tap ev_global_gesture_double_tap ev_global_gesture_drag_start ev_global_gesture_dragging ev_global_gesture_drag_end ev_global_gesture_flick ev_global_gesture_pinch_start ev_global_gesture_pinch_in ev_global_gesture_pinch_out ev_global_gesture_pinch_end ev_global_gesture_rotate_start ev_global_gesture_rotating ev_global_gesture_rotate_end vk_nokey vk_anykey vk_enter vk_return vk_shift vk_control vk_alt vk_escape vk_space vk_backspace vk_tab vk_pause vk_printscreen vk_left vk_right vk_up vk_down vk_home vk_end vk_delete vk_insert vk_pageup vk_pagedown vk_f1 vk_f2 vk_f3 vk_f4 vk_f5 vk_f6 vk_f7 vk_f8 vk_f9 vk_f10 vk_f11 vk_f12 vk_numpad0 vk_numpad1 vk_numpad2 vk_numpad3 vk_numpad4 vk_numpad5 vk_numpad6 vk_numpad7 vk_numpad8 vk_numpad9 vk_divide vk_multiply vk_subtract vk_add vk_decimal vk_lshift vk_lcontrol vk_lalt vk_rshift vk_rcontrol vk_ralt  mb_any mb_none mb_left mb_right mb_middle c_aqua c_black c_blue c_dkgray c_fuchsia c_gray c_green c_lime c_ltgray c_maroon c_navy c_olive c_purple c_red c_silver c_teal c_white c_yellow c_orange fa_left fa_center fa_right fa_top fa_middle fa_bottom pr_pointlist pr_linelist pr_linestrip pr_trianglelist pr_trianglestrip pr_trianglefan bm_complex bm_normal bm_add bm_max bm_subtract bm_zero bm_one bm_src_colour bm_inv_src_colour bm_src_color bm_inv_src_color bm_src_alpha bm_inv_src_alpha bm_dest_alpha bm_inv_dest_alpha bm_dest_colour bm_inv_dest_colour bm_dest_color bm_inv_dest_color bm_src_alpha_sat tf_point tf_linear tf_anisotropic mip_off mip_on mip_markedonly audio_falloff_none audio_falloff_inverse_distance audio_falloff_inverse_distance_clamped audio_falloff_linear_distance audio_falloff_linear_distance_clamped audio_falloff_exponent_distance audio_falloff_exponent_distance_clamped audio_old_system audio_new_system audio_mono audio_stereo audio_3d cr_default cr_none cr_arrow cr_cross cr_beam cr_size_nesw cr_size_ns cr_size_nwse cr_size_we cr_uparrow cr_hourglass cr_drag cr_appstart cr_handpoint cr_size_all spritespeed_framespersecond spritespeed_framespergameframe asset_object asset_unknown asset_sprite asset_sound asset_room asset_path asset_script asset_font asset_timeline asset_tiles asset_shader fa_readonly fa_hidden fa_sysfile fa_volumeid fa_directory fa_archive  ds_type_map ds_type_list ds_type_stack ds_type_queue ds_type_grid ds_type_priority ef_explosion ef_ring ef_ellipse ef_firework ef_smoke ef_smokeup ef_star ef_spark ef_flare ef_cloud ef_rain ef_snow pt_shape_pixel pt_shape_disk pt_shape_square pt_shape_line pt_shape_star pt_shape_circle pt_shape_ring pt_shape_sphere pt_shape_flare pt_shape_spark pt_shape_explosion pt_shape_cloud pt_shape_smoke pt_shape_snow ps_distr_linear ps_distr_gaussian ps_distr_invgaussian ps_shape_rectangle ps_shape_ellipse ps_shape_diamond ps_shape_line ty_real ty_string dll_cdecl dll_stdcall matrix_view matrix_projection matrix_world os_win32 os_windows os_macosx os_ios os_android os_symbian os_linux os_unknown os_winphone os_tizen os_win8native os_wiiu os_3ds  os_psvita os_bb10 os_ps4 os_xboxone os_ps3 os_xbox360 os_uwp os_tvos os_switch browser_not_a_browser browser_unknown browser_ie browser_firefox browser_chrome browser_safari browser_safari_mobile browser_opera browser_tizen browser_edge browser_windows_store browser_ie_mobile  device_ios_unknown device_ios_iphone device_ios_iphone_retina device_ios_ipad device_ios_ipad_retina device_ios_iphone5 device_ios_iphone6 device_ios_iphone6plus device_emulator device_tablet display_landscape display_landscape_flipped display_portrait display_portrait_flipped tm_sleep tm_countvsyncs of_challenge_win of_challen ge_lose of_challenge_tie leaderboard_type_number leaderboard_type_time_mins_secs cmpfunc_never cmpfunc_less cmpfunc_equal cmpfunc_lessequal cmpfunc_greater cmpfunc_notequal cmpfunc_greaterequal cmpfunc_always cull_noculling cull_clockwise cull_counterclockwise lighttype_dir lighttype_point iap_ev_storeload iap_ev_product iap_ev_purchase iap_ev_consume iap_ev_restore iap_storeload_ok iap_storeload_failed iap_status_uninitialised iap_status_unavailable iap_status_loading iap_status_available iap_status_processing iap_status_restoring iap_failed iap_unavailable iap_available iap_purchased iap_canceled iap_refunded fb_login_default fb_login_fallback_to_webview fb_login_no_fallback_to_webview fb_login_forcing_webview fb_login_use_system_account fb_login_forcing_safari  phy_joint_anchor_1_x phy_joint_anchor_1_y phy_joint_anchor_2_x phy_joint_anchor_2_y phy_joint_reaction_force_x phy_joint_reaction_force_y phy_joint_reaction_torque phy_joint_motor_speed phy_joint_angle phy_joint_motor_torque phy_joint_max_motor_torque phy_joint_translation phy_joint_speed phy_joint_motor_force phy_joint_max_motor_force phy_joint_length_1 phy_joint_length_2 phy_joint_damping_ratio phy_joint_frequency phy_joint_lower_angle_limit phy_joint_upper_angle_limit phy_joint_angle_limits phy_joint_max_length phy_joint_max_torque phy_joint_max_force phy_debug_render_aabb phy_debug_render_collision_pairs phy_debug_render_coms phy_debug_render_core_shapes phy_debug_render_joints phy_debug_render_obb phy_debug_render_shapes  phy_particle_flag_water phy_particle_flag_zombie phy_particle_flag_wall phy_particle_flag_spring phy_particle_flag_elastic phy_particle_flag_viscous phy_particle_flag_powder phy_particle_flag_tensile phy_particle_flag_colourmixing phy_particle_flag_colormixing phy_particle_group_flag_solid phy_particle_group_flag_rigid phy_particle_data_flag_typeflags phy_particle_data_flag_position phy_particle_data_flag_velocity phy_particle_data_flag_colour phy_particle_data_flag_color phy_particle_data_flag_category  achievement_our_info achievement_friends_info achievement_leaderboard_info achievement_achievement_info achievement_filter_all_players achievement_filter_friends_only achievement_filter_favorites_only achievement_type_achievement_challenge achievement_type_score_challenge achievement_pic_loaded  achievement_show_ui achievement_show_profile achievement_show_leaderboard achievement_show_achievement achievement_show_bank achievement_show_friend_picker achievement_show_purchase_prompt network_socket_tcp network_socket_udp network_socket_bluetooth network_type_connect network_type_disconnect network_type_data network_type_non_blocking_connect network_config_connect_timeout network_config_use_non_blocking_socket network_config_enable_reliable_udp network_config_disable_reliable_udp buffer_fixed buffer_grow buffer_wrap buffer_fast buffer_vbuffer buffer_network buffer_u8 buffer_s8 buffer_u16 buffer_s16 buffer_u32 buffer_s32 buffer_u64 buffer_f16 buffer_f32 buffer_f64 buffer_bool buffer_text buffer_string buffer_surface_copy buffer_seek_start buffer_seek_relative buffer_seek_end buffer_generalerror buffer_outofspace buffer_outofbounds buffer_invalidtype  text_type button_type input_type ANSI_CHARSET DEFAULT_CHARSET EASTEUROPE_CHARSET RUSSIAN_CHARSET SYMBOL_CHARSET SHIFTJIS_CHARSET HANGEUL_CHARSET GB2312_CHARSET CHINESEBIG5_CHARSET JOHAB_CHARSET HEBREW_CHARSET ARABIC_CHARSET GREEK_CHARSET TURKISH_CHARSET VIETNAMESE_CHARSET THAI_CHARSET MAC_CHARSET BALTIC_CHARSET OEM_CHARSET  gp_face1 gp_face2 gp_face3 gp_face4 gp_shoulderl gp_shoulderr gp_shoulderlb gp_shoulderrb gp_select gp_start gp_stickl gp_stickr gp_padu gp_padd gp_padl gp_padr gp_axislh gp_axislv gp_axisrh gp_axisrv ov_friends ov_community ov_players ov_settings ov_gamegroup ov_achievements lb_sort_none lb_sort_ascending lb_sort_descending lb_disp_none lb_disp_numeric lb_disp_time_sec lb_disp_time_ms ugc_result_success ugc_filetype_community ugc_filetype_microtrans ugc_visibility_public ugc_visibility_friends_only ugc_visibility_private ugc_query_RankedByVote ugc_query_RankedByPublicationDate ugc_query_AcceptedForGameRankedByAcceptanceDate ugc_query_RankedByTrend ugc_query_FavoritedByFriendsRankedByPublicationDate ugc_query_CreatedByFriendsRankedByPublicationDate ugc_query_RankedByNumTimesReported ugc_query_CreatedByFollowedUsersRankedByPublicationDate ugc_query_NotYetRated ugc_query_RankedByTotalVotesAsc ugc_query_RankedByVotesUp ugc_query_RankedByTextSearch ugc_sortorder_CreationOrderDesc ugc_sortorder_CreationOrderAsc ugc_sortorder_TitleAsc ugc_sortorder_LastUpdatedDesc ugc_sortorder_SubscriptionDateDesc ugc_sortorder_VoteScoreDesc ugc_sortorder_ForModeration ugc_list_Published ugc_list_VotedOn ugc_list_VotedUp ugc_list_VotedDown ugc_list_WillVoteLater ugc_list_Favorited ugc_list_Subscribed ugc_list_UsedOrPlayed ugc_list_Followed ugc_match_Items ugc_match_Items_Mtx ugc_match_Items_ReadyToUse ugc_match_Collections ugc_match_Artwork ugc_match_Videos ugc_match_Screenshots ugc_match_AllGuides ugc_match_WebGuides ugc_match_IntegratedGuides ugc_match_UsableInGame ugc_match_ControllerBindings  vertex_usage_position vertex_usage_colour vertex_usage_color vertex_usage_normal vertex_usage_texcoord vertex_usage_textcoord vertex_usage_blendweight vertex_usage_blendindices vertex_usage_psize vertex_usage_tangent vertex_usage_binormal vertex_usage_fog vertex_usage_depth vertex_usage_sample vertex_type_float1 vertex_type_float2 vertex_type_float3 vertex_type_float4 vertex_type_colour vertex_type_color vertex_type_ubyte4 layerelementtype_undefined layerelementtype_background layerelementtype_instance layerelementtype_oldtilemap layerelementtype_sprite layerelementtype_tilemap layerelementtype_particlesystem layerelementtype_tile tile_rotate tile_flip tile_mirror tile_index_mask kbv_type_default kbv_type_ascii kbv_type_url kbv_type_email kbv_type_numbers kbv_type_phone kbv_type_phone_name kbv_returnkey_default kbv_returnkey_go kbv_returnkey_google kbv_returnkey_join kbv_returnkey_next kbv_returnkey_route kbv_returnkey_search kbv_returnkey_send kbv_returnkey_yahoo kbv_returnkey_done kbv_returnkey_continue kbv_returnkey_emergency kbv_autocapitalize_none kbv_autocapitalize_words kbv_autocapitalize_sentences kbv_autocapitalize_characters",symbol:"argument_relative argument argument0 argument1 argument2 argument3 argument4 argument5 argument6 argument7 argument8 argument9 argument10 argument11 argument12 argument13 argument14 argument15 argument_count x y xprevious yprevious xstart ystart hspeed vspeed direction speed friction gravity gravity_direction path_index path_position path_positionprevious path_speed path_scale path_orientation path_endaction object_index id solid persistent mask_index instance_count instance_id room_speed fps fps_real current_time current_year current_month current_day current_weekday current_hour current_minute current_second alarm timeline_index timeline_position timeline_speed timeline_running timeline_loop room room_first room_last room_width room_height room_caption room_persistent score lives health show_score show_lives show_health caption_score caption_lives caption_health event_type event_number event_object event_action application_surface gamemaker_pro gamemaker_registered gamemaker_version error_occurred error_last debug_mode keyboard_key keyboard_lastkey keyboard_lastchar keyboard_string mouse_x mouse_y mouse_button mouse_lastbutton cursor_sprite visible sprite_index sprite_width sprite_height sprite_xoffset sprite_yoffset image_number image_index image_speed depth image_xscale image_yscale image_angle image_alpha image_blend bbox_left bbox_right bbox_top bbox_bottom layer background_colour  background_showcolour background_color background_showcolor view_enabled view_current view_visible view_xview view_yview view_wview view_hview view_xport view_yport view_wport view_hport view_angle view_hborder view_vborder view_hspeed view_vspeed view_object view_surface_id view_camera game_id game_display_name game_project_name game_save_id working_directory temp_directory program_directory browser_width browser_height os_type os_device os_browser os_version display_aa async_load delta_time webgl_enabled event_data iap_data phy_rotation phy_position_x phy_position_y phy_angular_velocity phy_linear_velocity_x phy_linear_velocity_y phy_speed_x phy_speed_y phy_speed phy_angular_damping phy_linear_damping phy_bullet phy_fixed_rotation phy_active phy_mass phy_inertia phy_com_x phy_com_y phy_dynamic phy_kinematic phy_sleeping phy_collision_points phy_collision_x phy_collision_y phy_col_normal_x phy_col_normal_y phy_position_xprevious phy_position_yprevious"},c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/go.min.js b/vendor/assets/javascripts/highlightjs/languages/go.min.js
index 9f78f66105..5cf533c3f0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/go.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/go.min.js
@@ -1 +1 @@
-hljs.registerLanguage("go",function(){"use strict";return function(e){var n={keyword:"break default func interface select case map struct chan else goto package switch const fallthrough if range type continue for import return var go defer bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 uint16 uint32 uint64 int uint uintptr rune",literal:"true false iota nil",built_in:"append cap close complex copy imag len make new panic print println real recover delete"};return{name:"Go",aliases:["golang"],keywords:n,illegal:"</",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"string",variants:[e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{begin:"`",end:"`"}]},{className:"number",variants:[{begin:e.C_NUMBER_RE+"[i]",relevance:1},e.C_NUMBER_MODE]},{begin:/:=/},{className:"function",beginKeywords:"func",end:"\\s*(\\{|$)",excludeEnd:!0,contains:[e.TITLE_MODE,{className:"params",begin:/\(/,end:/\)/,keywords:n,illegal:/["']/}]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("go",function(e){var n={keyword:"break default func interface select case map struct chan else goto package switch const fallthrough if range type continue for import return var go defer bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 uint16 uint32 uint64 int uint uintptr rune",literal:"true false iota nil",built_in:"append cap close complex copy imag len make new panic print println real recover delete"};return{aliases:["golang"],k:n,i:"</",c:[e.CLCM,e.CBCM,{cN:"string",v:[e.QSM,e.ASM,{b:"`",e:"`"}]},{cN:"number",v:[{b:e.CNR+"[i]",relevance:1},e.CNM]},{b:/:=/},{cN:"function",bK:"func",e:"\\s*(\\{|$)",eE:!0,c:[e.TM,{cN:"params",b:/\(/,e:/\)/,k:n,i:/["']/}]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/golo.min.js b/vendor/assets/javascripts/highlightjs/languages/golo.min.js
index a56cf56665..75b223c747 100644
--- a/vendor/assets/javascripts/highlightjs/languages/golo.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/golo.min.js
@@ -1 +1 @@
-hljs.registerLanguage("golo",function(){"use strict";return function(e){return{name:"Golo",keywords:{keyword:"println readln print import module function local return let var while for foreach times in case when match with break continue augment augmentation each find filter reduce if then else otherwise try catch finally raise throw orIfNull DynamicObject|10 DynamicVariable struct Observable map set vector list array",literal:"true false null"},contains:[e.HASH_COMMENT_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,{className:"meta",begin:"@[A-Za-z]+"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("golo",function(e){return{k:{keyword:"println readln print import module function local return let var while for foreach times in case when match with break continue augment augmentation each find filter reduce if then else otherwise try catch finally raise throw orIfNull DynamicObject|10 DynamicVariable struct Observable map set vector list array",literal:"true false null"},c:[e.HCM,e.QSM,e.CNM,{cN:"meta",b:"@[A-Za-z]+"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/gradle.min.js b/vendor/assets/javascripts/highlightjs/languages/gradle.min.js
index 9d39fb6dd5..498f21d0ff 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gradle.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gradle.min.js
@@ -1 +1 @@
-hljs.registerLanguage("gradle",function(){"use strict";return function(e){return{name:"Gradle",case_insensitive:!0,keywords:{keyword:"task project allprojects subprojects artifacts buildscript configurations dependencies repositories sourceSets description delete from into include exclude source classpath destinationDir includes options sourceCompatibility targetCompatibility group flatDir doLast doFirst flatten todir fromdir ant def abstract break case catch continue default do else extends final finally for if implements instanceof native new private protected public return static switch synchronized throw throws transient try volatile while strictfp package import false null super this true antlrtask checkstyle codenarc copy boolean byte char class double float int interface long short void compile runTime file fileTree abs any append asList asWritable call collect compareTo count div dump each eachByte eachFile eachLine every find findAll flatten getAt getErr getIn getOut getText grep immutable inject inspect intersect invokeMethods isCase join leftShift minus multiply newInputStream newOutputStream newPrintWriter newReader newWriter next plus pop power previous print println push putAt read readBytes readLines reverse reverseEach round size sort splitEachLine step subMap times toInteger toList tokenize upto waitForOrKill withPrintWriter withReader withStream withWriter withWriterAppend write writeLine"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.NUMBER_MODE,e.REGEXP_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("gradle",function(e){return{cI:!0,k:{keyword:"task project allprojects subprojects artifacts buildscript configurations dependencies repositories sourceSets description delete from into include exclude source classpath destinationDir includes options sourceCompatibility targetCompatibility group flatDir doLast doFirst flatten todir fromdir ant def abstract break case catch continue default do else extends final finally for if implements instanceof native new private protected public return static switch synchronized throw throws transient try volatile while strictfp package import false null super this true antlrtask checkstyle codenarc copy boolean byte char class double float int interface long short void compile runTime file fileTree abs any append asList asWritable call collect compareTo count div dump each eachByte eachFile eachLine every find findAll flatten getAt getErr getIn getOut getText grep immutable inject inspect intersect invokeMethods isCase join leftShift minus multiply newInputStream newOutputStream newPrintWriter newReader newWriter next plus pop power previous print println push putAt read readBytes readLines reverse reverseEach round size sort splitEachLine step subMap times toInteger toList tokenize upto waitForOrKill withPrintWriter withReader withStream withWriter withWriterAppend write writeLine"},c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.NM,e.RM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/groovy.min.js b/vendor/assets/javascripts/highlightjs/languages/groovy.min.js
index 31821980b6..8f140ff066 100644
--- a/vendor/assets/javascripts/highlightjs/languages/groovy.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/groovy.min.js
@@ -1 +1 @@
-hljs.registerLanguage("groovy",function(){"use strict";function e(e,n={}){return n.variants=e,n}return function(n){const a=e([n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE,n.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0},{className:"doctag",begin:"@[A-Za-z]+"}]})]),t={className:"regexp",begin:/~?\/[^\/\n]+\//,contains:[n.BACKSLASH_ESCAPE]},s=e([n.BINARY_NUMBER_MODE,n.C_NUMBER_MODE]),i=e([{begin:/"""/,end:/"""/},{begin:/'''/,end:/'''/},{begin:"\\$/",end:"/\\$",relevance:10},n.APOS_STRING_MODE,n.QUOTE_STRING_MODE],{className:"string"});return{name:"Groovy",keywords:{built_in:"this super",literal:"true false null",keyword:"byte short char int long boolean float double void def as in assert trait abstract static volatile transient public private protected synchronized final class interface enum if else for while switch case break default continue throw throws try catch finally implements extends new import package return instanceof"},contains:[n.SHEBANG(),a,i,t,s,{className:"class",beginKeywords:"class interface trait enum",end:"{",illegal:":",contains:[{beginKeywords:"extends implements"},n.UNDERSCORE_TITLE_MODE]},{className:"meta",begin:"@[A-Za-z]+"},{className:"attr",begin:"[A-Za-z0-9_$]+[ \t]*:"},{begin:/\?/,end:/:/,contains:[a,i,t,s,"self"]},{className:"symbol",begin:"^[ \t]*"+(r="[A-Za-z0-9_$]+:",function(...e){return e.map(e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n}).join("")}("(?=",r,")")),excludeBegin:!0,end:"[A-Za-z0-9_$]+:",relevance:0}],illegal:/#|<\//};var r}}());
\ No newline at end of file
+hljs.registerLanguage("groovy",function(e){return{k:{literal:"true false null",keyword:"byte short char int long boolean float double void def as in assert trait super this abstract static volatile transient public private protected synchronized final class interface enum if else for while switch case break default continue throw throws try catch finally implements extends new import package return instanceof"},c:[e.C("/\\*\\*","\\*/",{relevance:0,c:[{b:/\w+@/,relevance:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,{cN:"string",b:'"""',e:'"""'},{cN:"string",b:"'''",e:"'''"},{cN:"string",b:"\\$/",e:"/\\$",relevance:10},e.ASM,{cN:"regexp",b:/~?\/[^\/\n]+\//,c:[e.BE]},e.QSM,{cN:"meta",b:"^#!/usr/bin/env",e:"$",i:"\n"},e.BNM,{cN:"class",bK:"class interface trait enum",e:"{",i:":",c:[{bK:"extends implements"},e.UTM]},e.CNM,{cN:"meta",b:"@[A-Za-z]+"},{cN:"string",b:/[^\?]{0}[A-Za-z0-9_$]+ *:/},{b:/\?/,e:/\:/},{cN:"symbol",b:"^\\s*[A-Za-z0-9_$]+:",relevance:0}],i:/#|<\//}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/haml.min.js b/vendor/assets/javascripts/highlightjs/languages/haml.min.js
index 614f2519f9..b45d3f5db8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/haml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/haml.min.js
@@ -1 +1 @@
-hljs.registerLanguage("haml",function(){"use strict";return function(e){return{name:"HAML",case_insensitive:!0,contains:[{className:"meta",begin:"^!!!( (5|1\\.1|Strict|Frameset|Basic|Mobile|RDFa|XML\\b.*))?$",relevance:10},e.COMMENT("^\\s*(!=#|=#|-#|/).*$",!1,{relevance:0}),{begin:"^\\s*(-|=|!=)(?!#)",starts:{end:"\\n",subLanguage:"ruby"}},{className:"tag",begin:"^\\s*%",contains:[{className:"selector-tag",begin:"\\w+"},{className:"selector-id",begin:"#[\\w-]+"},{className:"selector-class",begin:"\\.[\\w-]+"},{begin:"{\\s*",end:"\\s*}",contains:[{begin:":\\w+\\s*=>",end:",\\s+",returnBegin:!0,endsWithParent:!0,contains:[{className:"attr",begin:":\\w+"},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{begin:"\\w+",relevance:0}]}]},{begin:"\\(\\s*",end:"\\s*\\)",excludeEnd:!0,contains:[{begin:"\\w+\\s*=",end:"\\s+",returnBegin:!0,endsWithParent:!0,contains:[{className:"attr",begin:"\\w+",relevance:0},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{begin:"\\w+",relevance:0}]}]}]},{begin:"^\\s*[=~]\\s*"},{begin:"#{",starts:{end:"}",subLanguage:"ruby"}}]}}}());
\ No newline at end of file
+hljs.registerLanguage("haml",function(e){return{cI:!0,c:[{cN:"meta",b:"^!!!( (5|1\\.1|Strict|Frameset|Basic|Mobile|RDFa|XML\\b.*))?$",relevance:10},e.C("^\\s*(!=#|=#|-#|/).*$",!1,{relevance:0}),{b:"^\\s*(-|=|!=)(?!#)",starts:{e:"\\n",sL:"ruby"}},{cN:"tag",b:"^\\s*%",c:[{cN:"selector-tag",b:"\\w+"},{cN:"selector-id",b:"#[\\w-]+"},{cN:"selector-class",b:"\\.[\\w-]+"},{b:"{\\s*",e:"\\s*}",c:[{b:":\\w+\\s*=>",e:",\\s+",rB:!0,eW:!0,c:[{cN:"attr",b:":\\w+"},e.ASM,e.QSM,{b:"\\w+",relevance:0}]}]},{b:"\\(\\s*",e:"\\s*\\)",eE:!0,c:[{b:"\\w+\\s*=",e:"\\s+",rB:!0,eW:!0,c:[{cN:"attr",b:"\\w+",relevance:0},e.ASM,e.QSM,{b:"\\w+",relevance:0}]}]}]},{b:"^\\s*[=~]\\s*"},{b:"#{",starts:{e:"}",sL:"ruby"}}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/handlebars.min.js b/vendor/assets/javascripts/highlightjs/languages/handlebars.min.js
index a0fee8b64b..3b4ce6e8c0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/handlebars.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/handlebars.min.js
@@ -1 +1 @@
-hljs.registerLanguage("handlebars",function(){"use strict";function e(...e){return e.map(e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n}).join("")}return function(n){const a={"builtin-name":"action bindattr collection component concat debugger each each-in get hash if in input link-to loc log lookup mut outlet partial query-params render template textarea unbound unless view with yield"},t=/\[.*?\]/,s=/[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/,i=e("(",/'.*?'/,"|",/".*?"/,"|",t,"|",s,"|",/\.|\//,")+"),r=e("(",t,"|",s,")(?==)"),l={begin:i,lexemes:/[\w.\/]+/},c=n.inherit(l,{keywords:{literal:"true false undefined null"}}),o={begin:/\(/,end:/\)/},m={className:"attr",begin:r,relevance:0,starts:{begin:/=/,end:/=/,starts:{contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,c,o]}}},d={contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,{begin:/as\s+\|/,keywords:{keyword:"as"},end:/\|/,contains:[{begin:/\w+/}]},m,c,o],returnEnd:!0},g=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/\)/})});o.contains=[g];const u=n.inherit(l,{keywords:a,className:"name",starts:n.inherit(d,{end:/}}/})}),b=n.inherit(l,{keywords:a,className:"name"}),h=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/}}/})});return{name:"Handlebars",aliases:["hbs","html.hbs","html.handlebars","htmlbars"],case_insensitive:!0,subLanguage:"xml",contains:[{begin:/\\\{\{/,skip:!0},{begin:/\\\\(?=\{\{)/,skip:!0},n.COMMENT(/\{\{!--/,/--\}\}/),n.COMMENT(/\{\{!/,/\}\}/),{className:"template-tag",begin:/\{\{\{\{(?!\/)/,end:/\}\}\}\}/,contains:[u],starts:{end:/\{\{\{\{\//,returnEnd:!0,subLanguage:"xml"}},{className:"template-tag",begin:/\{\{\{\{\//,end:/\}\}\}\}/,contains:[b]},{className:"template-tag",begin:/\{\{#/,end:/\}\}/,contains:[u]},{className:"template-tag",begin:/\{\{(?=else\}\})/,end:/\}\}/,keywords:"else"},{className:"template-tag",begin:/\{\{\//,end:/\}\}/,contains:[b]},{className:"template-variable",begin:/\{\{\{/,end:/\}\}\}/,contains:[h]},{className:"template-variable",begin:/\{\{/,end:/\}\}/,contains:[h]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("handlebars",function(e){var t={"builtin-name":"each in with if else unless bindattr action collection debugger log outlet template unbound view yield lookup"},a={b:/".*?"|'.*?'|\[.*?\]|\w+/},l=e.inherit(a,{k:t,starts:{eW:!0,relevance:0,c:[e.inherit(a,{relevance:0})]}}),i=e.inherit(l,{cN:"name"}),n=e.inherit(l,{relevance:0});return{aliases:["hbs","html.hbs","html.handlebars"],cI:!0,sL:"xml",c:[{b:/\\\{\{/,skip:!0},{b:/\\\\(?=\{\{)/,skip:!0},e.C(/\{\{!--/,/--\}\}/),e.C(/\{\{!/,/\}\}/),{cN:"template-tag",b:/\{\{\{\{(?!\/)/,e:/\}\}\}\}/,c:[i],starts:{e:/\{\{\{\{\//,rE:!0,sL:"xml"}},{cN:"template-tag",b:/\{\{\{\{\//,e:/\}\}\}\}/,c:[i]},{cN:"template-tag",b:/\{\{[#\/]/,e:/\}\}/,c:[i]},{cN:"template-variable",b:/\{\{\{/,e:/\}\}\}/,k:t,c:[n]},{cN:"template-variable",b:/\{\{/,e:/\}\}/,k:t,c:[n]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/haskell.min.js b/vendor/assets/javascripts/highlightjs/languages/haskell.min.js
index c92c641b11..08c3491b5e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/haskell.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/haskell.min.js
@@ -1 +1 @@
-hljs.registerLanguage("haskell",function(){"use strict";return function(e){var n={variants:[e.COMMENT("--","$"),e.COMMENT("{-","-}",{contains:["self"]})]},i={className:"meta",begin:"{-#",end:"#-}"},a={className:"meta",begin:"^#",end:"$"},s={className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},l={begin:"\\(",end:"\\)",illegal:'"',contains:[i,a,{className:"type",begin:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},e.inherit(e.TITLE_MODE,{begin:"[_a-z][\\w']*"}),n]};return{name:"Haskell",aliases:["hs"],keywords:"let in if then else case of where do module import hiding qualified type data newtype deriving class instance as default infix infixl infixr foreign export ccall stdcall cplusplus jvm dotnet safe unsafe family forall mdo proc rec",contains:[{beginKeywords:"module",end:"where",keywords:"module where",contains:[l,n],illegal:"\\W\\.|;"},{begin:"\\bimport\\b",end:"$",keywords:"import qualified as hiding",contains:[l,n],illegal:"\\W\\.|;"},{className:"class",begin:"^(\\s*)?(class|instance)\\b",end:"where",keywords:"class family instance where",contains:[s,l,n]},{className:"class",begin:"\\b(data|(new)?type)\\b",end:"$",keywords:"data family type newtype deriving",contains:[i,s,l,{begin:"{",end:"}",contains:l.contains},n]},{beginKeywords:"default",end:"$",contains:[s,l,n]},{beginKeywords:"infix infixl infixr",end:"$",contains:[e.C_NUMBER_MODE,n]},{begin:"\\bforeign\\b",end:"$",keywords:"foreign import export ccall stdcall cplusplus jvm dotnet safe unsafe",contains:[s,e.QUOTE_STRING_MODE,n]},{className:"meta",begin:"#!\\/usr\\/bin\\/env runhaskell",end:"$"},i,a,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,s,e.inherit(e.TITLE_MODE,{begin:"^[_a-z][\\w']*"}),n,{begin:"->|<-"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("haskell",function(e){var i={v:[e.C("--","$"),e.C("{-","-}",{c:["self"]})]},a={cN:"meta",b:"{-#",e:"#-}"},l={cN:"meta",b:"^#",e:"$"},c={cN:"type",b:"\\b[A-Z][\\w']*",relevance:0},n={b:"\\(",e:"\\)",i:'"',c:[a,l,{cN:"type",b:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},e.inherit(e.TM,{b:"[_a-z][\\w']*"}),i]};return{aliases:["hs"],k:"let in if then else case of where do module import hiding qualified type data newtype deriving class instance as default infix infixl infixr foreign export ccall stdcall cplusplus jvm dotnet safe unsafe family forall mdo proc rec",c:[{bK:"module",e:"where",k:"module where",c:[n,i],i:"\\W\\.|;"},{b:"\\bimport\\b",e:"$",k:"import qualified as hiding",c:[n,i],i:"\\W\\.|;"},{cN:"class",b:"^(\\s*)?(class|instance)\\b",e:"where",k:"class family instance where",c:[c,n,i]},{cN:"class",b:"\\b(data|(new)?type)\\b",e:"$",k:"data family type newtype deriving",c:[a,c,n,{b:"{",e:"}",c:n.c},i]},{bK:"default",e:"$",c:[c,n,i]},{bK:"infix infixl infixr",e:"$",c:[e.CNM,i]},{b:"\\bforeign\\b",e:"$",k:"foreign import export ccall stdcall cplusplus jvm dotnet safe unsafe",c:[c,e.QSM,i]},{cN:"meta",b:"#!\\/usr\\/bin\\/env runhaskell",e:"$"},a,l,e.QSM,e.CNM,c,e.inherit(e.TM,{b:"^[_a-z][\\w']*"}),i,{b:"->|<-"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/haxe.min.js b/vendor/assets/javascripts/highlightjs/languages/haxe.min.js
index 9e1612ee9e..8ba0bd9926 100644
--- a/vendor/assets/javascripts/highlightjs/languages/haxe.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/haxe.min.js
@@ -1 +1 @@
-hljs.registerLanguage("haxe",function(){"use strict";return function(e){return{name:"Haxe",aliases:["hx"],keywords:{keyword:"break case cast catch continue default do dynamic else enum extern for function here if import in inline never new override package private get set public return static super switch this throw trace try typedef untyped using var while Int Float String Bool Dynamic Void Array ",built_in:"trace this",literal:"true false null _"},contains:[{className:"string",begin:"'",end:"'",contains:[e.BACKSLASH_ESCAPE,{className:"subst",begin:"\\$\\{",end:"\\}"},{className:"subst",begin:"\\$",end:"\\W}"}]},e.QUOTE_STRING_MODE,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.C_NUMBER_MODE,{className:"meta",begin:"@:",end:"$"},{className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"if else elseif end error"}},{className:"type",begin:":[ \t]*",end:"[^A-Za-z0-9_ \t\\->]",excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:":[ \t]*",end:"\\W",excludeBegin:!0,excludeEnd:!0},{className:"type",begin:"new *",end:"\\W",excludeBegin:!0,excludeEnd:!0},{className:"class",beginKeywords:"enum",end:"\\{",contains:[e.TITLE_MODE]},{className:"class",beginKeywords:"abstract",end:"[\\{$]",contains:[{className:"type",begin:"\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0},{className:"type",begin:"from +",end:"\\W",excludeBegin:!0,excludeEnd:!0},{className:"type",begin:"to +",end:"\\W",excludeBegin:!0,excludeEnd:!0},e.TITLE_MODE],keywords:{keyword:"abstract from to"}},{className:"class",begin:"\\b(class|interface) +",end:"[\\{$]",excludeEnd:!0,keywords:"class interface",contains:[{className:"keyword",begin:"\\b(extends|implements) +",keywords:"extends implements",contains:[{className:"type",begin:e.IDENT_RE,relevance:0}]},e.TITLE_MODE]},{className:"function",beginKeywords:"function",end:"\\(",excludeEnd:!0,illegal:"\\S",contains:[e.TITLE_MODE]}],illegal:/<\//}}}());
\ No newline at end of file
+hljs.registerLanguage("haxe",function(e){return{aliases:["hx"],k:{keyword:"break case cast catch continue default do dynamic else enum extern for function here if import in inline never new override package private get set public return static super switch this throw trace try typedef untyped using var while Int Float String Bool Dynamic Void Array ",built_in:"trace this",literal:"true false null _"},c:[{cN:"string",b:"'",e:"'",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"},{cN:"subst",b:"\\$",e:"\\W}"}]},e.QSM,e.CLCM,e.CBCM,e.CNM,{cN:"meta",b:"@:",e:"$"},{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elseif end error"}},{cN:"type",b:":[ \t]*",e:"[^A-Za-z0-9_ \t\\->]",eB:!0,eE:!0,relevance:0},{cN:"type",b:":[ \t]*",e:"\\W",eB:!0,eE:!0},{cN:"type",b:"new *",e:"\\W",eB:!0,eE:!0},{cN:"class",bK:"enum",e:"\\{",c:[e.TM]},{cN:"class",bK:"abstract",e:"[\\{$]",c:[{cN:"type",b:"\\(",e:"\\)",eB:!0,eE:!0},{cN:"type",b:"from +",e:"\\W",eB:!0,eE:!0},{cN:"type",b:"to +",e:"\\W",eB:!0,eE:!0},e.TM],k:{keyword:"abstract from to"}},{cN:"class",b:"\\b(class|interface) +",e:"[\\{$]",eE:!0,k:"class interface",c:[{cN:"keyword",b:"\\b(extends|implements) +",k:"extends implements",c:[{cN:"type",b:e.IR,relevance:0}]},e.TM]},{cN:"function",bK:"function",e:"\\(",eE:!0,i:"\\S",c:[e.TM]}],i:/<\//}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/hsp.min.js b/vendor/assets/javascripts/highlightjs/languages/hsp.min.js
index 3846f5113f..8f4b0b2c4f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/hsp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/hsp.min.js
@@ -1 +1 @@
-hljs.registerLanguage("hsp",function(){"use strict";return function(e){return{name:"HSP",case_insensitive:!0,keywords:{$pattern:/[\w._]+/,keyword:"goto gosub return break repeat loop continue wait await dim sdim foreach dimtype dup dupptr end stop newmod delmod mref run exgoto on mcall assert logmes newlab resume yield onexit onerror onkey onclick oncmd exist delete mkdir chdir dirlist bload bsave bcopy memfile if else poke wpoke lpoke getstr chdpm memexpand memcpy memset notesel noteadd notedel noteload notesave randomize noteunsel noteget split strrep setease button chgdisp exec dialog mmload mmplay mmstop mci pset pget syscolor mes print title pos circle cls font sysfont objsize picload color palcolor palette redraw width gsel gcopy gzoom gmode bmpsave hsvcolor getkey listbox chkbox combox input mesbox buffer screen bgscr mouse objsel groll line clrobj boxf objprm objmode stick grect grotate gsquare gradf objimage objskip objenable celload celdiv celput newcom querycom delcom cnvstow comres axobj winobj sendmsg comevent comevarg sarrayconv callfunc cnvwtos comevdisp libptr system hspstat hspver stat cnt err strsize looplev sublev iparam wparam lparam refstr refdval int rnd strlen length length2 length3 length4 vartype gettime peek wpeek lpeek varptr varuse noteinfo instr abs limit getease str strmid strf getpath strtrim sin cos tan atan sqrt double absf expf logf limitf powf geteasef mousex mousey mousew hwnd hinstance hdc ginfo objinfo dirinfo sysinfo thismod __hspver__ __hsp30__ __date__ __time__ __line__ __file__ _debug __hspdef__ and or xor not screen_normal screen_palette screen_hide screen_fixedsize screen_tool screen_frame gmode_gdi gmode_mem gmode_rgb0 gmode_alpha gmode_rgb0alpha gmode_add gmode_sub gmode_pixela ginfo_mx ginfo_my ginfo_act ginfo_sel ginfo_wx1 ginfo_wy1 ginfo_wx2 ginfo_wy2 ginfo_vx ginfo_vy ginfo_sizex ginfo_sizey ginfo_winx ginfo_winy ginfo_mesx ginfo_mesy ginfo_r ginfo_g ginfo_b ginfo_paluse ginfo_dispx ginfo_dispy ginfo_cx ginfo_cy ginfo_intid ginfo_newid ginfo_sx ginfo_sy objinfo_mode objinfo_bmscr objinfo_hwnd notemax notesize dir_cur dir_exe dir_win dir_sys dir_cmdline dir_desktop dir_mydoc dir_tv font_normal font_bold font_italic font_underline font_strikeout font_antialias objmode_normal objmode_guifont objmode_usefont gsquare_grad msgothic msmincho do until while wend for next _break _continue switch case default swbreak swend ddim ldim alloc m_pi rad2deg deg2rad ease_linear ease_quad_in ease_quad_out ease_quad_inout ease_cubic_in ease_cubic_out ease_cubic_inout ease_quartic_in ease_quartic_out ease_quartic_inout ease_bounce_in ease_bounce_out ease_bounce_inout ease_shake_in ease_shake_out ease_shake_inout ease_loop"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{className:"string",begin:'{"',end:'"}',contains:[e.BACKSLASH_ESCAPE]},e.COMMENT(";","$",{relevance:0}),{className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"addion cfunc cmd cmpopt comfunc const defcfunc deffunc define else endif enum epack func global if ifdef ifndef include modcfunc modfunc modinit modterm module pack packopt regcmd runtime undef usecom uselib"},contains:[e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),e.NUMBER_MODE,e.C_NUMBER_MODE,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"symbol",begin:"^\\*(\\w+|@)"},e.NUMBER_MODE,e.C_NUMBER_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("hsp",function(e){return{cI:!0,l:/[\w\._]+/,k:"goto gosub return break repeat loop continue wait await dim sdim foreach dimtype dup dupptr end stop newmod delmod mref run exgoto on mcall assert logmes newlab resume yield onexit onerror onkey onclick oncmd exist delete mkdir chdir dirlist bload bsave bcopy memfile if else poke wpoke lpoke getstr chdpm memexpand memcpy memset notesel noteadd notedel noteload notesave randomize noteunsel noteget split strrep setease button chgdisp exec dialog mmload mmplay mmstop mci pset pget syscolor mes print title pos circle cls font sysfont objsize picload color palcolor palette redraw width gsel gcopy gzoom gmode bmpsave hsvcolor getkey listbox chkbox combox input mesbox buffer screen bgscr mouse objsel groll line clrobj boxf objprm objmode stick grect grotate gsquare gradf objimage objskip objenable celload celdiv celput newcom querycom delcom cnvstow comres axobj winobj sendmsg comevent comevarg sarrayconv callfunc cnvwtos comevdisp libptr system hspstat hspver stat cnt err strsize looplev sublev iparam wparam lparam refstr refdval int rnd strlen length length2 length3 length4 vartype gettime peek wpeek lpeek varptr varuse noteinfo instr abs limit getease str strmid strf getpath strtrim sin cos tan atan sqrt double absf expf logf limitf powf geteasef mousex mousey mousew hwnd hinstance hdc ginfo objinfo dirinfo sysinfo thismod __hspver__ __hsp30__ __date__ __time__ __line__ __file__ _debug __hspdef__ and or xor not screen_normal screen_palette screen_hide screen_fixedsize screen_tool screen_frame gmode_gdi gmode_mem gmode_rgb0 gmode_alpha gmode_rgb0alpha gmode_add gmode_sub gmode_pixela ginfo_mx ginfo_my ginfo_act ginfo_sel ginfo_wx1 ginfo_wy1 ginfo_wx2 ginfo_wy2 ginfo_vx ginfo_vy ginfo_sizex ginfo_sizey ginfo_winx ginfo_winy ginfo_mesx ginfo_mesy ginfo_r ginfo_g ginfo_b ginfo_paluse ginfo_dispx ginfo_dispy ginfo_cx ginfo_cy ginfo_intid ginfo_newid ginfo_sx ginfo_sy objinfo_mode objinfo_bmscr objinfo_hwnd notemax notesize dir_cur dir_exe dir_win dir_sys dir_cmdline dir_desktop dir_mydoc dir_tv font_normal font_bold font_italic font_underline font_strikeout font_antialias objmode_normal objmode_guifont objmode_usefont gsquare_grad msgothic msmincho do until while wend for next _break _continue switch case default swbreak swend ddim ldim alloc m_pi rad2deg deg2rad ease_linear ease_quad_in ease_quad_out ease_quad_inout ease_cubic_in ease_cubic_out ease_cubic_inout ease_quartic_in ease_quartic_out ease_quartic_inout ease_bounce_in ease_bounce_out ease_bounce_inout ease_shake_in ease_shake_out ease_shake_inout ease_loop",c:[e.CLCM,e.CBCM,e.QSM,e.ASM,{cN:"string",b:'{"',e:'"}',c:[e.BE]},e.C(";","$",{relevance:0}),{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"addion cfunc cmd cmpopt comfunc const defcfunc deffunc define else endif enum epack func global if ifdef ifndef include modcfunc modfunc modinit modterm module pack packopt regcmd runtime undef usecom uselib"},c:[e.inherit(e.QSM,{cN:"meta-string"}),e.NM,e.CNM,e.CLCM,e.CBCM]},{cN:"symbol",b:"^\\*(\\w+|@)"},e.NM,e.CNM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/htmlbars.min.js b/vendor/assets/javascripts/highlightjs/languages/htmlbars.min.js
index f735d0618e..8fef191c0f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/htmlbars.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/htmlbars.min.js
@@ -1 +1 @@
-hljs.registerLanguage("htmlbars",function(){"use strict";function e(...e){return e.map(e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n}).join("")}return function(n){const a=function(n){const a={"builtin-name":"action bindattr collection component concat debugger each each-in get hash if in input link-to loc log lookup mut outlet partial query-params render template textarea unbound unless view with yield"},t=/\[.*?\]/,s=/[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/,i=e("(",/'.*?'/,"|",/".*?"/,"|",t,"|",s,"|",/\.|\//,")+"),r=e("(",t,"|",s,")(?==)"),l={begin:i,lexemes:/[\w.\/]+/},c=n.inherit(l,{keywords:{literal:"true false undefined null"}}),o={begin:/\(/,end:/\)/},m={className:"attr",begin:r,relevance:0,starts:{begin:/=/,end:/=/,starts:{contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,c,o]}}},d={contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,{begin:/as\s+\|/,keywords:{keyword:"as"},end:/\|/,contains:[{begin:/\w+/}]},m,c,o],returnEnd:!0},g=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/\)/})});o.contains=[g];const u=n.inherit(l,{keywords:a,className:"name",starts:n.inherit(d,{end:/}}/})}),b=n.inherit(l,{keywords:a,className:"name"}),h=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/}}/})});return{name:"Handlebars",aliases:["hbs","html.hbs","html.handlebars","htmlbars"],case_insensitive:!0,subLanguage:"xml",contains:[{begin:/\\\{\{/,skip:!0},{begin:/\\\\(?=\{\{)/,skip:!0},n.COMMENT(/\{\{!--/,/--\}\}/),n.COMMENT(/\{\{!/,/\}\}/),{className:"template-tag",begin:/\{\{\{\{(?!\/)/,end:/\}\}\}\}/,contains:[u],starts:{end:/\{\{\{\{\//,returnEnd:!0,subLanguage:"xml"}},{className:"template-tag",begin:/\{\{\{\{\//,end:/\}\}\}\}/,contains:[b]},{className:"template-tag",begin:/\{\{#/,end:/\}\}/,contains:[u]},{className:"template-tag",begin:/\{\{(?=else\}\})/,end:/\}\}/,keywords:"else"},{className:"template-tag",begin:/\{\{\//,end:/\}\}/,contains:[b]},{className:"template-variable",begin:/\{\{\{/,end:/\}\}\}/,contains:[h]},{className:"template-variable",begin:/\{\{/,end:/\}\}/,contains:[h]}]}}(n);return a.name="HTMLbars",n.getLanguage("handlebars")&&(a.disableAutodetect=!0),a}}());
\ No newline at end of file
+hljs.registerLanguage("htmlbars",function(e){var a="action collection component concat debugger each each-in else get hash if input link-to loc log mut outlet partial query-params render textarea unbound unless with yield view",t=(e.QSM,{eW:!0,relevance:0,k:{keyword:"as",built_in:a},c:[e.QSM,{i:/\}\}/,b:/[a-zA-Z0-9_]+=/,rB:!0,relevance:0,c:[{cN:"attr",b:/[a-zA-Z0-9_]+/}]},e.NM]});return{cI:!0,sL:"xml",c:[e.C("{{!(--)?","(--)?}}"),{cN:"template-tag",b:/\{\{[#\/]/,e:/\}\}/,c:[{cN:"name",b:/[a-zA-Z\.\-]+/,k:{"builtin-name":a},starts:t}]},{cN:"template-variable",b:/\{\{[a-zA-Z][a-zA-Z\-]+/,e:/\}\}/,k:{keyword:"as",built_in:a},c:[e.QSM]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/http.min.js b/vendor/assets/javascripts/highlightjs/languages/http.min.js
index e7ea1b0a78..ff86eb1260 100644
--- a/vendor/assets/javascripts/highlightjs/languages/http.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/http.min.js
@@ -1 +1 @@
-hljs.registerLanguage("http",function(){"use strict";return function(e){return{name:"HTTP",aliases:["https"],illegal:"\\S",contains:[{begin:"^HTTP/[0-9\\.]+",end:"$",contains:[{className:"number",begin:"\\b\\d{3}\\b"}]},{begin:"^[A-Z]+ (.*?) HTTP/[0-9\\.]+$",returnBegin:!0,end:"$",contains:[{className:"string",begin:" ",end:" ",excludeBegin:!0,excludeEnd:!0},{begin:"HTTP/[0-9\\.]+"},{className:"keyword",begin:"[A-Z]+"}]},{className:"attribute",begin:"^\\w",end:": ",excludeEnd:!0,illegal:"\\n|\\s|=",starts:{end:"$",relevance:0}},{begin:"\\n\\n",starts:{subLanguage:[],endsWithParent:!0}}]}}}());
\ No newline at end of file
+hljs.registerLanguage("http",function(e){var t="HTTP/[0-9\\.]+";return{aliases:["https"],i:"\\S",c:[{b:"^"+t,e:"$",c:[{cN:"number",b:"\\b\\d{3}\\b"}]},{b:"^[A-Z]+ (.*?) "+t+"$",rB:!0,e:"$",c:[{cN:"string",b:" ",e:" ",eB:!0,eE:!0},{b:t},{cN:"keyword",b:"[A-Z]+"}]},{cN:"attribute",b:"^\\w",e:": ",eE:!0,i:"\\n|\\s|=",starts:{e:"$",relevance:0}},{b:"\\n\\n",starts:{sL:[],eW:!0}}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/hy.min.js b/vendor/assets/javascripts/highlightjs/languages/hy.min.js
index a494906d31..8747ff2f41 100644
--- a/vendor/assets/javascripts/highlightjs/languages/hy.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/hy.min.js
@@ -1 +1 @@
-hljs.registerLanguage("hy",function(){"use strict";return function(e){var a="[a-zA-Z_\\-!.?+*=<>&#'][a-zA-Z_\\-!.?+*=<>&#'0-9/;:]*",t={$pattern:a,"builtin-name":"!= % %= & &= * ** **= *= *map + += , --build-class-- --import-- -= . / // //= /= < << <<= <= = > >= >> >>= @ @= ^ ^= abs accumulate all and any ap-compose ap-dotimes ap-each ap-each-while ap-filter ap-first ap-if ap-last ap-map ap-map-when ap-pipe ap-reduce ap-reject apply as-> ascii assert assoc bin break butlast callable calling-module-name car case cdr chain chr coll? combinations compile compress cond cons cons? continue count curry cut cycle dec def default-method defclass defmacro defmacro-alias defmacro/g! defmain defmethod defmulti defn defn-alias defnc defnr defreader defseq del delattr delete-route dict-comp dir disassemble dispatch-reader-macro distinct divmod do doto drop drop-last drop-while empty? end-sequence eval eval-and-compile eval-when-compile even? every? except exec filter first flatten float? fn fnc fnr for for* format fraction genexpr gensym get getattr global globals group-by hasattr hash hex id identity if if* if-not if-python2 import in inc input instance? integer integer-char? integer? interleave interpose is is-coll is-cons is-empty is-even is-every is-float is-instance is-integer is-integer-char is-iterable is-iterator is-keyword is-neg is-none is-not is-numeric is-odd is-pos is-string is-symbol is-zero isinstance islice issubclass iter iterable? iterate iterator? keyword keyword? lambda last len let lif lif-not list* list-comp locals loop macro-error macroexpand macroexpand-1 macroexpand-all map max merge-with method-decorator min multi-decorator multicombinations name neg? next none? nonlocal not not-in not? nth numeric? oct odd? open or ord partition permutations pos? post-route postwalk pow prewalk print product profile/calls profile/cpu put-route quasiquote quote raise range read read-str recursive-replace reduce remove repeat repeatedly repr require rest round route route-with-methods rwm second seq set-comp setattr setv some sorted string string? sum switch symbol? take take-nth take-while tee try unless unquote unquote-splicing vars walk when while with with* with-decorator with-gensyms xi xor yield yield-from zero? zip zip-longest | |= ~"},i={begin:a,relevance:0},n={className:"number",begin:"[-+]?\\d+(\\.\\d+)?",relevance:0},r=e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),s=e.COMMENT(";","$",{relevance:0}),o={className:"literal",begin:/\b([Tt]rue|[Ff]alse|nil|None)\b/},l={begin:"[\\[\\{]",end:"[\\]\\}]"},c={className:"comment",begin:"\\^"+a},d=e.COMMENT("\\^\\{","\\}"),m={className:"symbol",begin:"[:]{1,2}"+a},p={begin:"\\(",end:"\\)"},u={endsWithParent:!0,relevance:0},f={keywords:t,className:"name",begin:a,starts:u},g=[p,r,c,d,s,m,l,n,o,i];return p.contains=[e.COMMENT("comment",""),f,u],u.contains=g,l.contains=g,{name:"Hy",aliases:["hylang"],illegal:/\S/,contains:[e.SHEBANG(),p,r,c,d,s,m,l,n,o]}}}());
\ No newline at end of file
+hljs.registerLanguage("hy",function(e){var t="a-zA-Z_\\-!.?+*=<>&#'",a="["+t+"]["+t+"0-9/;:]*",i={b:a,relevance:0},r={cN:"number",b:"[-+]?\\d+(\\.\\d+)?",relevance:0},o=e.inherit(e.QSM,{i:null}),n=e.C(";","$",{relevance:0}),s={cN:"literal",b:/\b([Tt]rue|[Ff]alse|nil|None)\b/},l={b:"[\\[\\{]",e:"[\\]\\}]"},c={cN:"comment",b:"\\^"+a},d=e.C("\\^\\{","\\}"),p={cN:"symbol",b:"[:]{1,2}"+a},m={b:"\\(",e:"\\)"},u={eW:!0,relevance:0},f={k:{"builtin-name":"!= % %= & &= * ** **= *= *map + += , --build-class-- --import-- -= . / // //= /= < << <<= <= = > >= >> >>= @ @= ^ ^= abs accumulate all and any ap-compose ap-dotimes ap-each ap-each-while ap-filter ap-first ap-if ap-last ap-map ap-map-when ap-pipe ap-reduce ap-reject apply as-> ascii assert assoc bin break butlast callable calling-module-name car case cdr chain chr coll? combinations compile compress cond cons cons? continue count curry cut cycle dec def default-method defclass defmacro defmacro-alias defmacro/g! defmain defmethod defmulti defn defn-alias defnc defnr defreader defseq del delattr delete-route dict-comp dir disassemble dispatch-reader-macro distinct divmod do doto drop drop-last drop-while empty? end-sequence eval eval-and-compile eval-when-compile even? every? except exec filter first flatten float? fn fnc fnr for for* format fraction genexpr gensym get getattr global globals group-by hasattr hash hex id identity if if* if-not if-python2 import in inc input instance? integer integer-char? integer? interleave interpose is is-coll is-cons is-empty is-even is-every is-float is-instance is-integer is-integer-char is-iterable is-iterator is-keyword is-neg is-none is-not is-numeric is-odd is-pos is-string is-symbol is-zero isinstance islice issubclass iter iterable? iterate iterator? keyword keyword? lambda last len let lif lif-not list* list-comp locals loop macro-error macroexpand macroexpand-1 macroexpand-all map max merge-with method-decorator min multi-decorator multicombinations name neg? next none? nonlocal not not-in not? nth numeric? oct odd? open or ord partition permutations pos? post-route postwalk pow prewalk print product profile/calls profile/cpu put-route quasiquote quote raise range read read-str recursive-replace reduce remove repeat repeatedly repr require rest round route route-with-methods rwm second seq set-comp setattr setv some sorted string string? sum switch symbol? take take-nth take-while tee try unless unquote unquote-splicing vars walk when while with with* with-decorator with-gensyms xi xor yield yield-from zero? zip zip-longest | |= ~"},l:a,cN:"name",b:a,starts:u},h=[m,o,c,d,n,p,l,r,s,i];return m.c=[e.C("comment",""),f,u],u.c=h,l.c=h,{aliases:["hylang"],i:/\S/,c:[{cN:"meta",b:"^#!",e:"$"},m,o,c,d,n,p,l,r,s]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/inform7.min.js b/vendor/assets/javascripts/highlightjs/languages/inform7.min.js
index 9816383e73..8a3a6bb617 100644
--- a/vendor/assets/javascripts/highlightjs/languages/inform7.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/inform7.min.js
@@ -1 +1 @@
-hljs.registerLanguage("inform7",function(){"use strict";return function(e){return{name:"Inform 7",aliases:["i7"],case_insensitive:!0,keywords:{keyword:"thing room person man woman animal container supporter backdrop door scenery open closed locked inside gender is are say understand kind of rule"},contains:[{className:"string",begin:'"',end:'"',relevance:0,contains:[{className:"subst",begin:"\\[",end:"\\]"}]},{className:"section",begin:/^(Volume|Book|Part|Chapter|Section|Table)\b/,end:"$"},{begin:/^(Check|Carry out|Report|Instead of|To|Rule|When|Before|After)\b/,end:":",contains:[{begin:"\\(This",end:"\\)"}]},{className:"comment",begin:"\\[",end:"\\]",contains:["self"]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("inform7",function(e){return{aliases:["i7"],cI:!0,k:{keyword:"thing room person man woman animal container supporter backdrop door scenery open closed locked inside gender is are say understand kind of rule"},c:[{cN:"string",b:'"',e:'"',relevance:0,c:[{cN:"subst",b:"\\[",e:"\\]"}]},{cN:"section",b:/^(Volume|Book|Part|Chapter|Section|Table)\b/,e:"$"},{b:/^(Check|Carry out|Report|Instead of|To|Rule|When|Before|After)\b/,e:":",c:[{b:"\\(This",e:"\\)"}]},{cN:"comment",b:"\\[",e:"\\]",c:["self"]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ini.min.js b/vendor/assets/javascripts/highlightjs/languages/ini.min.js
index 80541dca3c..600ae746f1 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ini.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ini.min.js
@@ -1 +1 @@
-hljs.registerLanguage("ini",function(){"use strict";return function(e){var n={className:"number",relevance:0,variants:[{begin:/([\+\-]+)?[\d]+_[\d_]+/},{begin:e.NUMBER_RE}]},a=e.COMMENT();a.variants=[{begin:/;/,end:/$/},{begin:/#/,end:/$/}];var s={className:"variable",variants:[{begin:/\$[\w\d"][\w\d_]*/},{begin:/\$\{(.*?)}/}]},i={className:"literal",begin:/\bon|off|true|false|yes|no\b/},t={className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:"'''",end:"'''",relevance:10},{begin:'"""',end:'"""',relevance:10},{begin:'"',end:'"'},{begin:"'",end:"'"}]};return{name:"TOML, also INI",aliases:["toml"],case_insensitive:!0,illegal:/\S/,contains:[a,{className:"section",begin:/\[+/,end:/\]+/},{begin:/^[a-z0-9\[\]_\.-]+(?=\s*=\s*)/,className:"attr",starts:{end:/$/,contains:[a,{begin:/\[/,end:/\]/,contains:[a,i,s,t,n,"self"],relevance:0},i,s,t,n]}}]}}}());
\ No newline at end of file
+hljs.registerLanguage("ini",function(e){var b={cN:"number",relevance:0,v:[{b:/([\+\-]+)?[\d]+_[\d_]+/},{b:e.NR}]},a=e.C();a.v=[{b:/;/,e:/$/},{b:/#/,e:/$/}];var c={cN:"variable",v:[{b:/\$[\w\d"][\w\d_]*/},{b:/\$\{(.*?)}/}]},r={cN:"literal",b:/\bon|off|true|false|yes|no\b/},n={cN:"string",c:[e.BE],v:[{b:"'''",e:"'''",relevance:10},{b:'"""',e:'"""',relevance:10},{b:'"',e:'"'},{b:"'",e:"'"}]};return{aliases:["toml"],cI:!0,i:/\S/,c:[a,{cN:"section",b:/\[+/,e:/\]+/},{b:/^[a-z0-9\[\]_\.-]+(?=\s*=\s*)/,cN:"attr",starts:{e:/$/,c:[a,{b:/\[/,e:/\]/,c:[a,r,c,n,b,"self"],relevance:0},r,c,n,b]}}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/irpf90.min.js b/vendor/assets/javascripts/highlightjs/languages/irpf90.min.js
index e0e369d14c..2e25ca8a6f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/irpf90.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/irpf90.min.js
@@ -1 +1 @@
-hljs.registerLanguage("irpf90",function(){"use strict";return function(e){return{name:"IRPF90",case_insensitive:!0,keywords:{literal:".False. .True.",keyword:"kind do while private call intrinsic where elsewhere type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then public subroutine|10 function program .and. .or. .not. .le. .eq. .ge. .gt. .lt. goto save else use module select case access blank direct exist file fmt form formatted iostat name named nextrec number opened rec recl sequential status unformatted unit continue format pause cycle exit c_null_char c_alert c_backspace c_form_feed flush wait decimal round iomsg synchronous nopass non_overridable pass protected volatile abstract extends import non_intrinsic value deferred generic final enumerator class associate bind enum c_int c_short c_long c_long_long c_signed_char c_size_t c_int8_t c_int16_t c_int32_t c_int64_t c_int_least8_t c_int_least16_t c_int_least32_t c_int_least64_t c_int_fast8_t c_int_fast16_t c_int_fast32_t c_int_fast64_t c_intmax_t C_intptr_t c_float c_double c_long_double c_float_complex c_double_complex c_long_double_complex c_bool c_char c_null_ptr c_null_funptr c_new_line c_carriage_return c_horizontal_tab c_vertical_tab iso_c_binding c_loc c_funloc c_associated  c_f_pointer c_ptr c_funptr iso_fortran_env character_storage_size error_unit file_storage_size input_unit iostat_end iostat_eor numeric_storage_size output_unit c_f_procpointer ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode newunit contiguous recursive pad position action delim readwrite eor advance nml interface procedure namelist include sequence elemental pure integer real character complex logical dimension allocatable|10 parameter external implicit|10 none double precision assign intent optional pointer target in out common equivalence data begin_provider &begin_provider end_provider begin_shell end_shell begin_template end_template subst assert touch soft_touch provide no_dep free irp_if irp_else irp_endif irp_write irp_read",built_in:"alog alog10 amax0 amax1 amin0 amin1 amod cabs ccos cexp clog csin csqrt dabs dacos dasin datan datan2 dcos dcosh ddim dexp dint dlog dlog10 dmax1 dmin1 dmod dnint dsign dsin dsinh dsqrt dtan dtanh float iabs idim idint idnint ifix isign max0 max1 min0 min1 sngl algama cdabs cdcos cdexp cdlog cdsin cdsqrt cqabs cqcos cqexp cqlog cqsin cqsqrt dcmplx dconjg derf derfc dfloat dgamma dimag dlgama iqint qabs qacos qasin qatan qatan2 qcmplx qconjg qcos qcosh qdim qerf qerfc qexp qgamma qimag qlgama qlog qlog10 qmax1 qmin1 qmod qnint qsign qsin qsinh qsqrt qtan qtanh abs acos aimag aint anint asin atan atan2 char cmplx conjg cos cosh exp ichar index int log log10 max min nint sign sin sinh sqrt tan tanh print write dim lge lgt lle llt mod nullify allocate deallocate adjustl adjustr all allocated any associated bit_size btest ceiling count cshift date_and_time digits dot_product eoshift epsilon exponent floor fraction huge iand ibclr ibits ibset ieor ior ishft ishftc lbound len_trim matmul maxexponent maxloc maxval merge minexponent minloc minval modulo mvbits nearest pack present product radix random_number random_seed range repeat reshape rrspacing scale scan selected_int_kind selected_real_kind set_exponent shape size spacing spread sum system_clock tiny transpose trim ubound unpack verify achar iachar transfer dble entry dprod cpu_time command_argument_count get_command get_command_argument get_environment_variable is_iostat_end ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode is_iostat_eor move_alloc new_line selected_char_kind same_type_as extends_type_of acosh asinh atanh bessel_j0 bessel_j1 bessel_jn bessel_y0 bessel_y1 bessel_yn erf erfc erfc_scaled gamma log_gamma hypot norm2 atomic_define atomic_ref execute_command_line leadz trailz storage_size merge_bits bge bgt ble blt dshiftl dshiftr findloc iall iany iparity image_index lcobound ucobound maskl maskr num_images parity popcnt poppar shifta shiftl shiftr this_image IRP_ALIGN irp_here"},illegal:/\/\*/,contains:[e.inherit(e.APOS_STRING_MODE,{className:"string",relevance:0}),e.inherit(e.QUOTE_STRING_MODE,{className:"string",relevance:0}),{className:"function",beginKeywords:"subroutine function program",illegal:"[${=\\n]",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",begin:"\\(",end:"\\)"}]},e.COMMENT("!","$",{relevance:0}),e.COMMENT("begin_doc","end_doc",{relevance:10}),{className:"number",begin:"(?=\\b|\\+|\\-|\\.)(?:\\.|\\d+\\.?)\\d*([de][+-]?\\d+)?(_[a-z_\\d]+)?",relevance:0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("irpf90",function(e){return{cI:!0,k:{literal:".False. .True.",keyword:"kind do while private call intrinsic where elsewhere type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then public subroutine|10 function program .and. .or. .not. .le. .eq. .ge. .gt. .lt. goto save else use module select case access blank direct exist file fmt form formatted iostat name named nextrec number opened rec recl sequential status unformatted unit continue format pause cycle exit c_null_char c_alert c_backspace c_form_feed flush wait decimal round iomsg synchronous nopass non_overridable pass protected volatile abstract extends import non_intrinsic value deferred generic final enumerator class associate bind enum c_int c_short c_long c_long_long c_signed_char c_size_t c_int8_t c_int16_t c_int32_t c_int64_t c_int_least8_t c_int_least16_t c_int_least32_t c_int_least64_t c_int_fast8_t c_int_fast16_t c_int_fast32_t c_int_fast64_t c_intmax_t C_intptr_t c_float c_double c_long_double c_float_complex c_double_complex c_long_double_complex c_bool c_char c_null_ptr c_null_funptr c_new_line c_carriage_return c_horizontal_tab c_vertical_tab iso_c_binding c_loc c_funloc c_associated  c_f_pointer c_ptr c_funptr iso_fortran_env character_storage_size error_unit file_storage_size input_unit iostat_end iostat_eor numeric_storage_size output_unit c_f_procpointer ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode newunit contiguous recursive pad position action delim readwrite eor advance nml interface procedure namelist include sequence elemental pure integer real character complex logical dimension allocatable|10 parameter external implicit|10 none double precision assign intent optional pointer target in out common equivalence data begin_provider &begin_provider end_provider begin_shell end_shell begin_template end_template subst assert touch soft_touch provide no_dep free irp_if irp_else irp_endif irp_write irp_read",built_in:"alog alog10 amax0 amax1 amin0 amin1 amod cabs ccos cexp clog csin csqrt dabs dacos dasin datan datan2 dcos dcosh ddim dexp dint dlog dlog10 dmax1 dmin1 dmod dnint dsign dsin dsinh dsqrt dtan dtanh float iabs idim idint idnint ifix isign max0 max1 min0 min1 sngl algama cdabs cdcos cdexp cdlog cdsin cdsqrt cqabs cqcos cqexp cqlog cqsin cqsqrt dcmplx dconjg derf derfc dfloat dgamma dimag dlgama iqint qabs qacos qasin qatan qatan2 qcmplx qconjg qcos qcosh qdim qerf qerfc qexp qgamma qimag qlgama qlog qlog10 qmax1 qmin1 qmod qnint qsign qsin qsinh qsqrt qtan qtanh abs acos aimag aint anint asin atan atan2 char cmplx conjg cos cosh exp ichar index int log log10 max min nint sign sin sinh sqrt tan tanh print write dim lge lgt lle llt mod nullify allocate deallocate adjustl adjustr all allocated any associated bit_size btest ceiling count cshift date_and_time digits dot_product eoshift epsilon exponent floor fraction huge iand ibclr ibits ibset ieor ior ishft ishftc lbound len_trim matmul maxexponent maxloc maxval merge minexponent minloc minval modulo mvbits nearest pack present product radix random_number random_seed range repeat reshape rrspacing scale scan selected_int_kind selected_real_kind set_exponent shape size spacing spread sum system_clock tiny transpose trim ubound unpack verify achar iachar transfer dble entry dprod cpu_time command_argument_count get_command get_command_argument get_environment_variable is_iostat_end ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode is_iostat_eor move_alloc new_line selected_char_kind same_type_as extends_type_ofacosh asinh atanh bessel_j0 bessel_j1 bessel_jn bessel_y0 bessel_y1 bessel_yn erf erfc erfc_scaled gamma log_gamma hypot norm2 atomic_define atomic_ref execute_command_line leadz trailz storage_size merge_bits bge bgt ble blt dshiftl dshiftr findloc iall iany iparity image_index lcobound ucobound maskl maskr num_images parity popcnt poppar shifta shiftl shiftr this_image IRP_ALIGN irp_here"},i:/\/\*/,c:[e.inherit(e.ASM,{cN:"string",relevance:0}),e.inherit(e.QSM,{cN:"string",relevance:0}),{cN:"function",bK:"subroutine function program",i:"[${=\\n]",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)"}]},e.C("!","$",{relevance:0}),e.C("begin_doc","end_doc",{relevance:10}),{cN:"number",b:"(?=\\b|\\+|\\-|\\.)(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*)(?:[de][+-]?\\d+)?\\b\\.?",relevance:0}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/isbl.min.js b/vendor/assets/javascripts/highlightjs/languages/isbl.min.js
index e69de29bb2..384bf9f85d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/isbl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/isbl.min.js
@@ -0,0 +1 @@
+hljs.registerLanguage("isbl",function(S){var E="[A-Za-zА-Яа-яёЁ_!][A-Za-zА-Яа-яёЁ_0-9]*",_={cN:"number",b:S.NR,relevance:0},T={cN:"string",v:[{b:'"',e:'"'},{b:"'",e:"'"}]},R={cN:"doctag",b:"\\b(?:TODO|DONE|BEGIN|END|STUB|CHG|FIXME|NOTE|BUG|XXX)\\b",relevance:0},O={v:[{cN:"comment",b:"//",e:"$",relevance:0,c:[S.PWM,R]},{cN:"comment",b:"/\\*",e:"\\*/",relevance:0,c:[S.PWM,R]}]},C={keyword:"and и else иначе endexcept endfinally endforeach конецвсе endif конецесли endwhile конецпока except exitfor finally foreach все if если in в not не or или try while пока ",built_in:"SYSRES_CONST_ACCES_RIGHT_TYPE_EDIT SYSRES_CONST_ACCES_RIGHT_TYPE_FULL SYSRES_CONST_ACCES_RIGHT_TYPE_VIEW SYSRES_CONST_ACCESS_MODE_REQUISITE_CODE SYSRES_CONST_ACCESS_NO_ACCESS_VIEW SYSRES_CONST_ACCESS_NO_ACCESS_VIEW_CODE SYSRES_CONST_ACCESS_RIGHTS_ADD_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_ADD_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_CHANGE_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_CHANGE_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_DELETE_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_DELETE_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_EXECUTE_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_EXECUTE_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_NO_ACCESS_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_NO_ACCESS_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_RATIFY_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_RATIFY_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_VIEW SYSRES_CONST_ACCESS_RIGHTS_VIEW_CODE SYSRES_CONST_ACCESS_RIGHTS_VIEW_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_VIEW_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_TYPE_CHANGE SYSRES_CONST_ACCESS_TYPE_CHANGE_CODE SYSRES_CONST_ACCESS_TYPE_EXISTS SYSRES_CONST_ACCESS_TYPE_EXISTS_CODE SYSRES_CONST_ACCESS_TYPE_FULL SYSRES_CONST_ACCESS_TYPE_FULL_CODE SYSRES_CONST_ACCESS_TYPE_VIEW SYSRES_CONST_ACCESS_TYPE_VIEW_CODE SYSRES_CONST_ACTION_TYPE_ABORT SYSRES_CONST_ACTION_TYPE_ACCEPT SYSRES_CONST_ACTION_TYPE_ACCESS_RIGHTS SYSRES_CONST_ACTION_TYPE_ADD_ATTACHMENT SYSRES_CONST_ACTION_TYPE_CHANGE_CARD SYSRES_CONST_ACTION_TYPE_CHANGE_KIND SYSRES_CONST_ACTION_TYPE_CHANGE_STORAGE SYSRES_CONST_ACTION_TYPE_CONTINUE SYSRES_CONST_ACTION_TYPE_COPY SYSRES_CONST_ACTION_TYPE_CREATE SYSRES_CONST_ACTION_TYPE_CREATE_VERSION SYSRES_CONST_ACTION_TYPE_DELETE SYSRES_CONST_ACTION_TYPE_DELETE_ATTACHMENT SYSRES_CONST_ACTION_TYPE_DELETE_VERSION SYSRES_CONST_ACTION_TYPE_DISABLE_DELEGATE_ACCESS_RIGHTS SYSRES_CONST_ACTION_TYPE_ENABLE_DELEGATE_ACCESS_RIGHTS SYSRES_CONST_ACTION_TYPE_ENCRYPTION_BY_CERTIFICATE SYSRES_CONST_ACTION_TYPE_ENCRYPTION_BY_CERTIFICATE_AND_PASSWORD SYSRES_CONST_ACTION_TYPE_ENCRYPTION_BY_PASSWORD SYSRES_CONST_ACTION_TYPE_EXPORT_WITH_LOCK SYSRES_CONST_ACTION_TYPE_EXPORT_WITHOUT_LOCK SYSRES_CONST_ACTION_TYPE_IMPORT_WITH_UNLOCK SYSRES_CONST_ACTION_TYPE_IMPORT_WITHOUT_UNLOCK SYSRES_CONST_ACTION_TYPE_LIFE_CYCLE_STAGE SYSRES_CONST_ACTION_TYPE_LOCK SYSRES_CONST_ACTION_TYPE_LOCK_FOR_SERVER SYSRES_CONST_ACTION_TYPE_LOCK_MODIFY SYSRES_CONST_ACTION_TYPE_MARK_AS_READED SYSRES_CONST_ACTION_TYPE_MARK_AS_UNREADED SYSRES_CONST_ACTION_TYPE_MODIFY SYSRES_CONST_ACTION_TYPE_MODIFY_CARD SYSRES_CONST_ACTION_TYPE_MOVE_TO_ARCHIVE SYSRES_CONST_ACTION_TYPE_OFF_ENCRYPTION SYSRES_CONST_ACTION_TYPE_PASSWORD_CHANGE SYSRES_CONST_ACTION_TYPE_PERFORM SYSRES_CONST_ACTION_TYPE_RECOVER_FROM_LOCAL_COPY SYSRES_CONST_ACTION_TYPE_RESTART SYSRES_CONST_ACTION_TYPE_RESTORE_FROM_ARCHIVE SYSRES_CONST_ACTION_TYPE_REVISION SYSRES_CONST_ACTION_TYPE_SEND_BY_MAIL SYSRES_CONST_ACTION_TYPE_SIGN SYSRES_CONST_ACTION_TYPE_START SYSRES_CONST_ACTION_TYPE_UNLOCK SYSRES_CONST_ACTION_TYPE_UNLOCK_FROM_SERVER SYSRES_CONST_ACTION_TYPE_VERSION_STATE SYSRES_CONST_ACTION_TYPE_VERSION_VISIBILITY SYSRES_CONST_ACTION_TYPE_VIEW SYSRES_CONST_ACTION_TYPE_VIEW_SHADOW_COPY SYSRES_CONST_ACTION_TYPE_WORKFLOW_DESCRIPTION_MODIFY SYSRES_CONST_ACTION_TYPE_WRITE_HISTORY SYSRES_CONST_ACTIVE_VERSION_STATE_PICK_VALUE SYSRES_CONST_ADD_REFERENCE_MODE_NAME SYSRES_CONST_ADDITION_REQUISITE_CODE SYSRES_CONST_ADDITIONAL_PARAMS_REQUISITE_CODE SYSRES_CONST_ADITIONAL_JOB_END_DATE_REQUISITE_NAME SYSRES_CONST_ADITIONAL_JOB_READ_REQUISITE_NAME SYSRES_CONST_ADITIONAL_JOB_START_DATE_REQUISITE_NAME SYSRES_CONST_ADITIONAL_JOB_STATE_REQUISITE_NAME SYSRES_CONST_ADMINISTRATION_HISTORY_ADDING_USER_TO_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_ADDING_USER_TO_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_COMP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_COMP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_USER_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_USER_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_DATABASE_USER_CREATION SYSRES_CONST_ADMINISTRATION_HISTORY_DATABASE_USER_CREATION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DATABASE_USER_DELETION SYSRES_CONST_ADMINISTRATION_HISTORY_DATABASE_USER_DELETION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_COMP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_COMP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_USER_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_USER_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_USER_FROM_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_USER_FROM_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_FILTERER_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_FILTERER_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_FILTERER_RESTRICTION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_FILTERER_RESTRICTION_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_PRIVILEGE_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_PRIVILEGE_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_RIGHTS_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_RIGHTS_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_IS_MAIN_SERVER_CHANGED_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_IS_MAIN_SERVER_CHANGED_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_IS_PUBLIC_CHANGED_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_IS_PUBLIC_CHANGED_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_FILTERER_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_FILTERER_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_FILTERER_RESTRICTION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_FILTERER_RESTRICTION_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_PRIVILEGE_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_PRIVILEGE_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_RIGHTS_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_RIGHTS_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_SERVER_LOGIN_CREATION SYSRES_CONST_ADMINISTRATION_HISTORY_SERVER_LOGIN_CREATION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_SERVER_LOGIN_DELETION SYSRES_CONST_ADMINISTRATION_HISTORY_SERVER_LOGIN_DELETION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_CATEGORY_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_CATEGORY_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_COMP_TITLE_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_COMP_TITLE_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_FULL_NAME_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_FULL_NAME_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_PARENT_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_PARENT_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_AUTH_TYPE_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_AUTH_TYPE_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_LOGIN_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_LOGIN_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_STATUS_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_STATUS_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_USER_PASSWORD_CHANGE SYSRES_CONST_ADMINISTRATION_HISTORY_USER_PASSWORD_CHANGE_ACTION SYSRES_CONST_ALL_ACCEPT_CONDITION_RUS SYSRES_CONST_ALL_USERS_GROUP SYSRES_CONST_ALL_USERS_GROUP_NAME SYSRES_CONST_ALL_USERS_SERVER_GROUP_NAME SYSRES_CONST_ALLOWED_ACCESS_TYPE_CODE SYSRES_CONST_ALLOWED_ACCESS_TYPE_NAME SYSRES_CONST_APP_VIEWER_TYPE_REQUISITE_CODE SYSRES_CONST_APPROVING_SIGNATURE_NAME SYSRES_CONST_APPROVING_SIGNATURE_REQUISITE_CODE SYSRES_CONST_ASSISTANT_SUBSTITUE_TYPE SYSRES_CONST_ASSISTANT_SUBSTITUE_TYPE_CODE SYSRES_CONST_ATTACH_TYPE_COMPONENT_TOKEN SYSRES_CONST_ATTACH_TYPE_DOC SYSRES_CONST_ATTACH_TYPE_EDOC SYSRES_CONST_ATTACH_TYPE_FOLDER SYSRES_CONST_ATTACH_TYPE_JOB SYSRES_CONST_ATTACH_TYPE_REFERENCE SYSRES_CONST_ATTACH_TYPE_TASK SYSRES_CONST_AUTH_ENCODED_PASSWORD SYSRES_CONST_AUTH_ENCODED_PASSWORD_CODE SYSRES_CONST_AUTH_NOVELL SYSRES_CONST_AUTH_PASSWORD SYSRES_CONST_AUTH_PASSWORD_CODE SYSRES_CONST_AUTH_WINDOWS SYSRES_CONST_AUTHENTICATING_SIGNATURE_NAME SYSRES_CONST_AUTHENTICATING_SIGNATURE_REQUISITE_CODE SYSRES_CONST_AUTO_ENUM_METHOD_FLAG SYSRES_CONST_AUTO_NUMERATION_CODE SYSRES_CONST_AUTO_STRONG_ENUM_METHOD_FLAG SYSRES_CONST_AUTOTEXT_NAME_REQUISITE_CODE SYSRES_CONST_AUTOTEXT_TEXT_REQUISITE_CODE SYSRES_CONST_AUTOTEXT_USAGE_ALL SYSRES_CONST_AUTOTEXT_USAGE_ALL_CODE SYSRES_CONST_AUTOTEXT_USAGE_SIGN SYSRES_CONST_AUTOTEXT_USAGE_SIGN_CODE SYSRES_CONST_AUTOTEXT_USAGE_WORK SYSRES_CONST_AUTOTEXT_USAGE_WORK_CODE SYSRES_CONST_AUTOTEXT_USE_ANYWHERE_CODE SYSRES_CONST_AUTOTEXT_USE_ON_SIGNING_CODE SYSRES_CONST_AUTOTEXT_USE_ON_WORK_CODE SYSRES_CONST_BEGIN_DATE_REQUISITE_CODE SYSRES_CONST_BLACK_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_BLUE_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_BTN_PART SYSRES_CONST_CALCULATED_ROLE_TYPE_CODE SYSRES_CONST_CALL_TYPE_VARIABLE_BUTTON_VALUE SYSRES_CONST_CALL_TYPE_VARIABLE_PROGRAM_VALUE SYSRES_CONST_CANCEL_MESSAGE_FUNCTION_RESULT SYSRES_CONST_CARD_PART SYSRES_CONST_CARD_REFERENCE_MODE_NAME SYSRES_CONST_CERTIFICATE_TYPE_REQUISITE_ENCRYPT_VALUE SYSRES_CONST_CERTIFICATE_TYPE_REQUISITE_SIGN_AND_ENCRYPT_VALUE SYSRES_CONST_CERTIFICATE_TYPE_REQUISITE_SIGN_VALUE SYSRES_CONST_CHECK_PARAM_VALUE_DATE_PARAM_TYPE SYSRES_CONST_CHECK_PARAM_VALUE_FLOAT_PARAM_TYPE SYSRES_CONST_CHECK_PARAM_VALUE_INTEGER_PARAM_TYPE SYSRES_CONST_CHECK_PARAM_VALUE_PICK_PARAM_TYPE SYSRES_CONST_CHECK_PARAM_VALUE_REEFRENCE_PARAM_TYPE SYSRES_CONST_CLOSED_RECORD_FLAG_VALUE_FEMININE SYSRES_CONST_CLOSED_RECORD_FLAG_VALUE_MASCULINE SYSRES_CONST_CODE_COMPONENT_TYPE_ADMIN SYSRES_CONST_CODE_COMPONENT_TYPE_DEVELOPER SYSRES_CONST_CODE_COMPONENT_TYPE_DOCS SYSRES_CONST_CODE_COMPONENT_TYPE_EDOC_CARDS SYSRES_CONST_CODE_COMPONENT_TYPE_EXTERNAL_EXECUTABLE SYSRES_CONST_CODE_COMPONENT_TYPE_OTHER SYSRES_CONST_CODE_COMPONENT_TYPE_REFERENCE SYSRES_CONST_CODE_COMPONENT_TYPE_REPORT SYSRES_CONST_CODE_COMPONENT_TYPE_SCRIPT SYSRES_CONST_CODE_COMPONENT_TYPE_URL SYSRES_CONST_CODE_REQUISITE_ACCESS SYSRES_CONST_CODE_REQUISITE_CODE SYSRES_CONST_CODE_REQUISITE_COMPONENT SYSRES_CONST_CODE_REQUISITE_DESCRIPTION SYSRES_CONST_CODE_REQUISITE_EXCLUDE_COMPONENT SYSRES_CONST_CODE_REQUISITE_RECORD SYSRES_CONST_COMMENT_REQ_CODE SYSRES_CONST_COMMON_SETTINGS_REQUISITE_CODE SYSRES_CONST_COMP_CODE_GRD SYSRES_CONST_COMPONENT_GROUP_TYPE_REQUISITE_CODE SYSRES_CONST_COMPONENT_TYPE_ADMIN_COMPONENTS SYSRES_CONST_COMPONENT_TYPE_DEVELOPER_COMPONENTS SYSRES_CONST_COMPONENT_TYPE_DOCS SYSRES_CONST_COMPONENT_TYPE_EDOC_CARDS SYSRES_CONST_COMPONENT_TYPE_EDOCS SYSRES_CONST_COMPONENT_TYPE_EXTERNAL_EXECUTABLE SYSRES_CONST_COMPONENT_TYPE_OTHER SYSRES_CONST_COMPONENT_TYPE_REFERENCE_TYPES SYSRES_CONST_COMPONENT_TYPE_REFERENCES SYSRES_CONST_COMPONENT_TYPE_REPORTS SYSRES_CONST_COMPONENT_TYPE_SCRIPTS SYSRES_CONST_COMPONENT_TYPE_URL SYSRES_CONST_COMPONENTS_REMOTE_SERVERS_VIEW_CODE SYSRES_CONST_CONDITION_BLOCK_DESCRIPTION SYSRES_CONST_CONST_FIRM_STATUS_COMMON SYSRES_CONST_CONST_FIRM_STATUS_INDIVIDUAL SYSRES_CONST_CONST_NEGATIVE_VALUE SYSRES_CONST_CONST_POSITIVE_VALUE SYSRES_CONST_CONST_SERVER_STATUS_DONT_REPLICATE SYSRES_CONST_CONST_SERVER_STATUS_REPLICATE SYSRES_CONST_CONTENTS_REQUISITE_CODE SYSRES_CONST_DATA_TYPE_BOOLEAN SYSRES_CONST_DATA_TYPE_DATE SYSRES_CONST_DATA_TYPE_FLOAT SYSRES_CONST_DATA_TYPE_INTEGER SYSRES_CONST_DATA_TYPE_PICK SYSRES_CONST_DATA_TYPE_REFERENCE SYSRES_CONST_DATA_TYPE_STRING SYSRES_CONST_DATA_TYPE_TEXT SYSRES_CONST_DATA_TYPE_VARIANT SYSRES_CONST_DATE_CLOSE_REQ_CODE SYSRES_CONST_DATE_FORMAT_DATE_ONLY_CHAR SYSRES_CONST_DATE_OPEN_REQ_CODE SYSRES_CONST_DATE_REQUISITE SYSRES_CONST_DATE_REQUISITE_CODE SYSRES_CONST_DATE_REQUISITE_NAME SYSRES_CONST_DATE_REQUISITE_TYPE SYSRES_CONST_DATE_TYPE_CHAR SYSRES_CONST_DATETIME_FORMAT_VALUE SYSRES_CONST_DEA_ACCESS_RIGHTS_ACTION_CODE SYSRES_CONST_DESCRIPTION_LOCALIZE_ID_REQUISITE_CODE SYSRES_CONST_DESCRIPTION_REQUISITE_CODE SYSRES_CONST_DET1_PART SYSRES_CONST_DET2_PART SYSRES_CONST_DET3_PART SYSRES_CONST_DET4_PART SYSRES_CONST_DET5_PART SYSRES_CONST_DET6_PART SYSRES_CONST_DETAIL_DATASET_KEY_REQUISITE_CODE SYSRES_CONST_DETAIL_PICK_REQUISITE_CODE SYSRES_CONST_DETAIL_REQ_CODE SYSRES_CONST_DO_NOT_USE_ACCESS_TYPE_CODE SYSRES_CONST_DO_NOT_USE_ACCESS_TYPE_NAME SYSRES_CONST_DO_NOT_USE_ON_VIEW_ACCESS_TYPE_CODE SYSRES_CONST_DO_NOT_USE_ON_VIEW_ACCESS_TYPE_NAME SYSRES_CONST_DOCUMENT_STORAGES_CODE SYSRES_CONST_DOCUMENT_TEMPLATES_TYPE_NAME SYSRES_CONST_DOUBLE_REQUISITE_CODE SYSRES_CONST_EDITOR_CLOSE_FILE_OBSERV_TYPE_CODE SYSRES_CONST_EDITOR_CLOSE_PROCESS_OBSERV_TYPE_CODE SYSRES_CONST_EDITOR_TYPE_REQUISITE_CODE SYSRES_CONST_EDITORS_APPLICATION_NAME_REQUISITE_CODE SYSRES_CONST_EDITORS_CREATE_SEVERAL_PROCESSES_REQUISITE_CODE SYSRES_CONST_EDITORS_EXTENSION_REQUISITE_CODE SYSRES_CONST_EDITORS_OBSERVER_BY_PROCESS_TYPE SYSRES_CONST_EDITORS_REFERENCE_CODE SYSRES_CONST_EDITORS_REPLACE_SPEC_CHARS_REQUISITE_CODE SYSRES_CONST_EDITORS_USE_PLUGINS_REQUISITE_CODE SYSRES_CONST_EDITORS_VIEW_DOCUMENT_OPENED_TO_EDIT_CODE SYSRES_CONST_EDOC_CARD_TYPE_REQUISITE_CODE SYSRES_CONST_EDOC_CARD_TYPES_LINK_REQUISITE_CODE SYSRES_CONST_EDOC_CERTIFICATE_AND_PASSWORD_ENCODE_CODE SYSRES_CONST_EDOC_CERTIFICATE_ENCODE_CODE SYSRES_CONST_EDOC_DATE_REQUISITE_CODE SYSRES_CONST_EDOC_KIND_REFERENCE_CODE SYSRES_CONST_EDOC_KINDS_BY_TEMPLATE_ACTION_CODE SYSRES_CONST_EDOC_MANAGE_ACCESS_CODE SYSRES_CONST_EDOC_NONE_ENCODE_CODE SYSRES_CONST_EDOC_NUMBER_REQUISITE_CODE SYSRES_CONST_EDOC_PASSWORD_ENCODE_CODE SYSRES_CONST_EDOC_READONLY_ACCESS_CODE SYSRES_CONST_EDOC_SHELL_LIFE_TYPE_VIEW_VALUE SYSRES_CONST_EDOC_SIZE_RESTRICTION_PRIORITY_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_CHECK_ACCESS_RIGHTS_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_COMPUTER_NAME_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_DATABASE_NAME_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_EDIT_IN_STORAGE_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_LOCAL_PATH_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_SHARED_SOURCE_NAME_REQUISITE_CODE SYSRES_CONST_EDOC_TEMPLATE_REQUISITE_CODE SYSRES_CONST_EDOC_TYPES_REFERENCE_CODE SYSRES_CONST_EDOC_VERSION_ACTIVE_STAGE_CODE SYSRES_CONST_EDOC_VERSION_DESIGN_STAGE_CODE SYSRES_CONST_EDOC_VERSION_OBSOLETE_STAGE_CODE SYSRES_CONST_EDOC_WRITE_ACCES_CODE SYSRES_CONST_EDOCUMENT_CARD_REQUISITES_REFERENCE_CODE_SELECTED_REQUISITE SYSRES_CONST_ENCODE_CERTIFICATE_TYPE_CODE SYSRES_CONST_END_DATE_REQUISITE_CODE SYSRES_CONST_ENUMERATION_TYPE_REQUISITE_CODE SYSRES_CONST_EXECUTE_ACCESS_RIGHTS_TYPE_CODE SYSRES_CONST_EXECUTIVE_FILE_STORAGE_TYPE SYSRES_CONST_EXIST_CONST SYSRES_CONST_EXIST_VALUE SYSRES_CONST_EXPORT_LOCK_TYPE_ASK SYSRES_CONST_EXPORT_LOCK_TYPE_WITH_LOCK SYSRES_CONST_EXPORT_LOCK_TYPE_WITHOUT_LOCK SYSRES_CONST_EXPORT_VERSION_TYPE_ASK SYSRES_CONST_EXPORT_VERSION_TYPE_LAST SYSRES_CONST_EXPORT_VERSION_TYPE_LAST_ACTIVE SYSRES_CONST_EXTENSION_REQUISITE_CODE SYSRES_CONST_FILTER_NAME_REQUISITE_CODE SYSRES_CONST_FILTER_REQUISITE_CODE SYSRES_CONST_FILTER_TYPE_COMMON_CODE SYSRES_CONST_FILTER_TYPE_COMMON_NAME SYSRES_CONST_FILTER_TYPE_USER_CODE SYSRES_CONST_FILTER_TYPE_USER_NAME SYSRES_CONST_FILTER_VALUE_REQUISITE_NAME SYSRES_CONST_FLOAT_NUMBER_FORMAT_CHAR SYSRES_CONST_FLOAT_REQUISITE_TYPE SYSRES_CONST_FOLDER_AUTHOR_VALUE SYSRES_CONST_FOLDER_KIND_ANY_OBJECTS SYSRES_CONST_FOLDER_KIND_COMPONENTS SYSRES_CONST_FOLDER_KIND_EDOCS SYSRES_CONST_FOLDER_KIND_JOBS SYSRES_CONST_FOLDER_KIND_TASKS SYSRES_CONST_FOLDER_TYPE_COMMON SYSRES_CONST_FOLDER_TYPE_COMPONENT SYSRES_CONST_FOLDER_TYPE_FAVORITES SYSRES_CONST_FOLDER_TYPE_INBOX SYSRES_CONST_FOLDER_TYPE_OUTBOX SYSRES_CONST_FOLDER_TYPE_QUICK_LAUNCH SYSRES_CONST_FOLDER_TYPE_SEARCH SYSRES_CONST_FOLDER_TYPE_SHORTCUTS SYSRES_CONST_FOLDER_TYPE_USER SYSRES_CONST_FROM_DICTIONARY_ENUM_METHOD_FLAG SYSRES_CONST_FULL_SUBSTITUTE_TYPE SYSRES_CONST_FULL_SUBSTITUTE_TYPE_CODE SYSRES_CONST_FUNCTION_CANCEL_RESULT SYSRES_CONST_FUNCTION_CATEGORY_SYSTEM SYSRES_CONST_FUNCTION_CATEGORY_USER SYSRES_CONST_FUNCTION_FAILURE_RESULT SYSRES_CONST_FUNCTION_SAVE_RESULT SYSRES_CONST_GENERATED_REQUISITE SYSRES_CONST_GREEN_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_GROUP_ACCOUNT_TYPE_VALUE_CODE SYSRES_CONST_GROUP_CATEGORY_NORMAL_CODE SYSRES_CONST_GROUP_CATEGORY_NORMAL_NAME SYSRES_CONST_GROUP_CATEGORY_SERVICE_CODE SYSRES_CONST_GROUP_CATEGORY_SERVICE_NAME SYSRES_CONST_GROUP_COMMON_CATEGORY_FIELD_VALUE SYSRES_CONST_GROUP_FULL_NAME_REQUISITE_CODE SYSRES_CONST_GROUP_NAME_REQUISITE_CODE SYSRES_CONST_GROUP_RIGHTS_T_REQUISITE_CODE SYSRES_CONST_GROUP_SERVER_CODES_REQUISITE_CODE SYSRES_CONST_GROUP_SERVER_NAME_REQUISITE_CODE SYSRES_CONST_GROUP_SERVICE_CATEGORY_FIELD_VALUE SYSRES_CONST_GROUP_USER_REQUISITE_CODE SYSRES_CONST_GROUPS_REFERENCE_CODE SYSRES_CONST_GROUPS_REQUISITE_CODE SYSRES_CONST_HIDDEN_MODE_NAME SYSRES_CONST_HIGH_LVL_REQUISITE_CODE SYSRES_CONST_HISTORY_ACTION_CREATE_CODE SYSRES_CONST_HISTORY_ACTION_DELETE_CODE SYSRES_CONST_HISTORY_ACTION_EDIT_CODE SYSRES_CONST_HOUR_CHAR SYSRES_CONST_ID_REQUISITE_CODE SYSRES_CONST_IDSPS_REQUISITE_CODE SYSRES_CONST_IMAGE_MODE_COLOR SYSRES_CONST_IMAGE_MODE_GREYSCALE SYSRES_CONST_IMAGE_MODE_MONOCHROME SYSRES_CONST_IMPORTANCE_HIGH SYSRES_CONST_IMPORTANCE_LOW SYSRES_CONST_IMPORTANCE_NORMAL SYSRES_CONST_IN_DESIGN_VERSION_STATE_PICK_VALUE SYSRES_CONST_INCOMING_WORK_RULE_TYPE_CODE SYSRES_CONST_INT_REQUISITE SYSRES_CONST_INT_REQUISITE_TYPE SYSRES_CONST_INTEGER_NUMBER_FORMAT_CHAR SYSRES_CONST_INTEGER_TYPE_CHAR SYSRES_CONST_IS_GENERATED_REQUISITE_NEGATIVE_VALUE SYSRES_CONST_IS_PUBLIC_ROLE_REQUISITE_CODE SYSRES_CONST_IS_REMOTE_USER_NEGATIVE_VALUE SYSRES_CONST_IS_REMOTE_USER_POSITIVE_VALUE SYSRES_CONST_IS_STORED_REQUISITE_NEGATIVE_VALUE SYSRES_CONST_IS_STORED_REQUISITE_STORED_VALUE SYSRES_CONST_ITALIC_LIFE_CYCLE_STAGE_DRAW_STYLE SYSRES_CONST_JOB_BLOCK_DESCRIPTION SYSRES_CONST_JOB_KIND_CONTROL_JOB SYSRES_CONST_JOB_KIND_JOB SYSRES_CONST_JOB_KIND_NOTICE SYSRES_CONST_JOB_STATE_ABORTED SYSRES_CONST_JOB_STATE_COMPLETE SYSRES_CONST_JOB_STATE_WORKING SYSRES_CONST_KIND_REQUISITE_CODE SYSRES_CONST_KIND_REQUISITE_NAME SYSRES_CONST_KINDS_CREATE_SHADOW_COPIES_REQUISITE_CODE SYSRES_CONST_KINDS_DEFAULT_EDOC_LIFE_STAGE_REQUISITE_CODE SYSRES_CONST_KINDS_EDOC_ALL_TEPLATES_ALLOWED_REQUISITE_CODE SYSRES_CONST_KINDS_EDOC_ALLOW_LIFE_CYCLE_STAGE_CHANGING_REQUISITE_CODE SYSRES_CONST_KINDS_EDOC_ALLOW_MULTIPLE_ACTIVE_VERSIONS_REQUISITE_CODE SYSRES_CONST_KINDS_EDOC_SHARE_ACCES_RIGHTS_BY_DEFAULT_CODE SYSRES_CONST_KINDS_EDOC_TEMPLATE_REQUISITE_CODE SYSRES_CONST_KINDS_EDOC_TYPE_REQUISITE_CODE SYSRES_CONST_KINDS_SIGNERS_REQUISITES_CODE SYSRES_CONST_KOD_INPUT_TYPE SYSRES_CONST_LAST_UPDATE_DATE_REQUISITE_CODE SYSRES_CONST_LIFE_CYCLE_START_STAGE_REQUISITE_CODE SYSRES_CONST_LILAC_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_LINK_OBJECT_KIND_COMPONENT SYSRES_CONST_LINK_OBJECT_KIND_DOCUMENT SYSRES_CONST_LINK_OBJECT_KIND_EDOC SYSRES_CONST_LINK_OBJECT_KIND_FOLDER SYSRES_CONST_LINK_OBJECT_KIND_JOB SYSRES_CONST_LINK_OBJECT_KIND_REFERENCE SYSRES_CONST_LINK_OBJECT_KIND_TASK SYSRES_CONST_LINK_REF_TYPE_REQUISITE_CODE SYSRES_CONST_LIST_REFERENCE_MODE_NAME SYSRES_CONST_LOCALIZATION_DICTIONARY_MAIN_VIEW_CODE SYSRES_CONST_MAIN_VIEW_CODE SYSRES_CONST_MANUAL_ENUM_METHOD_FLAG SYSRES_CONST_MASTER_COMP_TYPE_REQUISITE_CODE SYSRES_CONST_MASTER_TABLE_REC_ID_REQUISITE_CODE SYSRES_CONST_MAXIMIZED_MODE_NAME SYSRES_CONST_ME_VALUE SYSRES_CONST_MESSAGE_ATTENTION_CAPTION SYSRES_CONST_MESSAGE_CONFIRMATION_CAPTION SYSRES_CONST_MESSAGE_ERROR_CAPTION SYSRES_CONST_MESSAGE_INFORMATION_CAPTION SYSRES_CONST_MINIMIZED_MODE_NAME SYSRES_CONST_MINUTE_CHAR SYSRES_CONST_MODULE_REQUISITE_CODE SYSRES_CONST_MONITORING_BLOCK_DESCRIPTION SYSRES_CONST_MONTH_FORMAT_VALUE SYSRES_CONST_NAME_LOCALIZE_ID_REQUISITE_CODE SYSRES_CONST_NAME_REQUISITE_CODE SYSRES_CONST_NAME_SINGULAR_REQUISITE_CODE SYSRES_CONST_NAMEAN_INPUT_TYPE SYSRES_CONST_NEGATIVE_PICK_VALUE SYSRES_CONST_NEGATIVE_VALUE SYSRES_CONST_NO SYSRES_CONST_NO_PICK_VALUE SYSRES_CONST_NO_SIGNATURE_REQUISITE_CODE SYSRES_CONST_NO_VALUE SYSRES_CONST_NONE_ACCESS_RIGHTS_TYPE_CODE SYSRES_CONST_NONOPERATING_RECORD_FLAG_VALUE SYSRES_CONST_NONOPERATING_RECORD_FLAG_VALUE_MASCULINE SYSRES_CONST_NORMAL_ACCESS_RIGHTS_TYPE_CODE SYSRES_CONST_NORMAL_LIFE_CYCLE_STAGE_DRAW_STYLE SYSRES_CONST_NORMAL_MODE_NAME SYSRES_CONST_NOT_ALLOWED_ACCESS_TYPE_CODE SYSRES_CONST_NOT_ALLOWED_ACCESS_TYPE_NAME SYSRES_CONST_NOTE_REQUISITE_CODE SYSRES_CONST_NOTICE_BLOCK_DESCRIPTION SYSRES_CONST_NUM_REQUISITE SYSRES_CONST_NUM_STR_REQUISITE_CODE SYSRES_CONST_NUMERATION_AUTO_NOT_STRONG SYSRES_CONST_NUMERATION_AUTO_STRONG SYSRES_CONST_NUMERATION_FROM_DICTONARY SYSRES_CONST_NUMERATION_MANUAL SYSRES_CONST_NUMERIC_TYPE_CHAR SYSRES_CONST_NUMREQ_REQUISITE_CODE SYSRES_CONST_OBSOLETE_VERSION_STATE_PICK_VALUE SYSRES_CONST_OPERATING_RECORD_FLAG_VALUE SYSRES_CONST_OPERATING_RECORD_FLAG_VALUE_CODE SYSRES_CONST_OPERATING_RECORD_FLAG_VALUE_FEMININE SYSRES_CONST_OPERATING_RECORD_FLAG_VALUE_MASCULINE SYSRES_CONST_OPTIONAL_FORM_COMP_REQCODE_PREFIX SYSRES_CONST_ORANGE_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_ORIGINALREF_REQUISITE_CODE SYSRES_CONST_OURFIRM_REF_CODE SYSRES_CONST_OURFIRM_REQUISITE_CODE SYSRES_CONST_OURFIRM_VAR SYSRES_CONST_OUTGOING_WORK_RULE_TYPE_CODE SYSRES_CONST_PICK_NEGATIVE_RESULT SYSRES_CONST_PICK_POSITIVE_RESULT SYSRES_CONST_PICK_REQUISITE SYSRES_CONST_PICK_REQUISITE_TYPE SYSRES_CONST_PICK_TYPE_CHAR SYSRES_CONST_PLAN_STATUS_REQUISITE_CODE SYSRES_CONST_PLATFORM_VERSION_COMMENT SYSRES_CONST_PLUGINS_SETTINGS_DESCRIPTION_REQUISITE_CODE SYSRES_CONST_POSITIVE_PICK_VALUE SYSRES_CONST_POWER_TO_CREATE_ACTION_CODE SYSRES_CONST_POWER_TO_SIGN_ACTION_CODE SYSRES_CONST_PRIORITY_REQUISITE_CODE SYSRES_CONST_QUALIFIED_TASK_TYPE SYSRES_CONST_QUALIFIED_TASK_TYPE_CODE SYSRES_CONST_RECSTAT_REQUISITE_CODE SYSRES_CONST_RED_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_REF_ID_T_REF_TYPE_REQUISITE_CODE SYSRES_CONST_REF_REQUISITE SYSRES_CONST_REF_REQUISITE_TYPE SYSRES_CONST_REF_REQUISITES_REFERENCE_CODE_SELECTED_REQUISITE SYSRES_CONST_REFERENCE_RECORD_HISTORY_CREATE_ACTION_CODE SYSRES_CONST_REFERENCE_RECORD_HISTORY_DELETE_ACTION_CODE SYSRES_CONST_REFERENCE_RECORD_HISTORY_MODIFY_ACTION_CODE SYSRES_CONST_REFERENCE_TYPE_CHAR SYSRES_CONST_REFERENCE_TYPE_REQUISITE_NAME SYSRES_CONST_REFERENCES_ADD_PARAMS_REQUISITE_CODE SYSRES_CONST_REFERENCES_DISPLAY_REQUISITE_REQUISITE_CODE SYSRES_CONST_REMOTE_SERVER_STATUS_WORKING SYSRES_CONST_REMOTE_SERVER_TYPE_MAIN SYSRES_CONST_REMOTE_SERVER_TYPE_SECONDARY SYSRES_CONST_REMOTE_USER_FLAG_VALUE_CODE SYSRES_CONST_REPORT_APP_EDITOR_INTERNAL SYSRES_CONST_REPORT_BASE_REPORT_ID_REQUISITE_CODE SYSRES_CONST_REPORT_BASE_REPORT_REQUISITE_CODE SYSRES_CONST_REPORT_SCRIPT_REQUISITE_CODE SYSRES_CONST_REPORT_TEMPLATE_REQUISITE_CODE SYSRES_CONST_REPORT_VIEWER_CODE_REQUISITE_CODE SYSRES_CONST_REQ_ALLOW_COMPONENT_DEFAULT_VALUE SYSRES_CONST_REQ_ALLOW_RECORD_DEFAULT_VALUE SYSRES_CONST_REQ_ALLOW_SERVER_COMPONENT_DEFAULT_VALUE SYSRES_CONST_REQ_MODE_AVAILABLE_CODE SYSRES_CONST_REQ_MODE_EDIT_CODE SYSRES_CONST_REQ_MODE_HIDDEN_CODE SYSRES_CONST_REQ_MODE_NOT_AVAILABLE_CODE SYSRES_CONST_REQ_MODE_VIEW_CODE SYSRES_CONST_REQ_NUMBER_REQUISITE_CODE SYSRES_CONST_REQ_SECTION_VALUE SYSRES_CONST_REQ_TYPE_VALUE SYSRES_CONST_REQUISITE_FORMAT_BY_UNIT SYSRES_CONST_REQUISITE_FORMAT_DATE_FULL SYSRES_CONST_REQUISITE_FORMAT_DATE_TIME SYSRES_CONST_REQUISITE_FORMAT_LEFT SYSRES_CONST_REQUISITE_FORMAT_RIGHT SYSRES_CONST_REQUISITE_FORMAT_WITHOUT_UNIT SYSRES_CONST_REQUISITE_NUMBER_REQUISITE_CODE SYSRES_CONST_REQUISITE_SECTION_ACTIONS SYSRES_CONST_REQUISITE_SECTION_BUTTON SYSRES_CONST_REQUISITE_SECTION_BUTTONS SYSRES_CONST_REQUISITE_SECTION_CARD SYSRES_CONST_REQUISITE_SECTION_TABLE SYSRES_CONST_REQUISITE_SECTION_TABLE10 SYSRES_CONST_REQUISITE_SECTION_TABLE11 SYSRES_CONST_REQUISITE_SECTION_TABLE12 SYSRES_CONST_REQUISITE_SECTION_TABLE13 SYSRES_CONST_REQUISITE_SECTION_TABLE14 SYSRES_CONST_REQUISITE_SECTION_TABLE15 SYSRES_CONST_REQUISITE_SECTION_TABLE16 SYSRES_CONST_REQUISITE_SECTION_TABLE17 SYSRES_CONST_REQUISITE_SECTION_TABLE18 SYSRES_CONST_REQUISITE_SECTION_TABLE19 SYSRES_CONST_REQUISITE_SECTION_TABLE2 SYSRES_CONST_REQUISITE_SECTION_TABLE20 SYSRES_CONST_REQUISITE_SECTION_TABLE21 SYSRES_CONST_REQUISITE_SECTION_TABLE22 SYSRES_CONST_REQUISITE_SECTION_TABLE23 SYSRES_CONST_REQUISITE_SECTION_TABLE24 SYSRES_CONST_REQUISITE_SECTION_TABLE3 SYSRES_CONST_REQUISITE_SECTION_TABLE4 SYSRES_CONST_REQUISITE_SECTION_TABLE5 SYSRES_CONST_REQUISITE_SECTION_TABLE6 SYSRES_CONST_REQUISITE_SECTION_TABLE7 SYSRES_CONST_REQUISITE_SECTION_TABLE8 SYSRES_CONST_REQUISITE_SECTION_TABLE9 SYSRES_CONST_REQUISITES_PSEUDOREFERENCE_REQUISITE_NUMBER_REQUISITE_CODE SYSRES_CONST_RIGHT_ALIGNMENT_CODE SYSRES_CONST_ROLES_REFERENCE_CODE SYSRES_CONST_ROUTE_STEP_AFTER_RUS SYSRES_CONST_ROUTE_STEP_AND_CONDITION_RUS SYSRES_CONST_ROUTE_STEP_OR_CONDITION_RUS SYSRES_CONST_ROUTE_TYPE_COMPLEX SYSRES_CONST_ROUTE_TYPE_PARALLEL SYSRES_CONST_ROUTE_TYPE_SERIAL SYSRES_CONST_SBDATASETDESC_NEGATIVE_VALUE SYSRES_CONST_SBDATASETDESC_POSITIVE_VALUE SYSRES_CONST_SBVIEWSDESC_POSITIVE_VALUE SYSRES_CONST_SCRIPT_BLOCK_DESCRIPTION SYSRES_CONST_SEARCH_BY_TEXT_REQUISITE_CODE SYSRES_CONST_SEARCHES_COMPONENT_CONTENT SYSRES_CONST_SEARCHES_CRITERIA_ACTION_NAME SYSRES_CONST_SEARCHES_EDOC_CONTENT SYSRES_CONST_SEARCHES_FOLDER_CONTENT SYSRES_CONST_SEARCHES_JOB_CONTENT SYSRES_CONST_SEARCHES_REFERENCE_CODE SYSRES_CONST_SEARCHES_TASK_CONTENT SYSRES_CONST_SECOND_CHAR SYSRES_CONST_SECTION_REQUISITE_ACTIONS_VALUE SYSRES_CONST_SECTION_REQUISITE_CARD_VALUE SYSRES_CONST_SECTION_REQUISITE_CODE SYSRES_CONST_SECTION_REQUISITE_DETAIL_1_VALUE SYSRES_CONST_SECTION_REQUISITE_DETAIL_2_VALUE SYSRES_CONST_SECTION_REQUISITE_DETAIL_3_VALUE SYSRES_CONST_SECTION_REQUISITE_DETAIL_4_VALUE SYSRES_CONST_SECTION_REQUISITE_DETAIL_5_VALUE SYSRES_CONST_SECTION_REQUISITE_DETAIL_6_VALUE SYSRES_CONST_SELECT_REFERENCE_MODE_NAME SYSRES_CONST_SELECT_TYPE_SELECTABLE SYSRES_CONST_SELECT_TYPE_SELECTABLE_ONLY_CHILD SYSRES_CONST_SELECT_TYPE_SELECTABLE_WITH_CHILD SYSRES_CONST_SELECT_TYPE_UNSLECTABLE SYSRES_CONST_SERVER_TYPE_MAIN SYSRES_CONST_SERVICE_USER_CATEGORY_FIELD_VALUE SYSRES_CONST_SETTINGS_USER_REQUISITE_CODE SYSRES_CONST_SIGNATURE_AND_ENCODE_CERTIFICATE_TYPE_CODE SYSRES_CONST_SIGNATURE_CERTIFICATE_TYPE_CODE SYSRES_CONST_SINGULAR_TITLE_REQUISITE_CODE SYSRES_CONST_SQL_SERVER_AUTHENTIFICATION_FLAG_VALUE_CODE SYSRES_CONST_SQL_SERVER_ENCODE_AUTHENTIFICATION_FLAG_VALUE_CODE SYSRES_CONST_STANDART_ROUTE_REFERENCE_CODE SYSRES_CONST_STANDART_ROUTE_REFERENCE_COMMENT_REQUISITE_CODE SYSRES_CONST_STANDART_ROUTES_GROUPS_REFERENCE_CODE SYSRES_CONST_STATE_REQ_NAME SYSRES_CONST_STATE_REQUISITE_ACTIVE_VALUE SYSRES_CONST_STATE_REQUISITE_CLOSED_VALUE SYSRES_CONST_STATE_REQUISITE_CODE SYSRES_CONST_STATIC_ROLE_TYPE_CODE SYSRES_CONST_STATUS_PLAN_DEFAULT_VALUE SYSRES_CONST_STATUS_VALUE_AUTOCLEANING SYSRES_CONST_STATUS_VALUE_BLUE_SQUARE SYSRES_CONST_STATUS_VALUE_COMPLETE SYSRES_CONST_STATUS_VALUE_GREEN_SQUARE SYSRES_CONST_STATUS_VALUE_ORANGE_SQUARE SYSRES_CONST_STATUS_VALUE_PURPLE_SQUARE SYSRES_CONST_STATUS_VALUE_RED_SQUARE SYSRES_CONST_STATUS_VALUE_SUSPEND SYSRES_CONST_STATUS_VALUE_YELLOW_SQUARE SYSRES_CONST_STDROUTE_SHOW_TO_USERS_REQUISITE_CODE SYSRES_CONST_STORAGE_TYPE_FILE SYSRES_CONST_STORAGE_TYPE_SQL_SERVER SYSRES_CONST_STR_REQUISITE SYSRES_CONST_STRIKEOUT_LIFE_CYCLE_STAGE_DRAW_STYLE SYSRES_CONST_STRING_FORMAT_LEFT_ALIGN_CHAR SYSRES_CONST_STRING_FORMAT_RIGHT_ALIGN_CHAR SYSRES_CONST_STRING_REQUISITE_CODE SYSRES_CONST_STRING_REQUISITE_TYPE SYSRES_CONST_STRING_TYPE_CHAR SYSRES_CONST_SUBSTITUTES_PSEUDOREFERENCE_CODE SYSRES_CONST_SUBTASK_BLOCK_DESCRIPTION SYSRES_CONST_SYSTEM_SETTING_CURRENT_USER_PARAM_VALUE SYSRES_CONST_SYSTEM_SETTING_EMPTY_VALUE_PARAM_VALUE SYSRES_CONST_SYSTEM_VERSION_COMMENT SYSRES_CONST_TASK_ACCESS_TYPE_ALL SYSRES_CONST_TASK_ACCESS_TYPE_ALL_MEMBERS SYSRES_CONST_TASK_ACCESS_TYPE_MANUAL SYSRES_CONST_TASK_ENCODE_TYPE_CERTIFICATION SYSRES_CONST_TASK_ENCODE_TYPE_CERTIFICATION_AND_PASSWORD SYSRES_CONST_TASK_ENCODE_TYPE_NONE SYSRES_CONST_TASK_ENCODE_TYPE_PASSWORD SYSRES_CONST_TASK_ROUTE_ALL_CONDITION SYSRES_CONST_TASK_ROUTE_AND_CONDITION SYSRES_CONST_TASK_ROUTE_OR_CONDITION SYSRES_CONST_TASK_STATE_ABORTED SYSRES_CONST_TASK_STATE_COMPLETE SYSRES_CONST_TASK_STATE_CONTINUED SYSRES_CONST_TASK_STATE_CONTROL SYSRES_CONST_TASK_STATE_INIT SYSRES_CONST_TASK_STATE_WORKING SYSRES_CONST_TASK_TITLE SYSRES_CONST_TASK_TYPES_GROUPS_REFERENCE_CODE SYSRES_CONST_TASK_TYPES_REFERENCE_CODE SYSRES_CONST_TEMPLATES_REFERENCE_CODE SYSRES_CONST_TEST_DATE_REQUISITE_NAME SYSRES_CONST_TEST_DEV_DATABASE_NAME SYSRES_CONST_TEST_DEV_SYSTEM_CODE SYSRES_CONST_TEST_EDMS_DATABASE_NAME SYSRES_CONST_TEST_EDMS_MAIN_CODE SYSRES_CONST_TEST_EDMS_MAIN_DB_NAME SYSRES_CONST_TEST_EDMS_SECOND_CODE SYSRES_CONST_TEST_EDMS_SECOND_DB_NAME SYSRES_CONST_TEST_EDMS_SYSTEM_CODE SYSRES_CONST_TEST_NUMERIC_REQUISITE_NAME SYSRES_CONST_TEXT_REQUISITE SYSRES_CONST_TEXT_REQUISITE_CODE SYSRES_CONST_TEXT_REQUISITE_TYPE SYSRES_CONST_TEXT_TYPE_CHAR SYSRES_CONST_TYPE_CODE_REQUISITE_CODE SYSRES_CONST_TYPE_REQUISITE_CODE SYSRES_CONST_UNDEFINED_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_UNITS_SECTION_ID_REQUISITE_CODE SYSRES_CONST_UNITS_SECTION_REQUISITE_CODE SYSRES_CONST_UNOPERATING_RECORD_FLAG_VALUE_CODE SYSRES_CONST_UNSTORED_DATA_REQUISITE_CODE SYSRES_CONST_UNSTORED_DATA_REQUISITE_NAME SYSRES_CONST_USE_ACCESS_TYPE_CODE SYSRES_CONST_USE_ACCESS_TYPE_NAME SYSRES_CONST_USER_ACCOUNT_TYPE_VALUE_CODE SYSRES_CONST_USER_ADDITIONAL_INFORMATION_REQUISITE_CODE SYSRES_CONST_USER_AND_GROUP_ID_FROM_PSEUDOREFERENCE_REQUISITE_CODE SYSRES_CONST_USER_CATEGORY_NORMAL SYSRES_CONST_USER_CERTIFICATE_REQUISITE_CODE SYSRES_CONST_USER_CERTIFICATE_STATE_REQUISITE_CODE SYSRES_CONST_USER_CERTIFICATE_SUBJECT_NAME_REQUISITE_CODE SYSRES_CONST_USER_CERTIFICATE_THUMBPRINT_REQUISITE_CODE SYSRES_CONST_USER_COMMON_CATEGORY SYSRES_CONST_USER_COMMON_CATEGORY_CODE SYSRES_CONST_USER_FULL_NAME_REQUISITE_CODE SYSRES_CONST_USER_GROUP_TYPE_REQUISITE_CODE SYSRES_CONST_USER_LOGIN_REQUISITE_CODE SYSRES_CONST_USER_REMOTE_CONTROLLER_REQUISITE_CODE SYSRES_CONST_USER_REMOTE_SYSTEM_REQUISITE_CODE SYSRES_CONST_USER_RIGHTS_T_REQUISITE_CODE SYSRES_CONST_USER_SERVER_NAME_REQUISITE_CODE SYSRES_CONST_USER_SERVICE_CATEGORY SYSRES_CONST_USER_SERVICE_CATEGORY_CODE SYSRES_CONST_USER_STATUS_ADMINISTRATOR_CODE SYSRES_CONST_USER_STATUS_ADMINISTRATOR_NAME SYSRES_CONST_USER_STATUS_DEVELOPER_CODE SYSRES_CONST_USER_STATUS_DEVELOPER_NAME SYSRES_CONST_USER_STATUS_DISABLED_CODE SYSRES_CONST_USER_STATUS_DISABLED_NAME SYSRES_CONST_USER_STATUS_SYSTEM_DEVELOPER_CODE SYSRES_CONST_USER_STATUS_USER_CODE SYSRES_CONST_USER_STATUS_USER_NAME SYSRES_CONST_USER_STATUS_USER_NAME_DEPRECATED SYSRES_CONST_USER_TYPE_FIELD_VALUE_USER SYSRES_CONST_USER_TYPE_REQUISITE_CODE SYSRES_CONST_USERS_CONTROLLER_REQUISITE_CODE SYSRES_CONST_USERS_IS_MAIN_SERVER_REQUISITE_CODE SYSRES_CONST_USERS_REFERENCE_CODE SYSRES_CONST_USERS_REGISTRATION_CERTIFICATES_ACTION_NAME SYSRES_CONST_USERS_REQUISITE_CODE SYSRES_CONST_USERS_SYSTEM_REQUISITE_CODE SYSRES_CONST_USERS_USER_ACCESS_RIGHTS_TYPR_REQUISITE_CODE SYSRES_CONST_USERS_USER_AUTHENTICATION_REQUISITE_CODE SYSRES_CONST_USERS_USER_COMPONENT_REQUISITE_CODE SYSRES_CONST_USERS_USER_GROUP_REQUISITE_CODE SYSRES_CONST_USERS_VIEW_CERTIFICATES_ACTION_NAME SYSRES_CONST_VIEW_DEFAULT_CODE SYSRES_CONST_VIEW_DEFAULT_NAME SYSRES_CONST_VIEWER_REQUISITE_CODE SYSRES_CONST_WAITING_BLOCK_DESCRIPTION SYSRES_CONST_WIZARD_FORM_LABEL_TEST_STRING  SYSRES_CONST_WIZARD_QUERY_PARAM_HEIGHT_ETALON_STRING SYSRES_CONST_WIZARD_REFERENCE_COMMENT_REQUISITE_CODE SYSRES_CONST_WORK_RULES_DESCRIPTION_REQUISITE_CODE SYSRES_CONST_WORK_TIME_CALENDAR_REFERENCE_CODE SYSRES_CONST_WORK_WORKFLOW_HARD_ROUTE_TYPE_VALUE SYSRES_CONST_WORK_WORKFLOW_HARD_ROUTE_TYPE_VALUE_CODE SYSRES_CONST_WORK_WORKFLOW_HARD_ROUTE_TYPE_VALUE_CODE_RUS SYSRES_CONST_WORK_WORKFLOW_SOFT_ROUTE_TYPE_VALUE_CODE_RUS SYSRES_CONST_WORKFLOW_ROUTE_TYPR_HARD SYSRES_CONST_WORKFLOW_ROUTE_TYPR_SOFT SYSRES_CONST_XML_ENCODING SYSRES_CONST_XREC_STAT_REQUISITE_CODE SYSRES_CONST_XRECID_FIELD_NAME SYSRES_CONST_YES SYSRES_CONST_YES_NO_2_REQUISITE_CODE SYSRES_CONST_YES_NO_REQUISITE_CODE SYSRES_CONST_YES_NO_T_REF_TYPE_REQUISITE_CODE SYSRES_CONST_YES_PICK_VALUE SYSRES_CONST_YES_VALUE CR FALSE nil NO_VALUE NULL TAB TRUE YES_VALUE ADMINISTRATORS_GROUP_NAME CUSTOMIZERS_GROUP_NAME DEVELOPERS_GROUP_NAME SERVICE_USERS_GROUP_NAME DECISION_BLOCK_FIRST_OPERAND_PROPERTY DECISION_BLOCK_NAME_PROPERTY DECISION_BLOCK_OPERATION_PROPERTY DECISION_BLOCK_RESULT_TYPE_PROPERTY DECISION_BLOCK_SECOND_OPERAND_PROPERTY ANY_FILE_EXTENTION COMPRESSED_DOCUMENT_EXTENSION EXTENDED_DOCUMENT_EXTENSION SHORT_COMPRESSED_DOCUMENT_EXTENSION SHORT_EXTENDED_DOCUMENT_EXTENSION JOB_BLOCK_ABORT_DEADLINE_PROPERTY JOB_BLOCK_AFTER_FINISH_EVENT JOB_BLOCK_AFTER_QUERY_PARAMETERS_EVENT JOB_BLOCK_ATTACHMENT_PROPERTY JOB_BLOCK_ATTACHMENTS_RIGHTS_GROUP_PROPERTY JOB_BLOCK_ATTACHMENTS_RIGHTS_TYPE_PROPERTY JOB_BLOCK_BEFORE_QUERY_PARAMETERS_EVENT JOB_BLOCK_BEFORE_START_EVENT JOB_BLOCK_CREATED_JOBS_PROPERTY JOB_BLOCK_DEADLINE_PROPERTY JOB_BLOCK_EXECUTION_RESULTS_PROPERTY JOB_BLOCK_IS_PARALLEL_PROPERTY JOB_BLOCK_IS_RELATIVE_ABORT_DEADLINE_PROPERTY JOB_BLOCK_IS_RELATIVE_DEADLINE_PROPERTY JOB_BLOCK_JOB_TEXT_PROPERTY JOB_BLOCK_NAME_PROPERTY JOB_BLOCK_NEED_SIGN_ON_PERFORM_PROPERTY JOB_BLOCK_PERFORMER_PROPERTY JOB_BLOCK_RELATIVE_ABORT_DEADLINE_TYPE_PROPERTY JOB_BLOCK_RELATIVE_DEADLINE_TYPE_PROPERTY JOB_BLOCK_SUBJECT_PROPERTY ENGLISH_LANGUAGE_CODE RUSSIAN_LANGUAGE_CODE smHidden smMaximized smMinimized smNormal wmNo wmYes COMPONENT_TOKEN_LINK_KIND DOCUMENT_LINK_KIND EDOCUMENT_LINK_KIND FOLDER_LINK_KIND JOB_LINK_KIND REFERENCE_LINK_KIND TASK_LINK_KIND COMPONENT_TOKEN_LOCK_TYPE EDOCUMENT_VERSION_LOCK_TYPE MONITOR_BLOCK_AFTER_FINISH_EVENT MONITOR_BLOCK_BEFORE_START_EVENT MONITOR_BLOCK_DEADLINE_PROPERTY MONITOR_BLOCK_INTERVAL_PROPERTY MONITOR_BLOCK_INTERVAL_TYPE_PROPERTY MONITOR_BLOCK_IS_RELATIVE_DEADLINE_PROPERTY MONITOR_BLOCK_NAME_PROPERTY MONITOR_BLOCK_RELATIVE_DEADLINE_TYPE_PROPERTY MONITOR_BLOCK_SEARCH_SCRIPT_PROPERTY NOTICE_BLOCK_AFTER_FINISH_EVENT NOTICE_BLOCK_ATTACHMENT_PROPERTY NOTICE_BLOCK_ATTACHMENTS_RIGHTS_GROUP_PROPERTY NOTICE_BLOCK_ATTACHMENTS_RIGHTS_TYPE_PROPERTY NOTICE_BLOCK_BEFORE_START_EVENT NOTICE_BLOCK_CREATED_NOTICES_PROPERTY NOTICE_BLOCK_DEADLINE_PROPERTY NOTICE_BLOCK_IS_RELATIVE_DEADLINE_PROPERTY NOTICE_BLOCK_NAME_PROPERTY NOTICE_BLOCK_NOTICE_TEXT_PROPERTY NOTICE_BLOCK_PERFORMER_PROPERTY NOTICE_BLOCK_RELATIVE_DEADLINE_TYPE_PROPERTY NOTICE_BLOCK_SUBJECT_PROPERTY dseAfterCancel dseAfterClose dseAfterDelete dseAfterDeleteOutOfTransaction dseAfterInsert dseAfterOpen dseAfterScroll dseAfterUpdate dseAfterUpdateOutOfTransaction dseBeforeCancel dseBeforeClose dseBeforeDelete dseBeforeDetailUpdate dseBeforeInsert dseBeforeOpen dseBeforeUpdate dseOnAnyRequisiteChange dseOnCloseRecord dseOnDeleteError dseOnOpenRecord dseOnPrepareUpdate dseOnUpdateError dseOnUpdateRatifiedRecord dseOnValidDelete dseOnValidUpdate reOnChange reOnChangeValues SELECTION_BEGIN_ROUTE_EVENT SELECTION_END_ROUTE_EVENT CURRENT_PERIOD_IS_REQUIRED PREVIOUS_CARD_TYPE_NAME SHOW_RECORD_PROPERTIES_FORM ACCESS_RIGHTS_SETTING_DIALOG_CODE ADMINISTRATOR_USER_CODE ANALYTIC_REPORT_TYPE asrtHideLocal asrtHideRemote CALCULATED_ROLE_TYPE_CODE COMPONENTS_REFERENCE_DEVELOPER_VIEW_CODE DCTS_TEST_PROTOCOLS_FOLDER_PATH E_EDOC_VERSION_ALREADY_APPROVINGLY_SIGNED E_EDOC_VERSION_ALREADY_APPROVINGLY_SIGNED_BY_USER E_EDOC_VERSION_ALREDY_SIGNED E_EDOC_VERSION_ALREDY_SIGNED_BY_USER EDOC_TYPES_CODE_REQUISITE_FIELD_NAME EDOCUMENTS_ALIAS_NAME FILES_FOLDER_PATH FILTER_OPERANDS_DELIMITER FILTER_OPERATIONS_DELIMITER FORMCARD_NAME FORMLIST_NAME GET_EXTENDED_DOCUMENT_EXTENSION_CREATION_MODE GET_EXTENDED_DOCUMENT_EXTENSION_IMPORT_MODE INTEGRATED_REPORT_TYPE IS_BUILDER_APPLICATION_ROLE IS_BUILDER_APPLICATION_ROLE2 IS_BUILDER_USERS ISBSYSDEV LOG_FOLDER_PATH mbCancel mbNo mbNoToAll mbOK mbYes mbYesToAll MEMORY_DATASET_DESRIPTIONS_FILENAME mrNo mrNoToAll mrYes mrYesToAll MULTIPLE_SELECT_DIALOG_CODE NONOPERATING_RECORD_FLAG_FEMININE NONOPERATING_RECORD_FLAG_MASCULINE OPERATING_RECORD_FLAG_FEMININE OPERATING_RECORD_FLAG_MASCULINE PROFILING_SETTINGS_COMMON_SETTINGS_CODE_VALUE PROGRAM_INITIATED_LOOKUP_ACTION ratDelete ratEdit ratInsert REPORT_TYPE REQUIRED_PICK_VALUES_VARIABLE rmCard rmList SBRTE_PROGID_DEV SBRTE_PROGID_RELEASE STATIC_ROLE_TYPE_CODE SUPPRESS_EMPTY_TEMPLATE_CREATION SYSTEM_USER_CODE UPDATE_DIALOG_DATASET USED_IN_OBJECT_HINT_PARAM USER_INITIATED_LOOKUP_ACTION USER_NAME_FORMAT USER_SELECTION_RESTRICTIONS WORKFLOW_TEST_PROTOCOLS_FOLDER_PATH ELS_SUBTYPE_CONTROL_NAME ELS_FOLDER_KIND_CONTROL_NAME REPEAT_PROCESS_CURRENT_OBJECT_EXCEPTION_NAME PRIVILEGE_COMPONENT_FULL_ACCESS PRIVILEGE_DEVELOPMENT_EXPORT PRIVILEGE_DEVELOPMENT_IMPORT PRIVILEGE_DOCUMENT_DELETE PRIVILEGE_ESD PRIVILEGE_FOLDER_DELETE PRIVILEGE_MANAGE_ACCESS_RIGHTS PRIVILEGE_MANAGE_REPLICATION PRIVILEGE_MANAGE_SESSION_SERVER PRIVILEGE_OBJECT_FULL_ACCESS PRIVILEGE_OBJECT_VIEW PRIVILEGE_RESERVE_LICENSE PRIVILEGE_SYSTEM_CUSTOMIZE PRIVILEGE_SYSTEM_DEVELOP PRIVILEGE_SYSTEM_INSTALL PRIVILEGE_TASK_DELETE PRIVILEGE_USER_PLUGIN_SETTINGS_CUSTOMIZE PRIVILEGES_PSEUDOREFERENCE_CODE ACCESS_TYPES_PSEUDOREFERENCE_CODE ALL_AVAILABLE_COMPONENTS_PSEUDOREFERENCE_CODE ALL_AVAILABLE_PRIVILEGES_PSEUDOREFERENCE_CODE ALL_REPLICATE_COMPONENTS_PSEUDOREFERENCE_CODE AVAILABLE_DEVELOPERS_COMPONENTS_PSEUDOREFERENCE_CODE COMPONENTS_PSEUDOREFERENCE_CODE FILTRATER_SETTINGS_CONFLICTS_PSEUDOREFERENCE_CODE GROUPS_PSEUDOREFERENCE_CODE RECEIVE_PROTOCOL_PSEUDOREFERENCE_CODE REFERENCE_REQUISITE_PSEUDOREFERENCE_CODE REFERENCE_REQUISITES_PSEUDOREFERENCE_CODE REFTYPES_PSEUDOREFERENCE_CODE REPLICATION_SEANCES_DIARY_PSEUDOREFERENCE_CODE SEND_PROTOCOL_PSEUDOREFERENCE_CODE SUBSTITUTES_PSEUDOREFERENCE_CODE SYSTEM_SETTINGS_PSEUDOREFERENCE_CODE UNITS_PSEUDOREFERENCE_CODE USERS_PSEUDOREFERENCE_CODE VIEWERS_PSEUDOREFERENCE_CODE CERTIFICATE_TYPE_ENCRYPT CERTIFICATE_TYPE_SIGN CERTIFICATE_TYPE_SIGN_AND_ENCRYPT STORAGE_TYPE_FILE STORAGE_TYPE_NAS_CIFS STORAGE_TYPE_SAPERION STORAGE_TYPE_SQL_SERVER COMPTYPE2_REQUISITE_DOCUMENTS_VALUE COMPTYPE2_REQUISITE_TASKS_VALUE COMPTYPE2_REQUISITE_FOLDERS_VALUE COMPTYPE2_REQUISITE_REFERENCES_VALUE SYSREQ_CODE SYSREQ_COMPTYPE2 SYSREQ_CONST_AVAILABLE_FOR_WEB SYSREQ_CONST_COMMON_CODE SYSREQ_CONST_COMMON_VALUE SYSREQ_CONST_FIRM_CODE SYSREQ_CONST_FIRM_STATUS SYSREQ_CONST_FIRM_VALUE SYSREQ_CONST_SERVER_STATUS SYSREQ_CONTENTS SYSREQ_DATE_OPEN SYSREQ_DATE_CLOSE SYSREQ_DESCRIPTION SYSREQ_DESCRIPTION_LOCALIZE_ID SYSREQ_DOUBLE SYSREQ_EDOC_ACCESS_TYPE SYSREQ_EDOC_AUTHOR SYSREQ_EDOC_CREATED SYSREQ_EDOC_DELEGATE_RIGHTS_REQUISITE_CODE SYSREQ_EDOC_EDITOR SYSREQ_EDOC_ENCODE_TYPE SYSREQ_EDOC_ENCRYPTION_PLUGIN_NAME SYSREQ_EDOC_ENCRYPTION_PLUGIN_VERSION SYSREQ_EDOC_EXPORT_DATE SYSREQ_EDOC_EXPORTER SYSREQ_EDOC_KIND SYSREQ_EDOC_LIFE_STAGE_NAME SYSREQ_EDOC_LOCKED_FOR_SERVER_CODE SYSREQ_EDOC_MODIFIED SYSREQ_EDOC_NAME SYSREQ_EDOC_NOTE SYSREQ_EDOC_QUALIFIED_ID SYSREQ_EDOC_SESSION_KEY SYSREQ_EDOC_SESSION_KEY_ENCRYPTION_PLUGIN_NAME SYSREQ_EDOC_SESSION_KEY_ENCRYPTION_PLUGIN_VERSION SYSREQ_EDOC_SIGNATURE_TYPE SYSREQ_EDOC_SIGNED SYSREQ_EDOC_STORAGE SYSREQ_EDOC_STORAGES_ARCHIVE_STORAGE SYSREQ_EDOC_STORAGES_CHECK_RIGHTS SYSREQ_EDOC_STORAGES_COMPUTER_NAME SYSREQ_EDOC_STORAGES_EDIT_IN_STORAGE SYSREQ_EDOC_STORAGES_EXECUTIVE_STORAGE SYSREQ_EDOC_STORAGES_FUNCTION SYSREQ_EDOC_STORAGES_INITIALIZED SYSREQ_EDOC_STORAGES_LOCAL_PATH SYSREQ_EDOC_STORAGES_SAPERION_DATABASE_NAME SYSREQ_EDOC_STORAGES_SEARCH_BY_TEXT SYSREQ_EDOC_STORAGES_SERVER_NAME SYSREQ_EDOC_STORAGES_SHARED_SOURCE_NAME SYSREQ_EDOC_STORAGES_TYPE SYSREQ_EDOC_TEXT_MODIFIED SYSREQ_EDOC_TYPE_ACT_CODE SYSREQ_EDOC_TYPE_ACT_DESCRIPTION SYSREQ_EDOC_TYPE_ACT_DESCRIPTION_LOCALIZE_ID SYSREQ_EDOC_TYPE_ACT_ON_EXECUTE SYSREQ_EDOC_TYPE_ACT_ON_EXECUTE_EXISTS SYSREQ_EDOC_TYPE_ACT_SECTION SYSREQ_EDOC_TYPE_ADD_PARAMS SYSREQ_EDOC_TYPE_COMMENT SYSREQ_EDOC_TYPE_EVENT_TEXT SYSREQ_EDOC_TYPE_NAME_IN_SINGULAR SYSREQ_EDOC_TYPE_NAME_IN_SINGULAR_LOCALIZE_ID SYSREQ_EDOC_TYPE_NAME_LOCALIZE_ID SYSREQ_EDOC_TYPE_NUMERATION_METHOD SYSREQ_EDOC_TYPE_PSEUDO_REQUISITE_CODE SYSREQ_EDOC_TYPE_REQ_CODE SYSREQ_EDOC_TYPE_REQ_DESCRIPTION SYSREQ_EDOC_TYPE_REQ_DESCRIPTION_LOCALIZE_ID SYSREQ_EDOC_TYPE_REQ_IS_LEADING SYSREQ_EDOC_TYPE_REQ_IS_REQUIRED SYSREQ_EDOC_TYPE_REQ_NUMBER SYSREQ_EDOC_TYPE_REQ_ON_CHANGE SYSREQ_EDOC_TYPE_REQ_ON_CHANGE_EXISTS SYSREQ_EDOC_TYPE_REQ_ON_SELECT SYSREQ_EDOC_TYPE_REQ_ON_SELECT_KIND SYSREQ_EDOC_TYPE_REQ_SECTION SYSREQ_EDOC_TYPE_VIEW_CARD SYSREQ_EDOC_TYPE_VIEW_CODE SYSREQ_EDOC_TYPE_VIEW_COMMENT SYSREQ_EDOC_TYPE_VIEW_IS_MAIN SYSREQ_EDOC_TYPE_VIEW_NAME SYSREQ_EDOC_TYPE_VIEW_NAME_LOCALIZE_ID SYSREQ_EDOC_VERSION_AUTHOR SYSREQ_EDOC_VERSION_CRC SYSREQ_EDOC_VERSION_DATA SYSREQ_EDOC_VERSION_EDITOR SYSREQ_EDOC_VERSION_EXPORT_DATE SYSREQ_EDOC_VERSION_EXPORTER SYSREQ_EDOC_VERSION_HIDDEN SYSREQ_EDOC_VERSION_LIFE_STAGE SYSREQ_EDOC_VERSION_MODIFIED SYSREQ_EDOC_VERSION_NOTE SYSREQ_EDOC_VERSION_SIGNATURE_TYPE SYSREQ_EDOC_VERSION_SIGNED SYSREQ_EDOC_VERSION_SIZE SYSREQ_EDOC_VERSION_SOURCE SYSREQ_EDOC_VERSION_TEXT_MODIFIED SYSREQ_EDOCKIND_DEFAULT_VERSION_STATE_CODE SYSREQ_FOLDER_KIND SYSREQ_FUNC_CATEGORY SYSREQ_FUNC_COMMENT SYSREQ_FUNC_GROUP SYSREQ_FUNC_GROUP_COMMENT SYSREQ_FUNC_GROUP_NUMBER SYSREQ_FUNC_HELP SYSREQ_FUNC_PARAM_DEF_VALUE SYSREQ_FUNC_PARAM_IDENT SYSREQ_FUNC_PARAM_NUMBER SYSREQ_FUNC_PARAM_TYPE SYSREQ_FUNC_TEXT SYSREQ_GROUP_CATEGORY SYSREQ_ID SYSREQ_LAST_UPDATE SYSREQ_LEADER_REFERENCE SYSREQ_LINE_NUMBER SYSREQ_MAIN_RECORD_ID SYSREQ_NAME SYSREQ_NAME_LOCALIZE_ID SYSREQ_NOTE SYSREQ_ORIGINAL_RECORD SYSREQ_OUR_FIRM SYSREQ_PROFILING_SETTINGS_BATCH_LOGING SYSREQ_PROFILING_SETTINGS_BATCH_SIZE SYSREQ_PROFILING_SETTINGS_PROFILING_ENABLED SYSREQ_PROFILING_SETTINGS_SQL_PROFILING_ENABLED SYSREQ_PROFILING_SETTINGS_START_LOGGED SYSREQ_RECORD_STATUS SYSREQ_REF_REQ_FIELD_NAME SYSREQ_REF_REQ_FORMAT SYSREQ_REF_REQ_GENERATED SYSREQ_REF_REQ_LENGTH SYSREQ_REF_REQ_PRECISION SYSREQ_REF_REQ_REFERENCE SYSREQ_REF_REQ_SECTION SYSREQ_REF_REQ_STORED SYSREQ_REF_REQ_TOKENS SYSREQ_REF_REQ_TYPE SYSREQ_REF_REQ_VIEW SYSREQ_REF_TYPE_ACT_CODE SYSREQ_REF_TYPE_ACT_DESCRIPTION SYSREQ_REF_TYPE_ACT_DESCRIPTION_LOCALIZE_ID SYSREQ_REF_TYPE_ACT_ON_EXECUTE SYSREQ_REF_TYPE_ACT_ON_EXECUTE_EXISTS SYSREQ_REF_TYPE_ACT_SECTION SYSREQ_REF_TYPE_ADD_PARAMS SYSREQ_REF_TYPE_COMMENT SYSREQ_REF_TYPE_COMMON_SETTINGS SYSREQ_REF_TYPE_DISPLAY_REQUISITE_NAME SYSREQ_REF_TYPE_EVENT_TEXT SYSREQ_REF_TYPE_MAIN_LEADING_REF SYSREQ_REF_TYPE_NAME_IN_SINGULAR SYSREQ_REF_TYPE_NAME_IN_SINGULAR_LOCALIZE_ID SYSREQ_REF_TYPE_NAME_LOCALIZE_ID SYSREQ_REF_TYPE_NUMERATION_METHOD SYSREQ_REF_TYPE_REQ_CODE SYSREQ_REF_TYPE_REQ_DESCRIPTION SYSREQ_REF_TYPE_REQ_DESCRIPTION_LOCALIZE_ID SYSREQ_REF_TYPE_REQ_IS_CONTROL SYSREQ_REF_TYPE_REQ_IS_FILTER SYSREQ_REF_TYPE_REQ_IS_LEADING SYSREQ_REF_TYPE_REQ_IS_REQUIRED SYSREQ_REF_TYPE_REQ_NUMBER SYSREQ_REF_TYPE_REQ_ON_CHANGE SYSREQ_REF_TYPE_REQ_ON_CHANGE_EXISTS SYSREQ_REF_TYPE_REQ_ON_SELECT SYSREQ_REF_TYPE_REQ_ON_SELECT_KIND SYSREQ_REF_TYPE_REQ_SECTION SYSREQ_REF_TYPE_VIEW_CARD SYSREQ_REF_TYPE_VIEW_CODE SYSREQ_REF_TYPE_VIEW_COMMENT SYSREQ_REF_TYPE_VIEW_IS_MAIN SYSREQ_REF_TYPE_VIEW_NAME SYSREQ_REF_TYPE_VIEW_NAME_LOCALIZE_ID SYSREQ_REFERENCE_TYPE_ID SYSREQ_STATE SYSREQ_STATЕ SYSREQ_SYSTEM_SETTINGS_VALUE SYSREQ_TYPE SYSREQ_UNIT SYSREQ_UNIT_ID SYSREQ_USER_GROUPS_GROUP_FULL_NAME SYSREQ_USER_GROUPS_GROUP_NAME SYSREQ_USER_GROUPS_GROUP_SERVER_NAME SYSREQ_USERS_ACCESS_RIGHTS SYSREQ_USERS_AUTHENTICATION SYSREQ_USERS_CATEGORY SYSREQ_USERS_COMPONENT SYSREQ_USERS_COMPONENT_USER_IS_PUBLIC SYSREQ_USERS_DOMAIN SYSREQ_USERS_FULL_USER_NAME SYSREQ_USERS_GROUP SYSREQ_USERS_IS_MAIN_SERVER SYSREQ_USERS_LOGIN SYSREQ_USERS_REFERENCE_USER_IS_PUBLIC SYSREQ_USERS_STATUS SYSREQ_USERS_USER_CERTIFICATE SYSREQ_USERS_USER_CERTIFICATE_INFO SYSREQ_USERS_USER_CERTIFICATE_PLUGIN_NAME SYSREQ_USERS_USER_CERTIFICATE_PLUGIN_VERSION SYSREQ_USERS_USER_CERTIFICATE_STATE SYSREQ_USERS_USER_CERTIFICATE_SUBJECT_NAME SYSREQ_USERS_USER_CERTIFICATE_THUMBPRINT SYSREQ_USERS_USER_DEFAULT_CERTIFICATE SYSREQ_USERS_USER_DESCRIPTION SYSREQ_USERS_USER_GLOBAL_NAME SYSREQ_USERS_USER_LOGIN SYSREQ_USERS_USER_MAIN_SERVER SYSREQ_USERS_USER_TYPE SYSREQ_WORK_RULES_FOLDER_ID RESULT_VAR_NAME RESULT_VAR_NAME_ENG AUTO_NUMERATION_RULE_ID CANT_CHANGE_ID_REQUISITE_RULE_ID CANT_CHANGE_OURFIRM_REQUISITE_RULE_ID CHECK_CHANGING_REFERENCE_RECORD_USE_RULE_ID CHECK_CODE_REQUISITE_RULE_ID CHECK_DELETING_REFERENCE_RECORD_USE_RULE_ID CHECK_FILTRATER_CHANGES_RULE_ID CHECK_RECORD_INTERVAL_RULE_ID CHECK_REFERENCE_INTERVAL_RULE_ID CHECK_REQUIRED_DATA_FULLNESS_RULE_ID CHECK_REQUIRED_REQUISITES_FULLNESS_RULE_ID MAKE_RECORD_UNRATIFIED_RULE_ID RESTORE_AUTO_NUMERATION_RULE_ID SET_FIRM_CONTEXT_FROM_RECORD_RULE_ID SET_FIRST_RECORD_IN_LIST_FORM_RULE_ID SET_IDSPS_VALUE_RULE_ID SET_NEXT_CODE_VALUE_RULE_ID SET_OURFIRM_BOUNDS_RULE_ID SET_OURFIRM_REQUISITE_RULE_ID SCRIPT_BLOCK_AFTER_FINISH_EVENT SCRIPT_BLOCK_BEFORE_START_EVENT SCRIPT_BLOCK_EXECUTION_RESULTS_PROPERTY SCRIPT_BLOCK_NAME_PROPERTY SCRIPT_BLOCK_SCRIPT_PROPERTY SUBTASK_BLOCK_ABORT_DEADLINE_PROPERTY SUBTASK_BLOCK_AFTER_FINISH_EVENT SUBTASK_BLOCK_ASSIGN_PARAMS_EVENT SUBTASK_BLOCK_ATTACHMENTS_PROPERTY SUBTASK_BLOCK_ATTACHMENTS_RIGHTS_GROUP_PROPERTY SUBTASK_BLOCK_ATTACHMENTS_RIGHTS_TYPE_PROPERTY SUBTASK_BLOCK_BEFORE_START_EVENT SUBTASK_BLOCK_CREATED_TASK_PROPERTY SUBTASK_BLOCK_CREATION_EVENT SUBTASK_BLOCK_DEADLINE_PROPERTY SUBTASK_BLOCK_IMPORTANCE_PROPERTY SUBTASK_BLOCK_INITIATOR_PROPERTY SUBTASK_BLOCK_IS_RELATIVE_ABORT_DEADLINE_PROPERTY SUBTASK_BLOCK_IS_RELATIVE_DEADLINE_PROPERTY SUBTASK_BLOCK_JOBS_TYPE_PROPERTY SUBTASK_BLOCK_NAME_PROPERTY SUBTASK_BLOCK_PARALLEL_ROUTE_PROPERTY SUBTASK_BLOCK_PERFORMERS_PROPERTY SUBTASK_BLOCK_RELATIVE_ABORT_DEADLINE_TYPE_PROPERTY SUBTASK_BLOCK_RELATIVE_DEADLINE_TYPE_PROPERTY SUBTASK_BLOCK_REQUIRE_SIGN_PROPERTY SUBTASK_BLOCK_STANDARD_ROUTE_PROPERTY SUBTASK_BLOCK_START_EVENT SUBTASK_BLOCK_STEP_CONTROL_PROPERTY SUBTASK_BLOCK_SUBJECT_PROPERTY SUBTASK_BLOCK_TASK_CONTROL_PROPERTY SUBTASK_BLOCK_TEXT_PROPERTY SUBTASK_BLOCK_UNLOCK_ATTACHMENTS_ON_STOP_PROPERTY SUBTASK_BLOCK_USE_STANDARD_ROUTE_PROPERTY SUBTASK_BLOCK_WAIT_FOR_TASK_COMPLETE_PROPERTY SYSCOMP_CONTROL_JOBS SYSCOMP_FOLDERS SYSCOMP_JOBS SYSCOMP_NOTICES SYSCOMP_TASKS SYSDLG_CREATE_EDOCUMENT SYSDLG_CREATE_EDOCUMENT_VERSION SYSDLG_CURRENT_PERIOD SYSDLG_EDIT_FUNCTION_HELP SYSDLG_EDOCUMENT_KINDS_FOR_TEMPLATE SYSDLG_EXPORT_MULTIPLE_EDOCUMENTS SYSDLG_EXPORT_SINGLE_EDOCUMENT SYSDLG_IMPORT_EDOCUMENT SYSDLG_MULTIPLE_SELECT SYSDLG_SETUP_ACCESS_RIGHTS SYSDLG_SETUP_DEFAULT_RIGHTS SYSDLG_SETUP_FILTER_CONDITION SYSDLG_SETUP_SIGN_RIGHTS SYSDLG_SETUP_TASK_OBSERVERS SYSDLG_SETUP_TASK_ROUTE SYSDLG_SETUP_USERS_LIST SYSDLG_SIGN_EDOCUMENT SYSDLG_SIGN_MULTIPLE_EDOCUMENTS SYSREF_ACCESS_RIGHTS_TYPES SYSREF_ADMINISTRATION_HISTORY SYSREF_ALL_AVAILABLE_COMPONENTS SYSREF_ALL_AVAILABLE_PRIVILEGES SYSREF_ALL_REPLICATING_COMPONENTS SYSREF_AVAILABLE_DEVELOPERS_COMPONENTS SYSREF_CALENDAR_EVENTS SYSREF_COMPONENT_TOKEN_HISTORY SYSREF_COMPONENT_TOKENS SYSREF_COMPONENTS SYSREF_CONSTANTS SYSREF_DATA_RECEIVE_PROTOCOL SYSREF_DATA_SEND_PROTOCOL SYSREF_DIALOGS SYSREF_DIALOGS_REQUISITES SYSREF_EDITORS SYSREF_EDOC_CARDS SYSREF_EDOC_TYPES SYSREF_EDOCUMENT_CARD_REQUISITES SYSREF_EDOCUMENT_CARD_TYPES SYSREF_EDOCUMENT_CARD_TYPES_REFERENCE SYSREF_EDOCUMENT_CARDS SYSREF_EDOCUMENT_HISTORY SYSREF_EDOCUMENT_KINDS SYSREF_EDOCUMENT_REQUISITES SYSREF_EDOCUMENT_SIGNATURES SYSREF_EDOCUMENT_TEMPLATES SYSREF_EDOCUMENT_TEXT_STORAGES SYSREF_EDOCUMENT_VIEWS SYSREF_FILTERER_SETUP_CONFLICTS SYSREF_FILTRATER_SETTING_CONFLICTS SYSREF_FOLDER_HISTORY SYSREF_FOLDERS SYSREF_FUNCTION_GROUPS SYSREF_FUNCTION_PARAMS SYSREF_FUNCTIONS SYSREF_JOB_HISTORY SYSREF_LINKS SYSREF_LOCALIZATION_DICTIONARY SYSREF_LOCALIZATION_LANGUAGES SYSREF_MODULES SYSREF_PRIVILEGES SYSREF_RECORD_HISTORY SYSREF_REFERENCE_REQUISITES SYSREF_REFERENCE_TYPE_VIEWS SYSREF_REFERENCE_TYPES SYSREF_REFERENCES SYSREF_REFERENCES_REQUISITES SYSREF_REMOTE_SERVERS SYSREF_REPLICATION_SESSIONS_LOG SYSREF_REPLICATION_SESSIONS_PROTOCOL SYSREF_REPORTS SYSREF_ROLES SYSREF_ROUTE_BLOCK_GROUPS SYSREF_ROUTE_BLOCKS SYSREF_SCRIPTS SYSREF_SEARCHES SYSREF_SERVER_EVENTS SYSREF_SERVER_EVENTS_HISTORY SYSREF_STANDARD_ROUTE_GROUPS SYSREF_STANDARD_ROUTES SYSREF_STATUSES SYSREF_SYSTEM_SETTINGS SYSREF_TASK_HISTORY SYSREF_TASK_KIND_GROUPS SYSREF_TASK_KINDS SYSREF_TASK_RIGHTS SYSREF_TASK_SIGNATURES SYSREF_TASKS SYSREF_UNITS SYSREF_USER_GROUPS SYSREF_USER_GROUPS_REFERENCE SYSREF_USER_SUBSTITUTION SYSREF_USERS SYSREF_USERS_REFERENCE SYSREF_VIEWERS SYSREF_WORKING_TIME_CALENDARS ACCESS_RIGHTS_TABLE_NAME EDMS_ACCESS_TABLE_NAME EDOC_TYPES_TABLE_NAME TEST_DEV_DB_NAME TEST_DEV_SYSTEM_CODE TEST_EDMS_DB_NAME TEST_EDMS_MAIN_CODE TEST_EDMS_MAIN_DB_NAME TEST_EDMS_SECOND_CODE TEST_EDMS_SECOND_DB_NAME TEST_EDMS_SYSTEM_CODE TEST_ISB5_MAIN_CODE TEST_ISB5_SECOND_CODE TEST_SQL_SERVER_2005_NAME TEST_SQL_SERVER_NAME ATTENTION_CAPTION cbsCommandLinks cbsDefault CONFIRMATION_CAPTION ERROR_CAPTION INFORMATION_CAPTION mrCancel mrOk EDOC_VERSION_ACTIVE_STAGE_CODE EDOC_VERSION_DESIGN_STAGE_CODE EDOC_VERSION_OBSOLETE_STAGE_CODE cpDataEnciphermentEnabled cpDigitalSignatureEnabled cpID cpIssuer cpPluginVersion cpSerial cpSubjectName cpSubjSimpleName cpValidFromDate cpValidToDate ISBL_SYNTAX NO_SYNTAX XML_SYNTAX WAIT_BLOCK_AFTER_FINISH_EVENT WAIT_BLOCK_BEFORE_START_EVENT WAIT_BLOCK_DEADLINE_PROPERTY WAIT_BLOCK_IS_RELATIVE_DEADLINE_PROPERTY WAIT_BLOCK_NAME_PROPERTY WAIT_BLOCK_RELATIVE_DEADLINE_TYPE_PROPERTY SYSRES_COMMON SYSRES_CONST SYSRES_MBFUNC SYSRES_SBDATA SYSRES_SBGUI SYSRES_SBINTF SYSRES_SBREFDSC SYSRES_SQLERRORS SYSRES_SYSCOMP atUser atGroup atRole aemEnabledAlways aemDisabledAlways aemEnabledOnBrowse aemEnabledOnEdit aemDisabledOnBrowseEmpty apBegin apEnd alLeft alRight asmNever asmNoButCustomize asmAsLastTime asmYesButCustomize asmAlways cirCommon cirRevoked ctSignature ctEncode ctSignatureEncode clbUnchecked clbChecked clbGrayed ceISB ceAlways ceNever ctDocument ctReference ctScript ctUnknown ctReport ctDialog ctFunction ctFolder ctEDocument ctTask ctJob ctNotice ctControlJob cfInternal cfDisplay ciUnspecified ciWrite ciRead ckFolder ckEDocument ckTask ckJob ckComponentToken ckAny ckReference ckScript ckReport ckDialog ctISBLEditor ctBevel ctButton ctCheckListBox ctComboBox ctComboEdit ctGrid ctDBCheckBox ctDBComboBox ctDBEdit ctDBEllipsis ctDBMemo ctDBNavigator ctDBRadioGroup ctDBStatusLabel ctEdit ctGroupBox ctInplaceHint ctMemo ctPanel ctListBox ctRadioButton ctRichEdit ctTabSheet ctWebBrowser ctImage ctHyperLink ctLabel ctDBMultiEllipsis ctRibbon ctRichView ctInnerPanel ctPanelGroup ctBitButton cctDate cctInteger cctNumeric cctPick cctReference cctString cctText cltInternal cltPrimary cltGUI dseBeforeOpen dseAfterOpen dseBeforeClose dseAfterClose dseOnValidDelete dseBeforeDelete dseAfterDelete dseAfterDeleteOutOfTransaction dseOnDeleteError dseBeforeInsert dseAfterInsert dseOnValidUpdate dseBeforeUpdate dseOnUpdateRatifiedRecord dseAfterUpdate dseAfterUpdateOutOfTransaction dseOnUpdateError dseAfterScroll dseOnOpenRecord dseOnCloseRecord dseBeforeCancel dseAfterCancel dseOnUpdateDeadlockError dseBeforeDetailUpdate dseOnPrepareUpdate dseOnAnyRequisiteChange dssEdit dssInsert dssBrowse dssInActive dftDate dftShortDate dftDateTime dftTimeStamp dotDays dotHours dotMinutes dotSeconds dtkndLocal dtkndUTC arNone arView arEdit arFull ddaView ddaEdit emLock emEdit emSign emExportWithLock emImportWithUnlock emChangeVersionNote emOpenForModify emChangeLifeStage emDelete emCreateVersion emImport emUnlockExportedWithLock emStart emAbort emReInit emMarkAsReaded emMarkAsUnreaded emPerform emAccept emResume emChangeRights emEditRoute emEditObserver emRecoveryFromLocalCopy emChangeWorkAccessType emChangeEncodeTypeToCertificate emChangeEncodeTypeToPassword emChangeEncodeTypeToNone emChangeEncodeTypeToCertificatePassword emChangeStandardRoute emGetText emOpenForView emMoveToStorage emCreateObject emChangeVersionHidden emDeleteVersion emChangeLifeCycleStage emApprovingSign emExport emContinue emLockFromEdit emUnLockForEdit emLockForServer emUnlockFromServer emDelegateAccessRights emReEncode ecotFile ecotProcess eaGet eaCopy eaCreate eaCreateStandardRoute edltAll edltNothing edltQuery essmText essmCard esvtLast esvtLastActive esvtSpecified edsfExecutive edsfArchive edstSQLServer edstFile edvstNone edvstEDocumentVersionCopy edvstFile edvstTemplate edvstScannedFile vsDefault vsDesign vsActive vsObsolete etNone etCertificate etPassword etCertificatePassword ecException ecWarning ecInformation estAll estApprovingOnly evtLast evtLastActive evtQuery fdtString fdtNumeric fdtInteger fdtDate fdtText fdtUnknown fdtWideString fdtLargeInteger ftInbox ftOutbox ftFavorites ftCommonFolder ftUserFolder ftComponents ftQuickLaunch ftShortcuts ftSearch grhAuto grhX1 grhX2 grhX3 hltText hltRTF hltHTML iffBMP iffJPEG iffMultiPageTIFF iffSinglePageTIFF iffTIFF iffPNG im8bGrayscale im24bRGB im1bMonochrome itBMP itJPEG itWMF itPNG ikhInformation ikhWarning ikhError ikhNoIcon icUnknown icScript icFunction icIntegratedReport icAnalyticReport icDataSetEventHandler icActionHandler icFormEventHandler icLookUpEventHandler icRequisiteChangeEventHandler icBeforeSearchEventHandler icRoleCalculation icSelectRouteEventHandler icBlockPropertyCalculation icBlockQueryParamsEventHandler icChangeSearchResultEventHandler icBlockEventHandler icSubTaskInitEventHandler icEDocDataSetEventHandler icEDocLookUpEventHandler icEDocActionHandler icEDocFormEventHandler icEDocRequisiteChangeEventHandler icStructuredConversionRule icStructuredConversionEventBefore icStructuredConversionEventAfter icWizardEventHandler icWizardFinishEventHandler icWizardStepEventHandler icWizardStepFinishEventHandler icWizardActionEnableEventHandler icWizardActionExecuteEventHandler icCreateJobsHandler icCreateNoticesHandler icBeforeLookUpEventHandler icAfterLookUpEventHandler icTaskAbortEventHandler icWorkflowBlockActionHandler icDialogDataSetEventHandler icDialogActionHandler icDialogLookUpEventHandler icDialogRequisiteChangeEventHandler icDialogFormEventHandler icDialogValidCloseEventHandler icBlockFormEventHandler icTaskFormEventHandler icReferenceMethod icEDocMethod icDialogMethod icProcessMessageHandler isShow isHide isByUserSettings jkJob jkNotice jkControlJob jtInner jtLeft jtRight jtFull jtCross lbpAbove lbpBelow lbpLeft lbpRight eltPerConnection eltPerUser sfcUndefined sfcBlack sfcGreen sfcRed sfcBlue sfcOrange sfcLilac sfsItalic sfsStrikeout sfsNormal ldctStandardRoute ldctWizard ldctScript ldctFunction ldctRouteBlock ldctIntegratedReport ldctAnalyticReport ldctReferenceType ldctEDocumentType ldctDialog ldctServerEvents mrcrtNone mrcrtUser mrcrtMaximal mrcrtCustom vtEqual vtGreaterOrEqual vtLessOrEqual vtRange rdYesterday rdToday rdTomorrow rdThisWeek rdThisMonth rdThisYear rdNextMonth rdNextWeek rdLastWeek rdLastMonth rdWindow rdFile rdPrinter rdtString rdtNumeric rdtInteger rdtDate rdtReference rdtAccount rdtText rdtPick rdtUnknown rdtLargeInteger rdtDocument reOnChange reOnChangeValues ttGlobal ttLocal ttUser ttSystem ssmBrowse ssmSelect ssmMultiSelect ssmBrowseModal smSelect smLike smCard stNone stAuthenticating stApproving sctString sctStream sstAnsiSort sstNaturalSort svtEqual svtContain soatString soatNumeric soatInteger soatDatetime soatReferenceRecord soatText soatPick soatBoolean soatEDocument soatAccount soatIntegerCollection soatNumericCollection soatStringCollection soatPickCollection soatDatetimeCollection soatBooleanCollection soatReferenceRecordCollection soatEDocumentCollection soatAccountCollection soatContents soatUnknown tarAbortByUser tarAbortByWorkflowException tvtAllWords tvtExactPhrase tvtAnyWord usNone usCompleted usRedSquare usBlueSquare usYellowSquare usGreenSquare usOrangeSquare usPurpleSquare usFollowUp utUnknown utUser utDeveloper utAdministrator utSystemDeveloper utDisconnected btAnd btDetailAnd btOr btNotOr btOnly vmView vmSelect vmNavigation vsmSingle vsmMultiple vsmMultipleCheck vsmNoSelection wfatPrevious wfatNext wfatCancel wfatFinish wfepUndefined wfepText3 wfepText6 wfepText9 wfepSpinEdit wfepDropDown wfepRadioGroup wfepFlag wfepText12 wfepText15 wfepText18 wfepText21 wfepText24 wfepText27 wfepText30 wfepRadioGroupColumn1 wfepRadioGroupColumn2 wfepRadioGroupColumn3 wfetQueryParameter wfetText wfetDelimiter wfetLabel wptString wptInteger wptNumeric wptBoolean wptDateTime wptPick wptText wptUser wptUserList wptEDocumentInfo wptEDocumentInfoList wptReferenceRecordInfo wptReferenceRecordInfoList wptFolderInfo wptTaskInfo wptContents wptFileName wptDate wsrComplete wsrGoNext wsrGoPrevious wsrCustom wsrCancel wsrGoFinal wstForm wstEDocument wstTaskCard wstReferenceRecordCard wstFinal waAll waPerformers waManual wsbStart wsbFinish wsbNotice wsbStep wsbDecision wsbWait wsbMonitor wsbScript wsbConnector wsbSubTask wsbLifeCycleStage wsbPause wdtInteger wdtFloat wdtString wdtPick wdtDateTime wdtBoolean wdtTask wdtJob wdtFolder wdtEDocument wdtReferenceRecord wdtUser wdtGroup wdtRole wdtIntegerCollection wdtFloatCollection wdtStringCollection wdtPickCollection wdtDateTimeCollection wdtBooleanCollection wdtTaskCollection wdtJobCollection wdtFolderCollection wdtEDocumentCollection wdtReferenceRecordCollection wdtUserCollection wdtGroupCollection wdtRoleCollection wdtContents wdtUserList wdtSearchDescription wdtDeadLine wdtPickSet wdtAccountCollection wiLow wiNormal wiHigh wrtSoft wrtHard wsInit wsRunning wsDone wsControlled wsAborted wsContinued wtmFull wtmFromCurrent wtmOnlyCurrent ",class:"AltState Application CallType ComponentTokens CreatedJobs CreatedNotices ControlState DialogResult Dialogs EDocuments EDocumentVersionSource Folders GlobalIDs Job Jobs InputValue LookUpReference LookUpRequisiteNames LookUpSearch Object ParentComponent Processes References Requisite ReportName Reports Result Scripts Searches SelectedAttachments SelectedItems SelectMode Sender ServerEvents ServiceFactory ShiftState SubTask SystemDialogs Tasks Wizard Wizards Work ВызовСпособ ИмяОтчета РеквЗнач ",literal:"null true false nil "},I={b:"\\.\\s*"+S.UIR,k:C,relevance:0},N={cN:"type",b:":[ \\t]*("+"IApplication IAccessRights IAccountRepository IAccountSelectionRestrictions IAction IActionList IAdministrationHistoryDescription IAnchors IApplication IArchiveInfo IAttachment IAttachmentList ICheckListBox ICheckPointedList IColumn IComponent IComponentDescription IComponentToken IComponentTokenFactory IComponentTokenInfo ICompRecordInfo IConnection IContents IControl IControlJob IControlJobInfo IControlList ICrypto ICrypto2 ICustomJob ICustomJobInfo ICustomListBox ICustomObjectWizardStep ICustomWork ICustomWorkInfo IDataSet IDataSetAccessInfo IDataSigner IDateCriterion IDateRequisite IDateRequisiteDescription IDateValue IDeaAccessRights IDeaObjectInfo IDevelopmentComponentLock IDialog IDialogFactory IDialogPickRequisiteItems IDialogsFactory IDICSFactory IDocRequisite IDocumentInfo IDualListDialog IECertificate IECertificateInfo IECertificates IEditControl IEditorForm IEdmsExplorer IEdmsObject IEdmsObjectDescription IEdmsObjectFactory IEdmsObjectInfo IEDocument IEDocumentAccessRights IEDocumentDescription IEDocumentEditor IEDocumentFactory IEDocumentInfo IEDocumentStorage IEDocumentVersion IEDocumentVersionListDialog IEDocumentVersionSource IEDocumentWizardStep IEDocVerSignature IEDocVersionState IEnabledMode IEncodeProvider IEncrypter IEvent IEventList IException IExternalEvents IExternalHandler IFactory IField IFileDialog IFolder IFolderDescription IFolderDialog IFolderFactory IFolderInfo IForEach IForm IFormTitle IFormWizardStep IGlobalIDFactory IGlobalIDInfo IGrid IHasher IHistoryDescription IHyperLinkControl IImageButton IImageControl IInnerPanel IInplaceHint IIntegerCriterion IIntegerList IIntegerRequisite IIntegerValue IISBLEditorForm IJob IJobDescription IJobFactory IJobForm IJobInfo ILabelControl ILargeIntegerCriterion ILargeIntegerRequisite ILargeIntegerValue ILicenseInfo ILifeCycleStage IList IListBox ILocalIDInfo ILocalization ILock IMemoryDataSet IMessagingFactory IMetadataRepository INotice INoticeInfo INumericCriterion INumericRequisite INumericValue IObject IObjectDescription IObjectImporter IObjectInfo IObserver IPanelGroup IPickCriterion IPickProperty IPickRequisite IPickRequisiteDescription IPickRequisiteItem IPickRequisiteItems IPickValue IPrivilege IPrivilegeList IProcess IProcessFactory IProcessMessage IProgress IProperty IPropertyChangeEvent IQuery IReference IReferenceCriterion IReferenceEnabledMode IReferenceFactory IReferenceHistoryDescription IReferenceInfo IReferenceRecordCardWizardStep IReferenceRequisiteDescription IReferencesFactory IReferenceValue IRefRequisite IReport IReportFactory IRequisite IRequisiteDescription IRequisiteDescriptionList IRequisiteFactory IRichEdit IRouteStep IRule IRuleList ISchemeBlock IScript IScriptFactory ISearchCriteria ISearchCriterion ISearchDescription ISearchFactory ISearchFolderInfo ISearchForObjectDescription ISearchResultRestrictions ISecuredContext ISelectDialog IServerEvent IServerEventFactory IServiceDialog IServiceFactory ISignature ISignProvider ISignProvider2 ISignProvider3 ISimpleCriterion IStringCriterion IStringList IStringRequisite IStringRequisiteDescription IStringValue ISystemDialogsFactory ISystemInfo ITabSheet ITask ITaskAbortReasonInfo ITaskCardWizardStep ITaskDescription ITaskFactory ITaskInfo ITaskRoute ITextCriterion ITextRequisite ITextValue ITreeListSelectDialog IUser IUserList IValue IView IWebBrowserControl IWizard IWizardAction IWizardFactory IWizardFormElement IWizardParam IWizardPickParam IWizardReferenceParam IWizardStep IWorkAccessRights IWorkDescription IWorkflowAskableParam IWorkflowAskableParams IWorkflowBlock IWorkflowBlockResult IWorkflowEnabledMode IWorkflowParam IWorkflowPickParam IWorkflowReferenceParam IWorkState IWorkTreeCustomNode IWorkTreeJobNode IWorkTreeTaskNode IXMLEditorForm SBCrypto ".trim().replace(/\s/g,"|")+")",e:"[ \\t]*=",eE:!0},A={cN:"variable",l:E,k:C,b:E,relevance:0,c:[N,I]},e="[A-Za-zА-Яа-яёЁ_][A-Za-zА-Яа-яёЁ_0-9]*\\(";return{aliases:["isbl"],cI:!0,l:E,k:C,i:"\\$|\\?|%|,|;$|~|#|@|</",c:[{cN:"function",b:e,e:"\\)$",rB:!0,l:E,k:C,i:"[\\[\\]\\|\\$\\?%,~#@]",c:[{cN:"title",l:E,k:{built_in:"AddSubString AdjustLineBreaks AmountInWords Analysis ArrayDimCount ArrayHighBound ArrayLowBound ArrayOf ArrayReDim Assert Assigned BeginOfMonth BeginOfPeriod BuildProfilingOperationAnalysis CallProcedure CanReadFile CArrayElement CDataSetRequisite ChangeDate ChangeReferenceDataset Char CharPos CheckParam CheckParamValue CompareStrings ConstantExists ControlState ConvertDateStr Copy CopyFile CreateArray CreateCachedReference CreateConnection CreateDialog CreateDualListDialog CreateEditor CreateException CreateFile CreateFolderDialog CreateInputDialog CreateLinkFile CreateList CreateLock CreateMemoryDataSet CreateObject CreateOpenDialog CreateProgress CreateQuery CreateReference CreateReport CreateSaveDialog CreateScript CreateSQLPivotFunction CreateStringList CreateTreeListSelectDialog CSelectSQL CSQL CSubString CurrentUserID CurrentUserName CurrentVersion DataSetLocateEx DateDiff DateTimeDiff DateToStr DayOfWeek DeleteFile DirectoryExists DisableCheckAccessRights DisableCheckFullShowingRestriction DisableMassTaskSendingRestrictions DropTable DupeString EditText EnableCheckAccessRights EnableCheckFullShowingRestriction EnableMassTaskSendingRestrictions EndOfMonth EndOfPeriod ExceptionExists ExceptionsOff ExceptionsOn Execute ExecuteProcess Exit ExpandEnvironmentVariables ExtractFileDrive ExtractFileExt ExtractFileName ExtractFilePath ExtractParams FileExists FileSize FindFile FindSubString FirmContext ForceDirectories Format FormatDate FormatNumeric FormatSQLDate FormatString FreeException GetComponent GetComponentLaunchParam GetConstant GetLastException GetReferenceRecord GetRefTypeByRefID GetTableID GetTempFolder IfThen In IndexOf InputDialog InputDialogEx InteractiveMode IsFileLocked IsGraphicFile IsNumeric Length LoadString LoadStringFmt LocalTimeToUTC LowerCase Max MessageBox MessageBoxEx MimeDecodeBinary MimeDecodeString MimeEncodeBinary MimeEncodeString Min MoneyInWords MoveFile NewID Now OpenFile Ord Precision Raise ReadCertificateFromFile ReadFile ReferenceCodeByID ReferenceNumber ReferenceRequisiteMode ReferenceRequisiteValue RegionDateSettings RegionNumberSettings RegionTimeSettings RegRead RegWrite RenameFile Replace Round SelectServerCode SelectSQL ServerDateTime SetConstant SetManagedFolderFieldsState ShowConstantsInputDialog ShowMessage Sleep Split SQL SQL2XLSTAB SQLProfilingSendReport StrToDate SubString SubStringCount SystemSetting Time TimeDiff Today Transliterate Trim UpperCase UserStatus UTCToLocalTime ValidateXML VarIsClear VarIsEmpty VarIsNull WorkTimeDiff WriteFile WriteFileEx WriteObjectHistory Анализ БазаДанных БлокЕсть БлокЕстьРасш БлокИнфо БлокСнять БлокСнятьРасш БлокУстановить Ввод ВводМеню ВедС ВедСпр ВерхняяГраницаМассива ВнешПрогр Восст ВременнаяПапка Время ВыборSQL ВыбратьЗапись ВыделитьСтр Вызвать Выполнить ВыпПрогр ГрафическийФайл ГруппаДополнительно ДатаВремяСерв ДеньНедели ДиалогДаНет ДлинаСтр ДобПодстр ЕПусто ЕслиТо ЕЧисло ЗамПодстр ЗаписьСправочника ЗначПоляСпр ИДТипСпр ИзвлечьДиск ИзвлечьИмяФайла ИзвлечьПуть ИзвлечьРасширение ИзмДат ИзменитьРазмерМассива ИзмеренийМассива ИмяОрг ИмяПоляСпр Индекс ИндикаторЗакрыть ИндикаторОткрыть ИндикаторШаг ИнтерактивныйРежим ИтогТблСпр КодВидВедСпр КодВидСпрПоИД КодПоAnalit КодСимвола КодСпр КолПодстр КолПроп КонМес Конст КонстЕсть КонстЗнач КонТран КопироватьФайл КопияСтр КПериод КСтрТблСпр Макс МаксСтрТблСпр Массив Меню МенюРасш Мин НаборДанныхНайтиРасш НаимВидСпр НаимПоAnalit НаимСпр НастроитьПереводыСтрок НачМес НачТран НижняяГраницаМассива НомерСпр НПериод Окно Окр Окружение ОтлИнфДобавить ОтлИнфУдалить Отчет ОтчетАнал ОтчетИнт ПапкаСуществует Пауза ПВыборSQL ПереименоватьФайл Переменные ПереместитьФайл Подстр ПоискПодстр ПоискСтр ПолучитьИДТаблицы ПользовательДополнительно ПользовательИД ПользовательИмя ПользовательСтатус Прервать ПроверитьПараметр ПроверитьПараметрЗнач ПроверитьУсловие РазбСтр РазнВремя РазнДат РазнДатаВремя РазнРабВремя РегУстВрем РегУстДат РегУстЧсл РедТекст РеестрЗапись РеестрСписокИменПарам РеестрЧтение РеквСпр РеквСпрПр Сегодня Сейчас Сервер СерверПроцессИД СертификатФайлСчитать СжПроб Символ СистемаДиректумКод СистемаИнформация СистемаКод Содержит СоединениеЗакрыть СоединениеОткрыть СоздатьДиалог СоздатьДиалогВыбораИзДвухСписков СоздатьДиалогВыбораПапки СоздатьДиалогОткрытияФайла СоздатьДиалогСохраненияФайла СоздатьЗапрос СоздатьИндикатор СоздатьИсключение СоздатьКэшированныйСправочник СоздатьМассив СоздатьНаборДанных СоздатьОбъект СоздатьОтчет СоздатьПапку СоздатьРедактор СоздатьСоединение СоздатьСписок СоздатьСписокСтрок СоздатьСправочник СоздатьСценарий СоздСпр СостСпр Сохр СохрСпр СписокСистем Спр Справочник СпрБлокЕсть СпрБлокСнять СпрБлокСнятьРасш СпрБлокУстановить СпрИзмНабДан СпрКод СпрНомер СпрОбновить СпрОткрыть СпрОтменить СпрПарам СпрПолеЗнач СпрПолеИмя СпрРекв СпрРеквВведЗн СпрРеквНовые СпрРеквПр СпрРеквПредЗн СпрРеквРежим СпрРеквТипТекст СпрСоздать СпрСост СпрСохранить СпрТблИтог СпрТблСтр СпрТблСтрКол СпрТблСтрМакс СпрТблСтрМин СпрТблСтрПред СпрТблСтрСлед СпрТблСтрСозд СпрТблСтрУд СпрТекПредст СпрУдалить СравнитьСтр СтрВерхРегистр СтрНижнРегистр СтрТблСпр СумПроп Сценарий СценарийПарам ТекВерсия ТекОрг Точн Тран Транслитерация УдалитьТаблицу УдалитьФайл УдСпр УдСтрТблСпр Уст УстановкиКонстант ФайлАтрибутСчитать ФайлАтрибутУстановить ФайлВремя ФайлВремяУстановить ФайлВыбрать ФайлЗанят ФайлЗаписать ФайлИскать ФайлКопировать ФайлМожноЧитать ФайлОткрыть ФайлПереименовать ФайлПерекодировать ФайлПереместить ФайлПросмотреть ФайлРазмер ФайлСоздать ФайлСсылкаСоздать ФайлСуществует ФайлСчитать ФайлУдалить ФмтSQLДат ФмтДат ФмтСтр ФмтЧсл Формат ЦМассивЭлемент ЦНаборДанныхРеквизит ЦПодстр "},b:e,e:"\\(",rB:!0,eE:!0},I,A,T,_,O]},N,I,A,T,_,O]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/java.min.js b/vendor/assets/javascripts/highlightjs/languages/java.min.js
index 4b416c23f5..c83bc753c0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/java.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/java.min.js
@@ -1 +1 @@
-hljs.registerLanguage("java",function(){"use strict";return function(e){var a="false synchronized int abstract float private char boolean var static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports do",n={className:"meta",begin:"@[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*",contains:[{begin:/\(/,end:/\)/,contains:["self"]}]};return{name:"Java",aliases:["jsp"],keywords:a,illegal:/<\/|#/,contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0},{className:"doctag",begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"class",beginKeywords:"class interface",end:/[{;=]/,excludeEnd:!0,keywords:"class interface",illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"new throw return else",relevance:0},{className:"function",begin:"([À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(<[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(\\s*,\\s*[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*)*>)?\\s+)+"+e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:a,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/,keywords:a,relevance:0,contains:[n,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"number",begin:"\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",relevance:0},n]}}}());
\ No newline at end of file
+hljs.registerLanguage("java",function(e){var a="false synchronized int abstract float private char boolean var static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports do",t={cN:"number",b:"\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",relevance:0};return{aliases:["jsp"],k:a,i:/<\/|#/,c:[e.C("/\\*\\*","\\*/",{relevance:0,c:[{b:/\w+@/,relevance:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,e.ASM,e.QSM,{cN:"class",bK:"class interface",e:/[{;=]/,eE:!0,k:"class interface",i:/[:"\[\]]/,c:[{bK:"extends implements"},e.UTM]},{bK:"new throw return else",relevance:0},{cN:"function",b:"([À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(<[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(\\s*,\\s*[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*)*>)?\\s+)+"+e.UIR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:a,c:[{b:e.UIR+"\\s*\\(",rB:!0,relevance:0,c:[e.UTM]},{cN:"params",b:/\(/,e:/\)/,k:a,relevance:0,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]},t,{cN:"meta",b:"@[A-Za-z]+"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/javascript.min.js b/vendor/assets/javascripts/highlightjs/languages/javascript.min.js
index d3399d335f..551395ed44 100644
--- a/vendor/assets/javascripts/highlightjs/languages/javascript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/javascript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("javascript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);function s(e){return r("(?=",e,")")}function r(...e){return e.map(e=>{return(n=e)?"string"==typeof n?n:n.source:null;var n}).join("")}return function(t){var i="[A-Za-z$_][0-9A-Za-z$_]*",c={begin:/<[A-Za-z0-9\\._:-]+/,end:/\/[A-Za-z0-9\\._:-]+>|\/>/},o={$pattern:"[A-Za-z$_][0-9A-Za-z$_]*",keyword:e.join(" "),literal:n.join(" "),built_in:a.join(" ")},l={className:"number",variants:[{begin:"\\b(0[bB][01]+)n?"},{begin:"\\b(0[oO][0-7]+)n?"},{begin:t.C_NUMBER_RE+"n?"}],relevance:0},E={className:"subst",begin:"\\$\\{",end:"\\}",keywords:o,contains:[]},d={begin:"html`",end:"",starts:{end:"`",returnEnd:!1,contains:[t.BACKSLASH_ESCAPE,E],subLanguage:"xml"}},g={begin:"css`",end:"",starts:{end:"`",returnEnd:!1,contains:[t.BACKSLASH_ESCAPE,E],subLanguage:"css"}},u={className:"string",begin:"`",end:"`",contains:[t.BACKSLASH_ESCAPE,E]};E.contains=[t.APOS_STRING_MODE,t.QUOTE_STRING_MODE,d,g,u,l,t.REGEXP_MODE];var b=E.contains.concat([{begin:/\(/,end:/\)/,contains:["self"].concat(E.contains,[t.C_BLOCK_COMMENT_MODE,t.C_LINE_COMMENT_MODE])},t.C_BLOCK_COMMENT_MODE,t.C_LINE_COMMENT_MODE]),_={className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:b};return{name:"JavaScript",aliases:["js","jsx","mjs","cjs"],keywords:o,contains:[t.SHEBANG({binary:"node",relevance:5}),{className:"meta",relevance:10,begin:/^\s*['"]use (strict|asm)['"]/},t.APOS_STRING_MODE,t.QUOTE_STRING_MODE,d,g,u,t.C_LINE_COMMENT_MODE,t.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{className:"doctag",begin:"@[A-Za-z]+",contains:[{className:"type",begin:"\\{",end:"\\}",relevance:0},{className:"variable",begin:i+"(?=\\s*(-)|$)",endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]}),t.C_BLOCK_COMMENT_MODE,l,{begin:r(/[{,\n]\s*/,s(r(/(((\/\/.*)|(\/\*(.|\n)*\*\/))\s*)*/,i+"\\s*:"))),relevance:0,contains:[{className:"attr",begin:i+s("\\s*:"),relevance:0}]},{begin:"("+t.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",keywords:"return throw case",contains:[t.C_LINE_COMMENT_MODE,t.C_BLOCK_COMMENT_MODE,t.REGEXP_MODE,{className:"function",begin:"(\\([^(]*(\\([^(]*(\\([^(]*\\))?\\))?\\)|"+t.UNDERSCORE_IDENT_RE+")\\s*=>",returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{begin:t.UNDERSCORE_IDENT_RE},{className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:o,contains:b}]}]},{begin:/,/,relevance:0},{className:"",begin:/\s/,end:/\s*/,skip:!0},{variants:[{begin:"<>",end:"</>"},{begin:c.begin,end:c.end}],subLanguage:"xml",contains:[{begin:c.begin,end:c.end,skip:!0,contains:["self"]}]}],relevance:0},{className:"function",beginKeywords:"function",end:/\{/,excludeEnd:!0,contains:[t.inherit(t.TITLE_MODE,{begin:i}),_],illegal:/\[|%/},{begin:/\$[(.]/},t.METHOD_GUARD,{className:"class",beginKeywords:"class",end:/[{;=]/,excludeEnd:!0,illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends"},t.UNDERSCORE_TITLE_MODE]},{beginKeywords:"constructor",end:/\{/,excludeEnd:!0},{begin:"(get|set)\\s+(?="+i+"\\()",end:/{/,keywords:"get set",contains:[t.inherit(t.TITLE_MODE,{begin:i}),{begin:/\(\)/},_]}],illegal:/#(?!!)/}}}());
\ No newline at end of file
+hljs.registerLanguage("javascript",function(e){var r="<>",a="</>",t={b:/<[A-Za-z0-9\\._:-]+/,e:/\/[A-Za-z0-9\\._:-]+>|\/>/},c="[A-Za-z$_][0-9A-Za-z$_]*",n={keyword:"in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await static import from as",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise"},s={cN:"number",v:[{b:"\\b(0[bB][01]+)n?"},{b:"\\b(0[oO][0-7]+)n?"},{b:e.CNR+"n?"}],relevance:0},o={cN:"subst",b:"\\$\\{",e:"\\}",k:n,c:[]},i={b:"html`",e:"",starts:{e:"`",rE:!1,c:[e.BE,o],sL:"xml"}},b={b:"css`",e:"",starts:{e:"`",rE:!1,c:[e.BE,o],sL:"css"}},l={cN:"string",b:"`",e:"`",c:[e.BE,o]};o.c=[e.ASM,e.QSM,i,b,l,s,e.RM];var u=o.c.concat([e.CBCM,e.CLCM]);return{aliases:["js","jsx","mjs","cjs"],k:n,c:[{cN:"meta",relevance:10,b:/^\s*['"]use (strict|asm)['"]/},{cN:"meta",b:/^#!/,e:/$/},e.ASM,e.QSM,i,b,l,e.CLCM,e.C("/\\*\\*","\\*/",{relevance:0,c:[{cN:"doctag",b:"@[A-Za-z]+",c:[{cN:"type",b:"\\{",e:"\\}",relevance:0},{cN:"variable",b:c+"(?=\\s*(-)|$)",endsParent:!0,relevance:0},{b:/(?=[^\n])\s/,relevance:0}]}]}),e.CBCM,s,{b:/[{,\n]\s*/,relevance:0,c:[{b:c+"\\s*:",rB:!0,relevance:0,c:[{cN:"attr",b:c,relevance:0}]}]},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{cN:"function",b:"(\\(.*?\\)|"+c+")\\s*=>",rB:!0,e:"\\s*=>",c:[{cN:"params",v:[{b:c},{b:/\(\s*\)/},{b:/\(/,e:/\)/,eB:!0,eE:!0,k:n,c:u}]}]},{cN:"",b:/\s/,e:/\s*/,skip:!0},{v:[{b:r,e:a},{b:t.b,e:t.e}],sL:"xml",c:[{b:t.b,e:t.e,skip:!0,c:["self"]}]}],relevance:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:c}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:u}],i:/\[|%/},{b:/\$[(.]/},e.METHOD_GUARD,{cN:"class",bK:"class",e:/[{;=]/,eE:!0,i:/[:"\[\]]/,c:[{bK:"extends"},e.UTM]},{bK:"constructor get set",e:/\{/,eE:!0}],i:/#(?!!)/}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/jboss-cli.min.js b/vendor/assets/javascripts/highlightjs/languages/jboss-cli.min.js
index 4743d33219..41a9051433 100644
--- a/vendor/assets/javascripts/highlightjs/languages/jboss-cli.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/jboss-cli.min.js
@@ -1 +1 @@
-hljs.registerLanguage("jboss-cli",function(){"use strict";return function(e){return{name:"JBoss CLI",aliases:["wildfly-cli"],keywords:{$pattern:"[a-z-]+",keyword:"alias batch cd clear command connect connection-factory connection-info data-source deploy deployment-info deployment-overlay echo echo-dmr help history if jdbc-driver-info jms-queue|20 jms-topic|20 ls patch pwd quit read-attribute read-operation reload rollout-plan run-batch set shutdown try unalias undeploy unset version xa-data-source",literal:"true false"},contains:[e.HASH_COMMENT_MODE,e.QUOTE_STRING_MODE,{className:"params",begin:/--[\w\-=\/]+/},{className:"function",begin:/:[\w\-.]+/,relevance:0},{className:"string",begin:/\B(([\/.])[\w\-.\/=]+)+/},{className:"params",begin:/\(/,end:/\)/,contains:[{begin:/[\w-]+ *=/,returnBegin:!0,relevance:0,contains:[{className:"attr",begin:/[\w-]+/}]}],relevance:0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("jboss-cli",function(e){var a={cN:"params",b:/\(/,e:/\)/,c:[{b:/[\w-]+ *=/,rB:!0,relevance:0,c:[{cN:"attr",b:/[\w-]+/}]}],relevance:0};return{aliases:["wildfly-cli"],l:"[a-z-]+",k:{keyword:"alias batch cd clear command connect connection-factory connection-info data-source deploy deployment-info deployment-overlay echo echo-dmr help history if jdbc-driver-info jms-queue|20 jms-topic|20 ls patch pwd quit read-attribute read-operation reload rollout-plan run-batch set shutdown try unalias undeploy unset version xa-data-source",literal:"true false"},c:[e.HCM,e.QSM,{cN:"params",b:/--[\w\-=\/]+/},{cN:"function",b:/:[\w\-.]+/,relevance:0},{cN:"string",b:/\B(([\/.])[\w\-.\/=]+)+/},a]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/json.min.js b/vendor/assets/javascripts/highlightjs/languages/json.min.js
index 4a4f63c40f..cdd2a9b11c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/json.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/json.min.js
@@ -1 +1 @@
-hljs.registerLanguage("json",function(){"use strict";return function(n){var e={literal:"true false null"},i=[n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE],t=[n.QUOTE_STRING_MODE,n.C_NUMBER_MODE],a={end:",",endsWithParent:!0,excludeEnd:!0,contains:t,keywords:e},l={begin:"{",end:"}",contains:[{className:"attr",begin:/"/,end:/"/,contains:[n.BACKSLASH_ESCAPE],illegal:"\\n"},n.inherit(a,{begin:/:/})].concat(i),illegal:"\\S"},s={begin:"\\[",end:"\\]",contains:[n.inherit(a)],illegal:"\\S"};return t.push(l,s),i.forEach((function(n){t.push(n)})),{name:"JSON",contains:t,keywords:e,illegal:"\\S"}}}());
\ No newline at end of file
+hljs.registerLanguage("json",function(e){var i={literal:"true false null"},n=[e.CLCM,e.CBCM],c=[e.QSM,e.CNM],r={e:",",eW:!0,eE:!0,c:c,k:i},t={b:"{",e:"}",c:[{cN:"attr",b:/"/,e:/"/,c:[e.BE],i:"\\n"},e.inherit(r,{b:/:/})].concat(n),i:"\\S"},a={b:"\\[",e:"\\]",c:[e.inherit(r)],i:"\\S"};return c.push(t,a),n.forEach(function(e){c.push(e)}),{c:c,k:i,i:"\\S"}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/julia-repl.min.js b/vendor/assets/javascripts/highlightjs/languages/julia-repl.min.js
index 02cd223a50..8b66f4356d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/julia-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/julia-repl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("julia-repl",function(){"use strict";return function(e){return{name:"Julia REPL",contains:[{className:"meta",begin:/^julia>/,relevance:10,starts:{end:/^(?![ ]{6})/,subLanguage:"julia"},aliases:["jldoctest"]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("julia-repl",function(e){return{c:[{cN:"meta",b:/^julia>/,relevance:10,starts:{e:/^(?![ ]{6})/,sL:"julia"},aliases:["jldoctest"]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/julia.min.js b/vendor/assets/javascripts/highlightjs/languages/julia.min.js
index 0df157736b..78bfac3223 100644
--- a/vendor/assets/javascripts/highlightjs/languages/julia.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/julia.min.js
@@ -1 +1 @@
-hljs.registerLanguage("julia",function(){"use strict";return function(e){var r="[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*",t={$pattern:r,keyword:"in isa where baremodule begin break catch ccall const continue do else elseif end export false finally for function global if import importall let local macro module quote return true try using while type immutable abstract bitstype typealias ",literal:"true false ARGS C_NULL DevNull ENDIAN_BOM ENV I Inf Inf16 Inf32 Inf64 InsertionSort JULIA_HOME LOAD_PATH MergeSort NaN NaN16 NaN32 NaN64 PROGRAM_FILE QuickSort RoundDown RoundFromZero RoundNearest RoundNearestTiesAway RoundNearestTiesUp RoundToZero RoundUp STDERR STDIN STDOUT VERSION catalan e|0 eu|0 eulergamma golden im nothing pi γ π φ ",built_in:"ANY AbstractArray AbstractChannel AbstractFloat AbstractMatrix AbstractRNG AbstractSerializer AbstractSet AbstractSparseArray AbstractSparseMatrix AbstractSparseVector AbstractString AbstractUnitRange AbstractVecOrMat AbstractVector Any ArgumentError Array AssertionError Associative Base64DecodePipe Base64EncodePipe Bidiagonal BigFloat BigInt BitArray BitMatrix BitVector Bool BoundsError BufferStream CachingPool CapturedException CartesianIndex CartesianRange Cchar Cdouble Cfloat Channel Char Cint Cintmax_t Clong Clonglong ClusterManager Cmd CodeInfo Colon Complex Complex128 Complex32 Complex64 CompositeException Condition ConjArray ConjMatrix ConjVector Cptrdiff_t Cshort Csize_t Cssize_t Cstring Cuchar Cuint Cuintmax_t Culong Culonglong Cushort Cwchar_t Cwstring DataType Date DateFormat DateTime DenseArray DenseMatrix DenseVecOrMat DenseVector Diagonal Dict DimensionMismatch Dims DirectIndexString Display DivideError DomainError EOFError EachLine Enum Enumerate ErrorException Exception ExponentialBackOff Expr Factorization FileMonitor Float16 Float32 Float64 Function Future GlobalRef GotoNode HTML Hermitian IO IOBuffer IOContext IOStream IPAddr IPv4 IPv6 IndexCartesian IndexLinear IndexStyle InexactError InitError Int Int128 Int16 Int32 Int64 Int8 IntSet Integer InterruptException InvalidStateException Irrational KeyError LabelNode LinSpace LineNumberNode LoadError LowerTriangular MIME Matrix MersenneTwister Method MethodError MethodTable Module NTuple NewvarNode NullException Nullable Number ObjectIdDict OrdinalRange OutOfMemoryError OverflowError Pair ParseError PartialQuickSort PermutedDimsArray Pipe PollingFileWatcher ProcessExitedException Ptr QuoteNode RandomDevice Range RangeIndex Rational RawFD ReadOnlyMemoryError Real ReentrantLock Ref Regex RegexMatch RemoteChannel RemoteException RevString RoundingMode RowVector SSAValue SegmentationFault SerializationState Set SharedArray SharedMatrix SharedVector Signed SimpleVector Slot SlotNumber SparseMatrixCSC SparseVector StackFrame StackOverflowError StackTrace StepRange StepRangeLen StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubString SymTridiagonal Symbol Symmetric SystemError TCPSocket Task Text TextDisplay Timer Tridiagonal Tuple Type TypeError TypeMapEntry TypeMapLevel TypeName TypeVar TypedSlot UDPSocket UInt UInt128 UInt16 UInt32 UInt64 UInt8 UndefRefError UndefVarError UnicodeError UniformScaling Union UnionAll UnitRange Unsigned UpperTriangular Val Vararg VecElement VecOrMat Vector VersionNumber Void WeakKeyDict WeakRef WorkerConfig WorkerPool "},a={keywords:t,illegal:/<\//},n={className:"subst",begin:/\$\(/,end:/\)/,keywords:t},o={className:"variable",begin:"\\$"+r},i={className:"string",contains:[e.BACKSLASH_ESCAPE,n,o],variants:[{begin:/\w*"""/,end:/"""\w*/,relevance:10},{begin:/\w*"/,end:/"\w*/}]},l={className:"string",contains:[e.BACKSLASH_ESCAPE,n,o],begin:"`",end:"`"},s={className:"meta",begin:"@"+r};return a.name="Julia",a.contains=[{className:"number",begin:/(\b0x[\d_]*(\.[\d_]*)?|0x\.\d[\d_]*)p[-+]?\d+|\b0[box][a-fA-F0-9][a-fA-F0-9_]*|(\b\d[\d_]*(\.[\d_]*)?|\.\d[\d_]*)([eEfF][-+]?\d+)?/,relevance:0},{className:"string",begin:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},i,l,s,{className:"comment",variants:[{begin:"#=",end:"=#",relevance:10},{begin:"#",end:"$"}]},e.HASH_COMMENT_MODE,{className:"keyword",begin:"\\b(((abstract|primitive)\\s+)type|(mutable\\s+)?struct)\\b"},{begin:/<:/}],n.contains=a.contains,a}}());
\ No newline at end of file
+hljs.registerLanguage("julia",function(e){var r={keyword:"in isa where baremodule begin break catch ccall const continue do else elseif end export false finally for function global if import importall let local macro module quote return true try using while type immutable abstract bitstype typealias ",literal:"true false ARGS C_NULL DevNull ENDIAN_BOM ENV I Inf Inf16 Inf32 Inf64 InsertionSort JULIA_HOME LOAD_PATH MergeSort NaN NaN16 NaN32 NaN64 PROGRAM_FILE QuickSort RoundDown RoundFromZero RoundNearest RoundNearestTiesAway RoundNearestTiesUp RoundToZero RoundUp STDERR STDIN STDOUT VERSION catalan e|0 eu|0 eulergamma golden im nothing pi γ π φ ",built_in:"ANY AbstractArray AbstractChannel AbstractFloat AbstractMatrix AbstractRNG AbstractSerializer AbstractSet AbstractSparseArray AbstractSparseMatrix AbstractSparseVector AbstractString AbstractUnitRange AbstractVecOrMat AbstractVector Any ArgumentError Array AssertionError Associative Base64DecodePipe Base64EncodePipe Bidiagonal BigFloat BigInt BitArray BitMatrix BitVector Bool BoundsError BufferStream CachingPool CapturedException CartesianIndex CartesianRange Cchar Cdouble Cfloat Channel Char Cint Cintmax_t Clong Clonglong ClusterManager Cmd CodeInfo Colon Complex Complex128 Complex32 Complex64 CompositeException Condition ConjArray ConjMatrix ConjVector Cptrdiff_t Cshort Csize_t Cssize_t Cstring Cuchar Cuint Cuintmax_t Culong Culonglong Cushort Cwchar_t Cwstring DataType Date DateFormat DateTime DenseArray DenseMatrix DenseVecOrMat DenseVector Diagonal Dict DimensionMismatch Dims DirectIndexString Display DivideError DomainError EOFError EachLine Enum Enumerate ErrorException Exception ExponentialBackOff Expr Factorization FileMonitor Float16 Float32 Float64 Function Future GlobalRef GotoNode HTML Hermitian IO IOBuffer IOContext IOStream IPAddr IPv4 IPv6 IndexCartesian IndexLinear IndexStyle InexactError InitError Int Int128 Int16 Int32 Int64 Int8 IntSet Integer InterruptException InvalidStateException Irrational KeyError LabelNode LinSpace LineNumberNode LoadError LowerTriangular MIME Matrix MersenneTwister Method MethodError MethodTable Module NTuple NewvarNode NullException Nullable Number ObjectIdDict OrdinalRange OutOfMemoryError OverflowError Pair ParseError PartialQuickSort PermutedDimsArray Pipe PollingFileWatcher ProcessExitedException Ptr QuoteNode RandomDevice Range RangeIndex Rational RawFD ReadOnlyMemoryError Real ReentrantLock Ref Regex RegexMatch RemoteChannel RemoteException RevString RoundingMode RowVector SSAValue SegmentationFault SerializationState Set SharedArray SharedMatrix SharedVector Signed SimpleVector Slot SlotNumber SparseMatrixCSC SparseVector StackFrame StackOverflowError StackTrace StepRange StepRangeLen StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubString SymTridiagonal Symbol Symmetric SystemError TCPSocket Task Text TextDisplay Timer Tridiagonal Tuple Type TypeError TypeMapEntry TypeMapLevel TypeName TypeVar TypedSlot UDPSocket UInt UInt128 UInt16 UInt32 UInt64 UInt8 UndefRefError UndefVarError UnicodeError UniformScaling Union UnionAll UnitRange Unsigned UpperTriangular Val Vararg VecElement VecOrMat Vector VersionNumber Void WeakKeyDict WeakRef WorkerConfig WorkerPool "},t="[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*",a={l:t,k:r,i:/<\//},n={cN:"subst",b:/\$\(/,e:/\)/,k:r},o={cN:"variable",b:"\\$"+t},i={cN:"string",c:[e.BE,n,o],v:[{b:/\w*"""/,e:/"""\w*/,relevance:10},{b:/\w*"/,e:/"\w*/}]},l={cN:"string",c:[e.BE,n,o],b:"`",e:"`"},c={cN:"meta",b:"@"+t};return a.c=[{cN:"number",b:/(\b0x[\d_]*(\.[\d_]*)?|0x\.\d[\d_]*)p[-+]?\d+|\b0[box][a-fA-F0-9][a-fA-F0-9_]*|(\b\d[\d_]*(\.[\d_]*)?|\.\d[\d_]*)([eEfF][-+]?\d+)?/,relevance:0},{cN:"string",b:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},i,l,c,{cN:"comment",v:[{b:"#=",e:"=#",relevance:10},{b:"#",e:"$"}]},e.HCM,{cN:"keyword",b:"\\b(((abstract|primitive)\\s+)type|(mutable\\s+)?struct)\\b"},{b:/<:/}],n.c=a.c,a});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/kotlin.min.js b/vendor/assets/javascripts/highlightjs/languages/kotlin.min.js
index 0dd71d7a53..ab9e3742bb 100644
--- a/vendor/assets/javascripts/highlightjs/languages/kotlin.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/kotlin.min.js
@@ -1 +1 @@
-hljs.registerLanguage("kotlin",function(){"use strict";return function(e){var n={keyword:"abstract as val var vararg get set class object open private protected public noinline crossinline dynamic final enum if else do while for when throw try catch finally import package is in fun override companion reified inline lateinit init interface annotation data sealed internal infix operator out by constructor super tailrec where const inner suspend typealias external expect actual trait volatile transient native default",built_in:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",literal:"true false null"},a={className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"@"},i={className:"subst",begin:"\\${",end:"}",contains:[e.C_NUMBER_MODE]},s={className:"variable",begin:"\\$"+e.UNDERSCORE_IDENT_RE},t={className:"string",variants:[{begin:'"""',end:'"""(?=[^"])',contains:[s,i]},{begin:"'",end:"'",illegal:/\n/,contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"',illegal:/\n/,contains:[e.BACKSLASH_ESCAPE,s,i]}]};i.contains.push(t);var r={className:"meta",begin:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UNDERSCORE_IDENT_RE+")?"},l={className:"meta",begin:"@"+e.UNDERSCORE_IDENT_RE,contains:[{begin:/\(/,end:/\)/,contains:[e.inherit(t,{className:"meta-string"})]}]},c=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),o={variants:[{className:"type",begin:e.UNDERSCORE_IDENT_RE},{begin:/\(/,end:/\)/,contains:[]}]},d=o;return d.variants[1].contains=[o],o.variants[1].contains=[d],{name:"Kotlin",aliases:["kt"],keywords:n,contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{className:"doctag",begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,c,{className:"keyword",begin:/\b(break|continue|return|this)\b/,starts:{contains:[{className:"symbol",begin:/@\w+/}]}},a,r,l,{className:"function",beginKeywords:"fun",end:"[(]|$",returnBegin:!0,excludeEnd:!0,keywords:n,illegal:/fun\s+(<.*>)?[^\s\(]+(\s+[^\s\(]+)\s*=/,relevance:5,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"type",begin:/</,end:/>/,keywords:"reified",relevance:0},{className:"params",begin:/\(/,end:/\)/,endsParent:!0,keywords:n,relevance:0,contains:[{begin:/:/,end:/[=,\/]/,endsWithParent:!0,contains:[o,e.C_LINE_COMMENT_MODE,c],relevance:0},e.C_LINE_COMMENT_MODE,c,r,l,t,e.C_NUMBER_MODE]},c]},{className:"class",beginKeywords:"class interface trait",end:/[:\{(]|$/,excludeEnd:!0,illegal:"extends implements",contains:[{beginKeywords:"public protected internal private constructor"},e.UNDERSCORE_TITLE_MODE,{className:"type",begin:/</,end:/>/,excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:/[,:]\s*/,end:/[<\(,]|$/,excludeBegin:!0,returnEnd:!0},r,l]},t,{className:"meta",begin:"^#!/usr/bin/env",end:"$",illegal:"\n"},{className:"number",begin:"\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",relevance:0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("kotlin",function(e){var t={keyword:"abstract as val var vararg get set class object open private protected public noinline crossinline dynamic final enum if else do while for when throw try catch finally import package is in fun override companion reified inline lateinit init interface annotation data sealed internal infix operator out by constructor super tailrec where const inner suspend typealias external expect actual trait volatile transient native default",built_in:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",literal:"true false null"},a={cN:"symbol",b:e.UIR+"@"},n={cN:"subst",b:"\\${",e:"}",c:[e.CNM]},c={cN:"variable",b:"\\$"+e.UIR},r={cN:"string",v:[{b:'"""',e:'"""(?=[^"])',c:[c,n]},{b:"'",e:"'",i:/\n/,c:[e.BE]},{b:'"',e:'"',i:/\n/,c:[e.BE,c,n]}]};n.c.push(r);var i={cN:"meta",b:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UIR+")?"},l={cN:"meta",b:"@"+e.UIR,c:[{b:/\(/,e:/\)/,c:[e.inherit(r,{cN:"meta-string"})]}]},s={cN:"number",b:"\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",relevance:0},b=e.C("/\\*","\\*/",{c:[e.CBCM]}),o={v:[{cN:"type",b:e.UIR},{b:/\(/,e:/\)/,c:[]}]},d=o;return d.v[1].c=[o],o.v[1].c=[d],{aliases:["kt"],k:t,c:[e.C("/\\*\\*","\\*/",{relevance:0,c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,b,{cN:"keyword",b:/\b(break|continue|return|this)\b/,starts:{c:[{cN:"symbol",b:/@\w+/}]}},a,i,l,{cN:"function",bK:"fun",e:"[(]|$",rB:!0,eE:!0,k:t,i:/fun\s+(<.*>)?[^\s\(]+(\s+[^\s\(]+)\s*=/,relevance:5,c:[{b:e.UIR+"\\s*\\(",rB:!0,relevance:0,c:[e.UTM]},{cN:"type",b:/</,e:/>/,k:"reified",relevance:0},{cN:"params",b:/\(/,e:/\)/,endsParent:!0,k:t,relevance:0,c:[{b:/:/,e:/[=,\/]/,eW:!0,c:[o,e.CLCM,b],relevance:0},e.CLCM,b,i,l,r,e.CNM]},b]},{cN:"class",bK:"class interface trait",e:/[:\{(]|$/,eE:!0,i:"extends implements",c:[{bK:"public protected internal private constructor"},e.UTM,{cN:"type",b:/</,e:/>/,eB:!0,eE:!0,relevance:0},{cN:"type",b:/[,:]\s*/,e:/[<\(,]|$/,eB:!0,rE:!0},i,l]},r,{cN:"meta",b:"^#!/usr/bin/env",e:"$",i:"\n"},s]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/lasso.min.js b/vendor/assets/javascripts/highlightjs/languages/lasso.min.js
index c6c4aac7c7..3e2fcbf5db 100644
--- a/vendor/assets/javascripts/highlightjs/languages/lasso.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/lasso.min.js
@@ -1 +1 @@
-hljs.registerLanguage("lasso",function(){"use strict";return function(e){var a="\\]|\\?>",n={$pattern:"[a-zA-Z_][\\w.]*|&[lg]t;",literal:"true false none minimal full all void and or not bw nbw ew new cn ncn lt lte gt gte eq neq rx nrx ft",built_in:"array date decimal duration integer map pair string tag xml null boolean bytes keyword list locale queue set stack staticarray local var variable global data self inherited currentcapture givenblock",keyword:"cache database_names database_schemanames database_tablenames define_tag define_type email_batch encode_set html_comment handle handle_error header if inline iterate ljax_target link link_currentaction link_currentgroup link_currentrecord link_detail link_firstgroup link_firstrecord link_lastgroup link_lastrecord link_nextgroup link_nextrecord link_prevgroup link_prevrecord log loop namespace_using output_none portal private protect records referer referrer repeating resultset rows search_args search_arguments select sort_args sort_arguments thread_atomic value_list while abort case else fail_if fail_ifnot fail if_empty if_false if_null if_true loop_abort loop_continue loop_count params params_up return return_value run_children soap_definetag soap_lastrequest soap_lastresponse tag_name ascending average by define descending do equals frozen group handle_failure import in into join let match max min on order parent protected provide public require returnhome skip split_thread sum take thread to trait type where with yield yieldhome"},r=e.COMMENT("\x3c!--","--\x3e",{relevance:0}),t={className:"meta",begin:"\\[noprocess\\]",starts:{end:"\\[/noprocess\\]",returnEnd:!0,contains:[r]}},s={className:"meta",begin:"\\[/noprocess|<\\?(lasso(script)?|=)"},i=[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.inherit(e.C_NUMBER_MODE,{begin:e.C_NUMBER_RE+"|(-?infinity|NaN)\\b"}),e.inherit(e.APOS_STRING_MODE,{illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),{className:"string",begin:"`",end:"`"},{variants:[{begin:"[#$][a-zA-Z_][\\w.]*"},{begin:"#",end:"\\d+",illegal:"\\W"}]},{className:"type",begin:"::\\s*",end:"[a-zA-Z_][\\w.]*",illegal:"\\W"},{className:"params",variants:[{begin:"-(?!infinity)[a-zA-Z_][\\w.]*",relevance:0},{begin:"(\\.\\.\\.)"}]},{begin:/(->|\.)\s*/,relevance:0,contains:[{className:"symbol",begin:"'[a-zA-Z_][\\w.]*'"}]},{className:"class",beginKeywords:"define",returnEnd:!0,end:"\\(|=>",contains:[e.inherit(e.TITLE_MODE,{begin:"[a-zA-Z_][\\w.]*(=(?!>))?|[-+*/%](?!>)"})]}];return{name:"Lasso",aliases:["ls","lassoscript"],case_insensitive:!0,keywords:n,contains:[{className:"meta",begin:a,relevance:0,starts:{end:"\\[|<\\?(lasso(script)?|=)",returnEnd:!0,relevance:0,contains:[r]}},t,s,{className:"meta",begin:"\\[no_square_brackets",starts:{end:"\\[/no_square_brackets\\]",keywords:n,contains:[{className:"meta",begin:a,relevance:0,starts:{end:"\\[noprocess\\]|<\\?(lasso(script)?|=)",returnEnd:!0,contains:[r]}},t,s].concat(i)}},{className:"meta",begin:"\\[",relevance:0},{className:"meta",begin:"^#!",end:"lasso9$",relevance:10}].concat(i)}}}());
\ No newline at end of file
+hljs.registerLanguage("lasso",function(e){var r="[a-zA-Z_][\\w.]*",a="<\\?(lasso(script)?|=)",t="\\]|\\?>",n={literal:"true false none minimal full all void and or not bw nbw ew new cn ncn lt lte gt gte eq neq rx nrx ft",built_in:"array date decimal duration integer map pair string tag xml null boolean bytes keyword list locale queue set stack staticarray local var variable global data self inherited currentcapture givenblock",keyword:"cache database_names database_schemanames database_tablenames define_tag define_type email_batch encode_set html_comment handle handle_error header if inline iterate ljax_target link link_currentaction link_currentgroup link_currentrecord link_detail link_firstgroup link_firstrecord link_lastgroup link_lastrecord link_nextgroup link_nextrecord link_prevgroup link_prevrecord log loop namespace_using output_none portal private protect records referer referrer repeating resultset rows search_args search_arguments select sort_args sort_arguments thread_atomic value_list while abort case else fail_if fail_ifnot fail if_empty if_false if_null if_true loop_abort loop_continue loop_count params params_up return return_value run_children soap_definetag soap_lastrequest soap_lastresponse tag_name ascending average by define descending do equals frozen group handle_failure import in into join let match max min on order parent protected provide public require returnhome skip split_thread sum take thread to trait type where with yield yieldhome"},l=e.C("\x3c!--","--\x3e",{relevance:0}),i={cN:"meta",b:"\\[noprocess\\]",starts:{e:"\\[/noprocess\\]",rE:!0,c:[l]}},s={cN:"meta",b:"\\[/noprocess|"+a},o={cN:"symbol",b:"'"+r+"'"},c=[e.CLCM,e.CBCM,e.inherit(e.CNM,{b:e.CNR+"|(-?infinity|NaN)\\b"}),e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null}),{cN:"string",b:"`",e:"`"},{v:[{b:"[#$]"+r},{b:"#",e:"\\d+",i:"\\W"}]},{cN:"type",b:"::\\s*",e:r,i:"\\W"},{cN:"params",v:[{b:"-(?!infinity)"+r,relevance:0},{b:"(\\.\\.\\.)"}]},{b:/(->|\.)\s*/,relevance:0,c:[o]},{cN:"class",bK:"define",rE:!0,e:"\\(|=>",c:[e.inherit(e.TM,{b:r+"(=(?!>))?|[-+*/%](?!>)"})]}];return{aliases:["ls","lassoscript"],cI:!0,l:r+"|&[lg]t;",k:n,c:[{cN:"meta",b:t,relevance:0,starts:{e:"\\[|"+a,rE:!0,relevance:0,c:[l]}},i,s,{cN:"meta",b:"\\[no_square_brackets",starts:{e:"\\[/no_square_brackets\\]",l:r+"|&[lg]t;",k:n,c:[{cN:"meta",b:t,relevance:0,starts:{e:"\\[noprocess\\]|"+a,rE:!0,c:[l]}},i,s].concat(c)}},{cN:"meta",b:"\\[",relevance:0},{cN:"meta",b:"^#!",e:"lasso9$",relevance:10}].concat(c)}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ldif.min.js b/vendor/assets/javascripts/highlightjs/languages/ldif.min.js
index 7f4fff9f0e..209a715921 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ldif.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ldif.min.js
@@ -1 +1 @@
-hljs.registerLanguage("ldif",function(){"use strict";return function(e){return{name:"LDIF",contains:[{className:"attribute",begin:"^dn",end:": ",excludeEnd:!0,starts:{end:"$",relevance:0},relevance:10},{className:"attribute",begin:"^\\w",end:": ",excludeEnd:!0,starts:{end:"$",relevance:0}},{className:"literal",begin:"^-",end:"$"},e.HASH_COMMENT_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("ldif",function(e){return{c:[{cN:"attribute",b:"^dn",e:": ",eE:!0,starts:{e:"$",relevance:0},relevance:10},{cN:"attribute",b:"^\\w",e:": ",eE:!0,starts:{e:"$",relevance:0}},{cN:"literal",b:"^-",e:"$"},e.HCM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/leaf.min.js b/vendor/assets/javascripts/highlightjs/languages/leaf.min.js
index 36c2625447..b75f1048b8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/leaf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/leaf.min.js
@@ -1 +1 @@
-hljs.registerLanguage("leaf",function(){"use strict";return function(e){return{name:"Leaf",contains:[{className:"function",begin:"#+[A-Za-z_0-9]*\\(",end:" {",returnBegin:!0,excludeEnd:!0,contains:[{className:"keyword",begin:"#+"},{className:"title",begin:"[A-Za-z_][A-Za-z_0-9]*"},{className:"params",begin:"\\(",end:"\\)",endsParent:!0,contains:[{className:"string",begin:'"',end:'"'},{className:"variable",begin:"[A-Za-z_][A-Za-z_0-9]*"}]}]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("leaf",function(e){return{c:[{cN:"function",b:"#+[A-Za-z_0-9]*\\(",e:" {",rB:!0,eE:!0,c:[{cN:"keyword",b:"#+"},{cN:"title",b:"[A-Za-z_][A-Za-z_0-9]*"},{cN:"params",b:"\\(",e:"\\)",endsParent:!0,c:[{cN:"string",b:'"',e:'"'},{cN:"variable",b:"[A-Za-z_][A-Za-z_0-9]*"}]}]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/less.min.js b/vendor/assets/javascripts/highlightjs/languages/less.min.js
index 878011f1cd..d2789cf53b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/less.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/less.min.js
@@ -1 +1 @@
-hljs.registerLanguage("less",function(){"use strict";return function(e){var n=[],a=[],s=function(e){return{className:"string",begin:"~?"+e+".*?"+e}},t=function(e,n,a){return{className:e,begin:n,relevance:a}},r={begin:"\\(",end:"\\)",contains:a,relevance:0};a.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s("'"),s('"'),e.CSS_NUMBER_MODE,{begin:"(url|data-uri)\\(",starts:{className:"string",end:"[\\)\\n]",excludeEnd:!0}},t("number","#[0-9A-Fa-f]+\\b"),r,t("variable","@@?[\\w-]+",10),t("variable","@{[\\w-]+}"),t("built_in","~?`[^`]*?`"),{className:"attribute",begin:"[\\w-]+\\s*:",end:":",returnBegin:!0,excludeEnd:!0},{className:"meta",begin:"!important"});var i=a.concat({begin:"{",end:"}",contains:n}),c={beginKeywords:"when",endsWithParent:!0,contains:[{beginKeywords:"and not"}].concat(a)},l={begin:"([\\w-]+|@{[\\w-]+})\\s*:",returnBegin:!0,end:"[;}]",relevance:0,contains:[{className:"attribute",begin:"([\\w-]+|@{[\\w-]+})",end:":",excludeEnd:!0,starts:{endsWithParent:!0,illegal:"[<=$]",relevance:0,contains:a}}]},o={className:"keyword",begin:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",starts:{end:"[;{}]",returnEnd:!0,contains:a,relevance:0}},g={className:"variable",variants:[{begin:"@[\\w-]+\\s*:",relevance:15},{begin:"@[\\w-]+"}],starts:{end:"[;}]",returnEnd:!0,contains:i}},d={variants:[{begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:"([\\w-]+|@{[\\w-]+})",end:"{"}],returnBegin:!0,returnEnd:!0,illegal:"[<='$\"]",relevance:0,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,c,t("keyword","all\\b"),t("variable","@{[\\w-]+}"),t("selector-tag","([\\w-]+|@{[\\w-]+})%?",0),t("selector-id","#([\\w-]+|@{[\\w-]+})"),t("selector-class","\\.([\\w-]+|@{[\\w-]+})",0),t("selector-tag","&",0),{className:"selector-attr",begin:"\\[",end:"\\]"},{className:"selector-pseudo",begin:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{begin:"\\(",end:"\\)",contains:i},{begin:"!important"}]};return n.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,o,g,l,d),{name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:n}}}());
\ No newline at end of file
+hljs.registerLanguage("less",function(e){function r(e){return{cN:"string",b:"~?"+e+".*?"+e}}function t(e,r,t){return{cN:e,b:r,relevance:t}}var a="[\\w-]+",c="("+a+"|@{"+a+"})",s=[],n=[],b={b:"\\(",e:"\\)",c:n,relevance:0};n.push(e.CLCM,e.CBCM,r("'"),r('"'),e.CSSNM,{b:"(url|data-uri)\\(",starts:{cN:"string",e:"[\\)\\n]",eE:!0}},t("number","#[0-9A-Fa-f]+\\b"),b,t("variable","@@?"+a,10),t("variable","@{"+a+"}"),t("built_in","~?`[^`]*?`"),{cN:"attribute",b:a+"\\s*:",e:":",rB:!0,eE:!0},{cN:"meta",b:"!important"});var i=n.concat({b:"{",e:"}",c:s}),l={bK:"when",eW:!0,c:[{bK:"and not"}].concat(n)},o={b:c+"\\s*:",rB:!0,e:"[;}]",relevance:0,c:[{cN:"attribute",b:c,e:":",eE:!0,starts:{eW:!0,i:"[<=$]",relevance:0,c:n}}]},u={cN:"keyword",b:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",starts:{e:"[;{}]",rE:!0,c:n,relevance:0}},v={cN:"variable",v:[{b:"@"+a+"\\s*:",relevance:15},{b:"@"+a}],starts:{e:"[;}]",rE:!0,c:i}},C={v:[{b:"[\\.#:&\\[>]",e:"[;{}]"},{b:c,e:"{"}],rB:!0,rE:!0,i:"[<='$\"]",relevance:0,c:[e.CLCM,e.CBCM,l,t("keyword","all\\b"),t("variable","@{"+a+"}"),t("selector-tag",c+"%?",0),t("selector-id","#"+c),t("selector-class","\\."+c,0),t("selector-tag","&",0),{cN:"selector-attr",b:"\\[",e:"\\]"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"\\(",e:"\\)",c:i},{b:"!important"}]};return s.push(e.CLCM,e.CBCM,u,v,o,C),{cI:!0,i:"[=>'/<($\"]",c:s}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/lisp.min.js b/vendor/assets/javascripts/highlightjs/languages/lisp.min.js
index 28a6668273..48ea5b8a25 100644
--- a/vendor/assets/javascripts/highlightjs/languages/lisp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/lisp.min.js
@@ -1 +1 @@
-hljs.registerLanguage("lisp",function(){"use strict";return function(e){var n="[a-zA-Z_\\-\\+\\*\\/\\<\\=\\>\\&\\#][a-zA-Z0-9_\\-\\+\\*\\/\\<\\=\\>\\&\\#!]*",i="(\\-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s|D|E|F|L|S)(\\+|\\-)?\\d+)?",a={className:"literal",begin:"\\b(t{1}|nil)\\b"},s={className:"number",variants:[{begin:i,relevance:0},{begin:"#(b|B)[0-1]+(/[0-1]+)?"},{begin:"#(o|O)[0-7]+(/[0-7]+)?"},{begin:"#(x|X)[0-9a-fA-F]+(/[0-9a-fA-F]+)?"},{begin:"#(c|C)\\("+i+" +"+i,end:"\\)"}]},b=e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),g=e.COMMENT(";","$",{relevance:0}),l={begin:"\\*",end:"\\*"},t={className:"symbol",begin:"[:&]"+n},r={begin:n,relevance:0},c={contains:[s,b,l,t,{begin:"\\(",end:"\\)",contains:["self",a,b,s,r]},r],variants:[{begin:"['`]\\(",end:"\\)"},{begin:"\\(quote ",end:"\\)",keywords:{name:"quote"}},{begin:"'\\|[^]*?\\|"}]},d={variants:[{begin:"'"+n},{begin:"#'"+n+"(::"+n+")*"}]},o={begin:"\\(\\s*",end:"\\)"},u={endsWithParent:!0,relevance:0};return o.contains=[{className:"name",variants:[{begin:n},{begin:"\\|[^]*?\\|"}]},u],u.contains=[c,d,o,a,s,b,g,l,t,{begin:"\\|[^]*?\\|"},r],{name:"Lisp",illegal:/\S/,contains:[s,e.SHEBANG(),a,b,g,c,d,o,r]}}}());
\ No newline at end of file
+hljs.registerLanguage("lisp",function(e){var b="[a-zA-Z_\\-\\+\\*\\/\\<\\=\\>\\&\\#][a-zA-Z0-9_\\-\\+\\*\\/\\<\\=\\>\\&\\#!]*",c="\\|[^]*?\\|",a="(\\-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s|D|E|F|L|S)(\\+|\\-)?\\d+)?",l={cN:"literal",b:"\\b(t{1}|nil)\\b"},n={cN:"number",v:[{b:a,relevance:0},{b:"#(b|B)[0-1]+(/[0-1]+)?"},{b:"#(o|O)[0-7]+(/[0-7]+)?"},{b:"#(x|X)[0-9a-fA-F]+(/[0-9a-fA-F]+)?"},{b:"#(c|C)\\("+a+" +"+a,e:"\\)"}]},r=e.inherit(e.QSM,{i:null}),i=e.C(";","$",{relevance:0}),t={b:"\\*",e:"\\*"},v={cN:"symbol",b:"[:&]"+b},s={b:b,relevance:0},u={b:c},d={c:[n,r,t,v,{b:"\\(",e:"\\)",c:["self",l,r,n,s]},s],v:[{b:"['`]\\(",e:"\\)"},{b:"\\(quote ",e:"\\)",k:{name:"quote"}},{b:"'"+c}]},f={v:[{b:"'"+b},{b:"#'"+b+"(::"+b+")*"}]},m={b:"\\(\\s*",e:"\\)"},o={eW:!0,relevance:0};return m.c=[{cN:"name",v:[{b:b},{b:c}]},o],o.c=[d,f,m,l,n,r,i,t,v,u,s],{i:/\S/,c:[n,{cN:"meta",b:"^#!",e:"$"},l,r,i,d,f,m,s]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/livecodeserver.min.js b/vendor/assets/javascripts/highlightjs/languages/livecodeserver.min.js
index cda2207a9b..af2c77d4e7 100644
--- a/vendor/assets/javascripts/highlightjs/languages/livecodeserver.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/livecodeserver.min.js
@@ -1 +1 @@
-hljs.registerLanguage("livecodeserver",function(){"use strict";return function(e){var r={className:"variable",variants:[{begin:"\\b([gtps][A-Z]{1}[a-zA-Z0-9]*)(\\[.+\\])?(?:\\s*?)"},{begin:"\\$_[A-Z]+"}],relevance:0},t=[e.C_BLOCK_COMMENT_MODE,e.HASH_COMMENT_MODE,e.COMMENT("--","$"),e.COMMENT("[^:]//","$")],a=e.inherit(e.TITLE_MODE,{variants:[{begin:"\\b_*rig[A-Z]+[A-Za-z0-9_\\-]*"},{begin:"\\b_[a-z0-9\\-]+"}]}),o=e.inherit(e.TITLE_MODE,{begin:"\\b([A-Za-z0-9_\\-]+)\\b"});return{name:"LiveCode",case_insensitive:!1,keywords:{keyword:"$_COOKIE $_FILES $_GET $_GET_BINARY $_GET_RAW $_POST $_POST_BINARY $_POST_RAW $_SESSION $_SERVER codepoint codepoints segment segments codeunit codeunits sentence sentences trueWord trueWords paragraph after byte bytes english the until http forever descending using line real8 with seventh for stdout finally element word words fourth before black ninth sixth characters chars stderr uInt1 uInt1s uInt2 uInt2s stdin string lines relative rel any fifth items from middle mid at else of catch then third it file milliseconds seconds second secs sec int1 int1s int4 int4s internet int2 int2s normal text item last long detailed effective uInt4 uInt4s repeat end repeat URL in try into switch to words https token binfile each tenth as ticks tick system real4 by dateItems without char character ascending eighth whole dateTime numeric short first ftp integer abbreviated abbr abbrev private case while if div mod wrap and or bitAnd bitNot bitOr bitXor among not in a an within contains ends with begins the keys of keys",literal:"SIX TEN FORMFEED NINE ZERO NONE SPACE FOUR FALSE COLON CRLF PI COMMA ENDOFFILE EOF EIGHT FIVE QUOTE EMPTY ONE TRUE RETURN CR LINEFEED RIGHT BACKSLASH NULL SEVEN TAB THREE TWO six ten formfeed nine zero none space four false colon crlf pi comma endoffile eof eight five quote empty one true return cr linefeed right backslash null seven tab three two RIVERSION RISTATE FILE_READ_MODE FILE_WRITE_MODE FILE_WRITE_MODE DIR_WRITE_MODE FILE_READ_UMASK FILE_WRITE_UMASK DIR_READ_UMASK DIR_WRITE_UMASK",built_in:"put abs acos aliasReference annuity arrayDecode arrayEncode asin atan atan2 average avg avgDev base64Decode base64Encode baseConvert binaryDecode binaryEncode byteOffset byteToNum cachedURL cachedURLs charToNum cipherNames codepointOffset codepointProperty codepointToNum codeunitOffset commandNames compound compress constantNames cos date dateFormat decompress difference directories diskSpace DNSServers exp exp1 exp2 exp10 extents files flushEvents folders format functionNames geometricMean global globals hasMemory harmonicMean hostAddress hostAddressToName hostName hostNameToAddress isNumber ISOToMac itemOffset keys len length libURLErrorData libUrlFormData libURLftpCommand libURLLastHTTPHeaders libURLLastRHHeaders libUrlMultipartFormAddPart libUrlMultipartFormData libURLVersion lineOffset ln ln1 localNames log log2 log10 longFilePath lower macToISO matchChunk matchText matrixMultiply max md5Digest median merge messageAuthenticationCode messageDigest millisec millisecs millisecond milliseconds min monthNames nativeCharToNum normalizeText num number numToByte numToChar numToCodepoint numToNativeChar offset open openfiles openProcesses openProcessIDs openSockets paragraphOffset paramCount param params peerAddress pendingMessages platform popStdDev populationStandardDeviation populationVariance popVariance processID random randomBytes replaceText result revCreateXMLTree revCreateXMLTreeFromFile revCurrentRecord revCurrentRecordIsFirst revCurrentRecordIsLast revDatabaseColumnCount revDatabaseColumnIsNull revDatabaseColumnLengths revDatabaseColumnNames revDatabaseColumnNamed revDatabaseColumnNumbered revDatabaseColumnTypes revDatabaseConnectResult revDatabaseCursors revDatabaseID revDatabaseTableNames revDatabaseType revDataFromQuery revdb_closeCursor revdb_columnbynumber revdb_columncount revdb_columnisnull revdb_columnlengths revdb_columnnames revdb_columntypes revdb_commit revdb_connect revdb_connections revdb_connectionerr revdb_currentrecord revdb_cursorconnection revdb_cursorerr revdb_cursors revdb_dbtype revdb_disconnect revdb_execute revdb_iseof revdb_isbof revdb_movefirst revdb_movelast revdb_movenext revdb_moveprev revdb_query revdb_querylist revdb_recordcount revdb_rollback revdb_tablenames revGetDatabaseDriverPath revNumberOfRecords revOpenDatabase revOpenDatabases revQueryDatabase revQueryDatabaseBlob revQueryResult revQueryIsAtStart revQueryIsAtEnd revUnixFromMacPath revXMLAttribute revXMLAttributes revXMLAttributeValues revXMLChildContents revXMLChildNames revXMLCreateTreeFromFileWithNamespaces revXMLCreateTreeWithNamespaces revXMLDataFromXPathQuery revXMLEvaluateXPath revXMLFirstChild revXMLMatchingNode revXMLNextSibling revXMLNodeContents revXMLNumberOfChildren revXMLParent revXMLPreviousSibling revXMLRootNode revXMLRPC_CreateRequest revXMLRPC_Documents revXMLRPC_Error revXMLRPC_GetHost revXMLRPC_GetMethod revXMLRPC_GetParam revXMLText revXMLRPC_Execute revXMLRPC_GetParamCount revXMLRPC_GetParamNode revXMLRPC_GetParamType revXMLRPC_GetPath revXMLRPC_GetPort revXMLRPC_GetProtocol revXMLRPC_GetRequest revXMLRPC_GetResponse revXMLRPC_GetSocket revXMLTree revXMLTrees revXMLValidateDTD revZipDescribeItem revZipEnumerateItems revZipOpenArchives round sampVariance sec secs seconds sentenceOffset sha1Digest shell shortFilePath sin specialFolderPath sqrt standardDeviation statRound stdDev sum sysError systemVersion tan tempName textDecode textEncode tick ticks time to tokenOffset toLower toUpper transpose truewordOffset trunc uniDecode uniEncode upper URLDecode URLEncode URLStatus uuid value variableNames variance version waitDepth weekdayNames wordOffset xsltApplyStylesheet xsltApplyStylesheetFromFile xsltLoadStylesheet xsltLoadStylesheetFromFile add breakpoint cancel clear local variable file word line folder directory URL close socket process combine constant convert create new alias folder directory decrypt delete variable word line folder directory URL dispatch divide do encrypt filter get include intersect kill libURLDownloadToFile libURLFollowHttpRedirects libURLftpUpload libURLftpUploadFile libURLresetAll libUrlSetAuthCallback libURLSetDriver libURLSetCustomHTTPHeaders libUrlSetExpect100 libURLSetFTPListCommand libURLSetFTPMode libURLSetFTPStopTime libURLSetStatusCallback load extension loadedExtensions multiply socket prepare process post seek rel relative read from process rename replace require resetAll resolve revAddXMLNode revAppendXML revCloseCursor revCloseDatabase revCommitDatabase revCopyFile revCopyFolder revCopyXMLNode revDeleteFolder revDeleteXMLNode revDeleteAllXMLTrees revDeleteXMLTree revExecuteSQL revGoURL revInsertXMLNode revMoveFolder revMoveToFirstRecord revMoveToLastRecord revMoveToNextRecord revMoveToPreviousRecord revMoveToRecord revMoveXMLNode revPutIntoXMLNode revRollBackDatabase revSetDatabaseDriverPath revSetXMLAttribute revXMLRPC_AddParam revXMLRPC_DeleteAllDocuments revXMLAddDTD revXMLRPC_Free revXMLRPC_FreeAll revXMLRPC_DeleteDocument revXMLRPC_DeleteParam revXMLRPC_SetHost revXMLRPC_SetMethod revXMLRPC_SetPort revXMLRPC_SetProtocol revXMLRPC_SetSocket revZipAddItemWithData revZipAddItemWithFile revZipAddUncompressedItemWithData revZipAddUncompressedItemWithFile revZipCancel revZipCloseArchive revZipDeleteItem revZipExtractItemToFile revZipExtractItemToVariable revZipSetProgressCallback revZipRenameItem revZipReplaceItemWithData revZipReplaceItemWithFile revZipOpenArchive send set sort split start stop subtract symmetric union unload vectorDotProduct wait write"},contains:[r,{className:"keyword",begin:"\\bend\\sif\\b"},{className:"function",beginKeywords:"function",end:"$",contains:[r,o,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE,a]},{className:"function",begin:"\\bend\\s+",end:"$",keywords:"end",contains:[o,a],relevance:0},{beginKeywords:"command on",end:"$",contains:[r,o,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE,a]},{className:"meta",variants:[{begin:"<\\?(rev|lc|livecode)",relevance:10},{begin:"<\\?"},{begin:"\\?>"}]},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE,a].concat(t),illegal:";$|^\\[|^=|&|{"}}}());
\ No newline at end of file
+hljs.registerLanguage("livecodeserver",function(e){var r={cN:"variable",v:[{b:"\\b([gtps][A-Z]{1}[a-zA-Z0-9]*)(\\[.+\\])?(?:\\s*?)"},{b:"\\$_[A-Z]+"}],relevance:0},t=[e.CBCM,e.HCM,e.C("--","$"),e.C("[^:]//","$")],a=e.inherit(e.TM,{v:[{b:"\\b_*rig[A-Z]+[A-Za-z0-9_\\-]*"},{b:"\\b_[a-z0-9\\-]+"}]}),o=e.inherit(e.TM,{b:"\\b([A-Za-z0-9_\\-]+)\\b"});return{cI:!1,k:{keyword:"$_COOKIE $_FILES $_GET $_GET_BINARY $_GET_RAW $_POST $_POST_BINARY $_POST_RAW $_SESSION $_SERVER codepoint codepoints segment segments codeunit codeunits sentence sentences trueWord trueWords paragraph after byte bytes english the until http forever descending using line real8 with seventh for stdout finally element word words fourth before black ninth sixth characters chars stderr uInt1 uInt1s uInt2 uInt2s stdin string lines relative rel any fifth items from middle mid at else of catch then third it file milliseconds seconds second secs sec int1 int1s int4 int4s internet int2 int2s normal text item last long detailed effective uInt4 uInt4s repeat end repeat URL in try into switch to words https token binfile each tenth as ticks tick system real4 by dateItems without char character ascending eighth whole dateTime numeric short first ftp integer abbreviated abbr abbrev private case while if div mod wrap and or bitAnd bitNot bitOr bitXor among not in a an within contains ends with begins the keys of keys",literal:"SIX TEN FORMFEED NINE ZERO NONE SPACE FOUR FALSE COLON CRLF PI COMMA ENDOFFILE EOF EIGHT FIVE QUOTE EMPTY ONE TRUE RETURN CR LINEFEED RIGHT BACKSLASH NULL SEVEN TAB THREE TWO six ten formfeed nine zero none space four false colon crlf pi comma endoffile eof eight five quote empty one true return cr linefeed right backslash null seven tab three two RIVERSION RISTATE FILE_READ_MODE FILE_WRITE_MODE FILE_WRITE_MODE DIR_WRITE_MODE FILE_READ_UMASK FILE_WRITE_UMASK DIR_READ_UMASK DIR_WRITE_UMASK",built_in:"put abs acos aliasReference annuity arrayDecode arrayEncode asin atan atan2 average avg avgDev base64Decode base64Encode baseConvert binaryDecode binaryEncode byteOffset byteToNum cachedURL cachedURLs charToNum cipherNames codepointOffset codepointProperty codepointToNum codeunitOffset commandNames compound compress constantNames cos date dateFormat decompress difference directories diskSpace DNSServers exp exp1 exp2 exp10 extents files flushEvents folders format functionNames geometricMean global globals hasMemory harmonicMean hostAddress hostAddressToName hostName hostNameToAddress isNumber ISOToMac itemOffset keys len length libURLErrorData libUrlFormData libURLftpCommand libURLLastHTTPHeaders libURLLastRHHeaders libUrlMultipartFormAddPart libUrlMultipartFormData libURLVersion lineOffset ln ln1 localNames log log2 log10 longFilePath lower macToISO matchChunk matchText matrixMultiply max md5Digest median merge messageAuthenticationCode messageDigest millisec millisecs millisecond milliseconds min monthNames nativeCharToNum normalizeText num number numToByte numToChar numToCodepoint numToNativeChar offset open openfiles openProcesses openProcessIDs openSockets paragraphOffset paramCount param params peerAddress pendingMessages platform popStdDev populationStandardDeviation populationVariance popVariance processID random randomBytes replaceText result revCreateXMLTree revCreateXMLTreeFromFile revCurrentRecord revCurrentRecordIsFirst revCurrentRecordIsLast revDatabaseColumnCount revDatabaseColumnIsNull revDatabaseColumnLengths revDatabaseColumnNames revDatabaseColumnNamed revDatabaseColumnNumbered revDatabaseColumnTypes revDatabaseConnectResult revDatabaseCursors revDatabaseID revDatabaseTableNames revDatabaseType revDataFromQuery revdb_closeCursor revdb_columnbynumber revdb_columncount revdb_columnisnull revdb_columnlengths revdb_columnnames revdb_columntypes revdb_commit revdb_connect revdb_connections revdb_connectionerr revdb_currentrecord revdb_cursorconnection revdb_cursorerr revdb_cursors revdb_dbtype revdb_disconnect revdb_execute revdb_iseof revdb_isbof revdb_movefirst revdb_movelast revdb_movenext revdb_moveprev revdb_query revdb_querylist revdb_recordcount revdb_rollback revdb_tablenames revGetDatabaseDriverPath revNumberOfRecords revOpenDatabase revOpenDatabases revQueryDatabase revQueryDatabaseBlob revQueryResult revQueryIsAtStart revQueryIsAtEnd revUnixFromMacPath revXMLAttribute revXMLAttributes revXMLAttributeValues revXMLChildContents revXMLChildNames revXMLCreateTreeFromFileWithNamespaces revXMLCreateTreeWithNamespaces revXMLDataFromXPathQuery revXMLEvaluateXPath revXMLFirstChild revXMLMatchingNode revXMLNextSibling revXMLNodeContents revXMLNumberOfChildren revXMLParent revXMLPreviousSibling revXMLRootNode revXMLRPC_CreateRequest revXMLRPC_Documents revXMLRPC_Error revXMLRPC_GetHost revXMLRPC_GetMethod revXMLRPC_GetParam revXMLText revXMLRPC_Execute revXMLRPC_GetParamCount revXMLRPC_GetParamNode revXMLRPC_GetParamType revXMLRPC_GetPath revXMLRPC_GetPort revXMLRPC_GetProtocol revXMLRPC_GetRequest revXMLRPC_GetResponse revXMLRPC_GetSocket revXMLTree revXMLTrees revXMLValidateDTD revZipDescribeItem revZipEnumerateItems revZipOpenArchives round sampVariance sec secs seconds sentenceOffset sha1Digest shell shortFilePath sin specialFolderPath sqrt standardDeviation statRound stdDev sum sysError systemVersion tan tempName textDecode textEncode tick ticks time to tokenOffset toLower toUpper transpose truewordOffset trunc uniDecode uniEncode upper URLDecode URLEncode URLStatus uuid value variableNames variance version waitDepth weekdayNames wordOffset xsltApplyStylesheet xsltApplyStylesheetFromFile xsltLoadStylesheet xsltLoadStylesheetFromFile add breakpoint cancel clear local variable file word line folder directory URL close socket process combine constant convert create new alias folder directory decrypt delete variable word line folder directory URL dispatch divide do encrypt filter get include intersect kill libURLDownloadToFile libURLFollowHttpRedirects libURLftpUpload libURLftpUploadFile libURLresetAll libUrlSetAuthCallback libURLSetDriver libURLSetCustomHTTPHeaders libUrlSetExpect100 libURLSetFTPListCommand libURLSetFTPMode libURLSetFTPStopTime libURLSetStatusCallback load extension loadedExtensions multiply socket prepare process post seek rel relative read from process rename replace require resetAll resolve revAddXMLNode revAppendXML revCloseCursor revCloseDatabase revCommitDatabase revCopyFile revCopyFolder revCopyXMLNode revDeleteFolder revDeleteXMLNode revDeleteAllXMLTrees revDeleteXMLTree revExecuteSQL revGoURL revInsertXMLNode revMoveFolder revMoveToFirstRecord revMoveToLastRecord revMoveToNextRecord revMoveToPreviousRecord revMoveToRecord revMoveXMLNode revPutIntoXMLNode revRollBackDatabase revSetDatabaseDriverPath revSetXMLAttribute revXMLRPC_AddParam revXMLRPC_DeleteAllDocuments revXMLAddDTD revXMLRPC_Free revXMLRPC_FreeAll revXMLRPC_DeleteDocument revXMLRPC_DeleteParam revXMLRPC_SetHost revXMLRPC_SetMethod revXMLRPC_SetPort revXMLRPC_SetProtocol revXMLRPC_SetSocket revZipAddItemWithData revZipAddItemWithFile revZipAddUncompressedItemWithData revZipAddUncompressedItemWithFile revZipCancel revZipCloseArchive revZipDeleteItem revZipExtractItemToFile revZipExtractItemToVariable revZipSetProgressCallback revZipRenameItem revZipReplaceItemWithData revZipReplaceItemWithFile revZipOpenArchive send set sort split start stop subtract symmetric union unload vectorDotProduct wait write"},c:[r,{cN:"keyword",b:"\\bend\\sif\\b"},{cN:"function",bK:"function",e:"$",c:[r,o,e.ASM,e.QSM,e.BNM,e.CNM,a]},{cN:"function",b:"\\bend\\s+",e:"$",k:"end",c:[o,a],relevance:0},{bK:"command on",e:"$",c:[r,o,e.ASM,e.QSM,e.BNM,e.CNM,a]},{cN:"meta",v:[{b:"<\\?(rev|lc|livecode)",relevance:10},{b:"<\\?"},{b:"\\?>"}]},e.ASM,e.QSM,e.BNM,e.CNM,a].concat(t),i:";$|^\\[|^=|&|{"}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/livescript.min.js b/vendor/assets/javascripts/highlightjs/languages/livescript.min.js
index 9c8962db59..e0b9dba046 100644
--- a/vendor/assets/javascripts/highlightjs/languages/livescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/livescript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("livescript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);return function(t){var r={keyword:e.concat(["then","unless","until","loop","of","by","when","and","or","is","isnt","not","it","that","otherwise","from","to","til","fallthrough","case","enum","native","list","map","__hasProp","__extends","__slice","__bind","__indexOf"]).join(" "),literal:n.concat(["yes","no","on","off","it","that","void"]).join(" "),built_in:a.concat(["npm","print"]).join(" ")},i="[A-Za-z$_](?:-[0-9A-Za-z$_]|[0-9A-Za-z$_])*",s=t.inherit(t.TITLE_MODE,{begin:i}),o={className:"subst",begin:/#\{/,end:/}/,keywords:r},c={className:"subst",begin:/#[A-Za-z$_]/,end:/(?:\-[0-9A-Za-z$_]|[0-9A-Za-z$_])*/,keywords:r},l=[t.BINARY_NUMBER_MODE,{className:"number",begin:"(\\b0[xX][a-fA-F0-9_]+)|(\\b\\d(\\d|_\\d)*(\\.(\\d(\\d|_\\d)*)?)?(_*[eE]([-+]\\d(_\\d|\\d)*)?)?[_a-z]*)",relevance:0,starts:{end:"(\\s*/)?",relevance:0}},{className:"string",variants:[{begin:/'''/,end:/'''/,contains:[t.BACKSLASH_ESCAPE]},{begin:/'/,end:/'/,contains:[t.BACKSLASH_ESCAPE]},{begin:/"""/,end:/"""/,contains:[t.BACKSLASH_ESCAPE,o,c]},{begin:/"/,end:/"/,contains:[t.BACKSLASH_ESCAPE,o,c]},{begin:/\\/,end:/(\s|$)/,excludeEnd:!0}]},{className:"regexp",variants:[{begin:"//",end:"//[gim]*",contains:[o,t.HASH_COMMENT_MODE]},{begin:/\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W)/}]},{begin:"@"+i},{begin:"``",end:"``",excludeBegin:!0,excludeEnd:!0,subLanguage:"javascript"}];o.contains=l;var d={className:"params",begin:"\\(",returnBegin:!0,contains:[{begin:/\(/,end:/\)/,keywords:r,contains:["self"].concat(l)}]};return{name:"LiveScript",aliases:["ls"],keywords:r,illegal:/\/\*/,contains:l.concat([t.COMMENT("\\/\\*","\\*\\/"),t.HASH_COMMENT_MODE,{begin:"(#=>|=>|\\|>>|-?->|\\!->)"},{className:"function",contains:[s,d],returnBegin:!0,variants:[{begin:"("+i+"\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B\\->\\*?",end:"\\->\\*?"},{begin:"("+i+"\\s*(?:=|:=)\\s*)?!?(\\(.*\\))?\\s*\\B[-~]{1,2}>\\*?",end:"[-~]{1,2}>\\*?"},{begin:"("+i+"\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B!?[-~]{1,2}>\\*?",end:"!?[-~]{1,2}>\\*?"}]},{className:"class",beginKeywords:"class",end:"$",illegal:/[:="\[\]]/,contains:[{beginKeywords:"extends",endsWithParent:!0,illegal:/[:="\[\]]/,contains:[s]},s]},{begin:i+":",end:":",returnBegin:!0,returnEnd:!0,relevance:0}])}}}());
\ No newline at end of file
+hljs.registerLanguage("livescript",function(e){var t={keyword:"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger case default function var with then unless until loop of by when and or is isnt not it that otherwise from to til fallthrough super case default function var void const let enum export import native list map __hasProp __extends __slice __bind __indexOf",literal:"true false null undefined yes no on off it that void",built_in:"npm require console print module global window document"},s="[A-Za-z$_](?:-[0-9A-Za-z$_]|[0-9A-Za-z$_])*",n=e.inherit(e.TM,{b:s}),i={cN:"subst",b:/#\{/,e:/}/,k:t},a={cN:"subst",b:/#[A-Za-z$_]/,e:/(?:\-[0-9A-Za-z$_]|[0-9A-Za-z$_])*/,k:t},c=[e.BNM,{cN:"number",b:"(\\b0[xX][a-fA-F0-9_]+)|(\\b\\d(\\d|_\\d)*(\\.(\\d(\\d|_\\d)*)?)?(_*[eE]([-+]\\d(_\\d|\\d)*)?)?[_a-z]*)",relevance:0,starts:{e:"(\\s*/)?",relevance:0}},{cN:"string",v:[{b:/'''/,e:/'''/,c:[e.BE]},{b:/'/,e:/'/,c:[e.BE]},{b:/"""/,e:/"""/,c:[e.BE,i,a]},{b:/"/,e:/"/,c:[e.BE,i,a]},{b:/\\/,e:/(\s|$)/,eE:!0}]},{cN:"regexp",v:[{b:"//",e:"//[gim]*",c:[i,e.HCM]},{b:/\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W)/}]},{b:"@"+s},{b:"``",e:"``",eB:!0,eE:!0,sL:"javascript"}];i.c=c;var r={cN:"params",b:"\\(",rB:!0,c:[{b:/\(/,e:/\)/,k:t,c:["self"].concat(c)}]};return{aliases:["ls"],k:t,i:/\/\*/,c:c.concat([e.C("\\/\\*","\\*\\/"),e.HCM,{b:"(#=>|=>|\\|>>|-?->|\\!->)"},{cN:"function",c:[n,r],rB:!0,v:[{b:"("+s+"\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B\\->\\*?",e:"\\->\\*?"},{b:"("+s+"\\s*(?:=|:=)\\s*)?!?(\\(.*\\))?\\s*\\B[-~]{1,2}>\\*?",e:"[-~]{1,2}>\\*?"},{b:"("+s+"\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B!?[-~]{1,2}>\\*?",e:"!?[-~]{1,2}>\\*?"}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[n]},n]},{b:s+":",e:":",rB:!0,rE:!0,relevance:0}])}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/llvm.min.js b/vendor/assets/javascripts/highlightjs/languages/llvm.min.js
index 75ca9d2b42..961c904ac6 100644
--- a/vendor/assets/javascripts/highlightjs/languages/llvm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/llvm.min.js
@@ -1 +1 @@
-hljs.registerLanguage("llvm",function(){"use strict";return function(e){var n="([-a-zA-Z$._][\\w\\-$.]*)";return{name:"LLVM IR",keywords:"begin end true false declare define global constant private linker_private internal available_externally linkonce linkonce_odr weak weak_odr appending dllimport dllexport common default hidden protected extern_weak external thread_local zeroinitializer undef null to tail target triple datalayout volatile nuw nsw nnan ninf nsz arcp fast exact inbounds align addrspace section alias module asm sideeffect gc dbg linker_private_weak attributes blockaddress initialexec localdynamic localexec prefix unnamed_addr ccc fastcc coldcc x86_stdcallcc x86_fastcallcc arm_apcscc arm_aapcscc arm_aapcs_vfpcc ptx_device ptx_kernel intel_ocl_bicc msp430_intrcc spir_func spir_kernel x86_64_sysvcc x86_64_win64cc x86_thiscallcc cc c signext zeroext inreg sret nounwind noreturn noalias nocapture byval nest readnone readonly inlinehint noinline alwaysinline optsize ssp sspreq noredzone noimplicitfloat naked builtin cold nobuiltin noduplicate nonlazybind optnone returns_twice sanitize_address sanitize_memory sanitize_thread sspstrong uwtable returned type opaque eq ne slt sgt sle sge ult ugt ule uge oeq one olt ogt ole oge ord uno ueq une x acq_rel acquire alignstack atomic catch cleanup filter inteldialect max min monotonic nand personality release seq_cst singlethread umax umin unordered xchg add fadd sub fsub mul fmul udiv sdiv fdiv urem srem frem shl lshr ashr and or xor icmp fcmp phi call trunc zext sext fptrunc fpext uitofp sitofp fptoui fptosi inttoptr ptrtoint bitcast addrspacecast select va_arg ret br switch invoke unwind unreachable indirectbr landingpad resume malloc alloca free load store getelementptr extractelement insertelement shufflevector getresult extractvalue insertvalue atomicrmw cmpxchg fence argmemonly double",contains:[{className:"keyword",begin:"i\\d+"},e.COMMENT(";","\\n",{relevance:0}),e.QUOTE_STRING_MODE,{className:"string",variants:[{begin:'"',end:'[^\\\\]"'}],relevance:0},{className:"title",variants:[{begin:"@"+n},{begin:"@\\d+"},{begin:"!"+n},{begin:"!\\d+"+n}]},{className:"symbol",variants:[{begin:"%"+n},{begin:"%\\d+"},{begin:"#\\d+"}]},{className:"number",variants:[{begin:"0[xX][a-fA-F0-9]+"},{begin:"-?\\d+(?:[.]\\d+)?(?:[eE][-+]?\\d+(?:[.]\\d+)?)?"}],relevance:0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("llvm",function(e){var n="([-a-zA-Z$._][\\w\\-$.]*)";return{k:"begin end true false declare define global constant private linker_private internal available_externally linkonce linkonce_odr weak weak_odr appending dllimport dllexport common default hidden protected extern_weak external thread_local zeroinitializer undef null to tail target triple datalayout volatile nuw nsw nnan ninf nsz arcp fast exact inbounds align addrspace section alias module asm sideeffect gc dbg linker_private_weak attributes blockaddress initialexec localdynamic localexec prefix unnamed_addr ccc fastcc coldcc x86_stdcallcc x86_fastcallcc arm_apcscc arm_aapcscc arm_aapcs_vfpcc ptx_device ptx_kernel intel_ocl_bicc msp430_intrcc spir_func spir_kernel x86_64_sysvcc x86_64_win64cc x86_thiscallcc cc c signext zeroext inreg sret nounwind noreturn noalias nocapture byval nest readnone readonly inlinehint noinline alwaysinline optsize ssp sspreq noredzone noimplicitfloat naked builtin cold nobuiltin noduplicate nonlazybind optnone returns_twice sanitize_address sanitize_memory sanitize_thread sspstrong uwtable returned type opaque eq ne slt sgt sle sge ult ugt ule uge oeq one olt ogt ole oge ord uno ueq une x acq_rel acquire alignstack atomic catch cleanup filter inteldialect max min monotonic nand personality release seq_cst singlethread umax umin unordered xchg add fadd sub fsub mul fmul udiv sdiv fdiv urem srem frem shl lshr ashr and or xor icmp fcmp phi call trunc zext sext fptrunc fpext uitofp sitofp fptoui fptosi inttoptr ptrtoint bitcast addrspacecast select va_arg ret br switch invoke unwind unreachable indirectbr landingpad resume malloc alloca free load store getelementptr extractelement insertelement shufflevector getresult extractvalue insertvalue atomicrmw cmpxchg fence argmemonly double",c:[{cN:"keyword",b:"i\\d+"},e.C(";","\\n",{relevance:0}),e.QSM,{cN:"string",v:[{b:'"',e:'[^\\\\]"'}],relevance:0},{cN:"title",v:[{b:"@"+n},{b:"@\\d+"},{b:"!"+n},{b:"!\\d+"+n}]},{cN:"symbol",v:[{b:"%"+n},{b:"%\\d+"},{b:"#\\d+"}]},{cN:"number",v:[{b:"0[xX][a-fA-F0-9]+"},{b:"-?\\d+(?:[.]\\d+)?(?:[eE][-+]?\\d+(?:[.]\\d+)?)?"}],relevance:0}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/lsl.min.js b/vendor/assets/javascripts/highlightjs/languages/lsl.min.js
index e55634d20b..9b26dc4fd7 100644
--- a/vendor/assets/javascripts/highlightjs/languages/lsl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/lsl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("lsl",function(){"use strict";return function(E){var T={className:"number",begin:E.C_NUMBER_RE};return{name:"LSL (Linden Scripting Language)",illegal:":",contains:[{className:"string",begin:'"',end:'"',contains:[{className:"subst",begin:/\\[tn"\\]/}]},{className:"comment",variants:[E.COMMENT("//","$"),E.COMMENT("/\\*","\\*/")],relevance:0},T,{className:"section",variants:[{begin:"\\b(?:state|default)\\b"},{begin:"\\b(?:state_(?:entry|exit)|touch(?:_(?:start|end))?|(?:land_)?collision(?:_(?:start|end))?|timer|listen|(?:no_)?sensor|control|(?:not_)?at_(?:rot_)?target|money|email|experience_permissions(?:_denied)?|run_time_permissions|changed|attach|dataserver|moving_(?:start|end)|link_message|(?:on|object)_rez|remote_data|http_re(?:sponse|quest)|path_update|transaction_result)\\b"}]},{className:"built_in",begin:"\\b(?:ll(?:AgentInExperience|(?:Create|DataSize|Delete|KeyCount|Keys|Read|Update)KeyValue|GetExperience(?:Details|ErrorMessage)|ReturnObjectsBy(?:ID|Owner)|Json(?:2List|[GS]etValue|ValueType)|Sin|Cos|Tan|Atan2|Sqrt|Pow|Abs|Fabs|Frand|Floor|Ceil|Round|Vec(?:Mag|Norm|Dist)|Rot(?:Between|2(?:Euler|Fwd|Left|Up))|(?:Euler|Axes)2Rot|Whisper|(?:Region|Owner)?Say|Shout|Listen(?:Control|Remove)?|Sensor(?:Repeat|Remove)?|Detected(?:Name|Key|Owner|Type|Pos|Vel|Grab|Rot|Group|LinkNumber)|Die|Ground|Wind|(?:[GS]et)(?:AnimationOverride|MemoryLimit|PrimMediaParams|ParcelMusicURL|Object(?:Desc|Name)|PhysicsMaterial|Status|Scale|Color|Alpha|Texture|Pos|Rot|Force|Torque)|ResetAnimationOverride|(?:Scale|Offset|Rotate)Texture|(?:Rot)?Target(?:Remove)?|(?:Stop)?MoveToTarget|Apply(?:Rotational)?Impulse|Set(?:KeyframedMotion|ContentType|RegionPos|(?:Angular)?Velocity|Buoyancy|HoverHeight|ForceAndTorque|TimerEvent|ScriptState|Damage|TextureAnim|Sound(?:Queueing|Radius)|Vehicle(?:Type|(?:Float|Vector|Rotation)Param)|(?:Touch|Sit)?Text|Camera(?:Eye|At)Offset|PrimitiveParams|ClickAction|Link(?:Alpha|Color|PrimitiveParams(?:Fast)?|Texture(?:Anim)?|Camera|Media)|RemoteScriptAccessPin|PayPrice|LocalRot)|ScaleByFactor|Get(?:(?:Max|Min)ScaleFactor|ClosestNavPoint|StaticPath|SimStats|Env|PrimitiveParams|Link(?:PrimitiveParams|Number(?:OfSides)?|Key|Name|Media)|HTTPHeader|FreeURLs|Object(?:Details|PermMask|PrimCount)|Parcel(?:MaxPrims|Details|Prim(?:Count|Owners))|Attached(?:List)?|(?:SPMax|Free|Used)Memory|Region(?:Name|TimeDilation|FPS|Corner|AgentCount)|Root(?:Position|Rotation)|UnixTime|(?:Parcel|Region)Flags|(?:Wall|GMT)clock|SimulatorHostname|BoundingBox|GeometricCenter|Creator|NumberOf(?:Prims|NotecardLines|Sides)|Animation(?:List)?|(?:Camera|Local)(?:Pos|Rot)|Vel|Accel|Omega|Time(?:stamp|OfDay)|(?:Object|CenterOf)?Mass|MassMKS|Energy|Owner|(?:Owner)?Key|SunDirection|Texture(?:Offset|Scale|Rot)|Inventory(?:Number|Name|Key|Type|Creator|PermMask)|Permissions(?:Key)?|StartParameter|List(?:Length|EntryType)|Date|Agent(?:Size|Info|Language|List)|LandOwnerAt|NotecardLine|Script(?:Name|State))|(?:Get|Reset|GetAndReset)Time|PlaySound(?:Slave)?|LoopSound(?:Master|Slave)?|(?:Trigger|Stop|Preload)Sound|(?:(?:Get|Delete)Sub|Insert)String|To(?:Upper|Lower)|Give(?:InventoryList|Money)|RezObject|(?:Stop)?LookAt|Sleep|CollisionFilter|(?:Take|Release)Controls|DetachFromAvatar|AttachToAvatar(?:Temp)?|InstantMessage|(?:GetNext)?Email|StopHover|MinEventDelay|RotLookAt|String(?:Length|Trim)|(?:Start|Stop)Animation|TargetOmega|Request(?:Experience)?Permissions|(?:Create|Break)Link|BreakAllLinks|(?:Give|Remove)Inventory|Water|PassTouches|Request(?:Agent|Inventory)Data|TeleportAgent(?:Home|GlobalCoords)?|ModifyLand|CollisionSound|ResetScript|MessageLinked|PushObject|PassCollisions|AxisAngle2Rot|Rot2(?:Axis|Angle)|A(?:cos|sin)|AngleBetween|AllowInventoryDrop|SubStringIndex|List2(?:CSV|Integer|Json|Float|String|Key|Vector|Rot|List(?:Strided)?)|DeleteSubList|List(?:Statistics|Sort|Randomize|(?:Insert|Find|Replace)List)|EdgeOfWorld|AdjustSoundVolume|Key2Name|TriggerSoundLimited|EjectFromLand|(?:CSV|ParseString)2List|OverMyLand|SameGroup|UnSit|Ground(?:Slope|Normal|Contour)|GroundRepel|(?:Set|Remove)VehicleFlags|SitOnLink|(?:AvatarOn)?(?:Link)?SitTarget|Script(?:Danger|Profiler)|Dialog|VolumeDetect|ResetOtherScript|RemoteLoadScriptPin|(?:Open|Close)RemoteDataChannel|SendRemoteData|RemoteDataReply|(?:Integer|String)ToBase64|XorBase64|Log(?:10)?|Base64To(?:String|Integer)|ParseStringKeepNulls|RezAtRoot|RequestSimulatorData|ForceMouselook|(?:Load|Release|(?:E|Une)scape)URL|ParcelMedia(?:CommandList|Query)|ModPow|MapDestination|(?:RemoveFrom|AddTo|Reset)Land(?:Pass|Ban)List|(?:Set|Clear)CameraParams|HTTP(?:Request|Response)|TextBox|DetectedTouch(?:UV|Face|Pos|(?:N|Bin)ormal|ST)|(?:MD5|SHA1|DumpList2)String|Request(?:Secure)?URL|Clear(?:Prim|Link)Media|(?:Link)?ParticleSystem|(?:Get|Request)(?:Username|DisplayName)|RegionSayTo|CastRay|GenerateKey|TransferLindenDollars|ManageEstateAccess|(?:Create|Delete)Character|ExecCharacterCmd|Evade|FleeFrom|NavigateTo|PatrolPoints|Pursue|UpdateCharacter|WanderWithin))\\b"},{className:"literal",variants:[{begin:"\\b(?:PI|TWO_PI|PI_BY_TWO|DEG_TO_RAD|RAD_TO_DEG|SQRT2)\\b"},{begin:"\\b(?:XP_ERROR_(?:EXPERIENCES_DISABLED|EXPERIENCE_(?:DISABLED|SUSPENDED)|INVALID_(?:EXPERIENCE|PARAMETERS)|KEY_NOT_FOUND|MATURITY_EXCEEDED|NONE|NOT_(?:FOUND|PERMITTED(?:_LAND)?)|NO_EXPERIENCE|QUOTA_EXCEEDED|RETRY_UPDATE|STORAGE_EXCEPTION|STORE_DISABLED|THROTTLED|UNKNOWN_ERROR)|JSON_APPEND|STATUS_(?:PHYSICS|ROTATE_[XYZ]|PHANTOM|SANDBOX|BLOCK_GRAB(?:_OBJECT)?|(?:DIE|RETURN)_AT_EDGE|CAST_SHADOWS|OK|MALFORMED_PARAMS|TYPE_MISMATCH|BOUNDS_ERROR|NOT_(?:FOUND|SUPPORTED)|INTERNAL_ERROR|WHITELIST_FAILED)|AGENT(?:_(?:BY_(?:LEGACY_|USER)NAME|FLYING|ATTACHMENTS|SCRIPTED|MOUSELOOK|SITTING|ON_OBJECT|AWAY|WALKING|IN_AIR|TYPING|CROUCHING|BUSY|ALWAYS_RUN|AUTOPILOT|LIST_(?:PARCEL(?:_OWNER)?|REGION)))?|CAMERA_(?:PITCH|DISTANCE|BEHINDNESS_(?:ANGLE|LAG)|(?:FOCUS|POSITION)(?:_(?:THRESHOLD|LOCKED|LAG))?|FOCUS_OFFSET|ACTIVE)|ANIM_ON|LOOP|REVERSE|PING_PONG|SMOOTH|ROTATE|SCALE|ALL_SIDES|LINK_(?:ROOT|SET|ALL_(?:OTHERS|CHILDREN)|THIS)|ACTIVE|PASS(?:IVE|_(?:ALWAYS|IF_NOT_HANDLED|NEVER))|SCRIPTED|CONTROL_(?:FWD|BACK|(?:ROT_)?(?:LEFT|RIGHT)|UP|DOWN|(?:ML_)?LBUTTON)|PERMISSION_(?:RETURN_OBJECTS|DEBIT|OVERRIDE_ANIMATIONS|SILENT_ESTATE_MANAGEMENT|TAKE_CONTROLS|TRIGGER_ANIMATION|ATTACH|CHANGE_LINKS|(?:CONTROL|TRACK)_CAMERA|TELEPORT)|INVENTORY_(?:TEXTURE|SOUND|OBJECT|SCRIPT|LANDMARK|CLOTHING|NOTECARD|BODYPART|ANIMATION|GESTURE|ALL|NONE)|CHANGED_(?:INVENTORY|COLOR|SHAPE|SCALE|TEXTURE|LINK|ALLOWED_DROP|OWNER|REGION(?:_START)?|TELEPORT|MEDIA)|OBJECT_(?:CLICK_ACTION|HOVER_HEIGHT|LAST_OWNER_ID|(?:PHYSICS|SERVER|STREAMING)_COST|UNKNOWN_DETAIL|CHARACTER_TIME|PHANTOM|PHYSICS|TEMP_(?:ATTACHED|ON_REZ)|NAME|DESC|POS|PRIM_(?:COUNT|EQUIVALENCE)|RETURN_(?:PARCEL(?:_OWNER)?|REGION)|REZZER_KEY|ROO?T|VELOCITY|OMEGA|OWNER|GROUP(?:_TAG)?|CREATOR|ATTACHED_(?:POINT|SLOTS_AVAILABLE)|RENDER_WEIGHT|(?:BODY_SHAPE|PATHFINDING)_TYPE|(?:RUNNING|TOTAL)_SCRIPT_COUNT|TOTAL_INVENTORY_COUNT|SCRIPT_(?:MEMORY|TIME))|TYPE_(?:INTEGER|FLOAT|STRING|KEY|VECTOR|ROTATION|INVALID)|(?:DEBUG|PUBLIC)_CHANNEL|ATTACH_(?:AVATAR_CENTER|CHEST|HEAD|BACK|PELVIS|MOUTH|CHIN|NECK|NOSE|BELLY|[LR](?:SHOULDER|HAND|FOOT|EAR|EYE|[UL](?:ARM|LEG)|HIP)|(?:LEFT|RIGHT)_PEC|HUD_(?:CENTER_[12]|TOP_(?:RIGHT|CENTER|LEFT)|BOTTOM(?:_(?:RIGHT|LEFT))?)|[LR]HAND_RING1|TAIL_(?:BASE|TIP)|[LR]WING|FACE_(?:JAW|[LR]EAR|[LR]EYE|TOUNGE)|GROIN|HIND_[LR]FOOT)|LAND_(?:LEVEL|RAISE|LOWER|SMOOTH|NOISE|REVERT)|DATA_(?:ONLINE|NAME|BORN|SIM_(?:POS|STATUS|RATING)|PAYINFO)|PAYMENT_INFO_(?:ON_FILE|USED)|REMOTE_DATA_(?:CHANNEL|REQUEST|REPLY)|PSYS_(?:PART_(?:BF_(?:ZERO|ONE(?:_MINUS_(?:DEST_COLOR|SOURCE_(ALPHA|COLOR)))?|DEST_COLOR|SOURCE_(ALPHA|COLOR))|BLEND_FUNC_(DEST|SOURCE)|FLAGS|(?:START|END)_(?:COLOR|ALPHA|SCALE|GLOW)|MAX_AGE|(?:RIBBON|WIND|INTERP_(?:COLOR|SCALE)|BOUNCE|FOLLOW_(?:SRC|VELOCITY)|TARGET_(?:POS|LINEAR)|EMISSIVE)_MASK)|SRC_(?:MAX_AGE|PATTERN|ANGLE_(?:BEGIN|END)|BURST_(?:RATE|PART_COUNT|RADIUS|SPEED_(?:MIN|MAX))|ACCEL|TEXTURE|TARGET_KEY|OMEGA|PATTERN_(?:DROP|EXPLODE|ANGLE(?:_CONE(?:_EMPTY)?)?)))|VEHICLE_(?:REFERENCE_FRAME|TYPE_(?:NONE|SLED|CAR|BOAT|AIRPLANE|BALLOON)|(?:LINEAR|ANGULAR)_(?:FRICTION_TIMESCALE|MOTOR_DIRECTION)|LINEAR_MOTOR_OFFSET|HOVER_(?:HEIGHT|EFFICIENCY|TIMESCALE)|BUOYANCY|(?:LINEAR|ANGULAR)_(?:DEFLECTION_(?:EFFICIENCY|TIMESCALE)|MOTOR_(?:DECAY_)?TIMESCALE)|VERTICAL_ATTRACTION_(?:EFFICIENCY|TIMESCALE)|BANKING_(?:EFFICIENCY|MIX|TIMESCALE)|FLAG_(?:NO_DEFLECTION_UP|LIMIT_(?:ROLL_ONLY|MOTOR_UP)|HOVER_(?:(?:WATER|TERRAIN|UP)_ONLY|GLOBAL_HEIGHT)|MOUSELOOK_(?:STEER|BANK)|CAMERA_DECOUPLED))|PRIM_(?:ALLOW_UNSIT|ALPHA_MODE(?:_(?:BLEND|EMISSIVE|MASK|NONE))?|NORMAL|SPECULAR|TYPE(?:_(?:BOX|CYLINDER|PRISM|SPHERE|TORUS|TUBE|RING|SCULPT))?|HOLE_(?:DEFAULT|CIRCLE|SQUARE|TRIANGLE)|MATERIAL(?:_(?:STONE|METAL|GLASS|WOOD|FLESH|PLASTIC|RUBBER))?|SHINY_(?:NONE|LOW|MEDIUM|HIGH)|BUMP_(?:NONE|BRIGHT|DARK|WOOD|BARK|BRICKS|CHECKER|CONCRETE|TILE|STONE|DISKS|GRAVEL|BLOBS|SIDING|LARGETILE|STUCCO|SUCTION|WEAVE)|TEXGEN_(?:DEFAULT|PLANAR)|SCRIPTED_SIT_ONLY|SCULPT_(?:TYPE_(?:SPHERE|TORUS|PLANE|CYLINDER|MASK)|FLAG_(?:MIRROR|INVERT))|PHYSICS(?:_(?:SHAPE_(?:CONVEX|NONE|PRIM|TYPE)))?|(?:POS|ROT)_LOCAL|SLICE|TEXT|FLEXIBLE|POINT_LIGHT|TEMP_ON_REZ|PHANTOM|POSITION|SIT_TARGET|SIZE|ROTATION|TEXTURE|NAME|OMEGA|DESC|LINK_TARGET|COLOR|BUMP_SHINY|FULLBRIGHT|TEXGEN|GLOW|MEDIA_(?:ALT_IMAGE_ENABLE|CONTROLS|(?:CURRENT|HOME)_URL|AUTO_(?:LOOP|PLAY|SCALE|ZOOM)|FIRST_CLICK_INTERACT|(?:WIDTH|HEIGHT)_PIXELS|WHITELIST(?:_ENABLE)?|PERMS_(?:INTERACT|CONTROL)|PARAM_MAX|CONTROLS_(?:STANDARD|MINI)|PERM_(?:NONE|OWNER|GROUP|ANYONE)|MAX_(?:URL_LENGTH|WHITELIST_(?:SIZE|COUNT)|(?:WIDTH|HEIGHT)_PIXELS)))|MASK_(?:BASE|OWNER|GROUP|EVERYONE|NEXT)|PERM_(?:TRANSFER|MODIFY|COPY|MOVE|ALL)|PARCEL_(?:MEDIA_COMMAND_(?:STOP|PAUSE|PLAY|LOOP|TEXTURE|URL|TIME|AGENT|UNLOAD|AUTO_ALIGN|TYPE|SIZE|DESC|LOOP_SET)|FLAG_(?:ALLOW_(?:FLY|(?:GROUP_)?SCRIPTS|LANDMARK|TERRAFORM|DAMAGE|CREATE_(?:GROUP_)?OBJECTS)|USE_(?:ACCESS_(?:GROUP|LIST)|BAN_LIST|LAND_PASS_LIST)|LOCAL_SOUND_ONLY|RESTRICT_PUSHOBJECT|ALLOW_(?:GROUP|ALL)_OBJECT_ENTRY)|COUNT_(?:TOTAL|OWNER|GROUP|OTHER|SELECTED|TEMP)|DETAILS_(?:NAME|DESC|OWNER|GROUP|AREA|ID|SEE_AVATARS))|LIST_STAT_(?:MAX|MIN|MEAN|MEDIAN|STD_DEV|SUM(?:_SQUARES)?|NUM_COUNT|GEOMETRIC_MEAN|RANGE)|PAY_(?:HIDE|DEFAULT)|REGION_FLAG_(?:ALLOW_DAMAGE|FIXED_SUN|BLOCK_TERRAFORM|SANDBOX|DISABLE_(?:COLLISIONS|PHYSICS)|BLOCK_FLY|ALLOW_DIRECT_TELEPORT|RESTRICT_PUSHOBJECT)|HTTP_(?:METHOD|MIMETYPE|BODY_(?:MAXLENGTH|TRUNCATED)|CUSTOM_HEADER|PRAGMA_NO_CACHE|VERBOSE_THROTTLE|VERIFY_CERT)|SIT_(?:INVALID_(?:AGENT|LINK_OBJECT)|NO(?:T_EXPERIENCE|_(?:ACCESS|EXPERIENCE_PERMISSION|SIT_TARGET)))|STRING_(?:TRIM(?:_(?:HEAD|TAIL))?)|CLICK_ACTION_(?:NONE|TOUCH|SIT|BUY|PAY|OPEN(?:_MEDIA)?|PLAY|ZOOM)|TOUCH_INVALID_FACE|PROFILE_(?:NONE|SCRIPT_MEMORY)|RC_(?:DATA_FLAGS|DETECT_PHANTOM|GET_(?:LINK_NUM|NORMAL|ROOT_KEY)|MAX_HITS|REJECT_(?:TYPES|AGENTS|(?:NON)?PHYSICAL|LAND))|RCERR_(?:CAST_TIME_EXCEEDED|SIM_PERF_LOW|UNKNOWN)|ESTATE_ACCESS_(?:ALLOWED_(?:AGENT|GROUP)_(?:ADD|REMOVE)|BANNED_AGENT_(?:ADD|REMOVE))|DENSITY|FRICTION|RESTITUTION|GRAVITY_MULTIPLIER|KFM_(?:COMMAND|CMD_(?:PLAY|STOP|PAUSE)|MODE|FORWARD|LOOP|PING_PONG|REVERSE|DATA|ROTATION|TRANSLATION)|ERR_(?:GENERIC|PARCEL_PERMISSIONS|MALFORMED_PARAMS|RUNTIME_PERMISSIONS|THROTTLED)|CHARACTER_(?:CMD_(?:(?:SMOOTH_)?STOP|JUMP)|DESIRED_(?:TURN_)?SPEED|RADIUS|STAY_WITHIN_PARCEL|LENGTH|ORIENTATION|ACCOUNT_FOR_SKIPPED_FRAMES|AVOIDANCE_MODE|TYPE(?:_(?:[ABCD]|NONE))?|MAX_(?:DECEL|TURN_RADIUS|(?:ACCEL|SPEED)))|PURSUIT_(?:OFFSET|FUZZ_FACTOR|GOAL_TOLERANCE|INTERCEPT)|REQUIRE_LINE_OF_SIGHT|FORCE_DIRECT_PATH|VERTICAL|HORIZONTAL|AVOID_(?:CHARACTERS|DYNAMIC_OBSTACLES|NONE)|PU_(?:EVADE_(?:HIDDEN|SPOTTED)|FAILURE_(?:DYNAMIC_PATHFINDING_DISABLED|INVALID_(?:GOAL|START)|NO_(?:NAVMESH|VALID_DESTINATION)|OTHER|TARGET_GONE|(?:PARCEL_)?UNREACHABLE)|(?:GOAL|SLOWDOWN_DISTANCE)_REACHED)|TRAVERSAL_TYPE(?:_(?:FAST|NONE|SLOW))?|CONTENT_TYPE_(?:ATOM|FORM|HTML|JSON|LLSD|RSS|TEXT|XHTML|XML)|GCNP_(?:RADIUS|STATIC)|(?:PATROL|WANDER)_PAUSE_AT_WAYPOINTS|OPT_(?:AVATAR|CHARACTER|EXCLUSION_VOLUME|LEGACY_LINKSET|MATERIAL_VOLUME|OTHER|STATIC_OBSTACLE|WALKABLE)|SIM_STAT_PCT_CHARS_STEPPED)\\b"},{begin:"\\b(?:FALSE|TRUE)\\b"},{begin:"\\b(?:ZERO_ROTATION)\\b"},{begin:"\\b(?:EOF|JSON_(?:ARRAY|DELETE|FALSE|INVALID|NULL|NUMBER|OBJECT|STRING|TRUE)|NULL_KEY|TEXTURE_(?:BLANK|DEFAULT|MEDIA|PLYWOOD|TRANSPARENT)|URL_REQUEST_(?:GRANTED|DENIED))\\b"},{begin:"\\b(?:ZERO_VECTOR|TOUCH_INVALID_(?:TEXCOORD|VECTOR))\\b"}]},{className:"type",begin:"\\b(?:integer|float|string|key|vector|quaternion|rotation|list)\\b"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("lsl",function(E){var T={cN:"string",b:'"',e:'"',c:[{cN:"subst",b:/\\[tn"\\]/}]},A={cN:"number",b:E.CNR};return{i:":",c:[T,{cN:"comment",v:[E.C("//","$"),E.C("/\\*","\\*/")],relevance:0},A,{cN:"section",v:[{b:"\\b(?:state|default)\\b"},{b:"\\b(?:state_(?:entry|exit)|touch(?:_(?:start|end))?|(?:land_)?collision(?:_(?:start|end))?|timer|listen|(?:no_)?sensor|control|(?:not_)?at_(?:rot_)?target|money|email|experience_permissions(?:_denied)?|run_time_permissions|changed|attach|dataserver|moving_(?:start|end)|link_message|(?:on|object)_rez|remote_data|http_re(?:sponse|quest)|path_update|transaction_result)\\b"}]},{cN:"built_in",b:"\\b(?:ll(?:AgentInExperience|(?:Create|DataSize|Delete|KeyCount|Keys|Read|Update)KeyValue|GetExperience(?:Details|ErrorMessage)|ReturnObjectsBy(?:ID|Owner)|Json(?:2List|[GS]etValue|ValueType)|Sin|Cos|Tan|Atan2|Sqrt|Pow|Abs|Fabs|Frand|Floor|Ceil|Round|Vec(?:Mag|Norm|Dist)|Rot(?:Between|2(?:Euler|Fwd|Left|Up))|(?:Euler|Axes)2Rot|Whisper|(?:Region|Owner)?Say|Shout|Listen(?:Control|Remove)?|Sensor(?:Repeat|Remove)?|Detected(?:Name|Key|Owner|Type|Pos|Vel|Grab|Rot|Group|LinkNumber)|Die|Ground|Wind|(?:[GS]et)(?:AnimationOverride|MemoryLimit|PrimMediaParams|ParcelMusicURL|Object(?:Desc|Name)|PhysicsMaterial|Status|Scale|Color|Alpha|Texture|Pos|Rot|Force|Torque)|ResetAnimationOverride|(?:Scale|Offset|Rotate)Texture|(?:Rot)?Target(?:Remove)?|(?:Stop)?MoveToTarget|Apply(?:Rotational)?Impulse|Set(?:KeyframedMotion|ContentType|RegionPos|(?:Angular)?Velocity|Buoyancy|HoverHeight|ForceAndTorque|TimerEvent|ScriptState|Damage|TextureAnim|Sound(?:Queueing|Radius)|Vehicle(?:Type|(?:Float|Vector|Rotation)Param)|(?:Touch|Sit)?Text|Camera(?:Eye|At)Offset|PrimitiveParams|ClickAction|Link(?:Alpha|Color|PrimitiveParams(?:Fast)?|Texture(?:Anim)?|Camera|Media)|RemoteScriptAccessPin|PayPrice|LocalRot)|ScaleByFactor|Get(?:(?:Max|Min)ScaleFactor|ClosestNavPoint|StaticPath|SimStats|Env|PrimitiveParams|Link(?:PrimitiveParams|Number(?:OfSides)?|Key|Name|Media)|HTTPHeader|FreeURLs|Object(?:Details|PermMask|PrimCount)|Parcel(?:MaxPrims|Details|Prim(?:Count|Owners))|Attached(?:List)?|(?:SPMax|Free|Used)Memory|Region(?:Name|TimeDilation|FPS|Corner|AgentCount)|Root(?:Position|Rotation)|UnixTime|(?:Parcel|Region)Flags|(?:Wall|GMT)clock|SimulatorHostname|BoundingBox|GeometricCenter|Creator|NumberOf(?:Prims|NotecardLines|Sides)|Animation(?:List)?|(?:Camera|Local)(?:Pos|Rot)|Vel|Accel|Omega|Time(?:stamp|OfDay)|(?:Object|CenterOf)?Mass|MassMKS|Energy|Owner|(?:Owner)?Key|SunDirection|Texture(?:Offset|Scale|Rot)|Inventory(?:Number|Name|Key|Type|Creator|PermMask)|Permissions(?:Key)?|StartParameter|List(?:Length|EntryType)|Date|Agent(?:Size|Info|Language|List)|LandOwnerAt|NotecardLine|Script(?:Name|State))|(?:Get|Reset|GetAndReset)Time|PlaySound(?:Slave)?|LoopSound(?:Master|Slave)?|(?:Trigger|Stop|Preload)Sound|(?:(?:Get|Delete)Sub|Insert)String|To(?:Upper|Lower)|Give(?:InventoryList|Money)|RezObject|(?:Stop)?LookAt|Sleep|CollisionFilter|(?:Take|Release)Controls|DetachFromAvatar|AttachToAvatar(?:Temp)?|InstantMessage|(?:GetNext)?Email|StopHover|MinEventDelay|RotLookAt|String(?:Length|Trim)|(?:Start|Stop)Animation|TargetOmega|Request(?:Experience)?Permissions|(?:Create|Break)Link|BreakAllLinks|(?:Give|Remove)Inventory|Water|PassTouches|Request(?:Agent|Inventory)Data|TeleportAgent(?:Home|GlobalCoords)?|ModifyLand|CollisionSound|ResetScript|MessageLinked|PushObject|PassCollisions|AxisAngle2Rot|Rot2(?:Axis|Angle)|A(?:cos|sin)|AngleBetween|AllowInventoryDrop|SubStringIndex|List2(?:CSV|Integer|Json|Float|String|Key|Vector|Rot|List(?:Strided)?)|DeleteSubList|List(?:Statistics|Sort|Randomize|(?:Insert|Find|Replace)List)|EdgeOfWorld|AdjustSoundVolume|Key2Name|TriggerSoundLimited|EjectFromLand|(?:CSV|ParseString)2List|OverMyLand|SameGroup|UnSit|Ground(?:Slope|Normal|Contour)|GroundRepel|(?:Set|Remove)VehicleFlags|SitOnLink|(?:AvatarOn)?(?:Link)?SitTarget|Script(?:Danger|Profiler)|Dialog|VolumeDetect|ResetOtherScript|RemoteLoadScriptPin|(?:Open|Close)RemoteDataChannel|SendRemoteData|RemoteDataReply|(?:Integer|String)ToBase64|XorBase64|Log(?:10)?|Base64To(?:String|Integer)|ParseStringKeepNulls|RezAtRoot|RequestSimulatorData|ForceMouselook|(?:Load|Release|(?:E|Une)scape)URL|ParcelMedia(?:CommandList|Query)|ModPow|MapDestination|(?:RemoveFrom|AddTo|Reset)Land(?:Pass|Ban)List|(?:Set|Clear)CameraParams|HTTP(?:Request|Response)|TextBox|DetectedTouch(?:UV|Face|Pos|(?:N|Bin)ormal|ST)|(?:MD5|SHA1|DumpList2)String|Request(?:Secure)?URL|Clear(?:Prim|Link)Media|(?:Link)?ParticleSystem|(?:Get|Request)(?:Username|DisplayName)|RegionSayTo|CastRay|GenerateKey|TransferLindenDollars|ManageEstateAccess|(?:Create|Delete)Character|ExecCharacterCmd|Evade|FleeFrom|NavigateTo|PatrolPoints|Pursue|UpdateCharacter|WanderWithin))\\b"},{cN:"literal",v:[{b:"\\b(?:PI|TWO_PI|PI_BY_TWO|DEG_TO_RAD|RAD_TO_DEG|SQRT2)\\b"},{b:"\\b(?:XP_ERROR_(?:EXPERIENCES_DISABLED|EXPERIENCE_(?:DISABLED|SUSPENDED)|INVALID_(?:EXPERIENCE|PARAMETERS)|KEY_NOT_FOUND|MATURITY_EXCEEDED|NONE|NOT_(?:FOUND|PERMITTED(?:_LAND)?)|NO_EXPERIENCE|QUOTA_EXCEEDED|RETRY_UPDATE|STORAGE_EXCEPTION|STORE_DISABLED|THROTTLED|UNKNOWN_ERROR)|JSON_APPEND|STATUS_(?:PHYSICS|ROTATE_[XYZ]|PHANTOM|SANDBOX|BLOCK_GRAB(?:_OBJECT)?|(?:DIE|RETURN)_AT_EDGE|CAST_SHADOWS|OK|MALFORMED_PARAMS|TYPE_MISMATCH|BOUNDS_ERROR|NOT_(?:FOUND|SUPPORTED)|INTERNAL_ERROR|WHITELIST_FAILED)|AGENT(?:_(?:BY_(?:LEGACY_|USER)NAME|FLYING|ATTACHMENTS|SCRIPTED|MOUSELOOK|SITTING|ON_OBJECT|AWAY|WALKING|IN_AIR|TYPING|CROUCHING|BUSY|ALWAYS_RUN|AUTOPILOT|LIST_(?:PARCEL(?:_OWNER)?|REGION)))?|CAMERA_(?:PITCH|DISTANCE|BEHINDNESS_(?:ANGLE|LAG)|(?:FOCUS|POSITION)(?:_(?:THRESHOLD|LOCKED|LAG))?|FOCUS_OFFSET|ACTIVE)|ANIM_ON|LOOP|REVERSE|PING_PONG|SMOOTH|ROTATE|SCALE|ALL_SIDES|LINK_(?:ROOT|SET|ALL_(?:OTHERS|CHILDREN)|THIS)|ACTIVE|PASS(?:IVE|_(?:ALWAYS|IF_NOT_HANDLED|NEVER))|SCRIPTED|CONTROL_(?:FWD|BACK|(?:ROT_)?(?:LEFT|RIGHT)|UP|DOWN|(?:ML_)?LBUTTON)|PERMISSION_(?:RETURN_OBJECTS|DEBIT|OVERRIDE_ANIMATIONS|SILENT_ESTATE_MANAGEMENT|TAKE_CONTROLS|TRIGGER_ANIMATION|ATTACH|CHANGE_LINKS|(?:CONTROL|TRACK)_CAMERA|TELEPORT)|INVENTORY_(?:TEXTURE|SOUND|OBJECT|SCRIPT|LANDMARK|CLOTHING|NOTECARD|BODYPART|ANIMATION|GESTURE|ALL|NONE)|CHANGED_(?:INVENTORY|COLOR|SHAPE|SCALE|TEXTURE|LINK|ALLOWED_DROP|OWNER|REGION(?:_START)?|TELEPORT|MEDIA)|OBJECT_(?:CLICK_ACTION|HOVER_HEIGHT|LAST_OWNER_ID|(?:PHYSICS|SERVER|STREAMING)_COST|UNKNOWN_DETAIL|CHARACTER_TIME|PHANTOM|PHYSICS|TEMP_(?:ATTACHED|ON_REZ)|NAME|DESC|POS|PRIM_(?:COUNT|EQUIVALENCE)|RETURN_(?:PARCEL(?:_OWNER)?|REGION)|REZZER_KEY|ROO?T|VELOCITY|OMEGA|OWNER|GROUP(?:_TAG)?|CREATOR|ATTACHED_(?:POINT|SLOTS_AVAILABLE)|RENDER_WEIGHT|(?:BODY_SHAPE|PATHFINDING)_TYPE|(?:RUNNING|TOTAL)_SCRIPT_COUNT|TOTAL_INVENTORY_COUNT|SCRIPT_(?:MEMORY|TIME))|TYPE_(?:INTEGER|FLOAT|STRING|KEY|VECTOR|ROTATION|INVALID)|(?:DEBUG|PUBLIC)_CHANNEL|ATTACH_(?:AVATAR_CENTER|CHEST|HEAD|BACK|PELVIS|MOUTH|CHIN|NECK|NOSE|BELLY|[LR](?:SHOULDER|HAND|FOOT|EAR|EYE|[UL](?:ARM|LEG)|HIP)|(?:LEFT|RIGHT)_PEC|HUD_(?:CENTER_[12]|TOP_(?:RIGHT|CENTER|LEFT)|BOTTOM(?:_(?:RIGHT|LEFT))?)|[LR]HAND_RING1|TAIL_(?:BASE|TIP)|[LR]WING|FACE_(?:JAW|[LR]EAR|[LR]EYE|TOUNGE)|GROIN|HIND_[LR]FOOT)|LAND_(?:LEVEL|RAISE|LOWER|SMOOTH|NOISE|REVERT)|DATA_(?:ONLINE|NAME|BORN|SIM_(?:POS|STATUS|RATING)|PAYINFO)|PAYMENT_INFO_(?:ON_FILE|USED)|REMOTE_DATA_(?:CHANNEL|REQUEST|REPLY)|PSYS_(?:PART_(?:BF_(?:ZERO|ONE(?:_MINUS_(?:DEST_COLOR|SOURCE_(ALPHA|COLOR)))?|DEST_COLOR|SOURCE_(ALPHA|COLOR))|BLEND_FUNC_(DEST|SOURCE)|FLAGS|(?:START|END)_(?:COLOR|ALPHA|SCALE|GLOW)|MAX_AGE|(?:RIBBON|WIND|INTERP_(?:COLOR|SCALE)|BOUNCE|FOLLOW_(?:SRC|VELOCITY)|TARGET_(?:POS|LINEAR)|EMISSIVE)_MASK)|SRC_(?:MAX_AGE|PATTERN|ANGLE_(?:BEGIN|END)|BURST_(?:RATE|PART_COUNT|RADIUS|SPEED_(?:MIN|MAX))|ACCEL|TEXTURE|TARGET_KEY|OMEGA|PATTERN_(?:DROP|EXPLODE|ANGLE(?:_CONE(?:_EMPTY)?)?)))|VEHICLE_(?:REFERENCE_FRAME|TYPE_(?:NONE|SLED|CAR|BOAT|AIRPLANE|BALLOON)|(?:LINEAR|ANGULAR)_(?:FRICTION_TIMESCALE|MOTOR_DIRECTION)|LINEAR_MOTOR_OFFSET|HOVER_(?:HEIGHT|EFFICIENCY|TIMESCALE)|BUOYANCY|(?:LINEAR|ANGULAR)_(?:DEFLECTION_(?:EFFICIENCY|TIMESCALE)|MOTOR_(?:DECAY_)?TIMESCALE)|VERTICAL_ATTRACTION_(?:EFFICIENCY|TIMESCALE)|BANKING_(?:EFFICIENCY|MIX|TIMESCALE)|FLAG_(?:NO_DEFLECTION_UP|LIMIT_(?:ROLL_ONLY|MOTOR_UP)|HOVER_(?:(?:WATER|TERRAIN|UP)_ONLY|GLOBAL_HEIGHT)|MOUSELOOK_(?:STEER|BANK)|CAMERA_DECOUPLED))|PRIM_(?:ALLOW_UNSIT|ALPHA_MODE(?:_(?:BLEND|EMISSIVE|MASK|NONE))?|NORMAL|SPECULAR|TYPE(?:_(?:BOX|CYLINDER|PRISM|SPHERE|TORUS|TUBE|RING|SCULPT))?|HOLE_(?:DEFAULT|CIRCLE|SQUARE|TRIANGLE)|MATERIAL(?:_(?:STONE|METAL|GLASS|WOOD|FLESH|PLASTIC|RUBBER))?|SHINY_(?:NONE|LOW|MEDIUM|HIGH)|BUMP_(?:NONE|BRIGHT|DARK|WOOD|BARK|BRICKS|CHECKER|CONCRETE|TILE|STONE|DISKS|GRAVEL|BLOBS|SIDING|LARGETILE|STUCCO|SUCTION|WEAVE)|TEXGEN_(?:DEFAULT|PLANAR)|SCRIPTED_SIT_ONLY|SCULPT_(?:TYPE_(?:SPHERE|TORUS|PLANE|CYLINDER|MASK)|FLAG_(?:MIRROR|INVERT))|PHYSICS(?:_(?:SHAPE_(?:CONVEX|NONE|PRIM|TYPE)))?|(?:POS|ROT)_LOCAL|SLICE|TEXT|FLEXIBLE|POINT_LIGHT|TEMP_ON_REZ|PHANTOM|POSITION|SIT_TARGET|SIZE|ROTATION|TEXTURE|NAME|OMEGA|DESC|LINK_TARGET|COLOR|BUMP_SHINY|FULLBRIGHT|TEXGEN|GLOW|MEDIA_(?:ALT_IMAGE_ENABLE|CONTROLS|(?:CURRENT|HOME)_URL|AUTO_(?:LOOP|PLAY|SCALE|ZOOM)|FIRST_CLICK_INTERACT|(?:WIDTH|HEIGHT)_PIXELS|WHITELIST(?:_ENABLE)?|PERMS_(?:INTERACT|CONTROL)|PARAM_MAX|CONTROLS_(?:STANDARD|MINI)|PERM_(?:NONE|OWNER|GROUP|ANYONE)|MAX_(?:URL_LENGTH|WHITELIST_(?:SIZE|COUNT)|(?:WIDTH|HEIGHT)_PIXELS)))|MASK_(?:BASE|OWNER|GROUP|EVERYONE|NEXT)|PERM_(?:TRANSFER|MODIFY|COPY|MOVE|ALL)|PARCEL_(?:MEDIA_COMMAND_(?:STOP|PAUSE|PLAY|LOOP|TEXTURE|URL|TIME|AGENT|UNLOAD|AUTO_ALIGN|TYPE|SIZE|DESC|LOOP_SET)|FLAG_(?:ALLOW_(?:FLY|(?:GROUP_)?SCRIPTS|LANDMARK|TERRAFORM|DAMAGE|CREATE_(?:GROUP_)?OBJECTS)|USE_(?:ACCESS_(?:GROUP|LIST)|BAN_LIST|LAND_PASS_LIST)|LOCAL_SOUND_ONLY|RESTRICT_PUSHOBJECT|ALLOW_(?:GROUP|ALL)_OBJECT_ENTRY)|COUNT_(?:TOTAL|OWNER|GROUP|OTHER|SELECTED|TEMP)|DETAILS_(?:NAME|DESC|OWNER|GROUP|AREA|ID|SEE_AVATARS))|LIST_STAT_(?:MAX|MIN|MEAN|MEDIAN|STD_DEV|SUM(?:_SQUARES)?|NUM_COUNT|GEOMETRIC_MEAN|RANGE)|PAY_(?:HIDE|DEFAULT)|REGION_FLAG_(?:ALLOW_DAMAGE|FIXED_SUN|BLOCK_TERRAFORM|SANDBOX|DISABLE_(?:COLLISIONS|PHYSICS)|BLOCK_FLY|ALLOW_DIRECT_TELEPORT|RESTRICT_PUSHOBJECT)|HTTP_(?:METHOD|MIMETYPE|BODY_(?:MAXLENGTH|TRUNCATED)|CUSTOM_HEADER|PRAGMA_NO_CACHE|VERBOSE_THROTTLE|VERIFY_CERT)|SIT_(?:INVALID_(?:AGENT|LINK_OBJECT)|NO(?:T_EXPERIENCE|_(?:ACCESS|EXPERIENCE_PERMISSION|SIT_TARGET)))|STRING_(?:TRIM(?:_(?:HEAD|TAIL))?)|CLICK_ACTION_(?:NONE|TOUCH|SIT|BUY|PAY|OPEN(?:_MEDIA)?|PLAY|ZOOM)|TOUCH_INVALID_FACE|PROFILE_(?:NONE|SCRIPT_MEMORY)|RC_(?:DATA_FLAGS|DETECT_PHANTOM|GET_(?:LINK_NUM|NORMAL|ROOT_KEY)|MAX_HITS|REJECT_(?:TYPES|AGENTS|(?:NON)?PHYSICAL|LAND))|RCERR_(?:CAST_TIME_EXCEEDED|SIM_PERF_LOW|UNKNOWN)|ESTATE_ACCESS_(?:ALLOWED_(?:AGENT|GROUP)_(?:ADD|REMOVE)|BANNED_AGENT_(?:ADD|REMOVE))|DENSITY|FRICTION|RESTITUTION|GRAVITY_MULTIPLIER|KFM_(?:COMMAND|CMD_(?:PLAY|STOP|PAUSE)|MODE|FORWARD|LOOP|PING_PONG|REVERSE|DATA|ROTATION|TRANSLATION)|ERR_(?:GENERIC|PARCEL_PERMISSIONS|MALFORMED_PARAMS|RUNTIME_PERMISSIONS|THROTTLED)|CHARACTER_(?:CMD_(?:(?:SMOOTH_)?STOP|JUMP)|DESIRED_(?:TURN_)?SPEED|RADIUS|STAY_WITHIN_PARCEL|LENGTH|ORIENTATION|ACCOUNT_FOR_SKIPPED_FRAMES|AVOIDANCE_MODE|TYPE(?:_(?:[ABCD]|NONE))?|MAX_(?:DECEL|TURN_RADIUS|(?:ACCEL|SPEED)))|PURSUIT_(?:OFFSET|FUZZ_FACTOR|GOAL_TOLERANCE|INTERCEPT)|REQUIRE_LINE_OF_SIGHT|FORCE_DIRECT_PATH|VERTICAL|HORIZONTAL|AVOID_(?:CHARACTERS|DYNAMIC_OBSTACLES|NONE)|PU_(?:EVADE_(?:HIDDEN|SPOTTED)|FAILURE_(?:DYNAMIC_PATHFINDING_DISABLED|INVALID_(?:GOAL|START)|NO_(?:NAVMESH|VALID_DESTINATION)|OTHER|TARGET_GONE|(?:PARCEL_)?UNREACHABLE)|(?:GOAL|SLOWDOWN_DISTANCE)_REACHED)|TRAVERSAL_TYPE(?:_(?:FAST|NONE|SLOW))?|CONTENT_TYPE_(?:ATOM|FORM|HTML|JSON|LLSD|RSS|TEXT|XHTML|XML)|GCNP_(?:RADIUS|STATIC)|(?:PATROL|WANDER)_PAUSE_AT_WAYPOINTS|OPT_(?:AVATAR|CHARACTER|EXCLUSION_VOLUME|LEGACY_LINKSET|MATERIAL_VOLUME|OTHER|STATIC_OBSTACLE|WALKABLE)|SIM_STAT_PCT_CHARS_STEPPED)\\b"},{b:"\\b(?:FALSE|TRUE)\\b"},{b:"\\b(?:ZERO_ROTATION)\\b"},{b:"\\b(?:EOF|JSON_(?:ARRAY|DELETE|FALSE|INVALID|NULL|NUMBER|OBJECT|STRING|TRUE)|NULL_KEY|TEXTURE_(?:BLANK|DEFAULT|MEDIA|PLYWOOD|TRANSPARENT)|URL_REQUEST_(?:GRANTED|DENIED))\\b"},{b:"\\b(?:ZERO_VECTOR|TOUCH_INVALID_(?:TEXCOORD|VECTOR))\\b"}]},{cN:"type",b:"\\b(?:integer|float|string|key|vector|quaternion|rotation|list)\\b"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/lua.min.js b/vendor/assets/javascripts/highlightjs/languages/lua.min.js
index 8073263fbb..74e0dc1ee4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/lua.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/lua.min.js
@@ -1 +1 @@
-hljs.registerLanguage("lua",function(){"use strict";return function(e){var t={begin:"\\[=*\\[",end:"\\]=*\\]",contains:["self"]},a=[e.COMMENT("--(?!\\[=*\\[)","$"),e.COMMENT("--\\[=*\\[","\\]=*\\]",{contains:[t],relevance:10})];return{name:"Lua",keywords:{$pattern:e.UNDERSCORE_IDENT_RE,literal:"true false nil",keyword:"and break do else elseif end for goto if in local not or repeat return then until while",built_in:"_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len __gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall arg self coroutine resume yield status wrap create running debug getupvalue debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv io lines write close flush open output type read stderr stdin input stdout popen tmpfile math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower table setn insert getn foreachi maxn foreach concat sort remove"},contains:a.concat([{className:"function",beginKeywords:"function",end:"\\)",contains:[e.inherit(e.TITLE_MODE,{begin:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),{className:"params",begin:"\\(",endsWithParent:!0,contains:a}].concat(a)},e.C_NUMBER_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"string",begin:"\\[=*\\[",end:"\\]=*\\]",contains:[t],relevance:5}])}}}());
\ No newline at end of file
+hljs.registerLanguage("lua",function(e){var t="\\[=*\\[",a="\\]=*\\]",n={b:t,e:a,c:["self"]},l=[e.C("--(?!"+t+")","$"),e.C("--"+t,a,{c:[n],relevance:10})];return{l:e.UIR,k:{literal:"true false nil",keyword:"and break do else elseif end for goto if in local not or repeat return then until while",built_in:"_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len __gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstringmodule next pairs pcall print rawequal rawget rawset require select setfenvsetmetatable tonumber tostring type unpack xpcall arg selfcoroutine resume yield status wrap create running debug getupvalue debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv io lines write close flush open output type read stderr stdin input stdout popen tmpfile math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower table setn insert getn foreachi maxn foreach concat sort remove"},c:l.concat([{cN:"function",bK:"function",e:"\\)",c:[e.inherit(e.TM,{b:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),{cN:"params",b:"\\(",eW:!0,c:l}].concat(l)},e.CNM,e.ASM,e.QSM,{cN:"string",b:t,e:a,c:[n],relevance:5}])}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/makefile.min.js b/vendor/assets/javascripts/highlightjs/languages/makefile.min.js
index 0644db0972..ed3d94101d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/makefile.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/makefile.min.js
@@ -1 +1 @@
-hljs.registerLanguage("makefile",function(){"use strict";return function(e){var i={className:"variable",variants:[{begin:"\\$\\("+e.UNDERSCORE_IDENT_RE+"\\)",contains:[e.BACKSLASH_ESCAPE]},{begin:/\$[@%<?\^\+\*]/}]},n={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,i]},a={className:"variable",begin:/\$\([\w-]+\s/,end:/\)/,keywords:{built_in:"subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value"},contains:[i]},r={begin:"^"+e.UNDERSCORE_IDENT_RE+"\\s*(?=[:+?]?=)"},s={className:"section",begin:/^[^\s]+:/,end:/$/,contains:[i]};return{name:"Makefile",aliases:["mk","mak"],keywords:{$pattern:/[\w-]+/,keyword:"define endef undefine ifdef ifndef ifeq ifneq else endif include -include sinclude override export unexport private vpath"},contains:[e.HASH_COMMENT_MODE,i,n,a,r,{className:"meta",begin:/^\.PHONY:/,end:/$/,keywords:{$pattern:/[\.\w]+/,"meta-keyword":".PHONY"}},s]}}}());
\ No newline at end of file
+hljs.registerLanguage("makefile",function(e){var i={cN:"variable",v:[{b:"\\$\\("+e.UIR+"\\)",c:[e.BE]},{b:/\$[@%<?\^\+\*]/}]},r={cN:"string",b:/"/,e:/"/,c:[e.BE,i]},a={cN:"variable",b:/\$\([\w-]+\s/,e:/\)/,k:{built_in:"subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value"},c:[i]},n={b:"^"+e.UIR+"\\s*(?=[:+?]?=)"},t={cN:"section",b:/^[^\s]+:/,e:/$/,c:[i]};return{aliases:["mk","mak"],k:"define endef undefine ifdef ifndef ifeq ifneq else endif include -include sinclude override export unexport private vpath",l:/[\w-]+/,c:[e.HCM,i,r,a,n,{cN:"meta",b:/^\.PHONY:/,e:/$/,k:{"meta-keyword":".PHONY"},l:/[\.\w]+/},t]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/markdown.min.js b/vendor/assets/javascripts/highlightjs/languages/markdown.min.js
index 7c5c0e3da2..1f1268c0c5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/markdown.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/markdown.min.js
@@ -1 +1 @@
-hljs.registerLanguage("markdown",function(){"use strict";return function(n){const e={begin:"<",end:">",subLanguage:"xml",relevance:0},a={begin:"\\[.+?\\][\\(\\[].*?[\\)\\]]",returnBegin:!0,contains:[{className:"string",begin:"\\[",end:"\\]",excludeBegin:!0,returnEnd:!0,relevance:0},{className:"link",begin:"\\]\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0},{className:"symbol",begin:"\\]\\[",end:"\\]",excludeBegin:!0,excludeEnd:!0}],relevance:10},i={className:"strong",contains:[],variants:[{begin:/_{2}/,end:/_{2}/},{begin:/\*{2}/,end:/\*{2}/}]},s={className:"emphasis",contains:[],variants:[{begin:/\*(?!\*)/,end:/\*/},{begin:/_(?!_)/,end:/_/,relevance:0}]};i.contains.push(s),s.contains.push(i);var c=[e,a];return i.contains=i.contains.concat(c),s.contains=s.contains.concat(c),{name:"Markdown",aliases:["md","mkdown","mkd"],contains:[{className:"section",variants:[{begin:"^#{1,6}",end:"$",contains:c=c.concat(i,s)},{begin:"(?=^.+?\\n[=-]{2,}$)",contains:[{begin:"^[=-]*$"},{begin:"^",end:"\\n",contains:c}]}]},e,{className:"bullet",begin:"^[ \t]*([*+-]|(\\d+\\.))(?=\\s+)",end:"\\s+",excludeEnd:!0},i,s,{className:"quote",begin:"^>\\s+",contains:c,end:"$"},{className:"code",variants:[{begin:"(`{3,})(.|\\n)*?\\1`*[ ]*"},{begin:"(~{3,})(.|\\n)*?\\1~*[ ]*"},{begin:"```",end:"```+[ ]*$"},{begin:"~~~",end:"~~~+[ ]*$"},{begin:"`.+?`"},{begin:"(?=^( {4}|\\t))",contains:[{begin:"^( {4}|\\t)",end:"(\\n)$"}],relevance:0}]},{begin:"^[-\\*]{3,}",end:"$"},a,{begin:/^\[[^\n]+\]:/,returnBegin:!0,contains:[{className:"symbol",begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0},{className:"link",begin:/:\s*/,end:/$/,excludeBegin:!0}]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("markdown",function(e){return{aliases:["md","mkdown","mkd"],c:[{cN:"section",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",relevance:0},{cN:"bullet",b:"^\\s*([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",relevance:0}]},{cN:"quote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"^```\\w*\\s*$",e:"^```[ ]*$"},{b:"`.+?`"},{b:"^( {4}|\\t)",e:"$",relevance:0}]},{b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"string",b:"\\[",e:"\\]",eB:!0,rE:!0,relevance:0},{cN:"link",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"symbol",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],relevance:10},{b:/^\[[^\n]+\]:/,rB:!0,c:[{cN:"symbol",b:/\[/,e:/\]/,eB:!0,eE:!0},{cN:"link",b:/:\s*/,e:/$/,eB:!0}]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/mathematica.min.js b/vendor/assets/javascripts/highlightjs/languages/mathematica.min.js
index 0b1217918f..6bc30b5038 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mathematica.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mathematica.min.js
@@ -1 +1 @@
-hljs.registerLanguage("mathematica",function(){"use strict";return function(e){return{name:"Mathematica",aliases:["mma","wl"],keywords:{$pattern:"(\\$|\\b)"+e.IDENT_RE+"\\b",keyword:"AASTriangle AbelianGroup Abort AbortKernels AbortProtect AbortScheduledTask Above Abs AbsArg AbsArgPlot Absolute AbsoluteCorrelation AbsoluteCorrelationFunction AbsoluteCurrentValue AbsoluteDashing AbsoluteFileName AbsoluteOptions AbsolutePointSize AbsoluteThickness AbsoluteTime AbsoluteTiming AcceptanceThreshold AccountingForm Accumulate Accuracy AccuracyGoal ActionDelay ActionMenu ActionMenuBox ActionMenuBoxOptions Activate Active ActiveClassification ActiveClassificationObject ActiveItem ActivePrediction ActivePredictionObject ActiveStyle AcyclicGraphQ AddOnHelpPath AddSides AddTo AddToSearchIndex AddUsers AdjacencyGraph AdjacencyList AdjacencyMatrix AdjustmentBox AdjustmentBoxOptions AdjustTimeSeriesForecast AdministrativeDivisionData AffineHalfSpace AffineSpace AffineStateSpaceModel AffineTransform After AggregatedEntityClass AggregationLayer AircraftData AirportData AirPressureData AirTemperatureData AiryAi AiryAiPrime AiryAiZero AiryBi AiryBiPrime AiryBiZero AlgebraicIntegerQ AlgebraicNumber AlgebraicNumberDenominator AlgebraicNumberNorm AlgebraicNumberPolynomial AlgebraicNumberTrace AlgebraicRules AlgebraicRulesData Algebraics AlgebraicUnitQ Alignment AlignmentMarker AlignmentPoint All AllowAdultContent AllowedCloudExtraParameters AllowedCloudParameterExtensions AllowedDimensions AllowedFrequencyRange AllowedHeads AllowGroupClose AllowIncomplete AllowInlineCells AllowKernelInitialization AllowLooseGrammar AllowReverseGroupClose AllowScriptLevelChange AllTrue Alphabet AlphabeticOrder AlphabeticSort AlphaChannel AlternateImage AlternatingFactorial AlternatingGroup AlternativeHypothesis Alternatives AltitudeMethod AmbientLight AmbiguityFunction AmbiguityList Analytic AnatomyData AnatomyForm AnatomyPlot3D AnatomySkinStyle AnatomyStyling AnchoredSearch And AndersonDarlingTest AngerJ AngleBisector AngleBracket AnglePath AnglePath3D AngleVector AngularGauge Animate AnimationCycleOffset AnimationCycleRepetitions AnimationDirection AnimationDisplayTime AnimationRate AnimationRepetitions AnimationRunning AnimationRunTime AnimationTimeIndex Animator AnimatorBox AnimatorBoxOptions AnimatorElements Annotate Annotation AnnotationDelete AnnotationNames AnnotationRules AnnotationValue Annuity AnnuityDue Annulus AnomalyDetection AnomalyDetectorFunction Anonymous Antialiasing AntihermitianMatrixQ Antisymmetric AntisymmetricMatrixQ Antonyms AnyOrder AnySubset AnyTrue Apart ApartSquareFree APIFunction Appearance AppearanceElements AppearanceRules AppellF1 Append AppendCheck AppendLayer AppendTo ApplicationIdentificationKey Apply ApplySides ArcCos ArcCosh ArcCot ArcCoth ArcCsc ArcCsch ArcCurvature ARCHProcess ArcLength ArcSec ArcSech ArcSin ArcSinDistribution ArcSinh ArcTan ArcTanh Area Arg ArgMax ArgMin ArgumentCountQ ARIMAProcess ArithmeticGeometricMean ARMAProcess Around AroundReplace ARProcess Array ArrayComponents ArrayDepth ArrayFilter ArrayFlatten ArrayMesh ArrayPad ArrayPlot ArrayQ ArrayResample ArrayReshape ArrayRules Arrays Arrow Arrow3DBox ArrowBox Arrowheads ASATriangle Ask AskAppend AskConfirm AskDisplay AskedQ AskedValue AskFunction AskState AskTemplateDisplay AspectRatio AspectRatioFixed Assert AssociateTo Association AssociationFormat AssociationMap AssociationQ AssociationThread AssumeDeterministic Assuming Assumptions AstronomicalData AsymptoticDSolveValue AsymptoticEqual AsymptoticEquivalent AsymptoticGreater AsymptoticGreaterEqual AsymptoticIntegrate AsymptoticLess AsymptoticLessEqual AsymptoticOutputTracker AsymptoticRSolveValue AsymptoticSolve AsymptoticSum Asynchronous AsynchronousTaskObject AsynchronousTasks Atom AtomCoordinates AtomCount AtomDiagramCoordinates AtomList AtomQ AttentionLayer Attributes Audio AudioAmplify AudioAnnotate AudioAnnotationLookup AudioBlockMap AudioCapture AudioChannelAssignment AudioChannelCombine AudioChannelMix AudioChannels AudioChannelSeparate AudioData AudioDelay AudioDelete AudioDevice AudioDistance AudioFade AudioFrequencyShift AudioGenerator AudioIdentify AudioInputDevice AudioInsert AudioIntervals AudioJoin AudioLabel AudioLength AudioLocalMeasurements AudioLooping AudioLoudness AudioMeasurements AudioNormalize AudioOutputDevice AudioOverlay AudioPad AudioPan AudioPartition AudioPause AudioPitchShift AudioPlay AudioPlot AudioQ AudioRecord AudioReplace AudioResample AudioReverb AudioSampleRate AudioSpectralMap AudioSpectralTransformation AudioSplit AudioStop AudioStream AudioStreams AudioTimeStretch AudioTrim AudioType AugmentedPolyhedron AugmentedSymmetricPolynomial Authenticate Authentication AuthenticationDialog AutoAction Autocomplete AutocompletionFunction AutoCopy AutocorrelationTest AutoDelete AutoEvaluateEvents AutoGeneratedPackage AutoIndent AutoIndentSpacings AutoItalicWords AutoloadPath AutoMatch Automatic AutomaticImageSize AutoMultiplicationSymbol AutoNumberFormatting AutoOpenNotebooks AutoOpenPalettes AutoQuoteCharacters AutoRefreshed AutoRemove AutorunSequencing AutoScaling AutoScroll AutoSpacing AutoStyleOptions AutoStyleWords AutoSubmitting Axes AxesEdge AxesLabel AxesOrigin AxesStyle AxiomaticTheory Axis BabyMonsterGroupB Back Background BackgroundAppearance BackgroundTasksSettings Backslash Backsubstitution Backward Ball Band BandpassFilter BandstopFilter BarabasiAlbertGraphDistribution BarChart BarChart3D BarcodeImage BarcodeRecognize BaringhausHenzeTest BarLegend BarlowProschanImportance BarnesG BarOrigin BarSpacing BartlettHannWindow BartlettWindow BaseDecode BaseEncode BaseForm Baseline BaselinePosition BaseStyle BasicRecurrentLayer BatchNormalizationLayer BatchSize BatesDistribution BattleLemarieWavelet BayesianMaximization BayesianMaximizationObject BayesianMinimization BayesianMinimizationObject Because BeckmannDistribution Beep Before Begin BeginDialogPacket BeginFrontEndInteractionPacket BeginPackage BellB BellY Below BenfordDistribution BeniniDistribution BenktanderGibratDistribution BenktanderWeibullDistribution BernoulliB BernoulliDistribution BernoulliGraphDistribution BernoulliProcess BernsteinBasis BesselFilterModel BesselI BesselJ BesselJZero BesselK BesselY BesselYZero Beta BetaBinomialDistribution BetaDistribution BetaNegativeBinomialDistribution BetaPrimeDistribution BetaRegularized Between BetweennessCentrality BeveledPolyhedron BezierCurve BezierCurve3DBox BezierCurve3DBoxOptions BezierCurveBox BezierCurveBoxOptions BezierFunction BilateralFilter Binarize BinaryDeserialize BinaryDistance BinaryFormat BinaryImageQ BinaryRead BinaryReadList BinarySerialize BinaryWrite BinCounts BinLists Binomial BinomialDistribution BinomialProcess BinormalDistribution BiorthogonalSplineWavelet BipartiteGraphQ BiquadraticFilterModel BirnbaumImportance BirnbaumSaundersDistribution BitAnd BitClear BitGet BitLength BitNot BitOr BitSet BitShiftLeft BitShiftRight BitXor BiweightLocation BiweightMidvariance Black BlackmanHarrisWindow BlackmanNuttallWindow BlackmanWindow Blank BlankForm BlankNullSequence BlankSequence Blend Block BlockchainAddressData BlockchainBase BlockchainBlockData BlockchainContractValue BlockchainData BlockchainGet BlockchainKeyEncode BlockchainPut BlockchainTokenData BlockchainTransaction BlockchainTransactionData BlockchainTransactionSign BlockchainTransactionSubmit BlockMap BlockRandom BlomqvistBeta BlomqvistBetaTest Blue Blur BodePlot BohmanWindow Bold Bond BondCount BondList BondQ Bookmarks Boole BooleanConsecutiveFunction BooleanConvert BooleanCountingFunction BooleanFunction BooleanGraph BooleanMaxterms BooleanMinimize BooleanMinterms BooleanQ BooleanRegion Booleans BooleanStrings BooleanTable BooleanVariables BorderDimensions BorelTannerDistribution Bottom BottomHatTransform BoundaryDiscretizeGraphics BoundaryDiscretizeRegion BoundaryMesh BoundaryMeshRegion BoundaryMeshRegionQ BoundaryStyle BoundedRegionQ BoundingRegion Bounds Box BoxBaselineShift BoxData BoxDimensions Boxed Boxes BoxForm BoxFormFormatTypes BoxFrame BoxID BoxMargins BoxMatrix BoxObject BoxRatios BoxRotation BoxRotationPoint BoxStyle BoxWhiskerChart Bra BracketingBar BraKet BrayCurtisDistance BreadthFirstScan Break BridgeData BrightnessEqualize BroadcastStationData Brown BrownForsytheTest BrownianBridgeProcess BrowserCategory BSplineBasis BSplineCurve BSplineCurve3DBox BSplineCurve3DBoxOptions BSplineCurveBox BSplineCurveBoxOptions BSplineFunction BSplineSurface BSplineSurface3DBox BSplineSurface3DBoxOptions BubbleChart BubbleChart3D BubbleScale BubbleSizes BuildingData BulletGauge BusinessDayQ ButterflyGraph ButterworthFilterModel Button ButtonBar ButtonBox ButtonBoxOptions ButtonCell ButtonContents ButtonData ButtonEvaluator ButtonExpandable ButtonFrame ButtonFunction ButtonMargins ButtonMinHeight ButtonNote ButtonNotebook ButtonSource ButtonStyle ButtonStyleMenuListing Byte ByteArray ByteArrayFormat ByteArrayQ ByteArrayToString ByteCount ByteOrdering C CachedValue CacheGraphics CachePersistence CalendarConvert CalendarData CalendarType Callout CalloutMarker CalloutStyle CallPacket CanberraDistance Cancel CancelButton CandlestickChart CanonicalGraph CanonicalizePolygon CanonicalizePolyhedron CanonicalName CanonicalWarpingCorrespondence CanonicalWarpingDistance CantorMesh CantorStaircase Cap CapForm CapitalDifferentialD Capitalize CapsuleShape CaptureRunning CardinalBSplineBasis CarlemanLinearize CarmichaelLambda CaseOrdering Cases CaseSensitive Cashflow Casoratian Catalan CatalanNumber Catch Catenate CatenateLayer CauchyDistribution CauchyWindow CayleyGraph CDF CDFDeploy CDFInformation CDFWavelet Ceiling CelestialSystem Cell CellAutoOverwrite CellBaseline CellBoundingBox CellBracketOptions CellChangeTimes CellContents CellContext CellDingbat CellDynamicExpression CellEditDuplicate CellElementsBoundingBox CellElementSpacings CellEpilog CellEvaluationDuplicate CellEvaluationFunction CellEvaluationLanguage CellEventActions CellFrame CellFrameColor CellFrameLabelMargins CellFrameLabels CellFrameMargins CellGroup CellGroupData CellGrouping CellGroupingRules CellHorizontalScrolling CellID CellLabel CellLabelAutoDelete CellLabelMargins CellLabelPositioning CellLabelStyle CellLabelTemplate CellMargins CellObject CellOpen CellPrint CellProlog Cells CellSize CellStyle CellTags CellularAutomaton CensoredDistribution Censoring Center CenterArray CenterDot CentralFeature CentralMoment CentralMomentGeneratingFunction Cepstrogram CepstrogramArray CepstrumArray CForm ChampernowneNumber ChangeOptions ChannelBase ChannelBrokerAction ChannelDatabin ChannelHistoryLength ChannelListen ChannelListener ChannelListeners ChannelListenerWait ChannelObject ChannelPreSendFunction ChannelReceiverFunction ChannelSend ChannelSubscribers ChanVeseBinarize Character CharacterCounts CharacterEncoding CharacterEncodingsPath CharacteristicFunction CharacteristicPolynomial CharacterName CharacterRange Characters ChartBaseStyle ChartElementData ChartElementDataFunction ChartElementFunction ChartElements ChartLabels ChartLayout ChartLegends ChartStyle Chebyshev1FilterModel Chebyshev2FilterModel ChebyshevDistance ChebyshevT ChebyshevU Check CheckAbort CheckAll Checkbox CheckboxBar CheckboxBox CheckboxBoxOptions ChemicalData ChessboardDistance ChiDistribution ChineseRemainder ChiSquareDistribution ChoiceButtons ChoiceDialog CholeskyDecomposition Chop ChromaticityPlot ChromaticityPlot3D ChromaticPolynomial Circle CircleBox CircleDot CircleMinus CirclePlus CirclePoints CircleThrough CircleTimes CirculantGraph CircularOrthogonalMatrixDistribution CircularQuaternionMatrixDistribution CircularRealMatrixDistribution CircularSymplecticMatrixDistribution CircularUnitaryMatrixDistribution Circumsphere CityData ClassifierFunction ClassifierInformation ClassifierMeasurements ClassifierMeasurementsObject Classify ClassPriors Clear ClearAll ClearAttributes ClearCookies ClearPermissions ClearSystemCache ClebschGordan ClickPane Clip ClipboardNotebook ClipFill ClippingStyle ClipPlanes ClipPlanesStyle ClipRange Clock ClockGauge ClockwiseContourIntegral Close Closed CloseKernels ClosenessCentrality Closing ClosingAutoSave ClosingEvent CloudAccountData CloudBase CloudConnect CloudDeploy CloudDirectory CloudDisconnect CloudEvaluate CloudExport CloudExpression CloudExpressions CloudFunction CloudGet CloudImport CloudLoggingData CloudObject CloudObjectInformation CloudObjectInformationData CloudObjectNameFormat CloudObjects CloudObjectURLType CloudPublish CloudPut CloudRenderingMethod CloudSave CloudShare CloudSubmit CloudSymbol CloudUnshare ClusterClassify ClusterDissimilarityFunction ClusteringComponents ClusteringTree CMYKColor Coarse CodeAssistOptions Coefficient CoefficientArrays CoefficientDomain CoefficientList CoefficientRules CoifletWavelet Collect Colon ColonForm ColorBalance ColorCombine ColorConvert ColorCoverage ColorData ColorDataFunction ColorDetect ColorDistance ColorFunction ColorFunctionScaling Colorize ColorNegate ColorOutput ColorProfileData ColorQ ColorQuantize ColorReplace ColorRules ColorSelectorSettings ColorSeparate ColorSetter ColorSetterBox ColorSetterBoxOptions ColorSlider ColorsNear ColorSpace ColorToneMapping Column ColumnAlignments ColumnBackgrounds ColumnForm ColumnLines ColumnsEqual ColumnSpacings ColumnWidths CombinedEntityClass CombinerFunction CometData CommonDefaultFormatTypes Commonest CommonestFilter CommonName CommonUnits CommunityBoundaryStyle CommunityGraphPlot CommunityLabels CommunityRegionStyle CompanyData CompatibleUnitQ CompilationOptions CompilationTarget Compile Compiled CompiledCodeFunction CompiledFunction CompilerOptions Complement CompleteGraph CompleteGraphQ CompleteKaryTree CompletionsListPacket Complex Complexes ComplexExpand ComplexInfinity ComplexityFunction ComplexListPlot ComplexPlot ComplexPlot3D ComponentMeasurements ComponentwiseContextMenu Compose ComposeList ComposeSeries CompositeQ Composition CompoundElement CompoundExpression CompoundPoissonDistribution CompoundPoissonProcess CompoundRenewalProcess Compress CompressedData ComputeUncertainty Condition ConditionalExpression Conditioned Cone ConeBox ConfidenceLevel ConfidenceRange ConfidenceTransform ConfigurationPath ConformAudio ConformImages Congruent ConicHullRegion ConicHullRegion3DBox ConicHullRegionBox ConicOptimization Conjugate ConjugateTranspose Conjunction Connect ConnectedComponents ConnectedGraphComponents ConnectedGraphQ ConnectedMeshComponents ConnectedMoleculeComponents ConnectedMoleculeQ ConnectionSettings ConnectLibraryCallbackFunction ConnectSystemModelComponents ConnesWindow ConoverTest ConsoleMessage ConsoleMessagePacket ConsolePrint Constant ConstantArray ConstantArrayLayer ConstantImage ConstantPlusLayer ConstantRegionQ Constants ConstantTimesLayer ConstellationData ConstrainedMax ConstrainedMin Construct Containing ContainsAll ContainsAny ContainsExactly ContainsNone ContainsOnly ContentFieldOptions ContentLocationFunction ContentObject ContentPadding ContentsBoundingBox ContentSelectable ContentSize Context ContextMenu Contexts ContextToFileName Continuation Continue ContinuedFraction ContinuedFractionK ContinuousAction ContinuousMarkovProcess ContinuousTask ContinuousTimeModelQ ContinuousWaveletData ContinuousWaveletTransform ContourDetect ContourGraphics ContourIntegral ContourLabels ContourLines ContourPlot ContourPlot3D Contours ContourShading ContourSmoothing ContourStyle ContraharmonicMean ContrastiveLossLayer Control ControlActive ControlAlignment ControlGroupContentsBox ControllabilityGramian ControllabilityMatrix ControllableDecomposition ControllableModelQ ControllerDuration ControllerInformation ControllerInformationData ControllerLinking ControllerManipulate ControllerMethod ControllerPath ControllerState ControlPlacement ControlsRendering ControlType Convergents ConversionOptions ConversionRules ConvertToBitmapPacket ConvertToPostScript ConvertToPostScriptPacket ConvexHullMesh ConvexPolygonQ ConvexPolyhedronQ ConvolutionLayer Convolve ConwayGroupCo1 ConwayGroupCo2 ConwayGroupCo3 CookieFunction Cookies CoordinateBoundingBox CoordinateBoundingBoxArray CoordinateBounds CoordinateBoundsArray CoordinateChartData CoordinatesToolOptions CoordinateTransform CoordinateTransformData CoprimeQ Coproduct CopulaDistribution Copyable CopyDatabin CopyDirectory CopyFile CopyTag CopyToClipboard CornerFilter CornerNeighbors Correlation CorrelationDistance Correl
\ No newline at end of file
+hljs.registerLanguage("mathematica",function(e){return{aliases:["mma","wl"],l:"(\\$|\\b)"+e.IR+"\\b",k:"AASTriangle AbelianGroup Abort AbortKernels AbortProtect AbortScheduledTask Above Abs AbsArg AbsArgPlot Absolute AbsoluteCorrelation AbsoluteCorrelationFunction AbsoluteCurrentValue AbsoluteDashing AbsoluteFileName AbsoluteOptions AbsolutePointSize AbsoluteThickness AbsoluteTime AbsoluteTiming AcceptanceThreshold AccountingForm Accumulate Accuracy AccuracyGoal ActionDelay ActionMenu ActionMenuBox ActionMenuBoxOptions Activate Active ActiveClassification ActiveClassificationObject ActiveItem ActivePrediction ActivePredictionObject ActiveStyle AcyclicGraphQ AddOnHelpPath AddSides AddTo AddToSearchIndex AddUsers AdjacencyGraph AdjacencyList AdjacencyMatrix AdjustmentBox AdjustmentBoxOptions AdjustTimeSeriesForecast AdministrativeDivisionData AffineHalfSpace AffineSpace AffineStateSpaceModel AffineTransform After AggregatedEntityClass AggregationLayer AircraftData AirportData AirPressureData AirTemperatureData AiryAi AiryAiPrime AiryAiZero AiryBi AiryBiPrime AiryBiZero AlgebraicIntegerQ AlgebraicNumber AlgebraicNumberDenominator AlgebraicNumberNorm AlgebraicNumberPolynomial AlgebraicNumberTrace AlgebraicRules AlgebraicRulesData Algebraics AlgebraicUnitQ Alignment AlignmentMarker AlignmentPoint All AllowAdultContent AllowedCloudExtraParameters AllowedCloudParameterExtensions AllowedDimensions AllowedFrequencyRange AllowedHeads AllowGroupClose AllowIncomplete AllowInlineCells AllowKernelInitialization AllowLooseGrammar AllowReverseGroupClose AllowScriptLevelChange AllTrue Alphabet AlphabeticOrder AlphabeticSort AlphaChannel AlternateImage AlternatingFactorial AlternatingGroup AlternativeHypothesis Alternatives AltitudeMethod AmbientLight AmbiguityFunction AmbiguityList Analytic AnatomyData AnatomyForm AnatomyPlot3D AnatomySkinStyle AnatomyStyling AnchoredSearch And AndersonDarlingTest AngerJ AngleBisector AngleBracket AnglePath AnglePath3D AngleVector AngularGauge Animate AnimationCycleOffset AnimationCycleRepetitions AnimationDirection AnimationDisplayTime AnimationRate AnimationRepetitions AnimationRunning AnimationRunTime AnimationTimeIndex Animator AnimatorBox AnimatorBoxOptions AnimatorElements Annotate Annotation AnnotationDelete AnnotationNames AnnotationRules AnnotationValue Annuity AnnuityDue Annulus AnomalyDetection AnomalyDetectorFunction Anonymous Antialiasing AntihermitianMatrixQ Antisymmetric AntisymmetricMatrixQ Antonyms AnyOrder AnySubset AnyTrue Apart ApartSquareFree APIFunction Appearance AppearanceElements AppearanceRules AppellF1 Append AppendCheck AppendLayer AppendTo ApplicationIdentificationKey Apply ApplySides ArcCos ArcCosh ArcCot ArcCoth ArcCsc ArcCsch ArcCurvature ARCHProcess ArcLength ArcSec ArcSech ArcSin ArcSinDistribution ArcSinh ArcTan ArcTanh Area Arg ArgMax ArgMin ArgumentCountQ ARIMAProcess ArithmeticGeometricMean ARMAProcess Around AroundReplace ARProcess Array ArrayComponents ArrayDepth ArrayFilter ArrayFlatten ArrayMesh ArrayPad ArrayPlot ArrayQ ArrayResample ArrayReshape ArrayRules Arrays Arrow Arrow3DBox ArrowBox Arrowheads ASATriangle Ask AskAppend AskConfirm AskDisplay AskedQ AskedValue AskFunction AskState AskTemplateDisplay AspectRatio AspectRatioFixed Assert AssociateTo Association AssociationFormat AssociationMap AssociationQ AssociationThread AssumeDeterministic Assuming Assumptions AstronomicalData AsymptoticDSolveValue AsymptoticEqual AsymptoticEquivalent AsymptoticGreater AsymptoticGreaterEqual AsymptoticIntegrate AsymptoticLess AsymptoticLessEqual AsymptoticOutputTracker AsymptoticRSolveValue AsymptoticSolve AsymptoticSum Asynchronous AsynchronousTaskObject AsynchronousTasks Atom AtomCoordinates AtomCount AtomDiagramCoordinates AtomList AtomQ AttentionLayer Attributes Audio AudioAmplify AudioAnnotate AudioAnnotationLookup AudioBlockMap AudioCapture AudioChannelAssignment AudioChannelCombine AudioChannelMix AudioChannels AudioChannelSeparate AudioData AudioDelay AudioDelete AudioDevice AudioDistance AudioFade AudioFrequencyShift AudioGenerator AudioIdentify AudioInputDevice AudioInsert AudioIntervals AudioJoin AudioLabel AudioLength AudioLocalMeasurements AudioLooping AudioLoudness AudioMeasurements AudioNormalize AudioOutputDevice AudioOverlay AudioPad AudioPan AudioPartition AudioPause AudioPitchShift AudioPlay AudioPlot AudioQ AudioRecord AudioReplace AudioResample AudioReverb AudioSampleRate AudioSpectralMap AudioSpectralTransformation AudioSplit AudioStop AudioStream AudioStreams AudioTimeStretch AudioTrim AudioType AugmentedPolyhedron AugmentedSymmetricPolynomial Authenticate Authentication AuthenticationDialog AutoAction Autocomplete AutocompletionFunction AutoCopy AutocorrelationTest AutoDelete AutoEvaluateEvents AutoGeneratedPackage AutoIndent AutoIndentSpacings AutoItalicWords AutoloadPath AutoMatch Automatic AutomaticImageSize AutoMultiplicationSymbol AutoNumberFormatting AutoOpenNotebooks AutoOpenPalettes AutoQuoteCharacters AutoRefreshed AutoRemove AutorunSequencing AutoScaling AutoScroll AutoSpacing AutoStyleOptions AutoStyleWords AutoSubmitting Axes AxesEdge AxesLabel AxesOrigin AxesStyle AxiomaticTheory AxisBabyMonsterGroupB Back Background BackgroundAppearance BackgroundTasksSettings Backslash Backsubstitution Backward Ball Band BandpassFilter BandstopFilter BarabasiAlbertGraphDistribution BarChart BarChart3D BarcodeImage BarcodeRecognize BaringhausHenzeTest BarLegend BarlowProschanImportance BarnesG BarOrigin BarSpacing BartlettHannWindow BartlettWindow BaseDecode BaseEncode BaseForm Baseline BaselinePosition BaseStyle BasicRecurrentLayer BatchNormalizationLayer BatchSize BatesDistribution BattleLemarieWavelet BayesianMaximization BayesianMaximizationObject BayesianMinimization BayesianMinimizationObject Because BeckmannDistribution Beep Before Begin BeginDialogPacket BeginFrontEndInteractionPacket BeginPackage BellB BellY Below BenfordDistribution BeniniDistribution BenktanderGibratDistribution BenktanderWeibullDistribution BernoulliB BernoulliDistribution BernoulliGraphDistribution BernoulliProcess BernsteinBasis BesselFilterModel BesselI BesselJ BesselJZero BesselK BesselY BesselYZero Beta BetaBinomialDistribution BetaDistribution BetaNegativeBinomialDistribution BetaPrimeDistribution BetaRegularized Between BetweennessCentrality BeveledPolyhedron BezierCurve BezierCurve3DBox BezierCurve3DBoxOptions BezierCurveBox BezierCurveBoxOptions BezierFunction BilateralFilter Binarize BinaryDeserialize BinaryDistance BinaryFormat BinaryImageQ BinaryRead BinaryReadList BinarySerialize BinaryWrite BinCounts BinLists Binomial BinomialDistribution BinomialProcess BinormalDistribution BiorthogonalSplineWavelet BipartiteGraphQ BiquadraticFilterModel BirnbaumImportance BirnbaumSaundersDistribution BitAnd BitClear BitGet BitLength BitNot BitOr BitSet BitShiftLeft BitShiftRight BitXor BiweightLocation BiweightMidvariance Black BlackmanHarrisWindow BlackmanNuttallWindow BlackmanWindow Blank BlankForm BlankNullSequence BlankSequence Blend Block BlockchainAddressData BlockchainBase BlockchainBlockData BlockchainContractValue BlockchainData BlockchainGet BlockchainKeyEncode BlockchainPut BlockchainTokenData BlockchainTransaction BlockchainTransactionData BlockchainTransactionSign BlockchainTransactionSubmit BlockMap BlockRandom BlomqvistBeta BlomqvistBetaTest Blue Blur BodePlot BohmanWindow Bold Bond BondCount BondList BondQ Bookmarks Boole BooleanConsecutiveFunction BooleanConvert BooleanCountingFunction BooleanFunction BooleanGraph BooleanMaxterms BooleanMinimize BooleanMinterms BooleanQ BooleanRegion Booleans BooleanStrings BooleanTable BooleanVariables BorderDimensions BorelTannerDistribution Bottom BottomHatTransform BoundaryDiscretizeGraphics BoundaryDiscretizeRegion BoundaryMesh BoundaryMeshRegion BoundaryMeshRegionQ BoundaryStyle BoundedRegionQ BoundingRegion Bounds Box BoxBaselineShift BoxData BoxDimensions Boxed Boxes BoxForm BoxFormFormatTypes BoxFrame BoxID BoxMargins BoxMatrix BoxObject BoxRatios BoxRotation BoxRotationPoint BoxStyle BoxWhiskerChart Bra BracketingBar BraKet BrayCurtisDistance BreadthFirstScan Break BridgeData BrightnessEqualize BroadcastStationData Brown BrownForsytheTest BrownianBridgeProcess BrowserCategory BSplineBasis BSplineCurve BSplineCurve3DBox BSplineCurve3DBoxOptions BSplineCurveBox BSplineCurveBoxOptions BSplineFunction BSplineSurface BSplineSurface3DBox BSplineSurface3DBoxOptions BubbleChart BubbleChart3D BubbleScale BubbleSizes BuildingData BulletGauge BusinessDayQ ButterflyGraph ButterworthFilterModel Button ButtonBar ButtonBox ButtonBoxOptions ButtonCell ButtonContents ButtonData ButtonEvaluator ButtonExpandable ButtonFrame ButtonFunction ButtonMargins ButtonMinHeight ButtonNote ButtonNotebook ButtonSource ButtonStyle ButtonStyleMenuListing Byte ByteArray ByteArrayFormat ByteArrayQ ByteArrayToString ByteCount ByteOrderingC CachedValue CacheGraphics CachePersistence CalendarConvert CalendarData CalendarType Callout CalloutMarker CalloutStyle CallPacket CanberraDistance Cancel CancelButton CandlestickChart CanonicalGraph CanonicalizePolygon CanonicalizePolyhedron CanonicalName CanonicalWarpingCorrespondence CanonicalWarpingDistance CantorMesh CantorStaircase Cap CapForm CapitalDifferentialD Capitalize CapsuleShape CaptureRunning CardinalBSplineBasis CarlemanLinearize CarmichaelLambda CaseOrdering Cases CaseSensitive Cashflow Casoratian Catalan CatalanNumber Catch Catenate CatenateLayer CauchyDistribution CauchyWindow CayleyGraph CDF CDFDeploy CDFInformation CDFWavelet Ceiling CelestialSystem Cell CellAutoOverwrite CellBaseline CellBoundingBox CellBracketOptions CellChangeTimes CellContents CellContext CellDingbat CellDynamicExpression CellEditDuplicate CellElementsBoundingBox CellElementSpacings CellEpilog CellEvaluationDuplicate CellEvaluationFunction CellEvaluationLanguage CellEventActions CellFrame CellFrameColor CellFrameLabelMargins CellFrameLabels CellFrameMargins CellGroup CellGroupData CellGrouping CellGroupingRules CellHorizontalScrolling CellID CellLabel CellLabelAutoDelete CellLabelMargins CellLabelPositioning CellLabelStyle CellLabelTemplate CellMargins CellObject CellOpen CellPrint CellProlog Cells CellSize CellStyle CellTags CellularAutomaton CensoredDistribution Censoring Center CenterArray CenterDot CentralFeature CentralMoment CentralMomentGeneratingFunction Cepstrogram CepstrogramArray CepstrumArray CForm ChampernowneNumber ChangeOptions ChannelBase ChannelBrokerAction ChannelDatabin ChannelHistoryLength ChannelListen ChannelListener ChannelListeners ChannelListenerWait ChannelObject ChannelPreSendFunction ChannelReceiverFunction ChannelSend ChannelSubscribers ChanVeseBinarize Character CharacterCounts CharacterEncoding CharacterEncodingsPath CharacteristicFunction CharacteristicPolynomial CharacterName CharacterRange Characters ChartBaseStyle ChartElementData ChartElementDataFunction ChartElementFunction ChartElements ChartLabels ChartLayout ChartLegends ChartStyle Chebyshev1FilterModel Chebyshev2FilterModel ChebyshevDistance ChebyshevT ChebyshevU Check CheckAbort CheckAll Checkbox CheckboxBar CheckboxBox CheckboxBoxOptions ChemicalData ChessboardDistance ChiDistribution ChineseRemainder ChiSquareDistribution ChoiceButtons ChoiceDialog CholeskyDecomposition Chop ChromaticityPlot ChromaticityPlot3D ChromaticPolynomial Circle CircleBox CircleDot CircleMinus CirclePlus CirclePoints CircleThrough CircleTimes CirculantGraph CircularOrthogonalMatrixDistribution CircularQuaternionMatrixDistribution CircularRealMatrixDistribution CircularSymplecticMatrixDistribution CircularUnitaryMatrixDistribution Circumsphere CityData ClassifierFunction ClassifierInformation ClassifierMeasurements ClassifierMeasurementsObject Classify ClassPriors Clear ClearAll ClearAttributes ClearCookies ClearPermissions ClearSystemCache ClebschGordan ClickPane Clip ClipboardNotebook ClipFill ClippingStyle ClipPlanes ClipPlanesStyle ClipRange Clock ClockGauge ClockwiseContourIntegral Close Closed CloseKernels ClosenessCentrality Closing ClosingAutoSave ClosingEvent CloudAccountData CloudBase CloudConnect CloudDeploy CloudDirectory CloudDisconnect CloudEvaluate CloudExport CloudExpression CloudExpressions CloudFunction CloudGet CloudImport CloudLoggingData CloudObject CloudObjectInformation CloudObjectInformationData CloudObjectNameFormat CloudObjects CloudObjectURLType CloudPublish CloudPut CloudRenderingMethod CloudSave CloudShare CloudSubmit CloudSymbol CloudUnshare ClusterClassify ClusterDissimilarityFunction ClusteringComponents ClusteringTree CMYKColor Coarse CodeAssistOptions Coefficient CoefficientArrays CoefficientDomain CoefficientList CoefficientRules CoifletWavelet Collect Colon ColonForm ColorBalance ColorCombine ColorConvert ColorCoverage ColorData ColorDataFunction ColorDetect ColorDistance ColorFunction ColorFunctionScaling Colorize ColorNegate ColorOutput ColorProfileData ColorQ ColorQuantize ColorReplace ColorRules ColorSelectorSettings ColorSeparate ColorSetter ColorSetterBox ColorSetterBoxOptions ColorSlider ColorsNear ColorSpace ColorToneMapping Column ColumnAlignments ColumnBackgrounds ColumnForm ColumnLines ColumnsEqual ColumnSpacings ColumnWidths CombinedEntityClass CombinerFunction CometData CommonDefaultFormatTypes Commonest CommonestFilter CommonName CommonUnits CommunityBoundaryStyle CommunityGraphPlot CommunityLabels CommunityRegionStyle CompanyData CompatibleUnitQ CompilationOptions CompilationTarget Compile Compiled CompiledCodeFunction CompiledFunction CompilerOptions Complement CompleteGraph CompleteGraphQ CompleteKaryTree CompletionsListPacket Complex Complexes ComplexExpand ComplexInfinity ComplexityFunction ComplexListPlot ComplexPlot ComplexPlot3D ComponentMeasurements ComponentwiseContextMenu Compose ComposeList ComposeSeries CompositeQ Composition CompoundElement CompoundExpression CompoundPoissonDistribution CompoundPoissonProcess CompoundRenewalProcess Compress CompressedData ComputeUncertainty Condition ConditionalExpression Conditioned Cone ConeBox ConfidenceLevel ConfidenceRange ConfidenceTransform ConfigurationPath ConformAudio ConformImages Congruent ConicHullRegion ConicHullRegion3DBox ConicHullRegionBox ConicOptimization Conjugate ConjugateTranspose Conjunction Connect ConnectedComponents ConnectedGraphComponents ConnectedGraphQ ConnectedMeshComponents ConnectedMoleculeComponents ConnectedMoleculeQ ConnectionSettings ConnectLibraryCallbackFunction ConnectSystemModelComponents ConnesWindow ConoverTest ConsoleMessage ConsoleMessagePacket ConsolePrint Constant ConstantArray ConstantArrayLayer ConstantImage ConstantPlusLayer ConstantRegionQ Constants ConstantTimesLayer ConstellationData ConstrainedMax ConstrainedMin Construct Containing ContainsAll ContainsAny ContainsExactly ContainsNone ContainsOnly ContentFieldOptions ContentLocationFunction ContentObject ContentPadding ContentsBoundingBox ContentSelectable ContentSize Context ContextMenu Contexts ContextToFileName Continuation Continue ContinuedFraction ContinuedFractionK ContinuousAction ContinuousMarkovProcess ContinuousTask ContinuousTimeModelQ ContinuousWaveletData ContinuousWaveletTransform ContourDetect ContourGraphics ContourIntegral ContourLabels ContourLines ContourPlot ContourPlot3D Contours ContourShading ContourSmoothing ContourStyle ContraharmonicMean ContrastiveLossLayer Control ControlActive ControlAlignment ControlGroupContentsBox ControllabilityGramian ControllabilityMatrix ControllableDecomposition ControllableModelQ ControllerDuration ControllerInformation ControllerInformationData ControllerLinking ControllerManipulate ControllerMethod ControllerPath ControllerState ControlPlacement ControlsRendering ControlType Convergents ConversionOptions ConversionRules ConvertToBitmapPacket ConvertToPostScript ConvertToPostScriptPacket ConvexHullMesh ConvexPolygonQ ConvexPolyhedronQ ConvolutionLayer Convolve ConwayGroupCo1 ConwayGroupCo2 ConwayGroupCo3 CookieFunction Cookies CoordinateBoundingBox CoordinateBoundingBoxArray CoordinateBounds CoordinateBoundsArray CoordinateChartData CoordinatesToolOptions CoordinateTransform CoordinateTransformData CoprimeQ Coproduct CopulaDistribution Copyable CopyDatabin CopyDirectory CopyFile CopyTag CopyToClipboard CornerFilter CornerNeighbors Correlation CorrelationDistance CorrelationFunction CorrelationTest Cos Cosh CoshIntegral CosineDistance CosineWindow CosIntegral Cot Coth Count CountDistinct CountDistinctBy CounterAssignments CounterBox CounterBoxOptions CounterClockwiseContourIntegral CounterEvaluator CounterFunction CounterIncrements CounterStyle CounterStyleMenuListing CountRoots CountryData Counts CountsBy Covariance CovarianceEstimatorFunction CovarianceFunction CoxianDistribution CoxIngersollRossProcess CoxModel CoxModelFit CramerVonMisesTest CreateArchive CreateCellID CreateChannel CreateCloudExpression CreateDatabin CreateDataSystemModel CreateDialog CreateDirectory CreateDocument CreateFile CreateIntermediateDirectories CreateManagedLibraryExpression CreateNotebook CreatePalette CreatePalettePacket CreatePermissionsGroup CreateScheduledTask CreateSearchIndex CreateSystemModel CreateTemporary CreateUUID CreateWindow CriterionFunction CriticalityFailureImportance CriticalitySuccessImportance CriticalSection Cross CrossEntropyLossLayer CrossingCount CrossingDetect CrossingPolygon CrossMatrix Csc Csch CTCLossLayer Cube CubeRoot Cubics Cuboid CuboidBox Cumulant CumulantGeneratingFunction Cup CupCap Curl CurlyDoubleQuote CurlyQuote CurrencyConvert CurrentDate CurrentImage CurrentlySpeakingPacket CurrentNotebookImage CurrentScreenImage CurrentValue Curry CurvatureFlowFilter CurveClosed Cyan CycleGraph CycleIndexPolynomial Cycles CyclicGroup Cyclotomic Cylinder CylinderBox CylindricalDecompositionD DagumDistribution DamData DamerauLevenshteinDistance DampingFactor Darker Dashed Dashing DatabaseConnect DatabaseDisconnect DatabaseReference Databin DatabinAdd DatabinRemove Databins DatabinUpload DataCompression DataDistribution DataRange DataReversed Dataset Date DateBounds Dated DateDelimiters DateDifference DatedUnit DateFormat DateFunction DateHistogram DateList DateListLogPlot DateListPlot DateListStepPlot DateObject DateObjectQ DateOverlapsQ DatePattern DatePlus DateRange DateReduction DateString DateTicksFormat DateValue DateWithinQ DaubechiesWavelet DavisDistribution DawsonF DayCount DayCountConvention DayHemisphere DaylightQ DayMatchQ DayName DayNightTerminator DayPlus DayRange DayRound DeBruijnGraph DeBruijnSequence Debug DebugTag Decapitalize Decimal DecimalForm DeclareKnownSymbols DeclarePackage Decompose DeconvolutionLayer Decrement Decrypt DecryptFile DedekindEta DeepSpaceProbeData Default DefaultAxesStyle DefaultBaseStyle DefaultBoxStyle DefaultButton DefaultColor DefaultControlPlacement DefaultDuplicateCellStyle DefaultDuration DefaultElement DefaultFaceGridsStyle DefaultFieldHintStyle DefaultFont DefaultFontProperties DefaultFormatType DefaultFormatTypeForStyle DefaultFrameStyle DefaultFrameTicksStyle DefaultGridLinesStyle DefaultInlineFormatType DefaultInputFormatType DefaultLabelStyle DefaultMenuStyle DefaultNaturalLanguage DefaultNewCellStyle DefaultNewInlineCellStyle DefaultNotebook DefaultOptions DefaultOutputFormatType DefaultPrintPrecision DefaultStyle DefaultStyleDefinitions DefaultTextFormatType DefaultTextInlineFormatType DefaultTicksStyle DefaultTooltipStyle DefaultValue DefaultValues Defer DefineExternal DefineInputStreamMethod DefineOutputStreamMethod DefineResourceFunction Definition Degree DegreeCentrality DegreeGraphDistribution DegreeLexicographic DegreeReverseLexicographic DEigensystem DEigenvalues Deinitialization Del DelaunayMesh Delayed Deletable Delete DeleteAnomalies DeleteBorderComponents DeleteCases DeleteChannel DeleteCloudExpression DeleteContents DeleteDirectory DeleteDuplicates DeleteDuplicatesBy DeleteFile DeleteMissing DeleteObject DeletePermissionsKey DeleteSearchIndex DeleteSmallComponents DeleteStopwords DeleteWithContents DeletionWarning DelimitedArray DelimitedSequence Delimiter DelimiterFlashTime DelimiterMatching Delimiters DeliveryFunction Dendrogram Denominator DensityGraphics DensityHistogram DensityPlot DensityPlot3D DependentVariables Deploy Deployed Depth DepthFirstScan Derivative DerivativeFilter DerivedKey DescriptorStateSpace DesignMatrix DestroyAfterEvaluation Det DeviceClose DeviceConfigure DeviceExecute DeviceExecuteAsynchronous DeviceObject DeviceOpen DeviceOpenQ DeviceRead DeviceReadBuffer DeviceReadLatest DeviceReadList DeviceReadTimeSeries Devices DeviceStreams DeviceWrite DeviceWriteBuffer DGaussianWavelet DiacriticalPositioning Diagonal DiagonalizableMatrixQ DiagonalMatrix DiagonalMatrixQ Dialog DialogIndent DialogInput DialogLevel DialogNotebook DialogProlog DialogReturn DialogSymbols Diamond DiamondMatrix DiceDissimilarity DictionaryLookup DictionaryWordQ DifferenceDelta DifferenceOrder DifferenceQuotient DifferenceRoot DifferenceRootReduce Differences DifferentialD DifferentialRoot DifferentialRootReduce DifferentiatorFilter DigitalSignature DigitBlock DigitBlockMinimum DigitCharacter DigitCount DigitQ DihedralAngle DihedralGroup Dilation DimensionalCombinations DimensionalMeshComponents DimensionReduce DimensionReducerFunction DimensionReduction Dimensions DiracComb DiracDelta DirectedEdge DirectedEdges DirectedGraph DirectedGraphQ DirectedInfinity Direction Directive Directory DirectoryName DirectoryQ DirectoryStack DirichletBeta DirichletCharacter DirichletCondition DirichletConvolve DirichletDistribution DirichletEta DirichletL DirichletLambda DirichletTransform DirichletWindow DisableConsolePrintPacket DisableFormatting DiscreteChirpZTransform DiscreteConvolve DiscreteDelta DiscreteHadamardTransform DiscreteIndicator DiscreteLimit DiscreteLQEstimatorGains DiscreteLQRegulatorGains DiscreteLyapunovSolve DiscreteMarkovProcess DiscreteMaxLimit DiscreteMinLimit DiscretePlot DiscretePlot3D DiscreteRatio DiscreteRiccatiSolve DiscreteShift DiscreteTimeModelQ DiscreteUniformDistribution DiscreteVariables DiscreteWaveletData DiscreteWaveletPacketTransform DiscreteWaveletTransform DiscretizeGraphics DiscretizeRegion Discriminant DisjointQ Disjunction Disk DiskBox DiskMatrix DiskSegment Dispatch DispatchQ DispersionEstimatorFunction Display DisplayAllSteps DisplayEndPacket DisplayFlushImagePacket DisplayForm DisplayFunction DisplayPacket DisplayRules DisplaySetSizePacket DisplayString DisplayTemporary DisplayWith DisplayWithRef DisplayWithVariable DistanceFunction DistanceMatrix DistanceTransform Distribute Distributed DistributedContexts DistributeDefinitions DistributionChart DistributionDomain DistributionFitTest DistributionParameterAssumptions DistributionParameterQ Dithering Div Divergence Divide DivideBy Dividers DivideSides Divisible Divisors DivisorSigma DivisorSum DMSList DMSString Do DockedCells DocumentGenerator DocumentGeneratorInformation DocumentGeneratorInformationData DocumentGenerators DocumentNotebook DocumentWeightingRules Dodecahedron DomainRegistrationInformation DominantColors DOSTextFormat Dot DotDashed DotEqual DotLayer DotPlusLayer Dotted DoubleBracketingBar DoubleContourIntegral DoubleDownArrow DoubleLeftArrow DoubleLeftRightArrow DoubleLeftTee DoubleLongLeftArrow DoubleLongLeftRightArrow DoubleLongRightArrow DoubleRightArrow DoubleRightTee DoubleUpArrow DoubleUpDownArrow DoubleVerticalBar DoublyInfinite Down DownArrow DownArrowBar DownArrowUpArrow DownLeftRightVector DownLeftTeeVector DownLeftVector DownLeftVectorBar DownRightTeeVector DownRightVector DownRightVectorBar Downsample DownTee DownTeeArrow DownValues DragAndDrop DrawEdges DrawFrontFaces DrawHighlighted Drop DropoutLayer DSolve DSolveValue Dt DualLinearProgramming DualPolyhedron DualSystemsModel DumpGet DumpSave DuplicateFreeQ Duration Dynamic DynamicBox DynamicBoxOptions DynamicEvaluationTimeout DynamicGeoGraphics DynamicImage DynamicLocation DynamicModule DynamicModuleBox DynamicModuleBoxOptions DynamicModuleParent DynamicModuleValues DynamicName DynamicNamespace DynamicReference DynamicSetting DynamicUpdating DynamicWrapper DynamicWrapperBox DynamicWrapperBoxOptionsE EarthImpactData EarthquakeData EccentricityCentrality Echo EchoFunction EclipseType EdgeAdd EdgeBetweennessCentrality EdgeCapacity EdgeCapForm EdgeColor EdgeConnectivity EdgeContract EdgeCost EdgeCount EdgeCoverQ EdgeCycleMatrix EdgeDashing EdgeDelete EdgeDetect EdgeForm EdgeIndex EdgeJoinForm EdgeLabeling EdgeLabels EdgeLabelStyle EdgeList EdgeOpacity EdgeQ EdgeRenderingFunction EdgeRules EdgeShapeFunction EdgeStyle EdgeThickness EdgeWeight EdgeWeightedGraphQ Editable EditButtonSettings EditCellTagsSettings EditDistance EffectiveInterest Eigensystem Eigenvalues EigenvectorCentrality Eigenvectors Element ElementData ElementwiseLayer ElidedForms Eliminate EliminationOrder Ellipsoid EllipticE EllipticExp EllipticExpPrime EllipticF EllipticFilterModel EllipticK EllipticLog EllipticNomeQ EllipticPi EllipticReducedHalfPeriods EllipticTheta EllipticThetaPrime EmbedCode EmbeddedHTML EmbeddedService EmbeddingLayer EmbeddingObject EmitSound EmphasizeSyntaxErrors EmpiricalDistribution Empty EmptyGraphQ EmptyRegion EnableConsolePrintPacket Enabled Encode Encrypt EncryptedObject EncryptFile End EndAdd EndDialogPacket EndFrontEndInteractionPacket EndOfBuffer EndOfFile EndOfLine EndOfString EndPackage EngineEnvironment EngineeringForm Enter EnterExpressionPacket EnterTextPacket Entity EntityClass EntityClassList EntityCopies EntityFunction EntityGroup EntityInstance EntityList EntityPrefetch EntityProperties EntityProperty EntityPropertyClass EntityRegister EntityStore EntityStores EntityTypeName EntityUnregister EntityValue Entropy EntropyFilter Environment Epilog EpilogFunction Equal EqualColumns EqualRows EqualTilde EqualTo EquatedTo Equilibrium EquirippleFilterKernel Equivalent Erf Erfc Erfi ErlangB ErlangC ErlangDistribution Erosion ErrorBox ErrorBoxOptions ErrorNorm ErrorPacket ErrorsDialogSettings EscapeRadius EstimatedBackground EstimatedDistribution EstimatedProcess EstimatorGains EstimatorRegulator EuclideanDistance EulerAngles EulerCharacteristic EulerE EulerGamma EulerianGraphQ EulerMatrix EulerPhi Evaluatable Evaluate Evaluated EvaluatePacket EvaluateScheduledTask EvaluationBox EvaluationCell EvaluationCompletionAction EvaluationData EvaluationElements EvaluationEnvironment EvaluationMode EvaluationMonitor EvaluationNotebook EvaluationObject EvaluationOrder Evaluator EvaluatorNames EvenQ EventData EventEvaluator EventHandler EventHandlerTag EventLabels EventSeries ExactBlackmanWindow ExactNumberQ ExactRootIsolation ExampleData Except ExcludedForms ExcludedLines ExcludedPhysicalQuantities ExcludePods Exclusions ExclusionsStyle Exists Exit ExitDialog ExoplanetData Exp Expand ExpandAll ExpandDenominator ExpandFileName ExpandNumerator Expectation ExpectationE ExpectedValue ExpGammaDistribution ExpIntegralE ExpIntegralEi ExpirationDate Exponent ExponentFunction ExponentialDistribution ExponentialFamily ExponentialGeneratingFunction ExponentialMovingAverage ExponentialPowerDistribution ExponentPosition ExponentStep Export ExportAutoReplacements ExportByteArray ExportForm ExportPacket ExportString Expression ExpressionCell ExpressionPacket ExpressionUUID ExpToTrig ExtendedEntityClass ExtendedGCD Extension ExtentElementFunction ExtentMarkers ExtentSize ExternalBundle ExternalCall ExternalDataCharacterEncoding ExternalEvaluate ExternalFunction ExternalFunctionName ExternalObject ExternalOptions ExternalSessionObject ExternalSessions ExternalTypeSignature ExternalValue Extract ExtractArchive ExtractLayer ExtremeValueDistributionFaceForm FaceGrids FaceGridsStyle FacialFeatures Factor FactorComplete Factorial Factorial2 FactorialMoment FactorialMomentGeneratingFunction FactorialPower FactorInteger FactorList FactorSquareFree FactorSquareFreeList FactorTerms FactorTermsList Fail Failure FailureAction FailureDistribution FailureQ False FareySequence FARIMAProcess FeatureDistance FeatureExtract FeatureExtraction FeatureExtractor FeatureExtractorFunction FeatureNames FeatureNearest FeatureSpacePlot FeatureSpacePlot3D FeatureTypes FEDisableConsolePrintPacket FeedbackLinearize FeedbackSector FeedbackSectorStyle FeedbackType FEEnableConsolePrintPacket FetalGrowthData Fibonacci Fibonorial FieldCompletionFunction FieldHint FieldHintStyle FieldMasked FieldSize File FileBaseName FileByteCount FileConvert FileDate FileExistsQ FileExtension FileFormat FileHandler FileHash FileInformation FileName FileNameDepth FileNameDialogSettings FileNameDrop FileNameForms FileNameJoin FileNames FileNameSetter FileNameSplit FileNameTake FilePrint FileSize FileSystemMap FileSystemScan FileTemplate FileTemplateApply FileType FilledCurve FilledCurveBox FilledCurveBoxOptions Filling FillingStyle FillingTransform FilteredEntityClass FilterRules FinancialBond FinancialData FinancialDerivative FinancialIndicator Find FindAnomalies FindArgMax FindArgMin FindChannels FindClique FindClusters FindCookies FindCurvePath FindCycle FindDevices FindDistribution FindDistributionParameters FindDivisions FindEdgeCover FindEdgeCut FindEdgeIndependentPaths FindEquationalProof FindEulerianCycle FindExternalEvaluators FindFaces FindFile FindFit FindFormula FindFundamentalCycles FindGeneratingFunction FindGeoLocation FindGeometricConjectures FindGeometricTransform FindGraphCommunities FindGraphIsomorphism FindGraphPartition FindHamiltonianCycle FindHamiltonianPath FindHiddenMarkovStates FindIndependentEdgeSet FindIndependentVertexSet FindInstance FindIntegerNullVector FindKClan FindKClique FindKClub FindKPlex FindLibrary FindLinearRecurrence FindList FindMatchingColor FindMaximum FindMaximumFlow FindMaxValue FindMeshDefects FindMinimum FindMinimumCostFlow FindMinimumCut FindMinValue FindMoleculeSubstructure FindPath FindPeaks FindPermutation FindPostmanTour FindProcessParameters FindRepeat FindRoot FindSequenceFunction FindSettings FindShortestPath FindShortestTour FindSpanningTree FindSystemModelEquilibrium FindTextualAnswer FindThreshold FindTransientRepeat FindVertexCover FindVertexCut FindVertexIndependentPaths Fine FinishDynamic FiniteAbelianGroupCount FiniteGroupCount FiniteGroupData First FirstCase FirstPassageTimeDistribution FirstPosition FischerGroupFi22 FischerGroupFi23 FischerGroupFi24Prime FisherHypergeometricDistribution FisherRatioTest FisherZDistribution Fit FitAll FitRegularization FittedModel FixedOrder FixedPoint FixedPointList FlashSelection Flat Flatten FlattenAt FlattenLayer FlatTopWindow FlipView Floor FlowPolynomial FlushPrintOutputPacket Fold FoldList FoldPair FoldPairList FollowRedirects Font FontColor FontFamily FontForm FontName FontOpacity FontPostScriptName FontProperties FontReencoding FontSize FontSlant FontSubstitutions FontTracking FontVariations FontWeight For ForAll Format FormatRules FormatType FormatTypeAutoConvert FormatValues FormBox FormBoxOptions FormControl FormFunction FormLayoutFunction FormObject FormPage FormTheme FormulaData FormulaLookup FortranForm Forward ForwardBackward Fourier FourierCoefficient FourierCosCoefficient FourierCosSeries FourierCosTransform FourierDCT FourierDCTFilter FourierDCTMatrix FourierDST FourierDSTMatrix FourierMatrix FourierParameters FourierSequenceTransform FourierSeries FourierSinCoefficient FourierSinSeries FourierSinTransform FourierTransform FourierTrigSeries FractionalBrownianMotionProcess FractionalGaussianNoiseProcess FractionalPart FractionBox FractionBoxOptions FractionLine Frame FrameBox FrameBoxOptions Framed FrameInset FrameLabel Frameless FrameMargins FrameRate FrameStyle FrameTicks FrameTicksStyle FRatioDistribution FrechetDistribution FreeQ FrenetSerretSystem FrequencySamplingFilterKernel FresnelC FresnelF FresnelG FresnelS Friday FrobeniusNumber FrobeniusSolve FromAbsoluteTime FromCharacterCode FromCoefficientRules FromContinuedFraction FromDate FromDigits FromDMS FromEntity FromJulianDate FromLetterNumber FromPolarCoordinates FromRomanNumeral FromSphericalCoordinates FromUnixTime Front FrontEndDynamicExpression FrontEndEventActions FrontEndExecute FrontEndObject FrontEndResource FrontEndResourceString FrontEndStackSize FrontEndToken FrontEndTokenExecute FrontEndValueCache FrontEndVersion FrontFaceColor FrontFaceOpacity Full FullAxes FullDefinition FullForm FullGraphics FullInformationOutputRegulator FullOptions FullRegion FullSimplify Function FunctionCompile FunctionCompileExport FunctionCompileExportByteArray FunctionCompileExportLibrary FunctionCompileExportString FunctionDomain FunctionExpand FunctionInterpolation FunctionPeriod FunctionRange FunctionSpace FussellVeselyImportanceGaborFilter GaborMatrix GaborWavelet GainMargins GainPhaseMargins GalaxyData GalleryView Gamma GammaDistribution GammaRegularized GapPenalty GARCHProcess GatedRecurrentLayer Gather GatherBy GaugeFaceElementFunction GaugeFaceStyle GaugeFrameElementFunction GaugeFrameSize GaugeFrameStyle GaugeLabels GaugeMarkers GaugeStyle GaussianFilter GaussianIntegers GaussianMatrix GaussianOrthogonalMatrixDistribution GaussianSymplecticMatrixDistribution GaussianUnitaryMatrixDistribution GaussianWindow GCD GegenbauerC General GeneralizedLinearModelFit GenerateAsymmetricKeyPair GenerateConditions GeneratedCell GeneratedDocumentBinding GenerateDerivedKey GenerateDigitalSignature GenerateDocument GeneratedParameters GeneratedQuantityMagnitudes GenerateHTTPResponse GenerateSecuredAuthenticationKey GenerateSymmetricKey GeneratingFunction GeneratorDescription GeneratorHistoryLength GeneratorOutputType Generic GenericCylindricalDecomposition GenomeData GenomeLookup GeoAntipode GeoArea GeoArraySize GeoBackground GeoBoundingBox GeoBounds GeoBoundsRegion GeoBubbleChart GeoCenter GeoCircle GeodesicClosing GeodesicDilation GeodesicErosion GeodesicOpening GeoDestination GeodesyData GeoDirection GeoDisk GeoDisplacement GeoDistance GeoDistanceList GeoElevationData GeoEntities GeoGraphics GeogravityModelData GeoGridDirectionDifference GeoGridLines GeoGridLinesStyle GeoGridPosition GeoGridRange GeoGridRangePadding GeoGridUnitArea GeoGridUnitDistance GeoGridVector GeoGroup GeoHemisphere GeoHemisphereBoundary GeoHistogram GeoIdentify GeoImage GeoLabels GeoLength GeoListPlot GeoLocation GeologicalPeriodData GeomagneticModelData GeoMarker GeometricAssertion GeometricBrownianMotionProcess GeometricDistribution GeometricMean GeometricMeanFilter GeometricScene GeometricTransformation GeometricTransformation3DBox GeometricTransformation3DBoxOptions GeometricTransformationBox GeometricTransformationBoxOptions GeoModel GeoNearest GeoPath GeoPosition GeoPositionENU GeoPositionXYZ GeoProjection GeoProjectionData GeoRange GeoRangePadding GeoRegionValuePlot GeoResolution GeoScaleBar GeoServer GeoSmoothHistogram GeoStreamPlot GeoStyling GeoStylingImageFunction GeoVariant GeoVector GeoVectorENU GeoVectorPlot GeoVectorXYZ GeoVisibleRegion GeoVisibleRegionBoundary GeoWithinQ GeoZoomLevel GestureHandler GestureHandlerTag Get GetBoundingBoxSizePacket GetContext GetEnvironment GetFileName GetFrontEndOptionsDataPacket GetLinebreakInformationPacket GetMenusPacket GetPageBreakInformationPacket Glaisher GlobalClusteringCoefficient GlobalPreferences GlobalSession Glow GoldenAngle GoldenRatio GompertzMakehamDistribution GoodmanKruskalGamma GoodmanKruskalGammaTest Goto Grad Gradient GradientFilter GradientOrientationFilter GrammarApply GrammarRules GrammarToken Graph Graph3D GraphAssortativity GraphAutomorphismGroup GraphCenter GraphComplement GraphData GraphDensity GraphDiameter GraphDifference GraphDisjointUnion GraphDistance GraphDistanceMatrix GraphElementData GraphEmbedding GraphHighlight GraphHighlightStyle GraphHub Graphics Graphics3D Graphics3DBox Graphics3DBoxOptions GraphicsArray GraphicsBaseline GraphicsBox GraphicsBoxOptions GraphicsColor GraphicsColumn GraphicsComplex GraphicsComplex3DBox GraphicsComplex3DBoxOptions GraphicsComplexBox GraphicsComplexBoxOptions GraphicsContents GraphicsData GraphicsGrid GraphicsGridBox GraphicsGroup GraphicsGroup3DBox GraphicsGroup3DBoxOptions GraphicsGroupBox GraphicsGroupBoxOptions GraphicsGrouping GraphicsHighlightColor GraphicsRow GraphicsSpacing GraphicsStyle GraphIntersection GraphLayout GraphLinkEfficiency GraphPeriphery GraphPlot GraphPlot3D GraphPower GraphPropertyDistribution GraphQ GraphRadius GraphReciprocity GraphRoot GraphStyle GraphUnion Gray GrayLevel Greater GreaterEqual GreaterEqualLess GreaterEqualThan GreaterFullEqual GreaterGreater GreaterLess GreaterSlantEqual GreaterThan GreaterTilde Green GreenFunction Grid GridBaseline GridBox GridBoxAlignment GridBoxBackground GridBoxDividers GridBoxFrame GridBoxItemSize GridBoxItemStyle GridBoxOptions GridBoxSpacings GridCreationSettings GridDefaultElement GridElementStyleOptions GridFrame GridFrameMargins GridGraph GridLines GridLinesStyle GroebnerBasis GroupActionBase GroupBy GroupCentralizer GroupElementFromWord GroupElementPosition GroupElementQ GroupElements GroupElementToWord GroupGenerators Groupings GroupMultiplicationTable GroupOrbits GroupOrder GroupPageBreakWithin GroupSetwiseStabilizer GroupStabilizer GroupStabilizerChain GroupTogetherGrouping GroupTogetherNestedGrouping GrowCutComponents Gudermannian GuidedFilter GumbelDistributionHaarWavelet HadamardMatrix HalfLine HalfNormalDistribution HalfPlane HalfSpace HamiltonianGraphQ HammingDistance HammingWindow HandlerFunctions HandlerFunctionsKeys HankelH1 HankelH2 HankelMatrix HankelTransform HannPoissonWindow HannWindow HaradaNortonGroupHN HararyGraph HarmonicMean HarmonicMeanFilter HarmonicNumber Hash Haversine HazardFunction Head HeadCompose HeaderLines Heads HeavisideLambda HeavisidePi HeavisideTheta HeldGroupHe HeldPart HelpBrowserLookup HelpBrowserNotebook HelpBrowserSettings Here HermiteDecomposition HermiteH HermitianMatrixQ HessenbergDecomposition Hessian HexadecimalCharacter Hexahedron HexahedronBox HexahedronBoxOptions HiddenMarkovProcess HiddenSurface Highlighted HighlightGraph HighlightImage HighlightMesh HighpassFilter HigmanSimsGroupHS HilbertCurve HilbertFilter HilbertMatrix Histogram Histogram3D HistogramDistribution HistogramList HistogramTransform HistogramTransformInterpolation HistoricalPeriodData HitMissTransform HITSCentrality HjorthDistribution HodgeDual HoeffdingD HoeffdingDTest Hold HoldAll HoldAllComplete HoldComplete HoldFirst HoldForm HoldPattern HoldRest HolidayCalendar HomeDirectory HomePage Horizontal HorizontalForm HorizontalGauge HorizontalScrollPosition HornerForm HostLookup HotellingTSquareDistribution HoytDistribution HTMLSave HTTPErrorResponse HTTPRedirect HTTPRequest HTTPRequestData HTTPResponse Hue HumanGrowthData HumpDownHump HumpEqual HurwitzLerchPhi HurwitzZeta HyperbolicDistribution HypercubeGraph HyperexponentialDistribution Hyperfactorial Hypergeometric0F1 Hypergeometric0F1Regularized Hypergeometric1F1 Hypergeometric1F1Regularized Hypergeometric2F1 Hypergeometric2F1Regularized HypergeometricDistribution HypergeometricPFQ HypergeometricPFQRegularized HypergeometricU Hyperlink HyperlinkCreationSettings Hyperplane Hyphenation HyphenationOptions HypoexponentialDistribution HypothesisTestDataI IconData Iconize IconizedObject IconRules Icosahedron Identity IdentityMatrix If IgnoreCase IgnoreDiacritics IgnorePunctuation IgnoreSpellCheck IgnoringInactive Im Image Image3D Image3DProjection Image3DSlices ImageAccumulate ImageAdd ImageAdjust ImageAlign ImageApply ImageApplyIndexed ImageAspectRatio ImageAssemble ImageAugmentationLayer ImageBoundingBoxes ImageCache ImageCacheValid ImageCapture ImageCaptureFunction ImageCases ImageChannels ImageClip ImageCollage ImageColorSpace ImageCompose ImageContainsQ ImageContents ImageConvolve ImageCooccurrence ImageCorners ImageCorrelate ImageCorrespondingPoints ImageCrop ImageData ImageDeconvolve ImageDemosaic ImageDifference ImageDimensions ImageDisplacements ImageDistance ImageEffect ImageExposureCombine ImageFeatureTrack ImageFileApply ImageFileFilter ImageFileScan ImageFilter ImageFocusCombine ImageForestingComponents ImageFormattingWidth ImageForwardTransformation ImageGraphics ImageHistogram ImageIdentify ImageInstanceQ ImageKeypoints ImageLevels ImageLines ImageMargins ImageMarker ImageMarkers ImageMeasurements ImageMesh ImageMultiply ImageOffset ImagePad ImagePadding ImagePartition ImagePeriodogram ImagePerspectiveTransformation ImagePosition ImagePreviewFunction ImagePyramid ImagePyramidApply ImageQ ImageRangeCache ImageRecolor ImageReflect ImageRegion ImageResize ImageResolution ImageRestyle ImageRotate ImageRotated ImageSaliencyFilter ImageScaled ImageScan ImageSize ImageSizeAction ImageSizeCache ImageSizeMultipliers ImageSizeRaw ImageSubtract ImageTake ImageTransformation ImageTrim ImageType ImageValue ImageValuePositions ImagingDevice ImplicitRegion Implies Import ImportAutoReplacements ImportByteArray ImportOptions ImportString ImprovementImportance In Inactivate Inactive IncidenceGraph IncidenceList IncidenceMatrix IncludeAromaticBonds IncludeConstantBasis IncludeDefinitions IncludeDirectories IncludeFileExtension IncludeGeneratorTasks IncludeHydrogens IncludeInflections IncludeMetaInformation IncludePods IncludeQuantities IncludeRelatedTables IncludeSingularTerm IncludeWindowTimes Increment IndefiniteMatrixQ Indent IndentingNewlineSpacings IndentMaxFraction IndependenceTest IndependentEdgeSetQ IndependentPhysicalQuantity IndependentUnit IndependentUnitDimension IndependentVertexSetQ Indeterminate IndeterminateThreshold IndexCreationOptions Indexed IndexGraph IndexTag Inequality InexactNumberQ InexactNumbers InfiniteLine InfinitePlane Infinity Infix InflationAdjust InflationMethod Information InformationData InformationDataGrid Inherited InheritScope InhomogeneousPoissonProcess InitialEvaluationHistory Initialization InitializationCell InitializationCellEvaluation InitializationCellWarning InitializationObjects InitializationValue Initialize InitialSeeding InlineCounterAssignments InlineCounterIncrements InlineRules Inner InnerPolygon InnerPolyhedron Inpaint Input InputAliases InputAssumptions InputAutoReplacements InputField InputFieldBox InputFieldBoxOptions InputForm InputGrouping InputNamePacket InputNotebook InputPacket InputSettings InputStream InputString InputStringPacket InputToBoxFormPacket Insert InsertionFunction InsertionPointObject InsertLinebreaks InsertResults Inset Inset3DBox Inset3DBoxOptions InsetBox InsetBoxOptions Insphere Install InstallService InstanceNormalizationLayer InString Integer IntegerDigits IntegerExponent IntegerLength IntegerName IntegerPart IntegerPartitions IntegerQ IntegerReverse Integers IntegerString Integral Integrate Interactive InteractiveTradingChart Interlaced Interleaving InternallyBalancedDecomposition InterpolatingFunction InterpolatingPolynomial Interpolation InterpolationOrder InterpolationPoints InterpolationPrecision Interpretation InterpretationBox InterpretationBoxOptions InterpretationFunction Interpreter InterpretTemplate InterquartileRange Interrupt InterruptSettings IntersectingQ Intersection Interval IntervalIntersection IntervalMarkers IntervalMarkersStyle IntervalMemberQ IntervalSlider IntervalUnion Into Inverse InverseBetaRegularized InverseCDF InverseChiSquareDistribution InverseContinuousWaveletTransform InverseDistanceTransform InverseEllipticNomeQ InverseErf InverseErfc InverseFourier InverseFourierCosTransform InverseFourierSequenceTransform InverseFourierSinTransform InverseFourierTransform InverseFunction InverseFunctions InverseGammaDistribution InverseGammaRegularized InverseGaussianDistribution InverseGudermannian InverseHankelTransform InverseHaversine InverseImagePyramid InverseJacobiCD InverseJacobiCN InverseJacobiCS InverseJacobiDC InverseJacobiDN InverseJacobiDS InverseJacobiNC InverseJacobiND InverseJacobiNS InverseJacobiSC InverseJacobiSD InverseJacobiSN InverseLaplaceTransform InverseMellinTransform InversePermutation InverseRadon InverseRadonTransform InverseSeries InverseShortTimeFourier InverseSpectrogram InverseSurvivalFunction InverseTransformedRegion InverseWaveletTransform InverseWeierstrassP InverseWishartMatrixDistribution InverseZTransform Invisible InvisibleApplication InvisibleTimes IPAddress IrreduciblePolynomialQ IslandData IsolatingInterval IsomorphicGraphQ IsotopeData Italic Item ItemAspectRatio ItemBox ItemBoxOptions ItemSize ItemStyle ItoProcessJaccardDissimilarity JacobiAmplitude Jacobian JacobiCD JacobiCN JacobiCS JacobiDC JacobiDN JacobiDS JacobiNC JacobiND JacobiNS JacobiP JacobiSC JacobiSD JacobiSN JacobiSymbol JacobiZeta JankoGroupJ1 JankoGroupJ2 JankoGroupJ3 JankoGroupJ4 JarqueBeraALMTest JohnsonDistribution Join JoinAcross Joined JoinedCurve JoinedCurveBox JoinedCurveBoxOptions JoinForm JordanDecomposition JordanModelDecomposition JulianDate JuliaSetBoettcher JuliaSetIterationCount JuliaSetPlot JuliaSetPointsK KagiChart KaiserBesselWindow KaiserWindow KalmanEstimator KalmanFilter KarhunenLoeveDecomposition KaryTree KatzCentrality KCoreComponents KDistribution KEdgeConnectedComponents KEdgeConnectedGraphQ KelvinBei KelvinBer KelvinKei KelvinKer KendallTau KendallTauTest KernelExecute KernelFunction KernelMixtureDistribution Kernels Ket Key KeyCollisionFunction KeyComplement KeyDrop KeyDropFrom KeyExistsQ KeyFreeQ KeyIntersection KeyMap KeyMemberQ KeypointStrength Keys KeySelect KeySort KeySortBy KeyTake KeyUnion KeyValueMap KeyValuePattern Khinchin KillProcess KirchhoffGraph KirchhoffMatrix KleinInvariantJ KnapsackSolve KnightTourGraph KnotData KnownUnitQ KochCurve KolmogorovSmirnovTest KroneckerDelta KroneckerModelDecomposition KroneckerProduct KroneckerSymbol KuiperTest KumaraswamyDistribution Kurtosis KuwaharaFilter KVertexConnectedComponents KVertexConnectedGraphQLABColor Label Labeled LabeledSlider LabelingFunction LabelingSize LabelStyle LabelVisibility LaguerreL LakeData LambdaComponents LambertW LaminaData LanczosWindow LandauDistribution Language LanguageCategory LanguageData LanguageIdentify LanguageOptions LaplaceDistribution LaplaceTransform Laplacian LaplacianFilter LaplacianGaussianFilter Large Larger Last Latitude LatitudeLongitude LatticeData LatticeReduce Launch LaunchKernels LayeredGraphPlot LayerSizeFunction LayoutInformation LCHColor LCM LeaderSize LeafCount LeapYearQ LearnDistribution LearnedDistribution LearningRate LearningRateMultipliers LeastSquares LeastSquaresFilterKernel Left LeftArrow LeftArrowBar LeftArrowRightArrow LeftDownTeeVector LeftDownVector LeftDownVectorBar LeftRightArrow LeftRightVector LeftTee LeftTeeArrow LeftTeeVector LeftTriangle LeftTriangleBar LeftTriangleEqual LeftUpDownVector LeftUpTeeVector LeftUpVector LeftUpVectorBar LeftVector LeftVectorBar LegendAppearance Legended LegendFunction LegendLabel LegendLayout LegendMargins LegendMarkers LegendMarkerSize LegendreP LegendreQ LegendreType Length LengthWhile LerchPhi Less LessEqual LessEqualGreater LessEqualThan LessFullEqual LessGreater LessLess LessSlantEqual LessThan LessTilde LetterCharacter LetterCounts LetterNumber LetterQ Level LeveneTest LeviCivitaTensor LevyDistribution Lexicographic LibraryDataType LibraryFunction LibraryFunctionError LibraryFunctionInformation LibraryFunctionLoad LibraryFunctionUnload LibraryLoad LibraryUnload LicenseID LiftingFilterData LiftingWaveletTransform LightBlue LightBrown LightCyan Lighter LightGray LightGreen Lighting LightingAngle LightMagenta LightOrange LightPink LightPurple LightRed LightSources LightYellow Likelihood Limit LimitsPositioning LimitsPositioningTokens LindleyDistribution Line Line3DBox Line3DBoxOptions LinearFilter LinearFractionalOptimization LinearFractionalTransform LinearGradientImage LinearizingTransformationData LinearLayer LinearModelFit LinearOffsetFunction LinearOptimization LinearProgramming LinearRecurrence LinearSolve LinearSolveFunction LineBox LineBoxOptions LineBreak LinebreakAdjustments LineBreakChart LinebreakSemicolonWeighting LineBreakWithin LineColor LineGraph LineIndent LineIndentMaxFraction LineIntegralConvolutionPlot LineIntegralConvolutionScale LineLegend LineOpacity LineSpacing LineWrapParts LinkActivate LinkClose LinkConnect LinkConnectedQ LinkCreate LinkError LinkFlush LinkFunction LinkHost LinkInterrupt LinkLaunch LinkMode LinkObject LinkOpen LinkOptions LinkPatterns LinkProtocol LinkRankCentrality LinkRead LinkReadHeld LinkReadyQ Links LinkService LinkWrite LinkWriteHeld LiouvilleLambda List Listable ListAnimate ListContourPlot ListContourPlot3D ListConvolve ListCorrelate ListCurvePathPlot ListDeconvolve ListDensityPlot ListDensityPlot3D Listen ListFormat ListFourierSequenceTransform ListInterpolation ListLineIntegralConvolutionPlot ListLinePlot ListLogLinearPlot ListLogLogPlot ListLogPlot ListPicker ListPickerBox ListPickerBoxBackground ListPickerBoxOptions ListPlay ListPlot ListPlot3D ListPointPlot3D ListPolarPlot ListQ ListSliceContourPlot3D ListSliceDensityPlot3D ListSliceVectorPlot3D ListStepPlot ListStreamDensityPlot ListStreamPlot ListSurfacePlot3D ListVectorDensityPlot ListVectorPlot ListVectorPlot3D ListZTransform Literal LiteralSearch LocalAdaptiveBinarize LocalCache LocalClusteringCoefficient LocalizeDefinitions LocalizeVariables LocalObject LocalObjects LocalResponseNormalizationLayer LocalSubmit LocalSymbol LocalTime LocalTimeZone LocationEquivalenceTest LocationTest Locator LocatorAutoCreate LocatorBox LocatorBoxOptions LocatorCentering LocatorPane LocatorPaneBox LocatorPaneBoxOptions LocatorRegion Locked Log Log10 Log2 LogBarnesG LogGamma LogGammaDistribution LogicalExpand LogIntegral LogisticDistribution LogisticSigmoid LogitModelFit LogLikelihood LogLinearPlot LogLogisticDistribution LogLogPlot LogMultinormalDistribution LogNormalDistribution LogPlot LogRankTest LogSeriesDistribution LongEqual Longest LongestCommonSequence LongestCommonSequencePositions LongestCommonSubsequence LongestCommonSubsequencePositions LongestMatch LongestOrderedSequence LongForm Longitude LongLeftArrow LongLeftRightArrow LongRightArrow LongShortTermMemoryLayer Lookup Loopback LoopFreeGraphQ LossFunction LowerCaseQ LowerLeftArrow LowerRightArrow LowerTriangularize LowerTriangularMatrixQ LowpassFilter LQEstimatorGains LQGRegulator LQOutputRegulatorGains LQRegulatorGains LUBackSubstitution LucasL LuccioSamiComponents LUDecomposition LunarEclipse LUVColor LyapunovSolve LyonsGroupLyMachineID MachineName MachineNumberQ MachinePrecision MacintoshSystemPageSetup Magenta Magnification Magnify MailAddressValidation MailExecute MailFolder MailItem MailReceiverFunction MailResponseFunction MailSearch MailServerConnect MailServerConnection MailSettings MainSolve MaintainDynamicCaches Majority MakeBoxes MakeExpression MakeRules ManagedLibraryExpressionID ManagedLibraryExpressionQ MandelbrotSetBoettcher MandelbrotSetDistance MandelbrotSetIterationCount MandelbrotSetMemberQ MandelbrotSetPlot MangoldtLambda ManhattanDistance Manipulate Manipulator MannedSpaceMissionData MannWhitneyTest MantissaExponent Manual Map MapAll MapAt MapIndexed MAProcess MapThread MarchenkoPasturDistribution MarcumQ MardiaCombinedTest MardiaKurtosisTest MardiaSkewnessTest MarginalDistribution MarkovProcessProperties Masking MatchingDissimilarity MatchLocalNameQ MatchLocalNames MatchQ Material MathematicalFunctionData MathematicaNotation MathieuC MathieuCharacteristicA MathieuCharacteristicB MathieuCharacteristicExponent MathieuCPrime MathieuGroupM11 MathieuGroupM12 MathieuGroupM22 MathieuGroupM23 MathieuGroupM24 MathieuS MathieuSPrime MathMLForm MathMLText Matrices MatrixExp MatrixForm MatrixFunction MatrixLog MatrixNormalDistribution MatrixPlot MatrixPower MatrixPropertyDistribution MatrixQ MatrixRank MatrixTDistribution Max MaxBend MaxCellMeasure MaxColorDistance MaxDetect MaxDuration MaxExtraBandwidths MaxExtraConditions MaxFeatureDisplacement MaxFeatures MaxFilter MaximalBy Maximize MaxItems MaxIterations MaxLimit MaxMemoryUsed MaxMixtureKernels MaxOverlapFraction MaxPlotPoints MaxPoints MaxRecursion MaxStableDistribution MaxStepFraction MaxSteps MaxStepSize MaxTrainingRounds MaxValue MaxwellDistribution MaxWordGap McLaughlinGroupMcL Mean MeanAbsoluteLossLayer MeanAround MeanClusteringCoefficient MeanDegreeConnectivity MeanDeviation MeanFilter MeanGraphDistance MeanNeighborDegree MeanShift MeanShiftFilter MeanSquaredLossLayer Median MedianDeviation MedianFilter MedicalTestData Medium MeijerG MeijerGReduce MeixnerDistribution MellinConvolve MellinTransform MemberQ MemoryAvailable MemoryConstrained MemoryConstraint MemoryInUse MengerMesh Menu MenuAppearance MenuCommandKey MenuEvaluator MenuItem MenuList MenuPacket MenuSortingValue MenuStyle MenuView Merge MergeDifferences MergingFunction MersennePrimeExponent MersennePrimeExponentQ Mesh MeshCellCentroid MeshCellCount MeshCellHighlight MeshCellIndex MeshCellLabel MeshCellMarker MeshCellMeasure MeshCellQuality MeshCells MeshCellShapeFunction MeshCellStyle MeshCoordinates MeshFunctions MeshPrimitives MeshQualityGoal MeshRange MeshRefinementFunction MeshRegion MeshRegionQ MeshShading MeshStyle Message MessageDialog MessageList MessageName MessageObject MessageOptions MessagePacket Messages MessagesNotebook MetaCharacters MetaInformation MeteorShowerData Method MethodOptions MexicanHatWavelet MeyerWavelet Midpoint Min MinColorDistance MinDetect MineralData MinFilter MinimalBy MinimalPolynomial MinimalStateSpaceModel Minimize MinimumTimeIncrement MinIntervalSize MinkowskiQuestionMark MinLimit MinMax MinorPlanetData Minors MinRecursion MinSize MinStableDistribution Minus MinusPlus MinValue Missing MissingBehavior MissingDataMethod MissingDataRules MissingQ MissingString MissingStyle MissingValuePattern MittagLefflerE MixedFractionParts MixedGraphQ MixedMagnitude MixedRadix MixedRadixQuantity MixedUnit MixtureDistribution Mod Modal Mode Modular ModularInverse ModularLambda Module Modulus MoebiusMu Molecule MoleculeContainsQ MoleculeEquivalentQ MoleculeGraph MoleculeModify MoleculePattern MoleculePlot MoleculePlot3D MoleculeProperty MoleculeQ MoleculeValue Moment Momentary MomentConvert MomentEvaluate MomentGeneratingFunction MomentOfInertia Monday Monitor MonomialList MonomialOrder MonsterGroupM MoonPhase MoonPosition MorletWavelet MorphologicalBinarize MorphologicalBranchPoints MorphologicalComponents MorphologicalEulerNumber MorphologicalGraph MorphologicalPerimeter MorphologicalTransform MortalityData Most MountainData MouseAnnotation MouseAppearance MouseAppearanceTag MouseButtons Mouseover MousePointerNote MousePosition MovieData MovingAverage MovingMap MovingMedian MoyalDistribution Multicolumn MultiedgeStyle MultigraphQ MultilaunchWarning MultiLetterItalics MultiLetterStyle MultilineFunction Multinomial MultinomialDistribution MultinormalDistribution MultiplicativeOrder Multiplicity MultiplySides Multiselection MultivariateHypergeometricDistribution MultivariatePoissonDistribution MultivariateTDistributionN NakagamiDistribution NameQ Names NamespaceBox NamespaceBoxOptions Nand NArgMax NArgMin NBernoulliB NBodySimulation NBodySimulationData NCache NDEigensystem NDEigenvalues NDSolve NDSolveValue Nearest NearestFunction NearestNeighborGraph NearestTo NebulaData NeedCurrentFrontEndPackagePacket NeedCurrentFrontEndSymbolsPacket NeedlemanWunschSimilarity Needs Negative NegativeBinomialDistribution NegativeDefiniteMatrixQ NegativeIntegers NegativeMultinomialDistribution NegativeRationals NegativeReals NegativeSemidefiniteMatrixQ NeighborhoodData NeighborhoodGraph Nest NestedGreaterGreater NestedLessLess NestedScriptRules NestGraph NestList NestWhile NestWhileList NetAppend NetBidirectionalOperator NetChain NetDecoder NetDelete NetDrop NetEncoder NetEvaluationMode NetExtract NetFlatten NetFoldOperator NetGraph NetInformation NetInitialize NetInsert NetInsertSharedArrays NetJoin NetMapOperator NetMapThreadOperator NetMeasurements NetModel NetNestOperator NetPairEmbeddingOperator NetPort NetPortGradient NetPrepend NetRename NetReplace NetReplacePart NetSharedArray NetStateObject NetTake NetTrain NetTrainResultsObject NetworkPacketCapture NetworkPacketRecording NetworkPacketRecordingDuring NetworkPacketTrace NeumannValue NevilleThetaC NevilleThetaD NevilleThetaN NevilleThetaS NewPrimitiveStyle NExpectation Next NextCell NextDate NextPrime NextScheduledTaskTime NHoldAll NHoldFirst NHoldRest NicholsGridLines NicholsPlot NightHemisphere NIntegrate NMaximize NMaxValue NMinimize NMinValue NominalVariables NonAssociative NoncentralBetaDistribution NoncentralChiSquareDistribution NoncentralFRatioDistribution NoncentralStudentTDistribution NonCommutativeMultiply NonConstants NondimensionalizationTransform None NoneTrue NonlinearModelFit NonlinearStateSpaceModel NonlocalMeansFilter NonNegative NonNegativeIntegers NonNegativeRationals NonNegativeReals NonPositive NonPositiveIntegers NonPositiveRationals NonPositiveReals Nor NorlundB Norm Normal NormalDistribution NormalGrouping NormalizationLayer Normalize Normalized NormalizedSquaredEuclideanDistance NormalMatrixQ NormalsFunction NormFunction Not NotCongruent NotCupCap NotDoubleVerticalBar Notebook NotebookApply NotebookAutoSave NotebookClose NotebookConvertSettings NotebookCreate NotebookCreateReturnObject NotebookDefault NotebookDelete NotebookDirectory NotebookDynamicExpression NotebookEvaluate NotebookEventActions NotebookFileName NotebookFind NotebookFindReturnObject NotebookGet NotebookGetLayoutInformationPacket NotebookGetMisspellingsPacket NotebookImport NotebookInformation NotebookInterfaceObject NotebookLocate NotebookObject NotebookOpen NotebookOpenReturnObject NotebookPath NotebookPrint NotebookPut NotebookPutReturnObject NotebookRead NotebookResetGeneratedCells Notebooks NotebookSave NotebookSaveAs NotebookSelection NotebookSetupLayoutInformationPacket NotebooksMenu NotebookTemplate NotebookWrite NotElement NotEqualTilde NotExists NotGreater NotGreaterEqual NotGreaterFullEqual NotGreaterGreater NotGreaterLess NotGreaterSlantEqual NotGreaterTilde Nothing NotHumpDownHump NotHumpEqual NotificationFunction NotLeftTriangle NotLeftTriangleBar NotLeftTriangleEqual NotLess NotLessEqual NotLessFullEqual NotLessGreater NotLessLess NotLessSlantEqual NotLessTilde NotNestedGreaterGreater NotNestedLessLess NotPrecedes NotPrecedesEqual NotPrecedesSlantEqual NotPrecedesTilde NotReverseElement NotRightTriangle NotRightTriangleBar NotRightTriangleEqual NotSquareSubset NotSquareSubsetEqual NotSquareSuperset NotSquareSupersetEqual NotSubset NotSubsetEqual NotSucceeds NotSucceedsEqual NotSucceedsSlantEqual NotSucceedsTilde NotSuperset NotSupersetEqual NotTilde NotTildeEqual NotTildeFullEqual NotTildeTilde NotVerticalBar Now NoWhitespace NProbability NProduct NProductFactors NRoots NSolve NSum NSumTerms NuclearExplosionData NuclearReactorData Null NullRecords NullSpace NullWords Number NumberCompose NumberDecompose NumberExpand NumberFieldClassNumber NumberFieldDiscriminant NumberFieldFundamentalUnits NumberFieldIntegralBasis NumberFieldNormRepresentatives NumberFieldRegulator NumberFieldRootsOfUnity NumberFieldSignature NumberForm NumberFormat NumberLinePlot NumberMarks NumberMultiplier NumberPadding NumberPoint NumberQ NumberSeparator NumberSigns NumberString Numerator NumeratorDenominator NumericalOrder NumericalSort NumericArray NumericArrayQ NumericArrayType NumericFunction NumericQ NuttallWindow NValues NyquistGridLines NyquistPlotO ObservabilityGramian ObservabilityMatrix ObservableDecomposition ObservableModelQ OceanData Octahedron OddQ Off Offset OLEData On ONanGroupON Once OneIdentity Opacity OpacityFunction OpacityFunctionScaling Open OpenAppend Opener OpenerBox OpenerBoxOptions OpenerView OpenFunctionInspectorPacket Opening OpenRead OpenSpecialOptions OpenTemporary OpenWrite Operate OperatingSystem OptimumFlowData Optional OptionalElement OptionInspectorSettings OptionQ Options OptionsPacket OptionsPattern OptionValue OptionValueBox OptionValueBoxOptions Or Orange Order OrderDistribution OrderedQ Ordering OrderingBy OrderingLayer Orderless OrderlessPatternSequence OrnsteinUhlenbeckProcess Orthogonalize OrthogonalMatrixQ Out Outer OuterPolygon OuterPolyhedron OutputAutoOverwrite OutputControllabilityMatrix OutputControllableModelQ OutputForm OutputFormData OutputGrouping OutputMathEditExpression OutputNamePacket OutputResponse OutputSizeLimit OutputStream Over OverBar OverDot Overflow OverHat Overlaps Overlay OverlayBox OverlayBoxOptions Overscript OverscriptBox OverscriptBoxOptions OverTilde OverVector OverwriteTarget OwenT OwnValuesPackage PackingMethod PaddedForm Padding PaddingLayer PaddingSize PadeApproximant PadLeft PadRight PageBreakAbove PageBreakBelow PageBreakWithin PageFooterLines PageFooters PageHeaderLines PageHeaders PageHeight PageRankCentrality PageTheme PageWidth Pagination PairedBarChart PairedHistogram PairedSmoothHistogram PairedTTest PairedZTest PaletteNotebook PalettePath PalindromeQ Pane PaneBox PaneBoxOptions Panel PanelBox PanelBoxOptions Paneled PaneSelector PaneSelectorBox PaneSelectorBoxOptions PaperWidth ParabolicCylinderD ParagraphIndent ParagraphSpacing ParallelArray ParallelCombine ParallelDo Parallelepiped ParallelEvaluate Parallelization Parallelize ParallelMap ParallelNeeds Parallelogram ParallelProduct ParallelSubmit ParallelSum ParallelTable ParallelTry Parameter ParameterEstimator ParameterMixtureDistribution ParameterVariables ParametricFunction ParametricNDSolve ParametricNDSolveValue ParametricPlot ParametricPlot3D ParametricRegion ParentBox ParentCell ParentConnect ParentDirectory ParentForm Parenthesize ParentList ParentNotebook ParetoDistribution ParetoPickandsDistribution ParkData Part PartBehavior PartialCorrelationFunction PartialD ParticleAcceleratorData ParticleData Partition PartitionGranularity PartitionsP PartitionsQ PartLayer PartOfSpeech PartProtection ParzenWindow PascalDistribution PassEventsDown PassEventsUp Paste PasteAutoQuoteCharacters PasteBoxFormInlineCells PasteButton Path PathGraph PathGraphQ Pattern PatternSequence PatternTest PauliMatrix PaulWavelet Pause PausedTime PDF PeakDetect PeanoCurve PearsonChiSquareTest PearsonCorrelationTest PearsonDistribution PercentForm PerfectNumber PerfectNumberQ PerformanceGoal Perimeter PeriodicBoundaryCondition PeriodicInterpolation Periodogram PeriodogramArray Permanent Permissions PermissionsGroup PermissionsGroupMemberQ PermissionsGroups PermissionsKey PermissionsKeys PermutationCycles PermutationCyclesQ PermutationGroup PermutationLength PermutationList PermutationListQ PermutationMax PermutationMin PermutationOrder PermutationPower PermutationProduct PermutationReplace Permutations PermutationSupport Permute PeronaMalikFilter Perpendicular PerpendicularBisector PersistenceLocation PersistenceTime PersistentObject PersistentObjects PersistentValue PersonData PERTDistribution PetersenGraph PhaseMargins PhaseRange PhysicalSystemData Pi Pick PIDData PIDDerivativeFilter PIDFeedforward PIDTune Piecewise PiecewiseExpand PieChart PieChart3D PillaiTrace PillaiTraceTest PingTime Pink PitchRecognize Pivoting PixelConstrained PixelValue PixelValuePositions Placed Placeholder PlaceholderReplace Plain PlanarAngle PlanarGraph PlanarGraphQ PlanckRadiationLaw PlaneCurveData PlanetaryMoonData PlanetData PlantData Play PlayRange Plot Plot3D Plot3Matrix PlotDivision PlotJoined PlotLabel PlotLabels PlotLayout PlotLegends PlotMarkers PlotPoints PlotRange PlotRangeClipping PlotRangeClipPlanesStyle PlotRangePadding PlotRegion PlotStyle PlotTheme Pluralize Plus PlusMinus Pochhammer PodStates PodWidth Point Point3DBox Point3DBoxOptions PointBox PointBoxOptions PointFigureChart PointLegend PointSize PoissonConsulDistribution PoissonDistribution PoissonProcess PoissonWindow PolarAxes PolarAxesOrigin PolarGridLines PolarPlot PolarTicks PoleZeroMarkers PolyaAeppliDistribution PolyGamma Polygon Polygon3DBox Polygon3DBoxOptions PolygonalNumber PolygonAngle PolygonBox PolygonBoxOptions PolygonCoordinates PolygonDecomposition PolygonHoleScale PolygonIntersections PolygonScale Polyhedron PolyhedronAngle PolyhedronCoordinates PolyhedronData PolyhedronDecomposition PolyhedronGenus PolyLog PolynomialExtendedGCD PolynomialForm PolynomialGCD PolynomialLCM PolynomialMod PolynomialQ PolynomialQuotient PolynomialQuotientRemainder PolynomialReduce PolynomialRemainder Polynomials PoolingLayer PopupMenu PopupMenuBox PopupMenuBoxOptions PopupView PopupWindow Position PositionIndex Positive PositiveDefiniteMatrixQ PositiveIntegers PositiveRationals PositiveReals PositiveSemidefiniteMatrixQ PossibleZeroQ Postfix PostScript Power PowerDistribution PowerExpand PowerMod PowerModList PowerRange PowerSpectralDensity PowersRepresentations PowerSymmetricPolynomial Precedence PrecedenceForm Precedes PrecedesEqual PrecedesSlantEqual PrecedesTilde Precision PrecisionGoal PreDecrement Predict PredictionRoot PredictorFunction PredictorInformation PredictorMeasurements PredictorMeasurementsObject PreemptProtect PreferencesPath Prefix PreIncrement Prepend PrependLayer PrependTo PreprocessingRules PreserveColor PreserveImageOptions Previous PreviousCell PreviousDate PriceGraphDistribution PrimaryPlaceholder Prime PrimeNu PrimeOmega PrimePi PrimePowerQ PrimeQ Primes PrimeZetaP PrimitivePolynomialQ PrimitiveRoot PrimitiveRootList PrincipalComponents PrincipalValue Print PrintableASCIIQ PrintAction PrintForm PrintingCopies PrintingOptions PrintingPageRange PrintingStartingPageNumber PrintingStyleEnvironment Printout3D Printout3DPreviewer PrintPrecision PrintTemporary Prism PrismBox PrismBoxOptions PrivateCellOptions PrivateEvaluationOptions PrivateFontOptions PrivateFrontEndOptions PrivateKey PrivateNotebookOptions PrivatePaths Probability ProbabilityDistribution ProbabilityPlot ProbabilityPr ProbabilityScalePlot ProbitModelFit ProcessConnection ProcessDirectory ProcessEnvironment Processes ProcessEstimator ProcessInformation ProcessObject ProcessParameterAssumptions ProcessParameterQ ProcessStateDomain ProcessStatus ProcessTimeDomain Product ProductDistribution ProductLog ProgressIndicator ProgressIndicatorBox ProgressIndicatorBoxOptions Projection Prolog PromptForm ProofObject Properties Property PropertyList PropertyValue Proportion Proportional Protect Protected ProteinData Pruning PseudoInverse PsychrometricPropertyData PublicKey PublisherID PulsarData PunctuationCharacter Purple Put PutAppend Pyramid PyramidBox PyramidBoxOptionsQBinomial QFactorial QGamma QHypergeometricPFQ QnDispersion QPochhammer QPolyGamma QRDecomposition QuadraticIrrationalQ QuadraticOptimization Quantile QuantilePlot Quantity QuantityArray QuantityDistribution QuantityForm QuantityMagnitude QuantityQ QuantityUnit QuantityVariable QuantityVariableCanonicalUnit QuantityVariableDimensions QuantityVariableIdentifier QuantityVariablePhysicalQuantity Quartics QuartileDeviation Quartiles QuartileSkewness Query QueueingNetworkProcess QueueingProcess QueueProperties Quiet Quit Quotient QuotientRemainderRadialGradientImage RadialityCentrality RadicalBox RadicalBoxOptions RadioButton RadioButtonBar RadioButtonBox RadioButtonBoxOptions Radon RadonTransform RamanujanTau RamanujanTauL RamanujanTauTheta RamanujanTauZ Ramp Random RandomChoice RandomColor RandomComplex RandomEntity RandomFunction RandomGeoPosition RandomGraph RandomImage RandomInstance RandomInteger RandomPermutation RandomPoint RandomPolygon RandomPolyhedron RandomPrime RandomReal RandomSample RandomSeed RandomSeeding RandomVariate RandomWalkProcess RandomWord Range RangeFilter RangeSpecification RankedMax RankedMin RarerProbability Raster Raster3D Raster3DBox Raster3DBoxOptions RasterArray RasterBox RasterBoxOptions Rasterize RasterSize Rational RationalFunctions Rationalize Rationals Ratios RawArray RawBoxes RawData RawMedium RayleighDistribution Re Read ReadByteArray ReadLine ReadList ReadProtected ReadString Real RealAbs RealBlockDiagonalForm RealDigits RealExponent Reals RealSign Reap RecognitionPrior RecognitionThreshold Record RecordLists RecordSeparators Rectangle RectangleBox RectangleBoxOptions RectangleChart RectangleChart3D RectangularRepeatingElement RecurrenceFilter RecurrenceTable RecurringDigitsForm Red Reduce RefBox ReferenceLineStyle ReferenceMarkers ReferenceMarkerStyle Refine ReflectionMatrix ReflectionTransform Refresh RefreshRate Region RegionBinarize RegionBoundary RegionBounds RegionCentroid RegionDifference RegionDimension RegionDisjoint RegionDistance RegionDistanceFunction RegionEmbeddingDimension RegionEqual RegionFunction RegionImage RegionIntersection RegionMeasure RegionMember RegionMemberFunction RegionMoment RegionNearest RegionNearestFunction RegionPlot RegionPlot3D RegionProduct RegionQ RegionResize RegionSize RegionSymmetricDifference RegionUnion RegionWithin RegisterExternalEvaluator RegularExpression Regularization RegularlySampledQ RegularPolygon ReIm ReImLabels ReImPlot ReImStyle Reinstall RelationalDatabase RelationGraph Release ReleaseHold ReliabilityDistribution ReliefImage ReliefPlot RemoteAuthorizationCaching RemoteConnect RemoteConnectionObject RemoteFile RemoteRun RemoteRunProcess Remove RemoveAlphaChannel RemoveAsynchronousTask RemoveAudioStream RemoveBackground RemoveChannelListener RemoveChannelSubscribers Removed RemoveDiacritics RemoveInputStreamMethod RemoveOutputStreamMethod RemoveProperty RemoveScheduledTask RemoveUsers RenameDirectory RenameFile RenderAll RenderingOptions RenewalProcess RenkoChart RepairMesh Repeated RepeatedNull RepeatedString RepeatedTiming RepeatingElement Replace ReplaceAll ReplaceHeldPart ReplaceImageValue ReplaceList ReplacePart ReplacePixelValue ReplaceRepeated ReplicateLayer RequiredPhysicalQuantities Resampling ResamplingAlgorithmData ResamplingMethod Rescale RescalingTransform ResetDirectory ResetMenusPacket ResetScheduledTask ReshapeLayer Residue ResizeLayer Resolve ResourceAcquire ResourceData ResourceFunction ResourceObject ResourceRegister ResourceRemove ResourceSearch ResourceSubmissionObject ResourceSubmit ResourceSystemBase ResourceUpdate ResponseForm Rest RestartInterval Restricted Resultant ResumePacket Return ReturnEntersInput ReturnExpressionPacket ReturnInputFormPacket ReturnPacket ReturnReceiptFunction ReturnTextPacket Reverse ReverseBiorthogonalSplineWavelet ReverseElement ReverseEquilibrium ReverseGraph ReverseSort ReverseSortBy ReverseUpEquilibrium RevolutionAxis RevolutionPlot3D RGBColor RiccatiSolve RiceDistribution RidgeFilter RiemannR RiemannSiegelTheta RiemannSiegelZ RiemannXi Riffle Right RightArrow RightArrowBar RightArrowLeftArrow RightComposition RightCosetRepresentative RightDownTeeVector RightDownVector RightDownVectorBar RightTee RightTeeArrow RightTeeVector RightTriangle RightTriangleBar RightTriangleEqual RightUpDownVector RightUpTeeVector RightUpVector RightUpVectorBar RightVector RightVectorBar RiskAchievementImportance RiskReductionImportance RogersTanimotoDissimilarity RollPitchYawAngles RollPitchYawMatrix RomanNumeral Root RootApproximant RootIntervals RootLocusPlot RootMeanSquare RootOfUnityQ RootReduce Roots RootSum Rotate RotateLabel RotateLeft RotateRight RotationAction RotationBox RotationBoxOptions RotationMatrix RotationTransform Round RoundImplies RoundingRadius Row RowAlignments RowBackgrounds RowBox RowHeights RowLines RowMinHeight RowReduce RowsEqual RowSpacings RSolve RSolveValue RudinShapiro RudvalisGroupRu Rule RuleCondition RuleDelayed RuleForm RulePlot RulerUnits Run RunProcess RunScheduledTask RunThrough RuntimeAttributes RuntimeOptions RussellRaoDissimilaritySameQ SameTest SampledEntityClass SampleDepth SampledSoundFunction SampledSoundList SampleRate SamplingPeriod SARIMAProcess SARMAProcess SASTriangle SatelliteData SatisfiabilityCount SatisfiabilityInstances SatisfiableQ Saturday Save Saveable SaveAutoDelete SaveConnection SaveDefinitions SavitzkyGolayMatrix SawtoothWave Scale Scaled ScaleDivisions ScaledMousePosition ScaleOrigin ScalePadding ScaleRanges ScaleRangeStyle ScalingFunctions ScalingMatrix ScalingTransform Scan ScheduledTask ScheduledTaskActiveQ ScheduledTaskInformation ScheduledTaskInformationData ScheduledTaskObject ScheduledTasks SchurDecomposition ScientificForm ScientificNotationThreshold ScorerGi ScorerGiPrime ScorerHi ScorerHiPrime ScreenRectangle ScreenStyleEnvironment ScriptBaselineShifts ScriptForm ScriptLevel ScriptMinSize ScriptRules ScriptSizeMultipliers Scrollbars ScrollingOptions ScrollPosition SearchAdjustment SearchIndexObject SearchIndices SearchQueryString SearchResultObject Sec Sech SechDistribution SecondOrderConeOptimization SectionGrouping SectorChart SectorChart3D SectorOrigin SectorSpacing SecuredAuthenticationKey SecuredAuthenticationKeys SeedRandom Select Selectable SelectComponents SelectedCells SelectedNotebook SelectFirst Selection SelectionAnimate SelectionCell SelectionCellCreateCell SelectionCellDefaultStyle SelectionCellParentStyle SelectionCreateCell SelectionDebuggerTag SelectionDuplicateCell SelectionEvaluate SelectionEvaluateCreateCell SelectionMove SelectionPlaceholder SelectionSetStyle SelectWithContents SelfLoops SelfLoopStyle SemanticImport SemanticImportString SemanticInterpretation SemialgebraicComponentInstances SemidefiniteOptimization SendMail SendMessage Sequence SequenceAlignment SequenceAttentionLayer SequenceCases SequenceCount SequenceFold SequenceFoldList SequenceForm SequenceHold SequenceLastLayer SequenceMostLayer SequencePosition SequencePredict SequencePredictorFunction SequenceReplace SequenceRestLayer SequenceReverseLayer SequenceSplit Series SeriesCoefficient SeriesData ServiceConnect ServiceDisconnect ServiceExecute ServiceObject ServiceRequest ServiceResponse ServiceSubmit SessionSubmit SessionTime Set SetAccuracy SetAlphaChannel SetAttributes Setbacks SetBoxFormNamesPacket SetCloudDirectory SetCookies SetDelayed SetDirectory SetEnvironment SetEvaluationNotebook SetFileDate SetFileLoadingContext SetNotebookStatusLine SetOptions SetOptionsPacket SetPermissions SetPrecision SetProperty SetSecuredAuthenticationKey SetSelectedNotebook SetSharedFunction SetSharedVariable SetSpeechParametersPacket SetStreamPosition SetSystemModel SetSystemOptions Setter SetterBar SetterBox SetterBoxOptions Setting SetUsers SetValue Shading Shallow ShannonWavelet ShapiroWilkTest Share SharingList Sharpen ShearingMatrix ShearingTransform ShellRegion ShenCastanMatrix ShiftedGompertzDistribution ShiftRegisterSequence Short ShortDownArrow Shortest ShortestMatch ShortestPathFunction ShortLeftArrow ShortRightArrow ShortTimeFourier ShortTimeFourierData ShortUpArrow Show ShowAutoConvert ShowAutoSpellCheck ShowAutoStyles ShowCellBracket ShowCellLabel ShowCellTags ShowClosedCellArea ShowCodeAssist ShowContents ShowControls ShowCursorTracker ShowGroupOpenCloseIcon ShowGroupOpener ShowInvisibleCharacters ShowPageBreaks ShowPredictiveInterface ShowSelection ShowShortBoxForm ShowSpecialCharacters ShowStringCharacters ShowSyntaxStyles ShrinkingDelay ShrinkWrapBoundingBox SiderealTime SiegelTheta SiegelTukeyTest SierpinskiCurve SierpinskiMesh Sign Signature SignedRankTest SignedRegionDistance SignificanceLevel SignPadding SignTest SimilarityRules SimpleGraph SimpleGraphQ SimplePolygonQ SimplePolyhedronQ Simplex Simplify Sin Sinc SinghMaddalaDistribution SingleEvaluation SingleLetterItalics SingleLetterStyle SingularValueDecomposition SingularValueList SingularValuePlot SingularValues Sinh SinhIntegral SinIntegral SixJSymbol Skeleton SkeletonTransform SkellamDistribution Skewness SkewNormalDistribution SkinStyle Skip SliceContourPlot3D SliceDensityPlot3D SliceDistribution SliceVectorPlot3D Slider Slider2D Slider2DBox Slider2DBoxOptions SliderBox SliderBoxOptions SlideView Slot SlotSequence Small SmallCircle Smaller SmithDecomposition SmithDelayCompensator SmithWatermanSimilarity SmoothDensityHistogram SmoothHistogram SmoothHistogram3D SmoothKernelDistribution SnDispersion Snippet SnubPolyhedron SocialMediaData Socket SocketConnect SocketListen SocketListener SocketObject SocketOpen SocketReadMessage SocketReadyQ Sockets SocketWaitAll SocketWaitNext SoftmaxLayer SokalSneathDissimilarity SolarEclipse SolarSystemFeatureData SolidAngle SolidData SolidRegionQ Solve SolveAlways SolveDelayed Sort SortBy SortedBy SortedEntityClass Sound SoundAndGraphics SoundNote SoundVolume SourceLink Sow Space SpaceCurveData SpaceForm Spacer Spacings Span SpanAdjustments SpanCharacterRounding SpanFromAbove SpanFromBoth SpanFromLeft SpanLineThickness SpanMaxSize SpanMinSize SpanningCharacters SpanSymmetric SparseArray SpatialGraphDistribution SpatialMedian SpatialTransformationLayer Speak SpeakTextPacket SpearmanRankTest SpearmanRho SpeciesData SpecificityGoal SpectralLineData Spectrogram SpectrogramArray Specularity SpeechRecognize SpeechSynthesize SpellingCorrection SpellingCorrectionList SpellingDictionaries SpellingDictionariesPath SpellingOptions SpellingSuggestionsPacket Sphere SphereBox SpherePoints SphericalBesselJ SphericalBesselY SphericalHankelH1 SphericalHankelH2 SphericalHarmonicY SphericalPlot3D SphericalRegion SphericalShell SpheroidalEigenvalue SpheroidalJoiningFactor SpheroidalPS SpheroidalPSPrime SpheroidalQS SpheroidalQSPrime SpheroidalRadialFactor SpheroidalS1 SpheroidalS1Prime SpheroidalS2 SpheroidalS2Prime Splice SplicedDistribution SplineClosed SplineDegree SplineKnots SplineWeights Split SplitBy SpokenString Sqrt SqrtBox SqrtBoxOptions Square SquaredEuclideanDistance SquareFreeQ SquareIntersection SquareMatrixQ SquareRepeatingElement SquaresR SquareSubset SquareSubsetEqual SquareSuperset SquareSupersetEqual SquareUnion SquareWave SSSTriangle StabilityMargins StabilityMarginsStyle StableDistribution Stack StackBegin StackComplete StackedDateListPlot StackedListPlot StackInhibit StadiumShape StandardAtmosphereData StandardDeviation StandardDeviationFilter StandardForm Standardize Standardized StandardOceanData StandbyDistribution Star StarClusterData StarData StarGraph StartAsynchronousTask StartExternalSession StartingStepSize StartOfLine StartOfString StartProcess StartScheduledTask StartupSound StartWebSession StateDimensions StateFeedbackGains StateOutputEstimator StateResponse StateSpaceModel StateSpaceRealization StateSpaceTransform StateTransformationLinearize StationaryDistribution StationaryWaveletPacketTransform StationaryWaveletTransform StatusArea StatusCentrality StepMonitor StereochemistryElements StieltjesGamma StirlingS1 StirlingS2 StopAsynchronousTask StoppingPowerData StopScheduledTask StrataVariables StratonovichProcess StreamColorFunction StreamColorFunctionScaling StreamDensityPlot StreamMarkers StreamPlot StreamPoints StreamPosition Streams StreamScale StreamStyle String StringBreak StringByteCount StringCases StringContainsQ StringCount StringDelete StringDrop StringEndsQ StringExpression StringExtract StringForm StringFormat StringFreeQ StringInsert StringJoin StringLength StringMatchQ StringPadLeft StringPadRight StringPart StringPartition StringPosition StringQ StringRepeat StringReplace StringReplaceList StringReplacePart StringReverse StringRiffle StringRotateLeft StringRotateRight StringSkeleton StringSplit StringStartsQ StringTake StringTemplate StringToByteArray StringToStream StringTrim StripBoxes StripOnInput StripWrapperBoxes StrokeForm StructuralImportance StructuredArray StructuredSelection StruveH StruveL Stub StudentTDistribution Style StyleBox StyleBoxAutoDelete StyleData StyleDefinitions StyleForm StyleHints StyleKeyMapping StyleMenuListing StyleNameDialogSettings StyleNames StylePrint StyleSheetPath Subdivide Subfactorial Subgraph SubMinus SubPlus SubresultantPolynomialRemainders SubresultantPolynomials Subresultants Subscript SubscriptBox SubscriptBoxOptions Subscripted Subsequences Subset SubsetEqual SubsetMap SubsetQ Subsets SubStar SubstitutionSystem Subsuperscript SubsuperscriptBox SubsuperscriptBoxOptions Subtract SubtractFrom SubtractSides SubValues Succeeds SucceedsEqual SucceedsSlantEqual SucceedsTilde Success SuchThat Sum SumConvergence SummationLayer Sunday SunPosition Sunrise Sunset SuperDagger SuperMinus SupernovaData SuperPlus Superscript SuperscriptBox SuperscriptBoxOptions Superset SupersetEqual SuperStar Surd SurdForm SurfaceArea SurfaceColor SurfaceData SurfaceGraphics SurvivalDistribution SurvivalFunction SurvivalModel SurvivalModelFit SuspendPacket SuzukiDistribution SuzukiGroupSuz SwatchLegend Switch Symbol SymbolName SymletWavelet Symmetric SymmetricGroup SymmetricKey SymmetricMatrixQ SymmetricPolynomial SymmetricReduction Symmetrize SymmetrizedArray SymmetrizedArrayRules SymmetrizedDependentComponents SymmetrizedIndependentComponents SymmetrizedReplacePart SynchronousInitialization SynchronousUpdating Synonyms Syntax SyntaxForm SyntaxInformation SyntaxLength SyntaxPacket SyntaxQ SynthesizeMissingValues SystemDialogInput SystemException SystemGet SystemHelpPath SystemInformation SystemInformationData SystemInstall SystemModel SystemModeler SystemModelExamples SystemModelLinearize SystemModelParametricSimulate SystemModelPlot SystemModelProgressReporting SystemModelReliability SystemModels SystemModelSimulate SystemModelSimulateSensitivity SystemModelSimulationData SystemOpen SystemOptions SystemProcessData SystemProcesses SystemsConnectionsModel SystemsModelDelay SystemsModelDelayApproximate SystemsModelDelete SystemsModelDimensions SystemsModelExtract SystemsModelFeedbackConnect SystemsModelLabels SystemsModelLinearity SystemsModelMerge SystemsModelOrder SystemsModelParallelConnect SystemsModelSeriesConnect SystemsModelStateFeedbackConnect SystemsModelVectorRelativeOrders SystemStub SystemTestTab TabFilling Table TableAlignments TableDepth TableDirections TableForm TableHeadings TableSpacing TableView TableViewBox TableViewBoxBackground TableViewBoxOptions TabSpacings TabView TabViewBox TabViewBoxOptions TagBox TagBoxNote TagBoxOptions TaggingRules TagSet TagSetDelayed TagStyle TagUnset Take TakeDrop TakeLargest TakeLargestBy TakeList TakeSmallest TakeSmallestBy TakeWhile Tally Tan Tanh TargetDevice TargetFunctions TargetSystem TargetUnits TaskAbort TaskExecute TaskObject TaskRemove TaskResume Tasks TaskSuspend TaskWait TautologyQ TelegraphProcess TemplateApply TemplateArgBox TemplateBox TemplateBoxOptions TemplateEvaluate TemplateExpression TemplateIf TemplateObject TemplateSequence TemplateSlot TemplateSlotSequence TemplateUnevaluated TemplateVerbatim TemplateWith TemporalData TemporalRegularity Temporary TemporaryVariable TensorContract TensorDimensions TensorExpand TensorProduct TensorQ TensorRank TensorReduce TensorSymmetry TensorTranspose TensorWedge TestID TestReport TestReportObject TestResultObject Tetrahedron TetrahedronBox TetrahedronBoxOptions TeXForm TeXSave Text Text3DBox Text3DBoxOptions TextAlignment TextBand TextBoundingBox TextBox TextCases TextCell TextClipboardType TextContents TextData TextElement TextForm TextGrid TextJustification TextLine TextPacket TextParagraph TextPosition TextRecognize TextSearch TextSearchReport TextSentences TextString TextStructure TextStyle TextTranslation Texture TextureCoordinateFunction TextureCoordinateScaling TextWords Therefore ThermodynamicData ThermometerGauge Thick Thickness Thin Thinning ThisLink ThompsonGroupTh Thread ThreadingLayer ThreeJSymbol Threshold Through Throw ThueMorse Thumbnail Thursday Ticks TicksStyle TideData Tilde TildeEqual TildeFullEqual TildeTilde TimeConstrained TimeConstraint TimeDirection TimeFormat TimeGoal TimelinePlot TimeObject TimeObjectQ Times TimesBy TimeSeries TimeSeriesAggregate TimeSeriesForecast TimeSeriesInsert TimeSeriesInvertibility TimeSeriesMap TimeSeriesMapThread TimeSeriesModel TimeSeriesModelFit TimeSeriesResample TimeSeriesRescale TimeSeriesShift TimeSeriesThread TimeSeriesWindow TimeUsed TimeValue TimeWarpingCorrespondence TimeWarpingDistance TimeZone TimeZoneConvert TimeZoneOffset Timing Tiny TitleGrouping TitsGroupT ToBoxes ToCharacterCode ToColor ToContinuousTimeModel ToDate Today ToDiscreteTimeModel ToEntity ToeplitzMatrix ToExpression ToFileName Together Toggle ToggleFalse Toggler TogglerBar TogglerBox TogglerBoxOptions ToHeldExpression ToInvertibleTimeSeries TokenWords Tolerance ToLowerCase Tomorrow ToNumberField TooBig Tooltip TooltipBox TooltipBoxOptions TooltipDelay TooltipStyle Top TopHatTransform ToPolarCoordinates TopologicalSort ToRadicals ToRules ToSphericalCoordinates ToString Total TotalHeight TotalLayer TotalVariationFilter TotalWidth TouchPosition TouchscreenAutoZoom TouchscreenControlPlacement ToUpperCase Tr Trace TraceAbove TraceAction TraceBackward TraceDepth TraceDialog TraceForward TraceInternal TraceLevel TraceOff TraceOn TraceOriginal TracePrint TraceScan TrackedSymbols TrackingFunction TracyWidomDistribution TradingChart TraditionalForm TraditionalFunctionNotation TraditionalNotation TraditionalOrder TrainingProgressCheckpointing TrainingProgressFunction TrainingProgressMeasurements TrainingProgressReporting TrainingStoppingCriterion TransferFunctionCancel TransferFunctionExpand TransferFunctionFactor TransferFunctionModel TransferFunctionPoles TransferFunctionTransform TransferFunctionZeros TransformationClass TransformationFunction TransformationFunctions TransformationMatrix TransformedDistribution TransformedField TransformedProcess TransformedRegion TransitionDirection TransitionDuration TransitionEffect TransitiveClosureGraph TransitiveReductionGraph Translate TranslationOptions TranslationTransform Transliterate Transparent TransparentColor Transpose TransposeLayer TrapSelection TravelDirections TravelDirectionsData TravelDistance TravelDistanceList TravelMethod TravelTime TreeForm TreeGraph TreeGraphQ TreePlot TrendStyle Triangle TriangleCenter TriangleConstruct TriangleMeasurement TriangleWave TriangularDistribution TriangulateMesh Trig TrigExpand TrigFactor TrigFactorList Trigger TrigReduce TrigToExp TrimmedMean TrimmedVariance TropicalStormData True TrueQ TruncatedDistribution TruncatedPolyhedron TsallisQExponentialDistribution TsallisQGaussianDistribution TTest Tube TubeBezierCurveBox TubeBezierCurveBoxOptions TubeBox TubeBoxOptions TubeBSplineCurveBox TubeBSplineCurveBoxOptions Tuesday TukeyLambdaDistribution TukeyWindow TunnelData Tuples TuranGraph TuringMachine TuttePolynomial TwoWayRule Typed TypeSpecifierUnateQ Uncompress UnconstrainedParameters Undefined UnderBar Underflow Underlined Underoverscript UnderoverscriptBox UnderoverscriptBoxOptions Underscript UnderscriptBox UnderscriptBoxOptions UnderseaFeatureData UndirectedEdge UndirectedGraph UndirectedGraphQ UndoOptions UndoTrackedVariables Unequal UnequalTo Unevaluated UniformDistribution UniformGraphDistribution UniformPolyhedron UniformSumDistribution Uninstall Union UnionPlus Unique UnitaryMatrixQ UnitBox UnitConvert UnitDimensions Unitize UnitRootTest UnitSimplify UnitStep UnitSystem UnitTriangle UnitVector UnitVectorLayer UnityDimensions UniverseModelData UniversityData UnixTime Unprotect UnregisterExternalEvaluator UnsameQ UnsavedVariables Unset UnsetShared UntrackedVariables Up UpArrow UpArrowBar UpArrowDownArrow Update UpdateDynamicObjects UpdateDynamicObjectsSynchronous UpdateInterval UpdateSearchIndex UpDownArrow UpEquilibrium UpperCaseQ UpperLeftArrow UpperRightArrow UpperTriangularize UpperTriangularMatrixQ Upsample UpSet UpSetDelayed UpTee UpTeeArrow UpTo UpValues URL URLBuild URLDecode URLDispatcher URLDownload URLDownloadSubmit URLEncode URLExecute URLExpand URLFetch URLFetchAsynchronous URLParse URLQueryDecode URLQueryEncode URLRead URLResponseTime URLSave URLSaveAsynchronous URLShorten URLSubmit UseGraphicsRange UserDefinedWavelet Using UsingFrontEnd UtilityFunctionV2Get ValenceErrorHandling ValidationLength ValidationSet Value ValueBox ValueBoxOptions ValueDimensions ValueForm ValuePreprocessingFunction ValueQ Values ValuesData Variables Variance VarianceEquivalenceTest VarianceEstimatorFunction VarianceGammaDistribution VarianceTest VectorAngle VectorAround VectorColorFunction VectorColorFunctionScaling VectorDensityPlot VectorGlyphData VectorGreater VectorGreaterEqual VectorLess VectorLessEqual VectorMarkers VectorPlot VectorPlot3D VectorPoints VectorQ Vectors VectorScale VectorStyle Vee Verbatim Verbose VerboseConvertToPostScriptPacket VerificationTest VerifyConvergence VerifyDerivedKey VerifyDigitalSignature VerifyInterpretation VerifySecurityCertificates VerifySolutions VerifyTestAssumptions Version VersionNumber VertexAdd VertexCapacity VertexColors VertexComponent VertexConnectivity VertexContract VertexCoordinateRules VertexCoordinates VertexCorrelationSimilarity VertexCosineSimilarity VertexCount VertexCoverQ VertexDataCoordinates VertexDegree VertexDelete VertexDiceSimilarity VertexEccentricity VertexInComponent VertexInDegree VertexIndex VertexJaccardSimilarity VertexLabeling VertexLabels VertexLabelStyle VertexList VertexNormals VertexOutComponent VertexOutDegree VertexQ VertexRenderingFunction VertexReplace VertexShape VertexShapeFunction VertexSize VertexStyle VertexTextureCoordinates VertexWeight VertexWeightedGraphQ Vertical VerticalBar VerticalForm VerticalGauge VerticalSeparator VerticalSlider VerticalTilde ViewAngle ViewCenter ViewMatrix ViewPoint ViewPointSelectorSettings ViewPort ViewProjection ViewRange ViewVector ViewVertical VirtualGroupData Visible VisibleCell VoiceStyleData VoigtDistribution VolcanoData Volume VonMisesDistribution VoronoiMeshWaitAll WaitAsynchronousTask WaitNext WaitUntil WakebyDistribution WalleniusHypergeometricDistribution WaringYuleDistribution WarpingCorrespondence WarpingDistance WatershedComponents WatsonUSquareTest WattsStrogatzGraphDistribution WaveletBestBasis WaveletFilterCoefficients WaveletImagePlot WaveletListPlot WaveletMapIndexed WaveletMatrixPlot WaveletPhi WaveletPsi WaveletScale WaveletScalogram WaveletThreshold WeaklyConnectedComponents WeaklyConnectedGraphComponents WeaklyConnectedGraphQ WeakStationarity WeatherData WeatherForecastData WebAudioSearch WebElementObject WeberE WebExecute WebImage WebImageSearch WebSearch WebSessionObject WebSessions WebWindowObject Wedge Wednesday WeibullDistribution WeierstrassE1 WeierstrassE2 WeierstrassE3 WeierstrassEta1 WeierstrassEta2 WeierstrassEta3 WeierstrassHalfPeriods WeierstrassHalfPeriodW1 WeierstrassHalfPeriodW2 WeierstrassHalfPeriodW3 WeierstrassInvariantG2 WeierstrassInvariantG3 WeierstrassInvariants WeierstrassP WeierstrassPPrime WeierstrassSigma WeierstrassZeta WeightedAdjacencyGraph WeightedAdjacencyMatrix WeightedData WeightedGraphQ Weights WelchWindow WheelGraph WhenEvent Which While White WhiteNoiseProcess WhitePoint Whitespace WhitespaceCharacter WhittakerM WhittakerW WienerFilter WienerProcess WignerD WignerSemicircleDistribution WikipediaData WikipediaSearch WilksW WilksWTest WindDirectionData WindingCount WindingPolygon WindowClickSelect WindowElements WindowFloating WindowFrame WindowFrameElements WindowMargins WindowMovable WindowOpacity WindowPersistentStyles WindowSelected WindowSize WindowStatusArea WindowTitle WindowToolbars WindowWidth WindSpeedData WindVectorData WinsorizedMean WinsorizedVariance WishartMatrixDistribution With WolframAlpha WolframAlphaDate WolframAlphaQuantity WolframAlphaResult WolframLanguageData Word WordBoundary WordCharacter WordCloud WordCount WordCounts WordData WordDefinition WordFrequency WordFrequencyData WordList WordOrientation WordSearch WordSelectionFunction WordSeparators WordSpacings WordStem WordTranslation WorkingPrecision WrapAround Write WriteLine WriteString WronskianXMLElement XMLObject XMLTemplate Xnor Xor XYZColorYellow Yesterday YuleDissimilarityZernikeR ZeroSymmetric ZeroTest ZeroWidthTimes Zeta ZetaZero ZIPCodeData ZipfDistribution ZoomCenter ZoomFactor ZTest ZTransform$Aborted $ActivationGroupID $ActivationKey $ActivationUserRegistered $AddOnsDirectory $AllowExternalChannelFunctions $AssertFunction $Assumptions $AsynchronousTask $AudioInputDevices $AudioOutputDevices $BaseDirectory $BatchInput $BatchOutput $BlockchainBase $BoxForms $ByteOrdering $CacheBaseDirectory $Canceled $ChannelBase $CharacterEncoding $CharacterEncodings $CloudBase $CloudConnected $CloudCreditsAvailable $CloudEvaluation $CloudExpressionBase $CloudObjectNameFormat $CloudObjectURLType $CloudRootDirectory $CloudSymbolBase $CloudUserID $CloudUserUUID $CloudVersion $CloudVersionNumber $CloudWolframEngineVersionNumber $CommandLine $CompilationTarget $ConditionHold $ConfiguredKernels $Context $ContextPath $ControlActiveSetting $Cookies $CookieStore $CreationDate $CurrentLink $CurrentTask $CurrentWebSession $DateStringFormat $DefaultAudioInputDevice $DefaultAudioOutputDevice $DefaultFont $DefaultFrontEnd $DefaultImagingDevice $DefaultLocalBase $DefaultMailbox $DefaultNetworkInterface $DefaultPath $Display $DisplayFunction $DistributedContexts $DynamicEvaluation $Echo $EmbedCodeEnvironments $EmbeddableServices $EntityStores $Epilog $EvaluationCloudBase $EvaluationCloudObject $EvaluationEnvironment $ExportFormats $Failed $FinancialDataSource $FontFamilies $FormatType $FrontEnd $FrontEndSession $GeoEntityTypes $GeoLocation $GeoLocationCity $GeoLocationCountry $GeoLocationPrecision $GeoLocationSource $HistoryLength $HomeDirectory $HTMLExportRules $HTTPCookies $HTTPRequest $IgnoreEOF $ImageFormattingWidth $ImagingDevice $ImagingDevices $ImportFormats $IncomingMailSettings $InitialDirectory $Initialization $InitializationContexts $Input $InputFileName $InputStreamMethods $Inspector $InstallationDate $InstallationDirectory $InterfaceEnvironment $InterpreterTypes $IterationLimit $KernelCount $KernelID $Language $LaunchDirectory $LibraryPath $LicenseExpirationDate $LicenseID $LicenseProcesses $LicenseServer $LicenseSubprocesses $LicenseType $Line $Linked $LinkSupported $LoadedFiles $LocalBase $LocalSymbolBase $MachineAddresses $MachineDomain $MachineDomains $MachineEpsilon $MachineID $MachineName $MachinePrecision $MachineType $MaxExtraPrecision $MaxLicenseProcesses $MaxLicenseSubprocesses $MaxMachineNumber $MaxNumber $MaxPiecewiseCases $MaxPrecision $MaxRootDegree $MessageGroups $MessageList $MessagePrePrint $Messages $MinMachineNumber $MinNumber $MinorReleaseNumber $MinPrecision $MobilePhone $ModuleNumber $NetworkConnected $NetworkInterfaces $NetworkLicense $NewMessage $NewSymbol $Notebooks $NoValue $NumberMarks $Off $OperatingSystem $Output $OutputForms $OutputSizeLimit $OutputStreamMethods $Packages $ParentLink $ParentProcessID $PasswordFile $PatchLevelID $Path $PathnameSeparator $PerformanceGoal $Permissions $PermissionsGroupBase $PersistenceBase $PersistencePath $PipeSupported $PlotTheme $Post $Pre $PreferencesDirectory $PreInitialization $PrePrint $PreRead $PrintForms $PrintLiteral $Printout3DPreviewer $ProcessID $ProcessorCount $ProcessorType $ProductInformation $ProgramName $PublisherID $RandomState $RecursionLimit $RegisteredDeviceClasses $RegisteredUserName $ReleaseNumber $RequesterAddress $RequesterWolframID $RequesterWolframUUID $ResourceSystemBase $RootDirectory $ScheduledTask $ScriptCommandLine $ScriptInputString $SecuredAuthenticationKeyTokens $ServiceCreditsAvailable $Services $SessionID $SetParentLink $SharedFunctions $SharedVariables $SoundDisplay $SoundDisplayFunction $SourceLink $SSHAuthentication $SummaryBoxDataSizeLimit $SuppressInputFormHeads $SynchronousEvaluation $SyntaxHandler $System $SystemCharacterEncoding $SystemID $SystemMemory $SystemShell $SystemTimeZone $SystemWordLength $TemplatePath $TemporaryDirectory $TemporaryPrefix $TestFileName $TextStyle $TimedOut $TimeUnit $TimeZone $TimeZoneEntity $TopDirectory $TraceOff $TraceOn $TracePattern $TracePostAction $TracePreAction $UnitSystem $Urgent $UserAddOnsDirectory $UserAgentLanguages $UserAgentMachine $UserAgentName $UserAgentOperatingSystem $UserAgentString $UserAgentVersion $UserBaseDirectory $UserDocumentsDirectory $Username $UserName $UserURLBase $Version $VersionNumber $VoiceStyles $WolframID $WolframUUID",c:[e.C("\\(\\*","\\*\\)",{c:["self"]}),e.QSM,e.CNM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/matlab.min.js b/vendor/assets/javascripts/highlightjs/languages/matlab.min.js
index 8ed3108db3..dccfcf2a1c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/matlab.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/matlab.min.js
@@ -1 +1 @@
-hljs.registerLanguage("matlab",function(){"use strict";return function(e){var a={relevance:0,contains:[{begin:"('|\\.')+"}]};return{name:"Matlab",keywords:{keyword:"break case catch classdef continue else elseif end enumerated events for function global if methods otherwise parfor persistent properties return spmd switch try while",built_in:"sin sind sinh asin asind asinh cos cosd cosh acos acosd acosh tan tand tanh atan atand atan2 atanh sec secd sech asec asecd asech csc cscd csch acsc acscd acsch cot cotd coth acot acotd acoth hypot exp expm1 log log1p log10 log2 pow2 realpow reallog realsqrt sqrt nthroot nextpow2 abs angle complex conj imag real unwrap isreal cplxpair fix floor ceil round mod rem sign airy besselj bessely besselh besseli besselk beta betainc betaln ellipj ellipke erf erfc erfcx erfinv expint gamma gammainc gammaln psi legendre cross dot factor isprime primes gcd lcm rat rats perms nchoosek factorial cart2sph cart2pol pol2cart sph2cart hsv2rgb rgb2hsv zeros ones eye repmat rand randn linspace logspace freqspace meshgrid accumarray size length ndims numel disp isempty isequal isequalwithequalnans cat reshape diag blkdiag tril triu fliplr flipud flipdim rot90 find sub2ind ind2sub bsxfun ndgrid permute ipermute shiftdim circshift squeeze isscalar isvector ans eps realmax realmin pi i inf nan isnan isinf isfinite j why compan gallery hadamard hankel hilb invhilb magic pascal rosser toeplitz vander wilkinson max min nanmax nanmin mean nanmean type table readtable writetable sortrows sort figure plot plot3 scatter scatter3 cellfun legend intersect ismember procrustes hold num2cell "},illegal:'(//|"|#|/\\*|\\s+/\\w+)',contains:[{className:"function",beginKeywords:"function",end:"$",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",variants:[{begin:"\\(",end:"\\)"},{begin:"\\[",end:"\\]"}]}]},{className:"built_in",begin:/true|false/,relevance:0,starts:a},{begin:"[a-zA-Z][a-zA-Z_0-9]*('|\\.')+",relevance:0},{className:"number",begin:e.C_NUMBER_RE,relevance:0,starts:a},{className:"string",begin:"'",end:"'",contains:[e.BACKSLASH_ESCAPE,{begin:"''"}]},{begin:/\]|}|\)/,relevance:0,starts:a},{className:"string",begin:'"',end:'"',contains:[e.BACKSLASH_ESCAPE,{begin:'""'}],starts:a},e.COMMENT("^\\s*\\%\\{\\s*$","^\\s*\\%\\}\\s*$"),e.COMMENT("\\%","$")]}}}());
\ No newline at end of file
+hljs.registerLanguage("matlab",function(e){var a="('|\\.')+",s={relevance:0,c:[{b:a}]};return{k:{keyword:"break case catch classdef continue else elseif end enumerated events for function global if methods otherwise parfor persistent properties return spmd switch try while",built_in:"sin sind sinh asin asind asinh cos cosd cosh acos acosd acosh tan tand tanh atan atand atan2 atanh sec secd sech asec asecd asech csc cscd csch acsc acscd acsch cot cotd coth acot acotd acoth hypot exp expm1 log log1p log10 log2 pow2 realpow reallog realsqrt sqrt nthroot nextpow2 abs angle complex conj imag real unwrap isreal cplxpair fix floor ceil round mod rem sign airy besselj bessely besselh besseli besselk beta betainc betaln ellipj ellipke erf erfc erfcx erfinv expint gamma gammainc gammaln psi legendre cross dot factor isprime primes gcd lcm rat rats perms nchoosek factorial cart2sph cart2pol pol2cart sph2cart hsv2rgb rgb2hsv zeros ones eye repmat rand randn linspace logspace freqspace meshgrid accumarray size length ndims numel disp isempty isequal isequalwithequalnans cat reshape diag blkdiag tril triu fliplr flipud flipdim rot90 find sub2ind ind2sub bsxfun ndgrid permute ipermute shiftdim circshift squeeze isscalar isvector ans eps realmax realmin pi i inf nan isnan isinf isfinite j why compan gallery hadamard hankel hilb invhilb magic pascal rosser toeplitz vander wilkinson max min nanmax nanmin mean nanmean type table readtable writetable sortrows sort figure plot plot3 scatter scatter3 cellfun legend intersect ismember procrustes hold num2cell "},i:'(//|"|#|/\\*|\\s+/\\w+)',c:[{cN:"function",bK:"function",e:"$",c:[e.UTM,{cN:"params",v:[{b:"\\(",e:"\\)"},{b:"\\[",e:"\\]"}]}]},{cN:"built_in",b:/true|false/,relevance:0,starts:s},{b:"[a-zA-Z][a-zA-Z_0-9]*"+a,relevance:0},{cN:"number",b:e.CNR,relevance:0,starts:s},{cN:"string",b:"'",e:"'",c:[e.BE,{b:"''"}]},{b:/\]|}|\)/,relevance:0,starts:s},{cN:"string",b:'"',e:'"',c:[e.BE,{b:'""'}],starts:s},e.C("^\\s*\\%\\{\\s*$","^\\s*\\%\\}\\s*$"),e.C("\\%","$")]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/maxima.min.js b/vendor/assets/javascripts/highlightjs/languages/maxima.min.js
index 45ef823e58..d3fc2f024a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/maxima.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/maxima.min.js
@@ -1 +1 @@
-hljs.registerLanguage("maxima",function(){"use strict";return function(e){return{name:"Maxima",keywords:{$pattern:"[A-Za-z_%][0-9A-Za-z_%]*",keyword:"if then else elseif for thru do while unless step in and or not",literal:"true false unknown inf minf ind und %e %i %pi %phi %gamma",built_in:" abasep abs absint absolute_real_time acos acosh acot acoth acsc acsch activate addcol add_edge add_edges addmatrices addrow add_vertex add_vertices adjacency_matrix adjoin adjoint af agd airy airy_ai airy_bi airy_dai airy_dbi algsys alg_type alias allroots alphacharp alphanumericp amortization %and annuity_fv annuity_pv antid antidiff AntiDifference append appendfile apply apply1 apply2 applyb1 apropos args arit_amortization arithmetic arithsum array arrayapply arrayinfo arraymake arraysetapply ascii asec asech asin asinh askinteger asksign assoc assoc_legendre_p assoc_legendre_q assume assume_external_byte_order asympa at atan atan2 atanh atensimp atom atvalue augcoefmatrix augmented_lagrangian_method av average_degree backtrace bars barsplot barsplot_description base64 base64_decode bashindices batch batchload bc2 bdvac belln benefit_cost bern bernpoly bernstein_approx bernstein_expand bernstein_poly bessel bessel_i bessel_j bessel_k bessel_simplify bessel_y beta beta_incomplete beta_incomplete_generalized beta_incomplete_regularized bezout bfallroots bffac bf_find_root bf_fmin_cobyla bfhzeta bfloat bfloatp bfpsi bfpsi0 bfzeta biconnected_components bimetric binomial bipartition block blockmatrixp bode_gain bode_phase bothcoef box boxplot boxplot_description break bug_report build_info|10 buildq build_sample burn cabs canform canten cardinality carg cartan cartesian_product catch cauchy_matrix cbffac cdf_bernoulli cdf_beta cdf_binomial cdf_cauchy cdf_chi2 cdf_continuous_uniform cdf_discrete_uniform cdf_exp cdf_f cdf_gamma cdf_general_finite_discrete cdf_geometric cdf_gumbel cdf_hypergeometric cdf_laplace cdf_logistic cdf_lognormal cdf_negative_binomial cdf_noncentral_chi2 cdf_noncentral_student_t cdf_normal cdf_pareto cdf_poisson cdf_rank_sum cdf_rayleigh cdf_signed_rank cdf_student_t cdf_weibull cdisplay ceiling central_moment cequal cequalignore cf cfdisrep cfexpand cgeodesic cgreaterp cgreaterpignore changename changevar chaosgame charat charfun charfun2 charlist charp charpoly chdir chebyshev_t chebyshev_u checkdiv check_overlaps chinese cholesky christof chromatic_index chromatic_number cint circulant_graph clear_edge_weight clear_rules clear_vertex_label clebsch_gordan clebsch_graph clessp clesspignore close closefile cmetric coeff coefmatrix cograd col collapse collectterms columnop columnspace columnswap columnvector combination combine comp2pui compare compfile compile compile_file complement_graph complete_bipartite_graph complete_graph complex_number_p components compose_functions concan concat conjugate conmetderiv connected_components connect_vertices cons constant constantp constituent constvalue cont2part content continuous_freq contortion contour_plot contract contract_edge contragrad contrib_ode convert coord copy copy_file copy_graph copylist copymatrix cor cos cosh cot coth cov cov1 covdiff covect covers crc24sum create_graph create_list csc csch csetup cspline ctaylor ct_coordsys ctransform ctranspose cube_graph cuboctahedron_graph cunlisp cv cycle_digraph cycle_graph cylindrical days360 dblint deactivate declare declare_constvalue declare_dimensions declare_fundamental_dimensions declare_fundamental_units declare_qty declare_translated declare_unit_conversion declare_units declare_weights decsym defcon define define_alt_display define_variable defint defmatch defrule defstruct deftaylor degree_sequence del delete deleten delta demo demoivre denom depends derivdegree derivlist describe desolve determinant dfloat dgauss_a dgauss_b dgeev dgemm dgeqrf dgesv dgesvd diag diagmatrix diag_matrix diagmatrixp diameter diff digitcharp dimacs_export dimacs_import dimension dimensionless dimensions dimensions_as_list direct directory discrete_freq disjoin disjointp disolate disp dispcon dispform dispfun dispJordan display disprule dispterms distrib divide divisors divsum dkummer_m dkummer_u dlange dodecahedron_graph dotproduct dotsimp dpart draw draw2d draw3d drawdf draw_file draw_graph dscalar echelon edge_coloring edge_connectivity edges eigens_by_jacobi eigenvalues eigenvectors eighth einstein eivals eivects elapsed_real_time elapsed_run_time ele2comp ele2polynome ele2pui elem elementp elevation_grid elim elim_allbut eliminate eliminate_using ellipse elliptic_e elliptic_ec elliptic_eu elliptic_f elliptic_kc elliptic_pi ematrix empty_graph emptyp endcons entermatrix entertensor entier equal equalp equiv_classes erf erfc erf_generalized erfi errcatch error errormsg errors euler ev eval_string evenp every evolution evolution2d evundiff example exp expand expandwrt expandwrt_factored expint expintegral_chi expintegral_ci expintegral_e expintegral_e1 expintegral_ei expintegral_e_simplify expintegral_li expintegral_shi expintegral_si explicit explose exponentialize express expt exsec extdiff extract_linear_equations extremal_subset ezgcd %f f90 facsum factcomb factor factorfacsum factorial factorout factorsum facts fast_central_elements fast_linsolve fasttimes featurep fernfale fft fib fibtophi fifth filename_merge file_search file_type fillarray findde find_root find_root_abs find_root_error find_root_rel first fix flatten flength float floatnump floor flower_snark flush flush1deriv flushd flushnd flush_output fmin_cobyla forget fortran fourcos fourexpand fourier fourier_elim fourint fourintcos fourintsin foursimp foursin fourth fposition frame_bracket freeof freshline fresnel_c fresnel_s from_adjacency_matrix frucht_graph full_listify fullmap fullmapl fullratsimp fullratsubst fullsetify funcsolve fundamental_dimensions fundamental_units fundef funmake funp fv g0 g1 gamma gamma_greek gamma_incomplete gamma_incomplete_generalized gamma_incomplete_regularized gauss gauss_a gauss_b gaussprob gcd gcdex gcdivide gcfac gcfactor gd generalized_lambert_w genfact gen_laguerre genmatrix gensym geo_amortization geo_annuity_fv geo_annuity_pv geomap geometric geometric_mean geosum get getcurrentdirectory get_edge_weight getenv get_lu_factors get_output_stream_string get_pixel get_plot_option get_tex_environment get_tex_environment_default get_vertex_label gfactor gfactorsum ggf girth global_variances gn gnuplot_close gnuplot_replot gnuplot_reset gnuplot_restart gnuplot_start go Gosper GosperSum gr2d gr3d gradef gramschmidt graph6_decode graph6_encode graph6_export graph6_import graph_center graph_charpoly graph_eigenvalues graph_flow graph_order graph_periphery graph_product graph_size graph_union great_rhombicosidodecahedron_graph great_rhombicuboctahedron_graph grid_graph grind grobner_basis grotzch_graph hamilton_cycle hamilton_path hankel hankel_1 hankel_2 harmonic harmonic_mean hav heawood_graph hermite hessian hgfred hilbertmap hilbert_matrix hipow histogram histogram_description hodge horner hypergeometric i0 i1 %ibes ic1 ic2 ic_convert ichr1 ichr2 icosahedron_graph icosidodecahedron_graph icurvature ident identfor identity idiff idim idummy ieqn %if ifactors iframes ifs igcdex igeodesic_coords ilt image imagpart imetric implicit implicit_derivative implicit_plot indexed_tensor indices induced_subgraph inferencep inference_result infix info_display init_atensor init_ctensor in_neighbors innerproduct inpart inprod inrt integerp integer_partitions integrate intersect intersection intervalp intopois intosum invariant1 invariant2 inverse_fft inverse_jacobi_cd inverse_jacobi_cn inverse_jacobi_cs inverse_jacobi_dc inverse_jacobi_dn inverse_jacobi_ds inverse_jacobi_nc inverse_jacobi_nd inverse_jacobi_ns inverse_jacobi_sc inverse_jacobi_sd inverse_jacobi_sn invert invert_by_adjoint invert_by_lu inv_mod irr is is_biconnected is_bipartite is_connected is_digraph is_edge_in_graph is_graph is_graph_or_digraph ishow is_isomorphic isolate isomorphism is_planar isqrt isreal_p is_sconnected is_tree is_vertex_in_graph items_inference %j j0 j1 jacobi jacobian jacobi_cd jacobi_cn jacobi_cs jacobi_dc jacobi_dn jacobi_ds jacobi_nc jacobi_nd jacobi_ns jacobi_p jacobi_sc jacobi_sd jacobi_sn JF jn join jordan julia julia_set julia_sin %k kdels kdelta kill killcontext kostka kron_delta kronecker_product kummer_m kummer_u kurtosis kurtosis_bernoulli kurtosis_beta kurtosis_binomial kurtosis_chi2 kurtosis_continuous_uniform kurtosis_discrete_uniform kurtosis_exp kurtosis_f kurtosis_gamma kurtosis_general_finite_discrete kurtosis_geometric kurtosis_gumbel kurtosis_hypergeometric kurtosis_laplace kurtosis_logistic kurtosis_lognormal kurtosis_negative_binomial kurtosis_noncentral_chi2 kurtosis_noncentral_student_t kurtosis_normal kurtosis_pareto kurtosis_poisson kurtosis_rayleigh kurtosis_student_t kurtosis_weibull label labels lagrange laguerre lambda lambert_w laplace laplacian_matrix last lbfgs lc2kdt lcharp lc_l lcm lc_u ldefint ldisp ldisplay legendre_p legendre_q leinstein length let letrules letsimp levi_civita lfreeof lgtreillis lhs li liediff limit Lindstedt linear linearinterpol linear_program linear_regression line_graph linsolve listarray list_correlations listify list_matrix_entries list_nc_monomials listoftens listofvars listp lmax lmin load loadfile local locate_matrix_entry log logcontract log_gamma lopow lorentz_gauge lowercasep lpart lratsubst lreduce lriemann lsquares_estimates lsquares_estimates_approximate lsquares_estimates_exact lsquares_mse lsquares_residual_mse lsquares_residuals lsum ltreillis lu_backsub lucas lu_factor %m macroexpand macroexpand1 make_array makebox makefact makegamma make_graph make_level_picture makelist makeOrders make_poly_continent make_poly_country make_polygon make_random_state make_rgb_picture makeset make_string_input_stream make_string_output_stream make_transform mandelbrot mandelbrot_set map mapatom maplist matchdeclare matchfix mat_cond mat_fullunblocker mat_function mathml_display mat_norm matrix matrixmap matrixp matrix_size mattrace mat_trace mat_unblocker max max_clique max_degree max_flow maximize_lp max_independent_set max_matching maybe md5sum mean mean_bernoulli mean_beta mean_binomial mean_chi2 mean_continuous_uniform mean_deviation mean_discrete_uniform mean_exp mean_f mean_gamma mean_general_finite_discrete mean_geometric mean_gumbel mean_hypergeometric mean_laplace mean_logistic mean_lognormal mean_negative_binomial mean_noncentral_chi2 mean_noncentral_student_t mean_normal mean_pareto mean_poisson mean_rayleigh mean_student_t mean_weibull median median_deviation member mesh metricexpandall mgf1_sha1 min min_degree min_edge_cut minfactorial minimalPoly minimize_lp minimum_spanning_tree minor minpack_lsquares minpack_solve min_vertex_cover min_vertex_cut mkdir mnewton mod mode_declare mode_identity ModeMatrix moebius mon2schur mono monomial_dimensions multibernstein_poly multi_display_for_texinfo multi_elem multinomial multinomial_coeff multi_orbit multiplot_mode multi_pui multsym multthru mycielski_graph nary natural_unit nc_degree ncexpt ncharpoly negative_picture neighbors new newcontext newdet new_graph newline newton new_variable next_prime nicedummies niceindices ninth nofix nonarray noncentral_moment nonmetricity nonnegintegerp nonscalarp nonzeroandfreeof notequal nounify nptetrad npv nroots nterms ntermst nthroot nullity nullspace num numbered_boundaries numberp number_to_octets num_distinct_partitions numerval numfactor num_partitions nusum nzeta nzetai nzetar octets_to_number octets_to_oid odd_girth oddp ode2 ode_check odelin oid_to_octets op opena opena_binary openr openr_binary openw openw_binary operatorp opsubst optimize %or orbit orbits ordergreat ordergreatp orderless orderlessp orthogonal_complement orthopoly_recur orthopoly_weight outermap out_neighbors outofpois pade parabolic_cylinder_d parametric parametric_surface parg parGosper parse_string parse_timedate part part2cont partfrac partition partition_set partpol path_digraph path_graph pathname_directory pathname_name pathname_type pdf_bernoulli pdf_beta pdf_binomial pdf_cauchy pdf_chi2 pdf_continuous_uniform pdf_discrete_uniform pdf_exp pdf_f pdf_gamma pdf_general_finite_discrete pdf_geometric pdf_gumbel pdf_hypergeometric pdf_laplace pdf_logistic pdf_lognormal pdf_negative_binomial pdf_noncentral_chi2 pdf_noncentral_student_t pdf_normal pdf_pareto pdf_poisson pdf_rank_sum pdf_rayleigh pdf_signed_rank pdf_student_t pdf_weibull pearson_skewness permanent permut permutation permutations petersen_graph petrov pickapart picture_equalp picturep piechart piechart_description planar_embedding playback plog plot2d plot3d plotdf ploteq plsquares pochhammer points poisdiff poisexpt poisint poismap poisplus poissimp poissubst poistimes poistrim polar polarform polartorect polar_to_xy poly_add poly_buchberger poly_buchberger_criterion poly_colon_ideal poly_content polydecomp poly_depends_p poly_elimination_ideal poly_exact_divide poly_expand poly_expt poly_gcd polygon poly_grobner poly_grobner_equal poly_grobner_member poly_grobner_subsetp poly_ideal_intersection poly_ideal_polysaturation poly_ideal_polysaturation1 poly_ideal_saturation poly_ideal_saturation1 poly_lcm poly_minimization polymod poly_multiply polynome2ele polynomialp poly_normal_form poly_normalize poly_normalize_list poly_polysaturation_extension poly_primitive_part poly_pseudo_divide poly_reduced_grobner poly_reduction poly_saturation_extension poly_s_polynomial poly_subtract polytocompanion pop postfix potential power_mod powerseries powerset prefix prev_prime primep primes principal_components print printf printfile print_graph printpois printprops prodrac product properties propvars psi psubst ptriangularize pui pui2comp pui2ele pui2polynome pui_direct puireduc push put pv qput qrange qty quad_control quad_qag quad_qagi quad_qagp quad_qags quad_qawc quad_qawf quad_qawo quad_qaws quadrilateral quantile quantile_bernoulli quantile_beta quantile_binomial quantile_cauchy quantile_chi2 quantile_continuous_uniform quantile_discrete_uniform quantile_exp quantile_f quantile_gamma quantile_general_finite_discrete quantile_geometric quantile_gumbel quantile_hypergeometric quantile_laplace quantile_logistic quantile_lognormal quantile_negative_binomial quantile_noncentral_chi2 quantile_noncentral_student_t quantile_normal quantile_pareto quantile_poisson quantile_rayleigh quantile_student_t quantile_weibull quartile_skewness quit qunit quotient racah_v racah_w radcan radius random random_bernoulli random_beta random_binomial random_bipartite_graph random_cauchy random_chi2 random_continuous_uniform random_digraph random_discrete_uniform random_exp random_f random_gamma random_general_finite_discrete random_geometric random_graph random_graph1 random_gumbel random_hypergeometric random_laplace random_logistic random_lognormal random_negative_binomial random_network random_noncentral_chi2 random_noncentral_student_t random_normal random_pareto random_permutation random_poisson random_rayleigh random_regular_graph random_student_t random_tournament random_tree random_weibull range rank rat ratcoef ratdenom ratdiff ratdisrep ratexpand ratinterpol rational rationalize ratnumer ratnump ratp ratsimp ratsubst ratvars ratweight read read_array read_binary_array read_binary_list read_binary_matrix readbyte readchar read_hashed_array readline read_list read_matrix read_nested_list readonly read_xpm real_imagpart_to_conjugate realpart realroots rearray rectangle rectform rectform_log_if_constant recttopolar rediff reduce_consts reduce_order region region_boundaries region_boundaries_plus rem remainder remarray rembox remcomps remcon remcoord remfun remfunction remlet remove remove_constvalue remove_dimensions remove_edge remove_fundamental_dimensions remove_fundamental_units remove_plot_option remove_vertex rempart remrule remsym remvalue rename rename_file reset reset_displays residue resolvante resolvante_alternee1 resolvante_bipartite resolvante_diedrale resolvante_klein resolvante_klein3 resolvante_produit_sym resolvante_unitaire resolvante_vierer rest resultant return reveal reverse revert revert2 rgb2level rhs ricci riemann rinvariant risch rk rmdir rncombine romberg room rootscontract round row rowop rowswap rreduce run_testsuite %s save saving scalarp scaled_bessel_i scaled_bessel_i0 scaled_bessel_i1 scalefactors scanmap scatterplot scatterplot_description scene schur2comp sconcat scopy scsimp scurvature sdowncase sec sech second sequal sequalignore set_alt_display setdifference set_draw_defaults set_edge_weight setelmx setequalp setify setp set_partitions set_plot_option set_prompt set_random_state set_tex_environment set_tex_environment_default setunits setup_autoload set_up_dot_simplifications set_vertex_label seventh sexplode sf sha1sum sha256sum shortest_path shortest_weighted_path show showcomps showratvars sierpinskiale sierpinskimap sign signum similaritytransform simp_inequality simplify_sum simplode simpmetderiv simtran sin sinh sinsert sinvertcase sixth skewness skewness_bernoulli skewness_beta skewness_binomial skewness_chi2 skewness_continuous_uniform skewness_discrete_uniform skewness_exp skewness_f skewness_gamma skewness_general_finite_discrete skewness_geometric skewness_gumbel skewness_hypergeometric skewness_laplace skewness_logistic skewness_lognormal skewness_negative_binomial skewness_noncentral_chi2 skewness_noncentral_student_t skewness_normal skewness_pareto skewness_poisson skewness_rayleigh skewness_student_t skewness_weibull slength smake small_rhombicosidodecahedron_graph small_rhombicuboctahedron_graph smax smin smismatch snowmap snub_cube_graph snub_dodecahedron_graph solve solve_rec solve_rec_rat some somrac sort sparse6_decode sparse6_encode sparse6_export sparse6_import specint spherical spherical_bessel_j spherical_bessel_y spherical_hankel1 spherical_hankel2 spherical_harmonic spherical_to_xyz splice split sposition sprint sqfr sqrt sqrtdenest sremove sremovefirst sreverse ssearch ssort sstatus ssubst ssubstfirst staircase standardize standardize_inverse_trig starplot starplot_description status std std1 std_bernoulli std_beta std_binomial std_chi2 std_continuous_uniform std_discrete_uniform std_exp std_f std_gamma std_general_finite_discrete std_geometric std_gumbel std_hypergeometric std_laplace std_logistic std_lognormal std_negative_binomial std_noncentral_chi2 std_noncentral_student_t std_normal std_pareto std_poisson std_rayleigh std_student_t std_weibull stemplot stirling stirling1 stirling2 strim striml strimr string stringout stringp strong_components struve_h struve_l sublis sublist sublist_indices submatrix subsample subset subsetp subst substinpart subst_parallel substpart substring subvar subvarp sum sumcontract summand_to_rec supcase supcontext symbolp symmdifference symmetricp system take_channel take_inference tan tanh taylor taylorinfo taylorp taylor_simplifier taytorat tcl_output tcontract tellrat tellsimp tellsimpafter tentex tenth test_mean test_means_difference test_normality test_proportion test_proportions_difference test_rank_sum test_sign test_signed_rank test_variance test_variance_ratio tex tex1 tex_display texput %th third throw time timedate timer timer_info tldefint tlimit todd_coxeter toeplitz tokens to_lisp topological_sort to_poly to_poly_solve totaldisrep totalfourier totient tpartpol trace tracematrix trace_options transform_sample translate translate_file transpose treefale tree_reduce treillis treinat triangle triangularize trigexpand trigrat trigreduce trigsimp trunc truncate truncated_cube_graph truncated_dodecahedron_graph truncated_icosahedron_graph truncated_tetrahedron_graph tr_warnings_get tube tutte_graph ueivects uforget ultraspherical underlying_graph undiff union unique uniteigenvectors unitp units unit_step unitvector unorder unsum untellrat untimer untrace uppercasep uricci uriemann uvect vandermonde_matrix var var1 var_bernoulli var_beta var_binomial var_chi2 var_continuous_uniform var_discrete_uniform var_exp var_f var_gamma var_general_finite_discrete var_geometric var_gumbel var_hypergeometric var_laplace var_logistic var_lognormal var_negative_binomial var_noncentral_chi2 var_noncentral_student_t var_normal var_pareto var_poisson var_rayleigh var_student_t var_weibull vector vectorpotential vectorsimp verbify vers vertex_coloring vertex_connectivity vertex_degree vertex_distance vertex_eccentricity vertex_in_degree vertex_out_degree vertices vertices_to_cycle vertices_to_path %w weyl wheel_graph wiener_index wigner_3j wigner_6j wigner_9j with_stdout write_binary_data writebyte write_data writefile wronskian xreduce xthru %y Zeilberger zeroequiv zerofor zeromatrix zeromatrixp zeta zgeev zheev zlange zn_add_table zn_carmichael_lambda zn_characteristic_factors zn_determinant zn_factor_generators zn_invert_by_lu zn_log zn_mult_table absboxchar activecontexts adapt_depth additive adim aform algebraic algepsilon algexact aliases allbut all_dotsimp_denoms allocation allsym alphabetic animation antisymmetric arrays askexp assume_pos assume_pos_pred assumescalar asymbol atomgrad atrig1 axes axis_3d axis_bottom axis_left axis_right axis_top azimuth background background_color backsubst berlefact bernstein_explicit besselexpand beta_args_sum_to_integer beta_expand bftorat bftrunc bindtest border boundaries_array box boxchar breakup %c capping cauchysum cbrange cbtics center cflength cframe_flag cnonmet_flag color color_bar color_bar_tics colorbox columns commutative complex cone context contexts contour contour_levels cosnpiflag ctaypov ctaypt ctayswitch ctayvar ct_coords ctorsion_flag ctrgsimp cube current_let_rule_package cylinder data_file_name debugmode decreasing default_let_rule_package delay dependencies derivabbrev derivsubst detout diagmetric diff dim dimensions dispflag display2d|10 display_format_internal distribute_over doallmxops domain domxexpt domxmxops domxnctimes dontfactor doscmxops doscmxplus dot0nscsimp dot0simp dot1simp dotassoc dotconstrules dotdistrib dotexptsimp dotident dotscrules draw_graph_program draw_realpart edge_color edge_coloring edge_partition edge_type edge_width %edispflag elevation %emode endphi endtheta engineering_format_floats enhanced3d %enumer epsilon_lp erfflag erf_representation errormsg error_size error_syms error_type %e_to_numlog eval even evenfun evflag evfun ev_point expandwrt_denom expintexpand expintrep expon expop exptdispflag exptisolate exptsubst facexpand facsum_combine factlim factorflag factorial_expand factors_only fb feature features file_name file_output_append file_search_demo file_search_lisp file_search_maxima|10 file_search_tests file_search_usage file_type_lisp file_type_maxima|10 fill_color fill_density filled_func fixed_vertices flipflag float2bf font font_size fortindent fortspaces fpprec fpprintprec functions gamma_expand gammalim gdet genindex gensumnum GGFCFMAX GGFINFINITY globalsolve gnuplot_command gnuplot_curve_styles gnuplot_curve_titles gnuplot_default_term_command gnuplot_dumb_term_command gnuplot_file_args gnuplot_file_name gnuplot_out_file gnuplot_pdf_term_command gnuplot_pm3d gnuplot_png_term_command gnuplot_postamble gnuplot_preamble gnuplot_ps_term_command gnuplot_svg_term_command gnuplot_term gnuplot_view_args Gosper_in_Zeilberger gradefs grid grid2d grind halfangles head_angle head_both head_length head_type height hypergeometric_representation %iargs ibase icc1 icc2 icounter idummyx ieqnprint ifb ifc1 ifc2 ifg ifgi ifr iframe_bracket_form ifri igeowedge_flag ikt1 ikt2 imaginary inchar increasing infeval infinity inflag infolists inm inmc1 inmc2 intanalysis integer integervalued integrate_use_rootsof integration_constant integration_constant_counter interpolate_color intfaclim ip_grid ip_grid_in irrational isolate_wrt_times iterations itr julia_parameter %k1 %k2 keepfloat key key_pos kinvariant kt label label_alignment label_orientation labels lassociative lbfgs_ncorrections lbfgs_nfeval_max leftjust legend letrat let_rule_packages lfg lg lhospitallim limsubst linear linear_solver linechar linel|10 linenum line_type linewidth line_width linsolve_params linsolvewarn lispdisp listarith listconstvars listdummyvars lmxchar load_pathname loadprint logabs logarc logcb logconcoeffp logexpand lognegint logsimp logx logx_secondary logy logy_secondary logz lriem m1pbranch macroexpansion macros mainvar manual_demo maperror mapprint matrix_element_add matrix_element_mult matrix_element_transpose maxapplydepth maxapplyheight maxima_tempdir|10 maxima_userdir|10 maxnegex MAX_ORD maxposex maxpsifracdenom maxpsifracnum maxpsinegint maxpsiposint maxtayorder mesh_lines_color method mod_big_prime mode_check_errorp mode_checkp mode_check_warnp mod_test mod_threshold modular_linear_solver modulus multiplicative multiplicities myoptions nary negdistrib negsumdispflag newline newtonepsilon newtonmaxiter nextlayerfactor niceindicespref nm nmc noeval nolabels nonegative_lp noninteger nonscalar noun noundisp nouns np npi nticks ntrig numer numer_pbranch obase odd oddfun opacity opproperties opsubst optimprefix optionset orientation origin orthopoly_returns_intervals outative outchar packagefile palette partswitch pdf_file pfeformat phiresolution %piargs piece pivot_count_sx pivot_max_sx plot_format plot_options plot_realpart png_file pochhammer_max_index points pointsize point_size points_joined point_type poislim poisson poly_coefficient_ring poly_elimination_order polyfactor poly_grobner_algorithm poly_grobner_debug poly_monomial_order poly_primary_elimination_order poly_return_term_list poly_secondary_elimination_order poly_top_reduction_only posfun position powerdisp pred prederror primep_number_of_tests product_use_gamma program programmode promote_float_to_bigfloat prompt proportional_axes props psexpand ps_file radexpand radius radsubstflag rassociative ratalgdenom ratchristof ratdenomdivide rateinstein ratepsilon ratfac rational ratmx ratprint ratriemann ratsimpexpons ratvarswitch ratweights ratweyl ratwtlvl real realonly redraw refcheck resolution restart resultant ric riem rmxchar %rnum_list rombergabs rombergit rombergmin rombergtol rootsconmode rootsepsilon run_viewer same_xy same_xyz savedef savefactors scalar scalarmatrixp scale scale_lp setcheck setcheckbreak setval show_edge_color show_edges show_edge_type show_edge_width show_id show_label showtime show_vertex_color show_vertex_size show_vertex_type show_vertices show_weight simp simplified_output simplify_products simpproduct simpsum sinnpiflag solvedecomposes solveexplicit solvefactors solvenullwarn solveradcan solvetrigwarn space sparse sphere spring_embedding_depth sqrtdispflag stardisp startphi starttheta stats_numer stringdisp structures style sublis_apply_lambda subnumsimp sumexpand sumsplitfact surface surface_hide svg_file symmetric tab taylordepth taylor_logexpand taylor_order_coefficients taylor_truncate_polynomials tensorkill terminal testsuite_files thetaresolution timer_devalue title tlimswitch tr track transcompile transform transform_xy translate_fast_arrays transparent transrun tr_array_as_ref tr_bound_function_applyp tr_file_tty_messagesp tr_float_can_branch_complex tr_function_call_default trigexpandplus trigexpandtimes triginverses trigsign trivial_solutions tr_numer tr_optimize_max_loop tr_semicompile tr_state_vars tr_warn_bad_function_calls tr_warn_fexpr tr_warn_meval tr_warn_mode tr_warn_undeclared tr_warn_undefined_variable tstep ttyoff tube_extremes ufg ug %unitexpand unit_vectors uric uriem use_fast_arrays user_preamble usersetunits values vect_cross verbose vertex_color vertex_coloring vertex_partition vertex_size vertex_type view warnings weyl width windowname windowtitle wired_surface wireframe xaxis xaxis_color xaxis_secondary xaxis_type xaxis_width xlabel xlabel_secondary xlength xrange xrange_secondary xtics xtics_axis xtics_rotate xtics_rotate_secondary xtics_secondary xtics_secondary_axis xu_grid x_voxel xy_file xyplane xy_scale yaxis yaxis_color yaxis_secondary yaxis_type yaxis_width ylabel ylabel_secondary ylength yrange yrange_secondary ytics ytics_axis ytics_rotate ytics_rotate_secondary ytics_secondary ytics_secondary_axis yv_grid y_voxel yx_ratio zaxis zaxis_color zaxis_type zaxis_width zeroa zerob zerobern zeta%pi zlabel zlabel_rotate zlength zmin zn_primroot_limit zn_primroot_pretest",symbol:"_ __ %|0 %%|0"},contains:[{className:"comment",begin:"/\\*",end:"\\*/",contains:["self"]},e.QUOTE_STRING_MODE,{className:"number",relevance:0,variants:[{begin:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Ee][-+]?\\d+\\b"},{begin:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Bb][-+]?\\d+\\b",relevance:10},{begin:"\\b(\\.\\d+|\\d+\\.\\d+)\\b"},{begin:"\\b(\\d+|0[0-9A-Za-z]+)\\.?\\b"}]}],illegal:/@/}}}());
\ No newline at end of file
+hljs.registerLanguage("maxima",function(e){return{l:"[A-Za-z_%][0-9A-Za-z_%]*",k:{keyword:"if then else elseif for thru do while unless step in and or not",literal:"true false unknown inf minf ind und %e %i %pi %phi %gamma",built_in:" abasep abs absint absolute_real_time acos acosh acot acoth acsc acsch activate addcol add_edge add_edges addmatrices addrow add_vertex add_vertices adjacency_matrix adjoin adjoint af agd airy airy_ai airy_bi airy_dai airy_dbi algsys alg_type alias allroots alphacharp alphanumericp amortization %and annuity_fv annuity_pv antid antidiff AntiDifference append appendfile apply apply1 apply2 applyb1 apropos args arit_amortization arithmetic arithsum array arrayapply arrayinfo arraymake arraysetapply ascii asec asech asin asinh askinteger asksign assoc assoc_legendre_p assoc_legendre_q assume assume_external_byte_order asympa at atan atan2 atanh atensimp atom atvalue augcoefmatrix augmented_lagrangian_method av average_degree backtrace bars barsplot barsplot_description base64 base64_decode bashindices batch batchload bc2 bdvac belln benefit_cost bern bernpoly bernstein_approx bernstein_expand bernstein_poly bessel bessel_i bessel_j bessel_k bessel_simplify bessel_y beta beta_incomplete beta_incomplete_generalized beta_incomplete_regularized bezout bfallroots bffac bf_find_root bf_fmin_cobyla bfhzeta bfloat bfloatp bfpsi bfpsi0 bfzeta biconnected_components bimetric binomial bipartition block blockmatrixp bode_gain bode_phase bothcoef box boxplot boxplot_description break bug_report build_info|10 buildq build_sample burn cabs canform canten cardinality carg cartan cartesian_product catch cauchy_matrix cbffac cdf_bernoulli cdf_beta cdf_binomial cdf_cauchy cdf_chi2 cdf_continuous_uniform cdf_discrete_uniform cdf_exp cdf_f cdf_gamma cdf_general_finite_discrete cdf_geometric cdf_gumbel cdf_hypergeometric cdf_laplace cdf_logistic cdf_lognormal cdf_negative_binomial cdf_noncentral_chi2 cdf_noncentral_student_t cdf_normal cdf_pareto cdf_poisson cdf_rank_sum cdf_rayleigh cdf_signed_rank cdf_student_t cdf_weibull cdisplay ceiling central_moment cequal cequalignore cf cfdisrep cfexpand cgeodesic cgreaterp cgreaterpignore changename changevar chaosgame charat charfun charfun2 charlist charp charpoly chdir chebyshev_t chebyshev_u checkdiv check_overlaps chinese cholesky christof chromatic_index chromatic_number cint circulant_graph clear_edge_weight clear_rules clear_vertex_label clebsch_gordan clebsch_graph clessp clesspignore close closefile cmetric coeff coefmatrix cograd col collapse collectterms columnop columnspace columnswap columnvector combination combine comp2pui compare compfile compile compile_file complement_graph complete_bipartite_graph complete_graph complex_number_p components compose_functions concan concat conjugate conmetderiv connected_components connect_vertices cons constant constantp constituent constvalue cont2part content continuous_freq contortion contour_plot contract contract_edge contragrad contrib_ode convert coord copy copy_file copy_graph copylist copymatrix cor cos cosh cot coth cov cov1 covdiff covect covers crc24sum create_graph create_list csc csch csetup cspline ctaylor ct_coordsys ctransform ctranspose cube_graph cuboctahedron_graph cunlisp cv cycle_digraph cycle_graph cylindrical days360 dblint deactivate declare declare_constvalue declare_dimensions declare_fundamental_dimensions declare_fundamental_units declare_qty declare_translated declare_unit_conversion declare_units declare_weights decsym defcon define define_alt_display define_variable defint defmatch defrule defstruct deftaylor degree_sequence del delete deleten delta demo demoivre denom depends derivdegree derivlist describe desolve determinant dfloat dgauss_a dgauss_b dgeev dgemm dgeqrf dgesv dgesvd diag diagmatrix diag_matrix diagmatrixp diameter diff digitcharp dimacs_export dimacs_import dimension dimensionless dimensions dimensions_as_list direct directory discrete_freq disjoin disjointp disolate disp dispcon dispform dispfun dispJordan display disprule dispterms distrib divide divisors divsum dkummer_m dkummer_u dlange dodecahedron_graph dotproduct dotsimp dpart draw draw2d draw3d drawdf draw_file draw_graph dscalar echelon edge_coloring edge_connectivity edges eigens_by_jacobi eigenvalues eigenvectors eighth einstein eivals eivects elapsed_real_time elapsed_run_time ele2comp ele2polynome ele2pui elem elementp elevation_grid elim elim_allbut eliminate eliminate_using ellipse elliptic_e elliptic_ec elliptic_eu elliptic_f elliptic_kc elliptic_pi ematrix empty_graph emptyp endcons entermatrix entertensor entier equal equalp equiv_classes erf erfc erf_generalized erfi errcatch error errormsg errors euler ev eval_string evenp every evolution evolution2d evundiff example exp expand expandwrt expandwrt_factored expint expintegral_chi expintegral_ci expintegral_e expintegral_e1 expintegral_ei expintegral_e_simplify expintegral_li expintegral_shi expintegral_si explicit explose exponentialize express expt exsec extdiff extract_linear_equations extremal_subset ezgcd %f f90 facsum factcomb factor factorfacsum factorial factorout factorsum facts fast_central_elements fast_linsolve fasttimes featurep fernfale fft fib fibtophi fifth filename_merge file_search file_type fillarray findde find_root find_root_abs find_root_error find_root_rel first fix flatten flength float floatnump floor flower_snark flush flush1deriv flushd flushnd flush_output fmin_cobyla forget fortran fourcos fourexpand fourier fourier_elim fourint fourintcos fourintsin foursimp foursin fourth fposition frame_bracket freeof freshline fresnel_c fresnel_s from_adjacency_matrix frucht_graph full_listify fullmap fullmapl fullratsimp fullratsubst fullsetify funcsolve fundamental_dimensions fundamental_units fundef funmake funp fv g0 g1 gamma gamma_greek gamma_incomplete gamma_incomplete_generalized gamma_incomplete_regularized gauss gauss_a gauss_b gaussprob gcd gcdex gcdivide gcfac gcfactor gd generalized_lambert_w genfact gen_laguerre genmatrix gensym geo_amortization geo_annuity_fv geo_annuity_pv geomap geometric geometric_mean geosum get getcurrentdirectory get_edge_weight getenv get_lu_factors get_output_stream_string get_pixel get_plot_option get_tex_environment get_tex_environment_default get_vertex_label gfactor gfactorsum ggf girth global_variances gn gnuplot_close gnuplot_replot gnuplot_reset gnuplot_restart gnuplot_start go Gosper GosperSum gr2d gr3d gradef gramschmidt graph6_decode graph6_encode graph6_export graph6_import graph_center graph_charpoly graph_eigenvalues graph_flow graph_order graph_periphery graph_product graph_size graph_union great_rhombicosidodecahedron_graph great_rhombicuboctahedron_graph grid_graph grind grobner_basis grotzch_graph hamilton_cycle hamilton_path hankel hankel_1 hankel_2 harmonic harmonic_mean hav heawood_graph hermite hessian hgfred hilbertmap hilbert_matrix hipow histogram histogram_description hodge horner hypergeometric i0 i1 %ibes ic1 ic2 ic_convert ichr1 ichr2 icosahedron_graph icosidodecahedron_graph icurvature ident identfor identity idiff idim idummy ieqn %if ifactors iframes ifs igcdex igeodesic_coords ilt image imagpart imetric implicit implicit_derivative implicit_plot indexed_tensor indices induced_subgraph inferencep inference_result infix info_display init_atensor init_ctensor in_neighbors innerproduct inpart inprod inrt integerp integer_partitions integrate intersect intersection intervalp intopois intosum invariant1 invariant2 inverse_fft inverse_jacobi_cd inverse_jacobi_cn inverse_jacobi_cs inverse_jacobi_dc inverse_jacobi_dn inverse_jacobi_ds inverse_jacobi_nc inverse_jacobi_nd inverse_jacobi_ns inverse_jacobi_sc inverse_jacobi_sd inverse_jacobi_sn invert invert_by_adjoint invert_by_lu inv_mod irr is is_biconnected is_bipartite is_connected is_digraph is_edge_in_graph is_graph is_graph_or_digraph ishow is_isomorphic isolate isomorphism is_planar isqrt isreal_p is_sconnected is_tree is_vertex_in_graph items_inference %j j0 j1 jacobi jacobian jacobi_cd jacobi_cn jacobi_cs jacobi_dc jacobi_dn jacobi_ds jacobi_nc jacobi_nd jacobi_ns jacobi_p jacobi_sc jacobi_sd jacobi_sn JF jn join jordan julia julia_set julia_sin %k kdels kdelta kill killcontext kostka kron_delta kronecker_product kummer_m kummer_u kurtosis kurtosis_bernoulli kurtosis_beta kurtosis_binomial kurtosis_chi2 kurtosis_continuous_uniform kurtosis_discrete_uniform kurtosis_exp kurtosis_f kurtosis_gamma kurtosis_general_finite_discrete kurtosis_geometric kurtosis_gumbel kurtosis_hypergeometric kurtosis_laplace kurtosis_logistic kurtosis_lognormal kurtosis_negative_binomial kurtosis_noncentral_chi2 kurtosis_noncentral_student_t kurtosis_normal kurtosis_pareto kurtosis_poisson kurtosis_rayleigh kurtosis_student_t kurtosis_weibull label labels lagrange laguerre lambda lambert_w laplace laplacian_matrix last lbfgs lc2kdt lcharp lc_l lcm lc_u ldefint ldisp ldisplay legendre_p legendre_q leinstein length let letrules letsimp levi_civita lfreeof lgtreillis lhs li liediff limit Lindstedt linear linearinterpol linear_program linear_regression line_graph linsolve listarray list_correlations listify list_matrix_entries list_nc_monomials listoftens listofvars listp lmax lmin load loadfile local locate_matrix_entry log logcontract log_gamma lopow lorentz_gauge lowercasep lpart lratsubst lreduce lriemann lsquares_estimates lsquares_estimates_approximate lsquares_estimates_exact lsquares_mse lsquares_residual_mse lsquares_residuals lsum ltreillis lu_backsub lucas lu_factor %m macroexpand macroexpand1 make_array makebox makefact makegamma make_graph make_level_picture makelist makeOrders make_poly_continent make_poly_country make_polygon make_random_state make_rgb_picture makeset make_string_input_stream make_string_output_stream make_transform mandelbrot mandelbrot_set map mapatom maplist matchdeclare matchfix mat_cond mat_fullunblocker mat_function mathml_display mat_norm matrix matrixmap matrixp matrix_size mattrace mat_trace mat_unblocker max max_clique max_degree max_flow maximize_lp max_independent_set max_matching maybe md5sum mean mean_bernoulli mean_beta mean_binomial mean_chi2 mean_continuous_uniform mean_deviation mean_discrete_uniform mean_exp mean_f mean_gamma mean_general_finite_discrete mean_geometric mean_gumbel mean_hypergeometric mean_laplace mean_logistic mean_lognormal mean_negative_binomial mean_noncentral_chi2 mean_noncentral_student_t mean_normal mean_pareto mean_poisson mean_rayleigh mean_student_t mean_weibull median median_deviation member mesh metricexpandall mgf1_sha1 min min_degree min_edge_cut minfactorial minimalPoly minimize_lp minimum_spanning_tree minor minpack_lsquares minpack_solve min_vertex_cover min_vertex_cut mkdir mnewton mod mode_declare mode_identity ModeMatrix moebius mon2schur mono monomial_dimensions multibernstein_poly multi_display_for_texinfo multi_elem multinomial multinomial_coeff multi_orbit multiplot_mode multi_pui multsym multthru mycielski_graph nary natural_unit nc_degree ncexpt ncharpoly negative_picture neighbors new newcontext newdet new_graph newline newton new_variable next_prime nicedummies niceindices ninth nofix nonarray noncentral_moment nonmetricity nonnegintegerp nonscalarp nonzeroandfreeof notequal nounify nptetrad npv nroots nterms ntermst nthroot nullity nullspace num numbered_boundaries numberp number_to_octets num_distinct_partitions numerval numfactor num_partitions nusum nzeta nzetai nzetar octets_to_number octets_to_oid odd_girth oddp ode2 ode_check odelin oid_to_octets op opena opena_binary openr openr_binary openw openw_binary operatorp opsubst optimize %or orbit orbits ordergreat ordergreatp orderless orderlessp orthogonal_complement orthopoly_recur orthopoly_weight outermap out_neighbors outofpois pade parabolic_cylinder_d parametric parametric_surface parg parGosper parse_string parse_timedate part part2cont partfrac partition partition_set partpol path_digraph path_graph pathname_directory pathname_name pathname_type pdf_bernoulli pdf_beta pdf_binomial pdf_cauchy pdf_chi2 pdf_continuous_uniform pdf_discrete_uniform pdf_exp pdf_f pdf_gamma pdf_general_finite_discrete pdf_geometric pdf_gumbel pdf_hypergeometric pdf_laplace pdf_logistic pdf_lognormal pdf_negative_binomial pdf_noncentral_chi2 pdf_noncentral_student_t pdf_normal pdf_pareto pdf_poisson pdf_rank_sum pdf_rayleigh pdf_signed_rank pdf_student_t pdf_weibull pearson_skewness permanent permut permutation permutations petersen_graph petrov pickapart picture_equalp picturep piechart piechart_description planar_embedding playback plog plot2d plot3d plotdf ploteq plsquares pochhammer points poisdiff poisexpt poisint poismap poisplus poissimp poissubst poistimes poistrim polar polarform polartorect polar_to_xy poly_add poly_buchberger poly_buchberger_criterion poly_colon_ideal poly_content polydecomp poly_depends_p poly_elimination_ideal poly_exact_divide poly_expand poly_expt poly_gcd polygon poly_grobner poly_grobner_equal poly_grobner_member poly_grobner_subsetp poly_ideal_intersection poly_ideal_polysaturation poly_ideal_polysaturation1 poly_ideal_saturation poly_ideal_saturation1 poly_lcm poly_minimization polymod poly_multiply polynome2ele polynomialp poly_normal_form poly_normalize poly_normalize_list poly_polysaturation_extension poly_primitive_part poly_pseudo_divide poly_reduced_grobner poly_reduction poly_saturation_extension poly_s_polynomial poly_subtract polytocompanion pop postfix potential power_mod powerseries powerset prefix prev_prime primep primes principal_components print printf printfile print_graph printpois printprops prodrac product properties propvars psi psubst ptriangularize pui pui2comp pui2ele pui2polynome pui_direct puireduc push put pv qput qrange qty quad_control quad_qag quad_qagi quad_qagp quad_qags quad_qawc quad_qawf quad_qawo quad_qaws quadrilateral quantile quantile_bernoulli quantile_beta quantile_binomial quantile_cauchy quantile_chi2 quantile_continuous_uniform quantile_discrete_uniform quantile_exp quantile_f quantile_gamma quantile_general_finite_discrete quantile_geometric quantile_gumbel quantile_hypergeometric quantile_laplace quantile_logistic quantile_lognormal quantile_negative_binomial quantile_noncentral_chi2 quantile_noncentral_student_t quantile_normal quantile_pareto quantile_poisson quantile_rayleigh quantile_student_t quantile_weibull quartile_skewness quit qunit quotient racah_v racah_w radcan radius random random_bernoulli random_beta random_binomial random_bipartite_graph random_cauchy random_chi2 random_continuous_uniform random_digraph random_discrete_uniform random_exp random_f random_gamma random_general_finite_discrete random_geometric random_graph random_graph1 random_gumbel random_hypergeometric random_laplace random_logistic random_lognormal random_negative_binomial random_network random_noncentral_chi2 random_noncentral_student_t random_normal random_pareto random_permutation random_poisson random_rayleigh random_regular_graph random_student_t random_tournament random_tree random_weibull range rank rat ratcoef ratdenom ratdiff ratdisrep ratexpand ratinterpol rational rationalize ratnumer ratnump ratp ratsimp ratsubst ratvars ratweight read read_array read_binary_array read_binary_list read_binary_matrix readbyte readchar read_hashed_array readline read_list read_matrix read_nested_list readonly read_xpm real_imagpart_to_conjugate realpart realroots rearray rectangle rectform rectform_log_if_constant recttopolar rediff reduce_consts reduce_order region region_boundaries region_boundaries_plus rem remainder remarray rembox remcomps remcon remcoord remfun remfunction remlet remove remove_constvalue remove_dimensions remove_edge remove_fundamental_dimensions remove_fundamental_units remove_plot_option remove_vertex rempart remrule remsym remvalue rename rename_file reset reset_displays residue resolvante resolvante_alternee1 resolvante_bipartite resolvante_diedrale resolvante_klein resolvante_klein3 resolvante_produit_sym resolvante_unitaire resolvante_vierer rest resultant return reveal reverse revert revert2 rgb2level rhs ricci riemann rinvariant risch rk rmdir rncombine romberg room rootscontract round row rowop rowswap rreduce run_testsuite %s save saving scalarp scaled_bessel_i scaled_bessel_i0 scaled_bessel_i1 scalefactors scanmap scatterplot scatterplot_description scene schur2comp sconcat scopy scsimp scurvature sdowncase sec sech second sequal sequalignore set_alt_display setdifference set_draw_defaults set_edge_weight setelmx setequalp setify setp set_partitions set_plot_option set_prompt set_random_state set_tex_environment set_tex_environment_default setunits setup_autoload set_up_dot_simplifications set_vertex_label seventh sexplode sf sha1sum sha256sum shortest_path shortest_weighted_path show showcomps showratvars sierpinskiale sierpinskimap sign signum similaritytransform simp_inequality simplify_sum simplode simpmetderiv simtran sin sinh sinsert sinvertcase sixth skewness skewness_bernoulli skewness_beta skewness_binomial skewness_chi2 skewness_continuous_uniform skewness_discrete_uniform skewness_exp skewness_f skewness_gamma skewness_general_finite_discrete skewness_geometric skewness_gumbel skewness_hypergeometric skewness_laplace skewness_logistic skewness_lognormal skewness_negative_binomial skewness_noncentral_chi2 skewness_noncentral_student_t skewness_normal skewness_pareto skewness_poisson skewness_rayleigh skewness_student_t skewness_weibull slength smake small_rhombicosidodecahedron_graph small_rhombicuboctahedron_graph smax smin smismatch snowmap snub_cube_graph snub_dodecahedron_graph solve solve_rec solve_rec_rat some somrac sort sparse6_decode sparse6_encode sparse6_export sparse6_import specint spherical spherical_bessel_j spherical_bessel_y spherical_hankel1 spherical_hankel2 spherical_harmonic spherical_to_xyz splice split sposition sprint sqfr sqrt sqrtdenest sremove sremovefirst sreverse ssearch ssort sstatus ssubst ssubstfirst staircase standardize standardize_inverse_trig starplot starplot_description status std std1 std_bernoulli std_beta std_binomial std_chi2 std_continuous_uniform std_discrete_uniform std_exp std_f std_gamma std_general_finite_discrete std_geometric std_gumbel std_hypergeometric std_laplace std_logistic std_lognormal std_negative_binomial std_noncentral_chi2 std_noncentral_student_t std_normal std_pareto std_poisson std_rayleigh std_student_t std_weibull stemplot stirling stirling1 stirling2 strim striml strimr string stringout stringp strong_components struve_h struve_l sublis sublist sublist_indices submatrix subsample subset subsetp subst substinpart subst_parallel substpart substring subvar subvarp sum sumcontract summand_to_rec supcase supcontext symbolp symmdifference symmetricp system take_channel take_inference tan tanh taylor taylorinfo taylorp taylor_simplifier taytorat tcl_output tcontract tellrat tellsimp tellsimpafter tentex tenth test_mean test_means_difference test_normality test_proportion test_proportions_difference test_rank_sum test_sign test_signed_rank test_variance test_variance_ratio tex tex1 tex_display texput %th third throw time timedate timer timer_info tldefint tlimit todd_coxeter toeplitz tokens to_lisp topological_sort to_poly to_poly_solve totaldisrep totalfourier totient tpartpol trace tracematrix trace_options transform_sample translate translate_file transpose treefale tree_reduce treillis treinat triangle triangularize trigexpand trigrat trigreduce trigsimp trunc truncate truncated_cube_graph truncated_dodecahedron_graph truncated_icosahedron_graph truncated_tetrahedron_graph tr_warnings_get tube tutte_graph ueivects uforget ultraspherical underlying_graph undiff union unique uniteigenvectors unitp units unit_step unitvector unorder unsum untellrat untimer untrace uppercasep uricci uriemann uvect vandermonde_matrix var var1 var_bernoulli var_beta var_binomial var_chi2 var_continuous_uniform var_discrete_uniform var_exp var_f var_gamma var_general_finite_discrete var_geometric var_gumbel var_hypergeometric var_laplace var_logistic var_lognormal var_negative_binomial var_noncentral_chi2 var_noncentral_student_t var_normal var_pareto var_poisson var_rayleigh var_student_t var_weibull vector vectorpotential vectorsimp verbify vers vertex_coloring vertex_connectivity vertex_degree vertex_distance vertex_eccentricity vertex_in_degree vertex_out_degree vertices vertices_to_cycle vertices_to_path %w weyl wheel_graph wiener_index wigner_3j wigner_6j wigner_9j with_stdout write_binary_data writebyte write_data writefile wronskian xreduce xthru %y Zeilberger zeroequiv zerofor zeromatrix zeromatrixp zeta zgeev zheev zlange zn_add_table zn_carmichael_lambda zn_characteristic_factors zn_determinant zn_factor_generators zn_invert_by_lu zn_log zn_mult_table absboxchar activecontexts adapt_depth additive adim aform algebraic algepsilon algexact aliases allbut all_dotsimp_denoms allocation allsym alphabetic animation antisymmetric arrays askexp assume_pos assume_pos_pred assumescalar asymbol atomgrad atrig1 axes axis_3d axis_bottom axis_left axis_right axis_top azimuth background background_color backsubst berlefact bernstein_explicit besselexpand beta_args_sum_to_integer beta_expand bftorat bftrunc bindtest border boundaries_array box boxchar breakup %c capping cauchysum cbrange cbtics center cflength cframe_flag cnonmet_flag color color_bar color_bar_tics colorbox columns commutative complex cone context contexts contour contour_levels cosnpiflag ctaypov ctaypt ctayswitch ctayvar ct_coords ctorsion_flag ctrgsimp cube current_let_rule_package cylinder data_file_name debugmode decreasing default_let_rule_package delay dependencies derivabbrev derivsubst detout diagmetric diff dim dimensions dispflag display2d|10 display_format_internal distribute_over doallmxops domain domxexpt domxmxops domxnctimes dontfactor doscmxops doscmxplus dot0nscsimp dot0simp dot1simp dotassoc dotconstrules dotdistrib dotexptsimp dotident dotscrules draw_graph_program draw_realpart edge_color edge_coloring edge_partition edge_type edge_width %edispflag elevation %emode endphi endtheta engineering_format_floats enhanced3d %enumer epsilon_lp erfflag erf_representation errormsg error_size error_syms error_type %e_to_numlog eval even evenfun evflag evfun ev_point expandwrt_denom expintexpand expintrep expon expop exptdispflag exptisolate exptsubst facexpand facsum_combine factlim factorflag factorial_expand factors_only fb feature features file_name file_output_append file_search_demo file_search_lisp file_search_maxima|10 file_search_tests file_search_usage file_type_lisp file_type_maxima|10 fill_color fill_density filled_func fixed_vertices flipflag float2bf font font_size fortindent fortspaces fpprec fpprintprec functions gamma_expand gammalim gdet genindex gensumnum GGFCFMAX GGFINFINITY globalsolve gnuplot_command gnuplot_curve_styles gnuplot_curve_titles gnuplot_default_term_command gnuplot_dumb_term_command gnuplot_file_args gnuplot_file_name gnuplot_out_file gnuplot_pdf_term_command gnuplot_pm3d gnuplot_png_term_command gnuplot_postamble gnuplot_preamble gnuplot_ps_term_command gnuplot_svg_term_command gnuplot_term gnuplot_view_args Gosper_in_Zeilberger gradefs grid grid2d grind halfangles head_angle head_both head_length head_type height hypergeometric_representation %iargs ibase icc1 icc2 icounter idummyx ieqnprint ifb ifc1 ifc2 ifg ifgi ifr iframe_bracket_form ifri igeowedge_flag ikt1 ikt2 imaginary inchar increasing infeval infinity inflag infolists inm inmc1 inmc2 intanalysis integer integervalued integrate_use_rootsof integration_constant integration_constant_counter interpolate_color intfaclim ip_grid ip_grid_in irrational isolate_wrt_times iterations itr julia_parameter %k1 %k2 keepfloat key key_pos kinvariant kt label label_alignment label_orientation labels lassociative lbfgs_ncorrections lbfgs_nfeval_max leftjust legend letrat let_rule_packages lfg lg lhospitallim limsubst linear linear_solver linechar linel|10 linenum line_type linewidth line_width linsolve_params linsolvewarn lispdisp listarith listconstvars listdummyvars lmxchar load_pathname loadprint logabs logarc logcb logconcoeffp logexpand lognegint logsimp logx logx_secondary logy logy_secondary logz lriem m1pbranch macroexpansion macros mainvar manual_demo maperror mapprint matrix_element_add matrix_element_mult matrix_element_transpose maxapplydepth maxapplyheight maxima_tempdir|10 maxima_userdir|10 maxnegex MAX_ORD maxposex maxpsifracdenom maxpsifracnum maxpsinegint maxpsiposint maxtayorder mesh_lines_color method mod_big_prime mode_check_errorp mode_checkp mode_check_warnp mod_test mod_threshold modular_linear_solver modulus multiplicative multiplicities myoptions nary negdistrib negsumdispflag newline newtonepsilon newtonmaxiter nextlayerfactor niceindicespref nm nmc noeval nolabels nonegative_lp noninteger nonscalar noun noundisp nouns np npi nticks ntrig numer numer_pbranch obase odd oddfun opacity opproperties opsubst optimprefix optionset orientation origin orthopoly_returns_intervals outative outchar packagefile palette partswitch pdf_file pfeformat phiresolution %piargs piece pivot_count_sx pivot_max_sx plot_format plot_options plot_realpart png_file pochhammer_max_index points pointsize point_size points_joined point_type poislim poisson poly_coefficient_ring poly_elimination_order polyfactor poly_grobner_algorithm poly_grobner_debug poly_monomial_order poly_primary_elimination_order poly_return_term_list poly_secondary_elimination_order poly_top_reduction_only posfun position powerdisp pred prederror primep_number_of_tests product_use_gamma program programmode promote_float_to_bigfloat prompt proportional_axes props psexpand ps_file radexpand radius radsubstflag rassociative ratalgdenom ratchristof ratdenomdivide rateinstein ratepsilon ratfac rational ratmx ratprint ratriemann ratsimpexpons ratvarswitch ratweights ratweyl ratwtlvl real realonly redraw refcheck resolution restart resultant ric riem rmxchar %rnum_list rombergabs rombergit rombergmin rombergtol rootsconmode rootsepsilon run_viewer same_xy same_xyz savedef savefactors scalar scalarmatrixp scale scale_lp setcheck setcheckbreak setval show_edge_color show_edges show_edge_type show_edge_width show_id show_label showtime show_vertex_color show_vertex_size show_vertex_type show_vertices show_weight simp simplified_output simplify_products simpproduct simpsum sinnpiflag solvedecomposes solveexplicit solvefactors solvenullwarn solveradcan solvetrigwarn space sparse sphere spring_embedding_depth sqrtdispflag stardisp startphi starttheta stats_numer stringdisp structures style sublis_apply_lambda subnumsimp sumexpand sumsplitfact surface surface_hide svg_file symmetric tab taylordepth taylor_logexpand taylor_order_coefficients taylor_truncate_polynomials tensorkill terminal testsuite_files thetaresolution timer_devalue title tlimswitch tr track transcompile transform transform_xy translate_fast_arrays transparent transrun tr_array_as_ref tr_bound_function_applyp tr_file_tty_messagesp tr_float_can_branch_complex tr_function_call_default trigexpandplus trigexpandtimes triginverses trigsign trivial_solutions tr_numer tr_optimize_max_loop tr_semicompile tr_state_vars tr_warn_bad_function_calls tr_warn_fexpr tr_warn_meval tr_warn_mode tr_warn_undeclared tr_warn_undefined_variable tstep ttyoff tube_extremes ufg ug %unitexpand unit_vectors uric uriem use_fast_arrays user_preamble usersetunits values vect_cross verbose vertex_color vertex_coloring vertex_partition vertex_size vertex_type view warnings weyl width windowname windowtitle wired_surface wireframe xaxis xaxis_color xaxis_secondary xaxis_type xaxis_width xlabel xlabel_secondary xlength xrange xrange_secondary xtics xtics_axis xtics_rotate xtics_rotate_secondary xtics_secondary xtics_secondary_axis xu_grid x_voxel xy_file xyplane xy_scale yaxis yaxis_color yaxis_secondary yaxis_type yaxis_width ylabel ylabel_secondary ylength yrange yrange_secondary ytics ytics_axis ytics_rotate ytics_rotate_secondary ytics_secondary ytics_secondary_axis yv_grid y_voxel yx_ratio zaxis zaxis_color zaxis_type zaxis_width zeroa zerob zerobern zeta%pi zlabel zlabel_rotate zlength zmin zn_primroot_limit zn_primroot_pretest",symbol:"_ __ %|0 %%|0"},c:[{cN:"comment",b:"/\\*",e:"\\*/",c:["self"]},e.QSM,{cN:"number",relevance:0,v:[{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Ee][-+]?\\d+\\b"},{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Bb][-+]?\\d+\\b",relevance:10},{b:"\\b(\\.\\d+|\\d+\\.\\d+)\\b"},{b:"\\b(\\d+|0[0-9A-Za-z]+)\\.?\\b"}]}],i:/@/}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/mel.min.js b/vendor/assets/javascripts/highlightjs/languages/mel.min.js
index 881a207921..cb5f45347d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mel.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mel.min.js
@@ -1 +1 @@
-hljs.registerLanguage("mel",function(){"use strict";return function(e){return{name:"MEL",keywords:"int float string vector matrix if else switch case default while do for in break continue global proc return about abs addAttr addAttributeEditorNodeHelp addDynamic addNewShelfTab addPP addPanelCategory addPrefixToName advanceToNextDrivenKey affectedNet affects aimConstraint air alias aliasAttr align alignCtx alignCurve alignSurface allViewFit ambientLight angle angleBetween animCone animCurveEditor animDisplay animView annotate appendStringArray applicationName applyAttrPreset applyTake arcLenDimContext arcLengthDimension arclen arrayMapper art3dPaintCtx artAttrCtx artAttrPaintVertexCtx artAttrSkinPaintCtx artAttrTool artBuildPaintMenu artFluidAttrCtx artPuttyCtx artSelectCtx artSetPaintCtx artUserPaintCtx assignCommand assignInputDevice assignViewportFactories attachCurve attachDeviceAttr attachSurface attrColorSliderGrp attrCompatibility attrControlGrp attrEnumOptionMenu attrEnumOptionMenuGrp attrFieldGrp attrFieldSliderGrp attrNavigationControlGrp attrPresetEditWin attributeExists attributeInfo attributeMenu attributeQuery autoKeyframe autoPlace bakeClip bakeFluidShading bakePartialHistory bakeResults bakeSimulation basename basenameEx batchRender bessel bevel bevelPlus binMembership bindSkin blend2 blendShape blendShapeEditor blendShapePanel blendTwoAttr blindDataType boneLattice boundary boxDollyCtx boxZoomCtx bufferCurve buildBookmarkMenu buildKeyframeMenu button buttonManip CBG cacheFile cacheFileCombine cacheFileMerge cacheFileTrack camera cameraView canCreateManip canvas capitalizeString catch catchQuiet ceil changeSubdivComponentDisplayLevel changeSubdivRegion channelBox character characterMap characterOutlineEditor characterize chdir checkBox checkBoxGrp checkDefaultRenderGlobals choice circle circularFillet clamp clear clearCache clip clipEditor clipEditorCurrentTimeCtx clipSchedule clipSchedulerOutliner clipTrimBefore closeCurve closeSurface cluster cmdFileOutput cmdScrollFieldExecuter cmdScrollFieldReporter cmdShell coarsenSubdivSelectionList collision color colorAtPoint colorEditor colorIndex colorIndexSliderGrp colorSliderButtonGrp colorSliderGrp columnLayout commandEcho commandLine commandPort compactHairSystem componentEditor compositingInterop computePolysetVolume condition cone confirmDialog connectAttr connectControl connectDynamic connectJoint connectionInfo constrain constrainValue constructionHistory container containsMultibyte contextInfo control convertFromOldLayers convertIffToPsd convertLightmap convertSolidTx convertTessellation convertUnit copyArray copyFlexor copyKey copySkinWeights cos cpButton cpCache cpClothSet cpCollision cpConstraint cpConvClothToMesh cpForces cpGetSolverAttr cpPanel cpProperty cpRigidCollisionFilter cpSeam cpSetEdit cpSetSolverAttr cpSolver cpSolverTypes cpTool cpUpdateClothUVs createDisplayLayer createDrawCtx createEditor createLayeredPsdFile createMotionField createNewShelf createNode createRenderLayer createSubdivRegion cross crossProduct ctxAbort ctxCompletion ctxEditMode ctxTraverse currentCtx currentTime currentTimeCtx currentUnit curve curveAddPtCtx curveCVCtx curveEPCtx curveEditorCtx curveIntersect curveMoveEPCtx curveOnSurface curveSketchCtx cutKey cycleCheck cylinder dagPose date defaultLightListCheckBox defaultNavigation defineDataServer defineVirtualDevice deformer deg_to_rad delete deleteAttr deleteShadingGroupsAndMaterials deleteShelfTab deleteUI deleteUnusedBrushes delrandstr detachCurve detachDeviceAttr detachSurface deviceEditor devicePanel dgInfo dgdirty dgeval dgtimer dimWhen directKeyCtx directionalLight dirmap dirname disable disconnectAttr disconnectJoint diskCache displacementToPoly displayAffected displayColor displayCull displayLevelOfDetail displayPref displayRGBColor displaySmoothness displayStats displayString displaySurface distanceDimContext distanceDimension doBlur dolly dollyCtx dopeSheetEditor dot dotProduct doubleProfileBirailSurface drag dragAttrContext draggerContext dropoffLocator duplicate duplicateCurve duplicateSurface dynCache dynControl dynExport dynExpression dynGlobals dynPaintEditor dynParticleCtx dynPref dynRelEdPanel dynRelEditor dynamicLoad editAttrLimits editDisplayLayerGlobals editDisplayLayerMembers editRenderLayerAdjustment editRenderLayerGlobals editRenderLayerMembers editor editorTemplate effector emit emitter enableDevice encodeString endString endsWith env equivalent equivalentTol erf error eval evalDeferred evalEcho event exactWorldBoundingBox exclusiveLightCheckBox exec executeForEachObject exists exp expression expressionEditorListen extendCurve extendSurface extrude fcheck fclose feof fflush fgetline fgetword file fileBrowserDialog fileDialog fileExtension fileInfo filetest filletCurve filter filterCurve filterExpand filterStudioImport findAllIntersections findAnimCurves findKeyframe findMenuItem findRelatedSkinCluster finder firstParentOf fitBspline flexor floatEq floatField floatFieldGrp floatScrollBar floatSlider floatSlider2 floatSliderButtonGrp floatSliderGrp floor flow fluidCacheInfo fluidEmitter fluidVoxelInfo flushUndo fmod fontDialog fopen formLayout format fprint frameLayout fread freeFormFillet frewind fromNativePath fwrite gamma gauss geometryConstraint getApplicationVersionAsFloat getAttr getClassification getDefaultBrush getFileList getFluidAttr getInputDeviceRange getMayaPanelTypes getModifiers getPanel getParticleAttr getPluginResource getenv getpid glRender glRenderEditor globalStitch gmatch goal gotoBindPose grabColor gradientControl gradientControlNoAttr graphDollyCtx graphSelectContext graphTrackCtx gravity grid gridLayout group groupObjectsByName HfAddAttractorToAS HfAssignAS HfBuildEqualMap HfBuildFurFiles HfBuildFurImages HfCancelAFR HfConnectASToHF HfCreateAttractor HfDeleteAS HfEditAS HfPerformCreateAS HfRemoveAttractorFromAS HfSelectAttached HfSelectAttractors HfUnAssignAS hardenPointCurve hardware hardwareRenderPanel headsUpDisplay headsUpMessage help helpLine hermite hide hilite hitTest hotBox hotkey hotkeyCheck hsv_to_rgb hudButton hudSlider hudSliderButton hwReflectionMap hwRender hwRenderLoad hyperGraph hyperPanel hyperShade hypot iconTextButton iconTextCheckBox iconTextRadioButton iconTextRadioCollection iconTextScrollList iconTextStaticLabel ikHandle ikHandleCtx ikHandleDisplayScale ikSolver ikSplineHandleCtx ikSystem ikSystemInfo ikfkDisplayMethod illustratorCurves image imfPlugins inheritTransform insertJoint insertJointCtx insertKeyCtx insertKnotCurve insertKnotSurface instance instanceable instancer intField intFieldGrp intScrollBar intSlider intSliderGrp interToUI internalVar intersect iprEngine isAnimCurve isConnected isDirty isParentOf isSameObject isTrue isValidObjectName isValidString isValidUiName isolateSelect itemFilter itemFilterAttr itemFilterRender itemFilterType joint jointCluster jointCtx jointDisplayScale jointLattice keyTangent keyframe keyframeOutliner keyframeRegionCurrentTimeCtx keyframeRegionDirectKeyCtx keyframeRegionDollyCtx keyframeRegionInsertKeyCtx keyframeRegionMoveKeyCtx keyframeRegionScaleKeyCtx keyframeRegionSelectKeyCtx keyframeRegionSetKeyCtx keyframeRegionTrackCtx keyframeStats lassoContext lattice latticeDeformKeyCtx launch launchImageEditor layerButton layeredShaderPort layeredTexturePort layout layoutDialog lightList lightListEditor lightListPanel lightlink lineIntersection linearPrecision linstep listAnimatable listAttr listCameras listConnections listDeviceAttachments listHistory listInputDeviceAxes listInputDeviceButtons listInputDevices listMenuAnnotation listNodeTypes listPanelCategories listRelatives listSets listTransforms listUnselected listerEditor loadFluid loadNewShelf loadPlugin loadPluginLanguageResources loadPrefObjects localizedPanelLabel lockNode loft log longNameOf lookThru ls lsThroughFilter lsType lsUI Mayatomr mag makeIdentity makeLive makePaintable makeRoll makeSingleSurface makeTubeOn makebot manipMoveContext manipMoveLimitsCtx manipOptions manipRotateContext manipRotateLimitsCtx manipScaleContext manipScaleLimitsCtx marker match max memory menu menuBarLayout menuEditor menuItem menuItemToShelf menuSet menuSetPref messageLine min minimizeApp mirrorJoint modelCurrentTimeCtx modelEditor modelPanel mouse movIn movOut move moveIKtoFK moveKeyCtx moveVertexAlongDirection multiProfileBirailSurface mute nParticle nameCommand nameField namespace namespaceInfo newPanelItems newton nodeCast nodeIconButton nodeOutliner nodePreset nodeType noise nonLinear normalConstraint normalize nurbsBoolean nurbsCopyUVSet nurbsCube nurbsEditUV nurbsPlane nurbsSelect nurbsSquare nurbsToPoly nurbsToPolygonsPref nurbsToSubdiv nurbsToSubdivPref nurbsUVSet nurbsViewDirectionVector objExists objectCenter objectLayer objectType objectTypeUI obsoleteProc oceanNurbsPreviewPlane offsetCurve offsetCurveOnSurface offsetSurface openGLExtension openMayaPref optionMenu optionMenuGrp optionVar orbit orbitCtx orientConstraint outlinerEditor outlinerPanel overrideModifier paintEffectsDisplay pairBlend palettePort paneLayout panel panelConfiguration panelHistory paramDimContext paramDimension paramLocator parent parentConstraint particle particleExists particleInstancer particleRenderInfo partition pasteKey pathAnimation pause pclose percent performanceOptions pfxstrokes pickWalk picture pixelMove planarSrf plane play playbackOptions playblast plugAttr plugNode pluginInfo pluginResourceUtil pointConstraint pointCurveConstraint pointLight pointMatrixMult pointOnCurve pointOnSurface pointPosition poleVectorConstraint polyAppend polyAppendFacetCtx polyAppendVertex polyAutoProjection polyAverageNormal polyAverageVertex polyBevel polyBlendColor polyBlindData polyBoolOp polyBridgeEdge polyCacheMonitor polyCheck polyChipOff polyClipboard polyCloseBorder polyCollapseEdge polyCollapseFacet polyColorBlindData polyColorDel polyColorPerVertex polyColorSet polyCompare polyCone polyCopyUV polyCrease polyCreaseCtx polyCreateFacet polyCreateFacetCtx polyCube polyCut polyCutCtx polyCylinder polyCylindricalProjection polyDelEdge polyDelFacet polyDelVertex polyDuplicateAndConnect polyDuplicateEdge polyEditUV polyEditUVShell polyEvaluate polyExtrudeEdge polyExtrudeFacet polyExtrudeVertex polyFlipEdge polyFlipUV polyForceUV polyGeoSampler polyHelix polyInfo polyInstallAction polyLayoutUV polyListComponentConversion polyMapCut polyMapDel polyMapSew polyMapSewMove polyMergeEdge polyMergeEdgeCtx polyMergeFacet polyMergeFacetCtx polyMergeUV polyMergeVertex polyMirrorFace polyMoveEdge polyMoveFacet polyMoveFacetUV polyMoveUV polyMoveVertex polyNormal polyNormalPerVertex polyNormalizeUV polyOptUvs polyOptions polyOutput polyPipe polyPlanarProjection polyPlane polyPlatonicSolid polyPoke polyPrimitive polyPrism polyProjection polyPyramid polyQuad polyQueryBlindData polyReduce polySelect polySelectConstraint polySelectConstraintMonitor polySelectCtx polySelectEditCtx polySeparate polySetToFaceNormal polySewEdge polyShortestPathCtx polySmooth polySoftEdge polySphere polySphericalProjection polySplit polySplitCtx polySplitEdge polySplitRing polySplitVertex polyStraightenUVBorder polySubdivideEdge polySubdivideFacet polyToSubdiv polyTorus polyTransfer polyTriangulate polyUVSet polyUnite polyWedgeFace popen popupMenu pose pow preloadRefEd print progressBar progressWindow projFileViewer projectCurve projectTangent projectionContext projectionManip promptDialog propModCtx propMove psdChannelOutliner psdEditTextureFile psdExport psdTextureFile putenv pwd python querySubdiv quit rad_to_deg radial radioButton radioButtonGrp radioCollection radioMenuItemCollection rampColorPort rand randomizeFollicles randstate rangeControl readTake rebuildCurve rebuildSurface recordAttr recordDevice redo reference referenceEdit referenceQuery refineSubdivSelectionList refresh refreshAE registerPluginResource rehash reloadImage removeJoint removeMultiInstance removePanelCategory rename renameAttr renameSelectionList renameUI render renderGlobalsNode renderInfo renderLayerButton renderLayerParent renderLayerPostProcess renderLayerUnparent renderManip renderPartition renderQualityNode renderSettings renderThumbnailUpdate renderWindowEditor renderWindowSelectContext renderer reorder reorderDeformers requires reroot resampleFluid resetAE resetPfxToPolyCamera resetTool resolutionNode retarget reverseCurve reverseSurface revolve rgb_to_hsv rigidBody rigidSolver roll rollCtx rootOf rot rotate rotationInterpolation roundConstantRadius rowColumnLayout rowLayout runTimeCommand runup sampleImage saveAllShelves saveAttrPreset saveFluid saveImage saveInitialState saveMenu savePrefObjects savePrefs saveShelf saveToolSettings scale scaleBrushBrightness scaleComponents scaleConstraint scaleKey scaleKeyCtx sceneEditor sceneUIReplacement scmh scriptCtx scriptEditorInfo scriptJob scriptNode scriptTable scriptToShelf scriptedPanel scriptedPanelType scrollField scrollLayout sculpt searchPathArray seed selLoadSettings select selectContext selectCurveCV selectKey selectKeyCtx selectKeyframeRegionCtx selectMode selectPref selectPriority selectType selectedNodes selectionConnection separator setAttr setAttrEnumResource setAttrMapping setAttrNiceNameResource setConstraintRestPosition setDefaultShadingGroup setDrivenKeyframe setDynamic setEditCtx setEditor setFluidAttr setFocus setInfinity setInputDeviceMapping setKeyCtx setKeyPath setKeyframe setKeyframeBlendshapeTargetWts setMenuMode setNodeNiceNameResource setNodeTypeFlag setParent setParticleAttr setPfxToPolyCamera setPluginResource setProject setStampDensity setStartupMessage setState setToolTo setUITemplate setXformManip sets shadingConnection shadingGeometryRelCtx shadingLightRelCtx shadingNetworkCompare shadingNode shapeCompare shelfButton shelfLayout shelfTabLayout shellField shortNameOf showHelp showHidden showManipCtx showSelectionInTitle showShadingGroupAttrEditor showWindow sign simplify sin singleProfileBirailSurface size sizeBytes skinCluster skinPercent smoothCurve smoothTangentSurface smoothstep snap2to2 snapKey snapMode snapTogetherCtx snapshot soft softMod softModCtx sort sound soundControl source spaceLocator sphere sphrand spotLight spotLightPreviewPort spreadSheetEditor spring sqrt squareSurface srtContext stackTrace startString startsWith stitchAndExplodeShell stitchSurface stitchSurfacePoints strcmp stringArrayCatenate stringArrayContains stringArrayCount stringArrayInsertAtIndex stringArrayIntersector stringArrayRemove stringArrayRemoveAtIndex stringArrayRemoveDuplicates stringArrayRemoveExact stringArrayToString stringToStringArray strip stripPrefixFromName stroke subdAutoProjection subdCleanTopology subdCollapse subdDuplicateAndConnect subdEditUV subdListComponentConversion subdMapCut subdMapSewMove subdMatchTopology subdMirror subdToBlind subdToPoly subdTransferUVsToCache subdiv subdivCrease subdivDisplaySmoothness substitute substituteAllString substituteGeometry substring surface surfaceSampler surfaceShaderList swatchDisplayPort switchTable symbolButton symbolCheckBox sysFile system tabLayout tan tangentConstraint texLatticeDeformContext texManipContext texMoveContext texMoveUVShellContext texRotateContext texScaleContext texSelectContext texSelectShortestPathCtx texSmudgeUVContext texWinToolCtx text textCurves textField textFieldButtonGrp textFieldGrp textManip textScrollList textToShelf textureDisplacePlane textureHairColor texturePlacementContext textureWindow threadCount threePointArcCtx timeControl timePort timerX toNativePath toggle toggleAxis toggleWindowVisibility tokenize tokenizeList tolerance tolower toolButton toolCollection toolDropped toolHasOptions toolPropertyWindow torus toupper trace track trackCtx transferAttributes transformCompare transformLimits translator trim trunc truncateFluidCache truncateHairCache tumble tumbleCtx turbulence twoPointArcCtx uiRes uiTemplate unassignInputDevice undo undoInfo ungroup uniform unit unloadPlugin untangleUV untitledFileName untrim upAxis updateAE userCtx uvLink uvSnapshot validateShelfName vectorize view2dToolCtx viewCamera viewClipPlane viewFit viewHeadOn viewLookAt viewManip viewPlace viewSet visor volumeAxis vortex waitCursor warning webBrowser webBrowserPrefs whatIs window windowPref wire wireContext workspace wrinkle wrinkleContext writeTake xbmLangPathList xform",illegal:"</",contains:[e.C_NUMBER_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"string",begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE]},{begin:"[\\$\\%\\@](\\^\\w\\b|#\\w+|[^\\s\\w{]|{\\w+}|\\w+)"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("mel",function(e){return{k:"int float string vector matrix if else switch case default while do for in break continue global proc return about abs addAttr addAttributeEditorNodeHelp addDynamic addNewShelfTab addPP addPanelCategory addPrefixToName advanceToNextDrivenKey affectedNet affects aimConstraint air alias aliasAttr align alignCtx alignCurve alignSurface allViewFit ambientLight angle angleBetween animCone animCurveEditor animDisplay animView annotate appendStringArray applicationName applyAttrPreset applyTake arcLenDimContext arcLengthDimension arclen arrayMapper art3dPaintCtx artAttrCtx artAttrPaintVertexCtx artAttrSkinPaintCtx artAttrTool artBuildPaintMenu artFluidAttrCtx artPuttyCtx artSelectCtx artSetPaintCtx artUserPaintCtx assignCommand assignInputDevice assignViewportFactories attachCurve attachDeviceAttr attachSurface attrColorSliderGrp attrCompatibility attrControlGrp attrEnumOptionMenu attrEnumOptionMenuGrp attrFieldGrp attrFieldSliderGrp attrNavigationControlGrp attrPresetEditWin attributeExists attributeInfo attributeMenu attributeQuery autoKeyframe autoPlace bakeClip bakeFluidShading bakePartialHistory bakeResults bakeSimulation basename basenameEx batchRender bessel bevel bevelPlus binMembership bindSkin blend2 blendShape blendShapeEditor blendShapePanel blendTwoAttr blindDataType boneLattice boundary boxDollyCtx boxZoomCtx bufferCurve buildBookmarkMenu buildKeyframeMenu button buttonManip CBG cacheFile cacheFileCombine cacheFileMerge cacheFileTrack camera cameraView canCreateManip canvas capitalizeString catch catchQuiet ceil changeSubdivComponentDisplayLevel changeSubdivRegion channelBox character characterMap characterOutlineEditor characterize chdir checkBox checkBoxGrp checkDefaultRenderGlobals choice circle circularFillet clamp clear clearCache clip clipEditor clipEditorCurrentTimeCtx clipSchedule clipSchedulerOutliner clipTrimBefore closeCurve closeSurface cluster cmdFileOutput cmdScrollFieldExecuter cmdScrollFieldReporter cmdShell coarsenSubdivSelectionList collision color colorAtPoint colorEditor colorIndex colorIndexSliderGrp colorSliderButtonGrp colorSliderGrp columnLayout commandEcho commandLine commandPort compactHairSystem componentEditor compositingInterop computePolysetVolume condition cone confirmDialog connectAttr connectControl connectDynamic connectJoint connectionInfo constrain constrainValue constructionHistory container containsMultibyte contextInfo control convertFromOldLayers convertIffToPsd convertLightmap convertSolidTx convertTessellation convertUnit copyArray copyFlexor copyKey copySkinWeights cos cpButton cpCache cpClothSet cpCollision cpConstraint cpConvClothToMesh cpForces cpGetSolverAttr cpPanel cpProperty cpRigidCollisionFilter cpSeam cpSetEdit cpSetSolverAttr cpSolver cpSolverTypes cpTool cpUpdateClothUVs createDisplayLayer createDrawCtx createEditor createLayeredPsdFile createMotionField createNewShelf createNode createRenderLayer createSubdivRegion cross crossProduct ctxAbort ctxCompletion ctxEditMode ctxTraverse currentCtx currentTime currentTimeCtx currentUnit curve curveAddPtCtx curveCVCtx curveEPCtx curveEditorCtx curveIntersect curveMoveEPCtx curveOnSurface curveSketchCtx cutKey cycleCheck cylinder dagPose date defaultLightListCheckBox defaultNavigation defineDataServer defineVirtualDevice deformer deg_to_rad delete deleteAttr deleteShadingGroupsAndMaterials deleteShelfTab deleteUI deleteUnusedBrushes delrandstr detachCurve detachDeviceAttr detachSurface deviceEditor devicePanel dgInfo dgdirty dgeval dgtimer dimWhen directKeyCtx directionalLight dirmap dirname disable disconnectAttr disconnectJoint diskCache displacementToPoly displayAffected displayColor displayCull displayLevelOfDetail displayPref displayRGBColor displaySmoothness displayStats displayString displaySurface distanceDimContext distanceDimension doBlur dolly dollyCtx dopeSheetEditor dot dotProduct doubleProfileBirailSurface drag dragAttrContext draggerContext dropoffLocator duplicate duplicateCurve duplicateSurface dynCache dynControl dynExport dynExpression dynGlobals dynPaintEditor dynParticleCtx dynPref dynRelEdPanel dynRelEditor dynamicLoad editAttrLimits editDisplayLayerGlobals editDisplayLayerMembers editRenderLayerAdjustment editRenderLayerGlobals editRenderLayerMembers editor editorTemplate effector emit emitter enableDevice encodeString endString endsWith env equivalent equivalentTol erf error eval evalDeferred evalEcho event exactWorldBoundingBox exclusiveLightCheckBox exec executeForEachObject exists exp expression expressionEditorListen extendCurve extendSurface extrude fcheck fclose feof fflush fgetline fgetword file fileBrowserDialog fileDialog fileExtension fileInfo filetest filletCurve filter filterCurve filterExpand filterStudioImport findAllIntersections findAnimCurves findKeyframe findMenuItem findRelatedSkinCluster finder firstParentOf fitBspline flexor floatEq floatField floatFieldGrp floatScrollBar floatSlider floatSlider2 floatSliderButtonGrp floatSliderGrp floor flow fluidCacheInfo fluidEmitter fluidVoxelInfo flushUndo fmod fontDialog fopen formLayout format fprint frameLayout fread freeFormFillet frewind fromNativePath fwrite gamma gauss geometryConstraint getApplicationVersionAsFloat getAttr getClassification getDefaultBrush getFileList getFluidAttr getInputDeviceRange getMayaPanelTypes getModifiers getPanel getParticleAttr getPluginResource getenv getpid glRender glRenderEditor globalStitch gmatch goal gotoBindPose grabColor gradientControl gradientControlNoAttr graphDollyCtx graphSelectContext graphTrackCtx gravity grid gridLayout group groupObjectsByName HfAddAttractorToAS HfAssignAS HfBuildEqualMap HfBuildFurFiles HfBuildFurImages HfCancelAFR HfConnectASToHF HfCreateAttractor HfDeleteAS HfEditAS HfPerformCreateAS HfRemoveAttractorFromAS HfSelectAttached HfSelectAttractors HfUnAssignAS hardenPointCurve hardware hardwareRenderPanel headsUpDisplay headsUpMessage help helpLine hermite hide hilite hitTest hotBox hotkey hotkeyCheck hsv_to_rgb hudButton hudSlider hudSliderButton hwReflectionMap hwRender hwRenderLoad hyperGraph hyperPanel hyperShade hypot iconTextButton iconTextCheckBox iconTextRadioButton iconTextRadioCollection iconTextScrollList iconTextStaticLabel ikHandle ikHandleCtx ikHandleDisplayScale ikSolver ikSplineHandleCtx ikSystem ikSystemInfo ikfkDisplayMethod illustratorCurves image imfPlugins inheritTransform insertJoint insertJointCtx insertKeyCtx insertKnotCurve insertKnotSurface instance instanceable instancer intField intFieldGrp intScrollBar intSlider intSliderGrp interToUI internalVar intersect iprEngine isAnimCurve isConnected isDirty isParentOf isSameObject isTrue isValidObjectName isValidString isValidUiName isolateSelect itemFilter itemFilterAttr itemFilterRender itemFilterType joint jointCluster jointCtx jointDisplayScale jointLattice keyTangent keyframe keyframeOutliner keyframeRegionCurrentTimeCtx keyframeRegionDirectKeyCtx keyframeRegionDollyCtx keyframeRegionInsertKeyCtx keyframeRegionMoveKeyCtx keyframeRegionScaleKeyCtx keyframeRegionSelectKeyCtx keyframeRegionSetKeyCtx keyframeRegionTrackCtx keyframeStats lassoContext lattice latticeDeformKeyCtx launch launchImageEditor layerButton layeredShaderPort layeredTexturePort layout layoutDialog lightList lightListEditor lightListPanel lightlink lineIntersection linearPrecision linstep listAnimatable listAttr listCameras listConnections listDeviceAttachments listHistory listInputDeviceAxes listInputDeviceButtons listInputDevices listMenuAnnotation listNodeTypes listPanelCategories listRelatives listSets listTransforms listUnselected listerEditor loadFluid loadNewShelf loadPlugin loadPluginLanguageResources loadPrefObjects localizedPanelLabel lockNode loft log longNameOf lookThru ls lsThroughFilter lsType lsUI Mayatomr mag makeIdentity makeLive makePaintable makeRoll makeSingleSurface makeTubeOn makebot manipMoveContext manipMoveLimitsCtx manipOptions manipRotateContext manipRotateLimitsCtx manipScaleContext manipScaleLimitsCtx marker match max memory menu menuBarLayout menuEditor menuItem menuItemToShelf menuSet menuSetPref messageLine min minimizeApp mirrorJoint modelCurrentTimeCtx modelEditor modelPanel mouse movIn movOut move moveIKtoFK moveKeyCtx moveVertexAlongDirection multiProfileBirailSurface mute nParticle nameCommand nameField namespace namespaceInfo newPanelItems newton nodeCast nodeIconButton nodeOutliner nodePreset nodeType noise nonLinear normalConstraint normalize nurbsBoolean nurbsCopyUVSet nurbsCube nurbsEditUV nurbsPlane nurbsSelect nurbsSquare nurbsToPoly nurbsToPolygonsPref nurbsToSubdiv nurbsToSubdivPref nurbsUVSet nurbsViewDirectionVector objExists objectCenter objectLayer objectType objectTypeUI obsoleteProc oceanNurbsPreviewPlane offsetCurve offsetCurveOnSurface offsetSurface openGLExtension openMayaPref optionMenu optionMenuGrp optionVar orbit orbitCtx orientConstraint outlinerEditor outlinerPanel overrideModifier paintEffectsDisplay pairBlend palettePort paneLayout panel panelConfiguration panelHistory paramDimContext paramDimension paramLocator parent parentConstraint particle particleExists particleInstancer particleRenderInfo partition pasteKey pathAnimation pause pclose percent performanceOptions pfxstrokes pickWalk picture pixelMove planarSrf plane play playbackOptions playblast plugAttr plugNode pluginInfo pluginResourceUtil pointConstraint pointCurveConstraint pointLight pointMatrixMult pointOnCurve pointOnSurface pointPosition poleVectorConstraint polyAppend polyAppendFacetCtx polyAppendVertex polyAutoProjection polyAverageNormal polyAverageVertex polyBevel polyBlendColor polyBlindData polyBoolOp polyBridgeEdge polyCacheMonitor polyCheck polyChipOff polyClipboard polyCloseBorder polyCollapseEdge polyCollapseFacet polyColorBlindData polyColorDel polyColorPerVertex polyColorSet polyCompare polyCone polyCopyUV polyCrease polyCreaseCtx polyCreateFacet polyCreateFacetCtx polyCube polyCut polyCutCtx polyCylinder polyCylindricalProjection polyDelEdge polyDelFacet polyDelVertex polyDuplicateAndConnect polyDuplicateEdge polyEditUV polyEditUVShell polyEvaluate polyExtrudeEdge polyExtrudeFacet polyExtrudeVertex polyFlipEdge polyFlipUV polyForceUV polyGeoSampler polyHelix polyInfo polyInstallAction polyLayoutUV polyListComponentConversion polyMapCut polyMapDel polyMapSew polyMapSewMove polyMergeEdge polyMergeEdgeCtx polyMergeFacet polyMergeFacetCtx polyMergeUV polyMergeVertex polyMirrorFace polyMoveEdge polyMoveFacet polyMoveFacetUV polyMoveUV polyMoveVertex polyNormal polyNormalPerVertex polyNormalizeUV polyOptUvs polyOptions polyOutput polyPipe polyPlanarProjection polyPlane polyPlatonicSolid polyPoke polyPrimitive polyPrism polyProjection polyPyramid polyQuad polyQueryBlindData polyReduce polySelect polySelectConstraint polySelectConstraintMonitor polySelectCtx polySelectEditCtx polySeparate polySetToFaceNormal polySewEdge polyShortestPathCtx polySmooth polySoftEdge polySphere polySphericalProjection polySplit polySplitCtx polySplitEdge polySplitRing polySplitVertex polyStraightenUVBorder polySubdivideEdge polySubdivideFacet polyToSubdiv polyTorus polyTransfer polyTriangulate polyUVSet polyUnite polyWedgeFace popen popupMenu pose pow preloadRefEd print progressBar progressWindow projFileViewer projectCurve projectTangent projectionContext projectionManip promptDialog propModCtx propMove psdChannelOutliner psdEditTextureFile psdExport psdTextureFile putenv pwd python querySubdiv quit rad_to_deg radial radioButton radioButtonGrp radioCollection radioMenuItemCollection rampColorPort rand randomizeFollicles randstate rangeControl readTake rebuildCurve rebuildSurface recordAttr recordDevice redo reference referenceEdit referenceQuery refineSubdivSelectionList refresh refreshAE registerPluginResource rehash reloadImage removeJoint removeMultiInstance removePanelCategory rename renameAttr renameSelectionList renameUI render renderGlobalsNode renderInfo renderLayerButton renderLayerParent renderLayerPostProcess renderLayerUnparent renderManip renderPartition renderQualityNode renderSettings renderThumbnailUpdate renderWindowEditor renderWindowSelectContext renderer reorder reorderDeformers requires reroot resampleFluid resetAE resetPfxToPolyCamera resetTool resolutionNode retarget reverseCurve reverseSurface revolve rgb_to_hsv rigidBody rigidSolver roll rollCtx rootOf rot rotate rotationInterpolation roundConstantRadius rowColumnLayout rowLayout runTimeCommand runup sampleImage saveAllShelves saveAttrPreset saveFluid saveImage saveInitialState saveMenu savePrefObjects savePrefs saveShelf saveToolSettings scale scaleBrushBrightness scaleComponents scaleConstraint scaleKey scaleKeyCtx sceneEditor sceneUIReplacement scmh scriptCtx scriptEditorInfo scriptJob scriptNode scriptTable scriptToShelf scriptedPanel scriptedPanelType scrollField scrollLayout sculpt searchPathArray seed selLoadSettings select selectContext selectCurveCV selectKey selectKeyCtx selectKeyframeRegionCtx selectMode selectPref selectPriority selectType selectedNodes selectionConnection separator setAttr setAttrEnumResource setAttrMapping setAttrNiceNameResource setConstraintRestPosition setDefaultShadingGroup setDrivenKeyframe setDynamic setEditCtx setEditor setFluidAttr setFocus setInfinity setInputDeviceMapping setKeyCtx setKeyPath setKeyframe setKeyframeBlendshapeTargetWts setMenuMode setNodeNiceNameResource setNodeTypeFlag setParent setParticleAttr setPfxToPolyCamera setPluginResource setProject setStampDensity setStartupMessage setState setToolTo setUITemplate setXformManip sets shadingConnection shadingGeometryRelCtx shadingLightRelCtx shadingNetworkCompare shadingNode shapeCompare shelfButton shelfLayout shelfTabLayout shellField shortNameOf showHelp showHidden showManipCtx showSelectionInTitle showShadingGroupAttrEditor showWindow sign simplify sin singleProfileBirailSurface size sizeBytes skinCluster skinPercent smoothCurve smoothTangentSurface smoothstep snap2to2 snapKey snapMode snapTogetherCtx snapshot soft softMod softModCtx sort sound soundControl source spaceLocator sphere sphrand spotLight spotLightPreviewPort spreadSheetEditor spring sqrt squareSurface srtContext stackTrace startString startsWith stitchAndExplodeShell stitchSurface stitchSurfacePoints strcmp stringArrayCatenate stringArrayContains stringArrayCount stringArrayInsertAtIndex stringArrayIntersector stringArrayRemove stringArrayRemoveAtIndex stringArrayRemoveDuplicates stringArrayRemoveExact stringArrayToString stringToStringArray strip stripPrefixFromName stroke subdAutoProjection subdCleanTopology subdCollapse subdDuplicateAndConnect subdEditUV subdListComponentConversion subdMapCut subdMapSewMove subdMatchTopology subdMirror subdToBlind subdToPoly subdTransferUVsToCache subdiv subdivCrease subdivDisplaySmoothness substitute substituteAllString substituteGeometry substring surface surfaceSampler surfaceShaderList swatchDisplayPort switchTable symbolButton symbolCheckBox sysFile system tabLayout tan tangentConstraint texLatticeDeformContext texManipContext texMoveContext texMoveUVShellContext texRotateContext texScaleContext texSelectContext texSelectShortestPathCtx texSmudgeUVContext texWinToolCtx text textCurves textField textFieldButtonGrp textFieldGrp textManip textScrollList textToShelf textureDisplacePlane textureHairColor texturePlacementContext textureWindow threadCount threePointArcCtx timeControl timePort timerX toNativePath toggle toggleAxis toggleWindowVisibility tokenize tokenizeList tolerance tolower toolButton toolCollection toolDropped toolHasOptions toolPropertyWindow torus toupper trace track trackCtx transferAttributes transformCompare transformLimits translator trim trunc truncateFluidCache truncateHairCache tumble tumbleCtx turbulence twoPointArcCtx uiRes uiTemplate unassignInputDevice undo undoInfo ungroup uniform unit unloadPlugin untangleUV untitledFileName untrim upAxis updateAE userCtx uvLink uvSnapshot validateShelfName vectorize view2dToolCtx viewCamera viewClipPlane viewFit viewHeadOn viewLookAt viewManip viewPlace viewSet visor volumeAxis vortex waitCursor warning webBrowser webBrowserPrefs whatIs window windowPref wire wireContext workspace wrinkle wrinkleContext writeTake xbmLangPathList xform",i:"</",c:[e.CNM,e.ASM,e.QSM,{cN:"string",b:"`",e:"`",c:[e.BE]},{b:"[\\$\\%\\@](\\^\\w\\b|#\\w+|[^\\s\\w{]|{\\w+}|\\w+)"},e.CLCM,e.CBCM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/mercury.min.js b/vendor/assets/javascripts/highlightjs/languages/mercury.min.js
index e1dae67331..ce07defc86 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mercury.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mercury.min.js
@@ -1 +1 @@
-hljs.registerLanguage("mercury",function(){"use strict";return function(e){var i=e.COMMENT("%","$"),n=e.inherit(e.APOS_STRING_MODE,{relevance:0}),r=e.inherit(e.QUOTE_STRING_MODE,{relevance:0});return r.contains=r.contains.slice(),r.contains.push({className:"subst",begin:"\\\\[abfnrtv]\\|\\\\x[0-9a-fA-F]*\\\\\\|%[-+# *.0-9]*[dioxXucsfeEgGp]",relevance:0}),{name:"Mercury",aliases:["m","moo"],keywords:{keyword:"module use_module import_module include_module end_module initialise mutable initialize finalize finalise interface implementation pred mode func type inst solver any_pred any_func is semidet det nondet multi erroneous failure cc_nondet cc_multi typeclass instance where pragma promise external trace atomic or_else require_complete_switch require_det require_semidet require_multi require_nondet require_cc_multi require_cc_nondet require_erroneous require_failure",meta:"inline no_inline type_spec source_file fact_table obsolete memo loop_check minimal_model terminates does_not_terminate check_termination promise_equivalent_clauses foreign_proc foreign_decl foreign_code foreign_type foreign_import_module foreign_export_enum foreign_export foreign_enum may_call_mercury will_not_call_mercury thread_safe not_thread_safe maybe_thread_safe promise_pure promise_semipure tabled_for_io local untrailed trailed attach_to_io_state can_pass_as_mercury_type stable will_not_throw_exception may_modify_trail will_not_modify_trail may_duplicate may_not_duplicate affects_liveness does_not_affect_liveness doesnt_affect_liveness no_sharing unknown_sharing sharing",built_in:"some all not if then else true fail false try catch catch_any semidet_true semidet_false semidet_fail impure_true impure semipure"},contains:[{className:"built_in",variants:[{begin:"<=>"},{begin:"<=",relevance:0},{begin:"=>",relevance:0},{begin:"/\\\\"},{begin:"\\\\/"}]},{className:"built_in",variants:[{begin:":-\\|--\x3e"},{begin:"=",relevance:0}]},i,e.C_BLOCK_COMMENT_MODE,{className:"number",begin:"0'.\\|0[box][0-9a-fA-F]*"},e.NUMBER_MODE,n,r,{begin:/:-/},{begin:/\.$/}]}}}());
\ No newline at end of file
+hljs.registerLanguage("mercury",function(e){var i=e.C("%","$"),r=e.inherit(e.ASM,{relevance:0}),t=e.inherit(e.QSM,{relevance:0});t.c=t.c.slice(),t.c.push({cN:"subst",b:"\\\\[abfnrtv]\\|\\\\x[0-9a-fA-F]*\\\\\\|%[-+# *.0-9]*[dioxXucsfeEgGp]",relevance:0});return{aliases:["m","moo"],k:{keyword:"module use_module import_module include_module end_module initialise mutable initialize finalize finalise interface implementation pred mode func type inst solver any_pred any_func is semidet det nondet multi erroneous failure cc_nondet cc_multi typeclass instance where pragma promise external trace atomic or_else require_complete_switch require_det require_semidet require_multi require_nondet require_cc_multi require_cc_nondet require_erroneous require_failure",meta:"inline no_inline type_spec source_file fact_table obsolete memo loop_check minimal_model terminates does_not_terminate check_termination promise_equivalent_clauses foreign_proc foreign_decl foreign_code foreign_type foreign_import_module foreign_export_enum foreign_export foreign_enum may_call_mercury will_not_call_mercury thread_safe not_thread_safe maybe_thread_safe promise_pure promise_semipure tabled_for_io local untrailed trailed attach_to_io_state can_pass_as_mercury_type stable will_not_throw_exception may_modify_trail will_not_modify_trail may_duplicate may_not_duplicate affects_liveness does_not_affect_liveness doesnt_affect_liveness no_sharing unknown_sharing sharing",built_in:"some all not if then else true fail false try catch catch_any semidet_true semidet_false semidet_fail impure_true impure semipure"},c:[{cN:"built_in",v:[{b:"<=>"},{b:"<=",relevance:0},{b:"=>",relevance:0},{b:"/\\\\"},{b:"\\\\/"}]},{cN:"built_in",v:[{b:":-\\|--\x3e"},{b:"=",relevance:0}]},i,e.CBCM,{cN:"number",b:"0'.\\|0[box][0-9a-fA-F]*"},e.NM,r,t,{b:/:-/},{b:/\.$/}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/mipsasm.min.js b/vendor/assets/javascripts/highlightjs/languages/mipsasm.min.js
index 7d7591939d..b1160e13db 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mipsasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mipsasm.min.js
@@ -1 +1 @@
-hljs.registerLanguage("mipsasm",function(){"use strict";return function(e){return{name:"MIPS Assembly",case_insensitive:!0,aliases:["mips"],keywords:{$pattern:"\\.?"+e.IDENT_RE,meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .ltorg ",built_in:"$0 $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 $17 $18 $19 $20 $21 $22 $23 $24 $25 $26 $27 $28 $29 $30 $31 zero at v0 v1 a0 a1 a2 a3 a4 a5 a6 a7 t0 t1 t2 t3 t4 t5 t6 t7 t8 t9 s0 s1 s2 s3 s4 s5 s6 s7 s8 k0 k1 gp sp fp ra $f0 $f1 $f2 $f2 $f4 $f5 $f6 $f7 $f8 $f9 $f10 $f11 $f12 $f13 $f14 $f15 $f16 $f17 $f18 $f19 $f20 $f21 $f22 $f23 $f24 $f25 $f26 $f27 $f28 $f29 $f30 $f31 Context Random EntryLo0 EntryLo1 Context PageMask Wired EntryHi HWREna BadVAddr Count Compare SR IntCtl SRSCtl SRSMap Cause EPC PRId EBase Config Config1 Config2 Config3 LLAddr Debug DEPC DESAVE CacheErr ECC ErrorEPC TagLo DataLo TagHi DataHi WatchLo WatchHi PerfCtl PerfCnt "},contains:[{className:"keyword",begin:"\\b(addi?u?|andi?|b(al)?|beql?|bgez(al)?l?|bgtzl?|blezl?|bltz(al)?l?|bnel?|cl[oz]|divu?|ext|ins|j(al)?|jalr(.hb)?|jr(.hb)?|lbu?|lhu?|ll|lui|lw[lr]?|maddu?|mfhi|mflo|movn|movz|move|msubu?|mthi|mtlo|mul|multu?|nop|nor|ori?|rotrv?|sb|sc|se[bh]|sh|sllv?|slti?u?|srav?|srlv?|subu?|sw[lr]?|xori?|wsbh|abs.[sd]|add.[sd]|alnv.ps|bc1[ft]l?|c.(s?f|un|u?eq|[ou]lt|[ou]le|ngle?|seq|l[et]|ng[et]).[sd]|(ceil|floor|round|trunc).[lw].[sd]|cfc1|cvt.d.[lsw]|cvt.l.[dsw]|cvt.ps.s|cvt.s.[dlw]|cvt.s.p[lu]|cvt.w.[dls]|div.[ds]|ldx?c1|luxc1|lwx?c1|madd.[sd]|mfc1|mov[fntz]?.[ds]|msub.[sd]|mth?c1|mul.[ds]|neg.[ds]|nmadd.[ds]|nmsub.[ds]|p[lu][lu].ps|recip.fmt|r?sqrt.[ds]|sdx?c1|sub.[ds]|suxc1|swx?c1|break|cache|d?eret|[de]i|ehb|mfc0|mtc0|pause|prefx?|rdhwr|rdpgpr|sdbbp|ssnop|synci?|syscall|teqi?|tgei?u?|tlb(p|r|w[ir])|tlti?u?|tnei?|wait|wrpgpr)",end:"\\s"},e.COMMENT("[;#](?!s*$)","$"),e.C_BLOCK_COMMENT_MODE,e.QUOTE_STRING_MODE,{className:"string",begin:"'",end:"[^\\\\]'",relevance:0},{className:"title",begin:"\\|",end:"\\|",illegal:"\\n",relevance:0},{className:"number",variants:[{begin:"0x[0-9a-f]+"},{begin:"\\b-?\\d+"}],relevance:0},{className:"symbol",variants:[{begin:"^\\s*[a-z_\\.\\$][a-z0-9_\\.\\$]+:"},{begin:"^\\s*[0-9]+:"},{begin:"[0-9]+[bf]"}],relevance:0}],illegal:"/"}}}());
\ No newline at end of file
+hljs.registerLanguage("mipsasm",function(e){return{cI:!0,aliases:["mips"],l:"\\.?"+e.IR,k:{meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .ltorg ",built_in:"$0 $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 $17 $18 $19 $20 $21 $22 $23 $24 $25 $26 $27 $28 $29 $30 $31 zero at v0 v1 a0 a1 a2 a3 a4 a5 a6 a7 t0 t1 t2 t3 t4 t5 t6 t7 t8 t9 s0 s1 s2 s3 s4 s5 s6 s7 s8 k0 k1 gp sp fp ra $f0 $f1 $f2 $f2 $f4 $f5 $f6 $f7 $f8 $f9 $f10 $f11 $f12 $f13 $f14 $f15 $f16 $f17 $f18 $f19 $f20 $f21 $f22 $f23 $f24 $f25 $f26 $f27 $f28 $f29 $f30 $f31 Context Random EntryLo0 EntryLo1 Context PageMask Wired EntryHi HWREna BadVAddr Count Compare SR IntCtl SRSCtl SRSMap Cause EPC PRId EBase Config Config1 Config2 Config3 LLAddr Debug DEPC DESAVE CacheErr ECC ErrorEPC TagLo DataLo TagHi DataHi WatchLo WatchHi PerfCtl PerfCnt "},c:[{cN:"keyword",b:"\\b(addi?u?|andi?|b(al)?|beql?|bgez(al)?l?|bgtzl?|blezl?|bltz(al)?l?|bnel?|cl[oz]|divu?|ext|ins|j(al)?|jalr(.hb)?|jr(.hb)?|lbu?|lhu?|ll|lui|lw[lr]?|maddu?|mfhi|mflo|movn|movz|move|msubu?|mthi|mtlo|mul|multu?|nop|nor|ori?|rotrv?|sb|sc|se[bh]|sh|sllv?|slti?u?|srav?|srlv?|subu?|sw[lr]?|xori?|wsbh|abs.[sd]|add.[sd]|alnv.ps|bc1[ft]l?|c.(s?f|un|u?eq|[ou]lt|[ou]le|ngle?|seq|l[et]|ng[et]).[sd]|(ceil|floor|round|trunc).[lw].[sd]|cfc1|cvt.d.[lsw]|cvt.l.[dsw]|cvt.ps.s|cvt.s.[dlw]|cvt.s.p[lu]|cvt.w.[dls]|div.[ds]|ldx?c1|luxc1|lwx?c1|madd.[sd]|mfc1|mov[fntz]?.[ds]|msub.[sd]|mth?c1|mul.[ds]|neg.[ds]|nmadd.[ds]|nmsub.[ds]|p[lu][lu].ps|recip.fmt|r?sqrt.[ds]|sdx?c1|sub.[ds]|suxc1|swx?c1|break|cache|d?eret|[de]i|ehb|mfc0|mtc0|pause|prefx?|rdhwr|rdpgpr|sdbbp|ssnop|synci?|syscall|teqi?|tgei?u?|tlb(p|r|w[ir])|tlti?u?|tnei?|wait|wrpgpr)",e:"\\s"},e.C("[;#](?!s*$)","$"),e.CBCM,e.QSM,{cN:"string",b:"'",e:"[^\\\\]'",relevance:0},{cN:"title",b:"\\|",e:"\\|",i:"\\n",relevance:0},{cN:"number",v:[{b:"0x[0-9a-f]+"},{b:"\\b-?\\d+"}],relevance:0},{cN:"symbol",v:[{b:"^\\s*[a-z_\\.\\$][a-z0-9_\\.\\$]+:"},{b:"^\\s*[0-9]+:"},{b:"[0-9]+[bf]"}],relevance:0}],i:"/"}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/mizar.min.js b/vendor/assets/javascripts/highlightjs/languages/mizar.min.js
index a899554444..05e21b096e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mizar.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mizar.min.js
@@ -1 +1 @@
-hljs.registerLanguage("mizar",function(){"use strict";return function(e){return{name:"Mizar",keywords:"environ vocabularies notations constructors definitions registrations theorems schemes requirements begin end definition registration cluster existence pred func defpred deffunc theorem proof let take assume then thus hence ex for st holds consider reconsider such that and in provided of as from be being by means equals implies iff redefine define now not or attr is mode suppose per cases set thesis contradiction scheme reserve struct correctness compatibility coherence symmetry assymetry reflexivity irreflexivity connectedness uniqueness commutativity idempotence involutiveness projectivity",contains:[e.COMMENT("::","$")]}}}());
\ No newline at end of file
+hljs.registerLanguage("mizar",function(e){return{k:"environ vocabularies notations constructors definitions registrations theorems schemes requirements begin end definition registration cluster existence pred func defpred deffunc theorem proof let take assume then thus hence ex for st holds consider reconsider such that and in provided of as from be being by means equals implies iff redefine define now not or attr is mode suppose per cases set thesis contradiction scheme reserve struct correctness compatibility coherence symmetry assymetry reflexivity irreflexivity connectedness uniqueness commutativity idempotence involutiveness projectivity",c:[e.C("::","$")]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/mojolicious.min.js b/vendor/assets/javascripts/highlightjs/languages/mojolicious.min.js
index 96b75d3188..5c76a546de 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mojolicious.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mojolicious.min.js
@@ -1 +1 @@
-hljs.registerLanguage("mojolicious",function(){"use strict";return function(e){return{name:"Mojolicious",subLanguage:"xml",contains:[{className:"meta",begin:"^__(END|DATA)__$"},{begin:"^\\s*%{1,2}={0,2}",end:"$",subLanguage:"perl"},{begin:"<%{1,2}={0,2}",end:"={0,1}%>",subLanguage:"perl",excludeBegin:!0,excludeEnd:!0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("mojolicious",function(e){return{sL:"xml",c:[{cN:"meta",b:"^__(END|DATA)__$"},{b:"^\\s*%{1,2}={0,2}",e:"$",sL:"perl"},{b:"<%{1,2}={0,2}",e:"={0,1}%>",sL:"perl",eB:!0,eE:!0}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/monkey.min.js b/vendor/assets/javascripts/highlightjs/languages/monkey.min.js
index 2e41eb5c04..4d3485e8bd 100644
--- a/vendor/assets/javascripts/highlightjs/languages/monkey.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/monkey.min.js
@@ -1 +1 @@
-hljs.registerLanguage("monkey",function(){"use strict";return function(e){var n={className:"number",relevance:0,variants:[{begin:"[$][a-fA-F0-9]+"},e.NUMBER_MODE]};return{name:"Monkey",case_insensitive:!0,keywords:{keyword:"public private property continue exit extern new try catch eachin not abstract final select case default const local global field end if then else elseif endif while wend repeat until forever for to step next return module inline throw import",built_in:"DebugLog DebugStop Error Print ACos ACosr ASin ASinr ATan ATan2 ATan2r ATanr Abs Abs Ceil Clamp Clamp Cos Cosr Exp Floor Log Max Max Min Min Pow Sgn Sgn Sin Sinr Sqrt Tan Tanr Seed PI HALFPI TWOPI",literal:"true false null and or shl shr mod"},illegal:/\/\*/,contains:[e.COMMENT("#rem","#end"),e.COMMENT("'","$",{relevance:0}),{className:"function",beginKeywords:"function method",end:"[(=:]|$",illegal:/\n/,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"class",beginKeywords:"class interface",end:"$",contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{className:"built_in",begin:"\\b(self|super)\\b"},{className:"meta",begin:"\\s*#",end:"$",keywords:{"meta-keyword":"if else elseif endif end then"}},{className:"meta",begin:"^\\s*strict\\b"},{beginKeywords:"alias",end:"=",contains:[e.UNDERSCORE_TITLE_MODE]},e.QUOTE_STRING_MODE,n]}}}());
\ No newline at end of file
+hljs.registerLanguage("monkey",function(e){var n={cN:"number",relevance:0,v:[{b:"[$][a-fA-F0-9]+"},e.NM]};return{cI:!0,k:{keyword:"public private property continue exit extern new try catch eachin not abstract final select case default const local global field end if then else elseif endif while wend repeat until forever for to step next return module inline throw import",built_in:"DebugLog DebugStop Error Print ACos ACosr ASin ASinr ATan ATan2 ATan2r ATanr Abs Abs Ceil Clamp Clamp Cos Cosr Exp Floor Log Max Max Min Min Pow Sgn Sgn Sin Sinr Sqrt Tan Tanr Seed PI HALFPI TWOPI",literal:"true false null and or shl shr mod"},i:/\/\*/,c:[e.C("#rem","#end"),e.C("'","$",{relevance:0}),{cN:"function",bK:"function method",e:"[(=:]|$",i:/\n/,c:[e.UTM]},{cN:"class",bK:"class interface",e:"$",c:[{bK:"extends implements"},e.UTM]},{cN:"built_in",b:"\\b(self|super)\\b"},{cN:"meta",b:"\\s*#",e:"$",k:{"meta-keyword":"if else elseif endif end then"}},{cN:"meta",b:"^\\s*strict\\b"},{bK:"alias",e:"=",c:[e.UTM]},e.QSM,n]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/moonscript.min.js b/vendor/assets/javascripts/highlightjs/languages/moonscript.min.js
index e3be4ead57..54ccb8eedb 100644
--- a/vendor/assets/javascripts/highlightjs/languages/moonscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/moonscript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("moonscript",function(){"use strict";return function(e){var n={keyword:"if then not for in while do return else elseif break continue switch and or unless when class extends super local import export from using",literal:"true false nil",built_in:"_G _VERSION assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall coroutine debug io math os package string table"},s="[A-Za-z$_][0-9A-Za-z$_]*",a={className:"subst",begin:/#\{/,end:/}/,keywords:n},i=[e.inherit(e.C_NUMBER_MODE,{starts:{end:"(\\s*/)?",relevance:0}}),{className:"string",variants:[{begin:/'/,end:/'/,contains:[e.BACKSLASH_ESCAPE]},{begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,a]}]},{className:"built_in",begin:"@__"+e.IDENT_RE},{begin:"@"+e.IDENT_RE},{begin:e.IDENT_RE+"\\\\"+e.IDENT_RE}];a.contains=i;var t=e.inherit(e.TITLE_MODE,{begin:s}),r={className:"params",begin:"\\([^\\(]",returnBegin:!0,contains:[{begin:/\(/,end:/\)/,keywords:n,contains:["self"].concat(i)}]};return{name:"MoonScript",aliases:["moon"],keywords:n,illegal:/\/\*/,contains:i.concat([e.COMMENT("--","$"),{className:"function",begin:"^\\s*"+s+"\\s*=\\s*(\\(.*\\))?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[t,r]},{begin:/[\(,:=]\s*/,relevance:0,contains:[{className:"function",begin:"(\\(.*\\))?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[r]}]},{className:"class",beginKeywords:"class",end:"$",illegal:/[:="\[\]]/,contains:[{beginKeywords:"extends",endsWithParent:!0,illegal:/[:="\[\]]/,contains:[t]},t]},{className:"name",begin:s+":",end:":",returnBegin:!0,returnEnd:!0,relevance:0}])}}}());
\ No newline at end of file
+hljs.registerLanguage("moonscript",function(e){var t={keyword:"if then not for in while do return else elseif break continue switch and or unless when class extends super local import export from using",literal:"true false nil",built_in:"_G _VERSION assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall coroutine debug io math os package string table"},r="[A-Za-z$_][0-9A-Za-z$_]*",a={cN:"subst",b:/#\{/,e:/}/,k:t},s=[e.inherit(e.CNM,{starts:{e:"(\\s*/)?",relevance:0}}),{cN:"string",v:[{b:/'/,e:/'/,c:[e.BE]},{b:/"/,e:/"/,c:[e.BE,a]}]},{cN:"built_in",b:"@__"+e.IR},{b:"@"+e.IR},{b:e.IR+"\\\\"+e.IR}];a.c=s;var c=e.inherit(e.TM,{b:r}),n="(\\(.*\\))?\\s*\\B[-=]>",i={cN:"params",b:"\\([^\\(]",rB:!0,c:[{b:/\(/,e:/\)/,k:t,c:["self"].concat(s)}]};return{aliases:["moon"],k:t,i:/\/\*/,c:s.concat([e.C("--","$"),{cN:"function",b:"^\\s*"+r+"\\s*=\\s*"+n,e:"[-=]>",rB:!0,c:[c,i]},{b:/[\(,:=]\s*/,relevance:0,c:[{cN:"function",b:n,e:"[-=]>",rB:!0,c:[i]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[c]},c]},{cN:"name",b:r+":",e:":",rB:!0,rE:!0,relevance:0}])}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/n1ql.min.js b/vendor/assets/javascripts/highlightjs/languages/n1ql.min.js
index cd7e12d6f9..dd6678e30b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/n1ql.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/n1ql.min.js
@@ -1 +1 @@
-hljs.registerLanguage("n1ql",function(){"use strict";return function(e){return{name:"N1QL",case_insensitive:!0,contains:[{beginKeywords:"build create index delete drop explain infer|10 insert merge prepare select update upsert|10",end:/;/,endsWithParent:!0,keywords:{keyword:"all alter analyze and any array as asc begin between binary boolean break bucket build by call case cast cluster collate collection commit connect continue correlate cover create database dataset datastore declare decrement delete derived desc describe distinct do drop each element else end every except exclude execute exists explain fetch first flatten for force from function grant group gsi having if ignore ilike in include increment index infer inline inner insert intersect into is join key keys keyspace known last left let letting like limit lsm map mapping matched materialized merge minus namespace nest not number object offset on option or order outer over parse partition password path pool prepare primary private privilege procedure public raw realm reduce rename return returning revoke right role rollback satisfies schema select self semi set show some start statistics string system then to transaction trigger truncate under union unique unknown unnest unset update upsert use user using validate value valued values via view when where while with within work xor",literal:"true false null missing|5",built_in:"array_agg array_append array_concat array_contains array_count array_distinct array_ifnull array_length array_max array_min array_position array_prepend array_put array_range array_remove array_repeat array_replace array_reverse array_sort array_sum avg count max min sum greatest least ifmissing ifmissingornull ifnull missingif nullif ifinf ifnan ifnanorinf naninf neginfif posinfif clock_millis clock_str date_add_millis date_add_str date_diff_millis date_diff_str date_part_millis date_part_str date_trunc_millis date_trunc_str duration_to_str millis str_to_millis millis_to_str millis_to_utc millis_to_zone_name now_millis now_str str_to_duration str_to_utc str_to_zone_name decode_json encode_json encoded_size poly_length base64 base64_encode base64_decode meta uuid abs acos asin atan atan2 ceil cos degrees e exp ln log floor pi power radians random round sign sin sqrt tan trunc object_length object_names object_pairs object_inner_pairs object_values object_inner_values object_add object_put object_remove object_unwrap regexp_contains regexp_like regexp_position regexp_replace contains initcap length lower ltrim position repeat replace rtrim split substr title trim upper isarray isatom isboolean isnumber isobject isstring type toarray toatom toboolean tonumber toobject tostring"},contains:[{className:"string",begin:"'",end:"'",contains:[e.BACKSLASH_ESCAPE],relevance:0},{className:"string",begin:'"',end:'"',contains:[e.BACKSLASH_ESCAPE],relevance:0},{className:"symbol",begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE],relevance:2},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE]},e.C_BLOCK_COMMENT_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("n1ql",function(e){return{cI:!0,c:[{bK:"build create index delete drop explain infer|10 insert merge prepare select update upsert|10",e:/;/,eW:!0,k:{keyword:"all alter analyze and any array as asc begin between binary boolean break bucket build by call case cast cluster collate collection commit connect continue correlate cover create database dataset datastore declare decrement delete derived desc describe distinct do drop each element else end every except exclude execute exists explain fetch first flatten for force from function grant group gsi having if ignore ilike in include increment index infer inline inner insert intersect into is join key keys keyspace known last left let letting like limit lsm map mapping matched materialized merge minus namespace nest not number object offset on option or order outer over parse partition password path pool prepare primary private privilege procedure public raw realm reduce rename return returning revoke right role rollback satisfies schema select self semi set show some start statistics string system then to transaction trigger truncate under union unique unknown unnest unset update upsert use user using validate value valued values via view when where while with within work xor",literal:"true false null missing|5",built_in:"array_agg array_append array_concat array_contains array_count array_distinct array_ifnull array_length array_max array_min array_position array_prepend array_put array_range array_remove array_repeat array_replace array_reverse array_sort array_sum avg count max min sum greatest least ifmissing ifmissingornull ifnull missingif nullif ifinf ifnan ifnanorinf naninf neginfif posinfif clock_millis clock_str date_add_millis date_add_str date_diff_millis date_diff_str date_part_millis date_part_str date_trunc_millis date_trunc_str duration_to_str millis str_to_millis millis_to_str millis_to_utc millis_to_zone_name now_millis now_str str_to_duration str_to_utc str_to_zone_name decode_json encode_json encoded_size poly_length base64 base64_encode base64_decode meta uuid abs acos asin atan atan2 ceil cos degrees e exp ln log floor pi power radians random round sign sin sqrt tan trunc object_length object_names object_pairs object_inner_pairs object_values object_inner_values object_add object_put object_remove object_unwrap regexp_contains regexp_like regexp_position regexp_replace contains initcap length lower ltrim position repeat replace rtrim split substr title trim upper isarray isatom isboolean isnumber isobject isstring type toarray toatom toboolean tonumber toobject tostring"},c:[{cN:"string",b:"'",e:"'",c:[e.BE],relevance:0},{cN:"string",b:'"',e:'"',c:[e.BE],relevance:0},{cN:"symbol",b:"`",e:"`",c:[e.BE],relevance:2},e.CNM,e.CBCM]},e.CBCM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/nginx.min.js b/vendor/assets/javascripts/highlightjs/languages/nginx.min.js
index bdccaae572..432b3bb18a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/nginx.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/nginx.min.js
@@ -1 +1 @@
-hljs.registerLanguage("nginx",function(){"use strict";return function(e){var n={className:"variable",variants:[{begin:/\$\d+/},{begin:/\$\{/,end:/}/},{begin:"[\\$\\@]"+e.UNDERSCORE_IDENT_RE}]},a={endsWithParent:!0,keywords:{$pattern:"[a-z/_]+",literal:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},relevance:0,illegal:"=>",contains:[e.HASH_COMMENT_MODE,{className:"string",contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:/"/,end:/"/},{begin:/'/,end:/'/}]},{begin:"([a-z]+):/",end:"\\s",endsWithParent:!0,excludeEnd:!0,contains:[n]},{className:"regexp",contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:"\\s\\^",end:"\\s|{|;",returnEnd:!0},{begin:"~\\*?\\s+",end:"\\s|{|;",returnEnd:!0},{begin:"\\*(\\.[a-z\\-]+)+"},{begin:"([a-z\\-]+\\.)+\\*"}]},{className:"number",begin:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{className:"number",begin:"\\b\\d+[kKmMgGdshdwy]*\\b",relevance:0},n]};return{name:"Nginx config",aliases:["nginxconf"],contains:[e.HASH_COMMENT_MODE,{begin:e.UNDERSCORE_IDENT_RE+"\\s+{",returnBegin:!0,end:"{",contains:[{className:"section",begin:e.UNDERSCORE_IDENT_RE}],relevance:0},{begin:e.UNDERSCORE_IDENT_RE+"\\s",end:";|{",returnBegin:!0,contains:[{className:"attribute",begin:e.UNDERSCORE_IDENT_RE,starts:a}],relevance:0}],illegal:"[^\\s\\}]"}}}());
\ No newline at end of file
+hljs.registerLanguage("nginx",function(e){var r={cN:"variable",v:[{b:/\$\d+/},{b:/\$\{/,e:/}/},{b:"[\\$\\@]"+e.UIR}]},b={eW:!0,l:"[a-z/_]+",k:{literal:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},relevance:0,i:"=>",c:[e.HCM,{cN:"string",c:[e.BE,r],v:[{b:/"/,e:/"/},{b:/'/,e:/'/}]},{b:"([a-z]+):/",e:"\\s",eW:!0,eE:!0,c:[r]},{cN:"regexp",c:[e.BE,r],v:[{b:"\\s\\^",e:"\\s|{|;",rE:!0},{b:"~\\*?\\s+",e:"\\s|{|;",rE:!0},{b:"\\*(\\.[a-z\\-]+)+"},{b:"([a-z\\-]+\\.)+\\*"}]},{cN:"number",b:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{cN:"number",b:"\\b\\d+[kKmMgGdshdwy]*\\b",relevance:0},r]};return{aliases:["nginxconf"],c:[e.HCM,{b:e.UIR+"\\s+{",rB:!0,e:"{",c:[{cN:"section",b:e.UIR}],relevance:0},{b:e.UIR+"\\s",e:";|{",rB:!0,c:[{cN:"attribute",b:e.UIR,starts:b}],relevance:0}],i:"[^\\s\\}]"}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/nimrod.min.js b/vendor/assets/javascripts/highlightjs/languages/nimrod.min.js
index dfdb41db7f..300b01d4aa 100644
--- a/vendor/assets/javascripts/highlightjs/languages/nimrod.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/nimrod.min.js
@@ -1 +1 @@
-hljs.registerLanguage("nimrod",function(t){return{aliases:["nim"],k:{keyword:"addr and as asm bind block break case cast const continue converter discard distinct div do elif else end enum except export finally for from generic if import in include interface is isnot iterator let macro method mixin mod nil not notin object of or out proc ptr raise ref return shl shr static template try tuple type using var when while with without xor yield",literal:"shared guarded stdin stdout stderr result true false",built_in:"int int8 int16 int32 int64 uint uint8 uint16 uint32 uint64 float float32 float64 bool char string cstring pointer expr stmt void auto any range array openarray varargs seq set clong culong cchar cschar cshort cint csize clonglong cfloat cdouble clongdouble cuchar cushort cuint culonglong cstringarray semistatic"},c:[{cN:"meta",b:/{\./,e:/\.}/,r:10},{cN:"string",b:/[a-zA-Z]\w*"/,e:/"/,c:[{b:/""/}]},{cN:"string",b:/([a-zA-Z]\w*)?"""/,e:/"""/},t.QSM,{cN:"type",b:/\b[A-Z]\w+\b/,r:0},{cN:"number",r:0,v:[{b:/\b(0[xX][0-9a-fA-F][_0-9a-fA-F]*)('?[iIuU](8|16|32|64))?/},{b:/\b(0o[0-7][_0-7]*)('?[iIuUfF](8|16|32|64))?/},{b:/\b(0(b|B)[01][_01]*)('?[iIuUfF](8|16|32|64))?/},{b:/\b(\d[_\d]*)('?[iIuUfF](8|16|32|64))?/}]},t.HCM]}});
\ No newline at end of file
+hljs.registerLanguage("nimrod",function(t){return{aliases:["nim"],k:{keyword:"addr and as asm bind block break case cast const continue converter discard distinct div do elif else end enum except export finally for from generic if import in include interface is isnot iterator let macro method mixin mod nil not notin object of or out proc ptr raise ref return shl shr static template try tuple type using var when while with without xor yield",literal:"shared guarded stdin stdout stderr result true false",built_in:"int int8 int16 int32 int64 uint uint8 uint16 uint32 uint64 float float32 float64 bool char string cstring pointer expr stmt void auto any range array openarray varargs seq set clong culong cchar cschar cshort cint csize clonglong cfloat cdouble clongdouble cuchar cushort cuint culonglong cstringarray semistatic"},c:[{cN:"meta",b:/{\./,e:/\.}/,relevance:10},{cN:"string",b:/[a-zA-Z]\w*"/,e:/"/,c:[{b:/""/}]},{cN:"string",b:/([a-zA-Z]\w*)?"""/,e:/"""/},t.QSM,{cN:"type",b:/\b[A-Z]\w+\b/,relevance:0},{cN:"number",relevance:0,v:[{b:/\b(0[xX][0-9a-fA-F][_0-9a-fA-F]*)('?[iIuU](8|16|32|64))?/},{b:/\b(0o[0-7][_0-7]*)('?[iIuUfF](8|16|32|64))?/},{b:/\b(0(b|B)[01][_01]*)('?[iIuUfF](8|16|32|64))?/},{b:/\b(\d[_\d]*)('?[iIuUfF](8|16|32|64))?/}]},t.HCM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/nix.min.js b/vendor/assets/javascripts/highlightjs/languages/nix.min.js
index 9fdc5b3b8f..2f74e189d9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/nix.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/nix.min.js
@@ -1 +1 @@
-hljs.registerLanguage("nix",function(){"use strict";return function(e){var n={keyword:"rec with let in inherit assert if else then",literal:"true false or and null",built_in:"import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation"},i={className:"subst",begin:/\$\{/,end:/}/,keywords:n},t={className:"string",contains:[i],variants:[{begin:"''",end:"''"},{begin:'"',end:'"'}]},s=[e.NUMBER_MODE,e.HASH_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,t,{begin:/[a-zA-Z0-9-_]+(\s*=)/,returnBegin:!0,relevance:0,contains:[{className:"attr",begin:/\S+/}]}];return i.contains=s,{name:"Nix",aliases:["nixos"],keywords:n,contains:s}}}());
\ No newline at end of file
+hljs.registerLanguage("nix",function(e){var r={keyword:"rec with let in inherit assert if else then",literal:"true false or and null",built_in:"import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation"},t={cN:"subst",b:/\$\{/,e:/}/,k:r},i={cN:"string",c:[t],v:[{b:"''",e:"''"},{b:'"',e:'"'}]},a=[e.NM,e.HCM,e.CBCM,i,{b:/[a-zA-Z0-9-_]+(\s*=)/,rB:!0,relevance:0,c:[{cN:"attr",b:/\S+/}]}];return{aliases:["nixos"],k:r,c:t.c=a}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/nsis.min.js b/vendor/assets/javascripts/highlightjs/languages/nsis.min.js
index 746b381801..1db0a07b13 100644
--- a/vendor/assets/javascripts/highlightjs/languages/nsis.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/nsis.min.js
@@ -1 +1 @@
-hljs.registerLanguage("nsis",function(){"use strict";return function(e){var t={className:"variable",begin:/\$+{[\w\.:-]+}/},n={className:"variable",begin:/\$+\w+/,illegal:/\(\){}/},i={className:"variable",begin:/\$+\([\w\^\.:-]+\)/},r={className:"string",variants:[{begin:'"',end:'"'},{begin:"'",end:"'"},{begin:"`",end:"`"}],illegal:/\n/,contains:[{className:"meta",begin:/\$(\\[nrt]|\$)/},{className:"variable",begin:/\$(ADMINTOOLS|APPDATA|CDBURN_AREA|CMDLINE|COMMONFILES32|COMMONFILES64|COMMONFILES|COOKIES|DESKTOP|DOCUMENTS|EXEDIR|EXEFILE|EXEPATH|FAVORITES|FONTS|HISTORY|HWNDPARENT|INSTDIR|INTERNET_CACHE|LANGUAGE|LOCALAPPDATA|MUSIC|NETHOOD|OUTDIR|PICTURES|PLUGINSDIR|PRINTHOOD|PROFILE|PROGRAMFILES32|PROGRAMFILES64|PROGRAMFILES|QUICKLAUNCH|RECENT|RESOURCES_LOCALIZED|RESOURCES|SENDTO|SMPROGRAMS|SMSTARTUP|STARTMENU|SYSDIR|TEMP|TEMPLATES|VIDEOS|WINDIR)/},t,n,i]};return{name:"NSIS",case_insensitive:!1,keywords:{keyword:"Abort AddBrandingImage AddSize AllowRootDirInstall AllowSkipFiles AutoCloseWindow BGFont BGGradient BrandingText BringToFront Call CallInstDLL Caption ChangeUI CheckBitmap ClearErrors CompletedText ComponentText CopyFiles CRCCheck CreateDirectory CreateFont CreateShortCut Delete DeleteINISec DeleteINIStr DeleteRegKey DeleteRegValue DetailPrint DetailsButtonText DirText DirVar DirVerify EnableWindow EnumRegKey EnumRegValue Exch Exec ExecShell ExecShellWait ExecWait ExpandEnvStrings File FileBufSize FileClose FileErrorText FileOpen FileRead FileReadByte FileReadUTF16LE FileReadWord FileSeek FileWrite FileWriteByte FileWriteUTF16LE FileWriteWord FindClose FindFirst FindNext FindWindow FlushINI FunctionEnd GetCurInstType GetCurrentAddress GetDlgItem GetDLLVersion GetDLLVersionLocal GetErrorLevel GetFileTime GetFileTimeLocal GetFullPathName GetFunctionAddress GetInstDirError GetLabelAddress GetTempFileName Goto HideWindow Icon IfAbort IfErrors IfFileExists IfRebootFlag IfSilent InitPluginsDir InstallButtonText InstallColors InstallDir InstallDirRegKey InstProgressFlags InstType InstTypeGetText InstTypeSetText Int64Cmp Int64CmpU Int64Fmt IntCmp IntCmpU IntFmt IntOp IntPtrCmp IntPtrCmpU IntPtrOp IsWindow LangString LicenseBkColor LicenseData LicenseForceSelection LicenseLangString LicenseText LoadLanguageFile LockWindow LogSet LogText ManifestDPIAware ManifestSupportedOS MessageBox MiscButtonText Name Nop OutFile Page PageCallbacks PageExEnd Pop Push Quit ReadEnvStr ReadINIStr ReadRegDWORD ReadRegStr Reboot RegDLL Rename RequestExecutionLevel ReserveFile Return RMDir SearchPath SectionEnd SectionGetFlags SectionGetInstTypes SectionGetSize SectionGetText SectionGroupEnd SectionIn SectionSetFlags SectionSetInstTypes SectionSetSize SectionSetText SendMessage SetAutoClose SetBrandingImage SetCompress SetCompressor SetCompressorDictSize SetCtlColors SetCurInstType SetDatablockOptimize SetDateSave SetDetailsPrint SetDetailsView SetErrorLevel SetErrors SetFileAttributes SetFont SetOutPath SetOverwrite SetRebootFlag SetRegView SetShellVarContext SetSilent ShowInstDetails ShowUninstDetails ShowWindow SilentInstall SilentUnInstall Sleep SpaceTexts StrCmp StrCmpS StrCpy StrLen SubCaption Unicode UninstallButtonText UninstallCaption UninstallIcon UninstallSubCaption UninstallText UninstPage UnRegDLL Var VIAddVersionKey VIFileVersion VIProductVersion WindowIcon WriteINIStr WriteRegBin WriteRegDWORD WriteRegExpandStr WriteRegMultiStr WriteRegNone WriteRegStr WriteUninstaller XPStyle",literal:"admin all auto both bottom bzip2 colored components current custom directory false force hide highest ifdiff ifnewer instfiles lastused leave left license listonly lzma nevershow none normal notset off on open print right show silent silentlog smooth textonly top true try un.components un.custom un.directory un.instfiles un.license uninstConfirm user Win10 Win7 Win8 WinVista zlib"},contains:[e.HASH_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.COMMENT(";","$",{relevance:0}),{className:"function",beginKeywords:"Function PageEx Section SectionGroup",end:"$"},r,{className:"keyword",begin:/\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversion|gettlbversion|if|ifdef|ifmacrodef|ifmacrondef|ifndef|include|insertmacro|macro|macroend|makensis|packhdr|searchparse|searchreplace|system|tempfile|undef|verbose|warning)/},t,n,i,{className:"params",begin:"(ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)"},{className:"class",begin:/\w+\:\:\w+/},e.NUMBER_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("nsis",function(e){var t={cN:"variable",b:/\$+{[\w\.:-]+}/},n={cN:"variable",b:/\$+\w+/,i:/\(\){}/},i={cN:"variable",b:/\$+\([\w\^\.:-]+\)/},r={cN:"string",v:[{b:'"',e:'"'},{b:"'",e:"'"},{b:"`",e:"`"}],i:/\n/,c:[{cN:"meta",b:/\$(\\[nrt]|\$)/},{cN:"variable",b:/\$(ADMINTOOLS|APPDATA|CDBURN_AREA|CMDLINE|COMMONFILES32|COMMONFILES64|COMMONFILES|COOKIES|DESKTOP|DOCUMENTS|EXEDIR|EXEFILE|EXEPATH|FAVORITES|FONTS|HISTORY|HWNDPARENT|INSTDIR|INTERNET_CACHE|LANGUAGE|LOCALAPPDATA|MUSIC|NETHOOD|OUTDIR|PICTURES|PLUGINSDIR|PRINTHOOD|PROFILE|PROGRAMFILES32|PROGRAMFILES64|PROGRAMFILES|QUICKLAUNCH|RECENT|RESOURCES_LOCALIZED|RESOURCES|SENDTO|SMPROGRAMS|SMSTARTUP|STARTMENU|SYSDIR|TEMP|TEMPLATES|VIDEOS|WINDIR)/},t,n,i]};return{cI:!1,k:{keyword:"Abort AddBrandingImage AddSize AllowRootDirInstall AllowSkipFiles AutoCloseWindow BGFont BGGradient BrandingText BringToFront Call CallInstDLL Caption ChangeUI CheckBitmap ClearErrors CompletedText ComponentText CopyFiles CRCCheck CreateDirectory CreateFont CreateShortCut Delete DeleteINISec DeleteINIStr DeleteRegKey DeleteRegValue DetailPrint DetailsButtonText DirText DirVar DirVerify EnableWindow EnumRegKey EnumRegValue Exch Exec ExecShell ExecShellWait ExecWait ExpandEnvStrings File FileBufSize FileClose FileErrorText FileOpen FileRead FileReadByte FileReadUTF16LE FileReadWord FileSeek FileWrite FileWriteByte FileWriteUTF16LE FileWriteWord FindClose FindFirst FindNext FindWindow FlushINI FunctionEnd GetCurInstType GetCurrentAddress GetDlgItem GetDLLVersion GetDLLVersionLocal GetErrorLevel GetFileTime GetFileTimeLocal GetFullPathName GetFunctionAddress GetInstDirError GetLabelAddress GetTempFileName Goto HideWindow Icon IfAbort IfErrors IfFileExists IfRebootFlag IfSilent InitPluginsDir InstallButtonText InstallColors InstallDir InstallDirRegKey InstProgressFlags InstType InstTypeGetText InstTypeSetText Int64Cmp Int64CmpU Int64Fmt IntCmp IntCmpU IntFmt IntOp IntPtrCmp IntPtrCmpU IntPtrOp IsWindow LangString LicenseBkColor LicenseData LicenseForceSelection LicenseLangString LicenseText LoadLanguageFile LockWindow LogSet LogText ManifestDPIAware ManifestSupportedOS MessageBox MiscButtonText Name Nop OutFile Page PageCallbacks PageExEnd Pop Push Quit ReadEnvStr ReadINIStr ReadRegDWORD ReadRegStr Reboot RegDLL Rename RequestExecutionLevel ReserveFile Return RMDir SearchPath SectionEnd SectionGetFlags SectionGetInstTypes SectionGetSize SectionGetText SectionGroupEnd SectionIn SectionSetFlags SectionSetInstTypes SectionSetSize SectionSetText SendMessage SetAutoClose SetBrandingImage SetCompress SetCompressor SetCompressorDictSize SetCtlColors SetCurInstType SetDatablockOptimize SetDateSave SetDetailsPrint SetDetailsView SetErrorLevel SetErrors SetFileAttributes SetFont SetOutPath SetOverwrite SetRebootFlag SetRegView SetShellVarContext SetSilent ShowInstDetails ShowUninstDetails ShowWindow SilentInstall SilentUnInstall Sleep SpaceTexts StrCmp StrCmpS StrCpy StrLen SubCaption Unicode UninstallButtonText UninstallCaption UninstallIcon UninstallSubCaption UninstallText UninstPage UnRegDLL Var VIAddVersionKey VIFileVersion VIProductVersion WindowIcon WriteINIStr WriteRegBin WriteRegDWORD WriteRegExpandStr WriteRegMultiStr WriteRegNone WriteRegStr WriteUninstaller XPStyle",literal:"admin all auto both bottom bzip2 colored components current custom directory false force hide highest ifdiff ifnewer instfiles lastused leave left license listonly lzma nevershow none normal notset off on open print right show silent silentlog smooth textonly top true try un.components un.custom un.directory un.instfiles un.license uninstConfirm user Win10 Win7 Win8 WinVista zlib"},c:[e.HCM,e.CBCM,e.C(";","$",{relevance:0}),{cN:"function",bK:"Function PageEx Section SectionGroup",e:"$"},r,{cN:"keyword",b:/\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversion|gettlbversion|if|ifdef|ifmacrodef|ifmacrondef|ifndef|include|insertmacro|macro|macroend|makensis|packhdr|searchparse|searchreplace|system|tempfile|undef|verbose|warning)/},t,n,i,{cN:"params",b:"(ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)"},{cN:"class",b:/\w+\:\:\w+/},e.NM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/objectivec.min.js b/vendor/assets/javascripts/highlightjs/languages/objectivec.min.js
index af62322b3d..1e158370ad 100644
--- a/vendor/assets/javascripts/highlightjs/languages/objectivec.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/objectivec.min.js
@@ -1 +1 @@
-hljs.registerLanguage("objectivec",function(){"use strict";return function(e){var n=/[a-zA-Z@][a-zA-Z0-9_]*/,_={$pattern:n,keyword:"@interface @class @protocol @implementation"};return{name:"Objective-C",aliases:["mm","objc","obj-c"],keywords:{$pattern:n,keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required @encode @package @import @defs @compatibility_alias __bridge __bridge_transfer __bridge_retained __bridge_retain __covariant __contravariant __kindof _Nonnull _Nullable _Null_unspecified __FUNCTION__ __PRETTY_FUNCTION__ __attribute__ getter setter retain unsafe_unretained nonnull nullable null_unspecified null_resettable class instancetype NS_DESIGNATED_INITIALIZER NS_UNAVAILABLE NS_REQUIRES_SUPER NS_RETURNS_INNER_POINTER NS_INLINE NS_AVAILABLE NS_DEPRECATED NS_ENUM NS_OPTIONS NS_SWIFT_UNAVAILABLE NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_REFINED_FOR_SWIFT NS_SWIFT_NAME NS_SWIFT_NOTHROW NS_DURING NS_HANDLER NS_ENDHANDLER NS_VALUERETURN NS_VOIDRETURN",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},illegal:"</",contains:[{className:"built_in",begin:"\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.C_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{className:"string",variants:[{begin:'@"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]}]},{className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef include"},contains:[{begin:/\\\n/,relevance:0},e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),{className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"class",begin:"("+_.keyword.split(" ").join("|")+")\\b",end:"({|$)",excludeEnd:!0,keywords:_,contains:[e.UNDERSCORE_TITLE_MODE]},{begin:"\\."+e.UNDERSCORE_IDENT_RE,relevance:0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("objectivec",function(e){var t=/[a-zA-Z@][a-zA-Z0-9_]*/,i="@interface @class @protocol @implementation";return{aliases:["mm","objc","obj-c"],k:{keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required @encode @package @import @defs @compatibility_alias __bridge __bridge_transfer __bridge_retained __bridge_retain __covariant __contravariant __kindof _Nonnull _Nullable _Null_unspecified __FUNCTION__ __PRETTY_FUNCTION__ __attribute__ getter setter retain unsafe_unretained nonnull nullable null_unspecified null_resettable class instancetype NS_DESIGNATED_INITIALIZER NS_UNAVAILABLE NS_REQUIRES_SUPER NS_RETURNS_INNER_POINTER NS_INLINE NS_AVAILABLE NS_DEPRECATED NS_ENUM NS_OPTIONS NS_SWIFT_UNAVAILABLE NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_REFINED_FOR_SWIFT NS_SWIFT_NAME NS_SWIFT_NOTHROW NS_DURING NS_HANDLER NS_ENDHANDLER NS_VALUERETURN NS_VOIDRETURN",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},l:t,i:"</",c:[{cN:"built_in",b:"\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+"},e.CLCM,e.CBCM,e.CNM,e.QSM,e.ASM,{cN:"string",v:[{b:'@"',e:'"',i:"\\n",c:[e.BE]}]},{cN:"meta",b:/#\s*[a-z]+\b/,e:/$/,k:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef include"},c:[{b:/\\\n/,relevance:0},e.inherit(e.QSM,{cN:"meta-string"}),{cN:"meta-string",b:/<.*?>/,e:/$/,i:"\\n"},e.CLCM,e.CBCM]},{cN:"class",b:"("+i.split(" ").join("|")+")\\b",e:"({|$)",eE:!0,k:i,l:t,c:[e.UTM]},{b:"\\."+e.UIR,relevance:0}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ocaml.min.js b/vendor/assets/javascripts/highlightjs/languages/ocaml.min.js
index 6093d9e1fc..89df34a711 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ocaml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ocaml.min.js
@@ -1 +1 @@
-hljs.registerLanguage("ocaml",function(){"use strict";return function(e){return{name:"OCaml",aliases:["ml"],keywords:{$pattern:"[a-z_]\\w*!?",keyword:"and as assert asr begin class constraint do done downto else end exception external for fun function functor if in include inherit! inherit initializer land lazy let lor lsl lsr lxor match method!|10 method mod module mutable new object of open! open or private rec sig struct then to try type val! val virtual when while with parser value",built_in:"array bool bytes char exn|5 float int int32 int64 list lazy_t|5 nativeint|5 string unit in_channel out_channel ref",literal:"true false"},illegal:/\/\/|>>/,contains:[{className:"literal",begin:"\\[(\\|\\|)?\\]|\\(\\)",relevance:0},e.COMMENT("\\(\\*","\\*\\)",{contains:["self"]}),{className:"symbol",begin:"'[A-Za-z_](?!')[\\w']*"},{className:"type",begin:"`[A-Z][\\w']*"},{className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},{begin:"[a-z_]\\w*'[\\w']*",relevance:0},e.inherit(e.APOS_STRING_MODE,{className:"string",relevance:0}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),{className:"number",begin:"\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",relevance:0},{begin:/[-=]>/}]}}}());
\ No newline at end of file
+hljs.registerLanguage("ocaml",function(e){return{aliases:["ml"],k:{keyword:"and as assert asr begin class constraint do done downto else end exception external for fun function functor if in include inherit! inherit initializer land lazy let lor lsl lsr lxor match method!|10 method mod module mutable new object of open! open or private rec sig struct then to try type val! val virtual when while with parser value",built_in:"array bool bytes char exn|5 float int int32 int64 list lazy_t|5 nativeint|5 string unit in_channel out_channel ref",literal:"true false"},i:/\/\/|>>/,l:"[a-z_]\\w*!?",c:[{cN:"literal",b:"\\[(\\|\\|)?\\]|\\(\\)",relevance:0},e.C("\\(\\*","\\*\\)",{c:["self"]}),{cN:"symbol",b:"'[A-Za-z_](?!')[\\w']*"},{cN:"type",b:"`[A-Z][\\w']*"},{cN:"type",b:"\\b[A-Z][\\w']*",relevance:0},{b:"[a-z_]\\w*'[\\w']*",relevance:0},e.inherit(e.ASM,{cN:"string",relevance:0}),e.inherit(e.QSM,{i:null}),{cN:"number",b:"\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",relevance:0},{b:/[-=]>/}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/openscad.min.js b/vendor/assets/javascripts/highlightjs/languages/openscad.min.js
index 65b62f3e06..f744751af4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/openscad.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/openscad.min.js
@@ -1 +1 @@
-hljs.registerLanguage("openscad",function(){"use strict";return function(e){var n={className:"keyword",begin:"\\$(f[asn]|t|vp[rtd]|children)"},r={className:"number",begin:"\\b\\d+(\\.\\d+)?(e-?\\d+)?",relevance:0},s=e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),a={className:"function",beginKeywords:"module function",end:"\\=|\\{",contains:[{className:"params",begin:"\\(",end:"\\)",contains:["self",r,s,n,{className:"literal",begin:"false|true|PI|undef"}]},e.UNDERSCORE_TITLE_MODE]};return{name:"OpenSCAD",aliases:["scad"],keywords:{keyword:"function module include use for intersection_for if else \\%",literal:"false true PI undef",built_in:"circle square polygon text sphere cube cylinder polyhedron translate rotate scale resize mirror multmatrix color offset hull minkowski union difference intersection abs sign sin cos tan acos asin atan atan2 floor round ceil ln log pow sqrt exp rands min max concat lookup str chr search version version_num norm cross parent_module echo import import_dxf dxf_linear_extrude linear_extrude rotate_extrude surface projection render children dxf_cross dxf_dim let assign"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,r,{className:"meta",keywords:{"meta-keyword":"include use"},begin:"include|use <",end:">"},s,n,{begin:"[*!#%]",relevance:0},a]}}}());
\ No newline at end of file
+hljs.registerLanguage("openscad",function(e){var r={cN:"keyword",b:"\\$(f[asn]|t|vp[rtd]|children)"},n={cN:"number",b:"\\b\\d+(\\.\\d+)?(e-?\\d+)?",relevance:0},o=e.inherit(e.QSM,{i:null}),i={cN:"function",bK:"module function",e:"\\=|\\{",c:[{cN:"params",b:"\\(",e:"\\)",c:["self",n,o,r,{cN:"literal",b:"false|true|PI|undef"}]},e.UTM]};return{aliases:["scad"],k:{keyword:"function module include use for intersection_for if else \\%",literal:"false true PI undef",built_in:"circle square polygon text sphere cube cylinder polyhedron translate rotate scale resize mirror multmatrix color offset hull minkowski union difference intersection abs sign sin cos tan acos asin atan atan2 floor round ceil ln log pow sqrt exp rands min max concat lookup str chr search version version_num norm cross parent_module echo import import_dxf dxf_linear_extrude linear_extrude rotate_extrude surface projection render children dxf_cross dxf_dim let assign"},c:[e.CLCM,e.CBCM,n,{cN:"meta",k:{"meta-keyword":"include use"},b:"include|use <",e:">"},o,r,{b:"[*!#%]",relevance:0},i]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/oxygene.min.js b/vendor/assets/javascripts/highlightjs/languages/oxygene.min.js
index d5fd001b5e..25d35beebe 100644
--- a/vendor/assets/javascripts/highlightjs/languages/oxygene.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/oxygene.min.js
@@ -1 +1 @@
-hljs.registerLanguage("oxygene",function(){"use strict";return function(e){var n={$pattern:/\.?\w+/,keyword:"abstract add and array as asc aspect assembly async begin break block by case class concat const copy constructor continue create default delegate desc distinct div do downto dynamic each else empty end ensure enum equals event except exit extension external false final finalize finalizer finally flags for forward from function future global group has if implementation implements implies in index inherited inline interface into invariants is iterator join locked locking loop matching method mod module namespace nested new nil not notify nullable of old on operator or order out override parallel params partial pinned private procedure property protected public queryable raise read readonly record reintroduce remove repeat require result reverse sealed select self sequence set shl shr skip static step soft take then to true try tuple type union unit unsafe until uses using var virtual raises volatile where while with write xor yield await mapped deprecated stdcall cdecl pascal register safecall overload library platform reference packed strict published autoreleasepool selector strong weak unretained"},r=e.COMMENT("{","}",{relevance:0}),a=e.COMMENT("\\(\\*","\\*\\)",{relevance:10}),t={className:"string",begin:"'",end:"'",contains:[{begin:"''"}]},s={className:"string",begin:"(#\\d+)+"},i={className:"function",beginKeywords:"function constructor destructor procedure method",end:"[:;]",keywords:"function constructor|10 destructor|10 procedure|10 method|10",contains:[e.TITLE_MODE,{className:"params",begin:"\\(",end:"\\)",keywords:n,contains:[t,s]},r,a]};return{name:"Oxygene",case_insensitive:!0,keywords:n,illegal:'("|\\$[G-Zg-z]|\\/\\*|</|=>|->)',contains:[r,a,e.C_LINE_COMMENT_MODE,t,s,e.NUMBER_MODE,i,{className:"class",begin:"=\\bclass\\b",end:"end;",keywords:n,contains:[t,s,r,a,e.C_LINE_COMMENT_MODE,i]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("oxygene",function(e){var r="abstract add and array as asc aspect assembly async begin break block by case class concat const copy constructor continue create default delegate desc distinct div do downto dynamic each else empty end ensure enum equals event except exit extension external false final finalize finalizer finally flags for forward from function future global group has if implementation implements implies in index inherited inline interface into invariants is iterator join locked locking loop matching method mod module namespace nested new nil not notify nullable of old on operator or order out override parallel params partial pinned private procedure property protected public queryable raise read readonly record reintroduce remove repeat require result reverse sealed select self sequence set shl shr skip static step soft take then to true try tuple type union unit unsafe until uses using var virtual raises volatile where while with write xor yield await mapped deprecated stdcall cdecl pascal register safecall overload library platform reference packed strict published autoreleasepool selector strong weak unretained",t=e.C("{","}",{relevance:0}),a=e.C("\\(\\*","\\*\\)",{relevance:10}),n={cN:"string",b:"'",e:"'",c:[{b:"''"}]},o={cN:"string",b:"(#\\d+)+"},i={cN:"function",bK:"function constructor destructor procedure method",e:"[:;]",k:"function constructor|10 destructor|10 procedure|10 method|10",c:[e.TM,{cN:"params",b:"\\(",e:"\\)",k:r,c:[n,o]},t,a]};return{cI:!0,l:/\.?\w+/,k:r,i:'("|\\$[G-Zg-z]|\\/\\*|</|=>|->)',c:[t,a,e.CLCM,n,o,e.NM,i,{cN:"class",b:"=\\bclass\\b",e:"end;",k:r,c:[n,o,t,a,e.CLCM,i]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/parser3.min.js b/vendor/assets/javascripts/highlightjs/languages/parser3.min.js
index 0aac1441d2..3ca84f43a8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/parser3.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/parser3.min.js
@@ -1 +1 @@
-hljs.registerLanguage("parser3",function(){"use strict";return function(e){var a=e.COMMENT("{","}",{contains:["self"]});return{name:"Parser3",subLanguage:"xml",relevance:0,contains:[e.COMMENT("^#","$"),e.COMMENT("\\^rem{","}",{relevance:10,contains:[a]}),{className:"meta",begin:"^@(?:BASE|USE|CLASS|OPTIONS)$",relevance:10},{className:"title",begin:"@[\\w\\-]+\\[[\\w^;\\-]*\\](?:\\[[\\w^;\\-]*\\])?(?:.*)$"},{className:"variable",begin:"\\$\\{?[\\w\\-\\.\\:]+\\}?"},{className:"keyword",begin:"\\^[\\w\\-\\.\\:]+"},{className:"number",begin:"\\^#[0-9a-fA-F]+"},e.C_NUMBER_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("parser3",function(e){var r=e.C("{","}",{c:["self"]});return{sL:"xml",relevance:0,c:[e.C("^#","$"),e.C("\\^rem{","}",{relevance:10,c:[r]}),{cN:"meta",b:"^@(?:BASE|USE|CLASS|OPTIONS)$",relevance:10},{cN:"title",b:"@[\\w\\-]+\\[[\\w^;\\-]*\\](?:\\[[\\w^;\\-]*\\])?(?:.*)$"},{cN:"variable",b:"\\$\\{?[\\w\\-\\.\\:]+\\}?"},{cN:"keyword",b:"\\^[\\w\\-\\.\\:]+"},{cN:"number",b:"\\^#[0-9a-fA-F]+"},e.CNM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/perl.min.js b/vendor/assets/javascripts/highlightjs/languages/perl.min.js
index b3cb6332ac..41241e67a5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/perl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/perl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("perl",function(){"use strict";return function(e){var n={$pattern:/[\w.]+/,keyword:"getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qq fileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmget sub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedir ioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when"},t={className:"subst",begin:"[$@]\\{",end:"\\}",keywords:n},s={begin:"->{",end:"}"},r={variants:[{begin:/\$\d/},{begin:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{begin:/[\$%@][^\s\w{]/,relevance:0}]},i=[e.BACKSLASH_ESCAPE,t,r],a=[r,e.HASH_COMMENT_MODE,e.COMMENT("^\\=\\w","\\=cut",{endsWithParent:!0}),s,{className:"string",contains:i,variants:[{begin:"q[qwxr]?\\s*\\(",end:"\\)",relevance:5},{begin:"q[qwxr]?\\s*\\[",end:"\\]",relevance:5},{begin:"q[qwxr]?\\s*\\{",end:"\\}",relevance:5},{begin:"q[qwxr]?\\s*\\|",end:"\\|",relevance:5},{begin:"q[qwxr]?\\s*\\<",end:"\\>",relevance:5},{begin:"qw\\s+q",end:"q",relevance:5},{begin:"'",end:"'",contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"'},{begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE]},{begin:"{\\w+}",contains:[],relevance:0},{begin:"-?\\w+\\s*\\=\\>",contains:[],relevance:0}]},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{begin:"(\\/\\/|"+e.RE_STARTERS_RE+"|\\b(split|return|print|reverse|grep)\\b)\\s*",keywords:"split return print reverse grep",relevance:0,contains:[e.HASH_COMMENT_MODE,{className:"regexp",begin:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",relevance:10},{className:"regexp",begin:"(m|qr)?/",end:"/[a-z]*",contains:[e.BACKSLASH_ESCAPE],relevance:0}]},{className:"function",beginKeywords:"sub",end:"(\\s*\\(.*?\\))?[;{]",excludeEnd:!0,relevance:5,contains:[e.TITLE_MODE]},{begin:"-\\w\\b",relevance:0},{begin:"^__DATA__$",end:"^__END__$",subLanguage:"mojolicious",contains:[{begin:"^@@.*",end:"$",className:"comment"}]}];return t.contains=a,s.contains=a,{name:"Perl",aliases:["pl","pm"],keywords:n,contains:a}}}());
\ No newline at end of file
+hljs.registerLanguage("perl",function(e){var t="getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qqfileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmgetsub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedirioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when",r={cN:"subst",b:"[$@]\\{",e:"\\}",k:t},s={b:"->{",e:"}"},n={v:[{b:/\$\d/},{b:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{b:/[\$%@][^\s\w{]/,relevance:0}]},c=[e.BE,r,n],a=[n,e.HCM,e.C("^\\=\\w","\\=cut",{eW:!0}),s,{cN:"string",c:c,v:[{b:"q[qwxr]?\\s*\\(",e:"\\)",relevance:5},{b:"q[qwxr]?\\s*\\[",e:"\\]",relevance:5},{b:"q[qwxr]?\\s*\\{",e:"\\}",relevance:5},{b:"q[qwxr]?\\s*\\|",e:"\\|",relevance:5},{b:"q[qwxr]?\\s*\\<",e:"\\>",relevance:5},{b:"qw\\s+q",e:"q",relevance:5},{b:"'",e:"'",c:[e.BE]},{b:'"',e:'"'},{b:"`",e:"`",c:[e.BE]},{b:"{\\w+}",c:[],relevance:0},{b:"-?\\w+\\s*\\=\\>",c:[],relevance:0}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{b:"(\\/\\/|"+e.RSR+"|\\b(split|return|print|reverse|grep)\\b)\\s*",k:"split return print reverse grep",relevance:0,c:[e.HCM,{cN:"regexp",b:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",relevance:10},{cN:"regexp",b:"(m|qr)?/",e:"/[a-z]*",c:[e.BE],relevance:0}]},{cN:"function",bK:"sub",e:"(\\s*\\(.*?\\))?[;{]",eE:!0,relevance:5,c:[e.TM]},{b:"-\\w\\b",relevance:0},{b:"^__DATA__$",e:"^__END__$",sL:"mojolicious",c:[{b:"^@@.*",e:"$",cN:"comment"}]}];return r.c=a,{aliases:["pl","pm"],l:/[\w\.]+/,k:t,c:s.c=a}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/pf.min.js b/vendor/assets/javascripts/highlightjs/languages/pf.min.js
index e8c255dac9..f5079d29a8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/pf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/pf.min.js
@@ -1 +1 @@
-hljs.registerLanguage("pf",function(){"use strict";return function(t){return{name:"Packet Filter config",aliases:["pf.conf"],keywords:{$pattern:/[a-z0-9_<>-]+/,built_in:"block match pass load anchor|5 antispoof|10 set table",keyword:"in out log quick on rdomain inet inet6 proto from port os to route allow-opts divert-packet divert-reply divert-to flags group icmp-type icmp6-type label once probability recieved-on rtable prio queue tos tag tagged user keep fragment for os drop af-to|10 binat-to|10 nat-to|10 rdr-to|10 bitmask least-stats random round-robin source-hash static-port dup-to reply-to route-to parent bandwidth default min max qlimit block-policy debug fingerprints hostid limit loginterface optimization reassemble ruleset-optimization basic none profile skip state-defaults state-policy timeout const counters persist no modulate synproxy state|5 floating if-bound no-sync pflow|10 sloppy source-track global rule max-src-nodes max-src-states max-src-conn max-src-conn-rate overload flush scrub|5 max-mss min-ttl no-df|10 random-id",literal:"all any no-route self urpf-failed egress|5 unknown"},contains:[t.HASH_COMMENT_MODE,t.NUMBER_MODE,t.QUOTE_STRING_MODE,{className:"variable",begin:/\$[\w\d#@][\w\d_]*/},{className:"variable",begin:/<(?!\/)/,end:/>/}]}}}());
\ No newline at end of file
+hljs.registerLanguage("pf",function(t){return{aliases:["pf.conf"],l:/[a-z0-9_<>-]+/,k:{built_in:"block match pass load anchor|5 antispoof|10 set table",keyword:"in out log quick on rdomain inet inet6 proto from port os to routeallow-opts divert-packet divert-reply divert-to flags group icmp-typeicmp6-type label once probability recieved-on rtable prio queuetos tag tagged user keep fragment for os dropaf-to|10 binat-to|10 nat-to|10 rdr-to|10 bitmask least-stats random round-robinsource-hash static-portdup-to reply-to route-toparent bandwidth default min max qlimitblock-policy debug fingerprints hostid limit loginterface optimizationreassemble ruleset-optimization basic none profile skip state-defaultsstate-policy timeoutconst counters persistno modulate synproxy state|5 floating if-bound no-sync pflow|10 sloppysource-track global rule max-src-nodes max-src-states max-src-connmax-src-conn-rate overload flushscrub|5 max-mss min-ttl no-df|10 random-id",literal:"all any no-route self urpf-failed egress|5 unknown"},c:[t.HCM,t.NM,t.QSM,{cN:"variable",b:/\$[\w\d#@][\w\d_]*/},{cN:"variable",b:/<(?!\/)/,e:/>/}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/pgsql.min.js b/vendor/assets/javascripts/highlightjs/languages/pgsql.min.js
index df4d4fd6e3..e61a61d2ae 100644
--- a/vendor/assets/javascripts/highlightjs/languages/pgsql.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/pgsql.min.js
@@ -1 +1 @@
-hljs.registerLanguage("pgsql",function(){"use strict";return function(E){var T=E.COMMENT("--","$"),N="BIGINT INT8 BIGSERIAL SERIAL8 BIT VARYING VARBIT BOOLEAN BOOL BOX BYTEA CHARACTER CHAR VARCHAR CIDR CIRCLE DATE DOUBLE PRECISION FLOAT8 FLOAT INET INTEGER INT INT4 INTERVAL JSON JSONB LINE LSEG|10 MACADDR MACADDR8 MONEY NUMERIC DEC DECIMAL PATH POINT POLYGON REAL FLOAT4 SMALLINT INT2 SMALLSERIAL|10 SERIAL2|10 SERIAL|10 SERIAL4|10 TEXT TIME ZONE TIMETZ|10 TIMESTAMP TIMESTAMPTZ|10 TSQUERY|10 TSVECTOR|10 TXID_SNAPSHOT|10 UUID XML NATIONAL NCHAR INT4RANGE|10 INT8RANGE|10 NUMRANGE|10 TSRANGE|10 TSTZRANGE|10 DATERANGE|10 ANYELEMENT ANYARRAY ANYNONARRAY ANYENUM ANYRANGE CSTRING INTERNAL RECORD PG_DDL_COMMAND VOID UNKNOWN OPAQUE REFCURSOR NAME OID REGPROC|10 REGPROCEDURE|10 REGOPER|10 REGOPERATOR|10 REGCLASS|10 REGTYPE|10 REGROLE|10 REGNAMESPACE|10 REGCONFIG|10 REGDICTIONARY|10 ",A=N.trim().split(" ").map((function(E){return E.split("|")[0]})).join("|"),R="ARRAY_AGG AVG BIT_AND BIT_OR BOOL_AND BOOL_OR COUNT EVERY JSON_AGG JSONB_AGG JSON_OBJECT_AGG JSONB_OBJECT_AGG MAX MIN MODE STRING_AGG SUM XMLAGG CORR COVAR_POP COVAR_SAMP REGR_AVGX REGR_AVGY REGR_COUNT REGR_INTERCEPT REGR_R2 REGR_SLOPE REGR_SXX REGR_SXY REGR_SYY STDDEV STDDEV_POP STDDEV_SAMP VARIANCE VAR_POP VAR_SAMP PERCENTILE_CONT PERCENTILE_DISC ROW_NUMBER RANK DENSE_RANK PERCENT_RANK CUME_DIST NTILE LAG LEAD FIRST_VALUE LAST_VALUE NTH_VALUE NUM_NONNULLS NUM_NULLS ABS CBRT CEIL CEILING DEGREES DIV EXP FLOOR LN LOG MOD PI POWER RADIANS ROUND SCALE SIGN SQRT TRUNC WIDTH_BUCKET RANDOM SETSEED ACOS ACOSD ASIN ASIND ATAN ATAND ATAN2 ATAN2D COS COSD COT COTD SIN SIND TAN TAND BIT_LENGTH CHAR_LENGTH CHARACTER_LENGTH LOWER OCTET_LENGTH OVERLAY POSITION SUBSTRING TREAT TRIM UPPER ASCII BTRIM CHR CONCAT CONCAT_WS CONVERT CONVERT_FROM CONVERT_TO DECODE ENCODE INITCAP LEFT LENGTH LPAD LTRIM MD5 PARSE_IDENT PG_CLIENT_ENCODING QUOTE_IDENT|10 QUOTE_LITERAL|10 QUOTE_NULLABLE|10 REGEXP_MATCH REGEXP_MATCHES REGEXP_REPLACE REGEXP_SPLIT_TO_ARRAY REGEXP_SPLIT_TO_TABLE REPEAT REPLACE REVERSE RIGHT RPAD RTRIM SPLIT_PART STRPOS SUBSTR TO_ASCII TO_HEX TRANSLATE OCTET_LENGTH GET_BIT GET_BYTE SET_BIT SET_BYTE TO_CHAR TO_DATE TO_NUMBER TO_TIMESTAMP AGE CLOCK_TIMESTAMP|10 DATE_PART DATE_TRUNC ISFINITE JUSTIFY_DAYS JUSTIFY_HOURS JUSTIFY_INTERVAL MAKE_DATE MAKE_INTERVAL|10 MAKE_TIME MAKE_TIMESTAMP|10 MAKE_TIMESTAMPTZ|10 NOW STATEMENT_TIMESTAMP|10 TIMEOFDAY TRANSACTION_TIMESTAMP|10 ENUM_FIRST ENUM_LAST ENUM_RANGE AREA CENTER DIAMETER HEIGHT ISCLOSED ISOPEN NPOINTS PCLOSE POPEN RADIUS WIDTH BOX BOUND_BOX CIRCLE LINE LSEG PATH POLYGON ABBREV BROADCAST HOST HOSTMASK MASKLEN NETMASK NETWORK SET_MASKLEN TEXT INET_SAME_FAMILY INET_MERGE MACADDR8_SET7BIT ARRAY_TO_TSVECTOR GET_CURRENT_TS_CONFIG NUMNODE PLAINTO_TSQUERY PHRASETO_TSQUERY WEBSEARCH_TO_TSQUERY QUERYTREE SETWEIGHT STRIP TO_TSQUERY TO_TSVECTOR JSON_TO_TSVECTOR JSONB_TO_TSVECTOR TS_DELETE TS_FILTER TS_HEADLINE TS_RANK TS_RANK_CD TS_REWRITE TSQUERY_PHRASE TSVECTOR_TO_ARRAY TSVECTOR_UPDATE_TRIGGER TSVECTOR_UPDATE_TRIGGER_COLUMN XMLCOMMENT XMLCONCAT XMLELEMENT XMLFOREST XMLPI XMLROOT XMLEXISTS XML_IS_WELL_FORMED XML_IS_WELL_FORMED_DOCUMENT XML_IS_WELL_FORMED_CONTENT XPATH XPATH_EXISTS XMLTABLE XMLNAMESPACES TABLE_TO_XML TABLE_TO_XMLSCHEMA TABLE_TO_XML_AND_XMLSCHEMA QUERY_TO_XML QUERY_TO_XMLSCHEMA QUERY_TO_XML_AND_XMLSCHEMA CURSOR_TO_XML CURSOR_TO_XMLSCHEMA SCHEMA_TO_XML SCHEMA_TO_XMLSCHEMA SCHEMA_TO_XML_AND_XMLSCHEMA DATABASE_TO_XML DATABASE_TO_XMLSCHEMA DATABASE_TO_XML_AND_XMLSCHEMA XMLATTRIBUTES TO_JSON TO_JSONB ARRAY_TO_JSON ROW_TO_JSON JSON_BUILD_ARRAY JSONB_BUILD_ARRAY JSON_BUILD_OBJECT JSONB_BUILD_OBJECT JSON_OBJECT JSONB_OBJECT JSON_ARRAY_LENGTH JSONB_ARRAY_LENGTH JSON_EACH JSONB_EACH JSON_EACH_TEXT JSONB_EACH_TEXT JSON_EXTRACT_PATH JSONB_EXTRACT_PATH JSON_OBJECT_KEYS JSONB_OBJECT_KEYS JSON_POPULATE_RECORD JSONB_POPULATE_RECORD JSON_POPULATE_RECORDSET JSONB_POPULATE_RECORDSET JSON_ARRAY_ELEMENTS JSONB_ARRAY_ELEMENTS JSON_ARRAY_ELEMENTS_TEXT JSONB_ARRAY_ELEMENTS_TEXT JSON_TYPEOF JSONB_TYPEOF JSON_TO_RECORD JSONB_TO_RECORD JSON_TO_RECORDSET JSONB_TO_RECORDSET JSON_STRIP_NULLS JSONB_STRIP_NULLS JSONB_SET JSONB_INSERT JSONB_PRETTY CURRVAL LASTVAL NEXTVAL SETVAL COALESCE NULLIF GREATEST LEAST ARRAY_APPEND ARRAY_CAT ARRAY_NDIMS ARRAY_DIMS ARRAY_FILL ARRAY_LENGTH ARRAY_LOWER ARRAY_POSITION ARRAY_POSITIONS ARRAY_PREPEND ARRAY_REMOVE ARRAY_REPLACE ARRAY_TO_STRING ARRAY_UPPER CARDINALITY STRING_TO_ARRAY UNNEST ISEMPTY LOWER_INC UPPER_INC LOWER_INF UPPER_INF RANGE_MERGE GENERATE_SERIES GENERATE_SUBSCRIPTS CURRENT_DATABASE CURRENT_QUERY CURRENT_SCHEMA|10 CURRENT_SCHEMAS|10 INET_CLIENT_ADDR INET_CLIENT_PORT INET_SERVER_ADDR INET_SERVER_PORT ROW_SECURITY_ACTIVE FORMAT_TYPE TO_REGCLASS TO_REGPROC TO_REGPROCEDURE TO_REGOPER TO_REGOPERATOR TO_REGTYPE TO_REGNAMESPACE TO_REGROLE COL_DESCRIPTION OBJ_DESCRIPTION SHOBJ_DESCRIPTION TXID_CURRENT TXID_CURRENT_IF_ASSIGNED TXID_CURRENT_SNAPSHOT TXID_SNAPSHOT_XIP TXID_SNAPSHOT_XMAX TXID_SNAPSHOT_XMIN TXID_VISIBLE_IN_SNAPSHOT TXID_STATUS CURRENT_SETTING SET_CONFIG BRIN_SUMMARIZE_NEW_VALUES BRIN_SUMMARIZE_RANGE BRIN_DESUMMARIZE_RANGE GIN_CLEAN_PENDING_LIST SUPPRESS_REDUNDANT_UPDATES_TRIGGER LO_FROM_BYTEA LO_PUT LO_GET LO_CREAT LO_CREATE LO_UNLINK LO_IMPORT LO_EXPORT LOREAD LOWRITE GROUPING CAST".split(" ").map((function(E){return E.split("|")[0]})).join("|");return{name:"PostgreSQL",aliases:["postgres","postgresql"],case_insensitive:!0,keywords:{keyword:"ABORT ALTER ANALYZE BEGIN CALL CHECKPOINT|10 CLOSE CLUSTER COMMENT COMMIT COPY CREATE DEALLOCATE DECLARE DELETE DISCARD DO DROP END EXECUTE EXPLAIN FETCH GRANT IMPORT INSERT LISTEN LOAD LOCK MOVE NOTIFY PREPARE REASSIGN|10 REFRESH REINDEX RELEASE RESET REVOKE ROLLBACK SAVEPOINT SECURITY SELECT SET SHOW START TRUNCATE UNLISTEN|10 UPDATE VACUUM|10 VALUES AGGREGATE COLLATION CONVERSION|10 DATABASE DEFAULT PRIVILEGES DOMAIN TRIGGER EXTENSION FOREIGN WRAPPER|10 TABLE FUNCTION GROUP LANGUAGE LARGE OBJECT MATERIALIZED VIEW OPERATOR CLASS FAMILY POLICY PUBLICATION|10 ROLE RULE SCHEMA SEQUENCE SERVER STATISTICS SUBSCRIPTION SYSTEM TABLESPACE CONFIGURATION DICTIONARY PARSER TEMPLATE TYPE USER MAPPING PREPARED ACCESS METHOD CAST AS TRANSFORM TRANSACTION OWNED TO INTO SESSION AUTHORIZATION INDEX PROCEDURE ASSERTION ALL ANALYSE AND ANY ARRAY ASC ASYMMETRIC|10 BOTH CASE CHECK COLLATE COLUMN CONCURRENTLY|10 CONSTRAINT CROSS DEFERRABLE RANGE DESC DISTINCT ELSE EXCEPT FOR FREEZE|10 FROM FULL HAVING ILIKE IN INITIALLY INNER INTERSECT IS ISNULL JOIN LATERAL LEADING LIKE LIMIT NATURAL NOT NOTNULL NULL OFFSET ON ONLY OR ORDER OUTER OVERLAPS PLACING PRIMARY REFERENCES RETURNING SIMILAR SOME SYMMETRIC TABLESAMPLE THEN TRAILING UNION UNIQUE USING VARIADIC|10 VERBOSE WHEN WHERE WINDOW WITH BY RETURNS INOUT OUT SETOF|10 IF STRICT CURRENT CONTINUE OWNER LOCATION OVER PARTITION WITHIN BETWEEN ESCAPE EXTERNAL INVOKER DEFINER WORK RENAME VERSION CONNECTION CONNECT TABLES TEMP TEMPORARY FUNCTIONS SEQUENCES TYPES SCHEMAS OPTION CASCADE RESTRICT ADD ADMIN EXISTS VALID VALIDATE ENABLE DISABLE REPLICA|10 ALWAYS PASSING COLUMNS PATH REF VALUE OVERRIDING IMMUTABLE STABLE VOLATILE BEFORE AFTER EACH ROW PROCEDURAL ROUTINE NO HANDLER VALIDATOR OPTIONS STORAGE OIDS|10 WITHOUT INHERIT DEPENDS CALLED INPUT LEAKPROOF|10 COST ROWS NOWAIT SEARCH UNTIL ENCRYPTED|10 PASSWORD CONFLICT|10 INSTEAD INHERITS CHARACTERISTICS WRITE CURSOR ALSO STATEMENT SHARE EXCLUSIVE INLINE ISOLATION REPEATABLE READ COMMITTED SERIALIZABLE UNCOMMITTED LOCAL GLOBAL SQL PROCEDURES RECURSIVE SNAPSHOT ROLLUP CUBE TRUSTED|10 INCLUDE FOLLOWING PRECEDING UNBOUNDED RANGE GROUPS UNENCRYPTED|10 SYSID FORMAT DELIMITER HEADER QUOTE ENCODING FILTER OFF FORCE_QUOTE FORCE_NOT_NULL FORCE_NULL COSTS BUFFERS TIMING SUMMARY DISABLE_PAGE_SKIPPING RESTART CYCLE GENERATED IDENTITY DEFERRED IMMEDIATE LEVEL LOGGED UNLOGGED OF NOTHING NONE EXCLUDE ATTRIBUTE USAGE ROUTINES TRUE FALSE NAN INFINITY ALIAS BEGIN CONSTANT DECLARE END EXCEPTION RETURN PERFORM|10 RAISE GET DIAGNOSTICS STACKED|10 FOREACH LOOP ELSIF EXIT WHILE REVERSE SLICE DEBUG LOG INFO NOTICE WARNING ASSERT OPEN SUPERUSER NOSUPERUSER CREATEDB NOCREATEDB CREATEROLE NOCREATEROLE INHERIT NOINHERIT LOGIN NOLOGIN REPLICATION NOREPLICATION BYPASSRLS NOBYPASSRLS ",built_in:"CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER CURRENT_CATALOG|10 CURRENT_DATE LOCALTIME LOCALTIMESTAMP CURRENT_ROLE|10 CURRENT_SCHEMA|10 SESSION_USER PUBLIC FOUND NEW OLD TG_NAME|10 TG_WHEN|10 TG_LEVEL|10 TG_OP|10 TG_RELID|10 TG_RELNAME|10 TG_TABLE_NAME|10 TG_TABLE_SCHEMA|10 TG_NARGS|10 TG_ARGV|10 TG_EVENT|10 TG_TAG|10 ROW_COUNT RESULT_OID|10 PG_CONTEXT|10 RETURNED_SQLSTATE COLUMN_NAME CONSTRAINT_NAME PG_DATATYPE_NAME|10 MESSAGE_TEXT TABLE_NAME SCHEMA_NAME PG_EXCEPTION_DETAIL|10 PG_EXCEPTION_HINT|10 PG_EXCEPTION_CONTEXT|10 SQLSTATE SQLERRM|10 SUCCESSFUL_COMPLETION WARNING DYNAMIC_RESULT_SETS_RETURNED IMPLICIT_ZERO_BIT_PADDING NULL_VALUE_ELIMINATED_IN_SET_FUNCTION PRIVILEGE_NOT_GRANTED PRIVILEGE_NOT_REVOKED STRING_DATA_RIGHT_TRUNCATION DEPRECATED_FEATURE NO_DATA NO_ADDITIONAL_DYNAMIC_RESULT_SETS_RETURNED SQL_STATEMENT_NOT_YET_COMPLETE CONNECTION_EXCEPTION CONNECTION_DOES_NOT_EXIST CONNECTION_FAILURE SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION SQLSERVER_REJECTED_ESTABLISHMENT_OF_SQLCONNECTION TRANSACTION_RESOLUTION_UNKNOWN PROTOCOL_VIOLATION TRIGGERED_ACTION_EXCEPTION FEATURE_NOT_SUPPORTED INVALID_TRANSACTION_INITIATION LOCATOR_EXCEPTION INVALID_LOCATOR_SPECIFICATION INVALID_GRANTOR INVALID_GRANT_OPERATION INVALID_ROLE_SPECIFICATION DIAGNOSTICS_EXCEPTION STACKED_DIAGNOSTICS_ACCESSED_WITHOUT_ACTIVE_HANDLER CASE_NOT_FOUND CARDINALITY_VIOLATION DATA_EXCEPTION ARRAY_SUBSCRIPT_ERROR CHARACTER_NOT_IN_REPERTOIRE DATETIME_FIELD_OVERFLOW DIVISION_BY_ZERO ERROR_IN_ASSIGNMENT ESCAPE_CHARACTER_CONFLICT INDICATOR_OVERFLOW INTERVAL_FIELD_OVERFLOW INVALID_ARGUMENT_FOR_LOGARITHM INVALID_ARGUMENT_FOR_NTILE_FUNCTION INVALID_ARGUMENT_FOR_NTH_VALUE_FUNCTION INVALID_ARGUMENT_FOR_POWER_FUNCTION INVALID_ARGUMENT_FOR_WIDTH_BUCKET_FUNCTION INVALID_CHARACTER_VALUE_FOR_CAST INVALID_DATETIME_FORMAT INVALID_ESCAPE_CHARACTER INVALID_ESCAPE_OCTET INVALID_ESCAPE_SEQUENCE NONSTANDARD_USE_OF_ESCAPE_CHARACTER INVALID_INDICATOR_PARAMETER_VALUE INVALID_PARAMETER_VALUE INVALID_REGULAR_EXPRESSION INVALID_ROW_COUNT_IN_LIMIT_CLAUSE INVALID_ROW_COUNT_IN_RESULT_OFFSET_CLAUSE INVALID_TABLESAMPLE_ARGUMENT INVALID_TABLESAMPLE_REPEAT INVALID_TIME_ZONE_DISPLACEMENT_VALUE INVALID_USE_OF_ESCAPE_CHARACTER MOST_SPECIFIC_TYPE_MISMATCH NULL_VALUE_NOT_ALLOWED NULL_VALUE_NO_INDICATOR_PARAMETER NUMERIC_VALUE_OUT_OF_RANGE SEQUENCE_GENERATOR_LIMIT_EXCEEDED STRING_DATA_LENGTH_MISMATCH STRING_DATA_RIGHT_TRUNCATION SUBSTRING_ERROR TRIM_ERROR UNTERMINATED_C_STRING ZERO_LENGTH_CHARACTER_STRING FLOATING_POINT_EXCEPTION INVALID_TEXT_REPRESENTATION INVALID_BINARY_REPRESENTATION BAD_COPY_FILE_FORMAT UNTRANSLATABLE_CHARACTER NOT_AN_XML_DOCUMENT INVALID_XML_DOCUMENT INVALID_XML_CONTENT INVALID_XML_COMMENT INVALID_XML_PROCESSING_INSTRUCTION INTEGRITY_CONSTRAINT_VIOLATION RESTRICT_VIOLATION NOT_NULL_VIOLATION FOREIGN_KEY_VIOLATION UNIQUE_VIOLATION CHECK_VIOLATION EXCLUSION_VIOLATION INVALID_CURSOR_STATE INVALID_TRANSACTION_STATE ACTIVE_SQL_TRANSACTION BRANCH_TRANSACTION_ALREADY_ACTIVE HELD_CURSOR_REQUIRES_SAME_ISOLATION_LEVEL INAPPROPRIATE_ACCESS_MODE_FOR_BRANCH_TRANSACTION INAPPROPRIATE_ISOLATION_LEVEL_FOR_BRANCH_TRANSACTION NO_ACTIVE_SQL_TRANSACTION_FOR_BRANCH_TRANSACTION READ_ONLY_SQL_TRANSACTION SCHEMA_AND_DATA_STATEMENT_MIXING_NOT_SUPPORTED NO_ACTIVE_SQL_TRANSACTION IN_FAILED_SQL_TRANSACTION IDLE_IN_TRANSACTION_SESSION_TIMEOUT INVALID_SQL_STATEMENT_NAME TRIGGERED_DATA_CHANGE_VIOLATION INVALID_AUTHORIZATION_SPECIFICATION INVALID_PASSWORD DEPENDENT_PRIVILEGE_DESCRIPTORS_STILL_EXIST DEPENDENT_OBJECTS_STILL_EXIST INVALID_TRANSACTION_TERMINATION SQL_ROUTINE_EXCEPTION FUNCTION_EXECUTED_NO_RETURN_STATEMENT MODIFYING_SQL_DATA_NOT_PERMITTED PROHIBITED_SQL_STATEMENT_ATTEMPTED READING_SQL_DATA_NOT_PERMITTED INVALID_CURSOR_NAME EXTERNAL_ROUTINE_EXCEPTION CONTAINING_SQL_NOT_PERMITTED MODIFYING_SQL_DATA_NOT_PERMITTED PROHIBITED_SQL_STATEMENT_ATTEMPTED READING_SQL_DATA_NOT_PERMITTED EXTERNAL_ROUTINE_INVOCATION_EXCEPTION INVALID_SQLSTATE_RETURNED NULL_VALUE_NOT_ALLOWED TRIGGER_PROTOCOL_VIOLATED SRF_PROTOCOL_VIOLATED EVENT_TRIGGER_PROTOCOL_VIOLATED SAVEPOINT_EXCEPTION INVALID_SAVEPOINT_SPECIFICATION INVALID_CATALOG_NAME INVALID_SCHEMA_NAME TRANSACTION_ROLLBACK TRANSACTION_INTEGRITY_CONSTRAINT_VIOLATION SERIALIZATION_FAILURE STATEMENT_COMPLETION_UNKNOWN DEADLOCK_DETECTED SYNTAX_ERROR_OR_ACCESS_RULE_VIOLATION SYNTAX_ERROR INSUFFICIENT_PRIVILEGE CANNOT_COERCE GROUPING_ERROR WINDOWING_ERROR INVALID_RECURSION INVALID_FOREIGN_KEY INVALID_NAME NAME_TOO_LONG RESERVED_NAME DATATYPE_MISMATCH INDETERMINATE_DATATYPE COLLATION_MISMATCH INDETERMINATE_COLLATION WRONG_OBJECT_TYPE GENERATED_ALWAYS UNDEFINED_COLUMN UNDEFINED_FUNCTION UNDEFINED_TABLE UNDEFINED_PARAMETER UNDEFINED_OBJECT DUPLICATE_COLUMN DUPLICATE_CURSOR DUPLICATE_DATABASE DUPLICATE_FUNCTION DUPLICATE_PREPARED_STATEMENT DUPLICATE_SCHEMA DUPLICATE_TABLE DUPLICATE_ALIAS DUPLICATE_OBJECT AMBIGUOUS_COLUMN AMBIGUOUS_FUNCTION AMBIGUOUS_PARAMETER AMBIGUOUS_ALIAS INVALID_COLUMN_REFERENCE INVALID_COLUMN_DEFINITION INVALID_CURSOR_DEFINITION INVALID_DATABASE_DEFINITION INVALID_FUNCTION_DEFINITION INVALID_PREPARED_STATEMENT_DEFINITION INVALID_SCHEMA_DEFINITION INVALID_TABLE_DEFINITION INVALID_OBJECT_DEFINITION WITH_CHECK_OPTION_VIOLATION INSUFFICIENT_RESOURCES DISK_FULL OUT_OF_MEMORY TOO_MANY_CONNECTIONS CONFIGURATION_LIMIT_EXCEEDED PROGRAM_LIMIT_EXCEEDED STATEMENT_TOO_COMPLEX TOO_MANY_COLUMNS TOO_MANY_ARGUMENTS OBJECT_NOT_IN_PREREQUISITE_STATE OBJECT_IN_USE CANT_CHANGE_RUNTIME_PARAM LOCK_NOT_AVAILABLE OPERATOR_INTERVENTION QUERY_CANCELED ADMIN_SHUTDOWN CRASH_SHUTDOWN CANNOT_CONNECT_NOW DATABASE_DROPPED SYSTEM_ERROR IO_ERROR UNDEFINED_FILE DUPLICATE_FILE SNAPSHOT_TOO_OLD CONFIG_FILE_ERROR LOCK_FILE_EXISTS FDW_ERROR FDW_COLUMN_NAME_NOT_FOUND FDW_DYNAMIC_PARAMETER_VALUE_NEEDED FDW_FUNCTION_SEQUENCE_ERROR FDW_INCONSISTENT_DESCRIPTOR_INFORMATION FDW_INVALID_ATTRIBUTE_VALUE FDW_INVALID_COLUMN_NAME FDW_INVALID_COLUMN_NUMBER FDW_INVALID_DATA_TYPE FDW_INVALID_DATA_TYPE_DESCRIPTORS FDW_INVALID_DESCRIPTOR_FIELD_IDENTIFIER FDW_INVALID_HANDLE FDW_INVALID_OPTION_INDEX FDW_INVALID_OPTION_NAME FDW_INVALID_STRING_LENGTH_OR_BUFFER_LENGTH FDW_INVALID_STRING_FORMAT FDW_INVALID_USE_OF_NULL_POINTER FDW_TOO_MANY_HANDLES FDW_OUT_OF_MEMORY FDW_NO_SCHEMAS FDW_OPTION_NAME_NOT_FOUND FDW_REPLY_HANDLE FDW_SCHEMA_NOT_FOUND FDW_TABLE_NOT_FOUND FDW_UNABLE_TO_CREATE_EXECUTION FDW_UNABLE_TO_CREATE_REPLY FDW_UNABLE_TO_ESTABLISH_CONNECTION PLPGSQL_ERROR RAISE_EXCEPTION NO_DATA_FOUND TOO_MANY_ROWS ASSERT_FAILURE INTERNAL_ERROR DATA_CORRUPTED INDEX_CORRUPTED "},illegal:/:==|\W\s*\(\*|(^|\s)\$[a-z]|{{|[a-z]:\s*$|\.\.\.|TO:|DO:/,contains:[{className:"keyword",variants:[{begin:/\bTEXT\s*SEARCH\b/},{begin:/\b(PRIMARY|FOREIGN|FOR(\s+NO)?)\s+KEY\b/},{begin:/\bPARALLEL\s+(UNSAFE|RESTRICTED|SAFE)\b/},{begin:/\bSTORAGE\s+(PLAIN|EXTERNAL|EXTENDED|MAIN)\b/},{begin:/\bMATCH\s+(FULL|PARTIAL|SIMPLE)\b/},{begin:/\bNULLS\s+(FIRST|LAST)\b/},{begin:/\bEVENT\s+TRIGGER\b/},{begin:/\b(MAPPING|OR)\s+REPLACE\b/},{begin:/\b(FROM|TO)\s+(PROGRAM|STDIN|STDOUT)\b/},{begin:/\b(SHARE|EXCLUSIVE)\s+MODE\b/},{begin:/\b(LEFT|RIGHT)\s+(OUTER\s+)?JOIN\b/},{begin:/\b(FETCH|MOVE)\s+(NEXT|PRIOR|FIRST|LAST|ABSOLUTE|RELATIVE|FORWARD|BACKWARD)\b/},{begin:/\bPRESERVE\s+ROWS\b/},{begin:/\bDISCARD\s+PLANS\b/},{begin:/\bREFERENCING\s+(OLD|NEW)\b/},{begin:/\bSKIP\s+LOCKED\b/},{begin:/\bGROUPING\s+SETS\b/},{begin:/\b(BINARY|INSENSITIVE|SCROLL|NO\s+SCROLL)\s+(CURSOR|FOR)\b/},{begin:/\b(WITH|WITHOUT)\s+HOLD\b/},{begin:/\bWITH\s+(CASCADED|LOCAL)\s+CHECK\s+OPTION\b/},{begin:/\bEXCLUDE\s+(TIES|NO\s+OTHERS)\b/},{begin:/\bFORMAT\s+(TEXT|XML|JSON|YAML)\b/},{begin:/\bSET\s+((SESSION|LOCAL)\s+)?NAMES\b/},{begin:/\bIS\s+(NOT\s+)?UNKNOWN\b/},{begin:/\bSECURITY\s+LABEL\b/},{begin:/\bSTANDALONE\s+(YES|NO|NO\s+VALUE)\b/},{begin:/\bWITH\s+(NO\s+)?DATA\b/},{begin:/\b(FOREIGN|SET)\s+DATA\b/},{begin:/\bSET\s+(CATALOG|CONSTRAINTS)\b/},{begin:/\b(WITH|FOR)\s+ORDINALITY\b/},{begin:/\bIS\s+(NOT\s+)?DOCUMENT\b/},{begin:/\bXML\s+OPTION\s+(DOCUMENT|CONTENT)\b/},{begin:/\b(STRIP|PRESERVE)\s+WHITESPACE\b/},{begin:/\bNO\s+(ACTION|MAXVALUE|MINVALUE)\b/},{begin:/\bPARTITION\s+BY\s+(RANGE|LIST|HASH)\b/},{begin:/\bAT\s+TIME\s+ZONE\b/},{begin:/\bGRANTED\s+BY\b/},{begin:/\bRETURN\s+(QUERY|NEXT)\b/},{begin:/\b(ATTACH|DETACH)\s+PARTITION\b/},{begin:/\bFORCE\s+ROW\s+LEVEL\s+SECURITY\b/},{begin:/\b(INCLUDING|EXCLUDING)\s+(COMMENTS|CONSTRAINTS|DEFAULTS|IDENTITY|INDEXES|STATISTICS|STORAGE|ALL)\b/},{begin:/\bAS\s+(ASSIGNMENT|IMPLICIT|PERMISSIVE|RESTRICTIVE|ENUM|RANGE)\b/}]},{begin:/\b(FORMAT|FAMILY|VERSION)\s*\(/},{begin:/\bINCLUDE\s*\(/,keywords:"INCLUDE"},{begin:/\bRANGE(?!\s*(BETWEEN|UNBOUNDED|CURRENT|[-0-9]+))/},{begin:/\b(VERSION|OWNER|TEMPLATE|TABLESPACE|CONNECTION\s+LIMIT|PROCEDURE|RESTRICT|JOIN|PARSER|COPY|START|END|COLLATION|INPUT|ANALYZE|STORAGE|LIKE|DEFAULT|DELIMITER|ENCODING|COLUMN|CONSTRAINT|TABLE|SCHEMA)\s*=/},{begin:/\b(PG_\w+?|HAS_[A-Z_]+_PRIVILEGE)\b/,relevance:10},{begin:/\bEXTRACT\s*\(/,end:/\bFROM\b/,returnEnd:!0,keywords:{type:"CENTURY DAY DECADE DOW DOY EPOCH HOUR ISODOW ISOYEAR MICROSECONDS MILLENNIUM MILLISECONDS MINUTE MONTH QUARTER SECOND TIMEZONE TIMEZONE_HOUR TIMEZONE_MINUTE WEEK YEAR"}},{begin:/\b(XMLELEMENT|XMLPI)\s*\(\s*NAME/,keywords:{keyword:"NAME"}},{begin:/\b(XMLPARSE|XMLSERIALIZE)\s*\(\s*(DOCUMENT|CONTENT)/,keywords:{keyword:"DOCUMENT CONTENT"}},{beginKeywords:"CACHE INCREMENT MAXVALUE MINVALUE",end:E.C_NUMBER_RE,returnEnd:!0,keywords:"BY CACHE INCREMENT MAXVALUE MINVALUE"},{className:"type",begin:/\b(WITH|WITHOUT)\s+TIME\s+ZONE\b/},{className:"type",begin:/\bINTERVAL\s+(YEAR|MONTH|DAY|HOUR|MINUTE|SECOND)(\s+TO\s+(MONTH|HOUR|MINUTE|SECOND))?\b/},{begin:/\bRETURNS\s+(LANGUAGE_HANDLER|TRIGGER|EVENT_TRIGGER|FDW_HANDLER|INDEX_AM_HANDLER|TSM_HANDLER)\b/,keywords:{keyword:"RETURNS",type:"LANGUAGE_HANDLER TRIGGER EVENT_TRIGGER FDW_HANDLER INDEX_AM_HANDLER TSM_HANDLER"}},{begin:"\\b("+R+")\\s*\\("},{begin:"\\.("+A+")\\b"},{begin:"\\b("+A+")\\s+PATH\\b",keywords:{keyword:"PATH",type:N.replace("PATH ","")}},{className:"type",begin:"\\b("+A+")\\b"},{className:"string",begin:"'",end:"'",contains:[{begin:"''"}]},{className:"string",begin:"(e|E|u&|U&)'",end:"'",contains:[{begin:"\\\\."}],relevance:10},E.END_SAME_AS_BEGIN({begin:"\\$([a-zA-Z_]?|[a-zA-Z_][a-zA-Z_0-9]*)\\$",end:"\\$([a-zA-Z_]?|[a-zA-Z_][a-zA-Z_0-9]*)\\$",contains:[{subLanguage:["pgsql","perl","python","tcl","r","lua","java","php","ruby","bash","scheme","xml","json"],endsWithParent:!0}]}),{begin:'"',end:'"',contains:[{begin:'""'}]},E.C_NUMBER_MODE,E.C_BLOCK_COMMENT_MODE,T,{className:"meta",variants:[{begin:"%(ROW)?TYPE",relevance:10},{begin:"\\$\\d+"},{begin:"^#\\w",end:"$"}]},{className:"symbol",begin:"<<\\s*[a-zA-Z_][a-zA-Z_0-9$]*\\s*>>",relevance:10}]}}}());
\ No newline at end of file
+hljs.registerLanguage("pgsql",function(E){var T=E.C("--","$"),N="BIGINT INT8 BIGSERIAL SERIAL8 BIT VARYING VARBIT BOOLEAN BOOL BOX BYTEA CHARACTER CHAR VARCHAR CIDR CIRCLE DATE DOUBLE PRECISION FLOAT8 FLOAT INET INTEGER INT INT4 INTERVAL JSON JSONB LINE LSEG|10 MACADDR MACADDR8 MONEY NUMERIC DEC DECIMAL PATH POINT POLYGON REAL FLOAT4 SMALLINT INT2 SMALLSERIAL|10 SERIAL2|10 SERIAL|10 SERIAL4|10 TEXT TIME ZONE TIMETZ|10 TIMESTAMP TIMESTAMPTZ|10 TSQUERY|10 TSVECTOR|10 TXID_SNAPSHOT|10 UUID XML NATIONAL NCHAR INT4RANGE|10 INT8RANGE|10 NUMRANGE|10 TSRANGE|10 TSTZRANGE|10 DATERANGE|10 ANYELEMENT ANYARRAY ANYNONARRAY ANYENUM ANYRANGE CSTRING INTERNAL RECORD PG_DDL_COMMAND VOID UNKNOWN OPAQUE REFCURSOR NAME OID REGPROC|10 REGPROCEDURE|10 REGOPER|10 REGOPERATOR|10 REGCLASS|10 REGTYPE|10 REGROLE|10 REGNAMESPACE|10 REGCONFIG|10 REGDICTIONARY|10 ",A=N.trim().split(" ").map(function(E){return E.split("|")[0]}).join("|"),R="ARRAY_AGG AVG BIT_AND BIT_OR BOOL_AND BOOL_OR COUNT EVERY JSON_AGG JSONB_AGG JSON_OBJECT_AGG JSONB_OBJECT_AGG MAX MIN MODE STRING_AGG SUM XMLAGG CORR COVAR_POP COVAR_SAMP REGR_AVGX REGR_AVGY REGR_COUNT REGR_INTERCEPT REGR_R2 REGR_SLOPE REGR_SXX REGR_SXY REGR_SYY STDDEV STDDEV_POP STDDEV_SAMP VARIANCE VAR_POP VAR_SAMP PERCENTILE_CONT PERCENTILE_DISC ROW_NUMBER RANK DENSE_RANK PERCENT_RANK CUME_DIST NTILE LAG LEAD FIRST_VALUE LAST_VALUE NTH_VALUE NUM_NONNULLS NUM_NULLS ABS CBRT CEIL CEILING DEGREES DIV EXP FLOOR LN LOG MOD PI POWER RADIANS ROUND SCALE SIGN SQRT TRUNC WIDTH_BUCKET RANDOM SETSEED ACOS ACOSD ASIN ASIND ATAN ATAND ATAN2 ATAN2D COS COSD COT COTD SIN SIND TAN TAND BIT_LENGTH CHAR_LENGTH CHARACTER_LENGTH LOWER OCTET_LENGTH OVERLAY POSITION SUBSTRING TREAT TRIM UPPER ASCII BTRIM CHR CONCAT CONCAT_WS CONVERT CONVERT_FROM CONVERT_TO DECODE ENCODE INITCAPLEFT LENGTH LPAD LTRIM MD5 PARSE_IDENT PG_CLIENT_ENCODING QUOTE_IDENT|10 QUOTE_LITERAL|10 QUOTE_NULLABLE|10 REGEXP_MATCH REGEXP_MATCHES REGEXP_REPLACE REGEXP_SPLIT_TO_ARRAY REGEXP_SPLIT_TO_TABLE REPEAT REPLACE REVERSE RIGHT RPAD RTRIM SPLIT_PART STRPOS SUBSTR TO_ASCII TO_HEX TRANSLATE OCTET_LENGTH GET_BIT GET_BYTE SET_BIT SET_BYTE TO_CHAR TO_DATE TO_NUMBER TO_TIMESTAMP AGE CLOCK_TIMESTAMP|10 DATE_PART DATE_TRUNC ISFINITE JUSTIFY_DAYS JUSTIFY_HOURS JUSTIFY_INTERVAL MAKE_DATE MAKE_INTERVAL|10 MAKE_TIME MAKE_TIMESTAMP|10 MAKE_TIMESTAMPTZ|10 NOW STATEMENT_TIMESTAMP|10 TIMEOFDAY TRANSACTION_TIMESTAMP|10 ENUM_FIRST ENUM_LAST ENUM_RANGE AREA CENTER DIAMETER HEIGHT ISCLOSED ISOPEN NPOINTS PCLOSE POPEN RADIUS WIDTH BOX BOUND_BOX CIRCLE LINE LSEG PATH POLYGON ABBREV BROADCAST HOST HOSTMASK MASKLEN NETMASK NETWORK SET_MASKLEN TEXT INET_SAME_FAMILYINET_MERGE MACADDR8_SET7BIT ARRAY_TO_TSVECTOR GET_CURRENT_TS_CONFIG NUMNODE PLAINTO_TSQUERY PHRASETO_TSQUERY WEBSEARCH_TO_TSQUERY QUERYTREE SETWEIGHT STRIP TO_TSQUERY TO_TSVECTOR JSON_TO_TSVECTOR JSONB_TO_TSVECTOR TS_DELETE TS_FILTER TS_HEADLINE TS_RANK TS_RANK_CD TS_REWRITE TSQUERY_PHRASE TSVECTOR_TO_ARRAY TSVECTOR_UPDATE_TRIGGER TSVECTOR_UPDATE_TRIGGER_COLUMN XMLCOMMENT XMLCONCAT XMLELEMENT XMLFOREST XMLPI XMLROOT XMLEXISTS XML_IS_WELL_FORMED XML_IS_WELL_FORMED_DOCUMENT XML_IS_WELL_FORMED_CONTENT XPATH XPATH_EXISTS XMLTABLE XMLNAMESPACES TABLE_TO_XML TABLE_TO_XMLSCHEMA TABLE_TO_XML_AND_XMLSCHEMA QUERY_TO_XML QUERY_TO_XMLSCHEMA QUERY_TO_XML_AND_XMLSCHEMA CURSOR_TO_XML CURSOR_TO_XMLSCHEMA SCHEMA_TO_XML SCHEMA_TO_XMLSCHEMA SCHEMA_TO_XML_AND_XMLSCHEMA DATABASE_TO_XML DATABASE_TO_XMLSCHEMA DATABASE_TO_XML_AND_XMLSCHEMA XMLATTRIBUTES TO_JSON TO_JSONB ARRAY_TO_JSON ROW_TO_JSON JSON_BUILD_ARRAY JSONB_BUILD_ARRAY JSON_BUILD_OBJECT JSONB_BUILD_OBJECT JSON_OBJECT JSONB_OBJECT JSON_ARRAY_LENGTH JSONB_ARRAY_LENGTH JSON_EACH JSONB_EACH JSON_EACH_TEXT JSONB_EACH_TEXT JSON_EXTRACT_PATH JSONB_EXTRACT_PATH JSON_OBJECT_KEYS JSONB_OBJECT_KEYS JSON_POPULATE_RECORD JSONB_POPULATE_RECORD JSON_POPULATE_RECORDSET JSONB_POPULATE_RECORDSET JSON_ARRAY_ELEMENTS JSONB_ARRAY_ELEMENTS JSON_ARRAY_ELEMENTS_TEXT JSONB_ARRAY_ELEMENTS_TEXT JSON_TYPEOF JSONB_TYPEOF JSON_TO_RECORD JSONB_TO_RECORD JSON_TO_RECORDSET JSONB_TO_RECORDSET JSON_STRIP_NULLS JSONB_STRIP_NULLS JSONB_SET JSONB_INSERT JSONB_PRETTY CURRVAL LASTVAL NEXTVAL SETVAL COALESCE NULLIF GREATEST LEAST ARRAY_APPEND ARRAY_CAT ARRAY_NDIMS ARRAY_DIMS ARRAY_FILL ARRAY_LENGTH ARRAY_LOWER ARRAY_POSITION ARRAY_POSITIONS ARRAY_PREPEND ARRAY_REMOVE ARRAY_REPLACE ARRAY_TO_STRING ARRAY_UPPER CARDINALITY STRING_TO_ARRAY UNNEST ISEMPTY LOWER_INC UPPER_INC LOWER_INF UPPER_INF RANGE_MERGE GENERATE_SERIES GENERATE_SUBSCRIPTS CURRENT_DATABASE CURRENT_QUERY CURRENT_SCHEMA|10 CURRENT_SCHEMAS|10 INET_CLIENT_ADDR INET_CLIENT_PORT INET_SERVER_ADDR INET_SERVER_PORT ROW_SECURITY_ACTIVE FORMAT_TYPE TO_REGCLASS TO_REGPROC TO_REGPROCEDURE TO_REGOPER TO_REGOPERATOR TO_REGTYPE TO_REGNAMESPACE TO_REGROLE COL_DESCRIPTION OBJ_DESCRIPTION SHOBJ_DESCRIPTION TXID_CURRENT TXID_CURRENT_IF_ASSIGNED TXID_CURRENT_SNAPSHOT TXID_SNAPSHOT_XIP TXID_SNAPSHOT_XMAX TXID_SNAPSHOT_XMIN TXID_VISIBLE_IN_SNAPSHOT TXID_STATUS CURRENT_SETTING SET_CONFIG BRIN_SUMMARIZE_NEW_VALUES BRIN_SUMMARIZE_RANGE BRIN_DESUMMARIZE_RANGE GIN_CLEAN_PENDING_LIST SUPPRESS_REDUNDANT_UPDATES_TRIGGER LO_FROM_BYTEA LO_PUT LO_GET LO_CREAT LO_CREATE LO_UNLINK LO_IMPORT LO_EXPORT LOREAD LOWRITE GROUPING CAST ".trim().split(" ").map(function(E){return E.split("|")[0]}).join("|");return{aliases:["postgres","postgresql"],cI:!0,k:{keyword:"ABORT ALTER ANALYZE BEGIN CALL CHECKPOINT|10 CLOSE CLUSTER COMMENT COMMIT COPY CREATE DEALLOCATE DECLARE DELETE DISCARD DO DROP END EXECUTE EXPLAIN FETCH GRANT IMPORT INSERT LISTEN LOAD LOCK MOVE NOTIFY PREPARE REASSIGN|10 REFRESH REINDEX RELEASE RESET REVOKE ROLLBACK SAVEPOINT SECURITY SELECT SET SHOW START TRUNCATE UNLISTEN|10 UPDATE VACUUM|10 VALUES AGGREGATE COLLATION CONVERSION|10 DATABASE DEFAULT PRIVILEGES DOMAIN TRIGGER EXTENSION FOREIGN WRAPPER|10 TABLE FUNCTION GROUP LANGUAGE LARGE OBJECT MATERIALIZED VIEW OPERATOR CLASS FAMILY POLICY PUBLICATION|10 ROLE RULE SCHEMA SEQUENCE SERVER STATISTICS SUBSCRIPTION SYSTEM TABLESPACE CONFIGURATION DICTIONARY PARSER TEMPLATE TYPE USER MAPPING PREPARED ACCESS METHOD CAST AS TRANSFORM TRANSACTION OWNED TO INTO SESSION AUTHORIZATION INDEX PROCEDURE ASSERTION ALL ANALYSE AND ANY ARRAY ASC ASYMMETRIC|10 BOTH CASE CHECK COLLATE COLUMN CONCURRENTLY|10 CONSTRAINT CROSS DEFERRABLE RANGE DESC DISTINCT ELSE EXCEPT FOR FREEZE|10 FROM FULL HAVING ILIKE IN INITIALLY INNER INTERSECT IS ISNULL JOIN LATERAL LEADING LIKE LIMIT NATURAL NOT NOTNULL NULL OFFSET ON ONLY OR ORDER OUTER OVERLAPS PLACING PRIMARY REFERENCES RETURNING SIMILAR SOME SYMMETRIC TABLESAMPLE THEN TRAILING UNION UNIQUE USING VARIADIC|10 VERBOSE WHEN WHERE WINDOW WITH BY RETURNS INOUT OUT SETOF|10 IF STRICT CURRENT CONTINUE OWNER LOCATION OVER PARTITION WITHIN BETWEEN ESCAPE EXTERNAL INVOKER DEFINER WORK RENAME VERSION CONNECTION CONNECT TABLES TEMP TEMPORARY FUNCTIONS SEQUENCES TYPES SCHEMAS OPTION CASCADE RESTRICT ADD ADMIN EXISTS VALID VALIDATE ENABLE DISABLE REPLICA|10 ALWAYS PASSING COLUMNS PATH REF VALUE OVERRIDING IMMUTABLE STABLE VOLATILE BEFORE AFTER EACH ROW PROCEDURAL ROUTINE NO HANDLER VALIDATOR OPTIONS STORAGE OIDS|10 WITHOUT INHERIT DEPENDS CALLED INPUT LEAKPROOF|10 COST ROWS NOWAIT SEARCH UNTIL ENCRYPTED|10 PASSWORD CONFLICT|10 INSTEAD INHERITS CHARACTERISTICS WRITE CURSOR ALSO STATEMENT SHARE EXCLUSIVE INLINE ISOLATION REPEATABLE READ COMMITTED SERIALIZABLE UNCOMMITTED LOCAL GLOBAL SQL PROCEDURES RECURSIVE SNAPSHOT ROLLUP CUBE TRUSTED|10 INCLUDE FOLLOWING PRECEDING UNBOUNDED RANGE GROUPS UNENCRYPTED|10 SYSID FORMAT DELIMITER HEADER QUOTE ENCODING FILTER OFF FORCE_QUOTE FORCE_NOT_NULL FORCE_NULL COSTS BUFFERS TIMING SUMMARY DISABLE_PAGE_SKIPPING RESTART CYCLE GENERATED IDENTITY DEFERRED IMMEDIATE LEVEL LOGGED UNLOGGED OF NOTHING NONE EXCLUDE ATTRIBUTE USAGE ROUTINES TRUE FALSE NAN INFINITY ALIAS BEGIN CONSTANT DECLARE END EXCEPTION RETURN PERFORM|10 RAISE GET DIAGNOSTICS STACKED|10 FOREACH LOOP ELSIF EXIT WHILE REVERSE SLICE DEBUG LOG INFO NOTICE WARNING ASSERT OPEN SUPERUSER NOSUPERUSER CREATEDB NOCREATEDB CREATEROLE NOCREATEROLE INHERIT NOINHERIT LOGIN NOLOGIN REPLICATION NOREPLICATION BYPASSRLS NOBYPASSRLS ",built_in:"CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER CURRENT_CATALOG|10 CURRENT_DATE LOCALTIME LOCALTIMESTAMP CURRENT_ROLE|10 CURRENT_SCHEMA|10 SESSION_USER PUBLIC FOUND NEW OLD TG_NAME|10 TG_WHEN|10 TG_LEVEL|10 TG_OP|10 TG_RELID|10 TG_RELNAME|10 TG_TABLE_NAME|10 TG_TABLE_SCHEMA|10 TG_NARGS|10 TG_ARGV|10 TG_EVENT|10 TG_TAG|10 ROW_COUNT RESULT_OID|10 PG_CONTEXT|10 RETURNED_SQLSTATE COLUMN_NAME CONSTRAINT_NAME PG_DATATYPE_NAME|10 MESSAGE_TEXT TABLE_NAME SCHEMA_NAME PG_EXCEPTION_DETAIL|10 PG_EXCEPTION_HINT|10 PG_EXCEPTION_CONTEXT|10 SQLSTATE SQLERRM|10 SUCCESSFUL_COMPLETION WARNING DYNAMIC_RESULT_SETS_RETURNED IMPLICIT_ZERO_BIT_PADDING NULL_VALUE_ELIMINATED_IN_SET_FUNCTION PRIVILEGE_NOT_GRANTED PRIVILEGE_NOT_REVOKED STRING_DATA_RIGHT_TRUNCATION DEPRECATED_FEATURE NO_DATA NO_ADDITIONAL_DYNAMIC_RESULT_SETS_RETURNED SQL_STATEMENT_NOT_YET_COMPLETE CONNECTION_EXCEPTION CONNECTION_DOES_NOT_EXIST CONNECTION_FAILURE SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION SQLSERVER_REJECTED_ESTABLISHMENT_OF_SQLCONNECTION TRANSACTION_RESOLUTION_UNKNOWN PROTOCOL_VIOLATION TRIGGERED_ACTION_EXCEPTION FEATURE_NOT_SUPPORTED INVALID_TRANSACTION_INITIATION LOCATOR_EXCEPTION INVALID_LOCATOR_SPECIFICATION INVALID_GRANTOR INVALID_GRANT_OPERATION INVALID_ROLE_SPECIFICATION DIAGNOSTICS_EXCEPTION STACKED_DIAGNOSTICS_ACCESSED_WITHOUT_ACTIVE_HANDLER CASE_NOT_FOUND CARDINALITY_VIOLATION DATA_EXCEPTION ARRAY_SUBSCRIPT_ERROR CHARACTER_NOT_IN_REPERTOIRE DATETIME_FIELD_OVERFLOW DIVISION_BY_ZERO ERROR_IN_ASSIGNMENT ESCAPE_CHARACTER_CONFLICT INDICATOR_OVERFLOW INTERVAL_FIELD_OVERFLOW INVALID_ARGUMENT_FOR_LOGARITHM INVALID_ARGUMENT_FOR_NTILE_FUNCTION INVALID_ARGUMENT_FOR_NTH_VALUE_FUNCTION INVALID_ARGUMENT_FOR_POWER_FUNCTION INVALID_ARGUMENT_FOR_WIDTH_BUCKET_FUNCTION INVALID_CHARACTER_VALUE_FOR_CAST INVALID_DATETIME_FORMAT INVALID_ESCAPE_CHARACTER INVALID_ESCAPE_OCTET INVALID_ESCAPE_SEQUENCE NONSTANDARD_USE_OF_ESCAPE_CHARACTER INVALID_INDICATOR_PARAMETER_VALUE INVALID_PARAMETER_VALUE INVALID_REGULAR_EXPRESSION INVALID_ROW_COUNT_IN_LIMIT_CLAUSE INVALID_ROW_COUNT_IN_RESULT_OFFSET_CLAUSE INVALID_TABLESAMPLE_ARGUMENT INVALID_TABLESAMPLE_REPEAT INVALID_TIME_ZONE_DISPLACEMENT_VALUE INVALID_USE_OF_ESCAPE_CHARACTER MOST_SPECIFIC_TYPE_MISMATCH NULL_VALUE_NOT_ALLOWED NULL_VALUE_NO_INDICATOR_PARAMETER NUMERIC_VALUE_OUT_OF_RANGE SEQUENCE_GENERATOR_LIMIT_EXCEEDED STRING_DATA_LENGTH_MISMATCH STRING_DATA_RIGHT_TRUNCATION SUBSTRING_ERROR TRIM_ERROR UNTERMINATED_C_STRING ZERO_LENGTH_CHARACTER_STRING FLOATING_POINT_EXCEPTION INVALID_TEXT_REPRESENTATION INVALID_BINARY_REPRESENTATION BAD_COPY_FILE_FORMAT UNTRANSLATABLE_CHARACTER NOT_AN_XML_DOCUMENT INVALID_XML_DOCUMENT INVALID_XML_CONTENT INVALID_XML_COMMENT INVALID_XML_PROCESSING_INSTRUCTION INTEGRITY_CONSTRAINT_VIOLATION RESTRICT_VIOLATION NOT_NULL_VIOLATION FOREIGN_KEY_VIOLATION UNIQUE_VIOLATION CHECK_VIOLATION EXCLUSION_VIOLATION INVALID_CURSOR_STATE INVALID_TRANSACTION_STATE ACTIVE_SQL_TRANSACTION BRANCH_TRANSACTION_ALREADY_ACTIVE HELD_CURSOR_REQUIRES_SAME_ISOLATION_LEVEL INAPPROPRIATE_ACCESS_MODE_FOR_BRANCH_TRANSACTION INAPPROPRIATE_ISOLATION_LEVEL_FOR_BRANCH_TRANSACTION NO_ACTIVE_SQL_TRANSACTION_FOR_BRANCH_TRANSACTION READ_ONLY_SQL_TRANSACTION SCHEMA_AND_DATA_STATEMENT_MIXING_NOT_SUPPORTED NO_ACTIVE_SQL_TRANSACTION IN_FAILED_SQL_TRANSACTION IDLE_IN_TRANSACTION_SESSION_TIMEOUT INVALID_SQL_STATEMENT_NAME TRIGGERED_DATA_CHANGE_VIOLATION INVALID_AUTHORIZATION_SPECIFICATION INVALID_PASSWORD DEPENDENT_PRIVILEGE_DESCRIPTORS_STILL_EXIST DEPENDENT_OBJECTS_STILL_EXIST INVALID_TRANSACTION_TERMINATION SQL_ROUTINE_EXCEPTION FUNCTION_EXECUTED_NO_RETURN_STATEMENT MODIFYING_SQL_DATA_NOT_PERMITTED PROHIBITED_SQL_STATEMENT_ATTEMPTED READING_SQL_DATA_NOT_PERMITTED INVALID_CURSOR_NAME EXTERNAL_ROUTINE_EXCEPTION CONTAINING_SQL_NOT_PERMITTED MODIFYING_SQL_DATA_NOT_PERMITTED PROHIBITED_SQL_STATEMENT_ATTEMPTED READING_SQL_DATA_NOT_PERMITTED EXTERNAL_ROUTINE_INVOCATION_EXCEPTION INVALID_SQLSTATE_RETURNED NULL_VALUE_NOT_ALLOWED TRIGGER_PROTOCOL_VIOLATED SRF_PROTOCOL_VIOLATED EVENT_TRIGGER_PROTOCOL_VIOLATED SAVEPOINT_EXCEPTION INVALID_SAVEPOINT_SPECIFICATION INVALID_CATALOG_NAME INVALID_SCHEMA_NAME TRANSACTION_ROLLBACK TRANSACTION_INTEGRITY_CONSTRAINT_VIOLATION SERIALIZATION_FAILURE STATEMENT_COMPLETION_UNKNOWN DEADLOCK_DETECTED SYNTAX_ERROR_OR_ACCESS_RULE_VIOLATION SYNTAX_ERROR INSUFFICIENT_PRIVILEGE CANNOT_COERCE GROUPING_ERROR WINDOWING_ERROR INVALID_RECURSION INVALID_FOREIGN_KEY INVALID_NAME NAME_TOO_LONG RESERVED_NAME DATATYPE_MISMATCH INDETERMINATE_DATATYPE COLLATION_MISMATCH INDETERMINATE_COLLATION WRONG_OBJECT_TYPE GENERATED_ALWAYS UNDEFINED_COLUMN UNDEFINED_FUNCTION UNDEFINED_TABLE UNDEFINED_PARAMETER UNDEFINED_OBJECT DUPLICATE_COLUMN DUPLICATE_CURSOR DUPLICATE_DATABASE DUPLICATE_FUNCTION DUPLICATE_PREPARED_STATEMENT DUPLICATE_SCHEMA DUPLICATE_TABLE DUPLICATE_ALIAS DUPLICATE_OBJECT AMBIGUOUS_COLUMN AMBIGUOUS_FUNCTION AMBIGUOUS_PARAMETER AMBIGUOUS_ALIAS INVALID_COLUMN_REFERENCE INVALID_COLUMN_DEFINITION INVALID_CURSOR_DEFINITION INVALID_DATABASE_DEFINITION INVALID_FUNCTION_DEFINITION INVALID_PREPARED_STATEMENT_DEFINITION INVALID_SCHEMA_DEFINITION INVALID_TABLE_DEFINITION INVALID_OBJECT_DEFINITION WITH_CHECK_OPTION_VIOLATION INSUFFICIENT_RESOURCES DISK_FULL OUT_OF_MEMORY TOO_MANY_CONNECTIONS CONFIGURATION_LIMIT_EXCEEDED PROGRAM_LIMIT_EXCEEDED STATEMENT_TOO_COMPLEX TOO_MANY_COLUMNS TOO_MANY_ARGUMENTS OBJECT_NOT_IN_PREREQUISITE_STATE OBJECT_IN_USE CANT_CHANGE_RUNTIME_PARAM LOCK_NOT_AVAILABLE OPERATOR_INTERVENTION QUERY_CANCELED ADMIN_SHUTDOWN CRASH_SHUTDOWN CANNOT_CONNECT_NOW DATABASE_DROPPED SYSTEM_ERROR IO_ERROR UNDEFINED_FILE DUPLICATE_FILE SNAPSHOT_TOO_OLD CONFIG_FILE_ERROR LOCK_FILE_EXISTS FDW_ERROR FDW_COLUMN_NAME_NOT_FOUND FDW_DYNAMIC_PARAMETER_VALUE_NEEDED FDW_FUNCTION_SEQUENCE_ERROR FDW_INCONSISTENT_DESCRIPTOR_INFORMATION FDW_INVALID_ATTRIBUTE_VALUE FDW_INVALID_COLUMN_NAME FDW_INVALID_COLUMN_NUMBER FDW_INVALID_DATA_TYPE FDW_INVALID_DATA_TYPE_DESCRIPTORS FDW_INVALID_DESCRIPTOR_FIELD_IDENTIFIER FDW_INVALID_HANDLE FDW_INVALID_OPTION_INDEX FDW_INVALID_OPTION_NAME FDW_INVALID_STRING_LENGTH_OR_BUFFER_LENGTH FDW_INVALID_STRING_FORMAT FDW_INVALID_USE_OF_NULL_POINTER FDW_TOO_MANY_HANDLES FDW_OUT_OF_MEMORY FDW_NO_SCHEMAS FDW_OPTION_NAME_NOT_FOUND FDW_REPLY_HANDLE FDW_SCHEMA_NOT_FOUND FDW_TABLE_NOT_FOUND FDW_UNABLE_TO_CREATE_EXECUTION FDW_UNABLE_TO_CREATE_REPLY FDW_UNABLE_TO_ESTABLISH_CONNECTION PLPGSQL_ERROR RAISE_EXCEPTION NO_DATA_FOUND TOO_MANY_ROWS ASSERT_FAILURE INTERNAL_ERROR DATA_CORRUPTED INDEX_CORRUPTED "},i:/:==|\W\s*\(\*|(^|\s)\$[a-z]|{{|[a-z]:\s*$|\.\.\.|TO:|DO:/,c:[{cN:"keyword",v:[{b:/\bTEXT\s*SEARCH\b/},{b:/\b(PRIMARY|FOREIGN|FOR(\s+NO)?)\s+KEY\b/},{b:/\bPARALLEL\s+(UNSAFE|RESTRICTED|SAFE)\b/},{b:/\bSTORAGE\s+(PLAIN|EXTERNAL|EXTENDED|MAIN)\b/},{b:/\bMATCH\s+(FULL|PARTIAL|SIMPLE)\b/},{b:/\bNULLS\s+(FIRST|LAST)\b/},{b:/\bEVENT\s+TRIGGER\b/},{b:/\b(MAPPING|OR)\s+REPLACE\b/},{b:/\b(FROM|TO)\s+(PROGRAM|STDIN|STDOUT)\b/},{b:/\b(SHARE|EXCLUSIVE)\s+MODE\b/},{b:/\b(LEFT|RIGHT)\s+(OUTER\s+)?JOIN\b/},{b:/\b(FETCH|MOVE)\s+(NEXT|PRIOR|FIRST|LAST|ABSOLUTE|RELATIVE|FORWARD|BACKWARD)\b/},{b:/\bPRESERVE\s+ROWS\b/},{b:/\bDISCARD\s+PLANS\b/},{b:/\bREFERENCING\s+(OLD|NEW)\b/},{b:/\bSKIP\s+LOCKED\b/},{b:/\bGROUPING\s+SETS\b/},{b:/\b(BINARY|INSENSITIVE|SCROLL|NO\s+SCROLL)\s+(CURSOR|FOR)\b/},{b:/\b(WITH|WITHOUT)\s+HOLD\b/},{b:/\bWITH\s+(CASCADED|LOCAL)\s+CHECK\s+OPTION\b/},{b:/\bEXCLUDE\s+(TIES|NO\s+OTHERS)\b/},{b:/\bFORMAT\s+(TEXT|XML|JSON|YAML)\b/},{b:/\bSET\s+((SESSION|LOCAL)\s+)?NAMES\b/},{b:/\bIS\s+(NOT\s+)?UNKNOWN\b/},{b:/\bSECURITY\s+LABEL\b/},{b:/\bSTANDALONE\s+(YES|NO|NO\s+VALUE)\b/},{b:/\bWITH\s+(NO\s+)?DATA\b/},{b:/\b(FOREIGN|SET)\s+DATA\b/},{b:/\bSET\s+(CATALOG|CONSTRAINTS)\b/},{b:/\b(WITH|FOR)\s+ORDINALITY\b/},{b:/\bIS\s+(NOT\s+)?DOCUMENT\b/},{b:/\bXML\s+OPTION\s+(DOCUMENT|CONTENT)\b/},{b:/\b(STRIP|PRESERVE)\s+WHITESPACE\b/},{b:/\bNO\s+(ACTION|MAXVALUE|MINVALUE)\b/},{b:/\bPARTITION\s+BY\s+(RANGE|LIST|HASH)\b/},{b:/\bAT\s+TIME\s+ZONE\b/},{b:/\bGRANTED\s+BY\b/},{b:/\bRETURN\s+(QUERY|NEXT)\b/},{b:/\b(ATTACH|DETACH)\s+PARTITION\b/},{b:/\bFORCE\s+ROW\s+LEVEL\s+SECURITY\b/},{b:/\b(INCLUDING|EXCLUDING)\s+(COMMENTS|CONSTRAINTS|DEFAULTS|IDENTITY|INDEXES|STATISTICS|STORAGE|ALL)\b/},{b:/\bAS\s+(ASSIGNMENT|IMPLICIT|PERMISSIVE|RESTRICTIVE|ENUM|RANGE)\b/}]},{b:/\b(FORMAT|FAMILY|VERSION)\s*\(/},{b:/\bINCLUDE\s*\(/,k:"INCLUDE"},{b:/\bRANGE(?!\s*(BETWEEN|UNBOUNDED|CURRENT|[-0-9]+))/},{b:/\b(VERSION|OWNER|TEMPLATE|TABLESPACE|CONNECTION\s+LIMIT|PROCEDURE|RESTRICT|JOIN|PARSER|COPY|START|END|COLLATION|INPUT|ANALYZE|STORAGE|LIKE|DEFAULT|DELIMITER|ENCODING|COLUMN|CONSTRAINT|TABLE|SCHEMA)\s*=/},{b:/\b(PG_\w+?|HAS_[A-Z_]+_PRIVILEGE)\b/,relevance:10},{b:/\bEXTRACT\s*\(/,e:/\bFROM\b/,rE:!0,k:{type:"CENTURY DAY DECADE DOW DOY EPOCH HOUR ISODOW ISOYEAR MICROSECONDS MILLENNIUM MILLISECONDS MINUTE MONTH QUARTER SECOND TIMEZONE TIMEZONE_HOUR TIMEZONE_MINUTE WEEK YEAR"}},{b:/\b(XMLELEMENT|XMLPI)\s*\(\s*NAME/,k:{keyword:"NAME"}},{b:/\b(XMLPARSE|XMLSERIALIZE)\s*\(\s*(DOCUMENT|CONTENT)/,k:{keyword:"DOCUMENT CONTENT"}},{bK:"CACHE INCREMENT MAXVALUE MINVALUE",e:E.CNR,rE:!0,k:"BY CACHE INCREMENT MAXVALUE MINVALUE"},{cN:"type",b:/\b(WITH|WITHOUT)\s+TIME\s+ZONE\b/},{cN:"type",b:/\bINTERVAL\s+(YEAR|MONTH|DAY|HOUR|MINUTE|SECOND)(\s+TO\s+(MONTH|HOUR|MINUTE|SECOND))?\b/},{b:/\bRETURNS\s+(LANGUAGE_HANDLER|TRIGGER|EVENT_TRIGGER|FDW_HANDLER|INDEX_AM_HANDLER|TSM_HANDLER)\b/,k:{keyword:"RETURNS",type:"LANGUAGE_HANDLER TRIGGER EVENT_TRIGGER FDW_HANDLER INDEX_AM_HANDLER TSM_HANDLER"}},{b:"\\b("+R+")\\s*\\("},{b:"\\.("+A+")\\b"},{b:"\\b("+A+")\\s+PATH\\b",k:{keyword:"PATH",type:N.replace("PATH ","")}},{cN:"type",b:"\\b("+A+")\\b"},{cN:"string",b:"'",e:"'",c:[{b:"''"}]},{cN:"string",b:"(e|E|u&|U&)'",e:"'",c:[{b:"\\\\."}],relevance:10},{b:"\\$([a-zA-Z_]?|[a-zA-Z_][a-zA-Z_0-9]*)\\$",endSameAsBegin:!0,c:[{sL:["pgsql","perl","python","tcl","r","lua","java","php","ruby","bash","scheme","xml","json"],eW:!0}]},{b:'"',e:'"',c:[{b:'""'}]},E.CNM,E.CBCM,T,{cN:"meta",v:[{b:"%(ROW)?TYPE",relevance:10},{b:"\\$\\d+"},{b:"^#\\w",e:"$"}]},{cN:"symbol",b:"<<\\s*[a-zA-Z_][a-zA-Z_0-9$]*\\s*>>",relevance:10}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/php.min.js b/vendor/assets/javascripts/highlightjs/languages/php.min.js
index cf6da276c0..266e58b590 100644
--- a/vendor/assets/javascripts/highlightjs/languages/php.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/php.min.js
@@ -1 +1 @@
-hljs.registerLanguage("php",function(){"use strict";return function(e){var r={begin:"\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"},t={className:"meta",variants:[{begin:/<\?php/,relevance:10},{begin:/<\?[=]?/},{begin:/\?>/}]},a={className:"string",contains:[e.BACKSLASH_ESCAPE,t],variants:[{begin:'b"',end:'"'},{begin:"b'",end:"'"},e.inherit(e.APOS_STRING_MODE,{illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null})]},n={variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]},i={keyword:"__CLASS__ __DIR__ __FILE__ __FUNCTION__ __LINE__ __METHOD__ __NAMESPACE__ __TRAIT__ die echo exit include include_once print require require_once array abstract and as binary bool boolean break callable case catch class clone const continue declare default do double else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval extends final finally float for foreach from global goto if implements instanceof insteadof int integer interface isset iterable list new object or private protected public real return string switch throw trait try unset use var void while xor yield",literal:"false null true",built_in:"Error|0 AppendIterator ArgumentCountError ArithmeticError ArrayIterator ArrayObject AssertionError BadFunctionCallException BadMethodCallException CachingIterator CallbackFilterIterator CompileError Countable DirectoryIterator DivisionByZeroError DomainException EmptyIterator ErrorException Exception FilesystemIterator FilterIterator GlobIterator InfiniteIterator InvalidArgumentException IteratorIterator LengthException LimitIterator LogicException MultipleIterator NoRewindIterator OutOfBoundsException OutOfRangeException OuterIterator OverflowException ParentIterator ParseError RangeException RecursiveArrayIterator RecursiveCachingIterator RecursiveCallbackFilterIterator RecursiveDirectoryIterator RecursiveFilterIterator RecursiveIterator RecursiveIteratorIterator RecursiveRegexIterator RecursiveTreeIterator RegexIterator RuntimeException SeekableIterator SplDoublyLinkedList SplFileInfo SplFileObject SplFixedArray SplHeap SplMaxHeap SplMinHeap SplObjectStorage SplObserver SplObserver SplPriorityQueue SplQueue SplStack SplSubject SplSubject SplTempFileObject TypeError UnderflowException UnexpectedValueException ArrayAccess Closure Generator Iterator IteratorAggregate Serializable Throwable Traversable WeakReference Directory __PHP_Incomplete_Class parent php_user_filter self static stdClass"};return{aliases:["php","php3","php4","php5","php6","php7"],case_insensitive:!0,keywords:i,contains:[e.HASH_COMMENT_MODE,e.COMMENT("//","$",{contains:[t]}),e.COMMENT("/\\*","\\*/",{contains:[{className:"doctag",begin:"@[A-Za-z]+"}]}),e.COMMENT("__halt_compiler.+?;",!1,{endsWithParent:!0,keywords:"__halt_compiler"}),{className:"string",begin:/<<<['"]?\w+['"]?$/,end:/^\w+;?$/,contains:[e.BACKSLASH_ESCAPE,{className:"subst",variants:[{begin:/\$\w+/},{begin:/\{\$/,end:/\}/}]}]},t,{className:"keyword",begin:/\$this\b/},r,{begin:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{className:"function",beginKeywords:"fn function",end:/[;{]/,excludeEnd:!0,illegal:"[$%\\[]",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",begin:"\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0,keywords:i,contains:["self",r,e.C_BLOCK_COMMENT_MODE,a,n]}]},{className:"class",beginKeywords:"class interface",end:"{",excludeEnd:!0,illegal:/[:\(\$"]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"namespace",end:";",illegal:/[\.']/,contains:[e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"use",end:";",contains:[e.UNDERSCORE_TITLE_MODE]},{begin:"=>"},a,n]}}}());
\ No newline at end of file
+hljs.registerLanguage("php",function(e){var c={b:"\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"},i={cN:"meta",b:/<\?(php)?|\?>/},t={cN:"string",c:[e.BE,i],v:[{b:'b"',e:'"'},{b:"b'",e:"'"},e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null})]},a={v:[e.BNM,e.CNM]};return{aliases:["php","php3","php4","php5","php6","php7"],cI:!0,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try switch continue endfor endif declare unset true false trait goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally",c:[e.HCM,e.C("//","$",{c:[i]}),e.C("/\\*","\\*/",{c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.C("__halt_compiler.+?;",!1,{eW:!0,k:"__halt_compiler",l:e.UIR}),{cN:"string",b:/<<<['"]?\w+['"]?$/,e:/^\w+;?$/,c:[e.BE,{cN:"subst",v:[{b:/\$\w+/},{b:/\{\$/,e:/\}/}]}]},i,{cN:"keyword",b:/\$this\b/},c,{b:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{cN:"function",bK:"function",e:/[;{]/,eE:!0,i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:["self",c,e.CBCM,t,a]}]},{cN:"class",bK:"class interface",e:"{",eE:!0,i:/[:\(\$"]/,c:[{bK:"extends implements"},e.UTM]},{bK:"namespace",e:";",i:/[\.']/,c:[e.UTM]},{bK:"use",e:";",c:[e.UTM]},{b:"=>"},t,a]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/plaintext.min.js b/vendor/assets/javascripts/highlightjs/languages/plaintext.min.js
index 4eb6a8e5c8..6b51b1c861 100644
--- a/vendor/assets/javascripts/highlightjs/languages/plaintext.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/plaintext.min.js
@@ -1 +1 @@
-hljs.registerLanguage("plaintext",function(){"use strict";return function(t){return{name:"Plain text",aliases:["text","txt"],disableAutodetect:!0}}}());
\ No newline at end of file
+hljs.registerLanguage("plaintext",function(e){return{disableAutodetect:!0}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/pony.min.js b/vendor/assets/javascripts/highlightjs/languages/pony.min.js
index a795161ba9..f8c841aea1 100644
--- a/vendor/assets/javascripts/highlightjs/languages/pony.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/pony.min.js
@@ -1 +1 @@
-hljs.registerLanguage("pony",function(){"use strict";return function(e){return{name:"Pony",keywords:{keyword:"actor addressof and as be break class compile_error compile_intrinsic consume continue delegate digestof do else elseif embed end error for fun if ifdef in interface is isnt lambda let match new not object or primitive recover repeat return struct then trait try type until use var where while with xor",meta:"iso val tag trn box ref",literal:"this false true"},contains:[{className:"type",begin:"\\b_?[A-Z][\\w]*",relevance:0},{className:"string",begin:'"""',end:'"""',relevance:10},{className:"string",begin:'"',end:'"',contains:[e.BACKSLASH_ESCAPE]},{className:"string",begin:"'",end:"'",contains:[e.BACKSLASH_ESCAPE],relevance:0},{begin:e.IDENT_RE+"'",relevance:0},{className:"number",begin:"(-?)(\\b0[xX][a-fA-F0-9]+|\\b0[bB][01]+|(\\b\\d+(_\\d+)?(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",relevance:0},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("pony",function(e){return{k:{keyword:"actor addressof and as be break class compile_error compile_intrinsic consume continue delegate digestof do else elseif embed end error for fun if ifdef in interface is isnt lambda let match new not object or primitive recover repeat return struct then trait try type until use var where while with xor",meta:"iso val tag trn box ref",literal:"this false true"},c:[{cN:"type",b:"\\b_?[A-Z][\\w]*",relevance:0},{cN:"string",b:'"""',e:'"""',relevance:10},{cN:"string",b:'"',e:'"',c:[e.BE]},{cN:"string",b:"'",e:"'",c:[e.BE],relevance:0},{b:e.IR+"'",relevance:0},{cN:"number",b:"(-?)(\\b0[xX][a-fA-F0-9]+|\\b0[bB][01]+|(\\b\\d+(_\\d+)?(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",relevance:0},e.CLCM,e.CBCM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/powershell.min.js b/vendor/assets/javascripts/highlightjs/languages/powershell.min.js
index 4893b16070..8eb5b688bf 100644
--- a/vendor/assets/javascripts/highlightjs/languages/powershell.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/powershell.min.js
@@ -1 +1 @@
-hljs.registerLanguage("powershell",function(){"use strict";return function(e){var n={$pattern:/-?[A-z\.\-]+\b/,keyword:"if else foreach return do while until elseif begin for trap data dynamicparam end break throw param continue finally in switch exit filter try process catch hidden static parameter",built_in:"ac asnp cat cd CFS chdir clc clear clhy cli clp cls clv cnsn compare copy cp cpi cpp curl cvpa dbp del diff dir dnsn ebp echo|0 epal epcsv epsn erase etsn exsn fc fhx fl ft fw gal gbp gc gcb gci gcm gcs gdr gerr ghy gi gin gjb gl gm gmo gp gps gpv group gsn gsnp gsv gtz gu gv gwmi h history icm iex ihy ii ipal ipcsv ipmo ipsn irm ise iwmi iwr kill lp ls man md measure mi mount move mp mv nal ndr ni nmo npssc nsn nv ogv oh popd ps pushd pwd r rbp rcjb rcsn rd rdr ren ri rjb rm rmdir rmo rni rnp rp rsn rsnp rujb rv rvpa rwmi sajb sal saps sasv sbp sc scb select set shcm si sl sleep sls sort sp spjb spps spsv start stz sujb sv swmi tee trcm type wget where wjb write"},s={begin:"`[\\s\\S]",relevance:0},i={className:"variable",variants:[{begin:/\$\B/},{className:"keyword",begin:/\$this/},{begin:/\$[\w\d][\w\d_:]*/}]},a={className:"string",variants:[{begin:/"/,end:/"/},{begin:/@"/,end:/^"@/}],contains:[s,i,{className:"variable",begin:/\$[A-z]/,end:/[^A-z]/}]},t={className:"string",variants:[{begin:/'/,end:/'/},{begin:/@'/,end:/^'@/}]},r=e.inherit(e.COMMENT(null,null),{variants:[{begin:/#/,end:/$/},{begin:/<#/,end:/#>/}],contains:[{className:"doctag",variants:[{begin:/\.(synopsis|description|example|inputs|outputs|notes|link|component|role|functionality)/},{begin:/\.(parameter|forwardhelptargetname|forwardhelpcategory|remotehelprunspace|externalhelp)\s+\S+/}]}]}),c={className:"class",beginKeywords:"class enum",end:/\s*[{]/,excludeEnd:!0,relevance:0,contains:[e.TITLE_MODE]},l={className:"function",begin:/function\s+/,end:/\s*\{|$/,excludeEnd:!0,returnBegin:!0,relevance:0,contains:[{begin:"function",relevance:0,className:"keyword"},{className:"title",begin:/\w[\w\d]*((-)[\w\d]+)*/,relevance:0},{begin:/\(/,end:/\)/,className:"params",relevance:0,contains:[i]}]},o={begin:/using\s/,end:/$/,returnBegin:!0,contains:[a,t,{className:"keyword",begin:/(using|assembly|command|module|namespace|type)/}]},p={className:"function",begin:/\[.*\]\s*[\w]+[ ]??\(/,end:/$/,returnBegin:!0,relevance:0,contains:[{className:"keyword",begin:"(".concat(n.keyword.toString().replace(/\s/g,"|"),")\\b"),endsParent:!0,relevance:0},e.inherit(e.TITLE_MODE,{endsParent:!0})]},g=[p,r,s,e.NUMBER_MODE,a,t,{className:"built_in",variants:[{begin:"(Add|Clear|Close|Copy|Enter|Exit|Find|Format|Get|Hide|Join|Lock|Move|New|Open|Optimize|Pop|Push|Redo|Remove|Rename|Reset|Resize|Search|Select|Set|Show|Skip|Split|Step|Switch|Undo|Unlock|Watch|Backup|Checkpoint|Compare|Compress|Convert|ConvertFrom|ConvertTo|Dismount|Edit|Expand|Export|Group|Import|Initialize|Limit|Merge|New|Out|Publish|Restore|Save|Sync|Unpublish|Update|Approve|Assert|Complete|Confirm|Deny|Disable|Enable|Install|Invoke|Register|Request|Restart|Resume|Start|Stop|Submit|Suspend|Uninstall|Unregister|Wait|Debug|Measure|Ping|Repair|Resolve|Test|Trace|Connect|Disconnect|Read|Receive|Send|Write|Block|Grant|Protect|Revoke|Unblock|Unprotect|Use|ForEach|Sort|Tee|Where)+(-)[\\w\\d]+"}]},i,{className:"literal",begin:/\$(null|true|false)\b/},{className:"selector-tag",begin:/\@\B/,relevance:0}],m={begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0,relevance:0,contains:[].concat("self",g,{begin:"(string|char|byte|int|long|bool|decimal|single|double|DateTime|xml|array|hashtable|void)",className:"built_in",relevance:0},{className:"type",begin:/[\.\w\d]+/,relevance:0})};return p.contains.unshift(m),{name:"PowerShell",aliases:["ps","ps1"],case_insensitive:!0,keywords:n,contains:g.concat(c,l,o,{variants:[{className:"operator",begin:"(-and|-as|-band|-bnot|-bor|-bxor|-casesensitive|-ccontains|-ceq|-cge|-cgt|-cle|-clike|-clt|-cmatch|-cne|-cnotcontains|-cnotlike|-cnotmatch|-contains|-creplace|-csplit|-eq|-exact|-f|-file|-ge|-gt|-icontains|-ieq|-ige|-igt|-ile|-ilike|-ilt|-imatch|-in|-ine|-inotcontains|-inotlike|-inotmatch|-ireplace|-is|-isnot|-isplit|-join|-le|-like|-lt|-match|-ne|-not|-notcontains|-notin|-notlike|-notmatch|-or|-regex|-replace|-shl|-shr|-split|-wildcard|-xor)\\b"},{className:"literal",begin:/(-)[\w\d]+/,relevance:0}]},m)}}}());
\ No newline at end of file
+hljs.registerLanguage("powershell",function(e){var t={keyword:"if else foreach return do while until elseif begin for trap data dynamicparam end break throw param continue finally in switch exit filter try process catch hidden static parameter"},n={b:"`[\\s\\S]",relevance:0},c={cN:"variable",v:[{b:/\$\B/},{cN:"keyword",b:/\$this/},{b:/\$[\w\d][\w\d_:]*/}]},i={cN:"string",v:[{b:/"/,e:/"/},{b:/@"/,e:/^"@/}],c:[n,c,{cN:"variable",b:/\$[A-z]/,e:/[^A-z]/}]},a={cN:"string",v:[{b:/'/,e:/'/},{b:/@'/,e:/^'@/}]},r=e.inherit(e.C(null,null),{v:[{b:/#/,e:/$/},{b:/<#/,e:/#>/}],c:[{cN:"doctag",v:[{b:/\.(synopsis|description|example|inputs|outputs|notes|link|component|role|functionality)/},{b:/\.(parameter|forwardhelptargetname|forwardhelpcategory|remotehelprunspace|externalhelp)\s+\S+/}]}]}),o={cN:"built_in",v:[{b:"(".concat("Add|Clear|Close|Copy|Enter|Exit|Find|Format|Get|Hide|Join|Lock|Move|New|Open|Optimize|Pop|Push|Redo|Remove|Rename|Reset|Resize|Search|Select|Set|Show|Skip|Split|Step|Switch|Undo|Unlock|Watch|Backup|Checkpoint|Compare|Compress|Convert|ConvertFrom|ConvertTo|Dismount|Edit|Expand|Export|Group|Import|Initialize|Limit|Merge|New|Out|Publish|Restore|Save|Sync|Unpublish|Update|Approve|Assert|Complete|Confirm|Deny|Disable|Enable|Install|Invoke|Register|Request|Restart|Resume|Start|Stop|Submit|Suspend|Uninstall|Unregister|Wait|Debug|Measure|Ping|Repair|Resolve|Test|Trace|Connect|Disconnect|Read|Receive|Send|Write|Block|Grant|Protect|Revoke|Unblock|Unprotect|Use|ForEach|Sort|Tee|Where",")+(-)[\\w\\d]+")}]},l={cN:"class",bK:"class enum",e:/\s*[{]/,eE:!0,relevance:0,c:[e.TM]},s={cN:"function",b:/function\s+/,e:/\s*\{|$/,eE:!0,rB:!0,relevance:0,c:[{b:"function",relevance:0,cN:"keyword"},{cN:"title",b:/\w[\w\d]*((-)[\w\d]+)*/,relevance:0},{b:/\(/,e:/\)/,cN:"params",relevance:0,c:[c]}]},p={b:/using\s/,e:/$/,rB:!0,c:[i,a,{cN:"keyword",b:/(using|assembly|command|module|namespace|type)/}]},b={v:[{cN:"operator",b:"(".concat("-and|-as|-band|-bnot|-bor|-bxor|-casesensitive|-ccontains|-ceq|-cge|-cgt|-cle|-clike|-clt|-cmatch|-cne|-cnotcontains|-cnotlike|-cnotmatch|-contains|-creplace|-csplit|-eq|-exact|-f|-file|-ge|-gt|-icontains|-ieq|-ige|-igt|-ile|-ilike|-ilt|-imatch|-in|-ine|-inotcontains|-inotlike|-inotmatch|-ireplace|-is|-isnot|-isplit|-join|-le|-like|-lt|-match|-ne|-not|-notcontains|-notin|-notlike|-notmatch|-or|-regex|-replace|-shl|-shr|-split|-wildcard|-xor",")\\b")},{cN:"literal",b:/(-)[\w\d]+/,relevance:0}]},d={cN:"function",b:/\[.*\]\s*[\w]+[ ]??\(/,e:/$/,rB:!0,relevance:0,c:[{cN:"keyword",b:"(".concat(t.keyword.toString().replace(/\s/g,"|"),")\\b"),endsParent:!0,relevance:0},e.inherit(e.TM,{endsParent:!0})]},u=[d,r,n,e.NM,i,a,o,c,{cN:"literal",b:/\$(null|true|false)\b/},{cN:"selector-tag",b:/\@\B/,relevance:0}],m={b:/\[/,e:/\]/,eB:!0,eE:!0,relevance:0,c:[].concat("self",u,{b:"("+["string","char","byte","int","long","bool","decimal","single","double","DateTime","xml","array","hashtable","void"].join("|")+")",cN:"built_in",relevance:0},{cN:"type",b:/[\.\w\d]+/,relevance:0})};return d.c.unshift(m),{aliases:["ps","ps1"],l:/-?[A-z\.\-]+/,cI:!0,k:t,c:u.concat(l,s,p,b,m)}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/processing.min.js b/vendor/assets/javascripts/highlightjs/languages/processing.min.js
index 577ee7daf8..ddd7bb1913 100644
--- a/vendor/assets/javascripts/highlightjs/languages/processing.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/processing.min.js
@@ -1 +1 @@
-hljs.registerLanguage("processing",function(){"use strict";return function(e){return{name:"Processing",keywords:{keyword:"BufferedReader PVector PFont PImage PGraphics HashMap boolean byte char color double float int long String Array FloatDict FloatList IntDict IntList JSONArray JSONObject Object StringDict StringList Table TableRow XML false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private",literal:"P2D P3D HALF_PI PI QUARTER_PI TAU TWO_PI",title:"setup draw",built_in:"displayHeight displayWidth mouseY mouseX mousePressed pmouseX pmouseY key keyCode pixels focused frameCount frameRate height width size createGraphics beginDraw createShape loadShape PShape arc ellipse line point quad rect triangle bezier bezierDetail bezierPoint bezierTangent curve curveDetail curvePoint curveTangent curveTightness shape shapeMode beginContour beginShape bezierVertex curveVertex endContour endShape quadraticVertex vertex ellipseMode noSmooth rectMode smooth strokeCap strokeJoin strokeWeight mouseClicked mouseDragged mouseMoved mousePressed mouseReleased mouseWheel keyPressed keyPressedkeyReleased keyTyped print println save saveFrame day hour millis minute month second year background clear colorMode fill noFill noStroke stroke alpha blue brightness color green hue lerpColor red saturation modelX modelY modelZ screenX screenY screenZ ambient emissive shininess specular add createImage beginCamera camera endCamera frustum ortho perspective printCamera printProjection cursor frameRate noCursor exit loop noLoop popStyle pushStyle redraw binary boolean byte char float hex int str unbinary unhex join match matchAll nf nfc nfp nfs split splitTokens trim append arrayCopy concat expand reverse shorten sort splice subset box sphere sphereDetail createInput createReader loadBytes loadJSONArray loadJSONObject loadStrings loadTable loadXML open parseXML saveTable selectFolder selectInput beginRaw beginRecord createOutput createWriter endRaw endRecord PrintWritersaveBytes saveJSONArray saveJSONObject saveStream saveStrings saveXML selectOutput popMatrix printMatrix pushMatrix resetMatrix rotate rotateX rotateY rotateZ scale shearX shearY translate ambientLight directionalLight lightFalloff lights lightSpecular noLights normal pointLight spotLight image imageMode loadImage noTint requestImage tint texture textureMode textureWrap blend copy filter get loadPixels set updatePixels blendMode loadShader PShaderresetShader shader createFont loadFont text textFont textAlign textLeading textMode textSize textWidth textAscent textDescent abs ceil constrain dist exp floor lerp log mag map max min norm pow round sq sqrt acos asin atan atan2 cos degrees radians sin tan noise noiseDetail noiseSeed random randomGaussian randomSeed"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("processing",function(e){return{k:{keyword:"BufferedReader PVector PFont PImage PGraphics HashMap boolean byte char color double float int long String Array FloatDict FloatList IntDict IntList JSONArray JSONObject Object StringDict StringList Table TableRow XML false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private",literal:"P2D P3D HALF_PI PI QUARTER_PI TAU TWO_PI",title:"setup draw",built_in:"displayHeight displayWidth mouseY mouseX mousePressed pmouseX pmouseY key keyCode pixels focused frameCount frameRate height width size createGraphics beginDraw createShape loadShape PShape arc ellipse line point quad rect triangle bezier bezierDetail bezierPoint bezierTangent curve curveDetail curvePoint curveTangent curveTightness shape shapeMode beginContour beginShape bezierVertex curveVertex endContour endShape quadraticVertex vertex ellipseMode noSmooth rectMode smooth strokeCap strokeJoin strokeWeight mouseClicked mouseDragged mouseMoved mousePressed mouseReleased mouseWheel keyPressed keyPressedkeyReleased keyTyped print println save saveFrame day hour millis minute month second year background clear colorMode fill noFill noStroke stroke alpha blue brightness color green hue lerpColor red saturation modelX modelY modelZ screenX screenY screenZ ambient emissive shininess specular add createImage beginCamera camera endCamera frustum ortho perspective printCamera printProjection cursor frameRate noCursor exit loop noLoop popStyle pushStyle redraw binary boolean byte char float hex int str unbinary unhex join match matchAll nf nfc nfp nfs split splitTokens trim append arrayCopy concat expand reverse shorten sort splice subset box sphere sphereDetail createInput createReader loadBytes loadJSONArray loadJSONObject loadStrings loadTable loadXML open parseXML saveTable selectFolder selectInput beginRaw beginRecord createOutput createWriter endRaw endRecord PrintWritersaveBytes saveJSONArray saveJSONObject saveStream saveStrings saveXML selectOutput popMatrix printMatrix pushMatrix resetMatrix rotate rotateX rotateY rotateZ scale shearX shearY translate ambientLight directionalLight lightFalloff lights lightSpecular noLights normal pointLight spotLight image imageMode loadImage noTint requestImage tint texture textureMode textureWrap blend copy filter get loadPixels set updatePixels blendMode loadShader PShaderresetShader shader createFont loadFont text textFont textAlign textLeading textMode textSize textWidth textAscent textDescent abs ceil constrain dist exp floor lerp log mag map max min norm pow round sq sqrt acos asin atan atan2 cos degrees radians sin tan noise noiseDetail noiseSeed random randomGaussian randomSeed"},c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/profile.min.js b/vendor/assets/javascripts/highlightjs/languages/profile.min.js
index 94d6c5557e..9f81a35f6d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/profile.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/profile.min.js
@@ -1 +1 @@
-hljs.registerLanguage("profile",function(){"use strict";return function(e){return{name:"Python profiler",contains:[e.C_NUMBER_MODE,{begin:"[a-zA-Z_][\\da-zA-Z_]+\\.[\\da-zA-Z_]{1,3}",end:":",excludeEnd:!0},{begin:"(ncalls|tottime|cumtime)",end:"$",keywords:"ncalls tottime|10 cumtime|10 filename",relevance:10},{begin:"function calls",end:"$",contains:[e.C_NUMBER_MODE],relevance:10},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"string",begin:"\\(",end:"\\)$",excludeBegin:!0,excludeEnd:!0,relevance:0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("profile",function(e){return{c:[e.CNM,{b:"[a-zA-Z_][\\da-zA-Z_]+\\.[\\da-zA-Z_]{1,3}",e:":",eE:!0},{b:"(ncalls|tottime|cumtime)",e:"$",k:"ncalls tottime|10 cumtime|10 filename",relevance:10},{b:"function calls",e:"$",c:[e.CNM],relevance:10},e.ASM,e.QSM,{cN:"string",b:"\\(",e:"\\)$",eB:!0,eE:!0,relevance:0}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/prolog.min.js b/vendor/assets/javascripts/highlightjs/languages/prolog.min.js
index 0a06c993dd..7e4209b609 100644
--- a/vendor/assets/javascripts/highlightjs/languages/prolog.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/prolog.min.js
@@ -1 +1 @@
-hljs.registerLanguage("prolog",function(){"use strict";return function(n){var e={begin:/\(/,end:/\)/,relevance:0},a={begin:/\[/,end:/\]/},s={className:"comment",begin:/%/,end:/$/,contains:[n.PHRASAL_WORDS_MODE]},i={className:"string",begin:/`/,end:/`/,contains:[n.BACKSLASH_ESCAPE]},c=[{begin:/[a-z][A-Za-z0-9_]*/,relevance:0},{className:"symbol",variants:[{begin:/[A-Z][a-zA-Z0-9_]*/},{begin:/_[A-Za-z0-9_]*/}],relevance:0},e,{begin:/:-/},a,s,n.C_BLOCK_COMMENT_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,i,{className:"string",begin:/0\'(\\\'|.)/},{className:"string",begin:/0\'\\s/},n.C_NUMBER_MODE];return e.contains=c,a.contains=c,{name:"Prolog",contains:c.concat([{begin:/\.$/}])}}}());
\ No newline at end of file
+hljs.registerLanguage("prolog",function(e){var c={b:/\(/,e:/\)/,relevance:0},b={b:/\[/,e:/\]/},n={cN:"comment",b:/%/,e:/$/,c:[e.PWM]},r={cN:"string",b:/`/,e:/`/,c:[e.BE]},a=[{b:/[a-z][A-Za-z0-9_]*/,relevance:0},{cN:"symbol",v:[{b:/[A-Z][a-zA-Z0-9_]*/},{b:/_[A-Za-z0-9_]*/}],relevance:0},c,{b:/:-/},b,n,e.CBCM,e.QSM,e.ASM,r,{cN:"string",b:/0\'(\\\'|.)/},{cN:"string",b:/0\'\\s/},e.CNM];return c.c=a,{c:(b.c=a).concat([{b:/\.$/}])}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/properties.min.js b/vendor/assets/javascripts/highlightjs/languages/properties.min.js
index 16c77ffc26..d801aaeab0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/properties.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/properties.min.js
@@ -1 +1 @@
-hljs.registerLanguage("properties",function(){"use strict";return function(e){var n="[ \\t\\f]*",t="("+n+"[:=]"+n+"|[ \\t\\f]+)",a="([^\\\\:= \\t\\f\\n]|\\\\.)+",s={end:t,relevance:0,starts:{className:"string",end:/$/,relevance:0,contains:[{begin:"\\\\\\n"}]}};return{name:".properties",case_insensitive:!0,illegal:/\S/,contains:[e.COMMENT("^\\s*[!#]","$"),{begin:"([^\\\\\\W:= \\t\\f\\n]|\\\\.)+"+t,returnBegin:!0,contains:[{className:"attr",begin:"([^\\\\\\W:= \\t\\f\\n]|\\\\.)+",endsParent:!0,relevance:0}],starts:s},{begin:a+t,returnBegin:!0,relevance:0,contains:[{className:"meta",begin:a,endsParent:!0,relevance:0}],starts:s},{className:"attr",relevance:0,begin:a+n+"$"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("properties",function(e){var r="[ \\t\\f]*",t="("+r+"[:=]"+r+"|[ \\t\\f]+)",n="([^\\\\\\W:= \\t\\f\\n]|\\\\.)+",a="([^\\\\:= \\t\\f\\n]|\\\\.)+",c={e:t,relevance:0,starts:{cN:"string",e:/$/,relevance:0,c:[{b:"\\\\\\n"}]}};return{cI:!0,i:/\S/,c:[e.C("^\\s*[!#]","$"),{b:n+t,rB:!0,c:[{cN:"attr",b:n,endsParent:!0,relevance:0}],starts:c},{b:a+t,rB:!0,relevance:0,c:[{cN:"meta",b:a,endsParent:!0,relevance:0}],starts:c},{cN:"attr",relevance:0,b:a+r+"$"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/protobuf.min.js b/vendor/assets/javascripts/highlightjs/languages/protobuf.min.js
index 1a569a17e6..74085a9dbd 100644
--- a/vendor/assets/javascripts/highlightjs/languages/protobuf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/protobuf.min.js
@@ -1 +1 @@
-hljs.registerLanguage("protobuf",function(){"use strict";return function(e){return{name:"Protocol Buffers",keywords:{keyword:"package import option optional required repeated group oneof",built_in:"double float int32 int64 uint32 uint64 sint32 sint64 fixed32 fixed64 sfixed32 sfixed64 bool string bytes",literal:"true false"},contains:[e.QUOTE_STRING_MODE,e.NUMBER_MODE,e.C_LINE_COMMENT_MODE,{className:"class",beginKeywords:"message enum service",end:/\{/,illegal:/\n/,contains:[e.inherit(e.TITLE_MODE,{starts:{endsWithParent:!0,excludeEnd:!0}})]},{className:"function",beginKeywords:"rpc",end:/[{;]/,excludeEnd:!0,keywords:"rpc returns"},{begin:/^\s*[A-Z_]+/,end:/\s*=/,excludeEnd:!0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("protobuf",function(e){return{k:{keyword:"package import option optional required repeated group oneof",built_in:"double float int32 int64 uint32 uint64 sint32 sint64 fixed32 fixed64 sfixed32 sfixed64 bool string bytes",literal:"true false"},c:[e.QSM,e.NM,e.CLCM,{cN:"class",bK:"message enum service",e:/\{/,i:/\n/,c:[e.inherit(e.TM,{starts:{eW:!0,eE:!0}})]},{cN:"function",bK:"rpc",e:/;/,eE:!0,k:"rpc returns"},{b:/^\s*[A-Z_]+/,e:/\s*=/,eE:!0}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/puppet.min.js b/vendor/assets/javascripts/highlightjs/languages/puppet.min.js
index 9f785f24b9..18bff25f6e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/puppet.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/puppet.min.js
@@ -1 +1 @@
-hljs.registerLanguage("puppet",function(){"use strict";return function(e){var s=e.COMMENT("#","$"),r=e.inherit(e.TITLE_MODE,{begin:"([A-Za-z_]|::)(\\w|::)*"}),a={className:"variable",begin:"\\$([A-Za-z_]|::)(\\w|::)*"},n={className:"string",contains:[e.BACKSLASH_ESCAPE,a],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/}]};return{name:"Puppet",aliases:["pp"],contains:[s,a,n,{beginKeywords:"class",end:"\\{|;",illegal:/=/,contains:[r,s]},{beginKeywords:"define",end:/\{/,contains:[{className:"section",begin:e.IDENT_RE,endsParent:!0}]},{begin:e.IDENT_RE+"\\s+\\{",returnBegin:!0,end:/\S/,contains:[{className:"keyword",begin:e.IDENT_RE},{begin:/\{/,end:/\}/,keywords:{keyword:"and case default else elsif false if in import enherits node or true undef unless main settings $string ",literal:"alias audit before loglevel noop require subscribe tag owner ensure group mode name|0 changes context force incl lens load_path onlyif provider returns root show_diff type_check en_address ip_address realname command environment hour monute month monthday special target weekday creates cwd ogoutput refresh refreshonly tries try_sleep umask backup checksum content ctime force ignore links mtime purge recurse recurselimit replace selinux_ignore_defaults selrange selrole seltype seluser source souirce_permissions sourceselect validate_cmd validate_replacement allowdupe attribute_membership auth_membership forcelocal gid ia_load_module members system host_aliases ip allowed_trunk_vlans description device_url duplex encapsulation etherchannel native_vlan speed principals allow_root auth_class auth_type authenticate_user k_of_n mechanisms rule session_owner shared options device fstype enable hasrestart directory present absent link atboot blockdevice device dump pass remounts poller_tag use message withpath adminfile allow_virtual allowcdrom category configfiles flavor install_options instance package_settings platform responsefile status uninstall_options vendor unless_system_user unless_uid binary control flags hasstatus manifest pattern restart running start stop allowdupe auths expiry gid groups home iterations key_membership keys managehome membership password password_max_age password_min_age profile_membership profiles project purge_ssh_keys role_membership roles salt shell uid baseurl cost descr enabled enablegroups exclude failovermethod gpgcheck gpgkey http_caching include includepkgs keepalive metadata_expire metalink mirrorlist priority protect proxy proxy_password proxy_username repo_gpgcheck s3_enabled skip_if_unavailable sslcacert sslclientcert sslclientkey sslverify mounted",built_in:"architecture augeasversion blockdevices boardmanufacturer boardproductname boardserialnumber cfkey dhcp_servers domain ec2_ ec2_userdata facterversion filesystems ldom fqdn gid hardwareisa hardwaremodel hostname id|0 interfaces ipaddress ipaddress_ ipaddress6 ipaddress6_ iphostnumber is_virtual kernel kernelmajversion kernelrelease kernelversion kernelrelease kernelversion lsbdistcodename lsbdistdescription lsbdistid lsbdistrelease lsbmajdistrelease lsbminordistrelease lsbrelease macaddress macaddress_ macosx_buildversion macosx_productname macosx_productversion macosx_productverson_major macosx_productversion_minor manufacturer memoryfree memorysize netmask metmask_ network_ operatingsystem operatingsystemmajrelease operatingsystemrelease osfamily partitions path physicalprocessorcount processor processorcount productname ps puppetversion rubysitedir rubyversion selinux selinux_config_mode selinux_config_policy selinux_current_mode selinux_current_mode selinux_enforced selinux_policyversion serialnumber sp_ sshdsakey sshecdsakey sshrsakey swapencrypted swapfree swapsize timezone type uniqueid uptime uptime_days uptime_hours uptime_seconds uuid virtual vlans xendomains zfs_version zonenae zones zpool_version"},relevance:0,contains:[n,s,{begin:"[a-zA-Z_]+\\s*=>",returnBegin:!0,end:"=>",contains:[{className:"attr",begin:e.IDENT_RE}]},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},a]}],relevance:0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("puppet",function(e){var s=e.C("#","$"),r="([A-Za-z_]|::)(\\w|::)*",a=e.inherit(e.TM,{b:r}),i={cN:"variable",b:"\\$"+r},n={cN:"string",c:[e.BE,i],v:[{b:/'/,e:/'/},{b:/"/,e:/"/}]};return{aliases:["pp"],c:[s,i,n,{bK:"class",e:"\\{|;",i:/=/,c:[a,s]},{bK:"define",e:/\{/,c:[{cN:"section",b:e.IR,endsParent:!0}]},{b:e.IR+"\\s+\\{",rB:!0,e:/\S/,c:[{cN:"keyword",b:e.IR},{b:/\{/,e:/\}/,k:{keyword:"and case default else elsif false if in import enherits node or true undef unless main settings $string ",literal:"alias audit before loglevel noop require subscribe tag owner ensure group mode name|0 changes context force incl lens load_path onlyif provider returns root show_diff type_check en_address ip_address realname command environment hour monute month monthday special target weekday creates cwd ogoutput refresh refreshonly tries try_sleep umask backup checksum content ctime force ignore links mtime purge recurse recurselimit replace selinux_ignore_defaults selrange selrole seltype seluser source souirce_permissions sourceselect validate_cmd validate_replacement allowdupe attribute_membership auth_membership forcelocal gid ia_load_module members system host_aliases ip allowed_trunk_vlans description device_url duplex encapsulation etherchannel native_vlan speed principals allow_root auth_class auth_type authenticate_user k_of_n mechanisms rule session_owner shared options device fstype enable hasrestart directory present absent link atboot blockdevice device dump pass remounts poller_tag use message withpath adminfile allow_virtual allowcdrom category configfiles flavor install_options instance package_settings platform responsefile status uninstall_options vendor unless_system_user unless_uid binary control flags hasstatus manifest pattern restart running start stop allowdupe auths expiry gid groups home iterations key_membership keys managehome membership password password_max_age password_min_age profile_membership profiles project purge_ssh_keys role_membership roles salt shell uid baseurl cost descr enabled enablegroups exclude failovermethod gpgcheck gpgkey http_caching include includepkgs keepalive metadata_expire metalink mirrorlist priority protect proxy proxy_password proxy_username repo_gpgcheck s3_enabled skip_if_unavailable sslcacert sslclientcert sslclientkey sslverify mounted",built_in:"architecture augeasversion blockdevices boardmanufacturer boardproductname boardserialnumber cfkey dhcp_servers domain ec2_ ec2_userdata facterversion filesystems ldom fqdn gid hardwareisa hardwaremodel hostname id|0 interfaces ipaddress ipaddress_ ipaddress6 ipaddress6_ iphostnumber is_virtual kernel kernelmajversion kernelrelease kernelversion kernelrelease kernelversion lsbdistcodename lsbdistdescription lsbdistid lsbdistrelease lsbmajdistrelease lsbminordistrelease lsbrelease macaddress macaddress_ macosx_buildversion macosx_productname macosx_productversion macosx_productverson_major macosx_productversion_minor manufacturer memoryfree memorysize netmask metmask_ network_ operatingsystem operatingsystemmajrelease operatingsystemrelease osfamily partitions path physicalprocessorcount processor processorcount productname ps puppetversion rubysitedir rubyversion selinux selinux_config_mode selinux_config_policy selinux_current_mode selinux_current_mode selinux_enforced selinux_policyversion serialnumber sp_ sshdsakey sshecdsakey sshrsakey swapencrypted swapfree swapsize timezone type uniqueid uptime uptime_days uptime_hours uptime_seconds uuid virtual vlans xendomains zfs_version zonenae zones zpool_version"},relevance:0,c:[n,s,{b:"[a-zA-Z_]+\\s*=>",rB:!0,e:"=>",c:[{cN:"attr",b:e.IR}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},i]}],relevance:0}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/purebasic.min.js b/vendor/assets/javascripts/highlightjs/languages/purebasic.min.js
index 5faaa2116a..eb6802dca5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/purebasic.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/purebasic.min.js
@@ -1 +1 @@
-hljs.registerLanguage("purebasic",function(){"use strict";return function(e){return{name:"PureBASIC",aliases:["pb","pbi"],keywords:"Align And Array As Break CallDebugger Case CompilerCase CompilerDefault CompilerElse CompilerElseIf CompilerEndIf CompilerEndSelect CompilerError CompilerIf CompilerSelect CompilerWarning Continue Data DataSection Debug DebugLevel Declare DeclareC DeclareCDLL DeclareDLL DeclareModule Default Define Dim DisableASM DisableDebugger DisableExplicit Else ElseIf EnableASM EnableDebugger EnableExplicit End EndDataSection EndDeclareModule EndEnumeration EndIf EndImport EndInterface EndMacro EndModule EndProcedure EndSelect EndStructure EndStructureUnion EndWith Enumeration EnumerationBinary Extends FakeReturn For ForEach ForEver Global Gosub Goto If Import ImportC IncludeBinary IncludeFile IncludePath Interface List Macro MacroExpandedCount Map Module NewList NewMap Next Not Or Procedure ProcedureC ProcedureCDLL ProcedureDLL ProcedureReturn Protected Prototype PrototypeC ReDim Read Repeat Restore Return Runtime Select Shared Static Step Structure StructureUnion Swap Threaded To UndefineMacro Until Until  UnuseModule UseModule Wend While With XIncludeFile XOr",contains:[e.COMMENT(";","$",{relevance:0}),{className:"function",begin:"\\b(Procedure|Declare)(C|CDLL|DLL)?\\b",end:"\\(",excludeEnd:!0,returnBegin:!0,contains:[{className:"keyword",begin:"(Procedure|Declare)(C|CDLL|DLL)?",excludeEnd:!0},{className:"type",begin:"\\.\\w*"},e.UNDERSCORE_TITLE_MODE]},{className:"string",begin:'(~)?"',end:'"',illegal:"\\n"},{className:"symbol",begin:"#[a-zA-Z_]\\w*\\$?"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("purebasic",function(e){return{aliases:["pb","pbi"],k:"Align And Array As Break CallDebugger Case CompilerCase CompilerDefault CompilerElse CompilerElseIf CompilerEndIf CompilerEndSelect CompilerError CompilerIf CompilerSelect CompilerWarning Continue Data DataSection Debug DebugLevel Declare DeclareC DeclareCDLL DeclareDLL DeclareModule Default Define Dim DisableASM DisableDebugger DisableExplicit Else ElseIf EnableASM EnableDebugger EnableExplicit End EndDataSection EndDeclareModule EndEnumeration EndIf EndImport EndInterface EndMacro EndModule EndProcedure EndSelect EndStructure EndStructureUnion EndWith Enumeration EnumerationBinary Extends FakeReturn For ForEach ForEver Global Gosub Goto If Import ImportC IncludeBinary IncludeFile IncludePath Interface List Macro MacroExpandedCount Map Module NewList NewMap Next Not Or Procedure ProcedureC ProcedureCDLL ProcedureDLL ProcedureReturn Protected Prototype PrototypeC ReDim Read Repeat Restore Return Runtime Select Shared Static Step Structure StructureUnion Swap Threaded To UndefineMacro Until Until  UnuseModule UseModule Wend While With XIncludeFile XOr",c:[e.C(";","$",{relevance:0}),{cN:"function",b:"\\b(Procedure|Declare)(C|CDLL|DLL)?\\b",e:"\\(",eE:!0,rB:!0,c:[{cN:"keyword",b:"(Procedure|Declare)(C|CDLL|DLL)?",eE:!0},{cN:"type",b:"\\.\\w*"},e.UTM]},{cN:"string",b:'(~)?"',e:'"',i:"\\n"},{cN:"symbol",b:"#[a-zA-Z_]\\w*\\$?"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/python.min.js b/vendor/assets/javascripts/highlightjs/languages/python.min.js
index c74071fa2f..a1ec579541 100644
--- a/vendor/assets/javascripts/highlightjs/languages/python.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/python.min.js
@@ -1 +1 @@
-hljs.registerLanguage("python",function(){"use strict";return function(e){var n={keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10",built_in:"Ellipsis NotImplemented",literal:"False None True"},a={className:"meta",begin:/^(>>>|\.\.\.) /},i={className:"subst",begin:/\{/,end:/\}/,keywords:n,illegal:/#/},s={begin:/\{\{/,relevance:0},r={className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:/(u|b)?r?'''/,end:/'''/,contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{begin:/(u|b)?r?"""/,end:/"""/,contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{begin:/(fr|rf|f)'''/,end:/'''/,contains:[e.BACKSLASH_ESCAPE,a,s,i]},{begin:/(fr|rf|f)"""/,end:/"""/,contains:[e.BACKSLASH_ESCAPE,a,s,i]},{begin:/(u|r|ur)'/,end:/'/,relevance:10},{begin:/(u|r|ur)"/,end:/"/,relevance:10},{begin:/(b|br)'/,end:/'/},{begin:/(b|br)"/,end:/"/},{begin:/(fr|rf|f)'/,end:/'/,contains:[e.BACKSLASH_ESCAPE,s,i]},{begin:/(fr|rf|f)"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,i]},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},l={className:"number",relevance:0,variants:[{begin:e.BINARY_NUMBER_RE+"[lLjJ]?"},{begin:"\\b(0o[0-7]+)[lLjJ]?"},{begin:e.C_NUMBER_RE+"[lLjJ]?"}]},t={className:"params",variants:[{begin:/\(\s*\)/,skip:!0,className:null},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:["self",a,l,r,e.HASH_COMMENT_MODE]}]};return i.contains=[r,l,a],{name:"Python",aliases:["py","gyp","ipython"],keywords:n,illegal:/(<\/|->|\?)|=>/,contains:[a,l,{beginKeywords:"if",relevance:0},r,e.HASH_COMMENT_MODE,{variants:[{className:"function",beginKeywords:"def"},{className:"class",beginKeywords:"class"}],end:/:/,illegal:/[${=;\n,]/,contains:[e.UNDERSCORE_TITLE_MODE,t,{begin:/->/,endsWithParent:!0,keywords:"None"}]},{className:"meta",begin:/^[\t ]*@/,end:/$/},{begin:/\b(print|exec)\(/}]}}}());
\ No newline at end of file
+hljs.registerLanguage("python",function(e){var r={keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10",built_in:"Ellipsis NotImplemented",literal:"False None True"},b={cN:"meta",b:/^(>>>|\.\.\.) /},c={cN:"subst",b:/\{/,e:/\}/,k:r,i:/#/},a={b:/\{\{/,relevance:0},l={cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,c:[e.BE,b],relevance:10},{b:/(u|b)?r?"""/,e:/"""/,c:[e.BE,b],relevance:10},{b:/(fr|rf|f)'''/,e:/'''/,c:[e.BE,b,a,c]},{b:/(fr|rf|f)"""/,e:/"""/,c:[e.BE,b,a,c]},{b:/(u|r|ur)'/,e:/'/,relevance:10},{b:/(u|r|ur)"/,e:/"/,relevance:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},{b:/(fr|rf|f)'/,e:/'/,c:[e.BE,a,c]},{b:/(fr|rf|f)"/,e:/"/,c:[e.BE,a,c]},e.ASM,e.QSM]},n={cN:"number",relevance:0,v:[{b:e.BNR+"[lLjJ]?"},{b:"\\b(0o[0-7]+)[lLjJ]?"},{b:e.CNR+"[lLjJ]?"}]},i={cN:"params",b:/\(/,e:/\)/,c:["self",b,n,l,e.HCM]};return c.c=[l,n,b],{aliases:["py","gyp","ipython"],k:r,i:/(<\/|->|\?)|=>/,c:[b,n,{bK:"if",relevance:0},l,e.HCM,{v:[{cN:"function",bK:"def"},{cN:"class",bK:"class"}],e:/:/,i:/[${=;\n,]/,c:[e.UTM,i,{b:/->/,eW:!0,k:"None"}]},{cN:"meta",b:/^[\t ]*@/,e:/$/},{b:/\b(print|exec)\(/}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/q.min.js b/vendor/assets/javascripts/highlightjs/languages/q.min.js
index 94da55353e..af061f6eb5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/q.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/q.min.js
@@ -1 +1 @@
-hljs.registerLanguage("q",function(){"use strict";return function(e){return{name:"Q",aliases:["k","kdb"],keywords:{$pattern:/(`?)[A-Za-z0-9_]+\b/,keyword:"do while select delete by update from",literal:"0b 1b",built_in:"neg not null string reciprocal floor ceiling signum mod xbar xlog and or each scan over prior mmu lsq inv md5 ltime gtime count first var dev med cov cor all any rand sums prds mins maxs fills deltas ratios avgs differ prev next rank reverse iasc idesc asc desc msum mcount mavg mdev xrank mmin mmax xprev rotate distinct group where flip type key til get value attr cut set upsert raze union inter except cross sv vs sublist enlist read0 read1 hopen hclose hdel hsym hcount peach system ltrim rtrim trim lower upper ssr view tables views cols xcols keys xkey xcol xasc xdesc fkeys meta lj aj aj0 ij pj asof uj ww wj wj1 fby xgroup ungroup ej save load rsave rload show csv parse eval min max avg wavg wsum sin cos tan sum",type:"`float `double int `timestamp `timespan `datetime `time `boolean `symbol `char `byte `short `long `real `month `date `minute `second `guid"},contains:[e.C_LINE_COMMENT_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("q",function(e){return{aliases:["k","kdb"],k:{keyword:"do while select delete by update from",literal:"0b 1b",built_in:"neg not null string reciprocal floor ceiling signum mod xbar xlog and or each scan over prior mmu lsq inv md5 ltime gtime count first var dev med cov cor all any rand sums prds mins maxs fills deltas ratios avgs differ prev next rank reverse iasc idesc asc desc msum mcount mavg mdev xrank mmin mmax xprev rotate distinct group where flip type key til get value attr cut set upsert raze union inter except cross sv vs sublist enlist read0 read1 hopen hclose hdel hsym hcount peach system ltrim rtrim trim lower upper ssr view tables views cols xcols keys xkey xcol xasc xdesc fkeys meta lj aj aj0 ij pj asof uj ww wj wj1 fby xgroup ungroup ej save load rsave rload show csv parse eval min max avg wavg wsum sin cos tan sum",type:"`float `double int `timestamp `timespan `datetime `time `boolean `symbol `char `byte `short `long `real `month `date `minute `second `guid"},l:/(`?)[A-Za-z0-9_]+\b/,c:[e.CLCM,e.QSM,e.CNM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/qml.min.js b/vendor/assets/javascripts/highlightjs/languages/qml.min.js
index de27c0b92f..bd5a191932 100644
--- a/vendor/assets/javascripts/highlightjs/languages/qml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/qml.min.js
@@ -1 +1 @@
-hljs.registerLanguage("qml",function(){"use strict";return function(e){var n="[a-zA-Z_][a-zA-Z0-9\\._]*",r={className:"attribute",begin:"\\bid\\s*:",starts:{className:"string",end:n,returnEnd:!1}},a={begin:n+"\\s*:",returnBegin:!0,contains:[{className:"attribute",begin:n,end:"\\s*:",excludeEnd:!0,relevance:0}],relevance:0},t={begin:n+"\\s*{",end:"{",returnBegin:!0,relevance:0,contains:[e.inherit(e.TITLE_MODE,{begin:n})]};return{name:"QML",aliases:["qt"],case_insensitive:!1,keywords:{keyword:"in of on if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await import",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Behavior bool color coordinate date double enumeration font geocircle georectangle geoshape int list matrix4x4 parent point quaternion real rect size string url variant vector2d vector3d vector4d Promise"},contains:[{className:"meta",begin:/^\s*['"]use (strict|asm)['"]/},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"string",begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE,{className:"subst",begin:"\\$\\{",end:"\\}"}]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"number",variants:[{begin:"\\b(0[bB][01]+)"},{begin:"\\b(0[oO][0-7]+)"},{begin:e.C_NUMBER_RE}],relevance:0},{begin:"("+e.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",keywords:"return throw case",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.REGEXP_MODE,{begin:/</,end:/>\s*[);\]]/,relevance:0,subLanguage:"xml"}],relevance:0},{className:"keyword",begin:"\\bsignal\\b",starts:{className:"string",end:"(\\(|:|=|;|,|//|/\\*|$)",returnEnd:!0}},{className:"keyword",begin:"\\bproperty\\b",starts:{className:"string",end:"(:|=|;|,|//|/\\*|$)",returnEnd:!0}},{className:"function",beginKeywords:"function",end:/\{/,excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][0-9A-Za-z$_]*/}),{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]}],illegal:/\[|%/},{begin:"\\."+e.IDENT_RE,relevance:0},r,a,t],illegal:/#/}}}());
\ No newline at end of file
+hljs.registerLanguage("qml",function(e){var r="[a-zA-Z_][a-zA-Z0-9\\._]*",t={cN:"attribute",b:"\\bid\\s*:",starts:{cN:"string",e:r,rE:!1}},a={b:r+"\\s*:",rB:!0,c:[{cN:"attribute",b:r,e:"\\s*:",eE:!0,relevance:0}],relevance:0},n={b:r+"\\s*{",e:"{",rB:!0,relevance:0,c:[e.inherit(e.TM,{b:r})]};return{aliases:["qt"],cI:!1,k:{keyword:"in of on if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await import",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Behavior bool color coordinate date double enumeration font geocircle georectangle geoshape int list matrix4x4 parent point quaternion real rect size string url variant vector2d vector3d vector4dPromise"},c:[{cN:"meta",b:/^\s*['"]use (strict|asm)['"]/},e.ASM,e.QSM,{cN:"string",b:"`",e:"`",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"}]},e.CLCM,e.CBCM,{cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],relevance:0},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{b:/</,e:/>\s*[);\]]/,relevance:0,sL:"xml"}],relevance:0},{cN:"keyword",b:"\\bsignal\\b",starts:{cN:"string",e:"(\\(|:|=|;|,|//|/\\*|$)",rE:!0}},{cN:"keyword",b:"\\bproperty\\b",starts:{cN:"string",e:"(:|=|;|,|//|/\\*|$)",rE:!0}},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:[e.CLCM,e.CBCM]}],i:/\[|%/},{b:"\\."+e.IR,relevance:0},t,a,n],i:/#/}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/r.min.js b/vendor/assets/javascripts/highlightjs/languages/r.min.js
index fbf4dc2861..d1e9a833db 100644
--- a/vendor/assets/javascripts/highlightjs/languages/r.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/r.min.js
@@ -1 +1 @@
-hljs.registerLanguage("r",function(){"use strict";return function(e){var n="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";return{name:"R",contains:[e.HASH_COMMENT_MODE,{begin:n,keywords:{$pattern:n,keyword:"function if in break next repeat else for return switch while try tryCatch stop warning require library attach detach source setMethod setGeneric setGroupGeneric setClass ...",literal:"NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10"},relevance:0},{className:"number",begin:"0[xX][0-9a-fA-F]+[Li]?\\b",relevance:0},{className:"number",begin:"\\d+(?:[eE][+\\-]?\\d*)?L\\b",relevance:0},{className:"number",begin:"\\d+\\.(?!\\d)(?:i\\b)?",relevance:0},{className:"number",begin:"\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{className:"number",begin:"\\.\\d+(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{begin:"`",end:"`",relevance:0},{className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:'"',end:'"'},{begin:"'",end:"'"}]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("r",function(e){var r="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";return{c:[e.HCM,{b:r,l:r,k:{keyword:"function if in break next repeat else for return switch while try tryCatch stop warning require library attach detach source setMethod setGeneric setGroupGeneric setClass ...",literal:"NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10"},relevance:0},{cN:"number",b:"0[xX][0-9a-fA-F]+[Li]?\\b",relevance:0},{cN:"number",b:"\\d+(?:[eE][+\\-]?\\d*)?L\\b",relevance:0},{cN:"number",b:"\\d+\\.(?!\\d)(?:i\\b)?",relevance:0},{cN:"number",b:"\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{cN:"number",b:"\\.\\d+(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{b:"`",e:"`",relevance:0},{cN:"string",c:[e.BE],v:[{b:'"',e:'"'},{b:"'",e:"'"}]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/reasonml.min.js b/vendor/assets/javascripts/highlightjs/languages/reasonml.min.js
index 7ca98fe16a..98cb3b1327 100644
--- a/vendor/assets/javascripts/highlightjs/languages/reasonml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/reasonml.min.js
@@ -1 +1 @@
-hljs.registerLanguage("reasonml",function(){"use strict";return function(e){var n="~?[a-z$_][0-9a-zA-Z$_]*",a="`?[A-Z$_][0-9a-zA-Z$_]*",s="("+["||","&&","++","**","+.","*","/","*.","/.","...","|>"].map((function(e){return e.split("").map((function(e){return"\\"+e})).join("")})).join("|")+"|==|===)",i="\\s+"+s+"\\s+",r={keyword:"and as asr assert begin class constraint do done downto else end exception external for fun function functor if in include inherit initializer land lazy let lor lsl lsr lxor match method mod module mutable new nonrec object of open or private rec sig struct then to try type val virtual when while with",built_in:"array bool bytes char exn|5 float int int32 int64 list lazy_t|5 nativeint|5 ref string unit ",literal:"true false"},l="\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",t={className:"number",relevance:0,variants:[{begin:l},{begin:"\\(\\-"+l+"\\)"}]},c={className:"operator",relevance:0,begin:s},o=[{className:"identifier",relevance:0,begin:n},c,t],g=[e.QUOTE_STRING_MODE,c,{className:"module",begin:"\\b"+a,returnBegin:!0,end:".",contains:[{className:"identifier",begin:a,relevance:0}]}],b=[{className:"module",begin:"\\b"+a,returnBegin:!0,end:".",relevance:0,contains:[{className:"identifier",begin:a,relevance:0}]}],m={className:"function",relevance:0,keywords:r,variants:[{begin:"\\s(\\(\\.?.*?\\)|"+n+")\\s*=>",end:"\\s*=>",returnBegin:!0,relevance:0,contains:[{className:"params",variants:[{begin:n},{begin:"~?[a-z$_][0-9a-zA-Z$_]*(s*:s*[a-z$_][0-9a-z$_]*((s*('?[a-z$_][0-9a-z$_]*s*(,'?[a-z$_][0-9a-z$_]*)*)?s*))?)?(s*:s*[a-z$_][0-9a-z$_]*((s*('?[a-z$_][0-9a-z$_]*s*(,'?[a-z$_][0-9a-z$_]*)*)?s*))?)?"},{begin:/\(\s*\)/}]}]},{begin:"\\s\\(\\.?[^;\\|]*\\)\\s*=>",end:"\\s=>",returnBegin:!0,relevance:0,contains:[{className:"params",relevance:0,variants:[{begin:n,end:"(,|\\n|\\))",relevance:0,contains:[c,{className:"typing",begin:":",end:"(,|\\n)",returnBegin:!0,relevance:0,contains:b}]}]}]},{begin:"\\(\\.\\s"+n+"\\)\\s*=>"}]};g.push(m);var d={className:"constructor",begin:a+"\\(",end:"\\)",illegal:"\\n",keywords:r,contains:[e.QUOTE_STRING_MODE,c,{className:"params",begin:"\\b"+n}]},u={className:"pattern-match",begin:"\\|",returnBegin:!0,keywords:r,end:"=>",relevance:0,contains:[d,c,{relevance:0,className:"constructor",begin:a}]},_={className:"module-access",keywords:r,returnBegin:!0,variants:[{begin:"\\b("+a+"\\.)+"+n},{begin:"\\b("+a+"\\.)+\\(",end:"\\)",returnBegin:!0,contains:[m,{begin:"\\(",end:"\\)",skip:!0}].concat(g)},{begin:"\\b("+a+"\\.)+{",end:"}"}],contains:g};return b.push(_),{name:"ReasonML",aliases:["re"],keywords:r,illegal:"(:\\-|:=|\\${|\\+=)",contains:[e.COMMENT("/\\*","\\*/",{illegal:"^(\\#,\\/\\/)"}),{className:"character",begin:"'(\\\\[^']+|[^'])'",illegal:"\\n",relevance:0},e.QUOTE_STRING_MODE,{className:"literal",begin:"\\(\\)",relevance:0},{className:"literal",begin:"\\[\\|",end:"\\|\\]",relevance:0,contains:o},{className:"literal",begin:"\\[",end:"\\]",relevance:0,contains:o},d,{className:"operator",begin:i,illegal:"\\-\\->",relevance:0},t,e.C_LINE_COMMENT_MODE,u,m,{className:"module-def",begin:"\\bmodule\\s+"+n+"\\s+"+a+"\\s+=\\s+{",end:"}",returnBegin:!0,keywords:r,relevance:0,contains:[{className:"module",relevance:0,begin:a},{begin:"{",end:"}",skip:!0}].concat(g)},_]}}}());
\ No newline at end of file
+hljs.registerLanguage("reasonml",function(e){var a="~?[a-z$_][0-9a-zA-Z$_]*",r="`?[A-Z$_][0-9a-zA-Z$_]*",c="("+["||","&&","++","**","+.","*","/","*.","/.","...","|>"].map(function(e){return e.split("").map(function(e){return"\\"+e}).join("")}).join("|")+"|==|===)",n="\\s+"+c+"\\s+",l={keyword:"and as asr assert begin class constraint do done downto else end exception externalfor fun function functor if in include inherit initializerland lazy let lor lsl lsr lxor match method mod module mutable new nonrecobject of open or private rec sig struct then to try type val virtual when while with",built_in:"array bool bytes char exn|5 float int int32 int64 list lazy_t|5 nativeint|5 ref string unit ",literal:"true false"},t="\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",i={cN:"number",relevance:0,v:[{b:t},{b:"\\(\\-"+t+"\\)"}]},s={cN:"operator",relevance:0,b:c},b=[{cN:"identifier",relevance:0,b:a},s,i],o=[e.QSM,s,{cN:"module",b:"\\b"+r,rB:!0,e:".",c:[{cN:"identifier",b:r,relevance:0}]}],v=[{cN:"module",b:"\\b"+r,rB:!0,e:".",relevance:0,c:[{cN:"identifier",b:r,relevance:0}]}],u={cN:"function",relevance:0,k:l,v:[{b:"\\s(\\(\\.?.*?\\)|"+a+")\\s*=>",e:"\\s*=>",rB:!0,relevance:0,c:[{cN:"params",v:[{b:a},{b:"~?[a-z$_][0-9a-zA-Z$_]*(s*:s*[a-z$_][0-9a-z$_]*((s*('?[a-z$_][0-9a-z$_]*s*(,'?[a-z$_][0-9a-z$_]*)*)?s*))?)?(s*:s*[a-z$_][0-9a-z$_]*((s*('?[a-z$_][0-9a-z$_]*s*(,'?[a-z$_][0-9a-z$_]*)*)?s*))?)?"},{b:/\(\s*\)/}]}]},{b:"\\s\\(\\.?[^;\\|]*\\)\\s*=>",e:"\\s=>",rB:!0,relevance:0,c:[{cN:"params",relevance:0,v:[{b:a,e:"(,|\\n|\\))",relevance:0,c:[s,{cN:"typing",b:":",e:"(,|\\n)",rB:!0,relevance:0,c:v}]}]}]},{b:"\\(\\.\\s"+a+"\\)\\s*=>"}]};o.push(u);var _={cN:"constructor",b:r+"\\(",e:"\\)",i:"\\n",k:l,c:[e.QSM,s,{cN:"params",b:"\\b"+a}]},N={cN:"pattern-match",b:"\\|",rB:!0,k:l,e:"=>",relevance:0,c:[_,s,{relevance:0,cN:"constructor",b:r}]},d={cN:"module-access",k:l,rB:!0,v:[{b:"\\b("+r+"\\.)+"+a},{b:"\\b("+r+"\\.)+\\(",e:"\\)",rB:!0,c:[u,{b:"\\(",e:"\\)",skip:!0}].concat(o)},{b:"\\b("+r+"\\.)+{",e:"}"}],c:o};return v.push(d),{aliases:["re"],k:l,i:"(:\\-|:=|\\${|\\+=)",c:[e.C("/\\*","\\*/",{i:"^(\\#,\\/\\/)"}),{cN:"character",b:"'(\\\\[^']+|[^'])'",i:"\\n",relevance:0},e.QSM,{cN:"literal",b:"\\(\\)",relevance:0},{cN:"literal",b:"\\[\\|",e:"\\|\\]",relevance:0,c:b},{cN:"literal",b:"\\[",e:"\\]",relevance:0,c:b},_,{cN:"operator",b:n,i:"\\-\\->",relevance:0},i,e.CLCM,N,u,{cN:"module-def",b:"\\bmodule\\s+"+a+"\\s+"+r+"\\s+=\\s+{",e:"}",rB:!0,k:l,relevance:0,c:[{cN:"module",relevance:0,b:r},{b:"{",e:"}",skip:!0}].concat(o)},d]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/rib.min.js b/vendor/assets/javascripts/highlightjs/languages/rib.min.js
index c4b62d6e67..e79ffce7ad 100644
--- a/vendor/assets/javascripts/highlightjs/languages/rib.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/rib.min.js
@@ -1 +1 @@
-hljs.registerLanguage("rib",function(){"use strict";return function(e){return{name:"RenderMan RIB",keywords:"ArchiveRecord AreaLightSource Atmosphere Attribute AttributeBegin AttributeEnd Basis Begin Blobby Bound Clipping ClippingPlane Color ColorSamples ConcatTransform Cone CoordinateSystem CoordSysTransform CropWindow Curves Cylinder DepthOfField Detail DetailRange Disk Displacement Display End ErrorHandler Exposure Exterior Format FrameAspectRatio FrameBegin FrameEnd GeneralPolygon GeometricApproximation Geometry Hider Hyperboloid Identity Illuminate Imager Interior LightSource MakeCubeFaceEnvironment MakeLatLongEnvironment MakeShadow MakeTexture Matte MotionBegin MotionEnd NuPatch ObjectBegin ObjectEnd ObjectInstance Opacity Option Orientation Paraboloid Patch PatchMesh Perspective PixelFilter PixelSamples PixelVariance Points PointsGeneralPolygons PointsPolygons Polygon Procedural Projection Quantize ReadArchive RelativeDetail ReverseOrientation Rotate Scale ScreenWindow ShadingInterpolation ShadingRate Shutter Sides Skew SolidBegin SolidEnd Sphere SubdivisionMesh Surface TextureCoordinates Torus Transform TransformBegin TransformEnd TransformPoints Translate TrimCurve WorldBegin WorldEnd",illegal:"</",contains:[e.HASH_COMMENT_MODE,e.C_NUMBER_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("rib",function(e){return{k:"ArchiveRecord AreaLightSource Atmosphere Attribute AttributeBegin AttributeEnd Basis Begin Blobby Bound Clipping ClippingPlane Color ColorSamples ConcatTransform Cone CoordinateSystem CoordSysTransform CropWindow Curves Cylinder DepthOfField Detail DetailRange Disk Displacement Display End ErrorHandler Exposure Exterior Format FrameAspectRatio FrameBegin FrameEnd GeneralPolygon GeometricApproximation Geometry Hider Hyperboloid Identity Illuminate Imager Interior LightSource MakeCubeFaceEnvironment MakeLatLongEnvironment MakeShadow MakeTexture Matte MotionBegin MotionEnd NuPatch ObjectBegin ObjectEnd ObjectInstance Opacity Option Orientation Paraboloid Patch PatchMesh Perspective PixelFilter PixelSamples PixelVariance Points PointsGeneralPolygons PointsPolygons Polygon Procedural Projection Quantize ReadArchive RelativeDetail ReverseOrientation Rotate Scale ScreenWindow ShadingInterpolation ShadingRate Shutter Sides Skew SolidBegin SolidEnd Sphere SubdivisionMesh Surface TextureCoordinates Torus Transform TransformBegin TransformEnd TransformPoints Translate TrimCurve WorldBegin WorldEnd",i:"</",c:[e.HCM,e.CNM,e.ASM,e.QSM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/roboconf.min.js b/vendor/assets/javascripts/highlightjs/languages/roboconf.min.js
index 4606eeaff1..8859fd186b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/roboconf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/roboconf.min.js
@@ -1 +1 @@
-hljs.registerLanguage("roboconf",function(){"use strict";return function(n){var e={className:"attribute",begin:/[a-zA-Z-_]+/,end:/\s*:/,excludeEnd:!0,starts:{end:";",relevance:0,contains:[{className:"variable",begin:/\.[a-zA-Z-_]+/},{className:"keyword",begin:/\(optional\)/}]}};return{name:"Roboconf",aliases:["graph","instances"],case_insensitive:!0,keywords:"import",contains:[{begin:"^facet [a-zA-Z-_][^\\n{]+\\{",end:"}",keywords:"facet",contains:[e,n.HASH_COMMENT_MODE]},{begin:"^\\s*instance of [a-zA-Z-_][^\\n{]+\\{",end:"}",keywords:"name count channels instance-data instance-state instance of",illegal:/\S/,contains:["self",e,n.HASH_COMMENT_MODE]},{begin:"^[a-zA-Z-_][^\\n{]+\\{",end:"}",contains:[e,n.HASH_COMMENT_MODE]},n.HASH_COMMENT_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("roboconf",function(e){var a="[a-zA-Z-_][^\\n{]+\\{",n={cN:"attribute",b:/[a-zA-Z-_]+/,e:/\s*:/,eE:!0,starts:{e:";",relevance:0,c:[{cN:"variable",b:/\.[a-zA-Z-_]+/},{cN:"keyword",b:/\(optional\)/}]}};return{aliases:["graph","instances"],cI:!0,k:"import",c:[{b:"^facet "+a,e:"}",k:"facet",c:[n,e.HCM]},{b:"^\\s*instance of "+a,e:"}",k:"name count channels instance-data instance-state instance of",i:/\S/,c:["self",n,e.HCM]},{b:"^"+a,e:"}",c:[n,e.HCM]},e.HCM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/routeros.min.js b/vendor/assets/javascripts/highlightjs/languages/routeros.min.js
index af2cf1aa59..77c159ae51 100644
--- a/vendor/assets/javascripts/highlightjs/languages/routeros.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/routeros.min.js
@@ -1 +1 @@
-hljs.registerLanguage("routeros",function(){"use strict";return function(e){var n="foreach do while for if from to step else on-error and or not in",r="true false yes no nothing nil null",i={className:"variable",variants:[{begin:/\$[\w\d#@][\w\d_]*/},{begin:/\$\{(.*?)}/}]},s={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,i,{className:"variable",begin:/\$\(/,end:/\)/,contains:[e.BACKSLASH_ESCAPE]}]},t={className:"string",begin:/'/,end:/'/};return{name:"Microtik RouterOS script",aliases:["routeros","mikrotik"],case_insensitive:!0,keywords:{$pattern:/:?[\w-]+/,literal:r,keyword:n+" :"+n.split(" ").join(" :")+" :"+"global local beep delay put len typeof pick log time set find environment terminal error execute parse resolve toarray tobool toid toip toip6 tonum tostr totime".split(" ").join(" :")},contains:[{variants:[{begin:/^@/,end:/$/},{begin:/\/\*/,end:/\*\//},{begin:/%%/,end:/$/},{begin:/^'/,end:/$/},{begin:/^\s*\/[\w-]+=/,end:/$/},{begin:/\/\//,end:/$/},{begin:/^\[\</,end:/\>\]$/},{begin:/<\//,end:/>/},{begin:/^facet /,end:/\}/},{begin:"^1\\.\\.(\\d+)$",end:/$/}],illegal:/./},e.COMMENT("^#","$"),s,t,i,{begin:/[\w-]+\=([^\s\{\}\[\]\(\)]+)/,relevance:0,returnBegin:!0,contains:[{className:"attribute",begin:/[^=]+/},{begin:/=/,endsWithParent:!0,relevance:0,contains:[s,t,i,{className:"literal",begin:"\\b("+r.split(" ").join("|")+")\\b"},{begin:/("[^"]*"|[^\s\{\}\[\]]+)/}]}]},{className:"number",begin:/\*[0-9a-fA-F]+/},{begin:"\\b(add|remove|enable|disable|set|get|print|export|edit|find|run|debug|error|info|warning)([\\s[(]|])",returnBegin:!0,contains:[{className:"builtin-name",begin:/\w+/}]},{className:"built_in",variants:[{begin:"(\\.\\./|/|\\s)((traffic-flow|traffic-generator|firewall|scheduler|aaa|accounting|address-list|address|align|area|bandwidth-server|bfd|bgp|bridge|client|clock|community|config|connection|console|customer|default|dhcp-client|dhcp-server|discovery|dns|e-mail|ethernet|filter|firewall|firmware|gps|graphing|group|hardware|health|hotspot|identity|igmp-proxy|incoming|instance|interface|ip|ipsec|ipv6|irq|l2tp-server|lcd|ldp|logging|mac-server|mac-winbox|mangle|manual|mirror|mme|mpls|nat|nd|neighbor|network|note|ntp|ospf|ospf-v3|ovpn-server|page|peer|pim|ping|policy|pool|port|ppp|pppoe-client|pptp-server|prefix|profile|proposal|proxy|queue|radius|resource|rip|ripng|route|routing|screen|script|security-profiles|server|service|service-port|settings|shares|smb|sms|sniffer|snmp|snooper|socks|sstp-server|system|tool|tracking|type|upgrade|upnp|user-manager|users|user|vlan|secret|vrrp|watchdog|web-access|wireless|pptp|pppoe|lan|wan|layer7-protocol|lease|simple|raw);?\\s)+",relevance:10},{begin:/\.\./}]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("routeros",function(e){var r="foreach do while for if from to step else on-error and or not in",i="true false yes no nothing nil null",o={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},t={cN:"string",b:/"/,e:/"/,c:[e.BE,o,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},s={cN:"string",b:/'/,e:/'/};return{aliases:["routeros","mikrotik"],cI:!0,l:/:?[\w-]+/,k:{literal:i,keyword:r+" :"+r.split(" ").join(" :")+" :"+"global local beep delay put len typeof pick log time set find environment terminal error execute parse resolve toarray tobool toid toip toip6 tonum tostr totime".split(" ").join(" :")},c:[{v:[{b:/^@/,e:/$/},{b:/\/\*/,e:/\*\//},{b:/%%/,e:/$/},{b:/^'/,e:/$/},{b:/^\s*\/[\w-]+=/,e:/$/},{b:/\/\//,e:/$/},{b:/^\[\</,e:/\>\]$/},{b:/<\//,e:/>/},{b:/^facet /,e:/\}/},{b:"^1\\.\\.(\\d+)$",e:/$/}],i:/./},e.C("^#","$"),t,s,o,{b:/[\w-]+\=([^\s\{\}\[\]\(\)]+)/,relevance:0,rB:!0,c:[{cN:"attribute",b:/[^=]+/},{b:/=/,eW:!0,relevance:0,c:[t,s,o,{cN:"literal",b:"\\b("+i.split(" ").join("|")+")\\b"},{b:/("[^"]*"|[^\s\{\}\[\]]+)/}]}]},{cN:"number",b:/\*[0-9a-fA-F]+/},{b:"\\b("+"add remove enable disable set get print export edit find run debug error info warning".split(" ").join("|")+")([\\s[(]|])",rB:!0,c:[{cN:"builtin-name",b:/\w+/}]},{cN:"built_in",v:[{b:"(\\.\\./|/|\\s)(("+"traffic-flow traffic-generator firewall scheduler aaa accounting address-list address align area bandwidth-server bfd bgp bridge client clock community config connection console customer default dhcp-client dhcp-server discovery dns e-mail ethernet filter firewall firmware gps graphing group hardware health hotspot identity igmp-proxy incoming instance interface ip ipsec ipv6 irq l2tp-server lcd ldp logging mac-server mac-winbox mangle manual mirror mme mpls nat nd neighbor network note ntp ospf ospf-v3 ovpn-server page peer pim ping policy pool port ppp pppoe-client pptp-server prefix profile proposal proxy queue radius resource rip ripng route routing screen script security-profiles server service service-port settings shares smb sms sniffer snmp snooper socks sstp-server system tool tracking type upgrade upnp user-manager users user vlan secret vrrp watchdog web-access wireless pptp pppoe lan wan layer7-protocol lease simple raw".split(" ").join("|")+");?\\s)+",relevance:10},{b:/\.\./}]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/rsl.min.js b/vendor/assets/javascripts/highlightjs/languages/rsl.min.js
index e579481403..3f33a6f13c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/rsl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/rsl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("rsl",function(){"use strict";return function(e){return{name:"RenderMan RSL",keywords:{keyword:"float color point normal vector matrix while for if do return else break extern continue",built_in:"abs acos ambient area asin atan atmosphere attribute calculatenormal ceil cellnoise clamp comp concat cos degrees depth Deriv diffuse distance Du Dv environment exp faceforward filterstep floor format fresnel incident length lightsource log match max min mod noise normalize ntransform opposite option phong pnoise pow printf ptlined radians random reflect refract renderinfo round setcomp setxcomp setycomp setzcomp shadow sign sin smoothstep specular specularbrdf spline sqrt step tan texture textureinfo trace transform vtransform xcomp ycomp zcomp"},illegal:"</",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_NUMBER_MODE,{className:"meta",begin:"#",end:"$"},{className:"class",beginKeywords:"surface displacement light volume imager",end:"\\("},{beginKeywords:"illuminate illuminance gather",end:"\\("}]}}}());
\ No newline at end of file
+hljs.registerLanguage("rsl",function(e){return{k:{keyword:"float color point normal vector matrix while for if do return else break extern continue",built_in:"abs acos ambient area asin atan atmosphere attribute calculatenormal ceil cellnoise clamp comp concat cos degrees depth Deriv diffuse distance Du Dv environment exp faceforward filterstep floor format fresnel incident length lightsource log match max min mod noise normalize ntransform opposite option phong pnoise pow printf ptlined radians random reflect refract renderinfo round setcomp setxcomp setycomp setzcomp shadow sign sin smoothstep specular specularbrdf spline sqrt step tan texture textureinfo trace transform vtransform xcomp ycomp zcomp"},i:"</",c:[e.CLCM,e.CBCM,e.QSM,e.ASM,e.CNM,{cN:"meta",b:"#",e:"$"},{cN:"class",bK:"surface displacement light volume imager",e:"\\("},{bK:"illuminate illuminance gather",e:"\\("}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ruby.min.js b/vendor/assets/javascripts/highlightjs/languages/ruby.min.js
index 4b52defe67..0b39b5b16e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ruby.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ruby.min.js
@@ -1 +1 @@
-hljs.registerLanguage("ruby",function(){"use strict";return function(e){var n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",a={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},s={className:"doctag",begin:"@[A-Za-z]+"},i={begin:"#<",end:">"},r=[e.COMMENT("#","$",{contains:[s]}),e.COMMENT("^\\=begin","^\\=end",{contains:[s],relevance:10}),e.COMMENT("^__END__","\\n$")],c={className:"subst",begin:"#\\{",end:"}",keywords:a},t={className:"string",contains:[e.BACKSLASH_ESCAPE,c],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/`/,end:/`/},{begin:"%[qQwWx]?\\(",end:"\\)"},{begin:"%[qQwWx]?\\[",end:"\\]"},{begin:"%[qQwWx]?{",end:"}"},{begin:"%[qQwWx]?<",end:">"},{begin:"%[qQwWx]?/",end:"/"},{begin:"%[qQwWx]?%",end:"%"},{begin:"%[qQwWx]?-",end:"-"},{begin:"%[qQwWx]?\\|",end:"\\|"},{begin:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{begin:/<<[-~]?'?(\w+)(?:.|\n)*?\n\s*\1\b/,returnBegin:!0,contains:[{begin:/<<[-~]?'?/},e.END_SAME_AS_BEGIN({begin:/(\w+)/,end:/(\w+)/,contains:[e.BACKSLASH_ESCAPE,c]})]}]},b={className:"params",begin:"\\(",end:"\\)",endsParent:!0,keywords:a},d=[t,i,{className:"class",beginKeywords:"class module",end:"$|;",illegal:/=/,contains:[e.inherit(e.TITLE_MODE,{begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{begin:"<\\s*",contains:[{begin:"("+e.IDENT_RE+"::)?"+e.IDENT_RE}]}].concat(r)},{className:"function",beginKeywords:"def",end:"$|;",contains:[e.inherit(e.TITLE_MODE,{begin:n}),b].concat(r)},{begin:e.IDENT_RE+"::"},{className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"(\\!|\\?)?:",relevance:0},{className:"symbol",begin:":(?!\\s)",contains:[t,{begin:n}],relevance:0},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{begin:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{className:"params",begin:/\|/,end:/\|/,keywords:a},{begin:"("+e.RE_STARTERS_RE+"|unless)\\s*",keywords:"unless",contains:[i,{className:"regexp",contains:[e.BACKSLASH_ESCAPE,c],illegal:/\n/,variants:[{begin:"/",end:"/[a-z]*"},{begin:"%r{",end:"}[a-z]*"},{begin:"%r\\(",end:"\\)[a-z]*"},{begin:"%r!",end:"![a-z]*"},{begin:"%r\\[",end:"\\][a-z]*"}]}].concat(r),relevance:0}].concat(r);c.contains=d,b.contains=d;var g=[{begin:/^\s*=>/,starts:{end:"$",contains:d}},{className:"meta",begin:"^([>?]>|[\\w#]+\\(\\w+\\):\\d+:\\d+>|(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>)",starts:{end:"$",contains:d}}];return{name:"Ruby",aliases:["rb","gemspec","podspec","thor","irb"],keywords:a,illegal:/\/\*/,contains:r.concat(g).concat(d)}}}());
\ No newline at end of file
+hljs.registerLanguage("ruby",function(e){var c="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",b={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},r={cN:"doctag",b:"@[A-Za-z]+"},a={b:"#<",e:">"},n=[e.C("#","$",{c:[r]}),e.C("^\\=begin","^\\=end",{c:[r],relevance:10}),e.C("^__END__","\\n$")],s={cN:"subst",b:"#\\{",e:"}",k:b},t={cN:"string",c:[e.BE,s],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[qQwWx]?\\(",e:"\\)"},{b:"%[qQwWx]?\\[",e:"\\]"},{b:"%[qQwWx]?{",e:"}"},{b:"%[qQwWx]?<",e:">"},{b:"%[qQwWx]?/",e:"/"},{b:"%[qQwWx]?%",e:"%"},{b:"%[qQwWx]?-",e:"-"},{b:"%[qQwWx]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{b:/<<[-~]?'?(\w+)(?:.|\n)*?\n\s*\1\b/,rB:!0,c:[{b:/<<[-~]?'?/},{b:/\w+/,endSameAsBegin:!0,c:[e.BE,s]}]}]},i={cN:"params",b:"\\(",e:"\\)",endsParent:!0,k:b},l=[t,a,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{b:"<\\s*",c:[{b:"("+e.IR+"::)?"+e.IR}]}].concat(n)},{cN:"function",bK:"def",e:"$|;",c:[e.inherit(e.TM,{b:c}),i].concat(n)},{b:e.IR+"::"},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",relevance:0},{cN:"symbol",b:":(?!\\s)",c:[t,{b:c}],relevance:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{cN:"params",b:/\|/,e:/\|/,k:b},{b:"("+e.RSR+"|unless)\\s*",k:"unless",c:[a,{cN:"regexp",c:[e.BE,s],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}].concat(n),relevance:0}].concat(n);s.c=l;var d=[{b:/^\s*=>/,starts:{e:"$",c:i.c=l}},{cN:"meta",b:"^([>?]>|[\\w#]+\\(\\w+\\):\\d+:\\d+>|(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>)",starts:{e:"$",c:l}}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:b,i:/\/\*/,c:n.concat(d).concat(l)}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ruleslanguage.min.js b/vendor/assets/javascripts/highlightjs/languages/ruleslanguage.min.js
index 66b3a74280..b52a6c89f9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ruleslanguage.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ruleslanguage.min.js
@@ -1 +1 @@
-hljs.registerLanguage("ruleslanguage",function(){"use strict";return function(T){return{name:"Oracle Rules Language",keywords:{keyword:"BILL_PERIOD BILL_START BILL_STOP RS_EFFECTIVE_START RS_EFFECTIVE_STOP RS_JURIS_CODE RS_OPCO_CODE INTDADDATTRIBUTE|5 INTDADDVMSG|5 INTDBLOCKOP|5 INTDBLOCKOPNA|5 INTDCLOSE|5 INTDCOUNT|5 INTDCOUNTSTATUSCODE|5 INTDCREATEMASK|5 INTDCREATEDAYMASK|5 INTDCREATEFACTORMASK|5 INTDCREATEHANDLE|5 INTDCREATEOVERRIDEDAYMASK|5 INTDCREATEOVERRIDEMASK|5 INTDCREATESTATUSCODEMASK|5 INTDCREATETOUPERIOD|5 INTDDELETE|5 INTDDIPTEST|5 INTDEXPORT|5 INTDGETERRORCODE|5 INTDGETERRORMESSAGE|5 INTDISEQUAL|5 INTDJOIN|5 INTDLOAD|5 INTDLOADACTUALCUT|5 INTDLOADDATES|5 INTDLOADHIST|5 INTDLOADLIST|5 INTDLOADLISTDATES|5 INTDLOADLISTENERGY|5 INTDLOADLISTHIST|5 INTDLOADRELATEDCHANNEL|5 INTDLOADSP|5 INTDLOADSTAGING|5 INTDLOADUOM|5 INTDLOADUOMDATES|5 INTDLOADUOMHIST|5 INTDLOADVERSION|5 INTDOPEN|5 INTDREADFIRST|5 INTDREADNEXT|5 INTDRECCOUNT|5 INTDRELEASE|5 INTDREPLACE|5 INTDROLLAVG|5 INTDROLLPEAK|5 INTDSCALAROP|5 INTDSCALE|5 INTDSETATTRIBUTE|5 INTDSETDSTPARTICIPANT|5 INTDSETSTRING|5 INTDSETVALUE|5 INTDSETVALUESTATUS|5 INTDSHIFTSTARTTIME|5 INTDSMOOTH|5 INTDSORT|5 INTDSPIKETEST|5 INTDSUBSET|5 INTDTOU|5 INTDTOURELEASE|5 INTDTOUVALUE|5 INTDUPDATESTATS|5 INTDVALUE|5 STDEV INTDDELETEEX|5 INTDLOADEXACTUAL|5 INTDLOADEXCUT|5 INTDLOADEXDATES|5 INTDLOADEX|5 INTDLOADEXRELATEDCHANNEL|5 INTDSAVEEX|5 MVLOAD|5 MVLOADACCT|5 MVLOADACCTDATES|5 MVLOADACCTHIST|5 MVLOADDATES|5 MVLOADHIST|5 MVLOADLIST|5 MVLOADLISTDATES|5 MVLOADLISTHIST|5 IF FOR NEXT DONE SELECT END CALL ABORT CLEAR CHANNEL FACTOR LIST NUMBER OVERRIDE SET WEEK DISTRIBUTIONNODE ELSE WHEN THEN OTHERWISE IENUM CSV INCLUDE LEAVE RIDER SAVE DELETE NOVALUE SECTION WARN SAVE_UPDATE DETERMINANT LABEL REPORT REVENUE EACH IN FROM TOTAL CHARGE BLOCK AND OR CSV_FILE RATE_CODE AUXILIARY_DEMAND UIDACCOUNT RS BILL_PERIOD_SELECT HOURS_PER_MONTH INTD_ERROR_STOP SEASON_SCHEDULE_NAME ACCOUNTFACTOR ARRAYUPPERBOUND CALLSTOREDPROC GETADOCONNECTION GETCONNECT GETDATASOURCE GETQUALIFIER GETUSERID HASVALUE LISTCOUNT LISTOP LISTUPDATE LISTVALUE PRORATEFACTOR RSPRORATE SETBINPATH SETDBMONITOR WQ_OPEN BILLINGHOURS DATE DATEFROMFLOAT DATETIMEFROMSTRING DATETIMETOSTRING DATETOFLOAT DAY DAYDIFF DAYNAME DBDATETIME HOUR MINUTE MONTH MONTHDIFF MONTHHOURS MONTHNAME ROUNDDATE SAMEWEEKDAYLASTYEAR SECOND WEEKDAY WEEKDIFF YEAR YEARDAY YEARSTR COMPSUM HISTCOUNT HISTMAX HISTMIN HISTMINNZ HISTVALUE MAXNRANGE MAXRANGE MINRANGE COMPIKVA COMPKVA COMPKVARFROMKQKW COMPLF IDATTR FLAG LF2KW LF2KWH MAXKW POWERFACTOR READING2USAGE AVGSEASON MAXSEASON MONTHLYMERGE SEASONVALUE SUMSEASON ACCTREADDATES ACCTTABLELOAD CONFIGADD CONFIGGET CREATEOBJECT CREATEREPORT EMAILCLIENT EXPBLKMDMUSAGE EXPMDMUSAGE EXPORT_USAGE FACTORINEFFECT GETUSERSPECIFIEDSTOP INEFFECT ISHOLIDAY RUNRATE SAVE_PROFILE SETREPORTTITLE USEREXIT WATFORRUNRATE TO TABLE ACOS ASIN ATAN ATAN2 BITAND CEIL COS COSECANT COSH COTANGENT DIVQUOT DIVREM EXP FABS FLOOR FMOD FREPM FREXPN LOG LOG10 MAX MAXN MIN MINNZ MODF POW ROUND ROUND2VALUE ROUNDINT SECANT SIN SINH SQROOT TAN TANH FLOAT2STRING FLOAT2STRINGNC INSTR LEFT LEN LTRIM MID RIGHT RTRIM STRING STRINGNC TOLOWER TOUPPER TRIM NUMDAYS READ_DATE STAGING",built_in:"IDENTIFIER OPTIONS XML_ELEMENT XML_OP XML_ELEMENT_OF DOMDOCCREATE DOMDOCLOADFILE DOMDOCLOADXML DOMDOCSAVEFILE DOMDOCGETROOT DOMDOCADDPI DOMNODEGETNAME DOMNODEGETTYPE DOMNODEGETVALUE DOMNODEGETCHILDCT DOMNODEGETFIRSTCHILD DOMNODEGETSIBLING DOMNODECREATECHILDELEMENT DOMNODESETATTRIBUTE DOMNODEGETCHILDELEMENTCT DOMNODEGETFIRSTCHILDELEMENT DOMNODEGETSIBLINGELEMENT DOMNODEGETATTRIBUTECT DOMNODEGETATTRIBUTEI DOMNODEGETATTRIBUTEBYNAME DOMNODEGETBYNAME"},contains:[T.C_LINE_COMMENT_MODE,T.C_BLOCK_COMMENT_MODE,T.APOS_STRING_MODE,T.QUOTE_STRING_MODE,T.C_NUMBER_MODE,{className:"literal",variants:[{begin:"#\\s+[a-zA-Z\\ \\.]*",relevance:0},{begin:"#[a-zA-Z\\ \\.]+"}]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("ruleslanguage",function(T){return{k:{keyword:"BILL_PERIOD BILL_START BILL_STOP RS_EFFECTIVE_START RS_EFFECTIVE_STOP RS_JURIS_CODE RS_OPCO_CODE INTDADDATTRIBUTE|5 INTDADDVMSG|5 INTDBLOCKOP|5 INTDBLOCKOPNA|5 INTDCLOSE|5 INTDCOUNT|5 INTDCOUNTSTATUSCODE|5 INTDCREATEMASK|5 INTDCREATEDAYMASK|5 INTDCREATEFACTORMASK|5 INTDCREATEHANDLE|5 INTDCREATEOVERRIDEDAYMASK|5 INTDCREATEOVERRIDEMASK|5 INTDCREATESTATUSCODEMASK|5 INTDCREATETOUPERIOD|5 INTDDELETE|5 INTDDIPTEST|5 INTDEXPORT|5 INTDGETERRORCODE|5 INTDGETERRORMESSAGE|5 INTDISEQUAL|5 INTDJOIN|5 INTDLOAD|5 INTDLOADACTUALCUT|5 INTDLOADDATES|5 INTDLOADHIST|5 INTDLOADLIST|5 INTDLOADLISTDATES|5 INTDLOADLISTENERGY|5 INTDLOADLISTHIST|5 INTDLOADRELATEDCHANNEL|5 INTDLOADSP|5 INTDLOADSTAGING|5 INTDLOADUOM|5 INTDLOADUOMDATES|5 INTDLOADUOMHIST|5 INTDLOADVERSION|5 INTDOPEN|5 INTDREADFIRST|5 INTDREADNEXT|5 INTDRECCOUNT|5 INTDRELEASE|5 INTDREPLACE|5 INTDROLLAVG|5 INTDROLLPEAK|5 INTDSCALAROP|5 INTDSCALE|5 INTDSETATTRIBUTE|5 INTDSETDSTPARTICIPANT|5 INTDSETSTRING|5 INTDSETVALUE|5 INTDSETVALUESTATUS|5 INTDSHIFTSTARTTIME|5 INTDSMOOTH|5 INTDSORT|5 INTDSPIKETEST|5 INTDSUBSET|5 INTDTOU|5 INTDTOURELEASE|5 INTDTOUVALUE|5 INTDUPDATESTATS|5 INTDVALUE|5 STDEV INTDDELETEEX|5 INTDLOADEXACTUAL|5 INTDLOADEXCUT|5 INTDLOADEXDATES|5 INTDLOADEX|5 INTDLOADEXRELATEDCHANNEL|5 INTDSAVEEX|5 MVLOAD|5 MVLOADACCT|5 MVLOADACCTDATES|5 MVLOADACCTHIST|5 MVLOADDATES|5 MVLOADHIST|5 MVLOADLIST|5 MVLOADLISTDATES|5 MVLOADLISTHIST|5 IF FOR NEXT DONE SELECT END CALL ABORT CLEAR CHANNEL FACTOR LIST NUMBER OVERRIDE SET WEEK DISTRIBUTIONNODE ELSE WHEN THEN OTHERWISE IENUM CSV INCLUDE LEAVE RIDER SAVE DELETE NOVALUE SECTION WARN SAVE_UPDATE DETERMINANT LABEL REPORT REVENUE EACH IN FROM TOTAL CHARGE BLOCK AND OR CSV_FILE RATE_CODE AUXILIARY_DEMAND UIDACCOUNT RS BILL_PERIOD_SELECT HOURS_PER_MONTH INTD_ERROR_STOP SEASON_SCHEDULE_NAME ACCOUNTFACTOR ARRAYUPPERBOUND CALLSTOREDPROC GETADOCONNECTION GETCONNECT GETDATASOURCE GETQUALIFIER GETUSERID HASVALUE LISTCOUNT LISTOP LISTUPDATE LISTVALUE PRORATEFACTOR RSPRORATE SETBINPATH SETDBMONITOR WQ_OPEN BILLINGHOURS DATE DATEFROMFLOAT DATETIMEFROMSTRING DATETIMETOSTRING DATETOFLOAT DAY DAYDIFF DAYNAME DBDATETIME HOUR MINUTE MONTH MONTHDIFF MONTHHOURS MONTHNAME ROUNDDATE SAMEWEEKDAYLASTYEAR SECOND WEEKDAY WEEKDIFF YEAR YEARDAY YEARSTR COMPSUM HISTCOUNT HISTMAX HISTMIN HISTMINNZ HISTVALUE MAXNRANGE MAXRANGE MINRANGE COMPIKVA COMPKVA COMPKVARFROMKQKW COMPLF IDATTR FLAG LF2KW LF2KWH MAXKW POWERFACTOR READING2USAGE AVGSEASON MAXSEASON MONTHLYMERGE SEASONVALUE SUMSEASON ACCTREADDATES ACCTTABLELOAD CONFIGADD CONFIGGET CREATEOBJECT CREATEREPORT EMAILCLIENT EXPBLKMDMUSAGE EXPMDMUSAGE EXPORT_USAGE FACTORINEFFECT GETUSERSPECIFIEDSTOP INEFFECT ISHOLIDAY RUNRATE SAVE_PROFILE SETREPORTTITLE USEREXIT WATFORRUNRATE TO TABLE ACOS ASIN ATAN ATAN2 BITAND CEIL COS COSECANT COSH COTANGENT DIVQUOT DIVREM EXP FABS FLOOR FMOD FREPM FREXPN LOG LOG10 MAX MAXN MIN MINNZ MODF POW ROUND ROUND2VALUE ROUNDINT SECANT SIN SINH SQROOT TAN TANH FLOAT2STRING FLOAT2STRINGNC INSTR LEFT LEN LTRIM MID RIGHT RTRIM STRING STRINGNC TOLOWER TOUPPER TRIM NUMDAYS READ_DATE STAGING",built_in:"IDENTIFIER OPTIONS XML_ELEMENT XML_OP XML_ELEMENT_OF DOMDOCCREATE DOMDOCLOADFILE DOMDOCLOADXML DOMDOCSAVEFILE DOMDOCGETROOT DOMDOCADDPI DOMNODEGETNAME DOMNODEGETTYPE DOMNODEGETVALUE DOMNODEGETCHILDCT DOMNODEGETFIRSTCHILD DOMNODEGETSIBLING DOMNODECREATECHILDELEMENT DOMNODESETATTRIBUTE DOMNODEGETCHILDELEMENTCT DOMNODEGETFIRSTCHILDELEMENT DOMNODEGETSIBLINGELEMENT DOMNODEGETATTRIBUTECT DOMNODEGETATTRIBUTEI DOMNODEGETATTRIBUTEBYNAME DOMNODEGETBYNAME"},c:[T.CLCM,T.CBCM,T.ASM,T.QSM,T.CNM,{cN:"literal",v:[{b:"#\\s+[a-zA-Z\\ \\.]*",relevance:0},{b:"#[a-zA-Z\\ \\.]+"}]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/rust.min.js b/vendor/assets/javascripts/highlightjs/languages/rust.min.js
index 37ec123f25..45be976a12 100644
--- a/vendor/assets/javascripts/highlightjs/languages/rust.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/rust.min.js
@@ -1 +1 @@
-hljs.registerLanguage("rust",function(){"use strict";return function(e){var n="([ui](8|16|32|64|128|size)|f(32|64))?",t="drop i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize f32 f64 str char bool Box Option Result String Vec Copy Send Sized Sync Drop Fn FnMut FnOnce ToOwned Clone Debug PartialEq PartialOrd Eq Ord AsRef AsMut Into From Default Iterator Extend IntoIterator DoubleEndedIterator ExactSizeIterator SliceConcatExt ToString assert! assert_eq! bitflags! bytes! cfg! col! concat! concat_idents! debug_assert! debug_assert_eq! env! panic! file! format! format_args! include_bin! include_str! line! local_data_key! module_path! option_env! print! println! select! stringify! try! unimplemented! unreachable! vec! write! writeln! macro_rules! assert_ne! debug_assert_ne!";return{name:"Rust",aliases:["rs"],keywords:{$pattern:e.IDENT_RE+"!?",keyword:"abstract as async await become box break const continue crate do dyn else enum extern false final fn for if impl in let loop macro match mod move mut override priv pub ref return self Self static struct super trait true try type typeof unsafe unsized use virtual where while yield",literal:"true false Some None Ok Err",built_in:t},illegal:"</",contains:[e.C_LINE_COMMENT_MODE,e.COMMENT("/\\*","\\*/",{contains:["self"]}),e.inherit(e.QUOTE_STRING_MODE,{begin:/b?"/,illegal:null}),{className:"string",variants:[{begin:/r(#*)"(.|\n)*?"\1(?!#)/},{begin:/b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/}]},{className:"symbol",begin:/'[a-zA-Z_][a-zA-Z0-9_]*/},{className:"number",variants:[{begin:"\\b0b([01_]+)"+n},{begin:"\\b0o([0-7_]+)"+n},{begin:"\\b0x([A-Fa-f0-9_]+)"+n},{begin:"\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)"+n}],relevance:0},{className:"function",beginKeywords:"fn",end:"(\\(|<)",excludeEnd:!0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"meta",begin:"#\\!?\\[",end:"\\]",contains:[{className:"meta-string",begin:/"/,end:/"/}]},{className:"class",beginKeywords:"type",end:";",contains:[e.inherit(e.UNDERSCORE_TITLE_MODE,{endsParent:!0})],illegal:"\\S"},{className:"class",beginKeywords:"trait enum struct union",end:"{",contains:[e.inherit(e.UNDERSCORE_TITLE_MODE,{endsParent:!0})],illegal:"[\\w\\d]"},{begin:e.IDENT_RE+"::",keywords:{built_in:t}},{begin:"->"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("rust",function(e){var t="([ui](8|16|32|64|128|size)|f(32|64))?",r="drop i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize f32 f64 str char bool Box Option Result String Vec Copy Send Sized Sync Drop Fn FnMut FnOnce ToOwned Clone Debug PartialEq PartialOrd Eq Ord AsRef AsMut Into From Default Iterator Extend IntoIterator DoubleEndedIterator ExactSizeIterator SliceConcatExt ToString assert! assert_eq! bitflags! bytes! cfg! col! concat! concat_idents! debug_assert! debug_assert_eq! env! panic! file! format! format_args! include_bin! include_str! line! local_data_key! module_path! option_env! print! println! select! stringify! try! unimplemented! unreachable! vec! write! writeln! macro_rules! assert_ne! debug_assert_ne!";return{aliases:["rs"],k:{keyword:"abstract as async await become box break const continue crate do dyn else enum extern false final fn for if impl in let loop macro match mod move mut override priv pub ref return self Self static struct super trait true try type typeof unsafe unsized use virtual where while yield",literal:"true false Some None Ok Err",built_in:r},l:e.IR+"!?",i:"</",c:[e.CLCM,e.C("/\\*","\\*/",{c:["self"]}),e.inherit(e.QSM,{b:/b?"/,i:null}),{cN:"string",v:[{b:/r(#*)"(.|\n)*?"\1(?!#)/},{b:/b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/}]},{cN:"symbol",b:/'[a-zA-Z_][a-zA-Z0-9_]*/},{cN:"number",v:[{b:"\\b0b([01_]+)"+t},{b:"\\b0o([0-7_]+)"+t},{b:"\\b0x([A-Fa-f0-9_]+)"+t},{b:"\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)"+t}],relevance:0},{cN:"function",bK:"fn",e:"(\\(|<)",eE:!0,c:[e.UTM]},{cN:"meta",b:"#\\!?\\[",e:"\\]",c:[{cN:"meta-string",b:/"/,e:/"/}]},{cN:"class",bK:"type",e:";",c:[e.inherit(e.UTM,{endsParent:!0})],i:"\\S"},{cN:"class",bK:"trait enum struct union",e:"{",c:[e.inherit(e.UTM,{endsParent:!0})],i:"[\\w\\d]"},{b:e.IR+"::",k:{built_in:r}},{b:"->"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/sas.min.js b/vendor/assets/javascripts/highlightjs/languages/sas.min.js
index 5c03807171..045fc36710 100644
--- a/vendor/assets/javascripts/highlightjs/languages/sas.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/sas.min.js
@@ -1 +1 @@
-hljs.registerLanguage("sas",function(){"use strict";return function(e){return{name:"SAS",aliases:["sas","SAS"],case_insensitive:!0,keywords:{literal:"null missing _all_ _automatic_ _character_ _infile_ _n_ _name_ _null_ _numeric_ _user_ _webout_",meta:"do if then else end until while abort array attrib by call cards cards4 catname continue datalines datalines4 delete delim delimiter display dm drop endsas error file filename footnote format goto in infile informat input keep label leave length libname link list lostcard merge missing modify options output out page put redirect remove rename replace retain return select set skip startsas stop title update waitsas where window x systask add and alter as cascade check create delete describe distinct drop foreign from group having index insert into in key like message modify msgtype not null on or order primary references reset restrict select set table unique update validate view where"},contains:[{className:"keyword",begin:/^\s*(proc [\w\d_]+|data|run|quit)[\s\;]/},{className:"variable",begin:/\&[a-zA-Z_\&][a-zA-Z0-9_]*\.?/},{className:"emphasis",begin:/^\s*datalines|cards.*;/,end:/^\s*;\s*$/},{className:"built_in",begin:"%(bquote|nrbquote|cmpres|qcmpres|compstor|datatyp|display|do|else|end|eval|global|goto|if|index|input|keydef|label|left|length|let|local|lowcase|macro|mend|nrbquote|nrquote|nrstr|put|qcmpres|qleft|qlowcase|qscan|qsubstr|qsysfunc|qtrim|quote|qupcase|scan|str|substr|superq|syscall|sysevalf|sysexec|sysfunc|sysget|syslput|sysprod|sysrc|sysrput|then|to|trim|unquote|until|upcase|verify|while|window)"},{className:"name",begin:/%[a-zA-Z_][a-zA-Z_0-9]*/},{className:"meta",begin:"[^%](abs|addr|airy|arcos|arsin|atan|attrc|attrn|band|betainv|blshift|bnot|bor|brshift|bxor|byte|cdf|ceil|cexist|cinv|close|cnonct|collate|compbl|compound|compress|cos|cosh|css|curobs|cv|daccdb|daccdbsl|daccsl|daccsyd|dacctab|dairy|date|datejul|datepart|datetime|day|dclose|depdb|depdbsl|depdbsl|depsl|depsl|depsyd|depsyd|deptab|deptab|dequote|dhms|dif|digamma|dim|dinfo|dnum|dopen|doptname|doptnum|dread|dropnote|dsname|erf|erfc|exist|exp|fappend|fclose|fcol|fdelete|fetch|fetchobs|fexist|fget|fileexist|filename|fileref|finfo|finv|fipname|fipnamel|fipstate|floor|fnonct|fnote|fopen|foptname|foptnum|fpoint|fpos|fput|fread|frewind|frlen|fsep|fuzz|fwrite|gaminv|gamma|getoption|getvarc|getvarn|hbound|hms|hosthelp|hour|ibessel|index|indexc|indexw|input|inputc|inputn|int|intck|intnx|intrr|irr|jbessel|juldate|kurtosis|lag|lbound|left|length|lgamma|libname|libref|log|log10|log2|logpdf|logpmf|logsdf|lowcase|max|mdy|mean|min|minute|mod|month|mopen|mort|n|netpv|nmiss|normal|note|npv|open|ordinal|pathname|pdf|peek|peekc|pmf|point|poisson|poke|probbeta|probbnml|probchi|probf|probgam|probhypr|probit|probnegb|probnorm|probt|put|putc|putn|qtr|quote|ranbin|rancau|ranexp|rangam|range|rank|rannor|ranpoi|rantbl|rantri|ranuni|repeat|resolve|reverse|rewind|right|round|saving|scan|sdf|second|sign|sin|sinh|skewness|soundex|spedis|sqrt|std|stderr|stfips|stname|stnamel|substr|sum|symget|sysget|sysmsg|sysprod|sysrc|system|tan|tanh|time|timepart|tinv|tnonct|today|translate|tranwrd|trigamma|trim|trimn|trunc|uniform|upcase|uss|var|varfmt|varinfmt|varlabel|varlen|varname|varnum|varray|varrayx|vartype|verify|vformat|vformatd|vformatdx|vformatn|vformatnx|vformatw|vformatwx|vformatx|vinarray|vinarrayx|vinformat|vinformatd|vinformatdx|vinformatn|vinformatnx|vinformatw|vinformatwx|vinformatx|vlabel|vlabelx|vlength|vlengthx|vname|vnamex|vtype|vtypex|weekday|year|yyq|zipfips|zipname|zipnamel|zipstate)[(]"},{className:"string",variants:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},e.COMMENT("\\*",";"),e.C_BLOCK_COMMENT_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("sas",function(e){return{aliases:["sas","SAS"],cI:!0,k:{literal:"null missing _all_ _automatic_ _character_ _infile_ _n_ _name_ _null_ _numeric_ _user_ _webout_",meta:"do if then else end until while abort array attrib by call cards cards4 catname continue datalines datalines4 delete delim delimiter display dm drop endsas error file filename footnote format goto in infile informat input keep label leave length libname link list lostcard merge missing modify options output out page put redirect remove rename replace retain return select set skip startsas stop title update waitsas where window x systask add and alter as cascade check create delete describe distinct drop foreign from group having index insert into in key like message modify msgtype not null on or order primary references reset restrict select set table unique update validate view where"},c:[{cN:"keyword",b:/^\s*(proc [\w\d_]+|data|run|quit)[\s\;]/},{cN:"variable",b:/\&[a-zA-Z_\&][a-zA-Z0-9_]*\.?/},{cN:"emphasis",b:/^\s*datalines|cards.*;/,e:/^\s*;\s*$/},{cN:"built_in",b:"%(bquote|nrbquote|cmpres|qcmpres|compstor|datatyp|display|do|else|end|eval|global|goto|if|index|input|keydef|label|left|length|let|local|lowcase|macro|mend|nrbquote|nrquote|nrstr|put|qcmpres|qleft|qlowcase|qscan|qsubstr|qsysfunc|qtrim|quote|qupcase|scan|str|substr|superq|syscall|sysevalf|sysexec|sysfunc|sysget|syslput|sysprod|sysrc|sysrput|then|to|trim|unquote|until|upcase|verify|while|window)"},{cN:"name",b:/%[a-zA-Z_][a-zA-Z_0-9]*/},{cN:"meta",b:"[^%](abs|addr|airy|arcos|arsin|atan|attrc|attrn|band|betainv|blshift|bnot|bor|brshift|bxor|byte|cdf|ceil|cexist|cinv|close|cnonct|collate|compbl|compound|compress|cos|cosh|css|curobs|cv|daccdb|daccdbsl|daccsl|daccsyd|dacctab|dairy|date|datejul|datepart|datetime|day|dclose|depdb|depdbsl|depdbsl|depsl|depsl|depsyd|depsyd|deptab|deptab|dequote|dhms|dif|digamma|dim|dinfo|dnum|dopen|doptname|doptnum|dread|dropnote|dsname|erf|erfc|exist|exp|fappend|fclose|fcol|fdelete|fetch|fetchobs|fexist|fget|fileexist|filename|fileref|finfo|finv|fipname|fipnamel|fipstate|floor|fnonct|fnote|fopen|foptname|foptnum|fpoint|fpos|fput|fread|frewind|frlen|fsep|fuzz|fwrite|gaminv|gamma|getoption|getvarc|getvarn|hbound|hms|hosthelp|hour|ibessel|index|indexc|indexw|input|inputc|inputn|int|intck|intnx|intrr|irr|jbessel|juldate|kurtosis|lag|lbound|left|length|lgamma|libname|libref|log|log10|log2|logpdf|logpmf|logsdf|lowcase|max|mdy|mean|min|minute|mod|month|mopen|mort|n|netpv|nmiss|normal|note|npv|open|ordinal|pathname|pdf|peek|peekc|pmf|point|poisson|poke|probbeta|probbnml|probchi|probf|probgam|probhypr|probit|probnegb|probnorm|probt|put|putc|putn|qtr|quote|ranbin|rancau|ranexp|rangam|range|rank|rannor|ranpoi|rantbl|rantri|ranuni|repeat|resolve|reverse|rewind|right|round|saving|scan|sdf|second|sign|sin|sinh|skewness|soundex|spedis|sqrt|std|stderr|stfips|stname|stnamel|substr|sum|symget|sysget|sysmsg|sysprod|sysrc|system|tan|tanh|time|timepart|tinv|tnonct|today|translate|tranwrd|trigamma|trim|trimn|trunc|uniform|upcase|uss|var|varfmt|varinfmt|varlabel|varlen|varname|varnum|varray|varrayx|vartype|verify|vformat|vformatd|vformatdx|vformatn|vformatnx|vformatw|vformatwx|vformatx|vinarray|vinarrayx|vinformat|vinformatd|vinformatdx|vinformatn|vinformatnx|vinformatw|vinformatwx|vinformatx|vlabel|vlabelx|vlength|vlengthx|vname|vnamex|vtype|vtypex|weekday|year|yyq|zipfips|zipname|zipnamel|zipstate)[(]"},{cN:"string",v:[e.ASM,e.QSM]},e.C("\\*",";"),e.CBCM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/scala.min.js b/vendor/assets/javascripts/highlightjs/languages/scala.min.js
index 2ab49f3af8..1cc913c9f8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/scala.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/scala.min.js
@@ -1 +1 @@
-hljs.registerLanguage("scala",function(){"use strict";return function(e){var n={className:"subst",variants:[{begin:"\\$[A-Za-z0-9_]+"},{begin:"\\${",end:"}"}]},a={className:"string",variants:[{begin:'"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{begin:'"""',end:'"""',relevance:10},{begin:'[a-z]+"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE,n]},{className:"string",begin:'[a-z]+"""',end:'"""',contains:[n],relevance:10}]},s={className:"type",begin:"\\b[A-Z][A-Za-z0-9_]*",relevance:0},t={className:"title",begin:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/,relevance:0},i={className:"class",beginKeywords:"class object trait type",end:/[:={\[\n;]/,excludeEnd:!0,contains:[{beginKeywords:"extends with",relevance:10},{begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0,relevance:0,contains:[s]},{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,relevance:0,contains:[s]},t]},l={className:"function",beginKeywords:"def",end:/[:={\[(\n;]/,excludeEnd:!0,contains:[t]};return{name:"Scala",keywords:{literal:"true false null",keyword:"type yield lazy override def with val var sealed abstract private trait object if forSome for while throw finally protected extends import final return else break new catch super class case package default try this match continue throws implicit"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,{className:"symbol",begin:"'\\w[\\w\\d_]*(?!')"},s,l,i,e.C_NUMBER_MODE,{className:"meta",begin:"@[A-Za-z]+"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("scala",function(e){var t={cN:"subst",v:[{b:"\\$[A-Za-z0-9_]+"},{b:"\\${",e:"}"}]},a={cN:"string",v:[{b:'"',e:'"',i:"\\n",c:[e.BE]},{b:'"""',e:'"""',relevance:10},{b:'[a-z]+"',e:'"',i:"\\n",c:[e.BE,t]},{cN:"string",b:'[a-z]+"""',e:'"""',c:[t],relevance:10}]},c={cN:"type",b:"\\b[A-Z][A-Za-z0-9_]*",relevance:0},r={cN:"title",b:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/,relevance:0},n={cN:"class",bK:"class object trait type",e:/[:={\[\n;]/,eE:!0,c:[{bK:"extends with",relevance:10},{b:/\[/,e:/\]/,eB:!0,eE:!0,relevance:0,c:[c]},{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,relevance:0,c:[c]},r]},l={cN:"function",bK:"def",e:/[:={\[(\n;]/,eE:!0,c:[r]};return{k:{literal:"true false null",keyword:"type yield lazy override def with val var sealed abstract private trait object if forSome for while throw finally protected extends import final return else break new catch super class case package default try this match continue throws implicit"},c:[e.CLCM,e.CBCM,a,{cN:"symbol",b:"'\\w[\\w\\d_]*(?!')"},c,l,n,e.CNM,{cN:"meta",b:"@[A-Za-z]+"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/scheme.min.js b/vendor/assets/javascripts/highlightjs/languages/scheme.min.js
index 9ab4af08d4..432db62524 100644
--- a/vendor/assets/javascripts/highlightjs/languages/scheme.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/scheme.min.js
@@ -1 +1 @@
-hljs.registerLanguage("scheme",function(){"use strict";return function(e){var t="[^\\(\\)\\[\\]\\{\\}\",'`;#|\\\\\\s]+",n={$pattern:t,"builtin-name":"case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules ' * + , ,@ - ... / ; < <= = => > >= ` abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"},r={className:"literal",begin:"(#t|#f|#\\\\"+t+"|#\\\\.)"},a={className:"number",variants:[{begin:"(\\-|\\+)?\\d+([./]\\d+)?",relevance:0},{begin:"(\\-|\\+)?\\d+([./]\\d+)?[+\\-](\\-|\\+)?\\d+([./]\\d+)?i",relevance:0},{begin:"#b[0-1]+(/[0-1]+)?"},{begin:"#o[0-7]+(/[0-7]+)?"},{begin:"#x[0-9a-f]+(/[0-9a-f]+)?"}]},i=e.QUOTE_STRING_MODE,c=[e.COMMENT(";","$",{relevance:0}),e.COMMENT("#\\|","\\|#")],s={begin:t,relevance:0},l={className:"symbol",begin:"'"+t},o={endsWithParent:!0,relevance:0},u={variants:[{begin:/'/},{begin:"`"}],contains:[{begin:"\\(",end:"\\)",contains:["self",r,i,a,s,l]}]},g={className:"name",begin:t,keywords:n},d={variants:[{begin:"\\(",end:"\\)"},{begin:"\\[",end:"\\]"}],contains:[{begin:/lambda/,endsWithParent:!0,returnBegin:!0,contains:[g,{begin:/\(/,end:/\)/,endsParent:!0,contains:[s]}]},g,o]};return o.contains=[r,a,i,s,l,u,d].concat(c),{name:"Scheme",illegal:/\S/,contains:[e.SHEBANG(),a,i,l,u,d].concat(c)}}}());
\ No newline at end of file
+hljs.registerLanguage("scheme",function(e){var t="[^\\(\\)\\[\\]\\{\\}\",'`;#|\\\\\\s]+",r="(\\-|\\+)?\\d+([./]\\d+)?",a={cN:"literal",b:"(#t|#f|#\\\\"+t+"|#\\\\.)"},i={cN:"number",v:[{b:r,relevance:0},{b:"(\\-|\\+)?\\d+([./]\\d+)?[+\\-](\\-|\\+)?\\d+([./]\\d+)?i",relevance:0},{b:"#b[0-1]+(/[0-1]+)?"},{b:"#o[0-7]+(/[0-7]+)?"},{b:"#x[0-9a-f]+(/[0-9a-f]+)?"}]},n=e.QSM,c=[e.C(";","$",{relevance:0}),e.C("#\\|","\\|#")],l={b:t,relevance:0},s={cN:"symbol",b:"'"+t},o={eW:!0,relevance:0},u={v:[{b:/'/},{b:"`"}],c:[{b:"\\(",e:"\\)",c:["self",a,n,i,l,s]}]},p={cN:"name",b:t,l:t,k:{"builtin-name":"case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules ' * + , ,@ - ... / ; < <= = => > >= ` abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"}},d={v:[{b:"\\(",e:"\\)"},{b:"\\[",e:"\\]"}],c:[{b:/lambda/,eW:!0,rB:!0,c:[p,{b:/\(/,e:/\)/,endsParent:!0,c:[l]}]},p,o]};return o.c=[a,i,n,l,s,u,d].concat(c),{i:/\S/,c:[{cN:"meta",b:"^#!",e:"$"},i,n,s,u,d].concat(c)}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/scilab.min.js b/vendor/assets/javascripts/highlightjs/languages/scilab.min.js
index 00fe529eef..3139b01c0f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/scilab.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/scilab.min.js
@@ -1 +1 @@
-hljs.registerLanguage("scilab",function(){"use strict";return function(e){var n=[e.C_NUMBER_MODE,{className:"string",begin:"'|\"",end:"'|\"",contains:[e.BACKSLASH_ESCAPE,{begin:"''"}]}];return{name:"Scilab",aliases:["sci"],keywords:{$pattern:/%?\w+/,keyword:"abort break case clear catch continue do elseif else endfunction end for function global if pause return resume select try then while",literal:"%f %F %t %T %pi %eps %inf %nan %e %i %z %s",built_in:"abs and acos asin atan ceil cd chdir clearglobal cosh cos cumprod deff disp error exec execstr exists exp eye gettext floor fprintf fread fsolve imag isdef isempty isinfisnan isvector lasterror length load linspace list listfiles log10 log2 log max min msprintf mclose mopen ones or pathconvert poly printf prod pwd rand real round sinh sin size gsort sprintf sqrt strcat strcmps tring sum system tanh tan type typename warning zeros matrix"},illegal:'("|#|/\\*|\\s+/\\w+)',contains:[{className:"function",beginKeywords:"function",end:"$",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",begin:"\\(",end:"\\)"}]},{begin:"[a-zA-Z_][a-zA-Z_0-9]*('+[\\.']*|[\\.']+)",end:"",relevance:0},{begin:"\\[",end:"\\]'*[\\.']*",relevance:0,contains:n},e.COMMENT("//","$")].concat(n)}}}());
\ No newline at end of file
+hljs.registerLanguage("scilab",function(e){var s=[e.CNM,{cN:"string",b:"'|\"",e:"'|\"",c:[e.BE,{b:"''"}]}];return{aliases:["sci"],l:/%?\w+/,k:{keyword:"abort break case clear catch continue do elseif else endfunction end for function global if pause return resume select try then while",literal:"%f %F %t %T %pi %eps %inf %nan %e %i %z %s",built_in:"abs and acos asin atan ceil cd chdir clearglobal cosh cos cumprod deff disp error exec execstr exists exp eye gettext floor fprintf fread fsolve imag isdef isempty isinfisnan isvector lasterror length load linspace list listfiles log10 log2 log max min msprintf mclose mopen ones or pathconvert poly printf prod pwd rand real round sinh sin size gsort sprintf sqrt strcat strcmps tring sum system tanh tan type typename warning zeros matrix"},i:'("|#|/\\*|\\s+/\\w+)',c:[{cN:"function",bK:"function",e:"$",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)"}]},{b:"[a-zA-Z_][a-zA-Z_0-9]*('+[\\.']*|[\\.']+)",e:"",relevance:0},{b:"\\[",e:"\\]'*[\\.']*",relevance:0,c:s},e.C("//","$")].concat(s)}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/scss.min.js b/vendor/assets/javascripts/highlightjs/languages/scss.min.js
index 96d9774934..343dcaf57e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/scss.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/scss.min.js
@@ -1 +1 @@
-hljs.registerLanguage("scss",function(){"use strict";return function(e){var t={className:"variable",begin:"(\\$[a-zA-Z-][a-zA-Z0-9_-]*)\\b"},i={className:"number",begin:"#[0-9A-Fa-f]+"};return e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_BLOCK_COMMENT_MODE,{name:"SCSS",case_insensitive:!0,illegal:"[=/|']",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"selector-id",begin:"\\#[A-Za-z0-9_-]+",relevance:0},{className:"selector-class",begin:"\\.[A-Za-z0-9_-]+",relevance:0},{className:"selector-attr",begin:"\\[",end:"\\]",illegal:"$"},{className:"selector-tag",begin:"\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b",relevance:0},{className:"selector-pseudo",begin:":(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)"},{className:"selector-pseudo",begin:"::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)"},t,{className:"attribute",begin:"\\b(src|z-index|word-wrap|word-spacing|word-break|width|widows|white-space|visibility|vertical-align|unicode-bidi|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform|top|text-underline-position|text-transform|text-shadow|text-rendering|text-overflow|text-indent|text-decoration-style|text-decoration-line|text-decoration-color|text-decoration|text-align-last|text-align|tab-size|table-layout|right|resize|quotes|position|pointer-events|perspective-origin|perspective|page-break-inside|page-break-before|page-break-after|padding-top|padding-right|padding-left|padding-bottom|padding|overflow-y|overflow-x|overflow-wrap|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|order|opacity|object-position|object-fit|normal|none|nav-up|nav-right|nav-left|nav-index|nav-down|min-width|min-height|max-width|max-height|mask|marks|margin-top|margin-right|margin-left|margin-bottom|margin|list-style-type|list-style-position|list-style-image|list-style|line-height|letter-spacing|left|justify-content|initial|inherit|ime-mode|image-orientation|image-resolution|image-rendering|icon|hyphens|height|font-weight|font-variant-ligatures|font-variant|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|float|flex-wrap|flex-shrink|flex-grow|flex-flow|flex-direction|flex-basis|flex|filter|empty-cells|display|direction|cursor|counter-reset|counter-increment|content|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|columns|color|clip-path|clip|clear|caption-side|break-inside|break-before|break-after|box-sizing|box-shadow|box-decoration-break|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-left-width|border-left-style|border-left-color|border-left|border-image-width|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-attachment|background-blend-mode|background|backface-visibility|auto|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|align-self|align-items|align-content)\\b",illegal:"[^\\s]"},{begin:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"},{begin:":",end:";",contains:[t,i,e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{className:"meta",begin:"!important"}]},{begin:"@(page|font-face)",lexemes:"@[a-z-]+",keywords:"@page @font-face"},{begin:"@",end:"[{;]",returnBegin:!0,keywords:"and or not only",contains:[{begin:"@[a-z-]+",className:"keyword"},t,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,i,e.CSS_NUMBER_MODE]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("scss",function(e){var t="@[a-z-]+",r={cN:"variable",b:"(\\$[a-zA-Z-][a-zA-Z0-9_-]*)\\b"},i={cN:"number",b:"#[0-9A-Fa-f]+"};e.CSSNM,e.QSM,e.ASM,e.CBCM;return{cI:!0,i:"[=/|']",c:[e.CLCM,e.CBCM,{cN:"selector-id",b:"\\#[A-Za-z0-9_-]+",relevance:0},{cN:"selector-class",b:"\\.[A-Za-z0-9_-]+",relevance:0},{cN:"selector-attr",b:"\\[",e:"\\]",i:"$"},{cN:"selector-tag",b:"\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b",relevance:0},{cN:"selector-pseudo",b:":(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)"},{cN:"selector-pseudo",b:"::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)"},r,{cN:"attribute",b:"\\b(src|z-index|word-wrap|word-spacing|word-break|width|widows|white-space|visibility|vertical-align|unicode-bidi|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform|top|text-underline-position|text-transform|text-shadow|text-rendering|text-overflow|text-indent|text-decoration-style|text-decoration-line|text-decoration-color|text-decoration|text-align-last|text-align|tab-size|table-layout|right|resize|quotes|position|pointer-events|perspective-origin|perspective|page-break-inside|page-break-before|page-break-after|padding-top|padding-right|padding-left|padding-bottom|padding|overflow-y|overflow-x|overflow-wrap|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|order|opacity|object-position|object-fit|normal|none|nav-up|nav-right|nav-left|nav-index|nav-down|min-width|min-height|max-width|max-height|mask|marks|margin-top|margin-right|margin-left|margin-bottom|margin|list-style-type|list-style-position|list-style-image|list-style|line-height|letter-spacing|left|justify-content|initial|inherit|ime-mode|image-orientation|image-resolution|image-rendering|icon|hyphens|height|font-weight|font-variant-ligatures|font-variant|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|float|flex-wrap|flex-shrink|flex-grow|flex-flow|flex-direction|flex-basis|flex|filter|empty-cells|display|direction|cursor|counter-reset|counter-increment|content|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|columns|color|clip-path|clip|clear|caption-side|break-inside|break-before|break-after|box-sizing|box-shadow|box-decoration-break|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-left-width|border-left-style|border-left-color|border-left|border-image-width|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-attachment|background-blend-mode|background|backface-visibility|auto|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|align-self|align-items|align-content)\\b",i:"[^\\s]"},{b:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"},{b:":",e:";",c:[r,i,e.CSSNM,e.QSM,e.ASM,{cN:"meta",b:"!important"}]},{b:"@(page|font-face)",l:t,k:"@page @font-face"},{b:"@",e:"[{;]",rB:!0,k:"and or not only",c:[{b:t,cN:"keyword"},r,e.QSM,e.ASM,i,e.CSSNM]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/shell.min.js b/vendor/assets/javascripts/highlightjs/languages/shell.min.js
index 713ebe819e..0c9369a625 100644
--- a/vendor/assets/javascripts/highlightjs/languages/shell.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/shell.min.js
@@ -1 +1 @@
-hljs.registerLanguage("shell",function(){"use strict";return function(s){return{name:"Shell Session",aliases:["console"],contains:[{className:"meta",begin:"^\\s{0,3}[/\\w\\d\\[\\]()@-]*[>%$#]",starts:{end:"$",subLanguage:"bash"}}]}}}());
\ No newline at end of file
+hljs.registerLanguage("shell",function(s){return{aliases:["console"],c:[{cN:"meta",b:"^\\s{0,3}[/\\w\\d\\[\\]()@-]*[>%$#]",starts:{e:"$",sL:"bash"}}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/smali.min.js b/vendor/assets/javascripts/highlightjs/languages/smali.min.js
index d280e6ce9d..5fdec41ed4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/smali.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/smali.min.js
@@ -1 +1 @@
-hljs.registerLanguage("smali",function(){"use strict";return function(e){var n=["add","and","cmp","cmpg","cmpl","const","div","double","float","goto","if","int","long","move","mul","neg","new","nop","not","or","rem","return","shl","shr","sput","sub","throw","ushr","xor"];return{name:"Smali",aliases:["smali"],contains:[{className:"string",begin:'"',end:'"',relevance:0},e.COMMENT("#","$",{relevance:0}),{className:"keyword",variants:[{begin:"\\s*\\.end\\s[a-zA-Z0-9]*"},{begin:"^[ ]*\\.[a-zA-Z]*",relevance:0},{begin:"\\s:[a-zA-Z_0-9]*",relevance:0},{begin:"\\s(transient|constructor|abstract|final|synthetic|public|private|protected|static|bridge|system)"}]},{className:"built_in",variants:[{begin:"\\s("+n.join("|")+")\\s"},{begin:"\\s("+n.join("|")+")((\\-|/)[a-zA-Z0-9]+)+\\s",relevance:10},{begin:"\\s(aget|aput|array|check|execute|fill|filled|goto/16|goto/32|iget|instance|invoke|iput|monitor|packed|sget|sparse)((\\-|/)[a-zA-Z0-9]+)*\\s",relevance:10}]},{className:"class",begin:"L[^(;:\n]*;",relevance:0},{begin:"[vp][0-9]+"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("smali",function(e){var n=["add","and","cmp","cmpg","cmpl","const","div","double","float","goto","if","int","long","move","mul","neg","new","nop","not","or","rem","return","shl","shr","sput","sub","throw","ushr","xor"];return{aliases:["smali"],c:[{cN:"string",b:'"',e:'"',relevance:0},e.C("#","$",{relevance:0}),{cN:"keyword",v:[{b:"\\s*\\.end\\s[a-zA-Z0-9]*"},{b:"^[ ]*\\.[a-zA-Z]*",relevance:0},{b:"\\s:[a-zA-Z_0-9]*",relevance:0},{b:"\\s("+["transient","constructor","abstract","final","synthetic","public","private","protected","static","bridge","system"].join("|")+")"}]},{cN:"built_in",v:[{b:"\\s("+n.join("|")+")\\s"},{b:"\\s("+n.join("|")+")((\\-|/)[a-zA-Z0-9]+)+\\s",relevance:10},{b:"\\s("+["aget","aput","array","check","execute","fill","filled","goto/16","goto/32","iget","instance","invoke","iput","monitor","packed","sget","sparse"].join("|")+")((\\-|/)[a-zA-Z0-9]+)*\\s",relevance:10}]},{cN:"class",b:"L[^(;:\n]*;",relevance:0},{b:"[vp][0-9]+"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/smalltalk.min.js b/vendor/assets/javascripts/highlightjs/languages/smalltalk.min.js
index 05ef50cf30..fc731127a1 100644
--- a/vendor/assets/javascripts/highlightjs/languages/smalltalk.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/smalltalk.min.js
@@ -1 +1 @@
-hljs.registerLanguage("smalltalk",function(){"use strict";return function(e){var a={className:"string",begin:"\\$.{1}"},n={className:"symbol",begin:"#"+e.UNDERSCORE_IDENT_RE};return{name:"Smalltalk",aliases:["st"],keywords:"self super nil true false thisContext",contains:[e.COMMENT('"','"'),e.APOS_STRING_MODE,{className:"type",begin:"\\b[A-Z][A-Za-z0-9_]*",relevance:0},{begin:"[a-z][a-zA-Z0-9_]*:",relevance:0},e.C_NUMBER_MODE,n,a,{begin:"\\|[ ]*[a-z][a-zA-Z0-9_]*([ ]+[a-z][a-zA-Z0-9_]*)*[ ]*\\|",returnBegin:!0,end:/\|/,illegal:/\S/,contains:[{begin:"(\\|[ ]*)?[a-z][a-zA-Z0-9_]*"}]},{begin:"\\#\\(",end:"\\)",contains:[e.APOS_STRING_MODE,a,e.C_NUMBER_MODE,n]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("smalltalk",function(e){var a="[a-z][a-zA-Z0-9_]*",s={cN:"string",b:"\\$.{1}"},l={cN:"symbol",b:"#"+e.UIR};return{aliases:["st"],k:"self super nil true false thisContext",c:[e.C('"','"'),e.ASM,{cN:"type",b:"\\b[A-Z][A-Za-z0-9_]*",relevance:0},{b:a+":",relevance:0},e.CNM,l,s,{b:"\\|[ ]*"+a+"([ ]+"+a+")*[ ]*\\|",rB:!0,e:/\|/,i:/\S/,c:[{b:"(\\|[ ]*)?"+a}]},{b:"\\#\\(",e:"\\)",c:[e.ASM,s,e.CNM,l]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/sml.min.js b/vendor/assets/javascripts/highlightjs/languages/sml.min.js
index 67fb6d8323..9cc189c029 100644
--- a/vendor/assets/javascripts/highlightjs/languages/sml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/sml.min.js
@@ -1 +1 @@
-hljs.registerLanguage("sml",function(){"use strict";return function(e){return{name:"SML (Standard ML)",aliases:["ml"],keywords:{$pattern:"[a-z_]\\w*!?",keyword:"abstype and andalso as case datatype do else end eqtype exception fn fun functor handle if in include infix infixr let local nonfix of op open orelse raise rec sharing sig signature struct structure then type val with withtype where while",built_in:"array bool char exn int list option order real ref string substring vector unit word",literal:"true false NONE SOME LESS EQUAL GREATER nil"},illegal:/\/\/|>>/,contains:[{className:"literal",begin:/\[(\|\|)?\]|\(\)/,relevance:0},e.COMMENT("\\(\\*","\\*\\)",{contains:["self"]}),{className:"symbol",begin:"'[A-Za-z_](?!')[\\w']*"},{className:"type",begin:"`[A-Z][\\w']*"},{className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},{begin:"[a-z_]\\w*'[\\w']*"},e.inherit(e.APOS_STRING_MODE,{className:"string",relevance:0}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),{className:"number",begin:"\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",relevance:0},{begin:/[-=]>/}]}}}());
\ No newline at end of file
+hljs.registerLanguage("sml",function(e){return{aliases:["ml"],k:{keyword:"abstype and andalso as case datatype do else end eqtype exception fn fun functor handle if in include infix infixr let local nonfix of op open orelse raise rec sharing sig signature struct structure then type val with withtype where while",built_in:"array bool char exn int list option order real ref string substring vector unit word",literal:"true false NONE SOME LESS EQUAL GREATER nil"},i:/\/\/|>>/,l:"[a-z_]\\w*!?",c:[{cN:"literal",b:/\[(\|\|)?\]|\(\)/,relevance:0},e.C("\\(\\*","\\*\\)",{c:["self"]}),{cN:"symbol",b:"'[A-Za-z_](?!')[\\w']*"},{cN:"type",b:"`[A-Z][\\w']*"},{cN:"type",b:"\\b[A-Z][\\w']*",relevance:0},{b:"[a-z_]\\w*'[\\w']*"},e.inherit(e.ASM,{cN:"string",relevance:0}),e.inherit(e.QSM,{i:null}),{cN:"number",b:"\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",relevance:0},{b:/[-=]>/}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/sqf.min.js b/vendor/assets/javascripts/highlightjs/languages/sqf.min.js
index 730aacd285..d8e94666ee 100644
--- a/vendor/assets/javascripts/highlightjs/languages/sqf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/sqf.min.js
@@ -1 +1 @@
-hljs.registerLanguage("sqf",function(){"use strict";return function(e){var t={className:"string",variants:[{begin:'"',end:'"',contains:[{begin:'""',relevance:0}]},{begin:"'",end:"'",contains:[{begin:"''",relevance:0}]}]},a={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{"meta-keyword":"define undef ifdef ifndef else endif include"},contains:[{begin:/\\\n/,relevance:0},e.inherit(t,{className:"meta-string"}),{className:"meta-string",begin:/<[^\n>]*>/,end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]};return{name:"SQF",aliases:["sqf"],case_insensitive:!0,keywords:{keyword:"case catch default do else exit exitWith for forEach from if private switch then throw to try waitUntil while with",built_in:"abs accTime acos action actionIDs actionKeys actionKeysImages actionKeysNames actionKeysNamesArray actionName actionParams activateAddons activatedAddons activateKey add3DENConnection add3DENEventHandler add3DENLayer addAction addBackpack addBackpackCargo addBackpackCargoGlobal addBackpackGlobal addCamShake addCuratorAddons addCuratorCameraArea addCuratorEditableObjects addCuratorEditingArea addCuratorPoints addEditorObject addEventHandler addForce addGoggles addGroupIcon addHandgunItem addHeadgear addItem addItemCargo addItemCargoGlobal addItemPool addItemToBackpack addItemToUniform addItemToVest addLiveStats addMagazine addMagazineAmmoCargo addMagazineCargo addMagazineCargoGlobal addMagazineGlobal addMagazinePool addMagazines addMagazineTurret addMenu addMenuItem addMissionEventHandler addMPEventHandler addMusicEventHandler addOwnedMine addPlayerScores addPrimaryWeaponItem addPublicVariableEventHandler addRating addResources addScore addScoreSide addSecondaryWeaponItem addSwitchableUnit addTeamMember addToRemainsCollector addTorque addUniform addVehicle addVest addWaypoint addWeapon addWeaponCargo addWeaponCargoGlobal addWeaponGlobal addWeaponItem addWeaponPool addWeaponTurret admin agent agents AGLToASL aimedAtTarget aimPos airDensityRTD airplaneThrottle airportSide AISFinishHeal alive all3DENEntities allAirports allControls allCurators allCutLayers allDead allDeadMen allDisplays allGroups allMapMarkers allMines allMissionObjects allow3DMode allowCrewInImmobile allowCuratorLogicIgnoreAreas allowDamage allowDammage allowFileOperations allowFleeing allowGetIn allowSprint allPlayers allSimpleObjects allSites allTurrets allUnits allUnitsUAV allVariables ammo ammoOnPylon and animate animateBay animateDoor animatePylon animateSource animationNames animationPhase animationSourcePhase animationState append apply armoryPoints arrayIntersect asin ASLToAGL ASLToATL assert assignAsCargo assignAsCargoIndex assignAsCommander assignAsDriver assignAsGunner assignAsTurret assignCurator assignedCargo assignedCommander assignedDriver assignedGunner assignedItems assignedTarget assignedTeam assignedVehicle assignedVehicleRole assignItem assignTeam assignToAirport atan atan2 atg ATLToASL attachedObject attachedObjects attachedTo attachObject attachTo attackEnabled backpack backpackCargo backpackContainer backpackItems backpackMagazines backpackSpaceFor behaviour benchmark binocular boundingBox boundingBoxReal boundingCenter breakOut breakTo briefingName buildingExit buildingPos buttonAction buttonSetAction cadetMode call callExtension camCommand camCommit camCommitPrepared camCommitted camConstuctionSetParams camCreate camDestroy cameraEffect cameraEffectEnableHUD cameraInterest cameraOn cameraView campaignConfigFile camPreload camPreloaded camPrepareBank camPrepareDir camPrepareDive camPrepareFocus camPrepareFov camPrepareFovRange camPreparePos camPrepareRelPos camPrepareTarget camSetBank camSetDir camSetDive camSetFocus camSetFov camSetFovRange camSetPos camSetRelPos camSetTarget camTarget camUseNVG canAdd canAddItemToBackpack canAddItemToUniform canAddItemToVest cancelSimpleTaskDestination canFire canMove canSlingLoad canStand canSuspend canTriggerDynamicSimulation canUnloadInCombat canVehicleCargo captive captiveNum cbChecked cbSetChecked ceil channelEnabled cheatsEnabled checkAIFeature checkVisibility className clearAllItemsFromBackpack clearBackpackCargo clearBackpackCargoGlobal clearGroupIcons clearItemCargo clearItemCargoGlobal clearItemPool clearMagazineCargo clearMagazineCargoGlobal clearMagazinePool clearOverlay clearRadio clearWeaponCargo clearWeaponCargoGlobal clearWeaponPool clientOwner closeDialog closeDisplay closeOverlay collapseObjectTree collect3DENHistory collectiveRTD combatMode commandArtilleryFire commandChat commander commandFire commandFollow commandFSM commandGetOut commandingMenu commandMove commandRadio commandStop commandSuppressiveFire commandTarget commandWatch comment commitOverlay compile compileFinal completedFSM composeText configClasses configFile configHierarchy configName configProperties configSourceAddonList configSourceMod configSourceModList confirmSensorTarget connectTerminalToUAV controlsGroupCtrl copyFromClipboard copyToClipboard copyWaypoints cos count countEnemy countFriendly countSide countType countUnknown create3DENComposition create3DENEntity createAgent createCenter createDialog createDiaryLink createDiaryRecord createDiarySubject createDisplay createGearDialog createGroup createGuardedPoint createLocation createMarker createMarkerLocal createMenu createMine createMissionDisplay createMPCampaignDisplay createSimpleObject createSimpleTask createSite createSoundSource createTask createTeam createTrigger createUnit createVehicle createVehicleCrew createVehicleLocal crew ctAddHeader ctAddRow ctClear ctCurSel ctData ctFindHeaderRows ctFindRowHeader ctHeaderControls ctHeaderCount ctRemoveHeaders ctRemoveRows ctrlActivate ctrlAddEventHandler ctrlAngle ctrlAutoScrollDelay ctrlAutoScrollRewind ctrlAutoScrollSpeed ctrlChecked ctrlClassName ctrlCommit ctrlCommitted ctrlCreate ctrlDelete ctrlEnable ctrlEnabled ctrlFade ctrlHTMLLoaded ctrlIDC ctrlIDD ctrlMapAnimAdd ctrlMapAnimClear ctrlMapAnimCommit ctrlMapAnimDone ctrlMapCursor ctrlMapMouseOver ctrlMapScale ctrlMapScreenToWorld ctrlMapWorldToScreen ctrlModel ctrlModelDirAndUp ctrlModelScale ctrlParent ctrlParentControlsGroup ctrlPosition ctrlRemoveAllEventHandlers ctrlRemoveEventHandler ctrlScale ctrlSetActiveColor ctrlSetAngle ctrlSetAutoScrollDelay ctrlSetAutoScrollRewind ctrlSetAutoScrollSpeed ctrlSetBackgroundColor ctrlSetChecked ctrlSetEventHandler ctrlSetFade ctrlSetFocus ctrlSetFont ctrlSetFontH1 ctrlSetFontH1B ctrlSetFontH2 ctrlSetFontH2B ctrlSetFontH3 ctrlSetFontH3B ctrlSetFontH4 ctrlSetFontH4B ctrlSetFontH5 ctrlSetFontH5B ctrlSetFontH6 ctrlSetFontH6B ctrlSetFontHeight ctrlSetFontHeightH1 ctrlSetFontHeightH2 ctrlSetFontHeightH3 ctrlSetFontHeightH4 ctrlSetFontHeightH5 ctrlSetFontHeightH6 ctrlSetFontHeightSecondary ctrlSetFontP ctrlSetFontPB ctrlSetFontSecondary ctrlSetForegroundColor ctrlSetModel ctrlSetModelDirAndUp ctrlSetModelScale ctrlSetPixelPrecision ctrlSetPosition ctrlSetScale ctrlSetStructuredText ctrlSetText ctrlSetTextColor ctrlSetTooltip ctrlSetTooltipColorBox ctrlSetTooltipColorShade ctrlSetTooltipColorText ctrlShow ctrlShown ctrlText ctrlTextHeight ctrlTextWidth ctrlType ctrlVisible ctRowControls ctRowCount ctSetCurSel ctSetData ctSetHeaderTemplate ctSetRowTemplate ctSetValue ctValue curatorAddons curatorCamera curatorCameraArea curatorCameraAreaCeiling curatorCoef curatorEditableObjects curatorEditingArea curatorEditingAreaType curatorMouseOver curatorPoints curatorRegisteredObjects curatorSelected curatorWaypointCost current3DENOperation currentChannel currentCommand currentMagazine currentMagazineDetail currentMagazineDetailTurret currentMagazineTurret currentMuzzle currentNamespace currentTask currentTasks currentThrowable currentVisionMode currentWaypoint currentWeapon currentWeaponMode currentWeaponTurret currentZeroing cursorObject cursorTarget customChat customRadio cutFadeOut cutObj cutRsc cutText damage date dateToNumber daytime deActivateKey debriefingText debugFSM debugLog deg delete3DENEntities deleteAt deleteCenter deleteCollection deleteEditorObject deleteGroup deleteGroupWhenEmpty deleteIdentity deleteLocation deleteMarker deleteMarkerLocal deleteRange deleteResources deleteSite deleteStatus deleteTeam deleteVehicle deleteVehicleCrew deleteWaypoint detach detectedMines diag_activeMissionFSMs diag_activeScripts diag_activeSQFScripts diag_activeSQSScripts diag_captureFrame diag_captureFrameToFile diag_captureSlowFrame diag_codePerformance diag_drawMode diag_enable diag_enabled diag_fps diag_fpsMin diag_frameNo diag_lightNewLoad diag_list diag_log diag_logSlowFrame diag_mergeConfigFile diag_recordTurretLimits diag_setLightNew diag_tickTime diag_toggle dialog diarySubjectExists didJIP didJIPOwner difficulty difficultyEnabled difficultyEnabledRTD difficultyOption direction directSay disableAI disableCollisionWith disableConversation disableDebriefingStats disableMapIndicators disableNVGEquipment disableRemoteSensors disableSerialization disableTIEquipment disableUAVConnectability disableUserInput displayAddEventHandler displayCtrl displayParent displayRemoveAllEventHandlers displayRemoveEventHandler displaySetEventHandler dissolveTeam distance distance2D distanceSqr distributionRegion do3DENAction doArtilleryFire doFire doFollow doFSM doGetOut doMove doorPhase doStop doSuppressiveFire doTarget doWatch drawArrow drawEllipse drawIcon drawIcon3D drawLine drawLine3D drawLink drawLocation drawPolygon drawRectangle drawTriangle driver drop dynamicSimulationDistance dynamicSimulationDistanceCoef dynamicSimulationEnabled dynamicSimulationSystemEnabled echo edit3DENMissionAttributes editObject editorSetEventHandler effectiveCommander emptyPositions enableAI enableAIFeature enableAimPrecision enableAttack enableAudioFeature enableAutoStartUpRTD enableAutoTrimRTD enableCamShake enableCaustics enableChannel enableCollisionWith enableCopilot enableDebriefingStats enableDiagLegend enableDynamicSimulation enableDynamicSimulationSystem enableEndDialog enableEngineArtillery enableEnvironment enableFatigue enableGunLights enableInfoPanelComponent enableIRLasers enableMimics enablePersonTurret enableRadio enableReload enableRopeAttach enableSatNormalOnDetail enableSaving enableSentences enableSimulation enableSimulationGlobal enableStamina enableTeamSwitch enableTraffic enableUAVConnectability enableUAVWaypoints enableVehicleCargo enableVehicleSensor enableWeaponDisassembly endLoadingScreen endMission engineOn enginesIsOnRTD enginesRpmRTD enginesTorqueRTD entities environmentEnabled estimatedEndServerTime estimatedTimeLeft evalObjectArgument everyBackpack everyContainer exec execEditorScript execFSM execVM exp expectedDestination exportJIPMessages eyeDirection eyePos face faction fadeMusic fadeRadio fadeSound fadeSpeech failMission fillWeaponsFromPool find findCover findDisplay findEditorObject findEmptyPosition findEmptyPositionReady findIf findNearestEnemy finishMissionInit finite fire fireAtTarget firstBackpack flag flagAnimationPhase flagOwner flagSide flagTexture fleeing floor flyInHeight flyInHeightASL fog fogForecast fogParams forceAddUniform forcedMap forceEnd forceFlagTexture forceFollowRoad forceMap forceRespawn forceSpeed forceWalk forceWeaponFire forceWeatherChange forEachMember forEachMemberAgent forEachMemberTeam forgetTarget format formation formationDirection formationLeader formationMembers formationPosition formationTask formatText formLeader freeLook fromEditor fuel fullCrew gearIDCAmmoCount gearSlotAmmoCount gearSlotData get3DENActionState get3DENAttribute get3DENCamera get3DENConnections get3DENEntity get3DENEntityID get3DENGrid get3DENIconsVisible get3DENLayerEntities get3DENLinesVisible get3DENMissionAttribute get3DENMouseOver get3DENSelected getAimingCoef getAllEnvSoundControllers getAllHitPointsDamage getAllOwnedMines getAllSoundControllers getAmmoCargo getAnimAimPrecision getAnimSpeedCoef getArray getArtilleryAmmo getArtilleryComputerSettings getArtilleryETA getAssignedCuratorLogic getAssignedCuratorUnit getBackpackCargo getBleedingRemaining getBurningValue getCameraViewDirection getCargoIndex getCenterOfMass getClientState getClientStateNumber getCompatiblePylonMagazines getConnectedUAV getContainerMaxLoad getCursorObjectParams getCustomAimCoef getDammage getDescription getDir getDirVisual getDLCAssetsUsage getDLCAssetsUsageByName getDLCs getEditorCamera getEditorMode getEditorObjectScope getElevationOffset getEnvSoundController getFatigue getForcedFlagTexture getFriend getFSMVariable getFuelCargo getGroupIcon getGroupIconParams getGroupIcons getHideFrom getHit getHitIndex getHitPointDamage getItemCargo getMagazineCargo getMarkerColor getMarkerPos getMarkerSize getMarkerType getMass getMissionConfig getMissionConfigValue getMissionDLCs getMissionLayerEntities getModelInfo getMousePosition getMusicPlayedTime getNumber getObjectArgument getObjectChildren getObjectDLC getObjectMaterials getObjectProxy getObjectTextures getObjectType getObjectViewDistance getOxygenRemaining getPersonUsedDLCs getPilotCameraDirection getPilotCameraPosition getPilotCameraRotation getPilotCameraTarget getPlateNumber getPlayerChannel getPlayerScores getPlayerUID getPos getPosASL getPosASLVisual getPosASLW getPosATL getPosATLVisual getPosVisual getPosWorld getPylonMagazines getRelDir getRelPos getRemoteSensorsDisabled getRepairCargo getResolution getShadowDistance getShotParents getSlingLoad getSoundController getSoundControllerResult getSpeed getStamina getStatValue getSuppression getTerrainGrid getTerrainHeightASL getText getTotalDLCUsageTime getUnitLoadout getUnitTrait getUserMFDText getUserMFDvalue getVariable getVehicleCargo getWeaponCargo getWeaponSway getWingsOrientationRTD getWingsPositionRTD getWPPos glanceAt globalChat globalRadio goggles goto group groupChat groupFromNetId groupIconSelectable groupIconsVisible groupId groupOwner groupRadio groupSelectedUnits groupSelectUnit gunner gusts halt handgunItems handgunMagazine handgunWeapon handsHit hasInterface hasPilotCamera hasWeapon hcAllGroups hcGroupParams hcLeader hcRemoveAllGroups hcRemoveGroup hcSelected hcSelectGroup hcSetGroup hcShowBar hcShownBar headgear hideBody hideObject hideObjectGlobal hideSelection hint hintC hintCadet hintSilent hmd hostMission htmlLoad HUDMovementLevels humidity image importAllGroups importance in inArea inAreaArray incapacitatedState inflame inflamed infoPanel infoPanelComponentEnabled infoPanelComponents infoPanels inGameUISetEventHandler inheritsFrom initAmbientLife inPolygon inputAction inRangeOfArtillery insertEditorObject intersect is3DEN is3DENMultiplayer isAbleToBreathe isAgent isArray isAutoHoverOn isAutonomous isAutotest isBleeding isBurning isClass isCollisionLightOn isCopilotEnabled isDamageAllowed isDedicated isDLCAvailable isEngineOn isEqualTo isEqualType isEqualTypeAll isEqualTypeAny isEqualTypeArray isEqualTypeParams isFilePatchingEnabled isFlashlightOn isFlatEmpty isForcedWalk isFormationLeader isGroupDeletedWhenEmpty isHidden isInRemainsCollector isInstructorFigureEnabled isIRLaserOn isKeyActive isKindOf isLaserOn isLightOn isLocalized isManualFire isMarkedForCollection isMultiplayer isMultiplayerSolo isNil isNull isNumber isObjectHidden isObjectRTD isOnRoad isPipEnabled isPlayer isRealTime isRemoteExecuted isRemoteExecutedJIP isServer isShowing3DIcons isSimpleObject isSprintAllowed isStaminaEnabled isSteamMission isStreamFriendlyUIEnabled isText isTouchingGround isTurnedOut isTutHintsEnabled isUAVConnectable isUAVConnected isUIContext isUniformAllowed isVehicleCargo isVehicleRadarOn isVehicleSensorEnabled isWalking isWeaponDeployed isWeaponRested itemCargo items itemsWithMagazines join joinAs joinAsSilent joinSilent joinString kbAddDatabase kbAddDatabaseTargets kbAddTopic kbHasTopic kbReact kbRemoveTopic kbTell kbWasSaid keyImage keyName knowsAbout land landAt landResult language laserTarget lbAdd lbClear lbColor lbColorRight lbCurSel lbData lbDelete lbIsSelected lbPicture lbPictureRight lbSelection lbSetColor lbSetColorRight lbSetCurSel lbSetData lbSetPicture lbSetPictureColor lbSetPictureColorDisabled lbSetPictureColorSelected lbSetPictureRight lbSetPictureRightColor lbSetPictureRightColorDisabled lbSetPictureRightColorSelected lbSetSelectColor lbSetSelectColorRight lbSetSelected lbSetText lbSetTextRight lbSetTooltip lbSetValue lbSize lbSort lbSortByValue lbText lbTextRight lbValue leader leaderboardDeInit leaderboardGetRows leaderboardInit leaderboardRequestRowsFriends leaderboardsRequestUploadScore leaderboardsRequestUploadScoreKeepBest leaderboardState leaveVehicle libraryCredits libraryDisclaimers lifeState lightAttachObject lightDetachObject lightIsOn lightnings limitSpeed linearConversion lineIntersects lineIntersectsObjs lineIntersectsSurfaces lineIntersectsWith linkItem list listObjects listRemoteTargets listVehicleSensors ln lnbAddArray lnbAddColumn lnbAddRow lnbClear lnbColor lnbCurSelRow lnbData lnbDeleteColumn lnbDeleteRow lnbGetColumnsPosition lnbPicture lnbSetColor lnbSetColumnsPos lnbSetCurSelRow lnbSetData lnbSetPicture lnbSetText lnbSetValue lnbSize lnbSort lnbSortByValue lnbText lnbValue load loadAbs loadBackpack loadFile loadGame loadIdentity loadMagazine loadOverlay loadStatus loadUniform loadVest local localize locationPosition lock lockCameraTo lockCargo lockDriver locked lockedCargo lockedDriver lockedTurret lockIdentity lockTurret lockWP log logEntities logNetwork logNetworkTerminate lookAt lookAtPos magazineCargo magazines magazinesAllTurrets magazinesAmmo magazinesAmmoCargo magazinesAmmoFull magazinesDetail magazinesDetailBackpack magazinesDetailUniform magazinesDetailVest magazinesTurret magazineTurretAmmo mapAnimAdd mapAnimClear mapAnimCommit mapAnimDone mapCenterOnCamera mapGridPosition markAsFinishedOnSteam markerAlpha markerBrush markerColor markerDir markerPos markerShape markerSize markerText markerType max members menuAction menuAdd menuChecked menuClear menuCollapse menuData menuDelete menuEnable menuEnabled menuExpand menuHover menuPicture menuSetAction menuSetCheck menuSetData menuSetPicture menuSetValue menuShortcut menuShortcutText menuSize menuSort menuText menuURL menuValue min mineActive mineDetectedBy missionConfigFile missionDifficulty missionName missionNamespace missionStart missionVersion mod modelToWorld modelToWorldVisual modelToWorldVisualWorld modelToWorldWorld modParams moonIntensity moonPhase morale move move3DENCamera moveInAny moveInCargo moveInCommander moveInDriver moveInGunner moveInTurret moveObjectToEnd moveOut moveTime moveTo moveToCompleted moveToFailed musicVolume name nameSound nearEntities nearestBuilding nearestLocation nearestLocations nearestLocationWithDubbing nearestObject nearestObjects nearestTerrainObjects nearObjects nearObjectsReady nearRoads nearSupplies nearTargets needReload netId netObjNull newOverlay nextMenuItemIndex nextWeatherChange nMenuItems not numberOfEnginesRTD numberToDate objectCurators objectFromNetId objectParent objStatus onBriefingGroup onBriefingNotes onBriefingPlan onBriefingTeamSwitch onCommandModeChanged onDoubleClick onEachFrame onGroupIconClick onGroupIconOverEnter onGroupIconOverLeave onHCGroupSelectionChanged onMapSingleClick onPlayerConnected onPlayerDisconnected onPreloadFinished onPreloadStarted onShowNewObject onTeamSwitch openCuratorInterface openDLCPage openMap openSteamApp openYoutubeVideo or orderGetIn overcast overcastForecast owner param params parseNumber parseSimpleArray parseText parsingNamespace particlesQuality pickWeaponPool pitch pixelGrid pixelGridBase pixelGridNoUIScale pixelH pixelW playableSlotsNumber playableUnits playAction playActionNow player playerRespawnTime playerSide playersNumber playGesture playMission playMove playMoveNow playMusic playScriptedMission playSound playSound3D position positionCameraToWorld posScreenToWorld posWorldToScreen ppEffectAdjust ppEffectCommit ppEffectCommitted ppEffectCreate ppEffectDestroy ppEffectEnable ppEffectEnabled ppEffectForceInNVG precision preloadCamera preloadObject preloadSound preloadTitleObj preloadTitleRsc preprocessFile preprocessFileLineNumbers primaryWeapon primaryWeaponItems primaryWeaponMagazine priority processDiaryLink productVersion profileName profileNamespace profileNameSteam progressLoadingScreen progressPosition progressSetPosition publicVariable publicVariableClient publicVariableServer pushBack pushBackUnique putWeaponPool queryItemsPool queryMagazinePool queryWeaponPool rad radioChannelAdd radioChannelCreate radioChannelRemove radioChannelSetCallSign radioChannelSetLabel radioVolume rain rainbow random rank rankId rating rectangular registeredTasks registerTask reload reloadEnabled remoteControl remoteExec remoteExecCall remoteExecutedOwner remove3DENConnection remove3DENEventHandler remove3DENLayer removeAction removeAll3DENEventHandlers removeAllActions removeAllAssignedItems removeAllContainers removeAllCuratorAddons removeAllCuratorCameraAreas removeAllCuratorEditingAreas removeAllEventHandlers removeAllHandgunItems removeAllItems removeAllItemsWithMagazines removeAllMissionEventHandlers removeAllMPEventHandlers removeAllMusicEventHandlers removeAllOwnedMines removeAllPrimaryWeaponItems removeAllWeapons removeBackpack removeBackpackGlobal removeCuratorAddons removeCuratorCameraArea removeCuratorEditableObjects removeCuratorEditingArea removeDrawIcon removeDrawLinks removeEventHandler removeFromRemainsCollector removeGoggles removeGroupIcon removeHandgunItem removeHeadgear removeItem removeItemFromBackpack removeItemFromUniform removeItemFromVest removeItems removeMagazine removeMagazineGlobal removeMagazines removeMagazinesTurret removeMagazineTurret removeMenuItem removeMissionEventHandler removeMPEventHandler removeMusicEventHandler removeOwnedMine removePrimaryWeaponItem removeSecondaryWeaponItem removeSimpleTask removeSwitchableUnit removeTeamMember removeUniform removeVest removeWeapon removeWeaponAttachmentCargo removeWeaponCargo removeWeaponGlobal removeWeaponTurret reportRemoteTarget requiredVersion resetCamShake resetSubgroupDirection resize resources respawnVehicle restartEditorCamera reveal revealMine reverse reversedMouseY roadAt roadsConnectedTo roleDescription ropeAttachedObjects ropeAttachedTo ropeAttachEnabled ropeAttachTo ropeCreate ropeCut ropeDestroy ropeDetach ropeEndPosition ropeLength ropes ropeUnwind ropeUnwound rotorsForcesRTD rotorsRpmRTD round runInitScript safeZoneH safeZoneW safeZoneWAbs safeZoneX safeZoneXAbs safeZoneY save3DENInventory saveGame saveIdentity saveJoysticks saveOverlay saveProfileNamespace saveStatus saveVar savingEnabled say say2D say3D scopeName score scoreSide screenshot screenToWorld scriptDone scriptName scudState secondaryWeapon secondaryWeaponItems secondaryWeaponMagazine select selectBestPlaces selectDiarySubject selectedEditorObjects selectEditorObject selectionNames selectionPosition selectLeader selectMax selectMin selectNoPlayer selectPlayer selectRandom selectRandomWeighted selectWeapon selectWeaponTurret sendAUMessage sendSimpleCommand sendTask sendTaskResult sendUDPMessage serverCommand serverCommandAvailable serverCommandExecutable serverName serverTime set set3DENAttribute set3DENAttributes set3DENGrid set3DENIconsVisible set3DENLayer set3DENLinesVisible set3DENLogicType set3DENMissionAttribute set3DENMissionAttributes set3DENModelsVisible set3DENObjectType set3DENSelected setAccTime setActualCollectiveRTD setAirplaneThrottle setAirportSide setAmmo setAmmoCargo setAmmoOnPylon setAnimSpeedCoef setAperture setApertureNew setArmoryPoints setAttributes setAutonomous setBehaviour setBleedingRemaining setBrakesRTD setCameraInterest setCamShakeDefParams setCamShakeParams setCamUseTI setCaptive setCenterOfMass setCollisionLight setCombatMode setCompassOscillation setConvoySeparation setCuratorCameraAreaCeiling setCuratorCoef setCuratorEditingAreaType setCuratorWaypointCost setCurrentChannel setCurrentTask setCurrentWaypoint setCustomAimCoef setCustomWeightRTD setDamage setDammage setDate setDebriefingText setDefaultCamera setDestination setDetailMapBlendPars setDir setDirection setDrawIcon setDriveOnPath setDropInterval setDynamicSimulationDistance setDynamicSimulationDistanceCoef setEditorMode setEditorObjectScope setEffectCondition setEngineRPMRTD setFace setFaceAnimation setFatigue setFeatureType setFlagAnimationPhase setFlagOwner setFlagSide setFlagTexture setFog setFormation setFormationTask setFormDir setFriend setFromEditor setFSMVariable setFuel setFuelCargo setGroupIcon setGroupIconParams setGroupIconsSelectable setGroupIconsVisible setGroupId setGroupIdGlobal setGroupOwner setGusts setHideBehind setHit setHitIndex setHitPointDamage setHorizonParallaxCoef setHUDMovementLevels setIdentity setImportance setInfoPanel setLeader setLightAmbient setLightAttenuation setLightBrightness setLightColor setLightDayLight setLightFlareMaxDistance setLightFlareSize setLightIntensity setLightnings setLightUseFlare setLocalWindParams setMagazineTurretAmmo setMarkerAlpha setMarkerAlphaLocal setMarkerBrush setMarkerBrushLocal setMarkerColor setMarkerColorLocal setMarkerDir setMarkerDirLocal setMarkerPos setMarkerPosLocal setMarkerShape setMarkerShapeLocal setMarkerSize setMarkerSizeLocal setMarkerText setMarkerTextLocal setMarkerType setMarkerTypeLocal setMass setMimic setMousePosition setMusicEffect setMusicEventHandler setName setNameSound setObjectArguments setObjectMaterial setObjectMaterialGlobal setObjectProxy setObjectTexture setObjectTextureGlobal setObjectViewDistance setOvercast setOwner setOxygenRemaining setParticleCircle setParticleClass setParticleFire setParticleParams setParticleRandom setPilotCameraDirection setPilotCameraRotation setPilotCameraTarget setPilotLight setPiPEffect setPitch setPlateNumber setPlayable setPlayerRespawnTime setPos setPosASL setPosASL2 setPosASLW setPosATL setPosition setPosWorld setPylonLoadOut setPylonsPriority setRadioMsg setRain setRainbow setRandomLip setRank setRectangular setRepairCargo setRotorBrakeRTD setShadowDistance setShotParents setSide setSimpleTaskAlwaysVisible setSimpleTaskCustomData setSimpleTaskDescription setSimpleTaskDestination setSimpleTaskTarget setSimpleTaskType setSimulWeatherLayers setSize setSkill setSlingLoad setSoundEffect setSpeaker setSpeech setSpeedMode setStamina setStaminaScheme setStatValue setSuppression setSystemOfUnits setTargetAge setTaskMarkerOffset setTaskResult setTaskState setTerrainGrid setText setTimeMultiplier setTitleEffect setTrafficDensity setTrafficDistance setTrafficGap setTrafficSpeed setTriggerActivation setTriggerArea setTriggerStatements setTriggerText setTriggerTimeout setTriggerType setType setUnconscious setUnitAbility setUnitLoadout setUnitPos setUnitPosWeak setUnitRank setUnitRecoilCoefficient setUnitTrait setUnloadInCombat setUserActionText setUserMFDText setUserMFDvalue setVariable setVectorDir setVectorDirAndUp setVectorUp setVehicleAmmo setVehicleAmmoDef setVehicleArmor setVehicleCargo setVehicleId setVehicleLock setVehiclePosition setVehicleRadar setVehicleReceiveRemoteTargets setVehicleReportOwnPosition setVehicleReportRemoteTargets setVehicleTIPars setVehicleVarName setVelocity setVelocityModelSpace setVelocityTransformation setViewDistance setVisibleIfTreeCollapsed setWantedRPMRTD setWaves setWaypointBehaviour setWaypointCombatMode setWaypointCompletionRadius setWaypointDescription setWaypointForceBehaviour setWaypointFormation setWaypointHousePosition setWaypointLoiterRadius setWaypointLoiterType setWaypointName setWaypointPosition setWaypointScript setWaypointSpeed setWaypointStatements setWaypointTimeout setWaypointType setWaypointVisible setWeaponReloadingTime setWind setWindDir setWindForce setWindStr setWingForceScaleRTD setWPPos show3DIcons showChat showCinemaBorder showCommandingMenu showCompass showCuratorCompass showGPS showHUD showLegend showMap shownArtilleryComputer shownChat shownCompass shownCuratorCompass showNewEditorObject shownGPS shownHUD shownMap shownPad shownRadio shownScoretable shownUAVFeed shownWarrant shownWatch showPad showRadio showScoretable showSubtitles showUAVFeed showWarrant showWatch showWaypoint showWaypoints side sideChat sideEnemy sideFriendly sideRadio simpleTasks simulationEnabled simulCloudDensity simulCloudOcclusion simulInClouds simulWeatherSync sin size sizeOf skill skillFinal skipTime sleep sliderPosition sliderRange sliderSetPosition sliderSetRange sliderSetSpeed sliderSpeed slingLoadAssistantShown soldierMagazines someAmmo sort soundVolume spawn speaker speed speedMode splitString sqrt squadParams stance startLoadingScreen step stop stopEngineRTD stopped str sunOrMoon supportInfo suppressFor surfaceIsWater surfaceNormal surfaceType swimInDepth switchableUnits switchAction switchCamera switchGesture switchLight switchMove synchronizedObjects synchronizedTriggers synchronizedWaypoints synchronizeObjectsAdd synchronizeObjectsRemove synchronizeTrigger synchronizeWaypoint systemChat systemOfUnits tan targetKnowledge targets targetsAggregate targetsQuery taskAlwaysVisible taskChildren taskCompleted taskCustomData taskDescription taskDestination taskHint taskMarkerOffset taskParent taskResult taskState taskType teamMember teamName teams teamSwitch teamSwitchEnabled teamType terminate terrainIntersect terrainIntersectASL terrainIntersectAtASL text textLog textLogFormat tg time timeMultiplier titleCut titleFadeOut titleObj titleRsc titleText toArray toFixed toLower toString toUpper triggerActivated triggerActivation triggerArea triggerAttachedVehicle triggerAttachObject triggerAttachVehicle triggerDynamicSimulation triggerStatements triggerText triggerTimeout triggerTimeoutCurrent triggerType turretLocal turretOwner turretUnit tvAdd tvClear tvCollapse tvCollapseAll tvCount tvCurSel tvData tvDelete tvExpand tvExpandAll tvPicture tvSetColor tvSetCurSel tvSetData tvSetPicture tvSetPictureColor tvSetPictureColorDisabled tvSetPictureColorSelected tvSetPictureRight tvSetPictureRightColor tvSetPictureRightColorDisabled tvSetPictureRightColorSelected tvSetText tvSetTooltip tvSetValue tvSort tvSortByValue tvText tvTooltip tvValue type typeName typeOf UAVControl uiNamespace uiSleep unassignCurator unassignItem unassignTeam unassignVehicle underwater uniform uniformContainer uniformItems uniformMagazines unitAddons unitAimPosition unitAimPositionVisual unitBackpack unitIsUAV unitPos unitReady unitRecoilCoefficient units unitsBelowHeight unlinkItem unlockAchievement unregisterTask updateDrawIcon updateMenuItem updateObjectTree useAISteeringComponent useAudioTimeForMoves userInputDisabled vectorAdd vectorCos vectorCrossProduct vectorDiff vectorDir vectorDirVisual vectorDistance vectorDistanceSqr vectorDotProduct vectorFromTo vectorMagnitude vectorMagnitudeSqr vectorModelToWorld vectorModelToWorldVisual vectorMultiply vectorNormalized vectorUp vectorUpVisual vectorWorldToModel vectorWorldToModelVisual vehicle vehicleCargoEnabled vehicleChat vehicleRadio vehicleReceiveRemoteTargets vehicleReportOwnPosition vehicleReportRemoteTargets vehicles vehicleVarName velocity velocityModelSpace verifySignature vest vestContainer vestItems vestMagazines viewDistance visibleCompass visibleGPS visibleMap visiblePosition visiblePositionASL visibleScoretable visibleWatch waves waypointAttachedObject waypointAttachedVehicle waypointAttachObject waypointAttachVehicle waypointBehaviour waypointCombatMode waypointCompletionRadius waypointDescription waypointForceBehaviour waypointFormation waypointHousePosition waypointLoiterRadius waypointLoiterType waypointName waypointPosition waypoints waypointScript waypointsEnabledUAV waypointShow waypointSpeed waypointStatements waypointTimeout waypointTimeoutCurrent waypointType waypointVisible weaponAccessories weaponAccessoriesCargo weaponCargo weaponDirection weaponInertia weaponLowered weapons weaponsItems weaponsItemsCargo weaponState weaponsTurret weightRTD WFSideText wind ",literal:"blufor civilian configNull controlNull displayNull east endl false grpNull independent lineBreak locationNull nil objNull opfor pi resistance scriptNull sideAmbientLife sideEmpty sideLogic sideUnknown taskNull teamMemberNull true west"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.NUMBER_MODE,{className:"variable",begin:/\b_+[a-zA-Z_]\w*/},{className:"title",begin:/[a-zA-Z][a-zA-Z0-9]+_fnc_\w*/},t,a],illegal:/#|^\$ /}}}());
\ No newline at end of file
+hljs.registerLanguage("sqf",function(e){var t={cN:"string",v:[{b:'"',e:'"',c:[{b:'""',relevance:0}]},{b:"'",e:"'",c:[{b:"''",relevance:0}]}]},a={cN:"meta",b:/#\s*[a-z]+\b/,e:/$/,k:{"meta-keyword":"define undef ifdef ifndef else endif include"},c:[{b:/\\\n/,relevance:0},e.inherit(t,{cN:"meta-string"}),{cN:"meta-string",b:/<[^\n>]*>/,e:/$/,i:"\\n"},e.CLCM,e.CBCM]};return{aliases:["sqf"],cI:!0,k:{keyword:"case catch default do else exit exitWith for forEach from if private switch then throw to try waitUntil while with",built_in:"abs accTime acos action actionIDs actionKeys actionKeysImages actionKeysNames actionKeysNamesArray actionName actionParams activateAddons activatedAddons activateKey add3DENConnection add3DENEventHandler add3DENLayer addAction addBackpack addBackpackCargo addBackpackCargoGlobal addBackpackGlobal addCamShake addCuratorAddons addCuratorCameraArea addCuratorEditableObjects addCuratorEditingArea addCuratorPoints addEditorObject addEventHandler addForce addGoggles addGroupIcon addHandgunItem addHeadgear addItem addItemCargo addItemCargoGlobal addItemPool addItemToBackpack addItemToUniform addItemToVest addLiveStats addMagazine addMagazineAmmoCargo addMagazineCargo addMagazineCargoGlobal addMagazineGlobal addMagazinePool addMagazines addMagazineTurret addMenu addMenuItem addMissionEventHandler addMPEventHandler addMusicEventHandler addOwnedMine addPlayerScores addPrimaryWeaponItem addPublicVariableEventHandler addRating addResources addScore addScoreSide addSecondaryWeaponItem addSwitchableUnit addTeamMember addToRemainsCollector addTorque addUniform addVehicle addVest addWaypoint addWeapon addWeaponCargo addWeaponCargoGlobal addWeaponGlobal addWeaponItem addWeaponPool addWeaponTurret admin agent agents AGLToASL aimedAtTarget aimPos airDensityRTD airplaneThrottle airportSide AISFinishHeal alive all3DENEntities allAirports allControls allCurators allCutLayers allDead allDeadMen allDisplays allGroups allMapMarkers allMines allMissionObjects allow3DMode allowCrewInImmobile allowCuratorLogicIgnoreAreas allowDamage allowDammage allowFileOperations allowFleeing allowGetIn allowSprint allPlayers allSimpleObjects allSites allTurrets allUnits allUnitsUAV allVariables ammo ammoOnPylon and animate animateBay animateDoor animatePylon animateSource animationNames animationPhase animationSourcePhase animationState append apply armoryPoints arrayIntersect asin ASLToAGL ASLToATL assert assignAsCargo assignAsCargoIndex assignAsCommander assignAsDriver assignAsGunner assignAsTurret assignCurator assignedCargo assignedCommander assignedDriver assignedGunner assignedItems assignedTarget assignedTeam assignedVehicle assignedVehicleRole assignItem assignTeam assignToAirport atan atan2 atg ATLToASL attachedObject attachedObjects attachedTo attachObject attachTo attackEnabled backpack backpackCargo backpackContainer backpackItems backpackMagazines backpackSpaceFor behaviour benchmark binocular boundingBox boundingBoxReal boundingCenter breakOut breakTo briefingName buildingExit buildingPos buttonAction buttonSetAction cadetMode call callExtension camCommand camCommit camCommitPrepared camCommitted camConstuctionSetParams camCreate camDestroy cameraEffect cameraEffectEnableHUD cameraInterest cameraOn cameraView campaignConfigFile camPreload camPreloaded camPrepareBank camPrepareDir camPrepareDive camPrepareFocus camPrepareFov camPrepareFovRange camPreparePos camPrepareRelPos camPrepareTarget camSetBank camSetDir camSetDive camSetFocus camSetFov camSetFovRange camSetPos camSetRelPos camSetTarget camTarget camUseNVG canAdd canAddItemToBackpack canAddItemToUniform canAddItemToVest cancelSimpleTaskDestination canFire canMove canSlingLoad canStand canSuspend canTriggerDynamicSimulation canUnloadInCombat canVehicleCargo captive captiveNum cbChecked cbSetChecked ceil channelEnabled cheatsEnabled checkAIFeature checkVisibility className clearAllItemsFromBackpack clearBackpackCargo clearBackpackCargoGlobal clearGroupIcons clearItemCargo clearItemCargoGlobal clearItemPool clearMagazineCargo clearMagazineCargoGlobal clearMagazinePool clearOverlay clearRadio clearWeaponCargo clearWeaponCargoGlobal clearWeaponPool clientOwner closeDialog closeDisplay closeOverlay collapseObjectTree collect3DENHistory collectiveRTD combatMode commandArtilleryFire commandChat commander commandFire commandFollow commandFSM commandGetOut commandingMenu commandMove commandRadio commandStop commandSuppressiveFire commandTarget commandWatch comment commitOverlay compile compileFinal completedFSM composeText configClasses configFile configHierarchy configName configProperties configSourceAddonList configSourceMod configSourceModList confirmSensorTarget connectTerminalToUAV controlsGroupCtrl copyFromClipboard copyToClipboard copyWaypoints cos count countEnemy countFriendly countSide countType countUnknown create3DENComposition create3DENEntity createAgent createCenter createDialog createDiaryLink createDiaryRecord createDiarySubject createDisplay createGearDialog createGroup createGuardedPoint createLocation createMarker createMarkerLocal createMenu createMine createMissionDisplay createMPCampaignDisplay createSimpleObject createSimpleTask createSite createSoundSource createTask createTeam createTrigger createUnit createVehicle createVehicleCrew createVehicleLocal crew ctAddHeader ctAddRow ctClear ctCurSel ctData ctFindHeaderRows ctFindRowHeader ctHeaderControls ctHeaderCount ctRemoveHeaders ctRemoveRows ctrlActivate ctrlAddEventHandler ctrlAngle ctrlAutoScrollDelay ctrlAutoScrollRewind ctrlAutoScrollSpeed ctrlChecked ctrlClassName ctrlCommit ctrlCommitted ctrlCreate ctrlDelete ctrlEnable ctrlEnabled ctrlFade ctrlHTMLLoaded ctrlIDC ctrlIDD ctrlMapAnimAdd ctrlMapAnimClear ctrlMapAnimCommit ctrlMapAnimDone ctrlMapCursor ctrlMapMouseOver ctrlMapScale ctrlMapScreenToWorld ctrlMapWorldToScreen ctrlModel ctrlModelDirAndUp ctrlModelScale ctrlParent ctrlParentControlsGroup ctrlPosition ctrlRemoveAllEventHandlers ctrlRemoveEventHandler ctrlScale ctrlSetActiveColor ctrlSetAngle ctrlSetAutoScrollDelay ctrlSetAutoScrollRewind ctrlSetAutoScrollSpeed ctrlSetBackgroundColor ctrlSetChecked ctrlSetEventHandler ctrlSetFade ctrlSetFocus ctrlSetFont ctrlSetFontH1 ctrlSetFontH1B ctrlSetFontH2 ctrlSetFontH2B ctrlSetFontH3 ctrlSetFontH3B ctrlSetFontH4 ctrlSetFontH4B ctrlSetFontH5 ctrlSetFontH5B ctrlSetFontH6 ctrlSetFontH6B ctrlSetFontHeight ctrlSetFontHeightH1 ctrlSetFontHeightH2 ctrlSetFontHeightH3 ctrlSetFontHeightH4 ctrlSetFontHeightH5 ctrlSetFontHeightH6 ctrlSetFontHeightSecondary ctrlSetFontP ctrlSetFontPB ctrlSetFontSecondary ctrlSetForegroundColor ctrlSetModel ctrlSetModelDirAndUp ctrlSetModelScale ctrlSetPixelPrecision ctrlSetPosition ctrlSetScale ctrlSetStructuredText ctrlSetText ctrlSetTextColor ctrlSetTooltip ctrlSetTooltipColorBox ctrlSetTooltipColorShade ctrlSetTooltipColorText ctrlShow ctrlShown ctrlText ctrlTextHeight ctrlTextWidth ctrlType ctrlVisible ctRowControls ctRowCount ctSetCurSel ctSetData ctSetHeaderTemplate ctSetRowTemplate ctSetValue ctValue curatorAddons curatorCamera curatorCameraArea curatorCameraAreaCeiling curatorCoef curatorEditableObjects curatorEditingArea curatorEditingAreaType curatorMouseOver curatorPoints curatorRegisteredObjects curatorSelected curatorWaypointCost current3DENOperation currentChannel currentCommand currentMagazine currentMagazineDetail currentMagazineDetailTurret currentMagazineTurret currentMuzzle currentNamespace currentTask currentTasks currentThrowable currentVisionMode currentWaypoint currentWeapon currentWeaponMode currentWeaponTurret currentZeroing cursorObject cursorTarget customChat customRadio cutFadeOut cutObj cutRsc cutText damage date dateToNumber daytime deActivateKey debriefingText debugFSM debugLog deg delete3DENEntities deleteAt deleteCenter deleteCollection deleteEditorObject deleteGroup deleteGroupWhenEmpty deleteIdentity deleteLocation deleteMarker deleteMarkerLocal deleteRange deleteResources deleteSite deleteStatus deleteTeam deleteVehicle deleteVehicleCrew deleteWaypoint detach detectedMines diag_activeMissionFSMs diag_activeScripts diag_activeSQFScripts diag_activeSQSScripts diag_captureFrame diag_captureFrameToFile diag_captureSlowFrame diag_codePerformance diag_drawMode diag_enable diag_enabled diag_fps diag_fpsMin diag_frameNo diag_lightNewLoad diag_list diag_log diag_logSlowFrame diag_mergeConfigFile diag_recordTurretLimits diag_setLightNew diag_tickTime diag_toggle dialog diarySubjectExists didJIP didJIPOwner difficulty difficultyEnabled difficultyEnabledRTD difficultyOption direction directSay disableAI disableCollisionWith disableConversation disableDebriefingStats disableMapIndicators disableNVGEquipment disableRemoteSensors disableSerialization disableTIEquipment disableUAVConnectability disableUserInput displayAddEventHandler displayCtrl displayParent displayRemoveAllEventHandlers displayRemoveEventHandler displaySetEventHandler dissolveTeam distance distance2D distanceSqr distributionRegion do3DENAction doArtilleryFire doFire doFollow doFSM doGetOut doMove doorPhase doStop doSuppressiveFire doTarget doWatch drawArrow drawEllipse drawIcon drawIcon3D drawLine drawLine3D drawLink drawLocation drawPolygon drawRectangle drawTriangle driver drop dynamicSimulationDistance dynamicSimulationDistanceCoef dynamicSimulationEnabled dynamicSimulationSystemEnabled echo edit3DENMissionAttributes editObject editorSetEventHandler effectiveCommander emptyPositions enableAI enableAIFeature enableAimPrecision enableAttack enableAudioFeature enableAutoStartUpRTD enableAutoTrimRTD enableCamShake enableCaustics enableChannel enableCollisionWith enableCopilot enableDebriefingStats enableDiagLegend enableDynamicSimulation enableDynamicSimulationSystem enableEndDialog enableEngineArtillery enableEnvironment enableFatigue enableGunLights enableInfoPanelComponent enableIRLasers enableMimics enablePersonTurret enableRadio enableReload enableRopeAttach enableSatNormalOnDetail enableSaving enableSentences enableSimulation enableSimulationGlobal enableStamina enableTeamSwitch enableTraffic enableUAVConnectability enableUAVWaypoints enableVehicleCargo enableVehicleSensor enableWeaponDisassembly endLoadingScreen endMission engineOn enginesIsOnRTD enginesRpmRTD enginesTorqueRTD entities environmentEnabled estimatedEndServerTime estimatedTimeLeft evalObjectArgument everyBackpack everyContainer exec execEditorScript execFSM execVM exp expectedDestination exportJIPMessages eyeDirection eyePos face faction fadeMusic fadeRadio fadeSound fadeSpeech failMission fillWeaponsFromPool find findCover findDisplay findEditorObject findEmptyPosition findEmptyPositionReady findIf findNearestEnemy finishMissionInit finite fire fireAtTarget firstBackpack flag flagAnimationPhase flagOwner flagSide flagTexture fleeing floor flyInHeight flyInHeightASL fog fogForecast fogParams forceAddUniform forcedMap forceEnd forceFlagTexture forceFollowRoad forceMap forceRespawn forceSpeed forceWalk forceWeaponFire forceWeatherChange forEachMember forEachMemberAgent forEachMemberTeam forgetTarget format formation formationDirection formationLeader formationMembers formationPosition formationTask formatText formLeader freeLook fromEditor fuel fullCrew gearIDCAmmoCount gearSlotAmmoCount gearSlotData get3DENActionState get3DENAttribute get3DENCamera get3DENConnections get3DENEntity get3DENEntityID get3DENGrid get3DENIconsVisible get3DENLayerEntities get3DENLinesVisible get3DENMissionAttribute get3DENMouseOver get3DENSelected getAimingCoef getAllEnvSoundControllers getAllHitPointsDamage getAllOwnedMines getAllSoundControllers getAmmoCargo getAnimAimPrecision getAnimSpeedCoef getArray getArtilleryAmmo getArtilleryComputerSettings getArtilleryETA getAssignedCuratorLogic getAssignedCuratorUnit getBackpackCargo getBleedingRemaining getBurningValue getCameraViewDirection getCargoIndex getCenterOfMass getClientState getClientStateNumber getCompatiblePylonMagazines getConnectedUAV getContainerMaxLoad getCursorObjectParams getCustomAimCoef getDammage getDescription getDir getDirVisual getDLCAssetsUsage getDLCAssetsUsageByName getDLCs getEditorCamera getEditorMode getEditorObjectScope getElevationOffset getEnvSoundController getFatigue getForcedFlagTexture getFriend getFSMVariable getFuelCargo getGroupIcon getGroupIconParams getGroupIcons getHideFrom getHit getHitIndex getHitPointDamage getItemCargo getMagazineCargo getMarkerColor getMarkerPos getMarkerSize getMarkerType getMass getMissionConfig getMissionConfigValue getMissionDLCs getMissionLayerEntities getModelInfo getMousePosition getMusicPlayedTime getNumber getObjectArgument getObjectChildren getObjectDLC getObjectMaterials getObjectProxy getObjectTextures getObjectType getObjectViewDistance getOxygenRemaining getPersonUsedDLCs getPilotCameraDirection getPilotCameraPosition getPilotCameraRotation getPilotCameraTarget getPlateNumber getPlayerChannel getPlayerScores getPlayerUID getPos getPosASL getPosASLVisual getPosASLW getPosATL getPosATLVisual getPosVisual getPosWorld getPylonMagazines getRelDir getRelPos getRemoteSensorsDisabled getRepairCargo getResolution getShadowDistance getShotParents getSlingLoad getSoundController getSoundControllerResult getSpeed getStamina getStatValue getSuppression getTerrainGrid getTerrainHeightASL getText getTotalDLCUsageTime getUnitLoadout getUnitTrait getUserMFDText getUserMFDvalue getVariable getVehicleCargo getWeaponCargo getWeaponSway getWingsOrientationRTD getWingsPositionRTD getWPPos glanceAt globalChat globalRadio goggles goto group groupChat groupFromNetId groupIconSelectable groupIconsVisible groupId groupOwner groupRadio groupSelectedUnits groupSelectUnit gunner gusts halt handgunItems handgunMagazine handgunWeapon handsHit hasInterface hasPilotCamera hasWeapon hcAllGroups hcGroupParams hcLeader hcRemoveAllGroups hcRemoveGroup hcSelected hcSelectGroup hcSetGroup hcShowBar hcShownBar headgear hideBody hideObject hideObjectGlobal hideSelection hint hintC hintCadet hintSilent hmd hostMission htmlLoad HUDMovementLevels humidity image importAllGroups importance in inArea inAreaArray incapacitatedState inflame inflamed infoPanel infoPanelComponentEnabled infoPanelComponents infoPanels inGameUISetEventHandler inheritsFrom initAmbientLife inPolygon inputAction inRangeOfArtillery insertEditorObject intersect is3DEN is3DENMultiplayer isAbleToBreathe isAgent isArray isAutoHoverOn isAutonomous isAutotest isBleeding isBurning isClass isCollisionLightOn isCopilotEnabled isDamageAllowed isDedicated isDLCAvailable isEngineOn isEqualTo isEqualType isEqualTypeAll isEqualTypeAny isEqualTypeArray isEqualTypeParams isFilePatchingEnabled isFlashlightOn isFlatEmpty isForcedWalk isFormationLeader isGroupDeletedWhenEmpty isHidden isInRemainsCollector isInstructorFigureEnabled isIRLaserOn isKeyActive isKindOf isLaserOn isLightOn isLocalized isManualFire isMarkedForCollection isMultiplayer isMultiplayerSolo isNil isNull isNumber isObjectHidden isObjectRTD isOnRoad isPipEnabled isPlayer isRealTime isRemoteExecuted isRemoteExecutedJIP isServer isShowing3DIcons isSimpleObject isSprintAllowed isStaminaEnabled isSteamMission isStreamFriendlyUIEnabled isText isTouchingGround isTurnedOut isTutHintsEnabled isUAVConnectable isUAVConnected isUIContext isUniformAllowed isVehicleCargo isVehicleRadarOn isVehicleSensorEnabled isWalking isWeaponDeployed isWeaponRested itemCargo items itemsWithMagazines join joinAs joinAsSilent joinSilent joinString kbAddDatabase kbAddDatabaseTargets kbAddTopic kbHasTopic kbReact kbRemoveTopic kbTell kbWasSaid keyImage keyName knowsAbout land landAt landResult language laserTarget lbAdd lbClear lbColor lbColorRight lbCurSel lbData lbDelete lbIsSelected lbPicture lbPictureRight lbSelection lbSetColor lbSetColorRight lbSetCurSel lbSetData lbSetPicture lbSetPictureColor lbSetPictureColorDisabled lbSetPictureColorSelected lbSetPictureRight lbSetPictureRightColor lbSetPictureRightColorDisabled lbSetPictureRightColorSelected lbSetSelectColor lbSetSelectColorRight lbSetSelected lbSetText lbSetTextRight lbSetTooltip lbSetValue lbSize lbSort lbSortByValue lbText lbTextRight lbValue leader leaderboardDeInit leaderboardGetRows leaderboardInit leaderboardRequestRowsFriends leaderboardsRequestUploadScore leaderboardsRequestUploadScoreKeepBest leaderboardState leaveVehicle libraryCredits libraryDisclaimers lifeState lightAttachObject lightDetachObject lightIsOn lightnings limitSpeed linearConversion lineIntersects lineIntersectsObjs lineIntersectsSurfaces lineIntersectsWith linkItem list listObjects listRemoteTargets listVehicleSensors ln lnbAddArray lnbAddColumn lnbAddRow lnbClear lnbColor lnbCurSelRow lnbData lnbDeleteColumn lnbDeleteRow lnbGetColumnsPosition lnbPicture lnbSetColor lnbSetColumnsPos lnbSetCurSelRow lnbSetData lnbSetPicture lnbSetText lnbSetValue lnbSize lnbSort lnbSortByValue lnbText lnbValue load loadAbs loadBackpack loadFile loadGame loadIdentity loadMagazine loadOverlay loadStatus loadUniform loadVest local localize locationPosition lock lockCameraTo lockCargo lockDriver locked lockedCargo lockedDriver lockedTurret lockIdentity lockTurret lockWP log logEntities logNetwork logNetworkTerminate lookAt lookAtPos magazineCargo magazines magazinesAllTurrets magazinesAmmo magazinesAmmoCargo magazinesAmmoFull magazinesDetail magazinesDetailBackpack magazinesDetailUniform magazinesDetailVest magazinesTurret magazineTurretAmmo mapAnimAdd mapAnimClear mapAnimCommit mapAnimDone mapCenterOnCamera mapGridPosition markAsFinishedOnSteam markerAlpha markerBrush markerColor markerDir markerPos markerShape markerSize markerText markerType max members menuAction menuAdd menuChecked menuClear menuCollapse menuData menuDelete menuEnable menuEnabled menuExpand menuHover menuPicture menuSetAction menuSetCheck menuSetData menuSetPicture menuSetValue menuShortcut menuShortcutText menuSize menuSort menuText menuURL menuValue min mineActive mineDetectedBy missionConfigFile missionDifficulty missionName missionNamespace missionStart missionVersion mod modelToWorld modelToWorldVisual modelToWorldVisualWorld modelToWorldWorld modParams moonIntensity moonPhase morale move move3DENCamera moveInAny moveInCargo moveInCommander moveInDriver moveInGunner moveInTurret moveObjectToEnd moveOut moveTime moveTo moveToCompleted moveToFailed musicVolume name nameSound nearEntities nearestBuilding nearestLocation nearestLocations nearestLocationWithDubbing nearestObject nearestObjects nearestTerrainObjects nearObjects nearObjectsReady nearRoads nearSupplies nearTargets needReload netId netObjNull newOverlay nextMenuItemIndex nextWeatherChange nMenuItems not numberOfEnginesRTD numberToDate objectCurators objectFromNetId objectParent objStatus onBriefingGroup onBriefingNotes onBriefingPlan onBriefingTeamSwitch onCommandModeChanged onDoubleClick onEachFrame onGroupIconClick onGroupIconOverEnter onGroupIconOverLeave onHCGroupSelectionChanged onMapSingleClick onPlayerConnected onPlayerDisconnected onPreloadFinished onPreloadStarted onShowNewObject onTeamSwitch openCuratorInterface openDLCPage openMap openSteamApp openYoutubeVideo or orderGetIn overcast overcastForecast owner param params parseNumber parseSimpleArray parseText parsingNamespace particlesQuality pickWeaponPool pitch pixelGrid pixelGridBase pixelGridNoUIScale pixelH pixelW playableSlotsNumber playableUnits playAction playActionNow player playerRespawnTime playerSide playersNumber playGesture playMission playMove playMoveNow playMusic playScriptedMission playSound playSound3D position positionCameraToWorld posScreenToWorld posWorldToScreen ppEffectAdjust ppEffectCommit ppEffectCommitted ppEffectCreate ppEffectDestroy ppEffectEnable ppEffectEnabled ppEffectForceInNVG precision preloadCamera preloadObject preloadSound preloadTitleObj preloadTitleRsc preprocessFile preprocessFileLineNumbers primaryWeapon primaryWeaponItems primaryWeaponMagazine priority processDiaryLink productVersion profileName profileNamespace profileNameSteam progressLoadingScreen progressPosition progressSetPosition publicVariable publicVariableClient publicVariableServer pushBack pushBackUnique putWeaponPool queryItemsPool queryMagazinePool queryWeaponPool rad radioChannelAdd radioChannelCreate radioChannelRemove radioChannelSetCallSign radioChannelSetLabel radioVolume rain rainbow random rank rankId rating rectangular registeredTasks registerTask reload reloadEnabled remoteControl remoteExec remoteExecCall remoteExecutedOwner remove3DENConnection remove3DENEventHandler remove3DENLayer removeAction removeAll3DENEventHandlers removeAllActions removeAllAssignedItems removeAllContainers removeAllCuratorAddons removeAllCuratorCameraAreas removeAllCuratorEditingAreas removeAllEventHandlers removeAllHandgunItems removeAllItems removeAllItemsWithMagazines removeAllMissionEventHandlers removeAllMPEventHandlers removeAllMusicEventHandlers removeAllOwnedMines removeAllPrimaryWeaponItems removeAllWeapons removeBackpack removeBackpackGlobal removeCuratorAddons removeCuratorCameraArea removeCuratorEditableObjects removeCuratorEditingArea removeDrawIcon removeDrawLinks removeEventHandler removeFromRemainsCollector removeGoggles removeGroupIcon removeHandgunItem removeHeadgear removeItem removeItemFromBackpack removeItemFromUniform removeItemFromVest removeItems removeMagazine removeMagazineGlobal removeMagazines removeMagazinesTurret removeMagazineTurret removeMenuItem removeMissionEventHandler removeMPEventHandler removeMusicEventHandler removeOwnedMine removePrimaryWeaponItem removeSecondaryWeaponItem removeSimpleTask removeSwitchableUnit removeTeamMember removeUniform removeVest removeWeapon removeWeaponAttachmentCargo removeWeaponCargo removeWeaponGlobal removeWeaponTurret reportRemoteTarget requiredVersion resetCamShake resetSubgroupDirection resize resources respawnVehicle restartEditorCamera reveal revealMine reverse reversedMouseY roadAt roadsConnectedTo roleDescription ropeAttachedObjects ropeAttachedTo ropeAttachEnabled ropeAttachTo ropeCreate ropeCut ropeDestroy ropeDetach ropeEndPosition ropeLength ropes ropeUnwind ropeUnwound rotorsForcesRTD rotorsRpmRTD round runInitScript safeZoneH safeZoneW safeZoneWAbs safeZoneX safeZoneXAbs safeZoneY save3DENInventory saveGame saveIdentity saveJoysticks saveOverlay saveProfileNamespace saveStatus saveVar savingEnabled say say2D say3D scopeName score scoreSide screenshot screenToWorld scriptDone scriptName scudState secondaryWeapon secondaryWeaponItems secondaryWeaponMagazine select selectBestPlaces selectDiarySubject selectedEditorObjects selectEditorObject selectionNames selectionPosition selectLeader selectMax selectMin selectNoPlayer selectPlayer selectRandom selectRandomWeighted selectWeapon selectWeaponTurret sendAUMessage sendSimpleCommand sendTask sendTaskResult sendUDPMessage serverCommand serverCommandAvailable serverCommandExecutable serverName serverTime set set3DENAttribute set3DENAttributes set3DENGrid set3DENIconsVisible set3DENLayer set3DENLinesVisible set3DENLogicType set3DENMissionAttribute set3DENMissionAttributes set3DENModelsVisible set3DENObjectType set3DENSelected setAccTime setActualCollectiveRTD setAirplaneThrottle setAirportSide setAmmo setAmmoCargo setAmmoOnPylon setAnimSpeedCoef setAperture setApertureNew setArmoryPoints setAttributes setAutonomous setBehaviour setBleedingRemaining setBrakesRTD setCameraInterest setCamShakeDefParams setCamShakeParams setCamUseTI setCaptive setCenterOfMass setCollisionLight setCombatMode setCompassOscillation setConvoySeparation setCuratorCameraAreaCeiling setCuratorCoef setCuratorEditingAreaType setCuratorWaypointCost setCurrentChannel setCurrentTask setCurrentWaypoint setCustomAimCoef setCustomWeightRTD setDamage setDammage setDate setDebriefingText setDefaultCamera setDestination setDetailMapBlendPars setDir setDirection setDrawIcon setDriveOnPath setDropInterval setDynamicSimulationDistance setDynamicSimulationDistanceCoef setEditorMode setEditorObjectScope setEffectCondition setEngineRPMRTD setFace setFaceAnimation setFatigue setFeatureType setFlagAnimationPhase setFlagOwner setFlagSide setFlagTexture setFog setFormation setFormationTask setFormDir setFriend setFromEditor setFSMVariable setFuel setFuelCargo setGroupIcon setGroupIconParams setGroupIconsSelectable setGroupIconsVisible setGroupId setGroupIdGlobal setGroupOwner setGusts setHideBehind setHit setHitIndex setHitPointDamage setHorizonParallaxCoef setHUDMovementLevels setIdentity setImportance setInfoPanel setLeader setLightAmbient setLightAttenuation setLightBrightness setLightColor setLightDayLight setLightFlareMaxDistance setLightFlareSize setLightIntensity setLightnings setLightUseFlare setLocalWindParams setMagazineTurretAmmo setMarkerAlpha setMarkerAlphaLocal setMarkerBrush setMarkerBrushLocal setMarkerColor setMarkerColorLocal setMarkerDir setMarkerDirLocal setMarkerPos setMarkerPosLocal setMarkerShape setMarkerShapeLocal setMarkerSize setMarkerSizeLocal setMarkerText setMarkerTextLocal setMarkerType setMarkerTypeLocal setMass setMimic setMousePosition setMusicEffect setMusicEventHandler setName setNameSound setObjectArguments setObjectMaterial setObjectMaterialGlobal setObjectProxy setObjectTexture setObjectTextureGlobal setObjectViewDistance setOvercast setOwner setOxygenRemaining setParticleCircle setParticleClass setParticleFire setParticleParams setParticleRandom setPilotCameraDirection setPilotCameraRotation setPilotCameraTarget setPilotLight setPiPEffect setPitch setPlateNumber setPlayable setPlayerRespawnTime setPos setPosASL setPosASL2 setPosASLW setPosATL setPosition setPosWorld setPylonLoadOut setPylonsPriority setRadioMsg setRain setRainbow setRandomLip setRank setRectangular setRepairCargo setRotorBrakeRTD setShadowDistance setShotParents setSide setSimpleTaskAlwaysVisible setSimpleTaskCustomData setSimpleTaskDescription setSimpleTaskDestination setSimpleTaskTarget setSimpleTaskType setSimulWeatherLayers setSize setSkill setSlingLoad setSoundEffect setSpeaker setSpeech setSpeedMode setStamina setStaminaScheme setStatValue setSuppression setSystemOfUnits setTargetAge setTaskMarkerOffset setTaskResult setTaskState setTerrainGrid setText setTimeMultiplier setTitleEffect setTrafficDensity setTrafficDistance setTrafficGap setTrafficSpeed setTriggerActivation setTriggerArea setTriggerStatements setTriggerText setTriggerTimeout setTriggerType setType setUnconscious setUnitAbility setUnitLoadout setUnitPos setUnitPosWeak setUnitRank setUnitRecoilCoefficient setUnitTrait setUnloadInCombat setUserActionText setUserMFDText setUserMFDvalue setVariable setVectorDir setVectorDirAndUp setVectorUp setVehicleAmmo setVehicleAmmoDef setVehicleArmor setVehicleCargo setVehicleId setVehicleLock setVehiclePosition setVehicleRadar setVehicleReceiveRemoteTargets setVehicleReportOwnPosition setVehicleReportRemoteTargets setVehicleTIPars setVehicleVarName setVelocity setVelocityModelSpace setVelocityTransformation setViewDistance setVisibleIfTreeCollapsed setWantedRPMRTD setWaves setWaypointBehaviour setWaypointCombatMode setWaypointCompletionRadius setWaypointDescription setWaypointForceBehaviour setWaypointFormation setWaypointHousePosition setWaypointLoiterRadius setWaypointLoiterType setWaypointName setWaypointPosition setWaypointScript setWaypointSpeed setWaypointStatements setWaypointTimeout setWaypointType setWaypointVisible setWeaponReloadingTime setWind setWindDir setWindForce setWindStr setWingForceScaleRTD setWPPos show3DIcons showChat showCinemaBorder showCommandingMenu showCompass showCuratorCompass showGPS showHUD showLegend showMap shownArtilleryComputer shownChat shownCompass shownCuratorCompass showNewEditorObject shownGPS shownHUD shownMap shownPad shownRadio shownScoretable shownUAVFeed shownWarrant shownWatch showPad showRadio showScoretable showSubtitles showUAVFeed showWarrant showWatch showWaypoint showWaypoints side sideChat sideEnemy sideFriendly sideRadio simpleTasks simulationEnabled simulCloudDensity simulCloudOcclusion simulInClouds simulWeatherSync sin size sizeOf skill skillFinal skipTime sleep sliderPosition sliderRange sliderSetPosition sliderSetRange sliderSetSpeed sliderSpeed slingLoadAssistantShown soldierMagazines someAmmo sort soundVolume spawn speaker speed speedMode splitString sqrt squadParams stance startLoadingScreen step stop stopEngineRTD stopped str sunOrMoon supportInfo suppressFor surfaceIsWater surfaceNormal surfaceType swimInDepth switchableUnits switchAction switchCamera switchGesture switchLight switchMove synchronizedObjects synchronizedTriggers synchronizedWaypoints synchronizeObjectsAdd synchronizeObjectsRemove synchronizeTrigger synchronizeWaypoint systemChat systemOfUnits tan targetKnowledge targets targetsAggregate targetsQuery taskAlwaysVisible taskChildren taskCompleted taskCustomData taskDescription taskDestination taskHint taskMarkerOffset taskParent taskResult taskState taskType teamMember teamName teams teamSwitch teamSwitchEnabled teamType terminate terrainIntersect terrainIntersectASL terrainIntersectAtASL text textLog textLogFormat tg time timeMultiplier titleCut titleFadeOut titleObj titleRsc titleText toArray toFixed toLower toString toUpper triggerActivated triggerActivation triggerArea triggerAttachedVehicle triggerAttachObject triggerAttachVehicle triggerDynamicSimulation triggerStatements triggerText triggerTimeout triggerTimeoutCurrent triggerType turretLocal turretOwner turretUnit tvAdd tvClear tvCollapse tvCollapseAll tvCount tvCurSel tvData tvDelete tvExpand tvExpandAll tvPicture tvSetColor tvSetCurSel tvSetData tvSetPicture tvSetPictureColor tvSetPictureColorDisabled tvSetPictureColorSelected tvSetPictureRight tvSetPictureRightColor tvSetPictureRightColorDisabled tvSetPictureRightColorSelected tvSetText tvSetTooltip tvSetValue tvSort tvSortByValue tvText tvTooltip tvValue type typeName typeOf UAVControl uiNamespace uiSleep unassignCurator unassignItem unassignTeam unassignVehicle underwater uniform uniformContainer uniformItems uniformMagazines unitAddons unitAimPosition unitAimPositionVisual unitBackpack unitIsUAV unitPos unitReady unitRecoilCoefficient units unitsBelowHeight unlinkItem unlockAchievement unregisterTask updateDrawIcon updateMenuItem updateObjectTree useAISteeringComponent useAudioTimeForMoves userInputDisabled vectorAdd vectorCos vectorCrossProduct vectorDiff vectorDir vectorDirVisual vectorDistance vectorDistanceSqr vectorDotProduct vectorFromTo vectorMagnitude vectorMagnitudeSqr vectorModelToWorld vectorModelToWorldVisual vectorMultiply vectorNormalized vectorUp vectorUpVisual vectorWorldToModel vectorWorldToModelVisual vehicle vehicleCargoEnabled vehicleChat vehicleRadio vehicleReceiveRemoteTargets vehicleReportOwnPosition vehicleReportRemoteTargets vehicles vehicleVarName velocity velocityModelSpace verifySignature vest vestContainer vestItems vestMagazines viewDistance visibleCompass visibleGPS visibleMap visiblePosition visiblePositionASL visibleScoretable visibleWatch waves waypointAttachedObject waypointAttachedVehicle waypointAttachObject waypointAttachVehicle waypointBehaviour waypointCombatMode waypointCompletionRadius waypointDescription waypointForceBehaviour waypointFormation waypointHousePosition waypointLoiterRadius waypointLoiterType waypointName waypointPosition waypoints waypointScript waypointsEnabledUAV waypointShow waypointSpeed waypointStatements waypointTimeout waypointTimeoutCurrent waypointType waypointVisible weaponAccessories weaponAccessoriesCargo weaponCargo weaponDirection weaponInertia weaponLowered weapons weaponsItems weaponsItemsCargo weaponState weaponsTurret weightRTD WFSideText wind ",literal:"blufor civilian configNull controlNull displayNull east endl false grpNull independent lineBreak locationNull nil objNull opfor pi resistance scriptNull sideAmbientLife sideEmpty sideLogic sideUnknown taskNull teamMemberNull true west"},c:[e.CLCM,e.CBCM,e.NM,{cN:"variable",b:/\b_+[a-zA-Z_]\w*/},{cN:"title",b:/[a-zA-Z][a-zA-Z0-9]+_fnc_\w*/},t,a],i:/#|^\$ /}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/sql.min.js b/vendor/assets/javascripts/highlightjs/languages/sql.min.js
index 3e49bf82ea..c30231b88f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/sql.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/sql.min.js
@@ -1 +1 @@
-hljs.registerLanguage("sql",function(){"use strict";return function(e){var t=e.COMMENT("--","$");return{name:"SQL",case_insensitive:!0,illegal:/[<>{}*]/,contains:[{beginKeywords:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke comment values with",end:/;/,endsWithParent:!0,keywords:{$pattern:/[\w\.]+/,keyword:"as abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias all allocate allow alter always analyze ancillary and anti any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound bucket buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain explode export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force foreign form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour hours http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lateral lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minutes minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notnull notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second seconds section securefile security seed segment select self semi sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tablesample tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unnest unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace window with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek",literal:"true false null unknown",built_in:"array bigint binary bit blob bool boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text time timestamp tinyint varchar varchar2 varying void"},contains:[{className:"string",begin:"'",end:"'",contains:[{begin:"''"}]},{className:"string",begin:'"',end:'"',contains:[{begin:'""'}]},{className:"string",begin:"`",end:"`"},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,e.HASH_COMMENT_MODE]},e.C_BLOCK_COMMENT_MODE,t,e.HASH_COMMENT_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("sql",function(e){var t=e.C("--","$");return{cI:!0,i:/[<>{}*]/,c:[{bK:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke comment values with",e:/;/,eW:!0,l:/[\w\.]+/,k:{keyword:"as abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias all allocate allow alter always analyze ancillary and anti any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound bucket buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain explode export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force foreign form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour hours http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lateral lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minutes minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notnull notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second seconds section securefile security seed segment select self semi sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tablesample tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unnest unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace window with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek",literal:"true false null unknown",built_in:"array bigint binary bit blob bool boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text time timestamp tinyint varchar varchar2 varying void"},c:[{cN:"string",b:"'",e:"'",c:[{b:"''"}]},{cN:"string",b:'"',e:'"',c:[{b:'""'}]},{cN:"string",b:"`",e:"`"},e.CNM,e.CBCM,t,e.HCM]},e.CBCM,t,e.HCM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/stan.min.js b/vendor/assets/javascripts/highlightjs/languages/stan.min.js
index 1dcb6b78e6..d79793bf55 100644
--- a/vendor/assets/javascripts/highlightjs/languages/stan.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/stan.min.js
@@ -1 +1 @@
-hljs.registerLanguage("stan",function(){"use strict";return function(_){return{name:"Stan",aliases:["stanfuncs"],keywords:{$pattern:_.IDENT_RE,title:"functions model data parameters quantities transformed generated",keyword:["for","in","if","else","while","break","continue","return"].concat(["int","real","vector","ordered","positive_ordered","simplex","unit_vector","row_vector","matrix","cholesky_factor_corr|10","cholesky_factor_cov|10","corr_matrix|10","cov_matrix|10","void"]).concat(["print","reject","increment_log_prob|10","integrate_ode|10","integrate_ode_rk45|10","integrate_ode_bdf|10","algebra_solver"]).join(" "),built_in:"Phi Phi_approx abs acos acosh algebra_solver append_array append_col append_row asin asinh atan atan2 atanh bernoulli_cdf bernoulli_lccdf bernoulli_lcdf bernoulli_logit_lpmf bernoulli_logit_rng bernoulli_lpmf bernoulli_rng bessel_first_kind bessel_second_kind beta_binomial_cdf beta_binomial_lccdf beta_binomial_lcdf beta_binomial_lpmf beta_binomial_rng beta_cdf beta_lccdf beta_lcdf beta_lpdf beta_rng binary_log_loss binomial_cdf binomial_coefficient_log binomial_lccdf binomial_lcdf binomial_logit_lpmf binomial_lpmf binomial_rng block categorical_logit_lpmf categorical_logit_rng categorical_lpmf categorical_rng cauchy_cdf cauchy_lccdf cauchy_lcdf cauchy_lpdf cauchy_rng cbrt ceil chi_square_cdf chi_square_lccdf chi_square_lcdf chi_square_lpdf chi_square_rng cholesky_decompose choose col cols columns_dot_product columns_dot_self cos cosh cov_exp_quad crossprod csr_extract_u csr_extract_v csr_extract_w csr_matrix_times_vector csr_to_dense_matrix cumulative_sum determinant diag_matrix diag_post_multiply diag_pre_multiply diagonal digamma dims dirichlet_lpdf dirichlet_rng distance dot_product dot_self double_exponential_cdf double_exponential_lccdf double_exponential_lcdf double_exponential_lpdf double_exponential_rng e eigenvalues_sym eigenvectors_sym erf erfc exp exp2 exp_mod_normal_cdf exp_mod_normal_lccdf exp_mod_normal_lcdf exp_mod_normal_lpdf exp_mod_normal_rng expm1 exponential_cdf exponential_lccdf exponential_lcdf exponential_lpdf exponential_rng fabs falling_factorial fdim floor fma fmax fmin fmod frechet_cdf frechet_lccdf frechet_lcdf frechet_lpdf frechet_rng gamma_cdf gamma_lccdf gamma_lcdf gamma_lpdf gamma_p gamma_q gamma_rng gaussian_dlm_obs_lpdf get_lp gumbel_cdf gumbel_lccdf gumbel_lcdf gumbel_lpdf gumbel_rng head hypergeometric_lpmf hypergeometric_rng hypot inc_beta int_step integrate_ode integrate_ode_bdf integrate_ode_rk45 inv inv_Phi inv_chi_square_cdf inv_chi_square_lccdf inv_chi_square_lcdf inv_chi_square_lpdf inv_chi_square_rng inv_cloglog inv_gamma_cdf inv_gamma_lccdf inv_gamma_lcdf inv_gamma_lpdf inv_gamma_rng inv_logit inv_sqrt inv_square inv_wishart_lpdf inv_wishart_rng inverse inverse_spd is_inf is_nan lbeta lchoose lgamma lkj_corr_cholesky_lpdf lkj_corr_cholesky_rng lkj_corr_lpdf lkj_corr_rng lmgamma lmultiply log log10 log1m log1m_exp log1m_inv_logit log1p log1p_exp log2 log_determinant log_diff_exp log_falling_factorial log_inv_logit log_mix log_rising_factorial log_softmax log_sum_exp logistic_cdf logistic_lccdf logistic_lcdf logistic_lpdf logistic_rng logit lognormal_cdf lognormal_lccdf lognormal_lcdf lognormal_lpdf lognormal_rng machine_precision matrix_exp max mdivide_left_spd mdivide_left_tri_low mdivide_right_spd mdivide_right_tri_low mean min modified_bessel_first_kind modified_bessel_second_kind multi_gp_cholesky_lpdf multi_gp_lpdf multi_normal_cholesky_lpdf multi_normal_cholesky_rng multi_normal_lpdf multi_normal_prec_lpdf multi_normal_rng multi_student_t_lpdf multi_student_t_rng multinomial_lpmf multinomial_rng multiply_log multiply_lower_tri_self_transpose neg_binomial_2_cdf neg_binomial_2_lccdf neg_binomial_2_lcdf neg_binomial_2_log_lpmf neg_binomial_2_log_rng neg_binomial_2_lpmf neg_binomial_2_rng neg_binomial_cdf neg_binomial_lccdf neg_binomial_lcdf neg_binomial_lpmf neg_binomial_rng negative_infinity normal_cdf normal_lccdf normal_lcdf normal_lpdf normal_rng not_a_number num_elements ordered_logistic_lpmf ordered_logistic_rng owens_t pareto_cdf pareto_lccdf pareto_lcdf pareto_lpdf pareto_rng pareto_type_2_cdf pareto_type_2_lccdf pareto_type_2_lcdf pareto_type_2_lpdf pareto_type_2_rng pi poisson_cdf poisson_lccdf poisson_lcdf poisson_log_lpmf poisson_log_rng poisson_lpmf poisson_rng positive_infinity pow print prod qr_Q qr_R quad_form quad_form_diag quad_form_sym rank rayleigh_cdf rayleigh_lccdf rayleigh_lcdf rayleigh_lpdf rayleigh_rng reject rep_array rep_matrix rep_row_vector rep_vector rising_factorial round row rows rows_dot_product rows_dot_self scaled_inv_chi_square_cdf scaled_inv_chi_square_lccdf scaled_inv_chi_square_lcdf scaled_inv_chi_square_lpdf scaled_inv_chi_square_rng sd segment sin singular_values sinh size skew_normal_cdf skew_normal_lccdf skew_normal_lcdf skew_normal_lpdf skew_normal_rng softmax sort_asc sort_desc sort_indices_asc sort_indices_desc sqrt sqrt2 square squared_distance step student_t_cdf student_t_lccdf student_t_lcdf student_t_lpdf student_t_rng sub_col sub_row sum tail tan tanh target tcrossprod tgamma to_array_1d to_array_2d to_matrix to_row_vector to_vector trace trace_gen_quad_form trace_quad_form trigamma trunc uniform_cdf uniform_lccdf uniform_lcdf uniform_lpdf uniform_rng variance von_mises_lpdf von_mises_rng weibull_cdf weibull_lccdf weibull_lcdf weibull_lpdf weibull_rng wiener_lpdf wishart_lpdf wishart_rng"},contains:[_.C_LINE_COMMENT_MODE,_.COMMENT(/#/,/$/,{relevance:0,keywords:{"meta-keyword":"include"}}),_.COMMENT(/\/\*/,/\*\//,{relevance:0,contains:[{className:"doctag",begin:/@(return|param)/}]}),{begin:/<\s*lower\s*=/,keywords:"lower"},{begin:/[<,]\s*upper\s*=/,keywords:"upper"},{className:"keyword",begin:/\btarget\s*\+=/,relevance:10},{begin:"~\\s*("+_.IDENT_RE+")\\s*\\(",keywords:"bernoulli bernoulli_logit beta beta_binomial binomial binomial_logit categorical categorical_logit cauchy chi_square dirichlet double_exponential exp_mod_normal exponential frechet gamma gaussian_dlm_obs gumbel hypergeometric inv_chi_square inv_gamma inv_wishart lkj_corr lkj_corr_cholesky logistic lognormal multi_gp multi_gp_cholesky multi_normal multi_normal_cholesky multi_normal_prec multi_student_t multinomial neg_binomial neg_binomial_2 neg_binomial_2_log normal ordered_logistic pareto pareto_type_2 poisson poisson_log rayleigh scaled_inv_chi_square skew_normal student_t uniform von_mises weibull wiener wishart"},{className:"number",variants:[{begin:/\b\d+(?:\.\d*)?(?:[eE][+-]?\d+)?/},{begin:/\.\d+(?:[eE][+-]?\d+)?\b/}],relevance:0},{className:"string",begin:'"',end:'"',relevance:0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("stan",function(_){return{aliases:["stanfuncs"],k:{title:["functions","model","data","parameters","quantities","transformed","generated"].join(" "),keyword:["for","in","if","else","while","break","continue","return"].concat(["int","real","vector","ordered","positive_ordered","simplex","unit_vector","row_vector","matrix","cholesky_factor_corr|10","cholesky_factor_cov|10","corr_matrix|10","cov_matrix|10","void"]).concat(["print","reject","increment_log_prob|10","integrate_ode|10","integrate_ode_rk45|10","integrate_ode_bdf|10","algebra_solver"]).join(" "),built_in:["Phi","Phi_approx","abs","acos","acosh","algebra_solver","append_array","append_col","append_row","asin","asinh","atan","atan2","atanh","bernoulli_cdf","bernoulli_lccdf","bernoulli_lcdf","bernoulli_logit_lpmf","bernoulli_logit_rng","bernoulli_lpmf","bernoulli_rng","bessel_first_kind","bessel_second_kind","beta_binomial_cdf","beta_binomial_lccdf","beta_binomial_lcdf","beta_binomial_lpmf","beta_binomial_rng","beta_cdf","beta_lccdf","beta_lcdf","beta_lpdf","beta_rng","binary_log_loss","binomial_cdf","binomial_coefficient_log","binomial_lccdf","binomial_lcdf","binomial_logit_lpmf","binomial_lpmf","binomial_rng","block","categorical_logit_lpmf","categorical_logit_rng","categorical_lpmf","categorical_rng","cauchy_cdf","cauchy_lccdf","cauchy_lcdf","cauchy_lpdf","cauchy_rng","cbrt","ceil","chi_square_cdf","chi_square_lccdf","chi_square_lcdf","chi_square_lpdf","chi_square_rng","cholesky_decompose","choose","col","cols","columns_dot_product","columns_dot_self","cos","cosh","cov_exp_quad","crossprod","csr_extract_u","csr_extract_v","csr_extract_w","csr_matrix_times_vector","csr_to_dense_matrix","cumulative_sum","determinant","diag_matrix","diag_post_multiply","diag_pre_multiply","diagonal","digamma","dims","dirichlet_lpdf","dirichlet_rng","distance","dot_product","dot_self","double_exponential_cdf","double_exponential_lccdf","double_exponential_lcdf","double_exponential_lpdf","double_exponential_rng","e","eigenvalues_sym","eigenvectors_sym","erf","erfc","exp","exp2","exp_mod_normal_cdf","exp_mod_normal_lccdf","exp_mod_normal_lcdf","exp_mod_normal_lpdf","exp_mod_normal_rng","expm1","exponential_cdf","exponential_lccdf","exponential_lcdf","exponential_lpdf","exponential_rng","fabs","falling_factorial","fdim","floor","fma","fmax","fmin","fmod","frechet_cdf","frechet_lccdf","frechet_lcdf","frechet_lpdf","frechet_rng","gamma_cdf","gamma_lccdf","gamma_lcdf","gamma_lpdf","gamma_p","gamma_q","gamma_rng","gaussian_dlm_obs_lpdf","get_lp","gumbel_cdf","gumbel_lccdf","gumbel_lcdf","gumbel_lpdf","gumbel_rng","head","hypergeometric_lpmf","hypergeometric_rng","hypot","inc_beta","int_step","integrate_ode","integrate_ode_bdf","integrate_ode_rk45","inv","inv_Phi","inv_chi_square_cdf","inv_chi_square_lccdf","inv_chi_square_lcdf","inv_chi_square_lpdf","inv_chi_square_rng","inv_cloglog","inv_gamma_cdf","inv_gamma_lccdf","inv_gamma_lcdf","inv_gamma_lpdf","inv_gamma_rng","inv_logit","inv_sqrt","inv_square","inv_wishart_lpdf","inv_wishart_rng","inverse","inverse_spd","is_inf","is_nan","lbeta","lchoose","lgamma","lkj_corr_cholesky_lpdf","lkj_corr_cholesky_rng","lkj_corr_lpdf","lkj_corr_rng","lmgamma","lmultiply","log","log10","log1m","log1m_exp","log1m_inv_logit","log1p","log1p_exp","log2","log_determinant","log_diff_exp","log_falling_factorial","log_inv_logit","log_mix","log_rising_factorial","log_softmax","log_sum_exp","logistic_cdf","logistic_lccdf","logistic_lcdf","logistic_lpdf","logistic_rng","logit","lognormal_cdf","lognormal_lccdf","lognormal_lcdf","lognormal_lpdf","lognormal_rng","machine_precision","matrix_exp","max","mdivide_left_spd","mdivide_left_tri_low","mdivide_right_spd","mdivide_right_tri_low","mean","min","modified_bessel_first_kind","modified_bessel_second_kind","multi_gp_cholesky_lpdf","multi_gp_lpdf","multi_normal_cholesky_lpdf","multi_normal_cholesky_rng","multi_normal_lpdf","multi_normal_prec_lpdf","multi_normal_rng","multi_student_t_lpdf","multi_student_t_rng","multinomial_lpmf","multinomial_rng","multiply_log","multiply_lower_tri_self_transpose","neg_binomial_2_cdf","neg_binomial_2_lccdf","neg_binomial_2_lcdf","neg_binomial_2_log_lpmf","neg_binomial_2_log_rng","neg_binomial_2_lpmf","neg_binomial_2_rng","neg_binomial_cdf","neg_binomial_lccdf","neg_binomial_lcdf","neg_binomial_lpmf","neg_binomial_rng","negative_infinity","normal_cdf","normal_lccdf","normal_lcdf","normal_lpdf","normal_rng","not_a_number","num_elements","ordered_logistic_lpmf","ordered_logistic_rng","owens_t","pareto_cdf","pareto_lccdf","pareto_lcdf","pareto_lpdf","pareto_rng","pareto_type_2_cdf","pareto_type_2_lccdf","pareto_type_2_lcdf","pareto_type_2_lpdf","pareto_type_2_rng","pi","poisson_cdf","poisson_lccdf","poisson_lcdf","poisson_log_lpmf","poisson_log_rng","poisson_lpmf","poisson_rng","positive_infinity","pow","print","prod","qr_Q","qr_R","quad_form","quad_form_diag","quad_form_sym","rank","rayleigh_cdf","rayleigh_lccdf","rayleigh_lcdf","rayleigh_lpdf","rayleigh_rng","reject","rep_array","rep_matrix","rep_row_vector","rep_vector","rising_factorial","round","row","rows","rows_dot_product","rows_dot_self","scaled_inv_chi_square_cdf","scaled_inv_chi_square_lccdf","scaled_inv_chi_square_lcdf","scaled_inv_chi_square_lpdf","scaled_inv_chi_square_rng","sd","segment","sin","singular_values","sinh","size","skew_normal_cdf","skew_normal_lccdf","skew_normal_lcdf","skew_normal_lpdf","skew_normal_rng","softmax","sort_asc","sort_desc","sort_indices_asc","sort_indices_desc","sqrt","sqrt2","square","squared_distance","step","student_t_cdf","student_t_lccdf","student_t_lcdf","student_t_lpdf","student_t_rng","sub_col","sub_row","sum","tail","tan","tanh","target","tcrossprod","tgamma","to_array_1d","to_array_2d","to_matrix","to_row_vector","to_vector","trace","trace_gen_quad_form","trace_quad_form","trigamma","trunc","uniform_cdf","uniform_lccdf","uniform_lcdf","uniform_lpdf","uniform_rng","variance","von_mises_lpdf","von_mises_rng","weibull_cdf","weibull_lccdf","weibull_lcdf","weibull_lpdf","weibull_rng","wiener_lpdf","wishart_lpdf","wishart_rng"].join(" ")},l:_.IR,c:[_.CLCM,_.C(/#/,/$/,{relevance:0,k:{"meta-keyword":"include"}}),_.C(/\/\*/,/\*\//,{relevance:0,c:[{cN:"doctag",b:/@(return|param)/}]}),{b:/<\s*lower\s*=/,k:"lower"},{b:/[<,]*upper\s*=/,k:"upper"},{cN:"keyword",b:/\btarget\s*\+=/,relevance:10},{b:"~\\s*("+_.IR+")\\s*\\(",k:["bernoulli","bernoulli_logit","beta","beta_binomial","binomial","binomial_logit","categorical","categorical_logit","cauchy","chi_square","dirichlet","double_exponential","exp_mod_normal","exponential","frechet","gamma","gaussian_dlm_obs","gumbel","hypergeometric","inv_chi_square","inv_gamma","inv_wishart","lkj_corr","lkj_corr_cholesky","logistic","lognormal","multi_gp","multi_gp_cholesky","multi_normal","multi_normal_cholesky","multi_normal_prec","multi_student_t","multinomial","neg_binomial","neg_binomial_2","neg_binomial_2_log","normal","ordered_logistic","pareto","pareto_type_2","poisson","poisson_log","rayleigh","scaled_inv_chi_square","skew_normal","student_t","uniform","von_mises","weibull","wiener","wishart"].join(" ")},{cN:"number",v:[{b:/\b\d+(?:\.\d*)?(?:[eE][+-]?\d+)?/},{b:/\.\d+(?:[eE][+-]?\d+)?\b/}],relevance:0},{cN:"string",b:'"',e:'"',relevance:0}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/stata.min.js b/vendor/assets/javascripts/highlightjs/languages/stata.min.js
index 6ad1868312..55a31d2b79 100644
--- a/vendor/assets/javascripts/highlightjs/languages/stata.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/stata.min.js
@@ -1 +1 @@
-hljs.registerLanguage("stata",function(){"use strict";return function(e){return{name:"Stata",aliases:["do","ado"],case_insensitive:!0,keywords:"if else in foreach for forv forva forval forvalu forvalue forvalues by bys bysort xi quietly qui capture about ac ac_7 acprplot acprplot_7 adjust ado adopath adoupdate alpha ameans an ano anov anova anova_estat anova_terms anovadef aorder ap app appe appen append arch arch_dr arch_estat arch_p archlm areg areg_p args arima arima_dr arima_estat arima_p as asmprobit asmprobit_estat asmprobit_lf asmprobit_mfx__dlg asmprobit_p ass asse asser assert avplot avplot_7 avplots avplots_7 bcskew0 bgodfrey bias binreg bip0_lf biplot bipp_lf bipr_lf bipr_p biprobit bitest bitesti bitowt blogit bmemsize boot bootsamp bootstrap bootstrap_8 boxco_l boxco_p boxcox boxcox_6 boxcox_p bprobit br break brier bro brow brows browse brr brrstat bs bs_7 bsampl_w bsample bsample_7 bsqreg bstat bstat_7 bstat_8 bstrap bstrap_7 bubble bubbleplot ca ca_estat ca_p cabiplot camat canon canon_8 canon_8_p canon_estat canon_p cap caprojection capt captu captur capture cat cc cchart cchart_7 cci cd censobs_table centile cf char chdir checkdlgfiles checkestimationsample checkhlpfiles checksum chelp ci cii cl class classutil clear cli clis clist clo clog clog_lf clog_p clogi clogi_sw clogit clogit_lf clogit_p clogitp clogl_sw cloglog clonevar clslistarray cluster cluster_measures cluster_stop cluster_tree cluster_tree_8 clustermat cmdlog cnr cnre cnreg cnreg_p cnreg_sw cnsreg codebook collaps4 collapse colormult_nb colormult_nw compare compress conf confi confir confirm conren cons const constr constra constrai constrain constraint continue contract copy copyright copysource cor corc corr corr2data corr_anti corr_kmo corr_smc corre correl correla correlat correlate corrgram cou coun count cox cox_p cox_sw coxbase coxhaz coxvar cprplot cprplot_7 crc cret cretu cretur creturn cross cs cscript cscript_log csi ct ct_is ctset ctst_5 ctst_st cttost cumsp cumsp_7 cumul cusum cusum_7 cutil d|0 datasig datasign datasigna datasignat datasignatu datasignatur datasignature datetof db dbeta de dec deco decod decode deff des desc descr descri describ describe destring dfbeta dfgls dfuller di di_g dir dirstats dis discard disp disp_res disp_s displ displa display distinct do doe doed doedi doedit dotplot dotplot_7 dprobit drawnorm drop ds ds_util dstdize duplicates durbina dwstat dydx e|0 ed edi edit egen eivreg emdef en enc enco encod encode eq erase ereg ereg_lf ereg_p ereg_sw ereghet ereghet_glf ereghet_glf_sh ereghet_gp ereghet_ilf ereghet_ilf_sh ereghet_ip eret eretu eretur ereturn err erro error esize est est_cfexist est_cfname est_clickable est_expand est_hold est_table est_unhold est_unholdok estat estat_default estat_summ estat_vce_only esti estimates etodow etof etomdy ex exi exit expand expandcl fac fact facto factor factor_estat factor_p factor_pca_rotated factor_rotate factormat fcast fcast_compute fcast_graph fdades fdadesc fdadescr fdadescri fdadescrib fdadescribe fdasav fdasave fdause fh_st file open file read file close file filefilter fillin find_hlp_file findfile findit findit_7 fit fl fli flis flist for5_0 forest forestplot form forma format fpredict frac_154 frac_adj frac_chk frac_cox frac_ddp frac_dis frac_dv frac_in frac_mun frac_pp frac_pq frac_pv frac_wgt frac_xo fracgen fracplot fracplot_7 fracpoly fracpred fron_ex fron_hn fron_p fron_tn fron_tn2 frontier ftodate ftoe ftomdy ftowdate funnel funnelplot g|0 gamhet_glf gamhet_gp gamhet_ilf gamhet_ip gamma gamma_d2 gamma_p gamma_sw gammahet gdi_hexagon gdi_spokes ge gen gene gener genera generat generate genrank genstd genvmean gettoken gl gladder gladder_7 glim_l01 glim_l02 glim_l03 glim_l04 glim_l05 glim_l06 glim_l07 glim_l08 glim_l09 glim_l10 glim_l11 glim_l12 glim_lf glim_mu glim_nw1 glim_nw2 glim_nw3 glim_p glim_v1 glim_v2 glim_v3 glim_v4 glim_v5 glim_v6 glim_v7 glm glm_6 glm_p glm_sw glmpred glo glob globa global glogit glogit_8 glogit_p gmeans gnbre_lf gnbreg gnbreg_5 gnbreg_p gomp_lf gompe_sw gomper_p gompertz gompertzhet gomphet_glf gomphet_glf_sh gomphet_gp gomphet_ilf gomphet_ilf_sh gomphet_ip gphdot gphpen gphprint gprefs gprobi_p gprobit gprobit_8 gr gr7 gr_copy gr_current gr_db gr_describe gr_dir gr_draw gr_draw_replay gr_drop gr_edit gr_editviewopts gr_example gr_example2 gr_export gr_print gr_qscheme gr_query gr_read gr_rename gr_replay gr_save gr_set gr_setscheme gr_table gr_undo gr_use graph graph7 grebar greigen greigen_7 greigen_8 grmeanby grmeanby_7 gs_fileinfo gs_filetype gs_graphinfo gs_stat gsort gwood h|0 hadimvo hareg hausman haver he heck_d2 heckma_p heckman heckp_lf heckpr_p heckprob hel help hereg hetpr_lf hetpr_p hetprob hettest hexdump hilite hist hist_7 histogram hlogit hlu hmeans hotel hotelling hprobit hreg hsearch icd9 icd9_ff icd9p iis impute imtest inbase include inf infi infil infile infix inp inpu input ins insheet insp inspe inspec inspect integ inten intreg intreg_7 intreg_p intrg2_ll intrg_ll intrg_ll2 ipolate iqreg ir irf irf_create irfm iri is_svy is_svysum isid istdize ivprob_1_lf ivprob_lf ivprobit ivprobit_p ivreg ivreg_footnote ivtob_1_lf ivtob_lf ivtobit ivtobit_p jackknife jacknife jknife jknife_6 jknife_8 jkstat joinby kalarma1 kap kap_3 kapmeier kappa kapwgt kdensity kdensity_7 keep ksm ksmirnov ktau kwallis l|0 la lab labbe labbeplot labe label labelbook ladder levels levelsof leverage lfit lfit_p li lincom line linktest lis list lloghet_glf lloghet_glf_sh lloghet_gp lloghet_ilf lloghet_ilf_sh lloghet_ip llogi_sw llogis_p llogist llogistic llogistichet lnorm_lf lnorm_sw lnorma_p lnormal lnormalhet lnormhet_glf lnormhet_glf_sh lnormhet_gp lnormhet_ilf lnormhet_ilf_sh lnormhet_ip lnskew0 loadingplot loc loca local log logi logis_lf logistic logistic_p logit logit_estat logit_p loglogs logrank loneway lookfor lookup lowess lowess_7 lpredict lrecomp lroc lroc_7 lrtest ls lsens lsens_7 lsens_x lstat ltable ltable_7 ltriang lv lvr2plot lvr2plot_7 m|0 ma mac macr macro makecns man manova manova_estat manova_p manovatest mantel mark markin markout marksample mat mat_capp mat_order mat_put_rr mat_rapp mata mata_clear mata_describe mata_drop mata_matdescribe mata_matsave mata_matuse mata_memory mata_mlib mata_mosave mata_rename mata_which matalabel matcproc matlist matname matr matri matrix matrix_input__dlg matstrik mcc mcci md0_ md1_ md1debug_ md2_ md2debug_ mds mds_estat mds_p mdsconfig mdslong mdsmat mdsshepard mdytoe mdytof me_derd mean means median memory memsize menl meqparse mer merg merge meta mfp mfx mhelp mhodds minbound mixed_ll mixed_ll_reparm mkassert mkdir mkmat mkspline ml ml_5 ml_adjs ml_bhhhs ml_c_d ml_check ml_clear ml_cnt ml_debug ml_defd ml_e0 ml_e0_bfgs ml_e0_cycle ml_e0_dfp ml_e0i ml_e1 ml_e1_bfgs ml_e1_bhhh ml_e1_cycle ml_e1_dfp ml_e2 ml_e2_cycle ml_ebfg0 ml_ebfr0 ml_ebfr1 ml_ebh0q ml_ebhh0 ml_ebhr0 ml_ebr0i ml_ecr0i ml_edfp0 ml_edfr0 ml_edfr1 ml_edr0i ml_eds ml_eer0i ml_egr0i ml_elf ml_elf_bfgs ml_elf_bhhh ml_elf_cycle ml_elf_dfp ml_elfi ml_elfs ml_enr0i ml_enrr0 ml_erdu0 ml_erdu0_bfgs ml_erdu0_bhhh ml_erdu0_bhhhq ml_erdu0_cycle ml_erdu0_dfp ml_erdu0_nrbfgs ml_exde ml_footnote ml_geqnr ml_grad0 ml_graph ml_hbhhh ml_hd0 ml_hold ml_init ml_inv ml_log ml_max ml_mlout ml_mlout_8 ml_model ml_nb0 ml_opt ml_p ml_plot ml_query ml_rdgrd ml_repor ml_s_e ml_score ml_searc ml_technique ml_unhold mleval mlf_ mlmatbysum mlmatsum mlog mlogi mlogit mlogit_footnote mlogit_p mlopts mlsum mlvecsum mnl0_ mor more mov move mprobit mprobit_lf mprobit_p mrdu0_ mrdu1_ mvdecode mvencode mvreg mvreg_estat n|0 nbreg nbreg_al nbreg_lf nbreg_p nbreg_sw nestreg net newey newey_7 newey_p news nl nl_7 nl_9 nl_9_p nl_p nl_p_7 nlcom nlcom_p nlexp2 nlexp2_7 nlexp2a nlexp2a_7 nlexp3 nlexp3_7 nlgom3 nlgom3_7 nlgom4 nlgom4_7 nlinit nllog3 nllog3_7 nllog4 nllog4_7 nlog_rd nlogit nlogit_p nlogitgen nlogittree nlpred no nobreak noi nois noisi noisil noisily note notes notes_dlg nptrend numlabel numlist odbc old_ver olo olog ologi ologi_sw ologit ologit_p ologitp on one onew onewa oneway op_colnm op_comp op_diff op_inv op_str opr opro oprob oprob_sw oprobi oprobi_p oprobit oprobitp opts_exclusive order orthog orthpoly ou out outf outfi outfil outfile outs outsh outshe outshee outsheet ovtest pac pac_7 palette parse parse_dissim pause pca pca_8 pca_display pca_estat pca_p pca_rotate pcamat pchart pchart_7 pchi pchi_7 pcorr pctile pentium pergram pergram_7 permute permute_8 personal peto_st pkcollapse pkcross pkequiv pkexamine pkexamine_7 pkshape pksumm pksumm_7 pl plo plot plugin pnorm pnorm_7 poisgof poiss_lf poiss_sw poisso_p poisson poisson_estat post postclose postfile postutil pperron pr prais prais_e prais_e2 prais_p predict predictnl preserve print pro prob probi probit probit_estat probit_p proc_time procoverlay procrustes procrustes_estat procrustes_p profiler prog progr progra program prop proportion prtest prtesti pwcorr pwd q\\s qby qbys qchi qchi_7 qladder qladder_7 qnorm qnorm_7 qqplot qqplot_7 qreg qreg_c qreg_p qreg_sw qu quadchk quantile quantile_7 que quer query range ranksum ratio rchart rchart_7 rcof recast reclink recode reg reg3 reg3_p regdw regr regre regre_p2 regres regres_p regress regress_estat regriv_p remap ren rena renam rename renpfix repeat replace report reshape restore ret retu retur return rm rmdir robvar roccomp roccomp_7 roccomp_8 rocf_lf rocfit rocfit_8 rocgold rocplot rocplot_7 roctab roctab_7 rolling rologit rologit_p rot rota rotat rotate rotatemat rreg rreg_p ru run runtest rvfplot rvfplot_7 rvpplot rvpplot_7 sa safesum sample sampsi sav save savedresults saveold sc sca scal scala scalar scatter scm_mine sco scob_lf scob_p scobi_sw scobit scor score scoreplot scoreplot_help scree screeplot screeplot_help sdtest sdtesti se search separate seperate serrbar serrbar_7 serset set set_defaults sfrancia sh she shel shell shewhart shewhart_7 signestimationsample signrank signtest simul simul_7 simulate simulate_8 sktest sleep slogit slogit_d2 slogit_p smooth snapspan so sor sort spearman spikeplot spikeplot_7 spikeplt spline_x split sqreg sqreg_p sret sretu sretur sreturn ssc st st_ct st_hc st_hcd st_hcd_sh st_is st_issys st_note st_promo st_set st_show st_smpl st_subid stack statsby statsby_8 stbase stci stci_7 stcox stcox_estat stcox_fr stcox_fr_ll stcox_p stcox_sw stcoxkm stcoxkm_7 stcstat stcurv stcurve stcurve_7 stdes stem stepwise stereg stfill stgen stir stjoin stmc stmh stphplot stphplot_7 stphtest stphtest_7 stptime strate strate_7 streg streg_sw streset sts sts_7 stset stsplit stsum sttocc sttoct stvary stweib su suest suest_8 sum summ summa summar summari summariz summarize sunflower sureg survcurv survsum svar svar_p svmat svy svy_disp svy_dreg svy_est svy_est_7 svy_estat svy_get svy_gnbreg_p svy_head svy_header svy_heckman_p svy_heckprob_p svy_intreg_p svy_ivreg_p svy_logistic_p svy_logit_p svy_mlogit_p svy_nbreg_p svy_ologit_p svy_oprobit_p svy_poisson_p svy_probit_p svy_regress_p svy_sub svy_sub_7 svy_x svy_x_7 svy_x_p svydes svydes_8 svygen svygnbreg svyheckman svyheckprob svyintreg svyintreg_7 svyintrg svyivreg svylc svylog_p svylogit svymarkout svymarkout_8 svymean svymlog svymlogit svynbreg svyolog svyologit svyoprob svyoprobit svyopts svypois svypois_7 svypoisson svyprobit svyprobt svyprop svyprop_7 svyratio svyreg svyreg_p svyregress svyset svyset_7 svyset_8 svytab svytab_7 svytest svytotal sw sw_8 swcnreg swcox swereg swilk swlogis swlogit swologit swoprbt swpois swprobit swqreg swtobit swweib symmetry symmi symplot symplot_7 syntax sysdescribe sysdir sysuse szroeter ta tab tab1 tab2 tab_or tabd tabdi tabdis tabdisp tabi table tabodds tabodds_7 tabstat tabu tabul tabula tabulat tabulate te tempfile tempname tempvar tes test testnl testparm teststd tetrachoric time_it timer tis tob tobi tobit tobit_p tobit_sw token tokeni tokeniz tokenize tostring total translate translator transmap treat_ll treatr_p treatreg trim trimfill trnb_cons trnb_mean trpoiss_d2 trunc_ll truncr_p truncreg tsappend tset tsfill tsline tsline_ex tsreport tsrevar tsrline tsset tssmooth tsunab ttest ttesti tut_chk tut_wait tutorial tw tware_st two twoway twoway__fpfit_serset twoway__function_gen twoway__histogram_gen twoway__ipoint_serset twoway__ipoints_serset twoway__kdensity_gen twoway__lfit_serset twoway__normgen_gen twoway__pci_serset twoway__qfit_serset twoway__scatteri_serset twoway__sunflower_gen twoway_ksm_serset ty typ type typeof u|0 unab unabbrev unabcmd update us use uselabel var var_mkcompanion var_p varbasic varfcast vargranger varirf varirf_add varirf_cgraph varirf_create varirf_ctable varirf_describe varirf_dir varirf_drop varirf_erase varirf_graph varirf_ograph varirf_rename varirf_set varirf_table varlist varlmar varnorm varsoc varstable varstable_w varstable_w2 varwle vce vec vec_fevd vec_mkphi vec_p vec_p_w vecirf_create veclmar veclmar_w vecnorm vecnorm_w vecrank vecstable verinst vers versi versio version view viewsource vif vwls wdatetof webdescribe webseek webuse weib1_lf weib2_lf weib_lf weib_lf0 weibhet_glf weibhet_glf_sh weibhet_glfa weibhet_glfa_sh weibhet_gp weibhet_ilf weibhet_ilf_sh weibhet_ilfa weibhet_ilfa_sh weibhet_ip weibu_sw weibul_p weibull weibull_c weibull_s weibullhet wh whelp whi which whil while wilc_st wilcoxon win wind windo window winexec wntestb wntestb_7 wntestq xchart xchart_7 xcorr xcorr_7 xi xi_6 xmlsav xmlsave xmluse xpose xsh xshe xshel xshell xt_iis xt_tis xtab_p xtabond xtbin_p xtclog xtcloglog xtcloglog_8 xtcloglog_d2 xtcloglog_pa_p xtcloglog_re_p xtcnt_p xtcorr xtdata xtdes xtfront_p xtfrontier xtgee xtgee_elink xtgee_estat xtgee_makeivar xtgee_p xtgee_plink xtgls xtgls_p xthaus xthausman xtht_p xthtaylor xtile xtint_p xtintreg xtintreg_8 xtintreg_d2 xtintreg_p xtivp_1 xtivp_2 xtivreg xtline xtline_ex xtlogit xtlogit_8 xtlogit_d2 xtlogit_fe_p xtlogit_pa_p xtlogit_re_p xtmixed xtmixed_estat xtmixed_p xtnb_fe xtnb_lf xtnbreg xtnbreg_pa_p xtnbreg_refe_p xtpcse xtpcse_p xtpois xtpoisson xtpoisson_d2 xtpoisson_pa_p xtpoisson_refe_p xtpred xtprobit xtprobit_8 xtprobit_d2 xtprobit_re_p xtps_fe xtps_lf xtps_ren xtps_ren_8 xtrar_p xtrc xtrc_p xtrchh xtrefe_p xtreg xtreg_be xtreg_fe xtreg_ml xtreg_pa_p xtreg_re xtregar xtrere_p xtset xtsf_ll xtsf_llti xtsum xttab xttest0 xttobit xttobit_8 xttobit_p xttrans yx yxview__barlike_draw yxview_area_draw yxview_bar_draw yxview_dot_draw yxview_dropline_draw yxview_function_draw yxview_iarrow_draw yxview_ilabels_draw yxview_normal_draw yxview_pcarrow_draw yxview_pcbarrow_draw yxview_pccapsym_draw yxview_pcscatter_draw yxview_pcspike_draw yxview_rarea_draw yxview_rbar_draw yxview_rbarm_draw yxview_rcap_draw yxview_rcapsym_draw yxview_rconnected_draw yxview_rline_draw yxview_rscatter_draw yxview_rspike_draw yxview_spike_draw yxview_sunflower_draw zap_s zinb zinb_llf zinb_plf zip zip_llf zip_p zip_plf zt_ct_5 zt_hc_5 zt_hcd_5 zt_is_5 zt_iss_5 zt_sho_5 zt_smp_5 ztbase_5 ztcox_5 ztdes_5 ztereg_5 ztfill_5 ztgen_5 ztir_5 ztjoin_5 ztnb ztnb_p ztp ztp_p zts_5 ztset_5 ztspli_5 ztsum_5 zttoct_5 ztvary_5 ztweib_5",contains:[{className:"symbol",begin:/`[a-zA-Z0-9_]+'/},{className:"variable",begin:/\$\{?[a-zA-Z0-9_]+\}?/},{className:"string",variants:[{begin:'`"[^\r\n]*?"\''},{begin:'"[^\r\n"]*"'}]},{className:"built_in",variants:[{begin:"\\b(abs|acos|asin|atan|atan2|atanh|ceil|cloglog|comb|cos|digamma|exp|floor|invcloglog|invlogit|ln|lnfact|lnfactorial|lngamma|log|log10|max|min|mod|reldif|round|sign|sin|sqrt|sum|tan|tanh|trigamma|trunc|betaden|Binomial|binorm|binormal|chi2|chi2tail|dgammapda|dgammapdada|dgammapdadx|dgammapdx|dgammapdxdx|F|Fden|Ftail|gammaden|gammap|ibeta|invbinomial|invchi2|invchi2tail|invF|invFtail|invgammap|invibeta|invnchi2|invnFtail|invnibeta|invnorm|invnormal|invttail|nbetaden|nchi2|nFden|nFtail|nibeta|norm|normal|normalden|normd|npnchi2|tden|ttail|uniform|abbrev|char|index|indexnot|length|lower|ltrim|match|plural|proper|real|regexm|regexr|regexs|reverse|rtrim|string|strlen|strlower|strltrim|strmatch|strofreal|strpos|strproper|strreverse|strrtrim|strtrim|strupper|subinstr|subinword|substr|trim|upper|word|wordcount|_caller|autocode|byteorder|chop|clip|cond|e|epsdouble|epsfloat|group|inlist|inrange|irecode|matrix|maxbyte|maxdouble|maxfloat|maxint|maxlong|mi|minbyte|mindouble|minfloat|minint|minlong|missing|r|recode|replay|return|s|scalar|d|date|day|dow|doy|halfyear|mdy|month|quarter|week|year|d|daily|dofd|dofh|dofm|dofq|dofw|dofy|h|halfyearly|hofd|m|mofd|monthly|q|qofd|quarterly|tin|twithin|w|weekly|wofd|y|yearly|yh|ym|yofd|yq|yw|cholesky|colnumb|colsof|corr|det|diag|diag0cnt|el|get|hadamard|I|inv|invsym|issym|issymmetric|J|matmissing|matuniform|mreldif|nullmat|rownumb|rowsof|sweep|syminv|trace|vec|vecdiag)(?=\\()"}]},e.COMMENT("^[ \t]*\\*.*$",!1),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("stata",function(e){return{aliases:["do","ado"],case_insensitive:!0,keywords:"if else in foreach for forv forva forval forvalu forvalue forvalues by bys bysort xi quietly qui capture about ac ac_7 acprplot acprplot_7 adjust ado adopath adoupdate alpha ameans an ano anov anova anova_estat anova_terms anovadef aorder ap app appe appen append arch arch_dr arch_estat arch_p archlm areg areg_p args arima arima_dr arima_estat arima_p as asmprobit asmprobit_estat asmprobit_lf asmprobit_mfx__dlg asmprobit_p ass asse asser assert avplot avplot_7 avplots avplots_7 bcskew0 bgodfrey bias binreg bip0_lf biplot bipp_lf bipr_lf bipr_p biprobit bitest bitesti bitowt blogit bmemsize boot bootsamp bootstrap bootstrap_8 boxco_l boxco_p boxcox boxcox_6 boxcox_p bprobit br break brier bro brow brows browse brr brrstat bs bs_7 bsampl_w bsample bsample_7 bsqreg bstat bstat_7 bstat_8 bstrap bstrap_7 bubble bubbleplot ca ca_estat ca_p cabiplot camat canon canon_8 canon_8_p canon_estat canon_p cap caprojection capt captu captur capture cat cc cchart cchart_7 cci cd censobs_table centile cf char chdir checkdlgfiles checkestimationsample checkhlpfiles checksum chelp ci cii cl class classutil clear cli clis clist clo clog clog_lf clog_p clogi clogi_sw clogit clogit_lf clogit_p clogitp clogl_sw cloglog clonevar clslistarray cluster cluster_measures cluster_stop cluster_tree cluster_tree_8 clustermat cmdlog cnr cnre cnreg cnreg_p cnreg_sw cnsreg codebook collaps4 collapse colormult_nb colormult_nw compare compress conf confi confir confirm conren cons const constr constra constrai constrain constraint continue contract copy copyright copysource cor corc corr corr2data corr_anti corr_kmo corr_smc corre correl correla correlat correlate corrgram cou coun count cox cox_p cox_sw coxbase coxhaz coxvar cprplot cprplot_7 crc cret cretu cretur creturn cross cs cscript cscript_log csi ct ct_is ctset ctst_5 ctst_st cttost cumsp cumsp_7 cumul cusum cusum_7 cutil d|0 datasig datasign datasigna datasignat datasignatu datasignatur datasignature datetof db dbeta de dec deco decod decode deff des desc descr descri describ describe destring dfbeta dfgls dfuller di di_g dir dirstats dis discard disp disp_res disp_s displ displa display distinct do doe doed doedi doedit dotplot dotplot_7 dprobit drawnorm drop ds ds_util dstdize duplicates durbina dwstat dydx e|0 ed edi edit egen eivreg emdef en enc enco encod encode eq erase ereg ereg_lf ereg_p ereg_sw ereghet ereghet_glf ereghet_glf_sh ereghet_gp ereghet_ilf ereghet_ilf_sh ereghet_ip eret eretu eretur ereturn err erro error esize est est_cfexist est_cfname est_clickable est_expand est_hold est_table est_unhold est_unholdok estat estat_default estat_summ estat_vce_only esti estimates etodow etof etomdy ex exi exit expand expandcl fac fact facto factor factor_estat factor_p factor_pca_rotated factor_rotate factormat fcast fcast_compute fcast_graph fdades fdadesc fdadescr fdadescri fdadescrib fdadescribe fdasav fdasave fdause fh_st file open file read file close file filefilter fillin find_hlp_file findfile findit findit_7 fit fl fli flis flist for5_0 forest forestplot form forma format fpredict frac_154 frac_adj frac_chk frac_cox frac_ddp frac_dis frac_dv frac_in frac_mun frac_pp frac_pq frac_pv frac_wgt frac_xo fracgen fracplot fracplot_7 fracpoly fracpred fron_ex fron_hn fron_p fron_tn fron_tn2 frontier ftodate ftoe ftomdy ftowdate funnel funnelplot g|0 gamhet_glf gamhet_gp gamhet_ilf gamhet_ip gamma gamma_d2 gamma_p gamma_sw gammahet gdi_hexagon gdi_spokes ge gen gene gener genera generat generate genrank genstd genvmean gettoken gl gladder gladder_7 glim_l01 glim_l02 glim_l03 glim_l04 glim_l05 glim_l06 glim_l07 glim_l08 glim_l09 glim_l10 glim_l11 glim_l12 glim_lf glim_mu glim_nw1 glim_nw2 glim_nw3 glim_p glim_v1 glim_v2 glim_v3 glim_v4 glim_v5 glim_v6 glim_v7 glm glm_6 glm_p glm_sw glmpred glo glob globa global glogit glogit_8 glogit_p gmeans gnbre_lf gnbreg gnbreg_5 gnbreg_p gomp_lf gompe_sw gomper_p gompertz gompertzhet gomphet_glf gomphet_glf_sh gomphet_gp gomphet_ilf gomphet_ilf_sh gomphet_ip gphdot gphpen gphprint gprefs gprobi_p gprobit gprobit_8 gr gr7 gr_copy gr_current gr_db gr_describe gr_dir gr_draw gr_draw_replay gr_drop gr_edit gr_editviewopts gr_example gr_example2 gr_export gr_print gr_qscheme gr_query gr_read gr_rename gr_replay gr_save gr_set gr_setscheme gr_table gr_undo gr_use graph graph7 grebar greigen greigen_7 greigen_8 grmeanby grmeanby_7 gs_fileinfo gs_filetype gs_graphinfo gs_stat gsort gwood h|0 hadimvo hareg hausman haver he heck_d2 heckma_p heckman heckp_lf heckpr_p heckprob hel help hereg hetpr_lf hetpr_p hetprob hettest hexdump hilite hist hist_7 histogram hlogit hlu hmeans hotel hotelling hprobit hreg hsearch icd9 icd9_ff icd9p iis impute imtest inbase include inf infi infil infile infix inp inpu input ins insheet insp inspe inspec inspect integ inten intreg intreg_7 intreg_p intrg2_ll intrg_ll intrg_ll2 ipolate iqreg ir irf irf_create irfm iri is_svy is_svysum isid istdize ivprob_1_lf ivprob_lf ivprobit ivprobit_p ivreg ivreg_footnote ivtob_1_lf ivtob_lf ivtobit ivtobit_p jackknife jacknife jknife jknife_6 jknife_8 jkstat joinby kalarma1 kap kap_3 kapmeier kappa kapwgt kdensity kdensity_7 keep ksm ksmirnov ktau kwallis l|0 la lab labbe labbeplot labe label labelbook ladder levels levelsof leverage lfit lfit_p li lincom line linktest lis list lloghet_glf lloghet_glf_sh lloghet_gp lloghet_ilf lloghet_ilf_sh lloghet_ip llogi_sw llogis_p llogist llogistic llogistichet lnorm_lf lnorm_sw lnorma_p lnormal lnormalhet lnormhet_glf lnormhet_glf_sh lnormhet_gp lnormhet_ilf lnormhet_ilf_sh lnormhet_ip lnskew0 loadingplot loc loca local log logi logis_lf logistic logistic_p logit logit_estat logit_p loglogs logrank loneway lookfor lookup lowess lowess_7 lpredict lrecomp lroc lroc_7 lrtest ls lsens lsens_7 lsens_x lstat ltable ltable_7 ltriang lv lvr2plot lvr2plot_7 m|0 ma mac macr macro makecns man manova manova_estat manova_p manovatest mantel mark markin markout marksample mat mat_capp mat_order mat_put_rr mat_rapp mata mata_clear mata_describe mata_drop mata_matdescribe mata_matsave mata_matuse mata_memory mata_mlib mata_mosave mata_rename mata_which matalabel matcproc matlist matname matr matri matrix matrix_input__dlg matstrik mcc mcci md0_ md1_ md1debug_ md2_ md2debug_ mds mds_estat mds_p mdsconfig mdslong mdsmat mdsshepard mdytoe mdytof me_derd mean means median memory memsize menl meqparse mer merg merge meta mfp mfx mhelp mhodds minbound mixed_ll mixed_ll_reparm mkassert mkdir mkmat mkspline ml ml_5 ml_adjs ml_bhhhs ml_c_d ml_check ml_clear ml_cnt ml_debug ml_defd ml_e0 ml_e0_bfgs ml_e0_cycle ml_e0_dfp ml_e0i ml_e1 ml_e1_bfgs ml_e1_bhhh ml_e1_cycle ml_e1_dfp ml_e2 ml_e2_cycle ml_ebfg0 ml_ebfr0 ml_ebfr1 ml_ebh0q ml_ebhh0 ml_ebhr0 ml_ebr0i ml_ecr0i ml_edfp0 ml_edfr0 ml_edfr1 ml_edr0i ml_eds ml_eer0i ml_egr0i ml_elf ml_elf_bfgs ml_elf_bhhh ml_elf_cycle ml_elf_dfp ml_elfi ml_elfs ml_enr0i ml_enrr0 ml_erdu0 ml_erdu0_bfgs ml_erdu0_bhhh ml_erdu0_bhhhq ml_erdu0_cycle ml_erdu0_dfp ml_erdu0_nrbfgs ml_exde ml_footnote ml_geqnr ml_grad0 ml_graph ml_hbhhh ml_hd0 ml_hold ml_init ml_inv ml_log ml_max ml_mlout ml_mlout_8 ml_model ml_nb0 ml_opt ml_p ml_plot ml_query ml_rdgrd ml_repor ml_s_e ml_score ml_searc ml_technique ml_unhold mleval mlf_ mlmatbysum mlmatsum mlog mlogi mlogit mlogit_footnote mlogit_p mlopts mlsum mlvecsum mnl0_ mor more mov move mprobit mprobit_lf mprobit_p mrdu0_ mrdu1_ mvdecode mvencode mvreg mvreg_estat n|0 nbreg nbreg_al nbreg_lf nbreg_p nbreg_sw nestreg net newey newey_7 newey_p news nl nl_7 nl_9 nl_9_p nl_p nl_p_7 nlcom nlcom_p nlexp2 nlexp2_7 nlexp2a nlexp2a_7 nlexp3 nlexp3_7 nlgom3 nlgom3_7 nlgom4 nlgom4_7 nlinit nllog3 nllog3_7 nllog4 nllog4_7 nlog_rd nlogit nlogit_p nlogitgen nlogittree nlpred no nobreak noi nois noisi noisil noisily note notes notes_dlg nptrend numlabel numlist odbc old_ver olo olog ologi ologi_sw ologit ologit_p ologitp on one onew onewa oneway op_colnm op_comp op_diff op_inv op_str opr opro oprob oprob_sw oprobi oprobi_p oprobit oprobitp opts_exclusive order orthog orthpoly ou out outf outfi outfil outfile outs outsh outshe outshee outsheet ovtest pac pac_7 palette parse parse_dissim pause pca pca_8 pca_display pca_estat pca_p pca_rotate pcamat pchart pchart_7 pchi pchi_7 pcorr pctile pentium pergram pergram_7 permute permute_8 personal peto_st pkcollapse pkcross pkequiv pkexamine pkexamine_7 pkshape pksumm pksumm_7 pl plo plot plugin pnorm pnorm_7 poisgof poiss_lf poiss_sw poisso_p poisson poisson_estat post postclose postfile postutil pperron pr prais prais_e prais_e2 prais_p predict predictnl preserve print pro prob probi probit probit_estat probit_p proc_time procoverlay procrustes procrustes_estat procrustes_p profiler prog progr progra program prop proportion prtest prtesti pwcorr pwd q\\s qby qbys qchi qchi_7 qladder qladder_7 qnorm qnorm_7 qqplot qqplot_7 qreg qreg_c qreg_p qreg_sw qu quadchk quantile quantile_7 que quer query range ranksum ratio rchart rchart_7 rcof recast reclink recode reg reg3 reg3_p regdw regr regre regre_p2 regres regres_p regress regress_estat regriv_p remap ren rena renam rename renpfix repeat replace report reshape restore ret retu retur return rm rmdir robvar roccomp roccomp_7 roccomp_8 rocf_lf rocfit rocfit_8 rocgold rocplot rocplot_7 roctab roctab_7 rolling rologit rologit_p rot rota rotat rotate rotatemat rreg rreg_p ru run runtest rvfplot rvfplot_7 rvpplot rvpplot_7 sa safesum sample sampsi sav save savedresults saveold sc sca scal scala scalar scatter scm_mine sco scob_lf scob_p scobi_sw scobit scor score scoreplot scoreplot_help scree screeplot screeplot_help sdtest sdtesti se search separate seperate serrbar serrbar_7 serset set set_defaults sfrancia sh she shel shell shewhart shewhart_7 signestimationsample signrank signtest simul simul_7 simulate simulate_8 sktest sleep slogit slogit_d2 slogit_p smooth snapspan so sor sort spearman spikeplot spikeplot_7 spikeplt spline_x split sqreg sqreg_p sret sretu sretur sreturn ssc st st_ct st_hc st_hcd st_hcd_sh st_is st_issys st_note st_promo st_set st_show st_smpl st_subid stack statsby statsby_8 stbase stci stci_7 stcox stcox_estat stcox_fr stcox_fr_ll stcox_p stcox_sw stcoxkm stcoxkm_7 stcstat stcurv stcurve stcurve_7 stdes stem stepwise stereg stfill stgen stir stjoin stmc stmh stphplot stphplot_7 stphtest stphtest_7 stptime strate strate_7 streg streg_sw streset sts sts_7 stset stsplit stsum sttocc sttoct stvary stweib su suest suest_8 sum summ summa summar summari summariz summarize sunflower sureg survcurv survsum svar svar_p svmat svy svy_disp svy_dreg svy_est svy_est_7 svy_estat svy_get svy_gnbreg_p svy_head svy_header svy_heckman_p svy_heckprob_p svy_intreg_p svy_ivreg_p svy_logistic_p svy_logit_p svy_mlogit_p svy_nbreg_p svy_ologit_p svy_oprobit_p svy_poisson_p svy_probit_p svy_regress_p svy_sub svy_sub_7 svy_x svy_x_7 svy_x_p svydes svydes_8 svygen svygnbreg svyheckman svyheckprob svyintreg svyintreg_7 svyintrg svyivreg svylc svylog_p svylogit svymarkout svymarkout_8 svymean svymlog svymlogit svynbreg svyolog svyologit svyoprob svyoprobit svyopts svypois svypois_7 svypoisson svyprobit svyprobt svyprop svyprop_7 svyratio svyreg svyreg_p svyregress svyset svyset_7 svyset_8 svytab svytab_7 svytest svytotal sw sw_8 swcnreg swcox swereg swilk swlogis swlogit swologit swoprbt swpois swprobit swqreg swtobit swweib symmetry symmi symplot symplot_7 syntax sysdescribe sysdir sysuse szroeter ta tab tab1 tab2 tab_or tabd tabdi tabdis tabdisp tabi table tabodds tabodds_7 tabstat tabu tabul tabula tabulat tabulate te tempfile tempname tempvar tes test testnl testparm teststd tetrachoric time_it timer tis tob tobi tobit tobit_p tobit_sw token tokeni tokeniz tokenize tostring total translate translator transmap treat_ll treatr_p treatreg trim trimfill trnb_cons trnb_mean trpoiss_d2 trunc_ll truncr_p truncreg tsappend tset tsfill tsline tsline_ex tsreport tsrevar tsrline tsset tssmooth tsunab ttest ttesti tut_chk tut_wait tutorial tw tware_st two twoway twoway__fpfit_serset twoway__function_gen twoway__histogram_gen twoway__ipoint_serset twoway__ipoints_serset twoway__kdensity_gen twoway__lfit_serset twoway__normgen_gen twoway__pci_serset twoway__qfit_serset twoway__scatteri_serset twoway__sunflower_gen twoway_ksm_serset ty typ type typeof u|0 unab unabbrev unabcmd update us use uselabel var var_mkcompanion var_p varbasic varfcast vargranger varirf varirf_add varirf_cgraph varirf_create varirf_ctable varirf_describe varirf_dir varirf_drop varirf_erase varirf_graph varirf_ograph varirf_rename varirf_set varirf_table varlist varlmar varnorm varsoc varstable varstable_w varstable_w2 varwle vce vec vec_fevd vec_mkphi vec_p vec_p_w vecirf_create veclmar veclmar_w vecnorm vecnorm_w vecrank vecstable verinst vers versi versio version view viewsource vif vwls wdatetof webdescribe webseek webuse weib1_lf weib2_lf weib_lf weib_lf0 weibhet_glf weibhet_glf_sh weibhet_glfa weibhet_glfa_sh weibhet_gp weibhet_ilf weibhet_ilf_sh weibhet_ilfa weibhet_ilfa_sh weibhet_ip weibu_sw weibul_p weibull weibull_c weibull_s weibullhet wh whelp whi which whil while wilc_st wilcoxon win wind windo window winexec wntestb wntestb_7 wntestq xchart xchart_7 xcorr xcorr_7 xi xi_6 xmlsav xmlsave xmluse xpose xsh xshe xshel xshell xt_iis xt_tis xtab_p xtabond xtbin_p xtclog xtcloglog xtcloglog_8 xtcloglog_d2 xtcloglog_pa_p xtcloglog_re_p xtcnt_p xtcorr xtdata xtdes xtfront_p xtfrontier xtgee xtgee_elink xtgee_estat xtgee_makeivar xtgee_p xtgee_plink xtgls xtgls_p xthaus xthausman xtht_p xthtaylor xtile xtint_p xtintreg xtintreg_8 xtintreg_d2 xtintreg_p xtivp_1 xtivp_2 xtivreg xtline xtline_ex xtlogit xtlogit_8 xtlogit_d2 xtlogit_fe_p xtlogit_pa_p xtlogit_re_p xtmixed xtmixed_estat xtmixed_p xtnb_fe xtnb_lf xtnbreg xtnbreg_pa_p xtnbreg_refe_p xtpcse xtpcse_p xtpois xtpoisson xtpoisson_d2 xtpoisson_pa_p xtpoisson_refe_p xtpred xtprobit xtprobit_8 xtprobit_d2 xtprobit_re_p xtps_fe xtps_lf xtps_ren xtps_ren_8 xtrar_p xtrc xtrc_p xtrchh xtrefe_p xtreg xtreg_be xtreg_fe xtreg_ml xtreg_pa_p xtreg_re xtregar xtrere_p xtset xtsf_ll xtsf_llti xtsum xttab xttest0 xttobit xttobit_8 xttobit_p xttrans yx yxview__barlike_draw yxview_area_draw yxview_bar_draw yxview_dot_draw yxview_dropline_draw yxview_function_draw yxview_iarrow_draw yxview_ilabels_draw yxview_normal_draw yxview_pcarrow_draw yxview_pcbarrow_draw yxview_pccapsym_draw yxview_pcscatter_draw yxview_pcspike_draw yxview_rarea_draw yxview_rbar_draw yxview_rbarm_draw yxview_rcap_draw yxview_rcapsym_draw yxview_rconnected_draw yxview_rline_draw yxview_rscatter_draw yxview_rspike_draw yxview_spike_draw yxview_sunflower_draw zap_s zinb zinb_llf zinb_plf zip zip_llf zip_p zip_plf zt_ct_5 zt_hc_5 zt_hcd_5 zt_is_5 zt_iss_5 zt_sho_5 zt_smp_5 ztbase_5 ztcox_5 ztdes_5 ztereg_5 ztfill_5 ztgen_5 ztir_5 ztjoin_5 ztnb ztnb_p ztp ztp_p zts_5 ztset_5 ztspli_5 ztsum_5 zttoct_5 ztvary_5 ztweib_5",contains:[{className:"symbol",begin:/`[a-zA-Z0-9_]+'/},{className:"variable",begin:/\$\{?[a-zA-Z0-9_]+\}?/},{className:"string",variants:[{begin:'`"[^\r\n]*?"\''},{b:'"[^\r\n"]*"'}]},{cN:"built_in",v:[{b:"\\b(abs|acos|asin|atan|atan2|atanh|ceil|cloglog|comb|cos|digamma|exp|floor|invcloglog|invlogit|ln|lnfact|lnfactorial|lngamma|log|log10|max|min|mod|reldif|round|sign|sin|sqrt|sum|tan|tanh|trigamma|trunc|betaden|Binomial|binorm|binormal|chi2|chi2tail|dgammapda|dgammapdada|dgammapdadx|dgammapdx|dgammapdxdx|F|Fden|Ftail|gammaden|gammap|ibeta|invbinomial|invchi2|invchi2tail|invF|invFtail|invgammap|invibeta|invnchi2|invnFtail|invnibeta|invnorm|invnormal|invttail|nbetaden|nchi2|nFden|nFtail|nibeta|norm|normal|normalden|normd|npnchi2|tden|ttail|uniform|abbrev|char|index|indexnot|length|lower|ltrim|match|plural|proper|real|regexm|regexr|regexs|reverse|rtrim|string|strlen|strlower|strltrim|strmatch|strofreal|strpos|strproper|strreverse|strrtrim|strtrim|strupper|subinstr|subinword|substr|trim|upper|word|wordcount|_caller|autocode|byteorder|chop|clip|cond|e|epsdouble|epsfloat|group|inlist|inrange|irecode|matrix|maxbyte|maxdouble|maxfloat|maxint|maxlong|mi|minbyte|mindouble|minfloat|minint|minlong|missing|r|recode|replay|return|s|scalar|d|date|day|dow|doy|halfyear|mdy|month|quarter|week|year|d|daily|dofd|dofh|dofm|dofq|dofw|dofy|h|halfyearly|hofd|m|mofd|monthly|q|qofd|quarterly|tin|twithin|w|weekly|wofd|y|yearly|yh|ym|yofd|yq|yw|cholesky|colnumb|colsof|corr|det|diag|diag0cnt|el|get|hadamard|I|inv|invsym|issym|issymmetric|J|matmissing|matuniform|mreldif|nullmat|rownumb|rowsof|sweep|syminv|trace|vec|vecdiag)(?=\\()"}]},e.C("^[ \t]*\\*.*$",!1),e.CLCM,e.CBCM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/step21.min.js b/vendor/assets/javascripts/highlightjs/languages/step21.min.js
index b46e0e0ac9..8d7b0e7216 100644
--- a/vendor/assets/javascripts/highlightjs/languages/step21.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/step21.min.js
@@ -1 +1 @@
-hljs.registerLanguage("step21",function(){"use strict";return function(e){return{name:"STEP Part 21",aliases:["p21","step","stp"],case_insensitive:!0,keywords:{$pattern:"[A-Z_][A-Z0-9_.]*",keyword:"HEADER ENDSEC DATA"},contains:[{className:"meta",begin:"ISO-10303-21;",relevance:10},{className:"meta",begin:"END-ISO-10303-21;",relevance:10},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.COMMENT("/\\*\\*!","\\*/"),e.C_NUMBER_MODE,e.inherit(e.APOS_STRING_MODE,{illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),{className:"string",begin:"'",end:"'"},{className:"symbol",variants:[{begin:"#",end:"\\d+",illegal:"\\W"}]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("step21",function(e){return{aliases:["p21","step","stp"],cI:!0,l:"[A-Z_][A-Z0-9_.]*",k:{keyword:"HEADER ENDSEC DATA"},c:[{cN:"meta",b:"ISO-10303-21;",relevance:10},{cN:"meta",b:"END-ISO-10303-21;",relevance:10},e.CLCM,e.CBCM,e.C("/\\*\\*!","\\*/"),e.CNM,e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null}),{cN:"string",b:"'",e:"'"},{cN:"symbol",v:[{b:"#",e:"\\d+",i:"\\W"}]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/stylus.min.js b/vendor/assets/javascripts/highlightjs/languages/stylus.min.js
index 96c0aa18f4..0cc840ef66 100644
--- a/vendor/assets/javascripts/highlightjs/languages/stylus.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/stylus.min.js
@@ -1 +1 @@
-hljs.registerLanguage("stylus",function(){"use strict";return function(e){var t={className:"variable",begin:"\\$"+e.IDENT_RE},i={className:"number",begin:"#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})"};return{name:"Stylus",aliases:["styl"],case_insensitive:!1,keywords:"if else for in",illegal:"(\\?|(\\bReturn\\b)|(\\bEnd\\b)|(\\bend\\b)|(\\bdef\\b)|;|#\\s|\\*\\s|===\\s|\\||%)",contains:[e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,i,{begin:"\\.[a-zA-Z][a-zA-Z0-9_-]*(?=[\\.\\s\\n\\[\\:,])",className:"selector-class"},{begin:"\\#[a-zA-Z][a-zA-Z0-9_-]*(?=[\\.\\s\\n\\[\\:,])",className:"selector-id"},{begin:"\\b(a|abbr|address|article|aside|audio|b|blockquote|body|button|canvas|caption|cite|code|dd|del|details|dfn|div|dl|dt|em|fieldset|figcaption|figure|footer|form|h1|h2|h3|h4|h5|h6|header|hgroup|html|i|iframe|img|input|ins|kbd|label|legend|li|mark|menu|nav|object|ol|p|q|quote|samp|section|span|strong|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|tr|ul|var|video)(?=[\\.\\s\\n\\[\\:,])",className:"selector-tag"},{begin:"&?:?:\\b(after|before|first-letter|first-line|active|first-child|focus|hover|lang|link|visited)(?=[\\.\\s\\n\\[\\:,])"},{begin:"@(charset|css|debug|extend|font-face|for|import|include|media|mixin|page|warn|while)\\b"},t,e.CSS_NUMBER_MODE,e.NUMBER_MODE,{className:"function",begin:"^[a-zA-Z][a-zA-Z0-9_-]*\\(.*\\)",illegal:"[\\n]",returnBegin:!0,contains:[{className:"title",begin:"\\b[a-zA-Z][a-zA-Z0-9_-]*"},{className:"params",begin:/\(/,end:/\)/,contains:[i,t,e.APOS_STRING_MODE,e.CSS_NUMBER_MODE,e.NUMBER_MODE,e.QUOTE_STRING_MODE]}]},{className:"attribute",begin:"\\b("+["align-content","align-items","align-self","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","auto","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","clip-path","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","font","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-variant-ligatures","font-weight","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inherit","initial","justify-content","left","letter-spacing","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marks","mask","max-height","max-width","min-height","min-width","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","perspective","perspective-origin","pointer-events","position","quotes","resize","right","tab-size","table-layout","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-indent","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","white-space","widows","width","word-break","word-spacing","word-wrap","z-index"].reverse().join("|")+")\\b",starts:{end:/;|$/,contains:[i,t,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE,e.NUMBER_MODE,e.C_BLOCK_COMMENT_MODE],illegal:/\./,relevance:0}}]}}}());
\ No newline at end of file
+hljs.registerLanguage("stylus",function(e){var t={cN:"variable",b:"\\$"+e.IR},o={cN:"number",b:"#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})"},i="(?=[\\.\\s\\n\\[\\:,])";return{aliases:["styl"],cI:!1,k:"if else for in",i:"("+["\\?","(\\bReturn\\b)","(\\bEnd\\b)","(\\bend\\b)","(\\bdef\\b)",";","#\\s","\\*\\s","===\\s","\\|","%"].join("|")+")",c:[e.QSM,e.ASM,e.CLCM,e.CBCM,o,{b:"\\.[a-zA-Z][a-zA-Z0-9_-]*"+i,cN:"selector-class"},{b:"\\#[a-zA-Z][a-zA-Z0-9_-]*"+i,cN:"selector-id"},{b:"\\b("+["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"].join("|")+")"+i,cN:"selector-tag"},{b:"&?:?:\\b("+["after","before","first-letter","first-line","active","first-child","focus","hover","lang","link","visited"].join("|")+")"+i},{b:"@("+["charset","css","debug","extend","font-face","for","import","include","media","mixin","page","warn","while"].join("|")+")\\b"},t,e.CSSNM,e.NM,{cN:"function",b:"^[a-zA-Z][a-zA-Z0-9_-]*\\(.*\\)",i:"[\\n]",rB:!0,c:[{cN:"title",b:"\\b[a-zA-Z][a-zA-Z0-9_-]*"},{cN:"params",b:/\(/,e:/\)/,c:[o,t,e.ASM,e.CSSNM,e.NM,e.QSM]}]},{cN:"attribute",b:"\\b("+["align-content","align-items","align-self","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","auto","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","clip-path","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","font","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-variant-ligatures","font-weight","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inherit","initial","justify-content","left","letter-spacing","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marks","mask","max-height","max-width","min-height","min-width","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","perspective","perspective-origin","pointer-events","position","quotes","resize","right","tab-size","table-layout","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-indent","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","white-space","widows","width","word-break","word-spacing","word-wrap","z-index"].reverse().join("|")+")\\b",starts:{e:/;|$/,c:[o,t,e.ASM,e.QSM,e.CSSNM,e.NM,e.CBCM],i:/\./,relevance:0}}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/subunit.min.js b/vendor/assets/javascripts/highlightjs/languages/subunit.min.js
index 5796a4fa37..7926687025 100644
--- a/vendor/assets/javascripts/highlightjs/languages/subunit.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/subunit.min.js
@@ -1 +1 @@
-hljs.registerLanguage("subunit",function(){"use strict";return function(s){return{name:"SubUnit",case_insensitive:!0,contains:[{className:"string",begin:"\\[\n(multipart)?",end:"\\]\n"},{className:"string",begin:"\\d{4}-\\d{2}-\\d{2}(\\s+)\\d{2}:\\d{2}:\\d{2}.\\d+Z"},{className:"string",begin:"(\\+|-)\\d+"},{className:"keyword",relevance:10,variants:[{begin:"^(test|testing|success|successful|failure|error|skip|xfail|uxsuccess)(:?)\\s+(test)?"},{begin:"^progress(:?)(\\s+)?(pop|push)?"},{begin:"^tags:"},{begin:"^time:"}]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("subunit",function(s){return{cI:!0,c:[{cN:"string",b:"\\[\n(multipart)?",e:"\\]\n"},{cN:"string",b:"\\d{4}-\\d{2}-\\d{2}(\\s+)\\d{2}:\\d{2}:\\d{2}.\\d+Z"},{cN:"string",b:"(\\+|-)\\d+"},{cN:"keyword",relevance:10,v:[{b:"^(test|testing|success|successful|failure|error|skip|xfail|uxsuccess)(:?)\\s+(test)?"},{b:"^progress(:?)(\\s+)?(pop|push)?"},{b:"^tags:"},{b:"^time:"}]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/swift.min.js b/vendor/assets/javascripts/highlightjs/languages/swift.min.js
index 584096ba69..239ce369f0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/swift.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/swift.min.js
@@ -1 +1 @@
-hljs.registerLanguage("swift",function(){"use strict";return function(e){var i={keyword:"#available #colorLiteral #column #else #elseif #endif #file #fileLiteral #function #if #imageLiteral #line #selector #sourceLocation _ __COLUMN__ __FILE__ __FUNCTION__ __LINE__ Any as as! as? associatedtype associativity break case catch class continue convenience default defer deinit didSet do dynamic dynamicType else enum extension fallthrough false fileprivate final for func get guard if import in indirect infix init inout internal is lazy left let mutating nil none nonmutating open operator optional override postfix precedence prefix private protocol Protocol public repeat required rethrows return right self Self set static struct subscript super switch throw throws true try try! try? Type typealias unowned var weak where while willSet",literal:"true false nil",built_in:"abs advance alignof alignofValue anyGenerator assert assertionFailure bridgeFromObjectiveC bridgeFromObjectiveCUnconditional bridgeToObjectiveC bridgeToObjectiveCUnconditional c compactMap contains count countElements countLeadingZeros debugPrint debugPrintln distance dropFirst dropLast dump encodeBitsAsWords enumerate equal fatalError filter find getBridgedObjectiveCType getVaList indices insertionSort isBridgedToObjectiveC isBridgedVerbatimToObjectiveC isUniquelyReferenced isUniquelyReferencedNonObjC join lazy lexicographicalCompare map max maxElement min minElement numericCast overlaps partition posix precondition preconditionFailure print println quickSort readLine reduce reflect reinterpretCast reverse roundUpToAlignment sizeof sizeofValue sort split startsWith stride strideof strideofValue swap toString transcode underestimateCount unsafeAddressOf unsafeBitCast unsafeDowncast unsafeUnwrap unsafeReflect withExtendedLifetime withObjectAtPlusZero withUnsafePointer withUnsafePointerToObject withUnsafeMutablePointer withUnsafeMutablePointers withUnsafePointer withUnsafePointers withVaList zip"},n=e.COMMENT("/\\*","\\*/",{contains:["self"]}),t={className:"subst",begin:/\\\(/,end:"\\)",keywords:i,contains:[]},a={className:"string",contains:[e.BACKSLASH_ESCAPE,t],variants:[{begin:/"""/,end:/"""/},{begin:/"/,end:/"/}]},r={className:"number",begin:"\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b",relevance:0};return t.contains=[r],{name:"Swift",keywords:i,contains:[a,e.C_LINE_COMMENT_MODE,n,{className:"type",begin:"\\b[A-Z][\\wÀ-ʸ']*[!?]"},{className:"type",begin:"\\b[A-Z][\\wÀ-ʸ']*",relevance:0},r,{className:"function",beginKeywords:"func",end:"{",excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][0-9A-Za-z$_]*/}),{begin:/</,end:/>/},{className:"params",begin:/\(/,end:/\)/,endsParent:!0,keywords:i,contains:["self",r,a,e.C_BLOCK_COMMENT_MODE,{begin:":"}],illegal:/["']/}],illegal:/\[|%/},{className:"class",beginKeywords:"struct protocol class extension enum",keywords:i,end:"\\{",excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/})]},{className:"meta",begin:"(@discardableResult|@warn_unused_result|@exported|@lazy|@noescape|@NSCopying|@NSManaged|@objc|@objcMembers|@convention|@required|@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|@infix|@prefix|@postfix|@autoclosure|@testable|@available|@nonobjc|@NSApplicationMain|@UIApplicationMain|@dynamicMemberLookup|@propertyWrapper)\\b"},{beginKeywords:"import",end:/$/,contains:[e.C_LINE_COMMENT_MODE,n]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("swift",function(e){var i={keyword:"#available #colorLiteral #column #else #elseif #endif #file #fileLiteral #function #if #imageLiteral #line #selector #sourceLocation _ __COLUMN__ __FILE__ __FUNCTION__ __LINE__ Any as as! as? associatedtype associativity break case catch class continue convenience default defer deinit didSet do dynamic dynamicType else enum extension fallthrough false fileprivate final for func get guard if import in indirect infix init inout internal is lazy left let mutating nil none nonmutating open operator optional override postfix precedence prefix private protocol Protocol public repeat required rethrows return right self Self set static struct subscript super switch throw throws true try try! try? Type typealias unowned var weak where while willSet",literal:"true false nil",built_in:"abs advance alignof alignofValue anyGenerator assert assertionFailure bridgeFromObjectiveC bridgeFromObjectiveCUnconditional bridgeToObjectiveC bridgeToObjectiveCUnconditional c contains count countElements countLeadingZeros debugPrint debugPrintln distance dropFirst dropLast dump encodeBitsAsWords enumerate equal fatalError filter find getBridgedObjectiveCType getVaList indices insertionSort isBridgedToObjectiveC isBridgedVerbatimToObjectiveC isUniquelyReferenced isUniquelyReferencedNonObjC join lazy lexicographicalCompare map max maxElement min minElement numericCast overlaps partition posix precondition preconditionFailure print println quickSort readLine reduce reflect reinterpretCast reverse roundUpToAlignment sizeof sizeofValue sort split startsWith stride strideof strideofValue swap toString transcode underestimateCount unsafeAddressOf unsafeBitCast unsafeDowncast unsafeUnwrap unsafeReflect withExtendedLifetime withObjectAtPlusZero withUnsafePointer withUnsafePointerToObject withUnsafeMutablePointer withUnsafeMutablePointers withUnsafePointer withUnsafePointers withVaList zip"},t=e.C("/\\*","\\*/",{c:["self"]}),n={cN:"subst",b:/\\\(/,e:"\\)",k:i,c:[]},r={cN:"string",c:[e.BE,n],v:[{b:/"""/,e:/"""/},{b:/"/,e:/"/}]},a={cN:"number",b:"\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b",relevance:0};return n.c=[a],{k:i,c:[r,e.CLCM,t,{cN:"type",b:"\\b[A-Z][\\wÀ-ʸ']*[!?]"},{cN:"type",b:"\\b[A-Z][\\wÀ-ʸ']*",relevance:0},a,{cN:"function",bK:"func",e:"{",eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{b:/</,e:/>/},{cN:"params",b:/\(/,e:/\)/,endsParent:!0,k:i,c:["self",a,r,e.CBCM,{b:":"}],i:/["']/}],i:/\[|%/},{cN:"class",bK:"struct protocol class extension enum",k:i,e:"\\{",eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/})]},{cN:"meta",b:"(@discardableResult|@warn_unused_result|@exported|@lazy|@noescape|@NSCopying|@NSManaged|@objc|@objcMembers|@convention|@required|@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|@infix|@prefix|@postfix|@autoclosure|@testable|@available|@nonobjc|@NSApplicationMain|@UIApplicationMain|@dynamicMemberLookup|@propertyWrapper)"},{bK:"import",e:/$/,c:[e.CLCM,t]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/taggerscript.min.js b/vendor/assets/javascripts/highlightjs/languages/taggerscript.min.js
index 238c151995..1467530fa7 100644
--- a/vendor/assets/javascripts/highlightjs/languages/taggerscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/taggerscript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("taggerscript",function(){"use strict";return function(e){return{name:"Tagger Script",contains:[{className:"comment",begin:/\$noop\(/,end:/\)/,contains:[{begin:/\(/,end:/\)/,contains:["self",{begin:/\\./}]}],relevance:10},{className:"keyword",begin:/\$(?!noop)[a-zA-Z][_a-zA-Z0-9]*/,end:/\(/,excludeEnd:!0},{className:"variable",begin:/%[_a-zA-Z0-9:]*/,end:"%"},{className:"symbol",begin:/\\./}]}}}());
\ No newline at end of file
+hljs.registerLanguage("taggerscript",function(e){return{c:[{cN:"comment",b:/\$noop\(/,e:/\)/,c:[{b:/\(/,e:/\)/,c:["self",{b:/\\./}]}],relevance:10},{cN:"keyword",b:/\$(?!noop)[a-zA-Z][_a-zA-Z0-9]*/,e:/\(/,eE:!0},{cN:"variable",b:/%[_a-zA-Z0-9:]*/,e:"%"},{cN:"symbol",b:/\\./}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/tap.min.js b/vendor/assets/javascripts/highlightjs/languages/tap.min.js
index 148836811d..baa0031015 100644
--- a/vendor/assets/javascripts/highlightjs/languages/tap.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/tap.min.js
@@ -1 +1 @@
-hljs.registerLanguage("tap",function(){"use strict";return function(e){return{name:"Test Anything Protocol",case_insensitive:!0,contains:[e.HASH_COMMENT_MODE,{className:"meta",variants:[{begin:"^TAP version (\\d+)$"},{begin:"^1\\.\\.(\\d+)$"}]},{begin:"(s+)?---$",end:"\\.\\.\\.$",subLanguage:"yaml",relevance:0},{className:"number",begin:" (\\d+) "},{className:"symbol",variants:[{begin:"^ok"},{begin:"^not ok"}]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("tap",function(e){return{cI:!0,c:[e.HCM,{cN:"meta",v:[{b:"^TAP version (\\d+)$"},{b:"^1\\.\\.(\\d+)$"}]},{b:"(s+)?---$",e:"\\.\\.\\.$",sL:"yaml",relevance:0},{cN:"number",b:" (\\d+) "},{cN:"symbol",v:[{b:"^ok"},{b:"^not ok"}]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/tcl.min.js b/vendor/assets/javascripts/highlightjs/languages/tcl.min.js
index f49662b24f..5244bc04ab 100644
--- a/vendor/assets/javascripts/highlightjs/languages/tcl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/tcl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("tcl",function(){"use strict";return function(e){return{name:"Tcl",aliases:["tk"],keywords:"after append apply array auto_execok auto_import auto_load auto_mkindex auto_mkindex_old auto_qualify auto_reset bgerror binary break catch cd chan clock close concat continue dde dict encoding eof error eval exec exit expr fblocked fconfigure fcopy file fileevent filename flush for foreach format gets glob global history http if incr info interp join lappend|10 lassign|10 lindex|10 linsert|10 list llength|10 load lrange|10 lrepeat|10 lreplace|10 lreverse|10 lsearch|10 lset|10 lsort|10 mathfunc mathop memory msgcat namespace open package parray pid pkg::create pkg_mkIndex platform platform::shell proc puts pwd read refchan regexp registry regsub|10 rename return safe scan seek set socket source split string subst switch tcl_endOfWord tcl_findLibrary tcl_startOfNextWord tcl_startOfPreviousWord tcl_wordBreakAfter tcl_wordBreakBefore tcltest tclvars tell time tm trace unknown unload unset update uplevel upvar variable vwait while",contains:[e.COMMENT(";[ \\t]*#","$"),e.COMMENT("^[ \\t]*#","$"),{beginKeywords:"proc",end:"[\\{]",excludeEnd:!0,contains:[{className:"title",begin:"[ \\t\\n\\r]+(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*",end:"[ \\t\\n\\r]",endsWithParent:!0,excludeEnd:!0}]},{excludeEnd:!0,variants:[{begin:"\\$(\\{)?(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*\\(([a-zA-Z0-9_])*\\)",end:"[^a-zA-Z0-9_\\}\\$]"},{begin:"\\$(\\{)?(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*",end:"(\\))?[^a-zA-Z0-9_\\}\\$]"}]},{className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[e.inherit(e.QUOTE_STRING_MODE,{illegal:null})]},{className:"number",variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("tcl",function(e){return{aliases:["tk"],k:"after append apply array auto_execok auto_import auto_load auto_mkindex auto_mkindex_old auto_qualify auto_reset bgerror binary break catch cd chan clock close concat continue dde dict encoding eof error eval exec exit expr fblocked fconfigure fcopy file fileevent filename flush for foreach format gets glob global history http if incr info interp join lappend|10 lassign|10 lindex|10 linsert|10 list llength|10 load lrange|10 lrepeat|10 lreplace|10 lreverse|10 lsearch|10 lset|10 lsort|10 mathfunc mathop memory msgcat namespace open package parray pid pkg::create pkg_mkIndex platform platform::shell proc puts pwd read refchan regexp registry regsub|10 rename return safe scan seek set socket source split string subst switch tcl_endOfWord tcl_findLibrary tcl_startOfNextWord tcl_startOfPreviousWord tcl_wordBreakAfter tcl_wordBreakBefore tcltest tclvars tell time tm trace unknown unload unset update uplevel upvar variable vwait while",c:[e.C(";[ \\t]*#","$"),e.C("^[ \\t]*#","$"),{bK:"proc",e:"[\\{]",eE:!0,c:[{cN:"title",b:"[ \\t\\n\\r]+(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*",e:"[ \\t\\n\\r]",eW:!0,eE:!0}]},{eE:!0,v:[{b:"\\$(\\{)?(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*\\(([a-zA-Z0-9_])*\\)",e:"[^a-zA-Z0-9_\\}\\$]"},{b:"\\$(\\{)?(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*",e:"(\\))?[^a-zA-Z0-9_\\}\\$]"}]},{cN:"string",c:[e.BE],v:[e.inherit(e.QSM,{i:null})]},{cN:"number",v:[e.BNM,e.CNM]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/tex.min.js b/vendor/assets/javascripts/highlightjs/languages/tex.min.js
index eb7cc4cd20..177bca05a0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/tex.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/tex.min.js
@@ -1 +1 @@
-hljs.registerLanguage("tex",function(c){var e={cN:"tag",b:/\\/,r:0,c:[{cN:"name",v:[{b:/[a-zA-Zа-яА-я]+[*]?/},{b:/[^a-zA-Zа-яА-я0-9]/}],starts:{eW:!0,r:0,c:[{cN:"string",v:[{b:/\[/,e:/\]/},{b:/\{/,e:/\}/}]},{b:/\s*=\s*/,eW:!0,r:0,c:[{cN:"number",b:/-?\d*\.?\d+(pt|pc|mm|cm|in|dd|cc|ex|em)?/}]}]}}]};return{c:[e,{cN:"formula",c:[e],r:0,v:[{b:/\$\$/,e:/\$\$/},{b:/\$/,e:/\$/}]},c.C("%","$",{r:0})]}});
\ No newline at end of file
+hljs.registerLanguage("tex",function(e){var c={cN:"tag",b:/\\/,relevance:0,c:[{cN:"name",v:[{b:/[a-zA-Z\u0430-\u044f\u0410-\u042f]+[*]?/},{b:/[^a-zA-Z\u0430-\u044f\u0410-\u042f0-9]/}],starts:{eW:!0,relevance:0,c:[{cN:"string",v:[{b:/\[/,e:/\]/},{b:/\{/,e:/\}/}]},{b:/\s*=\s*/,eW:!0,relevance:0,c:[{cN:"number",b:/-?\d*\.?\d+(pt|pc|mm|cm|in|dd|cc|ex|em)?/}]}]}}]};return{c:[c,{cN:"formula",c:[c],relevance:0,v:[{b:/\$\$/,e:/\$\$/},{b:/\$/,e:/\$/}]},e.C("%","$",{relevance:0})]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/thrift.min.js b/vendor/assets/javascripts/highlightjs/languages/thrift.min.js
index 7b89a56e9b..4c97db0fe5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/thrift.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/thrift.min.js
@@ -1 +1 @@
-hljs.registerLanguage("thrift",function(){"use strict";return function(e){return{name:"Thrift",keywords:{keyword:"namespace const typedef struct enum service exception void oneway set list map required optional",built_in:"bool byte i16 i32 i64 double string binary",literal:"true false"},contains:[e.QUOTE_STRING_MODE,e.NUMBER_MODE,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"class",beginKeywords:"struct enum service exception",end:/\{/,illegal:/\n/,contains:[e.inherit(e.TITLE_MODE,{starts:{endsWithParent:!0,excludeEnd:!0}})]},{begin:"\\b(set|list|map)\\s*<",end:">",keywords:"bool byte i16 i32 i64 double string binary",contains:["self"]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("thrift",function(e){var t="bool byte i16 i32 i64 double string binary";return{k:{keyword:"namespace const typedef struct enum service exception void oneway set list map required optional",built_in:t,literal:"true false"},c:[e.QSM,e.NM,e.CLCM,e.CBCM,{cN:"class",bK:"struct enum service exception",e:/\{/,i:/\n/,c:[e.inherit(e.TM,{starts:{eW:!0,eE:!0}})]},{b:"\\b(set|list|map)\\s*<",e:">",k:t,c:["self"]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/tp.min.js b/vendor/assets/javascripts/highlightjs/languages/tp.min.js
index 9da6d9f3ff..055c9a0d9e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/tp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/tp.min.js
@@ -1 +1 @@
-hljs.registerLanguage("tp",function(){"use strict";return function(O){var e={className:"number",begin:"[1-9][0-9]*",relevance:0},R={className:"symbol",begin:":[^\\]]+"};return{name:"TP",keywords:{keyword:"ABORT ACC ADJUST AND AP_LD BREAK CALL CNT COL CONDITION CONFIG DA DB DIV DETECT ELSE END ENDFOR ERR_NUM ERROR_PROG FINE FOR GP GUARD INC IF JMP LINEAR_MAX_SPEED LOCK MOD MONITOR OFFSET Offset OR OVERRIDE PAUSE PREG PTH RT_LD RUN SELECT SKIP Skip TA TB TO TOOL_OFFSET Tool_Offset UF UT UFRAME_NUM UTOOL_NUM UNLOCK WAIT X Y Z W P R STRLEN SUBSTR FINDSTR VOFFSET PROG ATTR MN POS",literal:"ON OFF max_speed LPOS JPOS ENABLE DISABLE START STOP RESET"},contains:[{className:"built_in",begin:"(AR|P|PAYLOAD|PR|R|SR|RSR|LBL|VR|UALM|MESSAGE|UTOOL|UFRAME|TIMER|TIMER_OVERFLOW|JOINT_MAX_SPEED|RESUME_PROG|DIAG_REC)\\[",end:"\\]",contains:["self",e,R]},{className:"built_in",begin:"(AI|AO|DI|DO|F|RI|RO|UI|UO|GI|GO|SI|SO)\\[",end:"\\]",contains:["self",e,O.QUOTE_STRING_MODE,R]},{className:"keyword",begin:"/(PROG|ATTR|MN|POS|END)\\b"},{className:"keyword",begin:"(CALL|RUN|POINT_LOGIC|LBL)\\b"},{className:"keyword",begin:"\\b(ACC|CNT|Skip|Offset|PSPD|RT_LD|AP_LD|Tool_Offset)"},{className:"number",begin:"\\d+(sec|msec|mm/sec|cm/min|inch/min|deg/sec|mm|in|cm)?\\b",relevance:0},O.COMMENT("//","[;$]"),O.COMMENT("!","[;$]"),O.COMMENT("--eg:","$"),O.QUOTE_STRING_MODE,{className:"string",begin:"'",end:"'"},O.C_NUMBER_MODE,{className:"variable",begin:"\\$[A-Za-z0-9_]+"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("tp",function(O){var R={cN:"number",b:"[1-9][0-9]*",relevance:0},E={cN:"symbol",b:":[^\\]]+"};return{k:{keyword:"ABORT ACC ADJUST AND AP_LD BREAK CALL CNT COL CONDITION CONFIG DA DB DIV DETECT ELSE END ENDFOR ERR_NUM ERROR_PROG FINE FOR GP GUARD INC IF JMP LINEAR_MAX_SPEED LOCK MOD MONITOR OFFSET Offset OR OVERRIDE PAUSE PREG PTH RT_LD RUN SELECT SKIP Skip TA TB TO TOOL_OFFSET Tool_Offset UF UT UFRAME_NUM UTOOL_NUM UNLOCK WAIT X Y Z W P R STRLEN SUBSTR FINDSTR VOFFSET PROG ATTR MN POS",literal:"ON OFF max_speed LPOS JPOS ENABLE DISABLE START STOP RESET"},c:[{cN:"built_in",b:"(AR|P|PAYLOAD|PR|R|SR|RSR|LBL|VR|UALM|MESSAGE|UTOOL|UFRAME|TIMER|TIMER_OVERFLOW|JOINT_MAX_SPEED|RESUME_PROG|DIAG_REC)\\[",e:"\\]",c:["self",R,E]},{cN:"built_in",b:"(AI|AO|DI|DO|F|RI|RO|UI|UO|GI|GO|SI|SO)\\[",e:"\\]",c:["self",R,O.QSM,E]},{cN:"keyword",b:"/(PROG|ATTR|MN|POS|END)\\b"},{cN:"keyword",b:"(CALL|RUN|POINT_LOGIC|LBL)\\b"},{cN:"keyword",b:"\\b(ACC|CNT|Skip|Offset|PSPD|RT_LD|AP_LD|Tool_Offset)"},{cN:"number",b:"\\d+(sec|msec|mm/sec|cm/min|inch/min|deg/sec|mm|in|cm)?\\b",relevance:0},O.C("//","[;$]"),O.C("!","[;$]"),O.C("--eg:","$"),O.QSM,{cN:"string",b:"'",e:"'"},O.CNM,{cN:"variable",b:"\\$[A-Za-z0-9_]+"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/twig.min.js b/vendor/assets/javascripts/highlightjs/languages/twig.min.js
index 5dd66f42c8..44c144093f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/twig.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/twig.min.js
@@ -1 +1 @@
-hljs.registerLanguage("twig",function(){"use strict";return function(e){var a="attribute block constant cycle date dump include max min parent random range source template_from_string",n={beginKeywords:a,keywords:{name:a},relevance:0,contains:[{className:"params",begin:"\\(",end:"\\)"}]},t={begin:/\|[A-Za-z_]+:?/,keywords:"abs batch capitalize column convert_encoding date date_modify default escape filter first format inky_to_html inline_css join json_encode keys last length lower map markdown merge nl2br number_format raw reduce replace reverse round slice sort spaceless split striptags title trim upper url_encode",contains:[n]},s="apply autoescape block deprecated do embed extends filter flush for from if import include macro sandbox set use verbatim with";return s=s+" "+s.split(" ").map((function(e){return"end"+e})).join(" "),{name:"Twig",aliases:["craftcms"],case_insensitive:!0,subLanguage:"xml",contains:[e.COMMENT(/\{#/,/#}/),{className:"template-tag",begin:/\{%/,end:/%}/,contains:[{className:"name",begin:/\w+/,keywords:s,starts:{endsWithParent:!0,contains:[t,n],relevance:0}}]},{className:"template-variable",begin:/\{\{/,end:/}}/,contains:["self",t,n]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("twig",function(e){var t="attribute block constant cycle date dump include max min parent random range source template_from_string",a={bK:t,k:{name:t},relevance:0,c:[{cN:"params",b:"\\(",e:"\\)"}]},r={b:/\|[A-Za-z_]+:?/,k:"abs batch capitalize column convert_encoding date date_modify default escape filter first format inky_to_html inline_css join json_encode keys last length lower map markdown merge nl2br number_format raw reduce replace reverse round slice sort spaceless split striptags title trim upper url_encode",c:[a]},c=(c="apply autoescape block deprecated do embed extends filter flush for from if import include macro sandbox set use verbatim with")+" "+c.split(" ").map(function(e){return"end"+e}).join(" ");return{aliases:["craftcms"],cI:!0,sL:"xml",c:[e.C(/\{#/,/#}/),{cN:"template-tag",b:/\{%/,e:/%}/,c:[{cN:"name",b:/\w+/,k:c,starts:{eW:!0,c:[r,a],relevance:0}}]},{cN:"template-variable",b:/\{\{/,e:/}}/,c:["self",r,a]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/typescript.min.js b/vendor/assets/javascripts/highlightjs/languages/typescript.min.js
index 636139370c..9d9a56c996 100644
--- a/vendor/assets/javascripts/highlightjs/languages/typescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/typescript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("typescript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);return function(r){var t={$pattern:"[A-Za-z$_][0-9A-Za-z$_]*",keyword:e.concat(["type","namespace","typedef","interface","public","private","protected","implements","declare","abstract","readonly"]).join(" "),literal:n.join(" "),built_in:a.concat(["any","void","number","boolean","string","object","never","enum"]).join(" ")},s={className:"meta",begin:"@[A-Za-z$_][0-9A-Za-z$_]*"},i={className:"number",variants:[{begin:"\\b(0[bB][01]+)n?"},{begin:"\\b(0[oO][0-7]+)n?"},{begin:r.C_NUMBER_RE+"n?"}],relevance:0},o={className:"subst",begin:"\\$\\{",end:"\\}",keywords:t,contains:[]},c={begin:"html`",end:"",starts:{end:"`",returnEnd:!1,contains:[r.BACKSLASH_ESCAPE,o],subLanguage:"xml"}},l={begin:"css`",end:"",starts:{end:"`",returnEnd:!1,contains:[r.BACKSLASH_ESCAPE,o],subLanguage:"css"}},E={className:"string",begin:"`",end:"`",contains:[r.BACKSLASH_ESCAPE,o]};o.contains=[r.APOS_STRING_MODE,r.QUOTE_STRING_MODE,c,l,E,i,r.REGEXP_MODE];var d={begin:"\\(",end:/\)/,keywords:t,contains:["self",r.QUOTE_STRING_MODE,r.APOS_STRING_MODE,r.NUMBER_MODE]},u={className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:t,contains:[r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,s,d]};return{name:"TypeScript",aliases:["ts"],keywords:t,contains:[r.SHEBANG(),{className:"meta",begin:/^\s*['"]use strict['"]/},r.APOS_STRING_MODE,r.QUOTE_STRING_MODE,c,l,E,r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,i,{begin:"("+r.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",keywords:"return throw case",contains:[r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,r.REGEXP_MODE,{className:"function",begin:"(\\([^(]*(\\([^(]*(\\([^(]*\\))?\\))?\\)|"+r.UNDERSCORE_IDENT_RE+")\\s*=>",returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{begin:r.UNDERSCORE_IDENT_RE},{className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:t,contains:d.contains}]}]}],relevance:0},{className:"function",beginKeywords:"function",end:/[\{;]/,excludeEnd:!0,keywords:t,contains:["self",r.inherit(r.TITLE_MODE,{begin:"[A-Za-z$_][0-9A-Za-z$_]*"}),u],illegal:/%/,relevance:0},{beginKeywords:"constructor",end:/[\{;]/,excludeEnd:!0,contains:["self",u]},{begin:/module\./,keywords:{built_in:"module"},relevance:0},{beginKeywords:"module",end:/\{/,excludeEnd:!0},{beginKeywords:"interface",end:/\{/,excludeEnd:!0,keywords:"interface extends"},{begin:/\$[(.]/},{begin:"\\."+r.IDENT_RE,relevance:0},s,d]}}}());
\ No newline at end of file
+hljs.registerLanguage("typescript",function(e){var r="[A-Za-z$_][0-9A-Za-z$_]*",t={keyword:"in if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const class public private protected get set super static implements enum export import declare type namespace abstract as from extends async await",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document any number boolean string void Promise"},n={cN:"meta",b:"@"+r},a={b:"\\(",e:/\)/,k:t,c:["self",e.QSM,e.ASM,e.NM]},c={cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:t,c:[e.CLCM,e.CBCM,n,a]},s={cN:"number",v:[{b:"\\b(0[bB][01]+)n?"},{b:"\\b(0[oO][0-7]+)n?"},{b:e.CNR+"n?"}],relevance:0},o={cN:"subst",b:"\\$\\{",e:"\\}",k:t,c:[]},i={b:"html`",e:"",starts:{e:"`",rE:!1,c:[e.BE,o],sL:"xml"}},l={b:"css`",e:"",starts:{e:"`",rE:!1,c:[e.BE,o],sL:"css"}},b={cN:"string",b:"`",e:"`",c:[e.BE,o]};return o.c=[e.ASM,e.QSM,i,l,b,s,e.RM],{aliases:["ts"],k:t,c:[{cN:"meta",b:/^\s*['"]use strict['"]/},e.ASM,e.QSM,i,l,b,e.CLCM,e.CBCM,s,{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{cN:"function",b:"(\\(.*?\\)|"+e.IR+")\\s*=>",rB:!0,e:"\\s*=>",c:[{cN:"params",v:[{b:e.IR},{b:/\(\s*\)/},{b:/\(/,e:/\)/,eB:!0,eE:!0,k:t,c:["self",e.CLCM,e.CBCM]}]}]}],relevance:0},{cN:"function",bK:"function",e:/[\{;]/,eE:!0,k:t,c:["self",e.inherit(e.TM,{b:r}),c],i:/%/,relevance:0},{bK:"constructor",e:/[\{;]/,eE:!0,c:["self",c]},{b:/module\./,k:{built_in:"module"},relevance:0},{bK:"module",e:/\{/,eE:!0},{bK:"interface",e:/\{/,eE:!0,k:"interface extends"},{b:/\$[(.]/},{b:"\\."+e.IR,relevance:0},n,a]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/vala.min.js b/vendor/assets/javascripts/highlightjs/languages/vala.min.js
index 51a45d67d3..b33dde83e9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vala.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vala.min.js
@@ -1 +1 @@
-hljs.registerLanguage("vala",function(){"use strict";return function(e){return{name:"Vala",keywords:{keyword:"char uchar unichar int uint long ulong short ushort int8 int16 int32 int64 uint8 uint16 uint32 uint64 float double bool struct enum string void weak unowned owned async signal static abstract interface override virtual delegate if while do for foreach else switch case break default return try catch public private protected internal using new this get set const stdout stdin stderr var",built_in:"DBus GLib CCode Gee Object Gtk Posix",literal:"false true null"},contains:[{className:"class",beginKeywords:"class interface namespace",end:"{",excludeEnd:!0,illegal:"[^,:\\n\\s\\.]",contains:[e.UNDERSCORE_TITLE_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"string",begin:'"""',end:'"""',relevance:5},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,{className:"meta",begin:"^#",end:"$",relevance:2}]}}}());
\ No newline at end of file
+hljs.registerLanguage("vala",function(e){return{k:{keyword:"char uchar unichar int uint long ulong short ushort int8 int16 int32 int64 uint8 uint16 uint32 uint64 float double bool struct enum string void weak unowned owned async signal static abstract interface override virtual delegate if while do for foreach else switch case break default return try catch public private protected internal using new this get set const stdout stdin stderr var",built_in:"DBus GLib CCode Gee Object Gtk Posix",literal:"false true null"},c:[{cN:"class",bK:"class interface namespace",e:"{",eE:!0,i:"[^,:\\n\\s\\.]",c:[e.UTM]},e.CLCM,e.CBCM,{cN:"string",b:'"""',e:'"""',relevance:5},e.ASM,e.QSM,e.CNM,{cN:"meta",b:"^#",e:"$",relevance:2}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/vbnet.min.js b/vendor/assets/javascripts/highlightjs/languages/vbnet.min.js
index 93630f628b..3cd9a01e3c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vbnet.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vbnet.min.js
@@ -1 +1 @@
-hljs.registerLanguage("vbnet",function(){"use strict";return function(e){return{name:"Visual Basic .NET",aliases:["vb"],case_insensitive:!0,keywords:{keyword:"addhandler addressof alias and andalso aggregate ansi as async assembly auto await binary by byref byval call case catch class compare const continue custom declare default delegate dim distinct do each equals else elseif end enum erase error event exit explicit finally for friend from function get global goto group handles if implements imports in inherits interface into is isfalse isnot istrue iterator join key let lib like loop me mid mod module mustinherit mustoverride mybase myclass nameof namespace narrowing new next not notinheritable notoverridable of off on operator option optional or order orelse overloads overridable overrides paramarray partial preserve private property protected public raiseevent readonly redim rem removehandler resume return select set shadows shared skip static step stop structure strict sub synclock take text then throw to try unicode until using when where while widening with withevents writeonly xor yield",built_in:"boolean byte cbool cbyte cchar cdate cdec cdbl char cint clng cobj csbyte cshort csng cstr ctype date decimal directcast double gettype getxmlnamespace iif integer long object sbyte short single string trycast typeof uinteger ulong ushort",literal:"true false nothing"},illegal:"//|{|}|endif|gosub|variant|wend|^\\$ ",contains:[e.inherit(e.QUOTE_STRING_MODE,{contains:[{begin:'""'}]}),e.COMMENT("'","$",{returnBegin:!0,contains:[{className:"doctag",begin:"'''|\x3c!--|--\x3e",contains:[e.PHRASAL_WORDS_MODE]},{className:"doctag",begin:"</?",end:">",contains:[e.PHRASAL_WORDS_MODE]}]}),e.C_NUMBER_MODE,{className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"if else elseif end region externalsource"}}]}}}());
\ No newline at end of file
+hljs.registerLanguage("vbnet",function(e){return{aliases:["vb"],cI:!0,k:{keyword:"addhandler addressof alias and andalso aggregate ansi as async assembly auto await binary by byref byval call case catch class compare const continue custom declare default delegate dim distinct do each equals else elseif end enum erase error event exit explicit finally for friend from function get global goto group handles if implements imports in inherits interface into is isfalse isnot istrue iterator join key let lib like loop me mid mod module mustinherit mustoverride mybase myclass nameof namespace narrowing new next not notinheritable notoverridable of off on operator option optional or order orelse overloads overridable overrides paramarray partial preserve private property protected public raiseevent readonly redim rem removehandler resume return select set shadows shared skip static step stop structure strict sub synclock take text then throw to try unicode until using when where while widening with withevents writeonly xor yield",built_in:"boolean byte cbool cbyte cchar cdate cdec cdbl char cint clng cobj csbyte cshort csng cstr ctype date decimal directcast double gettype getxmlnamespace iif integer long object sbyte short single string trycast typeof uinteger ulong ushort",literal:"true false nothing"},i:"//|{|}|endif|gosub|variant|wend|^\\$ ",c:[e.inherit(e.QSM,{c:[{b:'""'}]}),e.C("'","$",{rB:!0,c:[{cN:"doctag",b:"'''|\x3c!--|--\x3e",c:[e.PWM]},{cN:"doctag",b:"</?",e:">",c:[e.PWM]}]}),e.CNM,{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elseif end region externalsource"}}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/vbscript-html.min.js b/vendor/assets/javascripts/highlightjs/languages/vbscript-html.min.js
index b2375eb3ff..eb52b324e6 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vbscript-html.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vbscript-html.min.js
@@ -1 +1 @@
-hljs.registerLanguage("vbscript-html",function(){"use strict";return function(n){return{name:"VBScript in HTML",subLanguage:"xml",contains:[{begin:"<%",end:"%>",subLanguage:"vbscript"}]}}}());
\ No newline at end of file
+hljs.registerLanguage("vbscript-html",function(r){return{sL:"xml",c:[{b:"<%",e:"%>",sL:"vbscript"}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/vbscript.min.js b/vendor/assets/javascripts/highlightjs/languages/vbscript.min.js
index 0825dfce62..15c59523f6 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vbscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vbscript.min.js
@@ -1 +1 @@
-hljs.registerLanguage("vbscript",function(){"use strict";return function(e){return{name:"VBScript",aliases:["vbs"],case_insensitive:!0,keywords:{keyword:"call class const dim do loop erase execute executeglobal exit for each next function if then else on error option explicit new private property let get public randomize redim rem select case set stop sub while wend with end to elseif is or xor and not class_initialize class_terminate default preserve in me byval byref step resume goto",built_in:"lcase month vartype instrrev ubound setlocale getobject rgb getref string weekdayname rnd dateadd monthname now day minute isarray cbool round formatcurrency conversions csng timevalue second year space abs clng timeserial fixs len asc isempty maths dateserial atn timer isobject filter weekday datevalue ccur isdate instr datediff formatdatetime replace isnull right sgn array snumeric log cdbl hex chr lbound msgbox ucase getlocale cos cdate cbyte rtrim join hour oct typename trim strcomp int createobject loadpicture tan formatnumber mid scriptenginebuildversion scriptengine split scriptengineminorversion cint sin datepart ltrim sqr scriptenginemajorversion time derived eval date formatpercent exp inputbox left ascw chrw regexp server response request cstr err",literal:"true false null nothing empty"},illegal:"//",contains:[e.inherit(e.QUOTE_STRING_MODE,{contains:[{begin:'""'}]}),e.COMMENT(/'/,/$/,{relevance:0}),e.C_NUMBER_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("vbscript",function(e){return{aliases:["vbs"],cI:!0,k:{keyword:"call class const dim do loop erase execute executeglobal exit for each next function if then else on error option explicit new private property let get public randomize redim rem select case set stop sub while wend with end to elseif is or xor and not class_initialize class_terminate default preserve in me byval byref step resume goto",built_in:"lcase month vartype instrrev ubound setlocale getobject rgb getref string weekdayname rnd dateadd monthname now day minute isarray cbool round formatcurrency conversions csng timevalue second year space abs clng timeserial fixs len asc isempty maths dateserial atn timer isobject filter weekday datevalue ccur isdate instr datediff formatdatetime replace isnull right sgn array snumeric log cdbl hex chr lbound msgbox ucase getlocale cos cdate cbyte rtrim join hour oct typename trim strcomp int createobject loadpicture tan formatnumber mid scriptenginebuildversion scriptengine split scriptengineminorversion cint sin datepart ltrim sqr scriptenginemajorversion time derived eval date formatpercent exp inputbox left ascw chrw regexp server response request cstr err",literal:"true false null nothing empty"},i:"//",c:[e.inherit(e.QSM,{c:[{b:'""'}]}),e.C(/'/,/$/,{relevance:0}),e.CNM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/verilog.min.js b/vendor/assets/javascripts/highlightjs/languages/verilog.min.js
index 7ffd5be95a..60d869259d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/verilog.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/verilog.min.js
@@ -1 +1 @@
-hljs.registerLanguage("verilog",function(){"use strict";return function(e){return{name:"Verilog",aliases:["v","sv","svh"],case_insensitive:!1,keywords:{$pattern:/[\w\$]+/,keyword:"accept_on alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind bins binsof bit break buf|0 bufif0 bufif1 byte case casex casez cell chandle checker class clocking cmos config const constraint context continue cover covergroup coverpoint cross deassign default defparam design disable dist do edge else end endcase endchecker endclass endclocking endconfig endfunction endgenerate endgroup endinterface endmodule endpackage endprimitive endprogram endproperty endspecify endsequence endtable endtask enum event eventually expect export extends extern final first_match for force foreach forever fork forkjoin function generate|5 genvar global highz0 highz1 if iff ifnone ignore_bins illegal_bins implements implies import incdir include initial inout input inside instance int integer interconnect interface intersect join join_any join_none large let liblist library local localparam logic longint macromodule matches medium modport module nand negedge nettype new nexttime nmos nor noshowcancelled not notif0 notif1 or output package packed parameter pmos posedge primitive priority program property protected pull0 pull1 pulldown pullup pulsestyle_ondetect pulsestyle_onevent pure rand randc randcase randsequence rcmos real realtime ref reg reject_on release repeat restrict return rnmos rpmos rtran rtranif0 rtranif1 s_always s_eventually s_nexttime s_until s_until_with scalared sequence shortint shortreal showcancelled signed small soft solve specify specparam static string strong strong0 strong1 struct super supply0 supply1 sync_accept_on sync_reject_on table tagged task this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 triand trior trireg type typedef union unique unique0 unsigned until until_with untyped use uwire var vectored virtual void wait wait_order wand weak weak0 weak1 while wildcard wire with within wor xnor xor",literal:"null",built_in:"$finish $stop $exit $fatal $error $warning $info $realtime $time $printtimescale $bitstoreal $bitstoshortreal $itor $signed $cast $bits $stime $timeformat $realtobits $shortrealtobits $rtoi $unsigned $asserton $assertkill $assertpasson $assertfailon $assertnonvacuouson $assertoff $assertcontrol $assertpassoff $assertfailoff $assertvacuousoff $isunbounded $sampled $fell $changed $past_gclk $fell_gclk $changed_gclk $rising_gclk $steady_gclk $coverage_control $coverage_get $coverage_save $set_coverage_db_name $rose $stable $past $rose_gclk $stable_gclk $future_gclk $falling_gclk $changing_gclk $display $coverage_get_max $coverage_merge $get_coverage $load_coverage_db $typename $unpacked_dimensions $left $low $increment $clog2 $ln $log10 $exp $sqrt $pow $floor $ceil $sin $cos $tan $countbits $onehot $isunknown $fatal $warning $dimensions $right $high $size $asin $acos $atan $atan2 $hypot $sinh $cosh $tanh $asinh $acosh $atanh $countones $onehot0 $error $info $random $dist_chi_square $dist_erlang $dist_exponential $dist_normal $dist_poisson $dist_t $dist_uniform $q_initialize $q_remove $q_exam $async$and$array $async$nand$array $async$or$array $async$nor$array $sync$and$array $sync$nand$array $sync$or$array $sync$nor$array $q_add $q_full $psprintf $async$and$plane $async$nand$plane $async$or$plane $async$nor$plane $sync$and$plane $sync$nand$plane $sync$or$plane $sync$nor$plane $system $display $displayb $displayh $displayo $strobe $strobeb $strobeh $strobeo $write $readmemb $readmemh $writememh $value$plusargs $dumpvars $dumpon $dumplimit $dumpports $dumpportson $dumpportslimit $writeb $writeh $writeo $monitor $monitorb $monitorh $monitoro $writememb $dumpfile $dumpoff $dumpall $dumpflush $dumpportsoff $dumpportsall $dumpportsflush $fclose $fdisplay $fdisplayb $fdisplayh $fdisplayo $fstrobe $fstrobeb $fstrobeh $fstrobeo $swrite $swriteb $swriteh $swriteo $fscanf $fread $fseek $fflush $feof $fopen $fwrite $fwriteb $fwriteh $fwriteo $fmonitor $fmonitorb $fmonitorh $fmonitoro $sformat $sformatf $fgetc $ungetc $fgets $sscanf $rewind $ftell $ferror"},contains:[e.C_BLOCK_COMMENT_MODE,e.C_LINE_COMMENT_MODE,e.QUOTE_STRING_MODE,{className:"number",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:"\\b((\\d+'(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+)"},{begin:"\\B(('(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+)"},{begin:"\\b([0-9_])+",relevance:0}]},{className:"variable",variants:[{begin:"#\\((?!parameter).+\\)"},{begin:"\\.\\w+",relevance:0}]},{className:"meta",begin:"`",end:"$",keywords:{"meta-keyword":"define __FILE__ __LINE__ begin_keywords celldefine default_nettype define else elsif end_keywords endcelldefine endif ifdef ifndef include line nounconnected_drive pragma resetall timescale unconnected_drive undef undefineall"},relevance:0}]}}}());
\ No newline at end of file
+hljs.registerLanguage("verilog",function(e){return{aliases:["v","sv","svh"],cI:!1,k:{keyword:"accept_on alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind bins binsof bit break buf|0 bufif0 bufif1 byte case casex casez cell chandle checker class clocking cmos config const constraint context continue cover covergroup coverpoint cross deassign default defparam design disable dist do edge else end endcase endchecker endclass endclocking endconfig endfunction endgenerate endgroup endinterface endmodule endpackage endprimitive endprogram endproperty endspecify endsequence endtable endtask enum event eventually expect export extends extern final first_match for force foreach forever fork forkjoin function generate|5 genvar global highz0 highz1 if iff ifnone ignore_bins illegal_bins implements implies import incdir include initial inout input inside instance int integer interconnect interface intersect join join_any join_none large let liblist library local localparam logic longint macromodule matches medium modport module nand negedge nettype new nexttime nmos nor noshowcancelled not notif0 notif1 or output package packed parameter pmos posedge primitive priority program property protected pull0 pull1 pulldown pullup pulsestyle_ondetect pulsestyle_onevent pure rand randc randcase randsequence rcmos real realtime ref reg reject_on release repeat restrict return rnmos rpmos rtran rtranif0 rtranif1 s_always s_eventually s_nexttime s_until s_until_with scalared sequence shortint shortreal showcancelled signed small soft solve specify specparam static string strong strong0 strong1 struct super supply0 supply1 sync_accept_on sync_reject_on table tagged task this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 triand trior trireg type typedef union unique unique0 unsigned until until_with untyped use uwire var vectored virtual void wait wait_order wand weak weak0 weak1 while wildcard wire with within wor xnor xor",literal:"null",built_in:"$finish $stop $exit $fatal $error $warning $info $realtime $time $printtimescale $bitstoreal $bitstoshortreal $itor $signed $cast $bits $stime $timeformat $realtobits $shortrealtobits $rtoi $unsigned $asserton $assertkill $assertpasson $assertfailon $assertnonvacuouson $assertoff $assertcontrol $assertpassoff $assertfailoff $assertvacuousoff $isunbounded $sampled $fell $changed $past_gclk $fell_gclk $changed_gclk $rising_gclk $steady_gclk $coverage_control $coverage_get $coverage_save $set_coverage_db_name $rose $stable $past $rose_gclk $stable_gclk $future_gclk $falling_gclk $changing_gclk $display $coverage_get_max $coverage_merge $get_coverage $load_coverage_db $typename $unpacked_dimensions $left $low $increment $clog2 $ln $log10 $exp $sqrt $pow $floor $ceil $sin $cos $tan $countbits $onehot $isunknown $fatal $warning $dimensions $right $high $size $asin $acos $atan $atan2 $hypot $sinh $cosh $tanh $asinh $acosh $atanh $countones $onehot0 $error $info $random $dist_chi_square $dist_erlang $dist_exponential $dist_normal $dist_poisson $dist_t $dist_uniform $q_initialize $q_remove $q_exam $async$and$array $async$nand$array $async$or$array $async$nor$array $sync$and$array $sync$nand$array $sync$or$array $sync$nor$array $q_add $q_full $psprintf $async$and$plane $async$nand$plane $async$or$plane $async$nor$plane $sync$and$plane $sync$nand$plane $sync$or$plane $sync$nor$plane $system $display $displayb $displayh $displayo $strobe $strobeb $strobeh $strobeo $write $readmemb $readmemh $writememh $value$plusargs $dumpvars $dumpon $dumplimit $dumpports $dumpportson $dumpportslimit $writeb $writeh $writeo $monitor $monitorb $monitorh $monitoro $writememb $dumpfile $dumpoff $dumpall $dumpflush $dumpportsoff $dumpportsall $dumpportsflush $fclose $fdisplay $fdisplayb $fdisplayh $fdisplayo $fstrobe $fstrobeb $fstrobeh $fstrobeo $swrite $swriteb $swriteh $swriteo $fscanf $fread $fseek $fflush $feof $fopen $fwrite $fwriteb $fwriteh $fwriteo $fmonitor $fmonitorb $fmonitorh $fmonitoro $sformat $sformatf $fgetc $ungetc $fgets $sscanf $rewind $ftell $ferror"},l:/[\w\$]+/,c:[e.CBCM,e.CLCM,e.QSM,{cN:"number",c:[e.BE],v:[{b:"\\b((\\d+'(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+)"},{b:"\\B(('(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+)"},{b:"\\b([0-9_])+",relevance:0}]},{cN:"variable",v:[{b:"#\\((?!parameter).+\\)"},{b:"\\.\\w+",relevance:0}]},{cN:"meta",b:"`",e:"$",k:{"meta-keyword":"define __FILE__ __LINE__ begin_keywords celldefine default_nettype define else elsif end_keywords endcelldefine endif ifdef ifndef include line nounconnected_drive pragma resetall timescale unconnected_drive undef undefineall"},relevance:0}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/vhdl.min.js b/vendor/assets/javascripts/highlightjs/languages/vhdl.min.js
index ef95aa3196..a725032ece 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vhdl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vhdl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("vhdl",function(){"use strict";return function(e){return{name:"VHDL",case_insensitive:!0,keywords:{keyword:"abs access after alias all and architecture array assert assume assume_guarantee attribute begin block body buffer bus case component configuration constant context cover disconnect downto default else elsif end entity exit fairness file for force function generate generic group guarded if impure in inertial inout is label library linkage literal loop map mod nand new next nor not null of on open or others out package parameter port postponed procedure process property protected pure range record register reject release rem report restrict restrict_guarantee return rol ror select sequence severity shared signal sla sll sra srl strong subtype then to transport type unaffected units until use variable view vmode vprop vunit wait when while with xnor xor",built_in:"boolean bit character integer time delay_length natural positive string bit_vector file_open_kind file_open_status std_logic std_logic_vector unsigned signed boolean_vector integer_vector std_ulogic std_ulogic_vector unresolved_unsigned u_unsigned unresolved_signed u_signed real_vector time_vector",literal:"false true note warning error failure line text side width"},illegal:"{",contains:[e.C_BLOCK_COMMENT_MODE,e.COMMENT("--","$"),e.QUOTE_STRING_MODE,{className:"number",begin:"\\b(\\d(_|\\d)*#\\w+(\\.\\w+)?#([eE][-+]?\\d(_|\\d)*)?|\\d(_|\\d)*(\\.\\d(_|\\d)*)?([eE][-+]?\\d(_|\\d)*)?)",relevance:0},{className:"string",begin:"'(U|X|0|1|Z|W|L|H|-)'",contains:[e.BACKSLASH_ESCAPE]},{className:"symbol",begin:"'[A-Za-z](_?[A-Za-z0-9])*",contains:[e.BACKSLASH_ESCAPE]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("vhdl",function(e){return{cI:!0,k:{keyword:"abs access after alias all and architecture array assert assume assume_guarantee attribute begin block body buffer bus case component configuration constant context cover disconnect downto default else elsif end entity exit fairness file for force function generate generic group guarded if impure in inertial inout is label library linkage literal loop map mod nand new next nor not null of on open or others out package parameter port postponed procedure process property protected pure range record register reject release rem report restrict restrict_guarantee return rol ror select sequence severity shared signal sla sll sra srl strong subtype then to transport type unaffected units until use variable view vmode vprop vunit wait when while with xnor xor",built_in:"boolean bit character integer time delay_length natural positive string bit_vector file_open_kind file_open_status std_logic std_logic_vector unsigned signed boolean_vector integer_vector std_ulogic std_ulogic_vector unresolved_unsigned u_unsigned unresolved_signed u_signed real_vector time_vector",literal:"false true note warning error failure line text side width"},i:"{",c:[e.CBCM,e.C("--","$"),e.QSM,{cN:"number",b:"\\b(\\d(_|\\d)*#\\w+(\\.\\w+)?#([eE][-+]?\\d(_|\\d)*)?|\\d(_|\\d)*(\\.\\d(_|\\d)*)?([eE][-+]?\\d(_|\\d)*)?)",relevance:0},{cN:"string",b:"'(U|X|0|1|Z|W|L|H|-)'",c:[e.BE]},{cN:"symbol",b:"'[A-Za-z](_?[A-Za-z0-9])*",c:[e.BE]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/vim.min.js b/vendor/assets/javascripts/highlightjs/languages/vim.min.js
index 49269bf56e..903053e459 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vim.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vim.min.js
@@ -1 +1 @@
-hljs.registerLanguage("vim",function(){"use strict";return function(e){return{name:"Vim Script",keywords:{$pattern:/[!#@\w]+/,keyword:"N|0 P|0 X|0 a|0 ab abc abo al am an|0 ar arga argd arge argdo argg argl argu as au aug aun b|0 bN ba bad bd be bel bf bl bm bn bo bp br brea breaka breakd breakl bro bufdo buffers bun bw c|0 cN cNf ca cabc caddb cad caddf cal cat cb cc ccl cd ce cex cf cfir cgetb cgete cg changes chd che checkt cl cla clo cm cmapc cme cn cnew cnf cno cnorea cnoreme co col colo com comc comp con conf cope cp cpf cq cr cs cst cu cuna cunme cw delm deb debugg delc delf dif diffg diffo diffp diffpu diffs diffthis dig di dl dell dj dli do doautoa dp dr ds dsp e|0 ea ec echoe echoh echom echon el elsei em en endfo endf endt endw ene ex exe exi exu f|0 files filet fin fina fini fir fix fo foldc foldd folddoc foldo for fu go gr grepa gu gv ha helpf helpg helpt hi hid his ia iabc if ij il im imapc ime ino inorea inoreme int is isp iu iuna iunme j|0 ju k|0 keepa kee keepj lN lNf l|0 lad laddb laddf la lan lat lb lc lch lcl lcs le lefta let lex lf lfir lgetb lgete lg lgr lgrepa lh ll lla lli lmak lm lmapc lne lnew lnf ln loadk lo loc lockv lol lope lp lpf lr ls lt lu lua luad luaf lv lvimgrepa lw m|0 ma mak map mapc marks mat me menut mes mk mks mksp mkv mkvie mod mz mzf nbc nb nbs new nm nmapc nme nn nnoreme noa no noh norea noreme norm nu nun nunme ol o|0 om omapc ome on ono onoreme opt ou ounme ow p|0 profd prof pro promptr pc ped pe perld po popu pp pre prev ps pt ptN ptf ptj ptl ptn ptp ptr pts pu pw py3 python3 py3d py3f py pyd pyf quita qa rec red redi redr redraws reg res ret retu rew ri rightb rub rubyd rubyf rund ru rv sN san sa sal sav sb sbN sba sbf sbl sbm sbn sbp sbr scrip scripte scs se setf setg setl sf sfir sh sim sig sil sl sla sm smap smapc sme sn sni sno snor snoreme sor so spelld spe spelli spellr spellu spellw sp spr sre st sta startg startr star stopi stj sts sun sunm sunme sus sv sw sy synti sync tN tabN tabc tabdo tabe tabf tabfir tabl tabm tabnew tabn tabo tabp tabr tabs tab ta tags tc tcld tclf te tf th tj tl tm tn to tp tr try ts tu u|0 undoj undol una unh unl unlo unm unme uns up ve verb vert vim vimgrepa vi viu vie vm vmapc vme vne vn vnoreme vs vu vunme windo w|0 wN wa wh wi winc winp wn wp wq wqa ws wu wv x|0 xa xmapc xm xme xn xnoreme xu xunme y|0 z|0 ~ Next Print append abbreviate abclear aboveleft all amenu anoremenu args argadd argdelete argedit argglobal arglocal argument ascii autocmd augroup aunmenu buffer bNext ball badd bdelete behave belowright bfirst blast bmodified bnext botright bprevious brewind break breakadd breakdel breaklist browse bunload bwipeout change cNext cNfile cabbrev cabclear caddbuffer caddexpr caddfile call catch cbuffer cclose center cexpr cfile cfirst cgetbuffer cgetexpr cgetfile chdir checkpath checktime clist clast close cmap cmapclear cmenu cnext cnewer cnfile cnoremap cnoreabbrev cnoremenu copy colder colorscheme command comclear compiler continue confirm copen cprevious cpfile cquit crewind cscope cstag cunmap cunabbrev cunmenu cwindow delete delmarks debug debuggreedy delcommand delfunction diffupdate diffget diffoff diffpatch diffput diffsplit digraphs display deletel djump dlist doautocmd doautoall deletep drop dsearch dsplit edit earlier echo echoerr echohl echomsg else elseif emenu endif endfor endfunction endtry endwhile enew execute exit exusage file filetype find finally finish first fixdel fold foldclose folddoopen folddoclosed foldopen function global goto grep grepadd gui gvim hardcopy help helpfind helpgrep helptags highlight hide history insert iabbrev iabclear ijump ilist imap imapclear imenu inoremap inoreabbrev inoremenu intro isearch isplit iunmap iunabbrev iunmenu join jumps keepalt keepmarks keepjumps lNext lNfile list laddexpr laddbuffer laddfile last language later lbuffer lcd lchdir lclose lcscope left leftabove lexpr lfile lfirst lgetbuffer lgetexpr lgetfile lgrep lgrepadd lhelpgrep llast llist lmake lmap lmapclear lnext lnewer lnfile lnoremap loadkeymap loadview lockmarks lockvar lolder lopen lprevious lpfile lrewind ltag lunmap luado luafile lvimgrep lvimgrepadd lwindow move mark make mapclear match menu menutranslate messages mkexrc mksession mkspell mkvimrc mkview mode mzscheme mzfile nbclose nbkey nbsart next nmap nmapclear nmenu nnoremap nnoremenu noautocmd noremap nohlsearch noreabbrev noremenu normal number nunmap nunmenu oldfiles open omap omapclear omenu only onoremap onoremenu options ounmap ounmenu ownsyntax print profdel profile promptfind promptrepl pclose pedit perl perldo pop popup ppop preserve previous psearch ptag ptNext ptfirst ptjump ptlast ptnext ptprevious ptrewind ptselect put pwd py3do py3file python pydo pyfile quit quitall qall read recover redo redir redraw redrawstatus registers resize retab return rewind right rightbelow ruby rubydo rubyfile rundo runtime rviminfo substitute sNext sandbox sargument sall saveas sbuffer sbNext sball sbfirst sblast sbmodified sbnext sbprevious sbrewind scriptnames scriptencoding scscope set setfiletype setglobal setlocal sfind sfirst shell simalt sign silent sleep slast smagic smapclear smenu snext sniff snomagic snoremap snoremenu sort source spelldump spellgood spellinfo spellrepall spellundo spellwrong split sprevious srewind stop stag startgreplace startreplace startinsert stopinsert stjump stselect sunhide sunmap sunmenu suspend sview swapname syntax syntime syncbind tNext tabNext tabclose tabedit tabfind tabfirst tablast tabmove tabnext tabonly tabprevious tabrewind tag tcl tcldo tclfile tearoff tfirst throw tjump tlast tmenu tnext topleft tprevious trewind tselect tunmenu undo undojoin undolist unabbreviate unhide unlet unlockvar unmap unmenu unsilent update vglobal version verbose vertical vimgrep vimgrepadd visual viusage view vmap vmapclear vmenu vnew vnoremap vnoremenu vsplit vunmap vunmenu write wNext wall while winsize wincmd winpos wnext wprevious wqall wsverb wundo wviminfo xit xall xmapclear xmap xmenu xnoremap xnoremenu xunmap xunmenu yank",built_in:"synIDtrans atan2 range matcharg did_filetype asin feedkeys xor argv complete_check add getwinposx getqflist getwinposy screencol clearmatches empty extend getcmdpos mzeval garbagecollect setreg ceil sqrt diff_hlID inputsecret get getfperm getpid filewritable shiftwidth max sinh isdirectory synID system inputrestore winline atan visualmode inputlist tabpagewinnr round getregtype mapcheck hasmapto histdel argidx findfile sha256 exists toupper getcmdline taglist string getmatches bufnr strftime winwidth bufexists strtrans tabpagebuflist setcmdpos remote_read printf setloclist getpos getline bufwinnr float2nr len getcmdtype diff_filler luaeval resolve libcallnr foldclosedend reverse filter has_key bufname str2float strlen setline getcharmod setbufvar index searchpos shellescape undofile foldclosed setqflist buflisted strchars str2nr virtcol floor remove undotree remote_expr winheight gettabwinvar reltime cursor tabpagenr finddir localtime acos getloclist search tanh matchend rename gettabvar strdisplaywidth type abs py3eval setwinvar tolower wildmenumode log10 spellsuggest bufloaded synconcealed nextnonblank server2client complete settabwinvar executable input wincol setmatches getftype hlID inputsave searchpair or screenrow line settabvar histadd deepcopy strpart remote_peek and eval getftime submatch screenchar winsaveview matchadd mkdir screenattr getfontname libcall reltimestr getfsize winnr invert pow getbufline byte2line soundfold repeat fnameescape tagfiles sin strwidth spellbadword trunc maparg log lispindent hostname setpos globpath remote_foreground getchar synIDattr fnamemodify cscope_connection stridx winbufnr indent min complete_add nr2char searchpairpos inputdialog values matchlist items hlexists strridx browsedir expand fmod pathshorten line2byte argc count getwinvar glob foldtextresult getreg foreground cosh matchdelete has char2nr simplify histget searchdecl iconv winrestcmd pumvisible writefile foldlevel haslocaldir keys cos matchstr foldtext histnr tan tempname getcwd byteidx getbufvar islocked escape eventhandler remote_send serverlist winrestview synstack pyeval prevnonblank readfile cindent filereadable changenr exp"},illegal:/;/,contains:[e.NUMBER_MODE,{className:"string",begin:"'",end:"'",illegal:"\\n"},{className:"string",begin:/"(\\"|\n\\|[^"\n])*"/},e.COMMENT('"',"$"),{className:"variable",begin:/[bwtglsav]:[\w\d_]*/},{className:"function",beginKeywords:"function function!",end:"$",relevance:0,contains:[e.TITLE_MODE,{className:"params",begin:"\\(",end:"\\)"}]},{className:"symbol",begin:/<[\w-]+>/}]}}}());
\ No newline at end of file
+hljs.registerLanguage("vim",function(e){return{l:/[!#@\w]+/,k:{keyword:"N|0 P|0 X|0 a|0 ab abc abo al am an|0 ar arga argd arge argdo argg argl argu as au aug aun b|0 bN ba bad bd be bel bf bl bm bn bo bp br brea breaka breakd breakl bro bufdo buffers bun bw c|0 cN cNf ca cabc caddb cad caddf cal cat cb cc ccl cd ce cex cf cfir cgetb cgete cg changes chd che checkt cl cla clo cm cmapc cme cn cnew cnf cno cnorea cnoreme co col colo com comc comp con conf cope cp cpf cq cr cs cst cu cuna cunme cw delm deb debugg delc delf dif diffg diffo diffp diffpu diffs diffthis dig di dl dell dj dli do doautoa dp dr ds dsp e|0 ea ec echoe echoh echom echon el elsei em en endfo endf endt endw ene ex exe exi exu f|0 files filet fin fina fini fir fix fo foldc foldd folddoc foldo for fu go gr grepa gu gv ha helpf helpg helpt hi hid his ia iabc if ij il im imapc ime ino inorea inoreme int is isp iu iuna iunme j|0 ju k|0 keepa kee keepj lN lNf l|0 lad laddb laddf la lan lat lb lc lch lcl lcs le lefta let lex lf lfir lgetb lgete lg lgr lgrepa lh ll lla lli lmak lm lmapc lne lnew lnf ln loadk lo loc lockv lol lope lp lpf lr ls lt lu lua luad luaf lv lvimgrepa lw m|0 ma mak map mapc marks mat me menut mes mk mks mksp mkv mkvie mod mz mzf nbc nb nbs new nm nmapc nme nn nnoreme noa no noh norea noreme norm nu nun nunme ol o|0 om omapc ome on ono onoreme opt ou ounme ow p|0 profd prof pro promptr pc ped pe perld po popu pp pre prev ps pt ptN ptf ptj ptl ptn ptp ptr pts pu pw py3 python3 py3d py3f py pyd pyf quita qa rec red redi redr redraws reg res ret retu rew ri rightb rub rubyd rubyf rund ru rv sN san sa sal sav sb sbN sba sbf sbl sbm sbn sbp sbr scrip scripte scs se setf setg setl sf sfir sh sim sig sil sl sla sm smap smapc sme sn sni sno snor snoreme sor so spelld spe spelli spellr spellu spellw sp spr sre st sta startg startr star stopi stj sts sun sunm sunme sus sv sw sy synti sync tN tabN tabc tabdo tabe tabf tabfir tabl tabm tabnew tabn tabo tabp tabr tabs tab ta tags tc tcld tclf te tf th tj tl tm tn to tp tr try ts tu u|0 undoj undol una unh unl unlo unm unme uns up ve verb vert vim vimgrepa vi viu vie vm vmapc vme vne vn vnoreme vs vu vunme windo w|0 wN wa wh wi winc winp wn wp wq wqa ws wu wv x|0 xa xmapc xm xme xn xnoreme xu xunme y|0 z|0 ~ Next Print append abbreviate abclear aboveleft all amenu anoremenu args argadd argdelete argedit argglobal arglocal argument ascii autocmd augroup aunmenu buffer bNext ball badd bdelete behave belowright bfirst blast bmodified bnext botright bprevious brewind break breakadd breakdel breaklist browse bunload bwipeout change cNext cNfile cabbrev cabclear caddbuffer caddexpr caddfile call catch cbuffer cclose center cexpr cfile cfirst cgetbuffer cgetexpr cgetfile chdir checkpath checktime clist clast close cmap cmapclear cmenu cnext cnewer cnfile cnoremap cnoreabbrev cnoremenu copy colder colorscheme command comclear compiler continue confirm copen cprevious cpfile cquit crewind cscope cstag cunmap cunabbrev cunmenu cwindow delete delmarks debug debuggreedy delcommand delfunction diffupdate diffget diffoff diffpatch diffput diffsplit digraphs display deletel djump dlist doautocmd doautoall deletep drop dsearch dsplit edit earlier echo echoerr echohl echomsg else elseif emenu endif endfor endfunction endtry endwhile enew execute exit exusage file filetype find finally finish first fixdel fold foldclose folddoopen folddoclosed foldopen function global goto grep grepadd gui gvim hardcopy help helpfind helpgrep helptags highlight hide history insert iabbrev iabclear ijump ilist imap imapclear imenu inoremap inoreabbrev inoremenu intro isearch isplit iunmap iunabbrev iunmenu join jumps keepalt keepmarks keepjumps lNext lNfile list laddexpr laddbuffer laddfile last language later lbuffer lcd lchdir lclose lcscope left leftabove lexpr lfile lfirst lgetbuffer lgetexpr lgetfile lgrep lgrepadd lhelpgrep llast llist lmake lmap lmapclear lnext lnewer lnfile lnoremap loadkeymap loadview lockmarks lockvar lolder lopen lprevious lpfile lrewind ltag lunmap luado luafile lvimgrep lvimgrepadd lwindow move mark make mapclear match menu menutranslate messages mkexrc mksession mkspell mkvimrc mkview mode mzscheme mzfile nbclose nbkey nbsart next nmap nmapclear nmenu nnoremap nnoremenu noautocmd noremap nohlsearch noreabbrev noremenu normal number nunmap nunmenu oldfiles open omap omapclear omenu only onoremap onoremenu options ounmap ounmenu ownsyntax print profdel profile promptfind promptrepl pclose pedit perl perldo pop popup ppop preserve previous psearch ptag ptNext ptfirst ptjump ptlast ptnext ptprevious ptrewind ptselect put pwd py3do py3file python pydo pyfile quit quitall qall read recover redo redir redraw redrawstatus registers resize retab return rewind right rightbelow ruby rubydo rubyfile rundo runtime rviminfo substitute sNext sandbox sargument sall saveas sbuffer sbNext sball sbfirst sblast sbmodified sbnext sbprevious sbrewind scriptnames scriptencoding scscope set setfiletype setglobal setlocal sfind sfirst shell simalt sign silent sleep slast smagic smapclear smenu snext sniff snomagic snoremap snoremenu sort source spelldump spellgood spellinfo spellrepall spellundo spellwrong split sprevious srewind stop stag startgreplace startreplace startinsert stopinsert stjump stselect sunhide sunmap sunmenu suspend sview swapname syntax syntime syncbind tNext tabNext tabclose tabedit tabfind tabfirst tablast tabmove tabnext tabonly tabprevious tabrewind tag tcl tcldo tclfile tearoff tfirst throw tjump tlast tmenu tnext topleft tprevious trewind tselect tunmenu undo undojoin undolist unabbreviate unhide unlet unlockvar unmap unmenu unsilent update vglobal version verbose vertical vimgrep vimgrepadd visual viusage view vmap vmapclear vmenu vnew vnoremap vnoremenu vsplit vunmap vunmenu write wNext wall while winsize wincmd winpos wnext wprevious wqall wsverb wundo wviminfo xit xall xmapclear xmap xmenu xnoremap xnoremenu xunmap xunmenu yank",built_in:"synIDtrans atan2 range matcharg did_filetype asin feedkeys xor argv complete_check add getwinposx getqflist getwinposy screencol clearmatches empty extend getcmdpos mzeval garbagecollect setreg ceil sqrt diff_hlID inputsecret get getfperm getpid filewritable shiftwidth max sinh isdirectory synID system inputrestore winline atan visualmode inputlist tabpagewinnr round getregtype mapcheck hasmapto histdel argidx findfile sha256 exists toupper getcmdline taglist string getmatches bufnr strftime winwidth bufexists strtrans tabpagebuflist setcmdpos remote_read printf setloclist getpos getline bufwinnr float2nr len getcmdtype diff_filler luaeval resolve libcallnr foldclosedend reverse filter has_key bufname str2float strlen setline getcharmod setbufvar index searchpos shellescape undofile foldclosed setqflist buflisted strchars str2nr virtcol floor remove undotree remote_expr winheight gettabwinvar reltime cursor tabpagenr finddir localtime acos getloclist search tanh matchend rename gettabvar strdisplaywidth type abs py3eval setwinvar tolower wildmenumode log10 spellsuggest bufloaded synconcealed nextnonblank server2client complete settabwinvar executable input wincol setmatches getftype hlID inputsave searchpair or screenrow line settabvar histadd deepcopy strpart remote_peek and eval getftime submatch screenchar winsaveview matchadd mkdir screenattr getfontname libcall reltimestr getfsize winnr invert pow getbufline byte2line soundfold repeat fnameescape tagfiles sin strwidth spellbadword trunc maparg log lispindent hostname setpos globpath remote_foreground getchar synIDattr fnamemodify cscope_connection stridx winbufnr indent min complete_add nr2char searchpairpos inputdialog values matchlist items hlexists strridx browsedir expand fmod pathshorten line2byte argc count getwinvar glob foldtextresult getreg foreground cosh matchdelete has char2nr simplify histget searchdecl iconv winrestcmd pumvisible writefile foldlevel haslocaldir keys cos matchstr foldtext histnr tan tempname getcwd byteidx getbufvar islocked escape eventhandler remote_send serverlist winrestview synstack pyeval prevnonblank readfile cindent filereadable changenr exp"},i:/;/,c:[e.NM,{cN:"string",b:"'",e:"'",i:"\\n"},{cN:"string",b:/"(\\"|\n\\|[^"\n])*"/},e.C('"',"$"),{cN:"variable",b:/[bwtglsav]:[\w\d_]*/},{cN:"function",bK:"function function!",e:"$",relevance:0,c:[e.TM,{cN:"params",b:"\\(",e:"\\)"}]},{cN:"symbol",b:/<[\w-]+>/}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/x86asm.min.js b/vendor/assets/javascripts/highlightjs/languages/x86asm.min.js
index f062a8f340..e2cdfb736d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/x86asm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/x86asm.min.js
@@ -1 +1 @@
-hljs.registerLanguage("x86asm",function(){"use strict";return function(s){return{name:"Intel x86 Assembly",case_insensitive:!0,keywords:{$pattern:"[.%]?"+s.IDENT_RE,keyword:"lock rep repe repz repne repnz xaquire xrelease bnd nobnd aaa aad aam aas adc add and arpl bb0_reset bb1_reset bound bsf bsr bswap bt btc btr bts call cbw cdq cdqe clc cld cli clts cmc cmp cmpsb cmpsd cmpsq cmpsw cmpxchg cmpxchg486 cmpxchg8b cmpxchg16b cpuid cpu_read cpu_write cqo cwd cwde daa das dec div dmint emms enter equ f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcmovb fcmovbe fcmove fcmovnb fcmovnbe fcmovne fcmovnu fcmovu fcom fcomi fcomip fcomp fcompp fcos fdecstp fdisi fdiv fdivp fdivr fdivrp femms feni ffree ffreep fiadd ficom ficomp fidiv fidivr fild fimul fincstp finit fist fistp fisttp fisub fisubr fld fld1 fldcw fldenv fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul fmulp fnclex fndisi fneni fninit fnop fnsave fnstcw fnstenv fnstsw fpatan fprem fprem1 fptan frndint frstor fsave fscale fsetpm fsin fsincos fsqrt fst fstcw fstenv fstp fstsw fsub fsubp fsubr fsubrp ftst fucom fucomi fucomip fucomp fucompp fxam fxch fxtract fyl2x fyl2xp1 hlt ibts icebp idiv imul in inc incbin insb insd insw int int01 int1 int03 int3 into invd invpcid invlpg invlpga iret iretd iretq iretw jcxz jecxz jrcxz jmp jmpe lahf lar lds lea leave les lfence lfs lgdt lgs lidt lldt lmsw loadall loadall286 lodsb lodsd lodsq lodsw loop loope loopne loopnz loopz lsl lss ltr mfence monitor mov movd movq movsb movsd movsq movsw movsx movsxd movzx mul mwait neg nop not or out outsb outsd outsw packssdw packsswb packuswb paddb paddd paddsb paddsiw paddsw paddusb paddusw paddw pand pandn pause paveb pavgusb pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw pdistib pf2id pfacc pfadd pfcmpeq pfcmpge pfcmpgt pfmax pfmin pfmul pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt pfsub pfsubr pi2fd pmachriw pmaddwd pmagw pmulhriw pmulhrwa pmulhrwc pmulhw pmullw pmvgezb pmvlzb pmvnzb pmvzb pop popa popad popaw popf popfd popfq popfw por prefetch prefetchw pslld psllq psllw psrad psraw psrld psrlq psrlw psubb psubd psubsb psubsiw psubsw psubusb psubusw psubw punpckhbw punpckhdq punpckhwd punpcklbw punpckldq punpcklwd push pusha pushad pushaw pushf pushfd pushfq pushfw pxor rcl rcr rdshr rdmsr rdpmc rdtsc rdtscp ret retf retn rol ror rdm rsdc rsldt rsm rsts sahf sal salc sar sbb scasb scasd scasq scasw sfence sgdt shl shld shr shrd sidt sldt skinit smi smint smintold smsw stc std sti stosb stosd stosq stosw str sub svdc svldt svts swapgs syscall sysenter sysexit sysret test ud0 ud1 ud2b ud2 ud2a umov verr verw fwait wbinvd wrshr wrmsr xadd xbts xchg xlatb xlat xor cmove cmovz cmovne cmovnz cmova cmovnbe cmovae cmovnb cmovb cmovnae cmovbe cmovna cmovg cmovnle cmovge cmovnl cmovl cmovnge cmovle cmovng cmovc cmovnc cmovo cmovno cmovs cmovns cmovp cmovpe cmovnp cmovpo je jz jne jnz ja jnbe jae jnb jb jnae jbe jna jg jnle jge jnl jl jnge jle jng jc jnc jo jno js jns jpo jnp jpe jp sete setz setne setnz seta setnbe setae setnb setnc setb setnae setcset setbe setna setg setnle setge setnl setl setnge setle setng sets setns seto setno setpe setp setpo setnp addps addss andnps andps cmpeqps cmpeqss cmpleps cmpless cmpltps cmpltss cmpneqps cmpneqss cmpnleps cmpnless cmpnltps cmpnltss cmpordps cmpordss cmpunordps cmpunordss cmpps cmpss comiss cvtpi2ps cvtps2pi cvtsi2ss cvtss2si cvttps2pi cvttss2si divps divss ldmxcsr maxps maxss minps minss movaps movhps movlhps movlps movhlps movmskps movntps movss movups mulps mulss orps rcpps rcpss rsqrtps rsqrtss shufps sqrtps sqrtss stmxcsr subps subss ucomiss unpckhps unpcklps xorps fxrstor fxrstor64 fxsave fxsave64 xgetbv xsetbv xsave xsave64 xsaveopt xsaveopt64 xrstor xrstor64 prefetchnta prefetcht0 prefetcht1 prefetcht2 maskmovq movntq pavgb pavgw pextrw pinsrw pmaxsw pmaxub pminsw pminub pmovmskb pmulhuw psadbw pshufw pf2iw pfnacc pfpnacc pi2fw pswapd maskmovdqu clflush movntdq movnti movntpd movdqa movdqu movdq2q movq2dq paddq pmuludq pshufd pshufhw pshuflw pslldq psrldq psubq punpckhqdq punpcklqdq addpd addsd andnpd andpd cmpeqpd cmpeqsd cmplepd cmplesd cmpltpd cmpltsd cmpneqpd cmpneqsd cmpnlepd cmpnlesd cmpnltpd cmpnltsd cmpordpd cmpordsd cmpunordpd cmpunordsd cmppd comisd cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi cvtpd2ps cvtpi2pd cvtps2dq cvtps2pd cvtsd2si cvtsd2ss cvtsi2sd cvtss2sd cvttpd2pi cvttpd2dq cvttps2dq cvttsd2si divpd divsd maxpd maxsd minpd minsd movapd movhpd movlpd movmskpd movupd mulpd mulsd orpd shufpd sqrtpd sqrtsd subpd subsd ucomisd unpckhpd unpcklpd xorpd addsubpd addsubps haddpd haddps hsubpd hsubps lddqu movddup movshdup movsldup clgi stgi vmcall vmclear vmfunc vmlaunch vmload vmmcall vmptrld vmptrst vmread vmresume vmrun vmsave vmwrite vmxoff vmxon invept invvpid pabsb pabsw pabsd palignr phaddw phaddd phaddsw phsubw phsubd phsubsw pmaddubsw pmulhrsw pshufb psignb psignw psignd extrq insertq movntsd movntss lzcnt blendpd blendps blendvpd blendvps dppd dpps extractps insertps movntdqa mpsadbw packusdw pblendvb pblendw pcmpeqq pextrb pextrd pextrq phminposuw pinsrb pinsrd pinsrq pmaxsb pmaxsd pmaxud pmaxuw pminsb pminsd pminud pminuw pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq pmuldq pmulld ptest roundpd roundps roundsd roundss crc32 pcmpestri pcmpestrm pcmpistri pcmpistrm pcmpgtq popcnt getsec pfrcpv pfrsqrtv movbe aesenc aesenclast aesdec aesdeclast aesimc aeskeygenassist vaesenc vaesenclast vaesdec vaesdeclast vaesimc vaeskeygenassist vaddpd vaddps vaddsd vaddss vaddsubpd vaddsubps vandpd vandps vandnpd vandnps vblendpd vblendps vblendvpd vblendvps vbroadcastss vbroadcastsd vbroadcastf128 vcmpeq_ospd vcmpeqpd vcmplt_ospd vcmpltpd vcmple_ospd vcmplepd vcmpunord_qpd vcmpunordpd vcmpneq_uqpd vcmpneqpd vcmpnlt_uspd vcmpnltpd vcmpnle_uspd vcmpnlepd vcmpord_qpd vcmpordpd vcmpeq_uqpd vcmpnge_uspd vcmpngepd vcmpngt_uspd vcmpngtpd vcmpfalse_oqpd vcmpfalsepd vcmpneq_oqpd vcmpge_ospd vcmpgepd vcmpgt_ospd vcmpgtpd vcmptrue_uqpd vcmptruepd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd vcmppd vcmpeq_osps vcmpeqps vcmplt_osps vcmpltps vcmple_osps vcmpleps vcmpunord_qps vcmpunordps vcmpneq_uqps vcmpneqps vcmpnlt_usps vcmpnltps vcmpnle_usps vcmpnleps vcmpord_qps vcmpordps vcmpeq_uqps vcmpnge_usps vcmpngeps vcmpngt_usps vcmpngtps vcmpfalse_oqps vcmpfalseps vcmpneq_oqps vcmpge_osps vcmpgeps vcmpgt_osps vcmpgtps vcmptrue_uqps vcmptrueps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps vcmpps vcmpeq_ossd vcmpeqsd vcmplt_ossd vcmpltsd vcmple_ossd vcmplesd vcmpunord_qsd vcmpunordsd vcmpneq_uqsd vcmpneqsd vcmpnlt_ussd vcmpnltsd vcmpnle_ussd vcmpnlesd vcmpord_qsd vcmpordsd vcmpeq_uqsd vcmpnge_ussd vcmpngesd vcmpngt_ussd vcmpngtsd vcmpfalse_oqsd vcmpfalsesd vcmpneq_oqsd vcmpge_ossd vcmpgesd vcmpgt_ossd vcmpgtsd vcmptrue_uqsd vcmptruesd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd vcmpsd vcmpeq_osss vcmpeqss vcmplt_osss vcmpltss vcmple_osss vcmpless vcmpunord_qss vcmpunordss vcmpneq_uqss vcmpneqss vcmpnlt_usss vcmpnltss vcmpnle_usss vcmpnless vcmpord_qss vcmpordss vcmpeq_uqss vcmpnge_usss vcmpngess vcmpngt_usss vcmpngtss vcmpfalse_oqss vcmpfalsess vcmpneq_oqss vcmpge_osss vcmpgess vcmpgt_osss vcmpgtss vcmptrue_uqss vcmptruess vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss vcmpss vcomisd vcomiss vcvtdq2pd vcvtdq2ps vcvtpd2dq vcvtpd2ps vcvtps2dq vcvtps2pd vcvtsd2si vcvtsd2ss vcvtsi2sd vcvtsi2ss vcvtss2sd vcvtss2si vcvttpd2dq vcvttps2dq vcvttsd2si vcvttss2si vdivpd vdivps vdivsd vdivss vdppd vdpps vextractf128 vextractps vhaddpd vhaddps vhsubpd vhsubps vinsertf128 vinsertps vlddqu vldqqu vldmxcsr vmaskmovdqu vmaskmovps vmaskmovpd vmaxpd vmaxps vmaxsd vmaxss vminpd vminps vminsd vminss vmovapd vmovaps vmovd vmovq vmovddup vmovdqa vmovqqa vmovdqu vmovqqu vmovhlps vmovhpd vmovhps vmovlhps vmovlpd vmovlps vmovmskpd vmovmskps vmovntdq vmovntqq vmovntdqa vmovntpd vmovntps vmovsd vmovshdup vmovsldup vmovss vmovupd vmovups vmpsadbw vmulpd vmulps vmulsd vmulss vorpd vorps vpabsb vpabsw vpabsd vpacksswb vpackssdw vpackuswb vpackusdw vpaddb vpaddw vpaddd vpaddq vpaddsb vpaddsw vpaddusb vpaddusw vpalignr vpand vpandn vpavgb vpavgw vpblendvb vpblendw vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq vpermilpd vpermilps vperm2f128 vpextrb vpextrw vpextrd vpextrq vphaddw vphaddd vphaddsw vphminposuw vphsubw vphsubd vphsubsw vpinsrb vpinsrw vpinsrd vpinsrq vpmaddwd vpmaddubsw vpmaxsb vpmaxsw vpmaxsd vpmaxub vpmaxuw vpmaxud vpminsb vpminsw vpminsd vpminub vpminuw vpminud vpmovmskb vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq vpmulhuw vpmulhrsw vpmulhw vpmullw vpmulld vpmuludq vpmuldq vpor vpsadbw vpshufb vpshufd vpshufhw vpshuflw vpsignb vpsignw vpsignd vpslldq vpsrldq vpsllw vpslld vpsllq vpsraw vpsrad vpsrlw vpsrld vpsrlq vptest vpsubb vpsubw vpsubd vpsubq vpsubsb vpsubsw vpsubusb vpsubusw vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq vpxor vrcpps vrcpss vrsqrtps vrsqrtss vroundpd vroundps vroundsd vroundss vshufpd vshufps vsqrtpd vsqrtps vsqrtsd vsqrtss vstmxcsr vsubpd vsubps vsubsd vsubss vtestps vtestpd vucomisd vucomiss vunpckhpd vunpckhps vunpcklpd vunpcklps vxorpd vxorps vzeroall vzeroupper pclmullqlqdq pclmulhqlqdq pclmullqhqdq pclmulhqhqdq pclmulqdq vpclmullqlqdq vpclmulhqlqdq vpclmullqhqdq vpclmulhqhqdq vpclmulqdq vfmadd132ps vfmadd132pd vfmadd312ps vfmadd312pd vfmadd213ps vfmadd213pd vfmadd123ps vfmadd123pd vfmadd231ps vfmadd231pd vfmadd321ps vfmadd321pd vfmaddsub132ps vfmaddsub132pd vfmaddsub312ps vfmaddsub312pd vfmaddsub213ps vfmaddsub213pd vfmaddsub123ps vfmaddsub123pd vfmaddsub231ps vfmaddsub231pd vfmaddsub321ps vfmaddsub321pd vfmsub132ps vfmsub132pd vfmsub312ps vfmsub312pd vfmsub213ps vfmsub213pd vfmsub123ps vfmsub123pd vfmsub231ps vfmsub231pd vfmsub321ps vfmsub321pd vfmsubadd132ps vfmsubadd132pd vfmsubadd312ps vfmsubadd312pd vfmsubadd213ps vfmsubadd213pd vfmsubadd123ps vfmsubadd123pd vfmsubadd231ps vfmsubadd231pd vfmsubadd321ps vfmsubadd321pd vfnmadd132ps vfnmadd132pd vfnmadd312ps vfnmadd312pd vfnmadd213ps vfnmadd213pd vfnmadd123ps vfnmadd123pd vfnmadd231ps vfnmadd231pd vfnmadd321ps vfnmadd321pd vfnmsub132ps vfnmsub132pd vfnmsub312ps vfnmsub312pd vfnmsub213ps vfnmsub213pd vfnmsub123ps vfnmsub123pd vfnmsub231ps vfnmsub231pd vfnmsub321ps vfnmsub321pd vfmadd132ss vfmadd132sd vfmadd312ss vfmadd312sd vfmadd213ss vfmadd213sd vfmadd123ss vfmadd123sd vfmadd231ss vfmadd231sd vfmadd321ss vfmadd321sd vfmsub132ss vfmsub132sd vfmsub312ss vfmsub312sd vfmsub213ss vfmsub213sd vfmsub123ss vfmsub123sd vfmsub231ss vfmsub231sd vfmsub321ss vfmsub321sd vfnmadd132ss vfnmadd132sd vfnmadd312ss vfnmadd312sd vfnmadd213ss vfnmadd213sd vfnmadd123ss vfnmadd123sd vfnmadd231ss vfnmadd231sd vfnmadd321ss vfnmadd321sd vfnmsub132ss vfnmsub132sd vfnmsub312ss vfnmsub312sd vfnmsub213ss vfnmsub213sd vfnmsub123ss vfnmsub123sd vfnmsub231ss vfnmsub231sd vfnmsub321ss vfnmsub321sd rdfsbase rdgsbase rdrand wrfsbase wrgsbase vcvtph2ps vcvtps2ph adcx adox rdseed clac stac xstore xcryptecb xcryptcbc xcryptctr xcryptcfb xcryptofb montmul xsha1 xsha256 llwpcb slwpcb lwpval lwpins vfmaddpd vfmaddps vfmaddsd vfmaddss vfmaddsubpd vfmaddsubps vfmsubaddpd vfmsubaddps vfmsubpd vfmsubps vfmsubsd vfmsubss vfnmaddpd vfnmaddps vfnmaddsd vfnmaddss vfnmsubpd vfnmsubps vfnmsubsd vfnmsubss vfrczpd vfrczps vfrczsd vfrczss vpcmov vpcomb vpcomd vpcomq vpcomub vpcomud vpcomuq vpcomuw vpcomw vphaddbd vphaddbq vphaddbw vphadddq vphaddubd vphaddubq vphaddubw vphaddudq vphadduwd vphadduwq vphaddwd vphaddwq vphsubbw vphsubdq vphsubwd vpmacsdd vpmacsdqh vpmacsdql vpmacssdd vpmacssdqh vpmacssdql vpmacsswd vpmacssww vpmacswd vpmacsww vpmadcsswd vpmadcswd vpperm vprotb vprotd vprotq vprotw vpshab vpshad vpshaq vpshaw vpshlb vpshld vpshlq vpshlw vbroadcasti128 vpblendd vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq vpermd vpermpd vpermps vpermq vperm2i128 vextracti128 vinserti128 vpmaskmovd vpmaskmovq vpsllvd vpsllvq vpsravd vpsrlvd vpsrlvq vgatherdpd vgatherqpd vgatherdps vgatherqps vpgatherdd vpgatherqd vpgatherdq vpgatherqq xabort xbegin xend xtest andn bextr blci blcic blsi blsic blcfill blsfill blcmsk blsmsk blsr blcs bzhi mulx pdep pext rorx sarx shlx shrx tzcnt tzmsk t1mskc valignd valignq vblendmpd vblendmps vbroadcastf32x4 vbroadcastf64x4 vbroadcasti32x4 vbroadcasti64x4 vcompresspd vcompressps vcvtpd2udq vcvtps2udq vcvtsd2usi vcvtss2usi vcvttpd2udq vcvttps2udq vcvttsd2usi vcvttss2usi vcvtudq2pd vcvtudq2ps vcvtusi2sd vcvtusi2ss vexpandpd vexpandps vextractf32x4 vextractf64x4 vextracti32x4 vextracti64x4 vfixupimmpd vfixupimmps vfixupimmsd vfixupimmss vgetexppd vgetexpps vgetexpsd vgetexpss vgetmantpd vgetmantps vgetmantsd vgetmantss vinsertf32x4 vinsertf64x4 vinserti32x4 vinserti64x4 vmovdqa32 vmovdqa64 vmovdqu32 vmovdqu64 vpabsq vpandd vpandnd vpandnq vpandq vpblendmd vpblendmq vpcmpltd vpcmpled vpcmpneqd vpcmpnltd vpcmpnled vpcmpd vpcmpltq vpcmpleq vpcmpneqq vpcmpnltq vpcmpnleq vpcmpq vpcmpequd vpcmpltud vpcmpleud vpcmpnequd vpcmpnltud vpcmpnleud vpcmpud vpcmpequq vpcmpltuq vpcmpleuq vpcmpnequq vpcmpnltuq vpcmpnleuq vpcmpuq vpcompressd vpcompressq vpermi2d vpermi2pd vpermi2ps vpermi2q vpermt2d vpermt2pd vpermt2ps vpermt2q vpexpandd vpexpandq vpmaxsq vpmaxuq vpminsq vpminuq vpmovdb vpmovdw vpmovqb vpmovqd vpmovqw vpmovsdb vpmovsdw vpmovsqb vpmovsqd vpmovsqw vpmovusdb vpmovusdw vpmovusqb vpmovusqd vpmovusqw vpord vporq vprold vprolq vprolvd vprolvq vprord vprorq vprorvd vprorvq vpscatterdd vpscatterdq vpscatterqd vpscatterqq vpsraq vpsravq vpternlogd vpternlogq vptestmd vptestmq vptestnmd vptestnmq vpxord vpxorq vrcp14pd vrcp14ps vrcp14sd vrcp14ss vrndscalepd vrndscaleps vrndscalesd vrndscaless vrsqrt14pd vrsqrt14ps vrsqrt14sd vrsqrt14ss vscalefpd vscalefps vscalefsd vscalefss vscatterdpd vscatterdps vscatterqpd vscatterqps vshuff32x4 vshuff64x2 vshufi32x4 vshufi64x2 kandnw kandw kmovw knotw kortestw korw kshiftlw kshiftrw kunpckbw kxnorw kxorw vpbroadcastmb2q vpbroadcastmw2d vpconflictd vpconflictq vplzcntd vplzcntq vexp2pd vexp2ps vrcp28pd vrcp28ps vrcp28sd vrcp28ss vrsqrt28pd vrsqrt28ps vrsqrt28sd vrsqrt28ss vgatherpf0dpd vgatherpf0dps vgatherpf0qpd vgatherpf0qps vgatherpf1dpd vgatherpf1dps vgatherpf1qpd vgatherpf1qps vscatterpf0dpd vscatterpf0dps vscatterpf0qpd vscatterpf0qps vscatterpf1dpd vscatterpf1dps vscatterpf1qpd vscatterpf1qps prefetchwt1 bndmk bndcl bndcu bndcn bndmov bndldx bndstx sha1rnds4 sha1nexte sha1msg1 sha1msg2 sha256rnds2 sha256msg1 sha256msg2 hint_nop0 hint_nop1 hint_nop2 hint_nop3 hint_nop4 hint_nop5 hint_nop6 hint_nop7 hint_nop8 hint_nop9 hint_nop10 hint_nop11 hint_nop12 hint_nop13 hint_nop14 hint_nop15 hint_nop16 hint_nop17 hint_nop18 hint_nop19 hint_nop20 hint_nop21 hint_nop22 hint_nop23 hint_nop24 hint_nop25 hint_nop26 hint_nop27 hint_nop28 hint_nop29 hint_nop30 hint_nop31 hint_nop32 hint_nop33 hint_nop34 hint_nop35 hint_nop36 hint_nop37 hint_nop38 hint_nop39 hint_nop40 hint_nop41 hint_nop42 hint_nop43 hint_nop44 hint_nop45 hint_nop46 hint_nop47 hint_nop48 hint_nop49 hint_nop50 hint_nop51 hint_nop52 hint_nop53 hint_nop54 hint_nop55 hint_nop56 hint_nop57 hint_nop58 hint_nop59 hint_nop60 hint_nop61 hint_nop62 hint_nop63",built_in:"ip eip rip al ah bl bh cl ch dl dh sil dil bpl spl r8b r9b r10b r11b r12b r13b r14b r15b ax bx cx dx si di bp sp r8w r9w r10w r11w r12w r13w r14w r15w eax ebx ecx edx esi edi ebp esp eip r8d r9d r10d r11d r12d r13d r14d r15d rax rbx rcx rdx rsi rdi rbp rsp r8 r9 r10 r11 r12 r13 r14 r15 cs ds es fs gs ss st st0 st1 st2 st3 st4 st5 st6 st7 mm0 mm1 mm2 mm3 mm4 mm5 mm6 mm7 xmm0  xmm1  xmm2  xmm3  xmm4  xmm5  xmm6  xmm7  xmm8  xmm9 xmm10  xmm11 xmm12 xmm13 xmm14 xmm15 xmm16 xmm17 xmm18 xmm19 xmm20 xmm21 xmm22 xmm23 xmm24 xmm25 xmm26 xmm27 xmm28 xmm29 xmm30 xmm31 ymm0  ymm1  ymm2  ymm3  ymm4  ymm5  ymm6  ymm7  ymm8  ymm9 ymm10  ymm11 ymm12 ymm13 ymm14 ymm15 ymm16 ymm17 ymm18 ymm19 ymm20 ymm21 ymm22 ymm23 ymm24 ymm25 ymm26 ymm27 ymm28 ymm29 ymm30 ymm31 zmm0  zmm1  zmm2  zmm3  zmm4  zmm5  zmm6  zmm7  zmm8  zmm9 zmm10  zmm11 zmm12 zmm13 zmm14 zmm15 zmm16 zmm17 zmm18 zmm19 zmm20 zmm21 zmm22 zmm23 zmm24 zmm25 zmm26 zmm27 zmm28 zmm29 zmm30 zmm31 k0 k1 k2 k3 k4 k5 k6 k7 bnd0 bnd1 bnd2 bnd3 cr0 cr1 cr2 cr3 cr4 cr8 dr0 dr1 dr2 dr3 dr8 tr3 tr4 tr5 tr6 tr7 r0 r1 r2 r3 r4 r5 r6 r7 r0b r1b r2b r3b r4b r5b r6b r7b r0w r1w r2w r3w r4w r5w r6w r7w r0d r1d r2d r3d r4d r5d r6d r7d r0h r1h r2h r3h r0l r1l r2l r3l r4l r5l r6l r7l r8l r9l r10l r11l r12l r13l r14l r15l db dw dd dq dt ddq do dy dz resb resw resd resq rest resdq reso resy resz incbin equ times byte word dword qword nosplit rel abs seg wrt strict near far a32 ptr",meta:"%define %xdefine %+ %undef %defstr %deftok %assign %strcat %strlen %substr %rotate %elif %else %endif %if %ifmacro %ifctx %ifidn %ifidni %ifid %ifnum %ifstr %iftoken %ifempty %ifenv %error %warning %fatal %rep %endrep %include %push %pop %repl %pathsearch %depend %use %arg %stacksize %local %line %comment %endcomment .nolist __FILE__ __LINE__ __SECT__  __BITS__ __OUTPUT_FORMAT__ __DATE__ __TIME__ __DATE_NUM__ __TIME_NUM__ __UTC_DATE__ __UTC_TIME__ __UTC_DATE_NUM__ __UTC_TIME_NUM__  __PASS__ struc endstruc istruc at iend align alignb sectalign daz nodaz up down zero default option assume public bits use16 use32 use64 default section segment absolute extern global common cpu float __utf16__ __utf16le__ __utf16be__ __utf32__ __utf32le__ __utf32be__ __float8__ __float16__ __float32__ __float64__ __float80m__ __float80e__ __float128l__ __float128h__ __Infinity__ __QNaN__ __SNaN__ Inf NaN QNaN SNaN float8 float16 float32 float64 float80m float80e float128l float128h __FLOAT_DAZ__ __FLOAT_ROUND__ __FLOAT__"},contains:[s.COMMENT(";","$",{relevance:0}),{className:"number",variants:[{begin:"\\b(?:([0-9][0-9_]*)?\\.[0-9_]*(?:[eE][+-]?[0-9_]+)?|(0[Xx])?[0-9][0-9_]*\\.?[0-9_]*(?:[pP](?:[+-]?[0-9_]+)?)?)\\b",relevance:0},{begin:"\\$[0-9][0-9A-Fa-f]*",relevance:0},{begin:"\\b(?:[0-9A-Fa-f][0-9A-Fa-f_]*[Hh]|[0-9][0-9_]*[DdTt]?|[0-7][0-7_]*[QqOo]|[0-1][0-1_]*[BbYy])\\b"},{begin:"\\b(?:0[Xx][0-9A-Fa-f_]+|0[DdTt][0-9_]+|0[QqOo][0-7_]+|0[BbYy][0-1_]+)\\b"}]},s.QUOTE_STRING_MODE,{className:"string",variants:[{begin:"'",end:"[^\\\\]'"},{begin:"`",end:"[^\\\\]`"}],relevance:0},{className:"symbol",variants:[{begin:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)"},{begin:"^\\s*%%[A-Za-z0-9_$#@~.?]*:"}],relevance:0},{className:"subst",begin:"%[0-9]+",relevance:0},{className:"subst",begin:"%!S+",relevance:0},{className:"meta",begin:/^\s*\.[\w_-]+/}]}}}());
\ No newline at end of file
+hljs.registerLanguage("x86asm",function(s){return{cI:!0,l:"[.%]?"+s.IR,k:{keyword:"lock rep repe repz repne repnz xaquire xrelease bnd nobnd aaa aad aam aas adc add and arpl bb0_reset bb1_reset bound bsf bsr bswap bt btc btr bts call cbw cdq cdqe clc cld cli clts cmc cmp cmpsb cmpsd cmpsq cmpsw cmpxchg cmpxchg486 cmpxchg8b cmpxchg16b cpuid cpu_read cpu_write cqo cwd cwde daa das dec div dmint emms enter equ f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcmovb fcmovbe fcmove fcmovnb fcmovnbe fcmovne fcmovnu fcmovu fcom fcomi fcomip fcomp fcompp fcos fdecstp fdisi fdiv fdivp fdivr fdivrp femms feni ffree ffreep fiadd ficom ficomp fidiv fidivr fild fimul fincstp finit fist fistp fisttp fisub fisubr fld fld1 fldcw fldenv fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul fmulp fnclex fndisi fneni fninit fnop fnsave fnstcw fnstenv fnstsw fpatan fprem fprem1 fptan frndint frstor fsave fscale fsetpm fsin fsincos fsqrt fst fstcw fstenv fstp fstsw fsub fsubp fsubr fsubrp ftst fucom fucomi fucomip fucomp fucompp fxam fxch fxtract fyl2x fyl2xp1 hlt ibts icebp idiv imul in inc incbin insb insd insw int int01 int1 int03 int3 into invd invpcid invlpg invlpga iret iretd iretq iretw jcxz jecxz jrcxz jmp jmpe lahf lar lds lea leave les lfence lfs lgdt lgs lidt lldt lmsw loadall loadall286 lodsb lodsd lodsq lodsw loop loope loopne loopnz loopz lsl lss ltr mfence monitor mov movd movq movsb movsd movsq movsw movsx movsxd movzx mul mwait neg nop not or out outsb outsd outsw packssdw packsswb packuswb paddb paddd paddsb paddsiw paddsw paddusb paddusw paddw pand pandn pause paveb pavgusb pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw pdistib pf2id pfacc pfadd pfcmpeq pfcmpge pfcmpgt pfmax pfmin pfmul pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt pfsub pfsubr pi2fd pmachriw pmaddwd pmagw pmulhriw pmulhrwa pmulhrwc pmulhw pmullw pmvgezb pmvlzb pmvnzb pmvzb pop popa popad popaw popf popfd popfq popfw por prefetch prefetchw pslld psllq psllw psrad psraw psrld psrlq psrlw psubb psubd psubsb psubsiw psubsw psubusb psubusw psubw punpckhbw punpckhdq punpckhwd punpcklbw punpckldq punpcklwd push pusha pushad pushaw pushf pushfd pushfq pushfw pxor rcl rcr rdshr rdmsr rdpmc rdtsc rdtscp ret retf retn rol ror rdm rsdc rsldt rsm rsts sahf sal salc sar sbb scasb scasd scasq scasw sfence sgdt shl shld shr shrd sidt sldt skinit smi smint smintold smsw stc std sti stosb stosd stosq stosw str sub svdc svldt svts swapgs syscall sysenter sysexit sysret test ud0 ud1 ud2b ud2 ud2a umov verr verw fwait wbinvd wrshr wrmsr xadd xbts xchg xlatb xlat xor cmove cmovz cmovne cmovnz cmova cmovnbe cmovae cmovnb cmovb cmovnae cmovbe cmovna cmovg cmovnle cmovge cmovnl cmovl cmovnge cmovle cmovng cmovc cmovnc cmovo cmovno cmovs cmovns cmovp cmovpe cmovnp cmovpo je jz jne jnz ja jnbe jae jnb jb jnae jbe jna jg jnle jge jnl jl jnge jle jng jc jnc jo jno js jns jpo jnp jpe jp sete setz setne setnz seta setnbe setae setnb setnc setb setnae setcset setbe setna setg setnle setge setnl setl setnge setle setng sets setns seto setno setpe setp setpo setnp addps addss andnps andps cmpeqps cmpeqss cmpleps cmpless cmpltps cmpltss cmpneqps cmpneqss cmpnleps cmpnless cmpnltps cmpnltss cmpordps cmpordss cmpunordps cmpunordss cmpps cmpss comiss cvtpi2ps cvtps2pi cvtsi2ss cvtss2si cvttps2pi cvttss2si divps divss ldmxcsr maxps maxss minps minss movaps movhps movlhps movlps movhlps movmskps movntps movss movups mulps mulss orps rcpps rcpss rsqrtps rsqrtss shufps sqrtps sqrtss stmxcsr subps subss ucomiss unpckhps unpcklps xorps fxrstor fxrstor64 fxsave fxsave64 xgetbv xsetbv xsave xsave64 xsaveopt xsaveopt64 xrstor xrstor64 prefetchnta prefetcht0 prefetcht1 prefetcht2 maskmovq movntq pavgb pavgw pextrw pinsrw pmaxsw pmaxub pminsw pminub pmovmskb pmulhuw psadbw pshufw pf2iw pfnacc pfpnacc pi2fw pswapd maskmovdqu clflush movntdq movnti movntpd movdqa movdqu movdq2q movq2dq paddq pmuludq pshufd pshufhw pshuflw pslldq psrldq psubq punpckhqdq punpcklqdq addpd addsd andnpd andpd cmpeqpd cmpeqsd cmplepd cmplesd cmpltpd cmpltsd cmpneqpd cmpneqsd cmpnlepd cmpnlesd cmpnltpd cmpnltsd cmpordpd cmpordsd cmpunordpd cmpunordsd cmppd comisd cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi cvtpd2ps cvtpi2pd cvtps2dq cvtps2pd cvtsd2si cvtsd2ss cvtsi2sd cvtss2sd cvttpd2pi cvttpd2dq cvttps2dq cvttsd2si divpd divsd maxpd maxsd minpd minsd movapd movhpd movlpd movmskpd movupd mulpd mulsd orpd shufpd sqrtpd sqrtsd subpd subsd ucomisd unpckhpd unpcklpd xorpd addsubpd addsubps haddpd haddps hsubpd hsubps lddqu movddup movshdup movsldup clgi stgi vmcall vmclear vmfunc vmlaunch vmload vmmcall vmptrld vmptrst vmread vmresume vmrun vmsave vmwrite vmxoff vmxon invept invvpid pabsb pabsw pabsd palignr phaddw phaddd phaddsw phsubw phsubd phsubsw pmaddubsw pmulhrsw pshufb psignb psignw psignd extrq insertq movntsd movntss lzcnt blendpd blendps blendvpd blendvps dppd dpps extractps insertps movntdqa mpsadbw packusdw pblendvb pblendw pcmpeqq pextrb pextrd pextrq phminposuw pinsrb pinsrd pinsrq pmaxsb pmaxsd pmaxud pmaxuw pminsb pminsd pminud pminuw pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq pmuldq pmulld ptest roundpd roundps roundsd roundss crc32 pcmpestri pcmpestrm pcmpistri pcmpistrm pcmpgtq popcnt getsec pfrcpv pfrsqrtv movbe aesenc aesenclast aesdec aesdeclast aesimc aeskeygenassist vaesenc vaesenclast vaesdec vaesdeclast vaesimc vaeskeygenassist vaddpd vaddps vaddsd vaddss vaddsubpd vaddsubps vandpd vandps vandnpd vandnps vblendpd vblendps vblendvpd vblendvps vbroadcastss vbroadcastsd vbroadcastf128 vcmpeq_ospd vcmpeqpd vcmplt_ospd vcmpltpd vcmple_ospd vcmplepd vcmpunord_qpd vcmpunordpd vcmpneq_uqpd vcmpneqpd vcmpnlt_uspd vcmpnltpd vcmpnle_uspd vcmpnlepd vcmpord_qpd vcmpordpd vcmpeq_uqpd vcmpnge_uspd vcmpngepd vcmpngt_uspd vcmpngtpd vcmpfalse_oqpd vcmpfalsepd vcmpneq_oqpd vcmpge_ospd vcmpgepd vcmpgt_ospd vcmpgtpd vcmptrue_uqpd vcmptruepd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd vcmppd vcmpeq_osps vcmpeqps vcmplt_osps vcmpltps vcmple_osps vcmpleps vcmpunord_qps vcmpunordps vcmpneq_uqps vcmpneqps vcmpnlt_usps vcmpnltps vcmpnle_usps vcmpnleps vcmpord_qps vcmpordps vcmpeq_uqps vcmpnge_usps vcmpngeps vcmpngt_usps vcmpngtps vcmpfalse_oqps vcmpfalseps vcmpneq_oqps vcmpge_osps vcmpgeps vcmpgt_osps vcmpgtps vcmptrue_uqps vcmptrueps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps vcmpps vcmpeq_ossd vcmpeqsd vcmplt_ossd vcmpltsd vcmple_ossd vcmplesd vcmpunord_qsd vcmpunordsd vcmpneq_uqsd vcmpneqsd vcmpnlt_ussd vcmpnltsd vcmpnle_ussd vcmpnlesd vcmpord_qsd vcmpordsd vcmpeq_uqsd vcmpnge_ussd vcmpngesd vcmpngt_ussd vcmpngtsd vcmpfalse_oqsd vcmpfalsesd vcmpneq_oqsd vcmpge_ossd vcmpgesd vcmpgt_ossd vcmpgtsd vcmptrue_uqsd vcmptruesd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd vcmpsd vcmpeq_osss vcmpeqss vcmplt_osss vcmpltss vcmple_osss vcmpless vcmpunord_qss vcmpunordss vcmpneq_uqss vcmpneqss vcmpnlt_usss vcmpnltss vcmpnle_usss vcmpnless vcmpord_qss vcmpordss vcmpeq_uqss vcmpnge_usss vcmpngess vcmpngt_usss vcmpngtss vcmpfalse_oqss vcmpfalsess vcmpneq_oqss vcmpge_osss vcmpgess vcmpgt_osss vcmpgtss vcmptrue_uqss vcmptruess vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss vcmpss vcomisd vcomiss vcvtdq2pd vcvtdq2ps vcvtpd2dq vcvtpd2ps vcvtps2dq vcvtps2pd vcvtsd2si vcvtsd2ss vcvtsi2sd vcvtsi2ss vcvtss2sd vcvtss2si vcvttpd2dq vcvttps2dq vcvttsd2si vcvttss2si vdivpd vdivps vdivsd vdivss vdppd vdpps vextractf128 vextractps vhaddpd vhaddps vhsubpd vhsubps vinsertf128 vinsertps vlddqu vldqqu vldmxcsr vmaskmovdqu vmaskmovps vmaskmovpd vmaxpd vmaxps vmaxsd vmaxss vminpd vminps vminsd vminss vmovapd vmovaps vmovd vmovq vmovddup vmovdqa vmovqqa vmovdqu vmovqqu vmovhlps vmovhpd vmovhps vmovlhps vmovlpd vmovlps vmovmskpd vmovmskps vmovntdq vmovntqq vmovntdqa vmovntpd vmovntps vmovsd vmovshdup vmovsldup vmovss vmovupd vmovups vmpsadbw vmulpd vmulps vmulsd vmulss vorpd vorps vpabsb vpabsw vpabsd vpacksswb vpackssdw vpackuswb vpackusdw vpaddb vpaddw vpaddd vpaddq vpaddsb vpaddsw vpaddusb vpaddusw vpalignr vpand vpandn vpavgb vpavgw vpblendvb vpblendw vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq vpermilpd vpermilps vperm2f128 vpextrb vpextrw vpextrd vpextrq vphaddw vphaddd vphaddsw vphminposuw vphsubw vphsubd vphsubsw vpinsrb vpinsrw vpinsrd vpinsrq vpmaddwd vpmaddubsw vpmaxsb vpmaxsw vpmaxsd vpmaxub vpmaxuw vpmaxud vpminsb vpminsw vpminsd vpminub vpminuw vpminud vpmovmskb vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq vpmulhuw vpmulhrsw vpmulhw vpmullw vpmulld vpmuludq vpmuldq vpor vpsadbw vpshufb vpshufd vpshufhw vpshuflw vpsignb vpsignw vpsignd vpslldq vpsrldq vpsllw vpslld vpsllq vpsraw vpsrad vpsrlw vpsrld vpsrlq vptest vpsubb vpsubw vpsubd vpsubq vpsubsb vpsubsw vpsubusb vpsubusw vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq vpxor vrcpps vrcpss vrsqrtps vrsqrtss vroundpd vroundps vroundsd vroundss vshufpd vshufps vsqrtpd vsqrtps vsqrtsd vsqrtss vstmxcsr vsubpd vsubps vsubsd vsubss vtestps vtestpd vucomisd vucomiss vunpckhpd vunpckhps vunpcklpd vunpcklps vxorpd vxorps vzeroall vzeroupper pclmullqlqdq pclmulhqlqdq pclmullqhqdq pclmulhqhqdq pclmulqdq vpclmullqlqdq vpclmulhqlqdq vpclmullqhqdq vpclmulhqhqdq vpclmulqdq vfmadd132ps vfmadd132pd vfmadd312ps vfmadd312pd vfmadd213ps vfmadd213pd vfmadd123ps vfmadd123pd vfmadd231ps vfmadd231pd vfmadd321ps vfmadd321pd vfmaddsub132ps vfmaddsub132pd vfmaddsub312ps vfmaddsub312pd vfmaddsub213ps vfmaddsub213pd vfmaddsub123ps vfmaddsub123pd vfmaddsub231ps vfmaddsub231pd vfmaddsub321ps vfmaddsub321pd vfmsub132ps vfmsub132pd vfmsub312ps vfmsub312pd vfmsub213ps vfmsub213pd vfmsub123ps vfmsub123pd vfmsub231ps vfmsub231pd vfmsub321ps vfmsub321pd vfmsubadd132ps vfmsubadd132pd vfmsubadd312ps vfmsubadd312pd vfmsubadd213ps vfmsubadd213pd vfmsubadd123ps vfmsubadd123pd vfmsubadd231ps vfmsubadd231pd vfmsubadd321ps vfmsubadd321pd vfnmadd132ps vfnmadd132pd vfnmadd312ps vfnmadd312pd vfnmadd213ps vfnmadd213pd vfnmadd123ps vfnmadd123pd vfnmadd231ps vfnmadd231pd vfnmadd321ps vfnmadd321pd vfnmsub132ps vfnmsub132pd vfnmsub312ps vfnmsub312pd vfnmsub213ps vfnmsub213pd vfnmsub123ps vfnmsub123pd vfnmsub231ps vfnmsub231pd vfnmsub321ps vfnmsub321pd vfmadd132ss vfmadd132sd vfmadd312ss vfmadd312sd vfmadd213ss vfmadd213sd vfmadd123ss vfmadd123sd vfmadd231ss vfmadd231sd vfmadd321ss vfmadd321sd vfmsub132ss vfmsub132sd vfmsub312ss vfmsub312sd vfmsub213ss vfmsub213sd vfmsub123ss vfmsub123sd vfmsub231ss vfmsub231sd vfmsub321ss vfmsub321sd vfnmadd132ss vfnmadd132sd vfnmadd312ss vfnmadd312sd vfnmadd213ss vfnmadd213sd vfnmadd123ss vfnmadd123sd vfnmadd231ss vfnmadd231sd vfnmadd321ss vfnmadd321sd vfnmsub132ss vfnmsub132sd vfnmsub312ss vfnmsub312sd vfnmsub213ss vfnmsub213sd vfnmsub123ss vfnmsub123sd vfnmsub231ss vfnmsub231sd vfnmsub321ss vfnmsub321sd rdfsbase rdgsbase rdrand wrfsbase wrgsbase vcvtph2ps vcvtps2ph adcx adox rdseed clac stac xstore xcryptecb xcryptcbc xcryptctr xcryptcfb xcryptofb montmul xsha1 xsha256 llwpcb slwpcb lwpval lwpins vfmaddpd vfmaddps vfmaddsd vfmaddss vfmaddsubpd vfmaddsubps vfmsubaddpd vfmsubaddps vfmsubpd vfmsubps vfmsubsd vfmsubss vfnmaddpd vfnmaddps vfnmaddsd vfnmaddss vfnmsubpd vfnmsubps vfnmsubsd vfnmsubss vfrczpd vfrczps vfrczsd vfrczss vpcmov vpcomb vpcomd vpcomq vpcomub vpcomud vpcomuq vpcomuw vpcomw vphaddbd vphaddbq vphaddbw vphadddq vphaddubd vphaddubq vphaddubw vphaddudq vphadduwd vphadduwq vphaddwd vphaddwq vphsubbw vphsubdq vphsubwd vpmacsdd vpmacsdqh vpmacsdql vpmacssdd vpmacssdqh vpmacssdql vpmacsswd vpmacssww vpmacswd vpmacsww vpmadcsswd vpmadcswd vpperm vprotb vprotd vprotq vprotw vpshab vpshad vpshaq vpshaw vpshlb vpshld vpshlq vpshlw vbroadcasti128 vpblendd vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq vpermd vpermpd vpermps vpermq vperm2i128 vextracti128 vinserti128 vpmaskmovd vpmaskmovq vpsllvd vpsllvq vpsravd vpsrlvd vpsrlvq vgatherdpd vgatherqpd vgatherdps vgatherqps vpgatherdd vpgatherqd vpgatherdq vpgatherqq xabort xbegin xend xtest andn bextr blci blcic blsi blsic blcfill blsfill blcmsk blsmsk blsr blcs bzhi mulx pdep pext rorx sarx shlx shrx tzcnt tzmsk t1mskc valignd valignq vblendmpd vblendmps vbroadcastf32x4 vbroadcastf64x4 vbroadcasti32x4 vbroadcasti64x4 vcompresspd vcompressps vcvtpd2udq vcvtps2udq vcvtsd2usi vcvtss2usi vcvttpd2udq vcvttps2udq vcvttsd2usi vcvttss2usi vcvtudq2pd vcvtudq2ps vcvtusi2sd vcvtusi2ss vexpandpd vexpandps vextractf32x4 vextractf64x4 vextracti32x4 vextracti64x4 vfixupimmpd vfixupimmps vfixupimmsd vfixupimmss vgetexppd vgetexpps vgetexpsd vgetexpss vgetmantpd vgetmantps vgetmantsd vgetmantss vinsertf32x4 vinsertf64x4 vinserti32x4 vinserti64x4 vmovdqa32 vmovdqa64 vmovdqu32 vmovdqu64 vpabsq vpandd vpandnd vpandnq vpandq vpblendmd vpblendmq vpcmpltd vpcmpled vpcmpneqd vpcmpnltd vpcmpnled vpcmpd vpcmpltq vpcmpleq vpcmpneqq vpcmpnltq vpcmpnleq vpcmpq vpcmpequd vpcmpltud vpcmpleud vpcmpnequd vpcmpnltud vpcmpnleud vpcmpud vpcmpequq vpcmpltuq vpcmpleuq vpcmpnequq vpcmpnltuq vpcmpnleuq vpcmpuq vpcompressd vpcompressq vpermi2d vpermi2pd vpermi2ps vpermi2q vpermt2d vpermt2pd vpermt2ps vpermt2q vpexpandd vpexpandq vpmaxsq vpmaxuq vpminsq vpminuq vpmovdb vpmovdw vpmovqb vpmovqd vpmovqw vpmovsdb vpmovsdw vpmovsqb vpmovsqd vpmovsqw vpmovusdb vpmovusdw vpmovusqb vpmovusqd vpmovusqw vpord vporq vprold vprolq vprolvd vprolvq vprord vprorq vprorvd vprorvq vpscatterdd vpscatterdq vpscatterqd vpscatterqq vpsraq vpsravq vpternlogd vpternlogq vptestmd vptestmq vptestnmd vptestnmq vpxord vpxorq vrcp14pd vrcp14ps vrcp14sd vrcp14ss vrndscalepd vrndscaleps vrndscalesd vrndscaless vrsqrt14pd vrsqrt14ps vrsqrt14sd vrsqrt14ss vscalefpd vscalefps vscalefsd vscalefss vscatterdpd vscatterdps vscatterqpd vscatterqps vshuff32x4 vshuff64x2 vshufi32x4 vshufi64x2 kandnw kandw kmovw knotw kortestw korw kshiftlw kshiftrw kunpckbw kxnorw kxorw vpbroadcastmb2q vpbroadcastmw2d vpconflictd vpconflictq vplzcntd vplzcntq vexp2pd vexp2ps vrcp28pd vrcp28ps vrcp28sd vrcp28ss vrsqrt28pd vrsqrt28ps vrsqrt28sd vrsqrt28ss vgatherpf0dpd vgatherpf0dps vgatherpf0qpd vgatherpf0qps vgatherpf1dpd vgatherpf1dps vgatherpf1qpd vgatherpf1qps vscatterpf0dpd vscatterpf0dps vscatterpf0qpd vscatterpf0qps vscatterpf1dpd vscatterpf1dps vscatterpf1qpd vscatterpf1qps prefetchwt1 bndmk bndcl bndcu bndcn bndmov bndldx bndstx sha1rnds4 sha1nexte sha1msg1 sha1msg2 sha256rnds2 sha256msg1 sha256msg2 hint_nop0 hint_nop1 hint_nop2 hint_nop3 hint_nop4 hint_nop5 hint_nop6 hint_nop7 hint_nop8 hint_nop9 hint_nop10 hint_nop11 hint_nop12 hint_nop13 hint_nop14 hint_nop15 hint_nop16 hint_nop17 hint_nop18 hint_nop19 hint_nop20 hint_nop21 hint_nop22 hint_nop23 hint_nop24 hint_nop25 hint_nop26 hint_nop27 hint_nop28 hint_nop29 hint_nop30 hint_nop31 hint_nop32 hint_nop33 hint_nop34 hint_nop35 hint_nop36 hint_nop37 hint_nop38 hint_nop39 hint_nop40 hint_nop41 hint_nop42 hint_nop43 hint_nop44 hint_nop45 hint_nop46 hint_nop47 hint_nop48 hint_nop49 hint_nop50 hint_nop51 hint_nop52 hint_nop53 hint_nop54 hint_nop55 hint_nop56 hint_nop57 hint_nop58 hint_nop59 hint_nop60 hint_nop61 hint_nop62 hint_nop63",built_in:"ip eip rip al ah bl bh cl ch dl dh sil dil bpl spl r8b r9b r10b r11b r12b r13b r14b r15b ax bx cx dx si di bp sp r8w r9w r10w r11w r12w r13w r14w r15w eax ebx ecx edx esi edi ebp esp eip r8d r9d r10d r11d r12d r13d r14d r15d rax rbx rcx rdx rsi rdi rbp rsp r8 r9 r10 r11 r12 r13 r14 r15 cs ds es fs gs ss st st0 st1 st2 st3 st4 st5 st6 st7 mm0 mm1 mm2 mm3 mm4 mm5 mm6 mm7 xmm0  xmm1  xmm2  xmm3  xmm4  xmm5  xmm6  xmm7  xmm8  xmm9 xmm10  xmm11 xmm12 xmm13 xmm14 xmm15 xmm16 xmm17 xmm18 xmm19 xmm20 xmm21 xmm22 xmm23 xmm24 xmm25 xmm26 xmm27 xmm28 xmm29 xmm30 xmm31 ymm0  ymm1  ymm2  ymm3  ymm4  ymm5  ymm6  ymm7  ymm8  ymm9 ymm10  ymm11 ymm12 ymm13 ymm14 ymm15 ymm16 ymm17 ymm18 ymm19 ymm20 ymm21 ymm22 ymm23 ymm24 ymm25 ymm26 ymm27 ymm28 ymm29 ymm30 ymm31 zmm0  zmm1  zmm2  zmm3  zmm4  zmm5  zmm6  zmm7  zmm8  zmm9 zmm10  zmm11 zmm12 zmm13 zmm14 zmm15 zmm16 zmm17 zmm18 zmm19 zmm20 zmm21 zmm22 zmm23 zmm24 zmm25 zmm26 zmm27 zmm28 zmm29 zmm30 zmm31 k0 k1 k2 k3 k4 k5 k6 k7 bnd0 bnd1 bnd2 bnd3 cr0 cr1 cr2 cr3 cr4 cr8 dr0 dr1 dr2 dr3 dr8 tr3 tr4 tr5 tr6 tr7 r0 r1 r2 r3 r4 r5 r6 r7 r0b r1b r2b r3b r4b r5b r6b r7b r0w r1w r2w r3w r4w r5w r6w r7w r0d r1d r2d r3d r4d r5d r6d r7d r0h r1h r2h r3h r0l r1l r2l r3l r4l r5l r6l r7l r8l r9l r10l r11l r12l r13l r14l r15l db dw dd dq dt ddq do dy dz resb resw resd resq rest resdq reso resy resz incbin equ times byte word dword qword nosplit rel abs seg wrt strict near far a32 ptr",meta:"%define %xdefine %+ %undef %defstr %deftok %assign %strcat %strlen %substr %rotate %elif %else %endif %if %ifmacro %ifctx %ifidn %ifidni %ifid %ifnum %ifstr %iftoken %ifempty %ifenv %error %warning %fatal %rep %endrep %include %push %pop %repl %pathsearch %depend %use %arg %stacksize %local %line %comment %endcomment .nolist __FILE__ __LINE__ __SECT__  __BITS__ __OUTPUT_FORMAT__ __DATE__ __TIME__ __DATE_NUM__ __TIME_NUM__ __UTC_DATE__ __UTC_TIME__ __UTC_DATE_NUM__ __UTC_TIME_NUM__  __PASS__ struc endstruc istruc at iend align alignb sectalign daz nodaz up down zero default option assume public bits use16 use32 use64 default section segment absolute extern global common cpu float __utf16__ __utf16le__ __utf16be__ __utf32__ __utf32le__ __utf32be__ __float8__ __float16__ __float32__ __float64__ __float80m__ __float80e__ __float128l__ __float128h__ __Infinity__ __QNaN__ __SNaN__ Inf NaN QNaN SNaN float8 float16 float32 float64 float80m float80e float128l float128h __FLOAT_DAZ__ __FLOAT_ROUND__ __FLOAT__"},c:[s.C(";","$",{relevance:0}),{cN:"number",v:[{b:"\\b(?:([0-9][0-9_]*)?\\.[0-9_]*(?:[eE][+-]?[0-9_]+)?|(0[Xx])?[0-9][0-9_]*\\.?[0-9_]*(?:[pP](?:[+-]?[0-9_]+)?)?)\\b",relevance:0},{b:"\\$[0-9][0-9A-Fa-f]*",relevance:0},{b:"\\b(?:[0-9A-Fa-f][0-9A-Fa-f_]*[Hh]|[0-9][0-9_]*[DdTt]?|[0-7][0-7_]*[QqOo]|[0-1][0-1_]*[BbYy])\\b"},{b:"\\b(?:0[Xx][0-9A-Fa-f_]+|0[DdTt][0-9_]+|0[QqOo][0-7_]+|0[BbYy][0-1_]+)\\b"}]},s.QSM,{cN:"string",v:[{b:"'",e:"[^\\\\]'"},{b:"`",e:"[^\\\\]`"}],relevance:0},{cN:"symbol",v:[{b:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)"},{b:"^\\s*%%[A-Za-z0-9_$#@~.?]*:"}],relevance:0},{cN:"subst",b:"%[0-9]+",relevance:0},{cN:"subst",b:"%!S+",relevance:0},{cN:"meta",b:/^\s*\.[\w_-]+/}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/xl.min.js b/vendor/assets/javascripts/highlightjs/languages/xl.min.js
index 2eb49c06ee..fed1a9f844 100644
--- a/vendor/assets/javascripts/highlightjs/languages/xl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/xl.min.js
@@ -1 +1 @@
-hljs.registerLanguage("xl",function(){"use strict";return function(e){var t={$pattern:/[a-zA-Z][a-zA-Z0-9_?]*/,keyword:"if then else do while until for loop import with is as where when by data constant integer real text name boolean symbol infix prefix postfix block tree",literal:"true false nil",built_in:"in mod rem and or xor not abs sign floor ceil sqrt sin cos tan asin acos atan exp expm1 log log2 log10 log1p pi at text_length text_range text_find text_replace contains page slide basic_slide title_slide title subtitle fade_in fade_out fade_at clear_color color line_color line_width texture_wrap texture_transform texture scale_?x scale_?y scale_?z? translate_?x translate_?y translate_?z? rotate_?x rotate_?y rotate_?z? rectangle circle ellipse sphere path line_to move_to quad_to curve_to theme background contents locally time mouse_?x mouse_?y mouse_buttons ObjectLoader Animate MovieCredits Slides Filters Shading Materials LensFlare Mapping VLCAudioVideo StereoDecoder PointCloud NetworkAccess RemoteControl RegExp ChromaKey Snowfall NodeJS Speech Charts"},a={className:"string",begin:'"',end:'"',illegal:"\\n"},n={beginKeywords:"import",end:"$",keywords:t,contains:[a]},o={className:"function",begin:/[a-z][^\n]*->/,returnBegin:!0,end:/->/,contains:[e.inherit(e.TITLE_MODE,{starts:{endsWithParent:!0,keywords:t}})]};return{name:"XL",aliases:["tao"],keywords:t,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,{className:"string",begin:"'",end:"'",illegal:"\\n"},{className:"string",begin:"<<",end:">>"},o,n,{className:"number",begin:"[0-9]+#[0-9A-Z_]+(\\.[0-9-A-Z_]+)?#?([Ee][+-]?[0-9]+)?"},e.NUMBER_MODE]}}}());
\ No newline at end of file
+hljs.registerLanguage("xl",function(e){var t={keyword:"if then else do while until for loop import with is as where when by data constant integer real text name boolean symbol infix prefix postfix block tree",literal:"true false nil",built_in:"in mod rem and or xor not abs sign floor ceil sqrt sin cos tan asin acos atan exp expm1 log log2 log10 log1p pi at text_length text_range text_find text_replace contains page slide basic_slide title_slide title subtitle fade_in fade_out fade_at clear_color color line_color line_width texture_wrap texture_transform texture scale_?x scale_?y scale_?z? translate_?x translate_?y translate_?z? rotate_?x rotate_?y rotate_?z? rectangle circle ellipse sphere path line_to move_to quad_to curve_to theme background contents locally time mouse_?x mouse_?y mouse_buttons ObjectLoader Animate MovieCredits Slides Filters Shading Materials LensFlare Mapping VLCAudioVideo StereoDecoder PointCloud NetworkAccess RemoteControl RegExp ChromaKey Snowfall NodeJS Speech Charts"},o={cN:"string",b:'"',e:'"',i:"\\n"},a={bK:"import",e:"$",k:t,c:[o]},r={cN:"function",b:/[a-z][^\n]*->/,rB:!0,e:/->/,c:[e.inherit(e.TM,{starts:{eW:!0,k:t}})]};return{aliases:["tao"],l:/[a-zA-Z][a-zA-Z0-9_?]*/,k:t,c:[e.CLCM,e.CBCM,o,{cN:"string",b:"'",e:"'",i:"\\n"},{cN:"string",b:"<<",e:">>"},r,a,{cN:"number",b:"[0-9]+#[0-9A-Z_]+(\\.[0-9-A-Z_]+)?#?([Ee][+-]?[0-9]+)?"},e.NM]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/xml.min.js b/vendor/assets/javascripts/highlightjs/languages/xml.min.js
index abe4a6d0a5..7b8cf5681a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/xml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/xml.min.js
@@ -1 +1 @@
-hljs.registerLanguage("xml",function(){"use strict";return function(e){var n={className:"symbol",begin:"&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;"},a={begin:"\\s",contains:[{className:"meta-keyword",begin:"#?[a-z_][a-z1-9_-]+",illegal:"\\n"}]},s=e.inherit(a,{begin:"\\(",end:"\\)"}),t=e.inherit(e.APOS_STRING_MODE,{className:"meta-string"}),i=e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),c={endsWithParent:!0,illegal:/</,relevance:0,contains:[{className:"attr",begin:"[A-Za-z0-9\\._:-]+",relevance:0},{begin:/=\s*/,relevance:0,contains:[{className:"string",endsParent:!0,variants:[{begin:/"/,end:/"/,contains:[n]},{begin:/'/,end:/'/,contains:[n]},{begin:/[^\s"'=<>`]+/}]}]}]};return{name:"HTML, XML",aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist","wsf","svg"],case_insensitive:!0,contains:[{className:"meta",begin:"<![a-z]",end:">",relevance:10,contains:[a,i,t,s,{begin:"\\[",end:"\\]",contains:[{className:"meta",begin:"<![a-z]",end:">",contains:[a,s,i,t]}]}]},e.COMMENT("\x3c!--","--\x3e",{relevance:10}),{begin:"<\\!\\[CDATA\\[",end:"\\]\\]>",relevance:10},n,{className:"meta",begin:/<\?xml/,end:/\?>/,relevance:10},{className:"tag",begin:"<style(?=\\s|>)",end:">",keywords:{name:"style"},contains:[c],starts:{end:"</style>",returnEnd:!0,subLanguage:["css","xml"]}},{className:"tag",begin:"<script(?=\\s|>)",end:">",keywords:{name:"script"},contains:[c],starts:{end:"<\/script>",returnEnd:!0,subLanguage:["javascript","handlebars","xml"]}},{className:"tag",begin:"</?",end:"/?>",contains:[{className:"name",begin:/[^\/><\s]+/,relevance:0},c]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("xml",function(e){var c={cN:"symbol",b:"&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;"},s={b:"\\s",c:[{cN:"meta-keyword",b:"#?[a-z_][a-z1-9_-]+",i:"\\n"}]},a=e.inherit(s,{b:"\\(",e:"\\)"}),t=e.inherit(e.ASM,{cN:"meta-string"}),l=e.inherit(e.QSM,{cN:"meta-string"}),r={eW:!0,i:/</,relevance:0,c:[{cN:"attr",b:"[A-Za-z0-9\\._:-]+",relevance:0},{b:/=\s*/,relevance:0,c:[{cN:"string",endsParent:!0,v:[{b:/"/,e:/"/,c:[c]},{b:/'/,e:/'/,c:[c]},{b:/[^\s"'=<>`]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist","wsf","svg"],cI:!0,c:[{cN:"meta",b:"<![a-z]",e:">",relevance:10,c:[s,l,t,a,{b:"\\[",e:"\\]",c:[{cN:"meta",b:"<![a-z]",e:">",c:[s,a,l,t]}]}]},e.C("\x3c!--","--\x3e",{relevance:10}),{b:"<\\!\\[CDATA\\[",e:"\\]\\]>",relevance:10},c,{cN:"meta",b:/<\?xml/,e:/\?>/,relevance:10},{b:/<\?(php)?/,e:/\?>/,sL:"php",c:[{b:"/\\*",e:"\\*/",skip:!0},{b:'b"',e:'"',skip:!0},{b:"b'",e:"'",skip:!0},e.inherit(e.ASM,{i:null,cN:null,c:null,skip:!0}),e.inherit(e.QSM,{i:null,cN:null,c:null,skip:!0})]},{cN:"tag",b:"<style(?=\\s|>)",e:">",k:{name:"style"},c:[r],starts:{e:"</style>",rE:!0,sL:["css","xml"]}},{cN:"tag",b:"<script(?=\\s|>)",e:">",k:{name:"script"},c:[r],starts:{e:"<\/script>",rE:!0,sL:["actionscript","javascript","handlebars","xml"]}},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"name",b:/[^\/><\s]+/,relevance:0},r]}]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/xquery.min.js b/vendor/assets/javascripts/highlightjs/languages/xquery.min.js
index 26e65d2a46..324907d733 100644
--- a/vendor/assets/javascripts/highlightjs/languages/xquery.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/xquery.min.js
@@ -1 +1 @@
-hljs.registerLanguage("xquery",function(){"use strict";return function(e){return{name:"XQuery",aliases:["xpath","xq"],case_insensitive:!1,illegal:/(proc)|(abstract)|(extends)|(until)|(#)/,keywords:{$pattern:/[a-zA-Z\$][a-zA-Z0-9_:\-]*/,keyword:"module schema namespace boundary-space preserve no-preserve strip default collation base-uri ordering context decimal-format decimal-separator copy-namespaces empty-sequence except exponent-separator external grouping-separator inherit no-inherit lax minus-sign per-mille percent schema-attribute schema-element strict unordered zero-digit declare import option function validate variable for at in let where order group by return if then else tumbling sliding window start when only end previous next stable ascending descending allowing empty greatest least some every satisfies switch case typeswitch try catch and or to union intersect instance of treat as castable cast map array delete insert into replace value rename copy modify update",type:"item document-node node attribute document element comment namespace namespace-node processing-instruction text construction xs:anyAtomicType xs:untypedAtomic xs:duration xs:time xs:decimal xs:float xs:double xs:gYearMonth xs:gYear xs:gMonthDay xs:gMonth xs:gDay xs:boolean xs:base64Binary xs:hexBinary xs:anyURI xs:QName xs:NOTATION xs:dateTime xs:dateTimeStamp xs:date xs:string xs:normalizedString xs:token xs:language xs:NMTOKEN xs:Name xs:NCName xs:ID xs:IDREF xs:ENTITY xs:integer xs:nonPositiveInteger xs:negativeInteger xs:long xs:int xs:short xs:byte xs:nonNegativeInteger xs:unisignedLong xs:unsignedInt xs:unsignedShort xs:unsignedByte xs:positiveInteger xs:yearMonthDuration xs:dayTimeDuration",literal:"eq ne lt le gt ge is self:: child:: descendant:: descendant-or-self:: attribute:: following:: following-sibling:: parent:: ancestor:: ancestor-or-self:: preceding:: preceding-sibling:: NaN"},contains:[{className:"variable",begin:/[\$][\w-:]+/},{className:"built_in",variants:[{begin:/\barray\:/,end:/(?:append|filter|flatten|fold\-(?:left|right)|for-each(?:\-pair)?|get|head|insert\-before|join|put|remove|reverse|size|sort|subarray|tail)\b/},{begin:/\bmap\:/,end:/(?:contains|entry|find|for\-each|get|keys|merge|put|remove|size)\b/},{begin:/\bmath\:/,end:/(?:a(?:cos|sin|tan[2]?)|cos|exp(?:10)?|log(?:10)?|pi|pow|sin|sqrt|tan)\b/},{begin:/\bop\:/,end:/\(/,excludeEnd:!0},{begin:/\bfn\:/,end:/\(/,excludeEnd:!0},{begin:/[^<\/\$\:'"-]\b(?:abs|accumulator\-(?:after|before)|adjust\-(?:date(?:Time)?|time)\-to\-timezone|analyze\-string|apply|available\-(?:environment\-variables|system\-properties)|avg|base\-uri|boolean|ceiling|codepoints?\-(?:equal|to\-string)|collation\-key|collection|compare|concat|contains(?:\-token)?|copy\-of|count|current(?:\-)?(?:date(?:Time)?|time|group(?:ing\-key)?|output\-uri|merge\-(?:group|key))?data|dateTime|days?\-from\-(?:date(?:Time)?|duration)|deep\-equal|default\-(?:collation|language)|distinct\-values|document(?:\-uri)?|doc(?:\-available)?|element\-(?:available|with\-id)|empty|encode\-for\-uri|ends\-with|environment\-variable|error|escape\-html\-uri|exactly\-one|exists|false|filter|floor|fold\-(?:left|right)|for\-each(?:\-pair)?|format\-(?:date(?:Time)?|time|integer|number)|function\-(?:arity|available|lookup|name)|generate\-id|has\-children|head|hours\-from\-(?:dateTime|duration|time)|id(?:ref)?|implicit\-timezone|in\-scope\-prefixes|index\-of|innermost|insert\-before|iri\-to\-uri|json\-(?:doc|to\-xml)|key|lang|last|load\-xquery\-module|local\-name(?:\-from\-QName)?|(?:lower|upper)\-case|matches|max|minutes\-from\-(?:dateTime|duration|time)|min|months?\-from\-(?:date(?:Time)?|duration)|name(?:space\-uri\-?(?:for\-prefix|from\-QName)?)?|nilled|node\-name|normalize\-(?:space|unicode)|not|number|one\-or\-more|outermost|parse\-(?:ietf\-date|json)|path|position|(?:prefix\-from\-)?QName|random\-number\-generator|regex\-group|remove|replace|resolve\-(?:QName|uri)|reverse|root|round(?:\-half\-to\-even)?|seconds\-from\-(?:dateTime|duration|time)|snapshot|sort|starts\-with|static\-base\-uri|stream\-available|string\-?(?:join|length|to\-codepoints)?|subsequence|substring\-?(?:after|before)?|sum|system\-property|tail|timezone\-from\-(?:date(?:Time)?|time)|tokenize|trace|trans(?:form|late)|true|type\-available|unordered|unparsed\-(?:entity|text)?\-?(?:public\-id|uri|available|lines)?|uri\-collection|xml\-to\-json|years?\-from\-(?:date(?:Time)?|duration)|zero\-or\-one)\b/},{begin:/\blocal\:/,end:/\(/,excludeEnd:!0},{begin:/\bzip\:/,end:/(?:zip\-file|(?:xml|html|text|binary)\-entry| (?:update\-)?entries)\b/},{begin:/\b(?:util|db|functx|app|xdmp|xmldb)\:/,end:/\(/,excludeEnd:!0}]},{className:"string",variants:[{begin:/"/,end:/"/,contains:[{begin:/""/,relevance:0}]},{begin:/'/,end:/'/,contains:[{begin:/''/,relevance:0}]}]},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{className:"comment",begin:"\\(:",end:":\\)",relevance:10,contains:[{className:"doctag",begin:"@\\w+"}]},{className:"meta",begin:/%[\w-:]+/},{className:"title",begin:/\bxquery version "[13]\.[01]"\s?(?:encoding ".+")?/,end:/;/},{beginKeywords:"element attribute comment document processing-instruction",end:"{",excludeEnd:!0},{begin:/<([\w\._:\-]+)((\s*.*)=('|").*('|"))?>/,end:/(\/[\w\._:\-]+>)/,subLanguage:"xml",contains:[{begin:"{",end:"}",subLanguage:"xquery"},"self"]}]}}}());
\ No newline at end of file
+hljs.registerLanguage("xquery",function(e){var t=[{cN:"variable",b:/[\$][\w-:]+/},{cN:"built_in",v:[{b:/\barray\:/,e:/(?:append|filter|flatten|fold\-(?:left|right)|for-each(?:\-pair)?|get|head|insert\-before|join|put|remove|reverse|size|sort|subarray|tail)\b/},{b:/\bmap\:/,e:/(?:contains|entry|find|for\-each|get|keys|merge|put|remove|size)\b/},{b:/\bmath\:/,e:/(?:a(?:cos|sin|tan[2]?)|cos|exp(?:10)?|log(?:10)?|pi|pow|sin|sqrt|tan)\b/},{b:/\bop\:/,e:/\(/,eE:!0},{b:/\bfn\:/,e:/\(/,eE:!0},{b:/[^<\/\$\:'"-]\b(?:abs|accumulator\-(?:after|before)|adjust\-(?:date(?:Time)?|time)\-to\-timezone|analyze\-string|apply|available\-(?:environment\-variables|system\-properties)|avg|base\-uri|boolean|ceiling|codepoints?\-(?:equal|to\-string)|collation\-key|collection|compare|concat|contains(?:\-token)?|copy\-of|count|current(?:\-)?(?:date(?:Time)?|time|group(?:ing\-key)?|output\-uri|merge\-(?:group|key))?data|dateTime|days?\-from\-(?:date(?:Time)?|duration)|deep\-equal|default\-(?:collation|language)|distinct\-values|document(?:\-uri)?|doc(?:\-available)?|element\-(?:available|with\-id)|empty|encode\-for\-uri|ends\-with|environment\-variable|error|escape\-html\-uri|exactly\-one|exists|false|filter|floor|fold\-(?:left|right)|for\-each(?:\-pair)?|format\-(?:date(?:Time)?|time|integer|number)|function\-(?:arity|available|lookup|name)|generate\-id|has\-children|head|hours\-from\-(?:dateTime|duration|time)|id(?:ref)?|implicit\-timezone|in\-scope\-prefixes|index\-of|innermost|insert\-before|iri\-to\-uri|json\-(?:doc|to\-xml)|key|lang|last|load\-xquery\-module|local\-name(?:\-from\-QName)?|(?:lower|upper)\-case|matches|max|minutes\-from\-(?:dateTime|duration|time)|min|months?\-from\-(?:date(?:Time)?|duration)|name(?:space\-uri\-?(?:for\-prefix|from\-QName)?)?|nilled|node\-name|normalize\-(?:space|unicode)|not|number|one\-or\-more|outermost|parse\-(?:ietf\-date|json)|path|position|(?:prefix\-from\-)?QName|random\-number\-generator|regex\-group|remove|replace|resolve\-(?:QName|uri)|reverse|root|round(?:\-half\-to\-even)?|seconds\-from\-(?:dateTime|duration|time)|snapshot|sort|starts\-with|static\-base\-uri|stream\-available|string\-?(?:join|length|to\-codepoints)?|subsequence|substring\-?(?:after|before)?|sum|system\-property|tail|timezone\-from\-(?:date(?:Time)?|time)|tokenize|trace|trans(?:form|late)|true|type\-available|unordered|unparsed\-(?:entity|text)?\-?(?:public\-id|uri|available|lines)?|uri\-collection|xml\-to\-json|years?\-from\-(?:date(?:Time)?|duration)|zero\-or\-one)\b/},{b:/\blocal\:/,e:/\(/,eE:!0},{b:/\bzip\:/,e:/(?:zip\-file|(?:xml|html|text|binary)\-entry| (?:update\-)?entries)\b/},{b:/\b(?:util|db|functx|app|xdmp|xmldb)\:/,e:/\(/,eE:!0}]},{cN:"string",v:[{b:/"/,e:/"/,c:[{b:/""/,relevance:0}]},{b:/'/,e:/'/,c:[{b:/''/,relevance:0}]}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{cN:"comment",b:"\\(:",e:":\\)",relevance:10,c:[{cN:"doctag",b:"@\\w+"}]},{cN:"meta",b:/%[\w-:]+/},{cN:"title",b:/\bxquery version "[13]\.[01]"\s?(?:encoding ".+")?/,e:/;/},{bK:"element attribute comment document processing-instruction",e:"{",eE:!0},{b:/<([\w\._:\-]+)((\s*.*)=('|").*('|"))?>/,e:/(\/[\w\._:\-]+>)/,sL:"xml",c:[{b:"{",e:"}",sL:"xquery"},"self"]}];return{aliases:["xpath","xq"],cI:!1,l:/[a-zA-Z\$][a-zA-Z0-9_:\-]*/,i:/(proc)|(abstract)|(extends)|(until)|(#)/,k:{keyword:"module schema namespace boundary-space preserve no-preserve strip default collation base-uri ordering context decimal-format decimal-separator copy-namespaces empty-sequence except exponent-separator external grouping-separator inherit no-inherit lax minus-sign per-mille percent schema-attribute schema-element strict unordered zero-digit declare import option function validate variable for at in let where order group by return if then else tumbling sliding window start when only end previous next stable ascending descending allowing empty greatest least some every satisfies switch case typeswitch try catch and or to union intersect instance of treat as castable cast map array delete insert into replace value rename copy modify update",type:"item document-node node attribute document element comment namespace namespace-node processing-instruction text construction xs:anyAtomicType xs:untypedAtomic xs:duration xs:time xs:decimal xs:float xs:double xs:gYearMonth xs:gYear xs:gMonthDay xs:gMonth xs:gDay xs:boolean xs:base64Binary xs:hexBinary xs:anyURI xs:QName xs:NOTATION xs:dateTime xs:dateTimeStamp xs:date xs:string xs:normalizedString xs:token xs:language xs:NMTOKEN xs:Name xs:NCName xs:ID xs:IDREF xs:ENTITY xs:integer xs:nonPositiveInteger xs:negativeInteger xs:long xs:int xs:short xs:byte xs:nonNegativeInteger xs:unisignedLong xs:unsignedInt xs:unsignedShort xs:unsignedByte xs:positiveInteger xs:yearMonthDuration xs:dayTimeDuration",literal:"eq ne lt le gt ge is self:: child:: descendant:: descendant-or-self:: attribute:: following:: following-sibling:: parent:: ancestor:: ancestor-or-self:: preceding:: preceding-sibling:: NaN"},c:t}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/yaml.min.js b/vendor/assets/javascripts/highlightjs/languages/yaml.min.js
index 587b8795ff..8e1de2429e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/yaml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/yaml.min.js
@@ -1 +1 @@
-hljs.registerLanguage("yaml",function(){"use strict";return function(e){var n="true false yes no null",a="[\\w#;/?:@&=+$,.~*\\'()[\\]]+",s={className:"string",relevance:0,variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/\S+/}],contains:[e.BACKSLASH_ESCAPE,{className:"template-variable",variants:[{begin:"{{",end:"}}"},{begin:"%{",end:"}"}]}]},i=e.inherit(s,{variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/[^\s,{}[\]]+/}]}),l={end:",",endsWithParent:!0,excludeEnd:!0,contains:[],keywords:n,relevance:0},t={begin:"{",end:"}",contains:[l],illegal:"\\n",relevance:0},g={begin:"\\[",end:"\\]",contains:[l],illegal:"\\n",relevance:0},b=[{className:"attr",variants:[{begin:"\\w[\\w :\\/.-]*:(?=[ \t]|$)"},{begin:'"\\w[\\w :\\/.-]*":(?=[ \t]|$)'},{begin:"'\\w[\\w :\\/.-]*':(?=[ \t]|$)"}]},{className:"meta",begin:"^---s*$",relevance:10},{className:"string",begin:"[\\|>]([0-9]?[+-])?[ ]*\\n( *)[\\S ]+\\n(\\2[\\S ]+\\n?)*"},{begin:"<%[%=-]?",end:"[%-]?%>",subLanguage:"ruby",excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:"!\\w+!"+a},{className:"type",begin:"!<"+a+">"},{className:"type",begin:"!"+a},{className:"type",begin:"!!"+a},{className:"meta",begin:"&"+e.UNDERSCORE_IDENT_RE+"$"},{className:"meta",begin:"\\*"+e.UNDERSCORE_IDENT_RE+"$"},{className:"bullet",begin:"\\-(?=[ ]|$)",relevance:0},e.HASH_COMMENT_MODE,{beginKeywords:n,keywords:{literal:n}},{className:"number",begin:"\\b[0-9]{4}(-[0-9][0-9]){0,2}([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?(\\.[0-9]*)?([ \\t])*(Z|[-+][0-9][0-9]?(:[0-9][0-9])?)?\\b"},{className:"number",begin:e.C_NUMBER_RE+"\\b"},t,g,s],c=[...b];return c.pop(),c.push(i),l.contains=c,{name:"YAML",case_insensitive:!0,aliases:["yml","YAML"],contains:b}}}());
\ No newline at end of file
+hljs.registerLanguage("yaml",function(e){var b="true false yes no null",a={cN:"string",relevance:0,v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/\S+/}],c:[e.BE,{cN:"template-variable",v:[{b:"{{",e:"}}"},{b:"%{",e:"}"}]}]};return{cI:!0,aliases:["yml","YAML","yaml"],c:[{cN:"attr",v:[{b:"\\w[\\w :\\/.-]*:(?=[ \t]|$)"},{b:'"\\w[\\w :\\/.-]*":(?=[ \t]|$)'},{b:"'\\w[\\w :\\/.-]*':(?=[ \t]|$)"}]},{cN:"meta",b:"^---s*$",relevance:10},{cN:"string",b:"[\\|>]([0-9]?[+-])?[ ]*\\n( *)[\\S ]+\\n(\\2[\\S ]+\\n?)*"},{b:"<%[%=-]?",e:"[%-]?%>",sL:"ruby",eB:!0,eE:!0,relevance:0},{cN:"type",b:"!"+e.UIR},{cN:"type",b:"!!"+e.UIR},{cN:"meta",b:"&"+e.UIR+"$"},{cN:"meta",b:"\\*"+e.UIR+"$"},{cN:"bullet",b:"\\-(?=[ ]|$)",relevance:0},e.HCM,{bK:b,k:{literal:b}},{cN:"number",b:e.CNR+"\\b"},a]}});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/zephir.min.js b/vendor/assets/javascripts/highlightjs/languages/zephir.min.js
index a375158d37..6581543412 100644
--- a/vendor/assets/javascripts/highlightjs/languages/zephir.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/zephir.min.js
@@ -1 +1 @@
-hljs.registerLanguage("zephir",function(){"use strict";return function(e){var n={className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[e.inherit(e.APOS_STRING_MODE,{illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null})]},a=e.UNDERSCORE_TITLE_MODE,s={variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]},i="namespace class interface use extends function return abstract final public protected private static deprecated throw try catch Exception echo empty isset instanceof unset let var new const self require if else elseif switch case default do while loop for continue break likely unlikely __LINE__ __FILE__ __DIR__ __FUNCTION__ __CLASS__ __TRAIT__ __METHOD__ __NAMESPACE__ array boolean float double integer object resource string char long unsigned bool int uint ulong uchar true false null undefined";return{name:"Zephir",aliases:["zep"],keywords:i,contains:[e.C_LINE_COMMENT_MODE,e.COMMENT("/\\*","\\*/",{contains:[{className:"doctag",begin:"@[A-Za-z]+"}]}),{className:"string",begin:"<<<['\"]?\\w+['\"]?$",end:"^\\w+;",contains:[e.BACKSLASH_ESCAPE]},{begin:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{className:"function",beginKeywords:"function fn",end:/[;{]/,excludeEnd:!0,illegal:"\\$|\\[|%",contains:[a,{className:"params",begin:"\\(",end:"\\)",keywords:i,contains:["self",e.C_BLOCK_COMMENT_MODE,n,s]}]},{className:"class",beginKeywords:"class interface",end:"{",excludeEnd:!0,illegal:/[:\(\$"]/,contains:[{beginKeywords:"extends implements"},a]},{beginKeywords:"namespace",end:";",illegal:/[\.']/,contains:[a]},{beginKeywords:"use",end:";",contains:[a]},{begin:"=>"},n,s]}}}());
\ No newline at end of file
+hljs.registerLanguage("zephir",function(e){var i={cN:"string",c:[e.BE],v:[{b:'b"',e:'"'},{b:"b'",e:"'"},e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null})]},n={v:[e.BNM,e.CNM]};return{aliases:["zep"],cI:!0,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var let while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try switch continue endfor endif declare unset true false trait goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally int uint long ulong char uchar double float bool boolean stringlikely unlikely",c:[e.CLCM,e.HCM,e.C("/\\*","\\*/",{c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.C("__halt_compiler.+?;",!1,{eW:!0,k:"__halt_compiler",l:e.UIR}),{cN:"string",b:"<<<['\"]?\\w+['\"]?$",e:"^\\w+;",c:[e.BE]},{b:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{cN:"function",bK:"function",e:/[;{]/,eE:!0,i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:["self",e.CBCM,i,n]}]},{cN:"class",bK:"class interface",e:"{",eE:!0,i:/[:\(\$"]/,c:[{bK:"extends implements"},e.UTM]},{bK:"namespace",e:";",i:/[\.']/,c:[e.UTM]},{bK:"use",e:";",c:[e.UTM]},{b:"=>"},i,n]}});
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 5ba938d8e4..6ff2bce65e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1501,9 +1501,9 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-"highlight.js@https://github.com/highlightjs/highlight.js":
-  version "10.0.0"
-  resolved "https://github.com/highlightjs/highlight.js#f30dbf774a1cb4c9644b6e97b0b853812e434038"
+"highlight.js@https://github.com/highlightjs/highlight.js#d72f0817aaab8187711fca7c608f5272ea5147f6":
+  version "9.18.1"
+  resolved "https://github.com/highlightjs/highlight.js#d72f0817aaab8187711fca7c608f5272ea5147f6"
 
 homedir-polyfill@^1.0.1:
   version "1.0.3"

From 5d792483f02aa984e7a887e1d0e84961b137f005 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 29 May 2020 11:11:28 +0200
Subject: [PATCH 1437/1830] UI: various select-kit dropdown tweaks/cleaning
 (#9922)

---
 .../common/select-kit/combo-box.scss          |  1 -
 .../select-kit/dropdown-select-box.scss       | 49 ++-----------------
 .../select-kit/notifications-button.scss      |  2 +-
 .../common/select-kit/select-kit.scss         |  2 +-
 .../toolbar-popup-menu-options.scss           |  4 +-
 .../topic-footer-mobile-dropdown.scss         |  4 ++
 .../select-kit/dropdown-select-box.scss       | 14 +++++-
 7 files changed, 24 insertions(+), 52 deletions(-)

diff --git a/app/assets/stylesheets/common/select-kit/combo-box.scss b/app/assets/stylesheets/common/select-kit/combo-box.scss
index d592023138..368a481d72 100644
--- a/app/assets/stylesheets/common/select-kit/combo-box.scss
+++ b/app/assets/stylesheets/common/select-kit/combo-box.scss
@@ -44,7 +44,6 @@
       flex-direction: column;
       padding: 0;
       min-width: 100px;
-      max-height: 200px;
 
       .collection-header {
         a {
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index fa6e12dea5..97e5477a51 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -1,7 +1,5 @@
 .select-kit {
   &.dropdown-select-box {
-    display: -webkit-inline-box;
-    display: -ms-inline-flexbox;
     display: inline-flex;
     min-width: auto;
     border: none;
@@ -23,52 +21,25 @@
       margin: 0;
 
       .icons {
-        display: -webkit-box;
-        display: -ms-flexbox;
         display: flex;
-        flex: 0 0 auto;
-        -webkit-box-align: start;
-        -ms-flex-align: start;
-        align-items: flex-start;
-        -webkit-box-pack: center;
-        -ms-flex-pack: center;
-        justify-content: center;
-        -ms-flex-item-align: start;
-        align-self: flex-start;
-        margin-right: 0.357em;
-        margin-top: 2px;
-        width: 30px;
+        margin-right: 0.5em;
 
         .d-icon {
           font-size: $font-up-2;
-          -ms-flex-item-align: center;
           align-self: center;
           margin-right: 0;
-          opacity: 1;
         }
       }
 
       .texts {
-        line-height: $line-height-large;
-        -webkit-box-flex: 1;
-        -ms-flex: 1;
+        line-height: $line-height-medium;
         flex: 1 1 0%;
-        -webkit-box-align: start;
-        -ms-flex-align: start;
         align-items: flex-start;
-        display: -webkit-box;
-        display: -ms-flexbox;
         display: flex;
-        -ms-flex-wrap: wrap;
         flex-wrap: wrap;
-        -webkit-box-orient: vertical;
-        -webkit-box-direction: normal;
-        -ms-flex-direction: column;
         flex-direction: column;
 
         .name {
-          -webkit-box-flex: 1;
-          -ms-flex: 1;
           flex: 1 1 auto;
           font-weight: bold;
           font-size: $font-0;
@@ -79,8 +50,6 @@
         }
 
         .desc {
-          -webkit-box-flex: 1;
-          -ms-flex: 1;
           flex: 1 1 auto;
           font-size: $font-down-1;
           font-weight: normal;
@@ -97,27 +66,15 @@
     }
 
     .dropdown-select-box-header {
-      -webkit-box-sizing: border-box;
-      -moz-box-sizing: border-box;
       box-sizing: border-box;
       border: 0;
-
-      -webkit-box-align: center;
-      -ms-flex-align: center;
       align-items: center;
-      -webkit-box-pack: justify;
-      -ms-flex-pack: justify;
       justify-content: space-between;
-      -webkit-box-orient: horizontal;
-      -webkit-box-direction: normal;
-      -ms-flex-direction: row;
       flex-direction: row;
-      display: -webkit-inline-box;
-      display: -ms-inline-flexbox;
       display: inline-flex;
 
       .d-icon + .d-icon {
-        margin-left: 5px;
+        margin-left: 0.25em;
       }
 
       &.is-focused {
diff --git a/app/assets/stylesheets/common/select-kit/notifications-button.scss b/app/assets/stylesheets/common/select-kit/notifications-button.scss
index 40ed042d53..6c7450a54c 100644
--- a/app/assets/stylesheets/common/select-kit/notifications-button.scss
+++ b/app/assets/stylesheets/common/select-kit/notifications-button.scss
@@ -7,8 +7,8 @@
 
       .select-kit-row {
         .icons {
-          -ms-flex-item-align: start;
           align-self: flex-start;
+          margin-right: 0.75em;
         }
       }
     }
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index f1c61c019a..ff39b2df69 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -190,7 +190,7 @@
     -webkit-overflow-scrolling: touch;
     margin: 0;
     padding: 0;
-    max-height: 200px;
+    max-height: 250px;
     width: 100%;
 
     .validation-message {
diff --git a/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss b/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
index 3b52aecd12..60ba59881b 100644
--- a/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
+++ b/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
@@ -22,13 +22,13 @@
         }
 
         .d-icon {
-          color: $primary-high;
+          color: $primary-medium;
         }
 
         &.is-highlighted,
         &.is-selected,
         &:hover {
-          background: $primary-low;
+          background: $tertiary-low;
           color: $primary;
         }
       }
diff --git a/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss b/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss
index 54b2567fca..6b0ebfcbc8 100644
--- a/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss
+++ b/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss
@@ -5,6 +5,10 @@
         padding: 0.75em 0.5em;
         border-bottom: 1px solid rgba($primary-low, 0.5);
 
+        .name {
+          line-height: $line-height-medium;
+        }
+
         &:last-child {
           border: none;
         }
diff --git a/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss
index 5d4c46832b..57ed8327cc 100644
--- a/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss
@@ -1,8 +1,20 @@
 .select-kit {
   &.dropdown-select-box {
     .select-kit-collection {
-      max-height: 200px;
       overflow-y: auto;
     }
+
+    .select-kit-row {
+      .svg-icon-title {
+        width: auto;
+        height: auto;
+      }
+
+      .texts {
+        .name {
+          font-weight: normal;
+        }
+      }
+    }
   }
 }

From 7635c18a14cc9a9b7c6502a59e0ab45ddd65a174 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 29 May 2020 13:05:44 +0200
Subject: [PATCH 1438/1830] DEV: ensures highlightjs is correctly tested
 (#9923)

---
 lib/tasks/javascript.rake                     |   5 +
 .../components/highlighted-code-test.js       |  22 ++
 .../highlightjs/highlight-test-bundle.min.js  | 194 ++++++++++++++++++
 3 files changed, 221 insertions(+)
 create mode 100644 test/javascripts/components/highlighted-code-test.js
 create mode 100644 vendor/assets/javascripts/highlightjs/highlight-test-bundle.min.js

diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rake
index 2b57ca0bc7..280e2451a3 100644
--- a/lib/tasks/javascript.rake
+++ b/lib/tasks/javascript.rake
@@ -177,6 +177,11 @@ task 'javascript:update' do
 
       puts "Cleanup unused styles folder"
       system("rm -rf node_modules/highlight.js/build/styles")
+
+      langs_dir = 'vendor/assets/javascripts/highlightjs/languages/*.min.js'
+      langs = Dir.glob(langs_dir).map { |lang| File.basename(lang).split('.')[0] }
+      test_bundle_dest = 'vendor/assets/javascripts/highlightjs/highlight-test-bundle.min.js'
+      File.write(test_bundle_dest, HighlightJs.bundle(langs))
     end
 
     if src.include? "ace-builds"
diff --git a/test/javascripts/components/highlighted-code-test.js b/test/javascripts/components/highlighted-code-test.js
new file mode 100644
index 0000000000..38b0f2d631
--- /dev/null
+++ b/test/javascripts/components/highlighted-code-test.js
@@ -0,0 +1,22 @@
+import componentTest from "helpers/component-test";
+
+moduleForComponent("highlighted-code", { integration: true });
+
+componentTest("highlighting code", {
+  template: "{{highlighted-code lang='ruby' code=code}}",
+
+  beforeEach() {
+    Discourse.HighlightJSPath =
+      "assets/highlightjs/highlight-test-bundle.min.js";
+    this.set("code", "def test; end");
+  },
+
+  async test(assert) {
+    assert.equal(
+      find("code.ruby.hljs .hljs-function .hljs-keyword")
+        .text()
+        .trim(),
+      "def"
+    );
+  }
+});
diff --git a/vendor/assets/javascripts/highlightjs/highlight-test-bundle.min.js b/vendor/assets/javascripts/highlightjs/highlight-test-bundle.min.js
new file mode 100644
index 0000000000..4371efe04a
--- /dev/null
+++ b/vendor/assets/javascripts/highlightjs/highlight-test-bundle.min.js
@@ -0,0 +1,194 @@
+/*! highlight.js v9.18.1 | BSD3 License | git.io/hljslicense */
+!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"==typeof exports||exports.nodeType?n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs})):e(exports)}(function(a){var f=[],o=Object.keys,C={},g={},m=!0,n=/^(no-?highlight|plain|text)$/i,E=/\blang(?:uage)?-([\w-]+)\b/i,t=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,r={case_insensitive:"cI",lexemes:"l",contains:"c",keywords:"k",subLanguage:"sL",className:"cN",begin:"b",beginKeywords:"bK",end:"e",endsWithParent:"eW",illegal:"i",excludeBegin:"eB",excludeEnd:"eE",returnBegin:"rB",returnEnd:"rE",variants:"v",IDENT_RE:"IR",UNDERSCORE_IDENT_RE:"UIR",NUMBER_RE:"NR",C_NUMBER_RE:"CNR",BINARY_NUMBER_RE:"BNR",RE_STARTERS_RE:"RSR",BACKSLASH_ESCAPE:"BE",APOS_STRING_MODE:"ASM",QUOTE_STRING_MODE:"QSM",PHRASAL_WORDS_MODE:"PWM",C_LINE_COMMENT_MODE:"CLCM",C_BLOCK_COMMENT_MODE:"CBCM",HASH_COMMENT_MODE:"HCM",NUMBER_MODE:"NM",C_NUMBER_MODE:"CNM",BINARY_NUMBER_MODE:"BNM",CSS_NUMBER_MODE:"CSSNM",REGEXP_MODE:"RM",TITLE_MODE:"TM",UNDERSCORE_TITLE_MODE:"UTM",COMMENT:"C",beginRe:"bR",endRe:"eR",illegalRe:"iR",lexemesRe:"lR",terminators:"t",terminator_end:"tE"},O="</span>",B="Could not find the language '{}', did you forget to load/include a language module?",x={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0},c="of and for in not or if then".split(" ");function S(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}function d(e){return e.nodeName.toLowerCase()}function R(e){return n.test(e)}function i(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function p(e){var a=[];return function e(n,t){for(var r=n.firstChild;r;r=r.nextSibling)3===r.nodeType?t+=r.nodeValue.length:1===r.nodeType&&(a.push({event:"start",offset:t,node:r}),t=e(r,t),d(r).match(/br|hr|img|input/)||a.push({event:"stop",offset:t,node:r}));return t}(e,0),a}function v(e,n,t){var r=0,a="",i=[];function o(){return e.length&&n.length?e[0].offset!==n[0].offset?e[0].offset<n[0].offset?e:n:"start"===n[0].event?e:n:e.length?e:n}function c(e){a+="<"+d(e)+f.map.call(e.attributes,function(e){return" "+e.nodeName+'="'+S(e.value).replace(/"/g,"&quot;")+'"'}).join("")+">"}function l(e){a+="</"+d(e)+">"}function u(e){("start"===e.event?c:l)(e.node)}for(;e.length||n.length;){var s=o();if(a+=S(t.substring(r,s[0].offset)),r=s[0].offset,s===e){for(i.reverse().forEach(l);u(s.splice(0,1)[0]),(s=o())===e&&s.length&&s[0].offset===r;);i.reverse().forEach(c)}else"start"===s[0].event?i.push(s[0].node):i.pop(),u(s.splice(0,1)[0])}return a+S(t.substr(r))}function l(n){return n.v&&!n.cached_variants&&(n.cached_variants=n.v.map(function(e){return i(n,{v:null},e)})),n.cached_variants?n.cached_variants:function e(n){return!!n&&(n.eW||e(n.starts))}(n)?[i(n,{starts:n.starts?i(n.starts):null})]:Object.isFrozen(n)?[i(n)]:[n]}function u(e){if(r&&!e.langApiRestored){for(var n in e.langApiRestored=!0,r)e[n]&&(e[r[n]]=e[n]);(e.c||[]).concat(e.v||[]).forEach(u)}}function M(n,t){var i={};return"string"==typeof n?r("keyword",n):o(n).forEach(function(e){r(e,n[e])}),i;function r(a,e){t&&(e=e.toLowerCase()),e.split(" ").forEach(function(e){var n,t,r=e.split("|");i[r[0]]=[a,(n=r[0],(t=r[1])?Number(t):function(e){return-1!=c.indexOf(e.toLowerCase())}(n)?0:1)]})}}function T(r){function s(e){return e&&e.source||e}function f(e,n){return new RegExp(s(e),"m"+(r.cI?"i":"")+(n?"g":""))}function a(a){var i={},o=[],c={},t=1;function e(e,n){i[t]=e,o.push([e,n]),t+=new RegExp(n.toString()+"|").exec("").length-1+1}for(var n=0;n<a.c.length;n++){var r,l=(r=a.c[n]).bK?"\\.?(?:"+r.b+")\\.?":r.b;e(r,l)}a.tE&&e("end",a.tE),a.i&&e("illegal",a.i);var u=f(function(e,n){for(var t=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./,r=0,a="",i=0;i<e.length;i++){var o=r+=1,c=s(e[i]);for(0<i&&(a+=n),a+="(";0<c.length;){var l=t.exec(c);if(null==l){a+=c;break}a+=c.substring(0,l.index),c=c.substring(l.index+l[0].length),"\\"==l[0][0]&&l[1]?a+="\\"+String(Number(l[1])+o):(a+=l[0],"("==l[0]&&r++)}a+=")"}return a}(o.map(function(e){return e[1]}),"|"),!0);return c.lastIndex=0,c.exec=function(e){var n;if(0===o.length)return null;u.lastIndex=c.lastIndex;var t=u.exec(e);if(!t)return null;for(var r=0;r<t.length;r++)if(null!=t[r]&&null!=i[""+r]){n=i[""+r];break}return"string"==typeof n?(t.type=n,t.extra=[a.i,a.tE]):(t.type="begin",t.rule=n),t},c}if(r.c&&-1!=r.c.indexOf("self")){if(!m)throw new Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.");r.c=r.c.filter(function(e){return"self"!=e})}!function n(t,e){t.compiled||(t.compiled=!0,t.k=t.k||t.bK,t.k&&(t.k=M(t.k,r.cI)),t.lR=f(t.l||/\w+/,!0),e&&(t.bK&&(t.b="\\b("+t.bK.split(" ").join("|")+")\\b"),t.b||(t.b=/\B|\b/),t.bR=f(t.b),t.endSameAsBegin&&(t.e=t.b),t.e||t.eW||(t.e=/\B|\b/),t.e&&(t.eR=f(t.e)),t.tE=s(t.e)||"",t.eW&&e.tE&&(t.tE+=(t.e?"|":"")+e.tE)),t.i&&(t.iR=f(t.i)),null==t.relevance&&(t.relevance=1),t.c||(t.c=[]),t.c=Array.prototype.concat.apply([],t.c.map(function(e){return l("self"===e?t:e)})),t.c.forEach(function(e){n(e,t)}),t.starts&&n(t.starts,e),t.t=a(t))}(r)}function w(n,e,a,t){var i=e;function c(e,n,t,r){if(!t&&""===n)return"";if(!e)return n;var a='<span class="'+(r?"":x.classPrefix);return(a+=e+'">')+n+(t?"":O)}function r(){var e,n,t,r,a,i,o;if(!d.k)return S(M);for(r="",n=0,d.lR.lastIndex=0,t=d.lR.exec(M);t;)r+=S(M.substring(n,t.index)),a=d,i=t,o=E.cI?i[0].toLowerCase():i[0],(e=a.k.hasOwnProperty(o)&&a.k[o])?(b+=e[1],r+=c(e[0],S(t[0]))):r+=S(t[0]),n=d.lR.lastIndex,t=d.lR.exec(M);return r+S(M.substr(n))}function o(){p+=(null!=d.sL?function(){var e="string"==typeof d.sL;if(e&&!C[d.sL])return S(M);var n=e?w(d.sL,M,!0,R[d.sL]):D(M,d.sL.length?d.sL:void 0);return 0<d.relevance&&(b+=n.relevance),e&&(R[d.sL]=n.top),c(n.language,n.value,!1,!0)}:r)(),M=""}function l(e){p+=e.cN?c(e.cN,"",!0):"",d=Object.create(e,{parent:{value:d}})}function u(e){var n=e[0],t=e.rule;return t&&t.endSameAsBegin&&(t.eR=new RegExp(n.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&"),"m")),t.skip?M+=n:(t.eB&&(M+=n),o(),t.rB||t.eB||(M=n)),l(t),t.rB?0:n.length}function s(e){var n=e[0],t=i.substr(e.index),r=function e(n,t){if(r=n.eR,a=t,(i=r&&r.exec(a))&&0===i.index){for(;n.endsParent&&n.parent;)n=n.parent;return n}var r,a,i;if(n.eW)return e(n.parent,t)}(d,t);if(r){var a=d;for(a.skip?M+=n:(a.rE||a.eE||(M+=n),o(),a.eE&&(M=n));d.cN&&(p+=O),d.skip||d.sL||(b+=d.relevance),(d=d.parent)!==r.parent;);return r.starts&&(r.endSameAsBegin&&(r.starts.eR=r.eR),l(r.starts)),a.rE?0:n.length}}var f={};function g(e,n){var t=n&&n[0];if(M+=e,null==t)return o(),0;if("begin"==f.type&&"end"==n.type&&f.index==n.index&&""===t)return M+=i.slice(n.index,n.index+1),1;if("begin"===(f=n).type)return u(n);if("illegal"===n.type&&!a)throw new Error('Illegal lexeme "'+t+'" for mode "'+(d.cN||"<unnamed>")+'"');if("end"===n.type){var r=s(n);if(null!=r)return r}return M+=t,t.length}var E=L(n);if(!E)throw console.error(B.replace("{}",n)),new Error('Unknown language: "'+n+'"');T(E);for(var d=t||E,R={},p="",v=d;v!==E;v=v.parent)v.cN&&(p=c(v.cN,"",!0)+p);var M="",b=0;try{for(var h,N,_=0;d.t.lastIndex=_,h=d.t.exec(i);)N=g(i.substring(_,h.index),h),_=h.index+N;for(g(i.substr(_)),v=d;v.parent;v=v.parent)v.cN&&(p+=O);return{relevance:b,value:p,i:!1,language:n,top:d}}catch(e){if(e.message&&-1!==e.message.indexOf("Illegal"))return{i:!0,relevance:0,value:S(i)};if(m)return{relevance:0,value:S(i),language:n,top:d,errorRaised:e};throw e}}function D(t,e){e=e||x.languages||o(C);var r={relevance:0,value:S(t)},a=r;return e.filter(L).filter(_).forEach(function(e){var n=w(e,t,!1);n.language=e,n.relevance>a.relevance&&(a=n),n.relevance>r.relevance&&(a=r,r=n)}),a.language&&(r.second_best=a),r}function b(e){return x.tabReplace||x.useBR?e.replace(t,function(e,n){return x.useBR&&"\n"===e?"<br>":x.tabReplace?n.replace(/\t/g,x.tabReplace):""}):e}function s(e){var n,t,r,a,i,o,c,l,u,s,f=function(e){var n,t,r,a,i=e.className+" ";if(i+=e.parentNode?e.parentNode.className:"",t=E.exec(i)){var o=L(t[1]);return o||(console.warn(B.replace("{}",t[1])),console.warn("Falling back to no-highlight mode for this block.",e)),o?t[1]:"no-highlight"}for(n=0,r=(i=i.split(/\s+/)).length;n<r;n++)if(R(a=i[n])||L(a))return a}(e);R(f)||(x.useBR?(n=document.createElement("div")).innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n"):n=e,i=n.textContent,r=f?w(f,i,!0):D(i),(t=p(n)).length&&((a=document.createElement("div")).innerHTML=r.value,r.value=v(t,p(a),i)),r.value=b(r.value),e.innerHTML=r.value,e.className=(o=e.className,c=f,l=r.language,u=c?g[c]:l,s=[o.trim()],o.match(/\bhljs\b/)||s.push("hljs"),-1===o.indexOf(u)&&s.push(u),s.join(" ").trim()),e.result={language:r.language,re:r.relevance},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.relevance}))}function h(){var e;h.called||(h.called=!0,e=document.querySelectorAll("pre code"),f.forEach.call(e,s))}var N={disableAutodetect:!0};function L(e){return e=(e||"").toLowerCase(),C[e]||C[g[e]]}function _(e){var n=L(e);return n&&!n.disableAutodetect}return a.highlight=w,a.highlightAuto=D,a.fixMarkup=b,a.highlightBlock=s,a.configure=function(e){x=i(x,e)},a.initHighlighting=h,a.initHighlightingOnLoad=function(){window.addEventListener("DOMContentLoaded",h,!1),window.addEventListener("load",h,!1)},a.registerLanguage=function(n,e){var t;try{t=e(a)}catch(e){if(console.error("Language definition for '{}' could not be registered.".replace("{}",n)),!m)throw e;console.error(e),t=N}u(C[n]=t),t.rawDefinition=e.bind(null,a),t.aliases&&t.aliases.forEach(function(e){g[e]=n})},a.listLanguages=function(){return o(C)},a.getLanguage=L,a.requireLanguage=function(e){var n=L(e);if(n)return n;throw new Error("The '{}' language is required, but not loaded.".replace("{}",e))},a.autoDetection=_,a.inherit=i,a.debugMode=function(){m=!1},a.IR=a.IDENT_RE="[a-zA-Z]\\w*",a.UIR=a.UNDERSCORE_IDENT_RE="[a-zA-Z_]\\w*",a.NR=a.NUMBER_RE="\\b\\d+(\\.\\d+)?",a.CNR=a.C_NUMBER_RE="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",a.BNR=a.BINARY_NUMBER_RE="\\b(0b[01]+)",a.RSR=a.RE_STARTERS_RE="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",a.BE=a.BACKSLASH_ESCAPE={b:"\\\\[\\s\\S]",relevance:0},a.ASM=a.APOS_STRING_MODE={cN:"string",b:"'",e:"'",i:"\\n",c:[a.BE]},a.QSM=a.QUOTE_STRING_MODE={cN:"string",b:'"',e:'"',i:"\\n",c:[a.BE]},a.PWM=a.PHRASAL_WORDS_MODE={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},a.C=a.COMMENT=function(e,n,t){var r=a.inherit({cN:"comment",b:e,e:n,c:[]},t||{});return r.c.push(a.PWM),r.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",relevance:0}),r},a.CLCM=a.C_LINE_COMMENT_MODE=a.C("//","$"),a.CBCM=a.C_BLOCK_COMMENT_MODE=a.C("/\\*","\\*/"),a.HCM=a.HASH_COMMENT_MODE=a.C("#","$"),a.NM=a.NUMBER_MODE={cN:"number",b:a.NR,relevance:0},a.CNM=a.C_NUMBER_MODE={cN:"number",b:a.CNR,relevance:0},a.BNM=a.BINARY_NUMBER_MODE={cN:"number",b:a.BNR,relevance:0},a.CSSNM=a.CSS_NUMBER_MODE={cN:"number",b:a.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",relevance:0},a.RM=a.REGEXP_MODE={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[a.BE,{b:/\[/,e:/\]/,relevance:0,c:[a.BE]}]},a.TM=a.TITLE_MODE={cN:"title",b:a.IR,relevance:0},a.UTM=a.UNDERSCORE_TITLE_MODE={cN:"title",b:a.UIR,relevance:0},a.METHOD_GUARD={b:"\\.\\s*"+a.UIR,relevance:0},[a.BE,a.ASM,a.QSM,a.PWM,a.C,a.CLCM,a.CBCM,a.HCM,a.NM,a.CNM,a.BNM,a.CSSNM,a.RM,a.TM,a.UTM,a.METHOD_GUARD].forEach(function(e){!function n(t){Object.freeze(t);var r="function"==typeof t;Object.getOwnPropertyNames(t).forEach(function(e){!t.hasOwnProperty(e)||null===t[e]||"object"!=typeof t[e]&&"function"!=typeof t[e]||r&&("caller"===e||"callee"===e||"arguments"===e)||Object.isFrozen(t[e])||n(t[e])});return t}(e)}),a});
+hljs.registerLanguage("subunit",function(s){return{cI:!0,c:[{cN:"string",b:"\\[\n(multipart)?",e:"\\]\n"},{cN:"string",b:"\\d{4}-\\d{2}-\\d{2}(\\s+)\\d{2}:\\d{2}:\\d{2}.\\d+Z"},{cN:"string",b:"(\\+|-)\\d+"},{cN:"keyword",relevance:10,v:[{b:"^(test|testing|success|successful|failure|error|skip|xfail|uxsuccess)(:?)\\s+(test)?"},{b:"^progress(:?)(\\s+)?(pop|push)?"},{b:"^tags:"},{b:"^time:"}]}]}});
+hljs.registerLanguage("rsl",function(e){return{k:{keyword:"float color point normal vector matrix while for if do return else break extern continue",built_in:"abs acos ambient area asin atan atmosphere attribute calculatenormal ceil cellnoise clamp comp concat cos degrees depth Deriv diffuse distance Du Dv environment exp faceforward filterstep floor format fresnel incident length lightsource log match max min mod noise normalize ntransform opposite option phong pnoise pow printf ptlined radians random reflect refract renderinfo round setcomp setxcomp setycomp setzcomp shadow sign sin smoothstep specular specularbrdf spline sqrt step tan texture textureinfo trace transform vtransform xcomp ycomp zcomp"},i:"</",c:[e.CLCM,e.CBCM,e.QSM,e.ASM,e.CNM,{cN:"meta",b:"#",e:"$"},{cN:"class",bK:"surface displacement light volume imager",e:"\\("},{bK:"illuminate illuminance gather",e:"\\("}]}});
+hljs.registerLanguage("csharp",function(){"use strict";return function(e){var n={keyword:"abstract as base bool break byte case catch char checked const continue decimal default delegate do double enum event explicit extern finally fixed float for foreach goto if implicit in int interface internal is lock long object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this try typeof uint ulong unchecked unsafe ushort using virtual void volatile while add alias ascending async await by descending dynamic equals from get global group into join let nameof on orderby partial remove select set value var when where yield",literal:"null false true"},i=e.inherit(e.TITLE_MODE,{begin:"[a-zA-Z](\\.?\\w)*"}),a={className:"number",variants:[{begin:"\\b(0b[01']+)"},{begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},s={className:"string",begin:'@"',end:'"',contains:[{begin:'""'}]},t=e.inherit(s,{illegal:/\n/}),l={className:"subst",begin:"{",end:"}",keywords:n},r=e.inherit(l,{illegal:/\n/}),c={className:"string",begin:/\$"/,end:'"',illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},e.BACKSLASH_ESCAPE,r]},o={className:"string",begin:/\$@"/,end:'"',contains:[{begin:"{{"},{begin:"}}"},{begin:'""'},l]},g=e.inherit(o,{illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},{begin:'""'},r]});l.contains=[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.C_BLOCK_COMMENT_MODE],r.contains=[g,c,t,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.inherit(e.C_BLOCK_COMMENT_MODE,{illegal:/\n/})];var d={variants:[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},E=e.IDENT_RE+"(<"+e.IDENT_RE+"(\\s*,\\s*"+e.IDENT_RE+")*>)?(\\[\\])?",_={begin:"@"+e.IDENT_RE,relevance:0};return{name:"C#",aliases:["cs","c#"],keywords:n,illegal:/::/,contains:[e.COMMENT("///","$",{returnBegin:!0,contains:[{className:"doctag",variants:[{begin:"///",relevance:0},{begin:"\x3c!--|--\x3e"},{begin:"</?",end:">"}]}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum"}},d,a,{beginKeywords:"class interface",end:/[{;=]/,illegal:/[^\s:,]/,contains:[{beginKeywords:"where class"},i,{begin:"<",end:">",keywords:"in out"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{beginKeywords:"namespace",end:/[{;=]/,illegal:/[^\s:]/,contains:[i,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"meta",begin:"^\\s*\\[",excludeBegin:!0,end:"\\]",excludeEnd:!0,contains:[{className:"meta-string",begin:/"/,end:/"/}]},{beginKeywords:"new return throw await else",relevance:0},{className:"function",begin:"("+E+"\\s+)+"+e.IDENT_RE+"\\s*\\(",returnBegin:!0,end:/\s*[{;=]/,excludeEnd:!0,keywords:n,contains:[{begin:e.IDENT_RE+"\\s*\\(",returnBegin:!0,contains:[e.TITLE_MODE],relevance:0},{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:n,relevance:0,contains:[d,a,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},_]}}}());
+hljs.registerLanguage("apache",function(e){var r={cN:"number",b:"[\\$%]\\d+"};return{aliases:["apacheconf"],cI:!0,c:[e.HCM,{cN:"section",b:"</?",e:">"},{cN:"attribute",b:/\w+/,relevance:0,k:{nomarkup:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{e:/$/,relevance:0,k:{literal:"on off all"},c:[{cN:"meta",b:"\\s\\[",e:"\\]$"},{cN:"variable",b:"[\\$%]\\{",e:"\\}",c:["self",r]},r,e.QSM]}}],i:/\S/}});
+hljs.registerLanguage("vbnet",function(e){return{aliases:["vb"],cI:!0,k:{keyword:"addhandler addressof alias and andalso aggregate ansi as async assembly auto await binary by byref byval call case catch class compare const continue custom declare default delegate dim distinct do each equals else elseif end enum erase error event exit explicit finally for friend from function get global goto group handles if implements imports in inherits interface into is isfalse isnot istrue iterator join key let lib like loop me mid mod module mustinherit mustoverride mybase myclass nameof namespace narrowing new next not notinheritable notoverridable of off on operator option optional or order orelse overloads overridable overrides paramarray partial preserve private property protected public raiseevent readonly redim rem removehandler resume return select set shadows shared skip static step stop structure strict sub synclock take text then throw to try unicode until using when where while widening with withevents writeonly xor yield",built_in:"boolean byte cbool cbyte cchar cdate cdec cdbl char cint clng cobj csbyte cshort csng cstr ctype date decimal directcast double gettype getxmlnamespace iif integer long object sbyte short single string trycast typeof uinteger ulong ushort",literal:"true false nothing"},i:"//|{|}|endif|gosub|variant|wend|^\\$ ",c:[e.inherit(e.QSM,{c:[{b:'""'}]}),e.C("'","$",{rB:!0,c:[{cN:"doctag",b:"'''|\x3c!--|--\x3e",c:[e.PWM]},{cN:"doctag",b:"</?",e:">",c:[e.PWM]}]}),e.CNM,{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elseif end region externalsource"}}]}});
+hljs.registerLanguage("monkey",function(e){var n={cN:"number",relevance:0,v:[{b:"[$][a-fA-F0-9]+"},e.NM]};return{cI:!0,k:{keyword:"public private property continue exit extern new try catch eachin not abstract final select case default const local global field end if then else elseif endif while wend repeat until forever for to step next return module inline throw import",built_in:"DebugLog DebugStop Error Print ACos ACosr ASin ASinr ATan ATan2 ATan2r ATanr Abs Abs Ceil Clamp Clamp Cos Cosr Exp Floor Log Max Max Min Min Pow Sgn Sgn Sin Sinr Sqrt Tan Tanr Seed PI HALFPI TWOPI",literal:"true false null and or shl shr mod"},i:/\/\*/,c:[e.C("#rem","#end"),e.C("'","$",{relevance:0}),{cN:"function",bK:"function method",e:"[(=:]|$",i:/\n/,c:[e.UTM]},{cN:"class",bK:"class interface",e:"$",c:[{bK:"extends implements"},e.UTM]},{cN:"built_in",b:"\\b(self|super)\\b"},{cN:"meta",b:"\\s*#",e:"$",k:{"meta-keyword":"if else elseif endif end then"}},{cN:"meta",b:"^\\s*strict\\b"},{bK:"alias",e:"=",c:[e.UTM]},e.QSM,n]}});
+hljs.registerLanguage("autohotkey",function(e){var a={b:"`[\\s\\S]"};return{cI:!0,aliases:["ahk"],k:{keyword:"Break Continue Critical Exit ExitApp Gosub Goto New OnExit Pause return SetBatchLines SetTimer Suspend Thread Throw Until ahk_id ahk_class ahk_pid ahk_exe ahk_group",literal:"true false NOT AND OR",built_in:"ComSpec Clipboard ClipboardAll ErrorLevel"},c:[a,e.inherit(e.QSM,{c:[a]}),e.C(";","$",{relevance:0}),e.CBCM,{cN:"number",b:e.NR,relevance:0},{cN:"variable",b:"%[a-zA-Z0-9#_$@]+%"},{cN:"built_in",b:"^\\s*\\w+\\s*(,|%)"},{cN:"title",v:[{b:'^[^\\n";]+::(?!=)'},{b:'^[^\\n";]+:(?!=)',relevance:0}]},{cN:"meta",b:"^\\s*#\\w+",e:"$",relevance:0},{cN:"built_in",b:"A_[a-zA-Z0-9]+"},{b:",\\s*,"}]}});
+hljs.registerLanguage("vbscript",function(e){return{aliases:["vbs"],cI:!0,k:{keyword:"call class const dim do loop erase execute executeglobal exit for each next function if then else on error option explicit new private property let get public randomize redim rem select case set stop sub while wend with end to elseif is or xor and not class_initialize class_terminate default preserve in me byval byref step resume goto",built_in:"lcase month vartype instrrev ubound setlocale getobject rgb getref string weekdayname rnd dateadd monthname now day minute isarray cbool round formatcurrency conversions csng timevalue second year space abs clng timeserial fixs len asc isempty maths dateserial atn timer isobject filter weekday datevalue ccur isdate instr datediff formatdatetime replace isnull right sgn array snumeric log cdbl hex chr lbound msgbox ucase getlocale cos cdate cbyte rtrim join hour oct typename trim strcomp int createobject loadpicture tan formatnumber mid scriptenginebuildversion scriptengine split scriptengineminorversion cint sin datepart ltrim sqr scriptenginemajorversion time derived eval date formatpercent exp inputbox left ascw chrw regexp server response request cstr err",literal:"true false null nothing empty"},i:"//",c:[e.inherit(e.QSM,{c:[{b:'""'}]}),e.C(/'/,/$/,{relevance:0}),e.CNM]}});
+hljs.registerLanguage("lua",function(e){var t="\\[=*\\[",a="\\]=*\\]",n={b:t,e:a,c:["self"]},l=[e.C("--(?!"+t+")","$"),e.C("--"+t,a,{c:[n],relevance:10})];return{l:e.UIR,k:{literal:"true false nil",keyword:"and break do else elseif end for goto if in local not or repeat return then until while",built_in:"_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len __gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstringmodule next pairs pcall print rawequal rawget rawset require select setfenvsetmetatable tonumber tostring type unpack xpcall arg selfcoroutine resume yield status wrap create running debug getupvalue debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv io lines write close flush open output type read stderr stdin input stdout popen tmpfile math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower table setn insert getn foreachi maxn foreach concat sort remove"},c:l.concat([{cN:"function",bK:"function",e:"\\)",c:[e.inherit(e.TM,{b:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),{cN:"params",b:"\\(",eW:!0,c:l}].concat(l)},e.CNM,e.ASM,e.QSM,{cN:"string",b:t,e:a,c:[n],relevance:5}])}});
+hljs.registerLanguage("erlang-repl",function(e){return{k:{built_in:"spawn spawn_link self",keyword:"after and andalso|10 band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse|10 query receive rem try when xor"},c:[{cN:"meta",b:"^[0-9]+> ",relevance:10},e.C("%","$"),{cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",relevance:0},e.ASM,e.QSM,{b:"\\?(::)?([A-Z]\\w*(::)?)+"},{b:"->"},{b:"ok"},{b:"!"},{b:"(\\b[a-z'][a-zA-Z0-9_']*:[a-z'][a-zA-Z0-9_']*)|(\\b[a-z'][a-zA-Z0-9_']*)",relevance:0},{b:"[A-Z][a-zA-Z0-9_']*",relevance:0}]}});
+hljs.registerLanguage("julia",function(e){var r={keyword:"in isa where baremodule begin break catch ccall const continue do else elseif end export false finally for function global if import importall let local macro module quote return true try using while type immutable abstract bitstype typealias ",literal:"true false ARGS C_NULL DevNull ENDIAN_BOM ENV I Inf Inf16 Inf32 Inf64 InsertionSort JULIA_HOME LOAD_PATH MergeSort NaN NaN16 NaN32 NaN64 PROGRAM_FILE QuickSort RoundDown RoundFromZero RoundNearest RoundNearestTiesAway RoundNearestTiesUp RoundToZero RoundUp STDERR STDIN STDOUT VERSION catalan e|0 eu|0 eulergamma golden im nothing pi γ π φ ",built_in:"ANY AbstractArray AbstractChannel AbstractFloat AbstractMatrix AbstractRNG AbstractSerializer AbstractSet AbstractSparseArray AbstractSparseMatrix AbstractSparseVector AbstractString AbstractUnitRange AbstractVecOrMat AbstractVector Any ArgumentError Array AssertionError Associative Base64DecodePipe Base64EncodePipe Bidiagonal BigFloat BigInt BitArray BitMatrix BitVector Bool BoundsError BufferStream CachingPool CapturedException CartesianIndex CartesianRange Cchar Cdouble Cfloat Channel Char Cint Cintmax_t Clong Clonglong ClusterManager Cmd CodeInfo Colon Complex Complex128 Complex32 Complex64 CompositeException Condition ConjArray ConjMatrix ConjVector Cptrdiff_t Cshort Csize_t Cssize_t Cstring Cuchar Cuint Cuintmax_t Culong Culonglong Cushort Cwchar_t Cwstring DataType Date DateFormat DateTime DenseArray DenseMatrix DenseVecOrMat DenseVector Diagonal Dict DimensionMismatch Dims DirectIndexString Display DivideError DomainError EOFError EachLine Enum Enumerate ErrorException Exception ExponentialBackOff Expr Factorization FileMonitor Float16 Float32 Float64 Function Future GlobalRef GotoNode HTML Hermitian IO IOBuffer IOContext IOStream IPAddr IPv4 IPv6 IndexCartesian IndexLinear IndexStyle InexactError InitError Int Int128 Int16 Int32 Int64 Int8 IntSet Integer InterruptException InvalidStateException Irrational KeyError LabelNode LinSpace LineNumberNode LoadError LowerTriangular MIME Matrix MersenneTwister Method MethodError MethodTable Module NTuple NewvarNode NullException Nullable Number ObjectIdDict OrdinalRange OutOfMemoryError OverflowError Pair ParseError PartialQuickSort PermutedDimsArray Pipe PollingFileWatcher ProcessExitedException Ptr QuoteNode RandomDevice Range RangeIndex Rational RawFD ReadOnlyMemoryError Real ReentrantLock Ref Regex RegexMatch RemoteChannel RemoteException RevString RoundingMode RowVector SSAValue SegmentationFault SerializationState Set SharedArray SharedMatrix SharedVector Signed SimpleVector Slot SlotNumber SparseMatrixCSC SparseVector StackFrame StackOverflowError StackTrace StepRange StepRangeLen StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubString SymTridiagonal Symbol Symmetric SystemError TCPSocket Task Text TextDisplay Timer Tridiagonal Tuple Type TypeError TypeMapEntry TypeMapLevel TypeName TypeVar TypedSlot UDPSocket UInt UInt128 UInt16 UInt32 UInt64 UInt8 UndefRefError UndefVarError UnicodeError UniformScaling Union UnionAll UnitRange Unsigned UpperTriangular Val Vararg VecElement VecOrMat Vector VersionNumber Void WeakKeyDict WeakRef WorkerConfig WorkerPool "},t="[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*",a={l:t,k:r,i:/<\//},n={cN:"subst",b:/\$\(/,e:/\)/,k:r},o={cN:"variable",b:"\\$"+t},i={cN:"string",c:[e.BE,n,o],v:[{b:/\w*"""/,e:/"""\w*/,relevance:10},{b:/\w*"/,e:/"\w*/}]},l={cN:"string",c:[e.BE,n,o],b:"`",e:"`"},c={cN:"meta",b:"@"+t};return a.c=[{cN:"number",b:/(\b0x[\d_]*(\.[\d_]*)?|0x\.\d[\d_]*)p[-+]?\d+|\b0[box][a-fA-F0-9][a-fA-F0-9_]*|(\b\d[\d_]*(\.[\d_]*)?|\.\d[\d_]*)([eEfF][-+]?\d+)?/,relevance:0},{cN:"string",b:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},i,l,c,{cN:"comment",v:[{b:"#=",e:"=#",relevance:10},{b:"#",e:"$"}]},e.HCM,{cN:"keyword",b:"\\b(((abstract|primitive)\\s+)type|(mutable\\s+)?struct)\\b"},{b:/<:/}],n.c=a.c,a});
+hljs.registerLanguage("swift",function(e){var i={keyword:"#available #colorLiteral #column #else #elseif #endif #file #fileLiteral #function #if #imageLiteral #line #selector #sourceLocation _ __COLUMN__ __FILE__ __FUNCTION__ __LINE__ Any as as! as? associatedtype associativity break case catch class continue convenience default defer deinit didSet do dynamic dynamicType else enum extension fallthrough false fileprivate final for func get guard if import in indirect infix init inout internal is lazy left let mutating nil none nonmutating open operator optional override postfix precedence prefix private protocol Protocol public repeat required rethrows return right self Self set static struct subscript super switch throw throws true try try! try? Type typealias unowned var weak where while willSet",literal:"true false nil",built_in:"abs advance alignof alignofValue anyGenerator assert assertionFailure bridgeFromObjectiveC bridgeFromObjectiveCUnconditional bridgeToObjectiveC bridgeToObjectiveCUnconditional c contains count countElements countLeadingZeros debugPrint debugPrintln distance dropFirst dropLast dump encodeBitsAsWords enumerate equal fatalError filter find getBridgedObjectiveCType getVaList indices insertionSort isBridgedToObjectiveC isBridgedVerbatimToObjectiveC isUniquelyReferenced isUniquelyReferencedNonObjC join lazy lexicographicalCompare map max maxElement min minElement numericCast overlaps partition posix precondition preconditionFailure print println quickSort readLine reduce reflect reinterpretCast reverse roundUpToAlignment sizeof sizeofValue sort split startsWith stride strideof strideofValue swap toString transcode underestimateCount unsafeAddressOf unsafeBitCast unsafeDowncast unsafeUnwrap unsafeReflect withExtendedLifetime withObjectAtPlusZero withUnsafePointer withUnsafePointerToObject withUnsafeMutablePointer withUnsafeMutablePointers withUnsafePointer withUnsafePointers withVaList zip"},t=e.C("/\\*","\\*/",{c:["self"]}),n={cN:"subst",b:/\\\(/,e:"\\)",k:i,c:[]},r={cN:"string",c:[e.BE,n],v:[{b:/"""/,e:/"""/},{b:/"/,e:/"/}]},a={cN:"number",b:"\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b",relevance:0};return n.c=[a],{k:i,c:[r,e.CLCM,t,{cN:"type",b:"\\b[A-Z][\\wÀ-ʸ']*[!?]"},{cN:"type",b:"\\b[A-Z][\\wÀ-ʸ']*",relevance:0},a,{cN:"function",bK:"func",e:"{",eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{b:/</,e:/>/},{cN:"params",b:/\(/,e:/\)/,endsParent:!0,k:i,c:["self",a,r,e.CBCM,{b:":"}],i:/["']/}],i:/\[|%/},{cN:"class",bK:"struct protocol class extension enum",k:i,e:"\\{",eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/})]},{cN:"meta",b:"(@discardableResult|@warn_unused_result|@exported|@lazy|@noescape|@NSCopying|@NSManaged|@objc|@objcMembers|@convention|@required|@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|@infix|@prefix|@postfix|@autoclosure|@testable|@available|@nonobjc|@NSApplicationMain|@UIApplicationMain|@dynamicMemberLookup|@propertyWrapper)"},{bK:"import",e:/$/,c:[e.CLCM,t]}]}});
+hljs.registerLanguage("x86asm",function(s){return{cI:!0,l:"[.%]?"+s.IR,k:{keyword:"lock rep repe repz repne repnz xaquire xrelease bnd nobnd aaa aad aam aas adc add and arpl bb0_reset bb1_reset bound bsf bsr bswap bt btc btr bts call cbw cdq cdqe clc cld cli clts cmc cmp cmpsb cmpsd cmpsq cmpsw cmpxchg cmpxchg486 cmpxchg8b cmpxchg16b cpuid cpu_read cpu_write cqo cwd cwde daa das dec div dmint emms enter equ f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcmovb fcmovbe fcmove fcmovnb fcmovnbe fcmovne fcmovnu fcmovu fcom fcomi fcomip fcomp fcompp fcos fdecstp fdisi fdiv fdivp fdivr fdivrp femms feni ffree ffreep fiadd ficom ficomp fidiv fidivr fild fimul fincstp finit fist fistp fisttp fisub fisubr fld fld1 fldcw fldenv fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul fmulp fnclex fndisi fneni fninit fnop fnsave fnstcw fnstenv fnstsw fpatan fprem fprem1 fptan frndint frstor fsave fscale fsetpm fsin fsincos fsqrt fst fstcw fstenv fstp fstsw fsub fsubp fsubr fsubrp ftst fucom fucomi fucomip fucomp fucompp fxam fxch fxtract fyl2x fyl2xp1 hlt ibts icebp idiv imul in inc incbin insb insd insw int int01 int1 int03 int3 into invd invpcid invlpg invlpga iret iretd iretq iretw jcxz jecxz jrcxz jmp jmpe lahf lar lds lea leave les lfence lfs lgdt lgs lidt lldt lmsw loadall loadall286 lodsb lodsd lodsq lodsw loop loope loopne loopnz loopz lsl lss ltr mfence monitor mov movd movq movsb movsd movsq movsw movsx movsxd movzx mul mwait neg nop not or out outsb outsd outsw packssdw packsswb packuswb paddb paddd paddsb paddsiw paddsw paddusb paddusw paddw pand pandn pause paveb pavgusb pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw pdistib pf2id pfacc pfadd pfcmpeq pfcmpge pfcmpgt pfmax pfmin pfmul pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt pfsub pfsubr pi2fd pmachriw pmaddwd pmagw pmulhriw pmulhrwa pmulhrwc pmulhw pmullw pmvgezb pmvlzb pmvnzb pmvzb pop popa popad popaw popf popfd popfq popfw por prefetch prefetchw pslld psllq psllw psrad psraw psrld psrlq psrlw psubb psubd psubsb psubsiw psubsw psubusb psubusw psubw punpckhbw punpckhdq punpckhwd punpcklbw punpckldq punpcklwd push pusha pushad pushaw pushf pushfd pushfq pushfw pxor rcl rcr rdshr rdmsr rdpmc rdtsc rdtscp ret retf retn rol ror rdm rsdc rsldt rsm rsts sahf sal salc sar sbb scasb scasd scasq scasw sfence sgdt shl shld shr shrd sidt sldt skinit smi smint smintold smsw stc std sti stosb stosd stosq stosw str sub svdc svldt svts swapgs syscall sysenter sysexit sysret test ud0 ud1 ud2b ud2 ud2a umov verr verw fwait wbinvd wrshr wrmsr xadd xbts xchg xlatb xlat xor cmove cmovz cmovne cmovnz cmova cmovnbe cmovae cmovnb cmovb cmovnae cmovbe cmovna cmovg cmovnle cmovge cmovnl cmovl cmovnge cmovle cmovng cmovc cmovnc cmovo cmovno cmovs cmovns cmovp cmovpe cmovnp cmovpo je jz jne jnz ja jnbe jae jnb jb jnae jbe jna jg jnle jge jnl jl jnge jle jng jc jnc jo jno js jns jpo jnp jpe jp sete setz setne setnz seta setnbe setae setnb setnc setb setnae setcset setbe setna setg setnle setge setnl setl setnge setle setng sets setns seto setno setpe setp setpo setnp addps addss andnps andps cmpeqps cmpeqss cmpleps cmpless cmpltps cmpltss cmpneqps cmpneqss cmpnleps cmpnless cmpnltps cmpnltss cmpordps cmpordss cmpunordps cmpunordss cmpps cmpss comiss cvtpi2ps cvtps2pi cvtsi2ss cvtss2si cvttps2pi cvttss2si divps divss ldmxcsr maxps maxss minps minss movaps movhps movlhps movlps movhlps movmskps movntps movss movups mulps mulss orps rcpps rcpss rsqrtps rsqrtss shufps sqrtps sqrtss stmxcsr subps subss ucomiss unpckhps unpcklps xorps fxrstor fxrstor64 fxsave fxsave64 xgetbv xsetbv xsave xsave64 xsaveopt xsaveopt64 xrstor xrstor64 prefetchnta prefetcht0 prefetcht1 prefetcht2 maskmovq movntq pavgb pavgw pextrw pinsrw pmaxsw pmaxub pminsw pminub pmovmskb pmulhuw psadbw pshufw pf2iw pfnacc pfpnacc pi2fw pswapd maskmovdqu clflush movntdq movnti movntpd movdqa movdqu movdq2q movq2dq paddq pmuludq pshufd pshufhw pshuflw pslldq psrldq psubq punpckhqdq punpcklqdq addpd addsd andnpd andpd cmpeqpd cmpeqsd cmplepd cmplesd cmpltpd cmpltsd cmpneqpd cmpneqsd cmpnlepd cmpnlesd cmpnltpd cmpnltsd cmpordpd cmpordsd cmpunordpd cmpunordsd cmppd comisd cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi cvtpd2ps cvtpi2pd cvtps2dq cvtps2pd cvtsd2si cvtsd2ss cvtsi2sd cvtss2sd cvttpd2pi cvttpd2dq cvttps2dq cvttsd2si divpd divsd maxpd maxsd minpd minsd movapd movhpd movlpd movmskpd movupd mulpd mulsd orpd shufpd sqrtpd sqrtsd subpd subsd ucomisd unpckhpd unpcklpd xorpd addsubpd addsubps haddpd haddps hsubpd hsubps lddqu movddup movshdup movsldup clgi stgi vmcall vmclear vmfunc vmlaunch vmload vmmcall vmptrld vmptrst vmread vmresume vmrun vmsave vmwrite vmxoff vmxon invept invvpid pabsb pabsw pabsd palignr phaddw phaddd phaddsw phsubw phsubd phsubsw pmaddubsw pmulhrsw pshufb psignb psignw psignd extrq insertq movntsd movntss lzcnt blendpd blendps blendvpd blendvps dppd dpps extractps insertps movntdqa mpsadbw packusdw pblendvb pblendw pcmpeqq pextrb pextrd pextrq phminposuw pinsrb pinsrd pinsrq pmaxsb pmaxsd pmaxud pmaxuw pminsb pminsd pminud pminuw pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq pmuldq pmulld ptest roundpd roundps roundsd roundss crc32 pcmpestri pcmpestrm pcmpistri pcmpistrm pcmpgtq popcnt getsec pfrcpv pfrsqrtv movbe aesenc aesenclast aesdec aesdeclast aesimc aeskeygenassist vaesenc vaesenclast vaesdec vaesdeclast vaesimc vaeskeygenassist vaddpd vaddps vaddsd vaddss vaddsubpd vaddsubps vandpd vandps vandnpd vandnps vblendpd vblendps vblendvpd vblendvps vbroadcastss vbroadcastsd vbroadcastf128 vcmpeq_ospd vcmpeqpd vcmplt_ospd vcmpltpd vcmple_ospd vcmplepd vcmpunord_qpd vcmpunordpd vcmpneq_uqpd vcmpneqpd vcmpnlt_uspd vcmpnltpd vcmpnle_uspd vcmpnlepd vcmpord_qpd vcmpordpd vcmpeq_uqpd vcmpnge_uspd vcmpngepd vcmpngt_uspd vcmpngtpd vcmpfalse_oqpd vcmpfalsepd vcmpneq_oqpd vcmpge_ospd vcmpgepd vcmpgt_ospd vcmpgtpd vcmptrue_uqpd vcmptruepd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd vcmppd vcmpeq_osps vcmpeqps vcmplt_osps vcmpltps vcmple_osps vcmpleps vcmpunord_qps vcmpunordps vcmpneq_uqps vcmpneqps vcmpnlt_usps vcmpnltps vcmpnle_usps vcmpnleps vcmpord_qps vcmpordps vcmpeq_uqps vcmpnge_usps vcmpngeps vcmpngt_usps vcmpngtps vcmpfalse_oqps vcmpfalseps vcmpneq_oqps vcmpge_osps vcmpgeps vcmpgt_osps vcmpgtps vcmptrue_uqps vcmptrueps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps vcmpps vcmpeq_ossd vcmpeqsd vcmplt_ossd vcmpltsd vcmple_ossd vcmplesd vcmpunord_qsd vcmpunordsd vcmpneq_uqsd vcmpneqsd vcmpnlt_ussd vcmpnltsd vcmpnle_ussd vcmpnlesd vcmpord_qsd vcmpordsd vcmpeq_uqsd vcmpnge_ussd vcmpngesd vcmpngt_ussd vcmpngtsd vcmpfalse_oqsd vcmpfalsesd vcmpneq_oqsd vcmpge_ossd vcmpgesd vcmpgt_ossd vcmpgtsd vcmptrue_uqsd vcmptruesd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd vcmpsd vcmpeq_osss vcmpeqss vcmplt_osss vcmpltss vcmple_osss vcmpless vcmpunord_qss vcmpunordss vcmpneq_uqss vcmpneqss vcmpnlt_usss vcmpnltss vcmpnle_usss vcmpnless vcmpord_qss vcmpordss vcmpeq_uqss vcmpnge_usss vcmpngess vcmpngt_usss vcmpngtss vcmpfalse_oqss vcmpfalsess vcmpneq_oqss vcmpge_osss vcmpgess vcmpgt_osss vcmpgtss vcmptrue_uqss vcmptruess vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss vcmpss vcomisd vcomiss vcvtdq2pd vcvtdq2ps vcvtpd2dq vcvtpd2ps vcvtps2dq vcvtps2pd vcvtsd2si vcvtsd2ss vcvtsi2sd vcvtsi2ss vcvtss2sd vcvtss2si vcvttpd2dq vcvttps2dq vcvttsd2si vcvttss2si vdivpd vdivps vdivsd vdivss vdppd vdpps vextractf128 vextractps vhaddpd vhaddps vhsubpd vhsubps vinsertf128 vinsertps vlddqu vldqqu vldmxcsr vmaskmovdqu vmaskmovps vmaskmovpd vmaxpd vmaxps vmaxsd vmaxss vminpd vminps vminsd vminss vmovapd vmovaps vmovd vmovq vmovddup vmovdqa vmovqqa vmovdqu vmovqqu vmovhlps vmovhpd vmovhps vmovlhps vmovlpd vmovlps vmovmskpd vmovmskps vmovntdq vmovntqq vmovntdqa vmovntpd vmovntps vmovsd vmovshdup vmovsldup vmovss vmovupd vmovups vmpsadbw vmulpd vmulps vmulsd vmulss vorpd vorps vpabsb vpabsw vpabsd vpacksswb vpackssdw vpackuswb vpackusdw vpaddb vpaddw vpaddd vpaddq vpaddsb vpaddsw vpaddusb vpaddusw vpalignr vpand vpandn vpavgb vpavgw vpblendvb vpblendw vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq vpermilpd vpermilps vperm2f128 vpextrb vpextrw vpextrd vpextrq vphaddw vphaddd vphaddsw vphminposuw vphsubw vphsubd vphsubsw vpinsrb vpinsrw vpinsrd vpinsrq vpmaddwd vpmaddubsw vpmaxsb vpmaxsw vpmaxsd vpmaxub vpmaxuw vpmaxud vpminsb vpminsw vpminsd vpminub vpminuw vpminud vpmovmskb vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq vpmulhuw vpmulhrsw vpmulhw vpmullw vpmulld vpmuludq vpmuldq vpor vpsadbw vpshufb vpshufd vpshufhw vpshuflw vpsignb vpsignw vpsignd vpslldq vpsrldq vpsllw vpslld vpsllq vpsraw vpsrad vpsrlw vpsrld vpsrlq vptest vpsubb vpsubw vpsubd vpsubq vpsubsb vpsubsw vpsubusb vpsubusw vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq vpxor vrcpps vrcpss vrsqrtps vrsqrtss vroundpd vroundps vroundsd vroundss vshufpd vshufps vsqrtpd vsqrtps vsqrtsd vsqrtss vstmxcsr vsubpd vsubps vsubsd vsubss vtestps vtestpd vucomisd vucomiss vunpckhpd vunpckhps vunpcklpd vunpcklps vxorpd vxorps vzeroall vzeroupper pclmullqlqdq pclmulhqlqdq pclmullqhqdq pclmulhqhqdq pclmulqdq vpclmullqlqdq vpclmulhqlqdq vpclmullqhqdq vpclmulhqhqdq vpclmulqdq vfmadd132ps vfmadd132pd vfmadd312ps vfmadd312pd vfmadd213ps vfmadd213pd vfmadd123ps vfmadd123pd vfmadd231ps vfmadd231pd vfmadd321ps vfmadd321pd vfmaddsub132ps vfmaddsub132pd vfmaddsub312ps vfmaddsub312pd vfmaddsub213ps vfmaddsub213pd vfmaddsub123ps vfmaddsub123pd vfmaddsub231ps vfmaddsub231pd vfmaddsub321ps vfmaddsub321pd vfmsub132ps vfmsub132pd vfmsub312ps vfmsub312pd vfmsub213ps vfmsub213pd vfmsub123ps vfmsub123pd vfmsub231ps vfmsub231pd vfmsub321ps vfmsub321pd vfmsubadd132ps vfmsubadd132pd vfmsubadd312ps vfmsubadd312pd vfmsubadd213ps vfmsubadd213pd vfmsubadd123ps vfmsubadd123pd vfmsubadd231ps vfmsubadd231pd vfmsubadd321ps vfmsubadd321pd vfnmadd132ps vfnmadd132pd vfnmadd312ps vfnmadd312pd vfnmadd213ps vfnmadd213pd vfnmadd123ps vfnmadd123pd vfnmadd231ps vfnmadd231pd vfnmadd321ps vfnmadd321pd vfnmsub132ps vfnmsub132pd vfnmsub312ps vfnmsub312pd vfnmsub213ps vfnmsub213pd vfnmsub123ps vfnmsub123pd vfnmsub231ps vfnmsub231pd vfnmsub321ps vfnmsub321pd vfmadd132ss vfmadd132sd vfmadd312ss vfmadd312sd vfmadd213ss vfmadd213sd vfmadd123ss vfmadd123sd vfmadd231ss vfmadd231sd vfmadd321ss vfmadd321sd vfmsub132ss vfmsub132sd vfmsub312ss vfmsub312sd vfmsub213ss vfmsub213sd vfmsub123ss vfmsub123sd vfmsub231ss vfmsub231sd vfmsub321ss vfmsub321sd vfnmadd132ss vfnmadd132sd vfnmadd312ss vfnmadd312sd vfnmadd213ss vfnmadd213sd vfnmadd123ss vfnmadd123sd vfnmadd231ss vfnmadd231sd vfnmadd321ss vfnmadd321sd vfnmsub132ss vfnmsub132sd vfnmsub312ss vfnmsub312sd vfnmsub213ss vfnmsub213sd vfnmsub123ss vfnmsub123sd vfnmsub231ss vfnmsub231sd vfnmsub321ss vfnmsub321sd rdfsbase rdgsbase rdrand wrfsbase wrgsbase vcvtph2ps vcvtps2ph adcx adox rdseed clac stac xstore xcryptecb xcryptcbc xcryptctr xcryptcfb xcryptofb montmul xsha1 xsha256 llwpcb slwpcb lwpval lwpins vfmaddpd vfmaddps vfmaddsd vfmaddss vfmaddsubpd vfmaddsubps vfmsubaddpd vfmsubaddps vfmsubpd vfmsubps vfmsubsd vfmsubss vfnmaddpd vfnmaddps vfnmaddsd vfnmaddss vfnmsubpd vfnmsubps vfnmsubsd vfnmsubss vfrczpd vfrczps vfrczsd vfrczss vpcmov vpcomb vpcomd vpcomq vpcomub vpcomud vpcomuq vpcomuw vpcomw vphaddbd vphaddbq vphaddbw vphadddq vphaddubd vphaddubq vphaddubw vphaddudq vphadduwd vphadduwq vphaddwd vphaddwq vphsubbw vphsubdq vphsubwd vpmacsdd vpmacsdqh vpmacsdql vpmacssdd vpmacssdqh vpmacssdql vpmacsswd vpmacssww vpmacswd vpmacsww vpmadcsswd vpmadcswd vpperm vprotb vprotd vprotq vprotw vpshab vpshad vpshaq vpshaw vpshlb vpshld vpshlq vpshlw vbroadcasti128 vpblendd vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq vpermd vpermpd vpermps vpermq vperm2i128 vextracti128 vinserti128 vpmaskmovd vpmaskmovq vpsllvd vpsllvq vpsravd vpsrlvd vpsrlvq vgatherdpd vgatherqpd vgatherdps vgatherqps vpgatherdd vpgatherqd vpgatherdq vpgatherqq xabort xbegin xend xtest andn bextr blci blcic blsi blsic blcfill blsfill blcmsk blsmsk blsr blcs bzhi mulx pdep pext rorx sarx shlx shrx tzcnt tzmsk t1mskc valignd valignq vblendmpd vblendmps vbroadcastf32x4 vbroadcastf64x4 vbroadcasti32x4 vbroadcasti64x4 vcompresspd vcompressps vcvtpd2udq vcvtps2udq vcvtsd2usi vcvtss2usi vcvttpd2udq vcvttps2udq vcvttsd2usi vcvttss2usi vcvtudq2pd vcvtudq2ps vcvtusi2sd vcvtusi2ss vexpandpd vexpandps vextractf32x4 vextractf64x4 vextracti32x4 vextracti64x4 vfixupimmpd vfixupimmps vfixupimmsd vfixupimmss vgetexppd vgetexpps vgetexpsd vgetexpss vgetmantpd vgetmantps vgetmantsd vgetmantss vinsertf32x4 vinsertf64x4 vinserti32x4 vinserti64x4 vmovdqa32 vmovdqa64 vmovdqu32 vmovdqu64 vpabsq vpandd vpandnd vpandnq vpandq vpblendmd vpblendmq vpcmpltd vpcmpled vpcmpneqd vpcmpnltd vpcmpnled vpcmpd vpcmpltq vpcmpleq vpcmpneqq vpcmpnltq vpcmpnleq vpcmpq vpcmpequd vpcmpltud vpcmpleud vpcmpnequd vpcmpnltud vpcmpnleud vpcmpud vpcmpequq vpcmpltuq vpcmpleuq vpcmpnequq vpcmpnltuq vpcmpnleuq vpcmpuq vpcompressd vpcompressq vpermi2d vpermi2pd vpermi2ps vpermi2q vpermt2d vpermt2pd vpermt2ps vpermt2q vpexpandd vpexpandq vpmaxsq vpmaxuq vpminsq vpminuq vpmovdb vpmovdw vpmovqb vpmovqd vpmovqw vpmovsdb vpmovsdw vpmovsqb vpmovsqd vpmovsqw vpmovusdb vpmovusdw vpmovusqb vpmovusqd vpmovusqw vpord vporq vprold vprolq vprolvd vprolvq vprord vprorq vprorvd vprorvq vpscatterdd vpscatterdq vpscatterqd vpscatterqq vpsraq vpsravq vpternlogd vpternlogq vptestmd vptestmq vptestnmd vptestnmq vpxord vpxorq vrcp14pd vrcp14ps vrcp14sd vrcp14ss vrndscalepd vrndscaleps vrndscalesd vrndscaless vrsqrt14pd vrsqrt14ps vrsqrt14sd vrsqrt14ss vscalefpd vscalefps vscalefsd vscalefss vscatterdpd vscatterdps vscatterqpd vscatterqps vshuff32x4 vshuff64x2 vshufi32x4 vshufi64x2 kandnw kandw kmovw knotw kortestw korw kshiftlw kshiftrw kunpckbw kxnorw kxorw vpbroadcastmb2q vpbroadcastmw2d vpconflictd vpconflictq vplzcntd vplzcntq vexp2pd vexp2ps vrcp28pd vrcp28ps vrcp28sd vrcp28ss vrsqrt28pd vrsqrt28ps vrsqrt28sd vrsqrt28ss vgatherpf0dpd vgatherpf0dps vgatherpf0qpd vgatherpf0qps vgatherpf1dpd vgatherpf1dps vgatherpf1qpd vgatherpf1qps vscatterpf0dpd vscatterpf0dps vscatterpf0qpd vscatterpf0qps vscatterpf1dpd vscatterpf1dps vscatterpf1qpd vscatterpf1qps prefetchwt1 bndmk bndcl bndcu bndcn bndmov bndldx bndstx sha1rnds4 sha1nexte sha1msg1 sha1msg2 sha256rnds2 sha256msg1 sha256msg2 hint_nop0 hint_nop1 hint_nop2 hint_nop3 hint_nop4 hint_nop5 hint_nop6 hint_nop7 hint_nop8 hint_nop9 hint_nop10 hint_nop11 hint_nop12 hint_nop13 hint_nop14 hint_nop15 hint_nop16 hint_nop17 hint_nop18 hint_nop19 hint_nop20 hint_nop21 hint_nop22 hint_nop23 hint_nop24 hint_nop25 hint_nop26 hint_nop27 hint_nop28 hint_nop29 hint_nop30 hint_nop31 hint_nop32 hint_nop33 hint_nop34 hint_nop35 hint_nop36 hint_nop37 hint_nop38 hint_nop39 hint_nop40 hint_nop41 hint_nop42 hint_nop43 hint_nop44 hint_nop45 hint_nop46 hint_nop47 hint_nop48 hint_nop49 hint_nop50 hint_nop51 hint_nop52 hint_nop53 hint_nop54 hint_nop55 hint_nop56 hint_nop57 hint_nop58 hint_nop59 hint_nop60 hint_nop61 hint_nop62 hint_nop63",built_in:"ip eip rip al ah bl bh cl ch dl dh sil dil bpl spl r8b r9b r10b r11b r12b r13b r14b r15b ax bx cx dx si di bp sp r8w r9w r10w r11w r12w r13w r14w r15w eax ebx ecx edx esi edi ebp esp eip r8d r9d r10d r11d r12d r13d r14d r15d rax rbx rcx rdx rsi rdi rbp rsp r8 r9 r10 r11 r12 r13 r14 r15 cs ds es fs gs ss st st0 st1 st2 st3 st4 st5 st6 st7 mm0 mm1 mm2 mm3 mm4 mm5 mm6 mm7 xmm0  xmm1  xmm2  xmm3  xmm4  xmm5  xmm6  xmm7  xmm8  xmm9 xmm10  xmm11 xmm12 xmm13 xmm14 xmm15 xmm16 xmm17 xmm18 xmm19 xmm20 xmm21 xmm22 xmm23 xmm24 xmm25 xmm26 xmm27 xmm28 xmm29 xmm30 xmm31 ymm0  ymm1  ymm2  ymm3  ymm4  ymm5  ymm6  ymm7  ymm8  ymm9 ymm10  ymm11 ymm12 ymm13 ymm14 ymm15 ymm16 ymm17 ymm18 ymm19 ymm20 ymm21 ymm22 ymm23 ymm24 ymm25 ymm26 ymm27 ymm28 ymm29 ymm30 ymm31 zmm0  zmm1  zmm2  zmm3  zmm4  zmm5  zmm6  zmm7  zmm8  zmm9 zmm10  zmm11 zmm12 zmm13 zmm14 zmm15 zmm16 zmm17 zmm18 zmm19 zmm20 zmm21 zmm22 zmm23 zmm24 zmm25 zmm26 zmm27 zmm28 zmm29 zmm30 zmm31 k0 k1 k2 k3 k4 k5 k6 k7 bnd0 bnd1 bnd2 bnd3 cr0 cr1 cr2 cr3 cr4 cr8 dr0 dr1 dr2 dr3 dr8 tr3 tr4 tr5 tr6 tr7 r0 r1 r2 r3 r4 r5 r6 r7 r0b r1b r2b r3b r4b r5b r6b r7b r0w r1w r2w r3w r4w r5w r6w r7w r0d r1d r2d r3d r4d r5d r6d r7d r0h r1h r2h r3h r0l r1l r2l r3l r4l r5l r6l r7l r8l r9l r10l r11l r12l r13l r14l r15l db dw dd dq dt ddq do dy dz resb resw resd resq rest resdq reso resy resz incbin equ times byte word dword qword nosplit rel abs seg wrt strict near far a32 ptr",meta:"%define %xdefine %+ %undef %defstr %deftok %assign %strcat %strlen %substr %rotate %elif %else %endif %if %ifmacro %ifctx %ifidn %ifidni %ifid %ifnum %ifstr %iftoken %ifempty %ifenv %error %warning %fatal %rep %endrep %include %push %pop %repl %pathsearch %depend %use %arg %stacksize %local %line %comment %endcomment .nolist __FILE__ __LINE__ __SECT__  __BITS__ __OUTPUT_FORMAT__ __DATE__ __TIME__ __DATE_NUM__ __TIME_NUM__ __UTC_DATE__ __UTC_TIME__ __UTC_DATE_NUM__ __UTC_TIME_NUM__  __PASS__ struc endstruc istruc at iend align alignb sectalign daz nodaz up down zero default option assume public bits use16 use32 use64 default section segment absolute extern global common cpu float __utf16__ __utf16le__ __utf16be__ __utf32__ __utf32le__ __utf32be__ __float8__ __float16__ __float32__ __float64__ __float80m__ __float80e__ __float128l__ __float128h__ __Infinity__ __QNaN__ __SNaN__ Inf NaN QNaN SNaN float8 float16 float32 float64 float80m float80e float128l float128h __FLOAT_DAZ__ __FLOAT_ROUND__ __FLOAT__"},c:[s.C(";","$",{relevance:0}),{cN:"number",v:[{b:"\\b(?:([0-9][0-9_]*)?\\.[0-9_]*(?:[eE][+-]?[0-9_]+)?|(0[Xx])?[0-9][0-9_]*\\.?[0-9_]*(?:[pP](?:[+-]?[0-9_]+)?)?)\\b",relevance:0},{b:"\\$[0-9][0-9A-Fa-f]*",relevance:0},{b:"\\b(?:[0-9A-Fa-f][0-9A-Fa-f_]*[Hh]|[0-9][0-9_]*[DdTt]?|[0-7][0-7_]*[QqOo]|[0-1][0-1_]*[BbYy])\\b"},{b:"\\b(?:0[Xx][0-9A-Fa-f_]+|0[DdTt][0-9_]+|0[QqOo][0-7_]+|0[BbYy][0-1_]+)\\b"}]},s.QSM,{cN:"string",v:[{b:"'",e:"[^\\\\]'"},{b:"`",e:"[^\\\\]`"}],relevance:0},{cN:"symbol",v:[{b:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)"},{b:"^\\s*%%[A-Za-z0-9_$#@~.?]*:"}],relevance:0},{cN:"subst",b:"%[0-9]+",relevance:0},{cN:"subst",b:"%!S+",relevance:0},{cN:"meta",b:/^\s*\.[\w_-]+/}]}});
+hljs.registerLanguage("c",function(){"use strict";return function(e){var n=e.getLanguage("c-like").rawDefinition();return n.name="C",n.aliases=["c","h"],n}}());
+hljs.registerLanguage("nsis",function(e){var t={cN:"variable",b:/\$+{[\w\.:-]+}/},n={cN:"variable",b:/\$+\w+/,i:/\(\){}/},i={cN:"variable",b:/\$+\([\w\^\.:-]+\)/},r={cN:"string",v:[{b:'"',e:'"'},{b:"'",e:"'"},{b:"`",e:"`"}],i:/\n/,c:[{cN:"meta",b:/\$(\\[nrt]|\$)/},{cN:"variable",b:/\$(ADMINTOOLS|APPDATA|CDBURN_AREA|CMDLINE|COMMONFILES32|COMMONFILES64|COMMONFILES|COOKIES|DESKTOP|DOCUMENTS|EXEDIR|EXEFILE|EXEPATH|FAVORITES|FONTS|HISTORY|HWNDPARENT|INSTDIR|INTERNET_CACHE|LANGUAGE|LOCALAPPDATA|MUSIC|NETHOOD|OUTDIR|PICTURES|PLUGINSDIR|PRINTHOOD|PROFILE|PROGRAMFILES32|PROGRAMFILES64|PROGRAMFILES|QUICKLAUNCH|RECENT|RESOURCES_LOCALIZED|RESOURCES|SENDTO|SMPROGRAMS|SMSTARTUP|STARTMENU|SYSDIR|TEMP|TEMPLATES|VIDEOS|WINDIR)/},t,n,i]};return{cI:!1,k:{keyword:"Abort AddBrandingImage AddSize AllowRootDirInstall AllowSkipFiles AutoCloseWindow BGFont BGGradient BrandingText BringToFront Call CallInstDLL Caption ChangeUI CheckBitmap ClearErrors CompletedText ComponentText CopyFiles CRCCheck CreateDirectory CreateFont CreateShortCut Delete DeleteINISec DeleteINIStr DeleteRegKey DeleteRegValue DetailPrint DetailsButtonText DirText DirVar DirVerify EnableWindow EnumRegKey EnumRegValue Exch Exec ExecShell ExecShellWait ExecWait ExpandEnvStrings File FileBufSize FileClose FileErrorText FileOpen FileRead FileReadByte FileReadUTF16LE FileReadWord FileSeek FileWrite FileWriteByte FileWriteUTF16LE FileWriteWord FindClose FindFirst FindNext FindWindow FlushINI FunctionEnd GetCurInstType GetCurrentAddress GetDlgItem GetDLLVersion GetDLLVersionLocal GetErrorLevel GetFileTime GetFileTimeLocal GetFullPathName GetFunctionAddress GetInstDirError GetLabelAddress GetTempFileName Goto HideWindow Icon IfAbort IfErrors IfFileExists IfRebootFlag IfSilent InitPluginsDir InstallButtonText InstallColors InstallDir InstallDirRegKey InstProgressFlags InstType InstTypeGetText InstTypeSetText Int64Cmp Int64CmpU Int64Fmt IntCmp IntCmpU IntFmt IntOp IntPtrCmp IntPtrCmpU IntPtrOp IsWindow LangString LicenseBkColor LicenseData LicenseForceSelection LicenseLangString LicenseText LoadLanguageFile LockWindow LogSet LogText ManifestDPIAware ManifestSupportedOS MessageBox MiscButtonText Name Nop OutFile Page PageCallbacks PageExEnd Pop Push Quit ReadEnvStr ReadINIStr ReadRegDWORD ReadRegStr Reboot RegDLL Rename RequestExecutionLevel ReserveFile Return RMDir SearchPath SectionEnd SectionGetFlags SectionGetInstTypes SectionGetSize SectionGetText SectionGroupEnd SectionIn SectionSetFlags SectionSetInstTypes SectionSetSize SectionSetText SendMessage SetAutoClose SetBrandingImage SetCompress SetCompressor SetCompressorDictSize SetCtlColors SetCurInstType SetDatablockOptimize SetDateSave SetDetailsPrint SetDetailsView SetErrorLevel SetErrors SetFileAttributes SetFont SetOutPath SetOverwrite SetRebootFlag SetRegView SetShellVarContext SetSilent ShowInstDetails ShowUninstDetails ShowWindow SilentInstall SilentUnInstall Sleep SpaceTexts StrCmp StrCmpS StrCpy StrLen SubCaption Unicode UninstallButtonText UninstallCaption UninstallIcon UninstallSubCaption UninstallText UninstPage UnRegDLL Var VIAddVersionKey VIFileVersion VIProductVersion WindowIcon WriteINIStr WriteRegBin WriteRegDWORD WriteRegExpandStr WriteRegMultiStr WriteRegNone WriteRegStr WriteUninstaller XPStyle",literal:"admin all auto both bottom bzip2 colored components current custom directory false force hide highest ifdiff ifnewer instfiles lastused leave left license listonly lzma nevershow none normal notset off on open print right show silent silentlog smooth textonly top true try un.components un.custom un.directory un.instfiles un.license uninstConfirm user Win10 Win7 Win8 WinVista zlib"},c:[e.HCM,e.CBCM,e.C(";","$",{relevance:0}),{cN:"function",bK:"Function PageEx Section SectionGroup",e:"$"},r,{cN:"keyword",b:/\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversion|gettlbversion|if|ifdef|ifmacrodef|ifmacrondef|ifndef|include|insertmacro|macro|macroend|makensis|packhdr|searchparse|searchreplace|system|tempfile|undef|verbose|warning)/},t,n,i,{cN:"params",b:"(ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)"},{cN:"class",b:/\w+\:\:\w+/},e.NM]}});
+hljs.registerLanguage("smalltalk",function(e){var a="[a-z][a-zA-Z0-9_]*",s={cN:"string",b:"\\$.{1}"},l={cN:"symbol",b:"#"+e.UIR};return{aliases:["st"],k:"self super nil true false thisContext",c:[e.C('"','"'),e.ASM,{cN:"type",b:"\\b[A-Z][A-Za-z0-9_]*",relevance:0},{b:a+":",relevance:0},e.CNM,l,s,{b:"\\|[ ]*"+a+"([ ]+"+a+")*[ ]*\\|",rB:!0,e:/\|/,i:/\S/,c:[{b:"(\\|[ ]*)?"+a}]},{b:"\\#\\(",e:"\\)",c:[e.ASM,s,e.CNM,l]}]}});
+hljs.registerLanguage("xquery",function(e){var t=[{cN:"variable",b:/[\$][\w-:]+/},{cN:"built_in",v:[{b:/\barray\:/,e:/(?:append|filter|flatten|fold\-(?:left|right)|for-each(?:\-pair)?|get|head|insert\-before|join|put|remove|reverse|size|sort|subarray|tail)\b/},{b:/\bmap\:/,e:/(?:contains|entry|find|for\-each|get|keys|merge|put|remove|size)\b/},{b:/\bmath\:/,e:/(?:a(?:cos|sin|tan[2]?)|cos|exp(?:10)?|log(?:10)?|pi|pow|sin|sqrt|tan)\b/},{b:/\bop\:/,e:/\(/,eE:!0},{b:/\bfn\:/,e:/\(/,eE:!0},{b:/[^<\/\$\:'"-]\b(?:abs|accumulator\-(?:after|before)|adjust\-(?:date(?:Time)?|time)\-to\-timezone|analyze\-string|apply|available\-(?:environment\-variables|system\-properties)|avg|base\-uri|boolean|ceiling|codepoints?\-(?:equal|to\-string)|collation\-key|collection|compare|concat|contains(?:\-token)?|copy\-of|count|current(?:\-)?(?:date(?:Time)?|time|group(?:ing\-key)?|output\-uri|merge\-(?:group|key))?data|dateTime|days?\-from\-(?:date(?:Time)?|duration)|deep\-equal|default\-(?:collation|language)|distinct\-values|document(?:\-uri)?|doc(?:\-available)?|element\-(?:available|with\-id)|empty|encode\-for\-uri|ends\-with|environment\-variable|error|escape\-html\-uri|exactly\-one|exists|false|filter|floor|fold\-(?:left|right)|for\-each(?:\-pair)?|format\-(?:date(?:Time)?|time|integer|number)|function\-(?:arity|available|lookup|name)|generate\-id|has\-children|head|hours\-from\-(?:dateTime|duration|time)|id(?:ref)?|implicit\-timezone|in\-scope\-prefixes|index\-of|innermost|insert\-before|iri\-to\-uri|json\-(?:doc|to\-xml)|key|lang|last|load\-xquery\-module|local\-name(?:\-from\-QName)?|(?:lower|upper)\-case|matches|max|minutes\-from\-(?:dateTime|duration|time)|min|months?\-from\-(?:date(?:Time)?|duration)|name(?:space\-uri\-?(?:for\-prefix|from\-QName)?)?|nilled|node\-name|normalize\-(?:space|unicode)|not|number|one\-or\-more|outermost|parse\-(?:ietf\-date|json)|path|position|(?:prefix\-from\-)?QName|random\-number\-generator|regex\-group|remove|replace|resolve\-(?:QName|uri)|reverse|root|round(?:\-half\-to\-even)?|seconds\-from\-(?:dateTime|duration|time)|snapshot|sort|starts\-with|static\-base\-uri|stream\-available|string\-?(?:join|length|to\-codepoints)?|subsequence|substring\-?(?:after|before)?|sum|system\-property|tail|timezone\-from\-(?:date(?:Time)?|time)|tokenize|trace|trans(?:form|late)|true|type\-available|unordered|unparsed\-(?:entity|text)?\-?(?:public\-id|uri|available|lines)?|uri\-collection|xml\-to\-json|years?\-from\-(?:date(?:Time)?|duration)|zero\-or\-one)\b/},{b:/\blocal\:/,e:/\(/,eE:!0},{b:/\bzip\:/,e:/(?:zip\-file|(?:xml|html|text|binary)\-entry| (?:update\-)?entries)\b/},{b:/\b(?:util|db|functx|app|xdmp|xmldb)\:/,e:/\(/,eE:!0}]},{cN:"string",v:[{b:/"/,e:/"/,c:[{b:/""/,relevance:0}]},{b:/'/,e:/'/,c:[{b:/''/,relevance:0}]}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{cN:"comment",b:"\\(:",e:":\\)",relevance:10,c:[{cN:"doctag",b:"@\\w+"}]},{cN:"meta",b:/%[\w-:]+/},{cN:"title",b:/\bxquery version "[13]\.[01]"\s?(?:encoding ".+")?/,e:/;/},{bK:"element attribute comment document processing-instruction",e:"{",eE:!0},{b:/<([\w\._:\-]+)((\s*.*)=('|").*('|"))?>/,e:/(\/[\w\._:\-]+>)/,sL:"xml",c:[{b:"{",e:"}",sL:"xquery"},"self"]}];return{aliases:["xpath","xq"],cI:!1,l:/[a-zA-Z\$][a-zA-Z0-9_:\-]*/,i:/(proc)|(abstract)|(extends)|(until)|(#)/,k:{keyword:"module schema namespace boundary-space preserve no-preserve strip default collation base-uri ordering context decimal-format decimal-separator copy-namespaces empty-sequence except exponent-separator external grouping-separator inherit no-inherit lax minus-sign per-mille percent schema-attribute schema-element strict unordered zero-digit declare import option function validate variable for at in let where order group by return if then else tumbling sliding window start when only end previous next stable ascending descending allowing empty greatest least some every satisfies switch case typeswitch try catch and or to union intersect instance of treat as castable cast map array delete insert into replace value rename copy modify update",type:"item document-node node attribute document element comment namespace namespace-node processing-instruction text construction xs:anyAtomicType xs:untypedAtomic xs:duration xs:time xs:decimal xs:float xs:double xs:gYearMonth xs:gYear xs:gMonthDay xs:gMonth xs:gDay xs:boolean xs:base64Binary xs:hexBinary xs:anyURI xs:QName xs:NOTATION xs:dateTime xs:dateTimeStamp xs:date xs:string xs:normalizedString xs:token xs:language xs:NMTOKEN xs:Name xs:NCName xs:ID xs:IDREF xs:ENTITY xs:integer xs:nonPositiveInteger xs:negativeInteger xs:long xs:int xs:short xs:byte xs:nonNegativeInteger xs:unisignedLong xs:unsignedInt xs:unsignedShort xs:unsignedByte xs:positiveInteger xs:yearMonthDuration xs:dayTimeDuration",literal:"eq ne lt le gt ge is self:: child:: descendant:: descendant-or-self:: attribute:: following:: following-sibling:: parent:: ancestor:: ancestor-or-self:: preceding:: preceding-sibling:: NaN"},c:t}});
+hljs.registerLanguage("typescript",function(e){var r="[A-Za-z$_][0-9A-Za-z$_]*",t={keyword:"in if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const class public private protected get set super static implements enum export import declare type namespace abstract as from extends async await",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document any number boolean string void Promise"},n={cN:"meta",b:"@"+r},a={b:"\\(",e:/\)/,k:t,c:["self",e.QSM,e.ASM,e.NM]},c={cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:t,c:[e.CLCM,e.CBCM,n,a]},s={cN:"number",v:[{b:"\\b(0[bB][01]+)n?"},{b:"\\b(0[oO][0-7]+)n?"},{b:e.CNR+"n?"}],relevance:0},o={cN:"subst",b:"\\$\\{",e:"\\}",k:t,c:[]},i={b:"html`",e:"",starts:{e:"`",rE:!1,c:[e.BE,o],sL:"xml"}},l={b:"css`",e:"",starts:{e:"`",rE:!1,c:[e.BE,o],sL:"css"}},b={cN:"string",b:"`",e:"`",c:[e.BE,o]};return o.c=[e.ASM,e.QSM,i,l,b,s,e.RM],{aliases:["ts"],k:t,c:[{cN:"meta",b:/^\s*['"]use strict['"]/},e.ASM,e.QSM,i,l,b,e.CLCM,e.CBCM,s,{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{cN:"function",b:"(\\(.*?\\)|"+e.IR+")\\s*=>",rB:!0,e:"\\s*=>",c:[{cN:"params",v:[{b:e.IR},{b:/\(\s*\)/},{b:/\(/,e:/\)/,eB:!0,eE:!0,k:t,c:["self",e.CLCM,e.CBCM]}]}]}],relevance:0},{cN:"function",bK:"function",e:/[\{;]/,eE:!0,k:t,c:["self",e.inherit(e.TM,{b:r}),c],i:/%/,relevance:0},{bK:"constructor",e:/[\{;]/,eE:!0,c:["self",c]},{b:/module\./,k:{built_in:"module"},relevance:0},{bK:"module",e:/\{/,eE:!0},{bK:"interface",e:/\{/,eE:!0,k:"interface extends"},{b:/\$[(.]/},{b:"\\."+e.IR,relevance:0},n,a]}});
+hljs.registerLanguage("prolog",function(e){var c={b:/\(/,e:/\)/,relevance:0},b={b:/\[/,e:/\]/},n={cN:"comment",b:/%/,e:/$/,c:[e.PWM]},r={cN:"string",b:/`/,e:/`/,c:[e.BE]},a=[{b:/[a-z][A-Za-z0-9_]*/,relevance:0},{cN:"symbol",v:[{b:/[A-Z][a-zA-Z0-9_]*/},{b:/_[A-Za-z0-9_]*/}],relevance:0},c,{b:/:-/},b,n,e.CBCM,e.QSM,e.ASM,r,{cN:"string",b:/0\'(\\\'|.)/},{cN:"string",b:/0\'\\s/},e.CNM];return c.c=a,{c:(b.c=a).concat([{b:/\.$/}])}});
+hljs.registerLanguage("asciidoc",function(e){return{aliases:["adoc"],c:[e.C("^/{4,}\\n","\\n/{4,}$",{relevance:10}),e.C("^//","$",{relevance:0}),{cN:"title",b:"^\\.\\w.*$"},{b:"^[=\\*]{4,}\\n",e:"\\n^[=\\*]{4,}$",relevance:10},{cN:"section",relevance:10,v:[{b:"^(={1,5}) .+?( \\1)?$"},{b:"^[^\\[\\]\\n]+?\\n[=\\-~\\^\\+]{2,}$"}]},{cN:"meta",b:"^:.+?:",e:"\\s",eE:!0,relevance:10},{cN:"meta",b:"^\\[.+?\\]$",relevance:0},{cN:"quote",b:"^_{4,}\\n",e:"\\n_{4,}$",relevance:10},{cN:"code",b:"^[\\-\\.]{4,}\\n",e:"\\n[\\-\\.]{4,}$",relevance:10},{b:"^\\+{4,}\\n",e:"\\n\\+{4,}$",c:[{b:"<",e:">",sL:"xml",relevance:0}],relevance:10},{cN:"bullet",b:"^(\\*+|\\-+|\\.+|[^\\n]+?::)\\s+"},{cN:"symbol",b:"^(NOTE|TIP|IMPORTANT|WARNING|CAUTION):\\s+",relevance:10},{cN:"strong",b:"\\B\\*(?![\\*\\s])",e:"(\\n{2}|\\*)",c:[{b:"\\\\*\\w",relevance:0}]},{cN:"emphasis",b:"\\B'(?!['\\s])",e:"(\\n{2}|')",c:[{b:"\\\\'\\w",relevance:0}],relevance:0},{cN:"emphasis",b:"_(?![_\\s])",e:"(\\n{2}|_)",relevance:0},{cN:"string",v:[{b:"``.+?''"},{b:"`.+?'"}]},{cN:"code",b:"(`.+?`|\\+.+?\\+)",relevance:0},{cN:"code",b:"^[ \\t]",e:"$",relevance:0},{b:"^'{3,}[ \\t]*$",relevance:10},{b:"(link:)?(http|https|ftp|file|irc|image:?):\\S+\\[.*?\\]",rB:!0,c:[{b:"(link|image:?):",relevance:0},{cN:"link",b:"\\w",e:"[^\\[]+",relevance:0},{cN:"string",b:"\\[",e:"\\]",eB:!0,eE:!0,relevance:0}],relevance:10}]}});
+hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},a={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]};return{aliases:["sh","zsh"],l:/\b-?[a-z\._]+\b/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,relevance:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],relevance:0},e.HCM,a,{cN:"",b:/\\"/},{cN:"string",b:/'/,e:/'/},t]}});
+hljs.registerLanguage("axapta",function(e){return{k:"false int abstract private char boolean static null if for true while long throw finally protected final return void enum else break new catch byte super case short default double public try this switch continue reverse firstfast firstonly forupdate nofetch sum avg minof maxof count order group by asc desc index hint like dispaly edit client server ttsbegin ttscommit str real date container anytype common div mod",c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM,{cN:"meta",b:"#",e:"$"},{cN:"class",bK:"class interface",e:"{",eE:!0,i:":",c:[{bK:"extends implements"},e.UTM]}]}});
+hljs.registerLanguage("coq",function(e){return{k:{keyword:"_|0 as at cofix else end exists exists2 fix for forall fun if IF in let match mod Prop return Set then Type using where with Abort About Add Admit Admitted All Arguments Assumptions Axiom Back BackTo Backtrack Bind Blacklist Canonical Cd Check Class Classes Close Coercion Coercions CoFixpoint CoInductive Collection Combined Compute Conjecture Conjectures Constant constr Constraint Constructors Context Corollary CreateHintDb Cut Declare Defined Definition Delimit Dependencies DependentDerive Drop eauto End Equality Eval Example Existential Existentials Existing Export exporting Extern Extract Extraction Fact Field Fields File Fixpoint Focus for From Function Functional Generalizable Global Goal Grab Grammar Graph Guarded Heap Hint HintDb Hints Hypotheses Hypothesis ident Identity If Immediate Implicit Import Include Inductive Infix Info Initial Inline Inspect Instance Instances Intro Intros Inversion Inversion_clear Language Left Lemma Let Libraries Library Load LoadPath Local Locate Ltac ML Mode Module Modules Monomorphic Morphism Next NoInline Notation Obligation Obligations Opaque Open Optimize Options Parameter Parameters Parametric Path Paths pattern Polymorphic Preterm Print Printing Program Projections Proof Proposition Pwd Qed Quit Rec Record Recursive Redirect Relation Remark Remove Require Reserved Reset Resolve Restart Rewrite Right Ring Rings Save Scheme Scope Scopes Script Search SearchAbout SearchHead SearchPattern SearchRewrite Section Separate Set Setoid Show Solve Sorted Step Strategies Strategy Structure SubClass Table Tables Tactic Term Test Theorem Time Timeout Transparent Type Typeclasses Types Undelimit Undo Unfocus Unfocused Unfold Universe Universes Unset Unshelve using Variable Variables Variant Verbose Visibility where with",built_in:"abstract absurd admit after apply as assert assumption at auto autorewrite autounfold before bottom btauto by case case_eq cbn cbv change classical_left classical_right clear clearbody cofix compare compute congruence constr_eq constructor contradict contradiction cut cutrewrite cycle decide decompose dependent destruct destruction dintuition discriminate discrR do double dtauto eapply eassumption eauto ecase econstructor edestruct ediscriminate eelim eexact eexists einduction einjection eleft elim elimtype enough equality erewrite eright esimplify_eq esplit evar exact exactly_once exfalso exists f_equal fail field field_simplify field_simplify_eq first firstorder fix fold fourier functional generalize generalizing gfail give_up has_evar hnf idtac in induction injection instantiate intro intro_pattern intros intuition inversion inversion_clear is_evar is_var lapply lazy left lia lra move native_compute nia nsatz omega once pattern pose progress proof psatz quote record red refine reflexivity remember rename repeat replace revert revgoals rewrite rewrite_strat right ring ring_simplify rtauto set setoid_reflexivity setoid_replace setoid_rewrite setoid_symmetry setoid_transitivity shelve shelve_unifiable simpl simple simplify_eq solve specialize split split_Rabs split_Rmult stepl stepr subst sum swap symmetry tactic tauto time timeout top transitivity trivial try tryif unfold unify until using vm_compute with"},c:[e.QSM,e.C("\\(\\*","\\*\\)"),e.CNM,{cN:"type",eB:!0,b:"\\|\\s*",e:"\\w+"},{b:/[-=]>/}]}});
+hljs.registerLanguage("flix",function(e){var t={cN:"function",bK:"def",e:/[:={\[(\n;]/,eE:!0,c:[{cN:"title",b:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/}]};return{k:{literal:"true false",keyword:"case class def else enum if impl import in lat rel index let match namespace switch type yield with"},c:[e.CLCM,e.CBCM,{cN:"string",b:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},{cN:"string",v:[{b:'"',e:'"'}]},t,e.CNM]}});
+hljs.registerLanguage("python-repl",function(){"use strict";return function(n){return{aliases:["pycon"],contains:[{className:"meta",starts:{end:/ |$/,starts:{end:"$",subLanguage:"python"}},variants:[{begin:/^>>>(?=[ ]|$)/},{begin:/^\.\.\.(?=[ ]|$)/}]}]}}}());
+hljs.registerLanguage("arduino",function(e){var t="boolean byte word String",r="setup loopKeyboardController MouseController SoftwareSerial EthernetServer EthernetClient LiquidCrystal RobotControl GSMVoiceCall EthernetUDP EsploraTFT HttpClient RobotMotor WiFiClient GSMScanner FileSystem Scheduler GSMServer YunClient YunServer IPAddress GSMClient GSMModem Keyboard Ethernet Console GSMBand Esplora Stepper Process WiFiUDP GSM_SMS Mailbox USBHost Firmata PImage Client Server GSMPIN FileIO Bridge Serial EEPROM Stream Mouse Audio Servo File Task GPRS WiFi Wire TFT GSM SPI SD runShellCommandAsynchronously analogWriteResolution retrieveCallingNumber printFirmwareVersion analogReadResolution sendDigitalPortPair noListenOnLocalhost readJoystickButton setFirmwareVersion readJoystickSwitch scrollDisplayRight getVoiceCallStatus scrollDisplayLeft writeMicroseconds delayMicroseconds beginTransmission getSignalStrength runAsynchronously getAsynchronously listenOnLocalhost getCurrentCarrier readAccelerometer messageAvailable sendDigitalPorts lineFollowConfig countryNameWrite runShellCommand readStringUntil rewindDirectory readTemperature setClockDivider readLightSensor endTransmission analogReference detachInterrupt countryNameRead attachInterrupt encryptionType readBytesUntil robotNameWrite readMicrophone robotNameRead cityNameWrite userNameWrite readJoystickY readJoystickX mouseReleased openNextFile scanNetworks noInterrupts digitalWrite beginSpeaker mousePressed isActionDone mouseDragged displayLogos noAutoscroll addParameter remoteNumber getModifiers keyboardRead userNameRead waitContinue processInput parseCommand printVersion readNetworks writeMessage blinkVersion cityNameRead readMessage setDataMode parsePacket isListening setBitOrder beginPacket isDirectory motorsWrite drawCompass digitalRead clearScreen serialEvent rightToLeft setTextSize leftToRight requestFrom keyReleased compassRead analogWrite interrupts WiFiServer disconnect playMelody parseFloat autoscroll getPINUsed setPINUsed setTimeout sendAnalog readSlider analogRead beginWrite createChar motorsStop keyPressed tempoWrite readButton subnetMask debugPrint macAddress writeGreen randomSeed attachGPRS readString sendString remotePort releaseAll mouseMoved background getXChange getYChange answerCall getResult voiceCall endPacket constrain getSocket writeJSON getButton available connected findUntil readBytes exitValue readGreen writeBlue startLoop IPAddress isPressed sendSysex pauseMode gatewayIP setCursor getOemKey tuneWrite noDisplay loadImage switchPIN onRequest onReceive changePIN playFile noBuffer parseInt overflow checkPIN knobRead beginTFT bitClear updateIR bitWrite position writeRGB highByte writeRed setSpeed readBlue noStroke remoteIP transfer shutdown hangCall beginSMS endWrite attached maintain noCursor checkReg checkPUK shiftOut isValid shiftIn pulseIn connect println localIP pinMode getIMEI display noBlink process getBand running beginSD drawBMP lowByte setBand release bitRead prepare pointTo readRed setMode noFill remove listen stroke detach attach noTone exists buffer height bitSet circle config cursor random IRread setDNS endSMS getKey micros millis begin print write ready flush width isPIN blink clear press mkdir rmdir close point yield image BSSID click delay read text move peek beep rect line open seek fill size turn stop home find step tone sqrt RSSI SSID end bit tan cos sin pow map abs max min get run put",i="DIGITAL_MESSAGE FIRMATA_STRING ANALOG_MESSAGE REPORT_DIGITAL REPORT_ANALOG INPUT_PULLUP SET_PIN_MODE INTERNAL2V56 SYSTEM_RESET LED_BUILTIN INTERNAL1V1 SYSEX_START INTERNAL EXTERNAL DEFAULT OUTPUT INPUT HIGH LOW",o=e.requireLanguage("cpp").rawDefinition(),a=o.k;return a.keyword+=" "+t,a.literal+=" "+i,a.built_in+=" "+r,o});
+hljs.registerLanguage("puppet",function(e){var s=e.C("#","$"),r="([A-Za-z_]|::)(\\w|::)*",a=e.inherit(e.TM,{b:r}),i={cN:"variable",b:"\\$"+r},n={cN:"string",c:[e.BE,i],v:[{b:/'/,e:/'/},{b:/"/,e:/"/}]};return{aliases:["pp"],c:[s,i,n,{bK:"class",e:"\\{|;",i:/=/,c:[a,s]},{bK:"define",e:/\{/,c:[{cN:"section",b:e.IR,endsParent:!0}]},{b:e.IR+"\\s+\\{",rB:!0,e:/\S/,c:[{cN:"keyword",b:e.IR},{b:/\{/,e:/\}/,k:{keyword:"and case default else elsif false if in import enherits node or true undef unless main settings $string ",literal:"alias audit before loglevel noop require subscribe tag owner ensure group mode name|0 changes context force incl lens load_path onlyif provider returns root show_diff type_check en_address ip_address realname command environment hour monute month monthday special target weekday creates cwd ogoutput refresh refreshonly tries try_sleep umask backup checksum content ctime force ignore links mtime purge recurse recurselimit replace selinux_ignore_defaults selrange selrole seltype seluser source souirce_permissions sourceselect validate_cmd validate_replacement allowdupe attribute_membership auth_membership forcelocal gid ia_load_module members system host_aliases ip allowed_trunk_vlans description device_url duplex encapsulation etherchannel native_vlan speed principals allow_root auth_class auth_type authenticate_user k_of_n mechanisms rule session_owner shared options device fstype enable hasrestart directory present absent link atboot blockdevice device dump pass remounts poller_tag use message withpath adminfile allow_virtual allowcdrom category configfiles flavor install_options instance package_settings platform responsefile status uninstall_options vendor unless_system_user unless_uid binary control flags hasstatus manifest pattern restart running start stop allowdupe auths expiry gid groups home iterations key_membership keys managehome membership password password_max_age password_min_age profile_membership profiles project purge_ssh_keys role_membership roles salt shell uid baseurl cost descr enabled enablegroups exclude failovermethod gpgcheck gpgkey http_caching include includepkgs keepalive metadata_expire metalink mirrorlist priority protect proxy proxy_password proxy_username repo_gpgcheck s3_enabled skip_if_unavailable sslcacert sslclientcert sslclientkey sslverify mounted",built_in:"architecture augeasversion blockdevices boardmanufacturer boardproductname boardserialnumber cfkey dhcp_servers domain ec2_ ec2_userdata facterversion filesystems ldom fqdn gid hardwareisa hardwaremodel hostname id|0 interfaces ipaddress ipaddress_ ipaddress6 ipaddress6_ iphostnumber is_virtual kernel kernelmajversion kernelrelease kernelversion kernelrelease kernelversion lsbdistcodename lsbdistdescription lsbdistid lsbdistrelease lsbmajdistrelease lsbminordistrelease lsbrelease macaddress macaddress_ macosx_buildversion macosx_productname macosx_productversion macosx_productverson_major macosx_productversion_minor manufacturer memoryfree memorysize netmask metmask_ network_ operatingsystem operatingsystemmajrelease operatingsystemrelease osfamily partitions path physicalprocessorcount processor processorcount productname ps puppetversion rubysitedir rubyversion selinux selinux_config_mode selinux_config_policy selinux_current_mode selinux_current_mode selinux_enforced selinux_policyversion serialnumber sp_ sshdsakey sshecdsakey sshrsakey swapencrypted swapfree swapsize timezone type uniqueid uptime uptime_days uptime_hours uptime_seconds uuid virtual vlans xendomains zfs_version zonenae zones zpool_version"},relevance:0,c:[n,s,{b:"[a-zA-Z_]+\\s*=>",rB:!0,e:"=>",c:[{cN:"attr",b:e.IR}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},i]}],relevance:0}]}});
+hljs.registerLanguage("moonscript",function(e){var t={keyword:"if then not for in while do return else elseif break continue switch and or unless when class extends super local import export from using",literal:"true false nil",built_in:"_G _VERSION assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall coroutine debug io math os package string table"},r="[A-Za-z$_][0-9A-Za-z$_]*",a={cN:"subst",b:/#\{/,e:/}/,k:t},s=[e.inherit(e.CNM,{starts:{e:"(\\s*/)?",relevance:0}}),{cN:"string",v:[{b:/'/,e:/'/,c:[e.BE]},{b:/"/,e:/"/,c:[e.BE,a]}]},{cN:"built_in",b:"@__"+e.IR},{b:"@"+e.IR},{b:e.IR+"\\\\"+e.IR}];a.c=s;var c=e.inherit(e.TM,{b:r}),n="(\\(.*\\))?\\s*\\B[-=]>",i={cN:"params",b:"\\([^\\(]",rB:!0,c:[{b:/\(/,e:/\)/,k:t,c:["self"].concat(s)}]};return{aliases:["moon"],k:t,i:/\/\*/,c:s.concat([e.C("--","$"),{cN:"function",b:"^\\s*"+r+"\\s*=\\s*"+n,e:"[-=]>",rB:!0,c:[c,i]},{b:/[\(,:=]\s*/,relevance:0,c:[{cN:"function",b:n,e:"[-=]>",rB:!0,c:[i]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[c]},c]},{cN:"name",b:r+":",e:":",rB:!0,rE:!0,relevance:0}])}});
+hljs.registerLanguage("nginx",function(e){var r={cN:"variable",v:[{b:/\$\d+/},{b:/\$\{/,e:/}/},{b:"[\\$\\@]"+e.UIR}]},b={eW:!0,l:"[a-z/_]+",k:{literal:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},relevance:0,i:"=>",c:[e.HCM,{cN:"string",c:[e.BE,r],v:[{b:/"/,e:/"/},{b:/'/,e:/'/}]},{b:"([a-z]+):/",e:"\\s",eW:!0,eE:!0,c:[r]},{cN:"regexp",c:[e.BE,r],v:[{b:"\\s\\^",e:"\\s|{|;",rE:!0},{b:"~\\*?\\s+",e:"\\s|{|;",rE:!0},{b:"\\*(\\.[a-z\\-]+)+"},{b:"([a-z\\-]+\\.)+\\*"}]},{cN:"number",b:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{cN:"number",b:"\\b\\d+[kKmMgGdshdwy]*\\b",relevance:0},r]};return{aliases:["nginxconf"],c:[e.HCM,{b:e.UIR+"\\s+{",rB:!0,e:"{",c:[{cN:"section",b:e.UIR}],relevance:0},{b:e.UIR+"\\s",e:";|{",rB:!0,c:[{cN:"attribute",b:e.UIR,starts:b}],relevance:0}],i:"[^\\s\\}]"}});
+hljs.registerLanguage("cos",function(e){return{cI:!0,aliases:["cos","cls"],k:"property parameter class classmethod clientmethod extends as break catch close continue do d|0 else elseif for goto halt hang h|0 if job j|0 kill k|0 lock l|0 merge new open quit q|0 read r|0 return set s|0 tcommit throw trollback try tstart use view while write w|0 xecute x|0 zkill znspace zn ztrap zwrite zw zzdump zzwrite print zbreak zinsert zload zprint zremove zsave zzprint mv mvcall mvcrt mvdim mvprint zquit zsync ascii",c:[{cN:"number",b:"\\b(\\d+(\\.\\d*)?|\\.\\d+)",relevance:0},{cN:"string",v:[{b:'"',e:'"',c:[{b:'""',relevance:0}]}]},e.CLCM,e.CBCM,{cN:"comment",b:/;/,e:"$",relevance:0},{cN:"built_in",b:/(?:\$\$?|\.\.)\^?[a-zA-Z]+/},{cN:"built_in",b:/\$\$\$[a-zA-Z]+/},{cN:"built_in",b:/%[a-z]+(?:\.[a-z]+)*/},{cN:"symbol",b:/\^%?[a-zA-Z][\w]*/},{cN:"keyword",b:/##class|##super|#define|#dim/},{b:/&sql\(/,e:/\)/,eB:!0,eE:!0,sL:"sql"},{b:/&(js|jscript|javascript)</,e:/>/,eB:!0,eE:!0,sL:"javascript"},{b:/&html<\s*</,e:/>\s*>/,sL:"xml"}]}});
+hljs.registerLanguage("gams",function(e){var a={keyword:"abort acronym acronyms alias all and assign binary card diag display else eq file files for free ge gt if integer le loop lt maximizing minimizing model models ne negative no not option options or ord positive prod put putpage puttl repeat sameas semicont semiint smax smin solve sos1 sos2 sum system table then until using while xor yes",literal:"eps inf na","built-in":"abs arccos arcsin arctan arctan2 Beta betaReg binomial ceil centropy cos cosh cvPower div div0 eDist entropy errorf execSeed exp fact floor frac gamma gammaReg log logBeta logGamma log10 log2 mapVal max min mod ncpCM ncpF ncpVUpow ncpVUsin normal pi poly power randBinomial randLinear randTriangle round rPower sigmoid sign signPower sin sinh slexp sllog10 slrec sqexp sqlog10 sqr sqrec sqrt tan tanh trunc uniform uniformInt vcPower bool_and bool_eqv bool_imp bool_not bool_or bool_xor ifThen rel_eq rel_ge rel_gt rel_le rel_lt rel_ne gday gdow ghour gleap gmillisec gminute gmonth gsecond gyear jdate jnow jstart jtime errorLevel execError gamsRelease gamsVersion handleCollect handleDelete handleStatus handleSubmit heapFree heapLimit heapSize jobHandle jobKill jobStatus jobTerminate licenseLevel licenseStatus maxExecError sleep timeClose timeComp timeElapsed timeExec timeStart"},o={cN:"symbol",v:[{b:/\=[lgenxc]=/},{b:/\$/}]},r={cN:"comment",v:[{b:"'",e:"'"},{b:'"',e:'"'}],i:"\\n",c:[e.BE]},t={b:"/",e:"/",k:a,c:[r,e.CLCM,e.CBCM,e.QSM,e.ASM,e.CNM]},l={b:/[a-z][a-z0-9_]*(\([a-z0-9_, ]*\))?[ \t]+/,eB:!0,e:"$",eW:!0,c:[r,t,{cN:"comment",b:/([ ]*[a-z0-9&#*=?@>\\<:\-,()$\[\]_.{}!+%^]+)+/,relevance:0}]};return{aliases:["gms"],cI:!0,k:a,c:[e.C(/^\$ontext/,/^\$offtext/),{cN:"meta",b:"^\\$[a-z0-9]+",e:"$",rB:!0,c:[{cN:"meta-keyword",b:"^\\$[a-z0-9]+"}]},e.C("^\\*","$"),e.CLCM,e.CBCM,e.QSM,e.ASM,{bK:"set sets parameter parameters variable variables scalar scalars equation equations",e:";",c:[e.C("^\\*","$"),e.CLCM,e.CBCM,e.QSM,e.ASM,t,l]},{bK:"table",e:";",rB:!0,c:[{bK:"table",e:"$",c:[l]},e.C("^\\*","$"),e.CLCM,e.CBCM,e.QSM,e.ASM,e.CNM]},{cN:"function",b:/^[a-z][a-z0-9_,\-+' ()$]+\.{2}/,rB:!0,c:[{cN:"title",b:/^[a-z0-9_]+/},{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0},o]},e.CNM,o]}});
+hljs.registerLanguage("openscad",function(e){var r={cN:"keyword",b:"\\$(f[asn]|t|vp[rtd]|children)"},n={cN:"number",b:"\\b\\d+(\\.\\d+)?(e-?\\d+)?",relevance:0},o=e.inherit(e.QSM,{i:null}),i={cN:"function",bK:"module function",e:"\\=|\\{",c:[{cN:"params",b:"\\(",e:"\\)",c:["self",n,o,r,{cN:"literal",b:"false|true|PI|undef"}]},e.UTM]};return{aliases:["scad"],k:{keyword:"function module include use for intersection_for if else \\%",literal:"false true PI undef",built_in:"circle square polygon text sphere cube cylinder polyhedron translate rotate scale resize mirror multmatrix color offset hull minkowski union difference intersection abs sign sin cos tan acos asin atan atan2 floor round ceil ln log pow sqrt exp rands min max concat lookup str chr search version version_num norm cross parent_module echo import import_dxf dxf_linear_extrude linear_extrude rotate_extrude surface projection render children dxf_cross dxf_dim let assign"},c:[e.CLCM,e.CBCM,n,{cN:"meta",k:{"meta-keyword":"include use"},b:"include|use <",e:">"},o,r,{b:"[*!#%]",relevance:0},i]}});
+hljs.registerLanguage("htmlbars",function(e){var a="action collection component concat debugger each each-in else get hash if input link-to loc log mut outlet partial query-params render textarea unbound unless with yield view",t=(e.QSM,{eW:!0,relevance:0,k:{keyword:"as",built_in:a},c:[e.QSM,{i:/\}\}/,b:/[a-zA-Z0-9_]+=/,rB:!0,relevance:0,c:[{cN:"attr",b:/[a-zA-Z0-9_]+/}]},e.NM]});return{cI:!0,sL:"xml",c:[e.C("{{!(--)?","(--)?}}"),{cN:"template-tag",b:/\{\{[#\/]/,e:/\}\}/,c:[{cN:"name",b:/[a-zA-Z\.\-]+/,k:{"builtin-name":a},starts:t}]},{cN:"template-variable",b:/\{\{[a-zA-Z][a-zA-Z\-]+/,e:/\}\}/,k:{keyword:"as",built_in:a},c:[e.QSM]}]}});
+hljs.registerLanguage("javascript",function(e){var r="<>",a="</>",t={b:/<[A-Za-z0-9\\._:-]+/,e:/\/[A-Za-z0-9\\._:-]+>|\/>/},c="[A-Za-z$_][0-9A-Za-z$_]*",n={keyword:"in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await static import from as",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise"},s={cN:"number",v:[{b:"\\b(0[bB][01]+)n?"},{b:"\\b(0[oO][0-7]+)n?"},{b:e.CNR+"n?"}],relevance:0},o={cN:"subst",b:"\\$\\{",e:"\\}",k:n,c:[]},i={b:"html`",e:"",starts:{e:"`",rE:!1,c:[e.BE,o],sL:"xml"}},b={b:"css`",e:"",starts:{e:"`",rE:!1,c:[e.BE,o],sL:"css"}},l={cN:"string",b:"`",e:"`",c:[e.BE,o]};o.c=[e.ASM,e.QSM,i,b,l,s,e.RM];var u=o.c.concat([e.CBCM,e.CLCM]);return{aliases:["js","jsx","mjs","cjs"],k:n,c:[{cN:"meta",relevance:10,b:/^\s*['"]use (strict|asm)['"]/},{cN:"meta",b:/^#!/,e:/$/},e.ASM,e.QSM,i,b,l,e.CLCM,e.C("/\\*\\*","\\*/",{relevance:0,c:[{cN:"doctag",b:"@[A-Za-z]+",c:[{cN:"type",b:"\\{",e:"\\}",relevance:0},{cN:"variable",b:c+"(?=\\s*(-)|$)",endsParent:!0,relevance:0},{b:/(?=[^\n])\s/,relevance:0}]}]}),e.CBCM,s,{b:/[{,\n]\s*/,relevance:0,c:[{b:c+"\\s*:",rB:!0,relevance:0,c:[{cN:"attr",b:c,relevance:0}]}]},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{cN:"function",b:"(\\(.*?\\)|"+c+")\\s*=>",rB:!0,e:"\\s*=>",c:[{cN:"params",v:[{b:c},{b:/\(\s*\)/},{b:/\(/,e:/\)/,eB:!0,eE:!0,k:n,c:u}]}]},{cN:"",b:/\s/,e:/\s*/,skip:!0},{v:[{b:r,e:a},{b:t.b,e:t.e}],sL:"xml",c:[{b:t.b,e:t.e,skip:!0,c:["self"]}]}],relevance:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:c}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:u}],i:/\[|%/},{b:/\$[(.]/},e.METHOD_GUARD,{cN:"class",bK:"class",e:/[{;=]/,eE:!0,i:/[:"\[\]]/,c:[{bK:"extends"},e.UTM]},{bK:"constructor get set",e:/\{/,eE:!0}],i:/#(?!!)/}});
+hljs.registerLanguage("lasso",function(e){var r="[a-zA-Z_][\\w.]*",a="<\\?(lasso(script)?|=)",t="\\]|\\?>",n={literal:"true false none minimal full all void and or not bw nbw ew new cn ncn lt lte gt gte eq neq rx nrx ft",built_in:"array date decimal duration integer map pair string tag xml null boolean bytes keyword list locale queue set stack staticarray local var variable global data self inherited currentcapture givenblock",keyword:"cache database_names database_schemanames database_tablenames define_tag define_type email_batch encode_set html_comment handle handle_error header if inline iterate ljax_target link link_currentaction link_currentgroup link_currentrecord link_detail link_firstgroup link_firstrecord link_lastgroup link_lastrecord link_nextgroup link_nextrecord link_prevgroup link_prevrecord log loop namespace_using output_none portal private protect records referer referrer repeating resultset rows search_args search_arguments select sort_args sort_arguments thread_atomic value_list while abort case else fail_if fail_ifnot fail if_empty if_false if_null if_true loop_abort loop_continue loop_count params params_up return return_value run_children soap_definetag soap_lastrequest soap_lastresponse tag_name ascending average by define descending do equals frozen group handle_failure import in into join let match max min on order parent protected provide public require returnhome skip split_thread sum take thread to trait type where with yield yieldhome"},l=e.C("\x3c!--","--\x3e",{relevance:0}),i={cN:"meta",b:"\\[noprocess\\]",starts:{e:"\\[/noprocess\\]",rE:!0,c:[l]}},s={cN:"meta",b:"\\[/noprocess|"+a},o={cN:"symbol",b:"'"+r+"'"},c=[e.CLCM,e.CBCM,e.inherit(e.CNM,{b:e.CNR+"|(-?infinity|NaN)\\b"}),e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null}),{cN:"string",b:"`",e:"`"},{v:[{b:"[#$]"+r},{b:"#",e:"\\d+",i:"\\W"}]},{cN:"type",b:"::\\s*",e:r,i:"\\W"},{cN:"params",v:[{b:"-(?!infinity)"+r,relevance:0},{b:"(\\.\\.\\.)"}]},{b:/(->|\.)\s*/,relevance:0,c:[o]},{cN:"class",bK:"define",rE:!0,e:"\\(|=>",c:[e.inherit(e.TM,{b:r+"(=(?!>))?|[-+*/%](?!>)"})]}];return{aliases:["ls","lassoscript"],cI:!0,l:r+"|&[lg]t;",k:n,c:[{cN:"meta",b:t,relevance:0,starts:{e:"\\[|"+a,rE:!0,relevance:0,c:[l]}},i,s,{cN:"meta",b:"\\[no_square_brackets",starts:{e:"\\[/no_square_brackets\\]",l:r+"|&[lg]t;",k:n,c:[{cN:"meta",b:t,relevance:0,starts:{e:"\\[noprocess\\]|"+a,rE:!0,c:[l]}},i,s].concat(c)}},{cN:"meta",b:"\\[",relevance:0},{cN:"meta",b:"^#!",e:"lasso9$",relevance:10}].concat(c)}});
+hljs.registerLanguage("python",function(e){var r={keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10",built_in:"Ellipsis NotImplemented",literal:"False None True"},b={cN:"meta",b:/^(>>>|\.\.\.) /},c={cN:"subst",b:/\{/,e:/\}/,k:r,i:/#/},a={b:/\{\{/,relevance:0},l={cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,c:[e.BE,b],relevance:10},{b:/(u|b)?r?"""/,e:/"""/,c:[e.BE,b],relevance:10},{b:/(fr|rf|f)'''/,e:/'''/,c:[e.BE,b,a,c]},{b:/(fr|rf|f)"""/,e:/"""/,c:[e.BE,b,a,c]},{b:/(u|r|ur)'/,e:/'/,relevance:10},{b:/(u|r|ur)"/,e:/"/,relevance:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},{b:/(fr|rf|f)'/,e:/'/,c:[e.BE,a,c]},{b:/(fr|rf|f)"/,e:/"/,c:[e.BE,a,c]},e.ASM,e.QSM]},n={cN:"number",relevance:0,v:[{b:e.BNR+"[lLjJ]?"},{b:"\\b(0o[0-7]+)[lLjJ]?"},{b:e.CNR+"[lLjJ]?"}]},i={cN:"params",b:/\(/,e:/\)/,c:["self",b,n,l,e.HCM]};return c.c=[l,n,b],{aliases:["py","gyp","ipython"],k:r,i:/(<\/|->|\?)|=>/,c:[b,n,{bK:"if",relevance:0},l,e.HCM,{v:[{cN:"function",bK:"def"},{cN:"class",bK:"class"}],e:/:/,i:/[${=;\n,]/,c:[e.UTM,i,{b:/->/,eW:!0,k:"None"}]},{cN:"meta",b:/^[\t ]*@/,e:/$/},{b:/\b(print|exec)\(/}]}});
+hljs.registerLanguage("makefile",function(e){var i={cN:"variable",v:[{b:"\\$\\("+e.UIR+"\\)",c:[e.BE]},{b:/\$[@%<?\^\+\*]/}]},r={cN:"string",b:/"/,e:/"/,c:[e.BE,i]},a={cN:"variable",b:/\$\([\w-]+\s/,e:/\)/,k:{built_in:"subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value"},c:[i]},n={b:"^"+e.UIR+"\\s*(?=[:+?]?=)"},t={cN:"section",b:/^[^\s]+:/,e:/$/,c:[i]};return{aliases:["mk","mak"],k:"define endef undefine ifdef ifndef ifeq ifneq else endif include -include sinclude override export unexport private vpath",l:/[\w-]+/,c:[e.HCM,i,r,a,n,{cN:"meta",b:/^\.PHONY:/,e:/$/,k:{"meta-keyword":".PHONY"},l:/[\.\w]+/},t]}});
+hljs.registerLanguage("verilog",function(e){return{aliases:["v","sv","svh"],cI:!1,k:{keyword:"accept_on alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind bins binsof bit break buf|0 bufif0 bufif1 byte case casex casez cell chandle checker class clocking cmos config const constraint context continue cover covergroup coverpoint cross deassign default defparam design disable dist do edge else end endcase endchecker endclass endclocking endconfig endfunction endgenerate endgroup endinterface endmodule endpackage endprimitive endprogram endproperty endspecify endsequence endtable endtask enum event eventually expect export extends extern final first_match for force foreach forever fork forkjoin function generate|5 genvar global highz0 highz1 if iff ifnone ignore_bins illegal_bins implements implies import incdir include initial inout input inside instance int integer interconnect interface intersect join join_any join_none large let liblist library local localparam logic longint macromodule matches medium modport module nand negedge nettype new nexttime nmos nor noshowcancelled not notif0 notif1 or output package packed parameter pmos posedge primitive priority program property protected pull0 pull1 pulldown pullup pulsestyle_ondetect pulsestyle_onevent pure rand randc randcase randsequence rcmos real realtime ref reg reject_on release repeat restrict return rnmos rpmos rtran rtranif0 rtranif1 s_always s_eventually s_nexttime s_until s_until_with scalared sequence shortint shortreal showcancelled signed small soft solve specify specparam static string strong strong0 strong1 struct super supply0 supply1 sync_accept_on sync_reject_on table tagged task this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 triand trior trireg type typedef union unique unique0 unsigned until until_with untyped use uwire var vectored virtual void wait wait_order wand weak weak0 weak1 while wildcard wire with within wor xnor xor",literal:"null",built_in:"$finish $stop $exit $fatal $error $warning $info $realtime $time $printtimescale $bitstoreal $bitstoshortreal $itor $signed $cast $bits $stime $timeformat $realtobits $shortrealtobits $rtoi $unsigned $asserton $assertkill $assertpasson $assertfailon $assertnonvacuouson $assertoff $assertcontrol $assertpassoff $assertfailoff $assertvacuousoff $isunbounded $sampled $fell $changed $past_gclk $fell_gclk $changed_gclk $rising_gclk $steady_gclk $coverage_control $coverage_get $coverage_save $set_coverage_db_name $rose $stable $past $rose_gclk $stable_gclk $future_gclk $falling_gclk $changing_gclk $display $coverage_get_max $coverage_merge $get_coverage $load_coverage_db $typename $unpacked_dimensions $left $low $increment $clog2 $ln $log10 $exp $sqrt $pow $floor $ceil $sin $cos $tan $countbits $onehot $isunknown $fatal $warning $dimensions $right $high $size $asin $acos $atan $atan2 $hypot $sinh $cosh $tanh $asinh $acosh $atanh $countones $onehot0 $error $info $random $dist_chi_square $dist_erlang $dist_exponential $dist_normal $dist_poisson $dist_t $dist_uniform $q_initialize $q_remove $q_exam $async$and$array $async$nand$array $async$or$array $async$nor$array $sync$and$array $sync$nand$array $sync$or$array $sync$nor$array $q_add $q_full $psprintf $async$and$plane $async$nand$plane $async$or$plane $async$nor$plane $sync$and$plane $sync$nand$plane $sync$or$plane $sync$nor$plane $system $display $displayb $displayh $displayo $strobe $strobeb $strobeh $strobeo $write $readmemb $readmemh $writememh $value$plusargs $dumpvars $dumpon $dumplimit $dumpports $dumpportson $dumpportslimit $writeb $writeh $writeo $monitor $monitorb $monitorh $monitoro $writememb $dumpfile $dumpoff $dumpall $dumpflush $dumpportsoff $dumpportsall $dumpportsflush $fclose $fdisplay $fdisplayb $fdisplayh $fdisplayo $fstrobe $fstrobeb $fstrobeh $fstrobeo $swrite $swriteb $swriteh $swriteo $fscanf $fread $fseek $fflush $feof $fopen $fwrite $fwriteb $fwriteh $fwriteo $fmonitor $fmonitorb $fmonitorh $fmonitoro $sformat $sformatf $fgetc $ungetc $fgets $sscanf $rewind $ftell $ferror"},l:/[\w\$]+/,c:[e.CBCM,e.CLCM,e.QSM,{cN:"number",c:[e.BE],v:[{b:"\\b((\\d+'(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+)"},{b:"\\B(('(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+)"},{b:"\\b([0-9_])+",relevance:0}]},{cN:"variable",v:[{b:"#\\((?!parameter).+\\)"},{b:"\\.\\w+",relevance:0}]},{cN:"meta",b:"`",e:"$",k:{"meta-keyword":"define __FILE__ __LINE__ begin_keywords celldefine default_nettype define else elsif end_keywords endcelldefine endif ifdef ifndef include line nounconnected_drive pragma resetall timescale unconnected_drive undef undefineall"},relevance:0}]}});
+hljs.registerLanguage("mipsasm",function(e){return{cI:!0,aliases:["mips"],l:"\\.?"+e.IR,k:{meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .ltorg ",built_in:"$0 $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 $17 $18 $19 $20 $21 $22 $23 $24 $25 $26 $27 $28 $29 $30 $31 zero at v0 v1 a0 a1 a2 a3 a4 a5 a6 a7 t0 t1 t2 t3 t4 t5 t6 t7 t8 t9 s0 s1 s2 s3 s4 s5 s6 s7 s8 k0 k1 gp sp fp ra $f0 $f1 $f2 $f2 $f4 $f5 $f6 $f7 $f8 $f9 $f10 $f11 $f12 $f13 $f14 $f15 $f16 $f17 $f18 $f19 $f20 $f21 $f22 $f23 $f24 $f25 $f26 $f27 $f28 $f29 $f30 $f31 Context Random EntryLo0 EntryLo1 Context PageMask Wired EntryHi HWREna BadVAddr Count Compare SR IntCtl SRSCtl SRSMap Cause EPC PRId EBase Config Config1 Config2 Config3 LLAddr Debug DEPC DESAVE CacheErr ECC ErrorEPC TagLo DataLo TagHi DataHi WatchLo WatchHi PerfCtl PerfCnt "},c:[{cN:"keyword",b:"\\b(addi?u?|andi?|b(al)?|beql?|bgez(al)?l?|bgtzl?|blezl?|bltz(al)?l?|bnel?|cl[oz]|divu?|ext|ins|j(al)?|jalr(.hb)?|jr(.hb)?|lbu?|lhu?|ll|lui|lw[lr]?|maddu?|mfhi|mflo|movn|movz|move|msubu?|mthi|mtlo|mul|multu?|nop|nor|ori?|rotrv?|sb|sc|se[bh]|sh|sllv?|slti?u?|srav?|srlv?|subu?|sw[lr]?|xori?|wsbh|abs.[sd]|add.[sd]|alnv.ps|bc1[ft]l?|c.(s?f|un|u?eq|[ou]lt|[ou]le|ngle?|seq|l[et]|ng[et]).[sd]|(ceil|floor|round|trunc).[lw].[sd]|cfc1|cvt.d.[lsw]|cvt.l.[dsw]|cvt.ps.s|cvt.s.[dlw]|cvt.s.p[lu]|cvt.w.[dls]|div.[ds]|ldx?c1|luxc1|lwx?c1|madd.[sd]|mfc1|mov[fntz]?.[ds]|msub.[sd]|mth?c1|mul.[ds]|neg.[ds]|nmadd.[ds]|nmsub.[ds]|p[lu][lu].ps|recip.fmt|r?sqrt.[ds]|sdx?c1|sub.[ds]|suxc1|swx?c1|break|cache|d?eret|[de]i|ehb|mfc0|mtc0|pause|prefx?|rdhwr|rdpgpr|sdbbp|ssnop|synci?|syscall|teqi?|tgei?u?|tlb(p|r|w[ir])|tlti?u?|tnei?|wait|wrpgpr)",e:"\\s"},e.C("[;#](?!s*$)","$"),e.CBCM,e.QSM,{cN:"string",b:"'",e:"[^\\\\]'",relevance:0},{cN:"title",b:"\\|",e:"\\|",i:"\\n",relevance:0},{cN:"number",v:[{b:"0x[0-9a-f]+"},{b:"\\b-?\\d+"}],relevance:0},{cN:"symbol",v:[{b:"^\\s*[a-z_\\.\\$][a-z0-9_\\.\\$]+:"},{b:"^\\s*[0-9]+:"},{b:"[0-9]+[bf]"}],relevance:0}],i:"/"}});
+hljs.registerLanguage("css",function(e){var c={b:/(?:[A-Z\_\.\-]+|--[a-zA-Z0-9_-]+)\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{eW:!0,eE:!0,c:[{b:/[\w-]+\(/,rB:!0,c:[{cN:"built_in",b:/[\w-]+/},{b:/\(/,e:/\)/,c:[e.ASM,e.QSM,e.CSSNM]}]},e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"number",b:"#[0-9A-Fa-f]+"},{cN:"meta",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"selector-id",b:/#[A-Za-z0-9_-]+/},{cN:"selector-class",b:/\.[A-Za-z0-9_-]+/},{cN:"selector-attr",b:/\[/,e:/\]/,i:"$",c:[e.ASM,e.QSM]},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"@(page|font-face)",l:"@[a-z-]+",k:"@page @font-face"},{b:"@",e:"[{;]",i:/:/,rB:!0,c:[{cN:"keyword",b:/@\-?\w[\w]*(\-\w+)*/},{b:/\s/,eW:!0,eE:!0,relevance:0,k:"and or not only",c:[{b:/[a-z-]+:/,cN:"attribute"},e.ASM,e.QSM,e.CSSNM]}]},{cN:"selector-tag",b:"[a-zA-Z-][a-zA-Z0-9_-]*",relevance:0},{b:"{",e:"}",i:/\S/,c:[e.CBCM,c]}]}});
+hljs.registerLanguage("clojure",function(e){var t="a-zA-Z_\\-!.?+*=<>&#'",n="["+t+"]["+t+"0-9/;:]*",r={b:n,relevance:0},a={cN:"number",b:"[-+]?\\d+(\\.\\d+)?",relevance:0},o=e.inherit(e.QSM,{i:null}),s=e.C(";","$",{relevance:0}),c={cN:"literal",b:/\b(true|false|nil)\b/},i={b:"[\\[\\{]",e:"[\\]\\}]"},d={cN:"comment",b:"\\^"+n},l=e.C("\\^\\{","\\}"),m={cN:"symbol",b:"[:]{1,2}"+n},p={b:"\\(",e:"\\)"},u={eW:!0,relevance:0},f={k:{"builtin-name":"def defonce cond apply if-not if-let if not not= = < > <= >= == + / * - rem quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? string? map? nil? contains? zero? instance? not-every? not-any? libspec? -> ->> .. . inc compare do dotimes mapcat take remove take-while drop letfn drop-last take-last drop-while while intern condp case reduced cycle split-at split-with repeat replicate iterate range merge zipmap declare line-seq sort comparator sort-by dorun doall nthnext nthrest partition eval doseq await await-for let agent atom send send-off release-pending-sends add-watch mapv filterv remove-watch agent-error restart-agent set-error-handler error-handler set-error-mode! error-mode shutdown-agents quote var fn loop recur throw try monitor-enter monitor-exit defmacro defn defn- macroexpand macroexpand-1 for dosync and or when when-not when-let comp juxt partial sequence memoize constantly complement identity assert peek pop doto proxy defstruct first rest cons defprotocol cast coll deftype defrecord last butlast sigs reify second ffirst fnext nfirst nnext defmulti defmethod meta with-meta ns in-ns create-ns import refer keys select-keys vals key val rseq name namespace promise into transient persistent! conj! assoc! dissoc! pop! disj! use class type num float double short byte boolean bigint biginteger bigdec print-method print-dup throw-if printf format load compile get-in update-in pr pr-on newline flush read slurp read-line subvec with-open memfn time re-find re-groups rand-int rand mod locking assert-valid-fdecl alias resolve ref deref refset swap! reset! set-validator! compare-and-set! alter-meta! reset-meta! commute get-validator alter ref-set ref-history-count ref-min-history ref-max-history ensure sync io! new next conj set! to-array future future-call into-array aset gen-class reduce map filter find empty hash-map hash-set sorted-map sorted-map-by sorted-set sorted-set-by vec vector seq flatten reverse assoc dissoc list disj get union difference intersection extend extend-type extend-protocol int nth delay count concat chunk chunk-buffer chunk-append chunk-first chunk-rest max min dec unchecked-inc-int unchecked-inc unchecked-dec-inc unchecked-dec unchecked-negate unchecked-add-int unchecked-add unchecked-subtract-int unchecked-subtract chunk-next chunk-cons chunked-seq? prn vary-meta lazy-seq spread list* str find-keyword keyword symbol gensym force rationalize"},l:n,cN:"name",b:n,starts:u},h=[p,o,d,l,s,m,i,a,c,r];return p.c=[e.C("comment",""),f,u],u.c=h,i.c=h,l.c=[i],{aliases:["clj"],i:/\S/,c:[p,o,d,l,s,m,i,a,c]}});
+hljs.registerLanguage("fsharp",function(e){var t={b:"<",e:">",c:[e.inherit(e.TM,{b:/'[a-zA-Z0-9_]+/})]};return{aliases:["fs"],k:"abstract and as assert base begin class default delegate do done downcast downto elif else end exception extern false finally for fun function global if in inherit inline interface internal lazy let match member module mutable namespace new null of open or override private public rec return sig static struct then to true try type upcast use val void when while with yield",i:/\/\*/,c:[{cN:"keyword",b:/\b(yield|return|let|do)!/},{cN:"string",b:'@"',e:'"',c:[{b:'""'}]},{cN:"string",b:'"""',e:'"""'},e.C("\\(\\*","\\*\\)"),{cN:"class",bK:"type",e:"\\(|=|$",eE:!0,c:[e.UTM,t]},{cN:"meta",b:"\\[<",e:">\\]",relevance:10},{cN:"symbol",b:"\\B('[A-Za-z])\\b",c:[e.BE]},e.CLCM,e.inherit(e.QSM,{i:null}),e.CNM]}});
+hljs.registerLanguage("dsconfig",function(e){return{k:"dsconfig",c:[{cN:"keyword",b:"^dsconfig",e:"\\s",eE:!0,relevance:10},{cN:"built_in",b:"(list|create|get|set|delete)-(\\w+)",e:"\\s",eE:!0,i:"!@#$%^&*()",relevance:10},{cN:"built_in",b:"--(\\w+)",e:"\\s",eE:!0},{cN:"string",b:/"/,e:/"/},{cN:"string",b:/'/,e:/'/},{cN:"string",b:"[\\w-?]+:\\w+",e:"\\W",relevance:0},{cN:"string",b:"\\w+-?\\w+",e:"\\W",relevance:0},e.HCM]}});
+hljs.registerLanguage("markdown",function(e){return{aliases:["md","mkdown","mkd"],c:[{cN:"section",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",relevance:0},{cN:"bullet",b:"^\\s*([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",relevance:0}]},{cN:"quote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"^```\\w*\\s*$",e:"^```[ ]*$"},{b:"`.+?`"},{b:"^( {4}|\\t)",e:"$",relevance:0}]},{b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"string",b:"\\[",e:"\\]",eB:!0,rE:!0,relevance:0},{cN:"link",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"symbol",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],relevance:10},{b:/^\[[^\n]+\]:/,rB:!0,c:[{cN:"symbol",b:/\[/,e:/\]/,eB:!0,eE:!0},{cN:"link",b:/:\s*/,e:/$/,eB:!0}]}]}});
+hljs.registerLanguage("scala",function(e){var t={cN:"subst",v:[{b:"\\$[A-Za-z0-9_]+"},{b:"\\${",e:"}"}]},a={cN:"string",v:[{b:'"',e:'"',i:"\\n",c:[e.BE]},{b:'"""',e:'"""',relevance:10},{b:'[a-z]+"',e:'"',i:"\\n",c:[e.BE,t]},{cN:"string",b:'[a-z]+"""',e:'"""',c:[t],relevance:10}]},c={cN:"type",b:"\\b[A-Z][A-Za-z0-9_]*",relevance:0},r={cN:"title",b:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/,relevance:0},n={cN:"class",bK:"class object trait type",e:/[:={\[\n;]/,eE:!0,c:[{bK:"extends with",relevance:10},{b:/\[/,e:/\]/,eB:!0,eE:!0,relevance:0,c:[c]},{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,relevance:0,c:[c]},r]},l={cN:"function",bK:"def",e:/[:={\[(\n;]/,eE:!0,c:[r]};return{k:{literal:"true false null",keyword:"type yield lazy override def with val var sealed abstract private trait object if forSome for while throw finally protected extends import final return else break new catch super class case package default try this match continue throws implicit"},c:[e.CLCM,e.CBCM,a,{cN:"symbol",b:"'\\w[\\w\\d_]*(?!')"},c,l,n,e.CNM,{cN:"meta",b:"@[A-Za-z]+"}]}});
+hljs.registerLanguage("php-template",function(){"use strict";return function(n){return{name:"PHP template",subLanguage:"xml",contains:[{begin:/<\?(php|=)?/,end:/\?>/,subLanguage:"php",contains:[{begin:"/\\*",end:"\\*/",skip:!0},{begin:'b"',end:'"',skip:!0},{begin:"b'",end:"'",skip:!0},n.inherit(n.APOS_STRING_MODE,{illegal:null,className:null,contains:null,skip:!0}),n.inherit(n.QUOTE_STRING_MODE,{illegal:null,className:null,contains:null,skip:!0})]}]}}}());
+hljs.registerLanguage("sqf",function(e){var t={cN:"string",v:[{b:'"',e:'"',c:[{b:'""',relevance:0}]},{b:"'",e:"'",c:[{b:"''",relevance:0}]}]},a={cN:"meta",b:/#\s*[a-z]+\b/,e:/$/,k:{"meta-keyword":"define undef ifdef ifndef else endif include"},c:[{b:/\\\n/,relevance:0},e.inherit(t,{cN:"meta-string"}),{cN:"meta-string",b:/<[^\n>]*>/,e:/$/,i:"\\n"},e.CLCM,e.CBCM]};return{aliases:["sqf"],cI:!0,k:{keyword:"case catch default do else exit exitWith for forEach from if private switch then throw to try waitUntil while with",built_in:"abs accTime acos action actionIDs actionKeys actionKeysImages actionKeysNames actionKeysNamesArray actionName actionParams activateAddons activatedAddons activateKey add3DENConnection add3DENEventHandler add3DENLayer addAction addBackpack addBackpackCargo addBackpackCargoGlobal addBackpackGlobal addCamShake addCuratorAddons addCuratorCameraArea addCuratorEditableObjects addCuratorEditingArea addCuratorPoints addEditorObject addEventHandler addForce addGoggles addGroupIcon addHandgunItem addHeadgear addItem addItemCargo addItemCargoGlobal addItemPool addItemToBackpack addItemToUniform addItemToVest addLiveStats addMagazine addMagazineAmmoCargo addMagazineCargo addMagazineCargoGlobal addMagazineGlobal addMagazinePool addMagazines addMagazineTurret addMenu addMenuItem addMissionEventHandler addMPEventHandler addMusicEventHandler addOwnedMine addPlayerScores addPrimaryWeaponItem addPublicVariableEventHandler addRating addResources addScore addScoreSide addSecondaryWeaponItem addSwitchableUnit addTeamMember addToRemainsCollector addTorque addUniform addVehicle addVest addWaypoint addWeapon addWeaponCargo addWeaponCargoGlobal addWeaponGlobal addWeaponItem addWeaponPool addWeaponTurret admin agent agents AGLToASL aimedAtTarget aimPos airDensityRTD airplaneThrottle airportSide AISFinishHeal alive all3DENEntities allAirports allControls allCurators allCutLayers allDead allDeadMen allDisplays allGroups allMapMarkers allMines allMissionObjects allow3DMode allowCrewInImmobile allowCuratorLogicIgnoreAreas allowDamage allowDammage allowFileOperations allowFleeing allowGetIn allowSprint allPlayers allSimpleObjects allSites allTurrets allUnits allUnitsUAV allVariables ammo ammoOnPylon and animate animateBay animateDoor animatePylon animateSource animationNames animationPhase animationSourcePhase animationState append apply armoryPoints arrayIntersect asin ASLToAGL ASLToATL assert assignAsCargo assignAsCargoIndex assignAsCommander assignAsDriver assignAsGunner assignAsTurret assignCurator assignedCargo assignedCommander assignedDriver assignedGunner assignedItems assignedTarget assignedTeam assignedVehicle assignedVehicleRole assignItem assignTeam assignToAirport atan atan2 atg ATLToASL attachedObject attachedObjects attachedTo attachObject attachTo attackEnabled backpack backpackCargo backpackContainer backpackItems backpackMagazines backpackSpaceFor behaviour benchmark binocular boundingBox boundingBoxReal boundingCenter breakOut breakTo briefingName buildingExit buildingPos buttonAction buttonSetAction cadetMode call callExtension camCommand camCommit camCommitPrepared camCommitted camConstuctionSetParams camCreate camDestroy cameraEffect cameraEffectEnableHUD cameraInterest cameraOn cameraView campaignConfigFile camPreload camPreloaded camPrepareBank camPrepareDir camPrepareDive camPrepareFocus camPrepareFov camPrepareFovRange camPreparePos camPrepareRelPos camPrepareTarget camSetBank camSetDir camSetDive camSetFocus camSetFov camSetFovRange camSetPos camSetRelPos camSetTarget camTarget camUseNVG canAdd canAddItemToBackpack canAddItemToUniform canAddItemToVest cancelSimpleTaskDestination canFire canMove canSlingLoad canStand canSuspend canTriggerDynamicSimulation canUnloadInCombat canVehicleCargo captive captiveNum cbChecked cbSetChecked ceil channelEnabled cheatsEnabled checkAIFeature checkVisibility className clearAllItemsFromBackpack clearBackpackCargo clearBackpackCargoGlobal clearGroupIcons clearItemCargo clearItemCargoGlobal clearItemPool clearMagazineCargo clearMagazineCargoGlobal clearMagazinePool clearOverlay clearRadio clearWeaponCargo clearWeaponCargoGlobal clearWeaponPool clientOwner closeDialog closeDisplay closeOverlay collapseObjectTree collect3DENHistory collectiveRTD combatMode commandArtilleryFire commandChat commander commandFire commandFollow commandFSM commandGetOut commandingMenu commandMove commandRadio commandStop commandSuppressiveFire commandTarget commandWatch comment commitOverlay compile compileFinal completedFSM composeText configClasses configFile configHierarchy configName configProperties configSourceAddonList configSourceMod configSourceModList confirmSensorTarget connectTerminalToUAV controlsGroupCtrl copyFromClipboard copyToClipboard copyWaypoints cos count countEnemy countFriendly countSide countType countUnknown create3DENComposition create3DENEntity createAgent createCenter createDialog createDiaryLink createDiaryRecord createDiarySubject createDisplay createGearDialog createGroup createGuardedPoint createLocation createMarker createMarkerLocal createMenu createMine createMissionDisplay createMPCampaignDisplay createSimpleObject createSimpleTask createSite createSoundSource createTask createTeam createTrigger createUnit createVehicle createVehicleCrew createVehicleLocal crew ctAddHeader ctAddRow ctClear ctCurSel ctData ctFindHeaderRows ctFindRowHeader ctHeaderControls ctHeaderCount ctRemoveHeaders ctRemoveRows ctrlActivate ctrlAddEventHandler ctrlAngle ctrlAutoScrollDelay ctrlAutoScrollRewind ctrlAutoScrollSpeed ctrlChecked ctrlClassName ctrlCommit ctrlCommitted ctrlCreate ctrlDelete ctrlEnable ctrlEnabled ctrlFade ctrlHTMLLoaded ctrlIDC ctrlIDD ctrlMapAnimAdd ctrlMapAnimClear ctrlMapAnimCommit ctrlMapAnimDone ctrlMapCursor ctrlMapMouseOver ctrlMapScale ctrlMapScreenToWorld ctrlMapWorldToScreen ctrlModel ctrlModelDirAndUp ctrlModelScale ctrlParent ctrlParentControlsGroup ctrlPosition ctrlRemoveAllEventHandlers ctrlRemoveEventHandler ctrlScale ctrlSetActiveColor ctrlSetAngle ctrlSetAutoScrollDelay ctrlSetAutoScrollRewind ctrlSetAutoScrollSpeed ctrlSetBackgroundColor ctrlSetChecked ctrlSetEventHandler ctrlSetFade ctrlSetFocus ctrlSetFont ctrlSetFontH1 ctrlSetFontH1B ctrlSetFontH2 ctrlSetFontH2B ctrlSetFontH3 ctrlSetFontH3B ctrlSetFontH4 ctrlSetFontH4B ctrlSetFontH5 ctrlSetFontH5B ctrlSetFontH6 ctrlSetFontH6B ctrlSetFontHeight ctrlSetFontHeightH1 ctrlSetFontHeightH2 ctrlSetFontHeightH3 ctrlSetFontHeightH4 ctrlSetFontHeightH5 ctrlSetFontHeightH6 ctrlSetFontHeightSecondary ctrlSetFontP ctrlSetFontPB ctrlSetFontSecondary ctrlSetForegroundColor ctrlSetModel ctrlSetModelDirAndUp ctrlSetModelScale ctrlSetPixelPrecision ctrlSetPosition ctrlSetScale ctrlSetStructuredText ctrlSetText ctrlSetTextColor ctrlSetTooltip ctrlSetTooltipColorBox ctrlSetTooltipColorShade ctrlSetTooltipColorText ctrlShow ctrlShown ctrlText ctrlTextHeight ctrlTextWidth ctrlType ctrlVisible ctRowControls ctRowCount ctSetCurSel ctSetData ctSetHeaderTemplate ctSetRowTemplate ctSetValue ctValue curatorAddons curatorCamera curatorCameraArea curatorCameraAreaCeiling curatorCoef curatorEditableObjects curatorEditingArea curatorEditingAreaType curatorMouseOver curatorPoints curatorRegisteredObjects curatorSelected curatorWaypointCost current3DENOperation currentChannel currentCommand currentMagazine currentMagazineDetail currentMagazineDetailTurret currentMagazineTurret currentMuzzle currentNamespace currentTask currentTasks currentThrowable currentVisionMode currentWaypoint currentWeapon currentWeaponMode currentWeaponTurret currentZeroing cursorObject cursorTarget customChat customRadio cutFadeOut cutObj cutRsc cutText damage date dateToNumber daytime deActivateKey debriefingText debugFSM debugLog deg delete3DENEntities deleteAt deleteCenter deleteCollection deleteEditorObject deleteGroup deleteGroupWhenEmpty deleteIdentity deleteLocation deleteMarker deleteMarkerLocal deleteRange deleteResources deleteSite deleteStatus deleteTeam deleteVehicle deleteVehicleCrew deleteWaypoint detach detectedMines diag_activeMissionFSMs diag_activeScripts diag_activeSQFScripts diag_activeSQSScripts diag_captureFrame diag_captureFrameToFile diag_captureSlowFrame diag_codePerformance diag_drawMode diag_enable diag_enabled diag_fps diag_fpsMin diag_frameNo diag_lightNewLoad diag_list diag_log diag_logSlowFrame diag_mergeConfigFile diag_recordTurretLimits diag_setLightNew diag_tickTime diag_toggle dialog diarySubjectExists didJIP didJIPOwner difficulty difficultyEnabled difficultyEnabledRTD difficultyOption direction directSay disableAI disableCollisionWith disableConversation disableDebriefingStats disableMapIndicators disableNVGEquipment disableRemoteSensors disableSerialization disableTIEquipment disableUAVConnectability disableUserInput displayAddEventHandler displayCtrl displayParent displayRemoveAllEventHandlers displayRemoveEventHandler displaySetEventHandler dissolveTeam distance distance2D distanceSqr distributionRegion do3DENAction doArtilleryFire doFire doFollow doFSM doGetOut doMove doorPhase doStop doSuppressiveFire doTarget doWatch drawArrow drawEllipse drawIcon drawIcon3D drawLine drawLine3D drawLink drawLocation drawPolygon drawRectangle drawTriangle driver drop dynamicSimulationDistance dynamicSimulationDistanceCoef dynamicSimulationEnabled dynamicSimulationSystemEnabled echo edit3DENMissionAttributes editObject editorSetEventHandler effectiveCommander emptyPositions enableAI enableAIFeature enableAimPrecision enableAttack enableAudioFeature enableAutoStartUpRTD enableAutoTrimRTD enableCamShake enableCaustics enableChannel enableCollisionWith enableCopilot enableDebriefingStats enableDiagLegend enableDynamicSimulation enableDynamicSimulationSystem enableEndDialog enableEngineArtillery enableEnvironment enableFatigue enableGunLights enableInfoPanelComponent enableIRLasers enableMimics enablePersonTurret enableRadio enableReload enableRopeAttach enableSatNormalOnDetail enableSaving enableSentences enableSimulation enableSimulationGlobal enableStamina enableTeamSwitch enableTraffic enableUAVConnectability enableUAVWaypoints enableVehicleCargo enableVehicleSensor enableWeaponDisassembly endLoadingScreen endMission engineOn enginesIsOnRTD enginesRpmRTD enginesTorqueRTD entities environmentEnabled estimatedEndServerTime estimatedTimeLeft evalObjectArgument everyBackpack everyContainer exec execEditorScript execFSM execVM exp expectedDestination exportJIPMessages eyeDirection eyePos face faction fadeMusic fadeRadio fadeSound fadeSpeech failMission fillWeaponsFromPool find findCover findDisplay findEditorObject findEmptyPosition findEmptyPositionReady findIf findNearestEnemy finishMissionInit finite fire fireAtTarget firstBackpack flag flagAnimationPhase flagOwner flagSide flagTexture fleeing floor flyInHeight flyInHeightASL fog fogForecast fogParams forceAddUniform forcedMap forceEnd forceFlagTexture forceFollowRoad forceMap forceRespawn forceSpeed forceWalk forceWeaponFire forceWeatherChange forEachMember forEachMemberAgent forEachMemberTeam forgetTarget format formation formationDirection formationLeader formationMembers formationPosition formationTask formatText formLeader freeLook fromEditor fuel fullCrew gearIDCAmmoCount gearSlotAmmoCount gearSlotData get3DENActionState get3DENAttribute get3DENCamera get3DENConnections get3DENEntity get3DENEntityID get3DENGrid get3DENIconsVisible get3DENLayerEntities get3DENLinesVisible get3DENMissionAttribute get3DENMouseOver get3DENSelected getAimingCoef getAllEnvSoundControllers getAllHitPointsDamage getAllOwnedMines getAllSoundControllers getAmmoCargo getAnimAimPrecision getAnimSpeedCoef getArray getArtilleryAmmo getArtilleryComputerSettings getArtilleryETA getAssignedCuratorLogic getAssignedCuratorUnit getBackpackCargo getBleedingRemaining getBurningValue getCameraViewDirection getCargoIndex getCenterOfMass getClientState getClientStateNumber getCompatiblePylonMagazines getConnectedUAV getContainerMaxLoad getCursorObjectParams getCustomAimCoef getDammage getDescription getDir getDirVisual getDLCAssetsUsage getDLCAssetsUsageByName getDLCs getEditorCamera getEditorMode getEditorObjectScope getElevationOffset getEnvSoundController getFatigue getForcedFlagTexture getFriend getFSMVariable getFuelCargo getGroupIcon getGroupIconParams getGroupIcons getHideFrom getHit getHitIndex getHitPointDamage getItemCargo getMagazineCargo getMarkerColor getMarkerPos getMarkerSize getMarkerType getMass getMissionConfig getMissionConfigValue getMissionDLCs getMissionLayerEntities getModelInfo getMousePosition getMusicPlayedTime getNumber getObjectArgument getObjectChildren getObjectDLC getObjectMaterials getObjectProxy getObjectTextures getObjectType getObjectViewDistance getOxygenRemaining getPersonUsedDLCs getPilotCameraDirection getPilotCameraPosition getPilotCameraRotation getPilotCameraTarget getPlateNumber getPlayerChannel getPlayerScores getPlayerUID getPos getPosASL getPosASLVisual getPosASLW getPosATL getPosATLVisual getPosVisual getPosWorld getPylonMagazines getRelDir getRelPos getRemoteSensorsDisabled getRepairCargo getResolution getShadowDistance getShotParents getSlingLoad getSoundController getSoundControllerResult getSpeed getStamina getStatValue getSuppression getTerrainGrid getTerrainHeightASL getText getTotalDLCUsageTime getUnitLoadout getUnitTrait getUserMFDText getUserMFDvalue getVariable getVehicleCargo getWeaponCargo getWeaponSway getWingsOrientationRTD getWingsPositionRTD getWPPos glanceAt globalChat globalRadio goggles goto group groupChat groupFromNetId groupIconSelectable groupIconsVisible groupId groupOwner groupRadio groupSelectedUnits groupSelectUnit gunner gusts halt handgunItems handgunMagazine handgunWeapon handsHit hasInterface hasPilotCamera hasWeapon hcAllGroups hcGroupParams hcLeader hcRemoveAllGroups hcRemoveGroup hcSelected hcSelectGroup hcSetGroup hcShowBar hcShownBar headgear hideBody hideObject hideObjectGlobal hideSelection hint hintC hintCadet hintSilent hmd hostMission htmlLoad HUDMovementLevels humidity image importAllGroups importance in inArea inAreaArray incapacitatedState inflame inflamed infoPanel infoPanelComponentEnabled infoPanelComponents infoPanels inGameUISetEventHandler inheritsFrom initAmbientLife inPolygon inputAction inRangeOfArtillery insertEditorObject intersect is3DEN is3DENMultiplayer isAbleToBreathe isAgent isArray isAutoHoverOn isAutonomous isAutotest isBleeding isBurning isClass isCollisionLightOn isCopilotEnabled isDamageAllowed isDedicated isDLCAvailable isEngineOn isEqualTo isEqualType isEqualTypeAll isEqualTypeAny isEqualTypeArray isEqualTypeParams isFilePatchingEnabled isFlashlightOn isFlatEmpty isForcedWalk isFormationLeader isGroupDeletedWhenEmpty isHidden isInRemainsCollector isInstructorFigureEnabled isIRLaserOn isKeyActive isKindOf isLaserOn isLightOn isLocalized isManualFire isMarkedForCollection isMultiplayer isMultiplayerSolo isNil isNull isNumber isObjectHidden isObjectRTD isOnRoad isPipEnabled isPlayer isRealTime isRemoteExecuted isRemoteExecutedJIP isServer isShowing3DIcons isSimpleObject isSprintAllowed isStaminaEnabled isSteamMission isStreamFriendlyUIEnabled isText isTouchingGround isTurnedOut isTutHintsEnabled isUAVConnectable isUAVConnected isUIContext isUniformAllowed isVehicleCargo isVehicleRadarOn isVehicleSensorEnabled isWalking isWeaponDeployed isWeaponRested itemCargo items itemsWithMagazines join joinAs joinAsSilent joinSilent joinString kbAddDatabase kbAddDatabaseTargets kbAddTopic kbHasTopic kbReact kbRemoveTopic kbTell kbWasSaid keyImage keyName knowsAbout land landAt landResult language laserTarget lbAdd lbClear lbColor lbColorRight lbCurSel lbData lbDelete lbIsSelected lbPicture lbPictureRight lbSelection lbSetColor lbSetColorRight lbSetCurSel lbSetData lbSetPicture lbSetPictureColor lbSetPictureColorDisabled lbSetPictureColorSelected lbSetPictureRight lbSetPictureRightColor lbSetPictureRightColorDisabled lbSetPictureRightColorSelected lbSetSelectColor lbSetSelectColorRight lbSetSelected lbSetText lbSetTextRight lbSetTooltip lbSetValue lbSize lbSort lbSortByValue lbText lbTextRight lbValue leader leaderboardDeInit leaderboardGetRows leaderboardInit leaderboardRequestRowsFriends leaderboardsRequestUploadScore leaderboardsRequestUploadScoreKeepBest leaderboardState leaveVehicle libraryCredits libraryDisclaimers lifeState lightAttachObject lightDetachObject lightIsOn lightnings limitSpeed linearConversion lineIntersects lineIntersectsObjs lineIntersectsSurfaces lineIntersectsWith linkItem list listObjects listRemoteTargets listVehicleSensors ln lnbAddArray lnbAddColumn lnbAddRow lnbClear lnbColor lnbCurSelRow lnbData lnbDeleteColumn lnbDeleteRow lnbGetColumnsPosition lnbPicture lnbSetColor lnbSetColumnsPos lnbSetCurSelRow lnbSetData lnbSetPicture lnbSetText lnbSetValue lnbSize lnbSort lnbSortByValue lnbText lnbValue load loadAbs loadBackpack loadFile loadGame loadIdentity loadMagazine loadOverlay loadStatus loadUniform loadVest local localize locationPosition lock lockCameraTo lockCargo lockDriver locked lockedCargo lockedDriver lockedTurret lockIdentity lockTurret lockWP log logEntities logNetwork logNetworkTerminate lookAt lookAtPos magazineCargo magazines magazinesAllTurrets magazinesAmmo magazinesAmmoCargo magazinesAmmoFull magazinesDetail magazinesDetailBackpack magazinesDetailUniform magazinesDetailVest magazinesTurret magazineTurretAmmo mapAnimAdd mapAnimClear mapAnimCommit mapAnimDone mapCenterOnCamera mapGridPosition markAsFinishedOnSteam markerAlpha markerBrush markerColor markerDir markerPos markerShape markerSize markerText markerType max members menuAction menuAdd menuChecked menuClear menuCollapse menuData menuDelete menuEnable menuEnabled menuExpand menuHover menuPicture menuSetAction menuSetCheck menuSetData menuSetPicture menuSetValue menuShortcut menuShortcutText menuSize menuSort menuText menuURL menuValue min mineActive mineDetectedBy missionConfigFile missionDifficulty missionName missionNamespace missionStart missionVersion mod modelToWorld modelToWorldVisual modelToWorldVisualWorld modelToWorldWorld modParams moonIntensity moonPhase morale move move3DENCamera moveInAny moveInCargo moveInCommander moveInDriver moveInGunner moveInTurret moveObjectToEnd moveOut moveTime moveTo moveToCompleted moveToFailed musicVolume name nameSound nearEntities nearestBuilding nearestLocation nearestLocations nearestLocationWithDubbing nearestObject nearestObjects nearestTerrainObjects nearObjects nearObjectsReady nearRoads nearSupplies nearTargets needReload netId netObjNull newOverlay nextMenuItemIndex nextWeatherChange nMenuItems not numberOfEnginesRTD numberToDate objectCurators objectFromNetId objectParent objStatus onBriefingGroup onBriefingNotes onBriefingPlan onBriefingTeamSwitch onCommandModeChanged onDoubleClick onEachFrame onGroupIconClick onGroupIconOverEnter onGroupIconOverLeave onHCGroupSelectionChanged onMapSingleClick onPlayerConnected onPlayerDisconnected onPreloadFinished onPreloadStarted onShowNewObject onTeamSwitch openCuratorInterface openDLCPage openMap openSteamApp openYoutubeVideo or orderGetIn overcast overcastForecast owner param params parseNumber parseSimpleArray parseText parsingNamespace particlesQuality pickWeaponPool pitch pixelGrid pixelGridBase pixelGridNoUIScale pixelH pixelW playableSlotsNumber playableUnits playAction playActionNow player playerRespawnTime playerSide playersNumber playGesture playMission playMove playMoveNow playMusic playScriptedMission playSound playSound3D position positionCameraToWorld posScreenToWorld posWorldToScreen ppEffectAdjust ppEffectCommit ppEffectCommitted ppEffectCreate ppEffectDestroy ppEffectEnable ppEffectEnabled ppEffectForceInNVG precision preloadCamera preloadObject preloadSound preloadTitleObj preloadTitleRsc preprocessFile preprocessFileLineNumbers primaryWeapon primaryWeaponItems primaryWeaponMagazine priority processDiaryLink productVersion profileName profileNamespace profileNameSteam progressLoadingScreen progressPosition progressSetPosition publicVariable publicVariableClient publicVariableServer pushBack pushBackUnique putWeaponPool queryItemsPool queryMagazinePool queryWeaponPool rad radioChannelAdd radioChannelCreate radioChannelRemove radioChannelSetCallSign radioChannelSetLabel radioVolume rain rainbow random rank rankId rating rectangular registeredTasks registerTask reload reloadEnabled remoteControl remoteExec remoteExecCall remoteExecutedOwner remove3DENConnection remove3DENEventHandler remove3DENLayer removeAction removeAll3DENEventHandlers removeAllActions removeAllAssignedItems removeAllContainers removeAllCuratorAddons removeAllCuratorCameraAreas removeAllCuratorEditingAreas removeAllEventHandlers removeAllHandgunItems removeAllItems removeAllItemsWithMagazines removeAllMissionEventHandlers removeAllMPEventHandlers removeAllMusicEventHandlers removeAllOwnedMines removeAllPrimaryWeaponItems removeAllWeapons removeBackpack removeBackpackGlobal removeCuratorAddons removeCuratorCameraArea removeCuratorEditableObjects removeCuratorEditingArea removeDrawIcon removeDrawLinks removeEventHandler removeFromRemainsCollector removeGoggles removeGroupIcon removeHandgunItem removeHeadgear removeItem removeItemFromBackpack removeItemFromUniform removeItemFromVest removeItems removeMagazine removeMagazineGlobal removeMagazines removeMagazinesTurret removeMagazineTurret removeMenuItem removeMissionEventHandler removeMPEventHandler removeMusicEventHandler removeOwnedMine removePrimaryWeaponItem removeSecondaryWeaponItem removeSimpleTask removeSwitchableUnit removeTeamMember removeUniform removeVest removeWeapon removeWeaponAttachmentCargo removeWeaponCargo removeWeaponGlobal removeWeaponTurret reportRemoteTarget requiredVersion resetCamShake resetSubgroupDirection resize resources respawnVehicle restartEditorCamera reveal revealMine reverse reversedMouseY roadAt roadsConnectedTo roleDescription ropeAttachedObjects ropeAttachedTo ropeAttachEnabled ropeAttachTo ropeCreate ropeCut ropeDestroy ropeDetach ropeEndPosition ropeLength ropes ropeUnwind ropeUnwound rotorsForcesRTD rotorsRpmRTD round runInitScript safeZoneH safeZoneW safeZoneWAbs safeZoneX safeZoneXAbs safeZoneY save3DENInventory saveGame saveIdentity saveJoysticks saveOverlay saveProfileNamespace saveStatus saveVar savingEnabled say say2D say3D scopeName score scoreSide screenshot screenToWorld scriptDone scriptName scudState secondaryWeapon secondaryWeaponItems secondaryWeaponMagazine select selectBestPlaces selectDiarySubject selectedEditorObjects selectEditorObject selectionNames selectionPosition selectLeader selectMax selectMin selectNoPlayer selectPlayer selectRandom selectRandomWeighted selectWeapon selectWeaponTurret sendAUMessage sendSimpleCommand sendTask sendTaskResult sendUDPMessage serverCommand serverCommandAvailable serverCommandExecutable serverName serverTime set set3DENAttribute set3DENAttributes set3DENGrid set3DENIconsVisible set3DENLayer set3DENLinesVisible set3DENLogicType set3DENMissionAttribute set3DENMissionAttributes set3DENModelsVisible set3DENObjectType set3DENSelected setAccTime setActualCollectiveRTD setAirplaneThrottle setAirportSide setAmmo setAmmoCargo setAmmoOnPylon setAnimSpeedCoef setAperture setApertureNew setArmoryPoints setAttributes setAutonomous setBehaviour setBleedingRemaining setBrakesRTD setCameraInterest setCamShakeDefParams setCamShakeParams setCamUseTI setCaptive setCenterOfMass setCollisionLight setCombatMode setCompassOscillation setConvoySeparation setCuratorCameraAreaCeiling setCuratorCoef setCuratorEditingAreaType setCuratorWaypointCost setCurrentChannel setCurrentTask setCurrentWaypoint setCustomAimCoef setCustomWeightRTD setDamage setDammage setDate setDebriefingText setDefaultCamera setDestination setDetailMapBlendPars setDir setDirection setDrawIcon setDriveOnPath setDropInterval setDynamicSimulationDistance setDynamicSimulationDistanceCoef setEditorMode setEditorObjectScope setEffectCondition setEngineRPMRTD setFace setFaceAnimation setFatigue setFeatureType setFlagAnimationPhase setFlagOwner setFlagSide setFlagTexture setFog setFormation setFormationTask setFormDir setFriend setFromEditor setFSMVariable setFuel setFuelCargo setGroupIcon setGroupIconParams setGroupIconsSelectable setGroupIconsVisible setGroupId setGroupIdGlobal setGroupOwner setGusts setHideBehind setHit setHitIndex setHitPointDamage setHorizonParallaxCoef setHUDMovementLevels setIdentity setImportance setInfoPanel setLeader setLightAmbient setLightAttenuation setLightBrightness setLightColor setLightDayLight setLightFlareMaxDistance setLightFlareSize setLightIntensity setLightnings setLightUseFlare setLocalWindParams setMagazineTurretAmmo setMarkerAlpha setMarkerAlphaLocal setMarkerBrush setMarkerBrushLocal setMarkerColor setMarkerColorLocal setMarkerDir setMarkerDirLocal setMarkerPos setMarkerPosLocal setMarkerShape setMarkerShapeLocal setMarkerSize setMarkerSizeLocal setMarkerText setMarkerTextLocal setMarkerType setMarkerTypeLocal setMass setMimic setMousePosition setMusicEffect setMusicEventHandler setName setNameSound setObjectArguments setObjectMaterial setObjectMaterialGlobal setObjectProxy setObjectTexture setObjectTextureGlobal setObjectViewDistance setOvercast setOwner setOxygenRemaining setParticleCircle setParticleClass setParticleFire setParticleParams setParticleRandom setPilotCameraDirection setPilotCameraRotation setPilotCameraTarget setPilotLight setPiPEffect setPitch setPlateNumber setPlayable setPlayerRespawnTime setPos setPosASL setPosASL2 setPosASLW setPosATL setPosition setPosWorld setPylonLoadOut setPylonsPriority setRadioMsg setRain setRainbow setRandomLip setRank setRectangular setRepairCargo setRotorBrakeRTD setShadowDistance setShotParents setSide setSimpleTaskAlwaysVisible setSimpleTaskCustomData setSimpleTaskDescription setSimpleTaskDestination setSimpleTaskTarget setSimpleTaskType setSimulWeatherLayers setSize setSkill setSlingLoad setSoundEffect setSpeaker setSpeech setSpeedMode setStamina setStaminaScheme setStatValue setSuppression setSystemOfUnits setTargetAge setTaskMarkerOffset setTaskResult setTaskState setTerrainGrid setText setTimeMultiplier setTitleEffect setTrafficDensity setTrafficDistance setTrafficGap setTrafficSpeed setTriggerActivation setTriggerArea setTriggerStatements setTriggerText setTriggerTimeout setTriggerType setType setUnconscious setUnitAbility setUnitLoadout setUnitPos setUnitPosWeak setUnitRank setUnitRecoilCoefficient setUnitTrait setUnloadInCombat setUserActionText setUserMFDText setUserMFDvalue setVariable setVectorDir setVectorDirAndUp setVectorUp setVehicleAmmo setVehicleAmmoDef setVehicleArmor setVehicleCargo setVehicleId setVehicleLock setVehiclePosition setVehicleRadar setVehicleReceiveRemoteTargets setVehicleReportOwnPosition setVehicleReportRemoteTargets setVehicleTIPars setVehicleVarName setVelocity setVelocityModelSpace setVelocityTransformation setViewDistance setVisibleIfTreeCollapsed setWantedRPMRTD setWaves setWaypointBehaviour setWaypointCombatMode setWaypointCompletionRadius setWaypointDescription setWaypointForceBehaviour setWaypointFormation setWaypointHousePosition setWaypointLoiterRadius setWaypointLoiterType setWaypointName setWaypointPosition setWaypointScript setWaypointSpeed setWaypointStatements setWaypointTimeout setWaypointType setWaypointVisible setWeaponReloadingTime setWind setWindDir setWindForce setWindStr setWingForceScaleRTD setWPPos show3DIcons showChat showCinemaBorder showCommandingMenu showCompass showCuratorCompass showGPS showHUD showLegend showMap shownArtilleryComputer shownChat shownCompass shownCuratorCompass showNewEditorObject shownGPS shownHUD shownMap shownPad shownRadio shownScoretable shownUAVFeed shownWarrant shownWatch showPad showRadio showScoretable showSubtitles showUAVFeed showWarrant showWatch showWaypoint showWaypoints side sideChat sideEnemy sideFriendly sideRadio simpleTasks simulationEnabled simulCloudDensity simulCloudOcclusion simulInClouds simulWeatherSync sin size sizeOf skill skillFinal skipTime sleep sliderPosition sliderRange sliderSetPosition sliderSetRange sliderSetSpeed sliderSpeed slingLoadAssistantShown soldierMagazines someAmmo sort soundVolume spawn speaker speed speedMode splitString sqrt squadParams stance startLoadingScreen step stop stopEngineRTD stopped str sunOrMoon supportInfo suppressFor surfaceIsWater surfaceNormal surfaceType swimInDepth switchableUnits switchAction switchCamera switchGesture switchLight switchMove synchronizedObjects synchronizedTriggers synchronizedWaypoints synchronizeObjectsAdd synchronizeObjectsRemove synchronizeTrigger synchronizeWaypoint systemChat systemOfUnits tan targetKnowledge targets targetsAggregate targetsQuery taskAlwaysVisible taskChildren taskCompleted taskCustomData taskDescription taskDestination taskHint taskMarkerOffset taskParent taskResult taskState taskType teamMember teamName teams teamSwitch teamSwitchEnabled teamType terminate terrainIntersect terrainIntersectASL terrainIntersectAtASL text textLog textLogFormat tg time timeMultiplier titleCut titleFadeOut titleObj titleRsc titleText toArray toFixed toLower toString toUpper triggerActivated triggerActivation triggerArea triggerAttachedVehicle triggerAttachObject triggerAttachVehicle triggerDynamicSimulation triggerStatements triggerText triggerTimeout triggerTimeoutCurrent triggerType turretLocal turretOwner turretUnit tvAdd tvClear tvCollapse tvCollapseAll tvCount tvCurSel tvData tvDelete tvExpand tvExpandAll tvPicture tvSetColor tvSetCurSel tvSetData tvSetPicture tvSetPictureColor tvSetPictureColorDisabled tvSetPictureColorSelected tvSetPictureRight tvSetPictureRightColor tvSetPictureRightColorDisabled tvSetPictureRightColorSelected tvSetText tvSetTooltip tvSetValue tvSort tvSortByValue tvText tvTooltip tvValue type typeName typeOf UAVControl uiNamespace uiSleep unassignCurator unassignItem unassignTeam unassignVehicle underwater uniform uniformContainer uniformItems uniformMagazines unitAddons unitAimPosition unitAimPositionVisual unitBackpack unitIsUAV unitPos unitReady unitRecoilCoefficient units unitsBelowHeight unlinkItem unlockAchievement unregisterTask updateDrawIcon updateMenuItem updateObjectTree useAISteeringComponent useAudioTimeForMoves userInputDisabled vectorAdd vectorCos vectorCrossProduct vectorDiff vectorDir vectorDirVisual vectorDistance vectorDistanceSqr vectorDotProduct vectorFromTo vectorMagnitude vectorMagnitudeSqr vectorModelToWorld vectorModelToWorldVisual vectorMultiply vectorNormalized vectorUp vectorUpVisual vectorWorldToModel vectorWorldToModelVisual vehicle vehicleCargoEnabled vehicleChat vehicleRadio vehicleReceiveRemoteTargets vehicleReportOwnPosition vehicleReportRemoteTargets vehicles vehicleVarName velocity velocityModelSpace verifySignature vest vestContainer vestItems vestMagazines viewDistance visibleCompass visibleGPS visibleMap visiblePosition visiblePositionASL visibleScoretable visibleWatch waves waypointAttachedObject waypointAttachedVehicle waypointAttachObject waypointAttachVehicle waypointBehaviour waypointCombatMode waypointCompletionRadius waypointDescription waypointForceBehaviour waypointFormation waypointHousePosition waypointLoiterRadius waypointLoiterType waypointName waypointPosition waypoints waypointScript waypointsEnabledUAV waypointShow waypointSpeed waypointStatements waypointTimeout waypointTimeoutCurrent waypointType waypointVisible weaponAccessories weaponAccessoriesCargo weaponCargo weaponDirection weaponInertia weaponLowered weapons weaponsItems weaponsItemsCargo weaponState weaponsTurret weightRTD WFSideText wind ",literal:"blufor civilian configNull controlNull displayNull east endl false grpNull independent lineBreak locationNull nil objNull opfor pi resistance scriptNull sideAmbientLife sideEmpty sideLogic sideUnknown taskNull teamMemberNull true west"},c:[e.CLCM,e.CBCM,e.NM,{cN:"variable",b:/\b_+[a-zA-Z_]\w*/},{cN:"title",b:/[a-zA-Z][a-zA-Z0-9]+_fnc_\w*/},t,a],i:/#|^\$ /}});
+hljs.registerLanguage("livecodeserver",function(e){var r={cN:"variable",v:[{b:"\\b([gtps][A-Z]{1}[a-zA-Z0-9]*)(\\[.+\\])?(?:\\s*?)"},{b:"\\$_[A-Z]+"}],relevance:0},t=[e.CBCM,e.HCM,e.C("--","$"),e.C("[^:]//","$")],a=e.inherit(e.TM,{v:[{b:"\\b_*rig[A-Z]+[A-Za-z0-9_\\-]*"},{b:"\\b_[a-z0-9\\-]+"}]}),o=e.inherit(e.TM,{b:"\\b([A-Za-z0-9_\\-]+)\\b"});return{cI:!1,k:{keyword:"$_COOKIE $_FILES $_GET $_GET_BINARY $_GET_RAW $_POST $_POST_BINARY $_POST_RAW $_SESSION $_SERVER codepoint codepoints segment segments codeunit codeunits sentence sentences trueWord trueWords paragraph after byte bytes english the until http forever descending using line real8 with seventh for stdout finally element word words fourth before black ninth sixth characters chars stderr uInt1 uInt1s uInt2 uInt2s stdin string lines relative rel any fifth items from middle mid at else of catch then third it file milliseconds seconds second secs sec int1 int1s int4 int4s internet int2 int2s normal text item last long detailed effective uInt4 uInt4s repeat end repeat URL in try into switch to words https token binfile each tenth as ticks tick system real4 by dateItems without char character ascending eighth whole dateTime numeric short first ftp integer abbreviated abbr abbrev private case while if div mod wrap and or bitAnd bitNot bitOr bitXor among not in a an within contains ends with begins the keys of keys",literal:"SIX TEN FORMFEED NINE ZERO NONE SPACE FOUR FALSE COLON CRLF PI COMMA ENDOFFILE EOF EIGHT FIVE QUOTE EMPTY ONE TRUE RETURN CR LINEFEED RIGHT BACKSLASH NULL SEVEN TAB THREE TWO six ten formfeed nine zero none space four false colon crlf pi comma endoffile eof eight five quote empty one true return cr linefeed right backslash null seven tab three two RIVERSION RISTATE FILE_READ_MODE FILE_WRITE_MODE FILE_WRITE_MODE DIR_WRITE_MODE FILE_READ_UMASK FILE_WRITE_UMASK DIR_READ_UMASK DIR_WRITE_UMASK",built_in:"put abs acos aliasReference annuity arrayDecode arrayEncode asin atan atan2 average avg avgDev base64Decode base64Encode baseConvert binaryDecode binaryEncode byteOffset byteToNum cachedURL cachedURLs charToNum cipherNames codepointOffset codepointProperty codepointToNum codeunitOffset commandNames compound compress constantNames cos date dateFormat decompress difference directories diskSpace DNSServers exp exp1 exp2 exp10 extents files flushEvents folders format functionNames geometricMean global globals hasMemory harmonicMean hostAddress hostAddressToName hostName hostNameToAddress isNumber ISOToMac itemOffset keys len length libURLErrorData libUrlFormData libURLftpCommand libURLLastHTTPHeaders libURLLastRHHeaders libUrlMultipartFormAddPart libUrlMultipartFormData libURLVersion lineOffset ln ln1 localNames log log2 log10 longFilePath lower macToISO matchChunk matchText matrixMultiply max md5Digest median merge messageAuthenticationCode messageDigest millisec millisecs millisecond milliseconds min monthNames nativeCharToNum normalizeText num number numToByte numToChar numToCodepoint numToNativeChar offset open openfiles openProcesses openProcessIDs openSockets paragraphOffset paramCount param params peerAddress pendingMessages platform popStdDev populationStandardDeviation populationVariance popVariance processID random randomBytes replaceText result revCreateXMLTree revCreateXMLTreeFromFile revCurrentRecord revCurrentRecordIsFirst revCurrentRecordIsLast revDatabaseColumnCount revDatabaseColumnIsNull revDatabaseColumnLengths revDatabaseColumnNames revDatabaseColumnNamed revDatabaseColumnNumbered revDatabaseColumnTypes revDatabaseConnectResult revDatabaseCursors revDatabaseID revDatabaseTableNames revDatabaseType revDataFromQuery revdb_closeCursor revdb_columnbynumber revdb_columncount revdb_columnisnull revdb_columnlengths revdb_columnnames revdb_columntypes revdb_commit revdb_connect revdb_connections revdb_connectionerr revdb_currentrecord revdb_cursorconnection revdb_cursorerr revdb_cursors revdb_dbtype revdb_disconnect revdb_execute revdb_iseof revdb_isbof revdb_movefirst revdb_movelast revdb_movenext revdb_moveprev revdb_query revdb_querylist revdb_recordcount revdb_rollback revdb_tablenames revGetDatabaseDriverPath revNumberOfRecords revOpenDatabase revOpenDatabases revQueryDatabase revQueryDatabaseBlob revQueryResult revQueryIsAtStart revQueryIsAtEnd revUnixFromMacPath revXMLAttribute revXMLAttributes revXMLAttributeValues revXMLChildContents revXMLChildNames revXMLCreateTreeFromFileWithNamespaces revXMLCreateTreeWithNamespaces revXMLDataFromXPathQuery revXMLEvaluateXPath revXMLFirstChild revXMLMatchingNode revXMLNextSibling revXMLNodeContents revXMLNumberOfChildren revXMLParent revXMLPreviousSibling revXMLRootNode revXMLRPC_CreateRequest revXMLRPC_Documents revXMLRPC_Error revXMLRPC_GetHost revXMLRPC_GetMethod revXMLRPC_GetParam revXMLText revXMLRPC_Execute revXMLRPC_GetParamCount revXMLRPC_GetParamNode revXMLRPC_GetParamType revXMLRPC_GetPath revXMLRPC_GetPort revXMLRPC_GetProtocol revXMLRPC_GetRequest revXMLRPC_GetResponse revXMLRPC_GetSocket revXMLTree revXMLTrees revXMLValidateDTD revZipDescribeItem revZipEnumerateItems revZipOpenArchives round sampVariance sec secs seconds sentenceOffset sha1Digest shell shortFilePath sin specialFolderPath sqrt standardDeviation statRound stdDev sum sysError systemVersion tan tempName textDecode textEncode tick ticks time to tokenOffset toLower toUpper transpose truewordOffset trunc uniDecode uniEncode upper URLDecode URLEncode URLStatus uuid value variableNames variance version waitDepth weekdayNames wordOffset xsltApplyStylesheet xsltApplyStylesheetFromFile xsltLoadStylesheet xsltLoadStylesheetFromFile add breakpoint cancel clear local variable file word line folder directory URL close socket process combine constant convert create new alias folder directory decrypt delete variable word line folder directory URL dispatch divide do encrypt filter get include intersect kill libURLDownloadToFile libURLFollowHttpRedirects libURLftpUpload libURLftpUploadFile libURLresetAll libUrlSetAuthCallback libURLSetDriver libURLSetCustomHTTPHeaders libUrlSetExpect100 libURLSetFTPListCommand libURLSetFTPMode libURLSetFTPStopTime libURLSetStatusCallback load extension loadedExtensions multiply socket prepare process post seek rel relative read from process rename replace require resetAll resolve revAddXMLNode revAppendXML revCloseCursor revCloseDatabase revCommitDatabase revCopyFile revCopyFolder revCopyXMLNode revDeleteFolder revDeleteXMLNode revDeleteAllXMLTrees revDeleteXMLTree revExecuteSQL revGoURL revInsertXMLNode revMoveFolder revMoveToFirstRecord revMoveToLastRecord revMoveToNextRecord revMoveToPreviousRecord revMoveToRecord revMoveXMLNode revPutIntoXMLNode revRollBackDatabase revSetDatabaseDriverPath revSetXMLAttribute revXMLRPC_AddParam revXMLRPC_DeleteAllDocuments revXMLAddDTD revXMLRPC_Free revXMLRPC_FreeAll revXMLRPC_DeleteDocument revXMLRPC_DeleteParam revXMLRPC_SetHost revXMLRPC_SetMethod revXMLRPC_SetPort revXMLRPC_SetProtocol revXMLRPC_SetSocket revZipAddItemWithData revZipAddItemWithFile revZipAddUncompressedItemWithData revZipAddUncompressedItemWithFile revZipCancel revZipCloseArchive revZipDeleteItem revZipExtractItemToFile revZipExtractItemToVariable revZipSetProgressCallback revZipRenameItem revZipReplaceItemWithData revZipReplaceItemWithFile revZipOpenArchive send set sort split start stop subtract symmetric union unload vectorDotProduct wait write"},c:[r,{cN:"keyword",b:"\\bend\\sif\\b"},{cN:"function",bK:"function",e:"$",c:[r,o,e.ASM,e.QSM,e.BNM,e.CNM,a]},{cN:"function",b:"\\bend\\s+",e:"$",k:"end",c:[o,a],relevance:0},{bK:"command on",e:"$",c:[r,o,e.ASM,e.QSM,e.BNM,e.CNM,a]},{cN:"meta",v:[{b:"<\\?(rev|lc|livecode)",relevance:10},{b:"<\\?"},{b:"\\?>"}]},e.ASM,e.QSM,e.BNM,e.CNM,a].concat(t),i:";$|^\\[|^=|&|{"}});
+hljs.registerLanguage("lsl",function(E){var T={cN:"string",b:'"',e:'"',c:[{cN:"subst",b:/\\[tn"\\]/}]},A={cN:"number",b:E.CNR};return{i:":",c:[T,{cN:"comment",v:[E.C("//","$"),E.C("/\\*","\\*/")],relevance:0},A,{cN:"section",v:[{b:"\\b(?:state|default)\\b"},{b:"\\b(?:state_(?:entry|exit)|touch(?:_(?:start|end))?|(?:land_)?collision(?:_(?:start|end))?|timer|listen|(?:no_)?sensor|control|(?:not_)?at_(?:rot_)?target|money|email|experience_permissions(?:_denied)?|run_time_permissions|changed|attach|dataserver|moving_(?:start|end)|link_message|(?:on|object)_rez|remote_data|http_re(?:sponse|quest)|path_update|transaction_result)\\b"}]},{cN:"built_in",b:"\\b(?:ll(?:AgentInExperience|(?:Create|DataSize|Delete|KeyCount|Keys|Read|Update)KeyValue|GetExperience(?:Details|ErrorMessage)|ReturnObjectsBy(?:ID|Owner)|Json(?:2List|[GS]etValue|ValueType)|Sin|Cos|Tan|Atan2|Sqrt|Pow|Abs|Fabs|Frand|Floor|Ceil|Round|Vec(?:Mag|Norm|Dist)|Rot(?:Between|2(?:Euler|Fwd|Left|Up))|(?:Euler|Axes)2Rot|Whisper|(?:Region|Owner)?Say|Shout|Listen(?:Control|Remove)?|Sensor(?:Repeat|Remove)?|Detected(?:Name|Key|Owner|Type|Pos|Vel|Grab|Rot|Group|LinkNumber)|Die|Ground|Wind|(?:[GS]et)(?:AnimationOverride|MemoryLimit|PrimMediaParams|ParcelMusicURL|Object(?:Desc|Name)|PhysicsMaterial|Status|Scale|Color|Alpha|Texture|Pos|Rot|Force|Torque)|ResetAnimationOverride|(?:Scale|Offset|Rotate)Texture|(?:Rot)?Target(?:Remove)?|(?:Stop)?MoveToTarget|Apply(?:Rotational)?Impulse|Set(?:KeyframedMotion|ContentType|RegionPos|(?:Angular)?Velocity|Buoyancy|HoverHeight|ForceAndTorque|TimerEvent|ScriptState|Damage|TextureAnim|Sound(?:Queueing|Radius)|Vehicle(?:Type|(?:Float|Vector|Rotation)Param)|(?:Touch|Sit)?Text|Camera(?:Eye|At)Offset|PrimitiveParams|ClickAction|Link(?:Alpha|Color|PrimitiveParams(?:Fast)?|Texture(?:Anim)?|Camera|Media)|RemoteScriptAccessPin|PayPrice|LocalRot)|ScaleByFactor|Get(?:(?:Max|Min)ScaleFactor|ClosestNavPoint|StaticPath|SimStats|Env|PrimitiveParams|Link(?:PrimitiveParams|Number(?:OfSides)?|Key|Name|Media)|HTTPHeader|FreeURLs|Object(?:Details|PermMask|PrimCount)|Parcel(?:MaxPrims|Details|Prim(?:Count|Owners))|Attached(?:List)?|(?:SPMax|Free|Used)Memory|Region(?:Name|TimeDilation|FPS|Corner|AgentCount)|Root(?:Position|Rotation)|UnixTime|(?:Parcel|Region)Flags|(?:Wall|GMT)clock|SimulatorHostname|BoundingBox|GeometricCenter|Creator|NumberOf(?:Prims|NotecardLines|Sides)|Animation(?:List)?|(?:Camera|Local)(?:Pos|Rot)|Vel|Accel|Omega|Time(?:stamp|OfDay)|(?:Object|CenterOf)?Mass|MassMKS|Energy|Owner|(?:Owner)?Key|SunDirection|Texture(?:Offset|Scale|Rot)|Inventory(?:Number|Name|Key|Type|Creator|PermMask)|Permissions(?:Key)?|StartParameter|List(?:Length|EntryType)|Date|Agent(?:Size|Info|Language|List)|LandOwnerAt|NotecardLine|Script(?:Name|State))|(?:Get|Reset|GetAndReset)Time|PlaySound(?:Slave)?|LoopSound(?:Master|Slave)?|(?:Trigger|Stop|Preload)Sound|(?:(?:Get|Delete)Sub|Insert)String|To(?:Upper|Lower)|Give(?:InventoryList|Money)|RezObject|(?:Stop)?LookAt|Sleep|CollisionFilter|(?:Take|Release)Controls|DetachFromAvatar|AttachToAvatar(?:Temp)?|InstantMessage|(?:GetNext)?Email|StopHover|MinEventDelay|RotLookAt|String(?:Length|Trim)|(?:Start|Stop)Animation|TargetOmega|Request(?:Experience)?Permissions|(?:Create|Break)Link|BreakAllLinks|(?:Give|Remove)Inventory|Water|PassTouches|Request(?:Agent|Inventory)Data|TeleportAgent(?:Home|GlobalCoords)?|ModifyLand|CollisionSound|ResetScript|MessageLinked|PushObject|PassCollisions|AxisAngle2Rot|Rot2(?:Axis|Angle)|A(?:cos|sin)|AngleBetween|AllowInventoryDrop|SubStringIndex|List2(?:CSV|Integer|Json|Float|String|Key|Vector|Rot|List(?:Strided)?)|DeleteSubList|List(?:Statistics|Sort|Randomize|(?:Insert|Find|Replace)List)|EdgeOfWorld|AdjustSoundVolume|Key2Name|TriggerSoundLimited|EjectFromLand|(?:CSV|ParseString)2List|OverMyLand|SameGroup|UnSit|Ground(?:Slope|Normal|Contour)|GroundRepel|(?:Set|Remove)VehicleFlags|SitOnLink|(?:AvatarOn)?(?:Link)?SitTarget|Script(?:Danger|Profiler)|Dialog|VolumeDetect|ResetOtherScript|RemoteLoadScriptPin|(?:Open|Close)RemoteDataChannel|SendRemoteData|RemoteDataReply|(?:Integer|String)ToBase64|XorBase64|Log(?:10)?|Base64To(?:String|Integer)|ParseStringKeepNulls|RezAtRoot|RequestSimulatorData|ForceMouselook|(?:Load|Release|(?:E|Une)scape)URL|ParcelMedia(?:CommandList|Query)|ModPow|MapDestination|(?:RemoveFrom|AddTo|Reset)Land(?:Pass|Ban)List|(?:Set|Clear)CameraParams|HTTP(?:Request|Response)|TextBox|DetectedTouch(?:UV|Face|Pos|(?:N|Bin)ormal|ST)|(?:MD5|SHA1|DumpList2)String|Request(?:Secure)?URL|Clear(?:Prim|Link)Media|(?:Link)?ParticleSystem|(?:Get|Request)(?:Username|DisplayName)|RegionSayTo|CastRay|GenerateKey|TransferLindenDollars|ManageEstateAccess|(?:Create|Delete)Character|ExecCharacterCmd|Evade|FleeFrom|NavigateTo|PatrolPoints|Pursue|UpdateCharacter|WanderWithin))\\b"},{cN:"literal",v:[{b:"\\b(?:PI|TWO_PI|PI_BY_TWO|DEG_TO_RAD|RAD_TO_DEG|SQRT2)\\b"},{b:"\\b(?:XP_ERROR_(?:EXPERIENCES_DISABLED|EXPERIENCE_(?:DISABLED|SUSPENDED)|INVALID_(?:EXPERIENCE|PARAMETERS)|KEY_NOT_FOUND|MATURITY_EXCEEDED|NONE|NOT_(?:FOUND|PERMITTED(?:_LAND)?)|NO_EXPERIENCE|QUOTA_EXCEEDED|RETRY_UPDATE|STORAGE_EXCEPTION|STORE_DISABLED|THROTTLED|UNKNOWN_ERROR)|JSON_APPEND|STATUS_(?:PHYSICS|ROTATE_[XYZ]|PHANTOM|SANDBOX|BLOCK_GRAB(?:_OBJECT)?|(?:DIE|RETURN)_AT_EDGE|CAST_SHADOWS|OK|MALFORMED_PARAMS|TYPE_MISMATCH|BOUNDS_ERROR|NOT_(?:FOUND|SUPPORTED)|INTERNAL_ERROR|WHITELIST_FAILED)|AGENT(?:_(?:BY_(?:LEGACY_|USER)NAME|FLYING|ATTACHMENTS|SCRIPTED|MOUSELOOK|SITTING|ON_OBJECT|AWAY|WALKING|IN_AIR|TYPING|CROUCHING|BUSY|ALWAYS_RUN|AUTOPILOT|LIST_(?:PARCEL(?:_OWNER)?|REGION)))?|CAMERA_(?:PITCH|DISTANCE|BEHINDNESS_(?:ANGLE|LAG)|(?:FOCUS|POSITION)(?:_(?:THRESHOLD|LOCKED|LAG))?|FOCUS_OFFSET|ACTIVE)|ANIM_ON|LOOP|REVERSE|PING_PONG|SMOOTH|ROTATE|SCALE|ALL_SIDES|LINK_(?:ROOT|SET|ALL_(?:OTHERS|CHILDREN)|THIS)|ACTIVE|PASS(?:IVE|_(?:ALWAYS|IF_NOT_HANDLED|NEVER))|SCRIPTED|CONTROL_(?:FWD|BACK|(?:ROT_)?(?:LEFT|RIGHT)|UP|DOWN|(?:ML_)?LBUTTON)|PERMISSION_(?:RETURN_OBJECTS|DEBIT|OVERRIDE_ANIMATIONS|SILENT_ESTATE_MANAGEMENT|TAKE_CONTROLS|TRIGGER_ANIMATION|ATTACH|CHANGE_LINKS|(?:CONTROL|TRACK)_CAMERA|TELEPORT)|INVENTORY_(?:TEXTURE|SOUND|OBJECT|SCRIPT|LANDMARK|CLOTHING|NOTECARD|BODYPART|ANIMATION|GESTURE|ALL|NONE)|CHANGED_(?:INVENTORY|COLOR|SHAPE|SCALE|TEXTURE|LINK|ALLOWED_DROP|OWNER|REGION(?:_START)?|TELEPORT|MEDIA)|OBJECT_(?:CLICK_ACTION|HOVER_HEIGHT|LAST_OWNER_ID|(?:PHYSICS|SERVER|STREAMING)_COST|UNKNOWN_DETAIL|CHARACTER_TIME|PHANTOM|PHYSICS|TEMP_(?:ATTACHED|ON_REZ)|NAME|DESC|POS|PRIM_(?:COUNT|EQUIVALENCE)|RETURN_(?:PARCEL(?:_OWNER)?|REGION)|REZZER_KEY|ROO?T|VELOCITY|OMEGA|OWNER|GROUP(?:_TAG)?|CREATOR|ATTACHED_(?:POINT|SLOTS_AVAILABLE)|RENDER_WEIGHT|(?:BODY_SHAPE|PATHFINDING)_TYPE|(?:RUNNING|TOTAL)_SCRIPT_COUNT|TOTAL_INVENTORY_COUNT|SCRIPT_(?:MEMORY|TIME))|TYPE_(?:INTEGER|FLOAT|STRING|KEY|VECTOR|ROTATION|INVALID)|(?:DEBUG|PUBLIC)_CHANNEL|ATTACH_(?:AVATAR_CENTER|CHEST|HEAD|BACK|PELVIS|MOUTH|CHIN|NECK|NOSE|BELLY|[LR](?:SHOULDER|HAND|FOOT|EAR|EYE|[UL](?:ARM|LEG)|HIP)|(?:LEFT|RIGHT)_PEC|HUD_(?:CENTER_[12]|TOP_(?:RIGHT|CENTER|LEFT)|BOTTOM(?:_(?:RIGHT|LEFT))?)|[LR]HAND_RING1|TAIL_(?:BASE|TIP)|[LR]WING|FACE_(?:JAW|[LR]EAR|[LR]EYE|TOUNGE)|GROIN|HIND_[LR]FOOT)|LAND_(?:LEVEL|RAISE|LOWER|SMOOTH|NOISE|REVERT)|DATA_(?:ONLINE|NAME|BORN|SIM_(?:POS|STATUS|RATING)|PAYINFO)|PAYMENT_INFO_(?:ON_FILE|USED)|REMOTE_DATA_(?:CHANNEL|REQUEST|REPLY)|PSYS_(?:PART_(?:BF_(?:ZERO|ONE(?:_MINUS_(?:DEST_COLOR|SOURCE_(ALPHA|COLOR)))?|DEST_COLOR|SOURCE_(ALPHA|COLOR))|BLEND_FUNC_(DEST|SOURCE)|FLAGS|(?:START|END)_(?:COLOR|ALPHA|SCALE|GLOW)|MAX_AGE|(?:RIBBON|WIND|INTERP_(?:COLOR|SCALE)|BOUNCE|FOLLOW_(?:SRC|VELOCITY)|TARGET_(?:POS|LINEAR)|EMISSIVE)_MASK)|SRC_(?:MAX_AGE|PATTERN|ANGLE_(?:BEGIN|END)|BURST_(?:RATE|PART_COUNT|RADIUS|SPEED_(?:MIN|MAX))|ACCEL|TEXTURE|TARGET_KEY|OMEGA|PATTERN_(?:DROP|EXPLODE|ANGLE(?:_CONE(?:_EMPTY)?)?)))|VEHICLE_(?:REFERENCE_FRAME|TYPE_(?:NONE|SLED|CAR|BOAT|AIRPLANE|BALLOON)|(?:LINEAR|ANGULAR)_(?:FRICTION_TIMESCALE|MOTOR_DIRECTION)|LINEAR_MOTOR_OFFSET|HOVER_(?:HEIGHT|EFFICIENCY|TIMESCALE)|BUOYANCY|(?:LINEAR|ANGULAR)_(?:DEFLECTION_(?:EFFICIENCY|TIMESCALE)|MOTOR_(?:DECAY_)?TIMESCALE)|VERTICAL_ATTRACTION_(?:EFFICIENCY|TIMESCALE)|BANKING_(?:EFFICIENCY|MIX|TIMESCALE)|FLAG_(?:NO_DEFLECTION_UP|LIMIT_(?:ROLL_ONLY|MOTOR_UP)|HOVER_(?:(?:WATER|TERRAIN|UP)_ONLY|GLOBAL_HEIGHT)|MOUSELOOK_(?:STEER|BANK)|CAMERA_DECOUPLED))|PRIM_(?:ALLOW_UNSIT|ALPHA_MODE(?:_(?:BLEND|EMISSIVE|MASK|NONE))?|NORMAL|SPECULAR|TYPE(?:_(?:BOX|CYLINDER|PRISM|SPHERE|TORUS|TUBE|RING|SCULPT))?|HOLE_(?:DEFAULT|CIRCLE|SQUARE|TRIANGLE)|MATERIAL(?:_(?:STONE|METAL|GLASS|WOOD|FLESH|PLASTIC|RUBBER))?|SHINY_(?:NONE|LOW|MEDIUM|HIGH)|BUMP_(?:NONE|BRIGHT|DARK|WOOD|BARK|BRICKS|CHECKER|CONCRETE|TILE|STONE|DISKS|GRAVEL|BLOBS|SIDING|LARGETILE|STUCCO|SUCTION|WEAVE)|TEXGEN_(?:DEFAULT|PLANAR)|SCRIPTED_SIT_ONLY|SCULPT_(?:TYPE_(?:SPHERE|TORUS|PLANE|CYLINDER|MASK)|FLAG_(?:MIRROR|INVERT))|PHYSICS(?:_(?:SHAPE_(?:CONVEX|NONE|PRIM|TYPE)))?|(?:POS|ROT)_LOCAL|SLICE|TEXT|FLEXIBLE|POINT_LIGHT|TEMP_ON_REZ|PHANTOM|POSITION|SIT_TARGET|SIZE|ROTATION|TEXTURE|NAME|OMEGA|DESC|LINK_TARGET|COLOR|BUMP_SHINY|FULLBRIGHT|TEXGEN|GLOW|MEDIA_(?:ALT_IMAGE_ENABLE|CONTROLS|(?:CURRENT|HOME)_URL|AUTO_(?:LOOP|PLAY|SCALE|ZOOM)|FIRST_CLICK_INTERACT|(?:WIDTH|HEIGHT)_PIXELS|WHITELIST(?:_ENABLE)?|PERMS_(?:INTERACT|CONTROL)|PARAM_MAX|CONTROLS_(?:STANDARD|MINI)|PERM_(?:NONE|OWNER|GROUP|ANYONE)|MAX_(?:URL_LENGTH|WHITELIST_(?:SIZE|COUNT)|(?:WIDTH|HEIGHT)_PIXELS)))|MASK_(?:BASE|OWNER|GROUP|EVERYONE|NEXT)|PERM_(?:TRANSFER|MODIFY|COPY|MOVE|ALL)|PARCEL_(?:MEDIA_COMMAND_(?:STOP|PAUSE|PLAY|LOOP|TEXTURE|URL|TIME|AGENT|UNLOAD|AUTO_ALIGN|TYPE|SIZE|DESC|LOOP_SET)|FLAG_(?:ALLOW_(?:FLY|(?:GROUP_)?SCRIPTS|LANDMARK|TERRAFORM|DAMAGE|CREATE_(?:GROUP_)?OBJECTS)|USE_(?:ACCESS_(?:GROUP|LIST)|BAN_LIST|LAND_PASS_LIST)|LOCAL_SOUND_ONLY|RESTRICT_PUSHOBJECT|ALLOW_(?:GROUP|ALL)_OBJECT_ENTRY)|COUNT_(?:TOTAL|OWNER|GROUP|OTHER|SELECTED|TEMP)|DETAILS_(?:NAME|DESC|OWNER|GROUP|AREA|ID|SEE_AVATARS))|LIST_STAT_(?:MAX|MIN|MEAN|MEDIAN|STD_DEV|SUM(?:_SQUARES)?|NUM_COUNT|GEOMETRIC_MEAN|RANGE)|PAY_(?:HIDE|DEFAULT)|REGION_FLAG_(?:ALLOW_DAMAGE|FIXED_SUN|BLOCK_TERRAFORM|SANDBOX|DISABLE_(?:COLLISIONS|PHYSICS)|BLOCK_FLY|ALLOW_DIRECT_TELEPORT|RESTRICT_PUSHOBJECT)|HTTP_(?:METHOD|MIMETYPE|BODY_(?:MAXLENGTH|TRUNCATED)|CUSTOM_HEADER|PRAGMA_NO_CACHE|VERBOSE_THROTTLE|VERIFY_CERT)|SIT_(?:INVALID_(?:AGENT|LINK_OBJECT)|NO(?:T_EXPERIENCE|_(?:ACCESS|EXPERIENCE_PERMISSION|SIT_TARGET)))|STRING_(?:TRIM(?:_(?:HEAD|TAIL))?)|CLICK_ACTION_(?:NONE|TOUCH|SIT|BUY|PAY|OPEN(?:_MEDIA)?|PLAY|ZOOM)|TOUCH_INVALID_FACE|PROFILE_(?:NONE|SCRIPT_MEMORY)|RC_(?:DATA_FLAGS|DETECT_PHANTOM|GET_(?:LINK_NUM|NORMAL|ROOT_KEY)|MAX_HITS|REJECT_(?:TYPES|AGENTS|(?:NON)?PHYSICAL|LAND))|RCERR_(?:CAST_TIME_EXCEEDED|SIM_PERF_LOW|UNKNOWN)|ESTATE_ACCESS_(?:ALLOWED_(?:AGENT|GROUP)_(?:ADD|REMOVE)|BANNED_AGENT_(?:ADD|REMOVE))|DENSITY|FRICTION|RESTITUTION|GRAVITY_MULTIPLIER|KFM_(?:COMMAND|CMD_(?:PLAY|STOP|PAUSE)|MODE|FORWARD|LOOP|PING_PONG|REVERSE|DATA|ROTATION|TRANSLATION)|ERR_(?:GENERIC|PARCEL_PERMISSIONS|MALFORMED_PARAMS|RUNTIME_PERMISSIONS|THROTTLED)|CHARACTER_(?:CMD_(?:(?:SMOOTH_)?STOP|JUMP)|DESIRED_(?:TURN_)?SPEED|RADIUS|STAY_WITHIN_PARCEL|LENGTH|ORIENTATION|ACCOUNT_FOR_SKIPPED_FRAMES|AVOIDANCE_MODE|TYPE(?:_(?:[ABCD]|NONE))?|MAX_(?:DECEL|TURN_RADIUS|(?:ACCEL|SPEED)))|PURSUIT_(?:OFFSET|FUZZ_FACTOR|GOAL_TOLERANCE|INTERCEPT)|REQUIRE_LINE_OF_SIGHT|FORCE_DIRECT_PATH|VERTICAL|HORIZONTAL|AVOID_(?:CHARACTERS|DYNAMIC_OBSTACLES|NONE)|PU_(?:EVADE_(?:HIDDEN|SPOTTED)|FAILURE_(?:DYNAMIC_PATHFINDING_DISABLED|INVALID_(?:GOAL|START)|NO_(?:NAVMESH|VALID_DESTINATION)|OTHER|TARGET_GONE|(?:PARCEL_)?UNREACHABLE)|(?:GOAL|SLOWDOWN_DISTANCE)_REACHED)|TRAVERSAL_TYPE(?:_(?:FAST|NONE|SLOW))?|CONTENT_TYPE_(?:ATOM|FORM|HTML|JSON|LLSD|RSS|TEXT|XHTML|XML)|GCNP_(?:RADIUS|STATIC)|(?:PATROL|WANDER)_PAUSE_AT_WAYPOINTS|OPT_(?:AVATAR|CHARACTER|EXCLUSION_VOLUME|LEGACY_LINKSET|MATERIAL_VOLUME|OTHER|STATIC_OBSTACLE|WALKABLE)|SIM_STAT_PCT_CHARS_STEPPED)\\b"},{b:"\\b(?:FALSE|TRUE)\\b"},{b:"\\b(?:ZERO_ROTATION)\\b"},{b:"\\b(?:EOF|JSON_(?:ARRAY|DELETE|FALSE|INVALID|NULL|NUMBER|OBJECT|STRING|TRUE)|NULL_KEY|TEXTURE_(?:BLANK|DEFAULT|MEDIA|PLYWOOD|TRANSPARENT)|URL_REQUEST_(?:GRANTED|DENIED))\\b"},{b:"\\b(?:ZERO_VECTOR|TOUCH_INVALID_(?:TEXCOORD|VECTOR))\\b"}]},{cN:"type",b:"\\b(?:integer|float|string|key|vector|quaternion|rotation|list)\\b"}]}});
+hljs.registerLanguage("tex",function(e){var c={cN:"tag",b:/\\/,relevance:0,c:[{cN:"name",v:[{b:/[a-zA-Z\u0430-\u044f\u0410-\u042f]+[*]?/},{b:/[^a-zA-Z\u0430-\u044f\u0410-\u042f0-9]/}],starts:{eW:!0,relevance:0,c:[{cN:"string",v:[{b:/\[/,e:/\]/},{b:/\{/,e:/\}/}]},{b:/\s*=\s*/,eW:!0,relevance:0,c:[{cN:"number",b:/-?\d*\.?\d+(pt|pc|mm|cm|in|dd|cc|ex|em)?/}]}]}}]};return{c:[c,{cN:"formula",c:[c],relevance:0,v:[{b:/\$\$/,e:/\$\$/},{b:/\$/,e:/\$/}]},e.C("%","$",{relevance:0})]}});
+hljs.registerLanguage("tp",function(O){var R={cN:"number",b:"[1-9][0-9]*",relevance:0},E={cN:"symbol",b:":[^\\]]+"};return{k:{keyword:"ABORT ACC ADJUST AND AP_LD BREAK CALL CNT COL CONDITION CONFIG DA DB DIV DETECT ELSE END ENDFOR ERR_NUM ERROR_PROG FINE FOR GP GUARD INC IF JMP LINEAR_MAX_SPEED LOCK MOD MONITOR OFFSET Offset OR OVERRIDE PAUSE PREG PTH RT_LD RUN SELECT SKIP Skip TA TB TO TOOL_OFFSET Tool_Offset UF UT UFRAME_NUM UTOOL_NUM UNLOCK WAIT X Y Z W P R STRLEN SUBSTR FINDSTR VOFFSET PROG ATTR MN POS",literal:"ON OFF max_speed LPOS JPOS ENABLE DISABLE START STOP RESET"},c:[{cN:"built_in",b:"(AR|P|PAYLOAD|PR|R|SR|RSR|LBL|VR|UALM|MESSAGE|UTOOL|UFRAME|TIMER|TIMER_OVERFLOW|JOINT_MAX_SPEED|RESUME_PROG|DIAG_REC)\\[",e:"\\]",c:["self",R,E]},{cN:"built_in",b:"(AI|AO|DI|DO|F|RI|RO|UI|UO|GI|GO|SI|SO)\\[",e:"\\]",c:["self",R,O.QSM,E]},{cN:"keyword",b:"/(PROG|ATTR|MN|POS|END)\\b"},{cN:"keyword",b:"(CALL|RUN|POINT_LOGIC|LBL)\\b"},{cN:"keyword",b:"\\b(ACC|CNT|Skip|Offset|PSPD|RT_LD|AP_LD|Tool_Offset)"},{cN:"number",b:"\\d+(sec|msec|mm/sec|cm/min|inch/min|deg/sec|mm|in|cm)?\\b",relevance:0},O.C("//","[;$]"),O.C("!","[;$]"),O.C("--eg:","$"),O.QSM,{cN:"string",b:"'",e:"'"},O.CNM,{cN:"variable",b:"\\$[A-Za-z0-9_]+"}]}});
+hljs.registerLanguage("nix",function(e){var r={keyword:"rec with let in inherit assert if else then",literal:"true false or and null",built_in:"import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation"},t={cN:"subst",b:/\$\{/,e:/}/,k:r},i={cN:"string",c:[t],v:[{b:"''",e:"''"},{b:'"',e:'"'}]},a=[e.NM,e.HCM,e.CBCM,i,{b:/[a-zA-Z0-9-_]+(\s*=)/,rB:!0,relevance:0,c:[{cN:"attr",b:/\S+/}]}];return{aliases:["nixos"],k:r,c:t.c=a}});
+hljs.registerLanguage("django",function(e){var t={b:/\|[A-Za-z]+:?/,k:{name:"truncatewords removetags linebreaksbr yesno get_digit timesince random striptags filesizeformat escape linebreaks length_is ljust rjust cut urlize fix_ampersands title floatformat capfirst pprint divisibleby add make_list unordered_list urlencode timeuntil urlizetrunc wordcount stringformat linenumbers slice date dictsort dictsortreversed default_if_none pluralize lower join center default truncatewords_html upper length phone2numeric wordwrap time addslashes slugify first escapejs force_escape iriencode last safe safeseq truncatechars localize unlocalize localtime utc timezone"},c:[e.QSM,e.ASM]};return{aliases:["jinja"],cI:!0,sL:"xml",c:[e.C(/\{%\s*comment\s*%}/,/\{%\s*endcomment\s*%}/),e.C(/\{#/,/#}/),{cN:"template-tag",b:/\{%/,e:/%}/,c:[{cN:"name",b:/\w+/,k:{name:"comment endcomment load templatetag ifchanged endifchanged if endif firstof for endfor ifnotequal endifnotequal widthratio extends include spaceless endspaceless regroup ifequal endifequal ssi now with cycle url filter endfilter debug block endblock else autoescape endautoescape csrf_token empty elif endwith static trans blocktrans endblocktrans get_static_prefix get_media_prefix plural get_current_language language get_available_languages get_current_language_bidi get_language_info get_language_info_list localize endlocalize localtime endlocaltime timezone endtimezone get_current_timezone verbatim"},starts:{eW:!0,k:"in by as",c:[t],relevance:0}}]},{cN:"template-variable",b:/\{\{/,e:/}}/,c:[t]}]}});
+hljs.registerLanguage("ini",function(e){var b={cN:"number",relevance:0,v:[{b:/([\+\-]+)?[\d]+_[\d_]+/},{b:e.NR}]},a=e.C();a.v=[{b:/;/,e:/$/},{b:/#/,e:/$/}];var c={cN:"variable",v:[{b:/\$[\w\d"][\w\d_]*/},{b:/\$\{(.*?)}/}]},r={cN:"literal",b:/\bon|off|true|false|yes|no\b/},n={cN:"string",c:[e.BE],v:[{b:"'''",e:"'''",relevance:10},{b:'"""',e:'"""',relevance:10},{b:'"',e:'"'},{b:"'",e:"'"}]};return{aliases:["toml"],cI:!0,i:/\S/,c:[a,{cN:"section",b:/\[+/,e:/\]+/},{b:/^[a-z0-9\[\]_\.-]+(?=\s*=\s*)/,cN:"attr",starts:{e:/$/,c:[a,{b:/\[/,e:/\]/,c:[a,r,c,n,b,"self"],relevance:0},r,c,n,b]}}]}});
+hljs.registerLanguage("q",function(e){return{aliases:["k","kdb"],k:{keyword:"do while select delete by update from",literal:"0b 1b",built_in:"neg not null string reciprocal floor ceiling signum mod xbar xlog and or each scan over prior mmu lsq inv md5 ltime gtime count first var dev med cov cor all any rand sums prds mins maxs fills deltas ratios avgs differ prev next rank reverse iasc idesc asc desc msum mcount mavg mdev xrank mmin mmax xprev rotate distinct group where flip type key til get value attr cut set upsert raze union inter except cross sv vs sublist enlist read0 read1 hopen hclose hdel hsym hcount peach system ltrim rtrim trim lower upper ssr view tables views cols xcols keys xkey xcol xasc xdesc fkeys meta lj aj aj0 ij pj asof uj ww wj wj1 fby xgroup ungroup ej save load rsave rload show csv parse eval min max avg wavg wsum sin cos tan sum",type:"`float `double int `timestamp `timespan `datetime `time `boolean `symbol `char `byte `short `long `real `month `date `minute `second `guid"},l:/(`?)[A-Za-z0-9_]+\b/,c:[e.CLCM,e.QSM,e.CNM]}});
+hljs.registerLanguage("elm",function(e){var i={v:[e.C("--","$"),e.C("{-","-}",{c:["self"]})]},t={cN:"type",b:"\\b[A-Z][\\w']*",relevance:0},c={b:"\\(",e:"\\)",i:'"',c:[{cN:"type",b:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},i]};return{k:"let in if then else case of where module import exposing type alias as infix infixl infixr port effect command subscription",c:[{bK:"port effect module",e:"exposing",k:"port effect module where command subscription exposing",c:[c,i],i:"\\W\\.|;"},{b:"import",e:"$",k:"import as exposing",c:[c,i],i:"\\W\\.|;"},{b:"type",e:"$",k:"type alias",c:[t,c,{b:"{",e:"}",c:c.c},i]},{bK:"infix infixl infixr",e:"$",c:[e.CNM,i]},{b:"port",e:"$",k:"port",c:[i]},{cN:"string",b:"'\\\\?.",e:"'",i:"."},e.QSM,e.CNM,t,e.inherit(e.TM,{b:"^[_a-z][\\w']*"}),i,{b:"->|<-"}],i:/;/}});
+hljs.registerLanguage("applescript",function(e){var t=e.inherit(e.QSM,{i:""}),r={cN:"params",b:"\\(",e:"\\)",c:["self",e.CNM,t]},i=e.C("--","$"),o=[i,e.C("\\(\\*","\\*\\)",{c:["self",i]}),e.HCM];return{aliases:["osascript"],k:{keyword:"about above after against and around as at back before beginning behind below beneath beside between but by considering contain contains continue copy div does eighth else end equal equals error every exit fifth first for fourth from front get given global if ignoring in into is it its last local me middle mod my ninth not of on onto or over prop property put ref reference repeat returning script second set seventh since sixth some tell tenth that the|0 then third through thru timeout times to transaction try until where while whose with without",literal:"AppleScript false linefeed return pi quote result space tab true",built_in:"alias application boolean class constant date file integer list number real record string text activate beep count delay launch log offset read round run say summarize write character characters contents day frontmost id item length month name paragraph paragraphs rest reverse running time version weekday word words year"},c:[t,e.CNM,{cN:"built_in",b:"\\b(clipboard info|the clipboard|info for|list (disks|folder)|mount volume|path to|(close|open for) access|(get|set) eof|current date|do shell script|get volume settings|random number|set volume|system attribute|system info|time to GMT|(load|run|store) script|scripting components|ASCII (character|number)|localized string|choose (application|color|file|file name|folder|from list|remote application|URL)|display (alert|dialog))\\b|^\\s*return\\b"},{cN:"literal",b:"\\b(text item delimiters|current application|missing value)\\b"},{cN:"keyword",b:"\\b(apart from|aside from|instead of|out of|greater than|isn't|(doesn't|does not) (equal|come before|come after|contain)|(greater|less) than( or equal)?|(starts?|ends|begins?) with|contained by|comes (before|after)|a (ref|reference)|POSIX file|POSIX path|(date|time) string|quoted form)\\b"},{bK:"on",i:"[${=;\\n]",c:[e.UTM,r]}].concat(o),i:"//|->|=>|\\[\\["}});
+hljs.registerLanguage("dos",function(e){var r=e.C(/^\s*@?rem\b/,/$/,{relevance:10});return{aliases:["bat","cmd"],cI:!0,i:/\/\*/,k:{keyword:"if else goto for in do call exit not exist errorlevel defined equ neq lss leq gtr geq",built_in:"prn nul lpt3 lpt2 lpt1 con com4 com3 com2 com1 aux shift cd dir echo setlocal endlocal set pause copy append assoc at attrib break cacls cd chcp chdir chkdsk chkntfs cls cmd color comp compact convert date dir diskcomp diskcopy doskey erase fs find findstr format ftype graftabl help keyb label md mkdir mode more move path pause print popd pushd promt rd recover rem rename replace restore rmdir shiftsort start subst time title tree type ver verify vol ping net ipconfig taskkill xcopy ren del"},c:[{cN:"variable",b:/%%[^ ]|%[^ ]+?%|![^ ]+?!/},{cN:"function",b:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)",e:"goto:eof",c:[e.inherit(e.TM,{b:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),r]},{cN:"number",b:"\\b\\d+",relevance:0},r]}});
+hljs.registerLanguage("shell",function(s){return{aliases:["console"],c:[{cN:"meta",b:"^\\s{0,3}[/\\w\\d\\[\\]()@-]*[>%$#]",starts:{e:"$",sL:"bash"}}]}});
+hljs.registerLanguage("elixir",function(e){var b="[a-zA-Z_][a-zA-Z0-9_.]*(\\!|\\?)?",c="and false then defined module in return redo retry end for true self when next until do begin unless nil break not case cond alias while ensure or include use alias fn quote require import with|0",n={cN:"subst",b:"#\\{",e:"}",l:b,k:c},r="[/|([{<\"']",a={cN:"string",b:"~[a-z](?="+r+")",c:[{endsParent:!0,c:[{c:[e.BE,n],v:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/\//,e:/\//},{b:/\|/,e:/\|/},{b:/\(/,e:/\)/},{b:/\[/,e:/\]/},{b:/\{/,e:/\}/},{b:/</,e:/>/}]}]}]},i={cN:"string",b:"~[A-Z](?="+r+")",c:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/\//,e:/\//},{b:/\|/,e:/\|/},{b:/\(/,e:/\)/},{b:/\[/,e:/\]/},{b:/\{/,e:/\}/},{b:/\</,e:/\>/}]},l={cN:"string",c:[e.BE,n],v:[{b:/"""/,e:/"""/},{b:/'''/,e:/'''/},{b:/~S"""/,e:/"""/,c:[]},{b:/~S"/,e:/"/,c:[]},{b:/~S'''/,e:/'''/,c:[]},{b:/~S'/,e:/'/,c:[]},{b:/'/,e:/'/},{b:/"/,e:/"/}]},s={cN:"function",bK:"def defp defmacro",e:/\B\b/,c:[e.inherit(e.TM,{b:b,endsParent:!0})]},t=e.inherit(s,{cN:"class",bK:"defimpl defmodule defprotocol defrecord",e:/\bdo\b|$|;/}),d=[l,i,a,e.HCM,t,s,{b:"::"},{cN:"symbol",b:":(?![\\s:])",c:[l,{b:"[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?"}],relevance:0},{cN:"symbol",b:b+":(?!:)",relevance:0},{cN:"number",b:"(\\b0o[0-7_]+)|(\\b0b[01_]+)|(\\b0x[0-9a-fA-F_]+)|(-?\\b[1-9][0-9_]*(.[0-9_]+([eE][-+]?[0-9]+)?)?)",relevance:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"->"},{b:"("+e.RSR+")\\s*",c:[e.HCM,{cN:"regexp",i:"\\n",c:[e.BE,n],v:[{b:"/",e:"/[a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}],relevance:0}];return{l:b,k:c,c:n.c=d}});
+hljs.registerLanguage("awk",function(e){return{k:{keyword:"BEGIN END if else while do for in break continue delete next nextfile function func exit|10"},c:[{cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},{cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,relevance:10},{b:/(u|b)?r?"""/,e:/"""/,relevance:10},{b:/(u|r|ur)'/,e:/'/,relevance:10},{b:/(u|r|ur)"/,e:/"/,relevance:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},e.ASM,e.QSM]},e.RM,e.HCM,e.NM]}});
+hljs.registerLanguage("armasm",function(s){return{cI:!0,aliases:["arm"],l:"\\.?"+s.IR,k:{meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .arm .thumb .code16 .code32 .force_thumb .thumb_func .ltorg ALIAS ALIGN ARM AREA ASSERT ATTR CN CODE CODE16 CODE32 COMMON CP DATA DCB DCD DCDU DCDO DCFD DCFDU DCI DCQ DCQU DCW DCWU DN ELIF ELSE END ENDFUNC ENDIF ENDP ENTRY EQU EXPORT EXPORTAS EXTERN FIELD FILL FUNCTION GBLA GBLL GBLS GET GLOBAL IF IMPORT INCBIN INCLUDE INFO KEEP LCLA LCLL LCLS LTORG MACRO MAP MEND MEXIT NOFP OPT PRESERVE8 PROC QN READONLY RELOC REQUIRE REQUIRE8 RLIST FN ROUT SETA SETL SETS SN SPACE SUBT THUMB THUMBX TTL WHILE WEND ",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 pc lr sp ip sl sb fp a1 a2 a3 a4 v1 v2 v3 v4 v5 v6 v7 v8 f0 f1 f2 f3 f4 f5 f6 f7 p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 q0 q1 q2 q3 q4 q5 q6 q7 q8 q9 q10 q11 q12 q13 q14 q15 cpsr_c cpsr_x cpsr_s cpsr_f cpsr_cx cpsr_cxs cpsr_xs cpsr_xsf cpsr_sf cpsr_cxsf spsr_c spsr_x spsr_s spsr_f spsr_cx spsr_cxs spsr_xs spsr_xsf spsr_sf spsr_cxsf s0 s1 s2 s3 s4 s5 s6 s7 s8 s9 s10 s11 s12 s13 s14 s15 s16 s17 s18 s19 s20 s21 s22 s23 s24 s25 s26 s27 s28 s29 s30 s31 d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 d10 d11 d12 d13 d14 d15 d16 d17 d18 d19 d20 d21 d22 d23 d24 d25 d26 d27 d28 d29 d30 d31 {PC} {VAR} {TRUE} {FALSE} {OPT} {CONFIG} {ENDIAN} {CODESIZE} {CPU} {FPU} {ARCHITECTURE} {PCSTOREOFFSET} {ARMASM_VERSION} {INTER} {ROPI} {RWPI} {SWST} {NOSWST} . @"},c:[{cN:"keyword",b:"\\b(adc|(qd?|sh?|u[qh]?)?add(8|16)?|usada?8|(q|sh?|u[qh]?)?(as|sa)x|and|adrl?|sbc|rs[bc]|asr|b[lx]?|blx|bxj|cbn?z|tb[bh]|bic|bfc|bfi|[su]bfx|bkpt|cdp2?|clz|clrex|cmp|cmn|cpsi[ed]|cps|setend|dbg|dmb|dsb|eor|isb|it[te]{0,3}|lsl|lsr|ror|rrx|ldm(([id][ab])|f[ds])?|ldr((s|ex)?[bhd])?|movt?|mvn|mra|mar|mul|[us]mull|smul[bwt][bt]|smu[as]d|smmul|smmla|mla|umlaal|smlal?([wbt][bt]|d)|mls|smlsl?[ds]|smc|svc|sev|mia([bt]{2}|ph)?|mrr?c2?|mcrr2?|mrs|msr|orr|orn|pkh(tb|bt)|rbit|rev(16|sh)?|sel|[su]sat(16)?|nop|pop|push|rfe([id][ab])?|stm([id][ab])?|str(ex)?[bhd]?|(qd?)?sub|(sh?|q|u[qh]?)?sub(8|16)|[su]xt(a?h|a?b(16)?)|srs([id][ab])?|swpb?|swi|smi|tst|teq|wfe|wfi|yield)(eq|ne|cs|cc|mi|pl|vs|vc|hi|ls|ge|lt|gt|le|al|hs|lo)?[sptrx]?",e:"\\s"},s.C("[;@]","$",{relevance:0}),s.CBCM,s.QSM,{cN:"string",b:"'",e:"[^\\\\]'",relevance:0},{cN:"title",b:"\\|",e:"\\|",i:"\\n",relevance:0},{cN:"number",v:[{b:"[#$=]?0x[0-9a-f]+"},{b:"[#$=]?0b[01]+"},{b:"[#$=]\\d+"},{b:"\\b\\d+"}],relevance:0},{cN:"symbol",v:[{b:"^[a-z_\\.\\$][a-z0-9_\\.\\$]+"},{b:"^\\s*[a-z_\\.\\$][a-z0-9_\\.\\$]+:"},{b:"[=#]\\w+"}],relevance:0}]}});
+hljs.registerLanguage("stan",function(_){return{aliases:["stanfuncs"],k:{title:["functions","model","data","parameters","quantities","transformed","generated"].join(" "),keyword:["for","in","if","else","while","break","continue","return"].concat(["int","real","vector","ordered","positive_ordered","simplex","unit_vector","row_vector","matrix","cholesky_factor_corr|10","cholesky_factor_cov|10","corr_matrix|10","cov_matrix|10","void"]).concat(["print","reject","increment_log_prob|10","integrate_ode|10","integrate_ode_rk45|10","integrate_ode_bdf|10","algebra_solver"]).join(" "),built_in:["Phi","Phi_approx","abs","acos","acosh","algebra_solver","append_array","append_col","append_row","asin","asinh","atan","atan2","atanh","bernoulli_cdf","bernoulli_lccdf","bernoulli_lcdf","bernoulli_logit_lpmf","bernoulli_logit_rng","bernoulli_lpmf","bernoulli_rng","bessel_first_kind","bessel_second_kind","beta_binomial_cdf","beta_binomial_lccdf","beta_binomial_lcdf","beta_binomial_lpmf","beta_binomial_rng","beta_cdf","beta_lccdf","beta_lcdf","beta_lpdf","beta_rng","binary_log_loss","binomial_cdf","binomial_coefficient_log","binomial_lccdf","binomial_lcdf","binomial_logit_lpmf","binomial_lpmf","binomial_rng","block","categorical_logit_lpmf","categorical_logit_rng","categorical_lpmf","categorical_rng","cauchy_cdf","cauchy_lccdf","cauchy_lcdf","cauchy_lpdf","cauchy_rng","cbrt","ceil","chi_square_cdf","chi_square_lccdf","chi_square_lcdf","chi_square_lpdf","chi_square_rng","cholesky_decompose","choose","col","cols","columns_dot_product","columns_dot_self","cos","cosh","cov_exp_quad","crossprod","csr_extract_u","csr_extract_v","csr_extract_w","csr_matrix_times_vector","csr_to_dense_matrix","cumulative_sum","determinant","diag_matrix","diag_post_multiply","diag_pre_multiply","diagonal","digamma","dims","dirichlet_lpdf","dirichlet_rng","distance","dot_product","dot_self","double_exponential_cdf","double_exponential_lccdf","double_exponential_lcdf","double_exponential_lpdf","double_exponential_rng","e","eigenvalues_sym","eigenvectors_sym","erf","erfc","exp","exp2","exp_mod_normal_cdf","exp_mod_normal_lccdf","exp_mod_normal_lcdf","exp_mod_normal_lpdf","exp_mod_normal_rng","expm1","exponential_cdf","exponential_lccdf","exponential_lcdf","exponential_lpdf","exponential_rng","fabs","falling_factorial","fdim","floor","fma","fmax","fmin","fmod","frechet_cdf","frechet_lccdf","frechet_lcdf","frechet_lpdf","frechet_rng","gamma_cdf","gamma_lccdf","gamma_lcdf","gamma_lpdf","gamma_p","gamma_q","gamma_rng","gaussian_dlm_obs_lpdf","get_lp","gumbel_cdf","gumbel_lccdf","gumbel_lcdf","gumbel_lpdf","gumbel_rng","head","hypergeometric_lpmf","hypergeometric_rng","hypot","inc_beta","int_step","integrate_ode","integrate_ode_bdf","integrate_ode_rk45","inv","inv_Phi","inv_chi_square_cdf","inv_chi_square_lccdf","inv_chi_square_lcdf","inv_chi_square_lpdf","inv_chi_square_rng","inv_cloglog","inv_gamma_cdf","inv_gamma_lccdf","inv_gamma_lcdf","inv_gamma_lpdf","inv_gamma_rng","inv_logit","inv_sqrt","inv_square","inv_wishart_lpdf","inv_wishart_rng","inverse","inverse_spd","is_inf","is_nan","lbeta","lchoose","lgamma","lkj_corr_cholesky_lpdf","lkj_corr_cholesky_rng","lkj_corr_lpdf","lkj_corr_rng","lmgamma","lmultiply","log","log10","log1m","log1m_exp","log1m_inv_logit","log1p","log1p_exp","log2","log_determinant","log_diff_exp","log_falling_factorial","log_inv_logit","log_mix","log_rising_factorial","log_softmax","log_sum_exp","logistic_cdf","logistic_lccdf","logistic_lcdf","logistic_lpdf","logistic_rng","logit","lognormal_cdf","lognormal_lccdf","lognormal_lcdf","lognormal_lpdf","lognormal_rng","machine_precision","matrix_exp","max","mdivide_left_spd","mdivide_left_tri_low","mdivide_right_spd","mdivide_right_tri_low","mean","min","modified_bessel_first_kind","modified_bessel_second_kind","multi_gp_cholesky_lpdf","multi_gp_lpdf","multi_normal_cholesky_lpdf","multi_normal_cholesky_rng","multi_normal_lpdf","multi_normal_prec_lpdf","multi_normal_rng","multi_student_t_lpdf","multi_student_t_rng","multinomial_lpmf","multinomial_rng","multiply_log","multiply_lower_tri_self_transpose","neg_binomial_2_cdf","neg_binomial_2_lccdf","neg_binomial_2_lcdf","neg_binomial_2_log_lpmf","neg_binomial_2_log_rng","neg_binomial_2_lpmf","neg_binomial_2_rng","neg_binomial_cdf","neg_binomial_lccdf","neg_binomial_lcdf","neg_binomial_lpmf","neg_binomial_rng","negative_infinity","normal_cdf","normal_lccdf","normal_lcdf","normal_lpdf","normal_rng","not_a_number","num_elements","ordered_logistic_lpmf","ordered_logistic_rng","owens_t","pareto_cdf","pareto_lccdf","pareto_lcdf","pareto_lpdf","pareto_rng","pareto_type_2_cdf","pareto_type_2_lccdf","pareto_type_2_lcdf","pareto_type_2_lpdf","pareto_type_2_rng","pi","poisson_cdf","poisson_lccdf","poisson_lcdf","poisson_log_lpmf","poisson_log_rng","poisson_lpmf","poisson_rng","positive_infinity","pow","print","prod","qr_Q","qr_R","quad_form","quad_form_diag","quad_form_sym","rank","rayleigh_cdf","rayleigh_lccdf","rayleigh_lcdf","rayleigh_lpdf","rayleigh_rng","reject","rep_array","rep_matrix","rep_row_vector","rep_vector","rising_factorial","round","row","rows","rows_dot_product","rows_dot_self","scaled_inv_chi_square_cdf","scaled_inv_chi_square_lccdf","scaled_inv_chi_square_lcdf","scaled_inv_chi_square_lpdf","scaled_inv_chi_square_rng","sd","segment","sin","singular_values","sinh","size","skew_normal_cdf","skew_normal_lccdf","skew_normal_lcdf","skew_normal_lpdf","skew_normal_rng","softmax","sort_asc","sort_desc","sort_indices_asc","sort_indices_desc","sqrt","sqrt2","square","squared_distance","step","student_t_cdf","student_t_lccdf","student_t_lcdf","student_t_lpdf","student_t_rng","sub_col","sub_row","sum","tail","tan","tanh","target","tcrossprod","tgamma","to_array_1d","to_array_2d","to_matrix","to_row_vector","to_vector","trace","trace_gen_quad_form","trace_quad_form","trigamma","trunc","uniform_cdf","uniform_lccdf","uniform_lcdf","uniform_lpdf","uniform_rng","variance","von_mises_lpdf","von_mises_rng","weibull_cdf","weibull_lccdf","weibull_lcdf","weibull_lpdf","weibull_rng","wiener_lpdf","wishart_lpdf","wishart_rng"].join(" ")},l:_.IR,c:[_.CLCM,_.C(/#/,/$/,{relevance:0,k:{"meta-keyword":"include"}}),_.C(/\/\*/,/\*\//,{relevance:0,c:[{cN:"doctag",b:/@(return|param)/}]}),{b:/<\s*lower\s*=/,k:"lower"},{b:/[<,]*upper\s*=/,k:"upper"},{cN:"keyword",b:/\btarget\s*\+=/,relevance:10},{b:"~\\s*("+_.IR+")\\s*\\(",k:["bernoulli","bernoulli_logit","beta","beta_binomial","binomial","binomial_logit","categorical","categorical_logit","cauchy","chi_square","dirichlet","double_exponential","exp_mod_normal","exponential","frechet","gamma","gaussian_dlm_obs","gumbel","hypergeometric","inv_chi_square","inv_gamma","inv_wishart","lkj_corr","lkj_corr_cholesky","logistic","lognormal","multi_gp","multi_gp_cholesky","multi_normal","multi_normal_cholesky","multi_normal_prec","multi_student_t","multinomial","neg_binomial","neg_binomial_2","neg_binomial_2_log","normal","ordered_logistic","pareto","pareto_type_2","poisson","poisson_log","rayleigh","scaled_inv_chi_square","skew_normal","student_t","uniform","von_mises","weibull","wiener","wishart"].join(" ")},{cN:"number",v:[{b:/\b\d+(?:\.\d*)?(?:[eE][+-]?\d+)?/},{b:/\.\d+(?:[eE][+-]?\d+)?\b/}],relevance:0},{cN:"string",b:'"',e:'"',relevance:0}]}});
+hljs.registerLanguage("sas",function(e){return{aliases:["sas","SAS"],cI:!0,k:{literal:"null missing _all_ _automatic_ _character_ _infile_ _n_ _name_ _null_ _numeric_ _user_ _webout_",meta:"do if then else end until while abort array attrib by call cards cards4 catname continue datalines datalines4 delete delim delimiter display dm drop endsas error file filename footnote format goto in infile informat input keep label leave length libname link list lostcard merge missing modify options output out page put redirect remove rename replace retain return select set skip startsas stop title update waitsas where window x systask add and alter as cascade check create delete describe distinct drop foreign from group having index insert into in key like message modify msgtype not null on or order primary references reset restrict select set table unique update validate view where"},c:[{cN:"keyword",b:/^\s*(proc [\w\d_]+|data|run|quit)[\s\;]/},{cN:"variable",b:/\&[a-zA-Z_\&][a-zA-Z0-9_]*\.?/},{cN:"emphasis",b:/^\s*datalines|cards.*;/,e:/^\s*;\s*$/},{cN:"built_in",b:"%(bquote|nrbquote|cmpres|qcmpres|compstor|datatyp|display|do|else|end|eval|global|goto|if|index|input|keydef|label|left|length|let|local|lowcase|macro|mend|nrbquote|nrquote|nrstr|put|qcmpres|qleft|qlowcase|qscan|qsubstr|qsysfunc|qtrim|quote|qupcase|scan|str|substr|superq|syscall|sysevalf|sysexec|sysfunc|sysget|syslput|sysprod|sysrc|sysrput|then|to|trim|unquote|until|upcase|verify|while|window)"},{cN:"name",b:/%[a-zA-Z_][a-zA-Z_0-9]*/},{cN:"meta",b:"[^%](abs|addr|airy|arcos|arsin|atan|attrc|attrn|band|betainv|blshift|bnot|bor|brshift|bxor|byte|cdf|ceil|cexist|cinv|close|cnonct|collate|compbl|compound|compress|cos|cosh|css|curobs|cv|daccdb|daccdbsl|daccsl|daccsyd|dacctab|dairy|date|datejul|datepart|datetime|day|dclose|depdb|depdbsl|depdbsl|depsl|depsl|depsyd|depsyd|deptab|deptab|dequote|dhms|dif|digamma|dim|dinfo|dnum|dopen|doptname|doptnum|dread|dropnote|dsname|erf|erfc|exist|exp|fappend|fclose|fcol|fdelete|fetch|fetchobs|fexist|fget|fileexist|filename|fileref|finfo|finv|fipname|fipnamel|fipstate|floor|fnonct|fnote|fopen|foptname|foptnum|fpoint|fpos|fput|fread|frewind|frlen|fsep|fuzz|fwrite|gaminv|gamma|getoption|getvarc|getvarn|hbound|hms|hosthelp|hour|ibessel|index|indexc|indexw|input|inputc|inputn|int|intck|intnx|intrr|irr|jbessel|juldate|kurtosis|lag|lbound|left|length|lgamma|libname|libref|log|log10|log2|logpdf|logpmf|logsdf|lowcase|max|mdy|mean|min|minute|mod|month|mopen|mort|n|netpv|nmiss|normal|note|npv|open|ordinal|pathname|pdf|peek|peekc|pmf|point|poisson|poke|probbeta|probbnml|probchi|probf|probgam|probhypr|probit|probnegb|probnorm|probt|put|putc|putn|qtr|quote|ranbin|rancau|ranexp|rangam|range|rank|rannor|ranpoi|rantbl|rantri|ranuni|repeat|resolve|reverse|rewind|right|round|saving|scan|sdf|second|sign|sin|sinh|skewness|soundex|spedis|sqrt|std|stderr|stfips|stname|stnamel|substr|sum|symget|sysget|sysmsg|sysprod|sysrc|system|tan|tanh|time|timepart|tinv|tnonct|today|translate|tranwrd|trigamma|trim|trimn|trunc|uniform|upcase|uss|var|varfmt|varinfmt|varlabel|varlen|varname|varnum|varray|varrayx|vartype|verify|vformat|vformatd|vformatdx|vformatn|vformatnx|vformatw|vformatwx|vformatx|vinarray|vinarrayx|vinformat|vinformatd|vinformatdx|vinformatn|vinformatnx|vinformatw|vinformatwx|vinformatx|vlabel|vlabelx|vlength|vlengthx|vname|vnamex|vtype|vtypex|weekday|year|yyq|zipfips|zipname|zipnamel|zipstate)[(]"},{cN:"string",v:[e.ASM,e.QSM]},e.C("\\*",";"),e.CBCM]}});
+hljs.registerLanguage("routeros",function(e){var r="foreach do while for if from to step else on-error and or not in",i="true false yes no nothing nil null",o={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},t={cN:"string",b:/"/,e:/"/,c:[e.BE,o,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},s={cN:"string",b:/'/,e:/'/};return{aliases:["routeros","mikrotik"],cI:!0,l:/:?[\w-]+/,k:{literal:i,keyword:r+" :"+r.split(" ").join(" :")+" :"+"global local beep delay put len typeof pick log time set find environment terminal error execute parse resolve toarray tobool toid toip toip6 tonum tostr totime".split(" ").join(" :")},c:[{v:[{b:/^@/,e:/$/},{b:/\/\*/,e:/\*\//},{b:/%%/,e:/$/},{b:/^'/,e:/$/},{b:/^\s*\/[\w-]+=/,e:/$/},{b:/\/\//,e:/$/},{b:/^\[\</,e:/\>\]$/},{b:/<\//,e:/>/},{b:/^facet /,e:/\}/},{b:"^1\\.\\.(\\d+)$",e:/$/}],i:/./},e.C("^#","$"),t,s,o,{b:/[\w-]+\=([^\s\{\}\[\]\(\)]+)/,relevance:0,rB:!0,c:[{cN:"attribute",b:/[^=]+/},{b:/=/,eW:!0,relevance:0,c:[t,s,o,{cN:"literal",b:"\\b("+i.split(" ").join("|")+")\\b"},{b:/("[^"]*"|[^\s\{\}\[\]]+)/}]}]},{cN:"number",b:/\*[0-9a-fA-F]+/},{b:"\\b("+"add remove enable disable set get print export edit find run debug error info warning".split(" ").join("|")+")([\\s[(]|])",rB:!0,c:[{cN:"builtin-name",b:/\w+/}]},{cN:"built_in",v:[{b:"(\\.\\./|/|\\s)(("+"traffic-flow traffic-generator firewall scheduler aaa accounting address-list address align area bandwidth-server bfd bgp bridge client clock community config connection console customer default dhcp-client dhcp-server discovery dns e-mail ethernet filter firewall firmware gps graphing group hardware health hotspot identity igmp-proxy incoming instance interface ip ipsec ipv6 irq l2tp-server lcd ldp logging mac-server mac-winbox mangle manual mirror mme mpls nat nd neighbor network note ntp ospf ospf-v3 ovpn-server page peer pim ping policy pool port ppp pppoe-client pptp-server prefix profile proposal proxy queue radius resource rip ripng route routing screen script security-profiles server service service-port settings shares smb sms sniffer snmp snooper socks sstp-server system tool tracking type upgrade upnp user-manager users user vlan secret vrrp watchdog web-access wireless pptp pppoe lan wan layer7-protocol lease simple raw".split(" ").join("|")+");?\\s)+",relevance:10},{b:/\.\./}]}]}});
+hljs.registerLanguage("gml",function(e){return{aliases:["gml","GML"],cI:!1,k:{keyword:"begin end if then else while do for break continue with until repeat exit and or xor not return mod div switch case default var globalvar enum #macro #region #endregion",built_in:"is_real is_string is_array is_undefined is_int32 is_int64 is_ptr is_vec3 is_vec4 is_matrix is_bool typeof variable_global_exists variable_global_get variable_global_set variable_instance_exists variable_instance_get variable_instance_set variable_instance_get_names array_length_1d array_length_2d array_height_2d array_equals array_create array_copy random random_range irandom irandom_range random_set_seed random_get_seed randomize randomise choose abs round floor ceil sign frac sqrt sqr exp ln log2 log10 sin cos tan arcsin arccos arctan arctan2 dsin dcos dtan darcsin darccos darctan darctan2 degtorad radtodeg power logn min max mean median clamp lerp dot_product dot_product_3d dot_product_normalised dot_product_3d_normalised dot_product_normalized dot_product_3d_normalized math_set_epsilon math_get_epsilon angle_difference point_distance_3d point_distance point_direction lengthdir_x lengthdir_y real string int64 ptr string_format chr ansi_char ord string_length string_byte_length string_pos string_copy string_char_at string_ord_at string_byte_at string_set_byte_at string_delete string_insert string_lower string_upper string_repeat string_letters string_digits string_lettersdigits string_replace string_replace_all string_count string_hash_to_newline clipboard_has_text clipboard_set_text clipboard_get_text date_current_datetime date_create_datetime date_valid_datetime date_inc_year date_inc_month date_inc_week date_inc_day date_inc_hour date_inc_minute date_inc_second date_get_year date_get_month date_get_week date_get_day date_get_hour date_get_minute date_get_second date_get_weekday date_get_day_of_year date_get_hour_of_year date_get_minute_of_year date_get_second_of_year date_year_span date_month_span date_week_span date_day_span date_hour_span date_minute_span date_second_span date_compare_datetime date_compare_date date_compare_time date_date_of date_time_of date_datetime_string date_date_string date_time_string date_days_in_month date_days_in_year date_leap_year date_is_today date_set_timezone date_get_timezone game_set_speed game_get_speed motion_set motion_add place_free place_empty place_meeting place_snapped move_random move_snap move_towards_point move_contact_solid move_contact_all move_outside_solid move_outside_all move_bounce_solid move_bounce_all move_wrap distance_to_point distance_to_object position_empty position_meeting path_start path_end mp_linear_step mp_potential_step mp_linear_step_object mp_potential_step_object mp_potential_settings mp_linear_path mp_potential_path mp_linear_path_object mp_potential_path_object mp_grid_create mp_grid_destroy mp_grid_clear_all mp_grid_clear_cell mp_grid_clear_rectangle mp_grid_add_cell mp_grid_get_cell mp_grid_add_rectangle mp_grid_add_instances mp_grid_path mp_grid_draw mp_grid_to_ds_grid collision_point collision_rectangle collision_circle collision_ellipse collision_line collision_point_list collision_rectangle_list collision_circle_list collision_ellipse_list collision_line_list instance_position_list instance_place_list point_in_rectangle point_in_triangle point_in_circle rectangle_in_rectangle rectangle_in_triangle rectangle_in_circle instance_find instance_exists instance_number instance_position instance_nearest instance_furthest instance_place instance_create_depth instance_create_layer instance_copy instance_change instance_destroy position_destroy position_change instance_id_get instance_deactivate_all instance_deactivate_object instance_deactivate_region instance_activate_all instance_activate_object instance_activate_region room_goto room_goto_previous room_goto_next room_previous room_next room_restart game_end game_restart game_load game_save game_save_buffer game_load_buffer event_perform event_user event_perform_object event_inherited show_debug_message show_debug_overlay debug_event debug_get_callstack alarm_get alarm_set font_texture_page_size keyboard_set_map keyboard_get_map keyboard_unset_map keyboard_check keyboard_check_pressed keyboard_check_released keyboard_check_direct keyboard_get_numlock keyboard_set_numlock keyboard_key_press keyboard_key_release keyboard_clear io_clear mouse_check_button mouse_check_button_pressed mouse_check_button_released mouse_wheel_up mouse_wheel_down mouse_clear draw_self draw_sprite draw_sprite_pos draw_sprite_ext draw_sprite_stretched draw_sprite_stretched_ext draw_sprite_tiled draw_sprite_tiled_ext draw_sprite_part draw_sprite_part_ext draw_sprite_general draw_clear draw_clear_alpha draw_point draw_line draw_line_width draw_rectangle draw_roundrect draw_roundrect_ext draw_triangle draw_circle draw_ellipse draw_set_circle_precision draw_arrow draw_button draw_path draw_healthbar draw_getpixel draw_getpixel_ext draw_set_colour draw_set_color draw_set_alpha draw_get_colour draw_get_color draw_get_alpha merge_colour make_colour_rgb make_colour_hsv colour_get_red colour_get_green colour_get_blue colour_get_hue colour_get_saturation colour_get_value merge_color make_color_rgb make_color_hsv color_get_red color_get_green color_get_blue color_get_hue color_get_saturation color_get_value merge_color screen_save screen_save_part draw_set_font draw_set_halign draw_set_valign draw_text draw_text_ext string_width string_height string_width_ext string_height_ext draw_text_transformed draw_text_ext_transformed draw_text_colour draw_text_ext_colour draw_text_transformed_colour draw_text_ext_transformed_colour draw_text_color draw_text_ext_color draw_text_transformed_color draw_text_ext_transformed_color draw_point_colour draw_line_colour draw_line_width_colour draw_rectangle_colour draw_roundrect_colour draw_roundrect_colour_ext draw_triangle_colour draw_circle_colour draw_ellipse_colour draw_point_color draw_line_color draw_line_width_color draw_rectangle_color draw_roundrect_color draw_roundrect_color_ext draw_triangle_color draw_circle_color draw_ellipse_color draw_primitive_begin draw_vertex draw_vertex_colour draw_vertex_color draw_primitive_end sprite_get_uvs font_get_uvs sprite_get_texture font_get_texture texture_get_width texture_get_height texture_get_uvs draw_primitive_begin_texture draw_vertex_texture draw_vertex_texture_colour draw_vertex_texture_color texture_global_scale surface_create surface_create_ext surface_resize surface_free surface_exists surface_get_width surface_get_height surface_get_texture surface_set_target surface_set_target_ext surface_reset_target surface_depth_disable surface_get_depth_disable draw_surface draw_surface_stretched draw_surface_tiled draw_surface_part draw_surface_ext draw_surface_stretched_ext draw_surface_tiled_ext draw_surface_part_ext draw_surface_general surface_getpixel surface_getpixel_ext surface_save surface_save_part surface_copy surface_copy_part application_surface_draw_enable application_get_position application_surface_enable application_surface_is_enabled display_get_width display_get_height display_get_orientation display_get_gui_width display_get_gui_height display_reset display_mouse_get_x display_mouse_get_y display_mouse_set display_set_ui_visibility window_set_fullscreen window_get_fullscreen window_set_caption window_set_min_width window_set_max_width window_set_min_height window_set_max_height window_get_visible_rects window_get_caption window_set_cursor window_get_cursor window_set_colour window_get_colour window_set_color window_get_color window_set_position window_set_size window_set_rectangle window_center window_get_x window_get_y window_get_width window_get_height window_mouse_get_x window_mouse_get_y window_mouse_set window_view_mouse_get_x window_view_mouse_get_y window_views_mouse_get_x window_views_mouse_get_y audio_listener_position audio_listener_velocity audio_listener_orientation audio_emitter_position audio_emitter_create audio_emitter_free audio_emitter_exists audio_emitter_pitch audio_emitter_velocity audio_emitter_falloff audio_emitter_gain audio_play_sound audio_play_sound_on audio_play_sound_at audio_stop_sound audio_resume_music audio_music_is_playing audio_resume_sound audio_pause_sound audio_pause_music audio_channel_num audio_sound_length audio_get_type audio_falloff_set_model audio_play_music audio_stop_music audio_master_gain audio_music_gain audio_sound_gain audio_sound_pitch audio_stop_all audio_resume_all audio_pause_all audio_is_playing audio_is_paused audio_exists audio_sound_set_track_position audio_sound_get_track_position audio_emitter_get_gain audio_emitter_get_pitch audio_emitter_get_x audio_emitter_get_y audio_emitter_get_z audio_emitter_get_vx audio_emitter_get_vy audio_emitter_get_vz audio_listener_set_position audio_listener_set_velocity audio_listener_set_orientation audio_listener_get_data audio_set_master_gain audio_get_master_gain audio_sound_get_gain audio_sound_get_pitch audio_get_name audio_sound_set_track_position audio_sound_get_track_position audio_create_stream audio_destroy_stream audio_create_sync_group audio_destroy_sync_group audio_play_in_sync_group audio_start_sync_group audio_stop_sync_group audio_pause_sync_group audio_resume_sync_group audio_sync_group_get_track_pos audio_sync_group_debug audio_sync_group_is_playing audio_debug audio_group_load audio_group_unload audio_group_is_loaded audio_group_load_progress audio_group_name audio_group_stop_all audio_group_set_gain audio_create_buffer_sound audio_free_buffer_sound audio_create_play_queue audio_free_play_queue audio_queue_sound audio_get_recorder_count audio_get_recorder_info audio_start_recording audio_stop_recording audio_sound_get_listener_mask audio_emitter_get_listener_mask audio_get_listener_mask audio_sound_set_listener_mask audio_emitter_set_listener_mask audio_set_listener_mask audio_get_listener_count audio_get_listener_info audio_system show_message show_message_async clickable_add clickable_add_ext clickable_change clickable_change_ext clickable_delete clickable_exists clickable_set_style show_question show_question_async get_integer get_string get_integer_async get_string_async get_login_async get_open_filename get_save_filename get_open_filename_ext get_save_filename_ext show_error highscore_clear highscore_add highscore_value highscore_name draw_highscore sprite_exists sprite_get_name sprite_get_number sprite_get_width sprite_get_height sprite_get_xoffset sprite_get_yoffset sprite_get_bbox_left sprite_get_bbox_right sprite_get_bbox_top sprite_get_bbox_bottom sprite_save sprite_save_strip sprite_set_cache_size sprite_set_cache_size_ext sprite_get_tpe sprite_prefetch sprite_prefetch_multi sprite_flush sprite_flush_multi sprite_set_speed sprite_get_speed_type sprite_get_speed font_exists font_get_name font_get_fontname font_get_bold font_get_italic font_get_first font_get_last font_get_size font_set_cache_size path_exists path_get_name path_get_length path_get_time path_get_kind path_get_closed path_get_precision path_get_number path_get_point_x path_get_point_y path_get_point_speed path_get_x path_get_y path_get_speed script_exists script_get_name timeline_add timeline_delete timeline_clear timeline_exists timeline_get_name timeline_moment_clear timeline_moment_add_script timeline_size timeline_max_moment object_exists object_get_name object_get_sprite object_get_solid object_get_visible object_get_persistent object_get_mask object_get_parent object_get_physics object_is_ancestor room_exists room_get_name sprite_set_offset sprite_duplicate sprite_assign sprite_merge sprite_add sprite_replace sprite_create_from_surface sprite_add_from_surface sprite_delete sprite_set_alpha_from_sprite sprite_collision_mask font_add_enable_aa font_add_get_enable_aa font_add font_add_sprite font_add_sprite_ext font_replace font_replace_sprite font_replace_sprite_ext font_delete path_set_kind path_set_closed path_set_precision path_add path_assign path_duplicate path_append path_delete path_add_point path_insert_point path_change_point path_delete_point path_clear_points path_reverse path_mirror path_flip path_rotate path_rescale path_shift script_execute object_set_sprite object_set_solid object_set_visible object_set_persistent object_set_mask room_set_width room_set_height room_set_persistent room_set_background_colour room_set_background_color room_set_view room_set_viewport room_get_viewport room_set_view_enabled room_add room_duplicate room_assign room_instance_add room_instance_clear room_get_camera room_set_camera asset_get_index asset_get_type file_text_open_from_string file_text_open_read file_text_open_write file_text_open_append file_text_close file_text_write_string file_text_write_real file_text_writeln file_text_read_string file_text_read_real file_text_readln file_text_eof file_text_eoln file_exists file_delete file_rename file_copy directory_exists directory_create directory_destroy file_find_first file_find_next file_find_close file_attributes filename_name filename_path filename_dir filename_drive filename_ext filename_change_ext file_bin_open file_bin_rewrite file_bin_close file_bin_position file_bin_size file_bin_seek file_bin_write_byte file_bin_read_byte parameter_count parameter_string environment_get_variable ini_open_from_string ini_open ini_close ini_read_string ini_read_real ini_write_string ini_write_real ini_key_exists ini_section_exists ini_key_delete ini_section_delete ds_set_precision ds_exists ds_stack_create ds_stack_destroy ds_stack_clear ds_stack_copy ds_stack_size ds_stack_empty ds_stack_push ds_stack_pop ds_stack_top ds_stack_write ds_stack_read ds_queue_create ds_queue_destroy ds_queue_clear ds_queue_copy ds_queue_size ds_queue_empty ds_queue_enqueue ds_queue_dequeue ds_queue_head ds_queue_tail ds_queue_write ds_queue_read ds_list_create ds_list_destroy ds_list_clear ds_list_copy ds_list_size ds_list_empty ds_list_add ds_list_insert ds_list_replace ds_list_delete ds_list_find_index ds_list_find_value ds_list_mark_as_list ds_list_mark_as_map ds_list_sort ds_list_shuffle ds_list_write ds_list_read ds_list_set ds_map_create ds_map_destroy ds_map_clear ds_map_copy ds_map_size ds_map_empty ds_map_add ds_map_add_list ds_map_add_map ds_map_replace ds_map_replace_map ds_map_replace_list ds_map_delete ds_map_exists ds_map_find_value ds_map_find_previous ds_map_find_next ds_map_find_first ds_map_find_last ds_map_write ds_map_read ds_map_secure_save ds_map_secure_load ds_map_secure_load_buffer ds_map_secure_save_buffer ds_map_set ds_priority_create ds_priority_destroy ds_priority_clear ds_priority_copy ds_priority_size ds_priority_empty ds_priority_add ds_priority_change_priority ds_priority_find_priority ds_priority_delete_value ds_priority_delete_min ds_priority_find_min ds_priority_delete_max ds_priority_find_max ds_priority_write ds_priority_read ds_grid_create ds_grid_destroy ds_grid_copy ds_grid_resize ds_grid_width ds_grid_height ds_grid_clear ds_grid_set ds_grid_add ds_grid_multiply ds_grid_set_region ds_grid_add_region ds_grid_multiply_region ds_grid_set_disk ds_grid_add_disk ds_grid_multiply_disk ds_grid_set_grid_region ds_grid_add_grid_region ds_grid_multiply_grid_region ds_grid_get ds_grid_get_sum ds_grid_get_max ds_grid_get_min ds_grid_get_mean ds_grid_get_disk_sum ds_grid_get_disk_min ds_grid_get_disk_max ds_grid_get_disk_mean ds_grid_value_exists ds_grid_value_x ds_grid_value_y ds_grid_value_disk_exists ds_grid_value_disk_x ds_grid_value_disk_y ds_grid_shuffle ds_grid_write ds_grid_read ds_grid_sort ds_grid_set ds_grid_get effect_create_below effect_create_above effect_clear part_type_create part_type_destroy part_type_exists part_type_clear part_type_shape part_type_sprite part_type_size part_type_scale part_type_orientation part_type_life part_type_step part_type_death part_type_speed part_type_direction part_type_gravity part_type_colour1 part_type_colour2 part_type_colour3 part_type_colour_mix part_type_colour_rgb part_type_colour_hsv part_type_color1 part_type_color2 part_type_color3 part_type_color_mix part_type_color_rgb part_type_color_hsv part_type_alpha1 part_type_alpha2 part_type_alpha3 part_type_blend part_system_create part_system_create_layer part_system_destroy part_system_exists part_system_clear part_system_draw_order part_system_depth part_system_position part_system_automatic_update part_system_automatic_draw part_system_update part_system_drawit part_system_get_layer part_system_layer part_particles_create part_particles_create_colour part_particles_create_color part_particles_clear part_particles_count part_emitter_create part_emitter_destroy part_emitter_destroy_all part_emitter_exists part_emitter_clear part_emitter_region part_emitter_burst part_emitter_stream external_call external_define external_free window_handle window_device matrix_get matrix_set matrix_build_identity matrix_build matrix_build_lookat matrix_build_projection_ortho matrix_build_projection_perspective matrix_build_projection_perspective_fov matrix_multiply matrix_transform_vertex matrix_stack_push matrix_stack_pop matrix_stack_multiply matrix_stack_set matrix_stack_clear matrix_stack_top matrix_stack_is_empty browser_input_capture os_get_config os_get_info os_get_language os_get_region os_lock_orientation display_get_dpi_x display_get_dpi_y display_set_gui_size display_set_gui_maximise display_set_gui_maximize device_mouse_dbclick_enable display_set_timing_method display_get_timing_method display_set_sleep_margin display_get_sleep_margin virtual_key_add virtual_key_hide virtual_key_delete virtual_key_show draw_enable_drawevent draw_enable_swf_aa draw_set_swf_aa_level draw_get_swf_aa_level draw_texture_flush draw_flush gpu_set_blendenable gpu_set_ztestenable gpu_set_zfunc gpu_set_zwriteenable gpu_set_lightingenable gpu_set_fog gpu_set_cullmode gpu_set_blendmode gpu_set_blendmode_ext gpu_set_blendmode_ext_sepalpha gpu_set_colorwriteenable gpu_set_colourwriteenable gpu_set_alphatestenable gpu_set_alphatestref gpu_set_alphatestfunc gpu_set_texfilter gpu_set_texfilter_ext gpu_set_texrepeat gpu_set_texrepeat_ext gpu_set_tex_filter gpu_set_tex_filter_ext gpu_set_tex_repeat gpu_set_tex_repeat_ext gpu_set_tex_mip_filter gpu_set_tex_mip_filter_ext gpu_set_tex_mip_bias gpu_set_tex_mip_bias_ext gpu_set_tex_min_mip gpu_set_tex_min_mip_ext gpu_set_tex_max_mip gpu_set_tex_max_mip_ext gpu_set_tex_max_aniso gpu_set_tex_max_aniso_ext gpu_set_tex_mip_enable gpu_set_tex_mip_enable_ext gpu_get_blendenable gpu_get_ztestenable gpu_get_zfunc gpu_get_zwriteenable gpu_get_lightingenable gpu_get_fog gpu_get_cullmode gpu_get_blendmode gpu_get_blendmode_ext gpu_get_blendmode_ext_sepalpha gpu_get_blendmode_src gpu_get_blendmode_dest gpu_get_blendmode_srcalpha gpu_get_blendmode_destalpha gpu_get_colorwriteenable gpu_get_colourwriteenable gpu_get_alphatestenable gpu_get_alphatestref gpu_get_alphatestfunc gpu_get_texfilter gpu_get_texfilter_ext gpu_get_texrepeat gpu_get_texrepeat_ext gpu_get_tex_filter gpu_get_tex_filter_ext gpu_get_tex_repeat gpu_get_tex_repeat_ext gpu_get_tex_mip_filter gpu_get_tex_mip_filter_ext gpu_get_tex_mip_bias gpu_get_tex_mip_bias_ext gpu_get_tex_min_mip gpu_get_tex_min_mip_ext gpu_get_tex_max_mip gpu_get_tex_max_mip_ext gpu_get_tex_max_aniso gpu_get_tex_max_aniso_ext gpu_get_tex_mip_enable gpu_get_tex_mip_enable_ext gpu_push_state gpu_pop_state gpu_get_state gpu_set_state draw_light_define_ambient draw_light_define_direction draw_light_define_point draw_light_enable draw_set_lighting draw_light_get_ambient draw_light_get draw_get_lighting shop_leave_rating url_get_domain url_open url_open_ext url_open_full get_timer achievement_login achievement_logout achievement_post achievement_increment achievement_post_score achievement_available achievement_show_achievements achievement_show_leaderboards achievement_load_friends achievement_load_leaderboard achievement_send_challenge achievement_load_progress achievement_reset achievement_login_status achievement_get_pic achievement_show_challenge_notifications achievement_get_challenges achievement_event achievement_show achievement_get_info cloud_file_save cloud_string_save cloud_synchronise ads_enable ads_disable ads_setup ads_engagement_launch ads_engagement_available ads_engagement_active ads_event ads_event_preload ads_set_reward_callback ads_get_display_height ads_get_display_width ads_move ads_interstitial_available ads_interstitial_display device_get_tilt_x device_get_tilt_y device_get_tilt_z device_is_keypad_open device_mouse_check_button device_mouse_check_button_pressed device_mouse_check_button_released device_mouse_x device_mouse_y device_mouse_raw_x device_mouse_raw_y device_mouse_x_to_gui device_mouse_y_to_gui iap_activate iap_status iap_enumerate_products iap_restore_all iap_acquire iap_consume iap_product_details iap_purchase_details facebook_init facebook_login facebook_status facebook_graph_request facebook_dialog facebook_logout facebook_launch_offerwall facebook_post_message facebook_send_invite facebook_user_id facebook_accesstoken facebook_check_permission facebook_request_read_permissions facebook_request_publish_permissions gamepad_is_supported gamepad_get_device_count gamepad_is_connected gamepad_get_description gamepad_get_button_threshold gamepad_set_button_threshold gamepad_get_axis_deadzone gamepad_set_axis_deadzone gamepad_button_count gamepad_button_check gamepad_button_check_pressed gamepad_button_check_released gamepad_button_value gamepad_axis_count gamepad_axis_value gamepad_set_vibration gamepad_set_colour gamepad_set_color os_is_paused window_has_focus code_is_compiled http_get http_get_file http_post_string http_request json_encode json_decode zip_unzip load_csv base64_encode base64_decode md5_string_unicode md5_string_utf8 md5_file os_is_network_connected sha1_string_unicode sha1_string_utf8 sha1_file os_powersave_enable analytics_event analytics_event_ext win8_livetile_tile_notification win8_livetile_tile_clear win8_livetile_badge_notification win8_livetile_badge_clear win8_livetile_queue_enable win8_secondarytile_pin win8_secondarytile_badge_notification win8_secondarytile_delete win8_livetile_notification_begin win8_livetile_notification_secondary_begin win8_livetile_notification_expiry win8_livetile_notification_tag win8_livetile_notification_text_add win8_livetile_notification_image_add win8_livetile_notification_end win8_appbar_enable win8_appbar_add_element win8_appbar_remove_element win8_settingscharm_add_entry win8_settingscharm_add_html_entry win8_settingscharm_add_xaml_entry win8_settingscharm_set_xaml_property win8_settingscharm_get_xaml_property win8_settingscharm_remove_entry win8_share_image win8_share_screenshot win8_share_file win8_share_url win8_share_text win8_search_enable win8_search_disable win8_search_add_suggestions win8_device_touchscreen_available win8_license_initialize_sandbox win8_license_trial_version winphone_license_trial_version winphone_tile_title winphone_tile_count winphone_tile_back_title winphone_tile_back_content winphone_tile_back_content_wide winphone_tile_front_image winphone_tile_front_image_small winphone_tile_front_image_wide winphone_tile_back_image winphone_tile_back_image_wide winphone_tile_background_colour winphone_tile_background_color winphone_tile_icon_image winphone_tile_small_icon_image winphone_tile_wide_content winphone_tile_cycle_images winphone_tile_small_background_image physics_world_create physics_world_gravity physics_world_update_speed physics_world_update_iterations physics_world_draw_debug physics_pause_enable physics_fixture_create physics_fixture_set_kinematic physics_fixture_set_density physics_fixture_set_awake physics_fixture_set_restitution physics_fixture_set_friction physics_fixture_set_collision_group physics_fixture_set_sensor physics_fixture_set_linear_damping physics_fixture_set_angular_damping physics_fixture_set_circle_shape physics_fixture_set_box_shape physics_fixture_set_edge_shape physics_fixture_set_polygon_shape physics_fixture_set_chain_shape physics_fixture_add_point physics_fixture_bind physics_fixture_bind_ext physics_fixture_delete physics_apply_force physics_apply_impulse physics_apply_angular_impulse physics_apply_local_force physics_apply_local_impulse physics_apply_torque physics_mass_properties physics_draw_debug physics_test_overlap physics_remove_fixture physics_set_friction physics_set_density physics_set_restitution physics_get_friction physics_get_density physics_get_restitution physics_joint_distance_create physics_joint_rope_create physics_joint_revolute_create physics_joint_prismatic_create physics_joint_pulley_create physics_joint_wheel_create physics_joint_weld_create physics_joint_friction_create physics_joint_gear_create physics_joint_enable_motor physics_joint_get_value physics_joint_set_value physics_joint_delete physics_particle_create physics_particle_delete physics_particle_delete_region_circle physics_particle_delete_region_box physics_particle_delete_region_poly physics_particle_set_flags physics_particle_set_category_flags physics_particle_draw physics_particle_draw_ext physics_particle_count physics_particle_get_data physics_particle_get_data_particle physics_particle_group_begin physics_particle_group_circle physics_particle_group_box physics_particle_group_polygon physics_particle_group_add_point physics_particle_group_end physics_particle_group_join physics_particle_group_delete physics_particle_group_count physics_particle_group_get_data physics_particle_group_get_mass physics_particle_group_get_inertia physics_particle_group_get_centre_x physics_particle_group_get_centre_y physics_particle_group_get_vel_x physics_particle_group_get_vel_y physics_particle_group_get_ang_vel physics_particle_group_get_x physics_particle_group_get_y physics_particle_group_get_angle physics_particle_set_group_flags physics_particle_get_group_flags physics_particle_get_max_count physics_particle_get_radius physics_particle_get_density physics_particle_get_damping physics_particle_get_gravity_scale physics_particle_set_max_count physics_particle_set_radius physics_particle_set_density physics_particle_set_damping physics_particle_set_gravity_scale network_create_socket network_create_socket_ext network_create_server network_create_server_raw network_connect network_connect_raw network_send_packet network_send_raw network_send_broadcast network_send_udp network_send_udp_raw network_set_timeout network_set_config network_resolve network_destroy buffer_create buffer_write buffer_read buffer_seek buffer_get_surface buffer_set_surface buffer_delete buffer_exists buffer_get_type buffer_get_alignment buffer_poke buffer_peek buffer_save buffer_save_ext buffer_load buffer_load_ext buffer_load_partial buffer_copy buffer_fill buffer_get_size buffer_tell buffer_resize buffer_md5 buffer_sha1 buffer_base64_encode buffer_base64_decode buffer_base64_decode_ext buffer_sizeof buffer_get_address buffer_create_from_vertex_buffer buffer_create_from_vertex_buffer_ext buffer_copy_from_vertex_buffer buffer_async_group_begin buffer_async_group_option buffer_async_group_end buffer_load_async buffer_save_async gml_release_mode gml_pragma steam_activate_overlay steam_is_overlay_enabled steam_is_overlay_activated steam_get_persona_name steam_initialised steam_is_cloud_enabled_for_app steam_is_cloud_enabled_for_account steam_file_persisted steam_get_quota_total steam_get_quota_free steam_file_write steam_file_write_file steam_file_read steam_file_delete steam_file_exists steam_file_size steam_file_share steam_is_screenshot_requested steam_send_screenshot steam_is_user_logged_on steam_get_user_steam_id steam_user_owns_dlc steam_user_installed_dlc steam_set_achievement steam_get_achievement steam_clear_achievement steam_set_stat_int steam_set_stat_float steam_set_stat_avg_rate steam_get_stat_int steam_get_stat_float steam_get_stat_avg_rate steam_reset_all_stats steam_reset_all_stats_achievements steam_stats_ready steam_create_leaderboard steam_upload_score steam_upload_score_ext steam_download_scores_around_user steam_download_scores steam_download_friends_scores steam_upload_score_buffer steam_upload_score_buffer_ext steam_current_game_language steam_available_languages steam_activate_overlay_browser steam_activate_overlay_user steam_activate_overlay_store steam_get_user_persona_name steam_get_app_id steam_get_user_account_id steam_ugc_download steam_ugc_create_item steam_ugc_start_item_update steam_ugc_set_item_title steam_ugc_set_item_description steam_ugc_set_item_visibility steam_ugc_set_item_tags steam_ugc_set_item_content steam_ugc_set_item_preview steam_ugc_submit_item_update steam_ugc_get_item_update_progress steam_ugc_subscribe_item steam_ugc_unsubscribe_item steam_ugc_num_subscribed_items steam_ugc_get_subscribed_items steam_ugc_get_item_install_info steam_ugc_get_item_update_info steam_ugc_request_item_details steam_ugc_create_query_user steam_ugc_create_query_user_ex steam_ugc_create_query_all steam_ugc_create_query_all_ex steam_ugc_query_set_cloud_filename_filter steam_ugc_query_set_match_any_tag steam_ugc_query_set_search_text steam_ugc_query_set_ranked_by_trend_days steam_ugc_query_add_required_tag steam_ugc_query_add_excluded_tag steam_ugc_query_set_return_long_description steam_ugc_query_set_return_total_only steam_ugc_query_set_allow_cached_response steam_ugc_send_query shader_set shader_get_name shader_reset shader_current shader_is_compiled shader_get_sampler_index shader_get_uniform shader_set_uniform_i shader_set_uniform_i_array shader_set_uniform_f shader_set_uniform_f_array shader_set_uniform_matrix shader_set_uniform_matrix_array shader_enable_corner_id texture_set_stage texture_get_texel_width texture_get_texel_height shaders_are_supported vertex_format_begin vertex_format_end vertex_format_delete vertex_format_add_position vertex_format_add_position_3d vertex_format_add_colour vertex_format_add_color vertex_format_add_normal vertex_format_add_texcoord vertex_format_add_textcoord vertex_format_add_custom vertex_create_buffer vertex_create_buffer_ext vertex_delete_buffer vertex_begin vertex_end vertex_position vertex_position_3d vertex_colour vertex_color vertex_argb vertex_texcoord vertex_normal vertex_float1 vertex_float2 vertex_float3 vertex_float4 vertex_ubyte4 vertex_submit vertex_freeze vertex_get_number vertex_get_buffer_size vertex_create_buffer_from_buffer vertex_create_buffer_from_buffer_ext push_local_notification push_get_first_local_notification push_get_next_local_notification push_cancel_local_notification skeleton_animation_set skeleton_animation_get skeleton_animation_mix skeleton_animation_set_ext skeleton_animation_get_ext skeleton_animation_get_duration skeleton_animation_get_frames skeleton_animation_clear skeleton_skin_set skeleton_skin_get skeleton_attachment_set skeleton_attachment_get skeleton_attachment_create skeleton_collision_draw_set skeleton_bone_data_get skeleton_bone_data_set skeleton_bone_state_get skeleton_bone_state_set skeleton_get_minmax skeleton_get_num_bounds skeleton_get_bounds skeleton_animation_get_frame skeleton_animation_set_frame draw_skeleton draw_skeleton_time draw_skeleton_instance draw_skeleton_collision skeleton_animation_list skeleton_skin_list skeleton_slot_data layer_get_id layer_get_id_at_depth layer_get_depth layer_create layer_destroy layer_destroy_instances layer_add_instance layer_has_instance layer_set_visible layer_get_visible layer_exists layer_x layer_y layer_get_x layer_get_y layer_hspeed layer_vspeed layer_get_hspeed layer_get_vspeed layer_script_begin layer_script_end layer_shader layer_get_script_begin layer_get_script_end layer_get_shader layer_set_target_room layer_get_target_room layer_reset_target_room layer_get_all layer_get_all_elements layer_get_name layer_depth layer_get_element_layer layer_get_element_type layer_element_move layer_force_draw_depth layer_is_draw_depth_forced layer_get_forced_depth layer_background_get_id layer_background_exists layer_background_create layer_background_destroy layer_background_visible layer_background_change layer_background_sprite layer_background_htiled layer_background_vtiled layer_background_stretch layer_background_yscale layer_background_xscale layer_background_blend layer_background_alpha layer_background_index layer_background_speed layer_background_get_visible layer_background_get_sprite layer_background_get_htiled layer_background_get_vtiled layer_background_get_stretch layer_background_get_yscale layer_background_get_xscale layer_background_get_blend layer_background_get_alpha layer_background_get_index layer_background_get_speed layer_sprite_get_id layer_sprite_exists layer_sprite_create layer_sprite_destroy layer_sprite_change layer_sprite_index layer_sprite_speed layer_sprite_xscale layer_sprite_yscale layer_sprite_angle layer_sprite_blend layer_sprite_alpha layer_sprite_x layer_sprite_y layer_sprite_get_sprite layer_sprite_get_index layer_sprite_get_speed layer_sprite_get_xscale layer_sprite_get_yscale layer_sprite_get_angle layer_sprite_get_blend layer_sprite_get_alpha layer_sprite_get_x layer_sprite_get_y layer_tilemap_get_id layer_tilemap_exists layer_tilemap_create layer_tilemap_destroy tilemap_tileset tilemap_x tilemap_y tilemap_set tilemap_set_at_pixel tilemap_get_tileset tilemap_get_tile_width tilemap_get_tile_height tilemap_get_width tilemap_get_height tilemap_get_x tilemap_get_y tilemap_get tilemap_get_at_pixel tilemap_get_cell_x_at_pixel tilemap_get_cell_y_at_pixel tilemap_clear draw_tilemap draw_tile tilemap_set_global_mask tilemap_get_global_mask tilemap_set_mask tilemap_get_mask tilemap_get_frame tile_set_empty tile_set_index tile_set_flip tile_set_mirror tile_set_rotate tile_get_empty tile_get_index tile_get_flip tile_get_mirror tile_get_rotate layer_tile_exists layer_tile_create layer_tile_destroy layer_tile_change layer_tile_xscale layer_tile_yscale layer_tile_blend layer_tile_alpha layer_tile_x layer_tile_y layer_tile_region layer_tile_visible layer_tile_get_sprite layer_tile_get_xscale layer_tile_get_yscale layer_tile_get_blend layer_tile_get_alpha layer_tile_get_x layer_tile_get_y layer_tile_get_region layer_tile_get_visible layer_instance_get_instance instance_activate_layer instance_deactivate_layer camera_create camera_create_view camera_destroy camera_apply camera_get_active camera_get_default camera_set_default camera_set_view_mat camera_set_proj_mat camera_set_update_script camera_set_begin_script camera_set_end_script camera_set_view_pos camera_set_view_size camera_set_view_speed camera_set_view_border camera_set_view_angle camera_set_view_target camera_get_view_mat camera_get_proj_mat camera_get_update_script camera_get_begin_script camera_get_end_script camera_get_view_x camera_get_view_y camera_get_view_width camera_get_view_height camera_get_view_speed_x camera_get_view_speed_y camera_get_view_border_x camera_get_view_border_y camera_get_view_angle camera_get_view_target view_get_camera view_get_visible view_get_xport view_get_yport view_get_wport view_get_hport view_get_surface_id view_set_camera view_set_visible view_set_xport view_set_yport view_set_wport view_set_hport view_set_surface_id gesture_drag_time gesture_drag_distance gesture_flick_speed gesture_double_tap_time gesture_double_tap_distance gesture_pinch_distance gesture_pinch_angle_towards gesture_pinch_angle_away gesture_rotate_time gesture_rotate_angle gesture_tap_count gesture_get_drag_time gesture_get_drag_distance gesture_get_flick_speed gesture_get_double_tap_time gesture_get_double_tap_distance gesture_get_pinch_distance gesture_get_pinch_angle_towards gesture_get_pinch_angle_away gesture_get_rotate_time gesture_get_rotate_angle gesture_get_tap_count keyboard_virtual_show keyboard_virtual_hide keyboard_virtual_status keyboard_virtual_height",literal:"self other all noone global local undefined pointer_invalid pointer_null path_action_stop path_action_restart path_action_continue path_action_reverse true false pi GM_build_date GM_version GM_runtime_version  timezone_local timezone_utc gamespeed_fps gamespeed_microseconds  ev_create ev_destroy ev_step ev_alarm ev_keyboard ev_mouse ev_collision ev_other ev_draw ev_draw_begin ev_draw_end ev_draw_pre ev_draw_post ev_keypress ev_keyrelease ev_trigger ev_left_button ev_right_button ev_middle_button ev_no_button ev_left_press ev_right_press ev_middle_press ev_left_release ev_right_release ev_middle_release ev_mouse_enter ev_mouse_leave ev_mouse_wheel_up ev_mouse_wheel_down ev_global_left_button ev_global_right_button ev_global_middle_button ev_global_left_press ev_global_right_press ev_global_middle_press ev_global_left_release ev_global_right_release ev_global_middle_release ev_joystick1_left ev_joystick1_right ev_joystick1_up ev_joystick1_down ev_joystick1_button1 ev_joystick1_button2 ev_joystick1_button3 ev_joystick1_button4 ev_joystick1_button5 ev_joystick1_button6 ev_joystick1_button7 ev_joystick1_button8 ev_joystick2_left ev_joystick2_right ev_joystick2_up ev_joystick2_down ev_joystick2_button1 ev_joystick2_button2 ev_joystick2_button3 ev_joystick2_button4 ev_joystick2_button5 ev_joystick2_button6 ev_joystick2_button7 ev_joystick2_button8 ev_outside ev_boundary ev_game_start ev_game_end ev_room_start ev_room_end ev_no_more_lives ev_animation_end ev_end_of_path ev_no_more_health ev_close_button ev_user0 ev_user1 ev_user2 ev_user3 ev_user4 ev_user5 ev_user6 ev_user7 ev_user8 ev_user9 ev_user10 ev_user11 ev_user12 ev_user13 ev_user14 ev_user15 ev_step_normal ev_step_begin ev_step_end ev_gui ev_gui_begin ev_gui_end ev_cleanup ev_gesture ev_gesture_tap ev_gesture_double_tap ev_gesture_drag_start ev_gesture_dragging ev_gesture_drag_end ev_gesture_flick ev_gesture_pinch_start ev_gesture_pinch_in ev_gesture_pinch_out ev_gesture_pinch_end ev_gesture_rotate_start ev_gesture_rotating ev_gesture_rotate_end ev_global_gesture_tap ev_global_gesture_double_tap ev_global_gesture_drag_start ev_global_gesture_dragging ev_global_gesture_drag_end ev_global_gesture_flick ev_global_gesture_pinch_start ev_global_gesture_pinch_in ev_global_gesture_pinch_out ev_global_gesture_pinch_end ev_global_gesture_rotate_start ev_global_gesture_rotating ev_global_gesture_rotate_end vk_nokey vk_anykey vk_enter vk_return vk_shift vk_control vk_alt vk_escape vk_space vk_backspace vk_tab vk_pause vk_printscreen vk_left vk_right vk_up vk_down vk_home vk_end vk_delete vk_insert vk_pageup vk_pagedown vk_f1 vk_f2 vk_f3 vk_f4 vk_f5 vk_f6 vk_f7 vk_f8 vk_f9 vk_f10 vk_f11 vk_f12 vk_numpad0 vk_numpad1 vk_numpad2 vk_numpad3 vk_numpad4 vk_numpad5 vk_numpad6 vk_numpad7 vk_numpad8 vk_numpad9 vk_divide vk_multiply vk_subtract vk_add vk_decimal vk_lshift vk_lcontrol vk_lalt vk_rshift vk_rcontrol vk_ralt  mb_any mb_none mb_left mb_right mb_middle c_aqua c_black c_blue c_dkgray c_fuchsia c_gray c_green c_lime c_ltgray c_maroon c_navy c_olive c_purple c_red c_silver c_teal c_white c_yellow c_orange fa_left fa_center fa_right fa_top fa_middle fa_bottom pr_pointlist pr_linelist pr_linestrip pr_trianglelist pr_trianglestrip pr_trianglefan bm_complex bm_normal bm_add bm_max bm_subtract bm_zero bm_one bm_src_colour bm_inv_src_colour bm_src_color bm_inv_src_color bm_src_alpha bm_inv_src_alpha bm_dest_alpha bm_inv_dest_alpha bm_dest_colour bm_inv_dest_colour bm_dest_color bm_inv_dest_color bm_src_alpha_sat tf_point tf_linear tf_anisotropic mip_off mip_on mip_markedonly audio_falloff_none audio_falloff_inverse_distance audio_falloff_inverse_distance_clamped audio_falloff_linear_distance audio_falloff_linear_distance_clamped audio_falloff_exponent_distance audio_falloff_exponent_distance_clamped audio_old_system audio_new_system audio_mono audio_stereo audio_3d cr_default cr_none cr_arrow cr_cross cr_beam cr_size_nesw cr_size_ns cr_size_nwse cr_size_we cr_uparrow cr_hourglass cr_drag cr_appstart cr_handpoint cr_size_all spritespeed_framespersecond spritespeed_framespergameframe asset_object asset_unknown asset_sprite asset_sound asset_room asset_path asset_script asset_font asset_timeline asset_tiles asset_shader fa_readonly fa_hidden fa_sysfile fa_volumeid fa_directory fa_archive  ds_type_map ds_type_list ds_type_stack ds_type_queue ds_type_grid ds_type_priority ef_explosion ef_ring ef_ellipse ef_firework ef_smoke ef_smokeup ef_star ef_spark ef_flare ef_cloud ef_rain ef_snow pt_shape_pixel pt_shape_disk pt_shape_square pt_shape_line pt_shape_star pt_shape_circle pt_shape_ring pt_shape_sphere pt_shape_flare pt_shape_spark pt_shape_explosion pt_shape_cloud pt_shape_smoke pt_shape_snow ps_distr_linear ps_distr_gaussian ps_distr_invgaussian ps_shape_rectangle ps_shape_ellipse ps_shape_diamond ps_shape_line ty_real ty_string dll_cdecl dll_stdcall matrix_view matrix_projection matrix_world os_win32 os_windows os_macosx os_ios os_android os_symbian os_linux os_unknown os_winphone os_tizen os_win8native os_wiiu os_3ds  os_psvita os_bb10 os_ps4 os_xboxone os_ps3 os_xbox360 os_uwp os_tvos os_switch browser_not_a_browser browser_unknown browser_ie browser_firefox browser_chrome browser_safari browser_safari_mobile browser_opera browser_tizen browser_edge browser_windows_store browser_ie_mobile  device_ios_unknown device_ios_iphone device_ios_iphone_retina device_ios_ipad device_ios_ipad_retina device_ios_iphone5 device_ios_iphone6 device_ios_iphone6plus device_emulator device_tablet display_landscape display_landscape_flipped display_portrait display_portrait_flipped tm_sleep tm_countvsyncs of_challenge_win of_challen ge_lose of_challenge_tie leaderboard_type_number leaderboard_type_time_mins_secs cmpfunc_never cmpfunc_less cmpfunc_equal cmpfunc_lessequal cmpfunc_greater cmpfunc_notequal cmpfunc_greaterequal cmpfunc_always cull_noculling cull_clockwise cull_counterclockwise lighttype_dir lighttype_point iap_ev_storeload iap_ev_product iap_ev_purchase iap_ev_consume iap_ev_restore iap_storeload_ok iap_storeload_failed iap_status_uninitialised iap_status_unavailable iap_status_loading iap_status_available iap_status_processing iap_status_restoring iap_failed iap_unavailable iap_available iap_purchased iap_canceled iap_refunded fb_login_default fb_login_fallback_to_webview fb_login_no_fallback_to_webview fb_login_forcing_webview fb_login_use_system_account fb_login_forcing_safari  phy_joint_anchor_1_x phy_joint_anchor_1_y phy_joint_anchor_2_x phy_joint_anchor_2_y phy_joint_reaction_force_x phy_joint_reaction_force_y phy_joint_reaction_torque phy_joint_motor_speed phy_joint_angle phy_joint_motor_torque phy_joint_max_motor_torque phy_joint_translation phy_joint_speed phy_joint_motor_force phy_joint_max_motor_force phy_joint_length_1 phy_joint_length_2 phy_joint_damping_ratio phy_joint_frequency phy_joint_lower_angle_limit phy_joint_upper_angle_limit phy_joint_angle_limits phy_joint_max_length phy_joint_max_torque phy_joint_max_force phy_debug_render_aabb phy_debug_render_collision_pairs phy_debug_render_coms phy_debug_render_core_shapes phy_debug_render_joints phy_debug_render_obb phy_debug_render_shapes  phy_particle_flag_water phy_particle_flag_zombie phy_particle_flag_wall phy_particle_flag_spring phy_particle_flag_elastic phy_particle_flag_viscous phy_particle_flag_powder phy_particle_flag_tensile phy_particle_flag_colourmixing phy_particle_flag_colormixing phy_particle_group_flag_solid phy_particle_group_flag_rigid phy_particle_data_flag_typeflags phy_particle_data_flag_position phy_particle_data_flag_velocity phy_particle_data_flag_colour phy_particle_data_flag_color phy_particle_data_flag_category  achievement_our_info achievement_friends_info achievement_leaderboard_info achievement_achievement_info achievement_filter_all_players achievement_filter_friends_only achievement_filter_favorites_only achievement_type_achievement_challenge achievement_type_score_challenge achievement_pic_loaded  achievement_show_ui achievement_show_profile achievement_show_leaderboard achievement_show_achievement achievement_show_bank achievement_show_friend_picker achievement_show_purchase_prompt network_socket_tcp network_socket_udp network_socket_bluetooth network_type_connect network_type_disconnect network_type_data network_type_non_blocking_connect network_config_connect_timeout network_config_use_non_blocking_socket network_config_enable_reliable_udp network_config_disable_reliable_udp buffer_fixed buffer_grow buffer_wrap buffer_fast buffer_vbuffer buffer_network buffer_u8 buffer_s8 buffer_u16 buffer_s16 buffer_u32 buffer_s32 buffer_u64 buffer_f16 buffer_f32 buffer_f64 buffer_bool buffer_text buffer_string buffer_surface_copy buffer_seek_start buffer_seek_relative buffer_seek_end buffer_generalerror buffer_outofspace buffer_outofbounds buffer_invalidtype  text_type button_type input_type ANSI_CHARSET DEFAULT_CHARSET EASTEUROPE_CHARSET RUSSIAN_CHARSET SYMBOL_CHARSET SHIFTJIS_CHARSET HANGEUL_CHARSET GB2312_CHARSET CHINESEBIG5_CHARSET JOHAB_CHARSET HEBREW_CHARSET ARABIC_CHARSET GREEK_CHARSET TURKISH_CHARSET VIETNAMESE_CHARSET THAI_CHARSET MAC_CHARSET BALTIC_CHARSET OEM_CHARSET  gp_face1 gp_face2 gp_face3 gp_face4 gp_shoulderl gp_shoulderr gp_shoulderlb gp_shoulderrb gp_select gp_start gp_stickl gp_stickr gp_padu gp_padd gp_padl gp_padr gp_axislh gp_axislv gp_axisrh gp_axisrv ov_friends ov_community ov_players ov_settings ov_gamegroup ov_achievements lb_sort_none lb_sort_ascending lb_sort_descending lb_disp_none lb_disp_numeric lb_disp_time_sec lb_disp_time_ms ugc_result_success ugc_filetype_community ugc_filetype_microtrans ugc_visibility_public ugc_visibility_friends_only ugc_visibility_private ugc_query_RankedByVote ugc_query_RankedByPublicationDate ugc_query_AcceptedForGameRankedByAcceptanceDate ugc_query_RankedByTrend ugc_query_FavoritedByFriendsRankedByPublicationDate ugc_query_CreatedByFriendsRankedByPublicationDate ugc_query_RankedByNumTimesReported ugc_query_CreatedByFollowedUsersRankedByPublicationDate ugc_query_NotYetRated ugc_query_RankedByTotalVotesAsc ugc_query_RankedByVotesUp ugc_query_RankedByTextSearch ugc_sortorder_CreationOrderDesc ugc_sortorder_CreationOrderAsc ugc_sortorder_TitleAsc ugc_sortorder_LastUpdatedDesc ugc_sortorder_SubscriptionDateDesc ugc_sortorder_VoteScoreDesc ugc_sortorder_ForModeration ugc_list_Published ugc_list_VotedOn ugc_list_VotedUp ugc_list_VotedDown ugc_list_WillVoteLater ugc_list_Favorited ugc_list_Subscribed ugc_list_UsedOrPlayed ugc_list_Followed ugc_match_Items ugc_match_Items_Mtx ugc_match_Items_ReadyToUse ugc_match_Collections ugc_match_Artwork ugc_match_Videos ugc_match_Screenshots ugc_match_AllGuides ugc_match_WebGuides ugc_match_IntegratedGuides ugc_match_UsableInGame ugc_match_ControllerBindings  vertex_usage_position vertex_usage_colour vertex_usage_color vertex_usage_normal vertex_usage_texcoord vertex_usage_textcoord vertex_usage_blendweight vertex_usage_blendindices vertex_usage_psize vertex_usage_tangent vertex_usage_binormal vertex_usage_fog vertex_usage_depth vertex_usage_sample vertex_type_float1 vertex_type_float2 vertex_type_float3 vertex_type_float4 vertex_type_colour vertex_type_color vertex_type_ubyte4 layerelementtype_undefined layerelementtype_background layerelementtype_instance layerelementtype_oldtilemap layerelementtype_sprite layerelementtype_tilemap layerelementtype_particlesystem layerelementtype_tile tile_rotate tile_flip tile_mirror tile_index_mask kbv_type_default kbv_type_ascii kbv_type_url kbv_type_email kbv_type_numbers kbv_type_phone kbv_type_phone_name kbv_returnkey_default kbv_returnkey_go kbv_returnkey_google kbv_returnkey_join kbv_returnkey_next kbv_returnkey_route kbv_returnkey_search kbv_returnkey_send kbv_returnkey_yahoo kbv_returnkey_done kbv_returnkey_continue kbv_returnkey_emergency kbv_autocapitalize_none kbv_autocapitalize_words kbv_autocapitalize_sentences kbv_autocapitalize_characters",symbol:"argument_relative argument argument0 argument1 argument2 argument3 argument4 argument5 argument6 argument7 argument8 argument9 argument10 argument11 argument12 argument13 argument14 argument15 argument_count x y xprevious yprevious xstart ystart hspeed vspeed direction speed friction gravity gravity_direction path_index path_position path_positionprevious path_speed path_scale path_orientation path_endaction object_index id solid persistent mask_index instance_count instance_id room_speed fps fps_real current_time current_year current_month current_day current_weekday current_hour current_minute current_second alarm timeline_index timeline_position timeline_speed timeline_running timeline_loop room room_first room_last room_width room_height room_caption room_persistent score lives health show_score show_lives show_health caption_score caption_lives caption_health event_type event_number event_object event_action application_surface gamemaker_pro gamemaker_registered gamemaker_version error_occurred error_last debug_mode keyboard_key keyboard_lastkey keyboard_lastchar keyboard_string mouse_x mouse_y mouse_button mouse_lastbutton cursor_sprite visible sprite_index sprite_width sprite_height sprite_xoffset sprite_yoffset image_number image_index image_speed depth image_xscale image_yscale image_angle image_alpha image_blend bbox_left bbox_right bbox_top bbox_bottom layer background_colour  background_showcolour background_color background_showcolor view_enabled view_current view_visible view_xview view_yview view_wview view_hview view_xport view_yport view_wport view_hport view_angle view_hborder view_vborder view_hspeed view_vspeed view_object view_surface_id view_camera game_id game_display_name game_project_name game_save_id working_directory temp_directory program_directory browser_width browser_height os_type os_device os_browser os_version display_aa async_load delta_time webgl_enabled event_data iap_data phy_rotation phy_position_x phy_position_y phy_angular_velocity phy_linear_velocity_x phy_linear_velocity_y phy_speed_x phy_speed_y phy_speed phy_angular_damping phy_linear_damping phy_bullet phy_fixed_rotation phy_active phy_mass phy_inertia phy_com_x phy_com_y phy_dynamic phy_kinematic phy_sleeping phy_collision_points phy_collision_x phy_collision_y phy_col_normal_x phy_col_normal_y phy_position_xprevious phy_position_yprevious"},c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM]}});
+hljs.registerLanguage("twig",function(e){var t="attribute block constant cycle date dump include max min parent random range source template_from_string",a={bK:t,k:{name:t},relevance:0,c:[{cN:"params",b:"\\(",e:"\\)"}]},r={b:/\|[A-Za-z_]+:?/,k:"abs batch capitalize column convert_encoding date date_modify default escape filter first format inky_to_html inline_css join json_encode keys last length lower map markdown merge nl2br number_format raw reduce replace reverse round slice sort spaceless split striptags title trim upper url_encode",c:[a]},c=(c="apply autoescape block deprecated do embed extends filter flush for from if import include macro sandbox set use verbatim with")+" "+c.split(" ").map(function(e){return"end"+e}).join(" ");return{aliases:["craftcms"],cI:!0,sL:"xml",c:[e.C(/\{#/,/#}/),{cN:"template-tag",b:/\{%/,e:/%}/,c:[{cN:"name",b:/\w+/,k:c,starts:{eW:!0,c:[r,a],relevance:0}}]},{cN:"template-variable",b:/\{\{/,e:/}}/,c:["self",r,a]}]}});
+hljs.registerLanguage("php",function(e){var c={b:"\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"},i={cN:"meta",b:/<\?(php)?|\?>/},t={cN:"string",c:[e.BE,i],v:[{b:'b"',e:'"'},{b:"b'",e:"'"},e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null})]},a={v:[e.BNM,e.CNM]};return{aliases:["php","php3","php4","php5","php6","php7"],cI:!0,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try switch continue endfor endif declare unset true false trait goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally",c:[e.HCM,e.C("//","$",{c:[i]}),e.C("/\\*","\\*/",{c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.C("__halt_compiler.+?;",!1,{eW:!0,k:"__halt_compiler",l:e.UIR}),{cN:"string",b:/<<<['"]?\w+['"]?$/,e:/^\w+;?$/,c:[e.BE,{cN:"subst",v:[{b:/\$\w+/},{b:/\{\$/,e:/\}/}]}]},i,{cN:"keyword",b:/\$this\b/},c,{b:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{cN:"function",bK:"function",e:/[;{]/,eE:!0,i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:["self",c,e.CBCM,t,a]}]},{cN:"class",bK:"class interface",e:"{",eE:!0,i:/[:\(\$"]/,c:[{bK:"extends implements"},e.UTM]},{bK:"namespace",e:";",i:/[\.']/,c:[e.UTM]},{bK:"use",e:";",c:[e.UTM]},{b:"=>"},t,a]}});
+hljs.registerLanguage("go",function(e){var n={keyword:"break default func interface select case map struct chan else goto package switch const fallthrough if range type continue for import return var go defer bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 uint16 uint32 uint64 int uint uintptr rune",literal:"true false iota nil",built_in:"append cap close complex copy imag len make new panic print println real recover delete"};return{aliases:["golang"],k:n,i:"</",c:[e.CLCM,e.CBCM,{cN:"string",v:[e.QSM,e.ASM,{b:"`",e:"`"}]},{cN:"number",v:[{b:e.CNR+"[i]",relevance:1},e.CNM]},{b:/:=/},{cN:"function",bK:"func",e:"\\s*(\\{|$)",eE:!0,c:[e.TM,{cN:"params",b:/\(/,e:/\)/,k:n,i:/["']/}]}]}});
+hljs.registerLanguage("actionscript",function(e){var a={cN:"rest_arg",b:"[.]{3}",e:"[a-zA-Z_$][a-zA-Z0-9_$]*",relevance:10};return{aliases:["as"],k:{keyword:"as break case catch class const continue default delete do dynamic each else extends final finally for function get if implements import in include instanceof interface internal is namespace native new override package private protected public return set static super switch this throw try typeof use var void while with",literal:"true false null undefined"},c:[e.ASM,e.QSM,e.CLCM,e.CBCM,e.CNM,{cN:"class",bK:"package",e:"{",c:[e.TM]},{cN:"class",bK:"class interface",e:"{",eE:!0,c:[{bK:"extends implements"},e.TM]},{cN:"meta",bK:"import include",e:";",k:{"meta-keyword":"import include"}},{cN:"function",bK:"function",e:"[{;]",eE:!0,i:"\\S",c:[e.TM,{cN:"params",b:"\\(",e:"\\)",c:[e.ASM,e.QSM,e.CLCM,e.CBCM,a]},{b:":\\s*([*]|[a-zA-Z_$][a-zA-Z0-9_$]*)"}]},e.METHOD_GUARD],i:/#/}});
+hljs.registerLanguage("lisp",function(e){var b="[a-zA-Z_\\-\\+\\*\\/\\<\\=\\>\\&\\#][a-zA-Z0-9_\\-\\+\\*\\/\\<\\=\\>\\&\\#!]*",c="\\|[^]*?\\|",a="(\\-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s|D|E|F|L|S)(\\+|\\-)?\\d+)?",l={cN:"literal",b:"\\b(t{1}|nil)\\b"},n={cN:"number",v:[{b:a,relevance:0},{b:"#(b|B)[0-1]+(/[0-1]+)?"},{b:"#(o|O)[0-7]+(/[0-7]+)?"},{b:"#(x|X)[0-9a-fA-F]+(/[0-9a-fA-F]+)?"},{b:"#(c|C)\\("+a+" +"+a,e:"\\)"}]},r=e.inherit(e.QSM,{i:null}),i=e.C(";","$",{relevance:0}),t={b:"\\*",e:"\\*"},v={cN:"symbol",b:"[:&]"+b},s={b:b,relevance:0},u={b:c},d={c:[n,r,t,v,{b:"\\(",e:"\\)",c:["self",l,r,n,s]},s],v:[{b:"['`]\\(",e:"\\)"},{b:"\\(quote ",e:"\\)",k:{name:"quote"}},{b:"'"+c}]},f={v:[{b:"'"+b},{b:"#'"+b+"(::"+b+")*"}]},m={b:"\\(\\s*",e:"\\)"},o={eW:!0,relevance:0};return m.c=[{cN:"name",v:[{b:b},{b:c}]},o],o.c=[d,f,m,l,n,r,i,t,v,u,s],{i:/\S/,c:[n,{cN:"meta",b:"^#!",e:"$"},l,r,i,d,f,m,s]}});
+hljs.registerLanguage("xml",function(e){var c={cN:"symbol",b:"&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;"},s={b:"\\s",c:[{cN:"meta-keyword",b:"#?[a-z_][a-z1-9_-]+",i:"\\n"}]},a=e.inherit(s,{b:"\\(",e:"\\)"}),t=e.inherit(e.ASM,{cN:"meta-string"}),l=e.inherit(e.QSM,{cN:"meta-string"}),r={eW:!0,i:/</,relevance:0,c:[{cN:"attr",b:"[A-Za-z0-9\\._:-]+",relevance:0},{b:/=\s*/,relevance:0,c:[{cN:"string",endsParent:!0,v:[{b:/"/,e:/"/,c:[c]},{b:/'/,e:/'/,c:[c]},{b:/[^\s"'=<>`]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist","wsf","svg"],cI:!0,c:[{cN:"meta",b:"<![a-z]",e:">",relevance:10,c:[s,l,t,a,{b:"\\[",e:"\\]",c:[{cN:"meta",b:"<![a-z]",e:">",c:[s,a,l,t]}]}]},e.C("\x3c!--","--\x3e",{relevance:10}),{b:"<\\!\\[CDATA\\[",e:"\\]\\]>",relevance:10},c,{cN:"meta",b:/<\?xml/,e:/\?>/,relevance:10},{b:/<\?(php)?/,e:/\?>/,sL:"php",c:[{b:"/\\*",e:"\\*/",skip:!0},{b:'b"',e:'"',skip:!0},{b:"b'",e:"'",skip:!0},e.inherit(e.ASM,{i:null,cN:null,c:null,skip:!0}),e.inherit(e.QSM,{i:null,cN:null,c:null,skip:!0})]},{cN:"tag",b:"<style(?=\\s|>)",e:">",k:{name:"style"},c:[r],starts:{e:"</style>",rE:!0,sL:["css","xml"]}},{cN:"tag",b:"<script(?=\\s|>)",e:">",k:{name:"script"},c:[r],starts:{e:"<\/script>",rE:!0,sL:["actionscript","javascript","handlebars","xml"]}},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"name",b:/[^\/><\s]+/,relevance:0},r]}]}});
+hljs.registerLanguage("handlebars",function(e){var t={"builtin-name":"each in with if else unless bindattr action collection debugger log outlet template unbound view yield lookup"},a={b:/".*?"|'.*?'|\[.*?\]|\w+/},l=e.inherit(a,{k:t,starts:{eW:!0,relevance:0,c:[e.inherit(a,{relevance:0})]}}),i=e.inherit(l,{cN:"name"}),n=e.inherit(l,{relevance:0});return{aliases:["hbs","html.hbs","html.handlebars"],cI:!0,sL:"xml",c:[{b:/\\\{\{/,skip:!0},{b:/\\\\(?=\{\{)/,skip:!0},e.C(/\{\{!--/,/--\}\}/),e.C(/\{\{!/,/\}\}/),{cN:"template-tag",b:/\{\{\{\{(?!\/)/,e:/\}\}\}\}/,c:[i],starts:{e:/\{\{\{\{\//,rE:!0,sL:"xml"}},{cN:"template-tag",b:/\{\{\{\{\//,e:/\}\}\}\}/,c:[i]},{cN:"template-tag",b:/\{\{[#\/]/,e:/\}\}/,c:[i]},{cN:"template-variable",b:/\{\{\{/,e:/\}\}\}/,k:t,c:[n]},{cN:"template-variable",b:/\{\{/,e:/\}\}/,k:t,c:[n]}]}});
+hljs.registerLanguage("cal",function(e){var r="div mod in and or not xor asserterror begin case do downto else end exit for if of repeat then to until while with var",c=[e.CLCM,e.C(/\{/,/\}/,{relevance:0}),e.C(/\(\*/,/\*\)/,{relevance:10})],n={cN:"string",b:/'/,e:/'/,c:[{b:/''/}]},t={cN:"string",b:/(#\d+)+/},a={cN:"function",bK:"procedure",e:/[:;]/,k:"procedure|10",c:[e.TM,{cN:"params",b:/\(/,e:/\)/,k:r,c:[n,t]}].concat(c)},o={cN:"class",b:"OBJECT (Table|Form|Report|Dataport|Codeunit|XMLport|MenuSuite|Page|Query) (\\d+) ([^\\r\\n]+)",rB:!0,c:[e.TM,a]};return{cI:!0,k:{keyword:r,literal:"false true"},i:/\/\*/,c:[n,t,{cN:"number",b:"\\b\\d+(\\.\\d+)?(DT|D|T)",relevance:0},{cN:"string",b:'"',e:'"'},e.NM,o,a]}});
+hljs.registerLanguage("sql",function(e){var t=e.C("--","$");return{cI:!0,i:/[<>{}*]/,c:[{bK:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke comment values with",e:/;/,eW:!0,l:/[\w\.]+/,k:{keyword:"as abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias all allocate allow alter always analyze ancillary and anti any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound bucket buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain explode export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force foreign form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour hours http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lateral lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minutes minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notnull notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second seconds section securefile security seed segment select self semi sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tablesample tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unnest unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace window with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek",literal:"true false null unknown",built_in:"array bigint binary bit blob bool boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text time timestamp tinyint varchar varchar2 varying void"},c:[{cN:"string",b:"'",e:"'",c:[{b:"''"}]},{cN:"string",b:'"',e:'"',c:[{b:'""'}]},{cN:"string",b:"`",e:"`"},e.CNM,e.CBCM,t,e.HCM]},e.CBCM,t,e.HCM]}});
+hljs.registerLanguage("pony",function(e){return{k:{keyword:"actor addressof and as be break class compile_error compile_intrinsic consume continue delegate digestof do else elseif embed end error for fun if ifdef in interface is isnt lambda let match new not object or primitive recover repeat return struct then trait try type until use var where while with xor",meta:"iso val tag trn box ref",literal:"this false true"},c:[{cN:"type",b:"\\b_?[A-Z][\\w]*",relevance:0},{cN:"string",b:'"""',e:'"""',relevance:10},{cN:"string",b:'"',e:'"',c:[e.BE]},{cN:"string",b:"'",e:"'",c:[e.BE],relevance:0},{b:e.IR+"'",relevance:0},{cN:"number",b:"(-?)(\\b0[xX][a-fA-F0-9]+|\\b0[bB][01]+|(\\b\\d+(_\\d+)?(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",relevance:0},e.CLCM,e.CBCM]}});
+hljs.registerLanguage("brainfuck",function(e){var r={cN:"literal",b:"[\\+\\-]",relevance:0};return{aliases:["bf"],c:[e.C("[^\\[\\]\\.,\\+\\-<> \r\n]","[\\[\\]\\.,\\+\\-<> \r\n]",{rE:!0,relevance:0}),{cN:"title",b:"[\\[\\]]",relevance:0},{cN:"string",b:"[\\.,]",relevance:0},{b:/(?:\+\+|\-\-)/,c:[r]},r]}});
+hljs.registerLanguage("matlab",function(e){var a="('|\\.')+",s={relevance:0,c:[{b:a}]};return{k:{keyword:"break case catch classdef continue else elseif end enumerated events for function global if methods otherwise parfor persistent properties return spmd switch try while",built_in:"sin sind sinh asin asind asinh cos cosd cosh acos acosd acosh tan tand tanh atan atand atan2 atanh sec secd sech asec asecd asech csc cscd csch acsc acscd acsch cot cotd coth acot acotd acoth hypot exp expm1 log log1p log10 log2 pow2 realpow reallog realsqrt sqrt nthroot nextpow2 abs angle complex conj imag real unwrap isreal cplxpair fix floor ceil round mod rem sign airy besselj bessely besselh besseli besselk beta betainc betaln ellipj ellipke erf erfc erfcx erfinv expint gamma gammainc gammaln psi legendre cross dot factor isprime primes gcd lcm rat rats perms nchoosek factorial cart2sph cart2pol pol2cart sph2cart hsv2rgb rgb2hsv zeros ones eye repmat rand randn linspace logspace freqspace meshgrid accumarray size length ndims numel disp isempty isequal isequalwithequalnans cat reshape diag blkdiag tril triu fliplr flipud flipdim rot90 find sub2ind ind2sub bsxfun ndgrid permute ipermute shiftdim circshift squeeze isscalar isvector ans eps realmax realmin pi i inf nan isnan isinf isfinite j why compan gallery hadamard hankel hilb invhilb magic pascal rosser toeplitz vander wilkinson max min nanmax nanmin mean nanmean type table readtable writetable sortrows sort figure plot plot3 scatter scatter3 cellfun legend intersect ismember procrustes hold num2cell "},i:'(//|"|#|/\\*|\\s+/\\w+)',c:[{cN:"function",bK:"function",e:"$",c:[e.UTM,{cN:"params",v:[{b:"\\(",e:"\\)"},{b:"\\[",e:"\\]"}]}]},{cN:"built_in",b:/true|false/,relevance:0,starts:s},{b:"[a-zA-Z][a-zA-Z_0-9]*"+a,relevance:0},{cN:"number",b:e.CNR,relevance:0,starts:s},{cN:"string",b:"'",e:"'",c:[e.BE,{b:"''"}]},{b:/\]|}|\)/,relevance:0,starts:s},{cN:"string",b:'"',e:'"',c:[e.BE,{b:'""'}],starts:s},e.C("^\\s*\\%\\{\\s*$","^\\s*\\%\\}\\s*$"),e.C("\\%","$")]}});
+hljs.registerLanguage("zephir",function(e){var i={cN:"string",c:[e.BE],v:[{b:'b"',e:'"'},{b:"b'",e:"'"},e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null})]},n={v:[e.BNM,e.CNM]};return{aliases:["zep"],cI:!0,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var let while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try switch continue endfor endif declare unset true false trait goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally int uint long ulong char uchar double float bool boolean stringlikely unlikely",c:[e.CLCM,e.HCM,e.C("/\\*","\\*/",{c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.C("__halt_compiler.+?;",!1,{eW:!0,k:"__halt_compiler",l:e.UIR}),{cN:"string",b:"<<<['\"]?\\w+['\"]?$",e:"^\\w+;",c:[e.BE]},{b:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{cN:"function",bK:"function",e:/[;{]/,eE:!0,i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:["self",e.CBCM,i,n]}]},{cN:"class",bK:"class interface",e:"{",eE:!0,i:/[:\(\$"]/,c:[{bK:"extends implements"},e.UTM]},{bK:"namespace",e:";",i:/[\.']/,c:[e.UTM]},{bK:"use",e:";",c:[e.UTM]},{b:"=>"},i,n]}});
+hljs.registerLanguage("capnproto",function(t){return{aliases:["capnp"],k:{keyword:"struct enum interface union group import using const annotation extends in of on as with from fixed",built_in:"Void Bool Int8 Int16 Int32 Int64 UInt8 UInt16 UInt32 UInt64 Float32 Float64 Text Data AnyPointer AnyStruct Capability List",literal:"true false"},c:[t.QSM,t.NM,t.HCM,{cN:"meta",b:/@0x[\w\d]{16};/,i:/\n/},{cN:"symbol",b:/@\d+\b/},{cN:"class",bK:"struct enum",e:/\{/,i:/\n/,c:[t.inherit(t.TM,{starts:{eW:!0,eE:!0}})]},{cN:"class",bK:"interface",e:/\{/,i:/\n/,c:[t.inherit(t.TM,{starts:{eW:!0,eE:!0}})]}]}});
+hljs.registerLanguage("properties",function(e){var r="[ \\t\\f]*",t="("+r+"[:=]"+r+"|[ \\t\\f]+)",n="([^\\\\\\W:= \\t\\f\\n]|\\\\.)+",a="([^\\\\:= \\t\\f\\n]|\\\\.)+",c={e:t,relevance:0,starts:{cN:"string",e:/$/,relevance:0,c:[{b:"\\\\\\n"}]}};return{cI:!0,i:/\S/,c:[e.C("^\\s*[!#]","$"),{b:n+t,rB:!0,c:[{cN:"attr",b:n,endsParent:!0,relevance:0}],starts:c},{b:a+t,rB:!0,relevance:0,c:[{cN:"meta",b:a,endsParent:!0,relevance:0}],starts:c},{cN:"attr",relevance:0,b:a+r+"$"}]}});
+hljs.registerLanguage("mel",function(e){return{k:"int float string vector matrix if else switch case default while do for in break continue global proc return about abs addAttr addAttributeEditorNodeHelp addDynamic addNewShelfTab addPP addPanelCategory addPrefixToName advanceToNextDrivenKey affectedNet affects aimConstraint air alias aliasAttr align alignCtx alignCurve alignSurface allViewFit ambientLight angle angleBetween animCone animCurveEditor animDisplay animView annotate appendStringArray applicationName applyAttrPreset applyTake arcLenDimContext arcLengthDimension arclen arrayMapper art3dPaintCtx artAttrCtx artAttrPaintVertexCtx artAttrSkinPaintCtx artAttrTool artBuildPaintMenu artFluidAttrCtx artPuttyCtx artSelectCtx artSetPaintCtx artUserPaintCtx assignCommand assignInputDevice assignViewportFactories attachCurve attachDeviceAttr attachSurface attrColorSliderGrp attrCompatibility attrControlGrp attrEnumOptionMenu attrEnumOptionMenuGrp attrFieldGrp attrFieldSliderGrp attrNavigationControlGrp attrPresetEditWin attributeExists attributeInfo attributeMenu attributeQuery autoKeyframe autoPlace bakeClip bakeFluidShading bakePartialHistory bakeResults bakeSimulation basename basenameEx batchRender bessel bevel bevelPlus binMembership bindSkin blend2 blendShape blendShapeEditor blendShapePanel blendTwoAttr blindDataType boneLattice boundary boxDollyCtx boxZoomCtx bufferCurve buildBookmarkMenu buildKeyframeMenu button buttonManip CBG cacheFile cacheFileCombine cacheFileMerge cacheFileTrack camera cameraView canCreateManip canvas capitalizeString catch catchQuiet ceil changeSubdivComponentDisplayLevel changeSubdivRegion channelBox character characterMap characterOutlineEditor characterize chdir checkBox checkBoxGrp checkDefaultRenderGlobals choice circle circularFillet clamp clear clearCache clip clipEditor clipEditorCurrentTimeCtx clipSchedule clipSchedulerOutliner clipTrimBefore closeCurve closeSurface cluster cmdFileOutput cmdScrollFieldExecuter cmdScrollFieldReporter cmdShell coarsenSubdivSelectionList collision color colorAtPoint colorEditor colorIndex colorIndexSliderGrp colorSliderButtonGrp colorSliderGrp columnLayout commandEcho commandLine commandPort compactHairSystem componentEditor compositingInterop computePolysetVolume condition cone confirmDialog connectAttr connectControl connectDynamic connectJoint connectionInfo constrain constrainValue constructionHistory container containsMultibyte contextInfo control convertFromOldLayers convertIffToPsd convertLightmap convertSolidTx convertTessellation convertUnit copyArray copyFlexor copyKey copySkinWeights cos cpButton cpCache cpClothSet cpCollision cpConstraint cpConvClothToMesh cpForces cpGetSolverAttr cpPanel cpProperty cpRigidCollisionFilter cpSeam cpSetEdit cpSetSolverAttr cpSolver cpSolverTypes cpTool cpUpdateClothUVs createDisplayLayer createDrawCtx createEditor createLayeredPsdFile createMotionField createNewShelf createNode createRenderLayer createSubdivRegion cross crossProduct ctxAbort ctxCompletion ctxEditMode ctxTraverse currentCtx currentTime currentTimeCtx currentUnit curve curveAddPtCtx curveCVCtx curveEPCtx curveEditorCtx curveIntersect curveMoveEPCtx curveOnSurface curveSketchCtx cutKey cycleCheck cylinder dagPose date defaultLightListCheckBox defaultNavigation defineDataServer defineVirtualDevice deformer deg_to_rad delete deleteAttr deleteShadingGroupsAndMaterials deleteShelfTab deleteUI deleteUnusedBrushes delrandstr detachCurve detachDeviceAttr detachSurface deviceEditor devicePanel dgInfo dgdirty dgeval dgtimer dimWhen directKeyCtx directionalLight dirmap dirname disable disconnectAttr disconnectJoint diskCache displacementToPoly displayAffected displayColor displayCull displayLevelOfDetail displayPref displayRGBColor displaySmoothness displayStats displayString displaySurface distanceDimContext distanceDimension doBlur dolly dollyCtx dopeSheetEditor dot dotProduct doubleProfileBirailSurface drag dragAttrContext draggerContext dropoffLocator duplicate duplicateCurve duplicateSurface dynCache dynControl dynExport dynExpression dynGlobals dynPaintEditor dynParticleCtx dynPref dynRelEdPanel dynRelEditor dynamicLoad editAttrLimits editDisplayLayerGlobals editDisplayLayerMembers editRenderLayerAdjustment editRenderLayerGlobals editRenderLayerMembers editor editorTemplate effector emit emitter enableDevice encodeString endString endsWith env equivalent equivalentTol erf error eval evalDeferred evalEcho event exactWorldBoundingBox exclusiveLightCheckBox exec executeForEachObject exists exp expression expressionEditorListen extendCurve extendSurface extrude fcheck fclose feof fflush fgetline fgetword file fileBrowserDialog fileDialog fileExtension fileInfo filetest filletCurve filter filterCurve filterExpand filterStudioImport findAllIntersections findAnimCurves findKeyframe findMenuItem findRelatedSkinCluster finder firstParentOf fitBspline flexor floatEq floatField floatFieldGrp floatScrollBar floatSlider floatSlider2 floatSliderButtonGrp floatSliderGrp floor flow fluidCacheInfo fluidEmitter fluidVoxelInfo flushUndo fmod fontDialog fopen formLayout format fprint frameLayout fread freeFormFillet frewind fromNativePath fwrite gamma gauss geometryConstraint getApplicationVersionAsFloat getAttr getClassification getDefaultBrush getFileList getFluidAttr getInputDeviceRange getMayaPanelTypes getModifiers getPanel getParticleAttr getPluginResource getenv getpid glRender glRenderEditor globalStitch gmatch goal gotoBindPose grabColor gradientControl gradientControlNoAttr graphDollyCtx graphSelectContext graphTrackCtx gravity grid gridLayout group groupObjectsByName HfAddAttractorToAS HfAssignAS HfBuildEqualMap HfBuildFurFiles HfBuildFurImages HfCancelAFR HfConnectASToHF HfCreateAttractor HfDeleteAS HfEditAS HfPerformCreateAS HfRemoveAttractorFromAS HfSelectAttached HfSelectAttractors HfUnAssignAS hardenPointCurve hardware hardwareRenderPanel headsUpDisplay headsUpMessage help helpLine hermite hide hilite hitTest hotBox hotkey hotkeyCheck hsv_to_rgb hudButton hudSlider hudSliderButton hwReflectionMap hwRender hwRenderLoad hyperGraph hyperPanel hyperShade hypot iconTextButton iconTextCheckBox iconTextRadioButton iconTextRadioCollection iconTextScrollList iconTextStaticLabel ikHandle ikHandleCtx ikHandleDisplayScale ikSolver ikSplineHandleCtx ikSystem ikSystemInfo ikfkDisplayMethod illustratorCurves image imfPlugins inheritTransform insertJoint insertJointCtx insertKeyCtx insertKnotCurve insertKnotSurface instance instanceable instancer intField intFieldGrp intScrollBar intSlider intSliderGrp interToUI internalVar intersect iprEngine isAnimCurve isConnected isDirty isParentOf isSameObject isTrue isValidObjectName isValidString isValidUiName isolateSelect itemFilter itemFilterAttr itemFilterRender itemFilterType joint jointCluster jointCtx jointDisplayScale jointLattice keyTangent keyframe keyframeOutliner keyframeRegionCurrentTimeCtx keyframeRegionDirectKeyCtx keyframeRegionDollyCtx keyframeRegionInsertKeyCtx keyframeRegionMoveKeyCtx keyframeRegionScaleKeyCtx keyframeRegionSelectKeyCtx keyframeRegionSetKeyCtx keyframeRegionTrackCtx keyframeStats lassoContext lattice latticeDeformKeyCtx launch launchImageEditor layerButton layeredShaderPort layeredTexturePort layout layoutDialog lightList lightListEditor lightListPanel lightlink lineIntersection linearPrecision linstep listAnimatable listAttr listCameras listConnections listDeviceAttachments listHistory listInputDeviceAxes listInputDeviceButtons listInputDevices listMenuAnnotation listNodeTypes listPanelCategories listRelatives listSets listTransforms listUnselected listerEditor loadFluid loadNewShelf loadPlugin loadPluginLanguageResources loadPrefObjects localizedPanelLabel lockNode loft log longNameOf lookThru ls lsThroughFilter lsType lsUI Mayatomr mag makeIdentity makeLive makePaintable makeRoll makeSingleSurface makeTubeOn makebot manipMoveContext manipMoveLimitsCtx manipOptions manipRotateContext manipRotateLimitsCtx manipScaleContext manipScaleLimitsCtx marker match max memory menu menuBarLayout menuEditor menuItem menuItemToShelf menuSet menuSetPref messageLine min minimizeApp mirrorJoint modelCurrentTimeCtx modelEditor modelPanel mouse movIn movOut move moveIKtoFK moveKeyCtx moveVertexAlongDirection multiProfileBirailSurface mute nParticle nameCommand nameField namespace namespaceInfo newPanelItems newton nodeCast nodeIconButton nodeOutliner nodePreset nodeType noise nonLinear normalConstraint normalize nurbsBoolean nurbsCopyUVSet nurbsCube nurbsEditUV nurbsPlane nurbsSelect nurbsSquare nurbsToPoly nurbsToPolygonsPref nurbsToSubdiv nurbsToSubdivPref nurbsUVSet nurbsViewDirectionVector objExists objectCenter objectLayer objectType objectTypeUI obsoleteProc oceanNurbsPreviewPlane offsetCurve offsetCurveOnSurface offsetSurface openGLExtension openMayaPref optionMenu optionMenuGrp optionVar orbit orbitCtx orientConstraint outlinerEditor outlinerPanel overrideModifier paintEffectsDisplay pairBlend palettePort paneLayout panel panelConfiguration panelHistory paramDimContext paramDimension paramLocator parent parentConstraint particle particleExists particleInstancer particleRenderInfo partition pasteKey pathAnimation pause pclose percent performanceOptions pfxstrokes pickWalk picture pixelMove planarSrf plane play playbackOptions playblast plugAttr plugNode pluginInfo pluginResourceUtil pointConstraint pointCurveConstraint pointLight pointMatrixMult pointOnCurve pointOnSurface pointPosition poleVectorConstraint polyAppend polyAppendFacetCtx polyAppendVertex polyAutoProjection polyAverageNormal polyAverageVertex polyBevel polyBlendColor polyBlindData polyBoolOp polyBridgeEdge polyCacheMonitor polyCheck polyChipOff polyClipboard polyCloseBorder polyCollapseEdge polyCollapseFacet polyColorBlindData polyColorDel polyColorPerVertex polyColorSet polyCompare polyCone polyCopyUV polyCrease polyCreaseCtx polyCreateFacet polyCreateFacetCtx polyCube polyCut polyCutCtx polyCylinder polyCylindricalProjection polyDelEdge polyDelFacet polyDelVertex polyDuplicateAndConnect polyDuplicateEdge polyEditUV polyEditUVShell polyEvaluate polyExtrudeEdge polyExtrudeFacet polyExtrudeVertex polyFlipEdge polyFlipUV polyForceUV polyGeoSampler polyHelix polyInfo polyInstallAction polyLayoutUV polyListComponentConversion polyMapCut polyMapDel polyMapSew polyMapSewMove polyMergeEdge polyMergeEdgeCtx polyMergeFacet polyMergeFacetCtx polyMergeUV polyMergeVertex polyMirrorFace polyMoveEdge polyMoveFacet polyMoveFacetUV polyMoveUV polyMoveVertex polyNormal polyNormalPerVertex polyNormalizeUV polyOptUvs polyOptions polyOutput polyPipe polyPlanarProjection polyPlane polyPlatonicSolid polyPoke polyPrimitive polyPrism polyProjection polyPyramid polyQuad polyQueryBlindData polyReduce polySelect polySelectConstraint polySelectConstraintMonitor polySelectCtx polySelectEditCtx polySeparate polySetToFaceNormal polySewEdge polyShortestPathCtx polySmooth polySoftEdge polySphere polySphericalProjection polySplit polySplitCtx polySplitEdge polySplitRing polySplitVertex polyStraightenUVBorder polySubdivideEdge polySubdivideFacet polyToSubdiv polyTorus polyTransfer polyTriangulate polyUVSet polyUnite polyWedgeFace popen popupMenu pose pow preloadRefEd print progressBar progressWindow projFileViewer projectCurve projectTangent projectionContext projectionManip promptDialog propModCtx propMove psdChannelOutliner psdEditTextureFile psdExport psdTextureFile putenv pwd python querySubdiv quit rad_to_deg radial radioButton radioButtonGrp radioCollection radioMenuItemCollection rampColorPort rand randomizeFollicles randstate rangeControl readTake rebuildCurve rebuildSurface recordAttr recordDevice redo reference referenceEdit referenceQuery refineSubdivSelectionList refresh refreshAE registerPluginResource rehash reloadImage removeJoint removeMultiInstance removePanelCategory rename renameAttr renameSelectionList renameUI render renderGlobalsNode renderInfo renderLayerButton renderLayerParent renderLayerPostProcess renderLayerUnparent renderManip renderPartition renderQualityNode renderSettings renderThumbnailUpdate renderWindowEditor renderWindowSelectContext renderer reorder reorderDeformers requires reroot resampleFluid resetAE resetPfxToPolyCamera resetTool resolutionNode retarget reverseCurve reverseSurface revolve rgb_to_hsv rigidBody rigidSolver roll rollCtx rootOf rot rotate rotationInterpolation roundConstantRadius rowColumnLayout rowLayout runTimeCommand runup sampleImage saveAllShelves saveAttrPreset saveFluid saveImage saveInitialState saveMenu savePrefObjects savePrefs saveShelf saveToolSettings scale scaleBrushBrightness scaleComponents scaleConstraint scaleKey scaleKeyCtx sceneEditor sceneUIReplacement scmh scriptCtx scriptEditorInfo scriptJob scriptNode scriptTable scriptToShelf scriptedPanel scriptedPanelType scrollField scrollLayout sculpt searchPathArray seed selLoadSettings select selectContext selectCurveCV selectKey selectKeyCtx selectKeyframeRegionCtx selectMode selectPref selectPriority selectType selectedNodes selectionConnection separator setAttr setAttrEnumResource setAttrMapping setAttrNiceNameResource setConstraintRestPosition setDefaultShadingGroup setDrivenKeyframe setDynamic setEditCtx setEditor setFluidAttr setFocus setInfinity setInputDeviceMapping setKeyCtx setKeyPath setKeyframe setKeyframeBlendshapeTargetWts setMenuMode setNodeNiceNameResource setNodeTypeFlag setParent setParticleAttr setPfxToPolyCamera setPluginResource setProject setStampDensity setStartupMessage setState setToolTo setUITemplate setXformManip sets shadingConnection shadingGeometryRelCtx shadingLightRelCtx shadingNetworkCompare shadingNode shapeCompare shelfButton shelfLayout shelfTabLayout shellField shortNameOf showHelp showHidden showManipCtx showSelectionInTitle showShadingGroupAttrEditor showWindow sign simplify sin singleProfileBirailSurface size sizeBytes skinCluster skinPercent smoothCurve smoothTangentSurface smoothstep snap2to2 snapKey snapMode snapTogetherCtx snapshot soft softMod softModCtx sort sound soundControl source spaceLocator sphere sphrand spotLight spotLightPreviewPort spreadSheetEditor spring sqrt squareSurface srtContext stackTrace startString startsWith stitchAndExplodeShell stitchSurface stitchSurfacePoints strcmp stringArrayCatenate stringArrayContains stringArrayCount stringArrayInsertAtIndex stringArrayIntersector stringArrayRemove stringArrayRemoveAtIndex stringArrayRemoveDuplicates stringArrayRemoveExact stringArrayToString stringToStringArray strip stripPrefixFromName stroke subdAutoProjection subdCleanTopology subdCollapse subdDuplicateAndConnect subdEditUV subdListComponentConversion subdMapCut subdMapSewMove subdMatchTopology subdMirror subdToBlind subdToPoly subdTransferUVsToCache subdiv subdivCrease subdivDisplaySmoothness substitute substituteAllString substituteGeometry substring surface surfaceSampler surfaceShaderList swatchDisplayPort switchTable symbolButton symbolCheckBox sysFile system tabLayout tan tangentConstraint texLatticeDeformContext texManipContext texMoveContext texMoveUVShellContext texRotateContext texScaleContext texSelectContext texSelectShortestPathCtx texSmudgeUVContext texWinToolCtx text textCurves textField textFieldButtonGrp textFieldGrp textManip textScrollList textToShelf textureDisplacePlane textureHairColor texturePlacementContext textureWindow threadCount threePointArcCtx timeControl timePort timerX toNativePath toggle toggleAxis toggleWindowVisibility tokenize tokenizeList tolerance tolower toolButton toolCollection toolDropped toolHasOptions toolPropertyWindow torus toupper trace track trackCtx transferAttributes transformCompare transformLimits translator trim trunc truncateFluidCache truncateHairCache tumble tumbleCtx turbulence twoPointArcCtx uiRes uiTemplate unassignInputDevice undo undoInfo ungroup uniform unit unloadPlugin untangleUV untitledFileName untrim upAxis updateAE userCtx uvLink uvSnapshot validateShelfName vectorize view2dToolCtx viewCamera viewClipPlane viewFit viewHeadOn viewLookAt viewManip viewPlace viewSet visor volumeAxis vortex waitCursor warning webBrowser webBrowserPrefs whatIs window windowPref wire wireContext workspace wrinkle wrinkleContext writeTake xbmLangPathList xform",i:"</",c:[e.CNM,e.ASM,e.QSM,{cN:"string",b:"`",e:"`",c:[e.BE]},{b:"[\\$\\%\\@](\\^\\w\\b|#\\w+|[^\\s\\w{]|{\\w+}|\\w+)"},e.CLCM,e.CBCM]}});
+hljs.registerLanguage("profile",function(e){return{c:[e.CNM,{b:"[a-zA-Z_][\\da-zA-Z_]+\\.[\\da-zA-Z_]{1,3}",e:":",eE:!0},{b:"(ncalls|tottime|cumtime)",e:"$",k:"ncalls tottime|10 cumtime|10 filename",relevance:10},{b:"function calls",e:"$",c:[e.CNM],relevance:10},e.ASM,e.QSM,{cN:"string",b:"\\(",e:"\\)$",eB:!0,eE:!0,relevance:0}]}});
+hljs.registerLanguage("basic",function(E){return{cI:!0,i:"^.",l:"[a-zA-Z][a-zA-Z0-9_$%!#]*",k:{keyword:"ABS ASC AND ATN AUTO|0 BEEP BLOAD|10 BSAVE|10 CALL CALLS CDBL CHAIN CHDIR CHR$|10 CINT CIRCLE CLEAR CLOSE CLS COLOR COM COMMON CONT COS CSNG CSRLIN CVD CVI CVS DATA DATE$ DEFDBL DEFINT DEFSNG DEFSTR DEF|0 SEG USR DELETE DIM DRAW EDIT END ENVIRON ENVIRON$ EOF EQV ERASE ERDEV ERDEV$ ERL ERR ERROR EXP FIELD FILES FIX FOR|0 FRE GET GOSUB|10 GOTO HEX$ IF THEN ELSE|0 INKEY$ INP INPUT INPUT# INPUT$ INSTR IMP INT IOCTL IOCTL$ KEY ON OFF LIST KILL LEFT$ LEN LET LINE LLIST LOAD LOC LOCATE LOF LOG LPRINT USING LSET MERGE MID$ MKDIR MKD$ MKI$ MKS$ MOD NAME NEW NEXT NOISE NOT OCT$ ON OR PEN PLAY STRIG OPEN OPTION BASE OUT PAINT PALETTE PCOPY PEEK PMAP POINT POKE POS PRINT PRINT] PSET PRESET PUT RANDOMIZE READ REM RENUM RESET|0 RESTORE RESUME RETURN|0 RIGHT$ RMDIR RND RSET RUN SAVE SCREEN SGN SHELL SIN SOUND SPACE$ SPC SQR STEP STICK STOP STR$ STRING$ SWAP SYSTEM TAB TAN TIME$ TIMER TROFF TRON TO USR VAL VARPTR VARPTR$ VIEW WAIT WHILE WEND WIDTH WINDOW WRITE XOR"},c:[E.QSM,E.C("REM","$",{relevance:10}),E.C("'","$",{relevance:0}),{cN:"symbol",b:"^[0-9]+ ",relevance:10},{cN:"number",b:"\\b([0-9]+[0-9edED.]*[#!]?)",relevance:0},{cN:"number",b:"(&[hH][0-9a-fA-F]{1,4})"},{cN:"number",b:"(&[oO][0-7]{1,6})"}]}});
+hljs.registerLanguage("jboss-cli",function(e){var a={cN:"params",b:/\(/,e:/\)/,c:[{b:/[\w-]+ *=/,rB:!0,relevance:0,c:[{cN:"attr",b:/[\w-]+/}]}],relevance:0};return{aliases:["wildfly-cli"],l:"[a-z-]+",k:{keyword:"alias batch cd clear command connect connection-factory connection-info data-source deploy deployment-info deployment-overlay echo echo-dmr help history if jdbc-driver-info jms-queue|20 jms-topic|20 ls patch pwd quit read-attribute read-operation reload rollout-plan run-batch set shutdown try unalias undeploy unset version xa-data-source",literal:"true false"},c:[e.HCM,e.QSM,{cN:"params",b:/--[\w\-=\/]+/},{cN:"function",b:/:[\w\-.]+/,relevance:0},{cN:"string",b:/\B(([\/.])[\w\-.\/=]+)+/},a]}});
+hljs.registerLanguage("oxygene",function(e){var r="abstract add and array as asc aspect assembly async begin break block by case class concat const copy constructor continue create default delegate desc distinct div do downto dynamic each else empty end ensure enum equals event except exit extension external false final finalize finalizer finally flags for forward from function future global group has if implementation implements implies in index inherited inline interface into invariants is iterator join locked locking loop matching method mod module namespace nested new nil not notify nullable of old on operator or order out override parallel params partial pinned private procedure property protected public queryable raise read readonly record reintroduce remove repeat require result reverse sealed select self sequence set shl shr skip static step soft take then to true try tuple type union unit unsafe until uses using var virtual raises volatile where while with write xor yield await mapped deprecated stdcall cdecl pascal register safecall overload library platform reference packed strict published autoreleasepool selector strong weak unretained",t=e.C("{","}",{relevance:0}),a=e.C("\\(\\*","\\*\\)",{relevance:10}),n={cN:"string",b:"'",e:"'",c:[{b:"''"}]},o={cN:"string",b:"(#\\d+)+"},i={cN:"function",bK:"function constructor destructor procedure method",e:"[:;]",k:"function constructor|10 destructor|10 procedure|10 method|10",c:[e.TM,{cN:"params",b:"\\(",e:"\\)",k:r,c:[n,o]},t,a]};return{cI:!0,l:/\.?\w+/,k:r,i:'("|\\$[G-Zg-z]|\\/\\*|</|=>|->)',c:[t,a,e.CLCM,n,o,e.NM,i,{cN:"class",b:"=\\bclass\\b",e:"end;",k:r,c:[n,o,t,a,e.CLCM,i]}]}});
+hljs.registerLanguage("dart",function(e){var t={cN:"subst",v:[{b:"\\$[A-Za-z0-9_]+"}]},r={cN:"subst",v:[{b:"\\${",e:"}"}],k:"true false null this is new super"},n={cN:"string",v:[{b:"r'''",e:"'''"},{b:'r"""',e:'"""'},{b:"r'",e:"'",i:"\\n"},{b:'r"',e:'"',i:"\\n"},{b:"'''",e:"'''",c:[e.BE,t,r]},{b:'"""',e:'"""',c:[e.BE,t,r]},{b:"'",e:"'",i:"\\n",c:[e.BE,t,r]},{b:'"',e:'"',i:"\\n",c:[e.BE,t,r]}]};r.c=[e.CNM,n];return{k:{keyword:"abstract as assert async await break case catch class const continue covariant default deferred do dynamic else enum export extends extension external factory false final finally for Function get hide if implements import in inferface is library mixin new null on operator part rethrow return set show static super switch sync this throw true try typedef var void while with yield",built_in:"Comparable DateTime Duration Function Iterable Iterator List Map Match Null Object Pattern RegExp Set Stopwatch String StringBuffer StringSink Symbol Type Uri bool double dynamic int num print Element ElementList document querySelector querySelectorAll window"},c:[n,e.C("/\\*\\*","\\*/",{sL:"markdown"}),e.C("///+\\s*","$",{c:[{sL:"markdown",b:".",e:"$"}]}),e.CLCM,e.CBCM,{cN:"class",bK:"class interface",e:"{",eE:!0,c:[{bK:"extends implements"},e.UTM]},e.CNM,{cN:"meta",b:"@[A-Za-z]+"},{b:"=>"}]}});
+hljs.registerLanguage("scilab",function(e){var s=[e.CNM,{cN:"string",b:"'|\"",e:"'|\"",c:[e.BE,{b:"''"}]}];return{aliases:["sci"],l:/%?\w+/,k:{keyword:"abort break case clear catch continue do elseif else endfunction end for function global if pause return resume select try then while",literal:"%f %F %t %T %pi %eps %inf %nan %e %i %z %s",built_in:"abs and acos asin atan ceil cd chdir clearglobal cosh cos cumprod deff disp error exec execstr exists exp eye gettext floor fprintf fread fsolve imag isdef isempty isinfisnan isvector lasterror length load linspace list listfiles log10 log2 log max min msprintf mclose mopen ones or pathconvert poly printf prod pwd rand real round sinh sin size gsort sprintf sqrt strcat strcmps tring sum system tanh tan type typename warning zeros matrix"},i:'("|#|/\\*|\\s+/\\w+)',c:[{cN:"function",bK:"function",e:"$",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)"}]},{b:"[a-zA-Z_][a-zA-Z_0-9]*('+[\\.']*|[\\.']+)",e:"",relevance:0},{b:"\\[",e:"\\]'*[\\.']*",relevance:0,c:s},e.C("//","$")].concat(s)}});
+hljs.registerLanguage("stata",function(e){return{aliases:["do","ado"],case_insensitive:!0,keywords:"if else in foreach for forv forva forval forvalu forvalue forvalues by bys bysort xi quietly qui capture about ac ac_7 acprplot acprplot_7 adjust ado adopath adoupdate alpha ameans an ano anov anova anova_estat anova_terms anovadef aorder ap app appe appen append arch arch_dr arch_estat arch_p archlm areg areg_p args arima arima_dr arima_estat arima_p as asmprobit asmprobit_estat asmprobit_lf asmprobit_mfx__dlg asmprobit_p ass asse asser assert avplot avplot_7 avplots avplots_7 bcskew0 bgodfrey bias binreg bip0_lf biplot bipp_lf bipr_lf bipr_p biprobit bitest bitesti bitowt blogit bmemsize boot bootsamp bootstrap bootstrap_8 boxco_l boxco_p boxcox boxcox_6 boxcox_p bprobit br break brier bro brow brows browse brr brrstat bs bs_7 bsampl_w bsample bsample_7 bsqreg bstat bstat_7 bstat_8 bstrap bstrap_7 bubble bubbleplot ca ca_estat ca_p cabiplot camat canon canon_8 canon_8_p canon_estat canon_p cap caprojection capt captu captur capture cat cc cchart cchart_7 cci cd censobs_table centile cf char chdir checkdlgfiles checkestimationsample checkhlpfiles checksum chelp ci cii cl class classutil clear cli clis clist clo clog clog_lf clog_p clogi clogi_sw clogit clogit_lf clogit_p clogitp clogl_sw cloglog clonevar clslistarray cluster cluster_measures cluster_stop cluster_tree cluster_tree_8 clustermat cmdlog cnr cnre cnreg cnreg_p cnreg_sw cnsreg codebook collaps4 collapse colormult_nb colormult_nw compare compress conf confi confir confirm conren cons const constr constra constrai constrain constraint continue contract copy copyright copysource cor corc corr corr2data corr_anti corr_kmo corr_smc corre correl correla correlat correlate corrgram cou coun count cox cox_p cox_sw coxbase coxhaz coxvar cprplot cprplot_7 crc cret cretu cretur creturn cross cs cscript cscript_log csi ct ct_is ctset ctst_5 ctst_st cttost cumsp cumsp_7 cumul cusum cusum_7 cutil d|0 datasig datasign datasigna datasignat datasignatu datasignatur datasignature datetof db dbeta de dec deco decod decode deff des desc descr descri describ describe destring dfbeta dfgls dfuller di di_g dir dirstats dis discard disp disp_res disp_s displ displa display distinct do doe doed doedi doedit dotplot dotplot_7 dprobit drawnorm drop ds ds_util dstdize duplicates durbina dwstat dydx e|0 ed edi edit egen eivreg emdef en enc enco encod encode eq erase ereg ereg_lf ereg_p ereg_sw ereghet ereghet_glf ereghet_glf_sh ereghet_gp ereghet_ilf ereghet_ilf_sh ereghet_ip eret eretu eretur ereturn err erro error esize est est_cfexist est_cfname est_clickable est_expand est_hold est_table est_unhold est_unholdok estat estat_default estat_summ estat_vce_only esti estimates etodow etof etomdy ex exi exit expand expandcl fac fact facto factor factor_estat factor_p factor_pca_rotated factor_rotate factormat fcast fcast_compute fcast_graph fdades fdadesc fdadescr fdadescri fdadescrib fdadescribe fdasav fdasave fdause fh_st file open file read file close file filefilter fillin find_hlp_file findfile findit findit_7 fit fl fli flis flist for5_0 forest forestplot form forma format fpredict frac_154 frac_adj frac_chk frac_cox frac_ddp frac_dis frac_dv frac_in frac_mun frac_pp frac_pq frac_pv frac_wgt frac_xo fracgen fracplot fracplot_7 fracpoly fracpred fron_ex fron_hn fron_p fron_tn fron_tn2 frontier ftodate ftoe ftomdy ftowdate funnel funnelplot g|0 gamhet_glf gamhet_gp gamhet_ilf gamhet_ip gamma gamma_d2 gamma_p gamma_sw gammahet gdi_hexagon gdi_spokes ge gen gene gener genera generat generate genrank genstd genvmean gettoken gl gladder gladder_7 glim_l01 glim_l02 glim_l03 glim_l04 glim_l05 glim_l06 glim_l07 glim_l08 glim_l09 glim_l10 glim_l11 glim_l12 glim_lf glim_mu glim_nw1 glim_nw2 glim_nw3 glim_p glim_v1 glim_v2 glim_v3 glim_v4 glim_v5 glim_v6 glim_v7 glm glm_6 glm_p glm_sw glmpred glo glob globa global glogit glogit_8 glogit_p gmeans gnbre_lf gnbreg gnbreg_5 gnbreg_p gomp_lf gompe_sw gomper_p gompertz gompertzhet gomphet_glf gomphet_glf_sh gomphet_gp gomphet_ilf gomphet_ilf_sh gomphet_ip gphdot gphpen gphprint gprefs gprobi_p gprobit gprobit_8 gr gr7 gr_copy gr_current gr_db gr_describe gr_dir gr_draw gr_draw_replay gr_drop gr_edit gr_editviewopts gr_example gr_example2 gr_export gr_print gr_qscheme gr_query gr_read gr_rename gr_replay gr_save gr_set gr_setscheme gr_table gr_undo gr_use graph graph7 grebar greigen greigen_7 greigen_8 grmeanby grmeanby_7 gs_fileinfo gs_filetype gs_graphinfo gs_stat gsort gwood h|0 hadimvo hareg hausman haver he heck_d2 heckma_p heckman heckp_lf heckpr_p heckprob hel help hereg hetpr_lf hetpr_p hetprob hettest hexdump hilite hist hist_7 histogram hlogit hlu hmeans hotel hotelling hprobit hreg hsearch icd9 icd9_ff icd9p iis impute imtest inbase include inf infi infil infile infix inp inpu input ins insheet insp inspe inspec inspect integ inten intreg intreg_7 intreg_p intrg2_ll intrg_ll intrg_ll2 ipolate iqreg ir irf irf_create irfm iri is_svy is_svysum isid istdize ivprob_1_lf ivprob_lf ivprobit ivprobit_p ivreg ivreg_footnote ivtob_1_lf ivtob_lf ivtobit ivtobit_p jackknife jacknife jknife jknife_6 jknife_8 jkstat joinby kalarma1 kap kap_3 kapmeier kappa kapwgt kdensity kdensity_7 keep ksm ksmirnov ktau kwallis l|0 la lab labbe labbeplot labe label labelbook ladder levels levelsof leverage lfit lfit_p li lincom line linktest lis list lloghet_glf lloghet_glf_sh lloghet_gp lloghet_ilf lloghet_ilf_sh lloghet_ip llogi_sw llogis_p llogist llogistic llogistichet lnorm_lf lnorm_sw lnorma_p lnormal lnormalhet lnormhet_glf lnormhet_glf_sh lnormhet_gp lnormhet_ilf lnormhet_ilf_sh lnormhet_ip lnskew0 loadingplot loc loca local log logi logis_lf logistic logistic_p logit logit_estat logit_p loglogs logrank loneway lookfor lookup lowess lowess_7 lpredict lrecomp lroc lroc_7 lrtest ls lsens lsens_7 lsens_x lstat ltable ltable_7 ltriang lv lvr2plot lvr2plot_7 m|0 ma mac macr macro makecns man manova manova_estat manova_p manovatest mantel mark markin markout marksample mat mat_capp mat_order mat_put_rr mat_rapp mata mata_clear mata_describe mata_drop mata_matdescribe mata_matsave mata_matuse mata_memory mata_mlib mata_mosave mata_rename mata_which matalabel matcproc matlist matname matr matri matrix matrix_input__dlg matstrik mcc mcci md0_ md1_ md1debug_ md2_ md2debug_ mds mds_estat mds_p mdsconfig mdslong mdsmat mdsshepard mdytoe mdytof me_derd mean means median memory memsize menl meqparse mer merg merge meta mfp mfx mhelp mhodds minbound mixed_ll mixed_ll_reparm mkassert mkdir mkmat mkspline ml ml_5 ml_adjs ml_bhhhs ml_c_d ml_check ml_clear ml_cnt ml_debug ml_defd ml_e0 ml_e0_bfgs ml_e0_cycle ml_e0_dfp ml_e0i ml_e1 ml_e1_bfgs ml_e1_bhhh ml_e1_cycle ml_e1_dfp ml_e2 ml_e2_cycle ml_ebfg0 ml_ebfr0 ml_ebfr1 ml_ebh0q ml_ebhh0 ml_ebhr0 ml_ebr0i ml_ecr0i ml_edfp0 ml_edfr0 ml_edfr1 ml_edr0i ml_eds ml_eer0i ml_egr0i ml_elf ml_elf_bfgs ml_elf_bhhh ml_elf_cycle ml_elf_dfp ml_elfi ml_elfs ml_enr0i ml_enrr0 ml_erdu0 ml_erdu0_bfgs ml_erdu0_bhhh ml_erdu0_bhhhq ml_erdu0_cycle ml_erdu0_dfp ml_erdu0_nrbfgs ml_exde ml_footnote ml_geqnr ml_grad0 ml_graph ml_hbhhh ml_hd0 ml_hold ml_init ml_inv ml_log ml_max ml_mlout ml_mlout_8 ml_model ml_nb0 ml_opt ml_p ml_plot ml_query ml_rdgrd ml_repor ml_s_e ml_score ml_searc ml_technique ml_unhold mleval mlf_ mlmatbysum mlmatsum mlog mlogi mlogit mlogit_footnote mlogit_p mlopts mlsum mlvecsum mnl0_ mor more mov move mprobit mprobit_lf mprobit_p mrdu0_ mrdu1_ mvdecode mvencode mvreg mvreg_estat n|0 nbreg nbreg_al nbreg_lf nbreg_p nbreg_sw nestreg net newey newey_7 newey_p news nl nl_7 nl_9 nl_9_p nl_p nl_p_7 nlcom nlcom_p nlexp2 nlexp2_7 nlexp2a nlexp2a_7 nlexp3 nlexp3_7 nlgom3 nlgom3_7 nlgom4 nlgom4_7 nlinit nllog3 nllog3_7 nllog4 nllog4_7 nlog_rd nlogit nlogit_p nlogitgen nlogittree nlpred no nobreak noi nois noisi noisil noisily note notes notes_dlg nptrend numlabel numlist odbc old_ver olo olog ologi ologi_sw ologit ologit_p ologitp on one onew onewa oneway op_colnm op_comp op_diff op_inv op_str opr opro oprob oprob_sw oprobi oprobi_p oprobit oprobitp opts_exclusive order orthog orthpoly ou out outf outfi outfil outfile outs outsh outshe outshee outsheet ovtest pac pac_7 palette parse parse_dissim pause pca pca_8 pca_display pca_estat pca_p pca_rotate pcamat pchart pchart_7 pchi pchi_7 pcorr pctile pentium pergram pergram_7 permute permute_8 personal peto_st pkcollapse pkcross pkequiv pkexamine pkexamine_7 pkshape pksumm pksumm_7 pl plo plot plugin pnorm pnorm_7 poisgof poiss_lf poiss_sw poisso_p poisson poisson_estat post postclose postfile postutil pperron pr prais prais_e prais_e2 prais_p predict predictnl preserve print pro prob probi probit probit_estat probit_p proc_time procoverlay procrustes procrustes_estat procrustes_p profiler prog progr progra program prop proportion prtest prtesti pwcorr pwd q\\s qby qbys qchi qchi_7 qladder qladder_7 qnorm qnorm_7 qqplot qqplot_7 qreg qreg_c qreg_p qreg_sw qu quadchk quantile quantile_7 que quer query range ranksum ratio rchart rchart_7 rcof recast reclink recode reg reg3 reg3_p regdw regr regre regre_p2 regres regres_p regress regress_estat regriv_p remap ren rena renam rename renpfix repeat replace report reshape restore ret retu retur return rm rmdir robvar roccomp roccomp_7 roccomp_8 rocf_lf rocfit rocfit_8 rocgold rocplot rocplot_7 roctab roctab_7 rolling rologit rologit_p rot rota rotat rotate rotatemat rreg rreg_p ru run runtest rvfplot rvfplot_7 rvpplot rvpplot_7 sa safesum sample sampsi sav save savedresults saveold sc sca scal scala scalar scatter scm_mine sco scob_lf scob_p scobi_sw scobit scor score scoreplot scoreplot_help scree screeplot screeplot_help sdtest sdtesti se search separate seperate serrbar serrbar_7 serset set set_defaults sfrancia sh she shel shell shewhart shewhart_7 signestimationsample signrank signtest simul simul_7 simulate simulate_8 sktest sleep slogit slogit_d2 slogit_p smooth snapspan so sor sort spearman spikeplot spikeplot_7 spikeplt spline_x split sqreg sqreg_p sret sretu sretur sreturn ssc st st_ct st_hc st_hcd st_hcd_sh st_is st_issys st_note st_promo st_set st_show st_smpl st_subid stack statsby statsby_8 stbase stci stci_7 stcox stcox_estat stcox_fr stcox_fr_ll stcox_p stcox_sw stcoxkm stcoxkm_7 stcstat stcurv stcurve stcurve_7 stdes stem stepwise stereg stfill stgen stir stjoin stmc stmh stphplot stphplot_7 stphtest stphtest_7 stptime strate strate_7 streg streg_sw streset sts sts_7 stset stsplit stsum sttocc sttoct stvary stweib su suest suest_8 sum summ summa summar summari summariz summarize sunflower sureg survcurv survsum svar svar_p svmat svy svy_disp svy_dreg svy_est svy_est_7 svy_estat svy_get svy_gnbreg_p svy_head svy_header svy_heckman_p svy_heckprob_p svy_intreg_p svy_ivreg_p svy_logistic_p svy_logit_p svy_mlogit_p svy_nbreg_p svy_ologit_p svy_oprobit_p svy_poisson_p svy_probit_p svy_regress_p svy_sub svy_sub_7 svy_x svy_x_7 svy_x_p svydes svydes_8 svygen svygnbreg svyheckman svyheckprob svyintreg svyintreg_7 svyintrg svyivreg svylc svylog_p svylogit svymarkout svymarkout_8 svymean svymlog svymlogit svynbreg svyolog svyologit svyoprob svyoprobit svyopts svypois svypois_7 svypoisson svyprobit svyprobt svyprop svyprop_7 svyratio svyreg svyreg_p svyregress svyset svyset_7 svyset_8 svytab svytab_7 svytest svytotal sw sw_8 swcnreg swcox swereg swilk swlogis swlogit swologit swoprbt swpois swprobit swqreg swtobit swweib symmetry symmi symplot symplot_7 syntax sysdescribe sysdir sysuse szroeter ta tab tab1 tab2 tab_or tabd tabdi tabdis tabdisp tabi table tabodds tabodds_7 tabstat tabu tabul tabula tabulat tabulate te tempfile tempname tempvar tes test testnl testparm teststd tetrachoric time_it timer tis tob tobi tobit tobit_p tobit_sw token tokeni tokeniz tokenize tostring total translate translator transmap treat_ll treatr_p treatreg trim trimfill trnb_cons trnb_mean trpoiss_d2 trunc_ll truncr_p truncreg tsappend tset tsfill tsline tsline_ex tsreport tsrevar tsrline tsset tssmooth tsunab ttest ttesti tut_chk tut_wait tutorial tw tware_st two twoway twoway__fpfit_serset twoway__function_gen twoway__histogram_gen twoway__ipoint_serset twoway__ipoints_serset twoway__kdensity_gen twoway__lfit_serset twoway__normgen_gen twoway__pci_serset twoway__qfit_serset twoway__scatteri_serset twoway__sunflower_gen twoway_ksm_serset ty typ type typeof u|0 unab unabbrev unabcmd update us use uselabel var var_mkcompanion var_p varbasic varfcast vargranger varirf varirf_add varirf_cgraph varirf_create varirf_ctable varirf_describe varirf_dir varirf_drop varirf_erase varirf_graph varirf_ograph varirf_rename varirf_set varirf_table varlist varlmar varnorm varsoc varstable varstable_w varstable_w2 varwle vce vec vec_fevd vec_mkphi vec_p vec_p_w vecirf_create veclmar veclmar_w vecnorm vecnorm_w vecrank vecstable verinst vers versi versio version view viewsource vif vwls wdatetof webdescribe webseek webuse weib1_lf weib2_lf weib_lf weib_lf0 weibhet_glf weibhet_glf_sh weibhet_glfa weibhet_glfa_sh weibhet_gp weibhet_ilf weibhet_ilf_sh weibhet_ilfa weibhet_ilfa_sh weibhet_ip weibu_sw weibul_p weibull weibull_c weibull_s weibullhet wh whelp whi which whil while wilc_st wilcoxon win wind windo window winexec wntestb wntestb_7 wntestq xchart xchart_7 xcorr xcorr_7 xi xi_6 xmlsav xmlsave xmluse xpose xsh xshe xshel xshell xt_iis xt_tis xtab_p xtabond xtbin_p xtclog xtcloglog xtcloglog_8 xtcloglog_d2 xtcloglog_pa_p xtcloglog_re_p xtcnt_p xtcorr xtdata xtdes xtfront_p xtfrontier xtgee xtgee_elink xtgee_estat xtgee_makeivar xtgee_p xtgee_plink xtgls xtgls_p xthaus xthausman xtht_p xthtaylor xtile xtint_p xtintreg xtintreg_8 xtintreg_d2 xtintreg_p xtivp_1 xtivp_2 xtivreg xtline xtline_ex xtlogit xtlogit_8 xtlogit_d2 xtlogit_fe_p xtlogit_pa_p xtlogit_re_p xtmixed xtmixed_estat xtmixed_p xtnb_fe xtnb_lf xtnbreg xtnbreg_pa_p xtnbreg_refe_p xtpcse xtpcse_p xtpois xtpoisson xtpoisson_d2 xtpoisson_pa_p xtpoisson_refe_p xtpred xtprobit xtprobit_8 xtprobit_d2 xtprobit_re_p xtps_fe xtps_lf xtps_ren xtps_ren_8 xtrar_p xtrc xtrc_p xtrchh xtrefe_p xtreg xtreg_be xtreg_fe xtreg_ml xtreg_pa_p xtreg_re xtregar xtrere_p xtset xtsf_ll xtsf_llti xtsum xttab xttest0 xttobit xttobit_8 xttobit_p xttrans yx yxview__barlike_draw yxview_area_draw yxview_bar_draw yxview_dot_draw yxview_dropline_draw yxview_function_draw yxview_iarrow_draw yxview_ilabels_draw yxview_normal_draw yxview_pcarrow_draw yxview_pcbarrow_draw yxview_pccapsym_draw yxview_pcscatter_draw yxview_pcspike_draw yxview_rarea_draw yxview_rbar_draw yxview_rbarm_draw yxview_rcap_draw yxview_rcapsym_draw yxview_rconnected_draw yxview_rline_draw yxview_rscatter_draw yxview_rspike_draw yxview_spike_draw yxview_sunflower_draw zap_s zinb zinb_llf zinb_plf zip zip_llf zip_p zip_plf zt_ct_5 zt_hc_5 zt_hcd_5 zt_is_5 zt_iss_5 zt_sho_5 zt_smp_5 ztbase_5 ztcox_5 ztdes_5 ztereg_5 ztfill_5 ztgen_5 ztir_5 ztjoin_5 ztnb ztnb_p ztp ztp_p zts_5 ztset_5 ztspli_5 ztsum_5 zttoct_5 ztvary_5 ztweib_5",contains:[{className:"symbol",begin:/`[a-zA-Z0-9_]+'/},{className:"variable",begin:/\$\{?[a-zA-Z0-9_]+\}?/},{className:"string",variants:[{begin:'`"[^\r\n]*?"\''},{b:'"[^\r\n"]*"'}]},{cN:"built_in",v:[{b:"\\b(abs|acos|asin|atan|atan2|atanh|ceil|cloglog|comb|cos|digamma|exp|floor|invcloglog|invlogit|ln|lnfact|lnfactorial|lngamma|log|log10|max|min|mod|reldif|round|sign|sin|sqrt|sum|tan|tanh|trigamma|trunc|betaden|Binomial|binorm|binormal|chi2|chi2tail|dgammapda|dgammapdada|dgammapdadx|dgammapdx|dgammapdxdx|F|Fden|Ftail|gammaden|gammap|ibeta|invbinomial|invchi2|invchi2tail|invF|invFtail|invgammap|invibeta|invnchi2|invnFtail|invnibeta|invnorm|invnormal|invttail|nbetaden|nchi2|nFden|nFtail|nibeta|norm|normal|normalden|normd|npnchi2|tden|ttail|uniform|abbrev|char|index|indexnot|length|lower|ltrim|match|plural|proper|real|regexm|regexr|regexs|reverse|rtrim|string|strlen|strlower|strltrim|strmatch|strofreal|strpos|strproper|strreverse|strrtrim|strtrim|strupper|subinstr|subinword|substr|trim|upper|word|wordcount|_caller|autocode|byteorder|chop|clip|cond|e|epsdouble|epsfloat|group|inlist|inrange|irecode|matrix|maxbyte|maxdouble|maxfloat|maxint|maxlong|mi|minbyte|mindouble|minfloat|minint|minlong|missing|r|recode|replay|return|s|scalar|d|date|day|dow|doy|halfyear|mdy|month|quarter|week|year|d|daily|dofd|dofh|dofm|dofq|dofw|dofy|h|halfyearly|hofd|m|mofd|monthly|q|qofd|quarterly|tin|twithin|w|weekly|wofd|y|yearly|yh|ym|yofd|yq|yw|cholesky|colnumb|colsof|corr|det|diag|diag0cnt|el|get|hadamard|I|inv|invsym|issym|issymmetric|J|matmissing|matuniform|mreldif|nullmat|rownumb|rowsof|sweep|syminv|trace|vec|vecdiag)(?=\\()"}]},e.C("^[ \t]*\\*.*$",!1),e.CLCM,e.CBCM]}});
+hljs.registerLanguage("haml",function(e){return{cI:!0,c:[{cN:"meta",b:"^!!!( (5|1\\.1|Strict|Frameset|Basic|Mobile|RDFa|XML\\b.*))?$",relevance:10},e.C("^\\s*(!=#|=#|-#|/).*$",!1,{relevance:0}),{b:"^\\s*(-|=|!=)(?!#)",starts:{e:"\\n",sL:"ruby"}},{cN:"tag",b:"^\\s*%",c:[{cN:"selector-tag",b:"\\w+"},{cN:"selector-id",b:"#[\\w-]+"},{cN:"selector-class",b:"\\.[\\w-]+"},{b:"{\\s*",e:"\\s*}",c:[{b:":\\w+\\s*=>",e:",\\s+",rB:!0,eW:!0,c:[{cN:"attr",b:":\\w+"},e.ASM,e.QSM,{b:"\\w+",relevance:0}]}]},{b:"\\(\\s*",e:"\\s*\\)",eE:!0,c:[{b:"\\w+\\s*=",e:"\\s+",rB:!0,eW:!0,c:[{cN:"attr",b:"\\w+",relevance:0},e.ASM,e.QSM,{b:"\\w+",relevance:0}]}]}]},{b:"^\\s*[=~]\\s*"},{b:"#{",starts:{e:"}",sL:"ruby"}}]}});
+hljs.registerLanguage("dns",function(d){return{aliases:["bind","zone"],k:{keyword:"IN A AAAA AFSDB APL CAA CDNSKEY CDS CERT CNAME DHCID DLV DNAME DNSKEY DS HIP IPSECKEY KEY KX LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM PTR RRSIG RP SIG SOA SRV SSHFP TA TKEY TLSA TSIG TXT"},c:[d.C(";","$",{relevance:0}),{cN:"meta",b:/^\$(TTL|GENERATE|INCLUDE|ORIGIN)\b/},{cN:"number",b:"((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))\\b"},{cN:"number",b:"((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\b"},d.inherit(d.NM,{b:/\b\d+[dhwm]?/})]}});
+hljs.registerLanguage("dust",function(e){return{aliases:["dst"],cI:!0,sL:"xml",c:[{cN:"template-tag",b:/\{[#\/]/,e:/\}/,i:/;/,c:[{cN:"name",b:/[a-zA-Z\.-]+/,starts:{eW:!0,relevance:0,c:[e.QSM]}}]},{cN:"template-variable",b:/\{/,e:/\}/,i:/;/,k:"if eq ne lt lte gt gte select default math sep"}]}});
+hljs.registerLanguage("gherkin",function(e){return{aliases:["feature"],k:"Feature Background Ability Business Need Scenario Scenarios Scenario Outline Scenario Template Examples Given And Then But When",c:[{cN:"symbol",b:"\\*",relevance:0},{cN:"meta",b:"@[^@\\s]+"},{b:"\\|",e:"\\|\\w*$",c:[{cN:"string",b:"[^|]+"}]},{cN:"variable",b:"<",e:">"},e.HCM,{cN:"string",b:'"""',e:'"""'},e.QSM]}});
+hljs.registerLanguage("fortran",function(e){return{cI:!0,aliases:["f90","f95"],k:{literal:".False. .True.",keyword:"kind do while private call intrinsic where elsewhere type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then block endblock public subroutine|10 function program .and. .or. .not. .le. .eq. .ge. .gt. .lt. goto save else use module select case access blank direct exist file fmt form formatted iostat name named nextrec number opened rec recl sequential status unformatted unit continue format pause cycle exit c_null_char c_alert c_backspace c_form_feed flush wait decimal round iomsg synchronous nopass non_overridable pass protected volatile abstract extends import non_intrinsic value deferred generic final enumerator class associate bind enum c_int c_short c_long c_long_long c_signed_char c_size_t c_int8_t c_int16_t c_int32_t c_int64_t c_int_least8_t c_int_least16_t c_int_least32_t c_int_least64_t c_int_fast8_t c_int_fast16_t c_int_fast32_t c_int_fast64_t c_intmax_t C_intptr_t c_float c_double c_long_double c_float_complex c_double_complex c_long_double_complex c_bool c_char c_null_ptr c_null_funptr c_new_line c_carriage_return c_horizontal_tab c_vertical_tab iso_c_binding c_loc c_funloc c_associated  c_f_pointer c_ptr c_funptr iso_fortran_env character_storage_size error_unit file_storage_size input_unit iostat_end iostat_eor numeric_storage_size output_unit c_f_procpointer ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode newunit contiguous recursive pad position action delim readwrite eor advance nml interface procedure namelist include sequence elemental pure integer real character complex logical dimension allocatable|10 parameter external implicit|10 none double precision assign intent optional pointer target in out common equivalence data",built_in:"alog alog10 amax0 amax1 amin0 amin1 amod cabs ccos cexp clog csin csqrt dabs dacos dasin datan datan2 dcos dcosh ddim dexp dint dlog dlog10 dmax1 dmin1 dmod dnint dsign dsin dsinh dsqrt dtan dtanh float iabs idim idint idnint ifix isign max0 max1 min0 min1 sngl algama cdabs cdcos cdexp cdlog cdsin cdsqrt cqabs cqcos cqexp cqlog cqsin cqsqrt dcmplx dconjg derf derfc dfloat dgamma dimag dlgama iqint qabs qacos qasin qatan qatan2 qcmplx qconjg qcos qcosh qdim qerf qerfc qexp qgamma qimag qlgama qlog qlog10 qmax1 qmin1 qmod qnint qsign qsin qsinh qsqrt qtan qtanh abs acos aimag aint anint asin atan atan2 char cmplx conjg cos cosh exp ichar index int log log10 max min nint sign sin sinh sqrt tan tanh print write dim lge lgt lle llt mod nullify allocate deallocate adjustl adjustr all allocated any associated bit_size btest ceiling count cshift date_and_time digits dot_product eoshift epsilon exponent floor fraction huge iand ibclr ibits ibset ieor ior ishft ishftc lbound len_trim matmul maxexponent maxloc maxval merge minexponent minloc minval modulo mvbits nearest pack present product radix random_number random_seed range repeat reshape rrspacing scale scan selected_int_kind selected_real_kind set_exponent shape size spacing spread sum system_clock tiny transpose trim ubound unpack verify achar iachar transfer dble entry dprod cpu_time command_argument_count get_command get_command_argument get_environment_variable is_iostat_end ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode is_iostat_eor move_alloc new_line selected_char_kind same_type_as extends_type_ofacosh asinh atanh bessel_j0 bessel_j1 bessel_jn bessel_y0 bessel_y1 bessel_yn erf erfc erfc_scaled gamma log_gamma hypot norm2 atomic_define atomic_ref execute_command_line leadz trailz storage_size merge_bits bge bgt ble blt dshiftl dshiftr findloc iall iany iparity image_index lcobound ucobound maskl maskr num_images parity popcnt poppar shifta shiftl shiftr this_image"},i:/\/\*/,c:[e.inherit(e.ASM,{cN:"string",relevance:0}),e.inherit(e.QSM,{cN:"string",relevance:0}),{cN:"function",bK:"subroutine function program",i:"[${=\\n]",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)"}]},e.C("!","$",{relevance:0}),{cN:"number",b:"(?=\\b|\\+|\\-|\\.)(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*)(?:[de][+-]?\\d+)?\\b\\.?",relevance:0}]}});
+hljs.registerLanguage("sml",function(e){return{aliases:["ml"],k:{keyword:"abstype and andalso as case datatype do else end eqtype exception fn fun functor handle if in include infix infixr let local nonfix of op open orelse raise rec sharing sig signature struct structure then type val with withtype where while",built_in:"array bool char exn int list option order real ref string substring vector unit word",literal:"true false NONE SOME LESS EQUAL GREATER nil"},i:/\/\/|>>/,l:"[a-z_]\\w*!?",c:[{cN:"literal",b:/\[(\|\|)?\]|\(\)/,relevance:0},e.C("\\(\\*","\\*\\)",{c:["self"]}),{cN:"symbol",b:"'[A-Za-z_](?!')[\\w']*"},{cN:"type",b:"`[A-Z][\\w']*"},{cN:"type",b:"\\b[A-Z][\\w']*",relevance:0},{b:"[a-z_]\\w*'[\\w']*"},e.inherit(e.ASM,{cN:"string",relevance:0}),e.inherit(e.QSM,{i:null}),{cN:"number",b:"\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",relevance:0},{b:/[-=]>/}]}});
+hljs.registerLanguage("aspectj",function(e){var t="false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else extends implements break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws privileged aspectOf adviceexecution proceed cflowbelow cflow initialization preinitialization staticinitialization withincode target within execution getWithinTypeName handler thisJoinPoint thisJoinPointStaticPart thisEnclosingJoinPointStaticPart declare parents warning error soft precedence thisAspectInstance",i="get set args call";return{k:t,i:/<\/|#/,c:[e.C("/\\*\\*","\\*/",{relevance:0,c:[{b:/\w+@/,relevance:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,e.ASM,e.QSM,{cN:"class",bK:"aspect",e:/[{;=]/,eE:!0,i:/[:;"\[\]]/,c:[{bK:"extends implements pertypewithin perthis pertarget percflowbelow percflow issingleton"},e.UTM,{b:/\([^\)]*/,e:/[)]+/,k:t+" "+i,eE:!1}]},{cN:"class",bK:"class interface",e:/[{;=]/,eE:!0,relevance:0,k:"class interface",i:/[:"\[\]]/,c:[{bK:"extends implements"},e.UTM]},{bK:"pointcut after before around throwing returning",e:/[)]/,eE:!1,i:/["\[\]]/,c:[{b:e.UIR+"\\s*\\(",rB:!0,c:[e.UTM]}]},{b:/[:]/,rB:!0,e:/[{;]/,relevance:0,eE:!1,k:t,i:/["\[\]]/,c:[{b:e.UIR+"\\s*\\(",k:t+" "+i,relevance:0},e.QSM]},{bK:"new throw",relevance:0},{cN:"function",b:/\w+ +\w+(\.)?\w+\s*\([^\)]*\)\s*((throws)[\w\s,]+)?[\{;]/,rB:!0,e:/[{;=]/,k:t,eE:!0,c:[{b:e.UIR+"\\s*\\(",rB:!0,relevance:0,c:[e.UTM]},{cN:"params",b:/\(/,e:/\)/,relevance:0,k:t,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]},e.CNM,{cN:"meta",b:"@[A-Za-z]+"}]}});
+hljs.registerLanguage("irpf90",function(e){return{cI:!0,k:{literal:".False. .True.",keyword:"kind do while private call intrinsic where elsewhere type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then public subroutine|10 function program .and. .or. .not. .le. .eq. .ge. .gt. .lt. goto save else use module select case access blank direct exist file fmt form formatted iostat name named nextrec number opened rec recl sequential status unformatted unit continue format pause cycle exit c_null_char c_alert c_backspace c_form_feed flush wait decimal round iomsg synchronous nopass non_overridable pass protected volatile abstract extends import non_intrinsic value deferred generic final enumerator class associate bind enum c_int c_short c_long c_long_long c_signed_char c_size_t c_int8_t c_int16_t c_int32_t c_int64_t c_int_least8_t c_int_least16_t c_int_least32_t c_int_least64_t c_int_fast8_t c_int_fast16_t c_int_fast32_t c_int_fast64_t c_intmax_t C_intptr_t c_float c_double c_long_double c_float_complex c_double_complex c_long_double_complex c_bool c_char c_null_ptr c_null_funptr c_new_line c_carriage_return c_horizontal_tab c_vertical_tab iso_c_binding c_loc c_funloc c_associated  c_f_pointer c_ptr c_funptr iso_fortran_env character_storage_size error_unit file_storage_size input_unit iostat_end iostat_eor numeric_storage_size output_unit c_f_procpointer ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode newunit contiguous recursive pad position action delim readwrite eor advance nml interface procedure namelist include sequence elemental pure integer real character complex logical dimension allocatable|10 parameter external implicit|10 none double precision assign intent optional pointer target in out common equivalence data begin_provider &begin_provider end_provider begin_shell end_shell begin_template end_template subst assert touch soft_touch provide no_dep free irp_if irp_else irp_endif irp_write irp_read",built_in:"alog alog10 amax0 amax1 amin0 amin1 amod cabs ccos cexp clog csin csqrt dabs dacos dasin datan datan2 dcos dcosh ddim dexp dint dlog dlog10 dmax1 dmin1 dmod dnint dsign dsin dsinh dsqrt dtan dtanh float iabs idim idint idnint ifix isign max0 max1 min0 min1 sngl algama cdabs cdcos cdexp cdlog cdsin cdsqrt cqabs cqcos cqexp cqlog cqsin cqsqrt dcmplx dconjg derf derfc dfloat dgamma dimag dlgama iqint qabs qacos qasin qatan qatan2 qcmplx qconjg qcos qcosh qdim qerf qerfc qexp qgamma qimag qlgama qlog qlog10 qmax1 qmin1 qmod qnint qsign qsin qsinh qsqrt qtan qtanh abs acos aimag aint anint asin atan atan2 char cmplx conjg cos cosh exp ichar index int log log10 max min nint sign sin sinh sqrt tan tanh print write dim lge lgt lle llt mod nullify allocate deallocate adjustl adjustr all allocated any associated bit_size btest ceiling count cshift date_and_time digits dot_product eoshift epsilon exponent floor fraction huge iand ibclr ibits ibset ieor ior ishft ishftc lbound len_trim matmul maxexponent maxloc maxval merge minexponent minloc minval modulo mvbits nearest pack present product radix random_number random_seed range repeat reshape rrspacing scale scan selected_int_kind selected_real_kind set_exponent shape size spacing spread sum system_clock tiny transpose trim ubound unpack verify achar iachar transfer dble entry dprod cpu_time command_argument_count get_command get_command_argument get_environment_variable is_iostat_end ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode is_iostat_eor move_alloc new_line selected_char_kind same_type_as extends_type_ofacosh asinh atanh bessel_j0 bessel_j1 bessel_jn bessel_y0 bessel_y1 bessel_yn erf erfc erfc_scaled gamma log_gamma hypot norm2 atomic_define atomic_ref execute_command_line leadz trailz storage_size merge_bits bge bgt ble blt dshiftl dshiftr findloc iall iany iparity image_index lcobound ucobound maskl maskr num_images parity popcnt poppar shifta shiftl shiftr this_image IRP_ALIGN irp_here"},i:/\/\*/,c:[e.inherit(e.ASM,{cN:"string",relevance:0}),e.inherit(e.QSM,{cN:"string",relevance:0}),{cN:"function",bK:"subroutine function program",i:"[${=\\n]",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)"}]},e.C("!","$",{relevance:0}),e.C("begin_doc","end_doc",{relevance:10}),{cN:"number",b:"(?=\\b|\\+|\\-|\\.)(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*)(?:[de][+-]?\\d+)?\\b\\.?",relevance:0}]}});
+hljs.registerLanguage("abnf",function(b){var A="^[a-zA-Z][a-zA-Z0-9-]*",s="[!@#$^&',?+~`|:]",a=b.C(";","$"),c={cN:"attribute",b:A+"(?=\\s*=)"};return{i:s,k:["ALPHA","BIT","CHAR","CR","CRLF","CTL","DIGIT","DQUOTE","HEXDIG","HTAB","LF","LWSP","OCTET","SP","VCHAR","WSP"].join(" "),c:[c,a,{cN:"symbol",b:/%b[0-1]+(-[0-1]+|(\.[0-1]+)+){0,1}/},{cN:"symbol",b:/%d[0-9]+(-[0-9]+|(\.[0-9]+)+){0,1}/},{cN:"symbol",b:/%x[0-9A-F]+(-[0-9A-F]+|(\.[0-9A-F]+)+){0,1}/},{cN:"symbol",b:/%[si]/},b.QSM,b.NM]}});
+hljs.registerLanguage("c-like",function(){"use strict";return function(e){function t(e){return"(?:"+e+")?"}var n="(decltype\\(auto\\)|"+t("[a-zA-Z_]\\w*::")+"[a-zA-Z_]\\w*"+t("<.*?>")+")",r={className:"keyword",begin:"\\b[a-z\\d_]*_t\\b"},a={className:"string",variants:[{begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",end:"'",illegal:"."},e.END_SAME_AS_BEGIN({begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},i={className:"number",variants:[{begin:"\\b(0b[01']+)"},{begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},s={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{"meta-keyword":"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"},contains:[{begin:/\\\n/,relevance:0},e.inherit(a,{className:"meta-string"}),{className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},o={className:"title",begin:t("[a-zA-Z_]\\w*::")+e.IDENT_RE,relevance:0},c=t("[a-zA-Z_]\\w*::")+e.IDENT_RE+"\\s*\\(",l={keyword:"int float while private char char8_t char16_t char32_t catch import module export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using asm case typeid wchar_t short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignas alignof constexpr consteval constinit decltype concept co_await co_return co_yield requires noexcept static_assert thread_local restrict final override atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return and and_eq bitand bitor compl not not_eq or or_eq xor xor_eq",built_in:"std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set pair bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap priority_queue make_pair array shared_ptr abort terminate abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr _Bool complex _Complex imaginary _Imaginary",literal:"true false nullptr NULL"},d=[r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,i,a],_={variants:[{begin:/=/,end:/;/},{begin:/\(/,end:/\)/},{beginKeywords:"new throw return else",end:/;/}],keywords:l,contains:d.concat([{begin:/\(/,end:/\)/,keywords:l,contains:d.concat(["self"]),relevance:0}]),relevance:0},u={className:"function",begin:"("+n+"[\\*&\\s]+)+"+c,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:l,illegal:/[^\w\s\*&:<>]/,contains:[{begin:"decltype\\(auto\\)",keywords:l,relevance:0},{begin:c,returnBegin:!0,contains:[o],relevance:0},{className:"params",begin:/\(/,end:/\)/,keywords:l,relevance:0,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,i,r,{begin:/\(/,end:/\)/,keywords:l,relevance:0,contains:["self",e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,i,r]}]},r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s]};return{aliases:["c","cc","h","c++","h++","hpp","hh","hxx","cxx"],keywords:l,disableAutodetect:!0,illegal:"</",contains:[].concat(_,u,d,[s,{begin:"\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",end:">",keywords:l,contains:["self",r]},{begin:e.IDENT_RE+"::",keywords:l},{className:"class",beginKeywords:"class struct",end:/[{;:]/,contains:[{begin:/</,end:/>/,contains:["self"]},e.TITLE_MODE]}]),exports:{preprocessor:s,strings:a,keywords:l}}}}());
+hljs.registerLanguage("purebasic",function(e){return{aliases:["pb","pbi"],k:"Align And Array As Break CallDebugger Case CompilerCase CompilerDefault CompilerElse CompilerElseIf CompilerEndIf CompilerEndSelect CompilerError CompilerIf CompilerSelect CompilerWarning Continue Data DataSection Debug DebugLevel Declare DeclareC DeclareCDLL DeclareDLL DeclareModule Default Define Dim DisableASM DisableDebugger DisableExplicit Else ElseIf EnableASM EnableDebugger EnableExplicit End EndDataSection EndDeclareModule EndEnumeration EndIf EndImport EndInterface EndMacro EndModule EndProcedure EndSelect EndStructure EndStructureUnion EndWith Enumeration EnumerationBinary Extends FakeReturn For ForEach ForEver Global Gosub Goto If Import ImportC IncludeBinary IncludeFile IncludePath Interface List Macro MacroExpandedCount Map Module NewList NewMap Next Not Or Procedure ProcedureC ProcedureCDLL ProcedureDLL ProcedureReturn Protected Prototype PrototypeC ReDim Read Repeat Restore Return Runtime Select Shared Static Step Structure StructureUnion Swap Threaded To UndefineMacro Until Until  UnuseModule UseModule Wend While With XIncludeFile XOr",c:[e.C(";","$",{relevance:0}),{cN:"function",b:"\\b(Procedure|Declare)(C|CDLL|DLL)?\\b",e:"\\(",eE:!0,rB:!0,c:[{cN:"keyword",b:"(Procedure|Declare)(C|CDLL|DLL)?",eE:!0},{cN:"type",b:"\\.\\w*"},e.UTM]},{cN:"string",b:'(~)?"',e:'"',i:"\\n"},{cN:"symbol",b:"#[a-zA-Z_]\\w*\\$?"}]}});
+hljs.registerLanguage("autoit",function(e){var t={v:[e.C(";","$",{relevance:0}),e.C("#cs","#ce"),e.C("#comments-start","#comments-end")]},r={b:"\\$[A-z0-9_]+"},i={cN:"string",v:[{b:/"/,e:/"/,c:[{b:/""/,relevance:0}]},{b:/'/,e:/'/,c:[{b:/''/,relevance:0}]}]},l={v:[e.BNM,e.CNM]};return{cI:!0,i:/\/\*/,k:{keyword:"ByRef Case Const ContinueCase ContinueLoop Default Dim Do Else ElseIf EndFunc EndIf EndSelect EndSwitch EndWith Enum Exit ExitLoop For Func Global If In Local Next ReDim Return Select Static Step Switch Then To Until Volatile WEnd While With",built_in:"Abs ACos AdlibRegister AdlibUnRegister Asc AscW ASin Assign ATan AutoItSetOption AutoItWinGetTitle AutoItWinSetTitle Beep Binary BinaryLen BinaryMid BinaryToString BitAND BitNOT BitOR BitRotate BitShift BitXOR BlockInput Break Call CDTray Ceiling Chr ChrW ClipGet ClipPut ConsoleRead ConsoleWrite ConsoleWriteError ControlClick ControlCommand ControlDisable ControlEnable ControlFocus ControlGetFocus ControlGetHandle ControlGetPos ControlGetText ControlHide ControlListView ControlMove ControlSend ControlSetText ControlShow ControlTreeView Cos Dec DirCopy DirCreate DirGetSize DirMove DirRemove DllCall DllCallAddress DllCallbackFree DllCallbackGetPtr DllCallbackRegister DllClose DllOpen DllStructCreate DllStructGetData DllStructGetPtr DllStructGetSize DllStructSetData DriveGetDrive DriveGetFileSystem DriveGetLabel DriveGetSerial DriveGetType DriveMapAdd DriveMapDel DriveMapGet DriveSetLabel DriveSpaceFree DriveSpaceTotal DriveStatus EnvGet EnvSet EnvUpdate Eval Execute Exp FileChangeDir FileClose FileCopy FileCreateNTFSLink FileCreateShortcut FileDelete FileExists FileFindFirstFile FileFindNextFile FileFlush FileGetAttrib FileGetEncoding FileGetLongName FileGetPos FileGetShortcut FileGetShortName FileGetSize FileGetTime FileGetVersion FileInstall FileMove FileOpen FileOpenDialog FileRead FileReadLine FileReadToArray FileRecycle FileRecycleEmpty FileSaveDialog FileSelectFolder FileSetAttrib FileSetEnd FileSetPos FileSetTime FileWrite FileWriteLine Floor FtpSetProxy FuncName GUICreate GUICtrlCreateAvi GUICtrlCreateButton GUICtrlCreateCheckbox GUICtrlCreateCombo GUICtrlCreateContextMenu GUICtrlCreateDate GUICtrlCreateDummy GUICtrlCreateEdit GUICtrlCreateGraphic GUICtrlCreateGroup GUICtrlCreateIcon GUICtrlCreateInput GUICtrlCreateLabel GUICtrlCreateList GUICtrlCreateListView GUICtrlCreateListViewItem GUICtrlCreateMenu GUICtrlCreateMenuItem GUICtrlCreateMonthCal GUICtrlCreateObj GUICtrlCreatePic GUICtrlCreateProgress GUICtrlCreateRadio GUICtrlCreateSlider GUICtrlCreateTab GUICtrlCreateTabItem GUICtrlCreateTreeView GUICtrlCreateTreeViewItem GUICtrlCreateUpdown GUICtrlDelete GUICtrlGetHandle GUICtrlGetState GUICtrlRead GUICtrlRecvMsg GUICtrlRegisterListViewSort GUICtrlSendMsg GUICtrlSendToDummy GUICtrlSetBkColor GUICtrlSetColor GUICtrlSetCursor GUICtrlSetData GUICtrlSetDefBkColor GUICtrlSetDefColor GUICtrlSetFont GUICtrlSetGraphic GUICtrlSetImage GUICtrlSetLimit GUICtrlSetOnEvent GUICtrlSetPos GUICtrlSetResizing GUICtrlSetState GUICtrlSetStyle GUICtrlSetTip GUIDelete GUIGetCursorInfo GUIGetMsg GUIGetStyle GUIRegisterMsg GUISetAccelerators GUISetBkColor GUISetCoord GUISetCursor GUISetFont GUISetHelp GUISetIcon GUISetOnEvent GUISetState GUISetStyle GUIStartGroup GUISwitch Hex HotKeySet HttpSetProxy HttpSetUserAgent HWnd InetClose InetGet InetGetInfo InetGetSize InetRead IniDelete IniRead IniReadSection IniReadSectionNames IniRenameSection IniWrite IniWriteSection InputBox Int IsAdmin IsArray IsBinary IsBool IsDeclared IsDllStruct IsFloat IsFunc IsHWnd IsInt IsKeyword IsNumber IsObj IsPtr IsString Log MemGetStats Mod MouseClick MouseClickDrag MouseDown MouseGetCursor MouseGetPos MouseMove MouseUp MouseWheel MsgBox Number ObjCreate ObjCreateInterface ObjEvent ObjGet ObjName OnAutoItExitRegister OnAutoItExitUnRegister Ping PixelChecksum PixelGetColor PixelSearch ProcessClose ProcessExists ProcessGetStats ProcessList ProcessSetPriority ProcessWait ProcessWaitClose ProgressOff ProgressOn ProgressSet Ptr Random RegDelete RegEnumKey RegEnumVal RegRead RegWrite Round Run RunAs RunAsWait RunWait Send SendKeepActive SetError SetExtended ShellExecute ShellExecuteWait Shutdown Sin Sleep SoundPlay SoundSetWaveVolume SplashImageOn SplashOff SplashTextOn Sqrt SRandom StatusbarGetText StderrRead StdinWrite StdioClose StdoutRead String StringAddCR StringCompare StringFormat StringFromASCIIArray StringInStr StringIsAlNum StringIsAlpha StringIsASCII StringIsDigit StringIsFloat StringIsInt StringIsLower StringIsSpace StringIsUpper StringIsXDigit StringLeft StringLen StringLower StringMid StringRegExp StringRegExpReplace StringReplace StringReverse StringRight StringSplit StringStripCR StringStripWS StringToASCIIArray StringToBinary StringTrimLeft StringTrimRight StringUpper Tan TCPAccept TCPCloseSocket TCPConnect TCPListen TCPNameToIP TCPRecv TCPSend TCPShutdown, UDPShutdown TCPStartup, UDPStartup TimerDiff TimerInit ToolTip TrayCreateItem TrayCreateMenu TrayGetMsg TrayItemDelete TrayItemGetHandle TrayItemGetState TrayItemGetText TrayItemSetOnEvent TrayItemSetState TrayItemSetText TraySetClick TraySetIcon TraySetOnEvent TraySetPauseIcon TraySetState TraySetToolTip TrayTip UBound UDPBind UDPCloseSocket UDPOpen UDPRecv UDPSend VarGetType WinActivate WinActive WinClose WinExists WinFlash WinGetCaretPos WinGetClassList WinGetClientSize WinGetHandle WinGetPos WinGetProcess WinGetState WinGetText WinGetTitle WinKill WinList WinMenuSelectItem WinMinimizeAll WinMinimizeAllUndo WinMove WinSetOnTop WinSetState WinSetTitle WinSetTrans WinWait",literal:"True False And Null Not Or"},c:[t,r,i,l,{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"comments include include-once NoTrayIcon OnAutoItStartRegister pragma compile RequireAdmin"},c:[{b:/\\\n/,relevance:0},{bK:"include",k:{"meta-keyword":"include"},e:"$",c:[i,{cN:"meta-string",v:[{b:"<",e:">"},{b:/"/,e:/"/,c:[{b:/""/,relevance:0}]},{b:/'/,e:/'/,c:[{b:/''/,relevance:0}]}]}]},i,t]},{cN:"symbol",b:"@[A-z0-9_]+"},{cN:"function",bK:"Func",e:"$",i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:[r,i,l]}]}]}});
+hljs.registerLanguage("smali",function(e){var n=["add","and","cmp","cmpg","cmpl","const","div","double","float","goto","if","int","long","move","mul","neg","new","nop","not","or","rem","return","shl","shr","sput","sub","throw","ushr","xor"];return{aliases:["smali"],c:[{cN:"string",b:'"',e:'"',relevance:0},e.C("#","$",{relevance:0}),{cN:"keyword",v:[{b:"\\s*\\.end\\s[a-zA-Z0-9]*"},{b:"^[ ]*\\.[a-zA-Z]*",relevance:0},{b:"\\s:[a-zA-Z_0-9]*",relevance:0},{b:"\\s("+["transient","constructor","abstract","final","synthetic","public","private","protected","static","bridge","system"].join("|")+")"}]},{cN:"built_in",v:[{b:"\\s("+n.join("|")+")\\s"},{b:"\\s("+n.join("|")+")((\\-|/)[a-zA-Z0-9]+)+\\s",relevance:10},{b:"\\s("+["aget","aput","array","check","execute","fill","filled","goto/16","goto/32","iget","instance","invoke","iput","monitor","packed","sget","sparse"].join("|")+")((\\-|/)[a-zA-Z0-9]+)*\\s",relevance:10}]},{cN:"class",b:"L[^(;:\n]*;",relevance:0},{b:"[vp][0-9]+"}]}});
+hljs.registerLanguage("nimrod",function(t){return{aliases:["nim"],k:{keyword:"addr and as asm bind block break case cast const continue converter discard distinct div do elif else end enum except export finally for from generic if import in include interface is isnot iterator let macro method mixin mod nil not notin object of or out proc ptr raise ref return shl shr static template try tuple type using var when while with without xor yield",literal:"shared guarded stdin stdout stderr result true false",built_in:"int int8 int16 int32 int64 uint uint8 uint16 uint32 uint64 float float32 float64 bool char string cstring pointer expr stmt void auto any range array openarray varargs seq set clong culong cchar cschar cshort cint csize clonglong cfloat cdouble clongdouble cuchar cushort cuint culonglong cstringarray semistatic"},c:[{cN:"meta",b:/{\./,e:/\.}/,relevance:10},{cN:"string",b:/[a-zA-Z]\w*"/,e:/"/,c:[{b:/""/}]},{cN:"string",b:/([a-zA-Z]\w*)?"""/,e:/"""/},t.QSM,{cN:"type",b:/\b[A-Z]\w+\b/,relevance:0},{cN:"number",relevance:0,v:[{b:/\b(0[xX][0-9a-fA-F][_0-9a-fA-F]*)('?[iIuU](8|16|32|64))?/},{b:/\b(0o[0-7][_0-7]*)('?[iIuUfF](8|16|32|64))?/},{b:/\b(0(b|B)[01][_01]*)('?[iIuUfF](8|16|32|64))?/},{b:/\b(\d[_\d]*)('?[iIuUfF](8|16|32|64))?/}]},t.HCM]}});
+hljs.registerLanguage("bnf",function(e){return{c:[{cN:"attribute",b:/</,e:/>/},{b:/::=/,starts:{e:/$/,c:[{b:/</,e:/>/},e.CLCM,e.CBCM,e.ASM,e.QSM]}}]}});
+hljs.registerLanguage("haskell",function(e){var i={v:[e.C("--","$"),e.C("{-","-}",{c:["self"]})]},a={cN:"meta",b:"{-#",e:"#-}"},l={cN:"meta",b:"^#",e:"$"},c={cN:"type",b:"\\b[A-Z][\\w']*",relevance:0},n={b:"\\(",e:"\\)",i:'"',c:[a,l,{cN:"type",b:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},e.inherit(e.TM,{b:"[_a-z][\\w']*"}),i]};return{aliases:["hs"],k:"let in if then else case of where do module import hiding qualified type data newtype deriving class instance as default infix infixl infixr foreign export ccall stdcall cplusplus jvm dotnet safe unsafe family forall mdo proc rec",c:[{bK:"module",e:"where",k:"module where",c:[n,i],i:"\\W\\.|;"},{b:"\\bimport\\b",e:"$",k:"import qualified as hiding",c:[n,i],i:"\\W\\.|;"},{cN:"class",b:"^(\\s*)?(class|instance)\\b",e:"where",k:"class family instance where",c:[c,n,i]},{cN:"class",b:"\\b(data|(new)?type)\\b",e:"$",k:"data family type newtype deriving",c:[a,c,n,{b:"{",e:"}",c:n.c},i]},{bK:"default",e:"$",c:[c,n,i]},{bK:"infix infixl infixr",e:"$",c:[e.CNM,i]},{b:"\\bforeign\\b",e:"$",k:"foreign import export ccall stdcall cplusplus jvm dotnet safe unsafe",c:[c,e.QSM,i]},{cN:"meta",b:"#!\\/usr\\/bin\\/env runhaskell",e:"$"},a,l,e.QSM,e.CNM,c,e.inherit(e.TM,{b:"^[_a-z][\\w']*"}),i,{b:"->|<-"}]}});
+hljs.registerLanguage("ceylon",function(e){var a="assembly module package import alias class interface object given value assign void function new of extends satisfies abstracts in out return break continue throw assert dynamic if else switch case for while try catch finally then let this outer super is exists nonempty",t={cN:"subst",eB:!0,eE:!0,b:/``/,e:/``/,k:a,relevance:10},s=[{cN:"string",b:'"""',e:'"""',relevance:10},{cN:"string",b:'"',e:'"',c:[t]},{cN:"string",b:"'",e:"'"},{cN:"number",b:"#[0-9a-fA-F_]+|\\$[01_]+|[0-9_]+(?:\\.[0-9_](?:[eE][+-]?\\d+)?)?[kMGTPmunpf]?",relevance:0}];return t.c=s,{k:{keyword:a+" shared abstract formal default actual variable late native deprecatedfinal sealed annotation suppressWarnings small",meta:"doc by license see throws tagged"},i:"\\$[^01]|#[^0-9a-fA-F]",c:[e.CLCM,e.C("/\\*","\\*/",{c:["self"]}),{cN:"meta",b:'@[a-z]\\w*(?:\\:"[^"]*")?'}].concat(s)}});
+hljs.registerLanguage("haxe",function(e){return{aliases:["hx"],k:{keyword:"break case cast catch continue default do dynamic else enum extern for function here if import in inline never new override package private get set public return static super switch this throw trace try typedef untyped using var while Int Float String Bool Dynamic Void Array ",built_in:"trace this",literal:"true false null _"},c:[{cN:"string",b:"'",e:"'",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"},{cN:"subst",b:"\\$",e:"\\W}"}]},e.QSM,e.CLCM,e.CBCM,e.CNM,{cN:"meta",b:"@:",e:"$"},{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elseif end error"}},{cN:"type",b:":[ \t]*",e:"[^A-Za-z0-9_ \t\\->]",eB:!0,eE:!0,relevance:0},{cN:"type",b:":[ \t]*",e:"\\W",eB:!0,eE:!0},{cN:"type",b:"new *",e:"\\W",eB:!0,eE:!0},{cN:"class",bK:"enum",e:"\\{",c:[e.TM]},{cN:"class",bK:"abstract",e:"[\\{$]",c:[{cN:"type",b:"\\(",e:"\\)",eB:!0,eE:!0},{cN:"type",b:"from +",e:"\\W",eB:!0,eE:!0},{cN:"type",b:"to +",e:"\\W",eB:!0,eE:!0},e.TM],k:{keyword:"abstract from to"}},{cN:"class",b:"\\b(class|interface) +",e:"[\\{$]",eE:!0,k:"class interface",c:[{cN:"keyword",b:"\\b(extends|implements) +",k:"extends implements",c:[{cN:"type",b:e.IR,relevance:0}]},e.TM]},{cN:"function",bK:"function",e:"\\(",eE:!0,i:"\\S",c:[e.TM]}],i:/<\//}});
+hljs.registerLanguage("angelscript",function(e){var i={cN:"built_in",b:"\\b(void|bool|int|int8|int16|int32|int64|uint|uint8|uint16|uint32|uint64|string|ref|array|double|float|auto|dictionary)"},t={cN:"symbol",b:"[a-zA-Z0-9_]+@"},n={cN:"keyword",b:"<",e:">",c:[i,t]};return i.c=[n],t.c=[n],{aliases:["asc"],k:"for in|0 break continue while do|0 return if else case switch namespace is cast or and xor not get|0 in inout|10 out override set|0 private public const default|0 final shared external mixin|10 enum typedef funcdef this super import from interface abstract|0 try catch protected explicit property",i:"(^using\\s+[A-Za-z0-9_\\.]+;$|\\bfunctions*[^\\(])",c:[{cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE],relevance:0},{cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE],relevance:0},{cN:"string",b:'"""',e:'"""'},e.CLCM,e.CBCM,{bK:"interface namespace",e:"{",i:"[;.\\-]",c:[{cN:"symbol",b:"[a-zA-Z0-9_]+"}]},{bK:"class",e:"{",i:"[;.\\-]",c:[{cN:"symbol",b:"[a-zA-Z0-9_]+",c:[{b:"[:,]\\s*",c:[{cN:"symbol",b:"[a-zA-Z0-9_]+"}]}]}]},i,t,{cN:"literal",b:"\\b(null|true|false)"},{cN:"number",b:"(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?f?|\\.\\d+f?)([eE][-+]?\\d+f?)?)"}]}});
+hljs.registerLanguage("powershell",function(e){var t={keyword:"if else foreach return do while until elseif begin for trap data dynamicparam end break throw param continue finally in switch exit filter try process catch hidden static parameter"},n={b:"`[\\s\\S]",relevance:0},c={cN:"variable",v:[{b:/\$\B/},{cN:"keyword",b:/\$this/},{b:/\$[\w\d][\w\d_:]*/}]},i={cN:"string",v:[{b:/"/,e:/"/},{b:/@"/,e:/^"@/}],c:[n,c,{cN:"variable",b:/\$[A-z]/,e:/[^A-z]/}]},a={cN:"string",v:[{b:/'/,e:/'/},{b:/@'/,e:/^'@/}]},r=e.inherit(e.C(null,null),{v:[{b:/#/,e:/$/},{b:/<#/,e:/#>/}],c:[{cN:"doctag",v:[{b:/\.(synopsis|description|example|inputs|outputs|notes|link|component|role|functionality)/},{b:/\.(parameter|forwardhelptargetname|forwardhelpcategory|remotehelprunspace|externalhelp)\s+\S+/}]}]}),o={cN:"built_in",v:[{b:"(".concat("Add|Clear|Close|Copy|Enter|Exit|Find|Format|Get|Hide|Join|Lock|Move|New|Open|Optimize|Pop|Push|Redo|Remove|Rename|Reset|Resize|Search|Select|Set|Show|Skip|Split|Step|Switch|Undo|Unlock|Watch|Backup|Checkpoint|Compare|Compress|Convert|ConvertFrom|ConvertTo|Dismount|Edit|Expand|Export|Group|Import|Initialize|Limit|Merge|New|Out|Publish|Restore|Save|Sync|Unpublish|Update|Approve|Assert|Complete|Confirm|Deny|Disable|Enable|Install|Invoke|Register|Request|Restart|Resume|Start|Stop|Submit|Suspend|Uninstall|Unregister|Wait|Debug|Measure|Ping|Repair|Resolve|Test|Trace|Connect|Disconnect|Read|Receive|Send|Write|Block|Grant|Protect|Revoke|Unblock|Unprotect|Use|ForEach|Sort|Tee|Where",")+(-)[\\w\\d]+")}]},l={cN:"class",bK:"class enum",e:/\s*[{]/,eE:!0,relevance:0,c:[e.TM]},s={cN:"function",b:/function\s+/,e:/\s*\{|$/,eE:!0,rB:!0,relevance:0,c:[{b:"function",relevance:0,cN:"keyword"},{cN:"title",b:/\w[\w\d]*((-)[\w\d]+)*/,relevance:0},{b:/\(/,e:/\)/,cN:"params",relevance:0,c:[c]}]},p={b:/using\s/,e:/$/,rB:!0,c:[i,a,{cN:"keyword",b:/(using|assembly|command|module|namespace|type)/}]},b={v:[{cN:"operator",b:"(".concat("-and|-as|-band|-bnot|-bor|-bxor|-casesensitive|-ccontains|-ceq|-cge|-cgt|-cle|-clike|-clt|-cmatch|-cne|-cnotcontains|-cnotlike|-cnotmatch|-contains|-creplace|-csplit|-eq|-exact|-f|-file|-ge|-gt|-icontains|-ieq|-ige|-igt|-ile|-ilike|-ilt|-imatch|-in|-ine|-inotcontains|-inotlike|-inotmatch|-ireplace|-is|-isnot|-isplit|-join|-le|-like|-lt|-match|-ne|-not|-notcontains|-notin|-notlike|-notmatch|-or|-regex|-replace|-shl|-shr|-split|-wildcard|-xor",")\\b")},{cN:"literal",b:/(-)[\w\d]+/,relevance:0}]},d={cN:"function",b:/\[.*\]\s*[\w]+[ ]??\(/,e:/$/,rB:!0,relevance:0,c:[{cN:"keyword",b:"(".concat(t.keyword.toString().replace(/\s/g,"|"),")\\b"),endsParent:!0,relevance:0},e.inherit(e.TM,{endsParent:!0})]},u=[d,r,n,e.NM,i,a,o,c,{cN:"literal",b:/\$(null|true|false)\b/},{cN:"selector-tag",b:/\@\B/,relevance:0}],m={b:/\[/,e:/\]/,eB:!0,eE:!0,relevance:0,c:[].concat("self",u,{b:"("+["string","char","byte","int","long","bool","decimal","single","double","DateTime","xml","array","hashtable","void"].join("|")+")",cN:"built_in",relevance:0},{cN:"type",b:/[\.\w\d]+/,relevance:0})};return d.c.unshift(m),{aliases:["ps","ps1"],l:/-?[A-z\.\-]+/,cI:!0,k:t,c:u.concat(l,s,p,b,m)}});
+hljs.registerLanguage("hsp",function(e){return{cI:!0,l:/[\w\._]+/,k:"goto gosub return break repeat loop continue wait await dim sdim foreach dimtype dup dupptr end stop newmod delmod mref run exgoto on mcall assert logmes newlab resume yield onexit onerror onkey onclick oncmd exist delete mkdir chdir dirlist bload bsave bcopy memfile if else poke wpoke lpoke getstr chdpm memexpand memcpy memset notesel noteadd notedel noteload notesave randomize noteunsel noteget split strrep setease button chgdisp exec dialog mmload mmplay mmstop mci pset pget syscolor mes print title pos circle cls font sysfont objsize picload color palcolor palette redraw width gsel gcopy gzoom gmode bmpsave hsvcolor getkey listbox chkbox combox input mesbox buffer screen bgscr mouse objsel groll line clrobj boxf objprm objmode stick grect grotate gsquare gradf objimage objskip objenable celload celdiv celput newcom querycom delcom cnvstow comres axobj winobj sendmsg comevent comevarg sarrayconv callfunc cnvwtos comevdisp libptr system hspstat hspver stat cnt err strsize looplev sublev iparam wparam lparam refstr refdval int rnd strlen length length2 length3 length4 vartype gettime peek wpeek lpeek varptr varuse noteinfo instr abs limit getease str strmid strf getpath strtrim sin cos tan atan sqrt double absf expf logf limitf powf geteasef mousex mousey mousew hwnd hinstance hdc ginfo objinfo dirinfo sysinfo thismod __hspver__ __hsp30__ __date__ __time__ __line__ __file__ _debug __hspdef__ and or xor not screen_normal screen_palette screen_hide screen_fixedsize screen_tool screen_frame gmode_gdi gmode_mem gmode_rgb0 gmode_alpha gmode_rgb0alpha gmode_add gmode_sub gmode_pixela ginfo_mx ginfo_my ginfo_act ginfo_sel ginfo_wx1 ginfo_wy1 ginfo_wx2 ginfo_wy2 ginfo_vx ginfo_vy ginfo_sizex ginfo_sizey ginfo_winx ginfo_winy ginfo_mesx ginfo_mesy ginfo_r ginfo_g ginfo_b ginfo_paluse ginfo_dispx ginfo_dispy ginfo_cx ginfo_cy ginfo_intid ginfo_newid ginfo_sx ginfo_sy objinfo_mode objinfo_bmscr objinfo_hwnd notemax notesize dir_cur dir_exe dir_win dir_sys dir_cmdline dir_desktop dir_mydoc dir_tv font_normal font_bold font_italic font_underline font_strikeout font_antialias objmode_normal objmode_guifont objmode_usefont gsquare_grad msgothic msmincho do until while wend for next _break _continue switch case default swbreak swend ddim ldim alloc m_pi rad2deg deg2rad ease_linear ease_quad_in ease_quad_out ease_quad_inout ease_cubic_in ease_cubic_out ease_cubic_inout ease_quartic_in ease_quartic_out ease_quartic_inout ease_bounce_in ease_bounce_out ease_bounce_inout ease_shake_in ease_shake_out ease_shake_inout ease_loop",c:[e.CLCM,e.CBCM,e.QSM,e.ASM,{cN:"string",b:'{"',e:'"}',c:[e.BE]},e.C(";","$",{relevance:0}),{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"addion cfunc cmd cmpopt comfunc const defcfunc deffunc define else endif enum epack func global if ifdef ifndef include modcfunc modfunc modinit modterm module pack packopt regcmd runtime undef usecom uselib"},c:[e.inherit(e.QSM,{cN:"meta-string"}),e.NM,e.CNM,e.CLCM,e.CBCM]},{cN:"symbol",b:"^\\*(\\w+|@)"},e.NM,e.CNM]}});
+hljs.registerLanguage("pgsql",function(E){var T=E.C("--","$"),N="BIGINT INT8 BIGSERIAL SERIAL8 BIT VARYING VARBIT BOOLEAN BOOL BOX BYTEA CHARACTER CHAR VARCHAR CIDR CIRCLE DATE DOUBLE PRECISION FLOAT8 FLOAT INET INTEGER INT INT4 INTERVAL JSON JSONB LINE LSEG|10 MACADDR MACADDR8 MONEY NUMERIC DEC DECIMAL PATH POINT POLYGON REAL FLOAT4 SMALLINT INT2 SMALLSERIAL|10 SERIAL2|10 SERIAL|10 SERIAL4|10 TEXT TIME ZONE TIMETZ|10 TIMESTAMP TIMESTAMPTZ|10 TSQUERY|10 TSVECTOR|10 TXID_SNAPSHOT|10 UUID XML NATIONAL NCHAR INT4RANGE|10 INT8RANGE|10 NUMRANGE|10 TSRANGE|10 TSTZRANGE|10 DATERANGE|10 ANYELEMENT ANYARRAY ANYNONARRAY ANYENUM ANYRANGE CSTRING INTERNAL RECORD PG_DDL_COMMAND VOID UNKNOWN OPAQUE REFCURSOR NAME OID REGPROC|10 REGPROCEDURE|10 REGOPER|10 REGOPERATOR|10 REGCLASS|10 REGTYPE|10 REGROLE|10 REGNAMESPACE|10 REGCONFIG|10 REGDICTIONARY|10 ",A=N.trim().split(" ").map(function(E){return E.split("|")[0]}).join("|"),R="ARRAY_AGG AVG BIT_AND BIT_OR BOOL_AND BOOL_OR COUNT EVERY JSON_AGG JSONB_AGG JSON_OBJECT_AGG JSONB_OBJECT_AGG MAX MIN MODE STRING_AGG SUM XMLAGG CORR COVAR_POP COVAR_SAMP REGR_AVGX REGR_AVGY REGR_COUNT REGR_INTERCEPT REGR_R2 REGR_SLOPE REGR_SXX REGR_SXY REGR_SYY STDDEV STDDEV_POP STDDEV_SAMP VARIANCE VAR_POP VAR_SAMP PERCENTILE_CONT PERCENTILE_DISC ROW_NUMBER RANK DENSE_RANK PERCENT_RANK CUME_DIST NTILE LAG LEAD FIRST_VALUE LAST_VALUE NTH_VALUE NUM_NONNULLS NUM_NULLS ABS CBRT CEIL CEILING DEGREES DIV EXP FLOOR LN LOG MOD PI POWER RADIANS ROUND SCALE SIGN SQRT TRUNC WIDTH_BUCKET RANDOM SETSEED ACOS ACOSD ASIN ASIND ATAN ATAND ATAN2 ATAN2D COS COSD COT COTD SIN SIND TAN TAND BIT_LENGTH CHAR_LENGTH CHARACTER_LENGTH LOWER OCTET_LENGTH OVERLAY POSITION SUBSTRING TREAT TRIM UPPER ASCII BTRIM CHR CONCAT CONCAT_WS CONVERT CONVERT_FROM CONVERT_TO DECODE ENCODE INITCAPLEFT LENGTH LPAD LTRIM MD5 PARSE_IDENT PG_CLIENT_ENCODING QUOTE_IDENT|10 QUOTE_LITERAL|10 QUOTE_NULLABLE|10 REGEXP_MATCH REGEXP_MATCHES REGEXP_REPLACE REGEXP_SPLIT_TO_ARRAY REGEXP_SPLIT_TO_TABLE REPEAT REPLACE REVERSE RIGHT RPAD RTRIM SPLIT_PART STRPOS SUBSTR TO_ASCII TO_HEX TRANSLATE OCTET_LENGTH GET_BIT GET_BYTE SET_BIT SET_BYTE TO_CHAR TO_DATE TO_NUMBER TO_TIMESTAMP AGE CLOCK_TIMESTAMP|10 DATE_PART DATE_TRUNC ISFINITE JUSTIFY_DAYS JUSTIFY_HOURS JUSTIFY_INTERVAL MAKE_DATE MAKE_INTERVAL|10 MAKE_TIME MAKE_TIMESTAMP|10 MAKE_TIMESTAMPTZ|10 NOW STATEMENT_TIMESTAMP|10 TIMEOFDAY TRANSACTION_TIMESTAMP|10 ENUM_FIRST ENUM_LAST ENUM_RANGE AREA CENTER DIAMETER HEIGHT ISCLOSED ISOPEN NPOINTS PCLOSE POPEN RADIUS WIDTH BOX BOUND_BOX CIRCLE LINE LSEG PATH POLYGON ABBREV BROADCAST HOST HOSTMASK MASKLEN NETMASK NETWORK SET_MASKLEN TEXT INET_SAME_FAMILYINET_MERGE MACADDR8_SET7BIT ARRAY_TO_TSVECTOR GET_CURRENT_TS_CONFIG NUMNODE PLAINTO_TSQUERY PHRASETO_TSQUERY WEBSEARCH_TO_TSQUERY QUERYTREE SETWEIGHT STRIP TO_TSQUERY TO_TSVECTOR JSON_TO_TSVECTOR JSONB_TO_TSVECTOR TS_DELETE TS_FILTER TS_HEADLINE TS_RANK TS_RANK_CD TS_REWRITE TSQUERY_PHRASE TSVECTOR_TO_ARRAY TSVECTOR_UPDATE_TRIGGER TSVECTOR_UPDATE_TRIGGER_COLUMN XMLCOMMENT XMLCONCAT XMLELEMENT XMLFOREST XMLPI XMLROOT XMLEXISTS XML_IS_WELL_FORMED XML_IS_WELL_FORMED_DOCUMENT XML_IS_WELL_FORMED_CONTENT XPATH XPATH_EXISTS XMLTABLE XMLNAMESPACES TABLE_TO_XML TABLE_TO_XMLSCHEMA TABLE_TO_XML_AND_XMLSCHEMA QUERY_TO_XML QUERY_TO_XMLSCHEMA QUERY_TO_XML_AND_XMLSCHEMA CURSOR_TO_XML CURSOR_TO_XMLSCHEMA SCHEMA_TO_XML SCHEMA_TO_XMLSCHEMA SCHEMA_TO_XML_AND_XMLSCHEMA DATABASE_TO_XML DATABASE_TO_XMLSCHEMA DATABASE_TO_XML_AND_XMLSCHEMA XMLATTRIBUTES TO_JSON TO_JSONB ARRAY_TO_JSON ROW_TO_JSON JSON_BUILD_ARRAY JSONB_BUILD_ARRAY JSON_BUILD_OBJECT JSONB_BUILD_OBJECT JSON_OBJECT JSONB_OBJECT JSON_ARRAY_LENGTH JSONB_ARRAY_LENGTH JSON_EACH JSONB_EACH JSON_EACH_TEXT JSONB_EACH_TEXT JSON_EXTRACT_PATH JSONB_EXTRACT_PATH JSON_OBJECT_KEYS JSONB_OBJECT_KEYS JSON_POPULATE_RECORD JSONB_POPULATE_RECORD JSON_POPULATE_RECORDSET JSONB_POPULATE_RECORDSET JSON_ARRAY_ELEMENTS JSONB_ARRAY_ELEMENTS JSON_ARRAY_ELEMENTS_TEXT JSONB_ARRAY_ELEMENTS_TEXT JSON_TYPEOF JSONB_TYPEOF JSON_TO_RECORD JSONB_TO_RECORD JSON_TO_RECORDSET JSONB_TO_RECORDSET JSON_STRIP_NULLS JSONB_STRIP_NULLS JSONB_SET JSONB_INSERT JSONB_PRETTY CURRVAL LASTVAL NEXTVAL SETVAL COALESCE NULLIF GREATEST LEAST ARRAY_APPEND ARRAY_CAT ARRAY_NDIMS ARRAY_DIMS ARRAY_FILL ARRAY_LENGTH ARRAY_LOWER ARRAY_POSITION ARRAY_POSITIONS ARRAY_PREPEND ARRAY_REMOVE ARRAY_REPLACE ARRAY_TO_STRING ARRAY_UPPER CARDINALITY STRING_TO_ARRAY UNNEST ISEMPTY LOWER_INC UPPER_INC LOWER_INF UPPER_INF RANGE_MERGE GENERATE_SERIES GENERATE_SUBSCRIPTS CURRENT_DATABASE CURRENT_QUERY CURRENT_SCHEMA|10 CURRENT_SCHEMAS|10 INET_CLIENT_ADDR INET_CLIENT_PORT INET_SERVER_ADDR INET_SERVER_PORT ROW_SECURITY_ACTIVE FORMAT_TYPE TO_REGCLASS TO_REGPROC TO_REGPROCEDURE TO_REGOPER TO_REGOPERATOR TO_REGTYPE TO_REGNAMESPACE TO_REGROLE COL_DESCRIPTION OBJ_DESCRIPTION SHOBJ_DESCRIPTION TXID_CURRENT TXID_CURRENT_IF_ASSIGNED TXID_CURRENT_SNAPSHOT TXID_SNAPSHOT_XIP TXID_SNAPSHOT_XMAX TXID_SNAPSHOT_XMIN TXID_VISIBLE_IN_SNAPSHOT TXID_STATUS CURRENT_SETTING SET_CONFIG BRIN_SUMMARIZE_NEW_VALUES BRIN_SUMMARIZE_RANGE BRIN_DESUMMARIZE_RANGE GIN_CLEAN_PENDING_LIST SUPPRESS_REDUNDANT_UPDATES_TRIGGER LO_FROM_BYTEA LO_PUT LO_GET LO_CREAT LO_CREATE LO_UNLINK LO_IMPORT LO_EXPORT LOREAD LOWRITE GROUPING CAST ".trim().split(" ").map(function(E){return E.split("|")[0]}).join("|");return{aliases:["postgres","postgresql"],cI:!0,k:{keyword:"ABORT ALTER ANALYZE BEGIN CALL CHECKPOINT|10 CLOSE CLUSTER COMMENT COMMIT COPY CREATE DEALLOCATE DECLARE DELETE DISCARD DO DROP END EXECUTE EXPLAIN FETCH GRANT IMPORT INSERT LISTEN LOAD LOCK MOVE NOTIFY PREPARE REASSIGN|10 REFRESH REINDEX RELEASE RESET REVOKE ROLLBACK SAVEPOINT SECURITY SELECT SET SHOW START TRUNCATE UNLISTEN|10 UPDATE VACUUM|10 VALUES AGGREGATE COLLATION CONVERSION|10 DATABASE DEFAULT PRIVILEGES DOMAIN TRIGGER EXTENSION FOREIGN WRAPPER|10 TABLE FUNCTION GROUP LANGUAGE LARGE OBJECT MATERIALIZED VIEW OPERATOR CLASS FAMILY POLICY PUBLICATION|10 ROLE RULE SCHEMA SEQUENCE SERVER STATISTICS SUBSCRIPTION SYSTEM TABLESPACE CONFIGURATION DICTIONARY PARSER TEMPLATE TYPE USER MAPPING PREPARED ACCESS METHOD CAST AS TRANSFORM TRANSACTION OWNED TO INTO SESSION AUTHORIZATION INDEX PROCEDURE ASSERTION ALL ANALYSE AND ANY ARRAY ASC ASYMMETRIC|10 BOTH CASE CHECK COLLATE COLUMN CONCURRENTLY|10 CONSTRAINT CROSS DEFERRABLE RANGE DESC DISTINCT ELSE EXCEPT FOR FREEZE|10 FROM FULL HAVING ILIKE IN INITIALLY INNER INTERSECT IS ISNULL JOIN LATERAL LEADING LIKE LIMIT NATURAL NOT NOTNULL NULL OFFSET ON ONLY OR ORDER OUTER OVERLAPS PLACING PRIMARY REFERENCES RETURNING SIMILAR SOME SYMMETRIC TABLESAMPLE THEN TRAILING UNION UNIQUE USING VARIADIC|10 VERBOSE WHEN WHERE WINDOW WITH BY RETURNS INOUT OUT SETOF|10 IF STRICT CURRENT CONTINUE OWNER LOCATION OVER PARTITION WITHIN BETWEEN ESCAPE EXTERNAL INVOKER DEFINER WORK RENAME VERSION CONNECTION CONNECT TABLES TEMP TEMPORARY FUNCTIONS SEQUENCES TYPES SCHEMAS OPTION CASCADE RESTRICT ADD ADMIN EXISTS VALID VALIDATE ENABLE DISABLE REPLICA|10 ALWAYS PASSING COLUMNS PATH REF VALUE OVERRIDING IMMUTABLE STABLE VOLATILE BEFORE AFTER EACH ROW PROCEDURAL ROUTINE NO HANDLER VALIDATOR OPTIONS STORAGE OIDS|10 WITHOUT INHERIT DEPENDS CALLED INPUT LEAKPROOF|10 COST ROWS NOWAIT SEARCH UNTIL ENCRYPTED|10 PASSWORD CONFLICT|10 INSTEAD INHERITS CHARACTERISTICS WRITE CURSOR ALSO STATEMENT SHARE EXCLUSIVE INLINE ISOLATION REPEATABLE READ COMMITTED SERIALIZABLE UNCOMMITTED LOCAL GLOBAL SQL PROCEDURES RECURSIVE SNAPSHOT ROLLUP CUBE TRUSTED|10 INCLUDE FOLLOWING PRECEDING UNBOUNDED RANGE GROUPS UNENCRYPTED|10 SYSID FORMAT DELIMITER HEADER QUOTE ENCODING FILTER OFF FORCE_QUOTE FORCE_NOT_NULL FORCE_NULL COSTS BUFFERS TIMING SUMMARY DISABLE_PAGE_SKIPPING RESTART CYCLE GENERATED IDENTITY DEFERRED IMMEDIATE LEVEL LOGGED UNLOGGED OF NOTHING NONE EXCLUDE ATTRIBUTE USAGE ROUTINES TRUE FALSE NAN INFINITY ALIAS BEGIN CONSTANT DECLARE END EXCEPTION RETURN PERFORM|10 RAISE GET DIAGNOSTICS STACKED|10 FOREACH LOOP ELSIF EXIT WHILE REVERSE SLICE DEBUG LOG INFO NOTICE WARNING ASSERT OPEN SUPERUSER NOSUPERUSER CREATEDB NOCREATEDB CREATEROLE NOCREATEROLE INHERIT NOINHERIT LOGIN NOLOGIN REPLICATION NOREPLICATION BYPASSRLS NOBYPASSRLS ",built_in:"CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER CURRENT_CATALOG|10 CURRENT_DATE LOCALTIME LOCALTIMESTAMP CURRENT_ROLE|10 CURRENT_SCHEMA|10 SESSION_USER PUBLIC FOUND NEW OLD TG_NAME|10 TG_WHEN|10 TG_LEVEL|10 TG_OP|10 TG_RELID|10 TG_RELNAME|10 TG_TABLE_NAME|10 TG_TABLE_SCHEMA|10 TG_NARGS|10 TG_ARGV|10 TG_EVENT|10 TG_TAG|10 ROW_COUNT RESULT_OID|10 PG_CONTEXT|10 RETURNED_SQLSTATE COLUMN_NAME CONSTRAINT_NAME PG_DATATYPE_NAME|10 MESSAGE_TEXT TABLE_NAME SCHEMA_NAME PG_EXCEPTION_DETAIL|10 PG_EXCEPTION_HINT|10 PG_EXCEPTION_CONTEXT|10 SQLSTATE SQLERRM|10 SUCCESSFUL_COMPLETION WARNING DYNAMIC_RESULT_SETS_RETURNED IMPLICIT_ZERO_BIT_PADDING NULL_VALUE_ELIMINATED_IN_SET_FUNCTION PRIVILEGE_NOT_GRANTED PRIVILEGE_NOT_REVOKED STRING_DATA_RIGHT_TRUNCATION DEPRECATED_FEATURE NO_DATA NO_ADDITIONAL_DYNAMIC_RESULT_SETS_RETURNED SQL_STATEMENT_NOT_YET_COMPLETE CONNECTION_EXCEPTION CONNECTION_DOES_NOT_EXIST CONNECTION_FAILURE SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION SQLSERVER_REJECTED_ESTABLISHMENT_OF_SQLCONNECTION TRANSACTION_RESOLUTION_UNKNOWN PROTOCOL_VIOLATION TRIGGERED_ACTION_EXCEPTION FEATURE_NOT_SUPPORTED INVALID_TRANSACTION_INITIATION LOCATOR_EXCEPTION INVALID_LOCATOR_SPECIFICATION INVALID_GRANTOR INVALID_GRANT_OPERATION INVALID_ROLE_SPECIFICATION DIAGNOSTICS_EXCEPTION STACKED_DIAGNOSTICS_ACCESSED_WITHOUT_ACTIVE_HANDLER CASE_NOT_FOUND CARDINALITY_VIOLATION DATA_EXCEPTION ARRAY_SUBSCRIPT_ERROR CHARACTER_NOT_IN_REPERTOIRE DATETIME_FIELD_OVERFLOW DIVISION_BY_ZERO ERROR_IN_ASSIGNMENT ESCAPE_CHARACTER_CONFLICT INDICATOR_OVERFLOW INTERVAL_FIELD_OVERFLOW INVALID_ARGUMENT_FOR_LOGARITHM INVALID_ARGUMENT_FOR_NTILE_FUNCTION INVALID_ARGUMENT_FOR_NTH_VALUE_FUNCTION INVALID_ARGUMENT_FOR_POWER_FUNCTION INVALID_ARGUMENT_FOR_WIDTH_BUCKET_FUNCTION INVALID_CHARACTER_VALUE_FOR_CAST INVALID_DATETIME_FORMAT INVALID_ESCAPE_CHARACTER INVALID_ESCAPE_OCTET INVALID_ESCAPE_SEQUENCE NONSTANDARD_USE_OF_ESCAPE_CHARACTER INVALID_INDICATOR_PARAMETER_VALUE INVALID_PARAMETER_VALUE INVALID_REGULAR_EXPRESSION INVALID_ROW_COUNT_IN_LIMIT_CLAUSE INVALID_ROW_COUNT_IN_RESULT_OFFSET_CLAUSE INVALID_TABLESAMPLE_ARGUMENT INVALID_TABLESAMPLE_REPEAT INVALID_TIME_ZONE_DISPLACEMENT_VALUE INVALID_USE_OF_ESCAPE_CHARACTER MOST_SPECIFIC_TYPE_MISMATCH NULL_VALUE_NOT_ALLOWED NULL_VALUE_NO_INDICATOR_PARAMETER NUMERIC_VALUE_OUT_OF_RANGE SEQUENCE_GENERATOR_LIMIT_EXCEEDED STRING_DATA_LENGTH_MISMATCH STRING_DATA_RIGHT_TRUNCATION SUBSTRING_ERROR TRIM_ERROR UNTERMINATED_C_STRING ZERO_LENGTH_CHARACTER_STRING FLOATING_POINT_EXCEPTION INVALID_TEXT_REPRESENTATION INVALID_BINARY_REPRESENTATION BAD_COPY_FILE_FORMAT UNTRANSLATABLE_CHARACTER NOT_AN_XML_DOCUMENT INVALID_XML_DOCUMENT INVALID_XML_CONTENT INVALID_XML_COMMENT INVALID_XML_PROCESSING_INSTRUCTION INTEGRITY_CONSTRAINT_VIOLATION RESTRICT_VIOLATION NOT_NULL_VIOLATION FOREIGN_KEY_VIOLATION UNIQUE_VIOLATION CHECK_VIOLATION EXCLUSION_VIOLATION INVALID_CURSOR_STATE INVALID_TRANSACTION_STATE ACTIVE_SQL_TRANSACTION BRANCH_TRANSACTION_ALREADY_ACTIVE HELD_CURSOR_REQUIRES_SAME_ISOLATION_LEVEL INAPPROPRIATE_ACCESS_MODE_FOR_BRANCH_TRANSACTION INAPPROPRIATE_ISOLATION_LEVEL_FOR_BRANCH_TRANSACTION NO_ACTIVE_SQL_TRANSACTION_FOR_BRANCH_TRANSACTION READ_ONLY_SQL_TRANSACTION SCHEMA_AND_DATA_STATEMENT_MIXING_NOT_SUPPORTED NO_ACTIVE_SQL_TRANSACTION IN_FAILED_SQL_TRANSACTION IDLE_IN_TRANSACTION_SESSION_TIMEOUT INVALID_SQL_STATEMENT_NAME TRIGGERED_DATA_CHANGE_VIOLATION INVALID_AUTHORIZATION_SPECIFICATION INVALID_PASSWORD DEPENDENT_PRIVILEGE_DESCRIPTORS_STILL_EXIST DEPENDENT_OBJECTS_STILL_EXIST INVALID_TRANSACTION_TERMINATION SQL_ROUTINE_EXCEPTION FUNCTION_EXECUTED_NO_RETURN_STATEMENT MODIFYING_SQL_DATA_NOT_PERMITTED PROHIBITED_SQL_STATEMENT_ATTEMPTED READING_SQL_DATA_NOT_PERMITTED INVALID_CURSOR_NAME EXTERNAL_ROUTINE_EXCEPTION CONTAINING_SQL_NOT_PERMITTED MODIFYING_SQL_DATA_NOT_PERMITTED PROHIBITED_SQL_STATEMENT_ATTEMPTED READING_SQL_DATA_NOT_PERMITTED EXTERNAL_ROUTINE_INVOCATION_EXCEPTION INVALID_SQLSTATE_RETURNED NULL_VALUE_NOT_ALLOWED TRIGGER_PROTOCOL_VIOLATED SRF_PROTOCOL_VIOLATED EVENT_TRIGGER_PROTOCOL_VIOLATED SAVEPOINT_EXCEPTION INVALID_SAVEPOINT_SPECIFICATION INVALID_CATALOG_NAME INVALID_SCHEMA_NAME TRANSACTION_ROLLBACK TRANSACTION_INTEGRITY_CONSTRAINT_VIOLATION SERIALIZATION_FAILURE STATEMENT_COMPLETION_UNKNOWN DEADLOCK_DETECTED SYNTAX_ERROR_OR_ACCESS_RULE_VIOLATION SYNTAX_ERROR INSUFFICIENT_PRIVILEGE CANNOT_COERCE GROUPING_ERROR WINDOWING_ERROR INVALID_RECURSION INVALID_FOREIGN_KEY INVALID_NAME NAME_TOO_LONG RESERVED_NAME DATATYPE_MISMATCH INDETERMINATE_DATATYPE COLLATION_MISMATCH INDETERMINATE_COLLATION WRONG_OBJECT_TYPE GENERATED_ALWAYS UNDEFINED_COLUMN UNDEFINED_FUNCTION UNDEFINED_TABLE UNDEFINED_PARAMETER UNDEFINED_OBJECT DUPLICATE_COLUMN DUPLICATE_CURSOR DUPLICATE_DATABASE DUPLICATE_FUNCTION DUPLICATE_PREPARED_STATEMENT DUPLICATE_SCHEMA DUPLICATE_TABLE DUPLICATE_ALIAS DUPLICATE_OBJECT AMBIGUOUS_COLUMN AMBIGUOUS_FUNCTION AMBIGUOUS_PARAMETER AMBIGUOUS_ALIAS INVALID_COLUMN_REFERENCE INVALID_COLUMN_DEFINITION INVALID_CURSOR_DEFINITION INVALID_DATABASE_DEFINITION INVALID_FUNCTION_DEFINITION INVALID_PREPARED_STATEMENT_DEFINITION INVALID_SCHEMA_DEFINITION INVALID_TABLE_DEFINITION INVALID_OBJECT_DEFINITION WITH_CHECK_OPTION_VIOLATION INSUFFICIENT_RESOURCES DISK_FULL OUT_OF_MEMORY TOO_MANY_CONNECTIONS CONFIGURATION_LIMIT_EXCEEDED PROGRAM_LIMIT_EXCEEDED STATEMENT_TOO_COMPLEX TOO_MANY_COLUMNS TOO_MANY_ARGUMENTS OBJECT_NOT_IN_PREREQUISITE_STATE OBJECT_IN_USE CANT_CHANGE_RUNTIME_PARAM LOCK_NOT_AVAILABLE OPERATOR_INTERVENTION QUERY_CANCELED ADMIN_SHUTDOWN CRASH_SHUTDOWN CANNOT_CONNECT_NOW DATABASE_DROPPED SYSTEM_ERROR IO_ERROR UNDEFINED_FILE DUPLICATE_FILE SNAPSHOT_TOO_OLD CONFIG_FILE_ERROR LOCK_FILE_EXISTS FDW_ERROR FDW_COLUMN_NAME_NOT_FOUND FDW_DYNAMIC_PARAMETER_VALUE_NEEDED FDW_FUNCTION_SEQUENCE_ERROR FDW_INCONSISTENT_DESCRIPTOR_INFORMATION FDW_INVALID_ATTRIBUTE_VALUE FDW_INVALID_COLUMN_NAME FDW_INVALID_COLUMN_NUMBER FDW_INVALID_DATA_TYPE FDW_INVALID_DATA_TYPE_DESCRIPTORS FDW_INVALID_DESCRIPTOR_FIELD_IDENTIFIER FDW_INVALID_HANDLE FDW_INVALID_OPTION_INDEX FDW_INVALID_OPTION_NAME FDW_INVALID_STRING_LENGTH_OR_BUFFER_LENGTH FDW_INVALID_STRING_FORMAT FDW_INVALID_USE_OF_NULL_POINTER FDW_TOO_MANY_HANDLES FDW_OUT_OF_MEMORY FDW_NO_SCHEMAS FDW_OPTION_NAME_NOT_FOUND FDW_REPLY_HANDLE FDW_SCHEMA_NOT_FOUND FDW_TABLE_NOT_FOUND FDW_UNABLE_TO_CREATE_EXECUTION FDW_UNABLE_TO_CREATE_REPLY FDW_UNABLE_TO_ESTABLISH_CONNECTION PLPGSQL_ERROR RAISE_EXCEPTION NO_DATA_FOUND TOO_MANY_ROWS ASSERT_FAILURE INTERNAL_ERROR DATA_CORRUPTED INDEX_CORRUPTED "},i:/:==|\W\s*\(\*|(^|\s)\$[a-z]|{{|[a-z]:\s*$|\.\.\.|TO:|DO:/,c:[{cN:"keyword",v:[{b:/\bTEXT\s*SEARCH\b/},{b:/\b(PRIMARY|FOREIGN|FOR(\s+NO)?)\s+KEY\b/},{b:/\bPARALLEL\s+(UNSAFE|RESTRICTED|SAFE)\b/},{b:/\bSTORAGE\s+(PLAIN|EXTERNAL|EXTENDED|MAIN)\b/},{b:/\bMATCH\s+(FULL|PARTIAL|SIMPLE)\b/},{b:/\bNULLS\s+(FIRST|LAST)\b/},{b:/\bEVENT\s+TRIGGER\b/},{b:/\b(MAPPING|OR)\s+REPLACE\b/},{b:/\b(FROM|TO)\s+(PROGRAM|STDIN|STDOUT)\b/},{b:/\b(SHARE|EXCLUSIVE)\s+MODE\b/},{b:/\b(LEFT|RIGHT)\s+(OUTER\s+)?JOIN\b/},{b:/\b(FETCH|MOVE)\s+(NEXT|PRIOR|FIRST|LAST|ABSOLUTE|RELATIVE|FORWARD|BACKWARD)\b/},{b:/\bPRESERVE\s+ROWS\b/},{b:/\bDISCARD\s+PLANS\b/},{b:/\bREFERENCING\s+(OLD|NEW)\b/},{b:/\bSKIP\s+LOCKED\b/},{b:/\bGROUPING\s+SETS\b/},{b:/\b(BINARY|INSENSITIVE|SCROLL|NO\s+SCROLL)\s+(CURSOR|FOR)\b/},{b:/\b(WITH|WITHOUT)\s+HOLD\b/},{b:/\bWITH\s+(CASCADED|LOCAL)\s+CHECK\s+OPTION\b/},{b:/\bEXCLUDE\s+(TIES|NO\s+OTHERS)\b/},{b:/\bFORMAT\s+(TEXT|XML|JSON|YAML)\b/},{b:/\bSET\s+((SESSION|LOCAL)\s+)?NAMES\b/},{b:/\bIS\s+(NOT\s+)?UNKNOWN\b/},{b:/\bSECURITY\s+LABEL\b/},{b:/\bSTANDALONE\s+(YES|NO|NO\s+VALUE)\b/},{b:/\bWITH\s+(NO\s+)?DATA\b/},{b:/\b(FOREIGN|SET)\s+DATA\b/},{b:/\bSET\s+(CATALOG|CONSTRAINTS)\b/},{b:/\b(WITH|FOR)\s+ORDINALITY\b/},{b:/\bIS\s+(NOT\s+)?DOCUMENT\b/},{b:/\bXML\s+OPTION\s+(DOCUMENT|CONTENT)\b/},{b:/\b(STRIP|PRESERVE)\s+WHITESPACE\b/},{b:/\bNO\s+(ACTION|MAXVALUE|MINVALUE)\b/},{b:/\bPARTITION\s+BY\s+(RANGE|LIST|HASH)\b/},{b:/\bAT\s+TIME\s+ZONE\b/},{b:/\bGRANTED\s+BY\b/},{b:/\bRETURN\s+(QUERY|NEXT)\b/},{b:/\b(ATTACH|DETACH)\s+PARTITION\b/},{b:/\bFORCE\s+ROW\s+LEVEL\s+SECURITY\b/},{b:/\b(INCLUDING|EXCLUDING)\s+(COMMENTS|CONSTRAINTS|DEFAULTS|IDENTITY|INDEXES|STATISTICS|STORAGE|ALL)\b/},{b:/\bAS\s+(ASSIGNMENT|IMPLICIT|PERMISSIVE|RESTRICTIVE|ENUM|RANGE)\b/}]},{b:/\b(FORMAT|FAMILY|VERSION)\s*\(/},{b:/\bINCLUDE\s*\(/,k:"INCLUDE"},{b:/\bRANGE(?!\s*(BETWEEN|UNBOUNDED|CURRENT|[-0-9]+))/},{b:/\b(VERSION|OWNER|TEMPLATE|TABLESPACE|CONNECTION\s+LIMIT|PROCEDURE|RESTRICT|JOIN|PARSER|COPY|START|END|COLLATION|INPUT|ANALYZE|STORAGE|LIKE|DEFAULT|DELIMITER|ENCODING|COLUMN|CONSTRAINT|TABLE|SCHEMA)\s*=/},{b:/\b(PG_\w+?|HAS_[A-Z_]+_PRIVILEGE)\b/,relevance:10},{b:/\bEXTRACT\s*\(/,e:/\bFROM\b/,rE:!0,k:{type:"CENTURY DAY DECADE DOW DOY EPOCH HOUR ISODOW ISOYEAR MICROSECONDS MILLENNIUM MILLISECONDS MINUTE MONTH QUARTER SECOND TIMEZONE TIMEZONE_HOUR TIMEZONE_MINUTE WEEK YEAR"}},{b:/\b(XMLELEMENT|XMLPI)\s*\(\s*NAME/,k:{keyword:"NAME"}},{b:/\b(XMLPARSE|XMLSERIALIZE)\s*\(\s*(DOCUMENT|CONTENT)/,k:{keyword:"DOCUMENT CONTENT"}},{bK:"CACHE INCREMENT MAXVALUE MINVALUE",e:E.CNR,rE:!0,k:"BY CACHE INCREMENT MAXVALUE MINVALUE"},{cN:"type",b:/\b(WITH|WITHOUT)\s+TIME\s+ZONE\b/},{cN:"type",b:/\bINTERVAL\s+(YEAR|MONTH|DAY|HOUR|MINUTE|SECOND)(\s+TO\s+(MONTH|HOUR|MINUTE|SECOND))?\b/},{b:/\bRETURNS\s+(LANGUAGE_HANDLER|TRIGGER|EVENT_TRIGGER|FDW_HANDLER|INDEX_AM_HANDLER|TSM_HANDLER)\b/,k:{keyword:"RETURNS",type:"LANGUAGE_HANDLER TRIGGER EVENT_TRIGGER FDW_HANDLER INDEX_AM_HANDLER TSM_HANDLER"}},{b:"\\b("+R+")\\s*\\("},{b:"\\.("+A+")\\b"},{b:"\\b("+A+")\\s+PATH\\b",k:{keyword:"PATH",type:N.replace("PATH ","")}},{cN:"type",b:"\\b("+A+")\\b"},{cN:"string",b:"'",e:"'",c:[{b:"''"}]},{cN:"string",b:"(e|E|u&|U&)'",e:"'",c:[{b:"\\\\."}],relevance:10},{b:"\\$([a-zA-Z_]?|[a-zA-Z_][a-zA-Z_0-9]*)\\$",endSameAsBegin:!0,c:[{sL:["pgsql","perl","python","tcl","r","lua","java","php","ruby","bash","scheme","xml","json"],eW:!0}]},{b:'"',e:'"',c:[{b:'""'}]},E.CNM,E.CBCM,T,{cN:"meta",v:[{b:"%(ROW)?TYPE",relevance:10},{b:"\\$\\d+"},{b:"^#\\w",e:"$"}]},{cN:"symbol",b:"<<\\s*[a-zA-Z_][a-zA-Z_0-9$]*\\s*>>",relevance:10}]}});
+hljs.registerLanguage("rib",function(e){return{k:"ArchiveRecord AreaLightSource Atmosphere Attribute AttributeBegin AttributeEnd Basis Begin Blobby Bound Clipping ClippingPlane Color ColorSamples ConcatTransform Cone CoordinateSystem CoordSysTransform CropWindow Curves Cylinder DepthOfField Detail DetailRange Disk Displacement Display End ErrorHandler Exposure Exterior Format FrameAspectRatio FrameBegin FrameEnd GeneralPolygon GeometricApproximation Geometry Hider Hyperboloid Identity Illuminate Imager Interior LightSource MakeCubeFaceEnvironment MakeLatLongEnvironment MakeShadow MakeTexture Matte MotionBegin MotionEnd NuPatch ObjectBegin ObjectEnd ObjectInstance Opacity Option Orientation Paraboloid Patch PatchMesh Perspective PixelFilter PixelSamples PixelVariance Points PointsGeneralPolygons PointsPolygons Polygon Procedural Projection Quantize ReadArchive RelativeDetail ReverseOrientation Rotate Scale ScreenWindow ShadingInterpolation ShadingRate Shutter Sides Skew SolidBegin SolidEnd Sphere SubdivisionMesh Surface TextureCoordinates Torus Transform TransformBegin TransformEnd TransformPoints Translate TrimCurve WorldBegin WorldEnd",i:"</",c:[e.HCM,e.CNM,e.ASM,e.QSM]}});
+hljs.registerLanguage("n1ql",function(e){return{cI:!0,c:[{bK:"build create index delete drop explain infer|10 insert merge prepare select update upsert|10",e:/;/,eW:!0,k:{keyword:"all alter analyze and any array as asc begin between binary boolean break bucket build by call case cast cluster collate collection commit connect continue correlate cover create database dataset datastore declare decrement delete derived desc describe distinct do drop each element else end every except exclude execute exists explain fetch first flatten for force from function grant group gsi having if ignore ilike in include increment index infer inline inner insert intersect into is join key keys keyspace known last left let letting like limit lsm map mapping matched materialized merge minus namespace nest not number object offset on option or order outer over parse partition password path pool prepare primary private privilege procedure public raw realm reduce rename return returning revoke right role rollback satisfies schema select self semi set show some start statistics string system then to transaction trigger truncate under union unique unknown unnest unset update upsert use user using validate value valued values via view when where while with within work xor",literal:"true false null missing|5",built_in:"array_agg array_append array_concat array_contains array_count array_distinct array_ifnull array_length array_max array_min array_position array_prepend array_put array_range array_remove array_repeat array_replace array_reverse array_sort array_sum avg count max min sum greatest least ifmissing ifmissingornull ifnull missingif nullif ifinf ifnan ifnanorinf naninf neginfif posinfif clock_millis clock_str date_add_millis date_add_str date_diff_millis date_diff_str date_part_millis date_part_str date_trunc_millis date_trunc_str duration_to_str millis str_to_millis millis_to_str millis_to_utc millis_to_zone_name now_millis now_str str_to_duration str_to_utc str_to_zone_name decode_json encode_json encoded_size poly_length base64 base64_encode base64_decode meta uuid abs acos asin atan atan2 ceil cos degrees e exp ln log floor pi power radians random round sign sin sqrt tan trunc object_length object_names object_pairs object_inner_pairs object_values object_inner_values object_add object_put object_remove object_unwrap regexp_contains regexp_like regexp_position regexp_replace contains initcap length lower ltrim position repeat replace rtrim split substr title trim upper isarray isatom isboolean isnumber isobject isstring type toarray toatom toboolean tonumber toobject tostring"},c:[{cN:"string",b:"'",e:"'",c:[e.BE],relevance:0},{cN:"string",b:'"',e:'"',c:[e.BE],relevance:0},{cN:"symbol",b:"`",e:"`",c:[e.BE],relevance:2},e.CNM,e.CBCM]},e.CBCM]}});
+hljs.registerLanguage("ldif",function(e){return{c:[{cN:"attribute",b:"^dn",e:": ",eE:!0,starts:{e:"$",relevance:0},relevance:10},{cN:"attribute",b:"^\\w",e:": ",eE:!0,starts:{e:"$",relevance:0}},{cN:"literal",b:"^-",e:"$"},e.HCM]}});
+hljs.registerLanguage("arcade",function(e){var t="[A-Za-z_][0-9A-Za-z_]*",a={keyword:"if for while var new function do return void else break",literal:"BackSlash DoubleQuote false ForwardSlash Infinity NaN NewLine null PI SingleQuote Tab TextFormatting true undefined",built_in:"Abs Acos Angle Attachments Area AreaGeodetic Asin Atan Atan2 Average Bearing Boolean Buffer BufferGeodetic Ceil Centroid Clip Console Constrain Contains Cos Count Crosses Cut Date DateAdd DateDiff Day Decode DefaultValue Dictionary Difference Disjoint Distance DistanceGeodetic Distinct DomainCode DomainName Equals Exp Extent Feature FeatureSet FeatureSetByAssociation FeatureSetById FeatureSetByPortalItem FeatureSetByRelationshipName FeatureSetByTitle FeatureSetByUrl Filter First Floor Geometry GroupBy Guid HasKey Hour IIf IndexOf Intersection Intersects IsEmpty IsNan IsSelfIntersecting Length LengthGeodetic Log Max Mean Millisecond Min Minute Month MultiPartToSinglePart Multipoint NextSequenceValue Now Number OrderBy Overlaps Point Polygon Polyline Portal Pow Random Relate Reverse RingIsClockWise Round Second SetGeometry Sin Sort Sqrt Stdev Sum SymmetricDifference Tan Text Timestamp Today ToLocal Top Touches ToUTC TrackCurrentTime TrackGeometryWindow TrackIndex TrackStartTime TrackWindow TypeOf Union UrlEncode Variance Weekday When Within Year "},r={cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],relevance:0},n={cN:"subst",b:"\\$\\{",e:"\\}",k:a,c:[]},i={cN:"string",b:"`",e:"`",c:[e.BE,n]};n.c=[e.ASM,e.QSM,i,r,e.RM];var o=n.c.concat([e.CBCM,e.CLCM]);return{aliases:["arcade"],k:a,c:[e.ASM,e.QSM,i,e.CLCM,e.CBCM,{cN:"symbol",b:"\\$[datastore|feature|layer|map|measure|sourcefeature|sourcelayer|targetfeature|targetlayer|value|view]+"},r,{b:/[{,]\s*/,relevance:0,c:[{b:t+"\\s*:",rB:!0,relevance:0,c:[{cN:"attr",b:t,relevance:0}]}]},{b:"("+e.RSR+"|\\b(return)\\b)\\s*",k:"return",c:[e.CLCM,e.CBCM,e.RM,{cN:"function",b:"(\\(.*?\\)|"+t+")\\s*=>",rB:!0,e:"\\s*=>",c:[{cN:"params",v:[{b:t},{b:/\(\s*\)/},{b:/\(/,e:/\)/,eB:!0,eE:!0,k:a,c:o}]}]}],relevance:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:t}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:o}],i:/\[|%/},{b:/\$[(.]/}],i:/#(?!!)/}});
+hljs.registerLanguage("fix",function(u){return{c:[{b:/[^\u2401\u0001]+/,e:/[\u2401\u0001]/,eE:!0,rB:!0,rE:!1,c:[{b:/([^\u2401\u0001=]+)/,e:/=([^\u2401\u0001=]+)/,rE:!0,rB:!1,cN:"attr"},{b:/=/,e:/([\u2401\u0001])/,eE:!0,eB:!0,cN:"string"}]}],cI:!0}});
+hljs.registerLanguage("tap",function(e){return{cI:!0,c:[e.HCM,{cN:"meta",v:[{b:"^TAP version (\\d+)$"},{b:"^1\\.\\.(\\d+)$"}]},{b:"(s+)?---$",e:"\\.\\.\\.$",sL:"yaml",relevance:0},{cN:"number",b:" (\\d+) "},{cN:"symbol",v:[{b:"^ok"},{b:"^not ok"}]}]}});
+hljs.registerLanguage("mathematica",function(e){return{aliases:["mma","wl"],l:"(\\$|\\b)"+e.IR+"\\b",k:"AASTriangle AbelianGroup Abort AbortKernels AbortProtect AbortScheduledTask Above Abs AbsArg AbsArgPlot Absolute AbsoluteCorrelation AbsoluteCorrelationFunction AbsoluteCurrentValue AbsoluteDashing AbsoluteFileName AbsoluteOptions AbsolutePointSize AbsoluteThickness AbsoluteTime AbsoluteTiming AcceptanceThreshold AccountingForm Accumulate Accuracy AccuracyGoal ActionDelay ActionMenu ActionMenuBox ActionMenuBoxOptions Activate Active ActiveClassification ActiveClassificationObject ActiveItem ActivePrediction ActivePredictionObject ActiveStyle AcyclicGraphQ AddOnHelpPath AddSides AddTo AddToSearchIndex AddUsers AdjacencyGraph AdjacencyList AdjacencyMatrix AdjustmentBox AdjustmentBoxOptions AdjustTimeSeriesForecast AdministrativeDivisionData AffineHalfSpace AffineSpace AffineStateSpaceModel AffineTransform After AggregatedEntityClass AggregationLayer AircraftData AirportData AirPressureData AirTemperatureData AiryAi AiryAiPrime AiryAiZero AiryBi AiryBiPrime AiryBiZero AlgebraicIntegerQ AlgebraicNumber AlgebraicNumberDenominator AlgebraicNumberNorm AlgebraicNumberPolynomial AlgebraicNumberTrace AlgebraicRules AlgebraicRulesData Algebraics AlgebraicUnitQ Alignment AlignmentMarker AlignmentPoint All AllowAdultContent AllowedCloudExtraParameters AllowedCloudParameterExtensions AllowedDimensions AllowedFrequencyRange AllowedHeads AllowGroupClose AllowIncomplete AllowInlineCells AllowKernelInitialization AllowLooseGrammar AllowReverseGroupClose AllowScriptLevelChange AllTrue Alphabet AlphabeticOrder AlphabeticSort AlphaChannel AlternateImage AlternatingFactorial AlternatingGroup AlternativeHypothesis Alternatives AltitudeMethod AmbientLight AmbiguityFunction AmbiguityList Analytic AnatomyData AnatomyForm AnatomyPlot3D AnatomySkinStyle AnatomyStyling AnchoredSearch And AndersonDarlingTest AngerJ AngleBisector AngleBracket AnglePath AnglePath3D AngleVector AngularGauge Animate AnimationCycleOffset AnimationCycleRepetitions AnimationDirection AnimationDisplayTime AnimationRate AnimationRepetitions AnimationRunning AnimationRunTime AnimationTimeIndex Animator AnimatorBox AnimatorBoxOptions AnimatorElements Annotate Annotation AnnotationDelete AnnotationNames AnnotationRules AnnotationValue Annuity AnnuityDue Annulus AnomalyDetection AnomalyDetectorFunction Anonymous Antialiasing AntihermitianMatrixQ Antisymmetric AntisymmetricMatrixQ Antonyms AnyOrder AnySubset AnyTrue Apart ApartSquareFree APIFunction Appearance AppearanceElements AppearanceRules AppellF1 Append AppendCheck AppendLayer AppendTo ApplicationIdentificationKey Apply ApplySides ArcCos ArcCosh ArcCot ArcCoth ArcCsc ArcCsch ArcCurvature ARCHProcess ArcLength ArcSec ArcSech ArcSin ArcSinDistribution ArcSinh ArcTan ArcTanh Area Arg ArgMax ArgMin ArgumentCountQ ARIMAProcess ArithmeticGeometricMean ARMAProcess Around AroundReplace ARProcess Array ArrayComponents ArrayDepth ArrayFilter ArrayFlatten ArrayMesh ArrayPad ArrayPlot ArrayQ ArrayResample ArrayReshape ArrayRules Arrays Arrow Arrow3DBox ArrowBox Arrowheads ASATriangle Ask AskAppend AskConfirm AskDisplay AskedQ AskedValue AskFunction AskState AskTemplateDisplay AspectRatio AspectRatioFixed Assert AssociateTo Association AssociationFormat AssociationMap AssociationQ AssociationThread AssumeDeterministic Assuming Assumptions AstronomicalData AsymptoticDSolveValue AsymptoticEqual AsymptoticEquivalent AsymptoticGreater AsymptoticGreaterEqual AsymptoticIntegrate AsymptoticLess AsymptoticLessEqual AsymptoticOutputTracker AsymptoticRSolveValue AsymptoticSolve AsymptoticSum Asynchronous AsynchronousTaskObject AsynchronousTasks Atom AtomCoordinates AtomCount AtomDiagramCoordinates AtomList AtomQ AttentionLayer Attributes Audio AudioAmplify AudioAnnotate AudioAnnotationLookup AudioBlockMap AudioCapture AudioChannelAssignment AudioChannelCombine AudioChannelMix AudioChannels AudioChannelSeparate AudioData AudioDelay AudioDelete AudioDevice AudioDistance AudioFade AudioFrequencyShift AudioGenerator AudioIdentify AudioInputDevice AudioInsert AudioIntervals AudioJoin AudioLabel AudioLength AudioLocalMeasurements AudioLooping AudioLoudness AudioMeasurements AudioNormalize AudioOutputDevice AudioOverlay AudioPad AudioPan AudioPartition AudioPause AudioPitchShift AudioPlay AudioPlot AudioQ AudioRecord AudioReplace AudioResample AudioReverb AudioSampleRate AudioSpectralMap AudioSpectralTransformation AudioSplit AudioStop AudioStream AudioStreams AudioTimeStretch AudioTrim AudioType AugmentedPolyhedron AugmentedSymmetricPolynomial Authenticate Authentication AuthenticationDialog AutoAction Autocomplete AutocompletionFunction AutoCopy AutocorrelationTest AutoDelete AutoEvaluateEvents AutoGeneratedPackage AutoIndent AutoIndentSpacings AutoItalicWords AutoloadPath AutoMatch Automatic AutomaticImageSize AutoMultiplicationSymbol AutoNumberFormatting AutoOpenNotebooks AutoOpenPalettes AutoQuoteCharacters AutoRefreshed AutoRemove AutorunSequencing AutoScaling AutoScroll AutoSpacing AutoStyleOptions AutoStyleWords AutoSubmitting Axes AxesEdge AxesLabel AxesOrigin AxesStyle AxiomaticTheory AxisBabyMonsterGroupB Back Background BackgroundAppearance BackgroundTasksSettings Backslash Backsubstitution Backward Ball Band BandpassFilter BandstopFilter BarabasiAlbertGraphDistribution BarChart BarChart3D BarcodeImage BarcodeRecognize BaringhausHenzeTest BarLegend BarlowProschanImportance BarnesG BarOrigin BarSpacing BartlettHannWindow BartlettWindow BaseDecode BaseEncode BaseForm Baseline BaselinePosition BaseStyle BasicRecurrentLayer BatchNormalizationLayer BatchSize BatesDistribution BattleLemarieWavelet BayesianMaximization BayesianMaximizationObject BayesianMinimization BayesianMinimizationObject Because BeckmannDistribution Beep Before Begin BeginDialogPacket BeginFrontEndInteractionPacket BeginPackage BellB BellY Below BenfordDistribution BeniniDistribution BenktanderGibratDistribution BenktanderWeibullDistribution BernoulliB BernoulliDistribution BernoulliGraphDistribution BernoulliProcess BernsteinBasis BesselFilterModel BesselI BesselJ BesselJZero BesselK BesselY BesselYZero Beta BetaBinomialDistribution BetaDistribution BetaNegativeBinomialDistribution BetaPrimeDistribution BetaRegularized Between BetweennessCentrality BeveledPolyhedron BezierCurve BezierCurve3DBox BezierCurve3DBoxOptions BezierCurveBox BezierCurveBoxOptions BezierFunction BilateralFilter Binarize BinaryDeserialize BinaryDistance BinaryFormat BinaryImageQ BinaryRead BinaryReadList BinarySerialize BinaryWrite BinCounts BinLists Binomial BinomialDistribution BinomialProcess BinormalDistribution BiorthogonalSplineWavelet BipartiteGraphQ BiquadraticFilterModel BirnbaumImportance BirnbaumSaundersDistribution BitAnd BitClear BitGet BitLength BitNot BitOr BitSet BitShiftLeft BitShiftRight BitXor BiweightLocation BiweightMidvariance Black BlackmanHarrisWindow BlackmanNuttallWindow BlackmanWindow Blank BlankForm BlankNullSequence BlankSequence Blend Block BlockchainAddressData BlockchainBase BlockchainBlockData BlockchainContractValue BlockchainData BlockchainGet BlockchainKeyEncode BlockchainPut BlockchainTokenData BlockchainTransaction BlockchainTransactionData BlockchainTransactionSign BlockchainTransactionSubmit BlockMap BlockRandom BlomqvistBeta BlomqvistBetaTest Blue Blur BodePlot BohmanWindow Bold Bond BondCount BondList BondQ Bookmarks Boole BooleanConsecutiveFunction BooleanConvert BooleanCountingFunction BooleanFunction BooleanGraph BooleanMaxterms BooleanMinimize BooleanMinterms BooleanQ BooleanRegion Booleans BooleanStrings BooleanTable BooleanVariables BorderDimensions BorelTannerDistribution Bottom BottomHatTransform BoundaryDiscretizeGraphics BoundaryDiscretizeRegion BoundaryMesh BoundaryMeshRegion BoundaryMeshRegionQ BoundaryStyle BoundedRegionQ BoundingRegion Bounds Box BoxBaselineShift BoxData BoxDimensions Boxed Boxes BoxForm BoxFormFormatTypes BoxFrame BoxID BoxMargins BoxMatrix BoxObject BoxRatios BoxRotation BoxRotationPoint BoxStyle BoxWhiskerChart Bra BracketingBar BraKet BrayCurtisDistance BreadthFirstScan Break BridgeData BrightnessEqualize BroadcastStationData Brown BrownForsytheTest BrownianBridgeProcess BrowserCategory BSplineBasis BSplineCurve BSplineCurve3DBox BSplineCurve3DBoxOptions BSplineCurveBox BSplineCurveBoxOptions BSplineFunction BSplineSurface BSplineSurface3DBox BSplineSurface3DBoxOptions BubbleChart BubbleChart3D BubbleScale BubbleSizes BuildingData BulletGauge BusinessDayQ ButterflyGraph ButterworthFilterModel Button ButtonBar ButtonBox ButtonBoxOptions ButtonCell ButtonContents ButtonData ButtonEvaluator ButtonExpandable ButtonFrame ButtonFunction ButtonMargins ButtonMinHeight ButtonNote ButtonNotebook ButtonSource ButtonStyle ButtonStyleMenuListing Byte ByteArray ByteArrayFormat ByteArrayQ ByteArrayToString ByteCount ByteOrderingC CachedValue CacheGraphics CachePersistence CalendarConvert CalendarData CalendarType Callout CalloutMarker CalloutStyle CallPacket CanberraDistance Cancel CancelButton CandlestickChart CanonicalGraph CanonicalizePolygon CanonicalizePolyhedron CanonicalName CanonicalWarpingCorrespondence CanonicalWarpingDistance CantorMesh CantorStaircase Cap CapForm CapitalDifferentialD Capitalize CapsuleShape CaptureRunning CardinalBSplineBasis CarlemanLinearize CarmichaelLambda CaseOrdering Cases CaseSensitive Cashflow Casoratian Catalan CatalanNumber Catch Catenate CatenateLayer CauchyDistribution CauchyWindow CayleyGraph CDF CDFDeploy CDFInformation CDFWavelet Ceiling CelestialSystem Cell CellAutoOverwrite CellBaseline CellBoundingBox CellBracketOptions CellChangeTimes CellContents CellContext CellDingbat CellDynamicExpression CellEditDuplicate CellElementsBoundingBox CellElementSpacings CellEpilog CellEvaluationDuplicate CellEvaluationFunction CellEvaluationLanguage CellEventActions CellFrame CellFrameColor CellFrameLabelMargins CellFrameLabels CellFrameMargins CellGroup CellGroupData CellGrouping CellGroupingRules CellHorizontalScrolling CellID CellLabel CellLabelAutoDelete CellLabelMargins CellLabelPositioning CellLabelStyle CellLabelTemplate CellMargins CellObject CellOpen CellPrint CellProlog Cells CellSize CellStyle CellTags CellularAutomaton CensoredDistribution Censoring Center CenterArray CenterDot CentralFeature CentralMoment CentralMomentGeneratingFunction Cepstrogram CepstrogramArray CepstrumArray CForm ChampernowneNumber ChangeOptions ChannelBase ChannelBrokerAction ChannelDatabin ChannelHistoryLength ChannelListen ChannelListener ChannelListeners ChannelListenerWait ChannelObject ChannelPreSendFunction ChannelReceiverFunction ChannelSend ChannelSubscribers ChanVeseBinarize Character CharacterCounts CharacterEncoding CharacterEncodingsPath CharacteristicFunction CharacteristicPolynomial CharacterName CharacterRange Characters ChartBaseStyle ChartElementData ChartElementDataFunction ChartElementFunction ChartElements ChartLabels ChartLayout ChartLegends ChartStyle Chebyshev1FilterModel Chebyshev2FilterModel ChebyshevDistance ChebyshevT ChebyshevU Check CheckAbort CheckAll Checkbox CheckboxBar CheckboxBox CheckboxBoxOptions ChemicalData ChessboardDistance ChiDistribution ChineseRemainder ChiSquareDistribution ChoiceButtons ChoiceDialog CholeskyDecomposition Chop ChromaticityPlot ChromaticityPlot3D ChromaticPolynomial Circle CircleBox CircleDot CircleMinus CirclePlus CirclePoints CircleThrough CircleTimes CirculantGraph CircularOrthogonalMatrixDistribution CircularQuaternionMatrixDistribution CircularRealMatrixDistribution CircularSymplecticMatrixDistribution CircularUnitaryMatrixDistribution Circumsphere CityData ClassifierFunction ClassifierInformation ClassifierMeasurements ClassifierMeasurementsObject Classify ClassPriors Clear ClearAll ClearAttributes ClearCookies ClearPermissions ClearSystemCache ClebschGordan ClickPane Clip ClipboardNotebook ClipFill ClippingStyle ClipPlanes ClipPlanesStyle ClipRange Clock ClockGauge ClockwiseContourIntegral Close Closed CloseKernels ClosenessCentrality Closing ClosingAutoSave ClosingEvent CloudAccountData CloudBase CloudConnect CloudDeploy CloudDirectory CloudDisconnect CloudEvaluate CloudExport CloudExpression CloudExpressions CloudFunction CloudGet CloudImport CloudLoggingData CloudObject CloudObjectInformation CloudObjectInformationData CloudObjectNameFormat CloudObjects CloudObjectURLType CloudPublish CloudPut CloudRenderingMethod CloudSave CloudShare CloudSubmit CloudSymbol CloudUnshare ClusterClassify ClusterDissimilarityFunction ClusteringComponents ClusteringTree CMYKColor Coarse CodeAssistOptions Coefficient CoefficientArrays CoefficientDomain CoefficientList CoefficientRules CoifletWavelet Collect Colon ColonForm ColorBalance ColorCombine ColorConvert ColorCoverage ColorData ColorDataFunction ColorDetect ColorDistance ColorFunction ColorFunctionScaling Colorize ColorNegate ColorOutput ColorProfileData ColorQ ColorQuantize ColorReplace ColorRules ColorSelectorSettings ColorSeparate ColorSetter ColorSetterBox ColorSetterBoxOptions ColorSlider ColorsNear ColorSpace ColorToneMapping Column ColumnAlignments ColumnBackgrounds ColumnForm ColumnLines ColumnsEqual ColumnSpacings ColumnWidths CombinedEntityClass CombinerFunction CometData CommonDefaultFormatTypes Commonest CommonestFilter CommonName CommonUnits CommunityBoundaryStyle CommunityGraphPlot CommunityLabels CommunityRegionStyle CompanyData CompatibleUnitQ CompilationOptions CompilationTarget Compile Compiled CompiledCodeFunction CompiledFunction CompilerOptions Complement CompleteGraph CompleteGraphQ CompleteKaryTree CompletionsListPacket Complex Complexes ComplexExpand ComplexInfinity ComplexityFunction ComplexListPlot ComplexPlot ComplexPlot3D ComponentMeasurements ComponentwiseContextMenu Compose ComposeList ComposeSeries CompositeQ Composition CompoundElement CompoundExpression CompoundPoissonDistribution CompoundPoissonProcess CompoundRenewalProcess Compress CompressedData ComputeUncertainty Condition ConditionalExpression Conditioned Cone ConeBox ConfidenceLevel ConfidenceRange ConfidenceTransform ConfigurationPath ConformAudio ConformImages Congruent ConicHullRegion ConicHullRegion3DBox ConicHullRegionBox ConicOptimization Conjugate ConjugateTranspose Conjunction Connect ConnectedComponents ConnectedGraphComponents ConnectedGraphQ ConnectedMeshComponents ConnectedMoleculeComponents ConnectedMoleculeQ ConnectionSettings ConnectLibraryCallbackFunction ConnectSystemModelComponents ConnesWindow ConoverTest ConsoleMessage ConsoleMessagePacket ConsolePrint Constant ConstantArray ConstantArrayLayer ConstantImage ConstantPlusLayer ConstantRegionQ Constants ConstantTimesLayer ConstellationData ConstrainedMax ConstrainedMin Construct Containing ContainsAll ContainsAny ContainsExactly ContainsNone ContainsOnly ContentFieldOptions ContentLocationFunction ContentObject ContentPadding ContentsBoundingBox ContentSelectable ContentSize Context ContextMenu Contexts ContextToFileName Continuation Continue ContinuedFraction ContinuedFractionK ContinuousAction ContinuousMarkovProcess ContinuousTask ContinuousTimeModelQ ContinuousWaveletData ContinuousWaveletTransform ContourDetect ContourGraphics ContourIntegral ContourLabels ContourLines ContourPlot ContourPlot3D Contours ContourShading ContourSmoothing ContourStyle ContraharmonicMean ContrastiveLossLayer Control ControlActive ControlAlignment ControlGroupContentsBox ControllabilityGramian ControllabilityMatrix ControllableDecomposition ControllableModelQ ControllerDuration ControllerInformation ControllerInformationData ControllerLinking ControllerManipulate ControllerMethod ControllerPath ControllerState ControlPlacement ControlsRendering ControlType Convergents ConversionOptions ConversionRules ConvertToBitmapPacket ConvertToPostScript ConvertToPostScriptPacket ConvexHullMesh ConvexPolygonQ ConvexPolyhedronQ ConvolutionLayer Convolve ConwayGroupCo1 ConwayGroupCo2 ConwayGroupCo3 CookieFunction Cookies CoordinateBoundingBox CoordinateBoundingBoxArray CoordinateBounds CoordinateBoundsArray CoordinateChartData CoordinatesToolOptions CoordinateTransform CoordinateTransformData CoprimeQ Coproduct CopulaDistribution Copyable CopyDatabin CopyDirectory CopyFile CopyTag CopyToClipboard CornerFilter CornerNeighbors Correlation CorrelationDistance CorrelationFunction CorrelationTest Cos Cosh CoshIntegral CosineDistance CosineWindow CosIntegral Cot Coth Count CountDistinct CountDistinctBy CounterAssignments CounterBox CounterBoxOptions CounterClockwiseContourIntegral CounterEvaluator CounterFunction CounterIncrements CounterStyle CounterStyleMenuListing CountRoots CountryData Counts CountsBy Covariance CovarianceEstimatorFunction CovarianceFunction CoxianDistribution CoxIngersollRossProcess CoxModel CoxModelFit CramerVonMisesTest CreateArchive CreateCellID CreateChannel CreateCloudExpression CreateDatabin CreateDataSystemModel CreateDialog CreateDirectory CreateDocument CreateFile CreateIntermediateDirectories CreateManagedLibraryExpression CreateNotebook CreatePalette CreatePalettePacket CreatePermissionsGroup CreateScheduledTask CreateSearchIndex CreateSystemModel CreateTemporary CreateUUID CreateWindow CriterionFunction CriticalityFailureImportance CriticalitySuccessImportance CriticalSection Cross CrossEntropyLossLayer CrossingCount CrossingDetect CrossingPolygon CrossMatrix Csc Csch CTCLossLayer Cube CubeRoot Cubics Cuboid CuboidBox Cumulant CumulantGeneratingFunction Cup CupCap Curl CurlyDoubleQuote CurlyQuote CurrencyConvert CurrentDate CurrentImage CurrentlySpeakingPacket CurrentNotebookImage CurrentScreenImage CurrentValue Curry CurvatureFlowFilter CurveClosed Cyan CycleGraph CycleIndexPolynomial Cycles CyclicGroup Cyclotomic Cylinder CylinderBox CylindricalDecompositionD DagumDistribution DamData DamerauLevenshteinDistance DampingFactor Darker Dashed Dashing DatabaseConnect DatabaseDisconnect DatabaseReference Databin DatabinAdd DatabinRemove Databins DatabinUpload DataCompression DataDistribution DataRange DataReversed Dataset Date DateBounds Dated DateDelimiters DateDifference DatedUnit DateFormat DateFunction DateHistogram DateList DateListLogPlot DateListPlot DateListStepPlot DateObject DateObjectQ DateOverlapsQ DatePattern DatePlus DateRange DateReduction DateString DateTicksFormat DateValue DateWithinQ DaubechiesWavelet DavisDistribution DawsonF DayCount DayCountConvention DayHemisphere DaylightQ DayMatchQ DayName DayNightTerminator DayPlus DayRange DayRound DeBruijnGraph DeBruijnSequence Debug DebugTag Decapitalize Decimal DecimalForm DeclareKnownSymbols DeclarePackage Decompose DeconvolutionLayer Decrement Decrypt DecryptFile DedekindEta DeepSpaceProbeData Default DefaultAxesStyle DefaultBaseStyle DefaultBoxStyle DefaultButton DefaultColor DefaultControlPlacement DefaultDuplicateCellStyle DefaultDuration DefaultElement DefaultFaceGridsStyle DefaultFieldHintStyle DefaultFont DefaultFontProperties DefaultFormatType DefaultFormatTypeForStyle DefaultFrameStyle DefaultFrameTicksStyle DefaultGridLinesStyle DefaultInlineFormatType DefaultInputFormatType DefaultLabelStyle DefaultMenuStyle DefaultNaturalLanguage DefaultNewCellStyle DefaultNewInlineCellStyle DefaultNotebook DefaultOptions DefaultOutputFormatType DefaultPrintPrecision DefaultStyle DefaultStyleDefinitions DefaultTextFormatType DefaultTextInlineFormatType DefaultTicksStyle DefaultTooltipStyle DefaultValue DefaultValues Defer DefineExternal DefineInputStreamMethod DefineOutputStreamMethod DefineResourceFunction Definition Degree DegreeCentrality DegreeGraphDistribution DegreeLexicographic DegreeReverseLexicographic DEigensystem DEigenvalues Deinitialization Del DelaunayMesh Delayed Deletable Delete DeleteAnomalies DeleteBorderComponents DeleteCases DeleteChannel DeleteCloudExpression DeleteContents DeleteDirectory DeleteDuplicates DeleteDuplicatesBy DeleteFile DeleteMissing DeleteObject DeletePermissionsKey DeleteSearchIndex DeleteSmallComponents DeleteStopwords DeleteWithContents DeletionWarning DelimitedArray DelimitedSequence Delimiter DelimiterFlashTime DelimiterMatching Delimiters DeliveryFunction Dendrogram Denominator DensityGraphics DensityHistogram DensityPlot DensityPlot3D DependentVariables Deploy Deployed Depth DepthFirstScan Derivative DerivativeFilter DerivedKey DescriptorStateSpace DesignMatrix DestroyAfterEvaluation Det DeviceClose DeviceConfigure DeviceExecute DeviceExecuteAsynchronous DeviceObject DeviceOpen DeviceOpenQ DeviceRead DeviceReadBuffer DeviceReadLatest DeviceReadList DeviceReadTimeSeries Devices DeviceStreams DeviceWrite DeviceWriteBuffer DGaussianWavelet DiacriticalPositioning Diagonal DiagonalizableMatrixQ DiagonalMatrix DiagonalMatrixQ Dialog DialogIndent DialogInput DialogLevel DialogNotebook DialogProlog DialogReturn DialogSymbols Diamond DiamondMatrix DiceDissimilarity DictionaryLookup DictionaryWordQ DifferenceDelta DifferenceOrder DifferenceQuotient DifferenceRoot DifferenceRootReduce Differences DifferentialD DifferentialRoot DifferentialRootReduce DifferentiatorFilter DigitalSignature DigitBlock DigitBlockMinimum DigitCharacter DigitCount DigitQ DihedralAngle DihedralGroup Dilation DimensionalCombinations DimensionalMeshComponents DimensionReduce DimensionReducerFunction DimensionReduction Dimensions DiracComb DiracDelta DirectedEdge DirectedEdges DirectedGraph DirectedGraphQ DirectedInfinity Direction Directive Directory DirectoryName DirectoryQ DirectoryStack DirichletBeta DirichletCharacter DirichletCondition DirichletConvolve DirichletDistribution DirichletEta DirichletL DirichletLambda DirichletTransform DirichletWindow DisableConsolePrintPacket DisableFormatting DiscreteChirpZTransform DiscreteConvolve DiscreteDelta DiscreteHadamardTransform DiscreteIndicator DiscreteLimit DiscreteLQEstimatorGains DiscreteLQRegulatorGains DiscreteLyapunovSolve DiscreteMarkovProcess DiscreteMaxLimit DiscreteMinLimit DiscretePlot DiscretePlot3D DiscreteRatio DiscreteRiccatiSolve DiscreteShift DiscreteTimeModelQ DiscreteUniformDistribution DiscreteVariables DiscreteWaveletData DiscreteWaveletPacketTransform DiscreteWaveletTransform DiscretizeGraphics DiscretizeRegion Discriminant DisjointQ Disjunction Disk DiskBox DiskMatrix DiskSegment Dispatch DispatchQ DispersionEstimatorFunction Display DisplayAllSteps DisplayEndPacket DisplayFlushImagePacket DisplayForm DisplayFunction DisplayPacket DisplayRules DisplaySetSizePacket DisplayString DisplayTemporary DisplayWith DisplayWithRef DisplayWithVariable DistanceFunction DistanceMatrix DistanceTransform Distribute Distributed DistributedContexts DistributeDefinitions DistributionChart DistributionDomain DistributionFitTest DistributionParameterAssumptions DistributionParameterQ Dithering Div Divergence Divide DivideBy Dividers DivideSides Divisible Divisors DivisorSigma DivisorSum DMSList DMSString Do DockedCells DocumentGenerator DocumentGeneratorInformation DocumentGeneratorInformationData DocumentGenerators DocumentNotebook DocumentWeightingRules Dodecahedron DomainRegistrationInformation DominantColors DOSTextFormat Dot DotDashed DotEqual DotLayer DotPlusLayer Dotted DoubleBracketingBar DoubleContourIntegral DoubleDownArrow DoubleLeftArrow DoubleLeftRightArrow DoubleLeftTee DoubleLongLeftArrow DoubleLongLeftRightArrow DoubleLongRightArrow DoubleRightArrow DoubleRightTee DoubleUpArrow DoubleUpDownArrow DoubleVerticalBar DoublyInfinite Down DownArrow DownArrowBar DownArrowUpArrow DownLeftRightVector DownLeftTeeVector DownLeftVector DownLeftVectorBar DownRightTeeVector DownRightVector DownRightVectorBar Downsample DownTee DownTeeArrow DownValues DragAndDrop DrawEdges DrawFrontFaces DrawHighlighted Drop DropoutLayer DSolve DSolveValue Dt DualLinearProgramming DualPolyhedron DualSystemsModel DumpGet DumpSave DuplicateFreeQ Duration Dynamic DynamicBox DynamicBoxOptions DynamicEvaluationTimeout DynamicGeoGraphics DynamicImage DynamicLocation DynamicModule DynamicModuleBox DynamicModuleBoxOptions DynamicModuleParent DynamicModuleValues DynamicName DynamicNamespace DynamicReference DynamicSetting DynamicUpdating DynamicWrapper DynamicWrapperBox DynamicWrapperBoxOptionsE EarthImpactData EarthquakeData EccentricityCentrality Echo EchoFunction EclipseType EdgeAdd EdgeBetweennessCentrality EdgeCapacity EdgeCapForm EdgeColor EdgeConnectivity EdgeContract EdgeCost EdgeCount EdgeCoverQ EdgeCycleMatrix EdgeDashing EdgeDelete EdgeDetect EdgeForm EdgeIndex EdgeJoinForm EdgeLabeling EdgeLabels EdgeLabelStyle EdgeList EdgeOpacity EdgeQ EdgeRenderingFunction EdgeRules EdgeShapeFunction EdgeStyle EdgeThickness EdgeWeight EdgeWeightedGraphQ Editable EditButtonSettings EditCellTagsSettings EditDistance EffectiveInterest Eigensystem Eigenvalues EigenvectorCentrality Eigenvectors Element ElementData ElementwiseLayer ElidedForms Eliminate EliminationOrder Ellipsoid EllipticE EllipticExp EllipticExpPrime EllipticF EllipticFilterModel EllipticK EllipticLog EllipticNomeQ EllipticPi EllipticReducedHalfPeriods EllipticTheta EllipticThetaPrime EmbedCode EmbeddedHTML EmbeddedService EmbeddingLayer EmbeddingObject EmitSound EmphasizeSyntaxErrors EmpiricalDistribution Empty EmptyGraphQ EmptyRegion EnableConsolePrintPacket Enabled Encode Encrypt EncryptedObject EncryptFile End EndAdd EndDialogPacket EndFrontEndInteractionPacket EndOfBuffer EndOfFile EndOfLine EndOfString EndPackage EngineEnvironment EngineeringForm Enter EnterExpressionPacket EnterTextPacket Entity EntityClass EntityClassList EntityCopies EntityFunction EntityGroup EntityInstance EntityList EntityPrefetch EntityProperties EntityProperty EntityPropertyClass EntityRegister EntityStore EntityStores EntityTypeName EntityUnregister EntityValue Entropy EntropyFilter Environment Epilog EpilogFunction Equal EqualColumns EqualRows EqualTilde EqualTo EquatedTo Equilibrium EquirippleFilterKernel Equivalent Erf Erfc Erfi ErlangB ErlangC ErlangDistribution Erosion ErrorBox ErrorBoxOptions ErrorNorm ErrorPacket ErrorsDialogSettings EscapeRadius EstimatedBackground EstimatedDistribution EstimatedProcess EstimatorGains EstimatorRegulator EuclideanDistance EulerAngles EulerCharacteristic EulerE EulerGamma EulerianGraphQ EulerMatrix EulerPhi Evaluatable Evaluate Evaluated EvaluatePacket EvaluateScheduledTask EvaluationBox EvaluationCell EvaluationCompletionAction EvaluationData EvaluationElements EvaluationEnvironment EvaluationMode EvaluationMonitor EvaluationNotebook EvaluationObject EvaluationOrder Evaluator EvaluatorNames EvenQ EventData EventEvaluator EventHandler EventHandlerTag EventLabels EventSeries ExactBlackmanWindow ExactNumberQ ExactRootIsolation ExampleData Except ExcludedForms ExcludedLines ExcludedPhysicalQuantities ExcludePods Exclusions ExclusionsStyle Exists Exit ExitDialog ExoplanetData Exp Expand ExpandAll ExpandDenominator ExpandFileName ExpandNumerator Expectation ExpectationE ExpectedValue ExpGammaDistribution ExpIntegralE ExpIntegralEi ExpirationDate Exponent ExponentFunction ExponentialDistribution ExponentialFamily ExponentialGeneratingFunction ExponentialMovingAverage ExponentialPowerDistribution ExponentPosition ExponentStep Export ExportAutoReplacements ExportByteArray ExportForm ExportPacket ExportString Expression ExpressionCell ExpressionPacket ExpressionUUID ExpToTrig ExtendedEntityClass ExtendedGCD Extension ExtentElementFunction ExtentMarkers ExtentSize ExternalBundle ExternalCall ExternalDataCharacterEncoding ExternalEvaluate ExternalFunction ExternalFunctionName ExternalObject ExternalOptions ExternalSessionObject ExternalSessions ExternalTypeSignature ExternalValue Extract ExtractArchive ExtractLayer ExtremeValueDistributionFaceForm FaceGrids FaceGridsStyle FacialFeatures Factor FactorComplete Factorial Factorial2 FactorialMoment FactorialMomentGeneratingFunction FactorialPower FactorInteger FactorList FactorSquareFree FactorSquareFreeList FactorTerms FactorTermsList Fail Failure FailureAction FailureDistribution FailureQ False FareySequence FARIMAProcess FeatureDistance FeatureExtract FeatureExtraction FeatureExtractor FeatureExtractorFunction FeatureNames FeatureNearest FeatureSpacePlot FeatureSpacePlot3D FeatureTypes FEDisableConsolePrintPacket FeedbackLinearize FeedbackSector FeedbackSectorStyle FeedbackType FEEnableConsolePrintPacket FetalGrowthData Fibonacci Fibonorial FieldCompletionFunction FieldHint FieldHintStyle FieldMasked FieldSize File FileBaseName FileByteCount FileConvert FileDate FileExistsQ FileExtension FileFormat FileHandler FileHash FileInformation FileName FileNameDepth FileNameDialogSettings FileNameDrop FileNameForms FileNameJoin FileNames FileNameSetter FileNameSplit FileNameTake FilePrint FileSize FileSystemMap FileSystemScan FileTemplate FileTemplateApply FileType FilledCurve FilledCurveBox FilledCurveBoxOptions Filling FillingStyle FillingTransform FilteredEntityClass FilterRules FinancialBond FinancialData FinancialDerivative FinancialIndicator Find FindAnomalies FindArgMax FindArgMin FindChannels FindClique FindClusters FindCookies FindCurvePath FindCycle FindDevices FindDistribution FindDistributionParameters FindDivisions FindEdgeCover FindEdgeCut FindEdgeIndependentPaths FindEquationalProof FindEulerianCycle FindExternalEvaluators FindFaces FindFile FindFit FindFormula FindFundamentalCycles FindGeneratingFunction FindGeoLocation FindGeometricConjectures FindGeometricTransform FindGraphCommunities FindGraphIsomorphism FindGraphPartition FindHamiltonianCycle FindHamiltonianPath FindHiddenMarkovStates FindIndependentEdgeSet FindIndependentVertexSet FindInstance FindIntegerNullVector FindKClan FindKClique FindKClub FindKPlex FindLibrary FindLinearRecurrence FindList FindMatchingColor FindMaximum FindMaximumFlow FindMaxValue FindMeshDefects FindMinimum FindMinimumCostFlow FindMinimumCut FindMinValue FindMoleculeSubstructure FindPath FindPeaks FindPermutation FindPostmanTour FindProcessParameters FindRepeat FindRoot FindSequenceFunction FindSettings FindShortestPath FindShortestTour FindSpanningTree FindSystemModelEquilibrium FindTextualAnswer FindThreshold FindTransientRepeat FindVertexCover FindVertexCut FindVertexIndependentPaths Fine FinishDynamic FiniteAbelianGroupCount FiniteGroupCount FiniteGroupData First FirstCase FirstPassageTimeDistribution FirstPosition FischerGroupFi22 FischerGroupFi23 FischerGroupFi24Prime FisherHypergeometricDistribution FisherRatioTest FisherZDistribution Fit FitAll FitRegularization FittedModel FixedOrder FixedPoint FixedPointList FlashSelection Flat Flatten FlattenAt FlattenLayer FlatTopWindow FlipView Floor FlowPolynomial FlushPrintOutputPacket Fold FoldList FoldPair FoldPairList FollowRedirects Font FontColor FontFamily FontForm FontName FontOpacity FontPostScriptName FontProperties FontReencoding FontSize FontSlant FontSubstitutions FontTracking FontVariations FontWeight For ForAll Format FormatRules FormatType FormatTypeAutoConvert FormatValues FormBox FormBoxOptions FormControl FormFunction FormLayoutFunction FormObject FormPage FormTheme FormulaData FormulaLookup FortranForm Forward ForwardBackward Fourier FourierCoefficient FourierCosCoefficient FourierCosSeries FourierCosTransform FourierDCT FourierDCTFilter FourierDCTMatrix FourierDST FourierDSTMatrix FourierMatrix FourierParameters FourierSequenceTransform FourierSeries FourierSinCoefficient FourierSinSeries FourierSinTransform FourierTransform FourierTrigSeries FractionalBrownianMotionProcess FractionalGaussianNoiseProcess FractionalPart FractionBox FractionBoxOptions FractionLine Frame FrameBox FrameBoxOptions Framed FrameInset FrameLabel Frameless FrameMargins FrameRate FrameStyle FrameTicks FrameTicksStyle FRatioDistribution FrechetDistribution FreeQ FrenetSerretSystem FrequencySamplingFilterKernel FresnelC FresnelF FresnelG FresnelS Friday FrobeniusNumber FrobeniusSolve FromAbsoluteTime FromCharacterCode FromCoefficientRules FromContinuedFraction FromDate FromDigits FromDMS FromEntity FromJulianDate FromLetterNumber FromPolarCoordinates FromRomanNumeral FromSphericalCoordinates FromUnixTime Front FrontEndDynamicExpression FrontEndEventActions FrontEndExecute FrontEndObject FrontEndResource FrontEndResourceString FrontEndStackSize FrontEndToken FrontEndTokenExecute FrontEndValueCache FrontEndVersion FrontFaceColor FrontFaceOpacity Full FullAxes FullDefinition FullForm FullGraphics FullInformationOutputRegulator FullOptions FullRegion FullSimplify Function FunctionCompile FunctionCompileExport FunctionCompileExportByteArray FunctionCompileExportLibrary FunctionCompileExportString FunctionDomain FunctionExpand FunctionInterpolation FunctionPeriod FunctionRange FunctionSpace FussellVeselyImportanceGaborFilter GaborMatrix GaborWavelet GainMargins GainPhaseMargins GalaxyData GalleryView Gamma GammaDistribution GammaRegularized GapPenalty GARCHProcess GatedRecurrentLayer Gather GatherBy GaugeFaceElementFunction GaugeFaceStyle GaugeFrameElementFunction GaugeFrameSize GaugeFrameStyle GaugeLabels GaugeMarkers GaugeStyle GaussianFilter GaussianIntegers GaussianMatrix GaussianOrthogonalMatrixDistribution GaussianSymplecticMatrixDistribution GaussianUnitaryMatrixDistribution GaussianWindow GCD GegenbauerC General GeneralizedLinearModelFit GenerateAsymmetricKeyPair GenerateConditions GeneratedCell GeneratedDocumentBinding GenerateDerivedKey GenerateDigitalSignature GenerateDocument GeneratedParameters GeneratedQuantityMagnitudes GenerateHTTPResponse GenerateSecuredAuthenticationKey GenerateSymmetricKey GeneratingFunction GeneratorDescription GeneratorHistoryLength GeneratorOutputType Generic GenericCylindricalDecomposition GenomeData GenomeLookup GeoAntipode GeoArea GeoArraySize GeoBackground GeoBoundingBox GeoBounds GeoBoundsRegion GeoBubbleChart GeoCenter GeoCircle GeodesicClosing GeodesicDilation GeodesicErosion GeodesicOpening GeoDestination GeodesyData GeoDirection GeoDisk GeoDisplacement GeoDistance GeoDistanceList GeoElevationData GeoEntities GeoGraphics GeogravityModelData GeoGridDirectionDifference GeoGridLines GeoGridLinesStyle GeoGridPosition GeoGridRange GeoGridRangePadding GeoGridUnitArea GeoGridUnitDistance GeoGridVector GeoGroup GeoHemisphere GeoHemisphereBoundary GeoHistogram GeoIdentify GeoImage GeoLabels GeoLength GeoListPlot GeoLocation GeologicalPeriodData GeomagneticModelData GeoMarker GeometricAssertion GeometricBrownianMotionProcess GeometricDistribution GeometricMean GeometricMeanFilter GeometricScene GeometricTransformation GeometricTransformation3DBox GeometricTransformation3DBoxOptions GeometricTransformationBox GeometricTransformationBoxOptions GeoModel GeoNearest GeoPath GeoPosition GeoPositionENU GeoPositionXYZ GeoProjection GeoProjectionData GeoRange GeoRangePadding GeoRegionValuePlot GeoResolution GeoScaleBar GeoServer GeoSmoothHistogram GeoStreamPlot GeoStyling GeoStylingImageFunction GeoVariant GeoVector GeoVectorENU GeoVectorPlot GeoVectorXYZ GeoVisibleRegion GeoVisibleRegionBoundary GeoWithinQ GeoZoomLevel GestureHandler GestureHandlerTag Get GetBoundingBoxSizePacket GetContext GetEnvironment GetFileName GetFrontEndOptionsDataPacket GetLinebreakInformationPacket GetMenusPacket GetPageBreakInformationPacket Glaisher GlobalClusteringCoefficient GlobalPreferences GlobalSession Glow GoldenAngle GoldenRatio GompertzMakehamDistribution GoodmanKruskalGamma GoodmanKruskalGammaTest Goto Grad Gradient GradientFilter GradientOrientationFilter GrammarApply GrammarRules GrammarToken Graph Graph3D GraphAssortativity GraphAutomorphismGroup GraphCenter GraphComplement GraphData GraphDensity GraphDiameter GraphDifference GraphDisjointUnion GraphDistance GraphDistanceMatrix GraphElementData GraphEmbedding GraphHighlight GraphHighlightStyle GraphHub Graphics Graphics3D Graphics3DBox Graphics3DBoxOptions GraphicsArray GraphicsBaseline GraphicsBox GraphicsBoxOptions GraphicsColor GraphicsColumn GraphicsComplex GraphicsComplex3DBox GraphicsComplex3DBoxOptions GraphicsComplexBox GraphicsComplexBoxOptions GraphicsContents GraphicsData GraphicsGrid GraphicsGridBox GraphicsGroup GraphicsGroup3DBox GraphicsGroup3DBoxOptions GraphicsGroupBox GraphicsGroupBoxOptions GraphicsGrouping GraphicsHighlightColor GraphicsRow GraphicsSpacing GraphicsStyle GraphIntersection GraphLayout GraphLinkEfficiency GraphPeriphery GraphPlot GraphPlot3D GraphPower GraphPropertyDistribution GraphQ GraphRadius GraphReciprocity GraphRoot GraphStyle GraphUnion Gray GrayLevel Greater GreaterEqual GreaterEqualLess GreaterEqualThan GreaterFullEqual GreaterGreater GreaterLess GreaterSlantEqual GreaterThan GreaterTilde Green GreenFunction Grid GridBaseline GridBox GridBoxAlignment GridBoxBackground GridBoxDividers GridBoxFrame GridBoxItemSize GridBoxItemStyle GridBoxOptions GridBoxSpacings GridCreationSettings GridDefaultElement GridElementStyleOptions GridFrame GridFrameMargins GridGraph GridLines GridLinesStyle GroebnerBasis GroupActionBase GroupBy GroupCentralizer GroupElementFromWord GroupElementPosition GroupElementQ GroupElements GroupElementToWord GroupGenerators Groupings GroupMultiplicationTable GroupOrbits GroupOrder GroupPageBreakWithin GroupSetwiseStabilizer GroupStabilizer GroupStabilizerChain GroupTogetherGrouping GroupTogetherNestedGrouping GrowCutComponents Gudermannian GuidedFilter GumbelDistributionHaarWavelet HadamardMatrix HalfLine HalfNormalDistribution HalfPlane HalfSpace HamiltonianGraphQ HammingDistance HammingWindow HandlerFunctions HandlerFunctionsKeys HankelH1 HankelH2 HankelMatrix HankelTransform HannPoissonWindow HannWindow HaradaNortonGroupHN HararyGraph HarmonicMean HarmonicMeanFilter HarmonicNumber Hash Haversine HazardFunction Head HeadCompose HeaderLines Heads HeavisideLambda HeavisidePi HeavisideTheta HeldGroupHe HeldPart HelpBrowserLookup HelpBrowserNotebook HelpBrowserSettings Here HermiteDecomposition HermiteH HermitianMatrixQ HessenbergDecomposition Hessian HexadecimalCharacter Hexahedron HexahedronBox HexahedronBoxOptions HiddenMarkovProcess HiddenSurface Highlighted HighlightGraph HighlightImage HighlightMesh HighpassFilter HigmanSimsGroupHS HilbertCurve HilbertFilter HilbertMatrix Histogram Histogram3D HistogramDistribution HistogramList HistogramTransform HistogramTransformInterpolation HistoricalPeriodData HitMissTransform HITSCentrality HjorthDistribution HodgeDual HoeffdingD HoeffdingDTest Hold HoldAll HoldAllComplete HoldComplete HoldFirst HoldForm HoldPattern HoldRest HolidayCalendar HomeDirectory HomePage Horizontal HorizontalForm HorizontalGauge HorizontalScrollPosition HornerForm HostLookup HotellingTSquareDistribution HoytDistribution HTMLSave HTTPErrorResponse HTTPRedirect HTTPRequest HTTPRequestData HTTPResponse Hue HumanGrowthData HumpDownHump HumpEqual HurwitzLerchPhi HurwitzZeta HyperbolicDistribution HypercubeGraph HyperexponentialDistribution Hyperfactorial Hypergeometric0F1 Hypergeometric0F1Regularized Hypergeometric1F1 Hypergeometric1F1Regularized Hypergeometric2F1 Hypergeometric2F1Regularized HypergeometricDistribution HypergeometricPFQ HypergeometricPFQRegularized HypergeometricU Hyperlink HyperlinkCreationSettings Hyperplane Hyphenation HyphenationOptions HypoexponentialDistribution HypothesisTestDataI IconData Iconize IconizedObject IconRules Icosahedron Identity IdentityMatrix If IgnoreCase IgnoreDiacritics IgnorePunctuation IgnoreSpellCheck IgnoringInactive Im Image Image3D Image3DProjection Image3DSlices ImageAccumulate ImageAdd ImageAdjust ImageAlign ImageApply ImageApplyIndexed ImageAspectRatio ImageAssemble ImageAugmentationLayer ImageBoundingBoxes ImageCache ImageCacheValid ImageCapture ImageCaptureFunction ImageCases ImageChannels ImageClip ImageCollage ImageColorSpace ImageCompose ImageContainsQ ImageContents ImageConvolve ImageCooccurrence ImageCorners ImageCorrelate ImageCorrespondingPoints ImageCrop ImageData ImageDeconvolve ImageDemosaic ImageDifference ImageDimensions ImageDisplacements ImageDistance ImageEffect ImageExposureCombine ImageFeatureTrack ImageFileApply ImageFileFilter ImageFileScan ImageFilter ImageFocusCombine ImageForestingComponents ImageFormattingWidth ImageForwardTransformation ImageGraphics ImageHistogram ImageIdentify ImageInstanceQ ImageKeypoints ImageLevels ImageLines ImageMargins ImageMarker ImageMarkers ImageMeasurements ImageMesh ImageMultiply ImageOffset ImagePad ImagePadding ImagePartition ImagePeriodogram ImagePerspectiveTransformation ImagePosition ImagePreviewFunction ImagePyramid ImagePyramidApply ImageQ ImageRangeCache ImageRecolor ImageReflect ImageRegion ImageResize ImageResolution ImageRestyle ImageRotate ImageRotated ImageSaliencyFilter ImageScaled ImageScan ImageSize ImageSizeAction ImageSizeCache ImageSizeMultipliers ImageSizeRaw ImageSubtract ImageTake ImageTransformation ImageTrim ImageType ImageValue ImageValuePositions ImagingDevice ImplicitRegion Implies Import ImportAutoReplacements ImportByteArray ImportOptions ImportString ImprovementImportance In Inactivate Inactive IncidenceGraph IncidenceList IncidenceMatrix IncludeAromaticBonds IncludeConstantBasis IncludeDefinitions IncludeDirectories IncludeFileExtension IncludeGeneratorTasks IncludeHydrogens IncludeInflections IncludeMetaInformation IncludePods IncludeQuantities IncludeRelatedTables IncludeSingularTerm IncludeWindowTimes Increment IndefiniteMatrixQ Indent IndentingNewlineSpacings IndentMaxFraction IndependenceTest IndependentEdgeSetQ IndependentPhysicalQuantity IndependentUnit IndependentUnitDimension IndependentVertexSetQ Indeterminate IndeterminateThreshold IndexCreationOptions Indexed IndexGraph IndexTag Inequality InexactNumberQ InexactNumbers InfiniteLine InfinitePlane Infinity Infix InflationAdjust InflationMethod Information InformationData InformationDataGrid Inherited InheritScope InhomogeneousPoissonProcess InitialEvaluationHistory Initialization InitializationCell InitializationCellEvaluation InitializationCellWarning InitializationObjects InitializationValue Initialize InitialSeeding InlineCounterAssignments InlineCounterIncrements InlineRules Inner InnerPolygon InnerPolyhedron Inpaint Input InputAliases InputAssumptions InputAutoReplacements InputField InputFieldBox InputFieldBoxOptions InputForm InputGrouping InputNamePacket InputNotebook InputPacket InputSettings InputStream InputString InputStringPacket InputToBoxFormPacket Insert InsertionFunction InsertionPointObject InsertLinebreaks InsertResults Inset Inset3DBox Inset3DBoxOptions InsetBox InsetBoxOptions Insphere Install InstallService InstanceNormalizationLayer InString Integer IntegerDigits IntegerExponent IntegerLength IntegerName IntegerPart IntegerPartitions IntegerQ IntegerReverse Integers IntegerString Integral Integrate Interactive InteractiveTradingChart Interlaced Interleaving InternallyBalancedDecomposition InterpolatingFunction InterpolatingPolynomial Interpolation InterpolationOrder InterpolationPoints InterpolationPrecision Interpretation InterpretationBox InterpretationBoxOptions InterpretationFunction Interpreter InterpretTemplate InterquartileRange Interrupt InterruptSettings IntersectingQ Intersection Interval IntervalIntersection IntervalMarkers IntervalMarkersStyle IntervalMemberQ IntervalSlider IntervalUnion Into Inverse InverseBetaRegularized InverseCDF InverseChiSquareDistribution InverseContinuousWaveletTransform InverseDistanceTransform InverseEllipticNomeQ InverseErf InverseErfc InverseFourier InverseFourierCosTransform InverseFourierSequenceTransform InverseFourierSinTransform InverseFourierTransform InverseFunction InverseFunctions InverseGammaDistribution InverseGammaRegularized InverseGaussianDistribution InverseGudermannian InverseHankelTransform InverseHaversine InverseImagePyramid InverseJacobiCD InverseJacobiCN InverseJacobiCS InverseJacobiDC InverseJacobiDN InverseJacobiDS InverseJacobiNC InverseJacobiND InverseJacobiNS InverseJacobiSC InverseJacobiSD InverseJacobiSN InverseLaplaceTransform InverseMellinTransform InversePermutation InverseRadon InverseRadonTransform InverseSeries InverseShortTimeFourier InverseSpectrogram InverseSurvivalFunction InverseTransformedRegion InverseWaveletTransform InverseWeierstrassP InverseWishartMatrixDistribution InverseZTransform Invisible InvisibleApplication InvisibleTimes IPAddress IrreduciblePolynomialQ IslandData IsolatingInterval IsomorphicGraphQ IsotopeData Italic Item ItemAspectRatio ItemBox ItemBoxOptions ItemSize ItemStyle ItoProcessJaccardDissimilarity JacobiAmplitude Jacobian JacobiCD JacobiCN JacobiCS JacobiDC JacobiDN JacobiDS JacobiNC JacobiND JacobiNS JacobiP JacobiSC JacobiSD JacobiSN JacobiSymbol JacobiZeta JankoGroupJ1 JankoGroupJ2 JankoGroupJ3 JankoGroupJ4 JarqueBeraALMTest JohnsonDistribution Join JoinAcross Joined JoinedCurve JoinedCurveBox JoinedCurveBoxOptions JoinForm JordanDecomposition JordanModelDecomposition JulianDate JuliaSetBoettcher JuliaSetIterationCount JuliaSetPlot JuliaSetPointsK KagiChart KaiserBesselWindow KaiserWindow KalmanEstimator KalmanFilter KarhunenLoeveDecomposition KaryTree KatzCentrality KCoreComponents KDistribution KEdgeConnectedComponents KEdgeConnectedGraphQ KelvinBei KelvinBer KelvinKei KelvinKer KendallTau KendallTauTest KernelExecute KernelFunction KernelMixtureDistribution Kernels Ket Key KeyCollisionFunction KeyComplement KeyDrop KeyDropFrom KeyExistsQ KeyFreeQ KeyIntersection KeyMap KeyMemberQ KeypointStrength Keys KeySelect KeySort KeySortBy KeyTake KeyUnion KeyValueMap KeyValuePattern Khinchin KillProcess KirchhoffGraph KirchhoffMatrix KleinInvariantJ KnapsackSolve KnightTourGraph KnotData KnownUnitQ KochCurve KolmogorovSmirnovTest KroneckerDelta KroneckerModelDecomposition KroneckerProduct KroneckerSymbol KuiperTest KumaraswamyDistribution Kurtosis KuwaharaFilter KVertexConnectedComponents KVertexConnectedGraphQLABColor Label Labeled LabeledSlider LabelingFunction LabelingSize LabelStyle LabelVisibility LaguerreL LakeData LambdaComponents LambertW LaminaData LanczosWindow LandauDistribution Language LanguageCategory LanguageData LanguageIdentify LanguageOptions LaplaceDistribution LaplaceTransform Laplacian LaplacianFilter LaplacianGaussianFilter Large Larger Last Latitude LatitudeLongitude LatticeData LatticeReduce Launch LaunchKernels LayeredGraphPlot LayerSizeFunction LayoutInformation LCHColor LCM LeaderSize LeafCount LeapYearQ LearnDistribution LearnedDistribution LearningRate LearningRateMultipliers LeastSquares LeastSquaresFilterKernel Left LeftArrow LeftArrowBar LeftArrowRightArrow LeftDownTeeVector LeftDownVector LeftDownVectorBar LeftRightArrow LeftRightVector LeftTee LeftTeeArrow LeftTeeVector LeftTriangle LeftTriangleBar LeftTriangleEqual LeftUpDownVector LeftUpTeeVector LeftUpVector LeftUpVectorBar LeftVector LeftVectorBar LegendAppearance Legended LegendFunction LegendLabel LegendLayout LegendMargins LegendMarkers LegendMarkerSize LegendreP LegendreQ LegendreType Length LengthWhile LerchPhi Less LessEqual LessEqualGreater LessEqualThan LessFullEqual LessGreater LessLess LessSlantEqual LessThan LessTilde LetterCharacter LetterCounts LetterNumber LetterQ Level LeveneTest LeviCivitaTensor LevyDistribution Lexicographic LibraryDataType LibraryFunction LibraryFunctionError LibraryFunctionInformation LibraryFunctionLoad LibraryFunctionUnload LibraryLoad LibraryUnload LicenseID LiftingFilterData LiftingWaveletTransform LightBlue LightBrown LightCyan Lighter LightGray LightGreen Lighting LightingAngle LightMagenta LightOrange LightPink LightPurple LightRed LightSources LightYellow Likelihood Limit LimitsPositioning LimitsPositioningTokens LindleyDistribution Line Line3DBox Line3DBoxOptions LinearFilter LinearFractionalOptimization LinearFractionalTransform LinearGradientImage LinearizingTransformationData LinearLayer LinearModelFit LinearOffsetFunction LinearOptimization LinearProgramming LinearRecurrence LinearSolve LinearSolveFunction LineBox LineBoxOptions LineBreak LinebreakAdjustments LineBreakChart LinebreakSemicolonWeighting LineBreakWithin LineColor LineGraph LineIndent LineIndentMaxFraction LineIntegralConvolutionPlot LineIntegralConvolutionScale LineLegend LineOpacity LineSpacing LineWrapParts LinkActivate LinkClose LinkConnect LinkConnectedQ LinkCreate LinkError LinkFlush LinkFunction LinkHost LinkInterrupt LinkLaunch LinkMode LinkObject LinkOpen LinkOptions LinkPatterns LinkProtocol LinkRankCentrality LinkRead LinkReadHeld LinkReadyQ Links LinkService LinkWrite LinkWriteHeld LiouvilleLambda List Listable ListAnimate ListContourPlot ListContourPlot3D ListConvolve ListCorrelate ListCurvePathPlot ListDeconvolve ListDensityPlot ListDensityPlot3D Listen ListFormat ListFourierSequenceTransform ListInterpolation ListLineIntegralConvolutionPlot ListLinePlot ListLogLinearPlot ListLogLogPlot ListLogPlot ListPicker ListPickerBox ListPickerBoxBackground ListPickerBoxOptions ListPlay ListPlot ListPlot3D ListPointPlot3D ListPolarPlot ListQ ListSliceContourPlot3D ListSliceDensityPlot3D ListSliceVectorPlot3D ListStepPlot ListStreamDensityPlot ListStreamPlot ListSurfacePlot3D ListVectorDensityPlot ListVectorPlot ListVectorPlot3D ListZTransform Literal LiteralSearch LocalAdaptiveBinarize LocalCache LocalClusteringCoefficient LocalizeDefinitions LocalizeVariables LocalObject LocalObjects LocalResponseNormalizationLayer LocalSubmit LocalSymbol LocalTime LocalTimeZone LocationEquivalenceTest LocationTest Locator LocatorAutoCreate LocatorBox LocatorBoxOptions LocatorCentering LocatorPane LocatorPaneBox LocatorPaneBoxOptions LocatorRegion Locked Log Log10 Log2 LogBarnesG LogGamma LogGammaDistribution LogicalExpand LogIntegral LogisticDistribution LogisticSigmoid LogitModelFit LogLikelihood LogLinearPlot LogLogisticDistribution LogLogPlot LogMultinormalDistribution LogNormalDistribution LogPlot LogRankTest LogSeriesDistribution LongEqual Longest LongestCommonSequence LongestCommonSequencePositions LongestCommonSubsequence LongestCommonSubsequencePositions LongestMatch LongestOrderedSequence LongForm Longitude LongLeftArrow LongLeftRightArrow LongRightArrow LongShortTermMemoryLayer Lookup Loopback LoopFreeGraphQ LossFunction LowerCaseQ LowerLeftArrow LowerRightArrow LowerTriangularize LowerTriangularMatrixQ LowpassFilter LQEstimatorGains LQGRegulator LQOutputRegulatorGains LQRegulatorGains LUBackSubstitution LucasL LuccioSamiComponents LUDecomposition LunarEclipse LUVColor LyapunovSolve LyonsGroupLyMachineID MachineName MachineNumberQ MachinePrecision MacintoshSystemPageSetup Magenta Magnification Magnify MailAddressValidation MailExecute MailFolder MailItem MailReceiverFunction MailResponseFunction MailSearch MailServerConnect MailServerConnection MailSettings MainSolve MaintainDynamicCaches Majority MakeBoxes MakeExpression MakeRules ManagedLibraryExpressionID ManagedLibraryExpressionQ MandelbrotSetBoettcher MandelbrotSetDistance MandelbrotSetIterationCount MandelbrotSetMemberQ MandelbrotSetPlot MangoldtLambda ManhattanDistance Manipulate Manipulator MannedSpaceMissionData MannWhitneyTest MantissaExponent Manual Map MapAll MapAt MapIndexed MAProcess MapThread MarchenkoPasturDistribution MarcumQ MardiaCombinedTest MardiaKurtosisTest MardiaSkewnessTest MarginalDistribution MarkovProcessProperties Masking MatchingDissimilarity MatchLocalNameQ MatchLocalNames MatchQ Material MathematicalFunctionData MathematicaNotation MathieuC MathieuCharacteristicA MathieuCharacteristicB MathieuCharacteristicExponent MathieuCPrime MathieuGroupM11 MathieuGroupM12 MathieuGroupM22 MathieuGroupM23 MathieuGroupM24 MathieuS MathieuSPrime MathMLForm MathMLText Matrices MatrixExp MatrixForm MatrixFunction MatrixLog MatrixNormalDistribution MatrixPlot MatrixPower MatrixPropertyDistribution MatrixQ MatrixRank MatrixTDistribution Max MaxBend MaxCellMeasure MaxColorDistance MaxDetect MaxDuration MaxExtraBandwidths MaxExtraConditions MaxFeatureDisplacement MaxFeatures MaxFilter MaximalBy Maximize MaxItems MaxIterations MaxLimit MaxMemoryUsed MaxMixtureKernels MaxOverlapFraction MaxPlotPoints MaxPoints MaxRecursion MaxStableDistribution MaxStepFraction MaxSteps MaxStepSize MaxTrainingRounds MaxValue MaxwellDistribution MaxWordGap McLaughlinGroupMcL Mean MeanAbsoluteLossLayer MeanAround MeanClusteringCoefficient MeanDegreeConnectivity MeanDeviation MeanFilter MeanGraphDistance MeanNeighborDegree MeanShift MeanShiftFilter MeanSquaredLossLayer Median MedianDeviation MedianFilter MedicalTestData Medium MeijerG MeijerGReduce MeixnerDistribution MellinConvolve MellinTransform MemberQ MemoryAvailable MemoryConstrained MemoryConstraint MemoryInUse MengerMesh Menu MenuAppearance MenuCommandKey MenuEvaluator MenuItem MenuList MenuPacket MenuSortingValue MenuStyle MenuView Merge MergeDifferences MergingFunction MersennePrimeExponent MersennePrimeExponentQ Mesh MeshCellCentroid MeshCellCount MeshCellHighlight MeshCellIndex MeshCellLabel MeshCellMarker MeshCellMeasure MeshCellQuality MeshCells MeshCellShapeFunction MeshCellStyle MeshCoordinates MeshFunctions MeshPrimitives MeshQualityGoal MeshRange MeshRefinementFunction MeshRegion MeshRegionQ MeshShading MeshStyle Message MessageDialog MessageList MessageName MessageObject MessageOptions MessagePacket Messages MessagesNotebook MetaCharacters MetaInformation MeteorShowerData Method MethodOptions MexicanHatWavelet MeyerWavelet Midpoint Min MinColorDistance MinDetect MineralData MinFilter MinimalBy MinimalPolynomial MinimalStateSpaceModel Minimize MinimumTimeIncrement MinIntervalSize MinkowskiQuestionMark MinLimit MinMax MinorPlanetData Minors MinRecursion MinSize MinStableDistribution Minus MinusPlus MinValue Missing MissingBehavior MissingDataMethod MissingDataRules MissingQ MissingString MissingStyle MissingValuePattern MittagLefflerE MixedFractionParts MixedGraphQ MixedMagnitude MixedRadix MixedRadixQuantity MixedUnit MixtureDistribution Mod Modal Mode Modular ModularInverse ModularLambda Module Modulus MoebiusMu Molecule MoleculeContainsQ MoleculeEquivalentQ MoleculeGraph MoleculeModify MoleculePattern MoleculePlot MoleculePlot3D MoleculeProperty MoleculeQ MoleculeValue Moment Momentary MomentConvert MomentEvaluate MomentGeneratingFunction MomentOfInertia Monday Monitor MonomialList MonomialOrder MonsterGroupM MoonPhase MoonPosition MorletWavelet MorphologicalBinarize MorphologicalBranchPoints MorphologicalComponents MorphologicalEulerNumber MorphologicalGraph MorphologicalPerimeter MorphologicalTransform MortalityData Most MountainData MouseAnnotation MouseAppearance MouseAppearanceTag MouseButtons Mouseover MousePointerNote MousePosition MovieData MovingAverage MovingMap MovingMedian MoyalDistribution Multicolumn MultiedgeStyle MultigraphQ MultilaunchWarning MultiLetterItalics MultiLetterStyle MultilineFunction Multinomial MultinomialDistribution MultinormalDistribution MultiplicativeOrder Multiplicity MultiplySides Multiselection MultivariateHypergeometricDistribution MultivariatePoissonDistribution MultivariateTDistributionN NakagamiDistribution NameQ Names NamespaceBox NamespaceBoxOptions Nand NArgMax NArgMin NBernoulliB NBodySimulation NBodySimulationData NCache NDEigensystem NDEigenvalues NDSolve NDSolveValue Nearest NearestFunction NearestNeighborGraph NearestTo NebulaData NeedCurrentFrontEndPackagePacket NeedCurrentFrontEndSymbolsPacket NeedlemanWunschSimilarity Needs Negative NegativeBinomialDistribution NegativeDefiniteMatrixQ NegativeIntegers NegativeMultinomialDistribution NegativeRationals NegativeReals NegativeSemidefiniteMatrixQ NeighborhoodData NeighborhoodGraph Nest NestedGreaterGreater NestedLessLess NestedScriptRules NestGraph NestList NestWhile NestWhileList NetAppend NetBidirectionalOperator NetChain NetDecoder NetDelete NetDrop NetEncoder NetEvaluationMode NetExtract NetFlatten NetFoldOperator NetGraph NetInformation NetInitialize NetInsert NetInsertSharedArrays NetJoin NetMapOperator NetMapThreadOperator NetMeasurements NetModel NetNestOperator NetPairEmbeddingOperator NetPort NetPortGradient NetPrepend NetRename NetReplace NetReplacePart NetSharedArray NetStateObject NetTake NetTrain NetTrainResultsObject NetworkPacketCapture NetworkPacketRecording NetworkPacketRecordingDuring NetworkPacketTrace NeumannValue NevilleThetaC NevilleThetaD NevilleThetaN NevilleThetaS NewPrimitiveStyle NExpectation Next NextCell NextDate NextPrime NextScheduledTaskTime NHoldAll NHoldFirst NHoldRest NicholsGridLines NicholsPlot NightHemisphere NIntegrate NMaximize NMaxValue NMinimize NMinValue NominalVariables NonAssociative NoncentralBetaDistribution NoncentralChiSquareDistribution NoncentralFRatioDistribution NoncentralStudentTDistribution NonCommutativeMultiply NonConstants NondimensionalizationTransform None NoneTrue NonlinearModelFit NonlinearStateSpaceModel NonlocalMeansFilter NonNegative NonNegativeIntegers NonNegativeRationals NonNegativeReals NonPositive NonPositiveIntegers NonPositiveRationals NonPositiveReals Nor NorlundB Norm Normal NormalDistribution NormalGrouping NormalizationLayer Normalize Normalized NormalizedSquaredEuclideanDistance NormalMatrixQ NormalsFunction NormFunction Not NotCongruent NotCupCap NotDoubleVerticalBar Notebook NotebookApply NotebookAutoSave NotebookClose NotebookConvertSettings NotebookCreate NotebookCreateReturnObject NotebookDefault NotebookDelete NotebookDirectory NotebookDynamicExpression NotebookEvaluate NotebookEventActions NotebookFileName NotebookFind NotebookFindReturnObject NotebookGet NotebookGetLayoutInformationPacket NotebookGetMisspellingsPacket NotebookImport NotebookInformation NotebookInterfaceObject NotebookLocate NotebookObject NotebookOpen NotebookOpenReturnObject NotebookPath NotebookPrint NotebookPut NotebookPutReturnObject NotebookRead NotebookResetGeneratedCells Notebooks NotebookSave NotebookSaveAs NotebookSelection NotebookSetupLayoutInformationPacket NotebooksMenu NotebookTemplate NotebookWrite NotElement NotEqualTilde NotExists NotGreater NotGreaterEqual NotGreaterFullEqual NotGreaterGreater NotGreaterLess NotGreaterSlantEqual NotGreaterTilde Nothing NotHumpDownHump NotHumpEqual NotificationFunction NotLeftTriangle NotLeftTriangleBar NotLeftTriangleEqual NotLess NotLessEqual NotLessFullEqual NotLessGreater NotLessLess NotLessSlantEqual NotLessTilde NotNestedGreaterGreater NotNestedLessLess NotPrecedes NotPrecedesEqual NotPrecedesSlantEqual NotPrecedesTilde NotReverseElement NotRightTriangle NotRightTriangleBar NotRightTriangleEqual NotSquareSubset NotSquareSubsetEqual NotSquareSuperset NotSquareSupersetEqual NotSubset NotSubsetEqual NotSucceeds NotSucceedsEqual NotSucceedsSlantEqual NotSucceedsTilde NotSuperset NotSupersetEqual NotTilde NotTildeEqual NotTildeFullEqual NotTildeTilde NotVerticalBar Now NoWhitespace NProbability NProduct NProductFactors NRoots NSolve NSum NSumTerms NuclearExplosionData NuclearReactorData Null NullRecords NullSpace NullWords Number NumberCompose NumberDecompose NumberExpand NumberFieldClassNumber NumberFieldDiscriminant NumberFieldFundamentalUnits NumberFieldIntegralBasis NumberFieldNormRepresentatives NumberFieldRegulator NumberFieldRootsOfUnity NumberFieldSignature NumberForm NumberFormat NumberLinePlot NumberMarks NumberMultiplier NumberPadding NumberPoint NumberQ NumberSeparator NumberSigns NumberString Numerator NumeratorDenominator NumericalOrder NumericalSort NumericArray NumericArrayQ NumericArrayType NumericFunction NumericQ NuttallWindow NValues NyquistGridLines NyquistPlotO ObservabilityGramian ObservabilityMatrix ObservableDecomposition ObservableModelQ OceanData Octahedron OddQ Off Offset OLEData On ONanGroupON Once OneIdentity Opacity OpacityFunction OpacityFunctionScaling Open OpenAppend Opener OpenerBox OpenerBoxOptions OpenerView OpenFunctionInspectorPacket Opening OpenRead OpenSpecialOptions OpenTemporary OpenWrite Operate OperatingSystem OptimumFlowData Optional OptionalElement OptionInspectorSettings OptionQ Options OptionsPacket OptionsPattern OptionValue OptionValueBox OptionValueBoxOptions Or Orange Order OrderDistribution OrderedQ Ordering OrderingBy OrderingLayer Orderless OrderlessPatternSequence OrnsteinUhlenbeckProcess Orthogonalize OrthogonalMatrixQ Out Outer OuterPolygon OuterPolyhedron OutputAutoOverwrite OutputControllabilityMatrix OutputControllableModelQ OutputForm OutputFormData OutputGrouping OutputMathEditExpression OutputNamePacket OutputResponse OutputSizeLimit OutputStream Over OverBar OverDot Overflow OverHat Overlaps Overlay OverlayBox OverlayBoxOptions Overscript OverscriptBox OverscriptBoxOptions OverTilde OverVector OverwriteTarget OwenT OwnValuesPackage PackingMethod PaddedForm Padding PaddingLayer PaddingSize PadeApproximant PadLeft PadRight PageBreakAbove PageBreakBelow PageBreakWithin PageFooterLines PageFooters PageHeaderLines PageHeaders PageHeight PageRankCentrality PageTheme PageWidth Pagination PairedBarChart PairedHistogram PairedSmoothHistogram PairedTTest PairedZTest PaletteNotebook PalettePath PalindromeQ Pane PaneBox PaneBoxOptions Panel PanelBox PanelBoxOptions Paneled PaneSelector PaneSelectorBox PaneSelectorBoxOptions PaperWidth ParabolicCylinderD ParagraphIndent ParagraphSpacing ParallelArray ParallelCombine ParallelDo Parallelepiped ParallelEvaluate Parallelization Parallelize ParallelMap ParallelNeeds Parallelogram ParallelProduct ParallelSubmit ParallelSum ParallelTable ParallelTry Parameter ParameterEstimator ParameterMixtureDistribution ParameterVariables ParametricFunction ParametricNDSolve ParametricNDSolveValue ParametricPlot ParametricPlot3D ParametricRegion ParentBox ParentCell ParentConnect ParentDirectory ParentForm Parenthesize ParentList ParentNotebook ParetoDistribution ParetoPickandsDistribution ParkData Part PartBehavior PartialCorrelationFunction PartialD ParticleAcceleratorData ParticleData Partition PartitionGranularity PartitionsP PartitionsQ PartLayer PartOfSpeech PartProtection ParzenWindow PascalDistribution PassEventsDown PassEventsUp Paste PasteAutoQuoteCharacters PasteBoxFormInlineCells PasteButton Path PathGraph PathGraphQ Pattern PatternSequence PatternTest PauliMatrix PaulWavelet Pause PausedTime PDF PeakDetect PeanoCurve PearsonChiSquareTest PearsonCorrelationTest PearsonDistribution PercentForm PerfectNumber PerfectNumberQ PerformanceGoal Perimeter PeriodicBoundaryCondition PeriodicInterpolation Periodogram PeriodogramArray Permanent Permissions PermissionsGroup PermissionsGroupMemberQ PermissionsGroups PermissionsKey PermissionsKeys PermutationCycles PermutationCyclesQ PermutationGroup PermutationLength PermutationList PermutationListQ PermutationMax PermutationMin PermutationOrder PermutationPower PermutationProduct PermutationReplace Permutations PermutationSupport Permute PeronaMalikFilter Perpendicular PerpendicularBisector PersistenceLocation PersistenceTime PersistentObject PersistentObjects PersistentValue PersonData PERTDistribution PetersenGraph PhaseMargins PhaseRange PhysicalSystemData Pi Pick PIDData PIDDerivativeFilter PIDFeedforward PIDTune Piecewise PiecewiseExpand PieChart PieChart3D PillaiTrace PillaiTraceTest PingTime Pink PitchRecognize Pivoting PixelConstrained PixelValue PixelValuePositions Placed Placeholder PlaceholderReplace Plain PlanarAngle PlanarGraph PlanarGraphQ PlanckRadiationLaw PlaneCurveData PlanetaryMoonData PlanetData PlantData Play PlayRange Plot Plot3D Plot3Matrix PlotDivision PlotJoined PlotLabel PlotLabels PlotLayout PlotLegends PlotMarkers PlotPoints PlotRange PlotRangeClipping PlotRangeClipPlanesStyle PlotRangePadding PlotRegion PlotStyle PlotTheme Pluralize Plus PlusMinus Pochhammer PodStates PodWidth Point Point3DBox Point3DBoxOptions PointBox PointBoxOptions PointFigureChart PointLegend PointSize PoissonConsulDistribution PoissonDistribution PoissonProcess PoissonWindow PolarAxes PolarAxesOrigin PolarGridLines PolarPlot PolarTicks PoleZeroMarkers PolyaAeppliDistribution PolyGamma Polygon Polygon3DBox Polygon3DBoxOptions PolygonalNumber PolygonAngle PolygonBox PolygonBoxOptions PolygonCoordinates PolygonDecomposition PolygonHoleScale PolygonIntersections PolygonScale Polyhedron PolyhedronAngle PolyhedronCoordinates PolyhedronData PolyhedronDecomposition PolyhedronGenus PolyLog PolynomialExtendedGCD PolynomialForm PolynomialGCD PolynomialLCM PolynomialMod PolynomialQ PolynomialQuotient PolynomialQuotientRemainder PolynomialReduce PolynomialRemainder Polynomials PoolingLayer PopupMenu PopupMenuBox PopupMenuBoxOptions PopupView PopupWindow Position PositionIndex Positive PositiveDefiniteMatrixQ PositiveIntegers PositiveRationals PositiveReals PositiveSemidefiniteMatrixQ PossibleZeroQ Postfix PostScript Power PowerDistribution PowerExpand PowerMod PowerModList PowerRange PowerSpectralDensity PowersRepresentations PowerSymmetricPolynomial Precedence PrecedenceForm Precedes PrecedesEqual PrecedesSlantEqual PrecedesTilde Precision PrecisionGoal PreDecrement Predict PredictionRoot PredictorFunction PredictorInformation PredictorMeasurements PredictorMeasurementsObject PreemptProtect PreferencesPath Prefix PreIncrement Prepend PrependLayer PrependTo PreprocessingRules PreserveColor PreserveImageOptions Previous PreviousCell PreviousDate PriceGraphDistribution PrimaryPlaceholder Prime PrimeNu PrimeOmega PrimePi PrimePowerQ PrimeQ Primes PrimeZetaP PrimitivePolynomialQ PrimitiveRoot PrimitiveRootList PrincipalComponents PrincipalValue Print PrintableASCIIQ PrintAction PrintForm PrintingCopies PrintingOptions PrintingPageRange PrintingStartingPageNumber PrintingStyleEnvironment Printout3D Printout3DPreviewer PrintPrecision PrintTemporary Prism PrismBox PrismBoxOptions PrivateCellOptions PrivateEvaluationOptions PrivateFontOptions PrivateFrontEndOptions PrivateKey PrivateNotebookOptions PrivatePaths Probability ProbabilityDistribution ProbabilityPlot ProbabilityPr ProbabilityScalePlot ProbitModelFit ProcessConnection ProcessDirectory ProcessEnvironment Processes ProcessEstimator ProcessInformation ProcessObject ProcessParameterAssumptions ProcessParameterQ ProcessStateDomain ProcessStatus ProcessTimeDomain Product ProductDistribution ProductLog ProgressIndicator ProgressIndicatorBox ProgressIndicatorBoxOptions Projection Prolog PromptForm ProofObject Properties Property PropertyList PropertyValue Proportion Proportional Protect Protected ProteinData Pruning PseudoInverse PsychrometricPropertyData PublicKey PublisherID PulsarData PunctuationCharacter Purple Put PutAppend Pyramid PyramidBox PyramidBoxOptionsQBinomial QFactorial QGamma QHypergeometricPFQ QnDispersion QPochhammer QPolyGamma QRDecomposition QuadraticIrrationalQ QuadraticOptimization Quantile QuantilePlot Quantity QuantityArray QuantityDistribution QuantityForm QuantityMagnitude QuantityQ QuantityUnit QuantityVariable QuantityVariableCanonicalUnit QuantityVariableDimensions QuantityVariableIdentifier QuantityVariablePhysicalQuantity Quartics QuartileDeviation Quartiles QuartileSkewness Query QueueingNetworkProcess QueueingProcess QueueProperties Quiet Quit Quotient QuotientRemainderRadialGradientImage RadialityCentrality RadicalBox RadicalBoxOptions RadioButton RadioButtonBar RadioButtonBox RadioButtonBoxOptions Radon RadonTransform RamanujanTau RamanujanTauL RamanujanTauTheta RamanujanTauZ Ramp Random RandomChoice RandomColor RandomComplex RandomEntity RandomFunction RandomGeoPosition RandomGraph RandomImage RandomInstance RandomInteger RandomPermutation RandomPoint RandomPolygon RandomPolyhedron RandomPrime RandomReal RandomSample RandomSeed RandomSeeding RandomVariate RandomWalkProcess RandomWord Range RangeFilter RangeSpecification RankedMax RankedMin RarerProbability Raster Raster3D Raster3DBox Raster3DBoxOptions RasterArray RasterBox RasterBoxOptions Rasterize RasterSize Rational RationalFunctions Rationalize Rationals Ratios RawArray RawBoxes RawData RawMedium RayleighDistribution Re Read ReadByteArray ReadLine ReadList ReadProtected ReadString Real RealAbs RealBlockDiagonalForm RealDigits RealExponent Reals RealSign Reap RecognitionPrior RecognitionThreshold Record RecordLists RecordSeparators Rectangle RectangleBox RectangleBoxOptions RectangleChart RectangleChart3D RectangularRepeatingElement RecurrenceFilter RecurrenceTable RecurringDigitsForm Red Reduce RefBox ReferenceLineStyle ReferenceMarkers ReferenceMarkerStyle Refine ReflectionMatrix ReflectionTransform Refresh RefreshRate Region RegionBinarize RegionBoundary RegionBounds RegionCentroid RegionDifference RegionDimension RegionDisjoint RegionDistance RegionDistanceFunction RegionEmbeddingDimension RegionEqual RegionFunction RegionImage RegionIntersection RegionMeasure RegionMember RegionMemberFunction RegionMoment RegionNearest RegionNearestFunction RegionPlot RegionPlot3D RegionProduct RegionQ RegionResize RegionSize RegionSymmetricDifference RegionUnion RegionWithin RegisterExternalEvaluator RegularExpression Regularization RegularlySampledQ RegularPolygon ReIm ReImLabels ReImPlot ReImStyle Reinstall RelationalDatabase RelationGraph Release ReleaseHold ReliabilityDistribution ReliefImage ReliefPlot RemoteAuthorizationCaching RemoteConnect RemoteConnectionObject RemoteFile RemoteRun RemoteRunProcess Remove RemoveAlphaChannel RemoveAsynchronousTask RemoveAudioStream RemoveBackground RemoveChannelListener RemoveChannelSubscribers Removed RemoveDiacritics RemoveInputStreamMethod RemoveOutputStreamMethod RemoveProperty RemoveScheduledTask RemoveUsers RenameDirectory RenameFile RenderAll RenderingOptions RenewalProcess RenkoChart RepairMesh Repeated RepeatedNull RepeatedString RepeatedTiming RepeatingElement Replace ReplaceAll ReplaceHeldPart ReplaceImageValue ReplaceList ReplacePart ReplacePixelValue ReplaceRepeated ReplicateLayer RequiredPhysicalQuantities Resampling ResamplingAlgorithmData ResamplingMethod Rescale RescalingTransform ResetDirectory ResetMenusPacket ResetScheduledTask ReshapeLayer Residue ResizeLayer Resolve ResourceAcquire ResourceData ResourceFunction ResourceObject ResourceRegister ResourceRemove ResourceSearch ResourceSubmissionObject ResourceSubmit ResourceSystemBase ResourceUpdate ResponseForm Rest RestartInterval Restricted Resultant ResumePacket Return ReturnEntersInput ReturnExpressionPacket ReturnInputFormPacket ReturnPacket ReturnReceiptFunction ReturnTextPacket Reverse ReverseBiorthogonalSplineWavelet ReverseElement ReverseEquilibrium ReverseGraph ReverseSort ReverseSortBy ReverseUpEquilibrium RevolutionAxis RevolutionPlot3D RGBColor RiccatiSolve RiceDistribution RidgeFilter RiemannR RiemannSiegelTheta RiemannSiegelZ RiemannXi Riffle Right RightArrow RightArrowBar RightArrowLeftArrow RightComposition RightCosetRepresentative RightDownTeeVector RightDownVector RightDownVectorBar RightTee RightTeeArrow RightTeeVector RightTriangle RightTriangleBar RightTriangleEqual RightUpDownVector RightUpTeeVector RightUpVector RightUpVectorBar RightVector RightVectorBar RiskAchievementImportance RiskReductionImportance RogersTanimotoDissimilarity RollPitchYawAngles RollPitchYawMatrix RomanNumeral Root RootApproximant RootIntervals RootLocusPlot RootMeanSquare RootOfUnityQ RootReduce Roots RootSum Rotate RotateLabel RotateLeft RotateRight RotationAction RotationBox RotationBoxOptions RotationMatrix RotationTransform Round RoundImplies RoundingRadius Row RowAlignments RowBackgrounds RowBox RowHeights RowLines RowMinHeight RowReduce RowsEqual RowSpacings RSolve RSolveValue RudinShapiro RudvalisGroupRu Rule RuleCondition RuleDelayed RuleForm RulePlot RulerUnits Run RunProcess RunScheduledTask RunThrough RuntimeAttributes RuntimeOptions RussellRaoDissimilaritySameQ SameTest SampledEntityClass SampleDepth SampledSoundFunction SampledSoundList SampleRate SamplingPeriod SARIMAProcess SARMAProcess SASTriangle SatelliteData SatisfiabilityCount SatisfiabilityInstances SatisfiableQ Saturday Save Saveable SaveAutoDelete SaveConnection SaveDefinitions SavitzkyGolayMatrix SawtoothWave Scale Scaled ScaleDivisions ScaledMousePosition ScaleOrigin ScalePadding ScaleRanges ScaleRangeStyle ScalingFunctions ScalingMatrix ScalingTransform Scan ScheduledTask ScheduledTaskActiveQ ScheduledTaskInformation ScheduledTaskInformationData ScheduledTaskObject ScheduledTasks SchurDecomposition ScientificForm ScientificNotationThreshold ScorerGi ScorerGiPrime ScorerHi ScorerHiPrime ScreenRectangle ScreenStyleEnvironment ScriptBaselineShifts ScriptForm ScriptLevel ScriptMinSize ScriptRules ScriptSizeMultipliers Scrollbars ScrollingOptions ScrollPosition SearchAdjustment SearchIndexObject SearchIndices SearchQueryString SearchResultObject Sec Sech SechDistribution SecondOrderConeOptimization SectionGrouping SectorChart SectorChart3D SectorOrigin SectorSpacing SecuredAuthenticationKey SecuredAuthenticationKeys SeedRandom Select Selectable SelectComponents SelectedCells SelectedNotebook SelectFirst Selection SelectionAnimate SelectionCell SelectionCellCreateCell SelectionCellDefaultStyle SelectionCellParentStyle SelectionCreateCell SelectionDebuggerTag SelectionDuplicateCell SelectionEvaluate SelectionEvaluateCreateCell SelectionMove SelectionPlaceholder SelectionSetStyle SelectWithContents SelfLoops SelfLoopStyle SemanticImport SemanticImportString SemanticInterpretation SemialgebraicComponentInstances SemidefiniteOptimization SendMail SendMessage Sequence SequenceAlignment SequenceAttentionLayer SequenceCases SequenceCount SequenceFold SequenceFoldList SequenceForm SequenceHold SequenceLastLayer SequenceMostLayer SequencePosition SequencePredict SequencePredictorFunction SequenceReplace SequenceRestLayer SequenceReverseLayer SequenceSplit Series SeriesCoefficient SeriesData ServiceConnect ServiceDisconnect ServiceExecute ServiceObject ServiceRequest ServiceResponse ServiceSubmit SessionSubmit SessionTime Set SetAccuracy SetAlphaChannel SetAttributes Setbacks SetBoxFormNamesPacket SetCloudDirectory SetCookies SetDelayed SetDirectory SetEnvironment SetEvaluationNotebook SetFileDate SetFileLoadingContext SetNotebookStatusLine SetOptions SetOptionsPacket SetPermissions SetPrecision SetProperty SetSecuredAuthenticationKey SetSelectedNotebook SetSharedFunction SetSharedVariable SetSpeechParametersPacket SetStreamPosition SetSystemModel SetSystemOptions Setter SetterBar SetterBox SetterBoxOptions Setting SetUsers SetValue Shading Shallow ShannonWavelet ShapiroWilkTest Share SharingList Sharpen ShearingMatrix ShearingTransform ShellRegion ShenCastanMatrix ShiftedGompertzDistribution ShiftRegisterSequence Short ShortDownArrow Shortest ShortestMatch ShortestPathFunction ShortLeftArrow ShortRightArrow ShortTimeFourier ShortTimeFourierData ShortUpArrow Show ShowAutoConvert ShowAutoSpellCheck ShowAutoStyles ShowCellBracket ShowCellLabel ShowCellTags ShowClosedCellArea ShowCodeAssist ShowContents ShowControls ShowCursorTracker ShowGroupOpenCloseIcon ShowGroupOpener ShowInvisibleCharacters ShowPageBreaks ShowPredictiveInterface ShowSelection ShowShortBoxForm ShowSpecialCharacters ShowStringCharacters ShowSyntaxStyles ShrinkingDelay ShrinkWrapBoundingBox SiderealTime SiegelTheta SiegelTukeyTest SierpinskiCurve SierpinskiMesh Sign Signature SignedRankTest SignedRegionDistance SignificanceLevel SignPadding SignTest SimilarityRules SimpleGraph SimpleGraphQ SimplePolygonQ SimplePolyhedronQ Simplex Simplify Sin Sinc SinghMaddalaDistribution SingleEvaluation SingleLetterItalics SingleLetterStyle SingularValueDecomposition SingularValueList SingularValuePlot SingularValues Sinh SinhIntegral SinIntegral SixJSymbol Skeleton SkeletonTransform SkellamDistribution Skewness SkewNormalDistribution SkinStyle Skip SliceContourPlot3D SliceDensityPlot3D SliceDistribution SliceVectorPlot3D Slider Slider2D Slider2DBox Slider2DBoxOptions SliderBox SliderBoxOptions SlideView Slot SlotSequence Small SmallCircle Smaller SmithDecomposition SmithDelayCompensator SmithWatermanSimilarity SmoothDensityHistogram SmoothHistogram SmoothHistogram3D SmoothKernelDistribution SnDispersion Snippet SnubPolyhedron SocialMediaData Socket SocketConnect SocketListen SocketListener SocketObject SocketOpen SocketReadMessage SocketReadyQ Sockets SocketWaitAll SocketWaitNext SoftmaxLayer SokalSneathDissimilarity SolarEclipse SolarSystemFeatureData SolidAngle SolidData SolidRegionQ Solve SolveAlways SolveDelayed Sort SortBy SortedBy SortedEntityClass Sound SoundAndGraphics SoundNote SoundVolume SourceLink Sow Space SpaceCurveData SpaceForm Spacer Spacings Span SpanAdjustments SpanCharacterRounding SpanFromAbove SpanFromBoth SpanFromLeft SpanLineThickness SpanMaxSize SpanMinSize SpanningCharacters SpanSymmetric SparseArray SpatialGraphDistribution SpatialMedian SpatialTransformationLayer Speak SpeakTextPacket SpearmanRankTest SpearmanRho SpeciesData SpecificityGoal SpectralLineData Spectrogram SpectrogramArray Specularity SpeechRecognize SpeechSynthesize SpellingCorrection SpellingCorrectionList SpellingDictionaries SpellingDictionariesPath SpellingOptions SpellingSuggestionsPacket Sphere SphereBox SpherePoints SphericalBesselJ SphericalBesselY SphericalHankelH1 SphericalHankelH2 SphericalHarmonicY SphericalPlot3D SphericalRegion SphericalShell SpheroidalEigenvalue SpheroidalJoiningFactor SpheroidalPS SpheroidalPSPrime SpheroidalQS SpheroidalQSPrime SpheroidalRadialFactor SpheroidalS1 SpheroidalS1Prime SpheroidalS2 SpheroidalS2Prime Splice SplicedDistribution SplineClosed SplineDegree SplineKnots SplineWeights Split SplitBy SpokenString Sqrt SqrtBox SqrtBoxOptions Square SquaredEuclideanDistance SquareFreeQ SquareIntersection SquareMatrixQ SquareRepeatingElement SquaresR SquareSubset SquareSubsetEqual SquareSuperset SquareSupersetEqual SquareUnion SquareWave SSSTriangle StabilityMargins StabilityMarginsStyle StableDistribution Stack StackBegin StackComplete StackedDateListPlot StackedListPlot StackInhibit StadiumShape StandardAtmosphereData StandardDeviation StandardDeviationFilter StandardForm Standardize Standardized StandardOceanData StandbyDistribution Star StarClusterData StarData StarGraph StartAsynchronousTask StartExternalSession StartingStepSize StartOfLine StartOfString StartProcess StartScheduledTask StartupSound StartWebSession StateDimensions StateFeedbackGains StateOutputEstimator StateResponse StateSpaceModel StateSpaceRealization StateSpaceTransform StateTransformationLinearize StationaryDistribution StationaryWaveletPacketTransform StationaryWaveletTransform StatusArea StatusCentrality StepMonitor StereochemistryElements StieltjesGamma StirlingS1 StirlingS2 StopAsynchronousTask StoppingPowerData StopScheduledTask StrataVariables StratonovichProcess StreamColorFunction StreamColorFunctionScaling StreamDensityPlot StreamMarkers StreamPlot StreamPoints StreamPosition Streams StreamScale StreamStyle String StringBreak StringByteCount StringCases StringContainsQ StringCount StringDelete StringDrop StringEndsQ StringExpression StringExtract StringForm StringFormat StringFreeQ StringInsert StringJoin StringLength StringMatchQ StringPadLeft StringPadRight StringPart StringPartition StringPosition StringQ StringRepeat StringReplace StringReplaceList StringReplacePart StringReverse StringRiffle StringRotateLeft StringRotateRight StringSkeleton StringSplit StringStartsQ StringTake StringTemplate StringToByteArray StringToStream StringTrim StripBoxes StripOnInput StripWrapperBoxes StrokeForm StructuralImportance StructuredArray StructuredSelection StruveH StruveL Stub StudentTDistribution Style StyleBox StyleBoxAutoDelete StyleData StyleDefinitions StyleForm StyleHints StyleKeyMapping StyleMenuListing StyleNameDialogSettings StyleNames StylePrint StyleSheetPath Subdivide Subfactorial Subgraph SubMinus SubPlus SubresultantPolynomialRemainders SubresultantPolynomials Subresultants Subscript SubscriptBox SubscriptBoxOptions Subscripted Subsequences Subset SubsetEqual SubsetMap SubsetQ Subsets SubStar SubstitutionSystem Subsuperscript SubsuperscriptBox SubsuperscriptBoxOptions Subtract SubtractFrom SubtractSides SubValues Succeeds SucceedsEqual SucceedsSlantEqual SucceedsTilde Success SuchThat Sum SumConvergence SummationLayer Sunday SunPosition Sunrise Sunset SuperDagger SuperMinus SupernovaData SuperPlus Superscript SuperscriptBox SuperscriptBoxOptions Superset SupersetEqual SuperStar Surd SurdForm SurfaceArea SurfaceColor SurfaceData SurfaceGraphics SurvivalDistribution SurvivalFunction SurvivalModel SurvivalModelFit SuspendPacket SuzukiDistribution SuzukiGroupSuz SwatchLegend Switch Symbol SymbolName SymletWavelet Symmetric SymmetricGroup SymmetricKey SymmetricMatrixQ SymmetricPolynomial SymmetricReduction Symmetrize SymmetrizedArray SymmetrizedArrayRules SymmetrizedDependentComponents SymmetrizedIndependentComponents SymmetrizedReplacePart SynchronousInitialization SynchronousUpdating Synonyms Syntax SyntaxForm SyntaxInformation SyntaxLength SyntaxPacket SyntaxQ SynthesizeMissingValues SystemDialogInput SystemException SystemGet SystemHelpPath SystemInformation SystemInformationData SystemInstall SystemModel SystemModeler SystemModelExamples SystemModelLinearize SystemModelParametricSimulate SystemModelPlot SystemModelProgressReporting SystemModelReliability SystemModels SystemModelSimulate SystemModelSimulateSensitivity SystemModelSimulationData SystemOpen SystemOptions SystemProcessData SystemProcesses SystemsConnectionsModel SystemsModelDelay SystemsModelDelayApproximate SystemsModelDelete SystemsModelDimensions SystemsModelExtract SystemsModelFeedbackConnect SystemsModelLabels SystemsModelLinearity SystemsModelMerge SystemsModelOrder SystemsModelParallelConnect SystemsModelSeriesConnect SystemsModelStateFeedbackConnect SystemsModelVectorRelativeOrders SystemStub SystemTestTab TabFilling Table TableAlignments TableDepth TableDirections TableForm TableHeadings TableSpacing TableView TableViewBox TableViewBoxBackground TableViewBoxOptions TabSpacings TabView TabViewBox TabViewBoxOptions TagBox TagBoxNote TagBoxOptions TaggingRules TagSet TagSetDelayed TagStyle TagUnset Take TakeDrop TakeLargest TakeLargestBy TakeList TakeSmallest TakeSmallestBy TakeWhile Tally Tan Tanh TargetDevice TargetFunctions TargetSystem TargetUnits TaskAbort TaskExecute TaskObject TaskRemove TaskResume Tasks TaskSuspend TaskWait TautologyQ TelegraphProcess TemplateApply TemplateArgBox TemplateBox TemplateBoxOptions TemplateEvaluate TemplateExpression TemplateIf TemplateObject TemplateSequence TemplateSlot TemplateSlotSequence TemplateUnevaluated TemplateVerbatim TemplateWith TemporalData TemporalRegularity Temporary TemporaryVariable TensorContract TensorDimensions TensorExpand TensorProduct TensorQ TensorRank TensorReduce TensorSymmetry TensorTranspose TensorWedge TestID TestReport TestReportObject TestResultObject Tetrahedron TetrahedronBox TetrahedronBoxOptions TeXForm TeXSave Text Text3DBox Text3DBoxOptions TextAlignment TextBand TextBoundingBox TextBox TextCases TextCell TextClipboardType TextContents TextData TextElement TextForm TextGrid TextJustification TextLine TextPacket TextParagraph TextPosition TextRecognize TextSearch TextSearchReport TextSentences TextString TextStructure TextStyle TextTranslation Texture TextureCoordinateFunction TextureCoordinateScaling TextWords Therefore ThermodynamicData ThermometerGauge Thick Thickness Thin Thinning ThisLink ThompsonGroupTh Thread ThreadingLayer ThreeJSymbol Threshold Through Throw ThueMorse Thumbnail Thursday Ticks TicksStyle TideData Tilde TildeEqual TildeFullEqual TildeTilde TimeConstrained TimeConstraint TimeDirection TimeFormat TimeGoal TimelinePlot TimeObject TimeObjectQ Times TimesBy TimeSeries TimeSeriesAggregate TimeSeriesForecast TimeSeriesInsert TimeSeriesInvertibility TimeSeriesMap TimeSeriesMapThread TimeSeriesModel TimeSeriesModelFit TimeSeriesResample TimeSeriesRescale TimeSeriesShift TimeSeriesThread TimeSeriesWindow TimeUsed TimeValue TimeWarpingCorrespondence TimeWarpingDistance TimeZone TimeZoneConvert TimeZoneOffset Timing Tiny TitleGrouping TitsGroupT ToBoxes ToCharacterCode ToColor ToContinuousTimeModel ToDate Today ToDiscreteTimeModel ToEntity ToeplitzMatrix ToExpression ToFileName Together Toggle ToggleFalse Toggler TogglerBar TogglerBox TogglerBoxOptions ToHeldExpression ToInvertibleTimeSeries TokenWords Tolerance ToLowerCase Tomorrow ToNumberField TooBig Tooltip TooltipBox TooltipBoxOptions TooltipDelay TooltipStyle Top TopHatTransform ToPolarCoordinates TopologicalSort ToRadicals ToRules ToSphericalCoordinates ToString Total TotalHeight TotalLayer TotalVariationFilter TotalWidth TouchPosition TouchscreenAutoZoom TouchscreenControlPlacement ToUpperCase Tr Trace TraceAbove TraceAction TraceBackward TraceDepth TraceDialog TraceForward TraceInternal TraceLevel TraceOff TraceOn TraceOriginal TracePrint TraceScan TrackedSymbols TrackingFunction TracyWidomDistribution TradingChart TraditionalForm TraditionalFunctionNotation TraditionalNotation TraditionalOrder TrainingProgressCheckpointing TrainingProgressFunction TrainingProgressMeasurements TrainingProgressReporting TrainingStoppingCriterion TransferFunctionCancel TransferFunctionExpand TransferFunctionFactor TransferFunctionModel TransferFunctionPoles TransferFunctionTransform TransferFunctionZeros TransformationClass TransformationFunction TransformationFunctions TransformationMatrix TransformedDistribution TransformedField TransformedProcess TransformedRegion TransitionDirection TransitionDuration TransitionEffect TransitiveClosureGraph TransitiveReductionGraph Translate TranslationOptions TranslationTransform Transliterate Transparent TransparentColor Transpose TransposeLayer TrapSelection TravelDirections TravelDirectionsData TravelDistance TravelDistanceList TravelMethod TravelTime TreeForm TreeGraph TreeGraphQ TreePlot TrendStyle Triangle TriangleCenter TriangleConstruct TriangleMeasurement TriangleWave TriangularDistribution TriangulateMesh Trig TrigExpand TrigFactor TrigFactorList Trigger TrigReduce TrigToExp TrimmedMean TrimmedVariance TropicalStormData True TrueQ TruncatedDistribution TruncatedPolyhedron TsallisQExponentialDistribution TsallisQGaussianDistribution TTest Tube TubeBezierCurveBox TubeBezierCurveBoxOptions TubeBox TubeBoxOptions TubeBSplineCurveBox TubeBSplineCurveBoxOptions Tuesday TukeyLambdaDistribution TukeyWindow TunnelData Tuples TuranGraph TuringMachine TuttePolynomial TwoWayRule Typed TypeSpecifierUnateQ Uncompress UnconstrainedParameters Undefined UnderBar Underflow Underlined Underoverscript UnderoverscriptBox UnderoverscriptBoxOptions Underscript UnderscriptBox UnderscriptBoxOptions UnderseaFeatureData UndirectedEdge UndirectedGraph UndirectedGraphQ UndoOptions UndoTrackedVariables Unequal UnequalTo Unevaluated UniformDistribution UniformGraphDistribution UniformPolyhedron UniformSumDistribution Uninstall Union UnionPlus Unique UnitaryMatrixQ UnitBox UnitConvert UnitDimensions Unitize UnitRootTest UnitSimplify UnitStep UnitSystem UnitTriangle UnitVector UnitVectorLayer UnityDimensions UniverseModelData UniversityData UnixTime Unprotect UnregisterExternalEvaluator UnsameQ UnsavedVariables Unset UnsetShared UntrackedVariables Up UpArrow UpArrowBar UpArrowDownArrow Update UpdateDynamicObjects UpdateDynamicObjectsSynchronous UpdateInterval UpdateSearchIndex UpDownArrow UpEquilibrium UpperCaseQ UpperLeftArrow UpperRightArrow UpperTriangularize UpperTriangularMatrixQ Upsample UpSet UpSetDelayed UpTee UpTeeArrow UpTo UpValues URL URLBuild URLDecode URLDispatcher URLDownload URLDownloadSubmit URLEncode URLExecute URLExpand URLFetch URLFetchAsynchronous URLParse URLQueryDecode URLQueryEncode URLRead URLResponseTime URLSave URLSaveAsynchronous URLShorten URLSubmit UseGraphicsRange UserDefinedWavelet Using UsingFrontEnd UtilityFunctionV2Get ValenceErrorHandling ValidationLength ValidationSet Value ValueBox ValueBoxOptions ValueDimensions ValueForm ValuePreprocessingFunction ValueQ Values ValuesData Variables Variance VarianceEquivalenceTest VarianceEstimatorFunction VarianceGammaDistribution VarianceTest VectorAngle VectorAround VectorColorFunction VectorColorFunctionScaling VectorDensityPlot VectorGlyphData VectorGreater VectorGreaterEqual VectorLess VectorLessEqual VectorMarkers VectorPlot VectorPlot3D VectorPoints VectorQ Vectors VectorScale VectorStyle Vee Verbatim Verbose VerboseConvertToPostScriptPacket VerificationTest VerifyConvergence VerifyDerivedKey VerifyDigitalSignature VerifyInterpretation VerifySecurityCertificates VerifySolutions VerifyTestAssumptions Version VersionNumber VertexAdd VertexCapacity VertexColors VertexComponent VertexConnectivity VertexContract VertexCoordinateRules VertexCoordinates VertexCorrelationSimilarity VertexCosineSimilarity VertexCount VertexCoverQ VertexDataCoordinates VertexDegree VertexDelete VertexDiceSimilarity VertexEccentricity VertexInComponent VertexInDegree VertexIndex VertexJaccardSimilarity VertexLabeling VertexLabels VertexLabelStyle VertexList VertexNormals VertexOutComponent VertexOutDegree VertexQ VertexRenderingFunction VertexReplace VertexShape VertexShapeFunction VertexSize VertexStyle VertexTextureCoordinates VertexWeight VertexWeightedGraphQ Vertical VerticalBar VerticalForm VerticalGauge VerticalSeparator VerticalSlider VerticalTilde ViewAngle ViewCenter ViewMatrix ViewPoint ViewPointSelectorSettings ViewPort ViewProjection ViewRange ViewVector ViewVertical VirtualGroupData Visible VisibleCell VoiceStyleData VoigtDistribution VolcanoData Volume VonMisesDistribution VoronoiMeshWaitAll WaitAsynchronousTask WaitNext WaitUntil WakebyDistribution WalleniusHypergeometricDistribution WaringYuleDistribution WarpingCorrespondence WarpingDistance WatershedComponents WatsonUSquareTest WattsStrogatzGraphDistribution WaveletBestBasis WaveletFilterCoefficients WaveletImagePlot WaveletListPlot WaveletMapIndexed WaveletMatrixPlot WaveletPhi WaveletPsi WaveletScale WaveletScalogram WaveletThreshold WeaklyConnectedComponents WeaklyConnectedGraphComponents WeaklyConnectedGraphQ WeakStationarity WeatherData WeatherForecastData WebAudioSearch WebElementObject WeberE WebExecute WebImage WebImageSearch WebSearch WebSessionObject WebSessions WebWindowObject Wedge Wednesday WeibullDistribution WeierstrassE1 WeierstrassE2 WeierstrassE3 WeierstrassEta1 WeierstrassEta2 WeierstrassEta3 WeierstrassHalfPeriods WeierstrassHalfPeriodW1 WeierstrassHalfPeriodW2 WeierstrassHalfPeriodW3 WeierstrassInvariantG2 WeierstrassInvariantG3 WeierstrassInvariants WeierstrassP WeierstrassPPrime WeierstrassSigma WeierstrassZeta WeightedAdjacencyGraph WeightedAdjacencyMatrix WeightedData WeightedGraphQ Weights WelchWindow WheelGraph WhenEvent Which While White WhiteNoiseProcess WhitePoint Whitespace WhitespaceCharacter WhittakerM WhittakerW WienerFilter WienerProcess WignerD WignerSemicircleDistribution WikipediaData WikipediaSearch WilksW WilksWTest WindDirectionData WindingCount WindingPolygon WindowClickSelect WindowElements WindowFloating WindowFrame WindowFrameElements WindowMargins WindowMovable WindowOpacity WindowPersistentStyles WindowSelected WindowSize WindowStatusArea WindowTitle WindowToolbars WindowWidth WindSpeedData WindVectorData WinsorizedMean WinsorizedVariance WishartMatrixDistribution With WolframAlpha WolframAlphaDate WolframAlphaQuantity WolframAlphaResult WolframLanguageData Word WordBoundary WordCharacter WordCloud WordCount WordCounts WordData WordDefinition WordFrequency WordFrequencyData WordList WordOrientation WordSearch WordSelectionFunction WordSeparators WordSpacings WordStem WordTranslation WorkingPrecision WrapAround Write WriteLine WriteString WronskianXMLElement XMLObject XMLTemplate Xnor Xor XYZColorYellow Yesterday YuleDissimilarityZernikeR ZeroSymmetric ZeroTest ZeroWidthTimes Zeta ZetaZero ZIPCodeData ZipfDistribution ZoomCenter ZoomFactor ZTest ZTransform$Aborted $ActivationGroupID $ActivationKey $ActivationUserRegistered $AddOnsDirectory $AllowExternalChannelFunctions $AssertFunction $Assumptions $AsynchronousTask $AudioInputDevices $AudioOutputDevices $BaseDirectory $BatchInput $BatchOutput $BlockchainBase $BoxForms $ByteOrdering $CacheBaseDirectory $Canceled $ChannelBase $CharacterEncoding $CharacterEncodings $CloudBase $CloudConnected $CloudCreditsAvailable $CloudEvaluation $CloudExpressionBase $CloudObjectNameFormat $CloudObjectURLType $CloudRootDirectory $CloudSymbolBase $CloudUserID $CloudUserUUID $CloudVersion $CloudVersionNumber $CloudWolframEngineVersionNumber $CommandLine $CompilationTarget $ConditionHold $ConfiguredKernels $Context $ContextPath $ControlActiveSetting $Cookies $CookieStore $CreationDate $CurrentLink $CurrentTask $CurrentWebSession $DateStringFormat $DefaultAudioInputDevice $DefaultAudioOutputDevice $DefaultFont $DefaultFrontEnd $DefaultImagingDevice $DefaultLocalBase $DefaultMailbox $DefaultNetworkInterface $DefaultPath $Display $DisplayFunction $DistributedContexts $DynamicEvaluation $Echo $EmbedCodeEnvironments $EmbeddableServices $EntityStores $Epilog $EvaluationCloudBase $EvaluationCloudObject $EvaluationEnvironment $ExportFormats $Failed $FinancialDataSource $FontFamilies $FormatType $FrontEnd $FrontEndSession $GeoEntityTypes $GeoLocation $GeoLocationCity $GeoLocationCountry $GeoLocationPrecision $GeoLocationSource $HistoryLength $HomeDirectory $HTMLExportRules $HTTPCookies $HTTPRequest $IgnoreEOF $ImageFormattingWidth $ImagingDevice $ImagingDevices $ImportFormats $IncomingMailSettings $InitialDirectory $Initialization $InitializationContexts $Input $InputFileName $InputStreamMethods $Inspector $InstallationDate $InstallationDirectory $InterfaceEnvironment $InterpreterTypes $IterationLimit $KernelCount $KernelID $Language $LaunchDirectory $LibraryPath $LicenseExpirationDate $LicenseID $LicenseProcesses $LicenseServer $LicenseSubprocesses $LicenseType $Line $Linked $LinkSupported $LoadedFiles $LocalBase $LocalSymbolBase $MachineAddresses $MachineDomain $MachineDomains $MachineEpsilon $MachineID $MachineName $MachinePrecision $MachineType $MaxExtraPrecision $MaxLicenseProcesses $MaxLicenseSubprocesses $MaxMachineNumber $MaxNumber $MaxPiecewiseCases $MaxPrecision $MaxRootDegree $MessageGroups $MessageList $MessagePrePrint $Messages $MinMachineNumber $MinNumber $MinorReleaseNumber $MinPrecision $MobilePhone $ModuleNumber $NetworkConnected $NetworkInterfaces $NetworkLicense $NewMessage $NewSymbol $Notebooks $NoValue $NumberMarks $Off $OperatingSystem $Output $OutputForms $OutputSizeLimit $OutputStreamMethods $Packages $ParentLink $ParentProcessID $PasswordFile $PatchLevelID $Path $PathnameSeparator $PerformanceGoal $Permissions $PermissionsGroupBase $PersistenceBase $PersistencePath $PipeSupported $PlotTheme $Post $Pre $PreferencesDirectory $PreInitialization $PrePrint $PreRead $PrintForms $PrintLiteral $Printout3DPreviewer $ProcessID $ProcessorCount $ProcessorType $ProductInformation $ProgramName $PublisherID $RandomState $RecursionLimit $RegisteredDeviceClasses $RegisteredUserName $ReleaseNumber $RequesterAddress $RequesterWolframID $RequesterWolframUUID $ResourceSystemBase $RootDirectory $ScheduledTask $ScriptCommandLine $ScriptInputString $SecuredAuthenticationKeyTokens $ServiceCreditsAvailable $Services $SessionID $SetParentLink $SharedFunctions $SharedVariables $SoundDisplay $SoundDisplayFunction $SourceLink $SSHAuthentication $SummaryBoxDataSizeLimit $SuppressInputFormHeads $SynchronousEvaluation $SyntaxHandler $System $SystemCharacterEncoding $SystemID $SystemMemory $SystemShell $SystemTimeZone $SystemWordLength $TemplatePath $TemporaryDirectory $TemporaryPrefix $TestFileName $TextStyle $TimedOut $TimeUnit $TimeZone $TimeZoneEntity $TopDirectory $TraceOff $TraceOn $TracePattern $TracePostAction $TracePreAction $UnitSystem $Urgent $UserAddOnsDirectory $UserAgentLanguages $UserAgentMachine $UserAgentName $UserAgentOperatingSystem $UserAgentString $UserAgentVersion $UserBaseDirectory $UserDocumentsDirectory $Username $UserName $UserURLBase $Version $VersionNumber $VoiceStyles $WolframID $WolframUUID",c:[e.C("\\(\\*","\\*\\)",{c:["self"]}),e.QSM,e.CNM]}});
+hljs.registerLanguage("csp",function(r){return{cI:!1,l:"[a-zA-Z][a-zA-Z0-9_-]*",k:{keyword:"base-uri child-src connect-src default-src font-src form-action frame-ancestors frame-src img-src media-src object-src plugin-types report-uri sandbox script-src style-src"},c:[{cN:"string",b:"'",e:"'"},{cN:"attribute",b:"^Content",e:":",eE:!0}]}});
+hljs.registerLanguage("erb",function(e){return{sL:"xml",c:[e.C("<%#","%>"),{b:"<%[%=-]?",e:"[%-]?%>",sL:"ruby",eB:!0,eE:!0}]}});
+hljs.registerLanguage("tcl",function(e){return{aliases:["tk"],k:"after append apply array auto_execok auto_import auto_load auto_mkindex auto_mkindex_old auto_qualify auto_reset bgerror binary break catch cd chan clock close concat continue dde dict encoding eof error eval exec exit expr fblocked fconfigure fcopy file fileevent filename flush for foreach format gets glob global history http if incr info interp join lappend|10 lassign|10 lindex|10 linsert|10 list llength|10 load lrange|10 lrepeat|10 lreplace|10 lreverse|10 lsearch|10 lset|10 lsort|10 mathfunc mathop memory msgcat namespace open package parray pid pkg::create pkg_mkIndex platform platform::shell proc puts pwd read refchan regexp registry regsub|10 rename return safe scan seek set socket source split string subst switch tcl_endOfWord tcl_findLibrary tcl_startOfNextWord tcl_startOfPreviousWord tcl_wordBreakAfter tcl_wordBreakBefore tcltest tclvars tell time tm trace unknown unload unset update uplevel upvar variable vwait while",c:[e.C(";[ \\t]*#","$"),e.C("^[ \\t]*#","$"),{bK:"proc",e:"[\\{]",eE:!0,c:[{cN:"title",b:"[ \\t\\n\\r]+(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*",e:"[ \\t\\n\\r]",eW:!0,eE:!0}]},{eE:!0,v:[{b:"\\$(\\{)?(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*\\(([a-zA-Z0-9_])*\\)",e:"[^a-zA-Z0-9_\\}\\$]"},{b:"\\$(\\{)?(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*",e:"(\\))?[^a-zA-Z0-9_\\}\\$]"}]},{cN:"string",c:[e.BE],v:[e.inherit(e.QSM,{i:null})]},{cN:"number",v:[e.BNM,e.CNM]}]}});
+hljs.registerLanguage("objectivec",function(e){var t=/[a-zA-Z@][a-zA-Z0-9_]*/,i="@interface @class @protocol @implementation";return{aliases:["mm","objc","obj-c"],k:{keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required @encode @package @import @defs @compatibility_alias __bridge __bridge_transfer __bridge_retained __bridge_retain __covariant __contravariant __kindof _Nonnull _Nullable _Null_unspecified __FUNCTION__ __PRETTY_FUNCTION__ __attribute__ getter setter retain unsafe_unretained nonnull nullable null_unspecified null_resettable class instancetype NS_DESIGNATED_INITIALIZER NS_UNAVAILABLE NS_REQUIRES_SUPER NS_RETURNS_INNER_POINTER NS_INLINE NS_AVAILABLE NS_DEPRECATED NS_ENUM NS_OPTIONS NS_SWIFT_UNAVAILABLE NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_REFINED_FOR_SWIFT NS_SWIFT_NAME NS_SWIFT_NOTHROW NS_DURING NS_HANDLER NS_ENDHANDLER NS_VALUERETURN NS_VOIDRETURN",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},l:t,i:"</",c:[{cN:"built_in",b:"\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+"},e.CLCM,e.CBCM,e.CNM,e.QSM,e.ASM,{cN:"string",v:[{b:'@"',e:'"',i:"\\n",c:[e.BE]}]},{cN:"meta",b:/#\s*[a-z]+\b/,e:/$/,k:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef include"},c:[{b:/\\\n/,relevance:0},e.inherit(e.QSM,{cN:"meta-string"}),{cN:"meta-string",b:/<.*?>/,e:/$/,i:"\\n"},e.CLCM,e.CBCM]},{cN:"class",b:"("+i.split(" ").join("|")+")\\b",e:"({|$)",eE:!0,k:i,l:t,c:[e.UTM]},{b:"\\."+e.UIR,relevance:0}]}});
+hljs.registerLanguage("vbscript-html",function(r){return{sL:"xml",c:[{b:"<%",e:"%>",sL:"vbscript"}]}});
+hljs.registerLanguage("processing",function(e){return{k:{keyword:"BufferedReader PVector PFont PImage PGraphics HashMap boolean byte char color double float int long String Array FloatDict FloatList IntDict IntList JSONArray JSONObject Object StringDict StringList Table TableRow XML false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private",literal:"P2D P3D HALF_PI PI QUARTER_PI TAU TWO_PI",title:"setup draw",built_in:"displayHeight displayWidth mouseY mouseX mousePressed pmouseX pmouseY key keyCode pixels focused frameCount frameRate height width size createGraphics beginDraw createShape loadShape PShape arc ellipse line point quad rect triangle bezier bezierDetail bezierPoint bezierTangent curve curveDetail curvePoint curveTangent curveTightness shape shapeMode beginContour beginShape bezierVertex curveVertex endContour endShape quadraticVertex vertex ellipseMode noSmooth rectMode smooth strokeCap strokeJoin strokeWeight mouseClicked mouseDragged mouseMoved mousePressed mouseReleased mouseWheel keyPressed keyPressedkeyReleased keyTyped print println save saveFrame day hour millis minute month second year background clear colorMode fill noFill noStroke stroke alpha blue brightness color green hue lerpColor red saturation modelX modelY modelZ screenX screenY screenZ ambient emissive shininess specular add createImage beginCamera camera endCamera frustum ortho perspective printCamera printProjection cursor frameRate noCursor exit loop noLoop popStyle pushStyle redraw binary boolean byte char float hex int str unbinary unhex join match matchAll nf nfc nfp nfs split splitTokens trim append arrayCopy concat expand reverse shorten sort splice subset box sphere sphereDetail createInput createReader loadBytes loadJSONArray loadJSONObject loadStrings loadTable loadXML open parseXML saveTable selectFolder selectInput beginRaw beginRecord createOutput createWriter endRaw endRecord PrintWritersaveBytes saveJSONArray saveJSONObject saveStream saveStrings saveXML selectOutput popMatrix printMatrix pushMatrix resetMatrix rotate rotateX rotateY rotateZ scale shearX shearY translate ambientLight directionalLight lightFalloff lights lightSpecular noLights normal pointLight spotLight image imageMode loadImage noTint requestImage tint texture textureMode textureWrap blend copy filter get loadPixels set updatePixels blendMode loadShader PShaderresetShader shader createFont loadFont text textFont textAlign textLeading textMode textSize textWidth textAscent textDescent abs ceil constrain dist exp floor lerp log mag map max min norm pow round sq sqrt acos asin atan atan2 cos degrees radians sin tan noise noiseDetail noiseSeed random randomGaussian randomSeed"},c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM]}});
+hljs.registerLanguage("scheme",function(e){var t="[^\\(\\)\\[\\]\\{\\}\",'`;#|\\\\\\s]+",r="(\\-|\\+)?\\d+([./]\\d+)?",a={cN:"literal",b:"(#t|#f|#\\\\"+t+"|#\\\\.)"},i={cN:"number",v:[{b:r,relevance:0},{b:"(\\-|\\+)?\\d+([./]\\d+)?[+\\-](\\-|\\+)?\\d+([./]\\d+)?i",relevance:0},{b:"#b[0-1]+(/[0-1]+)?"},{b:"#o[0-7]+(/[0-7]+)?"},{b:"#x[0-9a-f]+(/[0-9a-f]+)?"}]},n=e.QSM,c=[e.C(";","$",{relevance:0}),e.C("#\\|","\\|#")],l={b:t,relevance:0},s={cN:"symbol",b:"'"+t},o={eW:!0,relevance:0},u={v:[{b:/'/},{b:"`"}],c:[{b:"\\(",e:"\\)",c:["self",a,n,i,l,s]}]},p={cN:"name",b:t,l:t,k:{"builtin-name":"case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules ' * + , ,@ - ... / ; < <= = => > >= ` abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"}},d={v:[{b:"\\(",e:"\\)"},{b:"\\[",e:"\\]"}],c:[{b:/lambda/,eW:!0,rB:!0,c:[p,{b:/\(/,e:/\)/,endsParent:!0,c:[l]}]},p,o]};return o.c=[a,i,n,l,s,u,d].concat(c),{i:/\S/,c:[{cN:"meta",b:"^#!",e:"$"},i,n,s,u,d].concat(c)}});
+hljs.registerLanguage("mercury",function(e){var i=e.C("%","$"),r=e.inherit(e.ASM,{relevance:0}),t=e.inherit(e.QSM,{relevance:0});t.c=t.c.slice(),t.c.push({cN:"subst",b:"\\\\[abfnrtv]\\|\\\\x[0-9a-fA-F]*\\\\\\|%[-+# *.0-9]*[dioxXucsfeEgGp]",relevance:0});return{aliases:["m","moo"],k:{keyword:"module use_module import_module include_module end_module initialise mutable initialize finalize finalise interface implementation pred mode func type inst solver any_pred any_func is semidet det nondet multi erroneous failure cc_nondet cc_multi typeclass instance where pragma promise external trace atomic or_else require_complete_switch require_det require_semidet require_multi require_nondet require_cc_multi require_cc_nondet require_erroneous require_failure",meta:"inline no_inline type_spec source_file fact_table obsolete memo loop_check minimal_model terminates does_not_terminate check_termination promise_equivalent_clauses foreign_proc foreign_decl foreign_code foreign_type foreign_import_module foreign_export_enum foreign_export foreign_enum may_call_mercury will_not_call_mercury thread_safe not_thread_safe maybe_thread_safe promise_pure promise_semipure tabled_for_io local untrailed trailed attach_to_io_state can_pass_as_mercury_type stable will_not_throw_exception may_modify_trail will_not_modify_trail may_duplicate may_not_duplicate affects_liveness does_not_affect_liveness doesnt_affect_liveness no_sharing unknown_sharing sharing",built_in:"some all not if then else true fail false try catch catch_any semidet_true semidet_false semidet_fail impure_true impure semipure"},c:[{cN:"built_in",v:[{b:"<=>"},{b:"<=",relevance:0},{b:"=>",relevance:0},{b:"/\\\\"},{b:"\\\\/"}]},{cN:"built_in",v:[{b:":-\\|--\x3e"},{b:"=",relevance:0}]},i,e.CBCM,{cN:"number",b:"0'.\\|0[box][0-9a-fA-F]*"},e.NM,r,t,{b:/:-/},{b:/\.$/}]}});
+hljs.registerLanguage("taggerscript",function(e){return{c:[{cN:"comment",b:/\$noop\(/,e:/\)/,c:[{b:/\(/,e:/\)/,c:["self",{b:/\\./}]}],relevance:10},{cN:"keyword",b:/\$(?!noop)[a-zA-Z][_a-zA-Z0-9]*/,e:/\(/,eE:!0},{cN:"variable",b:/%[_a-zA-Z0-9:]*/,e:"%"},{cN:"symbol",b:/\\./}]}});
+hljs.registerLanguage("delphi",function(e){var r="exports register file shl array record property for mod while set ally label uses raise not stored class safecall var interface or private static exit index inherited to else stdcall override shr asm far resourcestring finalization packed virtual out and protected library do xorwrite goto near function end div overload object unit begin string on inline repeat until destructor write message program with read initialization except default nil if case cdecl in downto threadvar of try pascal const external constructor type public then implementation finally published procedure absolute reintroduce operator as is abstract alias assembler bitpacked break continue cppdecl cvar enumerator experimental platform deprecated unimplemented dynamic export far16 forward generic helper implements interrupt iochecks local name nodefault noreturn nostackframe oldfpccall otherwise saveregisters softfloat specialize strict unaligned varargs ",t=[e.CLCM,e.C(/\{/,/\}/,{relevance:0}),e.C(/\(\*/,/\*\)/,{relevance:10})],a={cN:"meta",v:[{b:/\{\$/,e:/\}/},{b:/\(\*\$/,e:/\*\)/}]},c={cN:"string",b:/'/,e:/'/,c:[{b:/''/}]},i={cN:"string",b:/(#\d+)+/},n={b:e.IR+"\\s*=\\s*class\\s*\\(",rB:!0,c:[e.TM]},o={cN:"function",bK:"function constructor destructor procedure",e:/[:;]/,k:"function constructor|10 destructor|10 procedure|10",c:[e.TM,{cN:"params",b:/\(/,e:/\)/,k:r,c:[c,i,a].concat(t)},a].concat(t)};return{aliases:["dpr","dfm","pas","pascal","freepascal","lazarus","lpr","lfm"],cI:!0,k:r,i:/"|\$[G-Zg-z]|\/\*|<\/|\|/,c:[c,i,e.NM,n,o,a].concat(t)}});
+hljs.registerLanguage("crmsh",function(e){var t="group clone ms master location colocation order fencing_topology rsc_ticket acl_target acl_group user role tag xml";return{aliases:["crm","pcmk"],cI:!0,k:{keyword:"params meta operations op rule attributes utilization read write deny defined not_defined in_range date spec in ref reference attribute type xpath version and or lt gt tag lte gte eq ne \\ number string",literal:"Master Started Slave Stopped start promote demote stop monitor true false"},c:[e.HCM,{bK:"node",starts:{e:"\\s*([\\w_-]+:)?",starts:{cN:"title",e:"\\s*[\\$\\w_][\\w_-]*"}}},{bK:"primitive rsc_template",starts:{cN:"title",e:"\\s*[\\$\\w_][\\w_-]*",starts:{e:"\\s*@?[\\w_][\\w_\\.:-]*"}}},{b:"\\b("+t.split(" ").join("|")+")\\s+",k:t,starts:{cN:"title",e:"[\\$\\w_][\\w_-]*"}},{bK:"property rsc_defaults op_defaults",starts:{cN:"title",e:"\\s*([\\w_-]+:)?"}},e.QSM,{cN:"meta",b:"(ocf|systemd|service|lsb):[\\w_:-]+",relevance:0},{cN:"number",b:"\\b\\d+(\\.\\d+)?(ms|s|h|m)?",relevance:0},{cN:"literal",b:"[-]?(infinity|inf)",relevance:0},{cN:"attr",b:/([A-Za-z\$_\#][\w_-]+)=/,relevance:0},{cN:"tag",b:"</?",e:"/?>",relevance:0}]}});
+hljs.registerLanguage("crystal",function(e){var c="(_*[ui](8|16|32|64|128))?",n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|[=!]~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~|]|//|//=|&[-+*]=?|&\\*\\*|\\[\\][=?]?",b="[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?",i={keyword:"abstract alias annotation as as? asm begin break case class def do else elsif end ensure enum extend for fun if include instance_sizeof is_a? lib macro module next nil? of out pointerof private protected rescue responds_to? return require select self sizeof struct super then type typeof union uninitialized unless until verbatim when while with yield __DIR__ __END_LINE__ __FILE__ __LINE__",literal:"false nil true"},r={cN:"subst",b:"#{",e:"}",k:i},a={cN:"template-variable",v:[{b:"\\{\\{",e:"\\}\\}"},{b:"\\{%",e:"%\\}"}],k:i};function s(e,c){var n=[{b:e,e:c}];return n[0].c=n}var t={cN:"string",c:[e.BE,r],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[Qwi]?\\(",e:"\\)",c:s("\\(","\\)")},{b:"%[Qwi]?\\[",e:"\\]",c:s("\\[","\\]")},{b:"%[Qwi]?{",e:"}",c:s("{","}")},{b:"%[Qwi]?<",e:">",c:s("<",">")},{b:"%[Qwi]?\\|",e:"\\|"},{b:/<<-\w+$/,e:/^\s*\w+$/}],relevance:0},l={cN:"string",v:[{b:"%q\\(",e:"\\)",c:s("\\(","\\)")},{b:"%q\\[",e:"\\]",c:s("\\[","\\]")},{b:"%q{",e:"}",c:s("{","}")},{b:"%q<",e:">",c:s("<",">")},{b:"%q\\|",e:"\\|"},{b:/<<-'\w+'$/,e:/^\s*\w+$/}],relevance:0},u={b:"(?!%})("+e.RSR+"|\\n|\\b(case|if|select|unless|until|when|while)\\b)\\s*",k:"case if select unless until when while",c:[{cN:"regexp",c:[e.BE,r],v:[{b:"//[a-z]*",relevance:0},{b:"/(?!\\/)",e:"/[a-z]*"}]}],relevance:0},_=[a,t,l,{cN:"regexp",c:[e.BE,r],v:[{b:"%r\\(",e:"\\)",c:s("\\(","\\)")},{b:"%r\\[",e:"\\]",c:s("\\[","\\]")},{b:"%r{",e:"}",c:s("{","}")},{b:"%r<",e:">",c:s("<",">")},{b:"%r\\|",e:"\\|"}],relevance:0},u,{cN:"meta",b:"@\\[",e:"\\]",c:[e.inherit(e.QSM,{cN:"meta-string"})]},e.HCM,{cN:"class",bK:"class module struct",e:"$|;",i:/=/,c:[e.HCM,e.inherit(e.TM,{b:b}),{b:"<"}]},{cN:"class",bK:"lib enum union",e:"$|;",i:/=/,c:[e.HCM,e.inherit(e.TM,{b:b})],relevance:10},{bK:"annotation",e:"$|;",i:/=/,c:[e.HCM,e.inherit(e.TM,{b:b})],relevance:10},{cN:"function",bK:"def",e:/\B\b/,c:[e.inherit(e.TM,{b:n,endsParent:!0})]},{cN:"function",bK:"fun macro",e:/\B\b/,c:[e.inherit(e.TM,{b:n,endsParent:!0})],relevance:5},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",relevance:0},{cN:"symbol",b:":",c:[t,{b:n}],relevance:0},{cN:"number",v:[{b:"\\b0b([01_]+)"+c},{b:"\\b0o([0-7_]+)"+c},{b:"\\b0x([A-Fa-f0-9_]+)"+c},{b:"\\b([1-9][0-9_]*[0-9]|[0-9])(\\.[0-9][0-9_]*)?([eE]_*[-+]?[0-9_]*)?(_*f(32|64))?(?!_)"},{b:"\\b([1-9][0-9_]*|0)"+c}],relevance:0}];return r.c=_,a.c=_.slice(1),{aliases:["cr"],l:"[a-zA-Z_]\\w*[!?=]?",k:i,c:_}});
+hljs.registerLanguage("avrasm",function(r){return{cI:!0,l:"\\.?"+r.IR,k:{keyword:"adc add adiw and andi asr bclr bld brbc brbs brcc brcs break breq brge brhc brhs brid brie brlo brlt brmi brne brpl brsh brtc brts brvc brvs bset bst call cbi cbr clc clh cli cln clr cls clt clv clz com cp cpc cpi cpse dec eicall eijmp elpm eor fmul fmuls fmulsu icall ijmp in inc jmp ld ldd ldi lds lpm lsl lsr mov movw mul muls mulsu neg nop or ori out pop push rcall ret reti rjmp rol ror sbc sbr sbrc sbrs sec seh sbi sbci sbic sbis sbiw sei sen ser ses set sev sez sleep spm st std sts sub subi swap tst wdr",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 r16 r17 r18 r19 r20 r21 r22 r23 r24 r25 r26 r27 r28 r29 r30 r31 x|0 xh xl y|0 yh yl z|0 zh zl ucsr1c udr1 ucsr1a ucsr1b ubrr1l ubrr1h ucsr0c ubrr0h tccr3c tccr3a tccr3b tcnt3h tcnt3l ocr3ah ocr3al ocr3bh ocr3bl ocr3ch ocr3cl icr3h icr3l etimsk etifr tccr1c ocr1ch ocr1cl twcr twdr twar twsr twbr osccal xmcra xmcrb eicra spmcsr spmcr portg ddrg ping portf ddrf sreg sph spl xdiv rampz eicrb eimsk gimsk gicr eifr gifr timsk tifr mcucr mcucsr tccr0 tcnt0 ocr0 assr tccr1a tccr1b tcnt1h tcnt1l ocr1ah ocr1al ocr1bh ocr1bl icr1h icr1l tccr2 tcnt2 ocr2 ocdr wdtcr sfior eearh eearl eedr eecr porta ddra pina portb ddrb pinb portc ddrc pinc portd ddrd pind spdr spsr spcr udr0 ucsr0a ucsr0b ubrr0l acsr admux adcsr adch adcl porte ddre pine pinf",meta:".byte .cseg .db .def .device .dseg .dw .endmacro .equ .eseg .exit .include .list .listmac .macro .nolist .org .set"},c:[r.CBCM,r.C(";","$",{relevance:0}),r.CNM,r.BNM,{cN:"number",b:"\\b(\\$[a-zA-Z0-9]+|0o[0-7]+)"},r.QSM,{cN:"string",b:"'",e:"[^\\\\]'",i:"[^\\\\][^']"},{cN:"symbol",b:"^[A-Za-z0-9_.$]+:"},{cN:"meta",b:"#",e:"$"},{cN:"subst",b:"@[0-9]+"}]}});
+hljs.registerLanguage("nim",function(){"use strict";return function(e){return{name:"Nim",aliases:["nim"],keywords:{keyword:"addr and as asm bind block break case cast const continue converter discard distinct div do elif else end enum except export finally for from func generic if import in include interface is isnot iterator let macro method mixin mod nil not notin object of or out proc ptr raise ref return shl shr static template try tuple type using var when while with without xor yield",literal:"shared guarded stdin stdout stderr result true false",built_in:"int int8 int16 int32 int64 uint uint8 uint16 uint32 uint64 float float32 float64 bool char string cstring pointer expr stmt void auto any range array openarray varargs seq set clong culong cchar cschar cshort cint csize clonglong cfloat cdouble clongdouble cuchar cushort cuint culonglong cstringarray semistatic"},contains:[{className:"meta",begin:/{\./,end:/\.}/,relevance:10},{className:"string",begin:/[a-zA-Z]\w*"/,end:/"/,contains:[{begin:/""/}]},{className:"string",begin:/([a-zA-Z]\w*)?"""/,end:/"""/},e.QUOTE_STRING_MODE,{className:"type",begin:/\b[A-Z]\w+\b/,relevance:0},{className:"number",relevance:0,variants:[{begin:/\b(0[xX][0-9a-fA-F][_0-9a-fA-F]*)('?[iIuU](8|16|32|64))?/},{begin:/\b(0o[0-7][_0-7]*)('?[iIuUfF](8|16|32|64))?/},{begin:/\b(0(b|B)[01][_01]*)('?[iIuUfF](8|16|32|64))?/},{begin:/\b(\d[_\d]*)('?[iIuUfF](8|16|32|64))?/}]},e.HASH_COMMENT_MODE]}}}());
+hljs.registerLanguage("accesslog",function(e){var n=["GET","POST","HEAD","PUT","DELETE","CONNECT","OPTIONS","PATCH","TRACE"];return{c:[{cN:"number",b:"^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b",relevance:5},{cN:"number",b:"\\b\\d+\\b",relevance:0},{cN:"string",b:'"('+n.join("|")+")",e:'"',k:n.join(" "),i:"\\n",relevance:5,c:[{b:"HTTP/[12]\\.\\d",relevance:5}]},{cN:"string",b:/\[\d[^\]\n]{8,}\]/,i:"\\n",relevance:1},{cN:"string",b:/\[/,e:/\]/,i:"\\n",relevance:0},{cN:"string",b:'"Mozilla/\\d\\.\\d \\(',e:'"',i:"\\n",relevance:3},{cN:"string",b:'"',e:'"',i:"\\n",relevance:0}]}});
+hljs.registerLanguage("scss",function(e){var t="@[a-z-]+",r={cN:"variable",b:"(\\$[a-zA-Z-][a-zA-Z0-9_-]*)\\b"},i={cN:"number",b:"#[0-9A-Fa-f]+"};e.CSSNM,e.QSM,e.ASM,e.CBCM;return{cI:!0,i:"[=/|']",c:[e.CLCM,e.CBCM,{cN:"selector-id",b:"\\#[A-Za-z0-9_-]+",relevance:0},{cN:"selector-class",b:"\\.[A-Za-z0-9_-]+",relevance:0},{cN:"selector-attr",b:"\\[",e:"\\]",i:"$"},{cN:"selector-tag",b:"\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b",relevance:0},{cN:"selector-pseudo",b:":(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)"},{cN:"selector-pseudo",b:"::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)"},r,{cN:"attribute",b:"\\b(src|z-index|word-wrap|word-spacing|word-break|width|widows|white-space|visibility|vertical-align|unicode-bidi|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform|top|text-underline-position|text-transform|text-shadow|text-rendering|text-overflow|text-indent|text-decoration-style|text-decoration-line|text-decoration-color|text-decoration|text-align-last|text-align|tab-size|table-layout|right|resize|quotes|position|pointer-events|perspective-origin|perspective|page-break-inside|page-break-before|page-break-after|padding-top|padding-right|padding-left|padding-bottom|padding|overflow-y|overflow-x|overflow-wrap|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|order|opacity|object-position|object-fit|normal|none|nav-up|nav-right|nav-left|nav-index|nav-down|min-width|min-height|max-width|max-height|mask|marks|margin-top|margin-right|margin-left|margin-bottom|margin|list-style-type|list-style-position|list-style-image|list-style|line-height|letter-spacing|left|justify-content|initial|inherit|ime-mode|image-orientation|image-resolution|image-rendering|icon|hyphens|height|font-weight|font-variant-ligatures|font-variant|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|float|flex-wrap|flex-shrink|flex-grow|flex-flow|flex-direction|flex-basis|flex|filter|empty-cells|display|direction|cursor|counter-reset|counter-increment|content|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|columns|color|clip-path|clip|clear|caption-side|break-inside|break-before|break-after|box-sizing|box-shadow|box-decoration-break|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-left-width|border-left-style|border-left-color|border-left|border-image-width|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-attachment|background-blend-mode|background|backface-visibility|auto|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|align-self|align-items|align-content)\\b",i:"[^\\s]"},{b:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"},{b:":",e:";",c:[r,i,e.CSSNM,e.QSM,e.ASM,{cN:"meta",b:"!important"}]},{b:"@(page|font-face)",l:t,k:"@page @font-face"},{b:"@",e:"[{;]",rB:!0,k:"and or not only",c:[{b:t,cN:"keyword"},r,e.QSM,e.ASM,i,e.CSSNM]}]}});
+hljs.registerLanguage("gradle",function(e){return{cI:!0,k:{keyword:"task project allprojects subprojects artifacts buildscript configurations dependencies repositories sourceSets description delete from into include exclude source classpath destinationDir includes options sourceCompatibility targetCompatibility group flatDir doLast doFirst flatten todir fromdir ant def abstract break case catch continue default do else extends final finally for if implements instanceof native new private protected public return static switch synchronized throw throws transient try volatile while strictfp package import false null super this true antlrtask checkstyle codenarc copy boolean byte char class double float int interface long short void compile runTime file fileTree abs any append asList asWritable call collect compareTo count div dump each eachByte eachFile eachLine every find findAll flatten getAt getErr getIn getOut getText grep immutable inject inspect intersect invokeMethods isCase join leftShift minus multiply newInputStream newOutputStream newPrintWriter newReader newWriter next plus pop power previous print println push putAt read readBytes readLines reverse reverseEach round size sort splitEachLine step subMap times toInteger toList tokenize upto waitForOrKill withPrintWriter withReader withStream withWriter withWriterAppend write writeLine"},c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.NM,e.RM]}});
+hljs.registerLanguage("diff",function(e){return{aliases:["patch"],c:[{cN:"meta",relevance:10,v:[{b:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"comment",v:[{b:/Index: /,e:/$/},{b:/={3,}/,e:/$/},{b:/^\-{3}/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+{3}/,e:/$/},{b:/^\*{15}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"addition",b:"^\\!",e:"$"}]}});
+hljs.registerLanguage("maxima",function(e){return{l:"[A-Za-z_%][0-9A-Za-z_%]*",k:{keyword:"if then else elseif for thru do while unless step in and or not",literal:"true false unknown inf minf ind und %e %i %pi %phi %gamma",built_in:" abasep abs absint absolute_real_time acos acosh acot acoth acsc acsch activate addcol add_edge add_edges addmatrices addrow add_vertex add_vertices adjacency_matrix adjoin adjoint af agd airy airy_ai airy_bi airy_dai airy_dbi algsys alg_type alias allroots alphacharp alphanumericp amortization %and annuity_fv annuity_pv antid antidiff AntiDifference append appendfile apply apply1 apply2 applyb1 apropos args arit_amortization arithmetic arithsum array arrayapply arrayinfo arraymake arraysetapply ascii asec asech asin asinh askinteger asksign assoc assoc_legendre_p assoc_legendre_q assume assume_external_byte_order asympa at atan atan2 atanh atensimp atom atvalue augcoefmatrix augmented_lagrangian_method av average_degree backtrace bars barsplot barsplot_description base64 base64_decode bashindices batch batchload bc2 bdvac belln benefit_cost bern bernpoly bernstein_approx bernstein_expand bernstein_poly bessel bessel_i bessel_j bessel_k bessel_simplify bessel_y beta beta_incomplete beta_incomplete_generalized beta_incomplete_regularized bezout bfallroots bffac bf_find_root bf_fmin_cobyla bfhzeta bfloat bfloatp bfpsi bfpsi0 bfzeta biconnected_components bimetric binomial bipartition block blockmatrixp bode_gain bode_phase bothcoef box boxplot boxplot_description break bug_report build_info|10 buildq build_sample burn cabs canform canten cardinality carg cartan cartesian_product catch cauchy_matrix cbffac cdf_bernoulli cdf_beta cdf_binomial cdf_cauchy cdf_chi2 cdf_continuous_uniform cdf_discrete_uniform cdf_exp cdf_f cdf_gamma cdf_general_finite_discrete cdf_geometric cdf_gumbel cdf_hypergeometric cdf_laplace cdf_logistic cdf_lognormal cdf_negative_binomial cdf_noncentral_chi2 cdf_noncentral_student_t cdf_normal cdf_pareto cdf_poisson cdf_rank_sum cdf_rayleigh cdf_signed_rank cdf_student_t cdf_weibull cdisplay ceiling central_moment cequal cequalignore cf cfdisrep cfexpand cgeodesic cgreaterp cgreaterpignore changename changevar chaosgame charat charfun charfun2 charlist charp charpoly chdir chebyshev_t chebyshev_u checkdiv check_overlaps chinese cholesky christof chromatic_index chromatic_number cint circulant_graph clear_edge_weight clear_rules clear_vertex_label clebsch_gordan clebsch_graph clessp clesspignore close closefile cmetric coeff coefmatrix cograd col collapse collectterms columnop columnspace columnswap columnvector combination combine comp2pui compare compfile compile compile_file complement_graph complete_bipartite_graph complete_graph complex_number_p components compose_functions concan concat conjugate conmetderiv connected_components connect_vertices cons constant constantp constituent constvalue cont2part content continuous_freq contortion contour_plot contract contract_edge contragrad contrib_ode convert coord copy copy_file copy_graph copylist copymatrix cor cos cosh cot coth cov cov1 covdiff covect covers crc24sum create_graph create_list csc csch csetup cspline ctaylor ct_coordsys ctransform ctranspose cube_graph cuboctahedron_graph cunlisp cv cycle_digraph cycle_graph cylindrical days360 dblint deactivate declare declare_constvalue declare_dimensions declare_fundamental_dimensions declare_fundamental_units declare_qty declare_translated declare_unit_conversion declare_units declare_weights decsym defcon define define_alt_display define_variable defint defmatch defrule defstruct deftaylor degree_sequence del delete deleten delta demo demoivre denom depends derivdegree derivlist describe desolve determinant dfloat dgauss_a dgauss_b dgeev dgemm dgeqrf dgesv dgesvd diag diagmatrix diag_matrix diagmatrixp diameter diff digitcharp dimacs_export dimacs_import dimension dimensionless dimensions dimensions_as_list direct directory discrete_freq disjoin disjointp disolate disp dispcon dispform dispfun dispJordan display disprule dispterms distrib divide divisors divsum dkummer_m dkummer_u dlange dodecahedron_graph dotproduct dotsimp dpart draw draw2d draw3d drawdf draw_file draw_graph dscalar echelon edge_coloring edge_connectivity edges eigens_by_jacobi eigenvalues eigenvectors eighth einstein eivals eivects elapsed_real_time elapsed_run_time ele2comp ele2polynome ele2pui elem elementp elevation_grid elim elim_allbut eliminate eliminate_using ellipse elliptic_e elliptic_ec elliptic_eu elliptic_f elliptic_kc elliptic_pi ematrix empty_graph emptyp endcons entermatrix entertensor entier equal equalp equiv_classes erf erfc erf_generalized erfi errcatch error errormsg errors euler ev eval_string evenp every evolution evolution2d evundiff example exp expand expandwrt expandwrt_factored expint expintegral_chi expintegral_ci expintegral_e expintegral_e1 expintegral_ei expintegral_e_simplify expintegral_li expintegral_shi expintegral_si explicit explose exponentialize express expt exsec extdiff extract_linear_equations extremal_subset ezgcd %f f90 facsum factcomb factor factorfacsum factorial factorout factorsum facts fast_central_elements fast_linsolve fasttimes featurep fernfale fft fib fibtophi fifth filename_merge file_search file_type fillarray findde find_root find_root_abs find_root_error find_root_rel first fix flatten flength float floatnump floor flower_snark flush flush1deriv flushd flushnd flush_output fmin_cobyla forget fortran fourcos fourexpand fourier fourier_elim fourint fourintcos fourintsin foursimp foursin fourth fposition frame_bracket freeof freshline fresnel_c fresnel_s from_adjacency_matrix frucht_graph full_listify fullmap fullmapl fullratsimp fullratsubst fullsetify funcsolve fundamental_dimensions fundamental_units fundef funmake funp fv g0 g1 gamma gamma_greek gamma_incomplete gamma_incomplete_generalized gamma_incomplete_regularized gauss gauss_a gauss_b gaussprob gcd gcdex gcdivide gcfac gcfactor gd generalized_lambert_w genfact gen_laguerre genmatrix gensym geo_amortization geo_annuity_fv geo_annuity_pv geomap geometric geometric_mean geosum get getcurrentdirectory get_edge_weight getenv get_lu_factors get_output_stream_string get_pixel get_plot_option get_tex_environment get_tex_environment_default get_vertex_label gfactor gfactorsum ggf girth global_variances gn gnuplot_close gnuplot_replot gnuplot_reset gnuplot_restart gnuplot_start go Gosper GosperSum gr2d gr3d gradef gramschmidt graph6_decode graph6_encode graph6_export graph6_import graph_center graph_charpoly graph_eigenvalues graph_flow graph_order graph_periphery graph_product graph_size graph_union great_rhombicosidodecahedron_graph great_rhombicuboctahedron_graph grid_graph grind grobner_basis grotzch_graph hamilton_cycle hamilton_path hankel hankel_1 hankel_2 harmonic harmonic_mean hav heawood_graph hermite hessian hgfred hilbertmap hilbert_matrix hipow histogram histogram_description hodge horner hypergeometric i0 i1 %ibes ic1 ic2 ic_convert ichr1 ichr2 icosahedron_graph icosidodecahedron_graph icurvature ident identfor identity idiff idim idummy ieqn %if ifactors iframes ifs igcdex igeodesic_coords ilt image imagpart imetric implicit implicit_derivative implicit_plot indexed_tensor indices induced_subgraph inferencep inference_result infix info_display init_atensor init_ctensor in_neighbors innerproduct inpart inprod inrt integerp integer_partitions integrate intersect intersection intervalp intopois intosum invariant1 invariant2 inverse_fft inverse_jacobi_cd inverse_jacobi_cn inverse_jacobi_cs inverse_jacobi_dc inverse_jacobi_dn inverse_jacobi_ds inverse_jacobi_nc inverse_jacobi_nd inverse_jacobi_ns inverse_jacobi_sc inverse_jacobi_sd inverse_jacobi_sn invert invert_by_adjoint invert_by_lu inv_mod irr is is_biconnected is_bipartite is_connected is_digraph is_edge_in_graph is_graph is_graph_or_digraph ishow is_isomorphic isolate isomorphism is_planar isqrt isreal_p is_sconnected is_tree is_vertex_in_graph items_inference %j j0 j1 jacobi jacobian jacobi_cd jacobi_cn jacobi_cs jacobi_dc jacobi_dn jacobi_ds jacobi_nc jacobi_nd jacobi_ns jacobi_p jacobi_sc jacobi_sd jacobi_sn JF jn join jordan julia julia_set julia_sin %k kdels kdelta kill killcontext kostka kron_delta kronecker_product kummer_m kummer_u kurtosis kurtosis_bernoulli kurtosis_beta kurtosis_binomial kurtosis_chi2 kurtosis_continuous_uniform kurtosis_discrete_uniform kurtosis_exp kurtosis_f kurtosis_gamma kurtosis_general_finite_discrete kurtosis_geometric kurtosis_gumbel kurtosis_hypergeometric kurtosis_laplace kurtosis_logistic kurtosis_lognormal kurtosis_negative_binomial kurtosis_noncentral_chi2 kurtosis_noncentral_student_t kurtosis_normal kurtosis_pareto kurtosis_poisson kurtosis_rayleigh kurtosis_student_t kurtosis_weibull label labels lagrange laguerre lambda lambert_w laplace laplacian_matrix last lbfgs lc2kdt lcharp lc_l lcm lc_u ldefint ldisp ldisplay legendre_p legendre_q leinstein length let letrules letsimp levi_civita lfreeof lgtreillis lhs li liediff limit Lindstedt linear linearinterpol linear_program linear_regression line_graph linsolve listarray list_correlations listify list_matrix_entries list_nc_monomials listoftens listofvars listp lmax lmin load loadfile local locate_matrix_entry log logcontract log_gamma lopow lorentz_gauge lowercasep lpart lratsubst lreduce lriemann lsquares_estimates lsquares_estimates_approximate lsquares_estimates_exact lsquares_mse lsquares_residual_mse lsquares_residuals lsum ltreillis lu_backsub lucas lu_factor %m macroexpand macroexpand1 make_array makebox makefact makegamma make_graph make_level_picture makelist makeOrders make_poly_continent make_poly_country make_polygon make_random_state make_rgb_picture makeset make_string_input_stream make_string_output_stream make_transform mandelbrot mandelbrot_set map mapatom maplist matchdeclare matchfix mat_cond mat_fullunblocker mat_function mathml_display mat_norm matrix matrixmap matrixp matrix_size mattrace mat_trace mat_unblocker max max_clique max_degree max_flow maximize_lp max_independent_set max_matching maybe md5sum mean mean_bernoulli mean_beta mean_binomial mean_chi2 mean_continuous_uniform mean_deviation mean_discrete_uniform mean_exp mean_f mean_gamma mean_general_finite_discrete mean_geometric mean_gumbel mean_hypergeometric mean_laplace mean_logistic mean_lognormal mean_negative_binomial mean_noncentral_chi2 mean_noncentral_student_t mean_normal mean_pareto mean_poisson mean_rayleigh mean_student_t mean_weibull median median_deviation member mesh metricexpandall mgf1_sha1 min min_degree min_edge_cut minfactorial minimalPoly minimize_lp minimum_spanning_tree minor minpack_lsquares minpack_solve min_vertex_cover min_vertex_cut mkdir mnewton mod mode_declare mode_identity ModeMatrix moebius mon2schur mono monomial_dimensions multibernstein_poly multi_display_for_texinfo multi_elem multinomial multinomial_coeff multi_orbit multiplot_mode multi_pui multsym multthru mycielski_graph nary natural_unit nc_degree ncexpt ncharpoly negative_picture neighbors new newcontext newdet new_graph newline newton new_variable next_prime nicedummies niceindices ninth nofix nonarray noncentral_moment nonmetricity nonnegintegerp nonscalarp nonzeroandfreeof notequal nounify nptetrad npv nroots nterms ntermst nthroot nullity nullspace num numbered_boundaries numberp number_to_octets num_distinct_partitions numerval numfactor num_partitions nusum nzeta nzetai nzetar octets_to_number octets_to_oid odd_girth oddp ode2 ode_check odelin oid_to_octets op opena opena_binary openr openr_binary openw openw_binary operatorp opsubst optimize %or orbit orbits ordergreat ordergreatp orderless orderlessp orthogonal_complement orthopoly_recur orthopoly_weight outermap out_neighbors outofpois pade parabolic_cylinder_d parametric parametric_surface parg parGosper parse_string parse_timedate part part2cont partfrac partition partition_set partpol path_digraph path_graph pathname_directory pathname_name pathname_type pdf_bernoulli pdf_beta pdf_binomial pdf_cauchy pdf_chi2 pdf_continuous_uniform pdf_discrete_uniform pdf_exp pdf_f pdf_gamma pdf_general_finite_discrete pdf_geometric pdf_gumbel pdf_hypergeometric pdf_laplace pdf_logistic pdf_lognormal pdf_negative_binomial pdf_noncentral_chi2 pdf_noncentral_student_t pdf_normal pdf_pareto pdf_poisson pdf_rank_sum pdf_rayleigh pdf_signed_rank pdf_student_t pdf_weibull pearson_skewness permanent permut permutation permutations petersen_graph petrov pickapart picture_equalp picturep piechart piechart_description planar_embedding playback plog plot2d plot3d plotdf ploteq plsquares pochhammer points poisdiff poisexpt poisint poismap poisplus poissimp poissubst poistimes poistrim polar polarform polartorect polar_to_xy poly_add poly_buchberger poly_buchberger_criterion poly_colon_ideal poly_content polydecomp poly_depends_p poly_elimination_ideal poly_exact_divide poly_expand poly_expt poly_gcd polygon poly_grobner poly_grobner_equal poly_grobner_member poly_grobner_subsetp poly_ideal_intersection poly_ideal_polysaturation poly_ideal_polysaturation1 poly_ideal_saturation poly_ideal_saturation1 poly_lcm poly_minimization polymod poly_multiply polynome2ele polynomialp poly_normal_form poly_normalize poly_normalize_list poly_polysaturation_extension poly_primitive_part poly_pseudo_divide poly_reduced_grobner poly_reduction poly_saturation_extension poly_s_polynomial poly_subtract polytocompanion pop postfix potential power_mod powerseries powerset prefix prev_prime primep primes principal_components print printf printfile print_graph printpois printprops prodrac product properties propvars psi psubst ptriangularize pui pui2comp pui2ele pui2polynome pui_direct puireduc push put pv qput qrange qty quad_control quad_qag quad_qagi quad_qagp quad_qags quad_qawc quad_qawf quad_qawo quad_qaws quadrilateral quantile quantile_bernoulli quantile_beta quantile_binomial quantile_cauchy quantile_chi2 quantile_continuous_uniform quantile_discrete_uniform quantile_exp quantile_f quantile_gamma quantile_general_finite_discrete quantile_geometric quantile_gumbel quantile_hypergeometric quantile_laplace quantile_logistic quantile_lognormal quantile_negative_binomial quantile_noncentral_chi2 quantile_noncentral_student_t quantile_normal quantile_pareto quantile_poisson quantile_rayleigh quantile_student_t quantile_weibull quartile_skewness quit qunit quotient racah_v racah_w radcan radius random random_bernoulli random_beta random_binomial random_bipartite_graph random_cauchy random_chi2 random_continuous_uniform random_digraph random_discrete_uniform random_exp random_f random_gamma random_general_finite_discrete random_geometric random_graph random_graph1 random_gumbel random_hypergeometric random_laplace random_logistic random_lognormal random_negative_binomial random_network random_noncentral_chi2 random_noncentral_student_t random_normal random_pareto random_permutation random_poisson random_rayleigh random_regular_graph random_student_t random_tournament random_tree random_weibull range rank rat ratcoef ratdenom ratdiff ratdisrep ratexpand ratinterpol rational rationalize ratnumer ratnump ratp ratsimp ratsubst ratvars ratweight read read_array read_binary_array read_binary_list read_binary_matrix readbyte readchar read_hashed_array readline read_list read_matrix read_nested_list readonly read_xpm real_imagpart_to_conjugate realpart realroots rearray rectangle rectform rectform_log_if_constant recttopolar rediff reduce_consts reduce_order region region_boundaries region_boundaries_plus rem remainder remarray rembox remcomps remcon remcoord remfun remfunction remlet remove remove_constvalue remove_dimensions remove_edge remove_fundamental_dimensions remove_fundamental_units remove_plot_option remove_vertex rempart remrule remsym remvalue rename rename_file reset reset_displays residue resolvante resolvante_alternee1 resolvante_bipartite resolvante_diedrale resolvante_klein resolvante_klein3 resolvante_produit_sym resolvante_unitaire resolvante_vierer rest resultant return reveal reverse revert revert2 rgb2level rhs ricci riemann rinvariant risch rk rmdir rncombine romberg room rootscontract round row rowop rowswap rreduce run_testsuite %s save saving scalarp scaled_bessel_i scaled_bessel_i0 scaled_bessel_i1 scalefactors scanmap scatterplot scatterplot_description scene schur2comp sconcat scopy scsimp scurvature sdowncase sec sech second sequal sequalignore set_alt_display setdifference set_draw_defaults set_edge_weight setelmx setequalp setify setp set_partitions set_plot_option set_prompt set_random_state set_tex_environment set_tex_environment_default setunits setup_autoload set_up_dot_simplifications set_vertex_label seventh sexplode sf sha1sum sha256sum shortest_path shortest_weighted_path show showcomps showratvars sierpinskiale sierpinskimap sign signum similaritytransform simp_inequality simplify_sum simplode simpmetderiv simtran sin sinh sinsert sinvertcase sixth skewness skewness_bernoulli skewness_beta skewness_binomial skewness_chi2 skewness_continuous_uniform skewness_discrete_uniform skewness_exp skewness_f skewness_gamma skewness_general_finite_discrete skewness_geometric skewness_gumbel skewness_hypergeometric skewness_laplace skewness_logistic skewness_lognormal skewness_negative_binomial skewness_noncentral_chi2 skewness_noncentral_student_t skewness_normal skewness_pareto skewness_poisson skewness_rayleigh skewness_student_t skewness_weibull slength smake small_rhombicosidodecahedron_graph small_rhombicuboctahedron_graph smax smin smismatch snowmap snub_cube_graph snub_dodecahedron_graph solve solve_rec solve_rec_rat some somrac sort sparse6_decode sparse6_encode sparse6_export sparse6_import specint spherical spherical_bessel_j spherical_bessel_y spherical_hankel1 spherical_hankel2 spherical_harmonic spherical_to_xyz splice split sposition sprint sqfr sqrt sqrtdenest sremove sremovefirst sreverse ssearch ssort sstatus ssubst ssubstfirst staircase standardize standardize_inverse_trig starplot starplot_description status std std1 std_bernoulli std_beta std_binomial std_chi2 std_continuous_uniform std_discrete_uniform std_exp std_f std_gamma std_general_finite_discrete std_geometric std_gumbel std_hypergeometric std_laplace std_logistic std_lognormal std_negative_binomial std_noncentral_chi2 std_noncentral_student_t std_normal std_pareto std_poisson std_rayleigh std_student_t std_weibull stemplot stirling stirling1 stirling2 strim striml strimr string stringout stringp strong_components struve_h struve_l sublis sublist sublist_indices submatrix subsample subset subsetp subst substinpart subst_parallel substpart substring subvar subvarp sum sumcontract summand_to_rec supcase supcontext symbolp symmdifference symmetricp system take_channel take_inference tan tanh taylor taylorinfo taylorp taylor_simplifier taytorat tcl_output tcontract tellrat tellsimp tellsimpafter tentex tenth test_mean test_means_difference test_normality test_proportion test_proportions_difference test_rank_sum test_sign test_signed_rank test_variance test_variance_ratio tex tex1 tex_display texput %th third throw time timedate timer timer_info tldefint tlimit todd_coxeter toeplitz tokens to_lisp topological_sort to_poly to_poly_solve totaldisrep totalfourier totient tpartpol trace tracematrix trace_options transform_sample translate translate_file transpose treefale tree_reduce treillis treinat triangle triangularize trigexpand trigrat trigreduce trigsimp trunc truncate truncated_cube_graph truncated_dodecahedron_graph truncated_icosahedron_graph truncated_tetrahedron_graph tr_warnings_get tube tutte_graph ueivects uforget ultraspherical underlying_graph undiff union unique uniteigenvectors unitp units unit_step unitvector unorder unsum untellrat untimer untrace uppercasep uricci uriemann uvect vandermonde_matrix var var1 var_bernoulli var_beta var_binomial var_chi2 var_continuous_uniform var_discrete_uniform var_exp var_f var_gamma var_general_finite_discrete var_geometric var_gumbel var_hypergeometric var_laplace var_logistic var_lognormal var_negative_binomial var_noncentral_chi2 var_noncentral_student_t var_normal var_pareto var_poisson var_rayleigh var_student_t var_weibull vector vectorpotential vectorsimp verbify vers vertex_coloring vertex_connectivity vertex_degree vertex_distance vertex_eccentricity vertex_in_degree vertex_out_degree vertices vertices_to_cycle vertices_to_path %w weyl wheel_graph wiener_index wigner_3j wigner_6j wigner_9j with_stdout write_binary_data writebyte write_data writefile wronskian xreduce xthru %y Zeilberger zeroequiv zerofor zeromatrix zeromatrixp zeta zgeev zheev zlange zn_add_table zn_carmichael_lambda zn_characteristic_factors zn_determinant zn_factor_generators zn_invert_by_lu zn_log zn_mult_table absboxchar activecontexts adapt_depth additive adim aform algebraic algepsilon algexact aliases allbut all_dotsimp_denoms allocation allsym alphabetic animation antisymmetric arrays askexp assume_pos assume_pos_pred assumescalar asymbol atomgrad atrig1 axes axis_3d axis_bottom axis_left axis_right axis_top azimuth background background_color backsubst berlefact bernstein_explicit besselexpand beta_args_sum_to_integer beta_expand bftorat bftrunc bindtest border boundaries_array box boxchar breakup %c capping cauchysum cbrange cbtics center cflength cframe_flag cnonmet_flag color color_bar color_bar_tics colorbox columns commutative complex cone context contexts contour contour_levels cosnpiflag ctaypov ctaypt ctayswitch ctayvar ct_coords ctorsion_flag ctrgsimp cube current_let_rule_package cylinder data_file_name debugmode decreasing default_let_rule_package delay dependencies derivabbrev derivsubst detout diagmetric diff dim dimensions dispflag display2d|10 display_format_internal distribute_over doallmxops domain domxexpt domxmxops domxnctimes dontfactor doscmxops doscmxplus dot0nscsimp dot0simp dot1simp dotassoc dotconstrules dotdistrib dotexptsimp dotident dotscrules draw_graph_program draw_realpart edge_color edge_coloring edge_partition edge_type edge_width %edispflag elevation %emode endphi endtheta engineering_format_floats enhanced3d %enumer epsilon_lp erfflag erf_representation errormsg error_size error_syms error_type %e_to_numlog eval even evenfun evflag evfun ev_point expandwrt_denom expintexpand expintrep expon expop exptdispflag exptisolate exptsubst facexpand facsum_combine factlim factorflag factorial_expand factors_only fb feature features file_name file_output_append file_search_demo file_search_lisp file_search_maxima|10 file_search_tests file_search_usage file_type_lisp file_type_maxima|10 fill_color fill_density filled_func fixed_vertices flipflag float2bf font font_size fortindent fortspaces fpprec fpprintprec functions gamma_expand gammalim gdet genindex gensumnum GGFCFMAX GGFINFINITY globalsolve gnuplot_command gnuplot_curve_styles gnuplot_curve_titles gnuplot_default_term_command gnuplot_dumb_term_command gnuplot_file_args gnuplot_file_name gnuplot_out_file gnuplot_pdf_term_command gnuplot_pm3d gnuplot_png_term_command gnuplot_postamble gnuplot_preamble gnuplot_ps_term_command gnuplot_svg_term_command gnuplot_term gnuplot_view_args Gosper_in_Zeilberger gradefs grid grid2d grind halfangles head_angle head_both head_length head_type height hypergeometric_representation %iargs ibase icc1 icc2 icounter idummyx ieqnprint ifb ifc1 ifc2 ifg ifgi ifr iframe_bracket_form ifri igeowedge_flag ikt1 ikt2 imaginary inchar increasing infeval infinity inflag infolists inm inmc1 inmc2 intanalysis integer integervalued integrate_use_rootsof integration_constant integration_constant_counter interpolate_color intfaclim ip_grid ip_grid_in irrational isolate_wrt_times iterations itr julia_parameter %k1 %k2 keepfloat key key_pos kinvariant kt label label_alignment label_orientation labels lassociative lbfgs_ncorrections lbfgs_nfeval_max leftjust legend letrat let_rule_packages lfg lg lhospitallim limsubst linear linear_solver linechar linel|10 linenum line_type linewidth line_width linsolve_params linsolvewarn lispdisp listarith listconstvars listdummyvars lmxchar load_pathname loadprint logabs logarc logcb logconcoeffp logexpand lognegint logsimp logx logx_secondary logy logy_secondary logz lriem m1pbranch macroexpansion macros mainvar manual_demo maperror mapprint matrix_element_add matrix_element_mult matrix_element_transpose maxapplydepth maxapplyheight maxima_tempdir|10 maxima_userdir|10 maxnegex MAX_ORD maxposex maxpsifracdenom maxpsifracnum maxpsinegint maxpsiposint maxtayorder mesh_lines_color method mod_big_prime mode_check_errorp mode_checkp mode_check_warnp mod_test mod_threshold modular_linear_solver modulus multiplicative multiplicities myoptions nary negdistrib negsumdispflag newline newtonepsilon newtonmaxiter nextlayerfactor niceindicespref nm nmc noeval nolabels nonegative_lp noninteger nonscalar noun noundisp nouns np npi nticks ntrig numer numer_pbranch obase odd oddfun opacity opproperties opsubst optimprefix optionset orientation origin orthopoly_returns_intervals outative outchar packagefile palette partswitch pdf_file pfeformat phiresolution %piargs piece pivot_count_sx pivot_max_sx plot_format plot_options plot_realpart png_file pochhammer_max_index points pointsize point_size points_joined point_type poislim poisson poly_coefficient_ring poly_elimination_order polyfactor poly_grobner_algorithm poly_grobner_debug poly_monomial_order poly_primary_elimination_order poly_return_term_list poly_secondary_elimination_order poly_top_reduction_only posfun position powerdisp pred prederror primep_number_of_tests product_use_gamma program programmode promote_float_to_bigfloat prompt proportional_axes props psexpand ps_file radexpand radius radsubstflag rassociative ratalgdenom ratchristof ratdenomdivide rateinstein ratepsilon ratfac rational ratmx ratprint ratriemann ratsimpexpons ratvarswitch ratweights ratweyl ratwtlvl real realonly redraw refcheck resolution restart resultant ric riem rmxchar %rnum_list rombergabs rombergit rombergmin rombergtol rootsconmode rootsepsilon run_viewer same_xy same_xyz savedef savefactors scalar scalarmatrixp scale scale_lp setcheck setcheckbreak setval show_edge_color show_edges show_edge_type show_edge_width show_id show_label showtime show_vertex_color show_vertex_size show_vertex_type show_vertices show_weight simp simplified_output simplify_products simpproduct simpsum sinnpiflag solvedecomposes solveexplicit solvefactors solvenullwarn solveradcan solvetrigwarn space sparse sphere spring_embedding_depth sqrtdispflag stardisp startphi starttheta stats_numer stringdisp structures style sublis_apply_lambda subnumsimp sumexpand sumsplitfact surface surface_hide svg_file symmetric tab taylordepth taylor_logexpand taylor_order_coefficients taylor_truncate_polynomials tensorkill terminal testsuite_files thetaresolution timer_devalue title tlimswitch tr track transcompile transform transform_xy translate_fast_arrays transparent transrun tr_array_as_ref tr_bound_function_applyp tr_file_tty_messagesp tr_float_can_branch_complex tr_function_call_default trigexpandplus trigexpandtimes triginverses trigsign trivial_solutions tr_numer tr_optimize_max_loop tr_semicompile tr_state_vars tr_warn_bad_function_calls tr_warn_fexpr tr_warn_meval tr_warn_mode tr_warn_undeclared tr_warn_undefined_variable tstep ttyoff tube_extremes ufg ug %unitexpand unit_vectors uric uriem use_fast_arrays user_preamble usersetunits values vect_cross verbose vertex_color vertex_coloring vertex_partition vertex_size vertex_type view warnings weyl width windowname windowtitle wired_surface wireframe xaxis xaxis_color xaxis_secondary xaxis_type xaxis_width xlabel xlabel_secondary xlength xrange xrange_secondary xtics xtics_axis xtics_rotate xtics_rotate_secondary xtics_secondary xtics_secondary_axis xu_grid x_voxel xy_file xyplane xy_scale yaxis yaxis_color yaxis_secondary yaxis_type yaxis_width ylabel ylabel_secondary ylength yrange yrange_secondary ytics ytics_axis ytics_rotate ytics_rotate_secondary ytics_secondary ytics_secondary_axis yv_grid y_voxel yx_ratio zaxis zaxis_color zaxis_type zaxis_width zeroa zerob zerobern zeta%pi zlabel zlabel_rotate zlength zmin zn_primroot_limit zn_primroot_pretest",symbol:"_ __ %|0 %%|0"},c:[{cN:"comment",b:"/\\*",e:"\\*/",c:["self"]},e.QSM,{cN:"number",relevance:0,v:[{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Ee][-+]?\\d+\\b"},{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Bb][-+]?\\d+\\b",relevance:10},{b:"\\b(\\.\\d+|\\d+\\.\\d+)\\b"},{b:"\\b(\\d+|0[0-9A-Za-z]+)\\.?\\b"}]}],i:/@/}});
+hljs.registerLanguage("leaf",function(e){return{c:[{cN:"function",b:"#+[A-Za-z_0-9]*\\(",e:" {",rB:!0,eE:!0,c:[{cN:"keyword",b:"#+"},{cN:"title",b:"[A-Za-z_][A-Za-z_0-9]*"},{cN:"params",b:"\\(",e:"\\)",endsParent:!0,c:[{cN:"string",b:'"',e:'"'},{cN:"variable",b:"[A-Za-z_][A-Za-z_0-9]*"}]}]}]}});
+hljs.registerLanguage("llvm",function(e){var n="([-a-zA-Z$._][\\w\\-$.]*)";return{k:"begin end true false declare define global constant private linker_private internal available_externally linkonce linkonce_odr weak weak_odr appending dllimport dllexport common default hidden protected extern_weak external thread_local zeroinitializer undef null to tail target triple datalayout volatile nuw nsw nnan ninf nsz arcp fast exact inbounds align addrspace section alias module asm sideeffect gc dbg linker_private_weak attributes blockaddress initialexec localdynamic localexec prefix unnamed_addr ccc fastcc coldcc x86_stdcallcc x86_fastcallcc arm_apcscc arm_aapcscc arm_aapcs_vfpcc ptx_device ptx_kernel intel_ocl_bicc msp430_intrcc spir_func spir_kernel x86_64_sysvcc x86_64_win64cc x86_thiscallcc cc c signext zeroext inreg sret nounwind noreturn noalias nocapture byval nest readnone readonly inlinehint noinline alwaysinline optsize ssp sspreq noredzone noimplicitfloat naked builtin cold nobuiltin noduplicate nonlazybind optnone returns_twice sanitize_address sanitize_memory sanitize_thread sspstrong uwtable returned type opaque eq ne slt sgt sle sge ult ugt ule uge oeq one olt ogt ole oge ord uno ueq une x acq_rel acquire alignstack atomic catch cleanup filter inteldialect max min monotonic nand personality release seq_cst singlethread umax umin unordered xchg add fadd sub fsub mul fmul udiv sdiv fdiv urem srem frem shl lshr ashr and or xor icmp fcmp phi call trunc zext sext fptrunc fpext uitofp sitofp fptoui fptosi inttoptr ptrtoint bitcast addrspacecast select va_arg ret br switch invoke unwind unreachable indirectbr landingpad resume malloc alloca free load store getelementptr extractelement insertelement shufflevector getresult extractvalue insertvalue atomicrmw cmpxchg fence argmemonly double",c:[{cN:"keyword",b:"i\\d+"},e.C(";","\\n",{relevance:0}),e.QSM,{cN:"string",v:[{b:'"',e:'[^\\\\]"'}],relevance:0},{cN:"title",v:[{b:"@"+n},{b:"@\\d+"},{b:"!"+n},{b:"!\\d+"+n}]},{cN:"symbol",v:[{b:"%"+n},{b:"%\\d+"},{b:"#\\d+"}]},{cN:"number",v:[{b:"0[xX][a-fA-F0-9]+"},{b:"-?\\d+(?:[.]\\d+)?(?:[eE][-+]?\\d+(?:[.]\\d+)?)?"}],relevance:0}]}});
+hljs.registerLanguage("ada",function(e){var r="[A-Za-z](_?[A-Za-z0-9.])*",t="[]{}%#'\"",n=e.C("--","$"),a={b:"\\s+:\\s+",e:"\\s*(:=|;|\\)|=>|$)",i:t,c:[{bK:"loop for declare others",endsParent:!0},{cN:"keyword",bK:"not null constant access function procedure in out aliased exception"},{cN:"type",b:r,endsParent:!0,relevance:0}]};return{cI:!0,k:{keyword:"abort else new return abs elsif not reverse abstract end accept entry select access exception of separate aliased exit or some all others subtype and for out synchronized array function overriding at tagged generic package task begin goto pragma terminate body private then if procedure type case in protected constant interface is raise use declare range delay limited record when delta loop rem while digits renames with do mod requeue xor",literal:"True False"},c:[n,{cN:"string",b:/"/,e:/"/,c:[{b:/""/,relevance:0}]},{cN:"string",b:/'.'/},{cN:"number",b:"\\b(\\d(_|\\d)*#\\w+(\\.\\w+)?#([eE][-+]?\\d(_|\\d)*)?|\\d(_|\\d)*(\\.\\d(_|\\d)*)?([eE][-+]?\\d(_|\\d)*)?)",relevance:0},{cN:"symbol",b:"'"+r},{cN:"title",b:"(\\bwith\\s+)?(\\bprivate\\s+)?\\bpackage\\s+(\\bbody\\s+)?",e:"(is|$)",k:"package body",eB:!0,eE:!0,i:t},{b:"(\\b(with|overriding)\\s+)?\\b(function|procedure)\\s+",e:"(\\bis|\\bwith|\\brenames|\\)\\s*;)",k:"overriding function procedure with is renames return",rB:!0,c:[n,{cN:"title",b:"(\\bwith\\s+)?\\b(function|procedure)\\s+",e:"(\\(|\\s+|$)",eB:!0,eE:!0,i:t},a,{cN:"type",b:"\\breturn\\s+",e:"(\\s+|;|$)",k:"return",eB:!0,eE:!0,endsParent:!0,i:t}]},{cN:"type",b:"\\b(sub)?type\\s+",e:"\\s+",k:"type",eB:!0,i:t},a]}});
+hljs.registerLanguage("golo",function(e){return{k:{keyword:"println readln print import module function local return let var while for foreach times in case when match with break continue augment augmentation each find filter reduce if then else otherwise try catch finally raise throw orIfNull DynamicObject|10 DynamicVariable struct Observable map set vector list array",literal:"true false null"},c:[e.HCM,e.QSM,e.CNM,{cN:"meta",b:"@[A-Za-z]+"}]}});
+hljs.registerLanguage("rust",function(e){var t="([ui](8|16|32|64|128|size)|f(32|64))?",r="drop i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize f32 f64 str char bool Box Option Result String Vec Copy Send Sized Sync Drop Fn FnMut FnOnce ToOwned Clone Debug PartialEq PartialOrd Eq Ord AsRef AsMut Into From Default Iterator Extend IntoIterator DoubleEndedIterator ExactSizeIterator SliceConcatExt ToString assert! assert_eq! bitflags! bytes! cfg! col! concat! concat_idents! debug_assert! debug_assert_eq! env! panic! file! format! format_args! include_bin! include_str! line! local_data_key! module_path! option_env! print! println! select! stringify! try! unimplemented! unreachable! vec! write! writeln! macro_rules! assert_ne! debug_assert_ne!";return{aliases:["rs"],k:{keyword:"abstract as async await become box break const continue crate do dyn else enum extern false final fn for if impl in let loop macro match mod move mut override priv pub ref return self Self static struct super trait true try type typeof unsafe unsized use virtual where while yield",literal:"true false Some None Ok Err",built_in:r},l:e.IR+"!?",i:"</",c:[e.CLCM,e.C("/\\*","\\*/",{c:["self"]}),e.inherit(e.QSM,{b:/b?"/,i:null}),{cN:"string",v:[{b:/r(#*)"(.|\n)*?"\1(?!#)/},{b:/b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/}]},{cN:"symbol",b:/'[a-zA-Z_][a-zA-Z0-9_]*/},{cN:"number",v:[{b:"\\b0b([01_]+)"+t},{b:"\\b0o([0-7_]+)"+t},{b:"\\b0x([A-Fa-f0-9_]+)"+t},{b:"\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)"+t}],relevance:0},{cN:"function",bK:"fn",e:"(\\(|<)",eE:!0,c:[e.UTM]},{cN:"meta",b:"#\\!?\\[",e:"\\]",c:[{cN:"meta-string",b:/"/,e:/"/}]},{cN:"class",bK:"type",e:";",c:[e.inherit(e.UTM,{endsParent:!0})],i:"\\S"},{cN:"class",bK:"trait enum struct union",e:"{",c:[e.inherit(e.UTM,{endsParent:!0})],i:"[\\w\\d]"},{b:e.IR+"::",k:{built_in:r}},{b:"->"}]}});
+hljs.registerLanguage("xl",function(e){var t={keyword:"if then else do while until for loop import with is as where when by data constant integer real text name boolean symbol infix prefix postfix block tree",literal:"true false nil",built_in:"in mod rem and or xor not abs sign floor ceil sqrt sin cos tan asin acos atan exp expm1 log log2 log10 log1p pi at text_length text_range text_find text_replace contains page slide basic_slide title_slide title subtitle fade_in fade_out fade_at clear_color color line_color line_width texture_wrap texture_transform texture scale_?x scale_?y scale_?z? translate_?x translate_?y translate_?z? rotate_?x rotate_?y rotate_?z? rectangle circle ellipse sphere path line_to move_to quad_to curve_to theme background contents locally time mouse_?x mouse_?y mouse_buttons ObjectLoader Animate MovieCredits Slides Filters Shading Materials LensFlare Mapping VLCAudioVideo StereoDecoder PointCloud NetworkAccess RemoteControl RegExp ChromaKey Snowfall NodeJS Speech Charts"},o={cN:"string",b:'"',e:'"',i:"\\n"},a={bK:"import",e:"$",k:t,c:[o]},r={cN:"function",b:/[a-z][^\n]*->/,rB:!0,e:/->/,c:[e.inherit(e.TM,{starts:{eW:!0,k:t}})]};return{aliases:["tao"],l:/[a-zA-Z][a-zA-Z0-9_?]*/,k:t,c:[e.CLCM,e.CBCM,o,{cN:"string",b:"'",e:"'",i:"\\n"},{cN:"string",b:"<<",e:">>"},r,a,{cN:"number",b:"[0-9]+#[0-9A-Z_]+(\\.[0-9-A-Z_]+)?#?([Ee][+-]?[0-9]+)?"},e.NM]}});
+hljs.registerLanguage("livescript",function(e){var t={keyword:"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger case default function var with then unless until loop of by when and or is isnt not it that otherwise from to til fallthrough super case default function var void const let enum export import native list map __hasProp __extends __slice __bind __indexOf",literal:"true false null undefined yes no on off it that void",built_in:"npm require console print module global window document"},s="[A-Za-z$_](?:-[0-9A-Za-z$_]|[0-9A-Za-z$_])*",n=e.inherit(e.TM,{b:s}),i={cN:"subst",b:/#\{/,e:/}/,k:t},a={cN:"subst",b:/#[A-Za-z$_]/,e:/(?:\-[0-9A-Za-z$_]|[0-9A-Za-z$_])*/,k:t},c=[e.BNM,{cN:"number",b:"(\\b0[xX][a-fA-F0-9_]+)|(\\b\\d(\\d|_\\d)*(\\.(\\d(\\d|_\\d)*)?)?(_*[eE]([-+]\\d(_\\d|\\d)*)?)?[_a-z]*)",relevance:0,starts:{e:"(\\s*/)?",relevance:0}},{cN:"string",v:[{b:/'''/,e:/'''/,c:[e.BE]},{b:/'/,e:/'/,c:[e.BE]},{b:/"""/,e:/"""/,c:[e.BE,i,a]},{b:/"/,e:/"/,c:[e.BE,i,a]},{b:/\\/,e:/(\s|$)/,eE:!0}]},{cN:"regexp",v:[{b:"//",e:"//[gim]*",c:[i,e.HCM]},{b:/\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W)/}]},{b:"@"+s},{b:"``",e:"``",eB:!0,eE:!0,sL:"javascript"}];i.c=c;var r={cN:"params",b:"\\(",rB:!0,c:[{b:/\(/,e:/\)/,k:t,c:["self"].concat(c)}]};return{aliases:["ls"],k:t,i:/\/\*/,c:c.concat([e.C("\\/\\*","\\*\\/"),e.HCM,{b:"(#=>|=>|\\|>>|-?->|\\!->)"},{cN:"function",c:[n,r],rB:!0,v:[{b:"("+s+"\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B\\->\\*?",e:"\\->\\*?"},{b:"("+s+"\\s*(?:=|:=)\\s*)?!?(\\(.*\\))?\\s*\\B[-~]{1,2}>\\*?",e:"[-~]{1,2}>\\*?"},{b:"("+s+"\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B!?[-~]{1,2}>\\*?",e:"!?[-~]{1,2}>\\*?"}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[n]},n]},{b:s+":",e:":",rB:!0,rE:!0,relevance:0}])}});
+hljs.registerLanguage("less",function(e){function r(e){return{cN:"string",b:"~?"+e+".*?"+e}}function t(e,r,t){return{cN:e,b:r,relevance:t}}var a="[\\w-]+",c="("+a+"|@{"+a+"})",s=[],n=[],b={b:"\\(",e:"\\)",c:n,relevance:0};n.push(e.CLCM,e.CBCM,r("'"),r('"'),e.CSSNM,{b:"(url|data-uri)\\(",starts:{cN:"string",e:"[\\)\\n]",eE:!0}},t("number","#[0-9A-Fa-f]+\\b"),b,t("variable","@@?"+a,10),t("variable","@{"+a+"}"),t("built_in","~?`[^`]*?`"),{cN:"attribute",b:a+"\\s*:",e:":",rB:!0,eE:!0},{cN:"meta",b:"!important"});var i=n.concat({b:"{",e:"}",c:s}),l={bK:"when",eW:!0,c:[{bK:"and not"}].concat(n)},o={b:c+"\\s*:",rB:!0,e:"[;}]",relevance:0,c:[{cN:"attribute",b:c,e:":",eE:!0,starts:{eW:!0,i:"[<=$]",relevance:0,c:n}}]},u={cN:"keyword",b:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",starts:{e:"[;{}]",rE:!0,c:n,relevance:0}},v={cN:"variable",v:[{b:"@"+a+"\\s*:",relevance:15},{b:"@"+a}],starts:{e:"[;}]",rE:!0,c:i}},C={v:[{b:"[\\.#:&\\[>]",e:"[;{}]"},{b:c,e:"{"}],rB:!0,rE:!0,i:"[<='$\"]",relevance:0,c:[e.CLCM,e.CBCM,l,t("keyword","all\\b"),t("variable","@{"+a+"}"),t("selector-tag",c+"%?",0),t("selector-id","#"+c),t("selector-class","\\."+c,0),t("selector-tag","&",0),{cN:"selector-attr",b:"\\[",e:"\\]"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"\\(",e:"\\)",c:i},{b:"!important"}]};return s.push(e.CLCM,e.CBCM,u,v,o,C),{cI:!0,i:"[=>'/<($\"]",c:s}});
+hljs.registerLanguage("groovy",function(e){return{k:{literal:"true false null",keyword:"byte short char int long boolean float double void def as in assert trait super this abstract static volatile transient public private protected synchronized final class interface enum if else for while switch case break default continue throw throws try catch finally implements extends new import package return instanceof"},c:[e.C("/\\*\\*","\\*/",{relevance:0,c:[{b:/\w+@/,relevance:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,{cN:"string",b:'"""',e:'"""'},{cN:"string",b:"'''",e:"'''"},{cN:"string",b:"\\$/",e:"/\\$",relevance:10},e.ASM,{cN:"regexp",b:/~?\/[^\/\n]+\//,c:[e.BE]},e.QSM,{cN:"meta",b:"^#!/usr/bin/env",e:"$",i:"\n"},e.BNM,{cN:"class",bK:"class interface trait enum",e:"{",i:":",c:[{bK:"extends implements"},e.UTM]},e.CNM,{cN:"meta",b:"@[A-Za-z]+"},{cN:"string",b:/[^\?]{0}[A-Za-z0-9_$]+ *:/},{b:/\?/,e:/\:/},{cN:"symbol",b:"^\\s*[A-Za-z0-9_$]+:",relevance:0}],i:/#|<\//}});
+hljs.registerLanguage("mizar",function(e){return{k:"environ vocabularies notations constructors definitions registrations theorems schemes requirements begin end definition registration cluster existence pred func defpred deffunc theorem proof let take assume then thus hence ex for st holds consider reconsider such that and in provided of as from be being by means equals implies iff redefine define now not or attr is mode suppose per cases set thesis contradiction scheme reserve struct correctness compatibility coherence symmetry assymetry reflexivity irreflexivity connectedness uniqueness commutativity idempotence involutiveness projectivity",c:[e.C("::","$")]}});
+hljs.registerLanguage("latex",function(){"use strict";return function(e){var n={className:"tag",begin:/\\/,relevance:0,contains:[{className:"name",variants:[{begin:/[a-zA-Z\u0430-\u044f\u0410-\u042f]+[*]?/},{begin:/[^a-zA-Z\u0430-\u044f\u0410-\u042f0-9]/}],starts:{endsWithParent:!0,relevance:0,contains:[{className:"string",variants:[{begin:/\[/,end:/\]/},{begin:/\{/,end:/\}/}]},{begin:/\s*=\s*/,endsWithParent:!0,relevance:0,contains:[{className:"number",begin:/-?\d*\.?\d+(pt|pc|mm|cm|in|dd|cc|ex|em)?/}]}]}}]};return{name:"LaTeX",aliases:["tex"],contains:[n,{className:"formula",contains:[n],relevance:0,variants:[{begin:/\$\$/,end:/\$\$/},{begin:/\$/,end:/\$/}]},e.COMMENT("%","$",{relevance:0})]}}}());
+hljs.registerLanguage("mojolicious",function(e){return{sL:"xml",c:[{cN:"meta",b:"^__(END|DATA)__$"},{b:"^\\s*%{1,2}={0,2}",e:"$",sL:"perl"},{b:"<%{1,2}={0,2}",e:"={0,1}%>",sL:"perl",eB:!0,eE:!0}]}});
+hljs.registerLanguage("clojure-repl",function(e){return{c:[{cN:"meta",b:/^([\w.-]+|\s*#_)?=>/,starts:{e:/$/,sL:"clojure"}}]}});
+hljs.registerLanguage("isbl",function(S){var E="[A-Za-zА-Яа-яёЁ_!][A-Za-zА-Яа-яёЁ_0-9]*",_={cN:"number",b:S.NR,relevance:0},T={cN:"string",v:[{b:'"',e:'"'},{b:"'",e:"'"}]},R={cN:"doctag",b:"\\b(?:TODO|DONE|BEGIN|END|STUB|CHG|FIXME|NOTE|BUG|XXX)\\b",relevance:0},O={v:[{cN:"comment",b:"//",e:"$",relevance:0,c:[S.PWM,R]},{cN:"comment",b:"/\\*",e:"\\*/",relevance:0,c:[S.PWM,R]}]},C={keyword:"and и else иначе endexcept endfinally endforeach конецвсе endif конецесли endwhile конецпока except exitfor finally foreach все if если in в not не or или try while пока ",built_in:"SYSRES_CONST_ACCES_RIGHT_TYPE_EDIT SYSRES_CONST_ACCES_RIGHT_TYPE_FULL SYSRES_CONST_ACCES_RIGHT_TYPE_VIEW SYSRES_CONST_ACCESS_MODE_REQUISITE_CODE SYSRES_CONST_ACCESS_NO_ACCESS_VIEW SYSRES_CONST_ACCESS_NO_ACCESS_VIEW_CODE SYSRES_CONST_ACCESS_RIGHTS_ADD_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_ADD_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_CHANGE_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_CHANGE_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_DELETE_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_DELETE_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_EXECUTE_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_EXECUTE_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_NO_ACCESS_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_NO_ACCESS_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_RATIFY_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_RATIFY_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_RIGHTS_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_VIEW SYSRES_CONST_ACCESS_RIGHTS_VIEW_CODE SYSRES_CONST_ACCESS_RIGHTS_VIEW_REQUISITE_CODE SYSRES_CONST_ACCESS_RIGHTS_VIEW_REQUISITE_YES_CODE SYSRES_CONST_ACCESS_TYPE_CHANGE SYSRES_CONST_ACCESS_TYPE_CHANGE_CODE SYSRES_CONST_ACCESS_TYPE_EXISTS SYSRES_CONST_ACCESS_TYPE_EXISTS_CODE SYSRES_CONST_ACCESS_TYPE_FULL SYSRES_CONST_ACCESS_TYPE_FULL_CODE SYSRES_CONST_ACCESS_TYPE_VIEW SYSRES_CONST_ACCESS_TYPE_VIEW_CODE SYSRES_CONST_ACTION_TYPE_ABORT SYSRES_CONST_ACTION_TYPE_ACCEPT SYSRES_CONST_ACTION_TYPE_ACCESS_RIGHTS SYSRES_CONST_ACTION_TYPE_ADD_ATTACHMENT SYSRES_CONST_ACTION_TYPE_CHANGE_CARD SYSRES_CONST_ACTION_TYPE_CHANGE_KIND SYSRES_CONST_ACTION_TYPE_CHANGE_STORAGE SYSRES_CONST_ACTION_TYPE_CONTINUE SYSRES_CONST_ACTION_TYPE_COPY SYSRES_CONST_ACTION_TYPE_CREATE SYSRES_CONST_ACTION_TYPE_CREATE_VERSION SYSRES_CONST_ACTION_TYPE_DELETE SYSRES_CONST_ACTION_TYPE_DELETE_ATTACHMENT SYSRES_CONST_ACTION_TYPE_DELETE_VERSION SYSRES_CONST_ACTION_TYPE_DISABLE_DELEGATE_ACCESS_RIGHTS SYSRES_CONST_ACTION_TYPE_ENABLE_DELEGATE_ACCESS_RIGHTS SYSRES_CONST_ACTION_TYPE_ENCRYPTION_BY_CERTIFICATE SYSRES_CONST_ACTION_TYPE_ENCRYPTION_BY_CERTIFICATE_AND_PASSWORD SYSRES_CONST_ACTION_TYPE_ENCRYPTION_BY_PASSWORD SYSRES_CONST_ACTION_TYPE_EXPORT_WITH_LOCK SYSRES_CONST_ACTION_TYPE_EXPORT_WITHOUT_LOCK SYSRES_CONST_ACTION_TYPE_IMPORT_WITH_UNLOCK SYSRES_CONST_ACTION_TYPE_IMPORT_WITHOUT_UNLOCK SYSRES_CONST_ACTION_TYPE_LIFE_CYCLE_STAGE SYSRES_CONST_ACTION_TYPE_LOCK SYSRES_CONST_ACTION_TYPE_LOCK_FOR_SERVER SYSRES_CONST_ACTION_TYPE_LOCK_MODIFY SYSRES_CONST_ACTION_TYPE_MARK_AS_READED SYSRES_CONST_ACTION_TYPE_MARK_AS_UNREADED SYSRES_CONST_ACTION_TYPE_MODIFY SYSRES_CONST_ACTION_TYPE_MODIFY_CARD SYSRES_CONST_ACTION_TYPE_MOVE_TO_ARCHIVE SYSRES_CONST_ACTION_TYPE_OFF_ENCRYPTION SYSRES_CONST_ACTION_TYPE_PASSWORD_CHANGE SYSRES_CONST_ACTION_TYPE_PERFORM SYSRES_CONST_ACTION_TYPE_RECOVER_FROM_LOCAL_COPY SYSRES_CONST_ACTION_TYPE_RESTART SYSRES_CONST_ACTION_TYPE_RESTORE_FROM_ARCHIVE SYSRES_CONST_ACTION_TYPE_REVISION SYSRES_CONST_ACTION_TYPE_SEND_BY_MAIL SYSRES_CONST_ACTION_TYPE_SIGN SYSRES_CONST_ACTION_TYPE_START SYSRES_CONST_ACTION_TYPE_UNLOCK SYSRES_CONST_ACTION_TYPE_UNLOCK_FROM_SERVER SYSRES_CONST_ACTION_TYPE_VERSION_STATE SYSRES_CONST_ACTION_TYPE_VERSION_VISIBILITY SYSRES_CONST_ACTION_TYPE_VIEW SYSRES_CONST_ACTION_TYPE_VIEW_SHADOW_COPY SYSRES_CONST_ACTION_TYPE_WORKFLOW_DESCRIPTION_MODIFY SYSRES_CONST_ACTION_TYPE_WRITE_HISTORY SYSRES_CONST_ACTIVE_VERSION_STATE_PICK_VALUE SYSRES_CONST_ADD_REFERENCE_MODE_NAME SYSRES_CONST_ADDITION_REQUISITE_CODE SYSRES_CONST_ADDITIONAL_PARAMS_REQUISITE_CODE SYSRES_CONST_ADITIONAL_JOB_END_DATE_REQUISITE_NAME SYSRES_CONST_ADITIONAL_JOB_READ_REQUISITE_NAME SYSRES_CONST_ADITIONAL_JOB_START_DATE_REQUISITE_NAME SYSRES_CONST_ADITIONAL_JOB_STATE_REQUISITE_NAME SYSRES_CONST_ADMINISTRATION_HISTORY_ADDING_USER_TO_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_ADDING_USER_TO_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_COMP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_COMP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_USER_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_CREATION_USER_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_DATABASE_USER_CREATION SYSRES_CONST_ADMINISTRATION_HISTORY_DATABASE_USER_CREATION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DATABASE_USER_DELETION SYSRES_CONST_ADMINISTRATION_HISTORY_DATABASE_USER_DELETION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_COMP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_COMP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_USER_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_USER_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_USER_FROM_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_DELETION_USER_FROM_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_FILTERER_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_FILTERER_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_FILTERER_RESTRICTION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_FILTERER_RESTRICTION_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_PRIVILEGE_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_PRIVILEGE_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_RIGHTS_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_GRANTING_RIGHTS_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_IS_MAIN_SERVER_CHANGED_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_IS_MAIN_SERVER_CHANGED_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_IS_PUBLIC_CHANGED_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_IS_PUBLIC_CHANGED_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_FILTERER_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_FILTERER_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_FILTERER_RESTRICTION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_FILTERER_RESTRICTION_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_PRIVILEGE_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_PRIVILEGE_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_RIGHTS_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_REMOVING_RIGHTS_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_SERVER_LOGIN_CREATION SYSRES_CONST_ADMINISTRATION_HISTORY_SERVER_LOGIN_CREATION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_SERVER_LOGIN_DELETION SYSRES_CONST_ADMINISTRATION_HISTORY_SERVER_LOGIN_DELETION_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_CATEGORY_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_CATEGORY_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_COMP_TITLE_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_COMP_TITLE_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_FULL_NAME_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_FULL_NAME_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_PARENT_GROUP_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_PARENT_GROUP_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_AUTH_TYPE_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_AUTH_TYPE_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_LOGIN_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_LOGIN_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_STATUS_ACTION SYSRES_CONST_ADMINISTRATION_HISTORY_UPDATING_USER_STATUS_ACTION_CODE SYSRES_CONST_ADMINISTRATION_HISTORY_USER_PASSWORD_CHANGE SYSRES_CONST_ADMINISTRATION_HISTORY_USER_PASSWORD_CHANGE_ACTION SYSRES_CONST_ALL_ACCEPT_CONDITION_RUS SYSRES_CONST_ALL_USERS_GROUP SYSRES_CONST_ALL_USERS_GROUP_NAME SYSRES_CONST_ALL_USERS_SERVER_GROUP_NAME SYSRES_CONST_ALLOWED_ACCESS_TYPE_CODE SYSRES_CONST_ALLOWED_ACCESS_TYPE_NAME SYSRES_CONST_APP_VIEWER_TYPE_REQUISITE_CODE SYSRES_CONST_APPROVING_SIGNATURE_NAME SYSRES_CONST_APPROVING_SIGNATURE_REQUISITE_CODE SYSRES_CONST_ASSISTANT_SUBSTITUE_TYPE SYSRES_CONST_ASSISTANT_SUBSTITUE_TYPE_CODE SYSRES_CONST_ATTACH_TYPE_COMPONENT_TOKEN SYSRES_CONST_ATTACH_TYPE_DOC SYSRES_CONST_ATTACH_TYPE_EDOC SYSRES_CONST_ATTACH_TYPE_FOLDER SYSRES_CONST_ATTACH_TYPE_JOB SYSRES_CONST_ATTACH_TYPE_REFERENCE SYSRES_CONST_ATTACH_TYPE_TASK SYSRES_CONST_AUTH_ENCODED_PASSWORD SYSRES_CONST_AUTH_ENCODED_PASSWORD_CODE SYSRES_CONST_AUTH_NOVELL SYSRES_CONST_AUTH_PASSWORD SYSRES_CONST_AUTH_PASSWORD_CODE SYSRES_CONST_AUTH_WINDOWS SYSRES_CONST_AUTHENTICATING_SIGNATURE_NAME SYSRES_CONST_AUTHENTICATING_SIGNATURE_REQUISITE_CODE SYSRES_CONST_AUTO_ENUM_METHOD_FLAG SYSRES_CONST_AUTO_NUMERATION_CODE SYSRES_CONST_AUTO_STRONG_ENUM_METHOD_FLAG SYSRES_CONST_AUTOTEXT_NAME_REQUISITE_CODE SYSRES_CONST_AUTOTEXT_TEXT_REQUISITE_CODE SYSRES_CONST_AUTOTEXT_USAGE_ALL SYSRES_CONST_AUTOTEXT_USAGE_ALL_CODE SYSRES_CONST_AUTOTEXT_USAGE_SIGN SYSRES_CONST_AUTOTEXT_USAGE_SIGN_CODE SYSRES_CONST_AUTOTEXT_USAGE_WORK SYSRES_CONST_AUTOTEXT_USAGE_WORK_CODE SYSRES_CONST_AUTOTEXT_USE_ANYWHERE_CODE SYSRES_CONST_AUTOTEXT_USE_ON_SIGNING_CODE SYSRES_CONST_AUTOTEXT_USE_ON_WORK_CODE SYSRES_CONST_BEGIN_DATE_REQUISITE_CODE SYSRES_CONST_BLACK_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_BLUE_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_BTN_PART SYSRES_CONST_CALCULATED_ROLE_TYPE_CODE SYSRES_CONST_CALL_TYPE_VARIABLE_BUTTON_VALUE SYSRES_CONST_CALL_TYPE_VARIABLE_PROGRAM_VALUE SYSRES_CONST_CANCEL_MESSAGE_FUNCTION_RESULT SYSRES_CONST_CARD_PART SYSRES_CONST_CARD_REFERENCE_MODE_NAME SYSRES_CONST_CERTIFICATE_TYPE_REQUISITE_ENCRYPT_VALUE SYSRES_CONST_CERTIFICATE_TYPE_REQUISITE_SIGN_AND_ENCRYPT_VALUE SYSRES_CONST_CERTIFICATE_TYPE_REQUISITE_SIGN_VALUE SYSRES_CONST_CHECK_PARAM_VALUE_DATE_PARAM_TYPE SYSRES_CONST_CHECK_PARAM_VALUE_FLOAT_PARAM_TYPE SYSRES_CONST_CHECK_PARAM_VALUE_INTEGER_PARAM_TYPE SYSRES_CONST_CHECK_PARAM_VALUE_PICK_PARAM_TYPE SYSRES_CONST_CHECK_PARAM_VALUE_REEFRENCE_PARAM_TYPE SYSRES_CONST_CLOSED_RECORD_FLAG_VALUE_FEMININE SYSRES_CONST_CLOSED_RECORD_FLAG_VALUE_MASCULINE SYSRES_CONST_CODE_COMPONENT_TYPE_ADMIN SYSRES_CONST_CODE_COMPONENT_TYPE_DEVELOPER SYSRES_CONST_CODE_COMPONENT_TYPE_DOCS SYSRES_CONST_CODE_COMPONENT_TYPE_EDOC_CARDS SYSRES_CONST_CODE_COMPONENT_TYPE_EXTERNAL_EXECUTABLE SYSRES_CONST_CODE_COMPONENT_TYPE_OTHER SYSRES_CONST_CODE_COMPONENT_TYPE_REFERENCE SYSRES_CONST_CODE_COMPONENT_TYPE_REPORT SYSRES_CONST_CODE_COMPONENT_TYPE_SCRIPT SYSRES_CONST_CODE_COMPONENT_TYPE_URL SYSRES_CONST_CODE_REQUISITE_ACCESS SYSRES_CONST_CODE_REQUISITE_CODE SYSRES_CONST_CODE_REQUISITE_COMPONENT SYSRES_CONST_CODE_REQUISITE_DESCRIPTION SYSRES_CONST_CODE_REQUISITE_EXCLUDE_COMPONENT SYSRES_CONST_CODE_REQUISITE_RECORD SYSRES_CONST_COMMENT_REQ_CODE SYSRES_CONST_COMMON_SETTINGS_REQUISITE_CODE SYSRES_CONST_COMP_CODE_GRD SYSRES_CONST_COMPONENT_GROUP_TYPE_REQUISITE_CODE SYSRES_CONST_COMPONENT_TYPE_ADMIN_COMPONENTS SYSRES_CONST_COMPONENT_TYPE_DEVELOPER_COMPONENTS SYSRES_CONST_COMPONENT_TYPE_DOCS SYSRES_CONST_COMPONENT_TYPE_EDOC_CARDS SYSRES_CONST_COMPONENT_TYPE_EDOCS SYSRES_CONST_COMPONENT_TYPE_EXTERNAL_EXECUTABLE SYSRES_CONST_COMPONENT_TYPE_OTHER SYSRES_CONST_COMPONENT_TYPE_REFERENCE_TYPES SYSRES_CONST_COMPONENT_TYPE_REFERENCES SYSRES_CONST_COMPONENT_TYPE_REPORTS SYSRES_CONST_COMPONENT_TYPE_SCRIPTS SYSRES_CONST_COMPONENT_TYPE_URL SYSRES_CONST_COMPONENTS_REMOTE_SERVERS_VIEW_CODE SYSRES_CONST_CONDITION_BLOCK_DESCRIPTION SYSRES_CONST_CONST_FIRM_STATUS_COMMON SYSRES_CONST_CONST_FIRM_STATUS_INDIVIDUAL SYSRES_CONST_CONST_NEGATIVE_VALUE SYSRES_CONST_CONST_POSITIVE_VALUE SYSRES_CONST_CONST_SERVER_STATUS_DONT_REPLICATE SYSRES_CONST_CONST_SERVER_STATUS_REPLICATE SYSRES_CONST_CONTENTS_REQUISITE_CODE SYSRES_CONST_DATA_TYPE_BOOLEAN SYSRES_CONST_DATA_TYPE_DATE SYSRES_CONST_DATA_TYPE_FLOAT SYSRES_CONST_DATA_TYPE_INTEGER SYSRES_CONST_DATA_TYPE_PICK SYSRES_CONST_DATA_TYPE_REFERENCE SYSRES_CONST_DATA_TYPE_STRING SYSRES_CONST_DATA_TYPE_TEXT SYSRES_CONST_DATA_TYPE_VARIANT SYSRES_CONST_DATE_CLOSE_REQ_CODE SYSRES_CONST_DATE_FORMAT_DATE_ONLY_CHAR SYSRES_CONST_DATE_OPEN_REQ_CODE SYSRES_CONST_DATE_REQUISITE SYSRES_CONST_DATE_REQUISITE_CODE SYSRES_CONST_DATE_REQUISITE_NAME SYSRES_CONST_DATE_REQUISITE_TYPE SYSRES_CONST_DATE_TYPE_CHAR SYSRES_CONST_DATETIME_FORMAT_VALUE SYSRES_CONST_DEA_ACCESS_RIGHTS_ACTION_CODE SYSRES_CONST_DESCRIPTION_LOCALIZE_ID_REQUISITE_CODE SYSRES_CONST_DESCRIPTION_REQUISITE_CODE SYSRES_CONST_DET1_PART SYSRES_CONST_DET2_PART SYSRES_CONST_DET3_PART SYSRES_CONST_DET4_PART SYSRES_CONST_DET5_PART SYSRES_CONST_DET6_PART SYSRES_CONST_DETAIL_DATASET_KEY_REQUISITE_CODE SYSRES_CONST_DETAIL_PICK_REQUISITE_CODE SYSRES_CONST_DETAIL_REQ_CODE SYSRES_CONST_DO_NOT_USE_ACCESS_TYPE_CODE SYSRES_CONST_DO_NOT_USE_ACCESS_TYPE_NAME SYSRES_CONST_DO_NOT_USE_ON_VIEW_ACCESS_TYPE_CODE SYSRES_CONST_DO_NOT_USE_ON_VIEW_ACCESS_TYPE_NAME SYSRES_CONST_DOCUMENT_STORAGES_CODE SYSRES_CONST_DOCUMENT_TEMPLATES_TYPE_NAME SYSRES_CONST_DOUBLE_REQUISITE_CODE SYSRES_CONST_EDITOR_CLOSE_FILE_OBSERV_TYPE_CODE SYSRES_CONST_EDITOR_CLOSE_PROCESS_OBSERV_TYPE_CODE SYSRES_CONST_EDITOR_TYPE_REQUISITE_CODE SYSRES_CONST_EDITORS_APPLICATION_NAME_REQUISITE_CODE SYSRES_CONST_EDITORS_CREATE_SEVERAL_PROCESSES_REQUISITE_CODE SYSRES_CONST_EDITORS_EXTENSION_REQUISITE_CODE SYSRES_CONST_EDITORS_OBSERVER_BY_PROCESS_TYPE SYSRES_CONST_EDITORS_REFERENCE_CODE SYSRES_CONST_EDITORS_REPLACE_SPEC_CHARS_REQUISITE_CODE SYSRES_CONST_EDITORS_USE_PLUGINS_REQUISITE_CODE SYSRES_CONST_EDITORS_VIEW_DOCUMENT_OPENED_TO_EDIT_CODE SYSRES_CONST_EDOC_CARD_TYPE_REQUISITE_CODE SYSRES_CONST_EDOC_CARD_TYPES_LINK_REQUISITE_CODE SYSRES_CONST_EDOC_CERTIFICATE_AND_PASSWORD_ENCODE_CODE SYSRES_CONST_EDOC_CERTIFICATE_ENCODE_CODE SYSRES_CONST_EDOC_DATE_REQUISITE_CODE SYSRES_CONST_EDOC_KIND_REFERENCE_CODE SYSRES_CONST_EDOC_KINDS_BY_TEMPLATE_ACTION_CODE SYSRES_CONST_EDOC_MANAGE_ACCESS_CODE SYSRES_CONST_EDOC_NONE_ENCODE_CODE SYSRES_CONST_EDOC_NUMBER_REQUISITE_CODE SYSRES_CONST_EDOC_PASSWORD_ENCODE_CODE SYSRES_CONST_EDOC_READONLY_ACCESS_CODE SYSRES_CONST_EDOC_SHELL_LIFE_TYPE_VIEW_VALUE SYSRES_CONST_EDOC_SIZE_RESTRICTION_PRIORITY_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_CHECK_ACCESS_RIGHTS_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_COMPUTER_NAME_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_DATABASE_NAME_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_EDIT_IN_STORAGE_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_LOCAL_PATH_REQUISITE_CODE SYSRES_CONST_EDOC_STORAGE_SHARED_SOURCE_NAME_REQUISITE_CODE SYSRES_CONST_EDOC_TEMPLATE_REQUISITE_CODE SYSRES_CONST_EDOC_TYPES_REFERENCE_CODE SYSRES_CONST_EDOC_VERSION_ACTIVE_STAGE_CODE SYSRES_CONST_EDOC_VERSION_DESIGN_STAGE_CODE SYSRES_CONST_EDOC_VERSION_OBSOLETE_STAGE_CODE SYSRES_CONST_EDOC_WRITE_ACCES_CODE SYSRES_CONST_EDOCUMENT_CARD_REQUISITES_REFERENCE_CODE_SELECTED_REQUISITE SYSRES_CONST_ENCODE_CERTIFICATE_TYPE_CODE SYSRES_CONST_END_DATE_REQUISITE_CODE SYSRES_CONST_ENUMERATION_TYPE_REQUISITE_CODE SYSRES_CONST_EXECUTE_ACCESS_RIGHTS_TYPE_CODE SYSRES_CONST_EXECUTIVE_FILE_STORAGE_TYPE SYSRES_CONST_EXIST_CONST SYSRES_CONST_EXIST_VALUE SYSRES_CONST_EXPORT_LOCK_TYPE_ASK SYSRES_CONST_EXPORT_LOCK_TYPE_WITH_LOCK SYSRES_CONST_EXPORT_LOCK_TYPE_WITHOUT_LOCK SYSRES_CONST_EXPORT_VERSION_TYPE_ASK SYSRES_CONST_EXPORT_VERSION_TYPE_LAST SYSRES_CONST_EXPORT_VERSION_TYPE_LAST_ACTIVE SYSRES_CONST_EXTENSION_REQUISITE_CODE SYSRES_CONST_FILTER_NAME_REQUISITE_CODE SYSRES_CONST_FILTER_REQUISITE_CODE SYSRES_CONST_FILTER_TYPE_COMMON_CODE SYSRES_CONST_FILTER_TYPE_COMMON_NAME SYSRES_CONST_FILTER_TYPE_USER_CODE SYSRES_CONST_FILTER_TYPE_USER_NAME SYSRES_CONST_FILTER_VALUE_REQUISITE_NAME SYSRES_CONST_FLOAT_NUMBER_FORMAT_CHAR SYSRES_CONST_FLOAT_REQUISITE_TYPE SYSRES_CONST_FOLDER_AUTHOR_VALUE SYSRES_CONST_FOLDER_KIND_ANY_OBJECTS SYSRES_CONST_FOLDER_KIND_COMPONENTS SYSRES_CONST_FOLDER_KIND_EDOCS SYSRES_CONST_FOLDER_KIND_JOBS SYSRES_CONST_FOLDER_KIND_TASKS SYSRES_CONST_FOLDER_TYPE_COMMON SYSRES_CONST_FOLDER_TYPE_COMPONENT SYSRES_CONST_FOLDER_TYPE_FAVORITES SYSRES_CONST_FOLDER_TYPE_INBOX SYSRES_CONST_FOLDER_TYPE_OUTBOX SYSRES_CONST_FOLDER_TYPE_QUICK_LAUNCH SYSRES_CONST_FOLDER_TYPE_SEARCH SYSRES_CONST_FOLDER_TYPE_SHORTCUTS SYSRES_CONST_FOLDER_TYPE_USER SYSRES_CONST_FROM_DICTIONARY_ENUM_METHOD_FLAG SYSRES_CONST_FULL_SUBSTITUTE_TYPE SYSRES_CONST_FULL_SUBSTITUTE_TYPE_CODE SYSRES_CONST_FUNCTION_CANCEL_RESULT SYSRES_CONST_FUNCTION_CATEGORY_SYSTEM SYSRES_CONST_FUNCTION_CATEGORY_USER SYSRES_CONST_FUNCTION_FAILURE_RESULT SYSRES_CONST_FUNCTION_SAVE_RESULT SYSRES_CONST_GENERATED_REQUISITE SYSRES_CONST_GREEN_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_GROUP_ACCOUNT_TYPE_VALUE_CODE SYSRES_CONST_GROUP_CATEGORY_NORMAL_CODE SYSRES_CONST_GROUP_CATEGORY_NORMAL_NAME SYSRES_CONST_GROUP_CATEGORY_SERVICE_CODE SYSRES_CONST_GROUP_CATEGORY_SERVICE_NAME SYSRES_CONST_GROUP_COMMON_CATEGORY_FIELD_VALUE SYSRES_CONST_GROUP_FULL_NAME_REQUISITE_CODE SYSRES_CONST_GROUP_NAME_REQUISITE_CODE SYSRES_CONST_GROUP_RIGHTS_T_REQUISITE_CODE SYSRES_CONST_GROUP_SERVER_CODES_REQUISITE_CODE SYSRES_CONST_GROUP_SERVER_NAME_REQUISITE_CODE SYSRES_CONST_GROUP_SERVICE_CATEGORY_FIELD_VALUE SYSRES_CONST_GROUP_USER_REQUISITE_CODE SYSRES_CONST_GROUPS_REFERENCE_CODE SYSRES_CONST_GROUPS_REQUISITE_CODE SYSRES_CONST_HIDDEN_MODE_NAME SYSRES_CONST_HIGH_LVL_REQUISITE_CODE SYSRES_CONST_HISTORY_ACTION_CREATE_CODE SYSRES_CONST_HISTORY_ACTION_DELETE_CODE SYSRES_CONST_HISTORY_ACTION_EDIT_CODE SYSRES_CONST_HOUR_CHAR SYSRES_CONST_ID_REQUISITE_CODE SYSRES_CONST_IDSPS_REQUISITE_CODE SYSRES_CONST_IMAGE_MODE_COLOR SYSRES_CONST_IMAGE_MODE_GREYSCALE SYSRES_CONST_IMAGE_MODE_MONOCHROME SYSRES_CONST_IMPORTANCE_HIGH SYSRES_CONST_IMPORTANCE_LOW SYSRES_CONST_IMPORTANCE_NORMAL SYSRES_CONST_IN_DESIGN_VERSION_STATE_PICK_VALUE SYSRES_CONST_INCOMING_WORK_RULE_TYPE_CODE SYSRES_CONST_INT_REQUISITE SYSRES_CONST_INT_REQUISITE_TYPE SYSRES_CONST_INTEGER_NUMBER_FORMAT_CHAR SYSRES_CONST_INTEGER_TYPE_CHAR SYSRES_CONST_IS_GENERATED_REQUISITE_NEGATIVE_VALUE SYSRES_CONST_IS_PUBLIC_ROLE_REQUISITE_CODE SYSRES_CONST_IS_REMOTE_USER_NEGATIVE_VALUE SYSRES_CONST_IS_REMOTE_USER_POSITIVE_VALUE SYSRES_CONST_IS_STORED_REQUISITE_NEGATIVE_VALUE SYSRES_CONST_IS_STORED_REQUISITE_STORED_VALUE SYSRES_CONST_ITALIC_LIFE_CYCLE_STAGE_DRAW_STYLE SYSRES_CONST_JOB_BLOCK_DESCRIPTION SYSRES_CONST_JOB_KIND_CONTROL_JOB SYSRES_CONST_JOB_KIND_JOB SYSRES_CONST_JOB_KIND_NOTICE SYSRES_CONST_JOB_STATE_ABORTED SYSRES_CONST_JOB_STATE_COMPLETE SYSRES_CONST_JOB_STATE_WORKING SYSRES_CONST_KIND_REQUISITE_CODE SYSRES_CONST_KIND_REQUISITE_NAME SYSRES_CONST_KINDS_CREATE_SHADOW_COPIES_REQUISITE_CODE SYSRES_CONST_KINDS_DEFAULT_EDOC_LIFE_STAGE_REQUISITE_CODE SYSRES_CONST_KINDS_EDOC_ALL_TEPLATES_ALLOWED_REQUISITE_CODE SYSRES_CONST_KINDS_EDOC_ALLOW_LIFE_CYCLE_STAGE_CHANGING_REQUISITE_CODE SYSRES_CONST_KINDS_EDOC_ALLOW_MULTIPLE_ACTIVE_VERSIONS_REQUISITE_CODE SYSRES_CONST_KINDS_EDOC_SHARE_ACCES_RIGHTS_BY_DEFAULT_CODE SYSRES_CONST_KINDS_EDOC_TEMPLATE_REQUISITE_CODE SYSRES_CONST_KINDS_EDOC_TYPE_REQUISITE_CODE SYSRES_CONST_KINDS_SIGNERS_REQUISITES_CODE SYSRES_CONST_KOD_INPUT_TYPE SYSRES_CONST_LAST_UPDATE_DATE_REQUISITE_CODE SYSRES_CONST_LIFE_CYCLE_START_STAGE_REQUISITE_CODE SYSRES_CONST_LILAC_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_LINK_OBJECT_KIND_COMPONENT SYSRES_CONST_LINK_OBJECT_KIND_DOCUMENT SYSRES_CONST_LINK_OBJECT_KIND_EDOC SYSRES_CONST_LINK_OBJECT_KIND_FOLDER SYSRES_CONST_LINK_OBJECT_KIND_JOB SYSRES_CONST_LINK_OBJECT_KIND_REFERENCE SYSRES_CONST_LINK_OBJECT_KIND_TASK SYSRES_CONST_LINK_REF_TYPE_REQUISITE_CODE SYSRES_CONST_LIST_REFERENCE_MODE_NAME SYSRES_CONST_LOCALIZATION_DICTIONARY_MAIN_VIEW_CODE SYSRES_CONST_MAIN_VIEW_CODE SYSRES_CONST_MANUAL_ENUM_METHOD_FLAG SYSRES_CONST_MASTER_COMP_TYPE_REQUISITE_CODE SYSRES_CONST_MASTER_TABLE_REC_ID_REQUISITE_CODE SYSRES_CONST_MAXIMIZED_MODE_NAME SYSRES_CONST_ME_VALUE SYSRES_CONST_MESSAGE_ATTENTION_CAPTION SYSRES_CONST_MESSAGE_CONFIRMATION_CAPTION SYSRES_CONST_MESSAGE_ERROR_CAPTION SYSRES_CONST_MESSAGE_INFORMATION_CAPTION SYSRES_CONST_MINIMIZED_MODE_NAME SYSRES_CONST_MINUTE_CHAR SYSRES_CONST_MODULE_REQUISITE_CODE SYSRES_CONST_MONITORING_BLOCK_DESCRIPTION SYSRES_CONST_MONTH_FORMAT_VALUE SYSRES_CONST_NAME_LOCALIZE_ID_REQUISITE_CODE SYSRES_CONST_NAME_REQUISITE_CODE SYSRES_CONST_NAME_SINGULAR_REQUISITE_CODE SYSRES_CONST_NAMEAN_INPUT_TYPE SYSRES_CONST_NEGATIVE_PICK_VALUE SYSRES_CONST_NEGATIVE_VALUE SYSRES_CONST_NO SYSRES_CONST_NO_PICK_VALUE SYSRES_CONST_NO_SIGNATURE_REQUISITE_CODE SYSRES_CONST_NO_VALUE SYSRES_CONST_NONE_ACCESS_RIGHTS_TYPE_CODE SYSRES_CONST_NONOPERATING_RECORD_FLAG_VALUE SYSRES_CONST_NONOPERATING_RECORD_FLAG_VALUE_MASCULINE SYSRES_CONST_NORMAL_ACCESS_RIGHTS_TYPE_CODE SYSRES_CONST_NORMAL_LIFE_CYCLE_STAGE_DRAW_STYLE SYSRES_CONST_NORMAL_MODE_NAME SYSRES_CONST_NOT_ALLOWED_ACCESS_TYPE_CODE SYSRES_CONST_NOT_ALLOWED_ACCESS_TYPE_NAME SYSRES_CONST_NOTE_REQUISITE_CODE SYSRES_CONST_NOTICE_BLOCK_DESCRIPTION SYSRES_CONST_NUM_REQUISITE SYSRES_CONST_NUM_STR_REQUISITE_CODE SYSRES_CONST_NUMERATION_AUTO_NOT_STRONG SYSRES_CONST_NUMERATION_AUTO_STRONG SYSRES_CONST_NUMERATION_FROM_DICTONARY SYSRES_CONST_NUMERATION_MANUAL SYSRES_CONST_NUMERIC_TYPE_CHAR SYSRES_CONST_NUMREQ_REQUISITE_CODE SYSRES_CONST_OBSOLETE_VERSION_STATE_PICK_VALUE SYSRES_CONST_OPERATING_RECORD_FLAG_VALUE SYSRES_CONST_OPERATING_RECORD_FLAG_VALUE_CODE SYSRES_CONST_OPERATING_RECORD_FLAG_VALUE_FEMININE SYSRES_CONST_OPERATING_RECORD_FLAG_VALUE_MASCULINE SYSRES_CONST_OPTIONAL_FORM_COMP_REQCODE_PREFIX SYSRES_CONST_ORANGE_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_ORIGINALREF_REQUISITE_CODE SYSRES_CONST_OURFIRM_REF_CODE SYSRES_CONST_OURFIRM_REQUISITE_CODE SYSRES_CONST_OURFIRM_VAR SYSRES_CONST_OUTGOING_WORK_RULE_TYPE_CODE SYSRES_CONST_PICK_NEGATIVE_RESULT SYSRES_CONST_PICK_POSITIVE_RESULT SYSRES_CONST_PICK_REQUISITE SYSRES_CONST_PICK_REQUISITE_TYPE SYSRES_CONST_PICK_TYPE_CHAR SYSRES_CONST_PLAN_STATUS_REQUISITE_CODE SYSRES_CONST_PLATFORM_VERSION_COMMENT SYSRES_CONST_PLUGINS_SETTINGS_DESCRIPTION_REQUISITE_CODE SYSRES_CONST_POSITIVE_PICK_VALUE SYSRES_CONST_POWER_TO_CREATE_ACTION_CODE SYSRES_CONST_POWER_TO_SIGN_ACTION_CODE SYSRES_CONST_PRIORITY_REQUISITE_CODE SYSRES_CONST_QUALIFIED_TASK_TYPE SYSRES_CONST_QUALIFIED_TASK_TYPE_CODE SYSRES_CONST_RECSTAT_REQUISITE_CODE SYSRES_CONST_RED_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_REF_ID_T_REF_TYPE_REQUISITE_CODE SYSRES_CONST_REF_REQUISITE SYSRES_CONST_REF_REQUISITE_TYPE SYSRES_CONST_REF_REQUISITES_REFERENCE_CODE_SELECTED_REQUISITE SYSRES_CONST_REFERENCE_RECORD_HISTORY_CREATE_ACTION_CODE SYSRES_CONST_REFERENCE_RECORD_HISTORY_DELETE_ACTION_CODE SYSRES_CONST_REFERENCE_RECORD_HISTORY_MODIFY_ACTION_CODE SYSRES_CONST_REFERENCE_TYPE_CHAR SYSRES_CONST_REFERENCE_TYPE_REQUISITE_NAME SYSRES_CONST_REFERENCES_ADD_PARAMS_REQUISITE_CODE SYSRES_CONST_REFERENCES_DISPLAY_REQUISITE_REQUISITE_CODE SYSRES_CONST_REMOTE_SERVER_STATUS_WORKING SYSRES_CONST_REMOTE_SERVER_TYPE_MAIN SYSRES_CONST_REMOTE_SERVER_TYPE_SECONDARY SYSRES_CONST_REMOTE_USER_FLAG_VALUE_CODE SYSRES_CONST_REPORT_APP_EDITOR_INTERNAL SYSRES_CONST_REPORT_BASE_REPORT_ID_REQUISITE_CODE SYSRES_CONST_REPORT_BASE_REPORT_REQUISITE_CODE SYSRES_CONST_REPORT_SCRIPT_REQUISITE_CODE SYSRES_CONST_REPORT_TEMPLATE_REQUISITE_CODE SYSRES_CONST_REPORT_VIEWER_CODE_REQUISITE_CODE SYSRES_CONST_REQ_ALLOW_COMPONENT_DEFAULT_VALUE SYSRES_CONST_REQ_ALLOW_RECORD_DEFAULT_VALUE SYSRES_CONST_REQ_ALLOW_SERVER_COMPONENT_DEFAULT_VALUE SYSRES_CONST_REQ_MODE_AVAILABLE_CODE SYSRES_CONST_REQ_MODE_EDIT_CODE SYSRES_CONST_REQ_MODE_HIDDEN_CODE SYSRES_CONST_REQ_MODE_NOT_AVAILABLE_CODE SYSRES_CONST_REQ_MODE_VIEW_CODE SYSRES_CONST_REQ_NUMBER_REQUISITE_CODE SYSRES_CONST_REQ_SECTION_VALUE SYSRES_CONST_REQ_TYPE_VALUE SYSRES_CONST_REQUISITE_FORMAT_BY_UNIT SYSRES_CONST_REQUISITE_FORMAT_DATE_FULL SYSRES_CONST_REQUISITE_FORMAT_DATE_TIME SYSRES_CONST_REQUISITE_FORMAT_LEFT SYSRES_CONST_REQUISITE_FORMAT_RIGHT SYSRES_CONST_REQUISITE_FORMAT_WITHOUT_UNIT SYSRES_CONST_REQUISITE_NUMBER_REQUISITE_CODE SYSRES_CONST_REQUISITE_SECTION_ACTIONS SYSRES_CONST_REQUISITE_SECTION_BUTTON SYSRES_CONST_REQUISITE_SECTION_BUTTONS SYSRES_CONST_REQUISITE_SECTION_CARD SYSRES_CONST_REQUISITE_SECTION_TABLE SYSRES_CONST_REQUISITE_SECTION_TABLE10 SYSRES_CONST_REQUISITE_SECTION_TABLE11 SYSRES_CONST_REQUISITE_SECTION_TABLE12 SYSRES_CONST_REQUISITE_SECTION_TABLE13 SYSRES_CONST_REQUISITE_SECTION_TABLE14 SYSRES_CONST_REQUISITE_SECTION_TABLE15 SYSRES_CONST_REQUISITE_SECTION_TABLE16 SYSRES_CONST_REQUISITE_SECTION_TABLE17 SYSRES_CONST_REQUISITE_SECTION_TABLE18 SYSRES_CONST_REQUISITE_SECTION_TABLE19 SYSRES_CONST_REQUISITE_SECTION_TABLE2 SYSRES_CONST_REQUISITE_SECTION_TABLE20 SYSRES_CONST_REQUISITE_SECTION_TABLE21 SYSRES_CONST_REQUISITE_SECTION_TABLE22 SYSRES_CONST_REQUISITE_SECTION_TABLE23 SYSRES_CONST_REQUISITE_SECTION_TABLE24 SYSRES_CONST_REQUISITE_SECTION_TABLE3 SYSRES_CONST_REQUISITE_SECTION_TABLE4 SYSRES_CONST_REQUISITE_SECTION_TABLE5 SYSRES_CONST_REQUISITE_SECTION_TABLE6 SYSRES_CONST_REQUISITE_SECTION_TABLE7 SYSRES_CONST_REQUISITE_SECTION_TABLE8 SYSRES_CONST_REQUISITE_SECTION_TABLE9 SYSRES_CONST_REQUISITES_PSEUDOREFERENCE_REQUISITE_NUMBER_REQUISITE_CODE SYSRES_CONST_RIGHT_ALIGNMENT_CODE SYSRES_CONST_ROLES_REFERENCE_CODE SYSRES_CONST_ROUTE_STEP_AFTER_RUS SYSRES_CONST_ROUTE_STEP_AND_CONDITION_RUS SYSRES_CONST_ROUTE_STEP_OR_CONDITION_RUS SYSRES_CONST_ROUTE_TYPE_COMPLEX SYSRES_CONST_ROUTE_TYPE_PARALLEL SYSRES_CONST_ROUTE_TYPE_SERIAL SYSRES_CONST_SBDATASETDESC_NEGATIVE_VALUE SYSRES_CONST_SBDATASETDESC_POSITIVE_VALUE SYSRES_CONST_SBVIEWSDESC_POSITIVE_VALUE SYSRES_CONST_SCRIPT_BLOCK_DESCRIPTION SYSRES_CONST_SEARCH_BY_TEXT_REQUISITE_CODE SYSRES_CONST_SEARCHES_COMPONENT_CONTENT SYSRES_CONST_SEARCHES_CRITERIA_ACTION_NAME SYSRES_CONST_SEARCHES_EDOC_CONTENT SYSRES_CONST_SEARCHES_FOLDER_CONTENT SYSRES_CONST_SEARCHES_JOB_CONTENT SYSRES_CONST_SEARCHES_REFERENCE_CODE SYSRES_CONST_SEARCHES_TASK_CONTENT SYSRES_CONST_SECOND_CHAR SYSRES_CONST_SECTION_REQUISITE_ACTIONS_VALUE SYSRES_CONST_SECTION_REQUISITE_CARD_VALUE SYSRES_CONST_SECTION_REQUISITE_CODE SYSRES_CONST_SECTION_REQUISITE_DETAIL_1_VALUE SYSRES_CONST_SECTION_REQUISITE_DETAIL_2_VALUE SYSRES_CONST_SECTION_REQUISITE_DETAIL_3_VALUE SYSRES_CONST_SECTION_REQUISITE_DETAIL_4_VALUE SYSRES_CONST_SECTION_REQUISITE_DETAIL_5_VALUE SYSRES_CONST_SECTION_REQUISITE_DETAIL_6_VALUE SYSRES_CONST_SELECT_REFERENCE_MODE_NAME SYSRES_CONST_SELECT_TYPE_SELECTABLE SYSRES_CONST_SELECT_TYPE_SELECTABLE_ONLY_CHILD SYSRES_CONST_SELECT_TYPE_SELECTABLE_WITH_CHILD SYSRES_CONST_SELECT_TYPE_UNSLECTABLE SYSRES_CONST_SERVER_TYPE_MAIN SYSRES_CONST_SERVICE_USER_CATEGORY_FIELD_VALUE SYSRES_CONST_SETTINGS_USER_REQUISITE_CODE SYSRES_CONST_SIGNATURE_AND_ENCODE_CERTIFICATE_TYPE_CODE SYSRES_CONST_SIGNATURE_CERTIFICATE_TYPE_CODE SYSRES_CONST_SINGULAR_TITLE_REQUISITE_CODE SYSRES_CONST_SQL_SERVER_AUTHENTIFICATION_FLAG_VALUE_CODE SYSRES_CONST_SQL_SERVER_ENCODE_AUTHENTIFICATION_FLAG_VALUE_CODE SYSRES_CONST_STANDART_ROUTE_REFERENCE_CODE SYSRES_CONST_STANDART_ROUTE_REFERENCE_COMMENT_REQUISITE_CODE SYSRES_CONST_STANDART_ROUTES_GROUPS_REFERENCE_CODE SYSRES_CONST_STATE_REQ_NAME SYSRES_CONST_STATE_REQUISITE_ACTIVE_VALUE SYSRES_CONST_STATE_REQUISITE_CLOSED_VALUE SYSRES_CONST_STATE_REQUISITE_CODE SYSRES_CONST_STATIC_ROLE_TYPE_CODE SYSRES_CONST_STATUS_PLAN_DEFAULT_VALUE SYSRES_CONST_STATUS_VALUE_AUTOCLEANING SYSRES_CONST_STATUS_VALUE_BLUE_SQUARE SYSRES_CONST_STATUS_VALUE_COMPLETE SYSRES_CONST_STATUS_VALUE_GREEN_SQUARE SYSRES_CONST_STATUS_VALUE_ORANGE_SQUARE SYSRES_CONST_STATUS_VALUE_PURPLE_SQUARE SYSRES_CONST_STATUS_VALUE_RED_SQUARE SYSRES_CONST_STATUS_VALUE_SUSPEND SYSRES_CONST_STATUS_VALUE_YELLOW_SQUARE SYSRES_CONST_STDROUTE_SHOW_TO_USERS_REQUISITE_CODE SYSRES_CONST_STORAGE_TYPE_FILE SYSRES_CONST_STORAGE_TYPE_SQL_SERVER SYSRES_CONST_STR_REQUISITE SYSRES_CONST_STRIKEOUT_LIFE_CYCLE_STAGE_DRAW_STYLE SYSRES_CONST_STRING_FORMAT_LEFT_ALIGN_CHAR SYSRES_CONST_STRING_FORMAT_RIGHT_ALIGN_CHAR SYSRES_CONST_STRING_REQUISITE_CODE SYSRES_CONST_STRING_REQUISITE_TYPE SYSRES_CONST_STRING_TYPE_CHAR SYSRES_CONST_SUBSTITUTES_PSEUDOREFERENCE_CODE SYSRES_CONST_SUBTASK_BLOCK_DESCRIPTION SYSRES_CONST_SYSTEM_SETTING_CURRENT_USER_PARAM_VALUE SYSRES_CONST_SYSTEM_SETTING_EMPTY_VALUE_PARAM_VALUE SYSRES_CONST_SYSTEM_VERSION_COMMENT SYSRES_CONST_TASK_ACCESS_TYPE_ALL SYSRES_CONST_TASK_ACCESS_TYPE_ALL_MEMBERS SYSRES_CONST_TASK_ACCESS_TYPE_MANUAL SYSRES_CONST_TASK_ENCODE_TYPE_CERTIFICATION SYSRES_CONST_TASK_ENCODE_TYPE_CERTIFICATION_AND_PASSWORD SYSRES_CONST_TASK_ENCODE_TYPE_NONE SYSRES_CONST_TASK_ENCODE_TYPE_PASSWORD SYSRES_CONST_TASK_ROUTE_ALL_CONDITION SYSRES_CONST_TASK_ROUTE_AND_CONDITION SYSRES_CONST_TASK_ROUTE_OR_CONDITION SYSRES_CONST_TASK_STATE_ABORTED SYSRES_CONST_TASK_STATE_COMPLETE SYSRES_CONST_TASK_STATE_CONTINUED SYSRES_CONST_TASK_STATE_CONTROL SYSRES_CONST_TASK_STATE_INIT SYSRES_CONST_TASK_STATE_WORKING SYSRES_CONST_TASK_TITLE SYSRES_CONST_TASK_TYPES_GROUPS_REFERENCE_CODE SYSRES_CONST_TASK_TYPES_REFERENCE_CODE SYSRES_CONST_TEMPLATES_REFERENCE_CODE SYSRES_CONST_TEST_DATE_REQUISITE_NAME SYSRES_CONST_TEST_DEV_DATABASE_NAME SYSRES_CONST_TEST_DEV_SYSTEM_CODE SYSRES_CONST_TEST_EDMS_DATABASE_NAME SYSRES_CONST_TEST_EDMS_MAIN_CODE SYSRES_CONST_TEST_EDMS_MAIN_DB_NAME SYSRES_CONST_TEST_EDMS_SECOND_CODE SYSRES_CONST_TEST_EDMS_SECOND_DB_NAME SYSRES_CONST_TEST_EDMS_SYSTEM_CODE SYSRES_CONST_TEST_NUMERIC_REQUISITE_NAME SYSRES_CONST_TEXT_REQUISITE SYSRES_CONST_TEXT_REQUISITE_CODE SYSRES_CONST_TEXT_REQUISITE_TYPE SYSRES_CONST_TEXT_TYPE_CHAR SYSRES_CONST_TYPE_CODE_REQUISITE_CODE SYSRES_CONST_TYPE_REQUISITE_CODE SYSRES_CONST_UNDEFINED_LIFE_CYCLE_STAGE_FONT_COLOR SYSRES_CONST_UNITS_SECTION_ID_REQUISITE_CODE SYSRES_CONST_UNITS_SECTION_REQUISITE_CODE SYSRES_CONST_UNOPERATING_RECORD_FLAG_VALUE_CODE SYSRES_CONST_UNSTORED_DATA_REQUISITE_CODE SYSRES_CONST_UNSTORED_DATA_REQUISITE_NAME SYSRES_CONST_USE_ACCESS_TYPE_CODE SYSRES_CONST_USE_ACCESS_TYPE_NAME SYSRES_CONST_USER_ACCOUNT_TYPE_VALUE_CODE SYSRES_CONST_USER_ADDITIONAL_INFORMATION_REQUISITE_CODE SYSRES_CONST_USER_AND_GROUP_ID_FROM_PSEUDOREFERENCE_REQUISITE_CODE SYSRES_CONST_USER_CATEGORY_NORMAL SYSRES_CONST_USER_CERTIFICATE_REQUISITE_CODE SYSRES_CONST_USER_CERTIFICATE_STATE_REQUISITE_CODE SYSRES_CONST_USER_CERTIFICATE_SUBJECT_NAME_REQUISITE_CODE SYSRES_CONST_USER_CERTIFICATE_THUMBPRINT_REQUISITE_CODE SYSRES_CONST_USER_COMMON_CATEGORY SYSRES_CONST_USER_COMMON_CATEGORY_CODE SYSRES_CONST_USER_FULL_NAME_REQUISITE_CODE SYSRES_CONST_USER_GROUP_TYPE_REQUISITE_CODE SYSRES_CONST_USER_LOGIN_REQUISITE_CODE SYSRES_CONST_USER_REMOTE_CONTROLLER_REQUISITE_CODE SYSRES_CONST_USER_REMOTE_SYSTEM_REQUISITE_CODE SYSRES_CONST_USER_RIGHTS_T_REQUISITE_CODE SYSRES_CONST_USER_SERVER_NAME_REQUISITE_CODE SYSRES_CONST_USER_SERVICE_CATEGORY SYSRES_CONST_USER_SERVICE_CATEGORY_CODE SYSRES_CONST_USER_STATUS_ADMINISTRATOR_CODE SYSRES_CONST_USER_STATUS_ADMINISTRATOR_NAME SYSRES_CONST_USER_STATUS_DEVELOPER_CODE SYSRES_CONST_USER_STATUS_DEVELOPER_NAME SYSRES_CONST_USER_STATUS_DISABLED_CODE SYSRES_CONST_USER_STATUS_DISABLED_NAME SYSRES_CONST_USER_STATUS_SYSTEM_DEVELOPER_CODE SYSRES_CONST_USER_STATUS_USER_CODE SYSRES_CONST_USER_STATUS_USER_NAME SYSRES_CONST_USER_STATUS_USER_NAME_DEPRECATED SYSRES_CONST_USER_TYPE_FIELD_VALUE_USER SYSRES_CONST_USER_TYPE_REQUISITE_CODE SYSRES_CONST_USERS_CONTROLLER_REQUISITE_CODE SYSRES_CONST_USERS_IS_MAIN_SERVER_REQUISITE_CODE SYSRES_CONST_USERS_REFERENCE_CODE SYSRES_CONST_USERS_REGISTRATION_CERTIFICATES_ACTION_NAME SYSRES_CONST_USERS_REQUISITE_CODE SYSRES_CONST_USERS_SYSTEM_REQUISITE_CODE SYSRES_CONST_USERS_USER_ACCESS_RIGHTS_TYPR_REQUISITE_CODE SYSRES_CONST_USERS_USER_AUTHENTICATION_REQUISITE_CODE SYSRES_CONST_USERS_USER_COMPONENT_REQUISITE_CODE SYSRES_CONST_USERS_USER_GROUP_REQUISITE_CODE SYSRES_CONST_USERS_VIEW_CERTIFICATES_ACTION_NAME SYSRES_CONST_VIEW_DEFAULT_CODE SYSRES_CONST_VIEW_DEFAULT_NAME SYSRES_CONST_VIEWER_REQUISITE_CODE SYSRES_CONST_WAITING_BLOCK_DESCRIPTION SYSRES_CONST_WIZARD_FORM_LABEL_TEST_STRING  SYSRES_CONST_WIZARD_QUERY_PARAM_HEIGHT_ETALON_STRING SYSRES_CONST_WIZARD_REFERENCE_COMMENT_REQUISITE_CODE SYSRES_CONST_WORK_RULES_DESCRIPTION_REQUISITE_CODE SYSRES_CONST_WORK_TIME_CALENDAR_REFERENCE_CODE SYSRES_CONST_WORK_WORKFLOW_HARD_ROUTE_TYPE_VALUE SYSRES_CONST_WORK_WORKFLOW_HARD_ROUTE_TYPE_VALUE_CODE SYSRES_CONST_WORK_WORKFLOW_HARD_ROUTE_TYPE_VALUE_CODE_RUS SYSRES_CONST_WORK_WORKFLOW_SOFT_ROUTE_TYPE_VALUE_CODE_RUS SYSRES_CONST_WORKFLOW_ROUTE_TYPR_HARD SYSRES_CONST_WORKFLOW_ROUTE_TYPR_SOFT SYSRES_CONST_XML_ENCODING SYSRES_CONST_XREC_STAT_REQUISITE_CODE SYSRES_CONST_XRECID_FIELD_NAME SYSRES_CONST_YES SYSRES_CONST_YES_NO_2_REQUISITE_CODE SYSRES_CONST_YES_NO_REQUISITE_CODE SYSRES_CONST_YES_NO_T_REF_TYPE_REQUISITE_CODE SYSRES_CONST_YES_PICK_VALUE SYSRES_CONST_YES_VALUE CR FALSE nil NO_VALUE NULL TAB TRUE YES_VALUE ADMINISTRATORS_GROUP_NAME CUSTOMIZERS_GROUP_NAME DEVELOPERS_GROUP_NAME SERVICE_USERS_GROUP_NAME DECISION_BLOCK_FIRST_OPERAND_PROPERTY DECISION_BLOCK_NAME_PROPERTY DECISION_BLOCK_OPERATION_PROPERTY DECISION_BLOCK_RESULT_TYPE_PROPERTY DECISION_BLOCK_SECOND_OPERAND_PROPERTY ANY_FILE_EXTENTION COMPRESSED_DOCUMENT_EXTENSION EXTENDED_DOCUMENT_EXTENSION SHORT_COMPRESSED_DOCUMENT_EXTENSION SHORT_EXTENDED_DOCUMENT_EXTENSION JOB_BLOCK_ABORT_DEADLINE_PROPERTY JOB_BLOCK_AFTER_FINISH_EVENT JOB_BLOCK_AFTER_QUERY_PARAMETERS_EVENT JOB_BLOCK_ATTACHMENT_PROPERTY JOB_BLOCK_ATTACHMENTS_RIGHTS_GROUP_PROPERTY JOB_BLOCK_ATTACHMENTS_RIGHTS_TYPE_PROPERTY JOB_BLOCK_BEFORE_QUERY_PARAMETERS_EVENT JOB_BLOCK_BEFORE_START_EVENT JOB_BLOCK_CREATED_JOBS_PROPERTY JOB_BLOCK_DEADLINE_PROPERTY JOB_BLOCK_EXECUTION_RESULTS_PROPERTY JOB_BLOCK_IS_PARALLEL_PROPERTY JOB_BLOCK_IS_RELATIVE_ABORT_DEADLINE_PROPERTY JOB_BLOCK_IS_RELATIVE_DEADLINE_PROPERTY JOB_BLOCK_JOB_TEXT_PROPERTY JOB_BLOCK_NAME_PROPERTY JOB_BLOCK_NEED_SIGN_ON_PERFORM_PROPERTY JOB_BLOCK_PERFORMER_PROPERTY JOB_BLOCK_RELATIVE_ABORT_DEADLINE_TYPE_PROPERTY JOB_BLOCK_RELATIVE_DEADLINE_TYPE_PROPERTY JOB_BLOCK_SUBJECT_PROPERTY ENGLISH_LANGUAGE_CODE RUSSIAN_LANGUAGE_CODE smHidden smMaximized smMinimized smNormal wmNo wmYes COMPONENT_TOKEN_LINK_KIND DOCUMENT_LINK_KIND EDOCUMENT_LINK_KIND FOLDER_LINK_KIND JOB_LINK_KIND REFERENCE_LINK_KIND TASK_LINK_KIND COMPONENT_TOKEN_LOCK_TYPE EDOCUMENT_VERSION_LOCK_TYPE MONITOR_BLOCK_AFTER_FINISH_EVENT MONITOR_BLOCK_BEFORE_START_EVENT MONITOR_BLOCK_DEADLINE_PROPERTY MONITOR_BLOCK_INTERVAL_PROPERTY MONITOR_BLOCK_INTERVAL_TYPE_PROPERTY MONITOR_BLOCK_IS_RELATIVE_DEADLINE_PROPERTY MONITOR_BLOCK_NAME_PROPERTY MONITOR_BLOCK_RELATIVE_DEADLINE_TYPE_PROPERTY MONITOR_BLOCK_SEARCH_SCRIPT_PROPERTY NOTICE_BLOCK_AFTER_FINISH_EVENT NOTICE_BLOCK_ATTACHMENT_PROPERTY NOTICE_BLOCK_ATTACHMENTS_RIGHTS_GROUP_PROPERTY NOTICE_BLOCK_ATTACHMENTS_RIGHTS_TYPE_PROPERTY NOTICE_BLOCK_BEFORE_START_EVENT NOTICE_BLOCK_CREATED_NOTICES_PROPERTY NOTICE_BLOCK_DEADLINE_PROPERTY NOTICE_BLOCK_IS_RELATIVE_DEADLINE_PROPERTY NOTICE_BLOCK_NAME_PROPERTY NOTICE_BLOCK_NOTICE_TEXT_PROPERTY NOTICE_BLOCK_PERFORMER_PROPERTY NOTICE_BLOCK_RELATIVE_DEADLINE_TYPE_PROPERTY NOTICE_BLOCK_SUBJECT_PROPERTY dseAfterCancel dseAfterClose dseAfterDelete dseAfterDeleteOutOfTransaction dseAfterInsert dseAfterOpen dseAfterScroll dseAfterUpdate dseAfterUpdateOutOfTransaction dseBeforeCancel dseBeforeClose dseBeforeDelete dseBeforeDetailUpdate dseBeforeInsert dseBeforeOpen dseBeforeUpdate dseOnAnyRequisiteChange dseOnCloseRecord dseOnDeleteError dseOnOpenRecord dseOnPrepareUpdate dseOnUpdateError dseOnUpdateRatifiedRecord dseOnValidDelete dseOnValidUpdate reOnChange reOnChangeValues SELECTION_BEGIN_ROUTE_EVENT SELECTION_END_ROUTE_EVENT CURRENT_PERIOD_IS_REQUIRED PREVIOUS_CARD_TYPE_NAME SHOW_RECORD_PROPERTIES_FORM ACCESS_RIGHTS_SETTING_DIALOG_CODE ADMINISTRATOR_USER_CODE ANALYTIC_REPORT_TYPE asrtHideLocal asrtHideRemote CALCULATED_ROLE_TYPE_CODE COMPONENTS_REFERENCE_DEVELOPER_VIEW_CODE DCTS_TEST_PROTOCOLS_FOLDER_PATH E_EDOC_VERSION_ALREADY_APPROVINGLY_SIGNED E_EDOC_VERSION_ALREADY_APPROVINGLY_SIGNED_BY_USER E_EDOC_VERSION_ALREDY_SIGNED E_EDOC_VERSION_ALREDY_SIGNED_BY_USER EDOC_TYPES_CODE_REQUISITE_FIELD_NAME EDOCUMENTS_ALIAS_NAME FILES_FOLDER_PATH FILTER_OPERANDS_DELIMITER FILTER_OPERATIONS_DELIMITER FORMCARD_NAME FORMLIST_NAME GET_EXTENDED_DOCUMENT_EXTENSION_CREATION_MODE GET_EXTENDED_DOCUMENT_EXTENSION_IMPORT_MODE INTEGRATED_REPORT_TYPE IS_BUILDER_APPLICATION_ROLE IS_BUILDER_APPLICATION_ROLE2 IS_BUILDER_USERS ISBSYSDEV LOG_FOLDER_PATH mbCancel mbNo mbNoToAll mbOK mbYes mbYesToAll MEMORY_DATASET_DESRIPTIONS_FILENAME mrNo mrNoToAll mrYes mrYesToAll MULTIPLE_SELECT_DIALOG_CODE NONOPERATING_RECORD_FLAG_FEMININE NONOPERATING_RECORD_FLAG_MASCULINE OPERATING_RECORD_FLAG_FEMININE OPERATING_RECORD_FLAG_MASCULINE PROFILING_SETTINGS_COMMON_SETTINGS_CODE_VALUE PROGRAM_INITIATED_LOOKUP_ACTION ratDelete ratEdit ratInsert REPORT_TYPE REQUIRED_PICK_VALUES_VARIABLE rmCard rmList SBRTE_PROGID_DEV SBRTE_PROGID_RELEASE STATIC_ROLE_TYPE_CODE SUPPRESS_EMPTY_TEMPLATE_CREATION SYSTEM_USER_CODE UPDATE_DIALOG_DATASET USED_IN_OBJECT_HINT_PARAM USER_INITIATED_LOOKUP_ACTION USER_NAME_FORMAT USER_SELECTION_RESTRICTIONS WORKFLOW_TEST_PROTOCOLS_FOLDER_PATH ELS_SUBTYPE_CONTROL_NAME ELS_FOLDER_KIND_CONTROL_NAME REPEAT_PROCESS_CURRENT_OBJECT_EXCEPTION_NAME PRIVILEGE_COMPONENT_FULL_ACCESS PRIVILEGE_DEVELOPMENT_EXPORT PRIVILEGE_DEVELOPMENT_IMPORT PRIVILEGE_DOCUMENT_DELETE PRIVILEGE_ESD PRIVILEGE_FOLDER_DELETE PRIVILEGE_MANAGE_ACCESS_RIGHTS PRIVILEGE_MANAGE_REPLICATION PRIVILEGE_MANAGE_SESSION_SERVER PRIVILEGE_OBJECT_FULL_ACCESS PRIVILEGE_OBJECT_VIEW PRIVILEGE_RESERVE_LICENSE PRIVILEGE_SYSTEM_CUSTOMIZE PRIVILEGE_SYSTEM_DEVELOP PRIVILEGE_SYSTEM_INSTALL PRIVILEGE_TASK_DELETE PRIVILEGE_USER_PLUGIN_SETTINGS_CUSTOMIZE PRIVILEGES_PSEUDOREFERENCE_CODE ACCESS_TYPES_PSEUDOREFERENCE_CODE ALL_AVAILABLE_COMPONENTS_PSEUDOREFERENCE_CODE ALL_AVAILABLE_PRIVILEGES_PSEUDOREFERENCE_CODE ALL_REPLICATE_COMPONENTS_PSEUDOREFERENCE_CODE AVAILABLE_DEVELOPERS_COMPONENTS_PSEUDOREFERENCE_CODE COMPONENTS_PSEUDOREFERENCE_CODE FILTRATER_SETTINGS_CONFLICTS_PSEUDOREFERENCE_CODE GROUPS_PSEUDOREFERENCE_CODE RECEIVE_PROTOCOL_PSEUDOREFERENCE_CODE REFERENCE_REQUISITE_PSEUDOREFERENCE_CODE REFERENCE_REQUISITES_PSEUDOREFERENCE_CODE REFTYPES_PSEUDOREFERENCE_CODE REPLICATION_SEANCES_DIARY_PSEUDOREFERENCE_CODE SEND_PROTOCOL_PSEUDOREFERENCE_CODE SUBSTITUTES_PSEUDOREFERENCE_CODE SYSTEM_SETTINGS_PSEUDOREFERENCE_CODE UNITS_PSEUDOREFERENCE_CODE USERS_PSEUDOREFERENCE_CODE VIEWERS_PSEUDOREFERENCE_CODE CERTIFICATE_TYPE_ENCRYPT CERTIFICATE_TYPE_SIGN CERTIFICATE_TYPE_SIGN_AND_ENCRYPT STORAGE_TYPE_FILE STORAGE_TYPE_NAS_CIFS STORAGE_TYPE_SAPERION STORAGE_TYPE_SQL_SERVER COMPTYPE2_REQUISITE_DOCUMENTS_VALUE COMPTYPE2_REQUISITE_TASKS_VALUE COMPTYPE2_REQUISITE_FOLDERS_VALUE COMPTYPE2_REQUISITE_REFERENCES_VALUE SYSREQ_CODE SYSREQ_COMPTYPE2 SYSREQ_CONST_AVAILABLE_FOR_WEB SYSREQ_CONST_COMMON_CODE SYSREQ_CONST_COMMON_VALUE SYSREQ_CONST_FIRM_CODE SYSREQ_CONST_FIRM_STATUS SYSREQ_CONST_FIRM_VALUE SYSREQ_CONST_SERVER_STATUS SYSREQ_CONTENTS SYSREQ_DATE_OPEN SYSREQ_DATE_CLOSE SYSREQ_DESCRIPTION SYSREQ_DESCRIPTION_LOCALIZE_ID SYSREQ_DOUBLE SYSREQ_EDOC_ACCESS_TYPE SYSREQ_EDOC_AUTHOR SYSREQ_EDOC_CREATED SYSREQ_EDOC_DELEGATE_RIGHTS_REQUISITE_CODE SYSREQ_EDOC_EDITOR SYSREQ_EDOC_ENCODE_TYPE SYSREQ_EDOC_ENCRYPTION_PLUGIN_NAME SYSREQ_EDOC_ENCRYPTION_PLUGIN_VERSION SYSREQ_EDOC_EXPORT_DATE SYSREQ_EDOC_EXPORTER SYSREQ_EDOC_KIND SYSREQ_EDOC_LIFE_STAGE_NAME SYSREQ_EDOC_LOCKED_FOR_SERVER_CODE SYSREQ_EDOC_MODIFIED SYSREQ_EDOC_NAME SYSREQ_EDOC_NOTE SYSREQ_EDOC_QUALIFIED_ID SYSREQ_EDOC_SESSION_KEY SYSREQ_EDOC_SESSION_KEY_ENCRYPTION_PLUGIN_NAME SYSREQ_EDOC_SESSION_KEY_ENCRYPTION_PLUGIN_VERSION SYSREQ_EDOC_SIGNATURE_TYPE SYSREQ_EDOC_SIGNED SYSREQ_EDOC_STORAGE SYSREQ_EDOC_STORAGES_ARCHIVE_STORAGE SYSREQ_EDOC_STORAGES_CHECK_RIGHTS SYSREQ_EDOC_STORAGES_COMPUTER_NAME SYSREQ_EDOC_STORAGES_EDIT_IN_STORAGE SYSREQ_EDOC_STORAGES_EXECUTIVE_STORAGE SYSREQ_EDOC_STORAGES_FUNCTION SYSREQ_EDOC_STORAGES_INITIALIZED SYSREQ_EDOC_STORAGES_LOCAL_PATH SYSREQ_EDOC_STORAGES_SAPERION_DATABASE_NAME SYSREQ_EDOC_STORAGES_SEARCH_BY_TEXT SYSREQ_EDOC_STORAGES_SERVER_NAME SYSREQ_EDOC_STORAGES_SHARED_SOURCE_NAME SYSREQ_EDOC_STORAGES_TYPE SYSREQ_EDOC_TEXT_MODIFIED SYSREQ_EDOC_TYPE_ACT_CODE SYSREQ_EDOC_TYPE_ACT_DESCRIPTION SYSREQ_EDOC_TYPE_ACT_DESCRIPTION_LOCALIZE_ID SYSREQ_EDOC_TYPE_ACT_ON_EXECUTE SYSREQ_EDOC_TYPE_ACT_ON_EXECUTE_EXISTS SYSREQ_EDOC_TYPE_ACT_SECTION SYSREQ_EDOC_TYPE_ADD_PARAMS SYSREQ_EDOC_TYPE_COMMENT SYSREQ_EDOC_TYPE_EVENT_TEXT SYSREQ_EDOC_TYPE_NAME_IN_SINGULAR SYSREQ_EDOC_TYPE_NAME_IN_SINGULAR_LOCALIZE_ID SYSREQ_EDOC_TYPE_NAME_LOCALIZE_ID SYSREQ_EDOC_TYPE_NUMERATION_METHOD SYSREQ_EDOC_TYPE_PSEUDO_REQUISITE_CODE SYSREQ_EDOC_TYPE_REQ_CODE SYSREQ_EDOC_TYPE_REQ_DESCRIPTION SYSREQ_EDOC_TYPE_REQ_DESCRIPTION_LOCALIZE_ID SYSREQ_EDOC_TYPE_REQ_IS_LEADING SYSREQ_EDOC_TYPE_REQ_IS_REQUIRED SYSREQ_EDOC_TYPE_REQ_NUMBER SYSREQ_EDOC_TYPE_REQ_ON_CHANGE SYSREQ_EDOC_TYPE_REQ_ON_CHANGE_EXISTS SYSREQ_EDOC_TYPE_REQ_ON_SELECT SYSREQ_EDOC_TYPE_REQ_ON_SELECT_KIND SYSREQ_EDOC_TYPE_REQ_SECTION SYSREQ_EDOC_TYPE_VIEW_CARD SYSREQ_EDOC_TYPE_VIEW_CODE SYSREQ_EDOC_TYPE_VIEW_COMMENT SYSREQ_EDOC_TYPE_VIEW_IS_MAIN SYSREQ_EDOC_TYPE_VIEW_NAME SYSREQ_EDOC_TYPE_VIEW_NAME_LOCALIZE_ID SYSREQ_EDOC_VERSION_AUTHOR SYSREQ_EDOC_VERSION_CRC SYSREQ_EDOC_VERSION_DATA SYSREQ_EDOC_VERSION_EDITOR SYSREQ_EDOC_VERSION_EXPORT_DATE SYSREQ_EDOC_VERSION_EXPORTER SYSREQ_EDOC_VERSION_HIDDEN SYSREQ_EDOC_VERSION_LIFE_STAGE SYSREQ_EDOC_VERSION_MODIFIED SYSREQ_EDOC_VERSION_NOTE SYSREQ_EDOC_VERSION_SIGNATURE_TYPE SYSREQ_EDOC_VERSION_SIGNED SYSREQ_EDOC_VERSION_SIZE SYSREQ_EDOC_VERSION_SOURCE SYSREQ_EDOC_VERSION_TEXT_MODIFIED SYSREQ_EDOCKIND_DEFAULT_VERSION_STATE_CODE SYSREQ_FOLDER_KIND SYSREQ_FUNC_CATEGORY SYSREQ_FUNC_COMMENT SYSREQ_FUNC_GROUP SYSREQ_FUNC_GROUP_COMMENT SYSREQ_FUNC_GROUP_NUMBER SYSREQ_FUNC_HELP SYSREQ_FUNC_PARAM_DEF_VALUE SYSREQ_FUNC_PARAM_IDENT SYSREQ_FUNC_PARAM_NUMBER SYSREQ_FUNC_PARAM_TYPE SYSREQ_FUNC_TEXT SYSREQ_GROUP_CATEGORY SYSREQ_ID SYSREQ_LAST_UPDATE SYSREQ_LEADER_REFERENCE SYSREQ_LINE_NUMBER SYSREQ_MAIN_RECORD_ID SYSREQ_NAME SYSREQ_NAME_LOCALIZE_ID SYSREQ_NOTE SYSREQ_ORIGINAL_RECORD SYSREQ_OUR_FIRM SYSREQ_PROFILING_SETTINGS_BATCH_LOGING SYSREQ_PROFILING_SETTINGS_BATCH_SIZE SYSREQ_PROFILING_SETTINGS_PROFILING_ENABLED SYSREQ_PROFILING_SETTINGS_SQL_PROFILING_ENABLED SYSREQ_PROFILING_SETTINGS_START_LOGGED SYSREQ_RECORD_STATUS SYSREQ_REF_REQ_FIELD_NAME SYSREQ_REF_REQ_FORMAT SYSREQ_REF_REQ_GENERATED SYSREQ_REF_REQ_LENGTH SYSREQ_REF_REQ_PRECISION SYSREQ_REF_REQ_REFERENCE SYSREQ_REF_REQ_SECTION SYSREQ_REF_REQ_STORED SYSREQ_REF_REQ_TOKENS SYSREQ_REF_REQ_TYPE SYSREQ_REF_REQ_VIEW SYSREQ_REF_TYPE_ACT_CODE SYSREQ_REF_TYPE_ACT_DESCRIPTION SYSREQ_REF_TYPE_ACT_DESCRIPTION_LOCALIZE_ID SYSREQ_REF_TYPE_ACT_ON_EXECUTE SYSREQ_REF_TYPE_ACT_ON_EXECUTE_EXISTS SYSREQ_REF_TYPE_ACT_SECTION SYSREQ_REF_TYPE_ADD_PARAMS SYSREQ_REF_TYPE_COMMENT SYSREQ_REF_TYPE_COMMON_SETTINGS SYSREQ_REF_TYPE_DISPLAY_REQUISITE_NAME SYSREQ_REF_TYPE_EVENT_TEXT SYSREQ_REF_TYPE_MAIN_LEADING_REF SYSREQ_REF_TYPE_NAME_IN_SINGULAR SYSREQ_REF_TYPE_NAME_IN_SINGULAR_LOCALIZE_ID SYSREQ_REF_TYPE_NAME_LOCALIZE_ID SYSREQ_REF_TYPE_NUMERATION_METHOD SYSREQ_REF_TYPE_REQ_CODE SYSREQ_REF_TYPE_REQ_DESCRIPTION SYSREQ_REF_TYPE_REQ_DESCRIPTION_LOCALIZE_ID SYSREQ_REF_TYPE_REQ_IS_CONTROL SYSREQ_REF_TYPE_REQ_IS_FILTER SYSREQ_REF_TYPE_REQ_IS_LEADING SYSREQ_REF_TYPE_REQ_IS_REQUIRED SYSREQ_REF_TYPE_REQ_NUMBER SYSREQ_REF_TYPE_REQ_ON_CHANGE SYSREQ_REF_TYPE_REQ_ON_CHANGE_EXISTS SYSREQ_REF_TYPE_REQ_ON_SELECT SYSREQ_REF_TYPE_REQ_ON_SELECT_KIND SYSREQ_REF_TYPE_REQ_SECTION SYSREQ_REF_TYPE_VIEW_CARD SYSREQ_REF_TYPE_VIEW_CODE SYSREQ_REF_TYPE_VIEW_COMMENT SYSREQ_REF_TYPE_VIEW_IS_MAIN SYSREQ_REF_TYPE_VIEW_NAME SYSREQ_REF_TYPE_VIEW_NAME_LOCALIZE_ID SYSREQ_REFERENCE_TYPE_ID SYSREQ_STATE SYSREQ_STATЕ SYSREQ_SYSTEM_SETTINGS_VALUE SYSREQ_TYPE SYSREQ_UNIT SYSREQ_UNIT_ID SYSREQ_USER_GROUPS_GROUP_FULL_NAME SYSREQ_USER_GROUPS_GROUP_NAME SYSREQ_USER_GROUPS_GROUP_SERVER_NAME SYSREQ_USERS_ACCESS_RIGHTS SYSREQ_USERS_AUTHENTICATION SYSREQ_USERS_CATEGORY SYSREQ_USERS_COMPONENT SYSREQ_USERS_COMPONENT_USER_IS_PUBLIC SYSREQ_USERS_DOMAIN SYSREQ_USERS_FULL_USER_NAME SYSREQ_USERS_GROUP SYSREQ_USERS_IS_MAIN_SERVER SYSREQ_USERS_LOGIN SYSREQ_USERS_REFERENCE_USER_IS_PUBLIC SYSREQ_USERS_STATUS SYSREQ_USERS_USER_CERTIFICATE SYSREQ_USERS_USER_CERTIFICATE_INFO SYSREQ_USERS_USER_CERTIFICATE_PLUGIN_NAME SYSREQ_USERS_USER_CERTIFICATE_PLUGIN_VERSION SYSREQ_USERS_USER_CERTIFICATE_STATE SYSREQ_USERS_USER_CERTIFICATE_SUBJECT_NAME SYSREQ_USERS_USER_CERTIFICATE_THUMBPRINT SYSREQ_USERS_USER_DEFAULT_CERTIFICATE SYSREQ_USERS_USER_DESCRIPTION SYSREQ_USERS_USER_GLOBAL_NAME SYSREQ_USERS_USER_LOGIN SYSREQ_USERS_USER_MAIN_SERVER SYSREQ_USERS_USER_TYPE SYSREQ_WORK_RULES_FOLDER_ID RESULT_VAR_NAME RESULT_VAR_NAME_ENG AUTO_NUMERATION_RULE_ID CANT_CHANGE_ID_REQUISITE_RULE_ID CANT_CHANGE_OURFIRM_REQUISITE_RULE_ID CHECK_CHANGING_REFERENCE_RECORD_USE_RULE_ID CHECK_CODE_REQUISITE_RULE_ID CHECK_DELETING_REFERENCE_RECORD_USE_RULE_ID CHECK_FILTRATER_CHANGES_RULE_ID CHECK_RECORD_INTERVAL_RULE_ID CHECK_REFERENCE_INTERVAL_RULE_ID CHECK_REQUIRED_DATA_FULLNESS_RULE_ID CHECK_REQUIRED_REQUISITES_FULLNESS_RULE_ID MAKE_RECORD_UNRATIFIED_RULE_ID RESTORE_AUTO_NUMERATION_RULE_ID SET_FIRM_CONTEXT_FROM_RECORD_RULE_ID SET_FIRST_RECORD_IN_LIST_FORM_RULE_ID SET_IDSPS_VALUE_RULE_ID SET_NEXT_CODE_VALUE_RULE_ID SET_OURFIRM_BOUNDS_RULE_ID SET_OURFIRM_REQUISITE_RULE_ID SCRIPT_BLOCK_AFTER_FINISH_EVENT SCRIPT_BLOCK_BEFORE_START_EVENT SCRIPT_BLOCK_EXECUTION_RESULTS_PROPERTY SCRIPT_BLOCK_NAME_PROPERTY SCRIPT_BLOCK_SCRIPT_PROPERTY SUBTASK_BLOCK_ABORT_DEADLINE_PROPERTY SUBTASK_BLOCK_AFTER_FINISH_EVENT SUBTASK_BLOCK_ASSIGN_PARAMS_EVENT SUBTASK_BLOCK_ATTACHMENTS_PROPERTY SUBTASK_BLOCK_ATTACHMENTS_RIGHTS_GROUP_PROPERTY SUBTASK_BLOCK_ATTACHMENTS_RIGHTS_TYPE_PROPERTY SUBTASK_BLOCK_BEFORE_START_EVENT SUBTASK_BLOCK_CREATED_TASK_PROPERTY SUBTASK_BLOCK_CREATION_EVENT SUBTASK_BLOCK_DEADLINE_PROPERTY SUBTASK_BLOCK_IMPORTANCE_PROPERTY SUBTASK_BLOCK_INITIATOR_PROPERTY SUBTASK_BLOCK_IS_RELATIVE_ABORT_DEADLINE_PROPERTY SUBTASK_BLOCK_IS_RELATIVE_DEADLINE_PROPERTY SUBTASK_BLOCK_JOBS_TYPE_PROPERTY SUBTASK_BLOCK_NAME_PROPERTY SUBTASK_BLOCK_PARALLEL_ROUTE_PROPERTY SUBTASK_BLOCK_PERFORMERS_PROPERTY SUBTASK_BLOCK_RELATIVE_ABORT_DEADLINE_TYPE_PROPERTY SUBTASK_BLOCK_RELATIVE_DEADLINE_TYPE_PROPERTY SUBTASK_BLOCK_REQUIRE_SIGN_PROPERTY SUBTASK_BLOCK_STANDARD_ROUTE_PROPERTY SUBTASK_BLOCK_START_EVENT SUBTASK_BLOCK_STEP_CONTROL_PROPERTY SUBTASK_BLOCK_SUBJECT_PROPERTY SUBTASK_BLOCK_TASK_CONTROL_PROPERTY SUBTASK_BLOCK_TEXT_PROPERTY SUBTASK_BLOCK_UNLOCK_ATTACHMENTS_ON_STOP_PROPERTY SUBTASK_BLOCK_USE_STANDARD_ROUTE_PROPERTY SUBTASK_BLOCK_WAIT_FOR_TASK_COMPLETE_PROPERTY SYSCOMP_CONTROL_JOBS SYSCOMP_FOLDERS SYSCOMP_JOBS SYSCOMP_NOTICES SYSCOMP_TASKS SYSDLG_CREATE_EDOCUMENT SYSDLG_CREATE_EDOCUMENT_VERSION SYSDLG_CURRENT_PERIOD SYSDLG_EDIT_FUNCTION_HELP SYSDLG_EDOCUMENT_KINDS_FOR_TEMPLATE SYSDLG_EXPORT_MULTIPLE_EDOCUMENTS SYSDLG_EXPORT_SINGLE_EDOCUMENT SYSDLG_IMPORT_EDOCUMENT SYSDLG_MULTIPLE_SELECT SYSDLG_SETUP_ACCESS_RIGHTS SYSDLG_SETUP_DEFAULT_RIGHTS SYSDLG_SETUP_FILTER_CONDITION SYSDLG_SETUP_SIGN_RIGHTS SYSDLG_SETUP_TASK_OBSERVERS SYSDLG_SETUP_TASK_ROUTE SYSDLG_SETUP_USERS_LIST SYSDLG_SIGN_EDOCUMENT SYSDLG_SIGN_MULTIPLE_EDOCUMENTS SYSREF_ACCESS_RIGHTS_TYPES SYSREF_ADMINISTRATION_HISTORY SYSREF_ALL_AVAILABLE_COMPONENTS SYSREF_ALL_AVAILABLE_PRIVILEGES SYSREF_ALL_REPLICATING_COMPONENTS SYSREF_AVAILABLE_DEVELOPERS_COMPONENTS SYSREF_CALENDAR_EVENTS SYSREF_COMPONENT_TOKEN_HISTORY SYSREF_COMPONENT_TOKENS SYSREF_COMPONENTS SYSREF_CONSTANTS SYSREF_DATA_RECEIVE_PROTOCOL SYSREF_DATA_SEND_PROTOCOL SYSREF_DIALOGS SYSREF_DIALOGS_REQUISITES SYSREF_EDITORS SYSREF_EDOC_CARDS SYSREF_EDOC_TYPES SYSREF_EDOCUMENT_CARD_REQUISITES SYSREF_EDOCUMENT_CARD_TYPES SYSREF_EDOCUMENT_CARD_TYPES_REFERENCE SYSREF_EDOCUMENT_CARDS SYSREF_EDOCUMENT_HISTORY SYSREF_EDOCUMENT_KINDS SYSREF_EDOCUMENT_REQUISITES SYSREF_EDOCUMENT_SIGNATURES SYSREF_EDOCUMENT_TEMPLATES SYSREF_EDOCUMENT_TEXT_STORAGES SYSREF_EDOCUMENT_VIEWS SYSREF_FILTERER_SETUP_CONFLICTS SYSREF_FILTRATER_SETTING_CONFLICTS SYSREF_FOLDER_HISTORY SYSREF_FOLDERS SYSREF_FUNCTION_GROUPS SYSREF_FUNCTION_PARAMS SYSREF_FUNCTIONS SYSREF_JOB_HISTORY SYSREF_LINKS SYSREF_LOCALIZATION_DICTIONARY SYSREF_LOCALIZATION_LANGUAGES SYSREF_MODULES SYSREF_PRIVILEGES SYSREF_RECORD_HISTORY SYSREF_REFERENCE_REQUISITES SYSREF_REFERENCE_TYPE_VIEWS SYSREF_REFERENCE_TYPES SYSREF_REFERENCES SYSREF_REFERENCES_REQUISITES SYSREF_REMOTE_SERVERS SYSREF_REPLICATION_SESSIONS_LOG SYSREF_REPLICATION_SESSIONS_PROTOCOL SYSREF_REPORTS SYSREF_ROLES SYSREF_ROUTE_BLOCK_GROUPS SYSREF_ROUTE_BLOCKS SYSREF_SCRIPTS SYSREF_SEARCHES SYSREF_SERVER_EVENTS SYSREF_SERVER_EVENTS_HISTORY SYSREF_STANDARD_ROUTE_GROUPS SYSREF_STANDARD_ROUTES SYSREF_STATUSES SYSREF_SYSTEM_SETTINGS SYSREF_TASK_HISTORY SYSREF_TASK_KIND_GROUPS SYSREF_TASK_KINDS SYSREF_TASK_RIGHTS SYSREF_TASK_SIGNATURES SYSREF_TASKS SYSREF_UNITS SYSREF_USER_GROUPS SYSREF_USER_GROUPS_REFERENCE SYSREF_USER_SUBSTITUTION SYSREF_USERS SYSREF_USERS_REFERENCE SYSREF_VIEWERS SYSREF_WORKING_TIME_CALENDARS ACCESS_RIGHTS_TABLE_NAME EDMS_ACCESS_TABLE_NAME EDOC_TYPES_TABLE_NAME TEST_DEV_DB_NAME TEST_DEV_SYSTEM_CODE TEST_EDMS_DB_NAME TEST_EDMS_MAIN_CODE TEST_EDMS_MAIN_DB_NAME TEST_EDMS_SECOND_CODE TEST_EDMS_SECOND_DB_NAME TEST_EDMS_SYSTEM_CODE TEST_ISB5_MAIN_CODE TEST_ISB5_SECOND_CODE TEST_SQL_SERVER_2005_NAME TEST_SQL_SERVER_NAME ATTENTION_CAPTION cbsCommandLinks cbsDefault CONFIRMATION_CAPTION ERROR_CAPTION INFORMATION_CAPTION mrCancel mrOk EDOC_VERSION_ACTIVE_STAGE_CODE EDOC_VERSION_DESIGN_STAGE_CODE EDOC_VERSION_OBSOLETE_STAGE_CODE cpDataEnciphermentEnabled cpDigitalSignatureEnabled cpID cpIssuer cpPluginVersion cpSerial cpSubjectName cpSubjSimpleName cpValidFromDate cpValidToDate ISBL_SYNTAX NO_SYNTAX XML_SYNTAX WAIT_BLOCK_AFTER_FINISH_EVENT WAIT_BLOCK_BEFORE_START_EVENT WAIT_BLOCK_DEADLINE_PROPERTY WAIT_BLOCK_IS_RELATIVE_DEADLINE_PROPERTY WAIT_BLOCK_NAME_PROPERTY WAIT_BLOCK_RELATIVE_DEADLINE_TYPE_PROPERTY SYSRES_COMMON SYSRES_CONST SYSRES_MBFUNC SYSRES_SBDATA SYSRES_SBGUI SYSRES_SBINTF SYSRES_SBREFDSC SYSRES_SQLERRORS SYSRES_SYSCOMP atUser atGroup atRole aemEnabledAlways aemDisabledAlways aemEnabledOnBrowse aemEnabledOnEdit aemDisabledOnBrowseEmpty apBegin apEnd alLeft alRight asmNever asmNoButCustomize asmAsLastTime asmYesButCustomize asmAlways cirCommon cirRevoked ctSignature ctEncode ctSignatureEncode clbUnchecked clbChecked clbGrayed ceISB ceAlways ceNever ctDocument ctReference ctScript ctUnknown ctReport ctDialog ctFunction ctFolder ctEDocument ctTask ctJob ctNotice ctControlJob cfInternal cfDisplay ciUnspecified ciWrite ciRead ckFolder ckEDocument ckTask ckJob ckComponentToken ckAny ckReference ckScript ckReport ckDialog ctISBLEditor ctBevel ctButton ctCheckListBox ctComboBox ctComboEdit ctGrid ctDBCheckBox ctDBComboBox ctDBEdit ctDBEllipsis ctDBMemo ctDBNavigator ctDBRadioGroup ctDBStatusLabel ctEdit ctGroupBox ctInplaceHint ctMemo ctPanel ctListBox ctRadioButton ctRichEdit ctTabSheet ctWebBrowser ctImage ctHyperLink ctLabel ctDBMultiEllipsis ctRibbon ctRichView ctInnerPanel ctPanelGroup ctBitButton cctDate cctInteger cctNumeric cctPick cctReference cctString cctText cltInternal cltPrimary cltGUI dseBeforeOpen dseAfterOpen dseBeforeClose dseAfterClose dseOnValidDelete dseBeforeDelete dseAfterDelete dseAfterDeleteOutOfTransaction dseOnDeleteError dseBeforeInsert dseAfterInsert dseOnValidUpdate dseBeforeUpdate dseOnUpdateRatifiedRecord dseAfterUpdate dseAfterUpdateOutOfTransaction dseOnUpdateError dseAfterScroll dseOnOpenRecord dseOnCloseRecord dseBeforeCancel dseAfterCancel dseOnUpdateDeadlockError dseBeforeDetailUpdate dseOnPrepareUpdate dseOnAnyRequisiteChange dssEdit dssInsert dssBrowse dssInActive dftDate dftShortDate dftDateTime dftTimeStamp dotDays dotHours dotMinutes dotSeconds dtkndLocal dtkndUTC arNone arView arEdit arFull ddaView ddaEdit emLock emEdit emSign emExportWithLock emImportWithUnlock emChangeVersionNote emOpenForModify emChangeLifeStage emDelete emCreateVersion emImport emUnlockExportedWithLock emStart emAbort emReInit emMarkAsReaded emMarkAsUnreaded emPerform emAccept emResume emChangeRights emEditRoute emEditObserver emRecoveryFromLocalCopy emChangeWorkAccessType emChangeEncodeTypeToCertificate emChangeEncodeTypeToPassword emChangeEncodeTypeToNone emChangeEncodeTypeToCertificatePassword emChangeStandardRoute emGetText emOpenForView emMoveToStorage emCreateObject emChangeVersionHidden emDeleteVersion emChangeLifeCycleStage emApprovingSign emExport emContinue emLockFromEdit emUnLockForEdit emLockForServer emUnlockFromServer emDelegateAccessRights emReEncode ecotFile ecotProcess eaGet eaCopy eaCreate eaCreateStandardRoute edltAll edltNothing edltQuery essmText essmCard esvtLast esvtLastActive esvtSpecified edsfExecutive edsfArchive edstSQLServer edstFile edvstNone edvstEDocumentVersionCopy edvstFile edvstTemplate edvstScannedFile vsDefault vsDesign vsActive vsObsolete etNone etCertificate etPassword etCertificatePassword ecException ecWarning ecInformation estAll estApprovingOnly evtLast evtLastActive evtQuery fdtString fdtNumeric fdtInteger fdtDate fdtText fdtUnknown fdtWideString fdtLargeInteger ftInbox ftOutbox ftFavorites ftCommonFolder ftUserFolder ftComponents ftQuickLaunch ftShortcuts ftSearch grhAuto grhX1 grhX2 grhX3 hltText hltRTF hltHTML iffBMP iffJPEG iffMultiPageTIFF iffSinglePageTIFF iffTIFF iffPNG im8bGrayscale im24bRGB im1bMonochrome itBMP itJPEG itWMF itPNG ikhInformation ikhWarning ikhError ikhNoIcon icUnknown icScript icFunction icIntegratedReport icAnalyticReport icDataSetEventHandler icActionHandler icFormEventHandler icLookUpEventHandler icRequisiteChangeEventHandler icBeforeSearchEventHandler icRoleCalculation icSelectRouteEventHandler icBlockPropertyCalculation icBlockQueryParamsEventHandler icChangeSearchResultEventHandler icBlockEventHandler icSubTaskInitEventHandler icEDocDataSetEventHandler icEDocLookUpEventHandler icEDocActionHandler icEDocFormEventHandler icEDocRequisiteChangeEventHandler icStructuredConversionRule icStructuredConversionEventBefore icStructuredConversionEventAfter icWizardEventHandler icWizardFinishEventHandler icWizardStepEventHandler icWizardStepFinishEventHandler icWizardActionEnableEventHandler icWizardActionExecuteEventHandler icCreateJobsHandler icCreateNoticesHandler icBeforeLookUpEventHandler icAfterLookUpEventHandler icTaskAbortEventHandler icWorkflowBlockActionHandler icDialogDataSetEventHandler icDialogActionHandler icDialogLookUpEventHandler icDialogRequisiteChangeEventHandler icDialogFormEventHandler icDialogValidCloseEventHandler icBlockFormEventHandler icTaskFormEventHandler icReferenceMethod icEDocMethod icDialogMethod icProcessMessageHandler isShow isHide isByUserSettings jkJob jkNotice jkControlJob jtInner jtLeft jtRight jtFull jtCross lbpAbove lbpBelow lbpLeft lbpRight eltPerConnection eltPerUser sfcUndefined sfcBlack sfcGreen sfcRed sfcBlue sfcOrange sfcLilac sfsItalic sfsStrikeout sfsNormal ldctStandardRoute ldctWizard ldctScript ldctFunction ldctRouteBlock ldctIntegratedReport ldctAnalyticReport ldctReferenceType ldctEDocumentType ldctDialog ldctServerEvents mrcrtNone mrcrtUser mrcrtMaximal mrcrtCustom vtEqual vtGreaterOrEqual vtLessOrEqual vtRange rdYesterday rdToday rdTomorrow rdThisWeek rdThisMonth rdThisYear rdNextMonth rdNextWeek rdLastWeek rdLastMonth rdWindow rdFile rdPrinter rdtString rdtNumeric rdtInteger rdtDate rdtReference rdtAccount rdtText rdtPick rdtUnknown rdtLargeInteger rdtDocument reOnChange reOnChangeValues ttGlobal ttLocal ttUser ttSystem ssmBrowse ssmSelect ssmMultiSelect ssmBrowseModal smSelect smLike smCard stNone stAuthenticating stApproving sctString sctStream sstAnsiSort sstNaturalSort svtEqual svtContain soatString soatNumeric soatInteger soatDatetime soatReferenceRecord soatText soatPick soatBoolean soatEDocument soatAccount soatIntegerCollection soatNumericCollection soatStringCollection soatPickCollection soatDatetimeCollection soatBooleanCollection soatReferenceRecordCollection soatEDocumentCollection soatAccountCollection soatContents soatUnknown tarAbortByUser tarAbortByWorkflowException tvtAllWords tvtExactPhrase tvtAnyWord usNone usCompleted usRedSquare usBlueSquare usYellowSquare usGreenSquare usOrangeSquare usPurpleSquare usFollowUp utUnknown utUser utDeveloper utAdministrator utSystemDeveloper utDisconnected btAnd btDetailAnd btOr btNotOr btOnly vmView vmSelect vmNavigation vsmSingle vsmMultiple vsmMultipleCheck vsmNoSelection wfatPrevious wfatNext wfatCancel wfatFinish wfepUndefined wfepText3 wfepText6 wfepText9 wfepSpinEdit wfepDropDown wfepRadioGroup wfepFlag wfepText12 wfepText15 wfepText18 wfepText21 wfepText24 wfepText27 wfepText30 wfepRadioGroupColumn1 wfepRadioGroupColumn2 wfepRadioGroupColumn3 wfetQueryParameter wfetText wfetDelimiter wfetLabel wptString wptInteger wptNumeric wptBoolean wptDateTime wptPick wptText wptUser wptUserList wptEDocumentInfo wptEDocumentInfoList wptReferenceRecordInfo wptReferenceRecordInfoList wptFolderInfo wptTaskInfo wptContents wptFileName wptDate wsrComplete wsrGoNext wsrGoPrevious wsrCustom wsrCancel wsrGoFinal wstForm wstEDocument wstTaskCard wstReferenceRecordCard wstFinal waAll waPerformers waManual wsbStart wsbFinish wsbNotice wsbStep wsbDecision wsbWait wsbMonitor wsbScript wsbConnector wsbSubTask wsbLifeCycleStage wsbPause wdtInteger wdtFloat wdtString wdtPick wdtDateTime wdtBoolean wdtTask wdtJob wdtFolder wdtEDocument wdtReferenceRecord wdtUser wdtGroup wdtRole wdtIntegerCollection wdtFloatCollection wdtStringCollection wdtPickCollection wdtDateTimeCollection wdtBooleanCollection wdtTaskCollection wdtJobCollection wdtFolderCollection wdtEDocumentCollection wdtReferenceRecordCollection wdtUserCollection wdtGroupCollection wdtRoleCollection wdtContents wdtUserList wdtSearchDescription wdtDeadLine wdtPickSet wdtAccountCollection wiLow wiNormal wiHigh wrtSoft wrtHard wsInit wsRunning wsDone wsControlled wsAborted wsContinued wtmFull wtmFromCurrent wtmOnlyCurrent ",class:"AltState Application CallType ComponentTokens CreatedJobs CreatedNotices ControlState DialogResult Dialogs EDocuments EDocumentVersionSource Folders GlobalIDs Job Jobs InputValue LookUpReference LookUpRequisiteNames LookUpSearch Object ParentComponent Processes References Requisite ReportName Reports Result Scripts Searches SelectedAttachments SelectedItems SelectMode Sender ServerEvents ServiceFactory ShiftState SubTask SystemDialogs Tasks Wizard Wizards Work ВызовСпособ ИмяОтчета РеквЗнач ",literal:"null true false nil "},I={b:"\\.\\s*"+S.UIR,k:C,relevance:0},N={cN:"type",b:":[ \\t]*("+"IApplication IAccessRights IAccountRepository IAccountSelectionRestrictions IAction IActionList IAdministrationHistoryDescription IAnchors IApplication IArchiveInfo IAttachment IAttachmentList ICheckListBox ICheckPointedList IColumn IComponent IComponentDescription IComponentToken IComponentTokenFactory IComponentTokenInfo ICompRecordInfo IConnection IContents IControl IControlJob IControlJobInfo IControlList ICrypto ICrypto2 ICustomJob ICustomJobInfo ICustomListBox ICustomObjectWizardStep ICustomWork ICustomWorkInfo IDataSet IDataSetAccessInfo IDataSigner IDateCriterion IDateRequisite IDateRequisiteDescription IDateValue IDeaAccessRights IDeaObjectInfo IDevelopmentComponentLock IDialog IDialogFactory IDialogPickRequisiteItems IDialogsFactory IDICSFactory IDocRequisite IDocumentInfo IDualListDialog IECertificate IECertificateInfo IECertificates IEditControl IEditorForm IEdmsExplorer IEdmsObject IEdmsObjectDescription IEdmsObjectFactory IEdmsObjectInfo IEDocument IEDocumentAccessRights IEDocumentDescription IEDocumentEditor IEDocumentFactory IEDocumentInfo IEDocumentStorage IEDocumentVersion IEDocumentVersionListDialog IEDocumentVersionSource IEDocumentWizardStep IEDocVerSignature IEDocVersionState IEnabledMode IEncodeProvider IEncrypter IEvent IEventList IException IExternalEvents IExternalHandler IFactory IField IFileDialog IFolder IFolderDescription IFolderDialog IFolderFactory IFolderInfo IForEach IForm IFormTitle IFormWizardStep IGlobalIDFactory IGlobalIDInfo IGrid IHasher IHistoryDescription IHyperLinkControl IImageButton IImageControl IInnerPanel IInplaceHint IIntegerCriterion IIntegerList IIntegerRequisite IIntegerValue IISBLEditorForm IJob IJobDescription IJobFactory IJobForm IJobInfo ILabelControl ILargeIntegerCriterion ILargeIntegerRequisite ILargeIntegerValue ILicenseInfo ILifeCycleStage IList IListBox ILocalIDInfo ILocalization ILock IMemoryDataSet IMessagingFactory IMetadataRepository INotice INoticeInfo INumericCriterion INumericRequisite INumericValue IObject IObjectDescription IObjectImporter IObjectInfo IObserver IPanelGroup IPickCriterion IPickProperty IPickRequisite IPickRequisiteDescription IPickRequisiteItem IPickRequisiteItems IPickValue IPrivilege IPrivilegeList IProcess IProcessFactory IProcessMessage IProgress IProperty IPropertyChangeEvent IQuery IReference IReferenceCriterion IReferenceEnabledMode IReferenceFactory IReferenceHistoryDescription IReferenceInfo IReferenceRecordCardWizardStep IReferenceRequisiteDescription IReferencesFactory IReferenceValue IRefRequisite IReport IReportFactory IRequisite IRequisiteDescription IRequisiteDescriptionList IRequisiteFactory IRichEdit IRouteStep IRule IRuleList ISchemeBlock IScript IScriptFactory ISearchCriteria ISearchCriterion ISearchDescription ISearchFactory ISearchFolderInfo ISearchForObjectDescription ISearchResultRestrictions ISecuredContext ISelectDialog IServerEvent IServerEventFactory IServiceDialog IServiceFactory ISignature ISignProvider ISignProvider2 ISignProvider3 ISimpleCriterion IStringCriterion IStringList IStringRequisite IStringRequisiteDescription IStringValue ISystemDialogsFactory ISystemInfo ITabSheet ITask ITaskAbortReasonInfo ITaskCardWizardStep ITaskDescription ITaskFactory ITaskInfo ITaskRoute ITextCriterion ITextRequisite ITextValue ITreeListSelectDialog IUser IUserList IValue IView IWebBrowserControl IWizard IWizardAction IWizardFactory IWizardFormElement IWizardParam IWizardPickParam IWizardReferenceParam IWizardStep IWorkAccessRights IWorkDescription IWorkflowAskableParam IWorkflowAskableParams IWorkflowBlock IWorkflowBlockResult IWorkflowEnabledMode IWorkflowParam IWorkflowPickParam IWorkflowReferenceParam IWorkState IWorkTreeCustomNode IWorkTreeJobNode IWorkTreeTaskNode IXMLEditorForm SBCrypto ".trim().replace(/\s/g,"|")+")",e:"[ \\t]*=",eE:!0},A={cN:"variable",l:E,k:C,b:E,relevance:0,c:[N,I]},e="[A-Za-zА-Яа-яёЁ_][A-Za-zА-Яа-яёЁ_0-9]*\\(";return{aliases:["isbl"],cI:!0,l:E,k:C,i:"\\$|\\?|%|,|;$|~|#|@|</",c:[{cN:"function",b:e,e:"\\)$",rB:!0,l:E,k:C,i:"[\\[\\]\\|\\$\\?%,~#@]",c:[{cN:"title",l:E,k:{built_in:"AddSubString AdjustLineBreaks AmountInWords Analysis ArrayDimCount ArrayHighBound ArrayLowBound ArrayOf ArrayReDim Assert Assigned BeginOfMonth BeginOfPeriod BuildProfilingOperationAnalysis CallProcedure CanReadFile CArrayElement CDataSetRequisite ChangeDate ChangeReferenceDataset Char CharPos CheckParam CheckParamValue CompareStrings ConstantExists ControlState ConvertDateStr Copy CopyFile CreateArray CreateCachedReference CreateConnection CreateDialog CreateDualListDialog CreateEditor CreateException CreateFile CreateFolderDialog CreateInputDialog CreateLinkFile CreateList CreateLock CreateMemoryDataSet CreateObject CreateOpenDialog CreateProgress CreateQuery CreateReference CreateReport CreateSaveDialog CreateScript CreateSQLPivotFunction CreateStringList CreateTreeListSelectDialog CSelectSQL CSQL CSubString CurrentUserID CurrentUserName CurrentVersion DataSetLocateEx DateDiff DateTimeDiff DateToStr DayOfWeek DeleteFile DirectoryExists DisableCheckAccessRights DisableCheckFullShowingRestriction DisableMassTaskSendingRestrictions DropTable DupeString EditText EnableCheckAccessRights EnableCheckFullShowingRestriction EnableMassTaskSendingRestrictions EndOfMonth EndOfPeriod ExceptionExists ExceptionsOff ExceptionsOn Execute ExecuteProcess Exit ExpandEnvironmentVariables ExtractFileDrive ExtractFileExt ExtractFileName ExtractFilePath ExtractParams FileExists FileSize FindFile FindSubString FirmContext ForceDirectories Format FormatDate FormatNumeric FormatSQLDate FormatString FreeException GetComponent GetComponentLaunchParam GetConstant GetLastException GetReferenceRecord GetRefTypeByRefID GetTableID GetTempFolder IfThen In IndexOf InputDialog InputDialogEx InteractiveMode IsFileLocked IsGraphicFile IsNumeric Length LoadString LoadStringFmt LocalTimeToUTC LowerCase Max MessageBox MessageBoxEx MimeDecodeBinary MimeDecodeString MimeEncodeBinary MimeEncodeString Min MoneyInWords MoveFile NewID Now OpenFile Ord Precision Raise ReadCertificateFromFile ReadFile ReferenceCodeByID ReferenceNumber ReferenceRequisiteMode ReferenceRequisiteValue RegionDateSettings RegionNumberSettings RegionTimeSettings RegRead RegWrite RenameFile Replace Round SelectServerCode SelectSQL ServerDateTime SetConstant SetManagedFolderFieldsState ShowConstantsInputDialog ShowMessage Sleep Split SQL SQL2XLSTAB SQLProfilingSendReport StrToDate SubString SubStringCount SystemSetting Time TimeDiff Today Transliterate Trim UpperCase UserStatus UTCToLocalTime ValidateXML VarIsClear VarIsEmpty VarIsNull WorkTimeDiff WriteFile WriteFileEx WriteObjectHistory Анализ БазаДанных БлокЕсть БлокЕстьРасш БлокИнфо БлокСнять БлокСнятьРасш БлокУстановить Ввод ВводМеню ВедС ВедСпр ВерхняяГраницаМассива ВнешПрогр Восст ВременнаяПапка Время ВыборSQL ВыбратьЗапись ВыделитьСтр Вызвать Выполнить ВыпПрогр ГрафическийФайл ГруппаДополнительно ДатаВремяСерв ДеньНедели ДиалогДаНет ДлинаСтр ДобПодстр ЕПусто ЕслиТо ЕЧисло ЗамПодстр ЗаписьСправочника ЗначПоляСпр ИДТипСпр ИзвлечьДиск ИзвлечьИмяФайла ИзвлечьПуть ИзвлечьРасширение ИзмДат ИзменитьРазмерМассива ИзмеренийМассива ИмяОрг ИмяПоляСпр Индекс ИндикаторЗакрыть ИндикаторОткрыть ИндикаторШаг ИнтерактивныйРежим ИтогТблСпр КодВидВедСпр КодВидСпрПоИД КодПоAnalit КодСимвола КодСпр КолПодстр КолПроп КонМес Конст КонстЕсть КонстЗнач КонТран КопироватьФайл КопияСтр КПериод КСтрТблСпр Макс МаксСтрТблСпр Массив Меню МенюРасш Мин НаборДанныхНайтиРасш НаимВидСпр НаимПоAnalit НаимСпр НастроитьПереводыСтрок НачМес НачТран НижняяГраницаМассива НомерСпр НПериод Окно Окр Окружение ОтлИнфДобавить ОтлИнфУдалить Отчет ОтчетАнал ОтчетИнт ПапкаСуществует Пауза ПВыборSQL ПереименоватьФайл Переменные ПереместитьФайл Подстр ПоискПодстр ПоискСтр ПолучитьИДТаблицы ПользовательДополнительно ПользовательИД ПользовательИмя ПользовательСтатус Прервать ПроверитьПараметр ПроверитьПараметрЗнач ПроверитьУсловие РазбСтр РазнВремя РазнДат РазнДатаВремя РазнРабВремя РегУстВрем РегУстДат РегУстЧсл РедТекст РеестрЗапись РеестрСписокИменПарам РеестрЧтение РеквСпр РеквСпрПр Сегодня Сейчас Сервер СерверПроцессИД СертификатФайлСчитать СжПроб Символ СистемаДиректумКод СистемаИнформация СистемаКод Содержит СоединениеЗакрыть СоединениеОткрыть СоздатьДиалог СоздатьДиалогВыбораИзДвухСписков СоздатьДиалогВыбораПапки СоздатьДиалогОткрытияФайла СоздатьДиалогСохраненияФайла СоздатьЗапрос СоздатьИндикатор СоздатьИсключение СоздатьКэшированныйСправочник СоздатьМассив СоздатьНаборДанных СоздатьОбъект СоздатьОтчет СоздатьПапку СоздатьРедактор СоздатьСоединение СоздатьСписок СоздатьСписокСтрок СоздатьСправочник СоздатьСценарий СоздСпр СостСпр Сохр СохрСпр СписокСистем Спр Справочник СпрБлокЕсть СпрБлокСнять СпрБлокСнятьРасш СпрБлокУстановить СпрИзмНабДан СпрКод СпрНомер СпрОбновить СпрОткрыть СпрОтменить СпрПарам СпрПолеЗнач СпрПолеИмя СпрРекв СпрРеквВведЗн СпрРеквНовые СпрРеквПр СпрРеквПредЗн СпрРеквРежим СпрРеквТипТекст СпрСоздать СпрСост СпрСохранить СпрТблИтог СпрТблСтр СпрТблСтрКол СпрТблСтрМакс СпрТблСтрМин СпрТблСтрПред СпрТблСтрСлед СпрТблСтрСозд СпрТблСтрУд СпрТекПредст СпрУдалить СравнитьСтр СтрВерхРегистр СтрНижнРегистр СтрТблСпр СумПроп Сценарий СценарийПарам ТекВерсия ТекОрг Точн Тран Транслитерация УдалитьТаблицу УдалитьФайл УдСпр УдСтрТблСпр Уст УстановкиКонстант ФайлАтрибутСчитать ФайлАтрибутУстановить ФайлВремя ФайлВремяУстановить ФайлВыбрать ФайлЗанят ФайлЗаписать ФайлИскать ФайлКопировать ФайлМожноЧитать ФайлОткрыть ФайлПереименовать ФайлПерекодировать ФайлПереместить ФайлПросмотреть ФайлРазмер ФайлСоздать ФайлСсылкаСоздать ФайлСуществует ФайлСчитать ФайлУдалить ФмтSQLДат ФмтДат ФмтСтр ФмтЧсл Формат ЦМассивЭлемент ЦНаборДанныхРеквизит ЦПодстр "},b:e,e:"\\(",rB:!0,eE:!0},I,A,T,_,O]},N,I,A,T,_,O]}});
+hljs.registerLanguage("stylus",function(e){var t={cN:"variable",b:"\\$"+e.IR},o={cN:"number",b:"#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})"},i="(?=[\\.\\s\\n\\[\\:,])";return{aliases:["styl"],cI:!1,k:"if else for in",i:"("+["\\?","(\\bReturn\\b)","(\\bEnd\\b)","(\\bend\\b)","(\\bdef\\b)",";","#\\s","\\*\\s","===\\s","\\|","%"].join("|")+")",c:[e.QSM,e.ASM,e.CLCM,e.CBCM,o,{b:"\\.[a-zA-Z][a-zA-Z0-9_-]*"+i,cN:"selector-class"},{b:"\\#[a-zA-Z][a-zA-Z0-9_-]*"+i,cN:"selector-id"},{b:"\\b("+["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"].join("|")+")"+i,cN:"selector-tag"},{b:"&?:?:\\b("+["after","before","first-letter","first-line","active","first-child","focus","hover","lang","link","visited"].join("|")+")"+i},{b:"@("+["charset","css","debug","extend","font-face","for","import","include","media","mixin","page","warn","while"].join("|")+")\\b"},t,e.CSSNM,e.NM,{cN:"function",b:"^[a-zA-Z][a-zA-Z0-9_-]*\\(.*\\)",i:"[\\n]",rB:!0,c:[{cN:"title",b:"\\b[a-zA-Z][a-zA-Z0-9_-]*"},{cN:"params",b:/\(/,e:/\)/,c:[o,t,e.ASM,e.CSSNM,e.NM,e.QSM]}]},{cN:"attribute",b:"\\b("+["align-content","align-items","align-self","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","auto","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","clip-path","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","font","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-variant-ligatures","font-weight","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inherit","initial","justify-content","left","letter-spacing","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marks","mask","max-height","max-width","min-height","min-width","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","perspective","perspective-origin","pointer-events","position","quotes","resize","right","tab-size","table-layout","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-indent","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","white-space","widows","width","word-break","word-spacing","word-wrap","z-index"].reverse().join("|")+")\\b",starts:{e:/;|$/,c:[o,t,e.ASM,e.QSM,e.CSSNM,e.NM,e.CBCM],i:/\./,relevance:0}}]}});
+hljs.registerLanguage("qml",function(e){var r="[a-zA-Z_][a-zA-Z0-9\\._]*",t={cN:"attribute",b:"\\bid\\s*:",starts:{cN:"string",e:r,rE:!1}},a={b:r+"\\s*:",rB:!0,c:[{cN:"attribute",b:r,e:"\\s*:",eE:!0,relevance:0}],relevance:0},n={b:r+"\\s*{",e:"{",rB:!0,relevance:0,c:[e.inherit(e.TM,{b:r})]};return{aliases:["qt"],cI:!1,k:{keyword:"in of on if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await import",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Behavior bool color coordinate date double enumeration font geocircle georectangle geoshape int list matrix4x4 parent point quaternion real rect size string url variant vector2d vector3d vector4dPromise"},c:[{cN:"meta",b:/^\s*['"]use (strict|asm)['"]/},e.ASM,e.QSM,{cN:"string",b:"`",e:"`",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"}]},e.CLCM,e.CBCM,{cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],relevance:0},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{b:/</,e:/>\s*[);\]]/,relevance:0,sL:"xml"}],relevance:0},{cN:"keyword",b:"\\bsignal\\b",starts:{cN:"string",e:"(\\(|:|=|;|,|//|/\\*|$)",rE:!0}},{cN:"keyword",b:"\\bproperty\\b",starts:{cN:"string",e:"(:|=|;|,|//|/\\*|$)",rE:!0}},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:[e.CLCM,e.CBCM]}],i:/\[|%/},{b:"\\."+e.IR,relevance:0},t,a,n],i:/#/}});
+hljs.registerLanguage("ruleslanguage",function(T){return{k:{keyword:"BILL_PERIOD BILL_START BILL_STOP RS_EFFECTIVE_START RS_EFFECTIVE_STOP RS_JURIS_CODE RS_OPCO_CODE INTDADDATTRIBUTE|5 INTDADDVMSG|5 INTDBLOCKOP|5 INTDBLOCKOPNA|5 INTDCLOSE|5 INTDCOUNT|5 INTDCOUNTSTATUSCODE|5 INTDCREATEMASK|5 INTDCREATEDAYMASK|5 INTDCREATEFACTORMASK|5 INTDCREATEHANDLE|5 INTDCREATEOVERRIDEDAYMASK|5 INTDCREATEOVERRIDEMASK|5 INTDCREATESTATUSCODEMASK|5 INTDCREATETOUPERIOD|5 INTDDELETE|5 INTDDIPTEST|5 INTDEXPORT|5 INTDGETERRORCODE|5 INTDGETERRORMESSAGE|5 INTDISEQUAL|5 INTDJOIN|5 INTDLOAD|5 INTDLOADACTUALCUT|5 INTDLOADDATES|5 INTDLOADHIST|5 INTDLOADLIST|5 INTDLOADLISTDATES|5 INTDLOADLISTENERGY|5 INTDLOADLISTHIST|5 INTDLOADRELATEDCHANNEL|5 INTDLOADSP|5 INTDLOADSTAGING|5 INTDLOADUOM|5 INTDLOADUOMDATES|5 INTDLOADUOMHIST|5 INTDLOADVERSION|5 INTDOPEN|5 INTDREADFIRST|5 INTDREADNEXT|5 INTDRECCOUNT|5 INTDRELEASE|5 INTDREPLACE|5 INTDROLLAVG|5 INTDROLLPEAK|5 INTDSCALAROP|5 INTDSCALE|5 INTDSETATTRIBUTE|5 INTDSETDSTPARTICIPANT|5 INTDSETSTRING|5 INTDSETVALUE|5 INTDSETVALUESTATUS|5 INTDSHIFTSTARTTIME|5 INTDSMOOTH|5 INTDSORT|5 INTDSPIKETEST|5 INTDSUBSET|5 INTDTOU|5 INTDTOURELEASE|5 INTDTOUVALUE|5 INTDUPDATESTATS|5 INTDVALUE|5 STDEV INTDDELETEEX|5 INTDLOADEXACTUAL|5 INTDLOADEXCUT|5 INTDLOADEXDATES|5 INTDLOADEX|5 INTDLOADEXRELATEDCHANNEL|5 INTDSAVEEX|5 MVLOAD|5 MVLOADACCT|5 MVLOADACCTDATES|5 MVLOADACCTHIST|5 MVLOADDATES|5 MVLOADHIST|5 MVLOADLIST|5 MVLOADLISTDATES|5 MVLOADLISTHIST|5 IF FOR NEXT DONE SELECT END CALL ABORT CLEAR CHANNEL FACTOR LIST NUMBER OVERRIDE SET WEEK DISTRIBUTIONNODE ELSE WHEN THEN OTHERWISE IENUM CSV INCLUDE LEAVE RIDER SAVE DELETE NOVALUE SECTION WARN SAVE_UPDATE DETERMINANT LABEL REPORT REVENUE EACH IN FROM TOTAL CHARGE BLOCK AND OR CSV_FILE RATE_CODE AUXILIARY_DEMAND UIDACCOUNT RS BILL_PERIOD_SELECT HOURS_PER_MONTH INTD_ERROR_STOP SEASON_SCHEDULE_NAME ACCOUNTFACTOR ARRAYUPPERBOUND CALLSTOREDPROC GETADOCONNECTION GETCONNECT GETDATASOURCE GETQUALIFIER GETUSERID HASVALUE LISTCOUNT LISTOP LISTUPDATE LISTVALUE PRORATEFACTOR RSPRORATE SETBINPATH SETDBMONITOR WQ_OPEN BILLINGHOURS DATE DATEFROMFLOAT DATETIMEFROMSTRING DATETIMETOSTRING DATETOFLOAT DAY DAYDIFF DAYNAME DBDATETIME HOUR MINUTE MONTH MONTHDIFF MONTHHOURS MONTHNAME ROUNDDATE SAMEWEEKDAYLASTYEAR SECOND WEEKDAY WEEKDIFF YEAR YEARDAY YEARSTR COMPSUM HISTCOUNT HISTMAX HISTMIN HISTMINNZ HISTVALUE MAXNRANGE MAXRANGE MINRANGE COMPIKVA COMPKVA COMPKVARFROMKQKW COMPLF IDATTR FLAG LF2KW LF2KWH MAXKW POWERFACTOR READING2USAGE AVGSEASON MAXSEASON MONTHLYMERGE SEASONVALUE SUMSEASON ACCTREADDATES ACCTTABLELOAD CONFIGADD CONFIGGET CREATEOBJECT CREATEREPORT EMAILCLIENT EXPBLKMDMUSAGE EXPMDMUSAGE EXPORT_USAGE FACTORINEFFECT GETUSERSPECIFIEDSTOP INEFFECT ISHOLIDAY RUNRATE SAVE_PROFILE SETREPORTTITLE USEREXIT WATFORRUNRATE TO TABLE ACOS ASIN ATAN ATAN2 BITAND CEIL COS COSECANT COSH COTANGENT DIVQUOT DIVREM EXP FABS FLOOR FMOD FREPM FREXPN LOG LOG10 MAX MAXN MIN MINNZ MODF POW ROUND ROUND2VALUE ROUNDINT SECANT SIN SINH SQROOT TAN TANH FLOAT2STRING FLOAT2STRINGNC INSTR LEFT LEN LTRIM MID RIGHT RTRIM STRING STRINGNC TOLOWER TOUPPER TRIM NUMDAYS READ_DATE STAGING",built_in:"IDENTIFIER OPTIONS XML_ELEMENT XML_OP XML_ELEMENT_OF DOMDOCCREATE DOMDOCLOADFILE DOMDOCLOADXML DOMDOCSAVEFILE DOMDOCGETROOT DOMDOCADDPI DOMNODEGETNAME DOMNODEGETTYPE DOMNODEGETVALUE DOMNODEGETCHILDCT DOMNODEGETFIRSTCHILD DOMNODEGETSIBLING DOMNODECREATECHILDELEMENT DOMNODESETATTRIBUTE DOMNODEGETCHILDELEMENTCT DOMNODEGETFIRSTCHILDELEMENT DOMNODEGETSIBLINGELEMENT DOMNODEGETATTRIBUTECT DOMNODEGETATTRIBUTEI DOMNODEGETATTRIBUTEBYNAME DOMNODEGETBYNAME"},c:[T.CLCM,T.CBCM,T.ASM,T.QSM,T.CNM,{cN:"literal",v:[{b:"#\\s+[a-zA-Z\\ \\.]*",relevance:0},{b:"#[a-zA-Z\\ \\.]+"}]}]}});
+hljs.registerLanguage("cpp",function(e){function t(e){return"(?:"+e+")?"}var r="decltype\\(auto\\)",a="[a-zA-Z_]\\w*::",i=(t(a),t("<.*?>"),{cN:"keyword",b:"\\b[a-z\\d_]*_t\\b"}),c={cN:"string",v:[{b:'(u8?|U|L)?"',e:'"',i:"\\n",c:[e.BE]},{b:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",e:"'",i:"."},{b:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\((?:.|\n)*?\)\1"/}]},s={cN:"number",v:[{b:"\\b(0b[01']+)"},{b:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{b:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},n={cN:"meta",b:/#\s*[a-z]+\b/,e:/$/,k:{"meta-keyword":"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"},c:[{b:/\\\n/,relevance:0},e.inherit(c,{cN:"meta-string"}),{cN:"meta-string",b:/<.*?>/,e:/$/,i:"\\n"},e.CLCM,e.CBCM]},o={cN:"title",b:t(a)+e.IR,relevance:0},l=t(a)+e.IR+"\\s*\\(",u={keyword:"int float while private char char8_t char16_t char32_t catch import module export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using asm case typeid wchar_tshort reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignas alignof constexpr consteval constinit decltype concept co_await co_return co_yield requires noexcept static_assert thread_local restrict final override atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return and and_eq bitand bitor compl not not_eq or or_eq xor xor_eq",built_in:"std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr abort terminate abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr _Bool complex _Complex imaginary _Imaginary",literal:"true false nullptr NULL"},p=[i,e.CLCM,e.CBCM,s,c],m={v:[{b:/=/,e:/;/},{b:/\(/,e:/\)/},{bK:"new throw return else",e:/;/}],k:u,c:p.concat([{b:/\(/,e:/\)/,k:u,c:p.concat(["self"]),relevance:0}]),relevance:0},d={cN:"function",b:"((decltype\\(auto\\)|(?:[a-zA-Z_]\\w*::)?[a-zA-Z_]\\w*(?:<.*?>)?)[\\*&\\s]+)+"+l,rB:!0,e:/[{;=]/,eE:!0,k:u,i:/[^\w\s\*&:<>]/,c:[{b:r,k:u,relevance:0},{b:l,rB:!0,c:[o],relevance:0},{cN:"params",b:/\(/,e:/\)/,k:u,relevance:0,c:[e.CLCM,e.CBCM,c,s,i,{b:/\(/,e:/\)/,k:u,relevance:0,c:["self",e.CLCM,e.CBCM,c,s,i]}]},i,e.CLCM,e.CBCM,n]};return{aliases:["c","cc","h","c++","h++","hpp","hh","hxx","cxx"],k:u,i:"</",c:[].concat(m,d,p,[n,{b:"\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",e:">",k:u,c:["self",i]},{b:e.IR+"::",k:u},{cN:"class",bK:"class struct",e:/[{;:]/,c:[{b:/</,e:/>/,c:["self"]},e.TM]}]),exports:{preprocessor:n,strings:c,k:u}}});
+hljs.registerLanguage("roboconf",function(e){var a="[a-zA-Z-_][^\\n{]+\\{",n={cN:"attribute",b:/[a-zA-Z-_]+/,e:/\s*:/,eE:!0,starts:{e:";",relevance:0,c:[{cN:"variable",b:/\.[a-zA-Z-_]+/},{cN:"keyword",b:/\(optional\)/}]}};return{aliases:["graph","instances"],cI:!0,k:"import",c:[{b:"^facet "+a,e:"}",k:"facet",c:[n,e.HCM]},{b:"^\\s*instance of "+a,e:"}",k:"name count channels instance-data instance-state instance of",i:/\S/,c:["self",n,e.HCM]},{b:"^"+a,e:"}",c:[n,e.HCM]},e.HCM]}});
+hljs.registerLanguage("pf",function(t){return{aliases:["pf.conf"],l:/[a-z0-9_<>-]+/,k:{built_in:"block match pass load anchor|5 antispoof|10 set table",keyword:"in out log quick on rdomain inet inet6 proto from port os to routeallow-opts divert-packet divert-reply divert-to flags group icmp-typeicmp6-type label once probability recieved-on rtable prio queuetos tag tagged user keep fragment for os dropaf-to|10 binat-to|10 nat-to|10 rdr-to|10 bitmask least-stats random round-robinsource-hash static-portdup-to reply-to route-toparent bandwidth default min max qlimitblock-policy debug fingerprints hostid limit loginterface optimizationreassemble ruleset-optimization basic none profile skip state-defaultsstate-policy timeoutconst counters persistno modulate synproxy state|5 floating if-bound no-sync pflow|10 sloppysource-track global rule max-src-nodes max-src-states max-src-connmax-src-conn-rate overload flushscrub|5 max-mss min-ttl no-df|10 random-id",literal:"all any no-route self urpf-failed egress|5 unknown"},c:[t.HCM,t.NM,t.QSM,{cN:"variable",b:/\$[\w\d#@][\w\d_]*/},{cN:"variable",b:/<(?!\/)/,e:/>/}]}});
+hljs.registerLanguage("dts",function(e){var a={cN:"string",v:[e.inherit(e.QSM,{b:'((u8?|U)|L)?"'}),{b:'(u8?|U)?R"',e:'"',c:[e.BE]},{b:"'\\\\?.",e:"'",i:"."}]},c={cN:"number",v:[{b:"\\b(\\d+(\\.\\d*)?|\\.\\d+)(u|U|l|L|ul|UL|f|F)"},{b:e.CNR}],relevance:0},b={cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elif endif define undef ifdef ifndef"},c:[{b:/\\\n/,relevance:0},{bK:"include",e:"$",k:{"meta-keyword":"include"},c:[e.inherit(a,{cN:"meta-string"}),{cN:"meta-string",b:"<",e:">",i:"\\n"}]},a,e.CLCM,e.CBCM]},n={cN:"variable",b:"\\&[a-z\\d_]*\\b"},i={cN:"meta-keyword",b:"/[a-z][a-z\\d-]*/"},r={cN:"symbol",b:"^\\s*[a-zA-Z_][a-zA-Z\\d_]*:"},d={cN:"params",b:"<",e:">",c:[c,n]},s={cN:"class",b:/[a-zA-Z_][a-zA-Z\d_@]*\s{/,e:/[{;=]/,rB:!0,eE:!0};return{k:"",c:[{cN:"class",b:"/\\s*{",e:"};",relevance:10,c:[n,i,r,s,d,e.CLCM,e.CBCM,c,a]},n,i,r,s,d,e.CLCM,e.CBCM,c,a,b,{b:e.IR+"::",k:""}]}});
+hljs.registerLanguage("inform7",function(e){return{aliases:["i7"],cI:!0,k:{keyword:"thing room person man woman animal container supporter backdrop door scenery open closed locked inside gender is are say understand kind of rule"},c:[{cN:"string",b:'"',e:'"',relevance:0,c:[{cN:"subst",b:"\\[",e:"\\]"}]},{cN:"section",b:/^(Volume|Book|Part|Chapter|Section|Table)\b/,e:"$"},{b:/^(Check|Carry out|Report|Instead of|To|Rule|When|Before|After)\b/,e:":",c:[{b:"\\(This",e:"\\)"}]},{cN:"comment",b:"\\[",e:"\\]",c:["self"]}]}});
+hljs.registerLanguage("reasonml",function(e){var a="~?[a-z$_][0-9a-zA-Z$_]*",r="`?[A-Z$_][0-9a-zA-Z$_]*",c="("+["||","&&","++","**","+.","*","/","*.","/.","...","|>"].map(function(e){return e.split("").map(function(e){return"\\"+e}).join("")}).join("|")+"|==|===)",n="\\s+"+c+"\\s+",l={keyword:"and as asr assert begin class constraint do done downto else end exception externalfor fun function functor if in include inherit initializerland lazy let lor lsl lsr lxor match method mod module mutable new nonrecobject of open or private rec sig struct then to try type val virtual when while with",built_in:"array bool bytes char exn|5 float int int32 int64 list lazy_t|5 nativeint|5 ref string unit ",literal:"true false"},t="\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",i={cN:"number",relevance:0,v:[{b:t},{b:"\\(\\-"+t+"\\)"}]},s={cN:"operator",relevance:0,b:c},b=[{cN:"identifier",relevance:0,b:a},s,i],o=[e.QSM,s,{cN:"module",b:"\\b"+r,rB:!0,e:".",c:[{cN:"identifier",b:r,relevance:0}]}],v=[{cN:"module",b:"\\b"+r,rB:!0,e:".",relevance:0,c:[{cN:"identifier",b:r,relevance:0}]}],u={cN:"function",relevance:0,k:l,v:[{b:"\\s(\\(\\.?.*?\\)|"+a+")\\s*=>",e:"\\s*=>",rB:!0,relevance:0,c:[{cN:"params",v:[{b:a},{b:"~?[a-z$_][0-9a-zA-Z$_]*(s*:s*[a-z$_][0-9a-z$_]*((s*('?[a-z$_][0-9a-z$_]*s*(,'?[a-z$_][0-9a-z$_]*)*)?s*))?)?(s*:s*[a-z$_][0-9a-z$_]*((s*('?[a-z$_][0-9a-z$_]*s*(,'?[a-z$_][0-9a-z$_]*)*)?s*))?)?"},{b:/\(\s*\)/}]}]},{b:"\\s\\(\\.?[^;\\|]*\\)\\s*=>",e:"\\s=>",rB:!0,relevance:0,c:[{cN:"params",relevance:0,v:[{b:a,e:"(,|\\n|\\))",relevance:0,c:[s,{cN:"typing",b:":",e:"(,|\\n)",rB:!0,relevance:0,c:v}]}]}]},{b:"\\(\\.\\s"+a+"\\)\\s*=>"}]};o.push(u);var _={cN:"constructor",b:r+"\\(",e:"\\)",i:"\\n",k:l,c:[e.QSM,s,{cN:"params",b:"\\b"+a}]},N={cN:"pattern-match",b:"\\|",rB:!0,k:l,e:"=>",relevance:0,c:[_,s,{relevance:0,cN:"constructor",b:r}]},d={cN:"module-access",k:l,rB:!0,v:[{b:"\\b("+r+"\\.)+"+a},{b:"\\b("+r+"\\.)+\\(",e:"\\)",rB:!0,c:[u,{b:"\\(",e:"\\)",skip:!0}].concat(o)},{b:"\\b("+r+"\\.)+{",e:"}"}],c:o};return v.push(d),{aliases:["re"],k:l,i:"(:\\-|:=|\\${|\\+=)",c:[e.C("/\\*","\\*/",{i:"^(\\#,\\/\\/)"}),{cN:"character",b:"'(\\\\[^']+|[^'])'",i:"\\n",relevance:0},e.QSM,{cN:"literal",b:"\\(\\)",relevance:0},{cN:"literal",b:"\\[\\|",e:"\\|\\]",relevance:0,c:b},{cN:"literal",b:"\\[",e:"\\]",relevance:0,c:b},_,{cN:"operator",b:n,i:"\\-\\->",relevance:0},i,e.CLCM,N,u,{cN:"module-def",b:"\\bmodule\\s+"+a+"\\s+"+r+"\\s+=\\s+{",e:"}",rB:!0,k:l,relevance:0,c:[{cN:"module",relevance:0,b:r},{b:"{",e:"}",skip:!0}].concat(o)},d]}});
+hljs.registerLanguage("d",function(e){var a="(0|[1-9][\\d_]*)",d="("+a+"|0[bB][01_]+|0[xX]([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))",t="\\\\(['\"\\?\\\\abfnrtv]|u[\\dA-Fa-f]{4}|[0-7]{1,3}|x[\\dA-Fa-f]{2}|U[\\dA-Fa-f]{8})|&[a-zA-Z\\d]{2,};",_={cN:"number",b:"\\b"+d+"(L|u|U|Lu|LU|uL|UL)?",relevance:0},r={cN:"number",b:"\\b(((0[xX](([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)\\.([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)|\\.?([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))[pP][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))|((0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(\\.\\d*|([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)))|\\d+\\.(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)|\\.(0|[1-9][\\d_]*)([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))?))([fF]|L|i|[fF]i|Li)?|"+d+"(i|[fF]i|Li))",relevance:0},i={cN:"string",b:"'("+t+"|.)",e:"'",i:"."},n={cN:"string",b:'"',c:[{b:t,relevance:0}],e:'"[cwd]?'},c=e.C("\\/\\+","\\+\\/",{c:["self"],relevance:10});return{l:e.UIR,k:{keyword:"abstract alias align asm assert auto body break byte case cast catch class const continue debug default delete deprecated do else enum export extern final finally for foreach foreach_reverse|10 goto if immutable import in inout int interface invariant is lazy macro mixin module new nothrow out override package pragma private protected public pure ref return scope shared static struct super switch synchronized template this throw try typedef typeid typeof union unittest version void volatile while with __FILE__ __LINE__ __gshared|10 __thread __traits __DATE__ __EOF__ __TIME__ __TIMESTAMP__ __VENDOR__ __VERSION__",built_in:"bool cdouble cent cfloat char creal dchar delegate double dstring float function idouble ifloat ireal long real short string ubyte ucent uint ulong ushort wchar wstring",literal:"false null true"},c:[e.CLCM,e.CBCM,c,{cN:"string",b:'x"[\\da-fA-F\\s\\n\\r]*"[cwd]?',relevance:10},n,{cN:"string",b:'[rq]"',e:'"[cwd]?',relevance:5},{cN:"string",b:"`",e:"`[cwd]?"},{cN:"string",b:'q"\\{',e:'\\}"'},r,_,i,{cN:"meta",b:"^#!",e:"$",relevance:5},{cN:"meta",b:"#(line)",e:"$",relevance:5},{cN:"keyword",b:"@[a-zA-Z_][a-zA-Z_\\d]*"}]}});
+hljs.registerLanguage("http",function(e){var t="HTTP/[0-9\\.]+";return{aliases:["https"],i:"\\S",c:[{b:"^"+t,e:"$",c:[{cN:"number",b:"\\b\\d{3}\\b"}]},{b:"^[A-Z]+ (.*?) "+t+"$",rB:!0,e:"$",c:[{cN:"string",b:" ",e:" ",eB:!0,eE:!0},{b:t},{cN:"keyword",b:"[A-Z]+"}]},{cN:"attribute",b:"^\\w",e:": ",eE:!0,i:"\\n|\\s|=",starts:{e:"$",relevance:0}},{b:"\\n\\n",starts:{sL:[],eW:!0}}]}});
+hljs.registerLanguage("yaml",function(e){var b="true false yes no null",a={cN:"string",relevance:0,v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/\S+/}],c:[e.BE,{cN:"template-variable",v:[{b:"{{",e:"}}"},{b:"%{",e:"}"}]}]};return{cI:!0,aliases:["yml","YAML","yaml"],c:[{cN:"attr",v:[{b:"\\w[\\w :\\/.-]*:(?=[ \t]|$)"},{b:'"\\w[\\w :\\/.-]*":(?=[ \t]|$)'},{b:"'\\w[\\w :\\/.-]*':(?=[ \t]|$)"}]},{cN:"meta",b:"^---s*$",relevance:10},{cN:"string",b:"[\\|>]([0-9]?[+-])?[ ]*\\n( *)[\\S ]+\\n(\\2[\\S ]+\\n?)*"},{b:"<%[%=-]?",e:"[%-]?%>",sL:"ruby",eB:!0,eE:!0,relevance:0},{cN:"type",b:"!"+e.UIR},{cN:"type",b:"!!"+e.UIR},{cN:"meta",b:"&"+e.UIR+"$"},{cN:"meta",b:"\\*"+e.UIR+"$"},{cN:"bullet",b:"\\-(?=[ ]|$)",relevance:0},e.HCM,{bK:b,k:{literal:b}},{cN:"number",b:e.CNR+"\\b"},a]}});
+hljs.registerLanguage("ebnf",function(a){var e=a.C(/\(\*/,/\*\)/);return{i:/\S/,c:[e,{cN:"attribute",b:/^[ ]*[a-zA-Z][a-zA-Z-_]*([\s-_]+[a-zA-Z][a-zA-Z]*)*/},{b:/=/,e:/[.;]/,c:[e,{cN:"meta",b:/\?.*\?/},{cN:"string",v:[a.ASM,a.QSM,{b:"`",e:"`"}]}]}]}});
+hljs.registerLanguage("julia-repl",function(e){return{c:[{cN:"meta",b:/^julia>/,relevance:10,starts:{e:/^(?![ ]{6})/,sL:"julia"},aliases:["jldoctest"]}]}});
+hljs.registerLanguage("hy",function(e){var t="a-zA-Z_\\-!.?+*=<>&#'",a="["+t+"]["+t+"0-9/;:]*",i={b:a,relevance:0},r={cN:"number",b:"[-+]?\\d+(\\.\\d+)?",relevance:0},o=e.inherit(e.QSM,{i:null}),n=e.C(";","$",{relevance:0}),s={cN:"literal",b:/\b([Tt]rue|[Ff]alse|nil|None)\b/},l={b:"[\\[\\{]",e:"[\\]\\}]"},c={cN:"comment",b:"\\^"+a},d=e.C("\\^\\{","\\}"),p={cN:"symbol",b:"[:]{1,2}"+a},m={b:"\\(",e:"\\)"},u={eW:!0,relevance:0},f={k:{"builtin-name":"!= % %= & &= * ** **= *= *map + += , --build-class-- --import-- -= . / // //= /= < << <<= <= = > >= >> >>= @ @= ^ ^= abs accumulate all and any ap-compose ap-dotimes ap-each ap-each-while ap-filter ap-first ap-if ap-last ap-map ap-map-when ap-pipe ap-reduce ap-reject apply as-> ascii assert assoc bin break butlast callable calling-module-name car case cdr chain chr coll? combinations compile compress cond cons cons? continue count curry cut cycle dec def default-method defclass defmacro defmacro-alias defmacro/g! defmain defmethod defmulti defn defn-alias defnc defnr defreader defseq del delattr delete-route dict-comp dir disassemble dispatch-reader-macro distinct divmod do doto drop drop-last drop-while empty? end-sequence eval eval-and-compile eval-when-compile even? every? except exec filter first flatten float? fn fnc fnr for for* format fraction genexpr gensym get getattr global globals group-by hasattr hash hex id identity if if* if-not if-python2 import in inc input instance? integer integer-char? integer? interleave interpose is is-coll is-cons is-empty is-even is-every is-float is-instance is-integer is-integer-char is-iterable is-iterator is-keyword is-neg is-none is-not is-numeric is-odd is-pos is-string is-symbol is-zero isinstance islice issubclass iter iterable? iterate iterator? keyword keyword? lambda last len let lif lif-not list* list-comp locals loop macro-error macroexpand macroexpand-1 macroexpand-all map max merge-with method-decorator min multi-decorator multicombinations name neg? next none? nonlocal not not-in not? nth numeric? oct odd? open or ord partition permutations pos? post-route postwalk pow prewalk print product profile/calls profile/cpu put-route quasiquote quote raise range read read-str recursive-replace reduce remove repeat repeatedly repr require rest round route route-with-methods rwm second seq set-comp setattr setv some sorted string string? sum switch symbol? take take-nth take-while tee try unless unquote unquote-splicing vars walk when while with with* with-decorator with-gensyms xi xor yield yield-from zero? zip zip-longest | |= ~"},l:a,cN:"name",b:a,starts:u},h=[m,o,c,d,n,p,l,r,s,i];return m.c=[e.C("comment",""),f,u],u.c=h,l.c=h,{aliases:["hylang"],i:/\S/,c:[{cN:"meta",b:"^#!",e:"$"},m,o,c,d,n,p,l,r,s]}});
+hljs.registerLanguage("parser3",function(e){var r=e.C("{","}",{c:["self"]});return{sL:"xml",relevance:0,c:[e.C("^#","$"),e.C("\\^rem{","}",{relevance:10,c:[r]}),{cN:"meta",b:"^@(?:BASE|USE|CLASS|OPTIONS)$",relevance:10},{cN:"title",b:"@[\\w\\-]+\\[[\\w^;\\-]*\\](?:\\[[\\w^;\\-]*\\])?(?:.*)$"},{cN:"variable",b:"\\$\\{?[\\w\\-\\.\\:]+\\}?"},{cN:"keyword",b:"\\^[\\w\\-\\.\\:]+"},{cN:"number",b:"\\^#[0-9a-fA-F]+"},e.CNM]}});
+hljs.registerLanguage("ocaml",function(e){return{aliases:["ml"],k:{keyword:"and as assert asr begin class constraint do done downto else end exception external for fun function functor if in include inherit! inherit initializer land lazy let lor lsl lsr lxor match method!|10 method mod module mutable new object of open! open or private rec sig struct then to try type val! val virtual when while with parser value",built_in:"array bool bytes char exn|5 float int int32 int64 list lazy_t|5 nativeint|5 string unit in_channel out_channel ref",literal:"true false"},i:/\/\/|>>/,l:"[a-z_]\\w*!?",c:[{cN:"literal",b:"\\[(\\|\\|)?\\]|\\(\\)",relevance:0},e.C("\\(\\*","\\*\\)",{c:["self"]}),{cN:"symbol",b:"'[A-Za-z_](?!')[\\w']*"},{cN:"type",b:"`[A-Z][\\w']*"},{cN:"type",b:"\\b[A-Z][\\w']*",relevance:0},{b:"[a-z_]\\w*'[\\w']*",relevance:0},e.inherit(e.ASM,{cN:"string",relevance:0}),e.inherit(e.QSM,{i:null}),{cN:"number",b:"\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",relevance:0},{b:/[-=]>/}]}});
+hljs.registerLanguage("gcode",function(N){var e=[N.CLCM,N.CBCM,N.C(/\(/,/\)/),N.inherit(N.CNM,{b:"([-+]?([0-9]*\\.?[0-9]+\\.?))|"+N.CNR}),N.inherit(N.ASM,{i:null}),N.inherit(N.QSM,{i:null}),{cN:"name",b:"([G])([0-9]+\\.?[0-9]?)"},{cN:"name",b:"([M])([0-9]+\\.?[0-9]?)"},{cN:"attr",b:"(VC|VS|#)",e:"(\\d+)"},{cN:"attr",b:"(VZOFX|VZOFY|VZOFZ)"},{cN:"built_in",b:"(ATAN|ABS|ACOS|ASIN|SIN|COS|EXP|FIX|FUP|ROUND|LN|TAN)(\\[)",e:"([-+]?([0-9]*\\.?[0-9]+\\.?))(\\])"},{cN:"symbol",v:[{b:"N",e:"\\d+",i:"\\W"}]}];return{aliases:["nc"],cI:!0,l:"[A-Z_][A-Z0-9_.]*",k:"IF DO WHILE ENDWHILE CALL ENDIF SUB ENDSUB GOTO REPEAT ENDREPEAT EQ LT GT NE GE LE OR XOR",c:[{cN:"meta",b:"\\%"},{cN:"meta",b:"([O])([0-9]+)"}].concat(e)}});
+hljs.registerLanguage("gauss",function(o){function e(e,t,a){var r=o.inherit({cN:"function",bK:e,e:t,eE:!0,c:[].concat(d)},a||{});return r.c.push(l),r.c.push(o.CNM),r.c.push(o.CBCM),r.c.push(n),r}var t={keyword:"bool break call callexe checkinterrupt clear clearg closeall cls comlog compile continue create debug declare delete disable dlibrary dllcall do dos ed edit else elseif enable end endfor endif endp endo errorlog errorlogat expr external fn for format goto gosub graph if keyword let lib library line load loadarray loadexe loadf loadk loadm loadp loads loadx local locate loopnextindex lprint lpwidth lshow matrix msym ndpclex new open output outwidth plot plotsym pop prcsn print printdos proc push retp return rndcon rndmod rndmult rndseed run save saveall screen scroll setarray show sparse stop string struct system trace trap threadfor threadendfor threadbegin threadjoin threadstat threadend until use while winprint ne ge le gt lt and xor or not eq eqv",built_in:"abs acf aconcat aeye amax amean AmericanBinomCall AmericanBinomCall_Greeks AmericanBinomCall_ImpVol AmericanBinomPut AmericanBinomPut_Greeks AmericanBinomPut_ImpVol AmericanBSCall AmericanBSCall_Greeks AmericanBSCall_ImpVol AmericanBSPut AmericanBSPut_Greeks AmericanBSPut_ImpVol amin amult annotationGetDefaults annotationSetBkd annotationSetFont annotationSetLineColor annotationSetLineStyle annotationSetLineThickness annualTradingDays arccos arcsin areshape arrayalloc arrayindex arrayinit arraytomat asciiload asclabel astd astds asum atan atan2 atranspose axmargin balance band bandchol bandcholsol bandltsol bandrv bandsolpd bar base10 begwind besselj bessely beta box boxcox cdfBeta cdfBetaInv cdfBinomial cdfBinomialInv cdfBvn cdfBvn2 cdfBvn2e cdfCauchy cdfCauchyInv cdfChic cdfChii cdfChinc cdfChincInv cdfExp cdfExpInv cdfFc cdfFnc cdfFncInv cdfGam cdfGenPareto cdfHyperGeo cdfLaplace cdfLaplaceInv cdfLogistic cdfLogisticInv cdfmControlCreate cdfMvn cdfMvn2e cdfMvnce cdfMvne cdfMvt2e cdfMvtce cdfMvte cdfN cdfN2 cdfNc cdfNegBinomial cdfNegBinomialInv cdfNi cdfPoisson cdfPoissonInv cdfRayleigh cdfRayleighInv cdfTc cdfTci cdfTnc cdfTvn cdfWeibull cdfWeibullInv cdir ceil ChangeDir chdir chiBarSquare chol choldn cholsol cholup chrs close code cols colsf combinate combinated complex con cond conj cons ConScore contour conv convertsatostr convertstrtosa corrm corrms corrvc corrx corrxs cos cosh counts countwts crossprd crout croutp csrcol csrlin csvReadM csvReadSA cumprodc cumsumc curve cvtos datacreate datacreatecomplex datalist dataload dataloop dataopen datasave date datestr datestring datestrymd dayinyr dayofweek dbAddDatabase dbClose dbCommit dbCreateQuery dbExecQuery dbGetConnectOptions dbGetDatabaseName dbGetDriverName dbGetDrivers dbGetHostName dbGetLastErrorNum dbGetLastErrorText dbGetNumericalPrecPolicy dbGetPassword dbGetPort dbGetTableHeaders dbGetTables dbGetUserName dbHasFeature dbIsDriverAvailable dbIsOpen dbIsOpenError dbOpen dbQueryBindValue dbQueryClear dbQueryCols dbQueryExecPrepared dbQueryFetchAllM dbQueryFetchAllSA dbQueryFetchOneM dbQueryFetchOneSA dbQueryFinish dbQueryGetBoundValue dbQueryGetBoundValues dbQueryGetField dbQueryGetLastErrorNum dbQueryGetLastErrorText dbQueryGetLastInsertID dbQueryGetLastQuery dbQueryGetPosition dbQueryIsActive dbQueryIsForwardOnly dbQueryIsNull dbQueryIsSelect dbQueryIsValid dbQueryPrepare dbQueryRows dbQuerySeek dbQuerySeekFirst dbQuerySeekLast dbQuerySeekNext dbQuerySeekPrevious dbQuerySetForwardOnly dbRemoveDatabase dbRollback dbSetConnectOptions dbSetDatabaseName dbSetHostName dbSetNumericalPrecPolicy dbSetPort dbSetUserName dbTransaction DeleteFile delif delrows denseToSp denseToSpRE denToZero design det detl dfft dffti diag diagrv digamma doswin DOSWinCloseall DOSWinOpen dotfeq dotfeqmt dotfge dotfgemt dotfgt dotfgtmt dotfle dotflemt dotflt dotfltmt dotfne dotfnemt draw drop dsCreate dstat dstatmt dstatmtControlCreate dtdate dtday dttime dttodtv dttostr dttoutc dtvnormal dtvtodt dtvtoutc dummy dummybr dummydn eig eigh eighv eigv elapsedTradingDays endwind envget eof eqSolve eqSolvemt eqSolvemtControlCreate eqSolvemtOutCreate eqSolveset erf erfc erfccplx erfcplx error etdays ethsec etstr EuropeanBinomCall EuropeanBinomCall_Greeks EuropeanBinomCall_ImpVol EuropeanBinomPut EuropeanBinomPut_Greeks EuropeanBinomPut_ImpVol EuropeanBSCall EuropeanBSCall_Greeks EuropeanBSCall_ImpVol EuropeanBSPut EuropeanBSPut_Greeks EuropeanBSPut_ImpVol exctsmpl exec execbg exp extern eye fcheckerr fclearerr feq feqmt fflush fft ffti fftm fftmi fftn fge fgemt fgets fgetsa fgetsat fgetst fgt fgtmt fileinfo filesa fle flemt floor flt fltmt fmod fne fnemt fonts fopen formatcv formatnv fputs fputst fseek fstrerror ftell ftocv ftos ftostrC gamma gammacplx gammaii gausset gdaAppend gdaCreate gdaDStat gdaDStatMat gdaGetIndex gdaGetName gdaGetNames gdaGetOrders gdaGetType gdaGetTypes gdaGetVarInfo gdaIsCplx gdaLoad gdaPack gdaRead gdaReadByIndex gdaReadSome gdaReadSparse gdaReadStruct gdaReportVarInfo gdaSave gdaUpdate gdaUpdateAndPack gdaVars gdaWrite gdaWrite32 gdaWriteSome getarray getdims getf getGAUSShome getmatrix getmatrix4D getname getnamef getNextTradingDay getNextWeekDay getnr getorders getpath getPreviousTradingDay getPreviousWeekDay getRow getscalar3D getscalar4D getTrRow getwind glm gradcplx gradMT gradMTm gradMTT gradMTTm gradp graphprt graphset hasimag header headermt hess hessMT hessMTg hessMTgw hessMTm hessMTmw hessMTT hessMTTg hessMTTgw hessMTTm hessMTw hessp hist histf histp hsec imag indcv indexcat indices indices2 indicesf indicesfn indnv indsav integrate1d integrateControlCreate intgrat2 intgrat3 inthp1 inthp2 inthp3 inthp4 inthpControlCreate intquad1 intquad2 intquad3 intrleav intrleavsa intrsect intsimp inv invpd invswp iscplx iscplxf isden isinfnanmiss ismiss key keyav keyw lag lag1 lagn lapEighb lapEighi lapEighvb lapEighvi lapgEig lapgEigh lapgEighv lapgEigv lapgSchur lapgSvdcst lapgSvds lapgSvdst lapSvdcusv lapSvds lapSvdusv ldlp ldlsol linSolve listwise ln lncdfbvn lncdfbvn2 lncdfmvn lncdfn lncdfn2 lncdfnc lnfact lngammacplx lnpdfmvn lnpdfmvt lnpdfn lnpdft loadd loadstruct loadwind loess loessmt loessmtControlCreate log loglog logx logy lower lowmat lowmat1 ltrisol lu lusol machEpsilon make makevars makewind margin matalloc matinit mattoarray maxbytes maxc maxindc maxv maxvec mbesselei mbesselei0 mbesselei1 mbesseli mbesseli0 mbesseli1 meanc median mergeby mergevar minc minindc minv miss missex missrv moment momentd movingave movingaveExpwgt movingaveWgt nextindex nextn nextnevn nextwind ntos null null1 numCombinations ols olsmt olsmtControlCreate olsqr olsqr2 olsqrmt ones optn optnevn orth outtyp pacf packedToSp packr parse pause pdfCauchy pdfChi pdfExp pdfGenPareto pdfHyperGeo pdfLaplace pdfLogistic pdfn pdfPoisson pdfRayleigh pdfWeibull pi pinv pinvmt plotAddArrow plotAddBar plotAddBox plotAddHist plotAddHistF plotAddHistP plotAddPolar plotAddScatter plotAddShape plotAddTextbox plotAddTS plotAddXY plotArea plotBar plotBox plotClearLayout plotContour plotCustomLayout plotGetDefaults plotHist plotHistF plotHistP plotLayout plotLogLog plotLogX plotLogY plotOpenWindow plotPolar plotSave plotScatter plotSetAxesPen plotSetBar plotSetBarFill plotSetBarStacked plotSetBkdColor plotSetFill plotSetGrid plotSetLegend plotSetLineColor plotSetLineStyle plotSetLineSymbol plotSetLineThickness plotSetNewWindow plotSetTitle plotSetWhichYAxis plotSetXAxisShow plotSetXLabel plotSetXRange plotSetXTicInterval plotSetXTicLabel plotSetYAxisShow plotSetYLabel plotSetYRange plotSetZAxisShow plotSetZLabel plotSurface plotTS plotXY polar polychar polyeval polygamma polyint polymake polymat polymroot polymult polyroot pqgwin previousindex princomp printfm printfmt prodc psi putarray putf putvals pvCreate pvGetIndex pvGetParNames pvGetParVector pvLength pvList pvPack pvPacki pvPackm pvPackmi pvPacks pvPacksi pvPacksm pvPacksmi pvPutParVector pvTest pvUnpack QNewton QNewtonmt QNewtonmtControlCreate QNewtonmtOutCreate QNewtonSet QProg QProgmt QProgmtInCreate qqr qqre qqrep qr qre qrep qrsol qrtsol qtyr qtyre qtyrep quantile quantiled qyr qyre qyrep qz rank rankindx readr real reclassify reclassifyCuts recode recserar recsercp recserrc rerun rescale reshape rets rev rfft rffti rfftip rfftn rfftnp rfftp rndBernoulli rndBeta rndBinomial rndCauchy rndChiSquare rndCon rndCreateState rndExp rndGamma rndGeo rndGumbel rndHyperGeo rndi rndKMbeta rndKMgam rndKMi rndKMn rndKMnb rndKMp rndKMu rndKMvm rndLaplace rndLCbeta rndLCgam rndLCi rndLCn rndLCnb rndLCp rndLCu rndLCvm rndLogNorm rndMTu rndMVn rndMVt rndn rndnb rndNegBinomial rndp rndPoisson rndRayleigh rndStateSkip rndu rndvm rndWeibull rndWishart rotater round rows rowsf rref sampleData satostrC saved saveStruct savewind scale scale3d scalerr scalinfnanmiss scalmiss schtoc schur searchsourcepath seekr select selif seqa seqm setdif setdifsa setvars setvwrmode setwind shell shiftr sin singleindex sinh sleep solpd sortc sortcc sortd sorthc sorthcc sortind sortindc sortmc sortr sortrc spBiconjGradSol spChol spConjGradSol spCreate spDenseSubmat spDiagRvMat spEigv spEye spLDL spline spLU spNumNZE spOnes spreadSheetReadM spreadSheetReadSA spreadSheetWrite spScale spSubmat spToDense spTrTDense spTScalar spZeros sqpSolve sqpSolveMT sqpSolveMTControlCreate sqpSolveMTlagrangeCreate sqpSolveMToutCreate sqpSolveSet sqrt statements stdc stdsc stocv stof strcombine strindx strlen strput strrindx strsect strsplit strsplitPad strtodt strtof strtofcplx strtriml strtrimr strtrunc strtruncl strtruncpad strtruncr submat subscat substute subvec sumc sumr surface svd svd1 svd2 svdcusv svds svdusv sysstate tab tan tanh tempname time timedt timestr timeutc title tkf2eps tkf2ps tocart todaydt toeplitz token topolar trapchk trigamma trimr trunc type typecv typef union unionsa uniqindx uniqindxsa unique uniquesa upmat upmat1 upper utctodt utctodtv utrisol vals varCovMS varCovXS varget vargetl varmall varmares varput varputl vartypef vcm vcms vcx vcxs vec vech vecr vector vget view viewxyz vlist vnamecv volume vput vread vtypecv wait waitc walkindex where window writer xlabel xlsGetSheetCount xlsGetSheetSize xlsGetSheetTypes xlsMakeRange xlsReadM xlsReadSA xlsWrite xlsWriteM xlsWriteSA xpnd xtics xy xyz ylabel ytics zeros zeta zlabel ztics cdfEmpirical dot h5create h5open h5read h5readAttribute h5write h5writeAttribute ldl plotAddErrorBar plotAddSurface plotCDFEmpirical plotSetColormap plotSetContourLabels plotSetLegendFont plotSetTextInterpreter plotSetXTicCount plotSetYTicCount plotSetZLevels powerm strjoin sylvester strtrim",literal:"DB_AFTER_LAST_ROW DB_ALL_TABLES DB_BATCH_OPERATIONS DB_BEFORE_FIRST_ROW DB_BLOB DB_EVENT_NOTIFICATIONS DB_FINISH_QUERY DB_HIGH_PRECISION DB_LAST_INSERT_ID DB_LOW_PRECISION_DOUBLE DB_LOW_PRECISION_INT32 DB_LOW_PRECISION_INT64 DB_LOW_PRECISION_NUMBERS DB_MULTIPLE_RESULT_SETS DB_NAMED_PLACEHOLDERS DB_POSITIONAL_PLACEHOLDERS DB_PREPARED_QUERIES DB_QUERY_SIZE DB_SIMPLE_LOCKING DB_SYSTEM_TABLES DB_TABLES DB_TRANSACTIONS DB_UNICODE DB_VIEWS __STDIN __STDOUT __STDERR __FILE_DIR"},n=o.C("@","@"),a={cN:"meta",b:"#",e:"$",k:{"meta-keyword":"define definecs|10 undef ifdef ifndef iflight ifdllcall ifmac ifos2win ifunix else endif lineson linesoff srcfile srcline"},c:[{b:/\\\n/,relevance:0},{bK:"include",e:"$",k:{"meta-keyword":"include"},c:[{cN:"meta-string",b:'"',e:'"',i:"\\n"}]},o.CLCM,o.CBCM,n]},r={b:/\bstruct\s+/,e:/\s/,k:"struct",c:[{cN:"type",b:o.UIR,relevance:0}]},d=[{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,eW:!0,relevance:0,c:[{cN:"literal",b:/\.\.\./},o.CNM,o.CBCM,n,r]}],l={cN:"title",b:o.UIR,relevance:0},s={cN:"built_in",b:"\\b("+t.built_in.split(" ").join("|")+")\\b"},i={cN:"string",b:'"',e:'"',c:[o.BE],relevance:0},c={b:o.UIR+"\\s*\\(",rB:!0,k:t,relevance:0,c:[{bK:t.keyword},s,{cN:"built_in",b:o.UIR,relevance:0}]},p={b:/\(/,e:/\)/,relevance:0,k:{built_in:t.built_in,literal:t.literal},c:[o.CNM,o.CBCM,n,s,c,i,"self"]};return c.c.push(p),{aliases:["gss"],cI:!0,k:t,i:/(\{[%#]|[%#]\}| <- )/,c:[o.CNM,o.CLCM,o.CBCM,n,i,a,{cN:"keyword",b:/\bexternal (matrix|string|array|sparse matrix|struct|proc|keyword|fn)/},e("proc keyword",";"),e("fn","="),{bK:"for threadfor",e:/;/,relevance:0,c:[o.CBCM,n,p]},{v:[{b:o.UIR+"\\."+o.UIR},{b:o.UIR+"\\s*="}],relevance:0},c,r]}});
+hljs.registerLanguage("step21",function(e){return{aliases:["p21","step","stp"],cI:!0,l:"[A-Z_][A-Z0-9_.]*",k:{keyword:"HEADER ENDSEC DATA"},c:[{cN:"meta",b:"ISO-10303-21;",relevance:10},{cN:"meta",b:"END-ISO-10303-21;",relevance:10},e.CLCM,e.CBCM,e.C("/\\*\\*!","\\*/"),e.CNM,e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null}),{cN:"string",b:"'",e:"'"},{cN:"symbol",v:[{b:"#",e:"\\d+",i:"\\W"}]}]}});
+hljs.registerLanguage("coffeescript",function(e){var c={keyword:"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger super yield import export from as default await then unless until loop of by when and or is isnt not",literal:"true false null undefined yes no on off",built_in:"npm require console print module global window document"},n="[A-Za-z$_][0-9A-Za-z$_]*",r={cN:"subst",b:/#\{/,e:/}/,k:c},i=[e.BNM,e.inherit(e.CNM,{starts:{e:"(\\s*/)?",relevance:0}}),{cN:"string",v:[{b:/'''/,e:/'''/,c:[e.BE]},{b:/'/,e:/'/,c:[e.BE]},{b:/"""/,e:/"""/,c:[e.BE,r]},{b:/"/,e:/"/,c:[e.BE,r]}]},{cN:"regexp",v:[{b:"///",e:"///",c:[r,e.HCM]},{b:"//[gim]{0,3}(?=\\W)",relevance:0},{b:/\/(?![ *]).*?(?![\\]).\/[gim]{0,3}(?=\W)/}]},{b:"@"+n},{sL:"javascript",eB:!0,eE:!0,v:[{b:"```",e:"```"},{b:"`",e:"`"}]}];r.c=i;var s=e.inherit(e.TM,{b:n}),t="(\\(.*\\))?\\s*\\B[-=]>",a={cN:"params",b:"\\([^\\(]",rB:!0,c:[{b:/\(/,e:/\)/,k:c,c:["self"].concat(i)}]};return{aliases:["coffee","cson","iced"],k:c,i:/\/\*/,c:i.concat([e.C("###","###"),e.HCM,{cN:"function",b:"^\\s*"+n+"\\s*=\\s*"+t,e:"[-=]>",rB:!0,c:[s,a]},{b:/[:\(,=]\s*/,relevance:0,c:[{cN:"function",b:t,e:"[-=]>",rB:!0,c:[a]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[s]},s]},{b:n+":",e:":",rB:!0,rE:!0,relevance:0}])}});
+hljs.registerLanguage("plaintext",function(e){return{disableAutodetect:!0}});
+hljs.registerLanguage("ruby",function(e){var c="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",b={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},r={cN:"doctag",b:"@[A-Za-z]+"},a={b:"#<",e:">"},n=[e.C("#","$",{c:[r]}),e.C("^\\=begin","^\\=end",{c:[r],relevance:10}),e.C("^__END__","\\n$")],s={cN:"subst",b:"#\\{",e:"}",k:b},t={cN:"string",c:[e.BE,s],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[qQwWx]?\\(",e:"\\)"},{b:"%[qQwWx]?\\[",e:"\\]"},{b:"%[qQwWx]?{",e:"}"},{b:"%[qQwWx]?<",e:">"},{b:"%[qQwWx]?/",e:"/"},{b:"%[qQwWx]?%",e:"%"},{b:"%[qQwWx]?-",e:"-"},{b:"%[qQwWx]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{b:/<<[-~]?'?(\w+)(?:.|\n)*?\n\s*\1\b/,rB:!0,c:[{b:/<<[-~]?'?/},{b:/\w+/,endSameAsBegin:!0,c:[e.BE,s]}]}]},i={cN:"params",b:"\\(",e:"\\)",endsParent:!0,k:b},l=[t,a,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{b:"<\\s*",c:[{b:"("+e.IR+"::)?"+e.IR}]}].concat(n)},{cN:"function",bK:"def",e:"$|;",c:[e.inherit(e.TM,{b:c}),i].concat(n)},{b:e.IR+"::"},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",relevance:0},{cN:"symbol",b:":(?!\\s)",c:[t,{b:c}],relevance:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{cN:"params",b:/\|/,e:/\|/,k:b},{b:"("+e.RSR+"|unless)\\s*",k:"unless",c:[a,{cN:"regexp",c:[e.BE,s],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}].concat(n),relevance:0}].concat(n);s.c=l;var d=[{b:/^\s*=>/,starts:{e:"$",c:i.c=l}},{cN:"meta",b:"^([>?]>|[\\w#]+\\(\\w+\\):\\d+:\\d+>|(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>)",starts:{e:"$",c:l}}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:b,i:/\/\*/,c:n.concat(d).concat(l)}});
+hljs.registerLanguage("json",function(e){var i={literal:"true false null"},n=[e.CLCM,e.CBCM],c=[e.QSM,e.CNM],r={e:",",eW:!0,eE:!0,c:c,k:i},t={b:"{",e:"}",c:[{cN:"attr",b:/"/,e:/"/,c:[e.BE],i:"\\n"},e.inherit(r,{b:/:/})].concat(n),i:"\\S"},a={b:"\\[",e:"\\]",c:[e.inherit(r)],i:"\\S"};return c.push(t,a),n.forEach(function(e){c.push(e)}),{c:c,k:i,i:"\\S"}});
+hljs.registerLanguage("java",function(e){var a="false synchronized int abstract float private char boolean var static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports do",t={cN:"number",b:"\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",relevance:0};return{aliases:["jsp"],k:a,i:/<\/|#/,c:[e.C("/\\*\\*","\\*/",{relevance:0,c:[{b:/\w+@/,relevance:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,e.ASM,e.QSM,{cN:"class",bK:"class interface",e:/[{;=]/,eE:!0,k:"class interface",i:/[:"\[\]]/,c:[{bK:"extends implements"},e.UTM]},{bK:"new throw return else",relevance:0},{cN:"function",b:"([À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(<[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(\\s*,\\s*[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*)*>)?\\s+)+"+e.UIR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:a,c:[{b:e.UIR+"\\s*\\(",rB:!0,relevance:0,c:[e.UTM]},{cN:"params",b:/\(/,e:/\)/,k:a,relevance:0,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]},t,{cN:"meta",b:"@[A-Za-z]+"}]}});
+hljs.registerLanguage("glsl",function(e){return{k:{keyword:"break continue discard do else for if return while switch case default attribute binding buffer ccw centroid centroid varying coherent column_major const cw depth_any depth_greater depth_less depth_unchanged early_fragment_tests equal_spacing flat fractional_even_spacing fractional_odd_spacing highp in index inout invariant invocations isolines layout line_strip lines lines_adjacency local_size_x local_size_y local_size_z location lowp max_vertices mediump noperspective offset origin_upper_left out packed patch pixel_center_integer point_mode points precise precision quads r11f_g11f_b10f r16 r16_snorm r16f r16i r16ui r32f r32i r32ui r8 r8_snorm r8i r8ui readonly restrict rg16 rg16_snorm rg16f rg16i rg16ui rg32f rg32i rg32ui rg8 rg8_snorm rg8i rg8ui rgb10_a2 rgb10_a2ui rgba16 rgba16_snorm rgba16f rgba16i rgba16ui rgba32f rgba32i rgba32ui rgba8 rgba8_snorm rgba8i rgba8ui row_major sample shared smooth std140 std430 stream triangle_strip triangles triangles_adjacency uniform varying vertices volatile writeonly",type:"atomic_uint bool bvec2 bvec3 bvec4 dmat2 dmat2x2 dmat2x3 dmat2x4 dmat3 dmat3x2 dmat3x3 dmat3x4 dmat4 dmat4x2 dmat4x3 dmat4x4 double dvec2 dvec3 dvec4 float iimage1D iimage1DArray iimage2D iimage2DArray iimage2DMS iimage2DMSArray iimage2DRect iimage3D iimageBufferiimageCube iimageCubeArray image1D image1DArray image2D image2DArray image2DMS image2DMSArray image2DRect image3D imageBuffer imageCube imageCubeArray int isampler1D isampler1DArray isampler2D isampler2DArray isampler2DMS isampler2DMSArray isampler2DRect isampler3D isamplerBuffer isamplerCube isamplerCubeArray ivec2 ivec3 ivec4 mat2 mat2x2 mat2x3 mat2x4 mat3 mat3x2 mat3x3 mat3x4 mat4 mat4x2 mat4x3 mat4x4 sampler1D sampler1DArray sampler1DArrayShadow sampler1DShadow sampler2D sampler2DArray sampler2DArrayShadow sampler2DMS sampler2DMSArray sampler2DRect sampler2DRectShadow sampler2DShadow sampler3D samplerBuffer samplerCube samplerCubeArray samplerCubeArrayShadow samplerCubeShadow image1D uimage1DArray uimage2D uimage2DArray uimage2DMS uimage2DMSArray uimage2DRect uimage3D uimageBuffer uimageCube uimageCubeArray uint usampler1D usampler1DArray usampler2D usampler2DArray usampler2DMS usampler2DMSArray usampler2DRect usampler3D samplerBuffer usamplerCube usamplerCubeArray uvec2 uvec3 uvec4 vec2 vec3 vec4 void",built_in:"gl_MaxAtomicCounterBindings gl_MaxAtomicCounterBufferSize gl_MaxClipDistances gl_MaxClipPlanes gl_MaxCombinedAtomicCounterBuffers gl_MaxCombinedAtomicCounters gl_MaxCombinedImageUniforms gl_MaxCombinedImageUnitsAndFragmentOutputs gl_MaxCombinedTextureImageUnits gl_MaxComputeAtomicCounterBuffers gl_MaxComputeAtomicCounters gl_MaxComputeImageUniforms gl_MaxComputeTextureImageUnits gl_MaxComputeUniformComponents gl_MaxComputeWorkGroupCount gl_MaxComputeWorkGroupSize gl_MaxDrawBuffers gl_MaxFragmentAtomicCounterBuffers gl_MaxFragmentAtomicCounters gl_MaxFragmentImageUniforms gl_MaxFragmentInputComponents gl_MaxFragmentInputVectors gl_MaxFragmentUniformComponents gl_MaxFragmentUniformVectors gl_MaxGeometryAtomicCounterBuffers gl_MaxGeometryAtomicCounters gl_MaxGeometryImageUniforms gl_MaxGeometryInputComponents gl_MaxGeometryOutputComponents gl_MaxGeometryOutputVertices gl_MaxGeometryTextureImageUnits gl_MaxGeometryTotalOutputComponents gl_MaxGeometryUniformComponents gl_MaxGeometryVaryingComponents gl_MaxImageSamples gl_MaxImageUnits gl_MaxLights gl_MaxPatchVertices gl_MaxProgramTexelOffset gl_MaxTessControlAtomicCounterBuffers gl_MaxTessControlAtomicCounters gl_MaxTessControlImageUniforms gl_MaxTessControlInputComponents gl_MaxTessControlOutputComponents gl_MaxTessControlTextureImageUnits gl_MaxTessControlTotalOutputComponents gl_MaxTessControlUniformComponents gl_MaxTessEvaluationAtomicCounterBuffers gl_MaxTessEvaluationAtomicCounters gl_MaxTessEvaluationImageUniforms gl_MaxTessEvaluationInputComponents gl_MaxTessEvaluationOutputComponents gl_MaxTessEvaluationTextureImageUnits gl_MaxTessEvaluationUniformComponents gl_MaxTessGenLevel gl_MaxTessPatchComponents gl_MaxTextureCoords gl_MaxTextureImageUnits gl_MaxTextureUnits gl_MaxVaryingComponents gl_MaxVaryingFloats gl_MaxVaryingVectors gl_MaxVertexAtomicCounterBuffers gl_MaxVertexAtomicCounters gl_MaxVertexAttribs gl_MaxVertexImageUniforms gl_MaxVertexOutputComponents gl_MaxVertexOutputVectors gl_MaxVertexTextureImageUnits gl_MaxVertexUniformComponents gl_MaxVertexUniformVectors gl_MaxViewports gl_MinProgramTexelOffset gl_BackColor gl_BackLightModelProduct gl_BackLightProduct gl_BackMaterial gl_BackSecondaryColor gl_ClipDistance gl_ClipPlane gl_ClipVertex gl_Color gl_DepthRange gl_EyePlaneQ gl_EyePlaneR gl_EyePlaneS gl_EyePlaneT gl_Fog gl_FogCoord gl_FogFragCoord gl_FragColor gl_FragCoord gl_FragData gl_FragDepth gl_FrontColor gl_FrontFacing gl_FrontLightModelProduct gl_FrontLightProduct gl_FrontMaterial gl_FrontSecondaryColor gl_GlobalInvocationID gl_InstanceID gl_InvocationID gl_Layer gl_LightModel gl_LightSource gl_LocalInvocationID gl_LocalInvocationIndex gl_ModelViewMatrix gl_ModelViewMatrixInverse gl_ModelViewMatrixInverseTranspose gl_ModelViewMatrixTranspose gl_ModelViewProjectionMatrix gl_ModelViewProjectionMatrixInverse gl_ModelViewProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixTranspose gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_Normal gl_NormalMatrix gl_NormalScale gl_NumSamples gl_NumWorkGroups gl_ObjectPlaneQ gl_ObjectPlaneR gl_ObjectPlaneS gl_ObjectPlaneT gl_PatchVerticesIn gl_Point gl_PointCoord gl_PointSize gl_Position gl_PrimitiveID gl_PrimitiveIDIn gl_ProjectionMatrix gl_ProjectionMatrixInverse gl_ProjectionMatrixInverseTranspose gl_ProjectionMatrixTranspose gl_SampleID gl_SampleMask gl_SampleMaskIn gl_SamplePosition gl_SecondaryColor gl_TessCoord gl_TessLevelInner gl_TessLevelOuter gl_TexCoord gl_TextureEnvColor gl_TextureMatrix gl_TextureMatrixInverse gl_TextureMatrixInverseTranspose gl_TextureMatrixTranspose gl_Vertex gl_VertexID gl_ViewportIndex gl_WorkGroupID gl_WorkGroupSize gl_in gl_out EmitStreamVertex EmitVertex EndPrimitive EndStreamPrimitive abs acos acosh all any asin asinh atan atanh atomicAdd atomicAnd atomicCompSwap atomicCounter atomicCounterDecrement atomicCounterIncrement atomicExchange atomicMax atomicMin atomicOr atomicXor barrier bitCount bitfieldExtract bitfieldInsert bitfieldReverse ceil clamp cos cosh cross dFdx dFdy degrees determinant distance dot equal exp exp2 faceforward findLSB findMSB floatBitsToInt floatBitsToUint floor fma fract frexp ftransform fwidth greaterThan greaterThanEqual groupMemoryBarrier imageAtomicAdd imageAtomicAnd imageAtomicCompSwap imageAtomicExchange imageAtomicMax imageAtomicMin imageAtomicOr imageAtomicXor imageLoad imageSize imageStore imulExtended intBitsToFloat interpolateAtCentroid interpolateAtOffset interpolateAtSample inverse inversesqrt isinf isnan ldexp length lessThan lessThanEqual log log2 matrixCompMult max memoryBarrier memoryBarrierAtomicCounter memoryBarrierBuffer memoryBarrierImage memoryBarrierShared min mix mod modf noise1 noise2 noise3 noise4 normalize not notEqual outerProduct packDouble2x32 packHalf2x16 packSnorm2x16 packSnorm4x8 packUnorm2x16 packUnorm4x8 pow radians reflect refract round roundEven shadow1D shadow1DLod shadow1DProj shadow1DProjLod shadow2D shadow2DLod shadow2DProj shadow2DProjLod sign sin sinh smoothstep sqrt step tan tanh texelFetch texelFetchOffset texture texture1D texture1DLod texture1DProj texture1DProjLod texture2D texture2DLod texture2DProj texture2DProjLod texture3D texture3DLod texture3DProj texture3DProjLod textureCube textureCubeLod textureGather textureGatherOffset textureGatherOffsets textureGrad textureGradOffset textureLod textureLodOffset textureOffset textureProj textureProjGrad textureProjGradOffset textureProjLod textureProjLodOffset textureProjOffset textureQueryLevels textureQueryLod textureSize transpose trunc uaddCarry uintBitsToFloat umulExtended unpackDouble2x32 unpackHalf2x16 unpackSnorm2x16 unpackSnorm4x8 unpackUnorm2x16 unpackUnorm4x8 usubBorrow",literal:"true false"},i:'"',c:[e.CLCM,e.CBCM,e.CNM,{cN:"meta",b:"#",e:"$"}]}});
+hljs.registerLanguage("protobuf",function(e){return{k:{keyword:"package import option optional required repeated group oneof",built_in:"double float int32 int64 uint32 uint64 sint32 sint64 fixed32 fixed64 sfixed32 sfixed64 bool string bytes",literal:"true false"},c:[e.QSM,e.NM,e.CLCM,{cN:"class",bK:"message enum service",e:/\{/,i:/\n/,c:[e.inherit(e.TM,{starts:{eW:!0,eE:!0}})]},{cN:"function",bK:"rpc",e:/;/,eE:!0,k:"rpc returns"},{b:/^\s*[A-Z_]+/,e:/\s*=/,eE:!0}]}});
+hljs.registerLanguage("cmake",function(e){return{aliases:["cmake.in"],cI:!0,k:{keyword:"break cmake_host_system_information cmake_minimum_required cmake_parse_arguments cmake_policy configure_file continue elseif else endforeach endfunction endif endmacro endwhile execute_process file find_file find_library find_package find_path find_program foreach function get_cmake_property get_directory_property get_filename_component get_property if include include_guard list macro mark_as_advanced math message option return separate_arguments set_directory_properties set_property set site_name string unset variable_watch while add_compile_definitions add_compile_options add_custom_command add_custom_target add_definitions add_dependencies add_executable add_library add_link_options add_subdirectory add_test aux_source_directory build_command create_test_sourcelist define_property enable_language enable_testing export fltk_wrap_ui get_source_file_property get_target_property get_test_property include_directories include_external_msproject include_regular_expression install link_directories link_libraries load_cache project qt_wrap_cpp qt_wrap_ui remove_definitions set_source_files_properties set_target_properties set_tests_properties source_group target_compile_definitions target_compile_features target_compile_options target_include_directories target_link_directories target_link_libraries target_link_options target_sources try_compile try_run ctest_build ctest_configure ctest_coverage ctest_empty_binary_directory ctest_memcheck ctest_read_custom_files ctest_run_script ctest_sleep ctest_start ctest_submit ctest_test ctest_update ctest_upload build_name exec_program export_library_dependencies install_files install_programs install_targets load_command make_directory output_required_files remove subdir_depends subdirs use_mangled_mesa utility_source variable_requires write_file qt5_use_modules qt5_use_package qt5_wrap_cpp on off true false and or not command policy target test exists is_newer_than is_directory is_symlink is_absolute matches less greater equal less_equal greater_equal strless strgreater strequal strless_equal strgreater_equal version_less version_greater version_equal version_less_equal version_greater_equal in_list defined"},c:[{cN:"variable",b:"\\${",e:"}"},e.HCM,e.QSM,e.NM]}});
+hljs.registerLanguage("r",function(e){var r="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";return{c:[e.HCM,{b:r,l:r,k:{keyword:"function if in break next repeat else for return switch while try tryCatch stop warning require library attach detach source setMethod setGeneric setGroupGeneric setClass ...",literal:"NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10"},relevance:0},{cN:"number",b:"0[xX][0-9a-fA-F]+[Li]?\\b",relevance:0},{cN:"number",b:"\\d+(?:[eE][+\\-]?\\d*)?L\\b",relevance:0},{cN:"number",b:"\\d+\\.(?!\\d)(?:i\\b)?",relevance:0},{cN:"number",b:"\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{cN:"number",b:"\\.\\d+(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{b:"`",e:"`",relevance:0},{cN:"string",c:[e.BE],v:[{b:'"',e:'"'},{b:"'",e:"'"}]}]}});
+hljs.registerLanguage("vala",function(e){return{k:{keyword:"char uchar unichar int uint long ulong short ushort int8 int16 int32 int64 uint8 uint16 uint32 uint64 float double bool struct enum string void weak unowned owned async signal static abstract interface override virtual delegate if while do for foreach else switch case break default return try catch public private protected internal using new this get set const stdout stdin stderr var",built_in:"DBus GLib CCode Gee Object Gtk Posix",literal:"false true null"},c:[{cN:"class",bK:"class interface namespace",e:"{",eE:!0,i:"[^,:\\n\\s\\.]",c:[e.UTM]},e.CLCM,e.CBCM,{cN:"string",b:'"""',e:'"""',relevance:5},e.ASM,e.QSM,e.CNM,{cN:"meta",b:"^#",e:"$",relevance:2}]}});
+hljs.registerLanguage("vhdl",function(e){return{cI:!0,k:{keyword:"abs access after alias all and architecture array assert assume assume_guarantee attribute begin block body buffer bus case component configuration constant context cover disconnect downto default else elsif end entity exit fairness file for force function generate generic group guarded if impure in inertial inout is label library linkage literal loop map mod nand new next nor not null of on open or others out package parameter port postponed procedure process property protected pure range record register reject release rem report restrict restrict_guarantee return rol ror select sequence severity shared signal sla sll sra srl strong subtype then to transport type unaffected units until use variable view vmode vprop vunit wait when while with xnor xor",built_in:"boolean bit character integer time delay_length natural positive string bit_vector file_open_kind file_open_status std_logic std_logic_vector unsigned signed boolean_vector integer_vector std_ulogic std_ulogic_vector unresolved_unsigned u_unsigned unresolved_signed u_signed real_vector time_vector",literal:"false true note warning error failure line text side width"},i:"{",c:[e.CBCM,e.C("--","$"),e.QSM,{cN:"number",b:"\\b(\\d(_|\\d)*#\\w+(\\.\\w+)?#([eE][-+]?\\d(_|\\d)*)?|\\d(_|\\d)*(\\.\\d(_|\\d)*)?([eE][-+]?\\d(_|\\d)*)?)",relevance:0},{cN:"string",b:"'(U|X|0|1|Z|W|L|H|-)'",c:[e.BE]},{cN:"symbol",b:"'[A-Za-z](_?[A-Za-z0-9])*",c:[e.BE]}]}});
+hljs.registerLanguage("thrift",function(e){var t="bool byte i16 i32 i64 double string binary";return{k:{keyword:"namespace const typedef struct enum service exception void oneway set list map required optional",built_in:t,literal:"true false"},c:[e.QSM,e.NM,e.CLCM,e.CBCM,{cN:"class",bK:"struct enum service exception",e:/\{/,i:/\n/,c:[e.inherit(e.TM,{starts:{eW:!0,eE:!0}})]},{b:"\\b(set|list|map)\\s*<",e:">",k:t,c:["self"]}]}});
+hljs.registerLanguage("cs",function(e){var a={keyword:"abstract as base bool break byte case catch char checked const continue decimal default delegate do double enum event explicit extern finally fixed float for foreach goto if implicit in int interface internal is lock long object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this try typeof uint ulong unchecked unsafe ushort using virtual void volatile while add alias ascending async await by descending dynamic equals from get global group into join let nameof on orderby partial remove select set value var when where yield",literal:"null false true"},i={cN:"number",v:[{b:"\\b(0b[01']+)"},{b:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{b:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},c={cN:"string",b:'@"',e:'"',c:[{b:'""'}]},r=e.inherit(c,{i:/\n/}),n={cN:"subst",b:"{",e:"}",k:a},t=e.inherit(n,{i:/\n/}),s={cN:"string",b:/\$"/,e:'"',i:/\n/,c:[{b:"{{"},{b:"}}"},e.BE,t]},l={cN:"string",b:/\$@"/,e:'"',c:[{b:"{{"},{b:"}}"},{b:'""'},n]},b=e.inherit(l,{i:/\n/,c:[{b:"{{"},{b:"}}"},{b:'""'},t]});n.c=[l,s,c,e.ASM,e.QSM,i,e.CBCM],t.c=[b,s,r,e.ASM,e.QSM,i,e.inherit(e.CBCM,{i:/\n/})];var o={v:[l,s,c,e.ASM,e.QSM]},d=e.IR+"(<"+e.IR+"(\\s*,\\s*"+e.IR+")*>)?(\\[\\])?";return{aliases:["csharp","c#"],k:a,i:/::/,c:[e.C("///","$",{rB:!0,c:[{cN:"doctag",v:[{b:"///",relevance:0},{b:"\x3c!--|--\x3e"},{b:"</?",e:">"}]}]}),e.CLCM,e.CBCM,{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum"}},o,i,{bK:"class interface",e:/[{;=]/,i:/[^\s:,]/,c:[e.TM,e.CLCM,e.CBCM]},{bK:"namespace",e:/[{;=]/,i:/[^\s:]/,c:[e.inherit(e.TM,{b:"[a-zA-Z](\\.?\\w)*"}),e.CLCM,e.CBCM]},{cN:"meta",b:"^\\s*\\[",eB:!0,e:"\\]",eE:!0,c:[{cN:"meta-string",b:/"/,e:/"/}]},{bK:"new return throw await else",relevance:0},{cN:"function",b:"("+d+"\\s+)+"+e.IR+"\\s*\\(",rB:!0,e:/\s*[{;=]/,eE:!0,k:a,c:[{b:e.IR+"\\s*\\(",rB:!0,c:[e.TM],relevance:0},{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:a,relevance:0,c:[o,i,e.CBCM]},e.CLCM,e.CBCM]}]}});
+hljs.registerLanguage("vim",function(e){return{l:/[!#@\w]+/,k:{keyword:"N|0 P|0 X|0 a|0 ab abc abo al am an|0 ar arga argd arge argdo argg argl argu as au aug aun b|0 bN ba bad bd be bel bf bl bm bn bo bp br brea breaka breakd breakl bro bufdo buffers bun bw c|0 cN cNf ca cabc caddb cad caddf cal cat cb cc ccl cd ce cex cf cfir cgetb cgete cg changes chd che checkt cl cla clo cm cmapc cme cn cnew cnf cno cnorea cnoreme co col colo com comc comp con conf cope cp cpf cq cr cs cst cu cuna cunme cw delm deb debugg delc delf dif diffg diffo diffp diffpu diffs diffthis dig di dl dell dj dli do doautoa dp dr ds dsp e|0 ea ec echoe echoh echom echon el elsei em en endfo endf endt endw ene ex exe exi exu f|0 files filet fin fina fini fir fix fo foldc foldd folddoc foldo for fu go gr grepa gu gv ha helpf helpg helpt hi hid his ia iabc if ij il im imapc ime ino inorea inoreme int is isp iu iuna iunme j|0 ju k|0 keepa kee keepj lN lNf l|0 lad laddb laddf la lan lat lb lc lch lcl lcs le lefta let lex lf lfir lgetb lgete lg lgr lgrepa lh ll lla lli lmak lm lmapc lne lnew lnf ln loadk lo loc lockv lol lope lp lpf lr ls lt lu lua luad luaf lv lvimgrepa lw m|0 ma mak map mapc marks mat me menut mes mk mks mksp mkv mkvie mod mz mzf nbc nb nbs new nm nmapc nme nn nnoreme noa no noh norea noreme norm nu nun nunme ol o|0 om omapc ome on ono onoreme opt ou ounme ow p|0 profd prof pro promptr pc ped pe perld po popu pp pre prev ps pt ptN ptf ptj ptl ptn ptp ptr pts pu pw py3 python3 py3d py3f py pyd pyf quita qa rec red redi redr redraws reg res ret retu rew ri rightb rub rubyd rubyf rund ru rv sN san sa sal sav sb sbN sba sbf sbl sbm sbn sbp sbr scrip scripte scs se setf setg setl sf sfir sh sim sig sil sl sla sm smap smapc sme sn sni sno snor snoreme sor so spelld spe spelli spellr spellu spellw sp spr sre st sta startg startr star stopi stj sts sun sunm sunme sus sv sw sy synti sync tN tabN tabc tabdo tabe tabf tabfir tabl tabm tabnew tabn tabo tabp tabr tabs tab ta tags tc tcld tclf te tf th tj tl tm tn to tp tr try ts tu u|0 undoj undol una unh unl unlo unm unme uns up ve verb vert vim vimgrepa vi viu vie vm vmapc vme vne vn vnoreme vs vu vunme windo w|0 wN wa wh wi winc winp wn wp wq wqa ws wu wv x|0 xa xmapc xm xme xn xnoreme xu xunme y|0 z|0 ~ Next Print append abbreviate abclear aboveleft all amenu anoremenu args argadd argdelete argedit argglobal arglocal argument ascii autocmd augroup aunmenu buffer bNext ball badd bdelete behave belowright bfirst blast bmodified bnext botright bprevious brewind break breakadd breakdel breaklist browse bunload bwipeout change cNext cNfile cabbrev cabclear caddbuffer caddexpr caddfile call catch cbuffer cclose center cexpr cfile cfirst cgetbuffer cgetexpr cgetfile chdir checkpath checktime clist clast close cmap cmapclear cmenu cnext cnewer cnfile cnoremap cnoreabbrev cnoremenu copy colder colorscheme command comclear compiler continue confirm copen cprevious cpfile cquit crewind cscope cstag cunmap cunabbrev cunmenu cwindow delete delmarks debug debuggreedy delcommand delfunction diffupdate diffget diffoff diffpatch diffput diffsplit digraphs display deletel djump dlist doautocmd doautoall deletep drop dsearch dsplit edit earlier echo echoerr echohl echomsg else elseif emenu endif endfor endfunction endtry endwhile enew execute exit exusage file filetype find finally finish first fixdel fold foldclose folddoopen folddoclosed foldopen function global goto grep grepadd gui gvim hardcopy help helpfind helpgrep helptags highlight hide history insert iabbrev iabclear ijump ilist imap imapclear imenu inoremap inoreabbrev inoremenu intro isearch isplit iunmap iunabbrev iunmenu join jumps keepalt keepmarks keepjumps lNext lNfile list laddexpr laddbuffer laddfile last language later lbuffer lcd lchdir lclose lcscope left leftabove lexpr lfile lfirst lgetbuffer lgetexpr lgetfile lgrep lgrepadd lhelpgrep llast llist lmake lmap lmapclear lnext lnewer lnfile lnoremap loadkeymap loadview lockmarks lockvar lolder lopen lprevious lpfile lrewind ltag lunmap luado luafile lvimgrep lvimgrepadd lwindow move mark make mapclear match menu menutranslate messages mkexrc mksession mkspell mkvimrc mkview mode mzscheme mzfile nbclose nbkey nbsart next nmap nmapclear nmenu nnoremap nnoremenu noautocmd noremap nohlsearch noreabbrev noremenu normal number nunmap nunmenu oldfiles open omap omapclear omenu only onoremap onoremenu options ounmap ounmenu ownsyntax print profdel profile promptfind promptrepl pclose pedit perl perldo pop popup ppop preserve previous psearch ptag ptNext ptfirst ptjump ptlast ptnext ptprevious ptrewind ptselect put pwd py3do py3file python pydo pyfile quit quitall qall read recover redo redir redraw redrawstatus registers resize retab return rewind right rightbelow ruby rubydo rubyfile rundo runtime rviminfo substitute sNext sandbox sargument sall saveas sbuffer sbNext sball sbfirst sblast sbmodified sbnext sbprevious sbrewind scriptnames scriptencoding scscope set setfiletype setglobal setlocal sfind sfirst shell simalt sign silent sleep slast smagic smapclear smenu snext sniff snomagic snoremap snoremenu sort source spelldump spellgood spellinfo spellrepall spellundo spellwrong split sprevious srewind stop stag startgreplace startreplace startinsert stopinsert stjump stselect sunhide sunmap sunmenu suspend sview swapname syntax syntime syncbind tNext tabNext tabclose tabedit tabfind tabfirst tablast tabmove tabnext tabonly tabprevious tabrewind tag tcl tcldo tclfile tearoff tfirst throw tjump tlast tmenu tnext topleft tprevious trewind tselect tunmenu undo undojoin undolist unabbreviate unhide unlet unlockvar unmap unmenu unsilent update vglobal version verbose vertical vimgrep vimgrepadd visual viusage view vmap vmapclear vmenu vnew vnoremap vnoremenu vsplit vunmap vunmenu write wNext wall while winsize wincmd winpos wnext wprevious wqall wsverb wundo wviminfo xit xall xmapclear xmap xmenu xnoremap xnoremenu xunmap xunmenu yank",built_in:"synIDtrans atan2 range matcharg did_filetype asin feedkeys xor argv complete_check add getwinposx getqflist getwinposy screencol clearmatches empty extend getcmdpos mzeval garbagecollect setreg ceil sqrt diff_hlID inputsecret get getfperm getpid filewritable shiftwidth max sinh isdirectory synID system inputrestore winline atan visualmode inputlist tabpagewinnr round getregtype mapcheck hasmapto histdel argidx findfile sha256 exists toupper getcmdline taglist string getmatches bufnr strftime winwidth bufexists strtrans tabpagebuflist setcmdpos remote_read printf setloclist getpos getline bufwinnr float2nr len getcmdtype diff_filler luaeval resolve libcallnr foldclosedend reverse filter has_key bufname str2float strlen setline getcharmod setbufvar index searchpos shellescape undofile foldclosed setqflist buflisted strchars str2nr virtcol floor remove undotree remote_expr winheight gettabwinvar reltime cursor tabpagenr finddir localtime acos getloclist search tanh matchend rename gettabvar strdisplaywidth type abs py3eval setwinvar tolower wildmenumode log10 spellsuggest bufloaded synconcealed nextnonblank server2client complete settabwinvar executable input wincol setmatches getftype hlID inputsave searchpair or screenrow line settabvar histadd deepcopy strpart remote_peek and eval getftime submatch screenchar winsaveview matchadd mkdir screenattr getfontname libcall reltimestr getfsize winnr invert pow getbufline byte2line soundfold repeat fnameescape tagfiles sin strwidth spellbadword trunc maparg log lispindent hostname setpos globpath remote_foreground getchar synIDattr fnamemodify cscope_connection stridx winbufnr indent min complete_add nr2char searchpairpos inputdialog values matchlist items hlexists strridx browsedir expand fmod pathshorten line2byte argc count getwinvar glob foldtextresult getreg foreground cosh matchdelete has char2nr simplify histget searchdecl iconv winrestcmd pumvisible writefile foldlevel haslocaldir keys cos matchstr foldtext histnr tan tempname getcwd byteidx getbufvar islocked escape eventhandler remote_send serverlist winrestview synstack pyeval prevnonblank readfile cindent filereadable changenr exp"},i:/;/,c:[e.NM,{cN:"string",b:"'",e:"'",i:"\\n"},{cN:"string",b:/"(\\"|\n\\|[^"\n])*"/},e.C('"',"$"),{cN:"variable",b:/[bwtglsav]:[\w\d_]*/},{cN:"function",bK:"function function!",e:"$",relevance:0,c:[e.TM,{cN:"params",b:"\\(",e:"\\)"}]},{cN:"symbol",b:/<[\w-]+>/}]}});
+hljs.registerLanguage("excel",function(E){return{aliases:["xlsx","xls"],cI:!0,l:/[a-zA-Z][\w\.]*/,k:{built_in:"ABS ACCRINT ACCRINTM ACOS ACOSH ACOT ACOTH AGGREGATE ADDRESS AMORDEGRC AMORLINC AND ARABIC AREAS ASC ASIN ASINH ATAN ATAN2 ATANH AVEDEV AVERAGE AVERAGEA AVERAGEIF AVERAGEIFS BAHTTEXT BASE BESSELI BESSELJ BESSELK BESSELY BETADIST BETA.DIST BETAINV BETA.INV BIN2DEC BIN2HEX BIN2OCT BINOMDIST BINOM.DIST BINOM.DIST.RANGE BINOM.INV BITAND BITLSHIFT BITOR BITRSHIFT BITXOR CALL CEILING CEILING.MATH CEILING.PRECISE CELL CHAR CHIDIST CHIINV CHITEST CHISQ.DIST CHISQ.DIST.RT CHISQ.INV CHISQ.INV.RT CHISQ.TEST CHOOSE CLEAN CODE COLUMN COLUMNS COMBIN COMBINA COMPLEX CONCAT CONCATENATE CONFIDENCE CONFIDENCE.NORM CONFIDENCE.T CONVERT CORREL COS COSH COT COTH COUNT COUNTA COUNTBLANK COUNTIF COUNTIFS COUPDAYBS COUPDAYS COUPDAYSNC COUPNCD COUPNUM COUPPCD COVAR COVARIANCE.P COVARIANCE.S CRITBINOM CSC CSCH CUBEKPIMEMBER CUBEMEMBER CUBEMEMBERPROPERTY CUBERANKEDMEMBER CUBESET CUBESETCOUNT CUBEVALUE CUMIPMT CUMPRINC DATE DATEDIF DATEVALUE DAVERAGE DAY DAYS DAYS360 DB DBCS DCOUNT DCOUNTA DDB DEC2BIN DEC2HEX DEC2OCT DECIMAL DEGREES DELTA DEVSQ DGET DISC DMAX DMIN DOLLAR DOLLARDE DOLLARFR DPRODUCT DSTDEV DSTDEVP DSUM DURATION DVAR DVARP EDATE EFFECT ENCODEURL EOMONTH ERF ERF.PRECISE ERFC ERFC.PRECISE ERROR.TYPE EUROCONVERT EVEN EXACT EXP EXPON.DIST EXPONDIST FACT FACTDOUBLE FALSE|0 F.DIST FDIST F.DIST.RT FILTERXML FIND FINDB F.INV F.INV.RT FINV FISHER FISHERINV FIXED FLOOR FLOOR.MATH FLOOR.PRECISE FORECAST FORECAST.ETS FORECAST.ETS.CONFINT FORECAST.ETS.SEASONALITY FORECAST.ETS.STAT FORECAST.LINEAR FORMULATEXT FREQUENCY F.TEST FTEST FV FVSCHEDULE GAMMA GAMMA.DIST GAMMADIST GAMMA.INV GAMMAINV GAMMALN GAMMALN.PRECISE GAUSS GCD GEOMEAN GESTEP GETPIVOTDATA GROWTH HARMEAN HEX2BIN HEX2DEC HEX2OCT HLOOKUP HOUR HYPERLINK HYPGEOM.DIST HYPGEOMDIST IF IFERROR IFNA IFS IMABS IMAGINARY IMARGUMENT IMCONJUGATE IMCOS IMCOSH IMCOT IMCSC IMCSCH IMDIV IMEXP IMLN IMLOG10 IMLOG2 IMPOWER IMPRODUCT IMREAL IMSEC IMSECH IMSIN IMSINH IMSQRT IMSUB IMSUM IMTAN INDEX INDIRECT INFO INT INTERCEPT INTRATE IPMT IRR ISBLANK ISERR ISERROR ISEVEN ISFORMULA ISLOGICAL ISNA ISNONTEXT ISNUMBER ISODD ISREF ISTEXT ISO.CEILING ISOWEEKNUM ISPMT JIS KURT LARGE LCM LEFT LEFTB LEN LENB LINEST LN LOG LOG10 LOGEST LOGINV LOGNORM.DIST LOGNORMDIST LOGNORM.INV LOOKUP LOWER MATCH MAX MAXA MAXIFS MDETERM MDURATION MEDIAN MID MIDBs MIN MINIFS MINA MINUTE MINVERSE MIRR MMULT MOD MODE MODE.MULT MODE.SNGL MONTH MROUND MULTINOMIAL MUNIT N NA NEGBINOM.DIST NEGBINOMDIST NETWORKDAYS NETWORKDAYS.INTL NOMINAL NORM.DIST NORMDIST NORMINV NORM.INV NORM.S.DIST NORMSDIST NORM.S.INV NORMSINV NOT NOW NPER NPV NUMBERVALUE OCT2BIN OCT2DEC OCT2HEX ODD ODDFPRICE ODDFYIELD ODDLPRICE ODDLYIELD OFFSET OR PDURATION PEARSON PERCENTILE.EXC PERCENTILE.INC PERCENTILE PERCENTRANK.EXC PERCENTRANK.INC PERCENTRANK PERMUT PERMUTATIONA PHI PHONETIC PI PMT POISSON.DIST POISSON POWER PPMT PRICE PRICEDISC PRICEMAT PROB PRODUCT PROPER PV QUARTILE QUARTILE.EXC QUARTILE.INC QUOTIENT RADIANS RAND RANDBETWEEN RANK.AVG RANK.EQ RANK RATE RECEIVED REGISTER.ID REPLACE REPLACEB REPT RIGHT RIGHTB ROMAN ROUND ROUNDDOWN ROUNDUP ROW ROWS RRI RSQ RTD SEARCH SEARCHB SEC SECH SECOND SERIESSUM SHEET SHEETS SIGN SIN SINH SKEW SKEW.P SLN SLOPE SMALL SQL.REQUEST SQRT SQRTPI STANDARDIZE STDEV STDEV.P STDEV.S STDEVA STDEVP STDEVPA STEYX SUBSTITUTE SUBTOTAL SUM SUMIF SUMIFS SUMPRODUCT SUMSQ SUMX2MY2 SUMX2PY2 SUMXMY2 SWITCH SYD T TAN TANH TBILLEQ TBILLPRICE TBILLYIELD T.DIST T.DIST.2T T.DIST.RT TDIST TEXT TEXTJOIN TIME TIMEVALUE T.INV T.INV.2T TINV TODAY TRANSPOSE TREND TRIM TRIMMEAN TRUE|0 TRUNC T.TEST TTEST TYPE UNICHAR UNICODE UPPER VALUE VAR VAR.P VAR.S VARA VARP VARPA VDB VLOOKUP WEBSERVICE WEEKDAY WEEKNUM WEIBULL WEIBULL.DIST WORKDAY WORKDAY.INTL XIRR XNPV XOR YEAR YEARFRAC YIELD YIELDDISC YIELDMAT Z.TEST ZTEST"},c:[{b:/^=/,e:/[^=]/,rE:!0,i:/=/,relevance:10},{cN:"symbol",b:/\b[A-Z]{1,2}\d+\b/,e:/[^\d]/,eE:!0,relevance:0},{cN:"symbol",b:/[A-Z]{0,2}\d*:[A-Z]{0,2}\d*/,relevance:0},E.BE,E.QSM,{cN:"number",b:E.NR+"(%)?",relevance:0},E.C(/\bN\(/,/\)/,{eB:!0,eE:!0,i:/\n/})]}});
+hljs.registerLanguage("erlang",function(e){var r="[a-z'][a-zA-Z0-9_']*",c="("+r+":"+r+"|"+r+")",n={keyword:"after and andalso|10 band begin bnot bor bsl bzr bxor case catch cond div end fun if let not of orelse|10 query receive rem try when xor",literal:"false true"},a=e.C("%","$"),b={cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",relevance:0},i={b:"fun\\s+"+r+"/\\d+"},l={b:c+"\\(",e:"\\)",rB:!0,relevance:0,c:[{b:c,relevance:0},{b:"\\(",e:"\\)",eW:!0,rE:!0,relevance:0}]},d={b:"{",e:"}",relevance:0},o={b:"\\b_([A-Z][A-Za-z0-9_]*)?",relevance:0},t={b:"[A-Z][a-zA-Z0-9_]*",relevance:0},v={b:"#"+e.UIR,relevance:0,rB:!0,c:[{b:"#"+e.UIR,relevance:0},{b:"{",e:"}",relevance:0}]},f={bK:"fun receive if try case",e:"end",k:n};f.c=[a,i,e.inherit(e.ASM,{cN:""}),f,l,e.QSM,b,d,o,t,v];var s=[a,i,f,l,e.QSM,b,d,o,t,v];l.c[1].c=s,d.c=s;var u={cN:"params",b:"\\(",e:"\\)",c:v.c[1].c=s};return{aliases:["erl"],k:n,i:"(</|\\*=|\\+=|-=|/\\*|\\*/|\\(\\*|\\*\\))",c:[{cN:"function",b:"^"+r+"\\s*\\(",e:"->",rB:!0,i:"\\(|#|//|/\\*|\\\\|:|;",c:[u,e.inherit(e.TM,{b:r})],starts:{e:";|\\.",k:n,c:s}},a,{b:"^-",e:"\\.",relevance:0,eE:!0,rB:!0,l:"-"+e.IR,k:"-module -record -undef -export -ifdef -ifndef -author -copyright -doc -vsn -import -include -include_lib -compile -define -else -endif -file -behaviour -behavior -spec",c:[u]},b,e.QSM,v,o,t,d,{b:/\.$/}]}});
+hljs.registerLanguage("kotlin",function(e){var t={keyword:"abstract as val var vararg get set class object open private protected public noinline crossinline dynamic final enum if else do while for when throw try catch finally import package is in fun override companion reified inline lateinit init interface annotation data sealed internal infix operator out by constructor super tailrec where const inner suspend typealias external expect actual trait volatile transient native default",built_in:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",literal:"true false null"},a={cN:"symbol",b:e.UIR+"@"},n={cN:"subst",b:"\\${",e:"}",c:[e.CNM]},c={cN:"variable",b:"\\$"+e.UIR},r={cN:"string",v:[{b:'"""',e:'"""(?=[^"])',c:[c,n]},{b:"'",e:"'",i:/\n/,c:[e.BE]},{b:'"',e:'"',i:/\n/,c:[e.BE,c,n]}]};n.c.push(r);var i={cN:"meta",b:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UIR+")?"},l={cN:"meta",b:"@"+e.UIR,c:[{b:/\(/,e:/\)/,c:[e.inherit(r,{cN:"meta-string"})]}]},s={cN:"number",b:"\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",relevance:0},b=e.C("/\\*","\\*/",{c:[e.CBCM]}),o={v:[{cN:"type",b:e.UIR},{b:/\(/,e:/\)/,c:[]}]},d=o;return d.v[1].c=[o],o.v[1].c=[d],{aliases:["kt"],k:t,c:[e.C("/\\*\\*","\\*/",{relevance:0,c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,b,{cN:"keyword",b:/\b(break|continue|return|this)\b/,starts:{c:[{cN:"symbol",b:/@\w+/}]}},a,i,l,{cN:"function",bK:"fun",e:"[(]|$",rB:!0,eE:!0,k:t,i:/fun\s+(<.*>)?[^\s\(]+(\s+[^\s\(]+)\s*=/,relevance:5,c:[{b:e.UIR+"\\s*\\(",rB:!0,relevance:0,c:[e.UTM]},{cN:"type",b:/</,e:/>/,k:"reified",relevance:0},{cN:"params",b:/\(/,e:/\)/,endsParent:!0,k:t,relevance:0,c:[{b:/:/,e:/[=,\/]/,eW:!0,c:[o,e.CLCM,b],relevance:0},e.CLCM,b,i,l,r,e.CNM]},b]},{cN:"class",bK:"class interface trait",e:/[:\{(]|$/,eE:!0,i:"extends implements",c:[{bK:"public protected internal private constructor"},e.UTM,{cN:"type",b:/</,e:/>/,eB:!0,eE:!0,relevance:0},{cN:"type",b:/[,:]\s*/,e:/[<\(,]|$/,eB:!0,rE:!0},i,l]},r,{cN:"meta",b:"^#!/usr/bin/env",e:"$",i:"\n"},s]}});
+hljs.registerLanguage("1c",function(s){var x="[A-Za-zА-Яа-яёЁ_][A-Za-zА-Яа-яёЁ_0-9]+",o="далее возврат вызватьисключение выполнить для если и из или иначе иначеесли исключение каждого конецесли конецпопытки конеццикла не новый перейти перем по пока попытка прервать продолжить тогда цикл экспорт ",m="null истина ложь неопределено",t=s.inherit(s.NM),l={cN:"string",b:'"|\\|',e:'"|$',c:[{b:'""'}]},e={b:"'",e:"'",eB:!0,eE:!0,c:[{cN:"number",b:"\\d{4}([\\.\\\\/:-]?\\d{2}){0,5}"}]},n=s.inherit(s.CLCM);return{cI:!0,l:x,k:{keyword:o,built_in:"разделительстраниц разделительстрок символтабуляции ansitooem oemtoansi ввестивидсубконто ввестиперечисление ввестипериод ввестиплансчетов выбранныйплансчетов датагод датамесяц датачисло заголовоксистемы значениевстроку значениеизстроки каталогиб каталогпользователя кодсимв конгода конецпериодаби конецрассчитанногопериодаби конецстандартногоинтервала конквартала конмесяца коннедели лог лог10 максимальноеколичествосубконто названиеинтерфейса названиенабораправ назначитьвид назначитьсчет найтиссылки началопериодаби началостандартногоинтервала начгода начквартала начмесяца начнедели номерднягода номерднянедели номернеделигода обработкаожидания основнойжурналрасчетов основнойплансчетов основнойязык очиститьокносообщений периодстр получитьвремята получитьдатута получитьдокументта получитьзначенияотбора получитьпозициюта получитьпустоезначение получитьта префиксавтонумерации пропись пустоезначение разм разобратьпозициюдокумента рассчитатьрегистрына рассчитатьрегистрыпо симв создатьобъект статусвозврата стрколичествострок сформироватьпозициюдокумента счетпокоду текущеевремя типзначения типзначениястр установитьтана установитьтапо фиксшаблон шаблон acos asin atan base64значение base64строка cos exp log log10 pow sin sqrt tan xmlзначение xmlстрока xmlтип xmlтипзнч активноеокно безопасныйрежим безопасныйрежимразделенияданных булево ввестидату ввестизначение ввестистроку ввестичисло возможностьчтенияxml вопрос восстановитьзначение врег выгрузитьжурналрегистрации выполнитьобработкуоповещения выполнитьпроверкуправдоступа вычислить год данныеформывзначение дата день деньгода деньнедели добавитьмесяц заблокироватьданныедляредактирования заблокироватьработупользователя завершитьработусистемы загрузитьвнешнююкомпоненту закрытьсправку записатьjson записатьxml записатьдатуjson записьжурналарегистрации заполнитьзначениясвойств запроситьразрешениепользователя запуститьприложение запуститьсистему зафиксироватьтранзакцию значениевданныеформы значениевстрокувнутр значениевфайл значениезаполнено значениеизстрокивнутр значениеизфайла изxmlтипа импортмоделиxdto имякомпьютера имяпользователя инициализироватьпредопределенныеданные информацияобошибке каталогбиблиотекимобильногоустройства каталогвременныхфайлов каталогдокументов каталогпрограммы кодироватьстроку кодлокализацииинформационнойбазы кодсимвола командасистемы конецгода конецдня конецквартала конецмесяца конецминуты конецнедели конецчаса конфигурациябазыданныхизмененадинамически конфигурацияизменена копироватьданныеформы копироватьфайл краткоепредставлениеошибки лев макс местноевремя месяц мин минута монопольныйрежим найти найтинедопустимыесимволыxml найтиокнопонавигационнойссылке найтипомеченныенаудаление найтипоссылкам найтифайлы началогода началодня началоквартала началомесяца началоминуты началонедели началочаса начатьзапросразрешенияпользователя начатьзапускприложения начатькопированиефайла начатьперемещениефайла начатьподключениевнешнейкомпоненты начатьподключениерасширенияработыскриптографией начатьподключениерасширенияработысфайлами начатьпоискфайлов начатьполучениекаталогавременныхфайлов начатьполучениекаталогадокументов начатьполучениерабочегокаталогаданныхпользователя начатьполучениефайлов начатьпомещениефайла начатьпомещениефайлов начатьсозданиедвоичныхданныхизфайла начатьсозданиекаталога начатьтранзакцию начатьудалениефайлов начатьустановкувнешнейкомпоненты начатьустановкурасширенияработыскриптографией начатьустановкурасширенияработысфайлами неделягода необходимостьзавершениясоединения номерсеансаинформационнойбазы номерсоединенияинформационнойбазы нрег нстр обновитьинтерфейс обновитьнумерациюобъектов обновитьповторноиспользуемыезначения обработкапрерыванияпользователя объединитьфайлы окр описаниеошибки оповестить оповеститьобизменении отключитьобработчикзапросанастроекклиенталицензирования отключитьобработчикожидания отключитьобработчикоповещения открытьзначение открытьиндекссправки открытьсодержаниесправки открытьсправку открытьформу открытьформумодально отменитьтранзакцию очиститьжурналрегистрации очиститьнастройкипользователя очиститьсообщения параметрыдоступа перейтипонавигационнойссылке переместитьфайл подключитьвнешнююкомпоненту подключитьобработчикзапросанастроекклиенталицензирования подключитьобработчикожидания подключитьобработчикоповещения подключитьрасширениеработыскриптографией подключитьрасширениеработысфайлами подробноепредставлениеошибки показатьвводдаты показатьвводзначения показатьвводстроки показатьвводчисла показатьвопрос показатьзначение показатьинформациюобошибке показатьнакарте показатьоповещениепользователя показатьпредупреждение полноеимяпользователя получитьcomобъект получитьxmlтип получитьадреспоместоположению получитьблокировкусеансов получитьвремязавершенияспящегосеанса получитьвремязасыпанияпассивногосеанса получитьвремяожиданияблокировкиданных получитьданныевыбора получитьдополнительныйпараметрклиенталицензирования получитьдопустимыекодылокализации получитьдопустимыечасовыепояса получитьзаголовокклиентскогоприложения получитьзаголовоксистемы получитьзначенияотборажурналарегистрации получитьидентификаторконфигурации получитьизвременногохранилища получитьимявременногофайла получитьимяклиенталицензирования получитьинформациюэкрановклиента получитьиспользованиежурналарегистрации получитьиспользованиесобытияжурналарегистрации получитькраткийзаголовокприложения получитьмакетоформления получитьмаскувсефайлы получитьмаскувсефайлыклиента получитьмаскувсефайлысервера получитьместоположениепоадресу получитьминимальнуюдлинупаролейпользователей получитьнавигационнуюссылку получитьнавигационнуюссылкуинформационнойбазы получитьобновлениеконфигурациибазыданных получитьобновлениепредопределенныхданныхинформационнойбазы получитьобщиймакет получитьобщуюформу получитьокна получитьоперативнуюотметкувремени получитьотключениебезопасногорежима получитьпараметрыфункциональныхопцийинтерфейса получитьполноеимяпредопределенногозначения получитьпредставлениянавигационныхссылок получитьпроверкусложностипаролейпользователей получитьразделительпути получитьразделительпутиклиента получитьразделительпутисервера получитьсеансыинформационнойбазы получитьскоростьклиентскогосоединения получитьсоединенияинформационнойбазы получитьсообщенияпользователю получитьсоответствиеобъектаиформы получитьсоставстандартногоинтерфейсаodata получитьструктурухранениябазыданных получитьтекущийсеансинформационнойбазы получитьфайл получитьфайлы получитьформу получитьфункциональнуюопцию получитьфункциональнуюопциюинтерфейса получитьчасовойпоясинформационнойбазы пользователиос поместитьвовременноехранилище поместитьфайл поместитьфайлы прав праводоступа предопределенноезначение представлениекодалокализации представлениепериода представлениеправа представлениеприложения представлениесобытияжурналарегистрации представлениечасовогопояса предупреждение прекратитьработусистемы привилегированныйрежим продолжитьвызов прочитатьjson прочитатьxml прочитатьдатуjson пустаястрока рабочийкаталогданныхпользователя разблокироватьданныедляредактирования разделитьфайл разорватьсоединениесвнешнимисточникомданных раскодироватьстроку рольдоступна секунда сигнал символ скопироватьжурналрегистрации смещениелетнеговремени смещениестандартноговремени соединитьбуферыдвоичныхданных создатькаталог создатьфабрикуxdto сокрл сокрлп сокрп сообщить состояние сохранитьзначение сохранитьнастройкипользователя сред стрдлина стрзаканчиваетсяна стрзаменить стрнайти стрначинаетсяс строка строкасоединенияинформационнойбазы стрполучитьстроку стрразделить стрсоединить стрсравнить стрчисловхождений стрчислострок стршаблон текущаядата текущаядатасеанса текущаяуниверсальнаядата текущаяуниверсальнаядатавмиллисекундах текущийвариантинтерфейсаклиентскогоприложения текущийвариантосновногошрифтаклиентскогоприложения текущийкодлокализации текущийрежимзапуска текущийязык текущийязыксистемы тип типзнч транзакцияактивна трег удалитьданныеинформационнойбазы удалитьизвременногохранилища удалитьобъекты удалитьфайлы универсальноевремя установитьбезопасныйрежим установитьбезопасныйрежимразделенияданных установитьблокировкусеансов установитьвнешнююкомпоненту установитьвремязавершенияспящегосеанса установитьвремязасыпанияпассивногосеанса установитьвремяожиданияблокировкиданных установитьзаголовокклиентскогоприложения установитьзаголовоксистемы установитьиспользованиежурналарегистрации установитьиспользованиесобытияжурналарегистрации установитькраткийзаголовокприложения установитьминимальнуюдлинупаролейпользователей установитьмонопольныйрежим установитьнастройкиклиенталицензирования установитьобновлениепредопределенныхданныхинформационнойбазы установитьотключениебезопасногорежима установитьпараметрыфункциональныхопцийинтерфейса установитьпривилегированныйрежим установитьпроверкусложностипаролейпользователей установитьрасширениеработыскриптографией установитьрасширениеработысфайлами установитьсоединениесвнешнимисточникомданных установитьсоответствиеобъектаиформы установитьсоставстандартногоинтерфейсаodata установитьчасовойпоясинформационнойбазы установитьчасовойпояссеанса формат цел час часовойпояс часовойпояссеанса число числопрописью этоадресвременногохранилища wsссылки библиотекакартинок библиотекамакетовоформлениякомпоновкиданных библиотекастилей бизнеспроцессы внешниеисточникиданных внешниеобработки внешниеотчеты встроенныепокупки главныйинтерфейс главныйстиль документы доставляемыеуведомления журналыдокументов задачи информацияобинтернетсоединении использованиерабочейдаты историяработыпользователя константы критерииотбора метаданные обработки отображениерекламы отправкадоставляемыхуведомлений отчеты панельзадачос параметрзапуска параметрысеанса перечисления планывидоврасчета планывидовхарактеристик планыобмена планысчетов полнотекстовыйпоиск пользователиинформационнойбазы последовательности проверкавстроенныхпокупок рабочаядата расширенияконфигурации регистрыбухгалтерии регистрынакопления регистрырасчета регистрысведений регламентныезадания сериализаторxdto справочники средствагеопозиционирования средствакриптографии средствамультимедиа средстваотображениярекламы средствапочты средствателефонии фабрикаxdto файловыепотоки фоновыезадания хранилищанастроек хранилищевариантовотчетов хранилищенастроекданныхформ хранилищеобщихнастроек хранилищепользовательскихнастроекдинамическихсписков хранилищепользовательскихнастроекотчетов хранилищесистемныхнастроек ",class:"webцвета windowsцвета windowsшрифты библиотекакартинок рамкистиля символы цветастиля шрифтыстиля автоматическоесохранениеданныхформывнастройках автонумерациявформе автораздвижениесерий анимациядиаграммы вариантвыравниванияэлементовизаголовков вариантуправлениявысотойтаблицы вертикальнаяпрокруткаформы вертикальноеположение вертикальноеположениеэлемента видгруппыформы виддекорацииформы виддополненияэлементаформы видизмененияданных видкнопкиформы видпереключателя видподписейкдиаграмме видполяформы видфлажка влияниеразмеранапузырекдиаграммы горизонтальноеположение горизонтальноеположениеэлемента группировкаколонок группировкаподчиненныхэлементовформы группыиэлементы действиеперетаскивания дополнительныйрежимотображения допустимыедействияперетаскивания интервалмеждуэлементамиформы использованиевывода использованиеполосыпрокрутки используемоезначениеточкибиржевойдиаграммы историявыборапривводе источникзначенийоситочекдиаграммы источникзначенияразмерапузырькадиаграммы категориягруппыкоманд максимумсерий начальноеотображениедерева начальноеотображениесписка обновлениетекстаредактирования ориентациядендрограммы ориентациядиаграммы ориентацияметокдиаграммы ориентацияметоксводнойдиаграммы ориентацияэлементаформы отображениевдиаграмме отображениевлегендедиаграммы отображениегруппыкнопок отображениезаголовкашкалыдиаграммы отображениезначенийсводнойдиаграммы отображениезначенияизмерительнойдиаграммы отображениеинтерваладиаграммыганта отображениекнопки отображениекнопкивыбора отображениеобсужденийформы отображениеобычнойгруппы отображениеотрицательныхзначенийпузырьковойдиаграммы отображениепанелипоиска отображениеподсказки отображениепредупрежденияприредактировании отображениеразметкиполосырегулирования отображениестраницформы отображениетаблицы отображениетекстазначениядиаграммыганта отображениеуправленияобычнойгруппы отображениефигурыкнопки палитрацветовдиаграммы поведениеобычнойгруппы поддержкамасштабадендрограммы поддержкамасштабадиаграммыганта поддержкамасштабасводнойдиаграммы поисквтаблицепривводе положениезаголовкаэлементаформы положениекартинкикнопкиформы положениекартинкиэлементаграфическойсхемы положениекоманднойпанелиформы положениекоманднойпанелиэлементаформы положениеопорнойточкиотрисовки положениеподписейкдиаграмме положениеподписейшкалызначенийизмерительнойдиаграммы положениесостоянияпросмотра положениестрокипоиска положениетекстасоединительнойлинии положениеуправленияпоиском положениешкалывремени порядокотображенияточекгоризонтальнойгистограммы порядоксерийвлегендедиаграммы размеркартинки расположениезаголовкашкалыдиаграммы растягиваниеповертикалидиаграммыганта режимавтоотображениясостояния режимвводастроктаблицы режимвыборанезаполненного режимвыделениядаты режимвыделениястрокитаблицы режимвыделениятаблицы режимизмененияразмера режимизменениясвязанногозначения режимиспользованиядиалогапечати режимиспользованияпараметракоманды режиммасштабированияпросмотра режимосновногоокнаклиентскогоприложения режимоткрытияокнаформы режимотображениявыделения режимотображениягеографическойсхемы режимотображениязначенийсерии режимотрисовкисеткиграфическойсхемы режимполупрозрачностидиаграммы режимпробеловдиаграммы режимразмещениянастранице режимредактированияколонки режимсглаживаниядиаграммы режимсглаживанияиндикатора режимсписказадач сквозноевыравнивание сохранениеданныхформывнастройках способзаполнениятекстазаголовкашкалыдиаграммы способопределенияограничивающегозначениядиаграммы стандартнаягруппакоманд стандартноеоформление статусоповещенияпользователя стильстрелки типаппроксимациилиниитрендадиаграммы типдиаграммы типединицышкалывремени типимпортасерийслоягеографическойсхемы типлиниигеографическойсхемы типлиниидиаграммы типмаркерагеографическойсхемы типмаркерадиаграммы типобластиоформления типорганизацииисточникаданныхгеографическойсхемы типотображениясериислоягеографическойсхемы типотображенияточечногообъектагеографическойсхемы типотображенияшкалыэлементалегендыгеографическойсхемы типпоискаобъектовгеографическойсхемы типпроекциигеографическойсхемы типразмещенияизмерений типразмещенияреквизитовизмерений типрамкиэлементауправления типсводнойдиаграммы типсвязидиаграммыганта типсоединениязначенийпосериямдиаграммы типсоединенияточекдиаграммы типсоединительнойлинии типстороныэлементаграфическойсхемы типформыотчета типшкалырадарнойдиаграммы факторлиниитрендадиаграммы фигуракнопки фигурыграфическойсхемы фиксациявтаблице форматдняшкалывремени форматкартинки ширинаподчиненныхэлементовформы виддвижениябухгалтерии виддвижениянакопления видпериодарегистрарасчета видсчета видточкимаршрутабизнеспроцесса использованиеагрегатарегистранакопления использованиегруппиэлементов использованиережимапроведения использованиесреза периодичностьагрегатарегистранакопления режимавтовремя режимзаписидокумента режимпроведениядокумента авторегистрацияизменений допустимыйномерсообщения отправкаэлементаданных получениеэлементаданных использованиерасшифровкитабличногодокумента ориентациястраницы положениеитоговколоноксводнойтаблицы положениеитоговстроксводнойтаблицы положениетекстаотносительнокартинки расположениезаголовкагруппировкитабличногодокумента способчтениязначенийтабличногодокумента типдвустороннейпечати типзаполненияобластитабличногодокумента типкурсоровтабличногодокумента типлиниирисункатабличногодокумента типлинииячейкитабличногодокумента типнаправленияпереходатабличногодокумента типотображениявыделениятабличногодокумента типотображениялинийсводнойтаблицы типразмещениятекстатабличногодокумента типрисункатабличногодокумента типсмещениятабличногодокумента типузоратабличногодокумента типфайлатабличногодокумента точностьпечати чередованиерасположениястраниц отображениевремениэлементовпланировщика типфайлаформатированногодокумента обходрезультатазапроса типзаписизапроса видзаполнениярасшифровкипостроителяотчета типдобавленияпредставлений типизмеренияпостроителяотчета типразмещенияитогов доступкфайлу режимдиалогавыборафайла режимоткрытияфайла типизмеренияпостроителязапроса видданныханализа методкластеризации типединицыинтервалавременианализаданных типзаполнениятаблицырезультатаанализаданных типиспользованиячисловыхзначенийанализаданных типисточникаданныхпоискаассоциаций типколонкианализаданныхдереворешений типколонкианализаданныхкластеризация типколонкианализаданныхобщаястатистика типколонкианализаданныхпоискассоциаций типколонкианализаданныхпоискпоследовательностей типколонкимоделипрогноза типмерырасстоянияанализаданных типотсеченияправилассоциации типполяанализаданных типстандартизациианализаданных типупорядочиванияправилассоциациианализаданных типупорядочиванияшаблоновпоследовательностейанализаданных типупрощениядереварешений wsнаправлениепараметра вариантxpathxs вариантзаписидатыjson вариантпростоготипаxs видгруппымоделиxs видфасетаxdto действиепостроителяdom завершенностьпростоготипаxs завершенностьсоставноготипаxs завершенностьсхемыxs запрещенныеподстановкиxs исключениягруппподстановкиxs категорияиспользованияатрибутаxs категорияограниченияидентичностиxs категорияограниченияпространствименxs методнаследованияxs модельсодержимогоxs назначениетипаxml недопустимыеподстановкиxs обработкапробельныхсимволовxs обработкасодержимогоxs ограничениезначенияxs параметрыотбораузловdom переносстрокjson позициявдокументеdom пробельныесимволыxml типатрибутаxml типзначенияjson типканоническогоxml типкомпонентыxs типпроверкиxml типрезультатаdomxpath типузлаdom типузлаxml формаxml формапредставленияxs форматдатыjson экранированиесимволовjson видсравнениякомпоновкиданных действиеобработкирасшифровкикомпоновкиданных направлениесортировкикомпоновкиданных расположениевложенныхэлементоврезультатакомпоновкиданных расположениеитоговкомпоновкиданных расположениегруппировкикомпоновкиданных расположениеполейгруппировкикомпоновкиданных расположениеполякомпоновкиданных расположениереквизитовкомпоновкиданных расположениересурсовкомпоновкиданных типбухгалтерскогоостаткакомпоновкиданных типвыводатекстакомпоновкиданных типгруппировкикомпоновкиданных типгруппыэлементовотборакомпоновкиданных типдополненияпериодакомпоновкиданных типзаголовкаполейкомпоновкиданных типмакетагруппировкикомпоновкиданных типмакетаобластикомпоновкиданных типостаткакомпоновкиданных типпериодакомпоновкиданных типразмещениятекстакомпоновкиданных типсвязинаборовданныхкомпоновкиданных типэлементарезультатакомпоновкиданных расположениелегендыдиаграммыкомпоновкиданных типпримененияотборакомпоновкиданных режимотображенияэлементанастройкикомпоновкиданных режимотображениянастроеккомпоновкиданных состояниеэлементанастройкикомпоновкиданных способвосстановлениянастроеккомпоновкиданных режимкомпоновкирезультата использованиепараметракомпоновкиданных автопозицияресурсовкомпоновкиданных вариантиспользованиягруппировкикомпоновкиданных расположениересурсоввдиаграммекомпоновкиданных фиксациякомпоновкиданных использованиеусловногооформлениякомпоновкиданных важностьинтернетпочтовогосообщения обработкатекстаинтернетпочтовогосообщения способкодированияинтернетпочтовоговложения способкодированиянеasciiсимволовинтернетпочтовогосообщения типтекстапочтовогосообщения протоколинтернетпочты статусразборапочтовогосообщения режимтранзакциизаписижурналарегистрации статустранзакциизаписижурналарегистрации уровеньжурналарегистрации расположениехранилищасертификатовкриптографии режимвключениясертификатовкриптографии режимпроверкисертификатакриптографии типхранилищасертификатовкриптографии кодировкаименфайловвzipфайле методсжатияzip методшифрованияzip режимвосстановленияпутейфайловzip режимобработкиподкаталоговzip режимсохраненияпутейzip уровеньсжатияzip звуковоеоповещение направлениепереходакстроке позициявпотоке порядокбайтов режимблокировкиданных режимуправленияблокировкойданных сервисвстроенныхпокупок состояниефоновогозадания типподписчикадоставляемыхуведомлений уровеньиспользованиязащищенногосоединенияftp направлениепорядкасхемызапроса типдополненияпериодамисхемызапроса типконтрольнойточкисхемызапроса типобъединениясхемызапроса типпараметрадоступнойтаблицысхемызапроса типсоединениясхемызапроса httpметод автоиспользованиеобщегореквизита автопрефиксномеразадачи вариантвстроенногоязыка видиерархии видрегистранакопления видтаблицывнешнегоисточникаданных записьдвиженийприпроведении заполнениепоследовательностей индексирование использованиебазыпланавидоврасчета использованиебыстроговыбора использованиеобщегореквизита использованиеподчинения использованиеполнотекстовогопоиска использованиеразделяемыхданныхобщегореквизита использованиереквизита назначениеиспользованияприложения назначениерасширенияконфигурации направлениепередачи обновлениепредопределенныхданных оперативноепроведение основноепредставлениевидарасчета основноепредставлениевидахарактеристики основноепредставлениезадачи основноепредставлениепланаобмена основноепредставлениесправочника основноепредставлениесчета перемещениеграницыприпроведении периодичностьномерабизнеспроцесса периодичностьномерадокумента периодичностьрегистрарасчета периодичностьрегистрасведений повторноеиспользованиевозвращаемыхзначений полнотекстовыйпоискпривводепостроке принадлежностьобъекта проведение разделениеаутентификацииобщегореквизита разделениеданныхобщегореквизита разделениерасширенийконфигурацииобщегореквизита режимавтонумерацииобъектов режимзаписирегистра режимиспользованиямодальности режимиспользованиясинхронныхвызововрасширенийплатформыивнешнихкомпонент режимповторногоиспользованиясеансов режимполученияданныхвыборапривводепостроке режимсовместимости режимсовместимостиинтерфейса режимуправленияблокировкойданныхпоумолчанию сериикодовпланавидовхарактеристик сериикодовпланасчетов сериикодовсправочника созданиепривводе способвыбора способпоискастрокипривводепостроке способредактирования типданныхтаблицывнешнегоисточникаданных типкодапланавидоврасчета типкодасправочника типмакета типномерабизнеспроцесса типномерадокумента типномеразадачи типформы удалениедвижений важностьпроблемыприменениярасширенияконфигурации вариантинтерфейсаклиентскогоприложения вариантмасштабаформклиентскогоприложения вариантосновногошрифтаклиентскогоприложения вариантстандартногопериода вариантстандартнойдатыначала видграницы видкартинки видотображенияполнотекстовогопоиска видрамки видсравнения видцвета видчисловогозначения видшрифта допустимаядлина допустимыйзнак использованиеbyteordermark использованиеметаданныхполнотекстовогопоиска источникрасширенийконфигурации клавиша кодвозвратадиалога кодировкаxbase кодировкатекста направлениепоиска направлениесортировки обновлениепредопределенныхданных обновлениеприизмененииданных отображениепанелиразделов проверказаполнения режимдиалогавопрос режимзапускаклиентскогоприложения режимокругления режимоткрытияформприложения режимполнотекстовогопоиска скоростьклиентскогосоединения состояниевнешнегоисточникаданных состояниеобновленияконфигурациибазыданных способвыборасертификатаwindows способкодированиястроки статуссообщения типвнешнейкомпоненты типплатформы типповеденияклавишиenter типэлементаинформацииовыполненииобновленияконфигурациибазыданных уровеньизоляциитранзакций хешфункция частидаты",type:"comобъект ftpсоединение httpзапрос httpсервисответ httpсоединение wsопределения wsпрокси xbase анализданных аннотацияxs блокировкаданных буфердвоичныхданных включениеxs выражениекомпоновкиданных генераторслучайныхчисел географическаясхема географическиекоординаты графическаясхема группамоделиxs данныерасшифровкикомпоновкиданных двоичныеданные дендрограмма диаграмма диаграммаганта диалогвыборафайла диалогвыборацвета диалогвыборашрифта диалограсписаниярегламентногозадания диалогредактированиястандартногопериода диапазон документdom документhtml документацияxs доставляемоеуведомление записьdom записьfastinfoset записьhtml записьjson записьxml записьzipфайла записьданных записьтекста записьузловdom запрос защищенноесоединениеopenssl значенияполейрасшифровкикомпоновкиданных извлечениетекста импортxs интернетпочта интернетпочтовоесообщение интернетпочтовыйпрофиль интернетпрокси интернетсоединение информациядляприложенияxs использованиеатрибутаxs использованиесобытияжурналарегистрации источникдоступныхнастроеккомпоновкиданных итераторузловdom картинка квалификаторыдаты квалификаторыдвоичныхданных квалификаторыстроки квалификаторычисла компоновщикмакетакомпоновкиданных компоновщикнастроеккомпоновкиданных конструктормакетаоформлениякомпоновкиданных конструкторнастроеккомпоновкиданных конструкторформатнойстроки линия макеткомпоновкиданных макетобластикомпоновкиданных макетоформлениякомпоновкиданных маскаxs менеджеркриптографии наборсхемxml настройкикомпоновкиданных настройкисериализацииjson обработкакартинок обработкарасшифровкикомпоновкиданных обходдереваdom объявлениеатрибутаxs объявлениенотацииxs объявлениеэлементаxs описаниеиспользованиясобытиядоступжурналарегистрации описаниеиспользованиясобытияотказвдоступежурналарегистрации описаниеобработкирасшифровкикомпоновкиданных описаниепередаваемогофайла описаниетипов определениегруппыатрибутовxs определениегруппымоделиxs определениеограниченияидентичностиxs определениепростоготипаxs определениесоставноготипаxs определениетипадокументаdom определенияxpathxs отборкомпоновкиданных пакетотображаемыхдокументов параметрвыбора параметркомпоновкиданных параметрызаписиjson параметрызаписиxml параметрычтенияxml переопределениеxs планировщик полеанализаданных полекомпоновкиданных построительdom построительзапроса построительотчета построительотчетаанализаданных построительсхемxml поток потоквпамяти почта почтовоесообщение преобразованиеxsl преобразованиекканоническомуxml процессорвыводарезультатакомпоновкиданныхвколлекциюзначений процессорвыводарезультатакомпоновкиданныхвтабличныйдокумент процессоркомпоновкиданных разыменовательпространствименdom рамка расписаниерегламентногозадания расширенноеимяxml результатчтенияданных своднаядиаграмма связьпараметравыбора связьпотипу связьпотипукомпоновкиданных сериализаторxdto сертификатклиентаwindows сертификатклиентафайл сертификаткриптографии сертификатыудостоверяющихцентровwindows сертификатыудостоверяющихцентровфайл сжатиеданных системнаяинформация сообщениепользователю сочетаниеклавиш сравнениезначений стандартнаядатаначала стандартныйпериод схемаxml схемакомпоновкиданных табличныйдокумент текстовыйдокумент тестируемоеприложение типданныхxml уникальныйидентификатор фабрикаxdto файл файловыйпоток фасетдлиныxs фасетколичестваразрядовдробнойчастиxs фасетмаксимальноговключающегозначенияxs фасетмаксимальногоисключающегозначенияxs фасетмаксимальнойдлиныxs фасетминимальноговключающегозначенияxs фасетминимальногоисключающегозначенияxs фасетминимальнойдлиныxs фасетобразцаxs фасетобщегоколичестваразрядовxs фасетперечисленияxs фасетпробельныхсимволовxs фильтрузловdom форматированнаястрока форматированныйдокумент фрагментxs хешированиеданных хранилищезначения цвет чтениеfastinfoset чтениеhtml чтениеjson чтениеxml чтениеzipфайла чтениеданных чтениетекста чтениеузловdom шрифт элементрезультатакомпоновкиданных comsafearray деревозначений массив соответствие списокзначений структура таблицазначений фиксированнаяструктура фиксированноесоответствие фиксированныймассив ",literal:m},c:[{cN:"meta",l:x,b:"#|&",e:"$",k:{"meta-keyword":o+"загрузитьизфайла вебклиент вместо внешнеесоединение клиент конецобласти мобильноеприложениеклиент мобильноеприложениесервер наклиенте наклиентенасервере наклиентенасерверебезконтекста насервере насерверебезконтекста область перед после сервер толстыйклиентобычноеприложение толстыйклиентуправляемоеприложение тонкийклиент "},c:[n]},{cN:"function",l:x,v:[{b:"процедура|функция",e:"\\)",k:"процедура функция"},{b:"конецпроцедуры|конецфункции",k:"конецпроцедуры конецфункции"}],c:[{b:"\\(",e:"\\)",endsParent:!0,c:[{cN:"params",l:x,b:x,e:",",eE:!0,eW:!0,k:{keyword:"знач",literal:m},c:[t,l,e]},n]},s.inherit(s.TM,{b:x})]},n,{cN:"symbol",b:"~",e:";|:",eE:!0},t,l,e]}});
+hljs.registerLanguage("dockerfile",function(e){return{aliases:["docker"],cI:!0,k:"from maintainer expose env arg user onbuild stopsignal",c:[e.HCM,e.ASM,e.QSM,e.NM,{bK:"run cmd entrypoint volume add copy workdir label healthcheck shell",starts:{e:/[^\\]$/,sL:"bash"}}],i:"</"}});
+hljs.registerLanguage("perl",function(e){var t="getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qqfileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmgetsub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedirioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when",r={cN:"subst",b:"[$@]\\{",e:"\\}",k:t},s={b:"->{",e:"}"},n={v:[{b:/\$\d/},{b:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{b:/[\$%@][^\s\w{]/,relevance:0}]},c=[e.BE,r,n],a=[n,e.HCM,e.C("^\\=\\w","\\=cut",{eW:!0}),s,{cN:"string",c:c,v:[{b:"q[qwxr]?\\s*\\(",e:"\\)",relevance:5},{b:"q[qwxr]?\\s*\\[",e:"\\]",relevance:5},{b:"q[qwxr]?\\s*\\{",e:"\\}",relevance:5},{b:"q[qwxr]?\\s*\\|",e:"\\|",relevance:5},{b:"q[qwxr]?\\s*\\<",e:"\\>",relevance:5},{b:"qw\\s+q",e:"q",relevance:5},{b:"'",e:"'",c:[e.BE]},{b:'"',e:'"'},{b:"`",e:"`",c:[e.BE]},{b:"{\\w+}",c:[],relevance:0},{b:"-?\\w+\\s*\\=\\>",c:[],relevance:0}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{b:"(\\/\\/|"+e.RSR+"|\\b(split|return|print|reverse|grep)\\b)\\s*",k:"split return print reverse grep",relevance:0,c:[e.HCM,{cN:"regexp",b:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",relevance:10},{cN:"regexp",b:"(m|qr)?/",e:"/[a-z]*",c:[e.BE],relevance:0}]},{cN:"function",bK:"sub",e:"(\\s*\\(.*?\\))?[;{]",eE:!0,relevance:5,c:[e.TM]},{b:"-\\w\\b",relevance:0},{b:"^__DATA__$",e:"^__END__$",sL:"mojolicious",c:[{b:"^@@.*",e:"$",cN:"comment"}]}];return r.c=a,{aliases:["pl","pm"],l:/[\w\.]+/,k:t,c:s.c=a}});
+hljs.registerLanguage("clean",function(e){return{aliases:["clean","icl","dcl"],k:{keyword:"if let in with where case of class instance otherwise implementation definition system module from import qualified as special code inline foreign export ccall stdcall generic derive infix infixl infixr",built_in:"Int Real Char Bool",literal:"True False"},c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM,{b:"->|<-[|:]?|#!?|>>=|\\{\\||\\|\\}|:==|=:|<>"}]}});
\ No newline at end of file

From d29d69e10d2e1d8a3d0c53505d3938b096e4335e Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 29 May 2020 13:04:51 +0100
Subject: [PATCH 1439/1830] FIX: Invalidate database theme cache when hostname
 changes (#9908)

Hostname can vary per-site on a multisite cluster, so this change requires converting the compiler_version from a constant into a class method which is evaluated at runtime. The value is stored in the theme DistributedCache, so performance impact should be negligible.
---
 app/models/theme.rb       | 19 ++++++++++++++++---
 app/models/theme_field.rb | 20 ++++++--------------
 spec/models/theme_spec.rb | 15 ++++++++++++++-
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/app/models/theme.rb b/app/models/theme.rb
index 4f54f9a518..da9d357729 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -122,6 +122,19 @@ class Theme < ActiveRecord::Base
     SvgSprite.expire_cache
   end
 
+  BASE_COMPILER_VERSION = 16
+  def self.compiler_version
+    get_set_cache "compiler_version" do
+      dependencies = [
+        BASE_COMPILER_VERSION,
+        Ember::VERSION,
+        GlobalSetting.cdn_url,
+        Discourse.current_hostname
+      ]
+      Digest::SHA1.hexdigest(dependencies.join)
+    end
+  end
+
   def self.get_set_cache(key, &blk)
     if @cache.hash.key? key.to_s
       return @cache[key]
@@ -248,7 +261,7 @@ class Theme < ActiveRecord::Base
     theme_ids = [theme_ids] unless Array === theme_ids
 
     theme_ids = transform_ids(theme_ids)
-    cache_key = "#{theme_ids.join(",")}:#{target}:#{field}:#{ThemeField::COMPILER_VERSION}"
+    cache_key = "#{theme_ids.join(",")}:#{target}:#{field}:#{Theme.compiler_version}"
     lookup = @cache[cache_key]
     return lookup.html_safe if lookup
 
@@ -262,7 +275,7 @@ class Theme < ActiveRecord::Base
     theme_ids = [theme_ids] unless Array === theme_ids
 
     theme_ids = transform_ids(theme_ids)
-    get_set_cache("#{theme_ids.join(",")}:modifier:#{modifier_name}:#{ThemeField::COMPILER_VERSION}") do
+    get_set_cache("#{theme_ids.join(",")}:modifier:#{modifier_name}:#{Theme.compiler_version}") do
       ThemeModifierSet.resolve_modifier_for_themes(theme_ids, modifier_name)
     end
   end
@@ -321,7 +334,7 @@ class Theme < ActiveRecord::Base
   def self.resolve_baked_field(theme_ids, target, name)
     if target == :extra_js
       require_rebake = ThemeField.where(theme_id: theme_ids, target_id: Theme.targets[:extra_js]).
-        where("compiler_version <> ?", ThemeField::COMPILER_VERSION)
+        where("compiler_version <> ?", Theme.compiler_version)
       require_rebake.each { |tf| tf.ensure_baked! }
       require_rebake.map(&:theme_id).uniq.each do |theme_id|
         Theme.find(theme_id).update_javascript_cache!
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index c2e8d06a72..a15d42ec9e 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -60,14 +60,6 @@ class ThemeField < ActiveRecord::Base
   validates :name, format: { with: /\A[a-z_][a-z0-9_-]*\z/i },
                    if: Proc.new { |field| ThemeField.theme_var_type_ids.include?(field.type_id) }
 
-  BASE_COMPILER_VERSION = 16
-  DEPENDENT_CONSTANTS = [
-    BASE_COMPILER_VERSION,
-    Ember::VERSION,
-    GlobalSetting.cdn_url
-  ]
-  COMPILER_VERSION = Digest::SHA1.hexdigest(DEPENDENT_CONSTANTS.join)
-
   belongs_to :theme
 
   def process_html(html)
@@ -311,18 +303,18 @@ class ThemeField < ActiveRecord::Base
   end
 
   def ensure_baked!
-    needs_baking = !self.value_baked || compiler_version != COMPILER_VERSION
+    needs_baking = !self.value_baked || compiler_version != Theme.compiler_version
     return unless needs_baking
 
     if basic_html_field? || translation_field?
       self.value_baked, self.error = translation_field? ? process_translation : process_html(self.value)
       self.error = nil unless self.error.present?
-      self.compiler_version = COMPILER_VERSION
+      self.compiler_version = Theme.compiler_version
       DB.after_commit { CSP::Extension.clear_theme_extensions_cache! }
     elsif extra_js_field?
       self.value_baked, self.error = process_extra_js(self.value)
       self.error = nil unless self.error.present?
-      self.compiler_version = COMPILER_VERSION
+      self.compiler_version = Theme.compiler_version
     elsif basic_scss_field?
       ensure_scss_compiles!
       DB.after_commit { Stylesheet::Manager.clear_theme_cache! }
@@ -332,12 +324,12 @@ class ThemeField < ActiveRecord::Base
       DB.after_commit { CSP::Extension.clear_theme_extensions_cache! }
       DB.after_commit { SvgSprite.expire_cache }
       self.value_baked = "baked"
-      self.compiler_version = COMPILER_VERSION
+      self.compiler_version = Theme.compiler_version
     elsif svg_sprite_field?
       DB.after_commit { SvgSprite.expire_cache }
       self.error = nil
       self.value_baked = "baked"
-      self.compiler_version = COMPILER_VERSION
+      self.compiler_version = Theme.compiler_version
     end
 
     if self.will_save_change_to_value_baked? ||
@@ -370,7 +362,7 @@ class ThemeField < ActiveRecord::Base
     rescue SassC::SyntaxError => e
       self.error = e.message unless self.destroyed?
     end
-    self.compiler_version = COMPILER_VERSION
+    self.compiler_version = Theme.compiler_version
     self.value_baked = Digest::SHA1.hexdigest(result.join(",")) # We don't use the compiled CSS here, we just use it to invalidate the stylesheet cache
   end
 
diff --git a/spec/models/theme_spec.rb b/spec/models/theme_spec.rb
index 04b452ccfc..f32dc33760 100644
--- a/spec/models/theme_spec.rb
+++ b/spec/models/theme_spec.rb
@@ -716,7 +716,7 @@ HTML
       first_common_value = Theme.lookup_field(child.id, :desktop, "header")
       first_extra_js_value = Theme.lookup_field(child.id, :extra_js, nil)
 
-      stub_const(ThemeField, :COMPILER_VERSION, "SOME_NEW_HASH") do
+      Theme.stubs(:compiler_version).returns("SOME_NEW_HASH") do
         second_common_value = Theme.lookup_field(child.id, :desktop, "header")
         second_extra_js_value = Theme.lookup_field(child.id, :extra_js, nil)
 
@@ -730,5 +730,18 @@ HTML
         expect(new_extra_js_compiler_version).to eq("SOME_NEW_HASH")
       end
     end
+
+    it 'recompiles when the hostname changes' do
+      theme.set_field(target: :settings, name: :yaml, value: "name: bob")
+      theme_field = theme.set_field(target: :common, name: :after_header, value: '<script>console.log("hello world");</script>')
+      theme.save!
+
+      expect(Theme.lookup_field(theme.id, :common, :after_header)).to include("_ws=#{Discourse.current_hostname}")
+
+      SiteSetting.force_hostname = "someotherhostname.com"
+      Theme.clear_cache!
+
+      expect(Theme.lookup_field(theme.id, :common, :after_header)).to include("_ws=someotherhostname.com")
+    end
   end
 end

From 28f46c171c18c7c4eb20a591141d42288136c173 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 29 May 2020 13:07:47 +0100
Subject: [PATCH 1440/1830] FIX: Pull hotlinked images even when edited by
 system users (#9890)

Previously the pull hotlinked images job was skipped after system edits. This ensured that we never had an infinite loop of system-edit/pull-hotlinked/system-edit/pull-hotlinked etc.

A side effect was that edits made by system for any other reason (e.g. API, removing full quotes) would prevent pulling hotlinked images. This commit removes the system edit check, and replaces it with another method to avoid an infinite job scheduling loop.
---
 app/jobs/regular/pull_hotlinked_images.rb     |  5 ++++-
 app/models/post.rb                            |  3 ++-
 lib/cooked_post_processor.rb                  |  3 +--
 spec/components/cooked_post_processor_spec.rb | 12 +++++-------
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index e7644e8ca8..a26fd0bf62 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -152,7 +152,10 @@ module Jobs
         changes = { raw: raw, edit_reason: I18n.t("upload.edit_reason") }
         post.revise(Discourse.system_user, changes, bypass_bump: true, skip_staff_log: true)
       elsif has_downloaded_image || has_new_large_image || has_new_broken_image
-        post.trigger_post_process(bypass_bump: true)
+        post.trigger_post_process(
+          bypass_bump: true,
+          skip_pull_hotlinked_images: true # Avoid an infinite loop of job scheduling
+        )
       end
     end
 
diff --git a/app/models/post.rb b/app/models/post.rb
index e1a3a1f391..7e92f0e5c4 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -748,11 +748,12 @@ class Post < ActiveRecord::Base
   end
 
   # Enqueue post processing for this post
-  def trigger_post_process(bypass_bump: false, priority: :normal, new_post: false)
+  def trigger_post_process(bypass_bump: false, priority: :normal, new_post: false, skip_pull_hotlinked_images: false)
     args = {
       post_id: id,
       bypass_bump: bypass_bump,
       new_post: new_post,
+      skip_pull_hotlinked_images: skip_pull_hotlinked_images,
     }
     args[:image_sizes] = image_sizes if image_sizes.present?
     args[:invalidate_oneboxes] = true if invalidate_oneboxes.present?
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 258b791dde..c2908a4fb8 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -663,12 +663,11 @@ class CookedPostProcessor
   end
 
   def pull_hotlinked_images
+    return if @opts[:skip_pull_hotlinked_images]
     # have we enough disk space?
     disable_if_low_on_disk_space # But still enqueue the job
     # don't download remote images for posts that are more than n days old
     return unless @post.created_at > (Date.today - SiteSetting.download_remote_images_max_days_old)
-    # we only want to run the job whenever it's changed by a user
-    return if @post.last_editor_id && @post.last_editor_id <= 0
     # make sure no other job is scheduled
     Jobs.cancel_scheduled_job(:pull_hotlinked_images, post_id: @post.id)
     # schedule the job
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index b62350d2be..efad82ca10 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -1485,16 +1485,14 @@ describe CookedPostProcessor do
         expect(SiteSetting.download_remote_images_to_local).to eq(false)
       end
 
+      it "does not run when requested to skip" do
+        CookedPostProcessor.new(post, skip_pull_hotlinked_images: true).pull_hotlinked_images
+        expect(Jobs::PullHotlinkedImages.jobs.size).to eq(0)
+      end
+
       context "and there is enough disk space" do
-
         before { cpp.expects(:disable_if_low_on_disk_space) }
 
-        it "does not run when the system user updated the post" do
-          post.last_editor_id = Discourse.system_user.id
-          Jobs.expects(:cancel_scheduled_job).never
-          cpp.pull_hotlinked_images
-        end
-
         context "and the post has been updated by an actual user" do
 
           before { post.id = 42 }

From 94cb5ab17274a26f7bd972eb06a2d90b73f7a2f1 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 29 May 2020 09:47:25 -0500
Subject: [PATCH 1441/1830] DEV: Remove unused variable topic_tracking_state
 (#9915)

---
 app/models/topic_tracking_state.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index 867961e19d..dcf1d60400 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -9,7 +9,6 @@ class TopicTrackingState
 
   include ActiveModel::SerializerSupport
 
-  CHANNEL = "/user-tracking"
   UNREAD_MESSAGE_TYPE = "unread"
   LATEST_MESSAGE_TYPE = "latest"
   MUTED_MESSAGE_TYPE = "muted"

From e5cd331fb30e88392689053f28f215c8c8905b42 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 29 May 2020 11:56:45 -0400
Subject: [PATCH 1442/1830] DEV: Why use a whole object when a functionw will
 do?

---
 .../app/controllers/preferences/interface.js          |  4 ++--
 .../discourse/app/helpers/page-reloader.js            | 11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
index 2fcc5781c3..c9fb194b80 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
@@ -5,7 +5,7 @@ import { setDefaultHomepage } from "discourse/lib/utilities";
 import discourseComputed from "discourse-common/utils/decorators";
 import { listThemes, setLocalTheme } from "discourse/lib/theme-selector";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import pageReloader from "discourse/helpers/page-reloader";
+import { reload } from "discourse/helpers/page-reloader";
 import {
   safariHacksDisabled,
   isiPad,
@@ -193,7 +193,7 @@ export default Controller.extend({
           }
 
           if (this.themeId !== this.currentThemeId) {
-            pageReloader.reload();
+            reload();
           }
         })
         .catch(popupAjaxError);
diff --git a/app/assets/javascripts/discourse/app/helpers/page-reloader.js b/app/assets/javascripts/discourse/app/helpers/page-reloader.js
index 6429be3a3c..a227bec414 100644
--- a/app/assets/javascripts/discourse/app/helpers/page-reloader.js
+++ b/app/assets/javascripts/discourse/app/helpers/page-reloader.js
@@ -1,10 +1,7 @@
-import EmberObject from "@ember/object";
 import Ember from "ember";
 
-export default EmberObject.create({
-  reload: function() {
-    if (!Ember.testing) {
-      location.reload();
-    }
+export function reload() {
+  if (!Ember.testing) {
+    location.reload();
   }
-});
+}

From e159fb06dff42022b2628b643e7502f7db27640b Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 29 May 2020 17:13:55 +0100
Subject: [PATCH 1443/1830] FEATURE: Download remote images even for old posts
 (#9925)

When a post is rebaked, the admins expect it to work the same regardless of how old the post is.
---
 config/locales/server.en.yml                  |  1 -
 config/site_settings.yml                      |  4 ---
 lib/cooked_post_processor.rb                  |  2 --
 spec/components/cooked_post_processor_spec.rb | 28 -------------------
 4 files changed, 35 deletions(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index ee1d6dde67..09e9a706c8 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1452,7 +1452,6 @@ en:
     crawl_images: "Retrieve images from remote URLs to insert the correct width and height dimensions."
     download_remote_images_to_local: "Convert remote images to local images by downloading them; this prevents broken images."
     download_remote_images_threshold: "Minimum disk space necessary to download remote images locally (in percent)"
-    download_remote_images_max_days_old: "Don't download remote images for posts that are more than n days old."
     disabled_image_download_domains: "Remote images will never be downloaded from these domains. Pipe-delimited list."
     editing_grace_period: "For (n) seconds after posting, editing will not create a new version in the post history."
     editing_grace_period_max_diff: "Maximum number of character changes allowed in editing grace period, if more changed store another post revision (trust level 0 and 1)"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index cfeb71108e..4676660f69 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1166,10 +1166,6 @@ files:
   download_remote_images_to_local:
     default: true
   download_remote_images_threshold: 10
-  download_remote_images_max_days_old:
-    default: 30
-    min: 1
-    max: 10000
   disabled_image_download_domains:
     type: list
     default: ""
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index c2908a4fb8..8651502c8f 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -666,8 +666,6 @@ class CookedPostProcessor
     return if @opts[:skip_pull_hotlinked_images]
     # have we enough disk space?
     disable_if_low_on_disk_space # But still enqueue the job
-    # don't download remote images for posts that are more than n days old
-    return unless @post.created_at > (Date.today - SiteSetting.download_remote_images_max_days_old)
     # make sure no other job is scheduled
     Jobs.cancel_scheduled_job(:pull_hotlinked_images, post_id: @post.id)
     # schedule the job
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index efad82ca10..aa63a7e4c8 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -1555,34 +1555,6 @@ describe CookedPostProcessor do
 
   end
 
-  context "#download_remote_images_max_days_old" do
-
-    let(:post) { build(:post, created_at: 20.days.ago) }
-    let(:cpp) { CookedPostProcessor.new(post) }
-
-    before do
-      SiteSetting.download_remote_images_to_local = true
-      cpp.expects(:disable_if_low_on_disk_space).returns(false)
-    end
-
-    it "does not run when download_remote_images_max_days_old is not satisfied" do
-      SiteSetting.download_remote_images_max_days_old = 15
-      Jobs.expects(:cancel_scheduled_job).never
-      cpp.pull_hotlinked_images
-    end
-
-    it "runs when download_remote_images_max_days_old is satisfied" do
-      SiteSetting.download_remote_images_max_days_old = 30
-
-      Jobs.expects(:cancel_scheduled_job).with(:pull_hotlinked_images, post_id: post.id).once
-
-      delay = SiteSetting.editing_grace_period + 1
-      Jobs.expects(:enqueue_in).with(delay.seconds, :pull_hotlinked_images, post_id: post.id).once
-
-      cpp.pull_hotlinked_images
-    end
-  end
-
   context "#is_a_hyperlink?" do
 
     let(:post) { build(:post) }

From 3fe5eacd1b11e156517d7ae53d890c8463260a9f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 29 May 2020 12:16:05 -0400
Subject: [PATCH 1444/1830] DEV: Abstract `Ember.testing` so our application
 code doesn't use it

---
 .../discourse-common/addon/config/environment.js         | 8 +++++++-
 .../javascripts/discourse/app/helpers/page-reloader.js   | 4 ++--
 .../javascripts/discourse/app/lib/category-tag-search.js | 9 +++++----
 app/assets/javascripts/discourse/app/lib/user-search.js  | 3 ++-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse-common/addon/config/environment.js b/app/assets/javascripts/discourse-common/addon/config/environment.js
index 18ce3cc976..8d684bf5a4 100644
--- a/app/assets/javascripts/discourse-common/addon/config/environment.js
+++ b/app/assets/javascripts/discourse-common/addon/config/environment.js
@@ -1,3 +1,9 @@
 export const INPUT_DELAY = 250;
 
-export default { environment: Ember.testing ? "test" : "development" };
+let environment = Ember.testing ? "test" : "development";
+
+export function isTesting() {
+  return environment === "test";
+}
+
+export default { environment };
diff --git a/app/assets/javascripts/discourse/app/helpers/page-reloader.js b/app/assets/javascripts/discourse/app/helpers/page-reloader.js
index a227bec414..e2b8382482 100644
--- a/app/assets/javascripts/discourse/app/helpers/page-reloader.js
+++ b/app/assets/javascripts/discourse/app/helpers/page-reloader.js
@@ -1,7 +1,7 @@
-import Ember from "ember";
+import { isTesting } from "discourse-common/config/environment";
 
 export function reload() {
-  if (!Ember.testing) {
+  if (!isTesting()) {
     location.reload();
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/category-tag-search.js b/app/assets/javascripts/discourse/app/lib/category-tag-search.js
index 85b17f5aac..9a370f0e21 100644
--- a/app/assets/javascripts/discourse/app/lib/category-tag-search.js
+++ b/app/assets/javascripts/discourse/app/lib/category-tag-search.js
@@ -5,10 +5,11 @@ import { TAG_HASHTAG_POSTFIX } from "discourse/lib/tag-hashtags";
 import { SEPARATOR } from "discourse/lib/category-hashtags";
 import { Promise } from "rsvp";
 import { later, cancel } from "@ember/runloop";
+import { isTesting } from "discourse-common/config/environment";
 
-var cache = {};
-var cacheTime;
-var oldSearch;
+let cache = {};
+let cacheTime;
+let oldSearch;
 
 function updateCache(term, results) {
   cache[term] = results;
@@ -22,7 +23,7 @@ function searchTags(term, categories, limit) {
       () => {
         resolve(CANCELLED_STATUS);
       },
-      Ember.testing ? 50 : 5000
+      isTesting() ? 50 : 5000
     );
 
     const debouncedSearch = discourseDebounce((q, cats, resultFunc) => {
diff --git a/app/assets/javascripts/discourse/app/lib/user-search.js b/app/assets/javascripts/discourse/app/lib/user-search.js
index 86d7d46012..5a6312274d 100644
--- a/app/assets/javascripts/discourse/app/lib/user-search.js
+++ b/app/assets/javascripts/discourse/app/lib/user-search.js
@@ -4,6 +4,7 @@ import { userPath } from "discourse/lib/url";
 import { emailValid } from "discourse/lib/utilities";
 import { Promise } from "rsvp";
 import { later, cancel } from "@ember/runloop";
+import { isTesting } from "discourse-common/config/environment";
 
 var cache = {},
   cacheKey,
@@ -185,7 +186,7 @@ export default function userSearch(options) {
       () => {
         resolve(CANCELLED_STATUS);
       },
-      Ember.testing ? 50 : 5000
+      isTesting() ? 50 : 5000
     );
 
     if (skipSearch(term, options.allowEmails)) {

From ecfce93f28e23ddaca5b38e2ed2bb029e14fc8ed Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 29 May 2020 17:47:05 +0100
Subject: [PATCH 1445/1830] FIX: Support IRIs (unicode URIs) when pulling
 hotlinked images (#9928)

---
 app/jobs/regular/pull_hotlinked_images.rb | 19 ++++++++++++-------
 spec/jobs/pull_hotlinked_images_spec.rb   | 11 +++++++++++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index a26fd0bf62..cb0fee6062 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -59,7 +59,7 @@ module Jobs
         if should_download_image?(src, post)
           begin
             # have we already downloaded that file?
-            schemeless_src = remove_scheme(original_src)
+            schemeless_src = normalize_src(original_src)
 
             unless downloaded_images.include?(schemeless_src) || large_images.include?(schemeless_src) || broken_images.include?(schemeless_src)
 
@@ -75,17 +75,17 @@ module Jobs
 
                   if upload.persisted?
                     downloaded_urls[src] = upload.url
-                    downloaded_images[remove_scheme(src)] = upload.id
+                    downloaded_images[normalize_src(src)] = upload.id
                     has_downloaded_image = true
                   else
                     log(:info, "Failed to pull hotlinked image for post: #{post_id}: #{src} - #{upload.errors.full_messages.join("\n")}")
                   end
                 else
-                  large_images << remove_scheme(original_src)
+                  large_images << normalize_src(original_src)
                   has_new_large_image = true
                 end
               else
-                broken_images << remove_scheme(original_src)
+                broken_images << normalize_src(original_src)
                 has_new_broken_image = true
               end
             end
@@ -95,8 +95,8 @@ module Jobs
               escaped_src = Regexp.escape(original_src)
 
               replace_raw = ->(match, match_src, replacement, _index) {
-                if remove_scheme(src) == remove_scheme(match_src)
 
+                if normalize_src(src) == normalize_src(match_src)
                   replacement =
                     if replacement.include?(InlineUploads::PLACEHOLDER)
                       replacement.sub(InlineUploads::PLACEHOLDER, upload.short_url)
@@ -215,8 +215,13 @@ module Jobs
 
     private
 
-    def remove_scheme(src)
-      src.sub(/^https?:/i, "")
+    def normalize_src(src)
+      uri = Addressable::URI.heuristic_parse(src)
+      uri.normalize!
+      uri.scheme = nil
+      uri.to_s
+    rescue URI::Error
+      src
     end
   end
 
diff --git a/spec/jobs/pull_hotlinked_images_spec.rb b/spec/jobs/pull_hotlinked_images_spec.rb
index de87e7e153..5e6003d0b7 100644
--- a/spec/jobs/pull_hotlinked_images_spec.rb
+++ b/spec/jobs/pull_hotlinked_images_spec.rb
@@ -8,12 +8,14 @@ describe Jobs::PullHotlinkedImages do
   let(:image_url) { "http://wiki.mozilla.org/images/2/2e/Longcat1.png" }
   let(:broken_image_url) { "http://wiki.mozilla.org/images/2/2e/Longcat2.png" }
   let(:large_image_url) { "http://wiki.mozilla.org/images/2/2e/Longcat3.png" }
+  let(:encoded_image_url) { "https://example.com/אלחוט-.jpg" }
   let(:png) { Base64.decode64("R0lGODlhAQABALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//wBiZCH5BAEAAA8ALAAAAAABAAEAAAQC8EUAOw==") }
   let(:large_png) { Base64.decode64("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") }
   let(:upload_path) { Discourse.store.upload_path }
 
   before do
     stub_request(:get, image_url).to_return(body: png, headers: { "Content-Type" => "image/png" })
+    stub_request(:get, encoded_image_url).to_return(body: png, headers: { "Content-Type" => "image/png" })
     stub_request(:get, broken_image_url).to_return(status: 404)
     stub_request(:get, large_image_url).to_return(body: large_png, headers: { "Content-Type" => "image/png" })
 
@@ -58,6 +60,15 @@ describe Jobs::PullHotlinkedImages do
       expect(post.reload.raw).to eq("![](#{Upload.last.short_url})")
     end
 
+    it 'replaces encoded image urls' do
+      post = Fabricate(:post, raw: "<img src='#{encoded_image_url}'>")
+      expect do
+        Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
+      end.to change { Upload.count }.by(1)
+
+      expect(post.reload.raw).to eq("![](#{Upload.last.short_url})")
+    end
+
     it 'replaces images in an anchor tag with weird indentation' do
       stub_request(:get, "http://test.localhost/uploads/short-url/z2QSs1KJWoj51uYhDjb6ifCzxH6.gif")
         .to_return(status: 200, body: "")

From 2b2434b82d2c7919e764248f756246d5f1d686b2 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 29 May 2020 14:37:02 -0400
Subject: [PATCH 1446/1830] Start Discourse in an initializer (#9930)

* DEV: To be pedantic, there is more than EMBER in there now

* DEV: Use less globals. Have `Discourse` start in an initializer

* DEV: Remove another global
---
 app/assets/javascripts/discourse-loader.js    | 10 +-
 .../pre-initializers/discourse-bootstrap.js   | 94 +++++++++++++++++++
 .../inject-discourse-objects.js               |  1 +
 .../discourse/app/widgets/post-stream.js      |  3 +-
 .../javascripts/preload-application-data.js   | 84 -----------------
 app/assets/javascripts/start-discourse.js     |  4 +
 app/views/layouts/application.html.erb        |  2 +-
 config/application.rb                         |  2 +-
 lib/discourse_js_processor.rb                 |  2 +-
 test/javascripts/test_helper.js               |  2 -
 10 files changed, 109 insertions(+), 95 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
 delete mode 100644 app/assets/javascripts/preload-application-data.js
 create mode 100644 app/assets/javascripts/start-discourse.js

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index fc829ae12f..f6a28c01cb 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -1,7 +1,7 @@
 var define, requirejs;
 
 (function() {
-  var EMBER_MODULES = {};
+  var JS_MODULES = {};
   var ALIASES = {
     "ember-addons/ember-computed-decorators":
       "discourse-common/utils/decorators",
@@ -11,7 +11,7 @@ var define, requirejs;
 
   // In future versions of ember we don't need this
   if (typeof Ember !== "undefined") {
-    EMBER_MODULES = {
+    JS_MODULES = {
       jquery: { default: $ },
       "@ember/array": {
         default: Ember.Array,
@@ -285,7 +285,7 @@ var define, requirejs;
       name = "@ember/object";
     }
 
-    var mod = EMBER_MODULES[name] || registry[name];
+    var mod = JS_MODULES[name] || registry[name];
     if (!mod) {
       throw new Error(
         "Could not find module `" + name + "` imported from `" + origin + "`"
@@ -308,8 +308,8 @@ var define, requirejs;
 
   requirejs = require = function(name) {
     name = transformForAliases(name);
-    if (EMBER_MODULES[name]) {
-      return EMBER_MODULES[name];
+    if (JS_MODULES[name]) {
+      return JS_MODULES[name];
     }
 
     var mod = registry[name];
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js b/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
new file mode 100644
index 0000000000..494ed5e2e9
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
@@ -0,0 +1,94 @@
+import PreloadStore from "discourse/lib/preload-store";
+import I18n from "I18n";
+import Session from "discourse/models/session";
+import RSVP from "rsvp";
+import { isTesting } from "discourse-common/config/environment";
+
+export default {
+  name: "discourse-bootstrap",
+
+  // The very first initializer to run
+  initialize(container, app) {
+    // Our test environment has its own bootstrap code
+    if (isTesting()) {
+      return;
+    }
+    const preloadedDataElement = document.getElementById("data-preloaded");
+    const setupData = document.getElementById("data-discourse-setup").dataset;
+
+    if (preloadedDataElement) {
+      const preloaded = JSON.parse(preloadedDataElement.dataset.preloaded);
+
+      Object.keys(preloaded).forEach(function(key) {
+        PreloadStore.store(key, JSON.parse(preloaded[key]));
+
+        if (setupData.debugPreloadedAppData === "true") {
+          /* eslint-disable no-console */
+          console.log(key, PreloadStore.get(key));
+          /* eslint-enable no-console */
+        }
+      });
+    }
+
+    app.CDN = setupData.cdn;
+    app.BaseUrl = setupData.baseUrl;
+    app.BaseUri = setupData.baseUri;
+    app.Environment = setupData.environment;
+    app.SiteSettings = PreloadStore.get("siteSettings");
+    app.ThemeSettings = PreloadStore.get("themeSettings");
+    app.LetterAvatarVersion = setupData.letterAvatarVersion;
+    app.MarkdownItURL = setupData.markdownItUrl;
+    app.ServiceWorkerURL = setupData.serviceWorkerUrl;
+    I18n.defaultLocale = setupData.defaultLocale;
+
+    window.Logster = window.Logster || {};
+    window.Logster.enabled = setupData.enableJsErrorReporting === "true";
+
+    app.set("assetVersion", setupData.assetVersion);
+
+    Session.currentProp(
+      "disableCustomCSS",
+      setupData.disableCustomCss === "true"
+    );
+
+    if (setupData.safeMode) {
+      Session.currentProp("safe_mode", setupData.safeMode);
+    }
+
+    app.HighlightJSPath = setupData.highlightJsPath;
+    app.SvgSpritePath = setupData.svgSpritePath;
+
+    if (app.Environment === "development") {
+      app.SvgIconList = setupData.svgIconList;
+    }
+
+    if (setupData.s3BaseUrl) {
+      app.S3CDN = setupData.s3Cdn;
+      app.S3BaseUrl = setupData.s3BaseUrl;
+    }
+
+    RSVP.configure("onerror", function(e) {
+      // Ignore TransitionAborted exceptions that bubble up
+      if (e && e.message === "TransitionAborted") {
+        return;
+      }
+
+      if (Discourse.Environment === "development") {
+        /* eslint-disable no-console  */
+        if (e) {
+          if (e.message || e.stack) {
+            console.log(e.message);
+            console.log(e.stack);
+          } else {
+            console.log("Uncaught promise: ", e);
+          }
+        } else {
+          console.log("A promise failed but was not caught.");
+        }
+        /* eslint-enable no-console  */
+      }
+
+      window.onerror(e && e.message, null, null, null, e);
+    });
+  }
+};
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
index 045798e6a0..9c2a3e4779 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
@@ -15,6 +15,7 @@ const ALL_TARGETS = ["controller", "component", "route", "model", "adapter"];
 
 export default {
   name: "inject-discourse-objects",
+  after: "discourse-bootstrap",
 
   initialize(container, app) {
     ALL_TARGETS.forEach(t => app.inject(t, "appEvents", "service:app-events"));
diff --git a/app/assets/javascripts/discourse/app/widgets/post-stream.js b/app/assets/javascripts/discourse/app/widgets/post-stream.js
index 6406d1c9e8..1ccb12f462 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-stream.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-stream.js
@@ -3,6 +3,7 @@ import { createWidget } from "discourse/widgets/widget";
 import transformPost from "discourse/lib/transform-post";
 import { Placeholder } from "discourse/lib/posts-with-placeholders";
 import { addWidgetCleanCallback } from "discourse/components/mount-widget";
+import { isTesting } from "discourse-common/config/environment";
 
 let transformCallbacks = null;
 export function postTransformCallbacks(transformed) {
@@ -19,7 +20,7 @@ export function addPostTransformCallback(callback) {
   transformCallbacks.push(callback);
 }
 
-const CLOAKING_ENABLED = !window.inTestEnv;
+const CLOAKING_ENABLED = !isTesting();
 const DAY = 1000 * 60 * 60 * 24;
 
 const _dontCloak = {};
diff --git a/app/assets/javascripts/preload-application-data.js b/app/assets/javascripts/preload-application-data.js
deleted file mode 100644
index bb11ecbea4..0000000000
--- a/app/assets/javascripts/preload-application-data.js
+++ /dev/null
@@ -1,84 +0,0 @@
-// discourse-skip-module
-(function() {
-  const ps = require("discourse/lib/preload-store").default;
-  const preloadedDataElement = document.getElementById("data-preloaded");
-  const setupData = document.getElementById("data-discourse-setup").dataset;
-  const I18n = require("I18n").default;
-
-  if (preloadedDataElement) {
-    const preloaded = JSON.parse(preloadedDataElement.dataset.preloaded);
-
-    Object.keys(preloaded).forEach(function(key) {
-      ps.store(key, JSON.parse(preloaded[key]));
-
-      if (setupData.debugPreloadedAppData === "true") {
-        /* eslint-disable no-console */
-        console.log(key, ps.get(key));
-        /* eslint-enable no-console */
-      }
-    });
-  }
-
-  window.Logster = window.Logster || {};
-  window.Logster.enabled = setupData.enableJsErrorReporting === "true";
-
-  Discourse.CDN = setupData.cdn;
-  Discourse.BaseUrl = setupData.baseUrl;
-  Discourse.BaseUri = setupData.baseUri;
-  Discourse.Environment = setupData.environment;
-  Discourse.SiteSettings = ps.get("siteSettings");
-  Discourse.ThemeSettings = ps.get("themeSettings");
-  Discourse.LetterAvatarVersion = setupData.letterAvatarVersion;
-  Discourse.MarkdownItURL = setupData.markdownItUrl;
-  Discourse.ServiceWorkerURL = setupData.serviceWorkerUrl;
-  I18n.defaultLocale = setupData.defaultLocale;
-  Discourse.start();
-  Discourse.set("assetVersion", setupData.assetVersion);
-
-  const Session = require("discourse/models/session").default;
-  Session.currentProp(
-    "disableCustomCSS",
-    setupData.disableCustomCss === "true"
-  );
-
-  if (setupData.safeMode) {
-    Session.currentProp("safe_mode", setupData.safeMode);
-  }
-
-  Discourse.HighlightJSPath = setupData.highlightJsPath;
-  Discourse.SvgSpritePath = setupData.svgSpritePath;
-
-  if (Discourse.Environment === "development") {
-    Discourse.SvgIconList = setupData.svgIconList;
-  }
-
-  if (setupData.s3BaseUrl) {
-    Discourse.S3CDN = setupData.s3Cdn;
-    Discourse.S3BaseUrl = setupData.s3BaseUrl;
-  }
-
-  // eslint-disable-next-line
-  Ember.RSVP.configure("onerror", function(e) {
-    // Ignore TransitionAborted exceptions that bubble up
-    if (e && e.message === "TransitionAborted") {
-      return;
-    }
-
-    if (Discourse.Environment === "development") {
-      /* eslint-disable no-console  */
-      if (e) {
-        if (e.message || e.stack) {
-          console.log(e.message);
-          console.log(e.stack);
-        } else {
-          console.log("Uncaught promise: ", e);
-        }
-      } else {
-        console.log("A promise failed but was not caught.");
-      }
-      /* eslint-enable no-console  */
-    }
-
-    window.onerror(e && e.message, null, null, null, e);
-  });
-})();
diff --git a/app/assets/javascripts/start-discourse.js b/app/assets/javascripts/start-discourse.js
new file mode 100644
index 0000000000..cabffc4a5e
--- /dev/null
+++ b/app/assets/javascripts/start-discourse.js
@@ -0,0 +1,4 @@
+// discourse-skip-module
+(function() {
+  Discourse.start();
+})();
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 862e00f2db..9cb5efcce9 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -109,7 +109,7 @@
     <% end %>
 
     <div class="hidden" id="data-preloaded" data-preloaded="<%= preloaded_json %>"></div>
-    <%= preload_script "preload-application-data" %>
+    <%= preload_script "start-discourse" %>
 
     <%= yield :data %>
 
diff --git a/config/application.rb b/config/application.rb
index 3f0f558f03..f2cbb14391 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -154,7 +154,7 @@ module Discourse
       service-worker.js
       google-tag-manager.js
       google-universal-analytics.js
-      preload-application-data.js
+      start-discourse.js
       print-page.js
       omniauth-complete.js
       activate-account.js
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index df5e35c697..274fda206d 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -48,7 +48,7 @@ class DiscourseJsProcessor
     return false if relative_path.start_with?("#{js_root}/plugins/")
 
     return true if %w(
-      preload-application-data
+      start-discourse
       wizard-start
       onpopstate-handler
       google-tag-manager
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 5e7c155edd..cc599032a1 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -53,8 +53,6 @@ sinon.config = {
   useFakeServer: false
 };
 
-window.inTestEnv = true;
-
 let MessageBus = require("message-bus-client").default;
 
 // Stop the message bus so we don't get ajax calls

From 931bfca4541caab70b1e135446054c610ded343f Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 29 May 2020 21:01:19 +0200
Subject: [PATCH 1447/1830] DEV: allows categories-admin-dropdown to have
 custom items (#9931)

Usage:

```
modifySelectKit("categories-admin-dropdown").appendContent(function() {
  return {
    id: "foo",
    name: I18n.t("foo"),
    description: I18n.t("foo_description"),
    icon: "gear",
    onChange: () => alert("Foo.")
  };
});
```
---
 .../addon/components/categories-admin-dropdown.js      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js b/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
index d8ea039ffd..2274158410 100644
--- a/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
+++ b/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
@@ -36,5 +36,13 @@ export default DropdownSelectBoxComponent.extend({
     }
 
     return items;
-  })
+  }),
+
+  _onChange(value, item) {
+    if (item.onChange) {
+      item.onChange(value, item);
+    } else if (this.attrs.onChange) {
+      this.attrs.onChange(value, item);
+    }
+  }
 });

From 8e6d95a30941501915d7b97c3b5d4de1f7905be0 Mon Sep 17 00:00:00 2001
From: Joe <johani@discourse.org>
Date: Sat, 30 May 2020 03:04:12 +0800
Subject: [PATCH 1448/1830] DEV: adds a few plugin outlets required for themes
 (#9929)

---
 .../discourse/app/templates/components/composer-toggles.hbs | 4 +++-
 .../javascripts/discourse/app/templates/discovery.hbs       | 4 +++-
 .../discourse/app/templates/discovery/topics.hbs            | 6 +++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
index a9efe1f6d5..09509b0557 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
@@ -1,4 +1,6 @@
 <div class="composer-controls">
+  {{plugin-outlet name="before-composer-toggles"}}
+
   {{#if site.mobileView}}
     {{flat-button
       class="toggle-toolbar"
@@ -19,4 +21,4 @@
       action=toggleFullscreen
       title=fullscreenTitle}}
   {{/unless}}
-</div>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/discovery.hbs b/app/assets/javascripts/discourse/app/templates/discovery.hbs
index ddec84d234..b8c7f4dc36 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery.hbs
@@ -14,6 +14,8 @@
 
   {{conditional-loading-spinner condition=loading}}
 
+  {{plugin-outlet name="discovery-above"}}
+
   <div class="container list-container {{if loading "hidden"}}">
     <div class="row">
       <div class="full-width">
@@ -34,4 +36,4 @@
   </div>
 
   {{plugin-outlet name="discovery-below"}}
-{{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
index 2bb1379c80..b793e261cb 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
@@ -42,6 +42,8 @@
       {{period-chooser period=period action=(action "changePeriod") fullDay=false}}
     </div>
   {{else}}
+    {{plugin-outlet name="before-topic-list" args=(hash category=category)}}
+
     {{#if topicTrackingState.hasIncoming}}
       <div class="show-more {{if hasTopics "has-topics"}}">
         <a tabindex="0" href {{action "showInserted"}} class="alert alert-info clickable">
@@ -73,6 +75,8 @@
       scrollOnLoad=true
       onScroll=discoveryTopicList.saveScrollPosition}}
   {{/if}}
+
+  {{plugin-outlet name="after-topic-list" args=(hash category=category)}}
 {{/discovery-topics-list}}
 
 <footer class="topic-list-bottom">
@@ -107,4 +111,4 @@
     {{/footer-message}}
 
   {{/if}}
-</footer>
+</footer>
\ No newline at end of file

From 7a76f3c29538e6b90e5462a89aafe013659e49fc Mon Sep 17 00:00:00 2001
From: Joe <johani@discourse.org>
Date: Sat, 30 May 2020 03:31:28 +0800
Subject: [PATCH 1449/1830] UX: Relocate before-topic-list outlet so it shows
 up on Top as well

---
 .../javascripts/discourse/app/templates/discovery/topics.hbs   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
index b793e261cb..6c5b479624 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
@@ -42,8 +42,6 @@
       {{period-chooser period=period action=(action "changePeriod") fullDay=false}}
     </div>
   {{else}}
-    {{plugin-outlet name="before-topic-list" args=(hash category=category)}}
-
     {{#if topicTrackingState.hasIncoming}}
       <div class="show-more {{if hasTopics "has-topics"}}">
         <a tabindex="0" href {{action "showInserted"}} class="alert alert-info clickable">
@@ -52,6 +50,7 @@
       </div>
     {{/if}}
   {{/if}}
+  {{plugin-outlet name="before-topic-list" args=(hash category=category)}}
 
   {{#if hasTopics}}
     {{topic-list

From 03c3448b158baa1f15311c9938ff7c1a5c33aaf2 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 29 May 2020 22:48:47 +0200
Subject: [PATCH 1450/1830] UX: better alignment of icons in notifications menu
 (#9934)

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

diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index e07095f500..bcf14d29c0 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -212,12 +212,13 @@
     }
     li:not(.show-all) {
       padding: 0;
+
       a {
         display: flex;
-        align-items: center;
         padding: 0.25em 0.5em;
       }
       .d-icon {
+        padding-top: 0.2em;
         margin-right: 0.5em;
       }
     }

From c5ccf5f93c7be57e5d73b705932e90a5d05e485a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 30 May 2020 00:06:35 +0200
Subject: [PATCH 1451/1830] UI: removes font-weight: bold from category-drop
 names (#9937)

---
 app/assets/stylesheets/common/select-kit/category-drop.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss
index 8529cfd2a2..414a4a3d6e 100644
--- a/app/assets/stylesheets/common/select-kit/category-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/category-drop.scss
@@ -66,7 +66,6 @@
 
         .badge-wrapper {
           margin: 0;
-          font-weight: bold;
 
           &:nth-child(2) {
             margin-left: 10px;

From 8f59f155fbfbf9a8b2aecfafb5f222261b6ebfae Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 30 May 2020 00:32:20 +0200
Subject: [PATCH 1452/1830] UI: makes topic count less visible in category drop
 (#9938)

---
 .../stylesheets/common/select-kit/category-drop.scss       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss
index 414a4a3d6e..d7a6b3e0ba 100644
--- a/app/assets/stylesheets/common/select-kit/category-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/category-drop.scss
@@ -60,8 +60,13 @@
         }
 
         .topic-count {
-          margin-left: 5px;
+          margin-left: 0.5em;
           font-weight: normal;
+          color: $primary-medium;
+        }
+
+        .category-name {
+          color: $primary;
         }
 
         .badge-wrapper {

From 32e40ea1337150f271761179178d5e8a1d52cf42 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 29 May 2020 21:02:26 -0400
Subject: [PATCH 1453/1830] UX: Make the menu links header within the user
 panel more flexible

---
 .../stylesheets/common/base/menu-panel.scss     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index bcf14d29c0..3921556f1f 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -279,10 +279,9 @@
 
 div.menu-links-header {
   width: 100%;
-  display: table;
-  border-collapse: separate;
-  border-spacing: 0 0.5em;
+  margin-bottom: 0.5em;
   .menu-links-row {
+    box-sizing: border-box;
     border-bottom: 1px solid dark-light-choose($primary-low, $secondary-medium);
     display: flex;
 
@@ -295,15 +294,17 @@ div.menu-links-header {
       flex-wrap: wrap;
       &.user {
         margin-right: auto;
+        flex: 1 1 0;
+        overflow: hidden;
       }
       &.glyphs {
-        flex-wrap: wrap;
+        flex-wrap: nowrap;
         text-align: right;
 
         a {
           // Expand the click area a bit.
-          padding-left: 0.55em;
-          padding-right: 0.55em;
+          padding-left: 0.6em;
+          padding-right: 0.6em;
         }
       }
 
@@ -347,10 +348,11 @@ div.menu-links-header {
     padding: 0.3em 0.5em;
   }
   a.user-activity-link {
+    box-sizing: border-box;
     align-items: center;
     display: flex;
     margin: -0.5em 0;
-    max-width: 120px;
+    max-width: 100%;
 
     // `overflow: hidden` on `.user-activity-link` would hide the `::after`
     // pseudo element (used to create the tab-looking effect). Sets `overflow:
@@ -359,7 +361,6 @@ div.menu-links-header {
 
     span.d-label {
       display: block;
-      max-width: 130px;
       @include ellipsis;
     }
 

From 3c11c5dcdc18fe82e890b843c2e1694bfe2c20cb Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 29 May 2020 22:05:58 -0400
Subject: [PATCH 1454/1830] show-replies styles were lost with some menu
 changes

---
 .../stylesheets/desktop/topic-post.scss       | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 8a395b5301..3d5f0017dc 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -149,23 +149,7 @@ nav.post-controls {
       margin-right: 5px;
       transition: all linear 0.15s;
     }
-    .show-replies {
-      margin-left: -10px;
-      font-size: inherit;
-      span.badge-posts {
-        color: dark-light-choose($primary-medium, $secondary-high);
-      }
-      &:hover {
-        background: $primary-low;
-        span.badge-posts {
-          color: $primary;
-        }
-      }
-      .d-icon {
-        margin-left: 5px;
-        font-size: $font-down-1;
-      }
-    }
+
     button.create {
       margin-right: 0;
       color: dark-light-choose($primary-high, $secondary-low);
@@ -215,6 +199,22 @@ nav.post-controls {
       }
     }
   }
+
+  .show-replies {
+    font-size: $font-up-1;
+    margin-left: -10px;
+    font-size: inherit;
+    padding: 10px;
+    color: $primary-medium;
+    &:hover {
+      color: $primary;
+      background: $primary-low;
+    }
+    .d-icon {
+      margin-left: 5px;
+      font-size: $font-down-1;
+    }
+  }
 }
 
 pre.copy-codeblocks .copy-cmd:not(.copied) {

From 530c6594cb9d0a447f3375bb1abde6d5c3b2ecf9 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 29 May 2020 22:23:23 -0400
Subject: [PATCH 1455/1830] follow-up fix due to adding overflow hidden in
 32e40ea

---
 .../stylesheets/common/base/menu-panel.scss   | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 3921556f1f..b2b219603e 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -154,6 +154,9 @@
   .quick-access-panel {
     width: 100%;
     display: table;
+    margin-top: -1px;
+    border-top: 1px solid $primary-low;
+    padding-top: 0.5em;
 
     h3 {
       padding: 0 0.4em;
@@ -279,12 +282,10 @@
 
 div.menu-links-header {
   width: 100%;
-  margin-bottom: 0.5em;
   .menu-links-row {
     box-sizing: border-box;
-    border-bottom: 1px solid dark-light-choose($primary-low, $secondary-medium);
     display: flex;
-
+    z-index: 2;
     // Tabs should have "ears".
     padding: 0 4px;
 
@@ -312,26 +313,17 @@ div.menu-links-header {
         // This is to make sure active and inactive tab icons have the same
         // size. `box-sizing` does not work and I have no idea why.
         border: 1px solid transparent;
-        border-bottom: 0;
+        &:not(.active):hover {
+          border-bottom: 0;
+          margin-top: -1px;
+        }
       }
 
       a.active {
         border: 1px solid dark-light-choose($primary-low, $secondary-medium);
-        border-bottom: 0;
+        border-bottom: 1px solid $secondary;
         position: relative;
 
-        &:after {
-          display: block;
-          position: absolute;
-          top: 100%;
-          left: 0;
-          z-index: z("header") + 1; // Higher than .menu-panel
-          width: 100%;
-          height: 0;
-          content: "";
-          border-top: 1px solid $secondary;
-        }
-
         &:focus,
         &:hover {
           background-color: inherit;
@@ -351,7 +343,6 @@ div.menu-links-header {
     box-sizing: border-box;
     align-items: center;
     display: flex;
-    margin: -0.5em 0;
     max-width: 100%;
 
     // `overflow: hidden` on `.user-activity-link` would hide the `::after`

From 93bd1ff228d471a6f48537f64f9cb328e26951c2 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 30 May 2020 10:53:08 +0200
Subject: [PATCH 1456/1830] FIX: topic-admin-popup-menu was overflowing on
 small screens (#9944)

---
 app/assets/stylesheets/mobile/topic.scss | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index f2fcdfd7ba..f9e6b44de3 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -221,29 +221,24 @@ sub sub {
 @media screen and (max-height: 600px) {
   .topic-admin-popup-menu {
     box-sizing: border-box;
-    width: 100%;
-    padding: 1em;
-    .header {
-      padding: 0;
-      position: relative;
-      .close-button {
-        position: absolute;
-        display: inline-block;
-        right: 0;
-        top: -0.1em;
-        width: auto;
-        background: transparent;
-      }
-    }
+    padding: 0.25em;
+
     ul {
       display: grid;
       grid-template-columns: 1fr 1fr 1fr;
+
       @media screen and (max-width: 550px) {
         grid-template-columns: 1fr 1fr;
       }
+
       .popup-menu-btn {
         @include ellipsis;
       }
+
+      li {
+        border: 0;
+        min-width: 0;
+      }
     }
   }
 }

From e1af91f5aeaf5d19837544adab416b6ae3559e0f Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Sat, 30 May 2020 20:53:53 +0530
Subject: [PATCH 1457/1830] Revert "FEATURE: category setting for default list
 filter."

This reverts commit 6f03d14c2340397b0ce9d175a2270ebae4180987.
---
 .../app/components/edit-category-settings.js     |  7 -------
 .../javascripts/discourse/app/models/category.js |  3 +--
 .../components/edit-category-settings.hbs        | 16 ----------------
 app/controllers/categories_controller.rb         |  1 -
 ...1959_add_default_list_filter_to_categories.rb |  7 -------
 5 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 db/migrate/20200524181959_add_default_list_filter_to_categories.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 c811ce2db6..5844e45d0c 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-settings.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-settings.js
@@ -68,13 +68,6 @@ export default buildCategoryPanel("settings", {
     );
   },
 
-  @discourseComputed
-  availableListFilters() {
-    return ["all", "none"].map(p => {
-      return { name: I18n.t(`category.list_filters.${p}`), value: p };
-    });
-  },
-
   @discourseComputed
   searchPrioritiesOptions() {
     const options = [];
diff --git a/app/assets/javascripts/discourse/app/models/category.js b/app/assets/javascripts/discourse/app/models/category.js
index eaca16a29d..78802cba87 100644
--- a/app/assets/javascripts/discourse/app/models/category.js
+++ b/app/assets/javascripts/discourse/app/models/category.js
@@ -187,8 +187,7 @@ const Category = RestModel.extend({
         ),
         search_priority: this.search_priority,
         reviewable_by_group_name: this.reviewable_by_group_name,
-        read_only_banner: this.read_only_banner,
-        default_list_filter: this.default_list_filter
+        read_only_banner: this.read_only_banner
       },
       type: id ? "PUT" : "POST"
     });
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 2218fc27fd..ab17a307c3 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
@@ -196,22 +196,6 @@
       {{/unless}}
     </div>
   </section>
-
-  <section class="field">
-    <label for="category-default-filter">
-      {{i18n "category.default_list_filter"}}
-    </label>
-    <div class="controls">
-      {{combo-box
-        id="category-default-filter"
-        valueProperty="value"
-        content=availableListFilters
-        value=category.default_list_filter
-        none="category.list_filters.all"
-      }}
-    </div>
-  </section>
-
   {{#if isParentCategory}}
     <section class="field show-subcategory-list-field">
       <label>
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 20e02ab061..8a36480609 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -329,7 +329,6 @@ class CategoriesController < ApplicationController
         :required_tag_group_name,
         :min_tags_from_required_group,
         :read_only_banner,
-        :default_list_filter,
         custom_fields: [params[:custom_fields].try(:keys)],
         permissions: [*p.try(:keys)],
         allowed_tags: [],
diff --git a/db/migrate/20200524181959_add_default_list_filter_to_categories.rb b/db/migrate/20200524181959_add_default_list_filter_to_categories.rb
deleted file mode 100644
index 4c43b5ccd3..0000000000
--- a/db/migrate/20200524181959_add_default_list_filter_to_categories.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class AddDefaultListFilterToCategories < ActiveRecord::Migration[6.0]
-  def change
-    add_column :categories, :default_list_filter, :string, limit: 20, default: 'all'
-  end
-end

From f2647f1f36c95db004f6054a8db12311d8b2b890 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Sat, 30 May 2020 15:32:57 -0400
Subject: [PATCH 1458/1830] UX: Position topic admin menu next to wrench
 (#9932)

---
 .../discourse/app/widgets/topic-admin-menu.js    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
index 4d0ea65734..2ba85dabc8 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
@@ -90,19 +90,31 @@ createWidget("topic-admin-menu-button", {
       $button = $(e.target).closest("button");
     }
 
-    const position = $button.position();
+    const position = $button.position(),
+      SPACING = 3,
+      MENU_WIDTH = 217;
 
     const rtl = $("html").hasClass("rtl");
     position.outerHeight = $button.outerHeight();
 
     if (rtl) {
-      position.left -= 217 - $button.outerWidth();
+      position.left -= MENU_WIDTH - $button.outerWidth();
     }
 
     if (this.attrs.fixed) {
       position.left += $button.width() - 203;
     }
 
+    if (this.attrs.openUpwards) {
+      if (rtl) {
+        position.left -= $button[0].offsetWidth + SPACING;
+      } else {
+        position.left += $button[0].offsetWidth + SPACING;
+      }
+    } else {
+      position.top += $button[0].offsetHeight + SPACING;
+    }
+
     if (this.site.mobileView && !this.attrs.rightSide) {
       const headerCloak = document.querySelector(".header-cloak");
       if (headerCloak) headerCloak.style.display = "block";

From 5c24f83a6b9ef300f52cbe8031bfd64d94a48e55 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 1 Jun 2020 10:22:04 +0800
Subject: [PATCH 1459/1830] DEV: Bump rails_failover.

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6144799fb4..a16bffaa7a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/discourse/rails_failover
-  revision: ab8fd97f4507a09a2084beb13cf96e77f3fcfb6e
+  revision: 0e668eba86591c20aa7a43f47b0cd36d4eacaeb6
   specs:
     rails_failover (0.4.0)
       activerecord (~> 6.0)

From 3894555b2ed9cbc40fd1c9ee028933adf74b495b Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 1 Jun 2020 10:55:53 +0800
Subject: [PATCH 1460/1830] DEV: Prefer `Discourse.redis.reconnct`.

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

diff --git a/lib/discourse.rb b/lib/discourse.rb
index 66c459da67..aa417260da 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -652,7 +652,7 @@ module Discourse
     # note: some of this reconnecting may no longer be needed per https://github.com/redis/redis-rb/pull/414
     MessageBus.after_fork
     SiteSetting.after_fork
-    Discourse.redis._client.reconnect
+    Discourse.redis.reconnect
     Rails.cache.reconnect
     Discourse.cache.reconnect
     Logster.store.redis.reconnect

From df62407f3506f1000625bb91dfbf8fe81a44c91d Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 1 Jun 2020 11:20:20 +0800
Subject: [PATCH 1461/1830] DEV: Implement multiple keys support for
 `DiscourseRedis#exists`.

---
 lib/discourse.rb                        |  2 +-
 lib/discourse_redis.rb                  | 13 ++++++++++++-
 spec/components/discourse_redis_spec.rb | 26 +++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/lib/discourse.rb b/lib/discourse.rb
index aa417260da..8417558972 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -489,7 +489,7 @@ module Discourse
   end
 
   def self.readonly_mode?(keys = READONLY_KEYS)
-    recently_readonly? || Discourse.redis.mget(*keys).compact.present?
+    recently_readonly? || Discourse.redis.exists(*keys)
   end
 
   def self.pg_readonly_mode?
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index 6b630b7b34..5ef5de9ce9 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -194,7 +194,7 @@ class DiscourseRedis
   end
 
   # Proxy key methods through, but prefix the keys with the namespace
-  [:append, :blpop, :brpop, :brpoplpush, :decr, :decrby, :exists, :expire, :expireat, :get, :getbit, :getrange, :getset,
+  [:append, :blpop, :brpop, :brpoplpush, :decr, :decrby, :expire, :expireat, :get, :getbit, :getrange, :getset,
    :hdel, :hexists, :hget, :hgetall, :hincrby, :hincrbyfloat, :hkeys, :hlen, :hmget, :hmset, :hset, :hsetnx, :hvals, :incr,
    :incrby, :incrbyfloat, :lindex, :linsert, :llen, :lpop, :lpush, :lpushx, :lrange, :lrem, :lset, :ltrim,
    :mapped_hmset, :mapped_hmget, :mapped_mget, :mapped_mset, :mapped_msetnx, :move, :mset,
@@ -208,6 +208,17 @@ class DiscourseRedis
     end
   end
 
+  # Remove when this has been upstreamed in https://github.com/redis/redis-rb/pull/911
+  def exists(*keys)
+    keys.map! { |a| "#{namespace}:#{a}" }  if @namespace
+
+    DiscourseRedis.ignore_readonly do
+      @redis._client.call([:exists, *keys]) do |value|
+        value > 0
+      end
+    end
+  end
+
   def mget(*args)
     args.map! { |a| "#{namespace}:#{a}" }  if @namespace
     DiscourseRedis.ignore_readonly { @redis.mget(*args) }
diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb
index abc9a5917a..059e144962 100644
--- a/spec/components/discourse_redis_spec.rb
+++ b/spec/components/discourse_redis_spec.rb
@@ -87,6 +87,32 @@ describe DiscourseRedis do
         expect(Discourse.recently_readonly?).to eq(true)
       end
     end
+
+    # Remove when this has been upstreamed in https://github.com/redis/redis-rb/pull/911
+    describe '.exists' do
+      it 'should return false when key is not present' do
+        expect(Discourse.redis.exists('test')).to eq(false)
+      end
+
+      it 'should return false when keys are not present' do
+        expect(Discourse.redis.exists('test', 'test2')).to eq(false)
+      end
+
+      it 'should return true when key is present' do
+        Discourse.redis.set('test', 1)
+
+        expect(Discourse.redis.exists('test')).to eq(true)
+      end
+
+      it 'should return true when any key is present' do
+        Discourse.redis.set('test', 1)
+        Discourse.redis.set('test2', 1)
+
+        expect(Discourse.redis.exists('test')).to eq(true)
+        expect(Discourse.redis.exists('test', 'test2')).to eq(true)
+        expect(Discourse.redis.exists('test2', 'test3')).to eq(true)
+      end
+    end
   end
 
   context '.slave_host' do

From b0b37bf5a37d60f37beb24444f55d6f385d84935 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 1 Jun 2020 11:23:58 +0800
Subject: [PATCH 1462/1830] DEV: Add force rails_over switch via Redis.

---
 config/initializers/002-rails_failover.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index e4bb24e928..d3249d6c4d 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -11,7 +11,14 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
     Sidekiq.unpause!
   end
 
+  module Discourse
+    PG_FORCE_READONLY_MODE_KEY ||= 'readonly_mode:postgres_force'
+  end
+
   RailsFailover::ActiveRecord.register_force_reading_role_callback do
-    Discourse.pg_readonly_mode?
+    Discourse.redis.exists(
+      Discourse::PG_READONLY_MODE_KEY,
+      Discourse::PG_FORCE_READONLY_MODE_KEY
+    )
   end
 end

From 9a6ef8073921899cb2bc901c1d6429cf16b916b0 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Mon, 1 Jun 2020 13:49:27 +1000
Subject: [PATCH 1463/1830] FEATURE: notify admins about old credentials
 (#9918)

* FEATURE: notify admins about old credentials

Security and API keys should be renewed periodically.
This additional notification should help admins keep their Discourse safe and secure.
---
 app/jobs/scheduled/old_keys_reminder.rb | 64 ++++++++++++++++++++
 config/locales/server.en.yml            | 12 ++++
 config/site_settings.yml                |  3 +
 spec/jobs/old_keys_reminder_spec.rb     | 78 +++++++++++++++++++++++++
 4 files changed, 157 insertions(+)
 create mode 100644 app/jobs/scheduled/old_keys_reminder.rb
 create mode 100644 spec/jobs/old_keys_reminder_spec.rb

diff --git a/app/jobs/scheduled/old_keys_reminder.rb b/app/jobs/scheduled/old_keys_reminder.rb
new file mode 100644
index 0000000000..8689c60cbf
--- /dev/null
+++ b/app/jobs/scheduled/old_keys_reminder.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Jobs
+  class OldKeysReminder < ::Jobs::Scheduled
+    every 1.month
+
+    OLD_CREDENTIALS_PERIOD = 2.years
+
+    def execute(_args)
+      return if SiteSetting.send_old_credential_reminder_days.to_i == 0
+      return if message_exists?
+      return if old_site_settings_keys.blank? && old_api_keys.blank?
+      PostCreator.create!(
+        Discourse.system_user,
+        title: title,
+        raw: body,
+        archetype: Archetype.private_message,
+        target_usernames: admins.map(&:username),
+        validate: false
+      )
+    end
+
+    private
+
+    def old_site_settings_keys
+      @old_site_settings_keys ||= SiteSetting.secret_settings.each_with_object([]) do |secret_name, old_keys|
+        site_setting = SiteSetting.find_by(name: secret_name)
+        next if site_setting&.value.blank?
+        next if site_setting.updated_at + OLD_CREDENTIALS_PERIOD > Time.zone.now
+        old_keys << site_setting
+      end.sort_by { |key| key.updated_at }
+    end
+
+    def old_api_keys
+      @old_api_keys ||= ApiKey.all.order(created_at: :asc).each_with_object([]) do |api_key, old_keys|
+        next if api_key.created_at + OLD_CREDENTIALS_PERIOD > Time.zone.now
+        old_keys << api_key
+      end
+    end
+
+    def admins
+      User.real.admins
+    end
+
+    def message_exists?
+      message = Topic.private_messages.with_deleted.find_by(title: title)
+      message && message.created_at + SiteSetting.send_old_credential_reminder_days.to_i.days > Time.zone.now
+    end
+
+    def title
+      I18n.t('old_keys_reminder.title')
+    end
+
+    def body
+      I18n.t('old_keys_reminder.body', keys: keys_list)
+    end
+
+    def keys_list
+      messages = old_site_settings_keys.map { |key| "#{key.name} - #{key.updated_at.to_date.to_s(:db)}" }
+      old_api_keys.each_with_object(messages) { |key, array| array << "#{[key.description, key.user&.username, key.created_at.to_date.to_s(:db)].compact.join(" - ")}" }
+      messages.join("\n")
+    end
+  end
+end
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 09e9a706c8..7c043dc22b 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1582,6 +1582,7 @@ en:
     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)"
+    send_old_credential_reminder_days: "Remind about old credentials after days"
 
     email_token_valid_hours: "Forgot password / activate account tokens are valid for (n) hours."
 
@@ -4820,3 +4821,14 @@ en:
 
   discord:
     not_in_allowed_guild: "Authentication failed. You are not a member of a permitted Discord guild."
+
+  old_keys_reminder:
+    title: "Reminder about old credentials"
+    body: |
+      Hello! This is a routine yearly security reminder from your Discourse instance.
+      
+      As a courtesy, we wanted to let you know that the following credentials used on your Discourse instance have not been updated in more than two years:
+      
+      %{keys}
+      
+      No action is required at this time, however, it is considered good security practice to cycle all your important credentials every few years.
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 4676660f69..5901d6d338 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1454,6 +1454,9 @@ security:
   allow_embedding_site_in_an_iframe:
     default: false
     hidden: true
+  send_old_credential_reminder_days:
+    default: 0
+    hidden: true
 
 onebox:
   enable_flash_video_onebox: false
diff --git a/spec/jobs/old_keys_reminder_spec.rb b/spec/jobs/old_keys_reminder_spec.rb
new file mode 100644
index 0000000000..fe68070f99
--- /dev/null
+++ b/spec/jobs/old_keys_reminder_spec.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Jobs::OldKeysReminder do
+  let!(:google_secret) { SiteSetting.create!(name: 'google_oauth2_client_secret', value: '123', data_type: 1) }
+  let!(:instagram_secret) { SiteSetting.create!(name: 'instagram_consumer_secret', value: '123', data_type: 1) }
+  let!(:api_key) { Fabricate(:api_key, description: 'api key description') }
+  let!(:admin) { Fabricate(:admin) }
+  let!(:another_admin) { Fabricate(:admin) }
+
+  let!(:recent_twitter_secret) { SiteSetting.create!(name: 'twitter_consumer_secret', value: '123', data_type: 1, updated_at: 2.years.from_now) }
+  let!(:recent_api_key) { Fabricate(:api_key, description: 'recent api key description', created_at: 2.years.from_now, user_id: admin.id) }
+
+  it 'is disabled be default' do
+    freeze_time 2.years.from_now
+    expect { described_class.new.execute({}) }.not_to change { Post.count }
+  end
+
+  it 'sends message to admin with old credentials' do
+    SiteSetting.send_old_credential_reminder_days = '365'
+    freeze_time 2.years.from_now
+    expect { described_class.new.execute({}) }.to change { Post.count }.by(1)
+    post = Post.last
+    expect(post.archetype).to eq(Archetype.private_message)
+    expect(post.topic.topic_allowed_users.map(&:user_id).sort).to eq([Discourse.system_user.id, admin.id, another_admin.id].sort)
+    expect(post.topic.title).to eq('Reminder about old credentials')
+    expect(post.raw).to eq(<<-MSG.rstrip)
+Hello! This is a routine yearly security reminder from your Discourse instance.
+
+As a courtesy, we wanted to let you know that the following credentials used on your Discourse instance have not been updated in more than two years:
+
+google_oauth2_client_secret - #{google_secret.updated_at.to_date.to_s(:db)}
+instagram_consumer_secret - #{instagram_secret.updated_at.to_date.to_s(:db)}
+api key description - #{api_key.created_at.to_date.to_s(:db)}
+
+No action is required at this time, however, it is considered good security practice to cycle all your important credentials every few years.
+    MSG
+
+    post.topic.destroy
+    freeze_time 4.years.from_now
+    described_class.new.execute({})
+    post = Post.last
+    expect(post.topic.title).to eq('Reminder about old credentials')
+    expect(post.raw).to eq(<<-MSG.rstrip)
+Hello! This is a routine yearly security reminder from your Discourse instance.
+
+As a courtesy, we wanted to let you know that the following credentials used on your Discourse instance have not been updated in more than two years:
+
+google_oauth2_client_secret - #{google_secret.updated_at.to_date.to_s(:db)}
+instagram_consumer_secret - #{instagram_secret.updated_at.to_date.to_s(:db)}
+twitter_consumer_secret - #{recent_twitter_secret.updated_at.to_date.to_s(:db)}
+api key description - #{api_key.created_at.to_date.to_s(:db)}
+recent api key description - #{admin.username} - #{recent_api_key.created_at.to_date.to_s(:db)}
+
+No action is required at this time, however, it is considered good security practice to cycle all your important credentials every few years.
+    MSG
+  end
+
+  it 'does not send message when send_old_credential_reminder_days is set to 0 or no old keys' do
+    expect { described_class.new.execute({}) }.to change { Post.count }.by(0)
+    SiteSetting.send_old_credential_reminder_days = '0'
+    freeze_time 2.years.from_now
+    expect { described_class.new.execute({}) }.to change { Post.count }.by(0)
+  end
+
+  it 'does not send a message if already exists' do
+    SiteSetting.send_old_credential_reminder_days = '367'
+    freeze_time 2.years.from_now
+    expect { described_class.new.execute({}) }.to change { Post.count }.by(1)
+    Topic.last.trash!
+    expect { described_class.new.execute({}) }.to change { Post.count }.by(0)
+    freeze_time 1.years.from_now
+    expect { described_class.new.execute({}) }.to change { Post.count }.by(0)
+    freeze_time 3.days.from_now
+    expect { described_class.new.execute({}) }.to change { Post.count }.by(1)
+  end
+end

From 8c8391c74254cd1316c91c862ad27dc13c6cabb9 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Sat, 30 May 2020 01:02:51 +0200
Subject: [PATCH 1464/1830] DEV: Don't require wget in script/bench

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

diff --git a/script/bench.rb b/script/bench.rb
index 02b9686657..6d9394e52a 100644
--- a/script/bench.rb
+++ b/script/bench.rb
@@ -229,7 +229,7 @@ begin
               'Api-Username' => "admin1" }
 
   # asset precompilation is a dog, wget to force it
-  run "wget http://127.0.0.1:#{@port}/ -o /dev/null -O /dev/null"
+  run "curl -s -o /dev/null http://127.0.0.1:#{@port}/"
 
   redirect_response = `curl -s -I "http://127.0.0.1:#{@port}/t/i-am-a-topic-used-for-perf-tests"`
   if redirect_response !~ /301 Moved Permanently/

From 4babdf510bfbe343b2cdeb18728e99fd6b8917aa Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Sat, 30 May 2020 01:03:40 +0200
Subject: [PATCH 1465/1830] DEV: Update facter usage

`Facter.reset` (https://github.com/puppetlabs/facter-ng/blob/65d167eac93f47dde42ac0476c4f2f676fb07362/lib/facter.rb#L126-L137) clears `Facter::Options[:external_dir]` which seems to be the 4.x equivalent of `Facter::Util::Config.external_facts_dirs`.

This commit also makes sure that version 4.0 or higher is installed.
---
 script/bench.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/script/bench.rb b/script/bench.rb
index 6d9394e52a..ce88f408b4 100644
--- a/script/bench.rb
+++ b/script/bench.rb
@@ -68,10 +68,9 @@ end
 
 begin
   require 'facter'
+  raise LoadError if Gem::Version.new(Facter.version) < Gem::Version.new("4.0")
 rescue LoadError
   run "gem install facter"
-  # Facter requires CFPropertyList, but doesn't install it.
-  run "gem install CFPropertyList"
   puts "please rerun script"
   exit
 end
@@ -286,7 +285,7 @@ begin
 
   # Prevent using external facts because it breaks when running in the
   # discourse/discourse_bench docker container.
-  Facter::Util::Config.external_facts_dirs = []
+  Facter.reset
   facts = Facter.to_hash
 
   facts.delete_if { |k, v|

From 7ac9a79ecb081c579a0c7446fe5876f4e03b0b8a Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Sat, 30 May 2020 20:46:25 +0200
Subject: [PATCH 1466/1830] UX: Fix inputs alignment in admin/customize/colors

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

diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index d887275e94..7fd4fc4f4c 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -487,10 +487,14 @@
     .hex-input {
       width: 80px;
       margin-bottom: 0;
+      margin-right: 6px;
     }
     .hex {
       text-align: center;
     }
+    .color-input {
+      display: flex;
+    }
     h3 {
       margin: 0;
     }

From 754a255ef7f169b588207041d2c2bef83a90437b Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Sat, 30 May 2020 20:48:23 +0200
Subject: [PATCH 1467/1830] UX: Remove the period after "Enable Notifications"
 button

---
 .../app/templates/components/notification-consent-banner.hbs     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/notification-consent-banner.hbs b/app/assets/javascripts/discourse/app/templates/components/notification-consent-banner.hbs
index 463b1b4f17..3c04a03265 100644
--- a/app/assets/javascripts/discourse/app/templates/components/notification-consent-banner.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/notification-consent-banner.hbs
@@ -8,7 +8,6 @@
           action=(action "turnon")
           label="user.desktop_notifications.enable"
         }}
-        .
       </span>
       {{d-button
         icon="times"

From 7bcee784c84a3847373791795c5cbf6acfc8d74a Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Sat, 30 May 2020 21:11:25 +0200
Subject: [PATCH 1468/1830] DEV: Remove an obsolete comment

Its first part was removed with other changes and this one got displaced after a `prettier` pass.
---
 app/assets/stylesheets/common/admin/dashboard.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/common/admin/dashboard.scss b/app/assets/stylesheets/common/admin/dashboard.scss
index fbae66ab16..8a5a5e00c6 100644
--- a/app/assets/stylesheets/common/admin/dashboard.scss
+++ b/app/assets/stylesheets/common/admin/dashboard.scss
@@ -351,7 +351,6 @@
   flex-direction: column;
 
   .dashboard-inline-table {
-    //  and "hides" margin when the item spans 100% width
     flex: 1 0 auto;
     max-width: 95%;
   }

From 9ee77eae98d5aec4534f6f12cf070a26fe0ca4e0 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Sun, 31 May 2020 12:25:49 +0200
Subject: [PATCH 1469/1830] FIX: `z` helper doesn't resolve inside `calc`

It resulted in invalid `z-index: calc(z("tooltip") - 100)` in the output CSS. `calc` wasn't necessary here anyway since both operands are constant.
---
 app/assets/stylesheets/common/base/d-popover.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/d-popover.scss b/app/assets/stylesheets/common/base/d-popover.scss
index 713432fec3..98ec3b1d87 100644
--- a/app/assets/stylesheets/common/base/d-popover.scss
+++ b/app/assets/stylesheets/common/base/d-popover.scss
@@ -75,7 +75,7 @@ $d-popover-border: $primary-medium;
     color: transparent;
     content: "";
     position: absolute;
-    z-index: calc(z("tooltip") - 100);
+    z-index: z("tooltip") - 100;
   }
 
   .d-popover-top-arrow {

From 7df688d108e5810408490bd9d19c6d5f9f922310 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Sun, 31 May 2020 14:35:08 +0200
Subject: [PATCH 1470/1830] FIX: Handle files removed between `glob` and
 `mtime`

---
 lib/file_store/base_store.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rb
index df85960391..483277618f 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -151,8 +151,14 @@ module FileStore
 
       # Remove all but CACHE_MAXIMUM_SIZE most recent files
       files = Dir.glob("#{CACHE_DIR}*")
-        .sort_by { |f| File.mtime(f) }
-        .slice(0...-CACHE_MAXIMUM_SIZE)
+      files.sort_by! do |file|
+        begin
+          File.mtime(file)
+        rescue Errno::ENOENT
+          Time.new(0)
+        end
+      end
+      files.pop(CACHE_MAXIMUM_SIZE)
 
       FileUtils.rm(files, force: true)
     end

From 27ad562ff57faef4307df1dfc14091e8ae1f3df7 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 1 Jun 2020 06:07:07 +0200
Subject: [PATCH 1471/1830] DEV: Rubocop fix

---
 lib/file_store/base_store.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rb
index 483277618f..7d22640b13 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -151,9 +151,9 @@ module FileStore
 
       # Remove all but CACHE_MAXIMUM_SIZE most recent files
       files = Dir.glob("#{CACHE_DIR}*")
-      files.sort_by! do |file|
+      files.sort_by! do |f|
         begin
-          File.mtime(file)
+          File.mtime(f)
         rescue Errno::ENOENT
           Time.new(0)
         end

From 2c3ff3e524b33aa35300eaf135c3991f2074ae75 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 1 Jun 2020 12:12:24 +0800
Subject: [PATCH 1472/1830] DEV: Missing readonly mode banner when forcing PG
 readonly.

---
 config/initializers/002-rails_failover.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index d3249d6c4d..8085060c2c 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -13,6 +13,16 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
 
   module Discourse
     PG_FORCE_READONLY_MODE_KEY ||= 'readonly_mode:postgres_force'
+
+    READONLY_KEYS.push(PG_FORCE_READONLY_MODE_KEY)
+
+    def self.enable_pg_force_readonly_mode
+      Discourse.redis.set(PG_FORCE_READONLY_MODE_KEY, 1)
+    end
+
+    def self.disable_pg_force_readonly_mode
+      Discourse.redis.del(PG_FORCE_READONLY_MODE_KEY)
+    end
   end
 
   RailsFailover::ActiveRecord.register_force_reading_role_callback do

From 00aab498297cba8f977c1e0eb17b7d38ff06cc68 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 1 Jun 2020 07:04:16 +0200
Subject: [PATCH 1473/1830] FIX: Restore the ability to rebake posts in deleted
 topics (#9951)

Lost in #9852
---
 app/models/post.rb       | 2 +-
 spec/models/post_spec.rb | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/models/post.rb b/app/models/post.rb
index 7e92f0e5c4..37b5deadc9 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -651,7 +651,7 @@ class Post < ActiveRecord::Base
     )
 
     if is_first_post?
-      topic.update_excerpt(excerpt_for_topic)
+      topic&.update_excerpt(excerpt_for_topic)
     end
 
     if invalidate_broken_images
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 5bc5206bce..fe4fe1add1 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1214,6 +1214,13 @@ describe Post do
       post.topic.reload
       expect(post.topic.excerpt).to eq("test")
     end
+
+    it "works with posts in deleted topics" do
+      post = create_post
+      post.topic.trash!
+      post.reload
+      post.rebake!
+    end
   end
 
   describe "#set_owner" do

From 389bdcf5ab1b45705320db8ba8b28f36f5ca3732 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 1 Jun 2020 13:11:06 +0800
Subject: [PATCH 1474/1830] DEV: Fix implementation for
 `DiscourseRedis#exists`.

---
 lib/discourse_redis.rb                  | 8 +++++---
 spec/components/discourse_redis_spec.rb | 1 -
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index 5ef5de9ce9..e273810a3c 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -208,13 +208,15 @@ class DiscourseRedis
     end
   end
 
-  # Remove when this has been upstreamed in https://github.com/redis/redis-rb/pull/911
+  # Implement our own because https://github.com/redis/redis-rb/issues/698 has stalled
   def exists(*keys)
     keys.map! { |a| "#{namespace}:#{a}" }  if @namespace
 
     DiscourseRedis.ignore_readonly do
-      @redis._client.call([:exists, *keys]) do |value|
-        value > 0
+      @redis.synchronize do |client|
+        client.call([:exists, *keys]) do |value|
+          value > 0
+        end
       end
     end
   end
diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb
index 059e144962..8e4411653b 100644
--- a/spec/components/discourse_redis_spec.rb
+++ b/spec/components/discourse_redis_spec.rb
@@ -88,7 +88,6 @@ describe DiscourseRedis do
       end
     end
 
-    # Remove when this has been upstreamed in https://github.com/redis/redis-rb/pull/911
     describe '.exists' do
       it 'should return false when key is not present' do
         expect(Discourse.redis.exists('test')).to eq(false)

From 32735be5bd5170949c21ad0eb08b15a87c1d11d2 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 1 Jun 2020 13:26:12 +0800
Subject: [PATCH 1475/1830] DEV: Fix publish to message_bus when forcing pg
 readonly.

---
 config/initializers/002-rails_failover.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index 8085060c2c..9985ecd520 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -18,10 +18,15 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
 
     def self.enable_pg_force_readonly_mode
       Discourse.redis.set(PG_FORCE_READONLY_MODE_KEY, 1)
+      MessageBus.publish(readonly_channel, true)
+      Site.clear_anon_cache!
+      true
     end
 
     def self.disable_pg_force_readonly_mode
-      Discourse.redis.del(PG_FORCE_READONLY_MODE_KEY)
+      result = Discourse.redis.del(PG_FORCE_READONLY_MODE_KEY)
+      MessageBus.publish(readonly_channel, false)
+      result > 0
     end
   end
 

From 82de9c53088ca7b3d009d0a8b22791f07c6c975b Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 1 Jun 2020 17:05:04 +1000
Subject: [PATCH 1476/1830] DEV: add countTags to topic tracking state

This introduces a new core API to get counts per tag from topic
tracking state

This API will only be useful if a plugin enable tags in topic
tracking state using

`TopicTrackingState.include_tags_in_report = true`
---
 .../app/models/topic-tracking-state.js        | 52 ++++++++++++++-----
 .../models/topic-tracking-state-test.js       | 50 ++++++++++++++++++
 2 files changed, 90 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
index be49ad4b39..65d1c21269 100644
--- a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
+++ b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
@@ -404,10 +404,10 @@ const TopicTrackingState = EmberObject.extend({
     return new Set(result);
   },
 
-  countNew(categoryId) {
+  countCategoryByState(fn, categoryId) {
     const subcategoryIds = this.getSubCategoryIds(categoryId);
     return _.chain(this.states)
-      .filter(isNew)
+      .filter(fn)
       .filter(
         topic =>
           topic.archetype !== "private_message" &&
@@ -417,17 +417,45 @@ const TopicTrackingState = EmberObject.extend({
       .value().length;
   },
 
+  countNew(categoryId) {
+    return this.countCategoryByState(isNew, categoryId);
+  },
+
   countUnread(categoryId) {
-    const subcategoryIds = this.getSubCategoryIds(categoryId);
-    return _.chain(this.states)
-      .filter(isUnread)
-      .filter(
-        topic =>
-          topic.archetype !== "private_message" &&
-          !topic.deleted &&
-          (!categoryId || subcategoryIds.has(topic.category_id))
-      )
-      .value().length;
+    return this.countCategoryByState(isUnread, categoryId);
+  },
+
+  countTags(tags) {
+    let counts = {};
+
+    tags.forEach(tag => {
+      counts[tag] = { unreadCount: 0, newCount: 0 };
+    });
+
+    Object.values(this.states).forEach(topic => {
+      if (
+        topic.archetype !== "private_message" &&
+        !topic.deleted &&
+        topic.tags
+      ) {
+        let newTopic = isNew(topic);
+        let unreadTopic = isUnread(topic);
+        if (isUnread || isNew) {
+          tags.forEach(tag => {
+            if (topic.tags.indexOf(tag) > -1) {
+              if (unreadTopic) {
+                counts[tag].unreadCount++;
+              }
+              if (newTopic) {
+                counts[tag].newCount++;
+              }
+            }
+          });
+        }
+      }
+    });
+
+    return counts;
   },
 
   countCategory(category_id) {
diff --git a/test/javascripts/models/topic-tracking-state-test.js b/test/javascripts/models/topic-tracking-state-test.js
index 709928c932..ee6c0c0e4e 100644
--- a/test/javascripts/models/topic-tracking-state-test.js
+++ b/test/javascripts/models/topic-tracking-state-test.js
@@ -14,6 +14,56 @@ QUnit.module("model:topic-tracking-state", {
   }
 });
 
+QUnit.test("tag counts", function(assert) {
+  const state = TopicTrackingState.create();
+
+  state.loadStates([
+    {
+      topic_id: 1,
+      last_read_post_number: null,
+      tags: ["foo", "new"]
+    },
+    {
+      topic_id: 2,
+      last_read_post_number: null,
+      tags: ["new"]
+    },
+    {
+      topic_id: 3,
+      last_read_post_number: null,
+      tags: ["random"]
+    },
+    {
+      topic_id: 4,
+      last_read_post_number: 1,
+      highest_post_number: 7,
+      tags: ["unread"],
+      notification_level: NotificationLevels.TRACKING
+    },
+    {
+      topic_id: 5,
+      last_read_post_number: 1,
+      highest_post_number: 7,
+      tags: ["bar", "unread"],
+      notification_level: NotificationLevels.TRACKING
+    },
+    {
+      topic_id: 6,
+      last_read_post_number: 1,
+      highest_post_number: 7,
+      tags: null,
+      notification_level: NotificationLevels.TRACKING
+    }
+  ]);
+
+  const states = state.countTags(["new", "unread"]);
+
+  assert.equal(states["new"].newCount, 2, "new counts");
+  assert.equal(states["new"].unreadCount, 0, "new counts");
+  assert.equal(states["unread"].unreadCount, 2, "unread counts");
+  assert.equal(states["unread"].newCount, 0, "unread counts");
+});
+
 QUnit.test("sync", function(assert) {
   const state = TopicTrackingState.create();
   state.states["t111"] = { last_read_post_number: null };

From 40c4a8e3fc8ca20e1186a7f8b193bb1615fcc8b1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 1 Jun 2020 11:09:34 +0200
Subject: [PATCH 1477/1830] DEV: skips/tweaks brittle tests (#9952)

---
 .../discourse/app/lib/user-search.js          |  2 +-
 test/javascripts/acceptance/topic-test.js     |  2 +-
 .../select-kit/user-chooser-test.js           | 25 -------------------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/user-search.js b/app/assets/javascripts/discourse/app/lib/user-search.js
index 5a6312274d..05d1741761 100644
--- a/app/assets/javascripts/discourse/app/lib/user-search.js
+++ b/app/assets/javascripts/discourse/app/lib/user-search.js
@@ -186,7 +186,7 @@ export default function userSearch(options) {
       () => {
         resolve(CANCELLED_STATUS);
       },
-      isTesting() ? 50 : 5000
+      isTesting() ? 250 : 5000
     );
 
     if (skipSearch(term, options.allowEmails)) {
diff --git a/test/javascripts/acceptance/topic-test.js b/test/javascripts/acceptance/topic-test.js
index eae9f30446..749b6c9920 100644
--- a/test/javascripts/acceptance/topic-test.js
+++ b/test/javascripts/acceptance/topic-test.js
@@ -236,7 +236,7 @@ acceptance("Topic featured links", {
   }
 });
 
-QUnit.test("remove featured link", async assert => {
+QUnit.skip("remove featured link", async assert => {
   await visit("/t/-/299/1");
   assert.ok(
     exists(".title-wrapper .topic-featured-link"),
diff --git a/test/javascripts/components/select-kit/user-chooser-test.js b/test/javascripts/components/select-kit/user-chooser-test.js
index d54da015d5..d980301f1e 100644
--- a/test/javascripts/components/select-kit/user-chooser-test.js
+++ b/test/javascripts/components/select-kit/user-chooser-test.js
@@ -1,6 +1,5 @@
 import componentTest from "helpers/component-test";
 import { testSelectKitModule } from "helpers/select-kit-helper";
-import pretender from "helpers/create-pretender";
 
 testSelectKitModule("user-chooser");
 
@@ -32,27 +31,3 @@ componentTest("can remove a username", {
     assert.equal(this.subject.header().name(), "martin");
   }
 });
-
-componentTest("can add a username", {
-  template: template(),
-
-  beforeEach() {
-    this.set("value", ["bob", "martin"]);
-
-    const response = object => {
-      return [200, { "Content-Type": "application/json" }, object];
-    };
-
-    pretender.get("/u/search/users", () => {
-      return response({ users: [{ username: "maja", name: "Maja" }] });
-    });
-  },
-
-  async test(assert) {
-    await this.subject.expand();
-    await this.subject.fillInFilter("maja");
-    await this.subject.keyboard("enter");
-
-    assert.equal(this.subject.header().name(), "bob,martin,maja");
-  }
-});

From 6ed3dbef034083c8b871d243c8af6069ebb22531 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 1 Jun 2020 11:21:07 +0200
Subject: [PATCH 1478/1830] UX: Fix border radius artifacts on dashboard pills
 (#9949)

---
 .../stylesheets/common/admin/dashboard.scss   | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/common/admin/dashboard.scss b/app/assets/stylesheets/common/admin/dashboard.scss
index 8a5a5e00c6..a2ba7db079 100644
--- a/app/assets/stylesheets/common/admin/dashboard.scss
+++ b/app/assets/stylesheets/common/admin/dashboard.scss
@@ -354,17 +354,18 @@
     flex: 1 0 auto;
     max-width: 95%;
   }
+
   .table-cell {
     display: flex;
     flex: 0 1 auto;
     margin: 0 10px 5px 0;
-    border: 1px solid $primary-low;
+    padding: 1px;
     border-radius: 10px;
+
     .label {
       display: flex;
       align-items: center;
       color: $primary;
-      background: $primary-very-low;
       justify-content: center;
       border-radius: 9px 0 0 9px;
       padding: 0 5px 0 8px;
@@ -376,8 +377,11 @@
     }
 
     .value {
+      background: $secondary;
+      border-radius: 0 9px 9px 0;
       padding: 0 8px 0 5px;
     }
+
     &.user-newuser {
       .label {
         color: $primary-high;
@@ -385,26 +389,20 @@
     }
     &.user-basic,
     &.user-member {
-      border-color: $bronze;
+      background: $bronze;
       .label {
-        border-color: $bronze;
-        background: $bronze;
         color: $secondary;
       }
     }
     &.user-regular {
-      border-color: $silver;
+      background: $silver;
       .label {
-        border-color: $silver;
-        background: $silver;
         color: $secondary;
       }
     }
     &.user-leader {
-      border-color: $gold;
+      background: $gold;
       .label {
-        background: $gold;
-        border-color: $gold;
         color: $secondary;
       }
     }

From 57e587f39fa8b672b6d99cbbd315d8da5194a4ab Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 1 Jun 2020 11:22:35 +0200
Subject: [PATCH 1479/1830] DEV: removes dead code of dropdown-menu (#9942)

---
 .../app/components/topic-navigation.js        |  1 -
 .../stylesheets/common/base/discourse.scss    |  8 ---
 app/assets/stylesheets/common/base/modal.scss |  3 -
 .../stylesheets/desktop/topic-list.scss       |  9 ---
 .../stylesheets/desktop/topic-post.scss       | 70 -------------------
 app/assets/stylesheets/mobile/topic-list.scss | 45 +-----------
 app/assets/stylesheets/mobile/topic-post.scss | 19 -----
 7 files changed, 1 insertion(+), 154 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/topic-navigation.js b/app/assets/javascripts/discourse/app/components/topic-navigation.js
index 614e144f5f..0f420607a5 100644
--- a/app/assets/javascripts/discourse/app/components/topic-navigation.js
+++ b/app/assets/javascripts/discourse/app/components/topic-navigation.js
@@ -76,7 +76,6 @@ export default Component.extend(PanEvents, {
         if (
           !$target.is(".widget-button") &&
           !$parents.is(".widget-button") &&
-          !$parents.is(".dropdown-menu") &&
           !$parents.is("#discourse-modal") &&
           !$target.is("#discourse-modal") &&
           !$parents.is(".modal-footer") &&
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 831aba61b0..fd6dfef8de 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -687,14 +687,6 @@ table {
       }
     }
   }
-
-  .dropdown-menu {
-    width: 120px;
-
-    & .icon {
-      margin-top: auto;
-    }
-  }
 }
 
 .topic-statuses {
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 3f4d85c61f..a15a7cf7c0 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -29,9 +29,6 @@
 }
 
 .modal-open {
-  .dropdown-menu {
-    z-index: z("modal", "dropdown");
-  }
   .popover {
     z-index: z("modal", "popover");
   }
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 13e1d03da1..d17cef20ff 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -218,15 +218,6 @@ button.dismiss-read {
   margin-left: 10px;
 }
 
-.tags-admin-menu {
-  .dropdown-menu {
-    right: 0;
-    top: 30px;
-    bottom: auto;
-    left: auto;
-  }
-}
-
 .category-heading {
   p {
     line-height: $line-height-large;
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 3d5f0017dc..ed1b906a30 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -503,10 +503,6 @@ video {
   }
 }
 
-.open > .dropdown-menu {
-  display: block;
-}
-
 .btn-group {
   position: relative;
 }
@@ -641,72 +637,6 @@ blockquote {
   margin-left: 5px;
 }
 
-.dropdown-menu {
-  position: absolute;
-  bottom: 115%;
-  left: 0;
-  z-index: z("dropdown");
-  display: none;
-  float: left;
-  width: 550px;
-  margin: 1px 0 0;
-  list-style: none;
-  background-color: $secondary;
-  border: 1px solid $primary-low;
-  box-shadow: shadow("dropdown");
-  background-clip: padding-box;
-  span {
-    font-size: $font-down-1;
-    color: dark-light-choose($primary-medium, $secondary-medium);
-  }
-  span.title {
-    font-weight: bold;
-    display: block;
-    font-size: $font-0;
-    color: $primary;
-  }
-}
-
-.dropdown-menu a {
-  display: block;
-  padding: 9px;
-  clear: both;
-  font-weight: normal;
-  line-height: $line-height-medium;
-  color: $primary;
-  transition: all linear 0.15s;
-  & > div {
-    margin-left: 26px;
-  }
-}
-
-.dropdown-menu li > a:hover,
-.dropdown-menu .active > a,
-.dropdown-menu .active > a:hover {
-  color: $primary;
-  text-decoration: none;
-  background-color: $highlight-medium;
-}
-
-.dropdown-menu .disabled > a,
-.dropdown-menu .disabled > a:hover {
-  text-decoration: none;
-  color: $primary;
-  background-color: $tertiary-low;
-  cursor: default;
-}
-
-.dropdown-menu .icon {
-  margin-top: 3px;
-  float: left;
-  font-size: $font-up-2;
-}
-
-.open > .dropdown-menu {
-  display: block;
-  clear: both;
-}
-
 .selected-posts {
   width: 200px;
   position: fixed;
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index 516c864c04..5683d5cfd0 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -424,50 +424,7 @@ tr.category-topic-link {
   content: "";
   margin-left: 5px;
 }
-.dropdown-menu {
-  position: relative;
-  top: 100%;
-  left: 0;
-  z-index: z("dropdown");
-  display: none;
-  float: left;
-  width: 280px;
-  padding: 4px 0;
-  list-style: none;
-  background-color: $secondary;
-  border: 1px solid dark-light-choose(rgba(0, 0, 0, 0.2), $primary);
-  border-radius: 5px;
-  box-shadow: shadow("dropdown");
-  background-clip: padding-box;
-  margin: 1px 0 20px;
-  .title {
-    font-weight: bold;
-    display: block;
-  }
-}
-.dropdown-menu a {
-  display: block;
-  padding: 3px 15px;
-  clear: both;
-  font-weight: normal;
-  line-height: $line-height-medium;
-  color: $primary;
-}
-.dropdown-menu li > a:hover,
-.dropdown-menu .active > a,
-.dropdown-menu .active > a:hover {
-  color: $tertiary;
-  text-decoration: none;
-  background-color: $tertiary-low;
-}
-.open > .dropdown-menu {
-  display: block;
-  clear: both;
-}
-.fade {
-  opacity: 0;
-  transition: opacity linear 0.15s;
-}
+
 .fade.in {
   opacity: 1;
 }
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 3f8729739a..7031810bc0 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -287,25 +287,6 @@ iframe {
   max-width: 100%;
 }
 
-.open > .dropdown-menu {
-  display: block;
-}
-
-.dropdown-menu li {
-  margin: 5px 0;
-  .fa {
-    float: left;
-    margin-right: 5px;
-    padding-top: 1px;
-  }
-  span {
-    color: dark-light-choose($primary-medium, $secondary-medium);
-  }
-  span.title {
-    color: $primary;
-  }
-}
-
 .btn-group {
   margin-top: 25px;
   position: relative;

From ef8e44af738773f2edbbf54546a3dd2b3ba04f7a Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 1 Jun 2020 14:15:23 +0200
Subject: [PATCH 1480/1830] FIX: Don't change the button height when spinner
 appears

on the exception page.
---
 app/assets/stylesheets/common/base/exception.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/base/exception.scss b/app/assets/stylesheets/common/base/exception.scss
index 122b1605ed..455023b555 100644
--- a/app/assets/stylesheets/common/base/exception.scss
+++ b/app/assets/stylesheets/common/base/exception.scss
@@ -19,6 +19,7 @@
     }
   }
   .buttons {
+    align-items: center;
     display: inline-flex;
     margin-top: 15px;
 

From 921751f128f989cc58bc570509977de4590f2835 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 1 Jun 2020 15:00:56 +0200
Subject: [PATCH 1481/1830] UX: Remove box-shadow from kbd, unify styling
 (#9948)

Having many elements with multiple box-shadows (e.g. in keyboard shortcuts modal) was tanking scrolling performance in some browsers.
---
 .../stylesheets/common/base/topic-post.scss      | 16 +++++++++-------
 .../common/components/keyboard_shortcuts.scss    | 13 +------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 1efad4f214..8ae08056b6 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -644,18 +644,20 @@ pre {
 }
 
 kbd {
-  border-radius: 3px;
-  box-shadow: shadow("kbd");
+  align-items: center;
   background: dark-light-choose(#fafafa, #303030);
   border: 1px solid dark-light-choose(#d0d0d0, #505050);
-  border-bottom: none;
-
+  border-bottom-width: 2px;
+  border-radius: 3px;
+  box-sizing: border-box;
   color: $primary;
-  display: inline-block;
+  display: inline-flex;
   font-size: $font-down-1;
+  justify-content: center;
   line-height: $line-height-large;
-  margin: 0 0.1em;
-  padding: 0.1em 0.6em;
+  margin: 0 0.15em;
+  min-width: 24px;
+  padding: 0.15em 0.6em;
 
   // don't allow more than 3 nested elements to prevent FF from crashing
   // cf. http://what.thedailywtf.com/t/nested-elements/7927
diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
index 303acbdd65..644b357dde 100644
--- a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
+++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
@@ -55,7 +55,7 @@
       border-radius: 3px;
       display: inline-flex;
       margin: 0 6px;
-      padding: 1px 0 5px;
+      padding: 2px 1px 4px;
     }
 
     span:first-child {
@@ -63,19 +63,8 @@
     }
 
     kbd {
-      align-items: center;
-      box-sizing: border-box;
-      color: dark-light-choose(#333, #aaa);
-      display: inline-flex;
       font-family: $base-font-family;
       font-weight: bold;
-      height: 24px;
-      justify-content: center;
-      margin: 0 3px;
-      min-width: 24px;
-      padding: 0 6px;
-      vertical-align: bottom;
-      white-space: nowrap;
     }
   }
 }

From c2abf88a61747796351b996696727ae7fde21241 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 1 Jun 2020 09:39:38 -0400
Subject: [PATCH 1482/1830] UX: Adjustments to topic admin menu on mobile
 (#9945)

---
 .../app/components/topic-admin-menu-button.js |  2 +-
 .../app/components/topic-navigation.js        | 10 +---
 .../discourse/app/templates/topic.hbs         | 52 ++++++-------------
 .../discourse/app/widgets/topic-admin-menu.js | 19 +------
 .../discourse/app/widgets/topic-timeline.js   |  9 ++++
 .../common/base/topic-admin-menu.scss         |  8 ---
 .../stylesheets/common/printer-friendly.scss  |  1 -
 .../stylesheets/common/topic-timeline.scss    | 13 ++---
 app/assets/stylesheets/mobile/menu-panel.scss |  1 +
 9 files changed, 38 insertions(+), 77 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/topic-admin-menu-button.js b/app/assets/javascripts/discourse/app/components/topic-admin-menu-button.js
index 95dbcebcac..3d5ad4d3fc 100644
--- a/app/assets/javascripts/discourse/app/components/topic-admin-menu-button.js
+++ b/app/assets/javascripts/discourse/app/components/topic-admin-menu-button.js
@@ -6,6 +6,6 @@ export default MountWidget.extend({
   widget: "topic-admin-menu-button",
 
   buildArgs() {
-    return this.getProperties("topic", "fixed", "openUpwards", "rightSide");
+    return this.getProperties("topic", "openUpwards", "rightSide");
   }
 });
diff --git a/app/assets/javascripts/discourse/app/components/topic-navigation.js b/app/assets/javascripts/discourse/app/components/topic-navigation.js
index 0f420607a5..4ffa6ce1aa 100644
--- a/app/assets/javascripts/discourse/app/components/topic-navigation.js
+++ b/app/assets/javascripts/discourse/app/components/topic-navigation.js
@@ -30,10 +30,7 @@ export default Component.extend(PanEvents, {
     let info = this.info;
 
     if (info.get("topicProgressExpanded")) {
-      info.setProperties({
-        renderTimeline: true,
-        renderAdminMenuButton: true
-      });
+      info.set("renderTimeline", true);
     } else {
       let renderTimeline = !this.site.mobileView;
 
@@ -51,10 +48,7 @@ export default Component.extend(PanEvents, {
         }
       }
 
-      info.setProperties({
-        renderTimeline,
-        renderAdminMenuButton: !renderTimeline
-      });
+      info.set("renderTimeline", renderTimeline);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index d5e22f5437..e6968f11b7 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -127,24 +127,6 @@
 
       {{#topic-navigation topic=model jumpToDate=(action "jumpToDate") jumpToIndex=(action "jumpToIndex") as |info|}}
         {{#if info.renderTimeline}}
-          {{#if info.renderAdminMenuButton}}
-            {{topic-admin-menu-button
-              topic=model
-              fixed="true"
-              toggleMultiSelect=(action "toggleMultiSelect")
-              deleteTopic=(action "deleteTopic")
-              recoverTopic=(action "recoverTopic")
-              toggleClosed=(action "toggleClosed")
-              toggleArchived=(action "toggleArchived")
-              toggleVisibility=(action "toggleVisibility")
-              showTopicStatusUpdate=(route-action "showTopicStatusUpdate")
-              showFeatureTopic=(route-action "showFeatureTopic")
-              showChangeTimestamp=(route-action "showChangeTimestamp")
-              resetBumpDate=(action "resetBumpDate")
-              convertToPublicTopic=(action "convertToPublicTopic")
-              convertToPrivateMessage=(action "convertToPrivateMessage")}}
-          {{/if}}
-
           {{topic-timeline
             topic=model
             notificationLevel=model.details.notification_level
@@ -178,24 +160,22 @@
             expanded=info.topicProgressExpanded
             jumpToPost=(action "jumpToPost")}}
             {{plugin-outlet name="before-topic-progress" args=(hash model=model jumpToPost=(action "jumpToPost"))}}
-            {{#if info.renderAdminMenuButton}}
-              {{topic-admin-menu-button
-                topic=model
-                openUpwards="true"
-                rightSide="true"
-                toggleMultiSelect=(action "toggleMultiSelect")
-                deleteTopic=(action "deleteTopic")
-                recoverTopic=(action "recoverTopic")
-                toggleClosed=(action "toggleClosed")
-                toggleArchived=(action "toggleArchived")
-                toggleVisibility=(action "toggleVisibility")
-                showTopicStatusUpdate=(route-action "showTopicStatusUpdate")
-                showFeatureTopic=(route-action "showFeatureTopic")
-                showChangeTimestamp=(route-action "showChangeTimestamp")
-                resetBumpDate=(action "resetBumpDate")
-                convertToPublicTopic=(action "convertToPublicTopic")
-                convertToPrivateMessage=(action "convertToPrivateMessage")}}
-            {{/if}}
+            {{topic-admin-menu-button
+              topic=model
+              openUpwards="true"
+              rightSide="true"
+              toggleMultiSelect=(action "toggleMultiSelect")
+              deleteTopic=(action "deleteTopic")
+              recoverTopic=(action "recoverTopic")
+              toggleClosed=(action "toggleClosed")
+              toggleArchived=(action "toggleArchived")
+              toggleVisibility=(action "toggleVisibility")
+              showTopicStatusUpdate=(route-action "showTopicStatusUpdate")
+              showFeatureTopic=(route-action "showFeatureTopic")
+              showChangeTimestamp=(route-action "showChangeTimestamp")
+              resetBumpDate=(action "resetBumpDate")
+              convertToPublicTopic=(action "convertToPublicTopic")
+              convertToPrivateMessage=(action "convertToPrivateMessage")}}
           {{/topic-progress}}
         {{/if}}
       {{/topic-navigation}}
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
index 2ba85dabc8..7c9683069f 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
@@ -38,7 +38,6 @@ createWidget("topic-admin-menu-button", {
 
     const menu = this.attach("topic-admin-menu", {
       position: state.position,
-      fixed: attrs.fixed,
       topic: attrs.topic,
       openUpwards: attrs.openUpwards,
       rightSide: !this.site.mobileView && attrs.rightSide,
@@ -54,7 +53,6 @@ createWidget("topic-admin-menu-button", {
         this.attach("button", {
           className:
             "popup-menu-button toggle-admin-menu" +
-            (attrs.fixed ? " show-topic-admin" : "") +
             (attrs.addKeyboardTargetClass ? " keyboard-target-admin-menu" : ""),
           title: "topic_admin_menu",
           icon: "wrench",
@@ -74,10 +72,6 @@ createWidget("topic-admin-menu-button", {
   hideAdminMenu() {
     this.state.expanded = false;
     this.state.position = null;
-
-    if (this.site.mobileView && !this.attrs.rightSide) {
-      $(".header-cloak").css("display", "");
-    }
   },
 
   showAdminMenu(e) {
@@ -101,10 +95,6 @@ createWidget("topic-admin-menu-button", {
       position.left -= MENU_WIDTH - $button.outerWidth();
     }
 
-    if (this.attrs.fixed) {
-      position.left += $button.width() - 203;
-    }
-
     if (this.attrs.openUpwards) {
       if (rtl) {
         position.left -= $button[0].offsetWidth + SPACING;
@@ -115,11 +105,6 @@ createWidget("topic-admin-menu-button", {
       position.top += $button[0].offsetHeight + SPACING;
     }
 
-    if (this.site.mobileView && !this.attrs.rightSide) {
-      const headerCloak = document.querySelector(".header-cloak");
-      if (headerCloak) headerCloak.style.display = "block";
-    }
-
     this.state.position = position;
   },
 
@@ -273,7 +258,7 @@ export default createWidget("topic-admin-menu", {
 
   buildAttributes(attrs) {
     let { top, left, outerHeight } = attrs.position;
-    const position = attrs.fixed || this.site.mobileView ? "fixed" : "absolute";
+    const position = this.site.mobileView ? "fixed" : "absolute";
 
     if (attrs.rightSide) {
       return;
@@ -289,7 +274,7 @@ export default createWidget("topic-admin-menu", {
       }
 
       if (this.site.mobileView) {
-        bottom = 0;
+        bottom = 50;
         left = 0;
       }
 
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-timeline.js b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
index cc3785acca..32f9aa2617 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
@@ -396,6 +396,15 @@ createWidget("timeline-footer-controls", {
           ["notificationLevel"]
         )
       );
+      if (this.site.mobileView) {
+        controls.push(
+          this.attach("topic-admin-menu-button", {
+            topic,
+            addKeyboardTargetClass: true,
+            openUpwards: true
+          })
+        );
+      }
     }
 
     return controls;
diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss
index a12e65fe0c..4a698c9c83 100644
--- a/app/assets/stylesheets/common/base/topic-admin-menu.scss
+++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss
@@ -24,14 +24,6 @@
   }
 }
 
-.show-topic-admin {
-  position: fixed;
-  top: 120px;
-  right: 10px;
-  z-index: z("dropdown");
-  height: 35px;
-}
-
 .modal-body.feature-topic {
   max-height: 500px;
   input.date-picker {
diff --git a/app/assets/stylesheets/common/printer-friendly.scss b/app/assets/stylesheets/common/printer-friendly.scss
index e3ae895760..ce0d4687d3 100644
--- a/app/assets/stylesheets/common/printer-friendly.scss
+++ b/app/assets/stylesheets/common/printer-friendly.scss
@@ -13,7 +13,6 @@
   #topic-progress-wrapper,
   div.nums,
   ._flyout,
-  .show-topic-admin,
   #topic-progress,
   .quote-controls,
   .topic-status-info,
diff --git a/app/assets/stylesheets/common/topic-timeline.scss b/app/assets/stylesheets/common/topic-timeline.scss
index 80d3ab37e8..ccbdbcede1 100644
--- a/app/assets/stylesheets/common/topic-timeline.scss
+++ b/app/assets/stylesheets/common/topic-timeline.scss
@@ -33,6 +33,7 @@
   &.timeline-fullscreen.show {
     max-height: 700px;
     transition: max-height 0.4s ease-out;
+
     @media screen and (max-height: 425px) {
       max-height: 75vh;
     }
@@ -58,7 +59,7 @@
     right: 0;
     border-top: 1px solid dark-light-choose($primary-low, $secondary-low);
     box-shadow: shadow("composer");
-    padding-top: 20px;
+    padding: 20px 0px;
     z-index: z("fullscreen");
     @media screen and (max-height: 425px) {
       padding-top: 10px;
@@ -119,21 +120,21 @@
       .timeline-footer-controls {
         display: none;
         position: absolute;
-        bottom: 10px;
+        bottom: 20px;
         left: 10px;
 
         button,
         .btn-group {
-          float: none;
-          display: inline-block;
           margin-bottom: 0;
           margin-right: 15px;
-          position: static;
+        }
+
+        .widget-component-connector {
+          vertical-align: top;
         }
       }
       .timeline-scrollarea-wrapper {
         display: table-cell;
-        padding-bottom: 20px;
         padding-right: 1.5em;
         width: 100px;
       }
diff --git a/app/assets/stylesheets/mobile/menu-panel.scss b/app/assets/stylesheets/mobile/menu-panel.scss
index d3cb727d86..1966954317 100644
--- a/app/assets/stylesheets/mobile/menu-panel.scss
+++ b/app/assets/stylesheets/mobile/menu-panel.scss
@@ -11,6 +11,7 @@
   left: 0;
   display: none;
   touch-action: pan-y pinch-zoom;
+
   &.animate {
     transition: opacity 0.2s ease-out;
   }

From 2c43c21abc4b829feb481e55148e158f54761cd9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Jun 2020 10:21:46 -0400
Subject: [PATCH 1483/1830] Build(deps): Bump coderay from 1.1.2 to 1.1.3
 (#9943)

Bumps [coderay](https://github.com/rubychan/coderay) from 1.1.2 to 1.1.3.
- [Release notes](https://github.com/rubychan/coderay/releases)
- [Changelog](https://github.com/rubychan/coderay/blob/master/Changes.textile)
- [Commits](https://github.com/rubychan/coderay/compare/v1.1.2...v1.1.3)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index a16bffaa7a..59e727c4de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -91,7 +91,7 @@ GEM
     cbor (0.5.9.6)
     certified (1.0.0)
     chunky_png (1.3.11)
-    coderay (1.1.2)
+    coderay (1.1.3)
     colored2 (3.1.2)
     concurrent-ruby (1.1.6)
     connection_pool (2.2.2)

From d8b258b4e55cdd8a19b86f3c7a1b68e02d50741e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Jun 2020 10:29:34 -0400
Subject: [PATCH 1484/1830] Build(deps): Bump ffi from 1.12.2 to 1.13.0 (#9954)

Bumps [ffi](https://github.com/ffi/ffi) from 1.12.2 to 1.13.0.
- [Release notes](https://github.com/ffi/ffi/releases)
- [Changelog](https://github.com/ffi/ffi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ffi/ffi/compare/1.12.2...1.13.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 59e727c4de..6bf999c7a3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -143,7 +143,7 @@ GEM
       rake-compiler
     fast_xs (0.8.0)
     fastimage (2.1.7)
-    ffi (1.12.2)
+    ffi (1.13.0)
     flamegraph (0.9.5)
     fspath (3.1.2)
     gc_tracer (1.5.1)

From e19d907f0f6e3bbaf3ddd3d7cb710d2a16c1489f Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 1 Jun 2020 16:31:53 +0200
Subject: [PATCH 1485/1830] FIX: Correct the misalignment of popover arrows
 (#9947)

* Fixes position of the top arrow, and border width of both
* Merged top and transform properties
* .5px values are required to make arrow border appear the same with as overall popover border width

I did have a chance to try it out on a Windows machine with a non-high DPI display and there were no issues. And I just re-tested it with Firefox on macOS using the "Open in Low Resolution" option and it looked more or less ok (bearing in mind that it the whole app is then a blurry mess, and that using custom zoom levels causes the arrow to break slightly, but that was also the case on Firefox before this change)
---
 app/assets/stylesheets/common/base/d-popover.scss | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/common/base/d-popover.scss b/app/assets/stylesheets/common/base/d-popover.scss
index 98ec3b1d87..1e625926ab 100644
--- a/app/assets/stylesheets/common/base/d-popover.scss
+++ b/app/assets/stylesheets/common/base/d-popover.scss
@@ -80,15 +80,14 @@ $d-popover-border: $primary-medium;
 
   .d-popover-top-arrow {
     border-color: transparent transparent $d-popover-border;
-    top: 8px;
-    transform: translate(0, -15px);
+    top: -8px;
     border-width: 0 8px 8px;
 
     &:after {
       border-color: transparent transparent $d-popover-background;
       border-style: solid;
       border-width: 0 7px 7px;
-      bottom: -8px;
+      bottom: -8.5px;
       margin-left: -7px;
       position: absolute;
       content: "";
@@ -97,8 +96,7 @@ $d-popover-border: $primary-medium;
 
   .d-popover-bottom-arrow {
     border-color: $d-popover-border transparent transparent;
-    top: calc(100% + 16px);
-    transform: translate(0, -16px);
+    top: 100%;
     border-width: 8px 8px 0;
 
     &:after {
@@ -107,7 +105,7 @@ $d-popover-border: $primary-medium;
       border-color: $d-popover-background transparent transparent;
       border-style: solid;
       border-width: 7px 7px 0;
-      bottom: 2px;
+      bottom: 1.5px;
       transform: translate(-7px, 0);
     }
   }

From 13d00eaad0fb311e27124e29345f14b5d9b5a245 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 1 Jun 2020 16:38:44 +0100
Subject: [PATCH 1486/1830] Drop support for outdated browsers (#9956)

In particular, this includes Internet Explorer 11. Code which existed to support old browsers will be removed over the coming weeks.

https://meta.discourse.org/t/discourse-is-ending-support-for-internet-explorer-11-ie11-on-june-1-2020/137984
---
 plugins/discourse-unsupported-browser/config/settings.yml      | 3 ++-
 .../spec/middleware/anonymous_cache_spec.rb                    | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/discourse-unsupported-browser/config/settings.yml b/plugins/discourse-unsupported-browser/config/settings.yml
index 6aa3ccf598..6536eeac8b 100644
--- a/plugins/discourse-unsupported-browser/config/settings.yml
+++ b/plugins/discourse-unsupported-browser/config/settings.yml
@@ -1,6 +1,7 @@
 plugins:
   discourse_unsupported_browser_enabled:
-    default: true
+    default: false
+    hidden: true
   browser_deprecation_warning:
     default: true
     client: true
diff --git a/plugins/discourse-unsupported-browser/spec/middleware/anonymous_cache_spec.rb b/plugins/discourse-unsupported-browser/spec/middleware/anonymous_cache_spec.rb
index ccd725e9da..5c849664af 100644
--- a/plugins/discourse-unsupported-browser/spec/middleware/anonymous_cache_spec.rb
+++ b/plugins/discourse-unsupported-browser/spec/middleware/anonymous_cache_spec.rb
@@ -3,6 +3,8 @@
 require "rails_helper"
 
 describe Middleware::AnonymousCache::Helper do
+  before { SiteSetting.discourse_unsupported_browser_enabled = true }
+
   def env(opts = {})
     {
       "HTTP_HOST" => "http://test.com",

From c01a9942635039f16974b6267df05dc7505be038 Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Mon, 1 Jun 2020 08:55:08 -0700
Subject: [PATCH 1487/1830] DEV: Better error handling for destroy:users task
 (#9939)

---
 app/services/destroy_task.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/services/destroy_task.rb b/app/services/destroy_task.rb
index b76d8f7f57..a366312cb9 100644
--- a/app/services/destroy_task.rb
+++ b/app/services/destroy_task.rb
@@ -90,6 +90,8 @@ class DestroyTask
         raise Discourse::InvalidAccess.new("User #{user.username} has #{user.post_count} posts, so can't be deleted.")
       rescue NoMethodError
         @io.puts "#{user.username} could not be deleted"
+      rescue Discourse::InvalidAccess => e
+        @io.puts "#{user.username} #{e.message}"
       end
     end
   end

From 0d6b638dac161980ee39631271fd5b3f00fe9b14 Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Mon, 1 Jun 2020 08:55:51 -0700
Subject: [PATCH 1488/1830] FEATURE: New plugin outlet under badges page title
 (#9936)

---
 app/assets/javascripts/discourse/app/templates/badges/index.hbs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/templates/badges/index.hbs b/app/assets/javascripts/discourse/app/templates/badges/index.hbs
index 0f64b83f62..6ee39f7ff4 100644
--- a/app/assets/javascripts/discourse/app/templates/badges/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/badges/index.hbs
@@ -2,6 +2,8 @@
   <div class="container badges">
     <h1>{{i18n "badges.title"}}</h1>
 
+    {{plugin-outlet name="below-badges-title"}}
+
     <div class="badge-groups">
       {{#each badgeGroups as |bg|}}
         <div class="badge-grouping">

From 7b9d207175f1707bb0be47e0e36fded980886314 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 1 Jun 2020 18:16:00 +0100
Subject: [PATCH 1489/1830] DEV: Restore default_list_filter column migration

This migration was added to master temporarily, then removed. This resulted in some sites being in an inconsistent state. Adding the migration back for now. If we decide the column is unneeded, then we should add a second migration to remove the column.

This reverts part of commit e1af91f5aeaf5d19837544adab416b6ae3559e0f.
---
 ...20200524181959_add_default_list_filter_to_categories.rb | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 db/migrate/20200524181959_add_default_list_filter_to_categories.rb

diff --git a/db/migrate/20200524181959_add_default_list_filter_to_categories.rb b/db/migrate/20200524181959_add_default_list_filter_to_categories.rb
new file mode 100644
index 0000000000..4c43b5ccd3
--- /dev/null
+++ b/db/migrate/20200524181959_add_default_list_filter_to_categories.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDefaultListFilterToCategories < ActiveRecord::Migration[6.0]
+  def change
+    add_column :categories, :default_list_filter, :string, limit: 20, default: 'all'
+  end
+end

From 3106f85983a52b1966551539c5219022c8cdd508 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 1 Jun 2020 18:23:58 +0100
Subject: [PATCH 1490/1830] FIX: Support exporting reports which reference
 topics (#9957)

---
 app/jobs/regular/export_csv_file.rb |  3 +++
 spec/jobs/export_csv_file_spec.rb   | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index 9485fc2fdc..7d9b00d166 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -231,6 +231,9 @@ module Jobs
         if label[:type] == :user
           titles[label[:properties][:username]] = label[:title]
           header << label[:properties][:username]
+        elsif label[:type] == :topic
+          titles[label[:properties][:id]] = label[:title]
+          header << label[:properties][:id]
         else
           titles[label[:property]] = label[:title]
           header << label[:property]
diff --git a/spec/jobs/export_csv_file_spec.rb b/spec/jobs/export_csv_file_spec.rb
index 9182f9f37d..a29bae2549 100644
--- a/spec/jobs/export_csv_file_spec.rb
+++ b/spec/jobs/export_csv_file_spec.rb
@@ -152,6 +152,20 @@ describe Jobs::ExportCsvFile do
       expect(report.second).to contain_exactly(user.username, "Earth", "2010-01-01 00:00:00 UTC")
     end
 
+    it 'works with topic reports' do
+      freeze_time DateTime.parse('2010-01-01 6:00')
+
+      exporter.extra['name'] = 'top_referred_topics'
+      post1 = Fabricate(:post)
+      post2 = Fabricate(:post)
+      IncomingLink.add(host: "a.com", referer: "http://twitter.com", post_id: post1.id, ip_address: '1.1.1.1')
+
+      report = exporter.report_export.to_a
+
+      expect(report.first).to contain_exactly("Topic", "Clicks")
+      expect(report.second).to contain_exactly(post1.topic.id.to_s, "1")
+    end
+
     it 'works with stacked_chart reports' do
       ApplicationRequest.create!(date: '2010-01-01', req_type: 'page_view_logged_in', count: 1)
       ApplicationRequest.create!(date: '2010-01-02', req_type: 'page_view_logged_in', count: 2)

From b6709f0dda08c7b10ee7837771729336dd193b68 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 1 Jun 2020 12:26:59 -0500
Subject: [PATCH 1491/1830] DEV: Add option to only show icons to header widget
 (#9935)

---
 .../components/add-category-tag-classes.js    |  7 ++++--
 .../discourse/app/widgets/header.js           | 25 +++++++++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/add-category-tag-classes.js b/app/assets/javascripts/discourse/app/components/add-category-tag-classes.js
index 50d93f3a95..54421ead69 100644
--- a/app/assets/javascripts/discourse/app/components/add-category-tag-classes.js
+++ b/app/assets/javascripts/discourse/app/components/add-category-tag-classes.js
@@ -20,7 +20,10 @@ export default Component.extend({
     this._removeClass();
 
     let classes = [];
-    if (slug) classes.push(`category-${slug}`);
+    if (slug) {
+      classes.push("category");
+      classes.push(`category-${slug}`);
+    }
     if (tags) tags.forEach(t => classes.push(`tag-${t}`));
     if (classes.length > 0) $("body").addClass(classes.join(" "));
   },
@@ -32,7 +35,7 @@ export default Component.extend({
 
   _removeClass() {
     $("body").removeClass((_, css) =>
-      (css.match(/\b(?:category|tag)-\S+/g) || []).join(" ")
+      (css.match(/\b(?:category|tag)-\S+|( category )/g) || []).join(" ")
     );
   },
 
diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index 8e27a15a03..2580fff416 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -299,17 +299,20 @@ export default createWidget("header", {
 
   html(attrs, state) {
     let contents = () => {
-      const panels = [
-        this.attach("header-buttons", attrs),
-        this.attach("header-icons", {
-          hamburgerVisible: state.hamburgerVisible,
-          userVisible: state.userVisible,
-          searchVisible: state.searchVisible,
-          ringBackdrop: state.ringBackdrop,
-          flagCount: attrs.flagCount,
-          user: this.currentUser
-        })
-      ];
+      const headerIcons = this.attach("header-icons", {
+        hamburgerVisible: state.hamburgerVisible,
+        userVisible: state.userVisible,
+        searchVisible: state.searchVisible,
+        ringBackdrop: state.ringBackdrop,
+        flagCount: attrs.flagCount,
+        user: this.currentUser
+      });
+
+      if (attrs.onlyIcons) {
+        return headerIcons;
+      }
+
+      const panels = [this.attach("header-buttons", attrs), headerIcons];
 
       if (state.searchVisible) {
         const contextType = this.searchContextType();

From 72c09ab4ae78ef2acd70ac92d7c2fdcc51cb70c3 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Mon, 1 Jun 2020 13:58:51 -0400
Subject: [PATCH 1492/1830] Update translations

---
 config/locales/client.ar.yml                  |   8 +-
 config/locales/client.be.yml                  |   2 +
 config/locales/client.bg.yml                  |   4 +-
 config/locales/client.bs_BA.yml               |   4 +-
 config/locales/client.ca.yml                  |   4 +-
 config/locales/client.cs.yml                  |   1 -
 config/locales/client.da.yml                  |   4 +-
 config/locales/client.de.yml                  |   4 +-
 config/locales/client.el.yml                  |   1 -
 config/locales/client.es.yml                  |   4 +-
 config/locales/client.et.yml                  |   1 -
 config/locales/client.fa_IR.yml               |  62 +-
 config/locales/client.fi.yml                  |  18 +-
 config/locales/client.fr.yml                  | 206 ++---
 config/locales/client.he.yml                  |   5 +-
 config/locales/client.hu.yml                  |   3 +-
 config/locales/client.hy.yml                  |   4 +-
 config/locales/client.id.yml                  |   3 +-
 config/locales/client.it.yml                  |   4 +-
 config/locales/client.ja.yml                  |   4 +-
 config/locales/client.ko.yml                  |   4 +-
 config/locales/client.lt.yml                  |   1 -
 config/locales/client.lv.yml                  |   3 -
 config/locales/client.nb_NO.yml               |   4 -
 config/locales/client.nl.yml                  |   5 +-
 config/locales/client.pl_PL.yml               |   4 +-
 config/locales/client.pt.yml                  |   1 -
 config/locales/client.pt_BR.yml               |   6 +-
 config/locales/client.ro.yml                  |   1 -
 config/locales/client.ru.yml                  |  13 +-
 config/locales/client.sk.yml                  |   1 -
 config/locales/client.sl.yml                  |   3 +-
 config/locales/client.sv.yml                  |   5 +-
 config/locales/client.sw.yml                  |   1 -
 config/locales/client.tr_TR.yml               |   4 +-
 config/locales/client.uk.yml                  |   4 +-
 config/locales/client.ur.yml                  |   6 +-
 config/locales/client.vi.yml                  |   4 +-
 config/locales/client.zh_CN.yml               |  18 +-
 config/locales/client.zh_TW.yml               |   3 +-
 config/locales/server.ar.yml                  |   1 -
 config/locales/server.be.yml                  |   1 -
 config/locales/server.ca.yml                  |   1 -
 config/locales/server.da.yml                  |   1 -
 config/locales/server.de.yml                  |   1 -
 config/locales/server.el.yml                  |   1 -
 config/locales/server.es.yml                  |   1 -
 config/locales/server.fa_IR.yml               |   4 +-
 config/locales/server.fi.yml                  |   1 -
 config/locales/server.fr.yml                  | 856 ++++++++++--------
 config/locales/server.he.yml                  |  17 +-
 config/locales/server.hy.yml                  |   1 -
 config/locales/server.it.yml                  |   1 -
 config/locales/server.ko.yml                  |   1 -
 config/locales/server.nb_NO.yml               |   1 -
 config/locales/server.nl.yml                  |  16 +-
 config/locales/server.pl_PL.yml               |   1 -
 config/locales/server.pt.yml                  |   1 -
 config/locales/server.pt_BR.yml               |   1 -
 config/locales/server.ro.yml                  |   1 -
 config/locales/server.ru.yml                  |   9 +-
 config/locales/server.sv.yml                  |  18 +-
 config/locales/server.sw.yml                  |   1 -
 config/locales/server.tr_TR.yml               |   1 -
 config/locales/server.uk.yml                  |   1 -
 config/locales/server.ur.yml                  |   1 -
 config/locales/server.zh_CN.yml               |  25 +-
 config/locales/server.zh_TW.yml               |   1 -
 .../config/locales/server.fa_IR.yml           |   2 +
 .../config/locales/server.fr.yml              |  20 +-
 .../config/locales/client.fa_IR.yml           |   3 +
 .../config/locales/server.fr.yml              |   2 +-
 plugins/poll/config/locales/client.fa_IR.yml  |   3 +
 plugins/poll/config/locales/client.zh_CN.yml  |   9 +
 public/500.fr.html                            |   4 +-
 public/503.fr.html                            |   2 +-
 76 files changed, 825 insertions(+), 623 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 85bd88a24f..b7634d3f70 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -1459,7 +1459,6 @@ ar:
           bookmarks: وضعت علية علامة مرجعية
           first: اول منشور في الموضوعات
           pinned: مثبتة
-          unpinned: غير مثبتة
           seen: قراءته
           unseen: لم أقرأها
           wiki: من النوع wiki
@@ -3549,19 +3548,26 @@ ar:
         category_id: "رقم التصنيف"
         category_title: "قسم"
         external_url: "رابط خارجي"
+        destination: "المكان المقصود"
         delete_confirm: هل أنت متأكد من حذف هذا الرابط الثابت ؟
         form:
           label: "جديد :"
           add: "أضف"
           filter: "بحث ( رابط داخلي أو خارجي )"
       reseed:
+        action:
+          label: "استبدال النص ..."
+          title: "استبدل نص الفئات والمواضيع بالترجمات"
         modal:
+          title: "استبدال النص"
+          subtitle: "استبدل نص الفئات والمواضيع التي أنشأها النظام بأحدث الترجمات"
           categories: "التصنيفات"
           topics: "المواضيع"
           replace: "غير"
   wizard_js:
     wizard:
       done: "انتهى"
+      finish: "إنهاء"
       back: "الى الخلف"
       next: "التالي"
       step: "%{current} من %{total}"
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index 586baf3d27..a37f2459e5 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -221,6 +221,8 @@ be:
           title: "тып"
         refresh: "абнавіць"
         category: "катэгорыя"
+        orders:
+          score: "кошт"
       scores:
         score: "кошт"
         type: "тып"
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index d7a7eadcb5..58905b0a40 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -392,8 +392,7 @@ bg:
         status: "Статус"
         category: "Категория"
         orders:
-          priority: "Приоритет"
-          priority_asc: "Приоритет (по обратен ред)"
+          score: "Точки"
           created_at: "Създадено на"
           created_at_asc: "Създадено на (по обратен ред)"
         priority:
@@ -1345,7 +1344,6 @@ bg:
           tracking: Аз следя
           first: е първата публикация
           pinned: са закачени
-          unpinned: не са закачени
           all_tags: Всички по-горни етикети
         post:
           time:
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index d190699927..45166458c3 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -462,8 +462,7 @@ bs_BA:
         status: "Status"
         category: "Kategorija"
         orders:
-          priority: "Prioritet"
-          priority_asc: "Prioritet (preokrenuti)"
+          score: "bodovi"
           created_at: "Napravjeno kod"
           created_at_asc: "Napravijeno kod (preokrenuti)"
         priority:
@@ -1806,7 +1805,6 @@ bs_BA:
           bookmarks: Zabilježene
           first: su friške prve objave
           pinned: su zakačene
-          unpinned: nisu zakačene
           seen: Pročitane
           unseen: Nepročitane
           wiki: su wiki
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 8db7993d27..419f05e48d 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -420,8 +420,7 @@ ca:
         status: "Estat"
         category: "Categoria"
         orders:
-          priority: "Prioritat"
-          priority_asc: "Prioritat (inversa)"
+          score: "Puntuació"
           created_at: "Creat"
           created_at_asc: "Creat (invers)"
         priority:
@@ -1748,7 +1747,6 @@ ca:
           bookmarks: He marcat com a preferits
           first: són la primera publicació
           pinned: estan afixats
-          unpinned: no estan afixats
           seen: he llegit
           unseen: no he llegit
           wiki: són wiki
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index ac5ed8e272..e27f0a61cd 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -1541,7 +1541,6 @@ cs:
           bookmarks: Mám v záložkách
           first: jsou první příspěvek v tématu
           pinned: jsou připnuty
-          unpinned: nejsou připnuty
           seen: která jsem četl
           unseen: jsem nečetl
           wiki: jsou wiki
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 29ff0441cb..ad56db3edd 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -420,8 +420,7 @@ da:
         status: "Status"
         category: "Kategori"
         orders:
-          priority: "Prioritet"
-          priority_asc: "Prioritet (omvendt)"
+          score: "Score"
           created_at: "Oprettet kl"
           created_at_asc: "Oprettet kl (omvendt)"
         priority:
@@ -1718,7 +1717,6 @@ da:
           bookmarks: Jeg bogmærkede
           first: er det allerførste indlæg
           pinned: er fastgjort
-          unpinned: er ikke fastgjort
           seen: jeg læser
           unseen: Jeg har ikke læst
           wiki: er wiki
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 0851c90d14..4554e4b7a2 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -446,8 +446,7 @@ de:
         status: "Status"
         category: "Kategorie"
         orders:
-          priority: "Priorität"
-          priority_asc: "Priorität (umgekehrt)"
+          score: "Wertung"
           created_at: "Erstellt am"
           created_at_asc: "Erstellt am (umgekehrt)"
         priority:
@@ -1793,7 +1792,6 @@ de:
           bookmarks: Themen/Beiträge mit Lesezeichen
           first: Erste Beiträge in Themen
           pinned: Angeheftete Themen
-          unpinned: Nicht angeheftete Themen
           seen: Gelesene Themen/Beiträge
           unseen: Ungelesene Themen/Beiträge
           wiki: Wikis
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index e96527ebe6..85c0836b8d 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -1250,7 +1250,6 @@ el:
           tracking: παρακολουθώ
           first: είναι η πρώτη ανάρτηση
           pinned: είναι καρφιτσωμένα
-          unpinned: δεν είναι καρφιτσωμένα
           unseen: δεν διάβασα
           wiki: " είναι βίκι"
         statuses:
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 08c3703d09..8f57fd3760 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -443,8 +443,7 @@ es:
         status: "Estado"
         category: "Categoría"
         orders:
-          priority: "Prioridad"
-          priority_asc: "Prioridad (inverso)"
+          score: "Puntuación"
           created_at: "Creado el"
           created_at_asc: "Creado el (inverso)"
         priority:
@@ -1805,7 +1804,6 @@ es:
           bookmarks: he guardado
           first: son la primera publicación
           pinned: son destacados
-          unpinned: son no destacados
           seen: he leído
           unseen: no he leído
           wiki: son tipo wiki
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 906304e4fe..2e48f786f9 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -1326,7 +1326,6 @@ et:
           bookmarks: Minu järjehoidjates
           first: on teema esimesed postitused
           pinned: on esile tõstetud
-          unpinned: ei ole esile tõstetud
           seen: Minu loetud
           unseen: Minu poolt lugemata
           wiki: on wiki
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 3c55bb46ff..a22efc5b04 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -27,8 +27,10 @@ fa_IR:
         millions: "{{number}} میلیون"
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -269,11 +271,20 @@ fa_IR:
       reminders:
         at_desktop: "بار آینده من پشت میزم هستم"
         later_today: "امروز"
+        next_business_day: "روز کاری بعدی"
         tomorrow: "فردا"
         next_week: "هفته بعد"
         later_this_week: "این هفته"
+        start_of_next_business_week: "دوشنبه بعدی"
         next_month: "ماه بعد"
         custom: "درج تاریخ و ساعت"
+        last_custom: "آخرین"
+        none: "هیچ یادآوری لازم نیست"
+        today_with_time: "امروز در %{time}"
+        tomorrow_with_time: "فردا در %{time}"
+        at_time: "در %{date_time}"
+    copy_codeblock:
+      copied: "کپی شد!"
     drafts:
       resume: "از سر گیری"
       remove: "پاک کردن"
@@ -429,8 +440,8 @@ fa_IR:
         status: "وضعیت"
         category: "دسته‌بندی"
         orders:
-          priority: "اولویت"
-          priority_asc: "اولویت (برعکس)"
+          score: "امتیاز"
+          score_asc: "امتیاز (معکوس)"
           created_at: "ساخته شده"
           created_at_asc: "ساخته شده (برعکس)"
         priority:
@@ -511,6 +522,7 @@ fa_IR:
       days_visited_long: "روز‌های بازدید شده"
       posts_read: "خواندن"
       posts_read_long: "نوشته‌های خوانده شده"
+      last_updated: "آخرین به روز رسانی:"
       total_rows:
         one: "%{count} کاربر"
         other: "%{count} کاربر"
@@ -536,6 +548,7 @@ fa_IR:
         deny: "رد کردن"
         denied: "رد شده"
         undone: "بازگرداندن درخواست"
+        handle: "رسیدگی به درخواست عضویت"
       manage:
         title: "مدیریت"
         name: "نام"
@@ -662,6 +675,9 @@ fa_IR:
       flair_color_placeholder: "(اختیاری) کد HEX رنگ"
       flair_preview_icon: "پیش‌نمایش آیکن"
       flair_preview_image: "پیش‌نمایش تصویر"
+      flair_type:
+        icon: "یک آیکون را انتخاب کنید"
+        image: "تصویری را بارگذاری کنید"
     user_action_groups:
       "1": "پسندهای داده شده"
       "2": "پسندهای دریافت شده"
@@ -738,6 +754,7 @@ fa_IR:
       private_messages: "پیام‌ها"
       user_notifications:
         filters:
+          filter_by: "فیلتر توسط"
           all: "همه"
           read: "خواندن"
           unread: "خوانده‌ نشده‌"
@@ -865,6 +882,7 @@ fa_IR:
         deleted_posts: "پست های حذف شده"
         suspensions: "تعلیق‌ها"
         warnings_received: "هشدارها"
+        rejected_posts: "پست های رد شده"
       messages:
         all: "همه"
         inbox: "صندوق دریافت"
@@ -947,6 +965,7 @@ fa_IR:
           edit: "کلید امنیتی را ویرایش کنید"
           save: "ذخیره"
           edit_description: "نام کلید امنیتی"
+          name_required_error: "شما باید یک نام برای کلید امنیتی خود انتخاب کنید."
       change_about:
         title: "تغییر «درباره‌ی من»"
         error: "در فرآیند تغییر این مقدار خطایی روی داد."
@@ -963,6 +982,7 @@ fa_IR:
         success_staff: "یک ایمیل به آدرس کنونی شما ارسال کردیم. لطفا دستورالعمل آن را دنبال کنید."
       change_avatar:
         title: "عکس نمایه خود را تغییر دهید"
+        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a> ، بر اساس"
         letter_based: "سیستم تصویر پرفایل را اختصاص داده است"
         uploaded_avatar: "تصویر سفارشی"
         uploaded_avatar_empty: "افزودن تصویر سفارشی"
@@ -981,6 +1001,7 @@ fa_IR:
         sso_override_instructions: "ایمیل را میتوانید از طریق SSO به روزرسانی کنید"
         instructions: "هرگز به عموم نمایش داده نخواهد شد"
         ok: "برای تایید ایمیلی برایتان ارسال خواهیم کرد."
+        required: "لطفا یک آدرس ایمیل وارد کنید"
         invalid: "لطفا یک آدرس ایمیل معتبر وارد کنید"
         authenticated: "ایمیل شما توسط {{provider}} تصدیق شد"
         frequency_immediately: "اگر به سرعت چیزی را که برایتان ارسال نکردیم نخوانده باشید، بلافاصله برایتان ایمیل ارسال می‌کنیم."
@@ -1001,6 +1022,7 @@ fa_IR:
         title: "نام"
         instructions: "نام و نام‌خانوادگی شما (اختیاری)"
         instructions_required: "نام و نام خانوادگی شما"
+        required: "لطفاً یک نام وارد کنید"
         too_short: "نام انتخابی شما خیلی کوتاه است"
         ok: "نام انتخابی شما به نطر می رسد خوب است"
       username:
@@ -1014,6 +1036,7 @@ fa_IR:
         too_long: "نام کاربری انتخابی شما خیلی طولانی است"
         checking: "بررسی در دسترس بودن نام‌کاربری..."
         prefilled: "ایمیل منطبق است با این نام کاربری ثبت شده "
+        required: "لطفاً یک نام کاربری وارد کنید"
       locale:
         title: "زبان رابط‌کاربری"
         instructions: "زبان رابط کاربری. با تازه کردن صفحه تغییر خواهد کرد."
@@ -1021,6 +1044,8 @@ fa_IR:
         any: "هر"
       password_confirmation:
         title: "رمز عبور را مجدد وارد نمایید"
+      invite_code:
+        title: "کد دعوت"
       auth_tokens:
         title: "ابزارهایی که اخیرا استفاده شدند"
         ip: "IP"
@@ -1153,6 +1178,7 @@ fa_IR:
         same_as_email: "رمز عبورتان با ایمیل شما برابر است. "
         ok: "رمز عبور خوبی است."
         instructions: "حداقل %{count} نویسه"
+        required: "لطفاً یک کلمه عبور وارد کنید"
       summary:
         title: "خلاصه"
         stats: "آمار"
@@ -1242,6 +1268,7 @@ fa_IR:
         fixed: "بارگذاری برگه"
     modal:
       close: "بسته"
+      dismiss_error: "رد کردن خطا"
     close: "بستن"
     assets_changed_confirm: "این وب سایت به روز رسانی شده است. برای دیدن آخرین نسخه تازه‌سازی می‌کنید؟"
     logout: "شما از سایت خارج شده‌اید."
@@ -1270,6 +1297,7 @@ fa_IR:
     mute: بی‌صدا
     unmute: صدادار
     last_post: ارسال شده
+    local_time: "زمان محلی"
     time_read: خواندن
     time_read_recently: "اخیراً"
     time_read_tooltip: "%{time_read} مجموع زمان خواندن "
@@ -1347,6 +1375,7 @@ fa_IR:
       second_factor_backup: "ورود با استفاده از یک کد پشتیبان"
       second_factor_backup_title: "پشتیبان دو عامله"
       second_factor_backup_description: "لطفا یکی از کدهای پشتیبان را وارد کنید:"
+      security_key_alternative: "روش دیگری را امتحان کنید"
       security_key_authenticate: "تأیید اعتبار با کلید امنیتی"
       security_key_not_allowed_error: "روند تأیید اعتبار کلید امنیتی به پایان رسیده است یا لغو شده است."
       email_placeholder: "ایمیل یا نام‌کاربری"
@@ -1728,13 +1757,13 @@ fa_IR:
           title: مطابقت فقط در عنوان باشد
           likes: پسندیده‌ام
           posted: در آن فرستاده‌ام
+          created: من درست کردم
           watching: مشاهده می‌کنم
           tracking: پیگیری می‌کنم
           private: در پیام‌های من
           bookmarks: نشانک زده‌ام
           first: اولین فرسته هستند
           pinned: سنجاق شده‌اند
-          unpinned: سنجاق نشده‌اند
           seen: خواندم
           unseen: نخوانده‌ام
           wiki: دانشنامه هستند
@@ -2136,6 +2165,14 @@ fa_IR:
         title: "ادغام نوشته‌های انتخاب شده"
         action: "ادغام نوشته‌های انتخاب شده"
         error: "خطایی در ادغام نوشته‌های انتخاب شده رخ داده است."
+      publish_page:
+        publish: "انتشار"
+        publish_url: "صفحه شما منتشر شده در:"
+        topic_published: "مبحث شما منتشر شده در:"
+        preview_url: "صفحه شما منتشر خواهد شد در:"
+        invalid_slug: "متأسفیم ، شما نمی توانید این صفحه را منتشر کنید."
+        unpublish: "لغو انتشار"
+        publishing_settings: "تنظیمات انتشار"
       change_owner:
         title: "تغییر دادن مالک"
         action: "تغییر مالکیت"
@@ -2279,6 +2316,12 @@ fa_IR:
           notify_moderators: "مدیر‌های مطلع شده"
           notify_user: "یک پیام ارسال شد"
           bookmark: "نشانه گذاری کن"
+          like:
+            one: "این را دوست داشت"
+            other: "دوست داشته اند"
+          read:
+            one: "این را بخوان"
+            other: "خوانده اند"
           like_capped:
             one: "و {{count}} نفر دیگر این را دوست داشتند"
             other: "و {{count}} نفر دیگر این را پسندیده‌اند."
@@ -2333,7 +2376,9 @@ fa_IR:
             button: "HTML"
       bookmarks:
         created: "ساخته شده"
+        updated: "به روز شده"
         name: "نام"
+        set_reminder: "به من یادآوری کن"
     category:
       can: "can&hellip; "
       none: "(بدون دسته‌بندی)"
@@ -2672,6 +2717,15 @@ fa_IR:
         log_out: "%{shortcut} خروج"
       composing:
         title: "نوشتن"
+      bookmarks:
+        enter: "%{shortcut} ذخیره و بستن"
+        later_today: "%{shortcut} بعد از امروز"
+        later_this_week: "%{shortcut} بعد از این هفته"
+        tomorrow: "%{shortcut} فردا"
+        next_week: "%{shortcut} هفته بعد"
+        next_month: "%{shortcut} ماه آینده"
+        next_business_week: "%{shortcut} شروع هفته آینده"
+        next_business_day: "%{shortcut} روز کاری بعدی"
       actions:
         title: "عملیات"
         bookmark_topic: "%{shortcut} باز کردن موضوع نشانه‌گذاری شده"
@@ -2733,6 +2787,7 @@ fa_IR:
       changed: "برچسب‌های تغییر یافته:"
       tags: "برچسب‌ها"
       choose_for_topic: "برچسب‌های اختیاری"
+      info: "اطلاعات"
       add_synonyms: "افزودن"
       delete_tag: "حذف برچسب"
       delete_confirm_no_topics: "ایا از حذف این برچسب مطمعن هستید؟"
@@ -2967,6 +3022,7 @@ fa_IR:
         user: "کاربر"
         title: "API"
         created: ساخته شده
+        updated: به روز شده
         generate: "تولید کردن"
         revoke: "ابطال"
         all_users: "همه کاربران"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 98d9a4a06b..885fa4871d 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -276,6 +276,7 @@ fi:
       no_timezone: 'Et ole valinnut aikavyöhykettä, joten et voi asettaa muistutuksia. Aseta se  <a href="%{basePath}/my/preferences/profile">profiilisivullasi</a>.'
       invalid_custom_datetime: "Antamasi päivämäärä ja kellonaika ei kelpaa, yritä uudelleen."
       list_permission_denied: "Et voi nähdä tämän käyttäjän kirjanmerkkejä."
+      delete_when_reminder_sent: "Poista tämä kirjanmerkki, kun muistutusilmoitus lähetetään."
       reminders:
         at_desktop: "Ensi kerralla kun olen työpöytäympäristössäni"
         later_today: "Myöhemmin tänään"
@@ -292,6 +293,8 @@ fi:
         tomorrow_with_time: "huomenna klo %{time}"
         at_time: "%{date_time}"
         existing_reminder: "Olet pyytänyt muistutuksen tästä kirjanmerkistä"
+    copy_codeblock:
+      copied: "kopioitiin!"
     drafts:
       resume: "Jatka"
       remove: "Poista"
@@ -447,8 +450,8 @@ fi:
         status: "Tila"
         category: "Alue"
         orders:
-          priority: "Prioriteetti"
-          priority_asc: "Prioriteetti (käänteinen)"
+          score: "Arvo"
+          score_asc: "Arvo (käänteinen)"
           created_at: "Luotu"
           created_at_asc: "Luotu (käänteinen)"
         priority:
@@ -676,12 +679,16 @@ fi:
           title: "Vaimennettu"
           description: "Et saa ilmoituksia ryhmän yksityiskeskusteluista."
       flair_url: "Avatarpinssin kuva"
+      flair_upload_description: "Käytä neliönmuotoisia kuvia, joiden koko on vähintään 20px kertaa 20px."
       flair_bg_color: "Avatar-pinssin taustaväri"
       flair_bg_color_placeholder: "(Ei-pakollinen) värin Hex-arvo"
       flair_color: "Avatarpinssin väri"
       flair_color_placeholder: "(Ei-pakollinen) värin Hex-arvo"
       flair_preview_icon: "Ikonin esikatselu"
       flair_preview_image: "Kuvan esikatselu"
+      flair_type:
+        icon: "Valitse ikoni"
+        image: "Lataa kuva"
     user_action_groups:
       "1": "Annetut tykkäykset"
       "2": "Saadut tykkäykset"
@@ -743,6 +750,7 @@ fi:
       copied: "kopioitu"
     user_fields:
       none: "(valitse vaihtoehto)"
+      required: '"%{name}" on pakollinen'
     user:
       said: "{{username}}:"
       profile: "Profiili"
@@ -879,6 +887,7 @@ fi:
       api_approved: "Sallittu:"
       api_last_used_at: "Viimeksi käytetty:"
       theme: "Teema"
+      save_to_change_theme: 'Teema päivittyy kun klikkaat "%{save_text}"'
       home: "Oletusnäkymä"
       staged: "Esikäyttäjä"
       staff_counters:
@@ -1019,6 +1028,7 @@ fi:
         no_secondary: "Ei toissijaisia sähköpostiosoitteita"
         instructions: "Ei tule julkiseksi."
         ok: "Lähetämme sinulle sähköpostin varmistukseksi."
+        required: "Syötä sähköpostiosoitteesi"
         invalid: "Sähköpostiosoite ei kelpaa."
         authenticated: "{{provider}} on todentanut sähköpostiosoitteesi"
         frequency_immediately: "Saat sähköpostia välittömästi, jollet ole jo lukenut asiaa, jota sähköpostiviesti koskee."
@@ -1039,6 +1049,7 @@ fi:
         title: "Nimi"
         instructions: "koko nimesi (ei pakollinen)"
         instructions_required: "Koko nimesi"
+        required: "Syötä nimesi"
         too_short: "Nimesi on liian lyhyt"
         ok: "Nimesi vaikuttaa hyvältä"
       username:
@@ -1052,6 +1063,7 @@ fi:
         too_long: "Käyttäjätunnus on liian pitkä"
         checking: "Tarkistetaan käyttäjätunnusta..."
         prefilled: "Sähköposti vastaa tätä käyttäjänimeä"
+        required: "Syötä käyttäjänimi"
       locale:
         title: "Käyttöliittymän kieli"
         instructions: "Käyttöliittymän kieli. Kieli vaihtuu sivun uudelleen lataamisen yhteydessä."
@@ -1195,6 +1207,7 @@ fi:
         same_as_email: "Salasanasi on sama kuin sähköpostisi."
         ok: "Salasana vaikuttaa hyvältä."
         instructions: "vähintään %{count} merkkiä."
+        required: "Syötä salasana"
       summary:
         title: "Yhteenveto"
         stats: "Tilastot"
@@ -1814,7 +1827,6 @@ fi:
           bookmarks: kirjanmerkeistäni
           first: jotka ovat ketjun avausviestejä
           pinned: jotka on kiinnitettyjä
-          unpinned: jotka eivät ole kiinnitettyjä
           seen: jotka olen lukenut
           unseen: joita en ole lukenut
           wiki: ovat wiki-viestejä
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index d2fbd8cb6c..19e6cd5669 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -33,7 +33,7 @@ fr:
       long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "Do MMMM"
-      long_with_year: "DD MMM YYYY H:mm"
+      long_with_year: "DD MMM YYYY HH:mm"
       long_with_year_no_time: "DD MMM YYYY"
       full_with_year_no_time: "D MMMM YYYY"
       long_date_with_year: "D MMM 'YY LT"
@@ -174,7 +174,7 @@ fr:
         cn_north_1: "Chine (Pékin)"
         cn_northwest_1: "Chine (Ningxia)"
         eu_central_1: "UE (Francfort)"
-        eu_north_1: "EU (Stockholm)"
+        eu_north_1: "UE (Stockholm)"
         eu_west_1: "UE (Irlande)"
         eu_west_2: "UE (Londres)"
         eu_west_3: "UE (Paris)"
@@ -187,7 +187,7 @@ fr:
         us_west_2: "États-Unis ouest (Oregon)"
     edit: "modifier le titre et la catégorie de ce sujet"
     expand: "Développer"
-    not_implemented: "Cette fonctionnalité n’est pas encore disponible."
+    not_implemented: "Cette fonctionnalité n'est pas encore disponible."
     no_value: "Non"
     yes_value: "Oui"
     submit: "Envoyer"
@@ -212,8 +212,8 @@ fr:
     tos: "Conditions générales d'utilisation"
     rules: "Règles"
     conduct: "Charte"
-    mobile_view: "Vue mobile"
-    desktop_view: "Vue bureau"
+    mobile_view: "Version mobile"
+    desktop_view: "Version ordinateur"
     you: "Vous"
     or: "ou"
     now: "à l'instant"
@@ -262,7 +262,7 @@ fr:
       help:
         bookmark: "Cliquer pour mettre un signet sur le premier message de ce sujet"
         unbookmark: "Cliquer pour retirer tous les signets de ce sujet"
-        unbookmark_with_reminder: "Cliquez pour supprimer tous les signets et rappels de ce sujet. Vous avez un rappel pour %{reminder_at} sur ce sujet."
+        unbookmark_with_reminder: "Cliquer pour supprimer tous les signets et rappels de ce sujet. Vous avez un rappel pour %{reminder_at} sur ce sujet."
     bookmarks:
       created: "vous avez mis un signet à ce message %{name}"
       not_bookmarked: "mettre un signet à ce message"
@@ -446,12 +446,12 @@ fr:
           title: "Type"
           all: "(tous les types)"
         minimum_score: "Score minimum :"
-        refresh: "Rafraîchir"
+        refresh: "Actualiser"
         status: "État"
         category: "Catégorie"
         orders:
-          priority: "Priorité"
-          priority_asc: "Priorité (inverse)"
+          score: "Score"
+          score_asc: "Score (inverse)"
           created_at: "Date de création"
           created_at_asc: "Date de création (inverse)"
         priority:
@@ -510,7 +510,7 @@ fr:
       you_replied_to_topic: "<a href='{{userUrl}}'>Vous</a> avez répondu à <a href='{{topicUrl}}'>ce sujet</a>"
       user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> a mentionné <a href='{{user2Url}}'>{{another_user}}</a>"
       user_mentioned_you: "<a href='{{user2Url}}'>Vous</a> avez été mentionné par <a href='{{user1Url}}'>{{user}}</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Vous</a> avez mentionné <a href='{{user2Url}}'>{{user}}</a>"
+      you_mentioned_user: "<a href='{{user1Url}}'>Vous</a> avez mentionné <a href='{{user2Url}}'>{{another_user}}</a>"
       posted_by_user: "Rédigé par <a href='{{userUrl}}'>{{user}}</a>"
       posted_by_you: "Rédigé par <a href='{{userUrl}}'>vous</a>"
       sent_by_user: "Envoyé par <a href='{{userUrl}}'>{{user}}</a>"
@@ -712,7 +712,7 @@ fr:
       reorder:
         title: "Réordonner les catégories"
         title_long: "Réorganiser la liste des catégories"
-        save: "Enregistrer l'ordre"
+        save: "Sauvegarder cette ordre"
         apply_all: "Appliquer"
         position: "Position"
       posts: "Messages"
@@ -787,13 +787,13 @@ fr:
       activity_stream: "Activité"
       preferences: "Préférences"
       feature_topic_on_profile:
-        open_search: "Sélectionnez un nouveau sujet"
-        title: "Sélectionnez un sujet"
-        search_label: "Rechercher des sujet grâce au titre"
+        open_search: "Sélectionner un nouveau sujet"
+        title: "Sélectionner un sujet"
+        search_label: "Rechercher des sujets par titre"
         save: "Sauvegarder"
         clear:
           title: "Vider"
-          warning: "Êtes-vous sûr de vouloir effacer ce sujet à la une ?"
+          warning: "Êtes-vous sûr de vouloir masquer votre sujet vedette ?"
       use_current_timezone: "Utiliser le fuseau horaire actuel"
       profile_hidden: "Le profil public de cet utilisateur est caché."
       expand_profile: "Développer"
@@ -825,9 +825,9 @@ fr:
       allow_private_messages: "Permettre aux autres utilisateurs de m’envoyer des messages directs"
       external_links_in_new_tab: "Ouvrir tous les liens externes dans un nouvel onglet"
       enable_quoting: "Proposer de citer le texte sélectionné"
-      enable_defer: "Activer le bouton pour reporter de sujets à plus tard en les marquant comme non lus"
+      enable_defer: "Activer le bouton pour reporter des sujets à plus tard en les marquant comme non lus"
       change: "modifier"
-      featured_topic: "Sujet à la une"
+      featured_topic: "Sujet vedette"
       moderator: "{{user}} est un modérateur"
       admin: "{{user}} est un administrateur"
       moderator_tooltip: "Cet utilisateur est un modérateur"
@@ -999,9 +999,9 @@ fr:
         taken: "Désolé, ce nom d'utilisateur est déjà pris."
         invalid: "Ce nom d'utilisateur est invalide. Il ne doit être composé que de lettres et de chiffres."
       change_email:
-        title: "Modifier l'adresse de courriel"
-        taken: "Désolé, cette adresse de courriel est indisponible."
-        error: "Il y a eu une erreur lors du changement d'adresse de courriel. Cette adresse est peut-être déjà utilisée ?"
+        title: "Modifier l'adresse courriel"
+        taken: "Désolé, cette adresse courriel est indisponible."
+        error: "Il y a eu une erreur lors du changement de l'adresse courriel. Cette adresse est peut-être déjà utilisée ?"
         success: "Nous avons envoyé un courriel à cette adresse. Merci de suivre les instructions."
         success_staff: "Nous avons envoyé un courriel à votre adresse actuelle. Merci de suivre les instructions."
       change_avatar:
@@ -1022,7 +1022,7 @@ fr:
         title: "Arrière-plan de la carte de l'utilisateur"
         instructions: "Les images d'arrière-plan seront centrées avec une largeur par défaut de 590 pixels."
       change_featured_topic:
-        title: "Sujet à la une"
+        title: "Sujet vedette"
         instructions: "Un lien vers ce sujet sera ajouté sur votre carte d'utilisateur et votre profil."
       email:
         title: "Courriel"
@@ -1033,8 +1033,8 @@ fr:
         instructions: "Jamais visible publiquement."
         ok: "Nous vous enverrons un courriel de confirmation"
         required: "Veuillez entrer une adresse courriel"
-        invalid: "Merci d'entrer une adresse de courriel valide"
-        authenticated: "Votre adresse de courriel a été authentifiée par {{provider}}"
+        invalid: "Veuillez entrer une adresse courriel valide"
+        authenticated: "Votre adresse courriel a été authentifiée par {{provider}}"
         frequency_immediately: "Nous vous enverrons un courriel immédiatement si vous n'avez pas lu le contenu en question."
         frequency:
           one: "Nous vous enverrons des courriels seulement si nous ne vous avons pas vu sur le site dans la dernière minute."
@@ -1057,7 +1057,7 @@ fr:
         too_short: "Votre nom est trop court"
         ok: "Votre nom a l'air correct"
       username:
-        title: "nom d'utilisateur"
+        title: "Nom d'utilisateur"
         instructions: "unique, sans espaces, court"
         short_instructions: "Les gens peuvent vous mentionner avec @{{username}}"
         available: "Votre nom d'utilisateur est disponible"
@@ -1083,7 +1083,7 @@ fr:
         ip: "IP"
         details: "Détails"
         log_out_all: "Se déconnecter partout"
-        active: "utilisé actuellement"
+        active: "actif"
         not_you: "Ce n'est pas vous ?"
         show_all: "Tout afficher ({{count}})"
         show_few: "Afficher moins"
@@ -1303,9 +1303,9 @@ fr:
       close: "fermer"
       dismiss_error: "Ignorer l'erreur"
     close: "Fermer"
-    assets_changed_confirm: "Ce site vient d'être mis à jour. Rafraîchir maintenant pour accéder à la nouvelle version ?"
+    assets_changed_confirm: "Ce site vient d'être mis à jour. Actualiser la page pour accéder à la nouvelle version ?"
     logout: "Vous avez été déconnecté."
-    refresh: "Rafraîchir"
+    refresh: "Actualiser"
     home: "Accueil"
     read_only_mode:
       enabled: "Le site est en mode lecture seule. Vous pouvez continer à naviguer, mais les réponses, J'aime et autre interactions sont désactivées pour l'instant."
@@ -1386,7 +1386,7 @@ fr:
       complete_email_found: "Nous avons trouvé un compte correspondant au courriel <b>%{email}</b>. Vous devriez recevoir rapidement un courriel avec les instructions pour réinitialiser votre mot de passe."
       complete_username_not_found: "Aucun compte ne correspond au nom d'utilisateur <b>%{username}</b>"
       complete_email_not_found: "Aucun compte ne correspond à <b>%{email}</b>"
-      help: "Le courriel n'est pas arrivé ? Pensez bien à vérifier dans votre dossier de spam.<p>Vous n'êtes pas sûr de l'adresse électronique que vous avez utilisée ? Saisissez ici une adresse électronique, et nous vous dirons si elle existe ici.</p><p>Si vous n'avez plus accès à l'adresse électronique de votre compte, merci de contacter <a href='%{basePath}/about'>nos responsables serviables.</a></p>"
+      help: "Le courriel n'est pas arrivé ? Pensez bien à vérifier dans votre dossier de spam.<p>Vous n'êtes pas sûr de l'adresse courriel que vous avez utilisée ? Saisissez une adresse courriel et nous vous dirons si elle existe ici.</p><p>Si vous n'avez plus accès à l'adresse courriel de votre compte, merci de contacter <a href='%{basePath}/about'>nos responsables serviables.</a></p>"
       button_ok: "OK"
       button_help: "Aide"
     email_login:
@@ -1394,7 +1394,7 @@ fr:
       button_label: "par courriel"
       emoji: "emoji de cadenas"
       complete_username: "Si un compte correspond au nom d'utilisateur <b>%{username}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
-      complete_email: "Si un compte correspond à l'adresse de courriel <b>%{email}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
+      complete_email: "Si un compte correspond à l'adresse courriel <b>%{email}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
       complete_username_found: "Nous avons trouvé un compte correspondant au nom d'utilisateur <b>%{username}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
       complete_email_found: "Nous avons trouvé un compte correspond au courriel <b>%{email}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
       complete_username_not_found: "Aucun compte ne correspond au nom d'utilisateur <b>%{username}</b>"
@@ -1591,7 +1591,7 @@ fr:
       reply: "Répondre"
       cancel: "Annuler"
       create_topic: "Créer le sujet"
-      create_pm: "Message direct"
+      create_pm: "Envoyer le message"
       create_whisper: "Murmurer"
       create_shared_draft: "Créer un brouillon partagé"
       edit_shared_draft: "Modifier le brouillon partagé"
@@ -1623,7 +1623,7 @@ fr:
       link_description: "saisir ici la description du lien"
       link_dialog_title: "Insérer le lien"
       link_optional_text: "titre optionnel"
-      link_url_placeholder: "Coller une URL ou tapez pour chercher des sujets"
+      link_url_placeholder: "Collez une URL ou tapez pour chercher des sujets"
       quote_title: "Citation"
       quote_text: "Citation"
       code_title: "Texte préformaté"
@@ -1656,8 +1656,9 @@ fr:
           label: "Répondre au message %{postNumber} de %{postUsername}"
           desc: Répondre à un message spécifique
         reply_as_new_topic:
-          label: Répondre à un sujet lié
+          label: Répondre via un sujet lié
           desc: Créer un nouveau sujet lié à ce sujet
+          confirm: Vous avez un brouillon sauvegardé pour ce nouveau sujet mais il sera perdu si vous créez un sujet lié.
         reply_as_private_message:
           label: Nouveau message direct
           desc: Créer un nouveau message direct
@@ -1760,7 +1761,7 @@ fr:
       title: "Ajouter une image"
       title_with_attachments: "Ajouter une image ou un fichier"
       from_my_computer: "Depuis mon appareil"
-      from_the_web: "Depuis le Web"
+      from_the_web: "Depuis le web"
       remote_tip: "lien vers l'image"
       remote_tip_with_attachments: "lien vers l'image ou le fichier {{authorized_extensions}}"
       local_tip: "sélectionnez des images depuis votre appareil"
@@ -1827,7 +1828,6 @@ fr:
           bookmarks: auxquels j'ai mis un signet
           first: qui sont les premiers messages
           pinned: qui sont épinglés
-          unpinned: qui ne sont pas épinglés
           seen: que j'ai lus
           unseen: que je n'ai pas lus
           wiki: qui sont des wikis
@@ -1859,7 +1859,7 @@ fr:
       bulk:
         select_all: "Tout sélectionner"
         clear_all: "Tout désélectionner"
-        unlist_topics: "Ne plus lister les sujets"
+        unlist_topics: "Rendre les sujets invisibles"
         relist_topics: "Lister les sujets"
         reset_read: "Réinitialiser la lecture"
         delete: "Supprimer les sujets"
@@ -1929,7 +1929,7 @@ fr:
         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 a déjà un sujet en vedette. Si vous continuez, ce sujet le remplacera."
+        warning: "Votre profil contient déjà un sujet vedette. Si vous continuez, ce sujet le remplacera."
         help: "Retirer le lien vers ce sujet de votre profil d'usager"
         title: "Retirer du profil"
       list: "Sujets"
@@ -1953,11 +1953,11 @@ fr:
         title: "Sujet non trouvé"
         description: "Désolé, nous n'avons pas trouvé ce sujet. Peut-être a t-il été retiré par un modérateur ?"
       total_unread_posts:
-        one: "vous avez %{count} message non lu dans ce sujet"
-        other: "vous avez {{count}} messages non lus dans ce sujet"
+        one: "il y a %{count} message non lu dans ce sujet"
+        other: " il y a {{count}} messages non lus dans ce sujet"
       unread_posts:
-        one: "vous avez %{count} message non lu sur ce sujet"
-        other: "vous avez {{count}} messages non lus sur ce sujet"
+        one: "il reste %{count} message que vous n'avez pas lu lors de votre visite précédente sur ce sujet"
+        other: "il reste {{count}} messages que vous n'avez pas lus lors de votre visite précédente sur ce sujet"
       new_posts:
         one: "il y a %{count} nouveau message sur ce sujet depuis votre derniere lecture"
         other: "il y a {{count}} nouveaux messages sur ce sujet depuis votre derniere lecture"
@@ -1986,7 +1986,7 @@ fr:
         title: "Action planifiée du sujet"
         save: "Planifier"
         num_of_hours: "Nombre d'heures :"
-        num_of_days: "Nombre de jours :"
+        num_of_days: "Nombre de jours :"
         remove: "Supprimer la planification"
         publish_to: "Publier dans :"
         when: "Quand :"
@@ -2088,10 +2088,10 @@ fr:
           title: "Surveiller"
           description: "Vous serez notifié de chaque nouvelle réponse dans ce sujet, et le nombre de nouvelles réponses apparaîtra."
         tracking_pm:
-          title: "Suivi"
+          title: "Suivre"
           description: "Le nombre de nouvelles réponses apparaîtra pour ce message. Vous serez notifié si quelqu'un vous mentionne ou vous répond."
         tracking:
-          title: "Suivi"
+          title: "Suivre"
           description: "Le nombre de nouvelles réponses apparaîtra pour ce sujet. Vous serez notifié si quelqu'un vous mentionne ou vous répond."
         regular:
           title: "Normal"
@@ -2131,7 +2131,7 @@ fr:
         remove_banner: "Retirer le sujet à la une"
       reply:
         title: "Répondre"
-        help: "commencez à répondre à ce sujet"
+        help: "commencer à répondre à ce sujet"
       clear_pin:
         title: "Désépingler"
         help: "Retirer l'épingle de ce sujet afin qu'il n'apparaisse plus en tête de votre liste de sujet"
@@ -2152,7 +2152,7 @@ fr:
       feature_topic:
         title: "Mettre ce sujet en évidence"
         pin: "Faire apparaître ce sujet en haut de la catégorie {{categoryLink}} jusqu'à"
-        confirm_pin: "Vous avez déjà {{count}} sujets épinglés. Trop de sujets épinglés peut être lourd pour les nouveaux utilisateurs et les visiteurs. Êtes-vous sûr de vouloir épingler un autre sujet dans cette catégorie ?"
+        confirm_pin: "Vous avez déjà {{count}} sujets épinglés. Avoir trop de sujets épinglés peut rendre la navigation difficile pour les nouveaux utilisateurs et les visiteurs. Êtes-vous sûr de vouloir épingler un autre sujet dans cette catégorie ?"
         unpin: "Enlever ce sujet du haut de la catégorie {{categoryLink}}."
         unpin_until: "Enlever ce sujet du haut de la catégorie {{categoryLink}} ou attendre jusqu'à <strong>%{until}</strong>."
         pin_note: "Les utilisateurs peuvent désépingler le sujet pour eux."
@@ -2221,7 +2221,7 @@ fr:
         error: "Il y a eu une erreur en déplaçant les messages vers un nouveau sujet."
         instructions:
           one: "Vous êtes sur le point de créer un nouveau sujet avec le message que vous avez sélectionné."
-          other: "Vous êtes sur le point de créer un nouveau sujet avec les <b>{{count}}</b> messages que vous avez sélectionné."
+          other: "Vous êtes sur le point de créer un nouveau sujet avec les <b>{{count}}</b> messages que vous avez sélectionnés."
       merge_topic:
         title: "Déplacer vers un sujet existant"
         action: "déplacer vers un sujet existant"
@@ -2310,8 +2310,8 @@ fr:
       edit_reason: "Raison :"
       post_number: "message {{number}}"
       ignored: "Contenu ignoré"
-      wiki_last_edited_on: "Wiki édité pour la dernière fois"
-      last_edited_on: "message édité pour la dernière fois"
+      wiki_last_edited_on: "wiki modifié pour la dernière fois le"
+      last_edited_on: "message modifié pour la dernière fois le"
       reply_as_new_topic: "Répondre par un nouveau sujet"
       reply_as_new_private_message: "Répondre par un nouveau message direct adressé aux mêmes destinataires"
       continue_discussion: "Suite du sujet {{postLink}} :"
@@ -2355,12 +2355,12 @@ fr:
       abandon_edit:
         confirm: "Êtes-vous sûr de vouloir annuler vos changements ?"
         no_value: "Non, garder"
-        no_save_draft: "Non, enregistrer le brouillon"
+        no_save_draft: "Non, sauvegarder le brouillon"
         yes_value: "Oui, annuler la modification"
       abandon:
         confirm: "Êtes-vous sûr de vouloir abandonner votre message ?"
         no_value: "Non, le conserver"
-        no_save_draft: "Non, enregistrer le brouillon"
+        no_save_draft: "Non, sauvegarder le brouillon"
         yes_value: "Oui, abandonner"
       via_email: "ce message est arrivé par courriel"
       via_auto_generated_email: "ce message est arrivé via un courriel généré automatiquement"
@@ -2371,7 +2371,7 @@ fr:
         save: "Sauvegarder les options"
       few_likes_left: "Merci de partager votre amour ! Vous n'avez plus que quelques J'aime à distribuer pour aujourd'hui."
       controls:
-        reply: "commencez à répondre à ce message"
+        reply: "commencer à répondre à ce message"
         like: "J'aime ce message"
         has_liked: "vous avez aimé ce message"
         read_indicator: "Membres ayant lu cette publication"
@@ -2394,11 +2394,11 @@ fr:
             other: "Oui et les {{count}} réponses"
           just_the_post: "Non, uniquement ce message"
         admin: "actions d'administration sur le message"
-        wiki: "Basculer en mode Wiki"
-        unwiki: "Retirer le mode Wiki"
+        wiki: "Basculer en mode wiki"
+        unwiki: "Retirer le mode wiki"
         convert_to_moderator: "Ajouter la couleur modérateur"
         revert_to_regular: "Retirer la couleur modérateur"
-        rebake: "Reconstruire l'HTML"
+        rebake: "Reconstruire le HTML"
         publish_page: "Publication de pages"
         unhide: "Ré-afficher"
         change_owner: "Modifier l'auteur"
@@ -2502,7 +2502,7 @@ fr:
         actions:
           delete_bookmark:
             name: "Supprimer le signet"
-            description: "Supprime le signet de votre profile et annule tous les rappels pour ce signet"
+            description: "Supprime le signet de votre profil et annule tous les rappels pour ce signet"
           edit_bookmark:
             name: "Modifier le signet"
             description: "Modifier le nom du signet ou changer la date et l'heure du rappel"
@@ -2556,7 +2556,7 @@ fr:
       already_used: "Cette couleur est déjà utilisée par une autre catégorie"
       security: "Sécurité"
       special_warning: "Avertissement : cette catégorie est une catégorie pré-remplie et les réglages de sécurité ne peuvent pas être modifiés. Si vous ne souhaitez pas utiliser cette catégorie, supprimez là au lieu de détourner sa fonction."
-      uncategorized_security_warning: "Cette catégorie est spéciale. Elle sert de zone d'attente pour les sujets qui n'ont pas de catégorie ; vous ne pouvez pas changer ses paramètres de sécurité."
+      uncategorized_security_warning: "Cette catégorie est spéciale. Elle sert à rassembler les sujets qui n'ont pas de catégorie ; vous ne pouvez pas changer ses paramètres de sécurité."
       uncategorized_general_warning: 'Cette catégorie est spéciale. Elle sert de catégorie par défaut pour les nouveaux sujets qui ne sont pas liés à une catégorie. Si vous souhaitez changer cela et forcer la sélection de catégorie, <a href="%{settingLink}">veuillez désactiver ce paramètre</a>. Si vous voulez modifier son nom ou sa description, allez dans <a href="%{customizeLink}">Personnaliser / Contenu</a>.'
       pending_permission_change_alert: "Vous n'avez pas ajouté %{group} à cette catégorie ; cliquez sur ce bouton pour l'ajouter."
       images: "Images"
@@ -2566,10 +2566,10 @@ fr:
       email_in_disabled_click: 'activez le paramètre « email in ».'
       mailinglist_mirror: "La catégorie reflète une liste de diffusion"
       show_subcategory_list: "Afficher la liste des sous-catégories au dessus des sujets dans cette catégorie."
-      read_only_banner: "Texte du bandeau à afficher lorsqu'un utilisateur ne peut pas créer un sujet dans cette catégorie :"
+      read_only_banner: "Texte du bandeau à afficher lorsqu'un utilisateur ne peut pas créer un sujet dans cette catégorie :"
       num_featured_topics: "Nombre de sujets affichés sur la page des catégories :"
       subcategory_num_featured_topics: "Nombre de sujets à la une sur la page de la catégorie parente :"
-      all_topics_wiki: "Faire des nouveaux sujets des Wikis par défaut"
+      all_topics_wiki: "Faire des nouveaux sujets des wikis par défaut"
       subcategory_list_style: "Style des listes de sous-catégories :"
       sort_order: "Trier la liste de sujets par :"
       default_view: "Liste de sujets par défaut :"
@@ -2597,7 +2597,7 @@ fr:
           title: "Surveiller les nouveaux sujets"
           description: "Vous serez averti de nouveaux sujets dans cette catégorie mais pas de réponses aux sujets."
         tracking:
-          title: "Suivi"
+          title: "Suivre"
           description: "Vous allez suivre automatiquement tous les sujets dans ces catégories. Vous serez notifié lorsque quelqu'un vous mentionne ou vous répond, et le nombre de nouvelles réponses sera affiché."
         regular:
           title: "Normal"
@@ -2716,7 +2716,7 @@ fr:
 
       low {avec un ratio élevé de J'aime par message}
 
-      med {avec un ratio très élevée de J'aime par message}
+      med {avec un ratio très élevé de J'aime par message}
 
       high {avec un ratio extrêmement élevé de J'aime par message}
 
@@ -3012,7 +3012,7 @@ fr:
           title: "Surveiller les nouveaux sujets"
           description: "Vous serez averti de nouveaux sujets avec cette étiquette mais pas de réponses aux sujets."
         tracking:
-          title: "Suivi"
+          title: "Suivre"
           description: "Vous allez suivre automatiquement tous les sujets avec cette étiquette. Le nombre de messages non lus et nouveaux apparaîtra à côté du sujet."
         regular:
           title: "Normal"
@@ -3089,14 +3089,14 @@ fr:
         critical_available: "Une mise à jour critique est disponible."
         updates_available: "Des mises à jour sont disponibles."
         please_upgrade: "Veuillez mettre à jour !"
-        no_check_performed: "Une vérification des mises à jour n'a pas été effectuée. Vérifiez que sidekiq est en cours d'exécution."
+        no_check_performed: "Une vérification de mises à jour n'a pas été effectuée. Vérifiez que sidekiq est en cours d'exécution."
         stale_data: "Une vérification des mises à jour n'a pas été effectuée récemment. Vérifiez que sidekiq est en cours d'exécution."
         version_check_pending: "On dirait que vous avez récemment fait une mise à jour. Super !"
         installed_version: "Installée"
         latest_version: "Dernière"
         problems_found: "Quelques conseils d'après vos paramètres actuels"
         last_checked: "Dernière vérification"
-        refresh_problems: "Rafraîchir"
+        refresh_problems: "Actualiser"
         no_problems: "Aucun problème n'a été trouvé."
         moderators: "Modérateurs :"
         admins: "Administateurs :"
@@ -3114,7 +3114,7 @@ fr:
           other: "%{count} sauvegardes sur %{location}"
         lastest_backup: "Dernière sauvegarde : %{date}"
         traffic_short: "Trafic"
-        traffic: "Requêtes d'application Web"
+        traffic: "Requêtes d'application web"
         page_views: "Pages vues"
         page_views_short: "Pages vues"
         show_traffic_report: "Afficher le rapport de trafic détaillé"
@@ -3212,7 +3212,7 @@ fr:
             automatic_membership_email_domains: "Les utilisateurs qui s'enregistrent avec un domaine courriel qui correspond exactement à un élément de cette liste seront automatiquement ajoutés à ce groupe :"
             automatic_membership_user_count: "%{count} utilisateurs ont les nouveaux domaines de courriel et seront ajoutés au groupe."
             primary_group: "Définir comme groupe principal automatiquement"
-        name_placeholder: "Nom du groupe (sans espace, mêmes règles que pour les noms d'utilisateurs)"
+        name_placeholder: "Nom du groupe (sans espaces, mêmes règles que pour les noms d'utilisateurs)"
         primary: "Groupe principal"
         no_primary: "(pas de groupe principal)"
         title: "Groupes"
@@ -3409,7 +3409,7 @@ fr:
           download:
             label: "Télécharger"
             title: "Envoyer un courriel avec un lien de téléchargement"
-            alert: "Un lien pour télécharger la sauvegarder vous a été envoyé. "
+            alert: "Un lien pour télécharger la sauvegarde vous a été envoyé par courriel. "
           destroy:
             title: "Supprimer la sauvegarde"
             confirm: "Êtes-vous sûr de vouloir détruire cette sauvegarde ?"
@@ -3433,7 +3433,7 @@ fr:
         button_title:
           user: "Exporter la liste des utilisateurs dans un fichier CSV."
           staff_action: "Exporter la liste des actions des responsables dans un fichier CSV."
-          screened_email: "Exporter la liste des adresses de courriel sous surveillance dans un fichier CSV."
+          screened_email: "Exporter la liste des adresses courriel sous surveillance dans un fichier CSV."
           screened_ip: "Exporter la liste des adresses IP sous surveillance dans un fichier CSV."
           screened_url: "Exporter toutes les URL sous surveillance vers un fichier CSV"
       export_json:
@@ -3534,7 +3534,7 @@ fr:
           upload: "Envoyer"
           select_component: "Sélectionner un composant…"
           unsaved_changes_alert: "Vous n'avez pas encore sauvegardé vos modifications, voulez-vous les abandonner et continuer ?"
-          unsaved_parent_themes: "Vous n'avez assigné le composant à aucun thème, voulez-vous continuer ?"
+          unsaved_parent_themes: "Vous n'avez assigné le composant à aucun thème, voulez-vous continuer ?"
           discard: "Abandonner"
           stay: "Rester"
           css_html: "CSS/HTML personnalisé"
@@ -3597,7 +3597,7 @@ fr:
             title: "Entrez du HTML à afficher sur toutes les pages après l'entête"
           footer:
             text: "Pied de page"
-            title: "Entrez du HTML à afficher de le pied de page"
+            title: "Entrez du HTML à afficher dans le pied de page"
           embedded_scss:
             text: "CSS intégré"
             title: "Entrez du CSS personnalisé pour la version intégrée des commentaires"
@@ -3609,7 +3609,7 @@ fr:
             title: "HTML qui sera inséré avant la balise </body>"
           yaml:
             text: "YAML"
-            title: "Définir les paramètres thème en format YAML"
+            title: "Définir les paramètres du thème en format YAML"
         colors:
           select_base:
             title: "Sélectionner la palette de couleurs de base"
@@ -3622,7 +3622,7 @@ fr:
           copy_name_prefix: "Copie de"
           delete_confirm: "Supprimer cette palette de couleur ?"
           undo: "annuler"
-          undo_title: "Annuler vos modifications sur cette couleur depuis la dernière fois qu'elle a été sauvegardée."
+          undo_title: "Annulez vos modifications sur cette couleur depuis la dernière fois qu'elle a été sauvegardée."
           revert: "rétablir"
           revert_title: "Rétablir la couleur de la palette par défaut de Discourse."
           primary:
@@ -3656,7 +3656,7 @@ fr:
             name: "aimer"
             description: "La couleur du bouton J'aime."
         robots:
-          title: "Remplacez le fichier robots.txt de votre site :"
+          title: "Remplacez le fichier robots.txt de votre site :"
           warning: "Cela remplacera définitivement tous les paramètres associés."
           overridden: Le fichier robots.txt par défaut de votre site est remplacé.
         email_style:
@@ -3665,8 +3665,8 @@ fr:
           html: "Modèle HTML"
           css: "CSS"
           reset: "Réinitialiser aux valeurs par défaut"
-          reset_confirm: "Êtes-vous sûr de vouloir rétablir la valeur par défaut %{fieldName} et perdre toutes vos modifications ?"
-          save_error_with_reason: "Vos modifications n'ont pas été enregistrées. %{error}"
+          reset_confirm: "Êtes-vous sûr de vouloir rétablir la valeur par défaut de %{fieldName} et perdre toutes vos modifications ?"
+          save_error_with_reason: "Vos modifications n'ont pas été sauvegardées. %{error}"
           instructions: "Personnalisez le modèle dans lequel tous les courriels HTML sont générés et stylés à l'aide de CSS."
       email:
         title: "Courriels"
@@ -3675,7 +3675,7 @@ fr:
         preview_digest: "Prévisualisation du courriel"
         advanced_test:
           title: "Test avancé"
-          desc: "Voir comment Discourse gère les courriels reçus. Pour gérer correctement le courriel, merci de coller ci-dessous l'entier du courriel."
+          desc: "Vérifiez comment Discourse gère les courriels reçus. Pour que le courriel soit géré correctement, veuillez coller ci-dessous la totalité du courriel original."
           email: "Message d'origine"
           run: "Lancer le test"
           text: "Corps de texte sélectionné"
@@ -3698,7 +3698,7 @@ fr:
         sent_test: "envoyé !"
         delivery_method: "Méthode d'envoi"
         preview_digest_desc: "Prévisualiser le contenu des résumés par courriel envoyés aux utilisateurs inactifs."
-        refresh: "Rafraîchir"
+        refresh: "Actualiser"
         send_digest_label: "Envoyer ce résultat à :"
         send_digest: "Envoyer"
         sending_email: "Courriel en cours d'envoi…"
@@ -3828,9 +3828,9 @@ fr:
             backup_destroy: "détruire la sauvegarde"
             reviewed_post: "message vérifié"
             custom_staff: "action personnalisée de l'extension"
-            post_locked: "message vérouillé"
+            post_locked: "message verrouillé"
             post_edit: "message modifié"
-            post_unlocked: "message dévérouillé"
+            post_unlocked: "message déverrouillé"
             check_personal_message: "vérifier un message direct"
             disabled_second_factor: "désactiver l'authentification à deux facteurs"
             topic_published: "sujet publié"
@@ -3864,21 +3864,21 @@ fr:
             page_unpublished: "publication de la page annulée"
         screened_emails:
           title: "Courriels sous surveillance"
-          description: "Lorsque quelqu'un essaye de créer un nouveau compte, les adresses de courriel suivantes seront vérifiées et l'inscription sera bloquée, ou une autre action sera réalisée."
+          description: "Lorsque quelqu'un essaye de créer un nouveau compte, les adresses courriel suivantes seront vérifiées et l'inscription sera bloquée, ou une autre action sera réalisée."
           email: "Courriel"
           actions:
             allow: "Autoriser"
         screened_urls:
           title: "URL sous surveillance"
-          description: "Les URL listées ici ont été utilisées dans des messages émis par des utilisateurs ayant été identifié comme spammeur."
+          description: "Les URL listées ici ont été utilisées dans des messages publiés par des utilisateurs ayant été identifiés comme spammeurs."
           url: "URL"
           domain: "Domaine"
         screened_ips:
           title: "IP sous surveillance"
-          description: 'Adresses IP qui sont surveillés. Utiliser « Autoriser » pour ajouter les adresses IP à la liste blanche.'
+          description: 'Adresses IP qui sont surveillées. Utilisez « Autoriser » pour ajouter les adresses IP à la liste blanche.'
           delete_confirm: "Êtes-vous sûr de vouloir supprimer la règle pour %{ip_address} ?"
-          roll_up_confirm: "Êtes-vous sûr de vouloir consolider les adresses IP sous surveillance sous forme de plages de sous réseaux ?"
-          rolled_up_some_subnets: "Consolidation réussie des adresses IP interdites vers ces plages de sous réseau : %{subnets}."
+          roll_up_confirm: "Êtes-vous sûr de vouloir consolider les adresses IP sous surveillance sous forme de plages de sous-réseau ?"
+          rolled_up_some_subnets: "Consolidation réussie des adresses IP interdites vers ces plages de sous-réseau : %{subnets}."
           rolled_up_no_subnet: "Aucune consolidation possible."
           actions:
             block: "Bloquer"
@@ -3929,7 +3929,7 @@ fr:
           block: "Empêchez les messages contenant ces mots d'être publiés. L'utilisateur verra un message d'erreur lorsqu'il essaiera de publier son message."
           censor: "Autoriser les messages contenant ces mots, mais les remplacer par des caractères qui cachent les mots censurés."
           require_approval: "Les messages qui contiennent ces mots devront être approuvés par un responsable avant de pouvoir être publiés."
-          flag: "Autoriser les messages contenant ces mots, mais les signaler comme inapproprié pour que les modérateurs puisse les vérifier."
+          flag: "Autoriser les messages contenant ces mots, mais les signaler comme inappropriés pour que les modérateurs puissent les vérifier."
         form:
           label: "Nouveau mot :"
           placeholder: "mot complet ou * comme signe générique"
@@ -3943,11 +3943,11 @@ fr:
           button_label: "Tester"
           modal_title: "Tester les mots observés pour l'action « %{action} »"
           description: "Entrez le texte ci-dessous pour vérifier les correspondances avec les mots surveillés"
-          found_matches: "Correspondances trouvées :"
+          found_matches: "Correspondances trouvées :"
           no_matches: "Aucune correspondance trouvée"
       impersonate:
         title: "Incarner"
-        help: "Utilisez cet outil pour incarner un compte utilisateur à des fins de tests.\nVous devrez vous déconnecter une fois terminé."
+        help: "Utilisez cet outil pour incarner un compte utilisateur à des fins de tests. Vous devrez vous déconnecter une fois terminé."
         not_found: "Cet utilisateur n'a pas été trouvé."
         invalid: "Désolé, vous ne pouvez pas vous faire passer pour cet utilisateur."
       users:
@@ -3957,8 +3957,8 @@ fr:
         not_found: "Désolé, ce nom d'utilisateur n'existe pas dans notre système."
         id_not_found: "Désolé cet identifiant d'utilisateur n'existe pas dans notre système."
         active: "Activé"
-        show_emails: "Afficher les adresses courriels"
-        hide_emails: "Cacher les adresses courriels"
+        show_emails: "Afficher les adresses courriel"
+        hide_emails: "Cacher les adresses courriel"
         nav:
           new: "Nouveaux"
           active: "Actifs"
@@ -4004,7 +4004,7 @@ fr:
         silence_reason_label: "Pourquoi mettez-vous cet utilisateur sous silence ?"
         silence_reason_placeholder: "Raison de la mise sous silence"
         silence_message: "Message courriel"
-        silence_message_placeholder: "(laisser vide pour envoyer un message par défaut)"
+        silence_message_placeholder: "(laissez vide pour envoyer un message par défaut)"
         suspended_until: "(jusqu'à %{until})"
         cant_suspend: "Cet utilisateur ne peut pas être suspendu."
         delete_all_posts: "Supprimer tous les messages"
@@ -4021,7 +4021,7 @@ fr:
           description: "les utilisateurs ayant des pénalités ne peuvent pas atteindre le niveau de confiance 3"
         delete_all_posts_confirm_MF: "Vous êtes sur le point de supprimer {POSTS, plural, one {1 message} other {# messages}} et {TOPICS, plural, one {1 sujet} other {# sujets}}. Êtes-vous sûr ?"
         silence: "Mettre sous silence"
-        unsilence: "Ne pas mettre sous silence"
+        unsilence: "Ne plus mettre sous silence"
         silenced: "Mis sous silence ?"
         moderator: "Modérateur ?"
         admin: "Administrateur ?"
@@ -4104,11 +4104,11 @@ fr:
           one: "Impossible de supprimer tous les messages parce que l'utilisateur a plus d'un message. (delete_all_posts_max)"
           other: "Impossible de supprimer tous les messages parce que l'utilisateur a plus de %{count} messages. (delete_all_posts_max)"
         delete_confirm: "Il est généralement préférable d'anonymiser les utilisateurs plutôt que de les supprimer, afin d'éviter d'enlever du contenu de discussions existantes. <br><br> Êtes-vous sûr de vouloir supprimer cet utilisateur ? C'est irréversible !"
-        delete_and_block: "Supprimer et <b>bloquer</b> cette adresse de courriel et adresse IP."
+        delete_and_block: "Supprimer et <b>bloquer</b> cette adresse courriel et adresse IP."
         delete_dont_block: "Supprimer uniquement"
         deleting_user: "Suppression de l'utilisateur"
         deleted: "L'utilisateur a été supprimé."
-        delete_failed: "Il y a eu une erreur lors de la suppression de l'utilisateur. Veuillez vous assurer que tous ses messages ont bien été supprimmés avant d'essayer de supprimer l'utilisateur."
+        delete_failed: "Il y a eu une erreur lors de la suppression de l'utilisateur. Veuillez vous assurer que tous ses messages ont bien été supprimés avant d'essayer de supprimer l'utilisateur."
         send_activation_email: "Envoyer le courriel d'activation"
         activation_email_sent: "Un courriel d'activation a été envoyé."
         send_activation_email_failed: "Il y a eu un problème lors du renvoi du courriel d'activation. %{error}"
@@ -4116,16 +4116,16 @@ fr:
         activate_failed: "Il y a eu un problème lors de l'activation du compte."
         deactivate_account: "Désactiver le compte"
         deactivate_failed: "Il y a eu un problème lors de la désactivation du compte."
-        unsilence_failed: "Il y a eu un problème en supprimant la mise sous silence de l'utilisateur."
+        unsilence_failed: "Il y a eu un problème en annulant la mise sous silence de l'utilisateur."
         silence_failed: "Il y a eu un problème en mettant l'utilisateur sous silence."
-        silence_confirm: "Êtes-vous sûr de vouloir mettre cet utilisateur sous silence ? Il ne sera plus capable de créer de nouveaux sujets ou messages."
+        silence_confirm: "Êtes-vous sûr de vouloir mettre cet utilisateur sous silence ? Il ne pourra plus créer de nouveaux sujets ou messages."
         silence_accept: "Oui, mettre cet utilisateur sous silence"
         bounce_score: "Taux de courriels non délivrés"
         reset_bounce_score:
           label: "Réinitialiser"
           title: "Réinitialiser le taux de courriels non délivrés à 0"
         visit_profile: "Visiter <a href='%{url}'>la page de préférence de cet utilisateur</a> pour modifier son profil"
-        deactivate_explanation: "Un utilisateur désactivé doit revalider son adresse de courriel."
+        deactivate_explanation: "Un utilisateur désactivé doit revalider son adresse courriel."
         suspended_explanation: "Un utilisateur suspendu ne peut pas se connecter."
         silence_explanation: "Un utilisateur mis sous silence ne peut pas créer des messages ou sujets."
         staged_explanation: "Un utilisateur distant ne peut envoyer des messages que par courriel et pour des sujets spécifiques."
@@ -4214,17 +4214,17 @@ fr:
           dropdown: "Menu déroulant"
       site_text:
         description: "Vous pouvez personnaliser n'importe quel texte de votre forum. Commencez en utilisant la recherche ci-dessous :"
-        search: "Cherchez le texte que vous souhaitez modifier"
+        search: "Recherchez le texte que vous souhaitez modifier"
         title: "Texte"
         edit: "modifier"
         revert: "Annuler les changements"
         revert_confirm: "Êtes-vous sûr de vouloir annuler vos changements ?"
         go_back: "Retour à la recherche"
         recommended: "Nous vous recommandons de personnaliser le texte suivant selon vos besoins :"
-        show_overriden: "Ne montrer que ce qui a été personnalisé"
+        show_overriden: "Afficher les textes modifiés uniquement"
         more_than_50_results: "Il y a plus de 50 résultats. Veuillez affiner votre recherche."
       settings:
-        show_overriden: "Ne montrer que ce qui a été personnalisé"
+        show_overriden: "Afficher les paramètres modifiés uniquement"
         reset: "rétablir"
         none: "aucun"
       site_settings:
@@ -4269,7 +4269,7 @@ fr:
           plugins: "Extensions"
           user_preferences: "Préférences"
           tags: "Étiquettes"
-          search: "Rechercher"
+          search: "Recherche"
           groups: "Groupes"
           dashboard: "Tableau de bord"
         secret_list:
@@ -4336,7 +4336,7 @@ fr:
           error_help: "Consulter les liens suivants pour obtenir de l'aide sur les requêtes de badge."
           bad_count_warning:
             header: "ATTENTION !"
-            text: "Certains badges n'ont pas été décernés. Ceci se produit lorsque la requête du badge retourne des identifiants d'utilisateurs ou de messages qui n’existent plus. Cela peut produire des résultats non attendus - veuillez vérifier votre requête."
+            text: "Certains badges n'ont pas été décernés. Ceci se produit lorsque la requête du badge retourne des identifiants d'utilisateurs ou de messages qui n’existent plus. Cela peut produire des résultats inattendus - veuillez vérifier votre requête."
           no_grant_count: "Aucun badge à assigner."
           grant_count:
             one: "<b>%{count}</b> badge à assigner."
@@ -4348,7 +4348,7 @@ fr:
             with_post_time: "<span class=\"username\">%{username}</span> pour son message dans %{link} à <span class=\"time\">%{time}</span>"
             with_time: "<span class=\"username\">%{username}</span> à <span class=\"time\">%{time}</span>"
         badge_intro:
-          title: "Choisissez un badge existant ou en créer un nouveau pour commencer"
+          title: "Choisissez un badge existant ou créez-en un nouveau pour commencer"
           emoji: "emoji de femme étudiante"
           what_are_badges_title: "Que sont les badges ?"
           badge_query_examples_title: "Exemple de requête de badge"
@@ -4388,7 +4388,7 @@ fr:
         embed_post_limit: "Le nombre maximum de messages à intégrer"
         embed_title_scrubber: "Expression régulière utilisée pour nettoyer le titre des messages"
         embed_truncate: "Tronquer les messages intégrés"
-        embed_unlisted: "Les sujets importés seront délistés jusqu'à la prochaine réponse."
+        embed_unlisted: "Les sujets importés seront invisibles jusqu'à la prochaine réponse."
         embed_whitelist_selector: "Sélecteur CSS pour les éléments qui seront autorisés dans les contenus intégrés"
         embed_blacklist_selector: "Sélecteur CSS pour les éléments qui seront interdits dans les contenus intégrés"
         embed_classname_whitelist: "Classes CSS autorisées"
@@ -4416,7 +4416,7 @@ fr:
           title: "Remplacer le texte des catégories et des sujets avec les traductions"
         modal:
           title: "Remplacer le texte"
-          subtitle: "Remplacer le texte des catégories et des sujets généré automatiquement par le système avec les dernières traductions"
+          subtitle: "Remplacer le texte des catégories et des sujets générés automatiquement par le système avec les dernières traductions"
           categories: "Catégories"
           topics: "Sujets"
           replace: "Remplacer"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 622563183a..4e916f971f 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -518,8 +518,8 @@ he:
         status: "מצב"
         category: "קטגוריה"
         orders:
-          priority: "עדיפות"
-          priority_asc: "עדיפות (הפוכה)"
+          score: "ניקוד"
+          score_asc: "ניקוד (הפוך)"
           created_at: "מועד יצירה"
           created_at_asc: "מועד יצירה (הפוך)"
         priority:
@@ -1957,7 +1957,6 @@ he:
           bookmarks: סימנתי
           first: הפוסטים הראשונים
           pinned: נעוצים
-          unpinned: לא נעוצים
           seen: קראתי
           unseen: לא קראתי
           wiki: הם ויקי
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index e602b1d7ed..f2e789a5a3 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -408,8 +408,7 @@ hu:
         status: "Állapot"
         category: "Kategória"
         orders:
-          priority: "Prioritás"
-          priority_asc: "Prioritás (fordított)"
+          score: "Pontszám"
           created_at: "Létrehozva"
           created_at_asc: "Létrehozva (fordított)"
         priority:
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index c02df4108a..ca0277d74b 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -426,8 +426,7 @@ hy:
         status: "Ստատուս"
         category: "Կատեգորիա"
         orders:
-          priority: "Գերակայության"
-          priority_asc: "Գերակայության (հետադարձ տեսակավորում)"
+          score: "Միավոր"
           created_at: "Ստեղծվել է At"
           created_at_asc: "Ստեղծվել է At (հետադարձ տեսակավորում)"
         priority:
@@ -1777,7 +1776,6 @@ hy:
           bookmarks: Ես էջանշել եմ
           first: "ամենաառաջին գրառումներն են "
           pinned: ամրակցված են
-          unpinned: ամրակցված չեն
           seen: Ես կարդացել եմ
           unseen: Ես չեմ կարդացել
           wiki: wiki են
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index e2a95bc2b6..202ca1aca6 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -374,8 +374,7 @@ id:
         status: "Status"
         category: "Kategori"
         orders:
-          priority: "Prioritas"
-          priority_asc: "Prioritas (terbalik)"
+          score: "Skor"
           created_at: "Dibuat Pada"
           created_at_asc: "Dibuat Pada (terbalik)"
         priority:
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index e376100dd7..f51ef4746e 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -450,8 +450,7 @@ it:
         status: "Stato"
         category: "Categoria"
         orders:
-          priority: "Priorità"
-          priority_asc: "Priorità (inversa)"
+          score: "Punteggio"
           created_at: "Creato il"
           created_at_asc: "Data creazione (inversa)"
         priority:
@@ -1832,7 +1831,6 @@ it:
           bookmarks: ho aggiunto ai segnalibri
           first: sono il primissimo post
           pinned: sono appuntati
-          unpinned: non sono appuntati
           seen: messaggi che ho letto
           unseen: non ho letto
           wiki: sono wiki
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index c433965c4b..300bb63ff7 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -360,8 +360,7 @@ ja:
         status: "ステータス"
         category: "カテゴリ"
         orders:
-          priority: "優先度"
-          priority_asc: "優先度（逆順）"
+          score: "スコア"
           created_at: "作られた"
         priority:
           title: "最小の優先度"
@@ -1462,7 +1461,6 @@ ja:
           bookmarks: ブックマーク中
           first: 最初の投稿
           pinned: 固定表示されている
-          unpinned: 固定表示されていない
           seen: 既読
           unseen: 未読
           wiki: wiki
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 8f6c833367..3edb7ed1fd 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -408,8 +408,7 @@ ko:
         status: "상태"
         category: "카테고리"
         orders:
-          priority: "우선 순위"
-          priority_asc: "우선 순위 (역)"
+          score: "점수"
           created_at: "에 만든"
           created_at_asc: "에서 생성 (역)"
         priority:
@@ -1727,7 +1726,6 @@ ko:
           bookmarks: 나는 북마크했다
           first: 가 가장 첫 포스트입니다.
           pinned: 핀고정된
-          unpinned: 핀고정 되지 않은
           seen: 읽었다
           unseen: 읽지 않은 것
           wiki: 은(는) 위키입니다.
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index af21556184..4a1f8c8986 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -1356,7 +1356,6 @@ lt:
           private: Mano žinutėse
           bookmarks: Aš išsaugojes
           pinned: yra prisegtas
-          unpinned: neprisegtas
           seen: Aš skaitau
           unseen: Aš neskaitau
           wiki: yra wiki
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 2f0e8f8e20..a08eed0133 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -315,8 +315,6 @@ lv:
         refresh: "Pārlādēt"
         status: "Statuss"
         category: "Sadaļa"
-        orders:
-          priority: "Prioritāte"
       scores:
         date: "Datums"
         status: "Statuss"
@@ -1240,7 +1238,6 @@ lv:
           tracking: Es sekoju
           first: ir tēmas pirmais ieraksts
           pinned: ir piesprausts
-          unpinned: nav piesprausts
           unseen: neesmu izlasījis
           wiki: ir wiki
         statuses:
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index a7c35a1273..866f97bec8 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -386,9 +386,6 @@ nb_NO:
         refresh: "Last inn på nytt"
         status: "Status"
         category: "Kategori"
-        orders:
-          priority: "Prioritet"
-          priority_asc: "Prioritet (motsatt)"
       scores:
         date: "Dato"
         type: "Type"
@@ -1494,7 +1491,6 @@ nb_NO:
           bookmarks: Jeg bokmerket
           first: er det første innlegget
           pinned: er festet
-          unpinned: er ikke festet
           seen: Jeg leste
           unseen: Jeg har ikke lest
           wiki: er wiki
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index bc89a09cf0..54ea8be60e 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -450,8 +450,8 @@ nl:
         status: "Status"
         category: "Categorie"
         orders:
-          priority: "Prioriteit"
-          priority_asc: "Prioriteit (omgekeerd)"
+          score: "Score"
+          score_asc: "Score (omgekeerd)"
           created_at: "Lid sinds"
           created_at_asc: "Gemaakt op (omgekeerd)"
         priority:
@@ -1832,7 +1832,6 @@ nl:
           bookmarks: Ik heb een bladwijzer aangemaakt
           first: die het eerste bericht zijn
           pinned: die zijn vastgemaakt
-          unpinned: die niet zijn vastgemaakt
           seen: Ik heb gelezen
           unseen: die ik niet heb gelezen
           wiki: die een wiki zijn
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 90bb21bc29..f56301c722 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -504,8 +504,7 @@ pl_PL:
         status: "Status"
         category: "Kategoria"
         orders:
-          priority: "Priorytet"
-          priority_asc: "Priorytet (odwróć)"
+          score: "Wynik"
           created_at: "Utworzony"
           created_at_asc: "Utworzono (odwrotnie)"
         priority:
@@ -1912,7 +1911,6 @@ pl_PL:
           bookmarks: Dodałeś do zakładek
           first: "tylko najnowsze posty "
           pinned: są przypięte
-          unpinned: są nie przypięte
           seen: Przeczytałem
           unseen: Nie przeczytałem
           wiki: są postami wiki
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 6632a055b4..b32843edab 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -1507,7 +1507,6 @@ pt:
           bookmarks: Adicionei aos marcadores
           first: são a primeira publicação
           pinned: estão afixados
-          unpinned: não estão afixados
           seen: Eu li
           unseen: Eu não li
           wiki: são wiki
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index e2438e65aa..d56dcea1d6 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -450,8 +450,7 @@ pt_BR:
         status: "Status"
         category: "Categoria"
         orders:
-          priority: "Prioridade"
-          priority_asc: "Prioridade (reversa)"
+          score: "Pontuação"
           created_at: "Criado a"
           created_at_asc: "Criado Em (reverso)"
         priority:
@@ -1308,7 +1307,7 @@ pt_BR:
       login_disabled: "O login é desabilitado enquanto o site está em modo de somente leitura."
       logout_disabled: "O logout é desabilitado enquanto o site está em modo de somente leitura."
     too_few_topics_and_posts_notice_MF: >-
-      Vamos <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">começar a discussão!</a> {currentTopics, plural, one {Existe <strong>#</strong> tópico} other {Existem <strong>#</strong> tópicos}} e {currentPosts, plural, one <strong>{#</strong> postagem} other <strong>{#</strong> postagens}}. Os visitantes precisam de mais para ler e responder – recomendamos pelo menos {requiredTopics, plural, one <strong>{#</strong> tópico} other <strong>{#</strong> tópicos}} e {requiredPosts, plural, one <strong>{#</strong> postagem} other <strong>{#</strong> postagens}}. Somente a staff pode ver esta mensagem.
+      Vamos <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">começar a discussão!</a> {currentTopics, plural, one {Existe <strong>#</strong> tópico} other {Existem <strong>#</strong> tópicos}} e {currentPosts, plural, one {<strong>#</strong> postagem} other {<strong>#</strong> postagens}}. Os visitantes precisam de mais para ler e responder – recomendamos pelo menos {requiredTopics, plural, one {<strong>#</strong> tópico} other {<strong>#</strong> tópicos}} e {requiredPosts, plural, one {<strong>#</strong> postagem} other {<strong>#</strong> postagens}}. Somente a staff pode ver esta mensagem.
     too_few_topics_notice_MF: >-
       Vamos <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">começar a discussão!</a> {currentTopics, plural, one {Existe <strong>#</strong> tópico} other {Existem <strong>#</strong> tópicos}}. Os visitantes precisam de mais para ler e responder – recomendamos pelo menos {requiredTopics, plural, one {<strong>#</strong> tópico} other { <strong>#</strong> tópicos}}. Somente a staff pode ver esta mensagem.
     too_few_posts_notice_MF: >-
@@ -1833,7 +1832,6 @@ pt_BR:
           bookmarks: Eu marquei como favorito
           first: são exatamente a primeira postagem
           pinned: estão fixados
-          unpinned: não estão fixados
           seen: Eu li
           unseen: Eu não li
           wiki: são wiki
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 16999e7b48..9d0f96b20d 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -1354,7 +1354,6 @@ ro:
           private: În mesajele mele
           first: sunt chiar pe primul loc în listă
           pinned: sunt fixate
-          unpinned: nu sunt fixate
           seen: Citesc
           unseen: Nu am citit
           wiki: sunt wiki
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 6e453f47e4..1f40f442d5 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -518,8 +518,8 @@ ru:
         status: "Статус"
         category: "Раздел"
         orders:
-          priority: "Приоритету"
-          priority_asc: "Приоритету (обратная сортировка)"
+          score: "Оценка"
+          score_asc: "Оценка (обратная)"
           created_at: "Дате создания"
           created_at_asc: "Дате создания (обратная сортировка)"
         priority:
@@ -752,7 +752,7 @@ ru:
         muted:
           title: "Выключено"
           description: "Вы не будете уведомлены о все о сообщениях в этой группе."
-      flair_url: "Изображение аватара"
+      flair_url: "Иконка на аватаре"
       flair_upload_description: "Используйте квадратные картинки размером не менее чем 20х20 пикселей."
       flair_bg_color: "Фоновый цвет аватара"
       flair_bg_color_placeholder: "(Необязательно) Hex-код цвета"
@@ -760,6 +760,9 @@ ru:
       flair_color_placeholder: "(Необязательно) Hex-код цвета"
       flair_preview_icon: "Иконка предпросмотра"
       flair_preview_image: "Изображение предпросмотра"
+      flair_type:
+        icon: "Выбрать иконку"
+        image: "Загрузить картинку"
     user_action_groups:
       "1": "Мои симпатии"
       "2": "Симпатии"
@@ -1802,7 +1805,7 @@ ru:
           other: "{{count}} непрочитанных сообщений"
         high_priority:
           one: "%{count} непрочитанное уведомление с высоким приоритетом"
-          few: "%{count} непрочитанных уведомлений с высоким приоритетом"
+          few: "%{count} непрочитанных уведомления с высоким приоритетом"
           many: "%{count} непрочитанных уведомлений с высоким приоритетом"
           other: "%{count} непрочитанных уведомлений с высоким приоритетом"
       title: "уведомления об упоминании вашего @псевдонима, ответах на ваши сообщения и темы, сообщения и т.д."
@@ -1954,7 +1957,6 @@ ru:
           bookmarks: В моих закладках
           first: Только в первом сообщении темы
           pinned: Закреплённые
-          unpinned: Незакреплённые
           seen: Прочитанные
           unseen: Непрочитанные
           wiki: Являются вики
@@ -4667,6 +4669,7 @@ ru:
         post_title: "Сообщение"
         category_id: "Номер раздела"
         category_title: "Раздел"
+        tag_name: "Имя тега"
         external_url: "Внешняя ссылка"
         destination: "Назначения"
         delete_confirm: "Удалить эту постоянную ссылку?"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index a98c6ebd58..e2b5297f8c 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -1344,7 +1344,6 @@ sk:
           tracking: Pozorujem
           private: V mojich správach
           pinned: sú pripnuté
-          unpinned: nie sú pripnuté
           unseen: som nečítal
         statuses:
           label: Kde témy
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 497fcb5081..931759b24f 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -432,6 +432,8 @@ sl:
         refresh: "Osveži"
         status: "Stanje"
         category: "Kategorija"
+        orders:
+          score: "Ocena"
         priority:
           medium: "Srednja"
           high: "Visoka"
@@ -1748,7 +1750,6 @@ sl:
           bookmarks: kjer sem ustvaril zaznamek
           first: ob prvem prispevku
           pinned: so pripete
-          unpinned: niso pripete
           seen: ki sem jih prebral
           unseen: ki jih nisem prebral
           wiki: so wiki
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 7c2d594cfc..9c39d3b3bc 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -450,8 +450,8 @@ sv:
         status: "Status"
         category: "Kategori"
         orders:
-          priority: "Prioritet"
-          priority_asc: "Prioritet (omvänt)"
+          score: "Poäng"
+          score_asc: "Poäng (omvänt)"
           created_at: "Skapad den"
           created_at_asc: "Skapad den (omvänt)"
         priority:
@@ -1835,7 +1835,6 @@ sv:
           bookmarks: Som jag har bokmärkt
           first: är den första posten
           pinned: är pinnade
-          unpinned: är inte pinnade
           seen: Som jag har läst
           unseen: Jag inte har läst
           wiki: är wiki
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index fcbcc9a504..ef8c1898bf 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -1393,7 +1393,6 @@ sw:
           bookmarks: Nimejibu
           first: ni chapisho la kwanza
           pinned: zimebadikwa
-          unpinned: hazijabadikwa
           seen: Nilisoma
           unseen: Sijasoma
           wiki: ni wiki
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index db99f641cc..dea6f70c0b 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -428,8 +428,7 @@ tr_TR:
         status: "Durum"
         category: "Kategori"
         orders:
-          priority: "Öncelik"
-          priority_asc: "Öncelik (ters)"
+          score: "Skor"
           created_at: "İçinde Oluşturuldu"
           created_at_asc: "İçinde Oluşturuldu (tersine)"
         priority:
@@ -1762,7 +1761,6 @@ tr_TR:
           bookmarks: İşaretledim
           first: "ilk gönderidir "
           pinned: sabitlenmiş
-          unpinned: sabitlenmemiş
           seen: Okudum
           unseen: Okumadım
           wiki: wiki olan
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 6d77e5b8ce..9068c2d63c 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -497,8 +497,7 @@ uk:
         status: "Статус"
         category: "Категорія"
         orders:
-          priority: "Пріоритет"
-          priority_asc: "Пріоритет (зворотний порядок)"
+          score: "Бал"
           created_at: "Створено в"
           created_at_asc: "Створено (зворотний порядок)"
         priority:
@@ -1887,7 +1886,6 @@ uk:
           bookmarks: Мої закладки
           first: Тільки перші повідомлення в темах
           pinned: Закріплені
-          unpinned: Не закріплені
           seen: Читання
           unseen: Позначити непрочитаними
           wiki: Є вікі
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 072bd19ef2..b15d697512 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -40,7 +40,7 @@ ur:
       long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
       wrap_ago: "%{date} قبل"
       tiny:
-        half_a_minute: "< 1منٹ"
+        half_a_minute: "ایک لحظہ قبل"
         less_than_x_seconds:
           one: "< %{count} سیکنڈ"
           other: "< %{count} سیکنڈ"
@@ -416,8 +416,7 @@ ur:
         status: "سٹیٹس"
         category: "زمرہ"
         orders:
-          priority: "ترجیح"
-          priority_asc: "ترجیح (ریوَرس)"
+          score: "اسکور"
           created_at: "کو بنایا گیا"
           created_at_asc: "کو بنایا گیا (ریوَرس)"
         priority:
@@ -1707,7 +1706,6 @@ ur:
           bookmarks: میں نے بُک مارک کیے ہوے ہوں
           first: جو سب سے پہلی پوسٹ ہو
           pinned: جو پِن ہوا ہو
-          unpinned: جو پِن نہ ہوا ہو
           seen: جو میں نے پڑھ لیے ہوں
           unseen: جو میں نے نہ پڑھا ہو
           wiki: جو وِیکی ہو
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index fab41b115e..edb82585f1 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -397,8 +397,7 @@ vi:
         status: "Trạng thái"
         category: "Danh mục"
         orders:
-          priority: "Mức độ ưu tiên"
-          priority_asc: "Mức độ ưu tiên (đảo ngược)"
+          score: "Điểm số"
           created_at: "Được tạo tại"
           created_at_asc: "Tạo tại (đảo ngược)"
         priority:
@@ -1439,7 +1438,6 @@ vi:
           likes: Tôi đã thích
           posted: Tôi đã gửi trong
           pinned: được gim
-          unpinned: không được gim
           unseen: Tôi chưa đọc
           wiki: là wiki
         statuses:
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 2fd20b3b61..5840f236e2 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -416,8 +416,8 @@ zh_CN:
         status: "状态"
         category: "分类"
         orders:
-          priority: "优先级"
-          priority_asc: "优先级（倒序）"
+          score: "评分"
+          score_asc: "分数（倒序）"
           created_at: "创建时间"
           created_at_asc: "创建时间（倒序）"
         priority:
@@ -642,12 +642,16 @@ zh_CN:
           title: "静音"
           description: "你不会收到有关此组中消息的任何通知。"
       flair_url: "头像图片"
+      flair_upload_description: "使用边长不小于20px的正方形图片。"
       flair_bg_color: "头像背景颜色"
       flair_bg_color_placeholder: "（可选）十六进制色彩值"
       flair_color: "头像颜色"
       flair_color_placeholder: "（可选）十六进制色彩值"
       flair_preview_icon: "预览图标"
       flair_preview_image: "预览图片"
+      flair_type:
+        icon: "选择图标"
+        image: "上传图片"
     user_action_groups:
       "1": "点赞赞"
       "2": "获得赞"
@@ -706,6 +710,7 @@ zh_CN:
       copied: "已复制"
     user_fields:
       none: "（选择一项）"
+      required: '请为“%{name}”输入一个值。'
     user:
       said: "{{username}}："
       profile: "个人资料"
@@ -721,6 +726,7 @@ zh_CN:
       private_messages: "私信"
       user_notifications:
         filters:
+          filter_by: "筛选"
           all: "全部"
           read: "阅读"
           unread: "未读"
@@ -841,6 +847,7 @@ zh_CN:
       api_approved: "已批准："
       api_last_used_at: "最后使用于："
       theme: "主题"
+      save_to_change_theme: '主题会在你点击“%{save_text}”后被更新。'
       home: "默认主页"
       staged: "暂存"
       staff_counters:
@@ -891,6 +898,7 @@ zh_CN:
         copy_to_clipboard: "复制到剪贴板"
         copy_to_clipboard_error: "复制到剪贴板时出错"
         copied_to_clipboard: "已复制到剪贴板"
+        download_backup_codes: "下载备份码"
         remaining_codes: "你有<strong>{{count}}</strong>个备份码"
         use: "使用备份码"
         enable_prerequisites: "你必须在生成备份代码之前启用主要第二因素。"
@@ -1016,6 +1024,7 @@ zh_CN:
         too_long: "用户名过长"
         checking: "查看用户名是否可用…"
         prefilled: "邮箱与用户匹配成功"
+        required: "请输入一个用户名"
       locale:
         title: "界面语言"
         instructions: "用户界面语言。将在你刷新页面后改变。"
@@ -1765,7 +1774,6 @@ zh_CN:
           bookmarks: 我收藏了
           first: 是第一帖
           pinned: 是置顶的
-          unpinned: 不是置顶的
           seen: 我看了
           unseen: 我还没看过
           wiki: 公共编辑
@@ -2174,6 +2182,7 @@ zh_CN:
         action: "合并选择的帖子"
         error: "合并帖子时发生了错误。"
       publish_page:
+        title: "页面发布中"
         publish: "出版"
         description: "当一个主题被出版为一个页面时，其链接是共享的，并且会以自定义的样式显示。"
         slug: "Slug"
@@ -2309,6 +2318,7 @@ zh_CN:
         convert_to_moderator: "添加管理人员颜色标识"
         revert_to_regular: "移除管理人员颜色标识"
         rebake: "重建 HTML"
+        publish_page: "页面发布中"
         unhide: "显示"
         change_owner: "更改作者"
         grant_badge: "授予徽章"
@@ -2936,6 +2946,7 @@ zh_CN:
     forced_anonymous: "由于极端负载，暂时向所有人显示，已注销用户会看到它。"
     footer_nav:
       back: "返回"
+      forward: "继续"
       share: "分享"
       dismiss: "忽略"
     safe_mode:
@@ -4265,6 +4276,7 @@ zh_CN:
         post_title: "帖子"
         category_id: "分类 ID"
         category_title: "分类"
+        tag_name: "标签名称"
         external_url: "外部 URL"
         destination: "目标"
         delete_confirm: 你确定要删除该永久链接？
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 28a810d7bf..2192949a22 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -356,6 +356,8 @@ zh_TW:
         refresh: "重新整理"
         status: "狀態"
         category: "分類"
+        orders:
+          score: "分數"
         priority:
           medium: "中間的"
           high: "高"
@@ -1562,7 +1564,6 @@ zh_TW:
           bookmarks: 我加入書籤的
           first: 是第一篇文
           pinned: 是置頂的
-          unpinned: 不是置頂的
           seen: 我已讀的
           unseen: 我還未讀的
           wiki: 是公共編輯的
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 8f34e97958..b37988fd4b 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -929,7 +929,6 @@ ar:
     crawl_images: "جلب الصور من الروابط لادراج الأبعاد الصحيحة."
     download_remote_images_to_local: "تحويل الصور البعيدة إلى صور محلية بواسطة تحميلها؛ بإستثناء الصور التالفة"
     download_remote_images_threshold: "ادني مساحه للقرص ضروربه لتحميل الصور البعيده محليا ( في المئه) "
-    download_remote_images_max_days_old: "لا تقم بتحميل الصور من مواقع اخرى للمنشورات اﻷقدم من هذا عدد من اﻷيام."
     disabled_image_download_domains: "الصور البعيدة لن يتم تنزيلها من هذا المجال. قائمة Pipe-delimited."
     editing_grace_period: "خلال هذا العدد من الثواني بعد نشر المنشور، تعديل المنشور لن يقوم بانشاء نسخة جديدة في السجل الخاص بالتعديل ."
     edit_history_visible_to_public: "اسمح لاي شخص ان يرى النسخ السابقه للمنشورات المعدله. عندما يتم تعطيلها.،فقط اعضاء فريق العمل يمكنهم رؤيتها "
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index 0be1a79574..cd1405bcd5 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -902,7 +902,6 @@ be:
     crawl_images: "Атрыманне малюнкаў з аддаленых URL-адрасоў, каб ўставіць правільныя памеры шырыні і вышыні."
     download_remote_images_to_local: "Пераўтварэнне аддаленых малюнкаў на лакальныя малюнка, загрузіўшы іх; гэта прадухіляе зламаныя выявы."
     download_remote_images_threshold: "Мінімальныя дыскавая прастора, неабходнае для загрузкі аддаленых малюнкаў лакальна (у працэнтах)"
-    download_remote_images_max_days_old: "Не загружаць выдаленыя выявы для паведамленняў, якія больш чым п дзён."
     disabled_image_download_domains: "Выдаленыя малюнка не будуць загружацца з гэтых даменаў. Pipe коскамі спіс."
     editing_grace_period_max_diff_high_trust: "Максімальную колькасць змяненняў сімвалаў, дазволеных для рэдагавання ільготнага перыяду, калі больш змененым крамы іншага паста перагляду (давер ўзроўню 2 і вышэй)"
     staff_edit_locks_post: "Паведамленні будуць заблакаваныя ад рэдагавання, калі яны рэдагуюцца супрацоўнікамі"
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 6645e0c719..68abffcbba 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -1291,7 +1291,6 @@ ca:
     crawl_images: "Recupera imatges d'adreces URL remotes per a inserir-hi les dimensions correctes d'amplada i alçada."
     download_remote_images_to_local: "Converteix les imatges remotes en imatges locals en descarregar-les. Això evita les imatges trencades."
     download_remote_images_threshold: "L'espai mínim necessari en el disc per a descarregar imatges remotes en local (percentatge)"
-    download_remote_images_max_days_old: "No descarreguis imatges remotes per a publicacions que tenen més de N dies."
     disabled_image_download_domains: "Les imatges remotes no es descarregaran mai des d'aquests dominis. Llista delimitada amb barres verticals."
     editing_grace_period: "Durant (n) segons després de publicar, l'edició no crearà una nova versió en l'historial de publicació."
     editing_grace_period_max_diff: "Nombre màxim de canvis de caràcter permesos en el període de gràcia d'edició. Si se'n canvien més, emmagatzema una altra revisió de publicació (nivells de confiança 0 i 1)."
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 1414b55b2c..573733ef81 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -944,7 +944,6 @@ da:
     crawl_images: "Hent billeder fra eksterne URLs for at indsætte de korrekte bredde og højde dimensioner."
     download_remote_images_to_local: "Konverter eksterne billeder til lokale billeder ved at downloade dem; dette forebygger at billeder ikke forsvinder."
     download_remote_images_threshold: "Minimum hukommelse påkrævet på drev for at downloade billeder lokalt (i procent)"
-    download_remote_images_max_days_old: "Undlade at downloade billeder til indlæg der er mere end n dage gamle."
     disabled_image_download_domains: "Eksterne billeder vil ikke blive hentet fra disse domæner. Afgrænset liste."
     editing_grace_period: "For (n) sekunder efter postering, vil redigering ikke skabe et nyt indlæg."
     edit_history_visible_to_public: "Tillad alle at se tidligere versioner af et redigeret indlæg. Når slået fra, kan kun administrator se dette."
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 410ff7eb58..1ce2dd6c90 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -1299,7 +1299,6 @@ de:
     crawl_images: "Lade Bilder von fremden URLs herunter, um ihre Höhe und Breite zu bestimmen."
     download_remote_images_to_local: "Lade eine Kopie von extern gehosteten Bildern herunter und ersetze Links in Beiträgen entsprechend; dies verhindert defekte Bilder."
     download_remote_images_threshold: "Minimal benötigter freier Festplattenspeicher um externe Bilder lokal herunterzuladen (in Prozent)"
-    download_remote_images_max_days_old: "Externe Bilder nicht herunterladen für Beiträge, die älter als (n) Tage alt sind."
     disabled_image_download_domains: "Liste von Domänen, von denen verlinkte Bilder niemals heruntergeladen werden sollen."
     editing_grace_period: "Für (n) Sekunden wird nach dem Bearbeiten keine neue Revision im Beitragsverlauf angelegt."
     editing_grace_period_max_diff: "Maximale Anzahl von Zeichenänderungen, die während der Bearbeitungsfrist erlaubt sind. Bei größeren Änderungen wird eine neue Beitragsversion gespeichert (Vertrauensstufe 0 und 1)"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 9e7ed99315..4166fca0e7 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -868,7 +868,6 @@ el:
     crawl_images: "Ανάκτηση εικόνων από απομακρυσμένα URLs για να προστεθούν οι σωστές διαστάσεις πλάτους και ύψους."
     download_remote_images_to_local: "Μετέτρεψε τις απομονωμένες εικόνες σε τοπικές εικόνες κατεβάζωντάς τες, αυτό αποτρέπει τις 'σπασμένες' εικόνες."
     download_remote_images_threshold: "Ελάχιστη απαιτούμενη χωρητικότητα δίσκου για το κατέβασμα απομακρυσμένων εικόνων τοπικά (σε ποσοστό)"
-    download_remote_images_max_days_old: "Μην κατεβάσεις απομακυσμένες εικόνες για αναρτήσεις που είναι μεγαλύτερες απο n ημερών."
     disabled_image_download_domains: "Οι απομακρυσμένες εικόνες δεν θα κατέβουν ποτέ από αυτούς τους τομείς. Λίστα pipe-delimited"
     editing_grace_period: "Για (n) δευτερόλεπτα μετά από την ανάρτηση, η επεξεργασία δεν θα δημιουργήσει νεα έκδoση στο ιστορικό της ανάρτησης. "
     edit_history_visible_to_public: "Επίτρεψε σε όλους να δουν προηγούμενες εκδοχές από μια επεξεργασμένη ανάρτηση. Όταν είναι απενεργοποιημένο, μόνο οι συνεργάτες μπορούν να τις δούν. "
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 7ebe54104c..4eebed5fd9 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -1334,7 +1334,6 @@ es:
     crawl_images: "Recuperar imágenes desde URLs remotas para insertarlas con las dimensiones correctas de ancho y de largo."
     download_remote_images_to_local: "Convertir imágenes remotas a imágenes locales descargándolas; esto previene imágenes rotas."
     download_remote_images_threshold: "Espacio mínimo en el disco necesario para descargar imágenes remotas de forma local (porcentaje)"
-    download_remote_images_max_days_old: "No descargar imágenes remotas de publicaciones que tengan más de n días de antigüedad."
     disabled_image_download_domains: "Las imágenes remotas que provengan de estos dominios no serán descargadas. Lista delimitada por barras."
     editing_grace_period: "Durante (n) segundos después de que se publique algún mensaje, se puede editar la publicación sin crear una nueva versión en el historial."
     editing_grace_period_max_diff: "Número máximo de cambios de caracteres permitidos en el período de gracia de edición, si hay más cambios, almacenar otra revisión de publicación (nivel de confianza 0 y 1)"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 812f19e0db..ea01165755 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -16,6 +16,7 @@ fa_IR:
       short_no_year: "%B %-d"
       date_only: "%B %-d, %Y"
       long: "%B %-d, %Y, %l:%M%P"
+      no_day: "%B %Y"
   date:
     month_names: [~, ژانویه, فوریه, مارچ, آپریل, می, جون, جولای, آگوست, سپتامبر, اکتبر, نوامبر, دسامبر]
     <<: *datetime_formats
@@ -219,6 +220,7 @@ fa_IR:
     reminders:
       at_desktop: "بار آینده من پشت میزم هستم"
       later_today: "امروز"
+      next_business_day: "روز کاری بعدی"
       tomorrow: "فردا"
       next_week: "هفته بعد"
       next_month: "ماه بعد"
@@ -863,7 +865,6 @@ fa_IR:
     crawl_images: "بازیابی تصاویر از URL‌های خارجی برای وارد کردن طول و عرض صحیح. "
     download_remote_images_to_local: "تبدیل عکس‌های خارجی به عکس های محلی با دانلود کردن آنها، این مانع از شکستن عکس‌ها می شود."
     download_remote_images_threshold: "حداقل فضای دیسک مورد نیاز برای دانلود عکس‌های خارجی به هاست (به درصد)"
-    download_remote_images_max_days_old: "تصاویر خارجی را برای فرسته‌های قدیمی‌تر از n روز بارگیری نکن."
     disabled_image_download_domains: "عکس‌های خارجی هرگز از این دامنه‌ها دانلود نخواهند شد. لیست Pipe-delimited"
     editing_grace_period: "ویرایش کردن تا (n) ثانیه بعد از ارسال فرسته، نسخه جدیدی در تاریخچه ایجاد نمی‌کند."
     edit_history_visible_to_public: "به همه اجازه بده تا نسخه قبلی نوشته ویرایش شده را ببینند. وقتی غیر‌فعال است٬ فقی اعضای همکار می‌توانند ببینند."
@@ -1333,6 +1334,7 @@ fa_IR:
     autoclosed_disabled_lastpost: "این موضوع در حال حاضر باز است. پاسخ‌های جدید اجازه‌ی ثبت دارند."
     auto_deleted_by_timer: "به صورت خودکار توسط زمان‌سنج حذف شده."
   login:
+    security_key_alternative: "روش دیگری را امتحان کنید"
     security_key_authenticate: "تأیید اعتبار با کلید امنیتی"
     security_key_not_allowed_error: "مراحل تأیید اعتبار کلید امنیتی به پایان رسیده است یا لغو شده است."
     not_approved: "حساب کاربری شما هنوز تایید نشده است. وقتی شما آماده ورود به سیستم شوید به شما اطلاع داده می شود."
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 1129ecc1f6..ceb4206823 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -1320,7 +1320,6 @@ fi:
     crawl_images: "Lataa linkatut kuvat kuvan dimensioiden määrittamiseksi."
     download_remote_images_to_local: "Muunna linkatut kuvat liitetiedostoiksi lataamalla ne; tämä estää kuvien rikkoontumisen vanhentuneiden linkkien vuoksi."
     download_remote_images_threshold: "Vähin vapaa tila, jotta linkatut kuvat ladataan (prosenteissa)"
-    download_remote_images_max_days_old: "Älä lataa linkattuja kuvia viesteistä, jotka ovat yli n päivää vanhoja."
     disabled_image_download_domains: "Linkattuja kuvia ei koskaan ladata näistä verkkotunnuksista. Pystyviivalla eroteltu lista."
     editing_grace_period: "Viestin muokkaaminen (n) sekunnin sisällä sen lähettämisestä ei luo viestistä uutta versiota viestin lokiin."
     editing_grace_period_max_diff: "Kuinka monen merkin muutos sallitaan katumusaikana. Jos muutos on isompi tallennetaan uusi viestirevisio (luottamustasolla 0 ja 1)."
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 934a29f6fd..8449404a2b 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -8,8 +8,8 @@
 fr:
   dates:
     short_date_no_year: "D MMM"
-    short_date: "D MMM, YYYY"
-    long_date: "D MMMM YYYY H:mm"
+    short_date: "D MMM YYYY"
+    long_date: "D MMMM YYYY LT"
   datetime_formats: &datetime_formats
     formats:
       short: "%d-%m-%Y"
@@ -67,13 +67,13 @@ fr:
       default_out_range: "La valeur par défaut de paramètre `%{name}` n'est pas dans la plage spécifiée."
       enum_value_not_valid: "La valeur séléctionnée ne fait pas partie des choix enum."
       number_value_not_valid: "La nouvelle valeur n'est pas dans la plage autorisée."
-      number_value_not_valid_min_max: "Doit être comprise entre %{min} et %{max}."
-      number_value_not_valid_min: "Doit être supérieure ou égale à %{min}."
-      number_value_not_valid_max: "Doit être inférieur ou égal à %{max}."
+      number_value_not_valid_min_max: "La valeur doit être comprise entre %{min} et %{max}."
+      number_value_not_valid_min: "La valeur doit être supérieure ou égale à %{min}."
+      number_value_not_valid_max: "La valeur doit être inférieure ou égale à %{max}."
       string_value_not_valid: "La longueur de la nouvelle valeur n'est pas dans la plage autorisée."
-      string_value_not_valid_min_max: "Doit être compris(e) entre %{min} et %{max} caractères."
-      string_value_not_valid_min: "Doit être d'au moins %{count} caractères."
-      string_value_not_valid_max: "Doit être de %{max} caractères au plus."
+      string_value_not_valid_min_max: "La chaîne de caractères doit contenir entre %{min} et %{max} caractères."
+      string_value_not_valid_min: "La chaîne de caractères doit contenir au moins %{min} caractères."
+      string_value_not_valid_max: "La chaîne de caractères doit contenir au plus %{max} caractères."
     locale_errors:
       top_level_locale: "La clé de premier niveau dans un fichier de localisation doit correspondre au nom de locale"
       invalid_yaml: "Traduction YAML non valide"
@@ -87,31 +87,31 @@ fr:
       missing_attachment: "(Fichier %{filename} introuvé)"
       errors:
         empty_email_error: "Se produit quand le courriel reçu était vide."
-        no_message_id_error: "Se produit quand le courriel n'a pas d'entête \"Message-Id\"."
+        no_message_id_error: "Se produit quand le courriel n'a pas d'entête « Message-Id »."
         auto_generated_email_error: "Se produit quand l'entête « precedence » est : list, junk, bulk ou auto-reply, ou lorsque n'importe quel autre entête contient : auto-submitted, auto-replied ou auto-generated."
         no_body_detected_error: "Se produit quand il est impossible d'extraire le corps du message et qu'il n'y a pas de pièces-jointes."
         no_sender_detected_error: "Se produit lorsque nous n'avons pas trouvé une adresse courriel valide dans l'entête From."
         from_reply_by_address_error: "Survient quand l'entête 'From' correspond à l'adresse courriel 'Reply by'."
         inactive_user_error: "Se produit quand l'expéditeur n'est pas actif."
         silenced_user_error: "Se produit lorsque l'expéditeur a été mis sous silence."
-        bad_destination_address: "Se produit quand aucune des adresses courriel des champs To/Cc ne correspond à une adresse de courriel entrante configurée."
+        bad_destination_address: "Se produit quand aucune des adresses courriel des champs To/Cc ne correspond à une adresse courriel entrante configurée."
         strangers_not_allowed_error: "Se produit quand un utilisateur a essayé de créer un nouveau sujet dans une catégorie dans laquelle il n'est pas membre."
         insufficient_trust_level_error: "Se produit quand un utilisateur a essayé de créer un nouveau sujet dans une catégorie pour laquelle il n'a pas le niveau de confiance nécessaire."
-        reply_user_not_matching_error: "Se produit quand une réponse est venue d'une adresse de courriel différente de celle où a été envoyée la notification."
+        reply_user_not_matching_error: "Se produit quand une réponse est venue d'une adresse courriel différente de celle où a été envoyée la notification."
         topic_not_found_error: "Se produit quand quelqu'un répond à un sujet qui a été supprimé."
         topic_closed_error: "Se produit quand quelqu'un répond mais le sujet lié a été fermé."
         bounced_email_error: "Le courriel est un rapport de courriel non délivré."
-        screened_email_error: "Arrive quand l'adresse courriel de l'expéditeur est déjà sous surveillance."
+        screened_email_error: "Se produit quand l'adresse courriel de l'expéditeur est déjà sous surveillance."
         unsubscribe_not_allowed: "Se produit lorsque le désabonnement via courriel n'est pas autorisé pour cet utilisateur."
         email_not_allowed: "Se produit quand l'adresse courriel n'est pas dans la liste autorisée ou est dans la liste des indésirables."
       unrecognized_error: "Erreur non reconnue"
-    secure_media_placeholder: "Expurgé: ce site a activé la sécurisation des médias, visitez le sujet pour visualiser le fichier image/audio/vidéo correspondant."
+    secure_media_placeholder: "Expurgé : ce site a activé la sécurisation des médias. Visitez le sujet pour visualiser le fichier image/audio/vidéo correspondant."
   errors: &errors
     format: "%{attribute} %{message}"
     format_with_full_message: "<b>%{attribute}</b> : %{message}"
     messages:
       too_long_validation: "est limité à %{max} caractères maximum ; il y en a %{length}."
-      invalid_boolean: "Vrai/Faux invalide."
+      invalid_boolean: "Booléen invalide."
       taken: "a déjà été pris"
       accepted: doit être accepté
       blank: ne peut être vide
@@ -127,7 +127,7 @@ fr:
       inclusion: n'est pas inclus dans la liste
       invalid: est invalide
       is_invalid: "ne semble pas clair, est-ce une phrase complète ?"
-      invalid_timezone: "« %{tz} » n'est pas fuseau horaire valide"
+      invalid_timezone: "« %{tz} » n'est pas fuseau horaire valide"
       contains_censored_words: "contient les mots censurés suivants : %{censored_words}"
       less_than: "doit être inférieure à %{count}"
       less_than_or_equal_to: "doit être inférieur ou égal à %{count}"
@@ -166,7 +166,7 @@ fr:
         other: "Vous avez spécifié les choix invalides %{name}"
       default_categories_already_selected: "Vous ne pouvez pas séléctionner une catégorie qui est utilisée dans une autre liste."
       default_tags_already_selected: "Vous ne pouvez pas sélectionner une étiquette utilisée dans une autre liste."
-      s3_upload_bucket_is_required: "Vous ne pouvez pas activer l'upload sur S3 avant d'avoir renseigné le 's3_upload_bucket'."
+      s3_upload_bucket_is_required: "Vous ne pouvez pas activer l'envoi de fichiers sur S3 avant d'avoir renseigné le paramètre 's3_upload_bucket'."
       enable_s3_uploads_is_required: "Vous ne pouvez pas activer l'inventaire sur S3 avant d'avoir activer les envois S3."
       s3_backup_requires_s3_settings: "Il n'est pas possible d'utiliser le lieu de sauvegarde S3 sans renseigner le '%{setting_name}'."
       s3_bucket_reused: "Il n'est pas possible d'utiliser le même bucket pour 's3_upload_bucket' and 's3_backup_bucket'. Choisir un autre bucket ou utiliser un chemin d'accès différent pour chaque bucket."
@@ -184,9 +184,9 @@ fr:
     not_found_template: |
       <p>Votre invitation à <a href="%{base_url}">%{site_name}</a> a déjà été utilisée.</p>
 
-      <p>Si vous vous rappelez de votre mot de passe, vous pouvez vous <a href="%{base_url}/login">Connecter</a>.</p>
+      <p>Si vous vous rappelez de votre mot de passe, vous pouvez vous <a href="%{base_url}/login">connecter</a>.</p>
 
-      <p>Sinon, veuillez <a href="%{base_url}/password-reset">Réinitialiser mot de passe</a>.</p>
+      <p>Sinon, veuillez <a href="%{base_url}/password-reset">réinitialiser mot de passe</a>.</p>
     error_message: "Il y a eu une erreur lors de l'acceptation d'une invitation. Merci de contacter l'administrateur du site."
     user_exists: "Il n'y a pas besoin d'inviter <b>%{email}</b> qui <a href='%{base_path}/u/%{username}/summary'>a déjà un compte</a> !"
     confirm_email: "<p>Vous y êtes presque ! Nous avons envoyé un courriel d'activation à votre adresse. Merci de suivre les instructions dans le courriel pour activer votre compte.</p><p>Si vous ne le recevez pas, vérifiez votre dossier Spam dans votre messagerie.</p>"
@@ -202,18 +202,18 @@ fr:
     backup_file_should_be_tar_gz: "Le fichier de sauvegarde doit être une archive .tar.gz."
     not_enough_space_on_disk: "Il n'y a pas assez d'espace sur le disque pour charger cette sauvegarde."
     invalid_filename: "Le nom du fichier de sauvegarde contient des caractères invalides. Sont autorisés : a-z 0-9 . - _."
-    file_exists: "Le fichier que vous essayer de télécharger existe déjà."
+    file_exists: "Le fichier que vous essayer d'envoyer existe déjà."
     location:
       local: "Locale"
       s3: "Amazon S3"
   invalid_params: "Vous avez fourni des paramètres invalides pour la requête : %{message}"
   not_logged_in: "Vous devez être connecté pour faire cela."
-  not_found: "L'URL ou ressource demandée n'a pas été retrouvé."
+  not_found: "L'URL ou la ressource demandée n'a pas été retrouvée."
   invalid_access: "Vous n'avez pas la permission de voir cette ressource."
   authenticator_not_found: "La méthode d'authentification n'existe pas ou a été désactivée."
-  invalid_api_credentials: "Vous n'êtes pas autorisés à voir cette ressource. Le nom d’utilisateur ou la clé API n'est pas valide."
-  provider_not_enabled: "Vous n'êtes pas autorisés à voir cette ressources. Le fournisseur d'authentification n'est pas activé."
-  provider_not_found: "Vous n'êtes pas autorisés à voir cette ressources. Le fournisseur d'authentification n'existe pas."
+  invalid_api_credentials: "Vous n'êtes pas autorisé à voir cette ressource. Le nom d’utilisateur ou la clé API n'est pas valide."
+  provider_not_enabled: "Vous n'êtes pas autorisé à voir cette ressource. Le fournisseur d'authentification n'est pas activé."
+  provider_not_found: "Vous n'êtes pas autorisé à voir cette ressource. Le fournisseur d'authentification n'existe pas."
   read_only_mode_enabled: "Le site est en mode lecture seule. Les interactions sont désactivées."
   invalid_grant_badge_reason_link: "Lien discourse externe ou invalide pas permis dans la raison d'un badge"
   email_template_cant_be_modified: "Ce modèle de courriel ne peut pas être modifié"
@@ -224,7 +224,7 @@ fr:
     request_membership: "Demande d'adhésion"
     join_group: "Rejoindre le groupe"
   deleted_topic: "Ce sujet a été supprimé et n'est plus disponible."
-  delete_topic_failed: "Une erreur est survenue pendant l'effacement de ce sujet. Merci de contacter l'Administrateur du site."
+  delete_topic_failed: "Une erreur est survenue pendant l'effacement de ce sujet. Veuillez contacter l'administrateur du site."
   reading_time: "Temps de lecture"
   likes: "J'aime"
   too_many_replies:
@@ -247,7 +247,7 @@ fr:
       other: "%{count} réponses supplémentaires"
     loading: "Chargement de la discussion…"
     permalink: "Lien permanent"
-    imported_from: "Il s'agit d'un sujet en provenance de l'article %{link}"
+    imported_from: "Ce sujet de discussion accompagne la publication %{link}"
     in_reply_to: "▶ %{username}"
     replies:
       one: "%{count} réponse"
@@ -281,15 +281,16 @@ fr:
     one: "Désolé, les nouveaux utilisateurs ne peuvent insérer qu'un seul lien par message."
     other: "Désolé, les nouveaux utilisateurs ne peuvent insérer que %{count} liens par message."
   contains_blocked_word: "Votre message contient un mot qui n'est pas permis : %{word}"
-  contains_blocked_words: "Votre message contient plusieurs mots qui ne sont pas autorisés: %{words}"
+  contains_blocked_words: "Votre message contient plusieurs mots qui ne sont pas permis : %{words}"
   spamming_host: "Désolé, vous ne pouvez pas insérer de lien vers ce domaine."
   user_is_suspended: "Les utilisateurs suspendus ne sont pas autorisés à poster de messages."
   topic_not_found: "Une erreur est survenue. Peut-être que ce sujet a été fermé ou supprimé pendant que vous le regardiez ?"
   not_accepting_pms: "Désolé, %{username} n'accepte pas de messages pour le moment."
   max_pm_recipients: "Désolé, vous pouvez envoyer un message à un maximum de %{recipients_limit} destinataires."
   pm_reached_recipients_limit: "Désolé, vous ne pouvez pas avoir plus de %{recipients_limit} destinataires dans un message direct."
-  removed_direct_reply_full_quotes: "La citation de l'entier du message précédent a été supprimé automatiquement."
-  secure_upload_not_allowed_in_public_topic: "Désolé, les envois sécurisés suivants ne peuvent pas être utilisés dans un sujet public : %{upload_filenames}."
+  removed_direct_reply_full_quotes: "La citation complète du message précédent a été supprimée automatiquement."
+  secure_upload_not_allowed_in_public_topic: "Désolé, les envois sécurisés suivants ne peuvent pas être utilisés dans un sujet public : %{upload_filenames}."
+  create_pm_on_existing_topic: "Désolé, vous ne pouvez pas créer un message direct sur un sujet existant."
   just_posted_that: "est trop similaire à ce que vous avez récemment posté"
   invalid_characters: "contient des caractères invalides"
   is_invalid: "ne semble pas clair, est-ce une phrase complète ?"
@@ -297,9 +298,9 @@ fr:
   prev_page: "← page précédente"
   page_num: "Page %{num}"
   home_title: "Accueil"
-  topics_in_category: "Sujets dans la catégorie « %{category} »"
-  rss_posts_in_topic: "Flux RSS de « %{topic} »"
-  rss_topics_in_category: "Flux RSS des sujets dans la catégorie « %{category} »"
+  topics_in_category: "Sujets dans la catégorie « %{category} »"
+  rss_posts_in_topic: "Flux RSS de « %{topic} »"
+  rss_topics_in_category: "Flux RSS des sujets dans la catégorie « %{category} »"
   rss_num_posts:
     one: "%{count} message"
     other: "%{count} messages"
@@ -321,42 +322,43 @@ fr:
     private_posts: "Derniers messages directs"
     group_posts: "Derniers messages de %{group_name}"
     group_mentions: "Dernières mentions de %{group_name}"
-    user_posts: "Derniers messages par @%{username}"
-    user_topics: "Derniers sujets par @%{username}"
+    user_posts: "Derniers messages de @%{username}"
+    user_topics: "Derniers sujets de @%{username}"
     tag: "Sujets étiquettés"
     badge: "%{display_name} badge sur %{site_title}"
   too_late_to_edit: "Ce message a été créé il y a trop longtemps. Il ne peut plus être modifié ou supprimé."
-  edit_conflict: "Ce message a été modifié par une autre utilisateur, vos modifications ne peuvent plus être sauvegardées."
+  edit_conflict: "Ce message a été modifié par un autre utilisateur et vos modifications ne peuvent plus être sauvegardées."
   revert_version_same: "La version actuelle est la même que la version vers laquelle vous essayez de revenir."
   excerpt_image: "image"
   bookmarks:
     errors:
       already_bookmarked_post: "Il n'est pas possible de mettre plus d'un signet sur un même message."
       cannot_set_past_reminder: "Vous ne pouvez pas définir un rappel de signet à une date passée."
+      cannot_set_reminder_in_distant_future: "Vous nous pouvez pas définir un rappel de signet plus de 10 ans dans le futur."
       time_must_be_provided: "l'heure doit être réglée pour tous les rappels"
     reminders:
-      at_desktop: "La prochaine fois je suis à mon bureau"
+      at_desktop: "La prochaine fois que je suis à mon bureau"
       later_today: "Plus tard aujourd'hui"
       next_business_day: "Prochain jour ouvré"
       tomorrow: "Demain"
       next_week: "Semaine prochaine"
-      next_month: "Mois prochai"
-      custom: "Date et heure personnalisés"
+      next_month: "Mois prochain"
+      custom: "Date et heure personnalisées"
   groups:
     success:
       bulk_add:
-        one: "%{count}utilisateur a été ajouté au groupe."
-        other: "%{count}utilisateurs ont été ajoutés au groupe."
+        one: "%{count} utilisateur a été ajouté au groupe."
+        other: "%{count} utilisateurs ont été ajoutés au groupe."
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' n'est pas un niveau de confiance valide."
       can_not_modify_automatic: "Vous ne pouvez pas modifier un groupe automatique"
       member_already_exist:
         one: "'%{username}' est déjà membre de ce groupe."
         other: "Les utilisateurs suivants sont déjà membres de ce groupe : %{username}"
-      invalid_domain: "'%{domain}' n'est pas un domaine valide."
-      invalid_incoming_email: "« %{email} » n'est pas une adresse de courriel valide."
-      email_already_used_in_group: "« %{email} » est déjà utilisé par le groupe « %{group_name} »."
-      email_already_used_in_category: "« %{email} » est déjà utilisé par la catégorie « %{category_name} »."
+      invalid_domain: "« %{domain} » n'est pas un domaine valide."
+      invalid_incoming_email: "« %{email} » n'est pas une adresse courriel valide."
+      email_already_used_in_group: "« %{email} » est déjà utilisé par le groupe « %{group_name} »."
+      email_already_used_in_category: "« %{email} » est déjà utilisé par la catégorie « %{category_name} »."
       cant_allow_membership_requests: "Vous ne pouvez pas autoriser les requêtes d'adhésion pour un groupe sans propriétaires."
       already_requested_membership: "Vous avez déjà demandé à adhérer à ce groupe."
     default_names:
@@ -371,7 +373,11 @@ fr:
       trust_level_4: "niveau_confiance_4"
     request_membership_pm:
       title: "Demande d'adhésion pour @%{group_name}"
-    view_hidden_topic_request_reason: "J'aimerais rejoindre le groupe '%{group_name}' afin d'accéder à [ce sujet] (%{topic_url})."
+    request_accepted_pm:
+      title: "Vous avez été accepté dans @%{group_name}"
+      body: |
+        Votre demande à rejoindre @%{group_name} a été acceptée et vous êtes désormais un membre.
+    view_hidden_topic_request_reason: "J'aimerais rejoindre le groupe « %{group_name} » afin d'accéder à [ce sujet](%{topic_url})."
   education:
     until_posts:
       one: "%{count} message"
@@ -385,9 +391,9 @@ fr:
 
       - Incluez des mots fréquents dans votre sujet pour que les utilisateurs puissent le *retrouver*. Pour le regrouper avec des sujets liés, sélectionnez une catégorie.
 
-      Pour plus d'info, [jettez un œil sur la charte de la communauté](%{base_path}/guidelines). Ce message apparaîtra uniquement pour vos premiers %{education_posts_text}.
+      Pour plus d'informations, [jetez un œil sur la charte de la communauté](%{base_path}/guidelines). Ce message apparaîtra uniquement pour vos premiers %{education_posts_text}.
     "new-reply": |
-      Bienvenue sur %{site_name} &mdash; **Merci de contribuer !**
+      Bienvenue sur %{site_name} &mdash; **merci de contribuer !**
 
       - Votre réponse améliore-t-elle la discussion ?
 
@@ -395,7 +401,7 @@ fr:
 
       - Les critiques constructives sont les bienvenues, mais critiquez les *idées*, pas les gens.
 
-      Pour plus d'informations, [consulter la charte de la communauté](%{base_path}/guidelines). Cet encart apparaîtra pour votre premier %{education_posts_text}.
+      Pour plus d'informations, [consulter la charte de la communauté](%{base_path}/guidelines). Cet encart apparaîtra pour vos premiers %{education_posts_text}.
     avatar: |
       ### Avez-vous pensé à une photo de profil ?
 
@@ -412,20 +418,26 @@ 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> qui s'affichera.
 
       C'est plus facile de lire des discussions avec des réponses approfondies plutôt que plusieurs réponses individuelles courtes.
+    dominating_topic: |
+      ### Laissez d'autres rejoindre la conversation
+
+      Ce sujet est vraiment important pour vous &ndash; vous avez posté plus de %{percent}% des réponses dans cette discussion.
+
+      Ce serait peut-être encore mieux si vous laissez d'autres personnes partager leur point de vue. Est-ce que vous pourriez les inviter à vous rejoindre ici ?
     get_a_room: |
-      ### Encourager d'autres à s'ajouter à la conversation
+      ### Encourager tout le monde à intervenir dans la discussion
 
       Vous avez répondu %{count} fois à @%{reply_username} dans ce sujet !
 
-      Une bonne discussion impliquer plusieurs avis et points de vue. Est-ce que vous pourriez impliquer quelqu'un d'autre ?
+      Une bonne discussion implique plusieurs avis et points de vue. Est-ce que vous pourriez impliquer quelqu'un d'autre ?
 
-      Et n'oubliez pas, si vous aimeriez prolonger la discussion avec cette personne en particulier, à l'abri du regard général, vous pouvez leur [envoyer une message direct](%{base_path}/u/%{reply_username}).
+      Et n'oubliez pas, si vous souhaitez prolonger la discussion avec cette personne en particulier, à l'abri du regard général, vous pouvez lui [envoyer un message direct](%{base_path}/u/%{reply_username}).
     too_many_replies: |
       ### Vous avez atteint le nombre de réponses maximum dans ce sujet
 
       Nous sommes désolés, les nouveaux membres sont limités temporairement à %{newuser_max_replies_per_topic} réponses dans un même sujet.
 
-      Plutôt que d'ajouter une nouvelle réponse, vous pouvez éditer vos messages précédents ou visiter d'autres sujets.
+      Plutôt que d'ajouter une nouvelle réponse, vous pouvez modifier vos messages précédents ou visiter d'autres sujets.
     reviving_old_topic: |
       ### Relancer ce sujet ?
 
@@ -455,7 +467,7 @@ fr:
               cant_send_pm: "Désolé, vous ne pouvez pas envoyer un message direct à cet utilisateur."
               no_user_selected: "Vous devez choisir un utilisateur valide."
               reply_by_email_disabled: "Réponse par courriel désactivée."
-              target_user_not_found: "Un des utilisateurs à qui vous envoyez ce message n'a pas été retrouvé."
+              target_user_not_found: "Un des utilisateurs à qui vous envoyez ce message n'a pas été trouvé."
               unable_to_update: "Il y a eu une erreur en mettant à jour ce sujet."
             featured_link:
               invalid: "est invalide. L'URL doit inclure http:// ou https://."
@@ -463,7 +475,7 @@ fr:
         user:
           attributes:
             password:
-              common: "fait partie des 10000 mots de passe les plus utilisés. Veuillez utiliser un mot de passe plus sécurisé."
+              common: "fait partie des 10 000 mots de passe les plus utilisés. Veuillez utiliser un mot de passe plus sécurisé."
               same_as_username: "est aussi votre nom d'utilisateur. Veuillez utiliser un mot de passe plus sécurisé."
               same_as_email: "est aussi votre adresse courriel. Veuillez utiliser un mot de passe plus sécurisé."
               same_as_current: "est le même que votre mot de passe actuel."
@@ -478,7 +490,7 @@ fr:
         user_profile:
           attributes:
             featured_topic_id:
-              invalid: "Ce sujet ne peut pas être mis à la une sur votre profil."
+              invalid: "Ce sujet ne peut pas être mis en vedette sur votre profil."
         user_email:
           attributes:
             user_id:
@@ -493,7 +505,7 @@ fr:
         web_hook:
           attributes:
             payload_url:
-              invalid: "L'URL est invalide. Elle devrait inclure http:// ou https:// et aucun espace n'est autorisé."
+              invalid: "L'URL est invalide. Elle devrait inclure http:// ou https:// et aucune espace n'est autorisée."
         custom_emoji:
           attributes:
             name:
@@ -514,7 +526,7 @@ fr:
   vip_category_name: "Salon"
   vip_category_description: "Une catégorie réservée aux membres avec un niveau de confiance 3 et plus."
   meta_category_name: "Retours sur le site"
-  meta_category_description: "Discussions à propos du site, son organisation, son fonctionnement, et comment nous pouvons l'améliorer."
+  meta_category_description: "Discussions à propos du site, son organisation, son fonctionnement et comment nous pouvons l'améliorer."
   staff_category_name: "Responsables"
   staff_category_description: "Catégorie privée pour les discussions de l'équipe du forum. Les sujets ne sont visibles que pour les administrateurs et les modérateurs."
   discourse_welcome_topic:
@@ -523,14 +535,11 @@ fr:
 
       Le premier paragraphe de ce sujet épinglé sera visible comme message de bienvenue à tous les nouveaux visiteurs de votre page d'accueil. Il est important !
 
-      **Modifier le** en une brève description de votre communauté :
-
-      - A qui est-elle destinée ?
+      **Modifier le** en une brève description de votre communauté :
 
+      - À qui est-elle destinée ?
       - Que peuvent-ils y trouver ?
-
       - Pourquoi devraient-ils venir ici ?
-
       - Où peuvent-ils en savoir plus (liens, ressources, etc.) ?
 
       <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
@@ -566,18 +575,18 @@ fr:
     post_template: "%{replace_paragraph}\n\nUtilisez les paragraphes suivants pour une plus longue description ou pour établir des règles :\n\n- À quoi sert cette catégorie ? Pourquoi les utilisateurs choisiraient-ils cette catégorie pour leur discussion ?\n\n- En quoi est-elle différente des autres catégories existantes ?\n\n- Quels sujets devraient figurer dans cette catégorie ?\n\n- Avons-nous besoin de cette catégorie ? Devrions-nous fusionner celle-ci avec une autre catégorie ?\n"
     errors:
       not_found: "Catégorie introuvée !"
-      uncategorized_parent: "La catégorie « Sans catégorie » ne peut pas avoir de parent"
+      uncategorized_parent: "La catégorie « Sans catégorie » ne peut pas avoir de parent"
       self_parent: "Le parent d'une sous-catégorie ne peut pas être elle-même"
       depth: "Vous ne pouvez pas imbriquer une sous-catégorie sous une autre"
-      invalid_email_in: "« %{email} » n'est pas une adresse de courriel valide."
-      email_already_used_in_group: "« %{email} » est déjà utilisé par le groupe « %{group_name} »."
-      email_already_used_in_category: "« %{email} » est déjà utilisé par la catégorie « %{category_name} »."
-      description_incomplete: "Le message de description de la catégorie doit être au moins un paragraphe."
+      invalid_email_in: "« %{email} » n'est pas une adresse courriel valide."
+      email_already_used_in_group: "« %{email} » est déjà utilisé par le groupe « %{group_name} »."
+      email_already_used_in_category: "« %{email} » est déjà utilisé par la catégorie « %{category_name} »."
+      description_incomplete: "Le message de description de la catégorie doit contenir au moins un paragraphe."
       permission_conflict: "Tout groupe autorisé à accéder à une sous-catégorie doit également avoir accès à la catégorie parente. Les groupes suivants ont accès à une des sous-catégories, mais n'ont pas accès à la catégorie parente : %{group_names}."
       disallowed_topic_tags: "Ce sujet contient des étiquettes qui ne sont pas autorisées dans cette catégorie : %{tags}"
       disallowed_tags_generic: "Ce sujet contient des étiquettes interdites."
     cannot_delete:
-      uncategorized: "Cette catégorie est spéciale. Elle sert de zone d'attente pour les sujets qui n'ont pas de catégorie ; elle ne peut pas être supprimée."
+      uncategorized: "Cette catégorie est spéciale. Elle sert à rassembler les sujets qui n'ont pas de catégorie ; elle ne peut pas être supprimée."
       has_subcategories: "Vous ne pouvez pas supprimer cette catégorie car elle a des sous-catégories."
       topic_exists:
         one: "Vous ne pouvez pas supprimer cette catégorie car elle contient %{count} sujet. Le plus vieux sujet est %{topic_link}."
@@ -611,7 +620,7 @@ fr:
       create_topic: "Vous créez des sujets trop rapidement. Veuillez patienter %{time_left} avant de réessayer."
       create_post: "Vous répondez trop rapidement. Veuillez patienter %{time_left} avant de réessayer."
       delete_post: "Vous effacez des messages trop rapidement. Veuillez patienter %{time_left} avant de réessayer."
-      public_group_membership: "Vous rejoignez et/ou quittez des groupes trop souvent. Veuillez patienter %{time_left} avant de réessayer."
+      public_group_membership: "Vous rejoignez ou quittez des groupes trop souvent. Veuillez patienter %{time_left} avant de réessayer."
       topics_per_day: "Vous avez atteint le nombre maximum de nouveaux sujets pour aujourd'hui. Veuillez patienter %{time_left} avant de réessayer."
       pms_per_day: "Vous avez atteint le nombre maximum de nouveaux messages. Veuillez patienter %{time_left} avant de réessayer."
       create_like: "Vous avez atteint le nombre maximum de J'aime. Veuillez patienter %{time_left} avant de réessayer."
@@ -700,7 +709,7 @@ fr:
         one: "il y a presque un an"
         other: "il y a presque %{count} ans"
   password_reset:
-    no_token: "Désolé, le lien pour le changement de mot de passe est trop ancien. Cliquez sur Connexion puis redemandez un mot de passe afin d'obtenir un nouveau lien. "
+    no_token: "Désolé, le lien pour le changement de mot de passe est trop ancien. Cliquez sur le bouton « Se connecter » et utiliser « J'ai oublié mon mot de passe » pour obtenir un nouveau lien."
     choose_new: "Choisir un nouveau mot de passe"
     choose: "Choisir un mot de passe"
     update: "Mettre à jour le mot de passe "
@@ -709,8 +718,8 @@ fr:
     success: "Vous avez modifié votre mot de passe avec succès et vous êtes maintenant connecté."
     success_unapproved: "Vous avez modifié votre mot de passe avec succès."
   email_login:
-    invalid_token: "Désolé, ce lien de connexion courriel est trop vieux. Séléctionner le bouton 'Se connecter' et utiliser 'Mot de passe oublié' pour obtenir un nouveau lien."
-    title: "Connexion courriel"
+    invalid_token: "Désolé, ce lien de connexion par courriel est trop vieux. Cliquez sur le bouton « Se connecter » et utiliser « J'ai oublié mon mot de passe » pour obtenir un nouveau lien."
+    title: "Connexion par courriel"
   user_auth_tokens:
     browser:
       chrome: "Google Chrome"
@@ -734,7 +743,7 @@ fr:
       unknown: "appareil inconnu"
     os:
       android: "Android"
-      chromeos: "ChromeOS"
+      chromeos: "Chrome OS"
       ios: "iOS"
       linux: "Linux"
       macos: "macOS"
@@ -742,7 +751,7 @@ fr:
       unknown: "système d'exploitation inconnu"
   change_email:
     wrong_account_error: "Vous êtes connecté avec le mauvais compte, veuillez vous déconnecter et réessayer."
-    confirmed: "Votre adresse de courriel a été mise à jour."
+    confirmed: "Votre adresse courriel a été mise à jour."
     please_continue: "Continuer vers %{site_name}"
     error: "Il y a eu une erreur lors de la modification de votre adresse courriel. Votre adresse courriel est peut-être déjà utilisée ?"
     error_staged: "Une erreur est survenue lors de la modification de votre adresse courriel. Cette adresse est déjà utilisée par un utilisateur distant."
@@ -750,12 +759,12 @@ fr:
     confirm: "Confirmer"
     authorizing_new:
       title: "Confirmer votre nouvelle adresse courriel"
-      description: "Veuillez confirmer que vous souhaitez changer votre adresse courriel à :"
+      description: "Veuillez confirmer que vous souhaitez changer votre adresse courriel à :"
     authorizing_old:
       title: "Changer votre adresse courriel"
       description: "Veuillez confirmer votre changement d'adresse courriel"
-      old_email: "Adresse courriel précédente : %{email}"
-      new_email: "Nouvelle adresse courriel : %{email}"
+      old_email: "Adresse courriel précédente : %{email}"
+      new_email: "Nouvelle adresse courriel : %{email}"
       almost_done_title: "Confirmer une nouvelle adresse courriel"
       almost_done_description: "Nous avons envoyé un courriel à votre nouvelle adresse pour confirmer le changement !"
   associated_accounts:
@@ -787,10 +796,10 @@ fr:
       long_form: "signalé comme hors-sujet"
     spam:
       title: "Spam"
-      description: "Ce message est une publicité, ou du vandalisme. Il n'est pas utile ou pertinent pour le sujet actuel."
+      description: "Ce message est une publicité ou du vandalisme. Il n'est pas utile ou pertinent pour le sujet actuel."
       short_description: "C'est de la publicité ou du vandalisme"
       long_form: "signalé comme spam"
-      email_title: '« %{title} » a été signalé comme spam'
+      email_title: '« %{title} » a été signalé comme spam'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: "Inapproprié"
@@ -802,14 +811,14 @@ fr:
       description: "J'aimerais parler à cette personne directement et personnellement au sujet de leur message."
       short_description: "J'aimerais parler à cette personne directement et personnellement au sujet de leur message."
       long_form: "utilisateur contacté"
-      email_title: 'Votre message sur « %{title} »'
+      email_title: 'Votre message sur « %{title} »'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Autre chose"
       description: "Ce message demande l'attention des responsables pour une autre raison."
-      short_description: "Nécessite l'attention du staff pour une autre raison"
+      short_description: "Nécessite l'attention des responsables pour une autre raison"
       long_form: "signalé aux responsables"
-      email_title: 'Un message dans « %{title} » nécessite l''attention des responsables'
+      email_title: 'Un message dans « %{title} » nécessite l''attention des responsables'
       email_body: "%{link}\n\n%{message}"
     bookmark:
       title: "Mettre un signet"
@@ -849,8 +858,9 @@ fr:
       invalid_origin_error: "L'origine de la requête d'authentification ne correspond pas à l'origine du serveur."
       malformed_attestation_error: "Une erreur s'est produite pendant le déchiffrage des données d'attestation."
       user_verification_error: "Une vérification de l'utilisateur est requise."
-      unsupported_public_key_algorithm_error: "L'algorithme de clé publique fournie n'est pas supporté par le serveur."
+      unsupported_public_key_algorithm_error: "L'algorithme de clé publique n'est pas supporté par le serveur."
       unsupported_attestation_format_error: "Le format d'attestation n'est pas supporté par le serveur."
+      public_key_error: "La vérification de la clé publique pour l'identifiant a échoué."
       ownership_error: "La clé de sécurité n'appartient pas à l'utilisateur."
       unknown_cose_algorithm_error: "L'algorithme utilisé pour la clé de sécurité n'est pas reconnu."
   topic_flag_types:
@@ -866,10 +876,10 @@ fr:
       short_description: 'Une transgression de <a href="%{base_path}/guidelines">notre charte communautaire</a>'
     notify_moderators:
       title: "Autre chose"
-      description: 'Ce sujet demande l''attention des responsables d''après la <a href="%{base_path}/guidelines">charte de la communauté</a>, <a href="%{tos_url}">les conditions générales de service</a> ou pour une autre raison.'
+      description: 'Ce sujet demande l''attention des responsables d''après la <a href="%{base_path}/guidelines">charte de la communauté</a>, <a href="%{tos_url}">les conditions d''utilisation</a> ou pour une autre raison.'
       long_form: "signalé pour modération"
-      short_description: "Nécessite l'attention du staff pour une autre raison"
-      email_title: 'Le sujet « %{title} » nécessite l''attention d''un modérateur'
+      short_description: "Nécessite l'attention des responsables pour une autre raison"
+      email_title: 'Le sujet « %{title} » nécessite l''attention d''un modérateur'
       email_body: "%{link}\n\n%{message}"
   flagging:
     you_must_edit: '<p>Votre message a été signalé par la communauté. Veuillez <a href="%{path}">consulter vos messages privés</a>.</p>'
@@ -889,6 +899,8 @@ fr:
     description: "les préférences de courriel pour <b>%{email}</b> ont été mises à jour. Pour modifier vos paramètres de messagerie, <a href='%{url}'>consultez vos préférences utilisateur</a>."
     topic_description: "Pour vous ré-abonner à %{link}, utilisez le contrôle des notifications en bas ou à droite du sujet."
     private_topic_description: "Pour vous ré-abonner, utilisez le contrôle des notifications en bas ou à droite du sujet."
+  uploads:
+    marked_insecure_from_theme_component_reason: "fichier utilisé dans un composant de thème"
   unsubscribe:
     title: "Se désabonner"
     stop_watching_topic: "Arrêter de surveiller ce sujet, %{link}"
@@ -1090,7 +1102,7 @@ fr:
         term: Terme
         searches: Recherches
         click_through: CTR
-      description: "Les critères de recherche les plus tendances avec leurs taux de suivi."
+      description: "Les critères de recherche les plus tendances avec leur taux de clics."
     emails:
       title: "Courriels envoyés"
       xaxis: "Jour"
@@ -1137,7 +1149,7 @@ fr:
         num_topics: "Sujets"
       description: "Utilisateurs par ordre du nombre de clics sur des liens qu'ils ont partagés."
     top_traffic_sources:
-      title: "Meilleures sources de traffic"
+      title: "Meilleures sources de trafic"
       xaxis: "Domaine"
       num_clicks: "Clics"
       num_topics: "Sujets"
@@ -1177,12 +1189,12 @@ fr:
       title: "Nombre de vues par les utilisateurs connectés"
       xaxis: "Jour"
       yaxis: "Nombre de vues par les utilisateurs connectés sur mobile"
-      description: "Nombre de nouvelles vues de pages par des utilisateurs connectés, et sur des appareils mobiles."
+      description: "Nombre de nouvelles vues de pages par des utilisateurs connectés depuis des appareils mobiles."
     page_view_anon_mobile_reqs:
       title: "Nombre de vues par les utilisateurs non connectés"
       xaxis: "Jour"
       yaxis: "Nombre de vues par les utilisateurs non connectés sur mobile"
-      description: "Nombre de nouvelles vues de pages par des utilisateurs anonymes, et sur des appareils mobiles."
+      description: "Nombre de nouvelles vues de pages par des utilisateurs anonymes depuis des appareils mobiles."
     http_background_reqs:
       title: "Arrière-plan"
       xaxis: "Jour"
@@ -1260,7 +1272,7 @@ fr:
         ignored_user: Utilisateur ignoré
         ignores_count: Ignorés
         mutes_count: Muets
-      description: "Les utilisateurs qui ont été mis sous silence et / ou ignorés par de nombreux autres utilisateurs."
+      description: "Les utilisateurs qui ont été mis sous silence ou ignorés par de nombreux autres utilisateurs."
   dashboard:
     rails_env_warning: "Votre serveur fonctionne dans l'environnement de %{env}."
     host_names_warning: "Votre fichier config/database.yml utilise le nom d'hôte par défaut. Veuillez renseigner votre nom d'hôte."
@@ -1273,7 +1285,7 @@ fr:
     github_config_warning: 'Le serveur est configuré pour permettre l''authentification par GitHub (enable_github_logins), mais les paramètres github_client_id et github_client_secret ne sont pas renseignés. Allez dans les <a href="%{base_path}/admin/site_settings">Paramètres</a> et mettez les à jour. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Voir le guide pour en savoir plus</a>.'
     s3_config_warning: 'Le serveur est configuré pour envoyer les sauvegardes sur S3, mais l''un des paramètres suivants n''est pas renseigné : s3_access_key_id, s3_secret_access_key ou s3_backup_bucket. Allez dans les <a href="%{base_path}/admin/site_settings">Paramètres</a> et mettez les à jour. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Voir « Comment mettre en place une sauvegarde sur S3 ? » pour en savoir plus</a>.'
     s3_backup_config_warning: 'Le serveur est configuré pour envoyer les sauvegardes sur S3, mais l''un des paramètres suivants n''est pas renseigné : s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, or s3_backup_bucket. Allez dans les <a href="%{base_path}/admin/site_settings">Paramètres</a> et mettez les à jour. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Voir « Comment mettre en place une sauvegarde sur S3 ? » pour en savoir plus</a>.'
-    image_magick_warning: 'Le serveur est configuré pour créer des aperçus des grandes images, mais ImageMagick n''est pas installé. Installez ImageMagick en utilisant votre gestionnaire de paquets favori ou bien allez ici <a href="https://www.imagemagick.org/script/download.php" target="_blank">pour télécharger la dernière version</a>.'
+    image_magick_warning: 'Le serveur est configuré pour créer des aperçus des grandes images, mais ImageMagick n''est pas installé. Installez ImageMagick en utilisant votre gestionnaire de paquets favori ou <a href="https://www.imagemagick.org/script/download.php" target="_blank">téléchargez directement la dernière version</a>.'
     failing_emails_warning: 'Il y a %{num_failed_jobs} tâches d''envois de courriel en erreur. Vérifiez votre fichier app.yml et assurez-vous de la conformité des paramètres du serveur de courriel. <a href="%{base_path}/sidekiq/retries" target="_blank">Voir aussi les processus en échec dans Sidekiq</a>.'
     subfolder_ends_in_slash: "Votre configuration de sous-répertoire est erronée ; DISCOURSE_RELATIVE_URL_ROOT se termine avec une barre oblique ."
     email_polling_errored_recently:
@@ -1281,6 +1293,7 @@ fr:
       other: "La vérification des courriels a généré %{count} erreurs au cours des 24 dernières heures. Vérifiez <a href='%{base_path}/logs' target='_blank'>le journal</a> pour plus de détails."
     missing_mailgun_api_key: "Le serveur est configuré pour envoyer des courriels via Mailgun mais vous n'avez pas fourni la clef API nécessaire pour vérifier les messages webhook."
     bad_favicon_url: "Impossible de charger la favicon. Vérifiez le paramètre favicon dans les <a href='%{base_path}/admin/site_settings'>paramètres du site</a>"
+    update_mail_receiver: "Nous avons détecté une version obsolète de mail-receiver. Cliquez <a href='https://meta.discourse.org/t/-/133491'>ici</a> pour des consignes de mise à jour. Après la mise à jour, ce message peut mettre jusqu'à 24 heures pour disparaître."
     poll_pop3_timeout: "La connexion vers le serveur POP3 a expiré. Les courriels entrants n'ont pas pu être téléchargés. Veuillez vérifier <a href='%{base_path}/admin/site_settings/category/email'>les paramètres POP3</a> et votre fournisseur de service courriel."
     poll_pop3_auth_error: "La connexion vers le serveur POP3 échoue avec une erreur d'authentification. Veuillez vérifier <a href='%{base_path}/admin/site_settings/category/email'>les paramètres POP3</a>."
     force_https_warning: "Votre site web utiliser le SSL. Mais `<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` n'est pas encore activé dans les paramètres du site."
@@ -1324,24 +1337,23 @@ fr:
     title: "Le nom du site, utilisé dans la balise title."
     site_description: "Décrivez ce site en une seule phrase, utilisée dans la balise meta description."
     short_site_description: "Description courte, utilisée dans la balise title de la page d'accueil."
-    contact_email: "Adresse de courriel de la personne responsable de ce site. Elle est utilisée pour des notifications critiques et des faits urgents en provenance du formulaire de contact de la page <a href='%{base_path}/about' target='_blank'>À propos</a>."
-    contact_url: "Adresse de courriel de ce site. Elle est utilisée pour des faits urgents en provenance du formulaire de contact de la page <a href='%{base_path}/about' target='_blank'>À propos</a>."
+    contact_email: "Adresse courriel de la personne responsable de ce site. Elle est utilisée pour des notifications critiques et des faits urgents en provenance du formulaire de contact de la page <a href='%{base_path}/about' target='_blank'>À propos</a>."
+    contact_url: "Adresse courriel de ce site. Elle est utilisée pour des faits urgents en provenance du formulaire de contact de la page <a href='%{base_path}/about' target='_blank'>À propos</a>."
     crawl_images: "Récupérer les images provenant de sources tierces pour y insérer les dimensions correctes (hauteur et largeur)."
     download_remote_images_to_local: "Transformer les images distantes en images locales en les téléchargeant ; cela permet d'éviter les liens morts."
     download_remote_images_threshold: "Quantité minimum d'espace disque requise pour télécharger localement des images distantes (en pourcentage)"
-    download_remote_images_max_days_old: "Ne pas télécharger les images distantes pour les messages plus anciens que n jours."
     disabled_image_download_domains: "Les images distantes de ces domaines ne seront jamais téléchargées. Liste délimitée par des pipes (|)."
     editing_grace_period: "Pendant (n) secondes après la publication d'un message, la modification de ce dernier ne provoquera pas d'historisation."
     editing_grace_period_max_diff: "Nombre maximum de changements de caractères autorisés dans le délai de grâce d'édition, si plus de changements, enregistrez une autre révision de poste (niveaux de confiance 0 et 1)."
     editing_grace_period_max_diff_high_trust: "Nombre maximum de changements de caractères autorisés dans le délai de grâce d'édition, si plus de changements, enregistrez une autre révision de poste (niveaux de confiance 2 et plus)."
-    staff_edit_locks_post: "Les messages seront vérouillés à la modification si modifiés par des responsables"
+    staff_edit_locks_post: "Les messages seront verrouillés à la modification si modifiés par des responsables"
     post_edit_time_limit: "Un auteur du niveau de confiance 0 ou 1 peut modifier ses messages pendant (n) minutes après leur publication. Mettre à 0 pour retirer cette limite."
     tl2_post_edit_time_limit: "Un auteur de niveau de confiance 2 ou supérieur peut modifier ses messages pendant (n) minutes après leur publication. Mettre à 0 pour retirer cette limite."
     edit_history_visible_to_public: "Autoriser tout le monde à voir les versions précédentes d'un message modifié. Quand désactivé, seuls les responsables peuvent voir l'historique."
     delete_removed_posts_after: "Les messages retirés par leur auteur seront automatiquement supprimés après (n) heures. Pour une valeur renseignée à 0, les messages seront supprimés immédiatement."
     max_image_width: "Largeur maximale des images dans un message"
     max_image_height: "Hauteur maximale autorisée des images dans un message"
-    responsive_post_image_sizes: "Adapter la taille des visualisations lightbox aux écrans DPI avec les ratios suivants. Retirer toutes les valeurs pour désactiver l'adaptation dynamique des images."
+    responsive_post_image_sizes: "Adapter la taille des visualisations d'images aux écrans à haut DPI avec les ratios suivants. Retirez toutes les valeurs pour désactiver l'adaptation dynamique des images."
     fixed_category_positions: "Si coché, vous pourrez modifier l'ordre des catégories. Si décoché, elle seront triées par ordre d'activité."
     fixed_category_positions_on_create: "Si coché, le classement des catégories sera maintenu dans la fenêtre de création de sujet (nécessite fixed_category_positions)."
     add_rel_nofollow_to_user_content: 'Ajouter rel nofollow à tous les contenus des utilisateurs, sauf les liens internes (incluant les domaines parents). Si vous modifiez ceci, vous devez exécuter la commande "rake posts:rebake"'
@@ -1352,7 +1364,7 @@ fr:
     show_pinned_excerpt_desktop: "Afficher les extraits des sujets épinglés en vue bureau."
     post_onebox_maxlength: "Longueur maximale d'un message emboîté en nombre de caractères."
     onebox_domains_blacklist: "Une liste de domaines que ne seront jamais transformés en Onebox."
-    inline_onebox_domains_whitelist: "Une liste de domaines qui seront transformé en Onebox s'ils ont été liés sans titre"
+    inline_onebox_domains_whitelist: "Une liste de domaines qui seront transformés en Onebox s'ils ont été insérés sans titre"
     enable_inline_onebox_on_all_domains: "Ignorer le paramètre inline_onebox_domain_whitelist et permettre des onebox 'inline' pour tous les domaines."
     max_oneboxes_per_post: "Nombre maximum de Onebox dans un message."
     logo: "L'image de votre logo située en haut à gauche de votre site. Utilisez une forme rectangulaire large avec une hauteur de 120 et une largeur de plus que 360. Si vous laissez ce champ vide, le nom de votre site apparaîtra."
@@ -1365,16 +1377,16 @@ fr:
     apple_touch_icon: "Icône utilisée pour les appareils Apple touch. Elle sera automatiquement redimensionnée en 180x180. Si vous laissez ce champ vide, large_icon sera utilisée."
     opengraph_image: "Image opengraph par défaut, utilisée lorsque la page n'a pas d'autre image appropriée. Si vous laissez ce champ vide, large_icon sera utilisée"
     twitter_summary_large_image: "Carte Twitter « Summary Card with Large Image » (doit être au moins 280 en largeur et au moins 150 en hauteur). Si vous laissez ce champ vide, les métadonnées standards de carte sont générées à l'aide de opengraph_image."
-    notification_email: "L'adresse de courriel utilisée pour envoyer les courriels systèmes essentiels et affichée dans le champs « De ». Le nom de domaine spécifié doit avoir les informations SPF, DKIM et PTR inversé renseignées correctement pour que le courriel arrive à destination."
+    notification_email: "L'adresse courriel utilisée pour envoyer les courriels systèmes essentiels et affichée dans le champs « De ». Le nom de domaine spécifié doit avoir les informations SPF, DKIM et PTR inversé renseignées correctement pour que le courriel arrive à destination."
     email_custom_headers: "Une liste délimité par des pipes (|) d'entêtes de courriel"
     email_subject: "Format du sujet personnalisable pour les courriels standards. Voir <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>"
     enforce_second_factor: "Forcer les utilisateurs à activer l'authentification à double facteur. Sélectionner « tous » pour l'appliquer à tous les utilisateurs. Sélectionner « responsables » pour l'imposer 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 via réseaux sociaux ainsi que tous les logos / dépendances tiers sont tous compatibles HTTPS eux aussi ?"
     same_site_cookies: "Utiliser des cookies de même site, qui éliminent tous les vecteurs de Cross Site Request Forgery sur les navigateurs supportés (Lax ou Strict). Avertissement : Strict ne fonctionnera que sur des sites qui imposent la connexion et utilisent le SSO."
-    summary_score_threshold: "Le score minimum requis pour qu'un message soit inclus dans le 'Résumé de ce sujet'"
-    summary_percent_filter: "Quand un utilisateur clique sur « Résumer ce sujet », montrer le top % des messages"
-    summary_max_results: "Nombre maximum de messages retournés par « Résumer ce sujet »"
-    enable_personal_messages: "Autoriser les utilisateurs de niveau de confiance 1 à créer des messages et à répondre (configurable via le niveau de confiance minimum pour envoyer des messages). Notez que les responsables peuvent toujours envoyer des messages."
+    summary_score_threshold: "Le score minimum pour qu'un message soit inclus dans le résultat de « Résumer ce sujet »"
+    summary_percent_filter: "Quand un utilisateur clique sur « Résumer ce sujet », montrer le top % des messages"
+    summary_max_results: "Nombre maximum de messages retournés par « Résumer ce sujet »"
+    enable_personal_messages: "Autoriser les utilisateurs de niveau de confiance 1 à créer des messages directs et à y répondre (configurable via le niveau de confiance minimum pour envoyer des messages directs). Notez que les responsables peuvent toujours envoyer des messages directs."
     enable_system_message_replies: "Permettre aux utilisateurs de répondre aux messages système, même si les messages directs sont désactivés."
     enable_long_polling: "Utiliser les requêtes longues pour le flux de notifications."
     long_polling_base_url: "Racine de l'URL utilisée pour les requêtes longues (dans le cas de l'utilisation d'un CDN pour fournir du contenu dynamique, pensez à le configurer en mode \"origin pull\") par exemple : http://origin.site.com"
@@ -1403,6 +1415,8 @@ fr:
     markdown_typographer_quotation_marks: "Liste des paires de remplacement des guillemets doubles et simples"
     post_undo_action_window_mins: "Nombre de minutes pendant lesquelles un utilisateur peut annuler une action sur un message (J'aime, signaler, etc.)"
     must_approve_users: "L'équipe du forum doit approuver tous les nouveaux utilisateurs avant qu'il aient accès au site."
+    invite_code: "Les utilisateurs doivent entrer ce code pour pouvoir créer un compte (cela est ignoré si le champ est laissé vide, insensible à la casse)"
+    approve_suspect_users: "Ajouter les utilisateurs suspects à la file de vérification. Les utilisateurs suspects ont renseigné une biographie ou un site web sur leur profil mais n'ont pas parcouru le forum."
     pending_users_reminder_delay: "Avertir les modérateurs si des nouveaux utilisateurs sont en attente d'approbation depuis x heures. Mettre -1 pour désactiver les notifications."
     maximum_session_age: "L'utilisateur restera connecté pour n heures après la dernière visite"
     ga_universal_tracking_code: "Code de suivi Google Universal Analytics (analytics.js), par exemple : UA-12345678-9; voir <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -1412,12 +1426,12 @@ fr:
     enable_escaped_fragments: "Utiliser l'API Ajax-Crawling de Google si aucun robot n'est détecté. Voir <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_create_categories: "Autoriser les modérateurs à créer de nouvelles catégories"
     cors_origins: "Requêtes cross-origin (CORS) autorisées. Chaque origine doit inclure http:// ou https://. la variable d'environnement DISCOURSE_ENABLE_CORS doit être renseignée à true pour activer CORS."
-    use_admin_ip_whitelist: "Les administrateurs ne peuvent se connecter que s'ils sont à une adresse IP définie dans la liste des IP sous surveillance (Admin > Journaux > IP surveillés)."
-    blacklist_ip_blocks: "Une liste de blocs IP privés qui ne doivent jamais être crawlés par Discourse"
-    whitelist_internal_hosts: "Une liste de domaines internes que Discourse peut crawler en sécurité pour les Onebox et autres"
+    use_admin_ip_whitelist: "Les administrateurs ne peuvent se connecter que s'ils sont à une adresse IP définie dans la liste des IP sous surveillance (Administration > Journaux > IP sous surveillance)."
+    blacklist_ip_blocks: "Une liste de blocs IP privés qui ne doivent jamais être indexés par Discourse"
+    whitelist_internal_hosts: "Une liste de domaines internes que Discourse peut indexer en sécurité pour les Onebox et autres"
     allowed_iframes: "Une liste des préfixes du domaine src iframe que Discourse peut autoriser en toute sécurité dans les messages"
     whitelisted_crawler_user_agents: "Les agents utilisateurs des robots d'indexation qui devraient être autorisés à accéder au site. ATTENTION ! CE PARAMÈTRE BLOQUERA TOUS LES ROBOTS D'INDEXATION NON LISTÉS ICI !"
-    blacklisted_crawler_user_agents: "Mot unique insensible à la casse dans la chaîne de caractères de l'agent utilisateur identifiant les robots d'exploration Web qui ne devraient pas être autorisés à accéder au site. Ne s'applique pas si une whitelist est définie."
+    blacklisted_crawler_user_agents: "Mot unique insensible à la casse dans la chaîne de caractères de l'agent utilisateur identifiant les robots d'exploration web qui ne devraient pas être autorisés à accéder au site. Ne s'applique pas si une whitelist est définie."
     slow_down_crawler_user_agents: "Agents utilisateurs des robots d'indexation qui devraient être limités dans robots.txt avec la commande Crawl-delay"
     slow_down_crawler_rate: "Si slow_down_crawler_user_agents est défini, ce taux s'appliquera à tous les robots d'indexation (nombre de secondes d'attente entre requêtes)"
     content_security_policy: "Activer Content-Security-Policy"
@@ -1433,36 +1447,36 @@ fr:
     send_welcome_message: "Envoyer à tous les nouveaux utilisateurs un message de bienvenue avec un guide de démarrage rapide."
     send_tl1_welcome_message: "Envoyer à tous les utilisateurs de niveau de confiance 1 un message de bienvenue."
     suppress_reply_directly_below: "Ne pas afficher le panneau extensible des réponses d'un message quand la seule réponse est juste en dessous ce dernier."
-    suppress_reply_directly_above: "Ne pas afficher « en réponse à » sur un message quand la seule réponse est juste en dessus de ce dernier."
-    remove_full_quote: "Supprimer automatiquement la citation dans les réponses directes."
-    suppress_reply_when_quoting: "Ne pas afficher « en réponse à » sur un message qui répond avec une citation."
-    max_reply_history: "Nombre maximum de réponses à développer en déroulant « en réponse à »"
+    suppress_reply_directly_above: "Ne pas afficher « en réponse à » sur un message quand il n'y a qu'une réponse au dessus de ce message."
+    remove_full_quote: "Supprimer automatiquement les citation de message complet dans les réponses directes."
+    suppress_reply_when_quoting: "Ne pas afficher « en réponse à » sur un message qui répond avec une citation."
+    max_reply_history: "Nombre maximum de réponses à développer en déroulant « en réponse à »"
     topics_per_period_in_top_summary: "Nombre de meilleurs sujets affichés dans le résumé par défaut des meilleurs sujets."
-    topics_per_period_in_top_page: "Nombre de meilleurs sujets affichés lorsqu'on sélectionne « Voir plus » des meilleurs sujets."
+    topics_per_period_in_top_page: "Nombre de meilleurs sujets affichés lorsqu'on sélectionne « Voir plus » des meilleurs sujets."
     redirect_users_to_top_page: "Rediriger automatiquement les nouveaux utilisateurs et les longues absences sur la page Top."
     top_page_default_timeframe: "Période par défaut pour la page la plus vue."
-    moderators_view_emails: "Permettre aux modérateurs de voir les adresses courriels des utilisateurs"
+    moderators_view_emails: "Permettre aux modérateurs de voir les adresses courriel des utilisateurs"
     prioritize_username_in_ux: "Afficher le nom d'utilisateur en premier sur la page d'un utilisateur, sa carte et ses messages (si désactivé, le nom complet est affiché en premier)"
-    enable_rich_text_paste: "Permettre la conversion automatique de HTML en Markdown lors que du texte est collé dans l'éditeur. (Expérimental)"
+    enable_rich_text_paste: "Permettre la conversion automatique du HTML en Markdown lorsque du texte est collé dans l'éditeur. (Expérimental)"
     email_token_valid_hours: "Les jetons (tokens) de Mot de passe oublié / Activation de comptes sont valides (n) jours."
     enable_badges: "Activer le système de badges"
     enable_whispers: "Autoriser les communications privées entre responsables au sein d'un sujet."
-    allow_index_in_robots_txt: "Spécifiez dans le fichier robots.txt que ce site peut être indexé par les moteurs de recherche Web. Dans des cas exceptionnels, vous pouvez remplacer définitivement le fichier <a href='%{base_path}/admin/customize/robots'>robots.txt</a>."
+    allow_index_in_robots_txt: "Spécifiez dans le fichier robots.txt que ce site peut être indexé par les moteurs de recherche web. Dans des cas exceptionnels, vous pouvez remplacer définitivement le fichier <a href='%{base_path}/admin/customize/robots'>robots.txt</a>."
     email_domains_blacklist: "Liste des domaines de courriel qui ne sont pas autorisés lors de la création de compte, délimitée par des pipes. Exemple : mailinator.com|trashmail.net"
-    email_domains_whitelist: "Liste des domaines de courriel avec lesquelles les utilisateurs DOIVENT s'enregistrer, délimités par un pipe. ATTENTION : les utilisateurs ayant une adresse de courriel sur un autre domaine ne pourront pas s'enregistrer !"
+    email_domains_whitelist: "Liste des domaines de courriel avec lesquelles les utilisateurs DOIVENT s'enregistrer, délimités par un pipe. ATTENTION : les utilisateurs ayant une adresse courriel sur un autre domaine ne pourront pas s'enregistrer !"
     auto_approve_email_domains: "Les utilisateurs dont le domaine de l'adresse courriel appartient à cette liste seront automatiquement approuvés."
     hide_email_address_taken: "Ne pas informer les utilisateurs qu'un compte existe avec un courriel donné lors de l'inscription ou à partir du formulaire d'oubli du mot de passe."
     log_out_strict: "Lors de la déconnexion, déconnecter TOUTES les sessions de l'utilisateur sur tous les appareils"
-    version_checks: "Ping les serveurs de Discourse afin d'obtenir les mises à jours et affiche les nouveaux messages d'information dans le tableau de bord <a href='%{base_path}/admin' target='_blank'>/admin</a>"
+    version_checks: "Vérifier périodiquement les serveurs Discourse pour obtenir des informations  de mises à jour et les afficher sur le tableau de bord <a href='%{base_path}/admin' target='_blank'>/admin</a>"
     new_version_emails: "Envoyer un courriel à contact_email quand une nouvelle version de Discourse est disponible."
     invite_expiry_days: "Combien de temps (en jours) les clés d'invitation sont-elles valides"
     invite_only: "Tous les nouveaux utilisateurs doivent être explicitement invités par des utilisateurs de confiance ou des responsables. L'inscription publique est désactivée."
     login_required: "Exiger l'authentification pour lire le contenu du site et interdire l'accès anonyme."
-    min_username_length: "Longueur minimale du nom d'utilisateur en caractères. ATTENTION : si des utilisateurs ou groupes existants ont des noms plus courts que celui-ci, votre site se cassera !"
-    max_username_length: "Longueur maximale du nom d'utilisateur en caractères. ATTENTION : si des utilisateurs ou groupes existants ont des noms plus longs que celui-ci, votre site se cassera !"
+    min_username_length: "Longueur minimale du nom d'utilisateur en caractères. ATTENTION : si des utilisateurs ou groupes existants ont des noms plus courts que cette valeur, votre site risque de ne plus fonctionner correctement !"
+    max_username_length: "Longueur maximale du nom d'utilisateur en caractères. ATTENTION : si des utilisateurs ou groupes existants ont des noms plus longs que cette valeur, votre site risque de ne plus fonctionner correctement !"
     unicode_usernames: "Autorisez les noms d'utilisateur et noms de groupes à contenir des lettres et des chiffres Unicode."
     unicode_username_character_whitelist: "Expression régulière pour autoriser uniquement certains caractères Unicode dans les noms d'utilisateur. Les lettres et les chiffres ASCII seront toujours autorisés et n'ont pas besoin d'être inclus dans la liste blanche."
-    reserved_usernames: "Noms d'utilisateurs pour lesquels l'inscription n'est pas autorisée. Le symbole « * » peut être utilisé pour représenter n'importe quel caractère 0 ou plusieurs fois."
+    reserved_usernames: "Noms d'utilisateurs pour lesquels l'inscription n'est pas autorisée. Le symbole « * » peut être utilisé pour représenter n'importe quel caractère 0 ou plusieurs fois."
     min_password_length: "Longueur minimale du mot de passe."
     min_admin_password_length: "Longueur minimale du mot de passe pour l'administrateur."
     password_unique_characters: "Nombre minimum de caractères uniques qu'un mot de passe doit avoir."
@@ -1510,8 +1524,8 @@ fr:
     discord_client_id: 'Identifiant de l''utilisateur Discord (en cas de besoin, le créer via <a href="https://discordapp.com/developers/applications/me">le portail de développement Discord</a>)'
     discord_secret: "Clé secrète Discord"
     discord_trusted_guilds: ' Seuls les membres de ces guildes Discord peuvent se connecter via Discord. Utiliser les identifiants numériques des guildes. Pour plus d''informations, suivre les instructions<a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">ici</a>. Laisser blanc pour autoriser toutes les guildes.'
-    enable_backups: "Autoriser les administrateurs à créer de nouveaux sauvegardes du forum"
-    allow_restore: "Autoriser la restauration, qui peut remplacer TOUTES les données du site ! Laissez à faux, sauf si vous envisagez de faire restaurer une sauvegarde"
+    enable_backups: "Autoriser les administrateurs à créer des sauvegardes du forum"
+    allow_restore: "Autoriser la restauration, qui peut remplacer TOUTES les données du site ! Laissez à faux sauf si vous envisagez de restaurer une sauvegarde"
     maximum_backups: "Nombre maximum de sauvegardes à conserver sur le disque. Les anciennes sauvegardes seront automatiquement supprimées"
     automatic_backups_enabled: "Activer les sauvegardes automatiques tels que définis dans les fréquences de sauvegarde"
     backup_frequency: "Nombre de jours entre chaque sauvegarde"
@@ -1525,7 +1539,7 @@ fr:
     backup_location: "Lieu de stockage des sauvegardes. IMPORTANT : S3 nécessite des identifiants valides dans les paramètres de fichiers."
     backup_gzip_compression_level_for_uploads: "Niveau de compression gzip utilisé pour compresser les envois."
     include_thumbnails_in_backups: "Inclure les vignettes générées dans les sauvegardes. Si vous désactivez cette option, les sauvegardes seront plus petites mais leur restauration nécessitera de régénérer tous les messages."
-    active_user_rate_limit_secs: "À quelle fréquence mettre à jour le champ « last_seen_at », en secondes."
+    active_user_rate_limit_secs: "À quelle fréquence mettre à jour le champ « last_seen_at », en secondes."
     verbose_localization: "Afficher des informations supplémentaires sur l'interface des textes à traduire."
     previous_visit_timeout_hours: "Combien d'heures pour qu'une visite soit considérée comme la visite « précédente »."
     top_topics_formula_log_views_multiplier: "formule pour la valeur de multiplicateur de vues de journal (n) dans les sujets tendance : `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
@@ -1553,15 +1567,15 @@ fr:
     alert_admins_if_errors_per_hour: "Nombre d'erreurs par heure nécessaires pour déclencher une alerte administrateur. Une valeur de 0 désactive cette fonctionnalité. N. B. : nécessite un redémarrage."
     categories_topics: "Nombre de sujets à afficher dans la page /categories. Si configuré à 0, une valeur automatique sera appliquée pour que les colonnes des catégories et des sujets soient symétriques."
     suggested_topics: "Nombre de sujets suggérés affichés en bas d'un sujet."
-    limit_suggested_to_category: "Afficher uniquement les sujets de la catégorie courante dans les sujets similaires."
+    limit_suggested_to_category: "Afficher uniquement les sujets de la catégorie actuelle dans les sujets similaires."
     suggested_topics_max_days_old: "Les sujets suggérés ne devraient pas être plus anciens que n jours."
     suggested_topics_unread_max_days_old: "Les sujets non lus suggérés ne doivent pas être âgés de plus de n jours."
-    clean_up_uploads: "Retirer les fichiers téléchargés orphelins pour prévenir les hébergements illégaux. ATTENTION : vous devriez faire une sauvegarde de votre répertoire /uploads avant d'activer ce paramètre."
+    clean_up_uploads: "Supprimer les fichiers envoyés orphelins pour prévenir les hébergements illégaux. ATTENTION : vous devriez faire une sauvegarde de votre répertoire /uploads avant d'activer ce paramètre."
     clean_orphan_uploads_grace_period_hours: "La période de grâce (en heures) avant qu'un fichier envoyé orphelin soit retiré."
     purge_deleted_uploads_grace_period_days: "La période de grâce (en jours) avant qu'un fichier envoyé et supprimé soit effacé."
     purge_unactivated_users_grace_period_days: "Période de grâce (en jours) avant qu'un utilisateur qui n'a pas activé son compte soit supprimé. Régler à 0 pour ne jamais purger les utilisateurs non activés."
     enable_s3_uploads: "Placez les fichiers envoyés sur un stockage Amazon S3. IMPORTANT : nécessite un accès valide à S3 (l'identifiant et la clé secrète)."
-    s3_use_iam_profile: 'Utiliser un <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">profile d''instance AWS EC2 </a> pour accorder l''accès au S3 bucket. NOTE: pour cela, Discourse doit être exécuté dans une instance EC2 correctement configurée, et remplace les paramètres « s3 access key id » et « s3 secret access key ».'
+    s3_use_iam_profile: 'Utiliser un <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">profil d''instance AWS EC2</a> pour accorder l''accès au bucket S3. NOTE : cela nécessite que Discourse soit exécuté sur une instance EC2 correctement configurée et remplace les paramètres « s3 access key id » et « s3 secret access key ».'
     s3_upload_bucket: "Le nom du bucket Amazon S3 qui contiendra les fichiers téléchargés. ATTENTION : doit être en minuscule, sans points et sans tirets bas."
     s3_access_key_id: "La clé d'accès Amazon S3 qui sera utilisée pour envoyer les images, les pièces joints et les sauvegardes."
     s3_secret_access_key: "La clé d'accès secrète Amazon S3 qui sera utilisée pour envoyer les images, les pièces joints et les sauvegardes."
@@ -1635,21 +1649,21 @@ fr:
     body_min_entropy: "L'entropie minimale (caractères unique, les caractères en langues étrangères compte pour plus) requise pour le corps d'un message."
     allow_uppercase_posts: "Autoriser des messages ou titres de sujets entièrement en majuscules."
     max_consecutive_replies: "Nombre de messages successifs qu'un utilisateur peut poster dans un sujet avant de ne plus pouvoir ajouter de nouvelle réponse."
-    title_fancy_entities: "Convertir les caractères ASCII commun en jolies entitées HTML dans les titres des sujets, comme SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
+    title_fancy_entities: "Convertir les caractères ASCII communs en jolies entités HTML dans les titres des sujets, comme SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "La taille minimale d'un titre avant que l'on vérifie l'existence de sujets identiques."
     desktop_category_page_style: "Style visuel de la page /categories."
     category_colors: "Une liste de couleurs en hexadécimale autorisées pour les catégories."
     category_style: "Style visuel pour les badges de catégorie."
     max_image_size_kb: "La taille maximale des images envoyées en Ko. La valeur doit aussi être configurée dans Nginx (client_max_body_size), Apache ou le proxy. Les images plus grandes que cette taille et plus petites que client_max_body_size seront redimensionnées à l'envoi."
     max_attachment_size_kb: "La taille maximale des fichiers envoyés en Ko. La valeur doit aussi être configurée dans Nginx (client_max_body_size), Apache ou le proxy."
-    authorized_extensions: "Une liste d'extensions de fichier autorisées pour les envois sur le serveur (mettre '*' pour autoriser tous les types)"
-    authorized_extensions_for_staff: "Une liste des extensions de fichiers autorisées pour le téléchargement pour les responsables en plus de la liste définie dans le paramètre `authorized_extensions'. (utilisez '*' pour activer tous les types de fichiers)"
-    theme_authorized_extensions: "Une liste d'extensions de fichier autorisées pour les envois de thème (mettre « * » pour autoriser tous les types de fichier)"
+    authorized_extensions: "Une liste d'extensions de fichier autorisées pour les envois sur le serveur (mettre « * » pour autoriser tous les types)"
+    authorized_extensions_for_staff: "Une liste des extensions de fichiers autorisées pour le téléchargement pour les responsables en plus de la liste définie dans le paramètre `authorized_extensions'. (utilisez « * » pour activer tous les types de fichiers)"
+    theme_authorized_extensions: "Une liste d'extensions de fichier autorisées pour les envois de thème (mettre « * » pour autoriser tous les types de fichier)"
     max_similar_results: "Combien de sujets similaires sont affichés lors de la création d'un nouveau sujet. La comparaison se base sur le titre et le contenu."
     max_image_megapixels: "Nombre maximum autorisé de mégapixels pour une image. Les images avec un nombre plus élevé seront rejetées."
-    title_prettify: "Corrige les coquilles les plus communes dans les titres (intégralité du titre en majuscule, première lettre en minuscule, de multiples ! et ?, un . inutile à la fin, etc.)"
-    title_remove_extraneous_space: "Supprimez les espaces devant les signes de ponctuation de fin."
-    automatic_topic_heat_values: 'Mettez à jour automatiquement les paramètres "Sujet affiché" et "Sujet similaire" en fonction de l''activité du site.'
+    title_prettify: "Corriger les coquilles les plus communes dans les titres (intégralité du titre en majuscule, première lettre en minuscule, de multiples ! et ?, un . inutile à la fin, etc.)"
+    title_remove_extraneous_space: "Supprimer les espaces devant les signes de ponctuation de fin."
+    automatic_topic_heat_values: 'Mettre à jour automatiquement les paramètres « topic views heat » et « topic post like heat » en fonction de l''activité du site.'
     topic_views_heat_low: "Après ce nombre de vues, le champ Vues sera légèrement mis en évidence."
     topic_views_heat_medium: "Après ce nombre de vues, le champ Vues sera modérément mis en évidence."
     topic_views_heat_high: "Après ce nombre de vues, le champ Vues sera fortement mis en évidence."
@@ -1665,16 +1679,16 @@ fr:
     faq_url: "Si vous disposez déjà d'une FAQ/Règles de la communauté, hébergée ailleurs, que vous souhaitez utiliser, vous pouvez renseigner l'URL complète ici."
     tos_url: "Si vous disposez déjà de conditions générales d'utilisation hébergées ailleurs que vous souhaitez utiliser, vous pouvez renseigner leur URL complète ici."
     privacy_policy_url: "Si vous disposez déjà d'une politique de confidentialité hébergée ailleurs que vous voulez utiliser, vous pouvez renseigner son URL complète ici."
-    log_anonymizer_details: "S'il y a lieu de conserver les détails d'un utilisateur dans le journal après avoir été rendu anonyme. Lorsque vous vous conformerez au GDPR, vous devrez l'éteindre."
+    log_anonymizer_details: "Conserver les détails d'un utilisateur rendu anonyme dans les journaux. Si vous vous conformerez au RGPD, vous devez désactiver cette fonction."
     newuser_spam_host_threshold: "Combien de fois un nouvel utilisateur peut publier un lien vers le même hôte dans la limite de leur `newuser_spam_host_threshold` messages avant d'être considérés comme du spam."
     white_listed_spam_host_domains: "Une liste des domaines exclus des hôtes testés comme spam. Les nouveaux utilisateurs ne seront jamais empêchés de créer des messages contenant des liens vers ces domaines. "
     staff_like_weight: "Quel poids supplémentaire donner aux J'aime de l'équipe."
-    topic_view_duration_hours: "Compte la vue d'un sujet une seule fois par IP ou par utilisateur toutes les N heures"
-    user_profile_view_duration_hours: "Compte la vue d'un profil d'utilisateur une seule fois par IP ou par utilisateur qui visite toutes les N heures"
+    topic_view_duration_hours: "Compter la vue d'un sujet une seule fois par IP ou par utilisateur toutes les N heures"
+    user_profile_view_duration_hours: "Compter la vue d'un profil d'utilisateur une seule fois par IP ou par utilisateur qui visite toutes les N heures"
     levenshtein_distance_spammer_emails: "Lorsque des courriels correspondent à des spammer, la différence du nombre de caractère permettra toujours une correspondance floue."
     max_new_accounts_per_registration_ip: "S'il y a déjà (n) Niveau de confiance 0 comptes à partir de cette adresse IP ( et aucun n'est un membre du personnel ou au NC2 ou ultérieure), ne plus accepter de nouvelles inscriptions de cette IP."
     min_ban_entries_for_roll_up: "En cliquant sur le bouton Consolider, une liste d'au moins (N) adresses interdites sera remplacée par une plage de sous réseau."
-    max_age_unmatched_emails: "Effacer les adresses de courriel sous surveillance sans correspondance après (N) jours"
+    max_age_unmatched_emails: "Effacer les adresses courriel sous surveillance sans correspondance après (N) jours"
     max_age_unmatched_ips: "Effacer les adresses IP sous surveillance sans correspondance après (N) jours"
     num_flaggers_to_close_topic: "Nombre minimum de signalements uniques requis pour automatiquement suspendre un sujet pour intervention"
     num_hours_to_close_topic: "Nombre d'heures de fermeture d'un sujet pour intervention."
@@ -1690,16 +1704,16 @@ fr:
     cooldown_hours_until_reflag: "Combien de temps les utilisateurs doivent attendre avant de pouvoir signaler à nouveau un message"
     reply_by_email_enabled: "Activer les réponses aux sujets via courriel."
     reply_by_email_address: "Modèle pour la réponse par courriel entrant, exemple : %%{reply_key}@reply.example.com ou replies+%%{reply_key}@example.com"
-    alternative_reply_by_email_addresses: "Liste des templates alternatifs pour les adresses des courriels entrants de la réponse par courriel. Exemple : %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
+    alternative_reply_by_email_addresses: "Liste des modèles alternatifs pour les adresses des courriels entrants de la réponse par courriel. Exemple : %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "Utilisez du HTML plutôt que du texte pour les courriels entrants."
-    strip_incoming_email_lines: "Supprimez les espaces blancs de début et de fin de chaque ligne de courriel entrants."
-    disable_emails: "Empêcher Discourse d'envoyer tout type de courriels. Sélectionnez « oui » pour désactiver les courriels pour tous les utilisateurs. Sélectionnez « non responsables » pour désactiver les courriels uniquement pour les utilisateurs qui ne sont pas des responsables."
+    strip_incoming_email_lines: "Supprimer les espaces en début et fin de chaque ligne de courriel entrants."
+    disable_emails: "Empêcher Discourse d'envoyer tout type de courriels. Sélectionnez « oui » pour désactiver les courriels pour tous les utilisateurs. Sélectionnez « non responsables » pour désactiver les courriels uniquement pour les utilisateurs qui ne sont pas des responsables."
     strip_images_from_short_emails: "Retirer les images des courriels dont la taille est inférieure à 2 800 octets"
     short_email_length: "Taille des courriels courts en octets"
-    display_name_on_email_from: "Affiche les noms complets dans le champ « De » du courriel"
-    unsubscribe_via_email: "Autoriser les utilisateurs à se désabonner des courriels en envoyant un courriel avec « unsubscribe » dans le sujet ou le corps du message."
+    display_name_on_email_from: "Afficher les noms complets dans le champ « De » des courriels"
+    unsubscribe_via_email: "Autoriser les utilisateurs à se désabonner des courriels en envoyant un courriel avec « unsubscribe » dans le sujet ou le corps du message."
     unsubscribe_via_email_footer: "Inclure un lien dans le pied des courriels envoyés pour se désabonner"
-    delete_email_logs_after_days: "Efface les journaux de messagerie après (N) jours. 0 pour conserver indéfiniment."
+    delete_email_logs_after_days: "Effacer les journaux de messagerie après (N) jours. 0 pour conserver indéfiniment."
     disallow_reply_by_email_after_days: "Interdire la réponse par courriel après (N) jours. 0 pour permettre indéfiniment."
     max_emails_per_day_per_user: "Nombre maximum de courriels à envoyer aux utilisateurs par jour. 0 pour désactiver la limite"
     enable_staged_users: "Créer automatiquement les utilisateurs distants lors du traitement des courriels entrants."
@@ -1715,10 +1729,10 @@ fr:
     attachment_content_type_blacklist: "Liste des mots-clés utilisés pour filtrer les pièces jointes en fonction du type de contenu."
     attachment_filename_blacklist: "Liste des mots-clés utilisés pour filtrer les pièces jointes en fonction du nom de fichier."
     forwarded_emails_behaviour: "Comment traiter un courriel transféré à Discourse"
-    always_show_trimmed_content: "Toujours montrer la partie réduite des courriels entrants. ATTENTION : cela peut révéler les adresses courriels."
+    always_show_trimmed_content: "Toujours montrer la partie réduite des courriels entrants. ATTENTION : cela peut révéler les adresses courriel."
     private_email: "Ne pas inclure le contenu de messages ou de sujets dans le titre ou le corps du courriel. REMARQUE : désactive également les courriels de résumé."
     email_total_attachment_size_limit_kb: "Taille totale maximale des fichiers joints aux courriels sortants. Définissez la valeur sur 0 pour désactiver l'envoi de pièces jointes."
-    post_excerpts_in_emails: "Dans les courriels de notification, envoyez toujours des extraits au lieu de messages complets."
+    post_excerpts_in_emails: "Dans les courriels de notification, toujours envoyer des extraits au lieu de messages complets."
     raw_email_max_length: "Combien de caractères doivent être stockés pour le courriel entrant."
     raw_rejected_email_max_length: "Combien de caractères doivent être stockés pour le courriel entrant rejeté."
     delete_rejected_email_after_days: "Supprimer les courriels rejetés plus vieux que (n) jours."
@@ -1731,37 +1745,37 @@ fr:
     pop3_polling_host: "L'hôte pour le pooling des courriels via POP3."
     pop3_polling_username: "Le nom d'utilisateur du compte POP3 pour le pooling des courriels."
     pop3_polling_password: "Le mot de passe du compte POP3 pour le pooling des courriels."
-    pop3_polling_delete_from_server: "Courriels supprimés du serveur. NOTE : Si vous désactivez ceci vous devrez vider manuellement votre boîte de réception courriel."
+    pop3_polling_delete_from_server: "Supprimer les courriels du serveur. NOTE : si vous désactivez ceci vous devrez vider manuellement votre boîte de réception courriel."
     log_mail_processing_failures: "Enregistrer tous les problèmes de courriel dans <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    email_in: 'Autoriser les utilisateurs à créer de nouveaux sujets par courriel (nécessite une requête manuelle ou via POP3). Configurez les adresses dans l''onglet « Paramètres » de chaque catégorie.'
+    email_in: 'Autoriser les utilisateurs à créer de nouveaux sujets par courriel (nécessite une requête manuelle ou via POP3). Configurez les adresses dans l''onglet « Paramètres » de chaque catégorie.'
     email_in_min_trust: "Le niveau de confiance minimum qu'un utilisateur doit avoir pour être autorisé à créer de nouveaux sujets par courriel."
     email_in_spam_header: "Entête courriel pour détecter du spam."
     email_prefix: "Le [label] qui sera utilisé dans le sujet des courriels. Par défaut il prend la valeur de 'title'."
     email_site_title: "Le titre du site utilisé comme expéditeur pour les courriels du site. Par défaut il prend la valeur de 'title'. Si votre 'title\" utilise des caractères interdits dans les courriels, utiliser ce paramètre."
-    find_related_post_with_key: "N'utilisez que la « reply key » pour trouver le message auquel on a répondu. ATTENTION : la désactivation de cette option permet l'usurpation d'identité de l'utilisateur sur la base de l'adresse courriel."
+    find_related_post_with_key: "N'utilisez que la « reply key » pour trouver le message auquel on a répondu. ATTENTION : la désactivation de cette option permet l'usurpation d'identité de l'utilisateur sur la base de l'adresse courriel."
     minimum_topics_similar: "Combien de sujets ont besoin d'exister dans la base de données avant que des sujets similaires soit présentés lors de la rédaction de nouveaux sujets."
     relative_date_duration: "Nombre de jours après la création d'un message à partir desquels les dates seront affichées en absolu (20 Fév) plutôt qu'en relatif (7j)"
-    delete_user_max_post_age: "Interdire la suppression des utilisateurs dont le premier message est date de plus de (n) jours."
+    delete_user_max_post_age: "Interdire la suppression des utilisateurs dont le premier message est daté de plus de (n) jours."
     delete_all_posts_max: "Le nombre maximum de messages qui peuvent être supprimés en une seule fois avec le bouton Supprimer tous les messages. Si un utilisateur a plus que ce nombre de messages, ses messages ne pourront pas être supprimés en une seule fois et l'utilisateur ne pourra pas être supprimé."
-    username_change_period: "Le nombre de jours maximum après l'inscription pendant lequel l'utilisateur peut encore modifier son nom d'utilisateur (0 pour empêcher la modification du nom d'utilisateur)."
-    email_editable: "Autoriser les utilisateurs à modifier leur adresse de courriel après l'inscription."
+    username_change_period: "Le nombre de jours maximum après l'inscription pendant lesquels l'utilisateur peut encore modifier son nom d'utilisateur (0 pour empêcher la modification du nom d'utilisateur)."
+    email_editable: "Autoriser les utilisateurs à modifier leur adresse courriel après l'inscription."
     logout_redirect: "URL vers laquelle rediriger le navigateur après déconnexion (par exemple : https://example.com/deconnexion)"
     allow_uploaded_avatars: "Autoriser les utilisateurs à envoyer une photo de profil personnalisée."
     allow_animated_avatars: "Autoriser les utilisateurs à utiliser une photo de profil de type GIF animé. ATTENTION : lancez la commande rake avatars:refresh après avoir modifié ce paramètre."
     allow_animated_thumbnails: "Créer des aperçus animés pour les GIF animés."
     default_avatars: "URLs des avatars qui seront utilisés par défaut pour les nouveaux utilisateurs jusqu'à ce qu'ils les modifient."
-    automatically_download_gravatars: "Télécharger les gravatars pour les utilisateurs lors de la création de compte ou de la modification de courriel."
+    automatically_download_gravatars: "Télécharger les Gravatars des utilisateurs lors de la création du compte ou la modification de l'adresse courriel."
     digest_topics: "Le nombre maximum de sujets populaires à afficher dans le résumé par courriel."
     digest_posts: "Le nombre maximum de messages populaires à afficher dans le résumé par courriel."
-    digest_other_topics: "Le nombre maximum de sujets à afficher dans la section « Nouveautés dans les sujets et catégories que vous suivez » du résumé par courriel."
+    digest_other_topics: "Le nombre maximum de sujets à afficher dans la section « Nouveautés dans les sujets et catégories que vous suivez » du résumé par courriel."
     digest_min_excerpt_length: "Longueur minimale (en caractères) de l'extrait des messages dans le résumé par courriel."
     suppress_digest_email_after_days: "Ne pas envoyer de résumés par courriel aux utilisateurs qui n'ont pas visité le site depuis plus de (n) jours."
     digest_suppress_categories: "Ne pas inclure ces catégories dans les résumés par courriel."
     disable_digest_emails: "Désactiver les résumés par courriel pour tous les utilisateurs."
-    apply_custom_styles_to_digest: "Les modèles et css de courrier électronique personnalisés sont appliqués aux courriers électroniques récapitulatifs."
-    email_accent_bg_color: "La couleur d'accentuation utilisée comme arrière-plan de certains éléments des courriels HTML. Entrez un nom de couleur (« red ») ou une valeur hexadécimale (« #FF0000 »)."
-    email_accent_fg_color: "La couleur des textes rendus sur la couleur d'arrière-plan des courriels HTML. Entrez un nom de couleur (« white ») ou une valeur hexadécimale (« #FFFFFF »)."
-    email_link_color: "La couleur des liens dans les courriels HTML. Entrez un nom de couleur (« blue ») ou une valeur hexadécimale (« #0000FF »)."
+    apply_custom_styles_to_digest: "Appliquer des modèles et un CSS personnalisés pour les courriels de résumé."
+    email_accent_bg_color: "La couleur d'accentuation utilisée comme arrière-plan de certains éléments des courriels HTML. Entrez un nom de couleur (« red ») ou une valeur hexadécimale (« #FF0000 »)."
+    email_accent_fg_color: "La couleur des textes rendus sur la couleur d'arrière-plan des courriels HTML. Entrez un nom de couleur (« white ») ou une valeur hexadécimale (« #FFFFFF »)."
+    email_link_color: "La couleur des liens dans les courriels HTML. Entrez un nom de couleur (« blue ») ou une valeur hexadécimale (« #0000FF »)."
     detect_custom_avatars: "Vérifier ou non si les utilisateurs ont envoyé une photo de profil personnalisée."
     max_daily_gravatar_crawls: "Nombre maximum de fois que Discourse vérifiera Gravatar pour des avatars personnalisés en une journée."
     public_user_custom_fields: "Une liste de champs personnalisables qui peuvent être récupérés avec l'API."
@@ -1772,7 +1786,7 @@ fr:
     group_in_subject: "Mettre %%{optional_pm} dans le sujet du courriel au nom du premier groupe du message direct. Voir : <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>personnaliser le format du sujet des courriel standards</a>"
     allow_anonymous_posting: "Permettre aux utilisateurs de passer en mode anonyme"
     anonymous_posting_min_trust_level: "Le niveau de confiance minimum pour passer en mode anonyme."
-    anonymous_account_duration_minutes: "Pour protéger l'anonymat, créer un nouveau compte anonyme tous les N minutes pour chaque utilisateur. Exemple : si 600 est choisi, dès 600 minutes après le dernier message ET que l'utilisateur passe en mode anonyme, un nouveau compte anonyme lui sera crée."
+    anonymous_account_duration_minutes: "Pour protéger l'anonymat, créer un nouveau compte anonyme tous les N minutes pour chaque utilisateur. Exemple : si 600 est choisi, quand 600 minutes sont passées après le dernier message ET l'utilisateur passe en mode anonyme, un nouveau compte anonyme lui sera créé."
     hide_user_profiles_from_public: "Cacher les cartes, les profils et le répertoire d'utilisateurs aux visiteurs."
     allow_featured_topic_on_user_profiles: "Permettre aux utilisateurs de mettre un lien vers un sujet à la une sur leur carte et leur profil."
     show_inactive_accounts: "Autoriser les utilisateurs connectés à parcourir les profils de comptes inactifs."
@@ -1783,41 +1797,42 @@ fr:
     clean_up_inactive_users_after_days: "Nombre de jours avant qu'un utilisateur inactif (niveau de confiance 0 sans aucun messages) soit supprimé. Pour désactiver le nettoyage saisir 0."
     clean_up_unused_staged_users_after_days: "Nombre de jours avant de supprimer un utilisateur distant inutilisé (sans aucun message). 0 pour désactiver le nettoyage."
     user_selected_primary_groups: "Autoriser les utilisateurs à définir leur groupe principal"
-    max_notifications_per_user: "Volume de notifications maximum par utilisateur. Si ce seuil est dépassé alors les notifications les plus anciennes seront supprimées. Appliqué chaque semaine. 0 pour le désactiver."
-    user_website_domains_whitelist: "Les sites Web des utilisateurs vont être vérifiés contre ces domaines. Liste délimitée par des pipes (|)."
+    max_notifications_per_user: "Volume maximum de notifications par utilisateur. Si ce seuil est dépassé alors les notifications les plus anciennes seront supprimées. Appliqué chaque semaine. 0 pour le désactiver."
+    user_website_domains_whitelist: "Les sites web des utilisateurs vont être vérifiés suivant ces domaines. Liste délimitée par des pipes (|)."
     allow_profile_backgrounds: "Autoriser les utilisateurs à envoyer des arrières-plans de profil."
-    sequential_replies_threshold: "Nombre de messages successifs qu'un utilisateur peut poster dans un sujet avant d'être averti d'avoir posté un nombre excessif de réponses qui se suivent."
+    sequential_replies_threshold: "Nombre de messages consécutifs qu'un utilisateur peut poster dans un sujet avant d'être averti d'avoir publié trop de messages à la suite."
     get_a_room_threshold: "Nombre de messages qu'un utilisateur doit faire à la même personne dans un même sujet avant d'être averti."
     enable_mobile_theme: "Les appareils mobiles utilisent un thème adapté aux mobiles, avec la possibilité de passer à la totalité du site. Désactivez cette option si vous voulez utiliser une feuille de style personnalisée qui répond à tous les types de client."
-    dominating_topic_minimum_percent: "Quel est le pourcentage de messages un utilisateur doit poster dans un sujet avant d'être rappelé à l'ordre pour laissé la communauté répondre."
+    dominating_topic_minimum_percent: "Quel pourcentage de messages un utilisateur doit publier dans un sujet avant d'être averti de laisser la communauté répondre."
     disable_avatar_education_message: "Désactiver le message incitant à changer l'avatar."
     suppress_uncategorized_badge: "Ne pas afficher le badge pour les sujets sans catégorie dans les listes de sujets."
     header_dropdown_category_count: "Nombre de catégories qui peuvent être affichées dans le menu déroulant de l'entête."
     permalink_normalizations: "Appliquer l'expression régulière suivante avant de détecter les permaliens, par exemple /(\\/topic.*)\\?.*/\\1 supprimera les chaînes de requête des chemins de sujet. Le format est regex+string, utilisez \\1 etc. pour capturer des séquences"
-    global_notice: "Afficher une bannière de notification globale, d'URGENCE, et qui ne peut pas être ignoré, à tous les visiteurs, vide pour cacher (HTML admis)."
+    global_notice: "Afficher une bannière de notification globale et qui ne peut être ignorée à tous les visiteurs pour un message URGENT (HTML autorisé). Laissez le champ vide pour cacher la bannière."
     disable_system_edit_notifications: "Désactiver les notifications de modifications par l'utilisateur système lorsque l'option 'download_remote_images_to_local' est activée."
     automatically_unpin_topics: "Désépingler automatiquement le sujet lorsque l'utilisateur atteint la fin."
     read_time_word_count: "Nombre de mots par minute servant de base de calcul à l'estimation du temps de lecture."
     topic_page_title_includes_category: "La <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>balise title</a> de la page du sujet comprend le nom de la catégorie."
-    native_app_install_banner_ios: "Affiche la bannière de l'application DiscourseHub sur les appareils iOS aux utilisateurs habitués (niveau de confiance supérieur ou égal à 1)."
-    native_app_install_banner_android: "Affiche la bannière de l'application DiscourseHub sur les appareils Android aux utilisateurs habitués (niveau de confiance supérieur ou égal à 1)."
+    native_app_install_banner_ios: "Affiche la bannière de l'application DiscourseHub sur les appareils iOS aux utilisateurs habitués (niveau de confiance 1 ou supérieur)."
+    native_app_install_banner_android: "Affiche la bannière de l'application DiscourseHub sur les appareils Android aux utilisateurs habitués (niveau de confiance 1 ou supérieur)."
     share_anonymized_statistics: "Partager les statistiques d'utilisation anonymes."
-    auto_handle_queued_age: "Gérer automatiquement les documents qui attendent d'être examinés après ce nombre de jours. Les signalements seront ignorés. Les messages et les utilisateurs en file d'attente seront rejetés. Réglez à 0 pour désactiver cette fonction."
-    svg_icon_subset: "Rajouter des icônes supplémentaires FontAwesome 5 que vous souhaitez inclure dans vos médias. Utiliser le préfixe 'fa-' pour les icônes solides, 'far-' pour les icônes normaux et 'fab-' pour les icônes de marque."
+    auto_handle_queued_age: "Gérer automatiquement les éléments qui attendent d'être examinés après ce nombre de jours. Les signalements seront ignorés. Les messages et les utilisateurs en file d'attente seront rejetés. Réglez à 0 pour désactiver cette fonction."
+    svg_icon_subset: "Ajouter des icônes supplémentaires FontAwesome 5 que vous souhaitez inclure dans vos médias. Utilisez le préfixe « fa- » pour les icônes solides, « far- » pour les icônes normales et « fab- » pour les icônes de marques."
     max_prints_per_hour_per_user: "Nombre maximum d'accès à la page /print (mettre à 0 pour désactiver)"
     full_name_required: "Le nom complet est requis dans le profil utilisateur."
     enable_names: "Autoriser l'affichage des noms complets des utilisateurs dans leur profil, sur leur carte d'utilisateur et dans les courriels. Décocher pour cacher les noms complets partout."
     display_name_on_posts: "Afficher le nom complet de l'utilisateur dans ses messages en plus de son nom d'utilisateur."
     show_time_gap_days: "Si deux messages sont publiés à ce nombre de jours d'écart, affichez cette durée dans le sujet."
-    short_progress_text_threshold: "Si le nombre de messages dans un sujet dépasse ce nombre, la barre de progression affichera uniquement le numéro de message actuel. Si vous modifiez la largeur de la barre de progression, vous devrez peut-être modifier cette valeur."
+    short_progress_text_threshold: "Si le nombre de messages dans un sujet dépasse cette valeur, la barre de progression affichera uniquement le numéro de message actuel. Si vous modifiez la largeur de la barre de progression, vous devrez peut-être modifier cette valeur."
     default_code_lang: "Coloration syntaxique par défaut appliquée à la syntaxe des langages de programmation des blocs de code GitHub (lang-auto, Ruby, Python, etc)"
-    warn_reviving_old_topic_age: "Lorsque quelqu'un commence à répondre à un sujet dont la dernière réponse est vielle de plusieurs jours, un avertissement sera affiché. Désactiver la fonctionnalité en indiquant: 0."
+    warn_reviving_old_topic_age: "Lorsque quelqu'un commence à répondre à un sujet dont la dernière réponse est vielle de plusieurs jours, un avertissement sera affiché. Désactivez la fonctionnalité en indiquant 0."
     autohighlight_all_code: "Forcer la coloration syntaxique dans tous les blocs de codes même si aucun langage de programmation n'est défini explicitement."
     highlighted_languages: "Règles de coloration syntaxique supportées. (Attention : supporter trop de langages peut impacter les performances.) Voir : <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo/</a> pour une démonstration."
     show_copy_button_on_codeblocks: "Ajouter un bouton aux blocs de codes pour copier leur contenu dans le presse-papier de l'utilisateur. Cette fonctionnalité n'est pas disponible avec Internet Explorer."
     embed_any_origin: "Autoriser le contenu intégré quelque soit son origine. Cela est nécessaire pour les applications mobiles utilisant du HTML statique."
     embed_topics_list: "Permettre l'intégration HTML des listes de sujets"
     embed_truncate: "Tronquer les messages embarqués."
+    embed_unlisted: "Les sujets importés seront invisibles jusqu'à ce qu'un utilisateur réponde."
     embed_support_markdown: "Permettre le formatage Markdown pour les messages intégrés."
     embed_whitelist_selector: "Une liste séparée par des virgules des éléments CSS autorisés à être intégrés."
     allowed_href_schemes: "Préfixes autorisés dans les liens en plus de http et https."
@@ -1827,13 +1842,13 @@ fr:
     show_create_topics_notice: "Si le site contient moins de 5 sujets publics, afficher un message pour demander aux administrateurs de créer d'autres sujets."
     delete_drafts_older_than_n_days: "Supprimer les brouillons plus vieux que (n) jours."
     bootstrap_mode_min_users: "Nombre minimum d'utilisateurs nécessaire pour désactiver le mode spécial de lancement (mettre à 0 pour désactiver)"
-    prevent_anons_from_downloading_files: "Refuser le téléchargement de pièces jointes aux visiteurs. ATTENTION : cela empêchera de fonctionner les ressources envoyées en pièce jointe qui ne sont pas des images."
-    slug_generation_method: "Choisissez une méthode de génération d'identifiant. \"encodé\" générera des chaines de caractères encodées avec des pourcentages. \"aucune\" désactivera complètement les identifiants."
+    prevent_anons_from_downloading_files: "Empêcher le téléchargement de pièces jointes par les visiteurs. ATTENTION : cela empêchera de fonctionner les ressources envoyées en pièce jointe qui ne sont pas des images."
+    slug_generation_method: "Choisissez une méthode de génération d'identifiant. « encoded » générera des chaînes de caractères encodées avec des pourcentages. « none » désactivera complètement les identifiants."
     enable_emoji: "Activer les emojis"
     enable_emoji_shortcuts: "Les textes de smiley courants :) :p :( seront convertis en emojis"
     emoji_set: "Comment aimeriez-vous vos emoji ?"
     emoji_autocomplete_min_chars: "Nombre minimum de caractères nécessaires pour invoquer la fenêtre contextuelle d'emoji"
-    enable_inline_emoji_translation: "Permet la traduction d'émojis en ligne (sans espace ni ponctuation auparavant)"
+    enable_inline_emoji_translation: "Active la traduction d'emojis en ligne (non précédés par une espace ou une ponctuation)"
     approve_post_count: "Le nombre de messages d'un utilisateur nouveau ou basique devant être approuvés"
     approve_unless_trust_level: "Les messages des utilisateurs qui n'ont pas atteint ce niveau de confiance doivent être approuvés"
     approve_new_topics_unless_trust_level: "Les nouveaux sujets des utilisateurs en dessous de ce niveau de confiance doivent être approuvés"
@@ -1848,9 +1863,10 @@ fr:
     new_user_notice_tl: "Niveau de confiance minimum requis pour voir les nouveaux avis de publication d'utilisateur."
     returning_user_notice_tl: "Niveau de confiance minimum requis pour voir les avis postés par les utilisateurs revenant."
     returning_users_days: "Combien de jours doivent s'écouler avant qu'un utilisateur soit considéré comme étant de retour."
+    enable_page_publishing: "Autorisez les responsables de publier des sujets vers de nouvelles URL utilisant leur propre style."
     default_email_digest_frequency: "Par défaut, à quelle fréquence les utilisateurs reçoivent les résumés par courriel."
     default_include_tl0_in_digests: "Par défaut, inclure les messages des nouveaux utilisateurs dans les résumés par courriel. Les utilisateurs peuvent changer cela dans leurs préférences."
-    default_email_level: "Définit le niveau des notifications par défaut pour les sujets standards."
+    default_email_level: "Définissez le niveau de notification courriel par défaut pour les sujets standards."
     default_email_messages_level: "Définissez le niveau de notification courriel par défaut quand quelqu'un envoie un message direct à un utilisateur."
     default_email_mailing_list_mode: "Envoyer un courriel pour chaque nouveau message."
     default_email_mailing_list_mode_frequency: "Par défaut, les utilisateurs ayant activé la liste de diffusion recevront des courriels à cette fréquence."
@@ -1861,24 +1877,24 @@ fr:
     default_other_auto_track_topics_after_msecs: "Paramètre global fixant le temps par défaut au bout duquel un sujet est suivi automatiquement."
     default_other_notification_level_when_replying: "Niveau de notification global par défaut quand un utilisateur répond à un sujet."
     default_other_external_links_in_new_tab: "Par défaut, ouvrir tous les liens externes dans un nouvel onglet"
-    default_other_enable_quoting: "Par défaut, proposer la citation du texte surligné."
+    default_other_enable_quoting: "Par défaut, proposer la citation du texte sélectionné."
     default_other_enable_defer: "Par défaut, activer le bouton pour reporter un sujet à plus tard."
     default_other_dynamic_favicon: "Par défaut, faire apparaître le nombre de sujets récemment créés ou mis à jour sur l'icône navigateur."
     default_other_like_notification_frequency: "Par défaut, notifier les utilisateurs d'un J'aime"
     default_topics_automatic_unpin: "Par défaut, désépingler automatiquement le sujet lorsque l'utilisateur atteint la fin."
     default_categories_watching: "Liste de catégories surveillées par défaut."
     default_categories_tracking: "Liste de catégories suivies par défaut."
-    default_categories_muted: "Liste de catégories silencées par défaut."
+    default_categories_muted: "Liste de catégories mises sous silence par défaut."
     default_categories_watching_first_post: "Liste des catégories dont le premier message de chaque nouveau sujet sera surveillé par défaut."
-    mute_all_categories_by_default: "Définit le niveau des notifications pour toutes les catégories à silencieux. Nécessite que les utilisateurs acceptent explicitement les catégories pour les faire apparaître sur les pages 'récents' et 'catégories'. Si vous souhaitez corriger les valeurs par défaut pour les utilisateurs anonymes veuillez renseigner les paramètres 'default_categories_'."
+    mute_all_categories_by_default: "Définir le niveau des notifications de toutes les catégories à silencieux. Cela demande aux utilisateurs de sélectionner explicitement les catégories qui peuvent apparaître sur leurs pages « Récents » et « Catégories ». Si vous souhaitez revoir les valeurs par défaut pour les utilisateurs anonymes, veuillez renseigner les paramètres « default_categories_ »."
     default_tags_watching: "Liste des étiquettes qui sont surveillées par défaut."
     default_tags_tracking: "Liste des étiquettes qui sont suivies par défaut."
     default_tags_muted: "Liste des étiquettes qui sont mises sous silence par défaut."
     default_tags_watching_first_post: "Liste des étiquettes pour lesquelles le premier message de chaque nouveau sujet sera surveillé par défaut."
     default_text_size: "Taille de texte par défaut"
-    default_title_count_mode: "Mode par défaut pour le compteur de titre de page"
-    retain_web_hook_events_period_days: "Nombre de jours de conservation des événement des Web hooks."
-    retry_web_hook_events: "Réessayez automatiquement 4 fois les événements de hook web qui ont échoué. Les intervalles entre les tentatives sont de 1, 5, 25 et 125 minutes."
+    default_title_count_mode: "Mode par défaut pour le compteur inclut dans le titre de la page"
+    retain_web_hook_events_period_days: "Nombre de jours de conservation des événements des Webhooks."
+    retry_web_hook_events: "Réessayer jusqu'à 4 fois les événements de Webhooks qui ont échoué. Les intervalles entre chaque tentative sont de 1, 5, 25 et 125 minutes."
     revoke_api_keys_days: "Nombre de jours avant qu'une clé API inutilisée ne soit automatiquement révoquée (0 pour jamais)"
     allow_user_api_keys: "Autoriser la génération des clés de l'API utilisateur"
     allow_user_api_key_scopes: "Liste des champs d'action autorisés pour les clés de l'API utilisateur"
@@ -1893,15 +1909,15 @@ fr:
     max_tag_length: "Le nombre maximum de caractères pouvant être utilisés pour une étiquette."
     max_tag_search_results: "Lors d'une recherche d'étiquettes, le nombre maximum de résultats à afficher."
     show_filter_by_tag: "Afficher une liste déroulante pour filtrer une liste de sujet par étiquette."
-    max_tags_in_filter_list: "Nombre maximum d'étiquettes à afficher dans la liste déroulante de filtres. Les étiquettes les plus utilisés seront affichées."
-    tags_sort_alphabetically: "Afficher les étiquettes par ordre alphabétique. Par défaut, ils sont affichés par ordre de popularité."
-    tags_listed_by_group: "Lister les étiquettes par groupe d'étiquette sur la <a href='%{base_path}/tags' target='_blank'>page Étiquettes</a>."
-    tag_style: "Style visuel pour badges d'étiquette."
-    allow_staff_to_tag_pms: "Autoriser les responsables à étiquetter n'importe quel message direct"
-    min_trust_level_to_tag_topics: "Niveau de confiance minimum requis pour étiquetter des sujets"
+    max_tags_in_filter_list: "Nombre maximum d'étiquettes à afficher dans la liste déroulante de filtres. Les étiquettes les plus utilisées seront affichées."
+    tags_sort_alphabetically: "Afficher les étiquettes par ordre alphabétique. Par défaut, elles sont affichées par ordre de popularité."
+    tags_listed_by_group: "Lister les étiquettes par groupe d'étiquettes sur la <a href='%{base_path}/tags' target='_blank'>page Étiquettes</a>."
+    tag_style: "Style visuel pour les badges d'étiquette."
+    allow_staff_to_tag_pms: "Autoriser les responsables à étiqueter n'importe quel message direct"
+    min_trust_level_to_tag_topics: "Niveau de confiance minimum requis pour étiqueter des sujets"
     suppress_overlapping_tags_in_list: "Si des étiquettes correspondent exactement à des mots du titre d'un sujet, ne pas afficher ces étiquettes"
-    remove_muted_tags_from_latest: "Ne pas afficher les sujets avec des étiquettes silencieuses dans la liste des sujets récents."
-    force_lowercase_tags: "Forcer les nouvelles étiquettes à être entièrement en miniscule"
+    remove_muted_tags_from_latest: "Ne pas afficher les sujets avec des étiquettes mises sous silence dans la liste des sujets récents."
+    force_lowercase_tags: "Forcer les nouvelles étiquettes à être en minuscule."
     company_name: "Nom de société"
     governing_law: "Droit applicable"
     city_for_disputes: "Ville pour les litiges"
@@ -1921,31 +1937,31 @@ fr:
       invalid_group: "Il n'y a pas de groupe ayant ce nom."
       invalid_integer_min_max: "La valeur doit être comprise entre %{min} et %{max}."
       invalid_integer_min: "La valeur doit être de %{min} ou plus."
-      invalid_integer_max: "La valeur ne peut pas être supérieur à %{max}."
-      invalid_integer: "La valeur doit être un entier."
+      invalid_integer_max: "La valeur ne peut pas être supérieure à %{max}."
+      invalid_integer: "La valeur doit être un nombre entier."
       regex_mismatch: "La valeur ne correspond pas au format requis."
-      must_include_latest: "Le menu du haut doit contenir l'onglet 'latest'."
+      must_include_latest: "Le menu du haut doit contenir l'onglet « Récents »."
       invalid_string: "Valeur invalide."
-      invalid_string_min_max: "Doit être compris(e) entre %{min} et %{max} caractères."
-      invalid_string_min: "Doit être d'au moins %{count} caractères."
-      invalid_string_max: "Ne doit pas être supérieur à %{max} caractères."
-      invalid_reply_by_email_address: "La valeur doit contenir « %{reply_key} » et être différente du courriel de notification."
-      invalid_alternative_reply_by_email_addresses: "Toutes les valeurs doivent contenir « %{reply_key} » et être différentes du courriel de notification."
-      pop3_polling_host_is_empty: "Vous devez définir « pop3 polling host » avant d'activer le relevé via POP3."
-      pop3_polling_username_is_empty: "Vous devez définir « pop3 polling username » avant d'activer le relevé via POP3."
-      pop3_polling_password_is_empty: "Vous devez définir « pop3 polling password » avant d'activer le relevé via POP3."
-      pop3_polling_authentication_failed: "Echec d'authentication POP3. Veuillez contrôler vos détails POP3."
-      reply_by_email_address_is_empty: "Vous devez renseigner une 'adresse de réponse par courriel' avant d'activer la réponse par courriel."
+      invalid_string_min_max: "La chaîne de caractères doit contenir entre %{min} et %{max} caractères."
+      invalid_string_min: "La chaîne de caractères doit contenir au moins %{min} caractères."
+      invalid_string_max: "La chaîne de caractères doit contenir au plus %{max} caractères."
+      invalid_reply_by_email_address: "La valeur doit contenir « %{reply_key} » et être différente du courriel de notification."
+      invalid_alternative_reply_by_email_addresses: "Toutes les valeurs doivent contenir « %{reply_key} » et être différentes du courriel de notification."
+      pop3_polling_host_is_empty: "Vous devez définir « pop3 polling host » avant d'activer le relevé via POP3."
+      pop3_polling_username_is_empty: "Vous devez définir « pop3 polling username » avant d'activer le relevé via POP3."
+      pop3_polling_password_is_empty: "Vous devez définir « pop3 polling password » avant d'activer le relevé via POP3."
+      pop3_polling_authentication_failed: "Échec d'authentication POP3. Veuillez vérifier vos identifiants POP3."
+      reply_by_email_address_is_empty: "Vous devez configurer le paramètre « reply by email address » avant d'activer les réponses par courriel."
       email_polling_disabled: "Vous devez activer le relevé manuel ou via POP3 avant d'activer les réponses par courriel."
-      user_locale_not_enabled: "Vous devez d'abord activer « allow user locale » avant d'activer ce paramètre."
+      user_locale_not_enabled: "Vous devez d'abord activer « allow user locale » avant d'activer ce paramètre."
       invalid_regex: "L'expression régulière est invalide ou non autorisée."
-      email_editable_enabled: "Vous devez désactiver « email editable » avant d'activer ce paramètre."
-      enable_sso_disabled: "Vous devez d'abord activer « enable sso » avant d'activer ce paramètre."
-      staged_users_disabled: "Vous devez d'abord activer 'utilisateurs distants' avant d'activer ce paramètre."
-      reply_by_email_disabled: "Vous devez d'abord activer « reply by email » avant d'activer ce paramètre."
-      sso_url_is_empty: "Vous devez d'abord configurer un « sso url » avant d'activer ce paramètre."
+      email_editable_enabled: "Vous devez désactiver « email editable » avant d'activer ce paramètre."
+      enable_sso_disabled: "Vous devez d'abord activer « enable sso » avant d'activer ce paramètre."
+      staged_users_disabled: "Vous devez d'abord activer « staged users » avant d'activer ce paramètre."
+      reply_by_email_disabled: "Vous devez d'abord activer « reply by email » avant d'activer ce paramètre."
+      sso_url_is_empty: "Vous devez d'abord configurer un « sso url » avant d'activer ce paramètre."
       sso_invite_only: "Vous ne pouvez pas activer en même temps le SSO et l'inscription par invitation uniquement."
-      enable_local_logins_disabled: "Vous devez d'abord activer « enable local logins » avant d'activer ce paramètre."
+      enable_local_logins_disabled: "Vous devez d'abord activer « enable local logins » avant d'activer ce paramètre."
       min_username_length_exists: "Il n'est pas possible de définir une longueur minimale de nom d'utilisateur qui soit plus longue qu'un nom d'utilisateur qui existe déjà (%{username})."
       min_username_length_range: "Il n'est pas possible de définir un minimum plus grand qu'un maximum."
       max_username_length_exists: "Il n'est pas possible de définir une longueur maximale de nom d'utilisateur qui soit plus courte qu'un nom d'utilisateur qui existe déjà (%{username})."
@@ -1971,7 +1987,7 @@ fr:
       category: "Catégories"
       topic: "Résultats"
       user: "Utilisateurs"
-    results_page: "Résultats de recherche pour « %{term} »"
+    results_page: "Résultats de recherche pour « %{term} »"
     audio: "[audio]"
     video: "[vidéo]"
   sso:
@@ -1980,7 +1996,7 @@ fr:
     account_not_approved: "Votre compte est en attente d'approbation. Vous recevrez une notification par courriel lorsque vous êtes approuvé."
     unknown_error: "Il y a un problème avec votre compte. Veuillez contacter l'administrateur du site."
     timeout_expired: "La connexion au compte a expiré, veuillez essayer de vous reconnecter."
-    no_email: "Aucune adresse de courriel n'a été fournie. Veuillez contacter l'administrateur du site."
+    no_email: "Aucune adresse courriel n'a été fournie. Veuillez contacter l'administrateur du site."
     email_error: "Un compte n'a pas pu être enregistré avec l'adresse courriel <b>%{email}</b>. Veuillez contacter l'administrateur du site."
     missing_secret: "L'authentification SSO a échoué en raison d'une clé secrète manquante. Contactez les administrateurs du site pour résoudre ce problème."
   original_poster: "Créateur du sujet"
@@ -2061,10 +2077,12 @@ fr:
       one: "Ce sujet a été automatiquement ouvert %{count} minute après la dernière réponse."
       other: "Ce sujet a été automatiquement ouvert %{count} minutes après la dernière réponse."
     autoclosed_disabled: "Ce sujet est maintenant ouvert. Les nouvelles réponses sont autorisées."
-    autoclosed_disabled_lastpost: "Ce sujet est maintenant ouvert. Vous pouvez y participer."
+    autoclosed_disabled_lastpost: "Ce sujet est maintenant ouvert. Les nouvelles réponses sont autorisées."
     auto_deleted_by_timer: "Supprimé automatiquement par planification"
   login:
-    security_key_description: "Dès que votre clé de sécurité physique est prête, appuyer sur le bouton S'authentifier avec une clé de sécurité ci-dessous."
+    invalid_second_factor_method: "La méthode à deux facteurs sélectionnée n'est pas valide."
+    not_enabled_second_factor_method: "La méthode à deux facteurs sélectionnée n'est pas activée pour votre compte."
+    security_key_description: "Dès que votre clé de sécurité physique est prête, appuyer sur le bouton « S'authentifier avec une clé de sécurité » ci-dessous."
     security_key_alternative: "Essayer une autre méthode"
     security_key_authenticate: "S'authentifier avec une clé de sécurité"
     security_key_not_allowed_error: "La procédure d'authentification de la clé de sécurité a expiré ou a été annulée."
@@ -2074,7 +2092,7 @@ fr:
     not_approved: "Votre compte n'a pas encore été approuvé. Vous serez notifié par courriel quand cela sera fait."
     incorrect_username_email_or_password: "Nom d'utilisateur, adresse courriel ou mot de passe incorrects"
     incorrect_password: "Mot de passe incorrect"
-    wait_approval: "Merci de vous être inscrit. Nous vous informerons lorsque votre compte aura été approuvé."
+    wait_approval: "Merci pour votre inscription. Nous vous informerons lorsque votre compte aura été approuvé."
     active: "Votre compte est activé et prêt à l'emploi."
     activate_email: "<p>C'est presque terminé ! Nous avons envoyé un courriel d'activation à <b>%{email}</b>. Merci de suivre les instructions pour activer votre compte.</p><p>Si vous ne le recevez pas, vérifiez le dossier Spam dans votre messagerie.</p>"
     not_activated: "Vous ne pouvez pas vous connecter pour le moment. Nous vous avons envoyé un courriel d'activation. Merci de suivre les instructions qui s'y trouve pour activer votre compte."
@@ -2091,10 +2109,10 @@ fr:
       csrf_detected: "L'autorisation a expiré ou vous avez changé de navigateur. Veuillez réessayer."
       request_error: "Une erreur est survenue en initiant l'autorisation. Veuillez réessayer."
       invalid_iat: "Impossible de vérifier le jeton d'autorisation en raison de différences d'horloge du serveur. Veuillez réessayer."
-    omniauth_error_unknown: "Quelque chose s'est mal passé lors de votre connexion, merci de réessayer."
+    omniauth_error_unknown: "Un problème est survenu lors de votre connexion, veuillez réessayer."
     omniauth_confirm_title: "Connectez-vous à l'aide de %{provider}"
     omniauth_confirm_button: "Poursuivre"
-    authenticator_error_no_valid_email: "Aucune adresse courriel associée à %{account}n'est autorisée. Vous devriez configurer votre compte avec une autre adresse."
+    authenticator_error_no_valid_email: "Aucune adresse courriel associée à %{account} n'est autorisée. Vous devriez configurer votre compte avec une autre adresse."
     new_registrations_disabled: "La création de nouveau compte n'est pas autorisé pour le moment."
     password_too_long: "Les mots de passe sont limités à 200 caractères."
     email_too_long: "Le courriel renseigné est trop long. Les noms de boîte courriel ne doivent pas dépasser 254 caractères, et les noms de domaines ne doivent pas dépasser 253 caractères."
@@ -2118,7 +2136,7 @@ fr:
     email:
       sent_test: "envoyé !"
   user:
-    deactivated: "A été désactivé car trop de courriels envoyés à « %{email} » n'ont pas été délivrés."
+    deactivated: "A été désactivé car trop de courriels envoyés à « %{email} » n'ont pas été délivrés."
     deactivated_by_staff: "Désactivé par un responsable"
     deactivated_by_inactivity:
       one: "Désactivé automatiquement après %{count} jour d'inactivité"
@@ -2138,14 +2156,14 @@ fr:
       must_not_contain_two_special_chars_in_seq: "ne doit pas contenir une séquence de 2 caractères spéciaux ou plus (.-_)"
       must_not_end_with_confusing_suffix: "ne doit pas se terminer avec un suffixe déroutant comme .json ou .png etc."
     email:
-      not_allowed: "n'est pas autorisé pour ce fournisseur de courriels. Merci d'utiliser une autre adresse."
+      not_allowed: "n'est pas autorisé pour ce fournisseur de courriels. Veuillez utiliser une autre adresse."
       blocked: "n'est pas autorisé."
-      revoked: "N'enverra plus de courriels à « %{email} » jusqu'à %{date}."
+      revoked: "N'enverra plus de courriels à « %{email} » jusqu'à %{date}."
     ip_address:
       blocked: "Les nouvelles inscriptions ne sont pas acceptées depuis votre adresse IP."
       max_new_accounts_per_registration_ip: "Les nouvelles inscriptions ne sont pas autorisées depuis votre adresse IP (limite atteinte). Contactez un responsable."
     website:
-      domain_not_allowed: "Site Web invalide. Les domaines autorisés sont : %{domains}"
+      domain_not_allowed: "Site web invalide. Les domaines autorisés sont : %{domains}"
     auto_rejected: "Rejeté automatiquement à cause de l'âge. Voir paramètre auto_handle_queued_age site."
     destroy_reasons:
       unused_staged_user: "Utilisateur distant inutilisé"
@@ -2173,7 +2191,7 @@ fr:
       Si vous souhaitez continuer à recevoir ces courriels, vous pouvez ignorer ce message.
   invite_mailer:
     title: "Invitiation"
-    subject_template: "%{inviter_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
+    subject_template: "%{inviter_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
     text_body_template: |
       %{inviter_name} vous a invité(e) à une discussion
 
@@ -2192,7 +2210,7 @@ fr:
       %{invite_link}
   custom_invite_mailer:
     title: "Invitation personnalisée"
-    subject_template: "%{inviter_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
+    subject_template: "%{inviter_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
     text_body_template: |
       %{inviter_name} vous a invité(e) à une discussion
 
@@ -2257,14 +2275,14 @@ fr:
 
       %{base_url}/u/password-reset/%{email_token}
 
-      (Si le lien est expiré, cliquez sur « J'ai oublié mon mot de passe » au moment de s'identifier avec adresse email)
+      (Si le lien est expiré, cliquez sur « J'ai oublié mon mot de passe » au moment de s'identifier avec votre adresse courriel.)
   download_backup_mailer:
     title: "Téléchargement de la sauvegarde"
     subject_template: "[%{email_prefix}] Téléchargement de la sauvegarde du site"
     text_body_template: |
       Voici le [téléchargement de la sauvegarde du site](%{backup_file_path}) que vous avez demandé.
 
-      Nous avons envoyé ce lien à votre adresse de courriel validée pour des raisons de sécurité.
+      Nous avons envoyé ce lien à votre adresse courriel validée pour des raisons de sécurité.
 
       (Si vous *n'avez pas* effectué cette demande, vous devriez vous poser des questions -- quelqu'un a accès à l'administration de votre site.)
     no_token: |2
@@ -2274,7 +2292,7 @@ fr:
     title: "Confirmation de l'administrateur"
     subject_template: "[%{email_prefix}] Confirmer votre nouveau compte"
     text_body_template: |
-      Merci de confirmer que vous souhaitez ajouter **%{target_username} (%{target_email})** comme administrateur à votre forum.
+      Veuillez confirmer que vous souhaitez ajouter **%{target_username} (%{target_email})** comme administrateur à votre forum.
 
       [Confirmer le compte administrateur](%{admin_confirm_url})
   test_mailer:
@@ -2283,13 +2301,39 @@ 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 des nouvelles, 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 des nouvelles, 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 au sujet en discussion qui est défini par son titre et son premier message."
-    inappropriate: "Votre message a été signalé comme étant **inapproprié** : la communauté considère que son contenu est offensif, abusif ou enfreint notre [charte](%{base_path}/guidelines)."
-    spam: "Votre message a été signalé comme étant du **spam** : la communauté considère qu'il s'agit d'une publicité, ou du contenu trop promotionnel au lieu d'être utile et pertinent au sujet."
+    off_topic: "Votre message a été signalé comme étant **hors sujet** : la communauté considère qu'il ne correspond pas au sujet en discussion qui est défini par son titre et son premier message."
+    inappropriate: "Votre message a été signalé comme étant **inapproprié** : la communauté considère que son contenu est offensant, abusif ou enfreint notre [charte](%{base_path}/guidelines)."
+    spam: "Votre message a été signalé comme étant du **spam** : la communauté considère qu'il s'agit d'une publicité ou du contenu trop promotionnel au lieu d'être utile et pertinent au sujet."
     notify_moderators: "Votre message a été **signalé aux modérateurs** : la communauté considère qu'il nécessite l'intervention d'un responsable."
   flags_dispositions:
     agreed: "Merci de nous en informer. Nous sommes en accord avec votre signalement et nous travaillons à sa résolution."
@@ -2309,24 +2353,36 @@ fr:
       text_body_template: |
         Bonjour,
 
-        Ceci est un message automatisé de %{site_name} vous informant que votre message a été masqué.
+        Ceci est un message automatique de %{site_name} vous informant que votre message a été masqué.
 
         <%{base_url}%{url}>
 
         %{flag_reason}
 
-        Ce message a été masqué en raison des drapeaux de la communauté. Veuillez donc réfléchir à la manière dont vous pourriez le réviser pour refléter leurs commentaires. ** Vous pouvez éditer votre message après %{edit_delay} minutes et celui-ci sera automatiquement masqué.**
+        Ce message a été masqué suite à des signalements de la communauté. Veuillez donc réfléchir à la manière dont vous pourriez le réviser pour refléter leurs commentaires. **Vous pouvez modifier votre message après %{edit_delay} minutes et il sera visible à nouveau.**
 
-        Toutefois, si le message est caché par la communauté une seconde fois, il le restera jusqu'à ce qu'il soit traité par le personnel.
+        Toutefois, si le message est masqué par la communauté une seconde fois, il le restera jusqu'à ce qu'il soit traité par des responsables.
 
-        Pour des conseils supplémentaires, veuillez vous reporter à notre [charte communautaire] (%{base_url}/charte).
+        Pour plus d'informations, veuillez consulter notre [charte communautaire](%{base_url}/charte).
     post_hidden_again:
       title: "Message caché à nouveau"
       subject_template: "Message caché suite à des signalements de la communauté, responsables avertis"
-      text_body_template: "Bonjour, Ceci est un message automatisé de %{site_name} pour vous informer que votre message a été caché à nouveau.\n\n <%{base_url}%{url}>\n\n %{flag_reason}\n\nLa communauté a signalé cet article, il est maintenant masqué. ** Ce message ayant été masqué plus d'une fois, votre message le restera jusqu'à ce qu'il soit géré par un membre du personnel. ** \n\nPour plus de précisions, veuillez consulter nos [charte communautaire] (%{base_url}/charte).\n"
+      text_body_template: "Bonjour,\n\nCeci est un message automatique de %{site_name} pour vous informer que votre message a été masqué à nouveau.\n\n <%{base_url}%{url}>\n\n %{flag_reason}\n\nLa communauté a signalé ce message et il est maintenant masqué. **Ce message ayant été masqué plus d'une fois, il le restera jusqu'à ce qu'un responsable intervienne.** \n\nPour plus d'informations, veuillez consulter notre [charte communautaire](%{base_url}/charte).\n"
     flags_disagreed:
       title: "Le message signalé a été rétabli par un responsable"
       subject_template: "Le message signalé a été rétabli par un responsable"
+      text_body_template: |
+        Bonjour,
+
+        Ceci est un message automatique de %{site_name} pour vous informer que [votre message](%{base_url}%{url}) a été rétabli.
+
+        Ce message a été signalé par la communauté et un responsable a décidé de le rétablir.
+
+        [details="Cliquez pour voir le message rétabli"]
+        ``` markdown
+        %{flagged_post_raw_content}
+        ```
+        [/details]
     flags_agreed_and_post_deleted:
       title: "Le message signalé a été retiré par un responsable"
       subject_template: "Le message signalé a été retiré par un responsable"
@@ -2339,16 +2395,16 @@ fr:
 
         Ce message a été signalé par la communauté et un responsable a décidé de le retirer.
 
-        [details="Clic pour développer message retiré"]
+        [details="Cliquez pour voir le message retiré"]
         ``` markdown
         %{flagged_post_raw_content}
         ```
         [/details]
 
-        Pour plus d'informations, merci de vous référer à notre [charte communautaire](%{base_url}/guidelines).
+        Pour plus d'informations, veuillez consulter notre [charte communautaire](%{base_url}/guidelines).
     usage_tips:
       text_body_template: |
-        Pour connaître quelques astuces pour vous aider à démarrer en tant que nouveau membre, [rendez-vous sur cette page](https://meta.discourse.org/t/fr-trucs-et-astuces-pour-nouveaux-utilisateurs/84100/).
+        Pour connaître quelques astuces qui vont vous aider à démarrer en tant que nouveau membre, [rendez-vous sur cette page](https://meta.discourse.org/t/fr-trucs-et-astuces-pour-nouveaux-utilisateurs/84100/).
 
         Au fur et à mesure que vous participerez ici, nous apprendrons à vous connaître et les limitations temporaires des nouveaux utilisateurs seront levées. Avec le temps, vous gagnerez [des niveaux de confiance](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (en anglais) qui incluent des fonctionnalités spéciales pour nous aider à gérer notre communauté ensemble.
     welcome_user:
@@ -2366,14 +2422,14 @@ fr:
       title: "Bienvenue utilisateur"
       subject_template: "Merci de passer du temps avec nous"
       text_body_template: |
-        Salut ! Nous avons vu que vous lisez beaucoup, ce qui est super, alors nous vous avons monté d'un [niveau de confiance !](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)
+        Salut ! Nous avons vu que vous lisez beaucoup, ce qui est super, alors nous vous avons monté d'un [niveau de confiance](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) !
 
         Nous sommes ravis que vous passiez du temps avec nous, et nous adorerions en savoir plus sur vous. Prenez un moment pour [remplir votre profil](%{base_url}/my/preferences/profile) ou sentez-vous libre de [démarrer un nouveau sujet](%{base_url}/categories).
     welcome_staff:
       title: "Bienvenue dans l'équipe"
       subject_template: "Félicitations, le statut de %{role} vous a été accordé !"
       text_body_template: |
-        Le rôle de %{role} vous a été accordé par un membre de l'équipe.
+        Le rôle de %{role} vous a été accordé par un responsable.
 
         En tant que %{role}, vous avez maintenant accès à l'interface <a href='%{base_url}/admin' target='_blank'>d'administration</a>.
 
@@ -2444,12 +2500,12 @@ fr:
     bulk_invite_succeeded:
       title: "Invitation en masse réussie"
       subject_template: "Envoi des invitations en masse réussi"
-      text_body_template: "Votre envoi d'invitations en masse a été effectué. %{sent} invitations envoyées."
+      text_body_template: "Votre envoi d'invitations en masse a été effectué. %{sent} invitations ont été envoyées."
     bulk_invite_failed:
       title: "Invitation en masse échouée"
       subject_template: "Envoi des invitations en masse effectué avec des erreurs"
       text_body_template: |
-        Votre envoi d'invitations en masse a été effectué. %{sent} invitations envoyées avec %{failed} erreur(s).
+        Votre envoi d'invitations en masse a été effectué. %{sent} invitations ont été envoyées avec %{failed} erreur(s).
 
         Voici le détail :
 
@@ -2477,7 +2533,7 @@ fr:
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
-        Votre compte n'a pas le niveau de confiance requis pour créer un nouveau sujet via cette adresse de courriel. Si vous pensez qu'il s'agit d'une erreur, [contacter un responsable](%{base_url}/about).
+        Votre compte n'a pas le niveau de confiance requis pour créer un nouveau sujet via cette adresse courriel. Si vous pensez qu'il s'agit d'une erreur, [contacter un responsable](%{base_url}/about).
     email_reject_user_not_found:
       title: "Courriel rejeté - Utilisateur introuvable"
       subject_template: "[%{site_name}] Problème de courriel -- L'utilisateur est introuvable"
@@ -2503,21 +2559,21 @@ fr:
       title: "Courriel rejeté - Utilisateur inactif"
       subject_template: "[%{email_prefix}] Problème de courriel -- Utilisateur inactif"
       text_body_template: |
-        Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué.
+        Malheureusement votre courriel à %{destination} (intitulé %{former_title}) a échoué.
 
-        Le compte associé avec cette adresse existe n'est pas activé. Veuillez activer votre compte avant d'envoyer des courriels.
+        Le compte associé à cette adresse n'est pas activé. Veuillez activer votre compte avant d'envoyer des courriels.
     email_reject_silenced_user:
       title: "Courriel rejeté - Utilisateur sous silence"
       subject_template: "[%{email_prefix}] Problème de courriel -- Utilisateur sous silence"
       text_body_template: |
-        Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué.
+        Malheureusement votre courriel à %{destination} (intitulé %{former_title}) a échoué.
 
-        Le compte associé avec cette adresse a été mis sous silence.
+        Le compte associé à cette adresse a été mis sous silence.
     email_reject_reply_user_not_matching:
       title: "Courriel rejeté - Utilisateur ne correspond pas"
       subject_template: "[%{email_prefix}] Problème de courriel -- Adresse de réponse inattendue"
       text_body_template: |
-        Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué.
+        Malheureusement votre courriel à %{destination} (intitulé %{former_title}) a échoué.
 
         Votre réponses nous est parvenue d'une autre adresse courriel que celle attendue, nous ne savons donc pas s'il s'agit de la même personne. Essayez de l'envoyer depuis une autre adresse, ou [contactez un responsable](%{base_url}/about).
     email_reject_empty:
@@ -2549,7 +2605,7 @@ fr:
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
-        La catégorie vers laquelle vous avez envoyé ce courriel autorise uniquement les réponses d'utilisateurs avec un compte valide et une adresse de courriel connue. Si vous pensez qu'il s'agit d'une erreur, [contactez un responsable](%{base_url}/about).
+        La catégorie vers laquelle vous avez envoyé ce courriel autorise uniquement les réponses d'utilisateurs avec un compte valide et une adresse courriel connue. Si vous pensez qu'il s'agit d'une erreur, [contactez un responsable](%{base_url}/about).
     email_reject_invalid_post:
       title: "Courriel rejeté - Message invalide"
       subject_template: "[%{email_prefix}] Problème de courriel -- Erreur d'envoi d'un message"
@@ -2575,7 +2631,7 @@ fr:
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
-        Afin de favoriser des discussions plus approfondies, les réponses très courtes ne sont pas permises. Est-ce que vous pouvez reformuler votre réponse avec au moins %{count} caractères ? Alternativement, vous pouvez aimer un message par courriel en répondant "+1".
+        Afin de favoriser des discussions plus approfondies, les réponses très courtes ne sont pas permises. Est-ce que vous pouvez reformuler votre réponse avec au moins %{count} caractères ? Vous pouvez aussi aimer un message par courriel en répondant « +1 ».
     email_reject_invalid_post_action:
       title: "Courriel rejeté - Message action invalide"
       subject_template: "[%{email_prefix}] Problème de courriel -- Action de message invalide"
@@ -2596,9 +2652,9 @@ fr:
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
-        Aucune des adresses de destination n'est reconnue, ou l'entête Message-ID dans le courriel a été modifié. Veuillez vérifier que vous envoyez bien à l'adresse de courriel fournie par les responsables.
+        Aucune des adresses de destination n'est reconnue, ou l'entête Message-ID dans le courriel a été modifiée. Veuillez vérifier que vous envoyez bien à l'adresse courriel fournie par les responsables.
     email_reject_old_destination:
-      title: "Courriel rejeté - Mauvaise ancienne destination"
+      title: "Courriel rejeté - Destination obsolète"
       subject_template: "[%{email_prefix}] Problème de courriel -- Vous essayez de répondre à une ancienne notification"
       text_body_template: |
         Nous sommes désolé, mais l'envoi de votre courriel à destination de %{destination} (intitulé %{former_title}) n'a pas fonctionné.
@@ -2624,7 +2680,7 @@ fr:
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
-        Votre courriel a été marqué comme « généré automatiquement  », ce qui signifie qu'il a été créé par un ordinateur au lieu d'être rédigé par un humain ; nous ne pouvons pas accepter ces types de courriel. Si vous pensez qu'il s'agit d'une erreur, [contacter un responsable](%{base_url}/about).
+        Votre courriel a été marqué comme « généré automatiquement  », ce qui signifie qu'il a été créé par un ordinateur au lieu d'être rédigé par un humain ; nous ne pouvons pas accepter ce type de courriel. Si vous pensez qu'il s'agit d'une erreur, [contacter un responsable](%{base_url}/about).
     email_reject_unrecognized_error:
       title: "Courriel rejeté - Erreur inconnue"
       subject_template: "[%{email_prefix}] Problème de courriel - Erreur inconnue"
@@ -2645,7 +2701,11 @@ fr:
     email_reject_reply_not_allowed:
       title: "Courriel rejeté - Réponses interdites"
       subject_template: "[%{email_prefix}] Problème de courriel -- Réponse non autorisée"
-      text_body_template: "Nous sommes désolés, mais l'envoie de courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. \n\nVous n'êtes pas autorisé à répondre au sujet. Si vous pensez qu'il s'agit d'une erreur, [contactez un responsable] (%{base_url}/about).\n"
+      text_body_template: "Nous sommes désolés, mais l'envoie de courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. \n\nVous n'êtes pas autorisé à répondre au sujet. Si vous pensez qu'il s'agit d'une erreur, [contactez un responsable](%{base_url}/about).\n"
+    email_reject_reply_to_digest:
+      title: "Courriel rejeté - Réponse au résumé"
+      subject_template: "[%{email_prefix}] Problème de courriel -- Réponse au résumé"
+      text_body_template: "Nous sommes désolés, mais l'envoie de courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. \n\nVous avez répondu à un courriel de résumé, ce qui n'est pas accepté.\n\nSi vous pensez qu'il s'agit d'une erreur, [contactez un responsable](%{base_url}/about).\n"
     email_error_notification:
       title: "Notification d'erreur courriel"
       subject_template: "[%{email_prefix}] Problème de courriel -- Erreur d'authentification POP3"
@@ -2673,7 +2733,7 @@ fr:
     ignored_users_summary:
       title: "Un utilisateur ignoré a dépassé le seuil"
       subject_template: "Un utilisateur a été ignoré par de nombreux utilisateurs"
-      text_body_template: "Bonjour, \n\nCeci est un message automatisé de %{site_name} pour vous informer que @ %{username} a été ignoré par les utilisateurs de %{ignores_threshold}. Cela pourrait indiquer qu'un problème se développe dans votre communauté. \n\nVous voudrez peut-être [revoir les messages récents] (%{base_url}/u/%{username}/résumé) de cet utilisateur et éventuellement d'autres utilisateurs du [rapport d'utilisateur ignoré et mis en sourdine] (%{base_url}/administrateur/reports/top_ignored_users). \n\nPour des conseils supplémentaires, veuillez vous reporter à notre [charte communautaire] (%{base_url}/charte).\n"
+      text_body_template: "Bonjour, \n\nCeci est un message automatique de %{site_name} pour vous informer que @%{username} a été ignoré par %{ignores_threshold} utilisateurs. Cela pourrait indiquer qu'un problème se développe dans votre communauté. \n\nVous voudrez peut-être [revoir les messages récents](%{base_url}/u/%{username}/summary) de cet utilisateur et éventuellement d'autres utilisateurs du [rapport d'utilisateurs ignorés et mis sous silence](%{base_url}/admin/reports/top_ignored_users). \n\nPour plus d'informations, veuillez consulter notre [charte communautaire](%{base_url}/guidelines).\n"
     too_many_spam_flags:
       title: "Trop de signalements de spam"
       subject_template: "Nouveau compte bloqué"
@@ -2725,11 +2785,11 @@ fr:
       text_body_template: |
         Ceci est un message automatique.
 
-        Le nouvel utilisateur [%{username}](%{user_url}) tente de créer de multiples messages avec des liens vers %{domains}, mais que ces messages ont été bloqués pour éviter le spam. Cet utilisateur est toujours capable de créer des messages qui ne contiennent pas de liens vers %{domains}.
+        Le nouvel utilisateur [%{username}](%{user_url}) a tenté de créer de multiples messages avec des liens vers %{domains}, mais ces messages ont été bloqués pour éviter le spam. Cet utilisateur est toujours capable de créer des messages qui ne contiennent pas de liens vers %{domains}.
 
-        Merci de [review the user](%{user_url}).
+        Veuillez [vérifier cet utilisateur](%{user_url}).
 
-        Ceci peut être modifier via les options `newuser_spam_host_threshold` et white_listed_spam_host_domains`. Songez à ajouter %{domains} à la liste blanche s'ils devraient être exemptés.
+        Ceci peut être modifié via les options `newuser_spam_host_threshold` et white_listed_spam_host_domains`. Songez à ajouter %{domains} à la liste blanche s'ils devraient être exemptés.
     unsilenced:
       title: "Mise sous silence annulée"
       subject_template: "Compte débloqué"
@@ -2755,6 +2815,12 @@ fr:
     dashboard_problems:
       title: "Problèmes du tableau de bord"
       subject_template: "Des nouveaux conseils sur votre tableau de bord"
+      text_body_template: |
+        Nous avons de nouveaux conseils et recommendations pour vous d'après vos paramètres actuels.
+
+        [Rendez-vous sur votre tableau de bord](%{base_url}/admin) pour les voir.
+
+        Si rien n'est visible sur votre tableau de bord, il est possible qu'un autre responsable ait déjà appliqué ces conseils. Une liste des actions réalisées par les responsables se trouve sur la page [Actions des responsables](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Vous êtes un nouvel utilisateur du mois !"
       subject_template: "Vous êtes un nouvel utilisateur du mois !"
@@ -2780,9 +2846,9 @@ fr:
   unsubscribe_mailing_list: |
     Vous recevez ce courriel car vous avez activé la liste de diffusion.
 
-    Pour se désabonner de ces courriels, [cliquer ici](%{unsubscribe_url}).
+    Pour se désabonner de ces courriels, [cliquez ici](%{unsubscribe_url}).
   subject_re: "Re :"
-  subject_pm: "[MP]"
+  subject_pm: "[MD]"
   email_from: "%{user_name} via %{site_name}"
   user_notifications:
     previous_discussion: "Réponses précédentes"
@@ -2801,6 +2867,20 @@ fr:
     visit_link_to_respond_pm: "[Voir le message](%{base_url}%{url}) pour répondre à %{participants}."
     posted_by: "Redigé par %{username} le %{post_date}"
     pm_participants: "Participants : %{participants}"
+    invited_group_to_private_message_body: |
+      %{username} a invité @%{group_name} à un message
+
+      > **[%{topic_title}](%{topic_url})**
+      >
+      > %{topic_excerpt}
+
+      sur
+
+      > %{site_title} -- %{site_description}
+
+      Pour rejoindre la discussion, cliquez le lien ci-dessous :
+
+      %{topic_url}
     invited_to_private_message_body: |
       %{username} vous invite à un message
 
@@ -2808,29 +2888,30 @@ fr:
       >
       > %{topic_excerpt}
 
-      à
+      sur
 
-      > %{site_title} - %{site_description}
+      > %{site_title} -- %{site_description}
 
-      Pour joindre le message, cliquer le lien ci-dessous :
+      Pour rejoindre la discussion, cliquez le lien ci-dessous :
 
       %{topic_url}
     invited_to_topic_body: |
       %{username} vous invite à une discussion
+
       > **[%{topic_title}](%{topic_url})**
       >
       > %{topic_excerpt}
 
-      à
+      sur
 
-      > %{site_title} - %{site_description}
+      > %{site_title} -- %{site_description}
 
-      Pour rejoindre la discussion, cliquer le lien ci-dessous :
+      Pour rejoindre la discussion, cliquez le lien ci-dessous :
 
       %{topic_url}
     user_invited_to_private_message_pm_group:
-      title: "Utilisateur a invité groupe au MD"
-      subject_template: "[%{email_prefix}] %{username} a invité @%{group_name} dans la conversation « %{topic_title} »"
+      title: "Groupe invité au MD par un utilisateur"
+      subject_template: "[%{email_prefix}] %{username} a invité @%{group_name} dans la conversation « %{topic_title} »"
       text_body_template: |
         %{header_instructions}
 
@@ -2839,7 +2920,7 @@ fr:
         %{respond_instructions}
     user_invited_to_private_message_pm:
       title: "Utilisateur invité au MD"
-      subject_template: "[%{email_prefix}] %{username} vous a invité dans la conversation « %{topic_title} »"
+      subject_template: "[%{email_prefix}] %{username} vous a invité dans la conversation « %{topic_title} »"
       text_body_template: |
         %{header_instructions}
 
@@ -2848,7 +2929,7 @@ fr:
         %{respond_instructions}
     user_invited_to_private_message_pm_staged:
       title: "Utilisateur distant invité au MD"
-      subject_template: "[%{email_prefix}] %{username} vous a invité dans la conversation « %{topic_title} »"
+      subject_template: "[%{email_prefix}] %{username} vous a invité dans la conversation « %{topic_title} »"
       text_body_template: |
         %{header_instructions}
 
@@ -2857,9 +2938,8 @@ fr:
         %{respond_instructions}
     user_invited_to_topic:
       title: "Utilisateur invité au sujet"
-      subject_template: "[%{email_prefix}] %{username} vous a invité dans « %{topic_title} »"
-      text_body_template: |2
-
+      subject_template: "[%{email_prefix}] %{username} vous a invité dans « %{topic_title} »"
+      text_body_template: |
         %{header_instructions}
 
         %{message}
@@ -2954,7 +3034,7 @@ fr:
 
         %{respond_instructions}
     user_watching_first_post:
-      title: "Utilisateur surveille premier message"
+      title: "Utilisateur surveille le premier message"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3018,12 +3098,13 @@ fr:
 
         Si vous n'avez pas choisi de désactiver l'authentification à deux facteurs, il se peut que quelqu'un ait compromis votre compte.
 
-        Si vous avez des questions,[contactez notre personnel amical](%{base_url}/about).
+        Si vous avez des questions, [contactez notre équipe](%{base_url}/about).
     digest:
       why: "Voici un bref résumé de ce qu'il s'est passé sur %{site_link} depuis votre dernière visite le %{last_seen_at}"
       since_last_visit: "Depuis votre dernière visite"
       new_topics: "Nouveaux sujets"
       unread_notifications: "Notifications non lues"
+      unread_high_priority: "Notifications prioritaires non lues"
       liked_received: "J'aime reçus"
       new_users: "Nouveaux utilisateurs"
       popular_topics: "Sujets populaires"
@@ -3052,18 +3133,18 @@ fr:
       title: "Se connecter avec un lien"
       subject_template: "[%{email_prefix}] Se connecter avec un lien"
       text_body_template: |
-        Voilà votre lien pour vous connecter à [%{site_name}](%{base_url}).
+        Voici votre lien pour vous connecter à [%{site_name}](%{base_url}).
 
-        Si vous n'en avez pas fait la demande, vous pouvez ignorer sans crainte ce courriel.
+        Si vous n'en avez pas fait la demande, vous pouvez ignorer ce courriel.
 
-        Sinon, cliquer sur le lien suivant pour vous connecter :
+        Sinon, cliquez sur le lien suivant pour vous connecter :
 
         %{base_url}/session/email-login/%{email_token}
     set_password:
       title: "Définir le mot de passe"
       subject_template: "[%{email_prefix}] Définir le mot de passe"
       text_body_template: |
-        Quelqu'un a demandé un mot de passe pour votre compte sur [%{site_name}](%{base_url}). Vous pouvez vous identifier en utilisant un service en ligne pris en charge (Google, Facebook, etc...) qui est associé avec cette adresse courriel.
+        Quelqu'un a demandé un mot de passe pour votre compte sur [%{site_name}](%{base_url}). Vous pouvez vous identifier en utilisant un service en ligne pris en charge (Google, Facebook, etc.) qui est associé avec cette adresse courriel.
 
         Si vous n'avez pas fait cette demande, vous pouvez ignorer ce courriel.
 
@@ -3071,11 +3152,19 @@ fr:
 
         %{base_url}/u/password-reset/%{email_token}
     admin_login:
-      title: "Identifiant Administrateur"
-      subject_template: "[%{email_prefix}] Identification"
+      title: "Connexion administrateur"
+      subject_template: "[%{email_prefix}] Connexion"
+      text_body_template: |
+        Quelqu'un a demandé à se connecter sur votre compte sur [%{site_name}](%{base_url}).
+
+        Si vous n'avez pas fait cette demande, vous pouvez ignorer ce courriel.
+
+        Cliquez sur le lien ci-dessous pour vous connecter :
+
+        %{base_url}/session/email-login/%{email_token}
     account_created:
       title: "Compte créé"
-      subject_template: "[%{email_prefix}] Votre Nouveau Compte"
+      subject_template: "[%{email_prefix}] Votre nouveau compte"
       text_body_template: |
         Un nouveau compte a été créé pour vous sur %{site_name}
 
@@ -3085,13 +3174,17 @@ fr:
     confirm_new_email:
       title: "Confirmer votre nouvelle adresse courriel"
       subject_template: "[%{email_prefix}] Confirmez votre nouvelle adresse courriel"
+      text_body_template: |
+        Confirmez votre nouvelle adresse courriel pour %{site_name} en cliquant sur le lien suivant :
+
+        %{base_url}/u/confirm-new-email/%{email_token}
     confirm_old_email:
       title: "Confirmez votre ancienne adresse courriel"
       subject_template: "[%{email_prefix}] Confirmez votre adresse courriel actuelle"
       text_body_template: |
-        Avant de pouvoir modifier votre adresse courriel, nous avons besoin de vous pour confirmer que vous contrôlez bien ce compte de messagerie. Une fois cette étape terminée, nous vous demanderons de confirmer la nouvelle adresse e-mail.
+        Avant de pouvoir modifier votre adresse courriel, nous avons besoin de confirmer que vous contrôlez bien ce compte de messagerie. Une fois cette étape terminée, nous vous demanderons de confirmer la nouvelle adresse courriel.
 
-        Merci de confirmer votre adresse courriel actuelle pour %{site_name} en cliquant sur le lien suivant:
+        Confirmez votre adresse courriel actuelle pour %{site_name} en cliquant sur le lien suivant:
 
         %{base_url}/u/confirm-old-email/%{email_token}
     notify_old_email:
@@ -3113,11 +3206,11 @@ fr:
 
         Un responsable a approuvé votre compte sur %{site_name}.
 
-        Cliquez sur le lien suivant pour accèder à votre nouveau compte :
+        Cliquez sur le lien suivant pour accéder à votre nouveau compte :
 
         %{base_url}
 
-        Si le lien ci-dessus n'est pas cliquable, essayez de le copier/coller dans la barre d'adresse de votre navigateur internet.
+        Si le lien ci-dessus n'est pas cliquable, essayez de le copier-coller dans la barre d'adresse de votre navigateur internet.
 
         %{new_user_tips}
 
@@ -3130,37 +3223,39 @@ fr:
       text_body_template: |
         Bienvenue sur %{site_name} !
 
-        Merci de cliquer sur le lien ci-dessous pour confirmer et activer votre compte :
+        Cliquez sur le lien ci-dessous pour confirmer et activer votre compte :
         %{base_url}/u/activate-account/%{email_token}
 
-        Si le lien n'est pas clickable, essayez de le copier/coller dans la barre d'adresse de votre navigateur.
+        Si le lien n'est pas cliquable, essayez de le copier-coller dans la barre d'adresse de votre navigateur.
     activation_reminder:
       title: "Rappel d'activation"
       subject_template: "[%{email_prefix}] Rappel pour activer votre compte"
       text_body_template: |
         Bienvenue sur %{site_name} !
 
-        Ceci est un rappel qu'il faudrait activer votre compte.
+        Ceci est un rappel pour activer votre compte.
 
-        Merci de cliquer sur le lien ci-dessous pour confirmer et activer votre compte :
+        Cliquez sur le lien ci-dessous pour confirmer et activer votre compte :
         %{base_url}/u/activate-account/%{email_token}
 
-        Si le lien n'est pas clickable, essayez de le copier/coller dans la barre d'adresse de votre navigateur.
+        Si le lien n'est pas cliquable, essayez de le copier-coller dans la barre d'adresse de votre navigateur.
     suspicious_login:
-      title: "Notification nouvelle connexion"
+      title: "Notification de nouvelle connexion"
       subject_template: "[%{site_name}] Nouvelle connexion depuis %{location}"
       text_body_template: |
         Bonjour,
 
-        Nous avons remarqué une connexion depuis un lieu ou appareil que vous n'utilisez pas habituellement. Etait-ce vous ?
+        Nous avons remarqué une connexion depuis un lieu ou appareil que vous n'utilisez pas habituellement. Était-ce vous ?
 
-         - Lieu: %{location} (%{client_ip})
-         - Navigateur: %{browser}
-         - Appareil: %{device} – %{os}
+         - Lieu : %{location} (%{client_ip})
+         - Navigateur : %{browser}
+         - Appareil : %{device} – %{os}
 
         Si c'était effectivement vous, il n'y a rien besoin de faire.
 
-        Si ce n'était pas vous, merci de [revoir vos connexions actuelles](%{base_url}/my/preferences/account), et songez à modifier votre mot de passe.
+        Si ce n'était pas vous, merci de [revoir vos connexions récentes](%{base_url}/my/preferences/account) et songez à modifier votre mot de passe.
+  page_forbidden:
+    title: "Oups ! Cette page est privée."
   page_not_found:
     title: "Oups ! Cette page n'existe pas ou est privée."
     popular_topics: "Populaires"
@@ -3172,21 +3267,20 @@ fr:
     title: "Impossible de charger l'application"
     offline_page_message: "Il semble que vous n'êtes pas connectés à Internet ! Veuillez vérifier votre connexion réseau puis réessayez."
   login_required:
-    welcome_message: |2
-
+    welcome_message: |
       ## [Bienvenue sur %{title}](#welcome)
 
       Un compte est nécessaire. Veuillez en créer un ou connectez-vous pour continuer.
     welcome_message_invite_only: |
-      # [Bienvenue sur %{title}](#welcome)
+      ## [Bienvenue sur %{title}](#welcome)
       Un compte est nécessaire. Veuillez demander une invitation à un membre ou connectez-vous pour continuer.
   deleted: "supprimé"
   image: "image"
   upload:
     edit_reason: "téléchargement d'une copie locale des images distantes"
-    unauthorized: "Désolé, le fichier que vous essayer d'envoyer n'est pas autorisé (extensions autorisés : %{authorized_extensions})."
+    unauthorized: "Désolé, le fichier que vous essayer d'envoyer n'est pas autorisé (extensions autorisées : %{authorized_extensions})."
     pasted_image_filename: "Image collée"
-    store_failure: "Erreur lors du stockage de #%{upload_id} pour l'utilisateur #%{user_id}."
+    store_failure: "Erreur lors du stockage du fichier #%{upload_id} pour l'utilisateur #%{user_id}."
     file_missing: "Désolé, il faut fournir un fichier à envoyer."
     empty: "Désolé, mais le fichier que vous avez fourni est vide."
     png_to_jpg_conversion_failure_message: "Une erreur est survenue lors de la conversion de PNG en JPG."
@@ -3194,15 +3288,16 @@ fr:
     attachments:
       too_large: "Désolé, le fichier que vous essayez d'envoyer est trop gros (taille maximale de %{max_size_kb} Ko)."
     images:
-      too_large: "Désolé, l'image que vous essayez d'envoyer est trop grande (taille maximale de %{max_size_kb} Ko), veuillez la redimensionner puis réessayez."
-      larger_than_x_megapixels: "Désolé, l'image que vous essayez d'envoyer est trop grande (la dimension maximale est de %{max_image_megapixels} mégapixels) ; veuillez la redimensionner et réessayer."
+      too_large: "Désolé, l'image que vous essayez d'envoyer est trop grande (taille maximale de %{max_size_kb} Ko) ; veuillez la redimensionner puis réessayez."
+      larger_than_x_megapixels: "Désolé, l'image que vous essayez d'envoyer est trop grande (la dimension maximale est de %{max_image_megapixels} mégapixels) ; veuillez la redimensionner puis réessayez."
       size_not_found: "Désolé, mais nous n'avons pas pu déterminer la taille de votre image. Peut-être est-elle corrompue ?"
     placeholders:
       too_large: "(image plus large que %{max_size_kb} Ko)"
   avatar:
-    missing: "Désolé, nous ne parvenons pas à trouver un avatar associé à cette adresse courriel. Pouvez-vous essayer de la télécharger à nouveau ?"
+    missing: "Désolé, nous ne parvenons pas à trouver un avatar associé à cette adresse courriel. Pouvez-vous essayer de l'envoyer à nouveau ?"
   flag_reason:
     sockpuppet: "Un nouvel utilisateur a créé un sujet et un autre nouvel utilisateur avec la même adresse IP (%{ip_address}) a répondu. Voir le paramètre <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
+    spam_hosts: "Ce nouvel utilisateur a tenté de créer plusieurs messages avec des liens vers le même domaine. Tous les messages de cet utilisateur qui contiennent des liens doivent être vérifiés. Voir le paramètre <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 dépassé"
     exceeded_bounces_limit: "bounce_score_threshold dépassé"
@@ -3215,10 +3310,11 @@ fr:
     user_email_notification_already_read: "La notification de ce courriel a déjà été lue"
     user_email_notification_topic_nil: "post.topic vaut nil"
     user_email_post_user_deleted: "L'auteur du message a été supprimé."
-    user_email_post_deleted: "le message a été supprimé son auteur"
+    user_email_post_deleted: "le message a été supprimé par son auteur"
     user_email_user_suspended: "l'utilisateur a été suspendu"
     user_email_already_read: "l'utilisateur a déjà lu ce message"
     user_email_access_denied: "l'utilisateur n'est pas autorisé à voir ce message"
+    user_email_no_email: "Aucun courriel n'est associé à l'ID utilisateur %{user_id}"
     sender_message_blank: "le message est vide"
     sender_message_to_blank: "message.to est vide"
     sender_text_part_body_blank: "text_part.body est vide"
@@ -3249,7 +3345,7 @@ fr:
   csv_export:
     boolean_yes: "Oui"
     boolean_no: "Non"
-    rate_limit_error: "Les messages peuvent être téléchargés une fois par jour, veuillez ressayer demain."
+    rate_limit_error: "Les messages peuvent être téléchargés une fois par jour, veuillez réessayer demain."
   static_topic_first_reply: |
     Modifiez le premier message de ce sujet pour changer le contenu de la page %{page_name}.
   guidelines_topic:
@@ -3623,13 +3719,16 @@ fr:
 
       Si nous décidons de changer notre politique de confidentialité, nous afficherons ces modifications sur cette page. Ce document est soumis à la licence creative commons CC-BY-SA. Il a été mis à jour le 31 mai 2013.
   badges:
+    mass_award:
+      errors:
+        invalid_csv: "Une erreur s'est produite à la ligne %{line_number}. Veuillez confirmer que le fichier CSV contient une adresse courriel par ligne."
     editor:
       name: Éditeur
       description: Première modification d'un message
       long_description: |
-        Ce badge est accordé après la première modification d'un de vos messages. Bien que la possibilité d'éditer un message soit limitée dans le temps, l'édition est toujours encouragée — vous pouvez améliorer les messages, réparer des petites erreurs, ou ajouter des éléments que vous avez oubliés lors de la rédaction. Éditer vos messages pour les rendre encore meilleurs !
+        Ce badge est accordé après la première modification d'un de vos messages. Bien que la possibilité de modifier un message soit limitée dans le temps, la modification est toujours encouragée — vous pouvez améliorer les messages, corriger des petites erreurs ou ajouter des éléments que vous avez oubliés lors de la rédaction. Modifier vos messages pour les rendre encore meilleurs !
     wiki_editor:
-      name: Éditeur Wiki
+      name: Éditeur wiki
       description: Première modification d'un wiki
       long_description: |
         Ce badge est accordé la première fois que vous modifiez un message wiki.
@@ -3637,70 +3736,62 @@ fr:
       name: Actif
       description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Accès accordé</a> à toutes les fonctions communautaires essentielles"
       long_description: |
-        Ce badge est accordé lorsque vous atteignez le niveau de confiance 1. Merci d'être resté dans le coin et d'avoir lu quelques sujets pour en apprendre plus sur notre communauté. Les restrictions "nouvel utilisateur" ont été levées, et vous avez accès aux fonctionnalités essentielles telles que la messagerie personnelle, le signalement, l'édition des wikis, et la possibilité de poster des images et de multiples liens.
+        Ce badge est accordé lorsque vous atteignez le niveau de confiance 1. Merci d'être resté sur le forum et d'avoir lu quelques sujets pour en apprendre plus sur notre communauté. Les restrictions liées au nouveaux utilisateurs ont été levées et vous avez accès aux fonctionnalités essentielles telles que la messagerie personnelle, le signalement, l'édition des wikis et la possibilité de poster plusieurs images et liens.
     member:
       name: Membre
       description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Accès accordé</a> aux invitations, aux messages de groupe et à plus de J'aime"
       long_description: |
-        Ce badge est accordé lorsque vous atteignez le niveau de confiance 2. Merci d'avoir participé durant plusieurs semaines à notre communauté. Vous pouvez désormais envoyer des invitations personnelles depuis votre page utilisateur ou un sujet, envoyer des messages groupés, et avez des J'aime supplémentaires chaque jour.
+        Ce badge est accordé lorsque vous atteignez le niveau de confiance 2. Merci d'avoir participé durant plusieurs semaines à notre communauté. Vous pouvez désormais envoyer des invitations personnelles depuis votre page utilisateur ou un sujet, envoyer des messages groupés et avez des J'aime supplémentaires à donner chaque jour.
     regular:
       name: Habitué
-      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Accès accordé</a> à la re-catégorisation, au renommage, au suivi de liens, au Wiki et à plus de J'aime"
-      long_description: |2
-
-        Ce badge est accordé lorsque vous atteignez le niveau de confiance 3. Merci d'avoir été un participant régulier à notre communauté pendant ces quelques mois, l'un de nos lecteurs les plus actifs et un contributeur sérieux à ce qui rend notre communauté si belle. Vous pouvez désormais re-catégoriser et renommer des sujets, accéder à la section privée, signaler des spams, et vous avez plein de J'aime en plus chaque jour.
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Accès accordé</a> à la re-catégorisation, au renommage, au suivi de liens, au wikis et à plus de J'aime"
+      long_description: |
+        Ce badge est accordé lorsque vous atteignez le niveau de confiance 3. Merci d'avoir été un participant régulier à notre communauté pendant ces quelques mois. Vous êtes l'un de nos lecteurs les plus actifs et un contributeur sérieux à ce qui rend notre communauté si belle. Vous pouvez désormais re-catégoriser et renommer des sujets, accéder au salon privé, signaler des spams et vous avez plein de J'aime en plus à donner chaque jour.
     leader:
       name: Meneur
       description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Accès accordé</a> à l'édition globale, l'épinglage, la fermeture, l'archivage, la séparation et la fusion de sujets, et toujours plus de J'aime"
-      long_description: |2
-
-        Ce badge est accordé lorsque vous atteignez le niveau de confiance 4. Vous êtes un meneur choisi par l'équipe dans cette communauté, et vous montrez l'exemple dans vos actions et vos mots. Vous avez la capacité de modifier tous les messages, utiliser les actions de modérations telles qu'épingler, fermer, cacher, archiver, scinder et fusionner.
+      long_description: |
+        Ce badge est accordé lorsque vous atteignez le niveau de confiance 4. Vous êtes un meneur choisi par l'équipe dans cette communauté, et vous montrez l'exemple dans vos actions et vos paroles. Vous avez la possibilité de modifier tous les messages, utiliser les actions de modérations telles qu'épingler, fermer, cacher, archiver, scinder et fusionner les sujets.
     welcome:
       name: Bienvenue
       description: A reçu un J'aime
       long_description: |
-        Ce badge est accordé lorsque vous recevez votre premier J'aime sur un de vos messages. Félicitations, vous avez écrit quelque chose que les membres de votre communauté ont trouvé intéressant, cool, ou utile !
+        Ce badge est accordé lorsque vous recevez votre premier J'aime sur un de vos messages. Félicitations, vous avez écrit quelque chose que les membres de votre communauté ont trouvé intéressant, sympa ou utile !
     autobiographer:
       name: Autobiographe
-      description: "A complété les informations de son <a href=\"%{base_uri}/my/preferences/profile\">profile</a>"
-      long_description: |2
-
-        Ce badge est accordé pour avoir complété <a href="%{base_uri}/my/preferences/profile">votre profil utilisateur</a> et au choix d'une photo de profil. En dire plus à la communauté sur vous et vos intérêts permet de la rendre plus agréable et plus connectée. Rejoignez-nous !
+      description: "A complété les informations de son <a href=\"%{base_uri}/my/preferences/profile\">profil</a>"
+      long_description: |
+        Ce badge est accordé pour avoir complété <a href="%{base_uri}/my/preferences/profile">votre profil utilisateur</a> et choisi une photo de profil. En dire plus à la communauté sur vous et vos intérêts permet de la rendre plus agréable et plus connectée. Rejoignez-nous !
     anniversary:
       name: Jubilaire
       description: "Membre actif depuis un an, avec au moins un message"
-      long_description: |2
-
-        Ce badge est accordé après avoir été membre du site pendant une année, avec au moins un message crée dans cette année. Merci d'être resté avec nous et de contribuer ainsi à notre communauté ! Nous n'aurions pas pu le faire sans vous.
+      long_description: |
+        Ce badge est accordé après avoir été membre du site pendant une année, avec au moins un message créé durant cette année. Merci d'être resté avec nous et de contribuer ainsi à notre communauté ! Nous n'aurions pas pu le faire sans vous.
     nice_post:
       name: Jolie réponse
       description: A reçu 10 J'aime sur une réponse
-      long_description: |2
-
+      long_description: |
         Ce badge est accordé quand votre réponse obtient 10 J'aime. Votre réponse a fait bonne impression sur la communauté et a aidé la conversation à progresser.
     good_post:
       name: Bonne réponse
       description: A reçu 25 J'aime sur une réponse
-      long_description: |2
-
-        Ce badge est accordé quand votre réponse obtient 25 J'aime. Votre réponse est exceptionnel et a rendu la conversation beaucoup plus intéressante !
+      long_description: |
+        Ce badge est accordé quand votre réponse obtient 25 J'aime. Votre réponse était exceptionnelle et a rendu la conversation beaucoup plus intéressante !
     great_post:
       name: Super réponse
       description: A reçu 50 J'aime sur une réponse
       long_description: |
-        Ce badge est accordé quand votre réponse obtient 50 J'aime. Votre réponse était inspirante, fascinante, hilarante, ou pertinente et la communauté l'a adorée !
+        Ce badge est accordé quand votre réponse obtient 50 J'aime. Votre réponse était inspirante, fascinante, hilarante ou pertinente et la communauté l'a adorée !
     nice_topic:
       name: Sujet intéressant
       description: A reçu 10 J'aime sur un sujet
-      long_description: |2
-
-        Ce badge est accordé quand votre sujet obtient 10 J'aime. Vous avez commencé une conversation intéressante que la communauté a apprécié !
+      long_description: |
+        Ce badge est accordé quand votre sujet obtient 10 J'aime. Vous avez commencé une conversation intéressante que la communauté a apprécié !
     good_topic:
       name: Bon sujet
       description: A reçu 25 J'aime sur un sujet
-      long_description: |2
-
-        Ce badge est accordé quand votre sujet obtient 25 J'aime. Vous avez lancé une conversation vibrante autour de laquelle la communauté s'est ralliée !
+      long_description: |
+        Ce badge est accordé quand votre sujet obtient 25 J'aime. Vous avez lancé une conversation vibrante autour de laquelle la communauté s'est ralliée !
     great_topic:
       name: Super sujet
       description: A reçu 50 J'aime sur un sujet
@@ -3709,14 +3800,13 @@ fr:
     nice_share:
       name: Partage sympa
       description: Message partagé avec 25 visiteurs uniques
-      long_description: |2
-
+      long_description: |
         Ce badge est accordé après le partage d'un lien vers un message consulté par 25 visiteurs extérieurs. Merci de faire connaître nos discussions et cette communauté.
     good_share:
       name: Bon partage
       description: Message partagé avec 300 visiteurs uniques
       long_description: |
-        Ce badge est accordé après le partage d'un lien vers un message consulté par 300 visiteurs extérieurs. Bon travail ! Vous avez diffusé une discussion intéressante à <i>beaucoup</i> de nouvelles personnes et nous avez aidés à grandir.
+        Ce badge est accordé après le partage d'un lien vers un message consulté par 300 visiteurs extérieurs. Bon travail ! Vous avez diffusé une discussion intéressante à <i>beaucoup</i> de nouvelles personnes et nous avez aidé à grandir.
     great_share:
       name: Super partage
       description: Message partagé avec 1000 visiteurs uniques
@@ -3726,22 +3816,21 @@ fr:
       name: Premier J'aime
       description: A aimé un message
       long_description: |
-        Ce badge est accordé la première fois que vous aimez un message en utilisant le bouton :heart:. Aimer des messages est le moyen parfait pour dire aux autres membres de la communauté que ce qu'ils ont posté était intéressant, utile, cool, ou amusant !
+        Ce badge est accordé la première fois que vous aimez un message en utilisant le bouton :heart:. Aimer des messages est le moyen parfait pour dire aux autres membres de la communauté que ce qu'ils ont posté était intéressant, utile, sympa ou amusant !
     first_flag:
       name: Premier signalement
       description: A signalé un message
       long_description: |
-        Ce badge est accordé la première fois que vous signalez un message. Les signalements sont essentiels à la santé de votre communauté. Si vous remarquez des messages nécessitant l'intervention d'un modérateur n'hésitez pas à les signaler. Si vous voyez un problème, :flag_black: signalez-le !
+        Ce badge est accordé la première fois que vous signalez un message. Les signalements sont essentiels à la santé de la communauté. Si vous remarquez des messages nécessitant l'intervention d'un modérateur n'hésitez pas à les signaler. Si vous voyez un problème, :flag_black: signalez-le !
     promoter:
       name: Ambassadeur
       description: A invité un utilisateur
       long_description: |
-        Ce badge est accordé quand vous invitez quelqu'un à rejoindre la communauté via le bouton d'invitation de la page utilisateur, ou à la fin d'un sujet. Inviter des amis qui peuvent être intéressé par des discussions spécifiques est un bonne manière d'introduire de nouvelles personnes dans la communauté, donc merci !
+        Ce badge est accordé quand vous invitez quelqu'un à rejoindre la communauté via le bouton d'invitation de la page utilisateur ou à la fin d'un sujet. Inviter des amis qui peuvent être intéressés par des discussions spécifiques est un bonne manière d'introduire de nouvelles personnes dans la communauté, donc merci !
     campaigner:
       name: Militant
       description: A invité 3 utilisateurs basiques
-      long_description: |2
-
+      long_description: |
         Ce badge est accordé lorsque vous avez invité 3 personnes qui ont ensuite passé assez de temps sur le site pour devenir des utilisateurs de base. Une communauté dynamique a besoin d'un apport régulier de nouveaux arrivants qui participent régulièrement et ajouter de nouvelles voix aux conversations.
     champion:
       name: Champion
@@ -3751,9 +3840,8 @@ fr:
     first_share:
       name: Premier partage
       description: A partagé un message
-      long_description: |2
-
-        Ce badge est accordé la première fois que vous partagez un lien vers une réponse ou un sujet en utilisant le bouton de partage. Partager des liens est une excellente façon de montrer des discussions intéressantes avec le reste du monde et faire croître votre communauté.
+      long_description: |
+        Ce badge est accordé la première fois que vous partagez un lien vers une réponse ou un sujet en utilisant le bouton de partage. Partager des liens est une excellente façon de montrer des discussions intéressantes avec le reste du monde et faire grandir votre communauté.
     first_link:
       name: Premier lien
       description: A ajouté un lien vers un autre sujet
@@ -3763,18 +3851,17 @@ fr:
       name: Première citation
       description: A cité un message
       long_description: |
-        Ce badge est accordé la première fois que vous citez un message dans votre réponse. Citer les sections pertinentes des messages précédents dans votre réponse permet de garder les discussions reliées entre elles et sur le sujet. La meilleure façon de citer est de mettre en évidence une section d'un message, puis appuyer sur un bouton de réponse. Citer généreusement !
+        Ce badge est accordé la première fois que vous citez un message dans votre réponse. Citer les sections pertinentes des messages précédents dans votre réponse permet de garder les discussions reliées entre elles et sur le sujet. La meilleure façon de citer est de sélectionner une section d'un message, puis appuyer sur un bouton de réponse. Citer généreusement !
     read_guidelines:
       name: Règlement lu
       description: "A lu le <a href=\"%{base_uri}/guidelines\">règlement de la communauté</a>"
-      long_description: |2
-
-        Ce badge est accordé après <a href="%{base_uri}/guidelines">lecture de la charte de la communauté</a>. Respecter et partager ces règles simples permet de construire une communauté sûre, agréable et durable. Souvenez-vous toujours qu'il y a un autre être humain, tout comme vous, de l'autre côté de cet écran. Soyez courtois !
+      long_description: |
+        Ce badge est accordé après <a href="%{base_uri}/guidelines">lecture de la charte de la communauté</a>. Respecter et partager ces règles simples permet de construire une communauté sûre, agréable et durable. Souvenez-vous toujours qu'il y a un autre être humain, tout comme vous, de l'autre côté de cet écran. Soyez courtois !
     reader:
       name: Lecteur
       description: A lu tous les messages d'un sujet contenant plus de 100 messages
       long_description: |
-        Ce badge est accordé la première fois que vous lisez un sujet avec plus de 100 réponses. Lire une conversation attentivement vous aide à suivre la discussion, comprendre différents points de vue, et conduit à des conversations plus intéressantes. Plus vous lisez, meilleure la conversation devient. Comme on aime le dire, lire est la base ! :slight_smile:
+        Ce badge est accordé la première fois que vous lisez un sujet avec plus de 100 réponses. Lire une conversation attentivement vous aide à suivre la discussion, comprendre différents points de vue et conduit à des conversations plus intéressantes. Plus vous lisez, meilleure la conversation devient. Comme on aime le dire, lire est la base ! :slight_smile:
     popular_link:
       name: Lien populaire
       description: A posté un lien externe avec au moins 50 clics
@@ -3798,8 +3885,7 @@ fr:
     respected:
       name: Respecté
       description: A reçu 2 J'aime sur 100 messages
-      long_description: |2
-
+      long_description: |
         Ce badge est accordé lorsque vous recevez au moins 2 J'aime sur 100 messages différents. La communauté a de plus en plus de respect pour vos nombreuses contributions aux conversations.
     admired:
       name: Admiré
@@ -3809,16 +3895,22 @@ fr:
     out_of_love:
       name: Trop d'amour
       description: "A utilisé %{max_likes_per_day} J'aime en une journée"
+      long_description: |
+        Ce badge est accordé lorsque vous utilisez la totalité de vos %{max_likes_per_day} J'aime quotidiens. Rappelez-vous de prendre un moment pour aimer les messages qui vous plaisent et que vous appréciez. Cela encourage les autres membres de la communauté à créer encore plus de discussions de qualité à l'avenir.
     higher_love:
       name: Amour plus fort
       description: "A utilisé %{max_likes_per_day} J'aime en un jour 5 fois"
+      long_description: |
+        Ce badge est accordé lorsque vous utilisez la totalité de vos %{max_likes_per_day} J'aime par jour pendant 5 jours. Merci de prendre le temps d'encourager activement les meilleures conversations chaque jour !
     crazy_in_love:
       name: Fou amoureux
+      description: "A utilisé %{max_likes_per_day} J'aime en un jour 20 fois"
+      long_description: |
+        Ce badge est accordé lorsque vous utilisez la totalité vos %{max_likes_per_day} J'aime par jour pendant 20 jours. Whaou ! Vous êtes un modèle d'encouragement pour les membres de la communauté !
     thank_you:
       name: "Merci "
       description: A 20 messages ayant reçu un J'aime et a donné 10 j'aime
-      long_description: |2
-
+      long_description: |
         Ce badge est accordé quand vous avez reçu 20 J'aime sur vos messages et en avez donné 10 ou plus en retour. Quand quelqu'un aime vos messages, vous trouvez le temps d'aimer ce que les autres postent à leur tour.
     gives_back:
       name: Redonne
@@ -3833,7 +3925,7 @@ fr:
       name: Premier Emoji
       description: A utilisé un emoji dans un message
       long_description: |
-        Ce badge est accordé la première fois que vous ajoutez un Emoji à votre message :thumbsup:. Les Emoji vous permettent de transmettre de l'émotion dans vos messages, du bonheur :smiley: à la tristesse :anguished: en passant par la colère :angry: et tout le reste :sunglasses:. Il suffit de taper : (deux-points) ou d'appuyer sur le bouton de la barre d'outils Emoji dans l'éditeur et de choisir parmi des centaines de choix :ok_hand:
+        Ce badge est accordé la première fois que vous ajoutez un emoji à votre message :thumbsup:. Les emojis vous permettent de transmettre de l'émotion dans vos messages, du bonheur :smiley: à la tristesse :anguished: en passant par la colère :angry: et tout le reste :sunglasses:. Il suffit de taper : (deux-points) ou d'appuyer sur le bouton de la barre d'outils Emoji dans l'éditeur et de choisir parmi des centaines de choix :ok_hand:
     first_mention:
       name: Première mention
       description: A mentionné un utilisateur dans un message
@@ -3842,9 +3934,8 @@ fr:
     first_onebox:
       name: Premier onebox
       description: A inséré un lien qui a été transformé en onebox
-      long_description: |2
-
-        Ce badge est accordé la première fois que vous publiez un lien seul sur une ligne, qui a été développé automatiquement dans un onebox avec un bref résumé, un titre, et (le cas échéant) une image.
+      long_description: |
+        Ce badge est accordé la première fois que vous publiez un lien seul sur une ligne, qui a été développé automatiquement dans un onebox avec un bref résumé, un titre et (le cas échéant) une image.
     first_reply_by_email:
       name: Première réponse par courriel
       description: A répondu à un message par courriel
@@ -3853,8 +3944,7 @@ fr:
     new_user_of_the_month:
       name: "Nouvel utilisateur du mois"
       description: Contributions remarquables durant leur premier mois
-      long_description: |2
-
+      long_description: |
         Ce badge est accordé pour féliciter deux nouveaux utilisateurs chaque mois pour leur excellente contribution mesurée par la fréquence à laquelle leurs messages reçoivent des J'aime et par qui.
     enthusiast:
       name: Passionné
@@ -3871,7 +3961,7 @@ fr:
       description: Visité 365 jours consécutifs
       long_description: |
         Ce badge est décerné pour avoir visité 365 jours consécutifs. Waouh, une année entière !
-    badge_title_metadata: "%{display_name} badge sur %{site_title}"
+    badge_title_metadata: "Badge %{display_name} sur %{site_title}"
   admin_login:
     success: "Courriel envoyé"
     errors:
@@ -3884,22 +3974,22 @@ fr:
     initial_topic_title: Rapports de performances du site
   tags:
     title: "Étiquettes"
-    staff_tag_disallowed: 'L''étiquette "%{tag}" ne peut être appliquée que par un responsable.'
-    staff_tag_remove_disallowed: 'L''étiquette "%{tag}" ne peut être retirée que par un responsable.'
+    staff_tag_disallowed: 'L''étiquette « %{tag} » ne peut être appliquée que par un responsable.'
+    staff_tag_remove_disallowed: 'L''étiquette « %{tag} » ne peut être retirée que par un responsable.'
     minimum_required_tags:
       one: "Vous devez choisir au moins %{count} étiquette."
       other: "Vous devez choisir au moins %{count} étiquettes."
     upload_row_too_long: "Le fichier CSV devrait avoir une étiquette par ligne. L'étiquette peut être suivie d'une virgule et par un nom de groupe d'étiquettes."
     forbidden:
       invalid:
-        one: "Le tag que vous avez sélectionné ne peut pas être utilisé"
-        other: "Aucune des étiquettes que vous avez sélectionnées ne peut être utilisée"
-      in_this_category: '"%{tag_name}" ne peut pas être utilisé dans cette catégorie'
+        one: "L'étiquette que vous avez sélectionnée ne peut pas être utilisée"
+        other: "Aucune des étiquettes que vous avez sélectionnées ne peut être utilisées"
+      in_this_category: 'L''étiquette « %{tag_name} » ne peut pas être utilisée dans cette catégorie'
       restricted_to:
-        one: '« %{tag_name} » est réservée à la catégorie « %{category_names} »'
-        other: '« %{tag_name} » est réservé aux catégories suivantes : %{category_names}'
-      synonym: 'Les synonymes ne sont pas autorisés. Utilisez « %{tag_name} ».'
-      has_synonyms: '« %{tag_name} » ne peut pas être utilisé car il a des synonymes.'
+        one: 'L''étiquette « %{tag_name} » est réservée à la catégorie « %{category_names} »'
+        other: 'L''étiquette « %{tag_name} » est réservée aux catégories suivantes : %{category_names}'
+      synonym: 'Les synonymes ne sont pas autorisés. Utilisez « %{tag_name} ».'
+      has_synonyms: 'L''étiquette « %{tag_name} » ne peut pas être utilisée car elle a des synonymes.'
     required_tags_from_group:
       one: "Vous devez inclure au moins %{count} étiquette du groupe %{tag_group_name}."
       other: "Vous devez inclure au moins %{count} étiquettes du groupe %{tag_group_name}."
@@ -3912,7 +4002,7 @@ fr:
       button: "Créer"
       title: "Créer un compte administrateur"
       help: "créer un nouveau compte pour commencer"
-      no_emails: "Malheureusement aucune adresse courriel d'administrateur n'a été définie lors de la configuration. Merci d'ajouter un courriel de développeur dans le fichier de configuration ou de <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>créer un compte administrateur depuis le console</a>."
+      no_emails: "Malheureusement aucune adresse courriel d'administrateur n'a été définie lors de la configuration. Veuillez ajouter un courriel de développeur dans le fichier de configuration ou <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>créez un compte administrateur depuis la console</a>."
     confirm_email:
       title: "Confirmer votre adresse courriel"
       message: "<p> Nous avons envoyé un courriel d'activation à <b>%{email}</b>. Veuillez suivre les instructions dans le courriel pour activer votre compte. </p><p> S'il n'arrive pas, vérifiez votre dossier de spam et <a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>assurez-vous de configurer correctement le courriel</a>. </p>"
@@ -3950,7 +4040,7 @@ fr:
             placeholder: "Meilleure communauté de tous les temps"
       introduction:
         title: "Introduction"
-        disabled: "<p>Nous n'avons pas trouvé de sujet avec le titre “%{topic_title}”.</p> <ul> <li>Si vous avez modifié le titre, modifier le sujet pour modifier le texte d'introduction de votre site.</li> <li>Si vous avez supprimé ce sujet, créer un nouveau sujet avec le titre “%{topic_title}” comme titre. Le contenu du premier message est le message d'introduction de votre site.</li> </ul>"
+        disabled: "<p>Nous n'avons pas trouvé de sujet avec le titre « %{topic_title} ».</p> <ul> <li>Si vous avez changé le titre, modifiez ce sujet pour personnaliser le texte d'introduction de votre site.</li> <li>Si vous avez supprimé ce sujet, créez un nouveau sujet avec le titre « %{topic_title} ». Le contenu du premier message est le message d'introduction de votre site.</li> </ul>"
         fields:
           welcome:
             label: "Sujet de bienvenue"
@@ -4049,29 +4139,29 @@ fr:
                 label: "Boîtes catégorie avec sujets"
       emoji:
         title: "Emoji"
-        description: "Quel style d'Emoji préférez-vous pour votre communauté ? Vous pouvez ajouter des Emoji supplémentaires dans Administration, Personnaliser, Emoji."
+        description: "Quel style d'emoji préférez-vous pour votre communauté ? Vous pouvez ajouter des emojis supplémentaires dans Administration, Personnaliser, Emoji."
       invites:
         title: "Inviter des responsables"
-        description: "Vous avez presque terminé ! Invitons quelques personnes pour <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>commencer des discussions</a> avec des sujets et réponses intéressantes pour faire démarrer votre communauté."
+        description: "Vous avez presque terminé ! Invitons quelques personnes pour <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>commencer des discussions</a> avec des sujets et réponses intéressantes pour lancer votre communauté."
         disabled: "Etant donné que les connexions locales sont désactivées, il n'est pas possible d'envoyer des invitations. Veuillez procéder à l'étape suivante."
       finished:
         title: "Votre Discourse est prêt !"
         description: |
-          <p>Si vous souhaitez modifier ces paramètres, <b>rejouez ce wizard à n'importe quel moment</b>, ou <a href='%{base_path}/admin' target='_blank'>rendez-vous dans la section Administration</a> ; à côté de la clef à molet dans le menu du site.</p>
+          <p>Si vous souhaitez modifier ces paramètres, <b>rejouez ce wizard à n'importe quel moment</b> ou <a href='%{base_path}/admin' target='_blank'>rendez-vous dans la section Administration</a> ; à côté de la clef à molette dans le menu du site.</p>
           <p>Amusez-vous et bonne chance pour <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>construire votre nouvelle communauté</a> !</p>
   search_logs:
     graph_title: "Nombre de recherches"
   joined: "Inscrit"
   discourse_push_notifications:
     popup:
-      mentioned: '%{username} vous a mentionné dans « %{topic} » - %{site_title}'
-      group_mentioned: '%{username} vous a mentionné dans « %{topic} » - %{site_title}'
-      quoted: '%{username} vous a cité dans « %{topic} » - %{site_title}'
-      replied: '%{username} vous a répondu dans « %{topic} » - %{site_title}'
-      posted: '%{username} a posté dans « %{topic} » - %{site_title}'
-      private_message: '%{username} vous a envoyé un message direct dans « %{topic} » - %{site_title}'
-      linked: '%{username} a créé un lien vers votre message posté dans « %{topic} » - %{site_title}'
-      watching_first_post: '%{username} a crée un nouveau sujet « %{topic} » - %{site_title}'
+      mentioned: '%{username} vous a mentionné dans « %{topic} » - %{site_title}'
+      group_mentioned: '%{username} vous a mentionné dans « %{topic} » - %{site_title}'
+      quoted: '%{username} vous a cité dans « %{topic} » - %{site_title}'
+      replied: '%{username} vous a répondu dans « %{topic} » - %{site_title}'
+      posted: '%{username} a posté dans « %{topic} » - %{site_title}'
+      private_message: '%{username} vous a envoyé un message direct dans « %{topic} » - %{site_title}'
+      linked: '%{username} a créé un lien vers votre message posté dans « %{topic} » - %{site_title}'
+      watching_first_post: '%{username} a créé un nouveau sujet « %{topic} » - %{site_title}'
       confirm_title: "Notifications activées - %{site_title}"
       confirm_body: "Les notifications ont été activées."
       custom: "Notification de %{username} sur %{site_title}"
@@ -4094,7 +4184,7 @@ fr:
       medium: "Moyenne"
       high: "Élevée"
     sensitivity:
-      disabled: "Désactivé"
+      disabled: "Désactivée"
       low: "Basse"
       medium: "Moyenne"
       high: "Élevée"
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 3522c00fc6..750d89daa2 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -411,6 +411,10 @@ he:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "בקשת חברות עבור ‎@%{group_name}‎"
+    request_accepted_pm:
+      title: "התקבלת אל ‎@%{group_name}‎"
+      body: |
+        בקשתך להיכנס אל ‎@%{group_name}‎ אושרה והתקבלת לחברות.
     view_hidden_topic_request_reason: "אבקש להצטרף לקבוצה ‚%{group_name}’, כדי שאוכל לגשת ל[נושא הזה](%{topic_url})"
   education:
     until_posts:
@@ -454,6 +458,12 @@ he:
       ניתן לערוך תגובות קודמות שלך כדי להוסיף ציטוט על ידי סימון טקסט ובחירה בכפתור שנגלה <b>ציטוט תגובה</b>.
 
       יותר קל לכולם לקרוא נושאים שיש בהם פחות תגובות עמוקות מאשר הרבה תגובות קטנות.
+    dominating_topic: |
+      ### לאפשר לזולת לקחת חלק בדיון
+
+      נושא זה בהחלט חשוב בעיניך &ndash; פרסמת בו למעלה מ־%{percent}% מהתגובות.
+
+      הדיון הזה עשוי עוד להשתפר אם יצטרפו אליו אנשים עם גישות שונות בנוסף. למה שלא להזמין אותם?
     get_a_room: |
       ### מומלץ לעודד את כולם להשתתף בדיון
 
@@ -1411,7 +1421,6 @@ he:
     crawl_images: "לקבל תמונות מכתובות מרוחקות כדי לציין את ממדי הרוחב והגובה הנכונים."
     download_remote_images_to_local: "המרת תמונות מרוחקות למקומיות על ידי הורדתן, פעולה זו מסייעת במניעת תמונות שבורות."
     download_remote_images_threshold: "שטח האחסון המזערי (באחוזים) הנדרש להורדת תמונות כדי לאחסן אותן מקומית"
-    download_remote_images_max_days_old: "לא להוריד תמונות מרוחקות עבור פוסטים שגילם עולה על n ימים."
     disabled_image_download_domains: "תמונות מרחוק לעולם לא יורדו ממתחמים (domains) אלו. "
     editing_grace_period: "למשך (n) שניות לאחר הפרסום, עריכה לא תיצור גרסה חדשה בהיסטוריית הפוסט."
     editing_grace_period_max_diff: "מספר תווים מרבי שמותר לשנות בטווח עריכת חסד, אם נערכו למעלה מהכמות הזאת יש ליצור מהדורה חדשה לפוסט (דרגות אמון 0 ו־1)"
@@ -1533,6 +1542,7 @@ he:
     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: "הפעלת מערכת העיטורים"
     enable_whispers: "אפשרו לצוות לקיים תקשורת פרטית בתוך נושאים."
@@ -3435,6 +3445,8 @@ he:
         אם זאת הייתה פעילות שלך, נהדר! לא צריך לעשות שום דבר.
 
         אם לא מדובר בפעולות מטעמך, אנא [לסקור את ההפעלות הנוכחיות שלך](%{base_url}/my/preferences/account) לצד שיקול בכובד ראש להחלפת הססמה שלך.
+  page_forbidden:
+    title: "אופס! זה עמוד פרטי."
   page_not_found:
     title: "אופס! הדף לא קיים או שהוא פרטי."
     popular_topics: "פופלארי"
@@ -3492,6 +3504,7 @@ he:
     user_email_user_suspended: "המשתמש הושעה"
     user_email_already_read: "המשתמש כבר קרא פוסט זה"
     user_email_access_denied: "למשתמש אין הרשאה לצפות בפוסט הזה"
+    user_email_no_email: "לא משויכת כתובת דוא״ל למזהה המשתמש %{user_id}"
     sender_message_blank: "ההודעה ריקה"
     sender_message_to_blank: "message.to ריק"
     sender_text_part_body_blank: "text_part.body ריק"
@@ -4297,3 +4310,5 @@ he:
     html_missing_placeholder: "תבנית ה־html חייבת לכלול %{placeholder}"
   discord:
     not_in_allowed_guild: "האימות נכשל. הגילדה ב־Discord אליה הצטרפת אינה מורשית לגשת."
+  old_keys_reminder:
+    title: "תזכורת על פרטי גישה ישנים"
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index d680197498..f8f28e3534 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -1149,7 +1149,6 @@ hy:
     crawl_images: "Ստանալ նկարներ հեռակա URL-ներից՝ ճշգրիտ լայնության և երկարության չափումները մուտքագրելու համար:"
     download_remote_images_to_local: "Դարձնել հեռակա նկարները տեղական՝ ներբեռնելով դրանք; սա կանխում է նկարների կորչելը: "
     download_remote_images_threshold: "Հեռակա նկարները տեղայնորեն ներբեռնելու համար դիսկի նվազագույն անհրաժեշտ տարածքը (տոկոսներով)"
-    download_remote_images_max_days_old: "Չներբեռնել հեռակա նկարները n օրվանից ավելի հին գրառումների համար:"
     disabled_image_download_domains: "Հեռակա նկարները երբեք չեն ներբեռնվի այս դոմեններից: Խողովակի սիմվոլով( | ) բաժանված ցանկ:"
     editing_grace_period: "Գրառումից հետո (n) վայրկյանի ընթացքում խմբագրումը գրառման պատմության մեջ նոր տարբերակ չի ստեղծի:"
     editing_grace_period_max_diff: "Խմբագրման արտոնյալ ժամկետում թույլատրված սիմվոլների փոփոխությունների առավելագույն քանակը, եթե փոփոխությունները ավելի շատ են, պահեստավորեք գրառման մեկ այլ խմբագրություն (վստահության 0 և 1-ին մակարդակ)"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 965c3ef5b3..1490a235ac 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -1325,7 +1325,6 @@ it:
     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."
     download_remote_images_threshold: "Minimo spazio disco necessario per scaricare le immagini remote in locale (in percentuale)"
-    download_remote_images_max_days_old: "Non scaricare immagini remote per messaggi che sono più vecchi di n giorni."
     disabled_image_download_domains: "Le immagini non verranno mai scaricate dai seguenti domini. Elenco delimitato dal carattere pipe |"
     editing_grace_period: "Per (n) secondi dopo la creazione del messaggio, le modifiche non saranno tracciate nella cronologia."
     editing_grace_period_max_diff: "Numero massimo di modifiche ai caratteri consentite durante la modifica del periodo di tolleranza, se più modifiche memorizzano un'altra revisione post (Livello Esperienza 0 e 1)"
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 9b137f3077..139cad6c07 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -1235,7 +1235,6 @@ ko:
     crawl_images: "제대로된 넓이와 높이를 추가하기 위해, 원격 URL로 부터 이미지를 회수해온다."
     download_remote_images_to_local: "이미지를 다운로드하면 원격 이미지를 로컬이미지로 변경. 이미지가 깨지는 것을 막을 수 있습니다."
     download_remote_images_threshold: "원격의 이미지를 로컬에 다운받기 위한 최소 디스크 공간(%)"
-    download_remote_images_max_days_old: "n일이 지난 후에는 포스트에 원격 이미지를 다운로드하지 않도록 설정"
     disabled_image_download_domains: "이 도메인을 통해서 원격 이미지를 다운로드 하지 않는다. ` | `를 구분자로 한 리스트"
     editing_grace_period: "글 작성 후, 편집해도 히스토리에 남기지 않는 시간 (단위: 초)"
     editing_grace_period_max_diff: "다른 변경 후 상점 (신뢰 레벨 0 및 1)을 더 많이 변경 한 경우 유예 기간 편집에 허용되는 최대 문자 변경 수"
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index 09ac225fad..c156a4a07f 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -1005,7 +1005,6 @@ nb_NO:
     crawl_images: "Hent bilder fra ekstern URL for å sette inn korrekt høyde og bredde."
     download_remote_images_to_local: "Konverter eksterne bilder ved å laste de ned lokalt, dette forhindrer ødelagte bilder."
     download_remote_images_threshold: "Minimum ledig diskplass for å kunne laste ned eksterne bilder (i prosent)"
-    download_remote_images_max_days_old: "Ikke last ned eksterne bilder for innlegg som er eldre enn dette antall dager."
     disabled_image_download_domains: "Eksterne bilder vil aldri bli lastet ned fra disse domenene (pipe-separert liste)."
     editing_grace_period: "(n) sekunder etter publisering vil redigering ikke opprette en ny versjon i redigeringsloggen."
     editing_grace_period_max_diff: "Maksimalt antall tegn for en endring utført i nådeperioden, hvis antallet overskrides lagres en ny revisjon av innlegget (tillitsnivå 0 og 1)"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 215a5223c4..fab96fbb1f 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -373,6 +373,10 @@ nl:
       trust_level_4: "vertrouwensniveau_4"
     request_membership_pm:
       title: "Lidmaatschapsaanvraag voor @%{group_name}"
+    request_accepted_pm:
+      title: "U bent geaccepteerd in @%{group_name}"
+      body: |
+        Uw aanvraag om toe te treden tot @%{group_name} is geaccepteerd, en u bent nu lid.
     view_hidden_topic_request_reason: "Ik wil toetreden tot de groep '%{group_name}', zodat ik toegang heb tot [dit topic](%{topic_url})"
   education:
     until_posts:
@@ -414,6 +418,12 @@ 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?
     get_a_room: |
       ### Overweeg iedereen aan de conversatie te laten deelnemen
 
@@ -1337,7 +1347,6 @@ nl:
     crawl_images: "Afbeeldingen van externe URL's ophalen om de juiste breedte- en hoogteafmetingen in te voegen"
     download_remote_images_to_local: "Externe afbeeldingen naar lokale afbeeldingen converteren door ze te downloaden; dit voorkomt beschadigde afbeeldingen."
     download_remote_images_threshold: "Minimaal vereiste schijfruimte om externe afbeeldingen lokaal te downloaden (percentage)"
-    download_remote_images_max_days_old: "Geen externe afbeeldingen downloaden voor berichten die meer dan n dagen oud zijn"
     disabled_image_download_domains: "Externe afbeeldingen zullen nooit vanaf deze domeinen worden gedownload. Pipe-gescheiden lijst."
     editing_grace_period: "De eerste (n) seconden na plaatsing van een bericht leidt bewerking ervan niet tot een nieuwe versie in de berichtgeschiedenis."
     editing_grace_period_max_diff: "Maximale aantal toegestane tekenwijzigingen in wachtperiode voor bewerken; bij meer wijzigingen een andere berichtrevisie bewaren (vertrouwensniveau 0 en 1)"
@@ -2123,7 +2132,7 @@ nl:
     omniauth_error_unknown: "Er is iets misgegaan bij het verwerken van uw aanmelding. Probeer het opnieuw."
     omniauth_confirm_title: "Aanmelden via %{provider}"
     omniauth_confirm_button: "Doorgaan"
-    authenticator_error_no_valid_email: "E-mailadressen die met %{account} zijn gekoppeld, zijn niet toegestaan. Mogelijk dient u uw account met een andere e-mailadres te configureren."
+    authenticator_error_no_valid_email: "E-mailadressen die met %{account} zijn gekoppeld, zijn niet toegestaan. Mogelijk dient u uw account met een ander e-mailadres te configureren."
     new_registrations_disabled: "Nieuwe accountregistraties zijn op dit moment niet toegestaan."
     password_too_long: "Wachtwoorden mogen maximaal 200 tekens lang zijn."
     email_too_long: "Het opgegeven e-mailadres is te lang. Postvaknamen mogen niet langer zijn dan 254 tekens, en domeinnamen niet langer dan 253 tekens."
@@ -2526,6 +2535,8 @@ nl:
     suspicious_login:
       title: "Waarschuwing voor nieuwe aanmelding"
       subject_template: "[%{site_name}] Nieuwe aanmelding vanaf %{location}"
+  page_forbidden:
+    title: "Oeps! Die pagina is privé."
   page_not_found:
     title: "Oeps! Die pagina bestaat niet of is privé."
     popular_topics: "Populair"
@@ -2571,6 +2582,7 @@ nl:
     user_email_user_suspended: "gebruiker was geschorst"
     user_email_already_read: "gebruiker heeft dit bericht al gelezen"
     user_email_access_denied: "gebruiker mag dit bericht niet zien"
+    user_email_no_email: "Geen e-mailadres gekoppeld met gebruikers-ID %{user_id}"
     sender_message_blank: "bericht is leeg"
     sender_message_to_blank: "message.to is leeg"
     sender_text_part_body_blank: "text_part.body is leeg"
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 270b608e93..1b9f8a0efa 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -1383,7 +1383,6 @@ pl_PL:
     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."
     download_remote_images_threshold: "Minimalna ilość wolnego miejsca na dysku wymagana przez funkcję pobierania zdalnych grafik (w procentach)"
-    download_remote_images_max_days_old: "Nie pobieraj zdalnych obrazów dla postów które mają więcej niż n dni."
     disabled_image_download_domains: "Zdalne grafiki z tych domen nie będą pobierane."
     editing_grace_period: "Przez (n) sekund po utworzeniu nowego wpisu jego kolejne edycje nie będą tworzyć nowych wersji w historii wpisu."
     editing_grace_period_max_diff: "Maksymalna liczba zmian znaków dozwolona w okresie karencji edycji, jeśli więcej zmieniono, zapisz kolejną wersję postu (poziom zaufania 0 i 1)"
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index a1cb8ac636..ee5fa857be 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -859,7 +859,6 @@ pt:
     crawl_images: "Recuperar imagens de URLs remotos para inserir o comprimento e largura corretos."
     download_remote_images_to_local: "Converta as imagens remotas em imagens locais transferindo-as; isto previne imagens corrompidas."
     download_remote_images_threshold: "Espaço mínimo necessário em disco para transferir imagens remotas localmente (em percentagem)"
-    download_remote_images_max_days_old: "Não transferir imagens remotas para publicações que têm mais de n dias."
     disabled_image_download_domains: "As imagens remotas nunca serão transferidas destes domínios. "
     editing_grace_period: "Por (n) segundos após publicar, a edição não irá criar uma nova versão no histórico da mensagem."
     edit_history_visible_to_public: "Permitir que todos vejam versões anteriores de uma mensagem editada. Quando desativado, apenas membros do pessoal podem ver."
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index e3964b78e1..11f2d2c2f7 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -1291,7 +1291,6 @@ pt_BR:
     crawl_images: "Recupere imagens de URLs remotas para inserir as dimensões de largura e altura corretos."
     download_remote_images_to_local: "Converta imagens remotas para imagens locais, transferindo-as; isto evita imagens quebradas."
     download_remote_images_threshold: "Espaço mínimo necessário para download das imagens ( em % )"
-    download_remote_images_max_days_old: "Não baixe fotos remotas para publicações que tem mais de n dias."
     disabled_image_download_domains: "Imagens hospedadas nestes domínios nunca serão baixadas. \nLista delimitada por |"
     editing_grace_period: "Por (n) segundos após a publicação, as edições não criarão uma nova versão ho histórico da publicação."
     editing_grace_period_max_diff: "Número máximo de alterações de caracteres permitidas no período de carência de edição, se mais alterações forem armazenadas, outra revisão de publicação (nível de confiança 0 e 1)"
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 737145ec6b..0274213569 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -818,7 +818,6 @@ ro:
     crawl_images: "Recuperează imaginile din URL-uri la distanță pentru a insera dimensiunile corecte de înălțime și lățime."
     download_remote_images_to_local: "Transformă imaginile la distanță în imagini locale descărcându-le; asta previne imaginile stricate."
     download_remote_images_threshold: "Spațiul minim necesar pentru descărcarea imaginilor la distanță pe local (în procente)"
-    download_remote_images_max_days_old: "Nu descărca imaginile de la distanță pentru postări care sunt mai vechi de n zile."
     disabled_image_download_domains: "Imaginile la distanță nu vor mai fi descărcate de pe aceste domenii. Listă delimitată de simbolul | (pipe)."
     editing_grace_period: "Pentru (n) secunde după postare, editarea nu va crea o versiune nouă în istoricul postării."
     edit_history_visible_to_public: "Permite tuturor să vadă versiunile precedente ale unei postări editate. Când e dezactivat, ele pot fi văzute doar de membrii echipei."
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 34f4f369b2..05d647e7f9 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -182,6 +182,7 @@ ru:
       s3_bucket_reused: "Нельзя использовать одно и то же bucket для 's3_upload_bucket' и 's3_backup_bucket'. Выберите другое bucket или используйте другой путь для каждого bucket."
       secure_media_requirements: "Перед включением безопасного носителя необходимо включить загрузку S3."
       second_factor_cannot_be_enforced_with_disabled_local_login: "Вы не можете применить 2FA, если локальные учетные записи отключены."
+      local_login_cannot_be_disabled_if_second_factor_enforced: "Вы не можете отключить локальный вход в систему, если применяется 2FA. Отключите принудительное 2FA перед отключением локальных входов."
     conflicting_google_user_id: 'Идентификатор учетной записи Google для этой учетной записи изменился; вмешательство персонала требуется по соображениям безопасности. Пожалуйста, свяжитесь с персоналом и укажите <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   activemodel:
     errors:
@@ -403,6 +404,10 @@ ru:
       trust_level_4: "уровень доверия 4"
     request_membership_pm:
       title: "Запрос на участие в группе %{group_name}"
+    request_accepted_pm:
+      title: "Вы были зачислены в группу @%{group_name}"
+      body: |
+        Ваш запрос на зачисление в группу @%{group_name} принят, теперь вы состоите в этой группе.
     view_hidden_topic_request_reason: "Я хочу присоединиться к группе '%{group_name}', чтобы я мог получить доступ к [this topic](%{topic_url})"
   education:
     until_posts:
@@ -1329,7 +1334,6 @@ ru:
     crawl_images: "Скачивать картинки с других сайтов для автоматического определения их размеров."
     download_remote_images_to_local: "Скачивать картинки, вставленные в сообщения ссылками на другие сайты, и хранить их локально, чтобы предотвратить их изменения или утерю."
     download_remote_images_threshold: "Минимальное доступное место на диске (в процентах), при котором разрешено автоматическое скачивание картинок для локального хранения."
-    download_remote_images_max_days_old: "Не загружайте удаленные изображения для сообщений, которые старше n дней."
     disabled_image_download_domains: "Список доменов, разделенный знаком \"|\", в которых не нужно скачивать картинки."
     editing_grace_period: "Количество секунд после отправки соощения, в течении которых правка сообщения не будет записываться в историю правок."
     editing_grace_period_max_diff: "Максимальное количество изменений символов, разрешенных в льготном периоде редактирования, если больше изменений сохранит другую редакцию поста (уровень доверия 0 и 1)"
@@ -2383,6 +2387,8 @@ ru:
         Если это были вы, отлично! Вам не нужно ничего делать.
 
         Если это были не вы, пожалуйста [проверьте список ваших устройств](%{base_url}/my/preferences/account) и смените пароль.
+  page_forbidden:
+    title: "Ой! Вы не можете просмотреть эту страницу."
   page_not_found:
     title: "Ой! Эта страница не существует или скрыта от публичного просмотра."
     popular_topics: "Популярные"
@@ -2434,6 +2440,7 @@ ru:
     user_email_user_suspended: "пользователь был приостановлен"
     user_email_already_read: "пользователь уже прочитал это сообщение"
     user_email_access_denied: "пользователь не может видеть этот пост"
+    user_email_no_email: "С пользовательским ID %{user_id} не связан ни один email"
     sender_message_blank: "пустое сообщение"
     sender_message_to_blank: "Адрес получателя пусто"
     sender_text_part_body_blank: "Текстовая часть сообщения письма пуста"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 23b8825601..1b21697954 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -373,6 +373,10 @@ sv:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "Begäran om medlemskap i @%{group_name}"
+    request_accepted_pm:
+      title: "Du har blivit accepterad in i @%{group_name}"
+      body: |
+        Din begäran om tillträde i @%{group_name} har blivit accepterad och du är nu medlem.
     view_hidden_topic_request_reason: "Jag skulle vilja gå med i gruppen '%{group_name}', så att jag kan gå till [detta ämne](%{topic_url})"
   education:
     until_posts:
@@ -414,6 +418,12 @@ 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 konversationen
+
+      Detta ämne är uppenbarligen viktigt för dig &ndash; du har postat mer än %{percent}% av alla svar här.
+
+      Det vore bättre om du ger andra personer utrymme att dela deras synpunkter också. Kanske kan du bjuda in dem?
     get_a_room: |
       ### Uppmuntra alla att delta i konversationen
 
@@ -1317,7 +1327,6 @@ sv:
     crawl_images: "Hämta bilder från tredjepartskällor för att infoga korrekta bredd- och höjddimensioner. "
     download_remote_images_to_local: "Konvertera externa bilder till lokala bilder genom att ladda hem dem; det motverkar felaktiga bildlänkar."
     download_remote_images_threshold: "Minimalt diskutrymme nödvändigt för att hämta hem externa bilder lokalt (i procent)"
-    download_remote_images_max_days_old: "Ladda inte ner externa bilder från inlägg som är mer än n dagar gamla. "
     disabled_image_download_domains: "Externa bilder kommer aldrig att hämtas hem från dessa domän. Pipe-avgränsad lista."
     editing_grace_period: "I (n) sekunder efter inlägg kommer redigeringar inte att skapa nya versioner i inläggshistoriken."
     editing_grace_period_max_diff: "Uppnått maximalt antal teckenförändringar tillåtna för redigering under prövotid, om fler ändras spara dessa i en annan inläggsrevision (förtroendenivå 0 och 1)"
@@ -1439,6 +1448,7 @@ sv:
     moderators_view_emails: "Tillåt moderatorer att visa användares e-post"
     prioritize_username_in_ux: "Använd användarnamn först på användarsidan, användarkortet och inlägg (när inaktiverad så visas namnet först)"
     enable_rich_text_paste: "Aktivera automatisk HTML vid Markdown-konvertering när du klistrar in text i kompositören. (Experimentell)"
+    send_old_credential_reminder_days: "Påminn om gamla behörigheter efter dag"
     email_token_valid_hours: "Glömt lösenord / aktivera konto länkar är giltiga i (n) timmar."
     enable_badges: "Aktivera utmärkelsesystemet"
     enable_whispers: "Tiliåt privat kommunikation inom ämnena."
@@ -3102,6 +3112,8 @@ sv:
       title: "Ny inloggningsvarning"
       subject_template: "[%{site_name}]  Ny inloggning från %{location}"
       text_body_template: "Hej, \n\nVi noterade en inloggning från en enhet eller plats som du vanligtvis inte använder. Var det du?\n\n- Plats: %{location} (%{client_ip})\n- Webbläsare: %{browser}\n- Enhet: %{device} – %{os}\n\nOm det var du, toppen! Du behöver inte göra något mer. \n\nOm det inte var du, vänligen [granska dina existerande sessioner](%{base_url}/my/preferences/account) samt överväg att ändra ditt lösenord.\n"
+  page_forbidden:
+    title: "Hoppsan! Den sidan är privat."
   page_not_found:
     title: "Hoppsan! Den sidan finns inte eller så är den privat."
     popular_topics: "Populära"
@@ -3159,6 +3171,7 @@ sv:
     user_email_user_suspended: "användare blev avstängd"
     user_email_already_read: "användaren har redan läst det här inlägget"
     user_email_access_denied: "användare är inte tillåten att se detta inlägg"
+    user_email_no_email: "Ingen e-post är associerad för användar-id %{user_id}"
     sender_message_blank: "meddelande är tomt"
     sender_message_to_blank: "message.to är tomt"
     sender_text_part_body_blank: "text_part.body är tomt"
@@ -3847,3 +3860,6 @@ sv:
     html_missing_placeholder: "Html-mallen måste inkludera %{placeholder}"
   discord:
     not_in_allowed_guild: "Autentisering misslyckades. Du är inte medlem i ett tillåtet Discord sällskap. "
+  old_keys_reminder:
+    title: "Påminnelse gällande gamla behörigheter"
+    body: "Hejsan! Detta är en årlig säkerhetspåminnelse från din Discourse-instans.\n  \nAv artighet vill vi upplysa dig om att följande behörighet som används för din Discourse-instans inte har uppdaterats under de senaste 2 åren:\n\n%{keys}\n\nIngen åtgärd är nödvändig i nuläget, däremot anses det som god praxis ur säkerhetssynpunkt att ändra alla dina viktiga behörigheter med tiden.\n"
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
index 568a7d9d54..2909a401d5 100644
--- a/config/locales/server.sw.yml
+++ b/config/locales/server.sw.yml
@@ -774,7 +774,6 @@ sw:
     educate_until_posts: "Mtumiaji akianza kuandika machapisho mapya (n), onyesha paneli ya ufundishaji kwenye sehemu ya kuandika maneno."
     title: "jina kwenye tovuti, kama linalotumika kwenye kichwa cha lebo."
     site_description: "Elezea tovuti hii kwenye sentensi moja, kama ilivyo kwenye maelezo ya lebo ya meta"
-    download_remote_images_max_days_old: "Usipakue picha kutoka ufikivu kutoka mbali kwa ajili ya machapisho ambayo ni zaidi ya siku n."
     editing_grace_period: "Kwa sekundi (n) baada ya kuchapisha, uhariri hautatengeneza nakala mpya kwenye historia ya chapisho."
     staff_edit_locks_post: "Machapisho hayataweza kufanyiwa uhariri kama yakihaririwa na wafanyakazi"
     edit_history_visible_to_public: "Ruhusu kila mtu aone matoleo ya kabla ya chapisho lililofanyiwa uhariri. Ikisitishwa, wasaidizi tu wataweza kuona."
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index a6ea45a2e5..0a6f4f2b2c 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -1309,7 +1309,6 @@ tr_TR:
     crawl_images: "Doğru genişlik ve yükseklik boyutlarını girmek için uzak URL'lerdeki resimlerin birer kopyasını alınsın."
     download_remote_images_to_local: "Uzaktaki resimler yerel resimlere çevirmek için indirilsin; bu ayar resim bağlantılarının kırılmasını önleyecektir"
     download_remote_images_threshold: "Uzaktaki resimlerin yerele indirilmesi için gereken en az disk alanı (yüzdesel)"
-    download_remote_images_max_days_old: "n günden daha eski gönderiler için uzak adresteki resimleri indirme."
     disabled_image_download_domains: "Bu alan adlarından hiç bir zaman uzaktan resim indirme. Sınırlandırılmış liste."
     editing_grace_period: "Gönderi oluşturulduktan (n) saniye içerisinde bir düzenleme yapıldığında, gönderi geçmişinde yeni bir sürüm oluşturma."
     editing_grace_period_max_diff: "Yetkisiz kullanım süresinin düzenlenmesinde izin verilen maksimum karakter değişikliği sayısı, daha fazla değişiklik başka bir gönderi düzeltmesi saklar (güven düzeyi 0 ve 1)"
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index f9b8d304c0..810f57f20a 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -1351,7 +1351,6 @@ uk:
     crawl_images: "Отримувати зображення з віддалених адрес, щоб встановити правильні розміри ширини та висоти."
     download_remote_images_to_local: "Завантажувати картинки, вставлені в повідомлення посиланнями на інші сайти, і зберігати їх локально, щоб запобігти їх зміни або втрату."
     download_remote_images_threshold: "Мінімальне доступне місце на диску (у відсотках), при якому дозволено автоматичне скачування картинок для локального зберігання."
-    download_remote_images_max_days_old: "Не завантажувати віддалені зображення для повідомлень, які старше n днів."
     disabled_image_download_domains: "Список доменів, розділений знаком \"|\", в яких не потрібно завантажувати картинки."
     editing_grace_period: "Кількість секунд після відправки соощенія, в перебігу яких правка повідомлення не буде записуватися в історії редагувань."
     editing_grace_period_max_diff: "Максимальна кількість змін символів, дозволених в пільговому періоді редагування, якщо більше змін збереже іншу редакцію поста (рівень довіри 0 і 1)"
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index f649990899..eadee2ddf4 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -1249,7 +1249,6 @@ ur:
     crawl_images: "صحیح چوڑائی اور اونچائی والے طول و عرض داخل کرنے کیلئے ریمَوٹ URL سے تصاویر حاصل کریں۔"
     download_remote_images_to_local: "ڈاؤن لوڈ کرکے ریمَوٹ تصاویر کو مقامی تصاویر میں تبدیل کریں؛ اِس طرح سے ٹوٹی ہوئی تصاویر کو روکا جا سکتا ہے۔"
     download_remote_images_threshold: "مقامی طور پر ریمَوٹ تصاویر کو ڈاؤن لَوڈ کرنے کیلئے ڈِسک میں کم از کم جگہ (فیصد میں)"
-    download_remote_images_max_days_old: "اُن پوسٹس کیلئے ریمَوٹ تصاویر ڈاؤن لوڈ نہ کریں جو ن دنوں سے زیادہ پرانی ہوں۔"
     disabled_image_download_domains: "ریمَوٹ تصاویر اِن ڈومینز سے کبھی ڈاؤن لوڈ نہیں ہوں گی۔ پائپ کے ساتھ الگ کی گئی فہرست۔"
     editing_grace_period: "پوسٹنگ کے بعد (ن) سیکنڈ تک، نئی ترمیم پوسٹ کی ہسٹری میں ایک نیا ورژن نہیں بنائے گا۔"
     editing_grace_period_max_diff: "ترمیم کی رعایتی مدت کے دوران حروف تبدیلیوں کی زیادہ سے زیادہ تعداد، اگر اِس سے زیادہ تبدیل کیے جائیں تو ایک اور پوسٹ رَوِیژن سٹور کریں (ٹرسٹ لَیول 0 اور 1)"
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index ec6341374f..789509557b 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -45,6 +45,7 @@ zh_CN:
       unrecognized_extension: "无法识别的文件扩展名：%{extension}"
     import_error:
       generic: 导入该主题时发生错误
+      about_json: "导入错误：about.json不存在或无效。你确定这是一个Discourse主题码？"
       about_json_values: "about.json 包含无效值：%{errors}"
       modifier_values: "about.json 的修改包含无效值：%{errors}"
       git: "克隆 git 储存库时出错，访问被拒绝或找不到存储库"
@@ -353,6 +354,10 @@ zh_CN:
       trust_level_4: "信任等级4"
     request_membership_pm:
       title: "%{group_name}的成员请求"
+    request_accepted_pm:
+      title: "你已接受加入@%{group_name}"
+      body: |
+        你要加入@%{group_name}的请求已被允许，现在你是其中一员了。
     view_hidden_topic_request_reason: "我希望加入群组 “%{group_name}” 以访问[此主题](%{topic_url})"
   education:
     until_posts:
@@ -393,6 +398,12 @@ zh_CN:
       你可以在你的回复中添加引用。只要选择你想引用的文字，然后点击随后出现的<b>引用回复</b>按钮。
 
       这样其它人会更容易地看一个长的回复，而不是多个分开的回复。
+    dominating_topic: |
+      ### 让其他人也加入到讨论中
+
+      显然这个主题对你很重要 &ndash；但所有回复中你的发言占比超过%{percent}%
+
+      留一点空间给其他人分享他们自己的见解会更好。你能邀请他们吗？
     get_a_room: |
       ### 鼓励大家参与讨论
 
@@ -1289,7 +1300,6 @@ zh_CN:
     crawl_images: "允许从第三方 URL 获取图片来插入宽、高数值"
     download_remote_images_to_local: "通过下载将远程图像转换为本地图像；此选项可避免图像损坏。"
     download_remote_images_threshold: "下载远程图像到本地所需的最小硬盘空间（百分比）"
-    download_remote_images_max_days_old: "不下载超过 n 天的帖子中的远程图片。"
     disabled_image_download_domains: "域名列表，链接到这些站点的图片不会被下载。用 | 分割。"
     editing_grace_period: "在 (n) 秒之内，对帖子的编辑不生成帖子历史。"
     editing_grace_period_max_diff: "编辑宽限期允许的最大字符更改数，如果更改存储后的另一个修订版（信任级别0和1）"
@@ -1307,6 +1317,7 @@ zh_CN:
     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 帖子的最大字符长度"
@@ -2685,6 +2696,15 @@ zh_CN:
         我们很抱歉，但是你发送至%{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 验证错误"
@@ -3230,6 +3250,8 @@ zh_CN:
         如果这是你，太棒了！你不需要做任何其他事情。
 
         如果不是你，请[查看你现有的会话](%{base_url}/my/preferences/account)并考虑更改密码。
+  page_forbidden:
+    title: "啊噢！该页面是私密的。"
   page_not_found:
     title: "抱歉！这个页面不存在或者是私密的。"
     popular_topics: "热门"
@@ -3287,6 +3309,7 @@ zh_CN:
     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为空"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index f348a525e4..daad849a0e 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -1178,7 +1178,6 @@ zh_TW:
     crawl_images: "允許從第三方 URL 取得圖片，來加入寬和高的數值"
     download_remote_images_to_local: "下載外部鏈接的圖片到本機；以防圖片損壞。"
     download_remote_images_threshold: "可用來下載外部圖片到本機最少的空間（百分比）"
-    download_remote_images_max_days_old: "不下載超過 n 天的貼文中的遠程圖片。"
     disabled_image_download_domains: "在此列表的網域名稱的遠端圖片將不會進行下載，用 | 分割多個域名"
     editing_grace_period: "在 (n) 秒之內，對貼文的編輯不生成貼文歷史。"
     editing_grace_period_max_diff: "編輯寬限期允許的字元更改的最大數量，如果有更多的更改，將另儲存為另一個版本的修訂（信任等級0和1）"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml b/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
index 6e04b4ea1f..31dc01588f 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
@@ -123,6 +123,7 @@ fa_IR:
 
           در عین حال، سعی میکنم که جلو راهت سبز نشم.
     new_user_narrative:
+      reset_trigger: "آموزش"
       cert_title: "با توجه به اتمام موفقیت آمیز راهنمای جدید کاربران"
       hello:
         message: |-
@@ -254,6 +255,7 @@ fa_IR:
       certificate:
         alt: "گواهی موفقیت"
     advanced_user_narrative:
+      reset_trigger: "آموزش پیشرفته"
       cert_title: "با توجه به اتمام موفقیت آمیز راهنمای جدید کاربران"
       title: ":arrow_up: ویژگی‌های کاربر حرفه‌ای"
       edit:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fr.yml b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
index fdb61ea804..2688690de1 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -7,12 +7,12 @@
 
 fr:
   site_settings:
-    discourse_narrative_bot_enabled: "Activer le rotbot de narration Discourse (discobot)"
+    discourse_narrative_bot_enabled: "Activer l'assistant Discourse (discobot)"
     disable_discourse_narrative_bot_welcome_post: "Désactiver le message de bienvenue de l'assistant Discourse"
     discourse_narrative_bot_ignored_usernames: "Noms d'utilisateurs que l'assistant Discourse doit ignorer"
     discourse_narrative_bot_disable_public_replies: "Désactiver les réponses publiques de l'assistant Discourse"
     discourse_narrative_bot_welcome_post_type: "Type de message de bienvenue envoyé par l'assistant Discourse"
-    discourse_narrative_bot_welcome_post_delay: "Attendre (n) seconde(s) avant d'envoyer le message de bienvenue de l'Assistant Discourse"
+    discourse_narrative_bot_welcome_post_delay: "Attendre (n) seconde(s) avant d'envoyer le message de bienvenue de l'assistant Discourse"
   badges:
     certified:
       name: Certifié
@@ -175,23 +175,23 @@ fr:
           <https://en.wikipedia.org/wiki/Exotic_Shorthair>
       images:
         instructions: |-
-          Voici une photo de licorne :
+          Voici une photo de licorne :
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
 
           Si vous l'aimez (et qui n'aime pas les licornes ?) appuyez sur le bouton _J'aime_ :heart: sous ce message pour me le faire savoir.
 
-          Pouvez-vous **répondre avec une image ?** N'importe laquelle fera l'affaire ! Glissez et déposer, appuyez sur le bouton d'upload, ou copiez juste son lien.
+          Pouvez-vous **répondre avec une image ?** N'importe laquelle fera l'affaire ! Glissez et déposer, appuyez sur le bouton d'envoi d'images, ou copiez juste son lien.
         reply: |-
           Sympa la photo ! – J'ai appuyé sur le bouton :heart: J'aime pour que vous sachiez au combien je l'apprécie. :heart_eyes:
         like_not_found: |-
           Avez-vous oublié d'aimer :heart: mon [message ?](%{url}) :crying_cat_face:
         not_found: |-
-          Il semblerait que vous n'avez pas uploadé d'image, du coup, j'en ai choisi une qui vous fera _certainement_ plaisir.
+          Il semblerait que vous n'avez pas envoyé d'image, donc j'en ai choisi une qui vous fera _certainement_ plaisir.
 
           `%{image_url}`
 
-          Essayez d'uploader la suivante, ou coller le lien sur une nouvelle ligne vide !
+          Essayez d'envoyer cette image, ou coller le lien sur une nouvelle ligne vide !
       formatting:
         instructions: |-
           Pouvez-vous faire quelques mots en **gras** ou en _italique_ dans votre réponse ?
@@ -241,13 +241,13 @@ fr:
         reply: |-
           C'est :sparkles: _emojitastic !_ :sparkles:
         not_found: |-
-          Oops, Je ne vois pas aucun emoji dans votre réponse ? Oh non ! :sob:
+          Oops, je ne vois pas aucun emoji dans votre réponse ? Oh non ! :sob:
 
-          Essayez de taper <kbd>:</kbd> pour faire apparaitre la selection d'emoji, puis appuyer sur les premières lettres de ce que vous voulez, comme par exemple `:bird:`
+          Essayez de taper <kbd>:</kbd> pour faire apparaître la sélection d'emoji, puis appuyer sur les premières lettres de ce que vous voulez, comme par exemple `:bird:`
 
-          Ou, appuyez sur le bouton emoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> dans l'éditeur.
+          Ou appuyez sur le bouton emoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> dans l'éditeur.
 
-          (Si vous êtes sur un périphérique mobile, vous pouvez aussi entrer l'émoji directement depuis votre clavier.)
+          (Si vous êtes sur un appareil mobile, vous pouvez aussi entrer l'emoji directement depuis votre clavier.)
       mention:
         instructions: |-
           Parfois vous avez peut-être envie d'attirer l'attention de quelqu'un, même si vous ne lui répondez pas directement. Tapez `@` et complétez son nom d'utilisateur pour le mentionner.
diff --git a/plugins/discourse-presence/config/locales/client.fa_IR.yml b/plugins/discourse-presence/config/locales/client.fa_IR.yml
index 4ed565ac18..367d434516 100644
--- a/plugins/discourse-presence/config/locales/client.fa_IR.yml
+++ b/plugins/discourse-presence/config/locales/client.fa_IR.yml
@@ -10,3 +10,6 @@ fa_IR:
     presence:
       replying: "در حال نوشتن پاسخ"
       editing: "در حال ویرایش"
+      replying_to_topic:
+        one: "پاسخ دادن"
+        other: "پاسخ دادن"
diff --git a/plugins/discourse-presence/config/locales/server.fr.yml b/plugins/discourse-presence/config/locales/server.fr.yml
index ea12363f08..778753c6ef 100644
--- a/plugins/discourse-presence/config/locales/server.fr.yml
+++ b/plugins/discourse-presence/config/locales/server.fr.yml
@@ -8,4 +8,4 @@
 fr:
   site_settings:
     presence_enabled: "Afficher les utilisateurs qui sont en train de répondre au sujet actuel ou modifier le message actuel ?"
-    presence_max_users_shown: "Nombre maximale d'utilisateurs affiché."
+    presence_max_users_shown: "Nombre maximal d'utilisateurs affichés."
diff --git a/plugins/poll/config/locales/client.fa_IR.yml b/plugins/poll/config/locales/client.fa_IR.yml
index 807a752191..c296c03bd1 100644
--- a/plugins/poll/config/locales/client.fa_IR.yml
+++ b/plugins/poll/config/locales/client.fa_IR.yml
@@ -25,6 +25,7 @@ fa_IR:
         label: "نتایج را نشان بده"
       hide-results:
         title: "برگشتن به رای گیری "
+        label: "نمایش رأی"
       export-results:
         label: "خروجی گرفتن"
       open:
@@ -42,7 +43,9 @@ fa_IR:
         title: ساخت نظرسنجی
         insert: درج نظر سنجی
         help:
+          options_count: حداقل 1 گزینه را وارد کنید
           invalid_values: مقدار حداقل می بایست کمتر از مقدار حداکثر باشد.
+          min_step_value: حداقل مقدار مرحله 1 است
         poll_type:
           label: نوع
           regular: یک انتخابی
diff --git a/plugins/poll/config/locales/client.zh_CN.yml b/plugins/poll/config/locales/client.zh_CN.yml
index f1935abb3f..dc7ef68708 100644
--- a/plugins/poll/config/locales/client.zh_CN.yml
+++ b/plugins/poll/config/locales/client.zh_CN.yml
@@ -24,6 +24,15 @@ zh_CN:
           title: "结果将显示一次<strong>关闭</strong>。"
         staff:
           title: "结果仅显示给<strong>管理</strong>成员。"
+      multiple:
+        help:
+          at_least_min_options:
+            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>个选项。"
       cast-votes:
         title: "投你的票"
         label: "现在投票！"
diff --git a/public/500.fr.html b/public/500.fr.html
index 95d425863c..5e49c3a3a2 100644
--- a/public/500.fr.html
+++ b/public/500.fr.html
@@ -6,8 +6,8 @@
 </head>
 <body>
     <h1>Oups</h1>
-    <p>Le logiciel utiliser par ce forum de discussion a rencontré un problème inattendu. Nous nous excusons pour la gêne occasionnée.</p>
-    <p>Des informations détaillées sur l'erreur ont été enregistrées, et une notification automatique générée. Nous allons jeter un coup d'oeil.</p>
+    <p>Le logiciel utilisé par ce forum de discussion a rencontré un problème inattendu. Nous nous excusons pour la gêne occasionnée.</p>
+    <p>Des informations détaillées sur l'erreur ont été enregistrées, et une notification automatique générée. Nous allons jeter un coup d’œil.</p>
     <p>Aucune autre action n'est nécessaire. Toutefois, si l'erreur persiste, vous pouvez fournir des détails supplémentaires, y compris les étapes pour reproduire l'erreur, en postant un sujet de discussion dans la catégorie dédiée.</p>
 </body>
 </html>
diff --git a/public/503.fr.html b/public/503.fr.html
index a1d8adad09..51f425b7b1 100644
--- a/public/503.fr.html
+++ b/public/503.fr.html
@@ -6,7 +6,7 @@
 </head>
 <body>
     <h1>Nous sommes actuellement indisponible pour une maintenance planifiée.</h1>
-    <p>Merci de revenir <span id="when-to-check-back"> dans quelques minutes</span>.</p>
+    <p>Merci de revenir <span id="when-to-check-back">dans quelques minutes</span>.</p>
     <p id="apology">Désolé pour le dérangement !</p>
 </body>
 </html>

From 09dc5eb5ea4d8c474ec144c976c9be557e040767 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Mon, 1 Jun 2020 14:13:48 -0400
Subject: [PATCH 1493/1830] Version bump to v2.5.0.beta6

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

diff --git a/lib/version.rb b/lib/version.rb
index 1368f623e9..c2a0e2edfb 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -9,7 +9,7 @@ module Discourse
       MAJOR = 2
       MINOR = 5
       TINY  = 0
-      PRE   = 'beta5'
+      PRE   = 'beta6'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end

From 9162cd8f3dd771a5b8dac846b8ba3e116ae08f4f Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Mon, 1 Jun 2020 11:44:41 -0700
Subject: [PATCH 1494/1830] FIX: Only render group card if user title is from
 group (#9946)

This was failing when a user with a primary_group chose to display a title coming from a badge.
---
 .../javascripts/discourse/app/lib/transform-post.js   |  1 +
 .../javascripts/discourse/app/widgets/poster-name.js  | 11 ++++++++---
 app/serializers/post_serializer.rb                    |  9 +++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/transform-post.js b/app/assets/javascripts/discourse/app/lib/transform-post.js
index 9c39e41713..a083d8fe07 100644
--- a/app/assets/javascripts/discourse/app/lib/transform-post.js
+++ b/app/assets/javascripts/discourse/app/lib/transform-post.js
@@ -47,6 +47,7 @@ export function transformBasicPost(post) {
     new_user: post.trust_level === 0,
     name: post.name,
     user_title: post.user_title,
+    title_is_group: post.title_is_group,
     created_at: post.created_at,
     updated_at: post.updated_at,
     canDelete: post.can_delete,
diff --git a/app/assets/javascripts/discourse/app/widgets/poster-name.js b/app/assets/javascripts/discourse/app/widgets/poster-name.js
index d0680fb831..f587a19d9a 100644
--- a/app/assets/javascripts/discourse/app/widgets/poster-name.js
+++ b/app/assets/javascripts/discourse/app/widgets/poster-name.js
@@ -18,7 +18,7 @@ createWidget("poster-name-title", {
 
   html(attrs) {
     let titleContents = attrs.title;
-    if (attrs.primaryGroupName) {
+    if (attrs.primaryGroupName && attrs.titleIsGroup) {
       const href = Discourse.getURL(`/g/${attrs.primaryGroupName}`);
       titleContents = h(
         "a.user-group",
@@ -126,10 +126,15 @@ export default createWidget("poster-name", {
       );
     }
 
-    const title = attrs.user_title;
+    const title = attrs.user_title,
+      titleIsGroup = attrs.title_is_group;
     if (title && title.length) {
       contents.push(
-        this.attach("poster-name-title", { title, primaryGroupName })
+        this.attach("poster-name-title", {
+          title,
+          primaryGroupName,
+          titleIsGroup
+        })
       );
     }
 
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index 35a50a5f96..873db6d671 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -47,6 +47,7 @@ class PostSerializer < BasicPostSerializer
              :link_counts,
              :read,
              :user_title,
+             :title_is_group,
              :reply_to_user,
              :bookmarked,
              :bookmark_reminder_at,
@@ -212,6 +213,14 @@ class PostSerializer < BasicPostSerializer
     object&.user&.title
   end
 
+  def title_is_group
+    object&.user&.title == object.user&.primary_group&.title
+  end
+
+  def include_title_is_group?
+    object&.user&.title.present?
+  end
+
   def trust_level
     object&.user&.trust_level
   end

From a95826f60cea23cf16e371fbb99b71490424150e Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 1 Jun 2020 16:33:43 -0400
Subject: [PATCH 1495/1830] Remove discourse constants (#9958)

* DEV: `Discourse.baseUri` does not exist

This never could have worked - should have been `Discourse.BaseUri` if
anything.

* DEV: Remove Discourse.Environment

* DEV: Remove `Discourse.disableMissingIconWarning`

* DEV: A bunch more missing environment checks
---
 .../admin/components/admin-report.js          |  6 ++---
 .../admin/components/themes-list-item.js      |  4 ++--
 .../addon/config/environment.js               | 22 +++++++++++++++----
 .../addon/lib/icon-library.js                 | 15 +++++++++++--
 .../app/components/composer-editor.js         |  4 ++--
 .../app/components/composer-title.js          |  4 ++--
 .../discourse/app/components/d-editor.js      |  4 ++--
 .../discourse/app/components/emoji-picker.js  |  4 ++--
 .../app/components/topic-timer-info.js        |  4 ++--
 .../discourse/app/controllers/composer.js     |  6 ++---
 .../app/initializers/live-development.js      |  4 ++--
 .../discourse/app/initializers/message-bus.js |  3 ++-
 .../subscribe-user-notifications.js           |  4 ++--
 .../discourse/app/lib/click-track.js          |  4 ++--
 .../javascripts/discourse/app/lib/eyeline.js  |  4 ++--
 .../javascripts/discourse/app/lib/mobile.js   |  4 ++--
 .../discourse/app/mapping-router.js           |  4 ++--
 .../discourse/app/mixins/scroll-top.js        |  4 ++--
 .../javascripts/discourse/app/models/site.js  |  5 -----
 .../pre-initializers/discourse-bootstrap.js   | 10 ++++++---
 .../discourse/app/routes/topic-from-params.js |  4 ++--
 .../javascripts/discourse/app/widgets/glue.js |  4 ++--
 .../discourse/app/widgets/post-menu.js        |  4 ++--
 .../discourse/app/widgets/widget.js           |  4 ++--
 .../addon/components/icon-picker.js           | 15 ++++++++-----
 app/assets/javascripts/wizard/router.js       |  4 ++--
 26 files changed, 92 insertions(+), 62 deletions(-)

diff --git a/app/assets/javascripts/admin/components/admin-report.js b/app/assets/javascripts/admin/components/admin-report.js
index b9ce9a6fdf..bacb6177e1 100644
--- a/app/assets/javascripts/admin/components/admin-report.js
+++ b/app/assets/javascripts/admin/components/admin-report.js
@@ -9,8 +9,8 @@ import ReportLoader from "discourse/lib/reports-loader";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
 import Report, { SCHEMA_VERSION } from "admin/models/report";
-import ENV from "discourse-common/config/environment";
 import { isPresent } from "@ember/utils";
+import { isTesting } from "discourse-common/config/environment";
 
 const TABLE_OPTIONS = {
   perPage: 8,
@@ -167,8 +167,8 @@ export default Component.extend({
     let reportKey = "reports:";
     reportKey += [
       dataSourceName,
-      ENV.environment === "test" ? "start" : startDate.replace(/-/g, ""),
-      ENV.environment === "test" ? "end" : endDate.replace(/-/g, ""),
+      isTesting() ? "start" : startDate.replace(/-/g, ""),
+      isTesting() ? "end" : endDate.replace(/-/g, ""),
       "[:prev_period]",
       this.get("reportOptions.table.limit"),
       // Convert all filter values to strings to ensure unique serialization
diff --git a/app/assets/javascripts/admin/components/themes-list-item.js b/app/assets/javascripts/admin/components/themes-list-item.js
index c292b80f99..56db74e7e8 100644
--- a/app/assets/javascripts/admin/components/themes-list-item.js
+++ b/app/assets/javascripts/admin/components/themes-list-item.js
@@ -4,7 +4,7 @@ import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { escape } from "pretty-text/sanitizer";
-import ENV from "discourse-common/config/environment";
+import { isTesting } from "discourse-common/config/environment";
 
 const MAX_COMPONENTS = 4;
 
@@ -41,7 +41,7 @@ export default Component.extend({
   animate(isInitial) {
     const $container = $(this.element);
     const $list = $(this.element.querySelector(".components-list"));
-    if ($list.length === 0 || ENV.environment === "test") {
+    if ($list.length === 0 || isTesting()) {
       return;
     }
     const duration = 300;
diff --git a/app/assets/javascripts/discourse-common/addon/config/environment.js b/app/assets/javascripts/discourse-common/addon/config/environment.js
index 8d684bf5a4..b580231ee7 100644
--- a/app/assets/javascripts/discourse-common/addon/config/environment.js
+++ b/app/assets/javascripts/discourse-common/addon/config/environment.js
@@ -1,9 +1,23 @@
 export const INPUT_DELAY = 250;
 
-let environment = Ember.testing ? "test" : "development";
+let environment = "unknown";
 
-export function isTesting() {
-  return environment === "test";
+export function setEnvironment(e) {
+  if (isTesting()) {
+    environment = "testing";
+  } else {
+    environment = e;
+  }
 }
 
-export default { environment };
+export function isTesting() {
+  return Ember.testing;
+}
+
+export function isDevelopment() {
+  return environment === "development";
+}
+
+export function isProduction() {
+  return environment === "production";
+}
diff --git a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js
index ef60571cec..8633701c1e 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js
@@ -1,10 +1,13 @@
 import I18n from "I18n";
 import { h } from "virtual-dom";
 import attributeHook from "discourse-common/lib/attribute-hook";
+import { isDevelopment } from "discourse-common/config/environment";
 
 const SVG_NAMESPACE = "http://www.w3.org/2000/svg";
 let _renderers = [];
 
+let warnMissingIcons = true;
+
 const REPLACEMENTS = {
   "d-tracking": "bell",
   "d-muted": "discourse-bell-slash",
@@ -45,6 +48,14 @@ export function replaceIcon(source, destination) {
   REPLACEMENTS[source] = destination;
 }
 
+export function disableMissingIconWarning() {
+  warnMissingIcons = false;
+}
+
+export function enableMissingIconWarning() {
+  warnMissingIcons = false;
+}
+
 export function renderIcon(renderType, id, params) {
   for (let i = 0; i < _renderers.length; i++) {
     let renderer = _renderers[i];
@@ -105,8 +116,8 @@ function iconClasses(icon, params) {
 function warnIfMissing(id) {
   if (
     typeof Discourse !== "undefined" &&
-    Discourse.Environment === "development" &&
-    !Discourse.disableMissingIconWarning &&
+    isDevelopment() &&
+    warnMissingIcons &&
     Discourse.SvgIconList &&
     Discourse.SvgIconList.indexOf(id) === -1
   ) {
diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js
index de6fa4344a..2eb99f44c5 100644
--- a/app/assets/javascripts/discourse/app/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/app/components/composer-editor.js
@@ -44,7 +44,7 @@ import {
   cacheShortUploadUrl,
   resolveAllShortUrls
 } from "pretty-text/upload-short-url";
-import ENV from "discourse-common/config/environment";
+import { isTesting } from "discourse-common/config/environment";
 
 const REBUILD_SCROLL_MAP_EVENTS = ["composer:resized", "composer:typed-reply"];
 
@@ -847,7 +847,7 @@ export default Component.extend({
       // need to wait a bit for the "slide down" transition of the composer
       later(
         () => this.appEvents.trigger("composer:closed"),
-        ENV.environment === "test" ? 0 : 400
+        isTesting() ? 0 : 400
       );
     });
 
diff --git a/app/assets/javascripts/discourse/app/components/composer-title.js b/app/assets/javascripts/discourse/app/components/composer-title.js
index 7ee2cb513a..ed037bd55d 100644
--- a/app/assets/javascripts/discourse/app/components/composer-title.js
+++ b/app/assets/javascripts/discourse/app/components/composer-title.js
@@ -6,7 +6,7 @@ import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { load } from "pretty-text/oneboxer";
 import { lookupCache } from "pretty-text/oneboxer-cache";
 import { ajax } from "discourse/lib/ajax";
-import ENV from "discourse-common/config/environment";
+import { isTesting } from "discourse-common/config/environment";
 import EmberObject from "@ember/object";
 import putCursorAtEnd from "discourse/lib/put-cursor-at-end";
 
@@ -76,7 +76,7 @@ export default Component.extend({
       return;
     }
 
-    if (ENV.environment === "test") {
+    if (isTesting()) {
       next(() =>
         // not ideal but we don't want to run this in current
         // runloop to avoid an error in console
diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index 184b7f93a6..87cec774a9 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -28,7 +28,7 @@ import { emojiSearch, isSkinTonableEmoji } from "pretty-text/emoji";
 import { emojiUrlFor } from "discourse/lib/text";
 import showModal from "discourse/lib/show-modal";
 import { Promise } from "rsvp";
-import ENV from "discourse-common/config/environment";
+import { isTesting } from "discourse-common/config/environment";
 
 // Our head can be a static string or a function that returns a string
 // based on input (like for numbered lists).
@@ -378,7 +378,7 @@ export default Component.extend({
     }
 
     // Debouncing in test mode is complicated
-    if (ENV.environment === "test") {
+    if (isTesting()) {
       this._updatePreview();
     } else {
       debounce(this, this._updatePreview, 30);
diff --git a/app/assets/javascripts/discourse/app/components/emoji-picker.js b/app/assets/javascripts/discourse/app/components/emoji-picker.js
index a77b564e59..3acf181622 100644
--- a/app/assets/javascripts/discourse/app/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/app/components/emoji-picker.js
@@ -10,7 +10,7 @@ import {
   emojiSearch
 } from "pretty-text/emoji";
 import { safariHacksDisabled } from "discourse/lib/utilities";
-import ENV, { INPUT_DELAY } from "discourse-common/config/environment";
+import { isTesting, INPUT_DELAY } from "discourse-common/config/environment";
 
 const PER_ROW = 11;
 function customEmojis() {
@@ -525,7 +525,7 @@ export default Component.extend({
       this.$picker.css(_.merge(attributes, options));
     };
 
-    if (ENV.environment === "test" || !this.automaticPositioning) {
+    if (isTesting() || !this.automaticPositioning) {
       desktopPositioning();
       return;
     }
diff --git a/app/assets/javascripts/discourse/app/components/topic-timer-info.js b/app/assets/javascripts/discourse/app/components/topic-timer-info.js
index 6bbde2a217..953c356590 100644
--- a/app/assets/javascripts/discourse/app/components/topic-timer-info.js
+++ b/app/assets/javascripts/discourse/app/components/topic-timer-info.js
@@ -8,7 +8,7 @@ import {
   REMINDER_TYPE,
   DELETE_REPLIES_TYPE
 } from "discourse/controllers/edit-topic-timer";
-import ENV from "discourse-common/config/environment";
+import { isTesting } from "discourse-common/config/environment";
 
 export default Component.extend({
   classNames: ["topic-status-info"],
@@ -92,7 +92,7 @@ export default Component.extend({
       });
 
       // TODO Sam: concerned this can cause a heavy rerender loop
-      if (ENV.environment !== "test") {
+      if (!isTesting()) {
         this._delayedRerender = later(() => {
           this.renderTopicTimer();
         }, rerenderDelay);
diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index d030c88c3a..54aae53368 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -23,7 +23,7 @@ import { emojiUnescape } from "discourse/lib/text";
 import { shortDate } from "discourse/lib/formatter";
 import { SAVE_LABELS, SAVE_ICONS } from "discourse/models/composer";
 import { Promise } from "rsvp";
-import ENV from "discourse-common/config/environment";
+import { isTesting } from "discourse-common/config/environment";
 import EmberObject, { computed, action } from "@ember/object";
 import deprecated from "discourse-common/lib/deprecated";
 
@@ -71,7 +71,7 @@ function loadDraft(store, opts) {
 
 const _popupMenuOptionsCallbacks = [];
 
-let _checkDraftPopup = ENV.environment !== "test";
+let _checkDraftPopup = !isTesting();
 
 export function toggleCheckDraftPopup(enabled) {
   _checkDraftPopup = enabled;
@@ -1109,7 +1109,7 @@ export default Controller.extend({
       if (model.draftSaving) {
         // in test debounce is Ember.run, this will cause
         // an infinite loop
-        if (ENV.environment !== "test") {
+        if (!isTesting()) {
           this._saveDraftDebounce = debounce(this, this._saveDraft, 2000);
         }
       } else {
diff --git a/app/assets/javascripts/discourse/app/initializers/live-development.js b/app/assets/javascripts/discourse/app/initializers/live-development.js
index fe3d59875b..8c8a3f1287 100644
--- a/app/assets/javascripts/discourse/app/initializers/live-development.js
+++ b/app/assets/javascripts/discourse/app/initializers/live-development.js
@@ -1,6 +1,6 @@
 import DiscourseURL from "discourse/lib/url";
 import { currentThemeIds, refreshCSS } from "discourse/lib/theme-selector";
-import ENV from "discourse-common/config/environment";
+import { isDevelopment } from "discourse-common/config/environment";
 import Handlebars from "handlebars";
 
 //  Use the message bus for live reloading of components for faster development.
@@ -48,7 +48,7 @@ export default {
     });
 
     // Useful to export this for debugging purposes
-    if (Discourse.Environment === "development" && ENV.environment !== "test") {
+    if (isDevelopment()) {
       window.DiscourseURL = DiscourseURL;
     }
 
diff --git a/app/assets/javascripts/discourse/app/initializers/message-bus.js b/app/assets/javascripts/discourse/app/initializers/message-bus.js
index f732065c0f..6825cd90fa 100644
--- a/app/assets/javascripts/discourse/app/initializers/message-bus.js
+++ b/app/assets/javascripts/discourse/app/initializers/message-bus.js
@@ -1,6 +1,7 @@
 // Initialize the message bus to receive messages.
 import userPresent from "discourse/lib/user-presence";
 import { handleLogoff } from "discourse/lib/ajax";
+import { isProduction } from "discourse-common/config/environment";
 
 const LONG_POLL_AFTER_UNSEEN_TIME = 1200000; // 20 minutes
 
@@ -32,7 +33,7 @@ export default {
       user = container.lookup("current-user:main"),
       siteSettings = container.lookup("site-settings:main");
 
-    messageBus.alwaysLongPoll = Discourse.Environment === "development";
+    messageBus.alwaysLongPoll = !isProduction();
     messageBus.shouldLongPollCallback = () =>
       userPresent(LONG_POLL_AFTER_UNSEEN_TIME);
 
diff --git a/app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js b/app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js
index 1482cf9d18..407ab97d8c 100644
--- a/app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js
+++ b/app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js
@@ -11,7 +11,7 @@ import {
   unsubscribe as unsubscribePushNotifications,
   isPushNotificationsEnabled
 } from "discourse/lib/push-notifications";
-import ENV from "discourse-common/config/environment";
+import { isTesting } from "discourse-common/config/environment";
 
 export default {
   name: "subscribe-user-notifications",
@@ -130,7 +130,7 @@ export default {
         Discourse.set("assetVersion", data)
       );
 
-      if (ENV.environment !== "test") {
+      if (!isTesting()) {
         bus.subscribe(alertChannel(user), data => onNotification(data, user));
         initDesktopNotifications(bus, appEvents);
 
diff --git a/app/assets/javascripts/discourse/app/lib/click-track.js b/app/assets/javascripts/discourse/app/lib/click-track.js
index 199a90ea43..d34e33363a 100644
--- a/app/assets/javascripts/discourse/app/lib/click-track.js
+++ b/app/assets/javascripts/discourse/app/lib/click-track.js
@@ -5,7 +5,7 @@ import DiscourseURL from "discourse/lib/url";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { selectedText } from "discourse/lib/utilities";
 import { Promise } from "rsvp";
-import ENV from "discourse-common/config/environment";
+import { isTesting } from "discourse-common/config/environment";
 import User from "discourse/models/user";
 
 export function isValidLink($link) {
@@ -101,7 +101,7 @@ export default {
 
     let trackPromise = Promise.resolve();
     if (tracking) {
-      if (ENV.environment !== "test" && navigator.sendBeacon) {
+      if (!isTesting() && navigator.sendBeacon) {
         const data = new FormData();
         data.append("url", href);
         data.append("post_id", postId);
diff --git a/app/assets/javascripts/discourse/app/lib/eyeline.js b/app/assets/javascripts/discourse/app/lib/eyeline.js
index 53f2a8435a..7afe84fe0e 100644
--- a/app/assets/javascripts/discourse/app/lib/eyeline.js
+++ b/app/assets/javascripts/discourse/app/lib/eyeline.js
@@ -1,4 +1,4 @@
-import ENV from "discourse-common/config/environment";
+import { isTesting } from "discourse-common/config/environment";
 import AppEvents from "discourse/services/app-events";
 
 let _skipUpdate;
@@ -9,7 +9,7 @@ export function configureEyeline(opts) {
     _skipUpdate = opts.skipUpdate;
     _rootElement = opts.rootElement;
   } else {
-    _skipUpdate = ENV.environment === "test";
+    _skipUpdate = isTesting();
     _rootElement = null;
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/mobile.js b/app/assets/javascripts/discourse/app/lib/mobile.js
index 511e269d83..b90ccc2424 100644
--- a/app/assets/javascripts/discourse/app/lib/mobile.js
+++ b/app/assets/javascripts/discourse/app/lib/mobile.js
@@ -1,4 +1,4 @@
-import ENV from "discourse-common/config/environment";
+import { isTesting } from "discourse-common/config/environment";
 
 let mobileForced = false;
 
@@ -12,7 +12,7 @@ const Mobile = {
     this.isMobileDevice = mobileForced || $html.hasClass("mobile-device");
     this.mobileView = mobileForced || $html.hasClass("mobile-view");
 
-    if (ENV.environment === "test" || mobileForced) {
+    if (isTesting() || mobileForced) {
       return;
     }
 
diff --git a/app/assets/javascripts/discourse/app/mapping-router.js b/app/assets/javascripts/discourse/app/mapping-router.js
index 38b8eec72e..99935ddc32 100644
--- a/app/assets/javascripts/discourse/app/mapping-router.js
+++ b/app/assets/javascripts/discourse/app/mapping-router.js
@@ -1,14 +1,14 @@
 import EmberRouter from "@ember/routing/router";
 import { defaultHomepage } from "discourse/lib/utilities";
 import { rewritePath } from "discourse/lib/url";
-import ENV from "discourse-common/config/environment";
 import Site from "discourse/models/site";
+import { isTesting } from "discourse-common/config/environment";
 
 const rootURL = Discourse.BaseUri;
 
 const BareRouter = EmberRouter.extend({
   rootURL,
-  location: ENV.environment === "test" ? "none" : "discourse-location",
+  location: isTesting() ? "none" : "discourse-location",
 
   handleURL(url) {
     url = rewritePath(url);
diff --git a/app/assets/javascripts/discourse/app/mixins/scroll-top.js b/app/assets/javascripts/discourse/app/mixins/scroll-top.js
index d636c2333f..9151ed192f 100644
--- a/app/assets/javascripts/discourse/app/mixins/scroll-top.js
+++ b/app/assets/javascripts/discourse/app/mixins/scroll-top.js
@@ -2,11 +2,11 @@ import { scheduleOnce } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import { deprecated } from "discourse/mixins/scroll-top";
 import Mixin from "@ember/object/mixin";
-import ENV from "discourse-common/config/environment";
+import { isTesting } from "discourse-common/config/environment";
 
 const context = {
   _scrollTop() {
-    if (ENV.environment === "test") {
+    if (isTesting()) {
       return;
     }
     $(document).scrollTop(0);
diff --git a/app/assets/javascripts/discourse/app/models/site.js b/app/assets/javascripts/discourse/app/models/site.js
index 03aee34519..8e6b8f2d2c 100644
--- a/app/assets/javascripts/discourse/app/models/site.js
+++ b/app/assets/javascripts/discourse/app/models/site.js
@@ -80,11 +80,6 @@ const Site = RestModel.extend({
     return result;
   },
 
-  @discourseComputed
-  baseUri() {
-    return Discourse.baseUri;
-  },
-
   // Returns it in the correct order, by setting
   @discourseComputed("categories.[]")
   categoriesList() {
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js b/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
index 494ed5e2e9..29570b5db2 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
@@ -2,7 +2,11 @@ import PreloadStore from "discourse/lib/preload-store";
 import I18n from "I18n";
 import Session from "discourse/models/session";
 import RSVP from "rsvp";
-import { isTesting } from "discourse-common/config/environment";
+import {
+  setEnvironment,
+  isTesting,
+  isProduction
+} from "discourse-common/config/environment";
 
 export default {
   name: "discourse-bootstrap",
@@ -33,7 +37,7 @@ export default {
     app.CDN = setupData.cdn;
     app.BaseUrl = setupData.baseUrl;
     app.BaseUri = setupData.baseUri;
-    app.Environment = setupData.environment;
+    setEnvironment(setupData.environment);
     app.SiteSettings = PreloadStore.get("siteSettings");
     app.ThemeSettings = PreloadStore.get("themeSettings");
     app.LetterAvatarVersion = setupData.letterAvatarVersion;
@@ -73,7 +77,7 @@ export default {
         return;
       }
 
-      if (Discourse.Environment === "development") {
+      if (!isProduction()) {
         /* eslint-disable no-console  */
         if (e) {
           if (e.message || e.stack) {
diff --git a/app/assets/javascripts/discourse/app/routes/topic-from-params.js b/app/assets/javascripts/discourse/app/routes/topic-from-params.js
index bcf904ad38..2c028e42de 100644
--- a/app/assets/javascripts/discourse/app/routes/topic-from-params.js
+++ b/app/assets/javascripts/discourse/app/routes/topic-from-params.js
@@ -3,7 +3,7 @@ import { schedule } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
 import DiscourseURL from "discourse/lib/url";
 import Draft from "discourse/models/draft";
-import ENV from "discourse-common/config/environment";
+import { isTesting } from "discourse-common/config/environment";
 
 // This route is used for retrieving a topic based on params
 export default DiscourseRoute.extend({
@@ -81,7 +81,7 @@ export default DiscourseRoute.extend({
         }
       })
       .catch(e => {
-        if (ENV.environment !== "test") {
+        if (!isTesting()) {
           // eslint-disable-next-line no-console
           console.log("Could not view topic", e);
         }
diff --git a/app/assets/javascripts/discourse/app/widgets/glue.js b/app/assets/javascripts/discourse/app/widgets/glue.js
index 78aa33196b..976aed9a31 100644
--- a/app/assets/javascripts/discourse/app/widgets/glue.js
+++ b/app/assets/javascripts/discourse/app/widgets/glue.js
@@ -2,7 +2,7 @@ import { cancel, scheduleOnce } from "@ember/runloop";
 import { diff, patch } from "virtual-dom";
 import { queryRegistry } from "discourse/widgets/widget";
 import DirtyKeys from "discourse/lib/dirty-keys";
-import ENV from "discourse-common/config/environment";
+import { isTesting } from "discourse-common/config/environment";
 
 export default class WidgetGlue {
   constructor(name, register, attrs) {
@@ -34,7 +34,7 @@ export default class WidgetGlue {
     cancel(this._timeout);
 
     // in test mode return early if store cannot be found
-    if (ENV.environment === "test") {
+    if (isTesting()) {
       try {
         this.register.lookup("service:store");
       } catch (e) {
diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
index 4b82dcb336..3798d71cb2 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@@ -4,14 +4,14 @@ import { avatarAtts } from "discourse/widgets/actions-summary";
 import { h } from "virtual-dom";
 import showModal from "discourse/lib/show-modal";
 import { Promise } from "rsvp";
-import ENV from "discourse-common/config/environment";
+import { isTesting } from "discourse-common/config/environment";
 import { formattedReminderTime } from "discourse/lib/bookmark";
 
 const LIKE_ACTION = 2;
 const VIBRATE_DURATION = 5;
 
 function animateHeart($elem, start, end, complete) {
-  if (ENV.environment === "test") {
+  if (isTesting()) {
     return run(this, complete);
   }
 
diff --git a/app/assets/javascripts/discourse/app/widgets/widget.js b/app/assets/javascripts/discourse/app/widgets/widget.js
index f945bd2c9f..362428bf05 100644
--- a/app/assets/javascripts/discourse/app/widgets/widget.js
+++ b/app/assets/javascripts/discourse/app/widgets/widget.js
@@ -16,7 +16,7 @@ import {
 import { h } from "virtual-dom";
 import DecoratorHelper from "discourse/widgets/decorator-helper";
 import { Promise } from "rsvp";
-import ENV from "discourse-common/config/environment";
+import { isProduction } from "discourse-common/config/environment";
 import { get } from "@ember/object";
 
 const _registry = {};
@@ -127,7 +127,7 @@ export default class Widget {
     this.init(this.attrs);
 
     // Helps debug widgets
-    if (Discourse.Environment === "development" || ENV.environment === "test") {
+    if (!isProduction()) {
       const ds = this.defaultState(attrs);
       if (typeof ds !== "object") {
         throw new Error(`defaultState must return an object`);
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 dfa074452e..d2aab09bcf 100644
--- a/app/assets/javascripts/select-kit/addon/components/icon-picker.js
+++ b/app/assets/javascripts/select-kit/addon/components/icon-picker.js
@@ -2,7 +2,12 @@ import MultiSelectComponent from "select-kit/components/multi-select";
 import { computed } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { makeArray } from "discourse-common/lib/helpers";
-import { convertIconClass } from "discourse-common/lib/icon-library";
+import {
+  convertIconClass,
+  disableMissingIconWarning,
+  enableMissingIconWarning
+} from "discourse-common/lib/icon-library";
+import { isDevelopment } from "discourse-common/config/environment";
 
 export default MultiSelectComponent.extend({
   pluginApiIdentifiers: ["icon-picker"],
@@ -13,8 +18,8 @@ export default MultiSelectComponent.extend({
 
     this._cachedIconsList = null;
 
-    if (Discourse.Environment === "development") {
-      Discourse.disableMissingIconWarning = true;
+    if (isDevelopment()) {
+      disableMissingIconWarning();
     }
   },
 
@@ -75,8 +80,8 @@ export default MultiSelectComponent.extend({
 
     this._cachedIconsList = null;
 
-    if (Discourse.Environment === "development") {
-      delete Discourse.disableMissingIconWarning;
+    if (isDevelopment()) {
+      enableMissingIconWarning();
     }
   },
 
diff --git a/app/assets/javascripts/wizard/router.js b/app/assets/javascripts/wizard/router.js
index 822d3d7aba..295e296222 100644
--- a/app/assets/javascripts/wizard/router.js
+++ b/app/assets/javascripts/wizard/router.js
@@ -1,10 +1,10 @@
 import EmberRouter from "@ember/routing/router";
 import getUrl from "discourse-common/lib/get-url";
-import ENV from "discourse-common/config/environment";
+import { isTesting } from "discourse-common/config/environment";
 
 const Router = EmberRouter.extend({
   rootURL: getUrl("/wizard/"),
-  location: ENV.environment === "test" ? "none" : "history"
+  location: isTesting() ? "none" : "history"
 });
 
 Router.map(function() {

From fa6aa7f62779aa5a8fb801a2403cd28c38f7ef9e Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 1 Jun 2020 17:39:16 -0400
Subject: [PATCH 1496/1830] FIX: Digest frequency issue on user creation

If `default email digest frequency` was set to "Never", users would get
a `digest_after_minutes` set to `nil` which triggered this error
in the logs if/when the site eventually changed that setting and
enabled digests:

```
NoMethodError (undefined method `>=' for nil:NilClass)
/var/www/discourse/app/mailers/user_notifications.rb:227:in `digest'
```
---
 app/mailers/user_notifications.rb |  2 +-
 app/models/user_option.rb         |  3 ++-
 spec/models/user_option_spec.rb   | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index d1e883f4f4..6ccb86c860 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -224,7 +224,7 @@ class UserNotifications < ActionMailer::Base
         @counts << { label_key: 'user_notifications.digest.liked_received', value: value, href: "#{Discourse.base_url}/my/notifications" } if value > 0
       end
 
-      if @counts.size < 3 && user.user_option.digest_after_minutes >= 1440
+      if @counts.size < 3 && user.user_option.digest_after_minutes.to_i >= 1440
         value = summary_new_users_count(min_date)
         @counts << { label_key: 'user_notifications.digest.new_users', value: value, href: "#{Discourse.base_url}/about" } if value > 0
       end
diff --git a/app/models/user_option.rb b/app/models/user_option.rb
index 10fd562c6c..17bd684906 100644
--- a/app/models/user_option.rb
+++ b/app/models/user_option.rb
@@ -68,9 +68,10 @@ class UserOption < ActiveRecord::Base
       self.email_digests = false
     else
       self.email_digests = true
-      self.digest_after_minutes ||= SiteSetting.default_email_digest_frequency.to_i
     end
 
+    self.digest_after_minutes ||= SiteSetting.default_email_digest_frequency.to_i
+
     self.include_tl0_in_digests = SiteSetting.default_include_tl0_in_digests
 
     self.text_size = SiteSetting.default_text_size
diff --git a/spec/models/user_option_spec.rb b/spec/models/user_option_spec.rb
index 30112859a6..715b1e67cc 100644
--- a/spec/models/user_option_spec.rb
+++ b/spec/models/user_option_spec.rb
@@ -33,6 +33,20 @@ describe UserOption do
     it "should not hide the profile and presence by default" do
       expect(user.user_option.hide_profile_and_presence).to eq(false)
     end
+
+    it "should correctly set digest frequency" do
+      SiteSetting.default_email_digest_frequency = 1440
+      user = Fabricate(:user)
+      expect(user.user_option.email_digests).to eq(true)
+      expect(user.user_option.digest_after_minutes).to eq(1440)
+    end
+
+    it "should correctly set digest frequency when disabled" do
+      SiteSetting.default_email_digest_frequency = 0
+      user = Fabricate(:user)
+      expect(user.user_option.email_digests).to eq(false)
+      expect(user.user_option.digest_after_minutes).to eq(0)
+    end
   end
 
   describe "site settings" do

From 326d6d5b0fd08eea2ab65cde2c96ea7de641960d Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 2 Jun 2020 09:20:03 +0800
Subject: [PATCH 1497/1830] DEV: Pause Sidekiq when forcing pg readonly mode.

---
 config/initializers/002-rails_failover.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index 9985ecd520..d45a45e00a 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -18,6 +18,7 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
 
     def self.enable_pg_force_readonly_mode
       Discourse.redis.set(PG_FORCE_READONLY_MODE_KEY, 1)
+      Sidekiq.pause!("pg_failover") if !Sidekiq.paused?
       MessageBus.publish(readonly_channel, true)
       Site.clear_anon_cache!
       true
@@ -25,6 +26,7 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
 
     def self.disable_pg_force_readonly_mode
       result = Discourse.redis.del(PG_FORCE_READONLY_MODE_KEY)
+      Sidekiq.unpause!
       MessageBus.publish(readonly_channel, false)
       result > 0
     end

From 7e52106812322374b5017768e98df8c33f9bc10e Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 2 Jun 2020 11:41:49 +1000
Subject: [PATCH 1498/1830] DEV: when synchornizing state pull tags

In some cases we may want topic tracking state to keep track of tags
this small change ensures we do not remove them if they are already in place
---
 .../javascripts/discourse/app/models/topic-tracking-state.js  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
index 65d1c21269..ee18ed4287 100644
--- a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
+++ b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
@@ -354,6 +354,10 @@ const TopicTrackingState = EmberObject.extend({
         row.category_id = topic.category.id;
       }
 
+      if (topic.tags) {
+        row.tags = topic.tags;
+      }
+
       tracker.states["t" + topic.id] = row;
     });
 

From 2a0a6894426fd124556cafd9f992a73010e90b7f Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 1 Jun 2020 22:24:16 -0400
Subject: [PATCH 1499/1830] UX: prevent devices from miscalculating fullscreen
 composer height

Fixes issue seen in some Chromebooks that flip between tablet and regular notebook window size
---
 app/assets/stylesheets/desktop/compose.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index ddd914a98a..9fb8c27a0a 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -247,6 +247,7 @@ a.toggle-preview {
     &.fullscreen {
       // important needed because of inline styles when height is changed manually with grippie
       height: 100vh !important;
+      max-height: 100%; // prevents devices from miscalculating using vh
       @supports (--custom: property) {
         height: calc(var(--composer-vh, 1vh) * 100) !important;
       }

From c21e3bbd1beaaf307a0a53db4cbf0f9b1cdec6e3 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 2 Jun 2020 10:33:30 +0800
Subject: [PATCH 1500/1830] DEV: Prefer `create!` over `create` when not
 checking return value.

We don't want stuff to silently fail.
---
 app/models/invite_redeemer.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index d4e9392f93..f70c8a1ae9 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -116,14 +116,14 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
   def add_to_private_topics_if_invited
     topic_ids = Topic.where(archetype: Archetype::private_message).includes(:invites).where(invites: { email: invite.email }).pluck(:id)
     topic_ids.each do |id|
-      TopicAllowedUser.create(user_id: invited_user.id, topic_id: id) unless TopicAllowedUser.exists?(user_id: invited_user.id, topic_id: id)
+      TopicAllowedUser.create!(user_id: invited_user.id, topic_id: id) unless TopicAllowedUser.exists?(user_id: invited_user.id, topic_id: id)
     end
   end
 
   def add_user_to_groups
     new_group_ids = invite.groups.pluck(:id) - invited_user.group_users.pluck(:group_id)
     new_group_ids.each do |id|
-      invited_user.group_users.create(group_id: id)
+      invited_user.group_users.create!(group_id: id)
       DiscourseEvent.trigger(:user_added_to_group, invited_user, Group.find_by(id: id), automatic: false)
     end
   end
@@ -147,7 +147,7 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
 
   def notify_invitee
     if inviter = invite.invited_by
-      inviter.notifications.create(notification_type: Notification.types[:invitee_accepted],
+      inviter.notifications.create!(notification_type: Notification.types[:invitee_accepted],
                                    data: { display_username: invited_user.username }.to_json)
     end
   end

From 370cba451d8ba5f803bb0b68221b6079d89f7e0d Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 2 Jun 2020 10:40:29 +0800
Subject: [PATCH 1501/1830] DEV: Refactor away conditionals that we don't need.

---
 app/controllers/users_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d7319dc2f5..12d9643b57 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -11,7 +11,7 @@ class UsersController < ApplicationController
     :update_second_factor, :create_second_factor_backup, :select_avatar,
     :notification_level, :revoke_auth_token, :register_second_factor_security_key,
     :create_second_factor_security_key, :feature_topic, :clear_featured_topic,
-    :bookmarks
+    :bookmarks, :invited
   ]
 
   skip_before_action :check_xhr, only: [
@@ -301,7 +301,7 @@ class UsersController < ApplicationController
   def invited
     guardian.ensure_can_invite_to_forum!
 
-    inviter = fetch_user_from_params(include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts))
+    inviter = fetch_user_from_params(include_inactive: current_user.staff? || SiteSetting.show_inactive_accounts)
     offset = params[:offset].to_i || 0
     filter_by = params[:filter]
 

From 7897010dfde1a6d9b4b86df82aa3f77a5884db42 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 2 Jun 2020 10:45:18 +0800
Subject: [PATCH 1502/1830] Fix lint.

---
 app/models/invite_redeemer.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index f70c8a1ae9..9c716d2983 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -147,8 +147,10 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
 
   def notify_invitee
     if inviter = invite.invited_by
-      inviter.notifications.create!(notification_type: Notification.types[:invitee_accepted],
-                                   data: { display_username: invited_user.username }.to_json)
+      inviter.notifications.create!(
+        notification_type: Notification.types[:invitee_accepted],
+        data: { display_username: invited_user.username }.to_json
+      )
     end
   end
 

From ade60b0cbcf254c5ff5a501eecbe67c065ba21e7 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 2 Jun 2020 11:32:07 +0800
Subject: [PATCH 1503/1830] DEV: Enable readonly mode for all multisite sites
 when PG goes down.

The risk here is that the database for one site goes down in the multisite setup and we drop everything to readonly mode. However, I discussed this with Sam and we agree that one database having problem is very rare. Most of the time, it is the entire DB cluster that goes down.
---
 config/initializers/002-rails_failover.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index d45a45e00a..04186541c5 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -2,12 +2,18 @@
 
 if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
   RailsFailover::ActiveRecord.on_failover do
-    Discourse.enable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+    RailsMultisite::ConnectionManagement.each_connection do
+      Discourse.enable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+    end
+
     Sidekiq.pause!("pg_failover") if !Sidekiq.paused?
   end
 
   RailsFailover::ActiveRecord.on_fallback do
-    Discourse.disable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+    RailsMultisite::ConnectionManagement.each_connection do
+      Discourse.disable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+    end
+
     Sidekiq.unpause!
   end
 

From fe9c82994d54c3797fa9d26448d515986fff2375 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 2 Jun 2020 11:40:16 +0800
Subject: [PATCH 1504/1830] DEV: Actually disconnect from Redis connections
 after fork.

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

diff --git a/lib/discourse.rb b/lib/discourse.rb
index 8417558972..27c28e199d 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -657,7 +657,7 @@ module Discourse
     Discourse.cache.reconnect
     Logster.store.redis.reconnect
     # shuts down all connections in the pool
-    Sidekiq.redis_pool.shutdown { |c| nil }
+    Sidekiq.redis_pool.shutdown { |conn| conn.close  }
     # re-establish
     Sidekiq.redis = sidekiq_redis_config
 

From e4cd4f7e0be9fec5d0e939f49da5f4e756ea7afa Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 2 Jun 2020 11:46:55 +0800
Subject: [PATCH 1505/1830] DEV: Avoid reaching for `Redis#_client` which is
 considered deprecated.

---
 config/unicorn.conf.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index 268edb66c9..71831433dd 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -162,7 +162,7 @@ before_fork do |server, worker|
               sleep 10
               force_kill_rogue_sidekiq
             end
-            Discourse.redis._client.disconnect
+            Discourse.redis.close
           end
         end
 
@@ -177,7 +177,7 @@ before_fork do |server, worker|
 
   end
 
-  Discourse.redis._client.disconnect
+  Discourse.redis.close
 
   # Throttle the master from forking too quickly by sleeping.  Due
   # to the implementation of standard Unix signal handlers, this

From 3dd17781998b2e2fee84e9050de74d5efbd96e54 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 2 Jun 2020 12:04:02 +0800
Subject: [PATCH 1506/1830] PERF: Reduce number of queries from 3 -> 1 when
 fetching web manifest.

---
 app/controllers/metadata_controller.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/metadata_controller.rb b/app/controllers/metadata_controller.rb
index 3ac058e33a..fecf6c1104 100644
--- a/app/controllers/metadata_controller.rb
+++ b/app/controllers/metadata_controller.rb
@@ -33,7 +33,8 @@ class MetadataController < ApplicationController
       end
     end
 
-    primary_color = ColorScheme.hex_for_name('primary', view_context.scheme_id)
+    scheme_id = view_context.scheme_id
+    primary_color = ColorScheme.hex_for_name('primary', scheme_id)
     icon_url_base = UrlHelper.absolute("/svg-sprite/#{Discourse.current_hostname}/icon/#{primary_color}")
 
     manifest = {
@@ -41,8 +42,8 @@ class MetadataController < ApplicationController
       short_name: SiteSetting.short_title.presence || SiteSetting.title.truncate(12, separator: ' ', omission: ''),
       display: display,
       start_url: Discourse.base_uri.present? ? "#{Discourse.base_uri}/" : '.',
-      background_color: "##{ColorScheme.hex_for_name('secondary', view_context.scheme_id)}",
-      theme_color: "##{ColorScheme.hex_for_name('header_background', view_context.scheme_id)}",
+      background_color: "##{ColorScheme.hex_for_name('secondary', scheme_id)}",
+      theme_color: "##{ColorScheme.hex_for_name('header_background', scheme_id)}",
       icons: [
       ],
       share_target: {

From 426b62a04ad638fc79fe1b5c532a61e30b1f1e4b Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 2 Jun 2020 12:15:31 +0800
Subject: [PATCH 1507/1830] DEV: Add silencer for verbose query logs in
 development.

---
 config/environments/development.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index e8d1d503e1..7cb2a61d72 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -82,6 +82,12 @@ Discourse::Application.configure do
       config.colorize_logging = true
     end
 
+    if ENV["RAILS_VERBOSE_QUERY_LOGS"] == "1"
+      ActiveRecord::LogSubscriber.backtrace_cleaner.add_silencer do |line|
+        line =~ /lib\/freedom_patches\/fast_pluck\.rb/
+      end
+    end
+
     if ENV['BULLET']
       Bullet.enable = true
       Bullet.rails_logger = true

From 111e8dec10333fb04027785a317f73ce203489df Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 2 Jun 2020 15:11:33 +1000
Subject: [PATCH 1508/1830] DEV: Bump rubocop from 0.84.0 to 0.85.0 (#9960)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.84.0 to 0.85.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.84.0...v0.85.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Change looks safe, everything is still passing lint
---
 Gemfile.lock | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6bf999c7a3..2b1a4069b1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -311,6 +311,7 @@ GEM
     redis (4.1.4)
     redis-namespace (1.7.0)
       redis (>= 3.0.4)
+    regexp_parser (1.7.0)
     request_store (1.5.0)
       rack (>= 1.4)
     rexml (3.2.4)
@@ -350,10 +351,11 @@ GEM
       json-schema (~> 2.2)
       railties (>= 3.1, < 7.0)
     rtlit (0.0.5)
-    rubocop (0.84.0)
+    rubocop (0.85.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
       rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)

From 6358e79f0f74459b284e6e9409e8abd35e5fe20c Mon Sep 17 00:00:00 2001
From: Aman Gupta Karmani <aman@tmm1.net>
Date: Mon, 1 Jun 2020 22:18:03 -0700
Subject: [PATCH 1509/1830] FIX: catch NoMethodError during precompile_css too
 (#9940)

Ran into this on heroku:

    NoMethodError: undefined method `enabled?' for #<Theme:0x0000558f069e7718>
    vendor/bundle/ruby/2.6.0/gems/activemodel-6.0.1/lib/active_model/attribute_methods.rb:431:in `method_missing'
    app/models/theme.rb:155:in `block (2 levels) in transform_ids'
    vendor/bundle/ruby/2.6.0/gems/activerecord-6.0.1/lib/active_record/relation/delegation.rb:85:in `each'
    vendor/bundle/ruby/2.6.0/gems/activerecord-6.0.1/lib/active_record/relation/delegation.rb:85:in `each'
    vendor/bundle/ruby/2.6.0/gems/activerecord-6.0.1/lib/active_record/relation/query_methods.rb:260:in `select'
    vendor/bundle/ruby/2.6.0/gems/activerecord-6.0.1/lib/active_record/relation/query_methods.rb:260:in `select'
    app/models/theme.rb:155:in `block in transform_ids'
    app/models/theme.rb:105:in `get_set_cache'
    app/models/theme.rb:140:in `transform_ids'
    app/models/theme.rb:321:in `list_baked_fields'
    app/models/theme.rb:317:in `resolve_baked_field'
    lib/stylesheet/manager.rb:289:in `theme_digest'
---
 lib/tasks/assets.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index 4261d69450..67788e3cf8 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -57,7 +57,7 @@ task 'assets:precompile:css' => 'environment' do
         STDERR.puts "Compiling css for #{db} #{Time.zone.now}"
         begin
           Stylesheet::Manager.precompile_css
-        rescue PG::UndefinedColumn, ActiveModel::MissingAttributeError => e
+        rescue PG::UndefinedColumn, ActiveModel::MissingAttributeError, NoMethodError => e
           STDERR.puts "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"
           STDERR.puts "Skipping precompilation of CSS cause schema is old, you are precompiling prior to running migrations."
         end

From f9e715672b1a7d23adb72676c06f88676165b2df Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 2 Jun 2020 07:20:14 +0200
Subject: [PATCH 1510/1830] DEV: makes autocomplete debounced (#9941)

* DEV: makes autocomplete debounced

* better wording
---
 .../discourse/app/lib/autocomplete.js         | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/autocomplete.js b/app/assets/javascripts/discourse/app/lib/autocomplete.js
index eea9f8e417..4b42b3b02f 100644
--- a/app/assets/javascripts/discourse/app/lib/autocomplete.js
+++ b/app/assets/javascripts/discourse/app/lib/autocomplete.js
@@ -1,4 +1,5 @@
-import { cancel, later } from "@ember/runloop";
+import { INPUT_DELAY } from "discourse-common/config/environment";
+import { debounce, cancel, later } from "@ember/runloop";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { setCaretPosition, caretPosition } from "discourse/lib/utilities";
 import Site from "discourse/models/site";
@@ -413,9 +414,7 @@ export default function(options) {
     return options.triggerRule ? options.triggerRule(me[0], opts) : true;
   }
 
-  $(this).on("keyup.autocomplete", function(e) {
-    if ([keys.esc, keys.enter].indexOf(e.which) !== -1) return true;
-
+  function debouncedInput() {
     let cp = caretPosition(me[0]);
     const key = me[0].value[cp - 1];
 
@@ -426,7 +425,7 @@ export default function(options) {
           completeStart = cp - match[0].length;
           completeEnd = completeStart + match[0].length - 1;
           let term = match[0].substring(1, match[0].length);
-          updateAutoComplete(dataSource(term, options));
+          debouncedUpdateAutocomplete(term, options);
         }
       }
     }
@@ -439,15 +438,24 @@ export default function(options) {
           (!prevChar || allowedLettersRegex.test(prevChar))
         ) {
           completeStart = completeEnd = cp - 1;
-          updateAutoComplete(dataSource("", options));
+          debouncedUpdateAutocomplete("", options);
         }
       }
     } else if (completeStart !== null) {
       let term = me.val().substring(completeStart + (options.key ? 1 : 0), cp);
-      updateAutoComplete(dataSource(term, options));
+      debouncedUpdateAutocomplete(term, options);
     }
+  }
+
+  $(this).on("keyup.autocomplete", function(e) {
+    if ([keys.esc, keys.enter].indexOf(e.which) !== -1) return true;
+    debounce(this, debouncedInput, INPUT_DELAY);
   });
 
+  function debouncedUpdateAutocomplete(t, o) {
+    updateAutoComplete(dataSource(t, o));
+  }
+
   $(this).on("keydown.autocomplete", function(e) {
     var c, i, initial, prev, prevIsGood, stopFound, term, total, userToComplete;
     let cp;
@@ -496,7 +504,13 @@ export default function(options) {
           ) {
             completeStart = c;
             term = me[0].value.substring(c + 1, initial);
-            updateAutoComplete(dataSource(term, options));
+            debounce(
+              this,
+              debouncedUpdateAutocomplete,
+              term,
+              options,
+              INPUT_DELAY
+            );
             return true;
           }
         }
@@ -583,7 +597,13 @@ export default function(options) {
             closeAutocomplete();
           }
 
-          updateAutoComplete(dataSource(term, options));
+          debounce(
+            this,
+            debouncedUpdateAutocomplete,
+            term,
+            options,
+            INPUT_DELAY
+          );
           return true;
         default:
           completeEnd = cp;

From ef3e3077d0cbc2e592beae7b228320ca995a372b Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Tue, 2 Jun 2020 09:11:25 +0300
Subject: [PATCH 1511/1830] FIX: Staff users can bypass tag validation rule
 (#9924)

---
 .../discourse/app/controllers/composer.js     |  1 +
 .../discourse/app/models/composer.js          |  2 +-
 .../acceptance/composer-tags-test.js          | 58 +++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 test/javascripts/acceptance/composer-tags-test.js

diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index 54aae53368..d4a5466da3 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -1157,6 +1157,7 @@ export default Controller.extend({
     const tagsArray = tags || [];
     if (
       this.site.can_tag_topics &&
+      !this.currentUser.staff &&
       category &&
       category.minimum_required_tags > tagsArray.length
     ) {
diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index 98ccdfaa6d..f4d302775a 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -374,7 +374,7 @@ const Composer = RestModel.extend({
     "tags",
     "topicFirstPost",
     "minimumRequiredTags",
-    "isStaffUser"
+    "user.staff"
   )
   cantSubmitPost(
     loading,
diff --git a/test/javascripts/acceptance/composer-tags-test.js b/test/javascripts/acceptance/composer-tags-test.js
new file mode 100644
index 0000000000..74391cde40
--- /dev/null
+++ b/test/javascripts/acceptance/composer-tags-test.js
@@ -0,0 +1,58 @@
+import Category from "discourse/models/category";
+import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
+import selectKit from "helpers/select-kit-helper";
+
+acceptance("Composer - Tags", {
+  loggedIn: true,
+  pretend(pretenderServer, helper) {
+    pretenderServer.post("/uploads/lookup-urls", () => {
+      return helper.response([]);
+    });
+  },
+  site: {
+    can_tag_topics: true
+  }
+});
+
+QUnit.test("staff bypass tag validation rule", async assert => {
+  await visit("/");
+  await click("#create-topic");
+
+  await fillIn("#reply-title", "this is my new topic title");
+  await fillIn(".d-editor-input", "this is the *content* of a post");
+
+  Category.findById(2).set("minimum_required_tags", 1);
+
+  const categoryChooser = selectKit(".category-chooser");
+  await categoryChooser.expand();
+  await categoryChooser.selectRowByValue(2);
+
+  await click("#reply-control button.create");
+  assert.notEqual(currentURL(), "/");
+});
+
+QUnit.test("users do not bypass tag validation rule", async assert => {
+  await visit("/");
+  await click("#create-topic");
+
+  await fillIn("#reply-title", "this is my new topic title");
+  await fillIn(".d-editor-input", "this is the *content* of a post");
+
+  Category.findById(2).set("minimum_required_tags", 1);
+
+  const categoryChooser = selectKit(".category-chooser");
+  await categoryChooser.expand();
+  await categoryChooser.selectRowByValue(2);
+
+  updateCurrentUser({ moderator: false, admin: false, trust_level: 1 });
+
+  await click("#reply-control button.create");
+  assert.equal(currentURL(), "/");
+
+  const tags = selectKit(".mini-tag-chooser");
+  await tags.expand();
+  await tags.selectRowByValue("monkey");
+
+  await click("#reply-control button.create");
+  assert.notEqual(currentURL(), "/");
+});

From d76ea9fa6b28fbb20d8ea78800873dfe2514bf5f Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Tue, 2 Jun 2020 09:14:41 +0300
Subject: [PATCH 1512/1830] FIX: Do not destroy $.fileupload element (#9888)

conditional-loading-section component rerendered the <input> element
and lost the necessary event handlers for jQuery-File-Upload.
---
 .../app/components/emoji-uploader.js          |  8 +-
 .../discourse/app/mixins/upload.js            |  4 +-
 .../templates/components/emoji-uploader.hbs   | 95 ++++++++++---------
 config/locales/client.en.yml                  |  1 +
 4 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/emoji-uploader.js b/app/assets/javascripts/discourse/app/components/emoji-uploader.js
index 9693811c15..0be91fec74 100644
--- a/app/assets/javascripts/discourse/app/components/emoji-uploader.js
+++ b/app/assets/javascripts/discourse/app/components/emoji-uploader.js
@@ -1,4 +1,4 @@
-import { notEmpty, not } from "@ember/object/computed";
+import { notEmpty } from "@ember/object/computed";
 import { action } from "@ember/object";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
@@ -11,7 +11,6 @@ export default Component.extend(UploadMixin, {
   uploadUrl: "/admin/customize/emojis",
   hasName: notEmpty("name"),
   hasGroup: notEmpty("group"),
-  addDisabled: not("hasName"),
   group: "default",
   emojiGroups: null,
   newEmojiGroups: null,
@@ -23,6 +22,11 @@ export default Component.extend(UploadMixin, {
     this.set("newEmojiGroups", this.emojiGroups);
   },
 
+  @discourseComputed("hasName", "uploading")
+  addDisabled() {
+    return !this.hasName || this.uploading;
+  },
+
   uploadOptions() {
     return { sequentialUploads: true };
   },
diff --git a/app/assets/javascripts/discourse/app/mixins/upload.js b/app/assets/javascripts/discourse/app/mixins/upload.js
index 85fdbc0031..b7394663a9 100644
--- a/app/assets/javascripts/discourse/app/mixins/upload.js
+++ b/app/assets/javascripts/discourse/app/mixins/upload.js
@@ -39,8 +39,10 @@ export default Mixin.create({
 
   _initialize: on("didInsertElement", function() {
     const $upload = $(this.element);
-    const reset = () =>
+    const reset = () => {
       this.setProperties({ uploading: false, uploadProgress: 0 });
+      document.getElementsByClassName("hidden-upload-field")[0].value = "";
+    };
     const maxFiles = this.getWithDefault(
       "maxFiles",
       this.siteSettings.simultaneous_uploads
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-uploader.hbs
index 7e1506383c..6839c6cb6f 100644
--- a/app/assets/javascripts/discourse/app/templates/components/emoji-uploader.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/emoji-uploader.hbs
@@ -1,48 +1,51 @@
-{{#conditional-loading-section isLoading=uploading}}
-  <div class="emoji-uploader">
-    <div class="control">
-      <span class="label">
-        {{i18n "admin.emoji.name"}}
-      </span>
-      <div class="input">
-        {{input
-          name="name"
-          placeholderKey="admin.emoji.name"
-          value=(readonly name)
-          input=(action (mut name) value="target.value")
-        }}
-      </div>
-    </div>
-    <div class="control">
-      <span class="label">
-        {{i18n "admin.emoji.group"}}
-      </span>
-      <div class="input">
-        {{combo-box
-          name="group"
-          value=group
-          content=newEmojiGroups
-          onChange=(action "createEmojiGroup")
-          valueProperty=null
-          nameProperty=null
-          options=(hash
-            allowAny=true
-          )
-        }}
-      </div>
-    </div>
-    <div class="control">
-      <div class="input">
-        <label class="btn btn-default btn-primary {{if addDisabled "disabled"}}">
-          {{d-icon "plus"}}
-          {{i18n "admin.emoji.add"}}
-          <input
-            class="hidden-upload-field"
-            disabled={{addDisabled}}
-            type="file"
-            accept=".png,.gif">
-        </label>
-      </div>
+<div class="emoji-uploader">
+  <div class="control">
+    <span class="label">
+      {{i18n "admin.emoji.name"}}
+    </span>
+    <div class="input">
+      {{input
+        name="name"
+        placeholderKey="admin.emoji.name"
+        value=(readonly name)
+        input=(action (mut name) value="target.value")
+      }}
     </div>
   </div>
-{{/conditional-loading-section}}
+  <div class="control">
+    <span class="label">
+      {{i18n "admin.emoji.group"}}
+    </span>
+    <div class="input">
+      {{combo-box
+        name="group"
+        value=group
+        content=newEmojiGroups
+        onChange=(action "createEmojiGroup")
+        valueProperty=null
+        nameProperty=null
+        options=(hash
+          allowAny=true
+        )
+      }}
+    </div>
+  </div>
+  <div class="control">
+    <div class="input">
+      <label class="btn btn-default btn-primary {{if addDisabled "disabled"}}">
+        {{#if uploading}}
+          {{d-icon "spinner" class="loading-icon"}}
+          <span>{{i18n "admin.emoji.uploading"}}</span>
+        {{else}}
+          {{d-icon "plus"}}
+          <span>{{i18n "admin.emoji.add"}}</span>
+        {{/if}}
+        <input
+          class="hidden-upload-field"
+          disabled={{addDisabled}}
+          type="file"
+          accept=".png,.gif">
+      </label>
+    </div>
+  </div>
+</div>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 3c85e215fb..95830e309a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4673,6 +4673,7 @@ en:
         title: "Emoji"
         help: "Add new emoji that will be available to everyone. (PROTIP: drag & drop multiple files at once)"
         add: "Add New Emoji"
+        uploading: "Uploading..."
         name: "Name"
         group: "Group"
         image: "Image"

From 75b1298e997ce7dda904cc88b668a55eb13b457f Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 2 Jun 2020 07:21:38 +0100
Subject: [PATCH 1513/1830] DEV: Drop unused image_url column from posts and
 topics (#9953)

This has been superseded by image_upload_id. The image_url value in API responses is now generated dynamically from the upload record.
---
 app/models/post.rb                            |  7 ++--
 app/models/topic.rb                           |  7 ++--
 ...00_remove_image_url_from_post_and_topic.rb | 40 +++++++++++++++++++
 3 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 db/post_migrate/20200601111500_remove_image_url_from_post_and_topic.rb

diff --git a/app/models/post.rb b/app/models/post.rb
index 37b5deadc9..36522ae873 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -10,8 +10,10 @@ class Post < ActiveRecord::Base
   include HasCustomFields
   include LimitedEdit
 
-  # TODO(2021-01-04): remove
-  self.ignored_columns = ["avg_time"]
+  self.ignored_columns = [
+    "avg_time", # TODO(2021-01-04): remove
+    "image_url" # TODO(2021-06-01): remove
+  ]
 
   cattr_accessor :plugin_permitted_create_params
   self.plugin_permitted_create_params = {}
@@ -1145,7 +1147,6 @@ end
 #  raw_email               :text
 #  public_version          :integer          default(1), not null
 #  action_code             :string
-#  image_url               :string
 #  locked_by_id            :integer
 #  image_upload_id         :bigint
 #
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 38affdb327..49d14cbf22 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -10,8 +10,10 @@ class Topic < ActiveRecord::Base
   include LimitedEdit
   extend Forwardable
 
-  # TODO(2021-01-04): remove
-  self.ignored_columns = ["avg_time"]
+  self.ignored_columns = [
+    "avg_time", # TODO(2021-01-04): remove
+    "image_url" # TODO(2021-06-01): remove
+  ]
 
   def_delegator :featured_users, :user_ids, :featured_user_ids
   def_delegator :featured_users, :choose, :feature_topic_users
@@ -1663,7 +1665,6 @@ end
 #  featured_user3_id         :integer
 #  deleted_at                :datetime
 #  highest_post_number       :integer          default(0), not null
-#  image_url                 :string
 #  like_count                :integer          default(0), not null
 #  incoming_link_count       :integer          default(0), not null
 #  category_id               :integer
diff --git a/db/post_migrate/20200601111500_remove_image_url_from_post_and_topic.rb b/db/post_migrate/20200601111500_remove_image_url_from_post_and_topic.rb
new file mode 100644
index 0000000000..5f0269783e
--- /dev/null
+++ b/db/post_migrate/20200601111500_remove_image_url_from_post_and_topic.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class RemoveImageUrlFromPostAndTopic < ActiveRecord::Migration[6.0]
+  disable_ddl_transaction!
+
+  def up
+    execute <<~SQL
+      ALTER TABLE topics DROP COLUMN IF EXISTS image_url
+    SQL
+
+    ActiveRecord::Base.transaction do
+      execute "DROP VIEW badge_posts"
+
+      execute <<~SQL
+        ALTER TABLE posts DROP COLUMN IF EXISTS image_url
+      SQL
+
+      # we must recreate this view every time we amend posts
+      # p.* is auto expanded and persisted into the view definition
+      # at create time
+      execute <<~SQL
+        CREATE VIEW badge_posts AS
+        SELECT p.*
+        FROM posts p
+        JOIN topics t ON t.id = p.topic_id
+        JOIN categories c ON c.id = t.category_id
+        WHERE c.allow_badges AND
+              p.deleted_at IS NULL AND
+              t.deleted_at IS NULL AND
+              NOT c.read_restricted AND
+              t.visible AND
+              p.post_type IN (1,2,3)
+      SQL
+    end
+  end
+
+  def down
+    # do nothing re-runnable
+  end
+end

From 4120ef7305a1124bd448ba65c29613437f2cfa2d Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 2 Jun 2020 16:49:33 +0800
Subject: [PATCH 1514/1830] Bump rails_multisite to 2.2.2.

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2b1a4069b1..12eb274516 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -286,7 +286,7 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails_multisite (2.1.2)
+    rails_multisite (2.2.2)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
     railties (6.0.3.1)

From deb84017f2f48faf337446a4b76952934fb8d042 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 2 Jun 2020 17:01:45 +0800
Subject: [PATCH 1515/1830] Update `rails_failover`.

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 12eb274516..53a0a696ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/discourse/rails_failover
-  revision: 0e668eba86591c20aa7a43f47b0cd36d4eacaeb6
+  revision: 291bf1c18e9a704556a40204d8160549d0438e96
   specs:
     rails_failover (0.4.0)
       activerecord (~> 6.0)

From 439db7ca1ece96819948c3abd3b61e9927200087 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 2 Jun 2020 17:24:14 +0800
Subject: [PATCH 1516/1830] DEV: Add `REDIS_RAILS_FAILOVER` env to test our new
 redis failover.

---
 Gemfile.lock                              |  2 +-
 app/models/global_setting.rb              | 24 +++++++++++++++++------
 config/application.rb                     |  4 ++++
 config/initializers/002-rails_failover.rb | 11 +++++++++++
 lib/discourse_redis.rb                    |  5 ++++-
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 53a0a696ce..92e1f2a4a7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/discourse/rails_failover
-  revision: 291bf1c18e9a704556a40204d8160549d0438e96
+  revision: 73ceb21624079e007a7d3bf0bf201f0b34dcd6aa
   specs:
     rails_failover (0.4.0)
       activerecord (~> 6.0)
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index a31df606eb..cd80df6681 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -169,9 +169,15 @@ class GlobalSetting
         c[:port] = redis_port if redis_port
 
         if redis_slave_host && redis_slave_port
-          c[:slave_host] = redis_slave_host
-          c[:slave_port] = redis_slave_port
-          c[:connector] = DiscourseRedis::Connector
+          if ENV["REDIS_RAILS_FAILOVER"]
+            c[:replica_host] = redis_slave_host
+            c[:replica_port] = redis_slave_port
+            c[:connector] = RailsFailover::Redis::Connector
+          else
+            c[:slave_host] = redis_slave_host
+            c[:slave_port] = redis_slave_port
+            c[:connector] = DiscourseRedis::Connector
+          end
         end
 
         c[:password] = redis_password if redis_password.present?
@@ -193,9 +199,15 @@ class GlobalSetting
         c[:port] = message_bus_redis_port if message_bus_redis_port
 
         if message_bus_redis_slave_host && message_bus_redis_slave_port
-          c[:slave_host] = message_bus_redis_slave_host
-          c[:slave_port] = message_bus_redis_slave_port
-          c[:connector] = DiscourseRedis::Connector
+          if ENV["REDIS_RAILS_FAILOVER"]
+            c[:replica_host] = redis_slave_host
+            c[:replica_port] = redis_slave_port
+            c[:connector] = RailsFailover::Redis::Connector
+          else
+            c[:slave_host] = message_bus_redis_slave_host
+            c[:slave_port] = message_bus_redis_slave_port
+            c[:connector] = DiscourseRedis::Connector
+          end
         end
 
         c[:password] = message_bus_redis_password if message_bus_redis_password.present?
diff --git a/config/application.rb b/config/application.rb
index f2cbb14391..07730bc63b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -31,6 +31,10 @@ if ENV['ACTIVE_RECORD_RAILS_FAILOVER']
   require 'rails_failover/active_record'
 end
 
+if ENV['REDIS_RAILS_FAILOVER']
+  require 'rails_failover/redis'
+end
+
 # Global config
 require_relative '../app/models/global_setting'
 GlobalSetting.configure!
diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index 04186541c5..5b65d579f1 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -1,5 +1,16 @@
 # frozen_string_literal: true
 
+if ENV["REDIS_RAILS_FAILOVER"]
+  RailsFailover::Redis.on_failover do
+    Discourse.received_redis_readonly!
+  end
+
+  RailsFailover::Redis.on_fallback do
+    Discourse.clear_readonly!
+    Discourse.request_refresh!
+  end
+end
+
 if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
   RailsFailover::ActiveRecord.on_failover do
     RailsMultisite::ConnectionManagement.each_connection do
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index e273810a3c..b172c02d12 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -176,7 +176,10 @@ class DiscourseRedis
         STDERR.puts "WARN: Redis is in a readonly state. Performed a noop"
       end
 
-      fallback_handler.verify_master if !fallback_handler.master
+      if !ENV["REDIS_RAILS_FAILOVER"]
+        fallback_handler.verify_master if !fallback_handler.master
+      end
+
       Discourse.received_redis_readonly!
       nil
     else

From 3e8d548d35432fab3d402104fbe1cdc8760a5f52 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 2 Jun 2020 16:30:34 +0200
Subject: [PATCH 1517/1830] FIX: Prevent clipping user mentions (#9962)

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

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 8ae08056b6..5f56f61226 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -806,11 +806,12 @@ blockquote > *:last-child {
 }
 
 a.mention {
+  align-items: baseline;
+  display: inline-flex;
   font-weight: bold;
   font-size: 0.93em;
-  color: $primary;
   color: dark-light-choose($primary-high, $secondary-low);
-  padding: 2px 4px;
+  padding: 1px 4px;
   background: $primary-low;
   border-radius: 8px;
 }

From 4e3a84c68793f576db84be095039e011a43d2e50 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 2 Jun 2020 11:49:02 -0400
Subject: [PATCH 1518/1830] FIX: If creating a flag for a watched word, include
 the reason

---
 app/jobs/regular/process_post.rb       |  7 ++++++-
 lib/post_action_creator.rb             | 16 +++++++++++++---
 spec/integration/watched_words_spec.rb |  8 +++++++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/jobs/regular/process_post.rb b/app/jobs/regular/process_post.rb
index 871e1dbb4a..24048a5f46 100644
--- a/app/jobs/regular/process_post.rb
+++ b/app/jobs/regular/process_post.rb
@@ -44,7 +44,12 @@ module Jobs
           s = post.cooked
           s << " #{post.topic.title}" if post.post_number == 1
           if !args[:bypass_bump] && WordWatcher.new(s).should_flag?
-            PostActionCreator.create(Discourse.system_user, post, :inappropriate)
+            PostActionCreator.create(
+              Discourse.system_user,
+              post,
+              :inappropriate,
+              reason: :watched_word
+            )
           end
         end
       end
diff --git a/lib/post_action_creator.rb b/lib/post_action_creator.rb
index ab38576c8f..f647a437cd 100644
--- a/lib/post_action_creator.rb
+++ b/lib/post_action_creator.rb
@@ -7,8 +7,15 @@ class PostActionCreator
 
   # Shortcut methods for easier invocation
   class << self
-    def create(created_by, post, action_key, message: nil, created_at: nil)
-      new(created_by, post, PostActionType.types[action_key], message: message, created_at: created_at).perform
+    def create(created_by, post, action_key, message: nil, created_at: nil, reason: nil)
+      new(
+        created_by,
+        post,
+        PostActionType.types[action_key],
+        message: message,
+        created_at: created_at,
+        reason: reason
+      ).perform
     end
 
     [:like, :off_topic, :spam, :inappropriate, :bookmark].each do |action|
@@ -31,7 +38,8 @@ class PostActionCreator
     message: nil,
     take_action: false,
     flag_topic: false,
-    created_at: nil
+    created_at: nil,
+    reason: nil
   )
     @created_by = created_by
     @created_at = created_at || Time.zone.now
@@ -46,6 +54,7 @@ class PostActionCreator
     @message = message
     @flag_topic = flag_topic
     @meta_post = nil
+    @reason = reason
   end
 
   def post_can_act?
@@ -306,6 +315,7 @@ private
       created_at: @created_at,
       take_action: @take_action,
       meta_topic_id: @meta_post&.topic_id,
+      reason: @reason
     )
   end
 
diff --git a/spec/integration/watched_words_spec.rb b/spec/integration/watched_words_spec.rb
index 4657c7e0b1..b8f5fff39b 100644
--- a/spec/integration/watched_words_spec.rb
+++ b/spec/integration/watched_words_spec.rb
@@ -141,7 +141,13 @@ describe WatchedWord do
     end
 
     it "should flag the post as inappropriate" do
-      should_flag_post(tl2_user, "I thought the #{flag_word.word} was bad.", Fabricate(:topic, user: tl2_user))
+      topic = Fabricate(:topic, user: tl2_user)
+      post = Fabricate(:post, raw: "I said.... #{flag_word.word}", topic: topic, user: tl2_user)
+      Jobs::ProcessPost.new.execute(post_id: post.id)
+      expect(PostAction.where(post_id: post.id, post_action_type_id: PostActionType.types[:inappropriate]).exists?).to eq(true)
+      reviewable = ReviewableFlaggedPost.where(target: post)
+      expect(reviewable).to be_present
+      expect(ReviewableScore.where(reviewable: reviewable, reason: 'watched_word')).to be_present
     end
 
     it "should look at the title too" do

From b3c8d364126732d8be6adeb50bc949bc524a13c8 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Tue, 2 Jun 2020 11:39:12 -0500
Subject: [PATCH 1519/1830] DEV: Plugin api for adding extra header icons
 (#9964)

---
 .../discourse/app/lib/plugin-api.js            | 18 +++++++++++++++++-
 .../discourse/app/widgets/header.js            | 12 ++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index 101c97da4b..879eeac107 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -28,7 +28,10 @@ import { addTagsHtmlCallback } from "discourse/lib/render-tags";
 import { addUserMenuGlyph } from "discourse/widgets/user-menu";
 import { addPostClassesCallback } from "discourse/widgets/post";
 import { addPostTransformCallback } from "discourse/widgets/post-stream";
-import { attachAdditionalPanel } from "discourse/widgets/header";
+import {
+  attachAdditionalPanel,
+  addToHeaderIcons
+} from "discourse/widgets/header";
 import {
   registerIconRenderer,
   replaceIcon
@@ -1141,6 +1144,19 @@ class PluginApi {
   addCategoryLinkIcon(renderer) {
     addExtraIconRenderer(renderer);
   }
+  /**
+   * Adds a widget to the header-icon ul. The widget must already be created. You can create new widgets
+   * in a theme or plugin via an initializer prior to calling this function.
+   *
+   * ```
+   * api.addToHeaderIcons(
+   *  createWidget('some-widget')
+   * ```
+   *
+   **/
+  addToHeaderIcons(icon) {
+    addToHeaderIcons(icon);
+  }
 }
 
 let _pluginv01;
diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index 2580fff416..4699a58a86 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -12,6 +12,12 @@ import { addExtraUserClasses } from "discourse/helpers/user-avatar";
 import { scrollTop } from "discourse/mixins/scroll-top";
 import { h } from "virtual-dom";
 
+const _extraHeaderIcons = [];
+
+export function addToHeaderIcons(icon) {
+  _extraHeaderIcons.push(icon);
+}
+
 const dropdown = {
   buildClasses(attrs) {
     if (attrs.active) {
@@ -226,6 +232,12 @@ createWidget("header-icons", {
       );
     }
 
+    if (_extraHeaderIcons) {
+      _extraHeaderIcons.forEach(icon => {
+        icons.push(this.attach(icon));
+      });
+    }
+
     return icons;
   }
 });

From 0cf297725faa931500b3f4aa2d9d4348ea3b2114 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 2 Jun 2020 18:41:23 +0200
Subject: [PATCH 1520/1830] DEV: Use consistent interpolation key format in
 translations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From now on client strings can easily be reused on the server and you don’t have to think about choosing the right format anymore.
---
 .../app/components/flag-action-type.js        |   2 +-
 .../app/components/reviewable-score.js        |   5 +-
 config/locales/client.en.yml                  | 448 +++++++++---------
 config/locales/server.en.yml                  |   8 +-
 spec/integrity/i18n_spec.rb                   |  14 +-
 test/javascripts/fixtures/site-fixtures.js    |   2 +-
 test/javascripts/helpers/site.js              |   2 +-
 7 files changed, 248 insertions(+), 233 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/flag-action-type.js b/app/assets/javascripts/discourse/app/components/flag-action-type.js
index 93de11b8fb..50f041d9b2 100644
--- a/app/assets/javascripts/discourse/app/components/flag-action-type.js
+++ b/app/assets/javascripts/discourse/app/components/flag-action-type.js
@@ -20,7 +20,7 @@ export default Component.extend({
   )
   formattedName(name, nameKey, isCustomFlag, username) {
     if (isCustomFlag) {
-      return name.replace("{{username}}", username);
+      return name.replace(/{{username}}|%{username}/, username);
     } else {
       return I18n.t("flagging.formatted_name." + nameKey);
     }
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-score.js b/app/assets/javascripts/discourse/app/components/reviewable-score.js
index ee36959c61..d9b18492cf 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-score.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-score.js
@@ -10,7 +10,10 @@ export default Component.extend({
   @discourseComputed("rs.score_type.title", "reviewable.target_created_by")
   title(title, targetCreatedBy) {
     if (title && targetCreatedBy) {
-      return title.replace("{{username}}", targetCreatedBy.username);
+      return title.replace(
+        /{{username}}|%{username}/,
+        targetCreatedBy.username
+      );
     }
 
     return title;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 95830e309a..8d7d1724c2 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -34,8 +34,8 @@ en:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
       time: "HH:mm"
@@ -265,11 +265,11 @@ en:
     weekly: "weekly"
     every_month: "every month"
     every_six_months: "every six months"
-    max_of_count: "max of {{count}}"
+    max_of_count: "max of %{count}"
     alternation: "or"
     character_count:
-      one: "{{count}} character"
-      other: "{{count}} characters"
+      one: "%{count} character"
+      other: "%{count} characters"
 
     related_messages:
       title: "Related Messages"
@@ -352,16 +352,16 @@ en:
         no_value: "No, keep"
 
     topic_count_latest:
-      one: "See {{count}} new or updated topic"
-      other: "See {{count}} new or updated topics"
+      one: "See %{count} new or updated topic"
+      other: "See %{count} new or updated topics"
 
     topic_count_unread:
-      one: "See {{count}} unread topic"
-      other: "See {{count}} unread topics"
+      one: "See %{count} unread topic"
+      other: "See %{count} unread topics"
 
     topic_count_new:
-      one: "See {{count}} new topic"
-      other: "See {{count}} new topics"
+      one: "See %{count} new topic"
+      other: "See %{count} new topics"
 
     preview: "preview"
     cancel: "cancel"
@@ -372,7 +372,7 @@ en:
 
     upload: "Upload"
     uploading: "Uploading..."
-    uploading_filename: "Uploading: {{filename}}..."
+    uploading_filename: "Uploading: %{filename}..."
     clipboard: "clipboard"
     uploaded: "Uploaded!"
 
@@ -434,7 +434,7 @@ en:
         optional: "You can claim this item to prevent others from reviewing it."
         required: "You must claim items before you can review them."
         claimed_by_you: "You've claimed this item and can review it."
-        claimed_by_other: "This item can only be reviewed by <b>{{username}}</b>."
+        claimed_by_other: "This item can only be reviewed by <b>%{username}</b>."
       claim:
         title: "claim this topic"
       unclaim:
@@ -455,7 +455,7 @@ en:
       view_pending: "view pending"
       topic_has_pending:
         one: "This topic has <b>%{count}</b> post pending approval"
-        other: "This topic has <b>{{count}}</b> posts pending approval"
+        other: "This topic has <b>%{count}</b> posts pending approval"
       title: "Review"
       topic: "Topic:"
       filtered_topic: "You have filtered to reviewable content in a single topic."
@@ -473,17 +473,17 @@ en:
 
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} total flag)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} total flags)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} total flag)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} total flags)"
         agreed:
-          one: "{{count}}% agree"
-          other: "{{count}}% agree"
+          one: "%{count}% agree"
+          other: "%{count}% agree"
         disagreed:
-          one: "{{count}}% disagree"
-          other: "{{count}}% disagree"
+          one: "%{count}% disagree"
+          other: "%{count}% disagree"
         ignored:
-          one: "{{count}}% ignore"
-          other: "{{count}}% ignore"
+          one: "%{count}% ignore"
+          other: "%{count}% ignore"
       topics:
         topic: "Topic"
         reviewable_count: "Count"
@@ -493,10 +493,10 @@ en:
         details: "details"
         unique_users:
           one: "%{count} user"
-          other: "{{count}} users"
+          other: "%{count} users"
       replies:
         one: "%{count} reply"
-        other: "{{count}} replies"
+        other: "%{count} replies"
       edit: "Edit"
       save: "Save"
       cancel: "Cancel"
@@ -565,25 +565,25 @@ en:
         description: "We've received your new post but it needs to be approved by a moderator before it will appear. Please be patient."
         pending_posts:
           one: "You have <strong>%{count}</strong> post pending."
-          other: "You have <strong>{{count}}</strong> posts pending."
+          other: "You have <strong>%{count}</strong> posts pending."
         ok: "OK"
 
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> posted <a href='{{topicUrl}}'>the topic</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>You</a> posted <a href='{{topicUrl}}'>the topic</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> replied to <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>You</a> replied to <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> replied to <a href='{{topicUrl}}'>the topic</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>You</a> replied to <a href='{{topicUrl}}'>the topic</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> posted <a href='%{topicUrl}'>the topic</a>"
+      you_posted_topic: "<a href='%{userUrl}'>You</a> posted <a href='%{topicUrl}'>the topic</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> replied to <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>You</a> replied to <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> replied to <a href='%{topicUrl}'>the topic</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>You</a> replied to <a href='%{topicUrl}'>the topic</a>"
 
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> mentioned <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> mentioned <a href='{{user2Url}}'>you</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>You</a> mentioned <a href='{{user2Url}}'>{{another_user}}</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> mentioned <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> mentioned <a href='%{user2Url}'>you</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>You</a> mentioned <a href='%{user2Url}'>%{another_user}</a>"
 
-      posted_by_user: "Posted by <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Posted by <a href='{{userUrl}}'>you</a>"
-      sent_by_user: "Sent by <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Sent by <a href='{{userUrl}}'>you</a>"
+      posted_by_user: "Posted by <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Posted by <a href='%{userUrl}'>you</a>"
+      sent_by_user: "Sent by <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Sent by <a href='%{userUrl}'>you</a>"
 
     directory:
       filter_name: "filter by username"
@@ -829,7 +829,7 @@ en:
       required: 'Please enter a value for "%{name}"'
 
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profile"
       mute: "Mute"
       edit: "Edit Preferences"
@@ -905,12 +905,12 @@ en:
       enable_defer: "Enable defer to mark topics unread"
       change: "change"
       featured_topic: "Featured Topic"
-      moderator: "{{user}} is a moderator"
-      admin: "{{user}} is an admin"
+      moderator: "%{user} is a moderator"
+      admin: "%{user} is an admin"
       moderator_tooltip: "This user is a moderator"
       admin_tooltip: "This user is an admin"
       silenced_tooltip: "This user is silenced"
-      suspended_notice: "This user is suspended until {{date}}."
+      suspended_notice: "This user is suspended until %{date}."
       suspended_permanently: "This user is suspended."
       suspended_reason: "Reason: "
       github_profile: "Github"
@@ -923,7 +923,7 @@ en:
           Muted topics and categories are not included in these emails.
         individual: "Send an email for every new post"
         individual_no_echo: "Send an email for every new post except my own"
-        many_per_day: "Send me an email for every new post (about {{dailyEmailEstimate}} per day)"
+        many_per_day: "Send me an email for every new post (about %{dailyEmailEstimate} per day)"
         few_per_day: "Send me an email for every new post (about 2 per day)"
         warning: "Mailing list mode enabled. Email notification settings are overridden."
       tag_settings: "Tags"
@@ -1017,12 +1017,12 @@ en:
         disable: "Disable"
         enable: "Enable"
         enable_long: "Enable backup codes"
-        manage: "Manage backup codes. You have <strong>{{count}}</strong> backup codes remaining."
+        manage: "Manage backup codes. You have <strong>%{count}</strong> backup codes remaining."
         copy_to_clipboard: "Copy to Clipboard"
         copy_to_clipboard_error: "Error copying data to Clipboard"
         copied_to_clipboard: "Copied to Clipboard"
         download_backup_codes: "Download backup codes"
-        remaining_codes: "You have <strong>{{count}}</strong> backup codes remaining."
+        remaining_codes: "You have <strong>%{count}</strong> backup codes remaining."
         use: "Use a backup code"
         enable_prerequisites: "You must enable a primary second factor before generating backup codes."
         codes:
@@ -1092,10 +1092,10 @@ en:
 
       change_avatar:
         title: "Change your profile picture"
-        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, based on"
-        gravatar_title: "Change your avatar on {{gravatarName}}'s website"
-        gravatar_failed: "We could not find a {{gravatarName}} with that email address."
-        refresh_gravatar_title: "Refresh your {{gravatarName}}"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, based on"
+        gravatar_title: "Change your avatar on %{gravatarName}'s website"
+        gravatar_failed: "We could not find a %{gravatarName} with that email address."
+        refresh_gravatar_title: "Refresh your %{gravatarName}"
         letter_based: "System assigned profile picture"
         uploaded_avatar: "Custom picture"
         uploaded_avatar_empty: "Add a custom picture"
@@ -1124,11 +1124,11 @@ en:
         ok: "We will email you to confirm"
         required: "Please enter an email address"
         invalid: "Please enter a valid email address"
-        authenticated: "Your email has been authenticated by {{provider}}"
+        authenticated: "Your email has been authenticated by %{provider}"
         frequency_immediately: "We'll email you immediately if you haven't read the thing we're emailing you about."
         frequency:
           one: "We'll only email you if we haven't seen you in the last minute."
-          other: "We'll only email you if we haven't seen you in the last {{count}} minutes."
+          other: "We'll only email you if we haven't seen you in the last %{count} minutes."
 
       associated_accounts:
         title: "Associated Accounts"
@@ -1151,9 +1151,9 @@ en:
       username:
         title: "Username"
         instructions: "unique, no spaces, short"
-        short_instructions: "People can mention you as @{{username}}"
+        short_instructions: "People can mention you as @%{username}"
         available: "Your username is available"
-        not_available: "Not available. Try {{suggestion}}?"
+        not_available: "Not available. Try %{suggestion}?"
         not_available_no_suggestion: "Not available"
         too_short: "Your username is too short"
         too_long: "Your username is too long"
@@ -1181,11 +1181,11 @@ en:
         log_out_all: "Log out all"
         active: "active now"
         not_you: "Not you?"
-        show_all: "Show all ({{count}})"
+        show_all: "Show all (%{count})"
         show_few: "Show fewer"
         was_this_you: "Was this you?"
         was_this_you_description: "If it wasn’t you, we recommend you change your password and log out everywhere."
-        browser_and_device: "{{browser}} on {{device}}"
+        browser_and_device: "%{browser} on %{device}"
         secure_account: "Secure my Account"
         latest_post: "You last posted…"
 
@@ -1275,14 +1275,14 @@ en:
         none: "No invites to display."
         truncated:
           one: "Showing the first invite."
-          other: "Showing the first {{count}} invites."
+          other: "Showing the first %{count} invites."
         redeemed: "Redeemed Invites"
         redeemed_tab: "Redeemed"
-        redeemed_tab_with_count: "Redeemed ({{count}})"
+        redeemed_tab_with_count: "Redeemed (%{count})"
         redeemed_at: "Redeemed"
         pending: "Pending Invites"
         pending_tab: "Pending"
-        pending_tab_with_count: "Pending ({{count}})"
+        pending_tab_with_count: "Pending (%{count})"
         topics_entered: "Topics Viewed"
         posts_read_count: "Posts Read"
         expired: "This invite has expired."
@@ -1403,7 +1403,7 @@ en:
       desc:
         network: "Please check your connection."
         network_fixed: "Looks like it's back."
-        server: "Error code: {{status}}"
+        server: "Error code: %{status}"
         forbidden: "You're not allowed to view that."
         not_found: "Oops, the application tried to load a URL that doesn't exist."
         unknown: "Something went wrong."
@@ -1485,8 +1485,8 @@ en:
 
     summary:
       enabled_description: "You're viewing a summary of this topic: the most interesting posts as determined by the community."
-      description: "There are <b>{{replyCount}}</b> replies."
-      description_time: "There are <b>{{replyCount}}</b> replies with an estimated read time of <b>{{readingTime}} minutes</b>."
+      description: "There are <b>%{replyCount}</b> replies."
+      description_time: "There are <b>%{replyCount}</b> replies with an estimated read time of <b>%{readingTime} minutes</b>."
       enable: "Summarize This Topic"
       disable: "Show All Posts"
 
@@ -1501,8 +1501,8 @@ en:
       invite: "Invite Others ..."
       edit: "Add or Remove ..."
       leave_message: "Do you really want to leave this message?"
-      remove_allowed_user: "Do you really want to remove {{name}} from this message?"
-      remove_allowed_group: "Do you really want to remove {{name}} from this message?"
+      remove_allowed_user: "Do you really want to remove %{name} from this message?"
+      remove_allowed_group: "Do you really want to remove %{name} from this message?"
 
     email: "Email"
     username: "Username"
@@ -1513,7 +1513,7 @@ en:
     search_hint: "username, email or IP address"
 
     create_account:
-      disclaimer: "By registering, you agree to the <a href='{{privacy_link}}' target='blank'>privacy policy</a> and <a href='{{tos_link}}' target='blank'>terms of service</a>."
+      disclaimer: "By registering, you agree to the <a href='%{privacy_link}' target='blank'>privacy policy</a> and <a href='%{tos_link}' target='blank'>terms of service</a>."
       title: "Create New Account"
       failed: "Something went wrong, perhaps this email is already registered, try the forgot password link"
 
@@ -1577,7 +1577,7 @@ en:
       awaiting_activation: "Your account is awaiting activation, use the forgot password link to issue another activation email."
       awaiting_approval: "Your account has not been approved by a staff member yet. You will be sent an email when it is approved."
       requires_invite: "Sorry, access to this forum is by invite only."
-      not_activated: "You can't log in yet. We previously sent an activation email to you at <b>{{sentTo}}</b>. Please follow the instructions in that email to activate your account."
+      not_activated: "You can't log in yet. We previously sent an activation email to you at <b>%{sentTo}</b>. Please follow the instructions in that email to activate your account."
       not_allowed_from_ip_address: "You can't login from that IP address."
       admin_not_allowed_from_ip_address: "You can't log in as admin from that IP address."
       resend_activation_email: "Click here to send the activation email again."
@@ -1588,7 +1588,7 @@ en:
       provide_new_email: "Provide a new address and we'll resend your confirmation email."
       submit_new_email: "Update Email Address"
 
-      sent_activation_email_again: "We sent another activation email to you at <b>{{currentEmail}}</b>. It might take a few minutes for it to arrive; be sure to check your spam folder."
+      sent_activation_email_again: "We sent another activation email to you at <b>%{currentEmail}</b>. It might take a few minutes for it to arrive; be sure to check your spam folder."
       sent_activation_email_again_generic: "We sent another activation email. It might take a few minutes for it to arrive; be sure to check your spam folder."
       to_continue: "Please Log In"
       preferences: "You need to be logged in to change your user preferences."
@@ -1658,21 +1658,21 @@ en:
       loading: Loading...
 
     category_row:
-      topic_count: "{{count}} topics in this category"
+      topic_count: "%{count} topics in this category"
 
     select_kit:
       default_header_text: Select...
       no_content: No matches found
       filter_placeholder: Search...
       filter_placeholder_with_any: Search or create...
-      create: "Create: '{{content}}'"
+      create: "Create: '%{content}'"
       max_content_reached:
-        one: "You can only select {{count}} item."
-        other: "You can only select {{count}} items."
+        one: "You can only select %{count} item."
+        other: "You can only select %{count} items."
       min_content_not_reached:
-        one: "Select at least {{count}} item."
-        other: "Select at least {{count}} items."
-      invalid_selection_length: "Selection must be at least {{count}} characters."
+        one: "Select at least %{count} item."
+        other: "Select at least %{count} items."
+      invalid_selection_length: "Selection must be at least %{count} characters."
       components:
         categories_admin_dropdown:
           title: "Categories admin dropdown"
@@ -1705,7 +1705,7 @@ en:
 
     shared_drafts:
       title: "Shared Drafts"
-      notice: "This topic is only visible to those who can see the <b>{{category}}</b> category."
+      notice: "This topic is only visible to those who can see the <b>%{category}</b> category."
       destination_category: "Destination Category"
       publish: "Publish Shared Draft"
       confirm_publish: "Are you sure you want to publish this draft?"
@@ -1728,25 +1728,25 @@ en:
       drafts_offline: "drafts offline"
       edit_conflict: "edit conflict"
 
-      group_mentioned_limit: "<b>Warning!</b> You mentioned <a href='{{group_link}}'>{{group}}</a>, however this group has more members than the administrator configured mention limit of {{max}} users. Nobody will be notified."
+      group_mentioned_limit: "<b>Warning!</b> You mentioned <a href='%{group_link}'>%{group}</a>, however this group has more members than the administrator configured mention limit of %{max} users. Nobody will be notified."
       group_mentioned:
-        one: "By mentioning {{group}}, you are about to notify <a href='{{group_link}}'>%{count} person</a> – are you sure?"
-        other: "By mentioning {{group}}, you are about to notify <a href='{{group_link}}'>{{count}} people</a> – are you sure?"
+        one: "By mentioning %{group}, you are about to notify <a href='%{group_link}'>%{count} person</a> – are you sure?"
+        other: "By mentioning %{group}, you are about to notify <a href='%{group_link}'>%{count} people</a> – are you sure?"
       cannot_see_mention:
-        category: "You mentioned {{username}} but they won't be notified because they do not have access to this category. You will need to add them to a group that has access to this category."
-        private: "You mentioned {{username}} but they won't be notified because they are unable to see this personal message. You will need to invite them to this PM."
-      duplicate_link: "It looks like your link to <b>{{domain}}</b> was already posted in the topic by <b>@{{username}}</b> in <a href='{{post_url}}'>a reply on {{ago}}</a> – are you sure you want to post it again?"
-      reference_topic_title: "RE: {{title}}"
+        category: "You mentioned %{username} but they won't be notified because they do not have access to this category. You will need to add them to a group that has access to this category."
+        private: "You mentioned %{username} but they won't be notified because they are unable to see this personal message. You will need to invite them to this PM."
+      duplicate_link: "It looks like your link to <b>%{domain}</b> was already posted in the topic by <b>@%{username}</b> in <a href='%{post_url}'>a reply on %{ago}</a> – are you sure you want to post it again?"
+      reference_topic_title: "RE: %{title}"
 
       error:
         title_missing: "Title is required"
-        title_too_short: "Title must be at least {{min}} characters"
-        title_too_long: "Title can't be more than {{max}} characters"
+        title_too_short: "Title must be at least %{min} characters"
+        title_too_long: "Title can't be more than %{max} characters"
         post_missing: "Post can’t be empty"
-        post_length: "Post must be at least {{min}} characters"
-        try_like: "Have you tried the {{heart}} button?"
+        post_length: "Post must be at least %{min} characters"
+        try_like: "Have you tried the %{heart} button?"
         category_missing: "You must choose a category"
-        tags_missing: "You must choose at least {{count}} tags"
+        tags_missing: "You must choose at least %{count} tags"
         topic_template_not_modified: "Please add details and specifics to your topic by editing the topic template."
 
       save_edit: "Save Edit"
@@ -1850,10 +1850,10 @@ en:
       tooltip:
         regular:
           one: "%{count} unseen notification"
-          other: "{{count}} unseen notifications"
+          other: "%{count} unseen notifications"
         message:
           one: "%{count} unread message"
-          other: "{{count}} unread messages"
+          other: "%{count} unread messages"
         high_priority:
           one: "%{count} unread high priority notification"
           other: "%{count} unread high priority notifications"
@@ -1862,50 +1862,50 @@ en:
       empty: "No notifications found."
       post_approved: "Your post was approved"
       reviewable_items: "items requiring review"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} and %{count} other</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} and {{count}} others</span> {{description}}"
+        one: "<span>%{username}, %{username2} and %{count} other</span> %{description}"
+        other: "<span>%{username}, %{username2} and %{count} others</span> %{description}"
       liked_consolidated_description:
-        one: "liked {{count}} of your posts"
-        other: "liked {{count}} of your posts"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> accepted your invitation"
-      moved_post: "<span>{{username}}</span> moved {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Earned '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>New Topic</span> {{description}}"
-      membership_request_accepted: "Membership accepted in '{{group_name}}'"
-      membership_request_consolidated: "{{count}} open membership requests for '{{group_name}}'"
+        one: "liked %{count} of your posts"
+        other: "liked %{count} of your posts"
+      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}"
+      invitee_accepted: "<span>%{username}</span> accepted your invitation"
+      moved_post: "<span>%{username}</span> moved %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Earned '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>New Topic</span> %{description}"
+      membership_request_accepted: "Membership accepted in '%{group_name}'"
+      membership_request_consolidated: "%{count} open membership requests for '%{group_name}'"
 
       group_message_summary:
-        one: "{{count}} message in your {{group_name}} inbox"
-        other: "{{count}} messages in your {{group_name}} inbox"
+        one: "%{count} message in your %{group_name} inbox"
+        other: "%{count} messages in your %{group_name} inbox"
 
       popup:
-        mentioned: '{{username}} mentioned you in "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} mentioned you in "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} quoted you in "{{topic}}" - {{site_title}}'
-        replied: '{{username}} replied to you in "{{topic}}" - {{site_title}}'
-        posted: '{{username}} posted in "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} sent you a personal message in "{{topic}}" - {{site_title}}'
-        linked: '{{username}} linked to your post from "{{topic}}" - {{site_title}}'
-        watching_first_post: '{{username}} created a new topic "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} mentioned you in "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} mentioned you in "%{topic}" - %{site_title}'
+        quoted: '%{username} quoted you in "%{topic}" - %{site_title}'
+        replied: '%{username} replied to you in "%{topic}" - %{site_title}'
+        posted: '%{username} posted in "%{topic}" - %{site_title}'
+        private_message: '%{username} sent you a personal message in "%{topic}" - %{site_title}'
+        linked: '%{username} linked to your post from "%{topic}" - %{site_title}'
+        watching_first_post: '%{username} created a new topic "%{topic}" - %{site_title}'
         confirm_title: "Notifications enabled - %{site_title}"
         confirm_body: "Success! Notifications have been enabled."
-        custom: "Notification from {{username}} on %{site_title}"
+        custom: "Notification from %{username} on %{site_title}"
 
       titles:
         mentioned: "mentioned"
@@ -1937,9 +1937,9 @@ en:
       from_my_computer: "From my device"
       from_the_web: "From the web"
       remote_tip: "link to image"
-      remote_tip_with_attachments: "link to image or file {{authorized_extensions}}"
+      remote_tip_with_attachments: "link to image or file %{authorized_extensions}"
       local_tip: "select images from your device"
-      local_tip_with_attachments: "select images or files from your device {{authorized_extensions}}"
+      local_tip_with_attachments: "select images or files from your device %{authorized_extensions}"
       hint: "(you can also drag & drop into the editor to upload them)"
       hint_for_supported_browsers: "you can also drag and drop or paste images into the editor"
       uploading: "Uploading"
@@ -1957,15 +1957,15 @@ en:
       clear_all: "Clear All"
       too_short: "Your search term is too short."
       result_count:
-        one: "<span>%{count} result for</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} results for</span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} result for</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} results for</span><span class='term'>%{term}</span>"
       title: "search topics, posts, users, or categories"
       full_page_title: "search topics or posts"
       no_results: "No results found."
       no_more_results: "No more results found."
       searching: "Searching ..."
-      post_format: "#{{post_number}} by {{username}}"
-      results_page: "Search results for '{{term}}'"
+      post_format: "#%{post_number} by %{username}"
+      results_page: "Search results for '%{term}'"
       more_results: "There are more results. Please narrow your search criteria."
       cant_find: "Can’t find what you’re looking for?"
       start_new_topic: "Perhaps start a new topic?"
@@ -1975,9 +1975,9 @@ en:
       search_google_title: "Search this site"
 
       context:
-        user: "Search posts by @{{username}}"
-        category: "Search the #{{category}} category"
-        tag: "Search the #{{tag}} tag"
+        user: "Search posts by @%{username}"
+        category: "Search the #%{category} category"
+        tag: "Search the #%{tag} tag"
         topic: "Search this topic"
         private_messages: "Search messages"
 
@@ -2057,7 +2057,7 @@ en:
         choose_new_category: "Choose the new category for the topics:"
         selected:
           one: "You have selected <b>%{count}</b> topic."
-          other: "You have selected <b>{{count}}</b> topics."
+          other: "You have selected <b>%{count}</b> topics."
         change_tags: "Replace Tags"
         append_tags: "Append Tags"
         choose_new_tags: "Choose new tags for these topics:"
@@ -2071,7 +2071,7 @@ en:
         posted: "You haven't posted in any topics yet."
         latest: "There are no latest topics. That's sad."
         bookmarks: "You have no bookmarked topics yet."
-        category: "There are no {{category}} topics."
+        category: "There are no %{category} topics."
         top: "There are no top topics."
         educate:
           new: '<p>Your new topics appear here.</p><p>By default, topics are considered new and will show a <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">new</span> indicator if they were created in the last 2 days.</p><p>Visit your <a href="%{userPrefsUrl}">preferences</a> to change this.</p>'
@@ -2082,14 +2082,14 @@ en:
         read: "There are no more read topics."
         new: "There are no more new topics."
         unread: "There are no more unread topics."
-        category: "There are no more {{category}} topics."
+        category: "There are no more %{category} topics."
         top: "There are no more top topics."
         bookmarks: "There are no more bookmarked topics."
 
     topic:
       filter_to:
         one: "%{count} post in topic"
-        other: "{{count}} posts in topic"
+        other: "%{count} posts in topic"
       create: "New Topic"
       create_long: "Create a new Topic"
       open_draft: "Open Draft"
@@ -2119,10 +2119,10 @@ en:
       unread: "unread"
       new_topics:
         one: "%{count} new topic"
-        other: "{{count}} new topics"
+        other: "%{count} new topics"
       unread_topics:
         one: "%{count} unread topic"
-        other: "{{count}} unread topics"
+        other: "%{count} unread topics"
       title: "Topic"
       invalid_access:
         title: "Topic is private"
@@ -2136,24 +2136,24 @@ en:
         description: "Sorry, we couldn't find that topic. Perhaps it was removed by a moderator?"
       total_unread_posts:
         one: "you have %{count} unread post in this topic"
-        other: "you have {{count}} unread posts in this topic"
+        other: "you have %{count} unread posts in this topic"
       unread_posts:
         one: "you have %{count} unread old post in this topic"
-        other: "you have {{count}} unread old posts in this topic"
+        other: "you have %{count} unread old posts in this topic"
       new_posts:
         one: "there is %{count} new post in this topic since you last read it"
-        other: "there are {{count}} new posts in this topic since you last read it"
+        other: "there are %{count} new posts in this topic since you last read it"
       likes:
         one: "there is %{count} like in this topic"
-        other: "there are {{count}} likes in this topic"
+        other: "there are %{count} likes in this topic"
       back_to_list: "Back to Topic List"
       options: "Topic Options"
       show_links: "show links within this topic"
       toggle_information: "toggle topic details"
-      read_more_in_category: "Want to read more? Browse other topics in {{catLink}} or {{latestLink}}."
-      read_more: "Want to read more? {{catLink}} or {{latestLink}}."
-      group_request: "You need to request membership to the `{{name}}` group to see this topic"
-      group_join: "You need join the `{{name}}` group to see this topic"
+      read_more_in_category: "Want to read more? Browse other topics in %{catLink} or %{latestLink}."
+      read_more: "Want to read more? %{catLink} or %{latestLink}."
+      group_request: "You need to request membership to the `%{name}` group to see this topic"
+      group_join: "You need join the `%{name}` group to see this topic"
       group_request_sent: "Your group membership request has been sent. You will be informed when it's accepted."
       unread_indicator: "No member has read the last post of this topic yet."
 
@@ -2171,7 +2171,7 @@ en:
         =0 {}
         one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 new</a> topic}
         other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># new</a> topics}
-        } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
+        } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false %{latestLink} other {}}"
 
       bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
 
@@ -2280,7 +2280,7 @@ en:
           "2_8": "You will see a count of new replies because you are tracking this category."
           "2_4": "You will see a count of new replies because you posted a reply to this topic."
           "2_2": "You will see a count of new replies because you are tracking this topic."
-          "2": 'You will see a count of new replies because you <a href="{{basePath}}/u/{{username}}/preferences/notifications">read this topic</a>.'
+          "2": 'You will see a count of new replies because you <a href="%{basePath}/u/%{username}/preferences/notifications">read this topic</a>.'
           "1_2": "You will be notified if someone mentions your @name or replies to you."
           "1": "You will be notified if someone mentions your @name or replies to you."
           "0_7": "You are ignoring all notifications in this category."
@@ -2364,25 +2364,25 @@ en:
 
       feature_topic:
         title: "Feature this topic"
-        pin: "Make this topic appear at the top of the {{categoryLink}} category until"
-        confirm_pin: "You already have {{count}} pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic in this category?"
-        unpin: "Remove this topic from the top of the {{categoryLink}} category."
-        unpin_until: "Remove this topic from the top of the {{categoryLink}} category or wait until <strong>%{until}</strong>."
+        pin: "Make this topic appear at the top of the %{categoryLink} category until"
+        confirm_pin: "You already have %{count} pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic in this category?"
+        unpin: "Remove this topic from the top of the %{categoryLink} category."
+        unpin_until: "Remove this topic from the top of the %{categoryLink} category or wait until <strong>%{until}</strong>."
         pin_note: "Users can unpin the topic individually for themselves."
         pin_validation: "A date is required to pin this topic."
-        not_pinned: "There are no topics pinned in {{categoryLink}}."
+        not_pinned: "There are no topics pinned in %{categoryLink}."
         already_pinned:
-          one: "Topics currently pinned in {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Topics currently pinned in {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Topics currently pinned in %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Topics currently pinned in %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Make this topic appear at the top of all topic lists until"
-        confirm_pin_globally: "You already have {{count}} globally pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic globally?"
+        confirm_pin_globally: "You already have %{count} globally pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic globally?"
         unpin_globally: "Remove this topic from the top of all topic lists."
         unpin_globally_until: "Remove this topic from the top of all topic lists or wait until <strong>%{until}</strong>."
         global_pin_note: "Users can unpin the topic individually for themselves."
         not_pinned_globally: "There are no topics pinned globally."
         already_pinned_globally:
           one: "Topics currently pinned globally: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Topics currently pinned globally: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Topics currently pinned globally: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Make this topic into a banner that appears at the top of all pages."
         remove_banner: "Remove the banner that appears at the top of all pages."
         banner_note: "Users can dismiss the banner by closing it. Only one topic can be bannered at any given time."
@@ -2417,17 +2417,17 @@ en:
         to_username: "Enter the username of the person you'd like to invite. We'll send a notification with a link inviting them to this topic."
 
         email_placeholder: "name@example.com"
-        success_email: "We mailed out an invitation to <b>{{emailOrUsername}}</b>. We'll notify you when the invitation is redeemed. Check the invitations tab on your user page to keep track of your invites."
+        success_email: "We mailed out an invitation to <b>%{emailOrUsername}</b>. We'll notify you when the invitation is redeemed. Check the invitations tab on your user page to keep track of your invites."
         success_username: "We've invited that user to participate in this topic."
         error: "Sorry, we couldn't invite that person. Perhaps they have already been invited? (Invites are rate limited)"
-        success_existing_email: "A user with email <b>{{emailOrUsername}}</b> already exists. We've invited that user to participate in this topic."
+        success_existing_email: "A user with email <b>%{emailOrUsername}</b> already exists. We've invited that user to participate in this topic."
 
       login_reply: "Log In to Reply"
 
       filters:
         n_posts:
           one: "%{count} post"
-          other: "{{count}} posts"
+          other: "%{count} posts"
         cancel: "Remove filter"
 
       move_to:
@@ -2443,7 +2443,7 @@ en:
         error: "There was an error moving posts to the new topic."
         instructions:
           one: "You are about to create a new topic and populate it with the post you've selected."
-          other: "You are about to create a new topic and populate it with the <b>{{count}}</b> posts you've selected."
+          other: "You are about to create a new topic and populate it with the <b>%{count}</b> posts you've selected."
 
       merge_topic:
         title: "Move to Existing Topic"
@@ -2452,7 +2452,7 @@ en:
         radio_label: "Existing Topic"
         instructions:
           one: "Please choose the topic you'd like to move that post to."
-          other: "Please choose the topic you'd like to move those <b>{{count}}</b> posts to."
+          other: "Please choose the topic you'd like to move those <b>%{count}</b> posts to."
 
       move_to_new_message:
         title: "Move to New Message"
@@ -2462,7 +2462,7 @@ en:
         participants: "Participants"
         instructions:
           one: "You are about to create a new message and populate it with the post you've selected."
-          other: "You are about to create a new message and populate it with the <b>{{count}}</b> posts you've selected."
+          other: "You are about to create a new message and populate it with the <b>%{count}</b> posts you've selected."
 
       move_to_existing_message:
         title: "Move to Existing Message"
@@ -2471,7 +2471,7 @@ en:
         participants: "Participants"
         instructions:
           one: "Please choose the message you'd like to move that post to."
-          other: "Please choose the message you'd like to move those <b>{{count}}</b> posts to."
+          other: "Please choose the message you'd like to move those <b>%{count}</b> posts to."
 
       merge_posts:
         title: "Merge Selected Posts"
@@ -2497,11 +2497,11 @@ en:
         error: "There was an error changing the ownership of the posts."
         placeholder: "username of new owner"
         instructions:
-          one: "Please choose a new owner for the post by <b>@{{old_user}}</b>"
-          other: "Please choose a new owner for the {{count}} posts by <b>@{{old_user}}</b>"
+          one: "Please choose a new owner for the post by <b>@%{old_user}</b>"
+          other: "Please choose a new owner for the %{count} posts by <b>@%{old_user}</b>"
         instructions_without_old_user:
           one: "Please choose a new owner for the post"
-          other: "Please choose a new owner for the {{count}} posts"
+          other: "Please choose a new owner for the %{count} posts"
 
       change_timestamp:
         title: "Change Timestamp..."
@@ -2512,7 +2512,7 @@ en:
 
       multi_select:
         select: "select"
-        selected: "selected ({{count}})"
+        selected: "selected (%{count})"
         select_post:
           label: "select"
           title: "Add post to selection"
@@ -2531,7 +2531,7 @@ en:
         deselect_all: deselect all
         description:
           one: You have selected <b>%{count}</b> post.
-          other: "You have selected <b>{{count}}</b> posts."
+          other: "You have selected <b>%{count}</b> posts."
 
       deleted_by_author:
         one: "(topic withdrawn by author, will be automatically deleted in %{count} hour unless flagged)"
@@ -2540,13 +2540,13 @@ en:
     post:
       quote_reply: "Quote"
       edit_reason: "Reason: "
-      post_number: "post {{number}}"
+      post_number: "post %{number}"
       ignored: "Ignored content"
       wiki_last_edited_on: "wiki last edited on"
       last_edited_on: "post last edited on"
       reply_as_new_topic: "Reply as linked Topic"
       reply_as_new_private_message: "Reply as new message to the same recipients"
-      continue_discussion: "Continuing the discussion from {{postLink}}:"
+      continue_discussion: "Continuing the discussion from %{postLink}:"
       follow_quote: "go to the quoted post"
       show_full: "Show Full Post"
       show_hidden: "View ignored content."
@@ -2558,34 +2558,34 @@ en:
       locked: "a staff member has locked this post from being edited"
       gap:
         one: "view %{count} hidden reply"
-        other: "view {{count}} hidden replies"
+        other: "view %{count} hidden replies"
 
       notice:
-        new_user: "This is the first time {{user}} has posted — let’s welcome them to our community!"
-        returning_user: "It’s been a while since we’ve seen {{user}} — their last post was {{time}}."
+        new_user: "This is the first time %{user} has posted — let’s welcome them to our community!"
+        returning_user: "It’s been a while since we’ve seen %{user} — their last post was %{time}."
 
       unread: "Post is unread"
       has_replies:
-        one: "{{count}} Reply"
-        other: "{{count}} Replies"
+        one: "%{count} Reply"
+        other: "%{count} Replies"
 
       has_likes_title:
         one: "%{count} person liked this post"
-        other: "{{count}} people liked this post"
+        other: "%{count} people liked this post"
 
       has_likes_title_only_you: "you liked this post"
       has_likes_title_you:
         one: "you and %{count} other person liked this post"
-        other: "you and {{count}} other people liked this post"
+        other: "you and %{count} other people liked this post"
 
       errors:
         create: "Sorry, there was an error creating your post. Please try again."
         edit: "Sorry, there was an error editing your post. Please try again."
         upload: "Sorry, there was an error uploading that file. Please try again."
-        file_too_large: "Sorry, that file is too big (maximum size is {{max_size_kb}}kb). Why not upload your large file to a cloud sharing service, then paste the link?"
+        file_too_large: "Sorry, that file is too big (maximum size is %{max_size_kb}kb). Why not upload your large file to a cloud sharing service, then paste the link?"
         too_many_uploads: "Sorry, you can only upload one file at a time."
-        too_many_dragged_and_dropped_files: "Sorry, you can only upload {{max}} files at a time."
-        upload_not_authorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: {{authorized_extensions}})."
+        too_many_dragged_and_dropped_files: "Sorry, you can only upload %{max} files at a time."
+        upload_not_authorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Sorry, new users can not upload images."
         attachment_upload_not_allowed_for_new_user: "Sorry, new users can not upload attachments."
         attachment_download_requires_login: "Sorry, you need to be logged in to download attachments."
@@ -2632,10 +2632,10 @@ en:
           confirm: "Do you also want to delete the replies to this post?"
           direct_replies:
             one: "Yes, and %{count} direct reply"
-            other: "Yes, and {{count}} direct replies"
+            other: "Yes, and %{count} direct replies"
           all_replies:
             one: "Yes, and %{count} reply"
-            other: "Yes, and all {{count}} replies"
+            other: "Yes, and all %{count} replies"
           just_the_post: "No, just this post"
         admin: "post admin actions"
         wiki: "Make Wiki"
@@ -2683,11 +2683,11 @@ en:
             one: "read this"
             other: "read this"
           like_capped:
-            one: "and {{count}} other liked this"
-            other: "and {{count}} others liked this"
+            one: "and %{count} other liked this"
+            other: "and %{count} others liked this"
           read_capped:
-            one: "and {{count}} other read this"
-            other: "and {{count}} others read this"
+            one: "and %{count} other read this"
+            other: "and %{count} others read this"
         by_you:
           off_topic: "You flagged this as off-topic"
           spam: "You flagged this as spam"
@@ -2700,12 +2700,12 @@ en:
       delete:
         confirm:
           one: "Are you sure you want to delete that post?"
-          other: "Are you sure you want to delete those {{count}} posts?"
+          other: "Are you sure you want to delete those %{count} posts?"
 
       merge:
         confirm:
           one: "Are you sure you want to merge those posts?"
-          other: "Are you sure you want to merge those {{count}} posts?"
+          other: "Are you sure you want to merge those %{count} posts?"
 
       revisions:
         controls:
@@ -2718,7 +2718,7 @@ en:
           revert: "Revert to this revision"
           edit_wiki: "Edit Wiki"
           edit_post: "Edit Post"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "Show the rendered output with additions and removals inline"
@@ -2915,13 +2915,13 @@ en:
       custom_message:
         at_least:
           one: "enter at least %{count} character"
-          other: "enter at least {{count}} characters"
+          other: "enter at least %{count} characters"
         more:
           one: "%{count} to go..."
-          other: "{{count}} to go..."
+          other: "%{count} to go..."
         left:
           one: "%{count} remaining"
-          other: "{{count}} remaining"
+          other: "%{count} remaining"
 
     flagging_topic:
       title: "Thanks for helping to keep our community civil!"
@@ -2968,7 +2968,7 @@ en:
         title: "This topic is a personal message"
         help: "This topic is a personal message"
     posts: "Posts"
-    posts_long: "there are {{number}} posts in this topic"
+    posts_long: "there are %{number} posts in this topic"
 
     # keys ending with _MF use message format, see https://meta.discourse.org/t/message-format-support-for-localization/7035 for details
     posts_likes_MF: |
@@ -2985,20 +2985,20 @@ en:
     replies: "Replies"
     views_long:
       one: "this topic has been viewed %{count} time"
-      other: "this topic has been viewed {{number}} times"
+      other: "this topic has been viewed %{number} times"
     activity: "Activity"
     likes: "Likes"
     likes_lowercase:
       one: "like"
       other: "likes"
-    likes_long: "there are {{number}} likes in this topic"
+    likes_long: "there are %{number} likes in this topic"
     users: "Users"
     users_lowercase:
       one: "user"
       other: "users"
     category_title: "Category"
     history: "History"
-    changed_by: "by {{author}}"
+    changed_by: "by %{author}"
 
     raw_email:
       title: "Incoming Email"
@@ -3013,33 +3013,33 @@ en:
         title: "Latest"
         title_with_count:
           one: "Latest (%{count})"
-          other: "Latest ({{count}})"
+          other: "Latest (%{count})"
         help: "topics with recent posts"
       read:
         title: "Read"
         help: "topics you've read, in the order that you last read them"
       categories:
         title: "Categories"
-        title_in: "Category - {{categoryName}}"
+        title_in: "Category - %{categoryName}"
         help: "all topics grouped by category"
       unread:
         title: "Unread"
         title_with_count:
           one: "Unread (%{count})"
-          other: "Unread ({{count}})"
+          other: "Unread (%{count})"
         help: "topics you are currently watching or tracking with unread posts"
         lower_title_with_count:
           one: "%{count} unread"
-          other: "{{count}} unread"
+          other: "%{count} unread"
       new:
         lower_title_with_count:
           one: "%{count} new"
-          other: "{{count}} new"
+          other: "%{count} new"
         lower_title: "new"
         title: "New"
         title_with_count:
           one: "New (%{count})"
-          other: "New ({{count}})"
+          other: "New (%{count})"
         help: "topics created in the last few days"
       posted:
         title: "My Posts"
@@ -3048,11 +3048,11 @@ en:
         title: "Bookmarks"
         help: "topics you have bookmarked"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "latest topics in the {{categoryName}} category"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "latest topics in the %{categoryName} category"
       top:
         title: "Top"
         help: "the most active topics in the last year, month, week or day"
@@ -3222,8 +3222,8 @@ en:
       synonyms: "Synonyms"
       synonyms_description: "When the following tags are used, they will be replaced with <b>%{base_tag_name}</b>."
       tag_groups_info:
-        one: 'This tag belongs to the group "{{tag_groups}}".'
-        other: "This tag belongs to these groups: {{tag_groups}}."
+        one: 'This tag belongs to the group "%{tag_groups}".'
+        other: "This tag belongs to these groups: %{tag_groups}."
       category_restrictions:
         one: "It can only be used in this category:"
         other: "It can only be used in these categories:"
@@ -3239,11 +3239,11 @@ en:
       delete_tag: "Delete Tag"
       delete_confirm:
         one: "Are you sure you want to delete this tag and remove it from %{count} topic it is assigned to?"
-        other: "Are you sure you want to delete this tag and remove it from {{count}} topics it is assigned to?"
+        other: "Are you sure you want to delete this tag and remove it from %{count} topics it is assigned to?"
       delete_confirm_no_topics: "Are you sure you want to delete this tag?"
       delete_confirm_synonyms:
         one: "Its synonym will also be deleted."
-        other: "Its {{count}} synonyms will also be deleted."
+        other: "Its %{count} synonyms will also be deleted."
       rename_tag: "Rename Tag"
       rename_instructions: "Choose a new name for the tag:"
       sort_by: "Sort by:"
@@ -3620,10 +3620,10 @@ en:
           redeliver: "Redeliver"
           incoming:
             one: "There is a new event."
-            other: "There are {{count}} new events."
+            other: "There are %{count} new events."
           completed_in:
             one: "Completed in %{count} second."
-            other: "Completed in {{count}} seconds."
+            other: "Completed in %{count} seconds."
           request: "Request"
           response: "Response"
           redeliver_confirm: "Are you sure you want to redeliver the same payload?"
@@ -3676,12 +3676,12 @@ en:
           label: "Upload"
           title: "Upload a backup to this instance"
           uploading: "Uploading..."
-          uploading_progress: "Uploading... {{progress}}%"
-          success: "'{{filename}}' has successfully been uploaded. The file is now being processed and will take up to a minute to show up in the list."
-          error: "There has been an error while uploading '{{filename}}': {{message}}"
+          uploading_progress: "Uploading... %{progress}%"
+          success: "'%{filename}' has successfully been uploaded. The file is now being processed and will take up to a minute to show up in the list."
+          error: "There has been an error while uploading '%{filename}': %{message}"
         operations:
           is_running: "An operation is currently running..."
-          failed: "The {{operation}} failed. Please check the logs."
+          failed: "The %{operation} failed. Please check the logs."
           cancel:
             label: "Cancel"
             title: "Cancel the current operation"
@@ -3808,7 +3808,7 @@ en:
           disabled_component_tooltip: "This component has been disabled"
           default_theme_tooltip: "This theme is the site's default theme"
           updates_available_tooltip: "Updates are available for this theme"
-          and_x_more: "and {{count}} more."
+          and_x_more: "and %{count} more."
           collapse: Collapse
           uploads: "Uploads"
           no_uploads: "You can upload assets associated with your theme such as fonts and images"
@@ -3857,8 +3857,8 @@ en:
           disabled_by: "This component has been disabled by"
           required_version:
             error: "This theme has been automatically disabled because it is not compatible with this version of Discourse."
-            minimum: "Requires Discourse version {{version}} or above."
-            maximum: "Requires Discourse version {{version}} or below."
+            minimum: "Requires Discourse version %{version} or above."
+            maximum: "Requires Discourse version %{version} or below."
           component_of: "Component of:"
           update_to_latest: "Update to Latest"
           check_for_updates: "Check for Updates"
@@ -3871,7 +3871,7 @@ en:
           empty: "No items"
           commits_behind:
             one: "Theme is %{count} commit behind!"
-            other: "Theme is {{count}} commits behind!"
+            other: "Theme is %{count} commits behind!"
           compare_commits: "(See new commits)"
           repo_unreachable: "Couldn't contact the Git repository of this theme. Error message:"
           imported_from_archive: "This theme was imported from a .zip file"
@@ -4283,8 +4283,8 @@ en:
           text: "Show"
 
       user:
-        suspend_failed: "Something went wrong suspending this user {{error}}"
-        unsuspend_failed: "Something went wrong unsuspending this user {{error}}"
+        suspend_failed: "Something went wrong suspending this user %{error}"
+        unsuspend_failed: "Something went wrong unsuspending this user %{error}"
         suspend_duration: "How long will the user be suspended for?"
         suspend_reason_label: "Why are you suspending? This text <b>will be visible to everyone</b> on this user's profile page, and will be shown to the user when they try to log in. Keep it short."
         suspend_reason_hidden_label: "Why are you suspending? This text will be shown to the user when they try to log in. Keep it short."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 7c043dc22b..7b564c402b 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -899,7 +899,7 @@ en:
       short_description: 'A violation of <a href="%{base_path}/guidelines">our community guidelines</a>'
       long_form: "flagged this as inappropriate"
     notify_user:
-      title: "Send @{{username}} a message"
+      title: "Send @%{username} a message"
       description: "I want to talk to this person directly and personally about their post."
       short_description: "I want to talk to this person directly and personally about their post."
       long_form: "messaged user"
@@ -4826,9 +4826,9 @@ en:
     title: "Reminder about old credentials"
     body: |
       Hello! This is a routine yearly security reminder from your Discourse instance.
-      
+
       As a courtesy, we wanted to let you know that the following credentials used on your Discourse instance have not been updated in more than two years:
-      
+
       %{keys}
-      
+
       No action is required at this time, however, it is considered good security practice to cycle all your important credentials every few years.
diff --git a/spec/integrity/i18n_spec.rb b/spec/integrity/i18n_spec.rb
index 41fbe2157f..7871a98729 100644
--- a/spec/integrity/i18n_spec.rb
+++ b/spec/integrity/i18n_spec.rb
@@ -141,13 +141,20 @@ describe "i18n integrity checks" do
       context "valid translations" do
         invalid_relative_links = {}
         invalid_relative_image_sources = {}
+        invalid_interpolation_key_format = {}
 
         each_translation(english_yaml) do |key, value|
           if value.match?(/href\s*=\s*["']\/[^\/]|\]\(\/[^\/]/i)
             invalid_relative_links[key] = value
-          elsif value.match?(/src\s*=\s*["']\/[^\/]/i)
+          end
+
+          if value.match?(/src\s*=\s*["']\/[^\/]/i)
             invalid_relative_image_sources[key] = value
           end
+
+          if value.match?(/\{\{.+?}}/)
+            invalid_interpolation_key_format[key] = value
+          end
         end
 
         it "uses %{base_url} or %{base_path} for relative links" do
@@ -159,6 +166,11 @@ describe "i18n integrity checks" do
           keys = invalid_relative_image_sources.keys.join("\n")
           expect(invalid_relative_image_sources).to be_empty, "The following keys have relative image sources, but do not start with %{base_url} or %{base_path}:\n\n#{keys}"
         end
+
+        it "uses the %{key} as interpolation key format" do
+          keys = invalid_interpolation_key_format.keys.join("\n")
+          expect(invalid_interpolation_key_format).to be_empty, "The following keys use {{key}} instead of %{key} for interpolation keys:\n\n#{keys}"
+        end
       end
     end
 
diff --git a/test/javascripts/fixtures/site-fixtures.js b/test/javascripts/fixtures/site-fixtures.js
index 875ef8f67e..644ab21900 100644
--- a/test/javascripts/fixtures/site-fixtures.js
+++ b/test/javascripts/fixtures/site-fixtures.js
@@ -490,7 +490,7 @@ export default {
         },
         {
           name_key: "notify_user",
-          name: "Notify {{username}}",
+          name: "Notify %{username}",
           description:
             "This post contains something I want to talk to this person directly and privately about. Does not cast a flag.",
           short_description:
diff --git a/test/javascripts/helpers/site.js b/test/javascripts/helpers/site.js
index ce7ffc8825..a1432aac5e 100644
--- a/test/javascripts/helpers/site.js
+++ b/test/javascripts/helpers/site.js
@@ -320,7 +320,7 @@ PreloadStore.store("site", {
     },
     {
       name_key: "notify_user",
-      name: "Notify {{username}}",
+      name: "Notify %{username}",
       description:
         "This post contains something I want to talk to this person directly and privately about.",
       long_form: "notified user",

From fc640f31df26350bc760ed713c8f0922487e246b Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 2 Jun 2020 19:51:47 +0200
Subject: [PATCH 1521/1830] DEV: Skip interpolation key specs until build
 scripts can be fixed

Currently the build fails because it runs the specs for all plugins even though the current source of those plugins isn't pulled from git.
---
 spec/integrity/i18n_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/integrity/i18n_spec.rb b/spec/integrity/i18n_spec.rb
index 7871a98729..0d44d5ea5d 100644
--- a/spec/integrity/i18n_spec.rb
+++ b/spec/integrity/i18n_spec.rb
@@ -167,7 +167,7 @@ describe "i18n integrity checks" do
           expect(invalid_relative_image_sources).to be_empty, "The following keys have relative image sources, but do not start with %{base_url} or %{base_path}:\n\n#{keys}"
         end
 
-        it "uses the %{key} as interpolation key format" do
+        skip "uses the %{key} as interpolation key format" do
           keys = invalid_interpolation_key_format.keys.join("\n")
           expect(invalid_interpolation_key_format).to be_empty, "The following keys use {{key}} instead of %{key} for interpolation keys:\n\n#{keys}"
         end

From 9c42c0fe9aeaf0a31d3e88f146398fb105c0a562 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 2 Jun 2020 21:42:39 +0200
Subject: [PATCH 1522/1830] FIX: Broken MessageFormat string

---
 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 8d7d1724c2..8f5e12383f 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2171,7 +2171,7 @@ en:
         =0 {}
         one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 new</a> topic}
         other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># new</a> topics}
-        } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false %{latestLink} other {}}"
+        } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
 
       bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
 

From 9e9ff01e8676c958e936538655457b71629d8a4c Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 2 Jun 2020 16:39:18 -0400
Subject: [PATCH 1523/1830] Add missing text back in

---
 app/assets/javascripts/admin/templates/user-tl3-requirements.hbs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
index de71c0bfb9..74738f2080 100644
--- a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
+++ b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
@@ -153,6 +153,7 @@
           {{i18n "admin.user.tl3_requirements.locked_will_not_be_promoted"}}
         {{else}}
           {{d-icon "times"}}
+          {{i18n "admin.user.tl3_requirements.does_not_qualify"}}
         {{/if}}
       {{/if}}
     {{/if}}

From 688d9428fe9cb2d96d1742cb6d09efd45776b073 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 2 Jun 2020 17:14:04 -0400
Subject: [PATCH 1524/1830] Use an em-based width for better scaling with
 font-size changes

---
 app/assets/stylesheets/common/base/popup-menu.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/popup-menu.scss b/app/assets/stylesheets/common/base/popup-menu.scss
index 2df35b5a4c..e367b048e4 100644
--- a/app/assets/stylesheets/common/base/popup-menu.scss
+++ b/app/assets/stylesheets/common/base/popup-menu.scss
@@ -1,6 +1,6 @@
 .popup-menu {
   background-color: $secondary;
-  width: 215px;
+  width: 14em;
   border: 1px solid $primary-low;
   z-index: z("dropdown");
   box-shadow: shadow("card");

From 10e321a96f942c73699ded3e96b107c942f79f92 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 3 Jun 2020 08:40:21 +1000
Subject: [PATCH 1525/1830] Revert "DEV: makes autocomplete debounced (#9941)"

This reverts commit f9e715672b1a7d23adb72676c06f88676165b2df.

Sadly this debounce fix appears to break @mention autocomplete,
reverting for now.
---
 .../discourse/app/lib/autocomplete.js         | 38 +++++--------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/autocomplete.js b/app/assets/javascripts/discourse/app/lib/autocomplete.js
index 4b42b3b02f..eea9f8e417 100644
--- a/app/assets/javascripts/discourse/app/lib/autocomplete.js
+++ b/app/assets/javascripts/discourse/app/lib/autocomplete.js
@@ -1,5 +1,4 @@
-import { INPUT_DELAY } from "discourse-common/config/environment";
-import { debounce, cancel, later } from "@ember/runloop";
+import { cancel, later } from "@ember/runloop";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { setCaretPosition, caretPosition } from "discourse/lib/utilities";
 import Site from "discourse/models/site";
@@ -414,7 +413,9 @@ export default function(options) {
     return options.triggerRule ? options.triggerRule(me[0], opts) : true;
   }
 
-  function debouncedInput() {
+  $(this).on("keyup.autocomplete", function(e) {
+    if ([keys.esc, keys.enter].indexOf(e.which) !== -1) return true;
+
     let cp = caretPosition(me[0]);
     const key = me[0].value[cp - 1];
 
@@ -425,7 +426,7 @@ export default function(options) {
           completeStart = cp - match[0].length;
           completeEnd = completeStart + match[0].length - 1;
           let term = match[0].substring(1, match[0].length);
-          debouncedUpdateAutocomplete(term, options);
+          updateAutoComplete(dataSource(term, options));
         }
       }
     }
@@ -438,24 +439,15 @@ export default function(options) {
           (!prevChar || allowedLettersRegex.test(prevChar))
         ) {
           completeStart = completeEnd = cp - 1;
-          debouncedUpdateAutocomplete("", options);
+          updateAutoComplete(dataSource("", options));
         }
       }
     } else if (completeStart !== null) {
       let term = me.val().substring(completeStart + (options.key ? 1 : 0), cp);
-      debouncedUpdateAutocomplete(term, options);
+      updateAutoComplete(dataSource(term, options));
     }
-  }
-
-  $(this).on("keyup.autocomplete", function(e) {
-    if ([keys.esc, keys.enter].indexOf(e.which) !== -1) return true;
-    debounce(this, debouncedInput, INPUT_DELAY);
   });
 
-  function debouncedUpdateAutocomplete(t, o) {
-    updateAutoComplete(dataSource(t, o));
-  }
-
   $(this).on("keydown.autocomplete", function(e) {
     var c, i, initial, prev, prevIsGood, stopFound, term, total, userToComplete;
     let cp;
@@ -504,13 +496,7 @@ export default function(options) {
           ) {
             completeStart = c;
             term = me[0].value.substring(c + 1, initial);
-            debounce(
-              this,
-              debouncedUpdateAutocomplete,
-              term,
-              options,
-              INPUT_DELAY
-            );
+            updateAutoComplete(dataSource(term, options));
             return true;
           }
         }
@@ -597,13 +583,7 @@ export default function(options) {
             closeAutocomplete();
           }
 
-          debounce(
-            this,
-            debouncedUpdateAutocomplete,
-            term,
-            options,
-            INPUT_DELAY
-          );
+          updateAutoComplete(dataSource(term, options));
           return true;
         default:
           completeEnd = cp;

From 1b5a5059305e402962a0c769b055ac72212ad017 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 2 Jun 2020 20:36:01 -0400
Subject: [PATCH 1526/1830] Small fixes to image uploaders

---
 app/assets/stylesheets/common/admin/settings.scss | 3 +++
 app/assets/stylesheets/common/base/group.scss     | 8 +++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/common/admin/settings.scss b/app/assets/stylesheets/common/admin/settings.scss
index 0eb49fecb9..b54d7f15c3 100644
--- a/app/assets/stylesheets/common/admin/settings.scss
+++ b/app/assets/stylesheets/common/admin/settings.scss
@@ -37,6 +37,9 @@
           width: 100% !important; // !important overrides hard-coded mobile width of 68px
         }
       }
+      .image-uploader {
+        display: flex;
+      }
       .uploaded-image-preview {
         background-size: contain;
         background-repeat: no-repeat;
diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss
index 998a82a0e9..2e87be8f56 100644
--- a/app/assets/stylesheets/common/base/group.scss
+++ b/app/assets/stylesheets/common/base/group.scss
@@ -140,17 +140,15 @@ table.group-members {
   color: $primary;
 }
 
-.form-vertical {
-  .group-flair-inputs {
-    display: inline-block;
-  }
+.group-flair-inputs {
+  display: inline-block;
 
   .avatar-flair-preview {
     position: relative;
     width: 45px;
 
     .avatar-wrapper {
-      background-color: #f4f4f4;
+      background-color: $primary-very-low;
     }
   }
 

From 062db10c527641b42b1d7609892f043e95152f82 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 3 Jun 2020 10:13:25 +0800
Subject: [PATCH 1527/1830] FIX: `EmailValidator` needs to validate format of
 email.

---
 app/models/invite.rb                         |  2 +-
 app/models/user_email.rb                     |  3 +--
 config/locales/server.en.yml                 |  1 +
 lib/validators/email_validator.rb            |  4 ++++
 spec/models/invite_spec.rb                   | 11 ++++++++---
 spec/models/user_email_spec.rb               | 12 ++++++++----
 spec/requests/users_email_controller_spec.rb |  2 +-
 7 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/models/invite.rb b/app/models/invite.rb
index 2618b37de9..5fde9a45ab 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -18,7 +18,7 @@ class Invite < ActiveRecord::Base
   has_many :topic_invites
   has_many :topics, through: :topic_invites, source: :topic
   validates_presence_of :invited_by_id
-  validates :email, email: true, format: { with: EmailValidator.email_regex }, allow_blank: true
+  validates :email, email: true, allow_blank: true
 
   before_create do
     self.invite_key ||= SecureRandom.hex
diff --git a/app/models/user_email.rb b/app/models/user_email.rb
index 7ce64cb4a2..a3e76f22fd 100644
--- a/app/models/user_email.rb
+++ b/app/models/user_email.rb
@@ -11,8 +11,7 @@ class UserEmail < ActiveRecord::Base
   before_validation :strip_downcase_email
 
   validates :email, presence: true
-  validates :email, email: true, format: { with: EmailValidator.email_regex },
-                    if: :validate_email?
+  validates :email, email: true, if: :validate_email?
 
   validates :primary, uniqueness: { scope: [:user_id] }, if: [:user_id, :primary]
   validate :user_id_not_changed, if: :primary
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 7b564c402b..da98bd5cc0 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2451,6 +2451,7 @@ en:
       must_not_contain_two_special_chars_in_seq: "must not contain a sequence of 2 or more special chars (.-_)"
       must_not_end_with_confusing_suffix: "must not end with a confusing suffix like .json or .png etc."
     email:
+      invalid: "is invalid."
       not_allowed: "is not allowed from that email provider. Please use another email address."
       blocked: "is not allowed."
       revoked: "Won't be sending emails to '%{email}' until %{date}."
diff --git a/lib/validators/email_validator.rb b/lib/validators/email_validator.rb
index 6436161b82..7090f2516b 100644
--- a/lib/validators/email_validator.rb
+++ b/lib/validators/email_validator.rb
@@ -3,6 +3,10 @@
 class EmailValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
+    unless value =~ EmailValidator.email_regex
+      record.errors.add(attribute, I18n.t(:'user.email.invalid'))
+    end
+
     unless EmailValidator.allowed?(value)
       record.errors.add(attribute, I18n.t(:'user.email.not_allowed'))
     end
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index fab7da2690..f66a8f84cd 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -29,9 +29,9 @@ describe Invite do
     fab!(:coding_horror) { Fabricate(:coding_horror) }
 
     it "should not allow an invite with unformatted email address" do
-      expect {
-        Fabricate(:invite, email: "John Doe <john.doe@example.com>")
-      }.to raise_error(ActiveRecord::RecordInvalid)
+      invite = Fabricate.build(:invite, email: "John Doe <john.doe@example.com>")
+      expect(invite.valid?).to eq(false)
+      expect(invite.errors.details[:email].first[:error]).to eq(I18n.t("user.email.invalid"))
     end
 
     it "should not allow an invite with blacklisted email" do
@@ -44,6 +44,11 @@ describe Invite do
       expect(invite).to be_valid
     end
 
+    it "should not allow an invalid email address" do
+      invite = Fabricate.build(:invite, email: 'asjdso')
+      expect(invite.valid?).to eq(false)
+      expect(invite.errors.details[:email].first[:error]).to eq(I18n.t("user.email.invalid"))
+    end
   end
 
   context '#create' do
diff --git a/spec/models/user_email_spec.rb b/spec/models/user_email_spec.rb
index ee48170269..ebd08de245 100644
--- a/spec/models/user_email_spec.rb
+++ b/spec/models/user_email_spec.rb
@@ -3,32 +3,36 @@
 require 'rails_helper'
 
 describe UserEmail do
+  fab!(:user) { Fabricate(:user) }
+
   context "validation" do
     it "allows only one primary email" do
-      user = Fabricate(:user)
       expect {
         Fabricate(:secondary_email, user: user, primary: true)
       }.to raise_error(ActiveRecord::RecordInvalid)
     end
 
     it "allows multiple secondary emails" do
-      user = Fabricate(:user)
       Fabricate(:secondary_email, user: user, primary: false)
       Fabricate(:secondary_email, user: user, primary: false)
       expect(user.user_emails.count).to eq 3
     end
+
+    it "does not allow an invalid email" do
+      user_email = Fabricate.build(:user_email, user: user, email: "asjdaiosd")
+      expect(user_email.valid?).to eq(false)
+      expect(user_email.errors.details[:email].first[:error]).to eq(I18n.t("user.email.invalid"))
+    end
   end
 
   context "indexes" do
     it "allows only one primary email" do
-      user = Fabricate(:user)
       expect {
         Fabricate.build(:secondary_email, user: user, primary: true).save(validate: false)
       }.to raise_error(ActiveRecord::RecordNotUnique)
     end
 
     it "allows multiple secondary emails" do
-      user = Fabricate(:user)
       Fabricate.build(:secondary_email, user: user, primary: false).save(validate: false)
       Fabricate.build(:secondary_email, user: user, primary: false).save(validate: false)
       expect(user.user_emails.count).to eq 3
diff --git a/spec/requests/users_email_controller_spec.rb b/spec/requests/users_email_controller_spec.rb
index f7c350199d..257a431caf 100644
--- a/spec/requests/users_email_controller_spec.rb
+++ b/spec/requests/users_email_controller_spec.rb
@@ -282,7 +282,7 @@ describe UsersEmailController do
       it 'raises an error without an invalid email' do
         put "/u/#{user.username}/preferences/email.json", params: { email: "sam@not-email.com'" }
         expect(response.status).to eq(422)
-        expect(response.body).to include("email is invalid")
+        expect(response.body).to include("Email is invalid")
       end
 
       it "raises an error if you can't edit the user's email" do

From 57a3d4e0d2c87e4552cb7de221de30d2b312c2c7 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 3 Jun 2020 13:19:42 +1000
Subject: [PATCH 1528/1830] FEATURE: whitelist theme repo mode (experimental)

In some restricted setups all JS payloads need tight control.

This setting bans admins from making changes to JS on the site and
requires all themes be whitelisted to be used.

There are edge cases we still need to work through in this mode
hence this is still not supported in production and experimental.

Use an example like this to enable:

`DISCOURSE_WHITELISTED_THEME_REPOS="https://repo.com/repo.git,https://repo.com/repo2.git"`

By default this feature is not enabled and no changes are made.

One exception is that default theme id was missing a security check
this was added for correctness.
---
 app/controllers/admin/themes_controller.rb    | 25 ++++++-
 app/controllers/application_controller.rb     |  4 +-
 app/models/global_setting.rb                  | 17 +++++
 config/discourse_defaults.conf                |  9 +++
 lib/guardian.rb                               | 18 +++++
 lib/tasks/themes.rake                         | 24 +++++++
 spec/components/guardian_spec.rb              | 26 +++++++
 spec/requests/admin/themes_controller_spec.rb | 69 ++++++++++++++++++-
 8 files changed, 186 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb
index d51b243979..a08bc95495 100644
--- a/app/controllers/admin/themes_controller.rb
+++ b/app/controllers/admin/themes_controller.rb
@@ -14,6 +14,9 @@ class Admin::ThemesController < Admin::AdminController
   end
 
   def upload_asset
+
+    ban_in_whitelist_mode!
+
     path = params[:file].path
 
     hijack do
@@ -49,6 +52,9 @@ class Admin::ThemesController < Admin::AdminController
   def import
     @theme = nil
     if params[:theme] && params[:theme].content_type == "application/json"
+
+      ban_in_whitelist_mode!
+
       # .dcstyle.json import. Deprecated, but still available to allow conversion
       json = JSON::parse(params[:theme].read)
       theme = json['theme']
@@ -85,15 +91,21 @@ class Admin::ThemesController < Admin::AdminController
       else
         render json: @theme.errors, status: :unprocessable_entity
       end
-    elsif params[:remote]
+    elsif remote = params[:remote]
+
+      guardian.ensure_allowed_theme_repo_import!(remote.strip)
+
       begin
         branch = params[:branch] ? params[:branch] : nil
-        @theme = RemoteTheme.import_theme(params[:remote], theme_user, private_key: params[:private_key], branch: branch)
+        @theme = RemoteTheme.import_theme(remote, theme_user, private_key: params[:private_key], branch: branch)
         render json: @theme, status: :created
       rescue RemoteTheme::ImportError => e
         render_json_error e.message
       end
     elsif params[:bundle] || (params[:theme] && THEME_CONTENT_TYPES.include?(params[:theme].content_type))
+
+      ban_in_whitelist_mode!
+
       # params[:bundle] used by theme CLI. params[:theme] used by admin UI
       bundle = params[:bundle] || params[:theme]
       theme_id = params[:theme_id]
@@ -139,6 +151,9 @@ class Admin::ThemesController < Admin::AdminController
   end
 
   def create
+
+    ban_in_whitelist_mode!
+
     @theme = Theme.new(name: theme_params[:name],
                        user_id: theme_user.id,
                        user_selectable: theme_params[:user_selectable] || false,
@@ -282,6 +297,10 @@ class Admin::ThemesController < Admin::AdminController
 
   private
 
+  def ban_in_whitelist_mode!
+    raise Discourse::InvalidAccess if !GlobalSetting.whitelisted_theme_ids.nil?
+  end
+
   def add_relative_themes!(kind, ids)
     expected = ids.map(&:to_i)
 
@@ -339,6 +358,8 @@ class Admin::ThemesController < Admin::AdminController
   def set_fields
     return unless fields = theme_params[:theme_fields]
 
+    ban_in_whitelist_mode!
+
     fields.each do |field|
       @theme.set_field(
         target: field[:target],
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e7f8c9750b..2ce9f875ff 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -414,7 +414,9 @@ class ApplicationController < ActionController::Base
     end
 
     if theme_ids.blank? && SiteSetting.default_theme_id != -1
-      theme_ids << SiteSetting.default_theme_id
+      if guardian.allow_themes?([SiteSetting.default_theme_id])
+        theme_ids << SiteSetting.default_theme_id
+      end
     end
 
     @theme_ids = request.env[:resolved_theme_ids] = theme_ids
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index cd80df6681..54dc310e61 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -220,6 +220,23 @@ class GlobalSetting
       end
   end
 
+  # test only
+  def self.reset_whitelisted_theme_ids!
+    @whitelisted_theme_ids = nil
+  end
+
+  def self.whitelisted_theme_ids
+    return nil if whitelisted_theme_repos.blank?
+
+    @whitelisted_theme_ids ||= begin
+      urls = whitelisted_theme_repos.split(",").map(&:strip)
+      Theme
+        .joins(:remote_theme)
+        .where('remote_themes.remote_url in (?)', urls)
+        .pluck(:id)
+    end
+  end
+
   def self.add_default(name, default)
     unless self.respond_to? name
       define_singleton_method(name) do
diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf
index 39df104204..b2b2aff03e 100644
--- a/config/discourse_defaults.conf
+++ b/config/discourse_defaults.conf
@@ -285,3 +285,12 @@ compress_anon_cache = false
 # This ensures there are no pathological cases where we keep storing data in anonymous cache
 # never to use it, set to 1 to store immediately, set to 0 to disable anon cache
 anon_cache_store_threshold = 2
+
+# EXPERIMENTAL - not yet supported in production
+# by default admins can install and amend any theme
+# you may restrict it so only specific themes are approved
+# in whitelist mode all theme updates must happen via git repos
+# themes missing from the list are automatically disallowed
+# list is a comma seperated list of git repos eg:
+# https://github.com/discourse/discourse-custom-header-links.git,https://github.com/discourse/discourse-simple-theme.git
+whitelisted_theme_repos =
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 456461fead..da6d1bf2b7 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -471,9 +471,27 @@ class Guardian
     @user.staff? || @user.trust_level >= TrustLevel.levels[:member]
   end
 
+  def allowed_theme_repo_import?(repo)
+    return false if !@user.admin?
+
+    whitelisted_repos = GlobalSetting.whitelisted_theme_repos
+    if !whitelisted_repos.blank?
+      urls = whitelisted_repos.split(",").map(&:strip)
+      return urls.include?(repo)
+    end
+
+    true
+  end
+
   def allow_themes?(theme_ids, include_preview: false)
     return true if theme_ids.blank?
 
+    if whitelisted_theme_ids = GlobalSetting.whitelisted_theme_ids
+      if (theme_ids - whitelisted_theme_ids).present?
+        return false
+      end
+    end
+
     if include_preview && is_staff? && (theme_ids - Theme.theme_ids).blank?
       return true
     end
diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake
index 8a90196faf..8a8cde8f68 100644
--- a/lib/tasks/themes.rake
+++ b/lib/tasks/themes.rake
@@ -50,3 +50,27 @@ task "themes:install" => :environment do |task, args|
     exit 1
   end
 end
+
+desc "List all the installed themes on the site"
+task "themes:audit" => :environment do
+  components = Set.new
+  puts "Selectable themes"
+  puts "-----------------"
+
+  Theme.where("(enabled OR user_selectable) AND NOT component").each do |theme|
+    puts theme.remote_theme&.remote_url || theme.name
+    theme.child_themes.each do |child|
+      if child.enabled
+        repo = child.remote_theme&.remote_url || child.name
+        components << repo
+      end
+    end
+  end
+
+  puts
+  puts "Selectable components"
+  puts "---------------------"
+  components.each do |repo|
+    puts repo
+  end
+end
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index 97a1b0c2e0..53b1b14c1c 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -2869,6 +2869,32 @@ describe Guardian do
     let!(:theme) { Fabricate(:theme) }
     let!(:theme2) { Fabricate(:theme) }
 
+    context "whitelist mode" do
+      before do
+        GlobalSetting.reset_whitelisted_theme_ids!
+        global_setting :whitelisted_theme_repos, "  https://magic.com/repo.git, https://x.com/git"
+      end
+
+      after do
+        GlobalSetting.reset_whitelisted_theme_ids!
+      end
+
+      it "should respect theme whitelisting" do
+        r = RemoteTheme.create!(remote_url: "https://magic.com/repo.git")
+        theme.update!(remote_theme_id: r.id)
+
+        guardian = Guardian.new(admin)
+
+        expect(guardian.allow_themes?([theme.id, theme2.id], include_preview: true)).to eq(false)
+
+        expect(guardian.allow_themes?([theme.id], include_preview: true)).to eq(true)
+
+        expect(guardian.allowed_theme_repo_import?('https://x.com/git')).to eq(true)
+        expect(guardian.allowed_theme_repo_import?('https:/evil.com/git')).to eq(false)
+
+      end
+    end
+
     it "allows staff to use any themes" do
       expect(Guardian.new(moderator).allow_themes?([theme.id, theme2.id])).to eq(false)
       expect(Guardian.new(admin).allow_themes?([theme.id, theme2.id])).to eq(false)
diff --git a/spec/requests/admin/themes_controller_spec.rb b/spec/requests/admin/themes_controller_spec.rb
index 39e24e8940..a7d42ce4f9 100644
--- a/spec/requests/admin/themes_controller_spec.rb
+++ b/spec/requests/admin/themes_controller_spec.rb
@@ -87,6 +87,7 @@ describe Admin::ThemesController do
   end
 
   describe '#import' do
+
     let(:theme_json_file) do
       Rack::Test::UploadedFile.new(file_from_fixtures("sam-s-simple-theme.dcstyle.json", "json"), "application/json")
     end
@@ -99,6 +100,40 @@ describe Admin::ThemesController do
       file_from_fixtures("logo.png")
     end
 
+    context 'when theme whitelist mode is enabled' do
+      before do
+        GlobalSetting.reset_whitelisted_theme_ids!
+        global_setting :whitelisted_theme_repos, "https://github.com/discourse/discourse-brand-header"
+      end
+
+      after do
+        GlobalSetting.reset_whitelisted_theme_ids!
+      end
+
+      it "allows whitelisted imports" do
+        RemoteTheme.stubs(:import_theme)
+        post "/admin/themes/import.json", params: {
+          remote: '    https://github.com/discourse/discourse-brand-header       '
+        }
+
+        expect(response.status).to eq(201)
+      end
+
+      it "bans non whtielisted imports" do
+        RemoteTheme.stubs(:import_theme)
+        post "/admin/themes/import.json", params: {
+          remote: '    https://bad.com/discourse/discourse-brand-header       '
+        }
+
+        expect(response.status).to eq(403)
+      end
+
+      it "bans json file import" do
+        post "/admin/themes/import.json", params: { theme: theme_json_file }
+        expect(response.status).to eq(403)
+      end
+    end
+
     it 'can import a theme from Git' do
       RemoteTheme.stubs(:import_theme)
       post "/admin/themes/import.json", params: {
@@ -120,7 +155,7 @@ describe Admin::ThemesController do
     end
 
     it 'imports a theme from an archive' do
-      existing_theme = Fabricate(:theme, name: "Header Icons")
+      _existing_theme = Fabricate(:theme, name: "Header Icons")
 
       expect do
         post "/admin/themes/import.json", params: { theme: theme_archive }
@@ -135,7 +170,7 @@ describe Admin::ThemesController do
 
     it 'updates an existing theme from an archive by name' do
       # Old theme CLI method, remove Jan 2020
-      existing_theme = Fabricate(:theme, name: "Header Icons")
+      _existing_theme = Fabricate(:theme, name: "Header Icons")
 
       expect do
         post "/admin/themes/import.json", params: { bundle: theme_archive }
@@ -150,7 +185,7 @@ describe Admin::ThemesController do
 
     it 'updates an existing theme from an archive by id' do
       # Used by theme CLI
-      existing_theme = Fabricate(:theme, name: "Header Icons")
+      _existing_theme = Fabricate(:theme, name: "Header Icons")
       other_existing_theme = Fabricate(:theme, name: "Some other name")
 
       messages = MessageBus.track_publish do
@@ -273,6 +308,34 @@ describe Admin::ThemesController do
       expect(SiteSetting.default_theme_id).to eq(-1)
     end
 
+    context 'when theme whitelist mode is enabled' do
+      before do
+        GlobalSetting.reset_whitelisted_theme_ids!
+        global_setting :whitelisted_theme_repos, "  https://magic.com/repo.git, https://x.com/git"
+      end
+
+      after do
+        GlobalSetting.reset_whitelisted_theme_ids!
+      end
+
+      it 'unconditionally bans theme_fields from updating' do
+        r = RemoteTheme.create!(remote_url: "https://magic.com/repo.git")
+        theme.update!(remote_theme_id: r.id)
+
+        put "/admin/themes/#{theme.id}.json", params: {
+          theme: {
+            name: 'my test name',
+            theme_fields: [
+              { name: 'scss', target: 'common', value: '' },
+              { name: 'scss', target: 'desktop', value: 'body{color: blue;}' },
+            ]
+          }
+        }
+
+        expect(response.status).to eq(403)
+      end
+    end
+
     it 'updates a theme' do
       theme.set_field(target: :common, name: :scss, value: '.body{color: black;}')
       theme.save

From 141fba88664b41c6d088780cde0106e925a058a0 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 3 Jun 2020 11:50:24 +0800
Subject: [PATCH 1529/1830] UX: Ensure that `select-kit` is hidden
 consistently.

---
 app/assets/stylesheets/common/select-kit/select-kit.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index ff39b2df69..8a696d6e13 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -8,7 +8,7 @@
   user-select: none;
 
   &.is-hidden {
-    display: none;
+    display: none !important;
   }
 
   &.is-disabled {

From 04a291ceea434c327e68ef68ce3f8198c56e4448 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 3 Jun 2020 12:23:46 +0800
Subject: [PATCH 1530/1830] DEV: Fix race conditions due to directory removal
 for uploads spec.

---
 spec/components/file_store/base_store_spec.rb | 2 --
 spec/fabricators/upload_fabricator.rb         | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/spec/components/file_store/base_store_spec.rb b/spec/components/file_store/base_store_spec.rb
index c58818a72f..708235d80c 100644
--- a/spec/components/file_store/base_store_spec.rb
+++ b/spec/components/file_store/base_store_spec.rb
@@ -47,8 +47,6 @@ RSpec.describe FileStore::BaseStore do
 
   describe '#download' do
     before do
-      `rm -rf #{FileStore::BaseStore::CACHE_DIR}`
-
       SiteSetting.enable_s3_uploads = true
       SiteSetting.s3_upload_bucket = "s3-upload-bucket"
       SiteSetting.s3_access_key_id = "some key"
diff --git a/spec/fabricators/upload_fabricator.rb b/spec/fabricators/upload_fabricator.rb
index c2f6952736..65e4a1bf2f 100644
--- a/spec/fabricators/upload_fabricator.rb
+++ b/spec/fabricators/upload_fabricator.rb
@@ -2,7 +2,7 @@
 
 Fabricator(:upload) do
   user
-  sha1 { sequence(:sha1) { |n| Digest::SHA1.hexdigest(n.to_s) } }
+  sha1 { sequence(:sha1) { |n| Digest::SHA1.hexdigest("#{n}#{Process.pid}") } }
   original_filename "logo.png"
   filesize 1234
   width 100

From cbaad631a47a62b07be39da92eb8048dc2410299 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 3 Jun 2020 15:18:32 +1000
Subject: [PATCH 1531/1830] PERF: add FORCE_BOOTSNAP env var

Bootsnap is designed to work in production per:
https://github.com/Shopify/bootsnap

Over the years we have seen very few issues with it, none of which
were corruption.

This allows us to enable bootsnap in production

Having bootsnap enabled means that we can speed up deploys by
about 5 seconds per server. It also means a lot less waiting for
various production rake tasks and so on.
---
 config/boot.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/boot.rb b/config/boot.rb
index ae2ee5b2fa..affd36c9bb 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -12,7 +12,7 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
 
-if ENV['RAILS_ENV'] != 'production' && ENV['RAILS_ENV'] != 'profile'
+if (ENV['FORCE_BOOTSNAP'] == '1') || (ENV['RAILS_ENV'] != 'production' && ENV['RAILS_ENV'] != 'profile')
   begin
     require 'bootsnap'
   rescue LoadError

From a4a33fccb07f511b94584bc3886f42f4e8c86a9f Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 3 Jun 2020 14:30:49 +0800
Subject: [PATCH 1532/1830] DEV: Update rails_failover.

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 92e1f2a4a7..ecb9738c74 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/discourse/rails_failover
-  revision: 73ceb21624079e007a7d3bf0bf201f0b34dcd6aa
+  revision: a8785298ad5c89869c315d53d5f7243ec9443b55
   specs:
     rails_failover (0.4.0)
       activerecord (~> 6.0)

From 76ce814a62033296156d9e0886117ef283e1e9f2 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 3 Jun 2020 15:36:50 +0800
Subject: [PATCH 1533/1830] DEV: Use `safe_each_connection` patch when
 preloading Rails.

This is to ensure we still boot even if there is a problem with any of
the databases.
---
 lib/discourse.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/discourse.rb b/lib/discourse.rb
index 27c28e199d..5da2acb15e 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -838,7 +838,7 @@ module Discourse
 
     # load up schema cache for all multisite assuming all dbs have
     # an identical schema
-    RailsMultisite::ConnectionManagement.each_connection do
+    RailsMultisite::ConnectionManagement.safe_each_connection do
       dup_cache = schema_cache.dup
       # this line is not really needed, but just in case the
       # underlying implementation changes lets give it a shot

From fc0f112f161e37899d1d9ec757abe7035eb731ea Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 3 Jun 2020 09:29:30 -0400
Subject: [PATCH 1534/1830] Bump connection_pool from 2.2.2 to 2.2.3 (#9967)

Bumps [connection_pool](https://github.com/mperham/connection_pool) from 2.2.2 to 2.2.3.
- [Release notes](https://github.com/mperham/connection_pool/releases)
- [Changelog](https://github.com/mperham/connection_pool/blob/master/Changes.md)
- [Commits](https://github.com/mperham/connection_pool/compare/v2.2.2...v2.2.3)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index ecb9738c74..e7febbb3ff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -94,7 +94,7 @@ GEM
     coderay (1.1.3)
     colored2 (3.1.2)
     concurrent-ruby (1.1.6)
-    connection_pool (2.2.2)
+    connection_pool (2.2.3)
     cose (1.0.0)
       cbor (~> 0.5.9)
       openssl-signature_algorithm (~> 0.4.0)

From 7fe414d35d39f7bb1b1462a0386291988844976a Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 3 Jun 2020 19:03:02 +0530
Subject: [PATCH 1535/1830] FIX: hide rss feed & json if a user profile is
 hidden.

---
 app/controllers/list_controller.rb           |  7 +++++++
 app/controllers/posts_controller.rb          |  1 +
 app/controllers/user_badges_controller.rb    |  1 +
 spec/requests/list_controller_spec.rb        | 14 ++++++++++++++
 spec/requests/posts_controller_spec.rb       | 10 ++++++++++
 spec/requests/user_badges_controller_spec.rb |  7 +++++++
 6 files changed, 40 insertions(+)

diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 5eadbbcf6d..069768cc45 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -121,6 +121,8 @@ class ListController < ApplicationController
   def topics_by
     list_opts = build_topic_list_options
     target_user = fetch_user_from_params({ include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts) }, [:user_stat, :user_option])
+    ensure_can_see_profile!(target_user)
+
     list = generate_list_for("topics_by", target_user, list_opts)
     list.more_topics_url = construct_url_with(:next, list_opts)
     list.prev_topics_url = construct_url_with(:prev, list_opts)
@@ -205,6 +207,7 @@ class ListController < ApplicationController
   def user_topics_feed
     discourse_expires_in 1.minute
     target_user = fetch_user_from_params
+    ensure_can_see_profile!(target_user)
 
     @title = "#{SiteSetting.title} - #{I18n.t("rss_description.user_topics", username: target_user.username)}"
     @link = "#{Discourse.base_url}/u/#{target_user.username}/activity/topics"
@@ -385,6 +388,10 @@ class ListController < ApplicationController
     public_send(method, opts.merge(page_params)).sub('.json?', '?')
   end
 
+  def ensure_can_see_profile!(target_user = nil)
+    raise Discourse::NotFound unless guardian.can_see_profile?(target_user)
+  end
+
   def self.best_period_for(previous_visit_at, category_id = nil)
     default_period = ((category_id && Category.where(id: category_id).pluck_first(:default_top_period)) ||
           SiteSetting.top_page_default_timeframe).to_sym
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 4ee3b294af..63ef5bb790 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -106,6 +106,7 @@ class PostsController < ApplicationController
   def user_posts_feed
     params.require(:username)
     user = fetch_user_from_params
+    raise Discourse::NotFound unless guardian.can_see_profile?(user)
 
     posts = Post.public_posts
       .where(user_id: user.id)
diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rb
index ddb5a3e8ae..0abbfecdd3 100644
--- a/app/controllers/user_badges_controller.rb
+++ b/app/controllers/user_badges_controller.rb
@@ -33,6 +33,7 @@ class UserBadgesController < ApplicationController
     params.permit [:grouped]
 
     user = fetch_user_from_params(include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts))
+    raise Discourse::NotFound unless guardian.can_see_profile?(user)
     user_badges = user.user_badges
 
     if params[:grouped]
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index bc913c58a0..710b044467 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -524,6 +524,12 @@ RSpec.describe ListController do
       json = response.parsed_body
       expect(json["topic_list"]["topics"].size).to eq(2)
     end
+
+    it "returns 404 if `hide_profile_and_presence` user option is checked" do
+      user.user_option.update_columns(hide_profile_and_presence: true)
+      get "/topics/created-by/#{user.username}.json"
+      expect(response.status).to eq(404)
+    end
   end
 
   describe "private_messages" do
@@ -622,4 +628,12 @@ RSpec.describe ListController do
       expect(ListController.best_periods_for(nil, :daily)).to eq([:daily, :all])
     end
   end
+
+  describe "user_topics_feed" do
+    it "returns 404 if `hide_profile_and_presence` user option is checked" do
+      user.user_option.update_columns(hide_profile_and_presence: true)
+      get "/u/#{user.username}/activity/topics.rss"
+      expect(response.status).to eq(404)
+    end
+  end
 end
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index e9ed6c4d17..f5ef93c53f 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -1644,6 +1644,16 @@ describe PostsController do
       expect(body).to_not include(private_post.topic.slug)
       expect(body).to include(public_post.topic.slug)
     end
+
+    it "returns 404 if `hide_profile_and_presence` user option is checked" do
+      user.user_option.update_columns(hide_profile_and_presence: true)
+
+      get "/u/#{user.username}/activity.rss"
+      expect(response.status).to eq(404)
+
+      get "/u/#{user.username}/activity.json"
+      expect(response.status).to eq(404)
+    end
   end
 
   describe '#latest' do
diff --git a/spec/requests/user_badges_controller_spec.rb b/spec/requests/user_badges_controller_spec.rb
index 1c19e01de7..0adf411f1a 100644
--- a/spec/requests/user_badges_controller_spec.rb
+++ b/spec/requests/user_badges_controller_spec.rb
@@ -44,6 +44,13 @@ describe UserBadgesController do
       expect(parsed["user_badges"].length).to eq(1)
     end
 
+    it "returns 404 if `hide_profile_and_presence` user option is checked" do
+      user.user_option.update_columns(hide_profile_and_presence: true)
+
+      get "/user-badges/#{user.username}.json"
+      expect(response.status).to eq(404)
+    end
+
     it 'returns user_badges for a user with period in username' do
       user.update!(username: "myname.test")
       get "/user-badges/#{user.username}", xhr: true

From d27b877a40333cc6bc94984016071b5660da7f0f Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 3 Jun 2020 18:19:53 +0200
Subject: [PATCH 1536/1830] FIX: prevents false boolean param to be filtered as
 non existant (#9968)

* FIX: prevents false boolean param to be filtered as non existant

This was preventing to filter top category route to be filtered by replies.

* if order is different ascending should be true on first click

* test

* fix

* just pass params

* more fixxes
---
 .../discourse/app/routes/build-category-route.js    | 10 +++++-----
 .../discourse/app/routes/build-topic-route.js       | 13 ++++++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/routes/build-category-route.js b/app/assets/javascripts/discourse/app/routes/build-category-route.js
index 18fe88124f..eac84d8484 100644
--- a/app/assets/javascripts/discourse/app/routes/build-category-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-category-route.js
@@ -61,12 +61,12 @@ export default (filterArg, params) => {
           const record = this.store.createRecord("category", result.category);
           record.setupGroupsAndPermissions();
           this.site.updateCategory(record);
-          return { category: record };
+          return { category: record, modelParams };
         });
       }
 
       if (category) {
-        return { category };
+        return { category, modelParams };
       }
     },
 
@@ -79,7 +79,7 @@ export default (filterArg, params) => {
       this._setupNavigation(model.category);
       return all([
         this._createSubcategoryList(model.category),
-        this._retrieveTopicList(model.category, transition)
+        this._retrieveTopicList(model.category, transition, model.modelParams)
       ]);
     },
 
@@ -113,11 +113,11 @@ export default (filterArg, params) => {
       return Promise.resolve();
     },
 
-    _retrieveTopicList(category, transition) {
+    _retrieveTopicList(category, transition, modelParams) {
       const listFilter = `c/${Category.slugFor(category)}/${
           category.id
         }/l/${this.filter(category)}`,
-        findOpts = filterQueryParams(transition.to.queryParams, params),
+        findOpts = filterQueryParams(modelParams),
         extras = { cached: this.isPoppedState(transition) };
 
       return findTopicList(
diff --git a/app/assets/javascripts/discourse/app/routes/build-topic-route.js b/app/assets/javascripts/discourse/app/routes/build-topic-route.js
index 8d34c8380e..786e9d557f 100644
--- a/app/assets/javascripts/discourse/app/routes/build-topic-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-topic-route.js
@@ -1,3 +1,4 @@
+import { isEmpty } from "@ember/utils";
 import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
 import { queryParams } from "discourse/controllers/discovery-sortable";
@@ -12,7 +13,7 @@ function filterQueryParams(params, defaultParams) {
 
   if (params) {
     Object.keys(queryParams).forEach(function(opt) {
-      if (params[opt]) {
+      if (!isEmpty(params[opt])) {
         findOpts[opt] = params[opt];
       }
     });
@@ -50,10 +51,12 @@ function findTopicList(store, tracking, filter, filterParams, extras) {
 
     // Clean up any string parameters that might slip through
     filterParams = filterParams || {};
-    Object.keys(filterParams).forEach(function(k) {
-      const val = filterParams[k];
-      if (val === "undefined" || val === "null" || val === "false") {
-        filterParams[k] = undefined;
+    Object.keys(filterParams).forEach(k => {
+      let val = filterParams[k];
+      if (val === "false") val = false;
+      if (val === "true") val = true;
+      if (val === "undefined" || val === "null") {
+        filterParams[k] = null;
       }
     });
 

From ba00cc8ec457ce708cc1aec5d25afc38495cc52a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 3 Jun 2020 12:45:26 -0400
Subject: [PATCH 1537/1830] DEV: Move `Discourse.getURL` and related functions
 to a module (#9966)

* DEV: Move `Discourse.getURL` and related functions to a module

* DEV: Remove `Discourse.getURL` and `Discourse.getURLWithCDN`

* FIX: `get-url` is required for server side code

* DEV: Deprecate `BaseUri` too.
---
 .../admin/components/resumable-upload.js      |  3 +-
 .../controllers/admin-dashboard-general.js    |  6 +-
 .../controllers/admin-dashboard-moderation.js |  3 +-
 .../admin/controllers/admin-web-hooks-show.js |  3 +-
 .../javascripts/admin/models/admin-user.js    | 11 +--
 app/assets/javascripts/admin/models/backup.js |  3 +-
 .../javascripts/admin/models/email-log.js     |  3 +-
 app/assets/javascripts/admin/models/report.js | 11 +--
 .../javascripts/admin/routes/admin-backups.js |  3 +-
 .../admin/templates/dashboard_general.hbs     |  2 +-
 .../discourse-common/addon/lib/get-url.js     | 42 ++++++++-
 .../discourse/app/adapters/topic-list.js      |  3 +-
 app/assets/javascripts/discourse/app/app.js   | 29 +++---
 .../discourse/app/components/cdn-img.js       |  3 +-
 .../app/components/composer-editor.js         |  5 +-
 .../app/components/discourse-tag-bound.js     |  3 +-
 .../app/components/edit-category-general.js   |  5 +-
 .../discourse/app/components/global-notice.js |  3 +-
 .../discourse/app/components/google-search.js |  3 +-
 .../app/components/group-flair-inputs.js      |  5 +-
 .../discourse/app/components/group-post.js    |  3 +-
 .../app/components/image-uploader.js          |  3 +-
 .../app/components/related-messages.js        |  3 +-
 .../app/components/suggested-topics.js        |  5 +-
 .../app/components/user-card-contents.js      |  3 +-
 .../discourse/app/controllers/bookmark.js     |  5 --
 .../discourse/app/controllers/composer.js     |  3 +-
 .../app/controllers/create-account.js         |  6 +-
 .../discourse/app/controllers/email-login.js  |  3 +-
 .../app/controllers/forgot-password.js        |  3 +-
 .../discourse/app/controllers/login.js        |  5 +-
 .../app/controllers/password-reset.js         |  5 +-
 .../app/controllers/preferences/account.js    |  3 +-
 .../discourse/app/helpers/category-link.js    |  5 +-
 .../discourse/app/initializers/message-bus.js |  3 +-
 .../initializers/register-service-worker.js   |  7 +-
 .../javascripts/discourse/app/lib/ajax.js     |  5 +-
 .../discourse/app/lib/category-tag-search.js  |  3 +-
 .../discourse/app/lib/click-track.js          |  5 +-
 .../javascripts/discourse/app/lib/computed.js |  3 +-
 .../discourse/app/lib/discourse-location.js   |  6 +-
 .../discourse/app/lib/keyboard-shortcuts.js   |  4 +-
 .../discourse/app/lib/link-mentions.js        |  3 +-
 .../discourse/app/lib/load-script.js          |  5 +-
 .../javascripts/discourse/app/lib/logout.js   |  5 +-
 .../discourse/app/lib/page-tracker.js         |  3 +-
 .../discourse/app/lib/render-tag.js           |  3 +-
 .../javascripts/discourse/app/lib/search.js   |  5 +-
 .../javascripts/discourse/app/lib/text.js     |  3 +-
 .../javascripts/discourse/app/lib/url.js      | 26 +++---
 .../discourse/app/lib/utilities.js            | 32 ++-----
 .../discourse/app/mapping-router.js           | 10 +--
 .../javascripts/discourse/app/models/badge.js |  3 +-
 .../discourse/app/models/bookmark.js          |  5 +-
 .../discourse/app/models/category.js          |  3 +-
 .../discourse/app/models/login-method.js      |  3 +-
 .../discourse/app/models/nav-item.js          |  3 +-
 .../discourse/app/models/published-page.js    |  3 +-
 .../discourse/app/models/topic-details.js     |  4 +-
 .../discourse/app/models/topic-list.js        |  7 +-
 .../javascripts/discourse/app/models/topic.js |  7 +-
 .../javascripts/discourse/app/models/user.js  | 20 ++---
 .../pre-initializers/discourse-bootstrap.js   | 27 +++++-
 .../discourse/app/routes/application.js       | 13 ++-
 .../discourse/app/services/logs-notice.js     |  3 +-
 .../app/templates/modal/bookmark.hbs          |  2 +-
 .../discourse/app/widgets/actions-summary.js  |  3 +-
 .../app/widgets/default-notification-item.js  | 10 +--
 .../app/widgets/hamburger-categories.js       |  3 +-
 .../discourse/app/widgets/hamburger-menu.js   |  3 +-
 .../app/widgets/header-topic-info.js          |  3 +-
 .../discourse/app/widgets/header.js           |  3 +-
 .../discourse/app/widgets/home-logo.js        |  9 +-
 .../javascripts/discourse/app/widgets/link.js |  5 +-
 .../javascripts/discourse/app/widgets/post.js |  5 +-
 .../discourse/app/widgets/poster-name.js      |  3 +-
 .../app/widgets/private-message-map.js        |  3 +-
 .../discourse/app/widgets/search-menu.js      |  3 +-
 .../addon/components/category-drop.js         |  5 +-
 .../select-kit/addon/components/tag-drop.js   |  9 +-
 .../select-kit/addon/mixins/tags.js           |  3 +-
 lib/pretty_text.rb                            |  1 +
 test/javascripts/lib/computed-test.js         |  3 +-
 test/javascripts/lib/discourse-test.js        | 37 --------
 test/javascripts/lib/get-url-test.js          | 88 +++++++++++++++++++
 test/javascripts/lib/url-test.js              |  5 +-
 test/javascripts/models/email-log-test.js     |  3 +-
 test/javascripts/models/report-test.js        |  3 +-
 test/javascripts/test_helper.js               |  6 +-
 test/javascripts/widgets/home-logo-test.js    |  7 +-
 90 files changed, 401 insertions(+), 260 deletions(-)
 create mode 100644 test/javascripts/lib/get-url-test.js

diff --git a/app/assets/javascripts/admin/components/resumable-upload.js b/app/assets/javascripts/admin/components/resumable-upload.js
index ed95ea68be..97b6f19875 100644
--- a/app/assets/javascripts/admin/components/resumable-upload.js
+++ b/app/assets/javascripts/admin/components/resumable-upload.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { later, schedule } from "@ember/runloop";
 import Component from "@ember/component";
@@ -31,7 +32,7 @@ export default Component.extend({
   @on("init")
   _initialize() {
     this.resumable = new Resumable({
-      target: Discourse.getURL(this.target),
+      target: getURL(this.target),
       maxFiles: 1, // only 1 file at a time
       headers: {
         "X-CSRF-Token": document.querySelector("meta[name='csrf-token']")
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js
index 07a195b566..2030c1e613 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js
@@ -8,6 +8,7 @@ import AdminDashboard from "admin/models/admin-dashboard";
 import Report from "admin/models/report";
 import PeriodComputationMixin from "admin/mixins/period-computation";
 import { computed } from "@ember/object";
+import getURL from "discourse-common/lib/get-url";
 
 function staticReport(reportType) {
   return computed("reports.[]", function() {
@@ -20,7 +21,6 @@ export default Controller.extend(PeriodComputationMixin, {
   dashboardFetchedAt: null,
   exceptionController: inject("exception"),
   logSearchQueriesEnabled: setting("log_search_queries"),
-  basePath: Discourse.BaseUri,
 
   @discourseComputed("siteSettings.dashboard_general_tab_activity_metrics")
   activityMetrics(metrics) {
@@ -107,7 +107,7 @@ export default Controller.extend(PeriodComputationMixin, {
   @discourseComputed
   trendingSearchDisabledLabel() {
     return I18n.t("admin.dashboard.reports.trending_search.disabled", {
-      basePath: Discourse.BaseUri
+      basePath: getURL("/")
     });
   },
 
@@ -150,6 +150,6 @@ export default Controller.extend(PeriodComputationMixin, {
   },
 
   _reportsForPeriodURL(period) {
-    return Discourse.getURL(`/admin?period=${period}`);
+    return getURL(`/admin?period=${period}`);
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js b/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js
index 95f820b598..f37d8606af 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
 import PeriodComputationMixin from "admin/mixins/period-computation";
@@ -45,6 +46,6 @@ export default Controller.extend(PeriodComputationMixin, {
   },
 
   _reportsForPeriodURL(period) {
-    return Discourse.getURL(`/admin/dashboard/moderation?period=${period}`);
+    return getURL(`/admin/dashboard/moderation?period=${period}`);
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js
index 031ad8ee8b..e6f20ee2f5 100644
--- a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js
+++ b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js
@@ -6,6 +6,7 @@ import Controller, { inject as controller } from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { extractDomainFromUrl } from "discourse/lib/utilities";
 import EmberObject from "@ember/object";
+import { isAbsoluteURL } from "discourse-common/lib/get-url";
 
 export default Controller.extend({
   adminWebHooks: controller(),
@@ -109,7 +110,7 @@ export default Controller.extend({
         domain === "localhost" ||
         domain.match(/192\.168\.\d+\.\d+/) ||
         domain.match(/127\.\d+\.\d+\.\d+/) ||
-        url.startsWith(Discourse.BaseUrl)
+        isAbsoluteURL(url)
       ) {
         return bootbox.confirm(
           I18n.t("admin.web_hooks.warn_local_payload_url"),
diff --git a/app/assets/javascripts/admin/models/admin-user.js b/app/assets/javascripts/admin/models/admin-user.js
index 9977fa8dd4..8dc7685cc1 100644
--- a/app/assets/javascripts/admin/models/admin-user.js
+++ b/app/assets/javascripts/admin/models/admin-user.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { filter, or, gt, lt, not } from "@ember/object/computed";
@@ -43,7 +44,7 @@ const AdminUser = User.extend({
 
   @discourseComputed
   bounceLink() {
-    return Discourse.getURL("/admin/email/bounced");
+    return getURL("/admin/email/bounced");
   },
 
   canResetBounceScore: gt("bounce_score", 0),
@@ -306,7 +307,7 @@ const AdminUser = User.extend({
       type: "POST",
       data: { username_or_email: this.username }
     })
-      .then(() => (document.location = Discourse.getURL("/")))
+      .then(() => (document.location = getURL("/")))
       .catch(e => {
         if (e.status === 404) {
           bootbox.alert(I18n.t("admin.impersonate.not_found"));
@@ -395,11 +396,11 @@ const AdminUser = User.extend({
         .then(function(data) {
           if (data.success) {
             if (data.username) {
-              document.location = Discourse.getURL(
+              document.location = getURL(
                 `/admin/users/${user.get("id")}/${data.username}`
               );
             } else {
-              document.location = Discourse.getURL("/admin/users/list/active");
+              document.location = getURL("/admin/users/list/active");
             }
           } else {
             bootbox.alert(I18n.t("admin.user.anonymize_failed"));
@@ -456,7 +457,7 @@ const AdminUser = User.extend({
             if (/^\/admin\/users\/list\//.test(location)) {
               document.location = location;
             } else {
-              document.location = Discourse.getURL("/admin/users/list/active");
+              document.location = getURL("/admin/users/list/active");
             }
           } else {
             bootbox.alert(I18n.t("admin.user.delete_failed"));
diff --git a/app/assets/javascripts/admin/models/backup.js b/app/assets/javascripts/admin/models/backup.js
index 45727a28b2..0b6f7122a4 100644
--- a/app/assets/javascripts/admin/models/backup.js
+++ b/app/assets/javascripts/admin/models/backup.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import { extractError } from "discourse/lib/ajax-error";
@@ -66,7 +67,7 @@ Backup.reopenClass({
         bootbox.alert(result.message);
       } else {
         // redirect to homepage (session might be lost)
-        window.location = Discourse.getURL("/");
+        window.location = getURL("/");
       }
     });
   }
diff --git a/app/assets/javascripts/admin/models/email-log.js b/app/assets/javascripts/admin/models/email-log.js
index c2eaaa26e6..1317df2943 100644
--- a/app/assets/javascripts/admin/models/email-log.js
+++ b/app/assets/javascripts/admin/models/email-log.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import { ajax } from "discourse/lib/ajax";
 import AdminUser from "admin/models/admin-user";
 import EmberObject from "@ember/object";
@@ -13,7 +14,7 @@ EmailLog.reopenClass({
     }
 
     if (attrs.post_url) {
-      attrs.post_url = Discourse.getURL(attrs.post_url);
+      attrs.post_url = getURL(attrs.post_url);
     }
 
     return this._super(attrs);
diff --git a/app/assets/javascripts/admin/models/report.js b/app/assets/javascripts/admin/models/report.js
index 2e0b448887..9d2f25f9a1 100644
--- a/app/assets/javascripts/admin/models/report.js
+++ b/app/assets/javascripts/admin/models/report.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { makeArray } from "discourse-common/lib/helpers";
@@ -37,7 +38,7 @@ const Report = EmberObject.extend({
       .locale("en")
       .format("YYYY-MM-DD");
 
-    return Discourse.getURL(
+    return getURL(
       `/admin/reports/${type}?start_date=${start_date}&end_date=${end_date}`
     );
   },
@@ -335,7 +336,7 @@ const Report = EmberObject.extend({
         avatar_template: row[properties.avatar]
       });
 
-      const href = Discourse.getURL(`/admin/users/${userId}/${username}`);
+      const href = getURL(`/admin/users/${userId}/${username}`);
 
       const avatarImg = renderAvatar(user, {
         imageSize: "tiny",
@@ -356,7 +357,7 @@ const Report = EmberObject.extend({
 
     const formatedValue = () => {
       const topicId = row[properties.id];
-      const href = Discourse.getURL(`/t/-/${topicId}`);
+      const href = getURL(`/t/-/${topicId}`);
       return `<a href='${href}'>${escapeExpression(topicTitle)}</a>`;
     };
 
@@ -370,7 +371,7 @@ const Report = EmberObject.extend({
     const postTitle = row[properties.truncated_raw];
     const postNumber = row[properties.number];
     const topicId = row[properties.topic_id];
-    const href = Discourse.getURL(`/t/-/${topicId}/${postNumber}`);
+    const href = getURL(`/t/-/${topicId}/${postNumber}`);
 
     return {
       property: properties.title,
@@ -434,7 +435,7 @@ const Report = EmberObject.extend({
 
   _linkLabel(properties, row) {
     const property = properties[0];
-    const value = Discourse.getURL(row[property]);
+    const value = getURL(row[property]);
     const formatedValue = (href, anchor) => {
       return `<a href="${escapeExpression(href)}">${escapeExpression(
         anchor
diff --git a/app/assets/javascripts/admin/routes/admin-backups.js b/app/assets/javascripts/admin/routes/admin-backups.js
index 3d517acbf1..aa7c88aba9 100644
--- a/app/assets/javascripts/admin/routes/admin-backups.js
+++ b/app/assets/javascripts/admin/routes/admin-backups.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import EmberObject from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
@@ -40,7 +41,7 @@ export default DiscourseRoute.extend({
         );
         if (log.operation === "restore") {
           // redirect to homepage when the restore is done (session might be lost)
-          window.location = Discourse.getURL("/");
+          window.location = getURL("/");
         }
       } else {
         this.controllerFor("adminBackupsLogs")
diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index 5566271a20..8c90890c55 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -147,7 +147,7 @@
           filters=trendingSearchFilters
           isEnabled=logSearchQueriesEnabled
           disabledLabel=trendingSearchDisabledLabel}}
-        {{html-safe (i18n "admin.dashboard.reports.trending_search.more" basePath=basePath)}}
+        {{html-safe (i18n "admin.dashboard.reports.trending_search.more" basePath=(get-url "/"))}}
       </div>
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse-common/addon/lib/get-url.js b/app/assets/javascripts/discourse-common/addon/lib/get-url.js
index 4a3a20d0d8..eb36586e8d 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/get-url.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/get-url.js
@@ -1,4 +1,5 @@
-let baseUri;
+let cdn, baseUrl, baseUri;
+let S3BaseUrl, S3CDN;
 
 export default function getURL(url) {
   if (!url) return url;
@@ -17,3 +18,42 @@ export default function getURL(url) {
 
   return baseUri + url;
 }
+
+export function getURLWithCDN(url) {
+  url = getURL(url);
+  // only relative urls
+  if (cdn && /^\/[^\/]/.test(url)) {
+    url = cdn + url;
+  } else if (S3CDN) {
+    url = url.replace(S3BaseUrl, S3CDN);
+  }
+  return url;
+}
+
+export function getAbsoluteURL(path) {
+  return baseUrl + path;
+}
+
+export function isAbsoluteURL(url) {
+  return url.startsWith(baseUrl);
+}
+
+export function withoutPrefix(path) {
+  const rootURL = (!baseUri ? "/" : baseUri).replace(/\/$/, "");
+  return path.replace(rootURL, "");
+}
+
+export function setPrefix(configBaseUri) {
+  baseUri = configBaseUri;
+}
+
+export function setupURL(configCdn, configBaseUrl, configBaseUri) {
+  cdn = configCdn;
+  baseUrl = configBaseUrl;
+  baseUri = configBaseUri;
+}
+
+export function setupS3CDN(configS3BaseUrl, configS3CDN) {
+  S3BaseUrl = configS3BaseUrl;
+  S3CDN = configS3CDN;
+}
diff --git a/app/assets/javascripts/discourse/app/adapters/topic-list.js b/app/assets/javascripts/discourse/app/adapters/topic-list.js
index bd45b85e09..359d7ee05a 100644
--- a/app/assets/javascripts/discourse/app/adapters/topic-list.js
+++ b/app/assets/javascripts/discourse/app/adapters/topic-list.js
@@ -1,10 +1,11 @@
+import getURL from "discourse-common/lib/get-url";
 import { ajax } from "discourse/lib/ajax";
 import RestAdapter from "discourse/adapters/rest";
 import PreloadStore from "discourse/lib/preload-store";
 
 export function finderFor(filter, params) {
   return function() {
-    let url = Discourse.getURL("/") + filter + ".json";
+    let url = getURL("/") + filter + ".json";
 
     if (params) {
       const keys = Object.keys(params),
diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index b484afcf52..06e5064e3e 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -4,6 +4,8 @@ import { computed } from "@ember/object";
 import { buildResolver } from "discourse-common/resolver";
 import { bind } from "@ember/runloop";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { default as getURL, getURLWithCDN } from "discourse-common/lib/get-url";
+import deprecated from "discourse-common/lib/deprecated";
 
 const _pluginCallbacks = [];
 
@@ -42,26 +44,19 @@ const Discourse = Application.extend({
   },
 
   getURL(url) {
-    if (!url) return url;
-
-    // if it's a non relative URL, return it.
-    if (url !== "/" && !/^\/[^\/]/.test(url)) return url;
-
-    if (url[0] !== "/") url = "/" + url;
-    if (url.startsWith(this.BaseUri)) return url;
-
-    return this.BaseUri + url;
+    deprecated(
+      "Import `getURL` from `discourse-common/lib/get-url` instead of `Discourse.getURL`",
+      { since: "2.5", dropFrom: "2.6" }
+    );
+    return getURL(url);
   },
 
   getURLWithCDN(url) {
-    url = this.getURL(url);
-    // only relative urls
-    if (this.CDN && /^\/[^\/]/.test(url)) {
-      url = this.CDN + url;
-    } else if (this.S3CDN) {
-      url = url.replace(this.S3BaseUrl, this.S3CDN);
-    }
-    return url;
+    deprecated(
+      "Import `getURLWithCDN` from `discourse-common/lib/get-url` instead of `Discourse.getURLWithCDN`",
+      { since: "2.5", dropFrom: "2.6" }
+    );
+    return getURLWithCDN(url);
   },
 
   Resolver: buildResolver("discourse"),
diff --git a/app/assets/javascripts/discourse/app/components/cdn-img.js b/app/assets/javascripts/discourse/app/components/cdn-img.js
index a5c7a2642a..e343eaea1f 100644
--- a/app/assets/javascripts/discourse/app/components/cdn-img.js
+++ b/app/assets/javascripts/discourse/app/components/cdn-img.js
@@ -1,3 +1,4 @@
+import { getURLWithCDN } from "discourse-common/lib/get-url";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { htmlSafe } from "@ember/template";
@@ -7,7 +8,7 @@ export default Component.extend({
 
   @discourseComputed("src")
   cdnSrc(src) {
-    return Discourse.getURLWithCDN(src);
+    return getURLWithCDN(src);
   },
 
   @discourseComputed("width", "height")
diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js
index 2eb99f44c5..74443c88ec 100644
--- a/app/assets/javascripts/discourse/app/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/app/components/composer-editor.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { debounce, later, next, schedule, throttle } from "@ember/runloop";
 import Component from "@ember/component";
@@ -650,9 +651,7 @@ export default Component.extend({
     const $element = $(this.element);
 
     $element.fileupload({
-      url: Discourse.getURL(
-        `/uploads.json?client_id=${this.messageBus.clientId}`
-      ),
+      url: getURL(`/uploads.json?client_id=${this.messageBus.clientId}`),
       dataType: "json",
       pasteZone: $element
     });
diff --git a/app/assets/javascripts/discourse/app/components/discourse-tag-bound.js b/app/assets/javascripts/discourse/app/components/discourse-tag-bound.js
index 13c8798631..becd4a1fa6 100644
--- a/app/assets/javascripts/discourse/app/components/discourse-tag-bound.js
+++ b/app/assets/javascripts/discourse/app/components/discourse-tag-bound.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 
@@ -13,6 +14,6 @@ export default Component.extend({
 
   @discourseComputed("tagRecord.id")
   href(tagRecordId) {
-    return Discourse.getURL("/tag/" + tagRecordId);
+    return getURL("/tag/" + tagRecordId);
   }
 });
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-general.js b/app/assets/javascripts/discourse/app/components/edit-category-general.js
index a2a477f6a1..931e8923fb 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-general.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-general.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { not } from "@ember/object/computed";
@@ -27,10 +28,10 @@ export default buildCategoryPanel("general", {
   },
 
   canSelectParentCategory: not("category.isUncategorizedCategory"),
-  uncategorizedSiteSettingLink: Discourse.getURL(
+  uncategorizedSiteSettingLink: getURL(
     "/admin/site_settings/category/all_results?filter=allow_uncategorized_topics"
   ),
-  customizeTextContentLink: Discourse.getURL(
+  customizeTextContentLink: getURL(
     "/admin/customize/site_texts?q=uncategorized"
   ),
 
diff --git a/app/assets/javascripts/discourse/app/components/global-notice.js b/app/assets/javascripts/discourse/app/components/global-notice.js
index 15eb1bf376..ced8c86bb2 100644
--- a/app/assets/javascripts/discourse/app/components/global-notice.js
+++ b/app/assets/javascripts/discourse/app/components/global-notice.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { bind, cancel } from "@ember/runloop";
 import Component from "@ember/component";
@@ -105,7 +106,7 @@ export default Component.extend({
 
       if (this.site.wizard_required) {
         const requiredText = I18n.t("wizard_required", {
-          url: Discourse.getURL("/wizard")
+          url: getURL("/wizard")
         });
         notices.push(Notice.create({ text: requiredText, id: "alert-wizard" }));
       }
diff --git a/app/assets/javascripts/discourse/app/components/google-search.js b/app/assets/javascripts/discourse/app/components/google-search.js
index 43db648e81..0054f2898b 100644
--- a/app/assets/javascripts/discourse/app/components/google-search.js
+++ b/app/assets/javascripts/discourse/app/components/google-search.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import discourseComputed from "discourse-common/utils/decorators";
 import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
@@ -10,6 +11,6 @@ export default Component.extend({
 
   @discourseComputed
   siteUrl() {
-    return `${location.protocol}//${location.host}${Discourse.getURL("/")}`;
+    return `${location.protocol}//${location.host}${getURL("/")}`;
   }
 });
diff --git a/app/assets/javascripts/discourse/app/components/group-flair-inputs.js b/app/assets/javascripts/discourse/app/components/group-flair-inputs.js
index b5ecb07bfc..0e264cdad3 100644
--- a/app/assets/javascripts/discourse/app/components/group-flair-inputs.js
+++ b/app/assets/javascripts/discourse/app/components/group-flair-inputs.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { debounce } from "@ember/runloop";
@@ -14,7 +15,7 @@ export default Component.extend({
 
   @discourseComputed
   demoAvatarUrl() {
-    return Discourse.getURL("/images/avatar.png");
+    return getURL("/images/avatar.png");
   },
 
   @discourseComputed("model.flair_type")
@@ -105,7 +106,7 @@ export default Component.extend({
   @action
   setFlairImage(upload) {
     this.model.setProperties({
-      flair_url: Discourse.getURL(upload.url),
+      flair_url: getURL(upload.url),
       flair_upload_id: upload.id
     });
   },
diff --git a/app/assets/javascripts/discourse/app/components/group-post.js b/app/assets/javascripts/discourse/app/components/group-post.js
index 51bb53f0ea..cdbd44ba38 100644
--- a/app/assets/javascripts/discourse/app/components/group-post.js
+++ b/app/assets/javascripts/discourse/app/components/group-post.js
@@ -1,9 +1,10 @@
+import getURL from "discourse-common/lib/get-url";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 
 export default Component.extend({
   @discourseComputed("post.url")
   postUrl(url) {
-    return Discourse.getURL(url);
+    return getURL(url);
   }
 });
diff --git a/app/assets/javascripts/discourse/app/components/image-uploader.js b/app/assets/javascripts/discourse/app/components/image-uploader.js
index 6db47602ad..48a8855889 100644
--- a/app/assets/javascripts/discourse/app/components/image-uploader.js
+++ b/app/assets/javascripts/discourse/app/components/image-uploader.js
@@ -1,3 +1,4 @@
+import { getURLWithCDN } from "discourse-common/lib/get-url";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { next } from "@ember/runloop";
@@ -43,7 +44,7 @@ export default Component.extend(UploadMixin, {
       return "".htmlSafe();
     }
 
-    return Discourse.getURLWithCDN(url);
+    return getURLWithCDN(url);
   },
 
   @discourseComputed("imageCDNURL")
diff --git a/app/assets/javascripts/discourse/app/components/related-messages.js b/app/assets/javascripts/discourse/app/components/related-messages.js
index 1e1457db7d..6381b3f9b8 100644
--- a/app/assets/javascripts/discourse/app/components/related-messages.js
+++ b/app/assets/javascripts/discourse/app/components/related-messages.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 
@@ -23,7 +24,7 @@ export default Component.extend({
 
   @discourseComputed
   searchLink() {
-    return Discourse.getURL(
+    return getURL(
       `/search?expanded=true&q=%40${this.targetUser.username}%20in%3Apersonal-direct`
     );
   },
diff --git a/app/assets/javascripts/discourse/app/components/suggested-topics.js b/app/assets/javascripts/discourse/app/components/suggested-topics.js
index e5c5a40f15..38ebaa1a5a 100644
--- a/app/assets/javascripts/discourse/app/components/suggested-topics.js
+++ b/app/assets/javascripts/discourse/app/components/suggested-topics.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { computed, get } from "@ember/object";
@@ -25,7 +26,7 @@ export default Component.extend({
     }
 
     const opts = {
-      latestLink: `<a href="${Discourse.getURL("/latest")}">${I18n.t(
+      latestLink: `<a href="${getURL("/latest")}">${I18n.t(
         "topic.view_latest_topics"
       )}</a>`
     };
@@ -43,7 +44,7 @@ export default Component.extend({
     } else {
       opts.catLink =
         '<a href="' +
-        Discourse.getURL("/categories") +
+        getURL("/categories") +
         '">' +
         I18n.t("topic.browse_all_categories") +
         "</a>";
diff --git a/app/assets/javascripts/discourse/app/components/user-card-contents.js b/app/assets/javascripts/discourse/app/components/user-card-contents.js
index ee19f26d82..220cadc923 100644
--- a/app/assets/javascripts/discourse/app/components/user-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/user-card-contents.js
@@ -1,3 +1,4 @@
+import { getURLWithCDN } from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { alias, gte, and, gt, not, or } from "@ember/object/computed";
@@ -153,7 +154,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
     }
 
     const url = this.get("user.card_background_upload_url");
-    const bg = isEmpty(url) ? "" : `url(${Discourse.getURLWithCDN(url)})`;
+    const bg = isEmpty(url) ? "" : `url(${getURLWithCDN(url)})`;
     thisElem.style.backgroundImage = bg;
   },
 
diff --git a/app/assets/javascripts/discourse/app/controllers/bookmark.js b/app/assets/javascripts/discourse/app/controllers/bookmark.js
index aa731cb62d..05a4c26b53 100644
--- a/app/assets/javascripts/discourse/app/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/app/controllers/bookmark.js
@@ -270,11 +270,6 @@ export default Controller.extend(ModalFunctionality, {
     return this.nextMonth().format(I18n.t("dates.long_no_year"));
   },
 
-  @discourseComputed()
-  basePath() {
-    return Discourse.BaseUri;
-  },
-
   @discourseComputed("userTimezone")
   userHasTimezoneSet(userTimezone) {
     return !_.isEmpty(userTimezone);
diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index d4a5466da3..3ca2b70f36 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import { and, or, alias, reads } from "@ember/object/computed";
@@ -561,7 +562,7 @@ export default Controller.extend({
       ) {
         groups.forEach(group => {
           let body;
-          const groupLink = Discourse.getURL(`/g/${group.name}/members`);
+          const groupLink = getURL(`/g/${group.name}/members`);
 
           if (group.max_mentions < group.user_count) {
             body = I18n.t("composer.group_mentioned_limit", {
diff --git a/app/assets/javascripts/discourse/app/controllers/create-account.js b/app/assets/javascripts/discourse/app/controllers/create-account.js
index 75ec7b2a66..dc8ee4dbcf 100644
--- a/app/assets/javascripts/discourse/app/controllers/create-account.js
+++ b/app/assets/javascripts/discourse/app/controllers/create-account.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { A } from "@ember/array";
 import { isEmpty } from "@ember/utils";
@@ -86,10 +87,9 @@ export default Controller.extend(
     @discourseComputed
     disclaimerHtml() {
       return I18n.t("create_account.disclaimer", {
-        tos_link: this.get("siteSettings.tos_url") || Discourse.getURL("/tos"),
+        tos_link: this.get("siteSettings.tos_url") || getURL("/tos"),
         privacy_link:
-          this.get("siteSettings.privacy_policy_url") ||
-          Discourse.getURL("/privacy")
+          this.get("siteSettings.privacy_policy_url") || getURL("/privacy")
       });
     },
 
diff --git a/app/assets/javascripts/discourse/app/controllers/email-login.js b/app/assets/javascripts/discourse/app/controllers/email-login.js
index 4000618587..6802271fd9 100644
--- a/app/assets/javascripts/discourse/app/controllers/email-login.js
+++ b/app/assets/javascripts/discourse/app/controllers/email-login.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import discourseComputed from "discourse-common/utils/decorators";
 import Controller from "@ember/controller";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
@@ -7,7 +8,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import { getWebauthnCredential } from "discourse/lib/webauthn";
 
 export default Controller.extend({
-  lockImageUrl: Discourse.getURL("/images/lock.svg"),
+  lockImageUrl: getURL("/images/lock.svg"),
 
   @discourseComputed("model")
   secondFactorRequired(model) {
diff --git a/app/assets/javascripts/discourse/app/controllers/forgot-password.js b/app/assets/javascripts/discourse/app/controllers/forgot-password.js
index 9821947e3b..334367a370 100644
--- a/app/assets/javascripts/discourse/app/controllers/forgot-password.js
+++ b/app/assets/javascripts/discourse/app/controllers/forgot-password.js
@@ -6,6 +6,7 @@ import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { escapeExpression } from "discourse/lib/utilities";
 import { extractError } from "discourse/lib/ajax-error";
+import getURL from "discourse-common/lib/get-url";
 
 export default Controller.extend(ModalFunctionality, {
   offerHelp: null,
@@ -30,7 +31,7 @@ export default Controller.extend(ModalFunctionality, {
     help() {
       this.setProperties({
         offerHelp: I18n.t("forgot_password.help", {
-          basePath: Discourse.BaseUri
+          basePath: getURL("/")
         }),
         helpSeen: true
       });
diff --git a/app/assets/javascripts/discourse/app/controllers/login.js b/app/assets/javascripts/discourse/app/controllers/login.js
index 4bc124b060..9edefd68ec 100644
--- a/app/assets/javascripts/discourse/app/controllers/login.js
+++ b/app/assets/javascripts/discourse/app/controllers/login.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
@@ -372,8 +373,8 @@ export default Controller.extend(ModalFunctionality, {
         // redirect client to the original URL
         $.removeCookie("destination_url");
         window.location.href = destinationUrl;
-      } else if (window.location.pathname === Discourse.getURL("/login")) {
-        window.location = Discourse.getURL("/");
+      } else if (window.location.pathname === getURL("/login")) {
+        window.location = getURL("/");
       } else {
         window.location.reload();
       }
diff --git a/app/assets/javascripts/discourse/app/controllers/password-reset.js b/app/assets/javascripts/discourse/app/controllers/password-reset.js
index 764396c21e..e14de1c1bd 100644
--- a/app/assets/javascripts/discourse/app/controllers/password-reset.js
+++ b/app/assets/javascripts/discourse/app/controllers/password-reset.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { alias, or, readOnly } from "@ember/object/computed";
 import Controller from "@ember/controller";
@@ -41,10 +42,10 @@ export default Controller.extend(PasswordValidation, {
 
   @discourseComputed("redirectTo")
   redirectHref(redirectTo) {
-    return Discourse.getURL(redirectTo || "/");
+    return getURL(redirectTo || "/");
   },
 
-  lockImageUrl: Discourse.getURL("/images/lock.svg"),
+  lockImageUrl: getURL("/images/lock.svg"),
 
   actions: {
     submit() {
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/account.js b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
index 584440ed0c..0a6f54c280 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/account.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { not, or, gt } from "@ember/object/computed";
 import Controller from "@ember/controller";
@@ -195,7 +196,7 @@ export default Controller.extend(CanCheckEmails, {
                 () => {
                   bootbox.alert(
                     I18n.t("user.deleted_yourself"),
-                    () => (window.location = Discourse.getURL("/"))
+                    () => (window.location = getURL("/"))
                   );
                 },
                 () => {
diff --git a/app/assets/javascripts/discourse/app/helpers/category-link.js b/app/assets/javascripts/discourse/app/helpers/category-link.js
index 9530c26982..ff63695293 100644
--- a/app/assets/javascripts/discourse/app/helpers/category-link.js
+++ b/app/assets/javascripts/discourse/app/helpers/category-link.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { get } from "@ember/object";
 import { registerUnbound } from "discourse-common/lib/helpers";
@@ -104,9 +105,7 @@ function defaultCategoryLinkRenderer(category, opts) {
   let restricted = get(category, "read_restricted");
   let url = opts.url
     ? opts.url
-    : Discourse.getURL(
-        `/c/${Category.slugFor(category)}/${get(category, "id")}`
-      );
+    : getURL(`/c/${Category.slugFor(category)}/${get(category, "id")}`);
   let href = opts.link === false ? "" : url;
   let tagName = opts.link === false || opts.link === "false" ? "span" : "a";
   let extraClasses = opts.extraClasses ? " " + opts.extraClasses : "";
diff --git a/app/assets/javascripts/discourse/app/initializers/message-bus.js b/app/assets/javascripts/discourse/app/initializers/message-bus.js
index 6825cd90fa..3422b6c405 100644
--- a/app/assets/javascripts/discourse/app/initializers/message-bus.js
+++ b/app/assets/javascripts/discourse/app/initializers/message-bus.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 // Initialize the message bus to receive messages.
 import userPresent from "discourse/lib/user-presence";
 import { handleLogoff } from "discourse/lib/ajax";
@@ -84,7 +85,7 @@ export default {
         return ajax(opts);
       };
 
-      messageBus.baseUrl = Discourse.getURL("/");
+      messageBus.baseUrl = getURL("/");
     }
 
     if (user) {
diff --git a/app/assets/javascripts/discourse/app/initializers/register-service-worker.js b/app/assets/javascripts/discourse/app/initializers/register-service-worker.js
index fbfc4484de..c22b7e98ff 100644
--- a/app/assets/javascripts/discourse/app/initializers/register-service-worker.js
+++ b/app/assets/javascripts/discourse/app/initializers/register-service-worker.js
@@ -1,3 +1,6 @@
+import { isAbsoluteURL } from "discourse-common/lib/get-url";
+import getURL from "discourse-common/lib/get-url";
+
 export default {
   name: "register-service-worker",
 
@@ -30,7 +33,7 @@ export default {
         });
 
         navigator.serviceWorker
-          .register(`${Discourse.BaseUri}/${Discourse.ServiceWorkerURL}`)
+          .register(`${getURL(Discourse.ServiceWorkerURL)}`)
           .catch(error => {
             // eslint-disable-next-line no-console
             console.info(`Failed to register Service Worker: ${error}`);
@@ -46,7 +49,7 @@ export default {
   },
 
   unregister(registration) {
-    if (registration.scope.startsWith(Discourse.BaseUrl)) {
+    if (isAbsoluteURL(registration.scope)) {
       registration.unregister();
     }
   }
diff --git a/app/assets/javascripts/discourse/app/lib/ajax.js b/app/assets/javascripts/discourse/app/lib/ajax.js
index 1eadcda626..da1af13206 100644
--- a/app/assets/javascripts/discourse/app/lib/ajax.js
+++ b/app/assets/javascripts/discourse/app/lib/ajax.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { run } from "@ember/runloop";
 import userPresent from "discourse/lib/user-presence";
@@ -159,7 +160,7 @@ export function ajax() {
       args.cache = true; // Disable JQuery cache busting param, which was created to deal with IE8
     }
 
-    ajaxObj = $.ajax(Discourse.getURL(url), args);
+    ajaxObj = $.ajax(getURL(url), args);
   }
 
   let promise;
@@ -169,7 +170,7 @@ export function ajax() {
   if (
     args.type &&
     args.type.toUpperCase() !== "GET" &&
-    url !== Discourse.getURL("/clicks/track") &&
+    url !== getURL("/clicks/track") &&
     !Session.currentProp("csrfToken")
   ) {
     promise = new Promise((resolve, reject) => {
diff --git a/app/assets/javascripts/discourse/app/lib/category-tag-search.js b/app/assets/javascripts/discourse/app/lib/category-tag-search.js
index 9a370f0e21..83ad3e96ab 100644
--- a/app/assets/javascripts/discourse/app/lib/category-tag-search.js
+++ b/app/assets/javascripts/discourse/app/lib/category-tag-search.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import discourseDebounce from "discourse/lib/debounce";
 import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
 import Category from "discourse/models/category";
@@ -27,7 +28,7 @@ function searchTags(term, categories, limit) {
     );
 
     const debouncedSearch = discourseDebounce((q, cats, resultFunc) => {
-      oldSearch = $.ajax(Discourse.getURL("/tags/filter/search"), {
+      oldSearch = $.ajax(getURL("/tags/filter/search"), {
         type: "GET",
         cache: true,
         data: { limit: limit, q }
diff --git a/app/assets/javascripts/discourse/app/lib/click-track.js b/app/assets/javascripts/discourse/app/lib/click-track.js
index d34e33363a..d3a37441f7 100644
--- a/app/assets/javascripts/discourse/app/lib/click-track.js
+++ b/app/assets/javascripts/discourse/app/lib/click-track.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { later } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
@@ -106,9 +107,9 @@ export default {
         data.append("url", href);
         data.append("post_id", postId);
         data.append("topic_id", topicId);
-        navigator.sendBeacon(Discourse.getURL("/clicks/track"), data);
+        navigator.sendBeacon(getURL("/clicks/track"), data);
       } else {
-        trackPromise = ajax(Discourse.getURL("/clicks/track"), {
+        trackPromise = ajax(getURL("/clicks/track"), {
           type: "POST",
           data: {
             url: href,
diff --git a/app/assets/javascripts/discourse/app/lib/computed.js b/app/assets/javascripts/discourse/app/lib/computed.js
index 68eefd11da..b3a4eb2e2a 100644
--- a/app/assets/javascripts/discourse/app/lib/computed.js
+++ b/app/assets/javascripts/discourse/app/lib/computed.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { computed } from "@ember/object";
 import { htmlSafe as htmlSafeTemplateHelper } from "@ember/template";
@@ -126,7 +127,7 @@ export function fmt(...args) {
 export function url(...args) {
   const format = args.pop();
   return computed(...args, function() {
-    return Discourse.getURL(addonFmt(format, ...args.map(a => this.get(a))));
+    return getURL(addonFmt(format, ...args.map(a => this.get(a))));
   });
 }
 
diff --git a/app/assets/javascripts/discourse/app/lib/discourse-location.js b/app/assets/javascripts/discourse/app/lib/discourse-location.js
index 20e8ad8c5d..2c0466c739 100644
--- a/app/assets/javascripts/discourse/app/lib/discourse-location.js
+++ b/app/assets/javascripts/discourse/app/lib/discourse-location.js
@@ -1,6 +1,7 @@
 import EmberObject from "@ember/object";
 import { defaultHomepage } from "discourse/lib/utilities";
 import { guidFor } from "@ember/object/internals";
+import { withoutPrefix } from "discourse-common/lib/get-url";
 let popstateFired = false;
 const supportsHistoryState = window.history && "state" in window.history;
 const popstateCallbacks = [];
@@ -62,10 +63,7 @@ const DiscourseLocation = EmberObject.extend({
     @method getURL
   */
   getURL() {
-    let url = this.location.pathname;
-
-    url = url.replace(new RegExp(`^${Discourse.BaseUri}`), "");
-
+    let url = withoutPrefix(this.location.pathname);
     const search = this.location.search || "";
     url += search;
     return url;
diff --git a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
index 985d9fc1af..29cfaaf9d2 100644
--- a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
@@ -471,9 +471,7 @@ export default {
   },
 
   _bindToPath(path, key) {
-    this.keyTrapper.bind(key, () =>
-      DiscourseURL.routeTo(Discourse.BaseUri + path)
-    );
+    this.keyTrapper.bind(key, () => DiscourseURL.routeTo(path));
   },
 
   _bindToClick(selector, binding) {
diff --git a/app/assets/javascripts/discourse/app/lib/link-mentions.js b/app/assets/javascripts/discourse/app/lib/link-mentions.js
index 02872edaec..700412a223 100644
--- a/app/assets/javascripts/discourse/app/lib/link-mentions.js
+++ b/app/assets/javascripts/discourse/app/lib/link-mentions.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import { schedule } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
@@ -15,7 +16,7 @@ function replaceSpan($e, username, opts) {
       extraClass = "notify";
     }
     $e.replaceWith(
-      `<a href='${Discourse.getURL("/g/") +
+      `<a href='${getURL("/g/") +
         username}' class='mention-group ${extraClass}' ${extra}>@${username}</a>`
     );
   } else {
diff --git a/app/assets/javascripts/discourse/app/lib/load-script.js b/app/assets/javascripts/discourse/app/lib/load-script.js
index 7c8dfd851f..52babb1952 100644
--- a/app/assets/javascripts/discourse/app/lib/load-script.js
+++ b/app/assets/javascripts/discourse/app/lib/load-script.js
@@ -1,3 +1,4 @@
+import { default as getURL, getURLWithCDN } from "discourse-common/lib/get-url";
 import { run } from "@ember/runloop";
 import { ajax } from "discourse/lib/ajax";
 import { Promise } from "rsvp";
@@ -51,9 +52,7 @@ export default function loadScript(url, opts) {
 
   // Scripts should always load from CDN
   // CSS is type text, to accept it from a CDN we would need to handle CORS
-  const fullUrl = opts.css
-    ? Discourse.getURL(url)
-    : Discourse.getURLWithCDN(url);
+  const fullUrl = opts.css ? getURL(url) : getURLWithCDN(url);
 
   $("script").each((i, tag) => {
     const src = tag.getAttribute("src");
diff --git a/app/assets/javascripts/discourse/app/lib/logout.js b/app/assets/javascripts/discourse/app/lib/logout.js
index 23160f8e44..2d5bf9966b 100644
--- a/app/assets/javascripts/discourse/app/lib/logout.js
+++ b/app/assets/javascripts/discourse/app/lib/logout.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import { isEmpty } from "@ember/utils";
 import { findAll } from "discourse/models/login-method";
 
@@ -23,9 +24,9 @@ export default function logout(siteSettings, keyValueStore) {
   if (siteSettings.login_required && (sso || oneAuthenticator)) {
     // In this situation visiting most URLs will start the auth process again
     // Go to the `/login` page to avoid an immediate redirect
-    window.location.href = Discourse.getURL("/login");
+    window.location.href = getURL("/login");
     return;
   }
 
-  window.location.href = Discourse.getURL("/");
+  window.location.href = getURL("/");
 }
diff --git a/app/assets/javascripts/discourse/app/lib/page-tracker.js b/app/assets/javascripts/discourse/app/lib/page-tracker.js
index 4acbdc4ea3..3246f14ee8 100644
--- a/app/assets/javascripts/discourse/app/lib/page-tracker.js
+++ b/app/assets/javascripts/discourse/app/lib/page-tracker.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import { next } from "@ember/runloop";
 let _started = false;
 let cache = {};
@@ -28,7 +29,7 @@ export function startPageTracking(router, appEvents) {
       transition.urlMethod === "replace" && transition.queryParamsOnly;
 
     router.send("refreshTitle");
-    const url = Discourse.getURL(router.get("url"));
+    const url = getURL(router.get("url"));
 
     // Refreshing the title is debounced, so we need to trigger this in the
     // next runloop to have the correct title.
diff --git a/app/assets/javascripts/discourse/app/lib/render-tag.js b/app/assets/javascripts/discourse/app/lib/render-tag.js
index f1882a386e..da11af4669 100644
--- a/app/assets/javascripts/discourse/app/lib/render-tag.js
+++ b/app/assets/javascripts/discourse/app/lib/render-tag.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import User from "discourse/models/user";
 import { escapeExpression } from "discourse/lib/utilities";
 
@@ -24,7 +25,7 @@ export function defaultRenderTag(tag, params) {
       path = `/tag/${tag}`;
     }
   }
-  const href = path ? ` href='${Discourse.getURL(path)}' ` : "";
+  const href = path ? ` href='${getURL(path)}' ` : "";
 
   if (Discourse.SiteSettings.tag_style || params.style) {
     classes.push(params.style || Discourse.SiteSettings.tag_style);
diff --git a/app/assets/javascripts/discourse/app/lib/search.js b/app/assets/javascripts/discourse/app/lib/search.js
index 07eb6ad7bf..d0974eba05 100644
--- a/app/assets/javascripts/discourse/app/lib/search.js
+++ b/app/assets/javascripts/discourse/app/lib/search.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
@@ -67,7 +68,7 @@ export function translateResults(results, opts) {
         flairBgColor,
         fullName,
         name,
-        url: Discourse.getURL(`/g/${name}`)
+        url: getURL(`/g/${name}`)
       };
     })
     .compact();
@@ -77,7 +78,7 @@ export function translateResults(results, opts) {
       const tagName = escapeExpression(tag.name);
       return EmberObject.create({
         id: tagName,
-        url: Discourse.getURL("/tag/" + tagName)
+        url: getURL("/tag/" + tagName)
       });
     })
     .compact();
diff --git a/app/assets/javascripts/discourse/app/lib/text.js b/app/assets/javascripts/discourse/app/lib/text.js
index 94d33b18d5..afca9415f7 100644
--- a/app/assets/javascripts/discourse/app/lib/text.js
+++ b/app/assets/javascripts/discourse/app/lib/text.js
@@ -1,3 +1,4 @@
+import { getURLWithCDN } from "discourse-common/lib/get-url";
 import PrettyText, { buildOptions } from "pretty-text/pretty-text";
 import { performEmojiUnescape, buildEmojiUrl } from "pretty-text/emoji";
 import WhiteLister from "pretty-text/white-lister";
@@ -7,8 +8,6 @@ import { formatUsername } from "discourse/lib/utilities";
 import { Promise } from "rsvp";
 import { htmlSafe } from "@ember/template";
 
-const getURLWithCDN = url => Discourse.getURLWithCDN(url);
-
 function getOpts(opts) {
   const siteSettings = Discourse.__container__.lookup("site-settings:main"),
     site = Discourse.__container__.lookup("site:main");
diff --git a/app/assets/javascripts/discourse/app/lib/url.js b/app/assets/javascripts/discourse/app/lib/url.js
index 4086ca7b62..f357e4978a 100644
--- a/app/assets/javascripts/discourse/app/lib/url.js
+++ b/app/assets/javascripts/discourse/app/lib/url.js
@@ -5,6 +5,7 @@ import offsetCalculator from "discourse/lib/offset-calculator";
 import LockOn from "discourse/lib/lock-on";
 import { defaultHomepage } from "discourse/lib/utilities";
 import User from "discourse/models/user";
+import { default as getURL, withoutPrefix } from "discourse-common/lib/get-url";
 
 const rewrites = [];
 const TOPIC_REGEXP = /\/t\/([^\/]+)\/(\d+)\/?(\d+)?/;
@@ -55,11 +56,11 @@ export function clearRewrites() {
 }
 
 export function userPath(subPath) {
-  return Discourse.getURL(subPath ? `/u/${subPath}` : "/u");
+  return getURL(subPath ? `/u/${subPath}` : "/u");
 }
 
 export function groupPath(subPath) {
-  return Discourse.getURL(subPath ? `/g/${subPath}` : "/g");
+  return getURL(subPath ? `/g/${subPath}` : "/g");
 }
 
 let _jumpScheduled = false;
@@ -210,11 +211,10 @@ const DiscourseURL = EmberObject.extend({
     }
 
     if (Discourse.get("requiresRefresh")) {
-      return redirectTo(Discourse.getURL(path));
+      return redirectTo(getURL(path));
     }
 
     const pathname = path.replace(/(https?\:)?\/\/[^\/]+/, "");
-    const baseUri = Discourse.BaseUri;
 
     if (!DiscourseURL.isInternal(path)) {
       return redirectTo(path);
@@ -241,7 +241,7 @@ const DiscourseURL = EmberObject.extend({
     path = path.replace(/(https?\:)?\/\/[^\/]+/, "");
 
     // Rewrite /my/* urls
-    let myPath = `${baseUri}/my/`;
+    let myPath = getURL("/my");
     if (path.indexOf(myPath) === 0) {
       const currentUser = User.current();
       if (currentUser) {
@@ -256,11 +256,7 @@ const DiscourseURL = EmberObject.extend({
 
     // handle prefixes
     if (path.indexOf("/") === 0) {
-      const rootURL = (baseUri === undefined ? "/" : baseUri).replace(
-        /\/$/,
-        ""
-      );
-      path = path.replace(rootURL, "");
+      path = withoutPrefix(path);
     }
 
     path = rewritePath(path);
@@ -293,7 +289,7 @@ const DiscourseURL = EmberObject.extend({
   },
 
   routeToUrl(url, opts = {}) {
-    this.routeTo(Discourse.getURL(url), opts);
+    this.routeTo(getURL(url), opts);
   },
 
   rewrite(regexp, replacement, opts) {
@@ -301,7 +297,7 @@ const DiscourseURL = EmberObject.extend({
   },
 
   redirectTo(url) {
-    window.location = Discourse.getURL(url);
+    window.location = getURL(url);
   },
 
   /**
@@ -420,10 +416,8 @@ const DiscourseURL = EmberObject.extend({
 
   // This has been extracted so it can be tested.
   origin() {
-    return (
-      window.location.origin +
-      (Discourse.BaseUri === "/" ? "" : Discourse.BaseUri)
-    );
+    let prefix = getURL("/");
+    return window.location.origin + (prefix === "/" ? "" : prefix);
   },
 
   // TODO: These container calls can be replaced eventually if we migrate this to a service
diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js
index 688aa53929..92fa344134 100644
--- a/app/assets/javascripts/discourse/app/lib/utilities.js
+++ b/app/assets/javascripts/discourse/app/lib/utilities.js
@@ -2,6 +2,7 @@ import I18n from "I18n";
 import { escape } from "pretty-text/sanitizer";
 import toMarkdown from "discourse/lib/to-markdown";
 import Handlebars from "handlebars";
+import { default as getURL, getURLWithCDN } from "discourse-common/lib/get-url";
 
 const homepageSelector = "meta[name=discourse_current_homepage]";
 
@@ -55,18 +56,15 @@ export function getRawSize(size) {
   return size * Math.min(3, Math.max(1, Math.round(pixelRatio)));
 }
 
-const getURLWithCDN = url => Discourse.getURLWithCDN(url);
-
-export function avatarImg(options, getURL) {
-  getURL = getURL || getURLWithCDN;
-
+export function avatarImg(options, customGetURL) {
   const size = translateSize(options.size);
-  const url = avatarUrl(options.avatarTemplate, size);
+  let path = avatarUrl(options.avatarTemplate, size);
 
   // We won't render an invalid url
-  if (!url || url.length === 0) {
+  if (!path || path.length === 0) {
     return "";
   }
+  path = (customGetURL || getURLWithCDN)(path);
 
   const classes =
     "avatar" + (options.extraClasses ? " " + options.extraClasses : "");
@@ -77,19 +75,7 @@ export function avatarImg(options, getURL) {
     title = ` title='${escaped}' aria-label='${escaped}'`;
   }
 
-  return (
-    "<img alt='' width='" +
-    size +
-    "' height='" +
-    size +
-    "' src='" +
-    getURL(url) +
-    "' class='" +
-    classes +
-    "'" +
-    title +
-    ">"
-  );
+  return `<img alt='' width='${size}' height='${size}' src='${path}' class='${classes}'${title}>`;
 }
 
 export function tinyAvatar(avatarTemplate, options) {
@@ -99,7 +85,7 @@ export function tinyAvatar(avatarTemplate, options) {
 }
 
 export function postUrl(slug, topicId, postNumber) {
-  var url = Discourse.getURL("/t/");
+  var url = getURL("/t/");
   if (slug) {
     url += slug + "/";
   } else {
@@ -430,7 +416,7 @@ function reportToLogster(name, error) {
     stacktrace: error.stack
   };
 
-  Ember.$.ajax(`${Discourse.BaseUri}/logs/report_js_error`, {
+  Ember.$.ajax(getURL("/logs/report_js_error"), {
     data,
     type: "POST",
     cache: false
@@ -447,7 +433,7 @@ export function rescueThemeError(name, error, api) {
     return;
   }
 
-  const path = `${Discourse.BaseUri}/admin/customize/themes`;
+  const path = getURL(`/admin/customize/themes`);
   const message = I18n.t("themes.broken_theme_alert", {
     theme: name,
     path: `<a href="${path}">${path}</a>`
diff --git a/app/assets/javascripts/discourse/app/mapping-router.js b/app/assets/javascripts/discourse/app/mapping-router.js
index 99935ddc32..ca6728a1fb 100644
--- a/app/assets/javascripts/discourse/app/mapping-router.js
+++ b/app/assets/javascripts/discourse/app/mapping-router.js
@@ -3,11 +3,9 @@ import { defaultHomepage } from "discourse/lib/utilities";
 import { rewritePath } from "discourse/lib/url";
 import Site from "discourse/models/site";
 import { isTesting } from "discourse-common/config/environment";
-
-const rootURL = Discourse.BaseUri;
+import getURL from "discourse-common/lib/get-url";
 
 const BareRouter = EmberRouter.extend({
-  rootURL,
   location: isTesting() ? "none" : "discourse-location",
 
   handleURL(url) {
@@ -136,10 +134,10 @@ export function mapRoutes() {
     }
   });
 
-  return BareRouter.extend().map(function() {
+  return BareRouter.extend({
+    rootURL: getURL("/")
+  }).map(function() {
     tree.mapRoutes(this);
     this.route("unknown", { path: "*path" });
   });
 }
-
-export default BareRouter;
diff --git a/app/assets/javascripts/discourse/app/models/badge.js b/app/assets/javascripts/discourse/app/models/badge.js
index 5b9e46cef9..3ea5131ae1 100644
--- a/app/assets/javascripts/discourse/app/models/badge.js
+++ b/app/assets/javascripts/discourse/app/models/badge.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import discourseComputed from "discourse-common/utils/decorators";
 import { none } from "@ember/object/computed";
 import EmberObject from "@ember/object";
@@ -11,7 +12,7 @@ const Badge = RestModel.extend({
 
   @discourseComputed
   url() {
-    return Discourse.getURL(`/badges/${this.id}/${this.slug}`);
+    return getURL(`/badges/${this.id}/${this.slug}`);
   },
 
   updateFromJson(json) {
diff --git a/app/assets/javascripts/discourse/app/models/bookmark.js b/app/assets/javascripts/discourse/app/models/bookmark.js
index a55fb80ace..c7a3249144 100644
--- a/app/assets/javascripts/discourse/app/models/bookmark.js
+++ b/app/assets/javascripts/discourse/app/models/bookmark.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import Category from "discourse/models/category";
 import User from "discourse/models/user";
@@ -19,7 +20,7 @@ const Bookmark = RestModel.extend({
 
   @computed
   get url() {
-    return Discourse.getURL(`/bookmarks/${this.id}`);
+    return getURL(`/bookmarks/${this.id}`);
   },
 
   destroy() {
@@ -37,7 +38,7 @@ const Bookmark = RestModel.extend({
 
   // Helper to build a Url with a post number
   urlForPostNumber(postNumber) {
-    let url = Discourse.getURL(`/t/${this.topic_id}`);
+    let url = getURL(`/t/${this.topic_id}`);
     if (postNumber > 0) {
       url += `/${postNumber}`;
     }
diff --git a/app/assets/javascripts/discourse/app/models/category.js b/app/assets/javascripts/discourse/app/models/category.js
index 78802cba87..2c0442a470 100644
--- a/app/assets/javascripts/discourse/app/models/category.js
+++ b/app/assets/javascripts/discourse/app/models/category.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import discourseComputed from "discourse-common/utils/decorators";
 import { get } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
@@ -96,7 +97,7 @@ const Category = RestModel.extend({
 
   @discourseComputed("name")
   url() {
-    return Discourse.getURL(`/c/${Category.slugFor(this)}/${this.id}`);
+    return getURL(`/c/${Category.slugFor(this)}/${this.id}`);
   },
 
   @discourseComputed
diff --git a/app/assets/javascripts/discourse/app/models/login-method.js b/app/assets/javascripts/discourse/app/models/login-method.js
index 0f2f1a46c0..0ef480e5ab 100644
--- a/app/assets/javascripts/discourse/app/models/login-method.js
+++ b/app/assets/javascripts/discourse/app/models/login-method.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import EmberObject from "@ember/object";
@@ -33,7 +34,7 @@ const LoginMethod = EmberObject.extend({
       return Promise.resolve();
     }
 
-    let authUrl = Discourse.getURL(`/auth/${this.name}`);
+    let authUrl = getURL(`/auth/${this.name}`);
 
     if (reconnect) {
       params["reconnect"] = true;
diff --git a/app/assets/javascripts/discourse/app/models/nav-item.js b/app/assets/javascripts/discourse/app/models/nav-item.js
index 955e536e1e..bf41bdde66 100644
--- a/app/assets/javascripts/discourse/app/models/nav-item.js
+++ b/app/assets/javascripts/discourse/app/models/nav-item.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { emojiUnescape } from "discourse/lib/text";
@@ -105,7 +106,7 @@ NavItem.reopenClass({
   extraNavItemDescriptors: [],
 
   pathFor(filterType, context) {
-    let path = Discourse.getURL("");
+    let path = getURL("");
     let includesCategoryContext = false;
     let includesTagContext = false;
 
diff --git a/app/assets/javascripts/discourse/app/models/published-page.js b/app/assets/javascripts/discourse/app/models/published-page.js
index 7f0c12ddf5..91152fa04c 100644
--- a/app/assets/javascripts/discourse/app/models/published-page.js
+++ b/app/assets/javascripts/discourse/app/models/published-page.js
@@ -1,8 +1,9 @@
 import RestModel from "discourse/models/rest";
 import { computed } from "@ember/object";
+import { getAbsoluteURL } from "discourse-common/lib/get-url";
 
 export default RestModel.extend({
   url: computed("slug", function() {
-    return `${Discourse.BaseUrl}/pub/${this.slug}`;
+    return getAbsoluteURL(`/pub/${this.slug}`);
   })
 });
diff --git a/app/assets/javascripts/discourse/app/models/topic-details.js b/app/assets/javascripts/discourse/app/models/topic-details.js
index d8d5ea0036..514db4d9f4 100644
--- a/app/assets/javascripts/discourse/app/models/topic-details.js
+++ b/app/assets/javascripts/discourse/app/models/topic-details.js
@@ -3,6 +3,8 @@ import discourseComputed from "discourse-common/utils/decorators";
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import User from "discourse/models/user";
+import getURL from "discourse-common/lib/get-url";
+
 /**
   A model representing a Topic's details that aren't always present, such as a list of participants.
   When showing topics in lists and such this information should not be required.
@@ -56,7 +58,7 @@ const TopicDetails = RestModel.extend({
     } else {
       return I18n.t(localeString, {
         username: User.currentProp("username_lower"),
-        basePath: Discourse.BaseUri
+        basePath: getURL("/")
       });
     }
   },
diff --git a/app/assets/javascripts/discourse/app/models/topic-list.js b/app/assets/javascripts/discourse/app/models/topic-list.js
index 489c926de3..16b2b67c6b 100644
--- a/app/assets/javascripts/discourse/app/models/topic-list.js
+++ b/app/assets/javascripts/discourse/app/models/topic-list.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import { notEmpty } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
@@ -124,9 +125,9 @@ const TopicList = RestModel.extend({
       this.topics.filter(topic => topic_ids.indexOf(topic.id) >= 0)
     );
 
-    const url = `${Discourse.getURL("/")}${
-      this.filter
-    }.json?topic_ids=${topic_ids.join(",")}`;
+    const url = `${getURL("/")}${this.filter}.json?topic_ids=${topic_ids.join(
+      ","
+    )}`;
 
     return ajax({ url, data: this.params }).then(result => {
       let i = 0;
diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js
index af4b87fbe2..4f5305fec6 100644
--- a/app/assets/javascripts/discourse/app/models/topic.js
+++ b/app/assets/javascripts/discourse/app/models/topic.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import EmberObject from "@ember/object";
 import { not, notEmpty, equal, and, or } from "@ember/object/computed";
@@ -25,7 +26,7 @@ import User from "discourse/models/user";
 
 export function loadTopicView(topic, args) {
   const data = _.merge({}, args);
-  const url = `${Discourse.getURL("/t/")}${topic.id}`;
+  const url = `${getURL("/t/")}${topic.id}`;
   const jsonUrl = (data.nearPost ? `${url}/${data.nearPost}` : url) + ".json";
 
   delete data.nearPost;
@@ -259,7 +260,7 @@ const Topic = RestModel.extend({
     if (slug.trim().length === 0) {
       slug = "topic";
     }
-    return `${Discourse.getURL("/t/")}${slug}/${id}`;
+    return `${getURL("/t/")}${slug}/${id}`;
   },
 
   // Helper to build a Url with a post number
@@ -739,7 +740,7 @@ Topic.reopenClass({
 
   // Load a topic, but accepts a set of filters
   find(topicId, opts) {
-    let url = Discourse.getURL("/t/") + topicId;
+    let url = getURL("/t/") + topicId;
     if (opts.nearPost) {
       url += `/${opts.nearPost}`;
     }
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index 6e287ccf72..a6356182f3 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -1,3 +1,5 @@
+import { getURLWithCDN } from "discourse-common/lib/get-url";
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { A } from "@ember/array";
 import { isEmpty } from "@ember/utils";
@@ -109,11 +111,7 @@ const User = RestModel.extend({
     if (isEmpty(bgUrl) || !Discourse.SiteSettings.allow_profile_backgrounds) {
       return "".htmlSafe();
     }
-    return (
-      "background-image: url(" +
-      Discourse.getURLWithCDN(bgUrl) +
-      ")"
-    ).htmlSafe();
+    return ("background-image: url(" + getURLWithCDN(bgUrl) + ")").htmlSafe();
   },
 
   @discourseComputed()
@@ -183,22 +181,22 @@ const User = RestModel.extend({
   @discourseComputed()
   mutedTopicsPath() {
     return defaultHomepage() === "latest"
-      ? Discourse.getURL("/?state=muted")
-      : Discourse.getURL("/latest?state=muted");
+      ? getURL("/?state=muted")
+      : getURL("/latest?state=muted");
   },
 
   @discourseComputed()
   watchingTopicsPath() {
     return defaultHomepage() === "latest"
-      ? Discourse.getURL("/?state=watching")
-      : Discourse.getURL("/latest?state=watching");
+      ? getURL("/?state=watching")
+      : getURL("/latest?state=watching");
   },
 
   @discourseComputed()
   trackingTopicsPath() {
     return defaultHomepage() === "latest"
-      ? Discourse.getURL("/?state=tracking")
-      : Discourse.getURL("/latest?state=tracking");
+      ? getURL("/?state=tracking")
+      : getURL("/latest?state=tracking");
   },
 
   @discourseComputed("username")
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js b/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
index 29570b5db2..d8eb01dadc 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
@@ -7,6 +7,8 @@ import {
   isTesting,
   isProduction
 } from "discourse-common/config/environment";
+import { setupURL, setupS3CDN } from "discourse-common/lib/get-url";
+import deprecated from "discourse-common/lib/deprecated";
 
 export default {
   name: "discourse-bootstrap",
@@ -35,8 +37,28 @@ export default {
     }
 
     app.CDN = setupData.cdn;
-    app.BaseUrl = setupData.baseUrl;
-    app.BaseUri = setupData.baseUri;
+
+    let baseUrl = setupData.baseUrl;
+    Object.defineProperty(app, "BaseUrl", {
+      get() {
+        deprecated(`use "get-url" helpers instead of Discourse.BaseUrl`, {
+          since: "2.5",
+          dropFrom: "2.6"
+        });
+        return baseUrl;
+      }
+    });
+    let baseUri = setupData.baseUri;
+    Object.defineProperty(app, "BaseUri", {
+      get() {
+        deprecated(`use "get-url" helpers instead of Discourse.BaseUri`, {
+          since: "2.5",
+          dropFrom: "2.6"
+        });
+        return baseUri;
+      }
+    });
+    setupURL(setupData.cdn, baseUrl, setupData.baseUri);
     setEnvironment(setupData.environment);
     app.SiteSettings = PreloadStore.get("siteSettings");
     app.ThemeSettings = PreloadStore.get("themeSettings");
@@ -69,6 +91,7 @@ export default {
     if (setupData.s3BaseUrl) {
       app.S3CDN = setupData.s3Cdn;
       app.S3BaseUrl = setupData.s3BaseUrl;
+      setupS3CDN(setupData.s3BaseUrl, setupData.s3Cdn);
     }
 
     RSVP.configure("onerror", function(e) {
diff --git a/app/assets/javascripts/discourse/app/routes/application.js b/app/assets/javascripts/discourse/app/routes/application.js
index b30dffebf8..cd9c6dd4a0 100644
--- a/app/assets/javascripts/discourse/app/routes/application.js
+++ b/app/assets/javascripts/discourse/app/routes/application.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { once } from "@ember/runloop";
 import DiscourseRoute from "discourse/routes/discourse";
@@ -46,8 +47,8 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
     _collectTitleTokens(tokens) {
       tokens.push(this.siteTitle);
       if (
-        (window.location.pathname === Discourse.getURL("/") ||
-          window.location.pathname === Discourse.getURL("/login")) &&
+        (window.location.pathname === getURL("/") ||
+          window.location.pathname === getURL("/login")) &&
         this.shortSiteDescription !== ""
       ) {
         tokens.push(this.shortSiteDescription);
@@ -250,9 +251,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
   handleShowLogin() {
     if (this.siteSettings.enable_sso) {
       const returnPath = encodeURIComponent(window.location.pathname);
-      window.location = Discourse.getURL(
-        "/session/sso?return_path=" + returnPath
-      );
+      window.location = getURL("/session/sso?return_path=" + returnPath);
     } else {
       this._autoLogin("login", "login-modal", () =>
         this.controllerFor("login").resetForm()
@@ -263,9 +262,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
   handleShowCreateAccount() {
     if (this.siteSettings.enable_sso) {
       const returnPath = encodeURIComponent(window.location.pathname);
-      window.location = Discourse.getURL(
-        "/session/sso?return_path=" + returnPath
-      );
+      window.location = getURL("/session/sso?return_path=" + returnPath);
     } else {
       this._autoLogin("createAccount", "create-account");
     }
diff --git a/app/assets/javascripts/discourse/app/services/logs-notice.js b/app/assets/javascripts/discourse/app/services/logs-notice.js
index c84dadb944..5faaaa2805 100644
--- a/app/assets/javascripts/discourse/app/services/logs-notice.js
+++ b/app/assets/javascripts/discourse/app/services/logs-notice.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
 import EmberObject from "@ember/object";
@@ -42,7 +43,7 @@ const LogsNotice = EmberObject.extend({
           ),
           rate,
           limit: siteSettingLimit,
-          url: Discourse.getURL("/logs")
+          url: getURL("/logs")
         })
       );
     });
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
index 5dc8225767..be9a93dbfa 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
@@ -96,7 +96,7 @@
         {{/tap-tile-grid}}
 
       {{else}}
-        <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=basePath)}}</div>
+        <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=(get-url "/"))}}</div>
       {{/if}}
     </div>
 
diff --git a/app/assets/javascripts/discourse/app/widgets/actions-summary.js b/app/assets/javascripts/discourse/app/widgets/actions-summary.js
index 25e0035897..9e15f6d523 100644
--- a/app/assets/javascripts/discourse/app/widgets/actions-summary.js
+++ b/app/assets/javascripts/discourse/app/widgets/actions-summary.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
 import { avatarFor } from "discourse/widgets/post";
@@ -48,7 +49,7 @@ createWidget("small-user-list", {
       if (postUrl) {
         description = h(
           "a",
-          { attributes: { href: Discourse.getURL(postUrl) } },
+          { attributes: { href: getURL(postUrl) } },
           description
         );
       }
diff --git a/app/assets/javascripts/discourse/app/widgets/default-notification-item.js b/app/assets/javascripts/discourse/app/widgets/default-notification-item.js
index e44a35d341..6840c4d347 100644
--- a/app/assets/javascripts/discourse/app/widgets/default-notification-item.js
+++ b/app/assets/javascripts/discourse/app/widgets/default-notification-item.js
@@ -15,6 +15,7 @@ import { setTransientHeader } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { ajax } from "discourse/lib/ajax";
+import getURL from "discourse-common/lib/get-url";
 
 export const DefaultNotificationItem = createWidget(
   "default-notification-item",
@@ -46,9 +47,7 @@ export const DefaultNotificationItem = createWidget(
 
         let username = data.username;
         username = username ? "?username=" + username.toLowerCase() : "";
-        return Discourse.getURL(
-          "/badges/" + badgeId + "/" + badgeSlug + username
-        );
+        return getURL("/badges/" + badgeId + "/" + badgeSlug + username);
       }
 
       const topicId = attrs.topic_id;
@@ -134,8 +133,9 @@ export const DefaultNotificationItem = createWidget(
       const id = this.attrs.id;
       setTransientHeader("Discourse-Clear-Notifications", id);
       if (document && document.cookie) {
-        let path = Discourse.BaseUri || "/";
-        document.cookie = `cn=${id}; path=${path}; expires=Fri, 31 Dec 9999 23:59:59 GMT`;
+        document.cookie = `cn=${id}; path=${getURL(
+          "/"
+        )}; expires=Fri, 31 Dec 9999 23:59:59 GMT`;
       }
       if (wantsNewWindow(e)) {
         return;
diff --git a/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js b/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js
index dd1b1693e5..5369f9c593 100644
--- a/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js
+++ b/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
@@ -52,7 +53,7 @@ export default createWidget("hamburger-categories", {
   tagName: "ul.category-links.clearfix",
 
   html(attrs) {
-    const href = Discourse.getURL("/categories");
+    const href = getURL("/categories");
     let title = I18n.t("filters.categories.title");
     if (attrs.moreCount > 0) {
       title = I18n.t("categories.n_more", { count: attrs.moreCount });
diff --git a/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js b/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
index 91aefaaa89..669d75928f 100644
--- a/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { later } from "@ember/runloop";
 import { createWidget, applyDecorators } from "discourse/widgets/widget";
@@ -269,7 +270,7 @@ export default createWidget("hamburger-menu", {
 
     let faqUrl = this.siteSettings.faq_url;
     if (!faqUrl || faqUrl.length === 0) {
-      faqUrl = Discourse.getURL("/faq");
+      faqUrl = getURL("/faq");
     }
 
     const prioritizeFaq =
diff --git a/app/assets/javascripts/discourse/app/widgets/header-topic-info.js b/app/assets/javascripts/discourse/app/widgets/header-topic-info.js
index 64a81513e7..99d4eaea36 100644
--- a/app/assets/javascripts/discourse/app/widgets/header-topic-info.js
+++ b/app/assets/javascripts/discourse/app/widgets/header-topic-info.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { applyDecorators, createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
@@ -27,7 +28,7 @@ createWidget("topic-header-participant", {
       url = user.get("path");
     } else {
       content = [iconNode("users")];
-      url = Discourse.getURL(`/g/${group.name}`);
+      url = getURL(`/g/${group.name}`);
       content.push(h("span", group.name));
     }
 
diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index 4699a58a86..b6f2abe9b4 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { get } from "@ember/object";
 import { schedule } from "@ember/runloop";
@@ -217,7 +218,7 @@ createWidget("header-icons", {
       iconId: "search-button",
       action: "toggleSearchMenu",
       active: attrs.searchVisible,
-      href: Discourse.getURL("/search")
+      href: getURL("/search")
     });
 
     const icons = [search, hamburger];
diff --git a/app/assets/javascripts/discourse/app/widgets/home-logo.js b/app/assets/javascripts/discourse/app/widgets/home-logo.js
index 5c7454df11..9af8f2b273 100644
--- a/app/assets/javascripts/discourse/app/widgets/home-logo.js
+++ b/app/assets/javascripts/discourse/app/widgets/home-logo.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 import { iconNode } from "discourse-common/lib/icon-library";
@@ -8,7 +9,7 @@ export default createWidget("home-logo", {
   tagName: "div.title",
 
   settings: {
-    href: Discourse.getURL("/")
+    href: getURL("/")
   },
 
   href() {
@@ -44,7 +45,7 @@ export default createWidget("home-logo", {
         return h("img#site-logo.logo-small", {
           key: "logo-small",
           attributes: {
-            src: Discourse.getURL(logoSmallUrl),
+            src: getURL(logoSmallUrl),
             width: 36,
             alt: title
           }
@@ -55,12 +56,12 @@ export default createWidget("home-logo", {
     } else if (showMobileLogo) {
       return h("img#site-logo.logo-big", {
         key: "logo-mobile",
-        attributes: { src: Discourse.getURL(mobileLogoUrl), alt: title }
+        attributes: { src: getURL(mobileLogoUrl), alt: title }
       });
     } else if (logoUrl.length) {
       return h("img#site-logo.logo-big", {
         key: "logo-big",
-        attributes: { src: Discourse.getURL(logoUrl), alt: title }
+        attributes: { src: getURL(logoUrl), alt: title }
       });
     } else {
       return h("h1#site-text-logo.text-logo", { key: "logo-text" }, title);
diff --git a/app/assets/javascripts/discourse/app/widgets/link.js b/app/assets/javascripts/discourse/app/widgets/link.js
index 3d10f189a6..1d19eada13 100644
--- a/app/assets/javascripts/discourse/app/widgets/link.js
+++ b/app/assets/javascripts/discourse/app/widgets/link.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { createWidget } from "discourse/widgets/widget";
@@ -17,12 +18,12 @@ export default createWidget("link", {
         if (attrs.model) {
           params.push(attrs.model);
         }
-        return Discourse.getURL(
+        return getURL(
           router._routerMicrolib.generate.apply(router._routerMicrolib, params)
         );
       }
     } else {
-      return Discourse.getURL(attrs.href);
+      return getURL(attrs.href);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js
index 467b25a117..83e2fd2f08 100644
--- a/app/assets/javascripts/discourse/app/widgets/post.js
+++ b/app/assets/javascripts/discourse/app/widgets/post.js
@@ -1,3 +1,4 @@
+import { default as getURL, getURLWithCDN } from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import PostCooked from "discourse/widgets/post-cooked";
 import DecoratorHelper from "discourse/widgets/decorator-helper";
@@ -43,7 +44,7 @@ export function avatarImg(wanted, attrs) {
       alt: "",
       width: size,
       height: size,
-      src: Discourse.getURLWithCDN(url),
+      src: getURLWithCDN(url),
       title
     },
     className
@@ -353,7 +354,7 @@ createWidget("post-group-request", {
   },
 
   html(attrs) {
-    const href = Discourse.getURL(
+    const href = getURL(
       "/g/" + attrs.requestedGroupName + "/requests?filter=" + attrs.username
     );
 
diff --git a/app/assets/javascripts/discourse/app/widgets/poster-name.js b/app/assets/javascripts/discourse/app/widgets/poster-name.js
index f587a19d9a..04457539ce 100644
--- a/app/assets/javascripts/discourse/app/widgets/poster-name.js
+++ b/app/assets/javascripts/discourse/app/widgets/poster-name.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { iconNode } from "discourse-common/lib/icon-library";
 import { createWidget, applyDecorators } from "discourse/widgets/widget";
@@ -19,7 +20,7 @@ createWidget("poster-name-title", {
   html(attrs) {
     let titleContents = attrs.title;
     if (attrs.primaryGroupName && attrs.titleIsGroup) {
-      const href = Discourse.getURL(`/g/${attrs.primaryGroupName}`);
+      const href = getURL(`/g/${attrs.primaryGroupName}`);
       titleContents = h(
         "a.user-group",
         {
diff --git a/app/assets/javascripts/discourse/app/widgets/private-message-map.js b/app/assets/javascripts/discourse/app/widgets/private-message-map.js
index 824e198b1b..5738312e59 100644
--- a/app/assets/javascripts/discourse/app/widgets/private-message-map.js
+++ b/app/assets/javascripts/discourse/app/widgets/private-message-map.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { makeArray } from "discourse-common/lib/helpers";
 import { createWidget } from "discourse/widgets/widget";
@@ -27,7 +28,7 @@ createWidget("pm-map-user-group", {
   tagName: "div.user.group",
 
   transform(attrs) {
-    return { href: Discourse.getURL(`/g/${attrs.group.name}`) };
+    return { href: getURL(`/g/${attrs.group.name}`) };
   },
 
   template: hbs`
diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu.js b/app/assets/javascripts/discourse/app/widgets/search-menu.js
index cec34e75a9..50f89a9a55 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import { get } from "@ember/object";
 import { debounce } from "@ember/runloop";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -118,7 +119,7 @@ export default createWidget("search-menu", {
       url = `${url}?${params.join("&")}`;
     }
 
-    return Discourse.getURL(url);
+    return getURL(url);
   },
 
   panelContents() {
diff --git a/app/assets/javascripts/select-kit/addon/components/category-drop.js b/app/assets/javascripts/select-kit/addon/components/category-drop.js
index ebe5eec4b2..3722e734f5 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-drop.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-drop.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { readOnly } from "@ember/object/computed";
 import { computed } from "@ember/object";
@@ -126,14 +127,14 @@ export default ComboBoxComponent.extend({
     "parentCategoryUrl",
     "selectKit.options.subCategory",
     function() {
-      return Discourse.getURL(
+      return getURL(
         this.selectKit.options.subCategory ? this.parentCategoryUrl || "/" : "/"
       );
     }
   ),
 
   noCategoriesUrl: computed("parentCategoryUrl", function() {
-    return Discourse.getURL(`${this.parentCategoryUrl}/none`);
+    return getURL(`${this.parentCategoryUrl}/none`);
   }),
 
   search(filter) {
diff --git a/app/assets/javascripts/select-kit/addon/components/tag-drop.js b/app/assets/javascripts/select-kit/addon/components/tag-drop.js
index 26641e6be2..6f93d7e926 100644
--- a/app/assets/javascripts/select-kit/addon/components/tag-drop.js
+++ b/app/assets/javascripts/select-kit/addon/components/tag-drop.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import Category from "discourse/models/category";
 import { readOnly, or, equal, gte } from "@ember/object/computed";
 import { i18n, setting } from "discourse/lib/computed";
@@ -73,9 +74,9 @@ export default ComboBoxComponent.extend(TagsMixin, {
 
   allTagsUrl: computed("firstCategory", "secondCategory", function() {
     if (this.currentCategory) {
-      return Discourse.getURL(`${this.currentCategoryUrl}?allTags=1`);
+      return getURL(`${this.currentCategoryUrl}?allTags=1`);
     } else {
-      return Discourse.getURL("/");
+      return getURL("/");
     }
   }),
 
@@ -86,7 +87,7 @@ export default ComboBoxComponent.extend(TagsMixin, {
         this.currentCategory.id
       }`;
     }
-    return Discourse.getURL(`${url}/${NONE_TAG_ID}`);
+    return getURL(`${url}/${NONE_TAG_ID}`);
   }),
 
   allTagsLabel: i18n("tagging.selector_all_tags"),
@@ -189,7 +190,7 @@ export default ComboBoxComponent.extend(TagsMixin, {
           }
       }
 
-      DiscourseURL.routeTo(Discourse.getURL(url));
+      DiscourseURL.routeTo(getURL(url));
     }
   }
 });
diff --git a/app/assets/javascripts/select-kit/addon/mixins/tags.js b/app/assets/javascripts/select-kit/addon/mixins/tags.js
index 8e96cf4f79..5bdd887967 100644
--- a/app/assets/javascripts/select-kit/addon/mixins/tags.js
+++ b/app/assets/javascripts/select-kit/addon/mixins/tags.js
@@ -1,3 +1,4 @@
+import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import { reads } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
@@ -8,7 +9,7 @@ import { isEmpty } from "@ember/utils";
 
 export default Mixin.create({
   searchTags(url, data, callback) {
-    return ajax(Discourse.getURL(url), {
+    return ajax(getURL(url), {
       quietMillis: 200,
       cache: true,
       dataType: "json",
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 642b627c3d..e17a90e44b 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -86,6 +86,7 @@ module PrettyText
     ctx_load_manifest(ctx, "markdown-it-bundle.js")
     root_path = "#{Rails.root}/app/assets/javascripts/"
 
+    apply_es6_file(ctx, root_path, "discourse-common/addon/lib/get-url")
     apply_es6_file(ctx, root_path, "discourse/app/lib/to-markdown")
     apply_es6_file(ctx, root_path, "discourse/app/lib/utilities")
 
diff --git a/test/javascripts/lib/computed-test.js b/test/javascripts/lib/computed-test.js
index b2eda9dcd7..35e47d801a 100644
--- a/test/javascripts/lib/computed-test.js
+++ b/test/javascripts/lib/computed-test.js
@@ -9,6 +9,7 @@ import {
   url,
   htmlSafe
 } from "discourse/lib/computed";
+import { setPrefix } from "discourse-common/lib/get-url";
 
 QUnit.module("lib:computed", {
   beforeEach() {
@@ -148,7 +149,7 @@ QUnit.test("url", assert => {
     "it supports urls without a prefix"
   );
 
-  Discourse.BaseUri = "/prefixed";
+  setPrefix("/prefixed");
   t = testClass.create({ username: "eviltrout" });
   assert.equal(
     t.get("userUrl"),
diff --git a/test/javascripts/lib/discourse-test.js b/test/javascripts/lib/discourse-test.js
index 3d04bdb350..4b2395c68e 100644
--- a/test/javascripts/lib/discourse-test.js
+++ b/test/javascripts/lib/discourse-test.js
@@ -2,43 +2,6 @@ import { logIn, updateCurrentUser } from "helpers/qunit-helpers";
 
 QUnit.module("lib:discourse");
 
-QUnit.test("getURL on subfolder install", assert => {
-  Discourse.BaseUri = "/forum";
-  assert.equal(Discourse.getURL("/"), "/forum/", "root url has subfolder");
-  assert.equal(
-    Discourse.getURL("/u/neil"),
-    "/forum/u/neil",
-    "relative url has subfolder"
-  );
-
-  assert.equal(
-    Discourse.getURL("/svg-sprite/forum.example.com/svg-sprite.js"),
-    "/forum/svg-sprite/forum.example.com/svg-sprite.js",
-    "works when the url has the prefix in the middle"
-  );
-
-  assert.equal(
-    Discourse.getURL("/forum/t/123"),
-    "/forum/t/123",
-    "does not prefix if the URL is already prefixed"
-  );
-});
-
-QUnit.test("getURLWithCDN on subfolder install with S3", assert => {
-  Discourse.BaseUri = "/forum";
-
-  Discourse.S3CDN = "https://awesome.cdn/site";
-  Discourse.S3BaseUrl = "//test.s3-us-west-1.amazonaws.com/site";
-
-  let url = "//test.s3-us-west-1.amazonaws.com/site/forum/awesome.png";
-  let expected = "https://awesome.cdn/site/forum/awesome.png";
-
-  assert.equal(Discourse.getURLWithCDN(url), expected, "at correct path");
-
-  Discourse.S3CDN = null;
-  Discourse.S3BaseUrl = null;
-});
-
 QUnit.test("title counts are updated correctly", assert => {
   Discourse.set("hasFocus", true);
   Discourse.set("contextCount", 0);
diff --git a/test/javascripts/lib/get-url-test.js b/test/javascripts/lib/get-url-test.js
new file mode 100644
index 0000000000..6a97f42894
--- /dev/null
+++ b/test/javascripts/lib/get-url-test.js
@@ -0,0 +1,88 @@
+import {
+  default as getURL,
+  setupURL,
+  setupS3CDN,
+  getURLWithCDN,
+  isAbsoluteURL,
+  getAbsoluteURL,
+  setPrefix,
+  withoutPrefix
+} from "discourse-common/lib/get-url";
+
+QUnit.module("lib:get-url");
+
+QUnit.test("isAbsoluteURL", assert => {
+  setupURL(null, "https://example.com", "/forum");
+  assert.ok(isAbsoluteURL("https://example.com/test/thing"));
+  assert.ok(!isAbsoluteURL("http://example.com/test/thing"));
+  assert.ok(!isAbsoluteURL("https://discourse.org/test/thing"));
+});
+
+QUnit.test("getAbsoluteURL", assert => {
+  setupURL(null, "https://example.com", "/forum");
+  assert.equal(getAbsoluteURL("/cool/path"), "https://example.com/cool/path");
+});
+
+QUnit.test("withoutPrefix", assert => {
+  setPrefix("/eviltrout");
+  assert.equal(withoutPrefix("/eviltrout/hello"), "/hello");
+  assert.equal(withoutPrefix("/eviltrout/"), "/");
+  assert.equal(withoutPrefix("/eviltrout"), "");
+
+  setPrefix("");
+  assert.equal(withoutPrefix("/eviltrout/hello"), "/eviltrout/hello");
+  assert.equal(withoutPrefix("/eviltrout"), "/eviltrout");
+  assert.equal(withoutPrefix("/"), "/");
+
+  setPrefix(null);
+  assert.equal(withoutPrefix("/eviltrout/hello"), "/eviltrout/hello");
+  assert.equal(withoutPrefix("/eviltrout"), "/eviltrout");
+  assert.equal(withoutPrefix("/"), "/");
+});
+
+QUnit.test("getURL with empty paths", assert => {
+  setupURL(null, "https://example.com", "/");
+  assert.equal(getURL("/"), "/");
+  assert.equal(getURL(""), "");
+  setupURL(null, "https://example.com", "");
+  assert.equal(getURL("/"), "/");
+  assert.equal(getURL(""), "");
+  setupURL(null, "https://example.com", undefined);
+  assert.equal(getURL("/"), "/");
+  assert.equal(getURL(""), "");
+});
+
+QUnit.test("getURL on subfolder install", assert => {
+  setupURL(null, "", "/forum");
+  assert.equal(getURL("/"), "/forum/", "root url has subfolder");
+  assert.equal(
+    getURL("/u/neil"),
+    "/forum/u/neil",
+    "relative url has subfolder"
+  );
+
+  assert.equal(
+    getURL("/svg-sprite/forum.example.com/svg-sprite.js"),
+    "/forum/svg-sprite/forum.example.com/svg-sprite.js",
+    "works when the url has the prefix in the middle"
+  );
+
+  assert.equal(
+    getURL("/forum/t/123"),
+    "/forum/t/123",
+    "does not prefix if the URL is already prefixed"
+  );
+});
+
+QUnit.test("getURLWithCDN on subfolder install with S3", assert => {
+  setupURL(null, "", "/forum");
+  setupS3CDN(
+    "//test.s3-us-west-1.amazonaws.com/site",
+    "https://awesome.cdn/site"
+  );
+
+  let url = "//test.s3-us-west-1.amazonaws.com/site/forum/awesome.png";
+  let expected = "https://awesome.cdn/site/forum/awesome.png";
+
+  assert.equal(getURLWithCDN(url), expected, "at correct path");
+});
diff --git a/test/javascripts/lib/url-test.js b/test/javascripts/lib/url-test.js
index 5c33defdf5..b5f755a143 100644
--- a/test/javascripts/lib/url-test.js
+++ b/test/javascripts/lib/url-test.js
@@ -1,4 +1,5 @@
 import DiscourseURL, { userPath } from "discourse/lib/url";
+import { setPrefix } from "discourse-common/lib/get-url";
 
 QUnit.module("lib:url");
 
@@ -59,8 +60,8 @@ QUnit.test("userPath", assert => {
   assert.equal(userPath("hp.json"), "/u/hp.json");
 });
 
-QUnit.test("userPath with BaseUri", assert => {
-  Discourse.BaseUri = "/forum";
+QUnit.test("userPath with prefix", assert => {
+  setPrefix("/forum");
   assert.equal(userPath(), "/forum/u");
   assert.equal(userPath("eviltrout"), "/forum/u/eviltrout");
   assert.equal(userPath("hp.json"), "/forum/u/hp.json");
diff --git a/test/javascripts/models/email-log-test.js b/test/javascripts/models/email-log-test.js
index f6e00b14e2..7391960dec 100644
--- a/test/javascripts/models/email-log-test.js
+++ b/test/javascripts/models/email-log-test.js
@@ -1,4 +1,5 @@
 import EmailLog from "admin/models/email-log";
+import { setPrefix } from "discourse-common/lib/get-url";
 
 QUnit.module("Discourse.EmailLog");
 
@@ -7,7 +8,7 @@ QUnit.test("create", assert => {
 });
 
 QUnit.test("subfolder support", assert => {
-  Discourse.BaseUri = "/forum";
+  setPrefix("/forum");
   const attrs = {
     id: 60,
     to_address: "wikiman@asdf.com",
diff --git a/test/javascripts/models/report-test.js b/test/javascripts/models/report-test.js
index 821a88eee8..cfd09f3d4d 100644
--- a/test/javascripts/models/report-test.js
+++ b/test/javascripts/models/report-test.js
@@ -1,4 +1,5 @@
 import Report from "admin/models/report";
+import { setPrefix } from "discourse-common/lib/get-url";
 
 QUnit.module("Report");
 
@@ -528,7 +529,7 @@ QUnit.test("computed labels", assert => {
   assert.equal(computedFilesizeLabel.value, 582641);
 
   // subfolder support
-  Discourse.BaseUri = "/forum";
+  setPrefix("/forum");
 
   const postLink = computedLabels[5].compute(row).formatedValue;
   assert.equal(
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index cc599032a1..f20b2251ed 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -151,8 +151,10 @@ QUnit.testStart(function(ctx) {
 
   // Allow our tests to change site settings and have them reset before the next test
   Discourse.SiteSettings = dup(Discourse.SiteSettingsOriginal);
-  Discourse.BaseUri = "";
-  Discourse.BaseUrl = "http://localhost:3000";
+
+  let getURL = require("discourse-common/lib/get-url");
+  getURL.setupURL(null, "http://localhost:3000", "");
+  getURL.setupS3CDN(null, null);
 
   let User = require("discourse/models/user").default;
   let Session = require("discourse/models/session").default;
diff --git a/test/javascripts/widgets/home-logo-test.js b/test/javascripts/widgets/home-logo-test.js
index bffe7ee19a..c30c1a56ec 100644
--- a/test/javascripts/widgets/home-logo-test.js
+++ b/test/javascripts/widgets/home-logo-test.js
@@ -1,4 +1,5 @@
 import { moduleForWidget, widgetTest } from "helpers/widget-test";
+import { setPrefix } from "discourse-common/lib/get-url";
 
 moduleForWidget("home-logo");
 
@@ -101,7 +102,7 @@ widgetTest("mobile without logo", {
 widgetTest("basics, subfolder", {
   template: '{{mount-widget widget="home-logo" args=args}}',
   beforeEach() {
-    Discourse.BaseUri = "/forum";
+    setPrefix("/forum");
     this.siteSettings.site_logo_url = bigLogo;
     this.siteSettings.site_logo_small_url = smallLogo;
     this.siteSettings.title = title;
@@ -118,7 +119,7 @@ widgetTest("basics, subfolder", {
 widgetTest("basics, subfolder - minimized", {
   template: '{{mount-widget widget="home-logo" args=args}}',
   beforeEach() {
-    Discourse.BaseUri = "/forum";
+    setPrefix("/forum");
     this.siteSettings.site_logo_url = bigLogo;
     this.siteSettings.site_logo_small_url = smallLogo;
     this.siteSettings.title = title;
@@ -135,7 +136,7 @@ widgetTest("basics, subfolder - minimized", {
 widgetTest("mobile logo, subfolder", {
   template: '{{mount-widget widget="home-logo" args=args}}',
   beforeEach() {
-    Discourse.BaseUri = "/forum";
+    setPrefix("/forum");
     this.siteSettings.site_mobile_logo_url = mobileLogo;
     this.siteSettings.site_logo_small_url = smallLogo;
     this.site.mobileView = true;

From 22789e0201851a5eddfbfb339affecc74fd84cee Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 3 Jun 2020 14:45:23 -0400
Subject: [PATCH 1538/1830] New `bootstrap.json` endpoint for starting up
 Discourse

Discourse needs a bunch of data preloaded before it can start up.
Normally we throw blobs of this into the HTML document that is requested
but in some cases that's awkward to retrieve.

For example with Ember CLI you have a separate javascript application
that needs to make its own HTML.

This API endpoint returns a JSON object with all the data Discourse needs to
bootstrap and start up.
---
 app/controllers/bootstrap_controller.rb    | 29 ++++++++++++++++
 app/helpers/application_helper.rb          |  1 +
 config/routes.rb                           |  2 ++
 spec/requests/bootstrap_controller_spec.rb | 40 ++++++++++++++++++++++
 4 files changed, 72 insertions(+)
 create mode 100644 app/controllers/bootstrap_controller.rb
 create mode 100644 spec/requests/bootstrap_controller_spec.rb

diff --git a/app/controllers/bootstrap_controller.rb b/app/controllers/bootstrap_controller.rb
new file mode 100644
index 0000000000..dca7007c58
--- /dev/null
+++ b/app/controllers/bootstrap_controller.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class BootstrapController < ApplicationController
+  include ApplicationHelper
+  include ActionView::Helpers::AssetUrlHelper
+
+  # This endpoint allows us to produce the data required to start up Discourse via JSON API,
+  # so that you don't have to scrape the HTML for `data-*` payloads
+  def index
+    locale = script_asset_path("locales/#{I18n.locale}")
+
+    preload_anonymous_data
+    if current_user
+      current_user.sync_notification_channel_position
+      preload_current_user_data
+    end
+
+    bootstrap = {
+      theme_ids: theme_ids,
+      title: SiteSetting.title,
+      current_homepage: current_homepage,
+      locale_script: "#{Discourse.base_url}#{locale}",
+      setup_data: client_side_setup_data,
+      preloaded: @preloaded
+    }
+
+    render_json_dump(bootstrap: bootstrap)
+  end
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 482b2477d3..f6bda658a3 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -356,6 +356,7 @@ module ApplicationHelper
   end
 
   def loading_admin?
+    return false unless defined?(controller)
     controller.class.name.split("::").first == "Admin"
   end
 
diff --git a/config/routes.rb b/config/routes.rb
index 69ade71938..e763252bc6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -14,6 +14,8 @@ Discourse::Application.routes.draw do
   match "/404", to: "exceptions#not_found", via: [:get, :post]
   get "/404-body" => "exceptions#not_found_body"
 
+  get "/bootstrap" => "bootstrap#index"
+
   post "webhooks/aws" => "webhooks#aws"
   post "webhooks/mailgun"  => "webhooks#mailgun"
   post "webhooks/mailjet"  => "webhooks#mailjet"
diff --git a/spec/requests/bootstrap_controller_spec.rb b/spec/requests/bootstrap_controller_spec.rb
new file mode 100644
index 0000000000..6495eb4d28
--- /dev/null
+++ b/spec/requests/bootstrap_controller_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe BootstrapController do
+
+  it "returns data as anonymous" do
+    get "/bootstrap.json"
+    expect(response.status).to eq(200)
+
+    json = response.parsed_body
+    expect(json).to be_present
+
+    bootstrap = json['bootstrap']
+    expect(bootstrap).to be_present
+    expect(bootstrap['title']).to be_present
+    expect(bootstrap['setup_data']['base_url']).to eq(Discourse.base_url)
+    preloaded = bootstrap['preloaded']
+    expect(preloaded['site']).to be_present
+    expect(preloaded['siteSettings']).to be_present
+    expect(preloaded['currentUser']).to be_blank
+    expect(preloaded['topicTrackingStates']).to be_blank
+  end
+
+  it "returns user data when authenticated" do
+    user = Fabricate(:user)
+    sign_in(user)
+    get "/bootstrap.json"
+    expect(response.status).to eq(200)
+
+    json = response.parsed_body
+    expect(json).to be_present
+
+    bootstrap = json['bootstrap']
+    preloaded = bootstrap['preloaded']
+    expect(preloaded['currentUser']).to be_present
+    expect(preloaded['topicTrackingStates']).to be_present
+  end
+
+end

From 3e7f7fdde8dd4ad92a34352ec927b2cdfbf91416 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Thu, 4 Jun 2020 00:56:56 +0530
Subject: [PATCH 1539/1830] FEATURE: category setting for default list filter.
 (#9975)

---
 .../app/components/edit-category-settings.js  |  7 ++++++
 .../discourse/app/models/category.js          |  3 ++-
 .../dynamic-route-builders.js                 |  4 +++
 .../discourse/app/routes/app-route-map.js     |  1 +
 .../app/routes/build-category-route.js        | 25 ++++++++++++++++---
 .../components/edit-category-settings.hbs     | 15 +++++++++++
 .../addon/components/category-drop.js         |  4 ++-
 app/controllers/categories_controller.rb      |  1 +
 app/serializers/basic_category_serializer.rb  |  1 +
 config/locales/client.en.yml                  |  4 +++
 config/routes.rb                              |  1 +
 spec/requests/api/categories_spec.rb          |  2 ++
 12 files changed, 63 insertions(+), 5 deletions(-)

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 5844e45d0c..c811ce2db6 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-settings.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-settings.js
@@ -68,6 +68,13 @@ export default buildCategoryPanel("settings", {
     );
   },
 
+  @discourseComputed
+  availableListFilters() {
+    return ["all", "none"].map(p => {
+      return { name: I18n.t(`category.list_filters.${p}`), value: p };
+    });
+  },
+
   @discourseComputed
   searchPrioritiesOptions() {
     const options = [];
diff --git a/app/assets/javascripts/discourse/app/models/category.js b/app/assets/javascripts/discourse/app/models/category.js
index 2c0442a470..7d950cae2c 100644
--- a/app/assets/javascripts/discourse/app/models/category.js
+++ b/app/assets/javascripts/discourse/app/models/category.js
@@ -188,7 +188,8 @@ const Category = RestModel.extend({
         ),
         search_priority: this.search_priority,
         reviewable_by_group_name: this.reviewable_by_group_name,
-        read_only_banner: this.read_only_banner
+        read_only_banner: this.read_only_banner,
+        default_list_filter: this.default_list_filter
       },
       type: id ? "PUT" : "POST"
     });
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/dynamic-route-builders.js b/app/assets/javascripts/discourse/app/pre-initializers/dynamic-route-builders.js
index 9c96d01e42..47626918f0 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/dynamic-route-builders.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/dynamic-route-builders.js
@@ -13,6 +13,7 @@ export default {
     app.DiscoveryCategoryController = DiscoverySortableController.extend();
     app.DiscoveryParentCategoryController = DiscoverySortableController.extend();
     app.DiscoveryCategoryNoneController = DiscoverySortableController.extend();
+    app.DiscoveryCategoryAllController = DiscoverySortableController.extend();
     app.DiscoveryCategoryWithIDController = DiscoverySortableController.extend();
 
     app.DiscoveryCategoryRoute = buildCategoryRoute("default");
@@ -20,6 +21,9 @@ export default {
     app.DiscoveryCategoryNoneRoute = buildCategoryRoute("default", {
       no_subcategories: true
     });
+    app.DiscoveryCategoryAllRoute = buildCategoryRoute("default", {
+      no_subcategories: false
+    });
     app.DiscoveryCategoryWithIDRoute = buildCategoryRoute("default");
 
     const site = Site.current();
diff --git a/app/assets/javascripts/discourse/app/routes/app-route-map.js b/app/assets/javascripts/discourse/app/routes/app-route-map.js
index fb13822bb2..9057ff2fe5 100644
--- a/app/assets/javascripts/discourse/app/routes/app-route-map.js
+++ b/app/assets/javascripts/discourse/app/routes/app-route-map.js
@@ -70,6 +70,7 @@ export default function() {
 
     // default filter for a category
     this.route("categoryNone", { path: "/c/*category_slug_path_with_id/none" });
+    this.route("categoryAll", { path: "/c/*category_slug_path_with_id/all" });
     this.route("category", { path: "/c/*category_slug_path_with_id" });
   });
 
diff --git a/app/assets/javascripts/discourse/app/routes/build-category-route.js b/app/assets/javascripts/discourse/app/routes/build-category-route.js
index eac84d8484..58e5584fd2 100644
--- a/app/assets/javascripts/discourse/app/routes/build-category-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-category-route.js
@@ -30,6 +30,11 @@ export default (filterArg, params) => {
             category,
             category_slug_path_with_id
           });
+        } else if (modelParams.id === "all") {
+          modelParams.category_slug_path_with_id = [
+            modelParams.parentSlug,
+            modelParams.slug
+          ].join("/");
         } else {
           modelParams.category_slug_path_with_id = [
             modelParams.parentSlug,
@@ -76,10 +81,24 @@ export default (filterArg, params) => {
         return;
       }
 
-      this._setupNavigation(model.category);
+      const { category, modelParams } = model;
+
+      if (
+        category.default_list_filter === "none" &&
+        filterArg === "default" &&
+        modelParams &&
+        modelParams.id !== "all"
+      ) {
+        this.replaceWith("discovery.categoryNone", {
+          category,
+          category_slug_path_with_id: modelParams.category_slug_path_with_id
+        });
+      }
+
+      this._setupNavigation(category);
       return all([
-        this._createSubcategoryList(model.category),
-        this._retrieveTopicList(model.category, transition, model.modelParams)
+        this._createSubcategoryList(category),
+        this._retrieveTopicList(category, transition, modelParams)
       ]);
     },
 
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 ab17a307c3..a569876fd8 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
@@ -196,6 +196,21 @@
       {{/unless}}
     </div>
   </section>
+
+  <section class="field">
+    <label for="category-default-filter">
+      {{i18n "category.default_list_filter"}}
+    </label>
+    <div class="controls">
+      {{combo-box
+        id="category-default-filter"
+        valueProperty="value"
+        content=availableListFilters
+        value=category.default_list_filter
+      }}
+    </div>
+  </section>
+
   {{#if isParentCategory}}
     <section class="field show-subcategory-list-field">
       <label>
diff --git a/app/assets/javascripts/select-kit/addon/components/category-drop.js b/app/assets/javascripts/select-kit/addon/components/category-drop.js
index 3722e734f5..a0ad319a95 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-drop.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-drop.js
@@ -128,7 +128,9 @@ export default ComboBoxComponent.extend({
     "selectKit.options.subCategory",
     function() {
       return getURL(
-        this.selectKit.options.subCategory ? this.parentCategoryUrl || "/" : "/"
+        this.selectKit.options.subCategory
+          ? `${this.parentCategoryUrl}/all` || "/"
+          : "/"
       );
     }
   ),
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 8a36480609..20e02ab061 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -329,6 +329,7 @@ class CategoriesController < ApplicationController
         :required_tag_group_name,
         :min_tags_from_required_group,
         :read_only_banner,
+        :default_list_filter,
         custom_fields: [params[:custom_fields].try(:keys)],
         permissions: [*p.try(:keys)],
         allowed_tags: [],
diff --git a/app/serializers/basic_category_serializer.rb b/app/serializers/basic_category_serializer.rb
index 540422a071..87c02a67a9 100644
--- a/app/serializers/basic_category_serializer.rb
+++ b/app/serializers/basic_category_serializer.rb
@@ -28,6 +28,7 @@ class BasicCategorySerializer < ApplicationSerializer
              :default_view,
              :subcategory_list_style,
              :default_top_period,
+             :default_list_filter,
              :minimum_required_tags,
              :navigate_to_first_post_after_read,
              :custom_fields
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 8f5e12383f..b5db1f5059 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2826,6 +2826,7 @@ en:
       sort_order: "Topic List Sort By:"
       default_view: "Default Topic List:"
       default_top_period: "Default Top Period:"
+      default_list_filter: "Default List Filter:"
       allow_badges_label: "Allow badges to be awarded in this category"
       edit_permissions: "Edit Permissions"
       reviewable_by_group: "In addition to staff, posts and flags in this category can be also be reviewed by:"
@@ -2888,6 +2889,9 @@ en:
         moderation: "Moderation"
         appearance: "Appearance"
         email: "Email"
+      list_filters:
+        all: "all"
+        none: "none"
 
     flagging:
       title: "Thanks for helping to keep our community civil!"
diff --git a/config/routes.rb b/config/routes.rb
index e763252bc6..1f843dcf6e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -686,6 +686,7 @@ Discourse::Application.routes.draw do
       get "/l/#{filter}" => "list#category_#{filter}", as: "category_#{filter}"
     end
 
+    get "/all" => "list#category_default", as: "category_all", constraints: { format: 'html' }
     get "/" => "list#category_default", as: "category_default"
   end
 
diff --git a/spec/requests/api/categories_spec.rb b/spec/requests/api/categories_spec.rb
index 5de0bdeee9..4e3e2bac51 100644
--- a/spec/requests/api/categories_spec.rb
+++ b/spec/requests/api/categories_spec.rb
@@ -195,6 +195,7 @@ describe 'categories' do
               default_view: { type: :string, nullable: true },
               subcategory_list_style: { type: :string },
               default_top_period: { type: :string },
+              default_list_filter: { type: :string },
               minimum_required_tags: { type: :integer },
               navigate_to_first_post_after_read: { type: :boolean },
               custom_fields: {
@@ -370,6 +371,7 @@ describe 'categories' do
               default_view: { type: :string, nullable: true },
               subcategory_list_style: { type: :string },
               default_top_period: { type: :string },
+              default_list_filter: { type: :string },
               minimum_required_tags: { type: :integer },
               navigate_to_first_post_after_read: { type: :boolean },
               custom_fields: {

From c200238bdc241586bfe82b2d0fc1f600fec45b1f Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 3 Jun 2020 14:28:02 -0500
Subject: [PATCH 1540/1830] DEV: Reorder appending extra header icons (#9973)

---
 .../discourse/app/widgets/header.js           | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index b6f2abe9b4..ca55984242 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -21,9 +21,12 @@ export function addToHeaderIcons(icon) {
 
 const dropdown = {
   buildClasses(attrs) {
+    let classes = attrs.classNames || [];
     if (attrs.active) {
-      return "active";
+      classes.push("active");
     }
+
+    return classes;
   },
 
   click(e) {
@@ -189,6 +192,26 @@ createWidget("header-icons", {
       return [];
     }
 
+    const icons = [];
+
+    if (_extraHeaderIcons) {
+      _extraHeaderIcons.forEach(icon => {
+        icons.push(this.attach(icon));
+      });
+    }
+
+    const search = this.attach("header-dropdown", {
+      title: "search.title",
+      icon: "search",
+      iconId: "search-button",
+      action: "toggleSearchMenu",
+      active: attrs.searchVisible,
+      href: getURL("/search"),
+      classNames: ["search-dropdown"]
+    });
+
+    icons.push(search);
+
     const hamburger = this.attach("header-dropdown", {
       title: "hamburger_menu",
       icon: "bars",
@@ -196,6 +219,8 @@ createWidget("header-icons", {
       active: attrs.hamburgerVisible,
       action: "toggleHamburger",
       href: "",
+      classNames: ["hamburger-dropdown"],
+
       contents() {
         let { currentUser } = this;
         if (currentUser && currentUser.reviewable_count) {
@@ -212,16 +237,8 @@ createWidget("header-icons", {
       }
     });
 
-    const search = this.attach("header-dropdown", {
-      title: "search.title",
-      icon: "search",
-      iconId: "search-button",
-      action: "toggleSearchMenu",
-      active: attrs.searchVisible,
-      href: getURL("/search")
-    });
+    icons.push(hamburger);
 
-    const icons = [search, hamburger];
     if (attrs.user) {
       icons.push(
         this.attach("user-dropdown", {
@@ -233,12 +250,6 @@ createWidget("header-icons", {
       );
     }
 
-    if (_extraHeaderIcons) {
-      _extraHeaderIcons.forEach(icon => {
-        icons.push(this.attach(icon));
-      });
-    }
-
     return icons;
   }
 });

From f683c5d0e0136b86890b7b818f186dac8b6ec8ae Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Wed, 3 Jun 2020 21:35:08 +0200
Subject: [PATCH 1541/1830] DEV: Check English locale for errors in CI

Moves the most important checks into a linter. It gets executed by Lefthook as well as the docker rake task and Github actions. Doing those checks in rspec takes too long and it produces errors when the discourse:test Docker image contains old, invalid locale files.
---
 .github/workflows/ci.yml    |  26 +++++---
 lefthook.yml                |  10 ++-
 lib/tasks/docker.rake       |   4 ++
 script/i18n_lint.rb         | 129 ++++++++++++++++++++++++++++++++++++
 spec/integrity/i18n_spec.rb |  93 --------------------------
 5 files changed, 158 insertions(+), 104 deletions(-)
 create mode 100644 script/i18n_lint.rb

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b5a33d7a45..7e7ce7f41f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
       - master
   pull_request:
     branches-ignore:
-      - 'tests-passed'
+      - "tests-passed"
 
 jobs:
   build:
@@ -28,12 +28,12 @@ jobs:
       fail-fast: false
 
       matrix:
-        build_types: [ 'BACKEND', 'FRONTEND', 'LINT' ]
-        target: [ 'PLUGINS', 'CORE' ]
-        os: [ ubuntu-latest ]
-        ruby: [ '2.6' ]
-        postgres: [ '10' ]
-        redis: [ '4.x' ]
+        build_types: ["BACKEND", "FRONTEND", "LINT"]
+        target: ["PLUGINS", "CORE"]
+        os: [ubuntu-latest]
+        ruby: ["2.6"]
+        postgres: ["10"]
+        redis: ["4.x"]
 
     services:
       postgres:
@@ -77,7 +77,7 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
+          architecture: "x64"
 
       - name: Setup bundler
         run: |
@@ -145,6 +145,14 @@ jobs:
           yarn prettier -v
           yarn prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.js" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6" "plugins/**/*.scss" "plugins/**/*.es6"
 
+      - name: Core English locale
+        if: env.BUILD_TYPE == 'LINT' && env.TARGET == 'CORE'
+        run: bundle exec ruby script/i18n_lint.rb "config/**/locales/{client,server}.en.yml"
+
+      - name: Plugin English locale
+        if: env.BUILD_TYPE == 'LINT' && env.TARGET == 'PLUGINS'
+        run: bundle exec ruby script/i18n_lint.rb "plugins/**/locales/{client,server}.en.yml"
+
       - name: Core RSpec
         if: env.BUILD_TYPE == 'BACKEND' && env.TARGET == 'CORE'
         run: |
@@ -167,5 +175,5 @@ jobs:
 
       - name: Plugin QUnit # Tests core plugins in TARGET=CORE, and all plugins in TARGET=PLUGINS
         if: env.BUILD_TYPE == 'FRONTEND'
-        run: bundle exec rake plugin:qunit
+        run: bundle exec rake plugin:qunit['*','1200000']
         timeout-minutes: 30
diff --git a/lefthook.yml b/lefthook.yml
index f3645c3d1a..65fe913cca 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -23,6 +23,9 @@ pre-commit:
       # database.yml is an erb file not a yaml file
       exclude: "database.yml"
       run: bundle exec yaml-lint {staged_files}
+    i18n-lint:
+      glob: "**/{client,server}.en.yml"
+      run: bundle exec ruby script/i18n_lint.rb {staged_files}
 
 commands: &commands
   bundle-install:
@@ -58,8 +61,11 @@ lints:
     eslint-test:
       run: yarn eslint --ext .es6 test/javascripts
     eslint-plugins-assets:
-      run: yarn eslint --ext .es6 plugins/**/assets/javascripts
+      run: yarn eslint --global I18n --ext .es6 plugins/**/assets/javascripts
     eslint-plugins-test:
-      run: yarn eslint --ext .es6 plugins/**/test/javascripts
+      run: yarn eslint --global I18n --ext .es6 plugins/**/test/javascripts
     eslint-assets-tests:
       run: yarn eslint app/assets/javascripts test/javascripts
+    i18n-lint:
+      glob: "**/{client,server}.en.yml"
+      run: bundle exec ruby script/i18n_lint.rb {all_files}
diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index 6733ae31a0..b0d2e6e2ec 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -66,6 +66,7 @@ task 'docker:test' do
 
       if ENV["SINGLE_PLUGIN"]
         @good &&= run_or_fail("bundle exec rubocop --parallel plugins/#{ENV["SINGLE_PLUGIN"]}")
+        @good &&= run_or_fail("bundle exec ruby script/i18n_lint.rb plugins/#{ENV["SINGLE_PLUGIN"]}/config/locales/{client,server}.en.yml")
         @good &&= run_or_fail("yarn eslint --global I18n --ext .es6 plugins/#{ENV['SINGLE_PLUGIN']}")
 
         puts "Listing prettier offenses in #{ENV['SINGLE_PLUGIN']}:"
@@ -78,6 +79,9 @@ task 'docker:test' do
         # TODO: remove --global I18n once plugins can be updated
         @good &&= run_or_fail("yarn eslint --global I18n --ext .es6 plugins") unless ENV["SKIP_PLUGINS"]
 
+        @good &&= run_or_fail('bundle exec ruby script/i18n_lint.rb "config/locales/{client,server}.en.yml"') unless ENV["SKIP_CORE"]
+        @good &&= run_or_fail('bundle exec ruby script/i18n_lint.rb "plugins/**/locales/{client,server}.en.yml"') unless ENV["SKIP_PLUGINS"]
+
         unless ENV["SKIP_CORE"]
           puts "Listing prettier offenses in core:"
           @good &&= run_or_fail('yarn prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6"')
diff --git a/script/i18n_lint.rb b/script/i18n_lint.rb
new file mode 100644
index 0000000000..298efbccaa
--- /dev/null
+++ b/script/i18n_lint.rb
@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+require 'colored2'
+require 'psych'
+
+class I18nLinter
+  def initialize(filenames_or_patterns)
+    @filenames = filenames_or_patterns.map { |fp| Dir[fp] }.flatten
+    @errors = {}
+  end
+
+  def run
+    has_errors = false
+
+    @filenames.each do |filename|
+      validator = LocaleFileValidator.new(filename)
+
+      if validator.has_errors?
+        validator.print_errors
+        has_errors = true
+      end
+    end
+
+    exit 1 if has_errors
+  end
+end
+
+class LocaleFileValidator
+  ERROR_MESSAGES = {
+    invalid_relative_links: "The following keys have relative links, but do not start with %{base_url} or %{base_path}:",
+    invalid_relative_image_sources: "The following keys have relative image sources, but do not start with %{base_url} or %{base_path}:",
+    invalid_interpolation_key_format: "The following keys use {{key}} instead of %{key} for interpolation keys:",
+    wrong_pluralization_keys: "Pluralized strings must have only the sub-keys 'one' and 'other'.\nThe following keys have missing or additional keys:",
+    invald_one_keys: "The following keys contain the number 1 instead of the interpolation key %{count}:"
+  }
+
+  PLURALIZATION_KEYS = ['zero', 'one', 'two', 'few', 'many', 'other']
+  ENGLISH_KEYS = ['one', 'other']
+
+  def initialize(filename)
+    @filename = filename
+    @errors = {}
+  end
+
+  def has_errors?
+    yaml = Psych.safe_load(File.read(@filename), aliases: true)
+    yaml = yaml[yaml.keys.first]
+
+    validate_pluralizations(yaml)
+    validate_content(yaml)
+
+    @errors.any? { |_, value| value.any? }
+  end
+
+  def print_errors
+    puts "", "Errors in #{@filename}".red
+
+    @errors.each do |type, keys|
+      next if keys.empty?
+
+      ERROR_MESSAGES[type].split("\n").each { |msg| puts "  #{msg}" }
+      keys.each { |key| puts "    * #{key}" }
+    end
+  end
+
+  private
+
+  def each_translation(hash, parent_key = '', &block)
+    hash.each do |key, value|
+      current_key = parent_key.empty? ? key : "#{parent_key}.#{key}"
+
+      if Hash === value
+        each_translation(value, current_key, &block)
+      else
+        yield(current_key, value.to_s)
+      end
+    end
+  end
+
+  def validate_content(yaml)
+    @errors[:invalid_relative_links] = []
+    @errors[:invalid_relative_image_sources] = []
+    @errors[:invalid_interpolation_key_format] = []
+
+    each_translation(yaml) do |key, value|
+      if value.match?(/href\s*=\s*["']\/[^\/]|\]\(\/[^\/]/i)
+        @errors[:invalid_relative_links] << key
+      end
+
+      if value.match?(/src\s*=\s*["']\/[^\/]/i)
+        @errors[:invalid_relative_image_sources] << key
+      end
+
+      if value.match?(/{{.+?}}/) && !key.end_with?("_MF")
+        @errors[:invalid_interpolation_key_format] << key
+      end
+    end
+  end
+
+  def each_pluralization(hash, parent_key = '', &block)
+    hash.each do |key, value|
+      if Hash === value
+        current_key = parent_key.empty? ? key : "#{parent_key}.#{key}"
+        each_pluralization(value, current_key, &block)
+      elsif PLURALIZATION_KEYS.include? key
+        yield(parent_key, hash)
+      end
+    end
+  end
+
+  def validate_pluralizations(yaml)
+    @errors[:wrong_pluralization_keys] = []
+    @errors[:invald_one_keys] = []
+
+    each_pluralization(yaml) do |key, hash|
+      # ignore errors from some ActiveRecord messages
+      next if key.include?("messages.restrict_dependent_destroy")
+
+      @errors[:wrong_pluralization_keys] << key if hash.keys.sort != ENGLISH_KEYS
+
+      one_value = hash['one']
+      if one_value && one_value.include?('1') && !one_value.match?(/%{count}|{{count}}/)
+        @errors[:invald_one_keys] << key
+      end
+    end
+  end
+end
+
+I18nLinter.new(ARGV).run
diff --git a/spec/integrity/i18n_spec.rb b/spec/integrity/i18n_spec.rb
index 0d44d5ea5d..49cabe87eb 100644
--- a/spec/integrity/i18n_spec.rb
+++ b/spec/integrity/i18n_spec.rb
@@ -7,22 +7,6 @@ def extract_locale(path)
   path[/\.([^.]{2,})\.yml$/, 1]
 end
 
-PLURALIZATION_KEYS ||= ['zero', 'one', 'two', 'few', 'many', 'other']
-ENGLISH_KEYS ||= ['one', 'other']
-
-def find_pluralizations(hash, parent_key = '', pluralizations = Hash.new)
-  hash.each do |key, value|
-    if Hash === value
-      current_key = parent_key.blank? ? key : "#{parent_key}.#{key}"
-      find_pluralizations(value, current_key, pluralizations)
-    elsif PLURALIZATION_KEYS.include? key
-      pluralizations[parent_key] = hash
-    end
-  end
-
-  pluralizations
-end
-
 def is_yaml_compatible?(english, translated)
   english.each do |k, v|
     if translated.has_key?(k)
@@ -39,18 +23,6 @@ def is_yaml_compatible?(english, translated)
   true
 end
 
-def each_translation(hash, parent_key = '', &block)
-  hash.each do |key, value|
-    current_key = parent_key.blank? ? key : "#{parent_key}.#{key}"
-
-    if Hash === value
-      each_translation(value, current_key, &block)
-    else
-      yield(current_key, value.to_s)
-    end
-  end
-end
-
 describe "i18n integrity checks" do
 
   it 'has an i18n key for each Trust Levels' do
@@ -107,71 +79,6 @@ describe "i18n integrity checks" do
         english_duplicates = DuplicateKeyFinder.new.find_duplicates(english_path)
         expect(english_duplicates).to be_empty
       end
-
-      context "pluralizations" do
-        wrong_keys = []
-        invald_one_keys = []
-
-        find_pluralizations(english_yaml).each do |key, hash|
-          next if key["messages.restrict_dependent_destroy"]
-
-          wrong_keys << key if hash.keys.sort != ENGLISH_KEYS
-
-          if one_value = hash['one']
-            invald_one_keys << key if one_value.include?('1') && !one_value.match?(/%{count}|{{count}}/)
-          end
-        end
-
-        it "has valid pluralizations keys" do
-          keys = wrong_keys.join("\n")
-          expect(wrong_keys).to be_empty, <<~MSG
-            Pluralized strings must have only the sub-keys 'one' and 'other'.
-            The following keys have missing or additional keys:\n\n#{keys}
-          MSG
-        end
-
-        it "should use %{count} instead of 1 in 'one' keys" do
-          keys = invald_one_keys.join(".one\n")
-          expect(invald_one_keys).to be_empty, <<~MSG
-            The following keys contain the number 1 instead of the interpolation key %{count}:\n\n#{keys}
-          MSG
-        end
-      end
-
-      context "valid translations" do
-        invalid_relative_links = {}
-        invalid_relative_image_sources = {}
-        invalid_interpolation_key_format = {}
-
-        each_translation(english_yaml) do |key, value|
-          if value.match?(/href\s*=\s*["']\/[^\/]|\]\(\/[^\/]/i)
-            invalid_relative_links[key] = value
-          end
-
-          if value.match?(/src\s*=\s*["']\/[^\/]/i)
-            invalid_relative_image_sources[key] = value
-          end
-
-          if value.match?(/\{\{.+?}}/)
-            invalid_interpolation_key_format[key] = value
-          end
-        end
-
-        it "uses %{base_url} or %{base_path} for relative links" do
-          keys = invalid_relative_links.keys.join("\n")
-          expect(invalid_relative_links).to be_empty, "The following keys have relative links, but do not start with %{base_url} or %{base_path}:\n\n#{keys}"
-        end
-
-        it "uses %{base_url} or %{base_path} for relative image src" do
-          keys = invalid_relative_image_sources.keys.join("\n")
-          expect(invalid_relative_image_sources).to be_empty, "The following keys have relative image sources, but do not start with %{base_url} or %{base_path}:\n\n#{keys}"
-        end
-
-        skip "uses the %{key} as interpolation key format" do
-          keys = invalid_interpolation_key_format.keys.join("\n")
-          expect(invalid_interpolation_key_format).to be_empty, "The following keys use {{key}} instead of %{key} for interpolation keys:\n\n#{keys}"
-        end
-      end
     end
 
     Dir[english_path.sub(".en.yml", ".*.yml")].each do |path|

From a89574ccb9fba119038e88e18c58d619ad662f9c Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Wed, 3 Jun 2020 15:26:40 -0600
Subject: [PATCH 1542/1830] FIX: Inline error when converting html to markdown

Looks like some html elements like `aside` and `section` will throw an error
when checking if they are inline or not. The commit simply handles

```
Job exception: undefined method `inline?' for nil:NilClass
```

and adds a test for it.
---
 lib/html_to_markdown.rb                  |  2 +-
 spec/components/html_to_markdown_spec.rb | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/html_to_markdown.rb b/lib/html_to_markdown.rb
index 448a0cd725..d2fb51f34c 100644
--- a/lib/html_to_markdown.rb
+++ b/lib/html_to_markdown.rb
@@ -99,7 +99,7 @@ class HtmlToMarkdown
   end
 
   def is_inline?(node)
-    node.text? || ("br" != node.name && node.description.inline? && node.children.all? { |n| is_inline?(n) })
+    node.text? || ("br" != node.name && node.description&.inline? && node.children.all? { |n| is_inline?(n) })
   end
 
   def collapse_spaces!(nodes, was_space = true)
diff --git a/spec/components/html_to_markdown_spec.rb b/spec/components/html_to_markdown_spec.rb
index 3d19c66f9a..0fde6eaa12 100644
--- a/spec/components/html_to_markdown_spec.rb
+++ b/spec/components/html_to_markdown_spec.rb
@@ -65,6 +65,23 @@ describe HtmlToMarkdown do
     expect(html_to_markdown(html)).to eq(markdown.strip)
   end
 
+  it "doesn't error on non-inline elements like (aside, section)" do
+
+    html = <<~HTML
+      <aside class="quote no-group">
+      <blockquote>
+      <p>hello.</p>
+      </blockquote>
+      </aside>
+    HTML
+
+    markdown = <<~MD
+      > hello.
+    MD
+
+    expect(html_to_markdown(html)).to eq(markdown.strip)
+  end
+
   it "skips hidden tags" do
     expect(html_to_markdown(%Q{<p>Hello <span style="display: none">cruel </span>World!</p>})).to eq("Hello World!")
     expect(html_to_markdown(%Q{<p>Hello <span hidden>cruel </span>World!</p>})).to eq("Hello World!")

From 81e6bc7a0f42e47fb2fd9fa0e3634f1b5bc8ad39 Mon Sep 17 00:00:00 2001
From: Michael K Johnson <a1237@danlj.org>
Date: Wed, 3 Jun 2020 19:48:11 -0400
Subject: [PATCH 1543/1830] FEATURE: Add uploads:batch_migrate_from_s3 task to
 limit total posts migrated at once (#9933)

Allow limiting the number of migrations to do at once, both to do migrations that
have impact limited to multiple off-peak usage hours to reduce user impact from
a migration, and to allow tests that do only a very small number for test
purposes. ("Give me a ping, Vasili. One ping only, please.")
---
 lib/tasks/uploads.rake     |  20 ++++---
 spec/tasks/uploads_spec.rb | 109 +++++++++++++++++++++++++++++++++++++
 2 files changed, 122 insertions(+), 7 deletions(-)

diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index f02534610c..35cd318404 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -93,6 +93,10 @@ task "uploads:migrate_from_s3" => :environment do
   ENV["RAILS_DB"] ? migrate_from_s3 : migrate_all_from_s3
 end
 
+task "uploads:batch_migrate_from_s3", [:limit] => :environment do |_, args|
+  ENV["RAILS_DB"] ? migrate_from_s3(limit: args[:limit]) : migrate_all_from_s3(limit: args[:limit])
+end
+
 def guess_filename(url, raw)
   begin
     uri = URI.parse("http:#{url}")
@@ -110,17 +114,17 @@ def guess_filename(url, raw)
   end
 end
 
-def migrate_all_from_s3
-  RailsMultisite::ConnectionManagement.each_connection { migrate_from_s3 }
+def migrate_all_from_s3(limit: nil)
+  RailsMultisite::ConnectionManagement.each_connection { migrate_from_s3(limit: limit) }
 end
 
-def migrate_from_s3
+def migrate_from_s3(limit: nil)
   require "file_store/s3_store"
 
   # make sure S3 is disabled
   if SiteSetting.Upload.enable_s3_uploads
     puts "You must disable S3 uploads before running that task."
-    return
+    exit 1
   end
 
   db = RailsMultisite::ConnectionManagement.current_db
@@ -129,10 +133,12 @@ def migrate_from_s3
 
   max_file_size = [SiteSetting.max_image_size_kb, SiteSetting.max_attachment_size_kb].max.kilobytes
 
-  Post
+  migrate_posts = Post
     .where("user_id > 0")
-    .where("raw LIKE '%.s3%.amazonaws.com/%' OR raw LIKE '%(upload://%'")
-    .find_each do |post|
+    .where("raw LIKE '%.s3%.amazonaws.com/%' OR raw LIKE '%#{SiteSetting.Upload.absolute_base_url}%' OR raw LIKE '%(upload://%'")
+  migrate_posts = migrate_posts.limit(limit.to_i) if limit
+
+  migrate_posts.find_each do |post|
     begin
       updated = false
 
diff --git a/spec/tasks/uploads_spec.rb b/spec/tasks/uploads_spec.rb
index cbbd5b1705..8cc08383e8 100644
--- a/spec/tasks/uploads_spec.rb
+++ b/spec/tasks/uploads_spec.rb
@@ -134,6 +134,115 @@ RSpec.describe "tasks/uploads" do
     end
   end
 
+  describe "uploads:batch_migrate_from_s3" do
+    let!(:uploads) do
+      [
+        upload1,
+        upload2,
+      ]
+    end
+
+    let(:upload1) { Fabricate(:upload_s3) }
+    let(:upload2) { Fabricate(:upload_s3) }
+
+    let!(:url1) { "upload://#{upload1.base62_sha1}.jpg" }
+    let!(:url2) { "upload://#{upload2.base62_sha1}.jpg" }
+
+    let(:post1) { Fabricate(:post, raw: "[foo](#{url1})") }
+    let(:post2) { Fabricate(:post, raw: "[foo](#{url2})") }
+
+    before do
+      global_setting :s3_bucket, 'file-uploads/folder'
+      global_setting :s3_region, 'us-east-1'
+      enable_s3_uploads(uploads)
+      upload1.url = "//#{SiteSetting.s3_upload_bucket}.amazonaws.com/original/1X/#{upload1.base62_sha1}.png"
+      upload1.save!
+      upload2.url = "//#{SiteSetting.s3_upload_bucket}.amazonaws.com/original/1X/#{upload2.base62_sha1}.png"
+      upload2.save!
+
+      PostUpload.create(post: post1, upload: upload1)
+      PostUpload.create(post: post2, upload: upload2)
+      SiteSetting.enable_s3_uploads = false
+    end
+
+    def invoke_task
+      capture_stdout do
+        Rake::Task['uploads:batch_migrate_from_s3'].invoke('1')
+      end
+    end
+
+    it "applies the limit" do
+      FileHelper.stubs(:download).returns(file_from_fixtures("logo.png")).once()
+
+      freeze_time
+
+      post1.update_columns(baked_at: 1.week.ago)
+      post2.update_columns(baked_at: 1.week.ago)
+      invoke_task
+
+      expect(post1.reload.baked_at).not_to eq_time(1.week.ago)
+      expect(post2.reload.baked_at).to eq_time(1.week.ago)
+    end
+
+  end
+
+  describe "uploads:migrate_from_s3" do
+    let!(:uploads) do
+      [
+        upload1,
+        upload2,
+      ]
+    end
+
+    let(:upload1) { Fabricate(:upload_s3) }
+    let(:upload2) { Fabricate(:upload_s3) }
+
+    let!(:url1) { "upload://#{upload1.base62_sha1}.jpg" }
+    let!(:url2) { "upload://#{upload2.base62_sha1}.jpg" }
+
+    let(:post1) { Fabricate(:post, raw: "[foo](#{url1})") }
+    let(:post2) { Fabricate(:post, raw: "[foo](#{url2})") }
+
+    before do
+      global_setting :s3_bucket, 'file-uploads/folder'
+      global_setting :s3_region, 'us-east-1'
+      enable_s3_uploads(uploads)
+      upload1.url = "//#{SiteSetting.s3_upload_bucket}.amazonaws.com/original/1X/#{upload1.base62_sha1}.png"
+      upload1.save!
+      upload2.url = "//#{SiteSetting.s3_upload_bucket}.amazonaws.com/original/1X/#{upload2.base62_sha1}.png"
+      upload2.save!
+
+      PostUpload.create(post: post1, upload: upload1)
+      PostUpload.create(post: post2, upload: upload2)
+      SiteSetting.enable_s3_uploads = false
+    end
+
+    def invoke_task
+      capture_stdout do
+        Rake::Task['uploads:migrate_from_s3'].invoke
+      end
+    end
+
+    it "fails if s3 uploads are still enabled" do
+      SiteSetting.enable_s3_uploads = true
+      expect { invoke_task }.to raise_error(SystemExit)
+    end
+
+    it "does not apply a limit" do
+      FileHelper.stubs(:download).with("http:#{upload1.url}", max_file_size: 4194304, tmp_file_name: "from_s3", follow_redirect: true).returns(file_from_fixtures("logo.png")).once()
+      FileHelper.stubs(:download).with("http:#{upload2.url}", max_file_size: 4194304, tmp_file_name: "from_s3", follow_redirect: true).returns(file_from_fixtures("logo.png")).once()
+
+      freeze_time
+
+      post1.update_columns(baked_at: 1.week.ago)
+      post2.update_columns(baked_at: 1.week.ago)
+      invoke_task
+
+      expect(post1.reload.baked_at).not_to eq_time(1.week.ago)
+      expect(post2.reload.baked_at).not_to eq_time(1.week.ago)
+    end
+  end
+
   describe "uploads:disable_secure_media" do
     def invoke_task
       capture_stdout do

From d3c972c30cafb8ca595a60233a30f75b2f95336c Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 3 Jun 2020 16:36:51 +0800
Subject: [PATCH 1544/1830] FIX: Rescue from readonly errors when looking up
 auth tokens.

Since this is rare, we don't want to check for
`Discourse.pg_readonly_mode?` on every request since we have to reach
for Redis. Instead, just rescue the error here.
---
 lib/auth/default_current_user_provider.rb | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index 36ba51051f..f79728de18 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -93,11 +93,17 @@ class Auth::DefaultCurrentUserProvider
       limiter = RateLimiter.new(nil, "cookie_auth_#{request.ip}", COOKIE_ATTEMPTS_PER_MIN , 60)
 
       if limiter.can_perform?
-        @user_token = UserAuthToken.lookup(auth_token,
-                                           seen: true,
-                                           user_agent: @env['HTTP_USER_AGENT'],
-                                           path: @env['REQUEST_PATH'],
-                                           client_ip: @request.ip)
+        @user_token = begin
+          UserAuthToken.lookup(
+            auth_token,
+            seen: true,
+            user_agent: @env['HTTP_USER_AGENT'],
+            path: @env['REQUEST_PATH'],
+            client_ip: @request.ip
+          )
+        rescue ActiveRecord::ReadOnlyError
+          nil
+        end
 
         current_user = @user_token.try(:user)
       end

From 50d4ad562e940401d03fcfc08043194c59ea2fd1 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Wed, 3 Jun 2020 19:59:51 -0700
Subject: [PATCH 1545/1830] copyedit, better email reply rejection copy

---
 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 da98bd5cc0..a7a1a7c110 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3039,7 +3039,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        None of the destination email addresses are recognized, or the Message-ID header in the email has been modified. Please make sure that you are sending to the correct email address provided by staff.
+        Do you use more than one email address? Did you reply from a different email address? Email replies require that you use the same email address when replying. Alternately, the Message-ID header in the email may have been modified.
 
     email_reject_old_destination:
       title: "Email Reject Old Destination"

From 2188ccccd52c4659263bc93e6ef1df9d855cbccd Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 4 Jun 2020 13:09:10 +0800
Subject: [PATCH 1546/1830] DEV: Remove `initiating_user` keyword arg from
 `EmailUpdater`.

The guardian contains the acting user.
---
 app/controllers/users_email_controller.rb | 2 +-
 lib/email_updater.rb                      | 5 ++---
 spec/components/email_updater_spec.rb     | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/controllers/users_email_controller.rb b/app/controllers/users_email_controller.rb
index a34cf21592..ae7b4c5623 100644
--- a/app/controllers/users_email_controller.rb
+++ b/app/controllers/users_email_controller.rb
@@ -35,7 +35,7 @@ class UsersEmailController < ApplicationController
     RateLimiter.new(user, "change-email-hr-#{request.remote_ip}", 6, 1.hour).performed!
     RateLimiter.new(user, "change-email-min-#{request.remote_ip}", 3, 1.minute).performed!
 
-    updater = EmailUpdater.new(guardian: guardian, user: user, initiating_user: current_user)
+    updater = EmailUpdater.new(guardian: guardian, user: user)
     updater.change_to(params[:email])
 
     if updater.errors.present?
diff --git a/lib/email_updater.rb b/lib/email_updater.rb
index 68799e304a..b3f4371c98 100644
--- a/lib/email_updater.rb
+++ b/lib/email_updater.rb
@@ -5,10 +5,9 @@ class EmailUpdater
 
   attr_reader :user
 
-  def initialize(guardian: nil, user: nil, initiating_user: nil)
+  def initialize(guardian: nil, user: nil)
     @guardian = guardian
     @user = user
-    @initiating_user = initiating_user
   end
 
   def self.human_attribute_name(name, options = {})
@@ -135,7 +134,7 @@ class EmailUpdater
   end
 
   def initiating_admin_changing_another_user_email?
-    @initiating_user&.admin? && @initiating_user != @user
+    @guardian.is_admin? && @guardian.user != @user
   end
 
   def auto_confirm_and_send_password_reset(email_token)
diff --git a/spec/components/email_updater_spec.rb b/spec/components/email_updater_spec.rb
index b5a06937e6..b2cae4d24d 100644
--- a/spec/components/email_updater_spec.rb
+++ b/spec/components/email_updater_spec.rb
@@ -19,7 +19,7 @@ describe EmailUpdater do
 
   context "when an admin is changing the email of another user" do
     let(:admin) { Fabricate(:admin) }
-    let(:updater) { EmailUpdater.new(guardian: user.guardian, user: user, initiating_user: admin) }
+    let(:updater) { EmailUpdater.new(guardian: admin.guardian, user: user) }
 
     def expect_old_email_job
       Jobs.expects(:enqueue).with(:critical_user_email, has_entries(to_address: old_email, type: :notify_old_email, user_id: user.id))

From a93d24501c3fc3358617000eca1b286a98a03a7f Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 4 Jun 2020 11:26:40 +0530
Subject: [PATCH 1547/1830] FIX: base import script was not updating
 first_post_created_at column FEATURE: new rake task to update
 first_post_created_at column

The not-equal operator (`<>`) in PostgreSQL does not compare values
with NULL. We should instead use `IS DISTINCT FROM` when comparing
values with NULL.
---
 lib/tasks/import.rake         | 19 +++++++++++++++++++
 script/import_scripts/base.rb |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index 9084a6492a..12d97adc4a 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -497,3 +497,22 @@ task 'import:file', [:file_name] => [:environment] do |_, args|
   ImportExport.import(args[:file_name])
   puts "", "Done", ""
 end
+
+desc "Update first_post_created_at column in user_stats table"
+task "import:update_first_post_created_at" => :environment do
+  puts "", "Updating first_post_created_at..."
+
+  DB.exec <<~SQL
+    WITH sub AS (
+      SELECT user_id, MIN(posts.created_at) AS first_post_created_at
+      FROM posts
+      GROUP BY user_id
+    )
+    UPDATE user_stats
+    SET first_post_created_at = sub.first_post_created_at
+    FROM user_stats u1
+    JOIN sub ON sub.user_id = u1.user_id
+    WHERE u1.user_id = user_stats.user_id
+      AND user_stats.first_post_created_at IS DISTINCT FROM sub.first_post_created_at
+  SQL
+end
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 035c8a3e57..a42b8c3dda 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -684,7 +684,7 @@ class ImportScripts::Base
       FROM users u1
       JOIN lpa ON lpa.user_id = u1.id
       WHERE u1.id = users.id
-        AND users.last_posted_at <> lpa.last_posted_at
+        AND users.last_posted_at IS DISTINCT FROM lpa.last_posted_at
     SQL
   end
 
@@ -702,7 +702,7 @@ class ImportScripts::Base
       FROM user_stats u1
       JOIN sub ON sub.user_id = u1.user_id
       WHERE u1.user_id = user_stats.user_id
-        AND user_stats.first_post_created_at <> sub.first_post_created_at
+        AND user_stats.first_post_created_at IS DISTINCT FROM sub.first_post_created_at
     SQL
 
     puts "", "Updating user post_count..."

From 07774894a6e40cd2c5fd1546163a43fdee34c039 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 4 Jun 2020 12:00:06 +0530
Subject: [PATCH 1548/1830] DEV: notify when the rake ask is completed

---
 lib/tasks/import.rake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index 12d97adc4a..0bd46c0280 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -500,7 +500,7 @@ end
 
 desc "Update first_post_created_at column in user_stats table"
 task "import:update_first_post_created_at" => :environment do
-  puts "", "Updating first_post_created_at..."
+  log "Updating first_post_created_at..."
 
   DB.exec <<~SQL
     WITH sub AS (
@@ -515,4 +515,6 @@ task "import:update_first_post_created_at" => :environment do
     WHERE u1.user_id = user_stats.user_id
       AND user_stats.first_post_created_at IS DISTINCT FROM sub.first_post_created_at
   SQL
+
+  log "Done"
 end

From ae52f5eaf549c5dbcccd1114050f1d92f488afdd Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 4 Jun 2020 09:21:21 +0200
Subject: [PATCH 1549/1830] DEV: removes brittle test (#9977)

---
 .../select-kit/single-select-test.js          | 38 -------------------
 1 file changed, 38 deletions(-)

diff --git a/test/javascripts/components/select-kit/single-select-test.js b/test/javascripts/components/select-kit/single-select-test.js
index 022f94eedd..43781679e5 100644
--- a/test/javascripts/components/select-kit/single-select-test.js
+++ b/test/javascripts/components/select-kit/single-select-test.js
@@ -259,44 +259,6 @@ componentTest("prevents propagating click event on header", {
   }
 });
 
-componentTest("focusAfterOnChange", {
-  template:
-    "{{d-button class='focus-me'}}{{single-select options=(hash focusAfterOnChange=focusAfterOnChange) value=value content=content onChange=onChange}}",
-
-  beforeEach() {
-    this.setProperties({
-      onChange: () => {
-        find(".focus-me").focus();
-        this.set("value", "foo");
-      },
-      content: DEFAULT_CONTENT,
-      value: DEFAULT_VALUE
-    });
-  },
-
-  async test(assert) {
-    this.set("focusAfterOnChange", true);
-
-    await this.subject.expand();
-    await this.subject.selectRowByIndex(0);
-
-    assert.ok(
-      document.activeElement.classList.contains("single-select-header"),
-      "it selects the header"
-    );
-
-    this.set("focusAfterOnChange", false);
-
-    await this.subject.expand();
-    await this.subject.selectRowByIndex(0);
-
-    assert.notOk(
-      document.activeElement.classList.contains("single-select-header"),
-      "it doesn’t select the header"
-    );
-  }
-});
-
 componentTest("labelProperty", {
   template: '{{single-select labelProperty="foo" value=value content=content}}',
 

From 8e1681d3567052f405b565725252d10a3fadbf4d Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 4 Jun 2020 15:21:42 +0800
Subject: [PATCH 1550/1830] Bump rails_failover.

---
 Gemfile.lock                              | 3 +--
 config/initializers/002-rails_failover.rb | 2 +-
 lib/discourse.rb                          | 4 ----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e7febbb3ff..baa304a8ec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,9 @@
 GIT
   remote: https://github.com/discourse/rails_failover
-  revision: a8785298ad5c89869c315d53d5f7243ec9443b55
+  revision: e9893a3920809c9a1bca4f7ae07b7243b2cd127e
   specs:
     rails_failover (0.4.0)
       activerecord (~> 6.0)
-      listen (~> 3.2)
       railties (~> 6.0)
 
 GEM
diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index 5b65d579f1..570248c748 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -25,7 +25,7 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
       Discourse.disable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
     end
 
-    Sidekiq.unpause!
+    Sidekiq.unpause! if Sidekiq.pause?
   end
 
   module Discourse
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 5da2acb15e..c46d91e362 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -661,10 +661,6 @@ module Discourse
     # re-establish
     Sidekiq.redis = sidekiq_redis_config
 
-    if ENV['ACTIVE_RECORD_RAILS_FAILOVER']
-      RailsFailover::ActiveRecord.after_fork
-    end
-
     # in case v8 was initialized we want to make sure it is nil
     PrettyText.reset_context
 

From 54f79ea3ba9c02be4c6bc25f47cd056b85a1ed0c Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 4 Jun 2020 15:43:40 +0800
Subject: [PATCH 1551/1830] DEV: Pausing Sidekiq is multisite aware.

---
 config/initializers/002-rails_failover.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index 570248c748..383dca3abd 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -15,17 +15,15 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
   RailsFailover::ActiveRecord.on_failover do
     RailsMultisite::ConnectionManagement.each_connection do
       Discourse.enable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+      Sidekiq.pause!("pg_failover") if !Sidekiq.paused?
     end
-
-    Sidekiq.pause!("pg_failover") if !Sidekiq.paused?
   end
 
   RailsFailover::ActiveRecord.on_fallback do
     RailsMultisite::ConnectionManagement.each_connection do
       Discourse.disable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+      Sidekiq.unpause! if Sidekiq.paused?
     end
-
-    Sidekiq.unpause! if Sidekiq.pause?
   end
 
   module Discourse

From aaece34e8b1e5ad66ba91ce68af09a1cd146052b Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 4 Jun 2020 17:13:59 +0800
Subject: [PATCH 1552/1830] DEV: Update rails_failover so that we can move
 middleware up the stack.

---
 Gemfile.lock                                 |  2 +-
 config/initializers/200-first_middlewares.rb |  4 +++
 lib/freedom_patches/middleware_stack.rb      | 38 ++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 lib/freedom_patches/middleware_stack.rb

diff --git a/Gemfile.lock b/Gemfile.lock
index baa304a8ec..56fa08db25 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/discourse/rails_failover
-  revision: e9893a3920809c9a1bca4f7ae07b7243b2cd127e
+  revision: 19a40ef42cb051c56d2679940ec5f00a436e670b
   specs:
     rails_failover (0.4.0)
       activerecord (~> 6.0)
diff --git a/config/initializers/200-first_middlewares.rb b/config/initializers/200-first_middlewares.rb
index 14432d8b9a..ab53806254 100644
--- a/config/initializers/200-first_middlewares.rb
+++ b/config/initializers/200-first_middlewares.rb
@@ -25,3 +25,7 @@ if Rails.configuration.multisite
   Rails.configuration.middleware.unshift RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config
   Rails.configuration.middleware.delete ActionDispatch::Executor
 end
+
+if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
+  Rails.configuration.middleware.move_after(RailsMultisite::Middleware, RailsFailover::ActiveRecord::Middleware)
+end
diff --git a/lib/freedom_patches/middleware_stack.rb b/lib/freedom_patches/middleware_stack.rb
new file mode 100644
index 0000000000..bf9d76f41a
--- /dev/null
+++ b/lib/freedom_patches/middleware_stack.rb
@@ -0,0 +1,38 @@
+# TODO: Remove once we upgrade to Rails 6.1
+# Copied implementation from https://github.com/rails/rails/pull/38169
+module ActionDispatch
+  class MiddlewareStack
+    def move(target, source)
+      source_index = assert_index(source, :before)
+      source_middleware = middlewares.delete_at(source_index)
+
+      target_index = assert_index(target, :before)
+      middlewares.insert(target_index, source_middleware)
+    end
+    alias_method :move_before, :move
+
+    def move_after(target, source)
+      source_index = assert_index(source, :after)
+      source_middleware = middlewares.delete_at(source_index)
+
+      target_index = assert_index(target, :after)
+      middlewares.insert(target_index + 1, source_middleware)
+    end
+  end
+end
+
+module Rails
+  module Configuration
+    class MiddlewareStackProxy
+      def move_before(*args, &block)
+        @delete_operations << -> middleware { middleware.send(__method__, *args, &block) }
+      end
+
+      alias :move :move_before
+
+      def move_after(*args, &block)
+        @delete_operations << -> middleware { middleware.send(__method__, *args, &block) }
+      end
+    end
+  end
+end

From 248db310d3a220a1bb6c297eddfb63fab60d7902 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 4 Jun 2020 17:24:41 +0800
Subject: [PATCH 1553/1830] DEV: Fix lint.

---
 lib/freedom_patches/middleware_stack.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/freedom_patches/middleware_stack.rb b/lib/freedom_patches/middleware_stack.rb
index bf9d76f41a..431fef373c 100644
--- a/lib/freedom_patches/middleware_stack.rb
+++ b/lib/freedom_patches/middleware_stack.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # TODO: Remove once we upgrade to Rails 6.1
 # Copied implementation from https://github.com/rails/rails/pull/38169
 module ActionDispatch

From 40dfac176fcbdf74979270ad305328b933ee93c0 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 4 Jun 2020 17:32:34 +0530
Subject: [PATCH 1554/1830] FIX: client side /my/ redirects were appending
 extra slash

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

diff --git a/app/assets/javascripts/discourse/app/lib/url.js b/app/assets/javascripts/discourse/app/lib/url.js
index f357e4978a..499b5d745c 100644
--- a/app/assets/javascripts/discourse/app/lib/url.js
+++ b/app/assets/javascripts/discourse/app/lib/url.js
@@ -247,7 +247,7 @@ const DiscourseURL = EmberObject.extend({
       if (currentUser) {
         path = path.replace(
           myPath,
-          userPath(currentUser.get("username_lower") + "/")
+          userPath(currentUser.get("username_lower"))
         );
       } else {
         return redirectTo("/login-preferences");

From 87673e65714ea120dfc020836d34611178c7be11 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 4 Jun 2020 20:29:47 +0800
Subject: [PATCH 1555/1830] DEV: Fix moving of rails_failover middleware.

---
 config/initializers/200-first_middlewares.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/initializers/200-first_middlewares.rb b/config/initializers/200-first_middlewares.rb
index ab53806254..fc6c66140f 100644
--- a/config/initializers/200-first_middlewares.rb
+++ b/config/initializers/200-first_middlewares.rb
@@ -27,5 +27,9 @@ if Rails.configuration.multisite
 end
 
 if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
-  Rails.configuration.middleware.move_after(RailsMultisite::Middleware, RailsFailover::ActiveRecord::Middleware)
+  if Rails.configuration.multisite
+    Rails.configuration.middleware.move_after(RailsMultisite::Middleware, RailsFailover::ActiveRecord::Middleware)
+  else
+    Rails.configuration.middleware.move_before(MessageBus::Rack::Middleware, RailsFailover::ActiveRecord::Middleware)
+  end
 end

From 76af25f753bc870767e5b92128b46e6d442c268f Mon Sep 17 00:00:00 2001
From: Joshua Rosenfeld <jomaxro@discourse.org>
Date: Thu, 4 Jun 2020 09:33:48 -0400
Subject: [PATCH 1556/1830] FEATURE: Support append when bulk tagging via rake
 (#9978)

New argument option for the `tags:bulk_tag_category` rake task.
Backwards compatible - defaults to false (no append) if no argument given.
---
 lib/tasks/tags.rake | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/tags.rake b/lib/tasks/tags.rake
index 192d08628b..6767b29948 100644
--- a/lib/tasks/tags.rake
+++ b/lib/tasks/tags.rake
@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
-task "tags:bulk_tag_category", [:tags, :category] => [:environment] do |_, args|
+task "tags:bulk_tag_category", [:tags, :category, :append] => [:environment] do |_, args|
+  args.with_defaults(append: false)
   tags = args[:tags].split("|")
   category_id = args[:category]
+  append = args[:append]
 
   if !tags || !category_id
     puts 'ERROR: Expecting tags:bulk_tag_category["tag",category_id]'
@@ -16,7 +18,7 @@ task "tags:bulk_tag_category", [:tags, :category] => [:environment] do |_, args|
   total = category.topics.count
 
   category.topics.find_each do |topic|
-    DiscourseTagging.tag_topic_by_names(topic, guardian, tags)
+    DiscourseTagging.tag_topic_by_names(topic, guardian, tags, append: append)
     print_status(tagged += 1, total)
   end
 

From 2d880b42a34de16fd99787d9a6898a36cf9bc14f Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 4 Jun 2020 10:44:54 -0400
Subject: [PATCH 1557/1830] UX: Add simple-list setting type (#9970)

---
 .../admin/components/simple-list.js           | 57 +++++++++++++
 .../components/site-settings/simple-list.js   | 11 +++
 .../admin/mixins/setting-component.js         |  3 +-
 .../templates/components/simple-list.hbs      | 40 +++++++++
 .../components/site-settings/simple-list.hbs  |  3 +
 .../stylesheets/common/admin/admin_base.scss  | 14 ++++
 config/locales/client.en.yml                  |  2 +
 config/site_settings.yml                      |  2 +-
 lib/site_settings/type_supervisor.rb          |  3 +-
 .../site_settings/type_supervisor_spec.rb     |  3 +
 .../components/simple-list-test.js            | 84 +++++++++++++++++++
 11 files changed, 219 insertions(+), 3 deletions(-)
 create mode 100644 app/assets/javascripts/admin/components/simple-list.js
 create mode 100644 app/assets/javascripts/admin/components/site-settings/simple-list.js
 create mode 100644 app/assets/javascripts/admin/templates/components/simple-list.hbs
 create mode 100644 app/assets/javascripts/admin/templates/components/site-settings/simple-list.hbs
 create mode 100644 test/javascripts/components/simple-list-test.js

diff --git a/app/assets/javascripts/admin/components/simple-list.js b/app/assets/javascripts/admin/components/simple-list.js
new file mode 100644
index 0000000000..3f43885d77
--- /dev/null
+++ b/app/assets/javascripts/admin/components/simple-list.js
@@ -0,0 +1,57 @@
+import { empty } from "@ember/object/computed";
+import Component from "@ember/component";
+import { action } from "@ember/object";
+import { on } from "discourse-common/utils/decorators";
+
+export default Component.extend({
+  classNameBindings: [":simple-list", ":value-list"],
+  inputEmpty: empty("newValue"),
+  inputDelimiter: null,
+  newValue: "",
+  collection: null,
+  values: null,
+
+  @on("didReceiveAttrs")
+  _setupCollection() {
+    this.set("collection", this._splitValues(this.values, this.inputDelimiter));
+  },
+
+  keyDown(event) {
+    if (event.which === 13) {
+      this.addValue(this.newValue);
+      return;
+    }
+  },
+
+  @action
+  changeValue(index, newValue) {
+    this.collection.replace(index, 1, [newValue]);
+    this.collection.arrayContentDidChange(index);
+    this._onChange();
+  },
+
+  @action
+  addValue(newValue) {
+    if (this.inputEmpty) return;
+
+    this.set("newValue", null);
+    this.collection.addObject(newValue);
+    this._onChange();
+  },
+
+  @action
+  removeValue(value) {
+    this.collection.removeObject(value);
+    this._onChange();
+  },
+
+  _onChange() {
+    this.attrs.onChange && this.attrs.onChange(this.collection);
+  },
+
+  _splitValues(values, delimiter) {
+    return values && values.length
+      ? values.split(delimiter || "\n").filter(Boolean)
+      : [];
+  }
+});
diff --git a/app/assets/javascripts/admin/components/site-settings/simple-list.js b/app/assets/javascripts/admin/components/site-settings/simple-list.js
new file mode 100644
index 0000000000..aab078bbe3
--- /dev/null
+++ b/app/assets/javascripts/admin/components/site-settings/simple-list.js
@@ -0,0 +1,11 @@
+import Component from "@ember/component";
+import { action } from "@ember/object";
+
+export default Component.extend({
+  inputDelimiter: "|",
+
+  @action
+  onChange(value) {
+    this.set("value", value.join(this.inputDelimiter || "\n"));
+  }
+});
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js b/app/assets/javascripts/admin/mixins/setting-component.js
index 83dcc31e65..699cecd32e 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js
+++ b/app/assets/javascripts/admin/mixins/setting-component.js
@@ -25,7 +25,8 @@ const CUSTOM_TYPES = [
   "upload",
   "group_list",
   "tag_list",
-  "color"
+  "color",
+  "simple_list"
 ];
 
 const AUTO_REFRESH_ON_SAVE = ["logo", "logo_small", "large_icon"];
diff --git a/app/assets/javascripts/admin/templates/components/simple-list.hbs b/app/assets/javascripts/admin/templates/components/simple-list.hbs
new file mode 100644
index 0000000000..3e78f77b05
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/simple-list.hbs
@@ -0,0 +1,40 @@
+{{#if collection}}
+  <div class="values">
+    {{#each collection as |value index|}}
+      <div data-index={{index}} class="value">
+        {{d-button
+          action=(action "removeValue")
+          actionParam=value
+          icon="times"
+          class="remove-value-btn btn-small"
+        }}
+
+        {{input
+          title=value
+          value=value
+          class="value-input"
+          focus-out=(action "changeValue" index)
+        }}
+      </div>
+    {{/each}}
+  </div>
+{{/if}}
+
+<div class="simple-list-input">
+  {{input
+    type="text"
+    value=newValue
+    placeholderKey="admin.site_settings.simple_list.add_item"
+    class="add-value-input"
+    autocomplete="discourse"
+    autocorrect="off"
+    autocapitalize="off"}}
+
+  {{d-button
+      action=(action "addValue")
+      actionParam=newValue
+      disabled=inputEmpty
+      icon="plus"
+      class="add-value-btn btn-small"
+    }}
+</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/simple-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/simple-list.hbs
new file mode 100644
index 0000000000..3eca57db83
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/site-settings/simple-list.hbs
@@ -0,0 +1,3 @@
+{{simple-list values=value inputDelimiter=inputDelimiter onChange=(action "onChange")}}
+{{setting-validation-message message=validationMessage}}
+<div class="desc">{{html-safe setting.description}}</div>
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index afdc9a7e3b..208e9127b3 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -931,6 +931,20 @@ table#user-badges {
   }
 }
 
+.simple-list-input {
+  display: flex;
+
+  .add-value-input {
+    margin: 0;
+    box-sizing: border-box;
+    flex: 1 0 0px;
+  }
+
+  .add-value-btn {
+    margin-left: 0.25em;
+  }
+}
+
 // Mobile view text-inputs need some padding
 .mobile-view .admin-contents {
   input[type="text"] {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index b5db1f5059..308944b3b2 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4588,6 +4588,8 @@ en:
           modal_description: "Would you like to apply this change historically? This will change preferences for %{count} existing users."
           modal_yes: "Yes"
           modal_no: "No, only apply change going forward"
+        simple_list:
+          add_item: "Add item..."
 
       badges:
         title: Badges
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 5901d6d338..c658ec727c 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1445,7 +1445,7 @@ security:
   content_security_policy_collect_reports:
     default: false
   content_security_policy_script_src:
-    type: list
+    type: simple_list
     default: ""
   invalidate_inactive_admin_email_after_days:
     default: 365
diff --git a/lib/site_settings/type_supervisor.rb b/lib/site_settings/type_supervisor.rb
index 26cc20b84e..ae78d5dd1f 100644
--- a/lib/site_settings/type_supervisor.rb
+++ b/lib/site_settings/type_supervisor.rb
@@ -34,7 +34,8 @@ class SiteSettings::TypeSupervisor
       group: 19,
       group_list: 20,
       tag_list: 21,
-      color: 22
+      color: 22,
+      simple_list: 23
     )
   end
 
diff --git a/spec/components/site_settings/type_supervisor_spec.rb b/spec/components/site_settings/type_supervisor_spec.rb
index caea601178..cc697c01d5 100644
--- a/spec/components/site_settings/type_supervisor_spec.rb
+++ b/spec/components/site_settings/type_supervisor_spec.rb
@@ -88,6 +88,9 @@ describe SiteSettings::TypeSupervisor do
       it "'color' should be at the right position" do
         expect(SiteSettings::TypeSupervisor.types[:color]).to eq(22)
       end
+      it "'simple_list' should be at the right position" do
+        expect(SiteSettings::TypeSupervisor.types[:simple_list]).to eq(23)
+      end
     end
   end
 
diff --git a/test/javascripts/components/simple-list-test.js b/test/javascripts/components/simple-list-test.js
new file mode 100644
index 0000000000..5c8d26dd51
--- /dev/null
+++ b/test/javascripts/components/simple-list-test.js
@@ -0,0 +1,84 @@
+import componentTest from "helpers/component-test";
+moduleForComponent("simple-list", { integration: true });
+
+componentTest("adding a value", {
+  template: "{{simple-list values=values}}",
+
+  beforeEach() {
+    this.set("values", "vinkas\nosama");
+  },
+
+  async test(assert) {
+    assert.ok(
+      find(".add-value-btn[disabled]").length,
+      "while loading the + button is disabled"
+    );
+
+    await fillIn(".add-value-input", "penar");
+    await click(".add-value-btn");
+
+    assert.ok(
+      find(".values .value").length === 3,
+      "it adds the value to the list of values"
+    );
+
+    assert.ok(
+      find(".values .value[data-index='2'] .value-input")[0].value === "penar",
+      "it sets the correct value for added item"
+    );
+
+    await fillIn(".add-value-input", "eviltrout");
+    await keyEvent(".add-value-input", "keydown", 13); // enter
+
+    assert.ok(
+      find(".values .value").length === 4,
+      "it adds the value when keying Enter"
+    );
+  }
+});
+
+componentTest("removing a value", {
+  template: "{{simple-list values=values}}",
+
+  beforeEach() {
+    this.set("values", "vinkas\nosama");
+  },
+
+  async test(assert) {
+    await click(".values .value[data-index='0'] .remove-value-btn");
+
+    assert.ok(
+      find(".values .value").length === 1,
+      "it removes the value from the list of values"
+    );
+
+    assert.ok(
+      find(".values .value[data-index='0'] .value-input")[0].value === "osama",
+      "it removes the correct value"
+    );
+  }
+});
+
+componentTest("delimiter support", {
+  template: "{{simple-list values=values inputDelimiter='|'}}",
+
+  beforeEach() {
+    this.set("values", "vinkas|osama");
+  },
+
+  async test(assert) {
+    await fillIn(".add-value-input", "eviltrout");
+    await click(".add-value-btn");
+
+    assert.ok(
+      find(".values .value").length === 3,
+      "it adds the value to the list of values"
+    );
+
+    assert.ok(
+      find(".values .value[data-index='2'] .value-input")[0].value ===
+        "eviltrout",
+      "it adds the correct value"
+    );
+  }
+});

From de29b4a5111183f0ddaaa6a244fa1b40c43f66b1 Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Thu, 4 Jun 2020 06:26:08 -1000
Subject: [PATCH 1558/1830] PERF: rate limit search, and add anon cache for
 search results (#9969)

Adds new hidden site settings for rate limits:
30 for logged in users, 15 for anon

Adds an anon cache for searching, caches results of searches for 1 minute
---
 app/controllers/search_controller.rb    |  31 ++++++-
 config/site_settings.yml                |   6 ++
 spec/requests/search_controller_spec.rb | 112 ++++++++++++++++++++++++
 3 files changed, 147 insertions(+), 2 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index a2dd66ea5f..6bfce11fc5 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -28,6 +28,10 @@ class SearchController < ApplicationController
       raise Discourse::InvalidParameters.new("string contains null byte")
     end
 
+    rate_limit_errors = rate_limit_search
+
+    discourse_expires_in 1.minute
+
     search_args = {
       type_filter: 'topic',
       guardian: guardian,
@@ -48,7 +52,10 @@ class SearchController < ApplicationController
     search_args[:ip_address] = request.remote_ip
     search_args[:user_id] = current_user.id if current_user.present?
 
-    if site_overloaded?
+    if rate_limit_errors
+      result = Search::GroupedSearchResults.new(search_args[:type_filter], @search_term, context, false, 0)
+      result.error = I18n.t("rate_limiter.slow_down")
+    elsif site_overloaded?
       result = Search::GroupedSearchResults.new(search_args[:type_filter], @search_term, context, false, 0)
       result.error = I18n.t("search.extreme_load_error")
     else
@@ -76,6 +83,10 @@ class SearchController < ApplicationController
       raise Discourse::InvalidParameters.new("string contains null byte")
     end
 
+    rate_limit_errors = rate_limit_search
+
+    discourse_expires_in 1.minute
+
     search_args = { guardian: guardian }
 
     search_args[:type_filter] = params[:type_filter]                 if params[:type_filter].present?
@@ -94,7 +105,10 @@ class SearchController < ApplicationController
     search_args[:user_id] = current_user.id if current_user.present?
     search_args[:restrict_to_archetype] = params[:restrict_to_archetype] if params[:restrict_to_archetype].present?
 
-    if site_overloaded?
+    if rate_limit_errors
+      result = Search::GroupedSearchResults.new(search_args[:type_filter], @search_term, context, false, 0)
+      result.error = I18n.t("rate_limiter.slow_down")
+    elsif site_overloaded?
       result = GroupedSearchResults.new(search_args["type_filter"], params[:term], context, false, 0)
     else
       search = Search.new(params[:term], search_args)
@@ -140,6 +154,19 @@ class SearchController < ApplicationController
       (queue_time > GlobalSetting.disable_search_queue_threshold)
   end
 
+  def rate_limit_search
+    begin
+      if current_user.present?
+        RateLimiter.new(current_user, "search-min", SiteSetting.rate_limit_search_user, 1.minute).performed!
+      else
+        RateLimiter.new(nil, "search-min-#{request.remote_ip}", SiteSetting.rate_limit_search_anon, 1.minute).performed!
+      end
+    rescue RateLimiter::LimitExceeded => e
+      return e
+    end
+    false
+  end
+
   def cancel_overloaded_search
     if site_overloaded?
       render_json_error I18n.t("search.extreme_load_error"), status: 409
diff --git a/config/site_settings.yml b/config/site_settings.yml
index c658ec727c..382f2f63a3 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1549,6 +1549,12 @@ rate_limits:
   rate_limit_create_post: 5
   rate_limit_new_user_create_topic: 120
   rate_limit_new_user_create_post: 30
+  rate_limit_search_anon:
+    hidden: true
+    default: 15
+  rate_limit_search_user:
+    hidden: true
+    default: 30
   max_topics_per_day: 20
   max_personal_messages_per_day: 20
   max_likes_per_day: 50
diff --git a/spec/requests/search_controller_spec.rb b/spec/requests/search_controller_spec.rb
index dac11690d3..044e741d54 100644
--- a/spec/requests/search_controller_spec.rb
+++ b/spec/requests/search_controller_spec.rb
@@ -179,6 +179,61 @@ describe SearchController do
       expect(response.status).to eq(200)
       expect(SearchLog.where(term: 'wookie')).to be_blank
     end
+
+    context 'rate limited' do
+      before do
+        SiteSetting.rate_limit_search_user = 3
+        SiteSetting.rate_limit_search_anon = 2
+      end
+
+      it 'rate limits searches' do
+        RateLimiter.enable
+        RateLimiter.clear_all!
+
+        2.times do
+          get "/search/query.json", params: {
+                term: 'wookie'
+              }
+
+          expect(response.status).to eq(200)
+          json = response.parsed_body
+          expect(json["grouped_search_result"]["error"]).to eq(nil)
+        end
+
+        get "/search/query.json", params: {
+              term: 'wookie'
+            }
+        expect(response.status).to eq(200)
+        json = response.parsed_body
+        expect(json["grouped_search_result"]["error"]).to eq(I18n.t("rate_limiter.slow_down"))
+      end
+
+      context "and a logged in user" do
+        before { sign_in(user) }
+
+        it 'rate limits logged in searches' do
+          RateLimiter.enable
+          RateLimiter.clear_all!
+
+          3.times do
+            get "/search/query.json", params: {
+                  term: 'wookie'
+                }
+
+            expect(response.status).to eq(200)
+            json = response.parsed_body
+            expect(json["grouped_search_result"]["error"]).to eq(nil)
+          end
+
+          get "/search/query.json", params: {
+                term: 'wookie'
+              }
+          expect(response.status).to eq(200)
+          json = response.parsed_body
+          expect(json["grouped_search_result"]["error"]).to eq(I18n.t("rate_limiter.slow_down"))
+        end
+      end
+    end
   end
 
   context "#show" do
@@ -217,6 +272,63 @@ describe SearchController do
       expect(response.status).to eq(200)
       expect(SearchLog.where(term: 'bantha')).to be_blank
     end
+
+    context 'rate limited' do
+
+      before do
+        SiteSetting.rate_limit_search_user = 3
+        SiteSetting.rate_limit_search_anon = 2
+      end
+
+      it 'rate limits searches' do
+        RateLimiter.enable
+        RateLimiter.clear_all!
+
+        2.times do
+          get "/search.json", params: {
+                q: 'bantha'
+              }
+
+          expect(response.status).to eq(200)
+          json = response.parsed_body
+          expect(json["grouped_search_result"]["error"]).to eq(nil)
+        end
+
+        get "/search.json", params: {
+              q: 'bantha'
+            }
+        expect(response.status).to eq(200)
+        json = response.parsed_body
+        expect(json["grouped_search_result"]["error"]).to eq(I18n.t("rate_limiter.slow_down"))
+
+      end
+
+      context "and a logged in user" do
+        before { sign_in(user) }
+
+        it 'rate limits searches' do
+          RateLimiter.enable
+          RateLimiter.clear_all!
+
+          3.times do
+            get "/search.json", params: {
+                  q: 'bantha'
+                }
+
+            expect(response.status).to eq(200)
+            json = response.parsed_body
+            expect(json["grouped_search_result"]["error"]).to eq(nil)
+          end
+
+          get "/search.json", params: {
+                q: 'bantha'
+              }
+          expect(response.status).to eq(200)
+          json = response.parsed_body
+          expect(json["grouped_search_result"]["error"]).to eq(I18n.t("rate_limiter.slow_down"))
+        end
+      end
+    end
   end
 
   context "search priority" do

From a23d31e4d629fb8f0d1745646c754955234ebeb9 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 4 Jun 2020 19:07:34 +0200
Subject: [PATCH 1559/1830] DEV: removes unecessary casting (#9982)

---
 .../javascripts/discourse/app/routes/build-topic-route.js     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/routes/build-topic-route.js b/app/assets/javascripts/discourse/app/routes/build-topic-route.js
index 786e9d557f..f623bf0b5c 100644
--- a/app/assets/javascripts/discourse/app/routes/build-topic-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-topic-route.js
@@ -52,9 +52,7 @@ function findTopicList(store, tracking, filter, filterParams, extras) {
     // Clean up any string parameters that might slip through
     filterParams = filterParams || {};
     Object.keys(filterParams).forEach(k => {
-      let val = filterParams[k];
-      if (val === "false") val = false;
-      if (val === "true") val = true;
+      const val = filterParams[k];
       if (val === "undefined" || val === "null") {
         filterParams[k] = null;
       }

From f00e5515e41fd72b84382350605c50ed4a938448 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Thu, 4 Jun 2020 14:49:39 -0300
Subject: [PATCH 1560/1830] FIX: Service Worker URL was broken

Behavior was changed in #9966, which made the URL be relative.

If the user landed in a topic, for example, the browser was given a
service worker URL under that specific topic URL, which was a 404.

Fixes broken PWA install and broken push notifications
---
 .../discourse/app/initializers/register-service-worker.js     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/initializers/register-service-worker.js b/app/assets/javascripts/discourse/app/initializers/register-service-worker.js
index c22b7e98ff..6b5927d511 100644
--- a/app/assets/javascripts/discourse/app/initializers/register-service-worker.js
+++ b/app/assets/javascripts/discourse/app/initializers/register-service-worker.js
@@ -1,5 +1,5 @@
 import { isAbsoluteURL } from "discourse-common/lib/get-url";
-import getURL from "discourse-common/lib/get-url";
+import getAbsoluteURL from "discourse-common/lib/get-url";
 
 export default {
   name: "register-service-worker",
@@ -33,7 +33,7 @@ export default {
         });
 
         navigator.serviceWorker
-          .register(`${getURL(Discourse.ServiceWorkerURL)}`)
+          .register(getAbsoluteURL(`/${Discourse.ServiceWorkerURL}`))
           .catch(error => {
             // eslint-disable-next-line no-console
             console.info(`Failed to register Service Worker: ${error}`);

From 5cc03698986573063889c1cbaea97c81bb0c5d3c Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 4 Jun 2020 17:26:57 -0400
Subject: [PATCH 1561/1830] Minor dropdown icon width fix

---
 app/assets/stylesheets/common/base/compose.scss                | 3 ---
 .../stylesheets/common/select-kit/dropdown-select-box.scss     | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 9c8864333a..00e40ddaa7 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -97,9 +97,6 @@
     margin: 5px 0 10px 0;
     display: flex;
     align-items: center;
-    .d-icon {
-      color: $primary-medium;
-    }
     .reply-details {
       max-width: calc(100% - 175px);
       flex: 1 1 auto;
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index 97e5477a51..23a9068c46 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -22,9 +22,11 @@
 
       .icons {
         display: flex;
+        align-self: flex-start;
         margin-right: 0.5em;
 
         .d-icon {
+          flex: 0 0 100%;
           font-size: $font-up-2;
           align-self: center;
           margin-right: 0;

From 5cea4a6cc2e6521ee4f5cc73a4e77c93c4d2bd2b Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 4 Jun 2020 17:29:28 -0400
Subject: [PATCH 1562/1830] icon color fix, follow-up to 5cc0369

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

diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 00e40ddaa7..94ab5db59b 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -97,6 +97,9 @@
     margin: 5px 0 10px 0;
     display: flex;
     align-items: center;
+    .d-icon {
+      color: $primary-high;
+    }
     .reply-details {
       max-width: calc(100% - 175px);
       flex: 1 1 auto;

From 36841210fb9902054aa461c135d5828264483a3e Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Fri, 5 Jun 2020 10:56:57 +1000
Subject: [PATCH 1563/1830] Move UploadSecurity public types into PUBLIC_TYPES
 constant

* this is so plugins can extend the public types if required
---
 lib/upload_security.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/upload_security.rb b/lib/upload_security.rb
index 5ce74ece10..887644699f 100644
--- a/lib/upload_security.rb
+++ b/lib/upload_security.rb
@@ -14,6 +14,7 @@
 # on the current secure? status, otherwise there would be a lot of additional
 # complex queries and joins to perform.
 class UploadSecurity
+  PUBLIC_TYPES = %w[avatar custom_emoji profile_background card_background]
   def initialize(upload, opts = {})
     @upload = upload
     @opts = opts
@@ -53,7 +54,7 @@ class UploadSecurity
   end
 
   def public_type?
-    %w[avatar custom_emoji profile_background card_background].include?(@upload_type)
+    PUBLIC_TYPES.include?(@upload_type)
   end
 
   def uploading_in_composer?

From e82d4d8a7589e4bc886c9c999ef8f2ce883599a3 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 5 Jun 2020 09:05:19 +0800
Subject: [PATCH 1564/1830] DEV: Update rails_failover to avoid monkey patching
 Rails config.

---
 Gemfile.lock                                 |  4 +-
 config/application.rb                        |  1 +
 config/initializers/200-first_middlewares.rb |  4 +-
 lib/freedom_patches/middleware_stack.rb      | 40 --------------------
 4 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 lib/freedom_patches/middleware_stack.rb

diff --git a/Gemfile.lock b/Gemfile.lock
index 56fa08db25..2c64a4bb47 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/discourse/rails_failover
-  revision: 19a40ef42cb051c56d2679940ec5f00a436e670b
+  revision: 850d04f4b1c4178862d9674ec0b2a46a2f1c20d9
   specs:
     rails_failover (0.4.0)
       activerecord (~> 6.0)
@@ -155,7 +155,7 @@ GEM
     hkdf (0.3.0)
     htmlentities (4.3.4)
     http_accept_language (2.1.1)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     image_size (1.5.0)
     in_threads (1.5.4)
diff --git a/config/application.rb b/config/application.rb
index 07730bc63b..a93c86c258 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -103,6 +103,7 @@ module Discourse
     # wrong position
     config.skip_message_bus_middleware = true
     config.skip_multisite_middleware = true
+    config.skip_rails_failover_active_record_middleware = true
 
     # Disable so this is only run manually
     # we may want to change this later on
diff --git a/config/initializers/200-first_middlewares.rb b/config/initializers/200-first_middlewares.rb
index fc6c66140f..5fada923cd 100644
--- a/config/initializers/200-first_middlewares.rb
+++ b/config/initializers/200-first_middlewares.rb
@@ -28,8 +28,8 @@ end
 
 if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
   if Rails.configuration.multisite
-    Rails.configuration.middleware.move_after(RailsMultisite::Middleware, RailsFailover::ActiveRecord::Middleware)
+    Rails.configuration.middleware.insert_after(RailsMultisite::Middleware, RailsFailover::ActiveRecord::Middleware)
   else
-    Rails.configuration.middleware.move_before(MessageBus::Rack::Middleware, RailsFailover::ActiveRecord::Middleware)
+    Rails.configuration.middleware.insert_before(MessageBus::Rack::Middleware, RailsFailover::ActiveRecord::Middleware)
   end
 end
diff --git a/lib/freedom_patches/middleware_stack.rb b/lib/freedom_patches/middleware_stack.rb
deleted file mode 100644
index 431fef373c..0000000000
--- a/lib/freedom_patches/middleware_stack.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-# TODO: Remove once we upgrade to Rails 6.1
-# Copied implementation from https://github.com/rails/rails/pull/38169
-module ActionDispatch
-  class MiddlewareStack
-    def move(target, source)
-      source_index = assert_index(source, :before)
-      source_middleware = middlewares.delete_at(source_index)
-
-      target_index = assert_index(target, :before)
-      middlewares.insert(target_index, source_middleware)
-    end
-    alias_method :move_before, :move
-
-    def move_after(target, source)
-      source_index = assert_index(source, :after)
-      source_middleware = middlewares.delete_at(source_index)
-
-      target_index = assert_index(target, :after)
-      middlewares.insert(target_index + 1, source_middleware)
-    end
-  end
-end
-
-module Rails
-  module Configuration
-    class MiddlewareStackProxy
-      def move_before(*args, &block)
-        @delete_operations << -> middleware { middleware.send(__method__, *args, &block) }
-      end
-
-      alias :move :move_before
-
-      def move_after(*args, &block)
-        @delete_operations << -> middleware { middleware.send(__method__, *args, &block) }
-      end
-    end
-  end
-end

From 320b1e95bf43a5345254fa5a3eec3182379b7803 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 5 Jun 2020 09:09:54 +0800
Subject: [PATCH 1565/1830] DEV: Silence all freedom patches trace in verbose
 query logs.

---
 config/environments/development.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 7cb2a61d72..cd89923a26 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -84,7 +84,7 @@ Discourse::Application.configure do
 
     if ENV["RAILS_VERBOSE_QUERY_LOGS"] == "1"
       ActiveRecord::LogSubscriber.backtrace_cleaner.add_silencer do |line|
-        line =~ /lib\/freedom_patches\/fast_pluck\.rb/
+        line =~ /lib\/freedom_patches/
       end
     end
 

From f6c3962e3cc63e1f6bd7c86c8ba14b7b8001e794 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 4 Jun 2020 21:24:14 -0400
Subject: [PATCH 1566/1830] UX: Change collapsed draft z-index on mobile

---
 app/assets/stylesheets/mobile/compose.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index 902f42102c..7156baaac5 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -63,6 +63,7 @@
   }
 
   &.draft {
+    z-index: z("footer-nav") + 1;
     padding-bottom: env(safe-area-inset-bottom);
 
     .toggle-toolbar,

From 2de253759514080a4c0581dc2bf3702ec44ee2af Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 4 Jun 2020 21:42:01 -0400
Subject: [PATCH 1567/1830] UX: add bottom padding to user lists on mobile

In some cases, when lists had a handful of items, the last item would be covered by the footer-nav eoverlay on PWAs and DiscourseHub.
---
 app/assets/stylesheets/mobile/user.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index 55888d37a1..28c43fa3d1 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -32,6 +32,7 @@
 
 .user-main {
   margin-top: 12px;
+  padding-bottom: 60px; // slightly taller than .footer-nav
 
   .user-content {
     box-sizing: border-box;

From 0f20a6f0aaecda85c1b698f3ddecf34d76a2ee35 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 5 Jun 2020 07:43:15 +0530
Subject: [PATCH 1568/1830] FIX: use `short_path` of flair upload to get signed
 url for secure media.

If we use `upload.url` for secure urls then the images won't render.
---
 app/models/group.rb                          | 2 +-
 spec/jobs/migrate_group_flair_images_spec.rb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/group.rb b/app/models/group.rb
index d99fb25721..0988cc3303 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -750,7 +750,7 @@ class Group < ActiveRecord::Base
   end
 
   def flair_url
-    flair_icon.presence || flair_upload&.url
+    flair_icon.presence || flair_upload&.short_path
   end
 
   protected
diff --git a/spec/jobs/migrate_group_flair_images_spec.rb b/spec/jobs/migrate_group_flair_images_spec.rb
index ff3428fc98..cc72d26fa2 100644
--- a/spec/jobs/migrate_group_flair_images_spec.rb
+++ b/spec/jobs/migrate_group_flair_images_spec.rb
@@ -28,7 +28,9 @@ RSpec.describe Jobs::MigrateGroupFlairImages do
     end.to change { Upload.count }.by(1)
 
     group.reload
-    expect(group.flair_upload).to eq(Upload.last)
+    upload = Upload.last
+    expect(group.flair_upload).to eq(upload)
+    expect(group.flair_url).to eq(upload.short_path)
     expect(group[:flair_url]).to eq(nil)
   end
 

From e84ffb4861d8890fd156893563b863afce0abbdd Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 5 Jun 2020 12:30:34 +1000
Subject: [PATCH 1569/1830] DEV: Add pry-byebug and optionally require pry
 behind a ENV var for better spec debugging (#9984)

We removed pry-nav a while back because it is not up to date with pry but it is super useful. Luckily pry-byebug is here to save us all from Satan's power.

To get this to work you need to add the following to your $HOME/.pryrc file.

```
if defined?(PryByebug)
  Pry.commands.alias_command 'c', 'continue'
  Pry.commands.alias_command 's', 'step'
  Pry.commands.alias_command 'n', 'next'
  Pry.commands.alias_command 'f', 'finish'
end

Pry::Commands.command /^$/, "repeat last command" do
  pry_instance.run_command Pry.history.to_a.last
end
```

The require-ing of pry, pry-rails, and pry-byebug in specs is controlled by the IMPROVED_SPEC_DEBUGGING flag (disabled by default).
---
 Gemfile              | 1 +
 Gemfile.lock         | 4 ++++
 spec/rails_helper.rb | 6 ++++++
 3 files changed, 11 insertions(+)

diff --git a/Gemfile b/Gemfile
index da983fa8c7..b708152130 100644
--- a/Gemfile
+++ b/Gemfile
@@ -112,6 +112,7 @@ gem 'oj'
 gem 'pg'
 gem 'mini_sql'
 gem 'pry-rails', require: false
+gem 'pry-byebug', require: false
 gem 'r2', require: false
 gem 'rake'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 2c64a4bb47..0aeb34d066 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -267,6 +267,9 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.5)
@@ -516,6 +519,7 @@ DEPENDENCIES
   onebox
   parallel_tests
   pg
+  pry-byebug
   pry-rails
   puma
   r2
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 256de29658..dd4879d7fe 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -8,6 +8,12 @@ end
 require 'rubygems'
 require 'rbtrace'
 
+if ENV['IMPROVED_SPEC_DEBUGGING']
+  require 'pry'
+  require 'pry-byebug'
+  require 'pry-rails'
+end
+
 # Loading more in this block will cause your tests to run faster. However,
 # if you change any configuration or code from libraries loaded here, you'll
 # need to restart spork for it take effect.

From 985900818ff985b04def6aa4c5d99c1aa6dbd45c Mon Sep 17 00:00:00 2001
From: OsamaSayegh <asooomaasoooma90@gmail.com>
Date: Fri, 5 Jun 2020 05:49:31 +0300
Subject: [PATCH 1570/1830] DEV: Fix indentation for routes.rb

---
 config/routes.rb | 1700 +++++++++++++++++++++++-----------------------
 1 file changed, 850 insertions(+), 850 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 1f843dcf6e..e04bc60dad 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,960 +11,960 @@ Discourse::Application.routes.draw do
   scope path: nil, constraints: { format: /(json|html|\*\/\*)/ } do
     relative_url_root = (defined?(Rails.configuration.relative_url_root) && Rails.configuration.relative_url_root) ? Rails.configuration.relative_url_root + '/' : '/'
 
-  match "/404", to: "exceptions#not_found", via: [:get, :post]
-  get "/404-body" => "exceptions#not_found_body"
+    match "/404", to: "exceptions#not_found", via: [:get, :post]
+    get "/404-body" => "exceptions#not_found_body"
 
-  get "/bootstrap" => "bootstrap#index"
+    get "/bootstrap" => "bootstrap#index"
 
-  post "webhooks/aws" => "webhooks#aws"
-  post "webhooks/mailgun"  => "webhooks#mailgun"
-  post "webhooks/mailjet"  => "webhooks#mailjet"
-  post "webhooks/mandrill" => "webhooks#mandrill"
-  post "webhooks/postmark" => "webhooks#postmark"
-  post "webhooks/sendgrid" => "webhooks#sendgrid"
-  post "webhooks/sparkpost" => "webhooks#sparkpost"
+    post "webhooks/aws" => "webhooks#aws"
+    post "webhooks/mailgun"  => "webhooks#mailgun"
+    post "webhooks/mailjet"  => "webhooks#mailjet"
+    post "webhooks/mandrill" => "webhooks#mandrill"
+    post "webhooks/postmark" => "webhooks#postmark"
+    post "webhooks/sendgrid" => "webhooks#sendgrid"
+    post "webhooks/sparkpost" => "webhooks#sparkpost"
 
-  scope path: nil, constraints: { format: /.*/ } do
-    Sidekiq::Web.set :sessions, Rails.application.config.session_options
-    if Rails.env.development?
-      mount Sidekiq::Web => "/sidekiq"
-      mount Logster::Web => "/logs"
-    else
-      # only allow sidekiq in master site
-      mount Sidekiq::Web => "/sidekiq", constraints: AdminConstraint.new(require_master: true)
-      mount Logster::Web => "/logs", constraints: AdminConstraint.new
+    scope path: nil, constraints: { format: /.*/ } do
+      Sidekiq::Web.set :sessions, Rails.application.config.session_options
+      if Rails.env.development?
+        mount Sidekiq::Web => "/sidekiq"
+        mount Logster::Web => "/logs"
+      else
+        # only allow sidekiq in master site
+        mount Sidekiq::Web => "/sidekiq", constraints: AdminConstraint.new(require_master: true)
+        mount Logster::Web => "/logs", constraints: AdminConstraint.new
+      end
     end
-  end
 
-  resources :about do
-    collection do
-      get "live_post_counts"
-    end
-  end
-
-  get "finish-installation" => "finish_installation#index"
-  get "finish-installation/register" => "finish_installation#register"
-  post "finish-installation/register" => "finish_installation#register"
-  get "finish-installation/confirm-email" => "finish_installation#confirm_email"
-  put "finish-installation/resend-email" => "finish_installation#resend_email"
-
-  get "pub/check-slug" => "published_pages#check_slug"
-  get "pub/by-topic/:topic_id" => "published_pages#details"
-  put "pub/by-topic/:topic_id" => "published_pages#upsert"
-  delete "pub/by-topic/:topic_id" => "published_pages#destroy"
-  get "pub/:slug" => "published_pages#show"
-
-  resources :directory_items
-
-  get "site" => "site#site"
-  namespace :site do
-    get "settings"
-    get "custom_html"
-    get "banner"
-    get "emoji"
-  end
-
-  get "site/basic-info" => 'site#basic_info'
-  get "site/statistics" => 'site#statistics'
-  get "site/selectable-avatars" => "site#selectable_avatars"
-
-  get "srv/status" => "forums#status"
-
-  get "wizard" => "wizard#index"
-  get 'wizard/steps' => 'steps#index'
-  get 'wizard/steps/:id' => "wizard#index"
-  put 'wizard/steps/:id' => "steps#update"
-
-  namespace :admin, constraints: StaffConstraint.new do
-    get "" => "admin#index"
-
-    get 'plugins' => 'plugins#index'
-
-    resources :site_settings, constraints: AdminConstraint.new do
+    resources :about do
       collection do
-        get "category/:id" => "site_settings#index"
-      end
-
-      put "user_count" => "site_settings#user_count"
-    end
-
-    get "reports" => "reports#index"
-    get "reports/bulk" => "reports#bulk"
-    get "reports/:type" => "reports#show"
-
-    resources :groups, constraints: AdminConstraint.new do
-      collection do
-        get 'bulk'
-        get 'bulk-complete' => 'groups#bulk'
-        put 'bulk' => 'groups#bulk_perform'
-        put "automatic_membership_count" => "groups#automatic_membership_count"
-      end
-      member do
-        put "owners" => "groups#add_owners"
-        delete "owners" => "groups#remove_owner"
+        get "live_post_counts"
       end
     end
 
-    get "groups/:type" => "groups#show", constraints: AdminConstraint.new
-    get "groups/:type/:id" => "groups#show", constraints: AdminConstraint.new
+    get "finish-installation" => "finish_installation#index"
+    get "finish-installation/register" => "finish_installation#register"
+    post "finish-installation/register" => "finish_installation#register"
+    get "finish-installation/confirm-email" => "finish_installation#confirm_email"
+    put "finish-installation/resend-email" => "finish_installation#resend_email"
 
-    resources :users, id: RouteFormat.username, except: [:show] do
-      collection do
-        get "list" => "users#index"
-        get "list/:query" => "users#index"
-        get "ip-info" => "users#ip_info"
-        delete "delete-others-with-same-ip" => "users#delete_other_accounts_with_same_ip"
-        get "total-others-with-same-ip" => "users#total_other_accounts_with_same_ip"
-        put "approve-bulk" => "users#approve_bulk"
-      end
-      delete "penalty_history", constraints: AdminConstraint.new
-      put "suspend"
-      put "delete_posts_batch"
-      put "unsuspend"
-      put "revoke_admin", constraints: AdminConstraint.new
-      put "grant_admin", constraints: AdminConstraint.new
-      put "revoke_moderation", constraints: AdminConstraint.new
-      put "grant_moderation", constraints: AdminConstraint.new
-      put "approve"
-      post "log_out", constraints: AdminConstraint.new
-      put "activate"
-      put "deactivate"
-      put "silence"
-      put "unsilence"
-      put "trust_level"
-      put "trust_level_lock"
-      put "primary_group"
-      post "groups" => "users#add_group", constraints: AdminConstraint.new
-      delete "groups/:group_id" => "users#remove_group", constraints: AdminConstraint.new
-      get "badges"
-      get "leader_requirements" => "users#tl3_requirements"
-      get "tl3_requirements"
-      put "anonymize"
-      post "merge"
-      post "reset_bounce_score"
-      put "disable_second_factor"
-    end
-    get "users/:id.json" => 'users#show', defaults: { format: 'json' }
-    get 'users/:id/:username' => 'users#show', constraints: { username: RouteFormat.username }
-    get 'users/:id/:username/badges' => 'users#show'
-    get 'users/:id/:username/tl3_requirements' => 'users#show'
+    get "pub/check-slug" => "published_pages#check_slug"
+    get "pub/by-topic/:topic_id" => "published_pages#details"
+    put "pub/by-topic/:topic_id" => "published_pages#upsert"
+    delete "pub/by-topic/:topic_id" => "published_pages#destroy"
+    get "pub/:slug" => "published_pages#show"
 
-    post "users/sync_sso" => "users#sync_sso", constraints: AdminConstraint.new
+    resources :directory_items
 
-    resources :impersonate, constraints: AdminConstraint.new
-
-    resources :email, constraints: AdminConstraint.new do
-      collection do
-        post "test"
-        get "sent"
-        get "skipped"
-        get "bounced"
-        get "received"
-        get "rejected"
-        get "/incoming/:id/raw" => "email#raw_email"
-        get "/incoming/:id" => "email#incoming"
-        get "/incoming_from_bounced/:id" => "email#incoming_from_bounced"
-        get "preview-digest" => "email#preview_digest"
-        get "send-digest" => "email#send_digest"
-        get "smtp_should_reject"
-        post "handle_mail"
-        get "advanced-test"
-        post "advanced-test" => "email#advanced_test"
-      end
+    get "site" => "site#site"
+    namespace :site do
+      get "settings"
+      get "custom_html"
+      get "banner"
+      get "emoji"
     end
 
-    scope "/logs" do
-      resources :staff_action_logs,     only: [:index]
-      get 'staff_action_logs/:id/diff' => 'staff_action_logs#diff'
-      resources :screened_emails,       only: [:index, :destroy]
-      resources :screened_ip_addresses, only: [:index, :create, :update, :destroy] do
+    get "site/basic-info" => 'site#basic_info'
+    get "site/statistics" => 'site#statistics'
+    get "site/selectable-avatars" => "site#selectable_avatars"
+
+    get "srv/status" => "forums#status"
+
+    get "wizard" => "wizard#index"
+    get 'wizard/steps' => 'steps#index'
+    get 'wizard/steps/:id' => "wizard#index"
+    put 'wizard/steps/:id' => "steps#update"
+
+    namespace :admin, constraints: StaffConstraint.new do
+      get "" => "admin#index"
+
+      get 'plugins' => 'plugins#index'
+
+      resources :site_settings, constraints: AdminConstraint.new do
         collection do
-          post "roll_up"
+          get "category/:id" => "site_settings#index"
+        end
+
+        put "user_count" => "site_settings#user_count"
+      end
+
+      get "reports" => "reports#index"
+      get "reports/bulk" => "reports#bulk"
+      get "reports/:type" => "reports#show"
+
+      resources :groups, constraints: AdminConstraint.new do
+        collection do
+          get 'bulk'
+          get 'bulk-complete' => 'groups#bulk'
+          put 'bulk' => 'groups#bulk_perform'
+          put "automatic_membership_count" => "groups#automatic_membership_count"
+        end
+        member do
+          put "owners" => "groups#add_owners"
+          delete "owners" => "groups#remove_owner"
         end
       end
-      resources :screened_urls,         only: [:index]
-      resources :watched_words, only: [:index, :create, :update, :destroy] do
+
+      get "groups/:type" => "groups#show", constraints: AdminConstraint.new
+      get "groups/:type/:id" => "groups#show", constraints: AdminConstraint.new
+
+      resources :users, id: RouteFormat.username, except: [:show] do
         collection do
-          get "action/:id" => "watched_words#index"
-          get "action/:id/download" => "watched_words#download"
-          delete "action/:id" => "watched_words#clear_all"
+          get "list" => "users#index"
+          get "list/:query" => "users#index"
+          get "ip-info" => "users#ip_info"
+          delete "delete-others-with-same-ip" => "users#delete_other_accounts_with_same_ip"
+          get "total-others-with-same-ip" => "users#total_other_accounts_with_same_ip"
+          put "approve-bulk" => "users#approve_bulk"
+        end
+        delete "penalty_history", constraints: AdminConstraint.new
+        put "suspend"
+        put "delete_posts_batch"
+        put "unsuspend"
+        put "revoke_admin", constraints: AdminConstraint.new
+        put "grant_admin", constraints: AdminConstraint.new
+        put "revoke_moderation", constraints: AdminConstraint.new
+        put "grant_moderation", constraints: AdminConstraint.new
+        put "approve"
+        post "log_out", constraints: AdminConstraint.new
+        put "activate"
+        put "deactivate"
+        put "silence"
+        put "unsilence"
+        put "trust_level"
+        put "trust_level_lock"
+        put "primary_group"
+        post "groups" => "users#add_group", constraints: AdminConstraint.new
+        delete "groups/:group_id" => "users#remove_group", constraints: AdminConstraint.new
+        get "badges"
+        get "leader_requirements" => "users#tl3_requirements"
+        get "tl3_requirements"
+        put "anonymize"
+        post "merge"
+        post "reset_bounce_score"
+        put "disable_second_factor"
+      end
+      get "users/:id.json" => 'users#show', defaults: { format: 'json' }
+      get 'users/:id/:username' => 'users#show', constraints: { username: RouteFormat.username }
+      get 'users/:id/:username/badges' => 'users#show'
+      get 'users/:id/:username/tl3_requirements' => 'users#show'
+
+      post "users/sync_sso" => "users#sync_sso", constraints: AdminConstraint.new
+
+      resources :impersonate, constraints: AdminConstraint.new
+
+      resources :email, constraints: AdminConstraint.new do
+        collection do
+          post "test"
+          get "sent"
+          get "skipped"
+          get "bounced"
+          get "received"
+          get "rejected"
+          get "/incoming/:id/raw" => "email#raw_email"
+          get "/incoming/:id" => "email#incoming"
+          get "/incoming_from_bounced/:id" => "email#incoming_from_bounced"
+          get "preview-digest" => "email#preview_digest"
+          get "send-digest" => "email#send_digest"
+          get "smtp_should_reject"
+          post "handle_mail"
+          get "advanced-test"
+          post "advanced-test" => "email#advanced_test"
         end
       end
-      post "watched_words/upload" => "watched_words#upload"
-      resources :search_logs,           only: [:index]
-      get 'search_logs/term/' => 'search_logs#term'
-    end
 
-    get "/logs" => "staff_action_logs#index"
-
-    get "customize" => "color_schemes#index", constraints: AdminConstraint.new
-    get "customize/themes" => "themes#index", constraints: AdminConstraint.new
-    get "customize/colors" => "color_schemes#index", constraints: AdminConstraint.new
-    get "customize/colors/:id" => "color_schemes#index", constraints: AdminConstraint.new
-    get "customize/permalinks" => "permalinks#index", constraints: AdminConstraint.new
-    get "customize/embedding" => "embedding#show", constraints: AdminConstraint.new
-    put "customize/embedding" => "embedding#update", constraints: AdminConstraint.new
-
-    resources :themes, constraints: AdminConstraint.new
-
-    post "themes/import" => "themes#import"
-    post "themes/upload_asset" => "themes#upload_asset"
-    post "themes/generate_key_pair" => "themes#generate_key_pair"
-    get "themes/:id/preview" => "themes#preview"
-    get "themes/:id/diff_local_changes" => "themes#diff_local_changes"
-    put "themes/:id/setting" => "themes#update_single_setting"
-
-    scope "/customize", constraints: AdminConstraint.new do
-      resources :user_fields, constraints: AdminConstraint.new
-      resources :emojis, constraints: AdminConstraint.new
-
-      get 'themes/:id/:target/:field_name/edit' => 'themes#index'
-      get 'themes/:id' => 'themes#index'
-      get "themes/:id/export" => "themes#export"
-
-      # They have periods in their URLs often:
-      get 'site_texts'             => 'site_texts#index'
-      get 'site_texts/:id.json'    => 'site_texts#show',   constraints: { id: /[\w.\-\+\%\&]+/i }
-      get 'site_texts/:id'         => 'site_texts#show',   constraints: { id: /[\w.\-\+\%\&]+/i }
-      put 'site_texts/:id.json'    => 'site_texts#update', constraints: { id: /[\w.\-\+\%\&]+/i }
-      put 'site_texts/:id'         => 'site_texts#update', constraints: { id: /[\w.\-\+\%\&]+/i }
-      delete 'site_texts/:id.json' => 'site_texts#revert', constraints: { id: /[\w.\-\+\%\&]+/i }
-      delete 'site_texts/:id'      => 'site_texts#revert', constraints: { id: /[\w.\-\+\%\&]+/i }
-
-      get 'reseed' => 'site_texts#get_reseed_options'
-      post 'reseed' => 'site_texts#reseed'
-
-      get 'email_templates'          => 'email_templates#index'
-      get 'email_templates/(:id)'    => 'email_templates#show',   constraints: { id: /[0-9a-z_.]+/ }
-      put 'email_templates/(:id)'    => 'email_templates#update', constraints: { id: /[0-9a-z_.]+/ }
-      delete 'email_templates/(:id)' => 'email_templates#revert', constraints: { id: /[0-9a-z_.]+/ }
-
-      get 'robots' => 'robots_txt#show'
-      put 'robots.json' => 'robots_txt#update'
-      delete 'robots.json' => 'robots_txt#reset'
-
-      resource :email_style, only: [:show, :update]
-      get 'email_style/:field' => 'email_styles#show', constraints: { field: /html|css/ }
-    end
-
-    resources :embeddable_hosts, constraints: AdminConstraint.new
-    resources :color_schemes, constraints: AdminConstraint.new
-
-    resources :permalinks, constraints: AdminConstraint.new
-
-    get "version_check" => "versions#show"
-
-    get "dashboard" => "dashboard#index"
-    get "dashboard/general" => "dashboard#general"
-    get "dashboard/moderation" => "dashboard#moderation"
-    get "dashboard/security" => "dashboard#security"
-    get "dashboard/reports" => "dashboard#reports"
-
-    resources :dashboard, only: [:index] do
-      collection do
-        get "problems"
-      end
-    end
-
-    resources :api, only: [:index], constraints: AdminConstraint.new do
-      collection do
-        resources :keys, controller: 'api', only: [:index, :show, :update, :create, :destroy] do
-          member do
-            post "revoke" => "api#revoke_key"
-            post "undo-revoke" => "api#undo_revoke_key"
+      scope "/logs" do
+        resources :staff_action_logs,     only: [:index]
+        get 'staff_action_logs/:id/diff' => 'staff_action_logs#diff'
+        resources :screened_emails,       only: [:index, :destroy]
+        resources :screened_ip_addresses, only: [:index, :create, :update, :destroy] do
+          collection do
+            post "roll_up"
           end
         end
-
-        resources :web_hooks
-        get 'web_hook_events/:id' => 'web_hooks#list_events', as: :web_hook_events
-        get 'web_hooks/:id/events' => 'web_hooks#list_events'
-        get 'web_hooks/:id/events/bulk' => 'web_hooks#bulk_events'
-        post 'web_hooks/:web_hook_id/events/:event_id/redeliver' => 'web_hooks#redeliver_event'
-        post 'web_hooks/:id/ping' => 'web_hooks#ping'
+        resources :screened_urls,         only: [:index]
+        resources :watched_words, only: [:index, :create, :update, :destroy] do
+          collection do
+            get "action/:id" => "watched_words#index"
+            get "action/:id/download" => "watched_words#download"
+            delete "action/:id" => "watched_words#clear_all"
+          end
+        end
+        post "watched_words/upload" => "watched_words#upload"
+        resources :search_logs,           only: [:index]
+        get 'search_logs/term/' => 'search_logs#term'
       end
-    end
 
-    resources :backups, only: [:index, :create], constraints: AdminConstraint.new do
-      member do
-        get "" => "backups#show", constraints: { id: RouteFormat.backup }
-        put "" => "backups#email", constraints: { id: RouteFormat.backup }
-        delete "" => "backups#destroy", constraints: { id: RouteFormat.backup }
-        post "restore" => "backups#restore", constraints: { id: RouteFormat.backup }
+      get "/logs" => "staff_action_logs#index"
+
+      get "customize" => "color_schemes#index", constraints: AdminConstraint.new
+      get "customize/themes" => "themes#index", constraints: AdminConstraint.new
+      get "customize/colors" => "color_schemes#index", constraints: AdminConstraint.new
+      get "customize/colors/:id" => "color_schemes#index", constraints: AdminConstraint.new
+      get "customize/permalinks" => "permalinks#index", constraints: AdminConstraint.new
+      get "customize/embedding" => "embedding#show", constraints: AdminConstraint.new
+      put "customize/embedding" => "embedding#update", constraints: AdminConstraint.new
+
+      resources :themes, constraints: AdminConstraint.new
+
+      post "themes/import" => "themes#import"
+      post "themes/upload_asset" => "themes#upload_asset"
+      post "themes/generate_key_pair" => "themes#generate_key_pair"
+      get "themes/:id/preview" => "themes#preview"
+      get "themes/:id/diff_local_changes" => "themes#diff_local_changes"
+      put "themes/:id/setting" => "themes#update_single_setting"
+
+      scope "/customize", constraints: AdminConstraint.new do
+        resources :user_fields, constraints: AdminConstraint.new
+        resources :emojis, constraints: AdminConstraint.new
+
+        get 'themes/:id/:target/:field_name/edit' => 'themes#index'
+        get 'themes/:id' => 'themes#index'
+        get "themes/:id/export" => "themes#export"
+
+        # They have periods in their URLs often:
+        get 'site_texts'             => 'site_texts#index'
+        get 'site_texts/:id.json'    => 'site_texts#show',   constraints: { id: /[\w.\-\+\%\&]+/i }
+        get 'site_texts/:id'         => 'site_texts#show',   constraints: { id: /[\w.\-\+\%\&]+/i }
+        put 'site_texts/:id.json'    => 'site_texts#update', constraints: { id: /[\w.\-\+\%\&]+/i }
+        put 'site_texts/:id'         => 'site_texts#update', constraints: { id: /[\w.\-\+\%\&]+/i }
+        delete 'site_texts/:id.json' => 'site_texts#revert', constraints: { id: /[\w.\-\+\%\&]+/i }
+        delete 'site_texts/:id'      => 'site_texts#revert', constraints: { id: /[\w.\-\+\%\&]+/i }
+
+        get 'reseed' => 'site_texts#get_reseed_options'
+        post 'reseed' => 'site_texts#reseed'
+
+        get 'email_templates'          => 'email_templates#index'
+        get 'email_templates/(:id)'    => 'email_templates#show',   constraints: { id: /[0-9a-z_.]+/ }
+        put 'email_templates/(:id)'    => 'email_templates#update', constraints: { id: /[0-9a-z_.]+/ }
+        delete 'email_templates/(:id)' => 'email_templates#revert', constraints: { id: /[0-9a-z_.]+/ }
+
+        get 'robots' => 'robots_txt#show'
+        put 'robots.json' => 'robots_txt#update'
+        delete 'robots.json' => 'robots_txt#reset'
+
+        resource :email_style, only: [:show, :update]
+        get 'email_style/:field' => 'email_styles#show', constraints: { field: /html|css/ }
       end
-      collection do
-        get "logs" => "backups#logs"
-        get "status" => "backups#status"
-        delete "cancel" => "backups#cancel"
-        post "rollback" => "backups#rollback"
-        put "readonly" => "backups#readonly"
-        get "upload" => "backups#check_backup_chunk"
-        post "upload" => "backups#upload_backup_chunk"
-        get "upload_url" => "backups#create_upload_url"
+
+      resources :embeddable_hosts, constraints: AdminConstraint.new
+      resources :color_schemes, constraints: AdminConstraint.new
+
+      resources :permalinks, constraints: AdminConstraint.new
+
+      get "version_check" => "versions#show"
+
+      get "dashboard" => "dashboard#index"
+      get "dashboard/general" => "dashboard#general"
+      get "dashboard/moderation" => "dashboard#moderation"
+      get "dashboard/security" => "dashboard#security"
+      get "dashboard/reports" => "dashboard#reports"
+
+      resources :dashboard, only: [:index] do
+        collection do
+          get "problems"
+        end
       end
-    end
 
-    resources :badges, constraints: AdminConstraint.new do
-      collection do
-        get "/award/:badge_id" => "badges#award"
-        post "/award/:badge_id" => "badges#mass_award"
-        get "types" => "badges#badge_types"
-        post "badge_groupings" => "badges#save_badge_groupings"
-        post "preview" => "badges#preview"
+      resources :api, only: [:index], constraints: AdminConstraint.new do
+        collection do
+          resources :keys, controller: 'api', only: [:index, :show, :update, :create, :destroy] do
+            member do
+              post "revoke" => "api#revoke_key"
+              post "undo-revoke" => "api#undo_revoke_key"
+            end
+          end
+
+          resources :web_hooks
+          get 'web_hook_events/:id' => 'web_hooks#list_events', as: :web_hook_events
+          get 'web_hooks/:id/events' => 'web_hooks#list_events'
+          get 'web_hooks/:id/events/bulk' => 'web_hooks#bulk_events'
+          post 'web_hooks/:web_hook_id/events/:event_id/redeliver' => 'web_hooks#redeliver_event'
+          post 'web_hooks/:id/ping' => 'web_hooks#ping'
+        end
       end
-    end
 
-  end # admin namespace
-
-  get "email_preferences" => "email#preferences_redirect", :as => "email_preferences_redirect"
-
-  get "email/unsubscribe/:key" => "email#unsubscribe", as: "email_unsubscribe"
-  get "email/unsubscribed" => "email#unsubscribed", as: "email_unsubscribed"
-  post "email/unsubscribe/:key" => "email#perform_unsubscribe", as: "email_perform_unsubscribe"
-
-  get "extra-locales/:bundle" => "extra_locales#show"
-
-  resources :session, id: RouteFormat.username, only: [:create, :destroy, :become] do
-    if !Rails.env.production?
-      get 'become'
-    end
-
-    collection do
-      post "forgot_password"
-    end
-  end
-
-  get "review" => "reviewables#index" # For ember app
-  get "review/:reviewable_id" => "reviewables#show", constraints: { reviewable_id: /\d+/ }
-  get "review/:reviewable_id/explain" => "reviewables#explain", constraints: { reviewable_id: /\d+/ }
-  get "review/topics" => "reviewables#topics"
-  get "review/settings" => "reviewables#settings"
-  put "review/settings" => "reviewables#settings"
-  put "review/:reviewable_id/perform/:action_id" => "reviewables#perform", constraints: {
-    reviewable_id: /\d+/,
-    action_id: /[a-z\_]+/
-  }
-  put "review/:reviewable_id" => "reviewables#update", constraints: { reviewable_id: /\d+/ }
-  delete "review/:reviewable_id" => "reviewables#destroy", constraints: { reviewable_id: /\d+/ }
-
-  resources :reviewable_claimed_topics
-
-  get "session/sso" => "session#sso"
-  get "session/sso_login" => "session#sso_login"
-  get "session/sso_provider" => "session#sso_provider"
-  get "session/current" => "session#current"
-  get "session/csrf" => "session#csrf"
-  get "session/email-login/:token" => "session#email_login_info"
-  post "session/email-login/:token" => "session#email_login"
-  get "session/otp/:token" => "session#one_time_password", constraints: { token: /[0-9a-f]+/ }
-  post "session/otp/:token" => "session#one_time_password", constraints: { token: /[0-9a-f]+/ }
-  get "composer_messages" => "composer_messages#index"
-
-  resources :static
-  post "login" => "static#enter"
-  get "login" => "static#show", id: "login"
-  get "password-reset" => "static#show", id: "password_reset"
-  get "faq" => "static#show", id: "faq"
-  get "tos" => "static#show", id: "tos", as: 'tos'
-  get "privacy" => "static#show", id: "privacy", as: 'privacy'
-  get "signup" => "static#show", id: "signup"
-  get "login-preferences" => "static#show", id: "login"
-
-  %w{guidelines rules conduct}.each do |faq_alias|
-    get faq_alias => "static#show", id: "guidelines", as: faq_alias
-  end
-
-  get "my/*path", to: 'users#my_redirect'
-  get "user_preferences" => "users#user_preferences_redirect"
-  get ".well-known/change-password", to: redirect(relative_url_root + 'my/preferences/account', status: 302)
-
-  get "user-cards" => "users#cards", format: :json
-
-  %w{users u}.each_with_index do |root_path, index|
-    get "#{root_path}" => "users#index", constraints: { format: 'html' }
-
-    resources :users, except: [:index, :new, :show, :update, :destroy], path: root_path do
-      collection do
-        get "check_username"
-        get "is_local_username"
+      resources :backups, only: [:index, :create], constraints: AdminConstraint.new do
+        member do
+          get "" => "backups#show", constraints: { id: RouteFormat.backup }
+          put "" => "backups#email", constraints: { id: RouteFormat.backup }
+          delete "" => "backups#destroy", constraints: { id: RouteFormat.backup }
+          post "restore" => "backups#restore", constraints: { id: RouteFormat.backup }
+        end
+        collection do
+          get "logs" => "backups#logs"
+          get "status" => "backups#status"
+          delete "cancel" => "backups#cancel"
+          post "rollback" => "backups#rollback"
+          put "readonly" => "backups#readonly"
+          get "upload" => "backups#check_backup_chunk"
+          post "upload" => "backups#upload_backup_chunk"
+          get "upload_url" => "backups#create_upload_url"
+        end
       end
-    end
 
-    post "#{root_path}/second_factors" => "users#list_second_factors"
-    put "#{root_path}/second_factor" => "users#update_second_factor"
+      resources :badges, constraints: AdminConstraint.new do
+        collection do
+          get "/award/:badge_id" => "badges#award"
+          post "/award/:badge_id" => "badges#mass_award"
+          get "types" => "badges#badge_types"
+          post "badge_groupings" => "badges#save_badge_groupings"
+          post "preview" => "badges#preview"
+        end
+      end
 
-    post "#{root_path}/create_second_factor_security_key" => "users#create_second_factor_security_key"
-    post "#{root_path}/register_second_factor_security_key" => "users#register_second_factor_security_key"
-    put "#{root_path}/security_key" => "users#update_security_key"
-    post "#{root_path}/create_second_factor_totp" => "users#create_second_factor_totp"
-    post "#{root_path}/enable_second_factor_totp" => "users#enable_second_factor_totp"
-    put "#{root_path}/disable_second_factor" => "users#disable_second_factor"
+    end # admin namespace
 
-    put "#{root_path}/second_factors_backup" => "users#create_second_factor_backup"
+    get "email_preferences" => "email#preferences_redirect", :as => "email_preferences_redirect"
 
-    put "#{root_path}/update-activation-email" => "users#update_activation_email"
-    get "#{root_path}/hp" => "users#get_honeypot_value"
-    post "#{root_path}/email-login" => "users#email_login"
-    get "#{root_path}/admin-login" => "users#admin_login"
-    put "#{root_path}/admin-login" => "users#admin_login"
-    post "#{root_path}/toggle-anon" => "users#toggle_anon"
-    post "#{root_path}/read-faq" => "users#read_faq"
-    get "#{root_path}/search/users" => "users#search_users"
+    get "email/unsubscribe/:key" => "email#unsubscribe", as: "email_unsubscribe"
+    get "email/unsubscribed" => "email#unsubscribed", as: "email_unsubscribed"
+    post "email/unsubscribe/:key" => "email#perform_unsubscribe", as: "email_perform_unsubscribe"
 
-    get({ "#{root_path}/account-created/" => "users#account_created" }.merge(index == 1 ? { as: :users_account_created } : { as: :old_account_created }))
+    get "extra-locales/:bundle" => "extra_locales#show"
 
-    get "#{root_path}/account-created/resent" => "users#account_created"
-    get "#{root_path}/account-created/edit-email" => "users#account_created"
-    get({ "#{root_path}/password-reset/:token" => "users#password_reset_show" }.merge(index == 1 ? { as: :password_reset_token } : {}))
-    get "#{root_path}/confirm-email-token/:token" => "users#confirm_email_token", constraints: { format: 'json' }
-    put "#{root_path}/password-reset/:token" => "users#password_reset_update"
-    get "#{root_path}/activate-account/:token" => "users#activate_account"
-    put({ "#{root_path}/activate-account/:token" => "users#perform_account_activation" }.merge(index == 1 ? { as: 'perform_activate_account' } : {}))
-
-    get "#{root_path}/confirm-old-email/:token" => "users_email#show_confirm_old_email"
-    put "#{root_path}/confirm-old-email" => "users_email#confirm_old_email"
-
-    get "#{root_path}/confirm-new-email/:token" => "users_email#show_confirm_new_email"
-    put "#{root_path}/confirm-new-email" => "users_email#confirm_new_email"
-
-    get({
-      "#{root_path}/confirm-admin/:token" => "users#confirm_admin",
-      constraints: { token: /[0-9a-f]+/ }
-    }.merge(index == 1 ? { as: 'confirm_admin' } : {}))
-    post "#{root_path}/confirm-admin/:token" => "users#confirm_admin", constraints: { token: /[0-9a-f]+/ }
-    get "#{root_path}/:username/private-messages" => "user_actions#private_messages", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/private-messages/:filter" => "user_actions#private_messages", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/messages" => "user_actions#private_messages", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/messages/:filter" => "user_actions#private_messages", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/messages/group/:group_name" => "user_actions#private_messages", constraints: { username: RouteFormat.username, group_name: RouteFormat.username }
-    get "#{root_path}/:username/messages/group/:group_name/archive" => "user_actions#private_messages", constraints: { username: RouteFormat.username, group_name: RouteFormat.username }
-    get "#{root_path}/:username/messages/tags/:tag_id" => "user_actions#private_messages", constraints: StaffConstraint.new
-    get "#{root_path}/:username.json" => "users#show", constraints: { username: RouteFormat.username }, defaults: { format: :json }
-    get({ "#{root_path}/:username" => "users#show", constraints: { username: RouteFormat.username } }.merge(index == 1 ? { as: 'user' } : {}))
-    put "#{root_path}/:username" => "users#update", constraints: { username: RouteFormat.username }, defaults: { format: :json }
-    get "#{root_path}/:username/emails" => "users#check_emails", constraints: { username: RouteFormat.username }
-    get({ "#{root_path}/:username/preferences" => "users#preferences", constraints: { username: RouteFormat.username } }.merge(index == 1 ? { as: :email_preferences } : {}))
-    get "#{root_path}/:username/preferences/email" => "users_email#index", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/preferences/account" => "users#preferences", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/preferences/profile" => "users#preferences", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/preferences/emails" => "users#preferences", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/preferences/notifications" => "users#preferences", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/preferences/categories" => "users#preferences", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/preferences/users" => "users#preferences", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/preferences/tags" => "users#preferences", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/preferences/interface" => "users#preferences", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/preferences/apps" => "users#preferences", constraints: { username: RouteFormat.username }
-    put "#{root_path}/:username/preferences/email" => "users_email#update", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/preferences/badge_title" => "users#preferences", constraints: { username: RouteFormat.username }
-    put "#{root_path}/:username/preferences/badge_title" => "users#badge_title", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/preferences/username" => "users#preferences", constraints: { username: RouteFormat.username }
-    put "#{root_path}/:username/preferences/username" => "users#username", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/preferences/second-factor" => "users#preferences", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/preferences/second-factor-backup" => "users#preferences", constraints: { username: RouteFormat.username }
-    delete "#{root_path}/:username/preferences/user_image" => "users#destroy_user_image", constraints: { username: RouteFormat.username }
-    put "#{root_path}/:username/preferences/avatar/pick" => "users#pick_avatar", constraints: { username: RouteFormat.username }
-    put "#{root_path}/:username/preferences/avatar/select" => "users#select_avatar", constraints: { username: RouteFormat.username }
-    post "#{root_path}/:username/preferences/revoke-account" => "users#revoke_account", constraints: { username: RouteFormat.username }
-    post "#{root_path}/:username/preferences/revoke-auth-token" => "users#revoke_auth_token", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/staff-info" => "users#staff_info", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/summary" => "users#summary", constraints: { username: RouteFormat.username }
-    put "#{root_path}/:username/notification_level" => "users#notification_level", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/invited" => "users#invited", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/invited_count" => "users#invited_count", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/invited/:filter" => "users#invited", constraints: { username: RouteFormat.username }
-    post "#{root_path}/action/send_activation_email" => "users#send_activation_email"
-    get "#{root_path}/:username/summary" => "users#show", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/activity/topics.rss" => "list#user_topics_feed", format: :rss, constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/activity.rss" => "posts#user_posts_feed", format: :rss, constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/activity.json" => "posts#user_posts_feed", format: :json, constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/activity" => "users#show", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/activity/:filter" => "users#show", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/badges" => "users#badges", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/bookmarks" => "users#bookmarks", constraints: { username: RouteFormat.username, format: /(json|ics)/ }
-    get "#{root_path}/:username/notifications" => "users#show", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/notifications/:filter" => "users#show", constraints: { username: RouteFormat.username }
-    delete "#{root_path}/:username" => "users#destroy", constraints: { username: RouteFormat.username }
-    get "#{root_path}/by-external/:external_id" => "users#show", constraints: { external_id: /[^\/]+/ }
-    get "#{root_path}/:username/flagged-posts" => "users#show", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/deleted-posts" => "users#show", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/topic-tracking-state" => "users#topic_tracking_state", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/profile-hidden" => "users#profile_hidden"
-    put "#{root_path}/:username/feature-topic" => "users#feature_topic", constraints: { username: RouteFormat.username }
-    put "#{root_path}/:username/clear-featured-topic" => "users#clear_featured_topic", constraints: { username: RouteFormat.username }
-    get "#{root_path}/:username/card.json" => "users#show_card", format: :json, constraints: { username: RouteFormat.username }
-  end
-
-  get "user-badges/:username.json" => "user_badges#username", constraints: { username: RouteFormat.username }, defaults: { format: :json }
-  get "user-badges/:username" => "user_badges#username", constraints: { username: RouteFormat.username }
-
-  post "user_avatar/:username/refresh_gravatar" => "user_avatars#refresh_gravatar", constraints: { username: RouteFormat.username }
-  get "letter_avatar/:username/:size/:version.png" => "user_avatars#show_letter", constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: RouteFormat.username, format: :png }
-  get "user_avatar/:hostname/:username/:size/:version.png" => "user_avatars#show", constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: RouteFormat.username, format: :png }
-
-  get "letter_avatar_proxy/:version/letter/:letter/:color/:size.png" => "user_avatars#show_proxy_letter", constraints: { format: :png }
-
-  get "svg-sprite/:hostname/svg-:theme_ids-:version.js" => "svg_sprite#show", constraints: { hostname: /[\w\.-]+/, version: /\h{40}/, theme_ids: /([0-9]+(,[0-9]+)*)?/, format: :js }
-  get "svg-sprite/search/:keyword" => "svg_sprite#search", format: false, constraints: { keyword: /[-a-z0-9\s\%]+/ }
-  get "svg-sprite/picker-search" => "svg_sprite#icon_picker_search", defaults: { format: :json }
-  get "svg-sprite/:hostname/icon(/:color)/:name.svg" => "svg_sprite#svg_icon", constraints: { hostname: /[\w\.-]+/, name: /[-a-z0-9\s\%]+/, color: /(\h{3}{1,2})/, format: :svg }
-
-  get "highlight-js/:hostname/:version.js" => "highlight_js#show", constraints: { hostname: /[\w\.-]+/, format: :js }
-
-  get "stylesheets/:name.css.map" => "stylesheets#show_source_map", constraints: { name: /[-a-z0-9_]+/ }
-  get "stylesheets/:name.css" => "stylesheets#show", constraints: { name: /[-a-z0-9_]+/ }
-  get "theme-javascripts/:digest.js" => "theme_javascripts#show", constraints: { digest: /\h{40}/ }
-
-  post "uploads/lookup-metadata" => "uploads#metadata"
-  post "uploads" => "uploads#create"
-  post "uploads/lookup-urls" => "uploads#lookup_urls"
-
-  # used to download original images
-  get "uploads/:site/:sha(.:extension)" => "uploads#show", constraints: { site: /\w+/, sha: /\h{40}/, extension: /[a-z0-9\._]+/i }
-  get "uploads/short-url/:base62(.:extension)" => "uploads#show_short", constraints: { site: /\w+/, base62: /[a-zA-Z0-9]+/, extension: /[a-z0-9\._]+/i }, as: :upload_short
-  # used to download attachments
-  get "uploads/:site/original/:tree:sha(.:extension)" => "uploads#show", constraints: { site: /\w+/, tree: /([a-z0-9]+\/)+/i, sha: /\h{40}/, extension: /[a-z0-9\._]+/i }
-  if Rails.env.test?
-    get "uploads/:site/test_:index/original/:tree:sha(.:extension)" => "uploads#show", constraints: { site: /\w+/, index: /\d+/, tree: /([a-z0-9]+\/)+/i, sha: /\h{40}/, extension: /[a-z0-9\._]+/i }
-  end
-  # used to download attachments (old route)
-  get "uploads/:site/:id/:sha" => "uploads#show", constraints: { site: /\w+/, id: /\d+/, sha: /\h{16}/, format: /.*/ }
-  get "secure-media-uploads/*path(.:extension)" => "uploads#show_secure", constraints: { extension: /[a-z0-9\._]+/i }
-
-  get "posts" => "posts#latest", id: "latest_posts", constraints: { format: /(json|rss)/ }
-  get "private-posts" => "posts#latest", id: "private_posts", constraints: { format: /(json|rss)/ }
-  get "posts/by_number/:topic_id/:post_number" => "posts#by_number"
-  get "posts/by-date/:topic_id/:date" => "posts#by_date"
-  get "posts/:id/reply-history" => "posts#reply_history"
-  get "posts/:id/reply-ids"     => "posts#reply_ids"
-  get "posts/:id/reply-ids/all" => "posts#all_reply_ids"
-  get "posts/:username/deleted" => "posts#deleted_posts", constraints: { username: RouteFormat.username }
-  get "posts/:username/flagged" => "posts#flagged_posts", constraints: { username: RouteFormat.username }
-
-  %w{groups g}.each do |root_path|
-    resources :groups, id: RouteFormat.username, path: root_path do
-      get "posts.rss" => "groups#posts_feed", format: :rss
-      get "mentions.rss" => "groups#mentions_feed", format: :rss
-
-      get 'members'
-      get 'posts'
-      get 'mentions'
-      get 'counts'
-      get 'mentionable'
-      get 'messageable'
-      get 'logs' => 'groups#histories'
+    resources :session, id: RouteFormat.username, only: [:create, :destroy, :become] do
+      if !Rails.env.production?
+        get 'become'
+      end
 
       collection do
-        get "check-name" => 'groups#check_name'
-        get 'custom/new' => 'groups#new', constraints: AdminConstraint.new
-        get "search" => "groups#search"
+        post "forgot_password"
+      end
+    end
+
+    get "review" => "reviewables#index" # For ember app
+    get "review/:reviewable_id" => "reviewables#show", constraints: { reviewable_id: /\d+/ }
+    get "review/:reviewable_id/explain" => "reviewables#explain", constraints: { reviewable_id: /\d+/ }
+    get "review/topics" => "reviewables#topics"
+    get "review/settings" => "reviewables#settings"
+    put "review/settings" => "reviewables#settings"
+    put "review/:reviewable_id/perform/:action_id" => "reviewables#perform", constraints: {
+      reviewable_id: /\d+/,
+      action_id: /[a-z\_]+/
+    }
+    put "review/:reviewable_id" => "reviewables#update", constraints: { reviewable_id: /\d+/ }
+    delete "review/:reviewable_id" => "reviewables#destroy", constraints: { reviewable_id: /\d+/ }
+
+    resources :reviewable_claimed_topics
+
+    get "session/sso" => "session#sso"
+    get "session/sso_login" => "session#sso_login"
+    get "session/sso_provider" => "session#sso_provider"
+    get "session/current" => "session#current"
+    get "session/csrf" => "session#csrf"
+    get "session/email-login/:token" => "session#email_login_info"
+    post "session/email-login/:token" => "session#email_login"
+    get "session/otp/:token" => "session#one_time_password", constraints: { token: /[0-9a-f]+/ }
+    post "session/otp/:token" => "session#one_time_password", constraints: { token: /[0-9a-f]+/ }
+    get "composer_messages" => "composer_messages#index"
+
+    resources :static
+    post "login" => "static#enter"
+    get "login" => "static#show", id: "login"
+    get "password-reset" => "static#show", id: "password_reset"
+    get "faq" => "static#show", id: "faq"
+    get "tos" => "static#show", id: "tos", as: 'tos'
+    get "privacy" => "static#show", id: "privacy", as: 'privacy'
+    get "signup" => "static#show", id: "signup"
+    get "login-preferences" => "static#show", id: "login"
+
+    %w{guidelines rules conduct}.each do |faq_alias|
+      get faq_alias => "static#show", id: "guidelines", as: faq_alias
+    end
+
+    get "my/*path", to: 'users#my_redirect'
+    get "user_preferences" => "users#user_preferences_redirect"
+    get ".well-known/change-password", to: redirect(relative_url_root + 'my/preferences/account', status: 302)
+
+    get "user-cards" => "users#cards", format: :json
+
+    %w{users u}.each_with_index do |root_path, index|
+      get "#{root_path}" => "users#index", constraints: { format: 'html' }
+
+      resources :users, except: [:index, :new, :show, :update, :destroy], path: root_path do
+        collection do
+          get "check_username"
+          get "is_local_username"
+        end
       end
 
-      member do
-        %w{
-          activity
-          activity/:filter
-          requests
-          messages
-          messages/inbox
-          messages/archive
-          manage
-          manage/profile
-          manage/members
-          manage/membership
-          manage/interaction
-          manage/logs
-        }.each do |path|
-          get path => 'groups#show'
+      post "#{root_path}/second_factors" => "users#list_second_factors"
+      put "#{root_path}/second_factor" => "users#update_second_factor"
+
+      post "#{root_path}/create_second_factor_security_key" => "users#create_second_factor_security_key"
+      post "#{root_path}/register_second_factor_security_key" => "users#register_second_factor_security_key"
+      put "#{root_path}/security_key" => "users#update_security_key"
+      post "#{root_path}/create_second_factor_totp" => "users#create_second_factor_totp"
+      post "#{root_path}/enable_second_factor_totp" => "users#enable_second_factor_totp"
+      put "#{root_path}/disable_second_factor" => "users#disable_second_factor"
+
+      put "#{root_path}/second_factors_backup" => "users#create_second_factor_backup"
+
+      put "#{root_path}/update-activation-email" => "users#update_activation_email"
+      get "#{root_path}/hp" => "users#get_honeypot_value"
+      post "#{root_path}/email-login" => "users#email_login"
+      get "#{root_path}/admin-login" => "users#admin_login"
+      put "#{root_path}/admin-login" => "users#admin_login"
+      post "#{root_path}/toggle-anon" => "users#toggle_anon"
+      post "#{root_path}/read-faq" => "users#read_faq"
+      get "#{root_path}/search/users" => "users#search_users"
+
+      get({ "#{root_path}/account-created/" => "users#account_created" }.merge(index == 1 ? { as: :users_account_created } : { as: :old_account_created }))
+
+      get "#{root_path}/account-created/resent" => "users#account_created"
+      get "#{root_path}/account-created/edit-email" => "users#account_created"
+      get({ "#{root_path}/password-reset/:token" => "users#password_reset_show" }.merge(index == 1 ? { as: :password_reset_token } : {}))
+      get "#{root_path}/confirm-email-token/:token" => "users#confirm_email_token", constraints: { format: 'json' }
+      put "#{root_path}/password-reset/:token" => "users#password_reset_update"
+      get "#{root_path}/activate-account/:token" => "users#activate_account"
+      put({ "#{root_path}/activate-account/:token" => "users#perform_account_activation" }.merge(index == 1 ? { as: 'perform_activate_account' } : {}))
+
+      get "#{root_path}/confirm-old-email/:token" => "users_email#show_confirm_old_email"
+      put "#{root_path}/confirm-old-email" => "users_email#confirm_old_email"
+
+      get "#{root_path}/confirm-new-email/:token" => "users_email#show_confirm_new_email"
+      put "#{root_path}/confirm-new-email" => "users_email#confirm_new_email"
+
+      get({
+        "#{root_path}/confirm-admin/:token" => "users#confirm_admin",
+        constraints: { token: /[0-9a-f]+/ }
+      }.merge(index == 1 ? { as: 'confirm_admin' } : {}))
+      post "#{root_path}/confirm-admin/:token" => "users#confirm_admin", constraints: { token: /[0-9a-f]+/ }
+      get "#{root_path}/:username/private-messages" => "user_actions#private_messages", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/private-messages/:filter" => "user_actions#private_messages", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/messages" => "user_actions#private_messages", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/messages/:filter" => "user_actions#private_messages", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/messages/group/:group_name" => "user_actions#private_messages", constraints: { username: RouteFormat.username, group_name: RouteFormat.username }
+      get "#{root_path}/:username/messages/group/:group_name/archive" => "user_actions#private_messages", constraints: { username: RouteFormat.username, group_name: RouteFormat.username }
+      get "#{root_path}/:username/messages/tags/:tag_id" => "user_actions#private_messages", constraints: StaffConstraint.new
+      get "#{root_path}/:username.json" => "users#show", constraints: { username: RouteFormat.username }, defaults: { format: :json }
+      get({ "#{root_path}/:username" => "users#show", constraints: { username: RouteFormat.username } }.merge(index == 1 ? { as: 'user' } : {}))
+      put "#{root_path}/:username" => "users#update", constraints: { username: RouteFormat.username }, defaults: { format: :json }
+      get "#{root_path}/:username/emails" => "users#check_emails", constraints: { username: RouteFormat.username }
+      get({ "#{root_path}/:username/preferences" => "users#preferences", constraints: { username: RouteFormat.username } }.merge(index == 1 ? { as: :email_preferences } : {}))
+      get "#{root_path}/:username/preferences/email" => "users_email#index", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/preferences/account" => "users#preferences", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/preferences/profile" => "users#preferences", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/preferences/emails" => "users#preferences", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/preferences/notifications" => "users#preferences", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/preferences/categories" => "users#preferences", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/preferences/users" => "users#preferences", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/preferences/tags" => "users#preferences", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/preferences/interface" => "users#preferences", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/preferences/apps" => "users#preferences", constraints: { username: RouteFormat.username }
+      put "#{root_path}/:username/preferences/email" => "users_email#update", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/preferences/badge_title" => "users#preferences", constraints: { username: RouteFormat.username }
+      put "#{root_path}/:username/preferences/badge_title" => "users#badge_title", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/preferences/username" => "users#preferences", constraints: { username: RouteFormat.username }
+      put "#{root_path}/:username/preferences/username" => "users#username", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/preferences/second-factor" => "users#preferences", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/preferences/second-factor-backup" => "users#preferences", constraints: { username: RouteFormat.username }
+      delete "#{root_path}/:username/preferences/user_image" => "users#destroy_user_image", constraints: { username: RouteFormat.username }
+      put "#{root_path}/:username/preferences/avatar/pick" => "users#pick_avatar", constraints: { username: RouteFormat.username }
+      put "#{root_path}/:username/preferences/avatar/select" => "users#select_avatar", constraints: { username: RouteFormat.username }
+      post "#{root_path}/:username/preferences/revoke-account" => "users#revoke_account", constraints: { username: RouteFormat.username }
+      post "#{root_path}/:username/preferences/revoke-auth-token" => "users#revoke_auth_token", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/staff-info" => "users#staff_info", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/summary" => "users#summary", constraints: { username: RouteFormat.username }
+      put "#{root_path}/:username/notification_level" => "users#notification_level", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/invited" => "users#invited", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/invited_count" => "users#invited_count", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/invited/:filter" => "users#invited", constraints: { username: RouteFormat.username }
+      post "#{root_path}/action/send_activation_email" => "users#send_activation_email"
+      get "#{root_path}/:username/summary" => "users#show", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/activity/topics.rss" => "list#user_topics_feed", format: :rss, constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/activity.rss" => "posts#user_posts_feed", format: :rss, constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/activity.json" => "posts#user_posts_feed", format: :json, constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/activity" => "users#show", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/activity/:filter" => "users#show", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/badges" => "users#badges", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/bookmarks" => "users#bookmarks", constraints: { username: RouteFormat.username, format: /(json|ics)/ }
+      get "#{root_path}/:username/notifications" => "users#show", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/notifications/:filter" => "users#show", constraints: { username: RouteFormat.username }
+      delete "#{root_path}/:username" => "users#destroy", constraints: { username: RouteFormat.username }
+      get "#{root_path}/by-external/:external_id" => "users#show", constraints: { external_id: /[^\/]+/ }
+      get "#{root_path}/:username/flagged-posts" => "users#show", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/deleted-posts" => "users#show", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/topic-tracking-state" => "users#topic_tracking_state", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/profile-hidden" => "users#profile_hidden"
+      put "#{root_path}/:username/feature-topic" => "users#feature_topic", constraints: { username: RouteFormat.username }
+      put "#{root_path}/:username/clear-featured-topic" => "users#clear_featured_topic", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/card.json" => "users#show_card", format: :json, constraints: { username: RouteFormat.username }
+    end
+
+    get "user-badges/:username.json" => "user_badges#username", constraints: { username: RouteFormat.username }, defaults: { format: :json }
+    get "user-badges/:username" => "user_badges#username", constraints: { username: RouteFormat.username }
+
+    post "user_avatar/:username/refresh_gravatar" => "user_avatars#refresh_gravatar", constraints: { username: RouteFormat.username }
+    get "letter_avatar/:username/:size/:version.png" => "user_avatars#show_letter", constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: RouteFormat.username, format: :png }
+    get "user_avatar/:hostname/:username/:size/:version.png" => "user_avatars#show", constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: RouteFormat.username, format: :png }
+
+    get "letter_avatar_proxy/:version/letter/:letter/:color/:size.png" => "user_avatars#show_proxy_letter", constraints: { format: :png }
+
+    get "svg-sprite/:hostname/svg-:theme_ids-:version.js" => "svg_sprite#show", constraints: { hostname: /[\w\.-]+/, version: /\h{40}/, theme_ids: /([0-9]+(,[0-9]+)*)?/, format: :js }
+    get "svg-sprite/search/:keyword" => "svg_sprite#search", format: false, constraints: { keyword: /[-a-z0-9\s\%]+/ }
+    get "svg-sprite/picker-search" => "svg_sprite#icon_picker_search", defaults: { format: :json }
+    get "svg-sprite/:hostname/icon(/:color)/:name.svg" => "svg_sprite#svg_icon", constraints: { hostname: /[\w\.-]+/, name: /[-a-z0-9\s\%]+/, color: /(\h{3}{1,2})/, format: :svg }
+
+    get "highlight-js/:hostname/:version.js" => "highlight_js#show", constraints: { hostname: /[\w\.-]+/, format: :js }
+
+    get "stylesheets/:name.css.map" => "stylesheets#show_source_map", constraints: { name: /[-a-z0-9_]+/ }
+    get "stylesheets/:name.css" => "stylesheets#show", constraints: { name: /[-a-z0-9_]+/ }
+    get "theme-javascripts/:digest.js" => "theme_javascripts#show", constraints: { digest: /\h{40}/ }
+
+    post "uploads/lookup-metadata" => "uploads#metadata"
+    post "uploads" => "uploads#create"
+    post "uploads/lookup-urls" => "uploads#lookup_urls"
+
+    # used to download original images
+    get "uploads/:site/:sha(.:extension)" => "uploads#show", constraints: { site: /\w+/, sha: /\h{40}/, extension: /[a-z0-9\._]+/i }
+    get "uploads/short-url/:base62(.:extension)" => "uploads#show_short", constraints: { site: /\w+/, base62: /[a-zA-Z0-9]+/, extension: /[a-z0-9\._]+/i }, as: :upload_short
+    # used to download attachments
+    get "uploads/:site/original/:tree:sha(.:extension)" => "uploads#show", constraints: { site: /\w+/, tree: /([a-z0-9]+\/)+/i, sha: /\h{40}/, extension: /[a-z0-9\._]+/i }
+    if Rails.env.test?
+      get "uploads/:site/test_:index/original/:tree:sha(.:extension)" => "uploads#show", constraints: { site: /\w+/, index: /\d+/, tree: /([a-z0-9]+\/)+/i, sha: /\h{40}/, extension: /[a-z0-9\._]+/i }
+    end
+    # used to download attachments (old route)
+    get "uploads/:site/:id/:sha" => "uploads#show", constraints: { site: /\w+/, id: /\d+/, sha: /\h{16}/, format: /.*/ }
+    get "secure-media-uploads/*path(.:extension)" => "uploads#show_secure", constraints: { extension: /[a-z0-9\._]+/i }
+
+    get "posts" => "posts#latest", id: "latest_posts", constraints: { format: /(json|rss)/ }
+    get "private-posts" => "posts#latest", id: "private_posts", constraints: { format: /(json|rss)/ }
+    get "posts/by_number/:topic_id/:post_number" => "posts#by_number"
+    get "posts/by-date/:topic_id/:date" => "posts#by_date"
+    get "posts/:id/reply-history" => "posts#reply_history"
+    get "posts/:id/reply-ids"     => "posts#reply_ids"
+    get "posts/:id/reply-ids/all" => "posts#all_reply_ids"
+    get "posts/:username/deleted" => "posts#deleted_posts", constraints: { username: RouteFormat.username }
+    get "posts/:username/flagged" => "posts#flagged_posts", constraints: { username: RouteFormat.username }
+
+    %w{groups g}.each do |root_path|
+      resources :groups, id: RouteFormat.username, path: root_path do
+        get "posts.rss" => "groups#posts_feed", format: :rss
+        get "mentions.rss" => "groups#mentions_feed", format: :rss
+
+        get 'members'
+        get 'posts'
+        get 'mentions'
+        get 'counts'
+        get 'mentionable'
+        get 'messageable'
+        get 'logs' => 'groups#histories'
+
+        collection do
+          get "check-name" => 'groups#check_name'
+          get 'custom/new' => 'groups#new', constraints: AdminConstraint.new
+          get "search" => "groups#search"
         end
 
-        put "members" => "groups#add_members"
-        delete "members" => "groups#remove_member"
-        post "request_membership" => "groups#request_membership"
-        put "handle_membership_request" => "groups#handle_membership_request"
-        post "notifications" => "groups#set_notifications"
+        member do
+          %w{
+            activity
+            activity/:filter
+            requests
+            messages
+            messages/inbox
+            messages/archive
+            manage
+            manage/profile
+            manage/members
+            manage/membership
+            manage/interaction
+            manage/logs
+          }.each do |path|
+            get path => 'groups#show'
+          end
+
+          put "members" => "groups#add_members"
+          delete "members" => "groups#remove_member"
+          post "request_membership" => "groups#request_membership"
+          put "handle_membership_request" => "groups#handle_membership_request"
+          post "notifications" => "groups#set_notifications"
+        end
       end
     end
-  end
 
-  # aliases so old API code works
-  delete "admin/groups/:id/members" => "groups#remove_member", constraints: AdminConstraint.new
-  put "admin/groups/:id/members" => "groups#add_members", constraints: AdminConstraint.new
+    # aliases so old API code works
+    delete "admin/groups/:id/members" => "groups#remove_member", constraints: AdminConstraint.new
+    put "admin/groups/:id/members" => "groups#add_members", constraints: AdminConstraint.new
 
-  resources :posts do
-    delete "bookmark", to: "posts#destroy_bookmark"
-    put "wiki"
-    put "post_type"
-    put "rebake"
-    put "unhide"
-    put "locked"
-    put "notice"
-    get "replies"
-    get "revisions/latest" => "posts#latest_revision"
-    get "revisions/:revision" => "posts#revisions", constraints: { revision: /\d+/ }
-    put "revisions/:revision/hide" => "posts#hide_revision", constraints: { revision: /\d+/ }
-    put "revisions/:revision/show" => "posts#show_revision", constraints: { revision: /\d+/ }
-    put "revisions/:revision/revert" => "posts#revert", constraints: { revision: /\d+/ }
-    put "recover"
-    collection do
-      delete "destroy_many"
-      put "merge_posts"
+    resources :posts do
+      delete "bookmark", to: "posts#destroy_bookmark"
+      put "wiki"
+      put "post_type"
+      put "rebake"
+      put "unhide"
+      put "locked"
+      put "notice"
+      get "replies"
+      get "revisions/latest" => "posts#latest_revision"
+      get "revisions/:revision" => "posts#revisions", constraints: { revision: /\d+/ }
+      put "revisions/:revision/hide" => "posts#hide_revision", constraints: { revision: /\d+/ }
+      put "revisions/:revision/show" => "posts#show_revision", constraints: { revision: /\d+/ }
+      put "revisions/:revision/revert" => "posts#revert", constraints: { revision: /\d+/ }
+      put "recover"
+      collection do
+        delete "destroy_many"
+        put "merge_posts"
+      end
     end
-  end
 
-  resources :bookmarks, only: %i[create destroy update]
+    resources :bookmarks, only: %i[create destroy update]
 
-  resources :notifications, except: :show do
-    collection do
-      put 'mark-read' => 'notifications#mark_read'
-      # creating an alias cause the api was extended to mark a single notification
-      # this allows us to cleanly target it
-      put 'read' => 'notifications#mark_read'
+    resources :notifications, except: :show do
+      collection do
+        put 'mark-read' => 'notifications#mark_read'
+        # creating an alias cause the api was extended to mark a single notification
+        # this allows us to cleanly target it
+        put 'read' => 'notifications#mark_read'
+      end
     end
-  end
 
-  match "/auth/failure", to: "users/omniauth_callbacks#failure", via: [:get, :post]
-  get "/auth/:provider", to: "users/omniauth_callbacks#confirm_request"
-  match "/auth/:provider/callback", to: "users/omniauth_callbacks#complete", via: [:get, :post]
-  get "/associate/:token", to: "users/associate_accounts#connect_info", constraints: { token: /\h{32}/ }
-  post "/associate/:token", to: "users/associate_accounts#connect", constraints: { token: /\h{32}/ }
+    match "/auth/failure", to: "users/omniauth_callbacks#failure", via: [:get, :post]
+    get "/auth/:provider", to: "users/omniauth_callbacks#confirm_request"
+    match "/auth/:provider/callback", to: "users/omniauth_callbacks#complete", via: [:get, :post]
+    get "/associate/:token", to: "users/associate_accounts#connect_info", constraints: { token: /\h{32}/ }
+    post "/associate/:token", to: "users/associate_accounts#connect", constraints: { token: /\h{32}/ }
 
-  resources :clicks do
-    collection do
-      post "track"
+    resources :clicks do
+      collection do
+        post "track"
+      end
     end
-  end
 
-  get "excerpt" => "excerpt#show"
+    get "excerpt" => "excerpt#show"
 
-  resources :post_action_users
-  resources :post_readers, only: %i[index]
-  resources :post_actions do
-    collection do
-      get "users"
-      post "defer_flags"
+    resources :post_action_users
+    resources :post_readers, only: %i[index]
+    resources :post_actions do
+      collection do
+        get "users"
+        post "defer_flags"
+      end
     end
-  end
-  resources :user_actions
+    resources :user_actions
 
-  resources :badges, only: [:index]
-  get "/badges/:id(/:slug)" => "badges#show", constraints: { format: /(json|html|rss)/ }
-  resources :user_badges, only: [:index, :create, :destroy]
+    resources :badges, only: [:index]
+    get "/badges/:id(/:slug)" => "badges#show", constraints: { format: /(json|html|rss)/ }
+    resources :user_badges, only: [:index, :create, :destroy]
 
-  get '/c', to: redirect(relative_url_root + 'categories')
+    get '/c', to: redirect(relative_url_root + 'categories')
 
-  resources :categories, except: [:show, :new, :edit]
-  post "categories/reorder" => "categories#reorder"
+    resources :categories, except: [:show, :new, :edit]
+    post "categories/reorder" => "categories#reorder"
 
-  scope path: 'category/:category_id' do
-    post "/move" => "categories#move"
-    post "/notifications" => "categories#set_notifications"
-    put "/slug" => "categories#update_slug"
-  end
+    scope path: 'category/:category_id' do
+      post "/move" => "categories#move"
+      post "/notifications" => "categories#set_notifications"
+      put "/slug" => "categories#update_slug"
+    end
 
-  get "category/*path" => "categories#redirect"
+    get "category/*path" => "categories#redirect"
 
-  get "categories_and_latest" => "categories#categories_and_latest"
-  get "categories_and_top" => "categories#categories_and_top"
+    get "categories_and_latest" => "categories#categories_and_latest"
+    get "categories_and_top" => "categories#categories_and_top"
 
-  get "c/:id/show" => "categories#show"
+    get "c/:id/show" => "categories#show"
 
-  get "c/:category_slug/find_by_slug" => "categories#find_by_slug"
-  get "c/:parent_category_slug/:category_slug/find_by_slug" => "categories#find_by_slug"
+    get "c/:category_slug/find_by_slug" => "categories#find_by_slug"
+    get "c/:parent_category_slug/:category_slug/find_by_slug" => "categories#find_by_slug"
 
-  get "c/*category_slug_path_with_id.rss" => "list#category_feed", format: :rss
-  scope path: 'c/*category_slug_path_with_id' do
-    get "/none" => "list#category_none_latest"
-    get "/none/l/top" => "list#category_none_top", as: "category_none_top"
-    get "/l/top" => "list#category_top", as: "category_top"
+    get "c/*category_slug_path_with_id.rss" => "list#category_feed", format: :rss
+    scope path: 'c/*category_slug_path_with_id' do
+      get "/none" => "list#category_none_latest"
+      get "/none/l/top" => "list#category_none_top", as: "category_none_top"
+      get "/l/top" => "list#category_top", as: "category_top"
+
+      TopTopic.periods.each do |period|
+        get "/none/l/top/#{period}" => "list#category_none_top_#{period}", as: "category_none_top_#{period}"
+        get "/l/top/#{period}" => "list#category_top_#{period}", as: "category_top_#{period}"
+      end
+
+      Discourse.filters.each do |filter|
+        get "/none/l/#{filter}" => "list#category_none_#{filter}", as: "category_none_#{filter}"
+        get "/l/#{filter}" => "list#category_#{filter}", as: "category_#{filter}"
+      end
+
+      get "/all" => "list#category_default", as: "category_all", constraints: { format: 'html' }
+      get "/" => "list#category_default", as: "category_default"
+    end
+
+    get "category_hashtags/check" => "category_hashtags#check"
 
     TopTopic.periods.each do |period|
-      get "/none/l/top/#{period}" => "list#category_none_top_#{period}", as: "category_none_top_#{period}"
-      get "/l/top/#{period}" => "list#category_top_#{period}", as: "category_top_#{period}"
+      get "top/#{period}.rss" => "list#top_#{period}_feed", format: :rss
+      get "top/#{period}" => "list#top_#{period}"
+    end
+
+    Discourse.anonymous_filters.each do |filter|
+      get "#{filter}.rss" => "list##{filter}_feed", format: :rss
     end
 
     Discourse.filters.each do |filter|
-      get "/none/l/#{filter}" => "list#category_none_#{filter}", as: "category_none_#{filter}"
-      get "/l/#{filter}" => "list#category_#{filter}", as: "category_#{filter}"
+      get "#{filter}" => "list##{filter}"
     end
 
-    get "/all" => "list#category_default", as: "category_all", constraints: { format: 'html' }
-    get "/" => "list#category_default", as: "category_default"
-  end
+    get "top" => "list#top"
+    get "search/query" => "search#query"
+    get "search" => "search#show"
+    post "search/click" => "search#click"
 
-  get "category_hashtags/check" => "category_hashtags#check"
+    # Topics resource
+    get "t/:id" => "topics#show"
+    put "t/:id" => "topics#update"
+    delete "t/:id" => "topics#destroy"
+    put "t/:id/archive-message" => "topics#archive_message"
+    put "t/:id/move-to-inbox" => "topics#move_to_inbox"
+    put "t/:id/convert-topic/:type" => "topics#convert_topic"
+    put "t/:id/publish" => "topics#publish"
+    put "t/:id/shared-draft" => "topics#update_shared_draft"
+    put "t/:id/reset-bump-date" => "topics#reset_bump_date"
+    put "topics/bulk"
+    put "topics/reset-new" => 'topics#reset_new'
+    post "topics/timings"
 
-  TopTopic.periods.each do |period|
-    get "top/#{period}.rss" => "list#top_#{period}_feed", format: :rss
-    get "top/#{period}" => "list#top_#{period}"
-  end
+    get 'topics/similar_to' => 'similar_topics#index'
+    resources :similar_topics
 
-  Discourse.anonymous_filters.each do |filter|
-    get "#{filter}.rss" => "list##{filter}_feed", format: :rss
-  end
+    get "topics/feature_stats"
 
-  Discourse.filters.each do |filter|
-    get "#{filter}" => "list##{filter}"
-  end
+    scope "/topics", username: RouteFormat.username do
+      get "created-by/:username" => "list#topics_by", as: "topics_by", defaults: { format: :json }
+      get "private-messages/:username" => "list#private_messages", as: "topics_private_messages", defaults: { format: :json }
+      get "private-messages-sent/:username" => "list#private_messages_sent", as: "topics_private_messages_sent", defaults: { format: :json }
+      get "private-messages-archive/:username" => "list#private_messages_archive", as: "topics_private_messages_archive", defaults: { format: :json }
+      get "private-messages-unread/:username" => "list#private_messages_unread", as: "topics_private_messages_unread", defaults: { format: :json }
+      get "private-messages-tags/:username/:tag_id.json" => "list#private_messages_tag", as: "topics_private_messages_tag", constraints: StaffConstraint.new
+      get "groups/:group_name" => "list#group_topics", as: "group_topics", group_name: RouteFormat.username
 
-  get "top" => "list#top"
-  get "search/query" => "search#query"
-  get "search" => "search#show"
-  post "search/click" => "search#click"
-
-  # Topics resource
-  get "t/:id" => "topics#show"
-  put "t/:id" => "topics#update"
-  delete "t/:id" => "topics#destroy"
-  put "t/:id/archive-message" => "topics#archive_message"
-  put "t/:id/move-to-inbox" => "topics#move_to_inbox"
-  put "t/:id/convert-topic/:type" => "topics#convert_topic"
-  put "t/:id/publish" => "topics#publish"
-  put "t/:id/shared-draft" => "topics#update_shared_draft"
-  put "t/:id/reset-bump-date" => "topics#reset_bump_date"
-  put "topics/bulk"
-  put "topics/reset-new" => 'topics#reset_new'
-  post "topics/timings"
-
-  get 'topics/similar_to' => 'similar_topics#index'
-  resources :similar_topics
-
-  get "topics/feature_stats"
-
-  scope "/topics", username: RouteFormat.username do
-    get "created-by/:username" => "list#topics_by", as: "topics_by", defaults: { format: :json }
-    get "private-messages/:username" => "list#private_messages", as: "topics_private_messages", defaults: { format: :json }
-    get "private-messages-sent/:username" => "list#private_messages_sent", as: "topics_private_messages_sent", defaults: { format: :json }
-    get "private-messages-archive/:username" => "list#private_messages_archive", as: "topics_private_messages_archive", defaults: { format: :json }
-    get "private-messages-unread/:username" => "list#private_messages_unread", as: "topics_private_messages_unread", defaults: { format: :json }
-    get "private-messages-tags/:username/:tag_id.json" => "list#private_messages_tag", as: "topics_private_messages_tag", constraints: StaffConstraint.new
-    get "groups/:group_name" => "list#group_topics", as: "group_topics", group_name: RouteFormat.username
-
-    scope "/private-messages-group/:username", group_name: RouteFormat.username do
-      get ":group_name.json" => "list#private_messages_group", as: "topics_private_messages_group"
-      get ":group_name/archive.json" => "list#private_messages_group_archive", as: "topics_private_messages_group_archive"
-    end
-  end
-
-  get 'embed/topics' => 'embed#topics'
-  get 'embed/comments' => 'embed#comments'
-  get 'embed/count' => 'embed#count'
-  get 'embed/info' => 'embed#info'
-
-  get "new-topic" => "list#latest"
-  get "new-message" => "list#latest"
-
-  # Topic routes
-  get "t/id_for/:slug" => "topics#id_for_slug"
-  get "t/:slug/:topic_id/print" => "topics#show", format: :html, print: true, constraints: { topic_id: /\d+/ }
-  get "t/:slug/:topic_id/wordpress" => "topics#wordpress", constraints: { topic_id: /\d+/ }
-  get "t/:topic_id/wordpress" => "topics#wordpress", constraints: { topic_id: /\d+/ }
-  get "t/:slug/:topic_id/moderator-liked" => "topics#moderator_liked", constraints: { topic_id: /\d+/ }
-  get "t/:slug/:topic_id/summary" => "topics#show", defaults: { summary: true }, constraints: { topic_id: /\d+/ }
-  get "t/:topic_id/summary" => "topics#show", constraints: { topic_id: /\d+/ }
-  put "t/:slug/:topic_id" => "topics#update", constraints: { topic_id: /\d+/ }
-  put "t/:slug/:topic_id/star" => "topics#star", constraints: { topic_id: /\d+/ }
-  put "t/:topic_id/star" => "topics#star", constraints: { topic_id: /\d+/ }
-  put "t/:slug/:topic_id/status" => "topics#status", constraints: { topic_id: /\d+/ }
-  put "t/:topic_id/status" => "topics#status", constraints: { topic_id: /\d+/ }
-  put "t/:topic_id/clear-pin" => "topics#clear_pin", constraints: { topic_id: /\d+/ }
-  put "t/:topic_id/re-pin" => "topics#re_pin", constraints: { topic_id: /\d+/ }
-  put "t/:topic_id/mute" => "topics#mute", constraints: { topic_id: /\d+/ }
-  put "t/:topic_id/unmute" => "topics#unmute", constraints: { topic_id: /\d+/ }
-  post "t/:topic_id/timer" => "topics#timer", constraints: { topic_id: /\d+/ }
-  put "t/:topic_id/make-banner" => "topics#make_banner", constraints: { topic_id: /\d+/ }
-  put "t/:topic_id/remove-banner" => "topics#remove_banner", constraints: { topic_id: /\d+/ }
-  put "t/:topic_id/remove-allowed-user" => "topics#remove_allowed_user", constraints: { topic_id: /\d+/ }
-  put "t/:topic_id/remove-allowed-group" => "topics#remove_allowed_group", constraints: { topic_id: /\d+/ }
-  put "t/:topic_id/recover" => "topics#recover", constraints: { topic_id: /\d+/ }
-  get "t/:topic_id/:post_number" => "topics#show", constraints: { topic_id: /\d+/, post_number: /\d+/ }
-  get "t/:topic_id/last" => "topics#show", post_number: 99999999, constraints: { topic_id: /\d+/ }
-  get "t/:slug/:topic_id.rss" => "topics#feed", format: :rss, constraints: { topic_id: /\d+/ }
-  get "t/:slug/:topic_id" => "topics#show", constraints: { topic_id: /\d+/ }
-  get "t/:slug/:topic_id/:post_number" => "topics#show", constraints: { topic_id: /\d+/, post_number: /\d+/ }
-  get "t/:slug/:topic_id/last" => "topics#show", post_number: 99999999, constraints: { topic_id: /\d+/ }
-  get "t/:topic_id/posts" => "topics#posts", constraints: { topic_id: /\d+/ }, format: :json
-  get "t/:topic_id/post_ids" => "topics#post_ids", constraints: { topic_id: /\d+/ }, format: :json
-  get "t/:topic_id/excerpts" => "topics#excerpts", constraints: { topic_id: /\d+/ }, format: :json
-  post "t/:topic_id/timings" => "topics#timings", constraints: { topic_id: /\d+/ }
-  post "t/:topic_id/invite" => "topics#invite", constraints: { topic_id: /\d+/ }
-  post "t/:topic_id/invite-group" => "topics#invite_group", constraints: { topic_id: /\d+/ }
-  post "t/:topic_id/move-posts" => "topics#move_posts", constraints: { topic_id: /\d+/ }
-  post "t/:topic_id/merge-topic" => "topics#merge_topic", constraints: { topic_id: /\d+/ }
-  post "t/:topic_id/change-owner" => "topics#change_post_owners", constraints: { topic_id: /\d+/ }
-  put "t/:topic_id/change-timestamp" => "topics#change_timestamps", constraints: { topic_id: /\d+/ }
-  delete "t/:topic_id/timings" => "topics#destroy_timings", constraints: { topic_id: /\d+/ }
-  put "t/:topic_id/bookmark" => "topics#bookmark", constraints: { topic_id: /\d+/ }
-  put "t/:topic_id/remove_bookmarks" => "topics#remove_bookmarks", constraints: { topic_id: /\d+/ }
-  put "t/:topic_id/tags" => "topics#update_tags", constraints: { topic_id: /\d+/ }
-
-  post "t/:topic_id/notifications" => "topics#set_notifications" , constraints: { topic_id: /\d+/ }
-
-  get "p/:post_id(/:user_id)" => "posts#short_link"
-  get "/posts/:id/cooked" => "posts#cooked"
-  get "/posts/:id/expand-embed" => "posts#expand_embed"
-  get "/posts/:id/raw" => "posts#markdown_id"
-  get "/posts/:id/raw-email" => "posts#raw_email"
-  get "raw/:topic_id(/:post_number)" => "posts#markdown_num"
-
-  resources :invites, except: [:show]
-  get "/invites/:id" => "invites#show", constraints: { format: :html }
-
-  post "invites/upload_csv" => "invites#upload_csv"
-  post "invites/rescind-all" => "invites#rescind_all_invites"
-  post "invites/reinvite" => "invites#resend_invite"
-  post "invites/reinvite-all" => "invites#resend_all_invites"
-  post "invites/link" => "invites#create_invite_link"
-  delete "invites" => "invites#destroy"
-  put "invites/show/:id" => "invites#perform_accept_invitation", as: 'perform_accept_invite'
-
-  resources :export_csv do
-    collection do
-      post "export_entity" => "export_csv#export_entity"
-    end
-  end
-
-  get "onebox" => "onebox#show"
-  get "inline-onebox" => "inline_onebox#show"
-
-  get "exception" => "list#latest"
-
-  get "message-bus/poll" => "message_bus#poll"
-
-  resources :drafts, only: [:index]
-  get "draft" => "draft#show"
-  post "draft" => "draft#update"
-  delete "draft" => "draft#destroy"
-
-  if service_worker_asset = Rails.application.assets_manifest.assets['service-worker.js']
-    # https://developers.google.com/web/fundamentals/codelabs/debugging-service-workers/
-    # Normally the browser will wait until a user closes all tabs that contain the
-    # current site before updating to a new Service Worker.
-    # Support the old Service Worker path to avoid routing error filling up the
-    # logs.
-    get "/service-worker.js" => redirect(relative_url_root + service_worker_asset, status: 302), format: :js
-    get service_worker_asset => "static#service_worker_asset", format: :js
-  elsif Rails.env.development?
-    get "/service-worker.js" => "static#service_worker_asset", format: :js
-  end
-
-  get "cdn_asset/:site/*path" => "static#cdn_asset", format: false, constraints: { format: /.*/ }
-  get "brotli_asset/*path" => "static#brotli_asset", format: false, constraints: { format: /.*/ }
-
-  get "favicon/proxied" => "static#favicon", format: false
-
-  get "robots.txt" => "robots_txt#index"
-  get "robots-builder.json" => "robots_txt#builder"
-  get "offline.html" => "offline#index"
-  get "manifest.webmanifest" => "metadata#manifest", as: :manifest
-  get "manifest.json" => "metadata#manifest"
-  get ".well-known/assetlinks.json" => "metadata#app_association_android"
-  get "apple-app-site-association" => "metadata#app_association_ios", format: false
-  get "opensearch" => "metadata#opensearch", constraints: { format: :xml }
-
-  scope '/tag/:tag_id' do
-    constraints format: :json do
-      get '/' => 'tags#show', as: 'tag_show'
-      get '/info' => 'tags#info'
-      get '/notifications' => 'tags#notifications'
-      put '/notifications' => 'tags#update_notifications'
-      put '/' => 'tags#update'
-      delete '/' => 'tags#destroy'
-      post '/synonyms' => 'tags#create_synonyms'
-      delete '/synonyms/:synonym_id' => 'tags#destroy_synonym'
-
-      Discourse.filters.each do |filter|
-        get "/l/#{filter}" => "tags#show_#{filter}", as: "tag_show_#{filter}"
+      scope "/private-messages-group/:username", group_name: RouteFormat.username do
+        get ":group_name.json" => "list#private_messages_group", as: "topics_private_messages_group"
+        get ":group_name/archive.json" => "list#private_messages_group_archive", as: "topics_private_messages_group_archive"
       end
     end
 
-    constraints format: :rss do
-      get '/' => 'tags#tag_feed'
+    get 'embed/topics' => 'embed#topics'
+    get 'embed/comments' => 'embed#comments'
+    get 'embed/count' => 'embed#count'
+    get 'embed/info' => 'embed#info'
+
+    get "new-topic" => "list#latest"
+    get "new-message" => "list#latest"
+
+    # Topic routes
+    get "t/id_for/:slug" => "topics#id_for_slug"
+    get "t/:slug/:topic_id/print" => "topics#show", format: :html, print: true, constraints: { topic_id: /\d+/ }
+    get "t/:slug/:topic_id/wordpress" => "topics#wordpress", constraints: { topic_id: /\d+/ }
+    get "t/:topic_id/wordpress" => "topics#wordpress", constraints: { topic_id: /\d+/ }
+    get "t/:slug/:topic_id/moderator-liked" => "topics#moderator_liked", constraints: { topic_id: /\d+/ }
+    get "t/:slug/:topic_id/summary" => "topics#show", defaults: { summary: true }, constraints: { topic_id: /\d+/ }
+    get "t/:topic_id/summary" => "topics#show", constraints: { topic_id: /\d+/ }
+    put "t/:slug/:topic_id" => "topics#update", constraints: { topic_id: /\d+/ }
+    put "t/:slug/:topic_id/star" => "topics#star", constraints: { topic_id: /\d+/ }
+    put "t/:topic_id/star" => "topics#star", constraints: { topic_id: /\d+/ }
+    put "t/:slug/:topic_id/status" => "topics#status", constraints: { topic_id: /\d+/ }
+    put "t/:topic_id/status" => "topics#status", constraints: { topic_id: /\d+/ }
+    put "t/:topic_id/clear-pin" => "topics#clear_pin", constraints: { topic_id: /\d+/ }
+    put "t/:topic_id/re-pin" => "topics#re_pin", constraints: { topic_id: /\d+/ }
+    put "t/:topic_id/mute" => "topics#mute", constraints: { topic_id: /\d+/ }
+    put "t/:topic_id/unmute" => "topics#unmute", constraints: { topic_id: /\d+/ }
+    post "t/:topic_id/timer" => "topics#timer", constraints: { topic_id: /\d+/ }
+    put "t/:topic_id/make-banner" => "topics#make_banner", constraints: { topic_id: /\d+/ }
+    put "t/:topic_id/remove-banner" => "topics#remove_banner", constraints: { topic_id: /\d+/ }
+    put "t/:topic_id/remove-allowed-user" => "topics#remove_allowed_user", constraints: { topic_id: /\d+/ }
+    put "t/:topic_id/remove-allowed-group" => "topics#remove_allowed_group", constraints: { topic_id: /\d+/ }
+    put "t/:topic_id/recover" => "topics#recover", constraints: { topic_id: /\d+/ }
+    get "t/:topic_id/:post_number" => "topics#show", constraints: { topic_id: /\d+/, post_number: /\d+/ }
+    get "t/:topic_id/last" => "topics#show", post_number: 99999999, constraints: { topic_id: /\d+/ }
+    get "t/:slug/:topic_id.rss" => "topics#feed", format: :rss, constraints: { topic_id: /\d+/ }
+    get "t/:slug/:topic_id" => "topics#show", constraints: { topic_id: /\d+/ }
+    get "t/:slug/:topic_id/:post_number" => "topics#show", constraints: { topic_id: /\d+/, post_number: /\d+/ }
+    get "t/:slug/:topic_id/last" => "topics#show", post_number: 99999999, constraints: { topic_id: /\d+/ }
+    get "t/:topic_id/posts" => "topics#posts", constraints: { topic_id: /\d+/ }, format: :json
+    get "t/:topic_id/post_ids" => "topics#post_ids", constraints: { topic_id: /\d+/ }, format: :json
+    get "t/:topic_id/excerpts" => "topics#excerpts", constraints: { topic_id: /\d+/ }, format: :json
+    post "t/:topic_id/timings" => "topics#timings", constraints: { topic_id: /\d+/ }
+    post "t/:topic_id/invite" => "topics#invite", constraints: { topic_id: /\d+/ }
+    post "t/:topic_id/invite-group" => "topics#invite_group", constraints: { topic_id: /\d+/ }
+    post "t/:topic_id/move-posts" => "topics#move_posts", constraints: { topic_id: /\d+/ }
+    post "t/:topic_id/merge-topic" => "topics#merge_topic", constraints: { topic_id: /\d+/ }
+    post "t/:topic_id/change-owner" => "topics#change_post_owners", constraints: { topic_id: /\d+/ }
+    put "t/:topic_id/change-timestamp" => "topics#change_timestamps", constraints: { topic_id: /\d+/ }
+    delete "t/:topic_id/timings" => "topics#destroy_timings", constraints: { topic_id: /\d+/ }
+    put "t/:topic_id/bookmark" => "topics#bookmark", constraints: { topic_id: /\d+/ }
+    put "t/:topic_id/remove_bookmarks" => "topics#remove_bookmarks", constraints: { topic_id: /\d+/ }
+    put "t/:topic_id/tags" => "topics#update_tags", constraints: { topic_id: /\d+/ }
+
+    post "t/:topic_id/notifications" => "topics#set_notifications" , constraints: { topic_id: /\d+/ }
+
+    get "p/:post_id(/:user_id)" => "posts#short_link"
+    get "/posts/:id/cooked" => "posts#cooked"
+    get "/posts/:id/expand-embed" => "posts#expand_embed"
+    get "/posts/:id/raw" => "posts#markdown_id"
+    get "/posts/:id/raw-email" => "posts#raw_email"
+    get "raw/:topic_id(/:post_number)" => "posts#markdown_num"
+
+    resources :invites, except: [:show]
+    get "/invites/:id" => "invites#show", constraints: { format: :html }
+
+    post "invites/upload_csv" => "invites#upload_csv"
+    post "invites/rescind-all" => "invites#rescind_all_invites"
+    post "invites/reinvite" => "invites#resend_invite"
+    post "invites/reinvite-all" => "invites#resend_all_invites"
+    post "invites/link" => "invites#create_invite_link"
+    delete "invites" => "invites#destroy"
+    put "invites/show/:id" => "invites#perform_accept_invitation", as: 'perform_accept_invite'
+
+    resources :export_csv do
+      collection do
+        post "export_entity" => "export_csv#export_entity"
+      end
     end
-  end
 
-  scope "/tags" do
-    get '/' => 'tags#index'
-    get '/filter/list' => 'tags#index'
-    get '/filter/search' => 'tags#search'
-    get '/check' => 'tags#check_hashtag'
-    get '/personal_messages/:username' => 'tags#personal_messages'
-    post '/upload' => 'tags#upload'
-    get '/unused' => 'tags#list_unused'
-    delete '/unused' => 'tags#destroy_unused'
+    get "onebox" => "onebox#show"
+    get "inline-onebox" => "inline_onebox#show"
 
-    constraints(tag_id: /[^\/]+?/, format: /json|rss/) do
-      scope path: '/c/*category_slug_path_with_id' do
-        Discourse.filters.each do |filter|
-          get "/none/:tag_id/l/#{filter}" => "tags#show_#{filter}", as: "tag_category_none_show_#{filter}", defaults: { no_subcategories: true }
-        end
+    get "exception" => "list#latest"
 
-        get '/none/:tag_id' => 'tags#show', as: 'tag_category_none_show', defaults: { no_subcategories: true }
+    get "message-bus/poll" => "message_bus#poll"
+
+    resources :drafts, only: [:index]
+    get "draft" => "draft#show"
+    post "draft" => "draft#update"
+    delete "draft" => "draft#destroy"
+
+    if service_worker_asset = Rails.application.assets_manifest.assets['service-worker.js']
+      # https://developers.google.com/web/fundamentals/codelabs/debugging-service-workers/
+      # Normally the browser will wait until a user closes all tabs that contain the
+      # current site before updating to a new Service Worker.
+      # Support the old Service Worker path to avoid routing error filling up the
+      # logs.
+      get "/service-worker.js" => redirect(relative_url_root + service_worker_asset, status: 302), format: :js
+      get service_worker_asset => "static#service_worker_asset", format: :js
+    elsif Rails.env.development?
+      get "/service-worker.js" => "static#service_worker_asset", format: :js
+    end
+
+    get "cdn_asset/:site/*path" => "static#cdn_asset", format: false, constraints: { format: /.*/ }
+    get "brotli_asset/*path" => "static#brotli_asset", format: false, constraints: { format: /.*/ }
+
+    get "favicon/proxied" => "static#favicon", format: false
+
+    get "robots.txt" => "robots_txt#index"
+    get "robots-builder.json" => "robots_txt#builder"
+    get "offline.html" => "offline#index"
+    get "manifest.webmanifest" => "metadata#manifest", as: :manifest
+    get "manifest.json" => "metadata#manifest"
+    get ".well-known/assetlinks.json" => "metadata#app_association_android"
+    get "apple-app-site-association" => "metadata#app_association_ios", format: false
+    get "opensearch" => "metadata#opensearch", constraints: { format: :xml }
+
+    scope '/tag/:tag_id' do
+      constraints format: :json do
+        get '/' => 'tags#show', as: 'tag_show'
+        get '/info' => 'tags#info'
+        get '/notifications' => 'tags#notifications'
+        put '/notifications' => 'tags#update_notifications'
+        put '/' => 'tags#update'
+        delete '/' => 'tags#destroy'
+        post '/synonyms' => 'tags#create_synonyms'
+        delete '/synonyms/:synonym_id' => 'tags#destroy_synonym'
 
         Discourse.filters.each do |filter|
-          get "/:tag_id/l/#{filter}" => "tags#show_#{filter}", as: "tag_category_show_#{filter}"
+          get "/l/#{filter}" => "tags#show_#{filter}", as: "tag_show_#{filter}"
+        end
+      end
+
+      constraints format: :rss do
+        get '/' => 'tags#tag_feed'
+      end
+    end
+
+    scope "/tags" do
+      get '/' => 'tags#index'
+      get '/filter/list' => 'tags#index'
+      get '/filter/search' => 'tags#search'
+      get '/check' => 'tags#check_hashtag'
+      get '/personal_messages/:username' => 'tags#personal_messages'
+      post '/upload' => 'tags#upload'
+      get '/unused' => 'tags#list_unused'
+      delete '/unused' => 'tags#destroy_unused'
+
+      constraints(tag_id: /[^\/]+?/, format: /json|rss/) do
+        scope path: '/c/*category_slug_path_with_id' do
+          Discourse.filters.each do |filter|
+            get "/none/:tag_id/l/#{filter}" => "tags#show_#{filter}", as: "tag_category_none_show_#{filter}", defaults: { no_subcategories: true }
+          end
+
+          get '/none/:tag_id' => 'tags#show', as: 'tag_category_none_show', defaults: { no_subcategories: true }
+
+          Discourse.filters.each do |filter|
+            get "/:tag_id/l/#{filter}" => "tags#show_#{filter}", as: "tag_category_show_#{filter}"
+          end
+
+          get '/:tag_id' => 'tags#show', as: 'tag_category_show'
         end
 
-        get '/:tag_id' => 'tags#show', as: 'tag_category_show'
+        get '/intersection/:tag_id/*additional_tag_ids' => 'tags#show', as: 'tag_intersection'
       end
 
-      get '/intersection/:tag_id/*additional_tag_ids' => 'tags#show', as: 'tag_intersection'
-    end
+      # legacy routes
+      constraints(tag_id: /[^\/]+?/, format: /json|rss/) do
+        get '/:tag_id.rss' => 'tags#tag_feed'
+        get '/:tag_id' => 'tags#show'
+        get '/:tag_id/info' => 'tags#info'
+        get '/:tag_id/notifications' => 'tags#notifications'
+        put '/:tag_id/notifications' => 'tags#update_notifications'
+        put '/:tag_id' => 'tags#update'
+        delete '/:tag_id' => 'tags#destroy'
+        post '/:tag_id/synonyms' => 'tags#create_synonyms'
+        delete '/:tag_id/synonyms/:synonym_id' => 'tags#destroy_synonym'
 
-    # legacy routes
-    constraints(tag_id: /[^\/]+?/, format: /json|rss/) do
-      get '/:tag_id.rss' => 'tags#tag_feed'
-      get '/:tag_id' => 'tags#show'
-      get '/:tag_id/info' => 'tags#info'
-      get '/:tag_id/notifications' => 'tags#notifications'
-      put '/:tag_id/notifications' => 'tags#update_notifications'
-      put '/:tag_id' => 'tags#update'
-      delete '/:tag_id' => 'tags#destroy'
-      post '/:tag_id/synonyms' => 'tags#create_synonyms'
-      delete '/:tag_id/synonyms/:synonym_id' => 'tags#destroy_synonym'
-
-      Discourse.filters.each do |filter|
-        get "/:tag_id/l/#{filter}" => "tags#show_#{filter}"
+        Discourse.filters.each do |filter|
+          get "/:tag_id/l/#{filter}" => "tags#show_#{filter}"
+        end
       end
     end
-  end
 
-  resources :tag_groups, constraints: StaffConstraint.new, except: [:edit] do
-    collection do
-      get '/filter/search' => 'tag_groups#search'
+    resources :tag_groups, constraints: StaffConstraint.new, except: [:edit] do
+      collection do
+        get '/filter/search' => 'tag_groups#search'
+      end
     end
-  end
 
-  Discourse.filters.each do |filter|
-    root to: "list##{filter}", constraints: HomePageConstraint.new("#{filter}"), as: "list_#{filter}"
-  end
-  # special case for categories
-  root to: "categories#index", constraints: HomePageConstraint.new("categories"), as: "categories_index"
-  # special case for top
-  root to: "list#top", constraints: HomePageConstraint.new("top"), as: "top_lists"
+    Discourse.filters.each do |filter|
+      root to: "list##{filter}", constraints: HomePageConstraint.new("#{filter}"), as: "list_#{filter}"
+    end
+    # special case for categories
+    root to: "categories#index", constraints: HomePageConstraint.new("categories"), as: "categories_index"
+    # special case for top
+    root to: "list#top", constraints: HomePageConstraint.new("top"), as: "top_lists"
 
-  root to: 'finish_installation#index', constraints: HomePageConstraint.new("finish_installation"), as: 'installation_redirect'
+    root to: 'finish_installation#index', constraints: HomePageConstraint.new("finish_installation"), as: 'installation_redirect'
 
-  get "/user-api-key/new" => "user_api_keys#new"
-  post "/user-api-key" => "user_api_keys#create"
-  post "/user-api-key/revoke" => "user_api_keys#revoke"
-  post "/user-api-key/undo-revoke" => "user_api_keys#undo_revoke"
-  get "/user-api-key/otp" => "user_api_keys#otp"
-  post "/user-api-key/otp" => "user_api_keys#create_otp"
+    get "/user-api-key/new" => "user_api_keys#new"
+    post "/user-api-key" => "user_api_keys#create"
+    post "/user-api-key/revoke" => "user_api_keys#revoke"
+    post "/user-api-key/undo-revoke" => "user_api_keys#undo_revoke"
+    get "/user-api-key/otp" => "user_api_keys#otp"
+    post "/user-api-key/otp" => "user_api_keys#create_otp"
 
-  get "/safe-mode" => "safe_mode#index"
-  post "/safe-mode" => "safe_mode#enter", as: "safe_mode_enter"
+    get "/safe-mode" => "safe_mode#index"
+    post "/safe-mode" => "safe_mode#enter", as: "safe_mode_enter"
 
-  unless Rails.env.production?
-    get "/qunit" => "qunit#index"
-    get "/wizard/qunit" => "wizard#qunit"
-  end
+    unless Rails.env.production?
+      get "/qunit" => "qunit#index"
+      get "/wizard/qunit" => "wizard#qunit"
+    end
 
-  post "/push_notifications/subscribe" => "push_notification#subscribe"
-  post "/push_notifications/unsubscribe" => "push_notification#unsubscribe"
+    post "/push_notifications/subscribe" => "push_notification#subscribe"
+    post "/push_notifications/unsubscribe" => "push_notification#unsubscribe"
 
-  resources :csp_reports, only: [:create]
+    resources :csp_reports, only: [:create]
 
-  get "/permalink-check", to: 'permalinks#check'
+    get "/permalink-check", to: 'permalinks#check'
 
-  get "*url", to: 'permalinks#show', constraints: PermalinkConstraint.new
+    get "*url", to: 'permalinks#show', constraints: PermalinkConstraint.new
   end
 end

From ded5ebb5ae5c937105aae2a4d6b7883da0dda9d0 Mon Sep 17 00:00:00 2001
From: OsamaSayegh <asooomaasoooma90@gmail.com>
Date: Fri, 5 Jun 2020 05:51:07 +0300
Subject: [PATCH 1571/1830] DEV: Make git ignore cosmetic commit

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 4eb8ad5f07..be7d476572 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -25,3 +25,6 @@ c4644c61d97c823b7dd940ffaf0967a104f4b58c
 
 # Migrate to app directory
 7a2e8d3ead63c7d99e1069fc7823e933f931ba85
+
+# DEV: Fix indentation for routes.rb
+985900818ff985b04def6aa4c5d99c1aa6dbd45c

From 1c48853edeb84f8d7a50ed8ac26bead0ec1ad105 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 5 Jun 2020 18:26:25 +1000
Subject: [PATCH 1572/1830] DEV: allow skipping of a single plugin when
 installing

SKIP_INSTALL_PLUGINS can be used to tell plugin:install_all_official
to skip a plugin.

Comma seperated list
---
 lib/tasks/docker.rake | 1 +
 lib/tasks/plugin.rake | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index b0d2e6e2ec..fb706a8f6f 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -8,6 +8,7 @@
 # => SKIP_TESTS                set to 1 to skip all tests
 # => SKIP_CORE                 set to 1 to skip core tests (rspec and qunit)
 # => SKIP_PLUGINS              set to 1 to skip plugin tests (rspec and qunit)
+# => SKIP_INSTALL_PLUGINS      comma seperated list of plugins you want to skip installing
 # => INSTALL_OFFICIAL_PLUGINS  set to 1 to install all core plugins before running tests
 # => RUBY_ONLY                 set to 1 to skip all qunit tests
 # => JS_ONLY                   set to 1 to skip all rspec tests
diff --git a/lib/tasks/plugin.rake b/lib/tasks/plugin.rake
index 9da1f43350..693f7ef817 100644
--- a/lib/tasks/plugin.rake
+++ b/lib/tasks/plugin.rake
@@ -11,6 +11,10 @@ task 'plugin:install_all_official' do
     'poll'
   ])
 
+  if skip_install = ENV["SKIP_INSTALL_PLUGINS"]
+    skip_install.split(",").map(&:strip).each { |plugin| skip << plugin  }
+  end
+
   map = {
     'Canned Replies' => 'https://github.com/discourse/discourse-canned-replies',
     'discourse-perspective' => 'https://github.com/discourse/discourse-perspective-api'

From 6c7e9d32555575f6689c0fa7d969bbe0d53bc789 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 5 Jun 2020 13:29:50 +0100
Subject: [PATCH 1573/1830] DEV: Remove htmlparser dependency (#9981)

We stopped using htmlparser in b5008586. There is no need to list it as a dependency
---
 package.json | 1 -
 yarn.lock    | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/package.json b/package.json
index 2df8b474e8..9ce74d66f8 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,6 @@
     "favcount": "https://github.com/chrishunt/favcount",
     "handlebars": "^4.7.0",
     "highlight.js": "https://github.com/highlightjs/highlight.js#d72f0817aaab8187711fca7c608f5272ea5147f6",
-    "htmlparser": "https://github.com/tautologistics/node-htmlparser",
     "intersection-observer": "^0.5.1",
     "jquery": "3.5.0",
     "jquery-color": "3.0.0-alpha.1",
diff --git a/yarn.lock b/yarn.lock
index 6ff2bce65e..578c46a486 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1512,10 +1512,6 @@ homedir-polyfill@^1.0.1:
   dependencies:
     parse-passwd "^1.0.0"
 
-"htmlparser@https://github.com/tautologistics/node-htmlparser":
-  version "2.0.0"
-  resolved "https://github.com/tautologistics/node-htmlparser#9613b99096ac1757b81695b1a4bbee7f10afcd7f"
-
 https-proxy-agent@^2.2.1:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"

From 731263b81ce027f9fe85dce07a8c576549a7d153 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 5 Jun 2020 13:36:48 +0100
Subject: [PATCH 1574/1830] PERF: Correctly memoize baseUri value in javascript
 app (#9986)

An empty string is a falsey value in javascript, so we were looking for the meta tag every time getURL was called, which took approximately 1.5ms every time.
---
 app/assets/javascripts/discourse-common/addon/lib/get-url.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse-common/addon/lib/get-url.js b/app/assets/javascripts/discourse-common/addon/lib/get-url.js
index eb36586e8d..a74ea5ff64 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/get-url.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/get-url.js
@@ -4,7 +4,7 @@ let S3BaseUrl, S3CDN;
 export default function getURL(url) {
   if (!url) return url;
 
-  if (!baseUri) {
+  if (baseUri === undefined) {
     baseUri = $('meta[name="discourse-base-uri"]').attr("content") || "";
   }
 

From be5974734dab5ecaeef8ed25c681b5c169182906 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 5 Jun 2020 13:37:07 +0100
Subject: [PATCH 1575/1830] PERF: Pass element to resolveAllShortUrl function,
 not text selector (#9988)

We already have a reference to the preview element, so there is no need to look it up again. This saves about 1ms per keypress in my testing.
---
 .../javascripts/discourse/app/components/composer-editor.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js
index 74443c88ec..e33973cd44 100644
--- a/app/assets/javascripts/discourse/app/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/app/components/composer-editor.js
@@ -1000,7 +1000,7 @@ export default Component.extend({
       );
 
       // Short upload urls need resolution
-      resolveAllShortUrls(ajax, this.siteSettings, ".d-editor-preview-wrapper");
+      resolveAllShortUrls(ajax, this.siteSettings, $preview[0]);
 
       if (this._enableAdvancedEditorPreviewSync()) {
         this._syncScroll(

From a9def011d0dca1668bf98a336fb42894ad3b5752 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 5 Jun 2020 09:53:43 -0400
Subject: [PATCH 1576/1830] FIX: `(getURL "")` was not working with the `i18n`
 helper

---
 app/assets/javascripts/admin/templates/dashboard_general.hbs    | 2 +-
 .../javascripts/discourse-common/addon/helpers/get-url.js       | 1 +
 .../javascripts/discourse/app/templates/modal/bookmark.hbs      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/templates/dashboard_general.hbs
index 8c90890c55..5d442f876b 100644
--- a/app/assets/javascripts/admin/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_general.hbs
@@ -147,7 +147,7 @@
           filters=trendingSearchFilters
           isEnabled=logSearchQueriesEnabled
           disabledLabel=trendingSearchDisabledLabel}}
-        {{html-safe (i18n "admin.dashboard.reports.trending_search.more" basePath=(get-url "/"))}}
+        {{html-safe (i18n "admin.dashboard.reports.trending_search.more" basePath=(base-url))}}
       </div>
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/get-url.js b/app/assets/javascripts/discourse-common/addon/helpers/get-url.js
index e3847c4bde..f221c20c77 100644
--- a/app/assets/javascripts/discourse-common/addon/helpers/get-url.js
+++ b/app/assets/javascripts/discourse-common/addon/helpers/get-url.js
@@ -2,3 +2,4 @@ import { registerUnbound } from "discourse-common/lib/helpers";
 import getUrl from "discourse-common/lib/get-url";
 
 registerUnbound("get-url", value => getUrl(value));
+registerUnbound("base-url", () => getUrl(""));
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
index be9a93dbfa..26679f3285 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
@@ -96,7 +96,7 @@
         {{/tap-tile-grid}}
 
       {{else}}
-        <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=(get-url "/"))}}</div>
+        <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=(base-uri))}}</div>
       {{/if}}
     </div>
 

From dc633f299f1af33d542ae5ae7f45ce4dba261d00 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 5 Jun 2020 10:00:59 -0400
Subject: [PATCH 1577/1830] Bump email_reply_trimmer from 0.1.12 to 0.1.13
 (#9980)

Bumps [email_reply_trimmer](https://github.com/discourse/email_reply_trimmer) from 0.1.12 to 0.1.13.
- [Release notes](https://github.com/discourse/email_reply_trimmer/releases)
- [Commits](https://github.com/discourse/email_reply_trimmer/commits/v0.1.13)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 0aeb34d066..7a0703b42a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,7 +114,7 @@ GEM
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
     docile (1.3.2)
-    email_reply_trimmer (0.1.12)
+    email_reply_trimmer (0.1.13)
     ember-data-source (3.0.2)
       ember-source (>= 2, < 3.0)
     ember-handlebars-template (0.8.0)

From 0f09fd22f3afa6ba22499e2fbf6d50a4574831aa Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 5 Jun 2020 15:12:30 +0100
Subject: [PATCH 1578/1830] DEV: Remove attachment css handling from
 resolveAllShortUrls

This was moved inside the markdown processor in 65481858, so there is no longer any need to run this logic after cooking
---
 .../javascripts/pretty-text/addon/upload-short-url.js  | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/assets/javascripts/pretty-text/addon/upload-short-url.js b/app/assets/javascripts/pretty-text/addon/upload-short-url.js
index 87d948693d..f37a5d4d4c 100644
--- a/app/assets/javascripts/pretty-text/addon/upload-short-url.js
+++ b/app/assets/javascripts/pretty-text/addon/upload-short-url.js
@@ -1,5 +1,4 @@
 import { debounce } from "@ember/runloop";
-import { ATTACHMENT_CSS_CLASS } from "./engines/discourse-markdown-it";
 let _cache = {};
 
 export function lookupCachedUploadUrl(shortUrl) {
@@ -85,15 +84,6 @@ function _loadCachedShortUrls($uploads, siteSettings) {
       case "A":
         retrieveCachedUrl($upload, siteSettings, "orig-href", url => {
           $upload.attr("href", url);
-
-          // Replace "|attachment" with class='attachment'
-          // TODO: This is a part of the cooking process now and should be
-          // removed in the future.
-          const content = $upload.text().split("|");
-          if (content[1] === ATTACHMENT_CSS_CLASS) {
-            $upload.addClass(ATTACHMENT_CSS_CLASS);
-            $upload.text(content[0]);
-          }
         });
 
         break;

From d4caf69ed7ab43c776fef38906fe828ae33e81b6 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 5 Jun 2020 17:59:23 +0200
Subject: [PATCH 1579/1830] DEV: makes SKIP_INSTALL_PLUGINS called last and
 global (#9990)

---
 lib/tasks/docker.rake | 7 +++++++
 lib/tasks/plugin.rake | 4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index fb706a8f6f..47af6ba468 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -134,6 +134,13 @@ task 'docker:test' do
         @good &&= run_or_fail("bundle exec rake plugin:update_all")
       end
 
+      if skip_install = ENV["SKIP_INSTALL_PLUGINS"]
+        skip_install.split(",").map(&:strip).each do |plugin|
+          puts "[SKIP_INSTALL_PLUGINS] Removing #{plugin}"
+          `rm -fr plugins/#{plugin}`
+        end
+      end
+
       command_prefix =
         if ENV["SKIP_PLUGINS"]
           # Make sure not to load plugins. bin/rake will add LOAD_PLUGINS=1 automatically unless we set it to 0 explicitly
diff --git a/lib/tasks/plugin.rake b/lib/tasks/plugin.rake
index 693f7ef817..9da1f43350 100644
--- a/lib/tasks/plugin.rake
+++ b/lib/tasks/plugin.rake
@@ -11,10 +11,6 @@ task 'plugin:install_all_official' do
     'poll'
   ])
 
-  if skip_install = ENV["SKIP_INSTALL_PLUGINS"]
-    skip_install.split(",").map(&:strip).each { |plugin| skip << plugin  }
-  end
-
   map = {
     'Canned Replies' => 'https://github.com/discourse/discourse-canned-replies',
     'discourse-perspective' => 'https://github.com/discourse/discourse-perspective-api'

From 293467a37ae33c5fd8fd40bbfc05bffa578b90ed Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 5 Jun 2020 17:15:14 +0100
Subject: [PATCH 1580/1830] REFACTOR: Remove jquery usage from
 resolveAllShortUrls, and fix debounce

- This function now requires an explicit scope. It will never run on the entire document.

- Previously debounce was being used with an anonymous function, which means it was having no effect.
---
 .../discourse/app/components/cook-text.js     |  2 +-
 .../pretty-text/addon/upload-short-url.js     | 68 ++++++++++---------
 test/javascripts/lib/upload-short-url-test.js | 12 ++--
 3 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/cook-text.js b/app/assets/javascripts/discourse/app/components/cook-text.js
index f3ad48f549..234d0906d6 100644
--- a/app/assets/javascripts/discourse/app/components/cook-text.js
+++ b/app/assets/javascripts/discourse/app/components/cook-text.js
@@ -16,7 +16,7 @@ const CookText = Component.extend({
       next(() =>
         window
           .requireModule("pretty-text/upload-short-url")
-          .resolveAllShortUrls(ajax, this.siteSettings)
+          .resolveAllShortUrls(ajax, this.siteSettings, this.element)
       );
     });
   }
diff --git a/app/assets/javascripts/pretty-text/addon/upload-short-url.js b/app/assets/javascripts/pretty-text/addon/upload-short-url.js
index f37a5d4d4c..5ccdc41417 100644
--- a/app/assets/javascripts/pretty-text/addon/upload-short-url.js
+++ b/app/assets/javascripts/pretty-text/addon/upload-short-url.js
@@ -43,12 +43,14 @@ export function resetCache() {
   _cache = {};
 }
 
-function retrieveCachedUrl($upload, siteSettings, dataAttribute, callback) {
-  const cachedUpload = lookupCachedUploadUrl($upload.data(dataAttribute));
+function retrieveCachedUrl(upload, siteSettings, dataAttribute, callback) {
+  const cachedUpload = lookupCachedUploadUrl(
+    upload.getAttribute(`data-${dataAttribute}`)
+  );
   const url = getAttributeBasedUrl(dataAttribute, cachedUpload, siteSettings);
 
   if (url) {
-    $upload.removeAttr(`data-${dataAttribute}`);
+    upload.removeAttribute(`data-${dataAttribute}`);
     if (url !== MISSING) {
       callback(url);
     }
@@ -77,43 +79,40 @@ function getAttributeBasedUrl(dataAttribute, cachedUpload, siteSettings) {
   return cachedUpload.short_path;
 }
 
-function _loadCachedShortUrls($uploads, siteSettings) {
-  $uploads.each((_idx, upload) => {
-    const $upload = $(upload);
+function _loadCachedShortUrls(uploadElements, siteSettings) {
+  uploadElements.forEach(upload => {
     switch (upload.tagName) {
       case "A":
-        retrieveCachedUrl($upload, siteSettings, "orig-href", url => {
-          $upload.attr("href", url);
+        retrieveCachedUrl(upload, siteSettings, "orig-href", url => {
+          upload.href = url;
         });
 
         break;
       case "IMG":
-        retrieveCachedUrl($upload, siteSettings, "orig-src", url => {
-          $upload.attr("src", url);
+        retrieveCachedUrl(upload, siteSettings, "orig-src", url => {
+          upload.src = url;
         });
 
         break;
       case "SOURCE": // video/audio tag > source tag
-        retrieveCachedUrl($upload, siteSettings, "orig-src", url => {
-          $upload.attr("src", url);
-
+        retrieveCachedUrl(upload, siteSettings, "orig-src", url => {
           if (url.startsWith(`//${window.location.host}`)) {
             let hostRegex = new RegExp("//" + window.location.host, "g");
             url = url.replace(hostRegex, "");
           }
           let fullUrl = window.location.origin + url;
-          $upload.attr("src", fullUrl);
+          upload.src = fullUrl;
 
           // this is necessary, otherwise because of the src change the
           // video/audio just doesn't bother loading!
-          let $parent = $upload.parent();
-          $parent[0].load();
+          upload.parentElement.load();
 
           // set the url and text for the <a> tag within the <video/audio> tag
-          $parent
-            .find("a")
-            .attr("href", fullUrl)
-            .text(fullUrl);
+          const link = upload.parentElement.querySelector("a");
+          if (link) {
+            link.href = fullUrl;
+            link.textContent = fullUrl;
+          }
         });
 
         break;
@@ -121,31 +120,36 @@ function _loadCachedShortUrls($uploads, siteSettings) {
   });
 }
 
-function _loadShortUrls($uploads, ajax, siteSettings) {
-  let urls = $uploads.toArray().map(upload => {
-    const $upload = $(upload);
-    return $upload.data("orig-src") || $upload.data("orig-href");
+function _loadShortUrls(uploads, ajax, siteSettings) {
+  let urls = [...uploads].map(upload => {
+    return (
+      upload.getAttribute("data-orig-src") ||
+      upload.getAttribute("data-orig-href")
+    );
   });
 
   return lookupUncachedUploadUrls(urls, ajax).then(() =>
-    _loadCachedShortUrls($uploads, siteSettings)
+    _loadCachedShortUrls(uploads, siteSettings)
   );
 }
 
-export function resolveAllShortUrls(ajax, siteSettings, scope = null) {
+export function resolveAllShortUrls(ajax, siteSettings, scope) {
   const attributes =
     "img[data-orig-src], a[data-orig-href], source[data-orig-src]";
-  let $shortUploadUrls = $(scope || document).find(attributes);
+  let shortUploadElements = scope.querySelectorAll(attributes);
 
-  if ($shortUploadUrls.length > 0) {
-    _loadCachedShortUrls($shortUploadUrls, siteSettings);
+  if (shortUploadElements.length > 0) {
+    _loadCachedShortUrls(shortUploadElements, siteSettings);
 
-    $shortUploadUrls = $(scope || document).find(attributes);
-    if ($shortUploadUrls.length > 0) {
+    shortUploadElements = scope.querySelectorAll(attributes);
+    if (shortUploadElements.length > 0) {
       // this is carefully batched so we can do a leading debounce (trigger right away)
       return debounce(
         null,
-        () => _loadShortUrls($shortUploadUrls, ajax, siteSettings),
+        _loadShortUrls,
+        shortUploadElements,
+        ajax,
+        siteSettings,
         450,
         true
       );
diff --git a/test/javascripts/lib/upload-short-url-test.js b/test/javascripts/lib/upload-short-url-test.js
index 849b2d7602..cbd02d972b 100644
--- a/test/javascripts/lib/upload-short-url-test.js
+++ b/test/javascripts/lib/upload-short-url-test.js
@@ -84,7 +84,7 @@ QUnit.test("resolveAllShortUrls", async assert => {
   lookup = lookupCachedUploadUrl("upload://a.jpeg");
   assert.deepEqual(lookup, {});
 
-  await resolveAllShortUrls(ajax, { secure_media: false });
+  await resolveAllShortUrls(ajax, { secure_media: false }, fixture()[0]);
 
   lookup = lookupCachedUploadUrl("upload://a.jpeg");
 
@@ -126,7 +126,7 @@ QUnit.test(
   "resolveAllShortUrls - href + src replaced correctly",
   async assert => {
     stubUrls();
-    await resolveAllShortUrls(ajax, { secure_media: false });
+    await resolveAllShortUrls(ajax, { secure_media: false }, fixture()[0]);
 
     let image1 = fixture()
       .find("img")
@@ -156,7 +156,7 @@ QUnit.test(
       ],
       null
     );
-    await resolveAllShortUrls(ajax, { secure_media: true });
+    await resolveAllShortUrls(ajax, { secure_media: true }, fixture()[0]);
 
     let link = fixture().find("a");
     assert.equal(
@@ -169,7 +169,9 @@ QUnit.test(
 QUnit.test("resolveAllShortUrls - scoped", async assert => {
   stubUrls();
   let lookup;
-  await resolveAllShortUrls(ajax, ".scoped-area");
+
+  let scopedElement = fixture()[0].querySelector(".scoped-area");
+  await resolveAllShortUrls(ajax, {}, scopedElement);
 
   lookup = lookupCachedUploadUrl("upload://z.jpeg");
 
@@ -181,7 +183,7 @@ QUnit.test("resolveAllShortUrls - scoped", async assert => {
   // do this because the pretender caches ALL the urls, not
   // just the ones being looked up (like the normal behaviour)
   resetCache();
-  await resolveAllShortUrls(ajax, ".scoped-area");
+  await resolveAllShortUrls(ajax, {}, scopedElement);
 
   lookup = lookupCachedUploadUrl("upload://a.jpeg");
   assert.deepEqual(lookup, {});

From dc49581344a9f0400a4b77e74331e269e995f648 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Sun, 7 Jun 2020 17:50:45 -0700
Subject: [PATCH 1581/1830] clarify on supported Linux distros

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

diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md
index 806651ce76..d27c98796d 100644
--- a/docs/INSTALL-cloud.md
+++ b/docs/INSTALL-cloud.md
@@ -6,7 +6,7 @@
 
 Create your new cloud server, for example [on DigitalOcean][do]:
 
-- The default of **Ubuntu 18.04 LTS x64** works fine. At minimum, a 64-bit Linux OS with a kernel version of 3.10+ is required.
+- The default of **the current supported LTS release of Ubuntu Server** works fine. At minimum, a 64-bit Linux OS with a modern kernel version is required.
 
 - The default of **1 GB** RAM works fine for small Discourse communities. We recommend 2 GB RAM for larger communities.
 

From cb015efb7482596ff942e28572f243298debb1e5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 7 Jun 2020 15:59:21 +0000
Subject: [PATCH 1582/1830] Bump rubocop from 0.85.0 to 0.85.1

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.85.0 to 0.85.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.85.0...v0.85.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7a0703b42a..27e629d26b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -313,7 +313,7 @@ GEM
     redis (4.1.4)
     redis-namespace (1.7.0)
       redis (>= 3.0.4)
-    regexp_parser (1.7.0)
+    regexp_parser (1.7.1)
     request_store (1.5.0)
       rack (>= 1.4)
     rexml (3.2.4)
@@ -353,7 +353,7 @@ GEM
       json-schema (~> 2.2)
       railties (>= 3.1, < 7.0)
     rtlit (0.0.5)
-    rubocop (0.85.0)
+    rubocop (0.85.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)

From dc8b77376519bd0ac1c2fa5a5c0546cdab1542d7 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 8 Jun 2020 11:03:25 +0800
Subject: [PATCH 1583/1830] Update rails_failover.

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 27e629d26b..6da31e2085 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/discourse/rails_failover
-  revision: 850d04f4b1c4178862d9674ec0b2a46a2f1c20d9
+  revision: b1a1c4ead35be67d344f092708b540baa0987516
   specs:
     rails_failover (0.4.0)
       activerecord (~> 6.0)

From 2ffda2b320181b36c3cd5bf216b5221c73125911 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 8 Jun 2020 12:19:33 +0800
Subject: [PATCH 1584/1830] Bump rails_failover.

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6da31e2085..1d6cf080a0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/discourse/rails_failover
-  revision: b1a1c4ead35be67d344f092708b540baa0987516
+  revision: 81f5009d7c94f359b7dd0cbca06c327aa95e3851
   specs:
     rails_failover (0.4.0)
       activerecord (~> 6.0)

From f6628e4f4376023b2e541de06dcb8b8010a2bc0c Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 8 Jun 2020 12:32:14 +0800
Subject: [PATCH 1585/1830] DEV: Disable messageBus keepalive when Redis fails
 over.

---
 config/initializers/002-rails_failover.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index 383dca3abd..72df0c9917 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -1,13 +1,18 @@
 # frozen_string_literal: true
 
 if ENV["REDIS_RAILS_FAILOVER"]
+  message_bus_keepalive_interval = nil
+
   RailsFailover::Redis.on_failover do
+    message_bus_keepalive_interval = MessageBus.keepalive_interval
+    MessageBus.keepalive_interval = -1 # Disable MessageBus keepalive_interval
     Discourse.received_redis_readonly!
   end
 
   RailsFailover::Redis.on_fallback do
     Discourse.clear_readonly!
     Discourse.request_refresh!
+    MessageBus.keepalive_interval = message_bus_keepalive_interval
   end
 end
 

From 8c6a42c589cbcbbc1f8c3dd4d13b7674f2661eb2 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Fri, 5 Jun 2020 18:31:58 +0200
Subject: [PATCH 1586/1830] FIX: Redirects containing Unicode usernames didn't
 work

---
 app/controllers/application_controller.rb     |  2 +-
 app/controllers/email_controller.rb           |  2 +-
 app/controllers/user_avatars_controller.rb    |  4 +--
 app/controllers/users_controller.rb           |  4 +--
 app/models/user.rb                            |  4 +++
 spec/fabricators/user_fabricator.rb           |  4 +++
 spec/models/user_spec.rb                      | 15 +++++++++
 spec/requests/application_controller_spec.rb  |  9 ++++++
 spec/requests/email_controller_spec.rb        | 12 +++++--
 spec/requests/user_avatars_controller_spec.rb | 26 ++++++++++++++--
 spec/requests/users_controller_spec.rb        | 31 ++++++++++++++-----
 spec/support/integration_helpers.rb           |  2 +-
 12 files changed, 96 insertions(+), 19 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2ce9f875ff..c59266e130 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -760,7 +760,7 @@ class ApplicationController < ActionController::Base
     return if !current_user
     return if !should_enforce_2fa?
 
-    redirect_path = "#{GlobalSetting.relative_url_root}/u/#{current_user.username}/preferences/second-factor"
+    redirect_path = path("/u/#{current_user.encoded_username}/preferences/second-factor")
     if !request.fullpath.start_with?(redirect_path)
       redirect_to path(redirect_path)
       nil
diff --git a/app/controllers/email_controller.rb b/app/controllers/email_controller.rb
index 5e8b8d63af..a7d283a6b2 100644
--- a/app/controllers/email_controller.rb
+++ b/app/controllers/email_controller.rb
@@ -7,7 +7,7 @@ class EmailController < ApplicationController
   before_action :ensure_logged_in, only: :preferences_redirect
 
   def preferences_redirect
-    redirect_to(email_preferences_path(current_user.username_lower))
+    redirect_to path("/u/#{current_user.encoded_username}/preferences/emails")
   end
 
   def unsubscribe
diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb
index 13fc1f8cd9..3b0dd7099c 100644
--- a/app/controllers/user_avatars_controller.rb
+++ b/app/controllers/user_avatars_controller.rb
@@ -109,7 +109,7 @@ class UserAvatarsController < ApplicationController
 
     if !Discourse.avatar_sizes.include?(size) && Discourse.store.external?
       closest = Discourse.avatar_sizes.to_a.min { |a, b| (size - a).abs <=> (size - b).abs }
-      avatar_url = UserAvatar.local_avatar_url(hostname, user.username_lower, upload_id, closest)
+      avatar_url = UserAvatar.local_avatar_url(hostname, user.encoded_username(lower: true), upload_id, closest)
       return redirect_to cdn_path(avatar_url)
     end
 
@@ -117,7 +117,7 @@ class UserAvatarsController < ApplicationController
     upload ||= user.uploaded_avatar if user.uploaded_avatar_id == upload_id
 
     if user.uploaded_avatar && !upload
-      avatar_url = UserAvatar.local_avatar_url(hostname, user.username_lower, user.uploaded_avatar_id, size)
+      avatar_url = UserAvatar.local_avatar_url(hostname, user.encoded_username(lower: true), user.uploaded_avatar_id, size)
       return redirect_to cdn_path(avatar_url)
     elsif upload && optimized = get_optimized_image(upload, size)
       if optimized.local?
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 12d9643b57..4230335442 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -130,7 +130,7 @@ class UsersController < ApplicationController
   end
 
   def user_preferences_redirect
-    redirect_to email_preferences_path(current_user.username_lower)
+    redirect_to path("/u/#{current_user.encoded_username}/preferences")
   end
 
   def update
@@ -273,7 +273,7 @@ class UsersController < ApplicationController
       cookies[:destination_url] = path("/my/#{params[:path]}")
       redirect_to path("/login-preferences")
     else
-      redirect_to(path("/u/#{current_user.username}/#{params[:path]}"))
+      redirect_to(path("/u/#{current_user.encoded_username}/#{params[:path]}"))
     end
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 0147c62b1b..fdade36364 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1302,6 +1302,10 @@ class User < ActiveRecord::Base
       .pluck(:credential_id)
   end
 
+  def encoded_username(lower: false)
+    UrlHelper.encode_component(lower ? username_lower : username)
+  end
+
   protected
 
   def badge_grant
diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb
index 6e6e4624f9..759a5a43d3 100644
--- a/spec/fabricators/user_fabricator.rb
+++ b/spec/fabricators/user_fabricator.rb
@@ -112,3 +112,7 @@ end
 Fabricator(:staged, from: :user) do
   staged true
 end
+
+Fabricator(:unicode_user, from: :user) do
+  username { sequence(:username) { |i| "Löwe#{i}" } }
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 4d2592c788..2a50cd82c1 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2373,4 +2373,19 @@ describe User do
   def reset_last_seen_cache!(user)
     Discourse.redis.del("user:#{user.id}:#{Time.zone.now.to_date}")
   end
+
+  describe ".encoded_username" do
+    it "doesn't encoded ASCII usernames" do
+      user = Fabricate(:user, username: "John")
+      expect(user.encoded_username).to eq("John")
+      expect(user.encoded_username(lower: true)).to eq("john")
+    end
+
+    it "encodes Unicode characters" do
+      SiteSetting.unicode_usernames = true
+      user = Fabricate(:user, username: "Löwe")
+      expect(user.encoded_username).to eq("L%C3%B6we")
+      expect(user.encoded_username(lower: true)).to eq("l%C3%B6we")
+    end
+  end
 end
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index 8e4dc439d8..0e3fe9a9c6 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -162,6 +162,15 @@ RSpec.describe ApplicationController do
       expect(response.status).to eq(200)
     end
 
+    it "correctly redirects for Unicode usernames" do
+      SiteSetting.enforce_second_factor = "all"
+      SiteSetting.unicode_usernames = true
+      user = sign_in(Fabricate(:unicode_user))
+
+      get "/"
+      expect(response).to redirect_to("/u/#{user.encoded_username}/preferences/second-factor")
+    end
+
     context "when enforcing second factor for staff" do
       before do
         SiteSetting.enforce_second_factor = "staff"
diff --git a/spec/requests/email_controller_spec.rb b/spec/requests/email_controller_spec.rb
index ec60265f66..9c9ab97232 100644
--- a/spec/requests/email_controller_spec.rb
+++ b/spec/requests/email_controller_spec.rb
@@ -176,11 +176,17 @@ RSpec.describe EmailController do
     end
 
     context 'when logged in' do
-      let!(:user) { sign_in(Fabricate(:user)) }
-
       it 'redirects to your user preferences' do
+        user = sign_in(Fabricate(:user))
         get "/email_preferences.json"
-        expect(response).to redirect_to("/u/#{user.username}/preferences")
+        expect(response).to redirect_to("/u/#{user.username}/preferences/emails")
+      end
+
+      it "correctly redirects for Unicode usernames" do
+        SiteSetting.unicode_usernames = true
+        user = sign_in(Fabricate(:unicode_user))
+        get "/email_preferences.json"
+        expect(response).to redirect_to("/u/#{user.encoded_username}/preferences/emails")
       end
     end
   end
diff --git a/spec/requests/user_avatars_controller_spec.rb b/spec/requests/user_avatars_controller_spec.rb
index 9772fe4b2d..4f639fd15b 100644
--- a/spec/requests/user_avatars_controller_spec.rb
+++ b/spec/requests/user_avatars_controller_spec.rb
@@ -75,10 +75,10 @@ describe UserAvatarsController do
       SiteSetting.s3_secret_access_key = "XXX"
       SiteSetting.s3_upload_bucket = "test"
       SiteSetting.s3_cdn_url = "http://cdn.com"
+      SiteSetting.unicode_usernames = true
 
       stub_request(:get, "http://cdn.com/something/else").to_return(body: 'image')
-
-      GlobalSetting.stubs(:cdn_url).returns("http://awesome.com/boom")
+      set_cdn_url("http://awesome.com/boom")
 
       upload = Fabricate(:upload, url: "//test.s3.dualstack.us-east-1.amazonaws.com/something")
 
@@ -103,6 +103,11 @@ describe UserAvatarsController do
       expect(response.body).to eq("image")
       expect(response.headers["Cache-Control"]).to eq('max-age=31556952, public, immutable')
       expect(response.headers["Last-Modified"]).to eq(optimized_image.upload.created_at.httpdate)
+
+      user.update!(username: "Löwe")
+
+      get "/user_avatar/default/#{user.encoded_username}/97/#{upload.id}.png"
+      expect(response).to redirect_to("http://awesome.com/boom/user_avatar/default/#{user.encoded_username(lower: true)}/98/#{upload.id}_#{OptimizedImage::VERSION}.png")
     end
 
     it 'serves new version for old urls' do
@@ -149,5 +154,22 @@ describe UserAvatarsController do
 
       expect(response.status).to eq(200)
     end
+
+    it "serves the correct image when the upload id changed" do
+      SiteSetting.avatar_sizes = "50"
+      SiteSetting.unicode_usernames = true
+
+      upload = Fabricate(:upload)
+      another_upload = Fabricate(:upload)
+      user = Fabricate(:user, uploaded_avatar_id: upload.id)
+
+      get "/user_avatar/default/#{user.username}/50/#{another_upload.id}.png"
+      expect(response).to redirect_to("http://test.localhost/user_avatar/default/#{user.username_lower}/50/#{upload.id}_#{OptimizedImage::VERSION}.png")
+
+      user.update!(username: "Löwe")
+
+      get "/user_avatar/default/#{user.encoded_username}/50/#{another_upload.id}.png"
+      expect(response).to redirect_to("http://test.localhost/user_avatar/default/#{user.encoded_username(lower: true)}/50/#{upload.id}_#{OptimizedImage::VERSION}.png")
+    end
   end
 end
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 5d3e0bc0de..9ec957d1c9 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -2433,8 +2433,10 @@ describe UsersController do
 
   describe '#my_redirect' do
     it "redirects if the user is not logged in" do
-      get "/my/wat.json"
-      expect(response).to be_redirect
+      get "/my/wat"
+      expect(response).to redirect_to("/login-preferences")
+      expect(response.cookies).to have_key("destination_url")
+      expect(response.cookies["destination_url"]).to eq("/my/wat")
       expect(response.headers['X-Robots-Tag']).to eq('noindex')
     end
 
@@ -2447,13 +2449,21 @@ describe UsersController do
       end
 
       it "will redirect to an valid path" do
-        get "/my/preferences.json"
-        expect(response).to be_redirect
+        get "/my/preferences"
+        expect(response).to redirect_to("/u/#{user.username}/preferences")
       end
 
       it "permits forward slashes" do
-        get "/my/activity/posts.json"
-        expect(response).to be_redirect
+        get "/my/activity/posts"
+        expect(response).to redirect_to("/u/#{user.username}/activity/posts")
+      end
+
+      it "correctly redirects for Unicode usernames" do
+        SiteSetting.unicode_usernames = true
+        user = sign_in(Fabricate(:unicode_user))
+
+        get "/my/preferences"
+        expect(response).to redirect_to("/u/#{user.encoded_username}/preferences")
       end
     end
   end
@@ -3495,7 +3505,14 @@ describe UsersController do
     it "redirects to their profile when logged in" do
       sign_in(user)
       get '/user_preferences'
-      expect(response).to redirect_to("/u/#{user.username_lower}/preferences")
+      expect(response).to redirect_to("/u/#{user.username}/preferences")
+    end
+
+    it "correctly redirects for Unicode usernames" do
+      SiteSetting.unicode_usernames = true
+      user = sign_in(Fabricate(:unicode_user))
+      get '/user_preferences'
+      expect(response).to redirect_to("/u/#{user.encoded_username}/preferences")
     end
   end
 
diff --git a/spec/support/integration_helpers.rb b/spec/support/integration_helpers.rb
index 8155ef4d2c..6cb93acbdf 100644
--- a/spec/support/integration_helpers.rb
+++ b/spec/support/integration_helpers.rb
@@ -26,7 +26,7 @@ module IntegrationHelpers
   end
 
   def sign_in(user)
-    get "/session/#{user.username}/become"
+    get "/session/#{user.encoded_username}/become"
     user
   end
 

From 0bf753a7396b7440b7a259dc47cc1be94a016957 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Fri, 5 Jun 2020 18:42:12 +0200
Subject: [PATCH 1587/1830] DEV: Remove unused routes

---
 app/controllers/email_controller.rb    |  5 -----
 app/controllers/users_controller.rb    |  8 ++------
 config/routes.rb                       |  5 +----
 spec/requests/email_controller_spec.rb | 22 ----------------------
 spec/requests/users_controller_spec.rb | 20 --------------------
 5 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/app/controllers/email_controller.rb b/app/controllers/email_controller.rb
index a7d283a6b2..deabbf1ffb 100644
--- a/app/controllers/email_controller.rb
+++ b/app/controllers/email_controller.rb
@@ -4,11 +4,6 @@ class EmailController < ApplicationController
   layout 'no_ember'
 
   skip_before_action :check_xhr, :preload_json, :redirect_to_login_if_required
-  before_action :ensure_logged_in, only: :preferences_redirect
-
-  def preferences_redirect
-    redirect_to path("/u/#{current_user.encoded_username}/preferences/emails")
-  end
 
   def unsubscribe
     @not_found = true
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4230335442..8e63e97f66 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -4,7 +4,7 @@ class UsersController < ApplicationController
   skip_before_action :authorize_mini_profiler, only: [:avatar]
 
   requires_login only: [
-    :username, :update, :user_preferences_redirect, :upload_user_image,
+    :username, :update, :upload_user_image,
     :pick_avatar, :destroy_user_image, :destroy, :check_emails,
     :topic_tracking_state, :preferences, :create_second_factor_totp,
     :enable_second_factor_totp, :disable_second_factor, :list_second_factors,
@@ -16,7 +16,7 @@ class UsersController < ApplicationController
 
   skip_before_action :check_xhr, only: [
     :show, :badges, :password_reset_show, :password_reset_update, :update, :account_created,
-    :activate_account, :perform_account_activation, :user_preferences_redirect, :avatar,
+    :activate_account, :perform_account_activation, :avatar,
     :my_redirect, :toggle_anon, :admin_login, :confirm_admin, :email_login, :summary,
     :feature_topic, :clear_featured_topic, :bookmarks
   ]
@@ -129,10 +129,6 @@ class UsersController < ApplicationController
     show
   end
 
-  def user_preferences_redirect
-    redirect_to path("/u/#{current_user.encoded_username}/preferences")
-  end
-
   def update
     user = fetch_user_from_params
     guardian.ensure_can_edit!(user)
diff --git a/config/routes.rb b/config/routes.rb
index e04bc60dad..d837af541b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -315,8 +315,6 @@ Discourse::Application.routes.draw do
 
     end # admin namespace
 
-    get "email_preferences" => "email#preferences_redirect", :as => "email_preferences_redirect"
-
     get "email/unsubscribe/:key" => "email#unsubscribe", as: "email_unsubscribe"
     get "email/unsubscribed" => "email#unsubscribed", as: "email_unsubscribed"
     post "email/unsubscribe/:key" => "email#perform_unsubscribe", as: "email_perform_unsubscribe"
@@ -374,7 +372,6 @@ Discourse::Application.routes.draw do
     end
 
     get "my/*path", to: 'users#my_redirect'
-    get "user_preferences" => "users#user_preferences_redirect"
     get ".well-known/change-password", to: redirect(relative_url_root + 'my/preferences/account', status: 302)
 
     get "user-cards" => "users#cards", format: :json
@@ -442,7 +439,7 @@ Discourse::Application.routes.draw do
       get({ "#{root_path}/:username" => "users#show", constraints: { username: RouteFormat.username } }.merge(index == 1 ? { as: 'user' } : {}))
       put "#{root_path}/:username" => "users#update", constraints: { username: RouteFormat.username }, defaults: { format: :json }
       get "#{root_path}/:username/emails" => "users#check_emails", constraints: { username: RouteFormat.username }
-      get({ "#{root_path}/:username/preferences" => "users#preferences", constraints: { username: RouteFormat.username } }.merge(index == 1 ? { as: :email_preferences } : {}))
+      get "#{root_path}/:username/preferences" => "users#preferences", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username/preferences/email" => "users_email#index", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username/preferences/account" => "users#preferences", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username/preferences/profile" => "users#preferences", constraints: { username: RouteFormat.username }
diff --git a/spec/requests/email_controller_spec.rb b/spec/requests/email_controller_spec.rb
index 9c9ab97232..e0764c6aea 100644
--- a/spec/requests/email_controller_spec.rb
+++ b/spec/requests/email_controller_spec.rb
@@ -169,28 +169,6 @@ RSpec.describe EmailController do
     end
   end
 
-  context '#preferences_redirect' do
-    it 'requires you to be logged in' do
-      get "/email_preferences.json"
-      expect(response.status).to eq(403)
-    end
-
-    context 'when logged in' do
-      it 'redirects to your user preferences' do
-        user = sign_in(Fabricate(:user))
-        get "/email_preferences.json"
-        expect(response).to redirect_to("/u/#{user.username}/preferences/emails")
-      end
-
-      it "correctly redirects for Unicode usernames" do
-        SiteSetting.unicode_usernames = true
-        user = sign_in(Fabricate(:unicode_user))
-        get "/email_preferences.json"
-        expect(response).to redirect_to("/u/#{user.encoded_username}/preferences/emails")
-      end
-    end
-  end
-
   context '#unsubscribe' do
     it 'displays not found if key is not found' do
       navigate_to_unsubscribe(SecureRandom.hex)
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 9ec957d1c9..d6edb84c06 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -3496,26 +3496,6 @@ describe UsersController do
     end
   end
 
-  describe '#user_preferences_redirect' do
-    it 'requires the user to be logged in' do
-      get '/user_preferences'
-      expect(response.status).to eq(404)
-    end
-
-    it "redirects to their profile when logged in" do
-      sign_in(user)
-      get '/user_preferences'
-      expect(response).to redirect_to("/u/#{user.username}/preferences")
-    end
-
-    it "correctly redirects for Unicode usernames" do
-      SiteSetting.unicode_usernames = true
-      user = sign_in(Fabricate(:unicode_user))
-      get '/user_preferences'
-      expect(response).to redirect_to("/u/#{user.encoded_username}/preferences")
-    end
-  end
-
   describe '#email_login' do
     before do
       SiteSetting.enable_local_logins_via_email = true

From 4ce618e55b9d3ad90f071de1e265bed3bdd0618b Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 8 Jun 2020 17:04:46 +0800
Subject: [PATCH 1588/1830] Bump rails_failover.

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1d6cf080a0..881a72a1f8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/discourse/rails_failover
-  revision: 81f5009d7c94f359b7dd0cbca06c327aa95e3851
+  revision: 66602aa73785851b81c506f0023d3c2a2e40de0a
   specs:
     rails_failover (0.4.0)
       activerecord (~> 6.0)

From 833b5d89e007f1e61dcb876dcb1b1fa672fe1fc2 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 8 Jun 2020 10:42:59 +0100
Subject: [PATCH 1589/1830] PERF: Cache PrettyText instance for rendering
 composer preview (#9987)

Previously we were building pretty-text from scratch on every keypress
---
 .../discourse/app/components/d-editor.js        | 17 ++++++++++++++---
 .../javascripts/discourse/app/lib/text.js       |  9 +++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index 87cec774a9..b8fda2c5b8 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -9,7 +9,7 @@ import discourseComputed, {
 } from "discourse-common/utils/decorators";
 import { categoryHashtagTriggerRule } from "discourse/lib/category-hashtags";
 import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
-import { cookAsync } from "discourse/lib/text";
+import { generateCookFunction } from "discourse/lib/text";
 import { getRegister } from "discourse-common/lib/get-owner";
 import { findRawTemplate } from "discourse-common/lib/raw-templates";
 import { siteDir } from "discourse/lib/text-direction";
@@ -344,15 +344,26 @@ export default Component.extend({
     return toolbar;
   },
 
+  cachedCookAsync(text) {
+    if (this._cachedCookFunction) {
+      return Promise.resolve(this._cachedCookFunction(text));
+    }
+
+    const markdownOptions = this.markdownOptions || {};
+    return generateCookFunction(markdownOptions).then(cook => {
+      this._cachedCookFunction = cook;
+      return cook(text);
+    });
+  },
+
   _updatePreview() {
     if (this._state !== "inDOM") {
       return;
     }
 
     const value = this.value;
-    const markdownOptions = this.markdownOptions || {};
 
-    cookAsync(value, markdownOptions).then(cooked => {
+    this.cachedCookAsync(value).then(cooked => {
       if (this.isDestroyed) {
         return;
       }
diff --git a/app/assets/javascripts/discourse/app/lib/text.js b/app/assets/javascripts/discourse/app/lib/text.js
index afca9415f7..a6d5bf21ef 100644
--- a/app/assets/javascripts/discourse/app/lib/text.js
+++ b/app/assets/javascripts/discourse/app/lib/text.js
@@ -38,6 +38,15 @@ export function cookAsync(text, options) {
   return loadMarkdownIt().then(() => cook(text, options));
 }
 
+// Warm up pretty text with a set of options and return a function
+// which can be used to cook without rebuilding prettytext every time
+export function generateCookFunction(options) {
+  return loadMarkdownIt().then(() => {
+    const prettyText = createPrettyText(options);
+    return text => prettyText.cook(text);
+  });
+}
+
 export function sanitize(text, options) {
   return textSanitize(text, new WhiteLister(options));
 }

From f7d676dce19bc44f969d6b84ec820e2c72da3903 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 8 Jun 2020 12:20:27 +0100
Subject: [PATCH 1590/1830] DEV: Correct historical schema discrepancies
 (#9955)

Rails schema defaults have changed over the years. This migration will correct discrepancies, and make all databases match the modern schema.
---
 ...0601130900_correct_schema_discrepancies.rb | 249 ++++++++++++++++++
 1 file changed, 249 insertions(+)
 create mode 100644 db/migrate/20200601130900_correct_schema_discrepancies.rb

diff --git a/db/migrate/20200601130900_correct_schema_discrepancies.rb b/db/migrate/20200601130900_correct_schema_discrepancies.rb
new file mode 100644
index 0000000000..dc7e1bdd9c
--- /dev/null
+++ b/db/migrate/20200601130900_correct_schema_discrepancies.rb
@@ -0,0 +1,249 @@
+# frozen_string_literal: true
+
+class CorrectSchemaDiscrepancies < ActiveRecord::Migration[6.0]
+  disable_ddl_transaction!
+
+  def up
+    timestamp_columns = %w{
+      category_tag_groups.created_at
+      category_tag_groups.updated_at
+      category_tags.created_at
+      category_tags.updated_at
+      child_themes.created_at
+      child_themes.updated_at
+      embeddable_hosts.created_at
+      embeddable_hosts.updated_at
+      group_archived_messages.created_at
+      group_archived_messages.updated_at
+      group_mentions.created_at
+      group_mentions.updated_at
+      muted_users.created_at
+      muted_users.updated_at
+      permalinks.created_at
+      permalinks.updated_at
+      post_stats.created_at
+      post_stats.updated_at
+      remote_themes.created_at
+      remote_themes.updated_at
+      stylesheet_cache.created_at
+      stylesheet_cache.updated_at
+      tag_group_memberships.created_at
+      tag_group_memberships.updated_at
+      tag_groups.created_at
+      tag_groups.updated_at
+      tag_users.created_at
+      tag_users.updated_at
+      tags.created_at
+      tags.updated_at
+      theme_fields.created_at
+      theme_fields.updated_at
+      topic_tags.created_at
+      topic_tags.updated_at
+      topic_timers.created_at
+      topic_timers.updated_at
+      unsubscribe_keys.created_at
+      unsubscribe_keys.updated_at
+      user_api_keys.created_at
+      user_api_keys.updated_at
+      user_archived_messages.created_at
+      user_archived_messages.updated_at
+      user_auth_tokens.created_at
+      user_auth_tokens.updated_at
+      user_emails.created_at
+      user_emails.updated_at
+      user_exports.created_at
+      user_exports.updated_at
+      user_field_options.created_at
+      user_field_options.updated_at
+      user_fields.created_at
+      user_fields.updated_at
+      user_warnings.created_at
+      user_warnings.updated_at
+      watched_words.created_at
+      watched_words.updated_at
+      web_hook_events.created_at
+      web_hook_events.updated_at
+      web_hooks.created_at
+      web_hooks.updated_at
+    }
+
+    char_limit_columns = %w{
+      badge_groupings.name
+      badge_posts.action_code
+      badge_posts.edit_reason
+      badge_types.name
+      badges.icon
+      badges.name
+      categories.email_in
+      categories.slug
+      color_scheme_colors.hex
+      color_scheme_colors.name
+      color_schemes.name
+      draft_sequences.draft_key
+      drafts.draft_key
+      email_logs.email_type
+      email_logs.to_address
+      email_tokens.email
+      email_tokens.token
+      embeddable_hosts.host
+      github_user_infos.screen_name
+      groups.name
+      groups.title
+      invites.email
+      message_bus.context
+      message_bus.name
+      oauth2_user_infos.email
+      oauth2_user_infos.name
+      oauth2_user_infos.provider
+      oauth2_user_infos.uid
+      optimized_images.url
+      plugin_store_rows.key
+      plugin_store_rows.plugin_name
+      plugin_store_rows.type_name
+      post_details.key
+      post_details.value
+      post_search_data.locale
+      posts.action_code
+      posts.edit_reason
+      schema_migrations.version
+      screened_emails.email
+      screened_urls.domain
+      screened_urls.url
+      single_sign_on_records.external_email
+      single_sign_on_records.external_id
+      single_sign_on_records.external_name
+      single_sign_on_records.external_username
+      site_settings.name
+      stylesheet_cache.digest
+      stylesheet_cache.target
+      themes.name
+      topic_links.title
+      topic_search_data.locale
+      topics.archetype
+      topics.slug
+      topics.subtype
+      topics.title
+      uploads.original_filename
+      uploads.url
+      user_exports.file_name
+      user_field_options.value
+      user_fields.description
+      user_fields.field_type
+      user_fields.name
+      user_histories.context
+      user_histories.custom_type
+      user_histories.email
+      user_histories.ip_address
+      user_open_ids.email
+      user_open_ids.url
+      user_profiles.location
+      user_profiles.website
+      users.name
+      users.title
+    }
+
+    float_default_columns = %w{
+      top_topics.all_score
+      top_topics.daily_score
+      top_topics.monthly_score
+      top_topics.weekly_score
+      top_topics.yearly_score
+    }
+
+    other_default_columns = %w{
+      categories.color
+      topic_search_data.topic_id
+    }
+
+    lookup_sql = (
+      timestamp_columns +
+      char_limit_columns +
+      float_default_columns +
+      other_default_columns
+    ).map do |ref|
+      table, column = ref.split(".")
+      "(table_name='#{table}' AND column_name='#{column}')"
+    end.join(" OR ")
+
+    raw_info = DB.query_hash <<~SQL
+      SELECT table_name, column_name, is_nullable, character_maximum_length, column_default
+      FROM information_schema.columns 
+      WHERE table_schema='public' 
+      AND (
+        #{lookup_sql}
+      )
+    SQL
+
+    schema_hash = {}
+
+    raw_info.each do |row|
+      schema_hash["#{row["table_name"]}.#{row["column_name"]}"] = row
+    end
+
+    # In the past, rails changed the default behavior for timestamp columns
+    # This only affects older discourse installations
+    # This migration will make old database schemas match modern behavior
+    timestamp_columns.each do |ref|
+      current_value = schema_hash[ref]["is_nullable"]
+      next if current_value == "NO"
+
+      table, column = ref.split(".")
+
+      # There shouldn't be any null values - rails inserts timestamps automatically
+      # But just in case, set them to now() if there are any nulls
+      DB.exec <<~SQL
+        UPDATE #{table} SET #{column} = now() WHERE #{column} IS NULL
+      SQL
+
+      DB.exec <<~SQL
+        ALTER TABLE #{table} ALTER COLUMN #{column} SET NOT NULL
+      SQL
+    end
+
+    # In the past, rails changed the default behavior for varchar columns
+    # This only affects older discourse installations
+    # This migration removes the character limits from columns, so that they match modern behavior
+    char_limit_columns.each do |ref|
+      current_value = schema_hash[ref]["character_maximum_length"]
+      next if current_value == nil
+      table, column = ref.split(".")
+
+      DB.exec <<~SQL
+        ALTER TABLE #{table} ALTER COLUMN #{column} TYPE varchar
+      SQL
+    end
+
+    # In the past, rails changed the default behavior for float columns
+    # This only affects older discourse installations
+    # This migration updates the default values, so that they match modern behavior
+    float_default_columns.each do |ref|
+      current_value = schema_hash[ref]["column_default"]
+      next if current_value == "0.0"
+      table, column = ref.split(".")
+
+      DB.exec <<~SQL
+        ALTER TABLE #{table} ALTER COLUMN #{column} SET DEFAULT 0.0
+      SQL
+    end
+
+    # Category color default was changed in https://github.com/discourse/discourse/commit/faf09bb8c80fcb28b132a5a644ac689cc9abffc2
+    # But should have been added in a new migration
+    if schema_hash["categories.color"]["column_default"] != "'0088CC'::character varying"
+      DB.exec <<~SQL
+        ALTER TABLE categories ALTER COLUMN color SET DEFAULT '0088CC'
+      SQL
+    end
+
+    # Older sites have a default value like nextval('topic_search_data_topic_id_seq'::regclass)
+    # Modern sites do not. This is likely caused by another historical change in rails
+    if schema_hash["topic_search_data.topic_id"]["column_default"] != nil
+      DB.exec <<~SQL
+        ALTER TABLE topic_search_data ALTER COLUMN topic_id SET DEFAULT NULL
+      SQL
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

From 556380f97075c25f59bb88e4f547930792897f8e Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 8 Jun 2020 13:07:56 +0100
Subject: [PATCH 1591/1830] DEV: Do not attempt to change schema badge_posts
 view

Followup to f7d676dc
---
 db/migrate/20200601130900_correct_schema_discrepancies.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/db/migrate/20200601130900_correct_schema_discrepancies.rb b/db/migrate/20200601130900_correct_schema_discrepancies.rb
index dc7e1bdd9c..0531b789be 100644
--- a/db/migrate/20200601130900_correct_schema_discrepancies.rb
+++ b/db/migrate/20200601130900_correct_schema_discrepancies.rb
@@ -69,8 +69,6 @@ class CorrectSchemaDiscrepancies < ActiveRecord::Migration[6.0]
 
     char_limit_columns = %w{
       badge_groupings.name
-      badge_posts.action_code
-      badge_posts.edit_reason
       badge_types.name
       badges.icon
       badges.name

From 472862e87da7eb718b5220da1516cc5b7046adc6 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 8 Jun 2020 13:52:31 +0100
Subject: [PATCH 1592/1830] DEV: Do not attempt to change schema of posts table

Changing this requires rebuilding the badge_posts view, so will need to be done separately

Followup to f7d676dc
---
 db/migrate/20200601130900_correct_schema_discrepancies.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/db/migrate/20200601130900_correct_schema_discrepancies.rb b/db/migrate/20200601130900_correct_schema_discrepancies.rb
index 0531b789be..ad18fed7c9 100644
--- a/db/migrate/20200601130900_correct_schema_discrepancies.rb
+++ b/db/migrate/20200601130900_correct_schema_discrepancies.rb
@@ -101,8 +101,6 @@ class CorrectSchemaDiscrepancies < ActiveRecord::Migration[6.0]
       post_details.key
       post_details.value
       post_search_data.locale
-      posts.action_code
-      posts.edit_reason
       schema_migrations.version
       screened_emails.email
       screened_urls.domain

From cb13152a43a409d5629e8cdd6e67660129832b7e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 8 Jun 2020 15:16:42 +0200
Subject: [PATCH 1593/1830] FIX: ensures edit-category-setting is correctly
 casting boolean (#9999)

---
 .../app/components/edit-category-settings.js     | 11 +++++++++--
 .../components/edit-category-settings.hbs        | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

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 c811ce2db6..5dc44ee02b 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-settings.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-settings.js
@@ -108,11 +108,18 @@ export default buildCategoryPanel("settings", {
       .sort((a, b) => a.name.localeCompare(b.name));
   },
 
+  @discourseComputed("category.sort_ascending")
+  sortAscendingOption(sortAscending) {
+    if (sortAscending === "false") return false;
+    if (sortAscending === "true") return true;
+    return sortAscending;
+  },
+
   @discourseComputed
   sortAscendingOptions() {
     return [
-      { name: I18n.t("category.sort_ascending"), value: "true" },
-      { name: I18n.t("category.sort_descending"), value: "false" }
+      { name: I18n.t("category.sort_ascending"), value: true },
+      { name: I18n.t("category.sort_descending"), value: false }
     ];
   }
 });
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 a569876fd8..5520c045a7 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
@@ -181,17 +181,25 @@
       {{i18n "category.sort_order"}}
     </label>
     <div class="controls">
-      {{combo-box valueProperty="value" content=availableSorts value=category.sort_order none="category.sort_options.default"}}
+      {{combo-box
+        valueProperty="value"
+        content=availableSorts
+        value=category.sort_order
+        options=(hash
+          none="category.sort_options.default"
+        )
+        onChange=(action (mut category.sort_order))
+      }}
       {{#unless isDefaultSortOrder}}
         {{combo-box
-          castBoolean=true
           valueProperty="value"
           content=sortAscendingOptions
-          value=category.sort_ascending
-          none="category.sort_options.default"
+          value=sortAscendingOption
           options=(hash
+            none="category.sort_options.default"
             placementStrategy="absolute"
           )
+          onChange=(action (mut category.sort_ascending))
         }}
       {{/unless}}
     </div>

From 052c91770f590e7489e751724a096beda9c37576 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Mon, 8 Jun 2020 16:23:33 +0300
Subject: [PATCH 1594/1830] FIX: Reply notifications should not appear as
 edited (#9965)

---
 app/services/post_alerter.rb       |  6 +++---
 spec/services/post_alerter_spec.rb | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index 02924fa3cd..79d8b7e71b 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -101,7 +101,7 @@ class PostAlerter
       if post.topic.private_message?
         notify_pm_users(post, reply_to_user, notified)
       elsif notify_about_reply?(post)
-        notify_post_users(post, notified)
+        notify_post_users(post, notified, new_record: new_record)
       end
     end
 
@@ -566,7 +566,7 @@ class PostAlerter
     end
   end
 
-  def notify_post_users(post, notified, include_category_watchers: true, include_tag_watchers: true)
+  def notify_post_users(post, notified, include_category_watchers: true, include_tag_watchers: true, new_record: false)
     return unless post.topic
 
     warn_if_not_sidekiq
@@ -627,7 +627,7 @@ class PostAlerter
     already_seen_user_ids = Set.new TopicUser.where(topic_id: post.topic.id).where("highest_seen_post_number >= ?", post.post_number).pluck(:user_id)
 
     each_user_in_batches(notify) do |user|
-      notification_type = already_seen_user_ids.include?(user.id) ? Notification.types[:edited] : Notification.types[:posted]
+      notification_type = !new_record && already_seen_user_ids.include?(user.id) ? Notification.types[:edited] : Notification.types[:posted]
       opts = {}
       opts[:display_username] = post.last_editor.username if notification_type == Notification.types[:edited]
       create_notification(user, notification_type, post, opts)
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index f3794d8bcb..35c4b866ff 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -1130,6 +1130,7 @@ describe PostAlerter do
     fab!(:post) { Fabricate(:post, topic: topic) }
     fab!(:last_editor) { Fabricate(:user) }
     fab!(:tag) { Fabricate(:tag) }
+    fab!(:category) { Fabricate(:category) }
 
     it 'creates single edit notification when post is modified' do
       TopicUser.create!(user_id: user.id, topic_id: topic.id, notification_level: TopicUser.notification_levels[:watching], highest_seen_post_number: post.post_number)
@@ -1142,5 +1143,26 @@ describe PostAlerter do
       PostAlerter.new.notify_post_users(post, [])
       expect(Notification.count).to eq(1)
     end
+
+    it 'creates posted notification when Sidekiq is slow' do
+      CategoryUser.set_notification_level_for_category(user, CategoryUser.notification_levels[:watching], category.id)
+
+      post = PostCreator.create!(
+        Fabricate(:user),
+        title: "one of my first topics",
+        raw: "one of my first posts",
+        category: category.id
+      )
+
+      TopicUser.change(user, post.topic_id, highest_seen_post_number: post.post_number)
+
+      # Manually run job after the user read the topic to simulate a slow
+      # Sidekiq.
+      job_args = Jobs::PostAlert.jobs[0]['args'][0]
+      expect { Jobs::PostAlert.new.execute(job_args.with_indifferent_access) }
+        .to change { Notification.count }.by(1)
+
+      expect(Notification.last.notification_type).to eq(Notification.types[:posted])
+    end
   end
 end

From bdba17cdf79f76bd29816a5b7375553ef3f1afac Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 8 Jun 2020 10:13:46 -0400
Subject: [PATCH 1595/1830] FIX: Restore stream position in safari (#9993)

Safari uses an aggressive back/forward cache, which means the app loads
very quickly when hitting Back. But, in topics with > 30 posts, hitting
Back runs post stream calculations too early, which means that users
get taken back to an earlier point in the stream, consistently.

Using `onpageshow`, we can restore the correct location before the post
stream calculations take place.
---
 .../discourse/app/components/scrolling-post-stream.js      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js b/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js
index cb9b3dac27..399e2a7e63 100644
--- a/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js
+++ b/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js
@@ -333,6 +333,13 @@ export default MountWidget.extend({
     });
 
     this.appEvents.on("post-stream:refresh", this, "_refresh");
+
+    // restore scroll position on browsers with aggressive BFCaches (like Safari)
+    window.onpageshow = function(event) {
+      if (event.persisted) {
+        DiscourseURL.routeTo(this.location.pathname);
+      }
+    };
   },
 
   willDestroyElement() {

From fbeaba4acf2f613b4910d331f2a01d39a7ef3463 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 8 Jun 2020 16:45:30 -0400
Subject: [PATCH 1596/1830] FIX: don't override category text color in dropdown

---
 .../stylesheets/common/select-kit/category-chooser.scss      | 2 +-
 app/assets/stylesheets/common/select-kit/category-drop.scss  | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/common/select-kit/category-chooser.scss b/app/assets/stylesheets/common/select-kit/category-chooser.scss
index 695e539053..11c5435917 100644
--- a/app/assets/stylesheets/common/select-kit/category-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/category-chooser.scss
@@ -23,7 +23,7 @@
 
         .topic-count {
           font-size: $font-down-1;
-          color: $primary;
+          color: $primary-medium;
           white-space: nowrap;
           margin-left: 0.5em;
           font-weight: normal;
diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss
index d7a6b3e0ba..792665b896 100644
--- a/app/assets/stylesheets/common/select-kit/category-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/category-drop.scss
@@ -63,10 +63,7 @@
           margin-left: 0.5em;
           font-weight: normal;
           color: $primary-medium;
-        }
-
-        .category-name {
-          color: $primary;
+          font-size: $font-down-1;
         }
 
         .badge-wrapper {

From c5b1f028edaa2bc7151da30a47ec323321a5f5f5 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 8 Jun 2020 17:10:26 -0400
Subject: [PATCH 1597/1830] FIX: update minimum required tag when switching
 categories in composer

---
 .../addon/components/mini-tag-chooser.js      |  2 +-
 .../addon/components/single-select.js         | 47 ++++++++++---------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js
index 94b9fa055a..5c7035a022 100644
--- a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js
+++ b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js
@@ -10,7 +10,6 @@ const SELECTED_TAGS_COLLECTION = "MINI_TAG_CHOOSER_SELECTED_TAGS";
 import { ERRORS_COLLECTION } from "select-kit/components/select-kit";
 
 export default ComboBox.extend(TagsMixin, {
-  headerComponent: "mini-tag-chooser/mini-tag-chooser-header",
   pluginApiIdentifiers: ["mini-tag-chooser"],
   attributeBindings: ["selectKit.options.categoryId:category-id"],
   classNames: ["mini-tag-chooser"],
@@ -31,6 +30,7 @@ export default ComboBox.extend(TagsMixin, {
   ),
 
   selectKitOptions: {
+    headerComponent: "mini-tag-chooser/mini-tag-chooser-header",
     fullWidthOnMobile: true,
     filterable: true,
     caretDownIcon: "caretIcon",
diff --git a/app/assets/javascripts/select-kit/addon/components/single-select.js b/app/assets/javascripts/select-kit/addon/components/single-select.js
index 7338d80ecf..12ed3fef67 100644
--- a/app/assets/javascripts/select-kit/addon/components/single-select.js
+++ b/app/assets/javascripts/select-kit/addon/components/single-select.js
@@ -12,31 +12,36 @@ export default SelectKitComponent.extend({
     headerComponent: "select-kit/single-select-header"
   },
 
-  selectedContent: computed("value", "content.[]", function() {
-    if (!isEmpty(this.value)) {
-      let content;
+  selectedContent: computed(
+    "value",
+    "content.[]",
+    "selectKit.noneItem",
+    function() {
+      if (!isEmpty(this.value)) {
+        let content;
 
-      const value =
-        this.selectKit.options.castInteger && this._isNumeric(this.value)
-          ? Number(this.value)
-          : this.value;
+        const value =
+          this.selectKit.options.castInteger && this._isNumeric(this.value)
+            ? Number(this.value)
+            : this.value;
 
-      if (this.selectKit.valueProperty) {
-        content = (this.content || []).findBy(
-          this.selectKit.valueProperty,
-          value
-        );
+        if (this.selectKit.valueProperty) {
+          content = (this.content || []).findBy(
+            this.selectKit.valueProperty,
+            value
+          );
 
-        return this.selectKit.modifySelection(
-          content || this.defaultItem(value, value)
-        );
+          return this.selectKit.modifySelection(
+            content || this.defaultItem(value, value)
+          );
+        } else {
+          return this.selectKit.modifySelection(
+            (this.content || []).filter(c => c === value)
+          );
+        }
       } else {
-        return this.selectKit.modifySelection(
-          (this.content || []).filter(c => c === value)
-        );
+        return this.selectKit.noneItem;
       }
-    } else {
-      return this.selectKit.noneItem;
     }
-  })
+  )
 });

From 4065cd198abdeb22c19a1167545dd8f1b66b97c9 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 9 Jun 2020 10:21:40 +0800
Subject: [PATCH 1598/1830] DEV: Print backtrace of error when plugin fails to
 initialize.

---
 lib/plugin_initialization_guard.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/plugin_initialization_guard.rb b/lib/plugin_initialization_guard.rb
index 42c1bda864..8b5935dc37 100644
--- a/lib/plugin_initialization_guard.rb
+++ b/lib/plugin_initialization_guard.rb
@@ -42,6 +42,8 @@ def plugin_initialization_guard(&block)
         initialization:
 
         #{error}
+
+        #{error.backtrace.join("\n")}
       MESSAGE
     end
     exit 1

From 9b050f28224df99ca2e5ac83b790e77603215e1e Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Mon, 8 Jun 2020 19:48:51 -0700
Subject: [PATCH 1599/1830] FIX: Enforce maximum of 100 years on all site
 settings counted in days (#9991)

---
 config/site_settings.yml | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index 382f2f63a3..11705c8e24 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -148,11 +148,11 @@ basic:
   suggested_topics_unread_max_days_old:
     default: 90
     min: 0
-    max: 10000
+    max: 36500
   suggested_topics_max_days_old:
     default: 365
     min: 7
-    max: 10000
+    max: 36500
   ga_universal_tracking_code:
     client: true
     default: ""
@@ -530,6 +530,7 @@ users:
     default: true
   invite_expiry_days:
     default: 30
+    max: 36500
   invites_per_page:
     client: true
     default: 40
@@ -553,6 +554,7 @@ users:
     min: 1
   purge_unactivated_users_grace_period_days:
     default: 14
+    max: 36500
   public_user_custom_fields:
     type: list
     default: ""
@@ -595,14 +597,15 @@ users:
     default: 365
     client: true
     min: 1
+    max: 36500
   clean_up_inactive_users_after_days:
     default: 730
     min: 0
-    max: 3650
+    max: 36500
   clean_up_unused_staged_users_after_days:
     default: 365
     min: 0
-    max: 3650
+    max: 36500
   user_selected_primary_groups:
     default: false
     client: true
@@ -836,6 +839,7 @@ posting:
     default: false
   show_time_gap_days:
     default: 7
+    max: 36500
     client: true
   short_progress_text_threshold:
     client: true
@@ -930,6 +934,7 @@ posting:
     client: true
   old_post_notice_days:
     default: 14
+    max: 36500
     client: true
   new_user_notice_tl:
     default: 2
@@ -939,6 +944,7 @@ posting:
     enum: "TrustLevelSetting"
   returning_users_days:
     default: 120
+    max: 36500
   enable_page_publishing:
     default: false
 
@@ -968,6 +974,7 @@ email:
     max: 20
   suppress_digest_email_after_days:
     default: 365
+    max: 36500
   digest_suppress_categories:
     type: category_list
     default: ""
@@ -1048,8 +1055,10 @@ email:
     default: false
   disallow_reply_by_email_after_days:
     default: 90
+    max: 36500
   delete_email_logs_after_days:
     default: 90
+    max: 36500
   max_emails_per_day_per_user: 100
   enable_staged_users: true
   maximum_staged_users_per_email: 10
@@ -1079,6 +1088,7 @@ email:
     min: 2
   reset_bounce_score_after_days:
     default: 30
+    max: 36500
   attachment_content_type_blacklist:
     type: list
     default: "pkcs7|x-vcard"
@@ -1111,7 +1121,9 @@ email:
   post_excerpts_in_emails: false
   raw_email_max_length: 220000
   raw_rejected_email_max_length: 4000
-  delete_rejected_email_after_days: 90
+  delete_rejected_email_after_days:
+    default: 90
+    max: 36500
 
 files:
   max_image_size_kb:
@@ -1174,6 +1186,7 @@ files:
   clean_orphan_uploads_grace_period_hours: 48
   purge_deleted_uploads_grace_period_days:
     default: 30
+    max: 36500
   prevent_anons_from_downloading_files:
     default: false
     client: true
@@ -1327,6 +1340,7 @@ trust:
   tl2_requires_time_spent_mins: 60
   tl2_requires_days_visited:
     default: 15
+    max: 36500
   tl2_requires_likes_received: 1
   tl2_requires_likes_given: 1
   tl2_requires_topic_reply_count: 3
@@ -1336,6 +1350,7 @@ trust:
     max: 1000000
   tl3_requires_days_visited:
     default: 50
+    max: 36500
   tl3_requires_topics_replied_to:
     default: 10
   tl3_requires_topics_viewed:
@@ -1450,7 +1465,7 @@ security:
   invalidate_inactive_admin_email_after_days:
     default: 365
     min: 0
-    max: 2000
+    max: 36500
   allow_embedding_site_in_an_iframe:
     default: false
     hidden: true
@@ -1868,12 +1883,15 @@ uncategorized:
   # Cold map thresholds
   cold_age_days_low:
     default: 14
+    max: 36500
     client: true
   cold_age_days_medium:
     default: 90
+    max: 36500
     client: true
   cold_age_days_high:
     default: 180
+    max: 36500
     client: true
 
   # Warnings
@@ -1932,6 +1950,7 @@ uncategorized:
 
   delete_drafts_older_than_n_days:
     default: 180
+    max: 36500
 
   backup_drafts_to_pm_length:
     default: 0
@@ -2122,6 +2141,7 @@ user_preferences:
 api:
   retain_web_hook_events_period_days:
     default: 30
+    max: 36500
   retry_web_hook_events:
     default: false
   api_key_last_used_epoch:
@@ -2129,6 +2149,7 @@ api:
     hidden: true
   revoke_api_keys_days:
     default: 180
+    max: 36500
 
 user_api:
   allow_user_api_keys:
@@ -2152,6 +2173,7 @@ user_api:
     type: list
   expire_user_api_keys_days:
     default: 180
+    max: 36500
 
 tags:
   tagging_enabled:

From d09bf892c77bf9f2eb53d4b1ebf6a5e8ef325886 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 8 Jun 2020 23:58:53 -0400
Subject: [PATCH 1600/1830] UX: Improve layout of topic pin admin modal

---
 .../app/templates/modal/feature-topic.hbs     | 40 ++++++++++---------
 .../common/base/topic-admin-menu.scss         | 34 +++++++++++-----
 2 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/feature-topic.hbs
index 4dbbafd384..fddb84f15a 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/feature-topic.hbs
@@ -53,15 +53,17 @@
         {{else}}
           <p class="with-validation">
             {{html-safe pinMessage}}
-            {{d-icon "far-clock"}}
-            {{future-date-input
-              class="pin-until"
-              includeFarFuture=true
-              clearable=true
-              input=model.pinnedInCategoryUntil
-              onChangeInput=(action (mut model.pinnedInCategoryUntil))
-            }}
-            {{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}}
+            <span>
+              {{d-icon "far-clock"}}
+              {{future-date-input
+                class="pin-until"
+                includeFarFuture=true
+                clearable=true
+                input=model.pinnedInCategoryUntil
+                onChangeInput=(action (mut model.pinnedInCategoryUntil))
+              }}
+              {{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}}
+            </span>
           </p>
         {{/if}}
         <p>
@@ -100,15 +102,17 @@
         {{else}}
           <p class="with-validation">
             {{i18n "topic.feature_topic.pin_globally"}}
-            {{d-icon "far-clock"}}
-            {{future-date-input
-              class="pin-until"
-              includeFarFuture=true
-              clearable=true
-              input=model.pinnedGloballyUntil
-              onChangeInput=(action (mut model.pinnedGloballyUntil))
-            }}
-            {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
+            <span>
+              {{d-icon "far-clock"}}
+              {{future-date-input
+                class="pin-until"
+                includeFarFuture=true
+                clearable=true
+                input=model.pinnedGloballyUntil
+                onChangeInput=(action (mut model.pinnedGloballyUntil))
+              }}
+              {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
+            </span>
           </p>
         {{/if}}
         <p>
diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss
index 4a698c9c83..d96719d5ec 100644
--- a/app/assets/stylesheets/common/base/topic-admin-menu.scss
+++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss
@@ -25,13 +25,14 @@
 }
 
 .modal-body.feature-topic {
-  max-height: 500px;
+  max-height: 70vh !important ;
+  padding: 0 1em;
   input.date-picker {
     margin: 0;
   }
   .feature-section {
     display: block;
-    padding: 1em 0;
+    padding: 1.25em 0;
     &:not(:last-of-type) {
       border-bottom: 1px solid $primary-low;
     }
@@ -46,10 +47,20 @@
       }
       p {
         margin: 10px 0 0;
+        max-width: 31em;
       }
     }
     .with-validation {
       position: relative;
+
+      > span {
+        display: flex;
+        align-items: flex-start;
+        > .d-icon {
+          padding-top: 0.75em;
+          margin-right: 0.5em;
+        }
+      }
     }
   }
 }
@@ -61,18 +72,16 @@
 }
 
 .desktop-view .feature-topic-modal {
-  .feature-topic {
-    overflow: visible;
-  }
-
-  .modal-inner-container {
-    min-width: 700px;
-  }
-
   .pin-until {
     position: relative;
     display: inline-block;
   }
+  .modal-inner-container {
+    overflow: visible;
+  }
+  .modal-footer {
+    background: $secondary;
+  }
 }
 
 .mobile-view .feature-topic .feature-section {
@@ -82,6 +91,11 @@
     max-width: 90%;
     margin: 0;
   }
+  .badge-wrapper {
+    white-space: nowrap;
+    overflow: hidden;
+    max-width: 19em;
+  }
 }
 
 // Select posts

From 3e210b76d9ff236430af3699feb25ce34163ae39 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 9 Jun 2020 14:47:30 +1000
Subject: [PATCH 1601/1830] FIX: Change bookmark name "name" attr to disable
 autocomplete

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

diff --git a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
index 26679f3285..615ae16b07 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
@@ -9,7 +9,7 @@
     {{/if}}
 
     <div class="control-group bookmark-name-wrap">
-      {{input id="bookmark-name" value=model.name name="name" class="bookmark-name" placeholder=(i18n "post.bookmarks.name_placeholder")}}
+      {{input id="bookmark-name" value=model.name name="bookmark-name" class="bookmark-name" placeholder=(i18n "post.bookmarks.name_placeholder")}}
       {{d-button icon="cog" action=(action "toggleOptionsPanel") class="bookmark-options-button"}}
     </div>
 

From 8b434531e445d054c6e7ad76f1cd00d17179729e Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 9 Jun 2020 14:11:53 +0800
Subject: [PATCH 1602/1830] Bump message_bus to 3.3.1.

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 881a72a1f8..189cfed62a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -191,7 +191,7 @@ GEM
       mini_mime (>= 0.1.1)
     maxminddb (0.1.22)
     memory_profiler (0.9.14)
-    message_bus (3.3.0)
+    message_bus (3.3.1)
       rack (>= 1.1.3)
     method_source (1.0.0)
     mini_mime (1.0.2)

From 08044b4f946decf75efc74e1e4151ed30168285f Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 9 Jun 2020 17:22:51 +1000
Subject: [PATCH 1603/1830] FIX: emoji autocomplete triggering incorrectly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previous to this fix the we were checking for non letters.

This was mismatching what pretty-text/addon/emoji.js was doing.

`ù:su`

and

`1:su`

Would lead to an emoji autocomplete popup in the composer.
---
 app/assets/javascripts/discourse/app/components/d-editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index b8fda2c5b8..4917acc81c 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -436,7 +436,7 @@ export default Component.extend({
           return false;
         }
 
-        const matches = /(?:^|[^a-z])(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/gi.exec(
+        const matches = /(?:^|[>.,\/#!$%^&*;:{}=\-_`~()])(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/gi.exec(
           text.substring(0, cp)
         );
 

From 716629dc0affb7887efbd2d9b765aaf34055ab1d Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 9 Jun 2020 17:40:41 +1000
Subject: [PATCH 1604/1830] DEV: correct flaky test relying on possibly valid
 user id

This test lasted about 7 years prior to it becoming flaky.

Today ... for whatever reason the test suite created 100 users
prior to running this spec. So the new user becomes user id 101

And... lo and behold:

```

  1) PostSerializer a hidden post with add_raw enabled a hidden post shows the raw post only if authorized to see it
     Failure/Error: expect(serialized_post_for_user(Fabricate(:user))[:raw]).to eq(nil)

       expected: nil
            got: "Raw contents of the post."

       (compared using ==)
     # ./spec/serializers/post_serializer_spec.rb:127:in `block (4 levels) in <main>'
```
---
 spec/serializers/post_serializer_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb
index 91ca676ecd..dc633ba80c 100644
--- a/spec/serializers/post_serializer_spec.rb
+++ b/spec/serializers/post_serializer_spec.rb
@@ -106,7 +106,7 @@ describe PostSerializer do
   end
 
   context "a hidden post with add_raw enabled" do
-    let(:user) { Fabricate.build(:user, id: 101) }
+    let(:user) { Fabricate.build(:user, id: -99999) }
     let(:raw)  { "Raw contents of the post." }
 
     context "a public post" do

From a1c13eb3c63d569f1ac6efa6a6eccf9b0a52cab4 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 9 Jun 2020 16:36:04 +0800
Subject: [PATCH 1605/1830] DEV: Redis failover should only clear redis
 recently readonly.

---
 config/initializers/002-rails_failover.rb |  2 +-
 lib/discourse.rb                          | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index 72df0c9917..d53451bc4c 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -10,7 +10,7 @@ if ENV["REDIS_RAILS_FAILOVER"]
   end
 
   RailsFailover::Redis.on_fallback do
-    Discourse.clear_readonly!
+    Discourse.clear_redis_readonly!
     Discourse.request_refresh!
     MessageBus.keepalive_interval = message_bus_keepalive_interval
   end
diff --git a/lib/discourse.rb b/lib/discourse.rb
index c46d91e362..67ac64c297 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -518,12 +518,21 @@ module Discourse
     postgres_last_read_only[Discourse.redis.namespace] = Time.zone.now
   end
 
+  def self.clear_postgres_readonly!
+    postgres_last_read_only[Discourse.redis.namespace] = nil
+  end
+
   def self.received_redis_readonly!
     redis_last_read_only[Discourse.redis.namespace] = Time.zone.now
   end
 
+  def self.clear_redis_readonly!
+    redis_last_read_only[Discourse.redis.namespace] = nil
+  end
+
   def self.clear_readonly!
-    postgres_last_read_only[Discourse.redis.namespace] = redis_last_read_only[Discourse.redis.namespace] = nil
+    clear_redis_readonly!
+    clear_postgres_readonly!
     Site.clear_anon_cache!
     true
   end

From c35649ccf1f5b7f6b262e7334df169e5dd9264ee Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 9 Jun 2020 16:44:38 +0800
Subject: [PATCH 1606/1830] DEV: Remove Redis noop logging.

When Redis drops into readonly mode, it floods the log. The log isn't
actionable and we have other means of knowing that an app is in readonly
mode.
---
 lib/discourse_redis.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index b172c02d12..096c86b574 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -172,10 +172,6 @@ class DiscourseRedis
     yield
   rescue Redis::CommandError => ex
     if ex.message =~ /READONLY/
-      unless Discourse.recently_readonly? || Rails.env.test?
-        STDERR.puts "WARN: Redis is in a readonly state. Performed a noop"
-      end
-
       if !ENV["REDIS_RAILS_FAILOVER"]
         fallback_handler.verify_master if !fallback_handler.master
       end

From edc940ce3e36a3e80c3744f787f3dcf4820b8521 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 9 Jun 2020 17:05:14 +0800
Subject: [PATCH 1607/1830] DEV: Fix incorrect messagebus redis config for
 rails_failover.

---
 app/models/global_setting.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index 54dc310e61..c32b2b2e08 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -200,8 +200,8 @@ class GlobalSetting
 
         if message_bus_redis_slave_host && message_bus_redis_slave_port
           if ENV["REDIS_RAILS_FAILOVER"]
-            c[:replica_host] = redis_slave_host
-            c[:replica_port] = redis_slave_port
+            c[:replica_host] = message_bus_redis_slave_host
+            c[:replica_port] = message_bus_redis_slave_port
             c[:connector] = RailsFailover::Redis::Connector
           else
             c[:slave_host] = message_bus_redis_slave_host

From f1fc6cd40d5cb77c1f43ab3cebc368147851db2f Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 9 Jun 2020 14:33:24 +0100
Subject: [PATCH 1608/1830] DEV: Add user-card-additional-buttons plugin outlet

The user-card-additional-controls outlet is outside the `<li>` element, which makes styling difficult. Placing an outlet inside the button list means that themes/plugins can easily reuse core styling.
---
 .../discourse/app/templates/components/user-card-contents.hbs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
index 8218fc3735..5b40fe9e97 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
@@ -104,6 +104,10 @@
               label="admin.user.delete"}}
             </li>
           {{/if}}
+          {{plugin-outlet
+            name="user-card-additional-buttons"
+            args=(hash user=this.user close=(action "close"))
+            tagName="li"}}
         </ul>
         {{plugin-outlet
         name="user-card-additional-controls"

From 6b7a2d6d4d9726ebf7c8d365bfecfd444220af9c Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 9 Jun 2020 15:26:27 +0200
Subject: [PATCH 1609/1830] DEV: Remove non-existent option from setup-ruby
 Github action

---
 .github/workflows/ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7e7ce7f41f..03f4e109c7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -77,7 +77,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: "x64"
 
       - name: Setup bundler
         run: |

From 3094459cd979e95067e5299e08fc94cf3f8ea0d3 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Tue, 9 Jun 2020 20:49:32 +0530
Subject: [PATCH 1610/1830] FEATURE: multiple use invite links (#9813)

---
 .../app/components/invite-link-panel.js       |  98 +++++++
 .../discourse/app/controllers/invites-show.js |  74 ++++--
 .../app/controllers/user-invited-show.js      |  28 +-
 .../discourse/app/models/invite.js            |  11 +-
 .../javascripts/discourse/app/models/user.js  |  11 +
 .../discourse/app/routes/user-invited-show.js |  51 +++-
 .../components/future-date-input.hbs          |   2 +-
 .../components/generated-invite-link.hbs      |   6 +-
 .../components/invite-link-panel.hbs          |  59 +++++
 .../discourse/app/templates/invites/show.hbs  |  28 +-
 .../app/templates/user-invited-show.hbs       |  38 ++-
 app/assets/stylesheets/common/base/login.scss |   3 +
 .../components/share-and-invite-modal.scss    |  21 +-
 app/assets/stylesheets/desktop/user.scss      |   4 +
 app/controllers/invites_controller.rb         |  63 +++--
 app/controllers/users_controller.rb           |  27 +-
 app/jobs/regular/anonymize_user.rb            |   2 +-
 app/models/invite.rb                          | 178 ++++++++++---
 app/models/invite_redeemer.rb                 |  50 ++--
 app/models/invited_user.rb                    |  26 ++
 app/models/user.rb                            |   5 +-
 app/serializers/invite_link_serializer.rb     |   9 +
 app/serializers/invite_serializer.rb          |  10 +-
 app/serializers/invited_serializer.rb         |   7 +
 .../invited_user_record_serializer.rb         |  60 +++++
 app/serializers/invited_user_serializer.rb    |  55 +---
 app/services/user_merger.rb                   |   2 +-
 config/locales/client.en.yml                  |  23 +-
 config/locales/server.en.yml                  |   6 +
 config/routes.rb                              |   1 +
 config/site_settings.yml                      |   5 +
 ...8102014_add_bulk_invite_link_to_invites.rb |  17 ++
 .../20200430072846_create_invited_users.rb    |  15 ++
 ...e_invite_redeemed_data_to_invited_users.rb |  26 ++
 lib/badge_queries.rb                          |   3 +-
 lib/guardian.rb                               |   4 +
 .../jobs/send_default_welcome_message_spec.rb |   7 +-
 spec/fabricators/invited_user_fabricator.rb   |   6 +
 spec/models/email_token_spec.rb               |   2 +-
 spec/models/invite_redeemer_spec.rb           |  71 ++++--
 spec/models/invite_spec.rb                    | 142 +++++++++--
 spec/requests/invites_controller_spec.rb      | 241 ++++++++++++------
 spec/requests/users_controller_spec.rb        |  80 ++++--
 spec/services/user_anonymizer_spec.rb         |   8 +-
 spec/services/user_merger_spec.rb             |   5 +-
 spec/services/username_changer_spec.rb        |   4 +-
 .../acceptance/invite-accept-test.js          |  23 +-
 .../invite-show-user-fields-test.js           |  14 +
 48 files changed, 1280 insertions(+), 351 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/components/invite-link-panel.js
 create mode 100644 app/assets/javascripts/discourse/app/templates/components/invite-link-panel.hbs
 create mode 100644 app/models/invited_user.rb
 create mode 100644 app/serializers/invite_link_serializer.rb
 create mode 100644 app/serializers/invited_user_record_serializer.rb
 create mode 100644 db/migrate/20200428102014_add_bulk_invite_link_to_invites.rb
 create mode 100644 db/migrate/20200430072846_create_invited_users.rb
 create mode 100644 db/post_migrate/20200602153813_migrate_invite_redeemed_data_to_invited_users.rb
 create mode 100644 spec/fabricators/invited_user_fabricator.rb

diff --git a/app/assets/javascripts/discourse/app/components/invite-link-panel.js b/app/assets/javascripts/discourse/app/components/invite-link-panel.js
new file mode 100644
index 0000000000..e2691e36fa
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/invite-link-panel.js
@@ -0,0 +1,98 @@
+import I18n from "I18n";
+import Component from "@ember/component";
+import Group from "discourse/models/group";
+import { readOnly } from "@ember/object/computed";
+import { action } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
+import Invite from "discourse/models/invite";
+
+export default Component.extend({
+  inviteModel: readOnly("panel.model.inviteModel"),
+  userInvitedShow: readOnly("panel.model.userInvitedShow"),
+  isStaff: readOnly("currentUser.staff"),
+  maxRedemptionAllowed: 5,
+  inviteExpiresAt: moment()
+    .add(1, "month")
+    .format("YYYY-MM-DD"),
+
+  willDestroyElement() {
+    this._super(...arguments);
+
+    this.reset();
+  },
+
+  @discourseComputed("isStaff", "inviteModel.saving", "maxRedemptionAllowed")
+  disabled(isStaff, saving, canInviteTo, maxRedemptionAllowed) {
+    if (saving) return true;
+    if (!isStaff) return true;
+    if (maxRedemptionAllowed < 2) return true;
+
+    return false;
+  },
+
+  groupFinder(term) {
+    return Group.findAll({ term, ignore_automatic: true });
+  },
+
+  errorMessage: I18n.t("user.invited.invite_link.error"),
+
+  reset() {
+    this.set("maxRedemptionAllowed", 5);
+
+    this.inviteModel.setProperties({
+      groupNames: null,
+      error: false,
+      saving: false,
+      finished: false,
+      inviteLink: null
+    });
+  },
+
+  @action
+  generateMultipleUseInviteLink() {
+    if (this.disabled) {
+      return;
+    }
+
+    const groupNames = this.get("inviteModel.groupNames");
+    const maxRedemptionAllowed = this.maxRedemptionAllowed;
+    const inviteExpiresAt = this.inviteExpiresAt;
+    const userInvitedController = this.userInvitedShow;
+    const model = this.inviteModel;
+    model.setProperties({ saving: true, error: false });
+
+    return model
+      .generateMultipleUseInviteLink(
+        groupNames,
+        maxRedemptionAllowed,
+        inviteExpiresAt
+      )
+      .then(result => {
+        model.setProperties({
+          saving: false,
+          finished: true,
+          inviteLink: result
+        });
+
+        if (userInvitedController) {
+          Invite.findInvitedBy(
+            this.currentUser,
+            userInvitedController.filter
+          ).then(inviteModel => {
+            userInvitedController.setProperties({
+              model: inviteModel,
+              totalInvites: inviteModel.invites.length
+            });
+          });
+        }
+      })
+      .catch(e => {
+        if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
+          this.set("errorMessage", e.jqXHR.responseJSON.errors[0]);
+        } else {
+          this.set("errorMessage", I18n.t("user.invited.invite_link.error"));
+        }
+        model.setProperties({ saving: false, error: true });
+      });
+  }
+});
diff --git a/app/assets/javascripts/discourse/app/controllers/invites-show.js b/app/assets/javascripts/discourse/app/controllers/invites-show.js
index b421b77058..a38ec6e1a9 100644
--- a/app/assets/javascripts/discourse/app/controllers/invites-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/invites-show.js
@@ -1,16 +1,18 @@
 import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
-import { alias, notEmpty } from "@ember/object/computed";
+import { alias, notEmpty, or, readOnly } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 import getUrl from "discourse-common/lib/get-url";
 import DiscourseURL from "discourse/lib/url";
 import { ajax } from "discourse/lib/ajax";
+import { emailValid } from "discourse/lib/utilities";
 import PasswordValidation from "discourse/mixins/password-validation";
 import UsernameValidation from "discourse/mixins/username-validation";
 import NameValidation from "discourse/mixins/name-validation";
 import UserFieldsValidation from "discourse/mixins/user-fields-validation";
 import { findAll as findLoginMethods } from "discourse/models/login-method";
+import EmberObject from "@ember/object";
 
 export default Controller.extend(
   PasswordValidation,
@@ -18,7 +20,7 @@ export default Controller.extend(
   NameValidation,
   UserFieldsValidation,
   {
-    invitedBy: alias("model.invited_by"),
+    invitedBy: readOnly("model.invited_by"),
     email: alias("model.email"),
     accountUsername: alias("model.username"),
     passwordRequired: notEmpty("accountPassword"),
@@ -26,6 +28,21 @@ export default Controller.extend(
     errorMessage: null,
     userFields: null,
     inviteImageUrl: getUrl("/images/envelope.svg"),
+    isInviteLink: readOnly("model.is_invite_link"),
+    submitDisabled: or(
+      "emailValidation.failed",
+      "usernameValidation.failed",
+      "passwordValidation.failed",
+      "nameValidation.failed",
+      "userFieldsValidation.failed"
+    ),
+    rejectedEmails: null,
+
+    init() {
+      this._super(...arguments);
+
+      this.rejectedEmails = [];
+    },
 
     @discourseComputed
     welcomeTitle() {
@@ -44,21 +61,6 @@ export default Controller.extend(
       return findLoginMethods().length > 0;
     },
 
-    @discourseComputed(
-      "usernameValidation.failed",
-      "passwordValidation.failed",
-      "nameValidation.failed",
-      "userFieldsValidation.failed"
-    )
-    submitDisabled(
-      usernameFailed,
-      passwordFailed,
-      nameFailed,
-      userFieldsFailed
-    ) {
-      return usernameFailed || passwordFailed || nameFailed || userFieldsFailed;
-    },
-
     @discourseComputed
     fullnameRequired() {
       return (
@@ -66,6 +68,35 @@ export default Controller.extend(
       );
     },
 
+    @discourseComputed("email", "rejectedEmails.[]")
+    emailValidation(email, rejectedEmails) {
+      // If blank, fail without a reason
+      if (isEmpty(email)) {
+        return EmberObject.create({
+          failed: true
+        });
+      }
+
+      if (rejectedEmails.includes(email)) {
+        return EmberObject.create({
+          failed: true,
+          reason: I18n.t("user.email.invalid")
+        });
+      }
+
+      if (emailValid(email)) {
+        return EmberObject.create({
+          ok: true,
+          reason: I18n.t("user.email.ok")
+        });
+      }
+
+      return EmberObject.create({
+        failed: true,
+        reason: I18n.t("user.email.invalid")
+      });
+    },
+
     actions: {
       submit() {
         const userFields = this.userFields;
@@ -80,6 +111,7 @@ export default Controller.extend(
           url: `/invites/show/${this.get("model.token")}.json`,
           type: "PUT",
           data: {
+            email: this.email,
             username: this.accountUsername,
             name: this.accountName,
             password: this.accountPassword,
@@ -97,6 +129,14 @@ export default Controller.extend(
                 DiscourseURL.redirectTo(result.redirect_to);
               }
             } else {
+              if (
+                result.errors &&
+                result.errors.email &&
+                result.errors.email.length > 0 &&
+                result.values
+              ) {
+                this.rejectedEmails.pushObject(result.values.email);
+              }
               if (
                 result.errors &&
                 result.errors.password &&
diff --git a/app/assets/javascripts/discourse/app/controllers/user-invited-show.js b/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
index eb3a42fd14..7e8f67ebe2 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
@@ -1,5 +1,5 @@
 import I18n from "I18n";
-import { equal, reads, gte } from "@ember/object/computed";
+import { equal, reads } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import Invite from "discourse/models/invite";
 import discourseDebounce from "discourse/lib/debounce";
@@ -35,21 +35,30 @@ export default Controller.extend({
   }, INPUT_DELAY),
 
   inviteRedeemed: equal("filter", "redeemed"),
+  invitePending: equal("filter", "pending"),
+
+  @discourseComputed("filter")
+  inviteLinks(filter) {
+    return filter === "links" && this.currentUser.staff;
+  },
 
   @discourseComputed("filter")
   showBulkActionButtons(filter) {
     return (
       filter === "pending" &&
       this.model.invites.length > 4 &&
-      this.currentUser.get("staff")
+      this.currentUser.staff
     );
   },
 
   canInviteToForum: reads("currentUser.can_invite_to_forum"),
-
   canBulkInvite: reads("currentUser.admin"),
+  canSendInviteLink: reads("currentUser.staff"),
 
-  showSearch: gte("totalInvites", 10),
+  @discourseComputed("totalInvites", "inviteLinks")
+  showSearch(totalInvites, inviteLinks) {
+    return totalInvites >= 10 && !inviteLinks;
+  },
 
   @discourseComputed("invitesCount.total", "invitesCount.pending")
   pendingLabel(invitesCountTotal, invitesCountPending) {
@@ -73,6 +82,17 @@ export default Controller.extend({
     }
   },
 
+  @discourseComputed("invitesCount.total", "invitesCount.links")
+  linksLabel(invitesCountTotal, invitesCountLinks) {
+    if (invitesCountTotal > 50) {
+      return I18n.t("user.invited.links_tab_with_count", {
+        count: invitesCountLinks
+      });
+    } else {
+      return I18n.t("user.invited.links_tab");
+    }
+  },
+
   actions: {
     rescind(invite) {
       invite.rescind();
diff --git a/app/assets/javascripts/discourse/app/models/invite.js b/app/assets/javascripts/discourse/app/models/invite.js
index 7eb142c0ab..347ca71d68 100644
--- a/app/assets/javascripts/discourse/app/models/invite.js
+++ b/app/assets/javascripts/discourse/app/models/invite.js
@@ -10,7 +10,7 @@ const Invite = EmberObject.extend({
   rescind() {
     ajax("/invites", {
       type: "DELETE",
-      data: { email: this.email }
+      data: { id: this.id }
     });
     this.set("rescinded", true);
   },
@@ -42,7 +42,14 @@ Invite.reopenClass({
     if (!isNone(search)) data.search = search;
     data.offset = offset || 0;
 
-    return ajax(userPath(`${user.username_lower}/invited.json`), {
+    let path;
+    if (filter === "links") {
+      path = userPath(`${user.username_lower}/invite_links.json`);
+    } else {
+      path = userPath(`${user.username_lower}/invited.json`);
+    }
+
+    return ajax(path, {
       data
     }).then(result => {
       result.invites = result.invites.map(i => Invite.create(i));
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index a6356182f3..113b592c27 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -654,6 +654,17 @@ const User = RestModel.extend({
     });
   },
 
+  generateMultipleUseInviteLink(
+    group_names,
+    max_redemptions_allowed,
+    expires_at
+  ) {
+    return ajax("/invites/link", {
+      type: "POST",
+      data: { group_names, max_redemptions_allowed, expires_at }
+    });
+  },
+
   @observes("muted_category_ids")
   updateMutedCategories() {
     this.set("mutedCategories", Category.findByIds(this.muted_category_ids));
diff --git a/app/assets/javascripts/discourse/app/routes/user-invited-show.js b/app/assets/javascripts/discourse/app/routes/user-invited-show.js
index 3cd83f79ce..7af69e14df 100644
--- a/app/assets/javascripts/discourse/app/routes/user-invited-show.js
+++ b/app/assets/javascripts/discourse/app/routes/user-invited-show.js
@@ -30,18 +30,51 @@ export default DiscourseRoute.extend({
 
   actions: {
     showInvite() {
+      const panels = [
+        {
+          id: "invite",
+          title: "user.invited.single_user",
+          model: {
+            inviteModel: this.currentUser,
+            userInvitedShow: this.controllerFor("user-invited-show")
+          }
+        }
+      ];
+
+      if (this.get("currentUser.staff")) {
+        panels.push({
+          id: "invite-link",
+          title: "user.invited.multiple_user",
+          model: {
+            inviteModel: this.currentUser,
+            userInvitedShow: this.controllerFor("user-invited-show")
+          }
+        });
+      }
+
       showModal("share-and-invite", {
         modalClass: "share-and-invite",
-        panels: [
-          {
-            id: "invite",
-            title: "user.invited.create",
-            model: {
-              inviteModel: this.currentUser,
-              userInvitedShow: this.controllerFor("user-invited-show")
-            }
+        panels
+      });
+    },
+
+    editInvite(inviteKey) {
+      const inviteLink = `${Discourse.BaseUrl}/invites/${inviteKey}`;
+      this.currentUser.setProperties({ finished: true, inviteLink });
+      const panels = [
+        {
+          id: "invite-link",
+          title: "user.invited.generate_link",
+          model: {
+            inviteModel: this.currentUser,
+            userInvitedShow: this.controllerFor("user-invited-show")
           }
-        ]
+        }
+      ];
+
+      showModal("share-and-invite", {
+        modalClass: "share-and-invite",
+        panels
       });
     }
   }
diff --git a/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
index 14da87147f..6e6b117e08 100644
--- a/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
@@ -31,7 +31,7 @@
 
     <div class="control-group">
       {{d-icon "far-clock"}}
-      {{input placeholder="--:--" type="time" value=time disabled=timeInputDisabled}}
+      {{input placeholder="--:--" type="time" class="time-input" value=time disabled=timeInputDisabled}}
     </div>
   {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/generated-invite-link.hbs b/app/assets/javascripts/discourse/app/templates/components/generated-invite-link.hbs
index 9e10822972..cd83a56e3e 100644
--- a/app/assets/javascripts/discourse/app/templates/components/generated-invite-link.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/generated-invite-link.hbs
@@ -1,5 +1,7 @@
 <p>{{i18n "user.invited.link_generated"}}</p>
 <p>
-  <input value={{link}} class="invite-link-input" style="width: 75%" type="text">
+  <input value={{link}} class="invite-link-input" type="text">
 </p>
-<p>{{i18n "user.invited.valid_for" email=email}}</p>
+{{#if email}}
+  <p>{{i18n "user.invited.valid_for" email=email}}</p>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/invite-link-panel.hbs b/app/assets/javascripts/discourse/app/templates/components/invite-link-panel.hbs
new file mode 100644
index 0000000000..cc1b30041c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/invite-link-panel.hbs
@@ -0,0 +1,59 @@
+{{#if inviteModel.error}}
+  <div class="alert alert-error">
+    {{html-safe errorMessage}}
+  </div>
+{{/if}}
+
+<div class="body">
+  {{#if inviteModel.finished}}
+    {{generated-invite-link link=inviteModel.inviteLink}}
+  {{else}}
+
+    <div class="group-access-control">
+      <label class="instructions">
+        {{i18n "topic.automatically_add_to_groups"}}
+      </label>
+      {{group-selector
+        fullWidthWrap=true
+        groupFinder=groupFinder
+        groupNames=inviteModel.groupNames
+        placeholderKey="topic.invite_private.group_name"}}
+    </div>
+
+    <div class="max-redemptions-allowed">
+      <label class="instructions">
+        {{i18n 'user.invited.invite_link.max_redemptions_allowed_label'}}
+      </label>
+      {{input type="number" value=maxRedemptionAllowed class="max-redemptions-allowed-input" min="2" max=siteSettings.invite_link_max_redemptions_limit}}
+    </div>
+
+    <div class="invite-link-expires-at">
+      <label class="instructions">
+        {{i18n 'user.invited.invite_link.expires_at'}}
+      </label>
+      {{future-date-input
+        includeDateTime=true
+        includeMidFuture=true
+        clearable=true
+        onChangeInput=(action (mut inviteExpiresAt))
+      }}
+    </div>
+
+  {{/if}}
+</div>
+
+<div class="footer">
+  {{#if inviteModel.finished}}
+    {{d-button
+      class="btn-primary"
+      action=(route-action "closeModal")
+      label="close"}}
+  {{else}}
+    {{d-button
+        icon="link"
+        action=(action "generateMultipleUseInviteLink")
+        class="btn-primary generate-invite-link"
+        disabled=disabled
+        label="user.invited.generate_link"}}
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/invites/show.hbs b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
index 96804f5f82..8739fc3924 100644
--- a/app/assets/javascripts/discourse/app/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
@@ -16,18 +16,30 @@
         <p>{{i18n "invites.invited_by"}}</p>
         <p>{{user-info user=invitedBy}}</p>
 
-        <p>
-          {{html-safe yourEmailMessage}}
-          {{#if externalAuthsEnabled}}
-            {{i18n "invites.social_login_available"}}
-          {{/if}}
-        </p>
+        {{#unless isInviteLink}}
+          <p>
+            {{html-safe yourEmailMessage}}
+            {{#if externalAuthsEnabled}}
+              {{i18n "invites.social_login_available"}}
+            {{/if}}
+          </p>
+        {{/unless}}
 
         <form>
+
+          {{#if isInviteLink}}
+            <div class="input email-input">
+              <label>{{i18n "user.email.title"}}</label>
+              {{input type="email" value=email id="new-account-email" name="email" autofocus="autofocus"}}
+              {{input-tip validation=emailValidation id="account-email-validation"}}
+              <div class="instructions">{{i18n "user.email.instructions"}}</div>
+            </div>
+          {{/if}}
+
           <div class="input username-input">
             <label>{{i18n "user.username.title"}}</label>
             {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="discourse"}}
-            &nbsp;{{input-tip validation=usernameValidation id="username-validation"}}
+            {{input-tip validation=usernameValidation id="username-validation"}}
             <div class="instructions">{{i18n "user.username.instructions"}}</div>
           </div>
 
@@ -42,7 +54,7 @@
           <div class="input password-input">
             <label>{{i18n "invites.password_label"}}</label>
             {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
-            &nbsp;{{input-tip validation=passwordValidation}}
+            {{input-tip validation=passwordValidation}}
             <div class="instructions">
               {{passwordInstructions}} {{i18n "invites.optional_description"}}
               <div class="caps-lock-warning {{unless capsLockOn "invisible"}}">
diff --git a/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
index 1def791972..9396e7f90f 100644
--- a/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
@@ -5,11 +5,14 @@
         <h2>{{i18n "user.invited.title"}}</h2>
 
         {{#if model.can_see_invite_details}}
-          <div class="admin-controls">
+          <div class="admin-controls invite-controls">
             <nav>
               <ul class="nav nav-pills">
                 {{nav-item route="userInvited.show" routeParam="pending" i18nLabel=pendingLabel}}
                 {{nav-item route="userInvited.show" routeParam="redeemed" i18nLabel=redeemedLabel}}
+                {{#if canSendInviteLink}}
+                  {{nav-item route="userInvited.show" routeParam="links" i18nLabel=linksLabel}}
+                {{/if}}
               </ul>
             </nav>
 
@@ -17,7 +20,6 @@
               {{d-button icon="plus" action=(route-action "showInvite") label="user.invited.create"}}
               {{#if canBulkInvite}}
                 {{csv-uploader uploading=uploading}}
-                <a href="https://meta.discourse.org/t/sending-bulk-user-invites/16468" rel="noopener noreferrer" target="_blank" style="color:black;">{{d-icon "question-circle"}}</a>
               {{/if}}
               {{#if showBulkActionButtons}}
                 {{#if rescindedAll}}
@@ -54,15 +56,25 @@
                     <th>{{i18n "user.invited.posts_read_count"}}</th>
                     <th>{{i18n "user.invited.time_read"}}</th>
                     <th>{{i18n "user.invited.days_visited"}}</th>
+                    {{#if canSendInviteLink}}
+                      <th>{{i18n "user.invited.source"}}</th>
+                    {{/if}}
                   {{/if}}
-                {{else}}
+                {{else if invitePending}}
                   <th colspan="1">{{i18n "user.invited.user"}}</th>
                   <th colspan="6">{{i18n "user.invited.sent"}}</th>
+                {{else if inviteLinks}}
+                  <th>{{i18n "user.invited.link_url"}}</th>
+                  <th>{{i18n "user.invited.link_created_at"}}</th>
+                  <th>{{i18n "user.invited.link_redemption_stats"}}</th>
+                  <th colspan="2">{{i18n "user.invited.link_groups"}}</th>
+                  <th>{{i18n "user.invited.link_expires_at"}}</th>
+                  <th></th>
                 {{/if}}
               </tr>
               {{#each model.invites as |invite|}}
                 <tr>
-                  {{#if invite.user}}
+                  {{#if inviteRedeemed}}
                     <td>
                       {{#link-to "user" invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}}
                       {{#link-to "user" invite.user}}{{invite.user.username}}{{/link-to}}
@@ -78,8 +90,11 @@
                           /
                         <span title={{i18n "user.invited.account_age_days"}}>{{html-safe invite.user.days_since_created}}</span>
                       </td>
+                      {{#if canSendInviteLink}}
+                        <td>{{html-safe invite.invite_source}}</td>
+                      {{/if}}
                     {{/if}}
-                  {{else}}
+                  {{else if invitePending}}
                     <td>{{invite.email}}</td>
                     <td>{{format-date invite.updated_at}}</td>
                     <td>
@@ -99,6 +114,19 @@
                         {{d-button icon="sync" action=(action "reinvite") actionParam=invite label="user.invited.reinvite"}}
                       {{/if}}
                     </td>
+                  {{else if inviteLinks}}
+                    <td>{{d-button icon="link" action=(route-action "editInvite" invite.invite_key) label="user.invited.copy_link"}}</td>
+                    <td>{{format-date invite.created_at}}</td>
+                    <td>{{number invite.redemption_count}} / {{number invite.max_redemptions_allowed}}</td>
+                    <td colspan="2">{{ invite.group_names }}</td>
+                    <td>{{raw-date invite.expires_at leaveAgo="true"}}</td>
+                    <td>
+                      {{#if invite.rescinded}}
+                        {{i18n "user.invited.rescinded"}}
+                      {{else}}
+                        {{d-button icon="times" action=(action "rescind") actionParam=invite label="user.invited.rescind"}}
+                      {{/if}}
+                    </td>
                   {{/if}}
                 </tr>
               {{/each}}
diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index 1e68921bec..6f75cf30dc 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -145,6 +145,9 @@
       font-weight: normal;
       line-height: $line-height-medium;
     }
+    .tip {
+      padding-left: 5px;
+    }
   }
 }
 
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 b964ea12b0..f4c1422d9c 100644
--- a/app/assets/stylesheets/common/components/share-and-invite-modal.scss
+++ b/app/assets/stylesheets/common/components/share-and-invite-modal.scss
@@ -62,7 +62,8 @@
   }
 }
 
-.share-and-invite.modal .invite.modal-panel {
+.share-and-invite.modal .invite.modal-panel,
+.invite-link.modal-panel {
   .error-message,
   .success-message {
     margin-bottom: 8px;
@@ -83,12 +84,30 @@
       width: 100%;
     }
 
+    .max-redemptions-allowed {
+      margin-bottom: 8px;
+
+      .max-redemptions-allowed-input {
+        width: 20%;
+        min-width: 100px;
+      }
+    }
+
+    .invite-link-expires-at .date-picker,
+    .time-input {
+      width: 150px;
+    }
+
     .invite-user-input-wrapper {
       display: flex;
       div.ac-wrap {
         flex: 1;
       }
     }
+
+    .invite-link-input {
+      width: 100%;
+    }
   }
 
   .footer {
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index d6b0342dfc..f2e6445f0d 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -80,6 +80,10 @@
   margin-top: 10px;
 }
 
+.invite-controls .btn {
+  margin-right: 0px;
+}
+
 .user-invite-list {
   width: 100%;
   margin-top: 15px;
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index a21b3af346..ed5b6a01dc 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -24,7 +24,8 @@ class InvitesController < ApplicationController
         store_preloaded("invite_info", MultiJson.dump(
           invited_by: UserNameSerializer.new(invite.invited_by, scope: guardian, root: false),
           email: invite.email,
-          username: UserNameSuggester.suggest(invite.email))
+          username: UserNameSuggester.suggest(invite.email),
+          is_invite_link: invite.is_invite_link?)
         )
 
         render layout: 'application'
@@ -40,23 +41,30 @@ class InvitesController < ApplicationController
 
   def perform_accept_invitation
     params.require(:id)
-    params.permit(:username, :name, :password, :timezone, user_custom_fields: {})
+    params.permit(:email, :username, :name, :password, :timezone, user_custom_fields: {})
     invite = Invite.find_by(invite_key: params[:id])
 
     if invite.present?
       begin
-        user = invite.redeem(username: params[:username], name: params[:name], password: params[:password], user_custom_fields: params[:user_custom_fields], ip_address: request.remote_ip)
+        user = if invite.is_invite_link?
+          invite.redeem_invite_link(email: params[:email], username: params[:username], name: params[:name], password: params[:password], user_custom_fields: params[:user_custom_fields], ip_address: request.remote_ip)
+        else
+          invite.redeem(username: params[:username], name: params[:name], password: params[:password], user_custom_fields: params[:user_custom_fields], ip_address: request.remote_ip)
+        end
+
         if user.present?
           log_on_user(user) if user.active?
           user.update_timezone_if_missing(params[:timezone])
           post_process_invite(user)
+          response = { success: true }
+        else
+          response = { success: false, message: I18n.t('invite.not_found_json') }
         end
 
-        response = { success: true }
         if user.present? && user.active?
           topic = invite.topics.first
           response[:redirect_to] = topic.present? ? path("#{topic.relative_url}") : path("/")
-        else
+        elsif user.present?
           response[:message] = I18n.t('invite.confirm_email')
         end
 
@@ -67,6 +75,8 @@ class InvitesController < ApplicationController
           errors: e.record&.errors&.to_hash || {},
           message: I18n.t('invite.error_message')
         }
+      rescue Invite::UserExists => e
+        render json: { success: false, message: [e.message] }
       end
     else
       render json: { success: false, message: I18n.t('invite.not_found_json') }
@@ -101,27 +111,44 @@ class InvitesController < ApplicationController
   end
 
   def create_invite_link
-    params.require(:email)
+    params.permit(:email, :max_redemptions_allowed, :expires_at, :group_ids, :group_names, :topic_id)
+
+    is_single_invite = params[:email].present?
+    unless is_single_invite
+      guardian.ensure_can_send_invite_links!(current_user)
+    end
 
     groups = Group.lookup_groups(
       group_ids: params[:group_ids],
       group_names: params[:group_names]
     )
     guardian.ensure_can_invite_to_forum!(groups)
-
-    topic = Topic.find_by(id: params[:topic_id])
-    guardian.ensure_can_invite_to!(topic) if topic.present?
-
     group_ids = groups.map(&:id)
 
-    invite_exists = Invite.exists?(email: params[:email], invited_by_id: current_user.id)
-    if invite_exists && !guardian.can_send_multiple_invites?(current_user)
-      return render json: failed_json, status: 422
+    if is_single_invite
+      if params[:topic_id].present?
+        topic = Topic.find_by(id: params[:topic_id])
+        guardian.ensure_can_invite_to!(topic) if topic.present?
+      end
+
+      invite_exists = Invite.exists?(email: params[:email], invited_by_id: current_user.id)
+      if invite_exists && !guardian.can_send_multiple_invites?(current_user)
+        return render json: failed_json, status: 422
+      end
     end
 
     begin
-      # generate invite link
-      if invite_link = Invite.generate_invite_link(params[:email], current_user, topic, group_ids)
+      invite_link = if is_single_invite
+        Invite.generate_single_use_invite_link(params[:email], current_user, topic, group_ids)
+      else
+        Invite.generate_multiple_use_invite_link(
+          invited_by: current_user,
+          max_redemptions_allowed: params[:max_redemptions_allowed],
+          expires_at: params[:expires_at],
+          group_ids: group_ids
+        )
+      end
+      if invite_link.present?
         render_json_dump(invite_link)
       else
         render json: failed_json, status: 422
@@ -132,10 +159,10 @@ class InvitesController < ApplicationController
   end
 
   def destroy
-    params.require(:email)
+    params.require(:id)
 
-    invite = Invite.find_by(invited_by_id: current_user.id, email: params[:email])
-    raise Discourse::InvalidParameters.new(:email) if invite.blank?
+    invite = Invite.find_by(invited_by_id: current_user.id, id: params[:id])
+    raise Discourse::InvalidParameters.new(:id) if invite.blank?
     invite.trash!(current_user)
 
     render body: nil
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8e63e97f66..57a2f7a400 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -297,30 +297,44 @@ class UsersController < ApplicationController
   def invited
     guardian.ensure_can_invite_to_forum!
 
-    inviter = fetch_user_from_params(include_inactive: current_user.staff? || SiteSetting.show_inactive_accounts)
     offset = params[:offset].to_i || 0
-    filter_by = params[:filter]
+    filter_by = params[:filter] || "redeemed"
+    inviter = fetch_user_from_params(include_inactive: current_user.staff? || SiteSetting.show_inactive_accounts)
 
     invites = if guardian.can_see_invite_details?(inviter) && filter_by == "pending"
       Invite.find_pending_invites_from(inviter, offset)
-    else
+    elsif filter_by == "redeemed"
       Invite.find_redeemed_invites_from(inviter, offset)
+    else
+      []
     end
 
     show_emails = guardian.can_see_invite_emails?(inviter)
-    if params[:search].present?
+    if params[:search].present? && invites.present?
       filter_sql = '(LOWER(users.username) LIKE :filter)'
       filter_sql = '(LOWER(invites.email) LIKE :filter) or (LOWER(users.username) LIKE :filter)' if show_emails
       invites = invites.where(filter_sql, filter: "%#{params[:search].downcase}%")
     end
 
     render json: MultiJson.dump(InvitedSerializer.new(
-      OpenStruct.new(invite_list: invites.to_a, show_emails: show_emails, inviter: inviter),
+      OpenStruct.new(invite_list: invites.to_a, show_emails: show_emails, inviter: inviter, type: filter_by),
       scope: guardian,
       root: false
     ))
   end
 
+  def invite_links
+    guardian.ensure_can_invite_to_forum!
+
+    inviter = fetch_user_from_params(include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts))
+    guardian.ensure_can_see_invite_details!(inviter)
+
+    offset = params[:offset].to_i || 0
+    invites = Invite.find_links_invites_from(inviter, offset)
+
+    render json: MultiJson.dump(invites: serialize_data(invites.to_a, InviteLinkSerializer), can_see_invite_details:  guardian.can_see_invite_details?(inviter))
+  end
+
   def invited_count
     guardian.ensure_can_invite_to_forum!
 
@@ -328,8 +342,9 @@ class UsersController < ApplicationController
 
     pending_count = Invite.find_pending_invites_count(inviter)
     redeemed_count = Invite.find_redeemed_invites_count(inviter)
+    links_count = Invite.find_links_invites_count(inviter)
 
-    render json: { counts: { pending: pending_count, redeemed: redeemed_count,
+    render json: { counts: { pending: pending_count, redeemed: redeemed_count, links: links_count,
                              total: (pending_count.to_i + redeemed_count.to_i) } }
   end
 
diff --git a/app/jobs/regular/anonymize_user.rb b/app/jobs/regular/anonymize_user.rb
index 8dca0ca403..1113476a81 100644
--- a/app/jobs/regular/anonymize_user.rb
+++ b/app/jobs/regular/anonymize_user.rb
@@ -16,7 +16,7 @@ module Jobs
     def make_anonymous
       anonymize_ips(@anonymize_ip) if @anonymize_ip
 
-      Invite.with_deleted.where(user_id: @user_id).destroy_all
+      InvitedUser.where(user_id: @user_id).destroy_all
       EmailToken.where(user_id: @user_id).destroy_all
       EmailLog.where(user_id: @user_id).delete_all
       IncomingEmail.where("user_id = ? OR from_address = ?", @user_id, @prev_email).delete_all
diff --git a/app/models/invite.rb b/app/models/invite.rb
index 5fde9a45ab..80858c5dad 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -5,6 +5,12 @@ class Invite < ActiveRecord::Base
   include RateLimiter::OnCreateRecord
   include Trashable
 
+  # TODO(2021-05-22): remove
+  self.ignored_columns = %w{
+    user_id
+    redeemed_at
+  }
+
   BULK_INVITE_EMAIL_LIMIT = 200
 
   rate_limit :limit_invites_per_day
@@ -13,6 +19,8 @@ class Invite < ActiveRecord::Base
   belongs_to :topic
   belongs_to :invited_by, class_name: 'User'
 
+  has_many :invited_users
+  has_many :users, through: :invited_users
   has_many :invited_groups
   has_many :groups, through: :invited_groups
   has_many :topic_invites
@@ -22,15 +30,20 @@ class Invite < ActiveRecord::Base
 
   before_create do
     self.invite_key ||= SecureRandom.hex
+    self.expires_at ||= SiteSetting.invite_expiry_days.days.from_now
   end
 
   before_validation do
     self.email = Email.downcase(email) unless email.nil?
   end
 
+  validate :ensure_max_redemptions_allowed
   validate :user_doesnt_already_exist
   attr_accessor :email_already_exists
 
+  scope :single_use_invites, -> { where('invites.max_redemptions_allowed = 1') }
+  scope :multiple_use_invites, -> { where('invites.max_redemptions_allowed > 1') }
+
   def self.emailed_status_types
     @emailed_status_types ||= Enum.new(not_required: 0, pending: 1, bulk_pending: 2, sending: 3, sent: 4)
   end
@@ -40,18 +53,26 @@ class Invite < ActiveRecord::Base
     return if email.blank?
     user = Invite.find_user_by_email(email)
 
-    if user && user.id != self.user_id
+    if user && user.id != self.invited_users&.first&.user_id
       @email_already_exists = true
       errors.add(:email)
     end
   end
 
+  def is_invite_link?
+    max_redemptions_allowed > 1
+  end
+
   def redeemed?
-    redeemed_at.present?
+    if is_invite_link?
+      redemption_count >= max_redemptions_allowed
+    else
+      self.invited_users.count > 0
+    end
   end
 
   def expired?
-    updated_at < SiteSetting.invite_expiry_days.days.ago
+    expires_at < Time.zone.now
   end
 
   # link_valid? indicates whether the invite link can be used to log in to the site
@@ -61,7 +82,7 @@ class Invite < ActiveRecord::Base
 
   def redeem(username: nil, name: nil, password: nil, user_custom_fields: nil, ip_address: nil)
     if !expired? && !destroyed? && link_valid?
-      InviteRedeemer.new(self, username, name, password, user_custom_fields, ip_address).redeem
+      InviteRedeemer.new(invite: self, email: self.email, username: username, name: name, password: password, user_custom_fields: user_custom_fields, ip_address: ip_address).redeem
     end
   end
 
@@ -74,8 +95,7 @@ class Invite < ActiveRecord::Base
     )
   end
 
-  # generate invite link
-  def self.generate_invite_link(email, invited_by, topic = nil, group_ids = nil)
+  def self.generate_single_use_invite_link(email, invited_by, topic = nil, group_ids = nil)
     invite = create_invite_by_email(email, invited_by,
       topic: topic,
       group_ids: group_ids,
@@ -123,6 +143,7 @@ class Invite < ActiveRecord::Base
       invite.update_columns(
         created_at: Time.zone.now,
         updated_at: Time.zone.now,
+        expires_at: SiteSetting.invite_expiry_days.days.from_now,
         emailed_status: emailed_status
       )
     else
@@ -160,6 +181,37 @@ class Invite < ActiveRecord::Base
     invite
   end
 
+  def self.generate_multiple_use_invite_link(invited_by:, max_redemptions_allowed: 5, expires_at: 1.month.from_now, group_ids: nil)
+    Invite.transaction do
+      create_args = {
+        invited_by: invited_by,
+        max_redemptions_allowed: max_redemptions_allowed.to_i,
+        expires_at: expires_at,
+        emailed_status: emailed_status_types[:not_required]
+      }
+      invite = Invite.create!(create_args)
+
+      if group_ids.present?
+        now = Time.zone.now
+        invited_groups = group_ids.map { |group_id| { group_id: group_id, invite_id: invite.id, created_at: now, updated_at: now } }
+        InvitedGroup.insert_all(invited_groups)
+      end
+
+      "#{Discourse.base_url}/invites/#{invite.invite_key}"
+    end
+  end
+
+  # redeem multiple use invite link
+  def redeem_invite_link(email: nil, username: nil, name: nil, password: nil, user_custom_fields: nil, ip_address: nil)
+    DistributedMutex.synchronize("redeem_invite_link_#{self.id}") do
+      reload
+      if is_invite_link? && !expired? && !redeemed? && !destroyed? && link_valid?
+        raise UserExists.new I18n.t("invite_link.email_taken") if UserEmail.exists?(email: email)
+        InviteRedeemer.new(invite: self, email: email, username: username, name: name, password: password, user_custom_fields: user_custom_fields, ip_address: ip_address).redeem
+      end
+    end
+  end
+
   def self.find_user_by_email(email)
     User.with_email(Email.downcase(email)).where(staged: false).first
   end
@@ -176,30 +228,62 @@ class Invite < ActiveRecord::Base
     group_ids
   end
 
-  def self.find_all_invites_from(inviter, offset = 0, limit = SiteSetting.invites_per_page)
-    Invite.where(invited_by_id: inviter.id)
+  def self.find_all_pending_invites_from(inviter, offset = 0, limit = SiteSetting.invites_per_page)
+    Invite.single_use_invites
+      .joins("LEFT JOIN invited_users ON invites.id = invited_users.invite_id")
+      .joins("LEFT JOIN users ON invited_users.user_id = users.id")
+      .where('invited_users.user_id IS NULL')
+      .where(invited_by_id: inviter.id)
       .where('invites.email IS NOT NULL')
-      .includes(user: :user_stat)
-      .order("CASE WHEN invites.user_id IS NOT NULL THEN 0 ELSE 1 END, user_stats.time_read DESC, invites.redeemed_at DESC")
+      .order('invites.updated_at DESC')
       .limit(limit)
       .offset(offset)
-      .references('user_stats')
   end
 
   def self.find_pending_invites_from(inviter, offset = 0)
-    find_all_invites_from(inviter, offset).where('invites.user_id IS NULL').order('invites.updated_at DESC')
-  end
-
-  def self.find_redeemed_invites_from(inviter, offset = 0)
-    find_all_invites_from(inviter, offset).where('invites.user_id IS NOT NULL').order('invites.redeemed_at DESC')
+    find_all_pending_invites_from(inviter, offset)
   end
 
   def self.find_pending_invites_count(inviter)
-    find_all_invites_from(inviter, 0, nil).where('invites.user_id IS NULL').reorder(nil).count
+    find_all_pending_invites_from(inviter, 0, nil).reorder(nil).count
+  end
+
+  def self.find_all_redeemed_invites_from(inviter, offset = 0, limit = SiteSetting.invites_per_page)
+    InvitedUser.includes(:invite)
+      .includes(user: :user_stat)
+      .where('invited_users.user_id IS NOT NULL')
+      .where('invites.invited_by_id = ?', inviter.id)
+      .order('user_stats.time_read DESC, invited_users.redeemed_at DESC')
+      .limit(limit)
+      .offset(offset)
+      .references('invite')
+      .references('user')
+      .references('user_stat')
+  end
+
+  def self.find_redeemed_invites_from(inviter, offset = 0)
+    find_all_redeemed_invites_from(inviter, offset)
   end
 
   def self.find_redeemed_invites_count(inviter)
-    find_all_invites_from(inviter, 0, nil).where('invites.user_id IS NOT NULL').reorder(nil).count
+    find_all_redeemed_invites_from(inviter, 0, nil).reorder(nil).count
+  end
+
+  def self.find_all_links_invites_from(inviter, offset = 0, limit = SiteSetting.invites_per_page)
+    Invite.multiple_use_invites
+      .includes(invited_groups: :group)
+      .where(invited_by_id: inviter.id)
+      .order('invites.updated_at DESC')
+      .limit(limit)
+      .offset(offset)
+  end
+
+  def self.find_links_invites_from(inviter, offset = 0)
+    find_all_links_invites_from(inviter, offset)
+  end
+
+  def self.find_links_invites_count(inviter)
+    find_all_links_invites_from(inviter, 0, nil).reorder(nil).count
   end
 
   def self.filter_by(email_or_username)
@@ -223,25 +307,32 @@ class Invite < ActiveRecord::Base
   end
 
   def self.redeem_from_email(email)
-    invite = Invite.find_by(email: Email.downcase(email))
-    InviteRedeemer.new(invite).redeem if invite
+    invite = Invite.single_use_invites.find_by(email: Email.downcase(email))
+    InviteRedeemer.new(invite: invite, email: invite.email).redeem if invite
     invite
   end
 
   def resend_invite
-    self.update_columns(updated_at: Time.zone.now)
+    self.update_columns(updated_at: Time.zone.now, expires_at: SiteSetting.invite_expiry_days.days.from_now)
     Jobs.enqueue(:invite_email, invite_id: self.id)
   end
 
   def self.resend_all_invites_from(user_id)
-    Invite.where('invites.user_id IS NULL AND invites.email IS NOT NULL AND invited_by_id = ?', user_id).find_each do |invite|
+    Invite.single_use_invites
+      .joins(:invited_users)
+      .where('invited_users.user_id IS NULL AND invites.email IS NOT NULL AND invited_by_id = ?', user_id)
+      .find_each do |invite|
       invite.resend_invite
     end
   end
 
   def self.rescind_all_expired_invites_from(user)
-    Invite.where('invites.user_id IS NULL AND invites.email IS NOT NULL AND invited_by_id = ? AND invites.updated_at < ?',
-                user.id, SiteSetting.invite_expiry_days.days.ago).find_each do |invite|
+    Invite.single_use_invites
+      .includes(:invited_users)
+      .where('invited_users.user_id IS NULL AND invites.email IS NOT NULL AND invited_by_id = ? AND invites.expires_at < ?',
+                user.id, Time.zone.now)
+      .references('invited_users')
+      .find_each do |invite|
       invite.trash!(user)
     end
   end
@@ -253,26 +344,37 @@ class Invite < ActiveRecord::Base
   def self.base_directory
     File.join(Rails.root, "public", "uploads", "csv", RailsMultisite::ConnectionManagement.current_db)
   end
+
+  def ensure_max_redemptions_allowed
+    if self.max_redemptions_allowed.nil? || self.max_redemptions_allowed == 1
+      self.max_redemptions_allowed ||= 1
+    else
+      if !self.max_redemptions_allowed.between?(2, SiteSetting.invite_link_max_redemptions_limit)
+        errors.add(:max_redemptions_allowed, I18n.t("invite_link.max_redemptions_limit", max_limit: SiteSetting.invite_link_max_redemptions_limit))
+      end
+    end
+  end
 end
 
 # == Schema Information
 #
 # Table name: invites
 #
-#  id             :integer          not null, primary key
-#  invite_key     :string(32)       not null
-#  email          :string
-#  invited_by_id  :integer          not null
-#  user_id        :integer
-#  redeemed_at    :datetime
-#  created_at     :datetime         not null
-#  updated_at     :datetime         not null
-#  deleted_at     :datetime
-#  deleted_by_id  :integer
-#  invalidated_at :datetime
-#  moderator      :boolean          default(FALSE), not null
-#  custom_message :text
-#  emailed_status :integer
+#  id                      :integer          not null, primary key
+#  invite_key              :string(32)       not null
+#  email                   :string
+#  invited_by_id           :integer          not null
+#  created_at              :datetime         not null
+#  updated_at              :datetime         not null
+#  deleted_at              :datetime
+#  deleted_by_id           :integer
+#  invalidated_at          :datetime
+#  moderator               :boolean          default(FALSE), not null
+#  custom_message          :text
+#  emailed_status          :integer
+#  max_redemptions_allowed :integer          default(1), not null
+#  redemption_count        :integer          default(0), not null
+#  expires_at              :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index 9c716d2983..ad49c18c6d 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_fields, :ip_address) do
+InviteRedeemer = Struct.new(:invite, :email, :username, :name, :password, :user_custom_fields, :ip_address, keyword_init: true) do
 
   def redeem
     Invite.transaction do
@@ -14,8 +14,8 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
   end
 
   # extracted from User cause it is very specific to invites
-  def self.create_user_from_invite(invite, username, name, password = nil, user_custom_fields = nil, ip_address = nil)
-    user = User.where(staged: true).with_email(invite.email.strip.downcase).first
+  def self.create_user_from_invite(email:, invite:, username: nil, name: nil, password: nil, user_custom_fields: nil, ip_address: nil)
+    user = User.where(staged: true).with_email(email.strip.downcase).first
     user.unstage! if user
 
     user ||= User.new
@@ -23,11 +23,11 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
     if username && UsernameValidator.new(username).valid_format? && User.username_available?(username)
       available_username = username
     else
-      available_username = UserNameSuggester.suggest(invite.email)
+      available_username = UserNameSuggester.suggest(email)
     end
 
     user.attributes = {
-      email: invite.email,
+      email: email,
       username: available_username,
       name: name || available_username,
       active: false,
@@ -63,7 +63,7 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
 
     user.save!
 
-    if invite.emailed_status != Invite.emailed_status_types[:not_required]
+    if invite.emailed_status != Invite.emailed_status_types[:not_required] && email == invite.email
       user.email_tokens.create!(email: user.email)
       user.activate
     end
@@ -86,35 +86,42 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
   end
 
   def invite_was_redeemed?
-    # Return true if a row was updated
-    mark_invite_redeemed == 1
+    mark_invite_redeemed
   end
 
   def mark_invite_redeemed
-    count = Invite.where('id = ? AND redeemed_at IS NULL AND updated_at >= ?',
-                 invite.id, SiteSetting.invite_expiry_days.days.ago)
-      .update_all('redeemed_at = CURRENT_TIMESTAMP')
+    if !invite.is_invite_link? && InvitedUser.exists?(invite_id: invite.id)
+      return false
+    end
 
-    if count == 1
+    existing_user = get_existing_user
+    if existing_user.present? && InvitedUser.exists?(user_id: existing_user.id, invite_id: invite.id)
+      return false
+    end
+
+    @invited_user_record = InvitedUser.create!(invite_id: invite.id, redeemed_at: Time.zone.now)
+    if invite.is_invite_link? && @invited_user_record.present?
+      Invite.increment_counter(:redemption_count, invite.id)
+    elsif @invited_user_record.present?
       delete_duplicate_invites
     end
 
-    count
+    @invited_user_record.present?
   end
 
   def get_invited_user
     result = get_existing_user
-    result ||= InviteRedeemer.create_user_from_invite(invite, username, name, password, user_custom_fields, ip_address)
+    result ||= InviteRedeemer.create_user_from_invite(invite: invite, email: email, username: username, name: name, password: password, user_custom_fields: user_custom_fields, ip_address: ip_address)
     result.send_welcome_message = false
     result
   end
 
   def get_existing_user
-    User.where(admin: false, staged: false).find_by_email(invite.email)
+    User.where(admin: false, staged: false).find_by_email(email)
   end
 
   def add_to_private_topics_if_invited
-    topic_ids = Topic.where(archetype: Archetype::private_message).includes(:invites).where(invites: { email: invite.email }).pluck(:id)
+    topic_ids = Topic.where(archetype: Archetype::private_message).includes(:invites).where(invites: { email: email }).pluck(:id)
     topic_ids.each do |id|
       TopicAllowedUser.create!(user_id: invited_user.id, topic_id: id) unless TopicAllowedUser.exists?(user_id: invited_user.id, topic_id: id)
     end
@@ -129,9 +136,8 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
   end
 
   def send_welcome_message
-    if Invite.where('email = ?', invite.email).update_all(['user_id = ?', invited_user.id]) == 1
-      invited_user.send_welcome_message = true
-    end
+    @invited_user_record.update!(user_id: invited_user.id)
+    invited_user.send_welcome_message = true
   end
 
   def approve_account_if_needed
@@ -155,6 +161,10 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
   end
 
   def delete_duplicate_invites
-    Invite.where('invites.email = ? AND redeemed_at IS NULL AND invites.id != ?', invite.email, invite.id).delete_all
+    Invite.single_use_invites
+      .joins("LEFT JOIN invited_users ON invites.id = invited_users.invite_id")
+      .where('invited_users.user_id IS NULL')
+      .where('invites.email = ? AND invites.id != ?', email, invite.id)
+      .delete_all
   end
 end
diff --git a/app/models/invited_user.rb b/app/models/invited_user.rb
new file mode 100644
index 0000000000..078878c7e7
--- /dev/null
+++ b/app/models/invited_user.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class InvitedUser < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :invite
+
+  validates_presence_of :invite_id
+  validates_uniqueness_of :invite_id, scope: :user_id, conditions: -> { where.not(user_id: nil) }
+end
+
+# == Schema Information
+#
+# Table name: invited_users
+#
+#  id          :bigint           not null, primary key
+#  user_id     :integer
+#  invite_id   :integer          not null
+#  redeemed_at :datetime
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#
+# Indexes
+#
+#  index_invited_users_on_invite_id              (invite_id)
+#  index_invited_users_on_user_id_and_invite_id  (user_id,invite_id) UNIQUE WHERE (user_id IS NOT NULL)
+#
diff --git a/app/models/user.rb b/app/models/user.rb
index fdade36364..ab30ea1b5a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -21,7 +21,6 @@ class User < ActiveRecord::Base
   has_many :user_archived_messages, dependent: :destroy
   has_many :email_change_requests, dependent: :destroy
   has_many :email_tokens, dependent: :destroy
-  has_many :invites, dependent: :destroy
   has_many :topic_links, dependent: :destroy
   has_many :user_uploads, dependent: :destroy
   has_many :user_emails, dependent: :destroy
@@ -37,6 +36,7 @@ class User < ActiveRecord::Base
   has_many :acting_group_histories, dependent: :destroy, foreign_key: :acting_user_id, class_name: 'GroupHistory'
   has_many :targeted_group_histories, dependent: :destroy, foreign_key: :target_user_id, class_name: 'GroupHistory'
   has_many :reviewable_scores, dependent: :destroy
+  has_many :invites, foreign_key: :invited_by_id, dependent: :destroy
 
   has_one :user_option, dependent: :destroy
   has_one :user_avatar, dependent: :destroy
@@ -47,6 +47,7 @@ class User < ActiveRecord::Base
   has_one :single_sign_on_record, dependent: :destroy
   has_one :anonymous_user_master, class_name: 'AnonymousUser', dependent: :destroy
   has_one :anonymous_user_shadow, ->(record) { where(active: true) }, foreign_key: :master_user_id, class_name: 'AnonymousUser', dependent: :destroy
+  has_one :invited_user, dependent: :destroy
 
   # delete all is faster but bypasses callbacks
   has_many :bookmarks, dependent: :delete_all
@@ -425,7 +426,7 @@ class User < ActiveRecord::Base
   end
 
   def invited_by
-    used_invite = invites.where("redeemed_at is not null").includes(:invited_by).first
+    used_invite = Invite.joins(:invited_users).where("invited_users.user_id = ?", self.id).first
     used_invite.try(:invited_by)
   end
 
diff --git a/app/serializers/invite_link_serializer.rb b/app/serializers/invite_link_serializer.rb
new file mode 100644
index 0000000000..21a6450918
--- /dev/null
+++ b/app/serializers/invite_link_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class InviteLinkSerializer < ApplicationSerializer
+  attributes :id, :invite_key, :created_at, :max_redemptions_allowed, :redemption_count, :expires_at, :group_names
+
+  def group_names
+    object.groups.pluck(:name).join(", ")
+  end
+end
diff --git a/app/serializers/invite_serializer.rb b/app/serializers/invite_serializer.rb
index 9c03c813fb..f66f1c02c7 100644
--- a/app/serializers/invite_serializer.rb
+++ b/app/serializers/invite_serializer.rb
@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 class InviteSerializer < ApplicationSerializer
-
-  attributes :email, :updated_at, :redeemed_at, :expired, :user
+  attributes :id, :email, :updated_at, :expired
 
   def include_email?
     options[:show_emails] && !object.redeemed?
@@ -11,11 +10,4 @@ class InviteSerializer < ApplicationSerializer
   def expired
     object.expired?
   end
-
-  def user
-    ser = InvitedUserSerializer.new(object.user, scope: scope, root: false)
-    ser.invited_by = object.invited_by
-    ser.as_json
-  end
-
 end
diff --git a/app/serializers/invited_serializer.rb b/app/serializers/invited_serializer.rb
index c0b07faa86..68ced8ba10 100644
--- a/app/serializers/invited_serializer.rb
+++ b/app/serializers/invited_serializer.rb
@@ -4,8 +4,15 @@ class InvitedSerializer < ApplicationSerializer
   attributes :invites, :can_see_invite_details
 
   def invites
+    serializer = if object.type == "pending"
+      InviteSerializer
+    else
+      InvitedUserSerializer
+    end
+
     ActiveModel::ArraySerializer.new(
       object.invite_list,
+      each_serializer: serializer,
       scope: scope,
       root: false,
       show_emails: object.show_emails
diff --git a/app/serializers/invited_user_record_serializer.rb b/app/serializers/invited_user_record_serializer.rb
new file mode 100644
index 0000000000..d98f475bf3
--- /dev/null
+++ b/app/serializers/invited_user_record_serializer.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+class InvitedUserRecordSerializer < BasicUserSerializer
+
+  attributes :topics_entered,
+             :posts_read_count,
+             :last_seen_at,
+             :time_read,
+             :days_visited,
+             :days_since_created
+
+  attr_accessor :invited_by
+
+  def time_read
+    object.user_stat.time_read
+  end
+
+  def include_time_read?
+    can_see_invite_details?
+  end
+
+  def days_visited
+    object.user_stat.days_visited
+  end
+
+  def include_days_visited?
+    can_see_invite_details?
+  end
+
+  def topics_entered
+    object.user_stat.topics_entered
+  end
+
+  def include_topics_entered?
+    can_see_invite_details?
+  end
+
+  def posts_read_count
+    object.user_stat.posts_read_count
+  end
+
+  def include_posts_read_count?
+    can_see_invite_details?
+  end
+
+  def days_since_created
+    ((Time.now - object.created_at) / 60 / 60 / 24).ceil
+  end
+
+  def include_days_since_created
+    can_see_invite_details?
+  end
+
+  private
+
+  def can_see_invite_details?
+    @can_see_invite_details ||= scope.can_see_invite_details?(invited_by)
+  end
+
+end
diff --git a/app/serializers/invited_user_serializer.rb b/app/serializers/invited_user_serializer.rb
index f793871f49..d4db8da953 100644
--- a/app/serializers/invited_user_serializer.rb
+++ b/app/serializers/invited_user_serializer.rb
@@ -1,54 +1,19 @@
 # frozen_string_literal: true
 
-class InvitedUserSerializer < BasicUserSerializer
+class InvitedUserSerializer < ApplicationSerializer
+  attributes :id, :redeemed_at, :user, :invite_source
 
-  attributes :topics_entered,
-             :posts_read_count,
-             :last_seen_at,
-             :time_read,
-             :days_visited,
-             :days_since_created
-
-  attr_accessor :invited_by
-
-  def time_read
-    object.user_stat.time_read
+  def id
+    object.invite.id
   end
 
-  def include_time_read?
-    scope.can_see_invite_details?(invited_by)
+  def user
+    ser = InvitedUserRecordSerializer.new(object.user, scope: scope, root: false)
+    ser.invited_by = object.invite.invited_by
+    ser.as_json
   end
 
-  def days_visited
-    object.user_stat.days_visited
+  def invite_source
+    object.invite.is_invite_link? ? "link" : "email"
   end
-
-  def include_days_visited?
-    scope.can_see_invite_details?(invited_by)
-  end
-
-  def topics_entered
-    object.user_stat.topics_entered
-  end
-
-  def include_topics_entered?
-    scope.can_see_invite_details?(invited_by)
-  end
-
-  def posts_read_count
-    object.user_stat.posts_read_count
-  end
-
-  def include_posts_read_count?
-    scope.can_see_invite_details?(invited_by)
-  end
-
-  def days_since_created
-    ((Time.now - object.created_at) / 60 / 60 / 24).ceil
-  end
-
-  def include_days_since_created
-    scope.can_see_invite_details?(invited_by)
-  end
-
 end
diff --git a/app/services/user_merger.rb b/app/services/user_merger.rb
index b576eea853..d6774b5080 100644
--- a/app/services/user_merger.rb
+++ b/app/services/user_merger.rb
@@ -257,7 +257,7 @@ class UserMerger
     IncomingLink.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
     IncomingLink.where(current_user_id: @source_user.id).update_all(current_user_id: @target_user.id)
 
-    Invite.with_deleted.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
+    InvitedUser.where(user_id: @source_user.id).update_all(user_id: @target_user.id)
     Invite.with_deleted.where(invited_by_id: @source_user.id).update_all(invited_by_id: @target_user.id)
     Invite.with_deleted.where(deleted_by_id: @source_user.id).update_all(deleted_by_id: @target_user.id)
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 308944b3b2..f43b88ef72 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1288,7 +1288,7 @@ en:
         expired: "This invite has expired."
         rescind: "Remove"
         rescinded: "Invite removed"
-        rescind_all: "Remove all Expired Invites"
+        rescind_all: "Remove Expired Invites"
         rescinded_all: "All Expired Invites removed!"
         rescind_all_confirm: "Are you sure you want to remove all expired invites?"
         reinvite: "Resend Invite"
@@ -1299,13 +1299,30 @@ en:
         time_read: "Read Time"
         days_visited: "Days Visited"
         account_age_days: "Account age in days"
-        create: "Send an Invite"
+        source: "Invited Via"
+        links_tab: "Links"
+        links_tab_with_count: "Links (%{count})"
+        link_url: "Link"
+        link_created_at: "Created"
+        link_redemption_stats: "Redemptions"
+        link_groups: Groups
+        link_expires_at: Expires
+        create: "Send Invite"
+        copy_link: "Copy Link"
         generate_link: "Copy Invite Link"
         link_generated: "Invite link generated successfully!"
         valid_for: "Invite link is only valid for this email address: %{email}"
+        single_user: "Single User"
+        multiple_user: "Multiple Users"
+        invite_link:
+          title: "Invite Link"
+          success: "Invite link generated successfully!"
+          error: "There was an error generating Invite link"
+          max_redemptions_allowed_label: "How many people are allowed to register using this link?"
+          expires_at: "When will this invite link expire?"
         bulk_invite:
           none: "You haven't invited anyone here yet. Send individual invites, or invite many people at once by <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>uploading a CSV file</a>."
-          text: "Bulk Invite from File"
+          text: "Bulk Invite"
           success: "File uploaded successfully, you will be notified via message when the process is complete."
           error: "Sorry, file should be CSV format."
           confirmation_message: "You’re about to email invites to everyone in the uploaded file."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index a7a1a7c110..eec321b8d8 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -235,6 +235,10 @@ en:
     max_rows: "First %{max_bulk_invites} invites has been sent. Try splitting the file in smaller parts."
     error: "There was an error uploading that file. Please try again later."
 
+  invite_link:
+    email_taken: "This email is already in use. If you already have an account please login or reset password."
+    max_redemptions_limit: "should be between 2 and %{max_limit}."
+
   topic_invite:
     failed_to_invite: "The user cannot be invited into this topic without a group membership in either one of the following groups: %{group_names}."
     user_exists: "Sorry, that user has already been invited. You may only invite a user to a topic once."
@@ -1714,6 +1718,8 @@ en:
     max_post_deletions_per_minute: "Maximum number of posts a user can delete per minute."
     max_post_deletions_per_day: "Maximum number of posts a user can delete per day."
 
+    invite_link_max_redemptions_limit: "Maximum redemptions allowed for invite links can't be more than this value."
+
     alert_admins_if_errors_per_minute: "Number of errors per minute in order to trigger an admin alert. A value of 0 disables this feature. NOTE: requires restart."
     alert_admins_if_errors_per_hour: "Number of errors per hour in order to trigger an admin alert. A value of 0 disables this feature. NOTE: requires restart."
 
diff --git a/config/routes.rb b/config/routes.rb
index d837af541b..96b81c8e26 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -468,6 +468,7 @@ Discourse::Application.routes.draw do
       get "#{root_path}/:username/invited" => "users#invited", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username/invited_count" => "users#invited_count", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username/invited/:filter" => "users#invited", constraints: { username: RouteFormat.username }
+      get "#{root_path}/:username/invite_links" => "users#invite_links", constraints: { username: RouteFormat.username }
       post "#{root_path}/action/send_activation_email" => "users#send_activation_email"
       get "#{root_path}/:username/summary" => "users#show", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username/activity/topics.rss" => "list#user_topics_feed", format: :rss, constraints: { username: RouteFormat.username }
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 11705c8e24..e240fe3526 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1604,6 +1604,11 @@ rate_limits:
   max_post_deletions_per_day:
     min: 1
     default: 10
+  invite_link_max_redemptions_limit:
+    min: 2
+    max: 1000000
+    default: 5000
+    client: true
 
 developer:
   force_hostname:
diff --git a/db/migrate/20200428102014_add_bulk_invite_link_to_invites.rb b/db/migrate/20200428102014_add_bulk_invite_link_to_invites.rb
new file mode 100644
index 0000000000..57636b6dcb
--- /dev/null
+++ b/db/migrate/20200428102014_add_bulk_invite_link_to_invites.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddBulkInviteLinkToInvites < ActiveRecord::Migration[6.0]
+  def change
+    add_column :invites, :max_redemptions_allowed, :integer, null: false, default: 1
+    add_column :invites, :redemption_count, :integer, null: false, default: 0
+    add_column :invites, :expires_at, :datetime, null: true
+
+    invite_expiry_days = DB.query_single("SELECT value FROM site_settings WHERE name = 'invite_expiry_days'").first
+    invite_expiry_days = 30 if invite_expiry_days.blank?
+    execute <<~SQL
+      UPDATE invites SET expires_at = updated_at + INTERVAL '#{invite_expiry_days} days'
+    SQL
+
+    change_column :invites, :expires_at, :datetime, null: false
+  end
+end
diff --git a/db/migrate/20200430072846_create_invited_users.rb b/db/migrate/20200430072846_create_invited_users.rb
new file mode 100644
index 0000000000..fa3f843e60
--- /dev/null
+++ b/db/migrate/20200430072846_create_invited_users.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateInvitedUsers < ActiveRecord::Migration[6.0]
+  def change
+    create_table :invited_users do |t|
+      t.integer :user_id
+      t.integer :invite_id, null: false
+      t.datetime :redeemed_at
+      t.timestamps null: false
+    end
+
+    add_index :invited_users, :invite_id
+    add_index :invited_users, [:user_id, :invite_id], unique: true, where: 'user_id IS NOT NULL'
+  end
+end
diff --git a/db/post_migrate/20200602153813_migrate_invite_redeemed_data_to_invited_users.rb b/db/post_migrate/20200602153813_migrate_invite_redeemed_data_to_invited_users.rb
new file mode 100644
index 0000000000..29c2927673
--- /dev/null
+++ b/db/post_migrate/20200602153813_migrate_invite_redeemed_data_to_invited_users.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class MigrateInviteRedeemedDataToInvitedUsers < ActiveRecord::Migration[6.0]
+  def up
+    %i{user_id redeemed_at}.each do |column|
+      Migration::ColumnDropper.mark_readonly(:invites, column)
+    end
+
+    execute <<~SQL
+      INSERT INTO invited_users (
+        user_id,
+        invite_id,
+        redeemed_at,
+        created_at,
+        updated_at
+      )
+      SELECT user_id, id, redeemed_at, created_at, updated_at
+      FROM invites
+      WHERE user_id IS NOT NULL AND redeemed_at IS NOT NULL
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/lib/badge_queries.rb b/lib/badge_queries.rb
index 8348087873..a8cf8a9171 100644
--- a/lib/badge_queries.rb
+++ b/lib/badge_queries.rb
@@ -158,7 +158,8 @@ module BadgeQueries
       WHERE u.id IN (
         SELECT invited_by_id
         FROM invites i
-        JOIN users u2 ON u2.id = i.user_id
+        JOIN invited_users iu ON iu.invite_id = i.id
+        JOIN users u2 ON u2.id = iu.user_id
         WHERE i.deleted_at IS NULL AND u2.active AND u2.trust_level >= #{trust_level.to_i} AND u2.silenced_till IS NULL
         GROUP BY invited_by_id
         HAVING COUNT(*) >= #{count.to_i}
diff --git a/lib/guardian.rb b/lib/guardian.rb
index da6d1bf2b7..5e6fe33282 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -383,6 +383,10 @@ class Guardian
     user.admin?
   end
 
+  def can_send_invite_links?(user)
+    user.staff?
+  end
+
   def can_send_multiple_invites?(user)
     user.staff?
   end
diff --git a/plugins/discourse-narrative-bot/spec/jobs/send_default_welcome_message_spec.rb b/plugins/discourse-narrative-bot/spec/jobs/send_default_welcome_message_spec.rb
index 58ae040cb6..da86df91b4 100644
--- a/plugins/discourse-narrative-bot/spec/jobs/send_default_welcome_message_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/jobs/send_default_welcome_message_spec.rb
@@ -24,10 +24,11 @@ RSpec.describe Jobs::SendDefaultWelcomeMessage do
   end
 
   describe 'for an invited user' do
-    let(:invite) { Fabricate(:invite, user: user, redeemed_at: Time.zone.now) }
+    let(:invite) { Fabricate(:invite, email: 'foo@bar.com') }
+    let(:invited_user) { Fabricate(:invited_user, invite: invite, user: Fabricate(:user, email: 'foo@bar.com'), redeemed_at: Time.zone.now) }
 
     it 'should send the right welcome message' do
-      described_class.new.execute(user_id: invite.user_id)
+      described_class.new.execute(user_id: invited_user.user_id)
 
       topic = Topic.last
 
@@ -38,7 +39,7 @@ RSpec.describe Jobs::SendDefaultWelcomeMessage do
 
       expect(topic.first_post.raw).to eq(I18n.t(
         "system_messages.welcome_invite.text_body_template",
-        SystemMessage.new(user).defaults
+        SystemMessage.new(invited_user.user).defaults
       ).chomp)
 
       expect(topic.closed).to eq(true)
diff --git a/spec/fabricators/invited_user_fabricator.rb b/spec/fabricators/invited_user_fabricator.rb
new file mode 100644
index 0000000000..05cb996a34
--- /dev/null
+++ b/spec/fabricators/invited_user_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:invited_user) do
+  user
+  invite
+end
diff --git a/spec/models/email_token_spec.rb b/spec/models/email_token_spec.rb
index 50df6b1004..46db9c98de 100644
--- a/spec/models/email_token_spec.rb
+++ b/spec/models/email_token_spec.rb
@@ -122,7 +122,7 @@ describe EmailToken do
         Jobs.run_immediately!
       end
 
-      fab!(:invite) { Fabricate(:invite, email: 'test@example.com', user_id: nil) }
+      fab!(:invite) { Fabricate(:invite, email: 'test@example.com') }
       fab!(:invited_user) { Fabricate(:user, active: false, email: invite.email) }
       let(:user_email_token) { invited_user.email_tokens.first }
       let!(:confirmed_invited_user) { EmailToken.confirm(user_email_token.token) }
diff --git a/spec/models/invite_redeemer_spec.rb b/spec/models/invite_redeemer_spec.rb
index 814fe42124..d29c9b6f57 100644
--- a/spec/models/invite_redeemer_spec.rb
+++ b/spec/models/invite_redeemer_spec.rb
@@ -6,7 +6,8 @@ describe InviteRedeemer do
 
   describe '#create_user_from_invite' do
     it "should be created correctly" do
-      user = InviteRedeemer.create_user_from_invite(Fabricate(:invite, email: 'walter.white@email.com'), 'walter', 'Walter White')
+      invite = Fabricate(:invite, email: 'walter.white@email.com')
+      user = InviteRedeemer.create_user_from_invite(invite: invite, email: invite.email, username: 'walter', name: 'Walter White')
       expect(user.username).to eq('walter')
       expect(user.name).to eq('Walter White')
       expect(user).to be_active
@@ -17,7 +18,8 @@ describe InviteRedeemer do
     it "can set the password and ip_address" do
       password = 's3cure5tpasSw0rD'
       ip_address = '192.168.1.1'
-      user = InviteRedeemer.create_user_from_invite(Fabricate(:invite, email: 'walter.white@email.com'), 'walter', 'Walter White', password, nil, ip_address)
+      invite = Fabricate(:invite, email: 'walter.white@email.com')
+      user = InviteRedeemer.create_user_from_invite(invite: invite, email: invite.email, username: 'walter', name: 'Walter White', password: password, ip_address: ip_address)
       expect(user).to have_password
       expect(user.confirm_password?(password)).to eq(true)
       expect(user.approved).to eq(true)
@@ -27,8 +29,9 @@ describe InviteRedeemer do
 
     it "raises exception with record and errors" do
       error = nil
+      invite = Fabricate(:invite, email: 'walter.white@email.com')
       begin
-        InviteRedeemer.create_user_from_invite(Fabricate(:invite, email: 'walter.white@email.com'), 'walter', 'Walter White', 'aaa')
+        InviteRedeemer.create_user_from_invite(invite: invite, email: invite.email, username: 'walter', name: 'Walter White', password: 'aaa')
       rescue ActiveRecord::RecordInvalid => e
         error = e
       end
@@ -38,7 +41,8 @@ describe InviteRedeemer do
 
     it "should unstage user" do
       staged_user = Fabricate(:staged, email: 'staged@account.com', active: true, username: 'staged1', name: 'Stage Name')
-      user = InviteRedeemer.create_user_from_invite(Fabricate(:invite, email: 'staged@account.com'), 'walter', 'Walter White')
+      invite = Fabricate(:invite, email: 'staged@account.com')
+      user = InviteRedeemer.create_user_from_invite(invite: invite, email: invite.email, username: 'walter', name: 'Walter White')
 
       expect(user.id).to eq(staged_user.id)
       expect(user.username).to eq('walter')
@@ -49,7 +53,9 @@ describe InviteRedeemer do
     end
 
     it "should not activate user invited via links" do
-      user = InviteRedeemer.create_user_from_invite(Fabricate(:invite, email: 'walter.white@email.com', emailed_status: Invite.emailed_status_types[:not_required]), 'walter', 'Walter White')
+      invite = Fabricate(:invite, email: 'walter.white@email.com', emailed_status: Invite.emailed_status_types[:not_required])
+      user = InviteRedeemer.create_user_from_invite(invite: invite, email: invite.email, username: 'walter', name: 'Walter White')
+
       expect(user.username).to eq('walter')
       expect(user.name).to eq('Walter White')
       expect(user.email).to eq('walter.white@email.com')
@@ -63,7 +69,7 @@ describe InviteRedeemer do
     let(:name) { 'john snow' }
     let(:username) { 'kingofthenorth' }
     let(:password) { 'know5nOthiNG' }
-    let(:invite_redeemer) { InviteRedeemer.new(invite, username, name) }
+    let(:invite_redeemer) { InviteRedeemer.new(invite: invite, email: invite.email, username: username, name: name) }
 
     it "should redeem the invite if invited by staff" do
       SiteSetting.must_approve_users = true
@@ -112,19 +118,13 @@ describe InviteRedeemer do
       expect(user.approved).to eq(true)
     end
 
-    it "should not blow up if invited_by user has been removed" do
+    it "should delete invite if invited_by user has been removed" do
       invite.invited_by.destroy!
-      invite.reload
-
-      user = invite_redeemer.redeem
-
-      expect(user.name).to eq(name)
-      expect(user.username).to eq(username)
-      expect(user.invited_by).to eq(nil)
+      expect { invite.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
     it "can set password" do
-      user = InviteRedeemer.new(invite, username, name, password).redeem
+      user = InviteRedeemer.new(invite: invite, email: invite.email, username: username, name: name, password: password).redeem
       expect(user).to have_password
       expect(user.confirm_password?(password)).to eq(true)
       expect(user.approved).to eq(true)
@@ -137,7 +137,7 @@ describe InviteRedeemer do
         required_field.id.to_s => 'value1',
         optional_field.id.to_s => 'value2'
       }
-      user = InviteRedeemer.new(invite, username, name, password, user_fields).redeem
+      user = InviteRedeemer.new(invite: invite, email: invite.email, username: username, name: name, password: password, user_custom_fields: user_fields).redeem
 
       expect(user).to be_present
       expect(user.custom_fields["user_field_#{required_field.id}"]).to eq('value1')
@@ -147,7 +147,7 @@ describe InviteRedeemer do
     it "adds user to group" do
       group = Fabricate(:group, grant_trust_level: 2)
       InvitedGroup.create(group_id: group.id, invite_id: invite.id)
-      user = InviteRedeemer.new(invite, username, name, password).redeem
+      user = InviteRedeemer.new(invite: invite, email: invite.email, username: username, name: name, password: password).redeem
 
       expect(user.group_users.count).to eq(4)
       expect(user.trust_level).to eq(2)
@@ -160,7 +160,7 @@ describe InviteRedeemer do
       user.email = "john@example.com"
       user.save!
 
-      another_invite_redeemer = InviteRedeemer.new(invite, username, name)
+      another_invite_redeemer = InviteRedeemer.new(invite: invite, email: invite.email, username: username, name: name)
       another_user = another_invite_redeemer.redeem
       expect(another_user).to eq(nil)
     end
@@ -176,7 +176,40 @@ describe InviteRedeemer do
 
       expect(user.invited_by).to eq(inviter)
       expect(inviter.notifications.count).to eq(1)
-      expect(invite.redeemed_at).not_to eq(nil)
+      expect(invite.invited_users.first).to be_present
+    end
+
+    context 'invite_link' do
+      fab!(:invite_link) { Fabricate(:invite, max_redemptions_allowed: 5, expires_at: 1.month.from_now, emailed_status: Invite.emailed_status_types[:not_required]) }
+      let(:invite_redeemer) { InviteRedeemer.new(invite: invite_link, email: 'foo@example.com') }
+
+      it 'works as expected' do
+        user = invite_redeemer.redeem
+        invite_link.reload
+
+        expect(user.send_welcome_message).to eq(true)
+        expect(user.trust_level).to eq(SiteSetting.default_invitee_trust_level)
+        expect(user.active).to eq(false)
+        expect(invite_link.redemption_count).to eq(1)
+      end
+
+      it "should not redeem the invite if InvitedUser record already exists for email" do
+        user = invite_redeemer.redeem
+        invite_link.reload
+
+        another_invite_redeemer = InviteRedeemer.new(invite: invite_link, email: 'foo@example.com')
+        another_user = another_invite_redeemer.redeem
+        expect(another_user).to eq(nil)
+      end
+
+      it "should redeem the invite if InvitedUser record does not exists for email" do
+        user = invite_redeemer.redeem
+        invite_link.reload
+
+        another_invite_redeemer = InviteRedeemer.new(invite: invite_link, email: 'bar@example.com')
+        another_user = another_invite_redeemer.redeem
+        expect(another_user.is_a?(User)).to eq(true)
+      end
     end
 
   end
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index f66a8f84cd..bd896e0777 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -22,7 +22,6 @@ describe Invite do
     it "should not allow a user to invite themselves" do
       expect(invite.email_already_exists).to eq(true)
     end
-
   end
 
   context 'email validators' do
@@ -52,7 +51,6 @@ describe Invite do
   end
 
   context '#create' do
-
     context 'saved' do
       subject { Fabricate(:invite) }
 
@@ -81,7 +79,7 @@ describe Invite do
       context 'links' do
         it 'does not enqueue a job to email the invite' do
           expect do
-            Invite.generate_invite_link(iceking, inviter, topic)
+            Invite.generate_single_use_invite_link(iceking, inviter, topic)
           end.not_to change { Jobs::InviteEmail.jobs.size }
         end
       end
@@ -142,7 +140,7 @@ describe Invite do
 
           it 'returns a new invite if the other has expired' do
             SiteSetting.invite_expiry_days = 1
-            invite.update!(updated_at: 2.days.ago)
+            invite.update!(expires_at: 2.days.ago)
 
             new_invite = Invite.invite_by_email(
               'iceking@adventuretime.ooo', inviter, topic
@@ -166,7 +164,7 @@ describe Invite do
 
         it 'resets expiry of a resent invite' do
           SiteSetting.invite_expiry_days = 2
-          invite.update!(updated_at: 10.days.ago)
+          invite.update!(expires_at: 10.days.ago)
           expect(invite).to be_expired
 
           invite.resend_invite
@@ -183,17 +181,43 @@ describe Invite do
         it 'does not mark emailed_status as sending after generating invite link' do
           expect(invite.emailed_status).to eq(Invite.emailed_status_types[:sending])
 
-          Invite.generate_invite_link(iceking, inviter, topic)
+          Invite.generate_single_use_invite_link(iceking, inviter, topic)
           expect(invite.reload.emailed_status).to eq(Invite.emailed_status_types[:not_required])
 
           Invite.invite_by_email(iceking, inviter, topic)
           expect(invite.reload.emailed_status).to eq(Invite.emailed_status_types[:not_required])
 
-          Invite.generate_invite_link(iceking, inviter, topic)
+          Invite.generate_single_use_invite_link(iceking, inviter, topic)
           expect(invite.reload.emailed_status).to eq(Invite.emailed_status_types[:not_required])
         end
       end
     end
+
+    context 'invite links' do
+      let(:inviter) { Fabricate(:user) }
+
+      it "has sane defaults" do
+        Invite.generate_multiple_use_invite_link(invited_by: inviter)
+        invite_link = Invite.last
+        expect(invite_link.max_redemptions_allowed).to eq(5)
+        expect(invite_link.expires_at.to_date).to eq(1.month.from_now.to_date)
+        expect(invite_link.emailed_status).to eq(Invite.emailed_status_types[:not_required])
+        expect(invite_link.is_invite_link?).to eq(true)
+      end
+
+      it 'checks for max_redemptions_allowed range' do
+        SiteSetting.invite_link_max_redemptions_limit = 1000
+        expect do
+          Invite.generate_multiple_use_invite_link(invited_by: inviter, max_redemptions_allowed: 1001)
+        end.to raise_error(ActiveRecord::RecordInvalid)
+      end
+
+      it 'does not enqueue a job to email the invite' do
+        expect do
+          Invite.generate_multiple_use_invite_link(invited_by: inviter)
+        end.not_to change { Jobs::InviteEmail.jobs.size }
+      end
+    end
   end
 
   context 'an existing user' do
@@ -205,7 +229,6 @@ describe Invite do
         Invite.invite_by_email(coding_horror.email, topic.user, topic)
       end.to raise_error(Invite::UserExists)
     end
-
   end
 
   context 'a staged user' do
@@ -228,7 +251,7 @@ describe Invite do
 
     it 'wont redeem an expired invite' do
       SiteSetting.invite_expiry_days = 10
-      invite.update_column(:updated_at, 20.days.ago)
+      invite.update_column(:expires_at, 20.days.ago)
       expect(invite.redeem).to be_blank
     end
 
@@ -253,12 +276,12 @@ describe Invite do
       end
 
       it 'does not delete already redeemed invite' do
-        redeemed_invite = Fabricate(:invite, email: invite.email, invited_by: another_user, redeemed_at: 1.day.ago)
+        redeemed_invite = Fabricate(:invite, email: invite.email, invited_by: another_user)
+        Fabricate(:invited_user, invite: invite, user: Fabricate(:user))
         invite.redeem
         used_invite = Invite.find_by(id: redeemed_invite.id)
         expect(used_invite).not_to be_nil
       end
-
     end
 
     context "as a moderator" do
@@ -308,7 +331,6 @@ describe Invite do
     end
 
     context 'simple invite' do
-
       let!(:user) { invite.redeem }
 
       it 'works correctly' do
@@ -324,7 +346,7 @@ describe Invite do
 
         it 'works correctly' do
           # has set the user_id attribute
-          expect(invite.user).to eq(user)
+          expect(invite.invited_users.first.user).to eq(user)
 
           # returns true for redeemed
           expect(invite).to be_redeemed
@@ -336,7 +358,6 @@ describe Invite do
           end
         end
       end
-
     end
 
     context 'invited to topics' do
@@ -379,15 +400,36 @@ describe Invite do
         end
       end
     end
+
+    context 'invite_link' do
+      fab!(:invite_link) { Fabricate(:invite, email: nil, max_redemptions_allowed: 5, expires_at: 1.month.from_now, emailed_status: Invite.emailed_status_types[:not_required]) }
+
+      it 'works correctly' do
+        user = invite_link.redeem_invite_link(email: 'foo@example.com')
+        expect(user.is_a?(User)).to eq(true)
+        expect(user.send_welcome_message).to eq(true)
+        expect(user.trust_level).to eq(SiteSetting.default_invitee_trust_level)
+        expect(user.active).to eq(false)
+        invite_link.reload
+        expect(invite_link.redemption_count).to eq(1)
+      end
+
+      it 'returns error if user with that email already exists' do
+        user = Fabricate(:user)
+        expect do
+          invite_link.redeem_invite_link(email: user.email)
+        end.to raise_error(Invite::UserExists)
+      end
+    end
   end
 
-  describe '.find_all_invites_from' do
+  describe '.find_all_pending_invites_from' do
     context 'with user that has invited' do
       it 'returns invites' do
         inviter = Fabricate(:user)
         invite = Fabricate(:invite, invited_by: inviter)
 
-        invites = Invite.find_all_invites_from(inviter)
+        invites = Invite.find_all_pending_invites_from(inviter)
 
         expect(invites).to include invite
       end
@@ -398,7 +440,7 @@ describe Invite do
         user = Fabricate(:user)
         Fabricate(:invite)
 
-        invites = Invite.find_all_invites_from(user)
+        invites = Invite.find_all_pending_invites_from(user)
 
         expect(invites).to be_empty
       end
@@ -408,17 +450,16 @@ describe Invite do
   describe '.find_pending_invites_from' do
     it 'returns pending invites only' do
       inviter = Fabricate(:user)
-      Fabricate(
+      redeemed_invite = Fabricate(
         :invite,
         invited_by: inviter,
-        user_id: 123,
         email: 'redeemed@example.com'
       )
+      Fabricate(:invited_user, invite: redeemed_invite, user: Fabricate(:user))
 
       pending_invite = Fabricate(
         :invite,
         invited_by: inviter,
-        user_id: nil,
         email: 'pending@example.com'
       )
 
@@ -437,24 +478,70 @@ describe Invite do
       Fabricate(
         :invite,
         invited_by: inviter,
-        user_id: nil,
         email: 'pending@example.com'
       )
 
       redeemed_invite = Fabricate(
         :invite,
         invited_by: inviter,
-        user_id: 123,
         email: 'redeemed@example.com'
       )
+      Fabricate(:invited_user, invite: redeemed_invite, user: Fabricate(:user))
 
       invites = Invite.find_redeemed_invites_from(inviter)
 
       expect(invites.length).to eq(1)
-      expect(invites.first).to eq redeemed_invite
+      expect(invites.first).to eq redeemed_invite.invited_users.first
 
       expect(Invite.find_redeemed_invites_count(inviter)).to eq(1)
     end
+
+    it 'returns redeemed invites for invite links' do
+      inviter = Fabricate(:user)
+      invite_link = Fabricate(
+        :invite,
+        invited_by: inviter,
+        max_redemptions_allowed: 50
+      )
+      Fabricate(:invited_user, invite: invite_link, user: Fabricate(:user))
+      Fabricate(:invited_user, invite: invite_link, user: Fabricate(:user))
+      Fabricate(:invited_user, invite: invite_link, user: Fabricate(:user))
+
+      invites = Invite.find_redeemed_invites_from(inviter)
+      expect(invites.length).to eq(3)
+      expect(Invite.find_redeemed_invites_count(inviter)).to eq(3)
+    end
+  end
+
+  describe '.find_links_invites_from' do
+    it 'returns invite links only' do
+      inviter = Fabricate(:user)
+      Fabricate(
+        :invite,
+        invited_by: inviter,
+        email: 'pending@example.com'
+      )
+
+      invite_link_1 = Fabricate(
+        :invite,
+        invited_by: inviter,
+        max_redemptions_allowed: 5
+      )
+
+      invite_link_2 = Fabricate(
+        :invite,
+        invited_by: inviter,
+        max_redemptions_allowed: 50
+      )
+
+      invites = Invite.find_links_invites_from(inviter)
+
+      expect(invites.length).to eq(2)
+      expect(invites.first).to eq(invite_link_2)
+      expect(invites.first.max_redemptions_allowed).to eq(50)
+
+      expect(Invite.find_links_invites_count(inviter)).to eq(2)
+    end
   end
 
   describe '.invalidate_for_email' do
@@ -466,14 +553,14 @@ describe Invite do
     end
 
     it 'sets the matching invite to be invalid' do
-      invite = Fabricate(:invite, invited_by: Fabricate(:user), user_id: nil, email: email)
+      invite = Fabricate(:invite, invited_by: Fabricate(:user), email: email)
       expect(subject).to eq(invite)
       expect(subject.link_valid?).to eq(false)
       expect(subject).to be_valid
     end
 
     it 'sets the matching invite to be invalid without being case-sensitive' do
-      invite = Fabricate(:invite, invited_by: Fabricate(:user), user_id: nil, email: 'invite.me2@Example.COM')
+      invite = Fabricate(:invite, invited_by: Fabricate(:user), email: 'invite.me2@Example.COM')
       result = described_class.invalidate_for_email('invite.me2@EXAMPLE.com')
       expect(result).to eq(invite)
       expect(result.link_valid?).to eq(false)
@@ -483,7 +570,7 @@ describe Invite do
 
   describe '.redeem_from_email' do
     fab!(:inviter) { Fabricate(:user) }
-    fab!(:invite) { Fabricate(:invite, invited_by: inviter, email: 'test@example.com', user_id: nil) }
+    fab!(:invite) { Fabricate(:invite, invited_by: inviter, email: 'test@example.com') }
     fab!(:user) { Fabricate(:user, email: invite.email) }
 
     it 'redeems the invite from email' do
@@ -497,7 +584,6 @@ describe Invite do
       invite.reload
       expect(invite).not_to be_redeemed
     end
-
   end
 
   describe '.rescind_all_expired_invites_from' do
@@ -507,7 +593,7 @@ describe Invite do
       invite_1 = Fabricate(:invite, invited_by: user)
       invite_2 = Fabricate(:invite, invited_by: user)
       expired_invite = Fabricate(:invite, invited_by: user)
-      expired_invite.update!(updated_at: 2.days.ago)
+      expired_invite.update!(expires_at: 2.days.ago)
       Invite.rescind_all_expired_invites_from(user)
       invite_1.reload
       invite_2.reload
diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rb
index 5e2bf32aa3..3ba6d09af9 100644
--- a/spec/requests/invites_controller_spec.rb
+++ b/spec/requests/invites_controller_spec.rb
@@ -3,6 +3,8 @@
 require 'rails_helper'
 
 describe InvitesController do
+  fab!(:admin) { Fabricate(:admin) }
+
   context 'show' do
     fab!(:invite) { Fabricate(:invite) }
     fab!(:user) { Fabricate(:coding_horror) }
@@ -28,7 +30,7 @@ describe InvitesController do
     end
 
     it "returns error if invite has already been redeemed" do
-      invite.update!(redeemed_at: 1.day.ago)
+      Fabricate(:invited_user, invite: invite, user: Fabricate(:user))
       get "/invites/#{invite.invite_key}"
 
       expect(response.status).to eq(200)
@@ -51,23 +53,23 @@ describe InvitesController do
       let!(:invite) { Fabricate(:invite, invited_by: user) }
       fab!(:another_invite) { Fabricate(:invite, email: 'anotheremail@address.com') }
 
-      it 'raises an error when the email is missing' do
+      it 'raises an error when the id is missing' do
         delete "/invites.json"
         expect(response.status).to eq(400)
       end
 
-      it "raises an error when the email cannot be found" do
-        delete "/invites.json", params: { email: 'finn@adventuretime.ooo' }
+      it "raises an error when the id cannot be found" do
+        delete "/invites.json", params: { id: 848 }
         expect(response.status).to eq(400)
       end
 
       it 'raises an error when the invite is not yours' do
-        delete "/invites.json", params: { email: another_invite.email }
+        delete "/invites.json", params: { id: another_invite.id }
         expect(response.status).to eq(400)
       end
 
       it "destroys the invite" do
-        delete "/invites.json", params: { email: invite.email }
+        delete "/invites.json", params: { id: invite.id }
         invite.reload
         expect(invite.trashed?).to be_truthy
       end
@@ -100,7 +102,7 @@ describe InvitesController do
 
       it "allows admins to invite to groups" do
         group = Fabricate(:group)
-        sign_in(Fabricate(:admin))
+        sign_in(admin)
         post "/invites.json", params: { email: email, group_names: group.name }
         expect(response.status).to eq(200)
         expect(Invite.find_by(email: email).invited_groups.count).to eq(1)
@@ -119,14 +121,14 @@ describe InvitesController do
       end
 
       it "allows admin to send multiple invites to same email" do
-        user = sign_in(Fabricate(:admin))
+        user = sign_in(admin)
         invite = Invite.invite_by_email("invite@example.com", user)
         post "/invites.json", params: { email: invite.email }
         expect(response.status).to eq(200)
       end
 
       it "responds with error message in case of validation failure" do
-        sign_in(Fabricate(:admin))
+        sign_in(admin)
         post "/invites.json", params: { email: "test@mailinator.com" }
         expect(response.status).to eq(422)
         json = response.parsed_body
@@ -135,70 +137,120 @@ describe InvitesController do
     end
   end
 
-  context '#create_invite_link' do
-    it 'requires you to be logged in' do
-      post "/invites/link.json", params: {
-        email: 'jake@adventuretime.ooo'
-      }
-      expect(response.status).to eq(403)
+  describe "#create_invite_link" do
+    describe 'single use invite link' do
+      it 'requires you to be logged in' do
+        post "/invites/link.json", params: {
+          email: 'jake@adventuretime.ooo'
+        }
+        expect(response.status).to eq(403)
+      end
+
+      context 'while logged in' do
+        let(:email) { 'jake@adventuretime.ooo' }
+
+        it "fails if you can't invite to the forum" do
+          sign_in(Fabricate(:user))
+          post "/invites/link.json", params: { email: email }
+          expect(response).to be_forbidden
+        end
+
+        it "fails for normal user if invite email already exists" do
+          user = sign_in(Fabricate(:trust_level_4))
+          invite = Invite.invite_by_email("invite@example.com", user)
+
+          post "/invites/link.json", params: {
+            email: invite.email
+          }
+
+          expect(response.status).to eq(422)
+        end
+
+        it "verifies that inviter is authorized to invite new user to a group-private topic" do
+          group = Fabricate(:group)
+          private_category = Fabricate(:private_category, group: group)
+          group_private_topic = Fabricate(:topic, category: private_category)
+          sign_in(Fabricate(:trust_level_4))
+
+          post "/invites/link.json", params: {
+            email: email, topic_id: group_private_topic.id
+          }
+
+          expect(response).to be_forbidden
+        end
+
+        it "allows admins to invite to groups" do
+          group = Fabricate(:group)
+          sign_in(admin)
+
+          post "/invites/link.json", params: {
+            email: email, group_names: group.name
+          }
+
+          expect(response.status).to eq(200)
+          expect(Invite.find_by(email: email).invited_groups.count).to eq(1)
+        end
+
+        it "allows multiple group invite" do
+          Fabricate(:group, name: "security")
+          Fabricate(:group, name: "support")
+          sign_in(admin)
+
+          post "/invites/link.json", params: {
+            email: email, group_names: "security,support"
+          }
+
+          expect(response.status).to eq(200)
+          expect(Invite.find_by(email: email).invited_groups.count).to eq(2)
+        end
+      end
     end
 
-    context 'while logged in' do
-      let(:email) { 'jake@adventuretime.ooo' }
-
-      it "fails if you can't invite to the forum" do
-        sign_in(Fabricate(:user))
-        post "/invites/link.json", params: { email: email }
+    describe 'multiple use invite link' do
+      it 'requires you to be logged in' do
+        post "/invites/link.json", params: {
+          max_redemptions_allowed: 5
+        }
         expect(response).to be_forbidden
       end
 
-      it "fails for normal user if invite email already exists" do
-        user = sign_in(Fabricate(:trust_level_4))
-        invite = Invite.invite_by_email("invite@example.com", user)
+      context 'while logged in' do
+        it "fails for non-staff users" do
+          sign_in(Fabricate(:trust_level_4))
+          post "/invites/link.json", params: {
+            max_redemptions_allowed: 5
+          }
+          expect(response).to be_forbidden
+        end
 
-        post "/invites/link.json", params: {
-          email: invite.email
-        }
+        it "allows staff to invite to groups" do
+          moderator = Fabricate(:moderator)
+          sign_in(moderator)
+          group = Fabricate(:group)
+          group.add_owner(moderator)
 
-        expect(response.status).to eq(422)
-      end
+          post "/invites/link.json", params: {
+            max_redemptions_allowed: 5,
+            group_names: group.name
+          }
 
-      it "verifies that inviter is authorized to invite new user to a group-private topic" do
-        group = Fabricate(:group)
-        private_category = Fabricate(:private_category, group: group)
-        group_private_topic = Fabricate(:topic, category: private_category)
-        sign_in(Fabricate(:trust_level_4))
+          expect(response.status).to eq(200)
+          expect(Invite.multiple_use_invites.last.invited_groups.count).to eq(1)
+        end
 
-        post "/invites/link.json", params: {
-          email: email, topic_id: group_private_topic.id
-        }
+        it "allows multiple group invite" do
+          Fabricate(:group, name: "security")
+          Fabricate(:group, name: "support")
+          sign_in(admin)
 
-        expect(response).to be_forbidden
-      end
+          post "/invites/link.json", params: {
+            max_redemptions_allowed: 5,
+            group_names: "security,support"
+          }
 
-      it "allows admins to invite to groups" do
-        group = Fabricate(:group)
-        sign_in(Fabricate(:admin))
-
-        post "/invites/link.json", params: {
-          email: email, group_names: group.name
-        }
-
-        expect(response.status).to eq(200)
-        expect(Invite.find_by(email: email).invited_groups.count).to eq(1)
-      end
-
-      it "allows multiple group invite" do
-        Fabricate(:group, name: "security")
-        Fabricate(:group, name: "support")
-        sign_in(Fabricate(:admin))
-
-        post "/invites/link.json", params: {
-          email: email, group_names: "security,support"
-        }
-
-        expect(response.status).to eq(200)
-        expect(Invite.find_by(email: email).invited_groups.count).to eq(2)
+          expect(response.status).to eq(200)
+          expect(Invite.multiple_use_invites.last.invited_groups.count).to eq(2)
+        end
       end
     end
   end
@@ -250,6 +302,20 @@ describe InvitesController do
       end
     end
 
+    context 'with an expired invite' do
+      fab!(:invite_link) { Fabricate(:invite, email: nil, max_redemptions_allowed: 5, expires_at: 1.day.ago, emailed_status: Invite.emailed_status_types[:not_required]) }
+
+      it "response is not successful" do
+        put "/invites/show/#{invite_link.invite_key}.json"
+
+        expect(response.status).to eq(200)
+        json = response.parsed_body
+        expect(json["success"]).to eq(false)
+        expect(json["message"]).to eq(I18n.t('invite.not_found_json'))
+        expect(session[:current_user_id]).to be_blank
+      end
+    end
+
     context 'with a valid invite id' do
       fab!(:topic) { Fabricate(:topic) }
       let(:invite) do
@@ -276,9 +342,9 @@ describe InvitesController do
             )
             invite.reload
             expect(response.status).to eq(200)
-            expect(session[:current_user_id]).to eq(invite.user_id)
+            expect(session[:current_user_id]).to eq(invite.invited_users.first.user_id)
             expect(invite.redeemed?).to be_truthy
-            user = User.find(invite.user_id)
+            user = User.find(invite.invited_users.first.user_id)
             expect(user.ip_address).to be_present
             expect(user.registration_ip_address).to be_present
           end
@@ -296,7 +362,7 @@ describe InvitesController do
               put "/invites/show/#{invite.invite_key}.json", params: { timezone: "Australia/Melbourne" }
               expect(response.status).to eq(200)
               invite.reload
-              user = User.find(invite.user_id)
+              user = User.find(invite.invited_users.first.user_id)
               expect(user.user_option.timezone).to eq("Australia/Melbourne")
             end
           end
@@ -329,7 +395,7 @@ describe InvitesController do
             put "/invites/show/#{invite.invite_key}.json"
             expect(response.status).to eq(200)
 
-            expect(invite.reload.user.groups.pluck(:name)).to contain_exactly("moderators", "staff")
+            expect(invite.invited_users.first.user.groups.pluck(:name)).to contain_exactly("moderators", "staff")
           end
 
           context "without password" do
@@ -409,15 +475,44 @@ describe InvitesController do
                 expect(job_args["user_id"]).to eq(invited_user.id)
                 expect(job_args["email_token"]).to eq(tokens.first)
               end
-
             end
-
           end
-
         end
       end
     end
 
+    context 'with multiple use invite link' do
+      fab!(:invite_link) { Fabricate(:invite, email: nil, max_redemptions_allowed: 5, expires_at: 1.month.from_now, emailed_status: Invite.emailed_status_types[:not_required]) }
+
+      it "sends an activation email and doesn't activate the user" do
+        expect do
+          put "/invites/show/#{invite_link.invite_key}.json", params: { email: "foobar@example.com", password: "verystrongpassword" }
+        end.not_to change { UserAuthToken.count }
+
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["success"]).to eq(true)
+        expect(response.parsed_body["message"]).to eq(I18n.t("invite.confirm_email"))
+
+        invite_link.reload
+        expect(invite_link.redemption_count).to eq(1)
+
+        invited_user = User.find_by_email("foobar@example.com")
+        expect(invited_user.active).to eq(false)
+        expect(invited_user.email_confirmed?).to eq(false)
+
+        expect(Jobs::InvitePasswordInstructionsEmail.jobs.size).to eq(0)
+        expect(Jobs::CriticalUserEmail.jobs.size).to eq(1)
+
+        tokens = EmailToken.where(user_id: invited_user.id, confirmed: false, expired: false).pluck(:token)
+        expect(tokens.size).to eq(1)
+
+        job_args = Jobs::CriticalUserEmail.jobs.first["args"].first
+        expect(job_args["type"]).to eq("signup")
+        expect(job_args["user_id"]).to eq(invited_user.id)
+        expect(job_args["email_token"]).to eq(tokens.first)
+      end
+    end
+
     context 'new registrations are disabled' do
       fab!(:topic) { Fabricate(:topic) }
 
@@ -431,7 +526,7 @@ describe InvitesController do
         put "/invites/show/#{invite.invite_key}.json"
         expect(response.status).to eq(200)
         invite.reload
-        expect(invite.user_id).to be_blank
+        expect(invite.invited_users).to be_blank
         expect(invite.redeemed?).to be_falsey
         expect(response.body).to include(I18n.t("login.new_registrations_disabled"))
       end
@@ -450,7 +545,7 @@ describe InvitesController do
         put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }
         expect(response.status).to eq(200)
         invite.reload
-        expect(invite.user_id).to be_blank
+        expect(invite.invited_users).to be_blank
         expect(invite.redeemed?).to be_falsey
         expect(response.body).to include(I18n.t("login.already_logged_in", current_user: user.username))
       end
@@ -513,7 +608,7 @@ describe InvitesController do
       end
 
       it "allows admin to bulk invite" do
-        sign_in(Fabricate(:admin))
+        sign_in(admin)
         post "/invites/upload_csv.json", params: { file: file, name: filename }
         expect(response.status).to eq(200)
         expect(Jobs::BulkInvite.jobs.size).to eq(1)
@@ -521,7 +616,7 @@ describe InvitesController do
 
       it "sends limited invites at a time" do
         SiteSetting.max_bulk_invites = 3
-        sign_in(Fabricate(:admin))
+        sign_in(admin)
         post "/invites/upload_csv.json", params: { file: file, name: filename }
 
         expect(response.status).to eq(422)
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index d6edb84c06..fed5b3c726 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -1505,7 +1505,8 @@ describe UsersController do
       inviter = Fabricate(:user, trust_level: 2)
       sign_in(inviter)
       invitee = Fabricate(:user)
-      _invite = Fabricate(:invite, invited_by: inviter, user: invitee)
+      _invite = Fabricate(:invite, invited_by: inviter)
+      Fabricate(:invited_user, invite: _invite, user: invitee)
       get "/u/#{user.username}/invited_count.json"
       expect(response.status).to eq(200)
 
@@ -1535,61 +1536,66 @@ describe UsersController do
       inviter = Fabricate(:user, trust_level: 2)
       sign_in(inviter)
 
+      Fabricate(:invite, email: 'billybob@example.com', invited_by: inviter)
+      redeemed_invite = Fabricate(:invite, email: 'jimtom@example.com', invited_by: inviter)
       invitee = Fabricate(:user)
-      Fabricate(:invite, email: 'billybob@example.com', invited_by: inviter, user: invitee)
-      Fabricate(:invite, email: 'jimtom@example.com', invited_by: inviter, user: invitee)
+      Fabricate(:invited_user, invite: redeemed_invite, user: invitee)
 
-      get "/u/#{inviter.username}/invited.json", params: { search: 'billybob' }
+      get "/u/#{inviter.username}/invited.json", params: { filter: 'pending', search: 'billybob' }
       expect(response.status).to eq(200)
 
       invites = response.parsed_body['invites']
       expect(invites.size).to eq(1)
       expect(invites.first).to include('email' => 'billybob@example.com')
 
-      get "/u/#{inviter.username}/invited.json", params: { search: invitee.username }
+      get "/u/#{inviter.username}/invited.json", params: { filter: 'redeemed', search: invitee.username }
       expect(response.status).to eq(200)
 
       invites = response.parsed_body['invites']
-      expect(invites.size).to eq(2)
-      expect(invites[0]['email']).to be_present
+      expect(invites.size).to eq(1)
+      expect(invites[0]['user']).to be_present
     end
 
     it "doesn't filter by email if another regular user" do
       inviter = Fabricate(:user, trust_level: 2)
       sign_in(Fabricate(:user, trust_level: 2))
 
+      Fabricate(:invite, email: 'billybob@example.com', invited_by: inviter)
+      redeemed_invite = Fabricate(:invite, email: 'jimtom@example.com', invited_by: inviter)
       invitee = Fabricate(:user)
-      Fabricate(:invite, email: 'billybob@example.com', invited_by: inviter, user: invitee)
-      Fabricate(:invite, email: 'jimtom@example.com', invited_by: inviter, user: invitee)
+      Fabricate(:invited_user, invite: redeemed_invite, user: invitee)
 
-      get "/u/#{inviter.username}/invited.json", params: { search: 'billybob' }
+      get "/u/#{inviter.username}/invited.json", params: { filter: 'pending', search: 'billybob' }
       expect(response.status).to eq(200)
 
       invites = response.parsed_body['invites']
       expect(invites.size).to eq(0)
 
-      get "/u/#{inviter.username}/invited.json", params: { search: invitee.username }
+      get "/u/#{inviter.username}/invited.json", params: { filter: 'redeemed', search: invitee.username }
       expect(response.status).to eq(200)
 
       invites = response.parsed_body['invites']
-      expect(invites.size).to eq(2)
-      expect(invites[0]['email']).to be_blank
+      expect(invites.size).to eq(1)
+      expect(invites[0]['user']).to be_present
     end
 
     it "filters by email if staff" do
       inviter = Fabricate(:user, trust_level: 2)
       sign_in(Fabricate(:moderator))
 
-      invitee = Fabricate(:user)
-      Fabricate(:invite, email: 'billybob@example.com', invited_by: inviter, user: invitee)
-      Fabricate(:invite, email: 'jimtom@example.com', invited_by: inviter, user: invitee)
+      invite_1 = Fabricate(:invite, email: 'billybob@example.com', invited_by: inviter)
+      invitee_1 = Fabricate(:user)
+      Fabricate(:invited_user, invite: invite_1, user: invitee_1)
+      invite_2 = Fabricate(:invite, email: 'jimtom@example.com', invited_by: inviter)
+      invitee_2 = Fabricate(:user)
+      Fabricate(:invited_user, invite: invite_2, user: invitee_2)
 
       get "/u/#{inviter.username}/invited.json", params: { search: 'billybob' }
       expect(response.status).to eq(200)
 
       invites = response.parsed_body['invites']
       expect(invites.size).to eq(1)
-      expect(invites[0]['email']).to be_present
+      expect(invites[0]['user']).to include('id' => invitee_1.id)
     end
 
     context 'with guest' do
@@ -1604,18 +1610,19 @@ describe UsersController do
       end
 
       context 'with redeemed invites' do
-        it 'returns invites' do
+        it 'returns invited_users' do
           inviter = Fabricate(:user, trust_level: 2)
           sign_in(inviter)
           invitee = Fabricate(:user)
-          invite = Fabricate(:invite, invited_by: inviter, user: invitee)
+          invite = Fabricate(:invite, invited_by: inviter)
+          invited_user = Fabricate(:invited_user, invite: invite, user: invitee)
 
           get "/u/#{inviter.username}/invited.json"
           expect(response.status).to eq(200)
 
           invites = response.parsed_body['invites']
           expect(invites.size).to eq(1)
-          expect(invites.first).to include('email' => invite.email)
+          expect(invites[0]).to include('id' => invite.id)
         end
       end
     end
@@ -1641,7 +1648,6 @@ describe UsersController do
           it 'does not return invites' do
             user = sign_in(Fabricate(:user))
             inviter = Fabricate(:user)
-            _invitee = Fabricate(:user)
             Fabricate(:invite, invited_by: inviter)
             stub_guardian(user) do |guardian|
               guardian.stubs(:can_see_invite_details?).
@@ -1659,14 +1665,42 @@ describe UsersController do
           sign_in(Fabricate(:moderator))
           inviter = Fabricate(:user)
           invitee = Fabricate(:user)
-          invite = Fabricate(:invite, invited_by: inviter, user: invitee)
+          invite = Fabricate(:invite, invited_by: inviter)
+          Fabricate(:invited_user, invite: invite, user: invitee)
 
           get "/u/#{inviter.username}/invited.json"
           expect(response.status).to eq(200)
 
           invites = response.parsed_body['invites']
           expect(invites.size).to eq(1)
-          expect(invites.first).to include('email' => invite.email)
+          expect(invites[0]).to include('id' => invite.id)
+        end
+      end
+
+      context 'with invite links' do
+        context 'with permission to see invite links' do
+          it 'returns invites' do
+            inviter = sign_in(Fabricate(:admin))
+            invite = Fabricate(:invite, invited_by: inviter,  email: nil, max_redemptions_allowed: 5, expires_at: 1.month.from_now, emailed_status: Invite.emailed_status_types[:not_required])
+
+            get "/u/#{inviter.username}/invite_links.json"
+            expect(response.status).to eq(200)
+
+            invites = response.parsed_body['invites']
+            expect(invites.size).to eq(1)
+            expect(invites.first).to include("id" => invite.id)
+          end
+        end
+
+        context 'without permission to see invite links' do
+          it 'does not return invites' do
+            user = Fabricate(:user, trust_level: 2)
+            inviter = Fabricate(:admin)
+            Fabricate(:invite, invited_by: inviter,  email: nil, max_redemptions_allowed: 5, expires_at: 1.month.from_now, emailed_status: Invite.emailed_status_types[:not_required])
+
+            get "/u/#{inviter.username}/invite_links.json"
+            expect(response.status).to eq(403)
+          end
         end
       end
     end
diff --git a/spec/services/user_anonymizer_spec.rb b/spec/services/user_anonymizer_spec.rb
index 5e9a64b7fc..da61af7b22 100644
--- a/spec/services/user_anonymizer_spec.rb
+++ b/spec/services/user_anonymizer_spec.rb
@@ -224,11 +224,11 @@ describe UserAnonymizer do
       end
 
       it "removes invites" do
-        Fabricate(:invite, user: user)
-        Fabricate(:invite, user: another_user)
+        Fabricate(:invited_user, invite: Fabricate(:invite), user: user)
+        Fabricate(:invited_user, invite: Fabricate(:invite), user: another_user)
 
-        expect { make_anonymous }.to change { Invite.count }.by(-1)
-        expect(Invite.where(user_id: user.id).count).to eq(0)
+        expect { make_anonymous }.to change { InvitedUser.count }.by(-1)
+        expect(InvitedUser.where(user_id: user.id).count).to eq(0)
       end
 
       it "removes email tokens" do
diff --git a/spec/services/user_merger_spec.rb b/spec/services/user_merger_spec.rb
index a239d2c2b6..939afd2ae9 100644
--- a/spec/services/user_merger_spec.rb
+++ b/spec/services/user_merger_spec.rb
@@ -251,7 +251,8 @@ describe UserMerger do
   end
 
   it "updates invites" do
-    invite1 = Fabricate(:invite, invited_by: walter, user: source_user)
+    invite1 = Fabricate(:invite, invited_by: walter)
+    Fabricate(:invited_user, invite: invite1, user: source_user)
     invite2 = Fabricate(:invite, invited_by: source_user)
     invite3 = Fabricate(:invite, invited_by: source_user)
     invite3.trash!(source_user)
@@ -260,7 +261,7 @@ describe UserMerger do
 
     [invite1, invite2, invite3].each { |x| x.reload }
 
-    expect(invite1.user).to eq(target_user)
+    expect(invite1.invited_users.first.user).to eq(target_user)
     expect(invite2.invited_by).to eq(target_user)
     expect(invite3.invited_by).to eq(target_user)
     expect(invite3.deleted_by).to eq(target_user)
diff --git a/spec/services/username_changer_spec.rb b/spec/services/username_changer_spec.rb
index 416c986ca9..9b6a1a1873 100644
--- a/spec/services/username_changer_spec.rb
+++ b/spec/services/username_changer_spec.rb
@@ -559,8 +559,8 @@ describe UsernameChanger do
         notified_user = Fabricate(:user)
         p1 = Fabricate(:post, post_number: 1, user: renamed_user)
         p2 = Fabricate(:post, post_number: 1, user: another_user)
-        Fabricate(:invite, invited_by: notified_user, user: renamed_user)
-        Fabricate(:invite, invited_by: notified_user, user: another_user)
+        Fabricate(:invited_user, invite: Fabricate(:invite, invited_by: notified_user), user: renamed_user)
+        Fabricate(:invited_user, invite: Fabricate(:invite, invited_by: notified_user), user: another_user)
 
         n01 = create_notification(:mentioned, notified_user, p1, original_and_display_username("alice"))
         n02 = create_notification(:mentioned, notified_user, p2, original_and_display_username("another_user"))
diff --git a/test/javascripts/acceptance/invite-accept-test.js b/test/javascripts/acceptance/invite-accept-test.js
index 27fd023394..ee1dcf903f 100644
--- a/test/javascripts/acceptance/invite-accept-test.js
+++ b/test/javascripts/acceptance/invite-accept-test.js
@@ -16,11 +16,13 @@ QUnit.test("Invite Acceptance Page", async assert => {
       name: "Neil Lalonde",
       title: "team"
     },
-    email: "invited@asdf.com",
-    username: "invited"
+    email: null,
+    username: "invited",
+    is_invite_link: true
   });
 
   await visit("/invites/myvalidinvitetoken");
+  assert.ok(exists("#new-account-email"), "shows the email input");
   assert.ok(exists("#new-account-username"), "shows the username input");
   assert.equal(
     find("#new-account-username").val(),
@@ -31,10 +33,16 @@ QUnit.test("Invite Acceptance Page", async assert => {
   assert.ok(exists("#new-account-password"), "shows the password input");
   assert.ok(
     exists(".invites-show .btn-primary:disabled"),
-    "submit is disabled because name is not filled"
+    "submit is disabled because name and email is not filled"
   );
 
   await fillIn("#new-account-name", "John Doe");
+  assert.ok(
+    exists(".invites-show .btn-primary:disabled"),
+    "submit is disabled because email is not filled"
+  );
+
+  await fillIn("#new-account-email", "john.doe@example.com");
   assert.not(
     exists(".invites-show .btn-primary:disabled"),
     "submit is enabled"
@@ -54,10 +62,19 @@ QUnit.test("Invite Acceptance Page", async assert => {
     "submit is disabled"
   );
 
+  await fillIn("#new-account-email", "john.doe@example");
+  assert.ok(exists(".email-input .bad"), "email is not valid");
+  assert.ok(
+    exists(".invites-show .btn-primary:disabled"),
+    "submit is disabled"
+  );
+
   await fillIn("#new-account-username", "validname");
   await fillIn("#new-account-password", "secur3ty4Y0uAndMe");
+  await fillIn("#new-account-email", "john.doe@example.com");
   assert.ok(exists(".username-input .good"), "username is valid");
   assert.ok(exists(".password-input .good"), "password is valid");
+  assert.ok(exists(".email-input .good"), "email is valid");
   assert.not(
     exists(".invites-show .btn-primary:disabled"),
     "submit is enabled"
diff --git a/test/javascripts/acceptance/invite-show-user-fields-test.js b/test/javascripts/acceptance/invite-show-user-fields-test.js
index e8ff05d8e0..5cfcb9606a 100644
--- a/test/javascripts/acceptance/invite-show-user-fields-test.js
+++ b/test/javascripts/acceptance/invite-show-user-fields-test.js
@@ -1,4 +1,5 @@
 import { acceptance } from "helpers/qunit-helpers";
+import PreloadStore from "discourse/lib/preload-store";
 
 acceptance("Accept Invite - User Fields", {
   site: {
@@ -26,6 +27,19 @@ acceptance("Accept Invite - User Fields", {
 });
 
 QUnit.test("accept invite with user fields", async assert => {
+  PreloadStore.store("invite_info", {
+    invited_by: {
+      id: 123,
+      username: "neil",
+      avatar_template: "/user_avatar/localhost/neil/{size}/25_1.png",
+      name: "Neil Lalonde",
+      title: "team"
+    },
+    email: "invited@asdf.com",
+    username: "invited",
+    is_invite_link: false
+  });
+
   await visit("/invites/myvalidinvitetoken");
   assert.ok(exists(".invites-show"), "shows the accept invite page");
   assert.ok(exists(".user-field"), "it has at least one user field");

From 415c1bb9e1fa1b4d0621a3a31cfc0b7f4e99549d Mon Sep 17 00:00:00 2001
From: Joe <johani@discourse.org>
Date: Wed, 10 Jun 2020 00:02:11 +0800
Subject: [PATCH 1611/1830] FIX: don't show create topic suggestion to users
 who can't

Users with TL below the "min trust to create topic" setting used to see a prompt to create new topics in the footer message below the topic list. Those topics would never be submitted because those users don't meet the TL requirements to create a new topic (based on that site setting). This PR removes that prompt for those users.
---
 .../javascripts/discourse/app/routes/build-category-route.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/routes/build-category-route.js b/app/assets/javascripts/discourse/app/routes/build-category-route.js
index 58e5584fd2..aa6da5804d 100644
--- a/app/assets/javascripts/discourse/app/routes/build-category-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-category-route.js
@@ -177,7 +177,7 @@ export default (filterArg, params) => {
         category = model.category,
         canCreateTopic = topics.get("can_create_topic"),
         canCreateTopicOnCategory =
-          category.get("permission") === PermissionType.FULL,
+          canCreateTopic && category.get("permission") === PermissionType.FULL,
         filter = this.filter(category);
 
       this.controllerFor("navigation/category").setProperties({

From 23ed16339f24a6eb8ed10bcec62ec3eafe760a3d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 9 Jun 2020 19:36:28 +0200
Subject: [PATCH 1612/1830] DEV: adds mouse{Over,Out} and touch{Start,End} to
 widgets (#10003)

---
 .../discourse/app/widgets/hooks.js            | 32 +++++++++++++++++++
 .../discourse/app/widgets/widget.js           | 22 ++++++++++++-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/hooks.js b/app/assets/javascripts/discourse/app/widgets/hooks.js
index 0d1dcd4b9f..aba09bb236 100644
--- a/app/assets/javascripts/discourse/app/widgets/hooks.js
+++ b/app/assets/javascripts/discourse/app/widgets/hooks.js
@@ -13,6 +13,10 @@ const CHANGE_ATTRIBUTE_NAME = "_discourse_change_widget";
 const MOUSE_DOWN_ATTRIBUTE_NAME = "_discourse_mouse_down_widget";
 const MOUSE_UP_ATTRIBUTE_NAME = "_discourse_mouse_up_widget";
 const MOUSE_MOVE_ATTRIBUTE_NAME = "_discourse_mouse_move_widget";
+const MOUSE_OVER_ATTRIBUTE_NAME = "_discourse_mouse_over_widget";
+const MOUSE_OUT_ATTRIBUTE_NAME = "_discourse_mouse_out_widget";
+const TOUCH_START_ATTRIBUTE_NAME = "_discourse_touch_start_widget";
+const TOUCH_END_ATTRIBUTE_NAME = "_discourse_touch_end_widget";
 
 function buildHook(attributeName, setAttr) {
   return class {
@@ -54,6 +58,10 @@ export const WidgetChangeHook = buildHook(CHANGE_ATTRIBUTE_NAME);
 export const WidgetMouseUpHook = buildHook(MOUSE_UP_ATTRIBUTE_NAME);
 export const WidgetMouseDownHook = buildHook(MOUSE_DOWN_ATTRIBUTE_NAME);
 export const WidgetMouseMoveHook = buildHook(MOUSE_MOVE_ATTRIBUTE_NAME);
+export const WidgetMouseOverHook = buildHook(MOUSE_OVER_ATTRIBUTE_NAME);
+export const WidgetMouseOutHook = buildHook(MOUSE_OUT_ATTRIBUTE_NAME);
+export const WidgetTouchStartHook = buildHook(TOUCH_START_ATTRIBUTE_NAME);
+export const WidgetTouchEndHook = buildHook(TOUCH_END_ATTRIBUTE_NAME);
 
 function nodeCallback(node, attrName, cb, options = { rerender: true }) {
   const { rerender } = options;
@@ -112,6 +120,18 @@ WidgetClickHook.setupDocumentCallback = function() {
     }
   };
 
+  $(document).on("mouseover.discourse-widget", e => {
+    nodeCallback(e.target, MOUSE_OVER_ATTRIBUTE_NAME, w => w.mouseOver(e), {
+      rerender: false
+    });
+  });
+
+  $(document).on("mouseout.discourse-widget", e => {
+    nodeCallback(e.target, MOUSE_OUT_ATTRIBUTE_NAME, w => w.mouseOut(e), {
+      rerender: false
+    });
+  });
+
   document.addEventListener("touchmove", onDrag, {
     passive: false,
     capture: true
@@ -202,6 +222,18 @@ WidgetClickHook.setupDocumentCallback = function() {
     });
   });
 
+  $(document).on("touchstart.discourse-widget", e => {
+    nodeCallback(e.target, TOUCH_START_ATTRIBUTE_NAME, w => w.touchStart(e), {
+      rerender: false
+    });
+  });
+
+  $(document).on("touchend.discourse-widget", e => {
+    nodeCallback(e.target, TOUCH_END_ATTRIBUTE_NAME, w => w.touchEnd(e), {
+      rerender: false
+    });
+  });
+
   $(document).on("mousedown.discourse-widget", e => {
     nodeCallback(e.target, MOUSE_DOWN_ATTRIBUTE_NAME, w => {
       w.mouseDown(e);
diff --git a/app/assets/javascripts/discourse/app/widgets/widget.js b/app/assets/javascripts/discourse/app/widgets/widget.js
index 362428bf05..99220973c8 100644
--- a/app/assets/javascripts/discourse/app/widgets/widget.js
+++ b/app/assets/javascripts/discourse/app/widgets/widget.js
@@ -11,7 +11,11 @@ import {
   WidgetChangeHook,
   WidgetMouseUpHook,
   WidgetMouseDownHook,
-  WidgetMouseMoveHook
+  WidgetMouseMoveHook,
+  WidgetMouseOverHook,
+  WidgetMouseOutHook,
+  WidgetTouchStartHook,
+  WidgetTouchEndHook
 } from "discourse/widgets/hooks";
 import { h } from "virtual-dom";
 import DecoratorHelper from "discourse/widgets/decorator-helper";
@@ -410,6 +414,22 @@ export default class Widget {
       properties["widget-mouse-move"] = new WidgetMouseMoveHook(this);
     }
 
+    if (this.mouseOver) {
+      properties["widget-mouse-over"] = new WidgetMouseOverHook(this);
+    }
+
+    if (this.mouseOut) {
+      properties["widget-mouse-out"] = new WidgetMouseOutHook(this);
+    }
+
+    if (this.touchStart) {
+      properties["widget-touch-start"] = new WidgetTouchStartHook(this);
+    }
+
+    if (this.touchEnd) {
+      properties["widget-touch-end"] = new WidgetTouchEndHook(this);
+    }
+
     const attributes = properties["attributes"] || {};
     properties.attributes = attributes;
 

From a3cf1cf6ff2c4ee99d8d636ba7c6dbc762066507 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 9 Jun 2020 19:37:06 +0200
Subject: [PATCH 1613/1830] DEV: allows to prepend widgets to post nav controls
 (#10005)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Régis Hanol <regis@hanol.fr>
---
 .../javascripts/discourse/app/widgets/post-menu.js  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
index 3798d71cb2..00520eb662 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@@ -552,8 +552,17 @@ export default createWidget("post-menu", {
       postControls.push(repliesButton);
     }
 
-    let extraControls = applyDecorators(this, "extra-controls", attrs, state);
-    postControls.push(h("div.actions", visibleButtons.concat(extraControls)));
+    const extraControls = applyDecorators(this, "extra-controls", attrs, state);
+    const beforeExtraControls = applyDecorators(
+      this,
+      "before-extra-controls",
+      attrs,
+      state
+    );
+
+    const controlsButtons = [...beforeExtraControls, ...visibleButtons, ...extraControls];
+
+    postControls.push(h("div.actions", controlsButtons));
     if (state.adminVisible) {
       postControls.push(this.attach("post-admin-menu", attrs));
     }

From ae6c4cd237346629b73efa8e318be71cc05209c8 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 9 Jun 2020 18:51:59 +0100
Subject: [PATCH 1614/1830] FIX: Allow merging users when email domains are
 restricted

---
 app/models/user.rb                | 2 +-
 app/services/user_merger.rb       | 2 ++
 spec/services/user_merger_spec.rb | 9 +++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index ab30ea1b5a..3caf839a2d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1200,7 +1200,7 @@ class User < ActiveRecord::Base
     if primary_email
       new_record? ? primary_email.email = new_email : primary_email.update(email: new_email)
     else
-      self.primary_email = UserEmail.new(email: new_email, user: self, primary: true)
+      self.primary_email = UserEmail.new(email: new_email, user: self, primary: true, skip_validate_email: !should_validate_email_address?)
     end
   end
 
diff --git a/app/services/user_merger.rb b/app/services/user_merger.rb
index d6774b5080..8da5afbfbc 100644
--- a/app/services/user_merger.rb
+++ b/app/services/user_merger.rb
@@ -358,6 +358,8 @@ class UserMerger
 
   def delete_source_user
     @source_user.reload
+
+    @source_user.skip_email_validation = true
     @source_user.update(
       admin: false,
       email: "#{@source_user.username}_#{SecureRandom.hex}@no-email.invalid"
diff --git a/spec/services/user_merger_spec.rb b/spec/services/user_merger_spec.rb
index 939afd2ae9..f8f66c99b8 100644
--- a/spec/services/user_merger_spec.rb
+++ b/spec/services/user_merger_spec.rb
@@ -990,6 +990,15 @@ describe UserMerger do
     expect(User.find_by_username(source_user.username)).to be_nil
   end
 
+  it "works even when email domains are restricted" do
+    SiteSetting.email_domains_whitelist = "example.com|work.com"
+    source_user.update_attribute(:admin, true)
+
+    expect(User.find_by_username(source_user.username)).to be_present
+    merge_users!
+    expect(User.find_by_username(source_user.username)).to be_nil
+  end
+
   it "deletes external auth infos of source user" do
     UserAssociatedAccount.create(user_id: source_user.id, provider_name: "facebook", provider_uid: "1234")
     GithubUserInfo.create(user_id: source_user.id, screen_name: "example", github_user_id: "examplel123123")

From 84d767716fc2123d90f1db57ee16c07e5f81ed79 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 9 Jun 2020 19:54:06 +0200
Subject: [PATCH 1615/1830] linting (#10008)

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

diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
index 00520eb662..fa18b45aee 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@@ -560,7 +560,11 @@ export default createWidget("post-menu", {
       state
     );
 
-    const controlsButtons = [...beforeExtraControls, ...visibleButtons, ...extraControls];
+    const controlsButtons = [
+      ...beforeExtraControls,
+      ...visibleButtons,
+      ...extraControls
+    ];
 
     postControls.push(h("div.actions", controlsButtons));
     if (state.adminVisible) {

From 43e17f92e09208cf6f08600df6e5419730a4c787 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 9 Jun 2020 19:58:17 +0200
Subject: [PATCH 1616/1830] DEV: allows to call a widget function without
 re-rendering the widget (#10004)

---
 .../javascripts/discourse/app/widgets/widget.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/widget.js b/app/assets/javascripts/discourse/app/widgets/widget.js
index 99220973c8..378035ab7b 100644
--- a/app/assets/javascripts/discourse/app/widgets/widget.js
+++ b/app/assets/javascripts/discourse/app/widgets/widget.js
@@ -327,14 +327,21 @@ export default class Widget {
     });
   }
 
+  callWidgetFunction(name, param) {
+    const widget = this._findAncestorWithProperty(name);
+    if (widget) {
+      return widget[name].call(widget, param);
+    }
+  }
+
   sendWidgetAction(name, param) {
     return this.rerenderResult(() => {
-      const widget = this._findAncestorWithProperty(name);
-      if (widget) {
-        return widget[name].call(widget, param);
-      }
+      const widgetFunction = this.callWidgetFunction(name, param);
 
-      return this._sendComponentAction(name, param || this.findAncestorModel());
+      return (
+        widgetFunction ||
+        this._sendComponentAction(name, param || this.findAncestorModel())
+      );
     });
   }
 

From f67e7d2fad48012de73c45f3a91dba97652e6d7f Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Wed, 10 Jun 2020 01:33:58 +0530
Subject: [PATCH 1617/1830] FIX: add attributes of `params` to topic
 `findOpts`.

If `params` is ignored then `findTopicList` won't get the `no_subcategories` attribute.

d27b877a40333cc6bc94984016071b5660da7f0f
---
 .../javascripts/discourse/app/routes/build-category-route.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/routes/build-category-route.js b/app/assets/javascripts/discourse/app/routes/build-category-route.js
index aa6da5804d..a28b6c8471 100644
--- a/app/assets/javascripts/discourse/app/routes/build-category-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-category-route.js
@@ -136,7 +136,7 @@ export default (filterArg, params) => {
       const listFilter = `c/${Category.slugFor(category)}/${
           category.id
         }/l/${this.filter(category)}`,
-        findOpts = filterQueryParams(modelParams),
+        findOpts = filterQueryParams(modelParams, params),
         extras = { cached: this.isPoppedState(transition) };
 
       return findTopicList(

From 9e98c02dd7c710d3a17754bc6fe1f4745a5edc5f Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 9 Jun 2020 23:01:07 +0100
Subject: [PATCH 1618/1830] FIX: Don't call cooked decorators in composer if
 cooked is unchanged

If cooked is unchanged, ember will not re-render the preview area, so we should not re-run the post-processing decorators. This can cause issues when decorateCooked functions are not idempotent.
---
 app/assets/javascripts/discourse/app/components/d-editor.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index 4917acc81c..f979d7cc72 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -367,6 +367,9 @@ export default Component.extend({
       if (this.isDestroyed) {
         return;
       }
+
+      if (this.preview === cooked) return;
+
       this.set("preview", cooked);
       schedule("afterRender", () => {
         if (this._state !== "inDOM") {

From 70a88111ddd68261e20f6bbb4128c69797a7bf7e Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Tue, 9 Jun 2020 12:26:10 -1000
Subject: [PATCH 1619/1830] FIX: prevent re-flagging when we have reviewed
 flags before (#10010)

FIX: prevent re-flagging when we have reviewed flags before

Fixes an edge case where a review can be reflagged when:
User flags as inappropriate.
Moderator rejects the flag.
Another user re-flags the post as spam.

Before, anyone was able to re-flag as inappropriate despite it being flagged
previously. With this, users are unable to re-flag for the same reason
regardless of reviewable status.
---
 lib/post_action_creator.rb                  |  4 ++--
 spec/components/post_action_creator_spec.rb | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/lib/post_action_creator.rb b/lib/post_action_creator.rb
index f647a437cd..62d576896a 100644
--- a/lib/post_action_creator.rb
+++ b/lib/post_action_creator.rb
@@ -141,11 +141,11 @@ private
 
   def cannot_flag_again?(reviewable)
     return false if @post_action_type_id == PostActionType.types[:notify_moderators]
-    flag_type_already_used = reviewable.reviewable_scores.any? { |rs| rs.reviewable_score_type == @post_action_type_id }
+    flag_type_already_used = reviewable.reviewable_scores.any? { |rs| rs.reviewable_score_type == @post_action_type_id && rs.status != ReviewableScore.statuses[:pending] }
     not_edited_since_last_review = @post.last_version_at.blank? || reviewable.updated_at > @post.last_version_at
     handled_recently = reviewable.updated_at > SiteSetting.cooldown_hours_until_reflag.to_i.hours.ago
 
-    !reviewable.pending? && flag_type_already_used && not_edited_since_last_review && handled_recently
+    flag_type_already_used && not_edited_since_last_review && handled_recently
   end
 
   def notify_subscribers
diff --git a/spec/components/post_action_creator_spec.rb b/spec/components/post_action_creator_spec.rb
index ad013f82f5..010455f48f 100644
--- a/spec/components/post_action_creator_spec.rb
+++ b/spec/components/post_action_creator_spec.rb
@@ -151,6 +151,26 @@ describe PostActionCreator do
           expect(result.success?).to eq(false)
         end
 
+        it "succeeds with other flag action types" do
+          freeze_time 10.seconds.from_now
+          spam_result = PostActionCreator.create(user, post, :spam)
+
+          expect(reviewable.reload.pending?).to eq(true)
+        end
+
+        it "fails when other flag action types are open" do
+          freeze_time 10.seconds.from_now
+          spam_result = PostActionCreator.create(user, post, :spam)
+
+          inappropriate_result = PostActionCreator.create(Fabricate(:user), post, :inappropriate)
+
+          reviewable.reload
+
+          expect(inappropriate_result.success?).to eq(false)
+          expect(reviewable.pending?).to eq(true)
+          expect(reviewable.reviewable_scores.select(&:pending?).count).to eq(1)
+        end
+
         it "succesfully flags the post if it was reviewed more than 24 hours ago" do
           reviewable.update!(updated_at: 25.hours.ago)
           post.last_version_at = 30.hours.ago

From f993d8a197f44b6ea1930543b8205e766db55662 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 10 Jun 2020 08:28:54 +1000
Subject: [PATCH 1620/1830] FIX: flaky post_alerter_spec.rb because of missing
 order (#10000)

---
 app/services/post_alerter.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index 79d8b7e71b..24d8b48265 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -463,6 +463,7 @@ class PostAlerter
         .where("push_url IS NOT NULL AND push_url <> ''")
         .where("position(push_url IN ?) > 0", SiteSetting.allowed_user_api_push_urls)
         .where("revoked_at IS NULL")
+        .order(client_id: :asc)
         .pluck(:client_id, :push_url)
 
       if clients.length > 0

From 45fd668dc563e1ba3a6240910bf1400928255664 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 10 Jun 2020 09:25:58 +0800
Subject: [PATCH 1621/1830] DEV: Render a proper response that can be handled
 on the client side.

---
 app/controllers/invites_controller.rb    | 8 ++++----
 spec/requests/invites_controller_spec.rb | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index ed5b6a01dc..c429fe3214 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -165,14 +165,14 @@ class InvitesController < ApplicationController
     raise Discourse::InvalidParameters.new(:id) if invite.blank?
     invite.trash!(current_user)
 
-    render body: nil
+    render json: success_json
   end
 
   def rescind_all_invites
     guardian.ensure_can_rescind_all_invites!(current_user)
 
     Invite.rescind_all_expired_invites_from(current_user)
-    render body: nil
+    render json: success_json
   end
 
   def resend_invite
@@ -182,7 +182,7 @@ class InvitesController < ApplicationController
     invite = Invite.find_by(invited_by_id: current_user.id, email: params[:email])
     raise Discourse::InvalidParameters.new(:email) if invite.blank?
     invite.resend_invite
-    render body: nil
+    render json: success_json
 
   rescue RateLimiter::LimitExceeded
     render_json_error(I18n.t("rate_limiter.slow_down"))
@@ -192,7 +192,7 @@ class InvitesController < ApplicationController
     guardian.ensure_can_resend_all_invites!(current_user)
 
     Invite.resend_all_invites_from(current_user.id)
-    render body: nil
+    render json: success_json
   end
 
   def upload_csv
diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rb
index 3ba6d09af9..2a5752d7c7 100644
--- a/spec/requests/invites_controller_spec.rb
+++ b/spec/requests/invites_controller_spec.rb
@@ -70,6 +70,9 @@ describe InvitesController do
 
       it "destroys the invite" do
         delete "/invites.json", params: { id: invite.id }
+
+        expect(response.status).to eq(200)
+
         invite.reload
         expect(invite.trashed?).to be_truthy
       end

From 31a527a2938142528250ef7fdc0a604263e1a4c8 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 10 Jun 2020 09:29:28 +0800
Subject: [PATCH 1622/1830] FIX: Return 400 when invalid topic_id is provided
 when creating invite.

---
 app/controllers/invites_controller.rb    | 15 ++++++++++-----
 spec/requests/invites_controller_spec.rb | 19 +++++++++++++++----
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index c429fe3214..6e26d45c5d 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -126,15 +126,20 @@ class InvitesController < ApplicationController
     group_ids = groups.map(&:id)
 
     if is_single_invite
-      if params[:topic_id].present?
-        topic = Topic.find_by(id: params[:topic_id])
-        guardian.ensure_can_invite_to!(topic) if topic.present?
-      end
-
       invite_exists = Invite.exists?(email: params[:email], invited_by_id: current_user.id)
       if invite_exists && !guardian.can_send_multiple_invites?(current_user)
         return render json: failed_json, status: 422
       end
+
+      if params[:topic_id].present?
+        topic = Topic.find_by(id: params[:topic_id])
+
+        if topic.present?
+          guardian.ensure_can_invite_to!(topic)
+        else
+          raise Discourse::InvalidParameters.new(:topic_id)
+        end
+      end
     end
 
     begin
diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rb
index 2a5752d7c7..16b79fde2f 100644
--- a/spec/requests/invites_controller_spec.rb
+++ b/spec/requests/invites_controller_spec.rb
@@ -4,6 +4,7 @@ require 'rails_helper'
 
 describe InvitesController do
   fab!(:admin) { Fabricate(:admin) }
+  fab!(:trust_level_4) { Fabricate(:trust_level_4) }
 
   context 'show' do
     fab!(:invite) { Fabricate(:invite) }
@@ -95,7 +96,7 @@ describe InvitesController do
       end
 
       it "fails for normal user if invite email already exists" do
-        user = sign_in(Fabricate(:trust_level_4))
+        user = sign_in(trust_level_4)
         invite = Invite.invite_by_email("invite@example.com", user)
         post "/invites.json", params: { email: invite.email }
         expect(response.status).to eq(422)
@@ -159,7 +160,7 @@ describe InvitesController do
         end
 
         it "fails for normal user if invite email already exists" do
-          user = sign_in(Fabricate(:trust_level_4))
+          user = sign_in(trust_level_4)
           invite = Invite.invite_by_email("invite@example.com", user)
 
           post "/invites/link.json", params: {
@@ -169,11 +170,21 @@ describe InvitesController do
           expect(response.status).to eq(422)
         end
 
+        it "returns the right response when topic_id is invalid" do
+          sign_in(trust_level_4)
+
+          post "/invites/link.json", params: {
+            email: email, topic_id: -9999
+          }
+
+          expect(response.status).to eq(400)
+        end
+
         it "verifies that inviter is authorized to invite new user to a group-private topic" do
           group = Fabricate(:group)
           private_category = Fabricate(:private_category, group: group)
           group_private_topic = Fabricate(:topic, category: private_category)
-          sign_in(Fabricate(:trust_level_4))
+          sign_in(trust_level_4)
 
           post "/invites/link.json", params: {
             email: email, topic_id: group_private_topic.id
@@ -219,7 +230,7 @@ describe InvitesController do
 
       context 'while logged in' do
         it "fails for non-staff users" do
-          sign_in(Fabricate(:trust_level_4))
+          sign_in(trust_level_4)
           post "/invites/link.json", params: {
             max_redemptions_allowed: 5
           }

From 7e1c93326f18b77060ffdac9966f37cf013bc962 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Tue, 9 Jun 2020 18:56:30 -0700
Subject: [PATCH 1623/1830] copyedit: make it more clear PMs are blocked by
 ignore and mute

---
 config/locales/client.en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f43b88ef72..1cc52eb745 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -954,9 +954,9 @@ en:
       admin_delete: "Delete"
       users: "Users"
       muted_users: "Muted"
-      muted_users_instructions: "Suppress all notifications from these users."
+      muted_users_instructions: "Suppress all notifications and PMs from these users."
       ignored_users: "Ignored"
-      ignored_users_instructions: "Suppress all posts and notifications from these users."
+      ignored_users_instructions: "Suppress all posts, notifications, and PMs from these users."
       tracked_topics_link: "Show"
       automatically_unpin_topics: "Automatically unpin topics when I reach the bottom."
       apps: "Apps"

From 7589551d68b2d7054d695bdb27bd950093b67f77 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 10 Jun 2020 12:20:17 +1000
Subject: [PATCH 1624/1830] PERF: enable bootsnap globally

If people wish to opt out they can use `DISABLE_BOOTSNAP = 1`

Bootsnap is production ready and was tested on our production
servers for safety.

Promoting it now so it is enabled globally.

Will result in faster application boot
---
 config/boot.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/boot.rb b/config/boot.rb
index affd36c9bb..572d833edd 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -12,7 +12,7 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
 
-if (ENV['FORCE_BOOTSNAP'] == '1') || (ENV['RAILS_ENV'] != 'production' && ENV['RAILS_ENV'] != 'profile')
+if (ENV['DISABLE_BOOTSNAP'] != '1')
   begin
     require 'bootsnap'
   rescue LoadError

From 2ce829cc01c6606c014194259fe6ba1e60e6b241 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 10 Jun 2020 14:03:20 +0800
Subject: [PATCH 1625/1830] DEV: Allow multisite apps to boot with reading
 connection handler.

---
 Gemfile.lock                              |  2 +-
 config/initializers/002-rails_failover.rb | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 189cfed62a..2870d86e7b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -288,7 +288,7 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails_multisite (2.2.2)
+    rails_multisite (2.3.0)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
     railties (6.0.3.1)
diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index d53451bc4c..54692b7f82 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -17,6 +17,13 @@ if ENV["REDIS_RAILS_FAILOVER"]
 end
 
 if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
+  if Rails.configuration.multisite
+    if ActiveRecord::Base.current_role == ActiveRecord::Base.reading_role
+      RailsMultisite::ConnectionManagement.default_connection_handler =
+        ActiveRecord::Base.connection_handlers[ActiveRecord::Base.reading_role]
+    end
+  end
+
   RailsFailover::ActiveRecord.on_failover do
     RailsMultisite::ConnectionManagement.each_connection do
       Discourse.enable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
@@ -29,6 +36,11 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
       Discourse.disable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
       Sidekiq.unpause! if Sidekiq.paused?
     end
+
+    if Rails.configuration.multisite
+      RailsMultisite::ConnectionManagement.default_connection_handler =
+        ActiveRecord::Base.connection_handlers[ActiveRecord::Base.writing_role]
+    end
   end
 
   module Discourse

From 98bc28cea259b823552e1b953506bcf2f76347a9 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 10 Jun 2020 14:28:56 +0800
Subject: [PATCH 1626/1830] Bump redis to 4.2.0.

---
 Gemfile.lock                              |  2 +-
 config/initializers/002-rails_failover.rb |  2 +-
 lib/admin_confirmation.rb                 |  2 +-
 lib/discourse.rb                          |  2 +-
 lib/discourse_redis.rb                    | 15 +-------------
 spec/components/discourse_redis_spec.rb   | 25 -----------------------
 6 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2870d86e7b..3aee17147d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -310,7 +310,7 @@ GEM
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
     rchardet (1.8.0)
-    redis (4.1.4)
+    redis (4.2.0)
     redis-namespace (1.7.0)
       redis (>= 3.0.4)
     regexp_parser (1.7.1)
diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index 54692b7f82..2b84cf11a6 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -65,7 +65,7 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
   end
 
   RailsFailover::ActiveRecord.register_force_reading_role_callback do
-    Discourse.redis.exists(
+    Discourse.redis.exists?(
       Discourse::PG_READONLY_MODE_KEY,
       Discourse::PG_FORCE_READONLY_MODE_KEY
     )
diff --git a/lib/admin_confirmation.rb b/lib/admin_confirmation.rb
index dc132b72f7..28f305b5ad 100644
--- a/lib/admin_confirmation.rb
+++ b/lib/admin_confirmation.rb
@@ -43,7 +43,7 @@ class AdminConfirmation
   end
 
   def self.exists_for?(user_id)
-    Discourse.redis.exists "admin-confirmation:#{user_id}"
+    Discourse.redis.exists? "admin-confirmation:#{user_id}"
   end
 
   def self.find_by_code(token)
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 67ac64c297..27066295a9 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -489,7 +489,7 @@ module Discourse
   end
 
   def self.readonly_mode?(keys = READONLY_KEYS)
-    recently_readonly? || Discourse.redis.exists(*keys)
+    recently_readonly? || Discourse.redis.exists?(*keys)
   end
 
   def self.pg_readonly_mode?
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index 096c86b574..9ca18dcdf8 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -193,7 +193,7 @@ class DiscourseRedis
   end
 
   # Proxy key methods through, but prefix the keys with the namespace
-  [:append, :blpop, :brpop, :brpoplpush, :decr, :decrby, :expire, :expireat, :get, :getbit, :getrange, :getset,
+  [:append, :blpop, :brpop, :brpoplpush, :decr, :decrby, :expire, :expireat, :exists, :exists?, :get, :getbit, :getrange, :getset,
    :hdel, :hexists, :hget, :hgetall, :hincrby, :hincrbyfloat, :hkeys, :hlen, :hmget, :hmset, :hset, :hsetnx, :hvals, :incr,
    :incrby, :incrbyfloat, :lindex, :linsert, :llen, :lpop, :lpush, :lpushx, :lrange, :lrem, :lset, :ltrim,
    :mapped_hmset, :mapped_hmget, :mapped_mget, :mapped_mset, :mapped_msetnx, :move, :mset,
@@ -207,19 +207,6 @@ class DiscourseRedis
     end
   end
 
-  # Implement our own because https://github.com/redis/redis-rb/issues/698 has stalled
-  def exists(*keys)
-    keys.map! { |a| "#{namespace}:#{a}" }  if @namespace
-
-    DiscourseRedis.ignore_readonly do
-      @redis.synchronize do |client|
-        client.call([:exists, *keys]) do |value|
-          value > 0
-        end
-      end
-    end
-  end
-
   def mget(*args)
     args.map! { |a| "#{namespace}:#{a}" }  if @namespace
     DiscourseRedis.ignore_readonly { @redis.mget(*args) }
diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb
index 8e4411653b..abc9a5917a 100644
--- a/spec/components/discourse_redis_spec.rb
+++ b/spec/components/discourse_redis_spec.rb
@@ -87,31 +87,6 @@ describe DiscourseRedis do
         expect(Discourse.recently_readonly?).to eq(true)
       end
     end
-
-    describe '.exists' do
-      it 'should return false when key is not present' do
-        expect(Discourse.redis.exists('test')).to eq(false)
-      end
-
-      it 'should return false when keys are not present' do
-        expect(Discourse.redis.exists('test', 'test2')).to eq(false)
-      end
-
-      it 'should return true when key is present' do
-        Discourse.redis.set('test', 1)
-
-        expect(Discourse.redis.exists('test')).to eq(true)
-      end
-
-      it 'should return true when any key is present' do
-        Discourse.redis.set('test', 1)
-        Discourse.redis.set('test2', 1)
-
-        expect(Discourse.redis.exists('test')).to eq(true)
-        expect(Discourse.redis.exists('test', 'test2')).to eq(true)
-        expect(Discourse.redis.exists('test2', 'test3')).to eq(true)
-      end
-    end
   end
 
   context '.slave_host' do

From a3dfd553a1cf56fa1adcd95c4edb02eeb3400ca9 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 10 Jun 2020 14:52:05 +0800
Subject: [PATCH 1627/1830] Revert "Bump redis to 4.2.0."

This reverts commit 98bc28cea259b823552e1b953506bcf2f76347a9.
---
 Gemfile.lock                              |  2 +-
 config/initializers/002-rails_failover.rb |  2 +-
 lib/admin_confirmation.rb                 |  2 +-
 lib/discourse.rb                          |  2 +-
 lib/discourse_redis.rb                    | 15 +++++++++++++-
 spec/components/discourse_redis_spec.rb   | 25 +++++++++++++++++++++++
 6 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3aee17147d..2870d86e7b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -310,7 +310,7 @@ GEM
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
     rchardet (1.8.0)
-    redis (4.2.0)
+    redis (4.1.4)
     redis-namespace (1.7.0)
       redis (>= 3.0.4)
     regexp_parser (1.7.1)
diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index 2b84cf11a6..54692b7f82 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -65,7 +65,7 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
   end
 
   RailsFailover::ActiveRecord.register_force_reading_role_callback do
-    Discourse.redis.exists?(
+    Discourse.redis.exists(
       Discourse::PG_READONLY_MODE_KEY,
       Discourse::PG_FORCE_READONLY_MODE_KEY
     )
diff --git a/lib/admin_confirmation.rb b/lib/admin_confirmation.rb
index 28f305b5ad..dc132b72f7 100644
--- a/lib/admin_confirmation.rb
+++ b/lib/admin_confirmation.rb
@@ -43,7 +43,7 @@ class AdminConfirmation
   end
 
   def self.exists_for?(user_id)
-    Discourse.redis.exists? "admin-confirmation:#{user_id}"
+    Discourse.redis.exists "admin-confirmation:#{user_id}"
   end
 
   def self.find_by_code(token)
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 27066295a9..67ac64c297 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -489,7 +489,7 @@ module Discourse
   end
 
   def self.readonly_mode?(keys = READONLY_KEYS)
-    recently_readonly? || Discourse.redis.exists?(*keys)
+    recently_readonly? || Discourse.redis.exists(*keys)
   end
 
   def self.pg_readonly_mode?
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index 9ca18dcdf8..096c86b574 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -193,7 +193,7 @@ class DiscourseRedis
   end
 
   # Proxy key methods through, but prefix the keys with the namespace
-  [:append, :blpop, :brpop, :brpoplpush, :decr, :decrby, :expire, :expireat, :exists, :exists?, :get, :getbit, :getrange, :getset,
+  [:append, :blpop, :brpop, :brpoplpush, :decr, :decrby, :expire, :expireat, :get, :getbit, :getrange, :getset,
    :hdel, :hexists, :hget, :hgetall, :hincrby, :hincrbyfloat, :hkeys, :hlen, :hmget, :hmset, :hset, :hsetnx, :hvals, :incr,
    :incrby, :incrbyfloat, :lindex, :linsert, :llen, :lpop, :lpush, :lpushx, :lrange, :lrem, :lset, :ltrim,
    :mapped_hmset, :mapped_hmget, :mapped_mget, :mapped_mset, :mapped_msetnx, :move, :mset,
@@ -207,6 +207,19 @@ class DiscourseRedis
     end
   end
 
+  # Implement our own because https://github.com/redis/redis-rb/issues/698 has stalled
+  def exists(*keys)
+    keys.map! { |a| "#{namespace}:#{a}" }  if @namespace
+
+    DiscourseRedis.ignore_readonly do
+      @redis.synchronize do |client|
+        client.call([:exists, *keys]) do |value|
+          value > 0
+        end
+      end
+    end
+  end
+
   def mget(*args)
     args.map! { |a| "#{namespace}:#{a}" }  if @namespace
     DiscourseRedis.ignore_readonly { @redis.mget(*args) }
diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb
index abc9a5917a..8e4411653b 100644
--- a/spec/components/discourse_redis_spec.rb
+++ b/spec/components/discourse_redis_spec.rb
@@ -87,6 +87,31 @@ describe DiscourseRedis do
         expect(Discourse.recently_readonly?).to eq(true)
       end
     end
+
+    describe '.exists' do
+      it 'should return false when key is not present' do
+        expect(Discourse.redis.exists('test')).to eq(false)
+      end
+
+      it 'should return false when keys are not present' do
+        expect(Discourse.redis.exists('test', 'test2')).to eq(false)
+      end
+
+      it 'should return true when key is present' do
+        Discourse.redis.set('test', 1)
+
+        expect(Discourse.redis.exists('test')).to eq(true)
+      end
+
+      it 'should return true when any key is present' do
+        Discourse.redis.set('test', 1)
+        Discourse.redis.set('test2', 1)
+
+        expect(Discourse.redis.exists('test')).to eq(true)
+        expect(Discourse.redis.exists('test', 'test2')).to eq(true)
+        expect(Discourse.redis.exists('test2', 'test3')).to eq(true)
+      end
+    end
   end
 
   context '.slave_host' do

From 8fe074430bda577758969f9c2d470776989abe7a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 10 Jun 2020 11:10:39 +0200
Subject: [PATCH 1628/1830] REVERT: partly revert change to ensure context is
 the same (#10012)

---
 app/assets/javascripts/discourse/app/widgets/widget.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/widget.js b/app/assets/javascripts/discourse/app/widgets/widget.js
index 378035ab7b..ad54150b33 100644
--- a/app/assets/javascripts/discourse/app/widgets/widget.js
+++ b/app/assets/javascripts/discourse/app/widgets/widget.js
@@ -336,12 +336,12 @@ export default class Widget {
 
   sendWidgetAction(name, param) {
     return this.rerenderResult(() => {
-      const widgetFunction = this.callWidgetFunction(name, param);
+      const widget = this._findAncestorWithProperty(name);
+      if (widget) {
+        return widget[name].call(widget, param);
+      }
 
-      return (
-        widgetFunction ||
-        this._sendComponentAction(name, param || this.findAncestorModel())
-      );
+      return this._sendComponentAction(name, param || this.findAncestorModel());
     });
   }
 

From 3ff3e6dc107895989881389abed5ef0a5e9e5513 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <svkn.87@gmail.com>
Date: Wed, 10 Jun 2020 16:03:57 +0530
Subject: [PATCH 1629/1830] minor copyedit on category setting options.

`default_list_filter`

3e7f7fdde8dd4ad92a34352ec927b2cdfbf91416
---
 config/locales/client.en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 1cc52eb745..1dc4865929 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2907,8 +2907,8 @@ en:
         appearance: "Appearance"
         email: "Email"
       list_filters:
-        all: "all"
-        none: "none"
+        all: "all topics"
+        none: "no subcategories"
 
     flagging:
       title: "Thanks for helping to keep our community civil!"

From 274db95fb2600a7ac143c14ce14893b806d76943 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 10 Jun 2020 16:09:36 +0530
Subject: [PATCH 1630/1830] FIX: MigrateInviteRedeemedDataToInvitedUsers should
 be normal migration (#10013)

---
 ...00602153813_migrate_invite_redeemed_data_to_invited_users.rb | 2 ++
 1 file changed, 2 insertions(+)
 rename db/{post_migrate => migrate}/20200602153813_migrate_invite_redeemed_data_to_invited_users.rb (94%)

diff --git a/db/post_migrate/20200602153813_migrate_invite_redeemed_data_to_invited_users.rb b/db/migrate/20200602153813_migrate_invite_redeemed_data_to_invited_users.rb
similarity index 94%
rename from db/post_migrate/20200602153813_migrate_invite_redeemed_data_to_invited_users.rb
rename to db/migrate/20200602153813_migrate_invite_redeemed_data_to_invited_users.rb
index 29c2927673..7f38286d4f 100644
--- a/db/post_migrate/20200602153813_migrate_invite_redeemed_data_to_invited_users.rb
+++ b/db/migrate/20200602153813_migrate_invite_redeemed_data_to_invited_users.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'migration/column_dropper'
+
 class MigrateInviteRedeemedDataToInvitedUsers < ActiveRecord::Migration[6.0]
   def up
     %i{user_id redeemed_at}.each do |column|

From 3a7ca97c36536ae4e49ce5c479e9fb50dc389fcc Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 10 Jun 2020 18:57:39 +0300
Subject: [PATCH 1631/1830] FIX: Use include-subcategories filter in report
 export (#10007)

Some filters were renamed and the conversion of the filter names and arguments
was removed.
---
 .../admin/components/admin-report.js          | 16 +++++---
 app/controllers/export_csv_controller.rb      |  2 +-
 app/jobs/regular/export_csv_file.rb           |  9 ++---
 app/models/report.rb                          |  6 ++-
 app/models/reports/top_uploads.rb             |  4 +-
 config/locales/client.en.yml                  |  4 +-
 spec/jobs/export_csv_file_spec.rb             | 21 +++++++++-
 spec/models/report_spec.rb                    | 39 ++++++++++++++++---
 8 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/admin/components/admin-report.js b/app/assets/javascripts/admin/components/admin-report.js
index bacb6177e1..e64e02f3eb 100644
--- a/app/assets/javascripts/admin/components/admin-report.js
+++ b/app/assets/javascripts/admin/components/admin-report.js
@@ -226,14 +226,18 @@ export default Component.extend({
 
   @action
   exportCsv() {
-    const customFilters = this.get("filters.customFilters") || {};
-    exportEntity("report", {
+    const args = {
       name: this.get("model.type"),
       start_date: this.startDate.toISOString(true).split("T")[0],
-      end_date: this.endDate.toISOString(true).split("T")[0],
-      category_id: customFilters.category,
-      group_id: customFilters.group
-    }).then(outputExportResult);
+      end_date: this.endDate.toISOString(true).split("T")[0]
+    };
+
+    const customFilters = this.get("filters.customFilters");
+    if (customFilters) {
+      Object.assign(args, customFilters);
+    }
+
+    exportEntity("report", args).then(outputExportResult);
   },
 
   @action
diff --git a/app/controllers/export_csv_controller.rb b/app/controllers/export_csv_controller.rb
index 6ac0412551..19257357db 100644
--- a/app/controllers/export_csv_controller.rb
+++ b/app/controllers/export_csv_controller.rb
@@ -18,7 +18,7 @@ class ExportCsvController < ApplicationController
   def export_params
     @_export_params ||= begin
       params.require(:entity)
-      params.permit(:entity, args: [:name, :start_date, :end_date, :category_id, :group_id, :trust_level]).to_h
+      params.permit(:entity, args: Report::FILTERS).to_h
     end
   end
 end
diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index 7d9b00d166..3a63c88ea1 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -215,12 +215,9 @@ module Jobs
       end
 
       @extra[:filters] = {}
-      if @extra[:category_id].present?
-        @extra[:filters][:category] = @extra[:category_id].to_i
-      end
-      if @extra[:group_id].present?
-        @extra[:filters][:group] = @extra[:group_id].to_i
-      end
+      @extra[:filters][:category] = @extra[:category].to_i if @extra[:category].present?
+      @extra[:filters][:group] = @extra[:group].to_i if @extra[:group].present?
+      @extra[:filters][:include_subcategories] = !!ActiveRecord::Type::Boolean.new.cast(@extra[:include_subcategories]) if @extra[:include_subcategories].present?
 
       report = Report.find(@extra[:name], @extra)
 
diff --git a/app/models/report.rb b/app/models/report.rb
index b66e36c772..bf8d1c3313 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -5,6 +5,8 @@ class Report
   # and you want to ensure cache is reset
   SCHEMA_VERSION = 4
 
+  FILTERS = [:name, :start_date, :end_date, :category, :group, :trust_level, :file_extension, :include_subcategories]
+
   attr_accessor :type, :data, :total, :prev30Days, :start_date,
                 :end_date, :labels, :prev_period, :facets, :limit, :average,
                 :percent, :higher_is_better, :icon, :modes, :prev_data,
@@ -80,9 +82,9 @@ class Report
     add_filter('category', type: 'category', default: category_id)
     return if category_id.blank?
 
-    include_subcategories = filters[:'include-subcategories']
+    include_subcategories = filters[:include_subcategories]
     include_subcategories = !!ActiveRecord::Type::Boolean.new.cast(include_subcategories)
-    add_filter('include-subcategories', type: 'bool', default: include_subcategories)
+    add_filter('include_subcategories', type: 'bool', default: include_subcategories)
 
     [category_id, include_subcategories]
   end
diff --git a/app/models/reports/top_uploads.rb b/app/models/reports/top_uploads.rb
index e5a4f542cf..f410fd4c6d 100644
--- a/app/models/reports/top_uploads.rb
+++ b/app/models/reports/top_uploads.rb
@@ -3,8 +3,8 @@
 Report.add_report('top_uploads') do |report|
   report.modes = [:table]
 
-  extension_filter = report.filters.dig(:"file-extension")
-  report.add_filter('file-extension',
+  extension_filter = report.filters.dig(:file_extension)
+  report.add_filter('file_extension',
     type: 'list',
     default: extension_filter || 'any',
     choices: (SiteSetting.authorized_extensions.split('|') + Array(extension_filter)).uniq
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 1dc4865929..2de77fce97 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3458,13 +3458,13 @@ en:
             more: '<a href="%{basePath}/admin/logs/search_logs">Search logs</a>'
             disabled: 'Trending search report is disabled. Enable <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">log search queries</a> to collect data.'
           filters:
-            file-extension:
+            file_extension:
               label: File extension
             group:
               label: Group
             category:
               label: Category
-            include-subcategories:
+            include_subcategories:
               label: "Include Subcategories"
 
       commits:
diff --git a/spec/jobs/export_csv_file_spec.rb b/spec/jobs/export_csv_file_spec.rb
index a29bae2549..45ab2520cb 100644
--- a/spec/jobs/export_csv_file_spec.rb
+++ b/spec/jobs/export_csv_file_spec.rb
@@ -121,7 +121,7 @@ describe Jobs::ExportCsvFile do
       user1.user_visits.create!(visited_at: '2010-01-03', posts_read: 420)
 
       exporter.extra['name'] = 'visits'
-      exporter.extra['group_id'] = group.id
+      exporter.extra['group'] = group.id
       report = exporter.report_export.to_a
 
       expect(report.length).to eq(2)
@@ -188,6 +188,25 @@ describe Jobs::ExportCsvFile do
       expect(report[3]).to contain_exactly("2010-01-03", "3", "6", "9")
     end
 
+    it 'works with posts reports and filters' do
+      category = Fabricate(:category)
+      subcategory = Fabricate(:category, parent_category: category)
+
+      Fabricate(:post, topic: Fabricate(:topic, category: category), created_at: '2010-01-01 12:00:00 UTC')
+      Fabricate(:post, topic: Fabricate(:topic, category: subcategory), created_at: '2010-01-01 12:00:00 UTC')
+
+      exporter.extra['name'] = 'posts'
+
+      exporter.extra['category'] = category.id
+      report = exporter.report_export.to_a
+      expect(report[0]).to contain_exactly("Count", "Day")
+      expect(report[1]).to contain_exactly("1", "2010-01-01")
+
+      exporter.extra['include_subcategories'] = true
+      report = exporter.report_export.to_a
+      expect(report[0]).to contain_exactly("Count", "Day")
+      expect(report[1]).to contain_exactly("2", "2010-01-01")
+    end
   end
 
   let(:user_list_header) {
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index 7ccaf60941..576c713125 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -771,7 +771,7 @@ describe Report do
         include_examples 'category filtering'
 
         context "on subcategories" do
-          let(:report) { Report.find('flags', filters: { category: c0.id, 'include-subcategories': true }) }
+          let(:report) { Report.find('flags', filters: { category: c0.id, 'include_subcategories': true }) }
 
           include_examples 'category filtering on subcategories'
         end
@@ -801,7 +801,7 @@ describe Report do
         include_examples 'category filtering'
 
         context "on subcategories" do
-          let(:report) { Report.find('topics', filters: { category: c0.id, 'include-subcategories': true }) }
+          let(:report) { Report.find('topics', filters: { category: c0.id, 'include_subcategories': true }) }
 
           include_examples 'category filtering on subcategories'
         end
@@ -892,7 +892,7 @@ describe Report do
         include_examples 'category filtering'
 
         context "on subcategories" do
-          let(:report) { Report.find('posts', filters: { category: c0.id, 'include-subcategories': true }) }
+          let(:report) { Report.find('posts', filters: { category: c0.id, 'include_subcategories': true }) }
 
           include_examples 'category filtering on subcategories'
         end
@@ -924,7 +924,7 @@ describe Report do
         include_examples 'category filtering'
 
         context "on subcategories" do
-          let(:report) { Report.find('topics_with_no_response', filters: { category: c0.id, 'include-subcategories': true }) }
+          let(:report) { Report.find('topics_with_no_response', filters: { category: c0.id, 'include_subcategories': true }) }
 
           include_examples 'category filtering on subcategories'
         end
@@ -960,7 +960,7 @@ describe Report do
         include_examples 'category filtering'
 
         context "on subcategories" do
-          let(:report) { Report.find('likes', filters: { category: c0.id, 'include-subcategories': true }) }
+          let(:report) { Report.find('likes', filters: { category: c0.id, 'include_subcategories': true }) }
 
           include_examples 'category filtering on subcategories'
         end
@@ -1236,4 +1236,33 @@ describe Report do
       end
     end
   end
+
+  describe "top_uploads" do
+    context "with no data" do
+      it "works" do
+        report = Report.find("top_uploads")
+
+        expect(report.data).to be_empty
+      end
+    end
+
+    context "with data" do
+      fab!(:jpg_upload) { Fabricate(:upload, extension: :jpg) }
+      fab!(:png_upload) { Fabricate(:upload, extension: :png) }
+
+      it "works" do
+        report = Report.find("top_uploads")
+
+        expect(report.data.length).to eq(2)
+        expect(report.data.map { |row| row[:extension] }).to contain_exactly("jpg", "png")
+      end
+
+      it "works with filters" do
+        report = Report.find("top_uploads", filters: { file_extension: "jpg" })
+
+        expect(report.data.length).to eq(1)
+        expect(report.data[0][:extension]).to eq("jpg")
+      end
+    end
+  end
 end

From be28fc73a0122e28ec020f76c872eb3bf5433fc6 Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Wed, 10 Jun 2020 10:59:17 -0500
Subject: [PATCH 1632/1830] DEV: Improvements to Drupal script (#10016)

Refactors script to follow conventions of other importers and adds some features including like import, processing of post raw text, and, if needed, SSO import.
---
 script/import_scripts/drupal.rb | 494 ++++++++++++++++++++++++++------
 1 file changed, 414 insertions(+), 80 deletions(-)

diff --git a/script/import_scripts/drupal.rb b/script/import_scripts/drupal.rb
index c97c2e632d..a10615fe32 100644
--- a/script/import_scripts/drupal.rb
+++ b/script/import_scripts/drupal.rb
@@ -1,16 +1,21 @@
 # frozen_string_literal: true
 
 require "mysql2"
+require "htmlentities"
 require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 
 class ImportScripts::Drupal < ImportScripts::Base
 
-  DRUPAL_DB = ENV['DRUPAL_DB'] || "newsite3"
+  DRUPAL_DB = ENV['DRUPAL_DB'] || "drupal"
   VID = ENV['DRUPAL_VID'] || 1
+  BATCH_SIZE = 1000
+  ATTACHMENT_DIR = "/root/files/upload"
 
   def initialize
     super
 
+    @htmlentities = HTMLEntities.new
+
     @client = Mysql2::Client.new(
       host: "localhost",
       username: "root",
@@ -19,142 +24,210 @@ class ImportScripts::Drupal < ImportScripts::Base
     )
   end
 
-  def categories_query
-    @client.query("SELECT tid, name, description FROM taxonomy_term_data WHERE vid = #{VID}")
-  end
-
   def execute
-    create_users(@client.query("SELECT uid id, name, mail email, created FROM users;")) do |row|
-      { id: row['id'], username: row['name'], email: row['email'], created_at: Time.zone.at(row['created']) }
-    end
 
-    # You'll need to edit the following query for your Drupal install:
-    #
-    #   * Drupal allows duplicate category names, so you may need to exclude some categories or rename them here.
-    #   * Table name may be term_data.
-    #   * May need to select a vid other than 1.
-    create_categories(categories_query) do |c|
-      { id: c['tid'], name: c['name'], description: c['description'] }
-    end
+    import_users
+    import_categories
 
     # "Nodes" in Drupal are divided into types. Here we import two types,
     # and will later import all the comments/replies for each node.
     # You will need to figure out what the type names are on your install and edit the queries to match.
     if ENV['DRUPAL_IMPORT_BLOG']
-      create_blog_topics
+      import_blog_topics
     end
 
-    create_forum_topics
+    import_forum_topics
 
-    create_replies
+    import_replies
+    import_likes
+    mark_topics_as_solved
+    import_sso_records
+    import_attachments
+    postprocess_posts
+    create_permalinks
+    import_gravatars
+  end
 
-    begin
-      create_admin(email: 'neil.lalonde@discourse.org', username: UserNameSuggester.suggest('neil'))
-    rescue => e
-      puts '', "Failed to create admin user"
-      puts e.message
+  def import_users
+    puts "", "importing users"
+
+    user_count = mysql_query("SELECT count(uid) count FROM users").first["count"]
+
+    last_user_id = -1
+
+    batches(BATCH_SIZE) do |offset|
+      users = mysql_query(<<-SQL
+          SELECT uid,
+                 name username,
+                 mail email,
+                 created
+            FROM users
+           WHERE uid > #{last_user_id}
+        ORDER BY uid
+           LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+
+      break if users.empty?
+
+      last_user_id = users[-1]["uid"]
+
+      users.reject! { |u| @lookup.user_already_imported?(u["uid"]) }
+
+      create_users(users, total: user_count, offset: offset) do |user|
+        email = user["email"].presence || fake_email
+        email = fake_email unless email[EmailValidator.email_regex]
+
+        username = @htmlentities.decode(user["username"]).strip
+
+        {
+          id: user["uid"],
+          name: username,
+          email: email,
+          created_at: Time.zone.at(user["created"])
+        }
+      end
     end
   end
 
-  def create_blog_topics
-    puts '', "creating blog topics"
+  def import_categories
+    # You'll need to edit the following query for your Drupal install:
+    #
+    #   * Drupal allows duplicate category names, so you may need to exclude some categories or rename them here.
+    #   * Table name may be term_data.
+    #   * May need to select a vid other than 1
 
-    create_category({
-      name: 'Blog',
-      user_id: -1,
-      description: "Articles from the blog"
-    }, nil) unless Category.find_by_name('Blog')
+    puts "", "importing categories"
 
-    results = @client.query("
-      SELECT n.nid nid, n.title title, n.uid uid, n.created created, n.sticky sticky,
-             f.body_value body
-        FROM node n,
-             field_data_body f
-       WHERE n.type = 'blog'
-         AND n.nid = f.entity_id
-         AND n.status = 1
-    ", cache_rows: false)
+    categories = mysql_query(<<-SQL
+        SELECT tid,
+               name,
+               description
+          FROM taxonomy_term_data
+         WHERE vid = #{VID}
+    SQL
+    ).to_a
 
-    create_posts(results) do |row|
+    create_categories(categories) do |category|
       {
-        id: "nid:#{row['nid']}",
-        user_id: user_id_from_imported_user_id(row['uid']) || -1,
-        category: 'Blog',
-        raw: row['body'],
-        created_at: Time.zone.at(row['created']),
-        pinned_at: row['sticky'].to_i == 1 ? Time.zone.at(row['created']) : nil,
-        title: row['title'].try(:strip),
-        custom_fields: { import_id: "nid:#{row['nid']}" }
+        id: category['tid'],
+        name: @htmlentities.decode(category['name']).strip,
+        description: @htmlentities.decode(category['description']).strip
       }
     end
   end
 
-  def create_forum_topics
-    puts '', "creating forum topics"
+  def import_blog_topics
+    puts '', "importing blog topics"
 
-    total_count = @client.query("
+    create_category(
+      {
+        name: 'Blog',
+        description: "Articles from the blog"
+      },
+    nil) unless Category.find_by_name('Blog')
+
+    blogs = mysql_query(<<-SQL
+      SELECT n.nid nid, n.title title, n.uid uid, n.created created, n.sticky sticky,
+             f.body_value body
+        FROM node n,
+             field_data_body f
+       WHERE n.type = 'article'
+         AND n.nid = f.entity_id
+         AND n.status = 1
+    SQL
+    ).to_a
+
+    category_id = Category.find_by_name('Blog').id
+
+    create_posts(blogs) do |topic|
+      {
+        id: "nid:#{topic['nid']}",
+        user_id: user_id_from_imported_user_id(topic['uid']) || -1,
+        category: category_id,
+        raw: topic['body'],
+        created_at: Time.zone.at(topic['created']),
+        pinned_at: topic['sticky'].to_i == 1 ? Time.zone.at(topic['created']) : nil,
+        title: topic['title'].try(:strip),
+        custom_fields: { import_id: "nid:#{topic['nid']}" }
+      }
+    end
+  end
+
+  def import_forum_topics
+    puts '', "importing forum topics"
+
+    total_count = mysql_query(<<-SQL
         SELECT COUNT(*) count
           FROM forum_index fi, node n
          WHERE n.type = 'forum'
            AND fi.nid = n.nid
-           AND n.status = 1;").first['count']
+           AND n.status = 1
+    SQL
+    ).first['count']
 
-    batch_size = 1000
-
-    batches(batch_size) do |offset|
-      results = @client.query("
+    batches(BATCH_SIZE) do |offset|
+      results = mysql_query(<<-SQL
         SELECT fi.nid nid,
                fi.title title,
                fi.tid tid,
                n.uid uid,
                fi.created created,
                fi.sticky sticky,
-               f.body_value body
-          FROM forum_index fi,
-               node n,
-               field_data_body f
+               f.body_value body,
+	       nc.totalcount views,
+	       fl.timestamp solved
+          FROM forum_index fi
+	 LEFT JOIN node n ON fi.nid = n.nid
+	 LEFT JOIN field_data_body f ON f.entity_id = n.nid
+	 LEFT JOIN flagging fl ON fl.entity_id = n.nid
+	     AND fl.fid = 7
+	 LEFT JOIN node_counter nc ON nc.nid = n.nid
          WHERE n.type = 'forum'
-           AND fi.nid = n.nid
-           AND n.nid = f.entity_id
            AND n.status = 1
-         LIMIT #{batch_size}
+         LIMIT #{BATCH_SIZE}
         OFFSET #{offset};
-      ", cache_rows: false)
+      SQL
+      ).to_a
 
       break if results.size < 1
 
       next if all_records_exist? :posts, results.map { |p| "nid:#{p['nid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
-        {
+        raw = preprocess_raw(row['body'])
+        topic = {
           id: "nid:#{row['nid']}",
           user_id: user_id_from_imported_user_id(row['uid']) || -1,
           category: category_id_from_imported_category_id(row['tid']),
-          raw: row['body'],
+          raw: raw,
           created_at: Time.zone.at(row['created']),
           pinned_at: row['sticky'].to_i == 1 ? Time.zone.at(row['created']) : nil,
-          title: row['title'].try(:strip)
+          title: row['title'].try(:strip),
+          views: row['views']
         }
+        topic[:custom_fields] = { import_solved: true } if row['solved'].present?
+        topic
       end
     end
   end
 
-  def create_replies
+  def import_replies
     puts '', "creating replies in topics"
 
-    total_count = @client.query("
+    total_count = mysql_query(<<-SQL
         SELECT COUNT(*) count
           FROM comment c,
                node n
          WHERE n.nid = c.nid
            AND c.status = 1
-           AND n.type IN ('blog', 'forum')
-           AND n.status = 1;").first['count']
+           AND n.type IN ('article', 'forum')
+           AND n.status = 1
+    SQL
+    ).first['count']
 
-    batch_size = 1000
-
-    batches(batch_size) do |offset|
-      results = @client.query("
+    batches(BATCH_SIZE) do |offset|
+      results = mysql_query(<<-SQL
         SELECT c.cid, c.pid, c.nid, c.uid, c.created,
                f.comment_body_value body
           FROM comment c,
@@ -165,9 +238,10 @@ class ImportScripts::Drupal < ImportScripts::Base
            AND c.status = 1
            AND n.type IN ('blog', 'forum')
            AND n.status = 1
-         LIMIT #{batch_size}
-        OFFSET #{offset};
-      ", cache_rows: false)
+         LIMIT #{BATCH_SIZE}
+        OFFSET #{offset}
+      SQL
+      ).to_a
 
       break if results.size < 1
 
@@ -176,11 +250,12 @@ class ImportScripts::Drupal < ImportScripts::Base
       create_posts(results, total: total_count, offset: offset) do |row|
         topic_mapping = topic_lookup_from_imported_post_id("nid:#{row['nid']}")
         if topic_mapping && topic_id = topic_mapping[:topic_id]
+          raw = preprocess_raw(row['body'])
           h = {
             id: "cid:#{row['cid']}",
             topic_id: topic_id,
             user_id: user_id_from_imported_user_id(row['uid']) || -1,
-            raw: row['body'],
+            raw: raw,
             created_at: Time.zone.at(row['created']),
           }
           if row['pid']
@@ -196,6 +271,265 @@ class ImportScripts::Drupal < ImportScripts::Base
     end
   end
 
+  def import_likes
+    puts "", "importing post likes"
+
+    batches(BATCH_SIZE) do |offset|
+      likes = mysql_query(<<-SQL
+        SELECT flagging_id,
+               fid,
+	       entity_id,
+	       uid
+	  FROM flagging
+	 WHERE fid = 5
+	    OR fid = 6
+	 LIMIT #{BATCH_SIZE}
+	OFFSET #{offset}
+      SQL
+      ).to_a
+
+      break if likes.empty?
+
+      likes.each do |l|
+        identifier = l['fid'] == 5 ? 'nid' : 'cid'
+        next unless user_id = user_id_from_imported_user_id(l['uid'])
+        next unless post_id = post_id_from_imported_post_id("#{identifier}:#{l['entity_id']}")
+        next unless user = User.find_by(id: user_id)
+        next unless post = Post.find_by(id: post_id)
+        PostActionCreator.like(user, post) rescue nil
+      end
+    end
+  end
+
+  def mark_topics_as_solved
+    puts "", "marking topics as solved"
+
+    solved_topics = TopicCustomField.where(name: "import_solved").where(value: true).pluck(:topic_id)
+
+    solved_topics.each do |topic_id|
+      next unless topic = Topic.find(topic_id)
+      next unless post = topic.posts.last
+      post_id = post.id
+
+      PostCustomField.create!(post_id: post_id, name: "is_accepted_answer", value: true)
+      TopicCustomField.create!(topic_id: topic_id, name: "accepted_answer_post_id", value: post_id)
+    end
+  end
+
+  def import_sso_records
+    puts "", "importing sso records"
+
+    start_time = Time.now
+    current_count = 0
+
+    users = UserCustomField.where(name: "import_id")
+
+    total_count = users.count
+
+    return if users.empty?
+
+    users.each do |ids|
+      user_id = ids.user_id
+      external_id = ids.value
+      next unless user = User.find(user_id)
+
+      begin
+        current_count += 1
+        print_status(current_count, total_count, start_time)
+        SingleSignOnRecord.create!(user_id: user.id, external_id: external_id, external_email: user.email, last_payload: '')
+      rescue
+        next
+      end
+    end
+  end
+
+  def import_attachments
+    puts "", "importing attachments"
+
+    current_count = 0
+    success_count = 0
+    fail_count = 0
+
+    total_count = mysql_query(<<-SQL
+      SELECT count(field_post_attachment_fid) count
+        FROM field_data_field_post_attachment
+    SQL
+    ).first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      attachments = mysql_query(<<-SQL
+          SELECT *
+            FROM field_data_field_post_attachment fp
+       LEFT JOIN file_managed fm
+              ON fp.field_post_attachment_fid = fm.fid
+           LIMIT #{BATCH_SIZE}
+          OFFSET #{offset}
+      SQL
+      ).to_a
+
+      break if attachments.size < 1
+
+      attachments.each do |attachment|
+        current_count += 1
+        print_status current_count, total_count
+
+        identifier = attachment['entity_type'] == "comment" ? "cid" : "nid"
+        next unless user_id = user_id_from_imported_user_id(attachment['uid'])
+        next unless post_id = post_id_from_imported_post_id("#{identifier}:#{attachment['entity_id']}")
+        next unless user = User.find(user_id)
+        next unless post = Post.find(post_id)
+
+        begin
+          new_raw = post.raw.dup
+          upload, filename = find_upload(post, attachment)
+
+          unless upload
+            fail_count += 1
+            next
+          end
+
+          upload_html = html_for_upload(upload, filename)
+          new_raw = "#{new_raw}\n\n#{upload_html}" unless new_raw.include?(upload_html)
+
+          if new_raw != post.raw
+            PostRevisor.new(post).revise!(post.user, { raw: new_raw }, bypass_bump: true, edit_reason: "Import attachment from Drupal")
+          else
+            puts '', 'Skipped upload: already imported'
+          end
+
+          success_count += 1
+        rescue => e
+          puts e
+        end
+      end
+    end
+  end
+
+  def create_permalinks
+    puts '', 'creating permalinks...'
+
+    Topic.listable_topics.find_each do |topic|
+      begin
+        tcf = topic.custom_fields
+        if tcf && tcf['import_id']
+          node_id = tcf['import_id'][/nid:(\d+)/, 1]
+          slug = "/topic/#{node_id}"
+          Permalink.create(url: slug, topic_id: topic.id)
+        end
+      rescue => e
+        puts e.message
+        puts "Permalink creation failed for id #{topic.id}"
+      end
+    end
+  end
+
+  def find_upload(post, attachment)
+    uri = attachment['uri'][/public:\/\/upload\/(.+)/, 1]
+    real_filename = CGI.unescapeHTML(uri)
+    file = File.join(ATTACHMENT_DIR, real_filename)
+
+    unless File.exists?(file)
+      puts "Attachment file #{attachment['filename']} doesn't exist"
+
+      tmpfile = "attachments_failed.txt"
+      filename = File.join('/tmp/', tmpfile)
+      File.open(filename, 'a') { |f|
+        f.puts attachment['filename']
+      }
+    end
+
+    upload = create_upload(post.user.id || -1, file, real_filename)
+
+    if upload.nil? || upload.errors.any?
+      puts "Upload not valid"
+      puts upload.errors.inspect if upload
+      return
+    end
+
+    [upload, real_filename]
+  end
+
+  def preprocess_raw(raw)
+    return if raw.blank?
+    # quotes on new lines
+    raw.gsub!(/\[quote\](.+?)\[\/quote\]/im) { |quote|
+      quote.gsub!(/\[quote\](.+?)\[\/quote\]/im) { "\n#{$1}\n" }
+      quote.gsub!(/\n(.+?)/) { "\n> #{$1}" }
+    }
+
+    # [QUOTE=<username>]...[/QUOTE]
+    raw.gsub!(/\[quote=([^;\]]+)\](.+?)\[\/quote\]/im) do
+      username, quote = $1, $2
+      "\n[quote=\"#{username}\"]\n#{quote}\n[/quote]\n"
+    end
+
+    raw.strip!
+    raw
+  end
+
+  def postprocess_posts
+    puts '', 'postprocessing posts'
+
+    current = 0
+    max = Post.count
+
+    Post.find_each do |post|
+      begin
+        raw = post.raw
+        new_raw = raw.dup
+
+        # replace old topic to new topic links
+        new_raw.gsub!(/https:\/\/site.com\/forum\/topic\/(\d+)/im) do
+          post_id = post_id_from_imported_post_id("nid:#{$1}")
+          next unless post_id
+          topic = Post.find(post_id).topic
+          "https://community.site.com/t/-/#{topic.id}"
+        end
+
+        # replace old comment to reply links
+        new_raw.gsub!(/https:\/\/site.com\/comment\/(\d+)#comment-\d+/im) do
+          post_id = post_id_from_imported_post_id("cid:#{$1}")
+          next unless post_id
+          post_ref = Post.find(post_id)
+          "https://community.site.com/t/-/#{post_ref.topic_id}/#{post_ref.post_number}"
+        end
+
+        if raw != new_raw
+          post.raw = new_raw
+          post.save
+        end
+      rescue
+        puts '', "Failed rewrite on post: #{post.id}"
+      ensure
+        print_status(current += 1, max)
+      end
+    end
+  end
+
+  def import_gravatars
+    puts '', 'importing gravatars'
+    current = 0
+    max = User.count
+    User.find_each do |user|
+      begin
+        user.create_user_avatar(user_id: user.id) unless user.user_avatar
+        user.user_avatar.update_gravatar!
+      rescue
+        puts '', 'Failed avatar update on user #{user.id}'
+      ensure
+        print_status(current += 1, max)
+      end
+    end
+  end
+
+  def parse_datetime(time)
+    DateTime.strptime(time, '%s')
+  end
+
+  def mysql_query(sql)
+    @client.query(sql, cache_rows: true)
+  end
+
 end
 
 if __FILE__ == $0

From 65dd8e2fa2a83f6923e47eb0ee2c191e340fada4 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 10 Jun 2020 12:00:16 -0400
Subject: [PATCH 1633/1830] Update translations

---
 config/locales/client.ar.yml                  | 510 +++++------
 config/locales/client.be.yml                  |  91 +-
 config/locales/client.bg.yml                  | 239 +++---
 config/locales/client.bs_BA.yml               | 566 ++++++------
 config/locales/client.ca.yml                  | 446 +++++-----
 config/locales/client.cs.yml                  | 562 ++++++------
 config/locales/client.da.yml                  | 430 +++++-----
 config/locales/client.de.yml                  | 443 +++++-----
 config/locales/client.el.yml                  | 298 +++----
 config/locales/client.es.yml                  | 495 ++++++-----
 config/locales/client.et.yml                  | 298 +++----
 config/locales/client.fa_IR.yml               | 462 +++++-----
 config/locales/client.fi.yml                  | 453 +++++-----
 config/locales/client.fr.yml                  | 621 +++++++-------
 config/locales/client.gl.yml                  | 208 ++---
 config/locales/client.he.yml                  | 805 +++++++++---------
 config/locales/client.hu.yml                  | 287 ++++---
 config/locales/client.hy.yml                  | 427 +++++-----
 config/locales/client.id.yml                  | 129 +--
 config/locales/client.it.yml                  | 455 +++++-----
 config/locales/client.ja.yml                  | 311 +++----
 config/locales/client.ko.yml                  | 380 +++++----
 config/locales/client.lt.yml                  | 472 +++++-----
 config/locales/client.lv.yml                  | 286 ++++---
 config/locales/client.nb_NO.yml               | 360 ++++----
 config/locales/client.nl.yml                  | 496 ++++++-----
 config/locales/client.pl_PL.yml               | 675 +++++++--------
 config/locales/client.pt.yml                  | 343 ++++----
 config/locales/client.pt_BR.yml               | 503 +++++------
 config/locales/client.ro.yml                  | 409 ++++-----
 config/locales/client.ru.yml                  | 774 ++++++++---------
 config/locales/client.sk.yml                  | 369 ++++----
 config/locales/client.sl.yml                  | 718 ++++++++--------
 config/locales/client.sq.yml                  | 221 ++---
 config/locales/client.sr.yml                  | 199 ++---
 config/locales/client.sv.yml                  | 460 +++++-----
 config/locales/client.sw.yml                  | 314 +++----
 config/locales/client.te.yml                  | 123 +--
 config/locales/client.th.yml                  | 483 ++++++-----
 config/locales/client.tr_TR.yml               | 507 +++++------
 config/locales/client.uk.yml                  | 745 ++++++++--------
 config/locales/client.ur.yml                  | 430 +++++-----
 config/locales/client.vi.yml                  | 257 +++---
 config/locales/client.zh_CN.yml               | 416 ++++-----
 config/locales/client.zh_TW.yml               | 374 ++++----
 config/locales/server.ar.yml                  |  10 +-
 config/locales/server.be.yml                  |   5 +-
 config/locales/server.bg.yml                  |   3 +-
 config/locales/server.bs_BA.yml               |   9 +
 config/locales/server.ca.yml                  |  10 +-
 config/locales/server.cs.yml                  |  10 +-
 config/locales/server.da.yml                  |  13 +-
 config/locales/server.de.yml                  |   6 +-
 config/locales/server.el.yml                  |  15 +-
 config/locales/server.es.yml                  |  20 +-
 config/locales/server.et.yml                  |  13 +-
 config/locales/server.fa_IR.yml               |  11 +-
 config/locales/server.fi.yml                  |  24 +-
 config/locales/server.fr.yml                  | 202 +++--
 config/locales/server.gl.yml                  |  12 +
 config/locales/server.he.yml                  |  30 +-
 config/locales/server.hu.yml                  |   7 +
 config/locales/server.hy.yml                  |   8 +-
 config/locales/server.id.yml                  |   3 +-
 config/locales/server.it.yml                  |   6 +-
 config/locales/server.ja.yml                  |   8 +-
 config/locales/server.ko.yml                  |   2 +-
 config/locales/server.lt.yml                  |  11 +-
 config/locales/server.lv.yml                  |  12 +
 config/locales/server.nb_NO.yml               |  10 +-
 config/locales/server.nl.yml                  |  15 +-
 config/locales/server.pl_PL.yml               |  11 +-
 config/locales/server.pt.yml                  |  10 +-
 config/locales/server.pt_BR.yml               | 246 +++---
 config/locales/server.ro.yml                  |   3 +-
 config/locales/server.ru.yml                  |   3 +-
 config/locales/server.sk.yml                  |  10 +-
 config/locales/server.sl.yml                  |   9 +-
 config/locales/server.sq.yml                  |  10 +-
 config/locales/server.sr.yml                  |   2 +
 config/locales/server.sv.yml                  |   7 +-
 config/locales/server.sw.yml                  |  12 +-
 config/locales/server.te.yml                  |   1 +
 config/locales/server.th.yml                  |  15 +
 config/locales/server.tr_TR.yml               |   6 +-
 config/locales/server.uk.yml                  |   2 +-
 config/locales/server.ur.yml                  |   6 +-
 config/locales/server.vi.yml                  |  10 +-
 config/locales/server.zh_CN.yml               |   9 +-
 config/locales/server.zh_TW.yml               |  13 +-
 .../config/locales/client.fr.yml              |   4 +-
 .../config/locales/client.fr.yml              |   4 +-
 .../config/locales/server.ca.yml              |   7 +
 .../config/locales/server.fr.yml              |  43 +-
 plugins/poll/config/locales/client.ca.yml     |  12 +
 plugins/poll/config/locales/client.es.yml     |   2 +
 plugins/poll/config/locales/client.fr.yml     |   2 +-
 plugins/poll/config/locales/server.fr.yml     |  20 +-
 public/422.fr.html                            |   2 +-
 public/503.fr.html                            |   2 +-
 100 files changed, 10168 insertions(+), 9640 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index b7634d3f70..4c1a70a7e1 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -27,8 +27,8 @@ ar:
             mb: م.بايت
             tb: ت.بايت
       short:
-        thousands: "{{number}} ألف"
-        millions: "{{number}} مليون"
+        thousands: "%{number} ألف"
+        millions: "%{number} مليون"
     dates:
       time: "h:mm a"
       time_short_day: "ddd, HH:mm"
@@ -316,15 +316,15 @@ ar:
     weekly: "أسبوعيا"
     every_month: "كل شهر"
     every_six_months: "كل ستة اشهر"
-    max_of_count: "أقصى عدد هو {{count}}"
+    max_of_count: "أقصى عدد هو %{count}"
     alternation: "أو"
     character_count:
       zero: "لا محارف"
       one: "محرف واحد"
       two: "محرفان"
-      few: "{{count}} محارف"
-      many: "{{count}} محرفا"
-      other: "{{count}} حرف"
+      few: "%{count} محارف"
+      many: "%{count} محرفا"
+      other: "%{count} حرف"
     related_messages:
       title: "الرسائل ذات الصلة"
       see_all: 'شاهد <a href="%{path}">كل الرسائل</a> من @%{username}...'
@@ -447,19 +447,19 @@ ar:
         description: "لقد وصلنا منشورك ولكنة يحتاج موافقة المشرف قبل ظهورها. نرجو منك الصبر."
         ok: "حسنا"
     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>"
-      user_replied_to_post: "ردّ <a href='{{userUrl}}'>{{user}}</a> على <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "رددت <a href='{{userUrl}}'>أنت</a> على <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "ردّ <a href='{{userUrl}}'>{{user}}</a> على <a href='{{topicUrl}}'>الموضوع</a>"
-      you_replied_to_topic: "رددت <a href='{{userUrl}}'>أنت</a> على <a href='{{topicUrl}}'>الموضوع</a>"
-      user_mentioned_user: "أشار <a href='{{user1Url}}'>{{user}}</a> إلى <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "أشار <a href='{{user1Url}}'>{{user}}</a> <a href='{{user2Url}}'>إليك</a>"
-      you_mentioned_user: "أشرت <a href='{{user1Url}}'>أنت</a> إلى <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "نُشرت بواسطة<a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "نُشرت بواسطتك <a href='{{userUrl}}'>انت</a>"
-      sent_by_user: "أرسله <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "أرسلته <a href='{{userUrl}}'>أنت</a>"
+      user_posted_topic: "نشر <a href='%{userUrl}'>%{user}</a> <a href='%{topicUrl}'>الموضوع</a>"
+      you_posted_topic: "نشرت <a href='%{userUrl}'>أنت</a> <a href='%{topicUrl}'>الموضوع</a>"
+      user_replied_to_post: "ردّ <a href='%{userUrl}'>%{user}</a> على <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "رددت <a href='%{userUrl}'>أنت</a> على <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "ردّ <a href='%{userUrl}'>%{user}</a> على <a href='%{topicUrl}'>الموضوع</a>"
+      you_replied_to_topic: "رددت <a href='%{userUrl}'>أنت</a> على <a href='%{topicUrl}'>الموضوع</a>"
+      user_mentioned_user: "أشار <a href='%{user1Url}'>%{user}</a> إلى <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "أشار <a href='%{user1Url}'>%{user}</a> <a href='%{user2Url}'>إليك</a>"
+      you_mentioned_user: "أشرت <a href='%{user1Url}'>أنت</a> إلى <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "نُشرت بواسطة<a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "نُشرت بواسطتك <a href='%{userUrl}'>انت</a>"
+      sent_by_user: "أرسله <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "أرسلته <a href='%{userUrl}'>أنت</a>"
     directory:
       filter_name: "رشّح باسم المستخدم"
       title: "الأعضاء"
@@ -667,7 +667,7 @@ ar:
     user_fields:
       none: "(إختر خيار )"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "الملف الشخصي"
       mute: "كتم"
       edit: "تعديل التفضيلات"
@@ -721,11 +721,11 @@ ar:
       external_links_in_new_tab: "فتح الروابط الخارجية في تبويب جديد"
       enable_quoting: "فعل خاصية إقتباس النصوص المظللة"
       change: "غيّر"
-      moderator: "{{user}} هو مشرف"
-      admin: "{{user}} هو مدير"
+      moderator: "%{user} هو مشرف"
+      admin: "%{user} هو مدير"
       moderator_tooltip: "هذا المستخدم مشرف"
       admin_tooltip: "هذا المستخدم مدير"
-      suspended_notice: "هذا المستخدم موقوف حتى تاريخ {{date}}"
+      suspended_notice: "هذا المستخدم موقوف حتى تاريخ %{date}"
       suspended_permanently: "هذا العضو موقوف."
       suspended_reason: "السبب:"
       github_profile: "Github"
@@ -738,7 +738,7 @@ ar:
           هذه الرسائل لا تشمل الموضوعات و الأقسام المكتومة.
         individual: "أرسل لي رسالة لكل منشور جديد"
         individual_no_echo: "أرسل رسالة لكل منشور جديد عدا منشوراتي"
-        many_per_day: "أرسل لي رسالة لكل منشور جديد (تقريبا {{dailyEmailEstimate}} يوميا)"
+        many_per_day: "أرسل لي رسالة لكل منشور جديد (تقريبا %{dailyEmailEstimate} يوميا)"
         few_per_day: "أرسل لي رسالة لكل منشور جديد (تقريبا إثنتان يوميا)"
       tag_settings: "الأوسمة"
       watched_tags: "مراقب"
@@ -764,7 +764,6 @@ ar:
       admin_delete: "أحذف"
       users: "الأعضاء"
       muted_users: "المكتومون"
-      muted_users_instructions: "تجاهل الإشعارات من هؤلاء الأعضاء."
       tracked_topics_link: "إظهار"
       automatically_unpin_topics: "ألغِ تثبيت الموضوعات آليا عندما أصل إلى آخرها."
       apps: "تطبيقات"
@@ -856,15 +855,15 @@ ar:
         title: "البريد الإلكتروني"
         ok: "سنرسل لك بريدا للتأكيد"
         invalid: "من فضلك أدخل بريدا إلكترونيا صالحا"
-        authenticated: "تم توثيق بريدك الإلكتروني بواسطة {{provider}}"
+        authenticated: "تم توثيق بريدك الإلكتروني بواسطة %{provider}"
         frequency_immediately: "سيتم ارسال رسالة الكترونية فورا في حال أنك لم تقرأ الرسائل السابقة التي كنا نرسلها لك."
         frequency:
-          zero: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة."
-          one: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة."
-          two: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة."
-          few: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة."
-          many: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة."
-          other: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة."
+          zero: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ %{count} دقيقة."
+          one: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ %{count} دقيقة."
+          two: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ %{count} دقيقة."
+          few: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ %{count} دقيقة."
+          many: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ %{count} دقيقة."
+          other: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ %{count} دقيقة."
       associated_accounts:
         revoke: "تعطيل"
         cancel: "ألغِ"
@@ -877,9 +876,9 @@ ar:
       username:
         title: "اسم المستخدم"
         instructions: "باللغة الإنجليزية و دون مسافات و قصير و غير مكرر"
-        short_instructions: "يمكن للغير الإشارة إليك ب‍@{{username}}"
+        short_instructions: "يمكن للغير الإشارة إليك ب‍@%{username}"
         available: "اسم المستخدم متاح"
-        not_available: "غير متاح. جرّب {{suggestion}} ؟"
+        not_available: "غير متاح. جرّب %{suggestion} ؟"
         not_available_no_suggestion: "غير متاح"
         too_short: "اسم المستخدم قصير جدًّا"
         too_long: "اسم المستخدم طويل جدًّا"
@@ -961,15 +960,15 @@ ar:
           one: "عرض الدعوة الأولى."
           two: "عرض الدعوتان الأولتان."
           few: "عرض الدعوات الأولية."
-          many: "عرض الدعوات {{count}} الأولى."
-          other: "عرض الدعوات {{count}} الأولى."
+          many: "عرض الدعوات %{count} الأولى."
+          other: "عرض الدعوات %{count} الأولى."
         redeemed: "دعوات محررة"
         redeemed_tab: "محررة"
-        redeemed_tab_with_count: "({{count}}) محررة"
+        redeemed_tab_with_count: "(%{count}) محررة"
         redeemed_at: "محررة"
         pending: "دعوات قيد الإنتضار"
         pending_tab: "قيد الانتظار"
-        pending_tab_with_count: "معلق ({{count}})"
+        pending_tab_with_count: "معلق (%{count})"
         topics_entered: " موضوعات شُوهِدت"
         posts_read_count: "منشورات قرات"
         expired: "الدعوة انتهت صلاحيتها "
@@ -983,13 +982,17 @@ ar:
         time_read: "وقت القراءة"
         days_visited: "أيام الزيارة"
         account_age_days: "عمر الحساب بالأيام"
+        links_tab: "روابط"
+        link_created_at: "أُنشئ في"
+        link_groups: المجموعات
         create: "أرسل دعوة"
         generate_link: "انسخ رابط الدعوة"
         link_generated: "وُلّد رابط الدعوة بنجاح!"
         valid_for: "رابط الدعوة صالح للبريد الإلكترونيّ هذا فقط: %{email}"
+        invite_link:
+          success: "وُلّد رابط الدعوة بنجاح!"
         bulk_invite:
           none: "لم تدعُ أحدًا إلى هنا بعد. أرسل الدّعوات إمّا فرديّة، أو إلى مجموعة أشخاص عبر <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>رفع ملفّ CSV</a>."
-          text: "دعوة جماعية بواسطة ملف"
           success: "رُفع الملف بنجاح. سيصلك إشعارا عبر رسالة عند اكتمال العملية."
           error: "عذرا، يجب أن يكون الملفّ بنسق CSV."
       password:
@@ -1088,7 +1091,7 @@ ar:
       desc:
         network: "من فضلك تحقق من اتصالك."
         network_fixed: "أنت الآن متصل بالانترنت"
-        server: "رمز الخطأ: {{status}}"
+        server: "رمز الخطأ: %{status}"
         forbidden: "ليس مسموحًا لك عرض هذا."
         not_found: "اوو! حاول التّطبيق تحميل عنوان غير موجود."
         unknown: "حدث خطب ما."
@@ -1137,8 +1140,8 @@ ar:
       hidden_for_session: "لا بأس، سأسلك غدًا. يمكنك دوما استخدام 'تسجيل الدخول' لإنشاء حساب ايضا."
     summary:
       enabled_description: "أنت تطالع ملخّصًا لهذا الموضوع، أي أكثر المنشورات الجديرة بالاهتمام حسب نظرة المجتمع."
-      description: "هناك <b>{{replyCount}}</b> من الردود."
-      description_time: "هناك <b>{{replyCount}}</b> من الردود، ووقت القراءة المتوقّع هو <b>{{readingTime}} من الدّقائق</b>."
+      description: "هناك <b>%{replyCount}</b> من الردود."
+      description_time: "هناك <b>%{replyCount}</b> من الردود، ووقت القراءة المتوقّع هو <b>%{readingTime} من الدّقائق</b>."
       enable: "لخّص هذا الموضوع"
       disable: "أظهر كل المشاركات"
     deleted_filter:
@@ -1148,8 +1151,8 @@ ar:
       disable: "أظهر المشاركات المحذوفة"
     private_message_info:
       title: "رسالة"
-      remove_allowed_user: "أمتأكّد من إزالة {{name}} من هذه الرّسالة؟"
-      remove_allowed_group: "أمتأكّد من إزالة {{name}} من هذه الرّسالة؟"
+      remove_allowed_user: "أمتأكّد من إزالة %{name} من هذه الرّسالة؟"
+      remove_allowed_group: "أمتأكّد من إزالة %{name} من هذه الرّسالة؟"
     email: "البريد الإلكتروني"
     username: "اسم المستخدم"
     last_seen: "كان هنا"
@@ -1193,7 +1196,7 @@ ar:
       awaiting_activation: "ما زال حسابك غير مفعّل، استخدم رابط نسيان كلمة المرور لإرسال بريد إلكتروني تفعيلي آخر."
       awaiting_approval: "لم يوافق أي من أعضاء طاقم العمل على حسابك بعد. سيُرسل إليك بريد إلكتروني حالما يتمّ ذلك."
       requires_invite: "عذرا، الدخول لهذا الموقع خاص بالمدعويين فقط."
-      not_activated: "لا يمكنك تسجيل دخول بعد. لقد أرسلنا سابقًا بريدًا إلى <b>{{sentTo}}</b>. رجاء اتّبع الإرشادات فيه لتفعيل حسابك."
+      not_activated: "لا يمكنك تسجيل دخول بعد. لقد أرسلنا سابقًا بريدًا إلى <b>%{sentTo}</b>. رجاء اتّبع الإرشادات فيه لتفعيل حسابك."
       not_allowed_from_ip_address: "لا يمكنك تسجيل دخول من عنوان IP هذا."
       admin_not_allowed_from_ip_address: "لا يمكنك تسجيل دخول كمدير من عنوان IP هذا."
       resend_activation_email: "انقر هنا لإرسال رسالة التفعيل مرّة أخرى."
@@ -1201,7 +1204,7 @@ ar:
       change_email: "غير عنوان البريد الالكتروني"
       provide_new_email: "ادخل عنوان بريد الكتروني جديد و سنقوم بأرسال لك بريد التأكيد."
       submit_new_email: "حدث عنوان البريد الإلكتروني"
-      sent_activation_email_again: "لقد أرسلنا بريد تفعيل آخر إلى <b>{{currentEmail}}</b>. قد يستغرق وصوله بضعة دقائق. تحقّق من مجلّد السبام."
+      sent_activation_email_again: "لقد أرسلنا بريد تفعيل آخر إلى <b>%{currentEmail}</b>. قد يستغرق وصوله بضعة دقائق. تحقّق من مجلّد السبام."
       to_continue: "رجاء سجل دخول"
       preferences: "عليك تسجل الدخول لتغيير تفضيلاتك الشخصية."
       forgot: "لا أتذكر معلومات حسابي"
@@ -1283,21 +1286,21 @@ ar:
       similar_topics: "موضوعك يشابه..."
       drafts_offline: "مسودات محفوظة "
       group_mentioned:
-        zero: "الإشارة إلى {{group}} تعني <a href='{{group_link}}'>عدم إخطار أحد</a>. أمتأكّد؟"
-        one: "الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>شخص واحد</a>. أمتأكّد؟"
-        two: "الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>شخصين</a>. أمتأكّد؟"
-        few: "الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>{{count}} أشخاص</a>. أمتأكّد؟"
-        many: "الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>{{count}} شخصًا</a>. أمتأكّد؟"
-        other: "بالإشارة إلى {{group}} تعني إشعار<a href='{{group_link}}'>{{count}} شخص</a>– أمتأكد من ذلك؟"
+        zero: "الإشارة إلى %{group} تعني <a href='%{group_link}'>عدم إخطار أحد</a>. أمتأكّد؟"
+        one: "الإشارة إلى %{group} تعني إخطار <a href='%{group_link}'>شخص واحد</a>. أمتأكّد؟"
+        two: "الإشارة إلى %{group} تعني إخطار <a href='%{group_link}'>شخصين</a>. أمتأكّد؟"
+        few: "الإشارة إلى %{group} تعني إخطار <a href='%{group_link}'>%{count} أشخاص</a>. أمتأكّد؟"
+        many: "الإشارة إلى %{group} تعني إخطار <a href='%{group_link}'>%{count} شخصًا</a>. أمتأكّد؟"
+        other: "بالإشارة إلى %{group} تعني إشعار<a href='%{group_link}'>%{count} شخص</a>– أمتأكد من ذلك؟"
       cannot_see_mention:
-        category: "لقد قمت بالإشارة إلي {{username}} لكن لن يتم إشعارهم لأن ليس لديهم صلاحية الوصول لهذا القسم. عليك ان تقوم باضافتهم لمجموعة لديها حق الوصول لهذا القسم."
-        private: "لقد قمت بالإشارة إلي {{username}} لكن لن يتم إشعارهم لأن ليس لديهم صلاحية الوصول لهذه الرسالة الخاصة. عليك ان تقوم باضافتهم إلي هذة الرسالة."
-      duplicate_link: "يبدوا ان هذا الرابط <b>{{domain}}</b> تم ذكرة فعلا في الموضوع من قبل <b>@{{username}}</b> في <a href='{{post_url}}'>رد منذ {{ago}}</a> – هل انت متاكد انك تريد نشرة مرة اخري؟"
+        category: "لقد قمت بالإشارة إلي %{username} لكن لن يتم إشعارهم لأن ليس لديهم صلاحية الوصول لهذا القسم. عليك ان تقوم باضافتهم لمجموعة لديها حق الوصول لهذا القسم."
+        private: "لقد قمت بالإشارة إلي %{username} لكن لن يتم إشعارهم لأن ليس لديهم صلاحية الوصول لهذه الرسالة الخاصة. عليك ان تقوم باضافتهم إلي هذة الرسالة."
+      duplicate_link: "يبدوا ان هذا الرابط <b>%{domain}</b> تم ذكرة فعلا في الموضوع من قبل <b>@%{username}</b> في <a href='%{post_url}'>رد منذ %{ago}</a> – هل انت متاكد انك تريد نشرة مرة اخري؟"
       error:
         title_missing: "العنوان مطلوب"
-        title_too_short: "العنوان يجب أن يكون علي الاقل {{min}} حرف"
-        title_too_long: "العنوان يجب أن لا يزيد عن {{max}} حرف"
-        post_length: "المنشور يجب أن يكون علي الاقل {{min}} حرف"
+        title_too_short: "العنوان يجب أن يكون علي الاقل %{min} حرف"
+        title_too_long: "العنوان يجب أن لا يزيد عن %{max} حرف"
+        post_length: "المنشور يجب أن يكون علي الاقل %{min} حرف"
         category_missing: "يجب عليك إختيار احد الأقسام"
       save_edit: "أحفظ التعديل"
       reply_original: "التعليق على الموضوع الأصلي"
@@ -1358,46 +1361,46 @@ ar:
       title: "إشعارات الإشارة إلى @اسمك، والردود على موضوعاتك و منشوراتك ، والرسائل، وغيرها"
       none: "تعذّر تحميل الإشعارات الآن."
       empty: "لا إشعارات."
-      mentioned: "<span>{{username}}</span>{{description}}"
-      group_mentioned: "<span>{{username}}</span>{{description}} "
-      quoted: "<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}} "
-      liked: "<span>{{username}}</span>{{description}} "
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span>%{description}"
+      group_mentioned: "<span>%{username}</span>%{description} "
+      quoted: "<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} "
+      liked: "<span>%{username}</span>%{description} "
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        zero: "<span>{{username}}, {{username2}}</span> {{description}}"
-        one: "<span>{{username}}, {{username2}} و وواحد اخر</span> {{description}}"
-        two: "<span>{{username}}, {{username2}} و اثنين اخرون</span> {{description}}"
-        few: "<span>{{username}}, {{username2}} و {{count}} اخرون</span> {{description}}"
-        many: "<span>{{username}}, {{username2}} و {{count}} اخرون</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} و {{count}} اخرون</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}}"
-      invitee_accepted: "<span>{{username}}</span> قبل دعوتك"
-      moved_post: "<span>{{username}}</span> نقل {{description}}"
-      linked: "<span>{{username}}</span>{{description}} "
-      granted_badge: "تم منحك شارة '{{description}}'"
-      topic_reminder: "<span>{{username}}</span>{{description}} "
-      watching_first_post: "<span>موضوع جديد</span> {{description}}"
+        zero: "<span>%{username}, %{username2}</span> %{description}"
+        one: "<span>%{username}, %{username2} و وواحد اخر</span> %{description}"
+        two: "<span>%{username}, %{username2} و اثنين اخرون</span> %{description}"
+        few: "<span>%{username}, %{username2} و %{count} اخرون</span> %{description}"
+        many: "<span>%{username}, %{username2} و %{count} اخرون</span> %{description}"
+        other: "<span>%{username}, %{username2} و %{count} اخرون</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}"
+      invitee_accepted: "<span>%{username}</span> قبل دعوتك"
+      moved_post: "<span>%{username}</span> نقل %{description}"
+      linked: "<span>%{username}</span>%{description} "
+      granted_badge: "تم منحك شارة '%{description}'"
+      topic_reminder: "<span>%{username}</span>%{description} "
+      watching_first_post: "<span>موضوع جديد</span> %{description}"
       group_message_summary:
-        zero: "لا يوجد رسائل في صندوق رسائل {{group_name}} "
-        one: "رسالة واحدة في صندوق رسائل {{group_name}} "
-        two: "{{count}} رسالة في صندوق رسائل {{group_name}} "
-        few: "{{count}} رسالة في صندوق رسائل {{group_name}} "
-        many: "{{count}} رسالة في صندوق رسائل {{group_name}} "
-        other: "{{count}} رسالة في صندوق رسائل {{group_name}} "
+        zero: "لا يوجد رسائل في صندوق رسائل %{group_name} "
+        one: "رسالة واحدة في صندوق رسائل %{group_name} "
+        two: "%{count} رسالة في صندوق رسائل %{group_name} "
+        few: "%{count} رسالة في صندوق رسائل %{group_name} "
+        many: "%{count} رسالة في صندوق رسائل %{group_name} "
+        other: "%{count} رسالة في صندوق رسائل %{group_name} "
       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}}'
-        linked: '{{username}} وضع رابطا لمنشورك في "{{topic}}" - {{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}'
+        linked: '%{username} وضع رابطا لمنشورك في "%{topic}" - %{site_title}'
       titles:
         watching_first_post: "موضوع جديد"
     upload_selector:
@@ -1406,9 +1409,9 @@ ar:
       from_my_computer: "من جهازي"
       from_the_web: "من الوبّ"
       remote_tip: "رابط لصورة"
-      remote_tip_with_attachments: "رابط لصورة أو ملف {{authorized_extensions}}"
+      remote_tip_with_attachments: "رابط لصورة أو ملف %{authorized_extensions}"
       local_tip: "إختر صور من جهازك ."
-      local_tip_with_attachments: "حدّد صورا أو ملفات من جهازك {{authorized_extensions}}"
+      local_tip_with_attachments: "حدّد صورا أو ملفات من جهازك %{authorized_extensions}"
       hint: "(يمكنك أيضا السحب والإفلات في المحرر لرفعها)"
       hint_for_supported_browsers: "يمكنك أيضا سحب وإفلات الصور أو لصقها في المحرر"
       uploading: "يرفع"
@@ -1428,7 +1431,7 @@ ar:
       no_results: "لا يوجد نتائج."
       no_more_results: "لا يوجد نتائج أخرى."
       searching: "يبحث..."
-      post_format: "#{{post_number}} كتبها {{username}}"
+      post_format: "#%{post_number} كتبها %{username}"
       more_results: "يوجد عدد كبير من النتائج, يرجى تضييق نطاق البحث."
       cant_find: "لا تستطيع ايجاد ما تبحث عنة؟"
       start_new_topic: "افتح موضوع جديد."
@@ -1437,8 +1440,8 @@ ar:
       search_google_button: "جوجل"
       search_google_title: "ابحث في هذا الموقع"
       context:
-        user: "ابحث في منشورات @{{username}}"
-        category: "أبحث في قسم #{{category}}"
+        user: "ابحث في منشورات @%{username}"
+        category: "أبحث في قسم #%{category}"
         topic: "ابحث في هذا الموضوع"
         private_messages: "البحث في الرسائل الخاصة"
       advanced:
@@ -1507,9 +1510,9 @@ ar:
           zero: "لم تحدد شيئا."
           one: "حددت موضوع <b>واحد</b>."
           two: "حددت <b>موضوعين</b>."
-          few: "حددت <b>{{count}}</b> مواضيع."
-          many: "حددت <b>{{count}}</b> موضوعا."
-          other: "حددت <b>{{count}}</b> موضوع."
+          few: "حددت <b>%{count}</b> مواضيع."
+          many: "حددت <b>%{count}</b> موضوعا."
+          other: "حددت <b>%{count}</b> موضوع."
         change_tags: "غيّر الأوسمة"
         append_tags: "اضف الأوسمة"
         choose_new_tags: "اختر أوسمة جديدة لهذه الموضوعات:"
@@ -1522,7 +1525,7 @@ ar:
         posted: "لم تشارك في أيّ موضوع بعد."
         latest: "لا مواضيع حديثة. يا للأسف."
         bookmarks: "لا مواضيع معلّمة بعد."
-        category: "لا يوجد موضوعات في قسم ’{{category}}‘."
+        category: "لا يوجد موضوعات في قسم ’%{category}‘."
         top: "لا يوجد موضوعات مشاهدة بكثرة"
         educate:
           new: '<p>سوف تظهر موضوعاتك هنا.</p><p>بشكل افتراضي تعتبر الموضوعات جديدة و يظهر بجانبها كلمه <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">جديد</span> إذا لم يمضي علي نشرها اكثر من يومين.</p><p>زور صفحة <a href="%{userPrefsUrl}">التفضيلات</a> لتغيير هذا السلوك</p>'
@@ -1533,7 +1536,7 @@ ar:
         read: "لا يوجد موضوعات مقروءة أخرى."
         new: "لا يوجد مواضيع جديدة أخرى."
         unread: "لا يوجد موضوعات غير مقروءة أخرى."
-        category: "لا يوجد مواضيع أخرى في قسم \"{{category}}\"."
+        category: "لا يوجد مواضيع أخرى في قسم \"%{category}\"."
         top: "لا يوجد موضوعات مشاهدة بكثرة اخري."
         bookmarks: "لا يوجد موضوعات عليها علامة مرجعية اخري."
     topic:
@@ -1541,9 +1544,9 @@ ar:
         zero: "لا يوجد منشورات في الموضوع"
         one: "منشور واحد في الموضوع"
         two: "منشورين في الموضوع"
-        few: "{{count}} منشور في الموضوع"
-        many: "{{count}} منشور في الموضوع"
-        other: "{{count}} منشور في الموضوع"
+        few: "%{count} منشور في الموضوع"
+        many: "%{count} منشور في الموضوع"
+        other: "%{count} منشور في الموضوع"
       create: "موضوع جديد"
       create_long: "كتابة موضوع جديد"
       private_message: "أرسل رسالة خاصة"
@@ -1564,16 +1567,16 @@ ar:
         zero: "لا مواضيع جديدة"
         one: "موضوع واحد جديد"
         two: "موضوعان جديدان"
-        few: "{{count}} مواضيع جديدة"
-        many: "{{count}} موضوعًا جديدًا"
-        other: "{{count}} موضوع جديد"
+        few: "%{count} مواضيع جديدة"
+        many: "%{count} موضوعًا جديدًا"
+        other: "%{count} موضوع جديد"
       unread_topics:
         zero: "لا مواضيع غير مقروءة"
         one: "موضوع واحد غير مقروء"
         two: "موضوعان غير مقروءان"
-        few: "{{count}} مواضيع غير مقروءة"
-        many: "{{count}} موضوعًا غير مقروء"
-        other: "{{count}} موضوع غير مقروء"
+        few: "%{count} مواضيع غير مقروءة"
+        many: "%{count} موضوعًا غير مقروء"
+        other: "%{count} موضوع غير مقروء"
       title: "الموضوع"
       invalid_access:
         title: "الموضوع خاص"
@@ -1588,37 +1591,37 @@ ar:
       total_unread_posts:
         zero: "لا يوجد منشورات غير مقروء في هذا الموضوع"
         one: "لديك منشور واحد غير مقروء في هذا الموضوع"
-        two: "لديك {{count}} منشور غير مقروء في هذا الموضوع"
-        few: "لديك {{count}} منشور غير مقروء في هذا الموضوع"
-        many: "لديك {{count}} منشور غير مقروء في هذا الموضوع"
-        other: "لديك {{count}} منشور غير مقروء في هذا الموضوع"
+        two: "لديك %{count} منشور غير مقروء في هذا الموضوع"
+        few: "لديك %{count} منشور غير مقروء في هذا الموضوع"
+        many: "لديك %{count} منشور غير مقروء في هذا الموضوع"
+        other: "لديك %{count} منشور غير مقروء في هذا الموضوع"
       unread_posts:
         zero: "لا مشاركات قديمة غير مقروءة في هذا الموضوع"
         one: "لديك مشاركة واحدة قديمة غير مقروءة في هذا الموضوع"
         two: "لديك مشاركتين قديمتين غير مقروءتين في هذا الموضوع"
-        few: "لديك {{count}} مشاركات قديمة غير مقروءة في هذا الموضوع"
-        many: "لديك {{count}} مشاركة قديمة غير مقروءة في هذا الموضوع"
-        other: "لديك {{count}} مشاركة قديمة غير مقروءة في هذا الموضوع"
+        few: "لديك %{count} مشاركات قديمة غير مقروءة في هذا الموضوع"
+        many: "لديك %{count} مشاركة قديمة غير مقروءة في هذا الموضوع"
+        other: "لديك %{count} مشاركة قديمة غير مقروءة في هذا الموضوع"
       new_posts:
         zero: "لا يوجد منشورات جديد في هذا الموضوع منذ اخر مرة قرأته"
         one: "هناك منشور واحد جديد في هذا الموضوع منذ اخر مرة قرأته"
         two: "هناك منشورين جديدين في هذا الموضوع منذ اخر مرة قرأته"
-        few: "هناك {{count}} منشور جديد في هذا الموضوع منذ اخر مرة قرأته"
-        many: "هناك {{count}} منشور جديد في هذا الموضوع منذ اخر مرة قرأته"
-        other: "هناك {{count}} منشور جديد في هذا الموضوع منذ اخر مرة قرأته"
+        few: "هناك %{count} منشور جديد في هذا الموضوع منذ اخر مرة قرأته"
+        many: "هناك %{count} منشور جديد في هذا الموضوع منذ اخر مرة قرأته"
+        other: "هناك %{count} منشور جديد في هذا الموضوع منذ اخر مرة قرأته"
       likes:
         zero: "لا إعجابات في هذا الموضوع"
         one: "هناك إعجاب واحد في هذا الموضوع"
         two: "هناك إعجابين في هذا الموضوع"
-        few: "هناك {{count}} إعجابات في هذا الموضوع"
-        many: "هناك {{count}} إعجابا في هذا الموضوع"
-        other: "هناك {{count}} إعجاب في هذا الموضوع"
+        few: "هناك %{count} إعجابات في هذا الموضوع"
+        many: "هناك %{count} إعجابا في هذا الموضوع"
+        other: "هناك %{count} إعجاب في هذا الموضوع"
       back_to_list: "عد إلى قائمة الموضوعات"
       options: "خيارات الموضوعات"
       show_links: "اظهر الروابط في هذا الموضوع"
       toggle_information: "أظهر/أخف تفاصيل الموضوع"
-      read_more_in_category: "أتريد قراءة المزيد؟ تصفح المواضيع الأخرى في {{catLink}} أو {{latestLink}}."
-      read_more: "أتريد قراءة المزيد؟ {{catLink}} أو {{latestLink}}."
+      read_more_in_category: "أتريد قراءة المزيد؟ تصفح المواضيع الأخرى في %{catLink} أو %{latestLink}."
+      read_more: "أتريد قراءة المزيد؟ %{catLink} أو %{latestLink}."
       read_more_MF: "{UNREAD, plural, zero {} one {تبقى <a href='{basePath}/unread'>موضوع واحد غير مقروء</a>} two {تبقى <a href='{basePath}/unread'>موضوعان غير مقروءان</a>} few {تبقت <a href='{basePath}/unread'># مواضيع غير مقروءة</a>} many {تبقى <a href='{basePath}/unread'># موضوعا غير مقروء</a>} other {تبقى <a href='{basePath}/unread'># موضوع غير مقروء</a>}} {BOTH, select, true { و} false {} other {}}{NEW, plural, zero {} one {{UNREAD, plural, zero {تبقى } one {} two {} few {} many {} other {}}<a href='{basePath}/new'>موضوع واحد جديد</a>} two {{UNREAD, plural, zero {تبقى } one {} two {} few {} many {} other {}}<a href='{basePath}/new'>موضوعان جديدان</a>} few {{UNREAD, plural, zero {تبقت } one {} two {} few {} many {} other {}}<a href='{basePath}/new'># مواضيع جديدة</a>} many {{UNREAD, plural, zero {تبقى } one {} two {} few {} many {} other {}}<a href='{basePath}/new'># موضوعا جديدا</a>} other {{UNREAD, plural, zero {تبقى } one {} two {} few {} many {} other {}}<a href='{basePath}/new'># موضوع جديد</a>}}، أو {CATEGORY, select, true {تصفّح المواضيع الأخرى في {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: تصفّح كل الأقسام
       view_latest_topics: اعرض اخر الموضوعات
@@ -1773,33 +1776,33 @@ ar:
         success_message: "لقد أبلغت عن هذا الموضوع بنجاح."
       feature_topic:
         title: "مميز هذا الموضوع"
-        pin: "اجعل هذا الموضوع يظهر أعلى قسم {{categoryLink}} حتى"
-        confirm_pin: "لديك مسبقاً {{count}} موضوع مثبت. قد تكون كثرة المواضيع المثبتة عبئاً على الأعضاء الجدد والزوار. هل أنت متأكد أنك تريد تثبيت موضوع آخر في هذا القسم؟"
-        unpin: "أزل هذا الموضوع من أعلى قسم \"{{categoryLink}}\"."
-        unpin_until: "أزل هذا الموضوع من أعلى قسم \"{{categoryLink}}\" أو انتظر حتى <strong>%{until}</strong>."
+        pin: "اجعل هذا الموضوع يظهر أعلى قسم %{categoryLink} حتى"
+        confirm_pin: "لديك مسبقاً %{count} موضوع مثبت. قد تكون كثرة المواضيع المثبتة عبئاً على الأعضاء الجدد والزوار. هل أنت متأكد أنك تريد تثبيت موضوع آخر في هذا القسم؟"
+        unpin: "أزل هذا الموضوع من أعلى قسم \"%{categoryLink}\"."
+        unpin_until: "أزل هذا الموضوع من أعلى قسم \"%{categoryLink}\" أو انتظر حتى <strong>%{until}</strong>."
         pin_note: "الاعضاء يستطعون إزالة تثبيت الموضوع لأنفسهم."
         pin_validation: "التاريخ مطلوب لتثبيت هذا الموضوع."
-        not_pinned: "لا يوجد موضوعات مثبتة في {{categoryLink}}."
+        not_pinned: "لا يوجد موضوعات مثبتة في %{categoryLink}."
         already_pinned:
-          zero: "المواضيع مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          one: "المواضيع مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          two: "المواضيع مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          few: "المواضيع مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "المواضيع مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "الموضوعات مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          zero: "المواضيع مثبتة حالياً في %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          one: "المواضيع مثبتة حالياً في %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          two: "المواضيع مثبتة حالياً في %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          few: "المواضيع مثبتة حالياً في %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          many: "المواضيع مثبتة حالياً في %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "الموضوعات مثبتة حالياً في %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "اعرض هذا الموضوع أعلى كل قوائم الموضوعات حتى"
-        confirm_pin_globally: "لديك {{count}} موضوع مثبت علي عموم الموقع مما قد يشكل عبئ على الأعضاء الجدد و الزوار. هل أنت واثق أنك تريد تثبيت موضوع أخر على عموم الموقع؟"
+        confirm_pin_globally: "لديك %{count} موضوع مثبت علي عموم الموقع مما قد يشكل عبئ على الأعضاء الجدد و الزوار. هل أنت واثق أنك تريد تثبيت موضوع أخر على عموم الموقع؟"
         unpin_globally: "أزل هذا الموضوع من أعلى كل قوائم الموضوعات."
         unpin_globally_until: "أزل هذا الموضوع من أعلى قوائم الموضوعات أو انتظر حتى <strong>%{until}</strong>."
         global_pin_note: "يمكن للاعضاء إذالة تثبيت الموضوع لأنفسهم. "
         not_pinned_globally: "لا يوجد موضوعات مثبتة للعموم."
         already_pinned_globally:
-          zero: "الموضوعات المثبتة علي عموم الموقع حاليا: <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>"
+          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: "الأعضاء يستطيعون تجاهل الموضوع المثبت كإعلان بإغلاقه. لا تمكن تعيين اكثر من موضوع في نفس الوقت كإعلان."
@@ -1829,19 +1832,19 @@ ar:
         to_topic_username: "لقد أدخلت اسم مستخدم. سنرسل إشعارًا يحتوي رابطًا يدعوهم إلى هذا الموضوع."
         to_username: "أدخل اسم المستخدم للشخص الذي تريد دعوته. سنرسل إشعارًا يحتوي رابطًا يدعوهم إلى هذا الموضوع."
         email_placeholder: "name@example.com"
-        success_email: "قمنا بإرسال دعوة بالبريد لـ <b>{{emailOrUsername}}</b> . سيتم تنبيهك عند قبول الدعوة , تحقق من تبويب الدعوات في صفحتك الشخصية لمتابعة دعوتك."
+        success_email: "قمنا بإرسال دعوة بالبريد لـ <b>%{emailOrUsername}</b> . سيتم تنبيهك عند قبول الدعوة , تحقق من تبويب الدعوات في صفحتك الشخصية لمتابعة دعوتك."
         success_username: "دعونا هذا العضو للمشاركة في هذا الموضوع."
         error: "عذرا, لا يمكنك دعوة هذا الشخص, ربما لأن تم دعوتة مسبقا؟ (الدعوات محدودة)"
-        success_existing_email: "العضو ذو عنوان البريد الإلكتروني <b>{{emailOrUsername}}</b> مسجل بالفعل. لقد قمنا بدعوتة للمشاركة بهذا الموضوع."
+        success_existing_email: "العضو ذو عنوان البريد الإلكتروني <b>%{emailOrUsername}</b> مسجل بالفعل. لقد قمنا بدعوتة للمشاركة بهذا الموضوع."
       login_reply: "عليك تسجيل الدخول للرد"
       filters:
         n_posts:
           zero: "لا يوجد منشورات"
           one: "منشور واحد"
           two: "منشوران"
-          few: "{{count}} منشور"
-          many: "{{count}} منشور"
-          other: "{{count}} منشور"
+          few: "%{count} منشور"
+          many: "%{count} منشور"
+          other: "%{count} منشور"
         cancel: "إزالة الترشيح"
       split_topic:
         title: "نقل الى موضوع جديد"
@@ -1852,9 +1855,9 @@ ar:
           zero: "أنت على وشك انشاء موضوع جديد, ولم تقم باختيار أي منشور لتعبئته."
           one: "أنت على وشك انشاء موضوع جديد وتعبئته بمنشورم اخترتة."
           two: "أنت على وشك انشاء موضوع جديد وتعبئته منشورين اخترتهما."
-          few: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة."
-          many: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة."
-          other: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة."
+          few: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>%{count}</b> منشور اخترتة."
+          many: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>%{count}</b> منشور اخترتة."
+          other: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>%{count}</b> منشور اخترتة."
       merge_topic:
         title: "نقل الى موضوع موجود"
         action: "نقل الى موضوع موجود"
@@ -1863,9 +1866,9 @@ ar:
           zero: "لم يتم اختيار أي منشورات لنقلها !"
           one: "الرجاء اختيار الموضوع الذي تود نقل منشور واحد إليه."
           two: "الرجاء اختيار الموضوع الذي تود نقل منشورين إليه."
-          few: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه."
-          many: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه."
-          other: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه."
+          few: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>%{count}</b> منشور إليه."
+          many: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>%{count}</b> منشور إليه."
+          other: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>%{count}</b> منشور إليه."
       move_to_new_message:
         radio_label: "رسالة جديدة"
       merge_posts:
@@ -1884,7 +1887,7 @@ ar:
         instructions: "من فضلك اختر تاريخ النشر الجديد للموضوع. سيتم تحديث تاريخ نشر منشورات الموضوع حتي يتم الحفاظ علي نفس الفارق الزمني."
       multi_select:
         select: "حدد"
-        selected: "محددة ({{count}})"
+        selected: "محددة (%{count})"
         select_post:
           label: "إختيار"
         selected_post:
@@ -1899,18 +1902,18 @@ ar:
           zero: "لم تحدّد أي منشورات."
           one: لقد حدّدت منشور<b>واحد</b>.
           two: "لقد حدّدت <b>منشورين</b>."
-          few: "لقد حدّدت <b>{{count}}</b> منشور."
-          many: "لقد حدّدت <b>{{count}}</b> منشور."
-          other: "لقد حدّدت <b>{{count}}</b> منشور."
+          few: "لقد حدّدت <b>%{count}</b> منشور."
+          many: "لقد حدّدت <b>%{count}</b> منشور."
+          other: "لقد حدّدت <b>%{count}</b> منشور."
     post:
       quote_reply: "اقتبس"
       edit_reason: "السبب:"
-      post_number: "المنشور {{number}}"
+      post_number: "المنشور %{number}"
       wiki_last_edited_on: "آخر تعديل على الـ wiki في "
       last_edited_on: "آخر تعديل على المنشور في "
       reply_as_new_topic: "التعليق على الموضوع الاصلي"
       reply_as_new_private_message: "الرد في رسالة جديدة علي نفس المستلم"
-      continue_discussion: "تكملة النقاش من {{postLink}}:"
+      continue_discussion: "تكملة النقاش من %{postLink}:"
       follow_quote: "انتقل إلى المنشور المقتبَس منه"
       show_full: "عرض كامل المنشور"
       deleted_by_author:
@@ -1924,39 +1927,39 @@ ar:
       gap:
         zero: "لا يوجد ردود مخفية"
         one: "اعرض رد واحد مخفي"
-        two: "اعرض ال‍ {{count}} رد مخفي"
-        few: "اعرض ال‍ {{count}} رد مخفي"
-        many: "اعرض ال‍ {{count}} رد مخفي"
-        other: "اعرض ال‍ {{count}} رد مخفي"
+        two: "اعرض ال‍ %{count} رد مخفي"
+        few: "اعرض ال‍ %{count} رد مخفي"
+        many: "اعرض ال‍ %{count} رد مخفي"
+        other: "اعرض ال‍ %{count} رد مخفي"
       unread: "المنشور غير مقروء"
       has_replies:
         zero: "لا ردود"
         one: "رد واحد"
-        two: "{{count}} رد"
-        few: "{{count}} رد"
-        many: "{{count}} رد"
-        other: "{{count}} رد"
+        two: "%{count} رد"
+        few: "%{count} رد"
+        many: "%{count} رد"
+        other: "%{count} رد"
       has_likes_title:
-        zero: "{{count}} عضو اعجب بهذا المشروع"
+        zero: "%{count} عضو اعجب بهذا المشروع"
         one: "عضو واحد اعجب بهذا المشروع"
-        two: "{{count}} عضو اعجب بهذا المشروع"
-        few: "{{count}} عضو اعجب بهذا المشروع"
-        many: "{{count}} عضو اعجب بهذا المشروع"
-        other: "{{count}} عضو اعجب بهذا المشروع"
+        two: "%{count} عضو اعجب بهذا المشروع"
+        few: "%{count} عضو اعجب بهذا المشروع"
+        many: "%{count} عضو اعجب بهذا المشروع"
+        other: "%{count} عضو اعجب بهذا المشروع"
       has_likes_title_only_you: "اعجبك هذا المنشور"
       has_likes_title_you:
         zero: "لم يعجب احد غيرك بهذا المنشور"
         one: "انت و عضو واحد غيرك اعجبكم هذا المنشور."
         two: "انت و عضوين غيرك اعجبكم هذا المنشور."
-        few: "انت و {{count}} غيرك اعجبكم هذا المنشور."
-        many: "انت و {{count}} غيرك اعجبكم هذا المنشور."
-        other: "انت و {{count}} غيرك اعجبكم هذا المنشور."
+        few: "انت و %{count} غيرك اعجبكم هذا المنشور."
+        many: "انت و %{count} غيرك اعجبكم هذا المنشور."
+        other: "انت و %{count} غيرك اعجبكم هذا المنشور."
       errors:
         create: "عذرا، حدثت مشكلة اثناء إنشاء منشورك. من فضلك حاول مجددا."
         edit: "عذرا، حدثت مشكلة اثناء تعديل منشورك. من فضلك حاول مجددا."
         upload: "عذرا، حدثت مشكلة اثناء رفع الملف. من فضلك حاول مجددا."
         too_many_uploads: "عذرا، يمكنك فقط رفع ملف واحد كل مرة."
-        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: "عذرا، عليك تسجيل الدخول لتحميل المرفقات."
@@ -2027,9 +2030,9 @@ ar:
           zero: "لا يوجد منشورات لدمجها"
           one: "هل انت متاكد انك تريد دمج هذا المنشور؟"
           two: "هل انت متاكد انك تريد دمج هذان المنشوران؟"
-          few: "هل انت متاكد انك تريد دمج الـ {{count}} منشور؟"
-          many: "هل انت متاكد انك تريد دمج الـ {{count}} منشور؟"
-          other: "هل انت متاكد انك تريد دمج الـ {{count}} منشور؟"
+          few: "هل انت متاكد انك تريد دمج الـ %{count} منشور؟"
+          many: "هل انت متاكد انك تريد دمج الـ %{count} منشور؟"
+          other: "هل انت متاكد انك تريد دمج الـ %{count} منشور؟"
       revisions:
         controls:
           first: "أول مراجعة"
@@ -2190,24 +2193,24 @@ ar:
         at_least:
           zero: "لا تُدخل أيّ محرف"
           one: "أدخل حرف واحد على الأقل"
-          two: "أدخل {{count}} احرف على الأقل"
-          few: "أدخل {{count}} احرف على الأقل"
-          many: "أدخل {{count}} احرف على الأقل"
-          other: "أدخل {{count}} احرف على الأقل"
+          two: "أدخل %{count} احرف على الأقل"
+          few: "أدخل %{count} احرف على الأقل"
+          many: "أدخل %{count} احرف على الأقل"
+          other: "أدخل %{count} احرف على الأقل"
         more:
-          zero: "{{count}} حرف متبقي علي الحد الادني..."
-          one: "{{count}} حرف واحد متبقي علي الحد الادني..."
-          two: "{{count}} حرف متبقي علي الحد الادني..."
-          few: "{{count}} حرف متبقي علي الحد الادني..."
-          many: "{{count}} حرف متبقي علي الحد الادني..."
-          other: "{{count}} حرف متبقي علي الحد الادني..."
+          zero: "%{count} حرف متبقي علي الحد الادني..."
+          one: "%{count} حرف واحد متبقي علي الحد الادني..."
+          two: "%{count} حرف متبقي علي الحد الادني..."
+          few: "%{count} حرف متبقي علي الحد الادني..."
+          many: "%{count} حرف متبقي علي الحد الادني..."
+          other: "%{count} حرف متبقي علي الحد الادني..."
         left:
-          zero: "{{count}} حرف متبقي علي الحد الاقصي..."
+          zero: "%{count} حرف متبقي علي الحد الاقصي..."
           one: "حرف واحد متبقي علي الحد الاقصي..."
-          two: "{{count}} حرف متبقي علي الحد الاقصي..."
-          few: "{{count}} حرف متبقي علي الحد الاقصي..."
-          many: "{{count}} حرف متبقي علي الحد الاقصي..."
-          other: "{{count}} حرف متبقي علي الحد الاقصي..."
+          two: "%{count} حرف متبقي علي الحد الاقصي..."
+          few: "%{count} حرف متبقي علي الحد الاقصي..."
+          many: "%{count} حرف متبقي علي الحد الاقصي..."
+          other: "%{count} حرف متبقي علي الحد الاقصي..."
     flagging_topic:
       title: "شكرا لمساعدتنا في ابقاء المجمتع متحضر"
       action: "التبليغ عن الموضوع"
@@ -2256,7 +2259,7 @@ ar:
       unlisted:
         help: "هذا الموضوع غير مدرج, لن يظهر في قائمة الموضوعات ولا يمكن الوصول إلية إلا برابط مباشر"
     posts: "منشورات"
-    posts_long: "هناك {{number}} منشور في هذا الموضوع"
+    posts_long: "هناك %{number} منشور في هذا الموضوع"
     posts_likes_MF: |
       {count, plural, zero {ليس في هذا الموضوع أي رد} one {في هذا الموضوع رد واحد} two {في هذا الموضوع ردان} few {في هذا الموضوع # ردود} many {في هذا الموضوع # ردا} other {في هذا الموضوع # رد}} {ratio, select,
       low {ونسبة الإعجاب إلى المشاركة عالية}
@@ -2274,12 +2277,12 @@ ar:
       other: "المشاهدات"
     replies: "الردود"
     views_long:
-      zero: "تم مشاهدة هذا الموضوع {{number}} مرة"
+      zero: "تم مشاهدة هذا الموضوع %{number} مرة"
       one: "تم مشاهدة هذا الموضوع مرة واحدة"
-      two: "تم مشاهدة هذا الموضوع {{number}} مرة"
-      few: "تم مشاهدة هذا الموضوع {{number}} مرة"
-      many: "تم مشاهدة هذا الموضوع {{number}} مرة"
-      other: "تم مشاهدة هذا الموضوع {{number}} مرة"
+      two: "تم مشاهدة هذا الموضوع %{number} مرة"
+      few: "تم مشاهدة هذا الموضوع %{number} مرة"
+      many: "تم مشاهدة هذا الموضوع %{number} مرة"
+      other: "تم مشاهدة هذا الموضوع %{number} مرة"
     activity: "النشاط"
     likes: "اعجابات"
     likes_lowercase:
@@ -2289,7 +2292,7 @@ ar:
       few: "اﻹعجابات"
       many: "اﻹعجابات"
       other: "اﻹعجابات"
-    likes_long: "هناك {{number}} اعجابات في هذا الموضوع"
+    likes_long: "هناك %{number} اعجابات في هذا الموضوع"
     users: "الأعضاء"
     users_lowercase:
       zero: "عضو"
@@ -2300,7 +2303,7 @@ ar:
       other: "الأعضاء"
     category_title: "قسم"
     history: "تاريخ"
-    changed_by: "الكاتب {{author}}"
+    changed_by: "الكاتب %{author}"
     raw_email:
       title: "البريد الإلكتروني الوارد"
       not_available: "غير متوفر!"
@@ -2311,54 +2314,54 @@ ar:
       latest:
         title: "الأخيرة"
         title_with_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})"
         help: "الموضوعات التي بها منشورات حديثة"
       read:
         title: "المقروءة"
         help: "المواضيع التي قرأتها بترتيب قرائتك لها"
       categories:
         title: "الأقسام"
-        title_in: "قسم - {{categoryName}}"
+        title_in: "قسم - %{categoryName}"
         help: "كلّ الموضوعات مجمّعة حسب القسم"
       unread:
         title: "غير المقروءة"
         title_with_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})"
         help: "الموضوعات التي تتابعها (أو تراقبها) والتي فيها منشورات غير مقروءة"
         lower_title_with_count:
           zero: "1 غير مقررء "
           one: "%{count} غير مقروء"
-          two: "{{count}} غير مقروء "
-          few: "{{count}} غير مقروء "
-          many: "{{count}} غير مقروء"
-          other: "{{count}} غير مقروء"
+          two: "%{count} غير مقروء "
+          few: "%{count} غير مقروء "
+          many: "%{count} غير مقروء"
+          other: "%{count} غير مقروء"
       new:
         lower_title_with_count:
           zero: "لا جديد"
           one: "%{count} جديد"
-          two: "{{count}} جديد"
-          few: "{{count}} جديد"
-          many: "{{count}} جديد"
-          other: "{{count}} جديدة"
+          two: "%{count} جديد"
+          few: "%{count} جديد"
+          many: "%{count} جديد"
+          other: "%{count} جديدة"
         lower_title: "الجديدة"
         title: "الجديدة"
         title_with_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})"
         help: "المواضيع المنشأة في الأيّام القليلة الماضية"
       posted:
         title: "منشوراتي"
@@ -2367,15 +2370,15 @@ ar:
         title: "العلامات المرجعية"
         help: "موضوعات وضعت عليها علامة مرجعية"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          zero: "{{categoryName}} ({{count}})"
-          one: "{{categoryName}} ({{count}})"
-          two: "{{categoryName}} ({{count}})"
-          few: "{{categoryName}} ({{count}})"
-          many: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
-        help: "آخر الموضوعات في قسم {{categoryName}}"
+          zero: "%{categoryName} (%{count})"
+          one: "%{categoryName} (%{count})"
+          two: "%{categoryName} (%{count})"
+          few: "%{categoryName} (%{count})"
+          many: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "آخر الموضوعات في قسم %{categoryName}"
       top:
         title: "الأكثر مُشاهدة"
         help: "أكثر المواضيع نشاطًا في آخر عام أو شهر أو أسبوع أو يوم"
@@ -2510,12 +2513,12 @@ ar:
       add_synonyms: "اضافة"
       delete_tag: "احذف الوسم"
       delete_confirm:
-        zero: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
+        zero: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من %{count} موضوع؟"
         one: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من موضوع واحد؟"
-        two: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
-        few: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
-        many: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
-        other: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
+        two: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من %{count} موضوع؟"
+        few: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من %{count} موضوع؟"
+        many: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من %{count} موضوع؟"
+        other: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من %{count} موضوع؟"
       delete_confirm_no_topics: "هل أنت متاكد انك تريد حذف هذا الوسم؟"
       rename_tag: "أعد تسمية الوسم"
       rename_instructions: "اختر اسما جديدا للوسم:"
@@ -2751,9 +2754,9 @@ ar:
             zero: "لا أحداث جديدة."
             one: "هناك حدث واحد جديد."
             two: "هناك حدثان جديدان."
-            few: "هناك {{count}} أحداث جديدة."
-            many: "هناك {{count}} حدثًا جديدًا."
-            other: "هناك {{count}} حدث جديد."
+            few: "هناك %{count} أحداث جديدة."
+            many: "هناك %{count} حدثًا جديدًا."
+            other: "هناك %{count} حدث جديد."
           request: "طلب"
           response: "الرد"
           headers: "الرؤوس"
@@ -2801,10 +2804,10 @@ ar:
           label: "رفع"
           title: "رفع نسخة احتياطية لهذه الحالة."
           uploading: "يرفع..."
-          error: "حصلت مشكلة أثناء رفع '{{filename}}': {{message}}"
+          error: "حصلت مشكلة أثناء رفع '%{filename}': %{message}"
         operations:
           is_running: "هناك عمليّة تجري حاليًّا..."
-          failed: "الـ {{operation}} فشلت. الرجاء التحقق من logs."
+          failed: "الـ %{operation} فشلت. الرجاء التحقق من logs."
           cancel:
             label: "إلغاء"
             title: "قم بإلغاء العملية الحالية"
@@ -3199,8 +3202,8 @@ ar:
           title: "اكشف عنوان البريد الإلكتروني لهذا العضو"
           text: "إظهار"
       user:
-        suspend_failed: "حدث خطب ما أثناء إيقاف هذا المستخدم {{error}}"
-        unsuspend_failed: "حدث خطب ما أثناء إلغاء إيقاف هذا المستخدم {{error}}"
+        suspend_failed: "حدث خطب ما أثناء إيقاف هذا المستخدم %{error}"
+        unsuspend_failed: "حدث خطب ما أثناء إلغاء إيقاف هذا المستخدم %{error}"
         suspend_duration: "ما المدّة التي سيُوقف هذا المستخدم خلالها؟"
         suspend_reason_label: "لماذا هل أنت عالق؟ هذا النص <b>سيكون ظاهراً للكل</b> على صفحة تعريف هذا العضو, وسيكون ظاهراً للعضو عندما يحاول تسجل الدخول. احفظها قصيرة."
         suspend_reason_hidden_label: "لماذا انت موقوف؟ هذا النص سيظهر للعضو حين يحاول الولوج. اجعله قصيراً."
@@ -3515,6 +3518,7 @@ ar:
         title: "الوجه التعبيري"
         help: "أضف رموز تعبيرية جديدة التي سوف تكون متاحة للكل . (PROTIP: drag & drop multiple files at once)"
         add: "أضافة وجه تعبيري جديد ؟"
+        uploading: "جاري الرفع..."
         name: "الأسم"
         group: "المجموعة"
         image: "صورة"
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index a37f2459e5..982c44fc43 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -21,8 +21,8 @@ be:
             mb: МБ
             tb: ТБ
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "HH:mm"
       long_no_year_no_time: "D MMM"
@@ -126,13 +126,13 @@ be:
     weekly: "штотыдзень"
     every_month: "кожны месяц"
     every_six_months: "кожныя паўгады"
-    max_of_count: "Не больш за {{count}}"
+    max_of_count: "Не больш за %{count}"
     alternation: "або"
     character_count:
-      one: "{{Count}} сімвал"
-      few: "{{Count}} сімвалы"
-      many: "{{Count}} сімвалаў"
-      other: "{{Count}} сімвалаў"
+      one: "%{Count} сімвал"
+      few: "%{Count} сімвалы"
+      many: "%{Count} сімвалаў"
+      other: "%{Count} сімвалаў"
     related_messages:
       title: "падобныя паведамленні"
     suggested_topics:
@@ -238,19 +238,19 @@ be:
         title: "Паведамленне мае патрэбу ў падцверджанні"
         ok: "Добра"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'> {{user}} <"
-      you_posted_topic: "<a href='{{userUrl}}'> Вы <"
-      user_replied_to_post: "<a href='{{userUrl}}'> {{user}} <"
-      you_replied_to_post: "<a href='{{userUrl}}'> Вы <"
-      user_replied_to_topic: "<a href='{{userUrl}}'> {{user}} <"
-      you_replied_to_topic: "<a href='{{userUrl}}'> Вы <"
-      user_mentioned_user: "<a href='{{user1Url}}'> {{user}} <"
-      user_mentioned_you: "<a href='{{user1Url}}'> {{user}} <"
-      you_mentioned_user: "<a href='{{user1Url}}'> Вы <"
-      posted_by_user: "Дададзена карыстальнікам <a href='{{userUrl}}'> {{user}} <"
-      posted_by_you: "Дададзена <a href='{{userUrl}}'> Вамі <"
-      sent_by_user: "Адпраўлена карыстальнікам <a href='{{userUrl}}'> {{user}} <"
-      sent_by_you: "Адпраўлена <a href='{{userUrl}}'> Вамі <"
+      user_posted_topic: "<a href='%{userUrl}'> %{user} <"
+      you_posted_topic: "<a href='%{userUrl}'> Вы <"
+      user_replied_to_post: "<a href='%{userUrl}'> %{user} <"
+      you_replied_to_post: "<a href='%{userUrl}'> Вы <"
+      user_replied_to_topic: "<a href='%{userUrl}'> %{user} <"
+      you_replied_to_topic: "<a href='%{userUrl}'> Вы <"
+      user_mentioned_user: "<a href='%{user1Url}'> %{user} <"
+      user_mentioned_you: "<a href='%{user1Url}'> %{user} <"
+      you_mentioned_user: "<a href='%{user1Url}'> Вы <"
+      posted_by_user: "Дададзена карыстальнікам <a href='%{userUrl}'> %{user} <"
+      posted_by_you: "Дададзена <a href='%{userUrl}'> Вамі <"
+      sent_by_user: "Адпраўлена карыстальнікам <a href='%{userUrl}'> %{user} <"
+      sent_by_you: "Адпраўлена <a href='%{userUrl}'> Вамі <"
     directory:
       filter_name: "фільтраваць па імені карыстальніка"
       title: "Карыстальнікі"
@@ -387,7 +387,7 @@ be:
       post_count: "колькасць паведамленняў"
       confirm_delete_other_accounts: "Вы ўпэўненыя, што жадаеце выдаліць гэтых карыстальнікаў?"
     user:
-      said: "{{Username}}"
+      said: "%{Username}"
       profile: "Профіль"
       mute: "Заглушыць"
       edit: "рэдагаваць налады"
@@ -506,7 +506,7 @@ be:
       username:
         title: "Імя карыстальніка"
         available: "Ваша імя даступна"
-        not_available: "Не даступна. Паспрабуеце {{suggestion}}?"
+        not_available: "Не даступна. Паспрабуеце %{suggestion}?"
         too_short: "Ваша імя кароткі"
         too_long: "Ваша імя доўгае"
         checking: "Праверка даступнасці імя карыстальніка ..."
@@ -582,9 +582,9 @@ be:
         time_read: "час чытання"
         days_visited: "дзён наведанае"
         account_age_days: "Ўзрост акаўнта ў днях"
-        create: "адправіць Запрашэнне"
-        bulk_invite:
-          text: "Масавае Запрашэнне з файла"
+        links_tab: "Спасылкі"
+        link_created_at: "створаны"
+        link_groups: Групы
       password:
         title: "Пароль"
         too_short: "Пароль занадта кароткі."
@@ -629,7 +629,7 @@ be:
         unknown: "памылка"
       desc:
         network: "Калі ласка, праверце злучэння."
-        server: "Код памылкі: {{status}}"
+        server: "Код памылкі: %{status}"
         forbidden: "Выбачайце, але гэта пераглядаць."
         unknown: "Нешта пайшло не так."
       buttons:
@@ -704,11 +704,11 @@ be:
       awaiting_activation: "Ваш рахунак чакае актывацыю. Для атрымання яшчэ аднаго актывацыйны лісты выкарыстоўвайце спасылкі Забыўся пароль."
       awaiting_approval: "Ваш рахунак яшчэ не зацверджаны членам каманды. Калі ён будзе актываваны, Вы атрымаеце электронны ліст."
       requires_invite: "Выбачайце, доступ да гэтага форуму - толькі па запрашэннях."
-      not_activated: "Вы яшчэ не можаце ўвайсці ў сістэму. Мы ўжо накіравалі Вам ліст для актывацыі на скрыню <b> {{sentTo}}"
+      not_activated: "Вы яшчэ не можаце ўвайсці ў сістэму. Мы ўжо накіравалі Вам ліст для актывацыі на скрыню <b> %{sentTo}"
       admin_not_allowed_from_ip_address: "Вы не можаце ўвайсці як адміністратар з гэтага IP-адрасу."
       resend_activation_email: "Націсніце тут, каб атрымаць яшчэ адзін ліст з актывацыяй."
       resend_title: "Актываваць зноў"
-      sent_activation_email_again: "Мы накіравалі ў паштовую скрыню <b> {{currentEmail}}"
+      sent_activation_email_again: "Мы накіравалі ў паштовую скрыню <b> %{currentEmail}"
       to_continue: "Калі ласка Увайдзіце"
       not_approved: "Ваш рахунак яшчэ не было прынята. Вы атрымаеце апавяшчэнне па электроннай пошце, калі зможаце ўвайсці ў сістэму."
       google_oauth2:
@@ -759,9 +759,9 @@ be:
       drafts_offline: "чарнавікі у афлайне"
       error:
         title_missing: "Загаловак неабходна"
-        title_too_short: "Загаловак павінен быць мінімум {{min}} сімвалаў"
-        title_too_long: "Загаловак не можа быць менш, чым {{max}} сімвалаў"
-        post_length: "Найменшы памер паведамленні павінна быць {{min}} сімвалаў"
+        title_too_short: "Загаловак павінен быць мінімум %{min} сімвалаў"
+        title_too_long: "Загаловак не можа быць менш, чым %{max} сімвалаў"
+        post_length: "Найменшы памер паведамленні павінна быць %{min} сімвалаў"
         category_missing: "Вы павінны выбраць катэгорыю"
       save_edit: "захаваць змены"
       reply_original: "Адказаць у пачатковай тэме"
@@ -816,8 +816,16 @@ be:
           label: "Стварыць новую тэму"
     notifications:
       popup:
+        mentioned: '% {Імя карыстальніка} згадаў вас у "% {} тэме" -% {SITE_TITLE}'
+        group_mentioned: '% {Імя карыстальніка} згадаў вас у "% {} тэме" -% {SITE_TITLE}'
+        quoted: '% {Імя карыстальніка} працытаваў вас у "% {} тэме" -% {SITE_TITLE}'
+        replied: '% {Імя карыстальніка} адказаў вам у "% {} тэме" -% {SITE_TITLE}'
+        posted: '% {Імя карыстальніка} пісаў у "% {} тэме" -% {SITE_TITLE}'
+        linked: '% {Імя карыстальніка} звязана з вашай пасады ад "% {} тэме" -% {SITE_TITLE}'
+        watching_first_post: '% {Імя карыстальніка} стварыў новую тэму "% {тэма}" - {%} SITE_TITLE'
         confirm_title: "Апавяшчэння ўключаная -% {SITE_TITLE}"
         confirm_body: "Поспех! Паведамлення былі ўключаны."
+        custom: "Апавяшчэнне ад% {імя карыстальніка} на {%} SITE_TITLE"
       titles:
         watching_first_post: "новая тэма"
     upload_selector:
@@ -837,6 +845,7 @@ be:
       full_page_title: "пошук тэмаў альбо пастоў"
       no_results: "Нічога не знойдзена."
       searching: "Пошук ..."
+      results_page: "Вынікі пошуку для '%{term}'"
       search_google_button: "Google"
       search_google_title: "Пошук на гэтым сайце"
       context:
@@ -877,7 +886,7 @@ be:
         posted: "Вы яшчэ не дапісвалі ў адну тэму."
         latest: "Апошніх тэм няма. Шкада."
         bookmarks: "У вас пакуль няма тэмаў у закладках."
-        category: "У катэгорыі {{category}} няма тэм."
+        category: "У катэгорыі %{category} няма тэм."
         top: "There are no top topics."
       bottom:
         latest: "Усе апошнія тэмы адлюстраваныя."
@@ -885,7 +894,7 @@ be:
         read: "Больш няма прачытаных тэм."
         new: "Больш няма новых тэм."
         unread: "Больш няма непрачытаных тэм."
-        category: "Больш няма тым у катэгорыі {{category}}."
+        category: "Больш няма тым у катэгорыі %{category}."
         top: "There are no more top topics."
         bookmarks: "Тэмы ў закладках адсутнічаюць."
     topic:
@@ -915,8 +924,8 @@ be:
       options: "Налады тэмы"
       show_links: "паказаць спасылкі ў гэтай тэме"
       toggle_information: "паказаць"
-      read_more_in_category: "Хочаце пачытаць яшчэ? Глядзіце іншыя тэмы ў {{catLink}} або {{latestLink}}."
-      read_more: "Хочаце пачытаць яшчэ? {{CatLink}} або {{latestLink}}."
+      read_more_in_category: "Хочаце пачытаць яшчэ? Глядзіце іншыя тэмы ў %{catLink} або %{latestLink}."
+      read_more: "Хочаце пачытаць яшчэ? %{CatLink} або %{latestLink}."
       browse_all_categories: Паглядзець усе катэгорыі
       view_latest_topics: Праглядзіце апошнія тэмы
       suggest_create_topic: "Чаму б не стварыць тэму?"
@@ -1021,6 +1030,7 @@ be:
     post:
       errors:
         upload: "Выбачайце, пры загрузцы гэтага файла адбылася памылка. Калі ласка, паспрабуйце яшчэ раз."
+        upload_not_authorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: %{authorized_extensions})."
       abandon_edit:
         no_value: "Не, пачакайце"
       abandon:
@@ -1138,11 +1148,11 @@ be:
     replies: "адказы"
     activity: "актыўнасць"
     likes: "перавагі"
-    likes_long: "у гэтай тэме {{number}} пераваг"
+    likes_long: "у гэтай тэме %{number} пераваг"
     users: "Карыстальнікі"
     category_title: "Катэгорыя"
     history: "гісторыя"
-    changed_by: "{{Author}}"
+    changed_by: "%{Author}"
     categories_list: "Спіс катэгорый"
     filters:
       latest:
@@ -1153,7 +1163,7 @@ be:
         help: "тэмы, якія вы прачыталі ў парадку, у якім Вы іх чыталі ў апошні раз"
       categories:
         title: "Катэгорыі"
-        title_in: "Катэгорыя - {{categoryName}}"
+        title_in: "Катэгорыя - %{categoryName}"
         help: "усе тэмы згрупаваныя па катэгорыях"
       unread:
         title: "Непрачытаныя"
@@ -1166,8 +1176,8 @@ be:
       bookmarks:
         title: "закладкі"
       category:
-        title: "{{CategoryName}}"
-        help: "Апошнія тэмы ў катэгорыі {{categoryName}}"
+        title: "%{CategoryName}"
+        help: "Апошнія тэмы ў катэгорыі %{categoryName}"
       top:
         title: "Топ тэмаў"
         all:
@@ -1842,6 +1852,7 @@ be:
           sample: "Прыклад:"
       emoji:
         title: "Абразкі"
+        uploading: "Запампоўванне ..."
         name: "Імя"
         group: "Група"
         image: "Выява"
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index 58905b0a40..efc23c459e 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -23,8 +23,8 @@ bg:
             mb: МБ
             tb: ТБ
       short:
-        thousands: "{{number}}k "
-        millions: "{{number}}M "
+        thousands: "%{number}k "
+        millions: "%{number}M "
     dates:
       time: "HH:mm"
       time_with_zone: "HH:mm (z)"
@@ -225,11 +225,11 @@ bg:
     weekly: "седмично"
     every_month: "всеки месец"
     every_six_months: "на всеки шест месеца"
-    max_of_count: "максимално от {{count}}"
+    max_of_count: "максимално от %{count}"
     alternation: "или"
     character_count:
-      one: "{{count}} символ"
-      other: "{{count}} символа"
+      one: "%{count} символ"
+      other: "%{count} символа"
     related_messages:
       title: "Свързани съобщения"
       see_all: 'See <a href="%{path}">всички съобщения</a> от @%{username}...'
@@ -295,11 +295,11 @@ bg:
         yes_value: "Да, напусни"
         no_value: "Не, запази"
     topic_count_unread:
-      one: "Виж {{count}} непрочетена тема"
-      other: "Виж {{count}} непрочетени теми"
+      one: "Виж %{count} непрочетена тема"
+      other: "Виж %{count} непрочетени теми"
     topic_count_new:
-      one: "Вижте {{count}} нова тема"
-      other: "Вижте {{count}} нови теми"
+      one: "Вижте %{count} нова тема"
+      other: "Вижте %{count} нови теми"
     preview: "преглед"
     cancel: "прекрати"
     save: "Запазете промените"
@@ -307,7 +307,7 @@ bg:
     saved: "Запазено!"
     upload: "Качване"
     uploading: "Качва се..."
-    uploading_filename: "Качване: {{filename}}..."
+    uploading_filename: "Качване: %{filename}..."
     clipboard: "клипборд"
     uploaded: "Качено!"
     pasting: "Вмъкване..."
@@ -362,24 +362,24 @@ bg:
         fields: "Полета"
       user_percentage:
         agreed:
-          one: "{{count}}% са съгласни"
-          other: "{{count}}% са съгласни"
+          one: "%{count}% са съгласни"
+          other: "%{count}% са съгласни"
         disagreed:
-          one: "{{count}}% не са съгласни"
-          other: "{{count}}% не са съгласни"
+          one: "%{count}% не са съгласни"
+          other: "%{count}% не са съгласни"
         ignored:
-          one: "{{count}}% игнорира"
-          other: "{{count}}% са без отношение"
+          one: "%{count}% игнорира"
+          other: "%{count}% са без отношение"
       topics:
         topic: "Тема"
         reviewable_count: "Брой"
         details: "детайли"
         unique_users:
           one: "%{count} потребител"
-          other: "{{count}} потребители"
+          other: "%{count} потребители"
       replies:
         one: "%{count} отговор"
-        other: "{{count}} отговора"
+        other: "%{count} отговора"
       edit: "Редактирай"
       save: "Запази"
       cancel: "Отмени"
@@ -420,22 +420,22 @@ bg:
         description: "Ние получихме вашата публикация, но тя трябва да бъде одобрена от модератора преди да бъде показана. Моля, проявете търпение."
         pending_posts:
           one: "Имате <strong>%{count}</strong> чакаща публикация."
-          other: "Имате <strong>{{count}}</strong> чакащи публикации."
+          other: "Имате <strong>%{count}</strong> чакащи публикации."
         ok: "Ок"
     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>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> отговори на <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Вие</a> отговорихте на <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> отговори в <a href='{{topicUrl}}'>тази тема</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Вие</a> отговорихте в <a href='{{topicUrl}}'>тази тема</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> спомена <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> <a href='{{user2Url}}'>Ви</a> спомена"
-      you_mentioned_user: "<a href='{{user1Url}}'>Вие</a> споменахте <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Публикувано от <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Публикувано от <a href='{{userUrl}}'>вас</a>"
-      sent_by_user: "Изпратено от <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Изпратено от <a href='{{userUrl}}'>Вас</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> публикува <a href='%{topicUrl}'>тази тема</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Вие</a> публикувахте <a href='%{topicUrl}'>тази тема</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> отговори на <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Вие</a> отговорихте на <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> отговори в <a href='%{topicUrl}'>тази тема</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Вие</a> отговорихте в <a href='%{topicUrl}'>тази тема</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> спомена <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> <a href='%{user2Url}'>Ви</a> спомена"
+      you_mentioned_user: "<a href='%{user1Url}'>Вие</a> споменахте <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Публикувано от <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Публикувано от <a href='%{userUrl}'>вас</a>"
+      sent_by_user: "Изпратено от <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Изпратено от <a href='%{userUrl}'>Вас</a>"
     directory:
       filter_name: "филтър по потребитилско име"
       title: "Потребители"
@@ -647,7 +647,7 @@ bg:
       none: "(изберете опция)"
       required: 'Моля, попълнете "%{name}"'
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Профил"
       mute: "Заглуши"
       edit: "Редактирай настройките"
@@ -707,11 +707,11 @@ bg:
       external_links_in_new_tab: "Отваряй всички външни връзки в нов раздел."
       enable_quoting: "Включи отговор с цитат при маркиран текст."
       change: "промени"
-      moderator: "{{user}} е модератор"
-      admin: "{{user}} е админ"
+      moderator: "%{user} е модератор"
+      admin: "%{user} е админ"
       moderator_tooltip: "Този потребител е модератор"
       admin_tooltip: "Този потребител е админ"
-      suspended_notice: "Този потребител е отстранен до {{date}}."
+      suspended_notice: "Този потребител е отстранен до %{date}."
       suspended_reason: "Причина:"
       github_profile: "Github"
       email_activity_summary: "Сумарна активност"
@@ -720,7 +720,7 @@ bg:
         enabled: "Включи режим Бюлетин"
         individual: "Изпращане на email за всяка нова публикация"
         individual_no_echo: "Пращай имейл за всяка нова публикация освен моите собствени"
-        many_per_day: "Пращай имейл за всяка нова публикация (около {{dailyEmailEstimate}} на ден)"
+        many_per_day: "Пращай имейл за всяка нова публикация (около %{dailyEmailEstimate} на ден)"
         few_per_day: "Изпратете ми имейл за всяка нова публикация (около 2 на ден)"
       tag_settings: "Етикети"
       watched_tags: "Наблюдавани"
@@ -747,7 +747,6 @@ bg:
       admin_delete: "Изтрий"
       users: "Потребители"
       muted_users: "Заглушен"
-      muted_users_instructions: "Забрани всички съобщения от тези потребители"
       tracked_topics_link: "Покажи "
       automatically_unpin_topics: "Автоматично отключете темите когато стигнете най-долу на форума."
       apps: "Приложения"
@@ -833,11 +832,11 @@ bg:
         instructions: "Не е публичен"
         ok: "Ще Ви изпратим имейл за потвърждение."
         invalid: "Моля, въведете валиден имейл адрес"
-        authenticated: "Вашият имейл беше потвърден от {{provider}}."
+        authenticated: "Вашият имейл беше потвърден от %{provider}."
         frequency_immediately: "Ще ви изпратим мейл веднага, ако не сте прочели поста за който сме ви писали."
         frequency:
           one: "Ние ще ви изпратим имейл само ако не сме ви виждали през последната минута."
-          other: "Ние ще ви изпратим имейл само ако не сме ви виждали през последните {{count}} минути."
+          other: "Ние ще ви изпратим имейл само ако не сме ви виждали през последните %{count} минути."
       associated_accounts:
         revoke: "Анулирай"
         cancel: "Отмени"
@@ -850,9 +849,9 @@ bg:
       username:
         title: "Потребителско име"
         instructions: "уникално, без интервали"
-        short_instructions: "Хора могат да Ви споменават като @{{username}}"
+        short_instructions: "Хора могат да Ви споменават като @%{username}"
         available: "Вашето потребителско име е свободно"
-        not_available: "Не е налично. Пробвайте с {{suggestion}}?"
+        not_available: "Не е налично. Пробвайте с %{suggestion}?"
         not_available_no_suggestion: "Не е наличен!"
         too_short: "Потребителското име е твърде кратко"
         too_long: "Потребителското име е твърде дълго"
@@ -929,14 +928,14 @@ bg:
         user: "Поканени потребители"
         truncated:
           one: "Показване на първата покана."
-          other: "Показване на пъврите {{count}} покани."
+          other: "Показване на пъврите %{count} покани."
         redeemed: "Взети покани"
         redeemed_tab: "Взети"
-        redeemed_tab_with_count: "Взети ({{count}})"
+        redeemed_tab_with_count: "Взети (%{count})"
         redeemed_at: "Взети"
         pending: "Изчакващи покани"
         pending_tab: "Чакащи"
-        pending_tab_with_count: "Чакащи ({{count}})"
+        pending_tab_with_count: "Чакащи (%{count})"
         topics_entered: "Прегледани теми"
         posts_read_count: "Прочетени публикации"
         expired: "Тази покана е изтекла."
@@ -949,10 +948,12 @@ bg:
         time_read: "Време за прочитане"
         days_visited: "Дни Посетена"
         account_age_days: "Период на акаунта в дни"
+        links_tab: "Връзки"
+        link_created_at: "Създадени"
+        link_groups: Групи
         create: "Изпрати покана"
         generate_link: "Копирай Връзката-Покана"
         bulk_invite:
-          text: "Групова покана чрез файл"
           success: "Файлът е качен успешно. Ще бъдете информирани чрез съобщение, когато процесът завърши."
       password:
         title: "Парола"
@@ -1030,7 +1031,7 @@ bg:
       desc:
         network: "Моля проверете вашата връзка"
         network_fixed: "Изглежда се е върнала."
-        server: "Грешка: {{status}}"
+        server: "Грешка: %{status}"
         forbidden: "Няматe права да виждате това."
         not_found: "Опаа, приложението опита да зареди URL, който не съществува."
         unknown: "Нещо се обърка."
@@ -1081,8 +1082,8 @@ bg:
       value_prop: "Когато създадете профил, ще отбелязваме това, което сте чели, така че да можете да продължите от там, откъдето сте спрели. Можете също така да получавате известия тук и по електронната поща, когато има нови мнения. Също така ще може да маркирате любимите си публикации."
     summary:
       enabled_description: "В момента гледате резюме на тази тема: най-интересните публикации определени от общността."
-      description: "Има <b>{{replyCount}}</b> отговора."
-      description_time: "В момента има <b>{{replyCount}}</b> отговора прочетени за <b>{{readingTime}} минути</b>."
+      description: "Има <b>%{replyCount}</b> отговора."
+      description_time: "В момента има <b>%{replyCount}</b> отговора прочетени за <b>%{readingTime} минути</b>."
       enable: "Обобщи Тази Тема"
       disable: "Покажи всички публикации"
     deleted_filter:
@@ -1094,8 +1095,8 @@ bg:
       title: "Съобщение"
       invite: "Поканете други ..."
       leave_message: "Сигурни ли сте, че искате да оставите това съобщение?"
-      remove_allowed_user: "Сигурни ли сте, че искате да премахнете {{name}} от това съобщение?"
-      remove_allowed_group: "Сигурни ли сте, че искате да премахнете {{name}} от това съобщение?"
+      remove_allowed_user: "Сигурни ли сте, че искате да премахнете %{name} от това съобщение?"
+      remove_allowed_group: "Сигурни ли сте, че искате да премахнете %{name} от това съобщение?"
     email: "Имейл"
     username: "Потребителско име"
     last_seen: "Видяно"
@@ -1104,7 +1105,7 @@ bg:
     trust_level: "Ниво на доверие"
     search_hint: "потребителско име, имейл или IP адрес"
     create_account:
-      disclaimer: "С регистрацията си се съгласявате с <a href='{{privacy_link}}' target='blank'>политиката за повелителност</a> и <a href='{{tos_link}}' target='blank'>условията за ползване</a>."
+      disclaimer: "С регистрацията си се съгласявате с <a href='%{privacy_link}' target='blank'>политиката за повелителност</a> и <a href='%{tos_link}' target='blank'>условията за ползване</a>."
       title: "Създай нов профил"
       failed: "Нещо се случи, вероятно вече има регистрация с този имейл адрес, опитайте с линка за забравена парола."
     forgot_password:
@@ -1144,13 +1145,13 @@ bg:
       awaiting_activation: "Вашият акаунт изчаква активация, използвайте линка за забравена парола, за да изпратите друг имейл за активация."
       awaiting_approval: "Вашия акаунт все още не е одобрен от администратора. Ще получите известие, когато това се случи."
       requires_invite: "Съжаляваме, този форум е достъпен само с покани."
-      not_activated: "Не може да влезете. Изпратихме имейл за активация на <b>{{sentTo}}</b>. Моля, следвайте инструкциите в имейла, за да активирате профила."
+      not_activated: "Не може да влезете. Изпратихме имейл за активация на <b>%{sentTo}</b>. Моля, следвайте инструкциите в имейла, за да активирате профила."
       not_allowed_from_ip_address: "Не може да влезете от този IP адрес."
       admin_not_allowed_from_ip_address: "Не може да влезете като админ от този IP адрес."
       resend_activation_email: "Натиснете тук, за да изпратите повторен имейл за активация."
       omniauth_disallow_totp: "Профилът ви има активирано удостоверяване с два фактора. Моля, влезте с паролата си."
       resend_title: "Изпрати отново активационен имейл "
-      sent_activation_email_again: "Изпратихме имейл за активация на <b>{{currentEmail}}</b>. Може да изминат няколко минути докато пристигне. Не забравяйте да проверите Вашата спам папка."
+      sent_activation_email_again: "Изпратихме имейл за активация на <b>%{currentEmail}</b>. Може да изминат няколко минути докато пристигне. Не забравяйте да проверите Вашата спам папка."
       to_continue: "Моля влезте"
       preferences: "Трябва да сте влезли, за да можете да променяте потребителските си настройки."
       forgot: "Не си спомням подробности за профила ми"
@@ -1217,9 +1218,9 @@ bg:
       drafts_offline: "чернови офлайн"
       error:
         title_missing: "Заглавието е задължително"
-        title_too_short: "Заглавието трябва да е минимум {{min}} символа"
-        title_too_long: "Заглавието не може да е повече от {{max}} символа"
-        post_length: "Публикацията трябва да е най-малко {{min}} символа."
+        title_too_short: "Заглавието трябва да е минимум %{min} символа"
+        title_too_long: "Заглавието не може да е повече от %{max} символа"
+        post_length: "Публикацията трябва да е най-малко %{min} символа."
         category_missing: "Трябва да изберете категория"
         tags_missing: "Трябва да изберете поне %{count} етикети."
       save_edit: "Запази редакцията"
@@ -1278,12 +1279,12 @@ bg:
       empty: "Няма намерени нотификации."
       reviewable_items: "точки, изискващи преглед"
       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}}'
-        linked: '{{username}} прикачи вашата публикация от "{{topic}}" - {{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}'
+        linked: '%{username} прикачи вашата публикация от "%{topic}" - %{site_title}'
         confirm_title: "Включени известявания - %{site_title}"
         confirm_body: "Успех! Известяването е включено."
       titles:
@@ -1295,9 +1296,9 @@ bg:
       from_my_computer: "От моето устройство"
       from_the_web: "От мрежата"
       remote_tip: "линк към изображение"
-      remote_tip_with_attachments: "връзка към картинка или файл {{authorized_extensions}}"
+      remote_tip_with_attachments: "връзка към картинка или файл %{authorized_extensions}"
       local_tip: "изберете изображения от вашето устройство"
-      local_tip_with_attachments: "изберете картинки или файлове от вашето устройство {{authorized_extensions}}"
+      local_tip_with_attachments: "изберете картинки или файлове от вашето устройство %{authorized_extensions}"
       hint: "(за да ги качите също можете да ги провлачите и пуснете в редактора)"
       hint_for_supported_browsers: "вие можете винаги да привлачите или поставите картинки върху вашия редактора"
       uploading: "Качване "
@@ -1317,16 +1318,16 @@ bg:
       no_results: "Няма резултати "
       no_more_results: "Не са намерени резултати."
       searching: "Търсене ... "
-      post_format: "#{{post_number}} от {{username}} "
-      results_page: "Резултати от търсенето на '{{term}}'"
+      post_format: "#%{post_number} от %{username} "
+      results_page: "Резултати от търсенето на '%{term}'"
       more_results: "Има повече резултати. Моля, прецизирайте търсенето си."
       or_search_google: "Или вместо това опитайте търсене с Гугъл:"
       search_google: "Опитайте вместо това търсене с Гугъл:"
       search_google_button: "Google"
       search_google_title: "Търсене в този сайт"
       context:
-        user: "Търсете публикация от @{{username}}"
-        category: "Търсене за категория #{{category}}"
+        user: "Търсете публикация от @%{username}"
+        category: "Търсене за категория #%{category}"
         topic: "Търсете тази тема"
         private_messages: "Търси съобщения"
       advanced:
@@ -1377,7 +1378,7 @@ bg:
         choose_new_category: "Избери нова категория за тези теми:"
         selected:
           one: "Вие сте избрали <b>%{count}</b> тема."
-          other: "Вие сте избрали <b>{{count}}</b> теми."
+          other: "Вие сте избрали <b>%{count}</b> теми."
         change_tags: "Замени етикетите"
         append_tags: "Добави етикетите"
         choose_new_tags: "Избери нови етикети за тези теми:"
@@ -1390,7 +1391,7 @@ bg:
         posted: "Все още не сте публикували нито една тема."
         latest: "Няма повече теми в Последни. Това е тъжно."
         bookmarks: "Все още нямате теми в Отметки."
-        category: "Няма теми в категория {{category}}."
+        category: "Няма теми в категория %{category}."
         top: "Няма топ теми."
         educate:
           new: '<p>Непрочетените теми се появяват тук.</p><p>По подразбиране темите се считат за непрочетени и ще показват бройката <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"> нови</span> ако са създадени през последните 2 дни.</p><p> Моля посетете вашите <a href="%{userPrefsUrl}">настройки</a> за да промените това.</p>'
@@ -1403,7 +1404,7 @@ bg:
         read: "Няма повече прочетени теми."
         new: "Няма повече нови теми."
         unread: "Няма повече непрочетени теми."
-        category: "Няма повече теми в {{category}}"
+        category: "Няма повече теми в %{category}"
         top: "Няма повече топ теми."
         bookmarks: "Няма теми в Отметки"
     topic:
@@ -1426,10 +1427,10 @@ bg:
       unread: "непрочетено"
       new_topics:
         one: "%{count} нова тема"
-        other: "{{count}} нови теми"
+        other: "%{count} нови теми"
       unread_topics:
         one: "%{count} непрочетена тема"
-        other: "{{count}} непрочетени теми"
+        other: "%{count} непрочетени теми"
       title: "Тема"
       invalid_access:
         title: "Темата е частна"
@@ -1443,22 +1444,22 @@ bg:
         description: "Темата не може да бъде открита. Възможно ли е да е премахната от модератор?"
       total_unread_posts:
         one: "имате %{count} непрочетено мнение в тази тема"
-        other: " Вие имате {{count}} непрочетени мнения в тази тема"
+        other: " Вие имате %{count} непрочетени мнения в тази тема"
       unread_posts:
         one: "Вие имате %{count} непрочетено старо мнение в тази тема"
-        other: "Вие имате {{count}} непрочетени стари мнения в тази тема"
+        other: "Вие имате %{count} непрочетени стари мнения в тази тема"
       new_posts:
         one: "има %{count} нова публикация в темата от последното Ви посещение на темата"
-        other: "от последното Ви посещение в темата до сега има {{count}} нови публикации"
+        other: "от последното Ви посещение в темата до сега има %{count} нови публикации"
       likes:
         one: "има %{count} харесване в тази тема"
-        other: "има {{count}} харесвания в тази тема"
+        other: "има %{count} харесвания в тази тема"
       back_to_list: "Назад към Списъка с теми"
       options: "Настройки на темата"
       show_links: "покажи връзките в тази тема"
       toggle_information: "Показване / скриване на подробна информация за дадена тема "
-      read_more_in_category: "Искате да прочетете повече ? Разгледайте други теми в {{catLink}} или {{latestLink}}."
-      read_more: "Искате да прочетете повече ? {{catLink}} или {{latestLink}}."
+      read_more_in_category: "Искате да прочетете повече ? Разгледайте други теми в %{catLink} или %{latestLink}."
+      read_more: "Искате да прочетете повече ? %{catLink} или %{latestLink}."
       read_more_MF: "Има { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 непрочетено</a> } other { <a href='{basePath}/unread'># непрочетени </a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 нова </a> тема} other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># теми </a>} } или {CATEGORY, select, true {потърси други теми в {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Прегледай всички категории
       view_latest_topics: виж последните теми
@@ -1576,25 +1577,25 @@ bg:
         success_message: "Успешно сигнализирахте за тази тема."
       feature_topic:
         title: "Фокусирай тази тема"
-        pin: "Тази тема да се появява в горната част на {{categoryLink}} категорията докато"
-        confirm_pin: "Вие вече имате {{count}} заковани теми. Прекалено много заковани теми може да объркат новите и анонимни потребители. Сигурни ли сте че искате да заковете още една тема към тази категория ?"
-        unpin: "Премахни тази тема от началото на категория {{categoryLink}}"
-        unpin_until: "Премахни тази тема от горната част на {{categoryLink}} категорията или изчакай докато <strong>%{until}</strong>."
+        pin: "Тази тема да се появява в горната част на %{categoryLink} категорията докато"
+        confirm_pin: "Вие вече имате %{count} заковани теми. Прекалено много заковани теми може да объркат новите и анонимни потребители. Сигурни ли сте че искате да заковете още една тема към тази категория ?"
+        unpin: "Премахни тази тема от началото на категория %{categoryLink}"
+        unpin_until: "Премахни тази тема от горната част на %{categoryLink} категорията или изчакай докато <strong>%{until}</strong>."
         pin_note: "Потребителите могат да отковат тази тема индивидуално само за тях"
         pin_validation: "Необходимо е да се избере дата, за да може да се закачи темата."
-        not_pinned: "Няма закачени теми в {{categoryLink}}."
+        not_pinned: "Няма закачени теми в %{categoryLink}."
         already_pinned:
-          one: "Темата е закачена в {{categoryLink}}: <strong class='badge badge-notification unread'>е %{count}</strong>"
-          other: "Темите закачени в {{categoryLink}}: <strong class='badge badge-notification unread'>са {{count}}</strong>"
+          one: "Темата е закачена в %{categoryLink}: <strong class='badge badge-notification unread'>е %{count}</strong>"
+          other: "Темите закачени в %{categoryLink}: <strong class='badge badge-notification unread'>са %{count}</strong>"
         pin_globally: "Тази тема да се появява в горната част на всички списъци докато"
-        confirm_pin_globally: "Вие вече имате {{count}} глобално заковани теми. Прекалено много заковани теми може да объркат новите и анонимни потребители. Сигурни ли сте че искате да заковете още една тема глобално към тази категория ?"
+        confirm_pin_globally: "Вие вече имате %{count} глобално заковани теми. Прекалено много заковани теми може да объркат новите и анонимни потребители. Сигурни ли сте че искате да заковете още една тема глобално към тази категория ?"
         unpin_globally: "Премахни тази тема от началото на списъците с теми."
         unpin_globally_until: "Премахни тази тема от горната част на списъка с теми или изчакай докато <strong>%{until}</strong>."
         global_pin_note: "Потребителите могат да отговат темата индивидуално само за тях."
         not_pinned_globally: "Няма никакви закачени теми."
         already_pinned_globally:
           one: "Темата закачена глобално е: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Темите закачени глобално: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Темите закачени глобално: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Направете тази тема на банер който ще присъства в началото на всички страници"
         remove_banner: "Премахнете този банер който се появява в началото на всички страници"
         banner_note: "Потребителите могат да откажат банера като го затворят. Само една тема може да бъде банер в едно и също време."
@@ -1622,14 +1623,14 @@ bg:
         to_topic_username: "Въведохте потребителско име. Ние ще изпратим напомняне с връзка която го кани в тази тема."
         to_username: "Въведете потребителското име на човека който искате да поканите. Ние ще му изпратим напомняне с връзка която го кани в тази тема."
         email_placeholder: "name@example.com"
-        success_email: "Изпратихте покана на <b>{{emailOrUsername}}</b>. Ще Ви уведомим, когато поканата е използвана. Проверявайте раздела с покани на Вашата потребителска страница, за да следите на Вашите покани."
+        success_email: "Изпратихте покана на <b>%{emailOrUsername}</b>. Ще Ви уведомим, когато поканата е използвана. Проверявайте раздела с покани на Вашата потребителска страница, за да следите на Вашите покани."
         success_username: "Ние поканихме този потребител да се присъедини темата."
         error: "Съжаляваме, не можем да поканим този човек. Вероятно вече е потребител? ( Поканите са ограничени)"
       login_reply: "Влезте, за да отговорите "
       filters:
         n_posts:
           one: "%{count} публикация"
-          other: "{{count}} публикации"
+          other: "%{count} публикации"
         cancel: "Премахни филтъра"
       move_to:
         title: "Премести в"
@@ -1643,14 +1644,14 @@ bg:
         error: "Възникна грешка при преместването на публикацията в нова тема."
         instructions:
           one: "На път сте да създадете нова тема и да я запълните с публикацията която избрахте."
-          other: "На път сте да създадете нова тема и да я запълните с <b>{{count}}</b> избрани публикации."
+          other: "На път сте да създадете нова тема и да я запълните с <b>%{count}</b> избрани публикации."
       merge_topic:
         title: "Преместете в съществуваща тема."
         action: "преместете в съществуваща тема."
         error: "Възникна грешка при преместване мнения в тази тема."
         instructions:
           one: "Моля изберете тема в която искате да преместите тази публикация. "
-          other: "Моля, изберете тема, в която искате да преместите тези <b>{{count}}</b> публикации. "
+          other: "Моля, изберете тема, в която искате да преместите тези <b>%{count}</b> публикации. "
       move_to_new_message:
         radio_label: "Ново Съобщение"
       publish_page:
@@ -1666,7 +1667,7 @@ bg:
         instructions: "Моля, изберете ново заглавие на темата. Публикациите в темата ще бъдат актуализирани, за да имат една и съща времева разлика."
       multi_select:
         select: "избери"
-        selected: "избрани ({{count}})"
+        selected: "избрани (%{count})"
         select_post:
           label: "избери"
         select_replies:
@@ -1677,13 +1678,13 @@ bg:
         deselect_all: "премахване на всички "
         description:
           one: Вие избрахте <b>%{count}</b> публикация.
-          other: "Вие избрахте <b>{{count}}</b> публикации. "
+          other: "Вие избрахте <b>%{count}</b> публикации. "
     post:
       edit_reason: "Причина: "
-      post_number: "публикация {{number}} "
+      post_number: "публикация %{number} "
       last_edited_on: "публикацията последно е редактирана на "
       reply_as_new_topic: "Отговори като свързана тема"
-      continue_discussion: "Продължаване на дискусията от {{postLink}}: "
+      continue_discussion: "Продължаване на дискусията от %{postLink}: "
       follow_quote: "отиди на цитираната публикация "
       show_full: "Покажи цялата публикация"
       deleted_by_author:
@@ -1692,23 +1693,24 @@ bg:
       expand_collapse: "разшири/намали "
       gap:
         one: "покажи %{count} скрит отговор"
-        other: "покажи {{count}} скрити отговора"
+        other: "покажи %{count} скрити отговора"
       unread: "Публикацията е непрочетена"
       has_replies:
-        one: "{{count}} Отговор"
-        other: "{{count}} Отговори"
+        one: "%{count} Отговор"
+        other: "%{count} Отговори"
       has_likes_title:
         one: "%{count} човек харесва тази публикация"
-        other: "{{count}} човека харесват тази публикация"
+        other: "%{count} човека харесват тази публикация"
       has_likes_title_only_you: "вие харесахте този пост"
       has_likes_title_you:
         one: "вие и още %{count} човек сте харесали този пост"
-        other: "вие и {{count}} човека сте харесали този пост"
+        other: "вие и %{count} човека сте харесали този пост"
       errors:
         create: "При създаването на Вашата публикация се получи грешка. Моля, опитайте отново."
         edit: "Съжаляваме, възникна грешка при редактирането на публикацията. Моля, опитайте отново. "
         upload: "Съжаляваме, възникна грешка при качването на този файл. Моля, опитайте отново."
         too_many_uploads: "Съжаляваме, не можете да качвате повече от един файл наведнъж."
+        upload_not_authorized: "Съжеляваме, Файлът е забранен за качване (разрешени разширения : %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Съжаляваме, новите потребители не могат да качват снимки."
         attachment_upload_not_allowed_for_new_user: "Съжаляваме, новите потребители не могат да прикачват файлове."
         attachment_download_requires_login: "Съжаляваме, трябва да сте логнат, за да може да сваляте прикачените файлове."
@@ -1980,7 +1982,7 @@ bg:
       unlisted:
         help: "Тази тема е скрита; не се появява в списъка с теми и може да бъде достъпна само с директен линк."
     posts: "Публикации"
-    posts_long: "има {{number}} публикации в тази тема"
+    posts_long: "има %{number} публикации в тази тема"
     posts_likes_MF: |
       Тази тема има {count, plural, one {1 reply} other {# replies}} {ratio, select,
       low {with a high like to post ratio}
@@ -1998,14 +2000,14 @@ bg:
     likes_lowercase:
       one: "харесване"
       other: "харесвания"
-    likes_long: "има {{number}} харесвания в тази тема"
+    likes_long: "има %{number} харесвания в тази тема"
     users: "Потребители"
     users_lowercase:
       one: "потребител"
       other: "потребители"
     category_title: "Категория"
     history: "История"
-    changed_by: "от {{author}}"
+    changed_by: "от %{author}"
     raw_email:
       title: "Входяща поща"
       not_available: "Не е наличен!"
@@ -2017,33 +2019,33 @@ bg:
         title: "Последни"
         title_with_count:
           one: "Последен (%{count})"
-          other: "Последни ({{count}})"
+          other: "Последни (%{count})"
         help: "теми със скорошни публикации"
       read:
         title: "Прочети"
         help: "прочетени теми по реда на прочитане"
       categories:
         title: "Категории"
-        title_in: "Категория - {{categoryName}}"
+        title_in: "Категория - %{categoryName}"
         help: "всички теми групирани по категория"
       unread:
         title: "Непрочетени"
         title_with_count:
           one: "Непрочетен (%{count})"
-          other: "Непрочетени ({{count}})"
+          other: "Непрочетени (%{count})"
         help: "теми които гледате или следите, с непрочетени публикации"
         lower_title_with_count:
           one: "%{count} непрочетен"
-          other: "{{count}} непрочетени"
+          other: "%{count} непрочетени"
       new:
         lower_title_with_count:
           one: "%{count} нов"
-          other: "{{count}} нови"
+          other: "%{count} нови"
         lower_title: "нови"
         title: "Нов"
         title_with_count:
           one: "Нов (%{count})"
-          other: "Нови ({{count}})"
+          other: "Нови (%{count})"
         help: "теми създадени през последните няколко дни"
       posted:
         title: "Моите публикации"
@@ -2052,11 +2054,11 @@ bg:
         title: "Отметки"
         help: "теми, които сте отбелязали в Отметки"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "последни теми в категория {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "последни теми в категория %{categoryName}"
       top:
         title: "Топ"
         help: "Най-активни теми в последната година, месец, седмица или ден"
@@ -2374,7 +2376,7 @@ bg:
           label: "Качи"
           title: "Качи бекъп за тази инстанция"
           uploading: "Качва се..."
-          error: "Появи се грешка при качването на '{{filename}}': {{message}}"
+          error: "Появи се грешка при качването на '%{filename}': %{message}"
         operations:
           is_running: "В момента се изпълнява задача..."
           failed: "Задачата се провали. Моля проверете логовете."
@@ -2723,8 +2725,8 @@ bg:
           title: "Разкрий имейла на този потребител"
           text: "Покажи"
       user:
-        suspend_failed: "Нещо се обърка при отстраняването на този потребител {{error}}"
-        unsuspend_failed: "Нещо се обърка при отстраняването на този потребител {{error}} "
+        suspend_failed: "Нещо се обърка при отстраняването на този потребител %{error}"
+        unsuspend_failed: "Нещо се обърка при отстраняването на този потребител %{error} "
         suspend_duration: "За колко време потребителят ще бъде отстранен?"
         suspend_reason_label: "Защо отстранявате? Този текст <b>ще бъде видим за всички</b> на профилната страница на потребителя и ще се показва на потребителя, когато направи опит да се логне. Бъдете кратки."
         suspend_reason: "Причина"
@@ -3000,6 +3002,7 @@ bg:
         title: "Емотикони "
         help: "Добави нови емотикони, които ще бъдат достъпни до всички. (Съвет: Може да дръпнете и пуснете много файлове наведнъж). "
         add: "Добави нова емотикона "
+        uploading: "Качва се..."
         name: "Име "
         group: "Група"
         image: "Изображение "
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 45166458c3..70d0af662d 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -24,8 +24,8 @@ bs_BA:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}} hiljada"
-        millions: "{{number}} miliona"
+        thousands: "%{number} hiljada"
+        millions: "%{number} miliona"
     dates:
       time: "HH: mm"
       timeline_date: "MMM YYYY"
@@ -247,12 +247,12 @@ bs_BA:
     weekly: "sedmično"
     every_month: "svaki mjesec"
     every_six_months: "svakih šest mjeseci"
-    max_of_count: "maksimalno {{count}}"
+    max_of_count: "maksimalno %{count}"
     alternation: "ili"
     character_count:
-      one: "{{count}} karakter"
-      few: "{{count}} karaktera"
-      other: "{{count}} karaktera"
+      one: "%{count} karakter"
+      few: "%{count} karaktera"
+      other: "%{count} karaktera"
     related_messages:
       title: "Povezane Poruke"
       see_all: 'Prikaži <a href="%{path}">sve poruke</a> od @ %{username} ...'
@@ -308,17 +308,17 @@ bs_BA:
         yes_value: "Da, otkaži"
         no_value: "Ne, sačuvaj"
     topic_count_latest:
-      one: "Pogledaj {{count}} novu ili ažuriranu temu"
-      few: "Pogledaj {{count}} nove ili ažurirane teme"
-      other: "Pogledaj {{count}} nove ili ažurirane tema"
+      one: "Pogledaj %{count} novu ili ažuriranu temu"
+      few: "Pogledaj %{count} nove ili ažurirane teme"
+      other: "Pogledaj %{count} nove ili ažurirane tema"
     topic_count_unread:
-      one: "Pogledaj {{count}} nepročitanu temu"
-      few: "Pogledaj {{count}} nepročitane teme"
-      other: "Pogledaj {{count}} nepročitanih tema"
+      one: "Pogledaj %{count} nepročitanu temu"
+      few: "Pogledaj %{count} nepročitane teme"
+      other: "Pogledaj %{count} nepročitanih tema"
     topic_count_new:
-      one: "Pogledaj {{count}} novu temu"
-      few: "Pogledaj {{count}} nove teme"
-      other: "Pogledaj {{count}} novih tema"
+      one: "Pogledaj %{count} novu temu"
+      few: "Pogledaj %{count} nove teme"
+      other: "Pogledaj %{count} novih tema"
     preview: "pregledaj"
     cancel: "otkaži"
     save: "Spremiti promjene"
@@ -326,7 +326,7 @@ bs_BA:
     saved: "Spremljeno!"
     upload: "Učitaj"
     uploading: "Učitava se..."
-    uploading_filename: "Učitavanje {{filename}}"
+    uploading_filename: "Učitavanje %{filename}"
     clipboard: "clipboard"
     uploaded: "Učitano!"
     pasting: "Lijepim..."
@@ -380,7 +380,7 @@ bs_BA:
         optional: "Možete tražiti ova da sprijećite ostale da ga pregledaju"
         required: "VI morate tvrditi stavari prije ih morate cijeniti"
         claimed_by_you: "Vi ste tvrdili ovu stvar i sad ju možete pregledati "
-        claimed_by_other: "Ovu stavku može revidirati samo korisnik<b>{{username}}</b>"
+        claimed_by_other: "Ovu stavku može revidirati samo korisnik<b>%{username}</b>"
       claim:
         title: "tvrdite ovu temu?"
       unclaim:
@@ -400,8 +400,8 @@ bs_BA:
       view_pending: "pogled na čekanju"
       topic_has_pending:
         one: "Ova tema ima <b>%{count}</b> post čekanje odobrenja"
-        few: "Ova tema ima <b>{{count}}</b> postove na čekanju za odobrenje"
-        other: "Ova tema ima <b>{{count}}</b> postova na čekanju za odobrenje"
+        few: "Ova tema ima <b>%{count}</b> postove na čekanju za odobrenje"
+        other: "Ova tema ima <b>%{count}</b> postova na čekanju za odobrenje"
       title: "Pregled"
       topic: "Tema:"
       filtered_topic: "Filtrirali ste sadržaj koji se može pregledati u jednoj temi."
@@ -418,21 +418,21 @@ bs_BA:
         fields: "Polja"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} (ukupno {{count}} flag)"
-          few: "{{agreed}}, {{disagreed}}, {{ignored}} (ukupno {{count}} zastavica)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} (ukupno {{count}}kazni )"
+          one: "%{agreed}, %{disagreed}, %{ignored} (ukupno %{count} flag)"
+          few: "%{agreed}, %{disagreed}, %{ignored} (ukupno %{count} zastavica)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (ukupno %{count}kazni )"
         agreed:
-          one: "{{count}}% slaže"
-          few: "{{count}}% slaže"
-          other: "{{count}}% se slaže"
+          one: "%{count}% slaže"
+          few: "%{count}% slaže"
+          other: "%{count}% se slaže"
         disagreed:
-          one: "{{count}}% se ne slažu"
-          few: "{{count}}% se ne slažu"
-          other: "{{count}}% se ne slažu"
+          one: "%{count}% se ne slažu"
+          few: "%{count}% se ne slažu"
+          other: "%{count}% se ne slažu"
         ignored:
-          one: "{{count}}% ignore"
-          few: "{{count}}% ignore"
-          other: "{{count}}% ignorišu"
+          one: "%{count}% ignore"
+          few: "%{count}% ignore"
+          other: "%{count}% ignorišu"
       topics:
         topic: "Topic"
         reviewable_count: "Broji"
@@ -442,12 +442,12 @@ bs_BA:
         details: "detalji"
         unique_users:
           one: "%{count} user"
-          few: "{{count}} users"
-          other: "{{count}}korisnika "
+          few: "%{count} users"
+          other: "%{count}korisnika "
       replies:
         one: "%{count} reply"
-        few: "{{count}} replies"
-        other: "{{count}}odgovora "
+        few: "%{count} replies"
+        other: "%{count}odgovora "
       edit: "Izmijeni"
       save: "Sačuvaj"
       cancel: "Otkaži"
@@ -510,23 +510,23 @@ bs_BA:
         description: "Primili smo Vaš novi post ali on treba biti odobren od strane moderatora prije nego bude javno dostupan. Molimo za strpljenje."
         pending_posts:
           one: "Imate <strong>%{count}</strong> poruku na čekanju."
-          few: "Imate <strong>{{count}}</strong> na čekanju."
-          other: "Imate <strong>{{count}}</strong> na čekanju."
+          few: "Imate <strong>%{count}</strong> na čekanju."
+          other: "Imate <strong>%{count}</strong> na čekanju."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> je objavio/la <a href='{{topicUrl}}'>temu</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Vi</a> ste objavili <a href='{{topicUrl}}'>temu</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> je odgovorio/la na objavu <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Vi</a> ste odgovorili na objavu <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> je odgovorio/la na <a href='{{topicUrl}}'>temu</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>You</a> replied to <a href='{{topicUrl}}'>the topic</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> je spomenuo/la <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "7<a href='{{user1Url}}'>{{user}}</a> je spomenuo/la<a href='{{user2Url}}'>vas</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Vi</a> ste spomenuli <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Objavio <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Objavili<a href='{{userUrl}}'>vi</a>"
-      sent_by_user: "Poslao <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Poslali <a href='{{userUrl}}'>vi</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> je objavio/la <a href='%{topicUrl}'>temu</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Vi</a> ste objavili <a href='%{topicUrl}'>temu</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> je odgovorio/la na objavu <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Vi</a> ste odgovorili na objavu <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> je odgovorio/la na <a href='%{topicUrl}'>temu</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>You</a> replied to <a href='%{topicUrl}'>the topic</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> je spomenuo/la <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "7<a href='%{user1Url}'>%{user}</a> je spomenuo/la<a href='%{user2Url}'>vas</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Vi</a> ste spomenuli <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Objavio <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Objavili<a href='%{userUrl}'>vi</a>"
+      sent_by_user: "Poslao <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Poslali <a href='%{userUrl}'>vi</a>"
     directory:
       filter_name: "filtiraj korisnike"
       title: "Korisnici"
@@ -762,7 +762,7 @@ bs_BA:
     user_fields:
       none: "(odaberi opciju)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profil"
       mute: "Mutiraj"
       edit: "Uredi Postavke"
@@ -836,12 +836,12 @@ bs_BA:
       enable_defer: "Omogući odlaganje za označavanje tema nepročitanih"
       change: "promjeni"
       featured_topic: "Istaknuta tema"
-      moderator: "{{user}} je moderator"
-      admin: "{{user}} je admin"
+      moderator: "%{user} je moderator"
+      admin: "%{user} je admin"
       moderator_tooltip: "Ovaj korisnik je moderator"
       admin_tooltip: "Ovaj korisnik je admin"
       silenced_tooltip: "Ovaj korisnik je ušutkan"
-      suspended_notice: "Ovaj korisnike je suspendovan sve do {{date}}."
+      suspended_notice: "Ovaj korisnike je suspendovan sve do %{date}."
       suspended_permanently: "Ovaj korisnik je suspendovan."
       suspended_reason: "Razlog: "
       github_profile: "Github"
@@ -854,7 +854,7 @@ bs_BA:
           Isključene teme (Muted topics) i kategorije nisu uključeni u ovim e-mailovima.
         individual: "Šalji e-mail za svaku novu objavu"
         individual_no_echo: "Šalji e-mail za svaki novu objavu izuzev vlastite"
-        many_per_day: "Pošalji mi e-mail za svaku novu objavu (od prilike {{dailyEmailEstimate}} puta po danu)"
+        many_per_day: "Pošalji mi e-mail za svaku novu objavu (od prilike %{dailyEmailEstimate} puta po danu)"
         few_per_day: "Pošalji mi e-mail za svaku novu objavu (od prilike 2 puta po danu)"
         warning: "Mejling lista način rada je uključen. Postavke email obavjesti su prepravljene."
       tag_settings: "Tagovi"
@@ -884,9 +884,7 @@ bs_BA:
       admin_delete: "Izbriši"
       users: "Korisnici"
       muted_users: "Utišani"
-      muted_users_instructions: "Odbij sve notifikacije od ovih korisnika."
       ignored_users: "Ignorisano"
-      ignored_users_instructions: "Potisnite sve postove i obavijesti tih korisnika."
       tracked_topics_link: "Show"
       automatically_unpin_topics: "Automatski otkači temu kada dođem do dna"
       apps: "Aplikacije"
@@ -939,11 +937,11 @@ bs_BA:
         disable: "Onemogući"
         enable: "Omogući"
         enable_long: "Omogućite rezervne kodove"
-        manage: "Upravljajte rezervnim kodovima. Imate <strong>preostale</strong> rezervne kodove <strong>{{count}}</strong> ."
+        manage: "Upravljajte rezervnim kodovima. Imate <strong>preostale</strong> rezervne kodove <strong>%{count}</strong> ."
         copy_to_clipboard: "Kopirati u clipboard"
         copy_to_clipboard_error: "Pogreška pri kopiranju podataka u međuspremnik"
         copied_to_clipboard: "Kopirano u međuspremnik"
-        remaining_codes: "Imate <strong>preostale</strong> rezervne kodove <strong>{{count}}</strong> ."
+        remaining_codes: "Imate <strong>preostale</strong> rezervne kodove <strong>%{count}</strong> ."
         use: "Koristi backup kod"
         enable_prerequisites: "Morate omogućiti primarni drugi faktor prije generiranja rezervnih kodova."
         codes:
@@ -1025,12 +1023,12 @@ bs_BA:
         instructions: "Nikada nije prikazan javnosti."
         ok: "Izgleda dobro. Poslat ćemo email sa potvrdom."
         invalid: "Molimo vas da unesete validnu email adresu."
-        authenticated: "Vaš email je ovjeren od strane {{provider}}."
+        authenticated: "Vaš email je ovjeren od strane %{provider}."
         frequency_immediately: "Slati ćemo vam e-mail obavijesti odmah na novo, ukoliko niste pročitali sadržaj koji smo vam prvobitno e-mailom poslali."
         frequency:
           one: "Poslaćemo vam email samo u slučaju da vas nismo vidjeli u zadnjoj minuti."
-          few: "Poslaćemo vam email samo u slučaju da vas nismo vidjeli u zadnje{{count}} minute."
-          other: "Poslaćemo vam email samo u slučaju da vas nismo vidjeli u zadnjih {{count}} minuta."
+          few: "Poslaćemo vam email samo u slučaju da vas nismo vidjeli u zadnje%{count} minute."
+          other: "Poslaćemo vam email samo u slučaju da vas nismo vidjeli u zadnjih %{count} minuta."
       associated_accounts:
         title: "Povezani računi"
         connect: "Poveži"
@@ -1050,9 +1048,9 @@ bs_BA:
       username:
         title: "Nadimak"
         instructions: "unikatno, bez tipke praznog prostora, kratko"
-        short_instructions: "Ljudi vas mogu spomenuti preko @{{username}}."
+        short_instructions: "Ljudi vas mogu spomenuti preko @%{username}."
         available: "Vaš nadimak je dostupan."
-        not_available: "Nije dostupan. Pokušaj {{suggestion}}?"
+        not_available: "Nije dostupan. Pokušaj %{suggestion}?"
         not_available_no_suggestion: "Nedostupno"
         too_short: "Vaše korisničko ime je prekratako."
         too_long: "Vaše korisničko ime je predugačko."
@@ -1072,11 +1070,11 @@ bs_BA:
         log_out_all: "Odjavite sve"
         active: "aktivan sada"
         not_you: "Ne vi?"
-        show_all: "Prikaži sve ({{count}})"
+        show_all: "Prikaži sve (%{count})"
         show_few: "Prikaži manje"
         was_this_you: "Jesi li to bio ti?"
         was_this_you_description: "Ako niste bili vi, preporučujemo vam da promijenite lozinku i odjavite se svuda."
-        browser_and_device: "{{browser}} na {{device}}"
+        browser_and_device: "%{browser} na %{device}"
         secure_account: "zaštiti moj račun"
         latest_post: "Poslednji ste objavili ..."
       last_posted: "Posljednja objava"
@@ -1156,21 +1154,20 @@ bs_BA:
         none: "Nema pozivnica za prikazati"
         truncated:
           one: "Prikaz prve pozivnice."
-          few: "Prikaz prvih {{count}} pozivnica."
-          other: "Prikaz prvih {{count}} pozivnica."
+          few: "Prikaz prvih %{count} pozivnica."
+          other: "Prikaz prvih %{count} pozivnica."
         redeemed: "Iskorištene pozivnice"
         redeemed_tab: "Iskorišteno"
-        redeemed_tab_with_count: "Iskorišteno ({{count}})"
+        redeemed_tab_with_count: "Iskorišteno (%{count})"
         redeemed_at: "Iskorišteno"
         pending: "Pozivnice na čekanju"
         pending_tab: "Na čekanju"
-        pending_tab_with_count: "Na čekanju ({{count}})"
+        pending_tab_with_count: "Na čekanju (%{count})"
         topics_entered: "Tema pregledano"
         posts_read_count: "Objava pregledano"
         expired: "Ova pozivnica je istekla."
         rescind: "Ukloni"
         rescinded: "Pozivnica uklonjena"
-        rescind_all: "Uklonite sve istekle pozive"
         rescinded_all: "Uklonjeni su svi istekli pozivi!"
         rescind_all_confirm: "Jeste li sigurni da želite ukloniti sve pozivnice koje su istekle?"
         reinvite: "Pošalji ponovno pozivnicu"
@@ -1181,13 +1178,17 @@ bs_BA:
         time_read: "Vrijeme čitanja"
         days_visited: "Dani posjete"
         account_age_days: "Starost korisničkog računa u danima"
-        create: "Pošalji Pozivnicu"
+        links_tab: "Linkovi"
+        link_created_at: "Kreiran"
+        link_groups: Grupa
+        create: "Email pozivnica"
         generate_link: "Kopiraj link za pozivnicu"
         link_generated: "Link pozivnice je uspješno generisan!"
         valid_for: "Link pozvinice je validan jedino za ovu e-mail adresu: %{email}"
+        invite_link:
+          success: "Link pozivnice je uspješno generisan!"
         bulk_invite:
           none: "Niste još uvijek nikoga pozvali. Šaljite individualne pozivnice, ili šaljite ka više osoba od jednom <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>učitavanjem liste iz CSV fajla</a>."
-          text: "Masovno pozovi koristeći fajl"
           success: "Fajl je uspješno učitan, dobit će te ukratko obavijest o progresu."
           error: "Oprostite, vaš fajl bi trebao biti u CSV formatu."
           confirmation_message: "Upravo ćete poslati e-poštom pozivnice svima u prenesenoj datoteci."
@@ -1286,7 +1287,7 @@ bs_BA:
       desc:
         network: "Molimo vas da provjerite vašu konekciju."
         network_fixed: "Izgleda da je konekcija uredu."
-        server: "Error code: {{status}}"
+        server: "Error code: %{status}"
         forbidden: "Niste ovlašteni da to pogledate."
         not_found: "Ups, aplikacija je pokušala učitati URL koji ne postoji."
         unknown: "Nešto je krenulo pogrešno."
@@ -1338,8 +1339,8 @@ bs_BA:
       value_prop: "Kada kreirate nalog, mi se sjećamo točno onoga što ste pročitali, tako da uvijek dolazite odmah tamo gdje ste stali. Također dobijate obavijesti, ovdje i putem e-maila, kad god vam netko odgovori. I možete dati like postovima da dijelite ljubav. : srce: \\ t"
     summary:
       enabled_description: "Trenutno gledate sažetak ove teme: objave koje drugi članovi smatraju kao najinteresantnije."
-      description: "Trenutno postoji <b>{{replyCount}}</b> odgovora."
-      description_time: "Trenutno postoje <b>{{replyCount}}</b> odgovora sa procijenjenim vremenom čitanja od <b>{{readingTime}} minuta</b>."
+      description: "Trenutno postoji <b>%{replyCount}</b> odgovora."
+      description_time: "Trenutno postoje <b>%{replyCount}</b> odgovora sa procijenjenim vremenom čitanja od <b>%{readingTime} minuta</b>."
       enable: "Napravi sažetak ove teme"
       disable: "Prikaži sve objave"
     deleted_filter:
@@ -1352,8 +1353,8 @@ bs_BA:
       invite: "Pozovi Ostale ..."
       edit: "Dodaj ili ukloni ..."
       leave_message: "Da li zaista želite da napustite ovu poruku?"
-      remove_allowed_user: "Da li zaista želite da uklonite {{name}} sa ove privatne poruke?"
-      remove_allowed_group: "Da li zaista želite da uklonite {{name}} sa ove poruke?"
+      remove_allowed_user: "Da li zaista želite da uklonite %{name} sa ove privatne poruke?"
+      remove_allowed_group: "Da li zaista želite da uklonite %{name} sa ove poruke?"
     email: "Email"
     username: "Ime"
     last_seen: "Viđen"
@@ -1362,7 +1363,7 @@ bs_BA:
     trust_level: "Nivo povjerenja"
     search_hint: "ime"
     create_account:
-      disclaimer: "Registracijom pristajete na <a href='{{privacy_link}}' target='blank'>politiku privatnosti</a> i <a href='{{tos_link}}' target='blank'>uvjete pružanja usluge</a> ."
+      disclaimer: "Registracijom pristajete na <a href='%{privacy_link}' target='blank'>politiku privatnosti</a> i <a href='%{tos_link}' target='blank'>uvjete pružanja usluge</a> ."
       title: "Kreiraj korisnički račun"
       failed: "Nešto je krenulo pogrešno, možda je ovaj email već iskorišten za registraciju, pokušajte sa Zaboravio šifru linkom"
     forgot_password:
@@ -1420,7 +1421,7 @@ bs_BA:
       awaiting_activation: "Vaš korisnički račun čeka aktivaciju, koristite Zaboravio šifru link kako bi dobili novi email sa aktivacijkim linkom."
       awaiting_approval: "Vaš korisnički račun nije još uvijek odobren od strane administratora. Dobiti ćete email kada bude zvanično aktiviran."
       requires_invite: "Žalimo, pristup ka forumu imaju samo članovi koji su primili pozivnicu."
-      not_activated: "Još uvijek se ne možete ulogovati. Prethodno smo vam poslali email za aktivaciju korisničkog računa na email <b>{{sentTo}}</b>. Molimo da tamo pratite instrukcije za aktivaciju vašeg računa."
+      not_activated: "Još uvijek se ne možete ulogovati. Prethodno smo vam poslali email za aktivaciju korisničkog računa na email <b>%{sentTo}</b>. Molimo da tamo pratite instrukcije za aktivaciju vašeg računa."
       not_allowed_from_ip_address: "Nije moguće se ulogovati sa te IP adrese."
       admin_not_allowed_from_ip_address: "Ne možete se logirati kao admin sa te IP adrese."
       resend_activation_email: "Kliknite ovdje kako bi poslali ponovo email za aktivaciju korisničkog računa."
@@ -1429,7 +1430,7 @@ bs_BA:
       change_email: "Promijeni email adresu"
       provide_new_email: "Unesite novu adresu i mi ćemo vam ponovo poslati email potvrde"
       submit_new_email: "Ažuriraj email adresu"
-      sent_activation_email_again: "We sent another activation email to you at <b>{{currentEmail}}</b>. It might take a few minutes for it to arrive; be sure to check your spam folder."
+      sent_activation_email_again: "We sent another activation email to you at <b>%{currentEmail}</b>. It might take a few minutes for it to arrive; be sure to check your spam folder."
       sent_activation_email_again_generic: "Poslali smo još jean e-mail za aktivaciju. Može potrajati nekoliko minuta da stigne; obavezno proverite svoj spam folder."
       to_continue: "Molimo vas ulogujte se"
       preferences: "Morate biti ulogovani kako bi mjenjali vaše postavke"
@@ -1485,22 +1486,22 @@ bs_BA:
     conditional_loading_section:
       loading: Obrađuje...
     category_row:
-      topic_count: "{{count}} tema u ovoj kategoriji"
+      topic_count: "%{count} tema u ovoj kategoriji"
     select_kit:
       default_header_text: Označava...
       no_content: Nije pronađen traženi pojam
       filter_placeholder: Pretraga...
       filter_placeholder_with_any: Pretražite ili kreirajte ...
-      create: "Kreiraj: '{{content}}'"
+      create: "Kreiraj: '%{content}'"
       max_content_reached:
-        one: "Možete označiti samo {{count}} predmet."
-        few: "Možete označiti samo {{count}} predmeta."
-        other: "Možete označiti samo {{count}} predmeta."
+        one: "Možete označiti samo %{count} predmet."
+        few: "Možete označiti samo %{count} predmeta."
+        other: "Možete označiti samo %{count} predmeta."
       min_content_not_reached:
-        one: "Označi bar {{count}} predmet."
-        few: "Označi bar {{count}} predmeta."
-        other: "Označi bar {{count}} predmeta."
-      invalid_selection_length: "Označeno mora biti najmanje {{count}} karaktera dugo."
+        one: "Označi bar %{count} predmet."
+        few: "Označi bar %{count} predmeta."
+        other: "Označi bar %{count} predmeta."
+      invalid_selection_length: "Označeno mora biti najmanje %{count} karaktera dugo."
     date_time_picker:
       from: Od
       to: Ka
@@ -1527,7 +1528,7 @@ bs_BA:
       default: Sopstveni emotikoni
     shared_drafts:
       title: "Dijeljene skice"
-      notice: "Ova tema je vidljiva onima koji mogu da vide <b>{{category}}</b> kategoriju."
+      notice: "Ova tema je vidljiva onima koji mogu da vide <b>%{category}</b> kategoriju."
       destination_category: "Kategorija destinacije"
       publish: "Objavi dijeljenu skicu"
       confirm_publish: "Da li ste sigurni da želite objaviti ovu skicu?"
@@ -1547,25 +1548,25 @@ bs_BA:
       similar_topics: "Tvoja tema je slična..."
       drafts_offline: "skicirano lokalno"
       edit_conflict: "uredi sukob"
-      group_mentioned_limit: "<b>Pažnja!</b> Spomenuli ste <a href='{{group_link}}'>{{group}}</a>, međutim ova grupa ima više članova nego što je administrator postavio granicu na spominjanje od maximalno {{max}} korisnika. Stoga niko neće biti obavješten. "
+      group_mentioned_limit: "<b>Pažnja!</b> Spomenuli ste <a href='%{group_link}'>%{group}</a>, međutim ova grupa ima više članova nego što je administrator postavio granicu na spominjanje od maximalno %{max} korisnika. Stoga niko neće biti obavješten. "
       group_mentioned:
-        one: "Spominjući {{group}}, obavijestiti će te {{count}} korisnika – da li ste sigurni?"
-        few: "Spominjući {{group}}, obavijestiti će te <a href='{{group_link}}'>{{count}} korisnika</a> – da li ste sigurni?"
-        other: "Spominjući {{group}}, obavijestiti će te <a href='{{group_link}}'>{{count}} korisnika</a> – da li ste sigurni?"
+        one: "Spominjući %{group}, obavijestiti će te %{count} korisnika – da li ste sigurni?"
+        few: "Spominjući %{group}, obavijestiti će te <a href='%{group_link}'>%{count} korisnika</a> – da li ste sigurni?"
+        other: "Spominjući %{group}, obavijestiti će te <a href='%{group_link}'>%{count} korisnika</a> – da li ste sigurni?"
       cannot_see_mention:
-        category: "Spomenuli ste {{username}} ali isti neće biti obavješteni zbog toga što nemaju pristup ovoj kategoriji. Morate ih dodati u Grupu koja ima pristup ka ovoj kategoriji."
-        private: "Spomenuli ste {{username}} ali isti neće biti obaviješteni zbog toga što nisu u mogućnosti da vide ovu personalnu poruku. Morate ih prvobitno pozvati u ovu PP tj. Personalnu poruku."
-      duplicate_link: "Izgleda da vaš link ka <b>{{domain}}</b> je već objavljen u temi od strane <b>@{{username}}</b> u<a href='{{post_url}}'>odgovoru prije {{ago}}</a> – da li ste sigurni da želite link objaviti ponovno?"
-      reference_topic_title: "RE:{{title}}"
+        category: "Spomenuli ste %{username} ali isti neće biti obavješteni zbog toga što nemaju pristup ovoj kategoriji. Morate ih dodati u Grupu koja ima pristup ka ovoj kategoriji."
+        private: "Spomenuli ste %{username} ali isti neće biti obaviješteni zbog toga što nisu u mogućnosti da vide ovu personalnu poruku. Morate ih prvobitno pozvati u ovu PP tj. Personalnu poruku."
+      duplicate_link: "Izgleda da vaš link ka <b>%{domain}</b> je već objavljen u temi od strane <b>@%{username}</b> u<a href='%{post_url}'>odgovoru prije %{ago}</a> – da li ste sigurni da želite link objaviti ponovno?"
+      reference_topic_title: "RE:%{title}"
       error:
         title_missing: "Naslov je obavezan"
-        title_too_short: "Naslov mora biti najmanje {{min}} karaktera"
-        title_too_long: "Naslov ne može biti više od {{max}} karaktera"
+        title_too_short: "Naslov mora biti najmanje %{min} karaktera"
+        title_too_long: "Naslov ne može biti više od %{max} karaktera"
         post_missing: "Objava ne može biti prazna"
-        post_length: "Odgovor mora biti najmanje {{min}} karaktera"
-        try_like: "Dail ste pokušali{{heart}}dugme?"
+        post_length: "Odgovor mora biti najmanje %{min} karaktera"
+        try_like: "Dail ste pokušali%{heart}dugme?"
         category_missing: "Morate odabrati kategoriju"
-        tags_missing: "Morate odabrati najmanje {{count}} oznaka"
+        tags_missing: "Morate odabrati najmanje %{count} oznaka"
         topic_template_not_modified: "Molimo da dodate detalje i specifikacije za vašu temu tako što ćete izmijeniti template teme."
       save_edit: "Sačuvaj izmjene"
       overwrite_edit: "Overwrite Edit"
@@ -1661,60 +1662,60 @@ bs_BA:
       tooltip:
         regular:
           one: "%{count} nepregledana obavijest"
-          few: "{{count}} nepregledane obavijesti"
-          other: "{{count}} nepregledanih obavijesti"
+          few: "%{count} nepregledane obavijesti"
+          other: "%{count} nepregledanih obavijesti"
         message:
           one: "%{count} nepročitana poruka"
-          few: "{{count}} nepročitane poruke"
-          other: "{{count}} nepročitanih poruka"
+          few: "%{count} nepročitane poruke"
+          other: "%{count} nepročitanih poruka"
       title: "obaviještenja na spomenuto @ime, odgovori na vaše teme i postove, privatne poruke, itd"
       none: "Nemate obavijesti trenutno."
       empty: "Nema obavještenja."
       post_approved: "Vaš post je odobren"
       reviewable_items: "stvari koje zahtijevaju pregled"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} and %{count} ostali</span> {{description}}"
-        few: "<span>{{username}}, {{username2}} i ostalih {{count}}</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} i ostalih {{count}} </span> {{description}}"
+        one: "<span>%{username}, %{username2} and %{count} ostali</span> %{description}"
+        few: "<span>%{username}, %{username2} i ostalih %{count}</span> %{description}"
+        other: "<span>%{username}, %{username2} i ostalih %{count} </span> %{description}"
       liked_consolidated_description:
-        one: "vam se svidio {{count}} vaših postova"
-        few: "vam se svidio {{count}} vaših postova"
-        other: "vam se svidio {{count}} vaših postova"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> je prihvatio vašu pozivnicu"
-      moved_post: "<span>{{username}}</span> je pomjerio {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Zasluženo '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Nova tema</span> {{description}}"
+        one: "vam se svidio %{count} vaših postova"
+        few: "vam se svidio %{count} vaših postova"
+        other: "vam se svidio %{count} vaših postova"
+      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}"
+      invitee_accepted: "<span>%{username}</span> je prihvatio vašu pozivnicu"
+      moved_post: "<span>%{username}</span> je pomjerio %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Zasluženo '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Nova tema</span> %{description}"
       group_message_summary:
-        one: "{{count}} poruka u vašem {{group_name}} sandučiću"
-        few: "{{count}} poruke u vašem {{group_name}} sandučiću"
-        other: "{{count}} poruka u vašem {{group_name}} sandučiću"
+        one: "%{count} poruka u vašem %{group_name} sandučiću"
+        few: "%{count} poruke u vašem %{group_name} sandučiću"
+        other: "%{count} poruka u vašem %{group_name} sandučiću"
       popup:
-        mentioned: '{{username}} vas je spomenuo/la u "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} vas je spomenuo/la u "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} vas je citirao/la u "{{topic}}" - {{site_title}}'
-        replied: '{{username}} vam je odgovorio/la u "{{topic}}" - {{site_title}}'
-        posted: '{{username}} je objavio/la "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} vam je poslao/la poruku u "{{topic}}" - {{site_title}}'
-        linked: '{{username}} je linkao/la vašu objavu "{{topic}}" - {{site_title}}'
-        watching_first_post: '{{username}} je kreirao novu temu "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} vas je spomenuo/la u "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} vas je spomenuo/la u "%{topic}" - %{site_title}'
+        quoted: '%{username} vas je citirao/la u "%{topic}" - %{site_title}'
+        replied: '%{username} vam je odgovorio/la u "%{topic}" - %{site_title}'
+        posted: '%{username} je objavio/la "%{topic}" - %{site_title}'
+        private_message: '%{username} vam je poslao/la poruku u "%{topic}" - %{site_title}'
+        linked: '%{username} je linkao/la vašu objavu "%{topic}" - %{site_title}'
+        watching_first_post: '%{username} je kreirao novu temu "%{topic}" - %{site_title}'
         confirm_title: "Obavijesti uključene - %{site_title}"
         confirm_body: "Uspješno! Obavijesti su sada uključene."
-        custom: "Obavijest od {{username}} na %{site_title}"
+        custom: "Obavijest od %{username} na %{site_title}"
       titles:
         mentioned: "spomenuto"
         replied: "novi odgovor"
@@ -1741,9 +1742,9 @@ bs_BA:
       from_my_computer: "Sa mog uređaja"
       from_the_web: "Sa neta"
       remote_tip: "link do slike http://primjer.com/slika.jpg"
-      remote_tip_with_attachments: "link ka slici ili datoteci {{authorized_extensions}}"
+      remote_tip_with_attachments: "link ka slici ili datoteci %{authorized_extensions}"
       local_tip: "Izaberi slike sa svog uređaja"
-      local_tip_with_attachments: "izaberite slike ili fajlove sa vašeg uređaja {{authorized_extensions}}"
+      local_tip_with_attachments: "izaberite slike ili fajlove sa vašeg uređaja %{authorized_extensions}"
       hint: "(možete i mišom prenijeti vaše slike direktno iz vašeg foldera ovdje)"
       hint_for_supported_browsers: "također možete povući i ispustiti ili zalijepiti slike u editor teksta"
       uploading: "Učitavam"
@@ -1760,16 +1761,16 @@ bs_BA:
       clear_all: "Očisti sve"
       too_short: "Vaš termin za pretragu je prekratak."
       result_count:
-        one: "<span>%{count} rezultat za</span><span class='term'>{{term}}</span>"
-        few: "<span>{{count}}{{plus}} resultata za</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} rezultata za</span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} rezultat za</span><span class='term'>%{term}</span>"
+        few: "<span>%{count}%{plus} resultata za</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} rezultata za</span><span class='term'>%{term}</span>"
       title: "traži teme, postove, članove ili kategorije"
       full_page_title: "pretraži teme ili objave"
       no_results: "Nema rezultata."
       no_more_results: "Nema rezultata pretrage."
       searching: "Potražujem..."
-      post_format: "#{{post_number}} od {{username}}"
-      results_page: "Pretraži za termin '{{term}}'"
+      post_format: "#%{post_number} od %{username}"
+      results_page: "Pretraži za termin '%{term}'"
       more_results: "Postoji više rezultata. Molimo vas da suzite kriterij za pretragu."
       cant_find: "Ne možete naći ono što tražite?"
       start_new_topic: "Možda da započnete novu temu?"
@@ -1778,8 +1779,8 @@ bs_BA:
       search_google_button: "Google"
       search_google_title: "Pretraži ovaj sajt"
       context:
-        user: "Traži postove od @{{username}}"
-        category: "Traži #{{category}} kategoriju"
+        user: "Traži postove od @%{username}"
+        category: "Traži #%{category} kategoriju"
         topic: "Pretraži ovu temu"
         private_messages: "Pretraži poruke"
       advanced:
@@ -1853,8 +1854,8 @@ bs_BA:
         choose_new_category: "Izaberi novu kategoriju za temu:"
         selected:
           one: "Označili ste <b>%{count}</b> temu."
-          few: "Označili ste <b>{{count}}</b> teme."
-          other: "Označili ste <b>{{count}}</b> teme."
+          few: "Označili ste <b>%{count}</b> teme."
+          other: "Označili ste <b>%{count}</b> teme."
         change_tags: "Zamijeni oznake"
         append_tags: "Pripoji oznake"
         choose_new_tags: "Odaberi nove tagove za ove teme:"
@@ -1867,7 +1868,7 @@ bs_BA:
         posted: "Niste odgovorili ni na jednu temu."
         latest: "Nema više novih tema. To je tužno."
         bookmarks: "Nemate još bookmark-iranih tema."
-        category: "Nema više tema u {{category}}."
+        category: "Nema više tema u %{category}."
         top: "Nema više popularnih tema."
         educate:
           new: '<p>Vaše nove teme se ovdje pojavljuju.</p><p>Načelno, teme se smatraju novim i prikazivat će<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">nova</span> indikator u slučaju da su objavljena u zadnja 2 dana.</p><p>Posjetite svoje <a href="%{userPrefsUrl}">postavke</a> ukoliko želite da to izmijenite.</p>'
@@ -1878,14 +1879,14 @@ bs_BA:
         read: "Nema više pročitanih tema."
         new: "Nema više novih tema."
         unread: "Nema više nepročitanih tema."
-        category: "Nema više tema na kategoriji {{category}}."
+        category: "Nema više tema na kategoriji %{category}."
         top: "Nema više popularnih tema."
         bookmarks: "Nema više bookmark-ovanih tema."
     topic:
       filter_to:
         one: "%{count} objava u temi"
-        few: "{{count}} objave u temi"
-        other: "{{count}} objava u temi"
+        few: "%{count} objave u temi"
+        other: "%{count} objava u temi"
       create: "Započni Temu"
       create_long: "Započni novu Temu"
       open_draft: "Otvori skicu"
@@ -1907,12 +1908,12 @@ bs_BA:
       unread: "nepročitana"
       new_topics:
         one: "%{count} nova tema"
-        few: "{{count}} nove teme"
-        other: "{{count}} nove teme"
+        few: "%{count} nove teme"
+        other: "%{count} nove teme"
       unread_topics:
         one: "%{count} nepročitana tema"
-        few: "{{count}} nepročitane teme"
-        other: "{{count}} nepročitane teme"
+        few: "%{count} nepročitane teme"
+        other: "%{count} nepročitane teme"
       title: "Tema"
       invalid_access:
         title: "Tema je privatna"
@@ -1926,28 +1927,28 @@ bs_BA:
         description: "Nažalost, nismo pronašli tu temu. Možda je uklonjena od strane moderatora?"
       total_unread_posts:
         one: "imate %{count} nepročitanu objavu u ovoj temi"
-        few: "imate {{count}} nepročitane objave u ovoj temi"
-        other: "imate {{count}} nepročitanih objava u ovoj temi"
+        few: "imate %{count} nepročitane objave u ovoj temi"
+        other: "imate %{count} nepročitanih objava u ovoj temi"
       unread_posts:
         one: "imate %{count} nepročitanu staru objavu u ovoj temi"
-        few: "imate {{count}} nepročitane stare objave u ovoj temi"
-        other: "imate {{count}} nepročitane stare objave u ovoj temi"
+        few: "imate %{count} nepročitane stare objave u ovoj temi"
+        other: "imate %{count} nepročitane stare objave u ovoj temi"
       new_posts:
         one: "imate %{count} novu objavu u ovoj temi od trenutka vaše zadnje posjete"
-        few: "imate {{count}} nove objave u ovoj temi od trenutka vaše zadnje posjete"
-        other: "imate {{count}} nove objave u ovoj temi od trenutka vaše zadnje posjete"
+        few: "imate %{count} nove objave u ovoj temi od trenutka vaše zadnje posjete"
+        other: "imate %{count} nove objave u ovoj temi od trenutka vaše zadnje posjete"
       likes:
         one: "postoji %{count} sviđanje u ovoj temi"
-        few: "postoji {{count}} sviđanja u ovoj temi"
-        other: "postoji {{count}} sviđanja u ovoj temi"
+        few: "postoji %{count} sviđanja u ovoj temi"
+        other: "postoji %{count} sviđanja u ovoj temi"
       back_to_list: "Vrati se na Listu Tema"
       options: "Opcije Teme"
       show_links: "pokaži linkove unutar ove teme"
       toggle_information: "uključi detalje teme"
-      read_more_in_category: "Želite da pročitate još? Pogledajte druge teme u kategoriji {{catLink}} ili {{latestLink}}."
-      read_more: "Želite da pročitate još? {{catLink}} ili {{latestLink}}."
-      group_request: "Morate zatražiti članstvo u grupi `{{name}}` da biste vidjeli ovu temu"
-      group_join: "Trebate se pridružiti grupi `{{name}}` da biste vidjeli ovu temu"
+      read_more_in_category: "Želite da pročitate još? Pogledajte druge teme u kategoriji %{catLink} ili %{latestLink}."
+      read_more: "Želite da pročitate još? %{catLink} ili %{latestLink}."
+      group_request: "Morate zatražiti članstvo u grupi `%{name}` da biste vidjeli ovu temu"
+      group_join: "Trebate se pridružiti grupi `%{name}` da biste vidjeli ovu temu"
       group_request_sent: "Vaš zahtjev za članstvo u grupi je poslan. Bićete obavešteni kada se prihvati."
       read_more_MF: "There { UNREAD, plural, =0 {} one { is <a href='{basePath}/unread'>1 unread</a> } other { are <a href='{basePath}/unread'># unread</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 new</a> topic} other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># new</a> topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Pogledajte sve Kategorije
@@ -2121,27 +2122,27 @@ bs_BA:
         choose_category: "Odaberite kategoriju za javnu temu:"
       feature_topic:
         title: "Istakni ovu temu."
-        pin: "Postavi ovu temu da se pojavljuje na vrhu {{categoryLink}} kategorije sve dok"
-        confirm_pin: "Već imate {{count}} okačenih tema. Previše okačenih tema može praviti teret za nove i anonimne korisnike. Da li ste sigurni da želite okačiti još jednu temu u ovoj kategoriji?"
-        unpin: "Uklonite ovu temu sa vrha {{categoryLink}} kategorije."
-        unpin_until: "Uklonite ovu temu sa vrha {{categoryLink}} kategorije ili sačekajte do <strong>%{until}</strong>."
+        pin: "Postavi ovu temu da se pojavljuje na vrhu %{categoryLink} kategorije sve dok"
+        confirm_pin: "Već imate %{count} okačenih tema. Previše okačenih tema može praviti teret za nove i anonimne korisnike. Da li ste sigurni da želite okačiti još jednu temu u ovoj kategoriji?"
+        unpin: "Uklonite ovu temu sa vrha %{categoryLink} kategorije."
+        unpin_until: "Uklonite ovu temu sa vrha %{categoryLink} kategorije ili sačekajte do <strong>%{until}</strong>."
         pin_note: "Korisnici mogu sami individualno za sebe odkloniti okačku sa teme."
         pin_validation: "Potreban je datum kako bi okačili ovu temu."
-        not_pinned: "Nema okačenih tema u {{categoryLink}}."
+        not_pinned: "Nema okačenih tema u %{categoryLink}."
         already_pinned:
-          one: "Tema trenutno zakačena u {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          few: "Teme trenutno zakačene u {{categoryLink}}: {{count}}"
-          other: "Tema trenutno zakačenih u {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Tema trenutno zakačena u %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          few: "Teme trenutno zakačene u %{categoryLink}: %{count}"
+          other: "Tema trenutno zakačenih u %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Postavi ovu temu da se prikazuje na vrhu svih lista tema sve do"
-        confirm_pin_globally: "Već imate {{count}} globalno okačene teme. Previše okačenih tema mogu praviti teret za nove i anonimne korisnike. Da li ste sigurni da želite okačiti još jednu temu u ovoj kategoriji?"
+        confirm_pin_globally: "Već imate %{count} globalno okačene teme. Previše okačenih tema mogu praviti teret za nove i anonimne korisnike. Da li ste sigurni da želite okačiti još jednu temu u ovoj kategoriji?"
         unpin_globally: "Uklonite ovu temu sa vrha svih lista tema."
         unpin_globally_until: "Odklonite ovu temu sa vrha svih lista tema ili sačekajte do <strong>%{until}</strong>."
         global_pin_note: "Korisnici mogu sami individualno za sebe ukloniti okačku sa teme."
         not_pinned_globally: "Nema tema okačenih globalno."
         already_pinned_globally:
           one: "Tema trenutno zakačena globalno: <strong class='badge badge-notification unread'>%{count}</strong>"
-          few: "Teme trenutno zakačene globalno: <strong class='badge badge-notification unread'>{{count}} </strong>"
-          other: "Tema trenutno zakačeno globalno: <strong class='badge badge-notification unread'> {{count}} </strong>"
+          few: "Teme trenutno zakačene globalno: <strong class='badge badge-notification unread'>%{count} </strong>"
+          other: "Tema trenutno zakačeno globalno: <strong class='badge badge-notification unread'> %{count} </strong>"
         make_banner: "Postavi ovu temu kao banner koji se pojavljuje na vrhu svih stranica."
         remove_banner: "Uklonite banner koji se pojavljuje u vrhu svih stranica."
         banner_note: "Korisnici mogu odkloniti banner tako što će ga zatvoriti. U svakom momentu samo jedna tema može biti postavljena za banner."
@@ -2171,16 +2172,16 @@ bs_BA:
         to_topic_username: "Unijeli ste korisničko ime. Na isto ćemo poslati obavještenje sa linkom pozivnice na ovu temu."
         to_username: "Unesite korisničko ime osobe koju želite pozvati. Poslati ćemo obavještenje sa linkom pozivnice na ovu temu."
         email_placeholder: "name@example.com"
-        success_email: "Poslali smo e-mailom pozivnicu ka <b>{{emailOrUsername}}</b>. Obavjestiti ćemo vas kada pozivnica bude iskorištena. Provjerite tab pozivnica na vašoj profilnoj stranici kako bi ste upratili sve vaše pozivnice."
+        success_email: "Poslali smo e-mailom pozivnicu ka <b>%{emailOrUsername}</b>. Obavjestiti ćemo vas kada pozivnica bude iskorištena. Provjerite tab pozivnica na vašoj profilnoj stranici kako bi ste upratili sve vaše pozivnice."
         success_username: "Pozvali smo tog korisnika da prisustvuje u ovoj temi."
         error: "Sorry, we couldn't invite that person. Perhaps they are already a user?"
-        success_existing_email: "Korisnik sa emailom <b>{{emailOrUsername}}</b> već postoji. Pozvali smo tog korisnika da se pridruži u raspravi na ovu temu."
+        success_existing_email: "Korisnik sa emailom <b>%{emailOrUsername}</b> već postoji. Pozvali smo tog korisnika da se pridruži u raspravi na ovu temu."
       login_reply: "Uloguj se da odgovoriš"
       filters:
         n_posts:
           one: "%{count} objava"
-          few: "{{count}} objave"
-          other: "{{count}} objava"
+          few: "%{count} objave"
+          other: "%{count} objava"
         cancel: "Show all posts in this topic again."
       move_to:
         title: "Idi kod"
@@ -2194,8 +2195,8 @@ bs_BA:
         error: "There was an error moving posts to the new topic."
         instructions:
           one: "Kreirati će te novu temu i popuniti je sa objavom koju ste označili."
-          few: "Kreirati će te novu temu i popuniti je sa <b>{{count}}</b> objave koje ste označili."
-          other: "Kreirati će te novu temu i popuniti je sa <b>{{count}}</b> objava koje ste označili."
+          few: "Kreirati će te novu temu i popuniti je sa <b>%{count}</b> objave koje ste označili."
+          other: "Kreirati će te novu temu i popuniti je sa <b>%{count}</b> objava koje ste označili."
       merge_topic:
         title: "Move to Existing Topic"
         action: "move to existing topic"
@@ -2203,8 +2204,8 @@ bs_BA:
         radio_label: "Postojeća tema"
         instructions:
           one: "Molimo da odaberete temu u koju će te pomjeriti tu objavu."
-          few: "Molimo da odaberete temu u koju će te pomjeriti <b>{{count}}</b> objave."
-          other: "Molimo da odaberete temu u koju će te pomjeriti <b>{{count}}</b> objava."
+          few: "Molimo da odaberete temu u koju će te pomjeriti <b>%{count}</b> objave."
+          other: "Molimo da odaberete temu u koju će te pomjeriti <b>%{count}</b> objava."
       move_to_new_message:
         title: "Premjesti u novu poruku"
         action: "pređite na novu poruku"
@@ -2213,8 +2214,8 @@ bs_BA:
         participants: "Učesnici"
         instructions:
           one: "Namjeravate kreirati novu poruku i popuniti je odabranim postom."
-          few: "<b>Nameravate</b> da kreirate novu poruku i popunite je sa <b>{{count}} postavkama</b> koje ste izabrali."
-          other: "<b>Nameravate</b> da kreirate novu poruku i popunite je sa <b>{{count}} postavkama</b> koje ste izabrali."
+          few: "<b>Nameravate</b> da kreirate novu poruku i popunite je sa <b>%{count} postavkama</b> koje ste izabrali."
+          other: "<b>Nameravate</b> da kreirate novu poruku i popunite je sa <b>%{count} postavkama</b> koje ste izabrali."
       move_to_existing_message:
         title: "Premjesti u postojeću poruku"
         action: "premjestite se na postojeću poruku"
@@ -2222,8 +2223,8 @@ bs_BA:
         participants: "Učesnici"
         instructions:
           one: "Odaberite poruku u koju želite premjestiti taj post."
-          few: "Molimo odaberite poruku u koju želite premjestiti postove <b>{{count}}</b> ."
-          other: "Molimo odaberite poruku u koju želite premjestiti postove <b>{{count}}</b> ."
+          few: "Molimo odaberite poruku u koju želite premjestiti postove <b>%{count}</b> ."
+          other: "Molimo odaberite poruku u koju želite premjestiti postove <b>%{count}</b> ."
       merge_posts:
         title: "Spoji izabrane postove"
         action: "spoji izabrane postove"
@@ -2234,9 +2235,9 @@ bs_BA:
         error: "There was an error changing the ownership of the posts."
         placeholder: "username of new owner"
         instructions:
-          one: "Molimo odaberite novog vlasnika za post od <b>@ {{old_user}}</b>"
-          few: "Molimo odaberite novog vlasnika za {{count}} postove od <b>@ {{old_user}}</b>"
-          other: "Molimo odaberite novog vlasnika za {{count}} postove od <b>@ {{old_user}}</b>"
+          one: "Molimo odaberite novog vlasnika za post od <b>@ %{old_user}</b>"
+          few: "Molimo odaberite novog vlasnika za %{count} postove od <b>@ %{old_user}</b>"
+          other: "Molimo odaberite novog vlasnika za %{count} postove od <b>@ %{old_user}</b>"
       change_timestamp:
         title: "Promijeni vremensku zabilješku..."
         action: "izmijeni vrijeme"
@@ -2245,7 +2246,7 @@ bs_BA:
         instructions: "Molimo da odaberete novu vremensku zabilješku teme. Objave u temi će biti ažurirane kako bi imale istu vremensku razliku."
       multi_select:
         select: "select"
-        selected: "selected ({{count}})"
+        selected: "selected (%{count})"
         select_post:
           label: "označi"
           title: "Dodaj objavu u označeno"
@@ -2264,8 +2265,8 @@ bs_BA:
         deselect_all: deselect all
         description:
           one: Označili ste <b>%{count}</b> objavu.
-          few: "Označili ste <b>{{count}}</b>objave."
-          other: "Označili ste <b>{{count}}</b> objava."
+          few: "Označili ste <b>%{count}</b>objave."
+          other: "Označili ste <b>%{count}</b> objava."
       deleted_by_author:
         one: "(tema povučena od strane autora, automatski će biti obrisana u %{count} satu osim ako nije označena)"
         few: "(tema povučena od strane autora, automatski će biti obrisana u %{count} sati osim ako nije označena)"
@@ -2273,13 +2274,13 @@ bs_BA:
     post:
       quote_reply: "Citat"
       edit_reason: "Razlog: "
-      post_number: "post {{number}}"
+      post_number: "post %{number}"
       ignored: "Ignorisani sadržaj"
       wiki_last_edited_on: "wiki zanji put izmijenjen"
       last_edited_on: "post last edited on"
       reply_as_new_topic: "Odgovori kroz novu povezanu Temu"
       reply_as_new_private_message: "Odgovori kao nova poruka istim primaocima"
-      continue_discussion: "Nastavak diskusije od teme {{postLink}}:"
+      continue_discussion: "Nastavak diskusije od teme %{postLink}:"
       follow_quote: "idi na citiran post"
       show_full: "Pogledaj Cijeli Post"
       show_hidden: "Prikaz zanemarenog sadržaja."
@@ -2292,33 +2293,33 @@ bs_BA:
       locked: "administrator je zaključao ovu objavu za nove izmjene"
       gap:
         one: "pogledaj %{count} skriven odgovor"
-        few: "pogledaj {{count}} skrivena odgovora"
-        other: "pogledaj {{count}} skrivenih odgovora"
+        few: "pogledaj %{count} skrivena odgovora"
+        other: "pogledaj %{count} skrivenih odgovora"
       notice:
-        new_user: "Ovo je prvi put da je {{user}} objavio - pozdravimo ih u našoj zajednici!"
-        returning_user: "Prošlo je dosta vremena od kada smo vidjeli {{user}} - njihov zadnji post je bio {{time}}."
+        new_user: "Ovo je prvi put da je %{user} objavio - pozdravimo ih u našoj zajednici!"
+        returning_user: "Prošlo je dosta vremena od kada smo vidjeli %{user} - njihov zadnji post je bio %{time}."
       unread: "Post je nepročitan"
       has_replies:
-        one: "{{count}} Odgovor"
-        few: "{{count}} Odgovora"
-        other: "{{count}} Odgovora"
+        one: "%{count} Odgovor"
+        few: "%{count} Odgovora"
+        other: "%{count} Odgovora"
       has_likes_title:
         one: "%{count} osobi se sviđa ova objava"
-        few: "{{count}} osoba se sviđa ova objava"
-        other: "{{count}} osoba se sviđa ova objava"
+        few: "%{count} osoba se sviđa ova objava"
+        other: "%{count} osoba se sviđa ova objava"
       has_likes_title_only_you: "sviđa vam se ova objava"
       has_likes_title_you:
         one: "vama i još %{count} osobi vam se sviđa ova objava"
-        few: "vama i još {{count}} ostale osobe vam se sviđa ova objava"
-        other: "vama i još {{count}} ostalih osoba vam se sviđa ova objava"
+        few: "vama i još %{count} ostale osobe vam se sviđa ova objava"
+        other: "vama i još %{count} ostalih osoba vam se sviđa ova objava"
       errors:
         create: "Sorry, there was an error creating your post. Please try again."
         edit: "Sorry, there was an error editing your post. Please try again."
         upload: "Sorry, there was an error uploading that file. Please try again."
-        file_too_large: "Nažalost, ta datoteka je prevelika (maksimalna veličina je {{max_size_kb}}kb). Zašto ne biste prenijeli vašu veliku datoteku na uslugu dijeljenja u oblaku, a zatim zalijepili vezu?"
+        file_too_large: "Nažalost, ta datoteka je prevelika (maksimalna veličina je %{max_size_kb}kb). Zašto ne biste prenijeli vašu veliku datoteku na uslugu dijeljenja u oblaku, a zatim zalijepili vezu?"
         too_many_uploads: "Sorry, you can only upload one file at a time."
-        too_many_dragged_and_dropped_files: "Nažalost, možete postaviti samo datoteke {{max}} odjednom."
-        upload_not_authorized: "Nažalost, fajl koji pokušavate da učitate nije dozvoljen za učitavanje (dozvoljene ekstenzije su: {{authorized_extensions}})."
+        too_many_dragged_and_dropped_files: "Nažalost, možete postaviti samo datoteke %{max} odjednom."
+        upload_not_authorized: "Nažalost, fajl koji pokušavate da učitate nije dozvoljen za učitavanje (dozvoljene ekstenzije su: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Sorry, new users can not upload images."
         attachment_upload_not_allowed_for_new_user: "Sorry, new users can not upload attachments."
         attachment_download_requires_login: "Sorry, you need to be logged in to download attachments."
@@ -2355,12 +2356,12 @@ bs_BA:
           confirm: "Da li želite također da obrišete i odgovore na ovu objavu?"
           direct_replies:
             one: "Da, i %{count} direktni odgovor"
-            few: "Da, i {{count}} direktna odgovora"
-            other: "Da, i {{count}} direktnih odgovora"
+            few: "Da, i %{count} direktna odgovora"
+            other: "Da, i %{count} direktnih odgovora"
           all_replies:
             one: "Da, i %{count} odgovor"
-            few: "Da, i sva {{count}} odgovora"
-            other: "Da, i svih {{count}} odgovora"
+            few: "Da, i sva %{count} odgovora"
+            other: "Da, i svih %{count} odgovora"
           just_the_post: "Ne, samo ovu objavu"
         admin: "post admin actions"
         wiki: "Make Wiki"
@@ -2401,9 +2402,9 @@ bs_BA:
           notify_user: "poruka poslata"
           bookmark: "ovo zabilježio"
           like_capped:
-            one: "i {{count}} drugim se svidelo ovo"
-            few: "i {{count}} drugima se ovo svidelo"
-            other: "i {{count}} drugima se ovo svidelo"
+            one: "i %{count} drugim se svidelo ovo"
+            few: "i %{count} drugima se ovo svidelo"
+            other: "i %{count} drugima se ovo svidelo"
         by_you:
           off_topic: "Prijavili ste ovo kao iskakanje iz okvira teme (off-topic)"
           spam: "Prijavili ste ovo kao spam"
@@ -2415,13 +2416,13 @@ bs_BA:
       delete:
         confirm:
           one: "Jeste li sigurni da želite izbrisati taj post?"
-          few: "Jeste li sigurni da želite izbrisati one postove {{count}}?"
-          other: "Jeste li sigurni da želite izbrisati one postove {{count}}?"
+          few: "Jeste li sigurni da želite izbrisati one postove %{count}?"
+          other: "Jeste li sigurni da želite izbrisati one postove %{count}?"
       merge:
         confirm:
           one: "Jeste li sigurni da želite spojiti te postove?"
-          few: "Jeste li sigurni da želite spojiti te postove {{count}}?"
-          other: "Jeste li sigurni da želite spojiti te postove {{count}}?"
+          few: "Jeste li sigurni da želite spojiti te postove %{count}?"
+          other: "Jeste li sigurni da želite spojiti te postove %{count}?"
       revisions:
         controls:
           first: "First revision"
@@ -2433,7 +2434,7 @@ bs_BA:
           revert: "Vratite se na ovu reviziju"
           edit_wiki: "Promjni Wiki"
           edit_post: "Promjeni Post"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "Show the rendered output with additions and removals inline"
@@ -2599,16 +2600,16 @@ bs_BA:
       custom_message:
         at_least:
           one: "unesite bar %{count} znak"
-          few: "unesite najmanje {{count}} znakova"
-          other: "unesite najmanje {{count}} znakova"
+          few: "unesite najmanje %{count} znakova"
+          other: "unesite najmanje %{count} znakova"
         more:
           one: "%{count} to go ..."
-          few: "{{count}} to go ... \\ t"
-          other: "{{count}}preostalo..."
+          few: "%{count} to go ... \\ t"
+          other: "%{count}preostalo..."
         left:
           one: "%{count} preostalo"
-          few: "{{count}} preostalo"
-          other: "{{count}} preostalo"
+          few: "%{count} preostalo"
+          other: "%{count} preostalo"
     flagging_topic:
       title: "Zašto privatno opominjete ovu temu?"
       action: "Prijavi temu"
@@ -2654,7 +2655,7 @@ bs_BA:
         title: "Ova tema je lična poruka"
         help: "Ova tema je lična poruka"
     posts: "Odgovori"
-    posts_long: "postoji {{number}} odgovora u ovoj temi"
+    posts_long: "postoji %{number} odgovora u ovoj temi"
     posts_likes_MF: |
       This topic has {count, plural, one {1 post} other {# posts}} {ratio, select,
       low {with a high like to post ratio}
@@ -2670,15 +2671,15 @@ bs_BA:
     replies: "Odgovora"
     views_long:
       one: "ova tema je pregledana %{count} time"
-      few: "Ova tema je pregledana {{number}} puta"
-      other: "Ova tema je pregledana {{number}} puta"
+      few: "Ova tema je pregledana %{number} puta"
+      other: "Ova tema je pregledana %{number} puta"
     activity: "Aktivnost"
     likes: "Lajkovi"
     likes_lowercase:
       one: "like"
       few: "likes"
       other: "likajkovi"
-    likes_long: "postoji {{number}} lajkova u ovoj temi"
+    likes_long: "postoji %{number} lajkova u ovoj temi"
     users: "Korisnici"
     users_lowercase:
       one: "korisnik"
@@ -2686,7 +2687,7 @@ bs_BA:
       other: "korisnici"
     category_title: "Kategorija"
     history: "Istorija"
-    changed_by: "od {{author}}"
+    changed_by: "od %{author}"
     raw_email:
       title: "Dolazna email"
       not_available: "Nije dostupno!"
@@ -2698,38 +2699,38 @@ bs_BA:
         title: "Zadnje"
         title_with_count:
           one: "Najnoviji (%{count})"
-          few: "Najnoviji ({{count}}) \\ t"
-          other: "Najnoviji ({{count}}) \\ t"
+          few: "Najnoviji (%{count}) \\ t"
+          other: "Najnoviji (%{count}) \\ t"
         help: "teme sa nedavnim postovima"
       read:
         title: "Pročitane"
         help: "teme koje ste pročitali, zadnje pročitane na vrhu."
       categories:
         title: "Kategorije"
-        title_in: "Kategorija - {{categoryName}}"
+        title_in: "Kategorija - %{categoryName}"
         help: "sve teme grupisane po kategoriji"
       unread:
         title: "Nepročitanih"
         title_with_count:
           one: "Nepročitano (%{count})"
-          few: "Nepročitano ({{count}})"
-          other: "Nepročitano ({{count}})"
+          few: "Nepročitano (%{count})"
+          other: "Nepročitano (%{count})"
         help: "teme koje trenutno pratite i motrite sa nepročitanim postovima"
         lower_title_with_count:
           one: "%{count} unread"
-          few: "{{count}} unread"
-          other: "{{count}} unread"
+          few: "%{count} unread"
+          other: "%{count} unread"
       new:
         lower_title_with_count:
           one: "%{count} novi"
-          few: "{{count}} nova"
-          other: "{{count}} novih"
+          few: "%{count} nova"
+          other: "%{count} novih"
         lower_title: "nova"
         title: "Novo"
         title_with_count:
           one: "Novo (%{count})"
-          few: "Novo ({{count}})"
-          other: "Novo ({{count}})"
+          few: "Novo (%{count})"
+          other: "Novo (%{count})"
         help: "teme kreirane u zadnjih nekoliko dana"
       posted:
         title: "Moji Odgovori"
@@ -2738,12 +2739,12 @@ bs_BA:
         title: "Zabilješke"
         help: "teme koje ste označili"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          few: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
-        help: "zadnje teme u {{categoryName}} kategoriji"
+          one: "%{categoryName} (%{count})"
+          few: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "zadnje teme u %{categoryName} kategoriji"
       top:
         title: "Popularne"
         help: "najaktivnije teme u zadnjih godinu, mjesec, sedmicu i dan"
@@ -2891,9 +2892,9 @@ bs_BA:
       synonyms: "Sinonimi"
       synonyms_description: "U slučaju da se sljedeće oznake koriste, iste će biti zamijenjene sa <b>%{base_tag_name}</b>."
       tag_groups_info:
-        one: 'Ovaj tag pripada grupi "{{tag_groups}}".'
-        few: "Ovaj tag pripada sljedećim grupama: {{tag_groups}}."
-        other: "Ova oznaka pripada sljedećim grupama: {{tag_groups}}."
+        one: 'Ovaj tag pripada grupi "%{tag_groups}".'
+        few: "Ovaj tag pripada sljedećim grupama: %{tag_groups}."
+        other: "Ova oznaka pripada sljedećim grupama: %{tag_groups}."
       category_restrictions:
         one: "Moguće je koristiti samo u sljedećoj kategoriji:"
         few: "Moguće je koristiti samo u sljedećim kategorijama:"
@@ -2911,13 +2912,13 @@ bs_BA:
       delete_tag: "Izbriši oznaku"
       delete_confirm:
         one: "Jeste li sigurni da želite izbrisati ovu oznaku i ukloniti je iz teme %{count} kojoj je dodijeljen?"
-        few: "Jeste li sigurni da želite izbrisati ovu oznaku i ukloniti je iz tema {{count}} kojima je dodijeljena?"
-        other: "Jeste li sigurni da želite izbrisati ovu oznaku i ukloniti je iz tema {{count}} kojima je dodijeljena?"
+        few: "Jeste li sigurni da želite izbrisati ovu oznaku i ukloniti je iz tema %{count} kojima je dodijeljena?"
+        other: "Jeste li sigurni da želite izbrisati ovu oznaku i ukloniti je iz tema %{count} kojima je dodijeljena?"
       delete_confirm_no_topics: "Jeste li sigurni da želite izbrisati ovu oznaku?"
       delete_confirm_synonyms:
         one: "Pripadajući sinonim će također biti obrisan."
-        few: "Pripadajućih {{count}} sinonima će također biti obrisano."
-        other: "Pripadajućih {{count}} sinonima će također biti obrisano."
+        few: "Pripadajućih %{count} sinonima će također biti obrisano."
+        other: "Pripadajućih %{count} sinonima će također biti obrisano."
       rename_tag: "Promjeni ime Oznake"
       rename_instructions: "Odaberite novo ime za oznaku:"
       sort_by: "Sortiraj po:"
@@ -3233,12 +3234,12 @@ bs_BA:
           redeliver: "Redeliver"
           incoming:
             one: "Postoji novi događaj."
-            few: "Postoje novi događaji {{count}}."
-            other: "Postoje novi događaji {{count}}."
+            few: "Postoje novi događaji %{count}."
+            other: "Postoje novi događaji %{count}."
           completed_in:
             one: "Završeno u sekundi %{count}."
-            few: "Završeno u {{count}} sekundi."
-            other: "Završeno u {{count}} sekundi."
+            few: "Završeno u %{count} sekundi."
+            other: "Završeno u %{count} sekundi."
           request: "Zatraži"
           response: "Odgovor"
           redeliver_confirm: "Jeste li sigurni da želite da ponovo prenesete isti teret?"
@@ -3290,12 +3291,12 @@ bs_BA:
           label: "Učitavanje"
           title: "Prenesite rezervnu kopiju na ovu instancu"
           uploading: "Uploading..."
-          uploading_progress: "Snimanje ... {{progress}}% \\ t"
-          success: "'{{filename}}' je uspješno otpremljen. Datoteka se sada obrađuje i traje do jednog minuta da se pojavi na listi."
-          error: "There has been an error while uploading '{{filename}}': {{message}}"
+          uploading_progress: "Snimanje ... %{progress}% \\ t"
+          success: "'%{filename}' je uspješno otpremljen. Datoteka se sada obrađuje i traje do jednog minuta da se pojavi na listi."
+          error: "There has been an error while uploading '%{filename}': %{message}"
         operations:
           is_running: "An operation is currently running..."
-          failed: "The {{operation}} failed. Please check the logs."
+          failed: "The %{operation} failed. Please check the logs."
           cancel:
             label: "Otkaži"
             title: "Cancel the current operation"
@@ -3411,7 +3412,7 @@ bs_BA:
           disabled_component_tooltip: "Ova komponenta je onemogućena"
           default_theme_tooltip: "Ova tema je podrazumevana tema sajta"
           updates_available_tooltip: "Ažuriranja su dostupna za ovu temu"
-          and_x_more: "i {{count}} više."
+          and_x_more: "i %{count} više."
           collapse: Spusti
           uploads: "Uploads"
           no_uploads: "Možete prenijeti sredstva povezana s vašom temom, kao što su fontovi i slike"
@@ -3454,8 +3455,8 @@ bs_BA:
           disabled_by: "Ovu komponentu je onemogućio korisnik"
           required_version:
             error: "Ova tema je automatski onemogućena jer nije kompatibilna sa ovom verzijom Diskursa."
-            minimum: "Potrebna je diskursna verzija {{version}} ili iznad."
-            maximum: "Potrebna je diskursna verzija {{version}} ili ispod."
+            minimum: "Potrebna je diskursna verzija %{version} ili iznad."
+            maximum: "Potrebna je diskursna verzija %{version} ili ispod."
           component_of: "Komponenta:"
           update_to_latest: "Ažurirajte na Najnovije"
           check_for_updates: "Potražite ažuriranja"
@@ -3468,8 +3469,8 @@ bs_BA:
           empty: "Nema stavki"
           commits_behind:
             one: "Tema je %{count} početi iza sebe!"
-            few: "Tema je {{count}} iza sebe!"
-            other: "Tema je {{count}} iza sebe!"
+            few: "Tema je %{count} iza sebe!"
+            other: "Tema je %{count} iza sebe!"
           compare_commits: "(Pogledajte nove unose)"
           repo_unreachable: "Nije moguće kontaktirati Git repozitorij ove teme. Poruka o grešci:"
           scss:
@@ -3854,8 +3855,8 @@ bs_BA:
           title: "Reveal this user's email address"
           text: "Show"
       user:
-        suspend_failed: "Something went wrong suspending this user {{error}}"
-        unsuspend_failed: "Something went wrong unsuspending this user {{error}}"
+        suspend_failed: "Something went wrong suspending this user %{error}"
+        unsuspend_failed: "Something went wrong unsuspending this user %{error}"
         suspend_duration: "How long will the user be suspended for?"
         suspend_reason_label: "Why are you suspending? This text <b>will be visible to everyone</b> on this user's profile page, and will be shown to the user when they try to log in. Keep it short."
         suspend_reason_hidden_label: "Zašto suspendirate? Ovaj tekst će biti prikazan korisniku kada se pokušaju prijaviti."
@@ -4194,6 +4195,7 @@ bs_BA:
         title: "Emoji"
         help: "Dodajte novi emotikon koji će biti dostupan svima. (PROTIP: povlačenje i ispuštanje više datoteka odjednom)"
         add: "Dodaj novi emoji"
+        uploading: "Učitava se..."
         name: "Ime"
         group: "Grupa"
         image: "Slika"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 419f05e48d..1387fda522 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -23,8 +23,8 @@ ca:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
@@ -223,11 +223,11 @@ ca:
     weekly: "setmanal"
     every_month: "cada mes"
     every_six_months: "cada sis mesos"
-    max_of_count: "màxim de {{count}}"
+    max_of_count: "màxim de %{count}"
     alternation: "o"
     character_count:
-      one: "{{count}} caràcter"
-      other: "{{count}} caràcters"
+      one: "%{count} caràcter"
+      other: "%{count} caràcters"
     related_messages:
       title: "Missatges relacionats"
       see_all: 'Mostra <a href="%{path}">tots els missatges</a> de @%{username}...'
@@ -259,6 +259,7 @@ ca:
         bookmark: "Feu clic per a marcar com a preferit la primera publicació d'aquest tema"
         unbookmark: "Feu clic per a eliminar tots els preferits d'aquest tema"
     bookmarks:
+      created: "Heu marcat aquesta publicació %{name}com a preferida"
       not_bookmarked: "marca aquesta publicació com a preferit"
       remove: "Elimina preferit"
       confirm_clear: "Esteu segur que voleu eliminar tots els preferits d'aquest tema?"
@@ -280,14 +281,14 @@ ca:
         yes_value: "Sí, abandona"
         no_value: "No, segueix"
     topic_count_latest:
-      one: "Vegeu {{count}} tema nou o actualitzat"
-      other: "Vegeu {{count}} temes nous o actualitzats"
+      one: "Vegeu %{count} tema nou o actualitzat"
+      other: "Vegeu %{count} temes nous o actualitzats"
     topic_count_unread:
-      one: "Vegeu {{count}} tema no llegit "
-      other: "Vegeu {{count}} temes no llegits"
+      one: "Vegeu %{count} tema no llegit "
+      other: "Vegeu %{count} temes no llegits"
     topic_count_new:
-      one: "Vegeu {{count}} tema nou"
-      other: "Vegeu {{count}} temes nous"
+      one: "Vegeu %{count} tema nou"
+      other: "Vegeu %{count} temes nous"
     preview: "previsualitza"
     cancel: "cancel·la"
     save: "Desa els canvis"
@@ -295,7 +296,7 @@ ca:
     saved: "Desat!"
     upload: "Carrega"
     uploading: "Carregant..."
-    uploading_filename: "Pujant: {{filename}}..."
+    uploading_filename: "Pujant: %{filename}..."
     clipboard: "porta-retalls"
     uploaded: "Carregat!"
     pasting: "Enganxant..."
@@ -319,6 +320,8 @@ ca:
         placeholder: "escriviu el títol, l’URL o l’identificador del tema aquí"
     choose_message:
       none_found: "No s'han trobat missatges."
+      title:
+        search: "Cerqueu un missatge"
     review:
       order_by: "Ordena per"
       in_reply_to: "en resposta a"
@@ -346,7 +349,7 @@ ca:
         optional: "Podeu reclamar aquest element per a impedir que altres el revisin."
         required: "Heu de reclamar elements abans de poder revisar-los"
         claimed_by_you: "Heu reclamat aquest element i podeu revisar-lo"
-        claimed_by_other: "Aquest element sols pot ser revisat per <b>{{username}}</b>."
+        claimed_by_other: "Aquest element sols pot ser revisat per <b>%{username}</b>."
       claim:
         title: "reclama aquest tema"
       unclaim:
@@ -366,7 +369,7 @@ ca:
       view_pending: "mostra els pendents"
       topic_has_pending:
         one: "Aquest tema té <b>%{count}</b> publicació pendent d'aprovar"
-        other: "Aquest tema té <b>{{count}}</b> publicacions pendents d'aprovar"
+        other: "Aquest tema té <b>%{count}</b> publicacions pendents d'aprovar"
       title: "Revisa"
       topic: "Tema:"
       filtered_topic: "Heu filtrat a contingut revisable en un sol tema."
@@ -382,17 +385,17 @@ ca:
         fields: "Camps"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} bandera en total)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} banderes en total)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} bandera en total)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} banderes en total)"
         agreed:
-          one: "El {{count}}% hi està d'acord"
-          other: "El {{count}}% hi està d'acord"
+          one: "El %{count}% hi està d'acord"
+          other: "El %{count}% hi està d'acord"
         disagreed:
-          one: "El {{count}}% hi està en desacord"
-          other: "El {{count}}% hi està en desacord"
+          one: "El %{count}% hi està en desacord"
+          other: "El %{count}% hi està en desacord"
         ignored:
-          one: "El {{count}}% ho ignora"
-          other: "El {{count}}% ho ignora"
+          one: "El %{count}% ho ignora"
+          other: "El %{count}% ho ignora"
       topics:
         topic: "Tema"
         reviewable_count: "Recompte"
@@ -402,10 +405,10 @@ ca:
         details: "detalls"
         unique_users:
           one: "%{count} usuari"
-          other: "{{count}} usuaris"
+          other: "%{count} usuaris"
       replies:
         one: "%{count} resposta"
-        other: "{{count}} respostes"
+        other: "%{count} respostes"
       edit: "Edita"
       save: "Desa"
       cancel: "Cancel·la"
@@ -468,22 +471,22 @@ ca:
         description: "Hem rebut la vostra nova publicació, però cal que sigui aprovada per un moderador abans d'aparèixer publicada. Tingueu una mica de paciència."
         pending_posts:
           one: "Teniu <strong>%{count}</strong> publicació pendent."
-          other: "Teniu <strong>{{count}}</strong> publicacions pendents."
+          other: "Teniu <strong>%{count}</strong> publicacions pendents."
         ok: "D'acord"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> ha publicat <a href='{{topicUrl}}'>el tema</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Vós</a> heu publicat <a href='{{topicUrl}}'>el tema</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> ha respost a <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Vós</a> heu respost <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> ha respost al <a href='{{topicUrl}}'>tema</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Vós</a> heu respost al <a href='{{topicUrl}}'>tema</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> ha mencionat <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> <a href='{{user2Url}}'>us</a> ha fet mencionat"
-      you_mentioned_user: "<a href='{{user1Url}}'>Vós</a> heu mencionat <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Publicat per <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Publicat per <a href='{{userUrl}}'>vós</a>"
-      sent_by_user: "Enviat per <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Enviat per <a href='{{userUrl}}'>vós</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> ha publicat <a href='%{topicUrl}'>el tema</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Vós</a> heu publicat <a href='%{topicUrl}'>el tema</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> ha respost a <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Vós</a> heu respost <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> ha respost al <a href='%{topicUrl}'>tema</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Vós</a> heu respost al <a href='%{topicUrl}'>tema</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> ha mencionat <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> <a href='%{user2Url}'>us</a> ha fet mencionat"
+      you_mentioned_user: "<a href='%{user1Url}'>Vós</a> heu mencionat <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Publicat per <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Publicat per <a href='%{userUrl}'>vós</a>"
+      sent_by_user: "Enviat per <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Enviat per <a href='%{userUrl}'>vós</a>"
     directory:
       filter_name: "filtra per usuari"
       title: "Usuaris"
@@ -714,7 +717,7 @@ ca:
     user_fields:
       none: "(trieu una opció)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Perfil"
       mute: "Silencia"
       edit: "Edita preferències"
@@ -783,12 +786,12 @@ ca:
       enable_quoting: "Permet citar la resposta en el text destacat"
       enable_defer: "Habilita l'ajornament per a marcar temes no llegits"
       change: "canvia"
-      moderator: "{{user}} és un moderador"
-      admin: "{{user}} és un administrador"
+      moderator: "%{user} és un moderador"
+      admin: "%{user} és un administrador"
       moderator_tooltip: "Aquest usuari és un moderador."
       admin_tooltip: "Aquest usuari és un administrador"
       silenced_tooltip: "Aquest usuari és silenciat"
-      suspended_notice: "Aquest usuari és suspès fins a {{date}}."
+      suspended_notice: "Aquest usuari és suspès fins a %{date}."
       suspended_permanently: "Aquest usuari és suspès."
       suspended_reason: "Motiu:"
       github_profile: "GitHub"
@@ -801,7 +804,7 @@ ca:
           Les categories i els temes silenciats no s'inclouen en aquests correus electrònics.
         individual: "Envia un correu per cada nova publicació"
         individual_no_echo: "Envia un correu per cada nova publicació excepte les meves"
-        many_per_day: "Envia un correu per cada nova publicació (aproximadament {{dailyEmailEstimate}} al dia)"
+        many_per_day: "Envia un correu per cada nova publicació (aproximadament %{dailyEmailEstimate} al dia)"
         few_per_day: "Envia un correu per cada nova publicació (aproximadament 2 cada dia)"
         warning: "Mode de llista de correu habilitat. La configuració de notificacions de correu és sobreescrita."
       tag_settings: "Etiquetes"
@@ -831,9 +834,7 @@ ca:
       admin_delete: "Suprimeix"
       users: "Usuaris"
       muted_users: "Silenciat"
-      muted_users_instructions: "Suprimeix totes les notificacions d'aquests usuaris"
       ignored_users: "Ignorat"
-      ignored_users_instructions: "Suprimeix totes les publicacions i les notificacions d'aquests usuaris."
       tracked_topics_link: "Mostra"
       automatically_unpin_topics: "Desafixa automàticament els temes quan jo arribi al final."
       apps: "Aplicacions"
@@ -886,11 +887,11 @@ ca:
         disable: "Desactiva"
         enable: "Activa"
         enable_long: "Activa els codis de còpia de seguretat"
-        manage: "Gestiona els codis de còpia de seguretat. Us resten <strong>{{count}}</strong> codis de còpia de seguretat. "
+        manage: "Gestiona els codis de còpia de seguretat. Us resten <strong>%{count}</strong> codis de còpia de seguretat. "
         copy_to_clipboard: "Copia al porta-retalls"
         copy_to_clipboard_error: "Error copiant dades al porta-retalls"
         copied_to_clipboard: "Copiat al porta-retalls."
-        remaining_codes: "Us resten <strong>{{count}}</strong> codis de còpia de seguretat."
+        remaining_codes: "Us resten <strong>%{count}</strong> codis de còpia de seguretat."
         use: "Utilitza un codi de còpia de seguretat"
         enable_prerequisites: "Cal habilitar un segon factor primari abans de generar codis de còpia de seguretat."
         codes:
@@ -949,10 +950,10 @@ ca:
         success_staff: "S'ha enviat un missatge a la vostra adreça actual. Seguiu les instruccions de confirmació."
       change_avatar:
         title: "Canvia la foto de perfil"
-        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, basat en"
-        gravatar_title: "Canvieu el vostre avatar en el lloc web de {{gravatarName}}"
-        gravatar_failed: "No hem trobat un {{gravatarName}} amb aquesta adreça de correu electrònic."
-        refresh_gravatar_title: "Actualitzeu el vostre {{gravatarName}}"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, basat en"
+        gravatar_title: "Canvieu el vostre avatar en el lloc web de %{gravatarName}"
+        gravatar_failed: "No hem trobat un %{gravatarName} amb aquesta adreça de correu electrònic."
+        refresh_gravatar_title: "Actualitzeu el vostre %{gravatarName}"
         letter_based: "Foto de perfil assignada pel sistema"
         uploaded_avatar: "Foto personalitzada"
         uploaded_avatar_empty: "Afegeix una foto personalitzada"
@@ -973,11 +974,11 @@ ca:
         instructions: "No es mostra mai en públic."
         ok: "Us enviarem un correu electrònic de confirmació"
         invalid: "Introduïu una adreça vàlida de correu electrònic"
-        authenticated: "El vostre correu electrònic ha estat autenticat per {{provider}}"
+        authenticated: "El vostre correu electrònic ha estat autenticat per %{provider}"
         frequency_immediately: "Us enviarem un correu immediatament si no heu llegit la cosa sobre la qual us escrivim."
         frequency:
           one: "Sols us enviarem un correu electrònic si no us hem vist en el darrer minut."
-          other: "Sols us enviarem un correu electrònic si no us hem vist en els darrers {{count}} minuts."
+          other: "Sols us enviarem un correu electrònic si no us hem vist en els darrers %{count} minuts."
       associated_accounts:
         title: "Comptes associats"
         connect: "Connecta"
@@ -997,9 +998,9 @@ ca:
       username:
         title: "Nom d'usuari"
         instructions: "únic, sense espais, breu"
-        short_instructions: "La gent us pot mencionar com a @{{username}}"
+        short_instructions: "La gent us pot mencionar com a @%{username}"
         available: "El nom d'usuari està disponible"
-        not_available: "No està disponible. I si proveu amb {{suggestion}}?"
+        not_available: "No està disponible. I si proveu amb %{suggestion}?"
         not_available_no_suggestion: "No disponible"
         too_short: "El nom d'usuari és massa breu"
         too_long: "El nom d'usuari és massa llarg"
@@ -1019,11 +1020,11 @@ ca:
         log_out_all: "Tanca totes les sessions"
         active: "actius ara"
         not_you: "No sou vós?"
-        show_all: "Mostra'ls tots ({{count}})"
+        show_all: "Mostra'ls tots (%{count})"
         show_few: "Mostra'n menys"
         was_this_you: "Heu estat vós?"
         was_this_you_description: "Si no heu estat vós, us recomanem que canvieu la contrasenya i que tanqueu les sessions a tot arreu."
-        browser_and_device: "{{browser}} en {{device}}"
+        browser_and_device: "%{browser} en %{device}"
         secure_account: "Fes segur el meu compte"
         latest_post: "L'última cosa que heu publicat..."
       last_posted: "Darrer missatge"
@@ -1103,20 +1104,19 @@ ca:
         none: "Cap invitació per a mostrar."
         truncated:
           one: "Mostrant la primera invitació."
-          other: "Mostrant les primeres {{count}} invitacions."
+          other: "Mostrant les primeres %{count} invitacions."
         redeemed: "Invitacions acceptades"
         redeemed_tab: "Acceptada"
-        redeemed_tab_with_count: "Acceptades ({{count}})"
+        redeemed_tab_with_count: "Acceptades (%{count})"
         redeemed_at: "Acceptada"
         pending: "Invitacions pendents"
         pending_tab: "Pendents"
-        pending_tab_with_count: "Pendents ({{count}})"
+        pending_tab_with_count: "Pendents (%{count})"
         topics_entered: "Temes vists"
         posts_read_count: "Publicacions llegides"
         expired: "Aquesta invitació ha caducat."
         rescind: "Elimina"
         rescinded: "Invitació eliminada"
-        rescind_all: "Elimina totes les invitacions expedides"
         rescinded_all: "Totes les invitacions expirades eliminades!"
         rescind_all_confirm: "Esteu segur que voleu eliminar totes les invitacions expirades?"
         reinvite: "Reenvia la invitació"
@@ -1127,13 +1127,18 @@ ca:
         time_read: "Temps de lectura"
         days_visited: "Dies visitats"
         account_age_days: "Antiguitat del compte en dies"
-        create: "Envia una invitació"
+        links_tab: "Enllaços"
+        link_created_at: "Creat"
+        link_groups: Grups
+        create: "Envia la invitació"
         generate_link: "Copia l'enllaç d'invitació"
         link_generated: "Enllaç d'invitació generat emb èxit!"
         valid_for: "L'enllaç d'invitació només és vàlid per a aquesta adreça de correu: %{email}"
+        single_user: "Usuari únic"
+        invite_link:
+          success: "Enllaç d'invitació generat emb èxit!"
         bulk_invite:
           none: "Encara no heu convidat ningú aquí. Envieu invitacions individuals o convideu molta gent d'un sol cop <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>enviant un fitxer CSV</a>."
-          text: "Invitació massiva des de fitxer"
           success: "Fitxer carregat amb èxit. Us notificarem amb un missatge quan s'hagi completat el procés."
           error: "El fitxer hauria de tenir format CSV."
           confirmation_message: "Esteu a punt d'enviar invitacions a tothom en el fitxer pujat. "
@@ -1224,7 +1229,7 @@ ca:
       desc:
         network: "Comproveu la connexió"
         network_fixed: "Sembla que ja ha tornat"
-        server: "Codi d'error: {{status}}"
+        server: "Codi d'error: %{status}"
         forbidden: "No teniu permís per a veure-ho."
         not_found: "Ui, l'aplicació ha provat de carregar un URL que no existeix."
         unknown: "Alguna cosa ha anat malament"
@@ -1279,8 +1284,8 @@ ca:
       value_prop: "Quan creeu un compte, recordem exactament el que heu llegit, de manera que sempre torneu allà on ho vau deixar. També rebreu notificacions, ací i via correu, quan algú us respon. I podeu dir que us agraden les publicacions per a compartir l'amor. :heartpulse:"
     summary:
       enabled_description: "Ara veieu un resum del tema: les publicacions més interessants segons la comunitat."
-      description: "Hi ha <b>{{replyCount}}</b> respostes."
-      description_time: "Hi ha <b>{{replyCount}}</b> respostes amb un temps de lectura estimat de <b>{{readingTime}} minuts</b>."
+      description: "Hi ha <b>%{replyCount}</b> respostes."
+      description_time: "Hi ha <b>%{replyCount}</b> respostes amb un temps de lectura estimat de <b>%{readingTime} minuts</b>."
       enable: "Resumeix aquest tema"
       disable: "Mostra totes les publicacions"
     deleted_filter:
@@ -1293,8 +1298,8 @@ ca:
       invite: "Convideu altres persones..."
       edit: "Afegeix o elimina..."
       leave_message: "Realment voleu deixar aquest missatge?"
-      remove_allowed_user: "De debò voleu eliminar {{name}} d'aquest missatge?"
-      remove_allowed_group: "De debò voleu eliminar {{name}} d'aquest missatge?"
+      remove_allowed_user: "De debò voleu eliminar %{name} d'aquest missatge?"
+      remove_allowed_group: "De debò voleu eliminar %{name} d'aquest missatge?"
     email: "Correu electrònic"
     username: "Nom d'usuari"
     last_seen: "Vist"
@@ -1303,7 +1308,7 @@ ca:
     trust_level: "Nivell de confiança"
     search_hint: "nom d'usuari, adreça electrònica o adreça IP"
     create_account:
-      disclaimer: "Registrant-vos, accepteu la <a href='{{privacy_link}}' target='blank'>política de privacitat</a> i les <a href='{{tos_link}}' target='blank'>condicions del servei</a>."
+      disclaimer: "Registrant-vos, accepteu la <a href='%{privacy_link}' target='blank'>política de privacitat</a> i les <a href='%{tos_link}' target='blank'>condicions del servei</a>."
       title: "Crea un compte nou"
       failed: "Alguna cosa ha anat malament. Potser aquest correu electrònic ja ha estat registrat; proveu-ho amb l'enllaç de contrasenya oblidada"
     forgot_password:
@@ -1362,7 +1367,7 @@ ca:
       awaiting_activation: "El vostre compte espera l'activació. Utilitzeu l'enllaç de contrasenya oblidada per a tramitar un altre correu d'activació."
       awaiting_approval: "El vostre compte encara no ha estat aprovat per l'equip responsable. Us enviarem un correu quan sigui aprovat."
       requires_invite: "L'accés a aquest fòrum es fa sols amb invitació."
-      not_activated: "Encara no podeu iniciar sessió. Abans us hem enviat un correu d'activació a <b>{{sentTo}}</b>. Seguiu les instruccions del correu per a activar el compte."
+      not_activated: "Encara no podeu iniciar sessió. Abans us hem enviat un correu d'activació a <b>%{sentTo}</b>. Seguiu les instruccions del correu per a activar el compte."
       not_allowed_from_ip_address: "No podeu iniciar la sessió des d'aquesta adreça IP."
       admin_not_allowed_from_ip_address: "No podeu iniciar la sessió com a administrador des d'aquesta adreça IP."
       resend_activation_email: "Feu clic aquí per a enviar de nou el correu d'activació."
@@ -1371,7 +1376,7 @@ ca:
       change_email: "Canvi d'adreça de correu"
       provide_new_email: "Proporcioneu una adreça nova i us reenviarem el correu de confirmació."
       submit_new_email: "Actualitza l'adreça de correu"
-      sent_activation_email_again: "Us hem enviat un altre correu d'activació a <b>{{currentEmail}}</b>. Potser triga a arribar uns pocs minuts; assegureu-vos de comprovar la carpeta de correu brossa."
+      sent_activation_email_again: "Us hem enviat un altre correu d'activació a <b>%{currentEmail}</b>. Potser triga a arribar uns pocs minuts; assegureu-vos de comprovar la carpeta de correu brossa."
       sent_activation_email_again_generic: "S'ha enviat un altre correu d'activació. Pot trigar uns quants minuts a arribar; comproveu la carpeta de correu brossa."
       to_continue: "Inicieu la sessió"
       preferences: "Cal que inicieu la sessió per a canviar les preferències d'usuari."
@@ -1434,19 +1439,19 @@ ca:
     conditional_loading_section:
       loading: Carregant...
     category_row:
-      topic_count: "{{count}}temes en aquesta categoria"
+      topic_count: "%{count}temes en aquesta categoria"
     select_kit:
       default_header_text: Selecciona...
       no_content: No s'han trobat coincidències
       filter_placeholder: Cerca...
       filter_placeholder_with_any: Cerca o crea...
-      create: "Crea: '{{content}}'"
+      create: "Crea: '%{content}'"
       max_content_reached:
-        one: "Sols podeu seleccionar {{count}} element."
-        other: "Sols podeu seleccionar {{count}} elements."
+        one: "Sols podeu seleccionar %{count} element."
+        other: "Sols podeu seleccionar %{count} elements."
       min_content_not_reached:
-        one: "Selecciona almenys {{count}} element."
-        other: "Seleccioneu almenys {{count}}elements."
+        one: "Selecciona almenys %{count} element."
+        other: "Seleccioneu almenys %{count}elements."
     date_time_picker:
       from: De
       to: A
@@ -1473,7 +1478,7 @@ ca:
       default: Emojis personalitzats
     shared_drafts:
       title: "Esborranys compartits"
-      notice: "Aquest tema sols és visible per als qui poden veure la categoria <b>{{category}}</b>."
+      notice: "Aquest tema sols és visible per als qui poden veure la categoria <b>%{category}</b>."
       destination_category: "Categoria de destinació"
       publish: "Publica l'esborrany compartit"
       confirm_publish: "Esteu segur que voleu publicar aquest esborrany?"
@@ -1493,24 +1498,24 @@ ca:
       similar_topics: "El tema és semblant a..."
       drafts_offline: "esborranys fora de línia"
       edit_conflict: "edita el conflicte"
-      group_mentioned_limit: "<b>Atenció!</b> Heu mencionat <a href='{{group_link}}'>{{group}}</a>, però aquest grup té més membres que el límit de mencions configurat per l'administrador: {{max}} usuaris. No serà notificat ningú. "
+      group_mentioned_limit: "<b>Atenció!</b> Heu mencionat <a href='%{group_link}'>%{group}</a>, però aquest grup té més membres que el límit de mencions configurat per l'administrador: %{max} usuaris. No serà notificat ningú. "
       group_mentioned:
-        one: "Si mencioneu {{group}}, ho notificareu a <a href='{{group_link}}'>%{count}persona</a>. Esteu segur?"
-        other: "Si mencioneu {{group}}, ho notificareu a <a href='{{group_link}}'>{{count}} persones</a>. Esteu segur?"
+        one: "Si mencioneu %{group}, ho notificareu a <a href='%{group_link}'>%{count}persona</a>. Esteu segur?"
+        other: "Si mencioneu %{group}, ho notificareu a <a href='%{group_link}'>%{count} persones</a>. Esteu segur?"
       cannot_see_mention:
-        category: "Heu mencionat {{username}}, però no se li notificarà res perquè aquesta persona no gaudeix d'accés a aquesta categoria. Us caldrà afegir-la a un grup que tingui accés a aquesta categoria."
-        private: "Heu mencionat {{username}}, però no es notificarà res perquè aquest usuari no pot veure aquest missatge personal. Haureu de convidar-lo al MP."
-      duplicate_link: "Sembla que l'enllaç a <b>{{domain}}</b> ja havia estat publicat en el tema per <b>@{{username}}</b> en <a href='{{post_url}}'>una resposta {{ago}}</a>. Esteu segur que voleu publicar-lo una altra vegada?"
-      reference_topic_title: "RE: {{title}}"
+        category: "Heu mencionat %{username}, però no se li notificarà res perquè aquesta persona no gaudeix d'accés a aquesta categoria. Us caldrà afegir-la a un grup que tingui accés a aquesta categoria."
+        private: "Heu mencionat %{username}, però no es notificarà res perquè aquest usuari no pot veure aquest missatge personal. Haureu de convidar-lo al MP."
+      duplicate_link: "Sembla que l'enllaç a <b>%{domain}</b> ja havia estat publicat en el tema per <b>@%{username}</b> en <a href='%{post_url}'>una resposta %{ago}</a>. Esteu segur que voleu publicar-lo una altra vegada?"
+      reference_topic_title: "RE: %{title}"
       error:
         title_missing: "El títol és obligatori"
-        title_too_short: "El títol ha de tenir un mínim de {{min}} caràcters"
-        title_too_long: "El títol ha de tenir un màxim de {{max}} caràcters"
+        title_too_short: "El títol ha de tenir un mínim de %{min} caràcters"
+        title_too_long: "El títol ha de tenir un màxim de %{max} caràcters"
         post_missing: "La publicació no pot estar buida"
-        post_length: "La publicació ha de tenir un mínim de {{min}} caràcters"
-        try_like: "Heu provat el botó {{heart}}?"
+        post_length: "La publicació ha de tenir un mínim de %{min} caràcters"
+        try_like: "Heu provat el botó %{heart}?"
         category_missing: "Heu de triar una categoria"
-        tags_missing: "Cal triar almenys {{count}} etiquetes."
+        tags_missing: "Cal triar almenys %{count} etiquetes."
         topic_template_not_modified: "Afegiu detalls i especificacions al tema editant la plantilla."
       save_edit: "Desa l'edició"
       overwrite_edit: "Sobreescriu l'edició"
@@ -1607,56 +1612,56 @@ ca:
       tooltip:
         regular:
           one: "%{count} notificació no vista"
-          other: "{{count}} notificacions no vistes"
+          other: "%{count} notificacions no vistes"
         message:
           one: "%{count} missatge no llegit"
-          other: "{{count}}missatges no llegits"
+          other: "%{count}missatges no llegits"
       title: "notificacions de mencions via @nom, respostes a les vostres  publicacions i temes, missatges, etc."
       none: "És impossible carregar ara mateix les notificacions"
       empty: "No hi ha notificacions."
       post_approved: "La vostra publicació ha estat aprovada"
       reviewable_items: "elements que requereixen revisió"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} i %{count} altre</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} i {{count}} altres</span> {{description}}"
+        one: "<span>%{username}, %{username2} i %{count} altre</span> %{description}"
+        other: "<span>%{username}, %{username2} i %{count} altres</span> %{description}"
       liked_consolidated_description:
-        one: "li agrada {{count}} de les vostres publicacions"
-        other: " {{count}} de les vostres publicacions té 'M'agrada'"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> ha acceptat la vostra invitació"
-      moved_post: "<span>{{username}}</span> ha mogut {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Heu guanyat '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Tema nou</span> {{description}}"
-      membership_request_accepted: "Membre acceptat en '{{group_name}}'"
+        one: "li agrada %{count} de les vostres publicacions"
+        other: " %{count} de les vostres publicacions té 'M'agrada'"
+      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}"
+      invitee_accepted: "<span>%{username}</span> ha acceptat la vostra invitació"
+      moved_post: "<span>%{username}</span> ha mogut %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Heu guanyat '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Tema nou</span> %{description}"
+      membership_request_accepted: "Membre acceptat en '%{group_name}'"
       group_message_summary:
-        one: "{{count}} missatge en la vostra bústia de {{group_name}}"
-        other: "{{count}} missatges en la vostra bústia de {{group_name}}"
+        one: "%{count} missatge en la vostra bústia de %{group_name}"
+        other: "%{count} missatges en la vostra bústia de %{group_name}"
       popup:
-        mentioned: '{{username}} us ha mencionat en "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} us ha mencionat en "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} us ha citat en "{{topic}}" - {{site_title}}'
-        replied: '{{username}} us ha respost en "{{topic}}" - {{site_title}}'
-        posted: '{{username}} publicat en "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} us ha enviat un missatge personal en "{{topic}}" - {{site_title}}'
-        linked: '{{username}} ha enllaçat la vostra publicació en "{{topic}}" - {{site_title}}'
-        watching_first_post: '{{username}} ha creat un tema nou "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} us ha mencionat en "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} us ha mencionat en "%{topic}" - %{site_title}'
+        quoted: '%{username} us ha citat en "%{topic}" - %{site_title}'
+        replied: '%{username} us ha respost en "%{topic}" - %{site_title}'
+        posted: '%{username} publicat en "%{topic}" - %{site_title}'
+        private_message: '%{username} us ha enviat un missatge personal en "%{topic}" - %{site_title}'
+        linked: '%{username} ha enllaçat la vostra publicació en "%{topic}" - %{site_title}'
+        watching_first_post: '%{username} ha creat un tema nou "%{topic}" - %{site_title}'
         confirm_title: "Notificacions activades - %{site_title}"
         confirm_body: "Èxit! S'han habilitat les notificacions."
-        custom: "Notificació de {{username}} sobre %{site_title}"
+        custom: "Notificació de %{username} sobre %{site_title}"
       titles:
         mentioned: "mencionat"
         replied: "resposta nova"
@@ -1683,9 +1688,9 @@ ca:
       from_my_computer: "Des del meu dispositiu"
       from_the_web: "Des de la web"
       remote_tip: "enllaç a imatge"
-      remote_tip_with_attachments: "enllaç a imatge o fixer {{authorized_extensions}} "
+      remote_tip_with_attachments: "enllaç a imatge o fixer %{authorized_extensions} "
       local_tip: "seleccioneu imatges des del vostre dispositiu"
-      local_tip_with_attachments: "trieu imatges o fitxers des del vostre dispositiu {{authorized_extensions}}"
+      local_tip_with_attachments: "trieu imatges o fitxers des del vostre dispositiu %{authorized_extensions}"
       hint: "(per a carregar-los, també podeu arrossegar-los i deixar-los anar en l'editor)"
       hint_for_supported_browsers: "també podeu arrossegar i deixar anar o enganxar imatges en l'editor"
       uploading: "Carregant"
@@ -1702,15 +1707,15 @@ ca:
       clear_all: "Neteja-ho tot"
       too_short: "El terme de la vostra cerca és massa curt"
       result_count:
-        one: "<span>%{count} resultat per a </span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} resultats per a</span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} resultat per a </span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} resultats per a</span><span class='term'>%{term}</span>"
       title: "cerca temes, publicacions, usuaris o categories"
       full_page_title: "cerca temes o publicacions"
       no_results: "No hi ha resultats."
       no_more_results: "No s'han trobat més resultats."
       searching: "Cercant..."
-      post_format: "#{{post_number}} per {{username}}"
-      results_page: "Resultats de la cerca per a '{{term}}'"
+      post_format: "#%{post_number} per %{username}"
+      results_page: "Resultats de la cerca per a '%{term}'"
       more_results: "No hi ha més resultats. Restringiu els criteris de cerca."
       cant_find: "No podeu trobar el que busqueu?"
       start_new_topic: "Podeu començar un tema nou."
@@ -1719,9 +1724,9 @@ ca:
       search_google_button: "Google"
       search_google_title: "Cerca en aquest lloc web"
       context:
-        user: "Cerca publicacions de @{{username}}"
-        category: "Cerca en la categoria #{{category}} "
-        tag: "Cerca l'etiqueta #{{tag}}"
+        user: "Cerca publicacions de @%{username}"
+        category: "Cerca en la categoria #%{category} "
+        tag: "Cerca l'etiqueta #%{tag}"
         topic: "Cerca en aquest tema"
         private_messages: "Cerca missatges"
       advanced:
@@ -1796,7 +1801,7 @@ ca:
         choose_new_category: "Seleccioneu la categoria nova per als temes:"
         selected:
           one: "He seleccionat <b>%{count}</b> tema."
-          other: "Heu seleccionat <b>{{count}}</b> temes."
+          other: "Heu seleccionat <b>%{count}</b> temes."
         change_tags: "Reemplaça etiquetes"
         append_tags: "Annexa etiquetes"
         choose_new_tags: "Trieu noves etiquetes per a aquests temes:"
@@ -1809,7 +1814,7 @@ ca:
         posted: "Encara no heu publicat cap tema."
         latest: "No hi ha temes més recents. És una llàstima."
         bookmarks: "Encara no heu marcat temes com a preferits."
-        category: "No hi ha temes de {{category}}."
+        category: "No hi ha temes de %{category}."
         top: "No hi ha temes principals."
         educate:
           new: '<p>Els vostres temes nous són aquí.</p><p>Per defecte, els temes es consideren nous i mostraran una <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">nova</span> indicació si han estat creats durant els passats 2 dies.</p><p>Aneu a les vostres <a href="%{userPrefsUrl}">preferències</a> per a canviar-ho.</p>'
@@ -1820,13 +1825,13 @@ ca:
         read: "No hi ha més temes llegits."
         new: "No hi ha més temes nous."
         unread: "No hi ha més temes no llegits. "
-        category: "No hi ha més temes de {{category}}."
+        category: "No hi ha més temes de %{category}."
         top: "No hi ha més temes destacats."
         bookmarks: "No hi ha més temes marcats com a preferits."
     topic:
       filter_to:
         one: "%{count} publicació en el tema"
-        other: "{{count}} publicacions en el tema"
+        other: "%{count} publicacions en el tema"
       create: "Tema nou"
       create_long: "Crea un tema nou"
       open_draft: "Obre esborrany"
@@ -1848,10 +1853,10 @@ ca:
       unread: "no llegit"
       new_topics:
         one: "%{count} tema nou"
-        other: "{{count}} temes nous "
+        other: "%{count} temes nous "
       unread_topics:
         one: "%{count} tema no llegit"
-        other: "{{count}} temes no llegits"
+        other: "%{count} temes no llegits"
       title: "Tema"
       invalid_access:
         title: "El tema és privat"
@@ -1865,24 +1870,24 @@ ca:
         description: "No hem pogut trobar aquest tema. Potser ha estat eliminat per un moderador."
       total_unread_posts:
         one: "teniu %{count} missatge no llegit en aquest tema"
-        other: "teniu {{count}} missatges no llegits en aquest tema"
+        other: "teniu %{count} missatges no llegits en aquest tema"
       unread_posts:
         one: "teniu %{count} publicació antiga no llegida en aquest tema"
-        other: "teniu {{count}} publicacions antigues no llegides en aquest tema"
+        other: "teniu %{count} publicacions antigues no llegides en aquest tema"
       new_posts:
         one: "hi ha %{count} publicació nova en aquest tema des de la vostra darrera lectura"
-        other: "hi ha {{count}} publicacions noves en aquest tema des de la vostra darrera lectura"
+        other: "hi ha %{count} publicacions noves en aquest tema des de la vostra darrera lectura"
       likes:
         one: "hi ha %{count} 'M'agrada' en aquest tema"
-        other: "hi ha {{count}} 'M'agrada' en aquest tema"
+        other: "hi ha %{count} 'M'agrada' en aquest tema"
       back_to_list: "Torna a la llista de temes"
       options: "Opcions del tema"
       show_links: "mostra enllaços dins d'aquest tema"
       toggle_information: "commuta els detalls del tema"
-      read_more_in_category: "Voleu llegir-ne més? Navegueu per altres temes a {{catLink}} o {{latestLink}}."
-      read_more: "Voleu llegir-ne més? {{catLink}} o {{latestLink}}."
-      group_request: "Cal que sol·liciteu pertànyer al grup `{{name}}` per a veure aquest tema"
-      group_join: "Cal que us uniu al grup `{{name}}` per a veure aquest tema"
+      read_more_in_category: "Voleu llegir-ne més? Navegueu per altres temes a %{catLink} o %{latestLink}."
+      read_more: "Voleu llegir-ne més? %{catLink} o %{latestLink}."
+      group_request: "Cal que sol·liciteu pertànyer al grup `%{name}` per a veure aquest tema"
+      group_join: "Cal que us uniu al grup `%{name}` per a veure aquest tema"
       group_request_sent: "S'ha enviat la vostra sol·licitud d'afiliació al grup. Sereu informat quan sigui acceptada."
       unread_indicator: "Cap membre encara no ha llegit la darrera publicació d'aquest tema."
       read_more_MF: "Hi ha { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 no llegit</a> } other { are <a href='{basePath}/unread'># no llegits</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 nou</a> tema} other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># nous</a> temes} } restants, or {CATEGORY, select, true {navegueu per altres temes en {catLink}} false {{latestLink}} other {}}"
@@ -2056,25 +2061,25 @@ ca:
         choose_category: "Trieu una categoria per al tema públic:"
       feature_topic:
         title: "Destaca aquest tema"
-        pin: "Fes que aquest tema aparegui al principi de la categoria {{categoryLink}} fins a"
-        confirm_pin: "Ja teniu {{count}} temes afixats. Massa temes afixats poden ser pesats per a usuaris nous o anònims. Esteu segur que voleu afixar un altre tema en aquesta categoria?"
-        unpin: "Elimina aquest tema del principi de la categoria {{categoryLink}}."
-        unpin_until: "Elimina aquest tema del principi de la categoria {{categoryLink}} o espera fins a <strong>%{until}</strong>."
+        pin: "Fes que aquest tema aparegui al principi de la categoria %{categoryLink} fins a"
+        confirm_pin: "Ja teniu %{count} temes afixats. Massa temes afixats poden ser pesats per a usuaris nous o anònims. Esteu segur que voleu afixar un altre tema en aquesta categoria?"
+        unpin: "Elimina aquest tema del principi de la categoria %{categoryLink}."
+        unpin_until: "Elimina aquest tema del principi de la categoria %{categoryLink} o espera fins a <strong>%{until}</strong>."
         pin_note: "Els mateixos usuaris poden desafixar el tema individualment."
         pin_validation: "Cal una data per a afixar aquest tema."
-        not_pinned: "No hi ha temes afixats en {{categoryLink}}."
+        not_pinned: "No hi ha temes afixats en %{categoryLink}."
         already_pinned:
-          one: "Temes clavats a hores d'ara{{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Temes clavats a hores d'ara{{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Temes clavats a hores d'ara%{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Temes clavats a hores d'ara%{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Fes que aquest tema aparegui al començament de tots els temes fins a"
-        confirm_pin_globally: "Ja heu arribat a {{count}} temes afixats globalment. Massa temes afixats poden ser pesats per als usuaris nous o anònims. Esteu segur que voleu afixar un altre tema globalment?"
+        confirm_pin_globally: "Ja heu arribat a %{count} temes afixats globalment. Massa temes afixats poden ser pesats per als usuaris nous o anònims. Esteu segur que voleu afixar un altre tema globalment?"
         unpin_globally: "Elimina aquest tema del començament de totes les llistes de temes."
         unpin_globally_until: "Elimina aquest tema del començament de totes les llistes fins a <strong>%{until}</strong>."
         global_pin_note: "Els mateixos usuaris poden desafixar el tema individualment."
         not_pinned_globally: "No hi ha temes afixats globalment."
         already_pinned_globally:
           one: "Temes actualment afixats globalment: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Temes actualment afixats globalment: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Temes actualment afixats globalment: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Converteix aquest tema en bàner que apareix al capdamunt de totes les pàgines."
         remove_banner: "Elimina el bàner que apareix al capdamunt de totes les pàgines."
         banner_note: "Els usuaris poden descartar el bàner tancant-lo. Només es pot posar un tema com a bàner en un moment donat."
@@ -2104,15 +2109,15 @@ ca:
         to_topic_username: "Heu introduït un nom d'usuari. Li enviarem una notificació amb l'enllaç d'invitació a aquest tema."
         to_username: "Introduïu el nom d'usuari de la persona a qui voleu convidar. Li enviarem una notificació amb l'enllaç d'invitació a aquest tema."
         email_placeholder: "nom@exemple.com"
-        success_email: "Hem enviat una invitació a <b>{{emailOrUsername}}</b>. Us notificarem quan s'accepti. Consulteu la pestanya d'invitacions de la vostra pàgina personal per a mantenir el seguiment de les invitacions."
+        success_email: "Hem enviat una invitació a <b>%{emailOrUsername}</b>. Us notificarem quan s'accepti. Consulteu la pestanya d'invitacions de la vostra pàgina personal per a mantenir el seguiment de les invitacions."
         success_username: "Hem convidat aquest usuari a participar en aquest tema."
         error: "No hem pogut convidar aquesta persona. Potser ja ha estat convidada. (Les invitacions són restringides per freqüència.)"
-        success_existing_email: "Ja existeix un usuari amb l'adreça <b>{{emailOrUsername}}</b>. Hem convidat aquest usuari a participar en aquest tema."
+        success_existing_email: "Ja existeix un usuari amb l'adreça <b>%{emailOrUsername}</b>. Hem convidat aquest usuari a participar en aquest tema."
       login_reply: "Inicieu la sessió per a respondre"
       filters:
         n_posts:
           one: "%{count} publicació"
-          other: "{{count}} publicacions"
+          other: "%{count} publicacions"
         cancel: "Elimina filtre"
       move_to:
         title: "Mou a"
@@ -2126,7 +2131,7 @@ ca:
         error: "Hi ha hagut un error en moure publicacions a aquest tema nou."
         instructions:
           one: "Esteu a punt de crear un tema nou i de difondre'l amb la publicació que heu triat."
-          other: "Esteu a punt de crear un tema nou i de difondre'l amb les <b>{{count}}</b> publicacions que heu triat."
+          other: "Esteu a punt de crear un tema nou i de difondre'l amb les <b>%{count}</b> publicacions que heu triat."
       merge_topic:
         title: "Mou a un tema existent"
         action: "mou a un tema existent"
@@ -2134,7 +2139,7 @@ ca:
         radio_label: "Tema existent"
         instructions:
           one: "Trieu el tema al qual voldríeu moure aquesta publicació."
-          other: "Trieu el tema al qual voldríeu moure aquestes <b>{{count}}</b> publicacions."
+          other: "Trieu el tema al qual voldríeu moure aquestes <b>%{count}</b> publicacions."
       move_to_new_message:
         title: "Mou a missatge nou"
         action: "mou a missatge nou"
@@ -2143,7 +2148,7 @@ ca:
         participants: "Participants"
         instructions:
           one: "Esteu a punt de crear un missatge nou i omplir-lo amb la publicació que heu seleccionat."
-          other: "Esteu a punt de crear un missatge nou i omplir-lo amb les <b>{{count}}</b> publicacions que heu seleccionat."
+          other: "Esteu a punt de crear un missatge nou i omplir-lo amb les <b>%{count}</b> publicacions que heu seleccionat."
       move_to_existing_message:
         title: "Mou a un missatge existent"
         action: "mou a un missatge existent"
@@ -2151,7 +2156,7 @@ ca:
         participants: "Participants"
         instructions:
           one: "Trieu el missatge al qual voleu moure aquesta publicació."
-          other: "Trieu un missatge al qual voleu moure aquestes<b>{{count}}</b> publicacions. "
+          other: "Trieu un missatge al qual voleu moure aquestes<b>%{count}</b> publicacions. "
       merge_posts:
         title: "Combina les publicacions seleccionades"
         action: "combina les publicacions seleccionades"
@@ -2162,8 +2167,8 @@ ca:
         error: "Hi ha hagut un error en canviar la propietat de les publicacions."
         placeholder: "nom d'usuari del nou propietari"
         instructions:
-          one: "Trieu un nou propietari per a la publicació de <b>@{{old_user}}</b>"
-          other: "Trieu un nou propietari per a les {{count}} publicacions de <b>@{{old_user}}</b>"
+          one: "Trieu un nou propietari per a la publicació de <b>@%{old_user}</b>"
+          other: "Trieu un nou propietari per a les %{count} publicacions de <b>@%{old_user}</b>"
       change_timestamp:
         title: "Canvia la marca de temps"
         action: "canvia la marca de temps"
@@ -2172,7 +2177,7 @@ ca:
         instructions: "Trieu la nova marca de temps del tema. Les publicacions del tema s'actualitzaran per a tenir la mateixa diferència de temps."
       multi_select:
         select: "selecciona"
-        selected: "seleccionat ({{count}})"
+        selected: "seleccionat (%{count})"
         select_post:
           label: "selecciona"
           title: "Afegeix la publicació a la selecció"
@@ -2191,20 +2196,20 @@ ca:
         deselect_all: desmarca-ho tot
         description:
           one: Heu seleccionat <b>%{count}</b> publicació
-          other: "Heu seleccionat <b>{{count}}</b> publicacions."
+          other: "Heu seleccionat <b>%{count}</b> publicacions."
       deleted_by_author:
         one: "(tema abandonat per l'autor, serà suprimit automàticament en %{count}hora llevat que sigui senyalat amb bandera)"
         other: "(tema abandonat per l'autor, serà suprimit automàticament en %{count} hores llevat que sigui senyalat amb bandera)"
     post:
       quote_reply: "Cita"
       edit_reason: "Motiu:"
-      post_number: "publicació {{number}}"
+      post_number: "publicació %{number}"
       ignored: "Contingut ignorat"
       wiki_last_edited_on: "wiki editada per darrera vegada "
       last_edited_on: "publicació editada per darrera vegada el"
       reply_as_new_topic: "Respon com a tema enllaçat"
       reply_as_new_private_message: "Respon amb un missatge nou als mateixos destinataris."
-      continue_discussion: "Continuant la discussió de {{postLink}}:"
+      continue_discussion: "Continuant la discussió de %{postLink}:"
       follow_quote: "vés a la publicació citada"
       show_full: "Mostra la publicació sencera"
       show_hidden: "Mira el contingut ignorat"
@@ -2216,29 +2221,29 @@ ca:
       locked: "un membre de l'equip responsable ha blocat l'edició d'aquesta publicació "
       gap:
         one: "mostra %{count} resposta amagada"
-        other: "mostra {{count}} respostes amagades"
+        other: "mostra %{count} respostes amagades"
       notice:
-        new_user: "Aquesta és la primera vegada que {{user}} ha publicat: donem-li la benvinguda a la comunitat!"
-        returning_user: "Fa un quant temps que no veiem {{user}}: la seva darrera publicació va ser {{time}}."
+        new_user: "Aquesta és la primera vegada que %{user} ha publicat: donem-li la benvinguda a la comunitat!"
+        returning_user: "Fa un quant temps que no veiem %{user}: la seva darrera publicació va ser %{time}."
       unread: "Publicació no llegida"
       has_replies:
-        one: "{{count}} resposta"
-        other: "{{count}} respostes"
+        one: "%{count} resposta"
+        other: "%{count} respostes"
       has_likes_title:
         one: "La publicació agrada a %{count} persona"
-        other: "La publicació agrada a {{count}} persones"
+        other: "La publicació agrada a %{count} persones"
       has_likes_title_only_you: "us ha agradat aquesta publicació"
       has_likes_title_you:
         one: "La publicació us agrada a vós i a %{count} persona"
-        other: "La publicació us agrada a vós i a {{count}} persones"
+        other: "La publicació us agrada a vós i a %{count} persones"
       errors:
         create: "S'ha produït un error en crear la vostra publicació. Torneu-ho a provar."
         edit: "S'ha produït un error en editar la vostra publicació. Torneu-ho a provar."
         upload: "Ho sentim. S'ha produït un error en carregar aquest fitxer. Torneu-ho a provar."
-        file_too_large: "Ho sentim, el fitxer és massa gros (mida màxima {{max_size_kb}} kb). Per què no pugeu el fitxer a un servei en el núvol i llavors enganxeu l'enllaç?"
+        file_too_large: "Ho sentim, el fitxer és massa gros (mida màxima %{max_size_kb} kb). Per què no pugeu el fitxer a un servei en el núvol i llavors enganxeu l'enllaç?"
         too_many_uploads: "Només podeu pujar un fitxer cada vegada."
-        too_many_dragged_and_dropped_files: "Ho sentim, només podeu pujar {{max}} fitxers de cop."
-        upload_not_authorized: "El fitxer que proveu de pujar no està autoritzat (les extensions autoritzades són: {{authorized_extensions}})."
+        too_many_dragged_and_dropped_files: "Ho sentim, només podeu pujar %{max} fitxers de cop."
+        upload_not_authorized: "El fitxer que proveu de pujar no està autoritzat (les extensions autoritzades són: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Els usuaris nous no poden pujar imatges."
         attachment_upload_not_allowed_for_new_user: "Els usuaris nous no poden adjuntar fitxers."
         attachment_download_requires_login: "Heu d'iniciar la sessió per a descarregar fitxers adjunts."
@@ -2278,10 +2283,10 @@ ca:
           confirm: "També voleu suprimir les respostes a aquesta publicació?"
           direct_replies:
             one: "Sí, i %{count} resposta directa"
-            other: "Sí, i {{count}} respostes directes."
+            other: "Sí, i %{count} respostes directes."
           all_replies:
             one: "Sí, i %{count} resposta"
-            other: "Sí, i totes les {{count}} respostes"
+            other: "Sí, i totes les %{count} respostes"
           just_the_post: "No, només aquesta publicació"
         admin: "accions d'administració de publicació"
         wiki: "Passa a wiki"
@@ -2324,8 +2329,8 @@ ca:
             one: "ha fet 'M'agrada' "
             other: "han fet 'M'agrada' "
           like_capped:
-            one: "i {{count}}més han dit que els agrada"
-            other: "i {{count}}més han dit que els agrada"
+            one: "i %{count}més han dit que els agrada"
+            other: "i %{count}més han dit que els agrada"
         by_you:
           off_topic: "Ho heu marcat amb bandera de fora de context"
           spam: "Ho heu marcat amb bandera de brossa"
@@ -2337,11 +2342,11 @@ ca:
       delete:
         confirm:
           one: "Esteu segur que voleu suprimir aquesta publicació?"
-          other: "Esteu segur que voleu suprimir aquestes {{count}} publicacions?"
+          other: "Esteu segur que voleu suprimir aquestes %{count} publicacions?"
       merge:
         confirm:
           one: "Esteu segur que voleu combinar aquesta publicació?"
-          other: "Esteu segur que voleu combinar aquests {{count}}missatges?"
+          other: "Esteu segur que voleu combinar aquests %{count}missatges?"
       revisions:
         controls:
           first: "Primera revisió"
@@ -2353,7 +2358,7 @@ ca:
           revert: "Reverteix a aquesta revisió"
           edit_wiki: "Edita Wiki"
           edit_post: "Edita publicació"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "Mostra la sortida renderitzada amb afegits i eliminacions en línia"
@@ -2531,13 +2536,13 @@ ca:
       custom_message:
         at_least:
           one: "introduïu almenys %{count} caràcter"
-          other: "introduïu almenys {{count}} caràcters"
+          other: "introduïu almenys %{count} caràcters"
         more:
           one: "En falta només %{count} "
-          other: "En falten {{count}} "
+          other: "En falten %{count} "
         left:
           one: "%{count} restant"
-          other: "{{count}} restants"
+          other: "%{count} restants"
     flagging_topic:
       title: "Gràcies per ajudar a mantenir endreçada la comunitat!"
       action: "Marca el tema amb bandera "
@@ -2581,7 +2586,7 @@ ca:
         title: "Aquest tema és un missatge personal"
         help: "Aquest tema és un missatge personal"
     posts: "Publicacions"
-    posts_long: "hi ha {{number}} publicacions a aquest tema"
+    posts_long: "hi ha %{number} publicacions a aquest tema"
     posts_likes_MF: |
       Aquest tema té {count, plural, one {1 resposta} other {# respostes}} {ratio, select,
       low {amb una proporció alta de 'm'agrada' per publicació}
@@ -2596,20 +2601,20 @@ ca:
     replies: "Respostes"
     views_long:
       one: "aquest tema ha estat vist %{count} vegada"
-      other: "aquest tema ha estat vist {{number}} vegades"
+      other: "aquest tema ha estat vist %{number} vegades"
     activity: "Activitat"
     likes: "'M'agrada'"
     likes_lowercase:
       one: "'M'agrada'"
       other: "'M'agrada'"
-    likes_long: "aquest tema ha agradat {{number}} vegades"
+    likes_long: "aquest tema ha agradat %{number} vegades"
     users: "Usuaris"
     users_lowercase:
       one: "usuari"
       other: "usuaris"
     category_title: "Categoria"
     history: "Historial"
-    changed_by: "per {{author}}"
+    changed_by: "per %{author}"
     raw_email:
       title: "Correu entrant"
       not_available: "No disponible!"
@@ -2621,33 +2626,33 @@ ca:
         title: "Més recents"
         title_with_count:
           one: "Darrer (%{count})"
-          other: "Més recents ({{count}})"
+          other: "Més recents (%{count})"
         help: "temes amb publicacions recents"
       read:
         title: "Llegit"
         help: "temes que heu llegit, segons l'ordre de lectura"
       categories:
         title: "Categories"
-        title_in: "Categoria - {{categoryName}}"
+        title_in: "Categoria - %{categoryName}"
         help: "tots els temes agrupats per categoria"
       unread:
         title: "No llegits"
         title_with_count:
           one: "No llegit (%{count})"
-          other: "No llegits ({{count}})"
+          other: "No llegits (%{count})"
         help: "temes que vigileu o seguiu amb publicacions no llegides"
         lower_title_with_count:
           one: "%{count} no llegit"
-          other: "{{count}} no llegits"
+          other: "%{count} no llegits"
       new:
         lower_title_with_count:
           one: "%{count} nou"
-          other: "{{count}} nous"
+          other: "%{count} nous"
         lower_title: "nou"
         title: "Nous"
         title_with_count:
           one: "Nou (%{count})"
-          other: "Nous ({{count}})"
+          other: "Nous (%{count})"
         help: "temes creats durant els darrers dies"
       posted:
         title: "Les meves publicacions"
@@ -2656,11 +2661,11 @@ ca:
         title: "Preferits"
         help: "temes que heu marcat com a preferits"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "temes més recents en la categoria {{categoryName}} "
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "temes més recents en la categoria %{categoryName} "
       top:
         title: "Principals"
         help: "els temes més actius durant el darrer any, mes, setmana o dia"
@@ -2682,6 +2687,8 @@ ca:
         this_month: "Mes"
         this_week: "Setmana"
         today: "Avui"
+        other_periods: "Vegeu a dalt:"
+    browser_update: 'Malauradament, <a href="https://www.discourse.org/faq/#browser">el vostre navegador és massa antic per a treballar amb aquest lloc web</a>. <a href="https://browsehappy.com">Actualitzeu el navegador</a> per a veure contingut més ric, iniciar sessió i respondre.'
     permission_types:
       full: "Crea / Respon / Mira"
       create_post: "Respon / Mira"
@@ -2802,7 +2809,7 @@ ca:
       delete_tag: "Suprimeix l'etiqueta"
       delete_confirm:
         one: "Esteu segur que voleu suprimir aquesta etiqueta i eliminar-la del tema %{count} al qual és assignada?"
-        other: "Esteu segur que voleu suprimir aquesta etiqueta i eliminar-la dels {{count}} temes als quals és assignada?"
+        other: "Esteu segur que voleu suprimir aquesta etiqueta i eliminar-la dels %{count} temes als quals és assignada?"
       delete_confirm_no_topics: "Esteu segur que voleu suprimir aquesta etiqueta?"
       rename_tag: "Reanomena l'etiqueta"
       rename_instructions: "Trieu un nom nou per a l'etiqueta:"
@@ -3150,10 +3157,10 @@ ca:
           redeliver: "Torna a lliurar"
           incoming:
             one: "Hi ha un nou esdeveniment."
-            other: "Hi ha {{count}} esdeveniments nous."
+            other: "Hi ha %{count} esdeveniments nous."
           completed_in:
             one: "Completat en %{count} segon."
-            other: "Completat en {{count}} segons."
+            other: "Completat en %{count} segons."
           request: "Sol·licita"
           response: "Reacció"
           redeliver_confirm: "Esteu segur que voleu tornar a lliurar la mateixa càrrega útil?"
@@ -3205,12 +3212,12 @@ ca:
           label: "Carrega"
           title: "Carrega una còpia de seguretat a aquesta instància"
           uploading: "Carregant..."
-          uploading_progress: "Carregant... {{progress}}%"
-          success: "{{filename}} s'ha carregat amb èxit. El fitxer ara és processat i trigarà fins a un minut a aparèixer en la llista."
-          error: "S'ha produït un error en carregar '{{filename}}': {{message}}"
+          uploading_progress: "Carregant... %{progress}%"
+          success: "%{filename} s'ha carregat amb èxit. El fitxer ara és processat i trigarà fins a un minut a aparèixer en la llista."
+          error: "S'ha produït un error en carregar '%{filename}': %{message}"
         operations:
           is_running: "Ara hi ha una operació en marxa..."
-          failed: "Ha fallat {{operation}}. Consulteu els registres (logs)."
+          failed: "Ha fallat %{operation}. Consulteu els registres (logs)."
           cancel:
             label: "Cancel·la"
             title: "Cancel·la l'operació actual"
@@ -3328,7 +3335,7 @@ ca:
           disabled_component_tooltip: "Aquest component s'ha desactivat"
           default_theme_tooltip: "Aquesta aparença és l'aparença predeterminada del lloc web"
           updates_available_tooltip: "Hi ha actualitzacions disponibles per a aquesta aparença"
-          and_x_more: "i {{count}} més."
+          and_x_more: "i %{count} més."
           collapse: Redueix
           uploads: "Càrregues"
           no_uploads: "Podeu pujar elements associats a la vostra aparença com ara fonts tipogràfiques i imatges"
@@ -3372,8 +3379,8 @@ ca:
           disabled_by: "Aquest component ha estat desactivat per"
           required_version:
             error: "Aquesta aparença s'ha desactivat automàticament perquè no és compatible amb aquesta versió de Discourse."
-            minimum: "Requereix una versió de Discourse {{version}} o superior."
-            maximum: "Requereix una versió de Discourse {{version}} o inferior."
+            minimum: "Requereix una versió de Discourse %{version} o superior."
+            maximum: "Requereix una versió de Discourse %{version} o inferior."
           component_of: "Component de:"
           update_to_latest: "Actualitza al més recent"
           check_for_updates: "Comprova si hi ha actualitzacions"
@@ -3386,7 +3393,7 @@ ca:
           empty: "Sense elements"
           commits_behind:
             one: "L'aparença és%{count} commit darrere!"
-            other: "L'aparença és {{count}} commits darrere!"
+            other: "L'aparença és %{count} commits darrere!"
           compare_commits: "(Vegeu els commits nous)"
           repo_unreachable: "No s'ha pogut contactar amb el repositori git d'aquesta aparença. Missatge d'error:"
           imported_from_archive: "Aquesta aparença s'ha importat d'un fitxer .zip"
@@ -3785,8 +3792,8 @@ ca:
           title: "Mostra l'adreça de correu d'aquest usuari"
           text: "Mostra"
       user:
-        suspend_failed: "Ha fallat alguna cosa en suspendre aquest usuari: {{error}}"
-        unsuspend_failed: "Alguna cosa ha fallat en desfer la suspensió de l'usuari {{error}}"
+        suspend_failed: "Ha fallat alguna cosa en suspendre aquest usuari: %{error}"
+        unsuspend_failed: "Alguna cosa ha fallat en desfer la suspensió de l'usuari %{error}"
         suspend_duration: "Quant de temps durarà la suspensió d'aquest usuari?"
         suspend_reason_label: "Per què suspeneu aquest usuari? Aquest text <b>serà visible per a tothom</b> en el perfil de l'usuari, i es mostrarà a l'usuari quan vulgui iniciar la sessió. Sigueu breu."
         suspend_reason_hidden_label: "Per què suspeneu aquest usuari? Aquest text es mostrarà a l'usuari quan intenti iniciar la sessió. Sigueu breu. "
@@ -4133,6 +4140,7 @@ ca:
         title: "Emoji"
         help: "Afegeix un nou emoji que estarà disponible per a tothom. (CONSELL: arrossegueu i deixeu anar molts fitxers de cop)"
         add: "Afegeix emoji nou"
+        uploading: "Carregant..."
         name: "Nom"
         group: "Grup"
         image: "Imatge"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index e27f0a61cd..b2f81bc439 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -25,8 +25,8 @@ cs:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
@@ -252,10 +252,10 @@ cs:
     max_of_count: "max z"
     alternation: "nebo"
     character_count:
-      one: "{{count}} znak"
-      few: "{{count}} znaky"
-      many: "{{count}} znaků"
-      other: "{{count}} znaků"
+      one: "%{count} znak"
+      few: "%{count} znaky"
+      many: "%{count} znaků"
+      other: "%{count} znaků"
     related_messages:
       title: "Související zprávy"
       see_all: 'Zobrazit <a href="%{path}">všechny zprávy</a>od @%{username}'
@@ -307,20 +307,20 @@ cs:
         yes_value: "Ano, zahodit"
         no_value: "Nezahazovat"
     topic_count_latest:
-      one: "Zobrazit {{count}} nové nebo upravené téma"
-      few: "Zobrazit {{count}} nová nebo upravená témata"
-      many: "Zobrazit {{count}} nových nebo upravených témat"
-      other: "Zobrazit {{count}} nových nebo upravených témat"
+      one: "Zobrazit %{count} nové nebo upravené téma"
+      few: "Zobrazit %{count} nová nebo upravená témata"
+      many: "Zobrazit %{count} nových nebo upravených témat"
+      other: "Zobrazit %{count} nových nebo upravených témat"
     topic_count_unread:
-      one: "Zobrazit {{count}} nepřečtené téma"
-      few: "Zobrazit {{count}} nepřečtená témata"
-      many: "Zobrazit {{count}} nepřečtených témat"
-      other: "Zobrazit {{count}} nepřečtených témat"
+      one: "Zobrazit %{count} nepřečtené téma"
+      few: "Zobrazit %{count} nepřečtená témata"
+      many: "Zobrazit %{count} nepřečtených témat"
+      other: "Zobrazit %{count} nepřečtených témat"
     topic_count_new:
-      one: "Zobrazit {{count}} nové téma"
-      few: "Zobrazit {{count}} nová témata"
-      many: "Zobrazit {{count}} nových témat"
-      other: "Zobrazit {{count}} nových témat"
+      one: "Zobrazit %{count} nové téma"
+      few: "Zobrazit %{count} nová témata"
+      many: "Zobrazit %{count} nových témat"
+      other: "Zobrazit %{count} nových témat"
     preview: "ukázka"
     cancel: "zrušit"
     save: "Uložit změny"
@@ -328,7 +328,7 @@ cs:
     saved: "Uloženo!"
     upload: "Obrázek"
     uploading: "Nahrávám..."
-    uploading_filename: "Nahrává se {{filename}}..."
+    uploading_filename: "Nahrává se %{filename}..."
     clipboard: "schránka"
     uploaded: "Nahráno!"
     pasting: "Vkládám..."
@@ -386,19 +386,19 @@ cs:
         description: "Obdrželi jsme váš příspěvek, ale musí být před zveřejněním schválen moderátorem. Buďte trpěliví."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> zaslal <a href='{{topicUrl}}'>téma</a>"
-      you_posted_topic: "Zaslal jste <a href='{{topicUrl}}'>téma</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> odpověděl na příspěvek <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "Odpověděl jste na příspěvek <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> přispěl do <a href='{{topicUrl}}'>tématu</a>"
-      you_replied_to_topic: "Přispěl jste do <a href='{{topicUrl}}'>tématu</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> zmínil uživatele <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> <a href='{{user2Url}}'>vás</a> zmínil"
-      you_mentioned_user: "Zmínil jste uživatele <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Příspěvěk od <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Odesláno <a href='{{userUrl}}'>vámi</a>"
-      sent_by_user: "Posláno uživatelem <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Posláno <a href='{{userUrl}}'>vámi</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> zaslal <a href='%{topicUrl}'>téma</a>"
+      you_posted_topic: "Zaslal jste <a href='%{topicUrl}'>téma</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> odpověděl na příspěvek <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "Odpověděl jste na příspěvek <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> přispěl do <a href='%{topicUrl}'>tématu</a>"
+      you_replied_to_topic: "Přispěl jste do <a href='%{topicUrl}'>tématu</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> zmínil uživatele <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> <a href='%{user2Url}'>vás</a> zmínil"
+      you_mentioned_user: "Zmínil jste uživatele <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Příspěvěk od <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Odesláno <a href='%{userUrl}'>vámi</a>"
+      sent_by_user: "Posláno uživatelem <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Posláno <a href='%{userUrl}'>vámi</a>"
     directory:
       filter_name: "Filtrovat podle uživatelského jména"
       title: "Uživatelé"
@@ -616,7 +616,7 @@ cs:
     user_fields:
       none: "(zvolit možnost)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profil"
       mute: "Ignorovat"
       edit: "Upravit nastavení"
@@ -670,12 +670,12 @@ cs:
       external_links_in_new_tab: "Otevírat všechny externí odkazy do nové záložky"
       enable_quoting: "Povolit odpověď s citací z označeného textu"
       change: "změnit"
-      moderator: "{{user}} je moderátor"
-      admin: "{{user}} je administrátor"
+      moderator: "%{user} je moderátor"
+      admin: "%{user} je administrátor"
       moderator_tooltip: "Tento uživatel je moderátor"
       admin_tooltip: "Tento uživatel je admi"
       silenced_tooltip: "Tento uživatel je ztišen."
-      suspended_notice: "Uživatel je suspendován do {{date}}."
+      suspended_notice: "Uživatel je suspendován do %{date}."
       suspended_permanently: "Tento uživatel je suspendován."
       suspended_reason: "Důvod: "
       github_profile: "Github"
@@ -688,7 +688,7 @@ cs:
           Ztlumená témata a kategorie nejsou zahrnuté v těchto emailech.
         individual: "Upozornit emailem na každý nový příspěvek"
         individual_no_echo: "Upozornit emailem na každý nový příspěvek kromě mých vlastních"
-        many_per_day: "Upozornit emailem na každý nový příspěvek (asi {{dailyEmailEstimate}} každý den)"
+        many_per_day: "Upozornit emailem na každý nový příspěvek (asi %{dailyEmailEstimate} každý den)"
         few_per_day: "Upozornit emailem na každý nový příspěvek (asi 2 každý den)"
         warning: "Režim emailové konference povolen. Nastavení emailových notifikací neplatí."
       tag_settings: "Štítky"
@@ -717,7 +717,6 @@ cs:
       admin_delete: "Smazat"
       users: "Uživatelé"
       muted_users: "Ztišení"
-      muted_users_instructions: "Umlčet všechny notifikace od těchto uživatelů."
       tracked_topics_link: "Zobrazit"
       automatically_unpin_topics: "Atomaticky odepni téma jakmile se dostanu na konec."
       apps: "Aplikace"
@@ -773,7 +772,7 @@ cs:
         copy_to_clipboard: "Kopírovat do schránky"
         copy_to_clipboard_error: "Chyba při kopírování dat do schránky"
         copied_to_clipboard: "Zkopírováno do schránky"
-        remaining_codes: "Zbývá vám <strong>{{count}}</strong> záložní kód."
+        remaining_codes: "Zbývá vám <strong>%{count}</strong> záložní kód."
         codes:
           title: "Záložní kódy vytvořeny"
           description: "Každý z těchto kódů může být použit jen jednou. Uložte si je někde v bezpečí, ale dostupné."
@@ -825,13 +824,13 @@ cs:
         instructions: "Nikdy nebude zveřejněno."
         ok: "Pro potvrzení vám pošleme email."
         invalid: "Zadejte prosím správnou emailovou adresu"
-        authenticated: "Vaše emailová adresa byla autorizována přes službu {{provider}}."
+        authenticated: "Vaše emailová adresa byla autorizována přes službu %{provider}."
         frequency_immediately: "Pokud jste obsah dosud nečetli, pošleme vám ho ihned emailem."
         frequency:
           one: "Email vám zašleme pouze pokud jste se neukázali během poslední minuty."
-          few: "Email vám zašleme pouze pokud jste se neukázali během posledních {{count}} minut."
-          many: "Email vám zašleme pouze pokud jste se neukázali během posledních {{count}} minut."
-          other: "Email vám zašleme pouze pokud jste se neukázali během posledních {{count}} minut."
+          few: "Email vám zašleme pouze pokud jste se neukázali během posledních %{count} minut."
+          many: "Email vám zašleme pouze pokud jste se neukázali během posledních %{count} minut."
+          other: "Email vám zašleme pouze pokud jste se neukázali během posledních %{count} minut."
       associated_accounts:
         title: "Propojené účty"
         connect: "Připojit"
@@ -847,9 +846,9 @@ cs:
       username:
         title: "Uživatelské jméno"
         instructions: "jedinečné, bez mezer, krátké"
-        short_instructions: "Lidé vás mohou zmínit pomocí @{{username}}"
+        short_instructions: "Lidé vás mohou zmínit pomocí @%{username}"
         available: "Vaše uživatelské jméno je volné"
-        not_available: "Není k dispozici. Co třeba {{suggestion}}?"
+        not_available: "Není k dispozici. Co třeba %{suggestion}?"
         not_available_no_suggestion: "Není k dispozici"
         too_short: "Uživatelské jméno je moc krátké"
         too_long: "Uživatelské jméno je moc dlouhé"
@@ -869,10 +868,10 @@ cs:
         log_out_all: "Odhlásit všechny"
         active: "právě aktivní"
         not_you: "Nejste to vy?"
-        show_all: "Ukázat vše ({{count}})"
+        show_all: "Ukázat vše (%{count})"
         show_few: "Ukázat méně"
         was_this_you: "Byla to vaše návštěva?"
-        browser_and_device: "{{browser}} na {{device}}"
+        browser_and_device: "%{browser} na %{device}"
       last_posted: "Poslední příspěvek"
       last_emailed: "Email naposledy zaslán"
       last_seen: "Naposledy viděn"
@@ -938,16 +937,16 @@ cs:
         none: "Nejsou žádné pozvánky k zobrazení."
         truncated:
           one: "Zobrazena první pozvánka."
-          few: "Zobrazeno prvních {{count}} pozvánek."
-          many: "Zobrazeno prvních {{count}} pozvánek."
-          other: "Zobrazeno prvních {{count}} pozvánek."
+          few: "Zobrazeno prvních %{count} pozvánek."
+          many: "Zobrazeno prvních %{count} pozvánek."
+          other: "Zobrazeno prvních %{count} pozvánek."
         redeemed: "Uplatněné pozvánky"
         redeemed_tab: "Uplatněno"
-        redeemed_tab_with_count: "Vyřízeno ({{count}})"
+        redeemed_tab_with_count: "Vyřízeno (%{count})"
         redeemed_at: "Uplatněno"
         pending: "Nevyřízené pozvánky"
         pending_tab: "Čeká na schválení"
-        pending_tab_with_count: "Nevyřízeno ({{count}})"
+        pending_tab_with_count: "Nevyřízeno (%{count})"
         topics_entered: "Zobrazil témat"
         posts_read_count: "Přečteno příspěvků"
         expired: "Poznávka je už prošlá."
@@ -961,13 +960,17 @@ cs:
         time_read: "Čas čtení"
         days_visited: "Přítomen dnů"
         account_age_days: "Stáří účtu ve dnech"
+        links_tab: "Odkazy"
+        link_created_at: "Vytvořený"
+        link_groups: Skupiny
         create: "Poslat pozvánku"
         generate_link: "Zkopírovat odkaz na pozvánku"
         link_generated: "Odkaz pozvánky byl úspěšně vygenerován!"
         valid_for: "Odkaz pozvánky je platný pouze pro tuto emailovou adresu: %{email}"
+        invite_link:
+          success: "Odkaz pozvánky byl úspěšně vygenerován!"
         bulk_invite:
           none: "Nikoho jste zatím nepozval. Můžete poslat individuální pozvánky, případně <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>nahrát CSV soubor</a> a pozvat tak několik lidí najednou."
-          text: "Hromadné pozvání s pomocí souboru"
           success: "Nahrání souboru proběhlo úspěšně. O dokončení celého procesu budete informování pomocí zprávy."
           error: "Omlouváme se, soubor by měl být ve formátu CSV."
       password:
@@ -1073,7 +1076,7 @@ cs:
       desc:
         network: "Prosím zkontrolujte své připojení."
         network_fixed: "Looks like it's back."
-        server: "Kód chyby: {{status}}"
+        server: "Kód chyby: %{status}"
         forbidden: "Nemáte povolení to spatřit."
         not_found: "Jejda, aplikace zkusila načíst neexistující URL."
         unknown: "Něco se pokazilo."
@@ -1125,8 +1128,8 @@ cs:
       value_prop: "Pokud si založíš účet, budeme si přesně pamatovat, co jsi četl, takže se vždycky vrátíš do bodu, odkud jsi odešel. Také budeš dostávat upozornění zde a přes e-mail, kdykoli ti někdo odpoví. A můžeš přidávat 'to se mi líbí' a šířit tak lásku. :heartpulse:"
     summary:
       enabled_description: "Čtete shrnutí tohoto tématu: nejzajímavější příspěvky podle komunity."
-      description: "Je tu <b>{{replyCount}}</b> odpovědí."
-      description_time: "Je tu <b>{{replyCount}}</b> odpovědí o odhadovaném času čtení <b>{{readingTime}} minut</b>."
+      description: "Je tu <b>%{replyCount}</b> odpovědí."
+      description_time: "Je tu <b>%{replyCount}</b> odpovědí o odhadovaném času čtení <b>%{readingTime} minut</b>."
       enable: "Přepnout na \"nejlepší příspěvky\""
       disable: "Přepnout na normální zobrazení"
     deleted_filter:
@@ -1139,8 +1142,8 @@ cs:
       invite: "Pozvat další..."
       edit: "Přidat nebo odebrat..."
       leave_message: "Opravdu chcete opustit tuto zprávu?"
-      remove_allowed_user: "Určitě chcete odstranit {{name}} z této zprávy?"
-      remove_allowed_group: "Opravdu chcete odstranit {{name}} z této zprávy?"
+      remove_allowed_user: "Určitě chcete odstranit %{name} z této zprávy?"
+      remove_allowed_group: "Opravdu chcete odstranit %{name} z této zprávy?"
     email: "Email"
     username: "Uživatelské jméno"
     last_seen: "Naposledy viděn"
@@ -1194,7 +1197,7 @@ cs:
       awaiting_activation: "Váš účet nyní čeká na aktivaci, použijte odkaz pro zapomenuté heslo, jestli chcete, abychom vám zaslali další aktivační email."
       awaiting_approval: "Váš účet zatím nebyl schválen členem redakce. Až se tak stane, budeme vás informovat emailem."
       requires_invite: "Promiňte, toto fórum je pouze pro zvané."
-      not_activated: "Ještě se nemůžete přihlásit. Zaslali jsme vám aktivační email v <b>{{sentTo}}</b>. Prosím následujte instrukce v tomto emailu, abychom mohli váš účet aktivovat."
+      not_activated: "Ještě se nemůžete přihlásit. Zaslali jsme vám aktivační email v <b>%{sentTo}</b>. Prosím následujte instrukce v tomto emailu, abychom mohli váš účet aktivovat."
       not_allowed_from_ip_address: "Z této IP adresy se nemůžete přihlásit."
       admin_not_allowed_from_ip_address: "Z této IP adresy se nemůžete přihlásit jako administrátor."
       resend_activation_email: "Klikněte sem pro zaslání aktivačního emailu."
@@ -1203,7 +1206,7 @@ cs:
       change_email: "Změnit emailovou adresu"
       provide_new_email: "Zadejte novou adresu na kterou chcete zaslat potvrzovací email."
       submit_new_email: "Aktualizovat emailovou adresu"
-      sent_activation_email_again: "Zaslali jsme vám další aktivační email na <b>{{currentEmail}}</b>. Může trvat několik minut, než vám dorazí. Zkontrolujte také vaši složku s nevyžádanou pošlou."
+      sent_activation_email_again: "Zaslali jsme vám další aktivační email na <b>%{currentEmail}</b>. Může trvat několik minut, než vám dorazí. Zkontrolujte také vaši složku s nevyžádanou pošlou."
       to_continue: "Přihlaš se, prosím"
       preferences: "Pro to, aby jsi mohl měnit své uživatelské nastavení, se musíš přihlásit."
       forgot: "Nevybavuju si podrobnosti svého účtu"
@@ -1263,17 +1266,17 @@ cs:
       no_content: Nebyly nalezeny žádné výsledky
       filter_placeholder: Hledat...
       filter_placeholder_with_any: Vyhledat nebo vytvořit...
-      create: "Vytvořit: '{{content}}'"
+      create: "Vytvořit: '%{content}'"
       max_content_reached:
-        one: "Můžete vybrat jen {{count}} položku."
-        few: "Můžete vybrat jen {{count}} položky."
-        many: "Můžete vybrat pouze {{count}} položek."
-        other: "Můžete vybrat jen {{count}} položek."
+        one: "Můžete vybrat jen %{count} položku."
+        few: "Můžete vybrat jen %{count} položky."
+        many: "Můžete vybrat pouze %{count} položek."
+        other: "Můžete vybrat jen %{count} položek."
       min_content_not_reached:
-        one: "Vyberte nejméně {{count}} položku."
-        few: "Vyberte nejméně {{count}} položky."
-        many: "Vyberte nejméně {{count}} položek."
-        other: "Vyberte nejméně {{count}} položek."
+        one: "Vyberte nejméně %{count} položku."
+        few: "Vyberte nejméně %{count} položky."
+        many: "Vyberte nejméně %{count} položek."
+        other: "Vyberte nejméně %{count} položek."
     date_time_picker:
       from: Od koho
       to: Komu
@@ -1291,7 +1294,7 @@ cs:
       default: Vlastní emoji
     shared_drafts:
       title: "Sdílené koncepty"
-      notice: "Toto téma uvidí pouze uživatelé, kteří mohou vidět kategorii <b>{{category}}</b>"
+      notice: "Toto téma uvidí pouze uživatelé, kteří mohou vidět kategorii <b>%{category}</b>"
       destination_category: "Cílová kategorie"
       publish: "Zveřejnit sdílený koncept"
       confirm_publish: "Určitě chceš zveřejnit tento koncept?"
@@ -1306,27 +1309,27 @@ cs:
       add_warning: "Toto je oficiální varování."
       toggle_whisper: "Přepnout šeptání"
       toggle_unlisted: "Přepnout neviditelné"
-      posting_not_on_topic: "Rozepsali jste odpověď na téma \"{{title}}\", ale nyní máte otevřené jiné téma."
+      posting_not_on_topic: "Rozepsali jste odpověď na téma \"%{title}\", ale nyní máte otevřené jiné téma."
       saved_local_draft_tip: "uloženo lokálně"
       similar_topics: "Podobná témata"
       drafts_offline: "koncepty offline"
-      group_mentioned_limit: "<b>Varování!</b> Zmínili jste <a href='{{group_link}}'>{{group}}</a>, ale protože má tato skupina více členů než je administrátorem nastavený limit maximálního počtu {{max}} uživatelů, kteří mohou být informováni, nebude informován nikdo."
+      group_mentioned_limit: "<b>Varování!</b> Zmínili jste <a href='%{group_link}'>%{group}</a>, ale protože má tato skupina více členů než je administrátorem nastavený limit maximálního počtu %{max} uživatelů, kteří mohou být informováni, nebude informován nikdo."
       group_mentioned:
-        one: "Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>%{count} člověka</a> – jste si jistý/á?"
-        few: "Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>{{count}} lidi</a> – jste si jistý/á?"
-        many: "Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>{{count}} lidí</a> – jste si jistý/á?"
-        other: "Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>{{count}} lidí</a> – jste si jistý/á?"
+        one: "Zmíněním %{group}, upozorníš <a href='%{group_link}'>%{count} člověka</a> – jste si jistý/á?"
+        few: "Zmíněním %{group}, upozorníš <a href='%{group_link}'>%{count} lidi</a> – jste si jistý/á?"
+        many: "Zmíněním %{group}, upozorníš <a href='%{group_link}'>%{count} lidí</a> – jste si jistý/á?"
+        other: "Zmíněním %{group}, upozorníš <a href='%{group_link}'>%{count} lidí</a> – jste si jistý/á?"
       cannot_see_mention:
-        category: "Zmínili jste uživatele {{username}}, ale oznámení se mu nepošle, protože nemá přístup do této kategorie. Budete jej muset přidat do skupiny, která má přístup do této kategorie."
-        private: "Zmínili jste uživatele {{username}}, ale oznámení se mu nepošle, protože tuto osobní zprávu nevidí. Musíte ho pozvat do této osobní konverzace."
-      duplicate_link: "Zdá se, že odkaz na <b>{{domain}}</b> už uvedl v tomto tématu <b>@ {{username}}</b> v <a href='{{post_url}}'>odpovědi {{ago}}</a> - opravdu chcete odkaz poslat znovu?"
+        category: "Zmínili jste uživatele %{username}, ale oznámení se mu nepošle, protože nemá přístup do této kategorie. Budete jej muset přidat do skupiny, která má přístup do této kategorie."
+        private: "Zmínili jste uživatele %{username}, ale oznámení se mu nepošle, protože tuto osobní zprávu nevidí. Musíte ho pozvat do této osobní konverzace."
+      duplicate_link: "Zdá se, že odkaz na <b>%{domain}</b> už uvedl v tomto tématu <b>@ %{username}</b> v <a href='%{post_url}'>odpovědi %{ago}</a> - opravdu chcete odkaz poslat znovu?"
       error:
         title_missing: "Název musí být vyplněn"
-        title_too_short: "Název musí být dlouhý alespoň {{min}} znaků"
-        title_too_long: "Název nemůže být delší než {{max}} znaků"
-        post_length: "Příspěvek musí být alespoň {{min}} znaků dlouhý"
+        title_too_short: "Název musí být dlouhý alespoň %{min} znaků"
+        title_too_long: "Název nemůže být delší než %{max} znaků"
+        post_length: "Příspěvek musí být alespoň %{min} znaků dlouhý"
         category_missing: "Musíte vybrat kategorii"
-        tags_missing: "Vybraných tagů musí být nejméně {{count}}"
+        tags_missing: "Vybraných tagů musí být nejméně %{count}"
       save_edit: "Uložit změnu"
       overwrite_edit: "Přepsat úpravu"
       reply_original: "Odpovědět na původní téma"
@@ -1418,54 +1421,54 @@ cs:
       tooltip:
         regular:
           one: "%{count} nepřečtene upozornění"
-          few: "{{count}} nepřečtená upozornění"
-          many: "{{count}} nepřečtených upozornění"
-          other: "{{count}} nepřečtených upozornění"
+          few: "%{count} nepřečtená upozornění"
+          many: "%{count} nepřečtených upozornění"
+          other: "%{count} nepřečtených upozornění"
         message:
           one: "%{count} nepřečtená zpráva"
-          few: "{{count}} nepřečtené zprávy"
-          many: "{{count}} nepřečtených zpráv"
-          other: "{{count}} nepřečtených zpráv"
+          few: "%{count} nepřečtené zprávy"
+          many: "%{count} nepřečtených zpráv"
+          other: "%{count} nepřečtených zpráv"
       title: "oznámení o zmínkách pomocí @name, odpovědi na vaše příspěvky a témata, zprávy, atd."
       none: "Notifikace nebylo možné načíst."
       empty: "Žádné upozornění nenalezeny."
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} a %{count} další</span> {{description}}"
-        few: "<span>{{username}}, {{username2}} a {{count}} další</span> {{description}}"
-        many: "<span>{{username}}, {{username2}} a {{count}} dalších</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} a {{count}} dalších</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}}"
-      invitee_accepted: "<span>{{username}}</span> přijal vaše pozvání"
-      moved_post: "<span>{{username}}</span> přesunul {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Získáno '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Nové téma</span> {{description}}"
+        one: "<span>%{username}, %{username2} a %{count} další</span> %{description}"
+        few: "<span>%{username}, %{username2} a %{count} další</span> %{description}"
+        many: "<span>%{username}, %{username2} a %{count} dalších</span> %{description}"
+        other: "<span>%{username}, %{username2} a %{count} dalších</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}"
+      invitee_accepted: "<span>%{username}</span> přijal vaše pozvání"
+      moved_post: "<span>%{username}</span> přesunul %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Získáno '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Nové téma</span> %{description}"
       group_message_summary:
-        one: "{{count}} zpráva ve schránce skupiny {{group_name}}"
-        few: "{{count}} zprávy ve schránce skupiny {{group_name}}"
-        many: "{{count}} zpráv ve schránce skupiny {{group_name}}"
-        other: "{{count}} zpráv ve schránce skupiny {{group_name}}"
+        one: "%{count} zpráva ve schránce skupiny %{group_name}"
+        few: "%{count} zprávy ve schránce skupiny %{group_name}"
+        many: "%{count} zpráv ve schránce skupiny %{group_name}"
+        other: "%{count} zpráv ve schránce skupiny %{group_name}"
       popup:
-        mentioned: '{{username}} vás zmínil v "{{topic}}" - {{site_title}}'
-        group_mentioned: 'Uživatel {{username}} vás zmínil v "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} vás citoval v "{{topic}}" - {{site_title}}'
-        replied: '{{username}} vám odpověděl v "{{topic}}" - {{site_title}}'
-        posted: '{{username}} přispěl do "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} vám poslal soukromou zprávu v "{{topic}}" - {{site_title}}'
-        linked: '{{username}} odkázal na vás příspěvek v "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} vás zmínil v "%{topic}" - %{site_title}'
+        group_mentioned: 'Uživatel %{username} vás zmínil v "%{topic}" - %{site_title}'
+        quoted: '%{username} vás citoval v "%{topic}" - %{site_title}'
+        replied: '%{username} vám odpověděl v "%{topic}" - %{site_title}'
+        posted: '%{username} přispěl do "%{topic}" - %{site_title}'
+        private_message: '%{username} vám poslal soukromou zprávu v "%{topic}" - %{site_title}'
+        linked: '%{username} odkázal na vás příspěvek v "%{topic}" - %{site_title}'
         confirm_title: "Upozornění zapnuta - %{site_title}"
         confirm_body: "Upozornění úspěšně zapnuta."
       titles:
@@ -1476,9 +1479,9 @@ cs:
       from_my_computer: "Z mého zařízení"
       from_the_web: "Z webu"
       remote_tip: "odkaz na obrázek"
-      remote_tip_with_attachments: "odkaz na obrázek nebo soubor {{authorized_extensions}}"
+      remote_tip_with_attachments: "odkaz na obrázek nebo soubor %{authorized_extensions}"
       local_tip: "vyber obrázky z tvého zařízení"
-      local_tip_with_attachments: "vyber obrázky nebo soubory ze svého zařízení {{authorized_extensions}}"
+      local_tip_with_attachments: "vyber obrázky nebo soubory ze svého zařízení %{authorized_extensions}"
       hint: "(můžete také rovnou soubor do editoru přetáhnout)"
       hint_for_supported_browsers: "také můžeš obrázky do editoru přetáhnout nebo vložit"
       uploading: "Nahrávám"
@@ -1495,17 +1498,17 @@ cs:
       clear_all: "Vymazat vše"
       too_short: "Hledaný výraz je příliš krátký."
       result_count:
-        one: "<span>%{count} výsledek pro</span><span class='term'>{{term}}</span>"
-        few: "<span>{{count}}{{plus}} výsledky pro</span><span class='term'>{{term}}</span>"
-        many: "<span>{{count}}{{plus}} výsledků pro</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} výsledků pro</span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} výsledek pro</span><span class='term'>%{term}</span>"
+        few: "<span>%{count}%{plus} výsledky pro</span><span class='term'>%{term}</span>"
+        many: "<span>%{count}%{plus} výsledků pro</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} výsledků pro</span><span class='term'>%{term}</span>"
       title: "vyhledávat témata, příspěvky, uživatele nebo kategorie"
       full_page_title: "vyhledávat témata nebo příspěvky"
       no_results: "Nenalezeny žádné výsledky."
       no_more_results: "Nenalezeny žádné další výsledky."
       searching: "Hledám ..."
-      post_format: "#{{post_number}} od {{username}}"
-      results_page: "Výsledky hledání pro '{{term}}'"
+      post_format: "#%{post_number} od %{username}"
+      results_page: "Výsledky hledání pro '%{term}'"
       more_results: "Existuje více výsledků. Prosím zpřesněte kritéria vyhledávání."
       cant_find: "Nemůžete najít, co hledáte?"
       start_new_topic: "Možná vytvořte nové téma?"
@@ -1514,8 +1517,8 @@ cs:
       search_google_button: "Google"
       search_google_title: "Hledat na tomto webu"
       context:
-        user: "Vyhledat příspěvky od @{{username}}"
-        category: "Hledat v kategorii #{{category}}"
+        user: "Vyhledat příspěvky od @%{username}"
+        category: "Hledat v kategorii #%{category}"
         topic: "Vyhledat v tomto tématu"
         private_messages: "Hledat ve zprávách"
       advanced:
@@ -1589,9 +1592,9 @@ cs:
         choose_new_category: "Zvolte novou kategorii pro témata:"
         selected:
           one: "Vybrali jste <b>%{count}</b> téma."
-          few: "Vybrali jste <b>{{count}}</b> témata."
-          many: "Vybrali jste <b>{{count}}</b> témat."
-          other: "Vybrali jste <b>{{count}}</b> témat."
+          few: "Vybrali jste <b>%{count}</b> témata."
+          many: "Vybrali jste <b>%{count}</b> témat."
+          other: "Vybrali jste <b>%{count}</b> témat."
         change_tags: "Zaměnit štítky"
         append_tags: "Přidat štítky"
         choose_new_tags: "Zvolte nové tagy pro témata:"
@@ -1604,7 +1607,7 @@ cs:
         posted: "Zatím jste nepřispěli do žádného tématu."
         latest: "Nejsou tu žádná témata z poslední doby. To je docela smutné."
         bookmarks: "V tématech nemáte žádné záložky."
-        category: "V kategorii {{category}} nejsou žádná témata."
+        category: "V kategorii %{category} nejsou žádná témata."
         top: "Nejsou tu žádná populární témata."
         educate:
           new: '<p>Zde se zobrazují vaše nová témata.</p><p>Dle výchozího nastavení se za nové příspěvky, které budou mít štítek<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">nové</span> , považují příspěvky, které byly vytvořeny během posledních 2 dnů.</p><p>Toto můžete změnit ve svém <a href="%{userPrefsUrl}">nastavení</a>.</p>'
@@ -1615,15 +1618,15 @@ cs:
         read: "Nejsou tu žádná další přečtená témata."
         new: "Nejsou tu žádná další nová témata k přečtení."
         unread: "Nejsou tu žádná další nepřečtená témata."
-        category: "V kategorii {{category}} nejsou žádná další témata."
+        category: "V kategorii %{category} nejsou žádná další témata."
         top: "Nejsou tu žádná další populární témata."
         bookmarks: "Žádná další oblíbená témata nejsou k dispozici."
     topic:
       filter_to:
         one: "%{count} příspěvek v tématu"
-        few: "{{count}} příspěvky v tématu"
-        many: "{{count}} příspěvků v tématu"
-        other: "{{count}} příspěvků v tématu"
+        few: "%{count} příspěvky v tématu"
+        many: "%{count} příspěvků v tématu"
+        other: "%{count} příspěvků v tématu"
       create: "Nové téma"
       create_long: "Vytvořit nové téma"
       open_draft: "Otevřít koncept"
@@ -1644,14 +1647,14 @@ cs:
       unread: "nepřečtený"
       new_topics:
         one: "%{count} nové téma"
-        few: "{{count}} nová témata"
-        many: "{{count}} nových témat"
-        other: "{{count}} nových témat"
+        few: "%{count} nová témata"
+        many: "%{count} nových témat"
+        other: "%{count} nových témat"
       unread_topics:
         one: "%{count} nepřečtené téma"
-        few: "{{count}} nepřečtená témata"
-        many: "{{count}} nepřečtených témat"
-        other: "{{count}} nepřečtených témat"
+        few: "%{count} nepřečtená témata"
+        many: "%{count} nepřečtených témat"
+        other: "%{count} nepřečtených témat"
       title: "Téma"
       invalid_access:
         title: "Téma je soukromé"
@@ -1665,30 +1668,30 @@ cs:
         description: "Bohužel se nám nepovedlo najít toto téma. Nebylo odstraněno moderátorem?"
       total_unread_posts:
         one: "máte %{count} nepřečtený příspěvek v tomto tématu"
-        few: "máte {{count}} nepřečtené příspěvky v tomto tématu."
-        many: "máte {{count}} nepřečtených příspěvků v tomto tématu."
-        other: "máte {{count}} nepřečtených příspěvků v tomto tématu."
+        few: "máte %{count} nepřečtené příspěvky v tomto tématu."
+        many: "máte %{count} nepřečtených příspěvků v tomto tématu."
+        other: "máte %{count} nepřečtených příspěvků v tomto tématu."
       unread_posts:
         one: "máte %{count} nepřečtený příspěvěk v tomto tématu"
-        few: "máte {{count}} nepřečtené příspěvky v tomto tématu"
-        many: "máte {{count}} nepřečtených příspěvků v tomto tématu"
-        other: "máte {{count}} nepřečtených příspěvků v tomto tématu"
+        few: "máte %{count} nepřečtené příspěvky v tomto tématu"
+        many: "máte %{count} nepřečtených příspěvků v tomto tématu"
+        other: "máte %{count} nepřečtených příspěvků v tomto tématu"
       new_posts:
         one: "je zde %{count} nový příspěvek od doby, kdy jste toto téma naposledy četli"
-        few: "jsou zde {{count}} nové příspěvky od doby, kdy jste toto téma naposledy četli"
-        many: "je zde {{count}} nových příspěvků od doby, kdy jste toto téma naposledy četli"
-        other: "je zde {{count}} nových příspěvků od doby, kdy jste toto téma naposledy četli"
+        few: "jsou zde %{count} nové příspěvky od doby, kdy jste toto téma naposledy četli"
+        many: "je zde %{count} nových příspěvků od doby, kdy jste toto téma naposledy četli"
+        other: "je zde %{count} nových příspěvků od doby, kdy jste toto téma naposledy četli"
       likes:
         one: "v tomto tématu je jedno 'líbí se'"
-        few: "v tomto tématu tématu je {{count}} 'líbí se'"
-        many: "v tomto tématu tématu je {{count}} 'líbí se'"
-        other: "v tomto tématu tématu je {{count}} 'líbí se'"
+        few: "v tomto tématu tématu je %{count} 'líbí se'"
+        many: "v tomto tématu tématu je %{count} 'líbí se'"
+        other: "v tomto tématu tématu je %{count} 'líbí se'"
       back_to_list: "Zpátky na seznam témat"
       options: "Možnosti"
       show_links: "zobrazit odkazy v tomto tématu"
       toggle_information: "zobrazit/skrýt detaily tématu"
-      read_more_in_category: "Chcete si toho přečíst víc? Projděte si témata v {{catLink}} nebo {{latestLink}}."
-      read_more: "Chcete si přečíst další informace? {{catLink}} nebo {{latestLink}}."
+      read_more_in_category: "Chcete si toho přečíst víc? Projděte si témata v %{catLink} nebo %{latestLink}."
+      read_more: "Chcete si přečíst další informace? %{catLink} nebo %{latestLink}."
       read_more_MF: "{ UNREAD, plural, =0 {} one { Zbývá <a href='{basePath}/unread'>1 nepřečtené</a> téma } other { Je tu <a href='{basePath}/unread'># nepřečtených</a> témat } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 nové</a> téma} other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># nových</a> témat} }, nebo {CATEGORY, select, true {zobrazit další témata v kategorii {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Projděte všechny kategorie
       view_latest_topics: zobrazte si populární témata
@@ -1851,29 +1854,29 @@ cs:
         success_message: "Téma úspěšně nahlášeno."
       feature_topic:
         title: "Povýšit téma"
-        pin: "Zobrazit toto téma na vrcholu kategorie {{categoryLink}} dokud"
-        confirm_pin: "Již máte {{count}} připevněných příspěvků. Příliš mnoho připevněných příspěvků může zatěžovat nové nebo anonymní uživatele. Určitě chcete připevnit další téma v této kategorii?"
-        unpin: "Odstranit toto téma z vrcholu {{categoryLink}} kategorie."
-        unpin_until: "Odstranit toto téma z vrcholu kategorie {{categoryLink}}, nebo počkat dokud <strong>%{until}</strong>"
+        pin: "Zobrazit toto téma na vrcholu kategorie %{categoryLink} dokud"
+        confirm_pin: "Již máte %{count} připevněných příspěvků. Příliš mnoho připevněných příspěvků může zatěžovat nové nebo anonymní uživatele. Určitě chcete připevnit další téma v této kategorii?"
+        unpin: "Odstranit toto téma z vrcholu %{categoryLink} kategorie."
+        unpin_until: "Odstranit toto téma z vrcholu kategorie %{categoryLink}, nebo počkat dokud <strong>%{until}</strong>"
         pin_note: "Uživatelé mohou odepnout téma sami pro sebe."
         pin_validation: "Pro připíchnutí tohoto tématu je třeba datum."
-        not_pinned: "V kategorii {{categoryLink}} nejsou žádná připnutá témata."
+        not_pinned: "V kategorii %{categoryLink} nejsou žádná připnutá témata."
         already_pinned:
-          one: "Připevněné téma v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          few: "Připevněná témata v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "Připevněná témata v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Připevněná témata v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Připevněné téma v %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          few: "Připevněná témata v %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          many: "Připevněná témata v %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Připevněná témata v %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Zobrazit toto téma na vrcholu seznamu všech témat dokud"
-        confirm_pin_globally: "Již máte {{count}} globálně připevněných příspěvků. Příliš mnoho připevněných příspěvků může zatěžovat nové nebo anonymní uživatele. Určitě chcete připevnit další téma globálně?"
+        confirm_pin_globally: "Již máte %{count} globálně připevněných příspěvků. Příliš mnoho připevněných příspěvků může zatěžovat nové nebo anonymní uživatele. Určitě chcete připevnit další téma globálně?"
         unpin_globally: "Odstranit toto téma z vrcholu všech seznamů s tématy."
         unpin_globally_until: "Odstranit toto téma z vrcholu seznamu všech témat nebo počat dokud <strong>%{until}</strong>."
         global_pin_note: "Uživatelé mohou odepnout téma sami pro sebe."
         not_pinned_globally: "Nemáte žádná globálně připevněná témata."
         already_pinned_globally:
           one: "V současnosti globálně připevněná témata: <strong class='badge badge-notification unread'>%{count}</strong>"
-          few: "V současnosti globálně připevněná témata: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "V současnosti globálně připevněná témata: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "V současnosti globálně připevněná témata: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: "V současnosti globálně připevněná témata: <strong class='badge badge-notification unread'>%{count}</strong>"
+          many: "V současnosti globálně připevněná témata: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "V současnosti globálně připevněná témata: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Udělat z tohoto tématu banner, který se zobrazí na vrcholu všech stránek."
         remove_banner: "Odstranit banner, který se zobrazuje na vrcholu všech stránek."
         banner_note: "Uživatelé mohou odmítnout banner jeho zavřením. V jeden moment může být pouze jedno téma jako banner."
@@ -1903,17 +1906,17 @@ cs:
         to_topic_username: "Zadali jste uživatelské jméno. Zašleme pozvánku s odkazem do tohoto tématu."
         to_username: "Zadejte uživatelské jméno člověka, kterého chcete pozvat. Zašleme pozvánku s odkazem do tohoto tématu."
         email_placeholder: "jmeno@priklad.cz"
-        success_email: "Zaslali jsme pozvánku na <b>{{emailOrUsername}}</b>. Upozorníme vás až bude pozvánka použita. Své pozvánky můžete sledovat v tabulce pozvánek na svém uživatelském profilu."
+        success_email: "Zaslali jsme pozvánku na <b>%{emailOrUsername}</b>. Upozorníme vás až bude pozvánka použita. Své pozvánky můžete sledovat v tabulce pozvánek na svém uživatelském profilu."
         success_username: "Pozvali jsme zadaného uživatele, aby se zúčastnil tématu."
         error: "Bohužel se nepodařilo pozvat tuto osobu. Možná už byla pozvána? (Počet opakovaných pozvánek je omezen)."
-        success_existing_email: "Uživatel s e-mailem<b>{{emailOrUsername}}</b> již existuje. Pozvali jsme ho, aby se zúčastnil tohoto tématu."
+        success_existing_email: "Uživatel s e-mailem<b>%{emailOrUsername}</b> již existuje. Pozvali jsme ho, aby se zúčastnil tohoto tématu."
       login_reply: "Přihlaste se, chcete-li odpovědět"
       filters:
         n_posts:
           one: "Je zobrazen pouze %{count} příspěvek"
-          few: "Jsou zobrazeny pouze {{count}} příspěvky"
-          many: "Je zobrazeno pouze {{count}} příspěvků"
-          other: "Je zobrazeno pouze {{count}} příspěvků"
+          few: "Jsou zobrazeny pouze %{count} příspěvky"
+          many: "Je zobrazeno pouze %{count} příspěvků"
+          other: "Je zobrazeno pouze %{count} příspěvků"
         cancel: "Zrušit filtr"
       split_topic:
         title: "Rozdělit téma"
@@ -1922,18 +1925,18 @@ cs:
         error: "Bohužel nastala chyba při rozdělování tématu."
         instructions:
           one: "Chystáte se vytvořit nové téma a naplnit ho příspěvkem, který jste označili."
-          few: "Chystate se vytvořit noté téma a naplnit ho <b>{{count}}</b> příspěvky, které jste označili."
-          many: "Chystate se vytvořit noté téma a naplnit ho <b>{{count}}</b> příspěvky, které jste označili."
-          other: "Chystate se vytvořit noté téma a naplnit ho <b>{{count}}</b> příspěvky, které jste označili."
+          few: "Chystate se vytvořit noté téma a naplnit ho <b>%{count}</b> příspěvky, které jste označili."
+          many: "Chystate se vytvořit noté téma a naplnit ho <b>%{count}</b> příspěvky, které jste označili."
+          other: "Chystate se vytvořit noté téma a naplnit ho <b>%{count}</b> příspěvky, které jste označili."
       merge_topic:
         title: "Sloučit téma"
         action: "do jiného tématu"
         error: "Bohužel nastala chyba při slučování tématu."
         instructions:
           one: "Prosím, vyberte téma, do kterého chcete příspěvek přesunout."
-          few: "Prosím, vyberte téma, do kterého chcete tyto <b>{{count}}</b> příspěvky přesunout."
-          many: "Prosím, vyberte téma, do kterého chcete těchto <b>{{count}}</b> příspěvků přesunout."
-          other: "Prosím, vyberte téma, do kterého chcete těchto <b>{{count}}</b> příspěvků přesunout."
+          few: "Prosím, vyberte téma, do kterého chcete tyto <b>%{count}</b> příspěvky přesunout."
+          many: "Prosím, vyberte téma, do kterého chcete těchto <b>%{count}</b> příspěvků přesunout."
+          other: "Prosím, vyberte téma, do kterého chcete těchto <b>%{count}</b> příspěvků přesunout."
       move_to_new_message:
         radio_label: "Nová zpráva"
       merge_posts:
@@ -1946,10 +1949,10 @@ cs:
         error: "Chyba při měnění autora u příspevků."
         placeholder: "uživatelské jméno nového autora"
         instructions:
-          one: "Prosíme vyberte nového vlastníka pro příspěvek od <b>@{{old_user}}</b>"
-          few: "Prosíme vyberte nového vlastníka pro {{count}} příspěvky od <b>@{{old_user}}</b>"
-          many: "Prosíme vyberte nového vlastníka pro {{count}} příspěvků od <b>@{{old_user}}</b>"
-          other: "Prosíme vyberte nového vlastníka pro {{count}} příspěvků od <b>@{{old_user}}</b>"
+          one: "Prosíme vyberte nového vlastníka pro příspěvek od <b>@%{old_user}</b>"
+          few: "Prosíme vyberte nového vlastníka pro %{count} příspěvky od <b>@%{old_user}</b>"
+          many: "Prosíme vyberte nového vlastníka pro %{count} příspěvků od <b>@%{old_user}</b>"
+          other: "Prosíme vyberte nového vlastníka pro %{count} příspěvků od <b>@%{old_user}</b>"
       change_timestamp:
         title: "Změnit časové razítko..."
         action: "změnit časovou značku"
@@ -1958,7 +1961,7 @@ cs:
         instructions: "Zvol novou časovou značku tématu, prosím. Příspěvky v tématu se aktualizují tak aby měly stejný rozdíl v čase."
       multi_select:
         select: "vybrat"
-        selected: "vybráno ({{count}})"
+        selected: "vybráno (%{count})"
         select_post:
           label: "vybrat"
           title: "Přidat příspěvek do výběru"
@@ -1977,18 +1980,18 @@ cs:
         deselect_all: zrušit výběr
         description:
           one: Máte označen <b>%{count}</b> příspěvek.
-          few: "Máte označeny <b>{{count}}</b> příspěvky."
-          many: "Máte označeno <b>{{count}}</b> příspěvků."
-          other: "Máte označeno <b>{{count}}</b> příspěvků."
+          few: "Máte označeny <b>%{count}</b> příspěvky."
+          many: "Máte označeno <b>%{count}</b> příspěvků."
+          other: "Máte označeno <b>%{count}</b> příspěvků."
     post:
       quote_reply: "Cituj"
       edit_reason: "Důvod: "
-      post_number: "příspěvek č. {{number}}"
+      post_number: "příspěvek č. %{number}"
       wiki_last_edited_on: "wiki naposledy upravena"
       last_edited_on: "příspěvek naposledy upraven"
       reply_as_new_topic: "Odpovědět v propojeném tématu"
       reply_as_new_private_message: "Odpověď poslat jako zprávu stejným příjemcům. "
-      continue_discussion: "Pokračování diskuze z {{postLink}}:"
+      continue_discussion: "Pokračování diskuze z %{postLink}:"
       follow_quote: "přejít na citovaný příspěvek"
       show_full: "Zobrazit celý příspěvek"
       deleted_by_author:
@@ -2001,32 +2004,32 @@ cs:
       locked: "Personál znemožnil upravování na tomto příspěvku"
       gap:
         one: "zobrazit %{count} skrytou odpověď"
-        few: "zobrazit {{count}} skryté odpovědi"
-        many: "zobrazit {{count}} skrytých odpovědí"
-        other: "zobrazit {{count}} skrytých odpovědí"
+        few: "zobrazit %{count} skryté odpovědi"
+        many: "zobrazit %{count} skrytých odpovědí"
+        other: "zobrazit %{count} skrytých odpovědí"
       unread: "Příspěvek je nepřečtený."
       has_replies:
-        one: "{{count}} odpověď"
-        few: "{{count}} odpovědi"
-        many: "{{count}} odpovědí"
-        other: "{{count}} odpovědí"
+        one: "%{count} odpověď"
+        few: "%{count} odpovědi"
+        many: "%{count} odpovědí"
+        other: "%{count} odpovědí"
       has_likes_title:
         one: "%{count} člověku se líbí tento příspěvek"
-        few: "{{count}} lidem se líbí tento příspěvek"
-        many: "{{count}} lidem se líbí tento příspěvek"
-        other: "{{count}} lidem se líbí tento příspěvek"
+        few: "%{count} lidem se líbí tento příspěvek"
+        many: "%{count} lidem se líbí tento příspěvek"
+        other: "%{count} lidem se líbí tento příspěvek"
       has_likes_title_only_you: "tento příspěvek se mi líbí"
       has_likes_title_you:
         one: "vám a %{count} dalšímu člověku se tento příspěvek líbí"
-        few: "vám a {{count}} dalším lidem se tento příspěvek líbí"
-        many: "vám a {{count}} dalším lidem se tento příspěvek líbí"
-        other: "vám a {{count}} dalším lidem se tento příspěvek líbí"
+        few: "vám a %{count} dalším lidem se tento příspěvek líbí"
+        many: "vám a %{count} dalším lidem se tento příspěvek líbí"
+        other: "vám a %{count} dalším lidem se tento příspěvek líbí"
       errors:
         create: "Bohužel nastala chyba při vytváření příspěvku. Prosím zkuste to znovu."
         edit: "Bohužel nastala chyba při editaci příspěvku. Prosím zkuste to znovu."
         upload: "Bohužel nastala chyba při nahrávání příspěvku. Prosím zkuste to znovu."
         too_many_uploads: "Bohužel, najednou smíte nahrát jen jeden soubor."
-        upload_not_authorized: "Bohužel, soubor, který se snažíš nahrát, není povolený (povolená rozšíření: {{authorized_extensions}}). "
+        upload_not_authorized: "Bohužel, soubor, který se snažíš nahrát, není povolený (povolená rozšíření: %{authorized_extensions}). "
         image_upload_not_allowed_for_new_user: "Bohužel, noví uživatelé nemohou nahrávat obrázky."
         attachment_upload_not_allowed_for_new_user: "Bohužel, noví uživatelé nemohou nahrávat přílohy."
         attachment_download_requires_login: "Omlouváme se, ale pro stáhnutí přílohy musíte být přihlášen."
@@ -2062,13 +2065,13 @@ cs:
           direct_replies:
             one: "Ano a %{count} přímá odpověď"
             few: "Ano a další přímé odpovědi"
-            many: "Ano a další {{count}} odpovědi"
-            other: "Ano a další {{count}} odpovědi"
+            many: "Ano a další %{count} odpovědi"
+            other: "Ano a další %{count} odpovědi"
           all_replies:
             one: "Ano a další %{count} odpověď"
-            few: "Ano a dalších {{count}} odpovědí"
-            many: "Ano a dalších {{count}} odpovědí"
-            other: "Ano a dalších {{count}} odpovědí"
+            few: "Ano a dalších %{count} odpovědí"
+            many: "Ano a dalších %{count} odpovědí"
+            other: "Ano a dalších %{count} odpovědí"
           just_the_post: "Ne, pouze tento příspěvek"
         admin: "post admin actions"
         wiki: "Převést na wiki"
@@ -2108,9 +2111,9 @@ cs:
           bookmark: "záložka přidána"
           like_capped:
             one: "a jednomu dalšímu se to líbí"
-            few: "a {{count}} dalším se to líbí"
-            many: "a {{count}} dalším se to líbí"
-            other: "a {{count}} dalším se to líbí"
+            few: "a %{count} dalším se to líbí"
+            many: "a %{count} dalším se to líbí"
+            other: "a %{count} dalším se to líbí"
         by_you:
           off_topic: "Označili jste tento příspěvek jako off-topic"
           spam: "Označili jste tento příspěvek jako spam"
@@ -2122,15 +2125,15 @@ cs:
       delete:
         confirm:
           one: "Jsi si jistý, že chceš smazat tento příspěvek?"
-          few: "Jsi si jistý, že chceš smazat tyto všechny {{count}} příspěvky? "
-          many: "Jsi si jistý, že chceš smazat tyto všechny {{count}} příspěvky? "
-          other: "Jsi si jistý, že chceš smazat tyto všechny {{count}} příspěvky? "
+          few: "Jsi si jistý, že chceš smazat tyto všechny %{count} příspěvky? "
+          many: "Jsi si jistý, že chceš smazat tyto všechny %{count} příspěvky? "
+          other: "Jsi si jistý, že chceš smazat tyto všechny %{count} příspěvky? "
       merge:
         confirm:
           one: "Opravdu chceš sloučit tyto příspěvky?"
-          few: "Opravdu chceš sloučit {{count}} příspěvky?"
-          many: "Opravdu chceš sloučit {{count}} příspěvků?"
-          other: "Opravdu chceš sloučit {{count}} příspěvků?"
+          few: "Opravdu chceš sloučit %{count} příspěvky?"
+          many: "Opravdu chceš sloučit %{count} příspěvků?"
+          other: "Opravdu chceš sloučit %{count} příspěvků?"
       revisions:
         controls:
           first: "První revize"
@@ -2296,19 +2299,19 @@ cs:
       custom_message:
         at_least:
           one: "zadejte alespoň %{count} znak"
-          few: "zadejte alespoň {{count}} znaky"
-          many: "zadejte alespoň {{count}} znaků"
-          other: "zadejte alespoň {{count}} znaků"
+          few: "zadejte alespoň %{count} znaky"
+          many: "zadejte alespoň %{count} znaků"
+          other: "zadejte alespoň %{count} znaků"
         more:
           one: "ještě %{count}..."
-          few: "ještě {{count}}..."
-          many: "ještě {{count}}..."
-          other: "ještě {{count}}..."
+          few: "ještě %{count}..."
+          many: "ještě %{count}..."
+          other: "ještě %{count}..."
         left:
           one: "%{count} zbývá"
-          few: "{{count}} zbývají"
-          many: "{{count}} zbývá"
-          other: "{{count}} zbývá"
+          few: "%{count} zbývají"
+          many: "%{count} zbývá"
+          other: "%{count} zbývá"
     flagging_topic:
       title: "Děkujeme, že pomáháte udržovat komunitu zdvořilou!"
       action: "Nahlásit téma"
@@ -2353,7 +2356,7 @@ cs:
       unlisted:
         help: "Toto téma je neviditelné; nebude se zobrazovat v seznamu témat a lze ho navštívit pouze přes přímý odkaz"
     posts: "Příspěvků"
-    posts_long: "v tomto tématu je {{number}} příspěvků"
+    posts_long: "v tomto tématu je %{number} příspěvků"
     posts_likes_MF: |
       Toto téma má {count, plural, one {1 příspěvek} other {# příspěvků}} {ratio, select,
       low {s vysokým počtem lajků}
@@ -2370,9 +2373,9 @@ cs:
     replies: "Odpovědi"
     views_long:
       one: "Toto téma bylo zobrazeno %{count} krát"
-      few: "Toto téma bylo zobrazeno {{number}} krát"
-      many: "Toto téma bylo zobrazeno {{number}} krát"
-      other: "Toto téma bylo zobrazeno {{number}} krát"
+      few: "Toto téma bylo zobrazeno %{number} krát"
+      many: "Toto téma bylo zobrazeno %{number} krát"
+      other: "Toto téma bylo zobrazeno %{number} krát"
     activity: "Aktivita"
     likes: "Líbí se"
     likes_lowercase:
@@ -2380,7 +2383,7 @@ cs:
       few: "líbí se"
       many: "líbí se"
       other: "líbí se"
-    likes_long: "v tomto tématu je {{number}} \"Líbí se\""
+    likes_long: "v tomto tématu je %{number} \"Líbí se\""
     users: "Účastníci"
     users_lowercase:
       one: "uživatel"
@@ -2389,7 +2392,7 @@ cs:
       other: "uživatelů"
     category_title: "Kategorie"
     history: "Historie"
-    changed_by: "od uživatele {{author}}"
+    changed_by: "od uživatele %{author}"
     raw_email:
       title: "Příchozí email"
       not_available: "Není k dispozici!"
@@ -2401,43 +2404,43 @@ cs:
         title: "Aktuální"
         title_with_count:
           one: "Nedávné (%{count})"
-          few: "Nedávná ({{count}})"
-          many: "Nedávná ({{count}})"
-          other: "Nedávná ({{count}})"
+          few: "Nedávná (%{count})"
+          many: "Nedávná (%{count})"
+          other: "Nedávná (%{count})"
         help: "aktuální témata"
       read:
         title: "Přečtená"
         help: "témata, která jste si přečetli"
       categories:
         title: "Kategorie"
-        title_in: "Kategorie - {{categoryName}}"
+        title_in: "Kategorie - %{categoryName}"
         help: "všechna témata seskupená podle kategorie"
       unread:
         title: "Nepřečtená"
         title_with_count:
           one: "Nepřečtená (%{count})"
-          few: "Nepřečtená ({{count}})"
-          many: "Nepřečtená ({{count}})"
-          other: "Nepřečtená ({{count}})"
+          few: "Nepřečtená (%{count})"
+          many: "Nepřečtená (%{count})"
+          other: "Nepřečtená (%{count})"
         help: "témata, která sledujete nebo hlídáte, s nepřečtenými příspěvky"
         lower_title_with_count:
-          one: "{{count}} nepřečtené"
-          few: "{{count}} nepřečtených"
-          many: "{{count}} nepřečtených"
-          other: "{{count}} nepřečtených"
+          one: "%{count} nepřečtené"
+          few: "%{count} nepřečtených"
+          many: "%{count} nepřečtených"
+          other: "%{count} nepřečtených"
       new:
         lower_title_with_count:
           one: "%{count} nové"
-          few: "{{count}} nová"
-          many: "{{count}} nových"
-          other: "{{count}} nových"
+          few: "%{count} nová"
+          many: "%{count} nových"
+          other: "%{count} nových"
         lower_title: "nové"
         title: "Nová"
         title_with_count:
           one: "Nové"
-          few: "Nová ({{count}})"
-          many: "Nová ({{count}})"
-          other: "Nová ({{count}})"
+          few: "Nová (%{count})"
+          many: "Nová (%{count})"
+          other: "Nová (%{count})"
         help: "témata vytvořená za posledních několik dní"
       posted:
         title: "Mé příspěvky"
@@ -2446,13 +2449,13 @@ cs:
         title: "Záložky"
         help: "témata, do kterých jste si vložili záložku"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} ({{count}})"
-          few: "{{categoryName}} ({{count}})"
-          many: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
-        help: "populární témata v kategorii {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          few: "%{categoryName} (%{count})"
+          many: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "populární témata v kategorii %{categoryName}"
       top:
         title: "Nejlepší"
         help: "výběr nejlepších témat za rok, měsíc, týden nebo den"
@@ -2589,9 +2592,9 @@ cs:
       delete_tag: "Smaž štítek"
       delete_confirm:
         one: "Jsi si jist, že chceš smazat tento štítek a odstranit ho z tématu, kterému je přiřazen?"
-        few: "Jsi si jist, že chceš smazat tento štítek a odstranit ho z {{count}} témat, kterým je přiřazen?"
-        many: "Jsi si jist, že chceš smazat tento štítek a odstranit ho z {{count}} témat, kterým je přiřazen?"
-        other: "Jsi si jist, že chceš smazat tento štítek a odstranit ho z {{count}} témat, kterým je přiřazen?"
+        few: "Jsi si jist, že chceš smazat tento štítek a odstranit ho z %{count} témat, kterým je přiřazen?"
+        many: "Jsi si jist, že chceš smazat tento štítek a odstranit ho z %{count} témat, kterým je přiřazen?"
+        other: "Jsi si jist, že chceš smazat tento štítek a odstranit ho z %{count} témat, kterým je přiřazen?"
       delete_confirm_no_topics: "Opravdu chceš smazat tento štítek? "
       rename_tag: "Přejmenovat štítek"
       rename_instructions: "Vyber název nového štítku:"
@@ -2849,14 +2852,14 @@ cs:
           redeliver: "Znovu dodat"
           incoming:
             one: "%{count} nová událost"
-            few: "{{count}} nové události"
-            many: "{{count}} nových událostí"
-            other: "{{count}} nových událostí"
+            few: "%{count} nové události"
+            many: "%{count} nových událostí"
+            other: "%{count} nových událostí"
           completed_in:
             one: "Dokončen za %{count} sekundu."
-            few: "Dokončen za {{count}} sekundy."
-            many: "Dokončen za {{count}} sekund."
-            other: "Dokončen za {{count}} sekund."
+            few: "Dokončen za %{count} sekundy."
+            many: "Dokončen za %{count} sekund."
+            other: "Dokončen za %{count} sekund."
           request: "Požadavek"
           response: "Odezva"
           redeliver_confirm: "Jsi si jistý, že chceš znovu doručit stejný payload?"
@@ -2907,11 +2910,11 @@ cs:
           label: "Nahrát"
           title: "Nahrát zálohu do téhle instance"
           uploading: "Nahrávání..."
-          success: "'{{filename}}' byl úspěšně nahraný. Soubor je nyní zpracováván a do minuty bude ukázán v seznamu. "
-          error: "There has been an error while uploading '{{filename}}': {{message}}"
+          success: "'%{filename}' byl úspěšně nahraný. Soubor je nyní zpracováván a do minuty bude ukázán v seznamu. "
+          error: "There has been an error while uploading '%{filename}': %{message}"
         operations:
           is_running: "An operation is currently running..."
-          failed: "The {{operation}} failed. Please check the logs."
+          failed: "The %{operation} failed. Please check the logs."
           cancel:
             label: "Zrušit"
             title: "Cancel the current operation"
@@ -3026,10 +3029,10 @@ cs:
           theme_settings: "Nastavení motivu"
           no_settings: "Tento motiv nemá nastavení"
           commits_behind:
-            one: "Motiv je {{count}} zavázaný!"
-            few: "Motiv je {{count}} zavázaný!"
-            many: "Motivy jsou {{count}} zavázané!"
-            other: "Motivy jsou {{count}} zavázané!"
+            one: "Motiv je %{count} zavázaný!"
+            few: "Motiv je %{count} zavázaný!"
+            many: "Motivy jsou %{count} zavázané!"
+            other: "Motivy jsou %{count} zavázané!"
           scss:
             text: "CSS"
             title: "Vložit vlastní CSS, akceptujeme všechny platné CSS a SCSS styly."
@@ -3355,8 +3358,8 @@ cs:
           title: "Odhal emailovou adresu tohoto uživatele"
           text: "Zobrazit"
       user:
-        suspend_failed: "Nastala chyba při zakazování uživatele {{error}}"
-        unsuspend_failed: "Nastala chyba při povolování uživatele {{error}}"
+        suspend_failed: "Nastala chyba při zakazování uživatele %{error}"
+        unsuspend_failed: "Nastala chyba při povolování uživatele %{error}"
         suspend_duration: "Jak dlouho má zákaz platit? (dny)"
         suspend_reason_label: "Why are you suspending? This text <b>will be visible to everyone</b> on this user's profile page, and will be shown to the user when they try to log in. Keep it short."
         suspend_reason_hidden_label: "Důvod zablokování? Tento text se zobrazí uživateli ve chvíli, kdy se pokusí přihlásit. Udržuj ho krátký."
@@ -3683,6 +3686,7 @@ cs:
         title: "Emoji"
         help: "Vložte nové emoji, které bude dostupné pro všechny na fóru. (Protip: můžete přetáhnout několik souborů najednou.)"
         add: "Vložit nový Emoji"
+        uploading: "Nahrává se..."
         name: "Název"
         group: "Skupina"
         image: "Obrázek"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index ad56db3edd..165c033d9d 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -23,8 +23,8 @@ da:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
@@ -222,11 +222,11 @@ da:
     weekly: "ugentligt"
     every_month: "hver måned"
     every_six_months: "hvert halvår"
-    max_of_count: "maks af {{count}}"
+    max_of_count: "maks af %{count}"
     alternation: "eller"
     character_count:
-      one: "{{count}} tegn"
-      other: "{{count}} tegn"
+      one: "%{count} tegn"
+      other: "%{count} tegn"
     related_messages:
       title: "Relaterede beskeder"
       see_all: 'Se <a href="%{path}">alle beskeder</a> fra @ %{username} ...'
@@ -280,14 +280,14 @@ da:
         yes_value: "Ja, opgiv"
         no_value: "Nej, behold"
     topic_count_latest:
-      one: "Se {{count}} nyt eller opdateret emne"
-      other: "Se {{count}} nye eller opdaterede emner"
+      one: "Se %{count} nyt eller opdateret emne"
+      other: "Se %{count} nye eller opdaterede emner"
     topic_count_unread:
-      one: "Se {{count}} ulæst emne"
-      other: "Se {{count}} ulæste emner"
+      one: "Se %{count} ulæst emne"
+      other: "Se %{count} ulæste emner"
     topic_count_new:
-      one: "Se {{count}} nyt emne"
-      other: "Se {{count}} nye emner"
+      one: "Se %{count} nyt emne"
+      other: "Se %{count} nye emner"
     preview: "forhåndsvising"
     cancel: "annullér"
     save: "Gem ændringer"
@@ -295,7 +295,7 @@ da:
     saved: "Gemt!"
     upload: "Upload"
     uploading: "Uploader…"
-    uploading_filename: "Uploader: {{filename}} ..."
+    uploading_filename: "Uploader: %{filename} ..."
     clipboard: "udklipsholder"
     uploaded: "Uploadet!"
     pasting: "Indsætter..."
@@ -347,7 +347,7 @@ da:
         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."
         claimed_by_you: "Du har gjort krav på dette punkt og kan gennemgå det."
-        claimed_by_other: "Dette punkt kan kun gennemgås af <b>{{username}}</b> ."
+        claimed_by_other: "Dette punkt kan kun gennemgås af <b>%{username}</b> ."
       claim:
         title: "gør krav på dette emne"
       unclaim:
@@ -367,7 +367,7 @@ da:
       view_pending: "vis afventende"
       topic_has_pending:
         one: "Dette emne har <b>%{count}</b> indlæg, afventende godkendelse"
-        other: "Dette emne har <b>{{count}}</b> indlæg, afventende godkendelse"
+        other: "Dette emne har <b>%{count}</b> indlæg, afventende godkendelse"
       title: "Anmeldelse"
       topic: "Emne:"
       filtered_topic: "Du har filtreret til indhold der kan andmeldes i ét enkelt emne."
@@ -382,17 +382,17 @@ da:
         fields: "Felter"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} samlet markering)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} samlede markeringer)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} samlet markering)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} samlede markeringer)"
         agreed:
-          one: "{{count}}% er enige"
-          other: "{{count}}% er enige"
+          one: "%{count}% er enige"
+          other: "%{count}% er enige"
         disagreed:
-          one: "{{count}}% er uenig"
-          other: "{{count}}% er uenige"
+          one: "%{count}% er uenig"
+          other: "%{count}% er uenige"
         ignored:
-          one: "{{count}}% ignorerer"
-          other: "{{count}}% ignorerer"
+          one: "%{count}% ignorerer"
+          other: "%{count}% ignorerer"
       topics:
         topic: "Emne"
         reviewable_count: "Tælle"
@@ -402,10 +402,10 @@ da:
         details: "detaljer"
         unique_users:
           one: "%{count} bruger"
-          other: "{{count}} brugere"
+          other: "%{count} brugere"
       replies:
         one: "%{count} svar"
-        other: "{{count}} svar"
+        other: "%{count} svar"
       edit: "Rediger"
       save: "Gem"
       cancel: "Afbryd"
@@ -468,22 +468,22 @@ da:
         description: "Vi har modtaget dit indlæg, men det skal først godkendes af en moderator. Hav venligst tålmodighed."
         pending_posts:
           one: "Du har <strong>%{count}</strong> afventende indlæg."
-          other: "Du har <strong>{{count}}</strong> indlæg afventende."
+          other: "Du har <strong>%{count}</strong> indlæg afventende."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> oprettede <a href='{{topicUrl}}'>emnet</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Du</a> oprettede <a href='{{topicUrl}}'>emnet</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> svarede på <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Du</a> svarede på <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> svarede på <a href='{{topicUrl}}'>emnet</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Du</a> svarede på <a href='{{topicUrl}}'>emnet</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> nævnte <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> nævnte <a href='{{user2Url}}'>dig</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Du</a> nævnte <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Oprettet af <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Oprettet af <a href='{{userUrl}}'>dig</a>"
-      sent_by_user: "Sendt af <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Sendt af <a href='{{userUrl}}'>dig</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> oprettede <a href='%{topicUrl}'>emnet</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Du</a> oprettede <a href='%{topicUrl}'>emnet</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> svarede på <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Du</a> svarede på <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> svarede på <a href='%{topicUrl}'>emnet</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Du</a> svarede på <a href='%{topicUrl}'>emnet</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> nævnte <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> nævnte <a href='%{user2Url}'>dig</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Du</a> nævnte <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Oprettet af <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Oprettet af <a href='%{userUrl}'>dig</a>"
+      sent_by_user: "Sendt af <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Sendt af <a href='%{userUrl}'>dig</a>"
     directory:
       filter_name: "filtrér efter brugernavn"
       title: "Brugere"
@@ -713,7 +713,7 @@ da:
     user_fields:
       none: "(vælg en indstilling)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profil"
       mute: "Mute"
       edit: "Redigér indstillinger"
@@ -785,12 +785,12 @@ da:
       enable_quoting: "Tillad citering af markeret tekst"
       enable_defer: "Aktivér 'udsæt' for at markere emner som ulæste"
       change: "skift"
-      moderator: "{{user}} er moderator"
-      admin: "{{user}} er admin"
+      moderator: "%{user} er moderator"
+      admin: "%{user} er admin"
       moderator_tooltip: "Denne bruger er moderator"
       admin_tooltip: "Denne bruger er administrator"
       silenced_tooltip: "Denne bruger er mådeholdt (silenced)"
-      suspended_notice: "Denne bruger er suspenderet indtil {{date}}."
+      suspended_notice: "Denne bruger er suspenderet indtil %{date}."
       suspended_permanently: "Denne bruger er udelukket."
       suspended_reason: "Begrundelse: "
       github_profile: "Github"
@@ -803,7 +803,7 @@ da:
           Fravalgte / 'muted' emner og kategorier fer ikke inkluderet i disse mails.
         individual: "Send en email for hvert nyt indlæg"
         individual_no_echo: "Send en e-mail for hver nyt indlæg bortset fra mine egne"
-        many_per_day: "Send mig en email for hvert nyt indlæg (omkring {{dailyEmailEstimate}} per dag)"
+        many_per_day: "Send mig en email for hvert nyt indlæg (omkring %{dailyEmailEstimate} per dag)"
         few_per_day: "Send mig en email or hvert nyt indlæg (cirka 2 om dagen)"
         warning: "Mailing liste tilstand aktiveret. Email notifikation indstillinger tilsidesættes."
       tag_settings: "Tags"
@@ -833,9 +833,7 @@ da:
       admin_delete: "Slet"
       users: "Brugere"
       muted_users: "Ignoreret"
-      muted_users_instructions: "Undertryk alle notifikationer fra disse brugere."
       ignored_users: "Ignoreret"
-      ignored_users_instructions: "Undertryk alle indlæg og notifikationer fra disse brugere."
       tracked_topics_link: "Vis"
       automatically_unpin_topics: "Automatisk stop med at følge emner, når jeg når til bunden."
       apps: "Apps"
@@ -888,11 +886,11 @@ da:
         disable: "Deaktiver"
         enable: "Aktiver"
         enable_long: "Aktivér backup koder"
-        manage: "Administrér backup koder. Du har <strong>{{count}}</strong> backup koder tilbage."
+        manage: "Administrér backup koder. Du har <strong>%{count}</strong> backup koder tilbage."
         copy_to_clipboard: "Kopiér til udklipsholder"
         copy_to_clipboard_error: "Fejl ved kopiering til udklipsholder"
         copied_to_clipboard: "Kopierede til udklipsholder"
-        remaining_codes: "Du har <strong>{{count}}</strong> backup koder tilbage."
+        remaining_codes: "Du har <strong>%{count}</strong> backup koder tilbage."
         use: "Brug en backup kode"
         enable_prerequisites: "Du skal aktivere en primær anden faktor, før du genererer backup koder."
         codes:
@@ -963,11 +961,11 @@ da:
         instructions: "Vis aldrig offentligt"
         ok: "Vi vil sende dig en bekræftelses email"
         invalid: "Indtast venligst en gyldig email adresse"
-        authenticated: "Din email er blevet bekræftet af {{provider}}"
+        authenticated: "Din email er blevet bekræftet af %{provider}"
         frequency_immediately: "Vi sender dig en email med det samme, hvis du ikke har læst den ting vi emailer dig om."
         frequency:
           one: "Vi sender dig kun email, hvis vi ikke har set dig i det seneste minut."
-          other: "Vi sender dig kun email. hvis vi ikke har set dig i de sidste {{count}} minutter."
+          other: "Vi sender dig kun email. hvis vi ikke har set dig i de sidste %{count} minutter."
       associated_accounts:
         title: "Tilknyttede konti"
         connect: "Opret forbindelse"
@@ -987,9 +985,9 @@ da:
       username:
         title: "Brugernavn"
         instructions: "unikt, ingen mellemrum, kort"
-        short_instructions: "Folk kan benævne dig som @{{username}}"
+        short_instructions: "Folk kan benævne dig som @%{username}"
         available: "Dit brugernavn er tilgængeligt"
-        not_available: "Ikke ledigt. Prøv {{suggestion}}?"
+        not_available: "Ikke ledigt. Prøv %{suggestion}?"
         not_available_no_suggestion: "Ikke tilgængelig"
         too_short: "Dit brugernavn er for kort"
         too_long: "Dit brugernavn er for langt"
@@ -1009,11 +1007,11 @@ da:
         log_out_all: "Log alle ud "
         active: "aktiv nu"
         not_you: "Ikke dig?"
-        show_all: "Vis alle ({{count}})"
+        show_all: "Vis alle (%{count})"
         show_few: "Vis færre"
         was_this_you: "Var dette dig?"
         was_this_you_description: "Hvis det ikke var dig, anbefaler vi at ændre dit kodeord og logge ud overalt."
-        browser_and_device: "{{browser}} på {{device}}"
+        browser_and_device: "%{browser} på %{device}"
         secure_account: "Gør min konto sikker"
         latest_post: "Du sendte sidst ..."
       last_posted: "Sidste indlæg"
@@ -1092,20 +1090,19 @@ da:
         none: "Ingen invitationer at vise."
         truncated:
           one: "Viser den første invitation."
-          other: "Viser de første {{count}} invitationer."
+          other: "Viser de første %{count} invitationer."
         redeemed: "Brugte invitationer"
         redeemed_tab: "Indløst"
-        redeemed_tab_with_count: "Indløst ({{count}})"
+        redeemed_tab_with_count: "Indløst (%{count})"
         redeemed_at: "Invitation brugt"
         pending: "Afventende invitationer"
         pending_tab: "Afventende"
-        pending_tab_with_count: "Ventende ({{count}})"
+        pending_tab_with_count: "Ventende (%{count})"
         topics_entered: "Emner åbnet"
         posts_read_count: "Indlæg læst"
         expired: "Denne invitation er forældet"
         rescind: "Fjern"
         rescinded: "Invitation fjernet"
-        rescind_all: "Fjern alle udløbne invitationer"
         rescinded_all: "Alle udløbne invitationer fjernet!"
         rescind_all_confirm: "Er du sikker på, at du vil fjerne alle udløbne invitationer?"
         reinvite: "Gensend invitation"
@@ -1116,13 +1113,17 @@ da:
         time_read: "Læsetid"
         days_visited: "Besøgsdage"
         account_age_days: "Kontoens alder i dage"
-        create: "Send en invitation"
+        links_tab: "Links"
+        link_created_at: "Oprettet"
+        link_groups: grupper
+        create: "Send invitation"
         generate_link: "Kopier invitations-link"
         link_generated: "Invitiationslinket blev genereret!"
         valid_for: "Imvitationslinket er kun gyldigt for emailadressen: %{email}"
+        invite_link:
+          success: "Invitiationslinket blev genereret!"
         bulk_invite:
           none: "Du har ikke inviteret noget endnu. Send individuelle invitationer eller inviter mange på en gang ved at <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>uploade en CSV-fil</a>."
-          text: "Masse invitering fra en fil"
           success: "Fil uploaded successfuldt, du vil blive meddelt via en beskede når processen er fuldendt."
           error: "Desværre, filen skal være CSV format."
           confirmation_message: "Du er ved at sende email invitationer til alle i den uploadede fil."
@@ -1213,7 +1214,7 @@ da:
       desc:
         network: "Tjek din internetforbindelse."
         network_fixed: "Det ser ud som om den er tilbage."
-        server: "Fejlkode: {{status}}"
+        server: "Fejlkode: %{status}"
         forbidden: "Du har ikke tilladelser til at se det"
         not_found: "Ups, programmet forsøgte at indlæse en URL der ikke eksisterer."
         unknown: "Noget gik galt."
@@ -1268,8 +1269,8 @@ da:
       value_prop: "Når du opretter en konto, husker vi nøjagtigt, hvad du har læst, så du altid kommer tilbage, hvor du slap. Du får også notifikationer her og via email, når nogen svarer til dig. Og du kan synes godt om indlæg for at dele kærligheden. : Heartpulse:"
     summary:
       enabled_description: "Du ser et sammendrag af dette emne: kun de mest interessante indlæg som andre finder interresante."
-      description: "Der er <b>{{replyCount}}</b> svar."
-      description_time: "Der er <b>{{replyCount}}</b> svar med en estimeret læsetid på <b>{{readingTime}} minutter</b>."
+      description: "Der er <b>%{replyCount}</b> svar."
+      description_time: "Der er <b>%{replyCount}</b> svar med en estimeret læsetid på <b>%{readingTime} minutter</b>."
       enable: "Opsummér dette emne"
       disable: "Vis alle indlæg"
     deleted_filter:
@@ -1282,8 +1283,8 @@ da:
       invite: "Invitér andre ..."
       edit: "Tilføj eller fjern ..."
       leave_message: "Vil du virkelig forlade denne besked?"
-      remove_allowed_user: "Ønsker du virkelig at fjerne {{name}} fra denne samtale?"
-      remove_allowed_group: "Er du sikker på du vil fjerne {{name}} fra denne besked?"
+      remove_allowed_user: "Ønsker du virkelig at fjerne %{name} fra denne samtale?"
+      remove_allowed_group: "Er du sikker på du vil fjerne %{name} fra denne besked?"
     email: "E-mail"
     username: "Brugernavn"
     last_seen: "Sidst set"
@@ -1292,7 +1293,7 @@ da:
     trust_level: "Tillidsniveau"
     search_hint: "brugernavn, email eller IP adresse"
     create_account:
-      disclaimer: "Ved at registrere dig accepterer du <a href='{{privacy_link}}' target='blank'>Privatlivsbetingelser</a> og <a href='{{tos_link}}' target='blank'>servicevilkårene</a> ."
+      disclaimer: "Ved at registrere dig accepterer du <a href='%{privacy_link}' target='blank'>Privatlivsbetingelser</a> og <a href='%{tos_link}' target='blank'>servicevilkårene</a> ."
       title: "Opret konto"
       failed: "Noget gik galt. Måske er e-mail-adressen allerede registreret – prøv “Jeg har glemt min adgangskode”-linket"
     forgot_password:
@@ -1341,7 +1342,7 @@ da:
       awaiting_activation: "Din konto mangler at blive aktiveret. Brug “Jeg har glemt min adgangskode”-linket for at få en ny aktiverings-mail."
       awaiting_approval: "Din konto er ikke blevet godkendt af en moderator endnu. Du får en e-mail når den bliver godkendt."
       requires_invite: "Beklager, det kræve en invitation at blive medlem af dette forum."
-      not_activated: "Du kan ikke logge ind endnu. Vi har tidligere sendt en aktiverings-e-mail til dig på <b>{{sentTo}}</b>. Følg venligst instruktionerne i den e-mail for at aktivere din konto."
+      not_activated: "Du kan ikke logge ind endnu. Vi har tidligere sendt en aktiverings-e-mail til dig på <b>%{sentTo}</b>. Følg venligst instruktionerne i den e-mail for at aktivere din konto."
       not_allowed_from_ip_address: "Du kan ikke logge ind fra den IP adresse."
       admin_not_allowed_from_ip_address: "Du kan ikke logge på som administrator fra denne IP adresse."
       resend_activation_email: "Klik her for at sende aktiverings-e-mail’en igen."
@@ -1350,7 +1351,7 @@ da:
       change_email: "Skift e-mailadresse"
       provide_new_email: "Angiv en ny adresse og vi fremsender din bekræftelses-e-mail påny. "
       submit_new_email: "Opdater e-mailadresse"
-      sent_activation_email_again: "Vi har sendt endnu en aktiverings-e-mail til dig på <b>{{currentEmail}}</b>. Det kan tage nogen få minutter før den når frem; kontrollér også din spam-mappe."
+      sent_activation_email_again: "Vi har sendt endnu en aktiverings-e-mail til dig på <b>%{currentEmail}</b>. Det kan tage nogen få minutter før den når frem; kontrollér også din spam-mappe."
       sent_activation_email_again_generic: "Vi har sendt en anden aktiveringsemail. Det kan tage et par minutter, før det ankommer; husk at checke din spam-mappe."
       to_continue: "Log venligst ind"
       preferences: "Du skal være logget ind for at ændre præferencer."
@@ -1409,19 +1410,19 @@ da:
     conditional_loading_section:
       loading: Loader...
     category_row:
-      topic_count: "{{count}} emner i denne kategori"
+      topic_count: "%{count} emner i denne kategori"
     select_kit:
       default_header_text: Vælg...
       no_content: Ingen match fundet
       filter_placeholder: Søg...
       filter_placeholder_with_any: Søg eller opret ...
-      create: "Opret: '{{content}}'"
+      create: "Opret: '%{content}'"
       max_content_reached:
-        one: "Du kan kun vælge {{count}}punkt."
-        other: "Du kan kun vælge {{count}}punkter."
+        one: "Du kan kun vælge %{count}punkt."
+        other: "Du kan kun vælge %{count}punkter."
       min_content_not_reached:
-        one: "Vælg mindst {{count}}punkt."
-        other: "Vælg mindst {{count}}punkter."
+        one: "Vælg mindst %{count}punkt."
+        other: "Vælg mindst %{count}punkter."
     date_time_picker:
       from: Fra
       to: Til
@@ -1448,7 +1449,7 @@ da:
       default: Brugerdefineret humørikoner
     shared_drafts:
       title: "Delte kladder"
-      notice: "Dette emne er kun synligt for dem, der kan se kategorien <b>{{category}}</b> ."
+      notice: "Dette emne er kun synligt for dem, der kan se kategorien <b>%{category}</b> ."
       destination_category: "Destinations-kategori"
       publish: "Offentliggør delt kladde"
       confirm_publish: "Er du sikker på, at du vil offentliggøre dette udkast?"
@@ -1468,24 +1469,24 @@ da:
       similar_topics: "Dit emne minder om…"
       drafts_offline: "kladder offline"
       edit_conflict: "rediger konflikt"
-      group_mentioned_limit: "<b>Advarsel!</b> Du nævnte <a href='{{group_link}}'>{{group}}</a> , men denne gruppe har flere medlemmer end administratorens konfigurerede omtale-grænse for {{max}} brugere. Ingen bliver underrettet."
+      group_mentioned_limit: "<b>Advarsel!</b> Du nævnte <a href='%{group_link}'>%{group}</a> , men denne gruppe har flere medlemmer end administratorens konfigurerede omtale-grænse for %{max} brugere. Ingen bliver underrettet."
       group_mentioned:
-        one: "Ved at nævne {{group}} sender du en notifikation til <a href='{{group_link}}'>%{count} person</a> - vil du fortsætte?"
-        other: "Ved at nævne {{group}} sender du en notifikation til <a href='{{group_link}}'>{{count}} personer</a> - vil du fortsætte?"
+        one: "Ved at nævne %{group} sender du en notifikation til <a href='%{group_link}'>%{count} person</a> - vil du fortsætte?"
+        other: "Ved at nævne %{group} sender du en notifikation til <a href='%{group_link}'>%{count} personer</a> - vil du fortsætte?"
       cannot_see_mention:
-        category: "Du nævnte {{username}}, men de vil ikke blive notificeret fordi de ikke har adgang til denne kategori. Du vil være nødt til at tilføje dem til en gruppe, der har adgang til kategori."
-        private: "Du nævnte {{username}}, men de vil ikke blive notificeret fordi de ikke er i stand til at se denne personlige besked. Du vil være nødt til at invitere dem til denne personlige besked."
-      duplicate_link: "Det ser ud til, at dit link til <b>{{domain}}</b> allerede var sendt i emnet af <b>@ {{username}}</b> i <a href='{{post_url}}'>et svar på {{ago}}</a> - er du sikker på, at du vil sende det igen?"
-      reference_topic_title: "RE: {{title}}"
+        category: "Du nævnte %{username}, men de vil ikke blive notificeret fordi de ikke har adgang til denne kategori. Du vil være nødt til at tilføje dem til en gruppe, der har adgang til kategori."
+        private: "Du nævnte %{username}, men de vil ikke blive notificeret fordi de ikke er i stand til at se denne personlige besked. Du vil være nødt til at invitere dem til denne personlige besked."
+      duplicate_link: "Det ser ud til, at dit link til <b>%{domain}</b> allerede var sendt i emnet af <b>@ %{username}</b> i <a href='%{post_url}'>et svar på %{ago}</a> - er du sikker på, at du vil sende det igen?"
+      reference_topic_title: "RE: %{title}"
       error:
         title_missing: "Titlen er påkrævet"
-        title_too_short: "Titlen skal være på mindst {{min}} tegn"
-        title_too_long: "Titlen skal være kortere end {{max}} tegn."
+        title_too_short: "Titlen skal være på mindst %{min} tegn"
+        title_too_long: "Titlen skal være kortere end %{max} tegn."
         post_missing: "Indlæg kan ikke være tomt"
-        post_length: "Indlægget skal være på mindst {{min}} tegn."
-        try_like: "Har du prøvet {{heart}}knappen?"
+        post_length: "Indlægget skal være på mindst %{min} tegn."
+        try_like: "Har du prøvet %{heart}knappen?"
         category_missing: "Du skal vælge en kategori."
-        tags_missing: "Du skal vælge mindst {{count}}-tags"
+        tags_missing: "Du skal vælge mindst %{count}-tags"
       save_edit: "Gem ændringer"
       overwrite_edit: "Overskriv redigering"
       reply_original: "Svar til det oprindelige emne"
@@ -1579,55 +1580,55 @@ da:
       tooltip:
         regular:
           one: "%{count} uset notifikation"
-          other: "{{count}} usete notifikationer"
+          other: "%{count} usete notifikationer"
         message:
           one: "%{count} ulæst besked"
-          other: "{{count}} ulæste beskeder"
+          other: "%{count} ulæste beskeder"
       title: "notifikationer ved @navns nævnelse, svar på dine indlæg og emner, beskeder, mv."
       none: "Ikke i stand til at indlæse notifikationer for tiden."
       empty: "Ingen notifikationer fundet."
       post_approved: "Dit indlæg blev godkendt"
       reviewable_items: "genstande, der kræver gennemgang"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} og %{count} anden</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} og {{count}} andre</span> {{description}}"
+        one: "<span>%{username}, %{username2} og %{count} anden</span> %{description}"
+        other: "<span>%{username}, %{username2} og %{count} andre</span> %{description}"
       liked_consolidated_description:
-        one: "kunne godt lide {{count}} af dine indlæg"
-        other: "syntes godt om {{count}} af dine indlæg"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> accepterede din invitation"
-      moved_post: "<span>{{username}}</span> flyttede {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Optjent '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Nyt emne</span> {{description}}"
+        one: "kunne godt lide %{count} af dine indlæg"
+        other: "syntes godt om %{count} af dine indlæg"
+      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}"
+      invitee_accepted: "<span>%{username}</span> accepterede din invitation"
+      moved_post: "<span>%{username}</span> flyttede %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Optjent '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Nyt emne</span> %{description}"
       group_message_summary:
-        one: "{{count}} besked i din {{group_name}} indbakke"
-        other: "{{count}} beskeder i din {{group_name}} indbakke"
+        one: "%{count} besked i din %{group_name} indbakke"
+        other: "%{count} beskeder i din %{group_name} indbakke"
       popup:
-        mentioned: '{{username}} nævnte dig i "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} nævnte dig i "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} citerede dig i "{{topic}}" - {{site_title}}'
-        replied: '{{username}} svarede dig i "{{topic}}" - {{site_title}}'
-        posted: '{{username}} skrev i "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} sendte dig en privat besked i "{{topic}}" - {{site_title}}'
-        linked: '{{username}} linkede til dit indlæg fra "{{topic}}" - {{site_title}}'
-        watching_first_post: '{{username}} oprettet et nyt emne"{{topic}}" - {{site_title}}'
+        mentioned: '%{username} nævnte dig i "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} nævnte dig i "%{topic}" - %{site_title}'
+        quoted: '%{username} citerede dig i "%{topic}" - %{site_title}'
+        replied: '%{username} svarede dig i "%{topic}" - %{site_title}'
+        posted: '%{username} skrev i "%{topic}" - %{site_title}'
+        private_message: '%{username} sendte dig en privat besked i "%{topic}" - %{site_title}'
+        linked: '%{username} linkede til dit indlæg fra "%{topic}" - %{site_title}'
+        watching_first_post: '%{username} oprettet et nyt emne"%{topic}" - %{site_title}'
         confirm_title: "Notifikationer aktiveret - %{site_title}"
         confirm_body: "Succes! notifikationer er aktiveret."
-        custom: "Notifikation fra {{username}}på %{site_title}"
+        custom: "Notifikation fra %{username}på %{site_title}"
       titles:
         mentioned: "nævnte"
         replied: "nyt svar"
@@ -1654,9 +1655,9 @@ da:
       from_my_computer: "Fra min computer"
       from_the_web: "Fra nettet"
       remote_tip: "link til billede"
-      remote_tip_with_attachments: "link til billede eller fil {{authorized_extensions}}"
+      remote_tip_with_attachments: "link til billede eller fil %{authorized_extensions}"
       local_tip: "vælg billeder fra din enhed"
-      local_tip_with_attachments: "vælg billeder eller filer fra din enhed {{authorized_extensions}}"
+      local_tip_with_attachments: "vælg billeder eller filer fra din enhed %{authorized_extensions}"
       hint: "(du kan også trække og slippe ind i editoren for at uploade dem)"
       hint_for_supported_browsers: "du kan også bruge træk-og-slip eller indsætte billeder i editoren"
       uploading: "Uploader billede"
@@ -1673,15 +1674,15 @@ da:
       clear_all: "Ryd alle"
       too_short: "Dit søgekriterie er for kort."
       result_count:
-        one: "<span>%{count} resultat for</span> <span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} resultater for</span> <span class='term'>{{term}}</span>"
+        one: "<span>%{count} resultat for</span> <span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} resultater for</span> <span class='term'>%{term}</span>"
       title: "søg efter emner, indlæg, brugere eller kategorier"
       full_page_title: "søg emner eller indlæg"
       no_results: "Ingen resultater fundet."
       no_more_results: "Ikke flere resultater."
       searching: "Søger…"
-      post_format: "#{{post_number}} af {{username}}"
-      results_page: "Søgeresultater for '{{term}}'"
+      post_format: "#%{post_number} af %{username}"
+      results_page: "Søgeresultater for '%{term}'"
       more_results: "Der er flere resultater. Begræns dine søgekriterier."
       cant_find: "Kan du ikke finde det, du leder efter?"
       start_new_topic: "Start måske et nyt emne?"
@@ -1690,8 +1691,8 @@ da:
       search_google_button: "Google"
       search_google_title: "Søg denne side"
       context:
-        user: "Søg i indlæg fra @{{username}}"
-        category: "Søg i #{{category}} kategorien"
+        user: "Søg i indlæg fra @%{username}"
+        category: "Søg i #%{category} kategorien"
         topic: "Søg i dette emne"
         private_messages: "Søg i beskeder"
       advanced:
@@ -1766,7 +1767,7 @@ da:
         choose_new_category: "Vælg den nye kategori for emnerne:"
         selected:
           one: "Du har valgt <b>%{count}</b> indlæg."
-          other: "Du har valgt <b>{{count}}</b> indlæg."
+          other: "Du har valgt <b>%{count}</b> indlæg."
         change_tags: "Erstat Tags"
         append_tags: "Tilføj Tags"
         choose_new_tags: "Vælg nye tags for dette emne"
@@ -1779,7 +1780,7 @@ da:
         posted: "Du har ikke skrevet nogen indlæg endnu."
         latest: "Der er ikke nogen nye emner. Det er sørgeligt."
         bookmarks: "Du har ingen bogmærkede emner endnu."
-        category: "Der er ingen emner i kategorien {{category}}."
+        category: "Der er ingen emner i kategorien %{category}."
         top: "Der er ingen top emner"
         educate:
           new: '<p>Dine nye emner vises her.</p><p>Som standard, betragtes emner som ulæste og vil vise en <span class="badge new-posts badge-notification" style="vertical-align:middle;line-height:inherit;">ny</span> indikator hvis de var oprettet indenfor de sidste 2 dage</p><p>Du kan ændre dette i dine <a href="%{userPrefsUrl}">indstillinger</a></p>'
@@ -1790,13 +1791,13 @@ da:
         read: "Der er ikke flere læste emner."
         new: "Der er ikke flere nye emner."
         unread: "Der er ikke flere ulæste emner."
-        category: "Der er ikke flere emner i kategorien {{category}}."
+        category: "Der er ikke flere emner i kategorien %{category}."
         top: "Der er ikke flere top emner"
         bookmarks: "Der er ikke flere bogmærkede emner."
     topic:
       filter_to:
         one: "%{count} indlæg i emnet"
-        other: "{{count}} indlæg i emnet"
+        other: "%{count} indlæg i emnet"
       create: "Nyt emne"
       create_long: "Opret et nyt emne i debatten"
       open_draft: "Åben kladde"
@@ -1818,10 +1819,10 @@ da:
       unread: "ulæste"
       new_topics:
         one: "%{count} nyt emne"
-        other: "{{count}} nye emner"
+        other: "%{count} nye emner"
       unread_topics:
         one: "%{count} ulæst emne"
-        other: "{{count}} ulæste emner"
+        other: "%{count} ulæste emner"
       title: "Emne"
       invalid_access:
         title: "Emnet er privat"
@@ -1834,25 +1835,25 @@ da:
         title: "Emnet findes ikke"
         description: "Beklager, vi kunne ikke finde det emne i databasen. Måske er det blevet fjernet af moderator?"
       total_unread_posts:
-        one: "der er {{count}} indlæg du ikke har læst i dette emne"
-        other: "der er {{count}} indlæg du ikke har læst i dette emne"
+        one: "der er %{count} indlæg du ikke har læst i dette emne"
+        other: "der er %{count} indlæg du ikke har læst i dette emne"
       unread_posts:
         one: "der er %{count} indlæg du ikke har læst i dette emne"
-        other: "der er {{count}} indlæg du ikke har læst i dette emne"
+        other: "der er %{count} indlæg du ikke har læst i dette emne"
       new_posts:
         one: "der er kommet %{count} nyt indlæg i dette emne siden du læste det sidst"
-        other: "der er kommet {{count}} nye indlæg i dette emne siden du læste det sidst"
+        other: "der er kommet %{count} nye indlæg i dette emne siden du læste det sidst"
       likes:
         one: "der er ét like i dette emne"
-        other: "der er {{count}} likes i dette emne"
+        other: "der er %{count} likes i dette emne"
       back_to_list: "Tilbage til emneoversigt"
       options: "Emneindstillinger"
       show_links: "vis links i dette emne"
       toggle_information: "vis/skjul emne detaljer"
-      read_more_in_category: "Mere læsestof? Se andre emner i {{catLink}} eller {{latestLink}}."
-      read_more: "Mere læsestof? {{catLink}} eller {{latestLink}}."
-      group_request: "Du skal anmode om medlemskab af gruppen '{{name}}' for at se dette emne"
-      group_join: "Du skal være medlem af gruppen '{{name}}' for at se dette emne"
+      read_more_in_category: "Mere læsestof? Se andre emner i %{catLink} eller %{latestLink}."
+      read_more: "Mere læsestof? %{catLink} eller %{latestLink}."
+      group_request: "Du skal anmode om medlemskab af gruppen '%{name}' for at se dette emne"
+      group_join: "Du skal være medlem af gruppen '%{name}' for at se dette emne"
       group_request_sent: "Din anmodning om gruppe medlemskab er sendt. Du får besked, når den accepteres."
       read_more_MF: "Der { UNREAD, plural, =0 {} one { er <a href='{basePath}/unread'>1 ulæst</a> } other { er <a href='{basePath}/unread'># ulæste</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 new</a> topic} other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># new</a> topics} } tilbage, eller {CATEGORY, select, true {kig på andre emner i {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Vis alle kategorier
@@ -2025,25 +2026,25 @@ da:
         choose_category: "Vælg en kategori til det offentlige emne:"
       feature_topic:
         title: "Fremhæv dette emne"
-        pin: "Fastgør dette emne til toppen af kategorien {{categoryLink}} indtil"
-        confirm_pin: "Du har allerede {{count}} fastgjorte emner. Fastgjorte emner kan være irriterende for nye og anonyme brugere. Er du sikker på du vil fastgøre et nyt emne i denne kategori?"
-        unpin: "Fjern dette emne fra starten af listen i {{categoryLink}} kategorien."
-        unpin_until: "Fjern dette emne fra toppen af kategorien {{categoryLink}} eller vent til <strong>%{until}</strong>."
+        pin: "Fastgør dette emne til toppen af kategorien %{categoryLink} indtil"
+        confirm_pin: "Du har allerede %{count} fastgjorte emner. Fastgjorte emner kan være irriterende for nye og anonyme brugere. Er du sikker på du vil fastgøre et nyt emne i denne kategori?"
+        unpin: "Fjern dette emne fra starten af listen i %{categoryLink} kategorien."
+        unpin_until: "Fjern dette emne fra toppen af kategorien %{categoryLink} eller vent til <strong>%{until}</strong>."
         pin_note: "Brugere kan unpinne emnet individuelt."
         pin_validation: "Der skal angives en dato for at fastgøre dette emne"
-        not_pinned: "Der er ingen fastgjorte emner i {{categoryLink}}."
+        not_pinned: "Der er ingen fastgjorte emner i %{categoryLink}."
         already_pinned:
-          one: "Emner fastgjort i {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Emner fastgjort i {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Emner fastgjort i %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Emner fastgjort i %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Fastgør dette emne til toppen af alle emnelister indtil"
-        confirm_pin_globally: "Du har allerede {{count}} globalt fastgjorte emner. For mange fastgjorte emner kan være irriterende for nye og anonyme brugere. Er du sikker på du vil fastgøre et emne mere globalt?"
+        confirm_pin_globally: "Du har allerede %{count} globalt fastgjorte emner. For mange fastgjorte emner kan være irriterende for nye og anonyme brugere. Er du sikker på du vil fastgøre et emne mere globalt?"
         unpin_globally: "Fjern dette emne fra toppen af alle emne lister."
         unpin_globally_until: "Fjern dette emne fra toppen af alle emnelister eller vent til <strong>%{until}</strong>."
         global_pin_note: "Brugere kan unpinne emnet individuelt."
         not_pinned_globally: "Der er ingen globalt fastgjorte emner."
         already_pinned_globally:
           one: "Globalt fastgjorte emner: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Globalt fastgjorte emner: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Globalt fastgjorte emner: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Gør dette emne til en banner, der kommer til at stå i toppen på alle sider."
         remove_banner: "Fjern banneret, der står på toppen af alle sider."
         banner_note: "Brugere kan fjernet banneret ved at lukke det. Kun én banner kan være aktiv ad gangen."
@@ -2073,15 +2074,15 @@ da:
         to_topic_username: "Du har indtastet et brugernavn. Vi sender en notifikation med en invitation til denne tråd."
         to_username: "Indtast brugernavnet på den person du vil invitere. Vi sender en notifikation med et link til denne tråd."
         email_placeholder: "e-mail-adresse"
-        success_email: "Vi har e-mailet en invitation til <b>{{emailOrUsername}}</b>. Vi notificerer dig, når invitationen er blevet accepteret. Kig på invitations fanebladet på din bruger side for at se status på dine invitationer."
+        success_email: "Vi har e-mailet en invitation til <b>%{emailOrUsername}</b>. Vi notificerer dig, når invitationen er blevet accepteret. Kig på invitations fanebladet på din bruger side for at se status på dine invitationer."
         success_username: "Vi har inviteret brugeren til at deltage i dette emne."
         error: "Beklager, vi kunne ikke invitere denne person. Måske er de allerede inviteret? (der er begrænsning på hvor mange gange man kan invitere en person)"
-        success_existing_email: "En bruger med email <b>{{emailOrUsername}}</b> eksisterer allerede. Vi har opfordret denne bruger til at deltage i dette emne."
+        success_existing_email: "En bruger med email <b>%{emailOrUsername}</b> eksisterer allerede. Vi har opfordret denne bruger til at deltage i dette emne."
       login_reply: "Log ind for at svare"
       filters:
         n_posts:
           one: "%{count} indlæg"
-          other: "{{count}} indlæg"
+          other: "%{count} indlæg"
         cancel: "Fjern filter"
       move_to:
         title: "Flyt til"
@@ -2095,7 +2096,7 @@ da:
         error: "Der opstod en fejl under flytningen af indlæg til det nye emne."
         instructions:
           one: "Du er ved at oprette et nyt emne med det valgte indlæg."
-          other: "Du er ved at oprette et nyt emne med de <b>{{count}}</b> valgte indlæg."
+          other: "Du er ved at oprette et nyt emne med de <b>%{count}</b> valgte indlæg."
       merge_topic:
         title: "Flyt til eksisterende emne"
         action: "flyt til eksisterende emne"
@@ -2103,7 +2104,7 @@ da:
         radio_label: "Eksisterende emne"
         instructions:
           one: "Vælg venligst det emne som indlægget skal flyttes til."
-          other: "Vælg venligst det emne som de <b>{{count}}</b> indlæg skal flyttes til."
+          other: "Vælg venligst det emne som de <b>%{count}</b> indlæg skal flyttes til."
       move_to_new_message:
         title: "Flyt til ny besked"
         action: "flyt til ny besked"
@@ -2112,7 +2113,7 @@ da:
         participants: "Deltagere"
         instructions:
           one: "Du er ved at oprette en ny besked og udfylde den med indlægget, du har valgt."
-          other: "Du er ved at oprette en ny besked og udfylde den med de <b>{{count}}</b>- indlæg, du har valgt."
+          other: "Du er ved at oprette en ny besked og udfylde den med de <b>%{count}</b>- indlæg, du har valgt."
       move_to_existing_message:
         title: "Flyt til Eksisterende Besked"
         action: "flyt til eksisterende besked"
@@ -2120,7 +2121,7 @@ da:
         participants: "Deltagere"
         instructions:
           one: "Vælg beskeden, du gerne vil flytte dette indlæg til."
-          other: "Vælg beskeden, du gerne vil flytte disse <b>{{count}}-</b> indlæg til."
+          other: "Vælg beskeden, du gerne vil flytte disse <b>%{count}-</b> indlæg til."
       merge_posts:
         title: "Flet valgte indlæg"
         action: "flet valgte indlæg"
@@ -2131,8 +2132,8 @@ da:
         error: "Der opstod en fejl da ejerskabet skulle skiftes."
         placeholder: "brugernavn på ny ejer"
         instructions:
-          one: "Vælg en ny ejer til indlægget af <b>@ {{old_user}}</b>"
-          other: "Vælg en ny ejer til {{count}}indlæg af <b>@ {{old_user}}</b>"
+          one: "Vælg en ny ejer til indlægget af <b>@ %{old_user}</b>"
+          other: "Vælg en ny ejer til %{count}indlæg af <b>@ %{old_user}</b>"
       change_timestamp:
         title: "Tilpas tidsstempel..."
         action: "ret tidsstempel"
@@ -2141,7 +2142,7 @@ da:
         instructions: "Vælg venligst det nye tidsstempel for dette emne. Indlæg under emnet vil blive opdateret så de har samme tidsforskel."
       multi_select:
         select: "vælg"
-        selected: "valgt ({{count}})"
+        selected: "valgt (%{count})"
         select_post:
           label: "vælg"
           title: "Tilføj indlæg til udvalg"
@@ -2160,20 +2161,20 @@ da:
         deselect_all: marker ingen
         description:
           one: Du har valgt <b>%{count}</b> indlæg.
-          other: "Du har valgt <b>{{count}}</b> indlæg."
+          other: "Du har valgt <b>%{count}</b> indlæg."
       deleted_by_author:
         one: "(emne, der trækkes tilbage af forfatteren, slettes automatisk efter%{count} time, medmindre det markeres)"
         other: "(emne, der trækkes tilbage af forfatteren, slettes automatisk efter %{count} timer, medmindre det markeres)"
     post:
       quote_reply: "Citér"
       edit_reason: "Reason: "
-      post_number: "indlæg {{number}}"
+      post_number: "indlæg %{number}"
       ignored: "Ignoreret indhold"
       wiki_last_edited_on: "wiki sidst redigeret den"
       last_edited_on: "indlæg sidst redigeret den"
       reply_as_new_topic: "Svar som linket emne"
       reply_as_new_private_message: "Svar med ny besked til de samme modtagere"
-      continue_discussion: "Fortsætter debatten fra {{postLink}}:"
+      continue_discussion: "Fortsætter debatten fra %{postLink}:"
       follow_quote: "gå til det citerede indlæg"
       show_full: "Vis hele emnet"
       show_hidden: "Vis ignoreret indhold."
@@ -2185,29 +2186,29 @@ da:
       locked: "Et hjælperteam medlem har låst dette indlæg fra at blive redigeret"
       gap:
         one: "se %{count} udeladt indlæg "
-        other: "se {{count}} udeladte indlæg "
+        other: "se %{count} udeladte indlæg "
       notice:
-        new_user: "Dette er første gang {{user}} har sendt - lad os byde dem velkommen til vores fællesskab!"
-        returning_user: "Det er et stykke tid siden vi har set {{user}} - deres sidste indlæg var {{time}}."
+        new_user: "Dette er første gang %{user} har sendt - lad os byde dem velkommen til vores fællesskab!"
+        returning_user: "Det er et stykke tid siden vi har set %{user} - deres sidste indlæg var %{time}."
       unread: "Indlæg er ulæst"
       has_replies:
-        one: "{{count}} svar"
-        other: "{{count}} svar"
+        one: "%{count} svar"
+        other: "%{count} svar"
       has_likes_title:
         one: "%{count} likede dette indlæg"
-        other: "{{count}} likede dette indlæg"
+        other: "%{count} likede dette indlæg"
       has_likes_title_only_you: "du likede dette indlæg"
       has_likes_title_you:
         one: "du og %{count} anden likede dette indlæg"
-        other: "du og {{count}} andre likede dette indlæg"
+        other: "du og %{count} andre likede dette indlæg"
       errors:
         create: "Beklager, der opstod en fejl under oprettelsen af dit indlæg. Prøv venligst igen."
         edit: "Beklager, der opstrod en fejl under redigeringen af dit indlæg. Prøv venligst igen."
         upload: "Beklager, der opstod en fejl ved upload af filen. Prøv venligst igen."
-        file_too_large: "Beklager, denne fil er for stor (maksimal størrelse er {{max_size_kb}}kb). Hvorfor ikke uploade din store fil til en cloud-delingstjeneste, og derefter indsætte linket?"
+        file_too_large: "Beklager, denne fil er for stor (maksimal størrelse er %{max_size_kb}kb). Hvorfor ikke uploade din store fil til en cloud-delingstjeneste, og derefter indsætte linket?"
         too_many_uploads: "Beklager, men du kan kun uploade én fil ad gangen."
-        too_many_dragged_and_dropped_files: "Beklager, du kan kun uploade {{max}} filer ad gangen."
-        upload_not_authorized: "Beklager, filen som du forsøger at uploade, er ikke tiladt (tilladte filendelser: {{authorized_extensions}})."
+        too_many_dragged_and_dropped_files: "Beklager, du kan kun uploade %{max} filer ad gangen."
+        upload_not_authorized: "Beklager, filen som du forsøger at uploade, er ikke tiladt (tilladte filendelser: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Beklager, nye brugere kan ikke uploade billeder."
         attachment_upload_not_allowed_for_new_user: "Beklager, nye brugere kan ikke uploade vedhæftede filer."
         attachment_download_requires_login: "Beklager, du skal være logget på for at downloade vedhæftede filer."
@@ -2245,10 +2246,10 @@ da:
           confirm: "Vil du også slette svarene på dette indlæg?"
           direct_replies:
             one: "Ja, og %{count} direkte svar"
-            other: "Ja, og {{count}} direkte svar"
+            other: "Ja, og %{count} direkte svar"
           all_replies:
             one: "Ja, og %{count} svar"
-            other: "Ja, og alle {{count}} svar"
+            other: "Ja, og alle %{count} svar"
           just_the_post: "Nej, kun dette indlæg"
         admin: "indlæg administrator handlinger"
         wiki: "Opret Wiki"
@@ -2288,8 +2289,8 @@ da:
           notify_user: "sendte en besked"
           bookmark: "bogmærkede dette"
           like_capped:
-            one: "og {{count}} anden kunne lide dette"
-            other: "og {{count}} andre kunne lide dette"
+            one: "og %{count} anden kunne lide dette"
+            other: "og %{count} andre kunne lide dette"
         by_you:
           off_topic: "Du flagede dette som off-topic"
           spam: "Du flagede dette som spam"
@@ -2301,11 +2302,11 @@ da:
       delete:
         confirm:
           one: "Er du sikker på, at du vil slette dette indlæg?"
-          other: "Er du sikker på, at du vil slette disse {{count}}indlæg?"
+          other: "Er du sikker på, at du vil slette disse %{count}indlæg?"
       merge:
         confirm:
           one: "Er du sikker på, at du vil flette disse indlæg?"
-          other: "Er du sikker på, at du vil flette disse {{count}}indlæg?"
+          other: "Er du sikker på, at du vil flette disse %{count}indlæg?"
       revisions:
         controls:
           first: "Første udgave"
@@ -2317,7 +2318,7 @@ da:
           revert: "Gå tilbage til denne udgave"
           edit_wiki: "Ret Wiki"
           edit_post: "Ret Indlæg"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "Vis det renderede output med tilføjelser og ændringer indlejret"
@@ -2489,13 +2490,13 @@ da:
       custom_message:
         at_least:
           one: "indtast mindst %{count} tegn"
-          other: "indtast mindst {{count}} tegn"
+          other: "indtast mindst %{count} tegn"
         more:
           one: "%{count} mere..."
-          other: "{{count}} mere..."
+          other: "%{count} mere..."
         left:
           one: "%{count} tilbage"
-          other: "{{count}} tilbage"
+          other: "%{count} tilbage"
     flagging_topic:
       title: "Tak fordi du hjælper med at holde vores forum civiliseret!"
       action: "Rapporter emne"
@@ -2539,7 +2540,7 @@ da:
         title: "Dette emne er en privat besked"
         help: "Dette emne er en privat besked"
     posts: "Indlæg"
-    posts_long: "{{number}} indlæg i dette emne"
+    posts_long: "%{number} indlæg i dette emne"
     posts_likes_MF: |
       Dette emne har {count, plural, one {1 svar} other {# svar}} {ratio, select,
       low {med et højt like pr. indlæg forhold}
@@ -2554,20 +2555,20 @@ da:
     replies: "Svar"
     views_long:
       one: "emnet er læst %{count} gang"
-      other: "emnet er læst {{number}} gange"
+      other: "emnet er læst %{number} gange"
     activity: "Aktivitet"
     likes: "Likes"
     likes_lowercase:
       one: "like"
       other: "likes"
-    likes_long: "der er {{number}} likes i dette emne"
+    likes_long: "der er %{number} likes i dette emne"
     users: "Deltagere"
     users_lowercase:
       one: "bruger"
       other: "brugere"
     category_title: "Kategori"
     history: "Historik"
-    changed_by: "af {{author}}"
+    changed_by: "af %{author}"
     raw_email:
       title: "Indgående e-mail"
       not_available: "Ikke tilgængelig!"
@@ -2579,33 +2580,33 @@ da:
         title: "Seneste"
         title_with_count:
           one: "Seneste (%{count})"
-          other: "Seneste ({{count}})"
+          other: "Seneste (%{count})"
         help: "de seneste emner"
       read:
         title: "Læste"
         help: "emner du har læst"
       categories:
         title: "Kategorier"
-        title_in: "Kategori - {{categoryName}}"
+        title_in: "Kategori - %{categoryName}"
         help: "alle emner grupperet efter kategori"
       unread:
         title: "Ulæst"
         title_with_count:
           one: "Ulæst (%{count})"
-          other: "Ulæste ({{count}})"
+          other: "Ulæste (%{count})"
         help: "emner du følger med i lige nu med ulæste indlæg"
         lower_title_with_count:
           one: "%{count} ulæst"
-          other: "{{count}} ulæste"
+          other: "%{count} ulæste"
       new:
         lower_title_with_count:
           one: "%{count} ny"
-          other: "{{count}} nye"
+          other: "%{count} nye"
         lower_title: "Ny"
         title: "Nye"
         title_with_count:
           one: "Nye (%{count})"
-          other: "Nye ({{count}})"
+          other: "Nye (%{count})"
         help: "Emner oprettet i de seneste par dage"
       posted:
         title: "Mine indlæg"
@@ -2614,11 +2615,11 @@ da:
         title: "Bogmærker"
         help: "emner du har bogmærket"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "populære emner i kategorien {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "populære emner i kategorien %{categoryName}"
       top:
         title: "Top"
         help: "de mest aktive emner i det sidse år, måned, uge og dag"
@@ -2760,7 +2761,7 @@ da:
       delete_tag: "Slet tag"
       delete_confirm:
         one: "Er du sikker på, at du vil slette dette tag og fjerne det fra et emne %{count}, der er tildelt det?"
-        other: "Er du sikker på, at du vil slette dette tag og fjerne det fra {{count}}emner, der er tildelt det?"
+        other: "Er du sikker på, at du vil slette dette tag og fjerne det fra %{count}emner, der er tildelt det?"
       delete_confirm_no_topics: "Er du sikker på, at du vil slette dette tag?"
       rename_tag: "Omdøb tag"
       rename_instructions: "Vælg et nyt navn for det tag:"
@@ -3087,10 +3088,10 @@ da:
           redeliver: "Genfremsend"
           incoming:
             one: "Der er et nyt event."
-            other: "Der er {{count}} nye events."
+            other: "Der er %{count} nye events."
           completed_in:
             one: "Fuldført på %{count} sekund."
-            other: "Fuldført på {{count}} sekunder."
+            other: "Fuldført på %{count} sekunder."
           request: "Forespørgsel"
           response: "Svar"
           redeliver_confirm: "Er du sikker på at du vil genfremsende det samme payload?"
@@ -3142,12 +3143,12 @@ da:
           label: "Upload"
           title: "Upload en backup til denne instans"
           uploading: "Uploader..."
-          uploading_progress: "Uploader ... {{progress}}%"
-          success: "'{{filename}}' er blevet uploadet. Filen behandles nu og vil tage op til et minut for at blive vist på listen."
-          error: "Der skete en fejl da filen '{{filename}}' blev forsøgt uploaded: {{message}}"
+          uploading_progress: "Uploader ... %{progress}%"
+          success: "'%{filename}' er blevet uploadet. Filen behandles nu og vil tage op til et minut for at blive vist på listen."
+          error: "Der skete en fejl da filen '%{filename}' blev forsøgt uploaded: %{message}"
         operations:
           is_running: "Der kører allerede en operation..."
-          failed: "{{operation}} gik galt. Kig venligst i logfilerne."
+          failed: "%{operation} gik galt. Kig venligst i logfilerne."
           cancel:
             label: "Annuller"
             title: "Annuller den nuværende handling"
@@ -3265,7 +3266,7 @@ da:
           disabled_component_tooltip: "Denne komponent er deaktiveret"
           default_theme_tooltip: "Dette tema er sidens standard tema"
           updates_available_tooltip: "Opdateringer er tilgængelige til dette tema"
-          and_x_more: "og {{count}} mere."
+          and_x_more: "og %{count} mere."
           collapse: Fald sammen
           uploads: "uploads"
           no_uploads: "Du kan uploade aktiver tilknyttet dit tema, f.eks. skrifttyper og billeder"
@@ -3309,8 +3310,8 @@ da:
           disabled_by: "Dette komponent er deaktiveret af"
           required_version:
             error: "Dette tema er automatisk deaktiveret, fordi det ikke er kompatibelt med denne version af Discourse."
-            minimum: "Kræver Discourse version {{version}} eller nyere."
-            maximum: "Kræver Discourse version {{version}} eller under."
+            minimum: "Kræver Discourse version %{version} eller nyere."
+            maximum: "Kræver Discourse version %{version} eller under."
           component_of: "Komponent af:"
           update_to_latest: "Opdatér til seneste"
           check_for_updates: "Tjek efter opdateringer"
@@ -3323,7 +3324,7 @@ da:
           empty: "Ingen punkter"
           commits_behind:
             one: "Temaet er %{count} 'commit' bagud!"
-            other: "Temaet er {{count}} 'commits' bagud!"
+            other: "Temaet er %{count} 'commits' bagud!"
           compare_commits: "(Se nye 'commits')"
           repo_unreachable: "Kunne ikke kontakte Git-repository for dette tema. Fejl besked:"
           scss:
@@ -3708,8 +3709,8 @@ da:
           title: "Vis denne brugers email adresse"
           text: "Vis"
       user:
-        suspend_failed: "Noget gik galt ved suspenderingen af denne bruger {{error}}"
-        unsuspend_failed: "Noget gik galt ved ophævningen af denne brugers suspendering {{error}}"
+        suspend_failed: "Noget gik galt ved suspenderingen af denne bruger %{error}"
+        unsuspend_failed: "Noget gik galt ved ophævningen af denne brugers suspendering %{error}"
         suspend_duration: "Hvor lang tid skal brugeren være suspenderet?"
         suspend_reason_label: "Hvorfor suspenderer du? Denne tekst <b>er synlig for alle</b> på brugerens profilside, og vises til brugeren når de prøver at logge ind. Fat dig i korthed."
         suspend_reason_hidden_label: "Hvorfor suspenderer du? Teksten er synlig for  denne bruger, når de prøver et log ind. Fat dig i korthed."
@@ -4054,6 +4055,7 @@ da:
         title: "Emoji"
         help: "Tilføj en ny emoji, som vil være tilgængelig for alle. (PROTIP: drag & drop flere filer på én gang)"
         add: "Tilføj ny emoji"
+        uploading: "Uploader…"
         name: "Navn"
         group: "Gruppe"
         image: "Billede"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 4554e4b7a2..535d412514 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -23,8 +23,8 @@ de:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
@@ -225,11 +225,11 @@ de:
     weekly: "wöchentlich"
     every_month: "jeden Monat"
     every_six_months: "alle sechs Monate"
-    max_of_count: "von max. {{count}}"
+    max_of_count: "von max. %{count}"
     alternation: "oder"
     character_count:
-      one: "{{count}} Zeichen"
-      other: "{{count}} Zeichen"
+      one: "%{count} Zeichen"
+      other: "%{count} Zeichen"
     related_messages:
       title: "Verwandte Nachrichten"
       see_all: 'Siehe <a href="%{path}">alle Nachrichten</a> von @%{username}...'
@@ -302,14 +302,14 @@ de:
         yes_value: "Ja, verwerfen"
         no_value: "Nein, behalten"
     topic_count_latest:
-      one: "Zeige {{count}} neues oder aktualisiertes Thema"
-      other: "Zeige {{count}} neue oder aktualisierte Themen"
+      one: "Zeige %{count} neues oder aktualisiertes Thema"
+      other: "Zeige %{count} neue oder aktualisierte Themen"
     topic_count_unread:
-      one: "Zeige {{count}} ungelesenes Thema"
-      other: "Zeige {{count}} ungelesene Themen"
+      one: "Zeige %{count} ungelesenes Thema"
+      other: "Zeige %{count} ungelesene Themen"
     topic_count_new:
-      one: "Zeige {{count}} neues Thema"
-      other: "Zeige {{count}} neue Themen"
+      one: "Zeige %{count} neues Thema"
+      other: "Zeige %{count} neue Themen"
     preview: "Vorschau"
     cancel: "Abbrechen"
     save: "Speichern"
@@ -317,7 +317,7 @@ de:
     saved: "Gespeichert!"
     upload: "Hochladen"
     uploading: "Wird hochgeladen…"
-    uploading_filename: "wird hochgeladen: {{filename}}..."
+    uploading_filename: "wird hochgeladen: %{filename}..."
     clipboard: "Zwischenablage"
     uploaded: "Hochgeladen!"
     pasting: "Einfügen..."
@@ -371,7 +371,7 @@ de:
         optional: "Du kannst dieses Element reservieren, damit andere es nicht überprüfen."
         required: "Du musst Elemente reservieren, bevor du sie überprüfen kannst."
         claimed_by_you: "Du hast dieses Element reserviert und kannst es überprüfen."
-        claimed_by_other: "Dieses Element kann nur von <b>{{username}}</b> überprüft werden."
+        claimed_by_other: "Dieses Element kann nur von <b>%{username}</b> überprüft werden."
       claim:
         title: "Reserviere dieses Thema"
       unclaim:
@@ -391,7 +391,7 @@ de:
       view_pending: "zeige verbleibende"
       topic_has_pending:
         one: "Dieses Thema hat <b>%{count}</b> Beitrag, der auf Genehmigung wartet."
-        other: "Dieses Thema hat <b>{{count}}</b> Beiträge, die auf Genehmigung warten."
+        other: "Dieses Thema hat <b>%{count}</b> Beiträge, die auf Genehmigung warten."
       title: "Überprüfen"
       topic: "Thema:"
       filtered_topic: "Du hast nach zu prüfenden Inhalten in einem einzelnen Thema gefiltert."
@@ -408,17 +408,17 @@ de:
         fields: "Felder"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} Meldung insgesamt)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} Meldungen insgesamt)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} Meldung insgesamt)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} Meldungen insgesamt)"
         agreed:
-          one: "{{count}}% zugestimmt"
-          other: "{{count}}% zugestimmt"
+          one: "%{count}% zugestimmt"
+          other: "%{count}% zugestimmt"
         disagreed:
-          one: "{{count}}% abgelehnt"
-          other: "{{count}}% abgelehnt"
+          one: "%{count}% abgelehnt"
+          other: "%{count}% abgelehnt"
         ignored:
-          one: "{{count}}% ignoriert"
-          other: "{{count}}% ignoriert"
+          one: "%{count}% ignoriert"
+          other: "%{count}% ignoriert"
       topics:
         topic: "Thema"
         reviewable_count: "Anzahl"
@@ -428,10 +428,10 @@ de:
         details: "Details"
         unique_users:
           one: "%{count} Benutzer"
-          other: "{{count}} Benutzer"
+          other: "%{count} Benutzer"
       replies:
         one: "%{count} Antwort"
-        other: "{{count}} Antworten"
+        other: "%{count} Antworten"
       edit: "Bearbeiten"
       save: "Speichern"
       cancel: "Abbrechen"
@@ -494,22 +494,22 @@ de:
         description: "Wir haben deinen neuen Beitrag erhalten. Dieser muss allerdings zunächst durch einen Moderator freigeschaltet werden. Bitte habe etwas Geduld. "
         pending_posts:
           one: "Du hast <strong>%{count}</strong> verbleibenden Beitrag."
-          other: "Du hast <strong>{{count}}</strong> verbleibende Beiträge."
+          other: "Du hast <strong>%{count}</strong> verbleibende Beiträge."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> hat <a href='{{topicUrl}}'>das Thema</a> verfasst"
-      you_posted_topic: "<a href=\"{{userUrl}}\">Du</a> hast <a href=\"{{topicUrl}}\">das Thema</a> verfasst"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> hat auf <a href='{{postUrl}}'>{{post_number}}</a> geantwortet"
-      you_replied_to_post: "<a href='{{userUrl}}'>Du</a> hast auf <a href='{{postUrl}}'>{{post_number}}</a> geantwortet"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> hat auf <a href='{{topicUrl}}'>das Thema</a> geantwortet"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Du</a> hast auf <a href='{{topicUrl}}'>das Thema</a> geantwortet"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> hat <a href='{{user2Url}}'>{{another_user}}</a> erwähnt"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> hat <a href='{{user2Url}}'>dich</a> erwähnt"
-      you_mentioned_user: "<a href='{{user1Url}}'>Du</a> hast <a href='{{user2Url}}'>{{another_user}}</a> erwähnt"
-      posted_by_user: "Geschrieben von <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Von <a href='{{userUrl}}'>dir</a> geschrieben"
-      sent_by_user: "Von <a href='{{userUrl}}'>{{user}}</a> gesendet"
-      sent_by_you: "Von <a href='{{userUrl}}'>dir</a> gesendet"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> hat <a href='%{topicUrl}'>das Thema</a> verfasst"
+      you_posted_topic: "<a href=\"%{userUrl}\">Du</a> hast <a href=\"%{topicUrl}\">das Thema</a> verfasst"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> hat auf <a href='%{postUrl}'>%{post_number}</a> geantwortet"
+      you_replied_to_post: "<a href='%{userUrl}'>Du</a> hast auf <a href='%{postUrl}'>%{post_number}</a> geantwortet"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> hat auf <a href='%{topicUrl}'>das Thema</a> geantwortet"
+      you_replied_to_topic: "<a href='%{userUrl}'>Du</a> hast auf <a href='%{topicUrl}'>das Thema</a> geantwortet"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> hat <a href='%{user2Url}'>%{another_user}</a> erwähnt"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> hat <a href='%{user2Url}'>dich</a> erwähnt"
+      you_mentioned_user: "<a href='%{user1Url}'>Du</a> hast <a href='%{user2Url}'>%{another_user}</a> erwähnt"
+      posted_by_user: "Geschrieben von <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Von <a href='%{userUrl}'>dir</a> geschrieben"
+      sent_by_user: "Von <a href='%{userUrl}'>%{user}</a> gesendet"
+      sent_by_you: "Von <a href='%{userUrl}'>dir</a> gesendet"
     directory:
       filter_name: "nach Benutzername filtern"
       title: "Benutzer"
@@ -741,7 +741,7 @@ de:
     user_fields:
       none: "(wähle eine Option aus)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profil"
       mute: "Stummschalten"
       edit: "Einstellungen bearbeiten"
@@ -815,12 +815,12 @@ de:
       enable_defer: "Aktiviere Verzögerung für das ungelesen Markieren von Themen"
       change: "ändern"
       featured_topic: "Hervorgehobenes Thema"
-      moderator: "{{user}} ist ein Moderator"
-      admin: "{{user}} ist ein Administrator"
+      moderator: "%{user} ist ein Moderator"
+      admin: "%{user} ist ein Administrator"
       moderator_tooltip: "Dieser Benutzer ist ein Moderator"
       admin_tooltip: "Dieser Benutzer ist ein Administrator"
       silenced_tooltip: "Der Benutzer ist stummgeschaltet"
-      suspended_notice: "Dieser Benutzer ist bis zum {{date}} gesperrt."
+      suspended_notice: "Dieser Benutzer ist bis zum %{date} gesperrt."
       suspended_permanently: "Der Benutzer ist gesperrt."
       suspended_reason: "Grund: "
       github_profile: "Github"
@@ -833,7 +833,7 @@ de:
           Stummgeschaltete Themen und Kategorien werden in diese E-Mails nicht eingeschlossen.
         individual: "Für jeden Beitrag eine E-Mail senden"
         individual_no_echo: "Sende für alle fremden Beträge eine E-Mail"
-        many_per_day: "Sende mir für jeden neuen Beitrag eine E-Mail (etwa {{dailyEmailEstimate}} pro Tag)"
+        many_per_day: "Sende mir für jeden neuen Beitrag eine E-Mail (etwa %{dailyEmailEstimate} pro Tag)"
         few_per_day: "Sende mir für jeden neuen Beitrag eine E-Mail (etwa 2 pro Tag)"
         warning: "Mailinglisten-Modus aktiviert. Einstellungen zur Benachrichtigung per E-Mail werden nicht berücksichtigt."
       tag_settings: "Schlagwörter"
@@ -863,9 +863,7 @@ de:
       admin_delete: "Löschen"
       users: "Benutzer"
       muted_users: "Stummgeschaltet"
-      muted_users_instructions: "Benachrichtigungen von diesen Benutzern werden unterdrückt."
       ignored_users: "Ignoriert"
-      ignored_users_instructions: "Alle Beiträge und Benachrichtigungen von diesen Benutzern unterdrücken."
       tracked_topics_link: "Anzeigen"
       automatically_unpin_topics: "Angeheftete Themen automatisch loslösen, wenn ich deren letzten Beitrag gelesen habe."
       apps: "Apps"
@@ -918,11 +916,11 @@ de:
         disable: "Deaktivieren"
         enable: "Aktivieren"
         enable_long: "Wiederherstellungscodes aktivieren"
-        manage: "Verwalte Sicherungscodes. Du hast noch <strong>{{count}}</strong> Sicherungscodes."
+        manage: "Verwalte Sicherungscodes. Du hast noch <strong>%{count}</strong> Sicherungscodes."
         copy_to_clipboard: "In Zwischenablage kopieren"
         copy_to_clipboard_error: "Beim Kopieren in die Zwischenablage trat ein Fehler auf"
         copied_to_clipboard: "Wurde in Zwischenablage kopiert"
-        remaining_codes: "Du hast noch <strong>{{count}}</strong> Wiederherstellungscodes übrig."
+        remaining_codes: "Du hast noch <strong>%{count}</strong> Wiederherstellungscodes übrig."
         use: "Benutze einen Backup-Code"
         enable_prerequisites: "Du musst vor dem Generieren von Sicherungscodes einen primären zweiten Faktor aktivieren."
         codes:
@@ -983,8 +981,8 @@ de:
         success_staff: "Wir haben eine E-Mail an deine aktuelle Adresse geschickt. Bitte folge den Bestätigungsanweisungen."
       change_avatar:
         title: "Ändere dein Profilbild"
-        gravatar_title: "Ändere deinen Avatar auf der Website von {{gravatarName}}"
-        gravatar_failed: "{{gravatarName}} zu dieser Email-Adresse nicht gefunden."
+        gravatar_title: "Ändere deinen Avatar auf der Website von %{gravatarName}"
+        gravatar_failed: "%{gravatarName} zu dieser Email-Adresse nicht gefunden."
         letter_based: "ein vom System zugewiesenes Profilbild"
         uploaded_avatar: "Eigenes Bild"
         uploaded_avatar_empty: "Eigenes Bild hinzufügen"
@@ -1008,11 +1006,11 @@ de:
         instructions: "Nie öffentlich gezeigt."
         ok: "Wir senden dir zur Bestätigung eine E-Mail"
         invalid: "Bitte gib eine gültige E-Mail-Adresse ein"
-        authenticated: "Deine E-Mail-Adresse wurde von {{provider}} bestätigt"
+        authenticated: "Deine E-Mail-Adresse wurde von %{provider} bestätigt"
         frequency_immediately: "Wir werden dir sofort eine E-Mail senden, wenn du die betroffenen Inhalte noch nicht gelesen hast."
         frequency:
           one: "Wir werden dir nur dann eine E-Mail senden, wenn wir dich nicht innerhalb der letzten Minute gesehen haben."
-          other: "Wir werden dir nur dann eine E-Mail senden, wenn wir dich nicht innerhalb der letzten {{count}} Minuten gesehen haben."
+          other: "Wir werden dir nur dann eine E-Mail senden, wenn wir dich nicht innerhalb der letzten %{count} Minuten gesehen haben."
       associated_accounts:
         title: "Zugehörige Konten"
         connect: "Verbinden"
@@ -1032,9 +1030,9 @@ de:
       username:
         title: "Benutzername"
         instructions: "einzigartig, keine Leerzeichen, kurz"
-        short_instructions: "Leute können dich mit @{{username}} erwähnen"
+        short_instructions: "Leute können dich mit @%{username} erwähnen"
         available: "Dein Benutzername ist verfügbar"
-        not_available: "Nicht verfügbar. Wie wäre es mit {{suggestion}}?"
+        not_available: "Nicht verfügbar. Wie wäre es mit %{suggestion}?"
         not_available_no_suggestion: "Nicht verfügbar"
         too_short: "Dein Benutzername ist zu kurz"
         too_long: "Dein Benutzername ist zu lang"
@@ -1057,11 +1055,11 @@ de:
         log_out_all: "Überall abmelden"
         active: "gerade aktiv"
         not_you: "Das bist nicht du?"
-        show_all: "Alle anzeigen ({{count}})"
+        show_all: "Alle anzeigen (%{count})"
         show_few: "Weniger anzeigen"
         was_this_you: "Warst das du?"
         was_this_you_description: "Wenn du das gewesen bist, empfehlen wir dir, dein Passwort zu ändern und dich überall abzumelden."
-        browser_and_device: "{{browser}} auf {{device}}"
+        browser_and_device: "%{browser} auf %{device}"
         secure_account: "Mein Konto absichern"
         latest_post: "Dein letzter Beitrag…"
       last_posted: "Letzter Beitrag"
@@ -1141,20 +1139,19 @@ de:
         none: "Keine Einladungen anzuzeigen."
         truncated:
           one: "Zeige die erste Einladung."
-          other: "Zeige die ersten {{count}} Einladungen."
+          other: "Zeige die ersten %{count} Einladungen."
         redeemed: "Angenommene Einladungen"
         redeemed_tab: "Angenommen"
-        redeemed_tab_with_count: "Angenommen ({{count}})"
+        redeemed_tab_with_count: "Angenommen (%{count})"
         redeemed_at: "Angenommen"
         pending: "Ausstehende Einladungen"
         pending_tab: "Ausstehend"
-        pending_tab_with_count: "Ausstehend ({{count}})"
+        pending_tab_with_count: "Ausstehend (%{count})"
         topics_entered: "Betrachtete Themen"
         posts_read_count: "Gelesene Beiträge"
         expired: "Diese Einladung ist abgelaufen."
         rescind: "Einladung zurücknehmen"
         rescinded: "Einladung zurückgenommen"
-        rescind_all: "Alle abgelaufenen Einladungen entfernen"
         rescinded_all: "Alle abgelaufenen Einladungen entfernt!"
         rescind_all_confirm: "Sollen alle abgelaufenen Einladungen entfernt werden?"
         reinvite: "Einladung erneut senden"
@@ -1165,13 +1162,18 @@ de:
         time_read: "Lesezeit"
         days_visited: "Besuchstage"
         account_age_days: "Konto-Alter in Tagen"
+        links_tab: "Links"
+        link_created_at: "Erstellt"
+        link_groups: Gruppen
         create: "Einladung versenden"
         generate_link: "Einladungslink kopieren"
         link_generated: "Der Einladungslink wurde erfolgreich generiert!"
         valid_for: "Der Einladungslink ist nur für die Adresse %{email} gültig"
+        single_user: "Einzelbenutzer"
+        invite_link:
+          success: "Der Einladungslink wurde erfolgreich generiert!"
         bulk_invite:
           none: "Du hast noch niemanden eingeladen. Verschicke eine individuelle Einladung, oder lade gleich mehrere Leute auf einmal durch <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>Hochladen einer CSV-Datei</a> ein."
-          text: "Masseneinladung aus Datei"
           success: "Die Datei wurde erfolgreich hochgeladen. Du erhältst eine Nachricht, sobald der Vorgang abgeschlossen ist."
           error: "Die Datei sollte im CSV Format vorliegen."
           confirmation_message: "Du bist dabei, E-Mail-Einladungen an jeden in der hochgeladenen Datei zu verschicken."
@@ -1262,7 +1264,7 @@ de:
       desc:
         network: "Bitte überprüfe deine Netzwerkverbindung."
         network_fixed: "Sieht aus, als wäre es wieder da."
-        server: "Fehlercode: {{status}}"
+        server: "Fehlercode: %{status}"
         forbidden: "Du darfst das nicht ansehen."
         not_found: "Hoppla! Die Anwendung hat versucht eine URL zu laden, die nicht existiert."
         unknown: "Etwas ist schief gelaufen."
@@ -1319,8 +1321,8 @@ de:
       value_prop: "Wenn du ein Benutzerkonto anlegst, merken wir uns, was du gelesen hast, damit du immer dort fortsetzen kannst, wo du aufgehört hast. Du kannst auch Benachrichtigungen – hier oder per E-Mail – erhalten, wenn jemand auf deine Beiträge antwortet. Beiträge, die dir gefallen, kannst du mit einem Like versehen und diese Freude mit allen teilen. :heartpulse:"
     summary:
       enabled_description: "Du siehst gerade eine Zusammenfassung des Themas: die interessantesten Beiträge, die von der Community bestimmt wurden."
-      description: "Es gibt <b>{{replyCount}}</b> Antworten."
-      description_time: "Es gibt <b>{{replyCount}}</b> Antworten mit einer geschätzten Lesezeit von <b>{{readingTime}} Minuten</b>."
+      description: "Es gibt <b>%{replyCount}</b> Antworten."
+      description_time: "Es gibt <b>%{replyCount}</b> Antworten mit einer geschätzten Lesezeit von <b>%{readingTime} Minuten</b>."
       enable: "Zusammenfassung vom Thema erstellen"
       disable: "Alle Beiträge anzeigen"
     deleted_filter:
@@ -1333,8 +1335,8 @@ de:
       invite: "Lade andere ein"
       edit: "Hinzufügen oder Entfernen"
       leave_message: "Möchtest du diese Nachricht wirklich verlassen?"
-      remove_allowed_user: "Willst du {{name}} wirklich aus dieser Unterhaltung entfernen?"
-      remove_allowed_group: "Willst du {{name}} wirklich aus dieser Unterhaltung entfernen?"
+      remove_allowed_user: "Willst du %{name} wirklich aus dieser Unterhaltung entfernen?"
+      remove_allowed_group: "Willst du %{name} wirklich aus dieser Unterhaltung entfernen?"
     email: "E-Mail-Adresse"
     username: "Benutzername"
     last_seen: "Zuletzt gesehen"
@@ -1343,7 +1345,7 @@ de:
     trust_level: "Vertrauensstufe"
     search_hint: "Benutzername, E-Mail- oder IP-Adresse"
     create_account:
-      disclaimer: "Mit der Registrierung stimmst du <a href='{{privacy_link}}' target='blank'>privacy policy</a> und <a href='{{tos_link}}' target='blank'>terms of service</a> zu."
+      disclaimer: "Mit der Registrierung stimmst du <a href='%{privacy_link}' target='blank'>privacy policy</a> und <a href='%{tos_link}' target='blank'>terms of service</a> zu."
       title: "Neues Benutzerkonto erstellen"
       failed: "Etwas ist fehlgeschlagen. Vielleicht ist diese E-Mail-Adresse bereits registriert. Versuche den 'Passwort vergessen'-Link."
     forgot_password:
@@ -1402,7 +1404,7 @@ de:
       awaiting_activation: "Dein Konto ist noch nicht aktiviert. Verwende den 'Passwort vergessen'-Link, um eine weitere E-Mail mit Anweisungen zur Aktivierung zu erhalten."
       awaiting_approval: "Dein Konto wurde noch nicht von einem Team-Mitglied genehmigt. Du bekommst eine E-Mail, sobald das geschehen ist."
       requires_invite: "Entschuldige, der Zugriff auf dieses Forum ist nur mit einer Einladung möglich."
-      not_activated: "Du kannst dich noch nicht anmelden. Wir haben dir schon eine E-Mail zur Aktivierung an <b>{{sentTo}}</b> geschickt. Bitte folge den Anweisungen in dieser E-Mail, um dein Benutzerkonto zu aktivieren."
+      not_activated: "Du kannst dich noch nicht anmelden. Wir haben dir schon eine E-Mail zur Aktivierung an <b>%{sentTo}</b> geschickt. Bitte folge den Anweisungen in dieser E-Mail, um dein Benutzerkonto zu aktivieren."
       not_allowed_from_ip_address: "Von dieser IP-Adresse darfst du dich nicht anmelden."
       admin_not_allowed_from_ip_address: "Von dieser IP-Adresse darfst du dich nicht als Administrator anmelden."
       resend_activation_email: "Klicke hier, um eine neue Aktivierungsmail zu schicken."
@@ -1411,7 +1413,7 @@ de:
       change_email: "E-Mail-Adresse ändern"
       provide_new_email: "Gib’ eine neue Adresse an und wir senden deine Bestätigungsmail erneut."
       submit_new_email: "E-Mail-Adresse aktualisieren"
-      sent_activation_email_again: "Wir haben dir eine weitere E-Mail zur Aktivierung an <b>{{currentEmail}}</b> geschickt. Es könnte ein paar Minuten dauern, bis diese ankommt; sieh auch im Spam-Ordner nach."
+      sent_activation_email_again: "Wir haben dir eine weitere E-Mail zur Aktivierung an <b>%{currentEmail}</b> geschickt. Es könnte ein paar Minuten dauern, bis diese ankommt; sieh auch im Spam-Ordner nach."
       sent_activation_email_again_generic: "Wir haben eine weitere Aktivierungsmail verschickt. Es könnte ein paar Minuten dauern, bis diese ankommt; schaue auch im Spam-Ordner nach."
       to_continue: "Melde dich bitte an"
       preferences: "Du musst angemeldet sein, um deine Benutzereinstellungen bearbeiten zu können."
@@ -1474,20 +1476,20 @@ de:
     conditional_loading_section:
       loading: Wird geladen…
     category_row:
-      topic_count: "{{count}} Themen in dieser Kategorie"
+      topic_count: "%{count} Themen in dieser Kategorie"
     select_kit:
       default_header_text: Auswählen…
       no_content: Keine Treffer gefunden
       filter_placeholder: Suchen…
       filter_placeholder_with_any: Suchen oder erzeugen
-      create: "Erstelle: '{{content}}'"
+      create: "Erstelle: '%{content}'"
       max_content_reached:
         one: "Du kannst nur einen Eintrag auswählen."
-        other: "Du kannst nur {{count}} Einträge auswählen."
+        other: "Du kannst nur %{count} Einträge auswählen."
       min_content_not_reached:
         one: "Wähle mindestens einen Eintrag aus."
-        other: "Wähle mindestens {{count}} Einträge aus."
-      invalid_selection_length: "Es müssen wenigstens{{count}} Zeichen markiert sein."
+        other: "Wähle mindestens %{count} Einträge aus."
+      invalid_selection_length: "Es müssen wenigstens%{count} Zeichen markiert sein."
     date_time_picker:
       from: Von
       to: An
@@ -1514,7 +1516,7 @@ de:
       default: Benutzerdefinierte Emojis
     shared_drafts:
       title: "Gemeinsame Vorlagen"
-      notice: "Das Thema ist nur sichtbar für die, die die <b>{{category}}</b>-Kategorie sehen können."
+      notice: "Das Thema ist nur sichtbar für die, die die <b>%{category}</b>-Kategorie sehen können."
       destination_category: "Ziel-Kategorie"
       publish: "Gemeinsame Vorlage veröffentlichen"
       confirm_publish: "Bist du sicher, dass du diese Vorlage veröffentlichten möchtest?"
@@ -1534,22 +1536,22 @@ de:
       similar_topics: "Dein Thema hat Ähnlichkeit mit…"
       drafts_offline: "Entwürfe offline"
       edit_conflict: "Konflikt bearbeiten"
-      group_mentioned_limit: "<b>Warnung!</b> Du erwähnst <a href='{{group_link}}'>{{group}}</a>, aber diese Gruppe hat mehr Mitglieder als der Administrator als die maximale Anzahl von {{max}} Benutzern eingestellt hat, die gleichzeitig erwähnt werden können. Keiner davon wird benachrichtigt."
+      group_mentioned_limit: "<b>Warnung!</b> Du erwähnst <a href='%{group_link}'>%{group}</a>, aber diese Gruppe hat mehr Mitglieder als der Administrator als die maximale Anzahl von %{max} Benutzern eingestellt hat, die gleichzeitig erwähnt werden können. Keiner davon wird benachrichtigt."
       group_mentioned:
-        one: "Indem du {{group}} erwähnst, bist du dabei, <a href='{{group_link}}'>eine Person</a> zu benachrichtigen – bist du dir sicher?"
-        other: "Indem du {{group}} erwähnst, bist du dabei, <a href='{{group_link}}'>{{count}} Personen</a> zu benachrichtigen – bist du dir sicher?"
+        one: "Indem du %{group} erwähnst, bist du dabei, <a href='%{group_link}'>eine Person</a> zu benachrichtigen – bist du dir sicher?"
+        other: "Indem du %{group} erwähnst, bist du dabei, <a href='%{group_link}'>%{count} Personen</a> zu benachrichtigen – bist du dir sicher?"
       cannot_see_mention:
-        category: "Du hast {{username}} erwähnt, aber diese Person wird nicht benachrichtigt da sie keinen Zugriff auf diese Kategorie hat. Füge sie einer Gruppe hinzu die Zugriff auf diese Kategorie hat."
-        private: "Du hast {{username}} erwähnt, aber diese Person wird nicht benachrichtigt da sie diese persönliche Nachricht nicht sehen kann. Lade sie zu dieser PM ein."
-      duplicate_link: "Es sieht so aus als wäre dein Link auf <b>{{domain}}</b> in dem Thema bereits geschrieben worden von <b>@{{username}}</b> in <a href='{{post_url}}'>einer Antwort vor {{ago}}</a> – bist du sicher, dass du ihn noch einmal schreiben möchtest?"
-      reference_topic_title: "AW: {{title}}"
+        category: "Du hast %{username} erwähnt, aber diese Person wird nicht benachrichtigt da sie keinen Zugriff auf diese Kategorie hat. Füge sie einer Gruppe hinzu die Zugriff auf diese Kategorie hat."
+        private: "Du hast %{username} erwähnt, aber diese Person wird nicht benachrichtigt da sie diese persönliche Nachricht nicht sehen kann. Lade sie zu dieser PM ein."
+      duplicate_link: "Es sieht so aus als wäre dein Link auf <b>%{domain}</b> in dem Thema bereits geschrieben worden von <b>@%{username}</b> in <a href='%{post_url}'>einer Antwort vor %{ago}</a> – bist du sicher, dass du ihn noch einmal schreiben möchtest?"
+      reference_topic_title: "AW: %{title}"
       error:
         title_missing: "Titel ist erforderlich"
-        title_too_short: "Titel muss mindestens {{min}} Zeichen lang sein"
-        title_too_long: "Titel darf maximal {{max}} Zeichen lang sein"
+        title_too_short: "Titel muss mindestens %{min} Zeichen lang sein"
+        title_too_long: "Titel darf maximal %{max} Zeichen lang sein"
         post_missing: "Beitrag darf nicht leer sein"
-        post_length: "Beitrag muss mindestens {{min}} Zeichen lang sein"
-        try_like: "Hast du schon die {{heart}}-Schaltfläche ausprobiert?"
+        post_length: "Beitrag muss mindestens %{min} Zeichen lang sein"
+        try_like: "Hast du schon die %{heart}-Schaltfläche ausprobiert?"
         category_missing: "Du musst eine Kategorie auswählen"
         tags_missing: "Du musst mindestens %{count} Schlagwörter wählen."
         topic_template_not_modified: "Bitte füge Details und Spezifikationen zu deinem Thema hinzu, indem du die Themenvorlage anpasst."
@@ -1649,57 +1651,57 @@ de:
       tooltip:
         regular:
           one: "%{count} nicht gesehene Benachrichtigung"
-          other: "{{count}} nicht gesehene Benachrichtigungen"
+          other: "%{count} nicht gesehene Benachrichtigungen"
         message:
           one: "%{count} ungelesene Nachricht"
-          other: "{{count}} ungelesene Nachrichten"
+          other: "%{count} ungelesene Nachrichten"
       title: "Benachrichtigung über @Name-Erwähnungen, Antworten auf deine Beiträge und Themen, Nachrichten, usw."
       none: "Die Benachrichtigungen können derzeit nicht geladen werden."
       empty: "Keine Benachrichtigungen gefunden."
       post_approved: "Dein Beitrag wurde genehmigt."
       reviewable_items: "Elemente, die eine Überprüfung benötigen"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} und jemand anderes</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} und {{count}} andere</span> {{description}}"
+        one: "<span>%{username}, %{username2} und jemand anderes</span> %{description}"
+        other: "<span>%{username}, %{username2} und %{count} andere</span> %{description}"
       liked_consolidated_description:
-        one: "gefällt {{count}} deiner Beiträge"
-        other: "gefallen {{count}} deiner Beiträge"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> hat deine Einladung angenommen"
-      moved_post: "<span>{{username}}</span> hat {{description}} verschoben"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Du hast '{{description}}' verliehen bekommen"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>New Topic</span> {{description}}"
-      membership_request_accepted: "Mitgliedschaft akzeptiert in '{{group_name}}' "
-      membership_request_consolidated: "{{count}} offene Gruppenmitgliedschaftsanfrage/n für die Gruppe '{{group_name}}'"
+        one: "gefällt %{count} deiner Beiträge"
+        other: "gefallen %{count} deiner Beiträge"
+      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}"
+      invitee_accepted: "<span>%{username}</span> hat deine Einladung angenommen"
+      moved_post: "<span>%{username}</span> hat %{description} verschoben"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Du hast '%{description}' verliehen bekommen"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>New Topic</span> %{description}"
+      membership_request_accepted: "Mitgliedschaft akzeptiert in '%{group_name}' "
+      membership_request_consolidated: "%{count} offene Gruppenmitgliedschaftsanfrage/n für die Gruppe '%{group_name}'"
       group_message_summary:
-        one: "{{count}} Nachricht in deinem {{group_name}} Posteingang"
-        other: "{{count}} Nachrichten in deinem {{group_name}} Posteingang"
+        one: "%{count} Nachricht in deinem %{group_name} Posteingang"
+        other: "%{count} Nachrichten in deinem %{group_name} Posteingang"
       popup:
-        mentioned: '{{username}} hat dich in "{{topic}}" - {{site_title}} erwähnt'
-        group_mentioned: '{{username}} hat dich in "{{topic}}" - {{site_title}} erwähnt'
-        quoted: '{{username}} hat dich in "{{topic}}" - {{site_title}} zitiert'
-        replied: '{{username}} hat dir in "{{topic}}" - {{site_title}} geantwortet'
-        posted: '{{username}} hat in "{{topic}}" - {{site_title}} einen Beitrag verfasst'
-        private_message: '{{username}} hat dir eine Nachricht geschickt in „{{topic}}“ – {{site_title}}'
-        linked: '{{username}} hat in "{{topic}}" - {{site_title}} einen Beitrag von dir verlinkt'
-        watching_first_post: '{{username}} hat ein neues Thema "{{topic}}" - {{site_title}} erstellt'
+        mentioned: '%{username} hat dich in "%{topic}" - %{site_title} erwähnt'
+        group_mentioned: '%{username} hat dich in "%{topic}" - %{site_title} erwähnt'
+        quoted: '%{username} hat dich in "%{topic}" - %{site_title} zitiert'
+        replied: '%{username} hat dir in "%{topic}" - %{site_title} geantwortet'
+        posted: '%{username} hat in "%{topic}" - %{site_title} einen Beitrag verfasst'
+        private_message: '%{username} hat dir eine Nachricht geschickt in „%{topic}“ – %{site_title}'
+        linked: '%{username} hat in "%{topic}" - %{site_title} einen Beitrag von dir verlinkt'
+        watching_first_post: '%{username} hat ein neues Thema "%{topic}" - %{site_title} erstellt'
         confirm_title: "Benachrichtigungen aktiviert – %{site_title}"
         confirm_body: "Erfolgreich! Benachrichtigungen wurden aktiviert."
-        custom: "Benachrichtigung von {{username}} auf %{site_title}"
+        custom: "Benachrichtigung von %{username} auf %{site_title}"
       titles:
         mentioned: "erwähnte"
         replied: "neue Antwort"
@@ -1727,9 +1729,9 @@ de:
       from_my_computer: "Von meinem Gerät"
       from_the_web: "Aus dem Web"
       remote_tip: "Link zu Bild"
-      remote_tip_with_attachments: "Link zu Bild oder Datei {{authorized_extensions}}"
+      remote_tip_with_attachments: "Link zu Bild oder Datei %{authorized_extensions}"
       local_tip: "wähle auf deinem Gerät gespeicherte Bilder aus"
-      local_tip_with_attachments: "Wähle Bilder oder Dateien von deinem Gerät aus {{authorized_extensions}}"
+      local_tip_with_attachments: "Wähle Bilder oder Dateien von deinem Gerät aus %{authorized_extensions}"
       hint: "(du kannst Dateien auch in den Editor ziehen, um diese hochzuladen)"
       hint_for_supported_browsers: "du kannst Bilder auch in den Editor ziehen oder diese aus der Zwischenablage einfügen"
       uploading: "Wird hochgeladen"
@@ -1746,15 +1748,15 @@ de:
       clear_all: "Auswahl aufheben"
       too_short: "Der Suchbegriff ist zu kurz."
       result_count:
-        one: "<span>%{count} Ergebnis für </span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} Ergebnisse für </span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} Ergebnis für </span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} Ergebnisse für </span><span class='term'>%{term}</span>"
       title: "suche nach Themen, Beiträgen, Benutzern oder Kategorien"
       full_page_title: "suche nach Themen oder Beiträgen"
       no_results: "Keine Ergebnisse gefunden."
       no_more_results: "Es wurde keine weiteren Ergebnisse gefunden."
       searching: "Suche …"
-      post_format: "#{{post_number}} von {{username}}"
-      results_page: "Suchergebnisse für '{{term}}'"
+      post_format: "#%{post_number} von %{username}"
+      results_page: "Suchergebnisse für '%{term}'"
       more_results: "Es gibt mehr Ergebnisse. Bitte grenze deine Suchkriterien weiter ein."
       cant_find: "Nicht gefunden, wonach du suchst?"
       start_new_topic: "Wie wär’s mit einem neuen Thema?"
@@ -1763,9 +1765,9 @@ de:
       search_google_button: "Google"
       search_google_title: "Durchsuche diese Seite"
       context:
-        user: "Beiträge von @{{username}} durchsuchen"
-        category: "Kategorie #{{category}} durchsuchen"
-        tag: "Den #{{tag}} tag suchen"
+        user: "Beiträge von @%{username} durchsuchen"
+        category: "Kategorie #%{category} durchsuchen"
+        tag: "Den #%{tag} tag suchen"
         topic: "Dieses Thema durchsuchen"
         private_messages: "Nachrichten durchsuchen"
       advanced:
@@ -1842,7 +1844,7 @@ de:
         choose_new_category: "Neue Kategorie für die gewählten Themen:"
         selected:
           one: "Du hast <b>ein</b> Thema ausgewählt."
-          other: "Du hast <b>{{count}}</b> Themen ausgewählt."
+          other: "Du hast <b>%{count}</b> Themen ausgewählt."
         change_tags: "Schlagwörter ersetzen"
         append_tags: "Schlagwörter hinzufügen"
         choose_new_tags: "Neue Schlagwörter für die gewählten Themen wählen:"
@@ -1855,7 +1857,7 @@ de:
         posted: "Du hast noch keine Beiträge verfasst."
         latest: "Es gibt keine aktuellen Themen. Das ist schade."
         bookmarks: "Du hast noch keine Themen, in denen du ein Lesezeichen gesetzt hast."
-        category: "Es gibt keine Themen in {{category}}."
+        category: "Es gibt keine Themen in %{category}."
         top: "Es gibt keine Top-Themen."
         educate:
           new: '<p>Hier werden neue Themen angezeigt.</p><p>Standardmäßig werden jene Themen als neu angesehen und mit dem <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">neu</span> Indikator versehen, die in den letzten 2 Tagen erstellt wurden.</p><p>Du kannst das in deinen <a href="%{userPrefsUrl}">Einstellungen</a> ändern.</p>'
@@ -1866,13 +1868,13 @@ de:
         read: "Das waren alle gelesenen Themen."
         new: "Das waren alle neuen Themen."
         unread: "Das waren alle ungelesen Themen."
-        category: "Das waren alle Themen in der Kategorie „{{category}}“."
+        category: "Das waren alle Themen in der Kategorie „%{category}“."
         top: "Das waren alle angesagten Themen."
         bookmarks: "Das waren alle Themen mit Lesezeichen."
     topic:
       filter_to:
         one: "%{count} Beitrag im Thema"
-        other: "{{count}} Beiträge im Thema"
+        other: "%{count} Beiträge im Thema"
       create: "Neues Thema"
       create_long: "Ein neues Thema erstellen"
       open_draft: "Entwurf öffnen"
@@ -1901,10 +1903,10 @@ de:
       unread: "ungelesen"
       new_topics:
         one: "%{count} neues Thema"
-        other: "{{count}} neue Themen"
+        other: "%{count} neue Themen"
       unread_topics:
         one: "%{count} ungelesenes Thema"
-        other: "{{count}} ungelesene Themen"
+        other: "%{count} ungelesene Themen"
       title: "Thema"
       invalid_access:
         title: "Thema ist nicht öffentlich"
@@ -1918,24 +1920,24 @@ de:
         description: "Entschuldige, wir konnten dieses Thema nicht finden. Wurde es vielleicht von einem Moderator entfernt?"
       total_unread_posts:
         one: "du hast einen ungelesenen Beitrag in diesem Thema"
-        other: "du hast {{count}} ungelesene Beiträge in diesem Thema"
+        other: "du hast %{count} ungelesene Beiträge in diesem Thema"
       unread_posts:
         one: "Du hast einen ungelesenen, alten Beitrag zu diesem Thema"
-        other: "Du hast {{count}} ungelesene, alte Beiträge zu diesem Thema"
+        other: "Du hast %{count} ungelesene, alte Beiträge zu diesem Thema"
       new_posts:
         one: "Es gibt einen neuen Beitrag zu diesem Thema seit du es das letzte Mal gelesen hast"
-        other: "Es gibt {{count}} neue Beiträge zu diesem Thema seit du es das letzte Mal gelesen hast"
+        other: "Es gibt %{count} neue Beiträge zu diesem Thema seit du es das letzte Mal gelesen hast"
       likes:
         one: "Es gibt ein Like in diesem Thema"
-        other: "Es gibt {{count}} Likes in diesem Thema"
+        other: "Es gibt %{count} Likes in diesem Thema"
       back_to_list: "Zurück zur Themenliste"
       options: "Themen-Optionen"
       show_links: "zeige Links innerhalb dieses Themas"
       toggle_information: "Details zum Thema ein- oder ausblenden"
-      read_more_in_category: "Möchtest du mehr lesen? Entdecke andere Themen in {{catLink}} oder {{latestLink}}."
-      read_more: "Möchtest du mehr lesen? {{catLink}} oder {{latestLink}}."
-      group_request: "Um dieses Thema zu sehen, musst du die Mitgliedschaft der Gruppe `{{name}}` beantragen"
-      group_join: "Du muss der Gruppe `{{name}}` beitreten, um dieses Thema zu sehen"
+      read_more_in_category: "Möchtest du mehr lesen? Entdecke andere Themen in %{catLink} oder %{latestLink}."
+      read_more: "Möchtest du mehr lesen? %{catLink} oder %{latestLink}."
+      group_request: "Um dieses Thema zu sehen, musst du die Mitgliedschaft der Gruppe `%{name}` beantragen"
+      group_join: "Du muss der Gruppe `%{name}` beitreten, um dieses Thema zu sehen"
       group_request_sent: "Dein Mitgliedschafts-Antrag wurde gesendet. Du bekommst eine Information, ob er akzepiert wurde."
       unread_indicator: "Kein Mitglied hat den letzten Beitrag dieses Themas bisher gelesen."
       read_more_MF: "Du {UNREAD, plural, =0 {} one {hast <a href='{basePath}/unread'>ein ungelesenes</a> Thema } other {hast <a href='{basePath}/unread'># ungelesene</a> Themen } } {NEW, plural, =0 {} one { {BOTH, select, true{und } false {hast } other{}} <a href='{basePath}/new'>ein neues</a> Thema} other { {BOTH, select, true{und } false {hast } other{}} <a href='{basePath}/new'># neue</a> Themen} }. Oder {CATEGORY, select, true {entdecke andere Themen in {catLink}} false {{latestLink}} other {}}"
@@ -2109,25 +2111,25 @@ de:
         choose_category: "Bitte wähle eine Kategorie für das öffentliche Thema:"
       feature_topic:
         title: "Thema hervorheben"
-        pin: "Dieses Thema am Anfang der {{categoryLink}} Kategorie anzeigen bis"
-        confirm_pin: "Es gibt bereits {{count}} angeheftete Themen. Zu viele angeheftete Themen könnten neue und unbekannte Benutzer leicht überwältigen. Willst du wirklich noch ein weiteres Thema in dieser Kategorie anheften?"
-        unpin: "Dieses Thema vom Anfang der {{categoryLink}} Kategorie loslösen."
-        unpin_until: "Dieses Thema vom Anfang der {{categoryLink}} Kategorie loslösen oder bis <strong>%{until}</strong> warten."
+        pin: "Dieses Thema am Anfang der %{categoryLink} Kategorie anzeigen bis"
+        confirm_pin: "Es gibt bereits %{count} angeheftete Themen. Zu viele angeheftete Themen könnten neue und unbekannte Benutzer leicht überwältigen. Willst du wirklich noch ein weiteres Thema in dieser Kategorie anheften?"
+        unpin: "Dieses Thema vom Anfang der %{categoryLink} Kategorie loslösen."
+        unpin_until: "Dieses Thema vom Anfang der %{categoryLink} Kategorie loslösen oder bis <strong>%{until}</strong> warten."
         pin_note: "Benutzer können das Thema für sich selbst loslösen."
         pin_validation: "Ein Datum wird benötigt um diesen Beitrag anzuheften."
-        not_pinned: "Es sind in {{categoryLink}} keine Themen angeheftet."
+        not_pinned: "Es sind in %{categoryLink} keine Themen angeheftet."
         already_pinned:
-          one: "Momentan in {{categoryLink}} angeheftete Themen: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Momentan in {{categoryLink}} angeheftete Themen: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Momentan in %{categoryLink} angeheftete Themen: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Momentan in %{categoryLink} angeheftete Themen: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Dieses Thema am Anfang aller Themenlisten anzeigen bis"
-        confirm_pin_globally: "Es gibt bereits {{count}} global angeheftete Themen. Zu viele angeheftete Themen könnten neue und unbekannte Benutzer leicht überwältigen. Willst du wirklich noch ein weiteres Thema global anheften?"
+        confirm_pin_globally: "Es gibt bereits %{count} global angeheftete Themen. Zu viele angeheftete Themen könnten neue und unbekannte Benutzer leicht überwältigen. Willst du wirklich noch ein weiteres Thema global anheften?"
         unpin_globally: "Dieses Thema vom Anfang aller Themenlisten loslösen."
         unpin_globally_until: "Dieses Thema vom Anfang aller Themenlisten loslösen oder bis <strong>%{until}</strong> warten."
         global_pin_note: "Benutzer können das Thema für sich selbst loslösen."
         not_pinned_globally: "Es sind keine Themen global angeheftet."
         already_pinned_globally:
           one: "Momentan global angeheftete Themen: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Momentan global angeheftete Themen: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Momentan global angeheftete Themen: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Macht das Thema zu einem Ankündigungsbanner, welcher am Anfang aller Seiten angezeigt wird."
         remove_banner: "Entfernt das Ankündigungsbanner vom Anfang aller Seiten."
         banner_note: "Benutzer können das Ankündigungsbanner schließen und so für sich selbst dauerhaft ausblenden. Es kann zu jeder Zeit höchstens ein Thema ein Banner sein."
@@ -2157,15 +2159,15 @@ de:
         to_topic_username: "Du hast einen Benutzernamen eingegeben. Wir werden eine Benachrichtigung versenden und mit einem Link zur Teilnahme an diesem Thema einladen."
         to_username: "Gib den Benutzername der Person ein, die du einladen möchtest. Wir werden eine Benachrichtigung versenden und mit einem Link zur Teilnahme an diesem Thema einladen."
         email_placeholder: "name@example.com"
-        success_email: "Wir haben an <b>{{emailOrUsername}}</b> eine Einladung verschickt und werden dich benachrichtigen, sobald die Einladung angenommen wurde. In deinem Benutzerprofil kannst du alle deine Einladungen überwachen."
+        success_email: "Wir haben an <b>%{emailOrUsername}</b> eine Einladung verschickt und werden dich benachrichtigen, sobald die Einladung angenommen wurde. In deinem Benutzerprofil kannst du alle deine Einladungen überwachen."
         success_username: "Wir haben den Benutzer gebeten, sich an diesem Thema zu beteiligen."
         error: "Es tut uns leid, wir konnten diese Person nicht einladen. Wurde diese Person vielleicht schon eingeladen? (Einladungen sind in ihrer Zahl beschränkt)"
-        success_existing_email: "Ein Benutzer mit der E-Mail-Adresse <b>{{emailOrUsername}}</b> existiert bereits. Wir haben den Benutzer eingeladen, sich an diesem Thema zu beteiligen."
+        success_existing_email: "Ein Benutzer mit der E-Mail-Adresse <b>%{emailOrUsername}</b> existiert bereits. Wir haben den Benutzer eingeladen, sich an diesem Thema zu beteiligen."
       login_reply: "Anmelden, um zu antworten"
       filters:
         n_posts:
           one: "%{count} Beitrag"
-          other: "{{count}} Beiträge"
+          other: "%{count} Beiträge"
         cancel: "Filter entfernen"
       move_to:
         title: "Verschieben"
@@ -2179,7 +2181,7 @@ de:
         error: "Beim Verschieben der Beiträge ins neue Thema ist ein Fehler aufgetreten."
         instructions:
           one: "Du bist dabei, ein neues Thema zu erstellen und den ausgewählten Beitrag dorthin zu verschieben."
-          other: "Du bist dabei, ein neues Thema zu erstellen und die <b>{{count}}</b> ausgewählten Beiträge dorthin zu verschieben."
+          other: "Du bist dabei, ein neues Thema zu erstellen und die <b>%{count}</b> ausgewählten Beiträge dorthin zu verschieben."
       merge_topic:
         title: "In ein vorhandenes Thema verschieben"
         action: "in ein vorhandenes Thema verschieben"
@@ -2187,7 +2189,7 @@ de:
         radio_label: "Vorhandenes Thema"
         instructions:
           one: "Bitte wähle das Thema, in welches du den Beitrag verschieben möchtest."
-          other: "Bitte wähle das Thema, in welches du die <b>{{count}}</b> Beiträge verschieben möchtest."
+          other: "Bitte wähle das Thema, in welches du die <b>%{count}</b> Beiträge verschieben möchtest."
       move_to_new_message:
         title: "Verschiebe in neue Nachricht"
         action: "verschiebe in neue Nachricht"
@@ -2196,7 +2198,7 @@ de:
         participants: "Teilnehmer"
         instructions:
           one: "Du bist dabei, eine neue Nachricht zu erstellen und sie mit dem ausgewählten Beitrag zu befüllen."
-          other: "Du bist dabei, eine neue Nachricht zu erstellen und sie mit den <b>{{count}}</b> ausgewählten Beiträgen zu befüllen."
+          other: "Du bist dabei, eine neue Nachricht zu erstellen und sie mit den <b>%{count}</b> ausgewählten Beiträgen zu befüllen."
       move_to_existing_message:
         title: "Verschiebe in vorhandene Nachricht"
         action: "in eine vorhandene Nachricht verschieben"
@@ -2204,7 +2206,7 @@ de:
         participants: "Teilnehmer"
         instructions:
           one: "Bitte wähle die Nachricht, in welche du den Beitrag versschieben möchtest."
-          other: "Bitte wähle die Nachricht, in welche du die <b>{{count}}</b> verschieben möchtest."
+          other: "Bitte wähle die Nachricht, in welche du die <b>%{count}</b> verschieben möchtest."
       merge_posts:
         title: "Ausgewählte Beiträge zusammenführen"
         action: "ausgewählte Beiträge zusammenführen"
@@ -2215,8 +2217,8 @@ de:
         error: "Beim Ändern des Eigentümers der Beiträge ist ein Fehler aufgetreten."
         placeholder: "Benutzername des neuen Eigentümers"
         instructions:
-          one: "Bitte wähle einen neuen Eigentümer für den Beitrag von <b>@{{old_user}}</b>"
-          other: "Bitte wähle einen neuen Eigentümer für {{count}} Beiträge von <b>@{{old_user}}</b>"
+          one: "Bitte wähle einen neuen Eigentümer für den Beitrag von <b>@%{old_user}</b>"
+          other: "Bitte wähle einen neuen Eigentümer für %{count} Beiträge von <b>@%{old_user}</b>"
       change_timestamp:
         title: "Zeitstempel ändern…"
         action: "Erstelldatum ändern"
@@ -2225,7 +2227,7 @@ de:
         instructions: "Wähle bitte ein neues Erstelldatum für das Thema aus. Alle Beitrage im Thema werden unter Beibehaltung der Zeitdifferenz ebenfalls angepasst."
       multi_select:
         select: "auswählen"
-        selected: "ausgewählt ({{count}})"
+        selected: "ausgewählt (%{count})"
         select_post:
           label: "auswählen"
           title: "Beitrag zu Auswahl hinzufügen"
@@ -2244,20 +2246,20 @@ de:
         deselect_all: keine auswählen
         description:
           one: Du hast <b>%{count}</b> Beitrag ausgewählt.
-          other: "Du hast <b>{{count}}</b> Beiträge ausgewählt."
+          other: "Du hast <b>%{count}</b> Beiträge ausgewählt."
       deleted_by_author:
         one: "(Thema von Autor zurückgezogen, wird automatisch in %{count} Stunde gelöscht, außer es wird gemeldet)"
         other: "(Thema von Autor zurückgezogen, wird automatisch in %{count}Stunden gelöscht, außer es wird gemeldet)"
     post:
       quote_reply: "Zitat"
       edit_reason: "Grund: "
-      post_number: "Beitrag {{number}}"
+      post_number: "Beitrag %{number}"
       ignored: "Ignorierter Inhalt"
       wiki_last_edited_on: "Wiki zuletzt bearbeitet am"
       last_edited_on: "Beitrag zuletzt bearbeitet am"
       reply_as_new_topic: "Mit verknüpftem Thema antworten"
       reply_as_new_private_message: "Antworte als neue Nachricht an die gleichen Empfänger"
-      continue_discussion: "Fortsetzung der Diskussion von {{postLink}}:"
+      continue_discussion: "Fortsetzung der Diskussion von %{postLink}:"
       follow_quote: "springe zum zitierten Beitrag"
       show_full: "Zeige ganzen Beitrag"
       show_hidden: "Ignorierte Inhalte anzeigen."
@@ -2269,29 +2271,29 @@ de:
       locked: "Ein Team-Mitglied hat diesen Beitrag für die weitere Bearbeitung gesperrt"
       gap:
         one: "einen versteckten Beitrag anzeigen"
-        other: "{{count}} versteckte Beiträge anzeigen"
+        other: "%{count} versteckte Beiträge anzeigen"
       notice:
-        new_user: "Dies ist der erste Beitrag von {{user}} — lasst uns das neue Mitglied in unserer Community willkommen hei­ßen!"
-        returning_user: "Es ist eine Weile her, dass wir {{user}} gesehen haben. — Der letzter Beitrag war {{time}}."
+        new_user: "Dies ist der erste Beitrag von %{user} — lasst uns das neue Mitglied in unserer Community willkommen hei­ßen!"
+        returning_user: "Es ist eine Weile her, dass wir %{user} gesehen haben. — Der letzter Beitrag war %{time}."
       unread: "Beitrag ist ungelesen"
       has_replies:
-        one: "{{count}} Antwort"
-        other: "{{count}} Antworten"
+        one: "%{count} Antwort"
+        other: "%{count} Antworten"
       has_likes_title:
         one: "dieser Beitrag gefällt %{count} Person"
-        other: "dieser Beitrag gefällt {{count}} Personen"
+        other: "dieser Beitrag gefällt %{count} Personen"
       has_likes_title_only_you: "dir gefällt dieser Beitrag"
       has_likes_title_you:
         one: "dir und einer weiteren Person gefällt dieser Beitrag"
-        other: "dir und {{count}} weiteren Personen gefällt dieser Beitrag"
+        other: "dir und %{count} weiteren Personen gefällt dieser Beitrag"
       errors:
         create: "Entschuldige, es gab einen Fehler beim Anlegen des Beitrags. Bitte versuche es noch einmal."
         edit: "Entschuldige, es gab einen Fehler beim Bearbeiten des Beitrags. Bitte versuche es noch einmal."
         upload: "Entschuldige, es gab einen Fehler beim Hochladen der Datei. Bitte versuche es noch einmal."
-        file_too_large: "Entschuldigung, die Datei ist zu groß (maximale Größe ist {{max_size_kb}}kb). Wie wäre es, die Datei zu einem Cloud Sharing Service hochzuladen und dann den Link einzufügen?"
+        file_too_large: "Entschuldigung, die Datei ist zu groß (maximale Größe ist %{max_size_kb}kb). Wie wäre es, die Datei zu einem Cloud Sharing Service hochzuladen und dann den Link einzufügen?"
         too_many_uploads: "Entschuldige, du darfst immer nur eine Datei hochladen."
-        too_many_dragged_and_dropped_files: "Entschuldige, du kannst nur {{max}} Dateien auf einmal hochladen."
-        upload_not_authorized: "Entschuldigung, die Datei die du hochladen möchtest ist nicht erlaubt (erlaubte Dateiendungen sind: {{authorized_extensions}})."
+        too_many_dragged_and_dropped_files: "Entschuldige, du kannst nur %{max} Dateien auf einmal hochladen."
+        upload_not_authorized: "Entschuldigung, die Datei die du hochladen möchtest ist nicht erlaubt (erlaubte Dateiendungen sind: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Entschuldige, neue Benutzer dürfen keine Bilder hochladen."
         attachment_upload_not_allowed_for_new_user: "Entschuldige, neue Benutzer dürfen keine Dateien hochladen."
         attachment_download_requires_login: "Entschuldige, du musst angemeldet sein, um Dateien herunterladen zu können."
@@ -2331,10 +2333,10 @@ de:
           confirm: "Möchtest du auch die Antworten auf diese Beiträge löschen?"
           direct_replies:
             one: "Ja, und eine direkte Antwort"
-            other: "Ja, und {{count}} direkte Antworten"
+            other: "Ja, und %{count} direkte Antworten"
           all_replies:
             one: "Ja, und eine Antwort"
-            other: "Ja, und {{count}} Antworten"
+            other: "Ja, und %{count} Antworten"
           just_the_post: "Nein, nur diesen Beitrag"
         admin: "Administrative Aktionen"
         wiki: "Wiki erstellen"
@@ -2380,11 +2382,11 @@ de:
             one: "hat dies gelesen"
             other: "hat dies gelesen"
           like_capped:
-            one: "und {{count}} anderen gefällt das"
-            other: "und {{count}} anderen gefällt das"
+            one: "und %{count} anderen gefällt das"
+            other: "und %{count} anderen gefällt das"
           read_capped:
-            one: "and {{count}} anderer haben dies gelesen"
-            other: "und {{count}} andere haben dies gelesen"
+            one: "and %{count} anderer haben dies gelesen"
+            other: "und %{count} andere haben dies gelesen"
         by_you:
           off_topic: "Du hast das als „am Thema vorbei“ gemeldet"
           spam: "Du hast das als Spam gemeldet"
@@ -2396,11 +2398,11 @@ de:
       delete:
         confirm:
           one: "Möchtest du wirklich diesen Beitrag löschen?"
-          other: "Möchtest du wirklich diese {{count}} Beiträge löschen?"
+          other: "Möchtest du wirklich diese %{count} Beiträge löschen?"
       merge:
         confirm:
           one: "Möchtest du diese Beiträge wirklich zusammenführen?"
-          other: "Möchtest du diese {{count}} Beiträge wirklich zusammenführen?"
+          other: "Möchtest du diese %{count} Beiträge wirklich zusammenführen?"
       revisions:
         controls:
           first: "Erste Überarbeitung"
@@ -2412,7 +2414,7 @@ de:
           revert: "Diese Überarbeitung wiederherstellen"
           edit_wiki: "Bearbeite Wiki"
           edit_post: "Bearbeite Beitrag"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "Zeige die Änderungen inline an"
@@ -2596,13 +2598,13 @@ de:
       custom_message:
         at_least:
           one: "gib mindestens ein Zeichen ein"
-          other: "gib mindestens {{count}} Zeichen ein"
+          other: "gib mindestens %{count} Zeichen ein"
         more:
           one: "eine weitere…"
-          other: "{{count}} weitere…"
+          other: "%{count} weitere…"
         left:
           one: "eine übrig"
-          other: "{{count}} übrig"
+          other: "%{count} übrig"
     flagging_topic:
       title: "Danke für deine Mithilfe!"
       action: "Thema melden"
@@ -2646,7 +2648,7 @@ de:
         title: "Dieses Thema ist eine persönliche Nachricht"
         help: "Dieses Thema ist eine persönliche Nachricht"
     posts: "Beiträge"
-    posts_long: "dieses Thema enthält {{number}} Beiträge"
+    posts_long: "dieses Thema enthält %{number} Beiträge"
     posts_likes_MF: |
       Dieses Thema hat {count, plural, one {1 Antwort} other {# Antworten}} {ratio, select, low {mit einem hohen Verhältnis von Likes zu Beiträgen} med {mit einem sehr hohen Verhältnis von Likes zu Beiträgen} high {mit einem extrem hohen Verhältnis von Likes zu Beiträgen} other {}}
     original_post: "Original-Beitrag"
@@ -2657,20 +2659,20 @@ de:
     replies: "Antworten"
     views_long:
       one: "dieses Thema wurde %{count}-mal betrachtet"
-      other: "dieses Thema wurde {{number}}-mal betrachtet"
+      other: "dieses Thema wurde %{number}-mal betrachtet"
     activity: "Aktivität"
     likes: "Likes"
     likes_lowercase:
       one: "Like"
       other: "Likes"
-    likes_long: "es gibt {{number}} Likes in diesem Thema"
+    likes_long: "es gibt %{number} Likes in diesem Thema"
     users: "Benutzer"
     users_lowercase:
       one: "Benutzer"
       other: "Benutzer"
     category_title: "Kategorie"
     history: "Verlauf"
-    changed_by: "von {{author}}"
+    changed_by: "von %{author}"
     raw_email:
       title: "Eingegangene E-Mail"
       not_available: "Nicht verfügbar!"
@@ -2682,33 +2684,33 @@ de:
         title: "Aktuell"
         title_with_count:
           one: "Aktuell (%{count})"
-          other: "Aktuell ({{count}})"
+          other: "Aktuell (%{count})"
         help: "die zuletzt geänderten Themen"
       read:
         title: "Gelesen"
         help: "Themen, die du gelesen hast; werden in der Reihenfolge angezeigt, in der du diese gelesen hast"
       categories:
         title: "Kategorien"
-        title_in: "Kategorie - {{categoryName}}"
+        title_in: "Kategorie - %{categoryName}"
         help: "alle Themen, gruppiert nach Kategorie"
       unread:
         title: "Ungelesen"
         title_with_count:
           one: "Ungelesen (%{count})"
-          other: "Ungelesen ({{count}})"
+          other: "Ungelesen (%{count})"
         help: "Themen mit ungelesenen Beiträgen, die du derzeit beobachtest oder verfolgst"
         lower_title_with_count:
           one: "%{count} ungelesenes"
-          other: "{{count}} ungelesene"
+          other: "%{count} ungelesene"
       new:
         lower_title_with_count:
           one: "%{count} neues"
-          other: "{{count}} neue"
+          other: "%{count} neue"
         lower_title: "neu"
         title: "Neu"
         title_with_count:
           one: "Neu (%{count})"
-          other: "Neu ({{count}})"
+          other: "Neu (%{count})"
         help: "Themen, die in den letzten paar Tagen erstellt wurden"
       posted:
         title: "Meine Beiträge"
@@ -2717,11 +2719,11 @@ de:
         title: "Lesezeichen"
         help: "Themen, in denen du ein Lesezeichen gesetzt hast"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "aktuelle Themen in der Kategorie {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "aktuelle Themen in der Kategorie %{categoryName}"
       top:
         title: "Angesagt"
         help: "die aktivsten Themen in diesem Jahr, in diesem Monat, in dieser Woche und heute"
@@ -2866,8 +2868,8 @@ de:
       synonyms: "Synonyme"
       synonyms_description: "Wenn die folgenden Schlagwörter verwendet werden, werden sie durch <b>%{base_tag_name} </b> ersetzt."
       tag_groups_info:
-        one: 'Dieser Tag gehört zur Gruppe &quot;{{tag_groups}}&quot;.'
-        other: "Dieses Schlagwort gehört zu diesen Gruppen: {{tag_groups}}."
+        one: 'Dieser Tag gehört zur Gruppe &quot;%{tag_groups}&quot;.'
+        other: "Dieses Schlagwort gehört zu diesen Gruppen: %{tag_groups}."
       category_restrictions:
         one: "Es kann nur in dieser Kategorie verwendet werden:"
         other: "Es kann nur in folgenden Kategorien verwendet werden:"
@@ -2883,11 +2885,11 @@ de:
       delete_tag: "Schlagwört löschen"
       delete_confirm:
         one: "Bist du sicher, dass du dieses Schlagwort löschen und von einem zugeordneten Thema entfernen möchtest?"
-        other: "Bist du sicher, dass du dieses Schlagwort löschen und von {{count}} zugeordneten Themen entfernen möchtest?"
+        other: "Bist du sicher, dass du dieses Schlagwort löschen und von %{count} zugeordneten Themen entfernen möchtest?"
       delete_confirm_no_topics: "Bist du sicher, dass du dieses Schlagwort löschen möchtest?"
       delete_confirm_synonyms:
         one: "Das Synonym wird ebenfalls gelöscht."
-        other: "Es werden {{count}} weitere Synonyme ebenfalls gelöscht."
+        other: "Es werden %{count} weitere Synonyme ebenfalls gelöscht."
       rename_tag: "Schlagwort umbenennen"
       rename_instructions: "Neuen Namen für das Schlagwort wählen:"
       sort_by: "Sortieren nach:"
@@ -3237,10 +3239,10 @@ de:
           redeliver: "Neu zustellen"
           incoming:
             one: "Es gibt ein neues Ereignis"
-            other: "Es gibt {{count}} neue Ereignisse."
+            other: "Es gibt %{count} neue Ereignisse."
           completed_in:
             one: "In %{count} Sekunde fertiggestellt."
-            other: "In {{count}} Sekunden fertiggestellt."
+            other: "In %{count} Sekunden fertiggestellt."
           request: "Request"
           response: "Response"
           redeliver_confirm: "Bist du sicher dass du denselben Payload noch einmal übertragen möchtest?"
@@ -3292,12 +3294,12 @@ de:
           label: "Hochladen"
           title: "Eine Sicherung zu dieser Instanz hochladen"
           uploading: "Wird hochgeladen…"
-          uploading_progress: "Wird hochgeladen... {{progress}}%"
-          success: "'{{filename}}' wurd erfolgreich hochgeladen. Die Datei wird nun verarbeitet. Es kann bis zu einer Minute dauern, bis sie in der Liste erscheint."
-          error: "Beim Hochladen der Datei '{{filename}}' ist ein Fehler aufgetreten: {{message}}"
+          uploading_progress: "Wird hochgeladen... %{progress}%"
+          success: "'%{filename}' wurd erfolgreich hochgeladen. Die Datei wird nun verarbeitet. Es kann bis zu einer Minute dauern, bis sie in der Liste erscheint."
+          error: "Beim Hochladen der Datei '%{filename}' ist ein Fehler aufgetreten: %{message}"
         operations:
           is_running: "Ein Vorgang läuft gerade…"
-          failed: "Der Vorgang '{{operation}}' ist fehlgeschlagen. Bitte überprüfe die Logs."
+          failed: "Der Vorgang '%{operation}' ist fehlgeschlagen. Bitte überprüfe die Logs."
           cancel:
             label: "Abbrechen"
             title: "Den aktuellen Vorgang abbrechen"
@@ -3416,7 +3418,7 @@ de:
           disabled_component_tooltip: "Diese Komponente wurde deaktiviert"
           default_theme_tooltip: "Dieses Theme ist das Standardtheme der Seite."
           updates_available_tooltip: "Updates sind verfügbar für dieses Theme"
-          and_x_more: "und {{count}} mehr."
+          and_x_more: "und %{count} mehr."
           collapse: Zuklappen
           uploads: "Uploads"
           no_uploads: "Du kannst Medieninhalte hochladen, die zu deinem Theme gehören, wie etwa Schriftarten und Bilder."
@@ -3464,8 +3466,8 @@ de:
           disabled_by: "Diese Komponente wurde deaktiviert von"
           required_version:
             error: "Dieses Theme wurde automatisch deaktiviert, weil es mit dieser Discourse-Version nicht kompatibel ist."
-            minimum: "Erfordert Discourse-Version {{version}} oder höher"
-            maximum: "Erfordert Discourse-Version {{version}} oder niedriger."
+            minimum: "Erfordert Discourse-Version %{version} oder höher"
+            maximum: "Erfordert Discourse-Version %{version} oder niedriger."
           component_of: "Komponente von:"
           update_to_latest: "Aktualisieren auf neueste Version"
           check_for_updates: "Nach Aktualisierungen suchen"
@@ -3478,7 +3480,7 @@ de:
           empty: "Keine Teile"
           commits_behind:
             one: "Theme liegt %{count} Commit zurück!"
-            other: "Theme liegt {{count}} Commits zurück!"
+            other: "Theme liegt %{count} Commits zurück!"
           compare_commits: "(Siehe neue Beiträge)"
           repo_unreachable: "Das Git-Repository dieses Themes konnte nicht kontaktiert werden. Fehlermeldung:"
           imported_from_archive: "Das Design wurde von eine .zip Datei importiert"
@@ -3880,8 +3882,8 @@ de:
           title: "E-Mail-Adresse des Benutzers anzeigen"
           text: "Anzeigen"
       user:
-        suspend_failed: "Beim Sperren dieses Benutzers ist etwas schief gegangen {{error}}"
-        unsuspend_failed: "Beim Entsperren dieses Benutzers ist etwas schief gegangen {{error}}"
+        suspend_failed: "Beim Sperren dieses Benutzers ist etwas schief gegangen %{error}"
+        unsuspend_failed: "Beim Entsperren dieses Benutzers ist etwas schief gegangen %{error}"
         suspend_duration: "Wie lange soll dieser Benutzer gesperrt werden?"
         suspend_reason_label: "Warum sperrst du? Dieser Text ist auf der Profilseite des Benutzers <b>für jeden sichtbar</b> und wird dem Benutzer angezeigt, wenn sich dieser anmelden will. Bitte kurz halten."
         suspend_reason_hidden_label: "Warum sperrst du? Dieser Text wird dem Benutzer angezeigt, wenn er versucht, sich anzumelden. Fasse dich kurz."
@@ -4236,6 +4238,7 @@ de:
         title: "Emoji"
         help: "Neues Emoji hinzufügen, das für alle verfügbar sein wird. (Tipp: per Drag & Drop kannst du gleichzeitig mehrere Dateien hinzufügen)"
         add: "Neues Emoji hinzufügen"
+        uploading: "Wird hochgeladen…"
         name: "Name"
         group: "Gruppe"
         image: "Bild"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 85c0836b8d..97356cf7d9 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -23,8 +23,8 @@ el:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}χιλ."
-        millions: "{{number}}εκατ."
+        thousands: "%{number}χιλ."
+        millions: "%{number}εκατ."
     dates:
       time: "ΗΗ:mm"
       timeline_date: "MMM YYYY"
@@ -194,11 +194,11 @@ el:
     daily: "καθημερινά"
     weekly: "κάθε εβδομάδα"
     every_month: "κάθε μήνα"
-    max_of_count: "μέγιστο {{count}}"
+    max_of_count: "μέγιστο %{count}"
     alternation: "ή"
     character_count:
-      one: "{{count}} χαρακτήρα"
-      other: "{{count}} χαρακτήρες"
+      one: "%{count} χαρακτήρα"
+      other: "%{count} χαρακτήρες"
     related_messages:
       title: "Σχετικά Μηνύματα"
     suggested_topics:
@@ -307,19 +307,19 @@ el:
         description: "Λάβαμε την ανάρτησή σου, αλλά πρέπει πρώτα να εγκριθεί από έναν συντονιστή πριν εμφανιστεί. Παρακαλώ περιμένετε."
         ok: "OK"
     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>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> απάντησε στο <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Απάντησες</a> στο <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> απάντησε στο <a href='{{topicUrl}}'>νήμα</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Απάντησες</a> στο <a href='{{topicUrl}}'>νήμα</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> ανάφερε τον/την <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> ανάφερε <a href='{{user2Url}}'>εσένα</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Ανάφερες</a> τον/την <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Αναρτήθηκε από τον/την <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Αναρτήθηκε από <a href='{{userUrl}}'>εσένα</a>"
-      sent_by_user: "Στάλθηκε από τον/την <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Στάλθηκε από <a href='{{userUrl}}'>εσένα</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> ανάρτησε <a href='%{topicUrl}'>το νήμα </a>"
+      you_posted_topic: "<a href='%{userUrl}'>Ανάρτησες</a> αυτό <a href='%{topicUrl}'>το νήμα</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> απάντησε στο <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Απάντησες</a> στο <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> απάντησε στο <a href='%{topicUrl}'>νήμα</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Απάντησες</a> στο <a href='%{topicUrl}'>νήμα</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> ανάφερε τον/την <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> ανάφερε <a href='%{user2Url}'>εσένα</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Ανάφερες</a> τον/την <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Αναρτήθηκε από τον/την <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Αναρτήθηκε από <a href='%{userUrl}'>εσένα</a>"
+      sent_by_user: "Στάλθηκε από τον/την <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Στάλθηκε από <a href='%{userUrl}'>εσένα</a>"
     directory:
       filter_name: "φιλτράρισμα με βάση το όνομα χρήστη"
       title: "Χρήστες"
@@ -499,7 +499,7 @@ el:
     user_fields:
       none: "(διαλέξτε μία επιλογή)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Προφίλ"
       mute: "Σίγαση"
       edit: "Επεξεργασία Ρυθμίσεων"
@@ -549,12 +549,12 @@ el:
       external_links_in_new_tab: "Άνοιγε όλους τους εξωτερικούς συνδέσμους σε νέα καρτέλα"
       enable_quoting: "Το κείμενο που επισημαίνεται να παρατίθεται στην απάντηση "
       change: "αλλαγή"
-      moderator: "Ο/Η {{user}} είναι συντονιστής"
-      admin: "Ο/Η {{user}} είναι διαχειριστής"
+      moderator: "Ο/Η %{user} είναι συντονιστής"
+      admin: "Ο/Η %{user} είναι διαχειριστής"
       moderator_tooltip: "Αυτός ο χρήστης είναι συντονιστής"
       admin_tooltip: "Αυτός ο χρήστης είναι διαχειριστής"
       silenced_tooltip: "Χρήστης σε σιγή"
-      suspended_notice: "Αυτός ο χρήστης είναι σε αποβολή μέχρι τις {{date}}."
+      suspended_notice: "Αυτός ο χρήστης είναι σε αποβολή μέχρι τις %{date}."
       suspended_permanently: "Ο χρήστης είναι αποβλημένος."
       suspended_reason: "Αιτιολογία:"
       github_profile: "Github"
@@ -569,7 +569,7 @@ el:
           Τα νήματα σε σίγαση και οι κατηγορίες δεν συμπεριλαμβάνονται σε αυτά τα ηλεκτρονικά μηνύματα.
         individual: "Στείλε ένα email για κάθε νέα ανάρτηση"
         individual_no_echo: "Στείλε ένα email για κάθε νέα ανάρτηση, εκτός από τις δικές μου."
-        many_per_day: "Στείλε μου ένα email για κάθε νέα ανάρτηση (περίπου {{dailyEmailEstimate}} τη μέρα)"
+        many_per_day: "Στείλε μου ένα email για κάθε νέα ανάρτηση (περίπου %{dailyEmailEstimate} τη μέρα)"
         few_per_day: "Στείλε μου ένα email για κάθε νέα ανάρτηση (περίπου 2 τη μέρα)"
       tag_settings: "Ετικέτες"
       watched_tags: "Επιτηρείται"
@@ -595,7 +595,6 @@ el:
       admin_delete: "Διαγραφή"
       users: "Χρήστες"
       muted_users: "Σε σίγαση"
-      muted_users_instructions: "Αποσιώπησε όλες τις ειδοποιήσεις από αυτούς τους χρήστες."
       ignored_users: "Αγνοήθηκε "
       tracked_topics_link: "Δείξε"
       automatically_unpin_topics: "Τα νήματα ξεκαρφιτσώνονται αυτόματα όταν φτάνω στο κάτω μέρος."
@@ -683,11 +682,11 @@ el:
         title: "Email"
         ok: "Για επιβεβαίωση θα σου στείλουμε ένα email"
         invalid: "Παρακαλώ δώσε μία έγκυρη διεύθυνση email"
-        authenticated: "Η διεύθυνση email σου ταυτοποιήθηκε από τον πάροχο {{provider}}"
+        authenticated: "Η διεύθυνση email σου ταυτοποιήθηκε από τον πάροχο %{provider}"
         frequency_immediately: "Θα σου στείλουμε αμέσως email, εάν δεν έχεις διαβάσει αυτό για το οποίο σου στέλνουμε το μήνυμα."
         frequency:
           one: "Θα σου στείλουμε ηλεκτρονικό μήνυμα μόνο εάν δε σε έχουμε δει το τελευταίο λεπτό."
-          other: "Θα σου στείλουμε ηλεκτρονικό μήνυμα μόνο εάν δεν σε έχουμε δει τα τελευταία {{count}} λεπτά."
+          other: "Θα σου στείλουμε ηλεκτρονικό μήνυμα μόνο εάν δεν σε έχουμε δει τα τελευταία %{count} λεπτά."
       associated_accounts:
         revoke: "Ανάκληση"
         cancel: "Άκυρο"
@@ -700,9 +699,9 @@ el:
       username:
         title: "Όνομα Χρήστη"
         instructions: "μοναδικό, χωρίς κενά, σύντομο"
-        short_instructions: "Οι άλλοι μπορούν να αναφερθούν σε σένα με το @{{username}} "
+        short_instructions: "Οι άλλοι μπορούν να αναφερθούν σε σένα με το @%{username} "
         available: "Το όνομα χρήστη είναι διαθέσιμο"
-        not_available: "Δεν είναι διαθέσιμο. Δοκίμασε {{suggestion}};"
+        not_available: "Δεν είναι διαθέσιμο. Δοκίμασε %{suggestion};"
         not_available_no_suggestion: "Μη διαθέσιμο "
         too_short: "Το όνομα χρήστη σου είναι μικρό"
         too_long: "Το όνομα χρήστη σου είναι μεγάλο"
@@ -780,14 +779,14 @@ el:
         user: "Προσκεκλημένος Χρήστης"
         truncated:
           one: "Δείχνοντας την πρώτη πρόσκληση."
-          other: "Προβάλονται οι πρώτες {{count}} προσκλήσεις."
+          other: "Προβάλονται οι πρώτες %{count} προσκλήσεις."
         redeemed: "Αποδεκτές Προσκλήσεις"
         redeemed_tab: "Αποδεκτές"
-        redeemed_tab_with_count: "Αποδεκτές ({{count}})"
+        redeemed_tab_with_count: "Αποδεκτές (%{count})"
         redeemed_at: "Αποδεκτές"
         pending: "Εκρεμείς προσκλήσεις"
         pending_tab: "Εκρεμείς"
-        pending_tab_with_count: "Εκρεμείς ({{count}})"
+        pending_tab_with_count: "Εκρεμείς (%{count})"
         topics_entered: "Προβεβλημένα Νήματα"
         posts_read_count: "Διαβασμένες Αναρτήσεις"
         expired: "Αυτή η πρόσκληση έχει λήξει."
@@ -801,13 +800,17 @@ el:
         time_read: "Χρόνος Ανάγνωσης"
         days_visited: "Μέρες Επίσκεψης"
         account_age_days: "Ηλικία λογαριασμού σε ημέρες"
+        links_tab: "Σύνδεσμοι"
+        link_created_at: "Δημιουργήθηκε"
+        link_groups: Ομάδες
         create: "Αποστολή Πρόσκλησης"
         generate_link: "Αντιγραφή Συνδέσμου Πρόσκλησης"
         link_generated: "Η δημιουργία του συνδέσμου πρόσκλησης έγινε επιτυχώς!"
         valid_for: "Ο σύνδεσμος πρόσκλησης είναι έγκυρος μόνο για αυτή τη διεύθυνση email: %{email}"
+        invite_link:
+          success: "Η δημιουργία του συνδέσμου πρόσκλησης έγινε επιτυχώς!"
         bulk_invite:
           none: "Δεν έχετε προσκαλέσει κανέναν ακόμα. Στείλτε ατομικές προσκλήσεις ή καλέστε πολλά άτομα με τη μία <a href='https://meta.discourse.org/t/send-bulk-invites/16468'> μεταφορτώνοντας ένα αρχείο CSV</a>."
-          text: "Ομαδική πρόσκληση από αρχείο"
           success: "Το αρχείο ανέβηκε. Θα ενημερωθείς με ένα μήνυμα όταν ολοκληρωθεί η διαδικασία."
           error: "Λυπούμαστε, το αρχείο πρέπει να έχει την μορφή CSV."
       password:
@@ -894,7 +897,7 @@ el:
       desc:
         network: "Παρακαλώ έλεγξε την σύνδεση."
         network_fixed: "Μοιάζει να επανήλθε."
-        server: "Κωδικός σφάλματος: {{status}}"
+        server: "Κωδικός σφάλματος: %{status}"
         forbidden: "Δεν επιτρέπεται να το δείς αυτό."
         not_found: "Ουπς, η εφαρμογή προσπάθησε να φορτώσει μια διεύθυνση URL που δεν υπάρχει."
         unknown: "Κάτι δεν πήγε καλά."
@@ -942,8 +945,8 @@ el:
       hidden_for_session: "Εντάξει, θα σε ρωτήσω αύριο. Μπορείς πάντα να χρησιμοποιείς τη \"Σύνδεση\" για να δημιουργήσεις ένα λογαριασμό."
     summary:
       enabled_description: "Βλέπεις μια περίληψη αυτού του νήματος: οι πιο ενδιαφέρουσες αναρτήσεις, όπως αυτές καθορίστηκαν από την κοινότητα."
-      description: "Υπάρχουν <b>{{replyCount}}</b> απαντήσεις."
-      description_time: "Υπάρχουν <b>{{replyCount}}</b> απαντήσεις με εκτιμώμενο χρόνο ανάγνωσης <b>{{readingTime}} λεπτών</b>."
+      description: "Υπάρχουν <b>%{replyCount}</b> απαντήσεις."
+      description_time: "Υπάρχουν <b>%{replyCount}</b> απαντήσεις με εκτιμώμενο χρόνο ανάγνωσης <b>%{readingTime} λεπτών</b>."
       enable: "Σύνοψη του Νήματος"
       disable: "Εμφάνιση όλων των αναρτήσεων"
     deleted_filter:
@@ -954,8 +957,8 @@ el:
     private_message_info:
       title: "Μήνυμα"
       leave_message: "Σίγουρα θελετε να αφήσετε αυτό το μήνυμα;"
-      remove_allowed_user: "Θέλεις σίγουρα να αφαιρέσεις τον/την {{name}} από αυτή τη συζήτηση;"
-      remove_allowed_group: "Θέλεις σίγουρα να αφαιρέσεις τον/την {{name}} από αυτό το μήνυμα;"
+      remove_allowed_user: "Θέλεις σίγουρα να αφαιρέσεις τον/την %{name} από αυτή τη συζήτηση;"
+      remove_allowed_group: "Θέλεις σίγουρα να αφαιρέσεις τον/την %{name} από αυτό το μήνυμα;"
     email: "Email"
     username: "Όνομα Χρήστη"
     last_seen: "Εθεάθη"
@@ -964,7 +967,7 @@ el:
     trust_level: "Επίπεδο Εμπιστοσύνης"
     search_hint: "όνομα χρήστη, email ή IP διεύθυνση"
     create_account:
-      disclaimer: "Κάνοντας εγγραφή συμφωνείς με την <a href='{{privacy_link}}'>πολιτική ιδιωτικότητας</a> και με τους <a href='{{tos_link}}'>όρους χρήσης</a>."
+      disclaimer: "Κάνοντας εγγραφή συμφωνείς με την <a href='%{privacy_link}'>πολιτική ιδιωτικότητας</a> και με τους <a href='%{tos_link}'>όρους χρήσης</a>."
       title: "Δημιουργία Λογαριασμού"
       failed: "Κάτι πήγε στραβά. Ίσως αυτή η διεύθυνση email να είναι ήδη δηλωμένη. Δοκίμασε την λειτουργία «ξέχασα τον κωδικό μου»."
     forgot_password:
@@ -999,7 +1002,7 @@ el:
       awaiting_activation: "Ο λογαριασμός σας αναμένει ενεργοποίηση, χρησιμοποιήστε τον σύνδεσμο ξεχασμένου συνθηματικού για δημιουργία νέου email ενεργοποίησης."
       awaiting_approval: "Ο λογαριασμός σου δεν έχει εγκριθεί από κανέναν συνεργάτη ακόμη. Θα λάβεις ένα email όταν εγκριθεί."
       requires_invite: "Λυπούμαστε, αλλά η πρόσβαση σε αυτό το φόρουμ είναι δυνατή μόνο με πρόσκληση."
-      not_activated: "Δεν γίνεται να συνδεθείς ακόμη. Έχουμε ήδη στείλει ένα email με οδηγίες ενεργοποίησης στη διεύθυνση <b>{{sentTo}}</b>. Ακολούθησε τις οδηγίες σε αυτό το μήνυμα για να ενεργοποιήσεις το λογαριασμό σου."
+      not_activated: "Δεν γίνεται να συνδεθείς ακόμη. Έχουμε ήδη στείλει ένα email με οδηγίες ενεργοποίησης στη διεύθυνση <b>%{sentTo}</b>. Ακολούθησε τις οδηγίες σε αυτό το μήνυμα για να ενεργοποιήσεις το λογαριασμό σου."
       not_allowed_from_ip_address: "Δεν μπορείς να συνδεθείς από αυτή τη διεύθυνση IP."
       admin_not_allowed_from_ip_address: "Από αυτή τη διεύθυνση IP δεν επιτρέπεται να συνδεθείς ως διαχειριστής."
       resend_activation_email: "Πάτησε εδώ για να σταλεί ξανά το email ενεργοποίησης."
@@ -1007,7 +1010,7 @@ el:
       change_email: "Αλλαγή Διεύθυνσης Email"
       provide_new_email: "Καταχωρήστε μια νέα διεύθυνση και θα σας στείλουμε εκ νέου το email ενεργοποίησης."
       submit_new_email: "Ενημέρωση Διεύθυνσης Email"
-      sent_activation_email_again: "Στάλθηκε ένα ακόμα email ενεργοποίησης στο <b>{{currentEmail}}</b>. Θα χρειαστούν κάποια λεπτά για να το λάβεις, βεβαιώσου ότι έλεγξες και το φάκελο ανεπιθύμητης αλληλογραφίας."
+      sent_activation_email_again: "Στάλθηκε ένα ακόμα email ενεργοποίησης στο <b>%{currentEmail}</b>. Θα χρειαστούν κάποια λεπτά για να το λάβεις, βεβαιώσου ότι έλεγξες και το φάκελο ανεπιθύμητης αλληλογραφίας."
       to_continue: "Παρακαλώ Συνδεθείτε"
       preferences: "Πρέπει να συνδεθείς για να αλλάξεις τις προτιμήσεις χρήστη."
       forgot: "Δεν θυμάμαι τις λεπτομέρειες του λογαριασμού μου"
@@ -1088,17 +1091,17 @@ el:
       similar_topics: "Το νήμα σας είναι παρόμοιο με ..."
       drafts_offline: "τοπικά πρόχειρα"
       group_mentioned:
-        one: "Αναφέροντας {{group}}, πρόκειται να λάβει ειδοποίηση <a href='{{group_link}}'> %{count} άτομο</a> - είσαι βέβαιος;"
-        other: "Αναφέροντας το {{group}}, πρόκειται να ειδοποίησεις <a href='{{group_link}}'>{{count}} μέλη</a> - είσαι σίγουρος;"
+        one: "Αναφέροντας %{group}, πρόκειται να λάβει ειδοποίηση <a href='%{group_link}'> %{count} άτομο</a> - είσαι βέβαιος;"
+        other: "Αναφέροντας το %{group}, πρόκειται να ειδοποίησεις <a href='%{group_link}'>%{count} μέλη</a> - είσαι σίγουρος;"
       cannot_see_mention:
-        category: "Ανέφερες το {{username}} αλλά δε θα λάβουν ειδοποίηση, επειδή δεν έχουν πρόσβαση σε αυτή την κατηγορία. Θα πρέπει να τους προσθέσεις σε μια ομάδα που έχει πρόσβαση σε αυτή την κατηγορία."
-        private: "Ανέφερες {{username}} αλλά δεν θα λάβουν ειδοποίηση, επειδή δεν μπορούν να δουν αυτό το προσωπικό μήνυμα. Πρέπει να τους προσκαλέσεις σε αυτό το ΠΜ."
-      duplicate_link: "Όπως φαίνετα ο σύνδεσμος σας προς <b>{{domain}}</b> έχει ήδη αναρτηθεί στο νήμα από <b>@{{username}}</b> σε μία <a href='{{post_url}}'>απάντηση πριν από {{ago}}</a> – θέλετε σίγουρα να αναρτήσετε τον σύνδεσμο ξανά;"
+        category: "Ανέφερες το %{username} αλλά δε θα λάβουν ειδοποίηση, επειδή δεν έχουν πρόσβαση σε αυτή την κατηγορία. Θα πρέπει να τους προσθέσεις σε μια ομάδα που έχει πρόσβαση σε αυτή την κατηγορία."
+        private: "Ανέφερες %{username} αλλά δεν θα λάβουν ειδοποίηση, επειδή δεν μπορούν να δουν αυτό το προσωπικό μήνυμα. Πρέπει να τους προσκαλέσεις σε αυτό το ΠΜ."
+      duplicate_link: "Όπως φαίνετα ο σύνδεσμος σας προς <b>%{domain}</b> έχει ήδη αναρτηθεί στο νήμα από <b>@%{username}</b> σε μία <a href='%{post_url}'>απάντηση πριν από %{ago}</a> – θέλετε σίγουρα να αναρτήσετε τον σύνδεσμο ξανά;"
       error:
         title_missing: "Απαιτείται τίτλος"
-        title_too_short: "Ο τίτλος πρέπει να έχει τουλάχιστον {{min}} χαρακτήρες"
-        title_too_long: "Ο τίτλος δεν μπορεί να έχει πάνω από {{max}} χαρακτήρες"
-        post_length: "Κάθε ανάρτηση πρέπει να περιέχει τουλάχιστον {{min}} χαρακτήρες"
+        title_too_short: "Ο τίτλος πρέπει να έχει τουλάχιστον %{min} χαρακτήρες"
+        title_too_long: "Ο τίτλος δεν μπορεί να έχει πάνω από %{max} χαρακτήρες"
+        post_length: "Κάθε ανάρτηση πρέπει να περιέχει τουλάχιστον %{min} χαρακτήρες"
         category_missing: "Πρέπει να διαλέξεις μια κατηγορία"
       save_edit: "Αποθήκευση Επεξεργασίας"
       reply_original: "Απάντηση στο αρχικό νήμα"
@@ -1159,38 +1162,38 @@ el:
       title: "ειδοποιήσεις για αναφορές στο @name, απαντήσεις στις αναρτήσεις σου και στα νήματά σου, προσωπικά μηνύματα, κλπ."
       none: "Αυτή τη στιγμή δεν είναι δυνατόν να φορτωθούν οι ειδοποιήσεις."
       empty: "Δεν βρέθηκαν ειδοποιήσεις."
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} και %{count} ακόμα</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} και {{count}} ακόμα</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}}"
-      invitee_accepted: "<span>{{username}}</span> αποδέχτηκε την πρόσκλησή σου"
-      moved_post: "<span>{{username}}</span> μετακίνησε {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Έλαβες '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Νέο Νήμα</span> {{description}}"
+        one: "<span>%{username}, %{username2} και %{count} ακόμα</span> %{description}"
+        other: "<span>%{username}, %{username2} και %{count} ακόμα</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}"
+      invitee_accepted: "<span>%{username}</span> αποδέχτηκε την πρόσκλησή σου"
+      moved_post: "<span>%{username}</span> μετακίνησε %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Έλαβες '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Νέο Νήμα</span> %{description}"
       group_message_summary:
-        one: "{{count}} μήνυμα στα εισερχόμενα της ομάδας {{group_name}}"
-        other: "{{count}} μηνύματα στα εισερχόμενα της ομάδας {{group_name}} "
+        one: "%{count} μήνυμα στα εισερχόμενα της ομάδας %{group_name}"
+        other: "%{count} μηνύματα στα εισερχόμενα της ομάδας %{group_name} "
       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}}'
-        linked: '{{username}} έκανε μια σύνδεση στην ανάρτηση που έκανες στο νήμα "{{topic}}" - {{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}'
+        linked: '%{username} έκανε μια σύνδεση στην ανάρτηση που έκανες στο νήμα "%{topic}" - %{site_title}'
       titles:
         watching_first_post: "νέο νήμα"
     upload_selector:
@@ -1199,9 +1202,9 @@ el:
       from_my_computer: "Από τη συσκευή μου"
       from_the_web: "Από το διαδίκτυο"
       remote_tip: "υπερσύνδεσμος προς μια εικόνα"
-      remote_tip_with_attachments: "σύνδεσμος σε εικόνα ή αρχείο {{authorized_extensions}}"
+      remote_tip_with_attachments: "σύνδεσμος σε εικόνα ή αρχείο %{authorized_extensions}"
       local_tip: "επιλογή εικόνων από τη συσκευή σου"
-      local_tip_with_attachments: "επίλεξε εικόνες ή αρχεία από τη συσκευή σου {{authorized_extensions}}"
+      local_tip_with_attachments: "επίλεξε εικόνες ή αρχεία από τη συσκευή σου %{authorized_extensions}"
       hint: "(μπορείς επίσης να τα σύρεις με το ποντίκι στον editor για να τα ανεβάσεις)"
       hint_for_supported_browsers: "μπορείς επίσης να σύρεις ή να επικόλλησεις εικόνες στον editor"
       uploading: "Ανεβαίνει"
@@ -1221,8 +1224,8 @@ el:
       no_results: "Δε βρέθηκαν αποτελέσματα."
       no_more_results: "Δε βρέθηκαν άλλα αποτελέσματα"
       searching: "Ψάχνω ..."
-      post_format: "#{{post_number}} από {{username}}"
-      results_page: "Αποτελέσματα αναζήτησης για '{{term}}'"
+      post_format: "#%{post_number} από %{username}"
+      results_page: "Αποτελέσματα αναζήτησης για '%{term}'"
       more_results: "Υπάρχουν περισσότερα αποτελέσματα. Παρακαλούμε περιορίστε την αναζήτησή σας."
       cant_find: "Δεν μπορείτε να βρείτε αυτό που ψάχνετε;"
       start_new_topic: "Ίσως να ξεκινούσατε ένα νέο νήμα;"
@@ -1231,8 +1234,8 @@ el:
       search_google_button: "Google"
       search_google_title: "Αναζήτηση στην ιστοσελίδα"
       context:
-        user: "Ψάξε στις αναρτήσεις του χρήστη @{{username}}"
-        category: "Αναζήτηση στην κατηγορία #{{category}} "
+        user: "Ψάξε στις αναρτήσεις του χρήστη @%{username}"
+        category: "Αναζήτηση στην κατηγορία #%{category} "
         topic: "Ψάξε σε αυτό το νήμα"
         private_messages: "Αναζήτηση στα μηνύματα"
       advanced:
@@ -1295,7 +1298,7 @@ el:
         choose_new_category: "Διάλεξε νέα κατηγορία για τα νήματα:"
         selected:
           one: "Έχεις διαλέξει <b>%{count}</b> νήμα."
-          other: "Έχεις διαλέξει <b>{{count}}</b> νήματα."
+          other: "Έχεις διαλέξει <b>%{count}</b> νήματα."
         change_tags: "Αντικατάσταση Ετικετών "
         append_tags: "Προσάρτηση Ετικετών "
         choose_new_tags: "Επίλεξε καινούριες ετικέτες για αυτά τα νήματα:"
@@ -1308,7 +1311,7 @@ el:
         posted: "Δεν έχεις αναρτήσει σε κάποιο νήμα ακόμη."
         latest: "Δεν υπάρχουν νέα νήματα. Αυτό είναι λυπηρό."
         bookmarks: "Δεν έχεις βάλει σελιδοδείκτη σε κανένα νήμα."
-        category: "Δεν υπάρχουν νήματα στην κατηγορία {{category}}."
+        category: "Δεν υπάρχουν νήματα στην κατηγορία %{category}."
         top: "Δεν υπάρχουν κορυφαία νήματα."
         educate:
           new: '<p>Τα νέα σου νήματα εμφανίζονται εδώ.</p><p>Από προεπιλογή, τα νήματα συζητήσεων θεωρούνται καινούρια και θα δείχνουν ένα <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">καινούριο</span> δείκτη εαν έχουν δημιουργηθεί τις τελευταίες 2 μέρες.</p><p>Επισκέψου τις <a href="%{userPrefsUrl}">προτιμήσεις σου</a> για να το αλλάξεις αυτό.</p>'
@@ -1319,13 +1322,13 @@ el:
         read: "Δεν υπάρχουν άλλα διαβασμένα νήματα."
         new: "Δεν υπάρχουν άλλα νέα νήματα."
         unread: "Δεν υπάρχουν άλλα αδιάβαστα νήματα."
-        category: "Δεν υπάρχουν άλλα νήματα στην κατηγορία {{category}}."
+        category: "Δεν υπάρχουν άλλα νήματα στην κατηγορία %{category}."
         top: "Δεν υπάρχουν άλλα κορυφαία νήματα."
         bookmarks: "Δεν υπάρχουν άλλα νήματα με σελιδοδείκτη."
     topic:
       filter_to:
         one: "%{count} δημοσίευση σε νήματα"
-        other: "{{count}} αναρτήσεις σε νήματα"
+        other: "%{count} αναρτήσεις σε νήματα"
       create: "Νέο Νήμα"
       create_long: "Δημιουργία νέου Νήματος"
       private_message: "Στείλε ένα προσωπικό μήνυμα"
@@ -1344,10 +1347,10 @@ el:
       unread: "αδιάβαστο"
       new_topics:
         one: "%{count} νέο νήμα"
-        other: "{{count}} νέα νήματα"
+        other: "%{count} νέα νήματα"
       unread_topics:
         one: "%{count} μη αναγνωσμένο νήμα"
-        other: "{{count}} αδιάβαστα νήματα"
+        other: "%{count} αδιάβαστα νήματα"
       title: "Νήμα"
       invalid_access:
         title: "Το νήμα είναι ιδιωτικό"
@@ -1361,22 +1364,22 @@ el:
         description: "Συγνώμη, δεν μπορέσαμε να βρούμε αυτό το νήμα συζήτησης. Μήπως έχει αφαιρεθεί από κάποιον συντονιστή;"
       total_unread_posts:
         one: "έχεις %{count} αδιάβαστη ανάρτηση σε αυτό το νήμα"
-        other: "έχεις {{count}} αδιάβαστες αναρτήσεις σε αυτό το νήμα"
+        other: "έχεις %{count} αδιάβαστες αναρτήσεις σε αυτό το νήμα"
       unread_posts:
         one: "έχεις %{count} αδιάβαστη παλιά ανάρτηση σε αυτό το νήμα"
-        other: "έχεις {{count}} αδιάβαστες παλιές αναρτήσεις σε αυτό το νήμα"
+        other: "έχεις %{count} αδιάβαστες παλιές αναρτήσεις σε αυτό το νήμα"
       new_posts:
         one: "υπάρχει %{count} νέα ανάρτηση σε αυτό το νήμα από την τελευταία φορά που το διάβασες"
-        other: "υπάρχουν {{count}} νέες αναρτήσεις σε αυτό το νήμα από την τελευταία φορά που το διάβασες"
+        other: "υπάρχουν %{count} νέες αναρτήσεις σε αυτό το νήμα από την τελευταία φορά που το διάβασες"
       likes:
         one: "υπάρχει %{count} «Μου αρέσει» σε αυτό το νήμα"
-        other: "υπάρχουν {{count}} «μου αρέσει» σε αυτό το νήμα"
+        other: "υπάρχουν %{count} «μου αρέσει» σε αυτό το νήμα"
       back_to_list: "Επιστροφή στη Λίστα Νημάτων"
       options: "Ρυθμίσεις Νήματος"
       show_links: "εμφάνιση συνδέσμων εντός του νήματος"
       toggle_information: "εναλλαγή λεπτομερειών νήματος"
-      read_more_in_category: "Θέλεις να διαβάσεις περισσότερα; Βρες άλλα νήματα στο {{catLink}} ή {{latestLink}}."
-      read_more: "Θέλεις να διαβασεις περισσότερα; {{catLink}} ή {{latestLink}}."
+      read_more_in_category: "Θέλεις να διαβάσεις περισσότερα; Βρες άλλα νήματα στο %{catLink} ή %{latestLink}."
+      read_more: "Θέλεις να διαβασεις περισσότερα; %{catLink} ή %{latestLink}."
       read_more_MF: "Έχεις { UNREAD, plural, =0 {} one { μόνο <a href='{basePath}/unread'>1 αδιάβαστο</a> } other { <a href='{basePath}/unread'># αδιάβαστα</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{και } false {έχεις } other{}} <a href='{basePath}/new'>1 νέο</a> νήμα} other { {BOTH, select, true{και } false {έχεις } other{}} <a href='{basePath}/new'># νέα</a> νήματα} } ακόμη ή {CATEGORY, select, true {περιηγήσου σε άλλα νήματα {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Περιήγηση σε όλες τις κατηγορίες
       view_latest_topics: δες τα πρόσφατα νήματα
@@ -1534,25 +1537,25 @@ el:
         success_message: "Επισήμανες αυτό το νήμα."
       feature_topic:
         title: "Θέσε το νήμα σε προβολή"
-        pin: "Το νήμα αυτό να εμφανίζεται στην κορυφή της {{categoryLink}} κατηγορίας μέχρι"
-        confirm_pin: "Υπάρχουν ήδη {{count}} καρφιτσωμένα νήματα. Τόσα πολλά καρφιτσωμένα νήματα μπορεί να είναι υπερβολικός φόρτος για νέους και ανώνυμους χρήστες. Θες στ' αλήθεια να καρφιτσώσεις ακόμη ένα νήμα σε αυτή την κατηγορία;"
-        unpin: "Απομάκρυνε το νήμα από την κορυφή της κατηγορίας {{categoryLink}}."
-        unpin_until: "Απομάκρυνε το νήμα από την κορυφή της {{categoryLink}} κατηγορίας ή περίμενε μέχρι <strong>%{until}</strong>."
+        pin: "Το νήμα αυτό να εμφανίζεται στην κορυφή της %{categoryLink} κατηγορίας μέχρι"
+        confirm_pin: "Υπάρχουν ήδη %{count} καρφιτσωμένα νήματα. Τόσα πολλά καρφιτσωμένα νήματα μπορεί να είναι υπερβολικός φόρτος για νέους και ανώνυμους χρήστες. Θες στ' αλήθεια να καρφιτσώσεις ακόμη ένα νήμα σε αυτή την κατηγορία;"
+        unpin: "Απομάκρυνε το νήμα από την κορυφή της κατηγορίας %{categoryLink}."
+        unpin_until: "Απομάκρυνε το νήμα από την κορυφή της %{categoryLink} κατηγορίας ή περίμενε μέχρι <strong>%{until}</strong>."
         pin_note: "Οι χρήστες μπορούν να ξεκαρφιτσώσουν αυτό το νήμα ο καθένας για τον εαυτό του."
         pin_validation: "Απαιτείται ημερομηνία για να καρφιτσώσεις το νήμα."
-        not_pinned: "Δεν υπάρχουν νήματα καρφιτσωμένα σε {{categoryLink}}."
+        not_pinned: "Δεν υπάρχουν νήματα καρφιτσωμένα σε %{categoryLink}."
         already_pinned:
-          one: "Νήμα καρφιτσωμένο σε {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Νήματα καρφιτσωμένα σε {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Νήμα καρφιτσωμένο σε %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Νήματα καρφιτσωμένα σε %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Εμφάνισε αυτό το νήμα στην κορυφή όλων των λιστών νημάτων μέχρι"
-        confirm_pin_globally: "Υπάρχουν ήδη {{count}} καθολικά καρφιτσωμένα νήματα. Τόσα πολλά καρφιτσωμένα νήματα μπορεί να είναι υπερβολικός φόρτος για νέους και ανώνυμους χρήστες. Θες στ' αλήθεια να καρφιτσώσεις καθολικά ακόμη ένα νήμα;"
+        confirm_pin_globally: "Υπάρχουν ήδη %{count} καθολικά καρφιτσωμένα νήματα. Τόσα πολλά καρφιτσωμένα νήματα μπορεί να είναι υπερβολικός φόρτος για νέους και ανώνυμους χρήστες. Θες στ' αλήθεια να καρφιτσώσεις καθολικά ακόμη ένα νήμα;"
         unpin_globally: "Αφαίρεσε αυτό το νήμα από την κορυφή όλων των λίστων νημάτων"
         unpin_globally_until: "Αφαίρεσε αυτό το νήμα από την κορυφή όλων των λίστων νημάτων ή περίμενε μέχρι <strong>%{until}</strong>."
         global_pin_note: "Οι χρήστες μπορούν να ξεκαρφιτσώσουν το νήμα ο καθένας για τον εαυτό του."
         not_pinned_globally: "Δεν υπάρχουν καθολικά καρφιτσωμένα νήματα."
         already_pinned_globally:
           one: "Πρόσφατα καθολικά καρφιτσωμένα νήματα:<strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Πρόσφατα καθολικά καρφιτσωμένα νήματα: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Πρόσφατα καθολικά καρφιτσωμένα νήματα: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Αυτό το νήμα να γίνει νήμα ανακοίνωσης και να εμφανίζεται στην κορυφή όλων των σελίδων."
         remove_banner: "Αφαίρεσε το νήμα ανακοίνωσης το οποίο εμφανίζεται στην κορυφή όλων των σελίδων."
         banner_note: "Οι χρήστες μπορούν να κλείσουν την ανακοίνωση έτσι ώστε να μην εμφανίζεται σε αυτούς. Ένα μόνο νήμα μπορεί να είναι νήμα ανακοίνωσης κάθε φορά."
@@ -1582,15 +1585,15 @@ el:
         to_topic_username: "Έδωσες όνομα χρήστη. Θα στείλουμε ειδοποίηση με ένα σύνδεσμο πρόσκλησης προς αυτό το νήμα."
         to_username: "Δώσε το όνομα χρήστη του ατόμου που θα ήθελες να προσκαλέσεις. Θα στείλουμε ειδοποίηση με ένα σύνδεσμο πρόσκλησης προς αυτό το νήμα."
         email_placeholder: "name@example.com"
-        success_email: "Στείλαμε μια πρόσκληση στον/στην <b>{{emailOrUsername}}</b>. Θα σε ειδοποιήσουμε όταν η πρόσκληση γίνει αποδεκτή. Στη σελίδα του προφίλ σου μπορείς να παρακολουθήσεις την εξέλιξη όλων των προσκλήσεών σου."
+        success_email: "Στείλαμε μια πρόσκληση στον/στην <b>%{emailOrUsername}</b>. Θα σε ειδοποιήσουμε όταν η πρόσκληση γίνει αποδεκτή. Στη σελίδα του προφίλ σου μπορείς να παρακολουθήσεις την εξέλιξη όλων των προσκλήσεών σου."
         success_username: "Προσκαλέσαμε τον χρήστη να συμμετέχει σε αυτό το νήμα."
         error: "Λυπούμαστε αλλά δεν μπορέσαμε να προσκαλέσουμε αυτό το άτομο. Μήπως έχει ήδη προσκληθεί; (ο ρυθμός αποστολής προσκλήσεων είναι περιορισμένος)"
-        success_existing_email: "Ο χρήστης με email <b>{{emailOrUsername}}</b> υπάρχει ήδη. Προσκαλέσαμε αυτόν τον χρήστης να συμμετέχει στο νήμα."
+        success_existing_email: "Ο χρήστης με email <b>%{emailOrUsername}</b> υπάρχει ήδη. Προσκαλέσαμε αυτόν τον χρήστης να συμμετέχει στο νήμα."
       login_reply: "Συνδέσου για να απαντήσεις"
       filters:
         n_posts:
           one: "%{count} ανάρτηση"
-          other: "{{count}} αναρτήσεις"
+          other: "%{count} αναρτήσεις"
         cancel: "Αφαίρεση φίλτρου"
       split_topic:
         title: "Μεταφορά σε Νέο Νήμα "
@@ -1599,14 +1602,14 @@ el:
         error: "Παρουσιάστηκε σφάλμα κατά τη μεταφορά των αναρτήσεων στο νέο νήμα."
         instructions:
           one: "Ετοιμάζεσαι να δημιουργήσεις ένα νέο νήμα και να μεταφέρεις σε αυτό την επιλεγμένη ανάρτηση."
-          other: "Ετοιμάζεσαι να δημιουργήσεις ένα νέο νήμα και να μεταφέρεις σε αυτό τις <b>{{count}}</b> επιλεγμένες αναρτήσεις."
+          other: "Ετοιμάζεσαι να δημιουργήσεις ένα νέο νήμα και να μεταφέρεις σε αυτό τις <b>%{count}</b> επιλεγμένες αναρτήσεις."
       merge_topic:
         title: "Μεταφορά σε Υφιστάμενο Νήμα"
         action: "μεταφορά σε υφιστάμενο νήμα"
         error: "Παρουσιάστηκε σφάλμα κατά τη μεταφορά των αναρτήσεων σε αυτό το νήμα. "
         instructions:
           one: "Παρακαλώ επίλεξε το νήμα στο οποίο θέλεις να μεταφέρεις την ανάρτηση."
-          other: "Παρακαλώ επίλεξε το νήμα στο οποίο θέλεις να μεταφέρεις τις <b>{{count}}</b> αυτές αναρτήσεις."
+          other: "Παρακαλώ επίλεξε το νήμα στο οποίο θέλεις να μεταφέρεις τις <b>%{count}</b> αυτές αναρτήσεις."
       move_to_new_message:
         radio_label: "Νέο Μήνυμα"
       merge_posts:
@@ -1625,7 +1628,7 @@ el:
         instructions: "Παρακαλώ επίλεξε τη νέα χρονοσήμανση του νήματος. Οι αναρτήσεις του νήματος θα ενημερωθούν ώστε να έχουν την ίδια διαφορά ώρας."
       multi_select:
         select: "επίλεξε"
-        selected: "επιλεγμένες ({{count}})"
+        selected: "επιλεγμένες (%{count})"
         select_post:
           label: "επίλεξε"
         select_replies:
@@ -1636,16 +1639,16 @@ el:
         deselect_all: απεπιλογή όλων
         description:
           one: Έχεις επιλέξει <b>%{count}</b> ανάρτηση.
-          other: "Έχεις επιλέξει <b>{{count}}</b> αναρτήσεις."
+          other: "Έχεις επιλέξει <b>%{count}</b> αναρτήσεις."
     post:
       quote_reply: "Παράθεση"
       edit_reason: "Αιτία:"
-      post_number: "ανάρτηση {{number}}"
+      post_number: "ανάρτηση %{number}"
       wiki_last_edited_on: "το βίκι επεξεργάστηκε τελευταία φορά στις"
       last_edited_on: "η ανάρτηση επεξεργάστηκε τελευταία φορά στις"
       reply_as_new_topic: "Απάντηση με διασυνδεδεμένο νήμα"
       reply_as_new_private_message: "Απάντηση ως νέο μήνυμα στον ίδιο παραλήπτη"
-      continue_discussion: "Συνέχιση της συζήτησης από το {{postLink}}:"
+      continue_discussion: "Συνέχιση της συζήτησης από το %{postLink}:"
       follow_quote: "πήγαινε στην παρατεθειμένη ανάρτηση"
       show_full: "Δείξε Πλήρη Ανάρτηση "
       deleted_by_author:
@@ -1654,24 +1657,24 @@ el:
       expand_collapse: "επέκταση/σύμπτυξη"
       gap:
         one: "δες %{count} κρυφή απάντηση"
-        other: "δες {{count}} κρυφές απαντήσεις"
+        other: "δες %{count} κρυφές απαντήσεις"
       unread: "Η ανάρτηση δεν έχει διαβαστεί"
       has_replies:
-        one: "{{count}} Απάντηση"
-        other: "{{count}} Απαντήσεις"
+        one: "%{count} Απάντηση"
+        other: "%{count} Απαντήσεις"
       has_likes_title:
         one: "%{count} άτομο πάτησε \"μου αρέσει\" στη δημοσίευση"
-        other: "{{count}} άτομα πάτησαν \"Μου αρέσει\" στην ανάρτηση"
+        other: "%{count} άτομα πάτησαν \"Μου αρέσει\" στην ανάρτηση"
       has_likes_title_only_you: "σου αρέσει αυτή η ανάρτηση"
       has_likes_title_you:
         one: "εσύ και %{count} άλλο άτομο πάτησε \"Μου αρέσει\" στη δημοσίευση"
-        other: "εσύ και {{count}} ακόμα άτομα πατήσατε \"Μου αρέσει\" στην ανάρτηση"
+        other: "εσύ και %{count} ακόμα άτομα πατήσατε \"Μου αρέσει\" στην ανάρτηση"
       errors:
         create: "Λυπούμαστε, παρουσιάστηκε σφάλμα κατά την δημιουργία της ανάρτησης. Προσπάθησε πάλι."
         edit: "Λυπούμαστε, παρουσιάστηκε σφάλμα κατά την επεξεργασία της ανάρτησης. Προσπάθησε πάλι."
         upload: "Λυπούμαστε, παρουσιάστηκε σφάλμα κατά το ανέβασμα του αρχείου. Προσπάθησε πάλι."
         too_many_uploads: "Λυπούμαστε, μπορείς να ανεβάζεις μόνο ένα αρχείο τη φορά."
-        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: "Λυπούμαστε, για να κατεβάσεις συνημμένα αρχεία, πρέπει πρώτα να συνδεθείς."
@@ -1733,8 +1736,8 @@ el:
           notify_user: "έστειλαν ένα μήνυμα"
           bookmark: "έβαλαν σελιδοδείκτη"
           like_capped:
-            one: "και {{count}} άλλος το άρεσε αυτό "
-            other: "και {{count}} άλλοι το άρεσαν αυτό "
+            one: "και %{count} άλλος το άρεσε αυτό "
+            other: "και %{count} άλλοι το άρεσαν αυτό "
         by_you:
           off_topic: "Το επισήμανες σαν εκτός θέματος"
           spam: "Το επισήμανες σαν ανεπιθύμητο"
@@ -1746,7 +1749,7 @@ el:
       merge:
         confirm:
           one: "Είσαι σίγουρος πως θέλεις να συγχωνεύσεις αυτές τις δημοσιεύσεις;"
-          other: "Είσαι σίγουρος πως θέλεις να συγχωνεύσεις αυτές τις {{count}} αναρτήσεις;"
+          other: "Είσαι σίγουρος πως θέλεις να συγχωνεύσεις αυτές τις %{count} αναρτήσεις;"
       revisions:
         controls:
           first: "Πρώτη αναθεώρηση"
@@ -1904,13 +1907,13 @@ el:
       custom_message:
         at_least:
           one: "βάλε τουλάχιστον %{count} χαρακτήρα"
-          other: "γράψε τουλάχιστον {{count}} χαρακτήρες"
+          other: "γράψε τουλάχιστον %{count} χαρακτήρες"
         more:
           one: "%{count} να πας..."
-          other: "{{count}} ακόμα..."
+          other: "%{count} ακόμα..."
         left:
           one: "%{count} απομένει"
-          other: "{{count}} απομένουν"
+          other: "%{count} απομένουν"
     flagging_topic:
       title: "Ευχαριστούμε για τη συνεισφρορά σου..."
       action: "Επισήμανση Νήματος"
@@ -1951,7 +1954,7 @@ el:
       unlisted:
         help: "Αυτό το νήμα είναι αόρατο. Δε θα εμφανίζεται σε καμια λίστα νημάτων και μπορεί να εμφανιστεί μόνο αν ακολουθήσεις ένα άμεσο σύνδεσμο προς αυτό."
     posts: "Αναρτήσεις"
-    posts_long: "υπάρχουν {{number}} αναρτήσεις σε αυτό το νήμα"
+    posts_long: "υπάρχουν %{number} αναρτήσεις σε αυτό το νήμα"
     posts_likes_MF: |2
 
       Αυτό το νήμα έχει {count, plural, one {1 απάντηση} other {# απαντήσεις}} {ratio, select,
@@ -1971,20 +1974,20 @@ el:
     replies: "Απαντήσεις"
     views_long:
       one: "αυτό το νήμα έχει προβληθεί %{count} φορά"
-      other: "αυτό το νήμα έχει προβληθεί {{number}} φορές"
+      other: "αυτό το νήμα έχει προβληθεί %{number} φορές"
     activity: "Δραστηριότητα"
     likes: "«Μου αρέσει»"
     likes_lowercase:
       one: "μου αρέσει"
       other: "μου αρέσει"
-    likes_long: "υπάρχουν {{number}} «μου αρέσει» σε αυτό το νήμα"
+    likes_long: "υπάρχουν %{number} «μου αρέσει» σε αυτό το νήμα"
     users: "Χρήστες"
     users_lowercase:
       one: "χρήστης"
       other: "χρήστες"
     category_title: "Κατηγορία"
     history: "Ιστορικό"
-    changed_by: "του/της {{author}}"
+    changed_by: "του/της %{author}"
     raw_email:
       title: "Εισερχόμενα email"
       not_available: "Μη διαθέσιμο!"
@@ -1996,33 +1999,33 @@ el:
         title: "Τελευταία"
         title_with_count:
           one: "Τελευταία (%{count})"
-          other: "Τελευταία ({{count}})"
+          other: "Τελευταία (%{count})"
         help: "νήματα με πρόσφατες αναρτήσεις"
       read:
         title: "Διαβασμένα"
         help: "νήματα που έχεις διαβάσει, με τη σειρά που τα έχεις διαβάσει"
       categories:
         title: "Κατηγορίες"
-        title_in: "Κατηγορία - {{categoryName}}"
+        title_in: "Κατηγορία - %{categoryName}"
         help: "όλα τα νήματα ομαδοποιημένα ανά κατηγορία"
       unread:
         title: "Αδιάβαστα"
         title_with_count:
           one: "Μη αναγνωσμένα (%{count})"
-          other: "Αδιάβαστα ({{count}})"
+          other: "Αδιάβαστα (%{count})"
         help: "νήματα που επιτηρείς ή παρακολουθείς και που έχουν αδιάβαστες αναρτήσεις"
         lower_title_with_count:
           one: "%{count} μη αναγνωσμένο"
-          other: "{{count}} αδιάβαστα"
+          other: "%{count} αδιάβαστα"
       new:
         lower_title_with_count:
           one: "%{count} νέο"
-          other: "{{count}} νέα"
+          other: "%{count} νέα"
         lower_title: "νέα"
         title: "Νέα"
         title_with_count:
           one: "Νέα (%{count})"
-          other: "Νέα ({{count}})"
+          other: "Νέα (%{count})"
         help: "νήματα που δημιουργήθηκαν τις προηγούμενες μέρες"
       posted:
         title: "Οι αναρτήσεις μου"
@@ -2031,11 +2034,11 @@ el:
         title: "Σελιδοδείκτες"
         help: "νήματα στα οποία έχεις βάλει σελιδοδείκτη"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "τελευταία νήματα στην κατηγορία {{categoryName}} "
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "τελευταία νήματα στην κατηγορία %{categoryName} "
       top:
         title: "Κορυφαία"
         help: "τα πιο ενεργά νήματα τον τελευταίο χρόνο, μήνα, εβδομάδα ή μέρα"
@@ -2155,7 +2158,7 @@ el:
       delete_tag: "Αφαίρεση Ετικέτας"
       delete_confirm:
         one: "Είσαι βέβαιος πως θέλεις να διαγράψεις αυτήν την ετικέτα και να την αφαιρέσεις από το %{count} νήμα στο οποίο είναι προσαρτημένη;"
-        other: "Είσαι βέβαιος πως θέλεις να διαγράψεις αυτήν την ετικέτα και να την αφαιρέσεις από τα {{count}} νήματα στα οποία είναι προσαρτημένη;"
+        other: "Είσαι βέβαιος πως θέλεις να διαγράψεις αυτήν την ετικέτα και να την αφαιρέσεις από τα %{count} νήματα στα οποία είναι προσαρτημένη;"
       delete_confirm_no_topics: "Είσαι βέβαιος πως θέλεις να διαγράψεις αυτήν την ετικέτα;"
       rename_tag: "Μετονομασία Ετικέτας"
       rename_instructions: "Επίλεξε ένα καινούριο όνομα για την ετικέτα:"
@@ -2386,10 +2389,10 @@ el:
           redeliver: "Διανομή ξανά"
           incoming:
             one: "Υπάρχει μία καινούρια εκδήλωση."
-            other: "Υπάρχουν {{count}} καινούρια γεγονότα."
+            other: "Υπάρχουν %{count} καινούρια γεγονότα."
           completed_in:
             one: "Ολοκληρώνεται σε %{count} δευτερόλεπτο."
-            other: "Ολοκληρώθηκε σε {{count}} δευτερόλεπτα."
+            other: "Ολοκληρώθηκε σε %{count} δευτερόλεπτα."
           request: "Αίτημα"
           response: "Απάντηση"
           redeliver_confirm: "Είστε σιγουρος/η ότι θέλετε να παραδώσετε εκ νέου το ίδιο payload;"
@@ -2440,10 +2443,10 @@ el:
           label: "Ανέβασμα"
           title: "Ανέβασε ένα αντίγραφο ασφαλείας για αυτό το στιγμιότυπο"
           uploading: "Ανεβαίνει..."
-          error: "Παρουσιάστηκε ένα σφάλμα κατά το ανέβασμα του '{{filename}}': {{message}}"
+          error: "Παρουσιάστηκε ένα σφάλμα κατά το ανέβασμα του '%{filename}': %{message}"
         operations:
           is_running: "Αυτή τη στιγμή εκτελείται μια λειτουργία..."
-          failed: "Η λειτουργία '{{operation}}' απέτυχε. Έλεγξε τα αρχεία καταγραφής."
+          failed: "Η λειτουργία '%{operation}' απέτυχε. Έλεγξε τα αρχεία καταγραφής."
           cancel:
             label: "Άκυρο"
             title: "Ακύρωση της τρέχουσας λειτουργίας"
@@ -2551,7 +2554,7 @@ el:
           add: "Προσθήκη"
           commits_behind:
             one: "Το θέμα είναι %{count} έκδοση πίσω!"
-            other: "Το θέμα είναι {{count}} εκδόσεις πίσω!"
+            other: "Το θέμα είναι %{count} εκδόσεις πίσω!"
           scss:
             text: "CSS"
             title: "Καταχώρησε custom CSS, γίνονται δεκτά όλα τα valid CSS και SCSS styles"
@@ -2852,8 +2855,8 @@ el:
           title: "Εμφάνισε το email αυτού του χρήστη"
           text: "Εμφάνιση"
       user:
-        suspend_failed: "Κάποιο λάθος εμφανίστηκε κατά την αποβολή αυτού του χρήστη {{error}}"
-        unsuspend_failed: "Κάτι πήγε στραβά κατά την αναίρεση της αποβολής αυτού του χρήστη {{error}}"
+        suspend_failed: "Κάποιο λάθος εμφανίστηκε κατά την αποβολή αυτού του χρήστη %{error}"
+        unsuspend_failed: "Κάτι πήγε στραβά κατά την αναίρεση της αποβολής αυτού του χρήστη %{error}"
         suspend_duration: "Πόσο χρονικό διάστημα θα κρατήσει η αποβολή του χρήστη;"
         suspend_reason_label: "Γιατί αποβάλεις τον χρήστη; Αυτό το κείμενο <b>θα είναι ορατό σε όλους</b> στη σελίδα προφίλ αυτού του χρήστη και θα εμφανίζεται στο χρήστη όταν αυτός προσπαθήσει να συνδεθεί. Φρόντισε να είναι σύντομο."
         suspend_reason_hidden_label: "Ποιος είναι ο λόγος της αποβολής; Το κείμενο αυτό θα εμφανίζεται στον χρήστη όταν προσπαθήσει να συνδεθεί. Φροντίστε να είναι σύντομο."
@@ -3162,6 +3165,7 @@ el:
         title: "Emoji"
         help: "Πρόσθεσε ένα νέο emoji που θα είναι διαθέσιμο σε όλους. (Συμβουλή: μπορείς να σύρεις πολλά αρχεία ταυτόχρονα)"
         add: "Προσθήκη νέου emoji"
+        uploading: "Ανεβαίνει..."
         name: "Όνομα"
         group: "Ομάδα"
         image: "Εικόνα"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 8f57fd3760..b90248cf8b 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -23,10 +23,11 @@ es:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "HH:mm"
+      time_with_zone: "HH:mm (z)"
       time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
       long_no_year: "D MMM, HH:mm"
@@ -226,11 +227,11 @@ es:
     weekly: "semanalmente"
     every_month: "cada mes"
     every_six_months: "cada seis meses"
-    max_of_count: "máximo de {{count}}"
+    max_of_count: "máximo de %{count}"
     alternation: "o"
     character_count:
-      one: "{{count}} carácter"
-      other: "{{count}} caracteres"
+      one: "%{count} carácter"
+      other: "%{count} caracteres"
     related_messages:
       title: " Mensajes relacionados"
       see_all: 'Ver <a href="%{path}">todos los mensajes</a> de @%{username}...'
@@ -263,6 +264,7 @@ es:
         unbookmark: "Haz clic para eliminar todos los marcadores en este tema"
         unbookmark_with_reminder: "Haz clic para quitar todos los marcadores y recordatorios en este tema. Tienes un recordatorio puesto %{reminder_at} para este tema."
     bookmarks:
+      created: "has guardado esta publicación en marcadores%{name}"
       not_bookmarked: "marcar esta publicación"
       remove: "Eliminar marcador"
       delete: "Borrar marcador"
@@ -288,6 +290,8 @@ es:
         tomorrow_with_time: "mañana a las %{time}"
         at_time: "a las %{date_time}"
         existing_reminder: "Tienes un recordatorio puesto para este marcador que será enviado"
+    copy_codeblock:
+      copied: "¡copiado!"
     drafts:
       resume: "Reanudar"
       remove: "Eliminar"
@@ -299,14 +303,14 @@ es:
         yes_value: "Sí, abandonar"
         no_value: "No, mantener"
     topic_count_latest:
-      one: "Ver {{count}} tema nuevo o actualizado"
-      other: "Ver {{count}} temas nuevos o actualizados"
+      one: "Ver %{count} tema nuevo o actualizado"
+      other: "Ver %{count} temas nuevos o actualizados"
     topic_count_unread:
-      one: "Ver {{count}} tema sin leer"
-      other: "Ver {{count}} temas no leídos"
+      one: "Ver %{count} tema sin leer"
+      other: "Ver %{count} temas no leídos"
     topic_count_new:
-      one: "Ver {{count}} tema nuevo"
-      other: "Ver {{count}} temas nuevos"
+      one: "Ver %{count} tema nuevo"
+      other: "Ver %{count} temas nuevos"
     preview: "vista previa"
     cancel: "cancelar"
     save: "Guardar cambios"
@@ -314,7 +318,7 @@ es:
     saved: "¡Guardado!"
     upload: "Subir"
     uploading: "Subiendo..."
-    uploading_filename: "Subiendo: {{filename}}..."
+    uploading_filename: "Subiendo: %{filename}..."
     clipboard: "portapapeles"
     uploaded: "¡Subido!"
     pasting: "Pegando..."
@@ -368,7 +372,7 @@ es:
         optional: "Puedes reclamar este artículo para evitar que otros lo revisen."
         required: "Debes reclamar los artículos antes de poder revisarlos."
         claimed_by_you: "Has reclamado este artículo y puedes revisarlo."
-        claimed_by_other: "Este artículo solo puede ser revisado por <b>{{username}}</b>."
+        claimed_by_other: "Este artículo solo puede ser revisado por <b>%{username}</b>."
       claim:
         title: "reclamar este tema"
       unclaim:
@@ -388,7 +392,7 @@ es:
       view_pending: "ver pendiente"
       topic_has_pending:
         one: "Este tema tiene <b>%{count}</b> publicación esperando aprobación"
-        other: "Este tema tiene <b>{{count}}</b> publicaciones pendientes de aprobación"
+        other: "Este tema tiene <b>%{count}</b> publicaciones pendientes de aprobación"
       title: "Revisión"
       topic: "Tema:"
       filtered_topic: "Has filtrado a contenido revisable en un solo tema."
@@ -405,17 +409,17 @@ es:
         fields: "Campos"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}}, ({{count}} reporte en total)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} reportes totales)"
+          one: "%{agreed}, %{disagreed}, %{ignored}, (%{count} reporte en total)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} reportes totales)"
         agreed:
-          one: "{{count}}% de acuerdo"
-          other: "{{count}}% de acuerdo"
+          one: "%{count}% de acuerdo"
+          other: "%{count}% de acuerdo"
         disagreed:
-          one: "{{count}}% en desacuerdo"
-          other: "{{count}}% en desacuerdo"
+          one: "%{count}% en desacuerdo"
+          other: "%{count}% en desacuerdo"
         ignored:
-          one: "{{count}}% ignorado"
-          other: "{{count}}% ignorados"
+          one: "%{count}% ignorado"
+          other: "%{count}% ignorados"
       topics:
         topic: "Tema"
         reviewable_count: "Cantidad"
@@ -425,10 +429,10 @@ es:
         details: "detalles"
         unique_users:
           one: "%{count} usuario"
-          other: "{{count}} usuarios"
+          other: "%{count} usuarios"
       replies:
         one: "%{count} respuest"
-        other: "{{count}} respuestas"
+        other: "%{count} respuestas"
       edit: "Editar"
       save: "Guardar"
       cancel: "Cancelar"
@@ -444,6 +448,7 @@ es:
         category: "Categoría"
         orders:
           score: "Puntuación"
+          score_asc: "Puntuación (orden inverso)"
           created_at: "Creado el"
           created_at_asc: "Creado el (inverso)"
         priority:
@@ -491,22 +496,22 @@ es:
         description: "Hemos recibido tu nueva publicación, pero debe ser aprobada por un moderador antes de que aparezca. Por favor, sé paciente."
         pending_posts:
           one: "Tienes <strong>%{count}</strong> publicación pendiente."
-          other: "Tienes <strong>{{count}}</strong> publicaciones pendientes."
+          other: "Tienes <strong>%{count}</strong> publicaciones pendientes."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> publicó <a href='{{topicUrl}}'>el tema</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Tú</a> publicaste <a href='{{topicUrl}}'>el tema</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> respondió a <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Tú</a> respondiste a <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> respondió a <a href='{{topicUrl}}'>el tema</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Tú</a> respondiste a <a href='{{topicUrl}}'>el tema</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> mencionó a <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> <a href='{{user2Url}}'>te mencionó</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Tú</a> mencionaste a <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Publicado por <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Publicado por <a href='{{userUrl}}'>ti</a>"
-      sent_by_user: "Enviado por <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Enviado por <a href='{{userUrl}}'>ti</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> publicó <a href='%{topicUrl}'>el tema</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Tú</a> publicaste <a href='%{topicUrl}'>el tema</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> respondió a <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Tú</a> respondiste a <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> respondió a <a href='%{topicUrl}'>el tema</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Tú</a> respondiste a <a href='%{topicUrl}'>el tema</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> mencionó a <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> <a href='%{user2Url}'>te mencionó</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Tú</a> mencionaste a <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Publicado por <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Publicado por <a href='%{userUrl}'>ti</a>"
+      sent_by_user: "Enviado por <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Enviado por <a href='%{userUrl}'>ti</a>"
     directory:
       filter_name: "filtrar por nombre de usuario"
       title: "Usuarios"
@@ -671,12 +676,16 @@ es:
           title: "Silenciado"
           description: "No se te notificará nada sobre los mensajes en este grupo."
       flair_url: "Imagen del sub-avatar"
+      flair_upload_description: "Usa imágenes cuadradas de al menos 20px por 20px"
       flair_bg_color: "Color de fondo del sub-avatar"
       flair_bg_color_placeholder: "(Opcional) Valor de color hexadecimal"
       flair_color: "Color del sub-avatar"
       flair_color_placeholder: "(Opcional) Valor de color hexadecimal"
       flair_preview_icon: "Previsualización del icono"
       flair_preview_image: "Previsualización de la imagen"
+      flair_type:
+        icon: "Selecciona un icono"
+        image: "Sube una imagen"
     user_action_groups:
       "1": "Me gusta dados"
       "2": "Me gusta recibidos"
@@ -732,14 +741,15 @@ es:
       trust_level: "NC"
       read_time: "tiempo de lectura"
       topics_entered: "temas ingresados"
-      post_count: "# posts"
+      post_count: "nº de publicaciones"
       confirm_delete_other_accounts: "¿Estás seguro de que quieres eliminar estas cuentas?"
       powered_by: "usando <a href='https://maxmind.com'>MaxMindDB</a>"
       copied: "copiado"
     user_fields:
       none: "(selecciona una opción)"
+      required: 'Por favor, introduce un valor para "%{name}"'
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Perfil"
       mute: "Silenciar"
       edit: "Editar Preferencias"
@@ -753,6 +763,7 @@ es:
       private_messages: "Mensajes"
       user_notifications:
         filters:
+          filter_by: "Filtrar por"
           all: "Todo"
           read: "Leídos"
           unread: "Sin leer"
@@ -814,12 +825,12 @@ es:
       enable_defer: "Activar diferir para marcar temas no leídos"
       change: "cambio"
       featured_topic: "Tema destacado"
-      moderator: "{{user}} es un moderador"
-      admin: "{{user}} es un administrador"
+      moderator: "%{user} es un moderador"
+      admin: "%{user} es un administrador"
       moderator_tooltip: "Este usuario es un moderador"
       admin_tooltip: "Este usuario es un administrador"
       silenced_tooltip: "Este usuario está silenciado"
-      suspended_notice: "Este usuario ha sido suspendido hasta {{date}}."
+      suspended_notice: "Este usuario ha sido suspendido hasta %{date}."
       suspended_permanently: "Este usuario está suspendido."
       suspended_reason: "Causa: "
       github_profile: "Github"
@@ -832,7 +843,7 @@ es:
           Los temas y categorías silenciados no se incluyen en estos correos electrónicos.
         individual: "Enviar un correo electrónico por cada publicación nueva"
         individual_no_echo: "Enviar un correo electrónico por cada publicación nueva excepto aquellas publicadas por mí"
-        many_per_day: "Envíame un correo electrónico por cada publicación nueva (unos {{dailyEmailEstimate}} por día)"
+        many_per_day: "Envíame un correo electrónico por cada publicación nueva (unos %{dailyEmailEstimate} por día)"
         few_per_day: "Envíame un correo electrónico por cada publicación nueva (unos 2 por día)"
         warning: "Modo de lista de correo habilitado. La configuración de notificaciones por correo electrónico está anulada."
       tag_settings: "Etiquetas"
@@ -862,9 +873,7 @@ es:
       admin_delete: "Eliminar"
       users: "Usuarios"
       muted_users: "Silenciados"
-      muted_users_instructions: "Omite todas las notificaciones de estos usuarios."
       ignored_users: "Ignorados"
-      ignored_users_instructions: "Omitir todas las publicaciones y mensajes de estos usuarios."
       tracked_topics_link: "Mostrar"
       automatically_unpin_topics: "Dejar de destacar temas automáticamente cuando los leo por completo."
       apps: "Aplicaciones"
@@ -873,6 +882,7 @@ es:
       api_approved: "Fecha de aprobación:"
       api_last_used_at: "Fecha de último uso:"
       theme: "Tema"
+      save_to_change_theme: 'Este tema se actualizará después de que pulses "%{save_text}"'
       home: "Página de inicio por defecto"
       staged: "Temporal"
       staff_counters:
@@ -919,11 +929,12 @@ es:
         disable: "Habilitar"
         enable: "Deshabilitar"
         enable_long: "Habilitar códigos de respaldo"
-        manage: "Administrar los códigos de respaldo. Tienes <strong>{{count}}</strong> códigos de respaldo restantes."
+        manage: "Administrar los códigos de respaldo. Tienes <strong>%{count}</strong> códigos de respaldo restantes."
         copy_to_clipboard: "Copiar al portapapeles"
         copy_to_clipboard_error: "Error al copiar datos al portapapeles"
         copied_to_clipboard: "Copiado al portapapeles"
-        remaining_codes: "Tienes <strong>{{count}}</strong> códigos de respaldo restantes."
+        download_backup_codes: "Descargar códigos de recuperación"
+        remaining_codes: "Tienes <strong>%{count}</strong> códigos de respaldo restantes."
         use: "Usar un código de respaldo"
         enable_prerequisites: "Debes habilitar un segundo factor primario antes de generar códigos de respaldo."
         codes:
@@ -956,11 +967,13 @@ es:
         edit_description: "Nombre del segundo factor"
         totp:
           title: "Autenticación basada en tokens"
+          add: "Añadir autentificador"
           default_name: "Mi autenticador"
           name_and_code_required_error: "Debes introducir un nombre y un código de tu aplicación de autentificación."
         security_key:
           register: "Registrar"
           title: "Claves de seguridad"
+          add: "Añadir clave de seguridad"
           default_name: "Clave de seguridad principal"
           not_allowed_error: "El proceso de registro de clave de seguridad fue cancelado o se agotó el tiempo."
           already_added_error: "Ya registraste esta clave de seguridad. No tienes que registrarla de nuevo."
@@ -984,10 +997,10 @@ es:
         success_staff: "Hemos enviado un correo electrónico a tu dirección actual. Por favor, sigue las instrucciones de confirmación."
       change_avatar:
         title: "Cambiar tu imagen de perfil"
-        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, basado en"
-        gravatar_title: "Cambia tu avatar en la pagina web de {{gravatarName}}"
-        gravatar_failed: "No pudimos encontrar un {{gravatarName}} con esa dirección de correo electrónico."
-        refresh_gravatar_title: "Actualiza tu {{gravatarName}}"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, basado en"
+        gravatar_title: "Cambia tu avatar en la pagina web de %{gravatarName}"
+        gravatar_failed: "No pudimos encontrar un %{gravatarName} con esa dirección de correo electrónico."
+        refresh_gravatar_title: "Actualiza tu %{gravatarName}"
         letter_based: "Imagen de perfil asignada por el sistema"
         uploaded_avatar: "Foto personalizada"
         uploaded_avatar_empty: "Agrega una foto personalizada"
@@ -1010,12 +1023,13 @@ es:
         sso_override_instructions: "El correo electrónico puede actualizarse desde el proveedor de SSO."
         instructions: "Nunca se mostrará al público."
         ok: "Te enviaremos un correo electrónico para confirmar"
+        required: "Por favor, introduce un correo electrónico"
         invalid: "Por favor, ingresa una dirección de correo electrónico válida"
-        authenticated: "Tu  correo electrónico ha sido autenticado por {{provider}}"
+        authenticated: "Tu  correo electrónico ha sido autenticado por %{provider}"
         frequency_immediately: "Te enviaremos un correo electrónico inmediatamente si no has leído el asunto por el cual te estamos enviando el correo."
         frequency:
           one: "Sólo te enviaremos emails si no te hemos visto en el último minuto."
-          other: "Solo te enviaremos un correo electrónico si no te hemos visto en los últimos {{count}} minutos."
+          other: "Solo te enviaremos un correo electrónico si no te hemos visto en los últimos %{count} minutos."
       associated_accounts:
         title: "Cuentas asociadas"
         connect: "Conectar"
@@ -1030,19 +1044,21 @@ es:
         title: "Nombre"
         instructions: "tu nombre completo (opcional)"
         instructions_required: "Tu nombre completo"
+        required: "Por favor, introduce un numbre"
         too_short: "Tu nombre es demasiado corto"
         ok: "Tu nombre se ve adecuado"
       username:
         title: "Nombre de usuario"
         instructions: "único, sin espacios y corto"
-        short_instructions: "Los demás usuarios pueden mencionarte como @{{username}}"
+        short_instructions: "Los demás usuarios pueden mencionarte como @%{username}"
         available: "Tu nombre de usuario está disponible"
-        not_available: "No disponible. ¿Deseas intentar {{suggestion}}?"
+        not_available: "No disponible. ¿Deseas intentar %{suggestion}?"
         not_available_no_suggestion: "No disponible"
         too_short: "Tu nombre de usuario es demasiado corto"
         too_long: "Tu nombre de usuario es demasiado largo"
         checking: "Comprobando la disponibilidad del nombre de usuario..."
         prefilled: "El correo electrónico coincide con el nombre de usuario registrado"
+        required: "Por favor, introduce un nombre de usuari"
       locale:
         title: "Idioma de la interfaz"
         instructions: "Idioma de la interfaz. Cambiará cuando recargues la página."
@@ -1060,11 +1076,11 @@ es:
         log_out_all: "Cerrar sesión en todos los dispositivos"
         active: "activo ahora"
         not_you: "¿No eres tú?"
-        show_all: "Mostrar todos ({{count}})"
+        show_all: "Mostrar todos (%{count})"
         show_few: "Mostrar menos"
         was_this_you: "¿Fuiste tú?"
         was_this_you_description: "Si no fuiste tú, te recomendamos que cambies tu contraseña y cierres sesión en todos los dispositivos."
-        browser_and_device: "{{browser}} en {{device}}"
+        browser_and_device: "%{browser} en %{device}"
         secure_account: "Asegurar mi cuenta"
         latest_post: "Publicaste por última vez..."
       last_posted: "Última publicación"
@@ -1144,20 +1160,19 @@ es:
         none: "Sin invitaciones para mostrar."
         truncated:
           one: "Mostrando la primera invitación."
-          other: "Mostrando las primeras {{count}} invitaciones."
+          other: "Mostrando las primeras %{count} invitaciones."
         redeemed: "Invitaciones aceptadas"
         redeemed_tab: "Aceptada"
-        redeemed_tab_with_count: "Aceptadas ({{count}})"
+        redeemed_tab_with_count: "Aceptadas (%{count})"
         redeemed_at: "Aceptada"
         pending: "Invitaciones pendientes"
         pending_tab: "Pendiente"
-        pending_tab_with_count: "Pendientes ({{count}})"
+        pending_tab_with_count: "Pendientes (%{count})"
         topics_entered: "Temas vistos"
         posts_read_count: "Publicaciones leídas"
         expired: "Esta invitación ha caducado."
         rescind: "Eliminar"
         rescinded: "Invitación eliminada"
-        rescind_all: "Eliminar todas las invitaciones expiradas"
         rescinded_all: "¡Todas las invitaciones expiradas se han eliminado!"
         rescind_all_confirm: "¿Estás seguro de querer eliminar todas las invitaciones expiradas?"
         reinvite: "Reenviar Invitación"
@@ -1168,13 +1183,18 @@ es:
         time_read: "Tiempo de lectura"
         days_visited: "Días visitados"
         account_age_days: "Antigüedad de la cuenta en días"
-        create: "Enviar una invitación"
+        links_tab: "Enlaces"
+        link_created_at: "Creado"
+        link_groups: Grupos
+        create: "Enviar invitación"
         generate_link: "Copiar enlace de invitación"
         link_generated: "¡Enlace de invitación generado satisfactoriamente!"
         valid_for: "El enlace de invitación solo es válido para esta dirección de correo electrónico: %{email}"
+        single_user: "Un usuario"
+        invite_link:
+          success: "¡Enlace de invitación generado satisfactoriamente!"
         bulk_invite:
           none: "No has invitado a nadie aún. Puedes enviar invitaciones individuales o invitar a varias personas a la vez <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>subiendo un archivo CVS</a>."
-          text: "Invitación masiva desde archivo"
           success: "Archivo subido correctamente, se te notificará mediante un mensaje cuando se complete el proceso."
           error: "Lo sentimos, el formato del archivo debe ser CSV. "
           confirmation_message: "Estás a punto de enviar invitaciones por correo electrónico a todas las direcciones en el archivo subido."
@@ -1186,6 +1206,7 @@ es:
         same_as_email: "Tu contraseña es la misma que tu correo electrónico."
         ok: "Tu contraseña es válida."
         instructions: "debe tener al menos %{count} caracteres"
+        required: "Por favor, introduce una contraseña"
       summary:
         title: "Resumen"
         stats: "Estadísticas"
@@ -1265,7 +1286,7 @@ es:
       desc:
         network: "Por favor, revisa tu conexión."
         network_fixed: "Parece que ha vuelto."
-        server: "Código de error: {{status}}"
+        server: "Código de error: %{status}"
         forbidden: "No tienes permitido ver esto."
         not_found: "¡Ups! La aplicación intentó cargar una URL inexistente."
         unknown: "Algo salió mal."
@@ -1310,6 +1331,7 @@ es:
     mute: Silenciar
     unmute: No silenciar
     last_post: Publicado
+    local_time: "Hora local"
     time_read: Leído
     time_read_recently: "%{time_read} recientemente"
     time_read_tooltip: "%{time_read} tiempo de lectura total"
@@ -1327,8 +1349,8 @@ es:
       value_prop: "Cuando creas una cuenta, recordamos exactamente lo que has leído de modo que puedas retomar lo que leías justo donde lo dejaste. También recibes notificaciones, por aquí y por correo electrónico, cuando alguien responde a tus mensajes. ¡También puedes darle «me gusta» a los mensajes para compartir amor! :heartpulse:"
     summary:
       enabled_description: "Estás viendo un resumen de este tema: las publicaciones más interesantes de acuerdo a la comunidad."
-      description: "Hay <b>{{replyCount}}</b> respuestas."
-      description_time: "Hay <b>{{replyCount}}</b> respuestas con un tiempo de lectura estimado de <b>{{readingTime}} minutos</b>."
+      description: "Hay <b>%{replyCount}</b> respuestas."
+      description_time: "Hay <b>%{replyCount}</b> respuestas con un tiempo de lectura estimado de <b>%{readingTime} minutos</b>."
       enable: "Resumir este tema"
       disable: "Ver todas las publicaciones"
     deleted_filter:
@@ -1341,8 +1363,8 @@ es:
       invite: "Invitar a otros..."
       edit: "Añadir o quitar..."
       leave_message: "¿Estás seguro de que quieres abandonar este mensaje?"
-      remove_allowed_user: "¿Estás seguro de que quieres eliminar a {{name}} de este mensaje?"
-      remove_allowed_group: "¿Estás seguro de que quieres eliminar a {{name}} de este mensaje?"
+      remove_allowed_user: "¿Estás seguro de que quieres eliminar a %{name} de este mensaje?"
+      remove_allowed_group: "¿Estás seguro de que quieres eliminar a %{name} de este mensaje?"
     email: "Correo electrónico"
     username: "Nombre de usuario"
     last_seen: "Visto por última vez"
@@ -1351,7 +1373,7 @@ es:
     trust_level: "Nivel de confianza"
     search_hint: "usuario, correo electrónico o dirección IP"
     create_account:
-      disclaimer: "Al registrarte aceptas la <a href='{{privacy_link}}' target='blank'>Política de privacidad</a> y los <a href='{{tos_link}}' target='blank'>Términos de servicio</a>."
+      disclaimer: "Al registrarte aceptas la <a href='%{privacy_link}' target='blank'>Política de privacidad</a> y los <a href='%{tos_link}' target='blank'>Términos de servicio</a>."
       title: "Crear cuenta nueva"
       failed: "Algo salió mal. Quizás este correo electrónico ya se encuentra registrado. Intenta con el enlace «olvidé la contraseña»"
     forgot_password:
@@ -1411,7 +1433,7 @@ es:
       awaiting_activation: "Tu cuenta está pendiente de activación, usa el enlace de «olvidé contraseña» para recibir otro correo electrónico de activación."
       awaiting_approval: "Tu cuenta todavía no ha sido aprobada por un miembro del staff. Recibirás un correo electrónico cuando sea aprobada."
       requires_invite: "Lo sentimos, solo se puede acceder a este foro mediante invitación."
-      not_activated: "No puedes iniciar sesión todavía. Anteriormente te hemos enviado un correo electrónico de activación a la dirección <b>{{sentTo}}</b>. Por favor, sigue las instrucciones que allí se encuentran para activar tu cuenta."
+      not_activated: "No puedes iniciar sesión todavía. Anteriormente te hemos enviado un correo electrónico de activación a la dirección <b>%{sentTo}</b>. Por favor, sigue las instrucciones que allí se encuentran para activar tu cuenta."
       not_allowed_from_ip_address: "No puedes iniciar sesión desde esa dirección IP."
       admin_not_allowed_from_ip_address: "No puedes iniciar sesión como administrador desde esta dirección IP."
       resend_activation_email: "Has clic aquí para enviar el correo electrónico de activación nuevamente."
@@ -1420,7 +1442,7 @@ es:
       change_email: "Cambiar dirección de correo electrónico"
       provide_new_email: "Ingresa una dirección de correo electrónico nueva y te reenviaremos el correo electrónico de confirmación."
       submit_new_email: "Actualizar dirección de correo electrónico"
-      sent_activation_email_again: "Te hemos enviado otro correo electrónico de activación a <b>{{currentEmail}}</b>. Podría tardar algunos minutos en llegar; asegúrate de revisar la carpeta de correo no deseado."
+      sent_activation_email_again: "Te hemos enviado otro correo electrónico de activación a <b>%{currentEmail}</b>. Podría tardar algunos minutos en llegar; asegúrate de revisar la carpeta de correo no deseado."
       sent_activation_email_again_generic: "Te hemos enviado otro correo  electrónico de activación. Podría tardar algunos minutos en llegar. Asegúrate de revisar la carpeta de correo no deseado."
       to_continue: "Por favor, inicia sesión"
       preferences: "Debes iniciar sesión para poder cambiar tus preferencias de usuario."
@@ -1484,20 +1506,20 @@ es:
     conditional_loading_section:
       loading: Cargando...
     category_row:
-      topic_count: "{{count}} temas en esta categoría"
+      topic_count: "%{count} temas en esta categoría"
     select_kit:
       default_header_text: Seleccionar...
       no_content: No se encontraron coincidencias
       filter_placeholder: Buscar...
       filter_placeholder_with_any: Buscar o crear...
-      create: "Crear: «{{content}}»"
+      create: "Crear: «%{content}»"
       max_content_reached:
-        one: "Puedes seleccionar únicamente {{count}} item."
-        other: "Solo puedes seleccionar {{count}} elementos."
+        one: "Puedes seleccionar únicamente %{count} item."
+        other: "Solo puedes seleccionar %{count} elementos."
       min_content_not_reached:
-        one: "Seleccionar al menos {{count}} item."
-        other: "Selecciona al menos {{count}} elementos."
-      invalid_selection_length: "La selección debe tener al menos {{count}} caracteres."
+        one: "Seleccionar al menos %{count} item."
+        other: "Selecciona al menos %{count} elementos."
+      invalid_selection_length: "La selección debe tener al menos %{count} caracteres."
     date_time_picker:
       from: Desde
       to: Hasta
@@ -1524,7 +1546,7 @@ es:
       default: Emojis personalizados
     shared_drafts:
       title: "Borradores Compartidos"
-      notice: "Este tema es visible solamente por quienes pueden ver la categoría <b>{{category}}</b>."
+      notice: "Este tema es visible solamente por quienes pueden ver la categoría <b>%{category}</b>."
       destination_category: "Categoría de destino"
       publish: "Publicar borrador compartido"
       confirm_publish: "¿Estás seguro de que quieres publicar este borrador?"
@@ -1544,24 +1566,24 @@ es:
       similar_topics: "Tu tema es similar a..."
       drafts_offline: "borradores sin conexión"
       edit_conflict: "conflicto de edición"
-      group_mentioned_limit: "<b>¡Advertencia!</b> Mencionaste a <a href='{{group_link}}'>{{group}}</a>. Sin embargo, este grupo tiene más miembros que el límite máximo de menciones que el administrador configuró. Este límite es de {{max}} usuarios. Por consiguiente, no se notificará a nadie."
+      group_mentioned_limit: "<b>¡Advertencia!</b> Mencionaste a <a href='%{group_link}'>%{group}</a>. Sin embargo, este grupo tiene más miembros que el límite máximo de menciones que el administrador configuró. Este límite es de %{max} usuarios. Por consiguiente, no se notificará a nadie."
       group_mentioned:
-        one: "Al mencionar a {{group}}, estás a punto de notificar a <a href='{{group_link}}'>%{count} persona</a> – ¿seguro que quieres hacerlo?"
-        other: "Al mencionar a {{group}}, estás a punto de notificar a <a href='{{group_link}}'>{{count}} personas</a> ¿Estás seguro de que quieres hacerlo?"
+        one: "Al mencionar a %{group}, estás a punto de notificar a <a href='%{group_link}'>%{count} persona</a> – ¿seguro que quieres hacerlo?"
+        other: "Al mencionar a %{group}, estás a punto de notificar a <a href='%{group_link}'>%{count} personas</a> ¿Estás seguro de que quieres hacerlo?"
       cannot_see_mention:
-        category: "Mencionaste a {{username}} pero no se les notificará porque no tienen acceso a esta categoría. Necesitarás añadirlos a un grupo que tenga acceso a esta categoría."
-        private: "Mencionaste a {{username}} pero no se les notificará porque no pueden ver este mensaje personal. Necesitarás invitarlos a este MP."
-      duplicate_link: "Parece que tu enlace a <b>{{domain}}</b> ya se publicó en el tema por <b>@{{username}}</b> en <a href='{{post_url}}'>una respuesta el {{ago}}</a>. ¿Estás seguro de que deseas volver a publicarlo?"
-      reference_topic_title: "RE: {{title}}"
+        category: "Mencionaste a %{username} pero no se les notificará porque no tienen acceso a esta categoría. Necesitarás añadirlos a un grupo que tenga acceso a esta categoría."
+        private: "Mencionaste a %{username} pero no se les notificará porque no pueden ver este mensaje personal. Necesitarás invitarlos a este MP."
+      duplicate_link: "Parece que tu enlace a <b>%{domain}</b> ya se publicó en el tema por <b>@%{username}</b> en <a href='%{post_url}'>una respuesta el %{ago}</a>. ¿Estás seguro de que deseas volver a publicarlo?"
+      reference_topic_title: "RE: %{title}"
       error:
         title_missing: "Es necesario un título"
-        title_too_short: "El título debe tener por lo menos {{min}} caracteres"
-        title_too_long: "El título no puede tener más de {{max}} caracteres."
+        title_too_short: "El título debe tener por lo menos %{min} caracteres"
+        title_too_long: "El título no puede tener más de %{max} caracteres."
         post_missing: "La publicación no puede estar vacía"
-        post_length: "La publicación debe tener por lo menos {{min}} caracteres."
-        try_like: "¿Has probado el botón {{heart}}?"
+        post_length: "La publicación debe tener por lo menos %{min} caracteres."
+        try_like: "¿Has probado el botón %{heart}?"
         category_missing: "Debes escoger una categoría."
-        tags_missing: "Debes seleccionar al menos {{count}} etiquetas"
+        tags_missing: "Debes seleccionar al menos %{count} etiquetas"
         topic_template_not_modified: "Por favor, agrega detalles y especificaciones a tu tema editando la plantilla de tema."
       save_edit: "Guardar edición"
       overwrite_edit: "Sobrescribir edición"
@@ -1659,57 +1681,57 @@ es:
       tooltip:
         regular:
           one: "%{count} notificación sin leer"
-          other: "{{count}} notificaciones no leídas"
+          other: "%{count} notificaciones no leídas"
         message:
           one: "%{count} mensaje sin leer"
-          other: "{{count}} mensajes sin leer"
+          other: "%{count} mensajes sin leer"
       title: "notificaciones por menciones a tu @nombre, respuestas a tus publicaciones y temas, mensajes, etc"
       none: "No se pudieron cargar las notificaciones en este momento."
       empty: "No se encontraron notificaciones."
       post_approved: "Tu publicación ha sido aprobada"
       reviewable_items: "elementos que requieren revisión"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} and %{count} mas</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} y otros {{count}} </span> {{description}}"
+        one: "<span>%{username}, %{username2} and %{count} mas</span> %{description}"
+        other: "<span>%{username}, %{username2} y otros %{count} </span> %{description}"
       liked_consolidated_description:
-        one: "le ha dado me gusta a {{count}} de tus mensajes"
-        other: "le ha dado me gusta a {{count}} de tus publicaciones"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> aceptó tu invitación"
-      moved_post: "<span>{{username}}</span> movió {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Ganaste '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Nuevo tema</span> {{description}}"
-      membership_request_accepted: "Membresía aceptada en «{{group_name}}»"
-      membership_request_consolidated: "{{count}} solicitudes de membresía abiertas para '{{group_name}}'"
+        one: "le ha dado me gusta a %{count} de tus mensajes"
+        other: "le ha dado me gusta a %{count} de tus publicaciones"
+      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}"
+      invitee_accepted: "<span>%{username}</span> aceptó tu invitación"
+      moved_post: "<span>%{username}</span> movió %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Ganaste '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Nuevo tema</span> %{description}"
+      membership_request_accepted: "Membresía aceptada en «%{group_name}»"
+      membership_request_consolidated: "%{count} solicitudes de membresía abiertas para '%{group_name}'"
       group_message_summary:
-        one: "{{count}} mensaje en tu bandeja de {{group_name}}"
-        other: "{{count}} mensajes en tu bandeja de {{group_name}} "
+        one: "%{count} mensaje en tu bandeja de %{group_name}"
+        other: "%{count} mensajes en tu bandeja de %{group_name} "
       popup:
-        mentioned: '{{username}} te mencionó en «{{topic}}» - {{site_title}}'
-        group_mentioned: '{{username}} te mencionó en «{{topic}}» - {{site_title}}'
-        quoted: '{{username}} te citó en «{{topic}}» - {{site_title}}'
-        replied: '{{username}} te respondió en «{{topic}}» - {{site_title}}'
-        posted: '{{username}} publicó en «{{topic}}» - {{site_title}}'
-        private_message: '{{username}} te envió un mensaje personal en «{{topic}}» - {{site_title}}'
-        linked: '{{username}} enlazó tu publicación desde «{{topic}}» - {{site_title}}'
-        watching_first_post: '{{username}} creó un nuevo tema «{{topic}}» - {{site_title}}'
+        mentioned: '%{username} te mencionó en «%{topic}» - %{site_title}'
+        group_mentioned: '%{username} te mencionó en «%{topic}» - %{site_title}'
+        quoted: '%{username} te citó en «%{topic}» - %{site_title}'
+        replied: '%{username} te respondió en «%{topic}» - %{site_title}'
+        posted: '%{username} publicó en «%{topic}» - %{site_title}'
+        private_message: '%{username} te envió un mensaje personal en «%{topic}» - %{site_title}'
+        linked: '%{username} enlazó tu publicación desde «%{topic}» - %{site_title}'
+        watching_first_post: '%{username} creó un nuevo tema «%{topic}» - %{site_title}'
         confirm_title: "Notificaciones activadas - %{site_title}"
         confirm_body: "¡Éxito! Se han activado las notificaciones."
-        custom: "Notificación de {{username}} en %{site_title}"
+        custom: "Notificación de %{username} en %{site_title}"
       titles:
         mentioned: "mencionado"
         replied: "nueva respuesta"
@@ -1739,9 +1761,9 @@ es:
       from_my_computer: "Desde mi dispositivo"
       from_the_web: "Desde la web"
       remote_tip: "enlace a la imagen"
-      remote_tip_with_attachments: "enlace a imagen o archivo {{authorized_extensions}}"
+      remote_tip_with_attachments: "enlace a imagen o archivo %{authorized_extensions}"
       local_tip: "selecciona las imágenes de tu dispositivo"
-      local_tip_with_attachments: "selecciona imágenes o archivos de tu dispositivo {{authorized_extensions}}"
+      local_tip_with_attachments: "selecciona imágenes o archivos de tu dispositivo %{authorized_extensions}"
       hint: "(también puedes arrastrarlos al editor para subirlos)"
       hint_for_supported_browsers: "puedes también arrastrar o pegar imágenes en el editor"
       uploading: "Subiendo"
@@ -1758,15 +1780,15 @@ es:
       clear_all: "Limpiar todo"
       too_short: "El término de búsqueda es demasiado corto."
       result_count:
-        one: "<span>%{count} resultado para</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} resultados para</span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} resultado para</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} resultados para</span><span class='term'>%{term}</span>"
       title: "buscar temas, publicaciones, usuarios o categorías"
       full_page_title: "buscar temas o publicaciones"
       no_results: "No se encontró ningún resultado."
       no_more_results: "No se encontraron más resultados."
       searching: "Buscando ..."
-      post_format: "#{{post_number}} de {{username}}"
-      results_page: "Resultados de búsqueda de «{{term}}»"
+      post_format: "#%{post_number} de %{username}"
+      results_page: "Resultados de búsqueda de «%{term}»"
       more_results: "Hay más resultados. Por favor, restringe los criterios de búsqueda."
       cant_find: "¿No puedes encontrar lo que estás buscando?"
       start_new_topic: "¿Y si creas un nuevo tema?"
@@ -1775,9 +1797,9 @@ es:
       search_google_button: "Google"
       search_google_title: "Busca en este sitio"
       context:
-        user: "Buscar publicaciones de @{{username}}"
-        category: "Buscar la categoría #{{category}}"
-        tag: "Buscar la etiqueta #{{tag}} "
+        user: "Buscar publicaciones de @%{username}"
+        category: "Buscar la categoría #%{category}"
+        tag: "Buscar la etiqueta #%{tag} "
         topic: "Buscar en este tema"
         private_messages: "Buscar en mensajes"
       advanced:
@@ -1785,13 +1807,13 @@ es:
         posted_by:
           label: Publicado por
         in_category:
-          label: Categorizado
+          label: Categoría
         in_group:
           label: En el grupo
         with_badge:
           label: Con la medalla
         with_tags:
-          label: Etiquetado
+          label: Etiquetas
         filters:
           label: Solo temas/mensajes que...
           title: coincide el título únicamente
@@ -1821,7 +1843,7 @@ es:
           count:
             label: Número mínimo de publicaciones
           time:
-            label: Publicó
+            label: Fecha de publicación
             before: antes de
             after: después de
     hamburger_menu: "ir a otra lista de temas o categoría"
@@ -1854,7 +1876,7 @@ es:
         choose_new_category: "Elige la nueva categoría de los temas:"
         selected:
           one: "Has seleccionado <b>%{count}</b> tema."
-          other: "Has seleccionado <b>{{count}}</b> temas."
+          other: "Has seleccionado <b>%{count}</b> temas."
         change_tags: "Remplazar etiquetas"
         append_tags: "Agregar etiquetas"
         choose_new_tags: "Elige etiquetas nuevas para estos temas:"
@@ -1867,7 +1889,7 @@ es:
         posted: "Todavía no has publicado en ningún tema."
         latest: "No hay temas recientes. Qué pena."
         bookmarks: "Todavía no tienes temas guardados en marcadores."
-        category: "No hay temas con la categoría {{category}}."
+        category: "No hay temas con la categoría %{category}."
         top: "No hay temas destacados."
         educate:
           new: '<p>Tus temas nuevos aparecen aquí.</p><p>Por defecto, los temas se consideran nuevos y mostrarán un indicador de <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">nuevo</span> si fueron creados en los últimos 2 días.</p><p>Configura tus <a href="%{userPrefsUrl}">preferencias</a> para cambiar esto.</p>'
@@ -1878,13 +1900,13 @@ es:
         read: "No hay más temas leídos."
         new: "No hay más temas nuevos."
         unread: "No hay más temas que no hayas leído."
-        category: "No hay más temas de la categoría {{category}}."
+        category: "No hay más temas de la categoría %{category}."
         top: "No hay más temas destacados."
         bookmarks: "No hay más temas guardados en marcadores."
     topic:
       filter_to:
         one: "%{count} post en el tema"
-        other: "{{count}} publicaciones en el tema"
+        other: "%{count} publicaciones en el tema"
       create: "Crear tema"
       create_long: "Crear un tema nuevo"
       open_draft: "Abrir borrador"
@@ -1913,10 +1935,10 @@ es:
       unread: "sin leer"
       new_topics:
         one: "%{count} tema nuevo"
-        other: "{{count}} temas nuevos"
+        other: "%{count} temas nuevos"
       unread_topics:
         one: "%{count} tema sin leer"
-        other: "{{count}} temas sin leer"
+        other: "%{count} temas sin leer"
       title: "Tema"
       invalid_access:
         title: "Este tema es privado"
@@ -1930,24 +1952,24 @@ es:
         description: "Lo sentimos, no pudimos encontrar ese tema. ¿Tal vez fue eliminado por un moderador?"
       total_unread_posts:
         one: "tienes %{count} publicación sin leer en este tema"
-        other: "tienes {{count}} publicaciones sin leer en este tema"
+        other: "tienes %{count} publicaciones sin leer en este tema"
       unread_posts:
         one: "tienes %{count} post antiguo sin leer en este tema"
-        other: "tienes {{count}} publicaciones antiguas sin leer en este tema"
+        other: "tienes %{count} publicaciones antiguas sin leer en este tema"
       new_posts:
         one: "hay %{count} nuevo post en este tema desde la última vez que lo leíste"
-        other: "hay {{count}} publicaciones nuevas en este tema desde la última vez que lo leíste"
+        other: "hay %{count} publicaciones nuevas en este tema desde la última vez que lo leíste"
       likes:
         one: "este tema le gusta a %{count} persona"
-        other: "este tema les gusta a {{count}} personas"
+        other: "este tema les gusta a %{count} personas"
       back_to_list: "Volver a la lista de temas"
       options: "Opciones del tema"
       show_links: "mostrar enlaces dentro de este tema"
       toggle_information: "activar/desactivar detalles del tema"
-      read_more_in_category: "¿Quieres leer más? Consulta otros temas en {{catLink}} o {{latestLink}}."
-      read_more: "¿Quieres leer más? {{catLink}} o {{latestLink}}."
-      group_request: "Necesitas solicitar la membresía al grupo «{{name}}» para ver este tema"
-      group_join: "Debes unirte al grupo «{{name}}» para ver este tema"
+      read_more_in_category: "¿Quieres leer más? Consulta otros temas en %{catLink} o %{latestLink}."
+      read_more: "¿Quieres leer más? %{catLink} o %{latestLink}."
+      group_request: "Necesitas solicitar la membresía al grupo «%{name}» para ver este tema"
+      group_join: "Debes unirte al grupo «%{name}» para ver este tema"
       group_request_sent: "Tu solicitud de membresía al grupo fue enviada. Se te informará cuando seas aceptado."
       unread_indicator: "Ningún miembro ha leído todavía la última publicación de este tema."
       read_more_MF: "Hay { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 no leído</a> } other { <a href='{basePath}/unread'># no leídos</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{y } false { } other{}} <a href='{basePath}/new'>1 nuevo</a> tema} other { {BOTH, select, true{y } false { } other{}} <a href='{basePath}/new'># nuevos</a> temas} } restantes, o {CATEGORY, select, true {explora otros temas en {catLink}} false {{latestLink}} other {}}"
@@ -2126,25 +2148,25 @@ es:
         choose_category: "Por favor, elige una categoría para el tema público:"
       feature_topic:
         title: "Características de este tema"
-        pin: "Hacer que este tema aparezca de primero en la categoría {{categoryLink}} hasta"
-        confirm_pin: "Ya has destacado {{count}} temas. Que haya demasiados temas destacados puede resultar engorroso para los usuarios nuevos y anónimos. ¿Estás seguro de que quieres destacar otro tema en esta categoría?"
-        unpin: "Quitar este tema del principio de la lista en la categoría {{categoryLink}}."
-        unpin_until: "Quitar este tema del top de la categoría {{categoryLink}} o esperar al <strong>%{until}</strong>."
+        pin: "Hacer que este tema aparezca de primero en la categoría %{categoryLink} hasta"
+        confirm_pin: "Ya has destacado %{count} temas. Que haya demasiados temas destacados puede resultar engorroso para los usuarios nuevos y anónimos. ¿Estás seguro de que quieres destacar otro tema en esta categoría?"
+        unpin: "Quitar este tema del principio de la lista en la categoría %{categoryLink}."
+        unpin_until: "Quitar este tema del top de la categoría %{categoryLink} o esperar al <strong>%{until}</strong>."
         pin_note: "Los usuarios pueden dejar de destacar los temas de forma individual por sí mismos."
         pin_validation: "Es obligatorio especificar una fecha para destacar este tema."
-        not_pinned: "No hay temas destacados en {{categoryLink}}."
+        not_pinned: "No hay temas destacados en %{categoryLink}."
         already_pinned:
-          one: "Hay <strong class='badge badge-notification unread'>un tema</strong> destacado actualmente en {{categoryLink}}. "
-          other: "Temas destacados actualmente en {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Hay <strong class='badge badge-notification unread'>un tema</strong> destacado actualmente en %{categoryLink}. "
+          other: "Temas destacados actualmente en %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Hacer que este tema aparezca de primero en todas las listas de temas hasta"
-        confirm_pin_globally: "Ya has destacado {{count}} temas globalmente. Que haya demasiados temas destacados puede resultar engorroso para los usuarios nuevos y anónimos. ¿Estás seguro de que quieres destacar otro tema de forma global?"
+        confirm_pin_globally: "Ya has destacado %{count} temas globalmente. Que haya demasiados temas destacados puede resultar engorroso para los usuarios nuevos y anónimos. ¿Estás seguro de que quieres destacar otro tema de forma global?"
         unpin_globally: "Quitar este tema de la parte superior de todas las listas de temas."
         unpin_globally_until: "Quitar este tema de la parte superior de todas las listas de temas o esperar hasta <strong>%{until}</strong>."
         global_pin_note: "Los usuarios pueden dejar de destacar el tema de forma individual por sí mismos."
         not_pinned_globally: "No hay temas destacados globalmente."
         already_pinned_globally:
           one: "Actualmente hay <strong class='badge badge-notification unread'>%{count}</strong> tema destacado globalmente."
-          other: "Temas destacados globalmente: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Temas destacados globalmente: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Hacer que este tema aparezca como encabezado en la parte superior de todas las páginas."
         remove_banner: "Retire el encabezado que aparece en la parte superior de todas las páginas."
         banner_note: "Los usuarios pueden cerrar el encabezado y descartarlo. Solo se puede anunciar un tema a la vez."
@@ -2174,15 +2196,15 @@ es:
         to_topic_username: "Ingresaste un nombre de usuario. Le enviaremos una notificación con un enlace de invitación a este tema."
         to_username: "Ingresa el nombre de usuario de la persona a la que quieres invitar. Le enviaremos una notificación con un enlace de invitación a este tema."
         email_placeholder: "nombre@ejemplo.com"
-        success_email: "Hemos enviado una invitación por correo electrónico a <b>{{emailOrUsername}}</b>. Te notificaremos cuando esta invitación sea aceptada. Puedes consultar el estado de tus invitaciones en las pestaña «Invitaciones» en tu perfil de usuario."
+        success_email: "Hemos enviado una invitación por correo electrónico a <b>%{emailOrUsername}</b>. Te notificaremos cuando esta invitación sea aceptada. Puedes consultar el estado de tus invitaciones en las pestaña «Invitaciones» en tu perfil de usuario."
         success_username: " Hemos invitado a ese usuario a participar en este tema."
         error: "Lo sentimos, no pudimos invitar a esa persona. ¿Tal vez ya fue invitada antes? (El número de invitaciones es limitado)"
-        success_existing_email: "Ya existe un usuario con el correo <b>{{emailOrUsername}}</b>. Invitamos a ese usuario a participar en este tema."
+        success_existing_email: "Ya existe un usuario con el correo <b>%{emailOrUsername}</b>. Invitamos a ese usuario a participar en este tema."
       login_reply: "Inicia sesión para responder"
       filters:
         n_posts:
           one: "%{count} post"
-          other: "{{count}} publicaciones"
+          other: "%{count} publicaciones"
         cancel: "Quitar filtro"
       move_to:
         title: "Mover a"
@@ -2196,7 +2218,7 @@ es:
         error: "Se produjo un error al mover las publicaciones al nuevo tema"
         instructions:
           one: "Estas a punto de crear un tema nuevo y rellenarlo con el post que has seleccionado."
-          other: "Estas a punto de crear un tema nuevo y rellenarlo con las <b>{{count}}</b> publiacaciones que seleccionaste."
+          other: "Estas a punto de crear un tema nuevo y rellenarlo con las <b>%{count}</b> publiacaciones que seleccionaste."
       merge_topic:
         title: "Mover a un tema existente"
         action: "mover a un tema existente"
@@ -2204,7 +2226,7 @@ es:
         radio_label: "Tema existente"
         instructions:
           one: "Por favor escoge el tema al que quieres mover ese post."
-          other: "Por favor, escoge el tema al que quieres mover estas <b>{{count}}</b> publicaciones."
+          other: "Por favor, escoge el tema al que quieres mover estas <b>%{count}</b> publicaciones."
       move_to_new_message:
         title: "Mover a un mensaje nuevo"
         action: "mover a un mensaje nuevo"
@@ -2213,7 +2235,7 @@ es:
         participants: "Participantes"
         instructions:
           one: "Estás a punto de crear un nuevo mensaje y de llenarlo con el mensaje que has seleccionado."
-          other: "Estás a punto de crear un mensaje nuevo y llenarlo con los <b>{{count}}</b> mensajes seleccionados."
+          other: "Estás a punto de crear un mensaje nuevo y llenarlo con los <b>%{count}</b> mensajes seleccionados."
       move_to_existing_message:
         title: "Mover a un mensaje existente"
         action: "mover a un mensaje existente"
@@ -2221,7 +2243,7 @@ es:
         participants: "Participantes"
         instructions:
           one: "Por favor, selecciona el mensaje al que te gustaría mover el mensaje."
-          other: "Por favor, selecciona el mensaje al que te gustaría mover los <b>{{count}}</b> mensajes."
+          other: "Por favor, selecciona el mensaje al que te gustaría mover los <b>%{count}</b> mensajes."
       merge_posts:
         title: "Fusionar las publicaciones seleccionadas"
         action: "fusionar las publicaciones seleccionadas"
@@ -2244,11 +2266,11 @@ es:
         error: "Se produjo un error al cambiar la autoría de las publicaciones."
         placeholder: "nombre de usuario del nuevo dueño"
         instructions:
-          one: "Por favor escoge el nuevo dueño del post de <b>@{{old_user}}</b>"
-          other: "Por favor, escoge el nuevo dueño de las {{count}} publicaciones de <b>@{{old_user}}</b>"
+          one: "Por favor escoge el nuevo dueño del post de <b>@%{old_user}</b>"
+          other: "Por favor, escoge el nuevo dueño de las %{count} publicaciones de <b>@%{old_user}</b>"
         instructions_without_old_user:
           one: "Por favor, escoge un nuevo propietario para la publicación."
-          other: "Por favor, escoge un nuevo propietario para las {{count}} publicaciones"
+          other: "Por favor, escoge un nuevo propietario para las %{count} publicaciones"
       change_timestamp:
         title: "Cambiar marca horaria..."
         action: "cambiar marca horaria"
@@ -2257,7 +2279,7 @@ es:
         instructions: "Por favor, selecciona la nueva marca horaria del tema. Las publicaciones en el tema se actualizarán para mantener la diferencia de tiempo."
       multi_select:
         select: "seleccionar"
-        selected: "seleccionados ({{count}})"
+        selected: "seleccionados (%{count})"
         select_post:
           label: "seleccionar"
           title: "Agregar publicación a la selección"
@@ -2276,20 +2298,20 @@ es:
         deselect_all: deshacer seleccionar todo
         description:
           one: Has seleccionado <b>%{count}</b> post.
-          other: "Has seleccionado <b>{{count}}</b> publicaciones."
+          other: "Has seleccionado <b>%{count}</b> publicaciones."
       deleted_by_author:
         one: "(tema retirado por su autor, se borrará automáticamente en %{count} hora, salvo que sea reportado)"
         other: "(tema retirado por el autor, se eliminará automáticamente en %{count} horas a menos de que sea reportado)"
     post:
       quote_reply: "Citar"
       edit_reason: "Motivo:"
-      post_number: "publicación {{number}}"
+      post_number: "publicación %{number}"
       ignored: "Contenido ignorado"
       wiki_last_edited_on: "wiki editada por última vez el"
       last_edited_on: "publicación editada por última vez el"
       reply_as_new_topic: "Responder como tema enlazado"
       reply_as_new_private_message: "Responder como mensaje nuevo a los mismos destinatarios"
-      continue_discussion: "Continuando la discusión desde {{postLink}}:"
+      continue_discussion: "Continuando la discusión desde %{postLink}:"
       follow_quote: "ir a la publicación citada"
       show_full: "Mostrar la publicación completa"
       show_hidden: "Ver contenido ignorado."
@@ -2301,29 +2323,29 @@ es:
       locked: "un miembro del staff bloqueó la posibilidad de editar esta publicación"
       gap:
         one: "ver %{count} post oculto"
-        other: "ver {{count}} publicaciones ocultas"
+        other: "ver %{count} publicaciones ocultas"
       notice:
-        new_user: "Esta es la primera vez que {{user}} ha publicado — ¡démosle la bienvenida a nuestra comunidad!"
-        returning_user: "Hace tiempo que no vemos a {{user}} — su última publicación fue {{time}}. "
+        new_user: "Esta es la primera vez que %{user} ha publicado — ¡démosle la bienvenida a nuestra comunidad!"
+        returning_user: "Hace tiempo que no vemos a %{user} — su última publicación fue %{time}. "
       unread: "Publicaciones sin leer"
       has_replies:
-        one: "{{count}} Respuesta"
-        other: "{{count}} Respuestas"
+        one: "%{count} Respuesta"
+        other: "%{count} Respuestas"
       has_likes_title:
         one: "%{count} persona le ha dado Me gusta a este post"
-        other: "{{count}} personas le han dado me gusta a esta publicación"
+        other: "%{count} personas le han dado me gusta a esta publicación"
       has_likes_title_only_you: "te ha gustado este mensaje"
       has_likes_title_you:
         one: "A tí y a una persona le ha gustado este mensaje"
-        other: "A tí y a otros {{count}} les han gustado este mensaje"
+        other: "A tí y a otros %{count} les han gustado este mensaje"
       errors:
         create: "Lo sentimos, se produjo un error al crear tu publicación. Por favor, inténtalo de nuevo."
         edit: "Lo sentimos, se produjo un error al editar tu publicación. Por favor, inténtalo de nuevo."
         upload: "Lo sentimos, se produjo un error al subir este archivo. Por favor, inténtalo de nuevo."
-        file_too_large: "Lo sentimos, ese archivo es demasiado grande (el tamaño máximo es {{max_size_kb}} kb). ¿Por qué no lo subes a un servicio de almacenamiento en la nube y compartes el enlace luego?"
+        file_too_large: "Lo sentimos, ese archivo es demasiado grande (el tamaño máximo es %{max_size_kb} kb). ¿Por qué no lo subes a un servicio de almacenamiento en la nube y compartes el enlace luego?"
         too_many_uploads: "Lo sentimos, solo puedes subir un archivo a la vez."
-        too_many_dragged_and_dropped_files: "Lo sentimos, solo puedes subir {{max}} archivos a la vez."
-        upload_not_authorized: "Lo sentimos, el archivo que estás intentando subir no está permitido (extensiones autorizadas: {{authorized_extensions}})."
+        too_many_dragged_and_dropped_files: "Lo sentimos, solo puedes subir %{max} archivos a la vez."
+        upload_not_authorized: "Lo sentimos, el archivo que estás intentando subir no está permitido (extensiones autorizadas: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Lo sentimos, los usuarios nuevos no pueden subir imágenes."
         attachment_upload_not_allowed_for_new_user: "Lo sentimos, los usuarios nuevos no pueden subir archivos adjuntos."
         attachment_download_requires_login: "Lo sentimos, necesitas haber iniciado sesión para descargar archivos adjuntos."
@@ -2363,10 +2385,10 @@ es:
           confirm: "¿Quieres eliminar también las respuestas a esta publicación?"
           direct_replies:
             one: "Si, y %{count} respuesta directa"
-            other: "Sí, y las {{count}} respuestas directas"
+            other: "Sí, y las %{count} respuestas directas"
           all_replies:
             one: "Sí, y %{count} respuesta"
-            other: "Sí, y todas las {{count}} respuestas"
+            other: "Sí, y todas las %{count} respuestas"
           just_the_post: "No, solo esta publicación"
         admin: "acciones de administrador para la publicación"
         wiki: "Transformar en formato wiki"
@@ -2413,11 +2435,11 @@ es:
             one: "leyó esto"
             other: "leyeron esto"
           like_capped:
-            one: "y {{count}} otro le gustó esto"
-            other: "y {{count}} otros le dieron me gusta a esto"
+            one: "y %{count} otro le gustó esto"
+            other: "y %{count} otros le dieron me gusta a esto"
           read_capped:
-            one: "y {{count}} otro ha leído"
-            other: "y {{count}} otros han leído"
+            one: "y %{count} otro ha leído"
+            other: "y %{count} otros han leído"
         by_you:
           off_topic: "Reportaste esto como sin relación con el tema"
           spam: "Reportaste esto como spam"
@@ -2429,11 +2451,11 @@ es:
       delete:
         confirm:
           one: "¿Estás seguro que quieres eliminar ese post?"
-          other: "¿Estás seguro de que quieres eliminar estas {{count}} publicaciones?"
+          other: "¿Estás seguro de que quieres eliminar estas %{count} publicaciones?"
       merge:
         confirm:
           one: "Seguro que quieres unir esos posts?"
-          other: "¿Estás seguro de que quieres fusionar estas {{count}} publicaciones?"
+          other: "¿Estás seguro de que quieres fusionar estas %{count} publicaciones?"
       revisions:
         controls:
           first: "Primera revisión"
@@ -2445,7 +2467,7 @@ es:
           revert: "Volver a esta revisión"
           edit_wiki: "Editar wiki"
           edit_post: "Editar publicación"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "Mostrar la producción renderizada con adiciones y eleminaciones en línea"
@@ -2635,13 +2657,13 @@ es:
       custom_message:
         at_least:
           one: "introduce al menos %{count} caracteres"
-          other: "ingresa al menos {{count}} caracteres"
+          other: "ingresa al menos %{count} caracteres"
         more:
           one: "%{count} más..."
-          other: "{{count}} más..."
+          other: "%{count} más..."
         left:
           one: "%{count} restante"
-          other: "{{count}} restantes"
+          other: "%{count} restantes"
     flagging_topic:
       title: "¡Gracias por ayudar a mantener una comunidad civilizada!"
       action: "Reportar tema"
@@ -2685,7 +2707,7 @@ es:
         title: "Este tema es un mensaje personal"
         help: "Este tema es un mensaje personal"
     posts: "Publicaciones"
-    posts_long: "Hay {{number}} publicaciones en este tema"
+    posts_long: "Hay %{number} publicaciones en este tema"
     posts_likes_MF: |
       Este tema tiene {count, plural, one {1 respuesta} other {# respuestas}} {ratio, select,
         low {con una proporción de me gusta por publicación elevada}
@@ -2700,20 +2722,20 @@ es:
     replies: "Respuestas"
     views_long:
       one: "este tema se ha visto %{count} vez"
-      other: "este tema se ha visto {{number}} veces"
+      other: "este tema se ha visto %{number} veces"
     activity: "Actividad"
     likes: "Me gusta"
     likes_lowercase:
       one: "me gusta"
       other: "me gusta"
-    likes_long: "este tema tiene {{number}} me gusta"
+    likes_long: "este tema tiene %{number} me gusta"
     users: "Usuarios"
     users_lowercase:
       one: "usuario"
       other: "usuarios"
     category_title: "Categoría"
     history: "Historial"
-    changed_by: "por {{author}}"
+    changed_by: "por %{author}"
     raw_email:
       title: "Correo electrónicos entrantes"
       not_available: "¡No disponible!"
@@ -2725,33 +2747,33 @@ es:
         title: "Recientes"
         title_with_count:
           one: "Reciente (%{count})"
-          other: "Recientes ({{count}})"
+          other: "Recientes (%{count})"
         help: "temas con publicaciones recientes"
       read:
         title: "Leídos"
         help: "temas que ya has leído en el orden que los leíste por última vez"
       categories:
         title: "Categorías"
-        title_in: "Categoría - {{categoryName}}"
+        title_in: "Categoría - %{categoryName}"
         help: "todos los temas agrupados por categoría"
       unread:
         title: "Sin leer"
         title_with_count:
           one: "Sin leer (%{count})"
-          other: "Sin leer ({{count}})"
+          other: "Sin leer (%{count})"
         help: "temas que estás vigilando o siguiendo actualmente con publicaciones sin leer"
         lower_title_with_count:
-          one: "{{count}} sin leer"
-          other: "{{count}} sin leer"
+          one: "%{count} sin leer"
+          other: "%{count} sin leer"
       new:
         lower_title_with_count:
           one: "%{count} tema nuevo"
-          other: "{{count}} nuevos"
+          other: "%{count} nuevos"
         lower_title: "nuevo"
         title: "Nuevo"
         title_with_count:
-          one: "Nuevos ({{count}})"
-          other: "Nuevos ({{count}})"
+          one: "Nuevos (%{count})"
+          other: "Nuevos (%{count})"
         help: "temas creados en los últimos días"
       posted:
         title: "Mis publicaciones"
@@ -2760,11 +2782,11 @@ es:
         title: "Marcadores"
         help: "temas que has guardado en marcadores"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "temas recientes en la categoría {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "temas recientes en la categoría %{categoryName}"
       top:
         title: "Destacados"
         help: "los temas con más actividad en el último año, mes, semana o día"
@@ -2786,6 +2808,7 @@ es:
         this_month: "Mes"
         this_week: "Semana"
         today: "Hoy"
+    browser_update: 'Desgraciadamente <a href="https://www.discourse.org/faq/#browser">tu navegador es demasiado antiguo para funcionar en este sitio</a>. Por favor, <a href="https://browsehappy.com">actualiza tu navegador</a> para ver más contenido, iniciar sesión o responder.'
     permission_types:
       full: "Crear / Responder / Ver"
       create_post: "Responder / Ver"
@@ -2926,8 +2949,8 @@ es:
       synonyms: "Sinónimos"
       synonyms_description: "Cuando las siguientes etiquetas sean usadas, serán reemplazadas por <b>%{base_tag_name}</b>."
       tag_groups_info:
-        one: 'Esta etiqueta pertence al grupo: «{{tag_groups}}»'
-        other: "Esta etiqueta pertence a estos grupos: {{tag_groups}}."
+        one: 'Esta etiqueta pertence al grupo: «%{tag_groups}»'
+        other: "Esta etiqueta pertence a estos grupos: %{tag_groups}."
       category_restrictions:
         one: "Solo se puede utilizar en esta categoría:"
         other: "Solo se puede utilizar en estas categorías:"
@@ -2943,11 +2966,11 @@ es:
       delete_tag: "Eliminar etiqueta"
       delete_confirm:
         one: "¿Estás seguro de querer borrar esta etiqueta y eliminarla de %{count} tema asignado?"
-        other: "¿Estás seguro de que quieres eliminar esta etiqueta y quitarla de los {{count}} temas a los que está asignada?"
+        other: "¿Estás seguro de que quieres eliminar esta etiqueta y quitarla de los %{count} temas a los que está asignada?"
       delete_confirm_no_topics: "¿Estás seguro de que quieres eliminar esta etiqueta?"
       delete_confirm_synonyms:
         one: "Su sinónimo también se eliminará"
-        other: "Sus {{count}} sinónimos también se eliminarán."
+        other: "Sus %{count} sinónimos también se eliminarán."
       rename_tag: "Renombrar etiqueta"
       rename_instructions: "Elige un nuevo nombre para la etiqueta:"
       sort_by: "Ordenar por:"
@@ -3304,10 +3327,10 @@ es:
           redeliver: "Reenviar"
           incoming:
             one: "Hay un nuevo evento."
-            other: "Hay {{count}} eventos. nuevos."
+            other: "Hay %{count} eventos. nuevos."
           completed_in:
             one: "Completado en %{count} segundo."
-            other: "Completado en {{count}} segundos."
+            other: "Completado en %{count} segundos."
           request: "Petición"
           response: "Respuesta"
           redeliver_confirm: "¿Estás seguro de que quieres reenviar el mismo payload?"
@@ -3359,12 +3382,12 @@ es:
           label: "Subir"
           title: "Subir un respaldo a esta instancia"
           uploading: "Subiendo..."
-          uploading_progress: "Subiendo... {{progress}}%"
-          success: "«{{filename}}» se subió exitosamente. El archivo se procesará ahora y tomará hasta un minuto para que se muestre en la lista."
-          error: "Se produjo un error al subir el archivo «{{filename}}»: {{message}}"
+          uploading_progress: "Subiendo... %{progress}%"
+          success: "«%{filename}» se subió exitosamente. El archivo se procesará ahora y tomará hasta un minuto para que se muestre en la lista."
+          error: "Se produjo un error al subir el archivo «%{filename}»: %{message}"
         operations:
           is_running: "Hay una operación en proceso actualmente..."
-          failed: "La {{operation}} falló. Por favor, revisa los registros"
+          failed: "La %{operation} falló. Por favor, revisa los registros"
           cancel:
             label: "Cancelar"
             title: "Cancelar la operación actual"
@@ -3462,6 +3485,7 @@ es:
           settings: "Ajustes"
           translations: "Traducciones"
           extra_scss: "Extra SCSS"
+          extra_files: "Archivos extra"
           preview: "Vista previa"
           show_advanced: "Mostrar campos avanzados"
           hide_advanced: "Ocultar campos avanzados"
@@ -3484,7 +3508,7 @@ es:
           disabled_component_tooltip: "Este componente ha sido deshabilitado"
           default_theme_tooltip: "Este tema es el tema por defecto del sitio"
           updates_available_tooltip: "Hay actualizaciones disponibles para este tema"
-          and_x_more: "y {{count}} más."
+          and_x_more: "y %{count} más."
           collapse: Colapsar
           uploads: "Subidos"
           no_uploads: "Puedes subir recursos asociados con tu tema como fuentes e imágenes "
@@ -3525,6 +3549,7 @@ es:
           license: "Licencia"
           version: "Versión:"
           authors: "Autoría:"
+          creator: "Creado por:"
           source_url: "Fuente"
           enable: "Habilitar"
           disable: "Inhabilitar"
@@ -3532,8 +3557,8 @@ es:
           disabled_by: "Este componente ha sido inhabilitado por"
           required_version:
             error: "Este tema se desactivó automáticamente porque no es compatible con esta versión de Discourse."
-            minimum: "Necesita la versión de Discourse {{version}} o superior."
-            maximum: "Necesita la versión de Discourse {{version}} o inferior."
+            minimum: "Necesita la versión de Discourse %{version} o superior."
+            maximum: "Necesita la versión de Discourse %{version} o inferior."
           component_of: "Componente de:"
           update_to_latest: "Actualizar a lo último"
           check_for_updates: "Buscar actualizaciones"
@@ -3546,7 +3571,7 @@ es:
           empty: "No hay elementos"
           commits_behind:
             one: "¡El tema está %{count} commit detrás!"
-            other: "¡El tema está {{count}} commits detrás!"
+            other: "¡El tema está %{count} commits detrás!"
           compare_commits: "(Ver nuevos commits)"
           repo_unreachable: "No se ha podido contactar el repositorio Git de este tema. Mensaje de error:"
           imported_from_archive: "Este tema se importó desde un archivo .zip"
@@ -3951,8 +3976,8 @@ es:
           title: "Revelar la dirección de correo electrónico de este usuario"
           text: "Mostrar"
       user:
-        suspend_failed: "Algo salió mal al suspender a este usuario {{error}}"
-        unsuspend_failed: "Algo salió mal al desbloquear a este usuario {{error}}"
+        suspend_failed: "Algo salió mal al suspender a este usuario %{error}"
+        unsuspend_failed: "Algo salió mal al desbloquear a este usuario %{error}"
         suspend_duration: "¿Durante cuánto tiempo este usuario estará suspendido?"
         suspend_reason_label: "¿Por qué lo suspendes? Este texto <b>será visible para todos</b> en la página de perfil del usuario y se mostrará al usuario cuando intente iniciar sesión. Sé conciso."
         suspend_reason_hidden_label: "¿Por qué estás suspendiendo? Este texto se mostrará al usuario cuando trate de iniciar sesión. Sé conciso."
@@ -4033,6 +4058,7 @@ es:
         anonymize_failed: "Hubo un problema al hacer anónima la cuenta."
         delete: "Eliminar usuario"
         merge:
+          button: "Juntar"
           prompt:
             title: "Transferir y eliminar @%{username}"
             description: |
@@ -4050,6 +4076,7 @@ es:
               <p><b>¡No se puede deshacer!</b></p>
 
               <p>Para continuar, escribe: <code>%{text}</code></p>
+            text: "transferir @%{username} a @%{targetUsername}"
             transfer_and_delete: "Transferir y eliminar @%{username}"
             cancel: "Cancelar"
         merging_user: "Juntando usuario..."
@@ -4327,6 +4354,7 @@ es:
         title: "Emoji"
         help: "Añade emojis nuevos que estarán disponibles para todos. (CONSEJO: arrasta varios archivos a la vez)"
         add: "Añadir emoji nuevo"
+        uploading: "Subiendo..."
         name: "Nombre"
         group: "Grupo"
         image: "Imagen"
@@ -4365,6 +4393,7 @@ es:
         post_title: "Publicación"
         category_id: "ID de la categoría"
         category_title: "Categoría"
+        tag_name: "Nombre de la etiqueta"
         external_url: "URL externa"
         destination: "Destino"
         delete_confirm: "¿Estás seguro de que quieres eliminar este enlace permanente?"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 2e48f786f9..e2478f0ade 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -23,8 +23,8 @@ et:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "hh:mm"
       timeline_date: "MMM YYYY"
@@ -194,11 +194,11 @@ et:
     every_hour: "iga tund"
     daily: "iga päev"
     weekly: "iga nädal"
-    max_of_count: "maksimum {{count}}-st"
+    max_of_count: "maksimum %{count}-st"
     alternation: "või"
     character_count:
-      one: "{{count}} sümbol"
-      other: "{{count}} sümbolit"
+      one: "%{count} sümbol"
+      other: "%{count} sümbolit"
     related_messages:
       title: "Seotud sõnumid"
     suggested_topics:
@@ -248,14 +248,14 @@ et:
         yes_value: "Jah, hülga"
         no_value: "Ei, hoia alles"
     topic_count_latest:
-      one: "Vaata {{count}} uut või uuendatud teemat"
-      other: "Vaata {{count}} uut või uuendatud teemat"
+      one: "Vaata %{count} uut või uuendatud teemat"
+      other: "Vaata %{count} uut või uuendatud teemat"
     topic_count_unread:
-      one: "Vaata {{count}} lugemata teemat"
-      other: "Vaata {{count}} lugemata teemat"
+      one: "Vaata %{count} lugemata teemat"
+      other: "Vaata %{count} lugemata teemat"
     topic_count_new:
-      one: "Vaata {{count}} uut teemat"
-      other: "Vaata {{count}} uut teemat"
+      one: "Vaata %{count} uut teemat"
+      other: "Vaata %{count} uut teemat"
     preview: "eelvaade"
     cancel: "tühista"
     save: "Salvesta muudatused"
@@ -263,7 +263,7 @@ et:
     saved: "Salvestatud!"
     upload: "Lae üles"
     uploading: "Laen üles..."
-    uploading_filename: "Üleslaadimine: {{filename}}..."
+    uploading_filename: "Üleslaadimine: %{filename}..."
     clipboard: "lõikelaud"
     uploaded: "Üles laetud!"
     pasting: "Asetamine..."
@@ -322,19 +322,19 @@ et:
         description: "Oleme sinu uue postituse kätte saanud, kuid see vajab enne ilmumist moderaatori kinnitust. Palume veidi kannatust. "
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> postitas <a href='{{topicUrl}}'>selle teema</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Sa</a> postitasid <a href='{{topicUrl}}'>selle teema</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> vastas postitusele <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Sa</a> vastasid postitusele <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> vastas <a href='{{topicUrl}}'>sellele teemale</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Sa</a> vastasid <a href='{{topicUrl}}'>sellele teemale</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> mainis kasutajat <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> mainis <a href='{{user2Url}}'>sind</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Sa</a> mmainisid kasutajat <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Postitatud kasutaja <a href='{{userUrl}}'>{{user}}</a> poolt"
-      posted_by_you: "<a href='{{userUrl}}'>Sinu</a> postitiatud"
-      sent_by_user: "Saadetud kasutaja <a href='{{userUrl}}'>{{user}}</a> poolt"
-      sent_by_you: "<a href='{{userUrl}}'>Sinu </a> saadetud"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> postitas <a href='%{topicUrl}'>selle teema</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Sa</a> postitasid <a href='%{topicUrl}'>selle teema</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> vastas postitusele <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Sa</a> vastasid postitusele <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> vastas <a href='%{topicUrl}'>sellele teemale</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Sa</a> vastasid <a href='%{topicUrl}'>sellele teemale</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> mainis kasutajat <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> mainis <a href='%{user2Url}'>sind</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Sa</a> mmainisid kasutajat <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Postitatud kasutaja <a href='%{userUrl}'>%{user}</a> poolt"
+      posted_by_you: "<a href='%{userUrl}'>Sinu</a> postitiatud"
+      sent_by_user: "Saadetud kasutaja <a href='%{userUrl}'>%{user}</a> poolt"
+      sent_by_you: "<a href='%{userUrl}'>Sinu </a> saadetud"
     directory:
       filter_name: "filtreeri kasutajanime järgi"
       title: "Kasutajad"
@@ -539,7 +539,7 @@ et:
     user_fields:
       none: "(vali võimalus)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profiil"
       mute: "Vaigista"
       edit: "Muuda Eelistusi"
@@ -591,12 +591,12 @@ et:
       external_links_in_new_tab: "Ava kõik välisviited uuel sakil"
       enable_quoting: "Luba esiletõstetud tekstile tsitaadiga vastata"
       change: "muuda"
-      moderator: "{{user}} on moderaator"
-      admin: "{{user}} on admin"
+      moderator: "%{user} on moderaator"
+      admin: "%{user} on admin"
       moderator_tooltip: "See kasutaja on moderaator"
       admin_tooltip: "See kasutaja on admin"
       silenced_tooltip: "See kasutaja on vaigistatud"
-      suspended_notice: "Selle kasutaja ligipääs on ajutiselt peatatud kuni {{date}}."
+      suspended_notice: "Selle kasutaja ligipääs on ajutiselt peatatud kuni %{date}."
       suspended_permanently: "Selle kasutaja konto on peatatud."
       suspended_reason: "Põhjus:"
       github_profile: "Github"
@@ -609,7 +609,7 @@ et:
           Vaigistatud teemad ja foorumid ei kajastu nendes meilides.
         individual: "Saada meil iga uue postituse kohta"
         individual_no_echo: "Saada meil iga uue postituse kohta, v.a. enda omad"
-        many_per_day: "Saada mulle meil iga uue postituse kohta (umbes {{dailyEmailEstimate}} meili päevas)"
+        many_per_day: "Saada mulle meil iga uue postituse kohta (umbes %{dailyEmailEstimate} meili päevas)"
         few_per_day: "Saada mulle meil iga uue postituse kohta (umbes 2 meili päevas)"
       tag_settings: "Sildid"
       watched_tags: "Vaadatud"
@@ -634,7 +634,6 @@ et:
       admin_delete: "Kustuta"
       users: "Kasutajad"
       muted_users: "Vaigistatud"
-      muted_users_instructions: "Summuta kõik teavitused nendelt kasutajatelt."
       tracked_topics_link: "Näita"
       automatically_unpin_topics: "Eemalda lõppu jõudmisel teemadelt automaatselt esiletõstmise märgistus."
       apps: "Äpid"
@@ -728,11 +727,11 @@ et:
         instructions: "Ära näita kunagi avalikkusele."
         ok: "Saadame sulle kinnituseks meili"
         invalid: "Sisesta palun korrektne meiliaadress"
-        authenticated: "Sinu meil on autenditud {{provider}} poolt"
+        authenticated: "Sinu meil on autenditud %{provider} poolt"
         frequency_immediately: "Saadame sulle kohe meili, kui sa ei ole seda lugenud, mille kohta meili saatsime."
         frequency:
           one: "Saadame meili vaid siis, kui pole sind viimase minuti jooksul näinud."
-          other: "Saadame meili vaid siis, kui pole Sind viimase {{count}} minuti jooksul näinud."
+          other: "Saadame meili vaid siis, kui pole Sind viimase %{count} minuti jooksul näinud."
       associated_accounts:
         title: "Seotud kontod"
         connect: "Ühenda"
@@ -748,9 +747,9 @@ et:
       username:
         title: "Kasutajanimi"
         instructions: "unikaalne, tühikuteta, lühike"
-        short_instructions: "Inimesed võivad sind mainda nimega @{{username}}"
+        short_instructions: "Inimesed võivad sind mainda nimega @%{username}"
         available: "Sinu poolt valitud kasutajanimi on vaba"
-        not_available: "Pole saadaval. Proovime {{suggestion}}?"
+        not_available: "Pole saadaval. Proovime %{suggestion}?"
         not_available_no_suggestion: "Pole saadaval"
         too_short: "Sinu poolt valitud kasutajanimi on liiga lühike"
         too_long: "Sinu poolt valitud kasutajanimi on liiga pikk"
@@ -770,7 +769,7 @@ et:
         log_out_all: "Logi kõik välja"
         active: "praegu aktiivne"
         not_you: "See pole sina?"
-        show_all: "Näita kõiki ({{count}})"
+        show_all: "Näita kõiki (%{count})"
         show_few: "Näita vähem"
         was_this_you: "Kas see olid sina?"
         secure_account: "Turva minu konto"
@@ -837,14 +836,14 @@ et:
         none: "Pole ühtegi kutset, mida näidata."
         truncated:
           one: "Näitan esimest kutset."
-          other: "Näitan esimest {{count}} kutset."
+          other: "Näitan esimest %{count} kutset."
         redeemed: "Lunastatud kutsed"
         redeemed_tab: "Lunastatud"
-        redeemed_tab_with_count: "Lunastatud ({{count}})"
+        redeemed_tab_with_count: "Lunastatud (%{count})"
         redeemed_at: "Lunastatud"
         pending: "Ootel kutsed"
         pending_tab: "Ootel"
-        pending_tab_with_count: "Ootel ({{count}})"
+        pending_tab_with_count: "Ootel (%{count})"
         topics_entered: "Vaadatud teemasid"
         posts_read_count: "Postitust loetud"
         expired: "See kutse on aegunud."
@@ -858,13 +857,17 @@ et:
         time_read: "Lugemise aeg"
         days_visited: "Päevi külastatud"
         account_age_days: "Konto vanus päevades"
+        links_tab: "Viited"
+        link_created_at: "Loodud"
+        link_groups: Grupid
         create: "Saada kutse"
         generate_link: "Kopeeri viide kutsele"
         link_generated: "Kutse link edukalt genereeritud!"
         valid_for: "Kutse link kehtib vaid meiliaadressile: %{email}"
+        invite_link:
+          success: "Kutse link edukalt genereeritud!"
         bulk_invite:
           none: "Sa pole veel kedagi siia kutsunud. Saada üksikuid kutseid või paljudele korraga <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>laadides üles CSV faili</a>."
-          text: "Masskutse Failist"
           success: "Fail edukalt üles laetud. Sulle saabub teade, kui protsess on lõpule jõudnud."
           error: "Vabandust, fail peab olema CSV vormingus."
       password:
@@ -953,7 +956,7 @@ et:
       desc:
         network: "Palun kontrolli ühendust."
         network_fixed: "Näib, et see on tagasi."
-        server: "Veakood: {{status}}"
+        server: "Veakood: %{status}"
         forbidden: "Sul puudub õigus seda näha."
         not_found: "Oppaa, programm proovis laadida olematut URL-i."
         unknown: "Miskit läks nihu."
@@ -998,8 +1001,8 @@ et:
       hidden_for_session: "OK, küsin homme uuesti. Samuti võid konto alati 'Logi sisse' lingi alt luua."
     summary:
       enabled_description: "Vaatad selle teema kokkuvõtet: kõige huvipakkuvamad postitused valib kogukond."
-      description: "Kokku on <b>{{replyCount}}</b> vastust."
-      description_time: "Kokku on <b>{{replyCount}}</b> vastust mille lugemiseks kulub hinnanguliselt <b>{{readingTime}} minutit</b>."
+      description: "Kokku on <b>%{replyCount}</b> vastust."
+      description_time: "Kokku on <b>%{replyCount}</b> vastust mille lugemiseks kulub hinnanguliselt <b>%{readingTime} minutit</b>."
       enable: "Võta see teema kokku"
       disable: "Näita kõiki postitusi"
     deleted_filter:
@@ -1011,8 +1014,8 @@ et:
       title: "Sõnum"
       invite: "Kutsu teisi..."
       edit: "Lisa või eemalda..."
-      remove_allowed_user: "Kas soovid tõesti {{name}} sellest sõnumist eemaldada?"
-      remove_allowed_group: "Kas soovid tõesti {{name}} sellest sõnumist eemaldada?"
+      remove_allowed_user: "Kas soovid tõesti %{name} sellest sõnumist eemaldada?"
+      remove_allowed_group: "Kas soovid tõesti %{name} sellest sõnumist eemaldada?"
     email: "Meiliaadress"
     username: "Kasutajanimi"
     last_seen: "Vaadatud"
@@ -1055,14 +1058,14 @@ et:
       awaiting_activation: "Sinu konto ootab aktiveerimist. Kasuta unustasin parooli - viidet, et aktiveerimise meil uuesti saata."
       awaiting_approval: "Sinu konto on alles meeskonna poolt kinnitamata. Saadame sulle kohe meili, kui see on heaks kiidetud."
       requires_invite: "Vabandame, sellesse foorumisse pääseb ainult kutsega."
-      not_activated: "Sa ei saa veel sisse logida. Saatsime sulle aktiveerimise meili aadressile <b>{{sentTo}}</b>. Järgi palun selles meilis olevaid juhiseid oma konto aktiveerimiseks."
+      not_activated: "Sa ei saa veel sisse logida. Saatsime sulle aktiveerimise meili aadressile <b>%{sentTo}</b>. Järgi palun selles meilis olevaid juhiseid oma konto aktiveerimiseks."
       not_allowed_from_ip_address: "Sellelt IP-aadressilt ei saa sisse logida."
       admin_not_allowed_from_ip_address: "Sellelt IP-aadressilt ei saa adminina sisse logida."
       resend_activation_email: "Selleks, et aktiveerimise meili uuesti saata, klikka siia."
       resend_title: "Saada aktiveerimismeil uuesti"
       change_email: "Muuda e-posti aadressi"
       submit_new_email: "Uuenda e-posti aadressi"
-      sent_activation_email_again: "Saatsime sulle aktiveerimise meili aadressile <b>{{currentEmail}}</b>. Selle kohalejõudmine võib võtta mõne minuti; kontrolli kindlasti ka spämmikausta."
+      sent_activation_email_again: "Saatsime sulle aktiveerimise meili aadressile <b>%{currentEmail}</b>. Selle kohalejõudmine võib võtta mõne minuti; kontrolli kindlasti ka spämmikausta."
       to_continue: "Palun logi sisse"
       preferences: "Oma kasutajaeelistuste muutmiseks pead olema sisse logitud."
       forgot: "Ma ei mäleta oma konto üksikasju"
@@ -1151,19 +1154,19 @@ et:
       drafts_offline: "mustandid vallasrežiimis"
       edit_conflict: "muuda konflikti"
       group_mentioned:
-        one: "Mainides {{group}}, oled teavitamas <a href='{{group_link}}'>%{count} inimest</a> – oled selles kindel?"
-        other: "Mainides {{group}}, oled teavitamas <a href='{{group_link}}'>{{count}} inimest</a> – oled selles kindel?"
+        one: "Mainides %{group}, oled teavitamas <a href='%{group_link}'>%{count} inimest</a> – oled selles kindel?"
+        other: "Mainides %{group}, oled teavitamas <a href='%{group_link}'>%{count} inimest</a> – oled selles kindel?"
       cannot_see_mention:
-        category: "Mainisid kasutajat {{username}} kuid teda ei teavitata, kuna tal puudub juurdepääs siia foorumisse. Lisa ta gruppi, kellel on siia foorumisse ligipääs."
-        private: "Mainisid kasutajat {{username}} kuid teda ei teavitata, kuna tal puudub juurdepääs käesoleva privaatsõnumi juurde. Kutsu ta seda privaatsõnumit vaatama."
+        category: "Mainisid kasutajat %{username} kuid teda ei teavitata, kuna tal puudub juurdepääs siia foorumisse. Lisa ta gruppi, kellel on siia foorumisse ligipääs."
+        private: "Mainisid kasutajat %{username} kuid teda ei teavitata, kuna tal puudub juurdepääs käesoleva privaatsõnumi juurde. Kutsu ta seda privaatsõnumit vaatama."
       error:
         title_missing: "Pealkiri on kohustuslik"
-        title_too_short: "Pealkiri peab olema vähemalt {{min}} sümbolit pikk"
-        title_too_long: "Pealkiri ei saa olla pikem kui {{max}} sümbolit"
-        post_length: "Postitus peab olema vähemalt {{min}} sümbolit pikk"
-        try_like: "Oled sa proovinud {{heart}} nuppu?"
+        title_too_short: "Pealkiri peab olema vähemalt %{min} sümbolit pikk"
+        title_too_long: "Pealkiri ei saa olla pikem kui %{max} sümbolit"
+        post_length: "Postitus peab olema vähemalt %{min} sümbolit pikk"
+        try_like: "Oled sa proovinud %{heart} nuppu?"
         category_missing: "Pead valima foorumi"
-        tags_missing: "Sa pead valima vähemalt {{count}} sildi"
+        tags_missing: "Sa pead valima vähemalt %{count} sildi"
       save_edit: "Salvesta muudatused"
       overwrite_edit: "Kirjuta muutmine üle"
       reply_original: "Vasta algsesse teemasse"
@@ -1235,38 +1238,38 @@ et:
       tooltip:
         regular:
           one: "%{count} nägemata teavitus"
-          other: "{{count}} nägemata teavitust"
+          other: "%{count} nägemata teavitust"
         message:
           one: "%{count} lugemata sõnum"
-          other: "{{count}} lugemata sõnumit"
+          other: "%{count} lugemata sõnumit"
       title: "teavitused @name mainimiste, oma postitustele ja teemadele vastamiste, sõnumite, jne kohta"
       none: "Hetkel ei saa teavitusi laadida."
       empty: "Teavitusi ei leitud."
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</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}}"
-      invitee_accepted: "<span>{{username}}</span> võttis su kutse vastu"
-      moved_post: "<span>{{username}}</span> moved {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>New Topic</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</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}"
+      invitee_accepted: "<span>%{username}</span> võttis su kutse vastu"
+      moved_post: "<span>%{username}</span> moved %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>New Topic</span> %{description}"
       popup:
-        mentioned: '{{username}} mainis Sind teemas "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} mainis Sind teemas "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} tsiteeris Sind teemas "{{topic}}" - {{site_title}}'
-        replied: '{{username}} vastas Sulle teemas "{{topic}}" - {{site_title}}'
-        posted: '{{username}} postitas teemasse "{{topic}}" - {{site_title}}'
-        linked: '{{username}} viitas Sinu postitusele teemas "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} mainis Sind teemas "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} mainis Sind teemas "%{topic}" - %{site_title}'
+        quoted: '%{username} tsiteeris Sind teemas "%{topic}" - %{site_title}'
+        replied: '%{username} vastas Sulle teemas "%{topic}" - %{site_title}'
+        posted: '%{username} postitas teemasse "%{topic}" - %{site_title}'
+        linked: '%{username} viitas Sinu postitusele teemas "%{topic}" - %{site_title}'
       titles:
         watching_first_post: "uus teema"
     upload_selector:
@@ -1275,9 +1278,9 @@ et:
       from_my_computer: "Minu seadmest"
       from_the_web: "Veebist"
       remote_tip: "viide pildile"
-      remote_tip_with_attachments: "viide pildile või failile {{authorized_extensions}}"
+      remote_tip_with_attachments: "viide pildile või failile %{authorized_extensions}"
       local_tip: "vali pildid oma seadmest"
-      local_tip_with_attachments: "vali pildid või failid oma seadmest {{authorized_extensions}}"
+      local_tip_with_attachments: "vali pildid või failid oma seadmest %{authorized_extensions}"
       hint: "(üleslaadimiseks võid faili ka redaktorisse pukseerida)"
       hint_for_supported_browsers: "võid pildi redaktorisse ka pukseerida või kleepida"
       uploading: "Laen üles"
@@ -1297,12 +1300,12 @@ et:
       no_results: "Ei leidnud midagi."
       no_more_results: "Rohkem vasteid pole."
       searching: "Otsin..."
-      post_format: "postituse nr{{post_number}} tegi {{username}}"
+      post_format: "postituse nr%{post_number} tegi %{username}"
       search_google_button: "Google"
       search_google_title: "Otsi sellelt saidilt"
       context:
-        user: "Otsi kasutaja @{{username}} postitusi"
-        category: "Otsi #{{category}} foorumist"
+        user: "Otsi kasutaja @%{username} postitusi"
+        category: "Otsi #%{category} foorumist"
         topic: "Otsi sellest teemast"
         private_messages: "Otsi sõnumeid"
       advanced:
@@ -1372,7 +1375,7 @@ et:
         choose_new_category: "Vali teemadele uus foorum:"
         selected:
           one: "Märkisid ära <b>%{count}</b> teema."
-          other: "Märkisid ära <b>{{count}}</b> teemat."
+          other: "Märkisid ära <b>%{count}</b> teemat."
         change_tags: "Asenda sildid"
         append_tags: "Lisa sildid"
         choose_new_tags: "Vali teemadele uued sildid:"
@@ -1385,7 +1388,7 @@ et:
         posted: "Sa ei ole veel ühtegi teemasse postitanud."
         latest: "Ühtegi värsket teemat pole. Nukker."
         bookmarks: "Sul ei ole veel ühtegi järjehoidjaga teemal."
-        category: "Foorumis {{category}} teemad puuduvad."
+        category: "Foorumis %{category} teemad puuduvad."
         top: "Tippteemad puuduvad."
         educate:
           new: '<p>Sinu uued teemad ilmuvad siia.</p><p>Teemad loetakse vaikimisi uuteks ja tähistatakse indikaatoriga <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">uus</span>, kui nad loodi viimase 2 ööpäeva jooksul.</p><p>Muutmiseks külasta oma <a href="%{userPrefsUrl}">eelistuste</a> lehekülge.</p>'
@@ -1396,13 +1399,13 @@ et:
         read: "Rohkem loetud teemasid pole."
         new: "Rohkem uusi teemasid pole."
         unread: "Rohkem lugemata teemasid pole."
-        category: "Foorumis {{category}} rohkem teemasid pole."
+        category: "Foorumis %{category} rohkem teemasid pole."
         top: "Rohkem tippteemasid pole."
         bookmarks: "Rohkem järjehoidjaga teemasid pole."
     topic:
       filter_to:
         one: "%{count} postitus teemas"
-        other: "{{count}} postitust teemas"
+        other: "%{count} postitust teemas"
       create: "Uus teema"
       create_long: "Loo uus teema"
       open_draft: "Ava mustand"
@@ -1422,10 +1425,10 @@ et:
       unread: "lugemata"
       new_topics:
         one: "%{count} uus teema"
-        other: "{{count}} uut teemat"
+        other: "%{count} uut teemat"
       unread_topics:
         one: "%{count} lugemata teema"
-        other: "{{count}} lugemata teemat"
+        other: "%{count} lugemata teemat"
       title: "Teema"
       invalid_access:
         title: "Teema on privaatne"
@@ -1439,22 +1442,22 @@ et:
         description: "Vabanda, meil ei õnnestunud seda teemat leida. Võimalik, et moderaator eemaldas selle?"
       total_unread_posts:
         one: "Sul on selles teemas %{count} lugemata postitus"
-        other: "Sul on selles teemas {{count}} lugemata postitust"
+        other: "Sul on selles teemas %{count} lugemata postitust"
       unread_posts:
         one: "Sul on selles teemas %{count} lugemata vana postitus"
-        other: "Sul on selles teemas {{count}} lugemata vana postitust"
+        other: "Sul on selles teemas %{count} lugemata vana postitust"
       new_posts:
         one: "selles teemas on %{count} uus postitus Sinu viimasest külastusest"
-        other: "selles teemas on {{count}} uut postitust Sinu viimasest külastusest"
+        other: "selles teemas on %{count} uut postitust Sinu viimasest külastusest"
       likes:
         one: "selles teemas on %{count} meeldimine"
-        other: "selles teemas on {{count}} meeldimist"
+        other: "selles teemas on %{count} meeldimist"
       back_to_list: "Tagasi Teemade Loendisse"
       options: "Teema Suvandid"
       show_links: "näita viiteid selles teemas"
       toggle_information: "lülita teema üksikasjad ümber"
-      read_more_in_category: "Soovid veel lugeda? Vaata teisi teemasid {{catLink}} või {{latestLink}}."
-      read_more: "Soovid veel lugeda? {{catLink}} või {{latestLink}}."
+      read_more_in_category: "Soovid veel lugeda? Vaata teisi teemasid %{catLink} või %{latestLink}."
+      read_more: "Soovid veel lugeda? %{catLink} või %{latestLink}."
       read_more_MF: "Sul on { UNREAD, plural, =0 {} one { is <a href='{basePath}/unread'>1 lugemata</a> } other { are <a href='{basePath}/unread'># lugemata </a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 uus</a> teema} other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># uut</a> teemat} } jäänud või {CATEGORY, select, true {loe teisi teemasid {catLink} alafoorumis} false {{latestLink}} other {}}"
       browse_all_categories: Vaata kõiki foorumeid
       view_latest_topics: vaata värskeid teemasid
@@ -1604,25 +1607,25 @@ et:
         success_message: "Tähistasid selle teema edukalt."
       feature_topic:
         title: "Kajasta seda teemat"
-        pin: "Lisa see teema foorumi {{categoryLink}} tippu kuni"
-        confirm_pin: "Sul on juba {{count}} esiletõstetud teemat. Liiga palju esiletõstetud teemasid võib olla uutele või anonüümsetele kasutajatele koormav. Kas soovid kindlasti selles foorumis veel ühe teema esile tõsta?"
-        unpin: "Eemalda see teema foorumi {{categoryLink}} tipust."
-        unpin_until: "Eemalda see teema foorumi {{categoryLink}} tipust või oota kuni <strong>%{until}</strong>."
+        pin: "Lisa see teema foorumi %{categoryLink} tippu kuni"
+        confirm_pin: "Sul on juba %{count} esiletõstetud teemat. Liiga palju esiletõstetud teemasid võib olla uutele või anonüümsetele kasutajatele koormav. Kas soovid kindlasti selles foorumis veel ühe teema esile tõsta?"
+        unpin: "Eemalda see teema foorumi %{categoryLink} tipust."
+        unpin_until: "Eemalda see teema foorumi %{categoryLink} tipust või oota kuni <strong>%{until}</strong>."
         pin_note: "Kasutajad saavad teema esiletõstmise enda jaoks individuaalselt eemaldada."
         pin_validation: "Selle teema esiletõstmiseks on kuupäev nõutav."
-        not_pinned: "Liigis {{categoryLink}} ei ole ühtegi esiletõstetud teemat."
+        not_pinned: "Liigis %{categoryLink} ei ole ühtegi esiletõstetud teemat."
         already_pinned:
-          one: "Liigis {{categoryLink}} hetkel kinnitatud teemad: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Liigis {{categoryLink}} hetkel esiletõstetud teemad: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Liigis %{categoryLink} hetkel kinnitatud teemad: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Liigis %{categoryLink} hetkel esiletõstetud teemad: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Lisa see teema kõikide teemaloetelude tippu kuni"
-        confirm_pin_globally: "Sul on juba {{count}} igal pool esiletõstetud teemat. Liiga palju esiletõstetud teemasid võib olla uutele või anonüümsetele kasutajatele koormav. Kas soovid kindlasti selles foorumis veel ühe teema igal pool esile tõsta?"
+        confirm_pin_globally: "Sul on juba %{count} igal pool esiletõstetud teemat. Liiga palju esiletõstetud teemasid võib olla uutele või anonüümsetele kasutajatele koormav. Kas soovid kindlasti selles foorumis veel ühe teema igal pool esile tõsta?"
         unpin_globally: "Eemalda see teema kõikide teemaloetelude tipust."
         unpin_globally_until: "Eemalda see teema kõikide teemaloetelude tipust või oota kuni <strong>%{until}</strong>."
         global_pin_note: "Kasutajad saavad teema esiletõstmise enda jaoks individuaalselt eemaldada."
         not_pinned_globally: "Ühtegi igal pool esiletõstetud teemat pole."
         already_pinned_globally:
           one: "Hetkel globaalselt kinnitatud teemad: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Igal pool esiletõstetud teemad hetkel: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Igal pool esiletõstetud teemad hetkel: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Tee sellest teemast bänner mis on nähtav iga lehe päises."
         remove_banner: "Eemalda bänner kõikide lehtede päistest."
         banner_note: "Kasutajad saavad bänneri peita sulgemise teel. Korraga võib bänneriks olla ainult üks teema."
@@ -1652,14 +1655,14 @@ et:
         to_topic_username: "Sisestasid kasutajanime. Saadame su sõbrale kutse, mis lubab tal viivitamatult sellesse teemasse vastata."
         to_username: "Sisesta selle isiku kasutajanimi, keda soovid kutsuda. Saadame talle teavituse koos viitega, mis sisaldab kutset siia teemasse."
         email_placeholder: "nimi@kuskil.ee"
-        success_email: "Saatsime kutse kasutajale <b>{{emailOrUsername}}</b>. Teatame sulle, kui kutse on aktsepteeritud. Vaata kutsete sakki sinu saadetud kutsete osas ülevaate saamiseks."
+        success_email: "Saatsime kutse kasutajale <b>%{emailOrUsername}</b>. Teatame sulle, kui kutse on aktsepteeritud. Vaata kutsete sakki sinu saadetud kutsete osas ülevaate saamiseks."
         success_username: "Oleme kutsunud selle kasutaja teemas osalema."
         error: "Vabanda, meil ei õnnestunud seda kasutajat kutsuda. Kas on võimalik et ta on juba kutsutud? (Kutsete saatmise sagedus on piiratud)"
       login_reply: "Vastamiseks logi sisse"
       filters:
         n_posts:
           one: "%{count} postitus"
-          other: "{{count}} postitust"
+          other: "%{count} postitust"
         cancel: "Eemalda filter"
       split_topic:
         title: "Liiguta uue teema alla"
@@ -1669,14 +1672,14 @@ et:
         error: "Postituste uude teemasse liigutamisel tekkis viga."
         instructions:
           one: "Oled loomas uut teemat ja lisamas sinna just valitud postitust."
-          other: "Oled loomas uut teemat ja lisamas sinna valitud <b>{{count}}</b> postitust."
+          other: "Oled loomas uut teemat ja lisamas sinna valitud <b>%{count}</b> postitust."
       merge_topic:
         title: "Liiguta olemasolevasse teemasse"
         action: "liiguta olemasolevasse teemasse"
         error: "Postituste sellesse teemasse liigutamisel tekkis viga."
         instructions:
           one: "Vali teema, kuhu soovid selle postituse liigutada."
-          other: "Vali teema, kuhu soovid need <b>{{count}}</b> postitust liigutada."
+          other: "Vali teema, kuhu soovid need <b>%{count}</b> postitust liigutada."
       move_to_new_message:
         radio_label: "Uus sõnum"
       merge_posts:
@@ -1696,7 +1699,7 @@ et:
         instructions: "Palun vali teemale uus ajatempel. Teema postituste ajad nihkuvad sama ajavahe võrra."
       multi_select:
         select: "vali"
-        selected: "valitud ({{count}})"
+        selected: "valitud (%{count})"
         select_post:
           label: "vali"
           title: "Lisa postitus valikusse"
@@ -1710,16 +1713,16 @@ et:
         deselect_all: eemalda valik kõigilt
         description:
           one: Oled valinud <b>%{count}</b> postituse.
-          other: "Oled valinud <b>{{count}}</b> postitust."
+          other: "Oled valinud <b>%{count}</b> postitust."
     post:
       quote_reply: "Tsitaat"
       edit_reason: "Põhjus:"
-      post_number: "postitus {{number}}"
+      post_number: "postitus %{number}"
       wiki_last_edited_on: "viimati muudeti wikit"
       last_edited_on: "postitus viimati muudetud"
       reply_as_new_topic: "Vasta viitega teemale"
       reply_as_new_private_message: "Vasta uue sõnumina samadele adressaatidele"
-      continue_discussion: "Jätkates vestlust viitelt {{postLink}}:"
+      continue_discussion: "Jätkates vestlust viitelt %{postLink}:"
       follow_quote: "mine tsiteeritud postituse juurde"
       show_full: "Näita kogu postitust"
       deleted_by_author:
@@ -1729,24 +1732,24 @@ et:
       expand_collapse: "laienda/ahenda"
       gap:
         one: "vaata %{count} peidetud vastust"
-        other: "vaata {{count}} peidetud vastust"
+        other: "vaata %{count} peidetud vastust"
       unread: "Postitus on lugemata"
       has_replies:
-        one: "{{count}} vastus"
-        other: "{{count}} vastust"
+        one: "%{count} vastus"
+        other: "%{count} vastust"
       has_likes_title:
         one: "Ühele meeldis see postitus"
-        other: "{{count}}-le meeldis see postitus"
+        other: "%{count}-le meeldis see postitus"
       has_likes_title_only_you: "Sulle see postitus meeldis"
       has_likes_title_you:
         one: "Sulle ja veel ühele inimesele see postitus meeldis"
-        other: "Sulle ja veel {{count}} inimesele see postitus meeldis"
+        other: "Sulle ja veel %{count} inimesele see postitus meeldis"
       errors:
         create: "Vabandame, postituse loomisel tekkis viga. Palun proovi uuesti."
         edit: "Vabandame, postituse redigeerimisel tekkis viga. Palun proovi uuesti."
         upload: "Vabandame, selle faili üleslaadimisel tekkis viga. Palun proovi uuesti."
         too_many_uploads: "Vabandame, faile saab üles laadida vaid ühekaupa."
-        upload_not_authorized: "Vabandust, fail mida püüad üles laadida, ei ole lubatud (lubatud faililaiendid: {{authorized_extensions}})."
+        upload_not_authorized: "Vabandust, fail mida püüad üles laadida, ei ole lubatud (lubatud faililaiendid: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Vabandame, uued kasutajad ei saa pilte üles laadida."
         attachment_upload_not_allowed_for_new_user: "Vabandame, uued kasutajad ei saa manuseid üles laadida."
         attachment_download_requires_login: "Vabandame, manuste allalaadimiseks pead olema sisse logitud."
@@ -1816,11 +1819,11 @@ et:
       delete:
         confirm:
           one: "Oled sa kindel, et soovid seda postitust kustutada?"
-          other: "Oled sa kindel, et soovid neid {{count}} postitust kustutada?"
+          other: "Oled sa kindel, et soovid neid %{count} postitust kustutada?"
       merge:
         confirm:
           one: "Oled kindel, et soovid need postitused ühendada?"
-          other: "Oled kindel, et soovid need {{count}} postitust ühendada?"
+          other: "Oled kindel, et soovid need %{count} postitust ühendada?"
       revisions:
         controls:
           first: "Esimene redaktsioon"
@@ -1965,13 +1968,13 @@ et:
       custom_message:
         at_least:
           one: "sisesta vähemalt %{count} sümbol"
-          other: "sisesta vähemalt {{count}} sümbolit"
+          other: "sisesta vähemalt %{count} sümbolit"
         more:
           one: "%{count} veel"
-          other: "{{count}} veel..."
+          other: "%{count} veel..."
         left:
           one: "%{count} jäänud"
-          other: "{{count}} jäänud"
+          other: "%{count} jäänud"
     flagging_topic:
       title: "Täname, et aitad meie kogukonna viisakust säilitada!"
       action: "Tähista teema"
@@ -2012,7 +2015,7 @@ et:
       unlisted:
         help: "See teema on salastatud; teda ei kuvata teemade loendites ning on kättesaadav vaid otseviite kaudu"
     posts: "Postitused"
-    posts_long: "selles teemas on {{number}} postitust"
+    posts_long: "selles teemas on %{number} postitust"
     posts_likes_MF: |
       Selles teemas on {count, plural, one {1 vastus} other {# vastust}} {ratio, select,
       low {kõrge meeldimiste / postituste suhtega}
@@ -2027,20 +2030,20 @@ et:
     replies: "Vastuseid"
     views_long:
       one: "seda teemat on vaadatud %{count} kord"
-      other: "seda teemat on vaadatud {{number}} korda"
+      other: "seda teemat on vaadatud %{number} korda"
     activity: "Aktiivsus"
     likes: "Meeldimisi"
     likes_lowercase:
       one: "meeldimine"
       other: "meeldimisi"
-    likes_long: "selles teemas on {{number}} meeldimist"
+    likes_long: "selles teemas on %{number} meeldimist"
     users: "Kasutajad"
     users_lowercase:
       one: "kasutaja"
       other: "kasutajad"
     category_title: "Foorum"
     history: "Ajalugu"
-    changed_by: "autor {{author}}"
+    changed_by: "autor %{author}"
     raw_email:
       title: "Sissetulevad e-kirjad"
       not_available: "Pole saadaval!"
@@ -2052,33 +2055,33 @@ et:
         title: "Värskeimad"
         title_with_count:
           one: "Värskeim (%{count})"
-          other: "Värskeimad ({{count}})"
+          other: "Värskeimad (%{count})"
         help: "teemad hiljutiste postitustega"
       read:
         title: "Loetud"
         help: "loetud teemad, viimase lugemise järjekorras"
       categories:
         title: "Foorumid"
-        title_in: "Foorum - {{categoryName}}"
+        title_in: "Foorum - %{categoryName}"
         help: "kõik teemad foorumite järgi rühmitatuna"
       unread:
         title: "Lugemata"
         title_with_count:
           one: "Lugemata (%{count})"
-          other: "Lugemata ({{count}})"
+          other: "Lugemata (%{count})"
         help: "teemad, mida vaatled või jälgid koos lugemata postitustega"
         lower_title_with_count:
           one: "%{count} lugemata"
-          other: "{{count}} lugemata"
+          other: "%{count} lugemata"
       new:
         lower_title_with_count:
           one: "%{count} uus"
-          other: "{{count}} uut"
+          other: "%{count} uut"
         lower_title: "uus"
         title: "Uus"
         title_with_count:
           one: "Uus (%{count})"
-          other: "Uusi ({{count}})"
+          other: "Uusi (%{count})"
         help: "viimase paari päeva jooksul loodud teemad"
       posted:
         title: "Minu"
@@ -2087,11 +2090,11 @@ et:
         title: "Järjehoidjad"
         help: "järjehoidjatega teemad"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "värskeimad teemad foorumis {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "värskeimad teemad foorumis %{categoryName}"
       top:
         title: "Juhtivad"
         help: "aktiivseimad teemad viimase aasta, kuu, nädala või päeva sees"
@@ -2454,10 +2457,10 @@ et:
           redeliver: "Saada uuesti"
           incoming:
             one: "On tekkinud uus sündmus."
-            other: "On tekkinud {{count}} uut sündmust."
+            other: "On tekkinud %{count} uut sündmust."
           completed_in:
             one: "Lõpetatud %{count} sekundiga."
-            other: "Lõpetatud {{count}} sekundiga."
+            other: "Lõpetatud %{count} sekundiga."
           request: "Päring"
           response: "Vastus"
           redeliver_confirm: "Oled kindel, et soovid sama kasulikku lasti uuesti saata?"
@@ -2508,10 +2511,10 @@ et:
           label: "Lae üles"
           title: "Lae varukoopia üles sellesse instantsi"
           uploading: "Laen üles..."
-          error: "Faili '{{filename}}' üleslaadimisel tekkis viga: {{message}}"
+          error: "Faili '%{filename}' üleslaadimisel tekkis viga: %{message}"
         operations:
           is_running: "Toiming on hetkel pooleli..."
-          failed: "Toiming {{operation}} ebaõnnestus. Kontrolli logisid."
+          failed: "Toiming %{operation} ebaõnnestus. Kontrolli logisid."
           cancel:
             label: "Tühista"
             title: "Tühista antud tegevus"
@@ -2907,8 +2910,8 @@ et:
           title: "Näita selle kasutaja meiliaadressi"
           text: "Näita"
       user:
-        suspend_failed: "Selle kasutaja peatamisel tekkis viga {{error}}"
-        unsuspend_failed: "Selle kasutaja taaslubamisel tekkis viga {{error}}"
+        suspend_failed: "Selle kasutaja peatamisel tekkis viga %{error}"
+        unsuspend_failed: "Selle kasutaja taaslubamisel tekkis viga %{error}"
         suspend_duration: "Kauaks see kasutaja peatatakse?"
         suspend_reason_label: "Peatamise põhjus? See tekst <b>on nähtav kõigile</b> selle kasutaja profiililehel, samuti kuvatakse kasutajale, kui ta üritab sisse logida. Tee lühidalt."
         suspend_reason: "Põhjus"
@@ -3204,6 +3207,7 @@ et:
         title: "Emotikon"
         help: "Lisa uued emotikonid kõigile kasutamiseks. (PRO-vihje: pukseeri korraga mitu faili)"
         add: "Lisa uus emotikon"
+        uploading: "Laen üles..."
         name: "Nimi"
         group: "Grupp"
         image: "Pilt"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index a22efc5b04..eb44b2c1ed 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -23,8 +23,8 @@ fa_IR:
             mb: مگابایت
             tb: ترابایت
       short:
-        thousands: "{{number}} هزار"
-        millions: "{{number}} میلیون"
+        thousands: "%{number} هزار"
+        millions: "%{number} میلیون"
     dates:
       time: "HH:mm"
       time_with_zone: "HH:mm (z)"
@@ -227,11 +227,11 @@ fa_IR:
     weekly: "هفتگی"
     every_month: "هر ماه"
     every_six_months: "هر شش ماه"
-    max_of_count: "حداکثر {{count}}"
+    max_of_count: "حداکثر %{count}"
     alternation: "یا"
     character_count:
-      one: "{{count}} نویسه"
-      other: "{{count}} نویسه"
+      one: "%{count} نویسه"
+      other: "%{count} نویسه"
     related_messages:
       title: "پیام‌های مرتبط"
       see_all: '<a href="%{path}">تمام پیام‌های</a>از طرف%{username}@ را ببینید'
@@ -296,14 +296,14 @@ fa_IR:
         yes_value: "بله، رها کن"
         no_value: "خیر، نگه دار"
     topic_count_latest:
-      one: "{{count}} موضوع تازه یا به‌ روز شده."
-      other: "{{count}} موضوع تازه یا به‌ روز شده."
+      one: "%{count} موضوع تازه یا به‌ روز شده."
+      other: "%{count} موضوع تازه یا به‌ روز شده."
     topic_count_unread:
-      one: "خواندن {{count}} موضوعات خوانده نشده"
-      other: "خواندن {{count}} موضوع خوانده نشده"
+      one: "خواندن %{count} موضوعات خوانده نشده"
+      other: "خواندن %{count} موضوع خوانده نشده"
     topic_count_new:
-      one: "مشاهده {{count}} موضوعات جدید"
-      other: "مشاهده {{count}} موضوع جدید"
+      one: "مشاهده %{count} موضوعات جدید"
+      other: "مشاهده %{count} موضوع جدید"
     preview: "پیش‌نمایش"
     cancel: "لغو"
     save: "ذخیره سازی تغییرات"
@@ -311,7 +311,7 @@ fa_IR:
     saved: "ذخیره شد!"
     upload: "بارگذاری"
     uploading: "در حال بارگذاری..."
-    uploading_filename: "بارگذاری {{filename}}..."
+    uploading_filename: "بارگذاری %{filename}..."
     clipboard: "کلیپ بورد"
     uploaded: "بارگذاری شد!"
     pasting: "چسباندن..."
@@ -365,7 +365,7 @@ fa_IR:
         optional: "می‌توانید این مورد را درخواست کنید تا دیگران را از بازنگری آن بازنگه دارید."
         required: "شما قبل از بازنگری موارد باید آن‌ها را درخواست دهید ."
         claimed_by_you: "می‌توانید این مورد را درخواست کنید و آن را بازنگری کنید."
-        claimed_by_other: "این مورد فقط توسط کاربر<b>{{username}} </b>قابل بازنگری است."
+        claimed_by_other: "این مورد فقط توسط کاربر<b>%{username} </b>قابل بازنگری است."
       claim:
         title: "درخواست این مبحث"
       unclaim:
@@ -385,7 +385,7 @@ fa_IR:
       view_pending: "نمایش صف انتظار"
       topic_has_pending:
         one: "این مبحث <b>%{count}</b>نوشته در حال انتظار دارد"
-        other: "این مبحث <b>{{count}}</b>نوشته در حال انتظار دارد."
+        other: "این مبحث <b>%{count}</b>نوشته در حال انتظار دارد."
       title: "بازنگری"
       topic: "موضوع:"
       filtered_topic: "شما یک مبحث را بر حسب محتوای قابل بازنگری فیلتر کرده‌اید"
@@ -402,17 +402,17 @@ fa_IR:
         fields: "فیلدها"
       user_percentage:
         summary:
-          one: "{{agreed}}، {{disagreed}}، {{ignored}}({{count}}پرچم)"
-          other: "{{agreed}}، {{disagreed}}، {{ignored}} ({{count}}پرچم)"
+          one: "%{agreed}، %{disagreed}، %{ignored}(%{count}پرچم)"
+          other: "%{agreed}، %{disagreed}، %{ignored} (%{count}پرچم)"
         agreed:
-          one: "{{count}}% موافقت شده"
-          other: "{{count}}% موافقت شده"
+          one: "%{count}% موافقت شده"
+          other: "%{count}% موافقت شده"
         disagreed:
-          one: "{{count}}% موافقت نشده"
-          other: "{{count}}% موافقت نشده"
+          one: "%{count}% موافقت نشده"
+          other: "%{count}% موافقت نشده"
         ignored:
-          one: "{{count}}% صرف نظر شده"
-          other: "{{count}}% صرف نظر شده"
+          one: "%{count}% صرف نظر شده"
+          other: "%{count}% صرف نظر شده"
       topics:
         topic: "موضوعات"
         reviewable_count: "تعداد"
@@ -422,10 +422,10 @@ fa_IR:
         details: "جزئیات"
         unique_users:
           one: "%{count}کاربر"
-          other: "{{count}}کاربر"
+          other: "%{count}کاربر"
       replies:
         one: "%{count}پاسخ"
-        other: "{{count}}پاسخ"
+        other: "%{count}پاسخ"
       edit: "ویرایش"
       save: "ذخیره"
       cancel: "لغو کردن"
@@ -489,22 +489,22 @@ fa_IR:
         description: "ما نوشته شما را دریافت کرده ایم ولی قبل از نمایش نیاز به تایید آن توسط یکی از مدیران است. لطفا صبر داشته باشید."
         pending_posts:
           one: "شما <strong>%{count}</strong> نوشته در انتظار دارید"
-          other: "شما <strong>{{count}}</strong> نوشته در انتظار دارید"
+          other: "شما <strong>%{count}</strong> نوشته در انتظار دارید"
         ok: "باشه"
     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> جدید ایجاد کردید."
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a>\n به <a href='{{postUrl}}'>{{post_number}}</a> پاسخ داد"
-      you_replied_to_post: "<a href='{{userUrl}}'>شما</a>\n به <a href='{{postUrl}}'>{{post_number}}</a> پاسخ دادید"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a>\n به <a href='{{postUrl}}'>موضوع</a> پاسخ داد"
-      you_replied_to_topic: "<a href='{{userUrl}}'>شما</a>\n به <a href='{{postUrl}}'>موضوع</a> پاسخ دادید"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> mentioned <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> به <a href='{{user2Url}}'>شما</a> اشاره کرد"
-      you_mentioned_user: "<a href='{{user1Url}}'>شما</a> به <a href='{{user2Url}}'>{{another_user}}</a> اشاره کردید"
-      posted_by_user: "ارسال شده توسط <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "ارسال شده توسط <a href='{{userUrl}}'>شما</a>"
-      sent_by_user: "ارسال شده توسط <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "ارسال شده توسط <a href='{{userUrl}}'>شما</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> <a href='%{topicUrl}'>یک موضوع</a> ایجاد کرد"
+      you_posted_topic: "<a href='%{userUrl}'>شما یک </a><a href='%{topicUrl}'>موضوع</a> جدید ایجاد کردید."
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a>\n به <a href='%{postUrl}'>%{post_number}</a> پاسخ داد"
+      you_replied_to_post: "<a href='%{userUrl}'>شما</a>\n به <a href='%{postUrl}'>%{post_number}</a> پاسخ دادید"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a>\n به <a href='%{postUrl}'>موضوع</a> پاسخ داد"
+      you_replied_to_topic: "<a href='%{userUrl}'>شما</a>\n به <a href='%{postUrl}'>موضوع</a> پاسخ دادید"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> mentioned <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> به <a href='%{user2Url}'>شما</a> اشاره کرد"
+      you_mentioned_user: "<a href='%{user1Url}'>شما</a> به <a href='%{user2Url}'>%{another_user}</a> اشاره کردید"
+      posted_by_user: "ارسال شده توسط <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "ارسال شده توسط <a href='%{userUrl}'>شما</a>"
+      sent_by_user: "ارسال شده توسط <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "ارسال شده توسط <a href='%{userUrl}'>شما</a>"
     directory:
       filter_name: "فیلتر بر اساس نام کاربری"
       title: "کاربران"
@@ -740,7 +740,7 @@ fa_IR:
     user_fields:
       none: "(یک گزینه انتخاب کنید)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "نمایه"
       mute: "بی‌صدا"
       edit: "ویرایش تنظیمات"
@@ -815,12 +815,12 @@ fa_IR:
       enable_defer: "تاخیر را برای علامت زدن مباحث به عنوان خوانده نشده فعال کن"
       change: "تغییر"
       featured_topic: "مبحث برجسته"
-      moderator: "{{user}} یک مدیر است"
-      admin: "{{user}} یک مدیر ارشد است"
+      moderator: "%{user} یک مدیر است"
+      admin: "%{user} یک مدیر ارشد است"
       moderator_tooltip: "این کاربر یک مدیر است"
       admin_tooltip: "این کاربر یک ادمین است"
       silenced_tooltip: "صدای این کاربر قطع شده است"
-      suspended_notice: "این کاربر تا {{date}} در وضعیت معلق است."
+      suspended_notice: "این کاربر تا %{date} در وضعیت معلق است."
       suspended_permanently: "این کاربر معلق شده."
       suspended_reason: "دلیل: "
       github_profile: "Github"
@@ -833,7 +833,7 @@ fa_IR:
           موضوعات و دسته‌بندی‌های قفل شده در این ایمیل‌ها نخواهند بود.
         individual: "ارسال یک ایمیل برای هر پست جدید"
         individual_no_echo: "ارسال ایمیل برای هر پست جدید، به جز پست‌های خودم"
-        many_per_day: "برای هر پست جدید یک ایمیل برای من بفرست. (حدود {{dailyEmailEstimate}} در روز)"
+        many_per_day: "برای هر پست جدید یک ایمیل برای من بفرست. (حدود %{dailyEmailEstimate} در روز)"
         few_per_day: "ارسال یک ایمیل برای هر پست جدید (حدود 2 ایمیل در روز)"
         warning: "حالت ایمیل فعال شد. تنظیمات اگاه سازی ایمیلی بازنویسی میشود."
       tag_settings: "برچسب‌ها"
@@ -863,9 +863,7 @@ fa_IR:
       admin_delete: "پاک کردن"
       users: "کاربران"
       muted_users: "بی‌صدا"
-      muted_users_instructions: "متوقف کردن تمام اطلاعیه ها از طرف این کاربران."
       ignored_users: "صرف نظر شده"
-      ignored_users_instructions: "تمام نوشته ها و اگاه سازی ها از این کاربران را خاموش کنید."
       tracked_topics_link: "نمایش"
       automatically_unpin_topics: "برداشتن پین موضوعات وقتی به پایین صفحه رسیدم."
       apps: "برنامه‌ها"
@@ -919,11 +917,11 @@ fa_IR:
         disable: "ازکاراندازی"
         enable: "فعال کردن"
         enable_long: "کدهای پشتیبان را به کار بگیر"
-        manage: "مدیریت کد‌های پشتیبانی، <strong>{{count}}</strong> از کد‌های پشتیبانی شما باقی مانده"
+        manage: "مدیریت کد‌های پشتیبانی، <strong>%{count}</strong> از کد‌های پشتیبانی شما باقی مانده"
         copy_to_clipboard: "کپی در clipboard"
         copy_to_clipboard_error: "خطا در کپی اطلاعات"
         copied_to_clipboard: "کپی شد"
-        remaining_codes: "شما <strong>{{count}}</strong>کد پشتیبان باقی مانده دارید."
+        remaining_codes: "شما <strong>%{count}</strong>کد پشتیبان باقی مانده دارید."
         use: "از کد پشتیبان استفاده کنید"
         enable_prerequisites: "شما باید قبل از ساخت کد‌های پشتیبانی یک تایید هویت دوعاملی اصلی را فعال کنید "
         codes:
@@ -982,7 +980,7 @@ fa_IR:
         success_staff: "یک ایمیل به آدرس کنونی شما ارسال کردیم. لطفا دستورالعمل آن را دنبال کنید."
       change_avatar:
         title: "عکس نمایه خود را تغییر دهید"
-        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a> ، بر اساس"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a> ، بر اساس"
         letter_based: "سیستم تصویر پرفایل را اختصاص داده است"
         uploaded_avatar: "تصویر سفارشی"
         uploaded_avatar_empty: "افزودن تصویر سفارشی"
@@ -1003,11 +1001,11 @@ fa_IR:
         ok: "برای تایید ایمیلی برایتان ارسال خواهیم کرد."
         required: "لطفا یک آدرس ایمیل وارد کنید"
         invalid: "لطفا یک آدرس ایمیل معتبر وارد کنید"
-        authenticated: "ایمیل شما توسط {{provider}} تصدیق شد"
+        authenticated: "ایمیل شما توسط %{provider} تصدیق شد"
         frequency_immediately: "اگر به سرعت چیزی را که برایتان ارسال نکردیم نخوانده باشید، بلافاصله برایتان ایمیل ارسال می‌کنیم."
         frequency:
-          one: "ما فقط در صورتی برای شما ایمیل میفرستیم که در {{count}} دقیقه آخر شما را ندیده باشیم."
-          other: "ما فقط در صورتی برای شما ایمیل میفرستیم که در {{count}} دقیقه آخر شما را ندیده باشیم."
+          one: "ما فقط در صورتی برای شما ایمیل میفرستیم که در %{count} دقیقه آخر شما را ندیده باشیم."
+          other: "ما فقط در صورتی برای شما ایمیل میفرستیم که در %{count} دقیقه آخر شما را ندیده باشیم."
       associated_accounts:
         title: "حساب های مرتبط"
         connect: "وصل شدن"
@@ -1028,9 +1026,9 @@ fa_IR:
       username:
         title: "نام‌کاربری"
         instructions: "یکتا، بدون فاصله، کوتاه"
-        short_instructions: "می توانید به کاربران دیگر اشاره کنید با@{{username}}"
+        short_instructions: "می توانید به کاربران دیگر اشاره کنید با@%{username}"
         available: "نام کاربری شما در دسترس است"
-        not_available: "در دسترس نیست. این را امتحان کن {{suggestion}} ؟"
+        not_available: "در دسترس نیست. این را امتحان کن %{suggestion} ؟"
         not_available_no_suggestion: "در دسترس نیست"
         too_short: "نام کاربری انتخابی شما خیلی کوتاه است"
         too_long: "نام کاربری انتخابی شما خیلی طولانی است"
@@ -1053,11 +1051,11 @@ fa_IR:
         log_out_all: "از همه خارج شو"
         active: "الان فعال است"
         not_you: "شما نیستید؟"
-        show_all: "نمایش همه ({{count}})"
+        show_all: "نمایش همه (%{count})"
         show_few: "کمتر نشان بده"
         was_this_you: "آیا شما بودید؟"
         was_this_you_description: "اگر شما نبودید، پیشنهاد می‌کنیم رمز عبور خود را تغییر دهید و از همه حساب ها خارج شوید"
-        browser_and_device: "{{browser}} در {{device}}"
+        browser_and_device: "%{browser} در %{device}"
         secure_account: "از حساب کاربری من محافظت کن"
         latest_post: "آخرین بار شما نوشتید ..."
       last_posted: "آخرین نوشته"
@@ -1135,21 +1133,20 @@ fa_IR:
         user: "کاربر دعوت شده"
         none: "هیچ دعوتنامه ای برای نمایش نیست"
         truncated:
-          one: "نمایش {{count}} دعوت اول."
-          other: "نمایش {{count}} دعوت اول."
+          one: "نمایش %{count} دعوت اول."
+          other: "نمایش %{count} دعوت اول."
         redeemed: "دعوت‌نامه‌های استفاده شده"
         redeemed_tab: "استفاده شده"
-        redeemed_tab_with_count: "({{count}}) استفاده شده"
+        redeemed_tab_with_count: "(%{count}) استفاده شده"
         redeemed_at: "استفاده شده"
         pending: "دعوت‌های در انتظار"
         pending_tab: "در انتظار"
-        pending_tab_with_count: "({{count}}) در انتظار"
+        pending_tab_with_count: "(%{count}) در انتظار"
         topics_entered: "موضوعات بازدید شده"
         posts_read_count: "نوشته‌های خوانده شده"
         expired: "این دعوت منقضی شده است."
         rescind: "پاک کردن"
         rescinded: "دعوت حذف شد"
-        rescind_all: "تمام دعوتنامه های منقضی شده را پاک کن"
         rescinded_all: "تمام دعوت نامه های منقضی شده حذف شدند!"
         rescind_all_confirm: "مطمئنی می‌خواهی تمام دعوتنامه های منقضی شده را پاک کنی؟"
         reinvite: "ارسال دوباره دعوت"
@@ -1160,13 +1157,17 @@ fa_IR:
         time_read: "زمان خواندن"
         days_visited: "روز های بازدید شده"
         account_age_days: "عمر حساب بر اساس روز"
-        create: "فرستادن یک دعوتنامه"
+        links_tab: "پیوندها"
+        link_created_at: "ساخته شده"
+        link_groups: گروه ها
+        create: "ارسال دعوتنامه "
         generate_link: "کپی لینک دعوت"
         link_generated: "لینک دعوت با موفقیت ایجاد شد!"
         valid_for: "لینک دعوت فقط برای این ایمیل معتبر است: %{email}"
+        invite_link:
+          success: "لینک دعوت با موفقیت ایجاد شد!"
         bulk_invite:
           none: "هنوز کسی را دعوت نکرده‌اید. افراد را یکی یکی یا یک جا با <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>فایل CSV</a> دعوت کنید."
-          text: "دعوت گروهی از طریق فایل"
           success: "فایل با موفقیت بارگذاری شد٬ وقتی که پروسه تمام شد به شما را از طریق پیام اطلاع می دهیم. "
           error: "با عرض پوزش، نوع فایل باید CSV باشد."
           confirmation_message: "میخواهید به همه ی افراد فایل اپلود شده دعوتنامه بفرستید"
@@ -1258,7 +1259,7 @@ fa_IR:
       desc:
         network: "ارتباط اینترنتی‌تان را بررسی کنید."
         network_fixed: "به نظر می رسد درست شد!"
-        server: "کد خطا: {{status}}"
+        server: "کد خطا: %{status}"
         forbidden: "شما اجازه دیدن آن را ندارید."
         not_found: "اوه, برنامه سعی کرد پیوندی را که وجود ندارد باز کند."
         unknown: "اشتباهی روی داد."
@@ -1315,8 +1316,8 @@ fa_IR:
       value_prop: "وقتی یک حساب کاربری بسازید، دقیقا به جایی که پیشتر مطالعه می‌کردید برمی‌گردید. در ضمن وقتی کسی به شما پاسخ داد، آگاه‌سازی ایمیلی هم دریافت می‌کنید. و می‌توانید نوشته‌های خوب را لایک کنید و محبت را در فضا توسعه دهید :heartpulse:"
     summary:
       enabled_description: "شما خلاصه ای از این موضوع را می بینید: بالاترین‌ نوشته‌هایی که توسط انجمن انتخاب شده."
-      description: "<b>{{replyCount}}</b> پاسخ وجود دارد."
-      description_time: " <b>{{replyCount}}</b> پاسخ با زمان برآورد شده <b>{{readingTime}} دقیقه</b> برای خواندن وجود دارد."
+      description: "<b>%{replyCount}</b> پاسخ وجود دارد."
+      description_time: " <b>%{replyCount}</b> پاسخ با زمان برآورد شده <b>%{readingTime} دقیقه</b> برای خواندن وجود دارد."
       enable: "خلاصه‌ی این موضوع"
       disable: "نمایش همه‌ی نوشته‌ها"
     deleted_filter:
@@ -1329,8 +1330,8 @@ fa_IR:
       invite: "فراخواندن دیگران ..."
       edit: "حذف یا اضافه ... "
       leave_message: "واقعا میخواهید این پیام را ترک کنید؟"
-      remove_allowed_user: "آیا واقعا می خواهید اسم {{name}} از پیام برداشته شود ؟ "
-      remove_allowed_group: "آیا از حذف {{name}} از این پیام اطمینان دارید؟"
+      remove_allowed_user: "آیا واقعا می خواهید اسم %{name} از پیام برداشته شود ؟ "
+      remove_allowed_group: "آیا از حذف %{name} از این پیام اطمینان دارید؟"
     email: "ایمیل"
     username: "نام‌کاربری"
     last_seen: "مشاهده شد"
@@ -1339,7 +1340,7 @@ fa_IR:
     trust_level: "سطح اعتماد"
     search_hint: "نام کاربری ، ایمیل یا ای پی "
     create_account:
-      disclaimer: "با ثبت نام شما با <a href='{{privacy_link}}' target='blank'>حریم خصوصی</a> و <a href='{{tos_link}}' target='blank'>شرایط و ضوابط استفاده از سرویس </a> موافقت کرده اید."
+      disclaimer: "با ثبت نام شما با <a href='%{privacy_link}' target='blank'>حریم خصوصی</a> و <a href='%{tos_link}' target='blank'>شرایط و ضوابط استفاده از سرویس </a> موافقت کرده اید."
       title: "ساختن حساب‌کاربری جدید"
       failed: "اشتباهی روی داده، شاید این نام کاربری پیش‌تر استفاده شده؛ پیوند فراموشی گذرواژه می‌تواند کمک کند."
     forgot_password:
@@ -1392,7 +1393,7 @@ fa_IR:
       awaiting_activation: "حساب‌کاربری شما در انتظار فعالسازی‌ است، برای ارسال مجدد ایمیل فعالسازی از گزینه فراموشی رمز عبور استفاده کنید."
       awaiting_approval: "هنوز همکاران حساب کاربری شما را تأیید نکرده‌اند. پس از تأیید، یک ایمیل دریافت خواهید کرد."
       requires_invite: "متأسفیم، دسترسی به این انجمن تنها با دعوت امکان دارد."
-      not_activated: "هنوز امکان ورود وجود ندارد. برای شما یک ایمیل فعالسازی به <b>{{sentTo}}</b> فرستادیم. برای فعال‌سازی شناسه‌تان لطفاً دستورالعمل ایمیل را دنبال کنید."
+      not_activated: "هنوز امکان ورود وجود ندارد. برای شما یک ایمیل فعالسازی به <b>%{sentTo}</b> فرستادیم. برای فعال‌سازی شناسه‌تان لطفاً دستورالعمل ایمیل را دنبال کنید."
       not_allowed_from_ip_address: "شما نمی توانید با این آدرس آیپی وارد شوید."
       admin_not_allowed_from_ip_address: "شما نمی تواند با این آدرس آیپی وارد بخش مدیریت شوید."
       resend_activation_email: "برای ارسال مجدد ایمیل فعالسازی، اینجا را کلیک کنید."
@@ -1401,7 +1402,7 @@ fa_IR:
       change_email: "تغییر ایمیل"
       provide_new_email: "یک ایمیل جدید وارد کنید و ما ایمیل فعالسازی را برایتان ارسال می‌کنیم."
       submit_new_email: "تغییر ایمیل"
-      sent_activation_email_again: "ایمیل فعال‌سازی دیگری را به نشانی <b>{{currentEmail}}</b> فرستادیم. ممکن است چند دقیقه طول بکشد؛ مطمئن شوید که پوشه اسپم را نیز بررسی کنید."
+      sent_activation_email_again: "ایمیل فعال‌سازی دیگری را به نشانی <b>%{currentEmail}</b> فرستادیم. ممکن است چند دقیقه طول بکشد؛ مطمئن شوید که پوشه اسپم را نیز بررسی کنید."
       sent_activation_email_again_generic: "یک ایمیل فعالسازی دیگر فرستادیم. رسیدن آن ممکن است چند دقیقه طول بکشد؛ لطفا پوشه‌ی اسپم را هم چک کنید."
       to_continue: "لطفا وارد شوید"
       preferences: "شما باید وارد شوید تا بتوانید تنظیمات کاربری خود را تغییر بدهید."
@@ -1461,19 +1462,19 @@ fa_IR:
     conditional_loading_section:
       loading: بارگذاری...
     category_row:
-      topic_count: "{{count}} مبحث در این دسته بندی"
+      topic_count: "%{count} مبحث در این دسته بندی"
     select_kit:
       default_header_text: انتخاب...
       no_content: چیزی یافت نشد.
       filter_placeholder: جستجو...
       filter_placeholder_with_any: "جستجو کنید یا بسازید ... "
-      create: "بسازید `{{content}}`"
+      create: "بسازید `%{content}`"
       max_content_reached:
-        one: "شما فقط {{count}}مورد میتوانید انتخاب کنید"
-        other: "شما فقط {{count}} مورد میتوانید انتخاب کنید"
+        one: "شما فقط %{count}مورد میتوانید انتخاب کنید"
+        other: "شما فقط %{count} مورد میتوانید انتخاب کنید"
       min_content_not_reached:
-        one: "لطفا حداقل {{count}} ایتم را انتخاب کنید"
-        other: "لطفا حداقل {{count}}ایتم را انتخاب کنید"
+        one: "لطفا حداقل %{count} ایتم را انتخاب کنید"
+        other: "لطفا حداقل %{count}ایتم را انتخاب کنید"
     date_time_picker:
       from: از طرف
       to: به
@@ -1498,7 +1499,7 @@ fa_IR:
       default: ایموجی های مخصوص
     shared_drafts:
       title: "درفت مشترک"
-      notice: "این موضوع فقط برای افرادی که به دسته بندی <b>{{category}}</b>دسترسی دارند نمایش داده می‌شود."
+      notice: "این موضوع فقط برای افرادی که به دسته بندی <b>%{category}</b>دسترسی دارند نمایش داده می‌شود."
       destination_category: "دسته بندی مقصد"
       publish: "درفت مشترک را منتشر کن"
       confirm_publish: "از انتشار درفت مطمئنید؟"
@@ -1519,21 +1520,21 @@ fa_IR:
       drafts_offline: "پیش نویس آفلاین"
       edit_conflict: "ویرایش تناقض"
       group_mentioned:
-        one: "با اشاره به {{group}}، به <a href='{{group_link}}'>{{count}} نفر</a> اطلاعیه ارسال می‌شود. مطمئن هستید؟"
-        other: "با اشاره به {{group}}، به <a href='{{group_link}}'>{{count}} نفر</a> اطلاعیه ارسال می‌شود. مطمئن هستید؟"
+        one: "با اشاره به %{group}، به <a href='%{group_link}'>%{count} نفر</a> اطلاعیه ارسال می‌شود. مطمئن هستید؟"
+        other: "با اشاره به %{group}، به <a href='%{group_link}'>%{count} نفر</a> اطلاعیه ارسال می‌شود. مطمئن هستید؟"
       cannot_see_mention:
-        category: "شما به {{username}} اشاره کردید ولی ایشان به دلیل نداشتن دسترسی به این دسته‌بندی، مطلع نخواهند شد. برای دسترسی باید آن‌ها را به گروهی که به این دسته‌بندی دسترسی دارند اضافه کنید."
-        private: "شما به {{username}} اشاره کردید ولی به دلیل نداشتن دسترسی به این پیام خصوصی مطلع نخواهند شد. برای دسترسی باید آن‌ها را به این پیام خصوصی دعوت کنید."
-      duplicate_link: "به نظر می‌رسد پیوند شما به <b>{{domain}}</b> قبلاً در یک مبحث توسط <b>@ {{username}}</b> در <a href='{{post_url}}'>پاسخ به {{ago}} ارسال شده است</a> - مطمئن هستید که می خواهید دوباره آن را بفرستید؟"
+        category: "شما به %{username} اشاره کردید ولی ایشان به دلیل نداشتن دسترسی به این دسته‌بندی، مطلع نخواهند شد. برای دسترسی باید آن‌ها را به گروهی که به این دسته‌بندی دسترسی دارند اضافه کنید."
+        private: "شما به %{username} اشاره کردید ولی به دلیل نداشتن دسترسی به این پیام خصوصی مطلع نخواهند شد. برای دسترسی باید آن‌ها را به این پیام خصوصی دعوت کنید."
+      duplicate_link: "به نظر می‌رسد پیوند شما به <b>%{domain}</b> قبلاً در یک مبحث توسط <b>@ %{username}</b> در <a href='%{post_url}'>پاسخ به %{ago} ارسال شده است</a> - مطمئن هستید که می خواهید دوباره آن را بفرستید؟"
       error:
         title_missing: "عنوان الزامی است"
-        title_too_short: "عنوان دست‌کم باید {{min}} نویسه باشد"
-        title_too_long: "عنوان نمی‌تواند بیش‌تر از {{max}} نویسه باشد"
+        title_too_short: "عنوان دست‌کم باید %{min} نویسه باشد"
+        title_too_long: "عنوان نمی‌تواند بیش‌تر از %{max} نویسه باشد"
         post_missing: "فرسته نمی‌تواند خالی باشد."
-        post_length: "نوشته باید دست‌کم {{min}} نویسه داشته باشد"
-        try_like: "دکمه‌ی {{heart}} را امتحان کرده‌اید؟ "
+        post_length: "نوشته باید دست‌کم %{min} نویسه داشته باشد"
+        try_like: "دکمه‌ی %{heart} را امتحان کرده‌اید؟ "
         category_missing: "باید یک دسته‌بندی انتخاب کنید"
-        tags_missing: "شما باید حداقل {{count}}برچسب انتخاب کنید"
+        tags_missing: "شما باید حداقل %{count}برچسب انتخاب کنید"
       save_edit: "ذخیره ویرایش"
       overwrite_edit: "بازنویسی ویرایش"
       reply_original: "پاسخ دادن در موضوع اصلی"
@@ -1626,57 +1627,57 @@ fa_IR:
     notifications:
       tooltip:
         regular:
-          one: "{{count}} اعلان دیده نشده"
-          other: "{{count}} اعلان دیده نشده"
+          one: "%{count} اعلان دیده نشده"
+          other: "%{count} اعلان دیده نشده"
         message:
-          one: "{{count}} خوانده نشده"
-          other: "{{count}} خوانده نشده"
+          one: "%{count} خوانده نشده"
+          other: "%{count} خوانده نشده"
       title: "اطلاع‌رسانی‌های اشاره به @نام، پاسخ به نوشته‌ها، موضوعات، پیام‌های شما و ..."
       none: "قادر به بارگیری اعلان‌ها در این زمان نیستیم."
       empty: "اعلانی پیدا نشد."
       post_approved: "نوشته ی شما تایید شد"
       reviewable_items: "موارد نیازمند بازبینی است"
-      mentioned: "<span>{{username}}</span>{{description}}"
-      group_mentioned: "<span>{{username}}</span>{{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span>{{description}}"
-      liked_2: "<span>{{username}}،{{username2}}</span>{{description}}"
+      mentioned: "<span>%{username}</span>%{description}"
+      group_mentioned: "<span>%{username}</span>%{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span>%{description}"
+      liked_2: "<span>%{username}،%{username2}</span>%{description}"
       liked_many:
-        one: "<span>{{username}}،{{username2}}و %{count} دیگر</span>{{description}}"
-        other: "<span>{{username}}،{{username2}}و {{count}} دیگر</span>{{description}}"
+        one: "<span>%{username}،%{username2}و %{count} دیگر</span>%{description}"
+        other: "<span>%{username}،%{username2}و %{count} دیگر</span>%{description}"
       liked_consolidated_description:
-        one: "{{count}}نوشته ی شما را پسندید"
-        other: "{{count}}نوشته ی شما را پسندید"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span>دعوت شما را پذیرفت"
-      moved_post: "<span>{{username}}</span> منتقل کرد {{description}}"
-      linked: "<span>{{username}}</span>{{description}}"
-      granted_badge: "به دست آوردید '{{description}}'"
-      topic_reminder: "<span>{{username}}</span>{{description}}"
-      watching_first_post: "<span>مبحث جدید</span>{{description}}"
-      membership_request_accepted: "عضویت در {{group_name}} پذیرفته‌شد"
+        one: "%{count}نوشته ی شما را پسندید"
+        other: "%{count}نوشته ی شما را پسندید"
+      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}"
+      invitee_accepted: "<span>%{username}</span>دعوت شما را پذیرفت"
+      moved_post: "<span>%{username}</span> منتقل کرد %{description}"
+      linked: "<span>%{username}</span>%{description}"
+      granted_badge: "به دست آوردید '%{description}'"
+      topic_reminder: "<span>%{username}</span>%{description}"
+      watching_first_post: "<span>مبحث جدید</span>%{description}"
+      membership_request_accepted: "عضویت در %{group_name} پذیرفته‌شد"
       group_message_summary:
-        one: "{{count}}پیام در اینباکس {{group_name}}"
-        other: "{{count}}پیام در اینباکس {{group_name}}"
+        one: "%{count}پیام در اینباکس %{group_name}"
+        other: "%{count}پیام در اینباکس %{group_name}"
       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}} ساخته'
+        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}} بر روی %{site_title}"
+        custom: "اعلان از طرف %{username} بر روی %{site_title}"
       titles:
         mentioned: "احضار شده"
         replied: "پاسخ جدید"
@@ -1703,9 +1704,9 @@ fa_IR:
       from_my_computer: "از دستگاه من"
       from_the_web: "از وب"
       remote_tip: "پیوند به تصویر"
-      remote_tip_with_attachments: "پیوند به عکس یا فایل {{authorized_extensions}}"
+      remote_tip_with_attachments: "پیوند به عکس یا فایل %{authorized_extensions}"
       local_tip: "عکس ها را از روی سیستم خود انتخاب کنید"
-      local_tip_with_attachments: "عکس ها یا فایل ها را از دستگاه خود انتخاب کنید {{authorized_extensions}}"
+      local_tip_with_attachments: "عکس ها یا فایل ها را از دستگاه خود انتخاب کنید %{authorized_extensions}"
       hint: "(برای آپلود می توانید فایل را کشیده و در ویرایشگر متن رها کنید)"
       hint_for_supported_browsers: "شما همچنین میتوانید عکس ها را به داخل ویرایشگر بکشید و رها کنید یا کپی کنید"
       uploading: "در حال بروز‌رسانی "
@@ -1726,8 +1727,8 @@ fa_IR:
       no_results: "چیزی یافت نشد."
       no_more_results: "نتایجی بیشتری یافت نشد."
       searching: "در حال جستجو..."
-      post_format: "#{{post_number}} توسط {{username}}"
-      results_page: "نتایج جستجو برای '{{term}}'"
+      post_format: "#%{post_number} توسط %{username}"
+      results_page: "نتایج جستجو برای '%{term}'"
       more_results: "نتایج بیشتری موجود است. لطفاً معیارهای جست‌وجوی خود را محدودتر کنید."
       cant_find: "چیزی را که به دنبالش بودید نیافتید؟"
       start_new_topic: "شاید باید یک موضوع جدید را شروع کنید؟"
@@ -1736,8 +1737,8 @@ fa_IR:
       search_google_button: "گوگل"
       search_google_title: "جستجو در سایت"
       context:
-        user: "جستجوی نوشته‌ها با @{{username}}"
-        category: "جستجوی دسته‌بندی #{{category}}"
+        user: "جستجوی نوشته‌ها با @%{username}"
+        category: "جستجوی دسته‌بندی #%{category}"
         topic: "جستجوی این موضوع"
         private_messages: "جستجوی پیام‌ها"
       advanced:
@@ -1812,8 +1813,8 @@ fa_IR:
         notification_level: "اعلان‌ها"
         choose_new_category: "یک دسته‌بندی جدید برای موضوع انتخاب نمایید"
         selected:
-          one: "شما <b>{{count}}</b> موضوع را انتخاب کرده اید."
-          other: "شما <b>{{count}}</b> موضوع را انتخاب کرده اید."
+          one: "شما <b>%{count}</b> موضوع را انتخاب کرده اید."
+          other: "شما <b>%{count}</b> موضوع را انتخاب کرده اید."
         change_tags: "جایگزینی برچسب‌ها"
         append_tags: "افزودن برچسب‌ها"
         choose_new_tags: "انتخاب برچسب‌های جدید برای این موضوعات:"
@@ -1826,7 +1827,7 @@ fa_IR:
         posted: "هنوز در هیچ موضوعی نوشته نگذاشته‌اید."
         latest: "هیچ موضوع تازه‌ای نیست. چه بد!"
         bookmarks: "هنوز هیچ موضوع نشانک‌داری ندارید."
-        category: "هیچ موضوعی در {{category}} نیست."
+        category: "هیچ موضوعی در %{category} نیست."
         top: "موضوع برتری وجود ندارد."
         educate:
           new: "<p>موضوعات جدید در اینجا نمایش داده می‌شوند.</p><p>به صورت پیشفرض موضوعات جدید با علامت <span class=\"badge new-topic badge-notification\" style=\"vertical-align:middle;line-height:inherit;\">جدید</span>نمایش داده می‌شوند\n موضوعاتی که کمتر از 2 روز از ایجادشان گذشته جدید هستند. برای تغییر این مقدار روی گزینه</p><p><a href=\"%{userPrefsUrl}\">تنظیمات</a> کلیک کنید.</p>"
@@ -1837,13 +1838,13 @@ fa_IR:
         read: "موضوع خوانده شده‌ی دیگری نیست."
         new: "موضوع تازه‌ی دیگری وجود ندارد."
         unread: "موضوع خوانده نشده‌ی دیگری وجود ندارد."
-        category: "هیچ موضوع دیگری در {{category}} نیست."
+        category: "هیچ موضوع دیگری در %{category} نیست."
         top: "موضوع برتر دیگری وجود ندارد"
         bookmarks: "موضوع نشانک‌دار دیگری وجود ندارد."
     topic:
       filter_to:
-        one: "{{count}} نوشته در این موضوع وجود دارد"
-        other: "{{count}} نوشته در این موضوع وجود دارد"
+        one: "%{count} نوشته در این موضوع وجود دارد"
+        other: "%{count} نوشته در این موضوع وجود دارد"
       create: "موضوع جدید"
       create_long: "ساخت یک موضوع جدید"
       open_draft: "بازکردن پیشنویس"
@@ -1864,11 +1865,11 @@ fa_IR:
       new: "موضوع جدید"
       unread: "خوانده نشده"
       new_topics:
-        one: "{{count}} موضوعات جدید"
-        other: "{{count}} موضوعات جدید"
+        one: "%{count} موضوعات جدید"
+        other: "%{count} موضوعات جدید"
       unread_topics:
-        one: "{{count}} موضوع خوانده نشده"
-        other: "{{count}} موضوع خوانده نشده"
+        one: "%{count} موضوع خوانده نشده"
+        other: "%{count} موضوع خوانده نشده"
       title: "موضوع"
       invalid_access:
         title: "موضوع خصوصی است"
@@ -1881,25 +1882,25 @@ fa_IR:
         title: "موضوع پیدا نشد"
         description: "متأسفیم، نتوانستیم آن موضوع را پیدا کنیم. شاید یکی از همکاران آن را پاک کرده؟"
       total_unread_posts:
-        one: "شما {{count}} نوشته‌ی خوانده نشده در این موضوع دارید"
-        other: "شما {{count}} نوشته‌ی خوانده نشده در این موضوع دارید"
+        one: "شما %{count} نوشته‌ی خوانده نشده در این موضوع دارید"
+        other: "شما %{count} نوشته‌ی خوانده نشده در این موضوع دارید"
       unread_posts:
-        one: "شما {{count}} نوشته‌ی خوانده نشده قدیمی در این موضوع دارید"
-        other: "شما {{count}} نوشته‌ی خوانده نشده قدیمی در این موضوع دارید"
+        one: "شما %{count} نوشته‌ی خوانده نشده قدیمی در این موضوع دارید"
+        other: "شما %{count} نوشته‌ی خوانده نشده قدیمی در این موضوع دارید"
       new_posts:
-        one: "{{count}} نوشته‌ی جدید از آخرین خواندن شما در این موضوع وجود دارد"
-        other: "{{count}} نوشته‌ی جدید از آخرین خواندن شما در این موضوع وجود دارد"
+        one: "%{count} نوشته‌ی جدید از آخرین خواندن شما در این موضوع وجود دارد"
+        other: "%{count} نوشته‌ی جدید از آخرین خواندن شما در این موضوع وجود دارد"
       likes:
-        one: "{{count}} پسند به این موضوع داده شده است"
-        other: "{{count}} پسند به این موضوع داده شده است"
+        one: "%{count} پسند به این موضوع داده شده است"
+        other: "%{count} پسند به این موضوع داده شده است"
       back_to_list: "بازگشت به فهرست موضوعات"
       options: "گزینه‌های موضوع"
       show_links: "نمایش پیوندهای درون این موضوع"
       toggle_information: " تغییر وضعیت جزئیات موضوع"
-      read_more_in_category: "می‌خواهید بیشتر بخوانید؟موضوعات دیگر را در {{catLink}} یا {{latestLink}} مرور کنید."
-      read_more: "می‌خواهید بیشتر بخوانید؟ {{catLink}} یا {{latestLink}}."
-      group_request: "برای مشاهده این مبحث نیازمند درخواست عضویت در گروه  `{{name}}` می‌باشید"
-      group_join: "برای مشاهده این مبحث نیازمند پیوستن به گروه `{{name}}` می‌باشید"
+      read_more_in_category: "می‌خواهید بیشتر بخوانید؟موضوعات دیگر را در %{catLink} یا %{latestLink} مرور کنید."
+      read_more: "می‌خواهید بیشتر بخوانید؟ %{catLink} یا %{latestLink}."
+      group_request: "برای مشاهده این مبحث نیازمند درخواست عضویت در گروه  `%{name}` می‌باشید"
+      group_join: "برای مشاهده این مبحث نیازمند پیوستن به گروه `%{name}` می‌باشید"
       group_request_sent: "درخواست عضویت شما در گروه ارسال شده است. در صورت پذیرش، شما مطلع خواهید شد."
       unread_indicator: "هیچ کاربری آخرین فرستهٔ این مبحث را نخوانده است."
       read_more_MF: "{ UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>یک پیام خوانده نشده</a> } other { <a href='{basePath}/unread'># پیام خوانده نشده</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{و } false { } other{}} <a href='{basePath}/new'>1 موضوع جدید</a> } other { {BOTH, select, true{و } false { } other{}} <a href='{basePath}/new'># موضوع جدید</a> } } وجود دارد, یا {CATEGORY, select, true {نمایش سایر موضوعات دسته‌بندی {catLink}} false {{latestLink}} other {}}"
@@ -2071,25 +2072,25 @@ fa_IR:
         choose_category: "لطفا یک دسته‌بندی برای این تاپیک عمومی انتخاب کنید:"
       feature_topic:
         title: "این موضوع را برجسته کن"
-        pin: "این موضوع را در بالای دسته‌بندی {{categoryLink}} نمایش بده تا وقتی که"
-        confirm_pin: "در حال حاضر {{count}} موضوع سنجاق‌شده دارید. تعداد زیاد موضوع‌های سنجاق‌شده شاید کاربران جدید یا ناشناس را به زحمت بیندازد. آیا از سنجاق کردن یک موضوع دیگر در این دسته‌بندی اطمینان دارید؟"
-        unpin: "این موضوع را از فهرست برترین‌های دسته‌بندی {{categoryLink}} حذف کن"
-        unpin_until: "این موضوع از برترین‌های دسته‌بندی {{categoryLink}} حذف شود یا تا <strong>%{until}</strong>منتظر بمانید."
+        pin: "این موضوع را در بالای دسته‌بندی %{categoryLink} نمایش بده تا وقتی که"
+        confirm_pin: "در حال حاضر %{count} موضوع سنجاق‌شده دارید. تعداد زیاد موضوع‌های سنجاق‌شده شاید کاربران جدید یا ناشناس را به زحمت بیندازد. آیا از سنجاق کردن یک موضوع دیگر در این دسته‌بندی اطمینان دارید؟"
+        unpin: "این موضوع را از فهرست برترین‌های دسته‌بندی %{categoryLink} حذف کن"
+        unpin_until: "این موضوع از برترین‌های دسته‌بندی %{categoryLink} حذف شود یا تا <strong>%{until}</strong>منتظر بمانید."
         pin_note: "کاربران می توانند موضوع را بصورت جداگانه برای خود از سنجاق در بیاورند"
         pin_validation: "برای سنجاق کردن این موضوع نیاز به یک تاریخ معین است."
-        not_pinned: "هیچ موضوعی در {{categoryLink}} سنجاق نشده."
+        not_pinned: "هیچ موضوعی در %{categoryLink} سنجاق نشده."
         already_pinned:
-          one: "موضوعاتی که در حال حاضر در {{categoryLink}} سنجاق شده اند: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "موضوعاتی که در حال حاضر در {{categoryLink}} سنجاق شده اند: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "موضوعاتی که در حال حاضر در %{categoryLink} سنجاق شده اند: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "موضوعاتی که در حال حاضر در %{categoryLink} سنجاق شده اند: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "نمایش این موضوع در بالای فهرست همه موضوعات تا وقتی که"
-        confirm_pin_globally: "شما قبلا این موضوع {{count}} را بصورت سراسری سنجاق زده‌اید. تعداد زیاد موضوع های سنجاق شده برای کاربران جدید و ناشناس می تواند سخت باشد. آیا از سنجاق کردن موضوعات به‌صورت سراری اطمینان دارید؟ "
+        confirm_pin_globally: "شما قبلا این موضوع %{count} را بصورت سراسری سنجاق زده‌اید. تعداد زیاد موضوع های سنجاق شده برای کاربران جدید و ناشناس می تواند سخت باشد. آیا از سنجاق کردن موضوعات به‌صورت سراری اطمینان دارید؟ "
         unpin_globally: "حذف این موضوع از بالای لیست همه‌ی موضوعات."
         unpin_globally_until: "حذف این موضوع از بالای لیست همه مباحث یا صبر کردن تا <strong>%{until}</strong>."
         global_pin_note: "کاربران می توانند موضوع را بصورت جداگانه برای خود از سنجاق در بیاورند"
         not_pinned_globally: "هیچ موضوعی به صورت سراسری سنجاق نشده."
         already_pinned_globally:
-          one: "موضوعاتی که در حال حاضر به صورت سراسری سنجاق شده‌اند: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "موضوعاتی که در حال حاضر به صورت سراسری سنجاق شده‌اند: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "موضوعاتی که در حال حاضر به صورت سراسری سنجاق شده‌اند: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "موضوعاتی که در حال حاضر به صورت سراسری سنجاق شده‌اند: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "این موضوع را در وارد بنر کن که در تمام صفحات در بالای صفحه نشان داده شود"
         remove_banner: "حذف بنری که از بالای تمام صفحات نمایش داده می شود. "
         banner_note: "کاربران می توانند سر‌صفحه را با بستن آنها رد کنند. فقط یک موضوع را می توان در یک زمان به سر‌صفحه تبدیل کرد."
@@ -2119,15 +2120,15 @@ fa_IR:
         to_topic_username: "شما نام کاربری شخصی را وارد کرده‌اید. ما این امر را به اطلاع او رسانده و او را به این موضوع دعوت می‌کنیم."
         to_username: "نام کاربری شخصی که می‌خواهید او را دعوت کنید، وارد کنید. ما این امر را به اطلاع او رسانده و او را به این عنوان دعوت می‌کنیم."
         email_placeholder: "name@example.com"
-        success_email: "lما از طریق ایمیل دعوت نامه ارسال کردیم <B> {{emailOrUsername}} </ B>. هنگامی که به دعوت شما پاسخ داده شد ما به شما اطلاع خواهیم داد.برای پی گیری به تب دعوت ها در پنل کاربری مراجعه نمایید"
+        success_email: "lما از طریق ایمیل دعوت نامه ارسال کردیم <B> %{emailOrUsername} </ B>. هنگامی که به دعوت شما پاسخ داده شد ما به شما اطلاع خواهیم داد.برای پی گیری به تب دعوت ها در پنل کاربری مراجعه نمایید"
         success_username: "ما آن کاربر را برای شرکت در این جستار دعوت کردیم."
         error: "متاسفیم٬‌ ما آن شخص را نمی توانیم دعوت کنیم. شاید قبلا دعوت شده اند. (فراخوان ها تعداد محدودی دارند)"
-        success_existing_email: "یک کاربر با رایانامه <b>{{emailOrUsername}}</b> وجو دارد. ما آن کاربر را برای شرکت در این مبحث دعوت کردیم."
+        success_existing_email: "یک کاربر با رایانامه <b>%{emailOrUsername}</b> وجو دارد. ما آن کاربر را برای شرکت در این مبحث دعوت کردیم."
       login_reply: "برای پاسخ دادن وارد شوید"
       filters:
         n_posts:
-          one: "{{count}} نوشته"
-          other: "{{count}} نوشته"
+          one: "%{count} نوشته"
+          other: "%{count} نوشته"
         cancel: "حذف فیلتر"
       move_to:
         title: "انتقال به"
@@ -2140,16 +2141,16 @@ fa_IR:
         radio_label: "موضوع جدید"
         error: "یک مشکل در انتقال نوشته‌ها به موضوع جدید پیش آمد."
         instructions:
-          one: "شما در حال ایجاد موضوع جدید و افزودن <b>{{count}}</b> نوشته انتخاب شده به آن هستید."
-          other: "شما در حال ایجاد موضوع جدید و افزودن <b>{{count}}</b> نوشته انتخاب شده به آن هستید."
+          one: "شما در حال ایجاد موضوع جدید و افزودن <b>%{count}</b> نوشته انتخاب شده به آن هستید."
+          other: "شما در حال ایجاد موضوع جدید و افزودن <b>%{count}</b> نوشته انتخاب شده به آن هستید."
       merge_topic:
         title: "انتقال به موضوع موجود"
         action: "انتقال به موضوع موجود"
         error: "یک خطا در انتقال نوشته‌ها به آن موضوع وجود داشت."
         radio_label: "موضوع قدیمی"
         instructions:
-          one: "لطفاً موضوعی را که قصد دارید تا <b>{{count}}</b> نوشته‌ را به آن انتقال دهید، انتخاب نمایید."
-          other: "لطفاً موضوعی را که قصد دارید تا <b>{{count}}</b> نوشته‌ را به آن انتقال دهید، انتخاب نمایید."
+          one: "لطفاً موضوعی را که قصد دارید تا <b>%{count}</b> نوشته‌ را به آن انتقال دهید، انتخاب نمایید."
+          other: "لطفاً موضوعی را که قصد دارید تا <b>%{count}</b> نوشته‌ را به آن انتقال دهید، انتخاب نمایید."
       move_to_new_message:
         title: "انتقال به پیام جدید"
         action: "انتقال به پیام جدید"
@@ -2186,7 +2187,7 @@ fa_IR:
         instructions: "لطفا یک زمان جدید برای موضوع انتخاب کنید. ارسال‌های موضوع برای اعمال اختلاف زمانی، به روز می‌شوند."
       multi_select:
         select: "انتخاب"
-        selected: "انتخاب شده ({{count}}) "
+        selected: "انتخاب شده (%{count}) "
         select_post:
           label: "انتخاب"
           title: "انتخاب نوشته"
@@ -2200,18 +2201,18 @@ fa_IR:
         select_all: انتخاب همه
         deselect_all: عدم انتخاب همه
         description:
-          one: شما <b>{{count}}</b> نوشته انتخاب کرده اید
-          other: "شما <b>{{count}}</b> نوشته انتخاب کرده اید"
+          one: شما <b>%{count}</b> نوشته انتخاب کرده اید
+          other: "شما <b>%{count}</b> نوشته انتخاب کرده اید"
     post:
       quote_reply: "نقل‌قول"
       edit_reason: "دلیل:"
-      post_number: "نوشته {{number}}"
+      post_number: "نوشته %{number}"
       ignored: "محتوای نادیده گرفته‌شد"
       wiki_last_edited_on: "دانشنامه آخرین بار در این زمان ویرایش شده"
       last_edited_on: "نوشته آخرین بار ویرایش شده در"
       reply_as_new_topic: "پاسخگویی به عنوان یک موضوع لینک شده"
       reply_as_new_private_message: "پاسخ به عنوان پیام جدید به همین دریافت کنندگان"
-      continue_discussion: "ادامه دادن بحث از {{postLink}}:"
+      continue_discussion: "ادامه دادن بحث از %{postLink}:"
       follow_quote: "برو به نوشته ای که نقل‌قول شده"
       show_full: "نمایش کامل نوشته"
       show_hidden: "دیدن محتوای نادیده گرفته‌شد"
@@ -2222,27 +2223,27 @@ fa_IR:
       expand_collapse: "باز کردن/بستن"
       locked: "یکی از دست‌اندرکاران انجمن این پست را جهت جلوگیری از ویرایش قفل کرده است"
       gap:
-        one: "{{count}} پاسخ پنهان را مشاهده کنید"
-        other: "{{count}} پاسخ پنهان را مشاهده کنید"
+        one: "%{count} پاسخ پنهان را مشاهده کنید"
+        other: "%{count} پاسخ پنهان را مشاهده کنید"
       unread: "نوشته‌ی خوانده نشده"
       has_replies:
-        one: "{{count}} پاسخ"
-        other: "{{count}} پاسخ"
+        one: "%{count} پاسخ"
+        other: "%{count} پاسخ"
       has_likes_title:
-        one: "{{count}} کاربر این مورد را پسندیده‌اند"
-        other: "{{count}} کاربر این مورد را پسندیده‌اند"
+        one: "%{count} کاربر این مورد را پسندیده‌اند"
+        other: "%{count} کاربر این مورد را پسندیده‌اند"
       has_likes_title_only_you: "شما این نوشته را پسندیده‌اید"
       has_likes_title_you:
-        one: "شما و {{count}} شخص دیگر این نوشته را پسندیده‌اید"
-        other: "شما و {{count}} شخص دیگر این نوشته را پسندیده‌اید"
+        one: "شما و %{count} شخص دیگر این نوشته را پسندیده‌اید"
+        other: "شما و %{count} شخص دیگر این نوشته را پسندیده‌اید"
       errors:
         create: "متأسفیم، در ایجاد نوشته‌ی شما خطایی روی داد. لطفاً دوباره تلاش کنید."
         edit: "متأسفیم، در ویرایش نوشته‌ی شما خطایی روی داد. لطفاً دوباره تلاش کنید."
         upload: "متأسفیم، در بارگذاری آن پرونده خطایی روی داد. لطفاً دوباره تلاش کنید."
-        file_too_large: "با عرض پوزش، حجم پرونده بسیار بالاست (بالاترین حجم قابل بارگذاری {{max_size_kb}} کیلوبایت است). چرا فایل‌های حجیم را در سرویس‌های ابری بارگذاری نمی‌کنید و پیوند آن را اینجا نمی‌چسبانید؟"
+        file_too_large: "با عرض پوزش، حجم پرونده بسیار بالاست (بالاترین حجم قابل بارگذاری %{max_size_kb} کیلوبایت است). چرا فایل‌های حجیم را در سرویس‌های ابری بارگذاری نمی‌کنید و پیوند آن را اینجا نمی‌چسبانید؟"
         too_many_uploads: "متأسفیم، هر بار تنها می‌توانید یک پرونده را بار‌گذاری کنید."
-        too_many_dragged_and_dropped_files: "با عرض پوزش، شما فقط می‌توانید {{max}} پرونده به صورت یک‌جا بارگذاری کنید."
-        upload_not_authorized: "با عرض پوزش، فایلی که در حال‌ بارگذاری آن هستید مجاز نیست. (پسوند‌های قابل بارگذاری: {{authorized_extensions}})."
+        too_many_dragged_and_dropped_files: "با عرض پوزش، شما فقط می‌توانید %{max} پرونده به صورت یک‌جا بارگذاری کنید."
+        upload_not_authorized: "با عرض پوزش، فایلی که در حال‌ بارگذاری آن هستید مجاز نیست. (پسوند‌های قابل بارگذاری: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "با عرض پوزش، کاربران جدید نمی توانند تصویر بار‌گذاری کنند."
         attachment_upload_not_allowed_for_new_user: "با عرض پوزش، کاربران جدید نمی توانند فایل پیوست بار‌گذاری کنند."
         attachment_download_requires_login: "با عرض پوزش، شما برای دانلود فایل پیوست باید وارد سایت شوید."
@@ -2323,8 +2324,8 @@ fa_IR:
             one: "این را بخوان"
             other: "خوانده اند"
           like_capped:
-            one: "و {{count}} نفر دیگر این را دوست داشتند"
-            other: "و {{count}} نفر دیگر این را پسندیده‌اند."
+            one: "و %{count} نفر دیگر این را دوست داشتند"
+            other: "و %{count} نفر دیگر این را پسندیده‌اند."
         by_you:
           off_topic: "شما برای این مورد پرچم خارج از بحث زدید"
           spam: "شما برای این مورد پرچم هرزنامه زدید"
@@ -2336,11 +2337,11 @@ fa_IR:
       delete:
         confirm:
           one: "آیا مطمئن هستید که می خواهید آن پست را حذف کنید؟"
-          other: "آیا مطمئن هستید که می‌خواهید آن {{count}} فرسته را حذف کنید؟"
+          other: "آیا مطمئن هستید که می‌خواهید آن %{count} فرسته را حذف کنید؟"
       merge:
         confirm:
           one: "آیا مطمئن هستید که می خواهید آن پست ها را ادغام کنید؟"
-          other: "آیا مطمئن هستید که می‌خواهید آن {{count}} فرسته را ادغام کنید؟"
+          other: "آیا مطمئن هستید که می‌خواهید آن %{count} فرسته را ادغام کنید؟"
       revisions:
         controls:
           first: "بازبینی نخست"
@@ -2352,7 +2353,7 @@ fa_IR:
           revert: "بازگشت به این بازبینی"
           edit_wiki: "ویرایش دانشنامه"
           edit_post: "ویرایش نوشته"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong>{{icon}}<strong>{{current}}</strong>/{{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong>%{icon}<strong>%{current}</strong>/%{total}"
         displays:
           inline:
             title: "نمایش خروجی رندر با اضافات و از بین بردن درون خطی"
@@ -2515,14 +2516,14 @@ fa_IR:
       custom_placeholder_notify_moderators: "به ما اجازه دهید بدانیم شما در مورد چه چیز آن نگران هستید، و تا جای ممکن از پیوند‌ها و مثال‌های مرتبط استفاده کنید."
       custom_message:
         at_least:
-          one: "حداقل {{count}} نویسه وارد کنید"
-          other: "حداقل {{count}} نویسه وارد کنید"
+          one: "حداقل %{count} نویسه وارد کنید"
+          other: "حداقل %{count} نویسه وارد کنید"
         more:
-          one: "{{count}} نیاز است..."
-          other: "{{count}} نیاز است..."
+          one: "%{count} نیاز است..."
+          other: "%{count} نیاز است..."
         left:
-          one: "{{count}} باقی مانده"
-          other: "{{count}} باقی مانده"
+          one: "%{count} باقی مانده"
+          other: "%{count} باقی مانده"
     flagging_topic:
       title: "تشکر برای کمک به جامعه مدنی انجمن ما!"
       action: "پرچم‌گذاری موضوع"
@@ -2566,7 +2567,7 @@ fa_IR:
         title: "این تاپیک یک پیام‌خصوصی است"
         help: "این تاپیک یک پیام‌خصوصی است"
     posts: "نوشته‌ها"
-    posts_long: "این موضوع {{number}} نوشته دارد"
+    posts_long: "این موضوع %{number} نوشته دارد"
     posts_likes_MF: |
       این موضوع دارای {count, plural, one {1 پاسخ} other {# پاسخ}} است {ratio, select,
       low {و مورد پسند دیگران واقع شده است}
@@ -2580,21 +2581,21 @@ fa_IR:
       other: "بازدیدها"
     replies: "پاسخ‌ها"
     views_long:
-      one: "این موضوع {{number}} بار دیده شده"
-      other: "این موضوع {{number}} بار دیده شده"
+      one: "این موضوع %{number} بار دیده شده"
+      other: "این موضوع %{number} بار دیده شده"
     activity: "فعالیت"
     likes: "پسندها"
     likes_lowercase:
       one: "پسند‌ها"
       other: "پسند‌ها"
-    likes_long: "{{number}} پسند در این موضوع وجود دارد"
+    likes_long: "%{number} پسند در این موضوع وجود دارد"
     users: "کاربران"
     users_lowercase:
       one: "کاربران"
       other: "کاربران"
     category_title: "دسته"
     history: "تاریخچه"
-    changed_by: "توسط {{author}}"
+    changed_by: "توسط %{author}"
     raw_email:
       title: "ایمیل دریافتی"
       not_available: "در دسترس نیست!"
@@ -2605,34 +2606,34 @@ fa_IR:
       latest:
         title: "آخرین"
         title_with_count:
-          one: "آخرین ({{count}})"
-          other: "آخرین ({{count}})"
+          one: "آخرین (%{count})"
+          other: "آخرین (%{count})"
         help: "موضوعات با نوشته‌های تازه"
       read:
         title: "خواندن"
         help: "موضوعاتی که شما خواندید، به ترتیب آخرین خوانده شده‌ها. "
       categories:
         title: "دسته‌‌بندی‌ها"
-        title_in: "دسته بندی - {{categoryName}}"
+        title_in: "دسته بندی - %{categoryName}"
         help: "همه‌ی موضوعات در دسته‌‌بندی‌ها جای گرفتند"
       unread:
         title: "خوانده‌ نشده‌"
         title_with_count:
-          one: " ({{count}}) خوانده‌ نشده‌"
-          other: " ({{count}}) خوانده‌ نشده‌"
+          one: " (%{count}) خوانده‌ نشده‌"
+          other: " (%{count}) خوانده‌ نشده‌"
         help: "موضوعاتی که در حال حاضر مشاهده می کنید یا دنبال می کنید با نوشته های خوانده نشده"
         lower_title_with_count:
-          one: "{{count}} خوانده نشده"
-          other: "{{count}} خوانده نشده"
+          one: "%{count} خوانده نشده"
+          other: "%{count} خوانده نشده"
       new:
         lower_title_with_count:
-          one: "{{count}} تازه"
-          other: "{{count}} تازه"
+          one: "%{count} تازه"
+          other: "%{count} تازه"
         lower_title: "جدید"
         title: "جدید"
         title_with_count:
-          one: "({{count}}) جدید"
-          other: "({{count}}) جدید"
+          one: "(%{count}) جدید"
+          other: "(%{count}) جدید"
         help: "موضوعات ایجاد شده در چند روز گذشته"
       posted:
         title: "نوشته‌های من"
@@ -2641,11 +2642,11 @@ fa_IR:
         title: "نشانک‌ها"
         help: "موضوعاتی که نشانک زده‌اید"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
-        help: "موضوعات تازه در دستهٔ {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "موضوعات تازه در دستهٔ %{categoryName}"
       top:
         title: "برترین‌ها"
         help: "بیشترین موضوعات فعال در سال گذشته، ماه ، هفته یا روز"
@@ -3089,11 +3090,11 @@ fa_IR:
           none: "رویداد مشابهی وجود ندارد"
           redeliver: "تحویل مجدد"
           incoming:
-            one: "{{count}} رویداد جدید جود دارد."
-            other: "{{count}} رویداد جدید جود دارد."
+            one: "%{count} رویداد جدید جود دارد."
+            other: "%{count} رویداد جدید جود دارد."
           completed_in:
-            one: "در {{count}} ثانیه کامل شد."
-            other: "در {{count}} ثانیه کامل شد."
+            one: "در %{count} ثانیه کامل شد."
+            other: "در %{count} ثانیه کامل شد."
           request: "درخواست"
           response: "پاسخ"
           redeliver_confirm: "آیا از تحویل مجدد payload اطمینان دارید؟"
@@ -3145,11 +3146,11 @@ fa_IR:
           label: "بار گذاری"
           title: "آپلود یک نسخه پشتیبان برای نمونه"
           uploading: "در حال بار گذاری ..."
-          uploading_progress: "درحال بارگذاری... 0 {{progress}}%"
-          error: "هنگام آپلود خطایی رخ می دهد '{{filename}}': {{message}}"
+          uploading_progress: "درحال بارگذاری... 0 %{progress}%"
+          error: "هنگام آپلود خطایی رخ می دهد '%{filename}': %{message}"
         operations:
           is_running: "عملیاتی در جریان است..."
-          failed: "{{operation}} ناموفق شد. لطفا گزارشات را بررسی نمایید."
+          failed: "%{operation} ناموفق شد. لطفا گزارشات را بررسی نمایید."
           cancel:
             label: "لغو کردن"
             title: "کنار گذاشتن عملیات کنونی"
@@ -3263,7 +3264,7 @@ fa_IR:
           disabled_component_tooltip: "این کامپوننت غیر فعال شده"
           default_theme_tooltip: "این تم، تم پیش‌فرض انجمن است"
           updates_available_tooltip: "بروزرسانی برای این تم موجود است"
-          and_x_more: "و {{count}} مورد دیگر"
+          and_x_more: "و %{count} مورد دیگر"
           collapse: جمع کردن
           uploads: "بارگذاری‌ها"
           no_uploads: "می‌توانید فایل‌های ثابت همراه با قالب خود مثل فونت و تصویر بارگذاری کنید"
@@ -3303,7 +3304,7 @@ fa_IR:
           theme_translations: "ترجمه تم"
           commits_behind:
             one: "قالب %{count}تغییر دیگر نیاز دارد."
-            other: "قالب {{count}} تغییر دیگر نیاز دارد."
+            other: "قالب %{count} تغییر دیگر نیاز دارد."
           scss:
             text: "سی اس اس"
             title: "کد CSS مد نظرتان را وارد کنید، از تمام کد‌های CSS و SCSS معتبر پشتیبانی می‌شود."
@@ -3608,8 +3609,8 @@ fa_IR:
           title: "ایمیل این کاربران را قابل رویت کن"
           text: "نشان دادن"
       user:
-        suspend_failed: "در جریان به تعلیق درآوردن این کاربر اشتباهی رخ داد. {{error}}"
-        unsuspend_failed: "در جریان خارج کردن این کاربر از تعلیق، اشتباهی رخ داد {{error}}"
+        suspend_failed: "در جریان به تعلیق درآوردن این کاربر اشتباهی رخ داد. %{error}"
+        unsuspend_failed: "در جریان خارج کردن این کاربر از تعلیق، اشتباهی رخ داد %{error}"
         suspend_duration: "کاربر چه مدت در تعلیق خواهد بود؟"
         suspend_reason_label: "شما چرا معلق شده‌اید؟ این متن بر روی صفحه‌ی نمایه‌ی کاربر <b/>برای همه قابل مشاهده خواهد بود<b>، و در هنگام ورود به سیستم نیز به خود کاربر نشان داده خواهد شد. لطفاً خلاصه بنویسید."
         suspend_reason: "دلیل"
@@ -3906,6 +3907,7 @@ fa_IR:
         title: "شکلک"
         help: "اضافه کردن شکلک های جدید که در دسترس همگان خواهد بود.(PROTIP: کشیدن و رها کردن چند فایل در یک بار)"
         add: "افزودن شکلک جدید"
+        uploading: "در حال بار گذاری ..."
         name: "نام"
         group: "گروه"
         image: "تصویر"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 885fa4871d..4c30f26f67 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -23,8 +23,8 @@ fi:
             mb: Mt
             tb: Tt
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "H:mm"
       time_with_zone: "HH.mm (z)"
@@ -227,11 +227,11 @@ fi:
     weekly: "viikottain"
     every_month: "kuukausittain"
     every_six_months: "puolen vuoden välein"
-    max_of_count: "korkeintaan {{count}}"
+    max_of_count: "korkeintaan %{count}"
     alternation: "tai"
     character_count:
-      one: "{{count}} merkki"
-      other: "{{count}} merkkiä"
+      one: "%{count} merkki"
+      other: "%{count} merkkiä"
     related_messages:
       title: "Aiheeseen liittyviä keskusteluja"
       see_all: 'Katso <a href="%{path}">kaikki viestit</a> käyttäjältä @%{username}...'
@@ -306,14 +306,14 @@ fi:
         yes_value: "Kyllä, hylkään"
         no_value: "Ei, säilytän"
     topic_count_latest:
-      one: "Katso {{count}} uusi tai päivittynyt ketju"
-      other: "Katso {{count}} uutta tai päivittynyttä ketjua"
+      one: "Katso %{count} uusi tai päivittynyt ketju"
+      other: "Katso %{count} uutta tai päivittynyttä ketjua"
     topic_count_unread:
-      one: "Näytä {{count}} lukematon ketju"
-      other: "Näytä {{count}} lukematonta ketjua"
+      one: "Näytä %{count} lukematon ketju"
+      other: "Näytä %{count} lukematonta ketjua"
     topic_count_new:
-      one: "Näytä {{count}} uusi ketju"
-      other: "Näytä {{count}} uutta ketjua"
+      one: "Näytä %{count} uusi ketju"
+      other: "Näytä %{count} uutta ketjua"
     preview: "esikatselu"
     cancel: "peruuta"
     save: "Tallenna muutokset"
@@ -321,7 +321,7 @@ fi:
     saved: "Tallennettu!"
     upload: "Liitä"
     uploading: "Lähettää..."
-    uploading_filename: "Ladataan: {{filename}}"
+    uploading_filename: "Ladataan: %{filename}"
     clipboard: "leikepöytä"
     uploaded: "Lähetetty!"
     pasting: "Liitetään..."
@@ -375,7 +375,7 @@ fi:
         optional: "Voit vaatia tämän itsellesi, jolloin muut eivät voi käsitellä sitä."
         required: "Sinun täytyy osoittaa asia itsellesi ennen kuin voit käsitellä sen."
         claimed_by_you: "Osoitit tämän itsellesi ja voit nyt käsitellä sen."
-        claimed_by_other: "Tämän voi käsitellä vain <b>{{username}}</b>."
+        claimed_by_other: "Tämän voi käsitellä vain <b>%{username}</b>."
       claim:
         title: "osoita ketju itsellesi"
       unclaim:
@@ -395,7 +395,7 @@ fi:
       view_pending: "tarkastele jonoa"
       topic_has_pending:
         one: "<b>%{count}</b> viesti tähän ketjuun odottaa hyväksyntää"
-        other: "<b>{{count}}</b> viestiä tähän ketjuun odottaa hyväksyntää"
+        other: "<b>%{count}</b> viestiä tähän ketjuun odottaa hyväksyntää"
       title: "Käsittele"
       topic: "Ketju:"
       filtered_topic: "Olet suodattanut käsiteltävän sisällön yhdestä ketjusta."
@@ -412,17 +412,17 @@ fi:
         fields: "Kentät"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} lippu kaikkiaan)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} lippua kaikkiaan)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} lippu kaikkiaan)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} lippua kaikkiaan)"
         agreed:
-          one: "{{count}}% samaa mieltä"
-          other: "{{count}}% samaa mieltä"
+          one: "%{count}% samaa mieltä"
+          other: "%{count}% samaa mieltä"
         disagreed:
-          one: "{{count}}% eri mieltä"
-          other: "{{count}}% eri mieltä"
+          one: "%{count}% eri mieltä"
+          other: "%{count}% eri mieltä"
         ignored:
-          one: "{{count}}% sivuutettu"
-          other: "{{count}}% sivuutettu"
+          one: "%{count}% sivuutettu"
+          other: "%{count}% sivuutettu"
       topics:
         topic: "Ketju"
         reviewable_count: "Lukumäärä"
@@ -432,10 +432,10 @@ fi:
         details: "yksityiskohdat"
         unique_users:
           one: "%{count} käyttäjä"
-          other: "{{count}} käyttäjää"
+          other: "%{count} käyttäjää"
       replies:
         one: "%{count} vastaus"
-        other: "{{count}} vastausta"
+        other: "%{count} vastausta"
       edit: "Muokkaa"
       save: "Tallenna"
       cancel: "Peru"
@@ -499,22 +499,22 @@ fi:
         description: "Viestisi saapui perille, mutta valvojan on vielä hyväksyttävä se, jotta se näkyy sivustolla. Ole kärsivällinen."
         pending_posts:
           one: "Jonossa on <strong>%{count}</strong> viesti."
-          other: "Jonossa on <strong>{{count}}</strong> viestiä."
+          other: "Jonossa on <strong>%{count}</strong> viestiä."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> kirjoitti <a href='{{topicUrl}}'>ketjuun</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Sinä</a> kirjoitit <a href='{{topicUrl}}'>ketjuun</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> vastasi <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Sinä</a> vastasit <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> vastasi <a href='{{topicUrl}}'>ketjuun</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Sinä</a> vastasit <a href='{{topicUrl}}'>ketjuun</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> mainitsi käyttäjän <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> mainitsi <a href='{{user2Url}}'>sinut</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Sinä</a> mainitsit käyttäjän <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Kirjoittaja <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Kirjoittaja <a href='{{userUrl}}'>sinä</a>"
-      sent_by_user: "Lähettäjä <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Lähettäjä <a href='{{userUrl}}'>sinä</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> kirjoitti <a href='%{topicUrl}'>ketjuun</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Sinä</a> kirjoitit <a href='%{topicUrl}'>ketjuun</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> vastasi <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Sinä</a> vastasit <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> vastasi <a href='%{topicUrl}'>ketjuun</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Sinä</a> vastasit <a href='%{topicUrl}'>ketjuun</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> mainitsi käyttäjän <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> mainitsi <a href='%{user2Url}'>sinut</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Sinä</a> mainitsit käyttäjän <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Kirjoittaja <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Kirjoittaja <a href='%{userUrl}'>sinä</a>"
+      sent_by_user: "Lähettäjä <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Lähettäjä <a href='%{userUrl}'>sinä</a>"
     directory:
       filter_name: "suodata tunnuksen perusteella"
       title: "Käyttäjät"
@@ -752,7 +752,7 @@ fi:
       none: "(valitse vaihtoehto)"
       required: '"%{name}" on pakollinen'
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profiili"
       mute: "Vaimenna"
       edit: "Muokkaa asetuksia"
@@ -828,12 +828,12 @@ fi:
       enable_defer: "Ota käyttöön lykkäystoiminto, jolla voi merkitä ketjun lukemattomaksi"
       change: "vaihda"
       featured_topic: "Valikoitu ketju"
-      moderator: "{{user}} on valvoja"
-      admin: "{{user}} on ylläpitäjä"
+      moderator: "%{user} on valvoja"
+      admin: "%{user} on ylläpitäjä"
       moderator_tooltip: "Tämä käyttäjä on valvoja"
       admin_tooltip: "Tämä käyttäjä on ylläpitäjä"
       silenced_tooltip: "Käyttäjä on hiljennetty"
-      suspended_notice: "Tämä käyttäjätili on hyllytetty {{date}} asti."
+      suspended_notice: "Tämä käyttäjätili on hyllytetty %{date} asti."
       suspended_permanently: "Käyttäjä on hyllytetty."
       suspended_reason: "Syy:"
       github_profile: "GitHub"
@@ -846,7 +846,7 @@ fi:
           Vaimennettujen ketjujen ja alueiden viestejä ei sisällytetä sähköposteihin.
         individual: "Lähetä sähköpostia jokaisesta uudesta viestistä"
         individual_no_echo: "Lähetä sähköposti jokaisesta uudesta viestistä lukuun ottamatta omiani"
-        many_per_day: "Lähetä minulle sähköpostia jokaisesta uudesta viestistä (noin {{dailyEmailEstimate}} päivässä)"
+        many_per_day: "Lähetä minulle sähköpostia jokaisesta uudesta viestistä (noin %{dailyEmailEstimate} päivässä)"
         few_per_day: "Lähetä minulle sähköpostia jokaisesta uudesta viestistä (noin 2 päivässä)"
         warning: "Postituslistatila käytössä. Sähköposti-ilmoitusasetukset syrjäytetty."
       tag_settings: "Tunnisteet"
@@ -876,9 +876,7 @@ fi:
       admin_delete: "Poista"
       users: "Käyttäjät"
       muted_users: "Vaimennetut"
-      muted_users_instructions: "Älä näytä ilmoituksia näiltä käyttäjiltä"
       ignored_users: "Sivuutettu"
-      ignored_users_instructions: "Jätä näyttämättä kaikki viestit ja ilmoitukset näiltä käyttäjiltä."
       tracked_topics_link: "Näytä"
       automatically_unpin_topics: "Poista kiinnitetyn ketjun kiinnitys automaattisesti, kun olen selannut sen loppuun."
       apps: "Sovellukset"
@@ -934,12 +932,12 @@ fi:
         disable: "Poista käytöstä"
         enable: "Ota käyttöön"
         enable_long: "Ota varakoodit käyttöön"
-        manage: "Hallinnoi varakoodeja.. <strong>{{count}}</strong> varakoodia on jäljellä."
+        manage: "Hallinnoi varakoodeja.. <strong>%{count}</strong> varakoodia on jäljellä."
         copy_to_clipboard: "Kopioi leikepöydälle"
         copy_to_clipboard_error: "Virhe kopioimisessa leikepöydälle"
         copied_to_clipboard: "Kopioitiin leikepöydälle"
         download_backup_codes: "Lataa varakoodit"
-        remaining_codes: "Sinulla on <strong>{{count}}</strong> varakoodia jäljellä."
+        remaining_codes: "Sinulla on <strong>%{count}</strong> varakoodia jäljellä."
         use: "Käytä varakoodi"
         enable_prerequisites: "Ensisijainen metodi, kaksivaiheinen tunnistautuminen täytyy ottaa käyttöön ennen varakoodien luomista."
         codes:
@@ -1004,9 +1002,9 @@ fi:
         success_staff: "Lähetimme sähköpostia nykyiseen osoitteeseesi. Noudata vahvistusohjeita."
       change_avatar:
         title: "Vaihda profiilikuvasi"
-        gravatar_title: "Muuta avatariasi {{gravatarName}} -sivustolla"
-        gravatar_failed: "{{gravatarName}}-gravataria ei löytynyt sähköpostiosoitteella."
-        refresh_gravatar_title: "Päivitä {{gravatarName}}"
+        gravatar_title: "Muuta avatariasi %{gravatarName} -sivustolla"
+        gravatar_failed: "%{gravatarName}-gravataria ei löytynyt sähköpostiosoitteella."
+        refresh_gravatar_title: "Päivitä %{gravatarName}"
         letter_based: "Sivuston luoma profiilikuva"
         uploaded_avatar: "Oma kuva"
         uploaded_avatar_empty: "Lisää oma kuva"
@@ -1030,11 +1028,11 @@ fi:
         ok: "Lähetämme sinulle sähköpostin varmistukseksi."
         required: "Syötä sähköpostiosoitteesi"
         invalid: "Sähköpostiosoite ei kelpaa."
-        authenticated: "{{provider}} on todentanut sähköpostiosoitteesi"
+        authenticated: "%{provider} on todentanut sähköpostiosoitteesi"
         frequency_immediately: "Saat sähköpostia välittömästi, jollet ole jo lukenut asiaa, jota sähköpostiviesti koskee."
         frequency:
           one: "Lähetämme sähköpostia vain, jos emme ole nähneet sinua edellisen minuutin aikana."
-          other: "Lähetämme sähköpostia vain, jos emme ole nähneet sinua edellisen {{count}} minuutin aikana."
+          other: "Lähetämme sähköpostia vain, jos emme ole nähneet sinua edellisen %{count} minuutin aikana."
       associated_accounts:
         title: "Liitetyt käyttäjätilit"
         connect: "Yhdistä"
@@ -1055,9 +1053,9 @@ fi:
       username:
         title: "Käyttäjätunnus"
         instructions: "uniikki, ei välilyöntejä, lyhyt"
-        short_instructions: "Muut käyttäjät voivat viitata sinuun nimellä @{{username}}"
+        short_instructions: "Muut käyttäjät voivat viitata sinuun nimellä @%{username}"
         available: "Käyttäjätunnus on vapaana"
-        not_available: "Ei saatavilla. Kokeile {{suggestion}}?"
+        not_available: "Ei saatavilla. Kokeile %{suggestion}?"
         not_available_no_suggestion: "Ei saatavilla"
         too_short: "Käyttäjätunnus on liian lyhyt"
         too_long: "Käyttäjätunnus on liian pitkä"
@@ -1081,11 +1079,11 @@ fi:
         log_out_all: "Kirjaudu ulos kaikkialta"
         active: "aktiivinen nyt"
         not_you: "Et ole sinä?"
-        show_all: "Näytä kaikki ({{count}})"
+        show_all: "Näytä kaikki (%{count})"
         show_few: "Näytä vähemmän"
         was_this_you: "Olitko sinä?"
         was_this_you_description: "Jos sisäänkirjautuja et ollut sinä, suosittelemme salasanan vaihtamista ja uloskirjautumista kaikilta laitteiltasi."
-        browser_and_device: "{{browser}} laitteella {{device}}"
+        browser_and_device: "%{browser} laitteella %{device}"
         secure_account: "Turvaa käyttäjätilini"
         latest_post: "Kirjoitit viimeksi..."
       last_posted: "Viimeisin viesti"
@@ -1165,20 +1163,19 @@ fi:
         none: "Ei kutsuja, joita näyttää."
         truncated:
           one: "Näytetään ensimmäinen kutsu."
-          other: "Näytetään ensimmäiset {{count}} kutsua."
+          other: "Näytetään ensimmäiset %{count} kutsua."
         redeemed: "Hyväksytyt kutsut"
         redeemed_tab: "Hyväksytyt"
-        redeemed_tab_with_count: "Hyväksytyt ({{count}})"
+        redeemed_tab_with_count: "Hyväksytyt (%{count})"
         redeemed_at: "Hyväksytty"
         pending: "Odottavat kutsut"
         pending_tab: "Odottavat"
-        pending_tab_with_count: "Avoimet ({{count}})"
+        pending_tab_with_count: "Avoimet (%{count})"
         topics_entered: "Avatut ketjut"
         posts_read_count: "Luetut viestit"
         expired: "Tämä kutsu on rauennut."
         rescind: "Poista"
         rescinded: "Kutsu poistettu"
-        rescind_all: "Poista kaikki vanhentuneet kutsut"
         rescinded_all: "Kaikki vanhentuneet kutsut poistettu!"
         rescind_all_confirm: "Haluatko varmasti poistaa kaikki vanhentuneet kutsut?"
         reinvite: "Lähetä kutsu uudestaan"
@@ -1189,13 +1186,18 @@ fi:
         time_read: "Lukuaika"
         days_visited: "Päiviä vierailtu"
         account_age_days: "Tilin ikä päivissä"
+        links_tab: "Linkit"
+        link_created_at: "Luotu"
+        link_groups: Ryhmät
         create: "Lähetä kutsu"
         generate_link: "Kopioi kutsulinkki"
         link_generated: "Kutsulinkki luotiin onnistuneesti!"
         valid_for: "Kutsulinkki on käypä tälle sähköpostiosoitteelle: %{email}"
+        single_user: "Yksittäinen käyttäjä"
+        invite_link:
+          success: "Kutsulinkki luotiin onnistuneesti!"
         bulk_invite:
           none: "Et ole kutsunut vielä ketään tänne. Voit lähettää yksittäisiä kutsuja tai kutsua joukon ihmisiä kerralla <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>lataamalla CSV-tiedoston</a>."
-          text: "Lähetä massakutsu tiedostosta"
           success: "Tiedoston lähettäminen onnistui. Saat viestin, kun prosessi on valmis."
           error: "Pahoittelut, tiedoston tulee olla CSV-muodossa."
           confirmation_message: "Olet lähettämässä kutsun kaikkiin sähköpostiosoitteisiin, jotka lähettämässäsi tiedostossa on."
@@ -1287,7 +1289,7 @@ fi:
       desc:
         network: "Tarkasta internetyhteytesi."
         network_fixed: "Näyttäisi palanneen takaisin."
-        server: "Virhekoodi: {{status}}"
+        server: "Virhekoodi: %{status}"
         forbidden: "Sinulla ei ole oikeutta katsoa tätä."
         not_found: "Hups, ohjelma yritti ladata osoitteen, jota ei ole olemassa"
         unknown: "Jotain meni pieleen."
@@ -1350,8 +1352,8 @@ fi:
       value_prop: "Kun luot tilin, muistamme mitä olet lukenut, jotta voit aina palata keskusteluissa takaisin oikeaan kohtaan. Saat myös ilmoituksia - palstalla näkyviä ja sähköpostiisi saapuvia - kun joku vastaa sinulle. Ja voit myös tykätä viesteistä. :heartbeat:"
     summary:
       enabled_description: "Tarkastelet tiivistelmää tästä ketjusta, sen mielenkiintoisimpia viestejä käyttäjien toiminnan perusteella."
-      description: "Vastauksia on <b>{{replyCount}}</b> kpl."
-      description_time: "Vastauksia on <b>{{replyCount}}</b>. Niiden lukemiseen menee arviolta <b>{{readingTime}} minuuttia</b>."
+      description: "Vastauksia on <b>%{replyCount}</b> kpl."
+      description_time: "Vastauksia on <b>%{replyCount}</b>. Niiden lukemiseen menee arviolta <b>%{readingTime} minuuttia</b>."
       enable: "Näytä ketjun tiivistelmä"
       disable: "Näytä kaikki viestit"
     deleted_filter:
@@ -1364,8 +1366,8 @@ fi:
       invite: "Kutsu muita..."
       edit: "Lisää tai poista..."
       leave_message: "Haluatko varmasti poistua yksityiskeskustelusta?"
-      remove_allowed_user: "Haluatko varmasti poistaa käyttäjän {{name}} tästä keskustelusta?"
-      remove_allowed_group: "Haluatko varmasti poistaa käyttäjän {{name}} tästä viestiketjusta?"
+      remove_allowed_user: "Haluatko varmasti poistaa käyttäjän %{name} tästä keskustelusta?"
+      remove_allowed_group: "Haluatko varmasti poistaa käyttäjän %{name} tästä viestiketjusta?"
     email: "Sähköposti"
     username: "Käyttäjätunnus"
     last_seen: "Nähty"
@@ -1374,7 +1376,7 @@ fi:
     trust_level: "Luottamustaso"
     search_hint: "käyttäjätunnus, sähköposti tai IP-osoite"
     create_account:
-      disclaimer: "Kun rekisteröidyt, hyväksyt <a href='{{privacy_link}}' target='blank'>tietosuojaselosteen</a> ja <a href='{{tos_link}}' target='blank'>käyttöehdot</a>."
+      disclaimer: "Kun rekisteröidyt, hyväksyt <a href='%{privacy_link}' target='blank'>tietosuojaselosteen</a> ja <a href='%{tos_link}' target='blank'>käyttöehdot</a>."
       title: "Luo uusi tunnus"
       failed: "Jotain meni pieleen. Ehkäpä tämä sähköpostiosoite on jo rekisteröity, kokeile salasana unohtui -linkkiä."
     forgot_password:
@@ -1434,7 +1436,7 @@ fi:
       awaiting_activation: "Tilisi odottaa aktivointia; unohdin salasanani -linkin kautta voit pyytää uuden aktivointisähköpostin."
       awaiting_approval: "Henkilökunta ei ole vielä hyväksynyt käyttäjätiliäsi. Saat sähköpostiviestin, kun tunnuksesi on hyväksytty."
       requires_invite: "Pahoittelut, tämä palsta on vain kutsutuille käyttäjille."
-      not_activated: "Et voi vielä kirjautua sisään. Lähetimme aiemmin vahvistusviestin osoitteeseen <b>{{sentTo}}</b>. Seuraa viestin ohjeita ottaaksesi tunnuksen käyttöön."
+      not_activated: "Et voi vielä kirjautua sisään. Lähetimme aiemmin vahvistusviestin osoitteeseen <b>%{sentTo}</b>. Seuraa viestin ohjeita ottaaksesi tunnuksen käyttöön."
       not_allowed_from_ip_address: "Kirjautuminen estetty tästä IP-osoitteesta."
       admin_not_allowed_from_ip_address: "Et voi kirjautua ylläpitäjänä tästä IP-osoitteesta."
       resend_activation_email: "Klikkaa tästä lähettääksesi vahvistusviestin uudelleen."
@@ -1443,7 +1445,7 @@ fi:
       change_email: "Vaihda sähköpostiosoitetta"
       provide_new_email: "Anna uusi osoite niin lähetämme sinulle vahvistamissähköpostin."
       submit_new_email: "Päivitä sähköpostiosoite"
-      sent_activation_email_again: "Lähetimme uuden vahvistusviestin sinulle osoitteeseen <b>{{currentEmail}}</b>. Viestin saapumisessa voi kestää muutama minuutti; muista tarkastaa myös roskapostikansio."
+      sent_activation_email_again: "Lähetimme uuden vahvistusviestin sinulle osoitteeseen <b>%{currentEmail}</b>. Viestin saapumisessa voi kestää muutama minuutti; muista tarkastaa myös roskapostikansio."
       sent_activation_email_again_generic: "Lähetimme uuden aktivointisähköpostin. Sen saapumisessa voi kestää joitakin minuutteja; tarkistathan myös roskapostikansiosi."
       to_continue: "Ole hyvä ja kirjaudu sisään"
       preferences: "Sinun täytyy olla kirjautuneena sisään muokataksesi tilisi asetuksia"
@@ -1507,20 +1509,20 @@ fi:
     conditional_loading_section:
       loading: Ladataan...
     category_row:
-      topic_count: "{{count}} ketjua tällä alueella"
+      topic_count: "%{count} ketjua tällä alueella"
     select_kit:
       default_header_text: Valitse...
       no_content: Ei osumia
       filter_placeholder: Hae...
       filter_placeholder_with_any: Etsi tai luo...
-      create: "Luo: '{{content}}'"
+      create: "Luo: '%{content}'"
       max_content_reached:
-        one: "Voit valita vain {{count}} kohteen."
-        other: "Voit valita enintään {{count}} kohdetta."
+        one: "Voit valita vain %{count} kohteen."
+        other: "Voit valita enintään %{count} kohdetta."
       min_content_not_reached:
-        one: "Valitse ainakin {{count}} kohde."
-        other: "Valitse ainakin {{count}} kohdetta."
-      invalid_selection_length: "Täytyy valita ainakin {{count}} merkkiä."
+        one: "Valitse ainakin %{count} kohde."
+        other: "Valitse ainakin %{count} kohdetta."
+      invalid_selection_length: "Täytyy valita ainakin %{count} merkkiä."
     date_time_picker:
       from: Mistä
       to: Vastaanottaja
@@ -1547,7 +1549,7 @@ fi:
       default: Mukautetut emojit
     shared_drafts:
       title: "Jaetut luonnokset"
-      notice: "Tämä ketju näkyy vain niille, jotka näkevät <b>{{category}}</b> -alueen."
+      notice: "Tämä ketju näkyy vain niille, jotka näkevät <b>%{category}</b> -alueen."
       destination_category: "Kohdealue"
       publish: "Julkaise jaettu luonnos"
       confirm_publish: "Haluatko varmasti julkaista luonnoksen?"
@@ -1567,24 +1569,24 @@ fi:
       similar_topics: "Tämä ketju vaikuttaa samalta kuin.."
       drafts_offline: "offline luonnokset"
       edit_conflict: "muokkauskonflikti"
-      group_mentioned_limit: "<b>Varoitus!</b> Mainitsit ryhmän <a href='{{group_link}}'>{{group}}</a>, mutta ylläpitäjä on määrittänyt mainintojen enimmäismääräksi {{max}} käyttäjää, minkä tämän ryhmän jäsenmäärä ylittää. Kukaan ei saa ilmoitusta. "
+      group_mentioned_limit: "<b>Varoitus!</b> Mainitsit ryhmän <a href='%{group_link}'>%{group}</a>, mutta ylläpitäjä on määrittänyt mainintojen enimmäismääräksi %{max} käyttäjää, minkä tämän ryhmän jäsenmäärä ylittää. Kukaan ei saa ilmoitusta. "
       group_mentioned:
-        one: "Jos mainitset ryhmän {{group}}, <a href='{{group_link}}'>%{count} käyttäjä</a> saa ilmoituksen – oletko varma?"
-        other: "Jos mainitset ryhmän {{group}}, <a href='{{group_link}}'>{{count}} käyttäjää</a> saa ilmoituksen – oletko varma?"
+        one: "Jos mainitset ryhmän %{group}, <a href='%{group_link}'>%{count} käyttäjä</a> saa ilmoituksen – oletko varma?"
+        other: "Jos mainitset ryhmän %{group}, <a href='%{group_link}'>%{count} käyttäjää</a> saa ilmoituksen – oletko varma?"
       cannot_see_mention:
-        category: "Mainitsit käyttäjän {{username}} mutta hän ei saa ilmoitusta, koska hänellä ei ole pääsyä tälle alueelle. Hänet tulee lisätä ryhmään, jolla on pääsy alueelle."
-        private: "Mainitsit käyttäjän {{username}} mutta hän ei saa ilmoitusta, koska hän ei näe tätä yksityiskeskustelua. Hänet tulee kutsua tähän yksityiskeskusteluun."
-      duplicate_link: "Näyttää siltä, että <b>@{{username}}</b> linkitti jo samaan kohteeseen <b>{{domain}}</b> ketjun <a href='{{post_url}}'>aiemmassa viestissä {{ago}}</a> – oletko varma, että haluat lähettää sen uudestaan?"
-      reference_topic_title: "RE: {{title}}"
+        category: "Mainitsit käyttäjän %{username} mutta hän ei saa ilmoitusta, koska hänellä ei ole pääsyä tälle alueelle. Hänet tulee lisätä ryhmään, jolla on pääsy alueelle."
+        private: "Mainitsit käyttäjän %{username} mutta hän ei saa ilmoitusta, koska hän ei näe tätä yksityiskeskustelua. Hänet tulee kutsua tähän yksityiskeskusteluun."
+      duplicate_link: "Näyttää siltä, että <b>@%{username}</b> linkitti jo samaan kohteeseen <b>%{domain}</b> ketjun <a href='%{post_url}'>aiemmassa viestissä %{ago}</a> – oletko varma, että haluat lähettää sen uudestaan?"
+      reference_topic_title: "RE: %{title}"
       error:
         title_missing: "Otsikko on pakollinen"
-        title_too_short: "Otsikon täytyy olla vähintään {{min}} merkkiä pitkä"
-        title_too_long: "Otsikko voi olla korkeintaan {{max}} merkkiä pitkä"
+        title_too_short: "Otsikon täytyy olla vähintään %{min} merkkiä pitkä"
+        title_too_long: "Otsikko voi olla korkeintaan %{max} merkkiä pitkä"
         post_missing: "Viesti ei voi olla tyhjä"
-        post_length: "Viestissä täytyy olla vähintään {{min}} merkkiä"
-        try_like: "Oletko kokeillut {{heart}}-nappia?"
+        post_length: "Viestissä täytyy olla vähintään %{min} merkkiä"
+        try_like: "Oletko kokeillut %{heart}-nappia?"
         category_missing: "Sinun täytyy valita viestille alue"
-        tags_missing: "Valitse vähintään {{count}} tunnistetta"
+        tags_missing: "Valitse vähintään %{count} tunnistetta"
         topic_template_not_modified: "Lisää tietoa ketjunaloitukseesi muokkaamalla ketjusapluunaa."
       save_edit: "Tallenna"
       overwrite_edit: "Päällekirjoita"
@@ -1682,57 +1684,57 @@ fi:
       tooltip:
         regular:
           one: "Uusi ilmoitus"
-          other: "{{count}} uutta ilmoitusta"
+          other: "%{count} uutta ilmoitusta"
         message:
           one: "Uusi yksityisviesti"
-          other: "{{count}} uutta yksityisviestiä"
+          other: "%{count} uutta yksityisviestiä"
       title: "ilmoitukset @nimeen viittauksista, vastauksista omiin viesteihin ja ketjuihin, viesteistä ym."
       none: "Ilmoitusten lataaminen ei onnistunut."
       empty: "Ilmoituksia ei löydetty."
       post_approved: "Viestisi hyväksyttiin"
       reviewable_items: "käsittelyä odottavaa asiaa"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} ja %{count} muu</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} ja {{count}} muuta</span> {{description}}"
+        one: "<span>%{username}, %{username2} ja %{count} muu</span> %{description}"
+        other: "<span>%{username}, %{username2} ja %{count} muuta</span> %{description}"
       liked_consolidated_description:
-        one: "tykkäsi {{count}} viestistäsi"
-        other: "tykkäsi {{count}} viestistäsi"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> hyväksyi kutsusi"
-      moved_post: "<span>{{username}}</span> siirsi {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Ansaitsit '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Uusi ketju</span> {{description}}"
-      membership_request_accepted: "Hyväksyttiin ryhmään '{{group_name}}'"
-      membership_request_consolidated: "{{count}} odottavaa jäsenhakemusta ryhmään {{group_name}}"
+        one: "tykkäsi %{count} viestistäsi"
+        other: "tykkäsi %{count} viestistäsi"
+      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}"
+      invitee_accepted: "<span>%{username}</span> hyväksyi kutsusi"
+      moved_post: "<span>%{username}</span> siirsi %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Ansaitsit '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Uusi ketju</span> %{description}"
+      membership_request_accepted: "Hyväksyttiin ryhmään '%{group_name}'"
+      membership_request_consolidated: "%{count} odottavaa jäsenhakemusta ryhmään %{group_name}"
       group_message_summary:
-        one: "{{count}} viesti ryhmän {{group_name}} saapuneissa"
-        other: "{{count}} viestiä ryhmän {{group_name}} saapuneissa"
+        one: "%{count} viesti ryhmän %{group_name} saapuneissa"
+        other: "%{count} viestiä ryhmän %{group_name} saapuneissa"
       popup:
-        mentioned: '{{username}} mainitsi sinut ketjussa "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} mainitsi sinut ketjussa "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} lainasi sinua ketjussa "{{topic}}" - {{site_title}}'
-        replied: '{{username}} vastasi sinulle ketjussa "{{topic}}" - {{site_title}}'
-        posted: '{{username}} vastasi ketjuun "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} lähetti sinulle yksityisviestin keskustelussa "{{topic}}" - {{site_title}}'
-        linked: '{{username}} linkitti viestiisi ketjusta "{{topic}}" - {{site_title}}'
-        watching_first_post: '{{username}} loi uuden ketjun "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} mainitsi sinut ketjussa "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} mainitsi sinut ketjussa "%{topic}" - %{site_title}'
+        quoted: '%{username} lainasi sinua ketjussa "%{topic}" - %{site_title}'
+        replied: '%{username} vastasi sinulle ketjussa "%{topic}" - %{site_title}'
+        posted: '%{username} vastasi ketjuun "%{topic}" - %{site_title}'
+        private_message: '%{username} lähetti sinulle yksityisviestin keskustelussa "%{topic}" - %{site_title}'
+        linked: '%{username} linkitti viestiisi ketjusta "%{topic}" - %{site_title}'
+        watching_first_post: '%{username} loi uuden ketjun "%{topic}" - %{site_title}'
         confirm_title: "Ilmoitukset käytössä - %{site_title}"
         confirm_body: "Onnistui! Ilmoitukset ovat nyt käytössä."
-        custom: "Ilmoitus käyttäjältä {{username}} sivustolla %{site_title}"
+        custom: "Ilmoitus käyttäjältä %{username} sivustolla %{site_title}"
       titles:
         mentioned: "mainitsi"
         replied: "uusi vastaus"
@@ -1762,9 +1764,9 @@ fi:
       from_my_computer: "Tästä laitteesta"
       from_the_web: "Netistä"
       remote_tip: "linkki kuvaan"
-      remote_tip_with_attachments: "linkki kuvaan tai tiedostoon {{authorized_extensions}}"
+      remote_tip_with_attachments: "linkki kuvaan tai tiedostoon %{authorized_extensions}"
       local_tip: "valitse kuvia laitteeltasi"
-      local_tip_with_attachments: "valitse kuvia tai tiedostoja laitteeltasi {{authorized_extensions}}"
+      local_tip_with_attachments: "valitse kuvia tai tiedostoja laitteeltasi %{authorized_extensions}"
       hint: "(voit myös raahata ne editoriin ladataksesi ne sivustolle)"
       hint_for_supported_browsers: "voit myös raahata tai liittää kuvia editoriin"
       uploading: "Lähettää"
@@ -1781,15 +1783,15 @@ fi:
       clear_all: "Tyhjennä kaikki"
       too_short: "Hakusana on liian lyhyt."
       result_count:
-        one: "<span>%{count} tulos haulle</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} tulosta haulle</span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} tulos haulle</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} tulosta haulle</span><span class='term'>%{term}</span>"
       title: "etsi ketjuja, viestejä, käyttäjiä tai alueita"
       full_page_title: "etsi ketjuja tai viestejä"
       no_results: "Ei tuloksia."
       no_more_results: "Enempää tuloksia ei löytynyt."
       searching: "Etsitään ..."
-      post_format: "#{{post_number}} käyttäjältä {{username}}"
-      results_page: "Tulokset hakusanalle '{{term}}'"
+      post_format: "#%{post_number} käyttäjältä %{username}"
+      results_page: "Tulokset hakusanalle '%{term}'"
       more_results: "Tuloksia olisi enemmänkin. Rajaa hakuasi."
       cant_find: "Etkö löydä etsimääsi?"
       start_new_topic: "Haluaisitko aloittaa uuden ketjun?"
@@ -1798,9 +1800,9 @@ fi:
       search_google_button: "Google"
       search_google_title: "Hae tältä sivustolta"
       context:
-        user: "Etsi @{{username}} viestejä"
-        category: "Etsi alueelta #{{category}}"
-        tag: "Hae tunnistetta #{{tag}}"
+        user: "Etsi @%{username} viestejä"
+        category: "Etsi alueelta #%{category}"
+        tag: "Hae tunnistetta #%{tag}"
         topic: "Etsi tästä ketjusta"
         private_messages: "Etsi viesteistä"
       advanced:
@@ -1877,7 +1879,7 @@ fi:
         choose_new_category: "Valitse uusi alue ketjuille:"
         selected:
           one: "Olet valinnut <b>yhden</b> ketjun."
-          other: "Olet valinnut <b>{{count}}</b> ketjua."
+          other: "Olet valinnut <b>%{count}</b> ketjua."
         change_tags: "Korvaa tunnisteet"
         append_tags: "Lisää tunnisteita"
         choose_new_tags: "Valitse tunnisteet näille ketjuille:"
@@ -1890,7 +1892,7 @@ fi:
         posted: "Et ole kirjoittanut vielä yhteenkään ketjuun."
         latest: "Tuoreimpia ketjuja ei ole. Onpa harmi."
         bookmarks: "Et ole vielä merkinnyt kirjanmerkkejä."
-        category: "Alueella {{category}} ei ole ketjua."
+        category: "Alueella %{category} ei ole ketjua."
         top: "Kuumia ketjuja ei ole."
         educate:
           new: '<p>Sinulle uudet ketjut näytetään tässä.</p><p>Ketju tulkitaan uudeksi ja sen yhteydessä näytetään <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">uusi</span>-merkintä, jos se on aloitettu edellisten kahden päivän aikana.</p><p>Aikarajaa voit muuttaa <a href="%{userPrefsUrl}">käyttäjäasetuksissasi</a>.</p>'
@@ -1901,13 +1903,13 @@ fi:
         read: "Luettuja ketjuja ei ole enempää."
         new: "Uusia ketjuja ei ole enempää."
         unread: "Ketjuja ei ole enempää lukematta."
-        category: "Alueen {{category}} ketjuja ei ole enempää."
+        category: "Alueen %{category} ketjuja ei ole enempää."
         top: "Kuumia ketjuja ei ole enempää."
         bookmarks: "Merkattuja ketjuja ei ole enempää."
     topic:
       filter_to:
         one: "%{count} viesti ketjussa"
-        other: "{{count}} viestiä ketjussa"
+        other: "%{count} viestiä ketjussa"
       create: "Uusi ketju"
       create_long: "Aloita uusi ketju"
       open_draft: "Avaa luonnos"
@@ -1936,10 +1938,10 @@ fi:
       unread: "lukematta"
       new_topics:
         one: "%{count} uusi ketju"
-        other: "{{count}} uutta ketjua"
+        other: "%{count} uutta ketjua"
       unread_topics:
         one: "%{count} ketju lukematta"
-        other: "{{count}} ketjua lukematta"
+        other: "%{count} ketjua lukematta"
       title: "Aihe"
       invalid_access:
         title: "Tämä ketju on yksityinen"
@@ -1953,24 +1955,24 @@ fi:
         description: "Pahoittelut, ketjua ei löytynyt. Ehkäpä valvoja on siirtänyt sen muualle?"
       total_unread_posts:
         one: "sinulla on %{count} lukematon viesti tässä ketjussa"
-        other: "sinulla on {{count}} lukematonta viestiä tässä ketjussa"
+        other: "sinulla on %{count} lukematonta viestiä tässä ketjussa"
       unread_posts:
         one: "yksi vanha viesti on lukematta tässä ketjussa"
-        other: "{{count}} vanhaa viestiä on lukematta tässä ketjussa"
+        other: "%{count} vanhaa viestiä on lukematta tässä ketjussa"
       new_posts:
         one: "tähän ketjuun on tullut yksi uusi viesti sen jälkeen, kun edellisen kerran luit sen"
-        other: "tähän ketjuun on tullut {{count}} uutta viestiä sen jälkeen, kun edellisen kerran luit sen"
+        other: "tähän ketjuun on tullut %{count} uutta viestiä sen jälkeen, kun edellisen kerran luit sen"
       likes:
         one: "tässä ketjussa on yksi tykkäys"
-        other: "tässä ketjussa on {{count}} tykkäystä"
+        other: "tässä ketjussa on %{count} tykkäystä"
       back_to_list: "Takaisin ketjulistaan"
       options: "Ketjun asetukset"
       show_links: "näytä tämän ketjun linkit"
       toggle_information: "näytä/kätke ketjun tiedot"
-      read_more_in_category: "Haluatko lukea lisää? Selaile muita alueen {{catLink}} ketjuja tai {{latestLink}}."
-      read_more: "Haluatko lukea lisää? Selaa aluetta {{catLink}} tai katsele {{latestLink}}."
-      group_request: "Jos haluat nähdä tämän ketjun, hae ryhmän `{{name}}` jäsenyyttä"
-      group_join: "Jos haluat nähdä tämän ketjun, sinun täytyy liittyä ryhmään `{{name}}`"
+      read_more_in_category: "Haluatko lukea lisää? Selaile muita alueen %{catLink} ketjuja tai %{latestLink}."
+      read_more: "Haluatko lukea lisää? Selaa aluetta %{catLink} tai katsele %{latestLink}."
+      group_request: "Jos haluat nähdä tämän ketjun, hae ryhmän `%{name}` jäsenyyttä"
+      group_join: "Jos haluat nähdä tämän ketjun, sinun täytyy liittyä ryhmään `%{name}`"
       group_request_sent: "Ryhmän jäsenyyspyyntösi on lähetetty. Saat ilmoituksen, kun se on hyväksytty."
       unread_indicator: "Kukaan jäsen ei ole lukenut ketjun viimeistä viestiä vielä."
       read_more_MF: "Sinulla on { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 ketju</a>, jossa on viestejä } other { <a href='{basePath}/unread'># ketjua</a>, joissa on viestejä }} { NEW, plural, =0 {} one { {BOTH, select, true{ja } false { } other{}} <a href='{basePath}/new'>1 uusi</a> ketju} other { {BOTH, select, true{ja } false { } other{}} <a href='{basePath}/new'># uutta ketjua</a>} } lukematta. Tai {CATEGORY, select, true {selaile aluetta {catLink}} false {katsele {latestLink}.} other {}}"
@@ -2074,7 +2076,7 @@ fi:
           "2_8": "Näet uusien vastausten määrän, koska olet asettanut tämän alueen seurantaan."
           "2_4": "Näet uusien vastausten määrän, koska olet kirjoittanut ketjuun."
           "2_2": "Näet uusien vastausten määrän, koska olet asettanut ketjun seurantaan."
-          "2": 'Näet uusien vastausten määrän, koska <a href="{{basePath}}/u/{{username}}/preferences/notifications">luit ketjua aiemmin</a>.'
+          "2": 'Näet uusien vastausten määrän, koska <a href="%{basePath}/u/%{username}/preferences/notifications">luit ketjua aiemmin</a>.'
           "1_2": "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle."
           "1": "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle."
           "0_7": "Et saa mitään ilmoituksia tältä alueelta."
@@ -2150,25 +2152,25 @@ fi:
         choose_category: "Valitse alue julkiselle ketjulle:"
       feature_topic:
         title: "Nosta tämä ketju"
-        pin: "Kiinnitä tämä ketju alueen {{categoryLink}} ylimmäiseksi kunnes"
-        confirm_pin: "Jo {{count}} ketjua on kiinnitetty. Liian monta kiinnitettyä ketjua voi olla taakaksi uusille ja kirjautumattomille käyttäjille. Oletko varma, että haluat kiinnittää yhden ketjun lisää tälle alueelle?"
-        unpin: "Älä enää pidä tätä ketjua {{categoryLink}}-aluen ylimmäisenä."
-        unpin_until: "Poista nyt tämän ketjun kiinnitys alueen {{categoryLink}} ylimmäisenä, tai odota kunnes <strong>%{until}</strong>."
+        pin: "Kiinnitä tämä ketju alueen %{categoryLink} ylimmäiseksi kunnes"
+        confirm_pin: "Jo %{count} ketjua on kiinnitetty. Liian monta kiinnitettyä ketjua voi olla taakaksi uusille ja kirjautumattomille käyttäjille. Oletko varma, että haluat kiinnittää yhden ketjun lisää tälle alueelle?"
+        unpin: "Älä enää pidä tätä ketjua %{categoryLink}-aluen ylimmäisenä."
+        unpin_until: "Poista nyt tämän ketjun kiinnitys alueen %{categoryLink} ylimmäisenä, tai odota kunnes <strong>%{until}</strong>."
         pin_note: "Käyttäjät voivat poistaa ketjun kiinnityksen itseltään."
         pin_validation: "Päivämäärä vaaditaan kiinnittämään tämä ketju"
-        not_pinned: "Alueella {{categoryLink}} ei ole kiinnitettyjä ketjuja."
+        not_pinned: "Alueella %{categoryLink} ei ole kiinnitettyjä ketjuja."
         already_pinned:
-          one: "Kiinnitettyjä ketjuja alueella {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Alueelle {{categoryLink}} kiinnitettyjä ketjuja: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Kiinnitettyjä ketjuja alueella %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Alueelle %{categoryLink} kiinnitettyjä ketjuja: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Kiinnitä tämä ketju kaikkien alueiden ylimmäiseksi, kunnes"
-        confirm_pin_globally: "Jo {{count}} ketjua on kiinnitetty koko palstalle. Liian monta kiinnitettyä ketjua voi olla taakaksi uusille ja kirjautumattomille käyttäjille. Oletko varma, että haluat kiinnittää yhden ketjun lisää koko palstalle?"
+        confirm_pin_globally: "Jo %{count} ketjua on kiinnitetty koko palstalle. Liian monta kiinnitettyä ketjua voi olla taakaksi uusille ja kirjautumattomille käyttäjille. Oletko varma, että haluat kiinnittää yhden ketjun lisää koko palstalle?"
         unpin_globally: "Älä enää pidä tätä ketjua kaikkien alueiden ylimmäisenä."
         unpin_globally_until: "Poista nyt tämän ketjun kiinnitys kaikkien alueiden ylimmäisenä, tai odota kunnes <strong>%{until}</strong>."
         global_pin_note: "Käyttäjät voivat poistaa ketjun kiinnityksen itseltään."
         not_pinned_globally: "Yhtään ketjua ei ole kiinnitetty koko palstalle."
         already_pinned_globally:
           one: "Koko palstalle kiinnitettyjä ketjuja: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Koko palstalle kiinnitettyjä ketjuja: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Koko palstalle kiinnitettyjä ketjuja: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Tee tästä ketjusta banneri, joka näytetään kaikkien sivujen ylimmäisenä."
         remove_banner: "Poista banneri, joka näytetään kaikkien sivujen ylimmäisenä."
         banner_note: "Käyttäjät voivat piilottaa bannerin sulkemalla sen. Vain yksi ketju kerrallaan voi olla banneri."
@@ -2198,15 +2200,15 @@ fi:
         to_topic_username: "Annoit käyttäjänimen. Lähetämme hänelle ilmoituksen, jossa on linkki ja kutsu tähän ketjuun."
         to_username: "Kirjoita henkilön käyttäjänimi, jonka haluat kutsua. Lähetämme hänelle ilmoituksen, jossa on linkki ja kutsu tähän ketjuun."
         email_placeholder: "nimi@esimerkki.fi"
-        success_email: "Olemme lähettäneet kutsun osoitteeseen <b>{{emailOrUsername}}</b>. Ilmoitamme, kun kutsuun on vastattu. Voit seurata käyttäjäsivusi kutsut-välilehdeltä kutsujesi tilannetta."
+        success_email: "Olemme lähettäneet kutsun osoitteeseen <b>%{emailOrUsername}</b>. Ilmoitamme, kun kutsuun on vastattu. Voit seurata käyttäjäsivusi kutsut-välilehdeltä kutsujesi tilannetta."
         success_username: "Olemme kutsuneet käyttäjän osallistumaan tähän ketjuun."
         error: "Pahoittelut, emme onnistuneet kutsumaan tätä henkilöä. Ehkäpä hänet on jo kutsuttu? (Huomaa, että kutsumistiheyttä rajoitetaan)"
-        success_existing_email: "On jo olemassa käyttäjä sähköpostiosoitteella <b>{{emailOrUsername}}</b>. Hänet kutsuttiin osallistumaan tähän ketjuun."
+        success_existing_email: "On jo olemassa käyttäjä sähköpostiosoitteella <b>%{emailOrUsername}</b>. Hänet kutsuttiin osallistumaan tähän ketjuun."
       login_reply: "Kirjaudu sisään vastataksesi"
       filters:
         n_posts:
           one: "%{count} viesti"
-          other: "{{count}} viestiä"
+          other: "%{count} viestiä"
         cancel: "Poista suodatin"
       move_to:
         title: "Siirrä"
@@ -2220,7 +2222,7 @@ fi:
         error: "Viestien siirtämisessä uuteen ketjuun tapahtui virhe."
         instructions:
           one: "Olet luomassa uutta ketjua valitsemastasi viestistä."
-          other: "Olet aloittamassa uutta ketjua valitsemistasi <b>{{count}}</b> viestistä."
+          other: "Olet aloittamassa uutta ketjua valitsemistasi <b>%{count}</b> viestistä."
       merge_topic:
         title: "Siirrä olemassa olevaan ketjuun"
         action: "siirrä olemassa olevaan ketjuun"
@@ -2228,7 +2230,7 @@ fi:
         radio_label: "Olemassa oleva ketju"
         instructions:
           one: "Valitse ketju, johon haluat siirtää valitun viestin."
-          other: "Valitse ketju, johon haluat siirtää valitut <b>{{count}}</b> viestiä."
+          other: "Valitse ketju, johon haluat siirtää valitut <b>%{count}</b> viestiä."
       move_to_new_message:
         title: "Siirrä uuteen yksityiskeskusteluun"
         action: "siirrä uuteen yksityiskeskusteluun"
@@ -2237,7 +2239,7 @@ fi:
         participants: "Osallistujat"
         instructions:
           one: "Olet luomassa uutta keskustelua, jossa olisi viesti, jonka olet valinnut."
-          other: "Olet luomassa uutta keskustelua, jossa olisi <b>{{count}}</b> viestiä, jotka olet valinnut."
+          other: "Olet luomassa uutta keskustelua, jossa olisi <b>%{count}</b> viestiä, jotka olet valinnut."
       move_to_existing_message:
         title: "Siirrä olemassa olevaan keskusteluun"
         action: "siirrä olemassa olevaan keskusteluun"
@@ -2245,7 +2247,7 @@ fi:
         participants: "Osallistujat"
         instructions:
           one: "Valitse keskustelu, johon haluat siirtää tämän viestin."
-          other: "Valitse keskustelu, johon haluat siirtää nämä <b>{{count}}</b> viestiä."
+          other: "Valitse keskustelu, johon haluat siirtää nämä <b>%{count}</b> viestiä."
       merge_posts:
         title: "Yhdistä valitut viestit"
         action: "yhdistä valitut viestit"
@@ -2259,8 +2261,8 @@ fi:
         error: "Viestin omistajan vaihdossa tapahtui virhe."
         placeholder: "uuden omistajan käyttäjätunnus"
         instructions:
-          one: "Valitse uusi omistaja käyttäjän <b>@{{old_user}}</b> viestille."
-          other: "Valitse uusi omistaja käyttäjän <b>@{{old_user}}</b> {{count}} viestille."
+          one: "Valitse uusi omistaja käyttäjän <b>@%{old_user}</b> viestille."
+          other: "Valitse uusi omistaja käyttäjän <b>@%{old_user}</b> %{count} viestille."
       change_timestamp:
         title: "Muuta aikaleimaa..."
         action: "muuta aikaleimaa"
@@ -2269,7 +2271,7 @@ fi:
         instructions: "Ole hyvä ja valitse ketjulle uusi aikaleima. Ketjun viestit päivitetään samalla aikaerolla."
       multi_select:
         select: "valitse"
-        selected: "valittuna ({{count}})"
+        selected: "valittuna (%{count})"
         select_post:
           label: "valitse"
           title: "Lisää viesti valittuihin"
@@ -2288,20 +2290,20 @@ fi:
         deselect_all: poista kaikkien valinta
         description:
           one: Olet valinnut <b>yhden</b> viestin.
-          other: "Olet valinnut <b>{{count}}</b> viestiä."
+          other: "Olet valinnut <b>%{count}</b> viestiä."
       deleted_by_author:
         one: "(kirjoittaja perui ketjun, poistetaan automaattisesti %{count} tunnin kuluttua, paitsi jos liputetaan)"
         other: "(kirjoittaja perui ketjun, poistetaan automaattisesti %{count} tunnin kuluttua, paitsi jos liputetaan)"
     post:
       quote_reply: "Lainaa"
       edit_reason: "Syy:"
-      post_number: "viesti {{number}}"
+      post_number: "viesti %{number}"
       ignored: "Sivuutettua sisältöä"
       wiki_last_edited_on: "wikiä muokattiin viimeksi"
       last_edited_on: "viestin viimeisin muokkausaika"
       reply_as_new_topic: "Vastaa aihetta sivuavassa ketjussa"
       reply_as_new_private_message: "Vastaa samoille vastaanottajille uudessa yksityisviestiketjussa"
-      continue_discussion: "Jatkoa ketjulle {{postLink}}:"
+      continue_discussion: "Jatkoa ketjulle %{postLink}:"
       follow_quote: "siirry lainattuun viestiin"
       show_full: "Näytä koko viesti"
       show_hidden: "Katso sivuutettu sisältö."
@@ -2313,29 +2315,29 @@ fi:
       locked: "henkilökunnan jäsen on estänyt tämän viestin muokkaamisen"
       gap:
         one: "näytä %{count} piilotettu vastaus"
-        other: "näytä {{count}} piilotettua vastausta"
+        other: "näytä %{count} piilotettua vastausta"
       notice:
-        new_user: "Tämä on ensimmäinen kerta kun {{user}} kirjoittaa — toivotetaan hänet tervetulleeksi yhteisöömme!"
-        returning_user: "Siitä on aikaa kun {{user}} on viimeksi nähty — hän oli viimeksi kirjoittanut {{time}}."
+        new_user: "Tämä on ensimmäinen kerta kun %{user} kirjoittaa — toivotetaan hänet tervetulleeksi yhteisöömme!"
+        returning_user: "Siitä on aikaa kun %{user} on viimeksi nähty — hän oli viimeksi kirjoittanut %{time}."
       unread: "Viesti on lukematta"
       has_replies:
-        one: "{{count}} vastaus"
-        other: "{{count}} vastausta"
+        one: "%{count} vastaus"
+        other: "%{count} vastausta"
       has_likes_title:
         one: "%{count} käyttäjä tykkäsi tästä viestistä"
-        other: "{{count}} käyttäjää tykkäsi tästä viestistä"
+        other: "%{count} käyttäjää tykkäsi tästä viestistä"
       has_likes_title_only_you: "tykkäsit tästä viestistä"
       has_likes_title_you:
         one: "Sinä ja yksi toinen tykkäsi tästä viestistä"
-        other: "Sinä ja {{count}} muuta tykkäsi tästä viestistä"
+        other: "Sinä ja %{count} muuta tykkäsi tästä viestistä"
       errors:
         create: "Pahoittelut, viestin luonti ei onnistunut. Ole hyvä ja yritä uudelleen."
         edit: "Pahoittelut, viestin muokkaus ei onnistunut. Ole hyvä ja yritä uudelleen."
         upload: "Pahoittelut, tiedoston lähetys ei onnistunut. Ole hyvä ja yritä uudelleen."
-        file_too_large: "Pahoittelut, tiedosto on liian suuri (enimmäiskoko on {{max_size_kb}}kb). Mitäpä jos lataisit suuren tiedostosi johonkin pilvipalveluun ja sitten jakaisit linkin?"
+        file_too_large: "Pahoittelut, tiedosto on liian suuri (enimmäiskoko on %{max_size_kb}kb). Mitäpä jos lataisit suuren tiedostosi johonkin pilvipalveluun ja sitten jakaisit linkin?"
         too_many_uploads: "Pahoittelut, voit ladata vain yhden tiedoston kerrallaan."
-        too_many_dragged_and_dropped_files: "Pahoittelut, voit ladata korkeintaan {{max}} tiedostoa kerrallaan."
-        upload_not_authorized: "Pahoittelut, tiedosto jota yrität ladata ei ole sallittu (sallitut laajennukset: {{authorized_extensions}})."
+        too_many_dragged_and_dropped_files: "Pahoittelut, voit ladata korkeintaan %{max} tiedostoa kerrallaan."
+        upload_not_authorized: "Pahoittelut, tiedosto jota yrität ladata ei ole sallittu (sallitut laajennukset: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Pahoittelut, uudet käyttjät eivät saa ladata kuvia."
         attachment_upload_not_allowed_for_new_user: "Pahoittelut, uudet käyttäjät eivät saa ladata liitteitä."
         attachment_download_requires_login: "Pahoittelut, sinun täytyy kirjautua sisään voidaksesi ladata liitetiedostoja."
@@ -2375,10 +2377,10 @@ fi:
           confirm: "Haluatko poistaa myös tähän viestiin liittyvät vastaukset?"
           direct_replies:
             one: "Kyllä, ja yksi suora vastaus"
-            other: "Kyllä, ja {{count}} suoraa vastausta"
+            other: "Kyllä, ja %{count} suoraa vastausta"
           all_replies:
             one: "Kyllä, ja yksi vastaus"
-            other: "Kyllä, ja kaikki {{count}} vastausta"
+            other: "Kyllä, ja kaikki %{count} vastausta"
           just_the_post: "Ei, vain tämä viesti"
         admin: "viestin ylläpitotoimet"
         wiki: "Tee wiki"
@@ -2425,11 +2427,11 @@ fi:
             one: "luki tämän"
             other: "lukivat tämän"
           like_capped:
-            one: "ja {{count}} muu tykkäsi tästä"
-            other: "ja {{count}} muuta tykkäsi tästä"
+            one: "ja %{count} muu tykkäsi tästä"
+            other: "ja %{count} muuta tykkäsi tästä"
           read_capped:
-            one: "ja {{count}} muu lukivat tämän"
-            other: "ja {{count}} muuta lukivat tämän"
+            one: "ja %{count} muu lukivat tämän"
+            other: "ja %{count} muuta lukivat tämän"
         by_you:
           off_topic: "Liputit tämän eksyvän aiheesta"
           spam: "Liputit tämän roskapostiksi"
@@ -2441,11 +2443,11 @@ fi:
       delete:
         confirm:
           one: "Oletko varma, että haluat poistaa viestin?"
-          other: "Oletko varma, että haluat poistaa {{count}} viestiä?"
+          other: "Oletko varma, että haluat poistaa %{count} viestiä?"
       merge:
         confirm:
           one: "Oletko varma, että haluat yhdistää nämä viestit?"
-          other: "Oletko varma, että haluat yhdistää nämä {{count}} viestiä?"
+          other: "Oletko varma, että haluat yhdistää nämä %{count} viestiä?"
       revisions:
         controls:
           first: "Ensimmäinen revisio"
@@ -2457,7 +2459,7 @@ fi:
           revert: "Palaa tähän revisioon"
           edit_wiki: "Muokkaa wikiä"
           edit_post: "Muokkaa viestiä"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "Näytä lisäykset ja poistot tekstin osana"
@@ -2641,13 +2643,13 @@ fi:
       custom_message:
         at_least:
           one: "syötä vähintään %{count} merkki"
-          other: "syötä vähintään {{count}} merkkiä"
+          other: "syötä vähintään %{count} merkkiä"
         more:
           one: "Vielä %{count}..."
-          other: "Vielä {{count}}..."
+          other: "Vielä %{count}..."
         left:
           one: "%{count} jäljellä"
-          other: "{{count}} jäljellä"
+          other: "%{count} jäljellä"
     flagging_topic:
       title: "Kiitos avustasi yhteisön hyväksi!"
       action: "Liputa ketju"
@@ -2691,7 +2693,7 @@ fi:
         title: "Tämä ketju on yksityiskeskustelu"
         help: "Tämä ketju on yksityiskeskustelu"
     posts: "Viestejä"
-    posts_long: "tässä ketjussa on {{number}} viestiä"
+    posts_long: "tässä ketjussa on %{number} viestiä"
     posts_likes_MF: |
       Tässä ketjussa on {count, plural, one {1 vastaus} other {# vastausta}} {ratio, select,
       low {, joilla on suuri määrä tykkäyksiä suhteessa viestien määrään}
@@ -2706,20 +2708,20 @@ fi:
     replies: "Vastauksia"
     views_long:
       one: "ketjua on katseltu yhden kerran"
-      other: "ketjua on katseltu {{number}} kertaa"
+      other: "ketjua on katseltu %{number} kertaa"
     activity: "Toiminta"
     likes: "Tykkäykset"
     likes_lowercase:
       one: "tykkäys"
       other: "tykkäykset"
-    likes_long: "tässä ketjussa on {{number}} tykkäystä"
+    likes_long: "tässä ketjussa on %{number} tykkäystä"
     users: "Käyttäjät"
     users_lowercase:
       one: "käyttäjä"
       other: "käyttäjät"
     category_title: "Alue"
     history: "Historia"
-    changed_by: "käyttäjältä {{author}}"
+    changed_by: "käyttäjältä %{author}"
     raw_email:
       title: "Saapuva sähköposti"
       not_available: "Ei käytettävissä!"
@@ -2731,33 +2733,33 @@ fi:
         title: "Tuoreimmat"
         title_with_count:
           one: "Tuoreimmat (%{count})"
-          other: "Tuoreimmat ({{count}})"
+          other: "Tuoreimmat (%{count})"
         help: "ketjut, joissa on viimeaikaisia viestejä"
       read:
         title: "Luetut"
         help: "lukemasi ketjut, lukemisjärjestyksessä"
       categories:
         title: "Keskustelualueet"
-        title_in: "Alue - {{categoryName}}"
+        title_in: "Alue - %{categoryName}"
         help: "kaikki ketjut alueen mukaan järjestettynä"
       unread:
         title: "Lukematta"
         title_with_count:
           one: "Lukematta (%{count})"
-          other: "Lukematta ({{count}})"
+          other: "Lukematta (%{count})"
         help: "ketjut, joita seuraat tai tarkkailet tällä hetkellä ja joissa on lukemattomia viestejä"
         lower_title_with_count:
           one: "%{count} lukematta"
-          other: "{{count}} lukematta"
+          other: "%{count} lukematta"
       new:
         lower_title_with_count:
           one: "%{count} uusi"
-          other: "{{count}} uutta"
+          other: "%{count} uutta"
         lower_title: "uusi"
         title: "Uudet"
         title_with_count:
           one: "Uudet (%{count})"
-          other: "Uudet ({{count}})"
+          other: "Uudet (%{count})"
         help: "viime päivinä aloitetut ketjut"
       posted:
         title: "Viestini"
@@ -2766,11 +2768,11 @@ fi:
         title: "Kirjanmerkit"
         help: "ketjut, jotka olet merkinnyt kirjanmerkillä"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "Tuoreimmat alueella {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "Tuoreimmat alueella %{categoryName}"
       top:
         title: "Kuumat"
         help: "Aktiivisimmat ketjut viimeisen vuoden, kuukauden ja päivän ajalta"
@@ -2915,8 +2917,8 @@ fi:
       synonyms: "Synonyymit"
       synonyms_description: "Kun näitä tunnisteita käytetään, ne korvataan pääsynonyymillä <b>%{base_tag_name}</b>."
       tag_groups_info:
-        one: 'Tunniste kuuluu ryhmään "{{tag_groups}}".'
-        other: "Tunniste kuuluu näihin ryhmiin: {{tag_groups}}"
+        one: 'Tunniste kuuluu ryhmään "%{tag_groups}".'
+        other: "Tunniste kuuluu näihin ryhmiin: %{tag_groups}"
       category_restrictions:
         one: "Sitä voi käyttää vain tällä alueella:"
         other: "Sitä voi käyttää vain näillä alueilla:"
@@ -2932,11 +2934,11 @@ fi:
       delete_tag: "Poista tunniste"
       delete_confirm:
         one: "Haluatko varmasti poistaa tunnisteen, mikä poistaa sen myös yhdeltä ketjulta, jolla tunniste on?"
-        other: "Haluatko varmasti poistaa tunnisteen, mikä poistaa sen myös {{count}} ketjulta, joilla tunniste on?"
+        other: "Haluatko varmasti poistaa tunnisteen, mikä poistaa sen myös %{count} ketjulta, joilla tunniste on?"
       delete_confirm_no_topics: "Haluatko varmasti poistaa tunnisteen?"
       delete_confirm_synonyms:
         one: "Sen synonyymi poistetaan myös."
-        other: "Sen {{count}} muuta synonyymiä poistetaan myös."
+        other: "Sen %{count} muuta synonyymiä poistetaan myös."
       rename_tag: "Uudelleennimeä tunniste"
       rename_instructions: "Valitse uusi nimi tälle tunnisteelle:"
       sort_by: "Järjestä:"
@@ -3286,10 +3288,10 @@ fi:
           redeliver: "Toimita uudelleen"
           incoming:
             one: "Yksi uusi tapahtuma."
-            other: "{{count}} uutta tapahtumaa."
+            other: "%{count} uutta tapahtumaa."
           completed_in:
             one: "Suoritettiin %{count} sekunnissa."
-            other: "Suoritettiin {{count}} sekunnissa."
+            other: "Suoritettiin %{count} sekunnissa."
           request: "Pyyntö"
           response: "Vastaus"
           redeliver_confirm: "Oletko varma, että haluat toimittaa uudelleen saman tietosisällön?"
@@ -3341,12 +3343,12 @@ fi:
           label: "Lähetä"
           title: "Lataa varmuuskopio tälle koneelle"
           uploading: "Lähettää..."
-          uploading_progress: "Lähetetään... {{progress}}"
-          success: "'{{filename}}' tallennettiin onnistuneesti. TIedostoa vielä työstetään ja voi mennä minuutti ennen kuin se näkyy luettelossa."
-          error: "Tiedoston '{{filename}}' lähetyksen aikana tapahtui virhe: {{message}}"
+          uploading_progress: "Lähetetään... %{progress}"
+          success: "'%{filename}' tallennettiin onnistuneesti. TIedostoa vielä työstetään ja voi mennä minuutti ennen kuin se näkyy luettelossa."
+          error: "Tiedoston '%{filename}' lähetyksen aikana tapahtui virhe: %{message}"
         operations:
           is_running: "Operaatiota suoritetaan parhaillaan..."
-          failed: "{{operation}} epäonnistui. Tarkista loki-tiedostot."
+          failed: "%{operation} epäonnistui. Tarkista loki-tiedostot."
           cancel:
             label: "Peruuta"
             title: "Peruuta toiminto"
@@ -3465,7 +3467,7 @@ fi:
           disabled_component_tooltip: "Komponentti ei ole käytössä"
           default_theme_tooltip: "Tämä on sivuston oletusteema"
           updates_available_tooltip: "Teemalle on päivityksiä saatavilla"
-          and_x_more: "ja {{count}} muuta."
+          and_x_more: "ja %{count} muuta."
           collapse: Kutista
           uploads: "Lataukset"
           no_uploads: "Voit ladata teemaasi liitteitä kuten fontteja ja kuvia"
@@ -3513,8 +3515,8 @@ fi:
           disabled_by: "Komponentin on ottanut käytöstä"
           required_version:
             error: "Teema poistettiin automaattisesti käytöstä, koska se ei ole yhteensopiva tämän Discourse-version kanssa."
-            minimum: "Vaatii Discourse-version {{version}}tai uudemman."
-            maximum: "Vaatii Discourse-version {{version}}tai vanhemman."
+            minimum: "Vaatii Discourse-version %{version}tai uudemman."
+            maximum: "Vaatii Discourse-version %{version}tai vanhemman."
           component_of: "Teemojen komponentti:"
           update_to_latest: "Päivitä tuoreimpaan"
           check_for_updates: "Hae päivityksiä"
@@ -3527,7 +3529,7 @@ fi:
           empty: "Ei mitään"
           commits_behind:
             one: "Teema on yhden muutoksen perässä!"
-            other: "Teema on {{count}} muutosta perässä!"
+            other: "Teema on %{count} muutosta perässä!"
           compare_commits: "(Näytä uudet muutokset)"
           repo_unreachable: "Teeman Git-tietovarastoon yhdistäminen epäonnistui. Virheviesti:"
           imported_from_archive: "Tämä teema tuotiin .zip-tiedostosta"
@@ -3929,8 +3931,8 @@ fi:
           title: "Paljasta tämän käyttäjän sähköpostiosoite"
           text: "Näytä"
       user:
-        suspend_failed: "Jotain meni vikaan tätä käyttäjää hyllyttäessä: {{error}}"
-        unsuspend_failed: "Jotain meni vikaan hyllytystä poistettaessa: {{error}}"
+        suspend_failed: "Jotain meni vikaan tätä käyttäjää hyllyttäessä: %{error}"
+        unsuspend_failed: "Jotain meni vikaan hyllytystä poistettaessa: %{error}"
         suspend_duration: "Kuinka pitkäksi aikaa käyttäjä hyllytetään?"
         suspend_reason_label: "Miksi hyllytät käyttäjän? Tämä teksti <b>on näkyvillä julkisesti</b> käyttäjän profiilisivulla ja näytetään käyttäjälle kun hän kirjautuu sisään. Pidä siis viesti lyhyenä."
         suspend_reason_hidden_label: "Miksi hyllytät? Tämä teksti näytetään käyttäjälle, kun hän yrittää kirjautua sisään. Pidä lyhyenä."
@@ -4284,6 +4286,7 @@ fi:
         title: "Emoji"
         help: "Lisää uusi emoji joka on kaikkien käytettävissä. (Voit raahata useita tiedostoja kerralla)"
         add: "Lisää uusi emoji"
+        uploading: "Lähettää..."
         name: "Nimi"
         group: "Ryhmä"
         image: "Kuva"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 19e6cd5669..fbb00145bc 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -23,8 +23,8 @@ fr:
             mb: Mo
             tb: To
       short:
-        thousands: "{{number}} k"
-        millions: "{{number}} M"
+        thousands: "%{number} k"
+        millions: "%{number} M"
     dates:
       time: "HH:mm"
       time_with_zone: "HH:mm (z)"
@@ -227,11 +227,11 @@ fr:
     weekly: "hebdomadaires"
     every_month: "chaque mois"
     every_six_months: "tous les six mois"
-    max_of_count: "maximum sur {{count}}"
+    max_of_count: "maximum sur %{count}"
     alternation: "ou"
     character_count:
-      one: "{{count}} caractère"
-      other: "{{count}} caractères"
+      one: "%{count} caractère"
+      other: "%{count} caractères"
     related_messages:
       title: "Messages connexes"
       see_all: 'Voir <a href="%{path}">tous les messages</a> de @%{username}…'
@@ -255,7 +255,7 @@ fr:
       user_count: "Utilisateurs"
       active_user_count: "Utilisateurs actifs"
       contact: "Nous contacter"
-      contact_info: "En cas de problème critique ou urgent sur ce site, veuillez nous contacter : %{contact_info}"
+      contact_info: "En cas de problèmes critiques ou sujets urgents concernant ce site, veuillez nous contacter à : %{contact_info}"
     bookmarked:
       title: "Mettre un signet"
       clear_bookmarks: "Retirer les signets"
@@ -306,14 +306,14 @@ fr:
         yes_value: "Oui, abandonner"
         no_value: "Non, garder"
     topic_count_latest:
-      one: "Voir {{count}} sujet récent ou mis à jour."
-      other: "Voir {{count}} sujets récents ou mis à jour"
+      one: "Voir %{count} sujet récent ou mis à jour."
+      other: "Voir %{count} sujets récents ou mis à jour"
     topic_count_unread:
-      one: "Voir {{count}} sujet non lu"
-      other: "Voir {{count}} sujets non lus"
+      one: "Voir %{count} sujet non lu"
+      other: "Voir %{count} sujets non lus"
     topic_count_new:
-      one: "Voir {{count}} nouveau sujet"
-      other: "Voir {{count}} nouveaux sujets"
+      one: "Voir %{count} nouveau sujet"
+      other: "Voir %{count} nouveaux sujets"
     preview: "prévisualiser"
     cancel: "annuler"
     save: "Sauvegarder"
@@ -321,10 +321,10 @@ fr:
     saved: "Sauvegardé !"
     upload: "Joindre un fichier"
     uploading: "Envoi en cours…"
-    uploading_filename: "Envoi en cours : {{filename}}…"
+    uploading_filename: "Envoi en cours : %{filename}…"
     clipboard: "presse-papiers"
     uploaded: "Envoyé !"
-    pasting: "Coller..."
+    pasting: "Coller…"
     enable: "Activer"
     disable: "Désactiver"
     continue: "Poursuivre"
@@ -358,7 +358,7 @@ fr:
         subtotal: "Sous-total"
         total: "Total"
         min_score_visibility: "Score minimum pour la visibilité"
-        score_to_hide: "Score pour cacher le message"
+        score_to_hide: "Score pour masquer le message"
         take_action_bonus:
           name: "intervenu"
           title: "Lorsqu'un responsable choisit d'agir, le signalement reçoit un bonus."
@@ -375,7 +375,7 @@ fr:
         optional: "Vous pouvez réserver cet élément pour empêcher d'autres de le vérifier."
         required: "Vous devez réserver des éléments avant de les vérifier."
         claimed_by_you: "Vous avez réservé cet élément et pouvez le vérifier."
-        claimed_by_other: "Cet élément ne peut être vérifié que par <b>{{username}}</b>."
+        claimed_by_other: "Cet élément ne peut être vérifié que par <b>%{username}</b>."
       claim:
         title: "réserver ce sujet"
       unclaim:
@@ -395,7 +395,7 @@ fr:
       view_pending: "voir les messages en attente"
       topic_has_pending:
         one: "Ce sujet a <b>%{count}</b> message en attente de validation"
-        other: "Ce sujet a <b>{{count}}</b> messages en attente de validation"
+        other: "Ce sujet a <b>%{count}</b> messages en attente de validation"
       title: "Vérification"
       topic: "Sujet :"
       filtered_topic: "Vous avez restreint au contenu vérifiable dans un seul sujet."
@@ -412,17 +412,17 @@ fr:
         fields: "Champs"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} signalement en total)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} signalements en total)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} signalement en total)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} signalements en total)"
         agreed:
-          one: "{{count}}% accepté"
-          other: "{{count}}% acceptés"
+          one: "%{count}% accepté"
+          other: "%{count}% acceptés"
         disagreed:
-          one: "{{count}}% rejeté"
-          other: "{{count}}% rejetés"
+          one: "%{count}% rejeté"
+          other: "%{count}% rejetés"
         ignored:
-          one: "{{count}}% ignoré"
-          other: "{{count}}% ignorés"
+          one: "%{count}% ignoré"
+          other: "%{count}% ignorés"
       topics:
         topic: "Sujet"
         reviewable_count: "Nombre"
@@ -432,10 +432,10 @@ fr:
         details: "détails"
         unique_users:
           one: "%{count} utilisateur"
-          other: "{{count}} utilisateurs"
+          other: "%{count} utilisateurs"
       replies:
         one: "%{count} réponse"
-        other: "{{count}} réponses"
+        other: "%{count} réponses"
       edit: "Modifier"
       save: "Sauvegarder"
       cancel: "Annuler"
@@ -499,22 +499,22 @@ fr:
         description: "Votre nouveau message a bien été envoyé, mais il doit être accepté par un modérateur avant d'apparaître publiquement. Merci de votre patience."
         pending_posts:
           one: "Vous avez <strong>%{count}</strong> message en attente."
-          other: "Vous avez <strong>{{count}}</strong> messages en attente."
+          other: "Vous avez <strong>%{count}</strong> messages en attente."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> a démarré <a href='{{topicUrl}}'>le sujet</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Vous</a> avez démarré <a href='{{topicUrl}}'>le sujet</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> a répondu à <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Vous</a> avez répondu à <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> a répondu à <a href='{{topicUrl}}'>ce sujet</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Vous</a> avez répondu à <a href='{{topicUrl}}'>ce sujet</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> a mentionné <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user2Url}}'>Vous</a> avez été mentionné par <a href='{{user1Url}}'>{{user}}</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Vous</a> avez mentionné <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Rédigé par <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Rédigé par <a href='{{userUrl}}'>vous</a>"
-      sent_by_user: "Envoyé par <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Envoyé par <a href='{{userUrl}}'>vous</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> a démarré <a href='%{topicUrl}'>le sujet</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Vous</a> avez démarré <a href='%{topicUrl}'>le sujet</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> a répondu à <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Vous</a> avez répondu à <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> a répondu à <a href='%{topicUrl}'>ce sujet</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Vous</a> avez répondu à <a href='%{topicUrl}'>ce sujet</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> a mentionné <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user2Url}'>Vous</a> avez été mentionné par <a href='%{user1Url}'>%{user}</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Vous</a> avez mentionné <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Rédigé par <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Rédigé par <a href='%{userUrl}'>vous</a>"
+      sent_by_user: "Envoyé par <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Envoyé par <a href='%{userUrl}'>vous</a>"
     directory:
       filter_name: "filtrer par nom d'utilisateur"
       title: "Utilisateurs"
@@ -576,7 +576,7 @@ fr:
           access: Accès
         logs:
           title: "Journaux"
-          when: "Quand"
+          when: "Date"
           action: "Action"
           acting_user: "Utilisateur agissant"
           target_user: "Utilisateur cible"
@@ -712,7 +712,7 @@ fr:
       reorder:
         title: "Réordonner les catégories"
         title_long: "Réorganiser la liste des catégories"
-        save: "Sauvegarder cette ordre"
+        save: "Sauvegarder cet ordre"
         apply_all: "Appliquer"
         position: "Position"
       posts: "Messages"
@@ -732,7 +732,7 @@ fr:
         other: "%{count} nouveaux sujets dans le dernier mois."
       n_more: "Catégories (%{count} autres) …"
     ip_lookup:
-      title: Rechercher l'adresse IP
+      title: Localisation de l'adresse IP
       hostname: Nom de l'hôte
       location: Localisation
       location_not_found: (inconnu)
@@ -746,20 +746,20 @@ fr:
       topics_entered: "sujets visités"
       post_count: "# messages"
       confirm_delete_other_accounts: "Êtes-vous sûr de vouloir supprimer ces comptes ?"
-      powered_by: "utilisant <a href='https://maxmind.com'>MaxMindDB</a>"
+      powered_by: "Informations fournies par <a href='https://maxmind.com'>MaxMindDB</a>"
       copied: "copié"
     user_fields:
       none: "(choisir une option)"
       required: 'Veuillez entrer une valeur pour « %{name} »'
     user:
-      said: "{{username}} :"
+      said: "%{username} :"
       profile: "Profil"
       mute: "Silencieux"
       edit: "Modifier les préférences"
       download_archive:
         button_text: "Tout télécharger"
         confirm: "Êtes-vous sûr de vouloir télécharger vos messages ?"
-        success: "Le téléchargement a démarré ; vous serez notifié par message lorsqu'il est terminé."
+        success: "Le téléchargement a démarré ; vous serez notifié par message lorsqu'il sera terminé."
         rate_limit_error: "Les messages peuvent être téléchargés une fois par jour, veuillez ressayer demain."
       new_private_message: "Créer un message direct"
       private_message: "Message direct"
@@ -770,7 +770,7 @@ fr:
           all: "Toutes"
           read: "Temps de lecture"
           unread: "Non lus"
-        ignore_duration_title: "Ignorer planification"
+        ignore_duration_title: "Ignorer la planification"
         ignore_duration_username: "Nom d'utilisateur"
         ignore_duration_when: "Durée :"
         ignore_duration_save: "Ignorer"
@@ -778,7 +778,7 @@ fr:
         ignore_duration_time_frame_required: "Veuillez sélectionner un intervalle de temps"
         ignore_no_users: "Vous n'avez aucun utilisateur ignoré."
         ignore_option: "Ignoré"
-        ignore_option_title: "Vous ne recevrez pas de notifications en lien avec cet utilisateur et ses messages et réponses seront cachés."
+        ignore_option_title: "Vous ne recevrez pas de notifications en lien avec cet utilisateur et ses messages et réponses seront masqués."
         add_ignored_user: "Ajouter…"
         mute_option: "Silencieux"
         mute_option_title: "Vous ne recevrez pas de notifications en lien avec cet utillisateur."
@@ -807,7 +807,7 @@ fr:
       statistics: "Statistiques"
       desktop_notifications:
         label: "Notifications actives"
-        not_supported: "Les notifications ne sont pas supportées avec ce navigateur. Désolé."
+        not_supported: "Les notifications ne sont pas supportées sur ce navigateur. Désolé."
         perm_default: "Activer les notifications"
         perm_denied_btn: "Permission refusée"
         perm_denied_expl: "Vous n'avez pas autorisé les notifications. Autorisez-les depuis les paramètres de votre navigateur."
@@ -828,12 +828,12 @@ fr:
       enable_defer: "Activer le bouton pour reporter des sujets à plus tard en les marquant comme non lus"
       change: "modifier"
       featured_topic: "Sujet vedette"
-      moderator: "{{user}} est un modérateur"
-      admin: "{{user}} est un administrateur"
+      moderator: "%{user} est un modérateur"
+      admin: "%{user} est un administrateur"
       moderator_tooltip: "Cet utilisateur est un modérateur"
       admin_tooltip: "Cet utilisateur est un administrateur"
       silenced_tooltip: "Cet utilisateur est mis sous silence"
-      suspended_notice: "L'utilisateur est suspendu jusqu'au {{date}}."
+      suspended_notice: "L'utilisateur est suspendu jusqu'au %{date}."
       suspended_permanently: "Cet utilisateur est suspendu."
       suspended_reason: "Raison :"
       github_profile: "GitHub"
@@ -841,22 +841,20 @@ fr:
       mailing_list_mode:
         label: "Liste de diffusion"
         enabled: "Activer la liste de diffusion"
-        instructions: |2
-
-          Ce réglage outrepasse le résumé d'activités.<br />
-
+        instructions: |
+          Ce paramètre remplace le résumé d'activités.<br />
           Les sujets et catégories passés en silencieux ne sont pas inclus dans ces courriels.
         individual: "Envoyer un courriel pour chaque nouveau message"
         individual_no_echo: "Envoyer un courriel pour chaque nouveau message sauf les miens"
-        many_per_day: "M'envoyer un courriel pour chaque nouveau message (environ {{dailyEmailEstimate}} par jour)"
+        many_per_day: "M'envoyer un courriel pour chaque nouveau message (environ %{dailyEmailEstimate} par jour)"
         few_per_day: "M'envoyer un courriel pour chaque nouveau message (environ 2 par jour)"
         warning: "Mode liste de diffusion activé. Les paramètres de notification par courriel sont remplacés."
       tag_settings: "Étiquettes"
-      watched_tags: "Surveillés"
+      watched_tags: "Surveillées"
       watched_tags_instructions: "Vous surveillerez automatiquement tous les sujets avec ces étiquettes. Vous serez notifié de tous les nouveaux messages et sujets, et le nombre de nouveaux messages apparaîtra à coté du sujet."
-      tracked_tags: "Suivis"
+      tracked_tags: "Suivies"
       tracked_tags_instructions: "Vous allez suivre automatiquement tous les sujets avec ces étiquettes. Le nombre de nouveaux messages apparaîtra à côté du sujet."
-      muted_tags: "Silencieux"
+      muted_tags: "Silencieuses"
       muted_tags_instructions: "Vous ne serez notifié de rien concernant les nouveaux sujets avec ces étiquettes, et ils n'apparaîtront pas dans la liste des sujets récents."
       watched_categories: "Surveillées"
       watched_categories_instructions: "Vous surveillerez automatiquement tous les sujets de ces catégories. Vous serez notifié de tous les nouveaux messages et sujets, et le nombre de nouveaux messages apparaîtra à coté du sujet."
@@ -878,9 +876,9 @@ fr:
       admin_delete: "Supprimer"
       users: "Utilisateurs"
       muted_users: "Silencieux"
-      muted_users_instructions: "Cacher toutes les notifications de ces utilisateurs."
+      muted_users_instructions: "Ignorer toutes les notifications et messages privés provenant de ces utilisateurs."
       ignored_users: "Ignorés"
-      ignored_users_instructions: "Cacher toutes les publications et les notifications de ces utilisateurs."
+      ignored_users_instructions: "Ignorer tous les billets, notifications et messages privés provenant de ces utilisateurs."
       tracked_topics_link: "Afficher"
       automatically_unpin_topics: "Désépingler automatiquement les sujets quand j'arrive à la fin."
       apps: "Applications"
@@ -936,12 +934,12 @@ fr:
         disable: "Désactiver"
         enable: "Activer"
         enable_long: "Activer les codes de secours"
-        manage: "Gérer les codes de sauvegarde. Il vous reste <strong>{{count}}</strong> code(s) de sauvegarde."
+        manage: "Gérer les codes de sauvegarde. Il vous reste <strong>%{count}</strong> code(s) de sauvegarde."
         copy_to_clipboard: "Copier dans le presse-papiers"
         copy_to_clipboard_error: "Erreur en copiant les données dans le presse-papiers"
         copied_to_clipboard: "Copié dans le presse-papiers"
         download_backup_codes: "Télécharger les codes de secours"
-        remaining_codes: "Vous avez <strong>{{count}}</strong> codes de secours restants."
+        remaining_codes: "Vous avez <strong>%{count}</strong> codes de secours restants."
         use: "Utiliser un code de secours"
         enable_prerequisites: "Vous devez activer un second facteur principal avant de générer des codes de sauvegarde."
         codes:
@@ -956,7 +954,7 @@ fr:
         label: "Code"
         rate_limit: "Veuillez patienter avant d'essayer un autre code d'identification."
         enable_description: |
-          Scannez ce code QR en utilisant une application supportée (<a href="https://www.google.com/search?q=authenticator+apps+for+android" target="_blank">Android</a>– <a href="https://www.google.com/search?q=authenticator+apps+for+ios" target="_blank">iOS</a>) et entrez votre code d'authentification.
+          Scannez ce code QR en utilisant une application compatible (<a href="https://www.google.com/search?q=authenticator+apps+for+android" target="_blank">Android</a>– <a href="https://www.google.com/search?q=authenticator+apps+for+ios" target="_blank">iOS</a>) et entrez votre code d'authentification.
         disable_description: "Veuillez saisir le code d'authentification de votre app"
         show_key_description: "Saisir manuellement"
         short_description: |
@@ -1006,10 +1004,10 @@ fr:
         success_staff: "Nous avons envoyé un courriel à votre adresse actuelle. Merci de suivre les instructions."
       change_avatar:
         title: "Modifier votre image de profil"
-        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, associé à"
-        gravatar_title: "Modifier votre avatar sur le site de {{gravatarName}}"
-        gravatar_failed: "Nous n'avons pas trouvé un {{gravatarName}} associé à cette adresse courriel."
-        refresh_gravatar_title: "Actualiser votre {{gravatarName}}"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, associé à"
+        gravatar_title: "Modifier votre avatar sur le site de %{gravatarName}"
+        gravatar_failed: "Nous n'avons pas trouvé un %{gravatarName} associé à cette adresse courriel."
+        refresh_gravatar_title: "Actualiser votre %{gravatarName}"
         letter_based: "Image de profil attribuée par le système"
         uploaded_avatar: "Avatar personnalisé"
         uploaded_avatar_empty: "Ajouter un avatar personnalisé"
@@ -1020,7 +1018,7 @@ fr:
         instructions: "Les arrière-plans du profil seront centrés avec une largeur par défaut de 1110 pixels."
       change_card_background:
         title: "Arrière-plan de la carte de l'utilisateur"
-        instructions: "Les images d'arrière-plan seront centrées avec une largeur par défaut de 590 pixels."
+        instructions: "Les arrière-plans de la carte utilisateur seront centrés avec une largeur par défaut de 590 pixels."
       change_featured_topic:
         title: "Sujet vedette"
         instructions: "Un lien vers ce sujet sera ajouté sur votre carte d'utilisateur et votre profil."
@@ -1034,11 +1032,11 @@ fr:
         ok: "Nous vous enverrons un courriel de confirmation"
         required: "Veuillez entrer une adresse courriel"
         invalid: "Veuillez entrer une adresse courriel valide"
-        authenticated: "Votre adresse courriel a été authentifiée par {{provider}}"
+        authenticated: "Votre adresse courriel a été authentifiée par %{provider}"
         frequency_immediately: "Nous vous enverrons un courriel immédiatement si vous n'avez pas lu le contenu en question."
         frequency:
           one: "Nous vous enverrons des courriels seulement si nous ne vous avons pas vu sur le site dans la dernière minute."
-          other: "Nous vous enverrons des courriels seulement si nous ne vous avons pas vu sur le site dans les dernières {{count}} minutes."
+          other: "Nous vous enverrons des courriels seulement si nous ne vous avons pas vu sur le site dans les %{count} dernières minutes."
       associated_accounts:
         title: "Comptes associés"
         connect: "Connecter"
@@ -1059,9 +1057,9 @@ fr:
       username:
         title: "Nom d'utilisateur"
         instructions: "unique, sans espaces, court"
-        short_instructions: "Les gens peuvent vous mentionner avec @{{username}}"
+        short_instructions: "Les gens peuvent vous mentionner avec @%{username}"
         available: "Votre nom d'utilisateur est disponible"
-        not_available: "Indisponible. Essayez {{suggestion}} ?"
+        not_available: "Indisponible. Essayez %{suggestion} ?"
         not_available_no_suggestion: "Non disponible"
         too_short: "Votre nom d'utilisateur est trop court"
         too_long: "Votre nom d'utilisateur est trop long"
@@ -1085,11 +1083,11 @@ fr:
         log_out_all: "Se déconnecter partout"
         active: "actif"
         not_you: "Ce n'est pas vous ?"
-        show_all: "Tout afficher ({{count}})"
+        show_all: "Tout afficher (%{count})"
         show_few: "Afficher moins"
         was_this_you: "Était-ce vous ?"
         was_this_you_description: "Si ce n'était pas vous, nous vous conseillons de modifier votre mot de passe et de vous déconnecter partout."
-        browser_and_device: "{{browser}} sur {{device}}"
+        browser_and_device: "%{browser} sur %{device}"
         secure_account: "Sécuriser mon compte"
         latest_post: "Votre dernier message..."
       last_posted: "Dernier message"
@@ -1138,7 +1136,7 @@ fr:
         never: "jamais"
       email_messages_level: "M'envoyer un courriel quand quelqu'un m'envoie un message direct."
       include_tl0_in_digests: "Inclure les contributions des nouveaux utilisateurs dans les résumés par courriel"
-      email_in_reply_to: "Inclure un extrait du message auquel il a été répondu dans les courriels"
+      email_in_reply_to: "En plus du message notifié par courriel, inclure un extrait du message auquel il répond"
       other_settings: "Autre"
       categories_settings: "Catégories"
       new_topic_duration:
@@ -1166,23 +1164,23 @@ fr:
         title: "Invitations"
         user: "Utilisateurs"
         sent: "Derniers envoyés"
-        none: "Il n'y a pas d'invitations en attente à afficher."
+        none: "Aucune invitation à afficher."
         truncated:
           one: "Afficher la première invitation."
-          other: "Afficher les {{count}} premières invitations."
+          other: "Afficher les %{count} premières invitations."
         redeemed: "Invitations acceptées"
         redeemed_tab: "Acceptées"
-        redeemed_tab_with_count: "Invitations acceptées ({{count}})"
+        redeemed_tab_with_count: "Invitations acceptées (%{count})"
         redeemed_at: "Acceptée le"
         pending: "Invitations en attente"
         pending_tab: "En attente"
-        pending_tab_with_count: "En attente ({{count}})"
+        pending_tab_with_count: "En attente (%{count})"
         topics_entered: "Sujets consultés"
         posts_read_count: "Messages lus"
         expired: "Cette invitation a expiré."
         rescind: "Supprimer"
         rescinded: "Invitation annulée"
-        rescind_all: "Supprimer toutes les invitations expirées"
+        rescind_all: "Supprimer les invitations expirées"
         rescinded_all: "Invitations expirées supprimées !"
         rescind_all_confirm: "Êtes-vous sûr de vouloir supprimer toutes les invitations expirées ?"
         reinvite: "Renvoyer l'invitation"
@@ -1193,13 +1191,30 @@ fr:
         time_read: "Temps de lecture"
         days_visited: "Ratio de présence"
         account_age_days: "Âge du compte en jours"
+        source: "Invité via"
+        links_tab: "Liens"
+        links_tab_with_count: "Liens (%{count})"
+        link_url: "Lien"
+        link_created_at: "Créé"
+        link_redemption_stats: "Utilisations"
+        link_groups: Groupes
+        link_expires_at: Expire
         create: "Envoyer une invitation"
+        copy_link: "Copier le lien"
         generate_link: "Copier le lien d'invitation"
         link_generated: "Lien d'invitation généré avec succés !"
         valid_for: "Le lien d'invitation est seulement valide pour cette adresse courriel : %{email}"
+        single_user: "Un utilisateur"
+        multiple_user: "Plusieurs utilisateurs"
+        invite_link:
+          title: "Lien d'invitation"
+          success: "Lien d'invitation généré avec succés !"
+          error: "Une erreur est survenue lors de la génération du lien d'invitation"
+          max_redemptions_allowed_label: "Combien de personnes peuvent s'inscrire en utilisant ce lien ?"
+          expires_at: "Quand ce lien va-t-il expirer ?"
         bulk_invite:
           none: "Vous n'avez encore invité personne. Envoyez des invitations individuelles ou à plusieurs personnes en même temps en <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>envoyant un fichier CSV.</a>"
-          text: "Invitation massive depuis un fichier"
+          text: "Invitation en masse"
           success: "Le fichier a été correctement importé. Vous serez notifié par message direct lorsque le traitement sera terminé."
           error: "Désolé, le fichier doit être au format CSV."
           confirmation_message: "Vous êtes sur le point d'envoyer un courriel à toutes les adresses contenues dans le fichier envoyé."
@@ -1260,7 +1275,7 @@ fr:
         topics: "Sujets"
         replies: "Réponses"
       ip_address:
-        title: "Dernières adresses IP"
+        title: "Dernière adresse IP"
       registration_ip_address:
         title: "Adresse IP d'enregistrement"
       avatar:
@@ -1284,14 +1299,14 @@ fr:
       prev_page: "lors du chargement de"
       reasons:
         network: "Erreur réseau"
-        server: "Erreur serveur"
+        server: "Erreur du serveur"
         forbidden: "Accès refusé"
         unknown: "Erreur"
         not_found: "Page introuvable"
       desc:
         network: "Veuillez vérifier votre connexion."
         network_fixed: "On dirait que c'est revenu."
-        server: "Code d'erreur : {{status}}"
+        server: "Code d'erreur : %{status}"
         forbidden: "Vous n'êtes pas autorisé à voir cela."
         not_found: "Oups, l'application a essayé de charger une URL qui n'existe pas."
         unknown: "Une erreur est survenue."
@@ -1311,6 +1326,12 @@ fr:
       enabled: "Le site est en mode lecture seule. Vous pouvez continer à naviguer, mais les réponses, J'aime et autre interactions sont désactivées pour l'instant."
       login_disabled: "La connexion est désactivée quand le site est en lecture seule."
       logout_disabled: "La déconnexion est désactivée quand le site est en lecture seule."
+    too_few_topics_and_posts_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Commençons la discussion !</a> Il y a {currentTopics, plural, one {<strong>#</strong> sujet} other {<strong>#</strong> sujets}} et {currentPosts, plural, one {<strong>#</strong> message} other {<strong>#</strong> messages}}. Il en faudrait davantage pour les visiteurs – nous recommandons au moins {requiredTopics, plural, one {<strong>#</strong> sujet} other {<strong>#</strong> sujets}} et {requiredPosts, plural, one {<strong>#</strong> message} other {<strong>#</strong> messages}}. Ce message n'est visible que par les responsables.
+    too_few_topics_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Commençons la discussion !</a> Il y a  {currentTopics, plural, one {<strong>#</strong> sujet} other {<strong>#</strong> sujets}}. Il en faudrait davantage pour les visiteurs – nous recommandons au moins {requiredTopics, plural, one {<strong>#</strong> sujet} other {<strong>#</strong> sujets}}. Ce message n'est visible que par les responsables.
+    too_few_posts_notice_MF: >-
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Commençons la discussion !</a> Il y a  {currentPosts, plural, one {<strong>#</strong> message} other {<strong>#</strong> messages}}. Il en faudrait davantage pour les visiteurs – nous recommandons au moins {requiredPosts, plural, one {<strong>#</strong> message} other {<strong>#</strong> messages}}. Ce message n'est visible que par les responsables.
     logs_error_rate_notice:
       reached_hour_MF: "{relativeAge} – {rate, plural, one {# erreur/heure} other {# erreurs/heure}} arrive à la limite paramétrée de {limit, plural, one {# erreur/heure} other {# erreurs/heure}}."
       reached_minute_MF: "{relativeAge} – {rate, plural, one {# erreur/minute} other {# erreurs/minute}} arrive à la limite paramétrée de {limit, plural, one {# erreur/minute} other {# erreurs/minute}}."
@@ -1348,22 +1369,22 @@ fr:
       value_prop: "Quand vous créez un compte, nous retenons ce que vous avez lu pour qu'à votre retour vous puissiez continuer là on vous vous êtes arrêté. Vous recevez aussi des notifications, ici et par courriel, dès que quelqu'un vous répond. Et vous pouvez aimer les messages pour partager vos coups de cœurs. :heartpulse:"
     summary:
       enabled_description: "Vous visualisez un résumé de ce sujet : les messages les plus intéressants choisis par la communauté."
-      description: "Il y a <b>{{replyCount}}</b> réponses."
-      description_time: "Il y a <b>{{replyCount}}</b> réponses avec un temps de lecture estimé à <b>{{readingTime}} minutes</b>."
+      description: "Il y a <b>%{replyCount}</b> réponses."
+      description_time: "Il y a <b>%{replyCount}</b> réponses avec un temps de lecture estimé à <b>%{readingTime} minutes</b>."
       enable: "Résumer ce sujet"
       disable: "Afficher tous les messages"
     deleted_filter:
-      enabled_description: "Ce sujet contient des messages supprimés, qui ont été cachés."
+      enabled_description: "Ce sujet contient des messages supprimés, qui ont été masqués."
       disabled_description: "Les messages supprimés du sujet sont visibles."
-      enable: "Cacher les messages supprimés"
+      enable: "Masquer les messages supprimés"
       disable: "Afficher les messages supprimés"
     private_message_info:
       title: "Message direct"
       invite: "Inviter d'autres utilisateurs…"
       edit: "Ajouter ou supprimer…"
       leave_message: "Êtes-vous sûr de vouloir quitter cette conversation ?"
-      remove_allowed_user: "Êtes-vous sûr de vouloir supprimer {{name}} de ce message direct ?"
-      remove_allowed_group: "Êtes-vous sûr de vouloir supprimer {{name}} de ce message direct ?"
+      remove_allowed_user: "Êtes-vous sûr de vouloir supprimer %{name} de ce message direct ?"
+      remove_allowed_group: "Êtes-vous sûr de vouloir supprimer %{name} de ce message direct ?"
     email: "Courriel"
     username: "Nom d'utilisateur"
     last_seen: "Vu"
@@ -1372,7 +1393,7 @@ fr:
     trust_level: "Niveau de confiance"
     search_hint: "nom d'utilisateur, courriel ou adresse IP"
     create_account:
-      disclaimer: "En vous s'inscrivant, vous acceptez la <a href='{{privacy_link}}' target='blank'>politique de confidentialité</a> et les <a href='{{tos_link}}' target='blank'>conditions générales d'utilisation</a>."
+      disclaimer: "En vous inscrivant, vous acceptez la <a href='%{privacy_link}' target='blank'>politique de confidentialité</a> et les <a href='%{tos_link}' target='blank'>conditions générales d'utilisation</a>."
       title: "Créer un nouveau compte"
       failed: "Un problème est survenu. Peut-être que cette adresse courriel est déjà enregistrée. Essayez le lien d'oubli du mot de passe."
     forgot_password:
@@ -1396,7 +1417,7 @@ fr:
       complete_username: "Si un compte correspond au nom d'utilisateur <b>%{username}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
       complete_email: "Si un compte correspond à l'adresse courriel <b>%{email}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
       complete_username_found: "Nous avons trouvé un compte correspondant au nom d'utilisateur <b>%{username}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
-      complete_email_found: "Nous avons trouvé un compte correspond au courriel <b>%{email}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
+      complete_email_found: "Nous avons trouvé un compte correspondant au courriel <b>%{email}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
       complete_username_not_found: "Aucun compte ne correspond au nom d'utilisateur <b>%{username}</b>"
       complete_email_not_found: "Aucun compte ne correspond à <b>%{email}</b>"
       confirm_title: "Continuer vers %{site_name}"
@@ -1432,7 +1453,7 @@ fr:
       awaiting_activation: "Votre compte est en attente d'activation, utilisez le lien mot de passe oublié pour envoyer un autre courriel d'activation."
       awaiting_approval: "Votre compte n'a pas encore été approuvé par un modérateur. Vous recevrez une confirmation par courriel lors de l'activation."
       requires_invite: "Désolé, l'accès à ce forum est sur invitation seulement."
-      not_activated: "Vous ne pouvez pas vous encore vous connecter. Nous avons envoyé un courriel d'activation à <b>{{sentTo}}</b>. Veuillez suivre les instructions afin d'activer votre compte."
+      not_activated: "Vous ne pouvez pas vous encore vous connecter. Nous avons envoyé un courriel d'activation à <b>%{sentTo}</b>. Veuillez suivre les instructions afin d'activer votre compte."
       not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter depuis cette adresse IP."
       admin_not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter comme administrateur depuis cette adresse IP."
       resend_activation_email: "Cliquez ici pour envoyer à nouveau le courriel d'activation."
@@ -1441,7 +1462,7 @@ fr:
       change_email: "Changer l'adresse courriel"
       provide_new_email: "Donnez une nouvelle adresse et nous allons renvoyer votre courriel de confirmation."
       submit_new_email: "Mettre à jour l'adresse courriel"
-      sent_activation_email_again: "Nous venons d'envoyer un nouveau courriel d'activation à <b>{{currentEmail}}</b>. Il peut prendre quelques minutes à arriver ; n'oubliez pas de vérifier votre répertoire spam."
+      sent_activation_email_again: "Nous venons d'envoyer un nouveau courriel d'activation à <b>%{currentEmail}</b>. Il peut prendre quelques minutes à arriver ; n'oubliez pas de vérifier votre répertoire spam."
       sent_activation_email_again_generic: "Nous avons envoyé un autre courriel d'activation. Il se peut que cela prenne quelques minutes pour arriver ; vérifier aussi votre spam."
       to_continue: "Veuillez vous connecter"
       preferences: "Vous devez être connecté pour modifier vos préférences utilisateur."
@@ -1505,20 +1526,23 @@ fr:
     conditional_loading_section:
       loading: Chargement…
     category_row:
-      topic_count: "{{count}} sujets dans cette catégorie"
+      topic_count: "%{count} sujets dans cette catégorie"
     select_kit:
       default_header_text: Sélectionner…
       no_content: Aucune correspondance trouvée
       filter_placeholder: Rechercher...
       filter_placeholder_with_any: Rechercher ou créer…
-      create: "Créer : « {{content}} »"
+      create: "Créer : « %{content} »"
       max_content_reached:
-        one: "Vous ne pouvez sélectionner que {{count}} élément."
-        other: "Vous ne pouvez sélectionner que {{count}} éléments."
+        one: "Vous ne pouvez sélectionner que %{count} élément."
+        other: "Vous ne pouvez sélectionner que %{count} éléments."
       min_content_not_reached:
-        one: "Sélectionner au moins {{count}} élément."
-        other: "Sélectionner au moins {{count}} éléments."
-      invalid_selection_length: "La sélection doit faire au minimum {{count}} caractères ."
+        one: "Sélectionner au moins %{count} élément."
+        other: "Sélectionner au moins %{count} éléments."
+      invalid_selection_length: "La sélection doit faire au minimum %{count} caractères ."
+      components:
+        categories_admin_dropdown:
+          title: "Menu déroulant d'administration des catégories"
     date_time_picker:
       from: De
       to: À
@@ -1545,8 +1569,8 @@ fr:
       default: Emojis personnalisés
     shared_drafts:
       title: "Brouillons partagés"
-      notice: "Ce sujet n'est visible que pour ceux qui peuvent voir la catégorie <b>{{category}}</b>."
-      destination_category: "Catégorie déstinataire"
+      notice: "Ce sujet n'est visible que pour ceux qui peuvent voir la catégorie <b>%{category}</b>."
+      destination_category: "Catégorie de destination"
       publish: "Publier le brouillon partagé"
       confirm_publish: "Êtes-vous sûr de vouloir publier ce brouillon ?"
       publishing: "Sujet en cours de publication..."
@@ -1565,24 +1589,24 @@ fr:
       similar_topics: "Votre sujet est similaire à…"
       drafts_offline: "brouillons hors ligne"
       edit_conflict: "conflit de modification"
-      group_mentioned_limit: "<b>Attention !</b> Vous avez mentionné <a href='{{group_link}}'>{{group}}</a>, cependant ce groupe a plus de membres que le nombre de mentions limite de {{max}} utilisateurs configuré par l'administrateur. Personne ne sera notifié."
+      group_mentioned_limit: "<b>Attention !</b> Vous avez mentionné <a href='%{group_link}'>%{group}</a>, cependant ce groupe a plus de membres que le nombre de mentions limite de %{max} utilisateurs configuré par l'administrateur. Personne ne sera notifié."
       group_mentioned:
-        one: "En mentionnant {{group}}, vous êtes sur le point de notifier <a href='{{group_link}}'>%{count} personne</a> – êtes-vous sûr ?"
-        other: "En mentionnant {{group}}, vous êtes sur le point de notifier <a href='{{group_link}}'>{{count}} personnes</a> – êtes-vous sûr ?"
+        one: "En mentionnant %{group}, vous êtes sur le point de notifier <a href='%{group_link}'>%{count} personne</a> – êtes-vous sûr ?"
+        other: "En mentionnant %{group}, vous êtes sur le point de notifier <a href='%{group_link}'>%{count} personnes</a> – êtes-vous sûr ?"
       cannot_see_mention:
-        category: "Vous avez mentionné {{username}} mais il ne sera pas notifié car il n'a pas accès à cette catégorie. Vous devez ajouter cet utilisateur à un groupe ayant accès à cette catégorie."
-        private: "Vous avez mentionné {{username}} mais il ne sera pas notifié car il ne peut pas voir ce message direct. Vous devez inviter cet utilisateur à la discussion."
-      duplicate_link: "Il semblerait que votre lien vers <b>{{domain}}</b> a déjà été publié dans le sujet par <b>@{{username}}</b> dans <a href='{{post_url}}'>une réponse de {{ago}}</a> – êtes vous sûr de vouloir le publier à nouveau ?"
-      reference_topic_title: "RE : {{title}}"
+        category: "Vous avez mentionné %{username} mais il ne sera pas notifié car il n'a pas accès à cette catégorie. Vous devez ajouter cet utilisateur à un groupe ayant accès à cette catégorie."
+        private: "Vous avez mentionné %{username} mais il ne sera pas notifié car il ne peut pas voir ce message direct. Vous devez inviter cet utilisateur à la discussion."
+      duplicate_link: "Il semblerait que votre lien vers <b>%{domain}</b> a déjà été publié dans le sujet par <b>@%{username}</b> dans <a href='%{post_url}'>une réponse de %{ago}</a> – êtes vous sûr de vouloir le publier à nouveau ?"
+      reference_topic_title: "RE : %{title}"
       error:
         title_missing: "Le titre est obligatoire."
-        title_too_short: "Le titre doit avoir au moins {{min}} caractères"
-        title_too_long: "Le titre ne doit pas dépasser les {{max}} caractères"
+        title_too_short: "Le titre doit avoir au moins %{min} caractères"
+        title_too_long: "Le titre ne doit pas dépasser les %{max} caractères"
         post_missing: "Le message ne peut être vide"
-        post_length: "Le message doit avoir au moins {{min}} caractères"
-        try_like: "Avez-vous essayé le bouton {{heart}} ?"
+        post_length: "Le message doit avoir au moins %{min} caractères"
+        try_like: "Avez-vous essayé le bouton %{heart} ?"
         category_missing: "Vous devez choisir une catégorie"
-        tags_missing: "Vous devez choisir au moins {{count}} étiquettes"
+        tags_missing: "Vous devez choisir au moins %{count} étiquettes"
         topic_template_not_modified: "Veuillez ajouter des détails à votre sujet en modifiant le modèle de sujet."
       save_edit: "Sauvegarder la modification"
       overwrite_edit: "Écraser la modification"
@@ -1611,7 +1635,7 @@ fr:
       saved_draft: "Brouillon de message en cours. Appuyer pour reprendre."
       uploading: "Envoi en cours…"
       show_preview: "afficher la prévisualisation &raquo;"
-      hide_preview: "&laquo; cacher la prévisualisation"
+      hide_preview: "&laquo; masquer la prévisualisation"
       quote_post_title: "Citer le message en entier"
       bold_label: "G"
       bold_title: "Gras"
@@ -1623,7 +1647,7 @@ fr:
       link_description: "saisir ici la description du lien"
       link_dialog_title: "Insérer le lien"
       link_optional_text: "titre optionnel"
-      link_url_placeholder: "Collez une URL ou tapez pour chercher des sujets"
+      link_url_placeholder: "Collez une URL ou tapez pour rechercher des sujets"
       quote_title: "Citation"
       quote_text: "Citation"
       code_title: "Texte préformaté"
@@ -1680,10 +1704,10 @@ fr:
       tooltip:
         regular:
           one: "%{count} notification non vue"
-          other: "{{count}} notifications non vues"
+          other: "%{count} notifications non vues"
         message:
           one: "%{count} message non lu"
-          other: "{{count}} messages non lus"
+          other: "%{count} messages non lus"
         high_priority:
           one: "%{count} notification prioritaire non lue"
           other: "%{count} notifications prioritaires non lues"
@@ -1692,48 +1716,48 @@ fr:
       empty: "Aucune notification trouvée."
       post_approved: "Votre message a été approuvé"
       reviewable_items: "éléments en attente de vérification"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} et %{count} autre</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} et {{count}} autres</span> {{description}}"
+        one: "<span>%{username}, %{username2} et %{count} autre</span> %{description}"
+        other: "<span>%{username}, %{username2} et %{count} autres</span> %{description}"
       liked_consolidated_description:
-        one: "a aimé de vos messages"
-        other: "a aimé {{count}} de vos messages"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> a accepté votre invitation"
-      moved_post: "<span>{{username}}</span> a deplacé {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Vous avez gagné « {{description}} »"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Nouveau sujet</span> {{description}}"
-      membership_request_accepted: "Adhésion acceptée dans « {{group_name}} »"
-      membership_request_consolidated: "{{count}} demandes d'adhésion ouvertes pour « {{group_name}} »"
+        one: "a aimé %{count} de vos messages"
+        other: "a aimé %{count} de vos messages"
+      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}"
+      invitee_accepted: "<span>%{username}</span> a accepté votre invitation"
+      moved_post: "<span>%{username}</span> a deplacé %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Vous avez gagné « %{description} »"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Nouveau sujet</span> %{description}"
+      membership_request_accepted: "Adhésion acceptée dans « %{group_name} »"
+      membership_request_consolidated: "%{count} demandes d'adhésion ouvertes pour « %{group_name} »"
       group_message_summary:
-        one: "{{count}} message dans la boîte de réception de {{group_name}}"
-        other: "{{count}} messages dans la boîte de réception de {{group_name}}"
+        one: "%{count} message dans la boîte de réception de %{group_name}"
+        other: "%{count} messages dans la boîte de réception de %{group_name}"
       popup:
-        mentioned: '{{username}} vous a mentionné dans « {{topic}} » - {{site_title}}'
-        group_mentioned: '{{username}} vous a mentionné dans « {{topic}} » - {{site_title}}'
-        quoted: '{{username}} vous a cité dans « {{topic}} » - {{site_title}}'
-        replied: '{{username}} vous a répondu dans « {{topic}} » - {{site_title}}'
-        posted: '{{username}} a posté dans « {{topic}} » - {{site_title}}'
-        private_message: '{{username}} vous a envoyé un message direct dans « {{topic}} » - {{site_title}}'
-        linked: '{{username}} a créé un lien vers votre message posté dans « {{topic}} » - {{site_title}}'
-        watching_first_post: '{{username}} a crée un nouveau sujet « {{topic}} » - {{site_title}}'
+        mentioned: '%{username} vous a mentionné dans « %{topic} » - %{site_title}'
+        group_mentioned: '%{username} vous a mentionné dans « %{topic} » - %{site_title}'
+        quoted: '%{username} vous a cité dans « %{topic} » - %{site_title}'
+        replied: '%{username} vous a répondu dans « %{topic} » - %{site_title}'
+        posted: '%{username} a posté dans « %{topic} » - %{site_title}'
+        private_message: '%{username} vous a envoyé un message direct dans « %{topic} » - %{site_title}'
+        linked: '%{username} a créé un lien vers votre message posté dans « %{topic} » - %{site_title}'
+        watching_first_post: '%{username} a crée un nouveau sujet « %{topic} » - %{site_title}'
         confirm_title: "Notifications activées - %{site_title}"
         confirm_body: "Les notifications ont été activées."
-        custom: "Notification de {{username}} sur %{site_title}"
+        custom: "Notification de %{username} sur %{site_title}"
       titles:
         mentioned: "mentionné"
         replied: "nouvelle réponse"
@@ -1763,9 +1787,9 @@ fr:
       from_my_computer: "Depuis mon appareil"
       from_the_web: "Depuis le web"
       remote_tip: "lien vers l'image"
-      remote_tip_with_attachments: "lien vers l'image ou le fichier {{authorized_extensions}}"
+      remote_tip_with_attachments: "lien vers l'image ou le fichier %{authorized_extensions}"
       local_tip: "sélectionnez des images depuis votre appareil"
-      local_tip_with_attachments: "sélectionnez des images ou des fichiers depuis votre appareil {{authorized_extensions}}"
+      local_tip_with_attachments: "sélectionnez des images ou des fichiers depuis votre appareil %{authorized_extensions}"
       hint: "(vous pouvez également faire un glisser-déposer dans l'éditeur pour les envoyer)"
       hint_for_supported_browsers: "vous pouvez aussi glisser-déposer ou coller des images dans l'éditeur"
       uploading: "En cours d'envoi"
@@ -1782,26 +1806,26 @@ fr:
       clear_all: "Tout désélectionner"
       too_short: "Votre terme de recherche est trop court."
       result_count:
-        one: "<span>%{count} résultat pour</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} résultats pour</span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} résultat pour</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} résultats pour</span><span class='term'>%{term}</span>"
       title: "rechercher des sujets, messages, utilisateurs ou catégories"
       full_page_title: "rechercher des sujets ou messages"
       no_results: "Aucun résultat."
       no_more_results: "Aucun résultat supplémentaire."
       searching: "Recherche en cours…"
-      post_format: "#{{post_number}} par {{username}}"
-      results_page: "Résultats de recherche pour « {{term}} »"
-      more_results: "Il y a d'autres résultats. Merci de préciser vos critères de recherche."
+      post_format: "#%{post_number} par %{username}"
+      results_page: "Résultats de recherche pour « %{term} »"
+      more_results: "Il y a des résultats supplémentaires. Veuillez raffiner vos critères de recherche."
       cant_find: "Vous ne trouvez pas ce que vous cherchez ?"
       start_new_topic: "Voulez-vous commencer un nouveau sujet ?"
-      or_search_google: "Ou essayez plutôt de chercher avec Google :"
-      search_google: "Essayez plutôt de chercher avec Google :"
+      or_search_google: "Ou essayez plutôt de rechercher avec Google :"
+      search_google: "Essayez plutôt de rechercher avec Google :"
       search_google_button: "Google"
       search_google_title: "Rechercher dans ce site"
       context:
-        user: "Rechercher dans les messages de @{{username}}"
-        category: "Rechercher dans la catégorie #{{category}}"
-        tag: "Rechercher dans l'étiquette #{{tag}}"
+        user: "Rechercher dans les messages de @%{username}"
+        category: "Rechercher dans la catégorie #%{category}"
+        tag: "Rechercher dans l'étiquette #%{tag}"
         topic: "Rechercher dans ce sujet"
         private_messages: "Rechercher dans les messages directs"
       advanced:
@@ -1853,7 +1877,7 @@ fr:
     go_back: "retour"
     not_logged_in_user: "page utilisateur avec un résumé de l'activité et les préférences "
     current_user: "aller à votre page utilisateur"
-    view_all: "Tout voir"
+    view_all: "tout voir"
     topics:
       new_messages_marker: "dernière visite"
       bulk:
@@ -1866,9 +1890,9 @@ fr:
         dismiss: "Ignorer"
         dismiss_read: "Ignorer tous les sujets non lus"
         dismiss_button: "Ignorer…"
-        dismiss_tooltip: "Ignorer les nouveaux messages ou arrêter de suivre les sujets"
+        dismiss_tooltip: "Ignorer les nouveaux messages uniquement ou arrêter de suivre les sujets"
         also_dismiss_topics: "Arrêter de suivre ces sujets pour qu'ils ne soient plus jamais marqués comme non lus"
-        dismiss_new: "Ignorer les nouveaux"
+        dismiss_new: "Ignorer les nouveaux sujets"
         toggle: "basculer la sélection multiple de sujets"
         actions: "Actions sur la sélection"
         change_category: "Définir la catégorie"
@@ -1878,7 +1902,7 @@ fr:
         choose_new_category: "Choisissez la nouvelle catégorie pour les sujets :"
         selected:
           one: "Vous avez sélectionné <b>%{count}</b> sujet."
-          other: "Vous avez sélectionné <b>{{count}}</b> sujets."
+          other: "Vous avez sélectionné <b>%{count}</b> sujets."
         change_tags: "Changer les étiquettes"
         append_tags: "Ajouter les étiquettes"
         choose_new_tags: "Choisissez de nouvelles étiquettes pour ces sujets :"
@@ -1891,7 +1915,7 @@ fr:
         posted: "Vous n'avez écrit aucun message pour le moment."
         latest: "Il n'y a aucun sujet pour le moment. C'est triste…"
         bookmarks: "Vous n'avez pas encore mis de signets à des sujets."
-        category: "Il n'y a pas de sujets dans {{category}}."
+        category: "Il n'y a pas de sujets dans %{category}."
         top: "Il n'y a pas de meilleurs sujets."
         educate:
           new: '<p>Vos nouveaux sujets apparaissent ici.</p><p>Par défaut, les sujets sont considérés comme nouveaux et affichent l''indicateur <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">nouveau</span> lorsqu''ils ont été créés depuis moins de 2 jours.</p><p>Vous pouvez modifier cela dans vos <a href="%{userPrefsUrl}">préférences</a>.</p>'
@@ -1902,13 +1926,13 @@ fr:
         read: "Il n'y a plus de sujets à lire."
         new: "Il n'y a plus de sujets à lire."
         unread: "Il n'y a plus de sujets à lire."
-        category: "Il n'y a plus de sujets à lire dans {{category}}."
+        category: "Il n'y a plus de sujets à lire dans %{category}."
         top: "Il n'y a plus de sujets à lire."
         bookmarks: "Il n'y a plus de sujets avec des signets."
     topic:
       filter_to:
         one: "%{count} message dans le sujet"
-        other: "{{count}} messages dans le sujet"
+        other: "%{count} messages dans le sujet"
       create: "Créer un sujet"
       create_long: "Créer un nouveau sujet"
       open_draft: "Ouvrir le brouillon"
@@ -1937,10 +1961,10 @@ fr:
       unread: "non lus"
       new_topics:
         one: "%{count} nouveau sujet"
-        other: "{{count}} nouveaux sujets"
+        other: "%{count} nouveaux sujets"
       unread_topics:
         one: "%{count} sujet non lu"
-        other: "{{count}} sujets non lus"
+        other: "%{count} sujets non lus"
       title: "Sujet"
       invalid_access:
         title: "Ce sujet est privé"
@@ -1948,30 +1972,30 @@ fr:
         login_required: "Vous devez vous connecter pour voir ce sujet de discussion."
       server_error:
         title: "Sujet impossible à charger"
-        description: "Désolé, nous n'avons pu charger ce sujet, probablement du à un problème de connexion. Merci de réessayer à nouveau. Si le problème persiste, merci de nous le faire savoir."
+        description: "Désolé, nous n'avons pu charger ce sujet, probablement à cause d'un problème de connexion. Veuillez réessayer. Si le problème persiste, merci de nous le faire savoir."
       not_found:
         title: "Sujet non trouvé"
         description: "Désolé, nous n'avons pas trouvé ce sujet. Peut-être a t-il été retiré par un modérateur ?"
       total_unread_posts:
         one: "il y a %{count} message non lu dans ce sujet"
-        other: " il y a {{count}} messages non lus dans ce sujet"
+        other: "il y a %{count} messages non lus dans ce sujet"
       unread_posts:
         one: "il reste %{count} message que vous n'avez pas lu lors de votre visite précédente sur ce sujet"
-        other: "il reste {{count}} messages que vous n'avez pas lus lors de votre visite précédente sur ce sujet"
+        other: "il reste %{count} messages que vous n'avez pas lus lors de votre visite précédente sur ce sujet"
       new_posts:
         one: "il y a %{count} nouveau message sur ce sujet depuis votre derniere lecture"
-        other: "il y a {{count}} nouveaux messages sur ce sujet depuis votre derniere lecture"
+        other: "il y a %{count} nouveaux messages sur ce sujet depuis votre derniere lecture"
       likes:
         one: "%{count} personne a aimé ce sujet"
-        other: "{{count}} personnes ont aimé ce sujet"
+        other: "%{count} personnes ont aimé ce sujet"
       back_to_list: "Retour à la liste des sujets"
       options: "Options du sujet"
       show_links: "afficher les liens dans ce sujet"
       toggle_information: "basculer l'affichage des détails du sujet"
-      read_more_in_category: "Vous voulez en lire plus ? Découvrez d'autres sujets dans {{catLink}} ou {{latestLink}}."
-      read_more: "Vous voulez en lire plus ? {{catLink}} ou {{latestLink}}."
-      group_request: "Effectuez une demande d'adhésion au groupe « {{name}} » pour afficher ce sujet"
-      group_join: "Vous devez rejoindre le groupe « {{name}} » pour voir ce sujet"
+      read_more_in_category: "Vous voulez en lire plus ? Découvrez d'autres sujets dans %{catLink} ou %{latestLink}."
+      read_more: "Vous voulez en lire plus ? %{catLink} ou %{latestLink}."
+      group_request: "Effectuez une demande d'adhésion au groupe « %{name} » pour afficher ce sujet"
+      group_join: "Vous devez rejoindre le groupe « %{name} » pour voir ce sujet"
       group_request_sent: "Votre demande d'adhésion au groupe a été envoyée. Vous serez averti de son acceptation."
       unread_indicator: "Aucun membre n'a encore lu le dernier message de ce sujet."
       read_more_MF: "Il y { UNREAD, plural, =0 {} one { a <a href='{basePath}/unread'>1 sujet non lu</a> } other { a <a href='{basePath}/unread'># sujets non lus</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{et } false {a } other{}} <a href='{basePath}/new'>1 nouveau sujet</a> } other { {BOTH, select, true{et } false {a } other{}} <a href='{basePath}/new'># nouveaux sujets</a> } } restant, ou {CATEGORY, select, true {consulter les autres sujets dans {catLink}} false {{latestLink}} other {}}"
@@ -1983,15 +2007,15 @@ fr:
       jump_reply_down: aller à des réponses ultérieures
       deleted: "Ce sujet a été supprimé"
       topic_status_update:
-        title: "Action planifiée du sujet"
+        title: "Planifier une action"
         save: "Planifier"
         num_of_hours: "Nombre d'heures :"
         num_of_days: "Nombre de jours :"
         remove: "Supprimer la planification"
         publish_to: "Publier dans :"
         when: "Quand :"
-        public_timer_types: Actions planifiées du sujet
-        private_timer_types: Actions utilisateur planifiées du sujet
+        public_timer_types: Actions planifiées pour le sujet
+        private_timer_types: Actions utilisateurs planifiées pour le sujet
         time_frame_required: Veuillez sélectionner un intervalle de temps
       auto_update_input:
         none: "Sélectionner un intervalle de temps"
@@ -2024,13 +2048,13 @@ fr:
         error: "Veuillez entrer une valeur valide."
         based_on_last_post: "Ne pas fermer tant que le dernier message du sujet n'a pas atteint cette ancienneté."
       auto_delete:
-        title: "Auto-suppression du sujet"
+        title: "Suppression automatique du sujet"
       auto_bump:
         title: "Remonter automatiquement le sujet"
       reminder:
         title: "Me rappeler"
       auto_delete_replies:
-        title: "Auto-suppression des réponses"
+        title: "Suppression automatique des réponses"
       status_update_notice:
         auto_open: "Ce sujet sera automatiquement ouvert %{timeLeft}."
         auto_close: "Ce sujet sera automatiquement fermé %{timeLeft}."
@@ -2075,7 +2099,7 @@ fr:
           "2_8": "Vous verrez un compteur de nouvelles réponses car vous suivez cette catégorie."
           "2_4": "Vous verrez un compteur de nouvelles réponses car vous avez répondu dans ce sujet."
           "2_2": "Vous verrez un compteur de nouvelles réponses car vous suivez ce sujet."
-          "2": 'Vous verrez un compteur de nouvelles réponses car vous <a href="{{basePath}}/u/{{username}}/preferences/notifications">avez lu ce sujet</a>.'
+          "2": 'Vous verrez un compteur de nouvelles réponses car vous <a href="%{basePath}/u/%{username}/preferences/notifications">avez lu ce sujet</a>.'
           "1_2": "Vous serez notifié si quelqu'un vous mentionne ou vous répond."
           "1": "Vous serez notifié si quelqu'un vous mentionne ou vous répond."
           "0_7": "Vous ignorez toutes les notifications de cette catégorie."
@@ -2151,25 +2175,25 @@ fr:
         choose_category: "Veuillez choisir une catégorie pour le sujet public :"
       feature_topic:
         title: "Mettre ce sujet en évidence"
-        pin: "Faire apparaître ce sujet en haut de la catégorie {{categoryLink}} jusqu'à"
-        confirm_pin: "Vous avez déjà {{count}} sujets épinglés. Avoir trop de sujets épinglés peut rendre la navigation difficile pour les nouveaux utilisateurs et les visiteurs. Êtes-vous sûr de vouloir épingler un autre sujet dans cette catégorie ?"
-        unpin: "Enlever ce sujet du haut de la catégorie {{categoryLink}}."
-        unpin_until: "Enlever ce sujet du haut de la catégorie {{categoryLink}} ou attendre jusqu'à <strong>%{until}</strong>."
+        pin: "Faire apparaître ce sujet en haut de la catégorie %{categoryLink} jusqu'à"
+        confirm_pin: "Vous avez déjà %{count} sujets épinglés. Avoir trop de sujets épinglés peut rendre la navigation difficile pour les nouveaux utilisateurs et les visiteurs. Êtes-vous sûr de vouloir épingler un autre sujet dans cette catégorie ?"
+        unpin: "Enlever ce sujet du haut de la catégorie %{categoryLink}."
+        unpin_until: "Enlever ce sujet du haut de la catégorie %{categoryLink} ou attendre jusqu'à <strong>%{until}</strong>."
         pin_note: "Les utilisateurs peuvent désépingler le sujet pour eux."
         pin_validation: "Une date est requise pour épingler ce sujet."
-        not_pinned: "Il n'y a aucun sujet épinglé dans {{categoryLink}}."
+        not_pinned: "Il n'y a aucun sujet épinglé dans %{categoryLink}."
         already_pinned:
-          one: "Sujets actuellement épinglés dans {{categoryLink}} : <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Sujets actuellement épinglés dans {{categoryLink}} : <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Sujets actuellement épinglés dans %{categoryLink} : <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Sujets actuellement épinglés dans %{categoryLink} : <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Faire apparaître ce sujet en haut de toutes les listes de sujet jusqu'à "
-        confirm_pin_globally: "Vous avez déjà {{count}} sujets épinglés. Trop de sujets épinglés peut être lourd pour les nouveaux utilisateurs et les visiteurs. Êtes-vous sûr de vouloir épingler globalement un autre sujet ?"
+        confirm_pin_globally: "Vous avez déjà %{count} sujets épinglés. Trop de sujets épinglés peut être lourd pour les nouveaux utilisateurs et les visiteurs. Êtes-vous sûr de vouloir épingler globalement un autre sujet ?"
         unpin_globally: "Enlever ce sujet du haut de toutes les listes de sujets."
         unpin_globally_until: "Enlever ce sujet du haut de toutes les listes de sujet ou attendre jusqu'à <strong>%{until}</strong>."
         global_pin_note: "Les utilisateurs peuvent désépingler le sujet pour eux."
         not_pinned_globally: "Il n'y a aucun sujet épinglé globalement."
         already_pinned_globally:
           one: "Sujets actuellement épinglés globalement : <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Sujets actuellement épinglés globalement : <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Sujets actuellement épinglés globalement : <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Mettre ce sujet à la une, il apparaîtra en haut de chaque page."
         remove_banner: "Enlever le sujet à la une qui apparaît en haut de chaque page."
         banner_note: "Les utilisateurs peuvent ignorer le sujet à la une. Seul un sujet peut être mis à la une à la fois."
@@ -2199,15 +2223,15 @@ fr:
         to_topic_username: "Vous avez entré un nom d'utilisateur. Nous allons lui envoyer une notification avec un lien l'invitant sur ce sujet."
         to_username: "Entrez le nom d'utilisateur de la personne que vous souhaitez inviter. Nous enverrons une notification avec un lien l'invitant sur ce sujet."
         email_placeholder: "nom@exemple.com"
-        success_email: "Nous avons envoyé une invitation à <b>{{emailOrUsername}}</b>. Nous vous avertirons lorsqu'il l'aura acceptée. Suivez l'état de vos invitations dans l'onglet prévu à cet effet sur votre page utilisateur."
+        success_email: "Nous avons envoyé une invitation à <b>%{emailOrUsername}</b>. Nous vous avertirons lorsqu'il l'aura acceptée. Suivez l'état de vos invitations dans l'onglet prévu à cet effet sur votre page utilisateur."
         success_username: "Nous avons invité cet utilisateur à participer à ce sujet."
         error: "Désolé, nous n'avons pas pu inviter cette personne. Elle a peut-être déjà été invitée ? (Le nombre d'invitations est limité)"
-        success_existing_email: "Un utilisateur avec le courriel <b>{{emailOrUsername}}</b> existe déjà. Nous avons invité cet utilisateur à participer à ce sujet."
+        success_existing_email: "Un utilisateur avec le courriel <b>%{emailOrUsername}</b> existe déjà. Nous avons invité cet utilisateur à participer à ce sujet."
       login_reply: "Se connecter pour répondre"
       filters:
         n_posts:
           one: "%{count} message"
-          other: "{{count}} messages"
+          other: "%{count} messages"
         cancel: "Supprimer le filtre"
       move_to:
         title: "Déplacer vers"
@@ -2221,7 +2245,7 @@ fr:
         error: "Il y a eu une erreur en déplaçant les messages vers un nouveau sujet."
         instructions:
           one: "Vous êtes sur le point de créer un nouveau sujet avec le message que vous avez sélectionné."
-          other: "Vous êtes sur le point de créer un nouveau sujet avec les <b>{{count}}</b> messages que vous avez sélectionnés."
+          other: "Vous êtes sur le point de créer un nouveau sujet avec les <b>%{count}</b> messages que vous avez sélectionnés."
       merge_topic:
         title: "Déplacer vers un sujet existant"
         action: "déplacer vers un sujet existant"
@@ -2229,7 +2253,7 @@ fr:
         radio_label: "Sujet existant"
         instructions:
           one: "Veuillez sélectionner le sujet dans lequel vous souhaitez déplacer ce message."
-          other: "Veuillez sélectionner le sujet dans lequel vous souhaitez déplacer ces <b>{{count}}</b> messages."
+          other: "Veuillez sélectionner le sujet dans lequel vous souhaitez déplacer ces <b>%{count}</b> messages."
       move_to_new_message:
         title: "Déplacer vers un nouveau message direct"
         action: "déplacer vers un nouveau message direct"
@@ -2238,7 +2262,7 @@ fr:
         participants: "Participants"
         instructions:
           one: "Vous êtes sur le point de créer un nouveau message direct avec le message que vous avez sélectionné."
-          other: "Vous êtes sur le point de créer un nouveau message direct avec les <b>{{count}}</b> messages que vous avez sélectionnés."
+          other: "Vous êtes sur le point de créer un nouveau message direct avec les <b>%{count}</b> messages que vous avez sélectionnés."
       move_to_existing_message:
         title: "Déplacer vers un message direct existant"
         action: "déplacer vers un message direct existant"
@@ -2246,7 +2270,7 @@ fr:
         participants: "Participants"
         instructions:
           one: "Veuillez sélectionner le message direct dans lequel vous souhaitez déplacer ce message."
-          other: "Veuillez sélectionner le message direct dans lequel vous souhaitez déplacer ces <b>{{count}}</b> messages."
+          other: "Veuillez sélectionner le message direct dans lequel vous souhaitez déplacer ces <b>%{count}</b> messages."
       merge_posts:
         title: "Fusionner les messages sélectionnés"
         action: "fusionner les messages sélectionnés"
@@ -2269,26 +2293,26 @@ fr:
         error: "Il y a eu une erreur lors du changement de l'auteur des messages."
         placeholder: "nom d'utilisateur du nouvel auteur"
         instructions:
-          one: "Veuillez choisir un nouvel auteur pour le message de <b>@{{old_user}}</b>"
-          other: "Veuillez choisir un nouvel auteur pour les {{count}} messages de <b>@{{old_user}}</b>"
+          one: "Veuillez choisir un nouvel auteur pour le message de <b>@%{old_user}</b>"
+          other: "Veuillez choisir un nouvel auteur pour les %{count} messages de <b>@%{old_user}</b>"
         instructions_without_old_user:
           one: "Veuillez choisir un nouvel auteur pour le message"
-          other: "Veuillez choisir un nouvel auteur pour les {{count}} messages"
+          other: "Veuillez choisir un nouvel auteur pour les %{count} messages"
       change_timestamp:
-        title: "Modifier la date/heure…"
-        action: "modifier la date/heure"
-        invalid_timestamp: "La date/heure ne peut être dans le futur"
-        error: "Il y a eu une erreur lors de la modification de la date/heure de ce sujet."
-        instructions: "Veuillez sélectionner la nouvelle date/heure du sujet. Les messages dans ce sujet seront mis à jour pour maintenir la même différence d'heure."
+        title: "Modifier la date et l'heure…"
+        action: "modifier la date et l'heure"
+        invalid_timestamp: "La date et l'heure ne peuvent pas être dans le futur."
+        error: "Il y a eu une erreur lors de la modification de la date et l'heure de ce sujet."
+        instructions: "Veuillez sélectionner les nouvelles date et heure du sujet. Les messages dans ce sujet seront mis à jour pour maintenir la même différence d'heures."
       multi_select:
         select: "sélectionner"
-        selected: "sélectionnés ({{count}})"
+        selected: "sélectionnés (%{count})"
         select_post:
           label: "sélectionner"
           title: "Ajouter le message à la sélection"
         selected_post:
           label: "sélectionné"
-          title: "Cliquer pour retirer le message de la sélection"
+          title: "Cliquez pour retirer le message de la sélection"
         select_replies:
           label: "sélectionner avec réponses"
           title: "Ajouter le message et toutes ses réponses à la sélection"
@@ -2301,54 +2325,54 @@ fr:
         deselect_all: tout désélectionner
         description:
           one: vous avez sélectionné <b>%{count}</b> message.
-          other: "Vous avez sélectionné <b>{{count}}</b> messages."
+          other: "Vous avez sélectionné <b>%{count}</b> messages."
       deleted_by_author:
         one: "(sujet supprimé par son auteur, sera supprimé automatiquement dans %{count} heure à moins qu'il ne soit signalé)"
         other: "(sujet supprimé par son auteur, sera supprimé automatiquement dans %{count} heures à moins qu'il ne soit signalé)"
     post:
       quote_reply: "Citer"
       edit_reason: "Raison :"
-      post_number: "message {{number}}"
+      post_number: "message %{number}"
       ignored: "Contenu ignoré"
       wiki_last_edited_on: "wiki modifié pour la dernière fois le"
       last_edited_on: "message modifié pour la dernière fois le"
       reply_as_new_topic: "Répondre par un nouveau sujet"
       reply_as_new_private_message: "Répondre par un nouveau message direct adressé aux mêmes destinataires"
-      continue_discussion: "Suite du sujet {{postLink}} :"
+      continue_discussion: "Suite du sujet %{postLink} :"
       follow_quote: "aller au message cité"
       show_full: "Afficher le message complet"
       show_hidden: "Visualiser le contenu ignoré."
       deleted_by_author:
-        one: "(message supprimé par son auteur, sera supprimé automatiquement dans %{count} heure à moins qu'il ne soit signalé)"
-        other: "(message supprimé par son auteur, sera supprimé automatiquement dans %{count} heures à moins qu'il ne soit signalé)"
+        one: "(message retiré par son auteur, il sera supprimé automatiquement dans %{count} heure à moins qu'il ne soit signalé)"
+        other: "(message retiré par son auteur, il sera supprimé automatiquement dans %{count} heures à moins qu'il ne soit signalé)"
       collapse: "réduire"
       expand_collapse: "développer/réduire"
       locked: "un responsable a verrouillé ce message pour empêcher sa modification"
       gap:
-        one: "voir %{count} réponse cachée"
-        other: "voir {{count}} réponses cachées"
+        one: "voir %{count} réponse masquée"
+        other: "voir %{count} réponses masquées"
       notice:
-        new_user: "C'est la première fois que {{user}} publie un message — accueillons-le comme il se doit dans notre communauté !"
-        returning_user: "Cela faisait un moment que nous n'avions pas vu {{user}} — son dernier message remonte à {{time}}."
+        new_user: "C'est la première fois que %{user} publie un message — accueillons-le comme il se doit dans notre communauté !"
+        returning_user: "Cela faisait un moment que nous n'avions pas vu %{user} — son dernier message remonte à %{time}."
       unread: "Ce message est non lu"
       has_replies:
-        one: "{{count}} réponse"
-        other: "{{count}} réponses"
+        one: "%{count} réponse"
+        other: "%{count} réponses"
       has_likes_title:
         one: "%{count} personne a aimé ce message"
-        other: "{{count}} personnes ont aimé ce message"
+        other: "%{count} personnes ont aimé ce message"
       has_likes_title_only_you: "vous avez aimé ce message"
       has_likes_title_you:
         one: "vous et %{count} autre personne ont aimé ce message"
-        other: "vous et {{count}} autres personnes ont aimé ce message"
+        other: "vous et %{count} autres personnes ont aimé ce message"
       errors:
         create: "Désolé, il y a eu une erreur lors de la publication de votre message. Veuillez réessayer."
         edit: "Désolé, il y a eu une erreur lors de la modification de votre message. Veuillez réessayer."
         upload: "Désolé, il y a eu une erreur lors de l'envoi du fichier. Veuillez réessayer."
-        file_too_large: "Désolé, ce fichier est trop volumineux (la taille maximale autorisée est de {{max_size_kb}} Ko). Vous pouvez envoyer votre fichier sur un service d'hébergement externe et ensuite coller le lien ici."
+        file_too_large: "Désolé, ce fichier est trop volumineux (la taille maximale autorisée est de %{max_size_kb} Ko). Vous pouvez envoyer votre fichier sur un service d'hébergement externe et ensuite coller le lien ici."
         too_many_uploads: "Désolé, vous ne pouvez envoyer qu'un seul fichier à la fois."
-        too_many_dragged_and_dropped_files: "Désolé, vous ne pouvez envoyer que {{max}} fichiers à la fois."
-        upload_not_authorized: "Désolé, le fichier que vous essayez d'envoyer n'est pas autorisé (extensions autorisées : {{authorized_extensions}})."
+        too_many_dragged_and_dropped_files: "Désolé, vous ne pouvez envoyer que %{max} fichiers à la fois."
+        upload_not_authorized: "Désolé, le fichier que vous essayez d'envoyer n'est pas autorisé (extensions autorisées : %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Désolé, les nouveaux utilisateurs ne peuvent pas envoyer d'images."
         attachment_upload_not_allowed_for_new_user: "Désolé, les nouveaux utilisateurs ne peuvent pas envoyer de fichiers."
         attachment_download_requires_login: "Désolé, vous devez être connecté pour télécharger une pièce jointe."
@@ -2388,10 +2412,10 @@ fr:
           confirm: "Voulez-vous aussi supprimer les réponses à ce message ?"
           direct_replies:
             one: "Oui et %{count} réponse directe"
-            other: "Oui et {{count}} réponses directes"
+            other: "Oui et %{count} réponses directes"
           all_replies:
             one: "Oui et la réponse"
-            other: "Oui et les {{count}} réponses"
+            other: "Oui et les %{count} réponses"
           just_the_post: "Non, uniquement ce message"
         admin: "actions d'administration sur le message"
         wiki: "Basculer en mode wiki"
@@ -2412,7 +2436,7 @@ fr:
         delete_topic: "supprimer le sujet"
         add_post_notice: "Ajouter une note pour les responsables"
         remove_post_notice: "Retirer la note pour les responsables"
-        remove_timer: "retirer le compteur"
+        remove_timer: "supprimer la planification"
       actions:
         flag: "Signaler"
         defer_flags:
@@ -2438,11 +2462,11 @@ fr:
             one: "a lu ceci"
             other: "ont lu ceci"
           like_capped:
-            one: "et {{count}} autre a aimé ça"
-            other: "et {{count}} autres ont aimé ça"
+            one: "et %{count} autre a aimé ça"
+            other: "et %{count} autres ont aimé ça"
           read_capped:
-            one: "et {{count}} autre a lu ceci"
-            other: "et {{count}} autres ont lu ceci"
+            one: "et %{count} autre a lu ceci"
+            other: "et %{count} autres ont lu ceci"
         by_you:
           off_topic: "Vous l'avez signalé comme étant hors-sujet"
           spam: "Vous l'avez signalé comme étant du spam"
@@ -2454,11 +2478,11 @@ fr:
       delete:
         confirm:
           one: "Êtes-vous sûr de vouloir supprimer ce message ?"
-          other: "Êtes-vous sûr de vouloir supprimer ces {{count}} messages ?"
+          other: "Êtes-vous sûr de vouloir supprimer ces %{count} messages ?"
       merge:
         confirm:
           one: "Êtes-vous sûr de vouloir fusionner ces messages ?"
-          other: "Êtes-vous sûr de vouloir fusionner ces {{count}} messages ?"
+          other: "Êtes-vous sûr de vouloir fusionner ces %{count} messages ?"
       revisions:
         controls:
           first: "Première révision"
@@ -2470,7 +2494,7 @@ fr:
           revert: "Revenir à cette révision"
           edit_wiki: "Modifier le wiki"
           edit_post: "Modifier le message"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}}<strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon}<strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "Afficher le rendu avec les ajouts et les retraits en ligne"
@@ -2499,6 +2523,7 @@ fr:
         updated: "Mis à jour"
         name: "Nom"
         name_placeholder: "À quoi correspond ce signet ?"
+        set_reminder: "Me rappeler"
         actions:
           delete_bookmark:
             name: "Supprimer le signet"
@@ -2574,6 +2599,7 @@ fr:
       sort_order: "Trier la liste de sujets par :"
       default_view: "Liste de sujets par défaut :"
       default_top_period: "Période des meilleurs sujets par défaut :"
+      default_list_filter: "Filtre de liste par défaut :"
       allow_badges_label: "Autoriser les badges à être accordés dans cette catégorie"
       edit_permissions: "Modifier les permissions"
       reviewable_by_group: "En plus des responsables, les messages et signalements dans cette catégorie peuvent aussi être vérifier par :"
@@ -2636,6 +2662,9 @@ fr:
         moderation: "Modération"
         appearance: "Apparence"
         email: "Courriel"
+      list_filters:
+        all: "tous les sujets"
+        none: "aucune sous-catégorie"
     flagging:
       title: "Merci de nous aider à garder notre communauté civilisée !"
       action: "Signaler ce message"
@@ -2659,14 +2688,14 @@ fr:
       custom_placeholder_notify_moderators: "Dites-nous ce qui vous dérange spécifiquement, et fournissez des liens pertinents et exemples si possible."
       custom_message:
         at_least:
-          one: "saisir au moins %{count} caractère"
-          other: "saisir au moins {{count}} caractères"
+          one: "saisissez au moins %{count} caractère"
+          other: "saisissez au moins %{count} caractères"
         more:
           one: "%{count} restant…"
-          other: "{{count}} restants…"
+          other: "%{count} restants…"
         left:
           one: "%{count} restant"
-          other: "{{count}} restants"
+          other: "%{count} restants"
     flagging_topic:
       title: "Merci de nous aider à garder notre communauté civilisée !"
       action: "Signaler le sujet"
@@ -2710,7 +2739,7 @@ fr:
         title: "Ce sujet est un message direct"
         help: "Ce sujet est un message direct"
     posts: "Messages"
-    posts_long: "il y a {{number}} messages dans ce sujet"
+    posts_long: "il y a %{number} messages dans ce sujet"
     posts_likes_MF: |
       Ce sujet a {count, plural, one {1 réponse} other {# réponses}} {ratio, select,
 
@@ -2729,20 +2758,20 @@ fr:
     replies: "Réponses"
     views_long:
       one: "ce sujet a été vu %{count} fois"
-      other: "ce sujet a été vu {{number}} fois"
+      other: "ce sujet a été vu %{number} fois"
     activity: "Activité"
     likes: "J'aime"
     likes_lowercase:
       one: "J'aime"
       other: "J'aime"
-    likes_long: "il y a {{number}} J'aime dans ce sujet"
+    likes_long: "il y a %{number} J'aime dans ce sujet"
     users: "Utilisateurs"
     users_lowercase:
       one: "utilisateur"
       other: "utilisateurs"
     category_title: "Catégorie"
     history: "Historique"
-    changed_by: "par {{author}}"
+    changed_by: "par %{author}"
     raw_email:
       title: "Courriel entrant"
       not_available: "Indisponible !"
@@ -2753,34 +2782,34 @@ fr:
       latest:
         title: "Récents"
         title_with_count:
-          one: "Récent ({{count}})"
-          other: "Récents ({{count}})"
+          one: "Récent (%{count})"
+          other: "Récents (%{count})"
         help: "sujets avec des messages récents"
       read:
         title: "Lus"
         help: "sujets que vous avez lus, dans l'ordre de dernière lecture"
       categories:
         title: "Catégories"
-        title_in: "Catégorie - {{categoryName}}"
+        title_in: "Catégorie - %{categoryName}"
         help: "tous les sujets regroupés par catégorie"
       unread:
         title: "Non lus"
         title_with_count:
           one: "Non lu (%{count})"
-          other: "Non lus ({{count}})"
+          other: "Non lus (%{count})"
         help: "sujets avec des messages non lus que vous suivez ou surveillez"
         lower_title_with_count:
           one: "%{count} non lu"
-          other: "{{count}} non lus"
+          other: "%{count} non lus"
       new:
         lower_title_with_count:
           one: "%{count} nouveau"
-          other: "{{count}} nouveaux"
+          other: "%{count} nouveaux"
         lower_title: "nouveau"
         title: "Nouveaux"
         title_with_count:
           one: "Nouveau (%{count})"
-          other: "Nouveaux ({{count}})"
+          other: "Nouveaux (%{count})"
         help: "sujets créés dans les derniers jours"
       posted:
         title: "Mes messages"
@@ -2789,11 +2818,11 @@ fr:
         title: "Signets"
         help: "sujets auxquels vous avez mis un signet"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "derniers sujets dans la catégorie {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "derniers sujets dans la catégorie %{categoryName}"
       top:
         title: "Top"
         help: "les meilleurs sujets de l'année, du mois, de la semaine ou du jour"
@@ -2906,7 +2935,7 @@ fr:
         mark_watching: "%{shortcut} Surveiller le sujet"
         print: "%{shortcut} Imprimer le sujet"
         defer: "%{shortcut} Reporter le sujet à plus tard"
-        topic_admin_actions: "%{shortcut} Ouvrir les actions d'administration sur ce sujet"
+        topic_admin_actions: "%{shortcut} Ouvrir les actions d'administration du sujet"
       search_menu:
         title: "Menu de recherche"
         prev_next: "%{shortcut} Déplacer la sélection vers le haut et bas"
@@ -2957,8 +2986,8 @@ fr:
       synonyms: "Synonymes"
       synonyms_description: "Quand les étiquettes suivantes sont utilisées, elles seront remplacées par <b>%{base_tag_name}</b>."
       tag_groups_info:
-        one: 'Cette étiquette appartient au groupe « {{tag_groups}} ».'
-        other: "Cette étiquette appartient aux groupes : {{tag_groups}}."
+        one: 'Cette étiquette appartient au groupe « %{tag_groups} ».'
+        other: "Cette étiquette appartient aux groupes : %{tag_groups}."
       category_restrictions:
         one: "Elle ne peut être utilisée que dans cette catégorie :"
         other: "Elle ne peut être utilisée que dans ces catégories :"
@@ -2974,11 +3003,11 @@ fr:
       delete_tag: "Supprimer l'étiquette"
       delete_confirm:
         one: "Êtes-vous sûr de vouloir supprimer cette étiquettes et l'enlever de %{count} sujet auquel elle est assignée ?"
-        other: "Êtes-vous sûr de vouloir supprimer cette étiquette et l'enlever de {{count}} sujets auxquels elle est assignée ?"
+        other: "Êtes-vous sûr de vouloir supprimer cette étiquette et l'enlever de %{count} sujets auxquels elle est assignée ?"
       delete_confirm_no_topics: "Êtes-vous sûr de vouloir supprimer cette étiquette ?"
       delete_confirm_synonyms:
         one: "Son synonyme sera aussi supprimé."
-        other: "Ses {{count}} synonymes seront aussi supprimés."
+        other: "Ses %{count} synonymes seront aussi supprimés."
       rename_tag: "Renommer l'étiquette"
       rename_instructions: "Choisissez un nouveau nom pour l'étiquette :"
       sort_by: "Trier par :"
@@ -3156,7 +3185,7 @@ fr:
           no_data: "Aucune donnée à afficher."
           trending_search:
             more: '<a href="%{basePath}/admin/logs/search_logs">Journal des recherches</a>'
-            disabled: 'Rapport sur les tendances de recherche désactivé. Activez la <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">journalisation des recherches</a> pour collectionner les données.'
+            disabled: 'Rapport sur les tendances de recherche désactivé. Activez la <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">journalisation des recherches</a> pour collecter des données.'
           filters:
             file-extension:
               label: Extension de fichier
@@ -3175,11 +3204,11 @@ fr:
           create: "Créer"
           name:
             too_short: "Nom de groupe trop court"
-            too_long: "Nom de groupe trop long"
+            too_long: "Le nom du groupe est trop long"
             checking: "Vérification de la disponibilité du nom de groupe…"
             available: "Nom de groupe disponible"
             not_available: "Nom de groupe indisponible"
-            blank: "Nom de groupe ne peut être vide"
+            blank: "Le nom du groupe ne peut être vide"
         bulk_add:
           title: "Ajouter au groupe en masse"
           complete_users_not_added: "Ces utilisateurs n'ont pas été ajoutés (vérifiez qu'ils ont un compte) :"
@@ -3254,7 +3283,7 @@ fr:
         no_description: (aucune description)
         all_api_keys: Toutes les clés pour l’API
         user_mode: Niveau de l’utilisateur
-        impersonate_all_users: Usurper l’identité d'un utilisateur
+        impersonate_all_users: Incarner un utilisateur
         single_user: "Utilisateur unique"
         user_placeholder: Entrez un nom d'utilisateur
         description_placeholder: "À quoi servira cette clé ?"
@@ -3336,10 +3365,10 @@ fr:
           redeliver: "Redélivrer"
           incoming:
             one: "Il y a un nouvel événement."
-            other: "Il y a {{count}} nouveaux événements."
+            other: "Il y a %{count} nouveaux événements."
           completed_in:
             one: "Terminé en %{count} seconde."
-            other: "Terminé en {{count}} secondes."
+            other: "Terminé en %{count} secondes."
           request: "Requête"
           response: "Réponse"
           redeliver_confirm: "Êtes-vous sûr de vouloir redélivrer les mêmes données ?"
@@ -3391,12 +3420,12 @@ fr:
           label: "Envoyer"
           title: "Envoyer une sauvegarde à cette instance"
           uploading: "Envoi en cours…"
-          uploading_progress: "Envoi en cours… {{progress}}%"
-          success: "« {{filename}} » a été envoyé avec succès. Le fichier est en cours de traitement et il faudra jusqu'à une minute pour qu'il apparaisse dans la liste."
-          error: "Il y a eu une erreur lors de l'envoi de « {{filename}} » : {{message}}"
+          uploading_progress: "Envoi en cours… %{progress}%"
+          success: "« %{filename} » a été envoyé avec succès. Le fichier est en cours de traitement et il faudra jusqu'à une minute pour qu'il apparaisse dans la liste."
+          error: "Il y a eu une erreur lors de l'envoi de « %{filename} » : %{message}"
         operations:
           is_running: "Une opération est en cours d'exécution…"
-          failed: "L'opération {{operation}} a échoué. Veuillez consulter les journaux."
+          failed: "L'opération %{operation} a échoué. Veuillez consulter les journaux."
           cancel:
             label: "Annuler"
             title: "Annuler l'opération en cours"
@@ -3405,7 +3434,7 @@ fr:
             label: "Sauvegarder"
             title: "Créer une sauvegarde"
             confirm: "Voulez-vous démarrer une nouvelle sauvegarde ?"
-            without_uploads: "Oui (n'incluez pas de téléversements)"
+            without_uploads: "Oui (ne pas inclure les fichiers envoyés)"
           download:
             label: "Télécharger"
             title: "Envoyer un courriel avec un lien de téléchargement"
@@ -3499,8 +3528,8 @@ fr:
           extra_files_remote: "Exportez le thème ou vérifiez le dépôt Git pour voir ces fichiers."
           preview: "Prévisualiser"
           show_advanced: "Afficher les champs avancés"
-          hide_advanced: "Cacher les champs avancés"
-          hide_unused_fields: "Cacher les champs inutilisés"
+          hide_advanced: "Masquer les champs avancés"
+          hide_unused_fields: "Masquer les champs inutilisés"
           is_default: "Thème activé par défaut"
           user_selectable: "Thème sélectionnable par les utilisateurs"
           color_scheme: "Palette de couleurs"
@@ -3519,7 +3548,7 @@ fr:
           disabled_component_tooltip: "Ce composant a été désactivé"
           default_theme_tooltip: "Ce thème est celui par défaut du site"
           updates_available_tooltip: "Des mises à jour sont disponibles pour ce thème"
-          and_x_more: "et {{count}} de plus."
+          and_x_more: "et %{count} de plus."
           collapse: Réduire
           uploads: "Fichiers envoyés"
           no_uploads: "Vous pouvez envoyer des ressources associées à votre thème comme des polices ou des images"
@@ -3568,8 +3597,8 @@ fr:
           disabled_by: "Ce composant a été désactivé par"
           required_version:
             error: "Ce thème a été désactivé automatiquement car il n'est pas compatible avec cette version de Discourse."
-            minimum: "Nécessite la version {{version}} ou supérieure de Discourse."
-            maximum: "Nécessite la version {{version}} ou inférieure de Discourse."
+            minimum: "Nécessite la version %{version} ou supérieure de Discourse."
+            maximum: "Nécessite la version %{version} ou inférieure de Discourse."
           component_of: "Composant de :"
           update_to_latest: "Mettre à jour"
           check_for_updates: "Vérifier les mises à jour"
@@ -3582,7 +3611,7 @@ fr:
           empty: "Aucun élément"
           commits_behind:
             one: "Le thème est en retard de %{count} commit !"
-            other: "Le thème est en retard de {{count}} commits !"
+            other: "Le thème est en retard de %{count} commits !"
           compare_commits: "(Voir les nouveaux changements)"
           repo_unreachable: "Le dépôt Git de ce thème est inaccessible. Message d'erreur : "
           imported_from_archive: "Ce thème a été importé depuis un fichier .zip"
@@ -3772,7 +3801,7 @@ fr:
           staff_user: "Utilisateur"
           target_user: "Utilisateur cible"
           subject: "Sujet"
-          when: "Quand"
+          when: "Date"
           context: "Contexte"
           details: "Détails"
           previous_value: "Précédent"
@@ -3842,7 +3871,7 @@ fr:
             merge_user: "fusionner un utilisateur"
             entity_export: "exporter l'entité"
             change_name: "modifier le nom"
-            topic_timestamps_changed: "date du sujet changée"
+            topic_timestamps_changed: "date et heure du sujet modifiées"
             approve_user: "utilisateur approuvé"
             web_hook_create: "créer le Webhook"
             web_hook_update: "mettre à jour le Webhook"
@@ -3927,7 +3956,7 @@ fr:
           flag: "Signaler"
         action_descriptions:
           block: "Empêchez les messages contenant ces mots d'être publiés. L'utilisateur verra un message d'erreur lorsqu'il essaiera de publier son message."
-          censor: "Autoriser les messages contenant ces mots, mais les remplacer par des caractères qui cachent les mots censurés."
+          censor: "Autoriser les messages contenant ces mots, mais les remplacer par des caractères qui masquent les mots censurés."
           require_approval: "Les messages qui contiennent ces mots devront être approuvés par un responsable avant de pouvoir être publiés."
           flag: "Autoriser les messages contenant ces mots, mais les signaler comme inappropriés pour que les modérateurs puissent les vérifier."
         form:
@@ -3958,7 +3987,7 @@ fr:
         id_not_found: "Désolé cet identifiant d'utilisateur n'existe pas dans notre système."
         active: "Activé"
         show_emails: "Afficher les adresses courriel"
-        hide_emails: "Cacher les adresses courriel"
+        hide_emails: "Masquer les adresses courriel"
         nav:
           new: "Nouveaux"
           active: "Actifs"
@@ -3987,8 +4016,8 @@ fr:
           title: "Afficher l'adresse courriel de cet utilisateur"
           text: "Afficher"
       user:
-        suspend_failed: "Il y a eu un problème pendant la suspension de cet utilisateur {{error}}"
-        unsuspend_failed: "Il y a eu un problème pendant le retrait de la suspension de cet utilisateur {{error}}"
+        suspend_failed: "Il y a eu un problème pendant la suspension de cet utilisateur %{error}"
+        unsuspend_failed: "Il y a eu un problème pendant le retrait de la suspension de cet utilisateur %{error}"
         suspend_duration: "Combien de temps l'utilisateur sera suspendu ?"
         suspend_reason_label: "Pourquoi suspendez-vous ? Ce texte <b>sera visible par tout le monde</b> sur la page du profil de cet utilisateur et sera affiché à l'utilisateur quand il essaie de se connecter. Soyez bref."
         suspend_reason_hidden_label: "Pourquoi le suspendez-vous ? Ce texte sera affiché à l'utilisateur quand il essaie de se connecter. Soyez bref."
@@ -4031,7 +4060,7 @@ fr:
         show_public_profile: "Afficher le profil public"
         impersonate: "Incarner"
         action_logs: "Journaux d'actions"
-        ip_lookup: "IP de consultation"
+        ip_lookup: "Localiser l'adresse IP"
         log_out: "Déconnecter l'utilisateur"
         logged_out: "L'utilisateur s'est déconnecté de tous les appareils"
         revoke_admin: "Révoquer les droits d'administration"
@@ -4278,6 +4307,8 @@ fr:
           modal_description: "Voulez-vous appliquer ce changement rétroactivement ? Cela changera les préférences de %{count} utilisateurs existants."
           modal_yes: "Oui"
           modal_no: "Non, appliquer ce changement à partir de maintenant"
+        simple_list:
+          add_item: "Ajouter un élément…"
       badges:
         title: Badges
         new_badge: Nouveau badge
@@ -4365,6 +4396,7 @@ fr:
         title: "Emoji"
         help: "Ajoutez de nouveaux emojis qui seront disponibles pour tout le monde. (Conseil : glisser-déposer plusieurs fichiers en même temps)"
         add: "Ajouter un nouvel emoji"
+        uploading: "Envoi en cours…"
         name: "Nom"
         group: "Groupe"
         image: "Image"
@@ -4403,6 +4435,7 @@ fr:
         post_title: "Message"
         category_id: "ID de la catégorie"
         category_title: "Catégorie"
+        tag_name: "Nom de l'étiquette"
         external_url: "URL externe"
         destination: "Cible"
         delete_confirm: "Êtes-vous sûr de vouloir supprimer ce permalien ?"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 4185d7c296..e69e86f5ae 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -23,8 +23,8 @@ gl:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
@@ -183,11 +183,11 @@ gl:
     every_hour: "cada hora"
     daily: "diariamente"
     weekly: "semanalmente"
-    max_of_count: "máx. de {{count}}"
+    max_of_count: "máx. de %{count}"
     alternation: "ou"
     character_count:
-      one: "{{count}} carácter"
-      other: "{{count}} caracteres"
+      one: "%{count} carácter"
+      other: "%{count} caracteres"
     suggested_topics:
       title: "Temas suxeridos"
       pm_title: "Mensaxes suxeridas"
@@ -276,19 +276,19 @@ gl:
         description: "Recibimos a túa nova publicación pero cómpre que sexa aprobada por un moderador antes de aparecer. Ten paciencia."
         ok: "De acordo"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> publicou <a href='{{topicUrl}}'>o tema</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Ti</a> publicaches <a href='{{topicUrl}}'>o tema</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> respondeu a <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Ti</a> respondiches a <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> respondeu ao tema <a href='{{topicUrl}}'></a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Ti</a> respondiches ao tema <a href='{{topicUrl}}'></a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> citou a <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> citou a <a href='{{user2Url}}'>, vaia, a ti.</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Ti</a> citaches a <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Publicado por <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Publicado por <a href='{{userUrl}}'>ti</a>"
-      sent_by_user: "Enviado por <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Enviado por <a href='{{userUrl}}'>, vaia, ti mesmo.</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> publicou <a href='%{topicUrl}'>o tema</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Ti</a> publicaches <a href='%{topicUrl}'>o tema</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> respondeu a <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Ti</a> respondiches a <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> respondeu ao tema <a href='%{topicUrl}'></a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Ti</a> respondiches ao tema <a href='%{topicUrl}'></a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> citou a <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> citou a <a href='%{user2Url}'>, vaia, a ti.</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Ti</a> citaches a <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Publicado por <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Publicado por <a href='%{userUrl}'>ti</a>"
+      sent_by_user: "Enviado por <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Enviado por <a href='%{userUrl}'>, vaia, ti mesmo.</a>"
     directory:
       filter_name: "filtrar por nome de usuario"
       title: "Usuarios"
@@ -412,7 +412,7 @@ gl:
     user_fields:
       none: "(seleccione unha opción)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Perfil"
       mute: "Silenciar"
       edit: "Editar preferencias"
@@ -428,6 +428,7 @@ gl:
           read: "Lidos"
           unread: "Sen ler"
         ignore_duration_username: "Nome do usuario"
+        ignore_duration_save: "Ignorar"
         mute_option: "Silenciado"
         normal_option: "Normal"
       activity_stream: "Actividade"
@@ -456,11 +457,11 @@ gl:
       external_links_in_new_tab: "Abrir todas as ligazóns externas nunha nova lapela"
       enable_quoting: "Activar as comiñas de resposta para o texto realzado"
       change: "cambiar"
-      moderator: "{{user}} é moderador"
-      admin: "{{user}} é administrador"
+      moderator: "%{user} é moderador"
+      admin: "%{user} é administrador"
       moderator_tooltip: "Este usuario é un moderador"
       admin_tooltip: "Este usuario é un administrador"
-      suspended_notice: "Este usuario está suspendido até o {{date}}."
+      suspended_notice: "Este usuario está suspendido até o %{date}."
       suspended_reason: "Razón:"
       github_profile: "Github"
       watched_tags: "Visto"
@@ -476,7 +477,6 @@ gl:
       admin_delete: "Eliminar"
       users: "Usuarios"
       muted_users: "Silenciado"
-      muted_users_instructions: "Suprimir todas as notificacións destes usuarios."
       tracked_topics_link: "Amosar"
       automatically_unpin_topics: "Despegar os temas automaticamente cando alcance o fondo."
       staff_counters:
@@ -544,11 +544,11 @@ gl:
         title: "Correo electrónico"
         ok: "Enviarémosche un correo electrónico para confirmar"
         invalid: "Introduce un enderezo de correo electrónico correcto"
-        authenticated: "O teu enderezo de correo electrónico foi autenticado por {{provider}}"
+        authenticated: "O teu enderezo de correo electrónico foi autenticado por %{provider}"
         frequency_immediately: "Enviarémosche un correo-e axiña se non liches sobre o que che estamos a enviar."
         frequency:
           one: "Só che eviaremos un correo-e se non te vimos no último minuto."
-          other: "Só che eviaremos un correo-e se non te vimos nos últimos {{count}} minutos."
+          other: "Só che eviaremos un correo-e se non te vimos nos últimos %{count} minutos."
       associated_accounts:
         revoke: "Revogar"
         cancel: "Cancelar"
@@ -559,9 +559,9 @@ gl:
         ok: "O nome parece correcto"
       username:
         title: "Nome do usuario"
-        short_instructions: "A xente pode mencionarte como @{{username}}"
+        short_instructions: "A xente pode mencionarte como @%{username}"
         available: "O nome de usuario está dispoñíbel"
-        not_available: "Non dispoñíbel. Tentar {{suggestion}}?"
+        not_available: "Non dispoñíbel. Tentar %{suggestion}?"
         too_short: "O nome do usuario é curto de máis"
         too_long: "O nome do usuario é longo de máis"
         checking: "Comprobando a dispoñibilidade do nome do usuario..."
@@ -634,14 +634,14 @@ gl:
         user: "Usuario convidado"
         truncated:
           one: "Amosando o primeiro convite."
-          other: "Amosando os primeiros {{count}} convites."
+          other: "Amosando os primeiros %{count} convites."
         redeemed: "Convites utilizados"
         redeemed_tab: "Utilizados"
-        redeemed_tab_with_count: "Utilizados ({{count}})"
+        redeemed_tab_with_count: "Utilizados (%{count})"
         redeemed_at: "Utilizados"
         pending: "Convites pendentes"
         pending_tab: "Pendente"
-        pending_tab_with_count: "Pendentes ({{count}})"
+        pending_tab_with_count: "Pendentes (%{count})"
         topics_entered: "Temas vistos"
         posts_read_count: "Publicacións lidas"
         expired: "Este convite caducou."
@@ -652,10 +652,12 @@ gl:
         time_read: "Tempo de lectura"
         days_visited: "Días visitado"
         account_age_days: "Tempo da conta en días"
-        create: "Enviar un convite"
+        links_tab: "Ligazóns"
+        link_created_at: "Creado"
+        link_groups: Grupos
+        create: "Enviar convite"
         generate_link: "Copiar a ligazón do convite"
         bulk_invite:
-          text: "Convidar en grupo desde un ficheiro"
           success: "O ficheiro enviouse correctamente, notificaráseche por mensaxe cando remate o proceso."
       password:
         title: "Contrasinal"
@@ -707,7 +709,7 @@ gl:
       desc:
         network: "Por favor, comproba a conexión."
         network_fixed: "Parece que xa estamos de volta."
-        server: "Código do erro: {{status}}"
+        server: "Código do erro: %{status}"
         forbidden: "Non tes permiso para ver isto"
         not_found: "Vaites, o aplicativo tentou cargar unha URL inexistente."
         unknown: "Algo foi mal."
@@ -749,8 +751,8 @@ gl:
       hidden_for_session: "De acordo, preguntareicho mañá. Tamén podes usar «Iniciar sesión» para crear unha conta."
     summary:
       enabled_description: "Estás vendo un resumo deste tema: as publicacións máis interesantes determinadas pola comunidade"
-      description: "Hai <b>{{replyCount}}</b> respostas."
-      description_time: "Hai <b>{{replyCount}}</b> respostas cun tempo estimado de lectura de <b>{{readingTime}} minutos</b>."
+      description: "Hai <b>%{replyCount}</b> respostas."
+      description_time: "Hai <b>%{replyCount}</b> respostas cun tempo estimado de lectura de <b>%{readingTime} minutos</b>."
       enable: "Resumir este tema"
       disable: "Amosar todas as publicacións"
     deleted_filter:
@@ -760,8 +762,8 @@ gl:
       disable: "Amosar as publicacións eliminadas"
     private_message_info:
       title: "Mensaxe"
-      remove_allowed_user: "Confirmas a eliminación de {{name}} desta mensaxe?"
-      remove_allowed_group: "Confirmas a eliminación de {{name}} desta mensaxe?"
+      remove_allowed_user: "Confirmas a eliminación de %{name} desta mensaxe?"
+      remove_allowed_group: "Confirmas a eliminación de %{name} desta mensaxe?"
     email: "Correo electrónico"
     username: "Nome do usuario"
     last_seen: "Visto"
@@ -802,11 +804,11 @@ gl:
       awaiting_activation: "A túa conta está pendente de se activar, emprega a ligazón de contrasinal esquecido para emitir outro correo de activación."
       awaiting_approval: "A túa conta non foi aínda aprobada polos membros do equipo. Enviaráseche unha mensaxe cando así for."
       requires_invite: "Sentímolo pero o acceso a este foro é unicamente por convite."
-      not_activated: "Non podes acceder aínda. Antes debemos enviarche unha mensaxe a <b>{{sentTo}}</b>. Por favor, sigue as instrucións desta mensaxe para activar a túa conta."
+      not_activated: "Non podes acceder aínda. Antes debemos enviarche unha mensaxe a <b>%{sentTo}</b>. Por favor, sigue as instrucións desta mensaxe para activar a túa conta."
       not_allowed_from_ip_address: "Non podes acceder desde este enderezo IP."
       admin_not_allowed_from_ip_address: "Non podes acceder como administrador desde este enderezo IP."
       resend_activation_email: "Preme aquí para enviar outro correo de activación."
-      sent_activation_email_again: "Enviamos outro correo-e de activación a <b>{{currentEmail}}</b>. Pode tardar uns minutos en chegar; asegúrate de revisar o cartafol do spam."
+      sent_activation_email_again: "Enviamos outro correo-e de activación a <b>%{currentEmail}</b>. Pode tardar uns minutos en chegar; asegúrate de revisar o cartafol do spam."
       to_continue: "Por favor, inicia sesión"
       preferences: "Precisas iniciar sesión para cambiar as túas preferencias de usuario."
       forgot: "Non lembro os detalles da miña conta"
@@ -857,9 +859,9 @@ gl:
       drafts_offline: "borradores sen conexión"
       error:
         title_missing: "O título é obrigatorio"
-        title_too_short: "O título debe ter alomenos {{min}} caracteres"
-        title_too_long: "O título non debe ter máis de {{max}} caracteres"
-        post_length: "A publicación debe ter alomenos {{min}} caracteres"
+        title_too_short: "O título debe ter alomenos %{min} caracteres"
+        title_too_long: "O título non debe ter máis de %{max} caracteres"
+        post_length: "A publicación debe ter alomenos %{min} caracteres"
         category_missing: "Debes seleccionar unha categoría"
       save_edit: "Gardar a edición"
       reply_original: "Responder no tema orixinal"
@@ -911,12 +913,12 @@ gl:
       title: "notificacións das mencións ao teu @nome, respostas ás túas publicacións e temas, mensaxes, etc"
       none: "Non é posíbel cargar as notificacións neste intre"
       popup:
-        mentioned: '{{username}} mencionoute en "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} mencionoute en "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} citoute en "{{topic}}" - {{site_title}}'
-        replied: '{{username}} respondeute en "{{topic}}" - {{site_title}}'
-        posted: '{{username}} publicou en "{{topic}}" - {{site_title}}'
-        linked: '{{username}} ligou a túa publicación desde "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} mencionoute en "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} mencionoute en "%{topic}" - %{site_title}'
+        quoted: '%{username} citoute en "%{topic}" - %{site_title}'
+        replied: '%{username} respondeute en "%{topic}" - %{site_title}'
+        posted: '%{username} publicou en "%{topic}" - %{site_title}'
+        linked: '%{username} ligou a túa publicación desde "%{topic}" - %{site_title}'
       titles:
         watching_first_post: "novo tema"
     upload_selector:
@@ -925,9 +927,9 @@ gl:
       from_my_computer: "Desde o meu dispositivo"
       from_the_web: "Desde a web"
       remote_tip: "ligazón á imaxe"
-      remote_tip_with_attachments: "ligazón á imaxe ou ficheiro {{authorized_extensions}}"
+      remote_tip_with_attachments: "ligazón á imaxe ou ficheiro %{authorized_extensions}"
       local_tip: "seleccionar imaxes do teu dispositivo"
-      local_tip_with_attachments: "selecciona imaxes ou ficheiros do teu dispositivo {{authorized_extensions}}"
+      local_tip_with_attachments: "selecciona imaxes ou ficheiros do teu dispositivo %{authorized_extensions}"
       hint: "(tamén podes arrastrar e soltar no editor para envialos)"
       hint_for_supported_browsers: "tamén podes arrastrar e soltar ou pegar imaxes no editor"
       uploading: "Enviando"
@@ -945,10 +947,10 @@ gl:
       no_results: "Non se atoparon resultados."
       no_more_results: "Non se atoparon máis resultados."
       searching: "Buscando..."
-      post_format: "#{{post_number}} de {{username}}"
+      post_format: "#%{post_number} de %{username}"
       search_google_button: "Google"
       context:
-        user: "Buscar publicacións de @{{username}}"
+        user: "Buscar publicacións de @%{username}"
         topic: "Buscar neste tema"
         private_messages: "Buscar mensaxes"
       advanced:
@@ -980,7 +982,7 @@ gl:
         choose_new_category: "Seleccionar a nova categoría dos temas:"
         selected:
           one: "Seleccionaches <b>un</b> tema."
-          other: "Seleccionaches <b>{{count}}</b> temas."
+          other: "Seleccionaches <b>%{count}</b> temas."
       none:
         unread: "Non tes temas sen ler."
         new: "Non tes novos temas."
@@ -988,7 +990,7 @@ gl:
         posted: "Aínda non publicaches en ningún tema."
         latest: "Non hai últimos temas. Triste."
         bookmarks: "Aínda non marcaches este tema."
-        category: "Non hai temas en {{category}}."
+        category: "Non hai temas en %{category}."
         top: "Non hai temas destacados."
         educate:
           new: '<p>Aquí aparecen os teus temas novos.</p><p>De xeito predeterminado, os temas considéranse novos e amosan un indicador <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">novo</span> se se crearon nos últimos dous días.</p><p>Podes ir ás <a href="%{userPrefsUrl}">preferencias</a> para cambiar este axuste.</p>'
@@ -999,7 +1001,7 @@ gl:
         read: "Non hai máis temas lidos."
         new: "Non hai máis temas novos."
         unread: "Non hai máis temas sen ler."
-        category: "Non hai máis temas en {{category}}."
+        category: "Non hai máis temas en %{category}."
         top: "Non hai máis temas destacados."
         bookmarks: "Non hai máis temas marcados."
     topic:
@@ -1021,10 +1023,10 @@ gl:
       unread: "sen ler"
       new_topics:
         one: "Un tema novo"
-        other: "{{count}} temas novos"
+        other: "%{count} temas novos"
       unread_topics:
         one: "Un tema sen ler"
-        other: "{{count}} temas sen ler"
+        other: "%{count} temas sen ler"
       title: "Tema"
       invalid_access:
         title: "O tema é privado"
@@ -1038,22 +1040,22 @@ gl:
         description: "Sentímolo pero non foi posíbel atopar este tema. Quizais foi eliminado por un moderador."
       total_unread_posts:
         one: "Tes unha publicación sen ler neste tema"
-        other: "Tes {{count}} publicacións sen ler neste tema"
+        other: "Tes %{count} publicacións sen ler neste tema"
       unread_posts:
         one: "Tes unha publicación antiga sen ler neste tema"
-        other: "Tes {{count}} publicacións antigas sen ler neste tema"
+        other: "Tes %{count} publicacións antigas sen ler neste tema"
       new_posts:
         one: "hai unha nova publicación neste tema desde a túa última lectura"
-        other: "hai {{count}} novas publicacións neste tema desde a túa última lectura"
+        other: "hai %{count} novas publicacións neste tema desde a túa última lectura"
       likes:
         one: "hai un gústame neste tema"
-        other: "hai {{count}} gústames neste tema"
+        other: "hai %{count} gústames neste tema"
       back_to_list: "Volver á lista de temas"
       options: "Opcións de temas"
       show_links: "amosar as ligazóns cara este tema"
       toggle_information: "cambiar detalles do tema"
-      read_more_in_category: "Queres ler máis? explora outros temas en {{catLink}} ou {{latestLink}}."
-      read_more: "Queres ler máis? {{catLink}} ou {{latestLink}}."
+      read_more_in_category: "Queres ler máis? explora outros temas en %{catLink} ou %{latestLink}."
+      read_more: "Queres ler máis? %{catLink} ou %{latestLink}."
       read_more_MF: "Hai { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 sen ler</a> } other { <a href='{basePath}/unread'># sen ler</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{e} false { } other{}} <a href='{basePath}/new'>1 novo</a> topic} other { {BOTH, select, true{e} false { } other{}} <a href='{basePath}/new'># novos</a> topics} } restantes, ou {CATEGORY, select, true {explora outros temas en {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Explorar todas as categorías
       view_latest_topics: ver últimos temas
@@ -1149,25 +1151,25 @@ gl:
         success_message: "Denunciaches o tema correctamente."
       feature_topic:
         title: "Destacar este tema"
-        pin: "Facer que este tema apareza no alto da categoría {{categoryLink}} até"
-        confirm_pin: "Xa tes {{count}} temas pegados. Demasiados temas pegados pode resultar pesado para usuarios novos e anónimos. Confirmas que queres pegar outro tema nesta categoría?"
-        unpin: "Eliminar este tema da banda superior da categoría {{categoryLink}}."
-        unpin_until: "Retirar este tema do alto da {{categoryLink}} ou agardar até <strong>%{until}</strong>."
+        pin: "Facer que este tema apareza no alto da categoría %{categoryLink} até"
+        confirm_pin: "Xa tes %{count} temas pegados. Demasiados temas pegados pode resultar pesado para usuarios novos e anónimos. Confirmas que queres pegar outro tema nesta categoría?"
+        unpin: "Eliminar este tema da banda superior da categoría %{categoryLink}."
+        unpin_until: "Retirar este tema do alto da %{categoryLink} ou agardar até <strong>%{until}</strong>."
         pin_note: "Os usuarios poden despegar o tema por si mesmos."
         pin_validation: "Requírese unha data para pegar este tema."
-        not_pinned: "Non hai temas pegados en {{categoryLink}}."
+        not_pinned: "Non hai temas pegados en %{categoryLink}."
         already_pinned:
-          one: "Temas pegados actualmente en {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Temas pegados actualmente en {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Temas pegados actualmente en %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Temas pegados actualmente en %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Facer que este tema apareza no alto de todas as listas de temas até"
-        confirm_pin_globally: "Xa tes {{count}} temas pegados globalmente. Demasiados temas pegados pode resultar pesado para usuarios novos e anónimos. Confirmas que queres pegar outro tema globalmente?"
+        confirm_pin_globally: "Xa tes %{count} temas pegados globalmente. Demasiados temas pegados pode resultar pesado para usuarios novos e anónimos. Confirmas que queres pegar outro tema globalmente?"
         unpin_globally: "Eliminar este tema da banda superior de todas as listas de temas."
         unpin_globally_until: "Eliminar este tema do alto de todas as listas de temas ou agardar até <strong>%{until}</strong>."
         global_pin_note: "Os usuarios poden despegar o tema por si mesmos."
         not_pinned_globally: "Non hai temas pegados globalmente."
         already_pinned_globally:
           one: "Temas pegados globalmente neste intre: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Temas pegados globalmente neste intre: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Temas pegados globalmente neste intre: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Facer deste tema un báner que apareza na banda superior de todas as páxinas."
         remove_banner: "Eliminar o báner que aparece na banda superior de todas as páxinas."
         banner_note: "Os usuarios poden desbotar un báner se o pechan. Unicamente pode haber un tema que sexa un báner ao mesmo tempo."
@@ -1195,14 +1197,14 @@ gl:
         to_topic_username: "Introduciches un nome de usuario. Enviarémoslle unha notificación cunha ligazón convidándoo a este tema."
         to_username: "Introduce o nome do usuario da persoa que desexas convidar. Enviarémoslle unha notificación cunha ligazón convidándoa a este tema."
         email_placeholder: "name@example.com"
-        success_email: "Enviamos un convite a <b>{{emailOrUsername}}</b>. Notificarémosche cando utilice a invitación. Mira a lapela de convites na túa páxina de usuario para facer un seguimento das túas invitacións."
+        success_email: "Enviamos un convite a <b>%{emailOrUsername}</b>. Notificarémosche cando utilice a invitación. Mira a lapela de convites na túa páxina de usuario para facer un seguimento das túas invitacións."
         success_username: "Convidamos este usuario a participar neste tema."
         error: "Sentímolo, non foi posíbel convidar esta persoa. Quizais xa foi convidada? (os convites teñen un límite)"
       login_reply: "Inicia sesión para responder"
       filters:
         n_posts:
           one: "Unha publicación"
-          other: "{{count}} publicacións"
+          other: "%{count} publicacións"
         cancel: "Eliminar filtro"
       split_topic:
         title: "Mover ao tema novo"
@@ -1211,14 +1213,14 @@ gl:
         error: "Produciuse un erro movendo as publicacións ao novo tema."
         instructions:
           one: "Vas crear un novo tema e enchelo coa publicación que seleccionaches."
-          other: "Vas crear un novo tema e enchelo coas <b>{{count}}</b> publicacións que seleccionaches."
+          other: "Vas crear un novo tema e enchelo coas <b>%{count}</b> publicacións que seleccionaches."
       merge_topic:
         title: "Mover a un tema existente"
         action: "mover a un tema existente"
         error: "Produciuse un erro movendo publicacións nese tema."
         instructions:
           one: "Selecciona o tema ao que queres mover esta publicación."
-          other: "Selecciona o tema ao que queres mover estas <b>{{count}}</b> publicacións."
+          other: "Selecciona o tema ao que queres mover estas <b>%{count}</b> publicacións."
       move_to_new_message:
         radio_label: "Nova mensaxe"
       change_owner:
@@ -1232,7 +1234,7 @@ gl:
         instructions: "Selecciona a marca data/hora para o tema. As publicacións do tema actualizaranse para ter a mesma diferenza de tempo."
       multi_select:
         select: "seleccionar"
-        selected: "seleccionados ({{count}})"
+        selected: "seleccionados (%{count})"
         select_post:
           label: "seleccionar"
         select_replies:
@@ -1243,13 +1245,13 @@ gl:
         deselect_all: deseleccionar todo
         description:
           one: Seleccionaches <b>unha</b> publicación.
-          other: "Seleccionaches <b>{{count}}</b> publicacións."
+          other: "Seleccionaches <b>%{count}</b> publicacións."
     post:
       edit_reason: "Razón:"
-      post_number: "publicación {{number}}"
+      post_number: "publicación %{number}"
       last_edited_on: "última edición da publicación"
       reply_as_new_topic: "Responder como tema ligado"
-      continue_discussion: "Continuar a discusión de {{postLink}}:"
+      continue_discussion: "Continuar a discusión de %{postLink}:"
       follow_quote: "ir á publicación citada"
       show_full: "Amosar a publicación completa"
       deleted_by_author:
@@ -1258,18 +1260,18 @@ gl:
       expand_collapse: "ampliar/reducir"
       gap:
         one: "ver unha resposta oculta"
-        other: "ver {{count}} respostas ocultas"
+        other: "ver %{count} respostas ocultas"
       unread: "Publicación sen ler"
       has_replies:
-        one: "{{count}} resposta"
-        other: "{{count}} respostas"
+        one: "%{count} resposta"
+        other: "%{count} respostas"
       has_likes_title:
         one: "A unha persoa gustoulle esta publicación"
-        other: "A {{count}} persoas gustoulles esta publicación"
+        other: "A %{count} persoas gustoulles esta publicación"
       has_likes_title_only_you: "gustouche esta publicación"
       has_likes_title_you:
         one: "A ti e a outro máis gustouvos esta publicación"
-        other: "A ti e a {{count}} persoas máis gustouvos esta publicación"
+        other: "A ti e a %{count} persoas máis gustouvos esta publicación"
       errors:
         create: "Sentímolo pero produciuse un erro creando a publicación. Téntao de novo."
         edit: "Sentímolo pero produciuse un erro editando a publicación. Téntao de novo."
@@ -1419,6 +1421,7 @@ gl:
       search_priority:
         options:
           normal: "Normal"
+          ignore: "Ignorar"
       sort_options:
         likes: "Gústames"
         views: "Vistas"
@@ -1482,7 +1485,7 @@ gl:
       unlisted:
         help: "Este tema non está listado. Non se presentará nas listas de temas e só estará accesíbel vía ligazón directa"
     posts: "Publicacións"
-    posts_long: "hai {{number}} publicacións neste tema"
+    posts_long: "hai %{number} publicacións neste tema"
     posts_likes_MF: |
       Este tema ten {count, plural, one {1 resposta} other {# respostas}} {ratio, select,
       low {cun alto índice de gústames}
@@ -1500,14 +1503,14 @@ gl:
     likes_lowercase:
       one: "gústame"
       other: "gústames"
-    likes_long: "hai {{number}} gústames neste tema"
+    likes_long: "hai %{number} gústames neste tema"
     users: "Usuarios"
     users_lowercase:
       one: "usuario"
       other: "usuarios"
     category_title: "Categoría"
     history: "Historial"
-    changed_by: "por {{author}}"
+    changed_by: "por %{author}"
     raw_email:
       not_available: "Non dispoñíbel."
     categories_list: "Lista de categorías"
@@ -1518,33 +1521,33 @@ gl:
         title: "Últimos"
         title_with_count:
           one: "Último (%{count})"
-          other: "({{count}}) últimos"
+          other: "(%{count}) últimos"
         help: "temas con publicacións recentes"
       read:
         title: "Lidos"
         help: "temas que liches, partindo da última lectura"
       categories:
         title: "Categorías"
-        title_in: "Categoría - {{categoryName}}"
+        title_in: "Categoría - %{categoryName}"
         help: "todos os temas agrupados por categoría"
       unread:
         title: "Sen ler"
         title_with_count:
           one: "Un sen ler"
-          other: "({{count}}) sen ler"
+          other: "(%{count}) sen ler"
         help: "temas con publicacións sen ler que estás vendo ou seguindo"
         lower_title_with_count:
           one: "Unha sen ler"
-          other: "{{count}} sen ler"
+          other: "%{count} sen ler"
       new:
         lower_title_with_count:
           one: "Un novo"
-          other: "{{count}} novos"
+          other: "%{count} novos"
         lower_title: "novo"
         title: "Novo"
         title_with_count:
           one: "Un novo"
-          other: "({{count}}) novos"
+          other: "(%{count}) novos"
         help: "temas creados nos últimos días"
       posted:
         title: "As miñas publicacións"
@@ -1553,11 +1556,11 @@ gl:
         title: "Marcadores"
         help: "temas que marcaches"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "últimos temas na categoría {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "últimos temas na categoría %{categoryName}"
       top:
         title: "Destacados"
         help: "os temas máis activos no último ano, mes, semana ou día"
@@ -1826,10 +1829,10 @@ gl:
           label: "Enviar"
           title: "Subir unha copia de seguranza a esta instancia"
           uploading: "Enviando..."
-          error: "Produciuse un erro durante o envío de «{{filename}}»: {{message}}"
+          error: "Produciuse un erro durante o envío de «%{filename}»: %{message}"
         operations:
           is_running: "Estase executando unha operación..."
-          failed: "Produciuse un fallo {{operation}} . Revisa os rexistros."
+          failed: "Produciuse un fallo %{operation} . Revisa os rexistros."
           cancel:
             label: "Cancelar"
             title: "Cancelar a operación actual"
@@ -2141,8 +2144,8 @@ gl:
           title: "Amosar o enderezo de correo-e deste usuario"
           text: "Amosar"
       user:
-        suspend_failed: "Algo fallou rexeitando este usuario {{error}}"
-        unsuspend_failed: "Algo foi mal levantando a suspensión deste usuario {{error}}"
+        suspend_failed: "Algo fallou rexeitando este usuario %{error}"
+        unsuspend_failed: "Algo foi mal levantando a suspensión deste usuario %{error}"
         suspend_duration: "Canto tempo estará suspendido o usuario?"
         suspend_reason_label: "Cal é o motivo da suspensión? Este texto <b>será visíbel para todo o mundo</b> na páxina do perfil deste usuario e amosaráselle ao usuario cando tente iniciar sesión. Procura ser breve."
         suspend_reason: "Razón"
@@ -2406,6 +2409,7 @@ gl:
         title: "Emoji"
         help: "Engade novo emoji que estará dispoñíbel para todos. (Suxestión: arrastra e solta múltiples ficheiros dunha vez)"
         add: "Engadir novo Emoji"
+        uploading: "Actualizando..."
         name: "Nome"
         group: "Grupo"
         image: "Imaxe"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 4e916f971f..f4aa2c933a 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -25,8 +25,8 @@ he:
             mb: מ״ב
             tb: ט״ב
       short:
-        thousands: "{{number}} אלף"
-        millions: "{{number}} מיליון"
+        thousands: "%{number} אלף"
+        millions: "%{number} מיליון"
     dates:
       time: "h:mm a"
       time_with_zone: "HH:mm (z)"
@@ -273,13 +273,13 @@ he:
     weekly: "שבועית"
     every_month: "כל חודש"
     every_six_months: "כל שישה חודשים"
-    max_of_count: "{{count}} לכל היותר"
+    max_of_count: "%{count} לכל היותר"
     alternation: "או"
     character_count:
       one: "תו אחד"
-      two: "{{count}} תווים"
-      many: "{{count}} תווים"
-      other: "{{count}} תווים"
+      two: "%{count} תווים"
+      many: "%{count} תווים"
+      other: "%{count} תווים"
     related_messages:
       title: "הודעות קשורות"
       see_all: 'להציג את <a href="%{path}">כל ההודעות</a> מאת ‎@%{username}‎…'
@@ -354,20 +354,20 @@ he:
         yes_value: "כן, לנטוש"
         no_value: "לא, שמור"
     topic_count_latest:
-      one: "הצגת נושא {{count}} חדש או עדכני"
-      two: "הצגת {{count}} נושאים חדשים או עדכניים"
-      many: "הצגת {{count}} נושאים חדשים או עדכניים"
-      other: "הצגת {{count}} נושאים חדשים או עדכניים"
+      one: "הצגת נושא %{count} חדש או עדכני"
+      two: "הצגת %{count} נושאים חדשים או עדכניים"
+      many: "הצגת %{count} נושאים חדשים או עדכניים"
+      other: "הצגת %{count} נושאים חדשים או עדכניים"
     topic_count_unread:
-      one: "הצגת נושא {{count}} שלא נקרא"
-      two: "הצגת {{count}} נושאים שלא נקראו"
-      many: "הצגת {{count}} נושאים שלא נקראו"
-      other: "הצגת {{count}} נושאים שלא נקראו"
+      one: "הצגת נושא %{count} שלא נקרא"
+      two: "הצגת %{count} נושאים שלא נקראו"
+      many: "הצגת %{count} נושאים שלא נקראו"
+      other: "הצגת %{count} נושאים שלא נקראו"
     topic_count_new:
-      one: "הצגת נושא {{count}} חדש"
-      two: "הצגת {{count}} נושאים חדשים"
-      many: "הצגת {{count}} נושאים חדשים"
-      other: "הצגת {{count}} נושאים חדשים"
+      one: "הצגת נושא %{count} חדש"
+      two: "הצגת %{count} נושאים חדשים"
+      many: "הצגת %{count} נושאים חדשים"
+      other: "הצגת %{count} נושאים חדשים"
     preview: "תצוגה מקדימה"
     cancel: "ביטול"
     save: "שמירת השינויים"
@@ -375,7 +375,7 @@ he:
     saved: "נשמר!"
     upload: "העלאה"
     uploading: "בהליכי העלאה..."
-    uploading_filename: "מעלה: {{filename}}..."
+    uploading_filename: "מעלה: %{filename}..."
     clipboard: "לוח"
     uploaded: "הועלה!"
     pasting: "מדביק..."
@@ -429,7 +429,7 @@ he:
         optional: "באפשרותך לדרוש את הפריט כדי למנוע מאחרים לסקור אותו."
         required: "עליך לדרוש פריטים לפני שיתאפשר לך לסקור אותם."
         claimed_by_you: "דרשת את הפריט הזה ועכשיו יתאפשר לך לסקור אותו."
-        claimed_by_other: "הפריט הזה זמין לסריקה רק על ידי <b>{{username}}</b>."
+        claimed_by_other: "הפריט הזה זמין לסריקה רק על ידי <b>%{username}</b>."
       claim:
         title: "דרישת פריט זה"
       unclaim:
@@ -449,9 +449,9 @@ he:
       view_pending: "הצגת ממתינים"
       topic_has_pending:
         one: "לנושא זה יש פוסט <b>אחד</b> שממתין לאישור"
-        two: "לנושא זה יש <b>{{count}}</b> פוסטים שממתינים לאישור"
-        many: "לנושא זה יש <b>{{count}}</b> פוסטים שממתינים לאישור"
-        other: "לנושא זה יש <b>{{count}}</b> פוסטים שממתינים לאישור"
+        two: "לנושא זה יש <b>%{count}</b> פוסטים שממתינים לאישור"
+        many: "לנושא זה יש <b>%{count}</b> פוסטים שממתינים לאישור"
+        other: "לנושא זה יש <b>%{count}</b> פוסטים שממתינים לאישור"
       title: "סקירה"
       topic: "נושא:"
       filtered_topic: "סיננת לתוכן שממתין לסקירה בנושא מסוים."
@@ -468,25 +468,25 @@ he:
         fields: "שדות"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} (דגל אחד סה״כ)"
-          two: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} דגלים סה״כ)"
-          many: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} דגלים סה״כ)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} דגלים סה״כ)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (דגל אחד סה״כ)"
+          two: "%{agreed}, %{disagreed}, %{ignored} (%{count} דגלים סה״כ)"
+          many: "%{agreed}, %{disagreed}, %{ignored} (%{count} דגלים סה״כ)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} דגלים סה״כ)"
         agreed:
-          one: "{{count}}% מסכים"
-          two: "{{count}}% מסכימים"
-          many: "{{count}}% מסכימים"
-          other: "{{count}}% מסכימים"
+          one: "%{count}% מסכים"
+          two: "%{count}% מסכימים"
+          many: "%{count}% מסכימים"
+          other: "%{count}% מסכימים"
         disagreed:
-          one: "{{count}}% חולק"
-          two: "{{count}}% חולקים"
-          many: "{{count}}% חולקים"
-          other: "{{count}}% חולקים"
+          one: "%{count}% חולק"
+          two: "%{count}% חולקים"
+          many: "%{count}% חולקים"
+          other: "%{count}% חולקים"
         ignored:
-          one: "{{count}}% מתעלם"
-          two: "{{count}}% מתעלמים"
-          many: "{{count}}% מתעלמים"
-          other: "{{count}}% מתעלמים"
+          one: "%{count}% מתעלם"
+          two: "%{count}% מתעלמים"
+          many: "%{count}% מתעלמים"
+          other: "%{count}% מתעלמים"
       topics:
         topic: "נושא"
         reviewable_count: "ספירה"
@@ -496,14 +496,14 @@ he:
         details: "פרטים"
         unique_users:
           one: "משתמש אחד"
-          two: "{{count}} משתמשים"
-          many: "{{count}} משתמשים"
-          other: "{{count}} משתמשים"
+          two: "%{count} משתמשים"
+          many: "%{count} משתמשים"
+          other: "%{count} משתמשים"
       replies:
         one: "תגובה אחת"
-        two: "{{count}} תגובות"
-        many: "{{count}} תגובות"
-        other: "{{count}} תגובות"
+        two: "%{count} תגובות"
+        many: "%{count} תגובות"
+        other: "%{count} תגובות"
       edit: "עריכה"
       save: "שמירה"
       cancel: "ביטול"
@@ -567,24 +567,24 @@ he:
         description: "הפוסט התקבל אך הוא נתון לאישור מפקח בטרם הצגתו. נא להתאזר בסבלנות."
         pending_posts:
           one: "יש לך פוסט <strong>אחד</strong> ממתין."
-          two: "יש לך <strong>{{count}}</strong> פוסטים ממתינים."
-          many: "יש לך <strong>{{count}}</strong> פוסטים ממתינים."
-          other: "יש לך <strong>{{count}}</strong> פוסטים ממתינים."
+          two: "יש לך <strong>%{count}</strong> פוסטים ממתינים."
+          many: "יש לך <strong>%{count}</strong> פוסטים ממתינים."
+          other: "יש לך <strong>%{count}</strong> פוסטים ממתינים."
         ok: "אישור"
     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>"
-      user_replied_to_post: "התקבלה תגובה מאת <a href='{{userUrl}}'>{{user}}</a> על: <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>הגבת</a> על: <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> הגיב <a href='{{topicUrl}}'>לנושא הזה</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>הגבת</a> <a href='{{topicUrl}}'>לנושא הזה</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> הזכיר/ה את <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> הזכיר/ה <a href='{{user2Url}}'>אותך</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>את/ה</a> הזכרת את <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "פורסם על ידי <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "פורסם על <a href='{{userUrl}}'>ידך</a>"
-      sent_by_user: "נשלח על ידי <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "נשלח <a href='{{userUrl}}'>על ידך</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> פרסם <a href='%{topicUrl}'>את הנושא</a>"
+      you_posted_topic: "<a href='%{userUrl}'>את/ה</a> פרסמת <a href='%{topicUrl}'>את הנושא</a>"
+      user_replied_to_post: "התקבלה תגובה מאת <a href='%{userUrl}'>%{user}</a> על: <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>הגבת</a> על: <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> הגיב <a href='%{topicUrl}'>לנושא הזה</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>הגבת</a> <a href='%{topicUrl}'>לנושא הזה</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> הזכיר/ה את <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> הזכיר/ה <a href='%{user2Url}'>אותך</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>את/ה</a> הזכרת את <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "פורסם על ידי <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "פורסם על <a href='%{userUrl}'>ידך</a>"
+      sent_by_user: "נשלח על ידי <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "נשלח <a href='%{userUrl}'>על ידך</a>"
     directory:
       filter_name: "סינון לפי שם משתמש"
       title: "משתמשים"
@@ -823,7 +823,7 @@ he:
       username: "שם משתמש"
       trust_level: "דרגת-אמון"
       read_time: "זמן צפייה"
-      topics_entered: "כניסה לנושאים"
+      topics_entered: "כניסות לנושאים"
       post_count: "# פוסטים"
       confirm_delete_other_accounts: "להסיר חשבונות אלו?"
       powered_by: "משתמש <a href='https://maxmind.com'>MaxMindDB</a>"
@@ -832,7 +832,7 @@ he:
       none: "(בחרו אפשרות)"
       required: 'נא למלא ערך עבור „%{name}”'
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "פרופיל"
       mute: "השתקה"
       edit: "עריכת העדפות"
@@ -908,12 +908,12 @@ he:
       enable_defer: "הפעלת דחייה לאחר כך כדי לסמן נושאים כלא נקראו"
       change: "שנה"
       featured_topic: "נושא מומלץ"
-      moderator: "ל־{{user}} יש תפקיד פיקוח"
-      admin: "{{user}} הוא מנהל מערכת"
+      moderator: "ל־%{user} יש תפקיד פיקוח"
+      admin: "%{user} הוא מנהל מערכת"
       moderator_tooltip: "משתמש זה הוא מפקח"
       admin_tooltip: "משתמש זה הינו אדמיניסטרטור"
       silenced_tooltip: "משתמש זה מושתק"
-      suspended_notice: "המשתמש הזה מושעה עד לתאריך: {{date}}."
+      suspended_notice: "המשתמש הזה מושעה עד לתאריך: %{date}."
       suspended_permanently: "משתמש זה מושעה."
       suspended_reason: "הסיבה: "
       github_profile: "GitHub"
@@ -926,7 +926,7 @@ he:
           נושאים וקטגוריות שהושתקו לא יופיעו בהודעות דוא״ל אלו.
         individual: "לשלוח לי דוא״ל על כל פוסט חדש"
         individual_no_echo: "לשלוח לי דוא״ל על כל פוסט חדש מלבד שלי"
-        many_per_day: "לשלוח לי דוא״ל על כל פוסט חדש (בערך {{dailyEmailEstimate}} ביום)"
+        many_per_day: "לשלוח לי דוא״ל על כל פוסט חדש (בערך %{dailyEmailEstimate} ביום)"
         few_per_day: "לשלוח לי דוא״ל על כל פוסט חדש (בערך 2 ביום)"
         warning: "מצב רשימת תפוצה מופעל. מצב זה משבית את הגדרות ההתראות בדוא״ל."
       tag_settings: "תגיות"
@@ -956,11 +956,11 @@ he:
       admin_delete: "מחיקה"
       users: "משתמשים"
       muted_users: "מושתק"
-      muted_users_instructions: "להשבית כל התראה ממשתמשים אלו"
+      muted_users_instructions: "הדחקת כל ההתראות וההודעות הפרטיות מהמשתמשים האלה."
       ignored_users: "זכה להתעלמות"
-      ignored_users_instructions: "הדחקת כל הפוסטים וההתראות מהמשתמשים האלה."
+      ignored_users_instructions: "הדחקת כל הפוסטים, ההתראות וההודעות הפרטיות מהמשתמשים האלה."
       tracked_topics_link: "הצגה"
-      automatically_unpin_topics: "בטל נעיצת נושאים באופן אוטומטי כאשר אני מגיע/ה לתחתית."
+      automatically_unpin_topics: "ביטול נעיצה אוטומטית של נושאים עם הגעה לתחתית."
       apps: "אפליקציות"
       revoke_access: "שלילת גישה"
       undo_revoke_access: "ביטול שלילת גישה"
@@ -1014,12 +1014,12 @@ he:
         disable: "בטל"
         enable: "הפעל"
         enable_long: "הפעל קודי גיבוי"
-        manage: "ניהול קודים כגיבוי. נותרו לרשותך <strong>{{count}}</strong> קודים כגיבוי."
+        manage: "ניהול קודים כגיבוי. נותרו לרשותך <strong>%{count}</strong> קודים כגיבוי."
         copy_to_clipboard: "העתקה ללוח"
         copy_to_clipboard_error: "שגיאה בהעתקת מידע ללוח"
         copied_to_clipboard: "הועתק ללוח"
         download_backup_codes: "הורדת קודים לגיבוי"
-        remaining_codes: "יש לך <strong>{{count}}</strong> קודי גיבוי נותרים"
+        remaining_codes: "יש לך <strong>%{count}</strong> קודי גיבוי נותרים"
         use: "להשתמש בקוד גיבוי"
         enable_prerequisites: "עליך להפעיל אימות דו־שלבי עיקרי בטרם יצירת קודים כגיבוי."
         codes:
@@ -1084,10 +1084,10 @@ he:
         success_staff: "שלחנו דואר אלקטרוני לכתובת הדואר הזו. אנא עיקבו אחרי הוראות האישור."
       change_avatar:
         title: "שינוי תמונת הפרופיל"
-        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, מבוסס על"
-        gravatar_title: "החלפת הדמות שלך באתר {{gravatarName}}"
-        gravatar_failed: "לא הצלחנו למצוא {{gravatarName}} עם כתובת הדוא״ל הזו."
-        refresh_gravatar_title: "רענון ה־{{gravatarName}} שלך"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, מבוסס על"
+        gravatar_title: "החלפת הדמות שלך באתר %{gravatarName}"
+        gravatar_failed: "לא הצלחנו למצוא %{gravatarName} עם כתובת הדוא״ל הזו."
+        refresh_gravatar_title: "רענון ה־%{gravatarName} שלך"
         letter_based: "תמונת פרופיל משובצת מהמערכת"
         uploaded_avatar: "תמונה אישית"
         uploaded_avatar_empty: "הוסיפו תמונה אישית"
@@ -1112,13 +1112,13 @@ he:
         ok: "נשלח אליכם דואר אלקטרוני לאישור"
         required: "נא למלא כתובת דוא״ל"
         invalid: "בבקשה הכניסו כתובת דואר אלקטרוני תקינה"
-        authenticated: "כתובת הדואר האלקטרוני שלך אושרה על ידי {{provider}}"
+        authenticated: "כתובת הדואר האלקטרוני שלך אושרה על ידי %{provider}"
         frequency_immediately: "נשלח לך הודעה בדוא״ל מיידית אם טרם קראת את מה ששלחנו לך קודם."
         frequency:
           one: "נשלח לך הודעה בדוא״ל רק אם לא הופעת בדקה האחרונה."
-          two: "נשלח לך הודעה בדוא״ל רק אם לא הופעת ב־{{count}} הדקות האחרונות."
-          many: "נשלח לך הודעה בדוא״ל רק אם לא הופעת ב־{{count}} הדקות האחרונות."
-          other: "נשלח לך הודעה בדוא״ל רק אם לא הופעת ב־{{count}} הדקות האחרונות."
+          two: "נשלח לך הודעה בדוא״ל רק אם לא הופעת ב־%{count} הדקות האחרונות."
+          many: "נשלח לך הודעה בדוא״ל רק אם לא הופעת ב־%{count} הדקות האחרונות."
+          other: "נשלח לך הודעה בדוא״ל רק אם לא הופעת ב־%{count} הדקות האחרונות."
       associated_accounts:
         title: "חשבונות מקושרים"
         connect: "התחבר"
@@ -1139,9 +1139,9 @@ he:
       username:
         title: "שם משתמש/ת"
         instructions: "ייחודי, ללא רווחים, קצר"
-        short_instructions: "אנשים יכולים לאזכר אותך כ @{{username}}"
+        short_instructions: "אנשים יכולים לאזכר אותך כ @%{username}"
         available: "שם המשתמש שלך פנוי"
-        not_available: "לא זמין. נסו {{suggestion}}?"
+        not_available: "לא זמין. נסו %{suggestion}?"
         not_available_no_suggestion: "לא זמין"
         too_short: "שם המשתמש שלך קצר מידי"
         too_long: "שם המשתמש שלך ארוך מידי"
@@ -1165,11 +1165,11 @@ he:
         log_out_all: "להוציא את כולם"
         active: "פעיל עכשיו"
         not_you: "לא אתה?"
-        show_all: "הצג הכל ({{count}})"
+        show_all: "הצג הכל (%{count})"
         show_few: "הצג פחות"
         was_this_you: "האם זה היית אתה?"
         was_this_you_description: "אם לא נכנסת למערכת, אנו ממליצים לך לשנות את ססמתך ולהוציא את המשתמש בכל מקום שניתן."
-        browser_and_device: "{{browser}} ב{{device}}"
+        browser_and_device: "%{browser} ב%{device}"
         secure_account: "אבטח את החשבון שלי"
         latest_post: "פרסמת לאחרונה..."
       last_posted: "פוסט אחרון"
@@ -1249,22 +1249,22 @@ he:
         none: "אין הזמנות להצגה"
         truncated:
           one: "מראה את ההזמנה הראשונה."
-          two: "מראה את {{count}} ההזמנות הראשונות."
-          many: "מראה את {{count}} ההזמנות הראשונות."
-          other: "מראה את {{count}} ההזמנות הראשונות."
+          two: "מראה את %{count} ההזמנות הראשונות."
+          many: "מראה את %{count} ההזמנות הראשונות."
+          other: "מראה את %{count} ההזמנות הראשונות."
         redeemed: "הזמנות נוצלו"
         redeemed_tab: "נענו"
-        redeemed_tab_with_count: "נוצלו ({{count}})"
+        redeemed_tab_with_count: "נוצלו (%{count})"
         redeemed_at: "נפדו ב"
         pending: "הזמנות ממתינות"
         pending_tab: "ממתין"
-        pending_tab_with_count: "ממתינות ({{count}})"
+        pending_tab_with_count: "ממתינות (%{count})"
         topics_entered: "נושאים נצפו"
         posts_read_count: "פוסטים נקראו"
         expired: "פג תוקף ההזמנה."
         rescind: "הסרה"
         rescinded: "הזמנה הוסרה"
-        rescind_all: "הסרת כל ההזמנות שתוקפן פג"
+        rescind_all: "הסרת הזמנות שתוקפן פג"
         rescinded_all: "כל ההזמנות שתוקפן פג הוסרו!"
         rescind_all_confirm: "להסיר את כל ההזמנות שתוקפן פג?"
         reinvite: "משלוח חוזר של הזמנה"
@@ -1275,13 +1275,29 @@ he:
         time_read: "זמן קריאה"
         days_visited: "מספר ימי ביקור"
         account_age_days: "גיל החשבון בימים"
-        create: "שליחת הזמנה"
+        source: "הזמנה דרך"
+        links_tab: "קישורים"
+        links_tab_with_count: "קישורים (%{count})"
+        link_url: "קישור"
+        link_created_at: "נוצר"
+        link_groups: קבוצות
+        link_expires_at: תפוגה
+        create: "שלח הזמנה"
+        copy_link: "העתקת קישור"
         generate_link: "העתקת קישור הזמנה"
         link_generated: "קישור הזמנה יוצר בהצלחה!"
         valid_for: "קישור ההזמנה תקף רק לכתובת דוא״ל זו: %{email}"
+        single_user: "משתמש בודד"
+        multiple_user: "מגוון משתמשים"
+        invite_link:
+          title: "קישור הזמנה"
+          success: "קישור הזמנה יוצר בהצלחה!"
+          error: "אירעה שגיאה ביצירת קישור הזמנה."
+          max_redemptions_allowed_label: "לכמה אנשים מותר להירשם באמצעות הקישור הזה?"
+          expires_at: "מתי תוקף קישור ההזמנה יפוג?"
         bulk_invite:
           none: "עדיין לא הזמנתם לכאן אף אחד. שילחו הזמנות אישיות, או הזמינו הרבה אנשים ביחד על ידי <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>העלאת קובץ CSV</a>."
-          text: "הזמנה קבוצתית מקובץ"
+          text: "הזמנה כמותית"
           success: "העלאת הקובץ החלה בהצלחה, תקבלו התראה באמצעות מסר כאשר התהליך יושלם."
           error: "מצטערים, לקובץ צריך להיות פורמט CSV"
           confirmation_message: "פעולה זו תשלח הזמנות בדוא״ל לכל מי שבקובץ שהועלה."
@@ -1389,7 +1405,7 @@ he:
       desc:
         network: "נא לבדוק את החיבור שלך."
         network_fixed: "נראה שזה חזר לעבוד."
-        server: "קוד שגיאה: {{status}}"
+        server: "קוד שגיאה: %{status}"
         forbidden: "אינכם רשאים לצפות בזה."
         not_found: "אופס, ניסינו לטעון עמוד שאיננו קיים."
         unknown: "משהו השתבש."
@@ -1424,11 +1440,11 @@ he:
     all_time: "סך הכל"
     all_time_desc: "כל הנושאים שנוצרו"
     year: "שנה"
-    year_desc: "נושאים שפורסמו ב-365 הימים האחרונים"
+    year_desc: "נושאים שפורסמו ב־365 הימים האחרונים"
     month: "חודש"
-    month_desc: "נושאים שפורסמו ב-30 הימים האחרונים"
+    month_desc: "נושאים שפורסמו ב־30 הימים האחרונים"
     week: "שבוע"
-    week_desc: "נושאים שפורסמו ב-7 הימים האחרונים"
+    week_desc: "נושאים שפורסמו ב־7 הימים האחרונים"
     day: "יום"
     first_post: פוסט ראשון
     mute: השתק
@@ -1454,8 +1470,8 @@ he:
       value_prop: "בעת יצירת החשבון, אנו זוכרים במדויק מה קראת, לכן תמיד יתאפשר לך לחזור להיכן שהפסקת. נוסף על כך, יישלחו אליך התראות, כאן ודרך דוא״ל כשמתקבלת תגובה על משהו שכתבת. יש לך גם אפשרות לסמן לייק פוסטים שאהבת כדי להוסיף ולהפיץ אהבה. :heartpulse:"
     summary:
       enabled_description: "אתם צופים בסיכום נושא זה: הפוסטים המעניינים ביותר כפי שסומנו על ידי הקהילה."
-      description: "ישנן <b>{{replyCount}}</b> תגובות."
-      description_time: "יש <b>{{replyCount}}</b> תגובות עם זמן קריאה מוערך של <b>{{readingTime}} דקות</b>."
+      description: "ישנן <b>%{replyCount}</b> תגובות."
+      description_time: "יש <b>%{replyCount}</b> תגובות עם זמן קריאה מוערך של <b>%{readingTime} דקות</b>."
       enable: "סכם נושא זה"
       disable: "הצג את כל הפוסטים"
     deleted_filter:
@@ -1468,8 +1484,8 @@ he:
       invite: "הזמינו אחרים..."
       edit: "הוספה או הסרה…"
       leave_message: "האם אתה באמת רוצה לעזוב את ההודעה הזו?"
-      remove_allowed_user: "להסיר את {{name}} מהודעה זו?"
-      remove_allowed_group: "להסיר את {{name}} מהודעה זו?"
+      remove_allowed_user: "להסיר את %{name} מהודעה זו?"
+      remove_allowed_group: "להסיר את %{name} מהודעה זו?"
     email: "דוא״ל"
     username: "שם משתמש"
     last_seen: "נצפה"
@@ -1478,7 +1494,7 @@ he:
     trust_level: "דרגת אמון"
     search_hint: "שם משתמש, דוא״ל או כתובת IP"
     create_account:
-      disclaimer: "עצם הרשמתך מביעה את הסכמתך ל<a href='{{privacy_link}}' target='blank'>מדיניות הפרטיות</a> ול<a href='{{tos_link}}' target='blank'>תנאי השירות</a>."
+      disclaimer: "עצם הרשמתך מביעה את הסכמתך ל<a href='%{privacy_link}' target='blank'>מדיניות הפרטיות</a> ול<a href='%{tos_link}' target='blank'>תנאי השירות</a>."
       title: "יצירת חשבון חדש"
       failed: "משהו לא בסדר, אולי כבר קיימת כתובת דואר אלקטרוני כזו. נסו את קישור שכחתי סיסמה."
     forgot_password:
@@ -1538,7 +1554,7 @@ he:
       awaiting_activation: "החשבון שלך ממתין להפעלה, נא להשתמש בקישור „שכחתי ססמה” כדי לשלוח הודעת הפעלה נוספת."
       awaiting_approval: "החשבון שלך טרם אושר על ידי חבר סגל. תישלח אליך הודעה בדוא״ל כשהוא יאושר."
       requires_invite: "סליחה, גישה לפורום הזה היא בהזמנה בלבד."
-      not_activated: "אינך יכול להתחבר עדיין. שלחנו לך דואר אלקטרוני להפעלת החשבון לכתובת: <b>{{sentTo}}</b>. יש לעקוב אחר ההוראות בדואר כדי להפעיל את החשבון."
+      not_activated: "אינך יכול להתחבר עדיין. שלחנו לך דואר אלקטרוני להפעלת החשבון לכתובת: <b>%{sentTo}</b>. יש לעקוב אחר ההוראות בדואר כדי להפעיל את החשבון."
       not_allowed_from_ip_address: "הכניסה מכתובת IP זו אסורה."
       admin_not_allowed_from_ip_address: "הכניסה לניהול מכתובת IP זו אסורה."
       resend_activation_email: "יש ללחוץ כאן לשליחת דואר אלקטרוני חוזר להפעלת החשבון."
@@ -1547,7 +1563,7 @@ he:
       change_email: "שינוי כתובת דוא״ל"
       provide_new_email: "נא לספק כתובת חדשה ואנו נשלח מחדש בדוא״ל את הודעת האישור שלך."
       submit_new_email: "עדכון כתובת דוא״ל"
-      sent_activation_email_again: "שלחנו לך הודעת דואר אלקטרוני נוספת להפעלת החשבון לכתובת <b>{{currentEmail}}</b>. זה יכול לקחת כמה דקות עד שיגיע, לא לשכוח לבדוק את תיבת דואר הזבל."
+      sent_activation_email_again: "שלחנו לך הודעת דואר אלקטרוני נוספת להפעלת החשבון לכתובת <b>%{currentEmail}</b>. זה יכול לקחת כמה דקות עד שיגיע, לא לשכוח לבדוק את תיבת דואר הזבל."
       sent_activation_email_again_generic: "שלחנו הודעת הפעלה נוספת בדוא״ל. ייתכן שיהיה עליך להמתין מספר דקות להגעתה. מוטב לבדוק גם את תיקיית הספאם שלך."
       to_continue: "נא להיכנס"
       preferences: "כדי לשנות את העדפות המשתמש ראשית יש להיכנס למערכת."
@@ -1611,24 +1627,24 @@ he:
     conditional_loading_section:
       loading: בטעינה…
     category_row:
-      topic_count: "{{count}} נושאים בקטגוריה הזו"
+      topic_count: "%{count} נושאים בקטגוריה הזו"
     select_kit:
       default_header_text: בחירה…
       no_content: לא נמצאו התאמות
       filter_placeholder: חיפוש...
       filter_placeholder_with_any: חיפוש או יצירה…
-      create: "יצירה: ‚{{content}}’"
+      create: "יצירה: ‚%{content}’"
       max_content_reached:
         one: "ניתן לבחור פריט אחד."
-        two: "ניתן לבחור {{count}} פריטים."
-        many: "ניתן לבחור {{count}} פריטים."
-        other: "ניתן לבחור {{count}} פריטים."
+        two: "ניתן לבחור %{count} פריטים."
+        many: "ניתן לבחור %{count} פריטים."
+        other: "ניתן לבחור %{count} פריטים."
       min_content_not_reached:
         one: "נא לבחור בפריט אחד לפחות."
-        two: "נא לבחור ב־{{count}} פריטים לפחות."
-        many: "נא לבחור ב־{{count}} פריטים לפחות."
-        other: "נא לבחור ב־{{count}} פריטים לפחות."
-      invalid_selection_length: "אורך הבחירה חייב להיות {{count}} תווים לפחות."
+        two: "נא לבחור ב־%{count} פריטים לפחות."
+        many: "נא לבחור ב־%{count} פריטים לפחות."
+        other: "נא לבחור ב־%{count} פריטים לפחות."
+      invalid_selection_length: "אורך הבחירה חייב להיות %{count} תווים לפחות."
       components:
         categories_admin_dropdown:
           title: "תפריט קטגוריות ניהול נגלל"
@@ -1658,7 +1674,7 @@ he:
       default: אמוג׳ים מותאמים
     shared_drafts:
       title: "טיוטות משותפות"
-      notice: "הנושא הזה ניתן לצפייה עבור מי שיכולים לצפות בקטגורית <b>{{category}}</b>."
+      notice: "הנושא הזה ניתן לצפייה עבור מי שיכולים לצפות בקטגורית <b>%{category}</b>."
       destination_category: "קטגוריית יעד"
       publish: "פרסום טיוטה משותפת"
       confirm_publish: "לפרסם את הטיוטה הזו?"
@@ -1678,26 +1694,26 @@ he:
       similar_topics: "הנושא שלך דומה ל..."
       drafts_offline: "טיוטות מנותקות"
       edit_conflict: "עריכת סתירה"
-      group_mentioned_limit: "<b>זהירות!</b> ציינת <a href='{{group_link}}'>{{group}}</a>, אך לקבוצה זו יש יותר חברים משהוגדר למנהל המערכת הגבלה של עד {{max}} משתמשים. אף אחד לא יקבל הודעה"
+      group_mentioned_limit: "<b>זהירות!</b> ציינת <a href='%{group_link}'>%{group}</a>, אך לקבוצה זו יש יותר חברים משהוגדר למנהל המערכת הגבלה של עד %{max} משתמשים. אף אחד לא יקבל הודעה"
       group_mentioned:
-        one: "על ידי אזכור {{group}}, אתם עומדים ליידע <a href='{{group_link}}'>אדם אחד</a> – אתם בטוחים?"
-        two: "על ידי אזכור {{group}}, אתם עומדים ליידע <a href='{{group_link}}'>{{count}} אנשים</a> – אתם בטוחים?"
-        many: "על ידי אזכור {{group}}, אתם עומדים ליידע <a href='{{group_link}}'>{{count}} אנשים</a> – אתם בטוחים?"
-        other: "על ידי אזכור {{group}}, אתם עומדים ליידע <a href='{{group_link}}'>{{count}} אנשים</a> – אתם בטוחים?"
+        one: "על ידי אזכור %{group}, אתם עומדים ליידע <a href='%{group_link}'>אדם אחד</a> – אתם בטוחים?"
+        two: "על ידי אזכור %{group}, אתם עומדים ליידע <a href='%{group_link}'>%{count} אנשים</a> – אתם בטוחים?"
+        many: "על ידי אזכור %{group}, אתם עומדים ליידע <a href='%{group_link}'>%{count} אנשים</a> – אתם בטוחים?"
+        other: "על ידי אזכור %{group}, אתם עומדים ליידע <a href='%{group_link}'>%{count} אנשים</a> – אתם בטוחים?"
       cannot_see_mention:
-        category: "הזכרת את {{username}} אבל לא תישלח אליו/ה התרעה עקב העדר גישה לקטגוריה זו. יהיה עליך להוסיף אותו/ה לקבוצה שיש לה גישה לקטגוריה הזו."
-        private: "הזכרתם את {{username}} אבל הוא/היא לא יקבלו התראה כיוון שהם לא יכולים לראות את ההודעה הפרטית הזו. תצטרכו להזמין אותם להודעה פרטית זו."
-      duplicate_link: "נראה שהקישור שלך אל <b>{{domain}}</b> כבר פורסם בנושא הזה על ידי <b>‎@{{username}}‎</b> כ<a href='{{post_url}}'>תגובה ב{{ago}}</a> - לפרסם אותו שוב?"
-      reference_topic_title: "תגובה: {{title}}"
+        category: "הזכרת את %{username} אבל לא תישלח אליו/ה התרעה עקב העדר גישה לקטגוריה זו. יהיה עליך להוסיף אותו/ה לקבוצה שיש לה גישה לקטגוריה הזו."
+        private: "הזכרתם את %{username} אבל הוא/היא לא יקבלו התראה כיוון שהם לא יכולים לראות את ההודעה הפרטית הזו. תצטרכו להזמין אותם להודעה פרטית זו."
+      duplicate_link: "נראה שהקישור שלך אל <b>%{domain}</b> כבר פורסם בנושא הזה על ידי <b>‎@%{username}‎</b> כ<a href='%{post_url}'>תגובה ב%{ago}</a> - לפרסם אותו שוב?"
+      reference_topic_title: "תגובה: %{title}"
       error:
         title_missing: "יש להזין כותרת."
-        title_too_short: "על הכותרת להיות באורך {{min}} תווים לפחות."
-        title_too_long: "על הכותרת להיות באורך {{max}} לכל היותר."
+        title_too_short: "על הכותרת להיות באורך %{min} תווים לפחות."
+        title_too_long: "על הכותרת להיות באורך %{max} לכל היותר."
         post_missing: "הפוסט לא יכול להיות ריק"
-        post_length: "על הפוסט להיות באורך {{min}} תווים לפחות"
-        try_like: "האם ניסית את כפתור ה-{{heart}}?"
+        post_length: "על הפוסט להיות באורך %{min} תווים לפחות"
+        try_like: "האם ניסית את כפתור ה-%{heart}?"
         category_missing: "עליך לבחור קטגוריה."
-        tags_missing: "עליך לפחות לפחות {{count}} תגיות"
+        tags_missing: "עליך לפחות לפחות %{count} תגיות"
         topic_template_not_modified: "נא להוסיף פרטים ותיאורים מדויקים לנושא שלך על ידי עריכת תבנית הנושא."
       save_edit: "שמירת עריכה"
       overwrite_edit: "שכתוב על עריכה"
@@ -1795,14 +1811,14 @@ he:
       tooltip:
         regular:
           one: "התראה אחת שלא נצפתה"
-          two: "{{count}} התראות שלא נצפו"
-          many: "{{count}} התראות שלא נצפו"
-          other: "{{count}} התראות שלא נצפו"
+          two: "%{count} התראות שלא נצפו"
+          many: "%{count} התראות שלא נצפו"
+          other: "%{count} התראות שלא נצפו"
         message:
           one: "הודעה אחת שלא נקראה"
-          two: "{{count}} הודעות שלא נקראו"
-          many: "{{count}} הודעות שלא נקראו"
-          other: "{{count}} הודעות שלא קראו"
+          two: "%{count} הודעות שלא נקראו"
+          many: "%{count} הודעות שלא נקראו"
+          other: "%{count} הודעות שלא קראו"
         high_priority:
           one: "הודעה %{count} בדחיפות גבוהה שלא נקראה"
           two: "%{count} הודעות בדחיפות גבוהה שלא נקראו"
@@ -1813,54 +1829,54 @@ he:
       empty: "לא נמצאו התראות."
       post_approved: "הפוסט שלך אושר"
       reviewable_items: "פריטים שדורשים סקירה"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} ו%{count} נוסף</span> {{description}}"
-        two: "<span>{{username}}, {{username2}} ו{{count}} נוספים</span> {{description}}"
-        many: "<span>{{username}}, {{username2}} ו{{count}} נוספים</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} ו{{count}} נוספים </span>{{description}}"
+        one: "<span>%{username}, %{username2} ו%{count} נוסף</span> %{description}"
+        two: "<span>%{username}, %{username2} ו%{count} נוספים</span> %{description}"
+        many: "<span>%{username}, %{username2} ו%{count} נוספים</span> %{description}"
+        other: "<span>%{username}, %{username2} ו%{count} נוספים </span>%{description}"
       liked_consolidated_description:
-        one: "אהבו פוסט {{count}} שלך"
-        two: "אהבו {{count}} מהפוסטים שלך"
-        many: "אהבו {{count}} מהפוסטים שלך"
-        other: "אהבו {{count}} מהפוסטים שלך"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> אישר/ה את ההזמנה שלך"
-      moved_post: "<span>{{username}}</span> עבר {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "הרווחת '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>נושא חדש</span> {{description}}"
-      membership_request_accepted: "התקבלת לחברות בקבוצה ‚{{group_name}}’"
-      membership_request_consolidated: "{{count}} בקשות חברות פתוחות מול ‚{{group_name}}’"
+        one: "אהבו פוסט %{count} שלך"
+        two: "אהבו %{count} מהפוסטים שלך"
+        many: "אהבו %{count} מהפוסטים שלך"
+        other: "אהבו %{count} מהפוסטים שלך"
+      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}"
+      invitee_accepted: "<span>%{username}</span> אישר/ה את ההזמנה שלך"
+      moved_post: "<span>%{username}</span> עבר %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "הרווחת '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>נושא חדש</span> %{description}"
+      membership_request_accepted: "התקבלת לחברות בקבוצה ‚%{group_name}’"
+      membership_request_consolidated: "%{count} בקשות חברות פתוחות מול ‚%{group_name}’"
       group_message_summary:
-        one: "הודעה {{count}} בתיבת ה{{group_name}} שלך"
-        two: "{{count}} הודעות בתיבת ה{{group_name}} שלך"
-        many: "{{count}} הודעות בתיבת ה{{group_name}} שלך"
-        other: "{{count}} הודעות בתיבת ה{{group_name}} שלך"
+        one: "הודעה %{count} בתיבת ה%{group_name} שלך"
+        two: "%{count} הודעות בתיבת ה%{group_name} שלך"
+        many: "%{count} הודעות בתיבת ה%{group_name} שלך"
+        other: "%{count} הודעות בתיבת ה%{group_name} שלך"
       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}}'
+        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}} באתר %{site_title}"
+        custom: "התראה מ־%{username} באתר %{site_title}"
       titles:
         mentioned: "אוזכר"
         replied: "תגובה חדשה"
@@ -1890,9 +1906,9 @@ he:
       from_my_computer: "מהמחשב שלי"
       from_the_web: "מהאינטרנט"
       remote_tip: "קישור לתמונה"
-      remote_tip_with_attachments: "קישור לתמונה או לקובץ {{authorized_extensions}}"
+      remote_tip_with_attachments: "קישור לתמונה או לקובץ %{authorized_extensions}"
       local_tip: "בחרו תמונות ממכשירכם"
-      local_tip_with_attachments: "בחירת תמונות או קבצים מהמכשיר שלך {{authorized_extensions}}"
+      local_tip_with_attachments: "בחירת תמונות או קבצים מהמכשיר שלך %{authorized_extensions}"
       hint: "(ניתן גם לגרור לעורך להעלאה)"
       hint_for_supported_browsers: "תוכלו גם לגרור או להדביק תמונות לעורך"
       uploading: "מעלה"
@@ -1909,17 +1925,17 @@ he:
       clear_all: "נקוי של הכל"
       too_short: "ביטוי החיפוש שלך קצר מידי."
       result_count:
-        one: "<span>תוצאה אחת עבור</span><span class='term'> {{term}}</span>"
-        two: "<span>{{count}}{{plus}} תוצאות עבור</span><span class='term'> {{term}}</span>"
-        many: "<span>{{count}}{{plus}} תוצאות עבור</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} תוצאות עבור </span><span class='term'>{{term}}</span>"
+        one: "<span>תוצאה אחת עבור</span><span class='term'> %{term}</span>"
+        two: "<span>%{count}%{plus} תוצאות עבור</span><span class='term'> %{term}</span>"
+        many: "<span>%{count}%{plus} תוצאות עבור</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} תוצאות עבור </span><span class='term'>%{term}</span>"
       title: "חיפוש נושאים, פוסטים, משתמשים או קטגוריות"
       full_page_title: "חפש נושאים או פוסטים"
       no_results: "אין תוצאות."
       no_more_results: "לא נמצאו עוד תוצאות."
       searching: "מחפש ..."
-      post_format: "#{{post_number}} מאת {{username}}"
-      results_page: "חפש תוצאות עבור '{{term}}'"
+      post_format: "#%{post_number} מאת %{username}"
+      results_page: "חפש תוצאות עבור '%{term}'"
       more_results: "יש עוד תוצאות. אנא צמצם את קריטריוני החיפוש."
       cant_find: "לא מצליחים למצוא את מה שחיפשתם?"
       start_new_topic: "אולי תפתחו נושא חדש?"
@@ -1928,9 +1944,9 @@ he:
       search_google_button: "גוגל"
       search_google_title: "חפש אתר זה"
       context:
-        user: "חיפוש פוסטים לפי @{{username}}"
-        category: "חפשו את הקטגוריה #{{category}}"
-        tag: "חיפוש אחר התגית #{{tag}}"
+        user: "חיפוש פוסטים לפי @%{username}"
+        category: "חפשו את הקטגוריה #%{category}"
+        tag: "חיפוש אחר התגית #%{tag}"
         topic: "חפשו בנושא זה"
         private_messages: "חיפוש הודעות"
       advanced:
@@ -2004,16 +2020,16 @@ he:
         close_topics: "סגירת נושאים"
         archive_topics: "ארכוב נושאים"
         notification_level: "התראות"
-        choose_new_category: "בחרו את הקטגוריה עבור הנושאים:"
+        choose_new_category: "נא לבחור קטגוריה לנושאים:"
         selected:
           one: "בחרת בנושא <b>אחד</b>."
-          two: "בחרת ב־<b>{{count}}</b> נושאים."
-          many: "בחרת ב־<b>{{count}}</b> נושאים."
-          other: "בחרת ב־<b>{{count}}</b> נושאים."
+          two: "בחרת ב־<b>%{count}</b> נושאים."
+          many: "בחרת ב־<b>%{count}</b> נושאים."
+          other: "בחרת ב־<b>%{count}</b> נושאים."
         change_tags: "החלפת תגים"
         append_tags: "הוספת תגים"
-        choose_new_tags: "בחרו בתגיות חדשות עבור נושאים אלו:"
-        choose_append_tags: "בחרו תגים חדשים להוסיף לנושאים הללו:"
+        choose_new_tags: "בחירה בתגיות חדשות לנושאים אלו:"
+        choose_append_tags: "בחירה בתגיות חדשות שיתווספו לנושאים אלו:"
         changed_tags: "התגיות של נושאים אלו השתנו."
       none:
         unread: "אין לך נושאים שלא נקראו."
@@ -2022,7 +2038,7 @@ he:
         posted: "עדיין לא פרסמתם באף נושא."
         latest: "אין נושאים אחרונים. זה עצוב."
         bookmarks: "אין לך עדיין סימניות לנושאים."
-        category: "אין נושאים בקטגוריה {{category}}."
+        category: "אין נושאים בקטגוריה %{category}."
         top: "אין נושאים מובילים."
         educate:
           new: '<p>הנושאים החדשים שלך יופיעו כאן.</p><p>כבררת מחדל, נושאים נחשבים חדשים ויופיעו עם המחוון <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">חדש</span> אם הם נוצרו ביומיים האחרונים </p><p>ניתן לבקר בעמוד ה<a href="%{userPrefsUrl}">העדפות</a> שלך כדי לשנות זאת.</p>'
@@ -2033,15 +2049,15 @@ he:
         read: "אין עוד נושאים שנקראו."
         new: "אין עוד נושאים חדשים."
         unread: "אין עוד נושאים שלא נקראו."
-        category: "אין עוד נושאים בקטגוריה {{category}}."
+        category: "אין עוד נושאים בקטגוריה %{category}."
         top: "אין עוד נושאים מובילים."
         bookmarks: "אין עוד סימניות לנושאים."
     topic:
       filter_to:
         one: "פוסט אחד בנושא"
-        two: "{{count}} פוסטים בנושא"
-        many: "{{count}} פוסטים בנושא"
-        other: "{{count}} פוסטים בנושא"
+        two: "%{count} פוסטים בנושא"
+        many: "%{count} פוסטים בנושא"
+        other: "%{count} פוסטים בנושא"
       create: "נושא חדש"
       create_long: "יצירת נושא חדש"
       open_draft: "פתח טיוטה"
@@ -2070,14 +2086,14 @@ he:
       unread: "לא נקראו"
       new_topics:
         one: "נושא חדש אחד"
-        two: "{{count}} נושאים חדשים"
-        many: "{{count}} נושאים חדשים"
-        other: "{{count}} נושאים חדשים"
+        two: "%{count} נושאים חדשים"
+        many: "%{count} נושאים חדשים"
+        other: "%{count} נושאים חדשים"
       unread_topics:
         one: "%{count} שלא נקרא"
-        two: "{{count}} נושאים שלא נקראו"
-        many: "{{count}} נושאים שלא נקראו"
-        other: "{{count}} נושאים שלא נקראו"
+        two: "%{count} נושאים שלא נקראו"
+        many: "%{count} נושאים שלא נקראו"
+        other: "%{count} נושאים שלא נקראו"
       title: "נושא"
       invalid_access:
         title: "הנושא פרטי"
@@ -2091,32 +2107,32 @@ he:
         description: "לא הצלחנו למצוא את הנושא הזה. אולי הוא הוסר על ידי הפיקוח?"
       total_unread_posts:
         one: "יש לכם פוסט אחד שלא נקרא בנושא זה"
-        two: "יש לכם {{count}} פוסטים שלא נקראו בנושא זה"
-        many: "יש לכם {{count}} פוסטים שלא נקראו בנושא זה"
-        other: "יש לכם {{count}} פוסטים שלא נקראו בנושא זה"
+        two: "יש לכם %{count} פוסטים שלא נקראו בנושא זה"
+        many: "יש לכם %{count} פוסטים שלא נקראו בנושא זה"
+        other: "יש לכם %{count} פוסטים שלא נקראו בנושא זה"
       unread_posts:
         one: "יש לכם פוסט אחד שלא נקרא בנושא הזה"
-        two: "יש לכם {{count}} פוסטים ישנים שלא נקראו בנושא הזה"
-        many: "יש לכם {{count}} פוסטים ישנים שלא נקראו בנושא הזה"
-        other: "יש לכם {{count}} פוסטים ישנים שלא נקראו בנושא הזה"
+        two: "יש לכם %{count} פוסטים ישנים שלא נקראו בנושא הזה"
+        many: "יש לכם %{count} פוסטים ישנים שלא נקראו בנושא הזה"
+        other: "יש לכם %{count} פוסטים ישנים שלא נקראו בנושא הזה"
       new_posts:
         one: "יש פוסט אחד חדש בנושא הזה מאז שקראתם אותו לאחרונה"
-        two: "יש {{count}} פוסטים חדשים בנושא זה מאז שקראתם אותו לאחרונה"
-        many: "יש {{count}} פוסטים חדשים בנושא זה מאז שקראתם אותו לאחרונה"
-        other: "יש {{count}} פוסטים חדשים בנושא זה מאז שקראתם אותו לאחרונה"
+        two: "יש %{count} פוסטים חדשים בנושא זה מאז שקראתם אותו לאחרונה"
+        many: "יש %{count} פוסטים חדשים בנושא זה מאז שקראתם אותו לאחרונה"
+        other: "יש %{count} פוסטים חדשים בנושא זה מאז שקראתם אותו לאחרונה"
       likes:
         one: "יש לייק אחד בנושא הזה"
-        two: "יש {{count}} לייקים בנושא זה"
-        many: "יש {{count}} לייקים בנושא זה"
-        other: "יש {{count}} לייקים בנושא זה"
+        two: "יש %{count} לייקים בנושא זה"
+        many: "יש %{count} לייקים בנושא זה"
+        other: "יש %{count} לייקים בנושא זה"
       back_to_list: "חזרה לרשימת הנושאים"
       options: "אפשרויות נושא"
       show_links: "הצג קישורים בתוך הנושא הזה"
       toggle_information: "הצגת פרטי נושא"
-      read_more_in_category: "רוצים לקרוא עוד? עיינו בנושאים אחרים ב {{catLink}} או {{latestLink}}."
-      read_more: "רוצה לקרוא עוד? {{catLink}} or {{latestLink}}."
-      group_request: "עליך לבקש חברות בקבוצה `{{name}}` כדי לצפות בנושא הזה"
-      group_join: "עליך להצטרף לקבוצה `{{name}}` כדי לצפות בנושא הזה"
+      read_more_in_category: "רוצים לקרוא עוד? עיינו בנושאים אחרים ב %{catLink} או %{latestLink}."
+      read_more: "רוצה לקרוא עוד? %{catLink} or %{latestLink}."
+      group_request: "עליך לבקש חברות בקבוצה `%{name}` כדי לצפות בנושא הזה"
+      group_join: "עליך להצטרף לקבוצה `%{name}` כדי לצפות בנושא הזה"
       group_request_sent: "בקשת החברות שלך נשלחה לקבוצה הזו. ניידע אותך כשהיא תתקבל."
       unread_indicator: "אף אחד מהחברים לא קרא את הפוסט האחרון של הנושא הזה עדיין."
       read_more_MF: "יש { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 שלא נקרא</a> } other { <a href='{basePath}/unread'># שלא נקראו</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ו} false {} other{}} נושא חדש <a href='{basePath}/new'>אחד</a>} other { {BOTH, select, true{ו} false {} other{}} <a href='{basePath}/new'>#</a> נושאים חדשים} } נותרים, או {CATEGORY, select, true {עיין בנושאים אחרים ב־{catLink}} false {{latestLink}} other {}}"
@@ -2165,7 +2181,7 @@ he:
         title: "סגירה זמנית"
       auto_close:
         title: "סגירה אוטומטית של נושא"
-        label: "שעות סגירת שעות אוטומטית:"
+        label: "שעות סגירת נושאים אוטומטית:"
         error: "אנא הכניסו ערך תקין."
         based_on_last_post: "אל תסגרו עד שהפוסט האחרון בנושא הוא לפחות בגיל זה."
       auto_delete:
@@ -2187,8 +2203,8 @@ he:
         auto_delete_replies: "תגובות על נושא זה נמחקות אוטומטית לאחר %{duration}."
       auto_close_title: "הגדרות סגירה אוטומטית"
       auto_close_immediate:
-        one: "הפוסט האחרון בנושא הוא כבר בן שעה, אז הנושא ייסגר מיידית."
-        two: "הפוסט האחרון בנושא הוא כבר בן %{count} שעות, אז הנושא ייסגר אוטומטית."
+        one: "הפוסט האחרון בנושא הוא כבר בן שעה (%{count}), אז הנושא ייסגר מיידית."
+        two: "הפוסט האחרון בנושא הוא כבר בן שעתיים (%{count}), אז הנושא ייסגר אוטומטית."
         many: "הפוסט האחרון בנושא הוא כבר בן %{count} שעות, אז הנושא ייסגר אוטומטית."
         other: "הפוסט האחרון בנושא הוא כבר בן %{count} שעות, אז הנושא ייסגר אוטומטית."
       timeline:
@@ -2222,7 +2238,7 @@ he:
           "2_8": "תראו ספירה של תגובות חדשות כיוון שאתם עוקבים אחר קטגוריה זו."
           "2_4": "תראו ספירה של תגובות חדשות כיוון שפרסמתם תגובה לנושא זה."
           "2_2": "תראו ספירה של תגובות חדשות כיוון שאתם עוקבים אחר נושא זה:"
-          "2": 'תופיע בפניך ספירה של תגובות חדשות מכיוון ש<a href="{{basePath}}/u/{{username}}/preferences/notifications">קראת את הנושא הזה</a>.'
+          "2": 'תופיע בפניך ספירה של תגובות חדשות מכיוון ש<a href="%{basePath}/u/%{username}/preferences/notifications">קראת את הנושא הזה</a>.'
           "1_2": "תישלח התראה אם מישהו יזכיר את @שם_המשתמש שלך או ישיב לך."
           "1": "תישלח התראה אם מישהו יזכיר את @שם_המשתמש שלך או ישיב לך."
           "0_7": "אתם מתעלמים מכל ההתראות בקטגוריה זו."
@@ -2236,34 +2252,34 @@ he:
           description: "תקבלו התראה על כל תגובה חדשה בנושא זה ומספר התגובות החדשות יוצג. "
         tracking_pm:
           title: "עוקב"
-          description: "ספירה של תגובות חדשות תופיע עבור הודעה זו. אתם תיודעו אם מישהו מזכיר את @שמכם או עונה לכם."
+          description: "ספירה של תגובות חדשות תופיע עבור הודעה זו. תקבלו התראה אם מישהו מזכיר את @שמכם או מגיב על הודעה שלכם."
         tracking:
           title: "עוקב"
           description: "כמו רגיל, בנוסף מספר התגובות שלא נקראו יוצג לנושא זה."
         regular:
           title: "רגיל"
-          description: "תישלח התראה אם מישהו יזכיר את @שם_המשתמש שלך או ישיב לך."
+          description: "תישלח התראה אם מישהו יזכיר את @שם_המשתמש שלך או יגיב להודעה שלך."
         regular_pm:
           title: "רגיל"
-          description: "תישלח התראה אם מישהו יזכיר את @שם_המשתמש שלך או ישיב לך."
+          description: "תישלח התראה אם מישהו יזכיר את @שם_המשתמש שלך או יגיב להודעה שלך."
         muted_pm:
           title: "מושתק"
           description: "לעולם לא תקבלו התראה בנוגע להודעה זו."
         muted:
           title: "מושתק"
-          description: "לעולם לא תיודעו לגבי דבר בנוגע לנושא זה, והוא לא יופיע ב״אחרונים״."
+          description: "לעולם לא תקבלו התראות על נושא זה, והוא לא יופיע ב״אחרונים״."
       actions:
         title: "פעולות"
         recover: "שחזר נושא"
-        delete: "מחיקת נושא"
-        open: "פתיחת נושא"
-        close: "סגירת נושא"
+        delete: "מחק נושא"
+        open: "פתח נושא"
+        close: "סגור נושא"
         multi_select: "בחרו פוסטים..."
-        timed_update: "קביעת שעון עצר נושא..."
-        pin: "נעיצת נושא..."
-        unpin: "שחרור נעיצת נושא..."
-        unarchive: "הוצאת נושא מארכיון"
-        archive: "ארכוב נושא"
+        timed_update: "קביעת שעון עצר לנושא..."
+        pin: "נעץ נושא..."
+        unpin: "שחרר נעיצת נושא..."
+        unarchive: "הוצא נושא מארכיון"
+        archive: "העבר נושא לארכיון"
         invisible: "הסתרה"
         visible: "גילוי"
         reset_read: "אפס מידע שנקרא"
@@ -2271,14 +2287,14 @@ he:
         make_private: "צור הודעה פרטית"
         reset_bump_date: "אפס תאריך הקפצה"
       feature:
-        pin: "נעיצת נושא"
-        unpin: "שחרור נעיצת נושא"
+        pin: "נעץ נושא"
+        unpin: "שחרר נעיצת נושא"
         pin_globally: "נעיצת נושא גלובלית"
         make_banner: "נושא באנר"
         remove_banner: "הסרת נושא באנר"
       reply:
         title: "תגובה"
-        help: "התחילו לערוך תגובה לנושא זה"
+        help: "התחל לערוך תגובה לנושא זה"
       clear_pin:
         title: "נקה נעיצה"
         help: "לנקות את מצב הנעיצה של הנושא הזה כדי שלא יופיע עוד בראש רשימת הנושאים שלך"
@@ -2298,29 +2314,29 @@ he:
         choose_category: "נא לבחור קטגוריה לנושא הציבורי:"
       feature_topic:
         title: "המליצו על נושא זה"
-        pin: "גרמו לנושא זה להופיע בראש קטגוריה {{categoryLink}} עד"
-        confirm_pin: "יש לך כבר {{count}} נושאים נעוצים. עודף נושאים נעוצים עשוי להכביד על משתמשים חדשים או אלמוניים. אכן לנעוץ נושא נוסף בקטגוריה זו? "
-        unpin: "הסרת נושא זה מראש הקטגוריה {{categoryLink}}."
-        unpin_until: "גרמו לנושא זה להופיע בראש הקטגוריה {{categoryLink}} או המתינו עד <strong>%{until}</strong>."
-        pin_note: "משתמשים יכולים לבטל עצמאית את נעיצת הנושא באופן פרטני."
+        pin: "גרמו לנושא זה להופיע בראש קטגוריה %{categoryLink} עד"
+        confirm_pin: "יש לך כבר %{count} נושאים נעוצים. עודף נושאים נעוצים עשוי להכביד על משתמשים חדשים או אלמוניים. אתה בטוח שאתה רוצה לנעוץ נושא נוסף בקטגוריה זו? "
+        unpin: "הסרת נושא זה מראש הקטגוריה %{categoryLink}."
+        unpin_until: "גרמו לנושא זה להופיע בראש הקטגוריה %{categoryLink} או המתינו עד <strong>%{until}</strong>."
+        pin_note: "משתמשים יכולים לבטל עצמאית את נעיצת הנושא עבורם בלבד."
         pin_validation: "דרוש תאריך על מנת לנעוץ את הנושא."
-        not_pinned: "אין נושאים שננעצו בקטגוריה {{categoryLink}}."
+        not_pinned: "אין נושאים שננעצו בקטגוריה %{categoryLink}."
         already_pinned:
-          one: "נושא שנעוץ כרגע בקטגוריה {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          two: "נושאים שנעוצים כרגע בקטגוריה {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "נושאים שנעוצים כרגע בקטגוריה {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "נושאים שנעוצים כרגע בקטגוריה {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-        pin_globally: "גרמו לנושא זה להופיע בראש כל רשימות הנושאים עד"
-        confirm_pin_globally: "יש לך כבר {{count}} נושאים נעוצים באופן גלובלי. עודף נושאים נעוצים עשוי להכביד על משתמשים חדשים או אלמוניים. אכן לנעוץ נושא גלובלי נוסף?"
+          one: "נושא שנעוץ כרגע בקטגוריה %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          two: "נושאים שנעוצים כרגע בקטגוריה %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          many: "נושאים שנעוצים כרגע בקטגוריה %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "נושאים שנעוצים כרגע בקטגוריה %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+        pin_globally: "להציב את הנושא הזה בראש כל רשימות הנושאים עד"
+        confirm_pin_globally: "יש לך כבר %{count} נושאים נעוצים באופן גלובלי. עודף נושאים נעוצים עשוי להכביד על משתמשים חדשים או אלמוניים. אתה בטוח שאתה רוצה לנעוץ נושא גלובלי נוסף?"
         unpin_globally: "הסרת נושא זה מראש כל רשימות הנושאים."
-        unpin_globally_until: "הסירו נושא זה מראש כל רשימות הנושאים או המתינו עד <strong>%{until}</strong>."
+        unpin_globally_until: "להסיר נושא זה מראש כל רשימות הנושאים או להמתין עד <strong>%{until}</strong>."
         global_pin_note: "משתמשים יכולים לבטל עצמאית את נעיצת הנושא באופן פרטני."
-        not_pinned_globally: "אין נושאים נעוצים גלובאלית."
+        not_pinned_globally: "אין נושאים נעוצים גלובלית."
         already_pinned_globally:
           one: "נושא שכרגע נעוץ גלובלית: <strong class='badge badge-notification unread'>%{count}</strong>"
-          two: "נושאים שכרגע נעוצים גלובלית: <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>"
+          two: "נושאים שכרגע נעוצים גלובלית: <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: "משתמשים יכולים לבטל את הבאנר על ידי סגירתו. רק פוסט אחד יכול לשמש כבאנר בזמן נתון."
@@ -2350,17 +2366,17 @@ he:
         to_topic_username: "הזנת שם משתמש/ת. נשלח התראה עם לינק הזמנה לנושא הזה. "
         to_username: "הכנסתם את שם המשתמש של האדם שברצונכם להזמין. אנו נשלח התראה למשתמש זה עם קישור המזמין אותו לנושא זה."
         email_placeholder: "name@example.com"
-        success_email: "שלחנו הזמנה אל <b>{{emailOrUsername}}</b>. נודיע לך כשהזמנה תיענה. כדאי לבדוק את לשונית ההזמנות בעמוד המשתמש שלך כדי לעקוב אחר ההזמנות ששלחת."
+        success_email: "שלחנו הזמנה אל <b>%{emailOrUsername}</b>. נודיע לך כשהזמנה תיענה. כדאי לבדוק את לשונית ההזמנות בעמוד המשתמש שלך כדי לעקוב אחר ההזמנות ששלחת."
         success_username: "הזמנו את המשתמש להשתתף בנושא."
         error: "מצטערים, לא יכלנו להזמין משתמש/ת אלו. אולי הם כבר הוזמנו בעבר? (תדירות שליחת ההזמנות מוגבלת)"
-        success_existing_email: " כבר קיים משתמש עם כתובת הדוא״ל <b>{{emailOrUsername}}</b>. נשלחה הזמנה למשתמש להשתתף בנושא."
+        success_existing_email: " כבר קיים משתמש עם כתובת הדוא״ל <b>%{emailOrUsername}</b>. נשלחה הזמנה למשתמש להשתתף בנושא."
       login_reply: "יש להיכנס כדי להשיב"
       filters:
         n_posts:
           one: "פוסט אחד"
-          two: "{{count}} פוסטים"
-          many: "{{count}} פוסטים"
-          other: "{{count}} פוסטים"
+          two: "%{count} פוסטים"
+          many: "%{count} פוסטים"
+          other: "%{count} פוסטים"
         cancel: "הסרת הסינון"
       move_to:
         title: "העבר ל"
@@ -2374,9 +2390,9 @@ he:
         error: "הייתה שגיאה בהעברת הפוסטים לנושא החדש."
         instructions:
           one: "אתם עומדים ליצור נושא חדש ולמלא אותו עם הפוסטים שבחרתם."
-          two: "אתם עומדים ליצור נושא חדש ולמלא אותו עם <b>{{count}}</b> הפוסטים שבחרתם."
-          many: "אתם עומדים ליצור נושא חדש ולמלא אותו עם <b>{{count}}</b> הפוסטים שבחרתם."
-          other: "אתם עומדים ליצור נושא חדש ולמלא אותו עם <b>{{count}}</b> הפוסטים שבחרתם."
+          two: "אתם עומדים ליצור נושא חדש ולמלא אותו עם <b>%{count}</b> הפוסטים שבחרתם."
+          many: "אתם עומדים ליצור נושא חדש ולמלא אותו עם <b>%{count}</b> הפוסטים שבחרתם."
+          other: "אתם עומדים ליצור נושא חדש ולמלא אותו עם <b>%{count}</b> הפוסטים שבחרתם."
       merge_topic:
         title: "העבר לנושא קיים"
         action: "העבר לנושא קיים"
@@ -2384,9 +2400,9 @@ he:
         radio_label: "נושא קיים"
         instructions:
           one: "בבקשה בחרו נושא אליו הייתם רוצים להעביר את הפוסט."
-          two: "בבקשה בחרו את הנושא אליו תרצה להעביר את <b>{{count}}</b> הפוסטים."
-          many: "בבקשה בחרו את הנושא אליו תרצה להעביר את <b>{{count}}</b> הפוסטים."
-          other: "בבקשה בחרו את הנושא אליו תרצה להעביר את <b>{{count}}</b> הפוסטים."
+          two: "בבקשה בחרו את הנושא אליו תרצה להעביר את <b>%{count}</b> הפוסטים."
+          many: "בבקשה בחרו את הנושא אליו תרצה להעביר את <b>%{count}</b> הפוסטים."
+          other: "בבקשה בחרו את הנושא אליו תרצה להעביר את <b>%{count}</b> הפוסטים."
       move_to_new_message:
         title: "העבר להודעה חדשה"
         action: "העבר להודעה חדשה"
@@ -2395,9 +2411,9 @@ he:
         participants: "משתתפים"
         instructions:
           one: "אתם עומדים ליצור נושא חדש ולמלא אותו עם הפוסט שבחרתם."
-          two: "אתם עומדים ליצור נושא חדש ולמלא אותו עם <b>{{count}}</b> הפוסטים שבחרתם."
-          many: "אתם עומדים ליצור נושא חדש ולמלא אותו עם <b>{{count}}</b> הפוסטים שבחרתם."
-          other: "אתם עומדים ליצור נושא חדש ולמלא אותו עם <b>{{count}}</b> הפוסטים שבחרתם."
+          two: "אתם עומדים ליצור נושא חדש ולמלא אותו עם <b>%{count}</b> הפוסטים שבחרתם."
+          many: "אתם עומדים ליצור נושא חדש ולמלא אותו עם <b>%{count}</b> הפוסטים שבחרתם."
+          other: "אתם עומדים ליצור נושא חדש ולמלא אותו עם <b>%{count}</b> הפוסטים שבחרתם."
       move_to_existing_message:
         title: "העבר להודעה קיימת"
         action: "העבר להודעה קיימת"
@@ -2405,9 +2421,9 @@ he:
         participants: "משתתפים"
         instructions:
           one: "בבקשה בחרו את ההודעה אליה תרצו להעביר את הפוסט."
-          two: "בבקשה בחרו את ההודעה אליה תרצו להעביר את <b>{{count}}</b> הפוסטים."
-          many: "בבקשה בחרו את ההודעה אליה תרצו להעביר את <b>{{count}}</b> הפוסטים."
-          other: "בבקשה בחרו את ההודעה אליה תרצו להעביר את <b>{{count}}</b> הפוסטים."
+          two: "בבקשה בחרו את ההודעה אליה תרצו להעביר את <b>%{count}</b> הפוסטים."
+          many: "בבקשה בחרו את ההודעה אליה תרצו להעביר את <b>%{count}</b> הפוסטים."
+          other: "בבקשה בחרו את ההודעה אליה תרצו להעביר את <b>%{count}</b> הפוסטים."
       merge_posts:
         title: "ניזוג פוסטים שנבחרו"
         action: "מיזוג פוסטים שנבחרו"
@@ -2430,15 +2446,15 @@ he:
         error: "התרחשה שגיאה בשינוי הבעלות של ההדעות."
         placeholder: "שם המשתמש של הבעלים החדש"
         instructions:
-          one: "אנא בחרו את הבעלים החדש של הפוסט מאת <b>{{old_user}}</b>."
-          two: "אנא בחרו את הבעלים החדש של {{count}} הפוסטים מאת <b>@{{old_user}}</b>."
-          many: "אנא בחרו את הבעלים החדש של {{count}} הפוסטים מאת <b>@{{old_user}}</b>."
-          other: "אנא בחרו את הבעלים החדש של {{count}} הפוסטים מאת <b>@{{old_user}}</b>."
+          one: "אנא בחרו את הבעלים החדש של הפוסט מאת <b>%{old_user}</b>."
+          two: "אנא בחרו את הבעלים החדש של %{count} הפוסטים מאת <b>@%{old_user}</b>."
+          many: "אנא בחרו את הבעלים החדש של %{count} הפוסטים מאת <b>@%{old_user}</b>."
+          other: "אנא בחרו את הבעלים החדש של %{count} הפוסטים מאת <b>@%{old_user}</b>."
         instructions_without_old_user:
           one: "נא לבחור בעלים חדש לפוסט"
-          two: "נא לבחור בעלים חדש ל־{{count}} הפוסטים"
-          many: "נא לבחור בעלים חדש ל־{{count}} הפוסטים"
-          other: "נא לבחור בעלים חדש ל־{{count}} הפוסטים"
+          two: "נא לבחור בעלים חדש ל־%{count} הפוסטים"
+          many: "נא לבחור בעלים חדש ל־%{count} הפוסטים"
+          other: "נא לבחור בעלים חדש ל־%{count} הפוסטים"
       change_timestamp:
         title: "שינוי חותמת זמן..."
         action: "שינוי חותמת זמן"
@@ -2447,7 +2463,7 @@ he:
         instructions: "אנא בחרו את חותמת הזמן החדשה של הנושא. פוסטים בנושא יועדכנו לאותם הפרשי זמנים."
       multi_select:
         select: "בחירה"
-        selected: "נבחרו ({{count}})"
+        selected: "נבחרו (%{count})"
         select_post:
           label: "בחירה"
           title: "הוספת פוסט לבחירה"
@@ -2466,9 +2482,9 @@ he:
         deselect_all: בחר כלום
         description:
           one: בחרתם פוסט אחד.
-          two: "בחרתם <b>{{count}}</b> פוסטים."
-          many: "בחרתם <b>{{count}}</b> פוסטים."
-          other: "בחרתם <b>{{count}}</b> פוסטים."
+          two: "בחרתם <b>%{count}</b> פוסטים."
+          many: "בחרתם <b>%{count}</b> פוסטים."
+          other: "בחרתם <b>%{count}</b> פוסטים."
       deleted_by_author:
         one: "(הנושא הוסר עקב חרטת המפרסם, הוא ימחק אוטומטית בעוד שעה אלמלא יסומן בדגל)"
         two: "(הנושא הוסר עקב חרטת המפרסם, הוא ימחק אוטומטית בעוד שעתיים אלמלא יסומן בדגל)"
@@ -2477,57 +2493,57 @@ he:
     post:
       quote_reply: "ציטוט"
       edit_reason: "סיבה: "
-      post_number: "פוסט {{number}}"
+      post_number: "פוסט %{number}"
       ignored: "תוכן בהתעלמות"
       wiki_last_edited_on: "וויקי נערך לאחרונה ב"
       last_edited_on: "הפוסט נערך לאחרונה ב"
       reply_as_new_topic: "תגובה כנושא מקושר"
       reply_as_new_private_message: "תגובה כהודעה חדשה לאותם נמענים"
-      continue_discussion: "ממשיך את הדיון מ {{postLink}}:"
+      continue_discussion: "ממשיך את הדיון מ %{postLink}:"
       follow_quote: "מעבר לפוסט המצוטט"
       show_full: "הצגת פוסט מלא"
       show_hidden: "צפייה בתוכן שמיועד להתעלמות."
       deleted_by_author:
-        one: "(הפוסט בוטל על ידי הכותבים, הוא ימחק אוטומטית בעוד %{count} שעות אלא אם יסומן בדגל)"
-        two: "(הפוסט נלקח בחזרה על ידי הכותבים, הוא ימחק אוטומטית בעוד %{count} שעות אלא אם כן הוא ידוגל)"
-        many: "(הפוסט נלקח בחזרה על ידי הכותבים, הוא ימחק אוטומטית בעוד %{count} שעות אלא אם כן הוא ידוגל)"
-        other: "(הפוסט נלקח בחזרה על ידי הכותבים, הוא ימחק אוטומטית בעוד %{count} שעות אלא אם כן הוא ידוגל)"
+        one: "(הפוסט נמשך על ידי המחבר, הוא יימחק אוטומטית בעוד שעה (%{count}) אלא אם כן הוא יסומן בדגל)"
+        two: "(הפוסט נמשך על ידי המחבר, הוא יימחק אוטומטית בעוד שעתיים (%{count}) אלא אם כן הוא יסומן בדגל)"
+        many: "(הפוסט נמשך על ידי המחבר, הוא יימחק אוטומטית בעוד %{count} שעות אלא אם כן הוא יסומן בדגל)"
+        other: "(הפוסט נמשך על ידי המחבר, הוא יימחק אוטומטית בעוד %{count} שעות אלא אם כן הוא יסומן בדגל)"
       collapse: "צמצום"
       expand_collapse: "הרחב/צמצם"
       locked: "חבר סגל נעל את האפשרות לערוך את הפוסט הזה"
       gap:
         one: "הצג תגובה אחת שהוסתרה"
-        two: "הצגת {{count}} תגובות שהוסתרו"
-        many: "הצגת {{count}} תגובות שהוסתרו"
-        other: "הצגת {{count}} תגובות שהוסתרו"
+        two: "הצגת %{count} תגובות שהוסתרו"
+        many: "הצגת %{count} תגובות שהוסתרו"
+        other: "הצגת %{count} תגובות שהוסתרו"
       notice:
-        new_user: "זהו הפרסום הראשון מאת {{user}} - הבה נקבל את פניו/ה לקהילה שלנו!"
-        returning_user: "עבר זמן מה מאז שראינו במחוזותינו את {{user}} - הפרסום האחרון שלו/ה היה ב־{{time}}."
+        new_user: "זהו הפרסום הראשון מאת %{user} - הבה נקבל את פניו/ה לקהילה שלנו!"
+        returning_user: "עבר זמן מה מאז שראינו במחוזותינו את %{user} - הפרסום האחרון שלו/ה היה ב־%{time}."
       unread: "הפוסט טרם נקרא"
       has_replies:
         one: "תגובה אחת"
-        two: "{{count}} תגובות"
-        many: "{{count}} תגובות"
-        other: "{{count}} תגובות"
+        two: "%{count} תגובות"
+        many: "%{count} תגובות"
+        other: "%{count} תגובות"
       has_likes_title:
         one: "מישהו אחד אהב את התגובה הזו"
-        two: "{{count}} אנשים אהבו את התגובה הזו"
-        many: "{{count}} אנשים אהבו את התגובה הזו"
-        other: "{{count}} אנשים אהבו את התגובה הזו"
+        two: "%{count} אנשים אהבו את התגובה הזו"
+        many: "%{count} אנשים אהבו את התגובה הזו"
+        other: "%{count} אנשים אהבו את התגובה הזו"
       has_likes_title_only_you: "אהבת את התגובה הזו"
       has_likes_title_you:
         one: "אתם ועוד מישהו אהבתם את הפוסט הזה"
-        two: "אתם ו {{count}} אנשים אחרים אהבתם את הפוסט הזה"
-        many: "אתם ו {{count}} אנשים אחרים אהבתם את הפוסט הזה"
-        other: "אתם ו {{count}} אנשים אחרים אהבתם את הפוסט הזה"
+        two: "אתם ו %{count} אנשים אחרים אהבתם את הפוסט הזה"
+        many: "אתם ו %{count} אנשים אחרים אהבתם את הפוסט הזה"
+        other: "אתם ו %{count} אנשים אחרים אהבתם את הפוסט הזה"
       errors:
         create: "אירעה שגיאה ביצירת הפוסט שלך. נא לנסות שוב, עמך הסליחה."
         edit: "אירעה שגיאה בעריכת הפוסט שלך. נא לנסות שוב, עמך הסליחה."
         upload: "סליחה, הייתה שגיאה בהעלאת הקובץ שלך. אנא נסו שנית"
-        file_too_large: "הקובץ הזה גדול מדי (הגודל המרבי הוא {{max_size_kb}} ק״ב), עמך הסליחה. למה שלא להעלות את הקובץ שלך לשירות שיתוף בענן ואז להדביק את הקישור?"
+        file_too_large: "הקובץ הזה גדול מדי (הגודל המרבי הוא %{max_size_kb} ק״ב), עמך הסליחה. למה שלא להעלות את הקובץ שלך לשירות שיתוף בענן ואז להדביק את הקישור?"
         too_many_uploads: "סליחה, אך ניתן להעלות רק קובץ אחת כל פעם."
-        too_many_dragged_and_dropped_files: "אפשר להעלות עד {{max}} קבצים בכל פעם, עמך הסליחה."
-        upload_not_authorized: "הקובץ שמועמד להעלאה אינו מורשה (סיומות מורשות: {{authorized_extensions}}), עמך הסליחה."
+        too_many_dragged_and_dropped_files: "אפשר להעלות עד %{max} קבצים בכל פעם, עמך הסליחה."
+        upload_not_authorized: "הקובץ שמועמד להעלאה אינו מורשה (סיומות מורשות: %{authorized_extensions}), עמך הסליחה."
         image_upload_not_allowed_for_new_user: "סליחה, משתמשים חדשים לא יכולים להעלות תמונות."
         attachment_upload_not_allowed_for_new_user: "סליחה, משתמשים חדשים לא יכולים להעלות קבצים."
         attachment_download_requires_login: "מצטערים, עליכם להיות מחוברים כדי להוריד את הקבצים המצורפים."
@@ -2568,13 +2584,13 @@ he:
           direct_replies:
             one: "כן, ותגובה אחת ישירה"
             two: "כן, ושתי תגובות ישירות"
-            many: "כן, ו־{{count}} תגובות ישירות"
-            other: "כן, ו־{{count}} תגובות ישירות"
+            many: "כן, ו־%{count} תגובות ישירות"
+            other: "כן, ו־%{count} תגובות ישירות"
           all_replies:
             one: "כן, ותגובה אחת"
             two: "כן, ושתי תגובות."
-            many: "כן, וכל {{count}}התגובות."
-            other: "כן, וכל {{count}}התגובות."
+            many: "כן, וכל %{count}התגובות."
+            other: "כן, וכל %{count}התגובות."
           just_the_post: "לא, רק את הפוסט"
         admin: "פעולות ניהול של הפוסט"
         wiki: "יצירת wiki"
@@ -2629,13 +2645,13 @@ he:
           like_capped:
             one: "ועוד מישהו אהב את זה"
             two: "ועוד 2 נוספים אהבו את זה"
-            many: "ועוד {{count}} נוספים אהבו את זה"
-            other: "ועוד {{count}} נוספים אהבו את זה"
+            many: "ועוד %{count} נוספים אהבו את זה"
+            other: "ועוד %{count} נוספים אהבו את זה"
           read_capped:
-            one: "ועוד מישהו/י ({{count}}) קרא/ה את זה"
-            two: "ו־{{count}} נוספים קראו את זה"
-            many: "ו־{{count}} נוספים קראו את זה"
-            other: "ו־{{count}} נוספים קראו את זה"
+            one: "ועוד מישהו/י (%{count}) קרא/ה את זה"
+            two: "ו־%{count} נוספים קראו את זה"
+            many: "ו־%{count} נוספים קראו את זה"
+            other: "ו־%{count} נוספים קראו את זה"
         by_you:
           off_topic: "דיגלתם פרסום זה כאוף-טופיק"
           spam: "דיגלתם את זה כספאם"
@@ -2647,15 +2663,15 @@ he:
       delete:
         confirm:
           one: "למחוק את הפוסט הזה?"
-          two: "למחוק את {{count}} הפוסטים האלה?"
-          many: "למחוק את {{count}} הפוסטים האלה?"
-          other: "למחוק את {{count}} הפוסטים האלה?"
+          two: "למחוק את %{count} הפוסטים האלה?"
+          many: "למחוק את %{count} הפוסטים האלה?"
+          other: "למחוק את %{count} הפוסטים האלה?"
       merge:
         confirm:
           one: "האם אתם בטוחים שאתם מעוניינים למזג פוסטים אלו?"
-          two: "האם אתם בטוחים שאתם מעוניינים למזג {{count}} פוסטים אלו?"
-          many: "האם אתם בטוחים שאתם מעוניינים למזג {{count}} פוסטים אלו?"
-          other: "האם אתם בטוחים שאתם מעוניינים למזג {{count}} פוסטים אלו?"
+          two: "האם אתם בטוחים שאתם מעוניינים למזג %{count} פוסטים אלו?"
+          many: "האם אתם בטוחים שאתם מעוניינים למזג %{count} פוסטים אלו?"
+          other: "האם אתם בטוחים שאתם מעוניינים למזג %{count} פוסטים אלו?"
       revisions:
         controls:
           first: "מהדורה ראשונה"
@@ -2667,7 +2683,7 @@ he:
           revert: "חזרה לגרסה זו"
           edit_wiki: "עריכת וויקי"
           edit_post: "עריכת פוסט"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "הצג את הפלט עם תוספות והסרות בתוכו"
@@ -2772,6 +2788,7 @@ he:
       sort_order: "סידור ברירת מחדל לנושאים:"
       default_view: "תצוגת ברירת מחדל לנושאים:"
       default_top_period: "פרק זמן דיפולטיבי להובלה"
+      default_list_filter: "מסנן רשימה כבררת מחדל:"
       allow_badges_label: "לאפשר הענקת עיטורים בקטגוריה זו"
       edit_permissions: "עריכת הרשאות"
       reviewable_by_group: "בנוסף לסגל, פוסטים ודגלים בקטגוריה הזאת יכולים להיות נתונים גם לסקירתם של:"
@@ -2828,12 +2845,15 @@ he:
         rows: "שורות"
         rows_with_featured_topics: "שורות עם נושאים מומלצים"
         boxes: "קופסאות"
-        boxes_with_featured_topics: "קופסאות אם נושאים מומלצים"
+        boxes_with_featured_topics: "תיבות עם נושאים מומלצים"
       settings_sections:
         general: "כללי"
         moderation: "פיקוח"
         appearance: "מראה"
         email: "דואר אלקטרוני"
+      list_filters:
+        all: "כל הנושאים"
+        none: "אין תת־קטגוריות"
     flagging:
       title: "תודה על עזרתך לשמירה על תרבות הקהילה שלנו!"
       action: "דגלו פוסט"
@@ -2858,19 +2878,19 @@ he:
       custom_message:
         at_least:
           one: "הכניסו לפחות תו אחד"
-          two: "הכניסו לפחות {{count}} תווים"
-          many: "הכניסו לפחות {{count}} תווים"
-          other: "הכניסו לפחות {{count}} תווים"
+          two: "הכניסו לפחות %{count} תווים"
+          many: "הכניסו לפחות %{count} תווים"
+          other: "הכניסו לפחות %{count} תווים"
         more:
           one: "נשאר אחד"
-          two: "{{count}} נשארו..."
-          many: "{{count}} נשארו..."
-          other: "{{count}} נשארו..."
+          two: "%{count} נשארו..."
+          many: "%{count} נשארו..."
+          other: "%{count} נשארו..."
         left:
           one: "נותר אחד"
-          two: "{{count}} נותרו"
-          many: "{{count}} נותרו"
-          other: "{{count}} נותרו"
+          two: "%{count} נותרו"
+          many: "%{count} נותרו"
+          other: "%{count} נותרו"
     flagging_topic:
       title: "תודה על עזרתך לשמירה על תרבות הקהילה שלנו!"
       action: "דגלו נושא"
@@ -2918,7 +2938,7 @@ he:
         title: "הנושא הזה הוא הודעה אישית"
         help: "הנושא הזה הוא הודעה אישית"
     posts: "פוסטים"
-    posts_long: "יש {{number}} פוסטים בנושא הזה"
+    posts_long: "יש %{number} פוסטים בנושא הזה"
     posts_likes_MF: |
       לנושא זה יש {count, plural, one {תגובה 1} other {# תגובות}} {ration, select,
       low {עם יחס גבוה של לייקים לפוסט}
@@ -2935,9 +2955,9 @@ he:
     replies: "תגובות"
     views_long:
       one: "נושא זה נצפה פעם %{count}"
-      two: "נושא זה נצפה {{number}} פעמים"
-      many: "נושא זה נצפה {{number}} פעמים"
-      other: "נושא זה נצפה {{number}} פעמים"
+      two: "נושא זה נצפה %{number} פעמים"
+      many: "נושא זה נצפה %{number} פעמים"
+      other: "נושא זה נצפה %{number} פעמים"
     activity: "פעילות"
     likes: "לייקים"
     likes_lowercase:
@@ -2945,7 +2965,7 @@ he:
       two: "לייקים"
       many: "לייקים"
       other: "לייקים"
-    likes_long: "יש {{number}} לייקים לנושא הזה"
+    likes_long: "יש %{number} לייקים לנושא הזה"
     users: "משתמשים"
     users_lowercase:
       one: "משתמש"
@@ -2954,7 +2974,7 @@ he:
       other: "משתמשים"
     category_title: "קטגוריה"
     history: "היסטוריה"
-    changed_by: "מאת {{author}}"
+    changed_by: "מאת %{author}"
     raw_email:
       title: "דוא״ל נכנס"
       not_available: "לא זמין!"
@@ -2963,46 +2983,46 @@ he:
       with_topics: "%{filter} נושאים"
       with_category: "%{filter} %{category} נושאים"
       latest:
-        title: "פורסמו לאחרונה"
+        title: "העדכני ביותר"
         title_with_count:
-          one: "האחרון (%{count})"
-          two: "({{count}}) פורסמו לאחרונה"
-          many: "({{count}}) פורסמו לאחרונה"
-          other: "({{count}}) פורסמו לאחרונה"
+          one: "(%{count}) העדכני ביותר"
+          two: "(%{count}) העדכניים ביותר"
+          many: "(%{count}) העדכניים ביותר"
+          other: "(%{count}) העדכניים ביותר"
         help: "נושאים עם תגובות לאחרונה"
       read:
         title: "נקרא"
         help: "נושאים שקראת, לפי סדר קריאתם"
       categories:
         title: "קטגוריות"
-        title_in: "קטגוריה - {{categoryName}}"
+        title_in: "קטגוריה - %{categoryName}"
         help: "כל הנושאים תחת הקטגוריה הזו"
       unread:
         title: "לא-נקראו"
         title_with_count:
           one: "לא נקראה (%{count})"
-          two: "לא-נקראו ({{count}})"
-          many: "לא-נקראו ({{count}})"
-          other: "לא נקראו ({{count}})"
+          two: "לא-נקראו (%{count})"
+          many: "לא-נקראו (%{count})"
+          other: "לא נקראו (%{count})"
         help: "נושאים שאתם כרגע צופים או עוקבים אחריהם עם פוסטים שלא נקראו"
         lower_title_with_count:
           one: "לא נקרא (%{count})"
-          two: "לא-נקראו {{count}} "
-          many: "לא-נקראו {{count}} "
-          other: "לא-נקראו {{count}} "
+          two: "לא-נקראו %{count} "
+          many: "לא-נקראו %{count} "
+          other: "לא-נקראו %{count} "
       new:
         lower_title_with_count:
           one: "חדש (%{count})"
-          two: "{{count}} חדשים"
-          many: "{{count}} חדשים"
-          other: "{{count}} חדשים"
+          two: "%{count} חדשים"
+          many: "%{count} חדשים"
+          other: "%{count} חדשים"
         lower_title: "חדש"
         title: "חדש"
         title_with_count:
           one: "חדש (%{count})"
-          two: "חדשים ({{count}})"
-          many: "חדשים ({{count}})"
-          other: "חדשים ({{count}})"
+          two: "חדשים (%{count})"
+          many: "חדשים (%{count})"
+          other: "חדשים (%{count})"
         help: "נושאים שנוצרו בימים האחרונים"
       posted:
         title: "הפוסטים שלי"
@@ -3011,13 +3031,13 @@ he:
         title: "סימניות"
         help: "נושאים עבורם יצרתם סימניות"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          two: "{{categoryName}} ({{count}})"
-          many: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
-        help: "נושאים מדוברים בקטגוריה {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          two: "%{categoryName} (%{count})"
+          many: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "נושאים מדוברים בקטגוריה %{categoryName}"
       top:
         title: "מובילים"
         help: "הנושאים הפעילים ביותר בשנה, חודש, שבוע או יום האחרונים"
@@ -3090,7 +3110,7 @@ he:
         search: "%{shortcut} חיפוש"
         help: "%{shortcut} פתיחת קיצורי מקשים"
         dismiss_new_posts: "%{shortcut} בטלו חדשים/פוסטים"
-        dismiss_topics: "%{shortcut} בטלו נושאים"
+        dismiss_topics: "%{shortcut} התעלמות מנושאים"
         log_out: "%{shortcut} התנתקות"
       composing:
         title: "חיבור"
@@ -3189,10 +3209,10 @@ he:
       synonyms: "מילים נרדפות"
       synonyms_description: "תגיות אלו תוחלפנה בתגית <b>%{base_tag_name}</b>."
       tag_groups_info:
-        one: 'תגית זו שייכת לקבוצה הזאת: {{tag_groups}}'
-        two: "תגית זו שייכת לקבוצות האלו: {{tag_groups}}"
-        many: "תגית זו שייכת לקבוצות האלו: {{tag_groups}}"
-        other: "תגית זו שייכת לקבוצות האלו: {{tag_groups}}"
+        one: 'תגית זו שייכת לקבוצה הזאת: %{tag_groups}'
+        two: "תגית זו שייכת לקבוצות האלו: %{tag_groups}"
+        many: "תגית זו שייכת לקבוצות האלו: %{tag_groups}"
+        other: "תגית זו שייכת לקבוצות האלו: %{tag_groups}"
       category_restrictions:
         one: "ניתן להשתמש בה בקטגוריה זו בלבד:"
         two: "ניתן להשתמש בה בקטגוריות אלו בלבד:"
@@ -3213,14 +3233,14 @@ he:
       delete_confirm:
         one: "למחוק את התגית הזו ולהסיר אותה מהנושא אליו היא מוקצית?"
         two: "למחוק את התגית הזו ולהסיר אותה משני הנושאים אליהן היא מוקצית?"
-        many: "למחוק את התגית הזו ולהסיר אותה מכל {{count}} הנושאים אליהן היא מוקצית?"
-        other: "למחוק את התגית הזו ולהסיר אותה מכל {{count}} הנושאים אליהן היא מוקצית?"
+        many: "למחוק את התגית הזו ולהסיר אותה מכל %{count} הנושאים אליהן היא מוקצית?"
+        other: "למחוק את התגית הזו ולהסיר אותה מכל %{count} הנושאים אליהן היא מוקצית?"
       delete_confirm_no_topics: "למחוק את התגית הזו?"
       delete_confirm_synonyms:
         one: "המילה הנרדפת שקשורה אליה תימחקנה גם כן."
-        two: "{{count}} המילים הנרדפות שקשורות אליה תימחקנה גם כן."
-        many: "{{count}} המילים הנרדפות שקשורות אליה תימחקנה גם כן."
-        other: "{{count}} המילים הנרדפות שקשורות אליה תימחקנה גם כן."
+        two: "%{count} המילים הנרדפות שקשורות אליה תימחקנה גם כן."
+        many: "%{count} המילים הנרדפות שקשורות אליה תימחקנה גם כן."
+        other: "%{count} המילים הנרדפות שקשורות אליה תימחקנה גם כן."
       rename_tag: "שינוי שם לתגית"
       rename_instructions: "בחרו שם חדש לתגית:"
       sort_by: "סידור לפי:"
@@ -3584,14 +3604,14 @@ he:
           redeliver: "שליחה מחדש"
           incoming:
             one: "יש אירוע חדש."
-            two: "יש {{count}} ארועים חדשים."
-            many: "יש {{count}} ארועים חדשים."
-            other: "יש {{count}} ארועים חדשים."
+            two: "יש %{count} ארועים חדשים."
+            many: "יש %{count} ארועים חדשים."
+            other: "יש %{count} ארועים חדשים."
           completed_in:
             one: "הושלמו בשנייה אחת."
-            two: "הושלמו ב {{count}} שניות."
-            many: "הושלמו ב {{count}} שניות."
-            other: "הושלמו ב {{count}} שניות."
+            two: "הושלמו ב %{count} שניות."
+            many: "הושלמו ב %{count} שניות."
+            other: "הושלמו ב %{count} שניות."
           request: "בקשה"
           response: "תשובה"
           redeliver_confirm: "לשלוח מחדש את אותו התוכן?"
@@ -3643,12 +3663,12 @@ he:
           label: "העלה"
           title: "טען גיבוי לinstance הזה"
           uploading: "מעלה..."
-          uploading_progress: "בהעלאה… {{progress}}%"
-          success: "ההעלאה של ‚{{filename}}’ הושלמה בהצלחה. הקובץ עובר עיבוד כרגע ותחלוף עד דקה עד שיופיע ברשימה."
-          error: "הייתה שגיאה במהלך העלאת '{{filename}}': {{message}}"
+          uploading_progress: "בהעלאה… %{progress}%"
+          success: "ההעלאה של ‚%{filename}’ הושלמה בהצלחה. הקובץ עובר עיבוד כרגע ותחלוף עד דקה עד שיופיע ברשימה."
+          error: "הייתה שגיאה במהלך העלאת '%{filename}': %{message}"
         operations:
           is_running: "פעולה רצה כרגע..."
-          failed: "ה-{{operation}} נכשל/ה. אנא בידקו את הלוגים."
+          failed: "ה-%{operation} נכשל/ה. אנא בידקו את הלוגים."
           cancel:
             label: "ביטול"
             title: "בטל את הפעולה הנוכחית"
@@ -3771,7 +3791,7 @@ he:
           disabled_component_tooltip: "הרכיב הזה נוטרל"
           default_theme_tooltip: "ערכת עיצוב זו מכהנת כבררת המחדל של האתר"
           updates_available_tooltip: "קיימים עדכונים לערכת עיצוב זו"
-          and_x_more: "ו־{{count}} נוספות."
+          and_x_more: "ו־%{count} נוספות."
           collapse: צמצום
           uploads: "העלאות"
           no_uploads: "ניתן להעלות משאבים שקשורים לערכת העיצוב שלך כגון גופנים ותמונות"
@@ -3820,8 +3840,8 @@ he:
           disabled_by: "הרכיב הזה נוטרל ע״י"
           required_version:
             error: "ערכת עיצוב זו נוטרלה אוטומטית כיוון שאינה תואמת לגרסה זו של Discourse."
-            minimum: "נדרש Discourse בגרסה {{version}} ומעלה."
-            maximum: "נדרש Discourse בגרסה {{version}} ומטה."
+            minimum: "נדרש Discourse בגרסה %{version} ומעלה."
+            maximum: "נדרש Discourse בגרסה %{version} ומטה."
           component_of: "רכיב של:"
           update_to_latest: "עדכון לגרסה אחרונה"
           check_for_updates: "בדיקת עדכונים"
@@ -3834,9 +3854,9 @@ he:
           empty: "אין פריטים"
           commits_behind:
             one: "ערכת העיצוב מעוכבת בהגשה %{count}!"
-            two: "ערכת העיצוב מעוכבת ב־{{count}} הגשות!"
-            many: "ערכת העיצוב מעוכבת ב־{{count}} הגשות!"
-            other: "ערכת העיצוב מעוכבת ב־{{count}} הגשות!"
+            two: "ערכת העיצוב מעוכבת ב־%{count} הגשות!"
+            many: "ערכת העיצוב מעוכבת ב־%{count} הגשות!"
+            other: "ערכת העיצוב מעוכבת ב־%{count} הגשות!"
           compare_commits: "(צפייה בהגשות חדשות)"
           repo_unreachable: "לא ניתן ליצור קשר עם מאגר ה־git של ערכת העיצוב הזו. הודעת השגיאה:"
           imported_from_archive: "ערכת עיצוב זו ייובאה מקובץ ‎.zip"
@@ -4243,8 +4263,8 @@ he:
           title: "חשיפת כתובת הדוא״ל של המשתמש"
           text: "הצגה"
       user:
-        suspend_failed: "משהו נכשל בהשעיית המשתמש הזה {{error}}"
-        unsuspend_failed: "משהו נכשל בביטול השעיית המשתמש הזה {{error}}"
+        suspend_failed: "משהו נכשל בהשעיית המשתמש הזה %{error}"
+        unsuspend_failed: "משהו נכשל בביטול השעיית המשתמש הזה %{error}"
         suspend_duration: "למשך כמה זמן יהיה המשתמש מושעה?"
         suspend_reason_label: "מה סיבת ההשעייה? הטקסט הזה <b>יופיע לעיני כל</b> בעמוד המשתמש ויוצג למשתמש כשינסה להיכנס. עדיף מסר קצר."
         suspend_reason_hidden_label: "מה סיבת ההשעייה? הטקסט הזה יוצג למשתמש כשינסה להיכנס. עדיף מסר קצר."
@@ -4542,6 +4562,8 @@ he:
           modal_description: "מעניין אותך להחיל את השינוי הזה רטרואקטיבית? פעולה זו תשנה את העדפותיהם של %{count} משתמשים קיימים."
           modal_yes: "כן"
           modal_no: "לא, להחיל את השינוי מעתה ואילך"
+        simple_list:
+          add_item: "הוספת פריט…"
       badges:
         title: עיטורים
         new_badge: עיטור חדש
@@ -4631,6 +4653,7 @@ he:
         title: "אמוג׳י"
         help: "הוספת אמוג׳י חדשים שיהיו זמינים לכולם. (עצה למקצוענים: עדיף לגרור לכאן כמה קבצים בבת אחת)"
         add: "הוספת אמוג׳י חדש"
+        uploading: "בהליכי העלאה..."
         name: "שם"
         group: "קבוצה"
         image: "תמונה"
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index f2e789a5a3..d7fa242236 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -23,8 +23,8 @@ hu:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}} ezer"
-        millions: "{{number}} millió"
+        thousands: "%{number} ezer"
+        millions: "%{number} millió"
     dates:
       time: "h:mm a"
       timeline_date: "YYYY MMMM"
@@ -223,11 +223,11 @@ hu:
     weekly: "hetente"
     every_month: "minden hónapban"
     every_six_months: "minden hat hónapban"
-    max_of_count: "legfeljebb {{count}}"
+    max_of_count: "legfeljebb %{count}"
     alternation: "vagy"
     character_count:
-      one: "{{count}} karakter"
-      other: "{{count}} karakter"
+      one: "%{count} karakter"
+      other: "%{count} karakter"
     related_messages:
       title: "Kapcsolódó üzenetek"
       see_all: 'Az <a href="%{path}">összes üzenet</a> megjelenítése @%{username} felhasználótól…'
@@ -280,14 +280,14 @@ hu:
         yes_value: "Igen, elvetés"
         no_value: "Nem, megtartás"
     topic_count_latest:
-      one: "Nézzen meg {{count}} új vagy frissített témát"
-      other: "Nézzen meg {{count}} új vagy frissített témát"
+      one: "Nézzen meg %{count} új vagy frissített témát"
+      other: "Nézzen meg %{count} új vagy frissített témát"
     topic_count_unread:
-      one: "Nézzen meg {{count}} olvasatlan témát"
-      other: "Nézzen meg {{count}} olvasatlan témát"
+      one: "Nézzen meg %{count} olvasatlan témát"
+      other: "Nézzen meg %{count} olvasatlan témát"
     topic_count_new:
-      one: "Nézzen meg {{count}} új témát"
-      other: "Nézzen meg {{count}} új témát"
+      one: "Nézzen meg %{count} új témát"
+      other: "Nézzen meg %{count} új témát"
     preview: "előnézet"
     cancel: "mégse"
     save: "Módosítások mentése"
@@ -295,7 +295,7 @@ hu:
     saved: "Mentve!"
     upload: "Feltöltés"
     uploading: "Feltöltés…"
-    uploading_filename: "Feltöltés: {{filename}}…"
+    uploading_filename: "Feltöltés: %{filename}…"
     clipboard: "vágólap"
     uploaded: "Feltöltve!"
     pasting: "Beillesztés…"
@@ -335,7 +335,7 @@ hu:
         optional: "Zárolhatja ezt az elemet, hogy mások ne hagyhassák jóvá."
         required: "Zárolnia kell az elemeket, hogy jóvá tudja őket hagyni."
         claimed_by_you: "Zárolta ezt az elemet, és most már jóváhagyhatja."
-        claimed_by_other: "Ezt az elemet csak <b>{{username}}</b> hagyhatja jóvá."
+        claimed_by_other: "Ezt az elemet csak <b>%{username}</b> hagyhatja jóvá."
       claim:
         title: "téma zárolása"
       unclaim:
@@ -355,7 +355,7 @@ hu:
       view_pending: "várakozók megtekintése"
       topic_has_pending:
         one: "Ebben a témában <b>%{count}</b> jóváhagyandó bejegyzés van."
-        other: "Ebben a témában <b>{{count}}</b> jóváhagyandó bejegyzés van."
+        other: "Ebben a témában <b>%{count}</b> jóváhagyandó bejegyzés van."
       title: "Áttekintés"
       topic: "Téma:"
       filtered_topic: "A jóváhagyandó tartalmakra szűrt egyetlen témában."
@@ -370,17 +370,17 @@ hu:
         fields: "Mezők"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} (összesen {{count}} megjelölés)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} (összesen {{count}} megjelölés)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (összesen %{count} megjelölés)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (összesen %{count} megjelölés)"
         agreed:
-          one: "{{count}}% egyetért "
-          other: "{{count}}% egyetért "
+          one: "%{count}% egyetért "
+          other: "%{count}% egyetért "
         disagreed:
-          one: "{{count}}% nem ért egyet"
-          other: "{{count}}% nem ért egyet"
+          one: "%{count}% nem ért egyet"
+          other: "%{count}% nem ért egyet"
         ignored:
-          one: "{{count}}% figyelmen kívül hagyja"
-          other: "{{count}}% figyelmen kívül hagyta"
+          one: "%{count}% figyelmen kívül hagyja"
+          other: "%{count}% figyelmen kívül hagyta"
       topics:
         topic: "Téma"
         reviewable_count: "Számláló"
@@ -390,10 +390,10 @@ hu:
         details: "részletek"
         unique_users:
           one: "%{count} felhasználó"
-          other: "{{count}} felhasználó"
+          other: "%{count} felhasználó"
       replies:
         one: "%{count} válasz"
-        other: "{{count}} válasz"
+        other: "%{count} válasz"
       edit: "Szerkesztés"
       save: "Mentés"
       cancel: "Mégse"
@@ -456,22 +456,22 @@ hu:
         description: "Fogadtuk a bejegyzését, de egy moderátornak jóvá kell hagynia, mielőtt megjelenne. Köszönjük a türelmét."
         pending_posts:
           one: "<strong>%{count}</strong> függőben lévő bejegyzése van."
-          other: "<strong>{{count}}</strong> függőben lévő bejegyzése van."
+          other: "<strong>%{count}</strong> függőben lévő bejegyzése van."
         ok: "Rendben"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> kitett <a href='{{topicUrl}}'>egy témát</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Ön</a> kitett <a href='{{topicUrl}}'>egy témát</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> válaszolt a következő bejegyzésre: <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Ön</a> válaszolt a következő bejegyzésre: <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> válaszolt <a href='{{topicUrl}}'>a témára</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Ön</a> válaszolt <a href='{{topicUrl}}'>a témára</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> megemlítette a következő felhasználót: <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> megemlítette <a href='{{user2Url}}'>Önt</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Ön</a> megemlítette a következő felhasználót: <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "<a href='{{userUrl}}'>{{user}}</a> bejegyzése"
-      posted_by_you: "Az <a href='{{userUrl}}'>Ön</a> bejegyzése"
-      sent_by_user: "<a href='{{userUrl}}'>{{user}}</a> küldte"
-      sent_by_you: "<a href='{{userUrl}}'>Ön</a> küldte"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> kitett <a href='%{topicUrl}'>egy témát</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Ön</a> kitett <a href='%{topicUrl}'>egy témát</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> válaszolt a következő bejegyzésre: <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Ön</a> válaszolt a következő bejegyzésre: <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> válaszolt <a href='%{topicUrl}'>a témára</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Ön</a> válaszolt <a href='%{topicUrl}'>a témára</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> megemlítette a következő felhasználót: <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> megemlítette <a href='%{user2Url}'>Önt</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Ön</a> megemlítette a következő felhasználót: <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "<a href='%{userUrl}'>%{user}</a> bejegyzése"
+      posted_by_you: "Az <a href='%{userUrl}'>Ön</a> bejegyzése"
+      sent_by_user: "<a href='%{userUrl}'>%{user}</a> küldte"
+      sent_by_you: "<a href='%{userUrl}'>Ön</a> küldte"
     directory:
       filter_name: "szűrés felhasználónév alapján"
       title: "Felhasználók"
@@ -700,7 +700,7 @@ hu:
     user_fields:
       none: "(válassz egy lehetőséget)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profil"
       mute: "Némítás"
       edit: "Beállítások szerkesztése"
@@ -776,7 +776,7 @@ hu:
       moderator_tooltip: "Ez a felhasználó egy moderátor"
       admin_tooltip: "Ez a felhasználó egy adminisztrátor"
       silenced_tooltip: "Ez a felhasználó némítva van"
-      suspended_notice: "Ez a felhasználó fel van függesztve eddig: {{date}}."
+      suspended_notice: "Ez a felhasználó fel van függesztve eddig: %{date}."
       suspended_permanently: "Ez a felhasználó fel van függesztve."
       suspended_reason: "Ok:"
       github_profile: "Github"
@@ -791,7 +791,7 @@ hu:
           Némított témák és kategóriák nem lesznek benne ezekben az emailekben.
         individual: "Küldjön e-mailt minden új hozzászólásról"
         individual_no_echo: "Küldjön e-mailt minden új hozzászólásról kivéve a sajátokat"
-        many_per_day: "Küldjön e-mailt minden új hozzászólás után (naponta kb. {{dailyEmailEstimate}} db)"
+        many_per_day: "Küldjön e-mailt minden új hozzászólás után (naponta kb. %{dailyEmailEstimate} db)"
         few_per_day: "Küldjön e-mailt minden új hozzászólás után (naponta kb. 2 db)"
         warning: "Levelezőlista üzemmód bekapcsolva. Az e-mail értesítések beállításai felülbírálva."
       tag_settings: "Címkék"
@@ -820,7 +820,6 @@ hu:
       admin_delete: "Törlés"
       users: "Felhasználók"
       muted_users: "Lenémítva"
-      muted_users_instructions: "Minden értesítés letiltása ezektől a felhasználoktól"
       ignored_users: "Figyelmen kívül hagyva"
       tracked_topics_link: "Mutat"
       automatically_unpin_topics: "Automatikusan letűzi a témát amikor elérem az alját."
@@ -922,7 +921,7 @@ hu:
         no_secondary: "Nincsenek másodlagos emailek"
         ok: " Jóváhagyás végett e-mailt fogunk küldeni"
         invalid: "Kérünk adj meg egy érvényes e-mail címet"
-        authenticated: "Az email címedet {{provider}} azonosította"
+        authenticated: "Az email címedet %{provider} azonosította"
         frequency_immediately: "Azonnal e-mailt fogunk küldeni neked, ha nem olvastad el, amit neked küldtünk egy korábbi e-mailben."
       associated_accounts:
         title: "Társított fiókok"
@@ -939,9 +938,9 @@ hu:
       username:
         title: "Felhasználónév"
         instructions: "egyedi, szóközök nélkül, rövid"
-        short_instructions: "A következő módon lehet téged megemlíteni: @{{username}}"
+        short_instructions: "A következő módon lehet téged megemlíteni: @%{username}"
         available: "A felhasználóneved elérhető"
-        not_available: "Nem elérhető. Esetleg {{suggestion}}?"
+        not_available: "Nem elérhető. Esetleg %{suggestion}?"
         not_available_no_suggestion: "Nem elérhető"
         too_short: "Túl rövid a felhasználóneved"
         too_long: "Túl hosszú a felhasználóneved"
@@ -961,7 +960,7 @@ hu:
         log_out_all: "Összes kiléptetése"
         active: "most aktív"
         not_you: "Nem te vagy?"
-        show_all: "Összes megjelenítése ({{count}})"
+        show_all: "Összes megjelenítése (%{count})"
         show_few: "Kevesebb megjelenítése"
         was_this_you: "Te voltál?"
         latest_post: "Legutóbbi bejegyzésed..."
@@ -1037,11 +1036,11 @@ hu:
         none: "Nincsenek meghívók."
         redeemed: "Felhasznált meghívók"
         redeemed_tab: "Felhasználva"
-        redeemed_tab_with_count: "Felhasználva ({{count}})"
+        redeemed_tab_with_count: "Felhasználva (%{count})"
         redeemed_at: "Felhasznált"
         pending: "Függőben levő meghívások"
         pending_tab: "Várakozik"
-        pending_tab_with_count: "Várakozik ({{count}})"
+        pending_tab_with_count: "Várakozik (%{count})"
         topics_entered: "Megtekintett témák"
         posts_read_count: "Elolvasott bejegyzések"
         expired: "Ez a meghívó lejárt!"
@@ -1055,12 +1054,16 @@ hu:
         time_read: "Olvasási idő"
         days_visited: "Látogatott napok"
         account_age_days: "Fiók kora napokban"
-        create: "Egy meghívó küldése"
+        links_tab: "Hivatkozások"
+        link_created_at: "Létrehozott"
+        link_groups: Csoportok
+        create: "Meghívó küldése"
         generate_link: "Meghívó link másolása"
         link_generated: "Meghívó link elkészült!"
         valid_for: "A meghívó-link csak ehhez az e-mail címhez érvényes: %{email}"
+        invite_link:
+          success: "Meghívó link elkészült!"
         bulk_invite:
-          text: "Csoportos meghívás fájlból"
           success: "A file sikeresen feltöltve, értesítést kapsz, ha a folyamat készen van."
           error: "A feltöltött filenak CSV formátumúnak kell lennie."
       password:
@@ -1150,7 +1153,7 @@ hu:
       desc:
         network: "Kérünk ellenőrizd az internet kapcsolatodat!"
         network_fixed: "Úgy néz ki, visszatért."
-        server: "Hibakód: {{status}}"
+        server: "Hibakód: %{status}"
         forbidden: "Nincs jogod megnézni ezt."
         not_found: "Oops, az alkalmazás olyan URL-t próbált betölteni ami nem létezik."
         unknown: "Valami félresikerült."
@@ -1197,7 +1200,7 @@ hu:
       hidden_for_session: "Rendben, holnap emlékeztetni foglak. Bármikor használhatod a 'Belépés' gombot, hogy csinálj magadnak egy fiókot."
     summary:
       enabled_description: "A téma összefoglalását látod: a legérdekesebb bejegyzéseket a közösség határozta meg."
-      description: "Összesen <b>{{count}}</b> válasz."
+      description: "Összesen <b>%{count}</b> válasz."
       enable: "Téma összefoglalása"
       disable: "Összes bejegyzés mutatása"
     deleted_filter:
@@ -1209,8 +1212,8 @@ hu:
       title: "Üzenet"
       invite: "Mások meghívása..."
       leave_message: "Valóban el akarod hagyni a beszélgetést?"
-      remove_allowed_user: "Biztosan kitörlöd {{name}}-t ebből az üzenetből?"
-      remove_allowed_group: "Valóban el akarod távolítani {{name}}-t ebből az üzenetből?"
+      remove_allowed_user: "Biztosan kitörlöd %{name}-t ebből az üzenetből?"
+      remove_allowed_group: "Valóban el akarod távolítani %{name}-t ebből az üzenetből?"
     email: "E-mail"
     username: "Felhasználónév"
     last_seen: "Látva"
@@ -1258,7 +1261,7 @@ hu:
       awaiting_activation: "A fiókod még nincsen aktiválva. A jelszóemlékeztető alatt újra kiküldetheted az aktivációs e-mailt."
       awaiting_approval: "A felhasználói fiókod még nincs jóváhagyva. A jóváhagyásról elektronikus levélben kapsz értesítést."
       requires_invite: "Sajnáljuk, de ehhez a fórumhoz csak meghívott személyek férhetnek hozzá."
-      not_activated: "Még nem tudsz bejelentkezni, mert a felhasználói fiókod még nincs aktiválva. A fiókodat szíveskedj aktiválni a korábban a(z) <b>{{sentTo}}</b> e-mail címre küldött elektronikus levélben található instrukciók szerint. "
+      not_activated: "Még nem tudsz bejelentkezni, mert a felhasználói fiókod még nincs aktiválva. A fiókodat szíveskedj aktiválni a korábban a(z) <b>%{sentTo}</b> e-mail címre küldött elektronikus levélben található instrukciók szerint. "
       not_allowed_from_ip_address: "Nem jelentkezhetsz be erről az ip címről!"
       admin_not_allowed_from_ip_address: "Nem léphetsz be erről az ip címről adminisztrátorként."
       resend_activation_email: "Kattints ide az aktivációs link újboli kiküldéséhez!"
@@ -1267,7 +1270,7 @@ hu:
       change_email: "Változtasd meg az e-mail címedet"
       provide_new_email: "Adj meg egy új címet és mi újraküldjük az aktivációs e-mailt"
       submit_new_email: "Frissítsd az e-mail címedet"
-      sent_activation_email_again: "Küldtünk egy másik aktivációs emailt a <b>{{currentEmail}}</b> címedre. Néhány percen belül meg kell érkeznie, ha mégsem, kérjük, nézd meg a spam mappádat."
+      sent_activation_email_again: "Küldtünk egy másik aktivációs emailt a <b>%{currentEmail}</b> címedre. Néhány percen belül meg kell érkeznie, ha mégsem, kérjük, nézd meg a spam mappádat."
       to_continue: "Kérlek jelentkezz be"
       preferences: "Bejelentkezve kell lenned ahoz hogy megváltoztasd a felhasználói beállításokat"
       forgot: "Nem emlékszem a fiók részleteire"
@@ -1324,7 +1327,7 @@ hu:
       default_header_text: Kiválasztás...
       no_content: Nem található egyezés
       filter_placeholder: Keresés...
-      create: "Létrehozás: '{{content}}'"
+      create: "Létrehozás: '%{content}'"
     date_time_picker:
       from: From
       to: To
@@ -1342,7 +1345,7 @@ hu:
       default: Egyéni emodzsik
     shared_drafts:
       title: "Megosztott vázlatok"
-      notice: "Ez a téma azoknak látható akik látják a <b>{{category}}</b>kategóriát"
+      notice: "Ez a téma azoknak látható akik látják a <b>%{category}</b>kategóriát"
       destination_category: "Cél kategória"
       publish: "Közzétenni a megosztott vázlatot"
       confirm_publish: "Biztosan közzé akarod tenni ezt a vázlatot?"
@@ -1359,20 +1362,20 @@ hu:
       saved_local_draft_tip: "helyi mentés készült"
       similar_topics: "A témaköröd hasonlít a..."
       drafts_offline: "offline piszkozatok"
-      group_mentioned_limit: "<b>Figyelem!</b>Említetted <a href='{{group_link}}'>{{group}}</a>, azonban ennek a csoportnak több embere van mint amit az adminisztrátor által konfigurált említési határa a {{max}} felhasználóknak. Senki nem lesz értesítve."
+      group_mentioned_limit: "<b>Figyelem!</b>Említetted <a href='%{group_link}'>%{group}</a>, azonban ennek a csoportnak több embere van mint amit az adminisztrátor által konfigurált említési határa a %{max} felhasználóknak. Senki nem lesz értesítve."
       group_mentioned:
-        one: "Megemlíteni a {{group}}, értesíteni fogsz <a href='{{group_link}}'>%{count} embert</a>- biztos vagy benne?"
-        other: "Megemlíteni a {{group}}, értesíteni fogsz <a href='{{group_link}}'>{{count}} embereket</a> - biztos vagy benne?"
+        one: "Megemlíteni a %{group}, értesíteni fogsz <a href='%{group_link}'>%{count} embert</a>- biztos vagy benne?"
+        other: "Megemlíteni a %{group}, értesíteni fogsz <a href='%{group_link}'>%{count} embereket</a> - biztos vagy benne?"
       cannot_see_mention:
-        category: "Megemlítetted {{username}} de nem lesznek értesítve mivel nincsen hozzáférésük ehez a témához. Hozzá kell adnod őket egy csoporthoz hogy hozzáférjenek a témához"
-        private: "Említetted {{username}} de nem lesznek értesítve mivel képtelenek megnézni ezt a személyes üzenetet. Megkell hívnod őket ehez a személyes üzenethez"
+        category: "Megemlítetted %{username} de nem lesznek értesítve mivel nincsen hozzáférésük ehez a témához. Hozzá kell adnod őket egy csoporthoz hogy hozzáférjenek a témához"
+        private: "Említetted %{username} de nem lesznek értesítve mivel képtelenek megnézni ezt a személyes üzenetet. Megkell hívnod őket ehez a személyes üzenethez"
       error:
         title_missing: "A címet kötelező megadni"
-        title_too_short: "A címnek legalább {{min}} karakter hosszúnak kell lennie"
-        title_too_long: "A cím nem lehet hosszabb, mint {{max}} katakter."
-        post_length: "A bejegyzésnek legalább {{min}} karakter hosszúnak kell lennie"
+        title_too_short: "A címnek legalább %{min} karakter hosszúnak kell lennie"
+        title_too_long: "A cím nem lehet hosszabb, mint %{max} katakter."
+        post_length: "A bejegyzésnek legalább %{min} karakter hosszúnak kell lennie"
         category_missing: "Ki kéne választanod egy kategóriát"
-        tags_missing: "Kikell választanod legalább {{count}}  címkét"
+        tags_missing: "Kikell választanod legalább %{count}  címkét"
       save_edit: "Módosítások mentése"
       overwrite_edit: "Módosítások mentése"
       reply_original: "Válasz az eredeti témakörre"
@@ -1451,47 +1454,48 @@ hu:
       tooltip:
         regular:
           one: "%{count} nemlátott értesítés"
-          other: "{{count}} nemlátott értesíések"
+          other: "%{count} nemlátott értesíések"
         message:
           one: "%{count} olvasatlan üzenet"
-          other: "{{count}} olvasatlan üzenet"
+          other: "%{count} olvasatlan üzenet"
       title: "értesítések @felhasználónév hivatkozásokról, a hozzászólásaidra adott válaszokról, üzenetekről stb."
       none: "Az értesítések betöltése sikertelen."
       empty: "Nincs értesítés."
       reviewable_items: "felülvizsgálatot igénylő elemek"
-      mentioned: "<span>{{username}}</span>{{description}}"
-      group_mentioned: "<span>{{username}} </span>{{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span>%{description}"
+      group_mentioned: "<span>%{username} </span>%{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} %{count} más</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} és {{count}} mások</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}}"
-      invitee_accepted: "<span>{{username}}</span> elfogadta a meghívásodat"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Megszerzett '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Új téma</span>{{description}} "
+        one: "<span>%{username}, %{username2} %{count} más</span> %{description}"
+        other: "<span>%{username}, %{username2} és %{count} mások</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}"
+      invitee_accepted: "<span>%{username}</span> elfogadta a meghívásodat"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Megszerzett '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Új téma</span>%{description} "
       group_message_summary:
-        one: "{{count}} Üzenet a {{group_name}} postaládában"
-        other: "{{count}} Üzenetek a {{group_name}} postaládában"
+        one: "%{count} Üzenet a %{group_name} postaládában"
+        other: "%{count} Üzenetek a %{group_name} postaládában"
       popup:
-        mentioned: '{{username}} megemlített itt: "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} megemlített téged "{{topic}}" - {{site_title}} témakörben'
-        quoted: '{{username}} idézett itt: "{{topic}}" - {{site_title}}'
-        replied: '{{username}} válaszolt neked itt: "{{topic}}" - {{site_title}}'
-        posted: '{{username}} hozzászólt itt: "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} küldött egy személyes üzenetet itt: "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} megemlített itt: "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} megemlített téged "%{topic}" - %{site_title} témakörben'
+        quoted: '%{username} idézett itt: "%{topic}" - %{site_title}'
+        replied: '%{username} válaszolt neked itt: "%{topic}" - %{site_title}'
+        posted: '%{username} hozzászólt itt: "%{topic}" - %{site_title}'
+        private_message: '%{username} küldött egy személyes üzenetet itt: "%{topic}" - %{site_title}'
         confirm_title: "Értesítések bekapcsolva - %{site_title}"
         confirm_body: "Siker! Értesítések engedélyezve."
+        custom: "Értesítés %{username} felhasználótól itt: %{site_title}"
       titles:
         watching_first_post: "új téma"
         post_approved: "bejegyzés jóváhagyva"
@@ -1502,7 +1506,7 @@ hu:
       from_the_web: "Az internetről"
       remote_tip: "kép linkje"
       local_tip: "Kép kiválasztása a készülékről"
-      local_tip_with_attachments: "Képek vagy fájlok kiválasztása a készülékről {{authorized_extensions}}"
+      local_tip_with_attachments: "Képek vagy fájlok kiválasztása a készülékről %{authorized_extensions}"
       uploading: "Feltöltés"
       select_file: "File kiválasztása."
       default_image_alt_text: Kép
@@ -1521,15 +1525,15 @@ hu:
       no_results: "Nincs eredmény."
       no_more_results: "Nincs több találat."
       searching: "Keresés ..."
-      post_format: "#{{post_number}} általa: {{username}}"
-      results_page: "Keresési eredmény: '{{term}}'"
+      post_format: "#%{post_number} általa: %{username}"
+      results_page: "Keresési eredmény: '%{term}'"
       start_new_topic: "Esetleg kezdj egy új témát?"
       or_search_google: "Vagy helyette próbálj meg a Googlén keresni:"
       search_google: "Helyette próbálj meg a Googlén keresni:"
       search_google_button: "Google"
       search_google_title: "Keresés az oldalon"
       context:
-        user: "Keresés @{{username}} bejegyzései között"
+        user: "Keresés @%{username} bejegyzései között"
         topic: "Keresés ebben a témakörben"
         private_messages: "Üzenetek keresése"
       advanced:
@@ -1587,7 +1591,7 @@ hu:
         posted: "Még egy témakörhöz sem szóltál hozzá."
         latest: "Szomorú, de nem állnak rendelkezésre friss témakörök."
         bookmarks: "Még nem adtál hozzá témakört a könyvjelzőidhez."
-        category: "Nincsenek témakörök a {{category}} kategóriában."
+        category: "Nincsenek témakörök a %{category} kategóriában."
         top: "Nincsenek top témák"
         educate:
           new: '<p> Itt jelennek meg az új témáid. </p><p> Alapértelmezés szerint a témák újnak számítanak, és <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">új</span> jelzővel szereplenek, ha az elmúlt 2 napban készültek. </p><p> Látogasd meg a <a href="%{userPrefsUrl}">beállításokat,</a> ha ezen változtatni szeretnél. </p>'
@@ -1598,7 +1602,7 @@ hu:
         read: "Nincs több olvasott téma."
         new: "Nincs több új témakör."
         unread: "Nincs több olvasatlan témakör."
-        category: "Nincs több {{category}} téma."
+        category: "Nincs több %{category} téma."
         top: "Nincsenek több top témák"
         bookmarks: "Nincs több témakör a könyvjelzők között."
     topic:
@@ -1618,10 +1622,10 @@ hu:
       unread: "olvasatlan"
       new_topics:
         one: "%{count} új téma"
-        other: "{{count}} új téma"
+        other: "%{count} új téma"
       unread_topics:
         one: "%{count} olvasatlan téma"
-        other: "{{count}} olvasatlan téma"
+        other: "%{count} olvasatlan téma"
       title: "Témakör"
       invalid_access:
         title: "Privát témakör"
@@ -1635,19 +1639,19 @@ hu:
         description: "Sajnáljuk, de nem tudtuk megtalálni ezt a témakört. Talán egy moderátor kitörölte volna?"
       total_unread_posts:
         one: "%{count} hozzászólást nem olvastál a témában"
-        other: "{{count}} hozzászólást nem olvastál a témában"
+        other: "%{count} hozzászólást nem olvastál a témában"
       unread_posts:
         one: "%{count} nem olvasott bejegyzés van ebben a témában"
-        other: "{{count}} nem olvasott bejegyzés van ebben a témában"
+        other: "%{count} nem olvasott bejegyzés van ebben a témában"
       new_posts:
         one: "%{count} új bejegyzés van ebben a témában."
-        other: "{{count}} új bejegyzés van ebben a témában."
+        other: "%{count} új bejegyzés van ebben a témában."
       back_to_list: "Vissza a témakörök listájára"
       options: "Témakör beállításai"
       show_links: "linkek megjelenítése ebben a témakörben"
       toggle_information: "témakör részleteinek megjelenítése vagy elrejtése"
-      read_more_in_category: "Szeretnél még többet olvasni? Nézz meg más témakat itt, {{catLink}} vagy itt: {{latestLink}}."
-      read_more: "Szeretnél mégtöbbet olvasni? {{catLink}} vagy {{latestLink}}."
+      read_more_in_category: "Szeretnél még többet olvasni? Nézz meg más témakat itt, %{catLink} vagy itt: %{latestLink}."
+      read_more: "Szeretnél mégtöbbet olvasni? %{catLink} vagy %{latestLink}."
       read_more_MF: "{ UNREAD, plural, =0 {} one { is <a href='{basePath}/unread'>1 unread</a> } other { are <a href='{basePath}/unread'># unread</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 new</a> topic} other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># new</a> topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Böngéssz a kategóriák között
       view_latest_topics: legújabb témák megtekintése
@@ -1783,12 +1787,12 @@ hu:
         title: "Megjelölés"
         success_message: "Sikeresen megjelölted ezt a témát."
       feature_topic:
-        confirm_pin: "Jelenleg {{count}} kiemelt témaköröd van. Túl sok kiemelt téma megzavarhatja az új vagy névtelen felhasználókat. Biztosan kiemelsz egy újabb témát ebben a kategóriában?"
-        unpin: "Téma eltávolítása a {{categoryLink}} kategória elejéről."
-        not_pinned: "Nincsenek kiemelt {{categoryLink}} témák. "
+        confirm_pin: "Jelenleg %{count} kiemelt témaköröd van. Túl sok kiemelt téma megzavarhatja az új vagy névtelen felhasználókat. Biztosan kiemelsz egy újabb témát ebben a kategóriában?"
+        unpin: "Téma eltávolítása a %{categoryLink} kategória elejéről."
+        not_pinned: "Nincsenek kiemelt %{categoryLink} témák. "
         already_pinned_globally:
           one: "Jelenleg globálisan rögzített témák: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Jelenleg globálisan kítűzött témák: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Jelenleg globálisan kítűzött témák: <strong class='badge badge-notification unread'>%{count}</strong>"
         banner_exists: "Jelenleg <strong class='badge badge-notification unread'>van</strong> egy banner téma."
       inviting: "Meghívás..."
       invite_private:
@@ -1812,7 +1816,7 @@ hu:
       filters:
         n_posts:
           one: "%{count} bejegyzés"
-          other: "{{count}} bejegyzés"
+          other: "%{count} bejegyzés"
         cancel: "Szűrő törlése"
       split_topic:
         title: "Áthelyezés új témába"
@@ -1838,7 +1842,7 @@ hu:
         action: "Időbélyeg módosítása"
       multi_select:
         select: "kiválasztás"
-        selected: "kiválasztva ({{count}})"
+        selected: "kiválasztva (%{count})"
         select_post:
           label: "Kiválasztás"
         selected_post:
@@ -1853,14 +1857,14 @@ hu:
         deselect_all: kijelölések törlése
         description:
           one: Kijelöltél <b>%{count}</b> hozzászólást.
-          other: "Kijelöltél <b>{{count}}</b> hozzászólást."
+          other: "Kijelöltél <b>%{count}</b> hozzászólást."
       deleted_by_author:
         one: "(a szerző által visszavont téma automatikusan törlődik az %{count} órában, hacsak nincs megjelölve)"
         other: "(a szerző által visszavont hozzászólás - amennyiben nincs megjelölve - automatikusan törlődik %{count} óra után)"
     post:
       quote_reply: "Idézet"
       edit_reason: "Ok:"
-      post_number: "bejegyzés {{number}}"
+      post_number: "bejegyzés %{number}"
       wiki_last_edited_on: "Wiki utoljára szerkesztve"
       last_edited_on: "utoljára szerkesztve"
       reply_as_new_topic: "Válasz csatolt üzenetként"
@@ -1873,18 +1877,18 @@ hu:
       expand_collapse: "kinyitás/bezárás"
       gap:
         one: "%{count} rejtett válasz megtekintése"
-        other: "{{count}} rejtett válasz megtekintése"
+        other: "%{count} rejtett válasz megtekintése"
       unread: "Olvasatlan bejegyzés"
       has_replies:
-        one: "{{count}} Válasz"
-        other: "{{count}} Válaszok"
+        one: "%{count} Válasz"
+        other: "%{count} Válaszok"
       has_likes_title:
         one: "%{count} emberek tetszett ez a bejegyzés"
-        other: "{{count}} emberek tetszett ez a bejegyzés"
+        other: "%{count} emberek tetszett ez a bejegyzés"
       has_likes_title_only_you: "kedvelted ezt a bejegyzést"
       has_likes_title_you:
         one: "rajtad kívül %{count} embernek tetszett ez a bejegyzés"
-        other: "rajtad kívül {{count}} embernek tetszett ez a bejegyzés"
+        other: "rajtad kívül %{count} embernek tetszett ez a bejegyzés"
       errors:
         create: "Sajnáljuk, de a bejegyzésed létrehozása közben hiba lépett fel. Kérünk próbáld újra!"
         edit: "Sajnáljuk, de a bejegyzésed szerkesztése közben hiba lépett fel. Kérünk próbáld újra!"
@@ -1939,8 +1943,8 @@ hu:
           inappropriate: "nem a témába tartozónak jelölve"
           notify_user: "üzenet küldése"
           like_capped:
-            one: "és {{count}} ezt likeolták"
-            other: "és {{count}} embernek tetszett"
+            one: "és %{count} ezt likeolták"
+            other: "és %{count} embernek tetszett"
         by_you:
           off_topic: "Nem a témába tartozónak jelölve"
           spam: "Spam-ként jelölted"
@@ -2075,7 +2079,7 @@ hu:
       custom_message:
         left:
           one: "%{count} van hátra"
-          other: "{{count}} hátralévő"
+          other: "%{count} hátralévő"
     flagging_topic:
       action: "Téma jelölése"
       notify_action: "Üzenet"
@@ -2114,7 +2118,7 @@ hu:
       unlisted:
         help: "Ez egy nem listázandó témakör, ezért nem fog megjelenni a témakörök listájában és csak közvetlen hivatkozással érhető el."
     posts: "Bejegyzések:"
-    posts_long: "{{number}} darab bejegyzés van a témában"
+    posts_long: "%{number} darab bejegyzés van a témában"
     original_post: "Eredeti Bejegyzés"
     views: "Megtekintések"
     views_lowercase:
@@ -2126,14 +2130,14 @@ hu:
     likes_lowercase:
       one: "kedvelés"
       other: "kedvelés"
-    likes_long: "{{number}} darab kedvelés van a témában"
+    likes_long: "%{number} darab kedvelés van a témában"
     users: "Felhasználók"
     users_lowercase:
       one: "felhasználó"
       other: "felhasználók"
     category_title: "Kategória"
     history: "Előzmények"
-    changed_by: "szerző {{author}}"
+    changed_by: "szerző %{author}"
     raw_email:
       title: "Bejövő email"
       not_available: "Nem elérhető!"
@@ -2144,33 +2148,33 @@ hu:
         title: "Legújabb"
         title_with_count:
           one: "Legutolsó (%{count})"
-          other: "Legutóbbi ({{count}})"
+          other: "Legutóbbi (%{count})"
         help: "a legfrissebb bejegyzések témakörei"
       read:
         title: "Olvasott"
         help: "olvasott témakörök, az olvasás sorrendjének megfelelően"
       categories:
         title: "Kategóriák"
-        title_in: "Kategória - {{categoryName}}"
+        title_in: "Kategória - %{categoryName}"
         help: "minden témakörök, kategóriákba csoportosítva"
       unread:
         title: "Olvasatlan"
         title_with_count:
           one: "Olvasatlan (%{count})"
-          other: "Olvasatlan ({{count}})"
+          other: "Olvasatlan (%{count})"
         help: "az általad figyelt vagy követett témák, melyekben olvasatlan bejegyzések vannak."
         lower_title_with_count:
           one: "%{count} olvasatlan"
-          other: "{{count}} olvasatlan"
+          other: "%{count} olvasatlan"
       new:
         lower_title_with_count:
           one: "%{count} új"
-          other: "{{count}} új"
+          other: "%{count} új"
         lower_title: "új"
         title: "Új"
         title_with_count:
           one: "Új (%{count})"
-          other: "Új ({{count}})"
+          other: "Új (%{count})"
         help: "az elmúlt napokban létrehozott témakörök"
       posted:
         title: "Saját bejegyzéseim"
@@ -2179,11 +2183,11 @@ hu:
         title: "Könyvjelzők"
         help: "Témakörök, amiket könyvjelzővel láttál el"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "legfrissebb témakörök a következő kategóriában: {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "legfrissebb témakörök a következő kategóriában: %{categoryName}"
       top:
         title: "Népszerű"
         help: "a legaktívabb témakörök az elmúlt évben, hónapban, hétben vagy napban"
@@ -2575,10 +2579,10 @@ hu:
         upload:
           label: "Feltöltés"
           uploading: "Feltültés..."
-          error: "Egy hiba lépett fel feltöltés közben '{{filename}}': {{message}}"
+          error: "Egy hiba lépett fel feltöltés közben '%{filename}': %{message}"
         operations:
           is_running: "Egy folyamat jelenleg fut már."
-          failed: "A {{operation}} meghiusúlt. Kérlek ellenőrízd a naplókat."
+          failed: "A %{operation} meghiusúlt. Kérlek ellenőrízd a naplókat."
           cancel:
             label: "Mégse"
             title: "Művelet visszavonása"
@@ -3175,6 +3179,7 @@ hu:
         title: "Emodzsi"
         help: "Adjon hozzá egy új emodzsit, amely mindenki számára elérhető lesz. (PROTIP: fogjon és vigyen több fájlt egyszerre)"
         add: "Új emodzsi hozzáadása"
+        uploading: "Feltöltés…"
         name: "Név"
         group: "Csoport"
         image: "Kép"
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index ca0277d74b..90a58e9344 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -23,8 +23,8 @@ hy:
             mb: ՄԲ
             tb: ՏԲ
       short:
-        thousands: "{{number}}հզ"
-        millions: "{{number}}մլն"
+        thousands: "%{number}հզ"
+        millions: "%{number}մլն"
     dates:
       time: "h:mm"
       time_with_zone: "HH:mm (տեղական)"
@@ -227,11 +227,11 @@ hy:
     weekly: "շաբաթական"
     every_month: "ամիսը մեկ"
     every_six_months: "վեց ամիսը մեկ"
-    max_of_count: "առավելագույնը {{count}}"
+    max_of_count: "առավելագույնը %{count}"
     alternation: "կամ"
     character_count:
-      one: "{{count}} սիմվոլ"
-      other: "{{count}} սիմվոլ"
+      one: "%{count} սիմվոլ"
+      other: "%{count} սիմվոլ"
     related_messages:
       title: " Առնչվող Հաղորդագրություններ"
       see_all: 'Տեսնել %{username}-ի @<a href="%{path}">բոլոր նամակները</a>'
@@ -304,14 +304,14 @@ hy:
         yes_value: "Այո, հրաժարվել"
         no_value: "Ոչ, պահել"
     topic_count_latest:
-      one: "Տեսնել {{count}} նոր կամ թարմացված թեման"
-      other: "Դիտել {{count}} նոր կամ թարմացված թեմաները"
+      one: "Տեսնել %{count} նոր կամ թարմացված թեման"
+      other: "Դիտել %{count} նոր կամ թարմացված թեմաները"
     topic_count_unread:
-      one: "Տեսնել {{count}} չկարդացած թեման"
-      other: "Դիտել {{count}} չկարդացած թեմաները"
+      one: "Տեսնել %{count} չկարդացած թեման"
+      other: "Դիտել %{count} չկարդացած թեմաները"
     topic_count_new:
-      one: "Տեսնել {{count}} նոր թեման"
-      other: "Դիտել {{count}} նոր թեմաները"
+      one: "Տեսնել %{count} նոր թեման"
+      other: "Դիտել %{count} նոր թեմաները"
     preview: "նախադիտում"
     cancel: "չեղարկել"
     save: "Պահպանել Փոփոխությունները"
@@ -319,7 +319,7 @@ hy:
     saved: "Պահված է!"
     upload: "Վերբեռնել"
     uploading: "Վերբեռնվում է..."
-    uploading_filename: "Վերբեռնվում է՝ {{filename}}..."
+    uploading_filename: "Վերբեռնվում է՝ %{filename}..."
     clipboard: "փոխանակման հարթակ"
     uploaded: "Վերբեռնված է !"
     pasting: "Տեղադրվում է..."
@@ -373,7 +373,7 @@ hy:
         optional: "Դուք կարող եք պահանջել այդ էլեմենտը, որպեսզի ուրիշները չկարողանան այն դիտել:  "
         required: "Դուք պետք է նախ՝ հայտ ներկայացնեք, որպեսզի կարողանաք այն դիտեք: "
         claimed_by_you: "Դուք վերցրել եք այդ էլեմենտը և կարող եք այն դիտել: "
-        claimed_by_other: "Այս կետը կարելի է դիտել միայն <b>{{username}}</b>."
+        claimed_by_other: "Այս կետը կարելի է դիտել միայն <b>%{username}</b>."
       claim:
         title: "հայտարարել այս թեման"
       unclaim:
@@ -474,19 +474,19 @@ hy:
         description: "Մենք ստացել ենք Ձեր նոր գրառումը, սակայն այն պետք է հաստատվի մոդերատորի կողմից մինչև ցուցադրվելը: Խնդրում ենք սպասել:"
         ok: "ՕԿ"
     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>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a>-ը պատասխանել է <a href='{{postUrl}}'>{{post_number}}</a> գրառմանը"
-      you_replied_to_post: "<a href='{{userUrl}}'>Դուք</a> պատասխանել եք <a href='{{postUrl}}'>{{post_number}}</a> գրառմանը"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a>-ը պատասխանել է <a href='{{topicUrl}}'>այս թեմային</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Դուք</a> պատասխանել եք <a href='{{topicUrl}}'>այս թեմային</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a>-ը հիշատակել է <a href='{{user2Url}}'>{{another_user}}</a>-ին"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a>-ը հիշատակել է <a href='{{user2Url}}'>Ձեզ</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Դուք</a> հիշատակել եք <a href='{{user2Url}}'>{{another_user}}</a>-ին"
-      posted_by_user: "Հրապարակվել է <a href='{{userUrl}}'>{{user}}</a>-ի կողմից"
-      posted_by_you: "Հրապարակվել է <a href='{{userUrl}}'>Ձեր</a> կողմից"
-      sent_by_user: "Ուղարկվել է<a href='{{userUrl}}'>{{user}}</a>-ի կողմից"
-      sent_by_you: "Ուղարկվել է <a href='{{userUrl}}'>Ձեր</a>կողմից"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a>-ը հրապարակել է <a href='%{topicUrl}'>այս թեման</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Դուք</a> հրապարակել եք <a href='%{topicUrl}'>այս թեման</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a>-ը պատասխանել է <a href='%{postUrl}'>%{post_number}</a> գրառմանը"
+      you_replied_to_post: "<a href='%{userUrl}'>Դուք</a> պատասխանել եք <a href='%{postUrl}'>%{post_number}</a> գրառմանը"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a>-ը պատասխանել է <a href='%{topicUrl}'>այս թեմային</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Դուք</a> պատասխանել եք <a href='%{topicUrl}'>այս թեմային</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a>-ը հիշատակել է <a href='%{user2Url}'>%{another_user}</a>-ին"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a>-ը հիշատակել է <a href='%{user2Url}'>Ձեզ</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Դուք</a> հիշատակել եք <a href='%{user2Url}'>%{another_user}</a>-ին"
+      posted_by_user: "Հրապարակվել է <a href='%{userUrl}'>%{user}</a>-ի կողմից"
+      posted_by_you: "Հրապարակվել է <a href='%{userUrl}'>Ձեր</a> կողմից"
+      sent_by_user: "Ուղարկվել է<a href='%{userUrl}'>%{user}</a>-ի կողմից"
+      sent_by_you: "Ուղարկվել է <a href='%{userUrl}'>Ձեր</a>կողմից"
     directory:
       filter_name: "ֆիլտրել ըստ օգտանվան"
       title: "Օգտատերեր"
@@ -719,7 +719,7 @@ hy:
     user_fields:
       none: "(ընտրել)"
     user:
-      said: "{{username}} ՝"
+      said: "%{username} ՝"
       profile: "Պրոֆիլ"
       mute: "Խլացնել"
       edit: "Խմբագրել Նախընտրությունները"
@@ -794,12 +794,12 @@ hy:
       enable_defer: "Սեղմել <<Հետաձգում>> կոճակը, նշելով որպես չընթերցված թեմաներ "
       change: "փոխել"
       featured_topic: "Հանրահայտ թեմա"
-      moderator: "{{user}}-ը մոդերատոր է"
-      admin: "{{user}}-ը ադմին է"
+      moderator: "%{user}-ը մոդերատոր է"
+      admin: "%{user}-ը ադմին է"
       moderator_tooltip: "Այս օգտատերը մոդերատոր է"
       admin_tooltip: "Այս օգտատերն ադմին է"
       silenced_tooltip: "Այս օգտատերը լռեցված է"
-      suspended_notice: "Այս օգտատերը սառեցված է մինչև {{date}}:"
+      suspended_notice: "Այս օգտատերը սառեցված է մինչև %{date}:"
       suspended_permanently: "Այս օգտատերը սառեցված է"
       suspended_reason: "Պատճառը՝ "
       github_profile: "Github"
@@ -812,7 +812,7 @@ hy:
           Խլացված թեմաները և կատեգորիաները ներառված չեն լինի այս էլ. նամակներում:
         individual: "Ուղարկել էլ. նամակ յուրաքանչյուր նոր գրառման համար"
         individual_no_echo: "Ուղարկել էլ. նամակ յուրաքանչյուր նոր գրառման համար, բացառությամբ իմ սեփականների"
-        many_per_day: "Ստանալ էլ. նամակ յուրաքանչյուր նոր գրառման համար (օրը մոտ {{dailyEmailEstimate}} հատ)"
+        many_per_day: "Ստանալ էլ. նամակ յուրաքանչյուր նոր գրառման համար (օրը մոտ %{dailyEmailEstimate} հատ)"
         few_per_day: "Ստանալ էլ. նամակ յուրաքանչյուր նոր գրառման համար (օրը մոտ 2 հատ)"
         warning: "Փոստային ցուցակի ռեժիմը միացված է: Էլ. փոստով ծանուցումների կարգավորումները վերասահմանված են: "
       tag_settings: "Թեգեր"
@@ -842,9 +842,7 @@ hy:
       admin_delete: "Ջնջել"
       users: "Օգտատերեր"
       muted_users: "Խլացված"
-      muted_users_instructions: "Արգելել այս օգտատերերից բոլոր ծանուցումները:"
       ignored_users: "Անտեսված"
-      ignored_users_instructions: "Թաքցնել բոլոր գրառումները և ծանուցումները այս օգտատերերից:"
       tracked_topics_link: "Ցուցադրել"
       automatically_unpin_topics: "Ավտոմատ կերպով ապակցել թեմաները, երբ ես հասնեմ ներքև:"
       apps: "Հավելվածներ"
@@ -899,12 +897,12 @@ hy:
         disable: "Անջատել"
         enable: "Միացնել"
         enable_long: "Միացնել պահուստային կոդերը"
-        manage: "Կառավարել պահուստային կոդերով: Ձեզ մնացել է պահուստային <strong>{{count}}</strong> կոդ:"
+        manage: "Կառավարել պահուստային կոդերով: Ձեզ մնացել է պահուստային <strong>%{count}</strong> կոդ:"
         copy_to_clipboard: "Կրկնօրինակել Փոխանակման Հարթակում"
         copy_to_clipboard_error: "Փոխանակման հարթակում տվյալների կրկնօրինակման սխալ"
         copied_to_clipboard: "Կրնօրինակված է Փոխանակման հարթակում"
         download_backup_codes: "Ներբեռնել պահուստային կոդերը"
-        remaining_codes: "Ձեզ մնացել է պահուստային <strong>{{count}}</strong> կոդ:"
+        remaining_codes: "Ձեզ մնացել է պահուստային <strong>%{count}</strong> կոդ:"
         use: "Օգտագործել պահուստային կոդը"
         enable_prerequisites: "Դուք պետք է ակտիվացնեք առաջնային երկրորդ գործոնը՝ պահուստային կոդերի գեներացիայից առաջ:"
         codes:
@@ -967,10 +965,10 @@ hy:
         success_staff: "Մենք ուղարկել ենք էլ. նամակ Ձեր ընթացիկ հասցեին: Խնդրում ենք հետևել հաստատման հրահանգներին:"
       change_avatar:
         title: "Փոխել Ձեր պրոֆիլի նկարը"
-        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a> , հիմնված"
-        gravatar_title: "Փոխեք Ձեր անձնապատրկեը Gravatar-ի կայքում {{gravatarName}} "
-        gravatar_failed: "Մենք չկարողացանք գտնել Gravatar {{gravatarName}} այդ էլ. հասցեով:"
-        refresh_gravatar_title: "Թարմացնել Ձեր Gravatar-ը {{gravatarName}}"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a> , հիմնված"
+        gravatar_title: "Փոխեք Ձեր անձնապատրկեը Gravatar-ի կայքում %{gravatarName} "
+        gravatar_failed: "Մենք չկարողացանք գտնել Gravatar %{gravatarName} այդ էլ. հասցեով:"
+        refresh_gravatar_title: "Թարմացնել Ձեր Gravatar-ը %{gravatarName}"
         letter_based: "Համակարգի կողմից դրված պրոֆիլի նկար"
         uploaded_avatar: "Անհատական նկար"
         uploaded_avatar_empty: "Ավելացնել անհատական նկար"
@@ -994,11 +992,11 @@ hy:
         instructions: "Երբեք չի ցուցադրվում հանրությանը"
         ok: "Հաստատման համար մենք Ձեզ կուղարկենք էլ. նամակ"
         invalid: "Խնդրում ենք մուտքագրել վավեր էլ. հասցե"
-        authenticated: "Ձեր էլ. հասցեն վավերացվել է {{provider}}-ի կողմից"
+        authenticated: "Ձեր էլ. հասցեն վավերացվել է %{provider}-ի կողմից"
         frequency_immediately: "Մենք անհապաղ Ձեզ էլ. նամակ կուղարկենք, եթե դեռևս Դուք դա չեք կարդացել կայքում:"
         frequency:
           one: "Մենք էլ. նամակ կուղարկենք Ձեզ միայն այն դեպքում, եթե մենք չենք տեսել Ձեզ վերջին րոպեի ընթացքում:"
-          other: "Մենք Ձեզ էլ. նամակ կուղարկենք միայն այն դեպքում, եթե մենք չենք տեսել Ձեզ վերջին {{count}} րոպեի ընթացքում:"
+          other: "Մենք Ձեզ էլ. նամակ կուղարկենք միայն այն դեպքում, եթե մենք չենք տեսել Ձեզ վերջին %{count} րոպեի ընթացքում:"
       associated_accounts:
         title: "Կապակցված Հաշիվներ"
         connect: "Կապել"
@@ -1018,9 +1016,9 @@ hy:
       username:
         title: "Օգտանուն"
         instructions: "եզակի, առանց բացատների, կարճ"
-        short_instructions: "Մարդիկ կարող են հիշատակել Ձեզ որպես @{{username}}"
+        short_instructions: "Մարդիկ կարող են հիշատակել Ձեզ որպես @%{username}"
         available: "Ձեր օգտանունը հասանելի է"
-        not_available: "Հասանելի չէ: Փորձե՞լ {{suggestion}}-ը:"
+        not_available: "Հասանելի չէ: Փորձե՞լ %{suggestion}-ը:"
         not_available_no_suggestion: "Հասանելի չէ"
         too_short: "Ձեր օգտանունը շատ կարճ է"
         too_long: "Ձեր օգտանունը շատ երկար է"
@@ -1043,11 +1041,11 @@ hy:
         log_out_all: "Դուրս գրվել բոլոր սարքերից"
         active: "հիմա ակտիվ է"
         not_you: "Դուք չե՞ք:"
-        show_all: "Ցուցադրել բոլորը ({{count}})"
+        show_all: "Ցուցադրել բոլորը (%{count})"
         show_few: "Ցուցադրել ավելի քիչ"
         was_this_you: "Սա Դո՞ւք էիք:"
         was_this_you_description: "Եթե դա Դուք չէիք, մենք խորհուրդ ենք տալիս փոխել Ձեր գաղտնաբառը և դուրս գրվել բոլոր սարքերից: "
-        browser_and_device: "{{browser}} {{device}}-ի վրա"
+        browser_and_device: "%{browser} %{device}-ի վրա"
         secure_account: "Ապահովագրել իմ Հաշիվը"
         latest_post: "Դուք վերջին անգամ հրապարակում կատարել եք..."
       last_posted: "Վերջին Գրառումը"
@@ -1127,20 +1125,19 @@ hy:
         none: "Հրավերներ չկան:"
         truncated:
           one: "Առաջին հրավերի ցուցադրում"
-          other: "Ցույց են տրված առաջին {{count}} հրավերները:"
+          other: "Ցույց են տրված առաջին %{count} հրավերները:"
         redeemed: "Ընդունված Հրավերները"
         redeemed_tab: "Ընդունված"
-        redeemed_tab_with_count: "Ընդունված ({{count}})"
+        redeemed_tab_with_count: "Ընդունված (%{count})"
         redeemed_at: "Ընդունվել է"
         pending: "Սպասող Հրավերներ"
         pending_tab: "Սպասող"
-        pending_tab_with_count: "Սպասող ({{count}})"
+        pending_tab_with_count: "Սպասող (%{count})"
         topics_entered: "Դիտված Թեմաները"
         posts_read_count: "Կարդացած Գրառում"
         expired: "Այս հրավերի ժամկետն անցել է:"
         rescind: "Հեռացնել"
         rescinded: "Հրավերը հեռացված է"
-        rescind_all: "Հեռացնել բոլոր Ժամկետանց Հրավերները"
         rescinded_all: "Բոլոր Ժամկետանց Հրավերները հեռացված են!"
         rescind_all_confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք հեռացնել բոլոր ժամկետանց հրավերները:"
         reinvite: "Հրավերը կրկին ուղարկել"
@@ -1151,13 +1148,18 @@ hy:
         time_read: "Կարդացած Ժամանակը"
         days_visited: "Այցելության Օր"
         account_age_days: "Հաշվի տարիքը օրերով"
+        links_tab: "Հղումներ"
+        link_created_at: "Ստեղծված"
+        link_groups: Խմբեր
         create: "Ուղարկել Հրավեր"
         generate_link: "Կրկնօրինակել Հրավերի Հղումը"
         link_generated: "Հրավերի հղումը հաջողությամբ գեներացված է!"
         valid_for: "Հրավերի հղումը վավեր է միայն հետևյալ էլ. հասցեի համար՝ %{email}"
+        single_user: "Առանձին Օգտատեր "
+        invite_link:
+          success: "Հրավերի հղումը հաջողությամբ գեներացված է!"
         bulk_invite:
           none: "Դուք դեռևս ոչ ոքի չեք հրավիրել այստեղ: Ուղարկեք անհատական հրավերներ կամ հրավիրեք բազմաթիվ մարդկանց միանգամից՝ <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>վերբեռնելով CSV ֆայլ</a>:"
-          text: "Զանգվածային Հրավեր ֆայլից"
           success: "Ֆայլը հաջողությամբ վերբեռնվել է, Դուք կստանաք ծանուցում հաղորդագրության միջոցով, երբ գործընթացն ավարտվի:"
           error: "Ներողություն, ֆայլը պետք է լինի CSV ձևաչափով:"
           confirmation_message: "Դուք պատրաստվում եք էլ. նամակով հրավերներ ուղարկել վերբեռնված ֆայլում բոլոր նշվածներին:"
@@ -1248,7 +1250,7 @@ hy:
       desc:
         network: "Խնդրում ենք ստուգել Ձեր ինտերնետը:"
         network_fixed: "Կապը համացանցին վերականգնվեց:"
-        server: "Սխալի կոդը՝ {{status}}"
+        server: "Սխալի կոդը՝ %{status}"
         forbidden: "Ձեզ թույլատրված չէ դիտել դա:"
         not_found: "Վա՜յ, հավելվածը փորձել է բեռնել գոյություն չունեցող URL:"
         unknown: "Ինչ-որ բան այն չէ:"
@@ -1300,8 +1302,8 @@ hy:
       value_prop: "Երբ Դուք ստեղծում եք հաշիվ, մենք հստակ հիշում ենք, թե Դուք ինչ եք կադացել, այսպիսով՝ Դուք միշտ վերադառնում եք ճիշտ այնտեղ, որտեղ կանգնել էիք: Դուք նաև ստանում եք ծանուցումներ այստեղ և էլ. փոստով, երբ որևէ մեկը պատասխանում է Ձեզ: Եվ Դուք կարող եք հավանել գրառումներ՝ կիսվելով սիրով: :heartpulse:"
     summary:
       enabled_description: "Դուք դիտում եք այս թեմայի ամփոփումը՝ համայնքի կողմից որոշված ամենահետաքրքիր գրառումները:"
-      description: "Կա <b>{{replyCount}}</b> պատասխան:"
-      description_time: "Կա <b>{{replyCount}}</b> պատասխան՝ մոտավորապես <b>{{readingTime}} րոպե</b> կարդալու ժամանակով:"
+      description: "Կա <b>%{replyCount}</b> պատասխան:"
+      description_time: "Կա <b>%{replyCount}</b> պատասխան՝ մոտավորապես <b>%{readingTime} րոպե</b> կարդալու ժամանակով:"
       enable: "Ամփոփել Այս Թեման"
       disable: "Ցուցադրել Բոլոր Գրառումները"
     deleted_filter:
@@ -1314,8 +1316,8 @@ hy:
       invite: "Հրավիրել այլ Մարդկանց ..."
       edit: "Ավելացնել կամ Հեռացնել ..."
       leave_message: "Դուք իսկապե՞ս ցանկանում եք թողնել այս հաղորդագրությունը:"
-      remove_allowed_user: "Դուք իսկապե՞ս ցանկանում եք հեռացնել {{name}}-ը այս հաղորդագրությունից:"
-      remove_allowed_group: "Դուք իսկապե՞ս ցանկանում եք հեռացնել {{name}}-ը այս հաղորդագրությունից:"
+      remove_allowed_user: "Դուք իսկապե՞ս ցանկանում եք հեռացնել %{name}-ը այս հաղորդագրությունից:"
+      remove_allowed_group: "Դուք իսկապե՞ս ցանկանում եք հեռացնել %{name}-ը այս հաղորդագրությունից:"
     email: "Էլ. հասցե"
     username: "Օգտանուն"
     last_seen: "Ակտիվ էր"
@@ -1324,7 +1326,7 @@ hy:
     trust_level: "Վստահության Մակարդակ"
     search_hint: "օգտանուն, էլ. հասցե կամ IP հասցե"
     create_account:
-      disclaimer: "Գրանցվելով դուք ընդունում եք <a href='{{privacy_link}}' target='blank'> գաղտնիության քաղաքականությունը </a> և <a href='{{tos_link}}' target='blank'> պայմանները </a>:"
+      disclaimer: "Գրանցվելով դուք ընդունում եք <a href='%{privacy_link}' target='blank'> գաղտնիության քաղաքականությունը </a> և <a href='%{tos_link}' target='blank'> պայմանները </a>:"
       title: "Ստեղծել Նոր Հաշիվ"
       failed: "Ինչ-որ սխալ է տեղի ունեցել, հնարավոր է՝ այս էլ. հասցեն արդեն գրանցված է, փորձեք կատարել գաղտնաբառի վերականգնում:"
     forgot_password:
@@ -1383,7 +1385,7 @@ hy:
       awaiting_activation: "Ձեր հաշիվն ակտիվացված չէ, օգտագործեք մոռացել եմ գաղտնաբառը հղումը՝ ակտիվացման մեկ այլ էլ. նամակ ստանալու համար:"
       awaiting_approval: "Ձեր հաշիվը դեռևս չի հաստատվել անձնակազմի կողմից: Երբ այն հաստատվի, Դուք կստանաք էլ. նամակ:"
       requires_invite: "Ներողություն, այս ֆորումին թույլտվությունը միայն հրավերով է:"
-      not_activated: "Դուք դեռևս չեք կարող մուտք գործել: Մենք որոշ ժամանակ առաջ Ձեզ ուղարկել ենք ակտիվացման նամակ <b>{{sentTo}}</b> էլ. հասցեին: Խնդրում ենք հետևել այդ նամակի հրահանգներին՝ Ձեր հաշիվը ակտիվացնելու համար:"
+      not_activated: "Դուք դեռևս չեք կարող մուտք գործել: Մենք որոշ ժամանակ առաջ Ձեզ ուղարկել ենք ակտիվացման նամակ <b>%{sentTo}</b> էլ. հասցեին: Խնդրում ենք հետևել այդ նամակի հրահանգներին՝ Ձեր հաշիվը ակտիվացնելու համար:"
       not_allowed_from_ip_address: "Դուք չեք կարող մուտք գործել այդ IP հասցեից:"
       admin_not_allowed_from_ip_address: "Դուք չեք կարող մուտք գործել որպես ադմին այդ IP հասցեից:"
       resend_activation_email: "Սեղմեք այստեղ՝ ակտիվացման նամակը կրկին ուղարկելու համար: "
@@ -1392,7 +1394,7 @@ hy:
       change_email: "Փոփոխել Էլ. Հասցեն"
       provide_new_email: "Տրամադրեք նոր էլ. հասցե, և մենք կրկին կուղարկենք հաստատման էլ. նամակը:"
       submit_new_email: "Փոխել Էլ. Հասցեն"
-      sent_activation_email_again: "Մենք ուղարկել ենք ակտիվացման մեկ այլ նամակ <b>{{currentEmail}}</b> էլ. հասցեին: Այն կհասնի մի քանի րոպեի ընթացքում; խնդրում ենք անպայման ստուգել նաև Ձեր Սպամ թղթապանակը:"
+      sent_activation_email_again: "Մենք ուղարկել ենք ակտիվացման մեկ այլ նամակ <b>%{currentEmail}</b> էլ. հասցեին: Այն կհասնի մի քանի րոպեի ընթացքում; խնդրում ենք անպայման ստուգել նաև Ձեր Սպամ թղթապանակը:"
       sent_activation_email_again_generic: "Մենք ուղարկել ենք ակտիվացիայի մեկ այլ նամակ: Այն կժամանի մի քանի րոպեի ընթացքում. ստուգեք նաև սպամի արկղը:"
       to_continue: "Խնդրում ենք Մուտք Գործել"
       preferences: "Ձեր նախընտրությունները փոփոխելու համար անհրաժեշտ է մուտք գործել:"
@@ -1456,20 +1458,20 @@ hy:
     conditional_loading_section:
       loading: Բեռնվում է...
     category_row:
-      topic_count: "{{count}} թեմաներ այս կատեգորիայում "
+      topic_count: "%{count} թեմաներ այս կատեգորիայում "
     select_kit:
       default_header_text: Ընտրել...
       no_content: Համընկնումներ չեն գտնվել
       filter_placeholder: Որոնում...
       filter_placeholder_with_any: Որոնել կամ ստեղծել...
-      create: "Ստեղծել '{{content}}'"
+      create: "Ստեղծել '%{content}'"
       max_content_reached:
-        one: "Դուք կարող եք ընտրել միայն {{count}} տարր:"
-        other: "Դուք կարող եք ընտրել միայն {{count}} տարր:"
+        one: "Դուք կարող եք ընտրել միայն %{count} տարր:"
+        other: "Դուք կարող եք ընտրել միայն %{count} տարր:"
       min_content_not_reached:
-        one: "Ընտրեք առնվազն{{count}} տարր:"
-        other: "Ընտրեք առնվազն {{count}} տարր:"
-      invalid_selection_length: "Անհրաժեշտ է ընտրել առնվազն {{count}} սիմվոլ: "
+        one: "Ընտրեք առնվազն%{count} տարր:"
+        other: "Ընտրեք առնվազն %{count} տարր:"
+      invalid_selection_length: "Անհրաժեշտ է ընտրել առնվազն %{count} սիմվոլ: "
     date_time_picker:
       from: Ում կողմից
       to: Ում
@@ -1496,7 +1498,7 @@ hy:
       default: Մասնավոր էմոջիներ
     shared_drafts:
       title: "Կիսված Սևագրեր"
-      notice: "Այս թեման տեսանելի է միայն նրանց, ովքեր կարող են տեսնել <b>{{category}}</b> կատեգորիան:"
+      notice: "Այս թեման տեսանելի է միայն նրանց, ովքեր կարող են տեսնել <b>%{category}</b> կատեգորիան:"
       destination_category: "Նպատակային Կատեգորիա"
       publish: "Հրատարակել կիսված սևագիրը"
       confirm_publish: "Դուք համոզվա՞ծ եք, որ ցանկանում եք հրատարակել այս սևագիրը:"
@@ -1516,24 +1518,24 @@ hy:
       similar_topics: "Ձեր թեման նման է..."
       drafts_offline: "Օֆլայն սևագրեր"
       edit_conflict: "խմբագրել հակասությունը"
-      group_mentioned_limit: "<b>Նախազգուշացում!</b> Դուք հիշատակել եք <a href='{{group_link}}'>{{group}}</a> խումբը, սակայն այս խումբն ունի ավելի շատ անդամ, քան ադմինիստրատորի կողմից կարգավորված հիշատակումների {{max}} սահմանային թիվը: Ոչ ոք ծանուցում չի ստանա:"
+      group_mentioned_limit: "<b>Նախազգուշացում!</b> Դուք հիշատակել եք <a href='%{group_link}'>%{group}</a> խումբը, սակայն այս խումբն ունի ավելի շատ անդամ, քան ադմինիստրատորի կողմից կարգավորված հիշատակումների %{max} սահմանային թիվը: Ոչ ոք ծանուցում չի ստանա:"
       group_mentioned:
-        one: "Նշելով {{group}} ՝ Դուք ծանուցում եք <a href='{{group_link}}'>%{count} person</a> . Դուք համոզվա՞ծ եք:"
-        other: "Հիշատակելով {{group}}-ը՝ Դուք ծանուցում կուղարկեք <a href='{{group_link}}'>{{count}} օգտագիրոջ</a>: Համոզվա՞ծ եք:"
+        one: "Նշելով %{group} ՝ Դուք ծանուցում եք <a href='%{group_link}'>%{count} person</a> . Դուք համոզվա՞ծ եք:"
+        other: "Հիշատակելով %{group}-ը՝ Դուք ծանուցում կուղարկեք <a href='%{group_link}'>%{count} օգտագիրոջ</a>: Համոզվա՞ծ եք:"
       cannot_see_mention:
-        category: "Դուք հիշատակել եք {{username}}-ին, բայց նա ծանուցում չի ստանա, քանի որ այս կատեգորիան նրան հասանելի չէ: Դուք պետք է ավելացնեք նրան որևէ խմբում, որը թուլտվություն ունի այս կատեգորիային:"
-        private: "Դուք հիշատակել եք {{username}}-ին, բայց նա ծանուցում չի ստանա, քանի որ չի կարող տեսնել այս անձնական նամակը: Դուք պետք է հրավիրեք նրան այս անձնական նամակագրությանը:"
-      duplicate_link: "Կարծես թե դեպի <b>{{domain}}</b> Ձեր հղումն արդեն իսկ հրապարակված է թեմայում <b>@{{username}}</b>-ի <a href='{{post_url}}'>պատասխանում {{ago}}</a>: Դուք համոզվա՞ծ եք, որ ցանկանում եք այն կրկին հրապարակել:"
-      reference_topic_title: "RE: {{title}}"
+        category: "Դուք հիշատակել եք %{username}-ին, բայց նա ծանուցում չի ստանա, քանի որ այս կատեգորիան նրան հասանելի չէ: Դուք պետք է ավելացնեք նրան որևէ խմբում, որը թուլտվություն ունի այս կատեգորիային:"
+        private: "Դուք հիշատակել եք %{username}-ին, բայց նա ծանուցում չի ստանա, քանի որ չի կարող տեսնել այս անձնական նամակը: Դուք պետք է հրավիրեք նրան այս անձնական նամակագրությանը:"
+      duplicate_link: "Կարծես թե դեպի <b>%{domain}</b> Ձեր հղումն արդեն իսկ հրապարակված է թեմայում <b>@%{username}</b>-ի <a href='%{post_url}'>պատասխանում %{ago}</a>: Դուք համոզվա՞ծ եք, որ ցանկանում եք այն կրկին հրապարակել:"
+      reference_topic_title: "RE: %{title}"
       error:
         title_missing: "Վերնագիրը պարտադիր է:"
-        title_too_short: "Վերնագիրը պետք է լինի առնվազն {{min}} սիմվոլ:"
-        title_too_long: "Վերնագիրը չպետք է գերազանցի {{max}} սիմվոլը:"
+        title_too_short: "Վերնագիրը պետք է լինի առնվազն %{min} սիմվոլ:"
+        title_too_long: "Վերնագիրը չպետք է գերազանցի %{max} սիմվոլը:"
         post_missing: "Գրառումը չի կարող դատարկ լինել:"
-        post_length: "Գրառումը պետք է լինի առնվազն {{min}} սիմվոլ:"
-        try_like: "Դուք փորձե՞լ եք {{heart}} կոճակը:"
+        post_length: "Գրառումը պետք է լինի առնվազն %{min} սիմվոլ:"
+        try_like: "Դուք փորձե՞լ եք %{heart} կոճակը:"
         category_missing: "Դուք պետք է ընտրեք կատեգորիա:"
-        tags_missing: "Դուք պետք է ընտրեք առնվազն{{count}} թեգ:"
+        tags_missing: "Դուք պետք է ընտրեք առնվազն%{count} թեգ:"
         topic_template_not_modified: "Դետալները գրանցել թեմայի մեջ և խմբագրել ձևանմուշը: "
       save_edit: "Պահել Խմբագրումը"
       overwrite_edit: "Վերասահմանել Խմբագրումը"
@@ -1631,57 +1633,57 @@ hy:
       tooltip:
         regular:
           one: "%{count} չդիտված ծանուցում"
-          other: "{{count}} չդիտված ծանուցում"
+          other: "%{count} չդիտված ծանուցում"
         message:
           one: "%{count} չկարդացած հաղորդագրություն"
-          other: "{{count}} չկարդացած հաղորդագրություն"
+          other: "%{count} չկարդացած հաղորդագրություն"
       title: "@անունի հիշատակումների, Ձեր գրառումների և թեմաների պատասխանների, հաղորդագրությունների և այլնի մասին ծանուցումներ "
       none: "Սյս պահին հնարավոր չէ բեռնել ծանուցումները"
       empty: "Ծանուցումներ չեն գտնվել:"
       post_approved: "Ձեր գրառումը հաստատված է"
       reviewable_items: "վերանայում պահանջող կետեր"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} and %{count} other</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} և ևս {{count}}-ը</span> {{description}}"
+        one: "<span>%{username}, %{username2} and %{count} other</span> %{description}"
+        other: "<span>%{username}, %{username2} և ևս %{count}-ը</span> %{description}"
       liked_consolidated_description:
-        one: "հավանել է Ձեր {{count}} գրառում"
-        other: "հավանել է Ձեր {{count}} գրառումը"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span>-ը ընդունել է Ձեր հրավերը"
-      moved_post: "<span>{{username}}</span>-ը տեղափոխել է {{description}}-ը"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Վասատկել է '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Նոր Թեմա</span> {{description}}"
-      membership_request_accepted: "Անդամակցության հարցումը ընդունվել է՝ '{{group_name}}'"
-      membership_request_consolidated: "{{count}} բաց անդամակցության հարցումներ '{{group_name}}' "
+        one: "հավանել է Ձեր %{count} գրառում"
+        other: "հավանել է Ձեր %{count} գրառումը"
+      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}"
+      invitee_accepted: "<span>%{username}</span>-ը ընդունել է Ձեր հրավերը"
+      moved_post: "<span>%{username}</span>-ը տեղափոխել է %{description}-ը"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Վասատկել է '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Նոր Թեմա</span> %{description}"
+      membership_request_accepted: "Անդամակցության հարցումը ընդունվել է՝ '%{group_name}'"
+      membership_request_consolidated: "%{count} բաց անդամակցության հարցումներ '%{group_name}' "
       group_message_summary:
-        one: "{{count}} հաղորդագրություն Ձեր {{group_name}} մուտքային արկղում"
-        other: "{{count}} հաղորդագրություն Ձեր {{group_name}}-ի մուտքային արկղում"
+        one: "%{count} հաղորդագրություն Ձեր %{group_name} մուտքային արկղում"
+        other: "%{count} հաղորդագրություն Ձեր %{group_name}-ի մուտքային արկղում"
       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}}'
+        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}} -ից մինչև %{site_title}"
+        custom: "Ծանուցում %{username} -ից մինչև %{site_title}"
       titles:
         mentioned: "Հիշատակված "
         replied: "նոր պատասխան"
@@ -1711,9 +1713,9 @@ hy:
       from_my_computer: "Իմ սարքից"
       from_the_web: "Համացանցից"
       remote_tip: "նկարի հղումը"
-      remote_tip_with_attachments: "նկարի կամ ֆայլի հղում՝ {{authorized_extensions}}"
+      remote_tip_with_attachments: "նկարի կամ ֆայլի հղում՝ %{authorized_extensions}"
       local_tip: "ընտրեք նկարներ Ձեր սարքից"
-      local_tip_with_attachments: "ընտրեք նկարներ կամ ֆայլեր Ձեր սարքից՝ {{authorized_extensions}}"
+      local_tip_with_attachments: "ընտրեք նկարներ կամ ֆայլեր Ձեր սարքից՝ %{authorized_extensions}"
       hint: "(վերբեռնելու համար կարող եք նաև քաշել և գցել խմբագրիչի մեջ)"
       hint_for_supported_browsers: "Դուք կարող եք նաև քաշել և գցել կամ տեղադրել նկարները խմբագրիչի մեջ"
       uploading: "Վերբեռնվում է"
@@ -1730,15 +1732,15 @@ hy:
       clear_all: "Մաքրել Բոլորը"
       too_short: "Ձեր որոնման տեքստը շատ կարճ է:"
       result_count:
-        one: "<span>%{count} result for</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} արդյունք</span><span class='term'>{{term}}</span>-ի համար"
+        one: "<span>%{count} result for</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} արդյունք</span><span class='term'>%{term}</span>-ի համար"
       title: "որոնել թեմաներ, հաղորդագրություններ, օգտատերեր կամ կատեգորիաներ"
       full_page_title: "որոնել թեմաներ կամ հաղորդագրություններ"
       no_results: "Արդյունքներ չեն գտնվել:"
       no_more_results: "Արդյունքներ այլևս չեն գտնվել:"
       searching: "Փնտրվում է..."
-      post_format: "#{{post_number}} {{username}}-ի կողմից"
-      results_page: "Որոնել արդյունքները '{{term}}'-ի համար"
+      post_format: "#%{post_number} %{username}-ի կողմից"
+      results_page: "Որոնել արդյունքները '%{term}'-ի համար"
       more_results: "Գտնվել են բազմաթիվ արդյունքներ: Խնդրում ենք հստակեցնել Ձեր որոնման չափանիշները:"
       cant_find: "Չե՞ք կարողանում գտնել այն, ինչ փնտրում էիք:"
       start_new_topic: "Միգուցե՞ սկսեք նոր թեմա:"
@@ -1747,9 +1749,9 @@ hy:
       search_google_button: "Google"
       search_google_title: "Որոնել այս կայքում"
       context:
-        user: "Որոնել @{{username}}-ի գրառումները"
-        category: "Որոնել #{{category}} կատեգորիայում"
-        tag: "Որոնում #{{tag}} թեգով"
+        user: "Որոնել @%{username}-ի գրառումները"
+        category: "Որոնել #%{category} կատեգորիայում"
+        tag: "Որոնում #%{tag} թեգով"
         topic: "Որոնել այս թեմայում"
         private_messages: "Որոնել հաղորդագրություններում"
       advanced:
@@ -1826,7 +1828,7 @@ hy:
         choose_new_category: "Ընտրել նոր կատեգորիա թեմաների համար՝"
         selected:
           one: "Դուք ընտրել եք <b>%{count}</b> թեմա:"
-          other: "Դուք ընտրել եք <b>{{count}}</b> թեմա:"
+          other: "Դուք ընտրել եք <b>%{count}</b> թեմա:"
         change_tags: "Փոխարինել Թեգերը"
         append_tags: "Ավելացնել Թեգեր"
         choose_new_tags: "Ընտրել նոր թեգեր այս թեմաների համար՝"
@@ -1839,7 +1841,7 @@ hy:
         posted: "Դուք դեռևս գրառում չեք կատարել ոչ մի թեմայում:"
         latest: "Վերջերս կատարված հրապարակումներ չկան: Տխուր է:"
         bookmarks: "Դուք դեռևս չունեք էջանշված թեմաներ:"
-        category: " {{category}}-ում թեմաներ չկան:"
+        category: " %{category}-ում թեմաներ չկան:"
         top: "Թոփ թեմաներ չկան:"
         educate:
           new: '<p>Ձեր նոր թեմաները ցույց կտրվեն այստեղ:</p><p>Սկզբում թեմաները համարվում են նոր և ցույց է տրվում <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">նոր</span> ցուցիչը, եթե նրանք ստեղծվել են վերջին 2 օրվա ընթացում:</p><p>Սա փոփոխելու համար բացեք Ձեր <a href="%{userPrefsUrl}">նախընտրությունները</a>:</p>'
@@ -1850,13 +1852,13 @@ hy:
         read: "Կարդացած թեմաներ այլևս չկան:"
         new: "Նոր թեմաներ այլևս չկան:"
         unread: "Չկարդացած թեմաներ այլևս չկան:"
-        category: "{{category}}-ում թեմաներ այլևս չկան:"
+        category: "%{category}-ում թեմաներ այլևս չկան:"
         top: "Թոփ թեմաներ այլևս չկան:"
         bookmarks: "Էջանշված թեմաներ այլևս չկան:"
     topic:
       filter_to:
         one: "%{count} հրապարակում թեմայում"
-        other: "{{count}} գրառում թեմայում"
+        other: "%{count} գրառում թեմայում"
       create: "Նոր Թեմա"
       create_long: "Ստեղծել Նոր Թեմա"
       open_draft: "Բացել Սևագիրը"
@@ -1885,10 +1887,10 @@ hy:
       unread: "չկարդացած"
       new_topics:
         one: "%{count} նոր թեմա"
-        other: "{{count}} նոր թեմա"
+        other: "%{count} նոր թեմա"
       unread_topics:
         one: "%{count} չկարդացած թեմա"
-        other: "{{count}} չկարդացած թեմա"
+        other: "%{count} չկարդացած թեմա"
       title: "Թեմա"
       invalid_access:
         title: "Թեման անձնական է"
@@ -1902,24 +1904,24 @@ hy:
         description: "Ներողություն, մենք չկարողացանք գտնել այդ թեման: Միգուցե՞ այն հեռացվել է մոդերատորի կողմից:"
       total_unread_posts:
         one: "Դուք ունեք %{count} չկարդացած հրապարակում այս թեմայում"
-        other: "Այս թեմայում Դուք ունեք {{count}} չկարդացած գրառում"
+        other: "Այս թեմայում Դուք ունեք %{count} չկարդացած գրառում"
       unread_posts:
         one: "Դուք ունեք %{count} չկարդացած հին հրապարակում այս թեմայում"
-        other: "Այս թեմայում Դուք ունեք {{count}} հին չկարդացած գրառում"
+        other: "Այս թեմայում Դուք ունեք %{count} հին չկարդացած գրառում"
       new_posts:
         one: "Այս թեմայում կա %{count} նոր հրապարակում՝ Ձեր վերջին կարդալուց հետո:"
-        other: "Ձեր վերջին կարդալուց հետո այս թեմայում կա {{count}} նոր գրառում"
+        other: "Ձեր վերջին կարդալուց հետո այս թեմայում կա %{count} նոր գրառում"
       likes:
         one: "Այս թեմայում կա %{count} հավանում:"
-        other: "Այս թեմայում կա {{count}} հավանում"
+        other: "Այս թեմայում կա %{count} հավանում"
       back_to_list: "Վերադառնալ Թեմաների Ցանկին"
       options: "Թեմաների Տարբերակները"
       show_links: "ցուցադրել այս թեմայի հղումները"
       toggle_information: "փոխանջատել թեմայի մանրամասները"
-      read_more_in_category: "Ցանկանո՞ւմ եք կարդալ ավելին: Դիտեք այլ թեմաներ՝ {{catLink}}-ում կամ {{latestLink}}."
-      read_more: "Ցանկանո՞ւմ եք կարդալ ավելին: {{catLink}} կամ {{latestLink}}."
-      group_request: "Այս թեման տեսնելու համար ձեզ հարկավոր է անդամակցել {{name}} խմբին: "
-      group_join: "Այս թեման տեսնելու համար հարկավոր է միանալ {{name}} խմբին:"
+      read_more_in_category: "Ցանկանո՞ւմ եք կարդալ ավելին: Դիտեք այլ թեմաներ՝ %{catLink}-ում կամ %{latestLink}."
+      read_more: "Ցանկանո՞ւմ եք կարդալ ավելին: %{catLink} կամ %{latestLink}."
+      group_request: "Այս թեման տեսնելու համար ձեզ հարկավոր է անդամակցել %{name} խմբին: "
+      group_join: "Այս թեման տեսնելու համար հարկավոր է միանալ %{name} խմբին:"
       group_request_sent: "Խմբին անդամության ձեր հարցումն ուղարկվել է: Ձեզ կտեղեկացնեն, երբ այն ընդունվի:"
       unread_indicator: "Ոչ մի անդամ դեռ չի կարդացել այս թեմայի մինչև վերջին գրառումը: "
       read_more_MF: " { UNREAD, plural, =0 {} one {<a href='{basePath}/unread'>1 չկարդացած</a> } other { <a href='{basePath}/unread'># չկարդացած</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {Կա} other{}} <a href='{basePath}/new'>1 նոր</a> topic} other { {BOTH, select, true{and } false {կա } other{}} <a href='{basePath}/new'># նոր</a> թեմա} } , կամ {CATEGORY, select, true {դիտեք այլ թեմաներ {catLink}} false {{latestLink}} other {}}"
@@ -2023,7 +2025,7 @@ hy:
           "2_8": "Դուք կտեսնեք նոր պատասխանների քանակը, քանի որ հետևում եք այս կատեգորիային:"
           "2_4": "Դուք կտեսնեք նոր պատասխանների քանակը, քանի որ հրապարակել եք պատասխան այս թեմայում:"
           "2_2": "Դուք կտեսնեք նոր պատասխանների քանակը, քանի որ հետևում եք այս թեմային:"
-          "2": 'Դուք կտեսնեք նոր պատասխանների քանակը, քանի որ Դուք <a href="{{basePath}}/u/{{username}}/preferences/notifications"> կարդացել եք այս թեման </a>.'
+          "2": 'Դուք կտեսնեք նոր պատասխանների քանակը, քանի որ Դուք <a href="%{basePath}/u/%{username}/preferences/notifications"> կարդացել եք այս թեման </a>.'
           "1_2": "Դուք ծանուցում կստանաք, եթե որևէ մեկը հիշատակի Ձեր @անունը կամ պատասխանի Ձեզ:"
           "1": "Դուք ծանուցում կստանաք, եթե որևէ մեկը հիշատակի Ձեր @անունը կամ պատասխանի Ձեզ:"
           "0_7": "Դուք անտեսում եք այս կատեգորիայի բոլոր ծանուցումները:"
@@ -2099,25 +2101,25 @@ hy:
         choose_category: "Խնդրում ենք ընտրել կատեգորիա՝ հրապարակային թեմայի համար"
       feature_topic:
         title: "Ամրացնել այս թեման"
-        pin: "Այս թեման տեղադրել {{categoryLink}} կատեգորիայի վերևում մինչև"
-        confirm_pin: "Դուք արդեն ունեք {{count}} ամրակցված թեմա: Չափից շատ ամրակցված թեմաները կարող են անհարմարություն պատճառել նոր և անանուն օգտատերերին: Դուք համոզվա՞ծ եք, որ ցանկանում եք ամրակցել ևս մեկ թեմա այս կատեգորիայում:"
-        unpin: "Հանել այս թեման {{categoryLink}} կատեգորիայի վերևից:"
-        unpin_until: "Հանել այս թեման{{categoryLink}} կատեգորիայի վերևից կամ սպասել մինչև <strong>%{until}</strong>:"
+        pin: "Այս թեման տեղադրել %{categoryLink} կատեգորիայի վերևում մինչև"
+        confirm_pin: "Դուք արդեն ունեք %{count} ամրակցված թեմա: Չափից շատ ամրակցված թեմաները կարող են անհարմարություն պատճառել նոր և անանուն օգտատերերին: Դուք համոզվա՞ծ եք, որ ցանկանում եք ամրակցել ևս մեկ թեմա այս կատեգորիայում:"
+        unpin: "Հանել այս թեման %{categoryLink} կատեգորիայի վերևից:"
+        unpin_until: "Հանել այս թեման%{categoryLink} կատեգորիայի վերևից կամ սպասել մինչև <strong>%{until}</strong>:"
         pin_note: "Օգտատերերը կարող են ապակցել թեման անհատապես իրենց համար:"
         pin_validation: "Ամսաթիվը պարտադիր է այս թեման ամրակցելու համար:"
-        not_pinned: "{{categoryLink}} կատեգորիայում ոչ մի թեմա ամրակցված չէ:"
+        not_pinned: "%{categoryLink} կատեգորիայում ոչ մի թեմա ամրակցված չէ:"
         already_pinned:
-          one: "Ներկայումս {{categoryLink}}կատեգորիայում ամրակցված Թեմաներ՝ <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Ներկայումս {{categoryLink}} կատեգորիայում ամրակցված թեմաները՝ <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Ներկայումս %{categoryLink}կատեգորիայում ամրակցված Թեմաներ՝ <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Ներկայումս %{categoryLink} կատեգորիայում ամրակցված թեմաները՝ <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Այս թեման տեղադրել բոլոր թեմաների ցանկերի վերում, մինչև"
-        confirm_pin_globally: "Դուք արդեն ունեք գլոբալ կերպով ամրակցված {{count}}թեմա: Չափից շատ ամրակցված թեմաները կարող են անհարմարություն պատճառել նոր և անանուն օգտատերերին: Դուք համոզվա՞ծ եք, որ ցանկանում եք գլոբալ կերպով ամրակցել ևս մեկ թեմա:"
+        confirm_pin_globally: "Դուք արդեն ունեք գլոբալ կերպով ամրակցված %{count}թեմա: Չափից շատ ամրակցված թեմաները կարող են անհարմարություն պատճառել նոր և անանուն օգտատերերին: Դուք համոզվա՞ծ եք, որ ցանկանում եք գլոբալ կերպով ամրակցել ևս մեկ թեմա:"
         unpin_globally: "Հանել այս թեման բոլոր թեմաների ցանկերի վերևից"
         unpin_globally_until: "Հանել այս թեման բոլոր թեմաների ցանկերի վերևից կամ սպասել մինչև <strong>%{until}</strong>:"
         global_pin_note: "Օգտատերերը կարող են ապակցել թեման անհատապես իրենց համար:"
         not_pinned_globally: "Գլոբալ կերպով ամրակցված թեմաներ չկան:"
         already_pinned_globally:
           one: "Ներկայումս գլոբալ կերպով ամրակցված թեմաներ՝ <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Ներկայումս գլոբալ կերպով ամրակցված թեմաները՝<strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Ներկայումս գլոբալ կերպով ամրակցված թեմաները՝<strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Այս թեման դարձնել բաններ, որը հայտնվում է բոլոր էջերի վերևում:"
         remove_banner: "Հանել բանները, որը հայտնվում է բոլոր էջերի վերևում:"
         banner_note: "Օգտատերերը կարող են չեղարկել բանները՝ փակելով այն: Ցանկացած պահի միայն մեկ թեմա կարող է լինել որպես բաններ:"
@@ -2147,15 +2149,15 @@ hy:
         to_topic_username: "Դուք մուտքագրել եք օգտանուն: Մենք կուղարկենք ծանուցում՝ այս թեմային հրավերի հղումով:"
         to_username: "Մուտքագրեք այն անձի օգտանունը, ում ցանկանում եք հրավիրել: Մենք կուղարկենք ծանուցում՝ այս թեմային հրավերի հղումով:"
         email_placeholder: "name@example.com"
-        success_email: "Մենք ուղարկել ենք հրավերի էլ. նամակ <b>{{emailOrUsername}}</b>-ին: Մենք ծանուցում կուղարկենք Ձեզ, երբ հրավերն ընդունվի: Ստուգեք Ձեր էջի հրավերների ներդիրը՝ Ձեր հրավերներին հետևելու համար:"
+        success_email: "Մենք ուղարկել ենք հրավերի էլ. նամակ <b>%{emailOrUsername}</b>-ին: Մենք ծանուցում կուղարկենք Ձեզ, երբ հրավերն ընդունվի: Ստուգեք Ձեր էջի հրավերների ներդիրը՝ Ձեր հրավերներին հետևելու համար:"
         success_username: "Մենք հրավիրել ենք այդ օգտատիրոջը մասնակցելու այս թեմային:"
         error: "Ներողություն, մենք չկարողացանք հրավիրել այդ մարդուն: Միգուցե նա արդեն հրավիրվա՞ծ է: (Հրավերները սահմանափակ են)"
-        success_existing_email: " <b>{{emailOrUsername}}</b> էլ. հասցեով օգատեր արդեն գոյություն ունի: Մենք հրավիրել ենք նրան մասնակցելու այս թեմային:"
+        success_existing_email: " <b>%{emailOrUsername}</b> էլ. հասցեով օգատեր արդեն գոյություն ունի: Մենք հրավիրել ենք նրան մասնակցելու այս թեմային:"
       login_reply: "Պատասխանելու համար Մուտք Գործեք"
       filters:
         n_posts:
           one: "%{count} հրապարակում"
-          other: "{{count}} գրառում"
+          other: "%{count} գրառում"
         cancel: "Հանել ֆիլտրը"
       move_to:
         title: "Տեղափոխել դեպի"
@@ -2169,7 +2171,7 @@ hy:
         error: "Գրառումները նոր թեմա տեղափոխելիս տեղի է ունեցել սխալ:"
         instructions:
           one: "Դուք պատրաստվում եք ստեղծել նոր թեմա և մուտքագրել Ձեր ընտրած հրապարակումով:"
-          other: "Դուք պատրաստվում եք ստեղծել նոր թեմա և մուտքագրել Ձեր ընտրած <b>{{count}}</b> գրառումը:"
+          other: "Դուք պատրաստվում եք ստեղծել նոր թեմա և մուտքագրել Ձեր ընտրած <b>%{count}</b> գրառումը:"
       merge_topic:
         title: "Տեղափոխել դեպի Գոյություն Ունեցող Թեմա"
         action: "տեղափոխել դեպի գոյություն ունեցող թեմա"
@@ -2177,7 +2179,7 @@ hy:
         radio_label: "Գոյություն Ունեցող Թեմա"
         instructions:
           one: "Խնդրում ենք ընտրել թեմա, ուր ցանկանում եք տեղափոխել այդ հրապարակումը: "
-          other: "Խնդրում ենք ընտրել թեմա, ուր ցանկանում եք տեղափոխել այդ <b>{{count}}</b> գրառումը:"
+          other: "Խնդրում ենք ընտրել թեմա, ուր ցանկանում եք տեղափոխել այդ <b>%{count}</b> գրառումը:"
       move_to_new_message:
         title: "Տեղափոխել դեպի Նոր Հաղորդագրություն"
         action: "տեղափոխել դեպի նոր հաղորդագրություն"
@@ -2186,7 +2188,7 @@ hy:
         participants: "Մասնակիցներ"
         instructions:
           one: "Դուք պատրաստվում եք ստեղծել նոր հաղորդագրություն և մասսայականացնել այն Ձեր ընտրած գրառումով:"
-          other: "Դուք պատրաստվում եք ստեղծել նոր հաղորդագրություն և լցնել այն Ձեր ընտրած <b>{{count}}</b> գրառումով:"
+          other: "Դուք պատրաստվում եք ստեղծել նոր հաղորդագրություն և լցնել այն Ձեր ընտրած <b>%{count}</b> գրառումով:"
       move_to_existing_message:
         title: "Տեղափոխել դեպի Գոյություն Ունեցող Հաղորդագրություն"
         action: "տեղափոխել դեպի գոյություն ունեցող հաղորդագրություն"
@@ -2194,7 +2196,7 @@ hy:
         participants: "Մասնակիցներ"
         instructions:
           one: "Խնդրում ենք ընտրել հաղորդագրությունը, ուր ցանկանում եք տեղափոխել այդ գրառումը:"
-          other: "Խնդրում ենք ընտրել հաղորդագրությունը, ուր ցանկանում եք տեղափոխել այդ <b>{{count}}</b> գրառումները:"
+          other: "Խնդրում ենք ընտրել հաղորդագրությունը, ուր ցանկանում եք տեղափոխել այդ <b>%{count}</b> գրառումները:"
       merge_posts:
         title: "Միավորել Ընտրված Գրառումները"
         action: "միավորել ընտրված գրառումները"
@@ -2216,8 +2218,8 @@ hy:
         error: "Գրառումների սեփականատիրոջը փոփոխելիս տեղի է ունեցել սխալ:"
         placeholder: "նոր սեփականատիրոջ օգտանունը"
         instructions:
-          one: "Խնդրում ենք ընտրել նոր սեփականատեր <b>@{{old_user}}</b> կողմից կատարված հրապարակման համար"
-          other: "Խնդրում ենք ընտրել նոր սեփականատեր <b>@{{old_user}}</b>-ի {{count}} գրառման համար:"
+          one: "Խնդրում ենք ընտրել նոր սեփականատեր <b>@%{old_user}</b> կողմից կատարված հրապարակման համար"
+          other: "Խնդրում ենք ընտրել նոր սեփականատեր <b>@%{old_user}</b>-ի %{count} գրառման համար:"
       change_timestamp:
         title: "Փոփոխել Ժամանակակետը"
         action: "փոփոխել ժամանակակետը"
@@ -2226,7 +2228,7 @@ hy:
         instructions: "Խնդրում ենք ընտրել թեմայի նոր ժամանակակետը: Թեմայի գրառումները կթարմացվեն՝ նույն ժամային տարբերությունն ունենալու համար:"
       multi_select:
         select: "ընտրել"
-        selected: "ընտրված ({{count}})"
+        selected: "ընտրված (%{count})"
         select_post:
           label: "ընտրել"
           title: "Ընտրվածին ավելացնել գրառում"
@@ -2245,17 +2247,17 @@ hy:
         deselect_all: հետընտրել բոլորը
         description:
           one: 'Դուք ընտրել եք <b>%{count}</b> հրապարակում:'
-          other: "Դուք ընտրել եք <b>{{count}}</b> գրառում:"
+          other: "Դուք ընտրել եք <b>%{count}</b> գրառում:"
     post:
       quote_reply: "Մեջբերել"
       edit_reason: "Պատճառը՝ "
-      post_number: "գրառում {{number}}"
+      post_number: "գրառում %{number}"
       ignored: "Անտեսված բովանդակություն"
       wiki_last_edited_on: "wiki-ն վերջին անգամ խմբագրվել է"
       last_edited_on: "գրառումը վերջին անգամ խմբագրվել է"
       reply_as_new_topic: "Պատասխանել որպես հղված թեմա"
       reply_as_new_private_message: "Պատասխանել որպես հաղորդագրություն նույն ստացողներին"
-      continue_discussion: "Շարունակելով {{postLink}} քննարկումը՝ "
+      continue_discussion: "Շարունակելով %{postLink} քննարկումը՝ "
       follow_quote: "գնալ դեպի մեջբերված գրառումը"
       show_full: "Ցուցադրել Գրառումն Ամբողջությամբ"
       show_hidden: "Դիտել անտեսված բովանդակությունը "
@@ -2267,29 +2269,29 @@ hy:
       locked: "անձնակազմի որևէ ներկայացուցիչ արգելափակել է այս գրառման խմբագրումը"
       gap:
         one: "դիտել %{count} թաքցրած պատասխան"
-        other: "դիտել {{count}} թաքցրած պատասխանները"
+        other: "դիտել %{count} թաքցրած պատասխանները"
       notice:
-        new_user: "Առաջին անգամն է, որ {{user}} -ը գրառում է կատարել — եկեք ողջունենք նրան մեր համայնքում!"
-        returning_user: "Բավական ժամանակ է անցել {{user}} -ին տեսնելուց հետո — նրա վերջին գրառումը եղել է {{time}}:"
+        new_user: "Առաջին անգամն է, որ %{user} -ը գրառում է կատարել — եկեք ողջունենք նրան մեր համայնքում!"
+        returning_user: "Բավական ժամանակ է անցել %{user} -ին տեսնելուց հետո — նրա վերջին գրառումը եղել է %{time}:"
       unread: "Գրառումը կարդացած չէ"
       has_replies:
-        one: "{{count}} պատասխան"
-        other: "{{count}} Պատասխան"
+        one: "%{count} պատասխան"
+        other: "%{count} Պատասխան"
       has_likes_title:
         one: "%{count} անձ հավանել է այս հրապարակումը"
-        other: "{{count}} մարդ հավանել է այս գրառումը"
+        other: "%{count} մարդ հավանել է այս գրառումը"
       has_likes_title_only_you: "Դուք հավանել եք այս գրառումը"
       has_likes_title_you:
         one: "Դուք և %{count} այլ անձ հավանել եք այս հրապարակումը"
-        other: "Դուք և {{count}} հոգի հավանել են այս գրառումը"
+        other: "Դուք և %{count} հոգի հավանել են այս գրառումը"
       errors:
         create: "Ներողություն, Ձեր գրառումը ստեղծելիս տեղի է ունեցել սխալ: Խնդրում ենք կրկին փորձել:"
         edit: "Ներողություն, Ձեր գրառումը խմբագրելիս տեղի է ունեցել սխալ: Խնդրում ենք կրկին փորձել:"
         upload: "Ներողություն, այդ ֆայլը վերբեռնելիս տեղի է ունեցել սխալ: Խնդրում ենք կրկին փորձել:"
-        file_too_large: "Ներողություն, այդ ֆայլը շատ մեծ է (առավելագույն չափը {{max_size_kb}}ԿԲ է): Առաջարկվում ենք վերբեռնել Ձեր մեծ ֆայլը որևէ ամպային ծառայություն(cloud service) և կիսվել հղումով:"
+        file_too_large: "Ներողություն, այդ ֆայլը շատ մեծ է (առավելագույն չափը %{max_size_kb}ԿԲ է): Առաջարկվում ենք վերբեռնել Ձեր մեծ ֆայլը որևէ ամպային ծառայություն(cloud service) և կիսվել հղումով:"
         too_many_uploads: "Ներողություն, Դուք կարող եք վերբեռնել միաժամանակ միայն մեկ ֆայլ:"
-        too_many_dragged_and_dropped_files: "Ներողություն, Դուք կարող եք վերբեռնել միաժամանակ միայն {{max}} ֆայլ:"
-        upload_not_authorized: "Ներողություն, ֆայլը, որ Դուք փորձում եք վերբեռնել թուլատրելի չէ (թույլատրվում են միայն՝ {{authorized_extensions}}):"
+        too_many_dragged_and_dropped_files: "Ներողություն, Դուք կարող եք վերբեռնել միաժամանակ միայն %{max} ֆայլ:"
+        upload_not_authorized: "Ներողություն, ֆայլը, որ Դուք փորձում եք վերբեռնել թուլատրելի չէ (թույլատրվում են միայն՝ %{authorized_extensions}):"
         image_upload_not_allowed_for_new_user: "Ներողություն, նոր օգտատերերը չեն կարող վերբեռնել նկարներ:"
         attachment_upload_not_allowed_for_new_user: "Ներողություն, նոր օգտատերերը չեն կարող ֆայլեր կցել:"
         attachment_download_requires_login: "Ներողություն, Դուք պետք է մուտք գործեք՝ կցված ֆայլերը ներբեռնելու համար:"
@@ -2329,10 +2331,10 @@ hy:
           confirm: "Դուք ցանկանո՞ւմ եք ջնջել նաև այս գրառման պատասխանները:"
           direct_replies:
             one: "Այո, և %{count} ուղղակի պատասխան"
-            other: "Այո, և {{count}} ուղղակի պատասխանները"
+            other: "Այո, և %{count} ուղղակի պատասխանները"
           all_replies:
             one: "Այո, և %{count} պատասխանը"
-            other: "Այո, և բոլոր {{count}} պատասխանները"
+            other: "Այո, և բոլոր %{count} պատասխանները"
           just_the_post: "Ոչ, միայն այս գրառումը"
         admin: "գրառման ադմինի գործողություններ"
         wiki: "Դարձնել Wiki"
@@ -2373,8 +2375,8 @@ hy:
           notify_user: "ուղարկել է հաղորդագրություն"
           bookmark: "էջանշել է սա"
           like_capped:
-            one: "և {{count}} այլ անձ հավանել է սա"
-            other: "և {{count}} հոգի հավանել են սա"
+            one: "և %{count} այլ անձ հավանել է սա"
+            other: "և %{count} հոգի հավանել են սա"
         by_you:
           off_topic: "Դուք դրոշակավորել եք սա որպես թեմայից դուրս"
           spam: "Դուք դրոշակավորել եք սա որպես սպամ"
@@ -2386,11 +2388,11 @@ hy:
       delete:
         confirm:
           one: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել այդ հրապարակումը:"
-          other: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել այդ{{count}} գրառումները:"
+          other: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել այդ%{count} գրառումները:"
       merge:
         confirm:
           one: "Դուք համոզվա՞ծ եք, որ ցանկանում եք միավորել այդ հրապարակումները:"
-          other: "Դուք համոզվա՞ծ եք, որ ցանկանում եք միավորել այդ {{count}} գրառումները:"
+          other: "Դուք համոզվա՞ծ եք, որ ցանկանում եք միավորել այդ %{count} գրառումները:"
       revisions:
         controls:
           first: "Առաջին խմբագրությունը"
@@ -2402,7 +2404,7 @@ hy:
           revert: "Վերադարձնել այս խմբագրությանը"
           edit_wiki: "Խմբագրել Wiki-ն"
           edit_post: "Խմբագրել Գրառումը"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "Ցուցադրել ստացված արդյունքը` հավելումներն ու հեռացումները մեկ տեղում"
@@ -2593,13 +2595,13 @@ hy:
       custom_message:
         at_least:
           one: "մուտքագրեք առնվազն %{count} սիմվոլ"
-          other: "մուտքագրեք առնվազն {{count}} սիմվոլ"
+          other: "մուտքագրեք առնվազն %{count} սիմվոլ"
         more:
           one: "%{count} ևս..."
-          other: "ևս {{count}} շարունակելու համար..."
+          other: "ևս %{count} շարունակելու համար..."
         left:
           one: "%{count}-ը մնում է"
-          other: "{{count}} հատ է մնացել"
+          other: "%{count} հատ է մնացել"
     flagging_topic:
       title: "Շնորհակալ ենք, որ օգնում եք պահել մեր համայնքը քաղաքակիրթ:"
       action: "Դրոշակավորել Թեման"
@@ -2643,7 +2645,7 @@ hy:
         title: "Այս թեման անձնական հաղորդագրություն է"
         help: "Այս թեման անձնական հաղորդագրություն է"
     posts: "Գրառումներ"
-    posts_long: "այս թեմայում կա {{number}} գրառում"
+    posts_long: "այս թեմայում կա %{number} գրառում"
     posts_likes_MF: |
       Այս թեման ունի {count, plural, one {1 պատասխան} other {# պատասխան}} {ratio, select,
         low {գրառման հավանումների բարձր հարաբերակցությամբ}
@@ -2658,20 +2660,20 @@ hy:
     replies: "Պատասխան"
     views_long:
       one: "այս թեման դիտվել է %{count} անգամ"
-      other: "այս թեման դիտվել է {{number}} անգամ"
+      other: "այս թեման դիտվել է %{number} անգամ"
     activity: "Ակտիվություն"
     likes: "Հավանում"
     likes_lowercase:
       one: "հավանում"
       other: "հավանում"
-    likes_long: "այս թեմայում կա {{number}} հավանում"
+    likes_long: "այս թեմայում կա %{number} հավանում"
     users: "Օգտատեր"
     users_lowercase:
       one: "օգտատեր"
       other: "օգտատերեր"
     category_title: "Կատեգորիա"
     history: "Պատմություն"
-    changed_by: "{{author}}-ի կողմից"
+    changed_by: "%{author}-ի կողմից"
     raw_email:
       title: "Մուտքային Էլ. նամակ"
       not_available: "Հասանելի չէ!"
@@ -2682,34 +2684,34 @@ hy:
       latest:
         title: "Վերջինները"
         title_with_count:
-          one: "Վերջին ({{count}})"
-          other: "Վերջինները ({{count}})"
+          one: "Վերջին (%{count})"
+          other: "Վերջինները (%{count})"
         help: "վերջերս կատարված գրառումներով թեմաները"
       read:
         title: "Կարդացած"
         help: "Ձեր կարդացած թեմաները այն հերթականությամբ, որով Դուք վերջին անգամ կարդացել եք դրանք"
       categories:
         title: "Կատեգորիաներ"
-        title_in: "Կատեգորիա - {{categoryName}}"
+        title_in: "Կատեգորիա - %{categoryName}"
         help: "ըստ կատեգորիայի խմբավորված բոլոր թեմաները"
       unread:
         title: "Չկարդացած"
         title_with_count:
           one: "Չկարդացած (%{count})"
-          other: "Չկարդացած ({{count}})"
+          other: "Չկարդացած (%{count})"
         help: "չկարդացած գրառումներով թեմաները, որոնց Դուք այժմ դիտում եք կամ հետևում եք"
         lower_title_with_count:
           one: "%{count} չկարդացած"
-          other: "{{count}} չկարդացած"
+          other: "%{count} չկարդացած"
       new:
         lower_title_with_count:
           one: "%{count} նոր"
-          other: "{{count}} նոր"
+          other: "%{count} նոր"
         lower_title: "նոր"
         title: "Նոր"
         title_with_count:
           one: "Նոր (%{count})"
-          other: "Նոր ({{count}})"
+          other: "Նոր (%{count})"
         help: "վերջին մի քանի օրվա ընթացքում ստեղծված թեմաներ"
       posted:
         title: "Իմ Գրառումները"
@@ -2718,11 +2720,11 @@ hy:
         title: "Էջանշաններ"
         help: "թեմաները, որոնք Դուք էջանշել եք"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "{{categoryName}} կատեգորիայի վերջին թեմաները"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "%{categoryName} կատեգորիայի վերջին թեմաները"
       top:
         title: "Թոփ"
         help: "վերջին տարվա, ամսվա, շաբաթվա կամ օրվա ընթացքում ամենաակտիվ թեմաները"
@@ -2886,8 +2888,8 @@ hy:
       synonyms: "Հոմանիշներ"
       synonyms_description: "Հետևյալ տեգերի օգտագործման դեպքում, դրանք կփոխարինվեն <b>%{base_tag_name}</b> -ով:"
       tag_groups_info:
-        one: 'Այս պիտակը պատկանում է «{{tag_groups}}» խմբին:'
-        other: "Այս թեգը պատկանում է այս խմբերին՝ {{tag_groups}}"
+        one: 'Այս պիտակը պատկանում է «%{tag_groups}» խմբին:'
+        other: "Այս թեգը պատկանում է այս խմբերին՝ %{tag_groups}"
       edit_synonyms: "Կարգավորել Հոմանիշները"
       add_synonyms_label: "Ավելացնել հոմանիշներ."
       add_synonyms: "Ավելացնել"
@@ -2897,7 +2899,7 @@ hy:
       delete_tag: "Ջնջել Թեգը"
       delete_confirm:
         one: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս թեգը և հեռացնել այն %{count} թեմայից, որին այն վերագրված է:"
-        other: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս թեգը և հեռացնել այն {{count}} թեմայից, որոնց այն վերագրված է:"
+        other: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս թեգը և հեռացնել այն %{count} թեմայից, որոնց այն վերագրված է:"
       delete_confirm_no_topics: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս թեգը:"
       rename_tag: "Վերանվանել Թեգը"
       rename_instructions: "Ընտրեք նոր անուն թեգի համար՝ "
@@ -3256,10 +3258,10 @@ hy:
           redeliver: "Վերաուղարկել"
           incoming:
             one: "Կա նոր իրադարձություն:"
-            other: "Կա {{count}} նոր իրադարձություն:"
+            other: "Կա %{count} նոր իրադարձություն:"
           completed_in:
             one: "Ավարտվել է %{count} վայրկյանում:"
-            other: "Ավարտվել է {{count}} վայրկյանում:"
+            other: "Ավարտվել է %{count} վայրկյանում:"
           request: "Հարցում"
           response: "Արձագանք"
           redeliver_confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք կրկին ուղարկել միևնույն տվյալները:"
@@ -3311,12 +3313,12 @@ hy:
           label: "Վերբեռնել"
           title: "Վերբեռնել պահուստ այս օրինակում"
           uploading: "Վերբեռնում..."
-          uploading_progress: "Վերբեռնում... {{progress}}%"
-          success: "'{{filename}}' -ը հաջողությամբ վերբեռնվել է: Այս ֆայլը այժմ մշակվում է, և մինչև մեկ րոպե կպահանջվի այն ցանկում ցուցադրելու համար:"
-          error: " '{{filename}}' -ը վերբեռնելիս տեղի է ունեցել սխալ՝ {{message}}"
+          uploading_progress: "Վերբեռնում... %{progress}%"
+          success: "'%{filename}' -ը հաջողությամբ վերբեռնվել է: Այս ֆայլը այժմ մշակվում է, և մինչև մեկ րոպե կպահանջվի այն ցանկում ցուցադրելու համար:"
+          error: " '%{filename}' -ը վերբեռնելիս տեղի է ունեցել սխալ՝ %{message}"
         operations:
           is_running: "Գործողությունը ներկայումս ընթանում է..."
-          failed: "{{operation}}-ը ձախողվեց: Խնդրում ենք ստուգել գրառումները:"
+          failed: "%{operation}-ը ձախողվեց: Խնդրում ենք ստուգել գրառումները:"
           cancel:
             label: "Չեղարկել"
             title: "Չեղարկել ընթացիկ գործողությունը"
@@ -3439,7 +3441,7 @@ hy:
           disabled_component_tooltip: "Այս բաղադրիչը անջատված է"
           default_theme_tooltip: "Այս թեման կայքի լռելյայն թեման է"
           updates_available_tooltip: "Այս թեմայի համար հասանելի են թարմացումներ"
-          and_x_more: "և ևս {{count}} հատ:"
+          and_x_more: "և ևս %{count} հատ:"
           collapse: Կրճատել
           uploads: "Վերբեռնումներ"
           no_uploads: "Դուք կարող եք վերբեռնել Ձեր թեմայի հետ կապված ակտիվներ, օրինակ՝ տառատեսակներ կամ նկարներ:"
@@ -3488,8 +3490,8 @@ hy:
           disabled_by: "Այս բաղադրիչը անջատված է եղել"
           required_version:
             error: "Այս թեման ավտոմատ կերպով անջատվել է, քանի որ այն համատեղելի չէ Discourse-ի այս տարբերակի հետ:"
-            minimum: "Պահանջում է Discourse-ի {{version}} կամ ավելի բարձր տարբերակ:"
-            maximum: "Պահանջում է Discourse-ի {{version}} կամ ավելի ցածր տարբերակ:"
+            minimum: "Պահանջում է Discourse-ի %{version} կամ ավելի բարձր տարբերակ:"
+            maximum: "Պահանջում է Discourse-ի %{version} կամ ավելի ցածր տարբերակ:"
           component_of: "Հետևյալի Բաղադրիչ՝ "
           update_to_latest: "Թարմացնել Վերջինով"
           check_for_updates: "Ստուգել Թարմացումները"
@@ -3502,7 +3504,7 @@ hy:
           empty: "Տարրեր չկան"
           commits_behind:
             one: "Թեման գտնվում է %{count} քոմմիթ ետ!"
-            other: "Թեման {{count}} commit ետ է!"
+            other: "Թեման %{count} commit ետ է!"
           compare_commits: "(Տեսնել նոր commit-ները)"
           repo_unreachable: "Հնարավոր չէ կապ հաստատել այս թեմայի Git ռեպոզիտորիայի հետ: Սխալի հաղորդագրությունը՝ "
           imported_from_archive: "Այս թեման ներմուծվել է .zip ֆայլից"
@@ -3907,8 +3909,8 @@ hy:
           title: "Ցուցադրել այս օգտատիրոջ էլ. հասցեն"
           text: "Ցուցադրել"
       user:
-        suspend_failed: "Այս օգտատիրոջը սառեցնելիս ինչ-որ սխալ է տեղի ունեցել՝ {{error}}"
-        unsuspend_failed: "Այս օգտատիրոջը վերականգնելիս ինչ-որ սխալ է տեղի ունեցել՝ {{error}}"
+        suspend_failed: "Այս օգտատիրոջը սառեցնելիս ինչ-որ սխալ է տեղի ունեցել՝ %{error}"
+        unsuspend_failed: "Այս օգտատիրոջը վերականգնելիս ինչ-որ սխալ է տեղի ունեցել՝ %{error}"
         suspend_duration: "Որքա՞ն ժամանակ պետք է սառեցվի օգտատերը:"
         suspend_reason_label: "Ինչո՞ւ եք սառեցնում այս օգտատիրոջը: Այս տեքստը <b>տեսանելի կլինի բոլորին</b> այս օգտատիրոջ պրոֆիլի էջում և կցուցադրվի օգտատիրոջը, երբ նա փորձի մուտք գործել: Մուտքագրեք կարճ տեքստ:"
         suspend_reason_hidden_label: "Ինչո՞ւ եք սառեցնում այս օգտատիրոջը: Այս տեքստը կցուցադրվի օգտատիրոջը, երբ նա փորձի մուտք գործել: Մուտքագրեք կարճ տեքստ:"
@@ -4285,6 +4287,7 @@ hy:
         title: "Էմոջի"
         help: "Ավելացրեք նոր էմոջի, որը հասանելի կլինի բոլորին: (ՀՈՒՇՈՒՄ՝ քաշեք և գցեք բազմակի ֆայլեր միանգամից)"
         add: "Ավելացնել Նոր Էմոջի"
+        uploading: "Վերբեռնում..."
         name: "Անուն"
         group: "Խումբ"
         image: "Նկար"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 202ca1aca6..6daee6f6ff 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -22,8 +22,8 @@ id:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "h:mm a"
       time_short_day: "ddd, HH: mm"
@@ -202,10 +202,10 @@ id:
     weekly: "mingguan"
     every_month: "setiap bulan"
     every_six_months: "setiap enam bulan"
-    max_of_count: "maksimal dari {{count}}"
+    max_of_count: "maksimal dari %{count}"
     alternation: "atau"
     character_count:
-      other: "{{count}} karakter"
+      other: "%{count} karakter"
     related_messages:
       title: "Pesan Terkait"
       see_all: 'Lihat <a href="%{path}">semua pesan</a> dari @ %{username} ...'
@@ -256,11 +256,11 @@ id:
         yes_value: "Ya, abaikan"
         no_value: "Tidak, simpan"
     topic_count_latest:
-      other: "Lihat {{count}} topik baru atau diperbarui"
+      other: "Lihat %{count} topik baru atau diperbarui"
     topic_count_unread:
-      other: "Lihat {{count}} topik belum dibaca"
+      other: "Lihat %{count} topik belum dibaca"
     topic_count_new:
-      other: "Lihat {{count}} topik baru"
+      other: "Lihat %{count} topik baru"
     preview: "pratinjau"
     cancel: "batal"
     save: "Simpan Perubahan"
@@ -268,7 +268,7 @@ id:
     saved: "Tersimpan!"
     upload: "Unggah"
     uploading: "Mengunggah..."
-    uploading_filename: "Sedang mengunggah {{filename}}..."
+    uploading_filename: "Sedang mengunggah %{filename}..."
     clipboard: "clipboard"
     uploaded: "Sudah Diunggah!"
     pasting: "Menempelkan..."
@@ -311,7 +311,7 @@ id:
         optional: "Anda dapat mengklaim item ini untuk mencegah orang lain meninjaunya."
         required: "Anda harus mengklaim hal ini sebelum dapat meninjaunya."
         claimed_by_you: "Anda telah mengklaim item ini dan dapat meninjaunya."
-        claimed_by_other: "Item ini hanya dapat ditinjau oleh <b>{{username}}</b> ."
+        claimed_by_other: "Item ini hanya dapat ditinjau oleh <b>%{username}</b> ."
       claim:
         title: "klaim topik ini"
       unclaim:
@@ -328,7 +328,7 @@ id:
       none: "Tidak ada item untuk diulas."
       view_pending: "tampilkan yang tertunda"
       topic_has_pending:
-        other: "Topik ini memiliki <b>{{count}}</b> tulisan menunggu persetujuan"
+        other: "Topik ini memiliki <b>%{count}</b> tulisan menunggu persetujuan"
       title: "Ulasan"
       topic: "Topik:"
       filtered_topic: "Anda telah menyaring ke konten yang dapat ditinjau dalam satu topik."
@@ -344,11 +344,11 @@ id:
         name: "Nama"
       user_percentage:
         agreed:
-          other: "{{count}}% setuju"
+          other: "%{count}% setuju"
         disagreed:
-          other: "{{count}}% tidak setuju"
+          other: "%{count}% tidak setuju"
         ignored:
-          other: "{{count}}% mengabaikan"
+          other: "%{count}% mengabaikan"
       topics:
         topic: "Topik"
         reviewable_count: "Menghitung"
@@ -357,9 +357,9 @@ id:
         original: "(topik asli)"
         details: "detail"
         unique_users:
-          other: "{{count}} pengguna"
+          other: "%{count} pengguna"
       replies:
-        other: "{{count}} balasan"
+        other: "%{count} balasan"
       edit: "Ubah"
       save: "Simpan"
       cancel: "Batal"
@@ -420,22 +420,22 @@ id:
         title: "Pesan Membutuhkan Persetujuan"
         description: "Kami telah menerima posting baru Anda, tetapi diperlukan persetujuan dari moderator sebelum posting tersebut tampil. Mohon kesabarannya. Terima kasih!"
         pending_posts:
-          other: "Anda memiliki <strong>{{count}}</strong> pos sedang menunggu."
+          other: "Anda memiliki <strong>%{count}</strong> pos sedang menunggu."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> memposting <a href='{{topicUrl}}'>topik</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Anda</a> memposting <a href='{{topicUrl}}'>the topic</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> membalas <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>You</a> membalas <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> membalas <a href='{{topicUrl}}'>topik</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Anda</a> membalas <a href='{{topicUrl}}'>topik</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> menandai <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> menandai <a href='{{user2Url}}'>Anda</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Anda</a> menandai <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Dikirim oleh <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Dikirim oleh <a href='{{userUrl}}'>Anda</a>"
-      sent_by_user: "Dikirim oleh <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Dikirim oleh <a href='{{userUrl}}'>kamu</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> memposting <a href='%{topicUrl}'>topik</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Anda</a> memposting <a href='%{topicUrl}'>the topic</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> membalas <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>You</a> membalas <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> membalas <a href='%{topicUrl}'>topik</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Anda</a> membalas <a href='%{topicUrl}'>topik</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> menandai <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> menandai <a href='%{user2Url}'>Anda</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Anda</a> menandai <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Dikirim oleh <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Dikirim oleh <a href='%{userUrl}'>Anda</a>"
+      sent_by_user: "Dikirim oleh <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Dikirim oleh <a href='%{userUrl}'>kamu</a>"
     directory:
       filter_name: "Menyaring dari nama pengguna"
       title: "Pengguna"
@@ -654,7 +654,7 @@ id:
     user_fields:
       none: "(memilih sebuah pilihan)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profil"
       mute: "Redam"
       edit: "Ubah Preferensi"
@@ -718,12 +718,12 @@ id:
       enable_quoting: "Aktifkan balasan kutipan untuk teks yang disorot"
       change: "ubah"
       featured_topic: "Topik Unggulan"
-      moderator: "{{user}} adalah moderator"
-      admin: "{{user}} adalah admin"
+      moderator: "%{user} adalah moderator"
+      admin: "%{user} adalah admin"
       moderator_tooltip: "Pengguna ini adalah moderator"
       admin_tooltip: "Pengguna ini adalah admin"
       silenced_tooltip: "Pengguna ini dibungkam"
-      suspended_notice: "Pengguna ini ditangguhkan sampai {{date}}"
+      suspended_notice: "Pengguna ini ditangguhkan sampai %{date}"
       suspended_permanently: "Pengguna ini dicekal"
       suspended_reason: "Alasan:"
       github_profile: "Github"
@@ -756,7 +756,6 @@ id:
       admin_delete: "Hapus"
       users: "Pengguna"
       muted_users: "Diredam"
-      muted_users_instructions: "Menekan semua pemberitahuan dari semua pengguna."
       ignored_users: "Diabaikan"
       tracked_topics_link: "Tunjukkan"
       apps: "Aplikasi"
@@ -849,9 +848,9 @@ id:
         instructions: "Jangan pernah tunjukkan ke publik."
         ok: "Kami akan mengirimkan surel kepada anda untuk konfirmasi"
         invalid: "Silahkan masukkan alamat email yang valid"
-        authenticated: "Email anda sudah dikonfirmasi oleh {{provider}}"
+        authenticated: "Email anda sudah dikonfirmasi oleh %{provider}"
         frequency:
-          other: "Kami akan mengirimkan email kepada anda jika kami tidak melihat anda selama {{count}} menit."
+          other: "Kami akan mengirimkan email kepada anda jika kami tidak melihat anda selama %{count} menit."
       associated_accounts:
         title: "Akun Terkait"
         connect: "Hubungkan"
@@ -868,9 +867,9 @@ id:
       username:
         title: "Nama Pengguna"
         instructions: "unik, tidak ada spasi, pendek"
-        short_instructions: "Orang dapat menyebut anda sebagai @{{username}}"
+        short_instructions: "Orang dapat menyebut anda sebagai @%{username}"
         available: "Nama pengguna anda tersedia"
-        not_available: "Tidak tersedia. Coba {{suggestion}}?"
+        not_available: "Tidak tersedia. Coba %{suggestion}?"
         not_available_no_suggestion: "Tidak tersedia"
         too_short: "Nama pengguna anda terlalu pendek"
         too_long: "Nama pengguna anda terlalu panjang"
@@ -949,7 +948,7 @@ id:
         none: "Tidak ada undangan"
         pending: "Undangan yang tertunda"
         pending_tab: "Tertunda"
-        pending_tab_with_count: "Tertunda ({{count}})"
+        pending_tab_with_count: "Tertunda (%{count})"
         topics_entered: "Topik Dilihat"
         posts_read_count: "Tulisan dilihat"
         expired: "Undangan ini sudah kadaluarsa"
@@ -962,12 +961,15 @@ id:
         time_read: "Waktu Baca"
         days_visited: "Hari Berkunjung"
         account_age_days: "Umur akun dalam hari"
-        create: "Kirim Undangan"
+        links_tab: "Tautan"
+        link_created_at: "Dibuat"
+        link_groups: Grup
         generate_link: "Salin Tautan Undangan"
         link_generated: "Tautan undangan telah sukses dibuat!"
         valid_for: "Tautan undangan hanya berlaku untuk alamat surel: %{email}"
+        invite_link:
+          success: "Tautan undangan telah sukses dibuat!"
         bulk_invite:
-          text: "Undangan Massal dari Berkas"
           success: "File telah sukses diunggah, anda akan mendapat pesan pemberitahuan saat proses telah selesai."
           error: "Maaf, file harus dalam format CSV"
       password:
@@ -1038,7 +1040,7 @@ id:
         not_found: "Halaman Tidak Ditemukan"
       desc:
         network: "Harap cek koneksi internet anda"
-        server: "Kode kesalahan: {{status}}"
+        server: "Kode kesalahan: %{status}"
         forbidden: "Anda tidak diijinkan untuk melihatnya"
         unknown: "Terjadi kesalahan"
       buttons:
@@ -1077,7 +1079,7 @@ id:
       hide_session: "Ingat saya besok"
       hide_forever: "tidak, terima kasih"
     summary:
-      description: "Terdapat <b>{{replyCount}}</b> balasan."
+      description: "Terdapat <b>%{replyCount}</b> balasan."
       enable: "Rangkum Topik Ini"
       disable: "Tampilkan Semua Postingan"
     deleted_filter:
@@ -1087,8 +1089,8 @@ id:
       title: "Pesan"
       edit: "Tambah atau Hapus ..."
       leave_message: "Apakah Anda yakin ingin meninggalkan pesan ini?"
-      remove_allowed_user: "Apakah Anda yakin ingin menghapus {{name}} dari pesan ini?"
-      remove_allowed_group: "Apakah Anda yakin ingin menghapus {{name}} dari pesan ini?"
+      remove_allowed_user: "Apakah Anda yakin ingin menghapus %{name} dari pesan ini?"
+      remove_allowed_group: "Apakah Anda yakin ingin menghapus %{name} dari pesan ini?"
     email: "Surel"
     username: "Nama Pengguna"
     last_seen: "Terlihat"
@@ -1175,13 +1177,13 @@ id:
     conditional_loading_section:
       loading: Diproses...
     category_row:
-      topic_count: "{{count}} topik dalam kategori ini"
+      topic_count: "%{count} topik dalam kategori ini"
     select_kit:
       default_header_text: Pilih...
       no_content: Tidak ditemukan yang cocok
       filter_placeholder: Cari...
       filter_placeholder_with_any: Cari atau buat ...
-      create: "Buat: &#39;{{content}}&#39;"
+      create: "Buat: &#39;%{content}&#39;"
     date_time_picker:
       from: Dari
       to: Kepada
@@ -1197,16 +1199,16 @@ id:
       blockquote_text: "Blok Kutipan"
       add_warning: "Ini adalah peringatan resmi."
       similar_topics: "Topik anda mirip dengan..."
-      reference_topic_title: "RE: {{title}}"
+      reference_topic_title: "RE: %{title}"
       error:
         title_missing: "Judul harus ada"
-        title_too_short: "Judul setidaknya {{min}} karakter"
-        title_too_long: "Judul tidak boleh lebih dari {{max}} karakter"
+        title_too_short: "Judul setidaknya %{min} karakter"
+        title_too_long: "Judul tidak boleh lebih dari %{max} karakter"
         post_missing: "Tulisan tidak boleh kosong"
-        post_length: "Tulisan setidaknya harus {{min}} karakter"
-        try_like: "Sudahkah Anda mencoba tombol {{heart}}?"
+        post_length: "Tulisan setidaknya harus %{min} karakter"
+        try_like: "Sudahkah Anda mencoba tombol %{heart}?"
         category_missing: "Anda harus memilih kategori"
-        tags_missing: "Anda harus memilih setidaknya {{count}} label"
+        tags_missing: "Anda harus memilih setidaknya %{count} label"
       save_edit: "Simpah Ubahan"
       reply_original: "Balas pada Topik Asal"
       reply_here: "Balas Disini"
@@ -1272,14 +1274,14 @@ id:
     notifications:
       tooltip:
         message:
-          other: "{{count}} pesan belum dibaca"
+          other: "%{count} pesan belum dibaca"
       title: "pemberitahuan penyebutan @nama, balasan ke artikel dan topik Anda, pesan, dll"
       empty: "Tidak ada pemberitahuan."
       post_approved: "Tulisan Anda telah disetujui"
       liked_consolidated_description:
-        other: "menyukai {{count}} dari tulisan Anda"
-      invitee_accepted: "<span>{{username}}</span> menerima undangan Anda"
-      granted_badge: "Mendapatkan &#39;{{description}}&#39;"
+        other: "menyukai %{count} dari tulisan Anda"
+      invitee_accepted: "<span>%{username}</span> menerima undangan Anda"
+      granted_badge: "Mendapatkan &#39;%{description}&#39;"
       titles:
         mentioned: "disebut"
         replied: "balasan baru"
@@ -1332,7 +1334,7 @@ id:
       list: "Topik"
       new: "topik baru"
       new_topics:
-        other: "{{count}} topik baru"
+        other: "%{count} topik baru"
       title: "Topik"
       invalid_access:
         description: "Maaf, kamu tidak berhak mengakses topik tersebut."
@@ -1341,7 +1343,7 @@ id:
       not_found:
         title: "Tidak ada topik"
       new_posts:
-        other: "ada {{count}} posting baru di topik ini sejak terakhir Anda mengunjunginya"
+        other: "ada %{count} posting baru di topik ini sejak terakhir Anda mengunjunginya"
       back_to_list: "Kembali ke Daftar Topik"
       options: "Opsi Topik"
       show_links: "tampilkan pranala dalam topik ini"
@@ -1481,16 +1483,16 @@ id:
         title: "Belum dibaca"
       new:
         lower_title_with_count:
-          other: "{{count}} baru"
+          other: "%{count} baru"
         lower_title: "baru"
         title: "Baru"
         title_with_count:
-          other: "Baru ({{count}})"
+          other: "Baru (%{count})"
       bookmarks:
         title: "Markah"
       category:
-        title: "{{categoryName}}"
-        help: "topik terakhir di kategori {{categoryName}}"
+        title: "%{categoryName}"
+        help: "topik terakhir di kategori %{categoryName}"
       top:
         all:
           title: "Sepanjang Waktu"
@@ -1785,6 +1787,7 @@ id:
         reason: Alasan
         expand: Perluas &hellip;
       emoji:
+        uploading: "Mengunggah..."
         name: "Nama"
       permalink:
         topic_title: "Topik"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index f51ef4746e..46e2fe4619 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -23,8 +23,8 @@ it:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "h:mm a"
       time_with_zone: "HH:mm (z)"
@@ -227,11 +227,11 @@ it:
     weekly: "ogni settimana"
     every_month: "ogni mese"
     every_six_months: "ogni sei mesi"
-    max_of_count: "massimo di {{count}}"
+    max_of_count: "massimo di %{count}"
     alternation: "o"
     character_count:
-      one: "{{count}} carattere"
-      other: "{{count}} caratteri"
+      one: "%{count} carattere"
+      other: "%{count} caratteri"
     related_messages:
       title: "Messaggi correlati"
       see_all: 'Vedi <a href="%{path}">tutti i messaggi</a> di @ %{username} ...'
@@ -306,14 +306,14 @@ it:
         yes_value: "Sì, abbandona"
         no_value: "No, mantieni"
     topic_count_latest:
-      one: "Visualizza {{count}} argomenti nuovi o aggiornati"
-      other: "Visualizza {{count}} argomenti nuovi o aggiornati."
+      one: "Visualizza %{count} argomenti nuovi o aggiornati"
+      other: "Visualizza %{count} argomenti nuovi o aggiornati."
     topic_count_unread:
       one: "V"
-      other: "Visualizza {{count}} argomenti non letti "
+      other: "Visualizza %{count} argomenti non letti "
     topic_count_new:
       one: "V"
-      other: "Visualizza {{count}} nuovi argomenti"
+      other: "Visualizza %{count} nuovi argomenti"
     preview: "anteprima"
     cancel: "annulla"
     save: "Salva Modifiche"
@@ -321,7 +321,7 @@ it:
     saved: "Salvato!"
     upload: "Carica"
     uploading: "In caricamento..."
-    uploading_filename: "In caricamento: {{filename}}..."
+    uploading_filename: "In caricamento: %{filename}..."
     clipboard: "clipboard"
     uploaded: "Caricato!"
     pasting: "Incollando..."
@@ -375,7 +375,7 @@ it:
         optional: "Puoi rivendicare questo elemento per evitare che altri lo revisionino."
         required: "Per poter revisionare gli elementi devi prima rivendicarli."
         claimed_by_you: "Hai rivendicato questo elemento e puoi revisionarlo."
-        claimed_by_other: "Questo elemento può essere revisionato esclusivamente da <b>{{username}}</b>."
+        claimed_by_other: "Questo elemento può essere revisionato esclusivamente da <b>%{username}</b>."
       claim:
         title: "rivendica questo argomento"
       unclaim:
@@ -395,7 +395,7 @@ it:
       view_pending: "vedi in attesa"
       topic_has_pending:
         one: "Questo argomento ha <b>%{count}</b> messaggio in attesa di approvazione"
-        other: "Questo Argomento ha <b>{{count}}</b> messaggi in attesa di approvazione"
+        other: "Questo Argomento ha <b>%{count}</b> messaggi in attesa di approvazione"
       title: "Revisiona"
       topic: "Argomento:"
       filtered_topic: "Hai filtrato il contenuto revisionabile in un singolo Argomento"
@@ -412,17 +412,17 @@ it:
         fields: "Campi"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} segnalazione in totale)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} segnalazioni in totale)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} segnalazione in totale)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} segnalazioni in totale)"
         agreed:
-          one: "{{count}}% a favore"
-          other: "{{count}}% a favore"
+          one: "%{count}% a favore"
+          other: "%{count}% a favore"
         disagreed:
-          one: "{{count}}% contrario"
-          other: "{{count}}% contrari"
+          one: "%{count}% contrario"
+          other: "%{count}% contrari"
         ignored:
-          one: "{{count}}% ignorato"
-          other: "{{count}}% ignorati"
+          one: "%{count}% ignorato"
+          other: "%{count}% ignorati"
       topics:
         topic: "Argomento"
         reviewable_count: "Conteggio"
@@ -432,10 +432,10 @@ it:
         details: "dettagli"
         unique_users:
           one: "%{count} utente"
-          other: "{{count}} utenti"
+          other: "%{count} utenti"
       replies:
         one: "%{count} risposta"
-        other: "{{count}} risposte"
+        other: "%{count} risposte"
       edit: "Modifica"
       save: "Salva"
       cancel: "Annulla"
@@ -498,22 +498,22 @@ it:
         description: "Abbiamo ricevuto il tuo messaggio ma prima che appaia è necessario che venga approvato da un moderatore. Per favore sii paziente."
         pending_posts:
           one: "Hai<strong>%{count}</strong> messaggio in attesa."
-          other: "Hai<strong>{{count}}</strong> messaggi in attesa."
+          other: "Hai<strong>%{count}</strong> messaggi in attesa."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> ha pubblicato <a href='{{topicUrl}}'>l'argomento</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Tu</a> hai pubblicato <a href='{{topicUrl}}'>l'argomento</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> ha risposto a <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Tu</a> hai risposto a <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> ha risposto <a href='{{topicUrl}}'>all'argomento</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Tu</a> hai risposto <a href='{{topicUrl}}'>all'argomento</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> ha menzionato <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> ha menzionato <a href='{{user2Url}}'>te</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Tu</a> hai menzionato <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Pubblicato da <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Pubblicato da <a href='{{userUrl}}'>te</a>"
-      sent_by_user: "Inviato da <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Inviato da <a href='{{userUrl}}'>te</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> ha pubblicato <a href='%{topicUrl}'>l'argomento</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Tu</a> hai pubblicato <a href='%{topicUrl}'>l'argomento</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> ha risposto a <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Tu</a> hai risposto a <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> ha risposto <a href='%{topicUrl}'>all'argomento</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Tu</a> hai risposto <a href='%{topicUrl}'>all'argomento</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> ha menzionato <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> ha menzionato <a href='%{user2Url}'>te</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Tu</a> hai menzionato <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Pubblicato da <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Pubblicato da <a href='%{userUrl}'>te</a>"
+      sent_by_user: "Inviato da <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Inviato da <a href='%{userUrl}'>te</a>"
     directory:
       filter_name: "filtra per nome utente"
       title: "Utenti"
@@ -751,7 +751,7 @@ it:
       none: "(scegli un'opzione)"
       required: 'Inserisci un valore per "%{name}"'
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profilo"
       mute: "Ignora"
       edit: "Modifica opzioni"
@@ -827,12 +827,12 @@ it:
       enable_defer: "Abilita il rinvio per contrassegnare gli argomenti come non letti"
       change: "cambia"
       featured_topic: "Argomento in primo piano"
-      moderator: "{{user}} è un moderatore"
-      admin: "{{user}} è un amministratore"
+      moderator: "%{user} è un moderatore"
+      admin: "%{user} è un amministratore"
       moderator_tooltip: "Questo utente è un moderatore"
       admin_tooltip: "Questo utente è un amministratore"
       silenced_tooltip: "Questo utente è silenziato"
-      suspended_notice: "Questo utente è sospeso fino al {{date}}."
+      suspended_notice: "Questo utente è sospeso fino al %{date}."
       suspended_permanently: "Questo utente è sospeso."
       suspended_reason: "Motivo: "
       github_profile: "Github"
@@ -845,7 +845,7 @@ it:
           Gli argomenti e le categorie silenziate non sono incluse in queste email.
         individual: "Invia una email per ogni nuovo messaggio"
         individual_no_echo: "Invia una email per ogni nuovo messaggio, eccetto per i miei"
-        many_per_day: "Inviamo una email per ogni nuovo messaggio (circa {{dailyEmailEstimate}} al giorno)"
+        many_per_day: "Inviamo una email per ogni nuovo messaggio (circa %{dailyEmailEstimate} al giorno)"
         few_per_day: "Inviami una email per ogni nuovo messaggio (circa 2 al giorno)"
         warning: "Modalità Mailing List attiva. Le impostazioni per la notifica via email verranno ignorate."
       tag_settings: "Etichette"
@@ -875,9 +875,7 @@ it:
       admin_delete: "Cancella"
       users: "Utenti"
       muted_users: "Silenziati"
-      muted_users_instructions: "Occulta tutte le notifiche da questi utenti."
       ignored_users: "Ignorato"
-      ignored_users_instructions: "Nascondi tutti i messaggi e le notifiche da questi utenti."
       tracked_topics_link: "Mostra"
       automatically_unpin_topics: "Spunta automaticamente gli argomenti quando arrivi in fondo."
       apps: "Applicazioni"
@@ -933,12 +931,12 @@ it:
         disable: "Disabilita"
         enable: "Abilita"
         enable_long: "Abilita codici di backup"
-        manage: "Gestisci i codici di backup. Hai <strong>{{count}}</strong> codici di backup rimanenti."
+        manage: "Gestisci i codici di backup. Hai <strong>%{count}</strong> codici di backup rimanenti."
         copy_to_clipboard: "Copia negli Appunti"
         copy_to_clipboard_error: "Errore durante la copia nella Clipboard"
         copied_to_clipboard: "Copiato nella Clipboard"
         download_backup_codes: "Scarica i codici di backup"
-        remaining_codes: "Ti sono rimasti <strong>{{count}}</strong> codici di backup."
+        remaining_codes: "Ti sono rimasti <strong>%{count}</strong> codici di backup."
         use: "Usa un codice di backup"
         enable_prerequisites: "È necessario abilitare un secondo fattore primario prima di generare codici di backup."
         codes:
@@ -1003,10 +1001,10 @@ it:
         success_staff: "Abbiamo inviato una email al tuo indirizzo corrente. Segui le istruzioni di conferma."
       change_avatar:
         title: "Cambia l'immagine del tuo profilo"
-        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, basato su"
-        gravatar_title: "Cambia il tuo avatar sul sito {{gravatarName}}"
-        gravatar_failed: "Non è stato trovato alcun {{gravatarName}} abbinato a questa email. "
-        refresh_gravatar_title: "Ricarica il tuo {{gravatarName}}"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, basato su"
+        gravatar_title: "Cambia il tuo avatar sul sito %{gravatarName}"
+        gravatar_failed: "Non è stato trovato alcun %{gravatarName} abbinato a questa email. "
+        refresh_gravatar_title: "Ricarica il tuo %{gravatarName}"
         letter_based: "Immagine del profilo assegnata dal sistema"
         uploaded_avatar: "Immagine personalizzata"
         uploaded_avatar_empty: "Aggiungi un'immagine personalizzata"
@@ -1031,11 +1029,11 @@ it:
         ok: "Ti invieremo una email di conferma"
         required: "Inserisci un indirizzo email"
         invalid: "Inserisci un indirizzo email valido"
-        authenticated: "{{provider}} ha autenticato la tua email"
+        authenticated: "%{provider} ha autenticato la tua email"
         frequency_immediately: "Ti invieremo immediatamente una email se non hai letto ciò per cui ti stiamo scrivendo."
         frequency:
           one: "TI invieremo un email solo se non ti avremo visto nell'ultimo minuto."
-          other: "Ti invieremo una email solo se non ti si vede da almeno {{count}} minuti."
+          other: "Ti invieremo una email solo se non ti si vede da almeno %{count} minuti."
       associated_accounts:
         title: "Account associati"
         connect: "Connetti"
@@ -1056,9 +1054,9 @@ it:
       username:
         title: "Nome utente"
         instructions: "univoco, senza spazi, breve"
-        short_instructions: "Gli utenti possono citarti scrivendo @{{username}}"
+        short_instructions: "Gli utenti possono citarti scrivendo @%{username}"
         available: "Il nome utente è disponibile"
-        not_available: "Non disponibile. Prova {{suggestion}}?"
+        not_available: "Non disponibile. Prova %{suggestion}?"
         not_available_no_suggestion: "Non disponibile"
         too_short: "Il nome utente è troppo corto"
         too_long: "Il nome utente è troppo lungo"
@@ -1082,11 +1080,11 @@ it:
         log_out_all: "Disconnetti tutti"
         active: "attivo ora"
         not_you: "Non sei tu?"
-        show_all: "Mostra tutti ({{count}})"
+        show_all: "Mostra tutti (%{count})"
         show_few: "Mostrane di meno"
         was_this_you: "Eri tu?"
         was_this_you_description: "Se non sei stato tu, ti raccomandiamo di cambiare la tua password e di disconnetterti da tutte le sessioni."
-        browser_and_device: "{{browser}} su {{device}}"
+        browser_and_device: "%{browser} su %{device}"
         secure_account: "Metti in sicurezza il mio account"
         latest_post: "Hai inviato il tuo ultimo messaggio..."
       last_posted: "Ultimo Messaggio"
@@ -1166,20 +1164,19 @@ it:
         none: "Nessun invito da visualizzare."
         truncated:
           one: "Mostro il primo invito."
-          other: "Mostro i primi {{count}} inviti."
+          other: "Mostro i primi %{count} inviti."
         redeemed: "Inviti Accettati"
         redeemed_tab: "Riscattato"
-        redeemed_tab_with_count: "Riscattato ({{count}})"
+        redeemed_tab_with_count: "Riscattato (%{count})"
         redeemed_at: "Accettato"
         pending: "Inviti in sospeso"
         pending_tab: "In sospeso"
-        pending_tab_with_count: "In sospeso ({{count}})"
+        pending_tab_with_count: "In sospeso (%{count})"
         topics_entered: "Argomenti Visti"
         posts_read_count: "Messaggi Letti"
         expired: "L'invito è scaduto."
         rescind: "Rimuovi"
         rescinded: "Invito revocato"
-        rescind_all: "Rimuovi tutti gli inviti scaduti"
         rescinded_all: "Tutti gli inviti scaduti sono stati rimossi!"
         rescind_all_confirm: "Sei sicuro di voler rimuovere tutti gli inviti scaduti?"
         reinvite: "Rinvia Invito"
@@ -1190,13 +1187,18 @@ it:
         time_read: "Ora di Lettura"
         days_visited: "Giorni Frequenza"
         account_age_days: "Età dell'utente in giorni"
-        create: "Invia un Invito"
+        links_tab: "Collegamenti"
+        link_created_at: "Creazione"
+        link_groups: Gruppi
+        create: "Invia Invito"
         generate_link: "Copia il collegamento di invito"
         link_generated: "Collegamento di invito generato con successo!"
         valid_for: "Questo collegamento di invito è valido solamente per il seguente indirizzo email: %{email}"
+        single_user: "Utente Singolo"
+        invite_link:
+          success: "Collegamento di invito generato con successo!"
         bulk_invite:
           none: "Non hai ancora invitato nessuno. Puoi inviare degli inviti individuali o più persone alla volta <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>caricando un file CSV</a>."
-          text: "Invito di Massa da File"
           success: "Il file è stato caricato con successo, riceverai un messaggio di notifica quando il processo sarà completato."
           error: "Spiacenti, il file deve essere in formato CSV."
           confirmation_message: "Stai per inviare un invito via email a tutti gli indirizzi inclusi nel file caricato."
@@ -1288,7 +1290,7 @@ it:
       desc:
         network: "Per favore controlla la connessione."
         network_fixed: "Sembra essere tornato."
-        server: "Codice di errore: {{status}}"
+        server: "Codice di errore: %{status}"
         forbidden: "Non hai i permessi per visualizzarlo."
         not_found: "Oops, l'applicazione ha cercato di caricare una URL inesistente."
         unknown: "Qualcosa è andato storto."
@@ -1351,8 +1353,8 @@ it:
       value_prop: "Quando crei un account, potremo ricordare esattamente cosa hai letto, in modo che tu possa riprendere esattamente da dove hai lasciato. Riceverai inoltre notifiche, qui o via email, quando qualcuno ti risponde. Potrai anche mettere \"Mi piace\" per mostrare il tuo apprezzamento :heartpulse:"
     summary:
       enabled_description: "Stai visualizzando un riepilogo dell'argomento: è la comunità a determinare quali sono i messaggi più interessanti."
-      description: "Ci sono <b>{{replyCount}}</b> risposte."
-      description_time: "Ci sono <b>{{replyCount}}</b> risposte con un tempo stimato di lettura di <b>{{readingTime}} minuti</b>."
+      description: "Ci sono <b>%{replyCount}</b> risposte."
+      description_time: "Ci sono <b>%{replyCount}</b> risposte con un tempo stimato di lettura di <b>%{readingTime} minuti</b>."
       enable: "Riassumi Questo Argomento"
       disable: "Mostra Tutti i Messaggi"
     deleted_filter:
@@ -1365,8 +1367,8 @@ it:
       invite: "Invita altri..."
       edit: "Aggiungi o rimuovi..."
       leave_message: "Vuoi veramente abbandonare questo messaggio?"
-      remove_allowed_user: "Davvero vuoi rimuovere {{name}} da questo messaggio?"
-      remove_allowed_group: "Vuoi veramente rimuovere {{name}} da questo messaggio?"
+      remove_allowed_user: "Davvero vuoi rimuovere %{name} da questo messaggio?"
+      remove_allowed_group: "Vuoi veramente rimuovere %{name} da questo messaggio?"
     email: "Email"
     username: "Nome utente"
     last_seen: "Ultima visita"
@@ -1375,7 +1377,7 @@ it:
     trust_level: "Livello Esperienza"
     search_hint: "nome utente, email o indirizzo IP"
     create_account:
-      disclaimer: "Registrandoti accetti il <a href='{{privacy_link}}' target='blank'>regolamento sulla Privacy</a> e <a href='{{tos_link}}' target='blank'>i termini di servizio</a>."
+      disclaimer: "Registrandoti accetti il <a href='%{privacy_link}' target='blank'>regolamento sulla Privacy</a> e <a href='%{tos_link}' target='blank'>i termini di servizio</a>."
       title: "Crea Nuovo Account"
       failed: "Qualcosa non ha funzionato. Forse questa email è già registrata, prova a usare il link di recupero password"
     forgot_password:
@@ -1435,7 +1437,7 @@ it:
       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."
-      not_activated: "Non puoi ancora connetterti. Abbiamo inviato un'email di attivazione a <b>{{sentTo}}</b>. Per favore segui le istruzioni contenute nell'email per attivare l'account."
+      not_activated: "Non puoi ancora connetterti. Abbiamo inviato un'email di attivazione a <b>%{sentTo}</b>. Per favore segui le istruzioni contenute nell'email per attivare l'account."
       not_allowed_from_ip_address: "Non puoi connetterti con questo indirizzo IP."
       admin_not_allowed_from_ip_address: "Non puoi connetterti come amministratore da quell'indirizzo IP."
       resend_activation_email: "Clicca qui per inviare nuovamente l'email di attivazione."
@@ -1444,7 +1446,7 @@ it:
       change_email: "Cambia Indirizzo Email"
       provide_new_email: "Fornisci un nuovo indirizzo e invieremo nuovamente la tua email di conferma."
       submit_new_email: "Aggiorna Indirizzo Email"
-      sent_activation_email_again: "Ti abbiamo mandato un'altra email di attivazione su <b>{{currentEmail}}</b>. Potrebbero essere necessari alcuni minuti di attesa; assicurati di controllare anche la cartella  spam."
+      sent_activation_email_again: "Ti abbiamo mandato un'altra email di attivazione su <b>%{currentEmail}</b>. Potrebbero essere necessari alcuni minuti di attesa; assicurati di controllare anche la cartella  spam."
       sent_activation_email_again_generic: "Abbiamo inviato un'altra email di attivazione. Potrebbero passare alcuni minuti prima che arrivi; assicurati di controllare la tua cartella spam."
       to_continue: "Per favore Connettiti"
       preferences: "Devi essere connesso per cambiare le tue impostazioni."
@@ -1508,20 +1510,20 @@ it:
     conditional_loading_section:
       loading: In caricamento...
     category_row:
-      topic_count: "{{count}} argomenti in questa categoria"
+      topic_count: "%{count} argomenti in questa categoria"
     select_kit:
       default_header_text: Selezione...
       no_content: Nessun risultato trovato
       filter_placeholder: Ricerca...
       filter_placeholder_with_any: Cerca o crea...
-      create: "Crea: '{{content}}'"
+      create: "Crea: '%{content}'"
       max_content_reached:
-        one: "Puoi selezionare solo {{count}} elemento."
-        other: "Puoi selezionare solo {{count}} elementi."
+        one: "Puoi selezionare solo %{count} elemento."
+        other: "Puoi selezionare solo %{count} elementi."
       min_content_not_reached:
-        one: "Seleziona almeno {{count}} elemento."
-        other: "Seleziona almeno {{count}} elementi."
-      invalid_selection_length: "La selezione deve contenere almeno {{count}} caratteri."
+        one: "Seleziona almeno %{count} elemento."
+        other: "Seleziona almeno %{count} elementi."
+      invalid_selection_length: "La selezione deve contenere almeno %{count} caratteri."
     date_time_picker:
       from: Da
       to: A
@@ -1548,7 +1550,7 @@ it:
       default: Emoji personalizzate
     shared_drafts:
       title: "Bozze condivise"
-      notice: "L'argomento è visibile solo a chi può vedere la categoria <b>{{category}}</b>."
+      notice: "L'argomento è visibile solo a chi può vedere la categoria <b>%{category}</b>."
       destination_category: "Categoria di destinazione"
       publish: "Pubblica Bozza Condivisa"
       confirm_publish: "Confermi la pubblicazione di questa bozza?"
@@ -1568,24 +1570,24 @@ it:
       similar_topics: "Il tuo argomento è simile a..."
       drafts_offline: "bozze offline"
       edit_conflict: "modifica conflitto"
-      group_mentioned_limit: "<b>Attenzione!</b> Hai menzionato <a href='{{group_link}}'>{{group}}</a>, tuttavia questo gruppo ha più membri del limite per le menzioni di {{max}} utenti  configurato dagli amministratori . Nessuna notifica verrà inviata. "
+      group_mentioned_limit: "<b>Attenzione!</b> Hai menzionato <a href='%{group_link}'>%{group}</a>, tuttavia questo gruppo ha più membri del limite per le menzioni di %{max} utenti  configurato dagli amministratori . Nessuna notifica verrà inviata. "
       group_mentioned:
-        one: "Menzionando {{group}}, verrà notificata <a href='{{group_link}}'>%{count} persona</a> – sei sicuro?"
-        other: "Menzionando {{group}}, verranno notificate <a href='{{group_link}}'>{{count}} persone</a> – sei sicuro?"
+        one: "Menzionando %{group}, verrà notificata <a href='%{group_link}'>%{count} persona</a> – sei sicuro?"
+        other: "Menzionando %{group}, verranno notificate <a href='%{group_link}'>%{count} persone</a> – sei sicuro?"
       cannot_see_mention:
-        category: "Hai menzionato {{username}} ma non verranno notificati perché non hanno accesso a questa categoria. Dovrai aggiungerli ad un gruppo che ha accesso a questa categoria."
-        private: "Hai menzionato {{username}} ma non verranno notificati perché non hanno accesso a questo messaggio personale. Dovrai invitarli a questo MP."
-      duplicate_link: "Sembra che il tuo collegamento a <b>{{domain}}</b> sia già stato pubblicato in questo argomento da <b>@{{username}}</b> in <a href='{{post_url}}'>una risposta di {{ago}}</a> - sei sicuro di volerlo pubblicare ancora?"
-      reference_topic_title: "RE: {{title}}"
+        category: "Hai menzionato %{username} ma non verranno notificati perché non hanno accesso a questa categoria. Dovrai aggiungerli ad un gruppo che ha accesso a questa categoria."
+        private: "Hai menzionato %{username} ma non verranno notificati perché non hanno accesso a questo messaggio personale. Dovrai invitarli a questo MP."
+      duplicate_link: "Sembra che il tuo collegamento a <b>%{domain}</b> sia già stato pubblicato in questo argomento da <b>@%{username}</b> in <a href='%{post_url}'>una risposta di %{ago}</a> - sei sicuro di volerlo pubblicare ancora?"
+      reference_topic_title: "RE: %{title}"
       error:
         title_missing: "Il titolo è richiesto"
-        title_too_short: "Il titolo deve essere lungo almeno {{min}} caratteri"
-        title_too_long: "Il titolo non può essere più lungo di {{max}} caratteri"
+        title_too_short: "Il titolo deve essere lungo almeno %{min} caratteri"
+        title_too_long: "Il titolo non può essere più lungo di %{max} caratteri"
         post_missing: "Il messaggio non può essere vuoto"
-        post_length: "Il messaggio deve essere lungo almeno {{min}} caratteri"
-        try_like: "Hai provato ad usare il pulsante {{heart}} ?"
+        post_length: "Il messaggio deve essere lungo almeno %{min} caratteri"
+        try_like: "Hai provato ad usare il pulsante %{heart} ?"
         category_missing: "Devi scegliere una categoria"
-        tags_missing: "Devi scegliere almeno {{count}} etichette"
+        tags_missing: "Devi scegliere almeno %{count} etichette"
         topic_template_not_modified: "Aggiungi dettagli e specificità al tuo argomento modificando il modello di argomento."
       save_edit: "Salva Modifiche"
       overwrite_edit: "Sovrascrivi modifica"
@@ -1683,10 +1685,10 @@ it:
       tooltip:
         regular:
           one: "%{count} notifica non visualizzata"
-          other: "{{count}} notifiche non visualizzate"
+          other: "%{count} notifiche non visualizzate"
         message:
           one: "%{count} messaggio non letto"
-          other: "{{count}} messaggi non letti"
+          other: "%{count} messaggi non letti"
         high_priority:
           one: "%{count} notifica ad alta priorità non letta"
           other: "%{count} notifiche ad alta priorità non lette"
@@ -1695,48 +1697,48 @@ it:
       empty: "Nessuna notifica trovata."
       post_approved: "Il tuo messaggio è stato approvato"
       reviewable_items: "elementi in attesa di revisione"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} e {{count}} altri</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} e {{count}} altri</span> {{description}}"
+        one: "<span>%{username}, %{username2} e %{count} altri</span> %{description}"
+        other: "<span>%{username}, %{username2} e %{count} altri</span> %{description}"
       liked_consolidated_description:
-        one: "ha messo \"mi piace\" ad {{count}} tuo messaggio"
-        other: "ha 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}}"
-      invited_to_topic: "<span>{{username}}</span> {{description}}"
-      invitee_accepted: "<span>{{username}}</span> ha accettato il tuo invito"
-      moved_post: "<span>{{username}}</span> spostato {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Guadagnato '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Nuovo Argomento</span> {{description}}"
-      membership_request_accepted: "Iscrizione accettata in &quot;{{group_name}}&quot;"
-      membership_request_consolidated: "{{count}} richieste di iscrizione aperte per &#39;{{group_name}}&#39;"
+        one: "ha messo \"mi piace\" ad %{count} tuo messaggio"
+        other: "ha 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}"
+      invited_to_topic: "<span>%{username}</span> %{description}"
+      invitee_accepted: "<span>%{username}</span> ha accettato il tuo invito"
+      moved_post: "<span>%{username}</span> spostato %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Guadagnato '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Nuovo Argomento</span> %{description}"
+      membership_request_accepted: "Iscrizione accettata in &quot;%{group_name}&quot;"
+      membership_request_consolidated: "%{count} richieste di iscrizione aperte per &#39;%{group_name}&#39;"
       group_message_summary:
-        one: "{{count}} messaggi in arrivo nella casella {{group_name}}"
-        other: "{{count}} messaggi in arrivo nella casella {{group_name}}"
+        one: "%{count} messaggi in arrivo nella casella %{group_name}"
+        other: "%{count} messaggi in arrivo nella casella %{group_name}"
       popup:
-        mentioned: '{{username}} ti ha menzionato in "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} ti ha menzionato in "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} ti ha citato in "{{topic}}" - {{site_title}}'
-        replied: '{{username}} ti ha risposto in "{{topic}}" - {{site_title}}'
-        posted: '{{username}} ha pubblicato in "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} ti ha inviato un messaggio personale in "{{topic}}" - {{site_title}}'
-        linked: '{{username}} ha aggiunto un collegamento a un tuo messaggio da "{{topic}}" - {{site_title}}'
-        watching_first_post: '{{username}} ha creato il nuovo argomento "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} ti ha menzionato in "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} ti ha menzionato in "%{topic}" - %{site_title}'
+        quoted: '%{username} ti ha citato in "%{topic}" - %{site_title}'
+        replied: '%{username} ti ha risposto in "%{topic}" - %{site_title}'
+        posted: '%{username} ha pubblicato in "%{topic}" - %{site_title}'
+        private_message: '%{username} ti ha inviato un messaggio personale in "%{topic}" - %{site_title}'
+        linked: '%{username} ha aggiunto un collegamento a un tuo messaggio da "%{topic}" - %{site_title}'
+        watching_first_post: '%{username} ha creato il nuovo argomento "%{topic}" - %{site_title}'
         confirm_title: "Notifiche abilitate - %{site_title}"
         confirm_body: "Successo! Le notifiche sono state abilitate."
-        custom: "Notifica di {{username}} su %{site_title}"
+        custom: "Notifica di %{username} su %{site_title}"
       titles:
         mentioned: "menzionato"
         replied: "nuova risposta"
@@ -1766,9 +1768,9 @@ it:
       from_my_computer: "Dal mio dispositivo"
       from_the_web: "Dal web"
       remote_tip: "collegamento all'immagine"
-      remote_tip_with_attachments: "collegamento all'immagine o al file {{authorized_extensions}}"
+      remote_tip_with_attachments: "collegamento all'immagine o al file %{authorized_extensions}"
       local_tip: "seleziona immagini dal tuo dispositivo"
-      local_tip_with_attachments: "seleziona immagini o file dal tuo dispositivo {{authorized_extensions}}"
+      local_tip_with_attachments: "seleziona immagini o file dal tuo dispositivo %{authorized_extensions}"
       hint: "(puoi anche trascinarle nell'editor per caricarle)"
       hint_for_supported_browsers: "puoi fare il \"trascina e rilascia\" o incollare immagini nell'editor"
       uploading: "In caricamento"
@@ -1785,15 +1787,15 @@ it:
       clear_all: "Cancella Tutto"
       too_short: "La tua chiave di ricerca è troppo corta."
       result_count:
-        one: "<span>%{count} risultato per</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} risultati per</span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} risultato per</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} risultati per</span><span class='term'>%{term}</span>"
       title: "cerca argomenti, messaggi, utenti o categorie"
       full_page_title: "Cerca negli Argomenti o nei Messaggi"
       no_results: "Nessun risultato trovato."
       no_more_results: "Nessun altro risultato trovato."
       searching: "Ricerca in corso..."
-      post_format: "#{{post_number}} da {{username}}"
-      results_page: "Risultati della ricerca per '{{term}}'"
+      post_format: "#%{post_number} da %{username}"
+      results_page: "Risultati della ricerca per '%{term}'"
       more_results: "Ci sono più risultati. Restringi i criteri di ricerca."
       cant_find: "Non riesci a trovare quello che stai cercando?"
       start_new_topic: "Forse vuoi avviare un nuovo argomento?"
@@ -1802,9 +1804,9 @@ it:
       search_google_button: "Google"
       search_google_title: "Cerca nel sito"
       context:
-        user: "Cerca messaggi di @{{username}}"
-        category: "Cerca nella categoria #{{category}}"
-        tag: "Cerca l'etichetta #{{tag}}"
+        user: "Cerca messaggi di @%{username}"
+        category: "Cerca nella categoria #%{category}"
+        tag: "Cerca l'etichetta #%{tag}"
         topic: "Cerca in questo argomento"
         private_messages: "Cerca messaggi"
       advanced:
@@ -1881,7 +1883,7 @@ it:
         choose_new_category: "Scegli la nuova categoria per gli argomenti:"
         selected:
           one: "Hai selezionato <b>%{count}</b> argomento."
-          other: "Hai selezionato <b>{{count}}</b> argomenti."
+          other: "Hai selezionato <b>%{count}</b> argomenti."
         change_tags: "Sostituire Etichette"
         append_tags: "Aggiungi Etichette"
         choose_new_tags: "Scegli nuove etichette per i seguenti argomenti:"
@@ -1894,7 +1896,7 @@ it:
         posted: "Non hai ancora scritto in nessun argomento."
         latest: "Non ci sono argomenti più recenti. Ciò è triste."
         bookmarks: "Non hai ancora argomenti nei segnalibri."
-        category: "Non ci sono argomenti in {{category}}."
+        category: "Non ci sono argomenti in %{category}."
         top: "Non ci sono argomenti di punta."
         educate:
           new: '<p>Qui compaiono i nuovi argomenti.</p><p>Per difetto, gli argomenti vengono considerati nuovi e mostrano l''indicatore <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">nuovo</span> se sono stati creati negli ultimi 2 giorni.</p><p>Puoi cambiare questa configurazione nelle tue <a href="%{userPrefsUrl}">preferenze</a>.</p>'
@@ -1905,13 +1907,13 @@ it:
         read: "Non ci sono altri argomenti letti."
         new: "Non ci sono altri argomenti nuovi."
         unread: "Non ci sono altri argomenti non letti"
-        category: "Non ci sono altri argomenti nella categoria {{category}}."
+        category: "Non ci sono altri argomenti nella categoria %{category}."
         top: "Non ci sono altri argomenti di punta."
         bookmarks: "Non ci sono ulteriori argomenti nei segnalibri."
     topic:
       filter_to:
         one: "%{count} messaggio in questo argomento"
-        other: "{{count}} messaggi in questo argomento"
+        other: "%{count} messaggi in questo argomento"
       create: "Nuovo Argomento"
       create_long: "Crea un nuovo Argomento"
       open_draft: "Apri Bozza"
@@ -1940,10 +1942,10 @@ it:
       unread: "non letto"
       new_topics:
         one: "%{count} nuovo argomento"
-        other: "{{count}} nuovi argomenti"
+        other: "%{count} nuovi argomenti"
       unread_topics:
         one: "%{count} argomento non letto"
-        other: "{{count}} argomenti non letti"
+        other: "%{count} argomenti non letti"
       title: "Argomento"
       invalid_access:
         title: "L'argomento è privato"
@@ -1957,24 +1959,24 @@ it:
         description: "Spiacenti, non abbiamo trovato l'argomento. Forse è stato rimosso da un moderatore?"
       total_unread_posts:
         one: "c'è un post non letto in questa discussione"
-        other: "hai {{count}} messagi non letti in questo argomento"
+        other: "hai %{count} messagi non letti in questo argomento"
       unread_posts:
         one: "Hai %{count} vecchio messaggio non letto in questo argomento"
-        other: "hai {{count}} vecchi messaggi non letti in questo argomento"
+        other: "hai %{count} vecchi messaggi non letti in questo argomento"
       new_posts:
         one: "c'è %{count} nuovo messaggio in questo argomento dalla tua ultima lettura"
-        other: "ci sono {{count}} nuovi messaggi in questo argomento dalla tua ultima lettura"
+        other: "ci sono %{count} nuovi messaggi in questo argomento dalla tua ultima lettura"
       likes:
         one: "c'è %{count} \"Mi piace\" in questo argomento"
-        other: "ci sono {{count}} \"Mi piace\" in questo argomento"
+        other: "ci sono %{count} \"Mi piace\" in questo argomento"
       back_to_list: "Torna alla Lista Argomenti"
       options: "Opzioni Argomento"
       show_links: "mostra i collegamenti in questo argomento"
       toggle_information: "commuta i dettagli dell'argomento"
-      read_more_in_category: "Vuoi saperne di più? Leggi altri argomenti in {{catLink}} o {{latestLink}}."
-      read_more: "Vuoi saperne di più? {{catLink}} o {{latestLink}}."
-      group_request: "Per vedere questo Argomento devi richiedere l&#39;iscrizioneal gruppo `{{name}}`"
-      group_join: "È necessario iscriversi al gruppo `{{name}}` per visualizzare questo Argomento"
+      read_more_in_category: "Vuoi saperne di più? Leggi altri argomenti in %{catLink} o %{latestLink}."
+      read_more: "Vuoi saperne di più? %{catLink} o %{latestLink}."
+      group_request: "Per vedere questo Argomento devi richiedere l&#39;iscrizioneal gruppo `%{name}`"
+      group_join: "È necessario iscriversi al gruppo `%{name}` per visualizzare questo Argomento"
       group_request_sent: "La tua richiesta di iscrizione al gruppo è stata inviata. Sarai informato quando sarà accettato."
       unread_indicator: "Nessun utente ha ancora letto l&#39;ultimo post di questo Argomento."
       read_more_MF: "{ UNREAD, plural, =0 {} one { C'è <a href='{basePath}/unread'>1 argomento non letto</a> } other { Ci sono <a href='{basePath}/unread'># argomenti non letti</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{e } false {è } other{}} <a href='{basePath}/new'>1 nuovo</a> argomento} other { {BOTH, select, true{e } false {Ci sono } other{}} <a href='{basePath}/new'># nuovi</a> argomenti} } restanti, o {CATEGORY, select, true {visualizza altri argomenti in {catLink}} false {{latestLink}} other {}}"
@@ -2078,7 +2080,7 @@ it:
           "2_8": "Vedrai un conteggio delle nuove risposte perché stai seguendo questa categoria."
           "2_4": "Vedrai un conteggio delle nuove risposte perché hai pubblicato una risposta in questo argomento."
           "2_2": "Vedrai un conteggio delle nuove risposte perché stai seguendo questo argomento."
-          "2": 'Vedrai un conteggio delle nuove risposte perché hai <a href="{{basePath}}/u/{{username}}/preferences/notifications">letto questo argomento</a>.'
+          "2": 'Vedrai un conteggio delle nuove risposte perché hai <a href="%{basePath}/u/%{username}/preferences/notifications">letto questo argomento</a>.'
           "1_2": "Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde."
           "1": "Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde."
           "0_7": "Stai ignorando tutte le notifiche di questa categoria."
@@ -2154,25 +2156,25 @@ it:
         choose_category: "Scegli una categoria per l'argomento pubblico:"
       feature_topic:
         title: "Poni argomento in primo piano"
-        pin: "Poni questo argomento in cima alla categoria {{categoryLink}} fino a"
-        confirm_pin: "Hai già {{count}} argomenti puntati. Troppi argomenti puntati potrebbero essere un peso per gli utenti nuovi o anonimi. Sicuro di voler puntare un altro argomento in questa categoria?"
-        unpin: "Rimuovi questo argomento dalla cima della categoria {{categoryLink}}."
-        unpin_until: "Rimuovi questo argomento dalla cima della categoria {{categoryLink}} o attendi fino a <strong>%{until}</strong>."
+        pin: "Poni questo argomento in cima alla categoria %{categoryLink} fino a"
+        confirm_pin: "Hai già %{count} argomenti puntati. Troppi argomenti puntati potrebbero essere un peso per gli utenti nuovi o anonimi. Sicuro di voler puntare un altro argomento in questa categoria?"
+        unpin: "Rimuovi questo argomento dalla cima della categoria %{categoryLink}."
+        unpin_until: "Rimuovi questo argomento dalla cima della categoria %{categoryLink} o attendi fino a <strong>%{until}</strong>."
         pin_note: "Gli utenti possono spuntare gli argomenti individualmente per loro stessi."
         pin_validation: "È richiesta una data per appuntare questo argomento."
-        not_pinned: "Non ci sono argomenti appuntati in {{categoryLink}}."
+        not_pinned: "Non ci sono argomenti appuntati in %{categoryLink}."
         already_pinned:
-          one: "Argomenti attualmente appuntati in {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Argomenti attualmente appuntati in {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Argomenti attualmente appuntati in %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Argomenti attualmente appuntati in %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Poni questo argomento in cima a tutte le liste di argomenti fino a"
-        confirm_pin_globally: "Hai già {{count}} argomenti puntati globalmente. Troppi argomenti puntati potrebbero essere un peso per gli utenti nuovi o anonimi. Sicuro di voler puntare un altro argomento globalmente?"
+        confirm_pin_globally: "Hai già %{count} argomenti puntati globalmente. Troppi argomenti puntati potrebbero essere un peso per gli utenti nuovi o anonimi. Sicuro di voler puntare un altro argomento globalmente?"
         unpin_globally: "Togli questo argomento dalla cima degli altri argomenti."
         unpin_globally_until: "Rimuovi questo argomento dalla cima di tutte le liste di argomenti o attendi fino a <strong>%{until}</strong>."
         global_pin_note: "Gli utenti possono spuntare gli argomenti autonomamente per loro stessi."
         not_pinned_globally: "Non ci sono argomenti appuntati globalmente."
         already_pinned_globally:
           one: "Argomenti attualmente appuntati globalmente: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Argomenti attualmente appuntati globalmente: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Argomenti attualmente appuntati globalmente: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Rendi questo argomento un annuncio che apparirà in cima a tutte le pagine."
         remove_banner: "Rimuovi lo striscione che appare in cima a tutte le pagine."
         banner_note: "Gli utenti possono nascondere l'annuncio chiudendolo. Solo un argomento per volta può diventare un annuncio."
@@ -2202,15 +2204,15 @@ it:
         to_topic_username: "Hai inserito un nome utente. Gli invieremo una notifica con un collegamento per invitarlo su questo argomento."
         to_username: "Inserisci il nome utente della persona che vorresti invitare. Gli invieremo una notifica con un collegamento di invito a questo argomento."
         email_placeholder: "nome@esempio.com"
-        success_email: "Abbiamo inviato un invito via email a <b>{{emailOrUsername}}</b>. Ti avvertiremo quando l'invito verrà riscattato. Controlla la sezione \"inviti\" sulla tua pagina utente per tracciarne lo stato."
+        success_email: "Abbiamo inviato un invito via email a <b>%{emailOrUsername}</b>. Ti avvertiremo quando l'invito verrà riscattato. Controlla la sezione \"inviti\" sulla tua pagina utente per tracciarne lo stato."
         success_username: "Abbiamo invitato l'utente a partecipare all'argomento."
         error: "Spiacenti, non siamo riusciti ad invitare questa persona. E' stata per caso già invitata (gli inviti sono limitati)? "
-        success_existing_email: "Esiste già un utente con email <b>{{emailOrUsername}}</b>. Lo abbiamo invitato a partecipare a questo argomento."
+        success_existing_email: "Esiste già un utente con email <b>%{emailOrUsername}</b>. Lo abbiamo invitato a partecipare a questo argomento."
       login_reply: "Connettiti per Rispondere"
       filters:
         n_posts:
           one: "%{count} post"
-          other: "{{count}} messaggi"
+          other: "%{count} messaggi"
         cancel: "Rimuovi filtro"
       move_to:
         title: "Sposta in"
@@ -2224,7 +2226,7 @@ it:
         error: "Si è verificato un errore spostando il messaggio nel nuovo argomento."
         instructions:
           one: "Stai per creare un nuovo argomento riempiendolo con il messaggio che hai selezionato."
-          other: "Stai per creare un nuovo argomento riempiendolo con i <b>{{count}}</b> messaggi che hai selezionato."
+          other: "Stai per creare un nuovo argomento riempiendolo con i <b>%{count}</b> messaggi che hai selezionato."
       merge_topic:
         title: "Sposta in Argomento Esistente"
         action: "sposta in un argomento esistente"
@@ -2232,7 +2234,7 @@ it:
         radio_label: "Argomento Esistente"
         instructions:
           one: "Per favore scegli l'argomento dove spostare il messaggio."
-          other: "Per favore scegli l'argomento di destinazione dove spostare i <b>{{count}}</b> messaggi."
+          other: "Per favore scegli l'argomento di destinazione dove spostare i <b>%{count}</b> messaggi."
       move_to_new_message:
         title: "Sposta in un nuovo messaggio"
         action: "sposta in un nuovo messaggio"
@@ -2241,7 +2243,7 @@ it:
         participants: "Partecipanti"
         instructions:
           one: "Stai per creare un nuovo messaggio e popolarlo con il messaggio che hai selezionato."
-          other: "Stai per creare un nuovo messaggio e popolarlo con i <b>{{count}}</b> messaggi che hai selezionato."
+          other: "Stai per creare un nuovo messaggio e popolarlo con i <b>%{count}</b> messaggi che hai selezionato."
       move_to_existing_message:
         title: "Sposta in un messaggio esistente"
         action: "sposta in un messaggio esistente"
@@ -2249,7 +2251,7 @@ it:
         participants: "Partecipanti"
         instructions:
           one: "Scegli il messaggio verso il quale vorresti spostare questo messaggio."
-          other: "Scegli il messaggio verso il quale vorresti spostare quei <b>{{count}}</b> messaggi."
+          other: "Scegli il messaggio verso il quale vorresti spostare quei <b>%{count}</b> messaggi."
       merge_posts:
         title: "Unisci Messaggi Selezionati"
         action: "unisci messaggi selezionati"
@@ -2272,11 +2274,11 @@ it:
         error: "Si è verificato un errore durante il cambio di proprietà dei messaggi."
         placeholder: "nome utente del nuovo proprietario"
         instructions:
-          one: "Per favore, scegli un nuovo proprietario per il messaggio che apparteneva a <b>@{{old_user}}</b>"
-          other: "Per favore, scegli un nuovo proprietario per i {{count}} messaggi che appartenevano a <b>@{{old_user}}</b>"
+          one: "Per favore, scegli un nuovo proprietario per il messaggio che apparteneva a <b>@%{old_user}</b>"
+          other: "Per favore, scegli un nuovo proprietario per i %{count} messaggi che appartenevano a <b>@%{old_user}</b>"
         instructions_without_old_user:
           one: "Scegli un nuovo proprietario per il messaggio"
-          other: "Scegli un nuovo proprietario per i {{count}} messaggi"
+          other: "Scegli un nuovo proprietario per i %{count} messaggi"
       change_timestamp:
         title: "Cambia Marca Temporale..."
         action: "cambia marca temporale"
@@ -2285,7 +2287,7 @@ it:
         instructions: "Seleziona il nuovo timestamp per l'argomento. I messaggi nell'argomento saranno aggiornati in modo che abbiano lo stesso intervallo temporale."
       multi_select:
         select: "scegli"
-        selected: "selezionati ({{count}})"
+        selected: "selezionati (%{count})"
         select_post:
           label: "seleziona"
           title: "Aggiungi il messaggio alla selezione"
@@ -2304,20 +2306,20 @@ it:
         deselect_all: deseleziona tutto
         description:
           one: Hai selezionato <b>%{count}</b> messaggio.
-          other: "Hai selezionato <b>{{count}}</b> messaggi."
+          other: "Hai selezionato <b>%{count}</b> messaggi."
       deleted_by_author:
         one: "(Argomento eliminato dall'autore, verrà automaticamente cancellato in %{count} ora, se non segnalato)"
         other: "(Argomento eliminato dall'autore, verrà automaticamente cancellato in %{count} ore, se non segnalato)"
     post:
       quote_reply: "Cita"
       edit_reason: "Motivo:"
-      post_number: "messaggio {{number}}"
+      post_number: "messaggio %{number}"
       ignored: "Contenuto ignorato"
       wiki_last_edited_on: "ultima modifica alla wiki"
       last_edited_on: "ultima modifica al messaggio:"
       reply_as_new_topic: "Rispondi come Argomento collegato"
       reply_as_new_private_message: "Rispondi come nuovo messaggio agli stessi destinatari"
-      continue_discussion: "Continua la discussione da {{postLink}}:"
+      continue_discussion: "Continua la discussione da %{postLink}:"
       follow_quote: "vai al messaggio citato"
       show_full: "Mostra Messaggio Completo"
       show_hidden: "Visualizza contenuto ignorato"
@@ -2329,29 +2331,29 @@ it:
       locked: "un membro dello Staff ha bloccato le modifiche a questo messaggio"
       gap:
         one: "visualizza %{count} risposta nascosta"
-        other: "visualizza {{count}} riposte nascoste"
+        other: "visualizza %{count} riposte nascoste"
       notice:
-        new_user: "E' la prima volta che {{user}} invia un messaggio. Diamogli il benvenuto nella nostra comunità!"
-        returning_user: "Era da un bel po' che {{user}} non si faceva vedere: l'ultimo messaggio risale a {{time}}."
+        new_user: "E' la prima volta che %{user} invia un messaggio. Diamogli il benvenuto nella nostra comunità!"
+        returning_user: "Era da un bel po' che %{user} non si faceva vedere: l'ultimo messaggio risale a %{time}."
       unread: "Messaggio non letto"
       has_replies:
-        one: "{{count}} Risposta"
-        other: "{{count}} Risposte"
+        one: "%{count} Risposta"
+        other: "%{count} Risposte"
       has_likes_title:
         one: "Una persona ha messo \"Mi piace\" a questo messaggio"
-        other: "{{count}} persone hanno messo \"Mi piace\" a questo messaggio"
+        other: "%{count} persone hanno messo \"Mi piace\" a questo messaggio"
       has_likes_title_only_you: "hai messo \"Mi piace\" a questo messaggio"
       has_likes_title_you:
         one: "tu e un'altra persona avete messo \"Mi piace\" a questo messaggio"
-        other: "tu e altre {{count}} persone avete messo \"Mi piace\" a questo messaggio"
+        other: "tu e altre %{count} persone avete messo \"Mi piace\" a questo messaggio"
       errors:
         create: "Spiacenti, si è verificato un errore nel creare il tuo messaggio. Prova di nuovo."
         edit: "Spiacenti, si è verificato un errore nel modificare il tuo messaggio. Prova di nuovo."
         upload: "Spiacenti, si è verificato un errore durante il caricamento del file. Prova di nuovo."
-        file_too_large: "Spiacenti, ma questo file è troppo grande (la dimensione massima è {{max_size_kb}}kb). Perché non lo carichi su un servizio di cloud sharing per poi incollarne qui il collegamento?"
+        file_too_large: "Spiacenti, ma questo file è troppo grande (la dimensione massima è %{max_size_kb}kb). Perché non lo carichi su un servizio di cloud sharing per poi incollarne qui il collegamento?"
         too_many_uploads: "Spiacenti, puoi caricare un solo file per volta."
-        too_many_dragged_and_dropped_files: "Spiacenti, puoi caricare solo {{max}} file contemporaneamente."
-        upload_not_authorized: "Spiacenti, il file che stai cercando di caricare non è autorizzato (estensioni autorizzate: {{authorized_extensions}})."
+        too_many_dragged_and_dropped_files: "Spiacenti, puoi caricare solo %{max} file contemporaneamente."
+        upload_not_authorized: "Spiacenti, il file che stai cercando di caricare non è autorizzato (estensioni autorizzate: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Spiacenti, i nuovi utenti non possono caricare immagini."
         attachment_upload_not_allowed_for_new_user: "Spiacenti, i nuovi utenti non possono caricare allegati."
         attachment_download_requires_login: "Spiacenti, devi essere connesso per poter scaricare gli allegati."
@@ -2391,10 +2393,10 @@ it:
           confirm: "Vuoi eliminare anche le risposte a questo messaggio?"
           direct_replies:
             one: "Sì, e %{count} risposta diretta"
-            other: "Sì, e le {{count}} risposte dirette"
+            other: "Sì, e le %{count} risposte dirette"
           all_replies:
             one: "Sì, e %{count} risposta."
-            other: "Sì, e tutte le {{count}} risposte"
+            other: "Sì, e tutte le %{count} risposte"
           just_the_post: "No, solo questo messaggio"
         admin: "azioni post-amministrazione"
         wiki: "Rendi Wiki"
@@ -2441,11 +2443,11 @@ it:
             one: "ha letto"
             other: "ha letto"
           like_capped:
-            one: "e a {{count}} persona è piaciuto"
-            other: "e ad altre {{count}} persone è piaciuto"
+            one: "e a %{count} persona è piaciuto"
+            other: "e ad altre %{count} persone è piaciuto"
           read_capped:
-            one: "e {{count}} ha letto"
-            other: "e altri {{count}} hanno letto"
+            one: "e %{count} ha letto"
+            other: "e altri %{count} hanno letto"
         by_you:
           off_topic: "L'hai segnalato come fuori tema"
           spam: "L'hai segnalato come spam"
@@ -2457,11 +2459,11 @@ it:
       delete:
         confirm:
           one: "Vuoi davvero eliminare quel messaggio?"
-          other: "Vuoi davvero eliminare questi {{count}} messaggi?"
+          other: "Vuoi davvero eliminare questi %{count} messaggi?"
       merge:
         confirm:
           one: "Sicuro di voler unire questi messaggi?"
-          other: "Sicuro di voler unire questi {{count}} messaggi?"
+          other: "Sicuro di voler unire questi %{count} messaggi?"
       revisions:
         controls:
           first: "Prima revisione"
@@ -2473,7 +2475,7 @@ it:
           revert: "Ritorna a questa revisione"
           edit_wiki: "Modifica Wiki"
           edit_post: "Modifica Messaggio"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "Mostra il risultato con le aggiunte e le rimozioni in linea"
@@ -2664,13 +2666,13 @@ it:
       custom_message:
         at_least:
           one: "inserisci almeno %{count} carattere"
-          other: "inserisci almeno {{count}} caratteri"
+          other: "inserisci almeno %{count} caratteri"
         more:
           one: "%{count} mancante..."
-          other: "{{count}} mancanti..."
+          other: "%{count} mancanti..."
         left:
           one: "%{count} mancante"
-          other: "{{count}} rimanenti..."
+          other: "%{count} rimanenti..."
     flagging_topic:
       title: "Grazie per aiutarci a mantenere la nostra comunità civile!"
       action: "Segnala Argomento"
@@ -2714,7 +2716,7 @@ it:
         title: "Questo argomento è un messaggio personale"
         help: "Questo argomento è un messaggio personale"
     posts: "Messaggi"
-    posts_long: "ci sono {{number}} messaggi in questo argomento"
+    posts_long: "ci sono %{number} messaggi in questo argomento"
     posts_likes_MF: |
       Questo argomento ha {count, plural, one {1 risposta} other {# risposte}} {ratio, select, low {con un alto rapporto "mi piace" / messaggi} med {con un altissimo rapporto "mi piace" / messaggi} high {con un estremamente alto rapporto "mi piace" / messaggi} other {}}
     original_post: "Messaggio Originale"
@@ -2725,20 +2727,20 @@ it:
     replies: "Risposte"
     views_long:
       one: "questo argomento è stato visto una volta"
-      other: "questo argomento è stato visto {{number}} volte"
+      other: "questo argomento è stato visto %{number} volte"
     activity: "Attività"
     likes: "Mi piace"
     likes_lowercase:
       one: "mi piace"
       other: "mi piace"
-    likes_long: "ci sono {{number}} \"Mi piace\" in questo argomento"
+    likes_long: "ci sono %{number} \"Mi piace\" in questo argomento"
     users: "Utenti"
     users_lowercase:
       one: "utente"
       other: "utenti"
     category_title: "Categoria"
     history: "Storia"
-    changed_by: "da {{author}}"
+    changed_by: "da %{author}"
     raw_email:
       title: "Email In Arrivo"
       not_available: "Non disponibile!"
@@ -2750,33 +2752,33 @@ it:
         title: "Recenti"
         title_with_count:
           one: "Recente (%{count})"
-          other: "Recenti ({{count}})"
+          other: "Recenti (%{count})"
         help: "argomenti con messaggi recenti"
       read:
         title: "Letti"
         help: "argomenti che hai letto, in ordine di lettura"
       categories:
         title: "Categorie"
-        title_in: "Categoria - {{categoryName}}"
+        title_in: "Categoria - %{categoryName}"
         help: "tutti gli argomenti raggruppati per categoria"
       unread:
         title: "Non letti"
         title_with_count:
           one: "Non letto (%{count})"
-          other: "Non letti ({{count}})"
+          other: "Non letti (%{count})"
         help: "argomenti che stai osservando o seguendo contenenti messaggi non letti"
         lower_title_with_count:
           one: "%{count} non letto"
-          other: "{{count}} non letti"
+          other: "%{count} non letti"
       new:
         lower_title_with_count:
           one: "%{count} nuovo"
-          other: "{{count}} nuovi"
+          other: "%{count} nuovi"
         lower_title: "nuovo"
         title: "Nuovi"
         title_with_count:
           one: "Nuovo (%{count})"
-          other: "Nuovi ({{count}})"
+          other: "Nuovi (%{count})"
         help: "argomenti creati negli ultimi giorni"
       posted:
         title: "I miei Messaggi"
@@ -2785,11 +2787,11 @@ it:
         title: "Segnalibri"
         help: "argomenti che hai aggiunto ai segnalibri"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "argomenti recenti nella categoria {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "argomenti recenti nella categoria %{categoryName}"
       top:
         title: "Popolari"
         help: "gli argomenti più attivi nell'ultimo anno, mese, settimana o giorno"
@@ -2953,8 +2955,8 @@ it:
       synonyms: "Sinonimi"
       synonyms_description: "Quando vengono utilizzate le seguenti etichette, verranno sostituite con <b>%{base_tag_name}</b>."
       tag_groups_info:
-        one: 'Questa etichetta appartiene al gruppo "{{tag_groups}}".'
-        other: "Questa etichetta appartiene a questi gruppi: {{tag_groups}}."
+        one: 'Questa etichetta appartiene al gruppo "%{tag_groups}".'
+        other: "Questa etichetta appartiene a questi gruppi: %{tag_groups}."
       category_restrictions:
         one: "Può essere utilizzato solo in questa categoria:"
         other: "Può essere utilizzato solo in queste categorie:"
@@ -2970,11 +2972,11 @@ it:
       delete_tag: "Cancella Etichetta"
       delete_confirm:
         one: "Sei sicuro di voler eliminare questa etichetta e rimuoverla da %{count} argomento a cui è assegnata?"
-        other: "Sei sicuro di voler eliminare questa etichetta e rimuoverla da {{count}} argomenti a cui è assegnata?"
+        other: "Sei sicuro di voler eliminare questa etichetta e rimuoverla da %{count} argomenti a cui è assegnata?"
       delete_confirm_no_topics: "Sei sicuro di voler eliminare questa etichetta?"
       delete_confirm_synonyms:
         one: "Anche il suo sinonimo verrà eliminato."
-        other: "I {{count}} sinonimi verranno a loro volta eliminati."
+        other: "I %{count} sinonimi verranno a loro volta eliminati."
       rename_tag: "Rinomina Etichetta"
       rename_instructions: "Scegli un altro nome per l'etichetta:"
       sort_by: "Ordina per:"
@@ -3332,10 +3334,10 @@ it:
           redeliver: "Riconsegna "
           incoming:
             one: "C'è un nuovo evento."
-            other: "Ci sono {{count}} nuovi eventi."
+            other: "Ci sono %{count} nuovi eventi."
           completed_in:
             one: "Compleato in %{count} secondo."
-            other: "Completato in {{count}} secondi."
+            other: "Completato in %{count} secondi."
           request: "Richiesta"
           response: "Risposta"
           redeliver_confirm: "Sicuro di voler rispedire lo stesso payload?"
@@ -3387,12 +3389,12 @@ it:
           label: "Carica"
           title: "Carica un backup su questa istanza"
           uploading: "In caricamento..."
-          uploading_progress: "In caricamento... {{progress}}%"
-          success: "'{{filename}}' è stato caricato con successo. Il file è in via di elaborazione e potrebbe servire fino ad un minuto perché appaia nella lista."
-          error: "Si è verificato un errore durante il caricamento {{filename}}': {{message}}"
+          uploading_progress: "In caricamento... %{progress}%"
+          success: "'%{filename}' è stato caricato con successo. Il file è in via di elaborazione e potrebbe servire fino ad un minuto perché appaia nella lista."
+          error: "Si è verificato un errore durante il caricamento %{filename}': %{message}"
         operations:
           is_running: "Un'operazione è attualmente in esecuzione..."
-          failed: "{{operation}} non è riuscito/a. Controlla i log per saperne di più."
+          failed: "%{operation} non è riuscito/a. Controlla i log per saperne di più."
           cancel:
             label: "Annulla"
             title: "Annulla l'operazione in corso"
@@ -3515,7 +3517,7 @@ it:
           disabled_component_tooltip: "Questo Componente è stato disabilitato"
           default_theme_tooltip: "Questo è il tema di default del sito"
           updates_available_tooltip: "Sono disponibili aggiornamenti per questo tema"
-          and_x_more: "ed altri {{count}}."
+          and_x_more: "ed altri %{count}."
           collapse: Raggruppa
           uploads: "Carica"
           no_uploads: "Puoi caricare le risorse associate al tuo tema come il tipo di carattere e le immagini"
@@ -3564,8 +3566,8 @@ it:
           disabled_by: "Questo componente è stato disabilitato da"
           required_version:
             error: "Questo tema è stato disattivato automaticamente perché non compatibile con questa versione di Discourse."
-            minimum: "Richiede versione {{version}} o superiore di Discourse."
-            maximum: "Richiede versione {{version}} o inferiore di Discourse."
+            minimum: "Richiede versione %{version} o superiore di Discourse."
+            maximum: "Richiede versione %{version} o inferiore di Discourse."
           component_of: "Componente di:"
           update_to_latest: "Aggiorna all'ultima versione"
           check_for_updates: "Controllo Aggiornamenti"
@@ -3578,7 +3580,7 @@ it:
           empty: "Nessun elemento"
           commits_behind:
             one: "Il tema è indietro di %{count} aggiornamento!"
-            other: "Il tema è indietro di {{count}} commit!"
+            other: "Il tema è indietro di %{count} commit!"
           compare_commits: "(Vedi i nuovi commit)"
           repo_unreachable: "Impossibile accedere al Git repository di questo tema. Messaggio di errore:"
           imported_from_archive: "Questo tema è stato importato da un file .zip"
@@ -3983,8 +3985,8 @@ it:
           title: "Mostra l'indirizzo email di questo utente"
           text: "Mostra"
       user:
-        suspend_failed: "Si è verificato un errore sospendendo questo utente {{error}}"
-        unsuspend_failed: "Si è verificato un errore riabilitando questo utente {{error}}"
+        suspend_failed: "Si è verificato un errore sospendendo questo utente %{error}"
+        unsuspend_failed: "Si è verificato un errore riabilitando questo utente %{error}"
         suspend_duration: "Per quanto tempo l'utente sarà sospeso?"
         suspend_reason_label: "Perché lo stai sospendendo? Questo testo <b>sarà visibile a tutti</b> nella pagina del profilo dell'utente, e gli verrà mostrato tutte le volte che si connetterà. Scrivi il meno possibile."
         suspend_reason_hidden_label: "Perché stai sospendendo l'utente? Questo testo verrà mostrato all'utente quando cercherà di accedere. Mantienilo breve."
@@ -4361,6 +4363,7 @@ it:
         title: "Emoji"
         help: "Aggiungi nuovi emoji da mettere a disposizione per tutti. (Suggerimento: trascina e rilascia più file in una volta sola)"
         add: "Aggiungi Nuovo Emoji"
+        uploading: "In caricamento..."
         name: "Nome"
         group: "Gruppo"
         image: "Immagine"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 300bb63ff7..b4c366f65b 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -22,8 +22,8 @@ ja:
             mb: メガバイト
             tb: テラバイト
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "H:mm"
       timeline_date: "YYYY年M月"
@@ -199,10 +199,10 @@ ja:
     weekly: "毎週"
     every_month: "毎月"
     every_six_months: "6ヶ月毎"
-    max_of_count: "最大 {{count}}"
+    max_of_count: "最大 %{count}"
     alternation: "または"
     character_count:
-      other: "{{count}}文字"
+      other: "%{count}文字"
     related_messages:
       title: "関連メッセージ"
       see_all: '@%{username}からの<a href="%{path}">全てのメッセージ</a>を見る'
@@ -255,11 +255,11 @@ ja:
         yes_value: "はい、破棄します"
         no_value: "いいえ、保持します"
     topic_count_latest:
-      other: "{{count}}件の新規/更新トピックがあります。"
+      other: "%{count}件の新規/更新トピックがあります。"
     topic_count_unread:
-      other: "{{count}} 件の未読トピックがあります。"
+      other: "%{count} 件の未読トピックがあります。"
     topic_count_new:
-      other: "{{count}} 件の新規トピックがあります。"
+      other: "%{count} 件の新規トピックがあります。"
     preview: "プレビュー"
     cancel: "キャンセル"
     save: "変更を保存"
@@ -267,7 +267,7 @@ ja:
     saved: "保存しました"
     upload: "アップロード"
     uploading: "アップロード中..."
-    uploading_filename: "{{filename}}をアップロードしています…"
+    uploading_filename: "%{filename}をアップロードしています…"
     clipboard: "クリップボード"
     uploaded: "アップロードしました"
     pasting: "貼り付け"
@@ -317,7 +317,7 @@ ja:
       none: "レビューするアイテムがありません"
       view_pending: "保留のものを見る"
       topic_has_pending:
-        other: "このトピックは<b>{{count}}</b>件の承認待ちのポストがあります"
+        other: "このトピックは<b>%{count}</b>件の承認待ちのポストがあります"
       title: "レビュー"
       topic: "トピック:"
       filtered_user: "ユーザー"
@@ -331,11 +331,11 @@ ja:
         fields: "広場"
       user_percentage:
         agreed:
-          other: "{{count}}%同意"
+          other: "%{count}%同意"
         disagreed:
-          other: "{{count}}%同意しない"
+          other: "%{count}%同意しない"
         ignored:
-          other: "{{count}}%無投票"
+          other: "%{count}%無投票"
       topics:
         topic: "トピック"
         reported_by: "報告者："
@@ -343,9 +343,9 @@ ja:
         original: "(もとのトピック)"
         details: "詳細"
         unique_users:
-          other: "{{count}}ユーザー"
+          other: "%{count}ユーザー"
       replies:
-        other: "{{count}}件の返信"
+        other: "%{count}件の返信"
       edit: "編集"
       save: "保存"
       cancel: "キャンセル"
@@ -394,19 +394,19 @@ ja:
         description: "新しい投稿はモデレータによる承認が必要です。しばらくお待ち下さい。"
         ok: "OK"
     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> を作成"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> が <a href='{{postUrl}}'>{{post_number}}</a> に返信"
-      you_replied_to_post: "<a href='{{userUrl}}'>あなた</a> が <a href='{{postUrl}}'>{{post_number}}</a> に返信"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> が <a href='{{topicUrl}}'>トピック</a> に返信"
-      you_replied_to_topic: "<a href='{{userUrl}}'>あなた</a> が <a href='{{topicUrl}}'>トピック</a> に返信"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> が <a href='{{user2Url}}'>{{another_user}}</a> をタグ付けしました"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> が <a href='{{user2Url}}'>あなた</a> を をタグ付けしました"
-      you_mentioned_user: "<a href='{{user1Url}}'>あなた</a> が <a href='{{user2Url}}'>{{another_user}}</a> をタグ付けしました"
-      posted_by_user: "<a href='{{userUrl}}'>{{user}}</a> が投稿"
-      posted_by_you: "<a href='{{userUrl}}'>あなた</a> が投稿"
-      sent_by_user: "<a href='{{userUrl}}'>{{user}}</a> が送信"
-      sent_by_you: "<a href='{{userUrl}}'>あなた</a> が送信"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> が <a href='%{topicUrl}'>トピック</a> を作成"
+      you_posted_topic: "<a href='%{userUrl}'>あなた</a> が <a href='%{topicUrl}'>トピック</a> を作成"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> が <a href='%{postUrl}'>%{post_number}</a> に返信"
+      you_replied_to_post: "<a href='%{userUrl}'>あなた</a> が <a href='%{postUrl}'>%{post_number}</a> に返信"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> が <a href='%{topicUrl}'>トピック</a> に返信"
+      you_replied_to_topic: "<a href='%{userUrl}'>あなた</a> が <a href='%{topicUrl}'>トピック</a> に返信"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> が <a href='%{user2Url}'>%{another_user}</a> をタグ付けしました"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> が <a href='%{user2Url}'>あなた</a> を をタグ付けしました"
+      you_mentioned_user: "<a href='%{user1Url}'>あなた</a> が <a href='%{user2Url}'>%{another_user}</a> をタグ付けしました"
+      posted_by_user: "<a href='%{userUrl}'>%{user}</a> が投稿"
+      posted_by_you: "<a href='%{userUrl}'>あなた</a> が投稿"
+      sent_by_user: "<a href='%{userUrl}'>%{user}</a> が送信"
+      sent_by_you: "<a href='%{userUrl}'>あなた</a> が送信"
     directory:
       filter_name: "ユーザー名でフィルタ"
       title: "ユーザー"
@@ -626,7 +626,7 @@ ja:
     user_fields:
       none: "(オプションを選択)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "プロフィール"
       mute: "ミュート"
       edit: "プロフィールを編集"
@@ -687,12 +687,12 @@ ja:
       external_links_in_new_tab: "外部リンクをすべて別のタブで開く"
       enable_quoting: "選択したテキストを引用して返信する"
       change: "変更"
-      moderator: "{{user}} はモデレータです"
-      admin: "{{user}} は管理者です"
+      moderator: "%{user} はモデレータです"
+      admin: "%{user} は管理者です"
       moderator_tooltip: "このユーザーはモデレータです"
       admin_tooltip: "このユーザーは管理者です"
       silenced_tooltip: "このユーザーは消音状態です"
-      suspended_notice: "このユーザーは {{date}} まで凍結状態です。"
+      suspended_notice: "このユーザーは %{date} まで凍結状態です。"
       suspended_permanently: "このユーザーは凍結されています"
       suspended_reason: "理由: "
       github_profile: "Github"
@@ -705,7 +705,7 @@ ja:
           ミュートしているトピックやカテゴリはこれらのメールには含まれません。
         individual: "新しい投稿がある場合にメールで送る"
         individual_no_echo: "自分以外の新しい投稿がある場合にメールで送る"
-        many_per_day: "投稿される度にメールで通知を受け取る (日に {{dailyEmailEstimate}} 回程度)"
+        many_per_day: "投稿される度にメールで通知を受け取る (日に %{dailyEmailEstimate} 回程度)"
         few_per_day: "投稿される度にメールで通知を受け取る (日に2回程度)"
         warning: "メーリングリストモードです。メール通知設定が上書きされます。"
       tag_settings: "タグ"
@@ -735,9 +735,7 @@ ja:
       admin_delete: "削除"
       users: "ユーザー"
       muted_users: "ミュート"
-      muted_users_instructions: "ユーザーからの通知をすべて行いません"
       ignored_users: "無視する"
-      ignored_users_instructions: "ユーザーからのすべての投稿と通知が抑制されます。"
       tracked_topics_link: "詳しく見る"
       automatically_unpin_topics: "最後まで読んだら自動的に固定表示を解除する。"
       apps: "アプリ連携"
@@ -792,7 +790,7 @@ ja:
         enable_long: "バックアップコードを有効にします"
         copy_to_clipboard_error: "クリップボードにコピーする際にエラーが発生しました"
         copied_to_clipboard: "クリップボードにコピーしました"
-        remaining_codes: "<strong>{{count}}</strong> 個のバックアップコードが残っています。"
+        remaining_codes: "<strong>%{count}</strong> 個のバックアップコードが残っています。"
         use: "バックアップコードを使用"
         codes:
           title: "バックアップコードが作られました"
@@ -841,10 +839,10 @@ ja:
         instructions: "他人に公開はされません"
         ok: "確認用メールを送信します"
         invalid: "正しいメールアドレスを入力してください"
-        authenticated: "あなたのメールアドレスは {{provider}} によって認証されています"
+        authenticated: "あなたのメールアドレスは %{provider} によって認証されています"
         frequency_immediately: "あなたがまだ読んでいない未送信分の内容について今すぐメールを送ります。"
         frequency:
-          other: "最後に利用されてから{{count}}分以上経過した場合にメールを送ります。"
+          other: "最後に利用されてから%{count}分以上経過した場合にメールを送ります。"
       associated_accounts:
         title: "関連アカウント"
         connect: "接続"
@@ -860,9 +858,9 @@ ja:
       username:
         title: "ユーザー名"
         instructions: "他人と被らず、空白を含まず、短い名前を入力してください。"
-        short_instructions: "@{{username}} であなたにメンションを送ることができます"
+        short_instructions: "@%{username} であなたにメンションを送ることができます"
         available: "ユーザー名は利用可能です"
-        not_available: "利用できない名前です。 {{suggestion}} などはどうでしょうか？"
+        not_available: "利用できない名前です。 %{suggestion} などはどうでしょうか？"
         not_available_no_suggestion: "そのユーザー名は利用できません"
         too_short: "ユーザー名が短すぎます"
         too_long: "ユーザー名が長すぎます"
@@ -882,7 +880,7 @@ ja:
         log_out_all: "すべてログアウトする"
         active: "動作中"
         not_you: "あなたではない？"
-        show_all: "すべてを見る({{count}})"
+        show_all: "すべてを見る(%{count})"
         show_few: "表示件数を少なくする"
         was_this_you: "これはあなたですか？"
       last_posted: "最後の投稿"
@@ -955,14 +953,14 @@ ja:
         user: "招待したユーザ"
         none: "表示する招待はありません。"
         truncated:
-          other: "{{count}} 件の招待を表示しています。"
+          other: "%{count} 件の招待を表示しています。"
         redeemed: "招待を確認する"
         redeemed_tab: "確認済み"
-        redeemed_tab_with_count: "確認済み ({{count}})"
+        redeemed_tab_with_count: "確認済み (%{count})"
         redeemed_at: "確認済み"
         pending: "保留中の招待"
         pending_tab: "保留中"
-        pending_tab_with_count: "保留中 ({{count}})"
+        pending_tab_with_count: "保留中 (%{count})"
         topics_entered: "閲覧したトピックの数"
         posts_read_count: "読んだ投稿"
         expired: "この招待の有効期限が切れました。"
@@ -976,13 +974,17 @@ ja:
         time_read: "読んだ時間"
         days_visited: "閲覧された日数"
         account_age_days: "アカウント有効日数"
-        create: "招待する"
+        links_tab: "リンク"
+        link_created_at: "作成者"
+        link_groups: グループ
+        create: "招待を送る"
         generate_link: "招待リンクをコピー"
         link_generated: "招待リンクが生成されました！"
         valid_for: "招待リンクはこのメールアドレスにだけ有効です。%{email}"
+        invite_link:
+          success: "招待リンクが生成されました！"
         bulk_invite:
           none: "まだ誰も招待していません。個々に招待するか、<a href='https://meta.discourse.org/t/send-bulk-invites/16468'>CSVファイルをアップロード</a>して、まとめて招待しましょう。"
-          text: "ファイルからまとめて招待する"
           success: "ファイルは無事にアップロードされました。処理が完了したらメッセージでお知らせします。"
           error: "申し訳ありません、ファイルはCSV形式である必要があります。"
       password:
@@ -1064,7 +1066,7 @@ ja:
       desc:
         network: "インターネット接続を確認してください。"
         network_fixed: "ネットワーク接続が回復しました。"
-        server: "エラーコード : {{status}}"
+        server: "エラーコード : %{status}"
         forbidden: "閲覧する権限がありません"
         not_found: "アプリケーションが存在しないURLを読み込もうとしました。"
         unknown: "エラーが発生しました。"
@@ -1110,8 +1112,8 @@ ja:
       value_prop: "アカウントを作成した後、いま読んでいるページへ戻ります。また、新しい投稿があった場合はこことメールにてお知らせします。 いいね！を使って好きな投稿をみんなに教えましょう。 :heartbeat:"
     summary:
       enabled_description: "トピックのまとめを表示されています。"
-      description: "<b>{{replyCount}}</b>件の返信があります。"
-      description_time: "<b>{{replyCount}}</b> 件の返信があります。 概ね <b>{{readingTime}} 分</b>で読める文量です。"
+      description: "<b>%{replyCount}</b>件の返信があります。"
+      description_time: "<b>%{replyCount}</b> 件の返信があります。 概ね <b>%{readingTime} 分</b>で読める文量です。"
       enable: "このトピックを要約する"
       disable: "すべての投稿を表示する"
     deleted_filter:
@@ -1124,8 +1126,8 @@ ja:
       invite: "他の人を招待する..."
       edit: "追加、削除"
       leave_message: "本当にメッセージから離れますか？"
-      remove_allowed_user: "このメッセージから {{name}} を削除してもよろしいですか？"
-      remove_allowed_group: "このメッセージから {{name}} を削除してもよろしいですか？"
+      remove_allowed_user: "このメッセージから %{name} を削除してもよろしいですか？"
+      remove_allowed_group: "このメッセージから %{name} を削除してもよろしいですか？"
     email: "メール"
     username: "ユーザ名"
     last_seen: "最終アクティビティ"
@@ -1134,7 +1136,7 @@ ja:
     trust_level: "トラストレベル"
     search_hint: "ユーザ名、メールアドレスまたはIPアドレス"
     create_account:
-      disclaimer: "登録すると<a href='{{privacy_link}}' target='blank'>プライバシーポリシー</a>と<a href='{{tos_link}}' target='blank'>利用規約</a>に同意することになります。"
+      disclaimer: "登録すると<a href='%{privacy_link}' target='blank'>プライバシーポリシー</a>と<a href='%{tos_link}' target='blank'>利用規約</a>に同意することになります。"
       title: "アカウントの作成"
       failed: "エラーが発生しました。既にこのメールアドレスは使用中かもしれません。「パスワードを忘れました」リンクを試してみてください"
     forgot_password:
@@ -1173,7 +1175,7 @@ ja:
       awaiting_activation: "あなたのアカウントはアクティベーション待ちの状態です。もう一度アクティベーションメールを送信するには「パスワードを忘れました」リンクをクリックしてください。"
       awaiting_approval: "アカウントはまだスタッフに承認されていません。承認され次第メールにてお知らせいたします。"
       requires_invite: "申し訳ありませんが、このフォーラムは招待制です。"
-      not_activated: "まだログインできません。<b>{{sentTo}}</b> にアクティベーションメールを送信しております。メールの指示に従ってアカウントのアクティベーションを行ってください。"
+      not_activated: "まだログインできません。<b>%{sentTo}</b> にアクティベーションメールを送信しております。メールの指示に従ってアカウントのアクティベーションを行ってください。"
       not_allowed_from_ip_address: "このIPアドレスでログインできません"
       admin_not_allowed_from_ip_address: "そのIPアドレスからは管理者としてログインできません"
       resend_activation_email: "再度アクティベーションメールを送信するにはここをクリックしてください。"
@@ -1182,7 +1184,7 @@ ja:
       change_email: "メールアドレスの変更"
       provide_new_email: "新しいメールアドレスを設定します。このあと、確認のメールを送信します。"
       submit_new_email: "メールアドレスの更新"
-      sent_activation_email_again: "<b>{{currentEmail}}</b> にアクティベーションメールを再送信しました。メールが届くまで数分掛かることがあります。 (メールが届かない場合は、迷惑メールフォルダの中をご確認ください)。"
+      sent_activation_email_again: "<b>%{currentEmail}</b> にアクティベーションメールを再送信しました。メールが届くまで数分掛かることがあります。 (メールが届かない場合は、迷惑メールフォルダの中をご確認ください)。"
       sent_activation_email_again_generic: "アクティベーションメールを送りました。届くのに少し時間がかかるかもしれません。スパムフォルダーも確認してください。"
       to_continue: "ログインしてください"
       preferences: "ユーザ設定を変更するには、ログインする必要があります。"
@@ -1239,11 +1241,11 @@ ja:
       no_content: 一致する項目が見つかりませんでした
       filter_placeholder: 検索...
       filter_placeholder_with_any: 検索 または 新規作成
-      create: "作成:'{{content}}'"
+      create: "作成:'%{content}'"
       max_content_reached:
-        other: "{{count}}アイテムまで選択できます。"
+        other: "%{count}アイテムまで選択できます。"
       min_content_not_reached:
-        other: "少なくとも{{count}}アイテムを選択してください。"
+        other: "少なくとも%{count}アイテムを選択してください。"
     date_time_picker:
       from: 発信元
       to: 宛先
@@ -1279,19 +1281,19 @@ ja:
       similar_topics: "このトピックに似ているものは..."
       drafts_offline: "オフラインの下書き"
       group_mentioned:
-        other: "{{group}}へのメンションで、 約<a href='{{group_link}}'>{{count}} 人</a> へ通知されます。よろしいですか？"
+        other: "%{group}へのメンションで、 約<a href='%{group_link}'>%{count} 人</a> へ通知されます。よろしいですか？"
       cannot_see_mention:
-        category: "{{username}}にメンションしましたが、このカテゴリへのアクセス権がないため通知されません。このカテゴリへのアクセス権があるグループにメンバー追加してください。"
-        private: "{{username}}にメンションしましたが、このパーソナルメッセージを見ることができないため通知されません。このパーソナルメッセージに招待してください。"
-      duplicate_link: "<b>{{domain}}</b> については、すでに<b>@{{username}}</b> が <a href='{{post_url}}'>{{ago}}</a> 前に投稿しています。再び投稿してよろしいですか？"
+        category: "%{username}にメンションしましたが、このカテゴリへのアクセス権がないため通知されません。このカテゴリへのアクセス権があるグループにメンバー追加してください。"
+        private: "%{username}にメンションしましたが、このパーソナルメッセージを見ることができないため通知されません。このパーソナルメッセージに招待してください。"
+      duplicate_link: "<b>%{domain}</b> については、すでに<b>@%{username}</b> が <a href='%{post_url}'>%{ago}</a> 前に投稿しています。再び投稿してよろしいですか？"
       error:
         title_missing: "タイトルを入力してください。"
-        title_too_short: "タイトルは{{min}}文字以上必要です。"
-        title_too_long: "タイトルは最長で{{max}}未満です。"
-        post_length: "投稿は{{min}}文字以上必要です。"
-        try_like: " {{heart}} ボタンは試しましたか？"
+        title_too_short: "タイトルは%{min}文字以上必要です。"
+        title_too_long: "タイトルは最長で%{max}未満です。"
+        post_length: "投稿は%{min}文字以上必要です。"
+        try_like: " %{heart} ボタンは試しましたか？"
         category_missing: "カテゴリを選択してください。"
-        tags_missing: "少なくとも {{count}} つのタグが必要です。"
+        tags_missing: "少なくとも %{count} つのタグが必要です。"
       save_edit: "編集内容を保存"
       reply_original: "オリジナルトピックへ返信"
       reply_here: "ここに返信"
@@ -1365,36 +1367,36 @@ ja:
       title: "@ユーザ名 のメンション、投稿やトピックへの返信、メッセージなどの通知"
       none: "通知を読み込むことができませんでした。"
       empty: "通知はありません。"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        other: "<span>{{username}}, {{username2}} 、他 {{count}} 人</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}}"
-      invitee_accepted: "<span>{{username}}</span> があなたの招待を受理しました"
-      moved_post: "<span>{{username}}</span> は {{description}} を移動しました"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "'{{description}}'バッジをゲット！"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>新しいトピック</span> {{description}}"
+        other: "<span>%{username}, %{username2} 、他 %{count} 人</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}"
+      invitee_accepted: "<span>%{username}</span> があなたの招待を受理しました"
+      moved_post: "<span>%{username}</span> は %{description} を移動しました"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "'%{description}'バッジをゲット！"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>新しいトピック</span> %{description}"
       group_message_summary:
-        other: "{{group_name}} 宛のメッセージが {{count}} 通あります"
+        other: "%{group_name} 宛のメッセージが %{count} 通あります"
       popup:
-        mentioned: '"{{topic}}"で{{username}} にメンションされました - {{site_title}}'
-        group_mentioned: '"{{topic}}"で{{username}} にメンションされました - {{site_title}}'
-        quoted: '"{{topic}}"で{{username}}が引用しました - {{site_title}}'
-        replied: '{{username}}が"{{topic}}"へ返信しました - {{site_title}}'
-        posted: '{{username}} が投稿しました "{{topic}}" - {{site_title}}'
-        linked: '"{{topic}}"にあるあなたの投稿に{{username}}がリンクしました - {{site_title}}'
+        mentioned: '"%{topic}"で%{username} にメンションされました - %{site_title}'
+        group_mentioned: '"%{topic}"で%{username} にメンションされました - %{site_title}'
+        quoted: '"%{topic}"で%{username}が引用しました - %{site_title}'
+        replied: '%{username}が"%{topic}"へ返信しました - %{site_title}'
+        posted: '%{username} が投稿しました "%{topic}" - %{site_title}'
+        linked: '"%{topic}"にあるあなたの投稿に%{username}がリンクしました - %{site_title}'
         confirm_body: "成功！通知を可能にしました！"
       titles:
         watching_first_post: "新着トピック"
@@ -1404,9 +1406,9 @@ ja:
       from_my_computer: "このデバイスから"
       from_the_web: "Web から"
       remote_tip: "画像へのリンク"
-      remote_tip_with_attachments: "画像かファイルへのリンク {{authorized_extensions}}"
+      remote_tip_with_attachments: "画像かファイルへのリンク %{authorized_extensions}"
       local_tip: "ローカルからアップロードする画像を選択"
-      local_tip_with_attachments: "デバイスから画像/ファイルを選択する {{authorized_extensions}}"
+      local_tip_with_attachments: "デバイスから画像/ファイルを選択する %{authorized_extensions}"
       hint: "(アップロードする画像をエディタにドラッグ&ドロップすることもできます)"
       hint_for_supported_browsers: "ドラッグ＆ドロップあるいはエディター内に画像を貼り付けてください。"
       uploading: "アップロード中"
@@ -1426,7 +1428,7 @@ ja:
       no_results: "何も見つかりませんでした。"
       no_more_results: "検索結果は以上です。"
       searching: "検索中..."
-      post_format: "#{{post_number}} {{username}}から"
+      post_format: "#%{post_number} %{username}から"
       more_results: "検索結果が多数あります。検索条件を絞ってください。"
       cant_find: "探しているものが見つかりませんか？"
       start_new_topic: "新しいトピックを始めてみては？"
@@ -1435,8 +1437,8 @@ ja:
       search_google_button: "Google"
       search_google_title: "サイトを検索"
       context:
-        user: "@{{username}}の投稿を検索"
-        category: "#{{category}} から検索する"
+        user: "@%{username}の投稿を検索"
+        category: "#%{category} から検索する"
         topic: "このトピックを探す"
         private_messages: "メッセージ検索"
       advanced:
@@ -1508,7 +1510,7 @@ ja:
         notification_level: "通知"
         choose_new_category: "このトピックの新しいカテゴリを選択してください"
         selected:
-          other: "あなたは <b>{{count}}</b> トピックを選択しました。"
+          other: "あなたは <b>%{count}</b> トピックを選択しました。"
         change_tags: "タグを付け替える"
         append_tags: "タグを追加する"
         choose_new_tags: "これらのトピックの新しいタグを選択してください"
@@ -1521,7 +1523,7 @@ ja:
         posted: "トピックは一つもありません。"
         latest: "最新のトピックはありません。"
         bookmarks: "ブックマークしたトピックはありません。"
-        category: "{{category}} トピックはありません。"
+        category: "%{category} トピックはありません。"
         top: "トップトピックはありません。"
         educate:
           new: '<p>新しいトピックがここに表示されます。</p><p>デフォルトでは新しいトピックがある場合に2日間、<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">new</span>が表示されます。</p><p>設定は<a href="%{userPrefsUrl}">プロフィール設定</a>から変更できます。</p>'
@@ -1532,12 +1534,12 @@ ja:
         read: "既読のトピックは以上です。"
         new: "新着トピックは以上です。"
         unread: "未読のトピックは以上です。"
-        category: "{{category}}トピックは以上です。"
+        category: "%{category}トピックは以上です。"
         top: "トップトピックはこれ以上ありません。"
         bookmarks: "ブックマーク済みのトピックはこれ以上ありません。"
     topic:
       filter_to:
-        other: "トピック内の {{count}} 件を表示"
+        other: "トピック内の %{count} 件を表示"
       create: "新規トピック"
       create_long: "新しいトピックの作成"
       open_draft: "下書きを開く"
@@ -1557,9 +1559,9 @@ ja:
       new: "新着トピック"
       unread: "未読"
       new_topics:
-        other: "{{count}}個の新着トピック"
+        other: "%{count}個の新着トピック"
       unread_topics:
-        other: "{{count}}個の未読トピック"
+        other: "%{count}個の未読トピック"
       title: "トピック"
       invalid_access:
         title: "トピックはプライベートです"
@@ -1572,19 +1574,19 @@ ja:
         title: "トピックが見つかりませんでした"
         description: "申し訳ありませんがトピックが見つかりませんでした。モデレータによって削除された可能性があります。"
       total_unread_posts:
-        other: "このトピックに未読のポストが{{count}}つあります。"
+        other: "このトピックに未読のポストが%{count}つあります。"
       unread_posts:
-        other: "このトピックに未読のポストが{{count}}つあります。"
+        other: "このトピックに未読のポストが%{count}つあります。"
       new_posts:
-        other: "前回閲覧時より、このトピックに新しいポストが{{count}}個投稿されています"
+        other: "前回閲覧時より、このトピックに新しいポストが%{count}個投稿されています"
       likes:
-        other: "このトピックには{{count}}個「いいね！」がついています"
+        other: "このトピックには%{count}個「いいね！」がついています"
       back_to_list: "トピックリストに戻る"
       options: "トピックオプション"
       show_links: "このトピック内のリンクを表示"
       toggle_information: "トピックの詳細を切り替え"
-      read_more_in_category: "もっと読みたいですか？{{catLink}}あるいは{{latestLink}}の他のトピックを見てみてください。"
-      read_more: "もっと見たいですか？{{catLink}}あるいは{{latestLink}}があります。"
+      read_more_in_category: "もっと読みたいですか？%{catLink}あるいは%{latestLink}の他のトピックを見てみてください。"
+      read_more: "もっと見たいですか？%{catLink}あるいは%{latestLink}があります。"
       read_more_MF: "{ UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1つの未読 </a>} other { are <a href='{basePath}/unread'># つの未読</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{と } false {} other{}} <a href='{basePath}/new'>1 つの新着</a> トピック} other { {BOTH, select, true{と } false {} other{}} <a href='{basePath}/new'># つの新着</a> トピック} } が残っています、あるいは {CATEGORY, select, true { {catLink}の他のトピックを見てみてください。} false {{latestLink}} other {}}"
       browse_all_categories: 全てのカテゴリを閲覧する
       view_latest_topics: 最新のトピックを見る
@@ -1733,23 +1735,23 @@ ja:
         success_message: "このトピックを通報しました。"
       feature_topic:
         title: "トピックを特集"
-        pin: "{{categoryLink}} カテゴリのトップに表示する"
-        confirm_pin: "既に {{count}} トピックを固定表示しています。固定表示が多すぎると、新規あるいは匿名ユーザの負担になる場合があります。このカテゴリにおいてさらに固定表示設定してもよいですか？"
-        unpin: "{{categoryLink}} カテゴリのトップからトピックを削除"
-        unpin_until: "{{categoryLink}} カテゴリのトップからこのトピックを削除するか、<strong>%{until}</strong> まで待つ。"
+        pin: "%{categoryLink} カテゴリのトップに表示する"
+        confirm_pin: "既に %{count} トピックを固定表示しています。固定表示が多すぎると、新規あるいは匿名ユーザの負担になる場合があります。このカテゴリにおいてさらに固定表示設定してもよいですか？"
+        unpin: "%{categoryLink} カテゴリのトップからトピックを削除"
+        unpin_until: "%{categoryLink} カテゴリのトップからこのトピックを削除するか、<strong>%{until}</strong> まで待つ。"
         pin_note: "ユーザはトピックを個別に固定表示解除することができます。"
         pin_validation: "このトピックを固定表示するためには日付を指定してください。"
-        not_pinned: "{{categoryLink}}で固定表示されているトピックはありません。"
+        not_pinned: "%{categoryLink}で固定表示されているトピックはありません。"
         already_pinned:
-          other: "{{categoryLink}}で固定表示されているトピック: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "%{categoryLink}で固定表示されているトピック: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "このトピックをすべてのトピックリストのトップに表示する"
-        confirm_pin_globally: "全体で既に {{count}} トピックを固定表示しています。固定表示が多すぎると、新規あるいは匿名ユーザの負担になる場合があります。このカテゴリにおいてさらに固定表示設定してもよいですか？"
+        confirm_pin_globally: "全体で既に %{count} トピックを固定表示しています。固定表示が多すぎると、新規あるいは匿名ユーザの負担になる場合があります。このカテゴリにおいてさらに固定表示設定してもよいですか？"
         unpin_globally: "トピック一覧のトップからこのトピックを削除します"
         unpin_globally_until: "このトピックをすべてのトピックリストのトップから削除するか、<strong>%{until}</strong> まで待つ。"
         global_pin_note: "ユーザはトピックを個別に固定表示解除することができます。"
         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: "ユーザはバナーを閉じることができます。常に１つのトピックだけがバナー表示されます"
@@ -1779,14 +1781,14 @@ ja:
         to_topic_username: "ユーザ名を入力しました。このトピックへの招待リンクの通知を送信します。"
         to_username: "招待したい人のユーザ名を入れてください。このトピックへの招待リンクの通知を送信します。"
         email_placeholder: "name@example.com"
-        success_email: "<b>{{emailOrUsername}}</b>に招待を送信しました。招待が受理されたらお知らせします。招待した人はユーザページの招待タブにて確認できます。"
+        success_email: "<b>%{emailOrUsername}</b>に招待を送信しました。招待が受理されたらお知らせします。招待した人はユーザページの招待タブにて確認できます。"
         success_username: "ユーザをこのトピックへ招待しました。"
         error: "申し訳ありません。その人を招待できませんでした。すでに招待を送信していませんか？ (招待できる数には限りがあります)"
-        success_existing_email: "<b>{{emailOrUsername}}</b>はすでにこのトピックへ招待済みです。"
+        success_existing_email: "<b>%{emailOrUsername}</b>はすでにこのトピックへ招待済みです。"
       login_reply: "ログインして返信"
       filters:
         n_posts:
-          other: "{{count}} 件"
+          other: "%{count} 件"
         cancel: "フィルター削除"
       split_topic:
         title: "新規トピックに移動"
@@ -1794,13 +1796,13 @@ ja:
         radio_label: "新規トピック"
         error: "投稿の新規トピックへの移動中にエラーが発生しました。"
         instructions:
-          other: "新たにトピックを作成し、選択した<b>{{count}}</b>個の投稿をこのトピックに移動しようとしています。"
+          other: "新たにトピックを作成し、選択した<b>%{count}</b>個の投稿をこのトピックに移動しようとしています。"
       merge_topic:
         title: "既存トピックに移動"
         action: "既存トピックに移動"
         error: "指定されたトピックへの投稿移動中にエラーが発生しました。"
         instructions:
-          other: "<b>{{count}}</b>個の投稿をどのトピックに移動するか選択してください。"
+          other: "<b>%{count}</b>個の投稿をどのトピックに移動するか選択してください。"
       move_to_new_message:
         title: "新しいメッセージに移動"
         action: "新しいメッセージに移動"
@@ -1828,7 +1830,7 @@ ja:
         instructions: "トピックの新たなタイムスタンプを設定してください。トピック内の各投稿時間はその時間を起点に再計算されます。"
       multi_select:
         select: "選択"
-        selected: "選択中 ({{count}})"
+        selected: "選択中 (%{count})"
         select_post:
           label: "選択"
         select_replies:
@@ -1838,17 +1840,17 @@ ja:
         select_all: すべて選択する
         deselect_all: すべて選択を外す
         description:
-          other: "<b>{{count}}</b>個の投稿を選択中。"
+          other: "<b>%{count}</b>個の投稿を選択中。"
     post:
       quote_reply: "引用"
       edit_reason: "理由: "
-      post_number: "投稿{{number}}"
+      post_number: "投稿%{number}"
       ignored: "無視したコンテンツ"
       wiki_last_edited_on: "wikiの最終編集日"
       last_edited_on: "投稿の最終編集日"
       reply_as_new_topic: "トピックのリンクを付けて返信"
       reply_as_new_private_message: "同じ受信者へ新しいメッセージとして返信"
-      continue_discussion: "{{postLink}} から:"
+      continue_discussion: "%{postLink} から:"
       follow_quote: "引用した投稿に移動"
       show_full: "全て表示"
       show_hidden: "無視したコンテンツを見る"
@@ -1856,21 +1858,21 @@ ja:
         other: "(投稿は投稿者により削除されました。何らかの通報がされていない限り、%{count}時間後に自動的に削除されます)"
       expand_collapse: "開く/折りたたむ"
       gap:
-        other: "{{count}}個の返信をすべて表示する"
+        other: "%{count}個の返信をすべて表示する"
       unread: "未読の投稿"
       has_replies:
-        other: "{{count}} 件の返信"
+        other: "%{count} 件の返信"
       has_likes_title:
-        other: "{{count}}人のユーザがこの返信に「いいね！」しました"
+        other: "%{count}人のユーザがこの返信に「いいね！」しました"
       has_likes_title_only_you: "あなたがいいねした投稿"
       has_likes_title_you:
-        other: "あなたと{{count}} 人の人がこの投稿に「いいね！」しました。"
+        other: "あなたと%{count} 人の人がこの投稿に「いいね！」しました。"
       errors:
         create: "申し訳ありませんが、投稿中にエラーが発生しました。もう一度やり直してください。"
         edit: "申し訳ありませんが、投稿の編集中にエラーが発生しました。もう一度やり直してください。"
         upload: "申し訳ありません、ファイルのアップロード中にエラーが発生しました。再度お試しください。"
         too_many_uploads: "申し訳ありませんが、複数のファイルは同時にアップロードできません。"
-        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: "ファイルをダウンロードするには、ログインする必要があります"
@@ -1936,7 +1938,7 @@ ja:
           like: "あなたが「いいね！」しました"
       merge:
         confirm:
-          other: "これらの{{count}}の投稿を統合したいですか?"
+          other: "これらの%{count}の投稿を統合したいですか?"
       revisions:
         controls:
           first: "最初のリビジョン"
@@ -2075,11 +2077,11 @@ ja:
       custom_placeholder_notify_moderators: "特にどのような問題が発生しているか記入して下さい。可能なら、関連するリンクなどを教えて下さい。"
       custom_message:
         at_least:
-          other: "少なくとも{{count}}文字入力してください"
+          other: "少なくとも%{count}文字入力してください"
         more:
-          other: "あと{{count}}文字..."
+          other: "あと%{count}文字..."
         left:
-          other: "残り{{count}}文字"
+          other: "残り%{count}文字"
     flagging_topic:
       title: "報告していただきありがとうございます。"
       action: "トピックを通報"
@@ -2118,7 +2120,7 @@ ja:
       unlisted:
         help: "このトピックはリストされていません。トピックリストには表示されません。直接リンクでのみアクセス可能です"
     posts: "投稿"
-    posts_long: "このトピックには{{number}}個の投稿があります"
+    posts_long: "このトピックには%{number}個の投稿があります"
     posts_likes_MF: |
       This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
       low {with a high like to post ratio}
@@ -2131,18 +2133,18 @@ ja:
       other: " 閲覧"
     replies: "返信"
     views_long:
-      other: "このトピックは{{number}}回閲覧されました"
+      other: "このトピックは%{number}回閲覧されました"
     activity: "アクティビティ"
     likes: "いいね！"
     likes_lowercase:
       other: "いいね！"
-    likes_long: "このトピックには{{number}}つ「いいね！」がついています"
+    likes_long: "このトピックには%{number}つ「いいね！」がついています"
     users: "ユーザ"
     users_lowercase:
       other: "ユーザ"
     category_title: "カテゴリ"
     history: "履歴"
-    changed_by: "by {{author}}"
+    changed_by: "by %{author}"
     raw_email:
       title: "受信メール"
       not_available: "利用不可"
@@ -2153,29 +2155,29 @@ ja:
       latest:
         title: "最新"
         title_with_count:
-          other: "最新の投稿 ({{count}})"
+          other: "最新の投稿 (%{count})"
         help: "最新のトピック"
       read:
         title: "既読"
         help: "既読のトピックを、最後に読んだ順に表示"
       categories:
         title: "カテゴリ"
-        title_in: "カテゴリ - {{categoryName}}"
+        title_in: "カテゴリ - %{categoryName}"
         help: "カテゴリ毎に整理されたトピックを表示"
       unread:
         title: "未読"
         title_with_count:
-          other: "未読 ({{count}})"
+          other: "未読 (%{count})"
         help: "未読投稿のあるトピック"
         lower_title_with_count:
-          other: "{{count}} 未読"
+          other: "%{count} 未読"
       new:
         lower_title_with_count:
-          other: "{{count}}件"
+          other: "%{count}件"
         lower_title: "NEW"
         title: "新着"
         title_with_count:
-          other: "新着 ({{count}})"
+          other: "新着 (%{count})"
         help: "最近投稿されたトピック"
       posted:
         title: "自分の投稿"
@@ -2184,10 +2186,10 @@ ja:
         title: "ブックマーク"
         help: "ブックマークしたトピック"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          other: "{{categoryName}} ({{count}})"
-        help: "{{categoryName}} カテゴリの最新トピック"
+          other: "%{categoryName} (%{count})"
+        help: "%{categoryName} カテゴリの最新トピック"
       top:
         title: "トップ"
         help: "過去年間、月間、週間及び日間のアクティブトピック"
@@ -2523,12 +2525,12 @@ ja:
           label: "アップロード"
           title: "このインスタンスにバックアップをアップロード"
           uploading: "アップロード中..."
-          uploading_progress: "アップロード中... {{progress}}%"
-          success: "'{{filename}}'のアップロードに成功しました。このファイルは現在処理中で、リストに表示されるまでに最大数分程度かかることがあります。"
-          error: "ファイル '{{filename}}'のアップロード中にエラーが発生しました: {{message}}"
+          uploading_progress: "アップロード中... %{progress}%"
+          success: "'%{filename}'のアップロードに成功しました。このファイルは現在処理中で、リストに表示されるまでに最大数分程度かかることがあります。"
+          error: "ファイル '%{filename}'のアップロード中にエラーが発生しました: %{message}"
         operations:
           is_running: "バックアップ作業を実行中..."
-          failed: "{{operation}}失敗しました。ログをチェックください。"
+          failed: "%{operation}失敗しました。ログをチェックください。"
           cancel:
             label: "キャンセル"
             title: "バックアップ作業をキャンセルする"
@@ -2876,8 +2878,8 @@ ja:
           title: "メールアドレスを表示する"
           text: "表示する"
       user:
-        suspend_failed: "ユーザの凍結に失敗しました: {{error}}"
-        unsuspend_failed: "ユーザの凍結解除に失敗しました: {{error}}"
+        suspend_failed: "ユーザの凍結に失敗しました: %{error}"
+        unsuspend_failed: "ユーザの凍結解除に失敗しました: %{error}"
         suspend_duration: "ユーザを何日間凍結しますか?"
         suspend_reason_label: "アカウントを凍結する理由を説明してください。ここに書いた理由は、このユーザのプロファイルページにおいて<b>全員が閲覧可能な状態</b>で公開されます。またこのユーザがログインを試みた際にも表示されます。"
         suspend_reason: "理由"
@@ -3167,6 +3169,7 @@ ja:
         title: "絵文字"
         help: "各ユーザが利用できる絵文字を追加します。 (ちょっとしたコツ: ドラッグアンドドロップで複数のファイルを一度にアップロードできます)"
         add: "新しい絵文字を追加"
+        uploading: "アップロード中..."
         name: "名前"
         group: "グループ"
         image: "画像"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 3edb7ed1fd..aead8849b5 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -22,8 +22,8 @@ ko:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}천"
-        millions: "{{number}}백만"
+        thousands: "%{number}천"
+        millions: "%{number}백만"
     dates:
       time: "a h:mm"
       time_with_zone: "HH : mm (z)"
@@ -204,10 +204,10 @@ ko:
     weekly: "매주"
     every_month: "매월"
     every_six_months: "6개월마다"
-    max_of_count: "최대 {{count}}"
+    max_of_count: "최대 %{count}"
     alternation: "또는"
     character_count:
-      other: "{{count}} 자"
+      other: "%{count} 자"
     related_messages:
       title: "관련 메시지"
       see_all: '@ %{username} ...의 <a href="%{path}">모든 메시지</a> 보기'
@@ -276,11 +276,11 @@ ko:
         yes_value: "예, 버립니다."
         no_value: "아니요, 버리지 않습니다."
     topic_count_latest:
-      other: "{{count}}개의 새 토픽이나 업데이트된 토픽"
+      other: "%{count}개의 새 토픽이나 업데이트된 토픽"
     topic_count_unread:
-      other: "{{count}}개의 읽지 않은 주제"
+      other: "%{count}개의 읽지 않은 주제"
     topic_count_new:
-      other: "{{count}}개의 새로운 토픽 보기"
+      other: "%{count}개의 새로운 토픽 보기"
     preview: "미리보기"
     cancel: "취소"
     save: "변경사항 저장"
@@ -288,7 +288,7 @@ ko:
     saved: "저장 완료!"
     upload: "업로드"
     uploading: "업로드 중..."
-    uploading_filename: "업르도중: {{filename}}..."
+    uploading_filename: "업르도중: %{filename}..."
     clipboard: "클립보드"
     uploaded: "업로드 완료!"
     pasting: "붙혀넣는중..."
@@ -342,7 +342,7 @@ ko:
         optional: "다른 사람이 검토하지 못하도록이 항목을 요청할 수 있습니다."
         required: "검토하기 전에 항목을 청구해야합니다."
         claimed_by_you: "이 항목을 요청했으며 검토 할 수 있습니다."
-        claimed_by_other: "이 아이템은 <b>{{username}}</b> 에 <b>의해서만</b> 리뷰 될 수 있습니다."
+        claimed_by_other: "이 아이템은 <b>%{username}</b> 에 <b>의해서만</b> 리뷰 될 수 있습니다."
       claim:
         title: "이 주제를 주장하십시오"
       unclaim:
@@ -361,7 +361,7 @@ ko:
       none: "검토 할 항목이 없습니다."
       view_pending: "보류중 보기"
       topic_has_pending:
-        other: "이 토픽에는 승인 대기중인 게시물이 <b>{{count}}</b>개 있습니다"
+        other: "이 토픽에는 승인 대기중인 게시물이 <b>%{count}</b>개 있습니다"
       title: "리뷰"
       topic: "토픽:"
       filtered_topic: "한 토픽에서 검토 가능한 콘텐츠로 필터링 했습니다."
@@ -378,13 +378,13 @@ ko:
         fields: "필드"
       user_percentage:
         summary:
-          other: "{{agreed}},{{disagreed}},{{ignored}} (전체 {{count}}개의 신고)"
+          other: "%{agreed},%{disagreed},%{ignored} (전체 %{count}개의 신고)"
         agreed:
-          other: "{{count}}% 동의"
+          other: "%{count}% 동의"
         disagreed:
-          other: "{{count}}% 동의안함"
+          other: "%{count}% 동의안함"
         ignored:
-          other: "{{count}}% 무시"
+          other: "%{count}% 무시"
       topics:
         topic: "토픽"
         reviewable_count: "수"
@@ -393,7 +393,7 @@ ko:
         original: "(원래 주제)"
         details: "상세"
         unique_users:
-          other: "{{count}} 사용자"
+          other: "%{count} 사용자"
       edit: "수정"
       save: "저장"
       cancel: "취소"
@@ -456,19 +456,19 @@ ko:
         description: "새로운 게시글이 있습니다. 그러나 이 게시글이 보여지려면 운영자의 승인이 필요합니다."
         ok: "확인"
     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>을 게시했습니다"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a>님이 <a href='{{postUrl}}'>{{post_number}}</a> 게시글에 답글 올림"
-      you_replied_to_post: "<a href='{{userUrl}}'>내</a>가 <a href='{{postUrl}}'>{{post_number}}</a> 게시글에 답글 올림"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a>님이 <a href='{{topicUrl}}'>토픽</a>에 답글을 올렸습니다"
-      you_replied_to_topic: "<a href='{{userUrl}}'>회원님</a>이 <a href='{{topicUrl}}'>토픽</a>에 댓글을 달았습니다"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a>님이 <a href='{{user2Url}}'>{{another_user}}</a>를 멘션함"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a>님이 <a href='{{user2Url}}'>나</a>를 멘션함"
-      you_mentioned_user: "<a href='{{user1Url}}'>내</a>가 <a href='{{user2Url}}'>{{another_user}}</a>님을 멘션함"
-      posted_by_user: "<a href='{{userUrl}}'>{{user}}</a>에 의해 게시됨"
-      posted_by_you: "<a href='{{userUrl}}'>내</a>가 게시함"
-      sent_by_user: "<a href='{{userUrl}}'>{{user}}</a>님이 보냄"
-      sent_by_you: "<a href='{{userUrl}}'>내</a>가 보냄"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a>님이 <a href='%{topicUrl}'>토픽</a>을 게시했습니다"
+      you_posted_topic: "<a href='%{userUrl}'>회원님</a>이 <a href='%{topicUrl}'>토픽</a>을 게시했습니다"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a>님이 <a href='%{postUrl}'>%{post_number}</a> 게시글에 답글 올림"
+      you_replied_to_post: "<a href='%{userUrl}'>내</a>가 <a href='%{postUrl}'>%{post_number}</a> 게시글에 답글 올림"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a>님이 <a href='%{topicUrl}'>토픽</a>에 답글을 올렸습니다"
+      you_replied_to_topic: "<a href='%{userUrl}'>회원님</a>이 <a href='%{topicUrl}'>토픽</a>에 댓글을 달았습니다"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a>님이 <a href='%{user2Url}'>%{another_user}</a>를 멘션함"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a>님이 <a href='%{user2Url}'>나</a>를 멘션함"
+      you_mentioned_user: "<a href='%{user1Url}'>내</a>가 <a href='%{user2Url}'>%{another_user}</a>님을 멘션함"
+      posted_by_user: "<a href='%{userUrl}'>%{user}</a>에 의해 게시됨"
+      posted_by_you: "<a href='%{userUrl}'>내</a>가 게시함"
+      sent_by_user: "<a href='%{userUrl}'>%{user}</a>님이 보냄"
+      sent_by_you: "<a href='%{userUrl}'>내</a>가 보냄"
     directory:
       filter_name: "아이디로 필터"
       title: "사용자"
@@ -692,7 +692,7 @@ ko:
     user_fields:
       none: "(옵션을 선택하세요)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "프로필"
       mute: "알림 끄기"
       edit: "환경 설정 편집"
@@ -767,12 +767,12 @@ ko:
       enable_defer: "읽지 않은 주제로 표시하도록 연기 활성화"
       change: "변경"
       featured_topic: "특집 주제"
-      moderator: "{{user}}님은 운영자입니다"
-      admin: "{{user}}님은 관리자 입니다"
+      moderator: "%{user}님은 운영자입니다"
+      admin: "%{user}님은 관리자 입니다"
       moderator_tooltip: "이 회원은 운영자 입니다"
       admin_tooltip: "이 회원은 관리자입니다."
       silenced_tooltip: "이 회원은 차단되었습니다"
-      suspended_notice: "이 회원은 {{date}}까지 접근 금지 되었습니다."
+      suspended_notice: "이 회원은 %{date}까지 접근 금지 되었습니다."
       suspended_permanently: "이 회원은 일시정지되었습니다."
       suspended_reason: "사유: "
       github_profile: "Github"
@@ -787,7 +787,7 @@ ko:
           알림이 꺼진 토픽과 카테고리는 이 이메일에 포함되지 않습니다.
         individual: "모든 새로운 게시글에 대해 메일을 보내주세요."
         individual_no_echo: "내가 쓴 것만 제외하고 모든 게시글에 대해 이메일을 보내주세요"
-        many_per_day: "모든 새 게시글에 대해 이메일을 보내주세요 (일일 약 {{dailyEmailEstimate}}개)"
+        many_per_day: "모든 새 게시글에 대해 이메일을 보내주세요 (일일 약 %{dailyEmailEstimate}개)"
         few_per_day: "모든 새로운 게시글에 대해 메일을 보내주세요 (하루에 약 2개)."
         warning: "메일 링리스트 모드가 활성화되었습니다. 이메일 알림 설정이 무시됩니다."
       tag_settings: "태그"
@@ -817,9 +817,7 @@ ko:
       admin_delete: "삭제"
       users: "회원"
       muted_users: "알람 끄기"
-      muted_users_instructions: "이 회원이 보낸 알림 모두 숨김"
       ignored_users: "무시됨"
-      ignored_users_instructions: "이 사용자의 모든 게시물과 알림을 표시하지 않습니다."
       tracked_topics_link: "보이기"
       automatically_unpin_topics: "글 끝에 다다르면 자동으로 토픽 고정을 해제합니다."
       apps: "앱"
@@ -874,11 +872,11 @@ ko:
         disable: "해제"
         enable: "설정"
         enable_long: "백업 코드 사용"
-        manage: "백업 코드를 관리하십시오. 남아있는 <strong>{{count}}</strong> 백업 코드가 있습니다."
+        manage: "백업 코드를 관리하십시오. 남아있는 <strong>%{count}</strong> 백업 코드가 있습니다."
         copy_to_clipboard: "클립보드에 복사하기"
         copy_to_clipboard_error: "데이터를 클립보드에 복사하는데 오류가 발생했습니다."
         copied_to_clipboard: "클립보드에 복사됨"
-        remaining_codes: "남아있는 <strong>{{count}}</strong> 백업 코드가 있습니다."
+        remaining_codes: "남아있는 <strong>%{count}</strong> 백업 코드가 있습니다."
         use: "백업 코드 사용"
         enable_prerequisites: "백업 코드를 생성하기 전에 기본 두 번째 요소를 활성화해야합니다."
         codes:
@@ -933,10 +931,10 @@ ko:
         success_staff: "현재 주소로 이메일을 보냈습니다. 확인 절차에 따라 진행해 주세요."
       change_avatar:
         title: "프로필 사진 변경"
-        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a> 기반"
-        gravatar_title: "{{gravatarName}}의 웹 사이트에서 아바타 변경"
-        gravatar_failed: "해당 이메일 주소로 {{gravatarName}}을 찾을 수 없습니다."
-        refresh_gravatar_title: "당신의 {{gravatarName}}를 상쾌하게하십시오"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a> 기반"
+        gravatar_title: "%{gravatarName}의 웹 사이트에서 아바타 변경"
+        gravatar_failed: "해당 이메일 주소로 %{gravatarName}을 찾을 수 없습니다."
+        refresh_gravatar_title: "당신의 %{gravatarName}를 상쾌하게하십시오"
         letter_based: "자동 생성된 아바타"
         uploaded_avatar: "커스텀 사진"
         uploaded_avatar_empty: "커스텀 사진 추가"
@@ -960,10 +958,10 @@ ko:
         instructions: "절대로 공개되지 않습니다."
         ok: "내 이메일로 확인 메일이 전송됩니다."
         invalid: "유효한 이메일 주소를 입력해주세요."
-        authenticated: "내 이메일이 {{provider}}에 의해 인증되었습니다."
+        authenticated: "내 이메일이 %{provider}에 의해 인증되었습니다."
         frequency_immediately: "만약 전송된 메일을 읽지 않았을 경우, 즉시 메일을 다시 보내드립니다."
         frequency:
-          other: "최근 {{count}}분 동안접속하지 않을 경우에만 메일이 전송됩니다."
+          other: "최근 %{count}분 동안접속하지 않을 경우에만 메일이 전송됩니다."
       associated_accounts:
         title: "관련 계정"
         connect: "연결"
@@ -983,9 +981,9 @@ ko:
       username:
         title: "아이디"
         instructions: "공백없이, 짧고 특이하게"
-        short_instructions: "@{{username}}으로 멘션이 가능합니다."
+        short_instructions: "@%{username}으로 멘션이 가능합니다."
         available: "아이디로 사용가능합니다."
-        not_available: "사용할 수 없는 아이디입니다. 다시 시도해보세요. {{suggestion}}"
+        not_available: "사용할 수 없는 아이디입니다. 다시 시도해보세요. %{suggestion}"
         not_available_no_suggestion: "불가합니다"
         too_short: "아이디가 너무 짧습니다"
         too_long: "아이디가 너무 깁니다."
@@ -1008,11 +1006,11 @@ ko:
         log_out_all: "모두 로그 아웃"
         active: "활성 지금"
         not_you: "사용자님이 아닌가요?"
-        show_all: "모두 표시 ({{count}})"
+        show_all: "모두 표시 (%{count})"
         show_few: "더 적게 표시"
         was_this_you: "이게 너야?"
         was_this_you_description: "그렇지 않은 경우 비밀번호를 변경하고 어디에서나 로그 아웃하는 것이 좋습니다."
-        browser_and_device: "{{device}}의 {{browser}}"
+        browser_and_device: "%{device}의 %{browser}"
         secure_account: "내 계정 보안"
         latest_post: "마지막으로 게시했습니다…"
       last_posted: "마지막글"
@@ -1091,20 +1089,19 @@ ko:
         sent: "마지막으로 보낸"
         none: "표시 할 초대가 없습니다."
         truncated:
-          other: "앞 {{count}}개의 초대를 보여줍니다."
+          other: "앞 %{count}개의 초대를 보여줍니다."
         redeemed: "초대를 받았습니다."
         redeemed_tab: "Redeemed"
-        redeemed_tab_with_count: "교환된 ({{count}})"
+        redeemed_tab_with_count: "교환된 (%{count})"
         redeemed_at: "에 초대되었습니다."
         pending: "초대를 보류합니다."
         pending_tab: "보류"
-        pending_tab_with_count: "지연 ({{count}})"
+        pending_tab_with_count: "지연 (%{count})"
         topics_entered: "읽은 토픽"
         posts_read_count: "글 읽기"
         expired: "이 초대장의 기한이 만료되었습니다."
         rescind: "삭제"
         rescinded: "초대가 제거되었습니다."
-        rescind_all: "만료 된 모든 초대 제거"
         rescinded_all: "모든 만료 된 초대가 제거되었습니다!"
         rescind_all_confirm: "만료 된 초대를 모두 제거 하시겠습니까?"
         reinvite: "초대 메일 재전송"
@@ -1115,13 +1112,17 @@ ko:
         time_read: "읽은 시간"
         days_visited: "일일 방문"
         account_age_days: "일일 계정 나이"
-        create: "이 포럼에 친구를 초대하기"
+        links_tab: "링크"
+        link_created_at: "생성일자"
+        link_groups: 그룹
+        create: "초대장 보내기"
         generate_link: "초대 링크 복사"
         link_generated: "초대 링크가 성공적으로 생성되었습니다!"
         valid_for: "이 초대링크는 이메일 주소 '%{email}'에 한해서만 유효합니다."
+        invite_link:
+          success: "초대 링크가 성공적으로 생성되었습니다!"
         bulk_invite:
           none: "아직 아무도 초대하지 않으셨어요. 한 명씩 초대장을 보내거나, <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>CSV 파일을 업로드</a>해서 여러 사람에게 한꺼번에 초대장을 보낼 수 있습니다."
-          text: "파일로 대량 초대하기"
           success: "파일이 성공적으로 업로드되었습니다. 완료되면 메시지로 알려드리겠습니다."
           error: "죄송합니다. CSV형식의 파일만 올릴 수 있습니다."
           confirmation_message: "업로드 한 파일의 모든 사람에게 초대장을 이메일로 보내려고합니다."
@@ -1204,7 +1205,7 @@ ko:
       desc:
         network: "접속상태를 확인해주세요."
         network_fixed: "문제가 해결된 것으로 보입니다."
-        server: "에러 코드: {{status}}"
+        server: "에러 코드: %{status}"
         forbidden: "볼 수 있도록 허용되지 않았습니다."
         not_found: "에구, 어플리케이션이 없는 URL를 가져오려고 시도했습니다."
         unknown: "문제가 발생했습니다."
@@ -1266,8 +1267,8 @@ ko:
       value_prop: "당신이 계정을 만들 때, 우리는 당신이 읽은 것을 정확하게 기억하므로, 당신은 항상 당신이 중단 한 곳으로 돌아옵니다. 또한 누군가가 귀하에게 회신 할 때마다 여기 및 이메일을 통해 알림을받습니다. 그리고 당신은 사랑을 공유하는 게시물을 좋아할 수 있습니다. : 심장 :"
     summary:
       enabled_description: "현재 커뮤니티에서 가장 인기있는 주제의 요약본을 보고 있습니다:"
-      description: "댓글이 <b>{{replyCount}}개</b> 있습니다."
-      description_time: "댓글이 <b>{{replyCount}}개</b> 있고 다 읽는데 <b>{{readingTime}} 분</b>이 걸립니다."
+      description: "댓글이 <b>%{replyCount}개</b> 있습니다."
+      description_time: "댓글이 <b>%{replyCount}개</b> 있고 다 읽는데 <b>%{readingTime} 분</b>이 걸립니다."
       enable: "이 주제를 요약"
       disable: "모든 포스트 보기"
     deleted_filter:
@@ -1280,8 +1281,8 @@ ko:
       invite: "다른 사람 초대 ..."
       edit: "추가 또는 삭제 ..."
       leave_message: "정말로 이 메시지를 남길까요?"
-      remove_allowed_user: "{{name}}에게서 온 메시지를 삭제할까요?"
-      remove_allowed_group: "{{name}}에게서 온 메시지를 삭제할까요?"
+      remove_allowed_user: "%{name}에게서 온 메시지를 삭제할까요?"
+      remove_allowed_group: "%{name}에게서 온 메시지를 삭제할까요?"
     email: "이메일"
     username: "아이디"
     last_seen: "마지막 접속"
@@ -1290,7 +1291,7 @@ ko:
     trust_level: "회원등급"
     search_hint: "아이디, 이메일 혹은 IP 주소"
     create_account:
-      disclaimer: "등록하면 <a href='{{privacy_link}}' target='blank'>개인 정보 보호 정책</a> 및 <a href='{{tos_link}}' target='blank'>서비스 약관에</a> 동의하게됩니다."
+      disclaimer: "등록하면 <a href='%{privacy_link}' target='blank'>개인 정보 보호 정책</a> 및 <a href='%{tos_link}' target='blank'>서비스 약관에</a> 동의하게됩니다."
       title: "회원 가입"
       failed: "뭔가 잘못되었습니다. 이 메일은 등록이 되어있습니다. 비밀번호를 잊으셨다면 비밀번호 찾기를 눌러주세요."
     forgot_password:
@@ -1350,7 +1351,7 @@ ko:
       awaiting_activation: "계정이 아직 미활성 상태입니다. 활성화 메일을 보내려면 비밀번호 찾기 링크를 사용하세요."
       awaiting_approval: "스태프가 아직 내 계정을 승인하지 않았습니다. 승인되면 이메일을 받게됩니다."
       requires_invite: "죄송합니다. 초대를 받은 사람만 이용하실 수 있습니다."
-      not_activated: "아직 로그인 할 수 없습니다. 계정을 만들었을때 <b> {{sentTo}} </b> 주소로 인증 이메일을 보냈습니다. 계정을 활성화하려면 해당 이메일의 지침을 따르십시오."
+      not_activated: "아직 로그인 할 수 없습니다. 계정을 만들었을때 <b> %{sentTo} </b> 주소로 인증 이메일을 보냈습니다. 계정을 활성화하려면 해당 이메일의 지침을 따르십시오."
       not_allowed_from_ip_address: "이 IP 주소에서 로그인 할 수 없습니다."
       admin_not_allowed_from_ip_address: "You can't log in as admin from that IP address."
       resend_activation_email: "다시 인증 이메일을 보내려면 여기를 클릭하세요."
@@ -1359,7 +1360,7 @@ ko:
       change_email: "이메일 주소 변경"
       provide_new_email: "새로운 주소를 적어주시면 확인 메일을 재전송해드리겠습니다."
       submit_new_email: "이메일 주소 변경"
-      sent_activation_email_again: "<b> {{currentEmail}} </b> 주소로 인증 이메일을 보냈습니다. 이메일이 도착하기까지 몇 분 정도 걸릴 수 있습니다. 또한 스팸 메일을 확인하십시오."
+      sent_activation_email_again: "<b> %{currentEmail} </b> 주소로 인증 이메일을 보냈습니다. 이메일이 도착하기까지 몇 분 정도 걸릴 수 있습니다. 또한 스팸 메일을 확인하십시오."
       sent_activation_email_again_generic: "다른 활성화 이메일을 보냈습니다. 도착하는 데 몇 분이 걸릴 수 있습니다. 스팸 폴더를 확인하십시오."
       to_continue: "로그인 해주세요"
       preferences: "사용자 환경을 변경하려면 로그인이 필요합니다."
@@ -1423,14 +1424,14 @@ ko:
     conditional_loading_section:
       loading: 로드중...
     category_row:
-      topic_count: "이 카테고리의 주제 {{count}}"
+      topic_count: "이 카테고리의 주제 %{count}"
     select_kit:
       default_header_text: 선택...
       no_content: 일치하는 결과가 없습니다
       filter_placeholder: 검색...
       filter_placeholder_with_any: 검색 또는 생성 ...
-      create: "만들기 : &#39;{{content}}&#39;"
-      invalid_selection_length: "선택은 {{count}} 자 이상이어야합니다."
+      create: "만들기 : &#39;%{content}&#39;"
+      invalid_selection_length: "선택은 %{count} 자 이상이어야합니다."
     date_time_picker:
       from: 보내는사람
       to: 받는사람
@@ -1457,7 +1458,7 @@ ko:
       default: 커스텀 emoji
     shared_drafts:
       title: "초안 공유"
-      notice: "이 주제는 <b>{{category}}</b> 카테고리를 볼 수있는 사람들에게만 표시됩니다."
+      notice: "이 주제는 <b>%{category}</b> 카테고리를 볼 수있는 사람들에게만 표시됩니다."
       destination_category: "대상 카테고리"
       publish: "공유 초안 게시"
       confirm_publish: "이 초안을 게시 하시겠습니까?"
@@ -1477,23 +1478,23 @@ ko:
       similar_topics: "작성하려는 내용과 비슷한 주제들..."
       drafts_offline: "초안"
       edit_conflict: "충돌을 편집하다"
-      group_mentioned_limit: "<b>경고!</b> <a href='{{group_link}}'>{{group}}을</a> 언급했지만이 그룹에는 관리자가 구성한 언급 한도 {{max}} 사용자보다 많은 구성원이 있습니다. 아무도 알림을받지 않습니다."
+      group_mentioned_limit: "<b>경고!</b> <a href='%{group_link}'>%{group}을</a> 언급했지만이 그룹에는 관리자가 구성한 언급 한도 %{max} 사용자보다 많은 구성원이 있습니다. 아무도 알림을받지 않습니다."
       group_mentioned:
-        other: "{{group}}을 언급하면, <a href='{{group_link}}'>{{count}} 명</a>의 회원에게 알림이 갑니다. 그렇게 할까요?"
+        other: "%{group}을 언급하면, <a href='%{group_link}'>%{count} 명</a>의 회원에게 알림이 갑니다. 그렇게 할까요?"
       cannot_see_mention:
-        category: "{{username}}에게 멘션을 썼지만, 해당 사용자가 이 카테고리에 접근할 수 없기 때문에 알림이 가지 않습니다. 이 카테고리에 접근할 수 있는 그룹에 해당 멤버가 추가되어야 합니다."
-        private: "{{username}}에게 멘션을 썼지만, 해당 사용자가 개인 메시지를 볼 수 없기 때문에 알림이 가지 않습니다. 이 개인 메시지에 해당 사용자를 초대해야 합니다."
-      duplicate_link: "이 토픽에는 이미<b>{{domain}}</b>의 링크가 <b>@{{username}}</b>님이 <a href='{{post_url}}'>{{ago}}</a>전에 쓴 게시글에 게시되어 있습니다. 그래도 다시 게시할까요?"
-      reference_topic_title: "RE : {{title}}"
+        category: "%{username}에게 멘션을 썼지만, 해당 사용자가 이 카테고리에 접근할 수 없기 때문에 알림이 가지 않습니다. 이 카테고리에 접근할 수 있는 그룹에 해당 멤버가 추가되어야 합니다."
+        private: "%{username}에게 멘션을 썼지만, 해당 사용자가 개인 메시지를 볼 수 없기 때문에 알림이 가지 않습니다. 이 개인 메시지에 해당 사용자를 초대해야 합니다."
+      duplicate_link: "이 토픽에는 이미<b>%{domain}</b>의 링크가 <b>@%{username}</b>님이 <a href='%{post_url}'>%{ago}</a>전에 쓴 게시글에 게시되어 있습니다. 그래도 다시 게시할까요?"
+      reference_topic_title: "RE : %{title}"
       error:
         title_missing: "제목은 필수 항목입니다"
-        title_too_short: "제목은 최소 {{min}} 글자 이상이어야 합니다."
-        title_too_long: "제목은 {{max}} 글자 이상일 수 없습니다."
+        title_too_short: "제목은 최소 %{min} 글자 이상이어야 합니다."
+        title_too_long: "제목은 %{max} 글자 이상일 수 없습니다."
         post_missing: "게시물은 비워 둘 수 없습니다"
-        post_length: "글은 최소 {{min}} 글자 이상이어야 합니다."
-        try_like: "{{heart}} 버튼을 사용해 보셨습니까?"
+        post_length: "글은 최소 %{min} 글자 이상이어야 합니다."
+        try_like: "%{heart} 버튼을 사용해 보셨습니까?"
         category_missing: "카테고리를 선택해주세요."
-        tags_missing: "최소한 {{count}} 태그를 선택해야합니다"
+        tags_missing: "최소한 %{count} 태그를 선택해야합니다"
         topic_template_not_modified: "토픽 템플릿을 편집하여 토픽에 세부 사항 및 세부 사항을 추가하십시오."
       save_edit: "편집 저장"
       overwrite_edit: "덮어 쓰기 편집"
@@ -1590,51 +1591,51 @@ ko:
     notifications:
       tooltip:
         regular:
-          other: "{{count}}개의 확인하지 않은 알림이 있습니다"
+          other: "%{count}개의 확인하지 않은 알림이 있습니다"
         message:
-          other: "{{count}}개의 읽지않은 메시지가 있습니다"
+          other: "%{count}개의 읽지않은 메시지가 있습니다"
       title: "@name 언급, 글과 주제에 대한 답글, 개인 메시지 등에 대한 알림"
       none: "현재 알림을 불러올 수 없습니다."
       empty: "알림이 없습니다."
       post_approved: "귀하의 게시물이 승인되었습니다"
       reviewable_items: "검토가 필요한 항목"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}} "
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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} "
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        other: "<span>{{username}}, {{username2}} 외 {{count}} 명의 사용자가</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}}"
-      invitee_accepted: "<span>{{username}}</span> 님이 초대를 수락했습니다"
-      moved_post: "<span>{{username}}</span> 님이 {{description}} (을)를 이동했습니다"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "'{{description}}' 를 받았습니다"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>새 토픽</span> {{description}}"
-      membership_request_accepted: "&#39;{{group_name}}&#39;에 회원 가입"
-      membership_request_consolidated: "{{count}} &#39;{{group_name}}&#39;에 대한 오픈 멤버쉽 요청"
+        other: "<span>%{username}, %{username2} 외 %{count} 명의 사용자가</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}"
+      invitee_accepted: "<span>%{username}</span> 님이 초대를 수락했습니다"
+      moved_post: "<span>%{username}</span> 님이 %{description} (을)를 이동했습니다"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "'%{description}' 를 받았습니다"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>새 토픽</span> %{description}"
+      membership_request_accepted: "&#39;%{group_name}&#39;에 회원 가입"
+      membership_request_consolidated: "%{count} &#39;%{group_name}&#39;에 대한 오픈 멤버쉽 요청"
       group_message_summary:
-        other: " {{group_name}} 사서함에 {{count}} 개의 메시지가 있습니다"
+        other: " %{group_name} 사서함에 %{count} 개의 메시지가 있습니다"
       popup:
-        mentioned: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 나를 멘션했습니다'
-        group_mentioned: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 당신을 언급했습니다'
-        quoted: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 나를 인용했습니다'
-        replied: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 내게 답글을 달았습니다'
-        posted: '"{{topic}}" - {{site_title}}에서 {{username}}님이 글을 게시하였습니다'
-        private_message: '{{username}}에서 &quot;{{topic}}&quot;에 개인 메시지를 보냈습니다-{{site_title}}'
-        linked: '{{username}}님이 "{{topic}}" - {{site_title}}에 내 글을 링크했습니다'
-        watching_first_post: '{{username}}가 새로운 주제 &quot;{{topic}}&quot;-{{site_title}}을 작성했습니다.'
+        mentioned: '"%{topic}" - %{site_title}에서 %{username} 님이 나를 멘션했습니다'
+        group_mentioned: '"%{topic}" - %{site_title}에서 %{username} 님이 당신을 언급했습니다'
+        quoted: '"%{topic}" - %{site_title}에서 %{username} 님이 나를 인용했습니다'
+        replied: '"%{topic}" - %{site_title}에서 %{username} 님이 내게 답글을 달았습니다'
+        posted: '"%{topic}" - %{site_title}에서 %{username}님이 글을 게시하였습니다'
+        private_message: '%{username}에서 &quot;%{topic}&quot;에 개인 메시지를 보냈습니다-%{site_title}'
+        linked: '%{username}님이 "%{topic}" - %{site_title}에 내 글을 링크했습니다'
+        watching_first_post: '%{username}가 새로운 주제 &quot;%{topic}&quot;-%{site_title}을 작성했습니다.'
         confirm_title: "알림 활성 - %{site_title}"
         confirm_body: "완료! 알림이 활성화되었습니다."
-        custom: "%{site_title}의 {{username}}에서 알림"
+        custom: "%{site_title}의 %{username}에서 알림"
       titles:
         mentioned: "말하는"
         replied: "새로운 답장"
@@ -1664,9 +1665,9 @@ ko:
       from_my_computer: "컴퓨터에서 가져오기"
       from_the_web: "인터넷에서 가져오기"
       remote_tip: "이미지 링크"
-      remote_tip_with_attachments: "이미니자 파일 링크 {{authorized_extensions}}"
+      remote_tip_with_attachments: "이미니자 파일 링크 %{authorized_extensions}"
       local_tip: "기기에서 이미지 선택"
-      local_tip_with_attachments: "디바이스에서 이미지나 파일을 선택하세요 {{authorized_extensions}}"
+      local_tip_with_attachments: "디바이스에서 이미지나 파일을 선택하세요 %{authorized_extensions}"
       hint: "(드래그&드랍으로 업로드 가능)"
       hint_for_supported_browsers: "편집창에 이미지를 끌어다 놓거나 붙여넣기 할 수도 있습니다"
       uploading: "업로드 중입니다..."
@@ -1687,8 +1688,8 @@ ko:
       no_results: "검색 결과가 없습니다"
       no_more_results: "더 이상 결과가 없습니다."
       searching: "검색중..."
-      post_format: "#{{post_number}} by {{username}}"
-      results_page: "'{{term}}'의 검색 결과"
+      post_format: "#%{post_number} by %{username}"
+      results_page: "'%{term}'의 검색 결과"
       more_results: "검색 결과가 많습니다. 검색 조건을 좁혀보세요."
       cant_find: "원하는 걸 찾을 수 없으신가요?"
       start_new_topic: "새 토픽을 만들어볼까요?"
@@ -1697,9 +1698,9 @@ ko:
       search_google_button: "구글"
       search_google_title: "이 사이트 검색"
       context:
-        user: "@{{username}}의 글 검색"
-        category: "#{{category}} 카테고리에서 검색"
-        tag: "# {{tag}} 태그 검색"
+        user: "@%{username}의 글 검색"
+        category: "#%{category} 카테고리에서 검색"
+        tag: "# %{tag} 태그 검색"
         topic: "이 주제를 검색"
         private_messages: "메시지 검색"
       advanced:
@@ -1775,7 +1776,7 @@ ko:
         notification_level: "알림"
         choose_new_category: "주제의 새로운 카테고리를 선택"
         selected:
-          other: "<b>{{count}}</b>개의 주제가 선택되었습니다."
+          other: "<b>%{count}</b>개의 주제가 선택되었습니다."
         change_tags: "태그 교체"
         append_tags: "태그 덧붙이기"
         choose_new_tags: "이 토픽의 태그를 입력하세요:"
@@ -1788,7 +1789,7 @@ ko:
         posted: "아직 어떠한 주제도 작성되지 않았습니다."
         latest: "최신 주제가 없습니다."
         bookmarks: "아직 북마크한 주제가 없습니다."
-        category: "{{category}}에 주제가 없습니다."
+        category: "%{category}에 주제가 없습니다."
         top: "Top 주제가 없습니다."
         educate:
           new: '<p>회원님의 주제는 여기에 나타납니다.</p><p>기본적으로 생긴 지 이틀 안된 주제는 새것으로 간주하고 <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">new</span> 표시가 뜹니다.</p><p>바꾸고 싶으면 <a href="%{userPrefsUrl}">환경설정</a>으로 가보세요.</p>'
@@ -1799,12 +1800,12 @@ ko:
         read: "더 이상 읽을 주제가 없습니다"
         new: "더 이상 읽을 새로운 주제가 없습니다."
         unread: "더 이상 읽지 않은 주제가 없습니다"
-        category: "더 이상 {{category}}에 주제가 없습니다"
+        category: "더 이상 %{category}에 주제가 없습니다"
         top: "더 이상 인기 주제가 없습니다."
         bookmarks: "더이상 북마크한 주제가 없습니다."
     topic:
       filter_to:
-        other: "이 토픽에 {{count}}개 게시글"
+        other: "이 토픽에 %{count}개 게시글"
       create: "새 주제 만들기"
       create_long: "새로운 주제 만들기"
       open_draft: "초안 열기"
@@ -1832,9 +1833,9 @@ ko:
       new: "새로운 주제"
       unread: "읽지 않은"
       new_topics:
-        other: "{{count}}개의 새로운 주제"
+        other: "%{count}개의 새로운 주제"
       unread_topics:
-        other: "{{count}}개의 읽지 않은 주제"
+        other: "%{count}개의 읽지 않은 주제"
       title: "주제"
       invalid_access:
         title: "이 주제는 비공개입니다"
@@ -1847,21 +1848,21 @@ ko:
         title: "주제를 찾을 수 없습니다"
         description: "죄송합니다. 주제를 찾을 수 없습니다. 아마도 운영자에 의해 삭제된 것 같습니다."
       total_unread_posts:
-        other: "이 주제에 {{count}}개의 읽지 않을 게시 글이 있습니다."
+        other: "이 주제에 %{count}개의 읽지 않을 게시 글이 있습니다."
       unread_posts:
-        other: "이 주제에 {{count}}개의 읽지 않을 게시 글이 있습니다."
+        other: "이 주제에 %{count}개의 읽지 않을 게시 글이 있습니다."
       new_posts:
-        other: "최근 읽은 이후 {{count}}개 글이 이 주제에 작성되었습니다."
+        other: "최근 읽은 이후 %{count}개 글이 이 주제에 작성되었습니다."
       likes:
-        other: "이 주제에 {{count}}개의 '좋아요'가 있습니다."
+        other: "이 주제에 %{count}개의 '좋아요'가 있습니다."
       back_to_list: "주제 리스트로 돌아갑니다."
       options: "주제 옵션"
       show_links: "이 주제에서 링크를 표시합니다."
       toggle_information: "주제의 세부 정보를 토글합니다."
-      read_more_in_category: "더 읽을거리가 필요하신가요? {{catLink}} 또는 {{latestLink}}를 살펴보세요."
-      read_more: "{{catLink}} 또는 {{latestLink}}에서 더 많은 토픽들을 찾으실 수 있습니다"
-      group_request: "이 주제를 보려면`{{name}}` 그룹의 멤버쉽을 요청해야합니다."
-      group_join: "이 주제를 보려면`{{name}}` 그룹에 가입해야합니다"
+      read_more_in_category: "더 읽을거리가 필요하신가요? %{catLink} 또는 %{latestLink}를 살펴보세요."
+      read_more: "%{catLink} 또는 %{latestLink}에서 더 많은 토픽들을 찾으실 수 있습니다"
+      group_request: "이 주제를 보려면`%{name}` 그룹의 멤버쉽을 요청해야합니다."
+      group_join: "이 주제를 보려면`%{name}` 그룹에 가입해야합니다"
       group_request_sent: "그룹 멤버십 요청이 전송되었습니다. 수락되면 알려드립니다."
       unread_indicator: "아직이 주제의 마지막 게시물을 읽은 회원이 없습니다."
       read_more_MF: "읽지 않은 글 { UNREAD, plural, =0 {} one { is <a href='{basePath}/unread'>1 개</a> }other { are <a href='{basePath}/unread'># 개</a> } }, 새 글은 { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 개</a> } other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># 개</a> } } 을 확인해보세요, {CATEGORY, select, true {{catLink} 카테고리의 다른 글들도 살펴보세요.} false {{latestLink}} other {}}"
@@ -2039,23 +2040,23 @@ ko:
         choose_category: "공개 주제의 카테고리를 선택하십시오 :"
       feature_topic:
         title: "주요 주제로 설정"
-        pin: " {{categoryLink}} 카테고리 주제 목록 상단에 고정 until"
-        confirm_pin: "이미 {{count}}개의 고정된 주제가 있습니다. 너무 많은 주제가 고정되어 있으면 새로운 사용자나 익명사용자에게 부담이 될 수 있습니다. 정말로 이 카테고리에 추가적으로 주제를 고정하시겠습니까?"
-        unpin: "이 주제를 {{categoryLink}} 카테고리 상단에서 제거 합니다."
-        unpin_until: "{{categoryLink}} 카테고리 주제 목록 상단에서 이 주제를 제거하거나 <strong>%{until}</strong>까지 기다림."
+        pin: " %{categoryLink} 카테고리 주제 목록 상단에 고정 until"
+        confirm_pin: "이미 %{count}개의 고정된 주제가 있습니다. 너무 많은 주제가 고정되어 있으면 새로운 사용자나 익명사용자에게 부담이 될 수 있습니다. 정말로 이 카테고리에 추가적으로 주제를 고정하시겠습니까?"
+        unpin: "이 주제를 %{categoryLink} 카테고리 상단에서 제거 합니다."
+        unpin_until: "%{categoryLink} 카테고리 주제 목록 상단에서 이 주제를 제거하거나 <strong>%{until}</strong>까지 기다림."
         pin_note: "개별적으로 사용자가 주제 고정을 취소할 수 있습니다."
         pin_validation: "주제를 고정하려면 날짜를 지정해야 합니다."
-        not_pinned: " {{categoryLink}} 카테고리에 고정된 주제가 없습니다."
+        not_pinned: " %{categoryLink} 카테고리에 고정된 주제가 없습니다."
         already_pinned:
-          other: "{{categoryLink}}에 고정된 주제 개수: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "%{categoryLink}에 고정된 주제 개수: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "모든 주제 목록 상단 고정 until"
-        confirm_pin_globally: "이미 {{count}}개의 주제가 전체 공지로 고정되어 있습니다. 너무 많은 주제가 고정되어 있으면 새로운 사용자나 익명사용자에게 부담이 될 수 있습니다. 정말로 이 주제를 전체 공지로 고정하겠습니까?"
+        confirm_pin_globally: "이미 %{count}개의 주제가 전체 공지로 고정되어 있습니다. 너무 많은 주제가 고정되어 있으면 새로운 사용자나 익명사용자에게 부담이 될 수 있습니다. 정말로 이 주제를 전체 공지로 고정하겠습니까?"
         unpin_globally: "모든 주제 목록 상단에서 이 주제를 제거"
         unpin_globally_until: "모든 주제 목록 상단에서 이 주제를 제거하거나 <strong>%{until}</strong>까지 기다림."
         global_pin_note: "개별적으로 사용자가 주제 고정을 취소할 수 있습니다."
         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: "사용자는 배너를 닫음으로써 배너를 나타나지 않게 할 수 있습니다. 단지 어떤 기간동안 딱 하나의 주제만이 배너로 지정 가능합니다."
@@ -2085,14 +2086,14 @@ ko:
         to_topic_username: "아이디를 입력하셨습니다. 이 주제에 초대하는 링크와 함께 알림을 보내겠습니다."
         to_username: "초대하려는 사용자의 아이디를 입력하세요. 이 주제에 초대하는 링크와 함께 알림을 보내겠습니다."
         email_placeholder: "이메일 주소"
-        success_email: "<b>{{emailOrUsername}}</b>로 초대장을 발송했습니다. 초대를 수락하면 알려 드리겠습니다. 초대상태를 확인하려면 사용자 페이지에서 '초대장' 탭을 선택하세요."
+        success_email: "<b>%{emailOrUsername}</b>로 초대장을 발송했습니다. 초대를 수락하면 알려 드리겠습니다. 초대상태를 확인하려면 사용자 페이지에서 '초대장' 탭을 선택하세요."
         success_username: "사용자가 이 주제에 참여할 수 있도록 초대했습니다."
         error: "그 사람을 초대할 수 없습니다. 혹시 이미 초대하진 않았나요? (Invites are rate limited)"
-        success_existing_email: "해당 email을 사용하고 있는 사용자 <b>{{emailOrUsername}}</b> 가 이미 존재합니다. 그 사용자를 이 토픽에 참여하도록 초청했습니다."
+        success_existing_email: "해당 email을 사용하고 있는 사용자 <b>%{emailOrUsername}</b> 가 이미 존재합니다. 그 사용자를 이 토픽에 참여하도록 초청했습니다."
       login_reply: "로그인하고 답글 쓰기"
       filters:
         n_posts:
-          other: "{{count}} 글"
+          other: "%{count} 글"
         cancel: "필터 제거"
       move_to:
         title: "로 이동"
@@ -2105,14 +2106,14 @@ ko:
         radio_label: "새 주제글"
         error: "새로운 주제로 이동시키는데 문제가 발생하였습니다."
         instructions:
-          other: "새로운 주제를 생성하여, 선택한 <b>{{count}}</b>개의 글로 채우려고 합니다."
+          other: "새로운 주제를 생성하여, 선택한 <b>%{count}</b>개의 글로 채우려고 합니다."
       merge_topic:
         title: "이미 있는 주제로 옮기기"
         action: "이미 있는 주제로 옮기기"
         error: "이 주제를 이동시키는데 문제가 발생하였습니다."
         radio_label: "기존 주제"
         instructions:
-          other: " <b>{{count}}</b>개의 글을 옮길 주제를 선택해주세요."
+          other: " <b>%{count}</b>개의 글을 옮길 주제를 선택해주세요."
       move_to_new_message:
         title: "새 메시지로 이동"
         action: "새 메시지로 이동"
@@ -2153,7 +2154,7 @@ ko:
         instructions: "토픽의 새로운 타임스탬프를 선택해주세요. 토픽에 속한 게시글은 같은 시간 간격으로 조정됩니다."
       multi_select:
         select: "선택"
-        selected: "({{count}})개가 선택됨"
+        selected: "(%{count})개가 선택됨"
         select_post:
           label: "선택"
           title: "선택에 게시물 추가"
@@ -2171,17 +2172,17 @@ ko:
         select_all: 전체 선택
         deselect_all: 전체 선택 해제
         description:
-          other: "<b>{{count}}</b>개의 개시글을 선택하셨어요."
+          other: "<b>%{count}</b>개의 개시글을 선택하셨어요."
     post:
       quote_reply: "인용하기"
       edit_reason: "사유: "
-      post_number: "{{number}}번째 글"
+      post_number: "%{number}번째 글"
       ignored: "무시 된 콘텐츠"
       wiki_last_edited_on: "마지막으로 위키가 수정된 일시"
       last_edited_on: "마지막으로 편집:"
       reply_as_new_topic: "연결된 주제로 답글 작성하기"
       reply_as_new_private_message: "같은 수신자에게 새로운 메시지로 답글쓰기"
-      continue_discussion: "{{postLink}}에서 토론을 계속:"
+      continue_discussion: "%{postLink}에서 토론을 계속:"
       follow_quote: "인용 글로 이동"
       show_full: "전체 글 보기"
       show_hidden: "무시 된 내용을 봅니다."
@@ -2191,26 +2192,26 @@ ko:
       expand_collapse: "확장/축소"
       locked: "이 글은 운영진에 의해 수정이 금지 되었습니다."
       gap:
-        other: "{{count}}개의 숨겨진 답글 보기"
+        other: "%{count}개의 숨겨진 답글 보기"
       notice:
-        new_user: "{{user}}이 처음으로 게시되었습니다. 커뮤니티에 오신 것을 환영합니다!"
-        returning_user: "우리가 {{user}}을 본 지 오래되었습니다. 마지막 게시물은 {{time}}입니다."
+        new_user: "%{user}이 처음으로 게시되었습니다. 커뮤니티에 오신 것을 환영합니다!"
+        returning_user: "우리가 %{user}을 본 지 오래되었습니다. 마지막 게시물은 %{time}입니다."
       unread: "읽지 않은 포스트"
       has_replies:
-        other: "{{count}} 답글"
+        other: "%{count} 답글"
       has_likes_title:
-        other: "{{count}}명이 이 글을 좋아합니다"
+        other: "%{count}명이 이 글을 좋아합니다"
       has_likes_title_only_you: "당신이 이 글을 좋아합니다."
       has_likes_title_you:
-        other: "당신 외 {{count}}명이 이 글을 좋아합니다"
+        other: "당신 외 %{count}명이 이 글을 좋아합니다"
       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: "죄송합니다. 한 번에 {{max}} 파일 만 업로드 할 수 있습니다."
-        upload_not_authorized: "죄송합니다. 허가되지 않은 확장자의 파일이 있습니다. (허가된 확장자: {{authorized_extensions}})."
+        too_many_dragged_and_dropped_files: "죄송합니다. 한 번에 %{max} 파일 만 업로드 할 수 있습니다."
+        upload_not_authorized: "죄송합니다. 허가되지 않은 확장자의 파일이 있습니다. (허가된 확장자: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "죄송합니다. 새로운 유저는 이미지를 업로드 하실 수 없습니다."
         attachment_upload_not_allowed_for_new_user: "죄송합니다. 새로운 유저는 파일 첨부를 업로드 하실 수 없습니다."
         attachment_download_requires_login: "죄송합니다. 첨부 파일을 받으려면 로그인이 필요합니다."
@@ -2294,10 +2295,10 @@ ko:
           like: "좋아해요"
       delete:
         confirm:
-          other: "정말로 {{count}}개의 글을 삭제 하시겠습니까?"
+          other: "정말로 %{count}개의 글을 삭제 하시겠습니까?"
       merge:
         confirm:
-          other: "정말로 이 {{count}}개의 게시글을 합칠까요?"
+          other: "정말로 이 %{count}개의 게시글을 합칠까요?"
       revisions:
         controls:
           first: "초판"
@@ -2309,7 +2310,7 @@ ko:
           revert: "이 수정본으로 되돌리기"
           edit_wiki: "Wiki 편집"
           edit_post: "포스트 편집"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "Show the rendered output with additions and removals inline"
@@ -2497,11 +2498,11 @@ ko:
       custom_placeholder_notify_moderators: "구체적으로 회원님이 걱정하는 내용과 가능한 모든 관련된 링크를 제공해주세요."
       custom_message:
         at_least:
-          other: "최소 {{count}}자 이상 입력하세요"
+          other: "최소 %{count}자 이상 입력하세요"
         more:
-          other: "{{count}} 남았습니다"
+          other: "%{count} 남았습니다"
         left:
-          other: "{{count}} 남았습니다"
+          other: "%{count} 남았습니다"
     flagging_topic:
       title: "우리 커뮤니티 질서를 지키는데 도와주셔서 감사합니다!"
       action: "주제 신고하기"
@@ -2543,7 +2544,7 @@ ko:
         title: "이 주제는 개인 메시지입니다"
         help: "이 주제는 개인 메시지입니다"
     posts: "글"
-    posts_long: "이 주제의 글 수는 {{number}}개 입니다."
+    posts_long: "이 주제의 글 수는 %{number}개 입니다."
     posts_likes_MF: |2
 
       이 토픽에는 {ratio, select,
@@ -2561,18 +2562,18 @@ ko:
       other: "조회"
     replies: "답변"
     views_long:
-      other: "이 토픽은 {{number}}번 조회되었습니다."
+      other: "이 토픽은 %{number}번 조회되었습니다."
     activity: "활동"
     likes: "좋아요"
     likes_lowercase:
       other: "좋아요"
-    likes_long: "이 주제에 {{number}}개의 '좋아요'가 있습니다."
+    likes_long: "이 주제에 %{number}개의 '좋아요'가 있습니다."
     users: "사용자"
     users_lowercase:
       other: "사용자"
     category_title: "카테고리"
     history: "기록"
-    changed_by: "{{author}}에 의해"
+    changed_by: "%{author}에 의해"
     raw_email:
       title: "수신 이메일"
       not_available: "Raw 이메일이 가능하지 않습니다."
@@ -2583,29 +2584,29 @@ ko:
       latest:
         title: "최근글"
         title_with_count:
-          other: "최근글 ({{count}})"
+          other: "최근글 (%{count})"
         help: "가장 최근 주제"
       read:
         title: "읽기"
         help: "마지막으로 순서대로 읽은 주제"
       categories:
         title: "카테고리"
-        title_in: "카테고리 - {{categoryName}}"
+        title_in: "카테고리 - %{categoryName}"
         help: "카테고리별로 그룹화 된 모든 주제"
       unread:
         title: "읽지 않은 글"
         title_with_count:
-          other: "읽지 않은 글 ({{count}})"
+          other: "읽지 않은 글 (%{count})"
         help: "지켜보거나 추적 중인 읽지 않은 주제"
         lower_title_with_count:
-          other: "{{count}} unread"
+          other: "%{count} unread"
       new:
         lower_title_with_count:
-          other: "{{count}} new"
+          other: "%{count} new"
         lower_title: "new"
         title: "새글"
         title_with_count:
-          other: "새글 ({{count}})"
+          other: "새글 (%{count})"
         help: "며칠 내에 만들어진 주제"
       posted:
         title: "내 글"
@@ -2614,10 +2615,10 @@ ko:
         title: "북마크"
         help: "북마크된 주제"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          other: "{{categoryName}} ({{count}})"
-        help: "{{categoryName}}카테고리의 최신 주제"
+          other: "%{categoryName} (%{count})"
+        help: "%{categoryName}카테고리의 최신 주제"
       top:
         title: "인기글"
         help: "작년 또는 지난 달, 지난 주, 어제에 활발했던 주제"
@@ -2779,7 +2780,7 @@ ko:
       delete_synonym_confirm: '동의어 &quot;%{tag_name}&quot;를 삭제 하시겠습니까?'
       delete_tag: "태그 삭제"
       delete_confirm:
-        other: "정말로 이 태그를 삭제하고 이 태그가 붙은 {{count}} 개의 토픽에서 태그를 제거할까요?"
+        other: "정말로 이 태그를 삭제하고 이 태그가 붙은 %{count} 개의 토픽에서 태그를 제거할까요?"
       delete_confirm_no_topics: "정말로 이 태그를 삭제할까요?"
       rename_tag: "태그 이름변경"
       rename_instructions: "새로운 태그의 이름을 입력하세요:"
@@ -3127,9 +3128,9 @@ ko:
           none: "연관된 이벤트가 없습니다"
           redeliver: "재발송"
           incoming:
-            other: "{{count}}개의 새로운 이벤트가 있습니다."
+            other: "%{count}개의 새로운 이벤트가 있습니다."
           completed_in:
-            other: "{{count}}초 후에 완료됩니다."
+            other: "%{count}초 후에 완료됩니다."
           request: "요청"
           response: "응답"
           redeliver_confirm: "정말로 동일한 payload를 재발송하기를 원하십니까?"
@@ -3181,12 +3182,12 @@ ko:
           label: "업로드"
           title: "백업을 업로드"
           uploading: "업로드 중..."
-          uploading_progress: "업로드중... {{progress}}%"
-          success: "'{{filename}}'이(가) 성공적으로 업로드 되었습니다. 파일은 처리중이며 몇분후에 리스트에 보여집니다."
-          error: "'{{filename}}' 파일 업로드중 에러가 발생하였습니다. ({{message}})"
+          uploading_progress: "업로드중... %{progress}%"
+          success: "'%{filename}'이(가) 성공적으로 업로드 되었습니다. 파일은 처리중이며 몇분후에 리스트에 보여집니다."
+          error: "'%{filename}' 파일 업로드중 에러가 발생하였습니다. (%{message})"
         operations:
           is_running: "실행 중입니다."
-          failed: "{{operation}} 작업 실행하지 못했습니다. 로그를 확인해 주세요."
+          failed: "%{operation} 작업 실행하지 못했습니다. 로그를 확인해 주세요."
           cancel:
             label: "취소"
             title: "현제 작업 취소하기"
@@ -3306,7 +3307,7 @@ ko:
           disabled_component_tooltip: "이 구성 요소가 비활성화되었습니다"
           default_theme_tooltip: "이 테마는 사이트의 기본 테마입니다"
           updates_available_tooltip: "이 테마에 대한 업데이트가 있습니다"
-          and_x_more: "그리고 {{count}} 더."
+          and_x_more: "그리고 %{count} 더."
           collapse: 무너짐
           uploads: "업로드할 파일"
           no_uploads: "폰트나 이미지같은 테마와 관련된 파일만 업로드 가능합니다"
@@ -3354,8 +3355,8 @@ ko:
           disabled_by: "이 구성 요소는"
           required_version:
             error: "이 테마는이 버전의 Discourse와 호환되지 않기 때문에 자동으로 비활성화되었습니다."
-            minimum: "Discourse 버전 {{version}} 이상이 필요합니다."
-            maximum: "담화 버전 {{version}} 이하가 필요합니다."
+            minimum: "Discourse 버전 %{version} 이상이 필요합니다."
+            maximum: "담화 버전 %{version} 이하가 필요합니다."
           component_of: "구성 요소 :"
           update_to_latest: "최신버전으로 업데이트하기"
           check_for_updates: "업데이트 체크하기"
@@ -3367,7 +3368,7 @@ ko:
           theme_translations: "테마 번역"
           empty: "항목이 없습니다"
           commits_behind:
-            other: "테마가 {{count}} 개 커밋 뒤쳐졌습니다!"
+            other: "테마가 %{count} 개 커밋 뒤쳐졌습니다!"
           compare_commits: "(새로운 커밋 참조)"
           repo_unreachable: "이 테마의 Git 저장소에 접속할 수 없습니다. 에러 메시지:"
           imported_from_archive: "이 테마는 .zip 파일에서 가져 왔습니다."
@@ -3771,8 +3772,8 @@ ko:
           title: "사용자의 이메일 주소 표시"
           text: "보이기"
       user:
-        suspend_failed: "이 사용자를 접근 금지하는데 오류 발생 {{error}}"
-        unsuspend_failed: "이 사용자를 접근 허용 하는데 오류 발생 {{error}}"
+        suspend_failed: "이 사용자를 접근 금지하는데 오류 발생 %{error}"
+        unsuspend_failed: "이 사용자를 접근 허용 하는데 오류 발생 %{error}"
         suspend_duration: "사용자를 몇일 접근 금지 하시겠습니까?"
         suspend_reason_label: "Why are you suspending? This text <b>will be visible to everyone</b> on this user's profile page, and will be shown to the user when they try to log in. Keep it short."
         suspend_reason_hidden_label: "이 사용자를 일시정지하는 사유는 무엇인가요? 이 텍스트는 해당 사용자가 로그인할 때 보이게 됩니다. 짧게 적어주세요."
@@ -4132,6 +4133,7 @@ ko:
         title: "이모지"
         help: "모든 사람이 쓸 수 있는 이모지를 추가합니다. (팁: 여러개 파일을 한 번에 드래그 & 드롭할 수 있어요)"
         add: "새 이모지 추가"
+        uploading: "업로드 중..."
         name: "이름"
         group: "그룹"
         image: "이미지"
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 4a1f8c8986..52ad59f808 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -25,8 +25,8 @@ lt:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
@@ -246,13 +246,13 @@ lt:
     every_hour: "kiekvieną valandą"
     daily: "kas dieną"
     weekly: "kas savaitę"
-    max_of_count: "daugiausia iš {{count}}"
+    max_of_count: "daugiausia iš %{count}"
     alternation: "arba"
     character_count:
-      one: "{{count}} simbolis"
-      few: "{{count}} simboliai"
-      many: "{{count}} simbolių"
-      other: "{{count}} simbolių"
+      one: "%{count} simbolis"
+      few: "%{count} simboliai"
+      many: "%{count} simbolių"
+      other: "%{count} simbolių"
     related_messages:
       title: "Susiję pranešimai"
     suggested_topics:
@@ -301,10 +301,10 @@ lt:
         yes_value: "Taip, atšaukti"
         no_value: "Ne, palikti"
     topic_count_new:
-      one: "Pamatyk {{count}} naują temą"
-      few: "Pamatyk {{count}} naujas temas"
-      many: "Pamatyk {{count}} naujų temų"
-      other: "Pamatyk {{count}} naujas temas"
+      one: "Pamatyk %{count} naują temą"
+      few: "Pamatyk %{count} naujas temas"
+      many: "Pamatyk %{count} naujų temų"
+      other: "Pamatyk %{count} naujas temas"
     preview: "Peržiūrėti"
     cancel: "atšaukti"
     save: "Išsaugoti pakeitimus"
@@ -370,19 +370,19 @@ lt:
         description: "Mes gavome tavo naują įrašą, tačiau jis turi būti patvirtintas moderatoriaus. Ačiū už kantrybę!"
         ok: "GERAI"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> paskelbė <a href='{{topicUrl}}'>temą</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Tu</a> paskelbei <a href='{{topicUrl}}'>temą</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> atsakė į <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Tu</a> atsakei į <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> atsakė į <a href='{{topicUrl}}'>temą</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Tu</a> atsakei į <a href='{{topicUrl}}'>temą</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> paminėjo <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> paminėjo <a href='{{user2Url}}'>tave</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Tu</a> paminėjai <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Paskelbė <a href='{{userUrl}}'>{{user}}</a> vartotojas"
-      posted_by_you: "Paskelbta nuo <a href='{{userUrl}}'>jūsų</a>"
-      sent_by_user: "Išsiuntė <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Išsiųsta nuo <a href='{{userUrl}}'>jūsų</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> paskelbė <a href='%{topicUrl}'>temą</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Tu</a> paskelbei <a href='%{topicUrl}'>temą</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> atsakė į <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Tu</a> atsakei į <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> atsakė į <a href='%{topicUrl}'>temą</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Tu</a> atsakei į <a href='%{topicUrl}'>temą</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> paminėjo <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> paminėjo <a href='%{user2Url}'>tave</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Tu</a> paminėjai <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Paskelbė <a href='%{userUrl}'>%{user}</a> vartotojas"
+      posted_by_you: "Paskelbta nuo <a href='%{userUrl}'>jūsų</a>"
+      sent_by_user: "Išsiuntė <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Išsiųsta nuo <a href='%{userUrl}'>jūsų</a>"
     directory:
       filter_name: "rušiuoti pagal vartotojus"
       title: "Vartotojai"
@@ -588,7 +588,7 @@ lt:
     user_fields:
       none: "(pasirink nustatymą)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profilis"
       mute: "Nutildyti"
       edit: "Redaguoti Nustatymus"
@@ -641,12 +641,12 @@ lt:
       external_links_in_new_tab: "Atidaryti visas pridėtas nuorodas naujame lange"
       enable_quoting: "Įjungti citatų atsakymus pabrėžtam tekstui"
       change: "pakeisti"
-      moderator: "{{user}} yra moderatorius"
-      admin: "{{user}} yra administratorius"
+      moderator: "%{user} yra moderatorius"
+      admin: "%{user} yra administratorius"
       moderator_tooltip: "Šis vartotojas yra moderatorius"
       admin_tooltip: "Šis vartotojas yra administratorius"
       silenced_tooltip: "Šis narys nutildytas"
-      suspended_notice: "Šis vartotojas nušalintas iki {{date}}."
+      suspended_notice: "Šis vartotojas nušalintas iki %{date}."
       suspended_permanently: "Šis narys suspenduotas"
       suspended_reason: "Priežastis:"
       github_profile: "Github"
@@ -659,7 +659,7 @@ lt:
           Prieš tai užtildytos temos ir įrašai nebus įtraukti į eketroninų laiškų sarašus.
         individual: "Atsiūsti elektroninį laišką apie naujus visus naujus įrašus"
         individual_no_echo: "Atsiūsti elektroninį laišką apie naujus visus naujus įrašus, išskyrus mano."
-        many_per_day: "Atsiūsti elektroninį laišką apie naujus visus naujus įrašus (kartų {{dailyEmailEstimate}} per dieną)"
+        many_per_day: "Atsiūsti elektroninį laišką apie naujus visus naujus įrašus (kartų %{dailyEmailEstimate} per dieną)"
         few_per_day: "Atsiūsti elektroninį laišką apie naujus visus naujus įrašus (apie 2 kartus per dieną)"
       tag_settings: "Etiketės"
       watched_tags: "Žiūrėta"
@@ -684,7 +684,6 @@ lt:
       admin_delete: "Ištrinti"
       users: "Vartotojai"
       muted_users: "Nutildytos"
-      muted_users_instructions: "Slopinti visus šių vartoojų pranešimus."
       tracked_topics_link: "Rodyti"
       automatically_unpin_topics: "Automatiškai atsegti temas pasiekus apačią."
       apps: "Programėlės"
@@ -735,7 +734,7 @@ lt:
         enable: "Įgalinti"
         copy_to_clipboard_error: "Klaida kopijuojant duomenis į iškarpinę"
         copied_to_clipboard: "Nukopijuota į iškirptę"
-        remaining_codes: "Jūs turite <strong>{{count}}</strong> atsarginiai kodai."
+        remaining_codes: "Jūs turite <strong>%{count}</strong> atsarginiai kodai."
         codes:
           title: "Sukurta atsarginių kopijų kodai"
       second_factor:
@@ -780,13 +779,13 @@ lt:
         instructions: "Nebus rodomas viešai."
         ok: "Mes jums atsiųsime patvirtinimo elektroninį laišką"
         invalid: "Prašom įrašyti teisingą elektroninį adresą"
-        authenticated: "Tavo elektroninis laiškas buvo {{provider}} autorizuotas"
+        authenticated: "Tavo elektroninis laiškas buvo %{provider} autorizuotas"
         frequency_immediately: "Mes jums atsiųsime elektroninį laišką iš karto, jeigu jūs neperskaitėte žinutės, kurią siuntėme praeitame laiške."
         frequency:
           one: "Mes atsiųsime el. laišką jeigu nebuvai prisijungęs per paskutinę minutę."
-          few: "Mes atsiųsime el. laišką jeigu nebuvai prisijungęs per paskutines {{count}} minutes."
-          many: "Mes atsiųsime el. laišką jeigu nebuvai prisijungęs per paskutines {{count}} minutes."
-          other: "Mes atsiųsime el. laišką jeigu nebuvai prisijungęs per paskutines {{count}} minutes."
+          few: "Mes atsiųsime el. laišką jeigu nebuvai prisijungęs per paskutines %{count} minutes."
+          many: "Mes atsiųsime el. laišką jeigu nebuvai prisijungęs per paskutines %{count} minutes."
+          other: "Mes atsiųsime el. laišką jeigu nebuvai prisijungęs per paskutines %{count} minutes."
       associated_accounts:
         connect: "Prisijungti"
         revoke: "Atšaukti"
@@ -801,9 +800,9 @@ lt:
       username:
         title: "Vartotojo vardas"
         instructions: "unikalus, be tarpelių, trumpas"
-        short_instructions: "Vartotojai gali tave paminėti kaip @{{username}}"
+        short_instructions: "Vartotojai gali tave paminėti kaip @%{username}"
         available: "Vartotojo vardas nėra užimtas"
-        not_available: "Negalimas. Gal pabandykite {{suggestion}}?"
+        not_available: "Negalimas. Gal pabandykite %{suggestion}?"
         not_available_no_suggestion: "Nepasiekiamas"
         too_short: "Vartotojo vardas yra per trumpas"
         too_long: "Vartotojo vardas yra per ilgas."
@@ -880,16 +879,16 @@ lt:
         user: "Pakviestas vartotojas"
         truncated:
           one: "Rodomas pirmas pakvietimas"
-          few: "Rodomi pirmi {{count}} pakvietimai."
-          many: "Rodomi pirmi {{count}} pakvietimai."
-          other: "Rodomi pirmi {{count}} pakvietimai."
+          few: "Rodomi pirmi %{count} pakvietimai."
+          many: "Rodomi pirmi %{count} pakvietimai."
+          other: "Rodomi pirmi %{count} pakvietimai."
         redeemed: "Atstatyti pakvietimai"
         redeemed_tab: "Atstatyta"
-        redeemed_tab_with_count: "Atstatyta ({{count}})"
+        redeemed_tab_with_count: "Atstatyta (%{count})"
         redeemed_at: "Atstatyta"
         pending: "Laukiami pakvietimai"
         pending_tab: "Laukiama"
-        pending_tab_with_count: "Neperskaityti ({{count}})"
+        pending_tab_with_count: "Neperskaityti (%{count})"
         topics_entered: "Peržiūrėtos temos"
         posts_read_count: "Perskaityta įrašų"
         expired: "Šis pakvietimas nebegalioja"
@@ -903,12 +902,16 @@ lt:
         time_read: "Skaitymo laikas"
         days_visited: "Apsilankymo dienos"
         account_age_days: "Paskyros amžius"
+        links_tab: "Nuorodos"
+        link_created_at: "Sukurta"
+        link_groups: Grupės
         create: "Siųsti pakvietimą"
         generate_link: "Kopijuoti pavietimo nuorodą"
         link_generated: "Pavyko sugeneruoti pakvietimo nuorodą"
         valid_for: "Pakvietimo nuoroda galioja tik šiam elektroninio pašto adresui: %{email}"
+        invite_link:
+          success: "Pavyko sugeneruoti pakvietimo nuorodą"
         bulk_invite:
-          text: "Grupinis pakvietimas iš failo"
           success: "Failas įkeltas sėkmingai, jums bus pranešta kada procesas bus baigtas."
           error: "Atsiprašome, failas privalo buti CSV formato."
       password:
@@ -972,7 +975,7 @@ lt:
       desc:
         network: "Prašome patikrinti savo ryšį."
         network_fixed: "Panašu, kad tai sugrįžo."
-        server: "Klaidos kodas: {{status}}"
+        server: "Klaidos kodas: %{status}"
         forbidden: "Jums negalima peržiūrėti."
         not_found: "Oops, URL neegzistuoja."
         unknown: "Kažkas blogai nutiko."
@@ -1021,8 +1024,8 @@ lt:
       hidden_for_session: "OK, paklausiu tavęs rytoj. Tu taip pat visada gali naudoti 'Prisijungti' kad sukurtum paskyrą"
     summary:
       enabled_description: "Tu šiuo metu žiūri temos aprašymą: pačius įdomiausius įrašus, kuriuos išrinko bendruomenė."
-      description: "Yra iš viso <b>{{replyCount}}</b> atsakymų."
-      description_time: "Yra <b>{{replyCount}}</b> atsakymų ir apytiksliai <b>{{readingTime}} minučių skaitymo</b>."
+      description: "Yra iš viso <b>%{replyCount}</b> atsakymų."
+      description_time: "Yra <b>%{replyCount}</b> atsakymų ir apytiksliai <b>%{readingTime} minučių skaitymo</b>."
       enable: "Apibendrinkite šią Temą"
       disable: "Peržiūrėti visus Įrašus"
     deleted_filter:
@@ -1032,8 +1035,8 @@ lt:
       disable: "Rodyti ištrintus įrašus"
     private_message_info:
       title: "Žinutės"
-      remove_allowed_user: "Ar tikrai nori pašalinti {{name}} iš šios žinutės?"
-      remove_allowed_group: "Ar tikrai norite pašalinti {{name}} iš šios žinutės?"
+      remove_allowed_user: "Ar tikrai nori pašalinti %{name} iš šios žinutės?"
+      remove_allowed_group: "Ar tikrai norite pašalinti %{name} iš šios žinutės?"
     email: "El. paštas"
     username: "Vartotojo vardas"
     last_seen: "Matytas"
@@ -1076,12 +1079,12 @@ lt:
       awaiting_activation: "Tavo paskyra laukia aktyvacijos. Prašome pakartotinai paspausti ant \"Pamiršau slaptažodį\" mygtuko, kad galėtume išsiųsti naują el. laišką su instrukcijomis."
       awaiting_approval: "Jūsų paskyra dar neaktyvuota. Kai tik paskyra bus aktyvuota, atsiųsime jums el. laišką."
       requires_invite: "Atsiprašome, bet prieeiga prie forumo tik su pakvietimais."
-      not_activated: "Jūs dar negalite prisijungti. Jums buvo išsiųstas el. laiškas į <b>{{sentTo}}</b>. Prašome laikytis el. laiške nurodytų instrukcijų."
+      not_activated: "Jūs dar negalite prisijungti. Jums buvo išsiųstas el. laiškas į <b>%{sentTo}</b>. Prašome laikytis el. laiške nurodytų instrukcijų."
       not_allowed_from_ip_address: "Jūs negalite prisijungti iš šio IP adreso."
       admin_not_allowed_from_ip_address: "Tu negali prisijungti kaip administratorius iš šio IP adreso."
       resend_activation_email: "Spauskite čia, kad gautumėte naują aktyvacijos laišką."
       resend_title: "Persiųsti patvirtinimo laišką"
-      sent_activation_email_again: "Mes jums išsiunteme dar vieną el. laišką su aktyvacijos instrucijomis į <b>{{currentEmail}}</b>. Prašome palaukti, gali užtrukti kelias minutes."
+      sent_activation_email_again: "Mes jums išsiunteme dar vieną el. laišką su aktyvacijos instrucijomis į <b>%{currentEmail}</b>. Prašome palaukti, gali užtrukti kelias minutes."
       to_continue: "Prašome prisijungti"
       preferences: "Turite būti prisijungęs, kad keistumete paskyros nustatymus."
       forgot: "Negaliu atsiminti paskyros duomenų."
@@ -1132,17 +1135,17 @@ lt:
       no_content: Atitikmenų nerasta
       filter_placeholder: Paieška...
       filter_placeholder_with_any: Ieškoti arba sukurti...
-      create: "Sukurti: '{{content}}'"
+      create: "Sukurti: '%{content}'"
       max_content_reached:
-        one: "Jūs galite pasirinkti{{count}} elementą."
-        few: "Jūs galite pasirinkti {{count}} elementus."
-        many: "Jūs galite pasirinkti {{count}}elementus."
-        other: "Jūs galite pasirinkti {{count}} elementus."
+        one: "Jūs galite pasirinkti%{count} elementą."
+        few: "Jūs galite pasirinkti %{count} elementus."
+        many: "Jūs galite pasirinkti %{count}elementus."
+        other: "Jūs galite pasirinkti %{count} elementus."
       min_content_not_reached:
-        one: "Pasirinkite bent {{count}} elementą."
-        few: "Pasirinkite bent {{count}} elementus."
-        many: "Pasirinkite bent {{count}} elementus."
-        other: "Pasirinkite bent {{count}} elementus."
+        one: "Pasirinkite bent %{count} elementą."
+        few: "Pasirinkite bent %{count} elementus."
+        many: "Pasirinkite bent %{count} elementus."
+        other: "Pasirinkite bent %{count} elementus."
     date_time_picker:
       from: Nuo
       to: Kam
@@ -1170,11 +1173,11 @@ lt:
       drafts_offline: "juodraščiai ne ryšio zonoje"
       error:
         title_missing: "Antraštė turi būti užpildyta"
-        title_too_short: "Tekstas turi būti bent {{min}} simbolių ilgumo"
-        title_too_long: "Tekstas negali būti viršyti {{max}} simbolių"
-        post_length: "Įrašas turi būti bent {{min}} simbolių ilgumo"
+        title_too_short: "Tekstas turi būti bent %{min} simbolių ilgumo"
+        title_too_long: "Tekstas negali būti viršyti %{max} simbolių"
+        post_length: "Įrašas turi būti bent %{min} simbolių ilgumo"
         category_missing: "Jūs privalote pasirinkti kategoriją"
-        tags_missing: "Privalote pasirinkti bent {{count}} gairę"
+        tags_missing: "Privalote pasirinkti bent %{count} gairę"
       save_edit: "Išsaugoti pakeitimus"
       reply_original: "Atsakyti į Originalią Temą"
       reply_here: "Atsakyti"
@@ -1241,54 +1244,54 @@ lt:
       tooltip:
         regular:
           one: "%{count} nematytas pranešimas"
-          few: "{{count}}nematyti pranešimai"
-          many: "{{count}}nematytų pranešimų"
-          other: "{{count}} nematyti pranešimai"
+          few: "%{count}nematyti pranešimai"
+          many: "%{count}nematytų pranešimų"
+          other: "%{count} nematyti pranešimai"
         message:
           one: "%{count} neskaityta žinutė"
-          few: "{{count}}neskaitytos žinutės"
-          many: "{{count}}neskaitytų žinučių"
-          other: "{{count}}neskaitytos žinutės"
+          few: "%{count}neskaitytos žinutės"
+          many: "%{count}neskaitytų žinučių"
+          other: "%{count}neskaitytos žinutės"
       title: "pranešimai kai paminimas @name , atsakomi tavo įrašai, temos, žinutės ir pan."
       none: "Šiuo metu neįmanoma pakrauti pranešimų."
       empty: "Pranešimų nėra"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} ir dar %{count}</span> {{description}}"
-        few: "<span>{{username}}, {{username2}}ir {{count}} kiti</span> {{description}}"
-        many: "<span>{{username}}, {{username2}} ir {{count}}kitų</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} ir {{count}}kitų</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}}"
-      invitee_accepted: "<span>{{username}}</span> priėmė jūsų kvietimą"
-      moved_post: "<span>{{username}}</span> perkeltas {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Gavote '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Nauja tema</span> {{description}}"
+        one: "<span>%{username}, %{username2} ir dar %{count}</span> %{description}"
+        few: "<span>%{username}, %{username2}ir %{count} kiti</span> %{description}"
+        many: "<span>%{username}, %{username2} ir %{count}kitų</span> %{description}"
+        other: "<span>%{username}, %{username2} ir %{count}kitų</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}"
+      invitee_accepted: "<span>%{username}</span> priėmė jūsų kvietimą"
+      moved_post: "<span>%{username}</span> perkeltas %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Gavote '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Nauja tema</span> %{description}"
       group_message_summary:
-        one: "{{count}} žinutė, jūsų {{group_name}}pato dėžutėje"
-        few: "{{count}} žinutės, jūsų {{group_name}}pato dėžutėje"
-        many: "{{count}}žinučių, jūsų {{group_name}} pato dėžutėje"
-        other: "{{count}} žinutės, jūsų {{group_name}} pašto dėžutėje"
+        one: "%{count} žinutė, jūsų %{group_name}pato dėžutėje"
+        few: "%{count} žinutės, jūsų %{group_name}pato dėžutėje"
+        many: "%{count}žinučių, jūsų %{group_name} pato dėžutėje"
+        other: "%{count} žinutės, jūsų %{group_name} pašto dėžutėje"
       popup:
-        mentioned: '{{username}} paminėjo tave "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} paminėjo tave "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} pacitavo tave "{{topic}}" - {{site_title}}'
-        replied: '{{username}} atsakė tau "{{topic}}" - {{site_title}}'
-        posted: '{{username}} paskelbė "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} atsiuntė privačią žinutė "{{topic}}" - {{site_title}}'
-        linked: '{{username}} panaudojo tavo įrašą "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} paminėjo tave "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} paminėjo tave "%{topic}" - %{site_title}'
+        quoted: '%{username} pacitavo tave "%{topic}" - %{site_title}'
+        replied: '%{username} atsakė tau "%{topic}" - %{site_title}'
+        posted: '%{username} paskelbė "%{topic}" - %{site_title}'
+        private_message: '%{username} atsiuntė privačią žinutė "%{topic}" - %{site_title}'
+        linked: '%{username} panaudojo tavo įrašą "%{topic}" - %{site_title}'
         confirm_title: "Pranešimai įgalinti - %{site_title}"
         confirm_body: "Pavyko! Pranešimai buvo įgalinti."
       titles:
@@ -1299,9 +1302,9 @@ lt:
       from_my_computer: "Iš įrenginio"
       from_the_web: "Iš naršyklės"
       remote_tip: "nuoroda į nuotrauką"
-      remote_tip_with_attachments: "nuoroda į nuotrauką ar failą {{authorized_extensions}}"
+      remote_tip_with_attachments: "nuoroda į nuotrauką ar failą %{authorized_extensions}"
       local_tip: "Pasirinkti nuotraukas iš įrenginio"
-      local_tip_with_attachments: "pasirinkti nuotraukas ar failus iš įrenginio {{authorized_extensions}}"
+      local_tip_with_attachments: "pasirinkti nuotraukas ar failus iš įrenginio %{authorized_extensions}"
       hint: "(taip pat gali perstumti ir įmesti į redagavimo skydą)"
       hint_for_supported_browsers: "gali perstumti, numesti ir kopijuoti nuotraukas į redagavimo skydą"
       uploading: "Įkeliama"
@@ -1318,23 +1321,23 @@ lt:
       clear_all: "Ištrinti viską"
       too_short: "Jūsų paieškos frazė, per trumpa."
       result_count:
-        one: "<span>%{count} rezultatas iš</span><span class='term'>{{term}}</span>"
-        few: "<span>{{count}}{{plus}}rezultatų iš</span><span class='term'>{{term}}</span>"
-        many: "<span>{{count}}{{plus}} rezultatai iš</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} rezultatai iš </span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} rezultatas iš</span><span class='term'>%{term}</span>"
+        few: "<span>%{count}%{plus}rezultatų iš</span><span class='term'>%{term}</span>"
+        many: "<span>%{count}%{plus} rezultatai iš</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} rezultatai iš </span><span class='term'>%{term}</span>"
       title: "temų, įrašų, vartotojų ar kategorijų paieška"
       full_page_title: "ieškoti temų arba įrašų"
       no_results: "Nerasta jokių rezultatų."
       no_more_results: "Nerasta jokių rezultatų."
       searching: "Ieškoma..."
-      post_format: "#{{post_number}} nuo {{username}}"
-      results_page: "Paieškos rezultatai ir '{{term}}'"
+      post_format: "#%{post_number} nuo %{username}"
+      results_page: "Paieškos rezultatai ir '%{term}'"
       start_new_topic: "Galbūt pradėkite naują temą?"
       search_google_button: "Google"
       search_google_title: "Ieškoti šioje svetainėje"
       context:
-        user: "Ieškoti įrašų nuo @{{username}}"
-        category: "Ieškoti #{{category}}kategorijoje"
+        user: "Ieškoti įrašų nuo @%{username}"
+        category: "Ieškoti #%{category}kategorijoje"
         topic: "Ieškoti šioje temoje"
         private_messages: "Ieškoti žinučių"
       advanced:
@@ -1398,10 +1401,10 @@ lt:
         notification_level: "Pranešimai"
         choose_new_category: "Pasirinkti naują kategoriją temoms:"
         selected:
-          one: "Jūs pasirinkote <b>{{count}}</b> temą."
-          few: "Jūs pasirinkote <b>{{count}}</b> temas."
-          many: "Jūs pasirinkote <b>{{count}}</b> temų."
-          other: "Jūs pasirinkote <b>{{count}}</b> temų."
+          one: "Jūs pasirinkote <b>%{count}</b> temą."
+          few: "Jūs pasirinkote <b>%{count}</b> temas."
+          many: "Jūs pasirinkote <b>%{count}</b> temų."
+          other: "Jūs pasirinkote <b>%{count}</b> temų."
       none:
         unread: "Jūs neturite neperskaitytų temų."
         new: "Jūs neturite naujų temų."
@@ -1409,7 +1412,7 @@ lt:
         posted: "Jūs dar nerašėte jokiose temose."
         latest: "Nėra jokių paskutinių temų. Tai liūdina."
         bookmarks: "Jūs dar neturite pažymėtų temų."
-        category: "Nėra jokių temų kategorijoje {{category}}."
+        category: "Nėra jokių temų kategorijoje %{category}."
         top: "Nėra jokių TOP temų."
       bottom:
         latest: "Daugiau nėra jokių naujausių temų."
@@ -1417,15 +1420,15 @@ lt:
         read: "Daugiau nėra jokių perskaitytų temų."
         new: "Daugiau nėra jokių naujų temų."
         unread: "Daugiau nėra jokių neperskaitytų temų."
-        category: "Daugiau nėra jokių temų kategorijoje {{category}}."
+        category: "Daugiau nėra jokių temų kategorijoje %{category}."
         top: "Daugiau nėra jokių populiarių temų."
         bookmarks: "Daugiau pažymėtų temų nėra"
     topic:
       filter_to:
         one: "temoje %{count} įrašas"
-        few: "temoje {{count}} įrašai"
-        many: "teoje {{count}} įrašų"
-        other: "temoje {{count}} įrašai"
+        few: "temoje %{count} įrašai"
+        many: "teoje %{count} įrašų"
+        other: "temoje %{count} įrašai"
       create: "Nauja Tema"
       create_long: "Sukurti naują temą"
       open_draft: "Atviras juodraštis"
@@ -1444,15 +1447,15 @@ lt:
       new: "nauja tema"
       unread: "Neperskaitytos"
       new_topics:
-        one: "{{count}} nauja tema"
-        few: "{{count}} naujos temos"
-        many: "{{count}} naujų temų"
-        other: "{{count}} naujų temų"
+        one: "%{count} nauja tema"
+        few: "%{count} naujos temos"
+        many: "%{count} naujų temų"
+        other: "%{count} naujų temų"
       unread_topics:
-        one: "{{count}} neperskaityta tema"
-        few: "{{count}} neperskaitytos temos"
-        many: "{{count}} neperskaitytų temų"
-        other: "{{count}} neperskaitytų temų"
+        one: "%{count} neperskaityta tema"
+        few: "%{count} neperskaitytos temos"
+        many: "%{count} neperskaitytų temų"
+        other: "%{count} neperskaitytų temų"
       title: "Tema"
       invalid_access:
         title: "Tema yra privati"
@@ -1466,30 +1469,30 @@ lt:
         description: "Atsiprašome, bet mes negalėjome rasti jūsų temos. Gal ji buvo ištrinta moderatoriaus?"
       total_unread_posts:
         one: "šioje temoje turi %{count} neperskaitytą įrašą"
-        few: "šioje temoje tu turi {{count}} neperskaitytų įrašų"
-        many: "šioje temoje tu turi {{count}} neperskaitytų įrašų"
-        other: "šioje temoje tu turi {{count}} neperskaitytų įrašų"
+        few: "šioje temoje tu turi %{count} neperskaitytų įrašų"
+        many: "šioje temoje tu turi %{count} neperskaitytų įrašų"
+        other: "šioje temoje tu turi %{count} neperskaitytų įrašų"
       unread_posts:
         one: "šioje temoje tu turi %{count} neperskaitytą seną įrašą"
-        few: "šioje temoje tu turi {{count}} neperskaitytų senų įrašų"
-        many: "šioje temoje tu turi {{count}} neperskaitytų senų įrašų"
-        other: "šioje temoje tu turi {{count}} neperskaitytų senų įrašų"
+        few: "šioje temoje tu turi %{count} neperskaitytų senų įrašų"
+        many: "šioje temoje tu turi %{count} neperskaitytų senų įrašų"
+        other: "šioje temoje tu turi %{count} neperskaitytų senų įrašų"
       new_posts:
         one: "šioje temoje yra %{count} naujas įrašas nuo paskutinio tavo skaitymo"
-        few: "šioje temoje yra {{count}} naujų įrašų nuo paskutinio tavo skaitymo"
-        many: "šioje temoje yra {{count}} naujų įrašų nuo paskutinio tavo skaitymo"
-        other: "šioje temoje yra {{count}} naujų įrašų nuo paskutinio tavo skaitymo"
+        few: "šioje temoje yra %{count} naujų įrašų nuo paskutinio tavo skaitymo"
+        many: "šioje temoje yra %{count} naujų įrašų nuo paskutinio tavo skaitymo"
+        other: "šioje temoje yra %{count} naujų įrašų nuo paskutinio tavo skaitymo"
       likes:
         one: "Šiuo metu temą mėgsta %{count} vartotojas"
-        few: "Šiuo metu temą mėgsta {{count}} vartotojų"
-        many: "Šiuo metu temą mėgsta {{count}} vartotojų"
-        other: "Šiuo metu temą mėgsta {{count}} vartotojų"
+        few: "Šiuo metu temą mėgsta %{count} vartotojų"
+        many: "Šiuo metu temą mėgsta %{count} vartotojų"
+        other: "Šiuo metu temą mėgsta %{count} vartotojų"
       back_to_list: "Grįžti į temų sąrašą"
       options: "Nustatymai"
       show_links: "Rodyti šios temos nuorodas"
       toggle_information: "perjungti temos detales"
-      read_more_in_category: "Nori skaityti daugiau? Ieškok kitų temų {{catLink}} arba {{latestLink}}."
-      read_more: "Norite skaityti daugiau? {{catLink}} arba {{latestLink}}."
+      read_more_in_category: "Nori skaityti daugiau? Ieškok kitų temų %{catLink} arba %{latestLink}."
+      read_more: "Norite skaityti daugiau? %{catLink} arba %{latestLink}."
       read_more_MF: "Šiuo metu { UNREAD, plural, =0 {} one { yra <a href='{basePath}/unread'>1 neperskaityta</a> } other { yra <a href='{basePath}/unread'># neperskaitytos</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 nauja</a> tema} other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># naujos</a> temos} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Žiūrėkite visas kategorijas
       view_latest_topics: peržiūrėkite paskutines temas
@@ -1621,29 +1624,29 @@ lt:
         success_message: "Tu sėkmingai uždėjai temai vėliavą."
       feature_topic:
         title: "Charakterizuok šią temą"
-        pin: "Nustatyk šią temą, kad laikytųsi kategorijos {{categoryLink}} viršuje"
-        confirm_pin: "Tu jau turi {{count}} prisegtų temų. Per daug prisegtų temų gali atstumti anoniminius ir naujus vartotojus. Ar esi tikras, jog nori prisegti šią temą?"
-        unpin: "Pašalink šią temą iš {{categoryLink}} kategorijos sąrašo viršaus."
-        unpin_until: "Pašalinti temą iš {{categoryLink}} kategorijos viršaus arba palaukti iki <strong>%{until}</strong>."
+        pin: "Nustatyk šią temą, kad laikytųsi kategorijos %{categoryLink} viršuje"
+        confirm_pin: "Tu jau turi %{count} prisegtų temų. Per daug prisegtų temų gali atstumti anoniminius ir naujus vartotojus. Ar esi tikras, jog nori prisegti šią temą?"
+        unpin: "Pašalink šią temą iš %{categoryLink} kategorijos sąrašo viršaus."
+        unpin_until: "Pašalinti temą iš %{categoryLink} kategorijos viršaus arba palaukti iki <strong>%{until}</strong>."
         pin_note: "Vartotojai gali Atsegti temą nuo viršaus individualiai sau."
         pin_validation: "Terminas reikalauja Prisegti šią temą."
-        not_pinned: "{{categoryLink}} nėra prisegtų temų "
+        not_pinned: "%{categoryLink} nėra prisegtų temų "
         already_pinned:
-          one: "Tema prisegta šioje kategorijoje {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          few: "Prisegtos temos šioje kategorijoje {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "Prisegtos temos šioje kategorijoje {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Prisegtos temos šioje kategorijoje {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Tema prisegta šioje kategorijoje %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          few: "Prisegtos temos šioje kategorijoje %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          many: "Prisegtos temos šioje kategorijoje %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Prisegtos temos šioje kategorijoje %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Iškelti temą virš visų kitų temų sąrašo iki "
-        confirm_pin_globally: "Jūs jau turite {{count}} globaliai Prisegtas temas. Per daug prisegtų temų gali atbaidyti naujus ir anoniminius vartotojus. Ar tikrai to norite?"
+        confirm_pin_globally: "Jūs jau turite %{count} globaliai Prisegtas temas. Per daug prisegtų temų gali atbaidyti naujus ir anoniminius vartotojus. Ar tikrai to norite?"
         unpin_globally: "Pašalinti šią temą iš visų temų sąrašo viršaus."
         unpin_globally_until: "Pašalinti temą iš visų temų sąrašo viršaus arba palaukti iki <strong>%{until}</strong>."
         global_pin_note: "Vartotojai gali Atsegti temą nuo sąrašo viršaus individualiai."
         not_pinned_globally: "Nėra jokių globaliai Prisegtų temų."
         already_pinned_globally:
           one: "Šiuo metu globaliai prisegta tema: <strong class='badge badge-notification unread'>%{count}</strong>"
-          few: "Šiuo metu globaliai Prisegtos temos: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "Šiuo metu globaliai Prisegtos temos: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Šiuo metu globaliai Prisegtos temos: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: "Šiuo metu globaliai Prisegtos temos: <strong class='badge badge-notification unread'>%{count}</strong>"
+          many: "Šiuo metu globaliai Prisegtos temos: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Šiuo metu globaliai Prisegtos temos: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Paryškink šią temą, kad ji atsidurtų visų puslapių sąrašo viršuje."
         remove_banner: "Pašalinti paryškintą temą, kuri yra visų puslapių viršuje."
         banner_note: "Vartotojai gali uždaryti paryškiuntą temą. Tik viena tema gali būti paryškinta tam tikru metu"
@@ -1671,16 +1674,16 @@ lt:
         to_topic_username: "Vartotojo vardas įvestas. Mes išsiųsime pranešimą su nuoroda į šią temą."
         to_username: "Įveskite vartotojo vardą žmogaus, kurį norite pakviesti. Mes išsiųsime pranešima su nuoroda į šią temą."
         email_placeholder: "vardas@pavizdys.lt"
-        success_email: "Mes išsiuntėme pakvietimą į <b>{{emailOrUsername}}</b>. Mes pranešime, kai pakvietimas bus patvirtintas. Stebėk pakvietimų kortelę savo paskyroje, kad žinotum pakvietimo statusą."
+        success_email: "Mes išsiuntėme pakvietimą į <b>%{emailOrUsername}</b>. Mes pranešime, kai pakvietimas bus patvirtintas. Stebėk pakvietimų kortelę savo paskyroje, kad žinotum pakvietimo statusą."
         success_username: "Vartotojas buvo pakviestas dalyvauti temoje."
         error: "Atsiprašome, tačiau nepavyko pakviesti šio žmogaus. Gal būt jis jau buvo pakviestas?"
       login_reply: "Prisijunk, kad atsakytum"
       filters:
         n_posts:
           one: "%{count} įrašas"
-          few: "{{count}} įrašai"
-          many: "{{count}}įrašų"
-          other: "{{count}}įrašai"
+          few: "%{count} įrašai"
+          many: "%{count}įrašų"
+          other: "%{count}įrašai"
         cancel: "Išjungti filtrus"
       split_topic:
         title: "Perkelti į naują temą"
@@ -1689,18 +1692,18 @@ lt:
         error: "Įvyko klaida perkeliant įrašus į naują temą."
         instructions:
           one: "Jūs tuoj sukursite naują temą ir įkesite įrašą, kurį pažymėjote."
-          few: "Jūs tuoj sukursite naują temą ir įkesite <b>{{count}}</b> įrašus, kuriuos pažymėjote."
-          many: "Jūs tuoj sukursite naują temą ir įkesite <b>{{count}}</b> įrašus, kuriuos pažymėjote."
-          other: "Jūs tuoj sukursite naują temą ir įkesite <b>{{count}}</b> įrašus, kuriuos pažymėjote."
+          few: "Jūs tuoj sukursite naują temą ir įkesite <b>%{count}</b> įrašus, kuriuos pažymėjote."
+          many: "Jūs tuoj sukursite naują temą ir įkesite <b>%{count}</b> įrašus, kuriuos pažymėjote."
+          other: "Jūs tuoj sukursite naują temą ir įkesite <b>%{count}</b> įrašus, kuriuos pažymėjote."
       merge_topic:
         title: "Perkelti į esamą temą"
         action: "perkelti į esamą temą"
         error: "Įvyko klaida perkeliant įrašus į šią temą."
         instructions:
           one: "Prašome pasirinkti temą, į kurią norėtumėte perkelti šį įrašą."
-          few: "Prašome pasirinkti temą, į kurią norėtumėte perkelti šiuos <b>{{count}}</b> įrašus."
-          many: "Prašome pasirinkti temą, į kurią norėtumėte perkelti šiuos <b>{{count}}</b> įrašus."
-          other: "Prašome pasirinkti temą, į kurią norėtumėte perkelti šiuos <b>{{count}}</b> įrašus."
+          few: "Prašome pasirinkti temą, į kurią norėtumėte perkelti šiuos <b>%{count}</b> įrašus."
+          many: "Prašome pasirinkti temą, į kurią norėtumėte perkelti šiuos <b>%{count}</b> įrašus."
+          other: "Prašome pasirinkti temą, į kurią norėtumėte perkelti šiuos <b>%{count}</b> įrašus."
       move_to_new_message:
         radio_label: "Nauja žinutė"
       merge_posts:
@@ -1717,7 +1720,7 @@ lt:
         instructions: "Prašome įvesti naują šios temos laiko formatą. Visi šios temos įrašai bus atnaujinti pagal nustatytą datą."
       multi_select:
         select: "pasirinkti"
-        selected: "pasirinkta ({{count}})"
+        selected: "pasirinkta (%{count})"
         select_post:
           label: "pasirinkti"
           title: "Pridėti įrašą prie pasirinktų"
@@ -1734,17 +1737,17 @@ lt:
         deselect_all: nieko nepasirinkti
         description:
           one: Jūs pasirinkote <b>%{count}</b> įrašą.
-          few: "Jūs pasirinkote <b>{{count}}</b> įrašus."
-          many: "Jūs pasirinkote <b>{{count}}</b> įrašus."
-          other: "Jūs pasirinkote <b>{{count}}</b> įrašus."
+          few: "Jūs pasirinkote <b>%{count}</b> įrašus."
+          many: "Jūs pasirinkote <b>%{count}</b> įrašus."
+          other: "Jūs pasirinkote <b>%{count}</b> įrašus."
     post:
       quote_reply: "Citata"
       edit_reason: "Priežastis:"
-      post_number: "įrašas {{number}}"
+      post_number: "įrašas %{number}"
       wiki_last_edited_on: "wiki paskutinį kartą redaguota "
       last_edited_on: "įrašas paskutinį kartą atnaujintas"
       reply_as_new_topic: "Atsakyti naujoje temoje"
-      continue_discussion: "Tęsiama {{postLink}} diskusija:"
+      continue_discussion: "Tęsiama %{postLink} diskusija:"
       follow_quote: "eiti į cituotą įrašą"
       show_full: "Rodyti Pilną Įrašą"
       deleted_by_author:
@@ -1755,26 +1758,26 @@ lt:
       expand_collapse: "išskleisti/suskleisti"
       gap:
         one: "Peržiūrėti %{count} paslėptą atsakymą"
-        few: "peržiūrėti {{count}} paslėptus atsakymus"
-        many: "peržiūrėti {{count}} paslėptus atsakymus"
-        other: "peržiūrėti {{count}} paslėptus atsakymus"
+        few: "peržiūrėti %{count} paslėptus atsakymus"
+        many: "peržiūrėti %{count} paslėptus atsakymus"
+        other: "peržiūrėti %{count} paslėptus atsakymus"
       unread: "Įrašas yra neperskaitytas"
       has_replies:
-        one: "{{count}} Atsakymas"
-        few: "{{count}} Atsakymai"
-        many: "{{count}} Atsakymai"
-        other: "{{count}} Atsakymai"
+        one: "%{count} Atsakymas"
+        few: "%{count} Atsakymai"
+        many: "%{count} Atsakymai"
+        other: "%{count} Atsakymai"
       has_likes_title:
         one: "%{count} žmogui patiko šis įrašas"
-        few: "{{count}} žmonėms patinka šis įrašas"
-        many: "{{count}} žmonėms patinka šis įrašas"
-        other: "{{count}} žmonėms patinka šis įrašas"
+        few: "%{count} žmonėms patinka šis įrašas"
+        many: "%{count} žmonėms patinka šis įrašas"
+        other: "%{count} žmonėms patinka šis įrašas"
       has_likes_title_only_you: "tau patiko šis įrašas"
       has_likes_title_you:
         one: "tau ir %{count} žmogui patiko šis įrašas"
-        few: "tau ir {{count}} žmonėms patiko šis įrašas"
-        many: "tau ir {{count}} žmonėms patiko šis įrašas"
-        other: "tau ir {{count}} žmonėms patiko šis įrašas"
+        few: "tau ir %{count} žmonėms patiko šis įrašas"
+        many: "tau ir %{count} žmonėms patiko šis įrašas"
+        other: "tau ir %{count} žmonėms patiko šis įrašas"
       errors:
         create: "Atsiprašome, įvyko klaida kuriant įrašą. Prašome pamėginti dar kartą."
         edit: "Atsiprašome, įvyko klaida redaguojant įrašą. Prašome pamėginti dar kartą."
@@ -1811,14 +1814,14 @@ lt:
         delete_replies:
           direct_replies:
             one: "Taip, ir %{count} tiesioginį atsakymą"
-            few: "Taip, ir {{count}}tiesioginius atsakymus"
-            many: "Taip, ir {{count}}tiesioginių atsakymų"
-            other: "Taip, ir {{count}} tiesioginius atsakymus"
+            few: "Taip, ir %{count}tiesioginius atsakymus"
+            many: "Taip, ir %{count}tiesioginių atsakymų"
+            other: "Taip, ir %{count} tiesioginius atsakymus"
           all_replies:
             one: "Taip, ir %{count} atsakymą"
-            few: "Taip, ir visus {{count}} atsakymus"
-            many: "Taip, ir visus {{count}}atsakymų"
-            other: "Taip, ir visus {{count}} atsakymus"
+            few: "Taip, ir visus %{count} atsakymus"
+            many: "Taip, ir visus %{count}atsakymų"
+            other: "Taip, ir visus %{count} atsakymus"
           just_the_post: "Ne, tik šį įrašą"
         admin: "įrašo administravimas"
         wiki: "Sukurti Wiki"
@@ -1843,10 +1846,10 @@ lt:
         people:
           spam: "pažymėtas kaip šlamštas"
           like_capped:
-            one: "ir {{count}}kitas mėgsta tai"
-            few: "ir {{count}}kitų mėgsta tai"
-            many: "ir {{count}}kitų mėgsta tai "
-            other: "ir {{count}} kitų mėgsta tai"
+            one: "ir %{count}kitas mėgsta tai"
+            few: "ir %{count}kitų mėgsta tai"
+            many: "ir %{count}kitų mėgsta tai "
+            other: "ir %{count} kitų mėgsta tai"
         by_you:
           off_topic: "Tu pažymėjai tai kaip \"ne į temą\"."
           spam: "Tu pažymėjai tai, kaip šiukšlę"
@@ -1990,14 +1993,14 @@ lt:
       custom_message:
         at_least:
           one: "įveskite bent jau %{count} simbolį"
-          few: "įveskite bent jau {{count}} simbolius"
-          many: "įveskite bent jau {{count}}simbolių"
-          other: "įveskite bent jau {{count}}simbolius"
+          few: "įveskite bent jau %{count} simbolius"
+          many: "įveskite bent jau %{count}simbolių"
+          other: "įveskite bent jau %{count}simbolius"
         more:
           one: "liko %{count}..."
-          few: "liko {{count}}..."
-          many: "liko {{count}}..."
-          other: "liko {{count}}..."
+          few: "liko %{count}..."
+          many: "liko %{count}..."
+          other: "liko %{count}..."
     flagging_topic:
       title: "Ačiū, kad padedi padedi išlaikyti forumą civilizuotu!"
       action: "Temos su vėliavomis"
@@ -2041,7 +2044,7 @@ lt:
       unlisted:
         help: "Ši tema yra išimta iš sąrašo. Ji daugiau nebebus rodoma temų sąraše ir ją galima pasiekti tik su tiesiogine nuoroda."
     posts: "Įrašai"
-    posts_long: "Šiuo metu yra {{number}} įrašų šioje temoje"
+    posts_long: "Šiuo metu yra %{number} įrašų šioje temoje"
     posts_likes_MF: |
       Ši tema turi {count, plural, one {1 reply} other {# replies}} {ratio, select,
       low {with a high like to post ratio}
@@ -2058,9 +2061,9 @@ lt:
     replies: "Atsakymai"
     views_long:
       one: "ši tema buvo peržiūrėta %{count} kartą"
-      few: "ši tema buvo peržiūrėta {{number}} kartus"
-      many: "ši tema buvo peržiūrėta {{number}}kartų"
-      other: "ši tema buvo peržiūrėta {{number}} kartus"
+      few: "ši tema buvo peržiūrėta %{number} kartus"
+      many: "ši tema buvo peržiūrėta %{number}kartų"
+      other: "ši tema buvo peržiūrėta %{number} kartus"
     activity: "Aktyvumas"
     likes: "Patikimai"
     likes_lowercase:
@@ -2068,7 +2071,7 @@ lt:
       few: "patikimai"
       many: "patikimai"
       other: "patikimai"
-    likes_long: "Šiuo metu temoje yra {{number}} Patikimų"
+    likes_long: "Šiuo metu temoje yra %{number} Patikimų"
     users: "Vartotojai"
     users_lowercase:
       one: "vartotojas"
@@ -2077,7 +2080,7 @@ lt:
       other: "vartotojai"
     category_title: "Kategorija"
     history: "Istorija"
-    changed_by: "pagal {{author}}"
+    changed_by: "pagal %{author}"
     raw_email:
       title: "Įeinantis paštas"
       not_available: "Nėra galimybių!"
@@ -2089,43 +2092,43 @@ lt:
         title: "Paskutinės"
         title_with_count:
           one: "Paskutinis (%{count})"
-          few: "Paskutinės ({{count}})"
-          many: "Paskutinės ({{count}})"
-          other: "Paskutinės ({{count}})"
+          few: "Paskutinės (%{count})"
+          many: "Paskutinės (%{count})"
+          other: "Paskutinės (%{count})"
         help: "temos su paskutiniais įrašais"
       read:
         title: "Perskaityti"
         help: "Temos, kurias perskaitei, pagal paskutinių perskaitytų temų tvarką"
       categories:
         title: "Kategorijos"
-        title_in: "Kategorija - {{categoryName}}"
+        title_in: "Kategorija - %{categoryName}"
         help: "Visos temos sugrupuotos pagal kategoriją"
       unread:
         title: "Neperskaitytos"
         title_with_count:
           one: "Neperskaitytas (%{count})"
-          few: "Neperskaitytos ({{count}})"
-          many: "Neperskaitytos ({{count}})"
-          other: "Neperskaitytos ({{count}})"
+          few: "Neperskaitytos (%{count})"
+          many: "Neperskaitytos (%{count})"
+          other: "Neperskaitytos (%{count})"
         help: "temos, kurias stebide ar sekate su neperskaitytais įrašais"
         lower_title_with_count:
           one: "%{count} neperskaitytas"
-          few: "{{count}} neperskaitytų"
-          many: "{{count}} neperskaitytų"
-          other: "{{count}} neperskaitytų"
+          few: "%{count} neperskaitytų"
+          many: "%{count} neperskaitytų"
+          other: "%{count} neperskaitytų"
       new:
         lower_title_with_count:
           one: "%{count} nauja"
-          few: "{{count}} nauji"
-          many: "{{count}} nauji"
-          other: "{{count}} nauji"
+          few: "%{count} nauji"
+          many: "%{count} nauji"
+          other: "%{count} nauji"
         lower_title: "Nauja"
         title: "Naujos"
         title_with_count:
           one: "Naujas (%{count})"
-          few: "Naujos ({{count}})"
-          many: "Naujos ({{count}})"
-          other: "Naujos ({{count}})"
+          few: "Naujos (%{count})"
+          many: "Naujos (%{count})"
+          other: "Naujos (%{count})"
         help: "Per paskutines dienas sukurtos temos"
       posted:
         title: "Mano Įrašai"
@@ -2134,13 +2137,13 @@ lt:
         title: "Žymės"
         help: "Temos, kurias pažymėjai"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          few: "{{categoryName}} ({{count}})"
-          many: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
-        help: "paskutinės temos kategorijoje {{categoryName}} "
+          one: "%{categoryName} (%{count})"
+          few: "%{categoryName} (%{count})"
+          many: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "paskutinės temos kategorijoje %{categoryName} "
       top:
         title: "Populiarios"
         help: "pačios aktyviausios temos paskutiniaisiais metais, mėnesį, savaitę ar dieną"
@@ -2486,10 +2489,10 @@ lt:
           label: "Įkelti"
           title: "Įkelti atsarginę kopiją šiam atskiram atvejui"
           uploading: "Įkeliama"
-          error: "Įvyko klaida įkeliant '{{filename}}': {{message}}"
+          error: "Įvyko klaida įkeliant '%{filename}': %{message}"
         operations:
           is_running: "Šiuo metu jau yra vykdoma operacija..."
-          failed: "Įvyko klaida su {{operation}}. Prašome patikrinti logaritmus."
+          failed: "Įvyko klaida su %{operation}. Prašome patikrinti logaritmus."
           cancel:
             label: "Atšaukti"
             title: "Atšaukti dabartinę operaciją"
@@ -2853,8 +2856,8 @@ lt:
           title: "Atskleisk šio vartotojo el. pašto adresą"
           text: "Rodyti"
       user:
-        suspend_failed: "Įvyko klaida sustabdant vartotoją {{error}}"
-        unsuspend_failed: "Įvyko klaida atkuriant vartotoją {{error}}"
+        suspend_failed: "Įvyko klaida sustabdant vartotoją %{error}"
+        unsuspend_failed: "Įvyko klaida atkuriant vartotoją %{error}"
         suspend_duration: "Kuriam laikui vartotojas bus sustabdytas?"
         suspend_reason_label: "Kodėl sustabdote? Šis tekstas <b>bus matomas visiems</b> vartotojo profilyje ir vartotojui bandant prisijungti. Stenkitės aprašyti trumpai."
         suspend_reason: "Priežastis"
@@ -3146,6 +3149,7 @@ lt:
         title: "Šypsenėlės"
         help: "Pridėti naują šypsenėlę, kurią galės matyti visi (patarimas: kelis failus kelk tuo pačiu metu)"
         add: "Pridėti Naują Šypsenėlę"
+        uploading: "Įkeliama..."
         name: "Vardas"
         group: "Grupė"
         image: "Paveiksliukas"
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index a08eed0133..b23f8da4e2 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -24,8 +24,8 @@ lv:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}} tūkst."
-        millions: "{{number}} milj."
+        thousands: "%{number} tūkst."
+        millions: "%{number} milj."
     dates:
       time: "hh:mm"
       timeline_date: "MMM YYYY"
@@ -214,12 +214,12 @@ lv:
     weekly: "katru nedēļu"
     every_month: "katru mēnesi"
     every_six_months: "katrus sešus mēnešus"
-    max_of_count: "ne vairāk kā {{count}}"
+    max_of_count: "ne vairāk kā %{count}"
     alternation: "vai"
     character_count:
-      zero: "{{count}} zīmes"
-      one: "{{count}} zīme"
-      other: "{{count}} zīmes"
+      zero: "%{count} zīmes"
+      one: "%{count} zīme"
+      other: "%{count} zīmes"
     related_messages:
       title: "Saistītās ziņas"
     suggested_topics:
@@ -331,19 +331,19 @@ lv:
         description: "Mēs saņēmām jūsu ierakstu, taču vispirms to jāapstiprina moderatoram. Lūdzu, esiet pacietīgi."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> pievienoja ierakstus <a href='{{topicUrl}}'>tēmai</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Jūs</a> pievienojāt ierakstu <a href='{{topicUrl}}'>tēmai</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> atbildēja <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Jūs</a> atbildējāt <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> atbildēja <a href='{{topicUrl}}'>temā</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Jūs</a> atbildējāt <a href='{{topicUrl}}'>temā</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> pieminēja <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> pieminēja <a href='{{user2Url}}'>Jūs</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Jūs</a> pieminējāt <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Ierakstīja <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Ierakstījāt <a href='{{userUrl}}'>Jūs</a>"
-      sent_by_user: "Nosūtīja <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Nosūtījāt <a href='{{userUrl}}'>Jūs</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> pievienoja ierakstus <a href='%{topicUrl}'>tēmai</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Jūs</a> pievienojāt ierakstu <a href='%{topicUrl}'>tēmai</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> atbildēja <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Jūs</a> atbildējāt <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> atbildēja <a href='%{topicUrl}'>temā</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Jūs</a> atbildējāt <a href='%{topicUrl}'>temā</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> pieminēja <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> pieminēja <a href='%{user2Url}'>Jūs</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Jūs</a> pieminējāt <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Ierakstīja <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Ierakstījāt <a href='%{userUrl}'>Jūs</a>"
+      sent_by_user: "Nosūtīja <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Nosūtījāt <a href='%{userUrl}'>Jūs</a>"
     directory:
       filter_name: "atlasīt pēc lietotājvārda"
       title: "Lietotāji"
@@ -520,7 +520,7 @@ lv:
     user_fields:
       none: "(izvēlieties opciju)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profils"
       mute: "Klusināt"
       edit: "Mainīt iestatījumus"
@@ -572,11 +572,11 @@ lv:
       external_links_in_new_tab: "Atvērt visas saites jaunā cilnē"
       enable_quoting: "Ieslēgt atbildi ar iezīmētā teksta citēšanu"
       change: "mainīt"
-      moderator: "{{user}} ir moderators"
-      admin: "{{user}} ir administrators"
+      moderator: "%{user} ir moderators"
+      admin: "%{user} ir administrators"
       moderator_tooltip: "Šis lietotājs ir moderators"
       admin_tooltip: "Šis lietotājs ir administrators"
-      suspended_notice: "Lietotājs ir īslaicīgi bloķēts līdz {{date}}."
+      suspended_notice: "Lietotājs ir īslaicīgi bloķēts līdz %{date}."
       suspended_reason: "Iemesls:"
       github_profile: "Github"
       email_activity_summary: "Aktivitātes atskaite"
@@ -588,7 +588,7 @@ lv:
           Klusinātās tēmas un sadaļas nav iekļautas šajos e-pastos.
         individual: "Sūtīt e-pastu par katru jauno ierakstu"
         individual_no_echo: "Sūtīt e-pastu par katru jauno ierakstu, izņemot manus"
-        many_per_day: "Sūtīt e-pastu par katru jauno ierakstu (apmēram {{dailyEmailEstimate}} dienā)"
+        many_per_day: "Sūtīt e-pastu par katru jauno ierakstu (apmēram %{dailyEmailEstimate} dienā)"
         few_per_day: "Sūtīt e-pastu par katru jauno ierakstu (apmēram divus dienā)"
       tag_settings: "Tagi"
       watched_tags: "Skatīts"
@@ -614,7 +614,6 @@ lv:
       admin_delete: "Dzēst"
       users: "Lietotāji"
       muted_users: "Klusināts"
-      muted_users_instructions: "Nerādīt paziņojumus no šiem lietotājiem."
       tracked_topics_link: "Parādīt"
       automatically_unpin_topics: "Automātiski atspraust tēmas, kad sasniedzu beigas."
       apps: "Lietotnes"
@@ -699,12 +698,12 @@ lv:
         title: "E-pasts"
         ok: "Mēs jums nosūtīsim apstiprinājuma e-pastu"
         invalid: "Lūdzu ievadiet derīgu e-pasta adresi"
-        authenticated: "Jūsu e-pastu autentificēja {{provider}}"
+        authenticated: "Jūsu e-pastu autentificēja %{provider}"
         frequency_immediately: "Mēs nekavējoties sūtīsim jums epastu par jaunām neizlasītām ziņām."
         frequency:
-          zero: "Mēs sūtīsim jums e-pastu tikai tad, ja nebūsim jūs redzējuši pēdējo {{count}} minūšu laikā."
+          zero: "Mēs sūtīsim jums e-pastu tikai tad, ja nebūsim jūs redzējuši pēdējo %{count} minūšu laikā."
           one: "Mēs sūtīsim jums e-pastu tikai tad, ja nebūsim jūs redzējuši pēdējās minūtes laikā."
-          other: "Mēs sūtīsim jums e-pastu tikai tad, ja nebūsim jūs redzējuši pēdējo {{count}} minūšu laikā."
+          other: "Mēs sūtīsim jums e-pastu tikai tad, ja nebūsim jūs redzējuši pēdējo %{count} minūšu laikā."
       associated_accounts:
         revoke: "Atsaukt"
         cancel: "Atcelt"
@@ -717,9 +716,9 @@ lv:
       username:
         title: "Lietotājvārds"
         instructions: "unikāls, bez atstarpēm, īss"
-        short_instructions: "Cilvēki var pieminēt jūs kā @{{username}}"
+        short_instructions: "Cilvēki var pieminēt jūs kā @%{username}"
         available: "Jūsu lietotājvārds ir pieejams"
-        not_available: "Nav pieejams. Mēģiniet {{suggestion}}?"
+        not_available: "Nav pieejams. Mēģiniet %{suggestion}?"
         not_available_no_suggestion: "Nav pieejams"
         too_short: "Jūsu lietotājvārds ir parāk īss"
         too_long: "Jūsu lietotājvārds ir pārāk garš"
@@ -803,14 +802,14 @@ lv:
         truncated:
           zero: "Nav ielūgumu."
           one: "Pirmais ielūgums."
-          other: "Pirmie {{count}} ielūgumi."
+          other: "Pirmie %{count} ielūgumi."
         redeemed: "Pieņemtie ielūgumi"
         redeemed_tab: "Pieņemti"
-        redeemed_tab_with_count: "Pieņemti ({{count}})"
+        redeemed_tab_with_count: "Pieņemti (%{count})"
         redeemed_at: "Pieņemti"
         pending: "Gaidošie ielūgumi"
         pending_tab: "Gaidošie"
-        pending_tab_with_count: "Gaidošie ({{count}})"
+        pending_tab_with_count: "Gaidošie (%{count})"
         topics_entered: "Apskatītās tēmas"
         posts_read_count: "Izlasītie ieraksti"
         expired: "Šis ielūgums ir izbeidzies."
@@ -824,13 +823,17 @@ lv:
         time_read: "Laiks, ko lasīja"
         days_visited: "Dienas, kurās apmeklēja"
         account_age_days: "Konta vecums dienās"
+        links_tab: "Saites"
+        link_created_at: "Radīts"
+        link_groups: Grupas
         create: "Nosūtīt ielūgumu"
         generate_link: "Kopēt ielūguma saiti"
         link_generated: "Ielūguma saite gatava!"
         valid_for: "Ielūguma saite ir derīga tikai šai e-pasta adresei: %{email}"
+        invite_link:
+          success: "Ielūguma saite gatava!"
         bulk_invite:
           none: "Jūs vēl šeit neesat nevienu ielūdzis. Nosūtiet atsevišķus ielūgumus vai ielūdziet daudzus lietotājus vienlaicīgi,<a href='https://meta.discourse.org/t/send-bulk-invites/16468'> augšupielādējot CSV failu</a>"
-          text: "Ielūgt visus no faila"
           success: "Fails veiksmīgi lejuplādēts, jums paziņos, kad process beidzies."
           error: "Atvainojiet, failam jābūt CSV formātā."
       password:
@@ -914,7 +917,7 @@ lv:
       desc:
         network: "Lūdzu, pārbaudiet jūsu savienojumu."
         network_fixed: "Šķiet, tīkls atkal pieslēgts."
-        server: "Kļūdas kods: {{status}}"
+        server: "Kļūdas kods: %{status}"
         forbidden: "Jums nav pieejas šai lapai."
         not_found: "Upss, aplikācija mēģināja ielādēt saiti, kura neeksistē."
         unknown: "Kaut kas nogāja greizi."
@@ -959,8 +962,8 @@ lv:
       hidden_for_session: "Labi, pajautāšu jums rīt. Starp citu, vienmēr var piereģistrēties, spiežot \"Ieiet sistēmā\"."
     summary:
       enabled_description: "Jūs skatāties šīs tēmas kopsavilkumu: pašus interesantākos ierakstus, pēc kopienas domām."
-      description: "Ir <b>{{replyCount}}</b> atbildes."
-      description_time: "Ir <b>{{replyCount}}</b> atbildes ar paredzamo lasīšanas laiku: <b>{{readingTime}} minūtes</b>."
+      description: "Ir <b>%{replyCount}</b> atbildes."
+      description_time: "Ir <b>%{replyCount}</b> atbildes ar paredzamo lasīšanas laiku: <b>%{readingTime} minūtes</b>."
       enable: "Tēmas kopsavilkums"
       disable: "Parādīt visus ierakstus"
     deleted_filter:
@@ -971,8 +974,8 @@ lv:
     private_message_info:
       title: "Ziņa"
       edit: "Pievienot vai noņemt..."
-      remove_allowed_user: "Vai jūs tiešām gribat dzēst {{name}} no šīs ziņas?"
-      remove_allowed_group: "Vai jūs tiešām gribat dzēst {{name}} no šīs ziņas?"
+      remove_allowed_user: "Vai jūs tiešām gribat dzēst %{name} no šīs ziņas?"
+      remove_allowed_group: "Vai jūs tiešām gribat dzēst %{name} no šīs ziņas?"
     email: "E-pasts"
     username: "Lietotājvārds"
     last_seen: "Redzēts"
@@ -1015,7 +1018,7 @@ lv:
       awaiting_activation: "Jūsu profils gaida aktivizāciju; izmantojiet saiti \"aizmirsu paroli\", lai izsūtītu citu aktivizācijas e-pastu."
       awaiting_approval: "Darbinieki pagaidām nav apstiprinājuši jūsu profilu. Jums nosūtīs e-pastu, kad tas notiks."
       requires_invite: "Atvainojiet, šim forumam var piekļūt tikai ar ielūgumiem."
-      not_activated: "Lai ieietu forumā, nepieciešams aktivizēt jūsu profilu. Mēs nosūtījām uz e-pastu {{sentTo}} instrukcijas, kā to paveikt."
+      not_activated: "Lai ieietu forumā, nepieciešams aktivizēt jūsu profilu. Mēs nosūtījām uz e-pastu %{sentTo} instrukcijas, kā to paveikt."
       not_allowed_from_ip_address: "Jūs nevarat ieiet no šīs IP adreses."
       admin_not_allowed_from_ip_address: "Jūs nevarat ieiet kā administrators no šīs IP adreses."
       resend_activation_email: "Klikšķiniet šeit, lai saņemtu aktivācijas e-pastu atkārtoti."
@@ -1023,7 +1026,7 @@ lv:
       change_email: "Mainīt e-pasta adresi"
       provide_new_email: "Norādiet jaunu adresi, un mēs atkārtoti nosūtīsim jūsu apstiprinājuma e-pastu."
       submit_new_email: "Atjaunināt e-pasta adresi"
-      sent_activation_email_again: "Mēs nosūtijām vēl vienu aktivācijas epastu uz <b>{{currentEmail}}</b>. Tas var pienākt dažu minūšu laikā; atcerieties pārbaudīt jūsu surogātpasta mapi."
+      sent_activation_email_again: "Mēs nosūtijām vēl vienu aktivācijas epastu uz <b>%{currentEmail}</b>. Tas var pienākt dažu minūšu laikā; atcerieties pārbaudīt jūsu surogātpasta mapi."
       to_continue: "Lūdzu ieejiet"
       preferences: "Jums ir jāieiet, lai izmainītu savus iestatījumus."
       forgot: "Es nevaru atcerēties sava konta informāciju."
@@ -1107,18 +1110,18 @@ lv:
       similar_topics: "Jūsu tēma ir līdzīga..."
       drafts_offline: "lokāls melnraksts"
       group_mentioned:
-        zero: "Pieminot {{group}}, neviens nesaņems paziņojumu, jo grupa ir tukša."
-        one: "Pieminot {{group}}, šis cilvēks saņems paziņojumu – esat pārliecināti?"
-        other: "Pieminot {{group}}, šiem <a href='{{group_link}}'>{{count}} cilvēki</a> saņems paziņojumu – esat pārliecināti?"
+        zero: "Pieminot %{group}, neviens nesaņems paziņojumu, jo grupa ir tukša."
+        one: "Pieminot %{group}, šis cilvēks saņems paziņojumu – esat pārliecināti?"
+        other: "Pieminot %{group}, šiem <a href='%{group_link}'>%{count} cilvēki</a> saņems paziņojumu – esat pārliecināti?"
       cannot_see_mention:
-        category: "Jūs pieminējāt {{username}}, kas ir bez piekļuves šai sadaļai un tāpēc nesaņems nekādu paziņojumu. Lai to izlabotu, pievieno viņus grupai ar pieeju šai sadaļai."
-        private: "Jūsu pieminējāt {{username}}, kas neredzēs šo privāto ziņu un tāpēc nesaņems nekādu paziņojumu. Lai to izlabotu, pievieno viņus šai ziņai."
-      duplicate_link: "Izskatās, ka jūsu saiti uz <b>{{domain}}</b> tēmā jau ievietoja <b>@{{username}}</b> <a href='{{post_url}}'>ierakstā {{ago}}</a> - vai jūs tiešām vēlaties to ievietot vēlreiz?"
+        category: "Jūs pieminējāt %{username}, kas ir bez piekļuves šai sadaļai un tāpēc nesaņems nekādu paziņojumu. Lai to izlabotu, pievieno viņus grupai ar pieeju šai sadaļai."
+        private: "Jūsu pieminējāt %{username}, kas neredzēs šo privāto ziņu un tāpēc nesaņems nekādu paziņojumu. Lai to izlabotu, pievieno viņus šai ziņai."
+      duplicate_link: "Izskatās, ka jūsu saiti uz <b>%{domain}</b> tēmā jau ievietoja <b>@%{username}</b> <a href='%{post_url}'>ierakstā %{ago}</a> - vai jūs tiešām vēlaties to ievietot vēlreiz?"
       error:
         title_missing: "Vajadzīgs nosaukums"
-        title_too_short: "Nosaukumā jābūt vismaz {{min}} burtiem"
-        title_too_long: "Nosaukums nevar būt garāks par {{max}} burtiem"
-        post_length: "Ierakstā jābūt vismaz {{min}} burtiem"
+        title_too_short: "Nosaukumā jābūt vismaz %{min} burtiem"
+        title_too_long: "Nosaukums nevar būt garāks par %{max} burtiem"
+        post_length: "Ierakstā jābūt vismaz %{min} burtiem"
         category_missing: "Jums ir jāizvēlas sadaļa"
       save_edit: "Saglabāt izmaiņas"
       reply_original: "Atbildēt sākotnējā tēmā"
@@ -1179,12 +1182,12 @@ lv:
       none: "Pašlaik neizdodas ielādēt paziņojumus."
       empty: "Nav atrasti paziņojumi."
       popup:
-        mentioned: '{{username}} pieminēja jūs "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} pieminēja jūs "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} citēja jūs "{{topic}}" - {{site_title}}'
-        replied: '{{username}} atbildēja jums "{{topic}}" - {{site_title}}'
-        posted: '{{username}} ierakstīja "{{topic}}" - {{site_title}}'
-        linked: '{{username}} ievietoja saiti uz jūsu ierakstu no "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} pieminēja jūs "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} pieminēja jūs "%{topic}" - %{site_title}'
+        quoted: '%{username} citēja jūs "%{topic}" - %{site_title}'
+        replied: '%{username} atbildēja jums "%{topic}" - %{site_title}'
+        posted: '%{username} ierakstīja "%{topic}" - %{site_title}'
+        linked: '%{username} ievietoja saiti uz jūsu ierakstu no "%{topic}" - %{site_title}'
       titles:
         watching_first_post: "Jauna tēma"
     upload_selector:
@@ -1193,9 +1196,9 @@ lv:
       from_my_computer: "No manas ierīces"
       from_the_web: "No interneta"
       remote_tip: "saite uz attēlu"
-      remote_tip_with_attachments: "saite uz attēlu vai failu {{authorized_extensions}}"
+      remote_tip_with_attachments: "saite uz attēlu vai failu %{authorized_extensions}"
       local_tip: "izvēlēties attēlus no jūsu ierīces"
-      local_tip_with_attachments: "izvēlēties attēlus vai failus no jūsu ierīces {{authorized_extensions}}"
+      local_tip_with_attachments: "izvēlēties attēlus vai failus no jūsu ierīces %{authorized_extensions}"
       hint: "(Jūs varat arī augšuplādēt failus, ievelkot tos redaktorā)"
       hint_for_supported_browsers: "Jūs varat arī ievilkt vai ielīmēt redaktorā attēlus"
       uploading: "Augšuplādē"
@@ -1214,13 +1217,13 @@ lv:
       no_results: "Nav rezultātu."
       no_more_results: "Vairāk nav rezultātu."
       searching: "Meklējam..."
-      post_format: "#{{post_number}} - {{username}}"
+      post_format: "#%{post_number} - %{username}"
       more_results: "Ir vēl vairāk rezultātu. Lūdzu precizējiet meklēšanas kritērijus."
       search_google_button: "Google"
       search_google_title: "Meklēt šajā vietnē"
       context:
-        user: "Meklēt ierakstus ar @{{username}}"
-        category: "Meklēt #{{category}} sadaļā"
+        user: "Meklēt ierakstus ar @%{username}"
+        category: "Meklēt #%{category} sadaļā"
         topic: "Meklēt šai tēmā"
         private_messages: "Meklēt ziņās"
       advanced:
@@ -1284,7 +1287,7 @@ lv:
         selected:
           zero: "Jūs izvēlējāties <b>0.</b> tēmas."
           one: "Jūs izvēlējāties <b>%{count}.</b> tēmu."
-          other: "Jūs izvēlējāties <b>{{count}}</b> tēmas."
+          other: "Jūs izvēlējāties <b>%{count}</b> tēmas."
         change_tags: "Aizvietot tagus"
         append_tags: "Pievienot tagus"
         choose_new_tags: "Izvēlēties jaunus tagus šīm tēmām:"
@@ -1297,7 +1300,7 @@ lv:
         posted: "Jūs vel neesat rakstījuši nevienā tēmā."
         latest: "Nav jaunu tēmu. Neraža."
         bookmarks: "Jūs vēl neesat pievienojuši grāmatzīmēm nevienu tēmu."
-        category: "Sadaļā {{category}} nav tēmu."
+        category: "Sadaļā %{category} nav tēmu."
         top: "Nav svarīgu tēmu."
         educate:
           new: '<p>Jūsu jaunās tēmas parādās šeit.</p> <p>Pēc noklusējuma tēmas tiek uzskatītas par jaunām un parādīsies <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">jauns</span> indikators, ja tās tika izveidotas pēdējo 2 dienu laikā.</p> <p>To var izmainīt jūsu <a href="%{userPrefsUrl}">iestatījumos</a>.</p>'
@@ -1308,14 +1311,14 @@ lv:
         read: "Vairāk lasīto tēmu nav. "
         new: "Vairāk jauno tēmu nav. "
         unread: "Vairāk nelasīto tēmu nav. "
-        category: "Vairāk sadaļās {{category}} tēmu nav. "
+        category: "Vairāk sadaļās %{category} tēmu nav. "
         top: "Vairāk svarīgu tēmu nav. "
         bookmarks: "Vairāk grāmatzīmēs ievietoto tēmu nav. "
     topic:
       filter_to:
         zero: "tēmā ziņu nav"
         one: "%{count} ziņa tēmā"
-        other: "{{count}} ziņas tēmā"
+        other: "%{count} ziņas tēmā"
       create: "Jauna tēma"
       create_long: "Izveidot jaunu tēmu "
       private_message: "Rakstīt ziņu "
@@ -1335,11 +1338,11 @@ lv:
       new_topics:
         zero: "Jaunu tēmu nav"
         one: "%{count} jauna tēma"
-        other: "{{count}} jaunas tēmas "
+        other: "%{count} jaunas tēmas "
       unread_topics:
         zero: "Nelasītu tēmu nav"
         one: "%{count} nelasīta tēma"
-        other: "{{count}} nelasītas tēmas"
+        other: "%{count} nelasītas tēmas"
       title: "Tēma"
       invalid_access:
         title: "Šī tēma ir privāta "
@@ -1354,25 +1357,25 @@ lv:
       total_unread_posts:
         zero: "Tev šajā tēmā nav neizlasītu ziņojumu"
         one: "Tev šajā tēmā ir %{count} neizlasīts ziņojums"
-        other: "Tev šajā tēmā ir {{count}} neizlasītu ziņojumu "
+        other: "Tev šajā tēmā ir %{count} neizlasītu ziņojumu "
       unread_posts:
         zero: "Tev šajā tēmā nav vecu neizlasītu ziņojumu"
         one: "Tev šajā tēmā ir %{count} vecs neizlasīts ziņojums"
-        other: "Tev šajā tēmā ir {{count}} vecu neizlasītu ziņojumu. "
+        other: "Tev šajā tēmā ir %{count} vecu neizlasītu ziņojumu. "
       new_posts:
         zero: "Šajā tēmā nav jaunu nelasītu ziņojumu"
         one: "Šajā tēmā ir %{count} jauns nelasīts ziņojums"
-        other: "Šajā tēmā ir {{count}} jauni nelasīti ziņojumi"
+        other: "Šajā tēmā ir %{count} jauni nelasīti ziņojumi"
       likes:
         zero: "Šai tēmai nav \"patīk\""
         one: "Šai tēmai ir viens \"patīk\""
-        other: "Šai tēmā ir {{count}} atzinības"
+        other: "Šai tēmā ir %{count} atzinības"
       back_to_list: "Atpakaļ pie tēmu saraksta "
       options: "Tēmas iestatījumi "
       show_links: "rādīt saites šajā tēmā"
       toggle_information: "rādīt / slēpt tēmas informāciju "
-      read_more_in_category: "Vēlies lasīt vēl? Pārlūko citas tēmas: {{catLink}} vai {{latestLink}}."
-      read_more: "Vēlies lasīt vēl? {{catLink}} or {{latestLink}}."
+      read_more_in_category: "Vēlies lasīt vēl? Pārlūko citas tēmas: %{catLink} vai %{latestLink}."
+      read_more: "Vēlies lasīt vēl? %{catLink} or %{latestLink}."
       read_more_MF: "{ UNREAD, plural, =0 {} one { Palikusi <a href='{basePath}/unread'>1 nelasīta</a> } other { Palikušas <a href='{basePath}/unread'># nelasītas</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 jauna</a> tēma} other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># jaunas</a> tēmas} } remaining, or {CATEGORY, select, true {pārlūkot citas tēmas iekš {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Pārlūkot visas sadaļas
       view_latest_topics: Skatīt jaunākās tēmas
@@ -1522,27 +1525,27 @@ lv:
         success_message: "Jūs veiksmīgi ziņojāt par šo tēmu."
       feature_topic:
         title: "Novietot šo tēmu augšgalā"
-        pin: "Nostiprināt šo tēmu sadaļas {{categoryLink}} augšgalā līdz"
-        confirm_pin: "Jums jau ir {{count}} piespraustas tēmas. Pārāk daudz piespraustu tēmu ir apgrūtinājums jauniem un anonīmiem lietotājiem. Vai jūs esat drošs, ka vēlaties piespraust vēl vienu tēmu šajā sadaļā."
-        unpin: "Noņemt šo tēmu no sadaļas {{categoryLink}} augšgala."
-        unpin_until: "Noņemt šo tēmu no sadaļas {{categoryLink}} augšgala vai gaidīt līdz <strong>%{until}</strong>."
+        pin: "Nostiprināt šo tēmu sadaļas %{categoryLink} augšgalā līdz"
+        confirm_pin: "Jums jau ir %{count} piespraustas tēmas. Pārāk daudz piespraustu tēmu ir apgrūtinājums jauniem un anonīmiem lietotājiem. Vai jūs esat drošs, ka vēlaties piespraust vēl vienu tēmu šajā sadaļā."
+        unpin: "Noņemt šo tēmu no sadaļas %{categoryLink} augšgala."
+        unpin_until: "Noņemt šo tēmu no sadaļas %{categoryLink} augšgala vai gaidīt līdz <strong>%{until}</strong>."
         pin_note: "Lietotāji var atspraust tēmu, katrs sev personīgi."
         pin_validation: "Lai piespraustu šo tēmu, ir nepieciešams datums."
-        not_pinned: "Sadaļā {{categoryLink}} nav piespraustu tēmu."
+        not_pinned: "Sadaļā %{categoryLink} nav piespraustu tēmu."
         already_pinned:
-          zero: "Sadaļā {{categoryLink}} šobrīd nav piespraustu tēmu"
-          one: "Sadaļā {{categoryLink}} šobrīd piesprausta {{count}} tēma"
-          other: "Sadaļā {{categoryLink}} šobrīd piespraustas <strong class='badge badge-notification unread'>{{count}}</strong> tēmas"
+          zero: "Sadaļā %{categoryLink} šobrīd nav piespraustu tēmu"
+          one: "Sadaļā %{categoryLink} šobrīd piesprausta %{count} tēma"
+          other: "Sadaļā %{categoryLink} šobrīd piespraustas <strong class='badge badge-notification unread'>%{count}</strong> tēmas"
         pin_globally: "Likt šai tēmai parādīties visu tēmu sarakstu augšgalos līdz"
-        confirm_pin_globally: "Jums jau ir {{count}} globāli piespraustas tēmas. Pārāk daudz piespraustu tēmu ir apgrūtinājums jauniem un anonīmiem lietotājiem. Vai jūs esat drošs, ka vēlaties globāli piespraust vēl vienu tēmu."
+        confirm_pin_globally: "Jums jau ir %{count} globāli piespraustas tēmas. Pārāk daudz piespraustu tēmu ir apgrūtinājums jauniem un anonīmiem lietotājiem. Vai jūs esat drošs, ka vēlaties globāli piespraust vēl vienu tēmu."
         unpin_globally: "Noņemt šo tēmu no visu tēmu sarakstu augšgaliem."
         unpin_globally_until: "Noņemt šo tēmu no visu tēmu sarakstu augšgaliem vai gaidīt līdz <strong>%{until}</strong>."
         global_pin_note: "Lietotāji var atspraust tēmu, katrs sev personīgi."
         not_pinned_globally: "Nav nevienas globāli piespraustas tēmas."
         already_pinned_globally:
-          zero: "Šobrīd globāli piespraustas <strong class='badge badge-notification unread'>{{count}}</strong> tēmas"
+          zero: "Šobrīd globāli piespraustas <strong class='badge badge-notification unread'>%{count}</strong> tēmas"
           one: "Šobrīd globāli piesprausta <strong class='badge badge-notification unread'>%{count}</strong> tēma"
-          other: "Šobrīd globāli piespraustas <strong class='badge badge-notification unread'>{{count}}</strong> tēmas"
+          other: "Šobrīd globāli piespraustas <strong class='badge badge-notification unread'>%{count}</strong> tēmas"
         make_banner: "Pārveidot šo tēmu par baneri, kas parādīsies visu lapu augšpusē."
         remove_banner: "Noņemt baneri, kas parādās visu lapu augšpusē."
         banner_note: "Lietotāji var noņemt baneri, aizverot to. Jebkurā brīdī tikai viena tēma var būt par baneri."
@@ -1572,16 +1575,16 @@ lv:
         to_topic_username: "Jūs esat ievadījis lietotājvārdu. Mēs nosūtīsim paziņojumu ar saiti, kas ļaus pievienoties šai tēmai."
         to_username: "Ievadiet personas, ko vēlētos ielūgt, lietotājvārdu. Mēs nosūtīsim paziņojumu ar saiti, kas ļaus pievienoties šai tēmai."
         email_placeholder: "vards@piemers.com"
-        success_email: "Mēs nosūtījām ielūguma e-pastu uz <b>{{emailOrUsername}}</b>. Mēs paziņosim jums, kad ielūgums būs izmantots. Pārbaudiet ielūgumu cilni jūsu lietotāja lapā, lai sekotu līdzi savu ielūgumu statusiem."
+        success_email: "Mēs nosūtījām ielūguma e-pastu uz <b>%{emailOrUsername}</b>. Mēs paziņosim jums, kad ielūgums būs izmantots. Pārbaudiet ielūgumu cilni jūsu lietotāja lapā, lai sekotu līdzi savu ielūgumu statusiem."
         success_username: "Mēs ielūdzām šo lietotāju piedalīties šai tēmā."
         error: "Atvainojiet, mēs nevarējām ielūgt šo cilvēku. Varbūt jau ir nosūtīts ielūgums?"
-        success_existing_email: "Jau pastāv lietotājs ar e-pastu <b>{{emailOrUsername}}</b>. Mēs ielūdzām šo lietotāju piedalīties šai tēmā."
+        success_existing_email: "Jau pastāv lietotājs ar e-pastu <b>%{emailOrUsername}</b>. Mēs ielūdzām šo lietotāju piedalīties šai tēmā."
       login_reply: "Lai atbildētu, ienāc forumā"
       filters:
         n_posts:
-          zero: "{{count}} ieraksti"
+          zero: "%{count} ieraksti"
           one: "%{count} ieraksts"
-          other: "{{count}} ieraksti"
+          other: "%{count} ieraksti"
         cancel: "Noņemt filtru"
       split_topic:
         title: "Pārvietot uz jaunu tēmu"
@@ -1591,7 +1594,7 @@ lv:
         instructions:
           zero: "Jūs tūlīt izveidosiet jaunu tēmu bez ierakstiem."
           one: "Jūs tūlīt izveidosiet jaunu tēmu ar izvēlēto ierakstu."
-          other: "Jūs tūlīt izveidosiet jaunu tēmu un aizpildīsiet to ar <b>{{count}}</b> izvēlētajiem ierakstiem."
+          other: "Jūs tūlīt izveidosiet jaunu tēmu un aizpildīsiet to ar <b>%{count}</b> izvēlētajiem ierakstiem."
       merge_topic:
         title: "Pārvietot uz esošu tēmu"
         action: "pārvietot uz esošu tēmu"
@@ -1599,7 +1602,7 @@ lv:
         instructions:
           zero: "Lūdzu izvēlieties tēmu, uz kuru vēlaties pārvietot šos ierakstus."
           one: "Lūdzu izvēlieties tēmu, uz kuru vēlaties pārvietot šo ierakstu."
-          other: "Lūdzu izvēlieties tēmu, uz kuru vēlaties pārvietot šos <b>{{count}}</b> ierakstus."
+          other: "Lūdzu izvēlieties tēmu, uz kuru vēlaties pārvietot šos <b>%{count}</b> ierakstus."
       move_to_new_message:
         radio_label: "Jauns ziņa"
       merge_posts:
@@ -1618,7 +1621,7 @@ lv:
         instructions: "Lūdzu izvēlieties tēmas jauno laika zīmogu. Tēmas ieraksti tiks atjaunināti, ņemot vērā attiecīgo laika starpību."
       multi_select:
         select: "izvēlēties"
-        selected: "izvēlēti ({{count}})"
+        selected: "izvēlēti (%{count})"
         select_post:
           label: "izvēlēties"
         select_replies:
@@ -1630,16 +1633,16 @@ lv:
         description:
           zero: "Jūs esat izvēlējies <b>0</b> ierakstu."
           one: Jūs esat izvēlējies <b>%{count}</b> ierakstu.
-          other: "Jūs esat izvēlējies <b>{{count}}</b> ierakstus."
+          other: "Jūs esat izvēlējies <b>%{count}</b> ierakstus."
     post:
       quote_reply: "Citāts"
       edit_reason: "Iemesls:"
-      post_number: "ieraksts {{number}}"
+      post_number: "ieraksts %{number}"
       wiki_last_edited_on: "wiki pēdējo reizi rediģēta"
       last_edited_on: "ieraksts pēdējo reizi rediģēts"
       reply_as_new_topic: "Atbildēt jaunā saistītā tēmā"
       reply_as_new_private_message: "Atbildēt jaunā vēstulē tiem pašiem adresātiem"
-      continue_discussion: "Turpinot diskusiju no {{postLink}}:"
+      continue_discussion: "Turpinot diskusiju no %{postLink}:"
       follow_quote: "doties uz citēto ierakstu"
       show_full: "Parādīt visu ierakstu"
       deleted_by_author:
@@ -1648,31 +1651,31 @@ lv:
         other: "(autors atcēlis ierakstu, tas tiks automātiski dzēsts pēc %{count} stundām, ja neviens nav ziņojis par to)"
       expand_collapse: "paplašināt/minimizēt"
       gap:
-        zero: "apslēpt {{count}} slēptās atbildes"
+        zero: "apslēpt %{count} slēptās atbildes"
         one: "aplūjot %{count} slēpto atbildi"
-        other: "aplūkot {{count}} slēptās atbildes"
+        other: "aplūkot %{count} slēptās atbildes"
       notice:
-        new_user: "Šis ir pirmais {{user}} ieraksts — sagaidīsim viņu mūsu kopienā!"
+        new_user: "Šis ir pirmais %{user} ieraksts — sagaidīsim viņu mūsu kopienā!"
       unread: "Ieraksts nav lasīts"
       has_replies:
-        zero: "{{count}} atbildes"
-        one: "{{count}} atbilde"
-        other: "{{count}} atbildes"
+        zero: "%{count} atbildes"
+        one: "%{count} atbilde"
+        other: "%{count} atbildes"
       has_likes_title:
-        zero: "{{count}} cilvēkiem patika šis ieraksts"
+        zero: "%{count} cilvēkiem patika šis ieraksts"
         one: "%{count} cilvēkam patika šis ieraksts"
-        other: "{{count}} cilvēkiem patika šis ieraksts"
+        other: "%{count} cilvēkiem patika šis ieraksts"
       has_likes_title_only_you: "jums patika šis ieraksts"
       has_likes_title_you:
         zero: "jums patika šis ieraksts"
         one: "jums un %{count} citam cilvēkam patika šis ieraksts"
-        other: "jums un {{count}} citiem cilvēkiem patika šis ieraksts"
+        other: "jums un %{count} citiem cilvēkiem patika šis ieraksts"
       errors:
         create: "Atvainojiet, izveidojot jūsu ierakstu, notika kļūda. Lūdzu, mēģiniet vēlreiz."
         edit: "Atvainojiet, rediģējot jūsu ierakstu, notika kļūda. Lūdzu, mēģiniet vēlreiz."
         upload: "Atvainojiet, augšuplādējot šo failu, notika kļūda. Lūdzu, mēģiniet vēlreiz."
         too_many_uploads: "Atvainojiet, jūs varat augšuplādēt tikai vienu failu vienā reizē."
-        upload_not_authorized: "Atvainojiet, fails, ko mēģināt augšuplādēt, nav atļauts (atļautie paplašinājumi: {{authorized_extensions}})."
+        upload_not_authorized: "Atvainojiet, fails, ko mēģināt augšuplādēt, nav atļauts (atļautie paplašinājumi: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Atvainojiet, jaunie lietotāji nevar augšuplādēt attēlus."
         attachment_upload_not_allowed_for_new_user: "Atvainojiet, jaunie lietotāji nevar augšuplādēt pielikumus."
         attachment_download_requires_login: "Atvainojiet, jums jābūt ienākušam forumā, lai varētu lejuplādēt pielikumus."
@@ -1740,9 +1743,9 @@ lv:
           like: "Jūs izteicāt atzinību šim"
       merge:
         confirm:
-          zero: "Vai jūs esat drošs, ka vēlaties apvienot šos {{count}} ierakstus?"
+          zero: "Vai jūs esat drošs, ka vēlaties apvienot šos %{count} ierakstus?"
           one: "Vai jūs esat drošs, ka vēlaties apvienot šos ierakstus?"
-          other: "Vai jūs esat drošs, ka vēlaties apvienot šos {{count}} ierakstus?"
+          other: "Vai jūs esat drošs, ka vēlaties apvienot šos %{count} ierakstus?"
       revisions:
         controls:
           first: "Pirmā versija"
@@ -1886,17 +1889,17 @@ lv:
       custom_placeholder_notify_moderators: "Ļaujiet mums uzzināt, kādu problēmu saredzat, un sniedziet būtiskās saites un piemērus, ja iespējams."
       custom_message:
         at_least:
-          zero: "ievadiet vismaz {{count}} simbolus"
+          zero: "ievadiet vismaz %{count} simbolus"
           one: "ievadiet vismaz %{count} simbolu"
-          other: "ievadiet vismaz {{count}} simbolus"
+          other: "ievadiet vismaz %{count} simbolus"
         more:
-          zero: "vēl {{count}}..."
+          zero: "vēl %{count}..."
           one: "vēl %{count}"
-          other: "vēl {{count}}..."
+          other: "vēl %{count}..."
         left:
-          zero: "palikuši {{count}}"
+          zero: "palikuši %{count}"
           one: "palicis %{count}"
-          other: "palikuši {{count}}"
+          other: "palikuši %{count}"
     flagging_topic:
       title: "Paldies, ka palīdzat uzturēt mūsu forumu civilizētu!"
       action: "Ziņot par tēmu"
@@ -1938,7 +1941,7 @@ lv:
       unlisted:
         help: "Šī tēma nav iekļauta sarakstos; tā netiks attēlota tēmu sarakstos, un piekļūt tai varēs, tikai izmantojot tiešu saiti"
     posts: "Ieraksti"
-    posts_long: "šai tēmā ir {{number}} ieraksts"
+    posts_long: "šai tēmā ir %{number} ieraksts"
     posts_likes_MF: |
       Šai tēmā ir {count, plural, one {1 atbilde} other {# atbildes}} {ratio, select,
       low {ar nedaudzām atzinībām}
@@ -1953,16 +1956,16 @@ lv:
       other: "skatījumi"
     replies: "Atbildes"
     views_long:
-      zero: "šo tēmu ir apskatījuši {{number}} reizes"
+      zero: "šo tēmu ir apskatījuši %{number} reizes"
       one: "šo tēmu ir apskatījuši %{count} reizi"
-      other: "šo tēmu ir apskatījuši {{number}} reizes"
+      other: "šo tēmu ir apskatījuši %{number} reizes"
     activity: "Aktivitāte"
     likes: "Patīk"
     likes_lowercase:
       zero: "atzinības"
       one: "atzinība"
       other: "atzinības"
-    likes_long: "šajā tēmā ir {{number}} atzinības"
+    likes_long: "šajā tēmā ir %{number} atzinības"
     users: "Lietotāji"
     users_lowercase:
       zero: "lietotāji"
@@ -1970,7 +1973,7 @@ lv:
       other: "lietotāji"
     category_title: "Sadaļa"
     history: "Vēsture"
-    changed_by: "{{author}}"
+    changed_by: "%{author}"
     raw_email:
       title: "Ienākošie e-pasti"
       not_available: "Nav pieejams!"
@@ -1981,39 +1984,39 @@ lv:
       latest:
         title: "Pēdējie"
         title_with_count:
-          zero: "Pēdējie ({{count}})"
+          zero: "Pēdējie (%{count})"
           one: "Pēdējais (%{count})"
-          other: "Pēdējie ({{count}})"
+          other: "Pēdējie (%{count})"
         help: "tēmas ar neseniem ierakstiem"
       read:
         title: "Lasīts"
         help: "Jūsu lasītās tēmas tajā secībā, kādā lasījāt"
       categories:
         title: "Sadaļas"
-        title_in: "Kategorija - {{categoryName}}"
+        title_in: "Kategorija - %{categoryName}"
         help: "visas tēmas, sagrupētas pēc sadaļām"
       unread:
         title: "Nelasīts"
         title_with_count:
-          zero: "Nelasīti ({{count}})"
+          zero: "Nelasīti (%{count})"
           one: "Nelasīts (%{count})"
-          other: "Nelasīti ({{count}})"
+          other: "Nelasīti (%{count})"
         help: "tēmas, kuras novērojat vai kurām sekojat, ar nelasītiem ierakstiem"
         lower_title_with_count:
-          zero: "{{count}} nelasītas"
+          zero: "%{count} nelasītas"
           one: "%{count} nelasīta"
-          other: "{{count}} nelasītas"
+          other: "%{count} nelasītas"
       new:
         lower_title_with_count:
-          zero: "{{count}} jaunas"
+          zero: "%{count} jaunas"
           one: "%{count} jauna"
-          other: "{{count}} jaunas"
+          other: "%{count} jaunas"
         lower_title: "jaunie"
         title: "Jaunie"
         title_with_count:
-          zero: "Jaunie ({{count}})"
+          zero: "Jaunie (%{count})"
           one: "Jauns (%{count})"
-          other: "Jaunie ({{count}})"
+          other: "Jaunie (%{count})"
         help: "pēdējās dažās dienās izveidotās tēmas"
       posted:
         title: "Mani ieraksti"
@@ -2022,12 +2025,12 @@ lv:
         title: "Grāmatzīmes"
         help: "tēmas, kurās esat veicis grāmatzīmes"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          zero: "{{categoryName}} ({{count}})"
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "pēdējās tēmas sadaļā {{categoryName}}"
+          zero: "%{categoryName} (%{count})"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "pēdējās tēmas sadaļā %{categoryName}"
       top:
         title: "Populārākās"
         help: "visaktīvākās tēmas pēdējā gada, mēneša, nedēļas vai dienas laikā"
@@ -2356,13 +2359,13 @@ lv:
           none: "Nav saistītu notikumu."
           redeliver: "Atkārtot piegādi"
           incoming:
-            zero: "Ir {{count}} jauni notikumi."
+            zero: "Ir %{count} jauni notikumi."
             one: "Ir viens jauns notikums."
-            other: "Ir {{count}} notikumi."
+            other: "Ir %{count} notikumi."
           completed_in:
-            zero: "Pabeigts {{count}} sekundēs."
+            zero: "Pabeigts %{count} sekundēs."
             one: "Pabeigts %{count} sekundē."
-            other: "Pabeigts {{count}} sekundēs."
+            other: "Pabeigts %{count} sekundēs."
           request: "Pieprasījums"
           response: "Atbilde"
           headers: "Virsraksts"
@@ -2409,9 +2412,9 @@ lv:
           label: "Augšupielādēt"
           title: "Augšupielādēt rezerves kopiju uz šo instanci"
           uploading: "Augšupielādē..."
-          error: "Augšupielādējot '{{filename}}', notika kļūda: {{message}}"
+          error: "Augšupielādējot '%{filename}', notika kļūda: %{message}"
         operations:
-          failed: "{{operation}} neizdevās. Lūdzu pārbaudīt žurnāla ierakstus."
+          failed: "%{operation} neizdevās. Lūdzu pārbaudīt žurnāla ierakstus."
           cancel:
             label: "Atcelt"
             title: "Atcelt šī brīža procesu"
@@ -2742,8 +2745,8 @@ lv:
           title: "Atklāt šī lietotāja e-pasta adresi"
           text: "Parādīt"
       user:
-        suspend_failed: "Kaut kas nenostrādāj apturot šo lietotāju {{error}}"
-        unsuspend_failed: "Kaut kas nenostrādāj atjaunojot šo lietotāju {{error}}"
+        suspend_failed: "Kaut kas nenostrādāj apturot šo lietotāju %{error}"
+        unsuspend_failed: "Kaut kas nenostrādāj atjaunojot šo lietotāju %{error}"
         suspend_duration: "Uz cik ilgu laiku lietotājs tiks atstādināts?"
         suspend_reason_label: "Kādēļ apturēt? Šis texts <b>būt redzams visiem</b> šajā lietotāja profila lapā, un tiks rādīts visiem, kas \"ielogojas\"."
         suspend_reason: "Iemesls"
@@ -3036,6 +3039,7 @@ lv:
         title: "Smaidiņi"
         help: "Pievienot jaunu smaidiņu, kas būs pieejams visiem."
         add: "Pievienot Jaunu Smaidiņu"
+        uploading: "Notiek ielāde..."
         name: "Nosaukums"
         group: "Grupa"
         image: "Attēls"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 866f97bec8..0a00bb7bb0 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -23,8 +23,8 @@ nb_NO:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "LT"
       timeline_date: "MMM YYYY"
@@ -218,11 +218,11 @@ nb_NO:
     weekly: "ukentlig"
     every_month: "hver måned"
     every_six_months: "hver sjette måned"
-    max_of_count: "maksimum av {{count}}"
+    max_of_count: "maksimum av %{count}"
     alternation: "eller"
     character_count:
-      one: "{{count}} tegn"
-      other: "{{count}} tegn"
+      one: "%{count} tegn"
+      other: "%{count} tegn"
     related_messages:
       title: "Relaterte meldinger"
       see_all: 'se <a href="%{path}">alle meldinger</a> fra @%{username} …'
@@ -278,14 +278,14 @@ nb_NO:
         yes_value: "Ja"
         no_value: "Nei"
     topic_count_latest:
-      one: "Se {{count}} nytt eller oppdatert emne"
-      other: "Se {{count}} nye eller oppdaterte emner"
+      one: "Se %{count} nytt eller oppdatert emne"
+      other: "Se %{count} nye eller oppdaterte emner"
     topic_count_unread:
-      one: "Se {{count}} ulest emne"
-      other: "Se {{count}} uleste emner"
+      one: "Se %{count} ulest emne"
+      other: "Se %{count} uleste emner"
     topic_count_new:
-      one: "Se {{count}} nytt emne"
-      other: "Se {{count}} nye emner"
+      one: "Se %{count} nytt emne"
+      other: "Se %{count} nye emner"
     preview: "forhåndsvisning"
     cancel: "avbryt"
     save: "Lagre endringer"
@@ -293,7 +293,7 @@ nb_NO:
     saved: "Lagret!"
     upload: "Last opp"
     uploading: "Laster opp…"
-    uploading_filename: "Laster opp {{filename}}"
+    uploading_filename: "Laster opp %{filename}"
     clipboard: "utklippstavle"
     uploaded: "Lastet opp!"
     pasting: "Limer inn…"
@@ -351,7 +351,7 @@ nb_NO:
       view_pending: "vis ventende"
       topic_has_pending:
         one: "Dette emnet har <b>%{count}</b> post som venter på godkjenning"
-        other: "Dette emnet har <b>{{count}}</b> poster som venter på godkjenning"
+        other: "Dette emnet har <b>%{count}</b> poster som venter på godkjenning"
       topic: "Emne:"
       filtered_user: "Bruker"
       show_all_topics: "vis alle emner"
@@ -371,10 +371,10 @@ nb_NO:
         details: "detaljer"
         unique_users:
           one: "%{count} bruker"
-          other: "{{count}} brukere"
+          other: "%{count} brukere"
       replies:
         one: "%{count} svar"
-        other: "{{count}} svar"
+        other: "%{count} svar"
       edit: "Rediger"
       save: "Lagre"
       cancel: "Avbryt"
@@ -403,19 +403,19 @@ nb_NO:
         description: "Vi har mottatt ditt nye innlegg men det krever godkjenning av en moderator før det vises. Ha tålmod."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> opprettet <a href='{{topicUrl}}'>emnet</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Du</a> opprettet <a href='{{topicUrl}}'>emnet</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> besvarte <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Du</a> besvarte <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> svarte på <a href='{{topicUrl}}'>emnet</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Du</a> svarte på <a href='{{topicUrl}}'>emnet</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> nevnte <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> nevnte <a href='{{user2Url}}'>deg</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Du</a> nevnte <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Postet av <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Postet av <a href='{{userUrl}}'>deg</a>"
-      sent_by_user: "Sendt av <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Sendt av <a href='{{userUrl}}'>deg</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> opprettet <a href='%{topicUrl}'>emnet</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Du</a> opprettet <a href='%{topicUrl}'>emnet</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> besvarte <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Du</a> besvarte <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> svarte på <a href='%{topicUrl}'>emnet</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Du</a> svarte på <a href='%{topicUrl}'>emnet</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> nevnte <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> nevnte <a href='%{user2Url}'>deg</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Du</a> nevnte <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Postet av <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Postet av <a href='%{userUrl}'>deg</a>"
+      sent_by_user: "Sendt av <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Sendt av <a href='%{userUrl}'>deg</a>"
     directory:
       filter_name: "filtrer etter brukernavn"
       title: "Brukere"
@@ -628,7 +628,7 @@ nb_NO:
     user_fields:
       none: "(velg et alternativ)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profil"
       mute: "Ignorer"
       edit: "Rediger innstillinger"
@@ -682,12 +682,12 @@ nb_NO:
       external_links_in_new_tab: "Åpne alle eksterne lenker i ny fane"
       enable_quoting: "Aktiver svar med sitat for uthevet tekst"
       change: "Endre"
-      moderator: "{{user}} er en moderator"
-      admin: "{{user}} er en admin"
+      moderator: "%{user} er en moderator"
+      admin: "%{user} er en admin"
       moderator_tooltip: "Denne brukeren er en moderator"
       admin_tooltip: "Denne brukeren er en administrator"
       silenced_tooltip: "Denne brukeren er dempet"
-      suspended_notice: "Denne brukeren er utestengt til {{date}}."
+      suspended_notice: "Denne brukeren er utestengt til %{date}."
       suspended_permanently: "Denne brukeren er utestengt."
       suspended_reason: "Begrunnelse:"
       github_profile: "Github"
@@ -700,7 +700,7 @@ nb_NO:
           Ignorerte emner og kategorier blir ikke inkludert i disse e-postene.
         individual: "Send en e-post for hvert nye innlegg"
         individual_no_echo: "Send en e-post for hvert nye innlegg bortsett fra mine egne"
-        many_per_day: "Send meg en e-post for hvert nye innlegg (rundt {{dailyEmailEstimate}} per deg)"
+        many_per_day: "Send meg en e-post for hvert nye innlegg (rundt %{dailyEmailEstimate} per deg)"
         few_per_day: "Send meg en e-post for hvert nye innlegg (rundt to ganger om dagen)"
         warning: "E-postlistemodus er aktivert. Instillinger for e-postvarslinger blir overstyrt."
       tag_settings: "Stikkord"
@@ -728,7 +728,6 @@ nb_NO:
       admin_delete: "Slett"
       users: "Brukere"
       muted_users: "Ignorert"
-      muted_users_instructions: "Skjul alle varsler fra denne brukeren"
       tracked_topics_link: "Vis"
       automatically_unpin_topics: "Fjern feste for et emne automatisk når jeg når bunnen."
       apps: "Programmer"
@@ -783,7 +782,7 @@ nb_NO:
         copy_to_clipboard: "Kopier til utklippstavle"
         copy_to_clipboard_error: "Feil ved kopiering til utklippstavlen"
         copied_to_clipboard: "Kopiert til utklippstavlen"
-        remaining_codes: "Du har <strong>{{count}}</strong> reservekoder igjen."
+        remaining_codes: "Du har <strong>%{count}</strong> reservekoder igjen."
         codes:
           title: "Reservekoder opprettet"
           description: "Hver av reservekodene kan kun brukes en gang. Oppbevar dem et trygt men tilgjengelig sted."
@@ -833,11 +832,11 @@ nb_NO:
         instructions: "Vises aldri offentlig"
         ok: "Vi sender deg en e-post for å bekrefte"
         invalid: "Oppgi en gyldig e-postadresse"
-        authenticated: "Din e-post har blitt autentisert av {{provider}}"
+        authenticated: "Din e-post har blitt autentisert av %{provider}"
         frequency_immediately: "Vi sender deg umiddelbart en e-post hvis du ikke har lest det vi sender e-post om."
         frequency:
           one: "Vi sender deg bare e-post hvis vi ikke har sett deg deg det siste minuttet."
-          other: "Vi sender deg bare e-post hvis vi ikke har sett deg de siste {{count}} minuttene."
+          other: "Vi sender deg bare e-post hvis vi ikke har sett deg de siste %{count} minuttene."
       associated_accounts:
         title: "Tilknyttede kontoer"
         connect: "Koble til"
@@ -853,9 +852,9 @@ nb_NO:
       username:
         title: "Brukernavn"
         instructions: "unikt, ingen mellomrom, kort"
-        short_instructions: "Folk kan nevne deg som @{{username}}."
+        short_instructions: "Folk kan nevne deg som @%{username}."
         available: "Ditt brukernavn er tilgjengelig."
-        not_available: "Ikke tilgjengelig. Prøv {{suggestion}}?"
+        not_available: "Ikke tilgjengelig. Prøv %{suggestion}?"
         not_available_no_suggestion: "Ikke tilgjengelig"
         too_short: "Ditt brukernavn er for kort."
         too_long: "Ditt brukernavn er for langt."
@@ -935,14 +934,14 @@ nb_NO:
         none: "Ingen invitasjoner å vise."
         truncated:
           one: "Viser den første invitasjonen."
-          other: "Viser de {{count}} første invitisajonene."
+          other: "Viser de %{count} første invitisajonene."
         redeemed: "Løs inn invitasjoner"
         redeemed_tab: "Brukt"
-        redeemed_tab_with_count: "Innløste ({{count}})"
+        redeemed_tab_with_count: "Innløste (%{count})"
         redeemed_at: "Løst inn ved"
         pending: "Ventende invitasjoner"
         pending_tab: "På vent"
-        pending_tab_with_count: "Ventende ({{count}})"
+        pending_tab_with_count: "Ventende (%{count})"
         topics_entered: "Emner vist"
         posts_read_count: "Innlegg lest"
         expired: "Denne invitasjonen har utløpt"
@@ -956,13 +955,17 @@ nb_NO:
         time_read: "Lesetid"
         days_visited: "Dager besøkt"
         account_age_days: "Kontoalder i dager"
-        create: "Send en invitasjon"
+        links_tab: "Lenker"
+        link_created_at: "Opprettet"
+        link_groups: Grupper
+        create: "Send Invitasjon"
         generate_link: "Kopier invitasjonslenke"
         link_generated: "Invitasjonslenke har blitt generert!"
         valid_for: "Invitasjonslenke er kun gyldig for denne e-postadressen: %{email}"
+        invite_link:
+          success: "Invitasjonslenke har blitt generert!"
         bulk_invite:
           none: "Du har ikke invitert noen ennå. Sende enkeltsående invitasjoner, eller inviter mange samtidig ved å <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>laste opp ei CSV-fil</a>."
-          text: "Masseinvitasjon fra fil"
           success: "Filen er lastet opp, du vil motta en melding når prosessesen er ferdig"
           error: "Beklager, fila må være i CSV-format."
       password:
@@ -1052,7 +1055,7 @@ nb_NO:
       desc:
         network: "Sjekk nettverkstilkoblingen din"
         network_fixed: "Ser ut som om den er tilbake."
-        server: "Feilkode: {{status}}"
+        server: "Feilkode: %{status}"
         forbidden: "Du har ikke tilgang til å se det."
         not_found: "Oisann, programmet forsøkte å laste inn en URL som ikke eksisterer."
         unknown: "Noe gikk galt."
@@ -1100,8 +1103,8 @@ nb_NO:
       hidden_for_session: "OK, jeg spør igjen i morgen. Du kan også registrere en konto når du vil!"
     summary:
       enabled_description: "Du ser for øyeblikket en oppsummering av dette emnet: de mest interessante innleggene ifølge brukerne."
-      description: "Det finnes <b>{{replyCount}}</b> svar."
-      description_time: "Det finnes <b>{{replyCount}}</b> svar med en forventet lesetid på <b>{{readingTime}} minutter</b>."
+      description: "Det finnes <b>%{replyCount}</b> svar."
+      description_time: "Det finnes <b>%{replyCount}</b> svar med en forventet lesetid på <b>%{readingTime} minutter</b>."
       enable: "Oppsummer dette emnet"
       disable: "Vis alle innlegg"
     deleted_filter:
@@ -1112,8 +1115,8 @@ nb_NO:
     private_message_info:
       title: "Send"
       leave_message: "Ønsker du virkelig å legge igjen denne meldingen?"
-      remove_allowed_user: "Er du sikker på at du vil fjerne {{name}} fra denne meldingen?"
-      remove_allowed_group: "Vil du virkelig fjerne {{name}} fra denne meldingen?"
+      remove_allowed_user: "Er du sikker på at du vil fjerne %{name} fra denne meldingen?"
+      remove_allowed_group: "Vil du virkelig fjerne %{name} fra denne meldingen?"
     email: "E-post"
     username: "Brukernavn"
     last_seen: "Sett"
@@ -1167,7 +1170,7 @@ nb_NO:
       awaiting_activation: "Din konto avventer aktivering. Bruk lenken for glemt passord for å sende en ny e-post for aktivering."
       awaiting_approval: "Din konto har ikke blitt godkjent av en moderator ennå. Du vil motta en e-post når den er godkjent."
       requires_invite: "Beklager, tilgang til dette forumet kun ved invitasjon."
-      not_activated: "Du kan ikke logge inn ennå. Vi sendte en e-post for aktivering til deg på <b>{{sentTo}}</b>. Følg instruksjonene i den e-posten for å aktivere din konto."
+      not_activated: "Du kan ikke logge inn ennå. Vi sendte en e-post for aktivering til deg på <b>%{sentTo}</b>. Følg instruksjonene i den e-posten for å aktivere din konto."
       not_allowed_from_ip_address: "Du kan ikke logge inn fra den IP-adressen."
       admin_not_allowed_from_ip_address: "Du kan ikke logge inn som administrator fra den IP-adressen."
       resend_activation_email: "Klikk her for å sende e-posten for aktivering igjen."
@@ -1176,7 +1179,7 @@ nb_NO:
       change_email: "Endre e-postadresse"
       provide_new_email: "Oppgi en ny adresse og vi vil sende din aktiverings-e-post på nytt."
       submit_new_email: "Oppdater e-postadresse"
-      sent_activation_email_again: "Vi sendte deg en ny aktiverings-e-post på <b>{{currentEmail}}</b>. Det kan ta noen minutter før den kommer frem; ikke glem å sjekke søppelpostmappen."
+      sent_activation_email_again: "Vi sendte deg en ny aktiverings-e-post på <b>%{currentEmail}</b>. Det kan ta noen minutter før den kommer frem; ikke glem å sjekke søppelpostmappen."
       to_continue: "Logg inn"
       preferences: "Du må være innlogget for å endre brukerinnstillinger."
       forgot: "I husker ikke mine kontodetaljer"
@@ -1231,13 +1234,13 @@ nb_NO:
       default_header_text: Velg…
       no_content: Ingen treff funnet
       filter_placeholder: Søk…
-      create: "Opprett: {{content}}"
+      create: "Opprett: %{content}"
       max_content_reached:
-        one: "Du kan kun velge {{count}} gjenstand."
-        other: "Du kan kun velge {{count}} gjenstander."
+        one: "Du kan kun velge %{count} gjenstand."
+        other: "Du kan kun velge %{count} gjenstander."
       min_content_not_reached:
-        one: "Velg minst {{count}} element."
-        other: "Velg minst {{count}} elementer."
+        one: "Velg minst %{count} element."
+        other: "Velg minst %{count} elementer."
     date_time_picker:
       from: Fra
       to: Til
@@ -1255,7 +1258,7 @@ nb_NO:
       default: Egendefinerte emoji-er
     shared_drafts:
       title: "Delte kladder"
-      notice: "Dette emnet er kun synlig for dem som kan se <b>{{category}}</b>-kategorien."
+      notice: "Dette emnet er kun synlig for dem som kan se <b>%{category}</b>-kategorien."
       destination_category: "Målkategori"
       publish: "Publiser delt kladd"
       confirm_publish: "Er du sikker på at du vil publisere denne kladden?"
@@ -1270,26 +1273,26 @@ nb_NO:
       add_warning: "Dette er en offisiell advarsel."
       toggle_whisper: "Slå på/av hvisking"
       toggle_unlisted: "Skjul eller gjør synlig"
-      posting_not_on_topic: "Du svarer på emnet \"{{title}}\", men for øyeblikket ser du på et annet emne."
+      posting_not_on_topic: "Du svarer på emnet \"%{title}\", men for øyeblikket ser du på et annet emne."
       saved_local_draft_tip: "lagret lokalt"
       similar_topics: "Emnet ditt har likheter med…"
       drafts_offline: "utkast offline"
-      group_mentioned_limit: "<b>Warning!</b> Du varslet <a href='{{group_link}}'>{{group}}</a>, dog har denne gruppen flere medlemmer en administratoren har satt opp som grense for varseling, {{max}} brukere. Ingen vil bli varslet."
+      group_mentioned_limit: "<b>Warning!</b> Du varslet <a href='%{group_link}'>%{group}</a>, dog har denne gruppen flere medlemmer en administratoren har satt opp som grense for varseling, %{max} brukere. Ingen vil bli varslet."
       group_mentioned:
-        one: "Ved å nevne {{group}}, er du i ferd med å henvende deg til <a href='{{group_link}}'>{{count}} én person</a> – er du sikker?"
-        other: "Ved å nevne {{group}}, er du i ferd med å henvende deg til <a href='{{group_link}}'>{{count}} folk</a> – er du sikker?"
+        one: "Ved å nevne %{group}, er du i ferd med å henvende deg til <a href='%{group_link}'>%{count} én person</a> – er du sikker?"
+        other: "Ved å nevne %{group}, er du i ferd med å henvende deg til <a href='%{group_link}'>%{count} folk</a> – er du sikker?"
       cannot_see_mention:
-        category: "Du nevnte {{username}}, men de vil ikke ikke bli varslet fordi de ikke har tilgang til denne kategorien. Du må legge dem til en gruppe som har tilgang til denne kategorien."
-        private: "Du nevnte {{username}}, men de vil ikke bli varslet fordi de ikke kan se denne samtalen. Du må invitere dem til denne private samtalen."
-      duplicate_link: "Det ser ut til at lenken din til <b>{{domain}}</b> allerede ble publisert i emnet av <b>@{{username}}</b> i <a href='{{post_url}}'>et svar {{ago}}</a>. Er du sikker på at du vil publisere den igjen?"
+        category: "Du nevnte %{username}, men de vil ikke ikke bli varslet fordi de ikke har tilgang til denne kategorien. Du må legge dem til en gruppe som har tilgang til denne kategorien."
+        private: "Du nevnte %{username}, men de vil ikke bli varslet fordi de ikke kan se denne samtalen. Du må invitere dem til denne private samtalen."
+      duplicate_link: "Det ser ut til at lenken din til <b>%{domain}</b> allerede ble publisert i emnet av <b>@%{username}</b> i <a href='%{post_url}'>et svar %{ago}</a>. Er du sikker på at du vil publisere den igjen?"
       error:
         title_missing: "Tittel er påkrevd"
-        title_too_short: "Tittel må være på minst {{min}} tegn"
-        title_too_long: "Tittel kan ikke være mer enn {{max}} tegn"
-        post_length: "Innlegget må være på minst {{min}} tegn"
-        try_like: "Har du prøvd {{heart}}-knappen?"
+        title_too_short: "Tittel må være på minst %{min} tegn"
+        title_too_long: "Tittel kan ikke være mer enn %{max} tegn"
+        post_length: "Innlegget må være på minst %{min} tegn"
+        try_like: "Har du prøvd %{heart}-knappen?"
         category_missing: "Du må velge en kategori"
-        tags_missing: "Du må velge minst {{count}} stikkord"
+        tags_missing: "Du må velge minst %{count} stikkord"
       save_edit: "Lagre endring"
       reply_original: "Svar på det opprinnelige emnet"
       reply_here: "Svar her"
@@ -1377,46 +1380,46 @@ nb_NO:
       tooltip:
         regular:
           one: "Én usett merknad"
-          other: "{{count}} usette merknader"
+          other: "%{count} usette merknader"
         message:
           one: "Én ulest melding"
-          other: "{{count}} uleste meldinger"
+          other: "%{count} uleste meldinger"
       title: "varsler om at @navnet ditt blir nevnt, svar på dine innlegg og emner, meldinger, osv"
       none: "Notifikasjoner er ikke tilgjengelig for øyeblikket."
       empty: "Ingen varsler funnet."
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} og én annen</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} og {{count}} andre</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}}"
-      invitee_accepted: "<span>{{username}}</span> godtok din invitasjon"
-      moved_post: "<span>{{username}}</span> flyttet {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Gjorde seg fortjent til '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Nytt emne</span> {{description}}"
+        one: "<span>%{username}, %{username2} og én annen</span> %{description}"
+        other: "<span>%{username}, %{username2} og %{count} andre</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}"
+      invitee_accepted: "<span>%{username}</span> godtok din invitasjon"
+      moved_post: "<span>%{username}</span> flyttet %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Gjorde seg fortjent til '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Nytt emne</span> %{description}"
       group_message_summary:
-        one: "{{count}} melding i din {{group_name}} innboks"
-        other: "{{count}} meldinger i din innboks for {{group_name}}"
+        one: "%{count} melding i din %{group_name} innboks"
+        other: "%{count} meldinger i din innboks for %{group_name}"
       popup:
-        mentioned: '{{username}} nevnte deg i "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} nevnte deg i "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} siterte deg i "{{topic}}" - {{site_title}}'
-        replied: '{{username}} svarte deg i "{{topic}}" - {{site_title}}'
-        posted: '{{username}} skrev noe i "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} sendte deg en personlig melding i "{{topic}}" - {{site_title}}'
-        linked: '{{username}} lenket til innlegget ditt i "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} nevnte deg i "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} nevnte deg i "%{topic}" - %{site_title}'
+        quoted: '%{username} siterte deg i "%{topic}" - %{site_title}'
+        replied: '%{username} svarte deg i "%{topic}" - %{site_title}'
+        posted: '%{username} skrev noe i "%{topic}" - %{site_title}'
+        private_message: '%{username} sendte deg en personlig melding i "%{topic}" - %{site_title}'
+        linked: '%{username} lenket til innlegget ditt i "%{topic}" - %{site_title}'
         confirm_title: "Varslinger aktivert - %{site_title}"
         confirm_body: "Suksess! Varslinger er nå aktivert."
       titles:
@@ -1428,9 +1431,9 @@ nb_NO:
       from_my_computer: "Fra min enhet"
       from_the_web: "Fra nettet"
       remote_tip: "lenke til bilde"
-      remote_tip_with_attachments: "lenke til bilde eller fil {{authorized_extensions}}"
+      remote_tip_with_attachments: "lenke til bilde eller fil %{authorized_extensions}"
       local_tip: "velg bilder fra din enhet"
-      local_tip_with_attachments: "velg bilde eller fil fra din enhet {{authorized_extensions}}"
+      local_tip_with_attachments: "velg bilde eller fil fra din enhet %{authorized_extensions}"
       hint: "(du kan også dra og slippe inn i tekstbehandleren for å laste dem opp)"
       hint_for_supported_browsers: "du kan også dra og slippe eller lime inn bilder i tekstbehandleren"
       uploading: "Laster opp bilde"
@@ -1447,15 +1450,15 @@ nb_NO:
       clear_all: "Fjern Alle"
       too_short: "Din søketekst er for kort."
       result_count:
-        one: "<span>%{count} resultat for</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} resultater for</span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} resultat for</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} resultater for</span><span class='term'>%{term}</span>"
       title: "søk etter emner, innlegg, brukere eller kategorier"
       full_page_title: "søk etter emner eller innlegg"
       no_results: "Ingen resultater funnet."
       no_more_results: "Ingen flere resultater funnet."
       searching: "Søker…"
-      post_format: "#{{post_number}} av {{username}}"
-      results_page: "Søkeresultater for \"{{term}}\""
+      post_format: "#%{post_number} av %{username}"
+      results_page: "Søkeresultater for \"%{term}\""
       more_results: "Det finnes flere resultater. Begrens søket ditt."
       cant_find: "Finner du ikke det du leter etter?"
       start_new_topic: "Kanskje du kan starte et nytt emne?"
@@ -1464,8 +1467,8 @@ nb_NO:
       search_google_button: "Google"
       search_google_title: "Søk på denne siden"
       context:
-        user: "Søk i innleggene av @{{username}}"
-        category: "Søk i kategorien #{{category}}"
+        user: "Søk i innleggene av @%{username}"
+        category: "Søk i kategorien #%{category}"
         topic: "Søk i dette emnet"
         private_messages: "Søk i meldinger"
       advanced:
@@ -1539,7 +1542,7 @@ nb_NO:
         choose_new_category: "Velg den nye kategorien for emnene:"
         selected:
           one: "Du har valgt <b>%{count}</b> emne."
-          other: "Du har valgt <b>{{count}}</b> emner."
+          other: "Du har valgt <b>%{count}</b> emner."
         change_tags: "Erstatt stikkord"
         append_tags: "Legg til stikkord"
         choose_new_tags: "Velg nye stikkord for følgende emner:"
@@ -1552,7 +1555,7 @@ nb_NO:
         posted: "Du har ikke skrevet innlegg i noen emner enda."
         latest: "Det finnes ingen siste emner. Det er sørgelig."
         bookmarks: "Du har ingen bokmerkede emner enda."
-        category: "Det finnes ingen {{category}}-emner."
+        category: "Det finnes ingen %{category}-emner."
         top: "Det finnes ingen populære emner."
         educate:
           new: '<p>Dine nye emner vil vises her.</p><p>Som forvalg anses emner som nye og viser en<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">ny</span>-indikator hvis de be opprettet i løpet av de siste 2 dagene.</p><p>Gå til <a href="%{userPrefsUrl}">innstillinger</a> for å endre dette.</p>'
@@ -1563,13 +1566,13 @@ nb_NO:
         read: "Det finnes ingen flere leste emner."
         new: "Det finnes ingen flere nye emner."
         unread: "Det finnes ingen flere uleste emner."
-        category: "Det finnes ingen {{category}}-emner igjen."
+        category: "Det finnes ingen %{category}-emner igjen."
         top: "Det finnes ingen flere populære emner."
         bookmarks: "Det finnes ingen flere bokmerkede emner."
     topic:
       filter_to:
         one: "%{count} innlegg i emnet"
-        other: "{{count}} innlegg i emnet"
+        other: "%{count} innlegg i emnet"
       create: "Nytt emne"
       create_long: "Opprett et nytt emne"
       open_draft: "Åpne utkast"
@@ -1590,10 +1593,10 @@ nb_NO:
       unread: "ulest"
       new_topics:
         one: "Ett nytt emne"
-        other: "{{count}} nye emner"
+        other: "%{count} nye emner"
       unread_topics:
         one: "Ett ulest emne"
-        other: "{{count}} uleste emner"
+        other: "%{count} uleste emner"
       title: "Emne"
       invalid_access:
         title: "Emnet er privat"
@@ -1607,22 +1610,22 @@ nb_NO:
         description: "Beklager, vi kunne ikke finne det emnet. Kanskje det ble fjernet av en moderator?"
       total_unread_posts:
         one: "du har %{count} ulest innlegg i dette emnet"
-        other: "du har {{count}} uleste innlegg i dette emnet"
+        other: "du har %{count} uleste innlegg i dette emnet"
       unread_posts:
         one: "du har %{count} ulest gammelt innlegg i dette emnet"
-        other: "du har {{count}} uleste gamle innlegg i dette emnet"
+        other: "du har %{count} uleste gamle innlegg i dette emnet"
       new_posts:
         one: "det er %{count} nytt innlegg i dette emnet siden sist du leste det"
-        other: "det er {{count}} nye innlegg i dette emnet siden sist du leste det"
+        other: "det er %{count} nye innlegg i dette emnet siden sist du leste det"
       likes:
         one: "det er én like i dette emnet"
-        other: "det er {{number}} likes i dette emnet"
+        other: "det er %{number} likes i dette emnet"
       back_to_list: "Tilbake til Listen over Emner"
       options: "Valg for emner"
       show_links: "vis lenker i dette emnet"
       toggle_information: "vis/skjul detaljer for emnet"
-      read_more_in_category: "Vil du lese mer? Les andre emner i {{catLink}} eller {{latestLink}}."
-      read_more: "Vil du lese mer? {{catLink}} eller {{latestLink}}."
+      read_more_in_category: "Vil du lese mer? Les andre emner i %{catLink} eller %{latestLink}."
+      read_more: "Vil du lese mer? %{catLink} eller %{latestLink}."
       read_more_MF: "Det { UNREAD, plural, =0 {} one { er <a href='{basePath}/unread'>1 ulest</a> } other { finnes <a href='{basePath}/unread'># uleste</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{og } false {finnes } other{}} <a href='{basePath}/new'>1 nytt</a> emne} other { {BOTH, select, true{og } false {er } other{}} <a href='{basePath}/new'># nye</a> emner} } igjen, eller {CATEGORY, select, true {se andre emner i {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Se alle kategorier
       view_latest_topics: se siste emner
@@ -1786,25 +1789,25 @@ nb_NO:
         success_message: "Du har rapportert dette emnet."
       feature_topic:
         title: "Fremhev denne emnet"
-        pin: "La dette emnet vises øverst i {{categoryLink}}-kategorien frem til"
-        confirm_pin: "Du har allerede {{count}} festede emner. For mange festede emner kan være slitsomt for nye og anonyme brukere. Er du sikker på at du ønsker å feste enda et emne i denne kategorien?"
-        unpin: "Fjern dette emnet fra toppen av {{categoryLink}}-kategorien."
-        unpin_until: "Fjern dette emnet fra toppen av {{categoryLink}}-kategorien, eller vent til <strong>%{until}</strong>."
+        pin: "La dette emnet vises øverst i %{categoryLink}-kategorien frem til"
+        confirm_pin: "Du har allerede %{count} festede emner. For mange festede emner kan være slitsomt for nye og anonyme brukere. Er du sikker på at du ønsker å feste enda et emne i denne kategorien?"
+        unpin: "Fjern dette emnet fra toppen av %{categoryLink}-kategorien."
+        unpin_until: "Fjern dette emnet fra toppen av %{categoryLink}-kategorien, eller vent til <strong>%{until}</strong>."
         pin_note: "Brukere kan fjerne festet for emnet individuelt for seg selv."
         pin_validation: "En dato kreves for å feste dette emnet."
-        not_pinned: "Det finnes ingen festede emner i {{categoryLink}}."
+        not_pinned: "Det finnes ingen festede emner i %{categoryLink}."
         already_pinned:
-          one: "Emner som er festet i {{categoryLink}} for øyeblikket: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Emner som er festet i {{categoryLink}} for øyeblikket: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Emner som er festet i %{categoryLink} for øyeblikket: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Emner som er festet i %{categoryLink} for øyeblikket: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "La dette emnet vises øverst i alle listene over emner inntil"
-        confirm_pin_globally: "Du har allerede {{count}} globalt festede emner. For mange festede emner kan være slitsomt for nye og anonyme brukere. Er du sikker på at du vil feste enda et emne globalt? "
+        confirm_pin_globally: "Du har allerede %{count} globalt festede emner. For mange festede emner kan være slitsomt for nye og anonyme brukere. Er du sikker på at du vil feste enda et emne globalt? "
         unpin_globally: "Fjern dette emnet fra toppen av alle lister over emner."
         unpin_globally_until: "Fjern dette emnet fra toppen av alle lister over emner eller vent til <strong>%{until}</strong>."
         global_pin_note: "Brukere kan fjerne festet for emnet individuelt for seg selv."
         not_pinned_globally: "Det finnes ingen globalt festede emner."
         already_pinned_globally:
           one: "Emner som er festet globalt for øyeblikket: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Emner som er festet globalt for øyeblikket: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Emner som er festet globalt for øyeblikket: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Gjør dette emnet til et banner som vises øverst på alle sider."
         remove_banner: "Fjern banneret som vises øverst alle sider. "
         banner_note: "Brukere kan fjerne banneret ved å lukke det. Kun ett emne kan være valgt som banner av gangen."
@@ -1834,15 +1837,15 @@ nb_NO:
         to_topic_username: "Du har oppgitt et brukernavn. Vi sender et varsel med en lenke som inviterer dem til dette emnet."
         to_username: "Oppgi brukernavnet til personen du ønsker å invitere. Vi sender et varsel med en lenke som inviterer vedkommende til dette emnet."
         email_placeholder: "navn@example.com"
-        success_email: "Vi har sendt ut en invitasjon til <b>{{emailOrUsername}}</b>. Vi varsler deg når invitasjonen er godtatt. Sjekk invitiasjonsfanen på brukersiden din for å beholde oversikten over invitasjonene dine."
+        success_email: "Vi har sendt ut en invitasjon til <b>%{emailOrUsername}</b>. Vi varsler deg når invitasjonen er godtatt. Sjekk invitiasjonsfanen på brukersiden din for å beholde oversikten over invitasjonene dine."
         success_username: "Vi har invitert den valgte brukeren til å delta i dette emnet."
         error: "Beklager, vi kunne ikke invitere den brukeren. Vedkommende har muligens allerede blitt invitert? (Antall invitasjoner er begrenset)"
-        success_existing_email: "En bruker med e-postadressen <b>{{emailOrUsername}}</b> finnes allerede. Vi har invitert brukeren til å delta i dette emnet."
+        success_existing_email: "En bruker med e-postadressen <b>%{emailOrUsername}</b> finnes allerede. Vi har invitert brukeren til å delta i dette emnet."
       login_reply: "Logg Inn for å svare"
       filters:
         n_posts:
           one: "%{count} innlegg"
-          other: "{{count}} innlegg"
+          other: "%{count} innlegg"
         cancel: "Fjern filter"
       split_topic:
         title: "Flytt til nytt emne"
@@ -1851,14 +1854,14 @@ nb_NO:
         error: "Det oppstod en feil ved flytting av innlegg til det nye emnet."
         instructions:
           one: "Du er i ferd med å opprette et nytt emne basert på innlegget du har valgt.."
-          other: "Du er i ferd med å opprette et nytt emne og fylle det med de <b>{{count}}</b> innleggene du har valgt."
+          other: "Du er i ferd med å opprette et nytt emne og fylle det med de <b>%{count}</b> innleggene du har valgt."
       merge_topic:
         title: "Flytt til eksisterende emne"
         action: "flytt til eksisterende emne"
         error: "Det oppstod en feil ved flytting av innlegg til det valgte emnet."
         instructions:
           one: "Velg emnet du vil flytte dette innlegget til."
-          other: "Velg emnet du vil flytte de <b>{{count}}</b> innleggene til."
+          other: "Velg emnet du vil flytte de <b>%{count}</b> innleggene til."
       move_to_new_message:
         radio_label: "Ny Melding"
       merge_posts:
@@ -1877,7 +1880,7 @@ nb_NO:
         instructions: "Vennligst velg det nye tidsstempelet for emnet. Innlegg i emnet blir oppdatert med samme tidsforskjell."
       multi_select:
         select: "velg"
-        selected: "valgte ({{count}})"
+        selected: "valgte (%{count})"
         select_post:
           label: "velg"
           title: "Legg til innlegg i utvalg"
@@ -1896,16 +1899,16 @@ nb_NO:
         deselect_all: fjern alle
         description:
           one: Du har valgt <b>%{count}</b> innlegg.
-          other: "Du har valgt <b>{{count}}</b> innlegg."
+          other: "Du har valgt <b>%{count}</b> innlegg."
     post:
       quote_reply: "Sitat"
       edit_reason: "Begrunnelse:"
-      post_number: "innlegg {{number}}"
+      post_number: "innlegg %{number}"
       wiki_last_edited_on: "wikien sist redigert"
       last_edited_on: "innlegg sist redigert"
       reply_as_new_topic: "Svar med lenket mne"
       reply_as_new_private_message: "Svar som ny melding til de samme mottakerne"
-      continue_discussion: "Fortsetter diskusjonen fra {{postLink}}:"
+      continue_discussion: "Fortsetter diskusjonen fra %{postLink}:"
       follow_quote: "gå til det siterte innlegget"
       show_full: "Vis hele innlegget"
       deleted_by_author:
@@ -1916,24 +1919,24 @@ nb_NO:
       locked: "et stabsmedlem har låst dette innlegget fra å bli endret"
       gap:
         one: "vis %{count} skjult svar"
-        other: "vis {{count}} skjulte svar"
+        other: "vis %{count} skjulte svar"
       unread: "Innlegget er ulest"
       has_replies:
-        one: "{{count}} svar"
-        other: "{{count}} svar"
+        one: "%{count} svar"
+        other: "%{count} svar"
       has_likes_title:
-        one: "{{count}} bruker likte dette innlegget"
-        other: "{{count}} brukere likte dette innlegget"
+        one: "%{count} bruker likte dette innlegget"
+        other: "%{count} brukere likte dette innlegget"
       has_likes_title_only_you: "du likte dette innlegget"
       has_likes_title_you:
         one: "du og %{count} annen bruker likte dette innlegget"
-        other: "du og {{count}} andre likte dette innlegget"
+        other: "du og %{count} andre likte dette innlegget"
       errors:
         create: "Beklager, det oppstod en feil ved å publisere ditt innlegg. Prøv igjen."
         edit: "Det oppstod en feil ved redigeringen av ditt innlegg. Prøv igjen."
         upload: "Det skjedde en feil når filen ble lastet opp. Prøv igjen senere. "
         too_many_uploads: "Du kan bare laste opp ett bilde av gangen."
-        upload_not_authorized: "Beklager, filen du forsøket å laste opp er ikke tillatt. Tillatte filendelser er {{authorized_extensions}}."
+        upload_not_authorized: "Beklager, filen du forsøket å laste opp er ikke tillatt. Tillatte filendelser er %{authorized_extensions}."
         image_upload_not_allowed_for_new_user: "Beklager, nye brukere kan ikke laste opp bilder"
         attachment_upload_not_allowed_for_new_user: "Beklager, nye brukere kan ikke laste opp vedlegg."
         attachment_download_requires_login: "Beklager, du må være innlogget for å laste ned vedlegg."
@@ -1968,10 +1971,10 @@ nb_NO:
           confirm: "Ønsker du å slette svarene på dette innlegget?"
           direct_replies:
             one: "Ja, og ett direkte svar"
-            other: "Ja, og {{count}} direkte svar"
+            other: "Ja, og %{count} direkte svar"
           all_replies:
             one: "Ja, og ett svar"
-            other: "Ja, og alle {{count}} svar"
+            other: "Ja, og alle %{count} svar"
           just_the_post: "Nei, kun dette innlegget"
         admin: "Innleggsadministrasjon"
         wiki: "Opprett wiki"
@@ -2008,8 +2011,8 @@ nb_NO:
           notify_user: "sendte en melding"
           bookmark: "bokmerket dette"
           like_capped:
-            one: "og {{count}} annen likte dette"
-            other: "og {{count}} andre likte dette"
+            one: "og %{count} annen likte dette"
+            other: "og %{count} andre likte dette"
         by_you:
           off_topic: "Du rapporterte dette som utenfor temaet"
           spam: "Du rapporterte dette som spam"
@@ -2021,11 +2024,11 @@ nb_NO:
       delete:
         confirm:
           one: "Er du sikker på at du ønsker å slette dette innlegget?"
-          other: "Er du sikker på at du ønsker å slette de {{count}} innleggene?"
+          other: "Er du sikker på at du ønsker å slette de %{count} innleggene?"
       merge:
         confirm:
           one: "Er du sikker på at du vil flette disse postene?"
-          other: "Er du sikker på at du vil flette de {{count}} innleggene?"
+          other: "Er du sikker på at du vil flette de %{count} innleggene?"
       revisions:
         controls:
           first: "Første versjon"
@@ -2192,13 +2195,13 @@ nb_NO:
       custom_message:
         at_least:
           one: "skriv inn minst ett tegn"
-          other: "skriv inn minst {{count}} tegn"
+          other: "skriv inn minst %{count} tegn"
         more:
           one: "Én igjen…"
-          other: "{{count}} igjen…"
+          other: "%{count} igjen…"
         left:
           one: "ett gjenstående"
-          other: "{{count}} gjenstående"
+          other: "%{count} gjenstående"
     flagging_topic:
       title: "Takk for at du hjelper med å vedlikeholde god skikk i samfundet vårt!"
       action: "Rapporter mne"
@@ -2239,7 +2242,7 @@ nb_NO:
       unlisted:
         help: "Dette emnet er ikke synlig; det vil ikke vises i lister over emner, og er kun tilgjengelig via en direkte lenke"
     posts: "Innlegg"
-    posts_long: "det er {{number}} innlegg i dette emnet"
+    posts_long: "det er %{number} innlegg i dette emnet"
     posts_likes_MF: |
       Dette emnet har {count, plural, one {1 svar} other {# svar}} {ratio, select,
       low {med mange likes i forhold til innlegg}
@@ -2254,20 +2257,20 @@ nb_NO:
     replies: "Svar"
     views_long:
       one: "dette emnet er lest %{count} gang"
-      other: "dette emnet er lest {{number}} ganger"
+      other: "dette emnet er lest %{number} ganger"
     activity: "Aktivitet"
     likes: "Likes"
     likes_lowercase:
       one: "like"
       other: "likes"
-    likes_long: "det finnes {{number}} likes i dette emnet"
+    likes_long: "det finnes %{number} likes i dette emnet"
     users: "Deltakere"
     users_lowercase:
       one: "bruker"
       other: "brukere"
     category_title: "Kategori"
     history: "Historie"
-    changed_by: "av {{author}}"
+    changed_by: "av %{author}"
     raw_email:
       title: "Innkommende e-post"
       not_available: "Ikke tilgjengelig!"
@@ -2279,33 +2282,33 @@ nb_NO:
         title: "Siste"
         title_with_count:
           one: "Siste (%{count})"
-          other: "Siste ({{count}})"
+          other: "Siste (%{count})"
         help: "emner med nylige innlegg"
       read:
         title: "Lest"
         help: "emner du har lest, i den rekkefølgen du sist leste dem"
       categories:
         title: "Kategorier"
-        title_in: "Kategori - {{categoryName}}"
+        title_in: "Kategori - %{categoryName}"
         help: "alle emner sortert etter kategori"
       unread:
         title: "Uleste"
         title_with_count:
           one: "Ulest (%{count})"
-          other: "Ulest ({{count}})"
+          other: "Ulest (%{count})"
         help: "emner du følger eller overvåker for øyeblikket, med uleste innlegg"
         lower_title_with_count:
           one: "%{count} ulest"
-          other: "{{count}} uleste"
+          other: "%{count} uleste"
       new:
         lower_title_with_count:
           one: "%{count} ny"
-          other: "{{count}} nye"
+          other: "%{count} nye"
         lower_title: "ny"
         title: "Nye"
         title_with_count:
           one: "Nye (%{count})"
-          other: "Nye ({{count}})"
+          other: "Nye (%{count})"
         help: "emner opprettet de siste dagene"
       posted:
         title: "Mine innlegg"
@@ -2314,11 +2317,11 @@ nb_NO:
         title: "Bokmerker"
         help: "emner du har bokmerket"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "siste emner i {{categoryName}}-kategorien"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "siste emner i %{categoryName}-kategorien"
       top:
         title: "Aktive"
         help: "de mest aktive emnene det siste året, den siste måneden, uken eller dagen "
@@ -2446,7 +2449,7 @@ nb_NO:
       delete_tag: "Slett stikkord"
       delete_confirm:
         one: "Er du sikker på at du ønsker å slette dette stikkordet og fjerne det fra emnet det er tilknyttet?"
-        other: "Er du sikker på at du ønsker å slette dette stikkordet og fjerne det fra {{count}} emner som er tilknyttet det?"
+        other: "Er du sikker på at du ønsker å slette dette stikkordet og fjerne det fra %{count} emner som er tilknyttet det?"
       delete_confirm_no_topics: "Er du sikker på at du ønsker å slette dette stikkordet?"
       rename_tag: "Gi stikkord nytt navn"
       rename_instructions: "Velg et nytt navn for dette stikkordet:"
@@ -2734,10 +2737,10 @@ nb_NO:
           redeliver: "Send på nytt"
           incoming:
             one: "Det finnes en ny hendelse."
-            other: "Det finnes {{count}} nye hendelser."
+            other: "Det finnes %{count} nye hendelser."
           completed_in:
             one: "Ferdig på %{count} sekund."
-            other: "Ferdig på {{count}} sekunder."
+            other: "Ferdig på %{count} sekunder."
           request: "Forespørsel"
           response: "Svar"
           redeliver_confirm: "Er du sikker på at du vil sende samme payload på nytt?"
@@ -2789,11 +2792,11 @@ nb_NO:
           label: "Last opp"
           title: "Last opp en sikkerhetskopi til denne instansen"
           uploading: "Laster opp…"
-          success: "Opplastingen av '{{filename}}' var vellykket. Filen blir nå bearbeidet og det vil ta opp til et minutt før den dukker opp i listen."
-          error: "Det oppstod en feil ved opplastingen av '{{filename}}': {{message}}"
+          success: "Opplastingen av '%{filename}' var vellykket. Filen blir nå bearbeidet og det vil ta opp til et minutt før den dukker opp i listen."
+          error: "Det oppstod en feil ved opplastingen av '%{filename}': %{message}"
         operations:
           is_running: "En prosess pågår…"
-          failed: " {{operation}} mislyktes. Undersøk loggene."
+          failed: " %{operation} mislyktes. Undersøk loggene."
           cancel:
             label: "Avbryt"
             title: "Avbryt den nåværende handlingen"
@@ -2912,7 +2915,7 @@ nb_NO:
           no_settings: "Denne drakten har ingen innstillinger."
           commits_behind:
             one: "Drakten er én utgave foreldet!"
-            other: "Drakten er {{count}} utgaver foreldet!"
+            other: "Drakten er %{count} utgaver foreldet!"
           scss:
             text: "CSS"
             title: "Skriv inn egendefinert CSS, alle gyldige CSS- og SCSS-stiler godtas"
@@ -3252,8 +3255,8 @@ nb_NO:
           title: "Vis denne brukerens e-postadresse"
           text: "Vis"
       user:
-        suspend_failed: "Noe gikk galt ved utestenging av denne brukeren {{error}}"
-        unsuspend_failed: "Noe gikk galt ved opphevelse av utestenging av denne brukeren {{error}}"
+        suspend_failed: "Noe gikk galt ved utestenging av denne brukeren %{error}"
+        unsuspend_failed: "Noe gikk galt ved opphevelse av utestenging av denne brukeren %{error}"
         suspend_duration: "Hvor lenge skal brukeren være utestengt? (dager)"
         suspend_reason_label: "Hvorfor stenger du ute brukeren? Denne teksten <b>vil være synlig for alle</b> på denne brukerens profilside og vil bli vist til brukeren når vedkommende forsøker å logge inn. Fatt deg i korthet."
         suspend_reason_hidden_label: "Hvorfor stenger du ute brukeren? Denne teksten vil bli vist til brukeren når vedkommende prøver å logge inn. Fatt deg i korthet."
@@ -3582,6 +3585,7 @@ nb_NO:
         title: "Emoji"
         help: "Legg til en ny emoji som vil være tilgjengelig for alle. (PROFFTIPS: Dra og slipp flere filer samtidig)"
         add: "Legg til ny Emoji"
+        uploading: "Laster opp…"
         name: "Navn"
         group: "Gruppe"
         image: "Bilde"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 54ea8be60e..14615a4794 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -23,8 +23,8 @@ nl:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "HH:mm"
       time_with_zone: "HH:mm (z)"
@@ -227,11 +227,11 @@ nl:
     weekly: "wekelijks"
     every_month: "elke maand"
     every_six_months: "elke zes maanden"
-    max_of_count: "maximaal {{count}}"
+    max_of_count: "maximaal %{count}"
     alternation: "of"
     character_count:
-      one: "{{count}} teken"
-      other: "{{count}} tekens"
+      one: "%{count} teken"
+      other: "%{count} tekens"
     related_messages:
       title: "Gerelateerde berichten"
       see_all: '<a href="%{path}">Alle berichten</a> van @%{username}bekijken...'
@@ -306,14 +306,14 @@ nl:
         yes_value: "Ja, afbreken"
         no_value: "Nee, behouden"
     topic_count_latest:
-      one: "{{count}} nieuw of bijgewerkt topic bekijken"
-      other: "{{count}} nieuwe of bijgewerkte topics bekijken"
+      one: "%{count} nieuw of bijgewerkt topic bekijken"
+      other: "%{count} nieuwe of bijgewerkte topics bekijken"
     topic_count_unread:
-      one: "{{count}} ongelezen topic bekijken"
-      other: "{{count}} ongelezen topics bekijken"
+      one: "%{count} ongelezen topic bekijken"
+      other: "%{count} ongelezen topics bekijken"
     topic_count_new:
-      one: "{{count}} nieuw topic bekijken"
-      other: "{{count}} nieuwe topics bekijken"
+      one: "%{count} nieuw topic bekijken"
+      other: "%{count} nieuwe topics bekijken"
     preview: "voorbeeld"
     cancel: "annuleren"
     save: "Wijzigingen opslaan"
@@ -321,7 +321,7 @@ nl:
     saved: "Opgeslagen!"
     upload: "Uploaden"
     uploading: "Uploaden..."
-    uploading_filename: "Uploaden: {{filename}}..."
+    uploading_filename: "Uploaden: %{filename}..."
     clipboard: "klembord"
     uploaded: "Geüpload!"
     pasting: "Plakken..."
@@ -375,7 +375,7 @@ nl:
         optional: "U kunt dit item opeisen om te voorkomen dat anderen het beoordelen."
         required: "U moet items opeisen voordat u ze kunt beoordelen."
         claimed_by_you: "U hebt dit item opgeëist en kunt het beoordelen."
-        claimed_by_other: "Dit item kan alleen worden beoordeeld door <b>{{username}}</b>."
+        claimed_by_other: "Dit item kan alleen worden beoordeeld door <b>%{username}</b>."
       claim:
         title: "dit topic opeisen"
       unclaim:
@@ -395,7 +395,7 @@ nl:
       view_pending: "wachtende bekijken"
       topic_has_pending:
         one: "Dit topic heeft <b>%{count}</b> bericht dat op goedkeuring wacht"
-        other: "Dit topic heeft <b>{{count}}</b> berichten die op goedkeuring wachten"
+        other: "Dit topic heeft <b>%{count}</b> berichten die op goedkeuring wachten"
       title: "Beoordelen"
       topic: "Topic:"
       filtered_topic: "U hebt op beoordeelbare inhoud in één topic gefilterd."
@@ -412,17 +412,17 @@ nl:
         fields: "Velden"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} totale markering)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} totale markeringen)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} totale markering)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} totale markeringen)"
         agreed:
-          one: "{{count}}% akkoord"
-          other: "{{count}}% akkoord"
+          one: "%{count}% akkoord"
+          other: "%{count}% akkoord"
         disagreed:
-          one: "{{count}}% niet akkoord"
-          other: "{{count}}% niet akkoord"
+          one: "%{count}% niet akkoord"
+          other: "%{count}% niet akkoord"
         ignored:
-          one: "{{count}}% genegeerd"
-          other: "{{count}}% genegeerd"
+          one: "%{count}% genegeerd"
+          other: "%{count}% genegeerd"
       topics:
         topic: "Topic"
         reviewable_count: "Aantal"
@@ -432,10 +432,10 @@ nl:
         details: "details"
         unique_users:
           one: "%{count} gebruiker"
-          other: "{{count}} gebruikers"
+          other: "%{count} gebruikers"
       replies:
         one: "%{count} antwoord"
-        other: "{{count}} antwoorden"
+        other: "%{count} antwoorden"
       edit: "Bewerken"
       save: "Opslaan"
       cancel: "Annuleren"
@@ -499,22 +499,22 @@ nl:
         description: "We hebben uw nieuwe bericht ontvangen, maar dit moet eerst door een moderator worden goedgekeurd voordat het zichtbaar wordt. Heb geduld."
         pending_posts:
           one: "U hebt <strong>%{count}</strong> wachtend bericht."
-          other: "U hebt <strong>{{count}}</strong> wachtende berichten."
+          other: "U hebt <strong>%{count}</strong> wachtende berichten."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> heeft <a href='{{topicUrl}}'>het topic</a> geplaatst"
-      you_posted_topic: "<a href='{{userUrl}}'>U</a> hebt <a href='{{topicUrl}}'>het topic</a> geplaatst"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> heeft op <a href='{{postUrl}}'>{{post_number}}</a> geantwoord"
-      you_replied_to_post: "<a href='{{userUrl}}'>U</a> hebt op <a href='{{postUrl}}'>{{post_number}}</a> geantwoord"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> heeft op <a href='{{topicUrl}}'>het topic</a> geantwoord"
-      you_replied_to_topic: "<a href='{{userUrl}}'>U</a> hebt op <a href='{{topicUrl}}'>het topic</a> geantwoord"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> heeft <a href='{{user2Url}}'>{{another_user}}</a> genoemd"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> heeft <a href='{{user2Url}}'>u</a> genoemd"
-      you_mentioned_user: "<a href='{{user1Url}}'>U</a> hebt <a href='{{user2Url}}'>{{another_user}}</a> genoemd"
-      posted_by_user: "Geplaatst door <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Geplaatst door <a href='{{userUrl}}'>u</a>"
-      sent_by_user: "Verzonden door <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Verzonden door <a href='{{userUrl}}'>u</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> heeft <a href='%{topicUrl}'>het topic</a> geplaatst"
+      you_posted_topic: "<a href='%{userUrl}'>U</a> hebt <a href='%{topicUrl}'>het topic</a> geplaatst"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> heeft op <a href='%{postUrl}'>%{post_number}</a> geantwoord"
+      you_replied_to_post: "<a href='%{userUrl}'>U</a> hebt op <a href='%{postUrl}'>%{post_number}</a> geantwoord"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> heeft op <a href='%{topicUrl}'>het topic</a> geantwoord"
+      you_replied_to_topic: "<a href='%{userUrl}'>U</a> hebt op <a href='%{topicUrl}'>het topic</a> geantwoord"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> heeft <a href='%{user2Url}'>%{another_user}</a> genoemd"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> heeft <a href='%{user2Url}'>u</a> genoemd"
+      you_mentioned_user: "<a href='%{user1Url}'>U</a> hebt <a href='%{user2Url}'>%{another_user}</a> genoemd"
+      posted_by_user: "Geplaatst door <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Geplaatst door <a href='%{userUrl}'>u</a>"
+      sent_by_user: "Verzonden door <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Verzonden door <a href='%{userUrl}'>u</a>"
     directory:
       filter_name: "filteren op gebruikersnaam"
       title: "Gebruikers"
@@ -710,7 +710,7 @@ nl:
       category: "Categorie"
       category_list: "Categorielijst weergeven"
       reorder:
-        title: "Categorieën herschikken "
+        title: "Categorieën herschikken"
         title_long: "De categorielijst opnieuw ordenen"
         save: "Volgorde opslaan"
         apply_all: "Toepassen"
@@ -752,7 +752,7 @@ nl:
       none: "(selecteer een optie)"
       required: 'Voer een waarde in voor ''%{name}'''
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profiel"
       mute: "Negeren"
       edit: "Voorkeuren bewerken"
@@ -828,12 +828,12 @@ nl:
       enable_defer: "Negeren voor markeren van topics als ongelezen inschakelen"
       change: "wijzigen"
       featured_topic: "Aanbevolen topic"
-      moderator: "{{user}} is een moderator"
-      admin: "{{user}} is een beheerder"
+      moderator: "%{user} is een moderator"
+      admin: "%{user} is een beheerder"
       moderator_tooltip: "Deze gebruiker is een moderator"
       admin_tooltip: "Deze gebruiker is een beheerder"
       silenced_tooltip: "Deze gebruiker is gedempt"
-      suspended_notice: "Deze gebruiker is geschorst tot {{date}}."
+      suspended_notice: "Deze gebruiker is geschorst tot %{date}."
       suspended_permanently: "Deze gebruiker is geschorst."
       suspended_reason: "Reden: "
       github_profile: "Github"
@@ -846,7 +846,7 @@ nl:
           Genegeerde topics en categorieën zijn niet in deze e-mails inbegrepen.
         individual: "Een e-mail voor elk nieuw bericht verzenden"
         individual_no_echo: "Een e-mail voor elk nieuw bericht verzenden, behalve die van mezelf"
-        many_per_day: "Mij een e-mail voor elk nieuw bericht sturen (ongeveer {{dailyEmailEstimate}} per dag)"
+        many_per_day: "Mij een e-mail voor elk nieuw bericht sturen (ongeveer %{dailyEmailEstimate} per dag)"
         few_per_day: "Mij een e-mail voor elk nieuw bericht sturen (ongeveer 2 per dag)"
         warning: "Mailinglijstmodus ingeschakeld. E-mailmeldingsinstellingen worden genegeerd."
       tag_settings: "Tags"
@@ -876,9 +876,9 @@ nl:
       admin_delete: "Verwijderen"
       users: "Gebruikers"
       muted_users: "Genegeerd"
-      muted_users_instructions: "Alle meldingen van deze gebruikers onderdrukken"
+      muted_users_instructions: "Alle meldingen en PB's van deze gebruikers onderdrukken."
       ignored_users: "Genegeerd"
-      ignored_users_instructions: "Alle berichten en meldingen van deze gebruikers onderdrukken."
+      ignored_users_instructions: "Alle berichten, meldingen en PB's van deze gebruikers onderdrukken."
       tracked_topics_link: "Tonen"
       automatically_unpin_topics: "Topics automatisch losmaken als ik de onderkant bereik"
       apps: "Apps"
@@ -930,16 +930,16 @@ nl:
         choose: "Kies een wachtwoord"
       second_factor_backup:
         title: "Twee-factor-back-upcodes"
-        regenerate: "Hergenereren "
+        regenerate: "Opnieuw genereren"
         disable: "Uitschakelen"
         enable: "Inschakelen"
         enable_long: "Back-upcodes inschakelen"
-        manage: "Back-upcodes beheren. U hebt <strong>{{count}}</strong> back-upcodes over."
+        manage: "Back-upcodes beheren. U hebt <strong>%{count}</strong> back-upcodes over."
         copy_to_clipboard: "Kopiëren naar klembord"
         copy_to_clipboard_error: "Fout bij kopiëren van gegevens naar klembord"
         copied_to_clipboard: "Gekopieerd naar klembord"
         download_backup_codes: "Back-upcodes downloaden"
-        remaining_codes: "U hebt <strong>{{count}}</strong> back-upcodes over."
+        remaining_codes: "U hebt <strong>%{count}</strong> back-upcodes over."
         use: "Een back-upcode gebruiken"
         enable_prerequisites: "U moet een primaire tweede factor inschakelen voordat u back-upcodes genereert."
         codes:
@@ -1004,10 +1004,10 @@ nl:
         success_staff: "Er is een e-mail naar uw huidige adres verzonden. Volg de bevestigingsinstructies."
       change_avatar:
         title: "Uw profielafbeelding wijzigen"
-        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, gebaseerd op"
-        gravatar_title: "Wijzig uw avatar op de website van {{gravatarName}}"
-        gravatar_failed: "We konden geen {{gravatarName}} voor dat e-mailadres vinden."
-        refresh_gravatar_title: "Uw {{gravatarName}} vernieuwen"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, gebaseerd op"
+        gravatar_title: "Wijzig uw avatar op de website van %{gravatarName}"
+        gravatar_failed: "We konden geen %{gravatarName} voor dat e-mailadres vinden."
+        refresh_gravatar_title: "Uw %{gravatarName} vernieuwen"
         letter_based: "Door systeem toegekende profielafbeelding"
         uploaded_avatar: "Eigen afbeelding"
         uploaded_avatar_empty: "Een eigen afbeelding toevoegen"
@@ -1031,12 +1031,12 @@ nl:
         instructions: "Nooit openbaar zichtbaar."
         ok: "We sturen een e-mail ter bevestiging"
         required: "Voer een e-mailadres in"
-        invalid: "Voer een geldig e-mailadres in "
-        authenticated: "Uw e-mailadres is geauthenticeerd door {{provider}}"
+        invalid: "Voer een geldig e-mailadres in"
+        authenticated: "Uw e-mailadres is geauthenticeerd door %{provider}"
         frequency_immediately: "Als u de inhoud in kwestie nog niet hebt gelezen, sturen we u direct een e-mail."
         frequency:
           one: "We sturen alleen een e-mail als we u de laatste minuut niet hebben gezien."
-          other: "We sturen alleen een e-mail als we u de laatste {{count}} minuten niet hebben gezien."
+          other: "We sturen alleen een e-mail als we u de laatste %{count} minuten niet hebben gezien."
       associated_accounts:
         title: "Gekoppelde accounts"
         connect: "Verbinden"
@@ -1057,9 +1057,9 @@ nl:
       username:
         title: "Gebruikersnaam"
         instructions: "uniek, geen spaties, kort"
-        short_instructions: "Mensen kunnen u vermelden als @{{username}}"
+        short_instructions: "Mensen kunnen u vermelden als @%{username}"
         available: "Uw gebruikersnaam is beschikbaar"
-        not_available: "Niet beschikbaar. {{suggestion}} proberen?"
+        not_available: "Niet beschikbaar. %{suggestion} proberen?"
         not_available_no_suggestion: "Niet beschikbaar"
         too_short: "Uw gebruikersnaam is te kort"
         too_long: "Uw gebruikersnaam is te lang"
@@ -1083,11 +1083,11 @@ nl:
         log_out_all: "Alles afmelden"
         active: "nu actief"
         not_you: "Niet u?"
-        show_all: "Alles tonen ({{count}})"
+        show_all: "Alles tonen (%{count})"
         show_few: "Minder tonen"
         was_this_you: "Was u dit?"
         was_this_you_description: "Als u dit niet was, raden we aan om uw wachtwoord te wijzigen en u overal af te melden."
-        browser_and_device: "{{browser}} op {{device}}"
+        browser_and_device: "%{browser} op %{device}"
         secure_account: "Mijn account beveiligen"
         latest_post: "Uw laatste bericht..."
       last_posted: "Laatste bericht"
@@ -1167,20 +1167,20 @@ nl:
         none: "Geen uitnodigingen om weer te geven."
         truncated:
           one: "De eerste uitnodiging wordt getoond."
-          other: "De eerste {{count}} uitnodigingen worden getoond."
+          other: "De eerste %{count} uitnodigingen worden getoond."
         redeemed: "Verzilverde uitnodigingen"
         redeemed_tab: "Verzilverd"
-        redeemed_tab_with_count: "Verzilverd ({{count}})"
+        redeemed_tab_with_count: "Verzilverd (%{count})"
         redeemed_at: "Verzilverd"
         pending: "Uitstaande uitnodigingen"
         pending_tab: "Uitstaand"
-        pending_tab_with_count: "Uitstaand ({{count}})"
+        pending_tab_with_count: "Uitstaand (%{count})"
         topics_entered: "Topics bekeken"
         posts_read_count: "Berichten gelezen"
         expired: "Deze uitnodiging is verlopen."
         rescind: "Verwijderen"
         rescinded: "Uitnodiging verwijderd"
-        rescind_all: "Alle verlopen uitnodigingen verwijderen"
+        rescind_all: "Verlopen uitnodigingen verwijderen"
         rescinded_all: "Alle verlopen uitnodigingen verwijderd!"
         rescind_all_confirm: "Weet u zeker dat u alle verlopen uitnodigingen wilt verwijderen?"
         reinvite: "Uitnodiging opnieuw versturen"
@@ -1191,13 +1191,30 @@ nl:
         time_read: "Leestijd"
         days_visited: "Dagen bezocht"
         account_age_days: "Leeftijd van account in dagen"
-        create: "Een uitnodiging versturen"
+        source: "Uitgenodigd via"
+        links_tab: "Koppelingen"
+        links_tab_with_count: "Koppelingen (%{count})"
+        link_url: "Koppeling"
+        link_created_at: "Gemaakt"
+        link_redemption_stats: "Inwisselingen"
+        link_groups: Groepen
+        link_expires_at: Verloopt
+        create: "Uitnodiging sturen"
+        copy_link: "Koppeling kopiëren"
         generate_link: "Uitnodigingskoppeling kopiëren"
         link_generated: "Uitnodigingskoppeling is aangemaakt!"
         valid_for: "De uitnodigingskoppeling is alleen geldig voor dit e-mailadres: %{email}"
+        single_user: "Enkele gebruiker"
+        multiple_user: "Meerdere gebruikers"
+        invite_link:
+          title: "Uitnodigingskoppeling"
+          success: "Uitnodigingskoppeling is aangemaakt!"
+          error: "Er is een fout opgetreden bij het genereren van de uitnodigingskoppeling"
+          max_redemptions_allowed_label: "Hoeveel mensen mogen zich via deze koppeling registreren?"
+          expires_at: "Wanneer verloopt deze uitnodigingskoppeling?"
         bulk_invite:
           none: "U hebt hier nog niemand uitgenodigd. Stuur individuele uitnodigingen of nodig meerdere mensen tegelijk uit door <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>een CSV-bestand te uploaden</a>."
-          text: "Bulkuitnodiging vanuit bestand"
+          text: "Bulkuitnodiging"
           success: "Het bestand is geüpload. U ontvangt een melding via een bericht zodra het proces is voltooid."
           error: "Sorry, bestand dient de CSV-indeling te hebben."
           confirmation_message: "U gaat uitnodigingen naar iedereen in het geüploade bestand e-mailen"
@@ -1289,7 +1306,7 @@ nl:
       desc:
         network: "Controleer uw verbinding."
         network_fixed: "De verbinding lijkt te zijn hersteld."
-        server: "Foutcode: {{status}}"
+        server: "Foutcode: %{status}"
         forbidden: "U mag dat niet bekijken."
         not_found: "Oeps, de toepassing heeft geprobeerd een URL te laden die niet bestaat."
         unknown: "Er is iets misgegaan."
@@ -1352,8 +1369,8 @@ nl:
       value_prop: "Als u een account aanmaakt, houden we precies bij wat u hebt gelezen, zodat u altijd kunt verdergaan waar u was gebleven. Ook ontvangt u meldingen bij nieuwe berichten zodra iemand antwoordt, hier en via e-mail, en kunt u berichten liken om uw passie te delen. :heartpulse:"
     summary:
       enabled_description: "U bekijkt een samenvatting van dit topic: de meeste interessante berichten zoals bepaald door de gemeenschap."
-      description: "Er zijn <b>{{replyCount}}</b> antwoorden."
-      description_time: "Er zijn <b>{{replyCount}}</b> antwoorden met een geschatte leestijd van <b>{{readingTime}} minuten</b>."
+      description: "Er zijn <b>%{replyCount}</b> antwoorden."
+      description_time: "Er zijn <b>%{replyCount}</b> antwoorden met een geschatte leestijd van <b>%{readingTime} minuten</b>."
       enable: "Dit topic samenvatten"
       disable: "Alle berichten tonen"
     deleted_filter:
@@ -1366,8 +1383,8 @@ nl:
       invite: "Anderen uitnodigen ..."
       edit: "Toevoegen of verwijderen ..."
       leave_message: "Weet u zeker dat u dit bericht wilt verlaten?"
-      remove_allowed_user: "Wilt u {{naam}} echt uit dit bericht verwijderen?"
-      remove_allowed_group: "Wilt u {{name}} echt uit dit bericht verwijderen?"
+      remove_allowed_user: "Wilt u %{name} echt uit dit bericht verwijderen?"
+      remove_allowed_group: "Wilt u %{name} echt uit dit bericht verwijderen?"
     email: "E-mailadres"
     username: "Gebruikersnaam"
     last_seen: "Gezien"
@@ -1376,7 +1393,7 @@ nl:
     trust_level: "Vertrouwensniveau"
     search_hint: "gebruikersnaam, e-mailadres of IP-adres"
     create_account:
-      disclaimer: "Door te registreren gaat u akkoord met het <a href='{{privacy_link}}' target='blank'>privacybeleid</a> en de <a href='{{tos_link}}' target='blank'>servicevoorwaarden</a>."
+      disclaimer: "Door te registreren gaat u akkoord met het <a href='%{privacy_link}' target='blank'>privacybeleid</a> en de <a href='%{tos_link}' target='blank'>servicevoorwaarden</a>."
       title: "Nieuwe account maken"
       failed: "Er is iets misgegaan; mogelijk is het e-mailadres al geregistreerd. Probeer de koppeling 'Wachtwoord vergeten'."
     forgot_password:
@@ -1436,7 +1453,7 @@ nl:
       awaiting_activation: "Uw account wacht op activering; gebruik de koppeling 'Wachtwoord vergeten' om een nieuwe activeringsmail te ontvangen."
       awaiting_approval: "Uw account is nog niet door een staflid goedgekeurd. U ontvangt een e-mail zodra dat is gebeurd."
       requires_invite: "Sorry, toegang tot dit forum werkt alleen via uitnodiging."
-      not_activated: "U kunt zich nog niet aanmelden. We hebben een activeringsmail naar <b>{{sentTo}}</b> gestuurd. Volg de instructies in dat e-mailbericht om uw account te activeren."
+      not_activated: "U kunt zich nog niet aanmelden. We hebben een activeringsmail naar <b>%{sentTo}</b> gestuurd. Volg de instructies in dat e-mailbericht om uw account te activeren."
       not_allowed_from_ip_address: "U kunt zich niet aanmelden vanaf dat IP-adres."
       admin_not_allowed_from_ip_address: "U kunt zich niet aanmelden als beheerder vanaf dat IP-adres."
       resend_activation_email: "Klik hier om de activeringsmail opnieuw te versturen."
@@ -1445,7 +1462,7 @@ nl:
       change_email: "E-mailadres wijzigen"
       provide_new_email: "Geef een nieuw adres op en we sturen uw bevestigingsmail opnieuw."
       submit_new_email: "E-mailadres bijwerken"
-      sent_activation_email_again: "We hebben een nieuwe activeringsmail naar <b>{{currentEmail}}</b> gestuurd. Het kan een aantal minuten duren voor deze aankomt; controleer ook uw spammap."
+      sent_activation_email_again: "We hebben een nieuwe activeringsmail naar <b>%{currentEmail}</b> gestuurd. Het kan een aantal minuten duren voor deze aankomt; controleer ook uw spammap."
       sent_activation_email_again_generic: "We hebben nog een activeringsmail gestuurd. Het kan een aantal minuten duren voordat deze aankomt; controleer ook uw spammap."
       to_continue: "Meld u aan"
       preferences: "U dient aangemeld te zijn om uw gebruikersvoorkeuren te wijzigen."
@@ -1509,20 +1526,20 @@ nl:
     conditional_loading_section:
       loading: Laden...
     category_row:
-      topic_count: "{{count}} topics in deze categorie"
+      topic_count: "%{count} topics in deze categorie"
     select_kit:
       default_header_text: Selecteren...
       no_content: Geen overeenkomsten gevonden
       filter_placeholder: Zoeken...
       filter_placeholder_with_any: Zoeken of aanmaken...
-      create: "Aanmaken: '{{content}}'"
+      create: "Aanmaken: '%{content}'"
       max_content_reached:
-        one: "U kunt maar {{count}} item selecteren."
-        other: "U kunt maar {{count}} items selecteren."
+        one: "U kunt maar %{count} item selecteren."
+        other: "U kunt maar %{count} items selecteren."
       min_content_not_reached:
-        one: "Selecteer minstens {{count}} item."
-        other: "Selecteer minstens {{count}} items."
-      invalid_selection_length: "Selectie moet minstens {{count}} tekens bevatten."
+        one: "Selecteer minstens %{count} item."
+        other: "Selecteer minstens %{count} items."
+      invalid_selection_length: "Selectie moet minstens %{count} tekens bevatten."
     date_time_picker:
       from: Van
       to: Aan
@@ -1549,7 +1566,7 @@ nl:
       default: Eigen emoji
     shared_drafts:
       title: "Gedeelde concepten"
-      notice: "Dit topic is alleen zichtbaar voor degenen die de categorie <b>{{category}}</b> kunnen zien."
+      notice: "Dit topic is alleen zichtbaar voor degenen die de categorie <b>%{category}</b> kunnen zien."
       destination_category: "Bestemmingscategorie"
       publish: "Gedeeld concept publiceren"
       confirm_publish: "Weet u zeker dat u dit concept wilt publiceren?"
@@ -1569,24 +1586,24 @@ nl:
       similar_topics: "Uw topic lijkt op..."
       drafts_offline: "concepten offline"
       edit_conflict: "bewerkingsconflict"
-      group_mentioned_limit: "<b>Waarschuwing!</b> U hebt <a href='{{group_link}}'>{{group}}</a> genoemd, maar deze groep heeft meer leden dan de door een beheerder geconfigureerde limiet van {{max}} gebruikers voor noemen. Niemand krijgt een melding. "
+      group_mentioned_limit: "<b>Waarschuwing!</b> U hebt <a href='%{group_link}'>%{group}</a> genoemd, maar deze groep heeft meer leden dan de door een beheerder geconfigureerde limiet van %{max} gebruikers voor noemen. Niemand krijgt een melding."
       group_mentioned:
-        one: "Door {{group}} te vermelden, gaat u <a href='{{group_link}}'>%{count} persoon</a> op de hoogte brengen – weet u dit zeker?"
-        other: "Door {{group}} te vermelden, gaat u <a href='{{group_link}}'>{{count}} personen</a> op de hoogte brengen – weet u dit zeker?"
+        one: "Door %{group} te vermelden, gaat u <a href='%{group_link}'>%{count} persoon</a> op de hoogte brengen – weet u dit zeker?"
+        other: "Door %{group} te vermelden, gaat u <a href='%{group_link}'>%{count} personen</a> op de hoogte brengen – weet u dit zeker?"
       cannot_see_mention:
-        category: "U hebt {{username}} genoemd, maar de gebruiker ontvangt geen melding, omdat hij of zij geen toegang heeft tot deze categorie. U dient de gebruiker toe te voegen aan een groep die toegang heeft tot deze categorie."
-        private: "U hebt {{username}} genoemd, maar de gebruiker ontvangt geen melding, omdat hij of zij dit persoonlijke bericht niet kan zien. U dient de gebruiker voor dit PB uit te nodigen."
-      duplicate_link: "Het lijkt erop dat uw koppeling naar <b>{{domain}}</b> al in het topic is geplaatst door <b>@{{username}}</b> in <a href='{{post_url}}'>een antwoord op {{ago}}</a> – weet u zeker dat u deze opnieuw wilt plaatsen?"
-      reference_topic_title: "RE: {{title}}"
+        category: "U hebt %{username} genoemd, maar de gebruiker ontvangt geen melding, omdat hij of zij geen toegang heeft tot deze categorie. U dient de gebruiker toe te voegen aan een groep die toegang heeft tot deze categorie."
+        private: "U hebt %{username} genoemd, maar de gebruiker ontvangt geen melding, omdat hij of zij dit persoonlijke bericht niet kan zien. U dient de gebruiker voor dit PB uit te nodigen."
+      duplicate_link: "Het lijkt erop dat uw koppeling naar <b>%{domain}</b> al in het topic is geplaatst door <b>@%{username}</b> in <a href='%{post_url}'>een antwoord op %{ago}</a> – weet u zeker dat u deze opnieuw wilt plaatsen?"
+      reference_topic_title: "RE: %{title}"
       error:
         title_missing: "Titel is vereist"
-        title_too_short: "Titel moet minstens {{min}} tekens bevatten"
-        title_too_long: "Titel kan niet langer zijn dan {{max}} tekens"
+        title_too_short: "Titel moet minstens %{min} tekens bevatten"
+        title_too_long: "Titel kan niet langer zijn dan %{max} tekens"
         post_missing: "Bericht kan niet leeg zijn"
-        post_length: "Bericht moet minstens {{min}} tekens bevatten"
-        try_like: "Hebt u de knop {{heart}} geprobeerd?"
+        post_length: "Bericht moet minstens %{min} tekens bevatten"
+        try_like: "Hebt u de knop %{heart} geprobeerd?"
         category_missing: "U moet een categorie kiezen"
-        tags_missing: "U moet minstens {{count}} tags kiezen"
+        tags_missing: "U moet minstens %{count} tags kiezen"
         topic_template_not_modified: "Voeg details en specifieke kenmerken toe aan uw topic door de topicsjabloon te bewerken."
       save_edit: "Bewerking opslaan"
       overwrite_edit: "Bewerking overschrijven"
@@ -1684,10 +1701,10 @@ nl:
       tooltip:
         regular:
           one: "%{count} ongeziene melding"
-          other: "{{count}} ongeziene meldingen"
+          other: "%{count} ongeziene meldingen"
         message:
           one: "%{count} ongelezen bericht"
-          other: "{{count}} ongelezen berichten"
+          other: "%{count} ongelezen berichten"
         high_priority:
           one: "%{count} ongelezen melding met hoge prioriteit"
           other: "%{count} ongelezen meldingen met hoge prioriteit"
@@ -1696,48 +1713,48 @@ nl:
       empty: "Geen meldingen gevonden."
       post_approved: "Uw bericht is goedgekeurd"
       reviewable_items: "items die beoordeling nodig hebben"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} en %{count} anderen</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} en {{count}} anderen</span> {{description}}"
+        one: "<span>%{username}, %{username2} en %{count} anderen</span> %{description}"
+        other: "<span>%{username}, %{username2} en %{count} anderen</span> %{description}"
       liked_consolidated_description:
-        one: "heeft {{count}} van uw berichten geliket"
-        other: "heeft {{count}} van uw berichten geliket"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> heeft uw uitnodiging geaccepteerd"
-      moved_post: "<span>{{username}}</span> heeft {{description}} verplaatst"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "'{{description}}' ontvangen"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Nieuw Topic</span> {{description}}"
-      membership_request_accepted: "Lidmaatschap geaccepteerd in '{{group_name}}'"
-      membership_request_consolidated: "{{count}} open lidmaatschapsaanvragen voor '{{group_name}}'"
+        one: "heeft %{count} van uw berichten geliket"
+        other: "heeft %{count} van uw berichten geliket"
+      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}"
+      invitee_accepted: "<span>%{username}</span> heeft uw uitnodiging geaccepteerd"
+      moved_post: "<span>%{username}</span> heeft %{description} verplaatst"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "'%{description}' ontvangen"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Nieuw Topic</span> %{description}"
+      membership_request_accepted: "Lidmaatschap geaccepteerd in '%{group_name}'"
+      membership_request_consolidated: "%{count} open lidmaatschapsaanvragen voor '%{group_name}'"
       group_message_summary:
-        one: "{{count}} bericht in uw Postvak IN voor {{group_name}}"
-        other: "{{count}} berichten in uw Postvak IN voor {{group_name}}"
+        one: "%{count} bericht in uw Postvak IN voor %{group_name}"
+        other: "%{count} berichten in uw Postvak IN voor %{group_name}"
       popup:
-        mentioned: '{{username}} heeft u genoemd in ''{{topic}}'' - {{site_title}}'
-        group_mentioned: '{{username}} heeft u genoemd in ''{{topic}}'' - {{site_title}}'
-        quoted: '{{username}} heeft u geciteerd in ''{{topic}}'' - {{site_title}}'
-        replied: '{{username}} heeft op u geantwoord in ''{{topic}}'' - {{site_title}}'
-        posted: '{{username}} heeft een bericht geplaatst in ''{{topic}}'' - {{site_title}}'
-        private_message: '{{username}} heeft u een persoonlijk bericht gestuurd in ''{{topic}}'' - {{site_title}}'
-        linked: '{{username}} heeft een koppeling naar uw bericht geplaatst vanaf ''{{topic}}'' - {{site_title}}'
-        watching_first_post: '{{username}} heeft een nieuw topic gemaakt: ''{{topic}}'' - {{site_title}}'
+        mentioned: '%{username} heeft u genoemd in ''%{topic}'' - %{site_title}'
+        group_mentioned: '%{username} heeft u genoemd in ''%{topic}'' - %{site_title}'
+        quoted: '%{username} heeft u geciteerd in ''%{topic}'' - %{site_title}'
+        replied: '%{username} heeft op u geantwoord in ''%{topic}'' - %{site_title}'
+        posted: '%{username} heeft een bericht geplaatst in ''%{topic}'' - %{site_title}'
+        private_message: '%{username} heeft u een persoonlijk bericht gestuurd in ''%{topic}'' - %{site_title}'
+        linked: '%{username} heeft een koppeling naar uw bericht geplaatst vanaf ''%{topic}'' - %{site_title}'
+        watching_first_post: '%{username} heeft een nieuw topic gemaakt: ''%{topic}'' - %{site_title}'
         confirm_title: "Meldingen ingeschakeld - %{site_title}"
         confirm_body: "Gelukt! Meldingen zijn ingeschakeld."
-        custom: "Melding van {{username}} op %{site_title}"
+        custom: "Melding van %{username} op %{site_title}"
       titles:
         mentioned: "genoemd"
         replied: "nieuw antwoord"
@@ -1767,9 +1784,9 @@ nl:
       from_my_computer: "Vanaf mijn apparaat"
       from_the_web: "Vanaf het web"
       remote_tip: "koppeling naar afbeelding"
-      remote_tip_with_attachments: "koppeling naar afbeelding of bestand {{authorized_extensions}}"
+      remote_tip_with_attachments: "koppeling naar afbeelding of bestand %{authorized_extensions}"
       local_tip: "selecteer afbeeldingen vanaf uw apparaat"
-      local_tip_with_attachments: "selecteer afbeeldingen of bestanden vanaf uw apparaat {{authorized_extensions}}"
+      local_tip_with_attachments: "selecteer afbeeldingen of bestanden vanaf uw apparaat %{authorized_extensions}"
       hint: "(u kunt ook afbeeldingen naar de editor slepen om deze te uploaden)"
       hint_for_supported_browsers: "u kunt ook afbeeldingen naar de editor slepen of hierin plakken"
       uploading: "Uploaden"
@@ -1786,15 +1803,15 @@ nl:
       clear_all: "Alles wissen"
       too_short: "Uw zoekterm is te kort."
       result_count:
-        one: "<span>%{count} resultaat voor</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} resultaten voor</span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} resultaat voor</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} resultaten voor</span><span class='term'>%{term}</span>"
       title: "zoeken naar topics, berichten, gebruikers of categorieën"
       full_page_title: "zoeken naar topics of berichten"
       no_results: "Geen resultaten gevonden."
       no_more_results: "Geen resultaten meer gevonden."
       searching: "Zoeken..."
-      post_format: "#{{post_number}} door {{username}}"
-      results_page: "Zoekresultaten voor '{{term}}'"
+      post_format: "#%{post_number} door %{username}"
+      results_page: "Zoekresultaten voor '%{term}'"
       more_results: "Er zijn meer resultaten. Verfijn uw zoekcriteria."
       cant_find: "Kunt u niet vinden wat u zoekt?"
       start_new_topic: "Misschien een nieuw topic starten?"
@@ -1803,9 +1820,9 @@ nl:
       search_google_button: "Google"
       search_google_title: "Zoeken op deze website"
       context:
-        user: "Berichten van @{{username}} doorzoeken"
-        category: "De categorie #{{category}} doorzoeken"
-        tag: "De tag #{{tag}} doorzoeken"
+        user: "Berichten van @%{username} doorzoeken"
+        category: "De categorie #%{category} doorzoeken"
+        tag: "De tag #%{tag} doorzoeken"
         topic: "Dit topic doorzoeken"
         private_messages: "Berichten doorzoeken"
       advanced:
@@ -1882,7 +1899,7 @@ nl:
         choose_new_category: "Kies de nieuwe categorie voor de topics:"
         selected:
           one: "U hebt <b>%{count}</b> topic geselecteerd."
-          other: "U hebt <b>{{count}}</b> topics geselecteerd."
+          other: "U hebt <b>%{count}</b> topics geselecteerd."
         change_tags: "Tags vervangen"
         append_tags: "Tags toevoegen"
         choose_new_tags: "Kies nieuwe tags voor deze topics:"
@@ -1895,7 +1912,7 @@ nl:
         posted: "U hebt nog niet in een topic gereageerd."
         latest: "Er zijn geen nieuwste topics. Dat is jammer."
         bookmarks: "U hebt nog geen bladwijzers voor topics gemaakt."
-        category: "Er zijn geen topics in {{category}}."
+        category: "Er zijn geen topics in %{category}."
         top: "Er zijn geen toptopics."
         educate:
           new: '<p>Hier verschijnen uw nieuwe topics.</p><p> Standaard worden topics als nieuw beschouwd en verschijnt de indicator <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">nieuw</span> als deze de afgelopen 2 dagen zijn aangemaakt.</p><p>Bezoek uw <a href="%{userPrefsUrl}">voorkeuren</a> om dit te wijzigen.</p>'
@@ -1906,20 +1923,20 @@ nl:
         read: "Er zijn geen gelezen topics meer."
         new: "Er zijn geen nieuwe topics meer."
         unread: "Er zijn geen ongelezen topics meer."
-        category: "Er zijn geen topics meer in {{category}}."
+        category: "Er zijn geen topics meer in %{category}."
         top: "Er zijn geen toptopics meer."
         bookmarks: "Er zijn geen topics met bladwijzers meer."
     topic:
       filter_to:
         one: "%{count} bericht in topic"
-        other: "{{count}} berichten in topic"
+        other: "%{count} berichten in topic"
       create: "Nieuw topic"
       create_long: "Een nieuw topic maken"
       open_draft: "Concept openen"
       private_message: "Een bericht sturen"
       archive_message:
         help: "Bericht naar uw archief verplaatsen"
-        title: "Archiveren "
+        title: "Archiveren"
       move_to_inbox:
         title: "Verplaatsen naar Postvak IN"
         help: "Bericht weer naar Postvak IN verplaatsen"
@@ -1941,10 +1958,10 @@ nl:
       unread: "ongelezen"
       new_topics:
         one: "%{count} nieuw topic"
-        other: "{{count}} nieuwe topics"
+        other: "%{count} nieuwe topics"
       unread_topics:
         one: "%{count} ongelezen topic"
-        other: "{{count}} ongelezen topics"
+        other: "%{count} ongelezen topics"
       title: "Topic"
       invalid_access:
         title: "Topic is privé"
@@ -1958,24 +1975,24 @@ nl:
         description: "Sorry, we konden het opgevraagde topic niet vinden. Misschien is het verwijderd door een moderator?"
       total_unread_posts:
         one: "u hebt %{count} ongelezen bericht in dit topic"
-        other: "u hebt {{count}} ongelezen berichten in dit topic"
+        other: "u hebt %{count} ongelezen berichten in dit topic"
       unread_posts:
         one: "u hebt %{count} ongelezen bericht in dit topic"
-        other: "u hebt {{count}} ongelezen berichten in dit topic"
+        other: "u hebt %{count} ongelezen berichten in dit topic"
       new_posts:
         one: "er is %{count} nieuw bericht in dit topic sinds u het voor het laatst hebt gelezen"
-        other: "er zijn {{count}} nieuwe berichten in dit topic sinds u het voor het laatst hebt gelezen"
+        other: "er zijn %{count} nieuwe berichten in dit topic sinds u het voor het laatst hebt gelezen"
       likes:
         one: "er is %{count} like in dit topic"
-        other: "er zijn {{likes}} likes in dit topic"
+        other: "er zijn %{count} likes in dit topic"
       back_to_list: "Terug naar topiclijst"
       options: "Topic-opties"
       show_links: "koppelingen binnen dit topic tonen"
       toggle_information: "topicdetails in-/uitschakelen"
-      read_more_in_category: "Wilt u meer lezen? U kunt door andere topics in {{catLink}} bladeren, of de {{latestLink}}."
-      read_more: "Wilt u meer lezen? {{catLink}} of {{latestLink}}."
-      group_request: "U dient lidmaatschap voor de groep `{{name}}` aan te vragen om dit topic te zien"
-      group_join: "U dient lid van de groep `{{name}}` te zijn om dit topic te zien"
+      read_more_in_category: "Wilt u meer lezen? U kunt door andere topics in %{catLink} bladeren, of de %{latestLink}."
+      read_more: "Wilt u meer lezen? %{catLink} of %{latestLink}."
+      group_request: "U dient lidmaatschap voor de groep `%{name}` aan te vragen om dit topic te zien"
+      group_join: "U dient lid van de groep `%{name}` te zijn om dit topic te zien"
       group_request_sent: "Uw lidmaatschapsaanvraag voor de groep is verstuurd. U ontvangt een melding zodra deze is geaccepteerd."
       unread_indicator: "Nog geen enkel lid heeft het laatste bericht van dit topic gelezen."
       read_more_MF: "Er { UNREAD, plural, =0 {} one { is <a href='{basePath}/unread'>1 ongelezen</a> } other { zijn <a href='{basePath}/unread'># ongelezen</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 nieuw</a> topic} other { {BOTH, select, true{and } false {zijn } other{}} <a href='{basePath}/new'># nieuwe</a> topics} } over, of {CATEGORY, select, true {blader door andere topics in {catLink}} false {{latestLink}} other {}}"
@@ -2079,7 +2096,7 @@ nl:
           "2_8": "U ziet het aantal nieuwe antwoorden, omdat u deze categorie volgt."
           "2_4": "U ziet het aantal nieuwe antwoorden, omdat u een antwoord in dit topic hebt geplaatst."
           "2_2": "U ziet het aantal nieuwe antwoorden, omdat u dit topic volgt."
-          "2": 'U ziet het aantal nieuwe antwoorden, omdat u <a href="{{basePath}}/u/{{username}}/preferences/notifications">dit topic hebt gelezen</a>.'
+          "2": 'U ziet het aantal nieuwe antwoorden, omdat u <a href="%{basePath}/u/%{username}/preferences/notifications">dit topic hebt gelezen</a>.'
           "1_2": "U ontvangt een melding als iemand uw @naam noemt of een bericht van u beantwoordt."
           "1": "U ontvangt een melding als iemand uw @naam noemt of een bericht van u beantwoordt."
           "0_7": "U negeert alle meldingen in deze categorie."
@@ -2155,25 +2172,25 @@ nl:
         choose_category: "Kies een categorie voor het openbare topic:"
       feature_topic:
         title: "Dit topic aanbevelen"
-        pin: "Dit topic boven in de categorie {{categoryLink}} laten verschijnen tot"
-        confirm_pin: "U hebt al {{count}} vastgemaakte topics. Te veel vastgemaakte topics kunnen storend zijn voor nieuwe en anonieme gebruikers. Weet u zeker dat u nog een topic in deze categorie wilt vastmaken?"
-        unpin: "Verwijder dit topic uit de bovenkant van de categorie {{categoryLink}}."
-        unpin_until: "Verwijder dit topic uit de bovenkant van de categorie {{categoryLink}} of wacht tot <strong>%{until}</strong>."
+        pin: "Dit topic boven in de categorie %{categoryLink} laten verschijnen tot"
+        confirm_pin: "U hebt al %{count} vastgemaakte topics. Te veel vastgemaakte topics kunnen storend zijn voor nieuwe en anonieme gebruikers. Weet u zeker dat u nog een topic in deze categorie wilt vastmaken?"
+        unpin: "Verwijder dit topic uit de bovenkant van de categorie %{categoryLink}."
+        unpin_until: "Verwijder dit topic uit de bovenkant van de categorie %{categoryLink} of wacht tot <strong>%{until}</strong>."
         pin_note: "Gebruikers kunnen het topic individueel voor zichzelf losmaken."
         pin_validation: "Er is een datum vereist om dit topic vast te maken."
-        not_pinned: "Er zijn geen topics vastgemaakt in {{categoryLink}}."
+        not_pinned: "Er zijn geen topics vastgemaakt in %{categoryLink}."
         already_pinned:
-          one: "Momenteel vastgemaakte topics in {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Momenteel vastgemaakte topics in {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
+          one: "Momenteel vastgemaakte topics in %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Momenteel vastgemaakte topics in %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>."
         pin_globally: "Dit topic bovenaan in alle topiclijsten laten verschijnen tot"
-        confirm_pin_globally: "U hebt al {{count}} globaal vastgemaakte topics. Te veel vastgemaakte topics kunnen storend zijn voor nieuwe en anonieme gebruikers. Weet u zeker dat u nog een topic globaal wilt vastmaken?"
+        confirm_pin_globally: "U hebt al %{count} globaal vastgemaakte topics. Te veel vastgemaakte topics kunnen storend zijn voor nieuwe en anonieme gebruikers. Weet u zeker dat u nog een topic globaal wilt vastmaken?"
         unpin_globally: "Verwijder dit topic uit de bovenkant van alle topiclijsten."
         unpin_globally_until: "Verwijder dit topic uit de bovenkant van alle topiclijsten of wacht tot <strong>%{until}</strong>."
         global_pin_note: "Gebruikers kunnen het topic individueel voor zichzelf losmaken."
         not_pinned_globally: "Er zijn geen globaal vastgemaakte topics."
         already_pinned_globally:
           one: "Momenteel globaal vastgemaakte topics: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Momenteel globaal vastgemaakte topics: <strong class='badge badge-notification unread'>{{count}}</strong>."
+          other: "Momenteel globaal vastgemaakte topics: <strong class='badge badge-notification unread'>%{count}</strong>."
         make_banner: "Dit topic omzetten naar een banner die bovenaan alle pagina's verschijnt"
         remove_banner: "De banner die bovenaan alle pagina's verschijnt verwijderen"
         banner_note: "Gebruikers kunnen de banner negeren door deze te sluiten. Er kan maar één bannertopic tegelijk bestaan."
@@ -2203,15 +2220,15 @@ nl:
         to_topic_username: "U hebt een gebruikersnaam ingevoerd. We sturen een melding met een uitnodigingskoppeling om aan dit topic deel te nemen."
         to_username: "Voer de gebruikersnaam in van de persoon die u wilt uitnodigen. We sturen een melding met een uitnodigingskoppeling om aan dit topic deel te nemen."
         email_placeholder: "name@example.com"
-        success_email: "Er is een uitnodiging naar <b>{{emailOrUsername}}</b> gemaild. We stellen u op de hoogte als op de uitnodiging is ingegaan. Controleer het uitnodigingentabblad op uw gebruikerspagina om uw uitnodigingen bij te houden."
+        success_email: "Er is een uitnodiging naar <b>%{emailOrUsername}</b> gemaild. We stellen u op de hoogte als op de uitnodiging is ingegaan. Controleer het uitnodigingentabblad op uw gebruikerspagina om uw uitnodigingen bij te houden."
         success_username: "We hebben die gebruiker uitgenodigd om aan dit topic deel te nemen."
         error: "Sorry, we konden deze persoon niet uitnodigen. Misschien is deze al uitgenodigd? (Uitnodigingen zijn in aantal beperkt)"
-        success_existing_email: "Een gebruiker met de e-mail <b>{{emailOrUsername}}</b> bestaat al. We hebben deze gebruiker uitgenodigd om aan dit topic deel te nemen."
+        success_existing_email: "Er bestaat al een gebruiker met het e-mailadres <b>%{emailOrUsername}</b>. We hebben deze gebruiker uitgenodigd om aan dit topic deel te nemen."
       login_reply: "Meld u aan om te antwoorden"
       filters:
         n_posts:
           one: "%{count} bericht"
-          other: "{{count}} berichten"
+          other: "%{count} berichten"
         cancel: "Filter verwijderen"
       move_to:
         title: "Verplaatsen naar"
@@ -2225,15 +2242,15 @@ nl:
         error: "Er is een fout opgetreden bij het verplaatsen van berichten naar het nieuwe topic."
         instructions:
           one: "U gaat een nieuw topic aanmaken en met het geselecteerde bericht vullen."
-          other: "U gaat een nieuw topic aanmaken en met de <b>{{count}}</b> geselecteerde berichten vullen."
+          other: "U gaat een nieuw topic aanmaken en met de <b>%{count}</b> geselecteerde berichten vullen."
       merge_topic:
         title: "Verplaatsen naar bestaand topic"
         action: "verplaatsen naar bestaand topic"
         error: "Er is een fout opgetreden bij het verplaatsen van berichten naar dat topic."
         radio_label: "Bestaand topic"
         instructions:
-          one: "Selecteer het topic waarnaar u dat bericht wilt verplaatsen."
-          other: "Selecteer het topic waarnaar u de <b>{{count}}</b> berichten wilt verplaatsen."
+          one: "Kies het topic waarnaar u dat bericht wilt verplaatsen."
+          other: "Kies het topic waarnaar u die <b>%{count}</b> berichten wilt verplaatsen."
       move_to_new_message:
         title: "Verplaatsen naar nieuw bericht"
         action: "verplaatsen naar nieuw bericht"
@@ -2242,7 +2259,7 @@ nl:
         participants: "Deelnemers"
         instructions:
           one: "U gaat een nieuw bericht maken en met het geselecteerde bericht vullen."
-          other: "U gaat een nieuw bericht maken en met de <b>{{count}}</b> geselecteerde berichten vullen."
+          other: "U gaat een nieuw bericht maken en met de <b>%{count}</b> geselecteerde berichten vullen."
       move_to_existing_message:
         title: "Verplaatsen naar bestaand bericht"
         action: "verplaatsen naar bestaand bericht"
@@ -2250,7 +2267,7 @@ nl:
         participants: "Deelnemers"
         instructions:
           one: "Kies het bericht waarnaar u dat bericht wilt verplaatsen."
-          other: "Kies het bericht waarnaar u die <b>{{count}}</b> berichten wilt verplaatsen."
+          other: "Kies het bericht waarnaar u die <b>%{count}</b> berichten wilt verplaatsen."
       merge_posts:
         title: "Geselecteerde berichten samenvoegen"
         action: "geselecteerde berichten samenvoegen"
@@ -2273,11 +2290,11 @@ nl:
         error: "Er is een fout opgetreden bij het wijzigen van het eigendom van de berichten."
         placeholder: "gebruikersnaam van nieuwe eigenaar"
         instructions:
-          one: "Kies een nieuwe eigenaar voor het bericht van <b>@{{old_user}}</b>"
-          other: "Kies een nieuwe eigenaar voor de {{count}} berichten van <b>@{{old_user}}</b>"
+          one: "Kies een nieuwe eigenaar voor het bericht van <b>@%{old_user}</b>"
+          other: "Kies een nieuwe eigenaar voor de %{count} berichten van <b>@%{old_user}</b>"
         instructions_without_old_user:
           one: "Kies een nieuwe eigenaar voor het bericht"
-          other: "Kies een nieuwe eigenaar voor de {{count}} berichten"
+          other: "Kies een nieuwe eigenaar voor de %{count} berichten"
       change_timestamp:
         title: "Tijdstempel wijzigen..."
         action: "tijdstempel wijzigen"
@@ -2286,7 +2303,7 @@ nl:
         instructions: "Kies een nieuwe tijdstempel voor het topic. Berichten in het topic worden bijgewerkt, zodat het onderlinge tijdsverschil gelijk blijft."
       multi_select:
         select: "selecteren"
-        selected: "geselecteerd ({{count}})"
+        selected: "geselecteerd (%{count})"
         select_post:
           label: "selecteren"
           title: "Bericht aan selectie toevoegen"
@@ -2305,20 +2322,20 @@ nl:
         deselect_all: alles deselecteren
         description:
           one: U hebt <b>%{count}</b> bericht geselecteerd.
-          other: "U hebt <b>{{count}}</b> berichten geselecteerd."
+          other: "U hebt <b>%{count}</b> berichten geselecteerd."
       deleted_by_author:
         one: "(topic ingetrokken door schrijver, wordt over %{count} uur automatisch verwijderd, tenzij gemarkeerd)"
         other: "(topic ingetrokken door schrijver, wordt over %{count} uur automatisch verwijderd, tenzij gemarkeerd)"
     post:
       quote_reply: "Citeren"
       edit_reason: "Reden: "
-      post_number: "bericht {{number}}"
+      post_number: "bericht %{number}"
       ignored: "Genegeerde inhoud"
       wiki_last_edited_on: "wiki laatst bewerkt op"
       last_edited_on: "bericht laatst bewerkt op"
       reply_as_new_topic: "Antwoorden als gekoppeld topic"
       reply_as_new_private_message: "Antwoorden als nieuw bericht naar dezelfde ontvangers"
-      continue_discussion: "Voortzetting van de discussie {{postLink}}:"
+      continue_discussion: "Voortzetting van de discussie %{postLink}:"
       follow_quote: "naar het geciteerde bericht"
       show_full: "Volledige bericht tonen"
       show_hidden: "Genegeerde inhoud weergeven."
@@ -2330,29 +2347,29 @@ nl:
       locked: "een staflid heeft dit bericht voor bewerking vergrendeld"
       gap:
         one: "%{count} verborgen antwoord weergeven"
-        other: "{{count}} verborgen antwoorden weergeven"
+        other: "%{count} verborgen antwoorden weergeven"
       notice:
-        new_user: "Dit is de eerste keer dat {{user}} iets heeft geplaatst – we heten hem/haar welkom in onze gemeenschap!"
-        returning_user: "Het is al even geleden dat we {{user}} hebben gezien – zijn/haar laatste bericht dateert van {{time}}."
+        new_user: "Dit is de eerste keer dat %{user} iets heeft geplaatst – we heten hem/haar welkom in onze gemeenschap!"
+        returning_user: "Het is al even geleden dat we %{user} hebben gezien – zijn/haar laatste bericht dateert van %{time}."
       unread: "Bericht is ongelezen"
       has_replies:
-        one: "{{count}} antwoord"
-        other: "{{count}} antwoorden"
+        one: "%{count} antwoord"
+        other: "%{count} antwoorden"
       has_likes_title:
         one: "%{count} persoon heeft dit bericht geliket"
-        other: "{{count}} personen hebben dit bericht geliket"
+        other: "%{count} personen hebben dit bericht geliket"
       has_likes_title_only_you: "u hebt dit bericht geliket"
       has_likes_title_you:
         one: "u en %{count} andere persoon hebben dit bericht geliket"
-        other: "u en {{count}} andere personen hebben dit bericht geliket"
+        other: "u en %{count} andere personen hebben dit bericht geliket"
       errors:
         create: "Sorry, er is een fout opgetreden bij het plaatsen van uw bericht. Probeer het opnieuw."
         edit: "Sorry, er is een fout opgetreden bij het bewerken van uw bericht. Probeer het opnieuw."
         upload: "Sorry, er is een fout opgetreden bij het uploaden van dat bestand. Probeer het opnieuw."
-        file_too_large: "Sorry, dat bestand is te groot (maximale grootte is {{max_size_kb}}kb). Misschien kunt u het uploaden naar een cloudopslagdienst, en dan de koppeling plakken?"
+        file_too_large: "Sorry, dat bestand is te groot (maximale grootte is %{max_size_kb}kb). Misschien kunt u het uploaden naar een cloudopslagdienst, en dan de koppeling plakken?"
         too_many_uploads: "Sorry, u kunt maar één bestand tegelijk uploaden."
-        too_many_dragged_and_dropped_files: "Sorry, u kunt maar {{max}} bestanden tegelijk uploaden."
-        upload_not_authorized: "Sorry, het bestand dat u probeert te uploaden is niet geautoriseerd (geautoriseerde extensies: {{authorized_extensions}})."
+        too_many_dragged_and_dropped_files: "Sorry, u kunt maar %{max} bestanden tegelijk uploaden."
+        upload_not_authorized: "Sorry, het bestand dat u probeert te uploaden is niet geautoriseerd (geautoriseerde extensies: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Sorry, nieuwe gebruikers kunnen geen afbeeldingen uploaden."
         attachment_upload_not_allowed_for_new_user: "Sorry, nieuwe gebruikers kunnen geen bijlagen uploaden."
         attachment_download_requires_login: "Sorry, u dient aangemeld te zijn om bijlagen te downloaden."
@@ -2392,10 +2409,10 @@ nl:
           confirm: "Wilt u ook de antwoorden op dit bericht verwijderen?"
           direct_replies:
             one: "Ja, en %{count} direct antwoord"
-            other: "Ja, en {{count}} directe antwoorden"
+            other: "Ja, en %{count} directe antwoorden"
           all_replies:
             one: "Ja, en %{count} antwoord"
-            other: "Ja, en alle {{count}} de antwoorden"
+            other: "Ja, en alle %{count} de antwoorden"
           just_the_post: "Nee, alleen dit bericht"
         admin: "beheeracties voor bericht"
         wiki: "Wiki maken"
@@ -2405,7 +2422,7 @@ nl:
         rebake: "HTML opnieuw opbouwen"
         publish_page: "Pagina's publiceren"
         unhide: "Tonen"
-        change_owner: "Eigendom wijzigen "
+        change_owner: "Eigendom wijzigen"
         grant_badge: "Badge toekennen"
         lock_post: "Bericht vergrendelen"
         lock_post_description: "voorkomen dat de schrijver dit bericht bewerkt"
@@ -2442,11 +2459,11 @@ nl:
             one: "heeft dit gelezen"
             other: "hebben dit gelezen"
           like_capped:
-            one: "en {{count}} ander heeft dit geliket"
-            other: "en {{count}} anderen hebben dit geliket"
+            one: "en %{count} ander heeft dit geliket"
+            other: "en %{count} anderen hebben dit geliket"
           read_capped:
-            one: "en {{count}} ander heeft dit gelezen"
-            other: "en {{count}} anderen hebben dit gelezen"
+            one: "en %{count} ander heeft dit gelezen"
+            other: "en %{count} anderen hebben dit gelezen"
         by_you:
           off_topic: "U hebt dit als off-topic gemarkeerd"
           spam: "U hebt dit als spam gemarkeerd"
@@ -2458,11 +2475,11 @@ nl:
       delete:
         confirm:
           one: "Weet u zeker dat u dat bericht wilt verwijderen?"
-          other: "Weet u zeker dat u die {{count}} berichten wilt verwijderen?"
+          other: "Weet u zeker dat u die %{count} berichten wilt verwijderen?"
       merge:
         confirm:
           one: "Weet u zeker dat u die berichten wilt samenvoegen?"
-          other: "Weet u zeker dat u die {{count}} berichten wilt samenvoegen?"
+          other: "Weet u zeker dat u die %{count} berichten wilt samenvoegen?"
       revisions:
         controls:
           first: "Eerste revisie"
@@ -2474,7 +2491,7 @@ nl:
           revert: "Terugkeren naar deze revisie"
           edit_wiki: "Wiki bewerken"
           edit_post: "Bericht bewerken"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "De gerenderde uitvoer met toevoegingen en verwijderingen inline tonen"
@@ -2579,6 +2596,7 @@ nl:
       sort_order: "Topiclijst sorteren op:"
       default_view: "Standaard topiclijst:"
       default_top_period: "Standaard topperiode:"
+      default_list_filter: "Standaard lijstfilter:"
       allow_badges_label: "Badges laten toekennen in deze categorie"
       edit_permissions: "Toestemmingen wijzigen"
       reviewable_by_group: "Naast stafleden kunnen berichten en markeringen in deze categorie ook worden beoordeeld door:"
@@ -2641,6 +2659,9 @@ nl:
         moderation: "Moderatie"
         appearance: "Vormgeving"
         email: "E-mailadres"
+      list_filters:
+        all: "alle topics"
+        none: "geen subcategorieën"
     flagging:
       title: "Bedankt voor het beleefd houden van onze gemeenschap!"
       action: "Bericht markeren"
@@ -2665,13 +2686,13 @@ nl:
       custom_message:
         at_least:
           one: "voer minstens %{count} teken in"
-          other: "voer minstens {{count}} tekens in"
+          other: "voer minstens %{count} tekens in"
         more:
           one: "%{count} teken te gaan..."
-          other: "{{count}} tekens te gaan..."
+          other: "%{count} tekens te gaan..."
         left:
           one: "%{count} resterend"
-          other: "{{count}} resterend"
+          other: "%{count} resterend"
     flagging_topic:
       title: "Bedankt voor het beleefd houden van onze gemeenschap!"
       action: "Topic markeren"
@@ -2715,7 +2736,7 @@ nl:
         title: "Dit topic is een persoonlijk bericht"
         help: "Dit topic is een persoonlijk bericht"
     posts: "Berichten"
-    posts_long: "er zijn {{number}} berichten in dit topic"
+    posts_long: "er zijn %{number} berichten in dit topic"
     posts_likes_MF: |
       Dit topic heeft {count, plural, one {1 antwoord} other {# antwoorden}} {ratio, select,
       low {met een hoge verhouding likes per bericht}
@@ -2730,20 +2751,20 @@ nl:
     replies: "Antwoorden"
     views_long:
       one: "dit topic is %{count} keer bekeken"
-      other: "dit topic is {{number}} keer bekeken"
+      other: "dit topic is %{number} keer bekeken"
     activity: "Activiteit"
     likes: "Likes"
     likes_lowercase:
       one: "like"
       other: "likes"
-    likes_long: "er zijn {{count}} likes in dit topic"
+    likes_long: "er zijn %{number} likes in dit topic"
     users: "Gebruikers"
     users_lowercase:
       one: "gebruiker"
       other: "gebruikers"
     category_title: "Categorie"
     history: "Geschiedenis"
-    changed_by: "door {{author}}"
+    changed_by: "door %{author}"
     raw_email:
       title: "Inkomende e-mail"
       not_available: "Niet beschikbaar!"
@@ -2755,33 +2776,33 @@ nl:
         title: "Nieuwste"
         title_with_count:
           one: "Nieuwste (%{count})"
-          other: "Nieuwste ({{count}})"
+          other: "Nieuwste (%{count})"
         help: "topics met recente berichten"
       read:
         title: "Gelezen"
         help: "topics die u hebt gelezen, in de volgorde waarin u ze voor het laatst hebt gelezen"
       categories:
         title: "Categorieën"
-        title_in: "Categorie - {{categoryName}}"
+        title_in: "Categorie - %{categoryName}"
         help: "alle topics gegroepeerd op categorie"
       unread:
         title: "Ongelezen"
         title_with_count:
           one: "Ongelezen (%{count})"
-          other: "Ongelezen ({{count}})"
+          other: "Ongelezen (%{count})"
         help: "topics die u momenteel in de gaten houdt of volgt met ongelezen berichten"
         lower_title_with_count:
           one: "%{count} ongelezen"
-          other: "{{count}} ongelezen"
+          other: "%{count} ongelezen"
       new:
         lower_title_with_count:
           one: "%{count} nieuw"
-          other: "{{count}} nieuw"
+          other: "%{count} nieuw"
         lower_title: "nieuw"
         title: "Nieuw"
         title_with_count:
           one: "Nieuw (%{count})"
-          other: "Nieuw ({{count}})"
+          other: "Nieuw (%{count})"
         help: "in de afgelopen paar dagen aangemaakte topics"
       posted:
         title: "Mijn berichten"
@@ -2790,11 +2811,11 @@ nl:
         title: "Bladwijzers"
         help: "topics waarvoor u een bladwijzer hebt"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "nieuwste topics in de categorie {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "nieuwste topics in de categorie %{categoryName}"
       top:
         title: "Top"
         help: "de meest actieve topics van het afgelopen jaar, maand, week of dag"
@@ -2958,8 +2979,8 @@ nl:
       synonyms: "Synoniemen"
       synonyms_description: "Wanneer de volgende tags worden gebruikt, worden deze vervangen door <b>%{base_tag_name}</b>."
       tag_groups_info:
-        one: 'Deze tag behoort tot de groep ''{{tag_groups}}''.'
-        other: "Deze tag behoort tot deze groepen: {{tag_groups}}."
+        one: 'Deze tag behoort tot de groep ''%{tag_groups}''.'
+        other: "Deze tag behoort tot deze groepen: %{tag_groups}."
       category_restrictions:
         one: "Deze kan alleen worden gebruikt in deze categorie:"
         other: "Deze kan alleen worden gebruikt in deze categorieën:"
@@ -2975,11 +2996,11 @@ nl:
       delete_tag: "Tag verwijderen"
       delete_confirm:
         one: "Weet u zeker dat u deze tag wilt verwijderen en loskoppelen van %{count} topic waaraan deze is toegewezen?"
-        other: "Weet u zeker dat u deze tag wilt verwijderen en loskoppelen van {{count}} topics waaraan deze is toegewezen?"
+        other: "Weet u zeker dat u deze tag wilt verwijderen en loskoppelen van %{count} topics waaraan deze is toegewezen?"
       delete_confirm_no_topics: "Weet u zeker dat u deze tag wilt verwijderen?"
       delete_confirm_synonyms:
         one: "Het synoniem ervan wordt ook verwijderd."
-        other: "De {{count}} synoniemen ervan worden ook verwijderd."
+        other: "De %{count} synoniemen ervan worden ook verwijderd."
       rename_tag: "Tag hernoemen"
       rename_instructions: "Kies een nieuwe naam voor de tag:"
       sort_by: "Sorteren op:"
@@ -3337,10 +3358,10 @@ nl:
           redeliver: "Opnieuw afleveren"
           incoming:
             one: "Er is een nieuwe gebeurtenis."
-            other: "Er zijn {{count}} nieuwe gebeurtenissen."
+            other: "Er zijn %{count} nieuwe gebeurtenissen."
           completed_in:
             one: "Voltooid in %{count} seconde."
-            other: "Voltooid in {{count}} seconden."
+            other: "Voltooid in %{count} seconden."
           request: "Aanvraag"
           response: "Reactie"
           redeliver_confirm: "Weet u zeker dat u dezelfde payload opnieuw wilt afleveren?"
@@ -3392,12 +3413,12 @@ nl:
           label: "Uploaden"
           title: "Een back-up naar deze instantie uploaden"
           uploading: "Uploaden..."
-          uploading_progress: "Uploaden... {{progress}}%"
-          success: "'{{filename}}' is geüpload. Het bestand wordt nu verwerkt en zal na hoogstens een minuut in de lijst verschijnen."
-          error: "Er is een fout opgetreden bij het uploaden van '{{filename}}': {{message}}"
+          uploading_progress: "Uploaden... %{progress}%"
+          success: "'%{filename}' is geüpload. Het bestand wordt nu verwerkt en zal na hoogstens een minuut in de lijst verschijnen."
+          error: "Er is een fout opgetreden bij het uploaden van '%{filename}': %{message}"
         operations:
           is_running: "Er wordt al een bewerking uitgevoerd..."
-          failed: "De bewerking {{operation}} is mislukt. Controleer de logboeken."
+          failed: "De bewerking %{operation} is mislukt. Controleer de logboeken."
           cancel:
             label: "Annuleren"
             title: "De huidige bewerking annuleren"
@@ -3520,7 +3541,7 @@ nl:
           disabled_component_tooltip: "Dit onderdeel is uitgeschakeld"
           default_theme_tooltip: "Dit thema is het standaardthema van de website"
           updates_available_tooltip: "Er zijn updates voor dit thema beschikbaar"
-          and_x_more: "en nog {{count}}."
+          and_x_more: "en nog %{count}."
           collapse: Samenvouwen
           uploads: "Uploads"
           no_uploads: "U kunt aan uw thema gerelateerde assets uploaden zoals fonts en afbeeldingen"
@@ -3569,8 +3590,8 @@ nl:
           disabled_by: "Dit onderdeel is uitgeschakeld door"
           required_version:
             error: "Dit thema is automatisch uitgeschakeld, omdat het niet compatibel is met deze versie van Discourse."
-            minimum: "Vereist Discourse-versie {{version}} of hoger."
-            maximum: "Vereist Discourse-versie {{version}} of lager."
+            minimum: "Vereist Discourse-versie %{version} of hoger."
+            maximum: "Vereist Discourse-versie %{version} of lager."
           component_of: "Onderdeel van:"
           update_to_latest: "Bijwerken naar nieuwste"
           check_for_updates: "Controleren op updates"
@@ -3583,7 +3604,7 @@ nl:
           empty: "Geen items"
           commits_behind:
             one: "Thema loopt %{count} commit achter!"
-            other: "Thema loopt {{count}} commits achter!"
+            other: "Thema loopt %{count} commits achter!"
           compare_commits: "(Nieuwe commits bekijken)"
           repo_unreachable: "Kon geen contact krijgen met de Git-repository van dit thema. Foutbericht:"
           imported_from_archive: "Dit thema is vanuit een .zip-bestand geïmporteerd"
@@ -3646,7 +3667,7 @@ nl:
             description: "Tekst en pictogrammen in de koptekst van de website."
           highlight:
             name: "markeren"
-            description: "De achtergrondkleur van gemarkeerde elementen op de pagina, zoals berichten en topics. "
+            description: "De achtergrondkleur van gemarkeerde elementen op de pagina, zoals berichten en topics."
           danger:
             name: "gevaar"
             description: "Markeringskleur voor acties zoals het verwijderen van berichten en topics."
@@ -3672,7 +3693,7 @@ nl:
       email:
         title: "E-mails"
         settings: "Instellingen"
-        templates: "Sjablonen "
+        templates: "Sjablonen"
         preview_digest: "Voorbeeld van samenvatting"
         advanced_test:
           title: "Geavanceerde test"
@@ -3988,8 +4009,8 @@ nl:
           title: "E-mailadres van deze gebruiker tonen"
           text: "Tonen"
       user:
-        suspend_failed: "Er is iets misgegaan bij het schorsen van deze gebruiker: {{error}}"
-        unsuspend_failed: "Er is iets misgegaan bij het opheffen van de schorsing van deze gebruiker: {{error}}"
+        suspend_failed: "Er is iets misgegaan bij het schorsen van deze gebruiker: %{error}"
+        unsuspend_failed: "Er is iets misgegaan bij het opheffen van de schorsing van deze gebruiker: %{error}"
         suspend_duration: "Hoelang wordt de gebruiker geschorst?"
         suspend_reason_label: "Waarom schorst u deze gebruiker? Deze tekst <b>zal voor iedereen zichtbaar zijn</b> op de profielpagina van deze gebruiker, en zal aan de gebruiker worden getoond als deze zich probeert aan te melden. Houd het kort."
         suspend_reason_hidden_label: "Waarom schorst u? Deze tekst wordt aan de gebruiker getoond wanneer deze zich probeert aan te melden. Hou het kort."
@@ -4279,6 +4300,8 @@ nl:
           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"
+        simple_list:
+          add_item: "Item toevoegen..."
       badges:
         title: Badges
         new_badge: Nieuwe badge
@@ -4366,6 +4389,7 @@ nl:
         title: "Emoji"
         help: "Nieuwe emoji toevoegen die voor iedereen beschikbaar zal zijn. (PROTIP: versleep meerdere bestanden tegelijk)"
         add: "Nieuwe emoji toevoegen"
+        uploading: "Uploaden..."
         name: "Naam"
         group: "Groep"
         image: "Afbeelding"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index f56301c722..8334b8cefe 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -25,8 +25,8 @@ pl_PL:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "H:mm"
       time_short_day: "ddd, GG: mm"
@@ -272,13 +272,13 @@ pl_PL:
     weekly: "tygodniowo"
     every_month: "każdego miesiąca"
     every_six_months: "co 6 miesięcy"
-    max_of_count: "max z {{count}}"
+    max_of_count: "max z %{count}"
     alternation: "lub"
     character_count:
       one: "%{count} znak"
-      few: "{{count}} znaki"
-      many: "{{count}} znaków"
-      other: "{{count}} znaków"
+      few: "%{count} znaki"
+      many: "%{count} znaków"
+      other: "%{count} znaków"
     related_messages:
       title: "Wiadomości powiązane"
       see_all: 'Zobacz <a href="%{path}">wszystkie wiadomości</a> od @ %{username} ...'
@@ -340,20 +340,20 @@ pl_PL:
         yes_value: "Tak, porzuć"
         no_value: "Nie, zatrzymaj"
     topic_count_latest:
-      one: "Zobacz {{count}} nowy albo zaktualizowany temat"
-      few: "Zobacz {{count}} nowe albo zaktualizowane tematy"
-      many: "Zobacz {{count}} nowych albo zaktualizowanych tematów"
-      other: "Zobacz {{count}} nowych albo zaktualizowanych tematów"
+      one: "Zobacz %{count} nowy albo zaktualizowany temat"
+      few: "Zobacz %{count} nowe albo zaktualizowane tematy"
+      many: "Zobacz %{count} nowych albo zaktualizowanych tematów"
+      other: "Zobacz %{count} nowych albo zaktualizowanych tematów"
     topic_count_unread:
-      one: "Zobacz {{count}} nieprzeczytany temat"
-      few: "Zobacz {{count}} nieprzeczytane tematy"
-      many: "Zobacz {{count}} nieprzeczytanych tematów"
-      other: "Zobacz {{count}} nieprzeczytanych tematów"
+      one: "Zobacz %{count} nieprzeczytany temat"
+      few: "Zobacz %{count} nieprzeczytane tematy"
+      many: "Zobacz %{count} nieprzeczytanych tematów"
+      other: "Zobacz %{count} nieprzeczytanych tematów"
     topic_count_new:
-      one: "Zobacz {{count}} nowy temat"
-      few: "Zobacz {{count}} nowe tematy"
-      many: "Zobacz {{count}} nowych tematów"
-      other: "Zobacz {{count}} nowych tematów"
+      one: "Zobacz %{count} nowy temat"
+      few: "Zobacz %{count} nowe tematy"
+      many: "Zobacz %{count} nowych tematów"
+      other: "Zobacz %{count} nowych tematów"
     preview: "podgląd"
     cancel: "anuluj"
     save: "Zapisz zmiany"
@@ -361,7 +361,7 @@ pl_PL:
     saved: "Zapisano!"
     upload: "Dodaj"
     uploading: "Wysyłam…"
-    uploading_filename: "Wysyłanie: {{filename}}"
+    uploading_filename: "Wysyłanie: %{filename}"
     clipboard: "schowek"
     uploaded: "Wgrano!"
     pasting: "Wklejanie..."
@@ -415,7 +415,7 @@ pl_PL:
         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ł je przejrzeć."
         claimed_by_you: "Przejąłeś tę pozycję i możesz ją teraz przejrzeć."
-        claimed_by_other: "Ten przedmiot może być sprawdzony tylko przez <b>{{username}}</b> ."
+        claimed_by_other: "Ten przedmiot może być sprawdzony tylko przez <b>%{username}</b> ."
       claim:
         title: "zgłoś ten temat"
       unclaim:
@@ -435,9 +435,9 @@ pl_PL:
       view_pending: "pokaż oczekujące"
       topic_has_pending:
         one: "W tym temacie jest <b>%{count}</b> po zatwierdzeniu"
-        few: "W tym temacie jest <b>{{count}}</b> postów oczekujących na zatwierdzenie"
-        many: "W tym temacie jest <b>{{count}}</b> postów oczekujących na zatwierdzenie"
-        other: "W tym temacie jest <b>{{count}}</b> postów oczekujących na zatwierdzenie"
+        few: "W tym temacie jest <b>%{count}</b> postów oczekujących na zatwierdzenie"
+        many: "W tym temacie jest <b>%{count}</b> postów oczekujących na zatwierdzenie"
+        other: "W tym temacie jest <b>%{count}</b> postów oczekujących na zatwierdzenie"
       title: "Sprawdź"
       topic: "Temat:"
       filtered_topic: "Przefiltrowałeś do przeglądalnej zawartości w jednym temacie."
@@ -454,25 +454,25 @@ pl_PL:
         fields: "Pola"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} flaga ogółem)"
-          few: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} flagi ogółem)"
-          many: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} flagi ogółem)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} flagi ogółem)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} flaga ogółem)"
+          few: "%{agreed}, %{disagreed}, %{ignored} (%{count} flagi ogółem)"
+          many: "%{agreed}, %{disagreed}, %{ignored} (%{count} flagi ogółem)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} flagi ogółem)"
         agreed:
-          one: "{{count}}% zgadza się"
-          few: "{{count}}% zgadza się"
-          many: "{{count}}% zgadza się"
-          other: "{{count}}% zgadza się"
+          one: "%{count}% zgadza się"
+          few: "%{count}% zgadza się"
+          many: "%{count}% zgadza się"
+          other: "%{count}% zgadza się"
         disagreed:
-          one: "{{count}}% nie zgadza się "
-          few: "{{count}}% nie zgadza się "
-          many: "{{count}}% nie zgadza się "
-          other: "{{count}}% nie zgadza się "
+          one: "%{count}% nie zgadza się "
+          few: "%{count}% nie zgadza się "
+          many: "%{count}% nie zgadza się "
+          other: "%{count}% nie zgadza się "
         ignored:
-          one: "{{count}}% zignorowało"
-          few: "{{count}}% zignorowało"
-          many: "{{count}}% zignorowało"
-          other: "{{count}}% zignorowało"
+          one: "%{count}% zignorowało"
+          few: "%{count}% zignorowało"
+          many: "%{count}% zignorowało"
+          other: "%{count}% zignorowało"
       topics:
         topic: "Temat"
         reviewable_count: "Liczba"
@@ -482,14 +482,14 @@ pl_PL:
         details: "szczegóły"
         unique_users:
           one: "%{count} użytkownik"
-          few: "{{count}} użytkowników"
-          many: "{{count}}użytkowników"
-          other: "{{count}} użytkowników"
+          few: "%{count} użytkowników"
+          many: "%{count}użytkowników"
+          other: "%{count} użytkowników"
       replies:
         one: "%{count} odpowiedź"
-        few: "{{count}} odpowiedzi"
-        many: "{{count}} odpowiedzi"
-        other: "{{count}} odpowiedzi"
+        few: "%{count} odpowiedzi"
+        many: "%{count} odpowiedzi"
+        other: "%{count} odpowiedzi"
       edit: "Edytuj"
       save: "Zapisz"
       cancel: "Anuluj"
@@ -552,24 +552,24 @@ pl_PL:
         description: "Twój nowy wpis został umieszczony w kolejce i pojawi się po zatwierdzeniu przez moderatora. Prosimy o cierpliwość."
         pending_posts:
           one: "Masz <strong>%{count}</strong> post w toku."
-          few: "Masz oczekujących <strong>{{count}}</strong> postów."
-          many: "Masz oczekujących <strong>{{count}}</strong> postów."
-          other: "Masz oczekujących <strong>{{count}}</strong> postów."
+          few: "Masz oczekujących <strong>%{count}</strong> postów."
+          many: "Masz oczekujących <strong>%{count}</strong> postów."
+          other: "Masz oczekujących <strong>%{count}</strong> postów."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> tworzy <a href='{{topicUrl}}'>temat</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Dodajesz</a> <a href='{{topicUrl}}'>temat</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> odpowiada na <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Odpowiadasz</a> na <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> odpisuje na <a href='{{topicUrl}}'>temat</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Odpowiadasz</a> w <a href='{{topicUrl}}'>temacie</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> wspomina o <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> wspomniał o <a href='{{user2Url}}'>tobie</a>"
-      you_mentioned_user: "<a href=\"{{user1Url}}\">Wspomniałeś/aś</a> o użytkowniku <a href=\"{{user2Url}}\">{{another_user}}</a>"
-      posted_by_user: "Wysłane przez <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Dodany przez <a href='{{userUrl}}'>ciebie</a>"
-      sent_by_user: "Wysłano przez <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Wysłano przez <a href='{{userUrl}}'>Ciebie</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> tworzy <a href='%{topicUrl}'>temat</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Dodajesz</a> <a href='%{topicUrl}'>temat</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> odpowiada na <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Odpowiadasz</a> na <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> odpisuje na <a href='%{topicUrl}'>temat</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Odpowiadasz</a> w <a href='%{topicUrl}'>temacie</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> wspomina o <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> wspomniał o <a href='%{user2Url}'>tobie</a>"
+      you_mentioned_user: "<a href=\"%{user1Url}\">Wspomniałeś/aś</a> o użytkowniku <a href=\"%{user2Url}\">%{another_user}</a>"
+      posted_by_user: "Wysłane przez <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Dodany przez <a href='%{userUrl}'>ciebie</a>"
+      sent_by_user: "Wysłano przez <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Wysłano przez <a href='%{userUrl}'>Ciebie</a>"
     directory:
       filter_name: "sortuj po nazwie użytkownika"
       title: "Użytkownicy"
@@ -812,7 +812,7 @@ pl_PL:
     user_fields:
       none: "(wybierz opcję)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profil"
       mute: "Wycisz"
       edit: "Edytuj ustawienia"
@@ -887,12 +887,12 @@ pl_PL:
       enable_defer: "Włącz odroczenie, aby oznaczyć tematy jako nieprzeczytane"
       change: "zmień"
       featured_topic: "Wyróżniony temat"
-      moderator: "{{user}} jest moderatorem"
-      admin: "{{user}} jest adminem"
+      moderator: "%{user} jest moderatorem"
+      admin: "%{user} jest adminem"
       moderator_tooltip: "Ten użytkownik jest moderatorem"
       admin_tooltip: "Ten użytkownik jest administratorem"
       silenced_tooltip: "Ten użytkownik jest wyciszony"
-      suspended_notice: "ten użytkownik jest zawieszony do {{date}}."
+      suspended_notice: "ten użytkownik jest zawieszony do %{date}."
       suspended_permanently: "Ten użytkownik jest zawieszony"
       suspended_reason: "Powód: "
       github_profile: "Github"
@@ -904,7 +904,7 @@ pl_PL:
           To ustawienie nadpisuje podsumowanie aktywności. <br />
         individual: "Wyślij e-mail dla każdego nowego postu"
         individual_no_echo: "Wysyłaj emaile dla każdego nowego postu oprócz mojego"
-        many_per_day: "Wyślij mi e-mail dla każdego nowego posta (około {{dailyEmailEstimate}} na dzień)"
+        many_per_day: "Wyślij mi e-mail dla każdego nowego posta (około %{dailyEmailEstimate} na dzień)"
         few_per_day: "Wyślij mi e-mail dla każdego nowego posta (około 2 dziennie)"
         warning: "Tryb listy mailingowej włączony. Ustawienia powiadomień e-mail są zastępowane."
       tag_settings: "Tagi"
@@ -934,9 +934,7 @@ pl_PL:
       admin_delete: "Usuń"
       users: "Użytkownicy"
       muted_users: "Uciszeni"
-      muted_users_instructions: "Wstrzymaj powiadomienia od tych użytkowników."
       ignored_users: "Zignorowany"
-      ignored_users_instructions: "Wstrzymaj wszystkie posty i powiadomienia od tych użytkowników."
       tracked_topics_link: "Pokaż"
       automatically_unpin_topics: "Automatycznie odpinaj tematy kiedy dotrę do końca strony."
       apps: "Aplikacje"
@@ -990,11 +988,11 @@ pl_PL:
         disable: "Wyłącz"
         enable: "Włącz"
         enable_long: "Włącz kody zapasowe"
-        manage: "Zarządzaj kodami zapasowymi. Pozostały Ci kody zapasowe <strong>{{count}}</strong> ."
+        manage: "Zarządzaj kodami zapasowymi. Pozostały Ci kody zapasowe <strong>%{count}</strong> ."
         copy_to_clipboard: "Skopiuj do schowka"
         copy_to_clipboard_error: "Wystąpił błąd w trakcie kopiowania do schowka"
         copied_to_clipboard: "Skopiowane do schowka"
-        remaining_codes: "Pozostały Ci kody zapasowe <strong>{{count}}</strong> ."
+        remaining_codes: "Pozostały Ci kody zapasowe <strong>%{count}</strong> ."
         use: "Używaj kodu zapasowego"
         enable_prerequisites: "Przed wygenerowaniem kodów zapasowych należy włączyć główny drugi czynnik."
         codes:
@@ -1053,10 +1051,10 @@ pl_PL:
         success_staff: "Wysłaliśmy wiadomość na bieżący adres. Proszę przestrzegać informacji dotyczących potwierdzenia adresu."
       change_avatar:
         title: "Zmień swój awatar"
-        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a> , na podstawie"
-        gravatar_title: "Zmień swój awatar na stronie {{gravatarName}}"
-        gravatar_failed: "Nie mogliśmy znaleźć {{gravatarName}} z tym adresem e-mail."
-        refresh_gravatar_title: "Odśwież swój {{gravatarName}}"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a> , na podstawie"
+        gravatar_title: "Zmień swój awatar na stronie %{gravatarName}"
+        gravatar_failed: "Nie mogliśmy znaleźć %{gravatarName} z tym adresem e-mail."
+        refresh_gravatar_title: "Odśwież swój %{gravatarName}"
         letter_based: "Awatar przyznany przez system"
         uploaded_avatar: "Zwyczajny obrazek"
         uploaded_avatar_empty: "Dodaj zwyczajny obrazek"
@@ -1080,13 +1078,13 @@ pl_PL:
         instructions: "Nie będzie publicznie widoczny."
         ok: "Otrzymasz potwierdzenie emailem"
         invalid: "Podaj poprawny adres email"
-        authenticated: "Twój email został potwierdzony przez {{provider}}"
+        authenticated: "Twój email został potwierdzony przez %{provider}"
         frequency_immediately: "Wyślemy powiadomienie jeśli wskazana rzecz nie została jeszcze przez Ciebie przeczytana."
         frequency:
           one: "Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatniej minuty."
-          few: "Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich {{count}} minut."
-          many: "Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich {{count}} minut."
-          other: "Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich {{count}} minut."
+          few: "Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich %{count} minut."
+          many: "Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich %{count} minut."
+          other: "Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich %{count} minut."
       associated_accounts:
         title: "Powiązane konta"
         connect: "Połącz"
@@ -1106,9 +1104,9 @@ pl_PL:
       username:
         title: "Nazwa konta"
         instructions: "unikalna, bez spacji, krótka"
-        short_instructions: "Inni mogą o tobie wspomnieć pisząc @{{username}}"
+        short_instructions: "Inni mogą o tobie wspomnieć pisząc @%{username}"
         available: "Nazwa użytkownika jest dostępna"
-        not_available: "Niedostępna. Może spróbuj {{suggestion}}?"
+        not_available: "Niedostępna. Może spróbuj %{suggestion}?"
         not_available_no_suggestion: "Niedostępne"
         too_short: "Nazwa użytkownika jest zbyt krótka"
         too_long: "Nazwa użytkownika jest zbyt długa"
@@ -1131,11 +1129,11 @@ pl_PL:
         log_out_all: "Wyloguj się wszędzie"
         active: "teraz aktywna"
         not_you: "To nie ty?"
-        show_all: "Pokaż wszystko ({{count}})"
+        show_all: "Pokaż wszystko (%{count})"
         show_few: "Pokaż mniej"
         was_this_you: "To byłes Ty?"
         was_this_you_description: "Jeśli to nie ty, zalecamy zmianę hasła i wylogowanie się ze wszystkich urządzeń."
-        browser_and_device: "{{browser}} na {{device}}"
+        browser_and_device: "%{browser} na %{device}"
         secure_account: "Zabezpiecz moje konto"
         latest_post: "Twój ostatni wpis ..."
       last_posted: "Ostatni wpis"
@@ -1215,22 +1213,21 @@ pl_PL:
         none: "Brak zaproszeń do wyświetlenia."
         truncated:
           one: "Wyświetlanie pierwszego zaproszenia."
-          few: "Wyświetlanie {{count}} pierwszych zaproszeń."
-          many: "Wyświetlanie {{count}} pierwszych zaproszeń."
-          other: "Wyświetlanie {{count}} pierwszych zaproszeń."
+          few: "Wyświetlanie %{count} pierwszych zaproszeń."
+          many: "Wyświetlanie %{count} pierwszych zaproszeń."
+          other: "Wyświetlanie %{count} pierwszych zaproszeń."
         redeemed: "Cofnięte zaproszenia"
         redeemed_tab: "Przyjęte"
-        redeemed_tab_with_count: "Zrealizowane ({{count}})"
+        redeemed_tab_with_count: "Zrealizowane (%{count})"
         redeemed_at: "Przyjęte"
         pending: "Oczekujące zaproszenia"
         pending_tab: "Oczekujący"
-        pending_tab_with_count: "Oczekujące ({{count}})"
+        pending_tab_with_count: "Oczekujące (%{count})"
         topics_entered: "Obejrzane tematy"
         posts_read_count: "Przeczytane wpisy"
         expired: "To zaproszenie wygasło."
         rescind: "Usuń"
         rescinded: "Zaproszenie usunięte"
-        rescind_all: "Usuń wszystkie wygasłe zaproszenia"
         rescinded_all: "Wszystkie zaproszenia, które wygasły, zostały usunięte!"
         rescind_all_confirm: "Czy na pewno chcesz usunąć wszystkie wygasłe zaproszenia?"
         reinvite: "Ponów zaproszenie"
@@ -1241,13 +1238,18 @@ pl_PL:
         time_read: "Czas odczytu"
         days_visited: "Dni odwiedzin"
         account_age_days: "Wiek konta w dniach"
+        links_tab: "Odnośniki"
+        link_created_at: "Utworzono"
+        link_groups: Grupy
         create: "Wyślij zaproszenie"
         generate_link: "Skopiuj link z zaproszeniem"
         link_generated: "Link z zaproszenie został poprawnie wygenerowany!"
         valid_for: "Link do zaproszenia jest ważny tylko dla tego adresu: %{email}"
+        single_user: "Pojedynczy użytkownik"
+        invite_link:
+          success: "Link z zaproszenie został poprawnie wygenerowany!"
         bulk_invite:
           none: "Jeszcze nikogo nie zaprosiłeś. Możesz wysłać pojedyncze zaproszenia lub zaprosić wiele osób na raz poprzez <a href='https://meta.discourse.org/t/send-bulk-invites/16468'> wysłanie pliku CSV</a>."
-          text: "Zaproszenia hurtowe z pliku"
           success: "Plik został przesłany pomyślnie: otrzymasz prywatną wiadomość, gdy proces zostanie zakończony."
           error: "Przykro nam, ale wymagany format pliku to CSV."
           confirmation_message: "Za chwilę wyślesz zaproszenia do wszystkich w przesłanym pliku."
@@ -1354,7 +1356,7 @@ pl_PL:
       desc:
         network: "Sprawdź swoje połączenie."
         network_fixed: "Chyba już w porządku."
-        server: "Kod błędu: {{status}}"
+        server: "Kod błędu: %{status}"
         forbidden: "Nie możesz obejrzeć tego zasobu."
         not_found: "Ups, aplikacja próbowała otworzyć URL który nie istnieje."
         unknown: "Coś poszło nie tak."
@@ -1418,8 +1420,8 @@ pl_PL:
       value_prop: "Jeśli założysz konto, będziemy pamiętać dokładnie to, co przeczytałeś, więc zawsze wrócisz tam, gdzie ostatnio opuściłeś temat. Otrzymasz również powiadomienia, tutaj i za pośrednictwem poczty email, gdy ktoś Ci odpowie. Możesz również polubić posty, aby dzielić się miłością. :heartpulse:"
     summary:
       enabled_description: "Przeglądasz podsumowanie tego tematu: widoczne są jedynie najbardziej wartościowe wpisy zdaniem uczestników. "
-      description: "Jest <b>{{replyCount}}</b> odpowiedzi."
-      description_time: "Istnieją <b>{{replyCount}}</b> odpowiedzi z czasem czytania oszacowanym na <b>{{readingTime}} minut</b>."
+      description: "Jest <b>%{replyCount}</b> odpowiedzi."
+      description_time: "Istnieją <b>%{replyCount}</b> odpowiedzi z czasem czytania oszacowanym na <b>%{readingTime} minut</b>."
       enable: "Podsumuj ten temat"
       disable: "Pokaż wszystkie wpisy"
     deleted_filter:
@@ -1432,8 +1434,8 @@ pl_PL:
       invite: "Zaproś innych"
       edit: "Dodaj lub usuń"
       leave_message: "Czy naprawdę chcesz zostawić tę wiadomość?"
-      remove_allowed_user: "Czy naprawdę chcesz usunąć {{name}} z tej dyskusji?"
-      remove_allowed_group: "Czy naprawdę chcesz usunąć {{name}} z tej wiadomości?"
+      remove_allowed_user: "Czy naprawdę chcesz usunąć %{name} z tej dyskusji?"
+      remove_allowed_group: "Czy naprawdę chcesz usunąć %{name} z tej wiadomości?"
     email: "Email"
     username: "Nazwa konta"
     last_seen: "Ostatnio oglądane"
@@ -1442,7 +1444,7 @@ pl_PL:
     trust_level: "Poziom zaufania"
     search_hint: "nazwa użytkownika, email lub IP"
     create_account:
-      disclaimer: "Rejestrując się, wyrażasz zgodę na <a href='{{privacy_link}}' target='blank'>politykę prywatności</a> i <a href='{{tos_link}}' target='blank'>warunki świadczenia usług</a> ."
+      disclaimer: "Rejestrując się, wyrażasz zgodę na <a href='%{privacy_link}' target='blank'>politykę prywatności</a> i <a href='%{tos_link}' target='blank'>warunki świadczenia usług</a> ."
       title: "Utwórz konto"
       failed: "Coś poszło nie tak, możliwe, że wybrany adres email jest już zarejestrowany, spróbuj użyć odnośnika przypomnienia hasła"
     forgot_password:
@@ -1501,7 +1503,7 @@ pl_PL:
       awaiting_activation: "Twoje konto czeka na aktywację. Użyj linku przypomnienia hasła, aby otrzymać kolejny email aktywujący."
       awaiting_approval: "Twoje konto jeszcze nie zostało zatwierdzone przez osoby z obsługi. Otrzymasz email gdy zostanie zatwierdzone."
       requires_invite: "Przepraszamy, dostęp do tego forum jest tylko za zaproszeniem."
-      not_activated: "Nie możesz się jeszcze zalogować. Wysłaliśmy email aktywujący konto na adres <b>{{sentTo}}</b>. W celu aktywacji konta postępuj zgodnie z instrukcjami otrzymanymi w emailu."
+      not_activated: "Nie możesz się jeszcze zalogować. Wysłaliśmy email aktywujący konto na adres <b>%{sentTo}</b>. W celu aktywacji konta postępuj zgodnie z instrukcjami otrzymanymi w emailu."
       not_allowed_from_ip_address: "Nie możesz się zalogować z tego adresu IP."
       admin_not_allowed_from_ip_address: "Nie możesz się zalogować jako admin z tego adresu IP."
       resend_activation_email: "Kliknij tutaj, aby ponownie wysłać email z aktywacją konta."
@@ -1510,7 +1512,7 @@ pl_PL:
       change_email: "Zmień Adres Email"
       provide_new_email: "Wprowadź nowy adres Email. Wyślemy na niego mail potwierdzający."
       submit_new_email: "Zaktualizuj adres Email"
-      sent_activation_email_again: "Wysłaliśmy do ciebie kolejny email z aktywacją konta na <b>{{currentEmail}}</b>. Zanim dotrze, może minąć kilka minut; pamiętaj, żeby sprawdzić folder ze spamem."
+      sent_activation_email_again: "Wysłaliśmy do ciebie kolejny email z aktywacją konta na <b>%{currentEmail}</b>. Zanim dotrze, może minąć kilka minut; pamiętaj, żeby sprawdzić folder ze spamem."
       sent_activation_email_again_generic: "Wysłaliśmy kolejny e-mail aktywacyjny. Przybycie może potrwać kilka minut; koniecznie sprawdź folder ze spamem."
       to_continue: "Zaloguj się"
       preferences: "Musisz się zalogować, aby zmieniać swoje ustawienia."
@@ -1573,24 +1575,24 @@ pl_PL:
     conditional_loading_section:
       loading: Ładowanie...
     category_row:
-      topic_count: "{{count}} tematów w tej kategorii"
+      topic_count: "%{count} tematów w tej kategorii"
     select_kit:
       default_header_text: Wybierz...
       no_content: Nie znaleziono dopasowań
       filter_placeholder: Wyszukiwanie...
       filter_placeholder_with_any: Wyszukaj lub utwórz ...
-      create: "Stwórz: '{{content}}'"
+      create: "Stwórz: '%{content}'"
       max_content_reached:
         one: "Możesz wybrać tylko jeden element."
-        few: "Może wybrać tylko {{count}} elementy."
-        many: "Możesz wybrać tylko {{count}} elementów."
-        other: "Możesz wybrać tylko {{count}} elementów."
+        few: "Może wybrać tylko %{count} elementy."
+        many: "Możesz wybrać tylko %{count} elementów."
+        other: "Możesz wybrać tylko %{count} elementów."
       min_content_not_reached:
         one: "Wybierz co najmniej jeden element."
-        few: "Wybierz co najmniej {{count}} elementy."
-        many: "Wybierz co najmniej {{count}} elementów."
-        other: "Wybierz co najmniej {{count}} elementów."
-      invalid_selection_length: "Zaznaczenie musi zawierać co najmniej {{count}} znaków."
+        few: "Wybierz co najmniej %{count} elementy."
+        many: "Wybierz co najmniej %{count} elementów."
+        other: "Wybierz co najmniej %{count} elementów."
+      invalid_selection_length: "Zaznaczenie musi zawierać co najmniej %{count} znaków."
     date_time_picker:
       from: Od
       to: Do
@@ -1617,7 +1619,7 @@ pl_PL:
       default: Spersonalizowane emoji
     shared_drafts:
       title: "Udostępnione projekty"
-      notice: "Ten temat jest widoczny tylko użytkowników mających dostęp do kategorii <b>{{category}}</b>."
+      notice: "Ten temat jest widoczny tylko użytkowników mających dostęp do kategorii <b>%{category}</b>."
       destination_category: "Kategoria docelowa"
       publish: "Opublikuj udostępniony projekt"
       confirm_publish: "Czy na pewno chcesz opublikować ten projekt?"
@@ -1637,26 +1639,26 @@ pl_PL:
       similar_topics: "Twój temat jest podobny do…"
       drafts_offline: "szkice offline"
       edit_conflict: "edytuj konflikt"
-      group_mentioned_limit: "<b>Ostrzeżenie!</b> Wspomniałeś o <a href='{{group_link}}'>{{group}}</a> , jednak ta grupa ma więcej członków niż skonfigurowany przez administratora limit wzmianek dla użytkowników {{max}}. Nikt nie zostanie powiadomiony."
+      group_mentioned_limit: "<b>Ostrzeżenie!</b> Wspomniałeś o <a href='%{group_link}'>%{group}</a> , jednak ta grupa ma więcej członków niż skonfigurowany przez administratora limit wzmianek dla użytkowników %{max}. Nikt nie zostanie powiadomiony."
       group_mentioned:
-        one: "Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>%{count} osobę</a> – czy jesteś pewien?"
-        few: "Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>{{count}} osoby</a> – czy jesteś pewien?"
-        many: "Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>{{count}} osób</a> – czy jesteś pewien?"
-        other: "Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>{{count}} osób</a> –czy jesteś pewien?"
+        one: "Wspominając %{group}, powiadomisz <a href='%{group_link}'>%{count} osobę</a> – czy jesteś pewien?"
+        few: "Wspominając %{group}, powiadomisz <a href='%{group_link}'>%{count} osoby</a> – czy jesteś pewien?"
+        many: "Wspominając %{group}, powiadomisz <a href='%{group_link}'>%{count} osób</a> – czy jesteś pewien?"
+        other: "Wspominając %{group}, powiadomisz <a href='%{group_link}'>%{count} osób</a> –czy jesteś pewien?"
       cannot_see_mention:
-        category: "Wspomniałeś o {{username}} lecz nie zostaną oni powiadomieni ponieważ nie mają dostępu do tej kategorii. Dodaj ich do grupy która ma dostęp do tej kategorii."
-        private: "Wspomniałeś o {{username}} lecz nie zostaną powiadomieni ponieważ nie mogą odczytać tej wiadomości . Będziesz musiał ich zaprosić do odczytania tej wiadomości "
-      duplicate_link: "Wygląda na to, że Twój link do <b>{{domain}}</b> został już wcześniej przesłany w tym wątku przez <b>@{{username}}</b> w <a href='{{post_url}}'>odpowiedzi przesłanej {{ago}}</a> - jesteś pewien, że chcesz go wysłać ponownie?"
-      reference_topic_title: "Odpowiedz: {{title}}"
+        category: "Wspomniałeś o %{username} lecz nie zostaną oni powiadomieni ponieważ nie mają dostępu do tej kategorii. Dodaj ich do grupy która ma dostęp do tej kategorii."
+        private: "Wspomniałeś o %{username} lecz nie zostaną powiadomieni ponieważ nie mogą odczytać tej wiadomości . Będziesz musiał ich zaprosić do odczytania tej wiadomości "
+      duplicate_link: "Wygląda na to, że Twój link do <b>%{domain}</b> został już wcześniej przesłany w tym wątku przez <b>@%{username}</b> w <a href='%{post_url}'>odpowiedzi przesłanej %{ago}</a> - jesteś pewien, że chcesz go wysłać ponownie?"
+      reference_topic_title: "Odpowiedz: %{title}"
       error:
         title_missing: "tytuł jest wymagany"
-        title_too_short: "tytuł musi zawierać co najmniej {{min}} znaków"
-        title_too_long: "Tytuł nie może zawierać więcej niż {{max}} znaków"
+        title_too_short: "tytuł musi zawierać co najmniej %{min} znaków"
+        title_too_long: "Tytuł nie może zawierać więcej niż %{max} znaków"
         post_missing: "Post nie może być pusty"
-        post_length: "Wpis musi zawierać przynajmniej {{min}} znaków"
-        try_like: "Czy wypróbowałeś przycisk {{heart}}?"
+        post_length: "Wpis musi zawierać przynajmniej %{min} znaków"
+        try_like: "Czy wypróbowałeś przycisk %{heart}?"
         category_missing: "Musisz wybrać kategorię"
-        tags_missing: "Musisz wybrać co najmniej {{count}} tagów"
+        tags_missing: "Musisz wybrać co najmniej %{count} tagów"
         topic_template_not_modified: "Dodaj szczegóły i szczegóły do swojego tematu, edytując szablon tematu."
       save_edit: "Zapisz zmiany"
       overwrite_edit: "Zastąp edycję"
@@ -1754,67 +1756,67 @@ pl_PL:
       tooltip:
         regular:
           one: "%{count} nieprzeczytane powiadomienie"
-          few: "Nieprzeczytanych powiadomień: {{count}}"
-          many: "Nieprzeczytanych powiadomień: {{count}}"
-          other: "Nieprzeczytanych powiadomień: {{count}}"
+          few: "Nieprzeczytanych powiadomień: %{count}"
+          many: "Nieprzeczytanych powiadomień: %{count}"
+          other: "Nieprzeczytanych powiadomień: %{count}"
         message:
-          one: "Nieodczytane wiadomości: {{count}}"
-          few: "Nieodczytane wiadomości: {{count}}"
-          many: "Nieodczytane wiadomości: {{count}}"
+          one: "Nieodczytane wiadomości: %{count}"
+          few: "Nieodczytane wiadomości: %{count}"
+          many: "Nieodczytane wiadomości: %{count}"
           other: "Nieodczytane wiadomości: 1"
       title: "powiadomienia o wywołanej @nazwie, odpowiedzi do twoich wpisów i tematów, prywatne wiadomości, itp"
       none: "Nie udało się załadować listy powiadomień."
       empty: "Nie znaleziono powiadomień."
       post_approved: "Twój post został zatwierdzony"
       reviewable_items: "przedmioty wymagające przeglądu"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} i %{count} inna osoba</span> {{description}}"
-        few: "<span>{{username}}, {{username2}} i {{count}} inne osoby</span> {{description}}"
-        many: "<span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}"
+        one: "<span>%{username}, %{username2} i %{count} inna osoba</span> %{description}"
+        few: "<span>%{username}, %{username2} i %{count} inne osoby</span> %{description}"
+        many: "<span>%{username}, %{username2} i %{count} innych osób</span> %{description}"
+        other: "<span>%{username}, %{username2} i %{count} innych osób</span> %{description}"
       liked_consolidated_description:
-        one: "polubiłem {{count}} twoich postów"
-        few: "polubiłem {{count}} twoich postów"
-        many: "polubiłem {{count}} twoich postów"
-        other: "polubiono {{count}} twoich postów"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> przyjmuje twoje zaproszenie"
-      moved_post: "<span>{{username}}</span> przenosi {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Otrzymujesz '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Nowy temat</span> {{description}}"
-      membership_request_accepted: "Członkostwo zaakceptowane w „{{group_name}}”"
-      membership_request_consolidated: "{{count}} otwarte wnioski o członkostwo dla „{{group_name}}”"
+        one: "polubiłem %{count} twoich postów"
+        few: "polubiłem %{count} twoich postów"
+        many: "polubiłem %{count} twoich postów"
+        other: "polubiono %{count} twoich postów"
+      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}"
+      invitee_accepted: "<span>%{username}</span> przyjmuje twoje zaproszenie"
+      moved_post: "<span>%{username}</span> przenosi %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Otrzymujesz '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Nowy temat</span> %{description}"
+      membership_request_accepted: "Członkostwo zaakceptowane w „%{group_name}”"
+      membership_request_consolidated: "%{count} otwarte wnioski o członkostwo dla „%{group_name}”"
       group_message_summary:
-        one: "masz {{count}} wiadomość w skrzynce odbiorczej {{group_name}}"
-        few: "masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}"
-        many: "masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}"
-        other: "masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}"
+        one: "masz %{count} wiadomość w skrzynce odbiorczej %{group_name}"
+        few: "masz %{count} wiadomości w skrzynce odbiorczej %{group_name}"
+        many: "masz %{count} wiadomości w skrzynce odbiorczej %{group_name}"
+        other: "masz %{count} wiadomości w skrzynce odbiorczej %{group_name}"
       popup:
-        mentioned: '{{username}} wspomina o tobie w "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} wspomniał o Tobie w "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} cytuje cie w "{{topic}}" - {{site_title}}'
-        replied: '{{username}} odpowiada na twój wpis w "{{topic}}" - {{site_title}}'
-        posted: '{{username}} pisze w "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} wysłał Ci osobistą wiadomość w „{{topic}}” - {{site_title}}'
-        linked: '{{username}} linkuje do twojego wpisu z "{{topic}}" - {{site_title}}'
-        watching_first_post: '{{username}} utworzył nowy temat „{{topic}}” - {{site_title}}'
+        mentioned: '%{username} wspomina o tobie w "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} wspomniał o Tobie w "%{topic}" - %{site_title}'
+        quoted: '%{username} cytuje cie w "%{topic}" - %{site_title}'
+        replied: '%{username} odpowiada na twój wpis w "%{topic}" - %{site_title}'
+        posted: '%{username} pisze w "%{topic}" - %{site_title}'
+        private_message: '%{username} wysłał Ci osobistą wiadomość w „%{topic}” - %{site_title}'
+        linked: '%{username} linkuje do twojego wpisu z "%{topic}" - %{site_title}'
+        watching_first_post: '%{username} utworzył nowy temat „%{topic}” - %{site_title}'
         confirm_title: "Powiadomienia włączone - %{site_title}"
         confirm_body: "Powodzenie! Powiadomienia zostały włączone."
-        custom: "Powiadomienie od {{username}} na %{site_title}"
+        custom: "Powiadomienie od %{username} na %{site_title}"
       titles:
         mentioned: "wzmiankowany"
         replied: "nowa odpowiedź"
@@ -1844,9 +1846,9 @@ pl_PL:
       from_my_computer: "Z mojego urządzenia"
       from_the_web: "Z Internetu"
       remote_tip: "link do obrazu"
-      remote_tip_with_attachments: "link do obrazu lub pliku {{authorized_extensions}}"
+      remote_tip_with_attachments: "link do obrazu lub pliku %{authorized_extensions}"
       local_tip: "wybierz obrazy ze swojego urządzenia"
-      local_tip_with_attachments: "wybierz obrazy lub pliki ze swojego urządzenia {{authorized_extensions}}"
+      local_tip_with_attachments: "wybierz obrazy lub pliki ze swojego urządzenia %{authorized_extensions}"
       hint: "(możesz także upuścić plik z katalogu komputera w okno edytora)"
       hint_for_supported_browsers: "możesz też przeciągać lub wklejać grafiki do edytora"
       uploading: "Wgrywanie"
@@ -1863,17 +1865,17 @@ pl_PL:
       clear_all: "Wyczyść wszystkie"
       too_short: "Wyszukiwana fraza jest zbyt krótka."
       result_count:
-        one: "<span>Wynik</span> <span class='term'>%{count}</span> <span>dla</span> <span class='term'>{{term}}</span>"
-        few: "<span>{{count}}{{plus}} wyniki dla</span> <span class='term'>{{term}}</span>"
-        many: "<span>{{count}}{{plus}} wyniki dla</span> <span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} wyniki dla</span> <span class='term'>{{term}}</span>"
+        one: "<span>Wynik</span> <span class='term'>%{count}</span> <span>dla</span> <span class='term'>%{term}</span>"
+        few: "<span>%{count}%{plus} wyniki dla</span> <span class='term'>%{term}</span>"
+        many: "<span>%{count}%{plus} wyniki dla</span> <span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} wyniki dla</span> <span class='term'>%{term}</span>"
       title: "szukaj tematów, wpisów, użytkowników lub kategorii"
       full_page_title: "szukaj tematów lub postów"
       no_results: "Brak wyników wyszukiwania"
       no_more_results: "Nie znaleziono więcej wyników."
       searching: "Szukam…"
-      post_format: "#{{post_number}} za {{username}}"
-      results_page: "Wyniki wyszukiwania dla '{{term}}'"
+      post_format: "#%{post_number} za %{username}"
+      results_page: "Wyniki wyszukiwania dla '%{term}'"
       more_results: "Istnieje więcej wyników wyszukiwania. Doprecyzuj kryteria wyszukiwania."
       cant_find: "Nie możesz znaleźć tego, czego szukasz?"
       start_new_topic: "Może utwórz nowy temat?"
@@ -1882,9 +1884,9 @@ pl_PL:
       search_google_button: "Google"
       search_google_title: "Przeszukaj tę stronę"
       context:
-        user: "Szukaj wpisów @{{username}}"
-        category: "Szukaj w kategorii #{{category}}"
-        tag: "Wyszukaj znacznik # {{tag}}"
+        user: "Szukaj wpisów @%{username}"
+        category: "Szukaj w kategorii #%{category}"
+        tag: "Wyszukaj znacznik # %{tag}"
         topic: "Szukaj w tym temacie"
         private_messages: "Wyszukiwanie wiadomości"
       advanced:
@@ -1961,9 +1963,9 @@ pl_PL:
         choose_new_category: "Wybierz nową kategorię dla tematów:"
         selected:
           one: "Zaznaczono <b>%{count}</b> temat."
-          few: "Zaznaczono <b>{{count}}</b> tematy."
-          many: "Zaznaczono <b>{{count}}</b> tematów."
-          other: "Zaznaczono <b>{{count}}</b> tematów."
+          few: "Zaznaczono <b>%{count}</b> tematy."
+          many: "Zaznaczono <b>%{count}</b> tematów."
+          other: "Zaznaczono <b>%{count}</b> tematów."
         change_tags: "Zmień tagi"
         append_tags: "Dodaj tagi"
         choose_new_tags: "Wybierz nowe tagi dla tych tematów:"
@@ -1976,7 +1978,7 @@ pl_PL:
         posted: "Jeszcze nie zamieściłeś wpisu w żadnym z tematów."
         latest: "Nie ma najnowszych tematów. Smutne."
         bookmarks: "Nie posiadasz tematów dodanych do zakładek."
-        category: "Nie ma tematów w kategorii {{category}}."
+        category: "Nie ma tematów w kategorii %{category}."
         top: "Brak najlepszych tematów."
         educate:
           new: '<p>Nowe tematy będą pojawiać się tutaj.</p><p>Domyślnie tematy są określane jako nowe i będą oznaczone jako<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">nowe</span> jeśli były stworzone w ciągu ostatnich 2 dni.</p><p>Odwiedź swoje <a href="%{userPrefsUrl}">ustawienia</a> by to zmienić.</p>'
@@ -1987,15 +1989,15 @@ pl_PL:
         read: "Nie ma więcej przeczytanych tematów."
         new: "Nie ma więcej nowych tematów."
         unread: "Nie ma więcej nieprzeczytanych tematów."
-        category: "Nie ma więcej tematów w kategorii {{category}}."
+        category: "Nie ma więcej tematów w kategorii %{category}."
         top: "Nie ma już więcej najlepszych tematów."
         bookmarks: "Nie ma więcej zakładek."
     topic:
       filter_to:
         one: "%{count} post w temacie"
-        few: "{{count}} posty w temacie"
-        many: "{{count}} postów w temacie"
-        other: "{{count}} postów w temacie"
+        few: "%{count} posty w temacie"
+        many: "%{count} postów w temacie"
+        other: "%{count} postów w temacie"
       create: "Nowy temat"
       create_long: "Utwórz nowy temat"
       open_draft: "Otwórz szkic"
@@ -2024,14 +2026,14 @@ pl_PL:
       unread: "nieprzeczytane"
       new_topics:
         one: "%{count} nowy temat"
-        few: "{{count}} nowe tematy"
-        many: "{{count}} nowych tematów"
-        other: "{{count}} nowych tematów"
+        few: "%{count} nowe tematy"
+        many: "%{count} nowych tematów"
+        other: "%{count} nowych tematów"
       unread_topics:
         one: "%{count} nieprzeczytany temat"
-        few: "{{count}} nieprzeczytane tematy"
-        many: "{{count}} nieprzeczytanych tematów"
-        other: "{{count}} nieprzeczytanych tematów"
+        few: "%{count} nieprzeczytane tematy"
+        many: "%{count} nieprzeczytanych tematów"
+        other: "%{count} nieprzeczytanych tematów"
       title: "Temat"
       invalid_access:
         title: "Temat jest prywatny"
@@ -2045,32 +2047,32 @@ pl_PL:
         description: "Przepraszamy, ale temat nie został znaleziony. Możliwe, że został usunięty przez moderatora?"
       total_unread_posts:
         one: "masz %{count} nieprzeczytany wpis w tym temacie"
-        few: "masz {{count}} nieprzeczytane wpisy w tym temacie"
-        many: "masz {{count}} nieprzeczytanych wpisów w tym temacie"
-        other: "masz {{count}} nieprzeczytanych wpisów w tym temacie"
+        few: "masz %{count} nieprzeczytane wpisy w tym temacie"
+        many: "masz %{count} nieprzeczytanych wpisów w tym temacie"
+        other: "masz %{count} nieprzeczytanych wpisów w tym temacie"
       unread_posts:
         one: "masz %{count} nieprzeczytany wpis w tym temacie"
-        few: "masz {{count}} nieprzeczytane wpisy w tym temacie"
-        many: "masz {{count}} nieprzeczytanych wpisów w tym temacie"
-        other: "masz {{count}} nieprzeczytanych wpisów w tym temacie"
+        few: "masz %{count} nieprzeczytane wpisy w tym temacie"
+        many: "masz %{count} nieprzeczytanych wpisów w tym temacie"
+        other: "masz %{count} nieprzeczytanych wpisów w tym temacie"
       new_posts:
         one: "od Twoich ostatnich odwiedzin pojawił się %{count} nowy wpis"
-        few: "od Twoich ostatnich odwiedzin pojawiły się {{count}} nowe wpisy"
-        many: "od Twoich ostatnich odwiedzin pojawiło się {{count}} nowych wpisów"
-        other: "od Twoich ostatnich odwiedzin pojawiło się {{count}} nowych wpisów"
+        few: "od Twoich ostatnich odwiedzin pojawiły się %{count} nowe wpisy"
+        many: "od Twoich ostatnich odwiedzin pojawiło się %{count} nowych wpisów"
+        other: "od Twoich ostatnich odwiedzin pojawiło się %{count} nowych wpisów"
       likes:
         one: "temat zawiera %{count} lajk"
-        few: "temat zawiera {{count}} lajki"
-        many: "temat zawiera {{count}} lajków"
-        other: "temat zawiera {{count}} lajków"
+        few: "temat zawiera %{count} lajki"
+        many: "temat zawiera %{count} lajków"
+        other: "temat zawiera %{count} lajków"
       back_to_list: "Wróć do Listy Tematów"
       options: "Opcje tematu"
       show_links: "pokaż odnośniki z tego tematu"
       toggle_information: "przełącz szczegóły tematu"
-      read_more_in_category: "Chcesz przeczytać więcej? Przeglądaj inne tematy w {{catLink}} lub {{latestLink}}."
-      read_more: "Chcesz przeczytać więcej? {{catLink}} lub {{latestLink}}."
-      group_request: "Aby zobaczyć ten temat, musisz poprosić o członkostwo w grupie `{{name}}`"
-      group_join: "Musisz dołączyć do grupy `{{name}}`, aby zobaczyć ten temat"
+      read_more_in_category: "Chcesz przeczytać więcej? Przeglądaj inne tematy w %{catLink} lub %{latestLink}."
+      read_more: "Chcesz przeczytać więcej? %{catLink} lub %{latestLink}."
+      group_request: "Aby zobaczyć ten temat, musisz poprosić o członkostwo w grupie `%{name}`"
+      group_join: "Musisz dołączyć do grupy `%{name}`, aby zobaczyć ten temat"
       group_request_sent: "Twoja prośba o członkostwo w grupie została wysłana. Zostaniesz poinformowany, kiedy zostanie zaakceptowane."
       unread_indicator: "Nikt jeszcze nie czytał ostatniego postu w tym temacie."
       read_more_MF: "Masz do zobaczenia { UNREAD, plural, =0 {} one { is <a href='{basePath}/unread'>1 nieprzeczytany</a> } other { are <a href='{basePath}/unread'># nieprzeczytanych</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 nowy</a> temat} other { {BOTH, select, true{and } false {} other{}} <a href='{basePath}/new'># nowych</a> tematów} }, lub {CATEGORY, select, true {przeglądaj inne tematy w {catLink}} false {{latestLink}} other {}}"
@@ -2245,29 +2247,29 @@ pl_PL:
         choose_category: "Wybierz kategorię dla tematu publicznego:"
       feature_topic:
         title: "Wyróżnij ten temat"
-        pin: "Wyróżnij ten temat przypinając go na górze w kategorii {{categoryLink}} do"
-        confirm_pin: "Czy na pewno przypiąć ten temat w tej kategorii? Masz już {{count}} przypiętych tematów -- zbyt wiele może obniżyć czytelność innych aktywnych tematów."
-        unpin: "Odepnij ten temat z początku kategorii {{categoryLink}}."
-        unpin_until: "Odepnij ten temat z początku kategorii {{categoryLink}} lub poczekaj do <strong>%{until}</strong>."
+        pin: "Wyróżnij ten temat przypinając go na górze w kategorii %{categoryLink} do"
+        confirm_pin: "Czy na pewno przypiąć ten temat w tej kategorii? Masz już %{count} przypiętych tematów -- zbyt wiele może obniżyć czytelność innych aktywnych tematów."
+        unpin: "Odepnij ten temat z początku kategorii %{categoryLink}."
+        unpin_until: "Odepnij ten temat z początku kategorii %{categoryLink} lub poczekaj do <strong>%{until}</strong>."
         pin_note: "Każdy użytkownik może samodzielnie usunąć przypięcie dla samego siebie."
         pin_validation: "Przypięcie tego tematu wymaga podania daty."
-        not_pinned: "Brak przypiętych tematów w {{categoryLink}}."
+        not_pinned: "Brak przypiętych tematów w %{categoryLink}."
         already_pinned:
-          one: "Tematy przypięte w {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          few: "Tematy przypięte w {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "Tematy przypięte w {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Tematy przypięte w {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Tematy przypięte w %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          few: "Tematy przypięte w %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          many: "Tematy przypięte w %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Tematy przypięte w %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Wyróżnij ten temat przypinając go na górze wszystkich list do"
-        confirm_pin_globally: "Czy na pewno chcesz globalnie przypiąć kolejny temat? Masz już {{count}} przypiętych tematów -- zbyt wiele może obniżyć czytelność innych aktywnych tematów."
+        confirm_pin_globally: "Czy na pewno chcesz globalnie przypiąć kolejny temat? Masz już %{count} przypiętych tematów -- zbyt wiele może obniżyć czytelność innych aktywnych tematów."
         unpin_globally: "Usuń wyróżnienie dla tego tematu odpinając go z początku wszystkich list."
         unpin_globally_until: "Usuń wyróżnienie dla tego tematu odpinając go z początku wszystkich list lub poczekaj do <strong>%{until}</strong>."
         global_pin_note: "Każdy użytkownik może samodzielnie usunąć przypięcie dla samego siebie."
         not_pinned_globally: "Brak przypiętych globalnie tematów."
         already_pinned_globally:
           one: "Tematy przypięte globalnie: <strong class='badge badge-notification unread'>%{count}</strong>."
-          few: "Tematy przypięte globalnie: <strong class='badge badge-notification unread'>{{count}}</strong>."
-          many: "Tematy przypięte globalnie: <strong class='badge badge-notification unread'>{{count}}</strong>."
-          other: "Tematy przypięte globalnie: <strong class='badge badge-notification unread'>{{count}}</strong>."
+          few: "Tematy przypięte globalnie: <strong class='badge badge-notification unread'>%{count}</strong>."
+          many: "Tematy przypięte globalnie: <strong class='badge badge-notification unread'>%{count}</strong>."
+          other: "Tematy przypięte globalnie: <strong class='badge badge-notification unread'>%{count}</strong>."
         make_banner: "Ustaw ten temat jako baner wyświetlany na górze każdej strony."
         remove_banner: "Usuń ten temat jako baner wyświetlany na górze każdej strony."
         banner_note: "Użytkownicy mogą usunąć baner zamykając go przyciskiem. Tylko jeden temat może być banerem w danej chwili."
@@ -2297,17 +2299,17 @@ pl_PL:
         to_topic_username: "Konto o wprowadzonej nazwie użytkownika otrzyma powiadomienie z linkiem do tego tematu."
         to_username: "Podaj nazwę użytkownika osoby którą chcesz zaprosić. Otrzyma powiadomienie z linkiem do tego tematu."
         email_placeholder: "nazwa@example.com"
-        success_email: "Wysłaliśmy zaproszenie do <b>{{emailOrUsername}}</b>. Otrzymasz powiadomienie, gdy zaproszenie zostanie przyjęte. Sprawdź zakładkę zaproszenia w swoim profilu, aby śledzić status tego i innych zaproszeń."
+        success_email: "Wysłaliśmy zaproszenie do <b>%{emailOrUsername}</b>. Otrzymasz powiadomienie, gdy zaproszenie zostanie przyjęte. Sprawdź zakładkę zaproszenia w swoim profilu, aby śledzić status tego i innych zaproszeń."
         success_username: "Wskazany użytkownik został zaproszony do udziału w tym temacie."
         error: "Przepraszamy, nie udało się zaprosić wskazanej osoby. Być może została już zaproszona? (Lub wysyłasz zbyt wiele zaproszeń)"
-        success_existing_email: "Użytkownik o e-mailu <b>{{emailOrUsername}}</b> już istnieje. Zaprosiliśmu tego użytkownika do udziału w tym temacie."
+        success_existing_email: "Użytkownik o e-mailu <b>%{emailOrUsername}</b> już istnieje. Zaprosiliśmu tego użytkownika do udziału w tym temacie."
       login_reply: "Zaloguj się, aby odpowiedzieć"
       filters:
         n_posts:
           one: "%{count} wpis"
-          few: "{{count}} wpisy"
-          many: "{{count}} wpisów"
-          other: "{{count}} wpisów"
+          few: "%{count} wpisy"
+          many: "%{count} wpisów"
+          other: "%{count} wpisów"
         cancel: "Usuń filtr"
       move_to:
         title: "Przenieś do"
@@ -2321,9 +2323,9 @@ pl_PL:
         error: "Wystąpił błąd podczas przenoszenia wpisów do nowego tematu."
         instructions:
           one: "Masz zamiar utworzyć nowy temat, składający się z wybranego przez ciebie wpisu."
-          few: "Masz zamiar utworzyć nowy temat, składający się z <b>{{count}}</b> wybranych przez ciebie wpisów."
-          many: "Masz zamiar utworzyć nowy temat, składający się z <b>{{count}}</b> wybranych przez ciebie wpisów."
-          other: "Masz zamiar utworzyć nowy temat, składający się z <b>{{count}}</b> wybranych przez ciebie wpisów."
+          few: "Masz zamiar utworzyć nowy temat, składający się z <b>%{count}</b> wybranych przez ciebie wpisów."
+          many: "Masz zamiar utworzyć nowy temat, składający się z <b>%{count}</b> wybranych przez ciebie wpisów."
+          other: "Masz zamiar utworzyć nowy temat, składający się z <b>%{count}</b> wybranych przez ciebie wpisów."
       merge_topic:
         title: "Przenieś do Istniejącego Tematu"
         action: "przenieś do istniejącego tematu"
@@ -2331,9 +2333,9 @@ pl_PL:
         radio_label: "Istniejący temat"
         instructions:
           one: "Wybierz temat, do którego chcesz przenieś ten wpis."
-          few: "Wybierz temat, do którego chcesz przenieść wybrane <b>{{count}}</b> wpisy."
-          many: "Wybierz temat, do którego chcesz przenieść <b>{{count}}</b> wybranych wpisów."
-          other: "Wybierz temat, do którego chcesz przenieść <b>{{count}}</b> wybranych wpisów."
+          few: "Wybierz temat, do którego chcesz przenieść wybrane <b>%{count}</b> wpisy."
+          many: "Wybierz temat, do którego chcesz przenieść <b>%{count}</b> wybranych wpisów."
+          other: "Wybierz temat, do którego chcesz przenieść <b>%{count}</b> wybranych wpisów."
       move_to_new_message:
         title: "Przejdź do nowej wiadomości"
         action: "przejdź do nowej wiadomości"
@@ -2342,9 +2344,9 @@ pl_PL:
         participants: "Uczestnicy"
         instructions:
           one: "Za chwilę utworzysz nową wiadomość i zapełnisz ją wybranym postem."
-          few: "Za chwilę utworzysz nową wiadomość i <b>zapełnisz</b> ją <b>wybranymi</b> postami <b>{{count}}</b> ."
-          many: "Za chwilę utworzysz nową wiadomość i <b>zapełnisz</b> ją <b>wybranymi</b> postami <b>{{count}}</b> ."
-          other: "Za chwilę utworzysz nową wiadomość i <b>zapełnisz</b> ją <b>wybranymi</b> postami <b>{{count}}</b> ."
+          few: "Za chwilę utworzysz nową wiadomość i <b>zapełnisz</b> ją <b>wybranymi</b> postami <b>%{count}</b> ."
+          many: "Za chwilę utworzysz nową wiadomość i <b>zapełnisz</b> ją <b>wybranymi</b> postami <b>%{count}</b> ."
+          other: "Za chwilę utworzysz nową wiadomość i <b>zapełnisz</b> ją <b>wybranymi</b> postami <b>%{count}</b> ."
       move_to_existing_message:
         title: "Przejdź do istniejącej wiadomości"
         action: "przejdź do istniejącej wiadomości"
@@ -2352,9 +2354,9 @@ pl_PL:
         participants: "Uczestnicy"
         instructions:
           one: "Wybierz wiadomość, do której chcesz przenieść ten post."
-          few: "Wybierz wiadomość, do której chcesz przenieść te posty <b>{{count}}</b> ."
-          many: "Wybierz wiadomość, do której chcesz przenieść te posty <b>{{count}}</b> ."
-          other: "Wybierz wiadomość, do której chcesz przenieść te posty <b>{{count}}</b> ."
+          few: "Wybierz wiadomość, do której chcesz przenieść te posty <b>%{count}</b> ."
+          many: "Wybierz wiadomość, do której chcesz przenieść te posty <b>%{count}</b> ."
+          other: "Wybierz wiadomość, do której chcesz przenieść te posty <b>%{count}</b> ."
       merge_posts:
         title: "Scal wybrane posty"
         action: "scal wybrane posty"
@@ -2365,10 +2367,10 @@ pl_PL:
         error: "Wystąpił błąd podczas zmiany właściciela wpisów."
         placeholder: "nazwa nowego właściciela"
         instructions:
-          one: "Wybierz nowego właściciela posta przez <b>@ {{old_user}}</b>"
-          few: "Wybierz nowego właściciela postów {{count}} autorstwa <b>@ {{old_user}}</b>"
-          many: "Wybierz nowego właściciela postów {{count}} autorstwa <b>@ {{old_user}}</b>"
-          other: "Wybierz nowego właściciela postów {{count}} autorstwa <b>@ {{old_user}}</b>"
+          one: "Wybierz nowego właściciela posta przez <b>@ %{old_user}</b>"
+          few: "Wybierz nowego właściciela postów %{count} autorstwa <b>@ %{old_user}</b>"
+          many: "Wybierz nowego właściciela postów %{count} autorstwa <b>@ %{old_user}</b>"
+          other: "Wybierz nowego właściciela postów %{count} autorstwa <b>@ %{old_user}</b>"
       change_timestamp:
         title: "zmień znacznik czasu"
         action: "zmień znacznik czasu"
@@ -2377,7 +2379,7 @@ pl_PL:
         instructions: "Wybierz nowy znacznik czasu dla tematu. Wpisy w temacie zostaną zaktualizowane o tę samą różnicę."
       multi_select:
         select: "wybierz"
-        selected: "wybrano ({{count}})"
+        selected: "wybrano (%{count})"
         select_post:
           label: "wybierz"
           title: "Dodaj wpis do zaznaczenia"
@@ -2396,19 +2398,19 @@ pl_PL:
         deselect_all: odznacz wszystkie
         description:
           one: Wybrano <b>%{count}</b> wpis.
-          few: "Wybrano <b>{{count}}</b> wpisy."
-          many: "Wybrano <b>{{count}}</b> wpisów."
-          other: "Wybrano <b>{{count}}</b> wpisów."
+          few: "Wybrano <b>%{count}</b> wpisy."
+          many: "Wybrano <b>%{count}</b> wpisów."
+          other: "Wybrano <b>%{count}</b> wpisów."
     post:
       quote_reply: "Cytuj"
       edit_reason: "Powód"
-      post_number: "wpis {{number}}"
+      post_number: "wpis %{number}"
       ignored: "Zignorowana treść"
       wiki_last_edited_on: "wiki ostatnio edytowane w"
       last_edited_on: "ostatnia edycja wpisu"
       reply_as_new_topic: "Odpowiedz w nowym temacie"
       reply_as_new_private_message: "Odpowiedź w nowej wiadomości do tego samego odbiorcy"
-      continue_discussion: "Kontynuując dyskusję z {{postLink}}:"
+      continue_discussion: "Kontynuując dyskusję z %{postLink}:"
       follow_quote: "idź do cytowanego wpisu"
       show_full: "Pokaż pełny wpis"
       show_hidden: "Wyświetl ignorowaną treść."
@@ -2422,35 +2424,35 @@ pl_PL:
       locked: "członek personelu zablokował edytowanie tego postu"
       gap:
         one: "pokaż %{count} ukrytą odpowiedź"
-        few: "pokaż {{count}} ukryte odpowiedzi"
-        many: "pokaż {{count}} ukrytych odpowiedzi"
-        other: "pokaż {{count}} ukrytych odpowiedzi"
+        few: "pokaż %{count} ukryte odpowiedzi"
+        many: "pokaż %{count} ukrytych odpowiedzi"
+        other: "pokaż %{count} ukrytych odpowiedzi"
       notice:
-        new_user: "{{user}} opublikował(a) coś po raz pierwszy - powitajmy tę osobę w naszej społeczności!"
-        returning_user: "Minęło trochę czasu, odkąd widzieliśmy {{user}} - jego ostatni post był {{time}}."
+        new_user: "%{user} opublikował(a) coś po raz pierwszy - powitajmy tę osobę w naszej społeczności!"
+        returning_user: "Minęło trochę czasu, odkąd widzieliśmy %{user} - jego ostatni post był %{time}."
       unread: "Nieprzeczytany wpis"
       has_replies:
-        one: "{{count}} odpowiedź"
-        few: "{{count}} odpowiedzi"
-        many: "{{count}} odpowiedzi"
-        other: "{{count}} odpowiedzi"
+        one: "%{count} odpowiedź"
+        few: "%{count} odpowiedzi"
+        many: "%{count} odpowiedzi"
+        other: "%{count} odpowiedzi"
       has_likes_title:
         one: "%{count} osoba lajkuje ten wpis"
-        few: "{{count}} osoby lajkują ten wpis"
-        many: "{{count}} osób lajkuje ten wpis"
-        other: "{{count}} osób lajkuje ten wpis"
+        few: "%{count} osoby lajkują ten wpis"
+        many: "%{count} osób lajkuje ten wpis"
+        other: "%{count} osób lajkuje ten wpis"
       has_likes_title_only_you: "lajkowany wpis"
       has_likes_title_you:
         one: "ty i %{count} inna osoba lajkuje ten wpis"
-        few: "ty i {{count}} inne osoby lajkują ten wpis"
-        many: "ty i {{count}} innych osób lajkuje ten wpis"
-        other: "ty i {{count}} innych osób lajkuje ten wpis"
+        few: "ty i %{count} inne osoby lajkują ten wpis"
+        many: "ty i %{count} innych osób lajkuje ten wpis"
+        other: "ty i %{count} innych osób lajkuje ten wpis"
       errors:
         create: "Przepraszamy, podczas tworzenia twojego wpisu wystąpił błąd. Spróbuj ponownie."
         edit: "Przepraszamy, podczas edytowania twojego wpisu wystąpił błąd. Spróbuj ponownie."
         upload: "Przepraszamy, wystąpił błąd podczas wczytywania Twojego pliku. Proszę, spróbuj ponownie."
         too_many_uploads: "Przepraszamy, ale możesz wgrać tylko jeden plik naraz."
-        upload_not_authorized: "Przepraszamy, plik który próbujesz wgrać jest nie dozwolony (dozwolone rozszerzenia: {{authorized_extensions}})."
+        upload_not_authorized: "Przepraszamy, plik który próbujesz wgrać jest nie dozwolony (dozwolone rozszerzenia: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Przepraszamy, ale nowi użytkownicy nie mogą wgrywać obrazów."
         attachment_upload_not_allowed_for_new_user: "Przepraszamy, ale nowi użytkownicy nie mogą wgrywać załączników."
         attachment_download_requires_login: "Przepraszamy, musisz się zalogować, aby pobierać załączniki."
@@ -2487,14 +2489,14 @@ pl_PL:
         delete_replies:
           direct_replies:
             one: "Tak i bezpośrednia odpowiedź %{count}"
-            few: "Tak i bezpośrednie odpowiedzi {{count}}"
-            many: "Tak i bezpośrednie odpowiedzi {{count}}"
-            other: "Tak i {{count}} bezpośrednich odpowiedzi"
+            few: "Tak i bezpośrednie odpowiedzi %{count}"
+            many: "Tak i bezpośrednie odpowiedzi %{count}"
+            other: "Tak i %{count} bezpośrednich odpowiedzi"
           all_replies:
             one: "Tak i odpowiedź %{count}"
-            few: "Tak i wszystkie odpowiedzi {{count}}"
-            many: "Tak i wszystkie odpowiedzi {{count}}"
-            other: "Tak i wszystkie {{count}} odpowiedzi "
+            few: "Tak i wszystkie odpowiedzi %{count}"
+            many: "Tak i wszystkie odpowiedzi %{count}"
+            other: "Tak i wszystkie %{count} odpowiedzi "
           just_the_post: "Nie, tylko ten post"
         admin: "administracja wpisem (tryb wiki itp)"
         wiki: "Włącz tryb Wiki"
@@ -2544,15 +2546,15 @@ pl_PL:
       delete:
         confirm:
           one: "Czy na pewno chcesz usunąć ten post?"
-          few: "Czy na pewno chcesz usunąć te {{count}} posty?"
-          many: "Czy na pewno chcesz usunąć te {{count}} postów? "
-          other: "Czy na pewno chcesz usunąć te {{count}} postów?"
+          few: "Czy na pewno chcesz usunąć te %{count} posty?"
+          many: "Czy na pewno chcesz usunąć te %{count} postów? "
+          other: "Czy na pewno chcesz usunąć te %{count} postów?"
       merge:
         confirm:
           one: "Czy na pewno chcesz połączyć te posty?"
-          few: "Czy na pewno chcesz połączyć te {{count}} postów?"
-          many: "Czy na pewno chcesz połączyć te {{count}} postów?"
-          other: "Czy na pewno chcesz połączyć te {{count}} postów?"
+          few: "Czy na pewno chcesz połączyć te %{count} postów?"
+          many: "Czy na pewno chcesz połączyć te %{count} postów?"
+          other: "Czy na pewno chcesz połączyć te %{count} postów?"
       revisions:
         controls:
           first: "Pierwsza wersja"
@@ -2722,19 +2724,19 @@ pl_PL:
       custom_message:
         at_least:
           one: "wprowadź co najmniej %{count} znak"
-          few: "wprowadź co najmniej {{count}} znaki"
-          many: "wprowadź co najmniej {{count}} znaków"
-          other: "wprowadź co najmniej {{count}} znaków"
+          few: "wprowadź co najmniej %{count} znaki"
+          many: "wprowadź co najmniej %{count} znaków"
+          other: "wprowadź co najmniej %{count} znaków"
         more:
           one: " pozostał %{count}"
-          few: "pozostały {{count}}"
-          many: "pozostało {{count}}"
-          other: "pozostało {{count}} "
+          few: "pozostały %{count}"
+          many: "pozostało %{count}"
+          other: "pozostało %{count} "
         left:
           one: "%{count} pozostał"
-          few: "{{count}} pozostało"
-          many: "{{count}} pozostało"
-          other: "{{count}} pozostało"
+          few: "%{count} pozostało"
+          many: "%{count} pozostało"
+          other: "%{count} pozostało"
     flagging_topic:
       title: "Dziękujemy za pomoc w utrzymaniu porządku w naszej społeczności!"
       action: "Zgłoś temat"
@@ -2779,7 +2781,7 @@ pl_PL:
       unlisted:
         help: "Temat jest niewidoczny: nie będzie wyświetlany na listach tematów a dostęp do niego można uzyskać jedynie poprzez link bezpośredni"
     posts: "Wpisy"
-    posts_long: "jest {{number}} wpisów w tym temacie"
+    posts_long: "jest %{number} wpisów w tym temacie"
     posts_likes_MF: |
       Ten temat ma {count, plural, one {1 reply} other {# replies}} {ratio, select
       low{odpowiedzi z dużą ilością lajk'ów w poście}
@@ -2796,9 +2798,9 @@ pl_PL:
     replies: "Odpowiedzi"
     views_long:
       one: "ten temat był przeglądany %{count} raz"
-      few: "ten temat był przeglądany {{number}} razy"
-      many: "ten temat był przeglądany {{number}} razy"
-      other: "ten temat był przeglądany {{number}} razy"
+      few: "ten temat był przeglądany %{number} razy"
+      many: "ten temat był przeglądany %{number} razy"
+      other: "ten temat był przeglądany %{number} razy"
     activity: "Aktywność"
     likes: "Lajki"
     likes_lowercase:
@@ -2806,7 +2808,7 @@ pl_PL:
       few: "lajki"
       many: "lajków"
       other: "lajków"
-    likes_long: "jest {{number}} lajków w tym temacie"
+    likes_long: "jest %{number} lajków w tym temacie"
     users: "Użytkownicy"
     users_lowercase:
       one: "użytkownik"
@@ -2815,7 +2817,7 @@ pl_PL:
       other: "użytkowników"
     category_title: "Kategoria"
     history: "Historia"
-    changed_by: "przez {{author}}"
+    changed_by: "przez %{author}"
     raw_email:
       title: "Email przychodzący"
       not_available: "Niedostępne!"
@@ -2827,43 +2829,43 @@ pl_PL:
         title: "Aktualne"
         title_with_count:
           one: "Aktualne (%{count})"
-          few: "Aktualne ({{count}})"
-          many: "Aktualne ({{count}})"
-          other: "Aktualne ({{count}})"
+          few: "Aktualne (%{count})"
+          many: "Aktualne (%{count})"
+          other: "Aktualne (%{count})"
         help: "tematy z ostatnimi wpisami"
       read:
         title: "Przeczytane"
         help: "tematy które przeczytałeś, w kolejności od ostatnio przeczytanych"
       categories:
         title: "Kategorie"
-        title_in: "Kategoria - {{categoryName}}"
+        title_in: "Kategoria - %{categoryName}"
         help: "wszystkie tematy zgrupowane przez kategorię"
       unread:
         title: "Nieprzeczytane"
         title_with_count:
           one: "Nieprzeczytane (%{count})"
-          few: "Nieprzeczytane ({{count}})"
-          many: "Nieprzeczytane ({{count}})"
-          other: "Nieprzeczytane ({{count}})"
+          few: "Nieprzeczytane (%{count})"
+          many: "Nieprzeczytane (%{count})"
+          other: "Nieprzeczytane (%{count})"
         help: "obserwowane lub śledzone tematy z nieprzeczytanymi wpisami"
         lower_title_with_count:
           one: "%{count} nieprzeczytany"
-          few: "{{count}} nieprzeczytane"
-          many: "{{count}} nieprzeczytanych"
-          other: "{{count}} nieprzeczytanych"
+          few: "%{count} nieprzeczytane"
+          many: "%{count} nieprzeczytanych"
+          other: "%{count} nieprzeczytanych"
       new:
         lower_title_with_count:
           one: "%{count} nowa"
-          few: "{{count}} nowe"
-          many: "{{count}} nowych"
-          other: "{{count}} nowych"
+          few: "%{count} nowe"
+          many: "%{count} nowych"
+          other: "%{count} nowych"
         lower_title: "nowe"
         title: "Nowe"
         title_with_count:
           one: "Nowe (%{count})"
-          few: "Nowe ({{count}})"
-          many: "Nowe ({{count}})"
-          other: "Nowe ({{count}})"
+          few: "Nowe (%{count})"
+          many: "Nowe (%{count})"
+          other: "Nowe (%{count})"
         help: "tematy dodane w ciągu ostatnich kilku dni"
       posted:
         title: "Wysłane"
@@ -2872,13 +2874,13 @@ pl_PL:
         title: "Zakładki"
         help: "tematy dodane do zakładek"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          few: "{{categoryName}} ({{count}})"
-          many: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
-        help: "najnowsze tematy w kategorii {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          few: "%{categoryName} (%{count})"
+          many: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "najnowsze tematy w kategorii %{categoryName}"
       top:
         title: "Popularne"
         help: "popularne tematy w ubiegłym roku, miesiącu, tygodniu lub dniu"
@@ -3023,9 +3025,9 @@ pl_PL:
       delete_tag: "Usuń Tag"
       delete_confirm:
         one: "Czy na pewno chcesz usunąć ten tag i usunąć go z %{count} wątku, do którego jest przypisany?"
-        few: "Czy na pewno chcesz usunąć ten tag i usunąć go z {{count}} wątków, do których jest przypisany?"
-        many: "Czy na pewno chcesz usunąć ten tag i usunąć go z {{count}} wątków, do których jest przypisany?"
-        other: "Czy na pewno chcesz usunąć ten tag i usunąć go z {{count}} wątków, do których jest przypisany?"
+        few: "Czy na pewno chcesz usunąć ten tag i usunąć go z %{count} wątków, do których jest przypisany?"
+        many: "Czy na pewno chcesz usunąć ten tag i usunąć go z %{count} wątków, do których jest przypisany?"
+        other: "Czy na pewno chcesz usunąć ten tag i usunąć go z %{count} wątków, do których jest przypisany?"
       delete_confirm_no_topics: "Czy na pewno chcesz usunąć ten tag?"
       rename_tag: "Zmień nazwę taga"
       rename_instructions: "Wybierz nową nazwę dla tego taga:"
@@ -3373,14 +3375,14 @@ pl_PL:
           redeliver: "Dostarcz ponownie"
           incoming:
             one: "Istnieje nowe wydarzenie "
-            few: "Istnieją {{count}} nowe wydarzenia. "
-            many: "Istnieje {{count}} nowych wydarzeń."
-            other: "Istnieje {{count}} nowych wydarzeń. "
+            few: "Istnieją %{count} nowe wydarzenia. "
+            many: "Istnieje %{count} nowych wydarzeń."
+            other: "Istnieje %{count} nowych wydarzeń. "
           completed_in:
             one: "Ukończono w %{count} sekundę."
-            few: "Ukończono w {{count}} sekundy."
-            many: "Ukończono w {{count}} sekund."
-            other: "Ukończono w {{count}} sekund."
+            few: "Ukończono w %{count} sekundy."
+            many: "Ukończono w %{count} sekund."
+            other: "Ukończono w %{count} sekund."
           request: "Żądanie"
           response: "Odpowiedź"
           redeliver_confirm: "Czy jesteś pewien, że chcesz dostarczyć ponownie tą samą zawartość?"
@@ -3432,12 +3434,12 @@ pl_PL:
           label: "Wyślij"
           title: "Wyślij kopię zapasową do tej instancji"
           uploading: "Wysyłanie…"
-          uploading_progress: "Przesyłanie ... {{progress}}%"
-          success: "Plik „{{filename}}” został pomyślnie przesłany. Plik jest teraz przetwarzany i pojawienie się na liście może potrwać do minuty."
-          error: "Podczas przesyłania pliku wystąpił błąd '{{filename}}': {{message}}"
+          uploading_progress: "Przesyłanie ... %{progress}%"
+          success: "Plik „%{filename}” został pomyślnie przesłany. Plik jest teraz przetwarzany i pojawienie się na liście może potrwać do minuty."
+          error: "Podczas przesyłania pliku wystąpił błąd '%{filename}': %{message}"
         operations:
           is_running: "Proces jest w trakcie działania…"
-          failed: "Proces {{operation}} zakończył się niepowodzeniem. Sprawdź logi."
+          failed: "Proces %{operation} zakończył się niepowodzeniem. Sprawdź logi."
           cancel:
             label: "Anuluj"
             title: "Anuluj bieżącą operację"
@@ -3555,7 +3557,7 @@ pl_PL:
           disabled_component_tooltip: "Ten komponent został wyłączony"
           default_theme_tooltip: "Ten motyw jest domyślnym motywem witryny"
           updates_available_tooltip: "Dostępne są aktualizacje dla tego motywu"
-          and_x_more: "i {{count}} więcej."
+          and_x_more: "i %{count} więcej."
           collapse: Zwiń
           uploads: "Pliki"
           no_uploads: "Możesz załadować zasoby do swojego motywu np. fonty lub obrazy"
@@ -3599,8 +3601,8 @@ pl_PL:
           disabled_by: "Ten komponent został wyłączony przez"
           required_version:
             error: "Ten motyw został automatycznie wyłączony, ponieważ nie jest kompatybilny z tą wersją Discourse."
-            minimum: "Wymaga wersji {{version}} Discourse'a lub wyższej."
-            maximum: "Wymaga wersji {{version}} Discourse'a lub niższej."
+            minimum: "Wymaga wersji %{version} Discourse'a lub wyższej."
+            maximum: "Wymaga wersji %{version} Discourse'a lub niższej."
           component_of: "Składnik:"
           update_to_latest: "Aktualizuj do najnowszego"
           check_for_updates: "Sprawdź dostępność aktualizacji"
@@ -3613,9 +3615,9 @@ pl_PL:
           empty: "Brak elementu"
           commits_behind:
             one: "Motyw jest %{count} aktualizację w tyle!"
-            few: "Motyw jest {{count}} aktualizacji w tyle!"
-            many: "Motyw jest {{count}} aktualizacji w tyle!"
-            other: "Motyw jest {{count}} aktualizacji w tyle!"
+            few: "Motyw jest %{count} aktualizacji w tyle!"
+            many: "Motyw jest %{count} aktualizacji w tyle!"
+            other: "Motyw jest %{count} aktualizacji w tyle!"
           compare_commits: "(Sprawdź nowe commity)"
           repo_unreachable: "Nie można skontaktować się z repozytorium Git tego motywu. Komunikat o błędzie:"
           imported_from_archive: "Motyw został zaimportowany z pliku .zip"
@@ -4009,8 +4011,8 @@ pl_PL:
           title: "Wyświetl adres email tego użytkownika"
           text: "Pokaż"
       user:
-        suspend_failed: "Coś poszło nie tak podczas zawieszania użytkownika {{error}}"
-        unsuspend_failed: "Coś poszło nie tak podczas odwieszania użytkownika {{error}}"
+        suspend_failed: "Coś poszło nie tak podczas zawieszania użytkownika %{error}"
+        unsuspend_failed: "Coś poszło nie tak podczas odwieszania użytkownika %{error}"
         suspend_duration: "Jak długo użytkownik ma być zawieszony?"
         suspend_reason_label: "Dlaczego zawieszasz? Ten tekst <b>będzie widoczny dla wszystkich</b> na stronie profilu użytkownika i będzie wyświetlany użytkownikowi gdy ten będzie próbował się zalogować. Zachowaj zwięzłość."
         suspend_reason_hidden_label: "Dlaczego zawieszasz użytkownika? Ten krótki tekst zostanie wyświetlony, gdy zawieszony użytkownik spróbuje się zalogować. "
@@ -4363,6 +4365,7 @@ pl_PL:
         title: "Emoji"
         help: "Dodawanie nowych emoji. (PROTIP: przeciągnij i upuść wiele plików)"
         add: "Dodaj nowe Emoji"
+        uploading: "Przesyłanie…"
         name: "Nazwa"
         group: "Grupa"
         image: "Grafika"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index b32843edab..ed641a74af 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -23,8 +23,8 @@ pt:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "hh:mm"
       timeline_date: "MMM YYYY"
@@ -214,11 +214,11 @@ pt:
     weekly: "semanal"
     every_month: "cada mês"
     every_six_months: "a cada seis meses"
-    max_of_count: "máximo de {{count}}"
+    max_of_count: "máximo de %{count}"
     alternation: "ou"
     character_count:
-      one: "{{count}} caracter"
-      other: "{{count}} caracteres"
+      one: "%{count} caracter"
+      other: "%{count} caracteres"
     related_messages:
       title: "Mensagens Relacionadas"
     suggested_topics:
@@ -270,14 +270,14 @@ pt:
         yes_value: "Sim, abandonar"
         no_value: "Não, manter"
     topic_count_latest:
-      one: "Ver {{count}} tópico novo ou atualizado"
-      other: "Ver {{count}} tópicos novos ou atualizados"
+      one: "Ver %{count} tópico novo ou atualizado"
+      other: "Ver %{count} tópicos novos ou atualizados"
     topic_count_unread:
-      one: "Ver {{count}} tópico não lido"
-      other: "Ver {{count}} tópicos não lidos"
+      one: "Ver %{count} tópico não lido"
+      other: "Ver %{count} tópicos não lidos"
     topic_count_new:
-      one: "Ver {{count}} tópico novo"
-      other: "Ver {{count}} tópicos novos"
+      one: "Ver %{count} tópico novo"
+      other: "Ver %{count} tópicos novos"
     preview: "pré-visualizar"
     cancel: "cancelar"
     save: "Guardar alterações"
@@ -285,7 +285,7 @@ pt:
     saved: "Guardado!"
     upload: "Carregar"
     uploading: "A carregar…"
-    uploading_filename: "A enviar: {{filename}}..."
+    uploading_filename: "A enviar: %{filename}..."
     clipboard: "área de transferência"
     uploaded: "Carregado!"
     pasting: "Colando..."
@@ -353,19 +353,19 @@ pt:
         description: "Recebemos a sua nova publicação mas necessita de ser aprovada pelo moderador antes de aparecer. Por favor seja paciente."
         ok: "CONFIRMAR"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> publicou <a href='{{topicUrl}}'>o tópico</a>"
-      you_posted_topic: "<a href='{{userUrl}}'></a> publicou <a href='{{topicUrl}}'>o tópico</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> respondeu a <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Você</a> respondeu a <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> respondeu ao <a href='{{topicUrl}}'>tópico</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'></a> respondeu ao <a href='{{topicUrl}}'>tópico</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> mencionou <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a><a href='{{user2Url}}'> mencionou-o</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'></a> mencionou <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Publicado por <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Publicado por <a href='{{userUrl}}'>si</a>"
-      sent_by_user: "Enviado por <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Enviado por <a href='{{userUrl}}'>si</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> publicou <a href='%{topicUrl}'>o tópico</a>"
+      you_posted_topic: "<a href='%{userUrl}'></a> publicou <a href='%{topicUrl}'>o tópico</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> respondeu a <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Você</a> respondeu a <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> respondeu ao <a href='%{topicUrl}'>tópico</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'></a> respondeu ao <a href='%{topicUrl}'>tópico</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> mencionou <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a><a href='%{user2Url}'> mencionou-o</a>"
+      you_mentioned_user: "<a href='%{user1Url}'></a> mencionou <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Publicado por <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Publicado por <a href='%{userUrl}'>si</a>"
+      sent_by_user: "Enviado por <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Enviado por <a href='%{userUrl}'>si</a>"
     directory:
       filter_name: "filtrar por nome de utilizador"
       title: "Utilizadores"
@@ -584,7 +584,7 @@ pt:
     user_fields:
       none: "(selecione uma opção)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Perfil"
       mute: "Silenciar"
       edit: "Editar Preferências"
@@ -642,12 +642,12 @@ pt:
       external_links_in_new_tab: "Abrir todas as hiperligações externas num novo separador"
       enable_quoting: "Ativar resposta usando citação de texto destacado"
       change: "alterar"
-      moderator: "{{user}} é um moderador"
-      admin: "{{user}} é um administrador"
+      moderator: "%{user} é um moderador"
+      admin: "%{user} é um administrador"
       moderator_tooltip: "Este utilizador é um moderador"
       admin_tooltip: "Este utilizador é um administrador"
       silenced_tooltip: "Este utilizador está silenciado"
-      suspended_notice: "Este utilizador está suspenso até {{date}}."
+      suspended_notice: "Este utilizador está suspenso até %{date}."
       suspended_permanently: "Este utilizador está suspenso"
       suspended_reason: "Motivo: "
       github_profile: "Github"
@@ -662,7 +662,7 @@ pt:
           Tópicos e categorias silenciados não são incluídos nestes correios electrónicos.
         individual: "Enviar um email por cada nova publicação"
         individual_no_echo: "Enviar um email por cada nova publicação excepto as minhas"
-        many_per_day: "Mandar-me um email por cada nova publicação (cerca de {{dailyEmailEstimate}} por dia)"
+        many_per_day: "Mandar-me um email por cada nova publicação (cerca de %{dailyEmailEstimate} por dia)"
         few_per_day: "Mandar-me um email por cada nova publicação (cerca de 2 por dia)"
         warning: "Modo de mailing list ativo. As definições de notificação por email vão ser ignoradas."
       tag_settings: "Etiquetas"
@@ -691,9 +691,7 @@ pt:
       admin_delete: "Apagar"
       users: "Utilizadores"
       muted_users: "Silenciado"
-      muted_users_instructions: "Suprimir todas as notificações destes utilizadores."
       ignored_users: "Ignorados"
-      ignored_users_instructions: "Suprimir todas as publicações e notificações destes utilizadores."
       tracked_topics_link: "Exibir"
       automatically_unpin_topics: "Desafixar tópicos automaticamente quando eu chegar ao final."
       apps: "Aplicações"
@@ -748,7 +746,7 @@ pt:
         enable_long: "Ativar códigos de reserva"
         copy_to_clipboard_error: "Erro a copiar dados para a Área de Transferência"
         copied_to_clipboard: "Copiado para a Área de Transferência"
-        remaining_codes: "Restam <strong>{{count}}</strong> códigos de reserva."
+        remaining_codes: "Restam <strong>%{count}</strong> códigos de reserva."
         codes:
           title: "Códigos de Reserva Gerados"
           description: "Cada um dos códigos de reserva só pode ser usado uma vez. Guarde-os num sítio seguro mas acessível."
@@ -801,11 +799,11 @@ pt:
         no_secondary: "Não existem emails secundários"
         ok: "Enviar-lhe-emos um email para confirmar"
         invalid: "Por favor introduza um endereço de email válido"
-        authenticated: "O seu email foi autenticado por {{provider}}"
+        authenticated: "O seu email foi autenticado por %{provider}"
         frequency_immediately: "Enviar-lhe-emos um email imediatamente caso não leia o que lhe estamos a enviar."
         frequency:
           one: "Só iremos enviar-lhe um email se não o tivermos visto no último minuto."
-          other: "Só iremos enviar-lhe um email se não o tivermos visto nos últimos {{count}} minutos."
+          other: "Só iremos enviar-lhe um email se não o tivermos visto nos últimos %{count} minutos."
       associated_accounts:
         title: "Contas Associadas"
         connect: "Associar"
@@ -821,9 +819,9 @@ pt:
       username:
         title: "Nome de Utilizador"
         instructions: "único, sem espaços, curto"
-        short_instructions: "As pessoas podem mencioná-lo como {{username}}"
+        short_instructions: "As pessoas podem mencioná-lo como %{username}"
         available: "O seu nome de utilizador está disponível"
-        not_available: "Não está disponível. Tente {{suggestion}}?"
+        not_available: "Não está disponível. Tente %{suggestion}?"
         not_available_no_suggestion: "Indisponível"
         too_short: "O seu nome de utilizador é muito curto"
         too_long: "O seu nome de utilizador é muito longo"
@@ -843,11 +841,11 @@ pt:
         log_out_all: "Sair de todas as contas"
         active: "ativas agora"
         not_you: "Não é a sua conta?"
-        show_all: "Mostrar todas ({{count}})"
+        show_all: "Mostrar todas (%{count})"
         show_few: "Mostrar menos"
         was_this_you: "Foi uma ação sua?"
         was_this_you_description: "Se não foi uma ação sua, recomendamos que altere a sua palavra-passe e saia de todas as contas."
-        browser_and_device: "{{browser}} no {{device}}"
+        browser_and_device: "%{browser} no %{device}"
         secure_account: "Proteger a minha Conta"
         latest_post: "A sua última publicação..."
       last_posted: "Última Publicação"
@@ -922,20 +920,19 @@ pt:
         none: "Sem convites para exibir."
         truncated:
           one: "A exibir o primeiro convite."
-          other: "A exibir os primeiros {{count}} convites."
+          other: "A exibir os primeiros %{count} convites."
         redeemed: "Convites Resgatados"
         redeemed_tab: "Resgatado"
-        redeemed_tab_with_count: "Resgatados ({{count}})"
+        redeemed_tab_with_count: "Resgatados (%{count})"
         redeemed_at: "Resgatado"
         pending: "Convites Pendentes"
         pending_tab: "Pendente"
-        pending_tab_with_count: "Pendentes ({{count}})"
+        pending_tab_with_count: "Pendentes (%{count})"
         topics_entered: "Tópicos Visualizados"
         posts_read_count: "Publicações Lidas"
         expired: "Este convite expirou."
         rescind: "Remover"
         rescinded: "Convite removido"
-        rescind_all: "Remover todos os Convites Expirados"
         rescinded_all: "Todos os Convites Expirados foram removidos!"
         rescind_all_confirm: "Tem a certeza que pretende remover todos os convites expirados?"
         reinvite: "Reenviar Convite"
@@ -946,13 +943,17 @@ pt:
         time_read: "Tempo de Leitura"
         days_visited: "Dias Visitados"
         account_age_days: "Idade da conta, em dias"
-        create: "Enviar um Convite"
+        links_tab: "Hiperligações"
+        link_created_at: "Criado"
+        link_groups: Grupos
+        create: "Enviar Convite"
         generate_link: "Copiar Hiperligação do Convite"
         link_generated: "Hiperligação do convite gerada com sucesso!"
         valid_for: "A hiperligação do convite é válida apenas para este endereço de e-mail: %{email}"
+        invite_link:
+          success: "Hiperligação do convite gerada com sucesso!"
         bulk_invite:
           none: "Ainda não convidou ninguém aqui. Envie convites individuais, ou convide muitas pessoas de uma vez só, <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>enviando um ficheiro CSV</a>."
-          text: "Convite em série a partir do 'Ficheiro'"
           success: "Ficheiro enviado corretamente, será notificado via mensagem quando o processo estiver concluído."
           error: "Desculpe, o ficheiro deverá estar no formato CSV."
           confirmation_message: "Está prestes a enviar convites por email a todos os incluídos no ficheiro que enviou."
@@ -1043,7 +1044,7 @@ pt:
       desc:
         network: "Por favor, verifique a sua ligação."
         network_fixed: "Parece que está de volta."
-        server: "Código de erro: {{status}}"
+        server: "Código de erro: %{status}"
         forbidden: "Não está autorizado para ver isso."
         not_found: "Ups, a aplicação tentou carregar um URL que não existe."
         unknown: "Correu algo de errado."
@@ -1093,8 +1094,8 @@ pt:
       value_prop: "Quando cria uma conta, nós lembramo-nos exatamente o que já leu, por isso volta sempre ao sítio onde parou. Também recebe notificações, aqui e por email, cada vez que alguém lhe responde. E pode gostar das publicações para interagir com outros utilizadores. :heartpulse:"
     summary:
       enabled_description: "Está a ver um resumo deste tópico: as respostas mais interessantes são determinadas pela comunidade."
-      description: "Existem <b>{{replyCount}}</b> respostas."
-      description_time: "Existem <b>{{replyCount}}</b> respostas com um tempo de leitura estimado de <b>{{readingTime}} minutos</b>."
+      description: "Existem <b>%{replyCount}</b> respostas."
+      description_time: "Existem <b>%{replyCount}</b> respostas com um tempo de leitura estimado de <b>%{readingTime} minutos</b>."
       enable: "Resumir Este Tópico"
       disable: "Mostrar Todas As Publicações"
     deleted_filter:
@@ -1107,8 +1108,8 @@ pt:
       invite: "Convidar Outros ..."
       edit: "Adicionar ou Remover ..."
       leave_message: "Quer mesmo deixar esta mensagem?"
-      remove_allowed_user: "Deseja mesmo remover {{name}} desta mensagem?"
-      remove_allowed_group: "Deseja mesmo remover {{name}} desta mensagem?"
+      remove_allowed_user: "Deseja mesmo remover %{name} desta mensagem?"
+      remove_allowed_group: "Deseja mesmo remover %{name} desta mensagem?"
     email: "E-mail"
     username: "Nome de utilizador"
     last_seen: "Visto"
@@ -1117,7 +1118,7 @@ pt:
     trust_level: "Nível de Confiança"
     search_hint: "nome de utilizador, e-mail ou endereço de IP"
     create_account:
-      disclaimer: "Ao registar-se, concorda com a <a href='{{privacy_link}}' target='blank'>política de privacidade</a> e os <a href='{{tos_link}}' target='blank'>termos do serviço</a>."
+      disclaimer: "Ao registar-se, concorda com a <a href='%{privacy_link}' target='blank'>política de privacidade</a> e os <a href='%{tos_link}' target='blank'>termos do serviço</a>."
       title: "Criar Nova Conta"
       failed: "Ocorreu algo de errado, este e-mail já pode estar registado. Tente utilizar a hiperligação \"Esqueci-me da Palavra-passe\"."
     forgot_password:
@@ -1163,7 +1164,7 @@ pt:
       awaiting_activation: "A sua conta está a aguardar ativação. Utilize a hiperligação \"Esqueci-me da Palavra-passe\" para pedir uma nova mensagem de ativação."
       awaiting_approval: "A sua conta ainda não foi aprovada por um membro da equipa. Nós Iremos enviar uma mensagem quando esta for aprovada."
       requires_invite: "Desculpe, o acesso a este fórum é apenas através de convite."
-      not_activated: "Ainda não pode iniciar a sessão. Nós enviámos anteriormente uma mensagem de ativação para o seu endereço <b>{{sentTo}}</b>. Por favor, siga as instruções contidas nessa mensagem para ativar a sua conta."
+      not_activated: "Ainda não pode iniciar a sessão. Nós enviámos anteriormente uma mensagem de ativação para o seu endereço <b>%{sentTo}</b>. Por favor, siga as instruções contidas nessa mensagem para ativar a sua conta."
       not_allowed_from_ip_address: "Não pode iniciar a sessão a partir desse endereço de IP."
       admin_not_allowed_from_ip_address: "Não pode iniciar a sessão como administrador a partir desse endereço de IP."
       resend_activation_email: "Clique aqui para enviar novamente a mensagem de ativação."
@@ -1172,7 +1173,7 @@ pt:
       change_email: "Alterar Endereço de E-mail"
       provide_new_email: "Forneça um novo endereço e nós iremos reenviar a sua mensagem de confirmação."
       submit_new_email: "Atualizar Endereço de E-mail"
-      sent_activation_email_again: "Nós enviámos outra mensagem de ativação para o seu endereço <b>{{currentEmail}}</b>. Esta pode demorar alguns minutos para a receber; certifique-se que verifica a sua pasta de spam."
+      sent_activation_email_again: "Nós enviámos outra mensagem de ativação para o seu endereço <b>%{currentEmail}</b>. Esta pode demorar alguns minutos para a receber; certifique-se que verifica a sua pasta de spam."
       sent_activation_email_again_generic: "Enviámos outro email de ativação. Pode demorar alguns minutos até que chegue; certifique-se de que verifica a sua pasta de spam."
       to_continue: "Por favor, inicie a sessão"
       preferences: "Necessita de ter a sessão iniciada para alterar as suas preferências de utilizador."
@@ -1231,13 +1232,13 @@ pt:
       no_content: Não foram encontradas correspondências
       filter_placeholder: Pesquisar...
       filter_placeholder_with_any: Pesquisar ou criar...
-      create: "Criar: '{{content}}'"
+      create: "Criar: '%{content}'"
       max_content_reached:
-        one: "Só consegue selecionar {{count}} item."
-        other: "Só consegue selecionar {{count}} itens."
+        one: "Só consegue selecionar %{count} item."
+        other: "Só consegue selecionar %{count} itens."
       min_content_not_reached:
-        one: "Selecione pelo menos {{count}} item."
-        other: "Selecione pelo menos {{count}} itens."
+        one: "Selecione pelo menos %{count} item."
+        other: "Selecione pelo menos %{count} itens."
     date_time_picker:
       from: De
       to: Para
@@ -1262,7 +1263,7 @@ pt:
       default: Emojis Personalizados
     shared_drafts:
       title: "Rascunhos Partilhados"
-      notice: "Este tópico só está visível aos utilizadores que conseguem ver a categoria <b>{{category}}</b>."
+      notice: "Este tópico só está visível aos utilizadores que conseguem ver a categoria <b>%{category}</b>."
       destination_category: "Categoria Destino"
       publish: "Publicar Rascunho Partilhado"
       confirm_publish: "Tem a certeza que quer publicar este rascunho?"
@@ -1282,22 +1283,22 @@ pt:
       similar_topics: "O seu tópico é similar a..."
       drafts_offline: "rascunhos off-line"
       edit_conflict: "editar conflito"
-      group_mentioned_limit: "<b>Aviso!</b> Mencionou o grupo <a href='{{group_link}}'>{{group}}</a>, no entanto este grupo tem um número de membros superior ao limite de menções configurado pelo administrador ({{max}} utilizadores). Ninguém vai ser notificado."
+      group_mentioned_limit: "<b>Aviso!</b> Mencionou o grupo <a href='%{group_link}'>%{group}</a>, no entanto este grupo tem um número de membros superior ao limite de menções configurado pelo administrador (%{max} utilizadores). Ninguém vai ser notificado."
       group_mentioned:
-        one: "Ao usar {{group}}, estará a notificar <a href='{{group_link}}'>%{count} pessoa</a> – tem a certeza?"
-        other: "Ao mencionar {{group}}, estará a notificar <a href='{{group_link}}'>{{count}} pessoas</a> – tem a certeza?"
+        one: "Ao usar %{group}, estará a notificar <a href='%{group_link}'>%{count} pessoa</a> – tem a certeza?"
+        other: "Ao mencionar %{group}, estará a notificar <a href='%{group_link}'>%{count} pessoas</a> – tem a certeza?"
       cannot_see_mention:
-        category: "Mencionou {{username}} , mas este não será notificado porque não têm acesso a esta categoria. Terá de os adicionar a um grupo que tenha acesso a esta categoria."
-        private: "Mencionou {{username}}, mas este não será notificado porque não consegue ver esta mensagem privada. Terá de o convidar para esta MP."
-      duplicate_link: "Parce que a sua hiperligação para <b>{{domain}}</b> já foi publicada neste tópico por <b>@{{username}}</b> numa <a href='{{post_url}}'>resposta {{ago}}</a> – tem a certeza que a quer publicar novamente?"
+        category: "Mencionou %{username} , mas este não será notificado porque não têm acesso a esta categoria. Terá de os adicionar a um grupo que tenha acesso a esta categoria."
+        private: "Mencionou %{username}, mas este não será notificado porque não consegue ver esta mensagem privada. Terá de o convidar para esta MP."
+      duplicate_link: "Parce que a sua hiperligação para <b>%{domain}</b> já foi publicada neste tópico por <b>@%{username}</b> numa <a href='%{post_url}'>resposta %{ago}</a> – tem a certeza que a quer publicar novamente?"
       error:
         title_missing: "O título é obrigatório"
-        title_too_short: "O título tem que ter pelo menos {{min}} carateres."
-        title_too_long: "O título não pode conter mais do que {{max}} carateres."
-        post_length: "A publicação tem que ter pelo menos {{min}} carateres"
-        try_like: "Já experimentou o botão {{heart}}?"
+        title_too_short: "O título tem que ter pelo menos %{min} carateres."
+        title_too_long: "O título não pode conter mais do que %{max} carateres."
+        post_length: "A publicação tem que ter pelo menos %{min} carateres"
+        try_like: "Já experimentou o botão %{heart}?"
         category_missing: "Tem de escolher uma categoria"
-        tags_missing: "Tem de escolher pelo menos {{count}} etiquetas"
+        tags_missing: "Tem de escolher pelo menos %{count} etiquetas"
       save_edit: "Guardar Edição"
       overwrite_edit: "Guardar Edição"
       reply_original: "Responder no Tópico Original"
@@ -1390,50 +1391,50 @@ pt:
       tooltip:
         regular:
           one: "Uma notificação não visualizada"
-          other: "{{count}} notificações não visualizadas"
+          other: "%{count} notificações não visualizadas"
         message:
           one: "Uma mensagem não lida"
-          other: "{{count}} mensagens não lidas"
+          other: "%{count} mensagens não lidas"
       title: "notificações de menções de @name, respostas às suas publicações e tópicos, mensagens, etc"
       none: "De momento, não é possível carregar as notificações."
       empty: "Não foram encontradas notificações."
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} e %{count} outro</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} e {{count}} outros</span> {{description}}"
+        one: "<span>%{username}, %{username2} e %{count} outro</span> %{description}"
+        other: "<span>%{username}, %{username2} e %{count} outros</span> %{description}"
       liked_consolidated_description:
-        one: "gostou de {{count}} das suas publicações"
-        other: "gostou de {{count}} das suas publicações"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> aceitou o seu convite"
-      moved_post: "<span>{{username}}</span> movido {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Ganhou '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Novo Tópico</span> {{description}}"
+        one: "gostou de %{count} das suas publicações"
+        other: "gostou de %{count} das suas publicações"
+      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}"
+      invitee_accepted: "<span>%{username}</span> aceitou o seu convite"
+      moved_post: "<span>%{username}</span> movido %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Ganhou '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Novo Tópico</span> %{description}"
       group_message_summary:
-        one: "{{count}} mensagem no seu grupo {{group_name}}"
-        other: "{{count}} mensagens no seu grupo {{group_name}}"
+        one: "%{count} mensagem no seu grupo %{group_name}"
+        other: "%{count} mensagens no seu grupo %{group_name}"
       popup:
-        mentioned: '{{username}} mencionou-o em "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} mencionou-o em "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} citou-o em "{{topic}}" - {{site_title}}'
-        replied: '{{username}} respondeu-lhe em "{{topic}}" - {{site_title}}'
-        posted: '{{username}} publicou em "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} enviou-lhe uma mensagem privada em "{{topic}}" - {{site_title}}'
-        linked: '{{username}} ligou à sua publicação de "{{topic}}" - {{site_title}}'
-        watching_first_post: '{{username}} criou um novo tópico "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} mencionou-o em "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} mencionou-o em "%{topic}" - %{site_title}'
+        quoted: '%{username} citou-o em "%{topic}" - %{site_title}'
+        replied: '%{username} respondeu-lhe em "%{topic}" - %{site_title}'
+        posted: '%{username} publicou em "%{topic}" - %{site_title}'
+        private_message: '%{username} enviou-lhe uma mensagem privada em "%{topic}" - %{site_title}'
+        linked: '%{username} ligou à sua publicação de "%{topic}" - %{site_title}'
+        watching_first_post: '%{username} criou um novo tópico "%{topic}" - %{site_title}'
         confirm_title: "Notificações ativas - %{site_title}"
         confirm_body: "Sucesso! As notificações foram ativadas."
       titles:
@@ -1444,9 +1445,9 @@ pt:
       from_my_computer: "Do meu dispositivo "
       from_the_web: "Da Web"
       remote_tip: "hiperligação para a imagem"
-      remote_tip_with_attachments: "hiperligação para a imagem ou ficheiro {{authorized_extensions}}"
+      remote_tip_with_attachments: "hiperligação para a imagem ou ficheiro %{authorized_extensions}"
       local_tip: "selecionar imagens a partir do seu dispositivo"
-      local_tip_with_attachments: "selecionar imagens ou ficheiros a partir do seu dispositivo {{authorized_extensions}}"
+      local_tip_with_attachments: "selecionar imagens ou ficheiros a partir do seu dispositivo %{authorized_extensions}"
       hint: "(também pode arrastar e largar o ficheiro para o editor para o enviar)"
       hint_for_supported_browsers: "também pode arrastar e largar ou colar as imagens no editor"
       uploading: "A enviar"
@@ -1463,15 +1464,15 @@ pt:
       clear_all: "Limpar Tudo"
       too_short: "O seu termo de pesquisa é muito curto."
       result_count:
-        one: "<span>%{count} resultado para</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} resultados para</span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} resultado para</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} resultados para</span><span class='term'>%{term}</span>"
       title: "pesquisar por tópicos, publicações, utilizadores, ou categorias"
       full_page_title: "pesquisar tópicos e publicações"
       no_results: "Não foram encontrados resultados."
       no_more_results: "Não foram encontrados mais resultados."
       searching: "A pesquisar..."
-      post_format: "#{{post_number}} por {{username}}"
-      results_page: "Resultados da pesquisa por '{{term}}'"
+      post_format: "#%{post_number} por %{username}"
+      results_page: "Resultados da pesquisa por '%{term}'"
       more_results: "Existem mais resultados. Por favor adicione mais critérios de pesquisa."
       cant_find: "Não encontra o que procura?"
       start_new_topic: "Talvez criar um novo tópico?"
@@ -1480,8 +1481,8 @@ pt:
       search_google_button: "Google"
       search_google_title: "Pesquisar este site"
       context:
-        user: "Procurar publicações por @{{username}}"
-        category: "Pesquise na categoria #{{category}}"
+        user: "Procurar publicações por @%{username}"
+        category: "Pesquise na categoria #%{category}"
         topic: "Pesquisar este tópico"
         private_messages: "Pesquisar mensagens"
       advanced:
@@ -1555,7 +1556,7 @@ pt:
         choose_new_category: "Escolha a nova categoria para os tópicos:"
         selected:
           one: "Selecionou <b>%{count}</b> tópico."
-          other: "Selecionou <b>{{count}}</b> tópicos."
+          other: "Selecionou <b>%{count}</b> tópicos."
         change_tags: "Substituir Etiquetas"
         append_tags: "Anexar Etiquetas"
         choose_new_tags: "Escolha novas etiquetas para estes tópicos:"
@@ -1568,7 +1569,7 @@ pt:
         posted: "Ainda não publicou em nenhum tópico."
         latest: "Não há tópicos recentes."
         bookmarks: "Ainda não marcou nenhum tópico."
-        category: "Não há tópicos na categoria {{category}}."
+        category: "Não há tópicos na categoria %{category}."
         top: "Não existem tópicos recentes."
         educate:
           new: '<p>Os seus novos tópicos aparecem aqui.</p><p>Por defeito, os tópicos são considerados novos e mostrarão o indicador <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">novo</span> caso tenham sido criados nos últimos 2 dias.</p><p>Pode alterar isto nas suas <a href="%{userPrefsUrl}"> preferências</a>.</p>'
@@ -1579,13 +1580,13 @@ pt:
         read: "Não existem mais tópicos lidos."
         new: "Não existem mais tópicos novos."
         unread: "Não existem mais tópicos não lidos."
-        category: "Não existem mais tópicos na categoria {{category}}."
+        category: "Não existem mais tópicos na categoria %{category}."
         top: "Não existem mais tópicos recentes."
         bookmarks: "Não há mais tópicos marcados."
     topic:
       filter_to:
         one: "%{count} publicação no tópico"
-        other: "{{count}} publicações no tópico"
+        other: "%{count} publicações no tópico"
       create: "Novo Tópico"
       create_long: "Criar um novo Tópico"
       open_draft: "Abrir Rascunho"
@@ -1606,10 +1607,10 @@ pt:
       unread: "não lido"
       new_topics:
         one: "%{count} novo tópico"
-        other: "{{count}} novos tópicos."
+        other: "%{count} novos tópicos."
       unread_topics:
         one: "%{count} tópico não lido"
-        other: "{{count}} tópicos não lidos"
+        other: "%{count} tópicos não lidos"
       title: "Tópico"
       invalid_access:
         title: "O tópico é privado"
@@ -1623,22 +1624,22 @@ pt:
         description: "Pedimos desculpa, não foi possível encontrar esse tópico. Talvez tenha sido removido por um moderador?"
       total_unread_posts:
         one: "tem %{count} publicação não lida neste tópico"
-        other: "tem {{count}} publicações não lidas neste tópico"
+        other: "tem %{count} publicações não lidas neste tópico"
       unread_posts:
         one: "tem %{count} publicação antiga não lida neste tópico"
-        other: "tem {{count}} publicações antigas não lidas neste tópico"
+        other: "tem %{count} publicações antigas não lidas neste tópico"
       new_posts:
         one: "existe %{count} nova publicação neste tópico desde a sua última leitura"
-        other: "existem {{count}} novas publicações neste tópico desde a sua última leitura"
+        other: "existem %{count} novas publicações neste tópico desde a sua última leitura"
       likes:
         one: "existe %{count} gosto neste tópico"
-        other: "existem {{count}} gostos neste tópico"
+        other: "existem %{count} gostos neste tópico"
       back_to_list: "Voltar à lista de Tópicos"
       options: "Opções do Tópico"
       show_links: "mostrar hiperligações dentro deste tópico"
       toggle_information: "alternar detalhes do tópico"
-      read_more_in_category: "Pretende ler mais? Procure outros tópicos em {{catLink}} ou {{latestLink}}."
-      read_more: "Pretende ler mais? {{catLink}} ou {{latestLink}}."
+      read_more_in_category: "Pretende ler mais? Procure outros tópicos em %{catLink} ou %{latestLink}."
+      read_more: "Pretende ler mais? %{catLink} ou %{latestLink}."
       read_more_MF: "{ UNREAD, plural, =0 {} one { Existe <a href='{basePath}/unread'>1 não lido </a> } other { Existem <a href='{basePath}/unread'># não lidos</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{e } false {existe } other{}} <a href='{basePath}/new'>1 novo</a> tópico} other { {BOTH, select, true{e } false {existem } other{}} <a href='{basePath}/new'># novos</a> tópicos} } restantes, ou {CATEGORY, select, true {pesquise outros tópicos em {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Pesquisar em todas as categorias
       view_latest_topics: ver os tópicos mais recentes
@@ -1804,25 +1805,25 @@ pt:
         success_message: "Denunciou este tópico com sucesso."
       feature_topic:
         title: "Destacar este tópico"
-        pin: "Fazer este tópico aparecer no topo da categoria {{categoryLink}} até"
-        confirm_pin: "Já tem {{count}} tópicos fixados. Demasiados tópicos fixados podem ser um fardo para utilizadores novos e anónimos. Tem a certeza que deseja fixar outro tópico nesta categoria?"
-        unpin: "Remover este tópico do topo da categoria {{categoryLink}}."
-        unpin_until: "Remover este tópico do topo da categoria {{categoryLink}} ou espere até <strong>%{until}</strong>."
+        pin: "Fazer este tópico aparecer no topo da categoria %{categoryLink} até"
+        confirm_pin: "Já tem %{count} tópicos fixados. Demasiados tópicos fixados podem ser um fardo para utilizadores novos e anónimos. Tem a certeza que deseja fixar outro tópico nesta categoria?"
+        unpin: "Remover este tópico do topo da categoria %{categoryLink}."
+        unpin_until: "Remover este tópico do topo da categoria %{categoryLink} ou espere até <strong>%{until}</strong>."
         pin_note: "Os utilizadores podem desafixar individualmente o tópico por si próprios."
         pin_validation: "É necessária uma data para fixar este tópico."
-        not_pinned: "Não há tópicos fixados em {{categoryLink}}."
+        not_pinned: "Não há tópicos fixados em %{categoryLink}."
         already_pinned:
-          one: "Tópicos atualmente afixados em {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Tópicos atualmente afixados em {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Tópicos atualmente afixados em %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Tópicos atualmente afixados em %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Fazer com que este tópico apareça no topo da lista de todos os tópicos até"
-        confirm_pin_globally: "Já tem {{count}} tópicos fixados globalmente. Demasiados tópicos fixados podem ser um fardo para utilizadores novos e anónimos. Tem a certeza que deseja fixar outro tópico globalmente?"
+        confirm_pin_globally: "Já tem %{count} tópicos fixados globalmente. Demasiados tópicos fixados podem ser um fardo para utilizadores novos e anónimos. Tem a certeza que deseja fixar outro tópico globalmente?"
         unpin_globally: "Remover este tópico do topo de todas as listas de tópicos."
         unpin_globally_until: "Remover este tópico do topo da lista de todos os tópicos ou espere até <strong>%{until}</strong>."
         global_pin_note: "Os utilizadores podem desafixar individualmente o tópico por si próprios."
         not_pinned_globally: "Não existem tópicos fixados globalmente."
         already_pinned_globally:
           one: "Tópicos atualmente afixados globalmente: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Tópicos atualmente afixados globalmente: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Tópicos atualmente afixados globalmente: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Tornar este tópico numa faixa que apareça no topo de todas as páginas."
         remove_banner: "Remover a faixa que aparece no topo de todas as páginas."
         banner_note: "Os utilizadores podem marcar vista a faixa por fecharem-na. Apenas um tópico pode ser posto como faixa em qualquer momento."
@@ -1852,15 +1853,15 @@ pt:
         to_topic_username: "Introduziu um nome de utilizador. Iremos enviar-lhe uma notificação com uma ligação convidando-o para este tópico."
         to_username: "Introduza o nome de utilizador da pessoa que deseja convidar. Iremos enviar-lhe uma notificação com uma ligação convidando-o para este tópico."
         email_placeholder: "nome@exemplo.com"
-        success_email: "Enviámos por email um convite para <b>{{emailOrUsername}}</b>. Iremos notificá-lo quando o convite for utilizado. Verifique o separador de convites na sua página de utilizador para acompanhar os seus convites."
+        success_email: "Enviámos por email um convite para <b>%{emailOrUsername}</b>. Iremos notificá-lo quando o convite for utilizado. Verifique o separador de convites na sua página de utilizador para acompanhar os seus convites."
         success_username: "Convidámos esse utilizador para participar neste tópico."
         error: "Pedimos desculpa, não conseguimos convidar essa pessoa. Talvez já tenha sido convidado? (Os convites são limitados)"
-        success_existing_email: "Já existe um utilizador com o email <b>{{emailOrUsername}}</b>. Convidámos esse utilizador a participar neste tópico."
+        success_existing_email: "Já existe um utilizador com o email <b>%{emailOrUsername}</b>. Convidámos esse utilizador a participar neste tópico."
       login_reply: "Iniciar sessão para Responder"
       filters:
         n_posts:
           one: "%{count} publicação"
-          other: "{{count}} publicações"
+          other: "%{count} publicações"
         cancel: "Remover filtro"
       move_to:
         title: "Mover para"
@@ -1874,7 +1875,7 @@ pt:
         error: "Ocorreu um erro ao mover as publicações para um novo tópico."
         instructions:
           one: "Está prestes a criar um novo tópico e populá-lo com a publicação que selecionou."
-          other: "Está prestes a criar um novo tópico e populá-lo com as <b>{{count}}</b> publicações que selecionou."
+          other: "Está prestes a criar um novo tópico e populá-lo com as <b>%{count}</b> publicações que selecionou."
       merge_topic:
         title: "Mover para Tópico Existente"
         action: "mover para tópico existente"
@@ -1882,7 +1883,7 @@ pt:
         radio_label: "Tópico Existente"
         instructions:
           one: "Por favor selecione o tópico para o qual gostaria de mover esta publicação."
-          other: "Por favor selecione o tópico para o qual gostaria de mover estas <b>{{count}}</b> publicações."
+          other: "Por favor selecione o tópico para o qual gostaria de mover estas <b>%{count}</b> publicações."
       move_to_new_message:
         title: "Mover para Nova Mensagem"
         action: "mover para nova mensagem"
@@ -1909,7 +1910,7 @@ pt:
         instructions: "Por favor selecione o novo selo temporal do tópico. Publicações no tópico serão atualizadas para terem a mesma diferença temporal."
       multi_select:
         select: "selecionar"
-        selected: "({{count}}) selecionados"
+        selected: "(%{count}) selecionados"
         select_post:
           label: "selecionar"
         selected_post:
@@ -1923,14 +1924,14 @@ pt:
         deselect_all: desmarcar tudo
         description:
           one: Selecionou <b>%{count}</b> publicação.
-          other: "Selecionou <b>{{count}}</b> publicações."
+          other: "Selecionou <b>%{count}</b> publicações."
     post:
       quote_reply: "Citar"
       edit_reason: "Motivo:"
-      post_number: "publicação {{number}}"
+      post_number: "publicação %{number}"
       last_edited_on: "publicação editada pela última vez em"
       reply_as_new_topic: "Responder com novo Tópico"
-      continue_discussion: "Continuar a discussão de {{postLink}}:"
+      continue_discussion: "Continuar a discussão de %{postLink}:"
       follow_quote: "ir para a publicação citada"
       show_full: "Mostrar Publicação Completa"
       deleted_by_author:
@@ -1939,23 +1940,24 @@ pt:
       expand_collapse: "expandir/colapsar"
       gap:
         one: "ver %{count} resposta oculta"
-        other: "ver {{count}} respostas ocultas"
+        other: "ver %{count} respostas ocultas"
       unread: "Publicação não lida"
       has_replies:
-        one: "{{count}} Resposta"
-        other: "{{count}} Respostas"
+        one: "%{count} Resposta"
+        other: "%{count} Respostas"
       has_likes_title:
         one: "%{count} pessoa gostou desta publicação"
-        other: "{{count}} pessoas gostaram desta publicação"
+        other: "%{count} pessoas gostaram desta publicação"
       has_likes_title_only_you: "você gostou desta publicação"
       has_likes_title_you:
         one: "você e %{count} outra pessoa gostaram desta publicação"
-        other: "você e {{count}} outras pessoas gostaram desta publicação"
+        other: "você e %{count} outras pessoas gostaram desta publicação"
       errors:
         create: "Pedimos desculpa, ocorreu um erro ao criar a sua publicação. Por favor, tente novamente."
         edit: "Pedimos desculpa, ocorreu um erro ao editar a sua publicação. Por favor, tente novamente."
         upload: "Pedimos desculpa, ocorreu um erro ao carregar esse ficheiro. Por favor, tente novamente."
         too_many_uploads: "Pedimos desculpa, só pode carregar um ficheiro de cada vez."
+        upload_not_authorized: "Pedimos desculpa, o ficheiro que está a tentar carregar não está autorizado (extensões autorizadas: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Pedimos desculpa, os novos utilizadores não podem carregar imagens."
         attachment_upload_not_allowed_for_new_user: "Pedimos desculpa, os novos utilizadores não podem carregar anexos."
         attachment_download_requires_login: "Desculpe, precisa de iniciar a sessão para transferir anexos."
@@ -2160,13 +2162,13 @@ pt:
       custom_message:
         at_least:
           one: "insira pelo menos %{count} caráter"
-          other: "insira pelo menos {{count}} carateres"
+          other: "insira pelo menos %{count} carateres"
         more:
           one: "%{count} a seguir..."
-          other: "{{count}} a seguir..."
+          other: "%{count} a seguir..."
         left:
           one: "%{count} restante"
-          other: "{{count}} restantes"
+          other: "%{count} restantes"
     flagging_topic:
       title: "Obrigado por ajudar a manter a nossa comunidade cívica!"
       action: "Denunciar Tópico"
@@ -2207,7 +2209,7 @@ pt:
       unlisted:
         help: "Este tópico não está listado; não será apresentado na lista de tópicos e poderá ser acedido apenas através de uma ligação direta"
     posts: "Publicações"
-    posts_long: "existem {{number}} publicações neste tópico"
+    posts_long: "existem %{number} publicações neste tópico"
     posts_likes_MF: |2
 
       Este tópico tem {count, plural, one {1 resposta} other {# respostas}} {ratio, select,
@@ -2230,14 +2232,14 @@ pt:
     likes_lowercase:
       one: "gosto"
       other: "gostos"
-    likes_long: "existem {{number}} gostos neste tópico"
+    likes_long: "existem %{number} gostos neste tópico"
     users: "Utilizadores"
     users_lowercase:
       one: "utilizador"
       other: "utilizadores"
     category_title: "Categoria"
     history: "Histórico"
-    changed_by: "por {{author}}"
+    changed_by: "por %{author}"
     raw_email:
       not_available: "Indisponível!"
     categories_list: "Lista de Categorias"
@@ -2248,33 +2250,33 @@ pt:
         title: "Recente"
         title_with_count:
           one: "Recente (%{count})"
-          other: "Recentes ({{count}})"
+          other: "Recentes (%{count})"
         help: "tópicos com publicações recentes"
       read:
         title: "Lido"
         help: "tópicos que leu, na ordem que os leu"
       categories:
         title: "Categorias"
-        title_in: "Categoria - {{categoryName}}"
+        title_in: "Categoria - %{categoryName}"
         help: "todos os tópicos agrupados por categoria"
       unread:
         title: "Não Lido"
         title_with_count:
           one: "Não Lido (%{count})"
-          other: "Não Lidos ({{count}})"
+          other: "Não Lidos (%{count})"
         help: "tópicos que está atualmente a vigiar ou a seguir com publicações não lidas"
         lower_title_with_count:
           one: "%{count} não lido"
-          other: "{{count}} não lidos"
+          other: "%{count} não lidos"
       new:
         lower_title_with_count:
           one: "%{count} novo"
-          other: "{{count}} novos"
+          other: "%{count} novos"
         lower_title: "novo"
         title: "Novo"
         title_with_count:
           one: "Novo (%{count})"
-          other: "Novos ({{count}})"
+          other: "Novos (%{count})"
         help: "tópicos criados nos últimos dias"
       posted:
         title: "As Minhas publicações"
@@ -2283,11 +2285,11 @@ pt:
         title: "Marcadores"
         help: "tópicos que marcou"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "tópicos recentes na categoria {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "tópicos recentes na categoria %{categoryName}"
       top:
         title: "Os Melhores"
         help: "os tópicos mais ativos no último ano, mês, semana ou dia"
@@ -2628,10 +2630,10 @@ pt:
           redeliver: "Re-entregar."
           incoming:
             one: "Existe %{count} evento novo."
-            other: "Existem {{count}} eventos novos."
+            other: "Existem %{count} eventos novos."
           completed_in:
             one: "Completado em %{count} segundos."
-            other: "Completado em {{count}} segundo."
+            other: "Completado em %{count} segundo."
           request: "Pedido"
           response: "Resposta"
           redeliver_confirm: "Tem a certeza de que quer re-entregar a mesma carga?"
@@ -2682,10 +2684,10 @@ pt:
           label: "Carregar"
           title: "Carregar uma cópia de segurança para esta instância"
           uploading: "A carregar…"
-          error: "Verificou-se um erro no carregamento de '{{filename}}': {{message}}"
+          error: "Verificou-se um erro no carregamento de '%{filename}': %{message}"
         operations:
           is_running: "Existe atualmente uma operação em execução..."
-          failed: "A {{operation}} falhou. Por favor verifique o registo dos logs."
+          failed: "A %{operation} falhou. Por favor verifique o registo dos logs."
           cancel:
             label: "Cancelar"
             title: "Cancelar a operação atual"
@@ -3024,8 +3026,8 @@ pt:
           title: "Revelar o endereço de email deste utilizador"
           text: "Mostrar"
       user:
-        suspend_failed: "Ocorreu um erro ao suspender este utilizador {{error}}"
-        unsuspend_failed: "Ocorreu um erro ao retirar a suspensão deste utilizador {{error}}"
+        suspend_failed: "Ocorreu um erro ao suspender este utilizador %{error}"
+        unsuspend_failed: "Ocorreu um erro ao retirar a suspensão deste utilizador %{error}"
         suspend_duration: "Durante quanto tempo o utilizador estará suspenso?"
         suspend_reason_label: "Qual é o motivo da sua suspensão? Este texto <b>estará visível para todos</b> na página do perfil deste utilizador, e será mostrada ao utilizador quando tentar iniciar sessão. Mantenha-o breve."
         suspend_reason: "Motivo"
@@ -3313,6 +3315,7 @@ pt:
         title: "Emoji"
         help: "Adicionar novo emoji que irá estar disponível para todos. (PROTIP: arraste múltiplos ficheiros de uma só vez)"
         add: "Adicionar Novo Emoji"
+        uploading: "A carregar…"
         name: "Nome"
         group: "Grupo"
         image: "Imagem"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index d56dcea1d6..ca30f525cb 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -23,8 +23,8 @@ pt_BR:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "HH:mm"
       time_with_zone: "HH:mm (z)"
@@ -227,11 +227,11 @@ pt_BR:
     weekly: "semanal"
     every_month: "a cada mês"
     every_six_months: "a cada seis meses"
-    max_of_count: "máx de {{count}}"
+    max_of_count: "máx de %{count}"
     alternation: "ou"
     character_count:
-      one: "{{count}} caracter"
-      other: "{{count}} caracteres"
+      one: "%{count} caracter"
+      other: "%{count} caracteres"
     related_messages:
       title: "Mensagens Relacionadas"
       see_all: 'Ver <a href="%{path}">todas as mensagens</a> de @ %{username} ...'
@@ -306,14 +306,14 @@ pt_BR:
         yes_value: "Sim, descartar."
         no_value: "Não, manter."
     topic_count_latest:
-      one: "Veja {{count}} tópico novo ou atualizado"
-      other: "Veja {{count}} tópicos novos ou atualizados"
+      one: "Veja %{count} tópico novo ou atualizado"
+      other: "Veja %{count} tópicos novos ou atualizados"
     topic_count_unread:
-      one: "Veja {{count}} tópico não lido"
-      other: "Veja {{count}} tópicos não lidos"
+      one: "Veja %{count} tópico não lido"
+      other: "Veja %{count} tópicos não lidos"
     topic_count_new:
-      one: "Veja {{count}} novo tópico"
-      other: "Veja {{count}} novos tópicos"
+      one: "Veja %{count} novo tópico"
+      other: "Veja %{count} novos tópicos"
     preview: "pré-visualização"
     cancel: "cancelar"
     save: "Salvar Mudanças"
@@ -321,7 +321,7 @@ pt_BR:
     saved: "Salvo!"
     upload: "Enviar"
     uploading: "Enviando..."
-    uploading_filename: "Enviando: {{filename}}..."
+    uploading_filename: "Enviando: %{filename}..."
     clipboard: "área de transferência"
     uploaded: "Enviado!"
     pasting: "Colando..."
@@ -375,7 +375,7 @@ pt_BR:
         optional: "Você pode reivindicar este item para impedir que outras pessoas o revisem."
         required: "Você precisa reivindicar itens antes de poder revisá-los."
         claimed_by_you: "Você reivindicou este item e pode revisá-lo."
-        claimed_by_other: "Este item só pode ser revisado por <b>{{username}}</b>."
+        claimed_by_other: "Este item só pode ser revisado por <b>%{username}</b>."
       claim:
         title: "reivindicar este tópico"
       unclaim:
@@ -395,7 +395,7 @@ pt_BR:
       view_pending: "visualização pendente"
       topic_has_pending:
         one: "Este tópico tem <b>%{count}</b> postagem pendente de aprovação"
-        other: "Este tópico tem <b>{{count}}</b> postagens pendentes de aprovação"
+        other: "Este tópico tem <b>%{count}</b> postagens pendentes de aprovação"
       title: "Revisar"
       topic: "Tópico:"
       filtered_topic: "Você filtrou para conteúdo de revisão em um único tópico."
@@ -412,17 +412,17 @@ pt_BR:
         fields: "Campos"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} sinalização no total)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} sinalizações no total)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} sinalização no total)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} sinalizações no total)"
         agreed:
-          one: "{{count}}% concorda"
-          other: "{{count}}% concordam"
+          one: "%{count}% concorda"
+          other: "%{count}% concordam"
         disagreed:
-          one: "{{count}}% discorda"
-          other: "{{count}}% discordam"
+          one: "%{count}% discorda"
+          other: "%{count}% discordam"
         ignored:
-          one: "{{count}}% ignora"
-          other: "{{count}}% ignoram"
+          one: "%{count}% ignora"
+          other: "%{count}% ignoram"
       topics:
         topic: "Tópico"
         reviewable_count: "Contagem"
@@ -432,10 +432,10 @@ pt_BR:
         details: "detalhes"
         unique_users:
           one: "%{count} usuário"
-          other: "{{count}} usuários"
+          other: "%{count} usuários"
       replies:
         one: "%{count} resposta"
-        other: "{{count}} respostas"
+        other: "%{count} respostas"
       edit: "Editar"
       save: "Salvar"
       cancel: "Cancelar"
@@ -498,22 +498,22 @@ pt_BR:
         description: "Nós recebemos sua nova postagem, mas é necessário que seja aprovada por um moderador antes de ser exibida. Por favor, tenha paciência."
         pending_posts:
           one: "Você tem <strong>%{count}</strong> postagem pendente."
-          other: "Você tem postagens <strong>{{count}}</strong> pendentes."
+          other: "Você tem postagens <strong>%{count}</strong> pendentes."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> postou <a href='{{topicUrl}}'>o tópico</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Você</a> postou <a href='{{topicUrl}}'>o tópico</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> respondeu <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Você</a> respondeu a <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> respondeu ao <a href='{{topicUrl}}'>tópico</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Você</a> respondeu ao <a href='{{topicUrl}}'>tópico</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> mencionou <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> mencionou <a href='{{user2Url}}'>você</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Você</a> mencionou <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Postado por <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Postado por <a href='{{userUrl}}'>você</a>"
-      sent_by_user: "Enviado por <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Enviado por <a href='{{userUrl}}'>você</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> postou <a href='%{topicUrl}'>o tópico</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Você</a> postou <a href='%{topicUrl}'>o tópico</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> respondeu <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Você</a> respondeu a <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> respondeu ao <a href='%{topicUrl}'>tópico</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Você</a> respondeu ao <a href='%{topicUrl}'>tópico</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> mencionou <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> mencionou <a href='%{user2Url}'>você</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Você</a> mencionou <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Postado por <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Postado por <a href='%{userUrl}'>você</a>"
+      sent_by_user: "Enviado por <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Enviado por <a href='%{userUrl}'>você</a>"
     directory:
       filter_name: "filtrar por nome de usuário"
       title: "Usuários"
@@ -749,7 +749,7 @@ pt_BR:
       none: "(selecione uma opção)"
       required: 'Por favor preencha "%{name}"'
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Perfil"
       mute: "Silenciar"
       edit: "Editar Preferências"
@@ -825,12 +825,12 @@ pt_BR:
       enable_defer: "Habilitar adiar para marcar tópicos não lidos"
       change: "alterar"
       featured_topic: "Tópico em Destaque"
-      moderator: "{{user}} é um moderador"
-      admin: "{{user}} é um administrador"
+      moderator: "%{user} é um moderador"
+      admin: "%{user} é um administrador"
       moderator_tooltip: "Este usuário é um moderador"
       admin_tooltip: "Este usuário é um administrador"
       silenced_tooltip: "Este usuário está silenciado"
-      suspended_notice: "Este usuário está suspenso até {{date}}."
+      suspended_notice: "Este usuário está suspenso até %{date}."
       suspended_permanently: "Este usuário está suspenso."
       suspended_reason: "Motivo:"
       github_profile: "Github"
@@ -843,7 +843,7 @@ pt_BR:
           Tópicos e categorias silenciadas não são incluídas nestes e-mails.
         individual: "Enviar um e-mail para cada postagem nova"
         individual_no_echo: "Enviar um e-mail para cada postagem nova, exceto as minhas"
-        many_per_day: "Me envie um e-mail para cada nova postagem (aproximadamente {{dailyEmailEstimate}} por dia)"
+        many_per_day: "Me envie um e-mail para cada nova postagem (aproximadamente %{dailyEmailEstimate} por dia)"
         few_per_day: "Me envie um e-mail para cada nova postagem (aproximadamente 2 por dia)"
         warning: "Modo de lista de correio habilitado. As configurações de notificação por e-mail são substituídas."
       tag_settings: "Etiquetas"
@@ -873,9 +873,7 @@ pt_BR:
       admin_delete: "Excluir"
       users: "Usuários"
       muted_users: "Silenciados"
-      muted_users_instructions: "Suprimir todas as notificações destes usuários."
       ignored_users: "Ignorados"
-      ignored_users_instructions: "Suprimir todas as postagens e notificações destes usuários."
       tracked_topics_link: "Exibir"
       automatically_unpin_topics: "Desafixar automaticamente os tópicos quando eu chegar no final deles."
       apps: "Aplicativos"
@@ -931,12 +929,12 @@ pt_BR:
         disable: "Desabilitar"
         enable: "Habilitar"
         enable_long: "Habilitar códigos de backup"
-        manage: "Gerenciar códigos de backup. Você tem <strong>{{count}}</strong> códigos de backup restantes."
+        manage: "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: "Copiado para a Área de Transferência"
         download_backup_codes: "Baixar códigos de backup"
-        remaining_codes: "Você tem <strong>{{count}}</strong> códigos de backup restantes."
+        remaining_codes: "Você tem <strong>%{count}</strong> códigos de backup restantes."
         use: "Use um código de backup"
         enable_prerequisites: "Você deve habilitar um segundo fator primário antes de gerar códigos de backup."
         codes:
@@ -1001,10 +999,10 @@ pt_BR:
         success_staff: "Enviamos um e-mail para o seu endereço atual. Por favor, siga as instruções de confirmação."
       change_avatar:
         title: "Alterar sua imagem de perfil"
-        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, baseado em"
-        gravatar_title: "Altere seu avatar no site de {{gravatarName}}"
-        gravatar_failed: "Não foi possível encontrar um {{gravatarName}} com esse endereço de e-mail."
-        refresh_gravatar_title: "Recarregar seu {{gravatarName}}"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, baseado em"
+        gravatar_title: "Altere seu avatar no site de %{gravatarName}"
+        gravatar_failed: "Não foi possível encontrar um %{gravatarName} com esse endereço de e-mail."
+        refresh_gravatar_title: "Recarregar seu %{gravatarName}"
         letter_based: "Imagem de perfil atribuída pelo sistema"
         uploaded_avatar: "Imagem personalizada"
         uploaded_avatar_empty: "Adicionar uma imagem personalizada"
@@ -1029,11 +1027,11 @@ pt_BR:
         ok: "Nós enviaremos um e-mail para confirmar"
         required: "Por favor preencha um endereço de e-mail"
         invalid: "Por favor, insira um endereço de e-mail válido"
-        authenticated: "Seu e-mail foi autenticado por {{provider}}"
+        authenticated: "Seu e-mail foi autenticado por %{provider}"
         frequency_immediately: "Enviaremos um e-mail imediatamente se você não tiver lido a coisa sobre a qual estamos enviando o e-mail."
         frequency:
           one: "Só lhe enviaremos um e-mail se não o tivermos visto no último minuto."
-          other: "Só lhe enviaremos um e-mail se não o tivermos visto nos últimos {{count}} minutos."
+          other: "Só lhe enviaremos um e-mail se não o tivermos visto nos últimos %{count} minutos."
       associated_accounts:
         title: "Contas Associadas"
         connect: "Conectar"
@@ -1054,9 +1052,9 @@ pt_BR:
       username:
         title: "Nome de Usuário"
         instructions: "único, sem espaços, curto"
-        short_instructions: "Pessoas podem mencionar você usando @{{username}}."
+        short_instructions: "Pessoas podem mencionar você usando @%{username}."
         available: "Seu nome de usuário está disponível"
-        not_available: "Não está disponível. Tente {{suggestion}}?"
+        not_available: "Não está disponível. Tente %{suggestion}?"
         not_available_no_suggestion: "Não disponível"
         too_short: "Seu nome de usuário é muito curto"
         too_long: "Seu nome de usuário é muito longo"
@@ -1080,11 +1078,11 @@ pt_BR:
         log_out_all: "Sair de todos"
         active: "ativo agora"
         not_you: "Não é você?"
-        show_all: "Mostrar todos ({{count}})"
+        show_all: "Mostrar todos (%{count})"
         show_few: "Mostrar menos"
         was_this_you: "Foi você?"
         was_this_you_description: "Se não foi você, recomendamos que você altere sua senha e saia de todos os dispositivos."
-        browser_and_device: "{{browser}} em {{device}}"
+        browser_and_device: "%{browser} em %{device}"
         secure_account: "Proteger minha Conta"
         latest_post: "Você postou por último…"
       last_posted: "Última Postagem"
@@ -1164,20 +1162,19 @@ pt_BR:
         none: "Não há convites para exibir."
         truncated:
           one: "Mostrando o primeiro convite."
-          other: "Mostrando os primeiros {{count}} convites."
+          other: "Mostrando os primeiros %{count} convites."
         redeemed: "Convites Usados"
         redeemed_tab: "Usados"
-        redeemed_tab_with_count: "Usados ({{count}})"
+        redeemed_tab_with_count: "Usados (%{count})"
         redeemed_at: "Usado"
         pending: "Convites Pendentes"
         pending_tab: "Pendentes"
-        pending_tab_with_count: "Pendentes ({{count}})"
+        pending_tab_with_count: "Pendentes (%{count})"
         topics_entered: "Tópicos Visualizados"
         posts_read_count: "Postagens Lidas"
         expired: "Este convite expirou."
         rescind: "Remover"
         rescinded: "Convite removido"
-        rescind_all: "Remover todos os Convites Expirados"
         rescinded_all: "Todos os Convites Expirados removidos!"
         rescind_all_confirm: "Você tem certeza de que deseja remover todos os convites expirados?"
         reinvite: "Reenviar Convite"
@@ -1188,13 +1185,18 @@ pt_BR:
         time_read: "Tempo de Leitura"
         days_visited: "Dias Visitados"
         account_age_days: "Idade da conta em dias"
-        create: "Enviar um Convite"
+        links_tab: "Links"
+        link_created_at: "Criado"
+        link_groups: Grupos
+        create: "Enviar Convite"
         generate_link: "Copiar Link do Convite"
         link_generated: "Link do convite gerado com sucesso!"
         valid_for: "Link do convite é válido apenas para este endereço de e-mail: %{email}"
+        single_user: "Único Usuário"
+        invite_link:
+          success: "Link do convite gerado com sucesso!"
         bulk_invite:
           none: "Você ainda não convidou ninguém para cá. Envie convites individuais, ou convide várias pessoas de uma só vez, fazendo a <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>importação de um arquivo CSV</a>."
-          text: "Convidar em Massa a partir de Arquivo"
           success: "Arquivo enviado com sucesso, você será notificado por mensagem quando o processo estiver completo."
           error: "Desculpe, o arquivo deve estar no formato CSV."
           confirmation_message: "Você está prestes a enviar convites por e-mail para todos no arquivo enviado."
@@ -1286,7 +1288,7 @@ pt_BR:
       desc:
         network: "Por favor, verifique sua conexão."
         network_fixed: "Parece que voltou."
-        server: "Código do erro: {{status}}"
+        server: "Código do erro: %{status}"
         forbidden: "Você não tem permissão para ver isto."
         not_found: "Oops, a aplicação tentou carregar uma URL que não existe."
         unknown: "Algo deu errado."
@@ -1349,8 +1351,8 @@ pt_BR:
       value_prop: "Quando você cria uma conta, lembramos exatamente o que você leu, para que você volte sempre de onde parou. Você também recebe notificações, aqui e via e-mail, sempre que alguém responder a você. E você pode gostar de postagens para compartilhar o amor. :heartpulse:"
     summary:
       enabled_description: "Você está vendo um resumo deste tópico: as postagens mais interessantes conforme determinados pela comunidade."
-      description: "Existem <b>{{replyCount}}</b> respostas."
-      description_time: "Existem <b>{{replyCount}}</b> respostas com tempo de leitura estimado de <b>{{readingTime}} minutos</b>."
+      description: "Existem <b>%{replyCount}</b> respostas."
+      description_time: "Existem <b>%{replyCount}</b> respostas com tempo de leitura estimado de <b>%{readingTime} minutos</b>."
       enable: "Resumir Este Tópico"
       disable: "Exibir Todas as Postagens"
     deleted_filter:
@@ -1363,8 +1365,8 @@ pt_BR:
       invite: "Convidar Outros ..."
       edit: "Adicionar ou Remover ..."
       leave_message: "Você quer mesmo sair desta mensagem?"
-      remove_allowed_user: "Você quer mesmo remover {{name}} desta mensagem?"
-      remove_allowed_group: "Você quer mesmo remover {{name}} desta mensagem?"
+      remove_allowed_user: "Você quer mesmo remover %{name} desta mensagem?"
+      remove_allowed_group: "Você quer mesmo remover %{name} desta mensagem?"
     email: "E-mail"
     username: "Nome de Usuário"
     last_seen: "Visto"
@@ -1373,7 +1375,7 @@ pt_BR:
     trust_level: "Nível de Confiança"
     search_hint: "nome de usuário, e-mail ou endereço IP"
     create_account:
-      disclaimer: "Ao se registrar, 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>."
+      disclaimer: "Ao se registrar, 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 Nova Conta"
       failed: "Algo deu errado, talvez este e-mail já esteja cadastrado, tente usar o link de esqueci a senha."
     forgot_password:
@@ -1433,7 +1435,7 @@ pt_BR:
       awaiting_activation: "Sua conta está aguardando ativação, utilize o link de esqueci a senha para enviar um novo e-mail de ativação."
       awaiting_approval: "Sua conta ainda não foi aprovada por um membro da staff. Você receberá um e-mail quando sua conta for aprovada."
       requires_invite: "Desculpe, o acesso a este fórum é permitido somente por convite de outro membro."
-      not_activated: "Você não pode entrar ainda. Nós lhe enviamos um e-mail de ativação anteriormente para endereço <b>{{sentTo}}</b>. Por favor, siga as instruções contidas neste e-mail para ativar a sua conta."
+      not_activated: "Você não pode entrar ainda. Nós lhe enviamos um e-mail de ativação anteriormente para endereço <b>%{sentTo}</b>. Por favor, siga as instruções contidas neste 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 com este endereço IP."
       resend_activation_email: "Clique aqui para enviar o e-mail de ativação novamente."
@@ -1442,7 +1444,7 @@ pt_BR:
       change_email: "Alterar Endereço de E-mail"
       provide_new_email: "Forneça um novo endereço de e-mail e nós re-enviaremos seu e-mail de confirmação."
       submit_new_email: "Atualizar Endereço de E-mail"
-      sent_activation_email_again: "Nós enviamos mais um e-mail de ativação para você no endereço <b>{{currentEmail}}</b>. Pode ser que demore alguns minutos para chegar; verifique sempre sua caixa de spam."
+      sent_activation_email_again: "Nós enviamos mais um e-mail de ativação para você no endereço <b>%{currentEmail}</b>. Pode ser que demore alguns minutos para chegar; verifique sempre sua caixa de spam."
       sent_activation_email_again_generic: "Nós enviamos mais um e-mail de ativação. Pode ser que demore alguns minutos para chegar; tenha certeza de verificar sua caixa de spam."
       to_continue: "Por Favor, Entre"
       preferences: "Você precisa estar logado para mudar suas preferências de usuário."
@@ -1506,20 +1508,20 @@ pt_BR:
     conditional_loading_section:
       loading: Carregando...
     category_row:
-      topic_count: "{{count}} tópicos nesta categoria"
+      topic_count: "%{count} tópicos nesta categoria"
     select_kit:
       default_header_text: Selecionar...
       no_content: Nenhuma correspondência encontrada
       filter_placeholder: Pesquisar...
       filter_placeholder_with_any: Pesquisar ou criar…
-      create: "Criar: '{{content}}'"
+      create: "Criar: '%{content}'"
       max_content_reached:
-        one: "Você só pode selecionar {{count}} item."
-        other: "Você só pode selecionar {{count}} itens."
+        one: "Você só pode selecionar %{count} item."
+        other: "Você só pode selecionar %{count} itens."
       min_content_not_reached:
-        one: "Selecione pelo menos {{count}} item."
-        other: "Selecione pelo menos {{count}} itens."
-      invalid_selection_length: "A seleção deve ter pelo menos {{count}} caracteres."
+        one: "Selecione pelo menos %{count} item."
+        other: "Selecione pelo menos %{count} itens."
+      invalid_selection_length: "A seleção deve ter pelo menos %{count} caracteres."
       components:
         categories_admin_dropdown:
           title: "Categorias na caixa de seleção da administração"
@@ -1549,7 +1551,7 @@ pt_BR:
       default: Emojis personalizados
     shared_drafts:
       title: "Rascunhos Compartilhados"
-      notice: "Este tópico só é visível para aqueles que podem ver a categoria <b>{{category}}</b>."
+      notice: "Este tópico só é visível para aqueles que podem ver a categoria <b>%{category}</b>."
       destination_category: "Categoria de Destino"
       publish: "Publicar Rascunho Compartilhado"
       confirm_publish: "Você tem certeza de que deseja publicar este rascunho?"
@@ -1569,24 +1571,24 @@ pt_BR:
       similar_topics: "Seu tópico é parecido com..."
       drafts_offline: "rascunhos offline"
       edit_conflict: "editar conflito"
-      group_mentioned_limit: "<b>Aviso!</b> Você mencionou <a href='{{group_link}}'>{{group}}</a>; no entanto, este grupo tem mais membros do que o limite de menção configurado pelo administrador de {{max}} usuários. Ninguém será notificado."
+      group_mentioned_limit: "<b>Aviso!</b> Você mencionou <a href='%{group_link}'>%{group}</a>; no entanto, este grupo tem mais membros do que o limite de menção configurado pelo administrador de %{max} usuários. Ninguém será notificado."
       group_mentioned:
-        one: "Ao mencionar {{group}}, você está prestes a notificar <a href='{{group_link}}'>%{count} pessoa</a> – você tem certeza?"
-        other: "Ao mencionar {{group}}, você está prestes a notificar <a href='{{group_link}}'>{{count}} pessoas</a> – você tem certeza?"
+        one: "Ao mencionar %{group}, você está prestes a notificar <a href='%{group_link}'>%{count} pessoa</a> – você tem certeza?"
+        other: "Ao mencionar %{group}, você está prestes a notificar <a href='%{group_link}'>%{count} pessoas</a> – você tem certeza?"
       cannot_see_mention:
-        category: "Você mencionou {{username}}, mas ele(a) não será notificado(a), pois ele(a) não tem acesso à esta categoria. Você precisará adicioná-lo(a) ao grupo que tem acesso à categoria."
-        private: "Você mencionou {{username}}, mas ele(a) não será notificado(a), pois ele(a) não pode ver esta mensagem pessoal. Você precisará convidá-lo(a) para esta MP."
-      duplicate_link: "Parece que o seu link para <b>{{domain}}</b> já foi postado neste tópico por <b>@{{username}}</b> em <a href='{{post_url}}'>uma resposta em {{ago}}</a> – você tem certeza de que deseja postá-lo novamente?"
-      reference_topic_title: "RE: {{title}}"
+        category: "Você mencionou %{username}, mas ele(a) não será notificado(a), pois ele(a) não tem acesso à esta categoria. Você precisará adicioná-lo(a) ao grupo que tem acesso à categoria."
+        private: "Você mencionou %{username}, mas ele(a) não será notificado(a), pois ele(a) não pode ver esta mensagem pessoal. Você precisará convidá-lo(a) para esta MP."
+      duplicate_link: "Parece que o seu link para <b>%{domain}</b> já foi postado neste tópico por <b>@%{username}</b> em <a href='%{post_url}'>uma resposta em %{ago}</a> – você tem certeza de que deseja postá-lo novamente?"
+      reference_topic_title: "RE: %{title}"
       error:
         title_missing: "Título é obrigatório"
-        title_too_short: "Título precisa ter no mínimo {{min}} caracteres"
-        title_too_long: "Título não pode ter mais de {{max}} caracteres"
+        title_too_short: "Título precisa ter no mínimo %{min} caracteres"
+        title_too_long: "Título não pode ter mais de %{max} caracteres"
         post_missing: "A postagem não pode estar vazia"
-        post_length: "Postagem precisa ter no mínimo {{min}} caracteres"
-        try_like: "Você já tentou o botão {{heart}}?"
+        post_length: "Postagem precisa ter no mínimo %{min} caracteres"
+        try_like: "Você já tentou o botão %{heart}?"
         category_missing: "Você precisa escolher uma categoria"
-        tags_missing: "Você precisa escolher pelo menos {{count}} etiquetas"
+        tags_missing: "Você precisa escolher pelo menos %{count} etiquetas"
         topic_template_not_modified: "Por favor, 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"
@@ -1684,10 +1686,10 @@ pt_BR:
       tooltip:
         regular:
           one: "%{count} notificação não visualizada"
-          other: "{{count}} notificações não visualizadas"
+          other: "%{count} notificações não visualizadas"
         message:
           one: "%{count} mensagem não lida"
-          other: "{{count}} mensagens não lidas"
+          other: "%{count} mensagens não lidas"
         high_priority:
           one: "%{count} notificação não lida de alta prioridade"
           other: "%{count} notificações não lidas de alta prioridade"
@@ -1696,48 +1698,48 @@ pt_BR:
       empty: "Nenhuma notificação foi encontrada."
       post_approved: "Sua postagem foi aprovada"
       reviewable_items: "itens que exigem revisão"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} e %{count} outro</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} e {{count}} outros</span> {{description}}"
+        one: "<span>%{username}, %{username2} e %{count} outro</span> %{description}"
+        other: "<span>%{username}, %{username2} e %{count} outros</span> %{description}"
       liked_consolidated_description:
-        one: "curtiu {{count}} de suas postagens"
-        other: "curtiu {{count}} de suas postagens"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> aceitou o seu convite"
-      moved_post: "<span>{{username}}</span> moveu {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Ganhou '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Novo Tópico</span> {{description}}"
-      membership_request_accepted: "Afiliação aceita em '{{group_name}}'"
-      membership_request_consolidated: "{{count}} abre solicitações de associação para '{{group_name}}'"
+        one: "curtiu %{count} de suas postagens"
+        other: "curtiu %{count} de suas postagens"
+      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}"
+      invitee_accepted: "<span>%{username}</span> aceitou o seu convite"
+      moved_post: "<span>%{username}</span> moveu %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Ganhou '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Novo Tópico</span> %{description}"
+      membership_request_accepted: "Afiliação aceita em '%{group_name}'"
+      membership_request_consolidated: "%{count} abre solicitações de associação para '%{group_name}'"
       group_message_summary:
-        one: "{{count}} mensagem na caixa de entrada de {{group_name}}"
-        other: "{{count}} mensagens na caixa de entrada de {{group_name}}"
+        one: "%{count} mensagem na caixa de entrada de %{group_name}"
+        other: "%{count} mensagens na caixa de entrada de %{group_name}"
       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}} te respondeu em "{{topic}}" - {{site_title}}'
-        posted: '{{username}} postou em "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} te enviou uma mensagem pessoal em "{{topic}}" - {{site_title}}'
-        linked: '{{username}} referenciou a sua postagem em "{{topic}}" - {{site_title}}'
-        watching_first_post: '{{username}} criou um novo tópico "{{topic}}" - {{site_title}}'
+        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} te respondeu em "%{topic}" - %{site_title}'
+        posted: '%{username} postou em "%{topic}" - %{site_title}'
+        private_message: '%{username} te enviou uma mensagem pessoal em "%{topic}" - %{site_title}'
+        linked: '%{username} referenciou a sua postagem em "%{topic}" - %{site_title}'
+        watching_first_post: '%{username} criou um novo tópico "%{topic}" - %{site_title}'
         confirm_title: "Notificações habilitadas - %{site_title}"
         confirm_body: "Sucesso! Notificações foram habilitadas."
-        custom: "Notificação de {{username}} em %{site_title}"
+        custom: "Notificação de %{username} em %{site_title}"
       titles:
         mentioned: "mencionado"
         replied: "nova resposta"
@@ -1767,9 +1769,9 @@ pt_BR:
       from_my_computer: "Do meu dispositivo"
       from_the_web: "Da Internet"
       remote_tip: "link para imagem"
-      remote_tip_with_attachments: "link para imagem ou arquivo {{authorized_extensions}}"
+      remote_tip_with_attachments: "link para imagem ou arquivo %{authorized_extensions}"
       local_tip: "selecione imagens a partir do seu dispositivo"
-      local_tip_with_attachments: "selecione imagens ou arquivos do seu dispositivo {{authorized_extensions}}"
+      local_tip_with_attachments: "selecione imagens ou arquivos do seu dispositivo %{authorized_extensions}"
       hint: "(você também pode arrastar e soltar no editor para enviá-las)"
       hint_for_supported_browsers: "você também pode arrastar e soltar no editor para enviá-las"
       uploading: "Enviando"
@@ -1786,15 +1788,15 @@ pt_BR:
       clear_all: "Limpar Todos"
       too_short: "Seu termo de pesquisa é muito curto."
       result_count:
-        one: "<span>%{count} resultado para</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} resultados para</span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} resultado para</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} resultados para</span><span class='term'>%{term}</span>"
       title: "pesquisar tópicos, postagens, usuários, ou categorias"
       full_page_title: "pesquisar tópicos ou postagens"
       no_results: "Nenhum resultado encontrado."
       no_more_results: "Nenhum outro resultado encontrado."
       searching: "Pesquisando..."
-      post_format: "#{{post_number}} por {{username}}"
-      results_page: "Pesquisar resultados para '{{term}}'"
+      post_format: "#%{post_number} por %{username}"
+      results_page: "Pesquisar resultados para '%{term}'"
       more_results: "Existem mais resultados. Por favor, restrinja os seus critérios de pesquisa."
       cant_find: "Não consegue encontrar o que você está procurando?"
       start_new_topic: "Que tal começar um novo tópico?"
@@ -1803,9 +1805,9 @@ pt_BR:
       search_google_button: "Google"
       search_google_title: "Pesquisar este site"
       context:
-        user: "Pesquisar postagens por @{{username}}"
-        category: "Pesquisar a categoria #{{category}}"
-        tag: "Pesquisar a #{{tag}} etiqueta"
+        user: "Pesquisar postagens por @%{username}"
+        category: "Pesquisar a categoria #%{category}"
+        tag: "Pesquisar a #%{tag} etiqueta"
         topic: "Pesquisar este tópico"
         private_messages: "Pesquisar mensagens"
       advanced:
@@ -1882,7 +1884,7 @@ pt_BR:
         choose_new_category: "Escolha a nova categoria para os tópicos:"
         selected:
           one: "Você selecionou <b>%{count}</b> tópico."
-          other: "Você selecionou <b>{{count}}</b> tópicos."
+          other: "Você selecionou <b>%{count}</b> tópicos."
         change_tags: "Substituir Etiquetas"
         append_tags: "Adicionar Etiquetas"
         choose_new_tags: "Escolha novas etiquetas para estes tópicos:"
@@ -1895,7 +1897,7 @@ pt_BR:
         posted: "Você ainda não postou em nenhum tópico."
         latest: "Não há últimos tópicos. Isto é triste."
         bookmarks: "Você ainda não tem nenhum tópico favorito."
-        category: "Não há tópicos na categoria {{category}}."
+        category: "Não há tópicos na categoria %{category}."
         top: "Não há melhores tópicos."
         educate:
           new: '<p>Seus novos tópicos aparecem aqui.</p><p>Por padrão, tópicos são considerados novos e mostrarão um indicador de <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">novo</span> se eles foram criados nos últimos 2 dias.</p><p>Visite as suas <a href="%{userPrefsUrl}">preferências</a> para alterar isto.</p>'
@@ -1906,13 +1908,13 @@ pt_BR:
         read: "Não há mais tópicos lidos."
         new: "Não há mais tópicos novos."
         unread: "Não há mais tópicos não lidos."
-        category: "Não há mais tópicos na categoria {{category}}."
+        category: "Não há mais tópicos na categoria %{category}."
         top: "Não há mais melhores tópicos."
         bookmarks: "Não há mais tópicos favoritos."
     topic:
       filter_to:
         one: "%{count} postagem no tópico"
-        other: "{{count}} postagens no tópico"
+        other: "%{count} postagens no tópico"
       create: "Novo Tópico"
       create_long: "Criar um novo Tópico"
       open_draft: "Rascunho Aberto"
@@ -1941,10 +1943,10 @@ pt_BR:
       unread: "não lido"
       new_topics:
         one: "%{count} tópico novo"
-        other: "{{count}} tópicos novos"
+        other: "%{count} tópicos novos"
       unread_topics:
         one: "%{count} tópico não lido"
-        other: "{{count}} tópicos não lidos"
+        other: "%{count} tópicos não lidos"
       title: "Tópico"
       invalid_access:
         title: "Tópico é privado"
@@ -1958,24 +1960,24 @@ pt_BR:
         description: "Desculpe, não foi possível encontrar aquele tópico. Talvez ele tenha sido removido por um moderador?"
       total_unread_posts:
         one: "você tem %{count} postagem não lida neste tópico"
-        other: "você tem {{count}} postagens não lidas neste tópico"
+        other: "você tem %{count} postagens não lidas neste tópico"
       unread_posts:
         one: "você tem %{count} postagem antiga não lida neste tópico"
-        other: "você tem {{count}} postagens antigas não lidas neste tópico"
+        other: "você tem %{count} postagens antigas não lidas neste tópico"
       new_posts:
         one: "há %{count} postagem nova neste tópico desde a sua última leitura"
-        other: "há {{count}} postagens novas neste tópico desde a sua última leitura"
+        other: "há %{count} postagens novas neste tópico desde a sua última leitura"
       likes:
         one: "há %{count} curtida neste tópico"
-        other: "há {{count}} curtidas 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: "mostrar links dentro deste tópico"
       toggle_information: "alternar 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}}."
-      group_request: "Você precisa solicitar filiação ao grupo `{{name}}` para ver este tópico"
-      group_join: "Você precisa juntar-se ao grupo `{{name}}` para ver este 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}."
+      group_request: "Você precisa solicitar filiação ao grupo `%{name}` para ver este tópico"
+      group_join: "Você precisa juntar-se ao grupo `%{name}` para ver este tópico"
       group_request_sent: "Sua solicitação de filiação ao grupo foi enviada. Você será informado(a) quando ela for aceita."
       unread_indicator: "Nenhum membro leu a última postagem deste tópico ainda."
       read_more_MF: "Há { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 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'>1 novo</a> tópico} other { {BOTH, select, true{e } false {} other{}} <a href='{basePath}/new'># novos</a> tópicos} } restantes, ou {CATEGORY, select, true {veja outros tópicos em {catLink}} false {{latestLink}} other {}}"
@@ -2079,7 +2081,7 @@ pt_BR:
           "2_8": "Você verá uma contagem de novas respostas porque está acompanhando esta categoria."
           "2_4": "Você verá uma contagem de novas respostas porque postou uma resposta a este tópico."
           "2_2": "Você verá uma contagem de novas respostas porque está acompanhando este tópico."
-          "2": 'Você verá uma contagem de novas respostas porque <a href="{{basePath}}/u/{{username}}/preferences/notifications">leu este tópico</a>.'
+          "2": 'Você verá uma contagem de novas respostas porque <a href="%{basePath}/u/%{username}/preferences/notifications">leu este tópico</a>.'
           "1_2": "Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem."
           "1": "Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem."
           "0_7": "Você está ignorando todas as notificações nesta categoria."
@@ -2155,25 +2157,25 @@ pt_BR:
         choose_category: "Por favor, escolha uma categoria para o tópico público:"
       feature_topic:
         title: "Destacar este tópico"
-        pin: "Fazer que este tópico apareça no topo da categoria {{categoryLink}} até"
-        confirm_pin: "Você já tem {{count}} tópicos fixos. Muitos tópicos fixados podem atrapalhar usuários novos e anônimos. Tem certeza que quer fixar outro tópico nesta categoria?"
-        unpin: "Remover este tópico do inicio da {{categoryLink}} categoria."
-        unpin_until: "Remover este tópico do topo da categoria {{categoryLink}} ou esperar até <strong>%{until}</strong>."
+        pin: "Fazer que este tópico apareça no topo da categoria %{categoryLink} até"
+        confirm_pin: "Você já tem %{count} tópicos fixos. Muitos tópicos fixados podem atrapalhar usuários novos e anônimos. Tem certeza que quer fixar outro tópico nesta categoria?"
+        unpin: "Remover este tópico do inicio da %{categoryLink} categoria."
+        unpin_until: "Remover este tópico do topo da categoria %{categoryLink} ou esperar até <strong>%{until}</strong>."
         pin_note: "Usuários podem desafixar o tópico individualmente para si."
         pin_validation: "Uma data é necessária para fixar este tópico."
-        not_pinned: "Não existem tópicos fixados em {{categoryLink}}."
+        not_pinned: "Não existem tópicos fixados em %{categoryLink}."
         already_pinned:
-          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>"
+          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: "Você já tem {{count}} tópicos fixados globalmente. Muitos tópicos fixados podem prejudicar usuários novos e anônimos. Tem certeza que quer fixar outro tópico globalmente?"
+        confirm_pin_globally: "Você já tem %{count} tópicos fixados globalmente. Muitos tópicos fixados podem prejudicar usuários novos e anônimos. Tem certeza 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 podem desafixar o tópico individualmente para si."
         not_pinned_globally: "Não existem tópicos fixados globalmente."
         already_pinned_globally:
-          one: "Tópicos atualmente fixados globalmente: <strong class='badge badge-notification unread'>{{count}}</strong>."
-          other: "Tópicos atualmente fixados globalmente: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Tópicos atualmente fixados globalmente: <strong class='badge badge-notification unread'>%{count}</strong>."
+          other: "Tópicos atualmente fixados globalmente: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Tornar este tópico em um banner que apareça no inicio de todas as páginas."
         remove_banner: "Remover o banner que aparece no inicio de todas as páginas."
         banner_note: "Usuários podem dispensar o banner fechando-o. Apenas um tópico pode ser colocado como banner a cada momento."
@@ -2201,17 +2203,17 @@ pt_BR:
         to_topic_blank: "Entrar o nome de usuário 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. Nós enviaremos um convite por e-mail que permite seu amigo responder imediatamente a este tópico."
         to_topic_username: "Você inseriu um nome de usuário. Nós vamos enviar uma notificação com um link convidando-o para este tópico."
-        to_username: "Insira o nome de usuário da pessoa que você gostaria de convidas. Nós vamos enviar uma notificação com um link convidando-o para este tópico."
+        to_username: "Insira o nome de usuário da pessoa que você gostaria de convidar. Nós vamos enviar uma notificação com um link convidando-o para este tópico."
         email_placeholder: "nome@exemplo.com"
-        success_email: "Enviamos um convite para <b>{{emailOrUsername}}</b>. Nós notificaremos você quando este convite for resgatado. Verifique a aba de convites na página de seu usuário para acompanhar seus convites."
+        success_email: "Enviamos um convite para <b>%{emailOrUsername}</b>. Nós notificaremos você quando este convite for resgatado. Verifique a aba de convites na página de seu usuário para acompanhar seus convites."
         success_username: "Nós convidamos o usuário para participar neste tópico."
         error: "Desculpe, nós não pudemos convidar esta pessoa. Talvez já seja usuário? (convites têm taxa limitada)"
-        success_existing_email: "Um usuário com e-mail <b>{{emailOrUsername}}</b> já existe. Convidamos este usuário a participar deste tópico."
+        success_existing_email: "Um usuário com e-mail <b>%{emailOrUsername}</b> já existe. Convidamos este usuário a participar deste tópico."
       login_reply: "Logar para Responder"
       filters:
         n_posts:
           one: "%{count} mensagem"
-          other: "{{count}} mensagens"
+          other: "%{count} mensagens"
         cancel: "Remover filtro"
       move_to:
         title: "Mover para"
@@ -2225,15 +2227,15 @@ pt_BR:
         error: "Houve um erro ao mover as mensagens para o novo tópico."
         instructions:
           one: "Você está prestes a criar um novo tópico e populá-lo com a resposta que você selecionou."
-          other: "Você está prestes a criar um novo tópico e populá-lo com as <b>{{count}}</b> respostas que você selecionou."
+          other: "Você está prestes a criar um novo tópico e populá-lo com as <b>%{count}</b> respostas que você selecionou."
       merge_topic:
         title: "Mover para tópico já existente"
         action: "mover para tópico já existente"
         error: "Houve um erro ao mover as mensagens para aquele tópico."
         radio_label: "Tópico Existente"
         instructions:
-          one: "Por favor selecione o tópico para o qual você gostaria de mover esta resposta."
-          other: "Por favor selecione o tópico para o qual você gostaria de mover estas <b>{{count}}</b> respostas."
+          one: "Por favor selecione o tópico para o qual você gostaria de mover esta postagem."
+          other: "Por favor selecione o tópico para o qual você gostaria de mover estas <b>%{count}</b> postagens."
       move_to_new_message:
         title: "Mover para Nova Mensagem"
         action: "mover para nova mensagem"
@@ -2242,7 +2244,7 @@ pt_BR:
         participants: "Participantes"
         instructions:
           one: "Você está prestes a criar uma nova mensagem e preenchê-la com a postagem que você selecionou."
-          other: "Você está prestes a criar uma nova mensagem e preenchê-la com as <b>{{count}}</b>postagens que você selecionou."
+          other: "Você está prestes a criar uma nova mensagem e preenchê-la com as <b>%{count}</b> postagens que você selecionou."
       move_to_existing_message:
         title: "Mover para Mensagem Existente"
         action: "mover para mensagem existente"
@@ -2250,7 +2252,7 @@ pt_BR:
         participants: "Participantes"
         instructions:
           one: "Por favor escolha a mensagem para a qual você gostaria de mover aquela postagem."
-          other: "Por favor escolha a mensagem para a qual você gostaria de mover aquelas <b>{{count}}</b> postagens."
+          other: "Por favor escolha a mensagem para a qual você gostaria de mover aquelas <b>%{count}</b> postagens."
       merge_posts:
         title: "Unificar as Mensagens Selecionadas"
         action: "unificar as mensagens selecionadas"
@@ -2273,11 +2275,11 @@ pt_BR:
         error: "Houve um erro ao alterar o autor destas mensagens."
         placeholder: "novo autor"
         instructions:
-          one: "Por favor escolha um novo autor para a postagem de <b>@{{old_user}}</b>"
-          other: "Por favor escolha um novo autor para as {{count}} postagens de <b>@{{old_user}}</b>"
+          one: "Por favor escolha um novo autor para a postagem de <b>@%{old_user}</b>"
+          other: "Por favor escolha um novo autor para as %{count} postagens de <b>@%{old_user}</b>"
         instructions_without_old_user:
           one: "Escolha um novo proprietário para a postagem"
-          other: "Escolha um novo proprietário para as {{count}} postagens"
+          other: "Escolha um novo proprietário para as %{count} postagens"
       change_timestamp:
         title: "Alterar o timestamp ..."
         action: "alterar horário"
@@ -2286,7 +2288,7 @@ pt_BR:
         instructions: "Por favor selecione um novo horário para o tópico. Mensagens no tópico serão atualizadas para manter a mesma diferença de tempo."
       multi_select:
         select: "selecionar"
-        selected: "({{count}}) selecionados"
+        selected: "(%{count}) selecionados"
         select_post:
           label: "selecione"
           title: "Adicionar postagem à seleção"
@@ -2305,20 +2307,20 @@ pt_BR:
         deselect_all: deselecionar tudo
         description:
           one: <b>%{count}</b> resposta selecionada.
-          other: "<b>{{count}}</b> respostas selecionadas."
+          other: "<b>%{count}</b> respostas selecionadas."
       deleted_by_author:
         one: "(tópico retirado pelo autor, será automaticamente excluído em %{count} hora a menos que seja sinalizado)"
         other: "(tópico retirado pelo autor, será automaticamente excluído em %{count} horas a menos que seja sinalizado)"
     post:
       quote_reply: "Citação"
       edit_reason: "Motivo:"
-      post_number: "resposta {{number}}"
+      post_number: "resposta %{number}"
       ignored: "Conteúdo ignorado"
       wiki_last_edited_on: "wiki última vez editada em"
       last_edited_on: "resposta editada pela última vez em"
       reply_as_new_topic: "Responder como um Tópico linkado"
       reply_as_new_private_message: "Responder como nova mensagem aos mesmos destinatários"
-      continue_discussion: "Continuando a discussão do {{postLink}}:"
+      continue_discussion: "Continuando a discussão do %{postLink}:"
       follow_quote: "ir para a resposta citada"
       show_full: "Exibir mensagem completa"
       show_hidden: "Ver o conteúdo ignorado."
@@ -2330,29 +2332,29 @@ pt_BR:
       locked: "um membro da equipe bloqueou este post de ser editado"
       gap:
         one: "ver %{count} resposta oculta"
-        other: "ver {{count}} respostas ocultas"
+        other: "ver %{count} respostas ocultas"
       notice:
-        new_user: "Esta é a primeira vez que o {{user}} postou — Vamos dar boas vindas da nossa comunidade"
-        returning_user: "Já faz um tempo desde que vimos {{user}} — Seu ultimo poste foi {{time}}."
+        new_user: "Esta é a primeira vez que o %{user} postou — Vamos dar boas vindas da nossa comunidade"
+        returning_user: "Já faz um tempo desde que vimos %{user} — Seu ultimo poste foi %{time}."
       unread: "Resposta não lida"
       has_replies:
-        one: "{{count}} Resposta"
-        other: "{{count}} Respostas"
+        one: "%{count} Resposta"
+        other: "%{count} Respostas"
       has_likes_title:
-        one: "{{count}} pessoa curtiu esta mensagem"
-        other: "{{count}} pessoas curtiram esta mensagem"
+        one: "%{count} pessoa curtiu esta postagem"
+        other: "%{count} pessoas curtiram esta postagem"
       has_likes_title_only_you: "você curtiu esta postagem"
       has_likes_title_you:
-        one: "você e mais %{count} pessoa gostaram desta postagem"
-        other: "você e mais {{count}} outras pessoas gostaram desta postagem"
+        one: "você e mais %{count} pessoa curtiram esta postagem"
+        other: "você e mais %{count} outras pessoas curtiram esta postagem"
       errors:
         create: "Desculpe, houve um erro ao criar sua resposta. Por favor, tente outra vez."
         edit: "Desculpe, houve um erro ao editar sua resposta. Por favor, tente outra vez."
         upload: "Desculpe, houve um erro ao enviar este arquivo. Por favor, tente outra vez."
-        file_too_large: "Desculpe, este arquivo é muito grande (o tamanho máximo é {{max_size_kb}}kb). Por que não faz o upload de seu arquivo grande em um serviço de nuvem e compartilha o link?"
+        file_too_large: "Desculpe, este arquivo é muito grande (o tamanho máximo é %{max_size_kb}kb). Por que não faz o upload de seu arquivo grande em um serviço de nuvem e compartilha o link?"
         too_many_uploads: "Desculpe, você pode enviar apenas um arquivos por vez."
-        too_many_dragged_and_dropped_files: "Desculpe, você só pode enviar {{max}} arquivos de uma vez."
-        upload_not_authorized: "Desculpe, o arquivo que você está tentando enviar não é permitido (extensões permitidas: {{authorized_extensions}})."
+        too_many_dragged_and_dropped_files: "Desculpe, você só pode enviar %{max} arquivos de uma 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, novos usuário não podem enviar imagens."
         attachment_upload_not_allowed_for_new_user: "Desculpe, usuários novos não podem enviar anexos."
         attachment_download_requires_login: "Desculpe, você precisa estar logado para baixar arquivos anexos."
@@ -2392,10 +2394,10 @@ pt_BR:
           confirm: "Você também deseja excluir as respostas desta postagem?"
           direct_replies:
             one: "Sim e %{count} resposta direta"
-            other: "Sim e {{count}} respostas diretas"
+            other: "Sim e %{count} respostas diretas"
           all_replies:
             one: "Sim e %{count} resposta"
-            other: "Sim, e todas as {{count}} respostas"
+            other: "Sim, e todas as %{count} respostas"
           just_the_post: "Não, apenas este post"
         admin: "ações administrativas da postagem"
         wiki: "Tornar Wiki"
@@ -2427,7 +2429,7 @@ pt_BR:
           spam: "Desfazer sinalização"
           inappropriate: "Desfazer sinalização"
           bookmark: "Remover favorito"
-          like: "Descurtir"
+          like: "Desfazer curtida"
         people:
           off_topic: "marcado como off-topic"
           spam: "marcado como spam"
@@ -2436,17 +2438,17 @@ pt_BR:
           notify_user: "enviou uma mensagem"
           bookmark: "favoritaram isto"
           like:
-            one: "gostou disto"
-            other: "gostaram disto"
+            one: "curtiu"
+            other: "curtiram"
           read:
             one: "leu isto"
             other: "Leram isto"
           like_capped:
-            one: "e {{count}} outro gostou disto"
-            other: "e {{count}} outros gostaram disto"
+            one: "e %{count} outro curtiu"
+            other: "e %{count} outros curtiram"
           read_capped:
-            one: "e {{count}} outra leu isto"
-            other: "e {{count}} outras leram isto"
+            one: "e %{count} outra leu isto"
+            other: "e %{count} outras leram isto"
         by_you:
           off_topic: "Você sinalizou isto como off-topic"
           spam: "Você sinalizou isto como spam"
@@ -2458,11 +2460,11 @@ pt_BR:
       delete:
         confirm:
           one: "Tem certeza de que deseja excluir esta postagem?"
-          other: "Tem certeza de que deseja excluir as postagens de {{count}}?"
+          other: "Tem certeza de que deseja excluir as postagens de %{count}?"
       merge:
         confirm:
           one: "Tem certeza de que deseja mesclar estas postagens?"
-          other: "Tem certeza de que deseja mesclar estas postagens de {{count}}?"
+          other: "Tem certeza de que deseja mesclar estas postagens de %{count}?"
       revisions:
         controls:
           first: "Primeira revisão"
@@ -2474,7 +2476,7 @@ pt_BR:
           revert: "Reverter para esta revisão"
           edit_wiki: "Editar Wiki"
           edit_post: "Editar Postagem"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "Exibir a saída renderizada com adições e remoções em linha"
@@ -2665,13 +2667,13 @@ pt_BR:
       custom_message:
         at_least:
           one: "insira pelo menos %{count} caractere"
-          other: "insira pelo menos {{count}} caracteres"
+          other: "insira pelo menos %{count} caracteres"
         more:
           one: "Falta apenas %{count}..."
-          other: "Faltam {{count}}..."
+          other: "Faltam %{count}..."
         left:
           one: "%{count} restante"
-          other: "{{count}} restantes"
+          other: "%{count} restantes"
     flagging_topic:
       title: "Obrigado por ajudar a manter a civilidade da nossa comunidade!"
       action: "Sinalizar Tópico"
@@ -2715,7 +2717,7 @@ pt_BR:
         title: "Este tópico é uma mensagem pessoal"
         help: "Este tópico é uma mensagem pessoal"
     posts: "Postagens"
-    posts_long: "há {{number}} mensagens neste tópico"
+    posts_long: "há %{number} mensagens neste tópico"
     posts_likes_MF: |
       Este tópico tem {count, plural, one {1 resposta} other {# respostas}} {ratio, select,
       low {com uma proporção alta de curtidas}
@@ -2730,20 +2732,20 @@ pt_BR:
     replies: "Respostas"
     views_long:
       one: "este tópico foi visto uma vez"
-      other: "este tópico foi visto {{number}} vezes"
+      other: "este tópico foi visto %{number} vezes"
     activity: "Atividade"
     likes: "Curtidas"
     likes_lowercase:
       one: "like"
-      other: "likes"
-    likes_long: "há {{number}} curtidas neste tópico"
+      other: "curtidas"
+    likes_long: "há %{number} curtidas neste tópico"
     users: "Usuários"
     users_lowercase:
       one: "usuário"
       other: "usuários"
     category_title: "Categoria"
     history: "Histórico"
-    changed_by: "por {{author}}"
+    changed_by: "por %{author}"
     raw_email:
       title: "Detalhes dos Emails Recebidos"
       not_available: "Não disponível!"
@@ -2755,33 +2757,33 @@ pt_BR:
         title: "Recente"
         title_with_count:
           one: "Recente (%{count})"
-          other: "Recentes ({{count}})"
+          other: "Recentes (%{count})"
         help: "tópicos com mensagens recentes"
       read:
         title: "Lido"
         help: "tópicos que você leu"
       categories:
         title: "Categorias"
-        title_in: "Categoria - {{categoryName}}"
+        title_in: "Categoria - %{categoryName}"
         help: "todos os tópicos agrupados por categoria"
       unread:
         title: "Não lidas"
         title_with_count:
           one: "Não lido (%{count})"
-          other: "Não lidos ({{count}})"
+          other: "Não lidos (%{count})"
         help: "tópicos que você está observando ou acompanhando com mensagens não lidas"
         lower_title_with_count:
           one: "%{count} não lido"
-          other: "{{count}} não lidos"
+          other: "%{count} não lidos"
       new:
         lower_title_with_count:
           one: "%{count} nova"
-          other: "{{count}} novas"
+          other: "%{count} novas"
         lower_title: "nova"
         title: "Novo"
         title_with_count:
           one: "Novo (%{count})"
-          other: "Novos ({{count}})"
+          other: "Novos (%{count})"
         help: "tópicos criados nos últimos dias"
       posted:
         title: "Minhas mensagens"
@@ -2790,11 +2792,11 @@ pt_BR:
         title: "Favoritos"
         help: "tópicos que você adicionou aos favoritos"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "tópicos recentes na categoria {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "tópicos recentes na categoria %{categoryName}"
       top:
         title: "Melhores"
         help: "os tópicos mais ativos no último ano, mês, semana ou dia"
@@ -2896,7 +2898,7 @@ pt_BR:
         reply_topic: "%{shortcut} Responder ao tópico"
         reply_post: "%{shortcut} Responder a mensagem"
         quote_post: "%{shortcut} Citar resposta"
-        like: "%{shortcut} Curtir a mensagem"
+        like: "%{shortcut} Curtir a postagem"
         flag: "%{shortcut} Sinalizar mensagem"
         bookmark: "%{shortcut} Favoritar mensagem"
         edit: "%{shortcut} Editar mensagem"
@@ -2919,7 +2921,7 @@ pt_BR:
       granted_on: "Concedido em %{date}"
       others_count: "Outros com este emblema (%{count})"
       title: Emblemas
-      allow_title: "Você pode usar este selo como um título"
+      allow_title: "Você pode usar este emblema como um título"
       multiple_grant: "Você pode ganhar isto várias vezes"
       badge_count:
         one: "%{count} Emblema"
@@ -2932,7 +2934,7 @@ pt_BR:
         other: "%{count} concedidos"
       select_badge_for_title: Selecione um emblema para usar como o seu título
       none: "(nenhum)"
-      successfully_granted: "Concedido com sucesso %{badge} to %{username}"
+      successfully_granted: "%{badge} concedido com sucesso para %{username}"
       badge_grouping:
         getting_started:
           name: Primeiros Passos
@@ -2958,8 +2960,8 @@ pt_BR:
       synonyms: "Sinônimos"
       synonyms_description: "Quando as seguintes etiquetas forem usadas, eles serão substituídas por <b>%{base_tag_name}</b>."
       tag_groups_info:
-        one: 'Esta etiqueta pertence a este grupo: {{tag_groups}}.'
-        other: "Esta etiqueta pertence a estes grupos: {{tag_groups}}."
+        one: 'Esta etiqueta pertence a este grupo: %{tag_groups}.'
+        other: "Esta etiqueta pertence a estes grupos: %{tag_groups}."
       category_restrictions:
         one: "Pode ser usada nesta categoria:"
         other: "Pode ser usada nestas categorias:"
@@ -2975,11 +2977,11 @@ pt_BR:
       delete_tag: "Apagar marcação"
       delete_confirm:
         one: "Tem certeza de que deseja excluir esta tag e removê-la de um tópico para o qual ela está atribuída?"
-        other: "Tem certeza de que deseja excluir esta tag e removê-la de {{count}} tópicos aos quais ela está atribuída?"
+        other: "Tem certeza de que deseja excluir esta tag e removê-la de %{count} tópicos aos quais ela está atribuída?"
       delete_confirm_no_topics: "Tem certeza de que deseja excluir esta tag?"
       delete_confirm_synonyms:
         one: "O sinônimo dela também será excluído."
-        other: "Os {{count}} sinônimos dela também serão excluídos."
+        other: "Os %{count} sinônimos dela também serão excluídos."
       rename_tag: "Renomear marcador"
       rename_instructions: "Escolha um novo nome para o marcador"
       sort_by: "Ordenar por"
@@ -3337,10 +3339,10 @@ pt_BR:
           redeliver: "Entregar novamente"
           incoming:
             one: "Existe um novo evento."
-            other: "Existem {{count}} novos eventos."
+            other: "Existem %{count} novos eventos."
           completed_in:
             one: "Completado em %{count} segundo."
-            other: "Completado em {{count}} segundos."
+            other: "Completado em %{count} segundos."
           request: "Requisição"
           response: "Resposta"
           redeliver_confirm: "Tem certeza que deseja enviar o mesmo payload novamente?"
@@ -3392,12 +3394,12 @@ pt_BR:
           label: "Enviar"
           title: "Enviar um backup para esta instância"
           uploading: "Enviando..."
-          uploading_progress: "Enviando... {{progress}}%"
-          success: "'{{filename}} foi enviado com sucesso. O arquivo está sendo processado e levará até um minuto para aparecer na lista."
-          error: "Houve um erro ao carregar '{{filename}}': {{message}}"
+          uploading_progress: "Enviando... %{progress}%"
+          success: "'%{filename} foi enviado com sucesso. O arquivo está sendo processado e levará até um minuto para aparecer na lista."
+          error: "Houve um erro ao carregar '%{filename}': %{message}"
         operations:
           is_running: "Uma operação está sendo executada..."
-          failed: "A {{operação}} falhou. Por favor, cheque os registros."
+          failed: "A %{operação} falhou. Por favor, cheque os registros."
           cancel:
             label: "Cancelar"
             title: "Cancelar a operação atual"
@@ -3520,7 +3522,7 @@ pt_BR:
           disabled_component_tooltip: "Este componente foi desabilitado"
           default_theme_tooltip: "Este tema é o tema padrão do site"
           updates_available_tooltip: "Atualizações estão disponíveis para este tema"
-          and_x_more: "e {{count}} mais."
+          and_x_more: "e %{count} mais."
           collapse: Recolher
           uploads: "Uploads"
           no_uploads: "Você pode fazer upload de recursos associados ao seu tema, como fontes e imagens"
@@ -3569,8 +3571,8 @@ pt_BR:
           disabled_by: "Este componente foi desabilitado por"
           required_version:
             error: "Este tema foi desabilitado automaticamente porque ele não é compatível com esta versão do Discourse."
-            minimum: "Requer versão {{version}} ou acima do Discourse."
-            maximum: "Requer versão {{version}} ou abaixo do Discourse."
+            minimum: "Requer versão %{version} ou acima do Discourse."
+            maximum: "Requer versão %{version} ou abaixo do Discourse."
           component_of: "Componente de:"
           update_to_latest: "Atualize para o mais recente"
           check_for_updates: "Verificar Atualizações"
@@ -3583,7 +3585,7 @@ pt_BR:
           empty: "Nenhum item"
           commits_behind:
             one: "O tema é %{count} commit por trás!"
-            other: "o tema é {{count}} confirmado por trás"
+            other: "o tema é %{count} confirmado por trás"
           compare_commits: "(Ver novos commits)"
           repo_unreachable: "Não foi possível contatar o repositório Git deste tema. Mensagem de erro:"
           imported_from_archive: "Este tema foi importado de um arquivo \".zip\""
@@ -3808,9 +3810,9 @@ pt_BR:
             delete_category: "apagar a categoria"
             create_category: "criar uma categoria"
             silence_user: "Silenciar usuário"
-            unsilence_user: "não silenciar usuário"
+            unsilence_user: "remover silenciamento de usuário usuário"
             removed_silence_user: "Silenciar usuário (removido)"
-            removed_unsilence_user: "não silenciar usuário (removido)"
+            removed_unsilence_user: "remover silenciamento de usuário (removido)"
             grant_admin: "conceder admin"
             revoke_admin: "revogar admin"
             grant_moderation: "conceder moderação"
@@ -3988,8 +3990,8 @@ pt_BR:
           title: "Mostrar endereço de e-mail deste usuário"
           text: "Mostrar"
       user:
-        suspend_failed: "Algo deu errado suspendendo este usuário {{error}}"
-        unsuspend_failed: "Algo deu errado reativando este usuário {{error}}"
+        suspend_failed: "Algo deu errado suspendendo este usuário %{error}"
+        unsuspend_failed: "Algo deu errado reativando este usuário %{error}"
         suspend_duration: "Por quanto tempo o usuário deverá ser suspenso?"
         suspend_reason_label: "Por que você está suspendendo? Este texto <b>será visível para todos</b> na página de perfil deste usuário, e será mostrado ao usuário quando ele tentar se logar. Seja breve."
         suspend_reason_hidden_label: "Por que você está suspendendo? Este texto será exibido para o usuário quando ele tentar efetuar login. Mantenha-o curto."
@@ -4011,7 +4013,7 @@ pt_BR:
         delete_all_posts: "Apagar todas mensagens"
         delete_posts_progress: "Excluindo postagens…"
         delete_posts_failed: "Houve um problema excluindo as postagens."
-        penalty_post_actions: "O que você gostaria de fazer com o post associado?"
+        penalty_post_actions: "O que você gostaria de fazer com a postagem associada?"
         penalty_post_delete: "Excluir a postagem"
         penalty_post_delete_replies: "Excluir a postagem + quaisquer respostas"
         penalty_post_edit: "editar a publicação"
@@ -4022,7 +4024,7 @@ pt_BR:
           description: "usuários com penalidades não podem alcançar TL3"
         delete_all_posts_confirm_MF: "Você está prestes a apagar {POSTS, plural, one {1 publicação} other {# publicações}} and {TOPICS, plural, one {1 tópico} other {# tópicos}}. Você tem certeza?"
         silence: "Silenciar"
-        unsilence: "Não silenciar"
+        unsilence: "Remover silenciamento"
         silenced: "Silenciado?"
         moderator: "Moderador?"
         admin: "Admin?"
@@ -4033,7 +4035,7 @@ pt_BR:
         impersonate: "Personificar"
         action_logs: "Registro de Atividades"
         ip_lookup: "Pesquisa do IP"
-        log_out: "Log Out"
+        log_out: "Sair"
         logged_out: "Usuário foi desconectado em todos os dipositivos"
         revoke_admin: "Revogar Admin"
         grant_admin: "Conceder Admin"
@@ -4048,7 +4050,7 @@ pt_BR:
         reputation: Reputação
         permissions: Permissões
         activity: Atividade
-        like_count: Curtidas dados / recebidos
+        like_count: Curtidas dadas / recebidas
         last_100_days: "nos últimos 100 dias"
         private_topics_count: Tópicos Privados
         posts_read_count: Mensagens lidas
@@ -4159,8 +4161,8 @@ pt_BR:
           posts_read_all_time: "Posts Lidos (todo o período)"
           flagged_posts: "Mensagens Sinalizadas"
           flagged_by_users: "Usuários que foram denunciados"
-          likes_given: "Curtidas dados"
-          likes_received: "Curtidas recebidos"
+          likes_given: "Curtidas dadas"
+          likes_received: "Curtidas recebidas"
           likes_received_days: "Curtidas recebidas: dias únicos"
           likes_received_users: "Curtidas recebidas: usuários únicos"
           suspended: "Suspenso (últimos 6 meses)"
@@ -4215,7 +4217,7 @@ pt_BR:
           dropdown: "Caixa de seleção"
       site_text:
         description: "Você pode personalizar qualquer parte do texto em seu fórum. Por favor, comece pesquisando abaixo:"
-        search: "Procure peloo texto que você gostaria de editar"
+        search: "Procure pelo texto que você gostaria de editar"
         title: "Texto"
         edit: "editar"
         revert: "Reverter alterações"
@@ -4345,7 +4347,7 @@ pt_BR:
           sample: "Exemplo:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
-            with_post: "<span class=\"username\">%{username}</span> for post in %{link}"
+            with_post: "<span class=\"username\">%{username}</span> por postar em %{link}"
             with_post_time: "<span class=\"username\">%{username}</span> por postar em %{link} às <span class=\"time\">%{time}</span>"
             with_time: "<span class=\"username\">%{username}</span> às <span class=\"time\">%{time}</span>"
         badge_intro:
@@ -4366,6 +4368,7 @@ pt_BR:
         title: "Emoji"
         help: "Adicionar novo emoji que estará disponível para todos. (DICA: arraste & solte diversos arquivos de uma vez)"
         add: "Adicionar Novo Emoji"
+        uploading: "Enviando..."
         name: "Nome"
         group: "Grupo"
         image: "Imagem"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 9d0f96b20d..320f35da3c 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -24,8 +24,8 @@ ro:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
@@ -222,12 +222,12 @@ ro:
     every_hour: "La fiecare oră"
     daily: "Zilnic"
     weekly: "Săptămânal"
-    max_of_count: "max din {{count}}"
+    max_of_count: "max din %{count}"
     alternation: "sau"
     character_count:
       one: "Un caracter"
-      few: "{{count}} caractere"
-      other: "{{count}} de caractere"
+      few: "%{count} caractere"
+      other: "%{count} de caractere"
     suggested_topics:
       title: "Subiecte sugerate"
       pm_title: "Mesaje sugerate"
@@ -275,16 +275,16 @@ ro:
         no_value: "Nu, păstrează."
     topic_count_latest:
       one: "Un subiect nou sau actualizat."
-      few: "{{count}} subiecte noi sau actualizate."
-      other: "{{count}} de subiecte noi sau actualizate."
+      few: "%{count} subiecte noi sau actualizate."
+      other: "%{count} de subiecte noi sau actualizate."
     topic_count_unread:
-      one: "Afișați {{count}} cubiect necitit"
-      few: "Afișați {{count}} subiect necitit"
-      other: "Vedeți {{count}} subiecte necitite"
+      one: "Afișați %{count} cubiect necitit"
+      few: "Afișați %{count} subiect necitit"
+      other: "Vedeți %{count} subiecte necitite"
     topic_count_new:
-      one: "Afișați {{count}} subiect nou"
-      few: "Afișați {{count}} subiecte noi"
-      other: "Afișați {{count}} subiecte noi"
+      one: "Afișați %{count} subiect nou"
+      few: "Afișați %{count} subiecte noi"
+      other: "Afișați %{count} subiecte noi"
     preview: "Previzualizează"
     cancel: "Anulează"
     save: "Salvează schimbările"
@@ -348,19 +348,19 @@ ro:
         description: "Am primit noua postare dar trebuie să fie aprobată de un moderator înainte că ea să apară pe site. Te rugăm să ai răbdare."
         ok: "Ok"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> a postat <a href='{{topicUrl}}'>discuția</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>ai</a> postat <a href='{{topicUrl}}'>subiectul</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a>a răspuns la<a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Tu</a> ai răspuns la <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> a răspuns la <a href='{{topicUrl}}'>subiect</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Tu</a> ai răspuns la <a href='{{topicUrl}}'>subiect</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> a menționat pe <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> te-a menționat pe <a href='{{user2Url}}'>tine</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Tu</a> ai menționat pe <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Postat de <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Postat de <a href='{{userUrl}}'>tine</a>"
-      sent_by_user: "Trimis de <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Trimis de <a href='{{userUrl}}'>tine</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> a postat <a href='%{topicUrl}'>discuția</a>"
+      you_posted_topic: "<a href='%{userUrl}'>ai</a> postat <a href='%{topicUrl}'>subiectul</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a>a răspuns la<a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Tu</a> ai răspuns la <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> a răspuns la <a href='%{topicUrl}'>subiect</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Tu</a> ai răspuns la <a href='%{topicUrl}'>subiect</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> a menționat pe <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> te-a menționat pe <a href='%{user2Url}'>tine</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Tu</a> ai menționat pe <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Postat de <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Postat de <a href='%{userUrl}'>tine</a>"
+      sent_by_user: "Trimis de <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Trimis de <a href='%{userUrl}'>tine</a>"
     directory:
       filter_name: "Filtrează după nume utilizator"
       title: "Utilizatori"
@@ -569,7 +569,7 @@ ro:
     user_fields:
       none: "(alege o opțiune)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profil"
       mute: "Silențios"
       edit: "Editează preferințe"
@@ -623,12 +623,12 @@ ro:
       external_links_in_new_tab: "Deschide toate adresele externe într-un tab nou"
       enable_quoting: "Activează citarea răspunsurilor pentru textul selectat"
       change: "Schimbă"
-      moderator: "{{user}} este moderator"
-      admin: "{{user}} este admin"
+      moderator: "%{user} este moderator"
+      admin: "%{user} este admin"
       moderator_tooltip: "Acest utilizator este moderator"
       admin_tooltip: "Acest utilizator este admin"
       silenced_tooltip: "Acest utilizator este silențios"
-      suspended_notice: "Acest utilizator este suspendat până la {{date}}."
+      suspended_notice: "Acest utilizator este suspendat până la %{date}."
       suspended_permanently: "Acest utilizator este suspendat."
       suspended_reason: "Motiv: "
       github_profile: "Github"
@@ -641,7 +641,7 @@ ro:
           Subiectele setate pe silențios și categoriile nu sunt incluse în aceste emailuri."
         individual: "Trimite un email pentru fiecare postare nouă"
         individual_no_echo: "Trimite un email pentru fiecare postare nouă în afară de postările mele"
-        many_per_day: "Trimite câte un email pentru pentru fiecare nouă postare (aproximativ {{dailyEmailEstimate}} pe zi)"
+        many_per_day: "Trimite câte un email pentru pentru fiecare nouă postare (aproximativ %{dailyEmailEstimate} pe zi)"
         few_per_day: "Trimite câte un email pentru fiecare nouă postare (aproximativ 2 pe zi)"
       tag_settings: "Etichete"
       watched_tags: "Urmărite activ"
@@ -667,7 +667,6 @@ ro:
       admin_delete: "Șterge"
       users: "Utilizatori"
       muted_users: "Silențios"
-      muted_users_instructions: "Oprește toate notificările de la aceşti utilizatori."
       tracked_topics_link: "Arată"
       automatically_unpin_topics: "Detașare automată a subiectelor când ajung la sfârșitul paginii."
       apps: "Aplicații"
@@ -756,12 +755,12 @@ ro:
         title: "Email"
         ok: "Îți vom trimite un email pentru confirmare."
         invalid: "Introduceți o adresă de email validă."
-        authenticated: "Emailul a fost autentificat de către {{provider}}."
+        authenticated: "Emailul a fost autentificat de către %{provider}."
         frequency_immediately: "Vom trimite imediat un email dacă nu ai citit deja despre ce este vorba. "
         frequency:
           one: "Vom trimite un email doar dacă nu te-am văzut în ultimul minut."
-          few: "Vom trimite un email doar dacă nu te-am văzut în ultimele {{count}} minute."
-          other: "Vom trimite un email doar dacă nu te-am văzut în ultimele {{count}} de minute."
+          few: "Vom trimite un email doar dacă nu te-am văzut în ultimele %{count} minute."
+          other: "Vom trimite un email doar dacă nu te-am văzut în ultimele %{count} de minute."
       associated_accounts:
         revoke: "Revocă"
         cancel: "Anulează"
@@ -774,9 +773,9 @@ ro:
       username:
         title: "Nume utilizator"
         instructions: "unic, fără spații, scurt"
-        short_instructions: "Ceilalți te pot menționa ca @{{username}}."
+        short_instructions: "Ceilalți te pot menționa ca @%{username}."
         available: "Numele de utilizator este disponibil."
-        not_available: "Nu este disponibil. Încerci {{suggestion}}?"
+        not_available: "Nu este disponibil. Încerci %{suggestion}?"
         not_available_no_suggestion: "Indisponibil"
         too_short: "Numele de utilizator este prea scurt."
         too_long: "Numele de utilizator este prea lung."
@@ -854,15 +853,15 @@ ro:
         none: "Nu există invitații."
         truncated:
           one: "Se afișează prima invitație."
-          few: "Se afișează primele {{count}} invitații."
-          other: "Se afișează primele {{count}} de invitații."
+          few: "Se afișează primele %{count} invitații."
+          other: "Se afișează primele %{count} de invitații."
         redeemed: "Invitații acceptate"
         redeemed_tab: "Acceptate"
-        redeemed_tab_with_count: "({{count}}) Acceptate"
+        redeemed_tab_with_count: "(%{count}) Acceptate"
         redeemed_at: "Acceptate"
         pending: "Invitații în așteptare"
         pending_tab: "În așteptare"
-        pending_tab_with_count: "În așteptare: ({{count}})"
+        pending_tab_with_count: "În așteptare: (%{count})"
         topics_entered: "Subiecte văzute"
         posts_read_count: "Postări citite"
         expired: "Această invitație a expirat."
@@ -876,13 +875,17 @@ ro:
         time_read: "Timp de citire"
         days_visited: "Zile de vizită"
         account_age_days: "Vârsta contului în zile"
+        links_tab: "Adrese web"
+        link_created_at: "Creat"
+        link_groups: Grupuri
         create: "Trimite o invitație"
         generate_link: "Copiază link-ul de invitație"
         link_generated: "Link de invitare generat cu succes!"
         valid_for: "Link-ul de invitare este valid doar pentru următoarele adrese de email: %{email}"
+        invite_link:
+          success: "Link de invitare generat cu succes!"
         bulk_invite:
           none: "Încă nu ai invitat pe nimeni. Trimite invitații indivituale sau invită mai multe persoane odată <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>uploadând un fișier CSV</a>."
-          text: "Invitație multiplă din fișier"
           success: "Fișier încărcat cu succes, vei fi înștiințat printr-un mesaj când procesarea este completă."
           error: "Scuze, fișierul trebuie să fie în format CSV."
       password:
@@ -978,7 +981,7 @@ ro:
       desc:
         network: "Te rugăm să verifici conexiunea."
         network_fixed: "Se pare că și-a revenit."
-        server: "Cod de eroare: {{status}}"
+        server: "Cod de eroare: %{status}"
         forbidden: "Nu ești autorizat să vezi această pagină."
         not_found: "Oops, aplicația încearcă să încarce un URL care nu există."
         unknown: "Ceva nu a funcționat."
@@ -1027,8 +1030,8 @@ ro:
       hidden_for_session: "OK, vom reveni. Poți oricând folosi secțiunea de 'Autentificare' pentru a crea un cont."
     summary:
       enabled_description: "Vizualizezi un rezumat al acestui subiect: cea mai interesantă postare, așa cum a fost desemnată de comunitate. "
-      description: "Există <b>{{replyCount}}</b> răspunsuri."
-      description_time: "Există <b>{{replyCount}}</b> răspunsuri cu un timp necesar pentru citire estimat la <b>{{readingTime}} minute</b>."
+      description: "Există <b>%{replyCount}</b> răspunsuri."
+      description_time: "Există <b>%{replyCount}</b> răspunsuri cu un timp necesar pentru citire estimat la <b>%{readingTime} minute</b>."
       enable: "Fă rezumatul acestui subiect"
       disable: "Arată toate postările"
     deleted_filter:
@@ -1039,8 +1042,8 @@ ro:
     private_message_info:
       title: "Mesaj"
       leave_message: "Sigur părăsești acest mesaj?"
-      remove_allowed_user: "Chiar dorești să îl elimini pe {{name}} din acest mesaj privat?"
-      remove_allowed_group: "Ești sigur că vrei să îl scoți pe {{name}} din acest mesaj?"
+      remove_allowed_user: "Chiar dorești să îl elimini pe %{name} din acest mesaj privat?"
+      remove_allowed_group: "Ești sigur că vrei să îl scoți pe %{name} din acest mesaj?"
     email: "Email"
     username: "Nume utilizator"
     last_seen: "Văzut"
@@ -1084,7 +1087,7 @@ ro:
       awaiting_activation: "Contul tău așteaptă activarea, folosește linkul pentru recuperarea parolei pentru a primi un alt link de activare a adresei de email."
       awaiting_approval: "Contul tău nu a fost aprobat încă de un admin . Vei primi un email când se aprobă."
       requires_invite: "Ne pare rău, accesul la forum se face pe bază de invitație."
-      not_activated: "Nu te poți loga încă. Am trimis anterior un email de activare pentru <b>{{sentTo}}</b>. Urmează instrucțiunile din email pentru a-ți activa contul."
+      not_activated: "Nu te poți loga încă. Am trimis anterior un email de activare pentru <b>%{sentTo}</b>. Urmează instrucțiunile din email pentru a-ți activa contul."
       not_allowed_from_ip_address: "Nu te poți conecta cu această adresă IP."
       admin_not_allowed_from_ip_address: "Nu te poți conecta ca administrator cu această adresă IP."
       resend_activation_email: "Click aici pentru a retrimite emailul de activare."
@@ -1092,7 +1095,7 @@ ro:
       change_email: "Schimbă adresa de email"
       provide_new_email: "Furnizează o nouă adresă de email și îți vom retrimite linkul de confirmare."
       submit_new_email: "Actualizează adresa de email"
-      sent_activation_email_again: "Am trimis un alt email de activare pentru tine la <b>{{currentEmail}}</b>. Poate dura câteva minute până ajunge; vezi și în secțiunea de spam a mailului."
+      sent_activation_email_again: "Am trimis un alt email de activare pentru tine la <b>%{currentEmail}</b>. Poate dura câteva minute până ajunge; vezi și în secțiunea de spam a mailului."
       to_continue: "Te rog să te autentifici."
       preferences: "Trebuie să fii autentificat pentru a schimba preferințele."
       forgot: "Nu îmi amintesc detaliile contului meu."
@@ -1154,7 +1157,7 @@ ro:
       recent: Folosite recent
       default: Emojii personalizate
     shared_drafts:
-      notice: "Această discuție este vizibilă doar pentru cei care pot accesa categoria <b>{{category}}</b>."
+      notice: "Această discuție este vizibilă doar pentru cei care pot accesa categoria <b>%{category}</b>."
       publishing: "Se postează discuția ..."
     composer:
       emoji: "Emoji :)"
@@ -1170,20 +1173,20 @@ ro:
       saved_local_draft_tip: "salvat local"
       similar_topics: "Subiectul tău seamănă cu..."
       drafts_offline: "schiță offline"
-      group_mentioned_limit: "1Atenție!1 Ai menționat 2{{group}}2, dar acest grup are mai mulți membri decât limita de {{max}} utilizatori configurată de către administrator. Nimeni nu va fi notificat."
+      group_mentioned_limit: "1Atenție!1 Ai menționat 2%{group}2, dar acest grup are mai mulți membri decât limita de %{max} utilizatori configurată de către administrator. Nimeni nu va fi notificat."
       group_mentioned:
-        one: "Prin menționarea {{group}}, urmează să notifici <a href='{{group_link}}'>o persoană</a> – ești sigur?"
-        few: "Prin menționarea {{group}}, urmează să notifici <a href='{{group_link}}'>{{count}} persoane</a> – ești sigur?"
-        other: "Prin menționarea {{group}}, urmează să notifici <a href='{{group_link}}'>{{count}} de persoane</a> – ești sigur?"
+        one: "Prin menționarea %{group}, urmează să notifici <a href='%{group_link}'>o persoană</a> – ești sigur?"
+        few: "Prin menționarea %{group}, urmează să notifici <a href='%{group_link}'>%{count} persoane</a> – ești sigur?"
+        other: "Prin menționarea %{group}, urmează să notifici <a href='%{group_link}'>%{count} de persoane</a> – ești sigur?"
       cannot_see_mention:
-        category: "Ai menționat utilizatorii: {{username}}. Însă ei nu vor notificați pentru că nu au acces la această categorie. Va trebui să îi adaugi la într-un grup care are acces la aceasta categorie."
-        private: "Ai menționat utilizatorii: {{username}}. Însă ei nu vor fi notificați pentru că nu au posibilitatea să vadă acest mesaj personal. Va trebui să îi inviți la acest MP. "
-      duplicate_link: "Se pare că link-ul dv. către <b>{{domain}}</b> a fost deja postat în cadrul discuției de către <b>@{{username}}</b> în <a href='{{post_url}}'> un răspuns {{ago}} în urmă</a> – sunteți sigur că vreți să îl postați din nou?"
+        category: "Ai menționat utilizatorii: %{username}. Însă ei nu vor notificați pentru că nu au acces la această categorie. Va trebui să îi adaugi la într-un grup care are acces la aceasta categorie."
+        private: "Ai menționat utilizatorii: %{username}. Însă ei nu vor fi notificați pentru că nu au posibilitatea să vadă acest mesaj personal. Va trebui să îi inviți la acest MP. "
+      duplicate_link: "Se pare că link-ul dv. către <b>%{domain}</b> a fost deja postat în cadrul discuției de către <b>@%{username}</b> în <a href='%{post_url}'> un răspuns %{ago} în urmă</a> – sunteți sigur că vreți să îl postați din nou?"
       error:
         title_missing: "Trebuie un titlu"
-        title_too_short: "Titlul trebuie să aibă minim {{min}} (de) caractere"
-        title_too_long: "Titlul nu poate avea mai mult de {{max}} (de) caractere"
-        post_length: "Postarea trebuie să aibă minim {{min}} (de) caractere"
+        title_too_short: "Titlul trebuie să aibă minim %{min} (de) caractere"
+        title_too_long: "Titlul nu poate avea mai mult de %{max} (de) caractere"
+        post_length: "Postarea trebuie să aibă minim %{min} (de) caractere"
         category_missing: "Trebuie să alegi o categorie"
       save_edit: "Salvează editarea"
       reply_original: "Răspunde la subiectul inițial"
@@ -1258,41 +1261,41 @@ ro:
       tooltip:
         message:
           one: "%{count} mesaj necitit"
-          few: "{{count}} mesaje necitite"
-          other: "{{count}} mesaje necitite"
+          few: "%{count} mesaje necitite"
+          other: "%{count} mesaje necitite"
       title: "notificări la menționările @numelui tău, răspunsuri la postările sau subiectele tale, mesaje, etc."
       none: "Nu pot încărca notificările în acest moment."
       empty: "Nu au fost găsite notificări."
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} și încă o persoană</span> {{description}}"
-        few: "<span>{{username}}, {{username2}} și încă o persoană</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} și alți {{count}}</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}}"
-      invitee_accepted: "<span>{{username}}</span> ți-a acceptat invitația"
-      moved_post: "<span>{{username}}</span> a mutat {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Ai câștigat '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Subiect nou</span> {{description}}"
+        one: "<span>%{username}, %{username2} și încă o persoană</span> %{description}"
+        few: "<span>%{username}, %{username2} și încă o persoană</span> %{description}"
+        other: "<span>%{username}, %{username2} și alți %{count}</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}"
+      invitee_accepted: "<span>%{username}</span> ți-a acceptat invitația"
+      moved_post: "<span>%{username}</span> a mutat %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Ai câștigat '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Subiect nou</span> %{description}"
       popup:
-        mentioned: '{{username}} te-a menţionat în "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} te-a menţionat în "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} te-a citat în "{{topic}}" - {{site_title}}'
-        replied: '{{username}} ți-a răspuns la "{{topic}}" - {{site_title}}'
-        posted: '{{username}} a postat în "{{topic}}" - {{site_title}}'
-        linked: '{{username}} a pus un link către postarea ta din "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} te-a menţionat în "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} te-a menţionat în "%{topic}" - %{site_title}'
+        quoted: '%{username} te-a citat în "%{topic}" - %{site_title}'
+        replied: '%{username} ți-a răspuns la "%{topic}" - %{site_title}'
+        posted: '%{username} a postat în "%{topic}" - %{site_title}'
+        linked: '%{username} a pus un link către postarea ta din "%{topic}" - %{site_title}'
       titles:
         watching_first_post: "subiect nou"
     upload_selector:
@@ -1301,9 +1304,9 @@ ro:
       from_my_computer: "Din dispozitivul meu"
       from_the_web: "De pe web"
       remote_tip: "link către imagine"
-      remote_tip_with_attachments: "link la imagine sau fișier {{authorized_extensions}}"
+      remote_tip_with_attachments: "link la imagine sau fișier %{authorized_extensions}"
       local_tip: "alege imagini de pe dispozitivul tău"
-      local_tip_with_attachments: "alege imagini sau fișiere de pe dispozitivul tău {{authorized_extensions}}"
+      local_tip_with_attachments: "alege imagini sau fișiere de pe dispozitivul tău %{authorized_extensions}"
       hint: "(poți să faci drag and drop în editor pentru a le încărca)"
       hint_for_supported_browsers: "Poți de asemenea să faci drag and drop sau să lipești imagini în editor"
       uploading: "Se încarcă"
@@ -1323,15 +1326,15 @@ ro:
       no_results: "Nici un rezultat."
       no_more_results: "Nu s-au mai găsit alte rezultate."
       searching: "Se caută..."
-      post_format: "#{{post_number}} de {{username}}"
-      results_page: "Caută rezultate pentru '{{term}}'"
+      post_format: "#%{post_number} de %{username}"
+      results_page: "Caută rezultate pentru '%{term}'"
       start_new_topic: "Creează un nou subiect?"
       or_search_google: "Sau încearcă să cauți cu Google:"
       search_google_button: "Google"
       search_google_title: "Caută în această pagină"
       context:
-        user: "Caută postări după @{{username}}"
-        category: "Caută în categoria #{{category}} "
+        user: "Caută postări după @%{username}"
+        category: "Caută în categoria #%{category} "
         topic: "Caută în acest subiect"
         private_messages: "Caută mesaje"
       advanced:
@@ -1400,8 +1403,8 @@ ro:
         choose_new_category: "Alege o nouă categorie pentru acest subiect"
         selected:
           one: "Ai selectat <b>un</b> subiect."
-          few: "Ai selectat <b>{{count}}</b> subiecte."
-          other: "Ai selectat <b>{{count}}</b> de subiecte."
+          few: "Ai selectat <b>%{count}</b> subiecte."
+          other: "Ai selectat <b>%{count}</b> de subiecte."
         change_tags: "Înlocuiește etichete"
         append_tags: "Adaugă etichete"
         choose_new_tags: "Alege etichete noi pentru aceste subiecte:"
@@ -1414,7 +1417,7 @@ ro:
         posted: "Nu ai postat încă în niciun subiect."
         latest: "Nu există niciun subiect recent. Asta-i trist."
         bookmarks: "Nu ai nici un semn de carte încă."
-        category: "Nu există niciun subiect din categoria {{category}}."
+        category: "Nu există niciun subiect din categoria %{category}."
         top: "Nu exită niciun subiect de top."
         educate:
           new: '<p>Subiectele noi vor apărea aici.</p><p>Implicit, subiectele vor fi considerate noi și vor afișa un indicator că sunt<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">noi</span> dacă au fost create în ultimele 2 zile.</p><p>Mergi la <a href="%{userPrefsUrl}">preferințe </a> pentru a schimba această setare.</p>'
@@ -1425,14 +1428,14 @@ ro:
         read: "Nu mai există subiecte citite."
         new: "Nu mai există subiecte noi."
         unread: "Nu mai există subiecte necitite."
-        category: "Nu mai există subiecte din categoria {{category}}."
+        category: "Nu mai există subiecte din categoria %{category}."
         top: "Nu mai există subiecte de top."
         bookmarks: "Nu mai sunt semne de carte."
     topic:
       filter_to:
         one: "O postare în subiect"
-        few: "{{count}} postări în subiect"
-        other: "{{count}} de postări în subiect"
+        few: "%{count} postări în subiect"
+        other: "%{count} de postări în subiect"
       create: "Subiect nou"
       create_long: "Creează un subiect nou"
       private_message: "Scrie un mesaj."
@@ -1451,12 +1454,12 @@ ro:
       unread: "necitit"
       new_topics:
         one: "Un subiect nou"
-        few: "{{count}} subiecte noi"
-        other: "{{count}} de subiecte noi"
+        few: "%{count} subiecte noi"
+        other: "%{count} de subiecte noi"
       unread_topics:
         one: "Un subiect necitit"
-        few: "{{count}} subiecte necitite"
-        other: "{{count}} de subiecte necitite"
+        few: "%{count} subiecte necitite"
+        other: "%{count} de subiecte necitite"
       title: "Subiect"
       invalid_access:
         title: "Discuția este privată"
@@ -1470,26 +1473,26 @@ ro:
         description: "Ne pare rău, Nu am putut găsi subiectul. Poate a fost șters de un moderator?"
       total_unread_posts:
         one: "ai un mesaj necitit în această discuţie."
-        few: "ai {{count}} mesaje necitite în această discuţie."
-        other: "ai {{count}} de mesaje necitite în această discuţie."
+        few: "ai %{count} mesaje necitite în această discuţie."
+        other: "ai %{count} de mesaje necitite în această discuţie."
       unread_posts:
         one: "ai un mesaj vechi necitit în această discuţie."
-        few: "ai {{count}} mesaje vechi necitite în această discuţie."
-        other: "ai {{count}} de mesaje vechi necitite în această discuţie."
+        few: "ai %{count} mesaje vechi necitite în această discuţie."
+        other: "ai %{count} de mesaje vechi necitite în această discuţie."
       new_posts:
         one: "este un mesaj nou în această discuţie de la ultima citire"
-        few: "sunt {{count}} mesaje noi în această discuţie de la ultima citire"
-        other: "sunt {{count}} de mesaje noi în această discuţie de la ultima citire"
+        few: "sunt %{count} mesaje noi în această discuţie de la ultima citire"
+        other: "sunt %{count} de mesaje noi în această discuţie de la ultima citire"
       likes:
         one: "există o apreciere pentru această discuţie"
-        few: "sunt {{count}} aprecieri pentru această discuţie"
-        other: "sunt {{count}} de aprecieri pentru această discuţie"
+        few: "sunt %{count} aprecieri pentru această discuţie"
+        other: "sunt %{count} de aprecieri pentru această discuţie"
       back_to_list: "Înapoi la lista de subiecte"
       options: "Opțiuni pentru subiect"
       show_links: "arată link-urile din acest subiect"
       toggle_information: "comută între detaliile subiectului"
-      read_more_in_category: "Vrei să citești mai mult? Răsfoiește alte subiecte din {{catLink}} sau {{latestLink}}."
-      read_more: "Vrei să citești mai multe subiecte? {{catLink}} sau {{latestLink}}."
+      read_more_in_category: "Vrei să citești mai mult? Răsfoiește alte subiecte din %{catLink} sau %{latestLink}."
+      read_more: "Vrei să citești mai multe subiecte? %{catLink} sau %{latestLink}."
       read_more_MF: "{ UNREAD, plural, =0 {} one { Există <a href='{basePath}/unread'>un subiect necitit</a> } other { Sunt <a href='{basePath}/unread'># subiecte necitite</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{și } false {există } other{}} <a href='{basePath}/new'>un subiect nou</a>} other { {BOTH, select, true{și } false {sunt } other{}} <a href='{basePath}/new'># subiecte noi</a>} } rămas(e), sau {CATEGORY, select, true {răsfoiți alte subiecte în {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Răsfoiți prin toate categoriile
       view_latest_topics: arată ultimele subiecte
@@ -1642,27 +1645,27 @@ ro:
         success_message: "Ai marcat cu succes acest subiect."
       feature_topic:
         title: "Promovează acest subiect"
-        pin: "Pune acest subiect în vârful categoriei {{categoryLink}} până"
-        confirm_pin: "Ai deja {{count}} subiecte fixate. Prea multe subiecte fixate pot deveni o problemă pentru utilizatorii noi sau anonimi. Ești sigur că vrei să fixezi un alt subiect în această categorie?"
-        unpin: "Elimină aceste mesaje din vârful categoriei {{categoryLink}}."
-        unpin_until: "Elimină acest subiect din vârful categoriei {{categoryLink}} sau așteaptă până <strong>%{until}</strong>."
+        pin: "Pune acest subiect în vârful categoriei %{categoryLink} până"
+        confirm_pin: "Ai deja %{count} subiecte fixate. Prea multe subiecte fixate pot deveni o problemă pentru utilizatorii noi sau anonimi. Ești sigur că vrei să fixezi un alt subiect în această categorie?"
+        unpin: "Elimină aceste mesaje din vârful categoriei %{categoryLink}."
+        unpin_until: "Elimină acest subiect din vârful categoriei %{categoryLink} sau așteaptă până <strong>%{until}</strong>."
         pin_note: "Utilizatorii pot anula un subiect fixat doar de ei pentru ei înșiși."
         pin_validation: "Este necesară o dată pentru a putea fixa acest subiect."
-        not_pinned: "Nu sunt subiecte fixate în {{categoryLink}}."
+        not_pinned: "Nu sunt subiecte fixate în %{categoryLink}."
         already_pinned:
-          one: "Număr de subiecte momentan fixate în {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          few: "Număr de subiecte momentan fixate în {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Număr de subiecte momentan fixate în {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Număr de subiecte momentan fixate în %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          few: "Număr de subiecte momentan fixate în %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Număr de subiecte momentan fixate în %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Pune acest subiect în vârful listei tuturor subiectelor până"
-        confirm_pin_globally: "Sunt {{count}} subiecte fixate la nivel global. Prea multe subiecte fixate pot fi deveni o problemă pentru utilizatorii noi sau anonimi. Ești sigur că vrei să fixezi un nou subiect la nivel global?"
+        confirm_pin_globally: "Sunt %{count} subiecte fixate la nivel global. Prea multe subiecte fixate pot fi deveni o problemă pentru utilizatorii noi sau anonimi. Ești sigur că vrei să fixezi un nou subiect la nivel global?"
         unpin_globally: "Elimină acest subiect din partea de sus a tuturor listelor de discuţii."
         unpin_globally_until: "Scoate acest subiect din vârful listei tuturor subiectelor și așteaptă până <strong>%{until}</strong>."
         global_pin_note: "Utilizatorii pot anula un subiect fixat doar de ei pentru ei înșiși."
         not_pinned_globally: "Nu există subiecte fixate global."
         already_pinned_globally:
-          one: "Număr de subiecte fixate la nivel global: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          few: "Număr de subiecte fixate la nivel global: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Număr de subiecte fixate la nivel global: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Număr de subiecte fixate la nivel global: <strong class='badge badge-notification unread'>%{count}</strong>"
+          few: "Număr de subiecte fixate la nivel global: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Număr de subiecte fixate la nivel global: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Transformă acest subiect într-un banner care apare în partea de sus a tuturor paginilor."
         remove_banner: "Elimină mesajul banner care apare în partea de sus a fiecărei pagini."
         banner_note: "Utilizatorii pot îndepărta baner-ul închizându-l. Doar un singur mesaj poate fi folosit ca baner într-un moment dat."
@@ -1692,15 +1695,15 @@ ro:
         to_topic_username: "Ai introdus un nume utilizator. Îi vom trimite o notificare cu link pentru a-l invita la acest subiect."
         to_username: "Introdu numele de utilizator al persoanei pe care dorești să o inviți. Îi vom trimite o notificare cu link pentru a o invita la acest subiect."
         email_placeholder: "nume@exemplu.com"
-        success_email: "Am trimis o invitație către <b>{{emailOrUsername}}</b>.. Te vom anunţa când invitația este folosită. Verifică tab-ul de invitații pe pagina ta de utilizator pentru a monitoriza invitațiile. "
+        success_email: "Am trimis o invitație către <b>%{emailOrUsername}</b>.. Te vom anunţa când invitația este folosită. Verifică tab-ul de invitații pe pagina ta de utilizator pentru a monitoriza invitațiile. "
         success_username: "Am invitat acest utilizator să participe la această discuţie."
         error: "Ne pare rău, nu am putut invita persoana indicată. Poate că a fost deja invitată? (Invitaţiile sunt limitate)"
       login_reply: "Autentifică-te pentru a răspunde."
       filters:
         n_posts:
           one: "O postare"
-          few: "{{count}} postări"
-          other: "{{count}} de postări"
+          few: "%{count} postări"
+          other: "%{count} de postări"
         cancel: "Șterge filtre"
       split_topic:
         title: "Mutare în subiect nou."
@@ -1709,16 +1712,16 @@ ro:
         error: "A apărut o eroare la mutarea postărilor în subiectul nou."
         instructions:
           one: "Vei crea o nouă discuţie care va fi populată cu postarea selectată."
-          few: "Vei crea o nouă discuţie care va fi populată cu cele <b>{{count}}</b> postări selectate."
-          other: "Vei crea o nouă discuţie care va fi populată cu cele <b>{{count}}</b> de postări selectate."
+          few: "Vei crea o nouă discuţie care va fi populată cu cele <b>%{count}</b> postări selectate."
+          other: "Vei crea o nouă discuţie care va fi populată cu cele <b>%{count}</b> de postări selectate."
       merge_topic:
         title: "Mută în subiect deja existent"
         action: "mută în subiect deja existent"
         error: "A apărut o eroare la mutarea postărilor în acel subiect."
         instructions:
           one: "Te rugăm să alegi subiectul unde dorești să muți acest mesaj."
-          few: "Te rugăm să alegi subiectul unde dorești să muți aceste <b>{{count}}</b> mesaje."
-          other: "Te rugăm să alegi subiectul unde dorești să muți aceste <b>{{count}}</b> de mesaje."
+          few: "Te rugăm să alegi subiectul unde dorești să muți aceste <b>%{count}</b> mesaje."
+          other: "Te rugăm să alegi subiectul unde dorești să muți aceste <b>%{count}</b> de mesaje."
       move_to_new_message:
         radio_label: "Mesaj nou"
       merge_posts:
@@ -1736,7 +1739,7 @@ ro:
         instructions: "Te rugăm să selectezi noul marcaj de timp pentru subiect. Postările din acest subiect vor fi actualizate pentru a menține aceeași diferență de timp."
       multi_select:
         select: "selectează"
-        selected: "selectate ({{count}})"
+        selected: "selectate (%{count})"
         select_post:
           label: "alege"
           title: "Adaugă postare în selecție"
@@ -1754,16 +1757,16 @@ ro:
         deselect_all: deselectează tot
         description:
           one: Ai selectat <b>un</b> mesaj.
-          few: "Ai selectat <b>{{count}}</b> mesaje."
-          other: "Ai selectat <b>{{count}}</b> de mesaje."
+          few: "Ai selectat <b>%{count}</b> mesaje."
+          other: "Ai selectat <b>%{count}</b> de mesaje."
     post:
       quote_reply: "Citează"
       edit_reason: "Motivul edit[rii: "
-      post_number: "postarea {{number}}"
+      post_number: "postarea %{number}"
       last_edited_on: "postare editată ultima oară la"
       reply_as_new_topic: "Răspunde cu link către subiect"
       reply_as_new_private_message: "Răspunde cu un mesaj nou aceluiași destinatar"
-      continue_discussion: "În continuarea discuției de la {{postLink}}:"
+      continue_discussion: "În continuarea discuției de la %{postLink}:"
       follow_quote: "mergi la postarea citată"
       show_full: "Arată postarea în întregime"
       deleted_by_author:
@@ -1774,29 +1777,30 @@ ro:
       expand_collapse: "extinde/restrânge"
       gap:
         one: "vezi un răspuns ascuns"
-        few: "vezi {{count}} răspunsuri ascunse"
-        other: "vezi {{count}} de răspunsuri ascunse"
+        few: "vezi %{count} răspunsuri ascunse"
+        other: "vezi %{count} de răspunsuri ascunse"
       notice:
-        new_user: "Este prima dată când {{user}}a adăugat un comentariu. Să-i spunem bun venit în comunitate!"
+        new_user: "Este prima dată când %{user}a adăugat un comentariu. Să-i spunem bun venit în comunitate!"
       unread: "postarea nu a fost citită"
       has_replies:
         one: "Un răspuns"
-        few: "{{count}} răspunsuri"
-        other: "{{count}} de răspunsuri"
+        few: "%{count} răspunsuri"
+        other: "%{count} de răspunsuri"
       has_likes_title:
         one: "O persoană a apreciat această postare."
-        few: "{{count}} persoane au apreciat această postare."
-        other: "{{count}} de persoane au apreciat această postare."
+        few: "%{count} persoane au apreciat această postare."
+        other: "%{count} de persoane au apreciat această postare."
       has_likes_title_only_you: "Ai apreciat această postare."
       has_likes_title_you:
         one: "Ai apreciat această postare împreună cu un alt utilizator."
-        few: "Ai apreciat această postare împreună cu alți {{count}} utilizatori."
-        other: "Ai apreciat această postare împreună cu alți {{count}} de utilizatori."
+        few: "Ai apreciat această postare împreună cu alți %{count} utilizatori."
+        other: "Ai apreciat această postare împreună cu alți %{count} de utilizatori."
       errors:
         create: "Ne pare rău, a apărut o eroare la creerea postării. Te rugăm să încerci iar."
         edit: "Ne pare rău, a apărut o eroare la editarea postării. Te rugăm să încerci iar."
         upload: "Ne pare rău, a apărut o eroare la încărcarea fișierului. Te rugăm să încerci iar."
         too_many_uploads: "Ne pare rău, poți încărca doar câte un fișier."
+        upload_not_authorized: "Ne pare rău, fișierul pe care-l încerci să-l încarci nu este autorizat (extensii autorizate: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Ne pare rău, un utilizator nou nu poate încărca imagini."
         attachment_upload_not_allowed_for_new_user: "Ne pare rău, un utilizator nou nu poate încărca atașamente."
         attachment_download_requires_login: "Ne pare rău, dar trebuie să fii autentificat pentru a descărca ataşamente."
@@ -1830,13 +1834,13 @@ ro:
         delete_replies:
           confirm: "Dorești să ștergi și răspunsurile la această postare?"
           direct_replies:
-            one: "Da, și {{count}} răspuns direct"
-            few: "Da, și {{count}} răspunsuri directe"
-            other: "Da, și {{count}} răspunsuri directe"
+            one: "Da, și %{count} răspuns direct"
+            few: "Da, și %{count} răspunsuri directe"
+            other: "Da, și %{count} răspunsuri directe"
           all_replies:
             one: "Da, și %{count} răspuns"
-            few: "Da, și toate {{count}} răspunsurile"
-            other: "Da, și toate {{count}} răspunsurile"
+            few: "Da, și toate %{count} răspunsurile"
+            other: "Da, și toate %{count} răspunsurile"
           just_the_post: "Nu, doare această postare"
         admin: "acțiuni administrative pentru postare"
         wiki: "Fă postarea Wiki"
@@ -1868,9 +1872,9 @@ ro:
           notify_user: "a trimis un mesaj"
           bookmark: "a pus semn de carte la asta"
           like_capped:
-            one: "și {{count}} altul au apreciat asta"
-            few: "și {{count}} alții au apreciat asta"
-            other: "și {{count}} alții au apreciat asta"
+            one: "și %{count} altul au apreciat asta"
+            few: "și %{count} alții au apreciat asta"
+            other: "și %{count} alții au apreciat asta"
         by_you:
           off_topic: "Ai marcat asta cu mesaj de avertizare, ca fiind în afara subiectului"
           spam: "Ai marcat asta cu mesaj de avertizare, ca fiind spam"
@@ -1882,13 +1886,13 @@ ro:
       delete:
         confirm:
           one: "Ești sigur că vrei să ștergi aca postare?"
-          few: "Ești sigur că vrei să ștergi acele {{count}} postări?"
-          other: "Ești sigur că vrei să ștergi acele {{count}} postări?"
+          few: "Ești sigur că vrei să ștergi acele %{count} postări?"
+          other: "Ești sigur că vrei să ștergi acele %{count} postări?"
       merge:
         confirm:
           one: "Ești sigur că vrei să comasezi acele postări?"
-          few: "Ești sigur că vrei să comasezi acele {{count}} postări?"
-          other: "Ești sigur că vrei să comasezi acele {{count}} postări?"
+          few: "Ești sigur că vrei să comasezi acele %{count} postări?"
+          other: "Ești sigur că vrei să comasezi acele %{count} postări?"
       revisions:
         controls:
           first: "Prima revizie"
@@ -2037,16 +2041,16 @@ ro:
       custom_message:
         at_least:
           one: "introdu cel puțin un caracter"
-          few: "introdu cel puțin {{count}} caractere"
-          other: "introdu cel puțin {{count}} de caractere"
+          few: "introdu cel puțin %{count} caractere"
+          other: "introdu cel puțin %{count} de caractere"
         more:
-          one: "încă {{count}} ..."
-          few: "încă {{count}} ..."
-          other: "încă {{count}} ..."
+          one: "încă %{count} ..."
+          few: "încă %{count} ..."
+          other: "încă %{count} ..."
         left:
-          one: "a mai rămas {{count}} ..."
-          few: "au mai rămas {{count}} ..."
-          other: "au mai rămas {{count}} ..."
+          one: "a mai rămas %{count} ..."
+          few: "au mai rămas %{count} ..."
+          other: "au mai rămas %{count} ..."
     flagging_topic:
       title: "Îți mulțumim că ne ajuți să păstrăm o comunitate civilizată!"
       action: "Marchează subiectul cu marcaj de avertizare"
@@ -2089,7 +2093,7 @@ ro:
       unlisted:
         help: "Acest subiect este invizibil; nu va fi afișat în listele de subiecte și va putea fi accesat numai prin link direct"
     posts: "Postări"
-    posts_long: "sunt {{number}} (de) postări în acest subiect"
+    posts_long: "sunt %{number} (de) postări în acest subiect"
     posts_likes_MF: |
       Acest subiect are {count, plural, one {1 răspuns} other {# răspunsuri}} {ratio, select,
       low {cu o rată înaltă de aprecieri pe postare}
@@ -2105,15 +2109,15 @@ ro:
     replies: "Răspunsuri"
     views_long:
       one: "această discuție a fost afișată %{count} dată"
-      few: "această discuție a fost afișată de {{number}} de ori."
-      other: "această discuție a fost afișată de {{number}} de ori"
+      few: "această discuție a fost afișată de %{number} de ori."
+      other: "această discuție a fost afișată de %{number} de ori"
     activity: "Activitate"
     likes: "Aprecieri"
     likes_lowercase:
       one: "apreciere"
       few: "aprecieri"
       other: "aprecieri"
-    likes_long: "sunt {{number}} (de) aprecieri în acest subiect"
+    likes_long: "sunt %{number} (de) aprecieri în acest subiect"
     users: "Utilizatori"
     users_lowercase:
       one: "utilizator"
@@ -2121,7 +2125,7 @@ ro:
       other: "de utilizatori"
     category_title: "Categorie"
     history: "Istoric"
-    changed_by: "de {{author}}"
+    changed_by: "de %{author}"
     raw_email:
       not_available: "Indisponibil!"
     categories_list: "Listă categorii"
@@ -2132,38 +2136,38 @@ ro:
         title: "Cele mai recente"
         title_with_count:
           one: "Cel mai recent (%{count})"
-          few: "Cele mai recente ({{count}})"
-          other: "Cele mai recente ({{count}})"
+          few: "Cele mai recente (%{count})"
+          other: "Cele mai recente (%{count})"
         help: "subiecte cu postări recente"
       read:
         title: "Citite"
         help: "Subiecte citite, în ordinea cronologică a citirii"
       categories:
         title: "Categorii"
-        title_in: "Categoria - {{categoryName}}"
+        title_in: "Categoria - %{categoryName}"
         help: "toate subiectele grupate pe categorii"
       unread:
         title: "Necitite"
         title_with_count:
           one: "Necitit (%{count})"
-          few: "Necitite ({{count}})"
-          other: "Necitite ({{count}})"
+          few: "Necitite (%{count})"
+          other: "Necitite (%{count})"
         help: "subiecte pe care le urmărești activ sau cele pe care le urmărești și care includ postări necitite"
         lower_title_with_count:
-          one: "{{count}} necitit"
-          few: "{{count}} necitite"
-          other: "{{count}} necitite"
+          one: "%{count} necitit"
+          few: "%{count} necitite"
+          other: "%{count} necitite"
       new:
         lower_title_with_count:
-          one: "{{count}} nou"
-          few: "{{count}} noi"
-          other: "{{count}} noi"
+          one: "%{count} nou"
+          few: "%{count} noi"
+          other: "%{count} noi"
         lower_title: "nou"
         title: "Noi"
         title_with_count:
           one: "Nou (%{count})"
-          few: "Noi ({{count}})"
-          other: "Noi ({{count}})"
+          few: "Noi (%{count})"
+          other: "Noi (%{count})"
         help: "subiecte create în ultimele zile"
       posted:
         title: "Postările mele"
@@ -2172,12 +2176,12 @@ ro:
         title: "Semne de carte"
         help: "subiecte cu semne de carte"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          few: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
-        help: "subiecte recente din categoria {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          few: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "subiecte recente din categoria %{categoryName}"
       top:
         title: "Top"
         help: "o selecție a celor mai bune subiecte din ultimul an, ultima lună sau zi"
@@ -2302,8 +2306,8 @@ ro:
       delete_tag: "Șterge etichetă"
       delete_confirm:
         one: "Ești sigur că vrei să ștergi această etichetă și să o scoți dintr-un subiect care o folosește?"
-        few: "Ești sigur că vrei să ștergi această etichetă și să o scoți din {{count}} subiecte care o folosesc?"
-        other: "Ești sigur că vrei să ștergi această etichetă și să o scoți din {{count}} subiecte care o folosesc?"
+        few: "Ești sigur că vrei să ștergi această etichetă și să o scoți din %{count} subiecte care o folosesc?"
+        other: "Ești sigur că vrei să ștergi această etichetă și să o scoți din %{count} subiecte care o folosesc?"
       delete_confirm_no_topics: "Ești sigur că vrei să ștergi această etichetă?"
       rename_tag: "Redenumire etichetă"
       rename_instructions: "Alege un nume nou pentru etichetă:"
@@ -2538,12 +2542,12 @@ ro:
           redeliver: "Livrează din nou"
           incoming:
             one: "Există un nou eveniment "
-            few: "Există {{count}} noi evenimente."
-            other: "Există {{count}} de noi evenimente."
+            few: "Există %{count} noi evenimente."
+            other: "Există %{count} de noi evenimente."
           completed_in:
             one: "Terminat într-o secundă."
-            few: "Terminat în {{count}} secunde."
-            other: "Terminat în {{count}} de secunde."
+            few: "Terminat în %{count} secunde."
+            other: "Terminat în %{count} de secunde."
           request: "Cerere"
           response: "Răspuns"
           redeliver_confirm: "Ești sigur ca vrei să livrezi din nou aceeași încărcătură?"
@@ -2594,10 +2598,10 @@ ro:
           label: "Încarcă"
           title: "Încarcă un backup în această instanță."
           uploading: "Se încarcă..."
-          error: "A apărut o eroare la încărcarea fișierului '{{filename}}': {{message}}"
+          error: "A apărut o eroare la încărcarea fișierului '%{filename}': %{message}"
         operations:
           is_running: "O altă operație este în desfășurare..."
-          failed: "operația {{operation}} nu s-a finalizat. Te rugăm verifică rapoartele."
+          failed: "operația %{operation} nu s-a finalizat. Te rugăm verifică rapoartele."
           cancel:
             label: "Anulare"
             title: "Anulează operația curentă"
@@ -2990,8 +2994,8 @@ ro:
           title: "Arată adresa de email a acestui utilizator"
           text: "Arată"
       user:
-        suspend_failed: "Ceva nu a funcționat la suspendarea acestui utilizator {{error}}"
-        unsuspend_failed: "Ceva nu a funcționat la activarea acestui utilizator {{error}}"
+        suspend_failed: "Ceva nu a funcționat la suspendarea acestui utilizator %{error}"
+        unsuspend_failed: "Ceva nu a funcționat la activarea acestui utilizator %{error}"
         suspend_duration: "Pentru cât timp va fi suspendat utilizatorul?"
         suspend_reason_label: "Motivul suspendării? Acest text <b>va fi vizibil</b> pe pagina de profil a utilizatorului, și va fi arătat utilizatorului atunci când încearcă să se autentifice. Încearcă să fii succint."
         suspend_reason: "Motiv"
@@ -3293,6 +3297,7 @@ ro:
         title: "Emoji"
         help: "Adaugă un nou \"emoji\" care va fi disponibil pentru toţi. (PROTIP: trage şi adaugă mai multe fişiere odată)"
         add: "Adaugă un emoji nou"
+        uploading: "Se încarcă..."
         name: "Nume"
         group: "Grup"
         image: "Imagine"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 1f40f442d5..aeffc76ecd 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -25,8 +25,8 @@ ru:
             mb: МБ
             tb: ТБ
       short:
-        thousands: "{{number}} тыс."
-        millions: "{{number}} млн."
+        thousands: "%{number} тыс."
+        millions: "%{number} млн."
     dates:
       time: "HH:mm"
       time_with_zone: "HH:mm (местное)"
@@ -273,13 +273,13 @@ ru:
     weekly: "еженедельно"
     every_month: "каждый месяц"
     every_six_months: "каждые шесть месяцев"
-    max_of_count: "{{count}} макс."
+    max_of_count: "%{count} макс."
     alternation: "или"
     character_count:
-      one: "{{count}} буква"
-      few: "{{count}} буквы"
-      many: "{{count}} букв"
-      other: "{{count}} букв"
+      one: "%{count} буква"
+      few: "%{count} буквы"
+      many: "%{count} букв"
+      other: "%{count} букв"
     related_messages:
       title: "Связанные сообщения"
       see_all: 'Показать <a href="%{path}">все сообщения</a> от @%{username}...'
@@ -354,20 +354,20 @@ ru:
         yes_value: "Да, удалить"
         no_value: "Нет, сохранить"
     topic_count_latest:
-      one: "Есть {{count}} новая или обновленная тема"
-      few: "Есть {{count}} новых или обновленных темы"
-      many: "Есть {{count}} новых или обновленных тем"
-      other: "Есть {{count}} новых или обновленных тем"
+      one: "Есть %{count} новая или обновленная тема"
+      few: "Есть %{count} новых или обновленных темы"
+      many: "Есть %{count} новых или обновленных тем"
+      other: "Есть %{count} новых или обновленных тем"
     topic_count_unread:
-      one: "Посмотреть {{count}} непрочитанную тему"
-      few: "Посмотреть {{count}} непрочитанных темы"
-      many: "Посмотреть {{count}} непрочитанных тем"
-      other: "Посмотреть {{count}} непрочитанных тем"
+      one: "Посмотреть %{count} непрочитанную тему"
+      few: "Посмотреть %{count} непрочитанных темы"
+      many: "Посмотреть %{count} непрочитанных тем"
+      other: "Посмотреть %{count} непрочитанных тем"
     topic_count_new:
-      one: "Посмотреть {{count}} новую тему"
-      few: "Посмотреть {{count}} новые темы"
-      many: "Посмотреть {{count}} новых тем"
-      other: "Посмотреть {{count}} новых тем"
+      one: "Посмотреть %{count} новую тему"
+      few: "Посмотреть %{count} новые темы"
+      many: "Посмотреть %{count} новых тем"
+      other: "Посмотреть %{count} новых тем"
     preview: "Предпросмотр"
     cancel: "Отмена"
     save: "Сохранить"
@@ -375,7 +375,7 @@ ru:
     saved: "Сохранено!"
     upload: "Загрузить"
     uploading: "Загрузка..."
-    uploading_filename: "Загрузка {{filename}}"
+    uploading_filename: "Загрузка %{filename}"
     clipboard: "буфер обмена"
     uploaded: "Загружено!"
     pasting: "Вставка..."
@@ -429,7 +429,7 @@ ru:
         optional: "Вы можете запросить этот элемент, чтобы другие не могли его просмотреть."
         required: "Вы должны подать заявку до того, как сможете их просмотреть."
         claimed_by_you: "Вы забрали этот элемент и можете его просмотреть."
-        claimed_by_other: "Этот пункт может быть рассмотрен только <b>{{username}}</b>."
+        claimed_by_other: "Этот пункт может быть рассмотрен только <b>%{username}</b>."
       claim:
         title: "заявить эту тему"
       unclaim:
@@ -449,9 +449,9 @@ ru:
       view_pending: "Просмотр сообщений, ожидающих подтверждения"
       topic_has_pending:
         one: "В этой теме <b>%{count}</b> сообщение ожидает проверки"
-        few: "В этой теме <b>{{count}}</b> сообщения ожидают проверки"
-        many: "В этой теме <b>{{count}}</b> сообщений ожидают проверки"
-        other: "В этой теме <b>{{count}}</b> сообщений ожидают проверки"
+        few: "В этой теме <b>%{count}</b> сообщения ожидают проверки"
+        many: "В этой теме <b>%{count}</b> сообщений ожидают проверки"
+        other: "В этой теме <b>%{count}</b> сообщений ожидают проверки"
       title: "Премодерация"
       topic: "Тема:"
       filtered_topic: "Вы отфильтровали для просмотра содержимое в одной теме."
@@ -468,25 +468,25 @@ ru:
         fields: "Поля"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} жалоба)"
-          few: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} жалобы)"
-          many: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} жалоб)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} жалоб)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} жалоба)"
+          few: "%{agreed}, %{disagreed}, %{ignored} (%{count} жалобы)"
+          many: "%{agreed}, %{disagreed}, %{ignored} (%{count} жалоб)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} жалоб)"
         agreed:
-          one: "{{count}}% согласие"
-          few: "{{count}}% согласия"
-          many: "{{count}}% согласий"
-          other: "{{count}}% согласий"
+          one: "%{count}% согласие"
+          few: "%{count}% согласия"
+          many: "%{count}% согласий"
+          other: "%{count}% согласий"
         disagreed:
-          one: "{{count}}% несогласие"
-          few: "{{count}}% несогласия"
-          many: "{{count}}% несогласий"
-          other: "{{count}}% несогласий"
+          one: "%{count}% несогласие"
+          few: "%{count}% несогласия"
+          many: "%{count}% несогласий"
+          other: "%{count}% несогласий"
         ignored:
-          one: "{{count}}% игнорирование"
-          few: "{{count}}% игнорирования"
-          many: "{{count}}% игнорирований"
-          other: "{{count}}% игнорирований"
+          one: "%{count}% игнорирование"
+          few: "%{count}% игнорирования"
+          many: "%{count}% игнорирований"
+          other: "%{count}% игнорирований"
       topics:
         topic: "Тема"
         reviewable_count: "Количество"
@@ -496,14 +496,14 @@ ru:
         details: "подробности"
         unique_users:
           one: "%{count} пользователь"
-          few: "{{count}} пользователя"
-          many: "{{count}} пользователей"
-          other: "{{count}} пользователей"
+          few: "%{count} пользователя"
+          many: "%{count} пользователей"
+          other: "%{count} пользователей"
       replies:
         one: "%{count} ответ"
-        few: "{{count}} ответа"
-        many: "{{count}} ответов"
-        other: "{{count}} ответов"
+        few: "%{count} ответа"
+        many: "%{count} ответов"
+        other: "%{count} ответов"
       edit: "Редактировать"
       save: "Сохранить"
       cancel: "Отмена"
@@ -567,24 +567,24 @@ ru:
         description: "Ваше сообщение отправлено, но требует проверки и утверждения модератором. Пожалуйста, будьте терпеливы."
         pending_posts:
           one: "У вас <strong>%{count}</strong> сообщение в ожидании модерации."
-          few: "У вас <strong>{{count}}</strong> сообщения в ожидании модерации."
-          many: "У вас <strong>{{count}}</strong> сообщений в ожидании модерации."
-          other: "У вас <strong>{{count}}</strong> сообщений в ожидании модерации."
+          few: "У вас <strong>%{count}</strong> сообщения в ожидании модерации."
+          many: "У вас <strong>%{count}</strong> сообщений в ожидании модерации."
+          other: "У вас <strong>%{count}</strong> сообщений в ожидании модерации."
         ok: "OK"
     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>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> ответил(а) на сообщение <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Вы</a> ответили на сообщение <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> ответил(а) в <a href='{{topicUrl}}'>теме</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Вы</a> ответили в <a href='{{topicUrl}}'>теме</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> упомянул <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> упомянул<a href='{{user2Url}}'>Вас</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Вы</a> упомянули <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Размещено пользователем <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Размещено <a href='{{userUrl}}'>Вами</a>"
-      sent_by_user: "Отправлено пользователем <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Отправлено <a href='{{userUrl}}'>Вами</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> создал <a href='%{topicUrl}'>тему</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Вы</a> создали <a href='%{topicUrl}'>тему</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> ответил(а) на сообщение <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Вы</a> ответили на сообщение <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> ответил(а) в <a href='%{topicUrl}'>теме</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Вы</a> ответили в <a href='%{topicUrl}'>теме</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> упомянул <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> упомянул<a href='%{user2Url}'>Вас</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Вы</a> упомянули <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Размещено пользователем <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Размещено <a href='%{userUrl}'>Вами</a>"
+      sent_by_user: "Отправлено пользователем <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Отправлено <a href='%{userUrl}'>Вами</a>"
     directory:
       filter_name: "фильтр по имени пользователя"
       title: "Пользователи"
@@ -832,7 +832,7 @@ ru:
       none: "(выберите)"
       required: 'Пожалуйста, введите значение для "%{name}"'
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Профиль"
       mute: "Отключить"
       edit: "Настройки"
@@ -908,12 +908,12 @@ ru:
       enable_defer: "Включить кнопку 'Отложить', чтобы помечать темы как непрочитанные"
       change: "изменить"
       featured_topic: "Избранная тема"
-      moderator: "{{user}} — модератор"
-      admin: "{{user}} — админ"
+      moderator: "%{user} — модератор"
+      admin: "%{user} — админ"
       moderator_tooltip: "Этот пользователь модератор"
-      admin_tooltip: "{{user}} — админ"
+      admin_tooltip: "%{user} — админ"
       silenced_tooltip: "Этот пользователь заблокирован"
-      suspended_notice: "Пользователь заморожен до {{date}}."
+      suspended_notice: "Пользователь заморожен до %{date}."
       suspended_permanently: "Этот пользователь заморожен."
       suspended_reason: "Причина:"
       github_profile: "Github"
@@ -926,7 +926,7 @@ ru:
           Темы и разделы с выключенными уведомлениями не будут включены в письма рассылки.
         individual: "Присылать письмо для каждого нового сообщения"
         individual_no_echo: "Присылать письмо по каждому новому сообщению, кроме моих собственных"
-        many_per_day: "Присылать письмо для каждого нового сообщения (примерно {{dailyEmailEstimate}} в день)"
+        many_per_day: "Присылать письмо для каждого нового сообщения (примерно %{dailyEmailEstimate} в день)"
         few_per_day: "Присылать письмо для каждого нового сообщения (примерно 2 в день)"
         warning: "Включён режим списка рассылки. Настройки email-уведомлений переопределены."
       tag_settings: "Теги"
@@ -956,9 +956,7 @@ ru:
       admin_delete: "Удалить"
       users: "Пользователи"
       muted_users: "Выключено"
-      muted_users_instructions: "Не отображать уведомления от этих пользователей."
       ignored_users: "Игнорировать"
-      ignored_users_instructions: "Запретить все сообщения и уведомления от этих пользователей."
       tracked_topics_link: "Показать"
       automatically_unpin_topics: "Автоматически откреплять темы после прочтения"
       apps: "Приложения"
@@ -1014,12 +1012,12 @@ ru:
         disable: "Отключить"
         enable: "Включить"
         enable_long: "Включить резервные коды"
-        manage: "Управление резервными кодами. У вас осталось <strong>{{count}}</strong> резервных кода."
+        manage: "Управление резервными кодами. У вас осталось <strong>%{count}</strong> резервных кода."
         copy_to_clipboard: "Скопировать в буфер"
         copy_to_clipboard_error: "Ошибка при копировании данных в буфер обмена"
         copied_to_clipboard: "Скопировано в буфер"
         download_backup_codes: "Скачать резервные коды"
-        remaining_codes: "У вас осталось <strong>{{count}}</strong>резервных кодов"
+        remaining_codes: "У вас осталось <strong>%{count}</strong>резервных кодов"
         use: "Используйте резервный код"
         enable_prerequisites: "Вы должны включить первичный второй фактор перед генерацией резервных кодов."
         codes:
@@ -1084,10 +1082,10 @@ ru:
         success_staff: "Мы отправили письмо на ваш текущий адрес электронной почты. Пожалуйста, следуйте инструкциям по подтверждению."
       change_avatar:
         title: "Изменить аватар"
-        gravatar: "На основе <a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>"
-        gravatar_title: "Изменить аватар на граватар {{gravatarName}}"
-        gravatar_failed: "Мы не можем найти граватар {{gravatarName}} по указанному адресу электронной почты."
-        refresh_gravatar_title: "Обновить граватар {{gravatarName}}"
+        gravatar: "На основе <a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>"
+        gravatar_title: "Изменить аватар на граватар %{gravatarName}"
+        gravatar_failed: "Мы не можем найти граватар %{gravatarName} по указанному адресу электронной почты."
+        refresh_gravatar_title: "Обновить граватар %{gravatarName}"
         letter_based: "Аватар по умолчанию"
         uploaded_avatar: "Собственный аватар"
         uploaded_avatar_empty: "Добавить собственный аватар"
@@ -1110,15 +1108,15 @@ ru:
         sso_override_instructions: "E-mail может быть переопределен от поставщика SSO."
         instructions: "Не будет опубликован."
         ok: "Мы вышлем вам письмо для подтверждения"
-        required: "Пожалуйста, введите e-mail адрес"
+        required: "Пожалуйста, введите email"
         invalid: "Введите действующий адрес электронной почты"
-        authenticated: "Ваш адрес электронной почты подтвержден {{provider}}"
+        authenticated: "Ваш адрес электронной почты подтвержден %{provider}"
         frequency_immediately: "Получать уведомления о новых непрочитанных сообщениях незамедлительно."
         frequency:
-          one: "Мы отправим вам письмо только в том случае, если вы более {{count}} минуты находитесь оффлайн."
-          few: "Мы отправим вам письмо только в том случае, если вы не были онлайн последние {{count}} минуты."
-          many: "Мы отправим вам письмо только в том случае, если вы не были онлайн последние {{count}} минут."
-          other: "Мы отправим вам письмо только в том случае, если вы не были онлайн последние {{count}} минут."
+          one: "Мы отправим вам письмо только в том случае, если вы более %{count} минуты находитесь оффлайн."
+          few: "Мы отправим вам письмо только в том случае, если вы не были онлайн последние %{count} минуты."
+          many: "Мы отправим вам письмо только в том случае, если вы не были онлайн последние %{count} минут."
+          other: "Мы отправим вам письмо только в том случае, если вы не были онлайн последние %{count} минут."
       associated_accounts:
         title: "Связанные учетные записи"
         connect: "Связать"
@@ -1139,9 +1137,9 @@ ru:
       username:
         title: "Псевдоним"
         instructions: "Уникальный, без пробелов и покороче"
-        short_instructions: "Пользователи могут упоминать вас по псевдониму @{{username}}"
+        short_instructions: "Пользователи могут упоминать вас по псевдониму @%{username}"
         available: "Псевдоним доступен"
-        not_available: "Недоступно. Попробуйте {{suggestion}}?"
+        not_available: "Недоступно. Попробуйте %{suggestion}?"
         not_available_no_suggestion: "Не доступно"
         too_short: "Псевдоним слишком короткий"
         too_long: "Псевдоним слишком длинный"
@@ -1165,11 +1163,11 @@ ru:
         log_out_all: "Выйти из всех устройств"
         active: "активны сейчас"
         not_you: "Не вы?"
-        show_all: "Показать все ({{count}})"
+        show_all: "Показать все (%{count})"
         show_few: "Показать меньше"
         was_this_you: "Это были вы?"
         was_this_you_description: "Если это были не вы, рекомендуем сменить пароль и выйти из всех устройств."
-        browser_and_device: "{{browser}} на {{device}}"
+        browser_and_device: "%{browser} на %{device}"
         secure_account: "Защита моей учетной записи"
         latest_post: "Ваша последняя активность..."
       last_posted: "Последнее сообщение"
@@ -1249,22 +1247,21 @@ ru:
         none: "Нет приглашений для отображения."
         truncated:
           one: "Первое приглашение"
-          few: "Первые {{count}} приглашения"
-          many: "Первые {{count}} приглашений"
-          other: "Первые {{count}} приглашений"
+          few: "Первые %{count} приглашения"
+          many: "Первые %{count} приглашений"
+          other: "Первые %{count} приглашений"
         redeemed: "Принятые приглашения"
         redeemed_tab: "Принятые"
-        redeemed_tab_with_count: "Принятые ({{count}})"
+        redeemed_tab_with_count: "Принятые (%{count})"
         redeemed_at: "Принято"
         pending: "Еще не принятые приглашения"
         pending_tab: "Ожидающие"
-        pending_tab_with_count: "Ожидающие ({{count}})"
+        pending_tab_with_count: "Ожидающие (%{count})"
         topics_entered: "Просмотрел тем"
         posts_read_count: "Прочитал сообщений"
         expired: "Это приглашение истекло."
         rescind: "Отозвать"
         rescinded: "Приглашение отозвано"
-        rescind_all: "Удалить все просроченные приглашения"
         rescinded_all: "Все просроченные приглашения удалены!"
         rescind_all_confirm: "Вы действительно хотите удалить все просроченные приглашения?"
         reinvite: "Повторить приглашение"
@@ -1275,13 +1272,18 @@ ru:
         time_read: "Времени читал"
         days_visited: "Дней посещал"
         account_age_days: "Дней с момента регистрации"
+        links_tab: "Ссылки"
+        link_created_at: "Создано"
+        link_groups: Групп
         create: "Отправить приглашение"
         generate_link: "Скопировать ссылку для приглашений"
         link_generated: "Пригласительная ссылка успешно создана!"
-        valid_for: "Пригласительная ссылка действительна только для этого адреса электропочты: %{email}"
+        valid_for: "Пригласительная ссылка действительна только для этого email: %{email}"
+        single_user: "Отдельный пользователь"
+        invite_link:
+          success: "Пригласительная ссылка успешно создана!"
         bulk_invite:
           none: "Вы ещё никого не приглашали сюда. Отправьте индивидуальные приглашения или пригласите несколько людей за раз, <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>загрузив файл CSV</a>."
-          text: "Пригласить всех из файла"
           success: "Файл успешно загружен, вы получите сообщение, когда процесс будет завершен."
           error: "Извините, но файл должен быть в формате CSV."
           confirmation_message: "Вы собираетесь отправить приглашения по электронной почте всем в загруженном файле."
@@ -1389,7 +1391,7 @@ ru:
       desc:
         network: "Пожалуйста, проверьте ваше соединение."
         network_fixed: "Похоже, сеть появилась."
-        server: "Ошибка: {{status}}"
+        server: "Ошибка: %{status}"
         forbidden: "У вас нет доступа для просмотра этого."
         not_found: "Упс, произошла попытка загрузить несуществующую ссылку"
         unknown: "Что-то пошло не так."
@@ -1454,8 +1456,8 @@ ru:
       value_prop: "Когда вы создаете учетную запись, мы точно помним, что вы прочитали, поэтому вы всегда возвращаетесь туда, где остановились. Вы также получаете уведомления, здесь и по электронной почте, когда кто-то отвечает вам. И вы можете в сообщениях поставить отметку <b>Мне нравится</b>. :heartpulse:"
     summary:
       enabled_description: "Вы просматриваете выдержку из темы - только самые интересные сообщения по мнению сообщества."
-      description: "Есть <b>{{replyCount}}</b> ответов."
-      description_time: "<b>{{replyCount}}</b> ответов с предполагаемым временем прочтения около <b>{{readingTime}} минут</b>."
+      description: "Есть <b>%{replyCount}</b> ответов."
+      description_time: "<b>%{replyCount}</b> ответов с предполагаемым временем прочтения около <b>%{readingTime} минут</b>."
       enable: "Сводка по теме"
       disable: "Показать все сообщения"
     deleted_filter:
@@ -1468,8 +1470,8 @@ ru:
       invite: "Пригласить других ..."
       edit: "Добавить или удалить ..."
       leave_message: "Вы действительно хотите оставить это сообщение?"
-      remove_allowed_user: "Вы действительно хотите удалить {{name}} из данного сообщения?"
-      remove_allowed_group: "Вы действительно хотите удалить {{name}} из данного сообщения?"
+      remove_allowed_user: "Вы действительно хотите удалить %{name} из данного сообщения?"
+      remove_allowed_group: "Вы действительно хотите удалить %{name} из данного сообщения?"
     email: "Email"
     username: "Псевдоним"
     last_seen: "Был"
@@ -1478,7 +1480,7 @@ ru:
     trust_level: "Уровень доверия"
     search_hint: "Псевдоним, e-mail или IP-адрес"
     create_account:
-      disclaimer: "Регистрируясь, вы соглашаетесь с <a href='{{privacy_link}}' target='blank'>политикой конфиденциальности</a> и <a href='{{tos_link}}' target='blank'> условиями предоставления услуг</a>."
+      disclaimer: "Регистрируясь, вы соглашаетесь с <a href='%{privacy_link}' target='blank'>политикой конфиденциальности</a> и <a href='%{tos_link}' target='blank'> условиями предоставления услуг</a>."
       title: "Зарегистрироваться"
       failed: "Произошла ошибка. Возможно, этот Email уже используется. Попробуйте восстановить пароль"
     forgot_password:
@@ -1538,7 +1540,7 @@ ru:
       awaiting_activation: "Ваша учетная запись ожидает активации через ссылку из письма. Чтобы повторно выслать активационное письмо, используйте кнопку сброса пароля."
       awaiting_approval: "Ваша учётная запись ещё не одобрена персоналом. Мы вышлем вам письмо, как только это произойдет."
       requires_invite: "Попасть в этот форум можно только по приглашениям."
-      not_activated: "Чтобы войти на форум, активируйте свою учетную запись. Мы отправили на почту <b>{{sentTo}}</b> подробные инструкции, как это сделать."
+      not_activated: "Чтобы войти на форум, активируйте свою учетную запись. Мы отправили на почту <b>%{sentTo}</b> подробные инструкции, как это сделать."
       not_allowed_from_ip_address: "Вход с этого IP-адреса запрещен."
       admin_not_allowed_from_ip_address: "Вход с этого IP-адреса в качестве администратора запрещен."
       resend_activation_email: "Щелкните здесь, чтобы повторно выслать письмо для активации учетной записи."
@@ -1547,7 +1549,7 @@ ru:
       change_email: "Изменить электронную почту"
       provide_new_email: "Укажите новый адрес электронной почты, чтобы задействовать его и заново выслать активационное письмо."
       submit_new_email: "Обновить электронную почту"
-      sent_activation_email_again: "По адресу <b>{{currentEmail}}</b> повторно отправлено письмо с инструкциями по активации вашей учетной записи. Доставка сообщения может занять несколько минут. Имейте в виду, что иногда по ошибке письмо может попасть в папку <b>Спам</b>."
+      sent_activation_email_again: "По адресу <b>%{currentEmail}</b> повторно отправлено письмо с инструкциями по активации вашей учетной записи. Доставка сообщения может занять несколько минут. Имейте в виду, что иногда по ошибке письмо может попасть в папку <b>Спам</b>."
       sent_activation_email_again_generic: "Мы отправили еще одно письмо для активации. Это может занять несколько минут для того, чтобы письмо было доставлено; не забудьте проверить папку со спамом."
       to_continue: "Пожалуйста, войдите"
       preferences: "Необходимо войти на сайт для редактирования настроек профиля."
@@ -1611,24 +1613,24 @@ ru:
     conditional_loading_section:
       loading: Загрузка...
     category_row:
-      topic_count: "{{count}} тем в этом разделе"
+      topic_count: "%{count} тем в этом разделе"
     select_kit:
       default_header_text: Выбрать...
       no_content: Совпадений не найдено
       filter_placeholder: Поиск...
       filter_placeholder_with_any: Найти или создать...
-      create: "Создать: '{{content}}'"
+      create: "Создать: '%{content}'"
       max_content_reached:
-        one: "Можно выбрать только {{count}} элемент."
-        few: "Можно выбрать только {{count}} элемента."
-        many: "Можно выбрать только {{count}} элементов."
-        other: "Можно выбрать только {{count}} элементов."
+        one: "Можно выбрать только %{count} элемент."
+        few: "Можно выбрать только %{count} элемента."
+        many: "Можно выбрать только %{count} элементов."
+        other: "Можно выбрать только %{count} элементов."
       min_content_not_reached:
-        one: "Введите хотя бы {{count}} элемент."
-        few: "Введите хотя бы {{count}} элемента."
-        many: "Введите хотя бы {{count}} элементов."
-        other: "Введите хотя бы {{count}} элементов."
-      invalid_selection_length: "Необходимо выбрать не менее {{count}} символов."
+        one: "Введите хотя бы %{count} элемент."
+        few: "Введите хотя бы %{count} элемента."
+        many: "Введите хотя бы %{count} элементов."
+        other: "Введите хотя бы %{count} элементов."
+      invalid_selection_length: "Необходимо выбрать не менее %{count} символов."
       components:
         categories_admin_dropdown:
           title: "Раскрывающийся список категорий"
@@ -1658,7 +1660,7 @@ ru:
       default: Пользовательские смайлы
     shared_drafts:
       title: "Общие черновики"
-      notice: "Эти темы видны только тем, кому доступен раздел <b>{{category}}</b>."
+      notice: "Эти темы видны только тем, кому доступен раздел <b>%{category}</b>."
       destination_category: "Раздел назначения"
       publish: "Публикация общего черновика"
       confirm_publish: "Вы действительно хотите опубликовать этот черновик?"
@@ -1678,26 +1680,26 @@ ru:
       similar_topics: "Ваша тема похожа на..."
       drafts_offline: "Черновики, сохраненные в офлайн"
       edit_conflict: "редактировать конфликт"
-      group_mentioned_limit: "<b>Внимание!</b> Вы упомянули <a href='{{group_link}}'>{{group}}</a>, в которой больше участников, чем установленный администратором лимит упоминаний на {{max}} пользователей. Никто не получит оповещение."
+      group_mentioned_limit: "<b>Внимание!</b> Вы упомянули <a href='%{group_link}'>%{group}</a>, в которой больше участников, чем установленный администратором лимит упоминаний на %{max} пользователей. Никто не получит оповещение."
       group_mentioned:
-        one: "Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>%{count}му пользователю</a> – вы уверены?"
-        few: "Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>{{count}} пользователям</a> – вы уверены?"
-        many: "Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>{{count}} пользователям</a> – вы уверены?"
-        other: "Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>{{count}} пользователям</a> – вы уверены?"
+        one: "Упоминая группу %{group}, вы тем самым отправите уведомление <a href='%{group_link}'>%{count} пользователю</a> – вы уверены?"
+        few: "Упоминая группу %{group}, вы тем самым отправите уведомление <a href='%{group_link}'>%{count} пользователям</a> – вы уверены?"
+        many: "Упоминая группу %{group}, вы тем самым отправите уведомление <a href='%{group_link}'>%{count} пользователям</a> – вы уверены?"
+        other: "Упоминая группу %{group}, вы тем самым отправите уведомление <a href='%{group_link}'>%{count} пользователям</a> – вы уверены?"
       cannot_see_mention:
-        category: "Вы упомянули {{username}}, но они не будут уведомлены, потому что у них нет доступа к этому разделу. Вам нужно добавить их в группу, имеющую доступ к этому разделу."
-        private: "Вы упомянули {{username}}, но они не будут уведомлены, потому что они не могут видеть это личное сообщение. Вам нужно пригласить их в это ЛС."
-      duplicate_link: "Кажется, ваша ссылка на <b>{{domain}}</b> уже была ранее размещена пользователем <b>@{{username}}</b> в <a href='{{post_url}}'>ответе {{ago}}</a>. Вы точно хотите разместить её ещё раз?"
-      reference_topic_title: "RE: {{title}}"
+        category: "Вы упомянули %{username}, но они не будут уведомлены, потому что у них нет доступа к этому разделу. Вам нужно добавить их в группу, имеющую доступ к этому разделу."
+        private: "Вы упомянули %{username}, но они не будут уведомлены, потому что они не могут видеть это личное сообщение. Вам нужно пригласить их в это ЛС."
+      duplicate_link: "Кажется, ваша ссылка на <b>%{domain}</b> уже была ранее размещена пользователем <b>@%{username}</b> в <a href='%{post_url}'>ответе %{ago}</a>. Вы точно хотите разместить её ещё раз?"
+      reference_topic_title: "RE: %{title}"
       error:
         title_missing: "Требуется название темы"
-        title_too_short: "Название темы должно быть не короче {{min}} символов"
-        title_too_long: "Название темы не может быть длиннее {{max}} символов"
+        title_too_short: "Название темы должно быть не короче %{min} символов"
+        title_too_long: "Название темы не может быть длиннее %{max} символов"
         post_missing: "Сообщение не может быть пустым"
-        post_length: "Сообщение должно быть не короче {{min}} символов"
-        try_like: "Вы пробовали нажать на {{heart}} кнопку?"
+        post_length: "Сообщение должно быть не короче %{min} символов"
+        try_like: "Вы пробовали нажать на кнопку %{heart}?"
         category_missing: "Выберите раздел"
-        tags_missing: "Необходимо выбрать по крайней мере {{count}} тег"
+        tags_missing: "Необходимо выбрать по крайней мере %{count} тег"
         topic_template_not_modified: "Впишите детали темы в шаблон"
       save_edit: "Сохранить"
       overwrite_edit: "Перезаписать, править"
@@ -1795,14 +1797,14 @@ ru:
       tooltip:
         regular:
           one: "%{count} невидимое уведомление"
-          few: "{{count}} невидимых уведомления"
-          many: "{{count}} невидимых уведомлений"
-          other: "{{count}} невидимые уведомлений"
+          few: "%{count} невидимых уведомления"
+          many: "%{count} невидимых уведомлений"
+          other: "%{count} невидимые уведомлений"
         message:
           one: "%{count} непрочитанное сообщение"
-          few: "{{count}} непрочитанных сообщения"
-          many: "{{count}} непрочитанных сообщений"
-          other: "{{count}} непрочитанных сообщений"
+          few: "%{count} непрочитанных сообщения"
+          many: "%{count} непрочитанных сообщений"
+          other: "%{count} непрочитанных сообщений"
         high_priority:
           one: "%{count} непрочитанное уведомление с высоким приоритетом"
           few: "%{count} непрочитанных уведомления с высоким приоритетом"
@@ -1813,54 +1815,54 @@ ru:
       empty: "Уведомления не найдены."
       post_approved: "Ваше сообщение было одобрено"
       reviewable_items: "пункты, требующие рассмотрения"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} и %{count} другой</span> {{description}}"
-        few: "<span>{{username}}, {{username2}} и {{count}} другие</span> {{description}}"
-        many: "<span>{{username}}, {{username2}} и {{count}} других</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} и {{count}} других</span> {{description}}"
+        one: "<span>%{username}, %{username2} и %{count} другой</span> %{description}"
+        few: "<span>%{username}, %{username2} и %{count} другие</span> %{description}"
+        many: "<span>%{username}, %{username2} и %{count} других</span> %{description}"
+        other: "<span>%{username}, %{username2} и %{count} других</span> %{description}"
       liked_consolidated_description:
-        one: "Понравилось {{count}} ваше сообщение"
-        few: "Понравилось {{count}} ваших сообщения"
-        many: "Понравилось {{count}} ваших сообщений"
-        other: "Понравилось {{count}} ваших сообщений"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> принял ваше приглашение"
-      moved_post: "<span>{{username}}</span> moved {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Заслужил(а) '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Новая тема</span> {{description}}"
-      membership_request_accepted: "Запрос на вступление принят '{{group_name}}'"
-      membership_request_consolidated: "{{count}} открытые запросы на вступления для '{{group_name}}'"
+        one: "Понравилось %{count} ваше сообщение"
+        few: "Понравилось %{count} ваших сообщения"
+        many: "Понравилось %{count} ваших сообщений"
+        other: "Понравилось %{count} ваших сообщений"
+      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}"
+      invitee_accepted: "<span>%{username}</span> принял ваше приглашение"
+      moved_post: "<span>%{username}</span> moved %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Заслужил(а) '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Новая тема</span> %{description}"
+      membership_request_accepted: "Запрос на вступление принят '%{group_name}'"
+      membership_request_consolidated: "%{count} открытые запросы на вступления для '%{group_name}'"
       group_message_summary:
-        one: "{{count}} сообщение в вашей группе: {{group_name}} "
-        few: "{{count}} сообщения в вашей группе: {{group_name}} "
-        many: "{{count}} сообщений в вашей группе: {{group_name}} "
-        other: "{{count}} сообщений в вашей группе: {{group_name}} "
+        one: "%{count} сообщение в вашей группе: %{group_name} "
+        few: "%{count} сообщения в вашей группе: %{group_name} "
+        many: "%{count} сообщений в вашей группе: %{group_name} "
+        other: "%{count} сообщений в вашей группе: %{group_name} "
       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}}'
+        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}} до %{site_title}"
+        custom: "Уведомления от %{username} до %{site_title}"
       titles:
         mentioned: "Упомянутый"
         replied: "Новый ответ"
@@ -1890,9 +1892,9 @@ ru:
       from_my_computer: "С моего устройства"
       from_the_web: "Из интернета"
       remote_tip: "Ссылка на изображение"
-      remote_tip_with_attachments: "Ссылка на изображение или файл {{authorized_extensions}}"
+      remote_tip_with_attachments: "Ссылка на изображение или файл %{authorized_extensions}"
       local_tip: "Выбор изображения с вашего устройства"
-      local_tip_with_attachments: "Выбор изображения или файла с вашего устройства {{authorized_extensions}}"
+      local_tip_with_attachments: "Выбор изображения или файла с вашего устройства %{authorized_extensions}"
       hint: "(вы также можете перетащить объект в редактор для его загрузки)"
       hint_for_supported_browsers: "вы также можете перетащить или скопировать изображения в редактор"
       uploading: "Загрузка"
@@ -1909,17 +1911,17 @@ ru:
       clear_all: "Сбросить все"
       too_short: "Слишком короткое слово для поиска."
       result_count:
-        one: "<span>%{count} результат для </span><span class='term'>{{term}}</span>"
-        few: "<span>{{count}}{{plus}} результата для </span><span class='term'>{{term}}</span>"
-        many: "<span>{{count}}{{plus}} результатов для </span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} результатов для </span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} результат для </span><span class='term'>%{term}</span>"
+        few: "<span>%{count}%{plus} результата для </span><span class='term'>%{term}</span>"
+        many: "<span>%{count}%{plus} результатов для </span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} результатов для </span><span class='term'>%{term}</span>"
       title: "Поиск по темам, сообщениям, псевдонимам и разделам"
       full_page_title: "поиск тем или сообщений"
       no_results: "Ничего не найдено."
       no_more_results: "Больше ничего не найдено."
       searching: "Поиск ..."
-      post_format: "#{{post_number}} от {{username}}"
-      results_page: "Результаты поиска для '{{term}}'"
+      post_format: "#%{post_number} от %{username}"
+      results_page: "Результаты поиска для '%{term}'"
       more_results: "Найдено множество результатов. Пожалуйста, уточните, критерии поиска."
       cant_find: "Не можете найти нужную информацию?"
       start_new_topic: "Создайте новую тему"
@@ -1928,9 +1930,9 @@ ru:
       search_google_button: "Google"
       search_google_title: "Искать на этом сайте"
       context:
-        user: "Искать сообщения от @{{username}}"
-        category: "Искать в разделе #{{category}}"
-        tag: "Поиск по #{{tag}} тегу"
+        user: "Искать сообщения от @%{username}"
+        category: "Искать в разделе #%{category}"
+        tag: "Поиск по #%{tag} тегу"
         topic: "Искать в этой теме"
         private_messages: "Искать в личных сообщениях"
       advanced:
@@ -2006,10 +2008,10 @@ ru:
         notification_level: "Уведомления"
         choose_new_category: "Выберите новый раздел для этих тем:"
         selected:
-          one: "Вы выбрали <b>{{count}}</b> тему."
-          few: "Вы выбрали <b>{{count}}</b> темы."
-          many: "Вы выбрали <b>{{count}}</b> тем."
-          other: "Вы выбрали <b>{{count}}</b> тем."
+          one: "Вы выбрали <b>%{count}</b> тему."
+          few: "Вы выбрали <b>%{count}</b> темы."
+          many: "Вы выбрали <b>%{count}</b> тем."
+          other: "Вы выбрали <b>%{count}</b> тем."
         change_tags: "Заменить теги"
         append_tags: "Добавить теги"
         choose_new_tags: "Выберите новые теги для этих тем:"
@@ -2022,7 +2024,7 @@ ru:
         posted: "Вы не принимали участие в обсуждении."
         latest: "Новых тем нет."
         bookmarks: "У вас нет избранных тем."
-        category: "В разделе {{category}} отсутствуют темы."
+        category: "В разделе %{category} отсутствуют темы."
         top: "Нет обсуждаемых тем."
         educate:
           new: '<p>Ваши новые темы скоро появятся тут.</p><p>Новые темы по умолчанию отмечаются иконкой <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">Новая</span> , если они были созданы за последние 2 дня.</p><p>При необходимости вы можете изменить параметры уведомлений в <a href="%{userPrefsUrl}">настройках</a> профиля пользователя.</p>'
@@ -2033,15 +2035,15 @@ ru:
         read: "Прочитанных тем больше нет."
         new: "Больше нет новых тем."
         unread: "Больше нет непрочитанных тем."
-        category: "В разделе {{category}} больше нет тем."
+        category: "В разделе %{category} больше нет тем."
         top: "Больше нет обсуждаемых тем."
         bookmarks: "Больше нет избранных тем."
     topic:
       filter_to:
         one: "%{count} сообщение в теме"
-        few: "{{count}} сообщения в теме"
-        many: "{{count}} сообщений в теме"
-        other: "{{count}} сообщений в теме"
+        few: "%{count} сообщения в теме"
+        many: "%{count} сообщений в теме"
+        other: "%{count} сообщений в теме"
       create: "Создать тему"
       create_long: "Создать новую тему"
       open_draft: "Открыть черновик"
@@ -2069,15 +2071,15 @@ ru:
       new: "новая тема"
       unread: "не прочитано"
       new_topics:
-        one: "{{count}} новая тема"
-        few: "{{count}} новых темы"
-        many: "{{count}} новых тем"
-        other: "{{count}} новых тем"
+        one: "%{count} новая тема"
+        few: "%{count} новых темы"
+        many: "%{count} новых тем"
+        other: "%{count} новых тем"
       unread_topics:
-        one: "{{count}} непрочитанная тема"
-        few: "{{count}} непрочитанные темы"
-        many: "{{count}} непрочитанных тем"
-        other: "{{count}} непрочитанных тем"
+        one: "%{count} непрочитанная тема"
+        few: "%{count} непрочитанные темы"
+        many: "%{count} непрочитанных тем"
+        other: "%{count} непрочитанных тем"
       title: "Тема"
       invalid_access:
         title: "Частная тема"
@@ -2090,33 +2092,33 @@ ru:
         title: "Тема не найдена"
         description: "К сожалению, запрошенная тема не найдена. Возможно, она была удалена модератором."
       total_unread_posts:
-        one: "У вас {{count}} непрочитанное сообщение в этой теме"
-        few: "У вас {{count}} непрочитанных сообщения в этой теме"
-        many: "У вас {{count}} непрочитанных сообщений в этой теме"
-        other: "У вас {{count}} непрочитанных сообщений в этой теме"
+        one: "У вас %{count} непрочитанное сообщение в этой теме"
+        few: "У вас %{count} непрочитанных сообщения в этой теме"
+        many: "У вас %{count} непрочитанных сообщений в этой теме"
+        other: "У вас %{count} непрочитанных сообщений в этой теме"
       unread_posts:
-        one: "У вас {{count}} непрочитанное старое сообщение в этой теме"
-        few: "У вас {{count}} непрочитанных старых сообщения в этой теме"
-        many: "У вас {{count}} непрочитанных старых сообщений в этой теме"
-        other: "У вас {{count}} непрочитанных старых сообщений в этой теме"
+        one: "У вас %{count} непрочитанное старое сообщение в этой теме"
+        few: "У вас %{count} непрочитанных старых сообщения в этой теме"
+        many: "У вас %{count} непрочитанных старых сообщений в этой теме"
+        other: "У вас %{count} непрочитанных старых сообщений в этой теме"
       new_posts:
-        one: "В этой теме {{count}} новое сообщение с вашего последнего просмотра"
-        few: "В этой теме {{count}} новых сообщения с вашего последнего просмотра"
-        many: "В этой теме {{count}} новых сообщений с вашего последнего просмотра"
-        other: "В этой теме {{count}} новых сообщений с вашего последнего просмотра"
+        one: "В этой теме %{count} новое сообщение с вашего последнего просмотра"
+        few: "В этой теме %{count} новых сообщения с вашего последнего просмотра"
+        many: "В этой теме %{count} новых сообщений с вашего последнего просмотра"
+        other: "В этой теме %{count} новых сообщений с вашего последнего просмотра"
       likes:
-        one: "В теме {{count}} лайк"
-        few: "В теме {{count}} лайка"
-        many: "В теме {{count}} лайков"
-        other: "В теме {{count}} лайков"
+        one: "В теме %{count} лайк"
+        few: "В теме %{count} лайка"
+        many: "В теме %{count} лайков"
+        other: "В теме %{count} лайков"
       back_to_list: "Вернуться к списку тем"
       options: "Опции темы"
       show_links: "Показать ссылки в теме"
       toggle_information: "Показать/скрыть подробную информацию о теме"
-      read_more_in_category: "Хотите почитать что-нибудь ещё? Можно посмотреть темы в {{catLink}} или {{latestLink}}."
-      read_more: "Хотите почитать что-нибудь ещё? {{catLink}} или {{latestLink}}."
-      group_request: "Вам нужно запросить членство в группе `{{name}}` чтобы увидеть эту тему."
-      group_join: "Вам нужно присоединиться к группе `{{name}}` чтобы увидеть эту тему."
+      read_more_in_category: "Хотите почитать что-нибудь ещё? Можно посмотреть темы в %{catLink} или %{latestLink}."
+      read_more: "Хотите почитать что-нибудь ещё? %{catLink} или %{latestLink}."
+      group_request: "Вам нужно запросить членство в группе `%{name}` чтобы увидеть эту тему."
+      group_join: "Вам нужно присоединиться к группе `%{name}` чтобы увидеть эту тему."
       group_request_sent: "Ваш запрос на членство в группе был отправлен. Вам сообщат, когда  будет одобрено."
       unread_indicator: "Никто еще не дочитал до конца этой темы."
       read_more_MF: "У вас осталось { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 непрочитанная</a> } few { <a href='{basePath}/unread'># непрочитанные</a> } other { <a href='{basePath}/unread'># непрочитанных</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'>1 новая</a> тема} few { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'># новые</a> темы} other { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'># новых</a> тем} }, вы также можете {CATEGORY, select, true {посмотреть другие темы в разделе {catLink}} false {{latestLink}} other {}}"
@@ -2222,7 +2224,7 @@ ru:
           "2_8": "Вы увидите количество новых ответов, поскольку следите за этим разделом."
           "2_4": "Вы увидите количество новых ответов, поскольку вы размещали ответ в этой теме."
           "2_2": "Вы увидите количество новых ответов, поскольку следите за этой темой."
-          "2": 'Вы увидите количество новых ответов, поскольку <a href="{{basePath}}/u/{{username}}/preferences/notifications">читали эту тему</a>.'
+          "2": 'Вы увидите количество новых ответов, поскольку <a href="%{basePath}/u/%{username}/preferences/notifications">читали эту тему</a>.'
           "1_2": "Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам."
           "1": "Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам."
           "0_7": "Не получать уведомлений из этого раздела."
@@ -2298,36 +2300,36 @@ ru:
         choose_category: "Пожалуйста, выберите раздел для публичной темы:"
       feature_topic:
         title: "Закрепить эту тему"
-        pin: "Закрепить эту тему вверху раздела {{categoryLink}} до"
-        confirm_pin: "У вас уже есть закрепленные темы в разделе ({{count}}). Перебор таких тем может оказаться неприятным неудобством для новичков и анонимных читателей. Вы действительно хотите закрепить еще одну тему в этом разделе?"
-        unpin: "Отменить закрепление этой темы вверху раздела {{categoryLink}}."
-        unpin_until: "Отменить закрепление этой темы вверху раздела {{categoryLink}} (произойдет автоматически <strong>%{until}</strong>)."
+        pin: "Закрепить эту тему вверху раздела %{categoryLink} до"
+        confirm_pin: "У вас уже есть закрепленные темы в разделе (%{count}). Перебор таких тем может оказаться неприятным неудобством для новичков и анонимных читателей. Вы действительно хотите закрепить еще одну тему в этом разделе?"
+        unpin: "Отменить закрепление этой темы в верхней части раздела %{categoryLink}."
+        unpin_until: "Отменить закрепление этой темы в верхней части раздела %{categoryLink} (произойдет автоматически <strong>%{until}</strong>)."
         pin_note: "Пользователи могут открепить тему, каждый сам для себя."
         pin_validation: "Чтобы закрепить эту тему, требуется дата."
-        not_pinned: "В разделе {{categoryLink}} нет закрепленных тем."
+        not_pinned: "В разделе %{categoryLink} нет закрепленных тем."
         already_pinned:
-          one: "Глобально закрепленных тем в разделе {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          few: "Глобально закрепленных тем в разделе {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "Глобально закрепленных тем в разделе {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Глобально закрепленных тем в разделе {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Глобально закрепленных тем в разделе %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          few: "Глобально закрепленных тем в разделе %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          many: "Глобально закрепленных тем в разделе %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Глобально закрепленных тем в разделе %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Закрепить эту тему вверху всех разделов и списков тем до"
-        confirm_pin_globally: "У вас уже есть глобально закрепленные темы ({{count}}). Перебор таких тем может оказаться неприятным неудобством для новичков и анонимных читателей. Вы действительно хотите глобально закрепить еще одну тему?"
+        confirm_pin_globally: "У вас уже есть глобально закреплённые темы (%{count}). Большое количество закреплённых тем может быть неудобным для новичков и анонимных пользователей при навигации по форуму. Вы действительно хотите глобально закрепить еще одну тему?"
         unpin_globally: "Отменить прикрепление этой темы вверху всех разделов и списков тем."
         unpin_globally_until: "Отменить прикрепление этой темы вверху всех разделов и списков тем (произойдет автоматически <strong>%{until}</strong>)."
         global_pin_note: "Пользователи могут открепить тему, каждый сам для себя."
         not_pinned_globally: "Нет глобально закрепленных тем."
         already_pinned_globally:
           one: "Глобально закрепленных тем: <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>"
+          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: "Пользователи могут закрывать объявление, каждый сам для себя, после чего оно больше не будет для них покываться. Только одна тема может быть сделана активным объявлением в любой момент времени."
         no_banner_exists: "Нет текущих тем-объявлений."
         banner_exists: "На данный момент <strong class='badge badge-notification unread'>уже есть</strong> тема-объявление."
       inviting: "Высылаю приглашение..."
-      automatically_add_to_groups: "Это приглашение предоставит доступ к следующим группам:"
+      automatically_add_to_groups: "Это приглашение также предоставит доступ к следующим группам:"
       invite_private:
         title: "Пригласить в беседу"
         email_or_username: "Адрес электронной почты или псевдоним того, кого вы хотите пригласить"
@@ -2343,24 +2345,24 @@ ru:
         username_placeholder: "псевдоним"
         action: "Отправить приглашение"
         help: "Пригласить других в эту тему с помощью email или уведомлений"
-        to_forum: "Будет отправлено короткое письмо, которое позволит вашему другу присоединиться, просто кликнув по ссылке, без необходимости входа на сайт."
+        to_forum: "Будет отправлено короткое письмо, которое позволит вашему другу быстро присоединиться к обсуждению, просто кликнув по ссылке, без необходимости ввода учётных данных."
         sso_enabled: "Введите псевдоним пользователя, которого вы хотите пригласить в эту тему."
         to_topic_blank: "Введите псевдоним или email пользователя, которого вы хотите пригласить в эту тему."
         to_topic_email: "Вы указали адрес электронной почты. Мы отправим приглашение, которое позволит вашему другу немедленно ответить в этой теме."
         to_topic_username: "Вы указали псевдоним пользователя. Мы отправим ему уведомление со ссылкой, чтобы пригласить его в эту тему."
         to_username: "Введите псевдоним пользователя, которого вы хотите пригласить в эту тему. Мы отправим ему уведомление о том что вы приглашаете его присоединиться к этой теме."
         email_placeholder: "name@example.com"
-        success_email: "Приглашение отправлено по адресу <b>{{emailOrUsername}}</b>. Мы уведомим Вас, когда этим приглашением воспользуются. Проверьте вкладку <b>Приглашения</b> на вашей странице пользователя, чтобы узнать состояние всех ваших приглашений."
+        success_email: "Приглашение отправлено по адресу <b>%{emailOrUsername}</b>. Мы уведомим Вас, когда этим приглашением воспользуются. Проверьте вкладку <b>Приглашения</b> на вашей странице пользователя, чтобы узнать состояние всех ваших приглашений."
         success_username: "Мы пригласили этого пользователя принять участие в теме."
         error: "К сожалению, мы не смогли пригласить этого человека. Возможно, он уже был приглашён? (Приглашения ограничены рейтингом)"
-        success_existing_email: "Пользователь с электронной почтой <b>{{emailOrUsername}}</b> уже существует. Мы пригласили этого пользователя принять участие в этой теме."
+        success_existing_email: "Пользователь с электронной почтой <b>%{emailOrUsername}</b> уже существует. Мы пригласили этого пользователя принять участие в этой теме."
       login_reply: "Войти и ответить"
       filters:
         n_posts:
-          one: "{{count}} сообщение"
-          few: "{{count}} сообщения"
-          many: "{{count}} сообщений"
-          other: "{{count}} сообщений"
+          one: "%{count} сообщение"
+          few: "%{count} сообщения"
+          many: "%{count} сообщений"
+          other: "%{count} сообщений"
         cancel: "Отменить фильтр"
       move_to:
         title: "Перемещение"
@@ -2373,20 +2375,20 @@ ru:
         radio_label: "Новая тема"
         error: "Во время перемещения сообщений в новую тему возникла ошибка."
         instructions:
-          one: "Сейчас вы создадите новую тему и в неё переместится выбранное вами <b>{{count}}</b> сообщение."
-          few: "Сейчас вы создадите новую тему и в неё переместятся выбранные вами <b>{{count}}</b> сообщения."
-          many: "Сейчас вы создадите новую тему и в неё переместятся выбранные вами <b>{{count}}</b> сообщения."
-          other: "Сейчас вы создадите новую тему и в неё переместятся выбранные вами <b>{{count}}</b> сообщения."
+          one: "Сейчас вы создадите новую тему и в неё переместится выбранное вами <b>%{count}</b> сообщение."
+          few: "Сейчас вы создадите новую тему и в неё переместятся выбранные вами <b>%{count}</b> сообщения."
+          many: "Сейчас вы создадите новую тему и в неё переместятся выбранные вами <b>%{count}</b> сообщения."
+          other: "Сейчас вы создадите новую тему и в неё переместятся выбранные вами <b>%{count}</b> сообщения."
       merge_topic:
         title: "Переместить в существующую тему"
         action: "Переместить в существующую тему"
         error: "Во время перемещения сообщений в тему возникла ошибка."
         radio_label: "Существующая тема"
         instructions:
-          one: "Пожалуйста, выберите тему, в которую вы хотели бы переместить это <b>{{count}}</b> сообщение."
-          few: "Пожалуйста, выберите тему, в которую вы хотели бы переместить эти <b>{{count}}</b> сообщения."
-          many: "Пожалуйста, выберите тему, в которую вы хотели бы переместить эти <b>{{count}}</b> сообщений."
-          other: "Пожалуйста, выберите тему, в которую вы хотели бы переместить эти <b>{{count}}</b> сообщений."
+          one: "Пожалуйста, выберите тему, в которую вы хотели бы переместить это <b>%{count}</b> сообщение."
+          few: "Пожалуйста, выберите тему, в которую вы хотели бы переместить эти <b>%{count}</b> сообщения."
+          many: "Пожалуйста, выберите тему, в которую вы хотели бы переместить эти <b>%{count}</b> сообщений."
+          other: "Пожалуйста, выберите тему, в которую вы хотели бы переместить эти <b>%{count}</b> сообщений."
       move_to_new_message:
         title: "Переместить в новое личное сообщение"
         action: "Переместить в новое личное сообщение"
@@ -2395,9 +2397,9 @@ ru:
         participants: "Участники"
         instructions:
           one: "Вы собираетесь создать новое личное сообщение и заполнить его выбранным вами сообщением."
-          few: "Вы собираетесь создать новое личное сообщение и заполнить его<b>{{count}}</b> сообщениями, которые вы выбрали."
-          many: "Вы собираетесь создать новое личное сообщение и заполнить его<b>{{count}}</b> сообщениями, которые вы выбрали."
-          other: "Вы собираетесь создать новое личное сообщение и заполнить его<b>{{count}}</b> сообщениями, которые вы выбрали."
+          few: "Вы собираетесь создать новое личное сообщение и заполнить его<b>%{count}</b> сообщениями, которые вы выбрали."
+          many: "Вы собираетесь создать новое личное сообщение и заполнить его<b>%{count}</b> сообщениями, которые вы выбрали."
+          other: "Вы собираетесь создать новое личное сообщение и заполнить его<b>%{count}</b> сообщениями, которые вы выбрали."
       move_to_existing_message:
         title: "Переместить в существующее личное сообщение"
         action: "Переместить в существующее личное сообщение"
@@ -2405,9 +2407,9 @@ ru:
         participants: "Участники"
         instructions:
           one: "Пожалуйста, выберите личное сообщение, в которое вы хотите переместить это сообщение."
-          few: "Пожалуйста, выберите личное сообщение, в которое вы хотите переместить <b>{{count}}</b> сообщения."
-          many: "Пожалуйста, выберите личное сообщение, в которое вы хотите переместить <b>{{count}}</b> сообщений."
-          other: "Пожалуйста, выберите личное сообщение, в которое вы хотите переместить <b>{{count}}</b> сообщений."
+          few: "Пожалуйста, выберите личное сообщение, в которое вы хотите переместить <b>%{count}</b> сообщения."
+          many: "Пожалуйста, выберите личное сообщение, в которое вы хотите переместить <b>%{count}</b> сообщений."
+          other: "Пожалуйста, выберите личное сообщение, в которое вы хотите переместить <b>%{count}</b> сообщений."
       merge_posts:
         title: "Объединить выделенные сообщения"
         action: "Объединить выделенные сообщения"
@@ -2430,15 +2432,15 @@ ru:
         error: "При смене владельца сообщений произошла ошибка."
         placeholder: "псевдоним нового владельца"
         instructions:
-          one: "Пожалуйста, выберите нового владельца для сообщения <b>@{{old_user}}</b>"
-          few: "Пожалуйста, выберите нового владельца для сообщений <b>@{{old_user}}</b>"
-          many: "Пожалуйста, выберите нового владельца для сообщений <b>@{{old_user}}</b>"
-          other: "Пожалуйста, выберите нового владельца {{count}} сообщений для <b>@{{old_user}}</b>"
+          one: "Пожалуйста, выберите нового владельца для сообщения <b>@%{old_user}</b>"
+          few: "Пожалуйста, выберите нового владельца для сообщений <b>@%{old_user}</b>"
+          many: "Пожалуйста, выберите нового владельца для сообщений <b>@%{old_user}</b>"
+          other: "Пожалуйста, выберите нового владельца %{count} сообщений для <b>@%{old_user}</b>"
         instructions_without_old_user:
           one: "Пожалуйста, выберите нового владельца сообщения"
-          few: "Пожалуйста, выберите нового владельца {{count}}сообщений"
-          many: "Пожалуйста, выберите нового владельца {{count}} сообщений"
-          other: "Пожалуйста, выберите нового владельца {{count}} сообщений"
+          few: "Пожалуйста, выберите нового владельца %{count}сообщений"
+          many: "Пожалуйста, выберите нового владельца %{count} сообщений"
+          other: "Пожалуйста, выберите нового владельца %{count} сообщений"
       change_timestamp:
         title: "Изменить метку времени..."
         action: "Изменить метку времени"
@@ -2447,7 +2449,7 @@ ru:
         instructions: "Пожалуйста, выберите новую метку времени. Сообщения в теме будут обновлены, чтобы убрать различия во времени."
       multi_select:
         select: "Выбрать"
-        selected: "Выбрано ({{count}})"
+        selected: "Выбрано (%{count})"
         select_post:
           label: "Выбрать"
           title: "Добавить сообщение в выделение"
@@ -2465,10 +2467,10 @@ ru:
         select_all: Выбрать все
         deselect_all: Снять весь выбор
         description:
-          one: Вы выбрали <b>{{count}}</b> сообщение.
-          few: "Вы выбрали <b>{{count}}</b> сообщения."
-          many: "Вы выбрали <b>{{count}}</b> сообщений."
-          other: "Вы выбрали <b>{{count}}</b> сообщений."
+          one: Вы выбрали <b>%{count}</b> сообщение.
+          few: "Вы выбрали <b>%{count}</b> сообщения."
+          many: "Вы выбрали <b>%{count}</b> сообщений."
+          other: "Вы выбрали <b>%{count}</b> сообщений."
       deleted_by_author:
         one: "(тема отозвана автором и будет автоматически удалена через %{count} час, если только на нее не поступит жалоба)"
         few: "(тема отозвана автором и будет автоматически удалена через %{count} часа, если только на нее не поступит жалоба)"
@@ -2477,13 +2479,13 @@ ru:
     post:
       quote_reply: "Цитата"
       edit_reason: "Причина:"
-      post_number: "сообщение {{number}}"
+      post_number: "сообщение %{number}"
       ignored: "Проигнорированное содержание"
       wiki_last_edited_on: "вики редактировалось"
       last_edited_on: "Последний раз сообщение редактировалось"
       reply_as_new_topic: "Ответить в новой связанной теме"
       reply_as_new_private_message: "Ответить новым сообщением тем же адресатам"
-      continue_discussion: "Продолжая обсуждение из {{postLink}}:"
+      continue_discussion: "Продолжая обсуждение из %{postLink}:"
       follow_quote: "Перейти к цитируемому сообщению"
       show_full: "Показать полный текст"
       show_hidden: "Просмотр игнорируемого содержимого."
@@ -2496,38 +2498,38 @@ ru:
       expand_collapse: "Развернуть/свернуть"
       locked: "Сотрудник заблокировал это сообщение для редактирования"
       gap:
-        one: "Просмотреть {{count}} скрытый ответ"
-        few: "Просмотреть {{count}} скрытых ответа"
-        many: "Просмотреть {{count}} скрытых ответов"
-        other: "Просмотреть {{count}} скрытых ответов"
+        one: "Просмотреть %{count} скрытый ответ"
+        few: "Просмотреть %{count} скрытых ответа"
+        many: "Просмотреть %{count} скрытых ответов"
+        other: "Просмотреть %{count} скрытых ответов"
       notice:
-        new_user: "Это первая публикация {{user}} — поприветствуем его в нашем сообществе!"
-        returning_user: "Пользователь {{user}} давно не появлялся — его последнее сообщение было {{time}}."
+        new_user: "Это первая публикация %{user} — поприветствуем его в нашем сообществе!"
+        returning_user: "Пользователь %{user} давно не появлялся — его последнее сообщение было %{time}."
       unread: "Сообщение не прочитано"
       has_replies:
-        one: "{{count}} ответ"
-        few: "{{count}} ответа"
-        many: "{{count}} ответов"
-        other: "{{count}} ответов"
+        one: "%{count} ответ"
+        few: "%{count} ответа"
+        many: "%{count} ответов"
+        other: "%{count} ответов"
       has_likes_title:
-        one: "Это сообщение понравилось {{count}} человеку"
-        few: "Это сообщение понравилось {{count}} людям"
-        many: "Это сообщение понравилось {{count}} людям"
-        other: "Это сообщение понравилось {{count}} людям"
+        one: "Это сообщение понравилось %{count} человеку"
+        few: "Это сообщение понравилось %{count} людям"
+        many: "Это сообщение понравилось %{count} людям"
+        other: "Это сообщение понравилось %{count} людям"
       has_likes_title_only_you: "Вам понравилось это сообщение"
       has_likes_title_you:
         one: "Вам и ещё %{count} человеку понравилось это сообщение"
-        few: "Вам и ещё {{count}} людям понравилось это сообщение"
-        many: "Вам и ещё {{count}} людям понравилось это сообщение"
-        other: "Вам и ещё {{count}} людям понравилось это сообщение"
+        few: "Вам и ещё %{count} людям понравилось это сообщение"
+        many: "Вам и ещё %{count} людям понравилось это сообщение"
+        other: "Вам и ещё %{count} людям понравилось это сообщение"
       errors:
         create: "К сожалению, не удалось создать сообщение из-за ошибки. Попробуйте ещё раз."
         edit: "К сожалению, не удалось изменить сообщение. Попробуйте ещё раз."
         upload: "К сожалению, не удалось загрузить файл. Попробуйте ещё раз."
-        file_too_large: "К сожалению, этот файл слишком большой (максимально допустимый размер {{max_size_kb}} КБ). Почему бы не загрузить этот файл в службу облачного обмена, а затем поделиться ссылкой?"
+        file_too_large: "К сожалению, этот файл слишком большой (максимально допустимый размер %{max_size_kb} КБ). Почему бы не загрузить этот файл в службу облачного обмена, а затем поделиться ссылкой?"
         too_many_uploads: "К сожалению, за один раз можно загрузить только одно изображение."
-        too_many_dragged_and_dropped_files: "Извините, вы можете только загрузить {{max}} файл."
-        upload_not_authorized: "К сожалению, вы не можете загрузить файл данного типа (список разрешённых типов файлов: {{authorized_extensions}})."
+        too_many_dragged_and_dropped_files: "Извините, но  вы можете загрузить одномоментно не более%{max} файлов ."
+        upload_not_authorized: "К сожалению, вы не можете загрузить файл данного типа (список разрешённых типов файлов: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "К сожалению, загрузка изображений недоступна новым пользователям."
         attachment_upload_not_allowed_for_new_user: "К сожалению, загрузка файлов недоступна новым пользователям."
         attachment_download_requires_login: "Войдите, чтобы скачивать прикрепленные файлы."
@@ -2567,14 +2569,14 @@ ru:
           confirm: "Хотите удалить также и ответы на это сообщение?"
           direct_replies:
             one: "Да, и %{count} прямой ответ"
-            few: "Да, и {{count}} прямых ответа"
-            many: "Да, и {{count}} прямых ответов"
-            other: "Да, и {{count}} прямой ответов"
+            few: "Да, и %{count} прямых ответа"
+            many: "Да, и %{count} прямых ответов"
+            other: "Да, и %{count} прямых ответов"
           all_replies:
             one: "Да, и %{count} ответ"
-            few: "Да, и все {{count}} ответа"
-            many: "Да, и все {{count}} ответов"
-            other: "Да, и все {{count}} ответов"
+            few: "Да, и все %{count} ответа"
+            many: "Да, и все %{count} ответов"
+            other: "Да, и все %{count} ответов"
           just_the_post: "Нет, только это сообщение"
         admin: "Действия администратора над сообщением"
         wiki: "Сделать вики-сообщением"
@@ -2627,15 +2629,15 @@ ru:
             many: "прочитали"
             other: "прочитали"
           like_capped:
-            one: "и {{count}} понравилось"
-            few: "и {{count}} другим понравилось"
-            many: "и {{count}} другим понравилось"
-            other: "и {{count}} другим понравилось"
+            one: "и %{count} понравилось"
+            few: "и %{count} другим понравилось"
+            many: "и %{count} другим понравилось"
+            other: "и %{count} другим понравилось"
           read_capped:
-            one: "и ещё {{count}} прочитал"
-            few: "и ещё {{count}} прочитали"
-            many: "и ещё {{count}} прочитали"
-            other: "и ещё {{count}} прочитали"
+            one: "и ещё %{count} прочитал"
+            few: "и ещё %{count} прочитали"
+            many: "и ещё %{count} прочитали"
+            other: "и ещё %{count} прочитали"
         by_you:
           off_topic: "Помечена вами как оффтопик"
           spam: "Помечена вами как спам"
@@ -2647,15 +2649,15 @@ ru:
       delete:
         confirm:
           one: "Вы действительно хотите удалить это сообщение?"
-          few: "Вы действительно хотите удалить {{count}} сообщения?"
-          many: "Вы действительно хотите удалить {{count}} сообщений?"
-          other: "Вы действительно хотите удалить {{count}} сообщений?"
+          few: "Вы действительно хотите удалить %{count} сообщения?"
+          many: "Вы действительно хотите удалить %{count} сообщений?"
+          other: "Вы действительно хотите удалить %{count} сообщений?"
       merge:
         confirm:
           one: "Вы действительно хотите объединить эти сообщения?"
-          few: "Вы действительно хотите объединить эти {{count}} сообщения?"
-          many: "Вы действительно хотите объединить эти {{count}} сообщений?"
-          other: "Вы действительно хотите объединить эти {{count}} сообщений?"
+          few: "Вы действительно хотите объединить эти %{count} сообщения?"
+          many: "Вы действительно хотите объединить эти %{count} сообщений?"
+          other: "Вы действительно хотите объединить эти %{count} сообщений?"
       revisions:
         controls:
           first: "Начальная версия"
@@ -2667,7 +2669,7 @@ ru:
           revert: "Откат до этой версии"
           edit_wiki: "Редактировать Wiki"
           edit_post: "Редактировать запись"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "Отобразить сообщение с включенными добавлениями и удалениями."
@@ -2772,6 +2774,7 @@ ru:
       sort_order: "Порядок сортировки тем:"
       default_view: "Вид списка тем по умолчанию:"
       default_top_period: "Верхний период по умолчанию:"
+      default_list_filter: "Фильтр по умолчанию:"
       allow_badges_label: "Разрешить вручение наград в этом разделе"
       edit_permissions: "Изменить права доступа"
       reviewable_by_group: "Кто еще, помимо персонала, может рассматривать сообщения и жалобы в этом разделе:"
@@ -2858,19 +2861,19 @@ ru:
       custom_message:
         at_least:
           one: "Введите хотя бы %{count} символ"
-          few: "Введите хотя бы {{count}} символа"
-          many: "Введите хотя бы {{count}} символов"
-          other: "Введите хотя бы {{count}} символов"
+          few: "Введите хотя бы %{count} символа"
+          many: "Введите хотя бы %{count} символов"
+          other: "Введите хотя бы %{count} символов"
         more:
           one: "Еще %{count} символ..."
-          few: "Еще хотя бы {{count}} символа..."
-          many: "Еще хотя бы {{count}} символов..."
-          other: "Еще хотя бы {{count}} символов..."
+          few: "Еще хотя бы %{count} символа..."
+          many: "Еще хотя бы %{count} символов..."
+          other: "Еще хотя бы %{count} символов..."
         left:
           one: "Осталось не более %{count} символа"
-          few: "Осталось не более {{count}} символов"
-          many: "Осталось не более {{count}} символов"
-          other: "Осталось не более {{count}} символов"
+          few: "Осталось не более %{count} символов"
+          many: "Осталось не более %{count} символов"
+          other: "Осталось не более %{count} символов"
     flagging_topic:
       title: "Спасибо за помощь в поддержании порядка!"
       action: "Пожаловаться на тему"
@@ -2918,7 +2921,7 @@ ru:
         title: "Эта тема является личным сообщением"
         help: "Эта тема является личным сообщением"
     posts: "Сообщ."
-    posts_long: "{{number}} сообщений в теме"
+    posts_long: "%{number} сообщений в теме"
     posts_likes_MF: |
       В этой теме {count, plural, one {1 сообщение} few {# сообщения} other {# сообщений}} {ratio, select,
       low {с высоким рейтингом симпатий}
@@ -2935,9 +2938,9 @@ ru:
     replies: "Ответов"
     views_long:
       one: "Тема просмотрена %{count} раз"
-      few: "Тема просмотрена {{number}} раза"
-      many: "Тема просмотрена {{number}} раз"
-      other: "Тема просмотрена {{number}} раз"
+      few: "Тема просмотрена %{number} раза"
+      many: "Тема просмотрена %{number} раз"
+      other: "Тема просмотрена %{number} раз"
     activity: "Активность"
     likes: "Нрав."
     likes_lowercase:
@@ -2945,7 +2948,7 @@ ru:
       few: "симпатии"
       many: "симпатий"
       other: "симпатий"
-    likes_long: "{{number}} лайков в теме"
+    likes_long: "%{number} лайков в теме"
     users: "Пользователи"
     users_lowercase:
       one: "пользователь"
@@ -2954,7 +2957,7 @@ ru:
       other: "пользователей"
     category_title: "Раздел"
     history: "История"
-    changed_by: "автором {{author}}"
+    changed_by: "автором %{author}"
     raw_email:
       title: "Входящее сообщение"
       not_available: "Не доступно!"
@@ -2966,43 +2969,43 @@ ru:
         title: "Последние"
         title_with_count:
           one: "Последние (%{count})"
-          few: "Последние ({{count}})"
-          many: "Последние ({{count}})"
-          other: "Последние ({{count}})"
+          few: "Последние (%{count})"
+          many: "Последние (%{count})"
+          other: "Последние (%{count})"
         help: "Темы с недавними сообщениями"
       read:
         title: "Прочитанные"
         help: "Темы, которые вас заинтересовали (в обратном хронологическом порядке)"
       categories:
         title: "Разделы"
-        title_in: "Раздел - {{categoryName}}"
+        title_in: "Раздел - %{categoryName}"
         help: "Все темы, сгруппированные по разделам"
       unread:
         title: "Непрочитанные"
         title_with_count:
-          one: "Непрочитанные ({{count}})"
-          few: "Непрочитанные ({{count}})"
-          many: "Непрочитанные ({{count}})"
-          other: "Непрочитанные ({{count}})"
+          one: "Непрочитанные (%{count})"
+          few: "Непрочитанные (%{count})"
+          many: "Непрочитанные (%{count})"
+          other: "Непрочитанные (%{count})"
         help: "Наблюдаемые или отслеживаемые темы с непрочитанными сообщениями"
         lower_title_with_count:
-          one: "{{count}} непрочитанная"
-          few: "{{count}} непрочитанных"
-          many: "{{count}} непрочитанных"
-          other: "{{count}} непрочитанных"
+          one: "%{count} непрочитанная"
+          few: "%{count} непрочитанных"
+          many: "%{count} непрочитанных"
+          other: "%{count} непрочитанных"
       new:
         lower_title_with_count:
-          one: "{{count}} новая"
-          few: "{{count}} новых"
-          many: "{{count}} новых"
-          other: "{{count}} новых"
+          one: "%{count} новая"
+          few: "%{count} новых"
+          many: "%{count} новых"
+          other: "%{count} новых"
         lower_title: "новые"
         title: "Новые"
         title_with_count:
-          one: "Новая ({{count}})"
-          few: "Новые ({{count}})"
-          many: "Новые ({{count}})"
-          other: "Новые ({{count}})"
+          one: "Новая (%{count})"
+          few: "Новые (%{count})"
+          many: "Новые (%{count})"
+          other: "Новые (%{count})"
         help: "Темы, созданные за последние несколько дней"
       posted:
         title: "Мои"
@@ -3011,13 +3014,13 @@ ru:
         title: "Закладки"
         help: "Темы, которые вы добавили в закладки"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} ({{count}})"
-          few: "{{categoryName}} ({{count}})"
-          many: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
-        help: "Последние темы в разделе {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          few: "%{categoryName} (%{count})"
+          many: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "Последние темы в разделе %{categoryName}"
       top:
         title: "Обсуждаемые"
         help: "Самые активные темы за последний год, месяц, квартал, неделю или день"
@@ -3189,10 +3192,10 @@ ru:
       synonyms: "Синонимы"
       synonyms_description: "При использовании следующих тегов они будут заменены на <b>%{base_tag_name}</b>."
       tag_groups_info:
-        one: 'Этот тег принадлежит группе "{{tag_groups}}".'
-        few: "Этот тег принадлежит к этим группам: {{tag_groups}}."
-        many: "Этот тег принадлежит к этим группам: {{tag_groups}}."
-        other: "Этот тег принадлежит к этим группам: {{tag_groups}}."
+        one: 'Этот тег принадлежит группе "%{tag_groups}".'
+        few: "Этот тег принадлежит к этим группам: %{tag_groups}."
+        many: "Этот тег принадлежит к этим группам: %{tag_groups}."
+        other: "Этот тег принадлежит к этим группам: %{tag_groups}."
       category_restrictions:
         one: "Его можно использовать только в этом разделе:"
         few: "Их можно использовать только в этом разделе:"
@@ -3212,15 +3215,15 @@ ru:
       delete_tag: "Удалить тег"
       delete_confirm:
         one: "Вы действительно хотите удалить этот тег и удалить его из %{count} темы, которой он присвоен?"
-        few: "Вы действительно хотите удалить этот тег и удалить его из {{count}} тем, которым он присвоен?"
-        many: "Вы действительно хотите удалить этот тег и удалить его из {{count}} тем, которым он присвоен?"
-        other: "Вы действительно хотите удалить этот тег и удалить его из {{count}} тем, которым он присвоен?"
+        few: "Вы действительно хотите удалить этот тег и удалить его из %{count} тем, которым он присвоен?"
+        many: "Вы действительно хотите удалить этот тег и удалить его из %{count} тем, которым он присвоен?"
+        other: "Вы действительно хотите удалить этот тег и удалить его из %{count} тем, которым он присвоен?"
       delete_confirm_no_topics: "Вы действительно хотите удалить этот тег?"
       delete_confirm_synonyms:
         one: "Его синоним также будет удален."
-        few: "Его {{count}} синонимы также будут удалены."
-        many: "Его {{count}} синонимы также будут удалены."
-        other: "Его {{count}} синонимы также будут удалены."
+        few: "Его %{count} синонима также будут удалены."
+        many: "Его %{count} синонимов также будут удалены."
+        other: "Его %{count} синонимов также будут удалены."
       rename_tag: "Редактировать тег"
       rename_instructions: "Выберите новое название тега:"
       sort_by: "Сортировка:"
@@ -3303,7 +3306,7 @@ ru:
           bookmarks: "Больше нет тем в закладках."
     invite:
       custom_message: "Сделать приглашение немного более личным, написав <a href>сообщение пользователю</a>."
-      custom_message_placeholder: "Напишите сюда ваше личное сообщение"
+      custom_message_placeholder: "Напишите здесь ваше личное сообщение"
       custom_message_template_forum: "Привет. Подумал, что тебе будет интересно зарегистрироваться на этом форуме!"
       custom_message_template_topic: "Привет! Подумал, что тебя может заинтересовать эта тема!"
     forced_anonymous: "Из-за чрезмерной нагрузки, это временно показывается всем, как если бы пользователь вышел из системы."
@@ -3584,14 +3587,14 @@ ru:
           redeliver: "Возврат"
           incoming:
             one: "Есть новое событие."
-            few: "{{count}} новых события."
-            many: "{{count}} новых событий."
-            other: "{{count}} новых событий."
+            few: "%{count} новых события."
+            many: "%{count} новых событий."
+            other: "%{count} новых событий."
           completed_in:
             one: "Завершится через %{count} секунду."
-            few: "Завершится через {{count}} секунды."
-            many: "Завершится через {{count}} секунд."
-            other: "Завершится через {{count}} секунд."
+            few: "Завершится через %{count} секунды."
+            many: "Завершится через %{count} секунд."
+            other: "Завершится через %{count} секунд."
           request: "Запрос"
           response: "Ответ"
           redeliver_confirm: "Вы действительно хотите повторно отправить те же самые данные?"
@@ -3643,12 +3646,12 @@ ru:
           label: "Загрузить"
           title: "Загрузить копию на сервер"
           uploading: "Загрузка..."
-          uploading_progress: "Загрузка... {{progress}}%"
-          success: "'{{filename}}' успешно загружен. Файл теперь обрабатывается и займет минуту, чтобы его строки отразились в списке."
-          error: "При загрузке '{{filename}}' произошла ошибка: {{message}}"
+          uploading_progress: "Загрузка... %{progress}%"
+          success: "'%{filename}' успешно загружен. Обработка файла займет не более минуты, после чего его строки отобразятся в списке."
+          error: "При загрузке '%{filename}' произошла ошибка: %{message}"
         operations:
           is_running: "Операция в данный момент исполняется..."
-          failed: "{{operation}} провалилась. Пожалуйста, проверьте журнал регистрации."
+          failed: "%{operation} провалилась. Пожалуйста, проверьте журнал регистрации."
           cancel:
             label: "Отменить"
             title: "Отменить текущую операцию"
@@ -3771,7 +3774,7 @@ ru:
           disabled_component_tooltip: "Этот компонент отключен"
           default_theme_tooltip: "Эта тема является темой сайта по умолчанию "
           updates_available_tooltip: "Доступны обновления для этой темы"
-          and_x_more: "и более {{count}}."
+          and_x_more: "и более %{count}."
           collapse: Крах
           uploads: "Загрузки"
           no_uploads: "Вы можете загружать различные ресурсы для вашего стиля, такие как шрифты и изображения"
@@ -3820,8 +3823,8 @@ ru:
           disabled_by: "Этот компонент был отключен"
           required_version:
             error: "Эта тема была автоматически отключена, потому что она не совместима с этой версией Discourse."
-            minimum: "Требуется версия Discourse {{version}} или выше."
-            maximum: "Требуется версия Discourse {{version}} или ниже."
+            minimum: "Требуется версия Discourse %{version} или выше."
+            maximum: "Требуется версия Discourse %{version} или ниже."
           component_of: "Компонент:"
           update_to_latest: "Обновить"
           check_for_updates: "Проверить обновления"
@@ -3834,9 +3837,9 @@ ru:
           empty: "Нет элементов"
           commits_behind:
             one: "Тема находится на %{count} коммит сзади!"
-            few: "Тема находится на {{count}} коммита сзади!"
-            many: "Тема находится на {{count}} коммитов сзади!"
-            other: "Тема находится на {{count}} коммитов сзади!"
+            few: "Тема находится на %{count} коммита сзади!"
+            many: "Тема находится на %{count} коммитов сзади!"
+            other: "Тема находится на %{count} коммитов сзади!"
           compare_commits: "(Смотрите новые коммиты)"
           repo_unreachable: "Не удалось связаться с Git-репозиторием этой темы. Сообщение об ошибке:"
           imported_from_archive: "Эта тема была импортирована из .zip файла"
@@ -4243,8 +4246,8 @@ ru:
           title: "Открыть e-mail этого пользователя"
           text: "Показать"
       user:
-        suspend_failed: "Ошибка заморозки пользователя {{error}}"
-        unsuspend_failed: "Ошибка разморозки пользователя {{error}}"
+        suspend_failed: "Ошибка заморозки пользователя %{error}"
+        unsuspend_failed: "Ошибка разморозки пользователя %{error}"
         suspend_duration: "На сколько времени заморозить пользователя?"
         suspend_reason_label: "Причина заморозки? Данный текст <b>будет виден всем</b> на странице профиля пользователя и будет отображаться, когда пользователь попытается войти. Введите краткое описание."
         suspend_reason_hidden_label: "Почему вы замораживаете пользователя? Этот текст будет показан пользователю, когда он попытается войти в систему. Будьте краткими."
@@ -4631,6 +4634,7 @@ ru:
         title: "Иконки"
         help: "Добавить новые смайлики-emoji, которые будут доступны всем. (Подсказка: можно перетаскивать несколько файлов за раз)"
         add: "Добавить новую иконку"
+        uploading: "Загрузка..."
         name: "Название"
         group: "Группа"
         image: "Изображение"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index e2b5297f8c..53d6fbe725 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -25,8 +25,8 @@ sk:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}tis"
-        millions: "{{number}}mil"
+        thousands: "%{number}tis"
+        millions: "%{number}mil"
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
@@ -245,13 +245,13 @@ sk:
     every_hour: "každú hodinu"
     daily: "denne"
     weekly: "týždenne"
-    max_of_count: "najviac {{count}}"
+    max_of_count: "najviac %{count}"
     alternation: "alebo"
     character_count:
       one: "%{count} znak"
-      few: "{{count}} znakov"
-      many: "{{count}} znakov"
-      other: "{{count}} znakov"
+      few: "%{count} znakov"
+      many: "%{count} znakov"
+      other: "%{count} znakov"
     related_messages:
       title: "Príbuzné správy"
     suggested_topics:
@@ -298,20 +298,20 @@ sk:
         yes_value: "Áno, opustiť"
         no_value: "Nie, ponechať"
     topic_count_latest:
-      one: "Pozri si {{count}} novú alebo upravenú tému."
-      few: "Pozri si {{count}} nových alebo upravených tém."
-      many: "Pozri si {{count}} nových alebo upravených tém."
-      other: "Pozri si {{count}} nových alebo upravených tém."
+      one: "Pozri si %{count} novú alebo upravenú tému."
+      few: "Pozri si %{count} nových alebo upravených tém."
+      many: "Pozri si %{count} nových alebo upravených tém."
+      other: "Pozri si %{count} nových alebo upravených tém."
     topic_count_unread:
-      one: "Pozrieť {{count}} neprečítanú tému."
-      few: "Pozrieť {{count}} neprečítaných tém."
-      many: "Pozrieť {{count}} neprečítaných tém."
-      other: "Pozrieť {{count}} neprečítaných tém."
+      one: "Pozrieť %{count} neprečítanú tému."
+      few: "Pozrieť %{count} neprečítaných tém."
+      many: "Pozrieť %{count} neprečítaných tém."
+      other: "Pozrieť %{count} neprečítaných tém."
     topic_count_new:
-      one: "Pozrieť {{count}} novú tému."
-      few: "Pozrieť {{count}} nových tém."
-      many: "Pozrieť {{count}} nových tém."
-      other: "Pozrieť {{count}} nových tém."
+      one: "Pozrieť %{count} novú tému."
+      few: "Pozrieť %{count} nových tém."
+      many: "Pozrieť %{count} nových tém."
+      other: "Pozrieť %{count} nových tém."
     preview: "náhľad"
     cancel: "zrušiť"
     save: "Uložiť zmeny"
@@ -319,7 +319,7 @@ sk:
     saved: "Zmeny uložené."
     upload: "Upload"
     uploading: "Upload prebieha..."
-    uploading_filename: "Nahrávam: {{filename}}..."
+    uploading_filename: "Nahrávam: %{filename}..."
     clipboard: "schránka"
     uploaded: "Upload úspešne dokončený."
     pasting: "Vkladám..."
@@ -379,19 +379,19 @@ sk:
         description: "Váš príspevok sme obdžali, ale skôr než bude zverejnený musí byť schválený moderátorom. Prosíme o trpezlivosť."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> založil <a href='{{topicUrl}}'>tému</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Vy</a> ste založili <a href='{{topicUrl}}'>tému</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> odpovedal na <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Vy</a> ste odpovedali na <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> odpovedal na <a href='{{topicUrl}}'>tému</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Vy</a> ste odpovedali na<a href='{{topicUrl}}'>tému</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> zmienil <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> zmienil <a href='{{user2Url}}'>Vás</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Vy</a> ste zmienili <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Príspevok od <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Príspevok od <a href='{{userUrl}}'>Vás</a>"
-      sent_by_user: "Poslané od <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Poslané <a href='{{userUrl}}'>Vami</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> založil <a href='%{topicUrl}'>tému</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Vy</a> ste založili <a href='%{topicUrl}'>tému</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> odpovedal na <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Vy</a> ste odpovedali na <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> odpovedal na <a href='%{topicUrl}'>tému</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Vy</a> ste odpovedali na<a href='%{topicUrl}'>tému</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> zmienil <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> zmienil <a href='%{user2Url}'>Vás</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Vy</a> ste zmienili <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Príspevok od <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Príspevok od <a href='%{userUrl}'>Vás</a>"
+      sent_by_user: "Poslané od <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Poslané <a href='%{userUrl}'>Vami</a>"
     directory:
       filter_name: "filtrovať podľa používateľského mena"
       title: "Používatelia"
@@ -608,7 +608,7 @@ sk:
     user_fields:
       none: "(vyberte možnosť)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profil"
       mute: "Ignorovať"
       edit: "Upraviť nastavenia"
@@ -661,12 +661,12 @@ sk:
       external_links_in_new_tab: "Otvárať všekty externé odkazy na novej karte"
       enable_quoting: "Umožniť odpoveď s citáciou z označeného textu"
       change: "zmeniť"
-      moderator: "{{user}} je moderátor"
-      admin: "{{user}} je administrátor"
+      moderator: "%{user} je moderátor"
+      admin: "%{user} je administrátor"
       moderator_tooltip: "Tento používateľ je moderátor"
       admin_tooltip: "Tento používateľ je administrátor"
       silenced_tooltip: "Tento používateľ je umlčaný"
-      suspended_notice: "Tento používateľ je suspendovaný do {{date}}"
+      suspended_notice: "Tento používateľ je suspendovaný do %{date}"
       suspended_permanently: "Tento používateľ je suspendovaný"
       suspended_reason: "Dôvod:"
       github_profile: "Github"
@@ -681,7 +681,7 @@ sk:
           Stíšené témy a kategórie nie sú v týchto emailoch zahrnuté.
         individual: "Pošli email pri každom novom príspevku"
         individual_no_echo: "Pošli email pri každom novom príspevku okrem vlastných."
-        many_per_day: "Pošli mi email pri každom novom príspevku (cca {{dailyEmailEstimate}} denne)"
+        many_per_day: "Pošli mi email pri každom novom príspevku (cca %{dailyEmailEstimate} denne)"
         few_per_day: "Pošli mi email pri každom novom príspevku (cca 2 denne)"
         warning: "Režim mailing listu zapnutý. Nastavenia emailových notifikácií sú ignorované."
       tag_settings: "Štítky"
@@ -709,7 +709,6 @@ sk:
       admin_delete: "Vymazať"
       users: "Používatelia"
       muted_users: "Ignorovaní"
-      muted_users_instructions: "Pozastaviť všetky notifikácie od týchto používateľov."
       tracked_topics_link: "Zobraziť"
       automatically_unpin_topics: "Automaticky zrušiť pripnutie témy ak sa dočítam na koniec."
       apps: "Appky"
@@ -764,7 +763,7 @@ sk:
         enable_long: "Povoliť kódy zálohy"
         copy_to_clipboard_error: "Chyba pri kopírovaní dát do schránky"
         copied_to_clipboard: "Skopírované do schránky"
-        remaining_codes: "Zostáva vám <strong>{{count}}</strong> kódov zálohy."
+        remaining_codes: "Zostáva vám <strong>%{count}</strong> kódov zálohy."
         codes:
           title: "Záložné kódy vygenerované"
           description: "Každý z týchto záložných kódov sa môže použiť iba raz. Uložte si ich bezpečne, no, aby Vám boli dostupné"
@@ -814,13 +813,13 @@ sk:
         no_secondary: "Žiadne sekundárne e-maily"
         ok: "Pošleme vám email pre potvrdenie"
         invalid: "Zadajte prosím platný email"
-        authenticated: "Váš email bude autentifikovaný pomocou {{provider}}"
+        authenticated: "Váš email bude autentifikovaný pomocou %{provider}"
         frequency_immediately: "Odošleme vám email ak ste neprečítali to, čo vám posielame emailom."
         frequency:
           one: "Odošleme vám email iba ak sme vás nevideli poslednú minútu"
-          few: "Odošleme vám email iba ak sme vás nevideli posledné {{count}} minúty."
-          many: "Odošleme vám email iba ak sme vás nevideli posledných {{count}} minút"
-          other: "Odošleme vám email iba ak sme vás nevideli posledných {{count}} minút"
+          few: "Odošleme vám email iba ak sme vás nevideli posledné %{count} minúty."
+          many: "Odošleme vám email iba ak sme vás nevideli posledných %{count} minút"
+          other: "Odošleme vám email iba ak sme vás nevideli posledných %{count} minút"
       associated_accounts:
         connect: "Pripojiť"
         revoke: "Odobrať"
@@ -835,9 +834,9 @@ sk:
       username:
         title: "Používateľské meno"
         instructions: "unikátne, bez medzier, krátke"
-        short_instructions: "Ostatní vás môžu zmieniť ako @{{username}}"
+        short_instructions: "Ostatní vás môžu zmieniť ako @%{username}"
         available: "Vaše používateľské meno je voľné"
-        not_available: "Nie je k dispozícii. Skúste {{suggestion}}?"
+        not_available: "Nie je k dispozícii. Skúste %{suggestion}?"
         not_available_no_suggestion: "Nedostupné"
         too_short: "Vaše používateľské meno je prikrátke"
         too_long: "Vaše používateľské meno je pridlhé"
@@ -920,16 +919,16 @@ sk:
         none: "Nemáte žiadne pozvánky na zobrazenie."
         truncated:
           one: "Zobrazuje sa prvá pozvánka."
-          few: "Zobrazujú sa prvé {{count}} pozvánky."
-          many: "Zobrazuje sa prvých {{count}} pozvánok."
-          other: "Zobrazuje sa prvých {{count}} pozvánok."
+          few: "Zobrazujú sa prvé %{count} pozvánky."
+          many: "Zobrazuje sa prvých %{count} pozvánok."
+          other: "Zobrazuje sa prvých %{count} pozvánok."
         redeemed: "Využité pozvánky"
         redeemed_tab: "Využité"
-        redeemed_tab_with_count: "Využité ({{count}})"
+        redeemed_tab_with_count: "Využité (%{count})"
         redeemed_at: "Využitá"
         pending: "Čakajúce pozvánky"
         pending_tab: "Čakajúce"
-        pending_tab_with_count: "Čakajúce ({{count}})"
+        pending_tab_with_count: "Čakajúce (%{count})"
         topics_entered: "Zobrazených tém"
         posts_read_count: "Prečítaných príspevkov"
         expired: "Táto pozvánka vypršala."
@@ -943,12 +942,16 @@ sk:
         time_read: "Doba čítania"
         days_visited: "Dní na stránke"
         account_age_days: "Vek účtu v dňoch"
-        create: "Poslať pozvánku"
+        links_tab: "Odkazy"
+        link_created_at: "Vytvorené"
+        link_groups: Skupiny
+        create: "Pošli pozvánku"
         generate_link: "Kopírovať Odkaz Pozvánky"
         link_generated: "Pozývací link bol úspešne vygenerovaný!"
         valid_for: "Pozývací link je platný len pre túto emailovú adresu: %{email}"
+        invite_link:
+          success: "Pozývací link bol úspešne vygenerovaný!"
         bulk_invite:
-          text: "Hromadná pozvánka zo súboru"
           success: "Súbor bol úspešne odoslaný. Keď sa nahrávanie dokončí, budete na to upozornený cez správu."
           error: "Prepáčte, súbor musí byť v CSV formáte."
       password:
@@ -1038,7 +1041,7 @@ sk:
       desc:
         network: "Skontrolujte, prosím, svoje pripojenie."
         network_fixed: "Zdá sa, že sme späť."
-        server: "Kód chyby: {{status}}"
+        server: "Kód chyby: %{status}"
         forbidden: "Nemáte oprávnenie na zobrazenie."
         not_found: "Hopla, aplikácia sa pokúsila načítať adresu, ktorá neexistuje."
         unknown: "Niečo sa pokazilo."
@@ -1085,8 +1088,8 @@ sk:
       hidden_for_session: "Fajn, opýtam sa vás to zajtra. Stále môžete na vytvorenie účtu použiť aj možnosť 'Prihlásenie'."
     summary:
       enabled_description: "Pozeráte sa na zhrnutie tejto témy: najzaujímavejšie príspevky podľa výberu komunity."
-      description: "<b>{{replyCount}}</b> odpovedí."
-      description_time: "<b>{{replyCount}}</b> odpovedí s odhadovaným časom čítania <b>{{readingTime}} minút</b>."
+      description: "<b>%{replyCount}</b> odpovedí."
+      description_time: "<b>%{replyCount}</b> odpovedí s odhadovaným časom čítania <b>%{readingTime} minút</b>."
       enable: "Zhrnutie tejto témy"
       disable: "Zobraziť všetky príspevky"
     deleted_filter:
@@ -1098,8 +1101,8 @@ sk:
       title: "Správa"
       invite: "Pozvať ďalších"
       edit: "Pridať alebo odobrať"
-      remove_allowed_user: "Skutočne chcete odstrániť {{name}} z tejto správy?"
-      remove_allowed_group: "Skutočne chcete odstrániť {{name}} z tejto správy?"
+      remove_allowed_user: "Skutočne chcete odstrániť %{name} z tejto správy?"
+      remove_allowed_group: "Skutočne chcete odstrániť %{name} z tejto správy?"
     email: "Email"
     username: "Používateľské meno"
     last_seen: "Videné"
@@ -1146,14 +1149,14 @@ sk:
       awaiting_activation: "Váš účet čaká na aktiváciu. Ak chcete zaslať aktivačný e-mail znova, použite odkaz pre zabudnuté heslo."
       awaiting_approval: "Váš účet zatiaľ nebol schválený členom tímu. Keď bude schválený, dostanete e-mail."
       requires_invite: "Ľutujeme, ale prístup k tomuto fóru majú iba pozvaní používatelia."
-      not_activated: "Systém vás nemôže prihlásiť. Na emailovú adresu <b>{{sentTo}}</b> sme vám poslali aktivačný email. Prosím, postupujte podľa inštrukcií na aktiváciu účtu, ktoré sú uvedené v tomto emaile."
+      not_activated: "Systém vás nemôže prihlásiť. Na emailovú adresu <b>%{sentTo}</b> sme vám poslali aktivačný email. Prosím, postupujte podľa inštrukcií na aktiváciu účtu, ktoré sú uvedené v tomto emaile."
       not_allowed_from_ip_address: "Nie je možné prihlásenie z tejto IP adresy."
       admin_not_allowed_from_ip_address: "Nie je možné prihlásenie ako admin z tejto IP adresy."
       resend_activation_email: "Kliknite sem pre opätovné odoslanie aktivačného emailu."
       resend_title: "Znova poslať aktivačný email."
       change_email: "Zmeniť emailovú adresu"
       submit_new_email: "Aktualizovať emailovú adresu"
-      sent_activation_email_again: "Odoslali sme vám ďalší aktivačný email na <b>{{currentEmail}}</b>. Môže trvať niekoľko minút kým príde; pre istotu si skontrolujte spamový priečinok."
+      sent_activation_email_again: "Odoslali sme vám ďalší aktivačný email na <b>%{currentEmail}</b>. Môže trvať niekoľko minút kým príde; pre istotu si skontrolujte spamový priečinok."
       to_continue: "Prosím, prihláste sa"
       preferences: "Na zmenu používateľských nastavení musíte byť prihlásený."
       forgot: "Nepamätám si detaily môjho účtu"
@@ -1218,15 +1221,15 @@ sk:
       similar_topics: "Vaša téma je podobná..."
       drafts_offline: "offline koncepty"
       group_mentioned:
-        one: "Zmienením {{group}}, upozorníte <a href='{{group_link}}'>%{count} človeka</a> – ste si istý?"
-        few: "Zmienením {{group}}, upozorníte <a href='{{group_link}}'>{{count}} ľudí</a> – ste si istý?"
-        many: "Zmienením {{group}}, upozorníte <a href='{{group_link}}'>{{count}} ľudí</a> – ste si istý?"
-        other: "Zmienením {{group}}, upozorníte <a href='{{group_link}}'>{{count}} ľudí</a> – ste si istý?"
+        one: "Zmienením %{group}, upozorníte <a href='%{group_link}'>%{count} človeka</a> – ste si istý?"
+        few: "Zmienením %{group}, upozorníte <a href='%{group_link}'>%{count} ľudí</a> – ste si istý?"
+        many: "Zmienením %{group}, upozorníte <a href='%{group_link}'>%{count} ľudí</a> – ste si istý?"
+        other: "Zmienením %{group}, upozorníte <a href='%{group_link}'>%{count} ľudí</a> – ste si istý?"
       error:
         title_missing: "Názov je povinný"
-        title_too_short: "Názov musí mať minimálne {{min}} znakov"
-        title_too_long: "Názov nesmie byť dlhší než {{max}} znakov"
-        post_length: "Príspevok musí mať minimálne {{min}} znakov"
+        title_too_short: "Názov musí mať minimálne %{min} znakov"
+        title_too_long: "Názov nesmie byť dlhší než %{max} znakov"
+        post_length: "Príspevok musí mať minimálne %{min} znakov"
         category_missing: "Musíte vybrať kategóriu"
       save_edit: "Uložiť úpravy"
       reply_original: "Odpovedať na pôvodnú tému"
@@ -1286,12 +1289,12 @@ sk:
       none: "Notifikácie sa nepodarilo načítať"
       empty: "Žiadne upozornenia sa nenašli."
       popup:
-        mentioned: '{{username}} Vás zmienil v "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} Vás zmienil v "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} vás citoval v "{{topic}}" - {{site_title}}'
-        replied: '{{username}} vám odpovedal v "{{topic}}" - {{site_title}}'
-        posted: '{{username}} prispel v "{{topic}}" - {{site_title}}'
-        linked: '{{username}} odkázal na váš príspevok z "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} Vás zmienil v "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} Vás zmienil v "%{topic}" - %{site_title}'
+        quoted: '%{username} vás citoval v "%{topic}" - %{site_title}'
+        replied: '%{username} vám odpovedal v "%{topic}" - %{site_title}'
+        posted: '%{username} prispel v "%{topic}" - %{site_title}'
+        linked: '%{username} odkázal na váš príspevok z "%{topic}" - %{site_title}'
       titles:
         watching_first_post: "nová téma"
     upload_selector:
@@ -1300,9 +1303,9 @@ sk:
       from_my_computer: "Z počítača"
       from_the_web: "Z webu"
       remote_tip: "odkaz na obrázok"
-      remote_tip_with_attachments: "odkaz na obrázok alebo súbor {{authorized_extensions}}"
+      remote_tip_with_attachments: "odkaz na obrázok alebo súbor %{authorized_extensions}"
       local_tip: "zvoľte obrázok z vášho počítača"
-      local_tip_with_attachments: "zvoľte obrázok alebo súbor z vášho počítača {{authorized_extensions}}"
+      local_tip_with_attachments: "zvoľte obrázok alebo súbor z vášho počítača %{authorized_extensions}"
       hint: "(môžete taktiež potiahnuť a pustiť do editora pre nahratie)"
       hint_for_supported_browsers: "môžete taktiež potiahnuť a pustiť alebo priložiť obrázky do editora"
       uploading: "Nahrávanie"
@@ -1322,13 +1325,13 @@ sk:
       no_results: "Žiadne výsledky"
       no_more_results: "Nenašlo sa viac výsledkov"
       searching: "Vyhľadávam....."
-      post_format: "#{{post_number}} podľa {{username}}"
+      post_format: "#%{post_number} podľa %{username}"
       cant_find: "Nemôžete nájsť to čo hľadáte?"
       search_google_button: "Google"
       search_google_title: "Prehľadať tieto stránky"
       context:
-        user: "Vyhľadávanie podľa @{{username}}"
-        category: "Vyhľadať kategóriu #{{category}}"
+        user: "Vyhľadávanie podľa @%{username}"
+        category: "Vyhľadať kategóriu #%{category}"
         topic: "Hľadaj v tejto téme"
         private_messages: "Hľadaj správy"
       advanced:
@@ -1386,9 +1389,9 @@ sk:
         choose_new_category: "Vyberte pre tému novú kategóriu:"
         selected:
           one: "Označíli ste <b>%{count}</b> tému."
-          few: "Označíli ste <b>{{count}}</b> tém.y"
-          many: "Označíli ste <b>{{count}}</b> tém."
-          other: "Označíli ste <b>{{count}}</b> tém."
+          few: "Označíli ste <b>%{count}</b> tém.y"
+          many: "Označíli ste <b>%{count}</b> tém."
+          other: "Označíli ste <b>%{count}</b> tém."
         choose_new_tags: "Vyberte pre tému nové štítky:"
         changed_tags: "Štítky tém boli zmenené."
       none:
@@ -1398,7 +1401,7 @@ sk:
         posted: "Nanapísali ste ešte žiadnu tému."
         latest: "Nie sú žiadne nové témy. To je smutné."
         bookmarks: "Nemáte zatiaľ žiadne témy v záložkách."
-        category: "V kategórii {{category}} nie je žiadna téma"
+        category: "V kategórii %{category} nie je žiadna téma"
         top: "Nie sú žiadne populárne témy."
         educate:
           new: '<p>Tu sa zobrazia Vaše nové témy.</p><p>V predvolenom nastavení sú témy považované za nové a zobrazí indikátor <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">nové</span> ak boli vytvorené za posledné 2 dni.</p><p>Môžete to zmeniť vo Vašich <a href="%{userPrefsUrl}">nastaveniach</a>.</p>'
@@ -1409,15 +1412,15 @@ sk:
         read: "Žiadne ďalšie prečítané témy."
         new: "Žiadne nové témy."
         unread: "Žiadne ďalšie neprečítané témy."
-        category: "Žiadne ďalšie témy v {{category}}."
+        category: "Žiadne ďalšie témy v %{category}."
         top: "Nie je už viac poulárnych tém"
         bookmarks: "Žiadne ďalšie témy v záložkách."
     topic:
       filter_to:
         one: "%{count} príspevok k téme"
-        few: "{{count}} príspevky k téme"
-        many: "{{count}} príspevkov k téme"
-        other: "{{count}} príspevkov k téme"
+        few: "%{count} príspevky k téme"
+        many: "%{count} príspevkov k téme"
+        other: "%{count} príspevkov k téme"
       create: "Nová téma"
       create_long: "Vytvoriť novú tému"
       private_message: "Vytvoríť správu"
@@ -1436,14 +1439,14 @@ sk:
       unread: "neprečítané"
       new_topics:
         one: "%{count} nová téma"
-        few: "{{count}} nové témy"
-        many: "{{count}} nových tém"
-        other: "{{count}} nových tém"
+        few: "%{count} nové témy"
+        many: "%{count} nových tém"
+        other: "%{count} nových tém"
       unread_topics:
         one: "%{count} neprečítaná téma"
-        few: "{{count}} neprečítané témy"
-        many: "{{count}} neprečítaných tém"
-        other: "{{count}} neprečítaných tém"
+        few: "%{count} neprečítané témy"
+        many: "%{count} neprečítaných tém"
+        other: "%{count} neprečítaných tém"
       title: "Témy"
       invalid_access:
         title: "Téma je súkromná"
@@ -1457,30 +1460,30 @@ sk:
         description: "Ľutujeme, hľadaná téma nebola nájdená. Možno bola odstránená moderátorom?"
       total_unread_posts:
         one: "máte %{count} neprečítaný príspevok k tejto téme"
-        few: "máte {{count}} neprečítanépríspevky k tejto téme"
-        many: "máte {{count}} neprečítaných príspevkov k tejto téme"
-        other: "máte {{count}} neprečítaných príspevkov k tejto téme"
+        few: "máte %{count} neprečítanépríspevky k tejto téme"
+        many: "máte %{count} neprečítaných príspevkov k tejto téme"
+        other: "máte %{count} neprečítaných príspevkov k tejto téme"
       unread_posts:
         one: "máte %{count} starší neprečítaný príspevok k tejto téme"
-        few: "máte {{count}} staršie neprečítané príspevky k tejto téme"
-        many: "máte {{count}} starších neprečítaných príspevkov k tejto téme"
-        other: "máte {{count}} starších neprečítaných príspevkov k tejto téme"
+        few: "máte %{count} staršie neprečítané príspevky k tejto téme"
+        many: "máte %{count} starších neprečítaných príspevkov k tejto téme"
+        other: "máte %{count} starších neprečítaných príspevkov k tejto téme"
       new_posts:
         one: "pribudol %{count} nový príspevok odkedy ste čítali túto tému naposledy "
-        few: "pribudlo {{count}} nové príspevky odkedy ste čítali túto tému naposledy "
-        many: "pribudlo {{count}} nových príspevkov odkedy ste čítali túto tému naposledy "
-        other: "pribudlo {{count}} nových príspevkov odkedy ste čítali túto tému naposledy "
+        few: "pribudlo %{count} nové príspevky odkedy ste čítali túto tému naposledy "
+        many: "pribudlo %{count} nových príspevkov odkedy ste čítali túto tému naposledy "
+        other: "pribudlo %{count} nových príspevkov odkedy ste čítali túto tému naposledy "
       likes:
         one: "v tejto téme je jedo \"Páči sa\""
-        few: "v tejto téme je {{count}} \"Páči sa\""
-        many: "v tejto téme je {{count}} \"Páči sa\""
-        other: "v tejto téme je {{count}} \"Páči sa\""
+        few: "v tejto téme je %{count} \"Páči sa\""
+        many: "v tejto téme je %{count} \"Páči sa\""
+        other: "v tejto téme je %{count} \"Páči sa\""
       back_to_list: "Naspäť na zoznam tém"
       options: "Možnosti tém"
       show_links: "zobrazovať odkazy v tejto téme"
       toggle_information: "zmeniť detaily témy"
-      read_more_in_category: "Chcete si prečítať viac? Prezrite si témy v {{catLink}} alebo v {{latestLink}}."
-      read_more: "Chcete si prečítať viac? {{catLink}} alebo v {{latestLink}}."
+      read_more_in_category: "Chcete si prečítať viac? Prezrite si témy v %{catLink} alebo v %{latestLink}."
+      read_more: "Chcete si prečítať viac? %{catLink} alebo v %{latestLink}."
       read_more_MF: "Máte { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 neprečítanú</a> } other { <a href='{basePath}/unread'># neprečítané</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{a} false { } other{}} <a href='{basePath}/new'>1 novú</a> tému} other { {BOTH, select, true{a } false {} other{}} <a href='{basePath}/new'># nových</a> tém} } na prečítanie, prípadne {CATEGORY, select, true {si pozrite iné témy v {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Prezrieť všetky kategórie
       view_latest_topics: zobraziť najnošie témy
@@ -1607,29 +1610,29 @@ sk:
         success_message: "Úspešne ste označili tému."
       feature_topic:
         title: "Vyzdvihni túto tému"
-        pin: "Zobrazuj túto tému na vrchu {{categoryLink}} kategórie do"
-        confirm_pin: "Máte už {{count}} pripnutých tém. Príliš veľa pripnutých tém môže byť na príťaž pre nových a anonymných používateľov. Ste si istý že chcete pripnúť ďalšiu tému v tejto kategórii?"
-        unpin: "Zruš túto tému z vrcholu kategórie {{categoryLink}} . "
-        unpin_until: "Zruš túto tému z vrcholu kategórie {{categoryLink}} , alebo počkaj do <strong>%{until}</strong>."
+        pin: "Zobrazuj túto tému na vrchu %{categoryLink} kategórie do"
+        confirm_pin: "Máte už %{count} pripnutých tém. Príliš veľa pripnutých tém môže byť na príťaž pre nových a anonymných používateľov. Ste si istý že chcete pripnúť ďalšiu tému v tejto kategórii?"
+        unpin: "Zruš túto tému z vrcholu kategórie %{categoryLink} . "
+        unpin_until: "Zruš túto tému z vrcholu kategórie %{categoryLink} , alebo počkaj do <strong>%{until}</strong>."
         pin_note: "Užívatelia si môžu sami odopnúť tému "
         pin_validation: "Dátum je vyžadovaný k pripnutiu tejto témy."
-        not_pinned: "V {{categoryLink}} nie sú pripnuté žiadne témy."
+        not_pinned: "V %{categoryLink} nie sú pripnuté žiadne témy."
         already_pinned:
-          one: "Téma pripnutá k {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          few: "Témy pripnuté ku {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "Tém pripnutých k {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Tém pripnutých k {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Téma pripnutá k %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          few: "Témy pripnuté ku %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          many: "Tém pripnutých k %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Tém pripnutých k %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Zobrazuj túto tému na vrchu všetkých zoznamov tém do"
-        confirm_pin_globally: "Máte už {{count}} globálne pripnutých tém. Príliš veľa pripnutých tém môže byť na príťaž pre nových a anonymných používateľov. Ste si istý že chcete pripnúť ďalšiu globálnu tému?"
+        confirm_pin_globally: "Máte už %{count} globálne pripnutých tém. Príliš veľa pripnutých tém môže byť na príťaž pre nových a anonymných používateľov. Ste si istý že chcete pripnúť ďalšiu globálnu tému?"
         unpin_globally: "Zruš túto tému z vrcholu všetkých zoznamov tém. "
         unpin_globally_until: "Zruš túto tému z vrcholu všetkých zoznamov tém, alebo počkaj do <strong>%{until}</strong>."
         global_pin_note: "Užívatelia si môžu sami odopnúť tému."
         not_pinned_globally: "Nie sú pripnuté žiadne globálne témy."
         already_pinned_globally:
           one: "Globálne pripnutá téma : <strong class='badge badge-notification unread'>%{count}</strong>"
-          few: "Globálne pripnuté témy : <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "Globálne pripnutých tém : <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Globálne pripnutých tém : <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: "Globálne pripnuté témy : <strong class='badge badge-notification unread'>%{count}</strong>"
+          many: "Globálne pripnutých tém : <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Globálne pripnutých tém : <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Spraviť z tejto témy baner, ktorý sa zobrazí navrchu každej stránky."
         remove_banner: "Odstrániť baner, ktorý sa zobrazuje navrchu každej stránky."
         banner_note: "Užívatelia môžu banner kedykoľvek zrušiť. Bannerom môže byť v jednom momente len jedna téma."
@@ -1658,16 +1661,16 @@ sk:
         to_topic_username: "Zadali ste používateľské meno. Pošleme mu pozvánku s odkazom na túto tému."
         to_username: "Zadajte používateľské meno osoby, ktorú chcete pozvať. Pošleme mu pozvánku s odkazom na túto tému."
         email_placeholder: "name@example.com"
-        success_email: "Poslali sme email s pozvánkou na <b>{{emailOrUsername}}</b>. Upozorníme vas keď bude pozvánka použítá. Svoje pozvánky môžete sledovať na karte pozvánok vo svojom používateľskom profile."
+        success_email: "Poslali sme email s pozvánkou na <b>%{emailOrUsername}</b>. Upozorníme vas keď bude pozvánka použítá. Svoje pozvánky môžete sledovať na karte pozvánok vo svojom používateľskom profile."
         success_username: "Pozvali sme tohoto používateľa aby sa podieľal na tejto téme."
         error: "Ľutujeme, nepodarilo sa nám pozvať túto osobu. Nebola už náhodou pozvaná? (Počet opakovaných pozvánok je obmedzený)"
       login_reply: "Príhláste sa ak chcete odpovedať"
       filters:
         n_posts:
           one: "%{count} príspevok"
-          few: "{{count}} príspevky"
-          many: "{{count}} príspevkov"
-          other: "{{count}} príspevkov"
+          few: "%{count} príspevky"
+          many: "%{count} príspevkov"
+          other: "%{count} príspevkov"
         cancel: "Zruš filter"
       split_topic:
         title: "Presuň na novú tému"
@@ -1676,18 +1679,18 @@ sk:
         error: "Nastala chyba pri presune príspevku na novú tému."
         instructions:
           one: "Vytvárate novú tému do ktorej bude vložený príspevok, ktorý ste označili. "
-          few: "Vytvárate novú tému do ktorej bude vložených <b>{{count}}</b> príspevkov, ktoré ste označili. "
-          many: "Vytvárate novú tému do ktorej budú vložené <b>{{count}}</b> príspevky, ktoré ste označili. "
-          other: "Vytvárate novú tému do ktorej budú vložené <b>{{count}}</b> príspevky, ktoré ste označili. "
+          few: "Vytvárate novú tému do ktorej bude vložených <b>%{count}</b> príspevkov, ktoré ste označili. "
+          many: "Vytvárate novú tému do ktorej budú vložené <b>%{count}</b> príspevky, ktoré ste označili. "
+          other: "Vytvárate novú tému do ktorej budú vložené <b>%{count}</b> príspevky, ktoré ste označili. "
       merge_topic:
         title: "Presuň do existujúcej témy."
         action: "presuň do existujúcej témy"
         error: "Nastala chyba pri presune príspevku do tejto témy."
         instructions:
           one: "Prosím vyberte tému do ktorej chcete presunúť tento príspevok."
-          few: "Prosím vyberte tému do ktorej chcete presunúť tieto <b>{{count}}</b> príspevky."
-          many: "Prosím vyberte tému do ktorej chcete presunúť týchto <b>{{count}}</b> príspevkov."
-          other: "Prosím vyberte tému do ktorej chcete presunúť týchto <b>{{count}}</b> príspevkov."
+          few: "Prosím vyberte tému do ktorej chcete presunúť tieto <b>%{count}</b> príspevky."
+          many: "Prosím vyberte tému do ktorej chcete presunúť týchto <b>%{count}</b> príspevkov."
+          other: "Prosím vyberte tému do ktorej chcete presunúť týchto <b>%{count}</b> príspevkov."
       move_to_new_message:
         radio_label: "Nová správa"
       merge_posts:
@@ -1704,7 +1707,7 @@ sk:
         instructions: "Prosím vyberte novú časovú značku témy. Príspevky k téme budu aktualizované so zachovaním časoveho rozdielu."
       multi_select:
         select: "označ"
-        selected: "označených ({{count}})"
+        selected: "označených (%{count})"
         select_post:
           label: "vybrať"
         selected_post:
@@ -1717,16 +1720,16 @@ sk:
         deselect_all: odznač všetko
         description:
           one: Označili ste <b>%{count}</b> príspevok
-          few: "Označili ste <b>{{count}}</b> príspevky"
-          many: "Označili ste <b>{{count}}</b> príspevkov"
-          other: "Označili ste <b>{{count}}</b> príspevkov"
+          few: "Označili ste <b>%{count}</b> príspevky"
+          many: "Označili ste <b>%{count}</b> príspevkov"
+          other: "Označili ste <b>%{count}</b> príspevkov"
     post:
       quote_reply: "Citácia"
       edit_reason: "Dôvod:"
-      post_number: "príspevok {{number}}"
+      post_number: "príspevok %{number}"
       last_edited_on: "príspevok naposledy upravený"
       reply_as_new_topic: "Odpoveď ako súvisiaca téma"
-      continue_discussion: "Pokračovanie diskusie z {{postLink}}:"
+      continue_discussion: "Pokračovanie diskusie z %{postLink}:"
       follow_quote: "prejsť na citovaný príspevok"
       show_full: "Zobraziť celý príspevok"
       deleted_by_author:
@@ -1737,31 +1740,32 @@ sk:
       expand_collapse: "rozbaliť/zbaliť"
       gap:
         one: "zobraziť skrytú odpoveď"
-        few: "zobraziť {{count}} skryté odpovede"
-        many: "zobraziť {{count}} skrytých odpovedí"
-        other: "zobraziť {{count}} skrytých odpovedí"
+        few: "zobraziť %{count} skryté odpovede"
+        many: "zobraziť %{count} skrytých odpovedí"
+        other: "zobraziť %{count} skrytých odpovedí"
       unread: "Príspevok je neprečítaný."
       has_replies:
-        one: "{{count}} Odpoveď"
-        few: "{{count}} Odpovede"
-        many: "{{count}} Odpovedí"
-        other: "{{count}} Odpovedí"
+        one: "%{count} Odpoveď"
+        few: "%{count} Odpovede"
+        many: "%{count} Odpovedí"
+        other: "%{count} Odpovedí"
       has_likes_title:
         one: "Tento príspevok sa páčil jedej osobe"
-        few: "Tento príspevok sa páčil {{count}} ľuďom"
-        many: "Tento príspevok sa páčil {{count}} ľuďom"
-        other: "Tento príspevok sa páčil {{count}} ľuďom"
+        few: "Tento príspevok sa páčil %{count} ľuďom"
+        many: "Tento príspevok sa páčil %{count} ľuďom"
+        other: "Tento príspevok sa páčil %{count} ľuďom"
       has_likes_title_only_you: "tento príspevok sa Vám páči"
       has_likes_title_you:
         one: "Tento príspevok sa páčil Vám a jednej ďalšej osobe"
-        few: "Tento príspevok sa páčil Vám a ďalším {{count}} ľuďom"
-        many: "Tento príspevok sa páčil Vám a ďalším {{count}} ľuďom"
-        other: "Tento príspevok sa páčil Vám a ďalším {{count}} ľuďom"
+        few: "Tento príspevok sa páčil Vám a ďalším %{count} ľuďom"
+        many: "Tento príspevok sa páčil Vám a ďalším %{count} ľuďom"
+        other: "Tento príspevok sa páčil Vám a ďalším %{count} ľuďom"
       errors:
         create: "Ľutujeme, pri vytváraní príspevku nastala chyba. Prosím, skúste znovu."
         edit: "Ľutujeme, pri úprave príspevku nastala chyba. Prosím, skúste znovu."
         upload: "Ľutujeme, pri nahrávaní súboru nastala chyba. Prosím, skúste znovu."
         too_many_uploads: "Ľutujeme, ale naraz je možné nahrať iba jeden súbor."
+        upload_not_authorized: "Ľutujeme, súbor, ktorý sa pokúšate nahrať nemá povolenú príponu (povolené prípony sú: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Ľutujeme, noví použivatelia nemôžu nahrávať obrázky."
         attachment_upload_not_allowed_for_new_user: "Ľutujeme, noví používatelia nemôžu nahrávať prílohy."
         attachment_download_requires_login: "Ľutujeme, pre stiahnutie príloh musíte byť prihlásený."
@@ -1948,14 +1952,14 @@ sk:
       custom_message:
         more:
           one: "ešte %{count} ..."
-          few: "ešte {{count}} ..."
-          many: "ešte {{count}} ..."
-          other: "ešte {{count}} ..."
+          few: "ešte %{count} ..."
+          many: "ešte %{count} ..."
+          other: "ešte %{count} ..."
         left:
           one: "%{count} zostáva"
-          few: "{{count}} zostávajú"
-          many: "{{count}} zostáva"
-          other: "{{count}} zostáva"
+          few: "%{count} zostávajú"
+          many: "%{count} zostáva"
+          other: "%{count} zostáva"
     flagging_topic:
       title: "Ďakujeme, že pomáhate udržiavať slušnosť v našej komunite!"
       action: "Označ príspevok"
@@ -1999,7 +2003,7 @@ sk:
       unlisted:
         help: "Táto téma je skrytá. Nebude zobrazená v zozname tém a prístup k nej bude možný len prostrednictvom priameho odkazu na ňu"
     posts: "Príspevky"
-    posts_long: "v tejto téme je {{number}} príspevkov"
+    posts_long: "v tejto téme je %{number} príspevkov"
     posts_likes_MF: |2
 
       Táto téma obsahuje {count, plural, one {1 odpoveď} other {# odpovedí}} {ratio, select,
@@ -2026,7 +2030,7 @@ sk:
       few: "\"Páči sa\""
       many: "\"Páči sa\""
       other: "\"Páči sa\""
-    likes_long: "v tejto téme je {{number}} \"Páči sa\""
+    likes_long: "v tejto téme je %{number} \"Páči sa\""
     users: "Používatelia"
     users_lowercase:
       one: "používateľ"
@@ -2035,7 +2039,7 @@ sk:
       other: "používateľov"
     category_title: "Kategória"
     history: "História"
-    changed_by: "od {{author}}"
+    changed_by: "od %{author}"
     raw_email:
       not_available: "Nedostupné!"
     categories_list: "Zoznam kategórií"
@@ -2046,43 +2050,43 @@ sk:
         title: "Najnovšie"
         title_with_count:
           one: "Posledný (%{count})"
-          few: "Posledné ({{count}})"
-          many: "Posledných ({{count}})"
-          other: "Posledných ({{count}})"
+          few: "Posledné (%{count})"
+          many: "Posledných (%{count})"
+          other: "Posledných (%{count})"
         help: "témy s nedávnymi príspevkami"
       read:
         title: "Prečítaná"
         help: "prečítané témy, zoradené podľa času ich prečítania"
       categories:
         title: "Kategórie"
-        title_in: "Kategória - {{categoryName}}"
+        title_in: "Kategória - %{categoryName}"
         help: "všetky témy zoskupené podľa kategórie"
       unread:
         title: "Neprečítané"
         title_with_count:
           one: "Neprečítaná (%{count})"
-          few: "Neprečítané ({{count}})"
-          many: "Neprečítaných ({{count}})"
-          other: "Neprečítaných ({{count}})"
+          few: "Neprečítané (%{count})"
+          many: "Neprečítaných (%{count})"
+          other: "Neprečítaných (%{count})"
         help: "témy ktorých neprečítané príspevky v súčastnosti sledujete alebo pozorujete "
         lower_title_with_count:
           one: "%{count} neprečítaná"
-          few: "{{count}} neprečítané"
-          many: "{{count}} neprečítaných"
-          other: "{{count}} neprečítaných"
+          few: "%{count} neprečítané"
+          many: "%{count} neprečítaných"
+          other: "%{count} neprečítaných"
       new:
         lower_title_with_count:
           one: "%{count} nová"
-          few: "{{count}} nové"
-          many: "{{count}} nových"
-          other: "{{count}} nových"
+          few: "%{count} nové"
+          many: "%{count} nových"
+          other: "%{count} nových"
         lower_title: "nový"
         title: "Nové"
         title_with_count:
           one: "Nová (%{count})"
-          few: "Nové ({{count}})"
-          many: "Nových ({{count}})"
-          other: "Nových ({{count}})"
+          few: "Nové (%{count})"
+          many: "Nových (%{count})"
+          other: "Nových (%{count})"
         help: "témy vytvorené za posledných pár dní"
       posted:
         title: "Moje príspevky"
@@ -2091,13 +2095,13 @@ sk:
         title: "Záložky"
         help: "témy, ktoré máte v záložkách"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} ({{count}})"
-          few: "{{categoryName}} ({{count}})"
-          many: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
-        help: "najnovšie témy v kategórii {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          few: "%{categoryName} (%{count})"
+          many: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "najnovšie témy v kategórii %{categoryName}"
       top:
         title: "Top"
         help: "najaktívnejšie témy za posledný rok, mesiac, týždeň, alebo deň"
@@ -2442,10 +2446,10 @@ sk:
           label: "Upload"
           title: "Nahrať zálohu do tejto inštancie"
           uploading: "Upload prebieha..."
-          error: "Počas nahrávania '{{filename}}' nastala chyba: {{message}}"
+          error: "Počas nahrávania '%{filename}' nastala chyba: %{message}"
         operations:
           is_running: "Operácia práve prebieha..."
-          failed: " Zlyhalo vykonanie {{operation}} . Prosím skontrolujte logy. "
+          failed: " Zlyhalo vykonanie %{operation} . Prosím skontrolujte logy. "
           cancel:
             label: "Zrušiť"
             title: "Zrušiť prebiehajúcu operáciu"
@@ -2792,8 +2796,8 @@ sk:
           title: "Odhaliť emailovú adresu tohto používateľa"
           text: "Zobraziť"
       user:
-        suspend_failed: "Niečo sa pokazilo pri odoberaní práv tomuto používateľovi {{error}}"
-        unsuspend_failed: "Niečo sa pokazilo pri obnovovaní práv tomuto používateľovi {{error}}"
+        suspend_failed: "Niečo sa pokazilo pri odoberaní práv tomuto používateľovi %{error}"
+        unsuspend_failed: "Niečo sa pokazilo pri obnovovaní práv tomuto používateľovi %{error}"
         suspend_duration: "Ako dlho budú používateľovi odobrate práva?"
         suspend_reason_label: "Prečo mu odoberáte práva? Tento text <b>sa zobrazí každému</b> na stránke profilu používateľa a bude zobrazený užívateľovi pri pokuse o prihlásenie. Buďte strucný."
         suspend_reason: "Dôvod"
@@ -3068,6 +3072,7 @@ sk:
         title: "Emoji"
         help: "Pridaj nové emoji, ktoré bude dostupné pre všetkých (TIP: môžete pretiahnuť viac súborov naraz)"
         add: "Pridaj nové Emoji"
+        uploading: "Upload prebieha..."
         name: "Meno"
         group: "Skupina"
         image: "Obrázok"
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 931759b24f..c8abd2ae59 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -25,8 +25,8 @@ sl:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "H:mm"
       timeline_date: "MMM YYYY"
@@ -266,13 +266,13 @@ sl:
     weekly: "tedensko"
     every_month: "vsak mesec"
     every_six_months: "vsakih 6 mesecev"
-    max_of_count: "največ od {{count}}"
+    max_of_count: "največ od %{count}"
     alternation: "ali"
     character_count:
-      one: "{{count}} znak"
-      two: "{{count}} znaka"
-      few: "{{count}} znaki"
-      other: "{{count}} znakov"
+      one: "%{count} znak"
+      two: "%{count} znaka"
+      few: "%{count} znaki"
+      other: "%{count} znakov"
     related_messages:
       title: "Povezana sporočila"
       see_all: 'Poglej <a href="%{path}">vsa sporočila</a> od @%{username}...'
@@ -325,20 +325,20 @@ sl:
         yes_value: "Da, opusti"
         no_value: "Ne, obdrži"
     topic_count_latest:
-      one: "Poglej {{count}} novo ali posodobljeno temo"
-      two: "Poglej {{count}} novi ali posodobljeni temi"
-      few: "Poglej {{count}} nove ali posodobljene teme"
-      other: "Poglej {{count}} novih ali posodobljenih tem"
+      one: "Poglej %{count} novo ali posodobljeno temo"
+      two: "Poglej %{count} novi ali posodobljeni temi"
+      few: "Poglej %{count} nove ali posodobljene teme"
+      other: "Poglej %{count} novih ali posodobljenih tem"
     topic_count_unread:
-      one: "Poglej {{count}} neprebrano temo"
-      two: "Poglej {{count}} neprebrani temi"
-      few: "Poglej {{count}} neprebrane teme"
-      other: "Poglej {{count}} neprebranih tem"
+      one: "Poglej %{count} neprebrano temo"
+      two: "Poglej %{count} neprebrani temi"
+      few: "Poglej %{count} neprebrane teme"
+      other: "Poglej %{count} neprebranih tem"
     topic_count_new:
-      one: "Poglej {{count}} novo temo"
-      two: "Poglej {{count}} novi temi"
-      few: "Poglej {{count}} nove teme"
-      other: "Poglej {{count}} novih tem"
+      one: "Poglej %{count} novo temo"
+      two: "Poglej %{count} novi temi"
+      few: "Poglej %{count} nove teme"
+      other: "Poglej %{count} novih tem"
     preview: "predogled"
     cancel: "prekliči"
     save: "Shrani spremembe"
@@ -346,7 +346,7 @@ sl:
     saved: "Shranjeno!"
     upload: "Naloži"
     uploading: "Nalagam..."
-    uploading_filename: "Nalagam: {{filename}} ..."
+    uploading_filename: "Nalagam: %{filename} ..."
     clipboard: "odložišče"
     uploaded: "Naloženo!"
     pasting: "Prilepljam..."
@@ -382,10 +382,10 @@ sl:
       none: "Ni nobenih predmetov za odobritev."
       view_pending: "poglej za odobritev"
       topic_has_pending:
-        one: "Ta tema ima <b>{{count}}</b> prispevek za potrditev"
-        two: "Ta tema ima <b>{{count}}</b> prispevka za potrditev"
-        few: "Ta tema ima <b>{{count}}</b> prispevke za potrditev"
-        other: "Ta tema ima <b>{{count}}</b> prispevkov za potrditev"
+        one: "Ta tema ima <b>%{count}</b> prispevek za potrditev"
+        two: "Ta tema ima <b>%{count}</b> prispevka za potrditev"
+        few: "Ta tema ima <b>%{count}</b> prispevke za potrditev"
+        other: "Ta tema ima <b>%{count}</b> prispevkov za potrditev"
       title: "Pregled"
       topic: "Tema:"
       filtered_user: "Uporabnik"
@@ -399,10 +399,10 @@ sl:
         fields: "Polja"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} vseh prijav)"
-          two: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} vseh prijav)"
-          few: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} vseh prijav)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} vseh prijav)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} vseh prijav)"
+          two: "%{agreed}, %{disagreed}, %{ignored} (%{count} vseh prijav)"
+          few: "%{agreed}, %{disagreed}, %{ignored} (%{count} vseh prijav)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} vseh prijav)"
       topics:
         topic: "Tema"
         reviewable_count: "Število"
@@ -411,15 +411,15 @@ sl:
         original: "(izvorna tema)"
         details: "podrobnosti"
         unique_users:
-          one: "{{count}} uporabnik"
-          two: "{{count}} uporabnika"
-          few: "{{count}} uporabniki"
-          other: "{{count}} uporabnikov"
+          one: "%{count} uporabnik"
+          two: "%{count} uporabnika"
+          few: "%{count} uporabniki"
+          other: "%{count} uporabnikov"
       replies:
-        one: "{{count}} odgovor"
-        two: "{{count}} odgovora"
-        few: "{{count}} odgovori"
-        other: "{{count}} odgovorov"
+        one: "%{count} odgovor"
+        two: "%{count} odgovora"
+        few: "%{count} odgovori"
+        other: "%{count} odgovorov"
       edit: "Uredi"
       save: "Shrani"
       cancel: "Prekliči"
@@ -470,25 +470,25 @@ sl:
         title: "Prispevek za odobritev."
         description: "Prejeli smo vaš nov prispevek, vendar potrebuje odobritev s strani moderatorja preden bo objavljen. Prosimo za potrpežljivost."
         pending_posts:
-          one: "Imate <strong>{{count}}</strong> prispevek za potrditev."
-          two: "Imate <strong>{{count}}</strong> prispevka za potrditev."
-          few: "Imate <strong>{{count}}</strong> prispevke za potrditev."
-          other: "Imate <strong>{{count}}</strong> prispevkov za potrditev."
+          one: "Imate <strong>%{count}</strong> prispevek za potrditev."
+          two: "Imate <strong>%{count}</strong> prispevka za potrditev."
+          few: "Imate <strong>%{count}</strong> prispevke za potrditev."
+          other: "Imate <strong>%{count}</strong> prispevkov za potrditev."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> je objavil <a href='{{topicUrl}}'>temo</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Vi</a> ste objavili <a href='{{topicUrl}}'>temo</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> je odgovoril na <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Vi</a> ste odgovorili na <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> je odgovoril na <a href='{{topicUrl}}'>temo</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Vi</a> ste odgovorili na <a href='{{topicUrl}}'>temo</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> je omenil <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> je omenil <a href='{{user2Url}}'>vas</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Vi</a> ste omenili <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Objavljeno od <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Objavljeno od <a href='{{userUrl}}'>vas</a>"
-      sent_by_user: "Poslano od <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Poslano od <a href='{{userUrl}}'>tebe</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> je objavil <a href='%{topicUrl}'>temo</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Vi</a> ste objavili <a href='%{topicUrl}'>temo</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> je odgovoril na <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Vi</a> ste odgovorili na <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> je odgovoril na <a href='%{topicUrl}'>temo</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Vi</a> ste odgovorili na <a href='%{topicUrl}'>temo</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> je omenil <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> je omenil <a href='%{user2Url}'>vas</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Vi</a> ste omenili <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Objavljeno od <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Objavljeno od <a href='%{userUrl}'>vas</a>"
+      sent_by_user: "Poslano od <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Poslano od <a href='%{userUrl}'>tebe</a>"
     directory:
       filter_name: "filtriraj po uporabniškem imenu"
       title: "Uporabniki"
@@ -727,7 +727,7 @@ sl:
     user_fields:
       none: "(izberi možnost)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profil"
       mute: "Utišaj"
       edit: "Uredi Nastavitve"
@@ -796,12 +796,12 @@ sl:
       enable_quoting: "Omogoči odgovarjanje s citiranjem za poudarjen tekst"
       enable_defer: "Omogoči preloži za označiti teme kot neprebrane"
       change: "spremeni"
-      moderator: "{{user}} je moderator"
-      admin: "{{user}} je administrator"
+      moderator: "%{user} je moderator"
+      admin: "%{user} je administrator"
       moderator_tooltip: "Uporabnik je moderator"
       admin_tooltip: "Uporabnik je administrator"
       silenced_tooltip: "Ta uporabnik je utišan"
-      suspended_notice: "Ta uporabnik je suspendiran do {{date}}."
+      suspended_notice: "Ta uporabnik je suspendiran do %{date}."
       suspended_permanently: "Ta uporabnik je suspendiran"
       suspended_reason: "Razlog:"
       github_profile: "Github"
@@ -814,7 +814,7 @@ sl:
           Izključene teme in kategorije niso vključene v ta obvestila.
         individual: "Pošlji e-sporočilo za vsako nov prispevek"
         individual_no_echo: "Pošlji e-sporočilo za vsak nov prispevek, razen mojih"
-        many_per_day: "Pošlji mi e-sporočilo za vsak nov prispevek (okvirno {{dailyEmailEstimate}} na dan)"
+        many_per_day: "Pošlji mi e-sporočilo za vsak nov prispevek (okvirno %{dailyEmailEstimate} na dan)"
         few_per_day: "Pošlji mi e-sporočilo za vsako nov prispevek (okvirno 2 na dan)"
         warning: "Vkopljeno pošiljanje e-sporočila za vsak prispevek. Povzetek aktivnosti izklopljen."
       tag_settings: "Oznake"
@@ -844,9 +844,7 @@ sl:
       admin_delete: "Izbriši"
       users: "Uporabniki"
       muted_users: "Utišano"
-      muted_users_instructions: "Onemogoči vsa obvestila povezana s temi uporabniki."
       ignored_users: "Prezrti"
-      ignored_users_instructions: "Onemogoči vse prispevke in obvestila povezana s temi uporabniki."
       tracked_topics_link: "Prikaži"
       automatically_unpin_topics: "Samodejno odpni temo, ko preberem zadnji prispevek."
       apps: "Aplikacije"
@@ -902,7 +900,7 @@ sl:
         copy_to_clipboard: "Kopiraj v odložišče"
         copy_to_clipboard_error: "Napaka pri prenosu na odlagališče"
         copied_to_clipboard: "Prenešeno na odlagališče"
-        remaining_codes: "Imate <strong>{{count}}</strong> rezervnih potrditvenih kod."
+        remaining_codes: "Imate <strong>%{count}</strong> rezervnih potrditvenih kod."
         codes:
           title: "Rezervne potrditvene kode ustvarjene"
           description: "Vsaka od rezervnih potrditvenih kod se lahko uporabi samo enkrat. Shranite jih na varno, ampak dostopno mesto."
@@ -959,13 +957,13 @@ sl:
         instructions: "se nikoli ne prikaže javno"
         ok: "Poslali vam bomo e-sporočilo za potrditev."
         invalid: "Vnesite veljaven e-naslov."
-        authenticated: "Vaša e-naslov je bil potrjen pri {{provider}}"
+        authenticated: "Vaša e-naslov je bil potrjen pri %{provider}"
         frequency_immediately: "E-sporočilo bo poslano nemudoma, če niste prebrali stvari o katerih vam pošiljamo e-sporočilo."
         frequency:
           one: "E-sporočilo bo poslano samo če niste bili aktivni v zadnji minuti."
-          two: "E-sporočilo bo poslano samo če niste bili aktivni vsaj {{count}} minuti."
-          few: "E-sporočilo bo poslano samo če niste bili aktivni vsaj {{count}} minute."
-          other: "E-sporočilo bo poslano samo če niste bili aktivni vsaj {{count}} minut."
+          two: "E-sporočilo bo poslano samo če niste bili aktivni vsaj %{count} minuti."
+          few: "E-sporočilo bo poslano samo če niste bili aktivni vsaj %{count} minute."
+          other: "E-sporočilo bo poslano samo če niste bili aktivni vsaj %{count} minut."
       associated_accounts:
         title: "Povezani računi"
         connect: "Poveži"
@@ -985,9 +983,9 @@ sl:
       username:
         title: "Uporabniško ime"
         instructions: "unikatno, brez presledkov, kratko"
-        short_instructions: "Ljudje vas lahko omenijo kot @{{username}}"
+        short_instructions: "Ljudje vas lahko omenijo kot @%{username}"
         available: "Vaše uporabniško ime je prosto"
-        not_available: "Ni na voljo. Poskusi {{suggestion}}?"
+        not_available: "Ni na voljo. Poskusi %{suggestion}?"
         not_available_no_suggestion: "Ni na voljo"
         too_short: "Vaše uporabniško ime je prekratko"
         too_long: "Vaše uporabniško ime je predolgo"
@@ -1007,11 +1005,11 @@ sl:
         log_out_all: "Odjavi vse naprave"
         active: "aktiven zdaj"
         not_you: "To niste vi?"
-        show_all: "Prikaži vse ({{count}})"
+        show_all: "Prikaži vse (%{count})"
         show_few: "Prikaži manj"
         was_this_you: "Ste bili to vi?"
         was_this_you_description: "Če to niste bili vi, vam predlagamo da spremenite geslo in se odjavite iz vseh naprav."
-        browser_and_device: "{{browser}} na {{device}}"
+        browser_and_device: "%{browser} na %{device}"
         secure_account: "Zavaruj moj račun"
         latest_post: "Nazadnje ste objavili..."
       last_posted: "Zadnji prispevek"
@@ -1090,22 +1088,21 @@ sl:
         none: "Ni povabil za prikaz."
         truncated:
           one: "Prikazano prvo povabilo."
-          two: "Prikazana prva {{count}} povabila."
-          few: "Prikazanih prva {{count}} povabila."
-          other: "Prikazanih prvih {{count}} povabil."
+          two: "Prikazana prva %{count} povabila."
+          few: "Prikazanih prva %{count} povabila."
+          other: "Prikazanih prvih %{count} povabil."
         redeemed: "Sprejeta povabila"
         redeemed_tab: "Sprejeto"
-        redeemed_tab_with_count: "Sprejeto ({{count}})"
+        redeemed_tab_with_count: "Sprejeto (%{count})"
         redeemed_at: "Sprejeto"
         pending: "Povabila v teku"
         pending_tab: "V teku"
-        pending_tab_with_count: "V teku ({{count}})"
+        pending_tab_with_count: "V teku (%{count})"
         topics_entered: "Ogledanih tem"
         posts_read_count: "Prebranih prispevkov"
         expired: "To povabilo je poteklo."
         rescind: "Odstrani"
         rescinded: "Povabilo odstranjeno"
-        rescind_all: "Odstrani vsa pretečena povabila"
         rescinded_all: "Vsa pretečena povabila odstranjena!"
         rescind_all_confirm: "Ali ste prepričani, da hočete odstraniti vsa pretečena povabila?"
         reinvite: "Ponovno povabi"
@@ -1116,13 +1113,17 @@ sl:
         time_read: "Čas branja"
         days_visited: "Dni prisotnosti"
         account_age_days: "Starost računa v dnevih"
+        links_tab: "Povezave"
+        link_created_at: "Ustvarjeno"
+        link_groups: Skupine
         create: "Pošlji povabilo"
         generate_link: "Kopiraj povezavo s povabilom"
         link_generated: "Povezava s povabilom ustvarjena!"
         valid_for: "Povezava s povabilom je veljavna samo za e-naslov: %{email}"
+        invite_link:
+          success: "Povezava s povabilom ustvarjena!"
         bulk_invite:
           none: "Niste povabili še nikogar. Pošljite posamična povabila ali povabite več oseb naenkrat tako da <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>naložite CSV datoteko</a>."
-          text: "Množično povabilo iz datoteke"
           success: "Datoteka uspešno prenešena. Obveščeni boste, ko je postopek zaključen."
           error: "Datoteka mora biti v CSV obliki."
           confirmation_message: "Poslali boste povabila preko e-pošte vsem iz naložene datoteke."
@@ -1229,7 +1230,7 @@ sl:
       desc:
         network: "Preverite vašo povezavo"
         network_fixed: "Izgleda da je povezava nazaj"
-        server: "Oznaka napake: {{status}}"
+        server: "Oznaka napake: %{status}"
         forbidden: "Nimate dostopa."
         not_found: "Aplikacija je hotela naložiti URL, ki ne obstaja."
         unknown: "Nekaj je šlo narobe."
@@ -1281,8 +1282,8 @@ sl:
       value_prop: "Ko registrirate uporabniški račun, si lahko zapomnimo točno kaj ste že prebrali, tako da boste naslednjič lahko nadaljevali od tam, kjer ste končali. Lahko boste tudi prejemali obvestila, tukaj ali preko e-sporočila vsakič, ko vam nekdo odgovori. In lahko boste všečkali prispevke, ki so vam všeč. :heartpulse:"
     summary:
       enabled_description: "Ogledujete si povzetek teme: najbolj zanimive prispevke, kot jih je določila skupnost."
-      description: "Obstaja <b>{{replyCount}}</b> odgovorov."
-      description_time: "Obstaja <b>{{replyCount}}</b> odgovorov z ocenjenim časom branja <b>{{readingTime}} minut</b>."
+      description: "Obstaja <b>%{replyCount}</b> odgovorov."
+      description_time: "Obstaja <b>%{replyCount}</b> odgovorov z ocenjenim časom branja <b>%{readingTime} minut</b>."
       enable: "Pripravi povzetek teme"
       disable: "Prikaži vse prispevke"
     deleted_filter:
@@ -1295,8 +1296,8 @@ sl:
       invite: "Povabi druge..."
       edit: "Dodaj ali odstrani..."
       leave_message: "Ali hočete res zapustiti to sporočilo?"
-      remove_allowed_user: "Ali resnično želite odstraniti {{name}} s tega sporočila?"
-      remove_allowed_group: "Ali resnično želite odstraniti {{name}} s tega sporočila?"
+      remove_allowed_user: "Ali resnično želite odstraniti %{name} s tega sporočila?"
+      remove_allowed_group: "Ali resnično želite odstraniti %{name} s tega sporočila?"
     email: "E-naslov"
     username: "Uporabniško ime"
     last_seen: "Viden"
@@ -1305,7 +1306,7 @@ sl:
     trust_level: "Nivo zaupanja"
     search_hint: "uporabniško ime, e-naslov ali IP naslov"
     create_account:
-      disclaimer: "Z registracijo sprejemate <a href='{{privacy_link}}' target='blank'>Pravilnik o zasebnosti</a> in <a href='{{tos_link}}' target='blank'>Pogoje uporabe</a>."
+      disclaimer: "Z registracijo sprejemate <a href='%{privacy_link}' target='blank'>Pravilnik o zasebnosti</a> in <a href='%{tos_link}' target='blank'>Pogoje uporabe</a>."
       title: "Registracija uporabnika"
       failed: "Nekaj je šlo narobe, morda je ta e-naslov že registriran, poskusite povezavo za pozabljeno geslo."
     forgot_password:
@@ -1354,7 +1355,7 @@ sl:
       awaiting_activation: "Vaš uporabniški račun čaka aktivacijo - uporabite povezavo za pozabljeno geslo, če želite prejeti še en e-sporočilo za aktivacijo."
       awaiting_approval: "Vaš uporabniški račun še ni bil potrjen s strani člana osebja foruma. Prejeli boste e-sporočilo, ko bo potrjen."
       requires_invite: "Oprostite, dostop do foruma je mogoč samo preko povabila."
-      not_activated: "Ne morete se še prijaviti. Pred časom smo poslali aktivacijsko e-sporočilo na <b>{{sentTo}}</b>. Sledite navodilom v e-sporočilu da akitivirate vaš uporabniški račun."
+      not_activated: "Ne morete se še prijaviti. Pred časom smo poslali aktivacijsko e-sporočilo na <b>%{sentTo}</b>. Sledite navodilom v e-sporočilu da akitivirate vaš uporabniški račun."
       not_allowed_from_ip_address: "Ne morete se prijaviti s tega IP naslova."
       admin_not_allowed_from_ip_address: "Ne morete se prijaviti kot administrator iz tega IP naslova."
       resend_activation_email: "Kliknite tukaj za ponovno pošiljanje aktivacijskega e-sporočila."
@@ -1363,7 +1364,7 @@ sl:
       change_email: "Spremeni e-naslov"
       provide_new_email: "Vpišite nov e-naslov in ponovno vam bomo poslali potrditveno e-sporočilo."
       submit_new_email: "Usveži e-naslov"
-      sent_activation_email_again: "Poslali smo vam novo aktivacijsko sporočilo na <b>{{currentEmail}}</b>. Lahko traja nekaj minut, da ga boste prejeli - drugače preverite mapo z neželeno pošto."
+      sent_activation_email_again: "Poslali smo vam novo aktivacijsko sporočilo na <b>%{currentEmail}</b>. Lahko traja nekaj minut, da ga boste prejeli - drugače preverite mapo z neželeno pošto."
       sent_activation_email_again_generic: "Poslali smo vam novo aktivacijsko sporočilo. Lahko traja nekaj minut, da ga boste prejeli - drugače preverite mapo z neželeno pošto."
       to_continue: "Prijavite se"
       preferences: "Za spremembo nastavitev morate biti prijavljeni."
@@ -1422,23 +1423,23 @@ sl:
     conditional_loading_section:
       loading: Nalagam...
     category_row:
-      topic_count: "{{count}} tem v tej kategoriji"
+      topic_count: "%{count} tem v tej kategoriji"
     select_kit:
       default_header_text: Izberi...
       no_content: Ni zadetkov
       filter_placeholder: Išči...
       filter_placeholder_with_any: Išči ali ustvari novo...
-      create: "Ustvari: '{{content}}'"
+      create: "Ustvari: '%{content}'"
       max_content_reached:
-        one: "Izberete lahko samo {{count}} stvar."
-        two: "Izberete lahko samo {{count}} stvari."
-        few: "Izberete lahko samo {{count}} stvari."
-        other: "Izberete lahko samo {{count}} stvari."
+        one: "Izberete lahko samo %{count} stvar."
+        two: "Izberete lahko samo %{count} stvari."
+        few: "Izberete lahko samo %{count} stvari."
+        other: "Izberete lahko samo %{count} stvari."
       min_content_not_reached:
-        one: "Izberite vsaj {{count}} stvar."
-        two: "Izberite vsaj {{count}} stvari."
-        few: "Izberite vsaj {{count}} stvari."
-        other: "Izberite vsaj {{count}} stvari."
+        one: "Izberite vsaj %{count} stvar."
+        two: "Izberite vsaj %{count} stvari."
+        few: "Izberite vsaj %{count} stvari."
+        other: "Izberite vsaj %{count} stvari."
     date_time_picker:
       from: Od
       to: Do
@@ -1465,7 +1466,7 @@ sl:
       default: Po meri emoji
     shared_drafts:
       title: "Skupni osnutki"
-      notice: "Ta tema je vidna samo tistim, ki lahko vidijo kategorijo <b>{{category}}</b>."
+      notice: "Ta tema je vidna samo tistim, ki lahko vidijo kategorijo <b>%{category}</b>."
       destination_category: "Ciljna kategorija"
       publish: "Objavi skupni osnutek"
       confirm_publish: "Ali ste prepričani da hočete objaviti ta osnutek?"
@@ -1485,26 +1486,26 @@ sl:
       similar_topics: "Vaša tema je podobna kot..."
       drafts_offline: "osnutki brez povezave"
       edit_conflict: "uredi spor"
-      group_mentioned_limit: "<b>Opozorilo!</b> Omenili ste <a href='{{group_link}}'>{{group}}</a> ampak ta skupina ima več članov kot je omejitev administratorja na {{max}} uporabnika. Nihče ne bo obveščen. "
+      group_mentioned_limit: "<b>Opozorilo!</b> Omenili ste <a href='%{group_link}'>%{group}</a> ampak ta skupina ima več članov kot je omejitev administratorja na %{max} uporabnika. Nihče ne bo obveščen. "
       group_mentioned:
-        one: "Z omembo {{group}} boste obvestili <a href='{{group_link}}'>{{count}} osebo</a> – ali ste prepričani?"
-        two: "Z omembo {{group}}boste obvestili <a href='{{group_link}}'>{{count}} osebi</a> – ali ste prepričani?"
-        few: "Z omembo {{group}} boste obvestili <a href='{{group_link}}'>{{count}} osebe</a> – ali ste prepričani?"
-        other: "Z omembo {{group}} boste obvestili <a href='{{group_link}}'>{{count}} oseb</a> – ali ste prepričani?"
+        one: "Z omembo %{group} boste obvestili <a href='%{group_link}'>%{count} osebo</a> – ali ste prepričani?"
+        two: "Z omembo %{group}boste obvestili <a href='%{group_link}'>%{count} osebi</a> – ali ste prepričani?"
+        few: "Z omembo %{group} boste obvestili <a href='%{group_link}'>%{count} osebe</a> – ali ste prepričani?"
+        other: "Z omembo %{group} boste obvestili <a href='%{group_link}'>%{count} oseb</a> – ali ste prepričani?"
       cannot_see_mention:
-        category: "Omenil si uporabnika {{username}}, a ta ne bo obveščen saj nima dostopa do te kategorije. Dodati ga je potrebno v skupino ki lahko dostopa do kategorije."
-        private: "Omenili ste uporabnika {{username}}, a ta ne bo obveščen, ker ne more videti tega zasebnega sporočila. Moraii ga boste povabiti v to zasebno sporočilo."
-      duplicate_link: "Povezava do <b>{{domain}}</b> bila že objavljena v temi od <b>@{{username}}</b> v <a href='{{post_url}}'>odgovoru {{ago}}</a> – ali ste prepričani, da jo želite objaviti še enkrat?"
-      reference_topic_title: "RE: {{title}}"
+        category: "Omenil si uporabnika %{username}, a ta ne bo obveščen saj nima dostopa do te kategorije. Dodati ga je potrebno v skupino ki lahko dostopa do kategorije."
+        private: "Omenili ste uporabnika %{username}, a ta ne bo obveščen, ker ne more videti tega zasebnega sporočila. Moraii ga boste povabiti v to zasebno sporočilo."
+      duplicate_link: "Povezava do <b>%{domain}</b> bila že objavljena v temi od <b>@%{username}</b> v <a href='%{post_url}'>odgovoru %{ago}</a> – ali ste prepričani, da jo želite objaviti še enkrat?"
+      reference_topic_title: "RE: %{title}"
       error:
         title_missing: "Naslov je obvezen"
-        title_too_short: "Naslov mora vsebovati vsaj {{min}} znakov"
-        title_too_long: "Naslov ne more imeti več kot {{max}} znakov"
+        title_too_short: "Naslov mora vsebovati vsaj %{min} znakov"
+        title_too_long: "Naslov ne more imeti več kot %{max} znakov"
         post_missing: "Prispevek ne more biti prazen"
-        post_length: "Prispevek mora vsebovati vsaj {{min}} znakov"
-        try_like: "Ste že uporabili {{heart}} gumb za všečkanje?"
+        post_length: "Prispevek mora vsebovati vsaj %{min} znakov"
+        try_like: "Ste že uporabili %{heart} gumb za všečkanje?"
         category_missing: "Izbrati morate kategorijo"
-        tags_missing: "Izbrati morate vsaj {{count}} oznak"
+        tags_missing: "Izbrati morate vsaj %{count} oznak"
         topic_template_not_modified: "Dodajte podrobnosti in značilnosti v vašo temo tako da uredite predlogo teme."
       save_edit: "Shrani spremembe"
       overwrite_edit: "Prepiši spremembo"
@@ -1598,67 +1599,67 @@ sl:
     notifications:
       tooltip:
         regular:
-          one: "{{count}} neprebrano obvestilo"
-          two: "{{count}} neprebrani obvestili"
-          few: "{{count}} neprebrana obvestila"
-          other: "{{count}} neprebranih obvestil"
+          one: "%{count} neprebrano obvestilo"
+          two: "%{count} neprebrani obvestili"
+          few: "%{count} neprebrana obvestila"
+          other: "%{count} neprebranih obvestil"
         message:
-          one: "{{count}} neprebrano sporočilo"
-          two: "{{count}} neprebrani sporočili"
-          few: "{{count}} neprebrana sporočila"
-          other: "{{count}} neprebranih sporočil"
+          one: "%{count} neprebrano sporočilo"
+          two: "%{count} neprebrani sporočili"
+          few: "%{count} neprebrana sporočila"
+          other: "%{count} neprebranih sporočil"
       title: "obvestila ko omeni vaše @ime, odgovorih na vaše prispevke in teme, zasebna sporočila"
       none: "Ta trenutek ne moremo naložiti obvestil."
       empty: "Ni obvestil."
       post_approved: "Vaš prispevek je bil odobren"
       reviewable_items: "čakajo na pregled"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} in {{count}} drug</span> {{description}}"
-        two: "<span>{{username}}, {{username2}} in {{count}} druga</span> {{description}}"
-        few: "<span>{{username}}, {{username2}} in {{count}} drugi</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} in {{count}} drugih</span> {{description}}"
+        one: "<span>%{username}, %{username2} in %{count} drug</span> %{description}"
+        two: "<span>%{username}, %{username2} in %{count} druga</span> %{description}"
+        few: "<span>%{username}, %{username2} in %{count} drugi</span> %{description}"
+        other: "<span>%{username}, %{username2} in %{count} drugih</span> %{description}"
       liked_consolidated_description:
-        one: "je všečkal {{count}} vaš prispevek"
-        two: "je všečkal {{count}} vaša prispevka"
-        few: "je všečkal {{count}} vaše prispevke"
-        other: "je všečkal {{count}} vaših prispevkov"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> je sprejel tvoje povabilo."
-      moved_post: "<span>{{username}}</span> premaknil {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Prislužili '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Nova tema</span> {{description}}"
-      membership_request_accepted: "Sprejeti v članstvo v '{{group_name}}'"
+        one: "je všečkal %{count} vaš prispevek"
+        two: "je všečkal %{count} vaša prispevka"
+        few: "je všečkal %{count} vaše prispevke"
+        other: "je všečkal %{count} vaših prispevkov"
+      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}"
+      invitee_accepted: "<span>%{username}</span> je sprejel tvoje povabilo."
+      moved_post: "<span>%{username}</span> premaknil %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Prislužili '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Nova tema</span> %{description}"
+      membership_request_accepted: "Sprejeti v članstvo v '%{group_name}'"
       group_message_summary:
-        one: "{{count}} sporočilo v{{group_name}} predalu"
-        two: "{{count}} sporočili v {{group_name}} predalu"
-        few: "{{count}} sporočila v {{group_name}} predalu"
-        other: "{{count}} sporočil v {{group_name}} predalu"
+        one: "%{count} sporočilo v%{group_name} predalu"
+        two: "%{count} sporočili v %{group_name} predalu"
+        few: "%{count} sporočila v %{group_name} predalu"
+        other: "%{count} sporočil v %{group_name} predalu"
       popup:
-        mentioned: '{{username}} vas je omenil v"{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} vas je omenil v "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} vas je citiral v "{{topic}}" - {{site_title}}'
-        replied: '{{username}} vam je odgovoril v "{{topic}}" - {{site_title}}'
-        posted: '{{username}} objavil v "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} vam je poslal zasebno sporočilo "{{topic}}" - {{site_title}}'
-        linked: '{{username}} je dodal povezavo na vaš prispevek iz "{{topic}}" - {{site_title}}'
-        watching_first_post: '{{username}} je ustvaril novo temo "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} vas je omenil v"%{topic}" - %{site_title}'
+        group_mentioned: '%{username} vas je omenil v "%{topic}" - %{site_title}'
+        quoted: '%{username} vas je citiral v "%{topic}" - %{site_title}'
+        replied: '%{username} vam je odgovoril v "%{topic}" - %{site_title}'
+        posted: '%{username} objavil v "%{topic}" - %{site_title}'
+        private_message: '%{username} vam je poslal zasebno sporočilo "%{topic}" - %{site_title}'
+        linked: '%{username} je dodal povezavo na vaš prispevek iz "%{topic}" - %{site_title}'
+        watching_first_post: '%{username} je ustvaril novo temo "%{topic}" - %{site_title}'
         confirm_title: "Obvestila omogočena - %{site_title}"
         confirm_body: "Uspelo! Obvestila so bila omogočena."
-        custom: "Obvestilo od {{username}} na %{site_title}"
+        custom: "Obvestilo od %{username} na %{site_title}"
       titles:
         mentioned: "omenjen"
         replied: "nov odgovor"
@@ -1685,9 +1686,9 @@ sl:
       from_my_computer: "Iz moje naprave"
       from_the_web: "Iz spletne strani"
       remote_tip: "povezava do slike"
-      remote_tip_with_attachments: "povezava do slike ali datoteke {{authorized_extensions}}"
+      remote_tip_with_attachments: "povezava do slike ali datoteke %{authorized_extensions}"
       local_tip: "izberite slike iz vaše naprave"
-      local_tip_with_attachments: "izberite slike na svoji napravi {{authorized_extensions}}"
+      local_tip_with_attachments: "izberite slike na svoji napravi %{authorized_extensions}"
       hint: "(slike lahko naložite tudi tako, da jih povlečete in spustite v urejevalnik) "
       hint_for_supported_browsers: "slike lahko naložite tudi tako, da jih povlečete in spustite v urejevalnik"
       uploading: "Nalagam"
@@ -1704,17 +1705,17 @@ sl:
       clear_all: "Počisti vse"
       too_short: "Niz za iskanje je prekratek"
       result_count:
-        one: "<span>{{count}} zadetek za</span><span class='term'>{{term}}</span>"
-        two: "<span>{{count}}{{plus}} zadetka za</span><span class='term'>{{term}}</span>"
-        few: "<span>{{count}}{{plus}} zadetki za</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} zadetkov za</span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} zadetek za</span><span class='term'>%{term}</span>"
+        two: "<span>%{count}%{plus} zadetka za</span><span class='term'>%{term}</span>"
+        few: "<span>%{count}%{plus} zadetki za</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} zadetkov za</span><span class='term'>%{term}</span>"
       title: "išči po temah, prispevkih, uporabnikih ali kategorijah"
       full_page_title: "išči teme ali prispevke"
       no_results: "Iskanje nima zadetkov."
       no_more_results: "Ni več zadetkov iskanja."
       searching: "Iščem ..."
-      post_format: "#{{post_number}} od {{username}}"
-      results_page: "Zadetki iskanja za '{{term}}'"
+      post_format: "#%{post_number} od %{username}"
+      results_page: "Zadetki iskanja za '%{term}'"
       more_results: "Obstaja več zadetkov. Zožite kriterije iskanja."
       cant_find: "Ne najdete tega kar iščete?"
       start_new_topic: "Bi mogoče ustvarili novo temo?"
@@ -1723,8 +1724,8 @@ sl:
       search_google_button: "Google"
       search_google_title: "Išči po tej spletni strani"
       context:
-        user: "Išči prispevke od @{{username}}"
-        category: "Išči po #{{category}} kategoriji"
+        user: "Išči prispevke od @%{username}"
+        category: "Išči po #%{category} kategoriji"
         topic: "Išči po tej temi"
         private_messages: "Išči po zasebnih sporočilih"
       advanced:
@@ -1798,10 +1799,10 @@ sl:
         notification_level: "Obvestila"
         choose_new_category: "Izberi novo kategorijo za temo:"
         selected:
-          one: "Izbrali ste <b>{{count}}</b> temo."
-          two: "Izbrali ste <b>{{count}}</b> temi."
-          few: "Izbrali ste <b>{{count}}</b> teme."
-          other: "Izbrali ste <b>{{count}}</b> tem."
+          one: "Izbrali ste <b>%{count}</b> temo."
+          two: "Izbrali ste <b>%{count}</b> temi."
+          few: "Izbrali ste <b>%{count}</b> teme."
+          other: "Izbrali ste <b>%{count}</b> tem."
         change_tags: "Zamenjaj oznake"
         append_tags: "Dodaj oznake"
         choose_new_tags: "Izberite nove oznake za te teme:"
@@ -1814,7 +1815,7 @@ sl:
         posted: "Niste objavili še v nobeni temi."
         latest: "Ni najnovejših tem. "
         bookmarks: "Nimate tem z zaznamki."
-        category: "Ni tem v kategoriji {{category}} ."
+        category: "Ni tem v kategoriji %{category} ."
         top: "Ni najboljših tem."
         educate:
           new: '<p>Tu se prikažejo vaše nove teme.</p><p>Privzeto se teme prikažejo kot nove in bodo imele oznako <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">novo</span> če so bile ustvarjene v zadnjih 2 dneh.</p><p>Obiščite <a href="%{userPrefsUrl}">nastavitve</a> če želite spremembo.</p>'
@@ -1825,15 +1826,15 @@ sl:
         read: "Ni več prebranih tem."
         new: "Ni več novih tem."
         unread: "Ni več neprebranih tem."
-        category: "Ni več tem v kategoriji {{category}}."
+        category: "Ni več tem v kategoriji %{category}."
         top: "Ni več najboljših tem."
         bookmarks: "Ni več tem z zaznamki."
     topic:
       filter_to:
-        one: "{{count}} prispevek v temi"
-        two: "{{count}} prispevka v temi"
-        few: "{{count}} prispevki v temi"
-        other: "{{count}} prispevkov v temi"
+        one: "%{count} prispevek v temi"
+        two: "%{count} prispevka v temi"
+        few: "%{count} prispevki v temi"
+        other: "%{count} prispevkov v temi"
       create: "Nova tema"
       create_long: "Ustvari novo temo"
       open_draft: "Odpri osnutek"
@@ -1853,15 +1854,15 @@ sl:
       new: "nova tema"
       unread: "neprebrana"
       new_topics:
-        one: "{{count}} nova tema"
-        two: "{{count}} novi temi"
-        few: "{{count}} nove teme"
-        other: "{{count}} novih tem"
+        one: "%{count} nova tema"
+        two: "%{count} novi temi"
+        few: "%{count} nove teme"
+        other: "%{count} novih tem"
       unread_topics:
-        one: "{{count}} neprebrana tema"
-        two: "{{count}} neprebrani temi"
-        few: "{{count}} neprebrane teme"
-        other: "{{count}} neprebranih tem"
+        one: "%{count} neprebrana tema"
+        two: "%{count} neprebrani temi"
+        few: "%{count} neprebrane teme"
+        other: "%{count} neprebranih tem"
       title: "Tema"
       invalid_access:
         title: "Tema je zasebna"
@@ -1874,33 +1875,33 @@ sl:
         title: "Ne najdemo temo."
         description: "Oprostite, ne najdemo te teme. Mogoče jo je odstranil moderator?"
       total_unread_posts:
-        one: "imate {{count}} neprebran prispevek v tej temi"
-        two: "imate {{count}} neprebrana prispevka v tej temi"
-        few: "imate {{count}} neprebrane prispevke v tej temi"
-        other: "imate {{count}} neprebranih prispevkov v tej temi"
+        one: "imate %{count} neprebran prispevek v tej temi"
+        two: "imate %{count} neprebrana prispevka v tej temi"
+        few: "imate %{count} neprebrane prispevke v tej temi"
+        other: "imate %{count} neprebranih prispevkov v tej temi"
       unread_posts:
-        one: "imate {{count}} neprebran star prispevek v tej temi"
-        two: "imate {{count}} neprebrana stara prispevka v tej temi"
-        few: "imate {{count}} neprebrane stare prispevke v tej temi"
-        other: "imate {{count}} neprebranih starih prispevkov v tej temi"
+        one: "imate %{count} neprebran star prispevek v tej temi"
+        two: "imate %{count} neprebrana stara prispevka v tej temi"
+        few: "imate %{count} neprebrane stare prispevke v tej temi"
+        other: "imate %{count} neprebranih starih prispevkov v tej temi"
       new_posts:
-        one: "{{count}} nov prispevek v tej temi od kar ste jo zadnjič brali"
-        two: "{{count}} nova prispevka v tej temi od kar ste jo zadnjič brali"
-        few: "{{count}} novi prispevki v tej temi od kar ste jo zadnjič brali"
-        other: "{{count}} novih prispevkov v tej temi od kar ste jo zadnjič brali"
+        one: "%{count} nov prispevek v tej temi od kar ste jo zadnjič brali"
+        two: "%{count} nova prispevka v tej temi od kar ste jo zadnjič brali"
+        few: "%{count} novi prispevki v tej temi od kar ste jo zadnjič brali"
+        other: "%{count} novih prispevkov v tej temi od kar ste jo zadnjič brali"
       likes:
-        one: "{{count}} všeček na tej temi"
-        two: "{{count}} všečka na tej temi"
-        few: "{{count}} všečki na tej temi"
-        other: "{{count}} všečkov na tej temi"
+        one: "%{count} všeček na tej temi"
+        two: "%{count} všečka na tej temi"
+        few: "%{count} všečki na tej temi"
+        other: "%{count} všečkov na tej temi"
       back_to_list: "Nazaj na seznam tem"
       options: "Možnosti teme"
       show_links: "pokaži povezave v tej temi"
       toggle_information: "preklopi podrobnosti teme"
-      read_more_in_category: "Brskaj po ostalih temah v {{catLink}} ali {{latestLink}}."
-      read_more: "Brskaj po ostalih temah {{catLink}} ali {{latestLink}}."
-      group_request: "Zaprositi morate članstvo v skupini `{{name}}` za dostop do te teme"
-      group_join: "Včlaniti se morate v skupino `{{name}}` za dostop do te teme"
+      read_more_in_category: "Brskaj po ostalih temah v %{catLink} ali %{latestLink}."
+      read_more: "Brskaj po ostalih temah %{catLink} ali %{latestLink}."
+      group_request: "Zaprositi morate članstvo v skupini `%{name}` za dostop do te teme"
+      group_join: "Včlaniti se morate v skupino `%{name}` za dostop do te teme"
       group_request_sent: "Vaša prošnja za članstvo je bila poslana. Obveščeni boste, ko bo odobrena."
       unread_indicator: "Noben član ni še prebral zadnjega prispevka v tej temi."
       read_more_MF: "{ UNREAD, plural, =0 {} one { Je še <a href='{basePath}/unread'>1 neprebrana</a> } two { Sta še <a href='{basePath}/unread'>2 neprebrani</a> } other { Je še<a href='{basePath}/unread'># neprebranih } } { NEW, plural, =0 {} one { {BOTH, select, true{in} false {je } other{}} <a href='{basePath}/new'>1 nova</a> tema ostala} two { {BOTH, select, true{in } false {sta } other{}} <a href='{basePath}/new'>2 novi</a> temi ostali} other { {BOTH, select, true{in } false {so } other{}} <a href='{basePath}/new'># nove</a> teme ostale} }, ali {CATEGORY, select, true {brskaj druge teme v {catLink}} false {{latestLink}} other {}}"
@@ -2076,29 +2077,29 @@ sl:
         choose_category: "Izberite kategorijo za to javno temo:"
       feature_topic:
         title: "Izpostavi to temo"
-        pin: "Naj se ta tema prikaže na vrhu kategorije {{categoryLink}} do"
-        confirm_pin: "Trenutno imate {{count}} pripetih tem. Preveč pripetih tem je lahko breme za nove in anonimne uporabnike. Ali ste prepričani da želite pripeti še eno temo v to kategorijo?"
-        unpin: "Odpnite to temo iz vrha kategorije {{categoryLink}}."
-        unpin_until: "Odstrani to temo iz vrha kategorije {{categoryLink}} ali počakaj do <strong>%{until}</strong>."
+        pin: "Naj se ta tema prikaže na vrhu kategorije %{categoryLink} do"
+        confirm_pin: "Trenutno imate %{count} pripetih tem. Preveč pripetih tem je lahko breme za nove in anonimne uporabnike. Ali ste prepričani da želite pripeti še eno temo v to kategorijo?"
+        unpin: "Odpnite to temo iz vrha kategorije %{categoryLink}."
+        unpin_until: "Odstrani to temo iz vrha kategorije %{categoryLink} ali počakaj do <strong>%{until}</strong>."
         pin_note: "Uporabniki lahko samostojno odpnejo temo."
         pin_validation: "Datum je zahtevan, če želite pripeti to temo."
-        not_pinned: "Ni pripetih tem v {{categoryLink}}."
+        not_pinned: "Ni pripetih tem v %{categoryLink}."
         already_pinned:
-          one: "Trenutno pripeta tema v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          two: "Trenutno pripeti temi v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          few: "Trenutno pripete teme v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Trenutno pripetih tem v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Trenutno pripeta tema v %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          two: "Trenutno pripeti temi v %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          few: "Trenutno pripete teme v %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Trenutno pripetih tem v %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Ta tema naj se pojavi na vrhu vseh seznamov tem do"
-        confirm_pin_globally: "Trenutno imate {{count}} globalno pripetih tem. Preveč pripetih tem je lahko breme za nove in anonimne uporabnike. Ali ste prepričani da želite pripeti še eno globalno temo?"
+        confirm_pin_globally: "Trenutno imate %{count} globalno pripetih tem. Preveč pripetih tem je lahko breme za nove in anonimne uporabnike. Ali ste prepričani da želite pripeti še eno globalno temo?"
         unpin_globally: "Odstrani to temo z vrha vseh seznamov tem."
         unpin_globally_until: "Odstrani to temo z vrha seznama vseh tem ali počakaj do <strong>%{until}</strong>."
         global_pin_note: "Uporabniki lahko samostojno odpnejo temo."
         not_pinned_globally: "Ni globalno pripetih tem."
         already_pinned_globally:
-          one: "Trenutno globalno pripeta tema: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          two: "Trenutno globalno pripeti temi: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          few: "Trenutno globalno pripete teme: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Trenutno globalno pripetih tem: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Trenutno globalno pripeta tema: <strong class='badge badge-notification unread'>%{count}</strong>"
+          two: "Trenutno globalno pripeti temi: <strong class='badge badge-notification unread'>%{count}</strong>"
+          few: "Trenutno globalno pripete teme: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Trenutno globalno pripetih tem: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Naredi to temo v oglasni trak, ki se bo prikazoval na vrhu vseh strani."
         remove_banner: "Odstrani oglasni trak, ki se pojavlja na vrhu vseh strani."
         banner_note: "Uporabniki lahko opustijo oglasni trak tako da ga zaprejo. Naenkrat je lahko samo ena tema v oglasnem traku."
@@ -2128,17 +2129,17 @@ sl:
         to_topic_username: "Vnesli ste uporabniško ime. Poslali mu bomo obvestilo s povezavo na to temo."
         to_username: "Vnesite uporabniško ime osebe, ki bi jo povabili v to temo. Poslali mu bomo obvestilo s povezavo na to temo."
         email_placeholder: "name@example.com"
-        success_email: "Poslali smo povabilo na <b>{{emailOrUsername}}</b>. Obvestili vas bomo, ko se bo uporabnik prvič prijavil. Na vaši uporabniški strani lahko v zavihku Povabila spremljate stanje vaših povabil."
+        success_email: "Poslali smo povabilo na <b>%{emailOrUsername}</b>. Obvestili vas bomo, ko se bo uporabnik prvič prijavil. Na vaši uporabniški strani lahko v zavihku Povabila spremljate stanje vaših povabil."
         success_username: "Povabili smo uporabnika, da sodeluje v tej temi."
         error: "Nismo mogli povabiti to osebo. Mogoče je ta oseba že povabljena? (povabila so omejena)"
-        success_existing_email: "Uporabnik z e-naslovom <b>{{emailOrUsername}}</b> že obstaja. Tega uporabnika smo povabili, da sodeluje v tej temi."
+        success_existing_email: "Uporabnik z e-naslovom <b>%{emailOrUsername}</b> že obstaja. Tega uporabnika smo povabili, da sodeluje v tej temi."
       login_reply: "Za odgovor je potrebna prijava"
       filters:
         n_posts:
-          one: "{{count}} prispevek"
-          two: "{{count}} prispevka"
-          few: "{{count}} prispevki"
-          other: "{{count}} prispevkov"
+          one: "%{count} prispevek"
+          two: "%{count} prispevka"
+          few: "%{count} prispevki"
+          other: "%{count} prispevkov"
         cancel: "Odstrani filter"
       move_to:
         title: "Prestavi v"
@@ -2151,20 +2152,20 @@ sl:
         radio_label: "Nova tema"
         error: "Med prestavljanjem prispevkov v novo temo je prišlo do napake."
         instructions:
-          one: "Ustvarili boste novo temo in jo napolnili z <b>{{count}}</b> izbranim prispevkom."
-          two: "Ustvarili boste novo temo in jo napolnili z <b>{{count}}</b> izbranima prispevkoma."
-          few: "Ustvarili boste novo temo in jo napolnili z <b>{{count}}</b> izbranimi prispevki."
-          other: "Ustvarili boste novo temo in jo napolnili z <b>{{count}}</b> izbranimi prispevki."
+          one: "Ustvarili boste novo temo in jo napolnili z <b>%{count}</b> izbranim prispevkom."
+          two: "Ustvarili boste novo temo in jo napolnili z <b>%{count}</b> izbranima prispevkoma."
+          few: "Ustvarili boste novo temo in jo napolnili z <b>%{count}</b> izbranimi prispevki."
+          other: "Ustvarili boste novo temo in jo napolnili z <b>%{count}</b> izbranimi prispevki."
       merge_topic:
         title: "Prestavi v obstoječo temo"
         action: "prestavi v obstoječo temo"
         error: "Med prestavljanjem prispevkov v to temo je prišlo do napake."
         radio_label: "Obstoječa tema"
         instructions:
-          one: "Izberite temo v katero bi prestavili <b>{{count}}</b> prispevek."
-          two: "Izberite temo v katero bi prestavili <b>{{count}}</b> prispevka."
-          few: "Izberite temo v katero bi prestavili <b>{{count}}</b> prispevke."
-          other: "Izberite temo v katero bi prestavili <b>{{count}}</b> prispevkov."
+          one: "Izberite temo v katero bi prestavili <b>%{count}</b> prispevek."
+          two: "Izberite temo v katero bi prestavili <b>%{count}</b> prispevka."
+          few: "Izberite temo v katero bi prestavili <b>%{count}</b> prispevke."
+          other: "Izberite temo v katero bi prestavili <b>%{count}</b> prispevkov."
       move_to_new_message:
         title: "Prestavi v novo ZS"
         action: "prestavi v novo ZS"
@@ -2172,20 +2173,20 @@ sl:
         radio_label: "Novo zasebno sporočilo"
         participants: "Udeleženci"
         instructions:
-          one: "Ustvarili boste novo sporočilo in ga napolnili z <b>{{count}}</b> izbranim prispevkom."
-          two: "Ustvarili boste novo sporočilo in ga napolnili z <b>{{count}}</b> izbranima prispevkoma."
-          few: "Ustvarili boste novo sporočilo in ga napolnili z <b>{{count}}</b> izbranimi prispevki."
-          other: "Ustvarili boste novo sporočilo in ga napolnili z <b>{{count}}</b> izbranimi prispevki."
+          one: "Ustvarili boste novo sporočilo in ga napolnili z <b>%{count}</b> izbranim prispevkom."
+          two: "Ustvarili boste novo sporočilo in ga napolnili z <b>%{count}</b> izbranima prispevkoma."
+          few: "Ustvarili boste novo sporočilo in ga napolnili z <b>%{count}</b> izbranimi prispevki."
+          other: "Ustvarili boste novo sporočilo in ga napolnili z <b>%{count}</b> izbranimi prispevki."
       move_to_existing_message:
         title: "Prestavi v obstoječe zasebno sporočilo"
         action: "prestavi v obstoječe zasebno sporočilo"
         radio_label: "Obstoječe zasebno sporočilo"
         participants: "Udeleženci"
         instructions:
-          one: "Izberite sporočilo v katero bi radi premaknili <b>{{count}}</b> prispevek."
-          two: "Izberite sporočilo v katero bi radi premaknili <b>{{count}}</b> prispevka."
-          few: "Izberite sporočilo v katero bi radi premaknili <b>{{count}}</b> prispevke."
-          other: "Izberite sporočilo v katero bi radi premaknili <b>{{count}}</b> prispevkov."
+          one: "Izberite sporočilo v katero bi radi premaknili <b>%{count}</b> prispevek."
+          two: "Izberite sporočilo v katero bi radi premaknili <b>%{count}</b> prispevka."
+          few: "Izberite sporočilo v katero bi radi premaknili <b>%{count}</b> prispevke."
+          other: "Izberite sporočilo v katero bi radi premaknili <b>%{count}</b> prispevkov."
       merge_posts:
         title: "Združi izbrane prispevke"
         action: "združi izbrane prispevke"
@@ -2196,10 +2197,10 @@ sl:
         error: "Med spreminjanjem lastništva prispevkov je prišlo do napake."
         placeholder: "uporabniško ime novega lastnika"
         instructions:
-          one: "Izberite novega lastnika za {{count}} prispevek od <b>@{{old_user}}</b>"
-          two: "Izberite novega lastnika za {{count}} prispevka od <b>@{{old_user}}</b>"
-          few: "Izberite novega lastnika za {{count}} prispevke od <b>@{{old_user}}</b>"
-          other: "Izberite novega lastnika za {{count}} prispevkov od <b>@{{old_user}}</b>"
+          one: "Izberite novega lastnika za %{count} prispevek od <b>@%{old_user}</b>"
+          two: "Izberite novega lastnika za %{count} prispevka od <b>@%{old_user}</b>"
+          few: "Izberite novega lastnika za %{count} prispevke od <b>@%{old_user}</b>"
+          other: "Izberite novega lastnika za %{count} prispevkov od <b>@%{old_user}</b>"
       change_timestamp:
         title: "Spremeni čas objave..."
         action: "spremeni čas objave"
@@ -2208,7 +2209,7 @@ sl:
         instructions: "Izberite nov čas objave za temo. Prispevki v temi se bodo spremenili z enakim zamikom časa objave."
       multi_select:
         select: "izberi"
-        selected: "izbrani ({{count}})"
+        selected: "izbrani (%{count})"
         select_post:
           label: "izberi"
           title: "Dodaj prispevek med izbrane"
@@ -2226,25 +2227,25 @@ sl:
         select_all: izberi vse
         deselect_all: odznači vse
         description:
-          one: Izbrali ste <b>{{count}}</b> prispevek.
-          two: "Izbrali ste <b>{{count}}</b> prispevka."
-          few: "Izbrali ste <b>{{count}}</b> prispevke."
-          other: "Izbrali ste <b>{{count}}</b> prispevkov."
+          one: Izbrali ste <b>%{count}</b> prispevek.
+          two: "Izbrali ste <b>%{count}</b> prispevka."
+          few: "Izbrali ste <b>%{count}</b> prispevke."
+          other: "Izbrali ste <b>%{count}</b> prispevkov."
       deleted_by_author:
-        one: "(tema umaknjena s strani avtorja bo samodejno izbrisana v {{count}} uri - razen če je prijavljena moderatorju)"
-        two: "(tema umaknjena s strani avtorja bo samodejno izbrisana v {{count}} urah - razen če je prijavljena moderatorju)"
-        few: "(tema umaknjena s strani avtorja bo samodejno izbrisana v {{count}} urah - razen če je prijavljena moderatorju)"
-        other: "(tema umaknjena s strani avtorja bo samodejno izbrisana v {{count}} urah - razen če je prijavljena moderatorju)"
+        one: "(tema umaknjena s strani avtorja bo samodejno izbrisana v %{count} uri - razen če je prijavljena moderatorju)"
+        two: "(tema umaknjena s strani avtorja bo samodejno izbrisana v %{count} urah - razen če je prijavljena moderatorju)"
+        few: "(tema umaknjena s strani avtorja bo samodejno izbrisana v %{count} urah - razen če je prijavljena moderatorju)"
+        other: "(tema umaknjena s strani avtorja bo samodejno izbrisana v %{count} urah - razen če je prijavljena moderatorju)"
     post:
       quote_reply: "Citiraj"
       edit_reason: "Razlog:"
-      post_number: "prispevek {{number}}"
+      post_number: "prispevek %{number}"
       ignored: "Prezrta vsebina"
       wiki_last_edited_on: "wiki zadnjič spremenjen"
       last_edited_on: "prispevek zadnjič spremenjen"
       reply_as_new_topic: "Odgovori v novi povezani temi"
       reply_as_new_private_message: "Odgovori kot zasebno sporočilo z enakimi naslovniki"
-      continue_discussion: "Nadaljevanje pogovora iz {{postLink}}:"
+      continue_discussion: "Nadaljevanje pogovora iz %{postLink}:"
       follow_quote: "pojdi na citiran prispevek"
       show_full: "Prikaži cel prispevek"
       show_hidden: "Prikaži prezrto vsebino."
@@ -2257,38 +2258,38 @@ sl:
       expand_collapse: "razširi/skrči"
       locked: "član osebja je zaklenil ta prispevek za urejanje"
       gap:
-        one: "poglej {{count}} skriti odgovor"
-        two: "poglej {{count}} skrita odgovora"
-        few: "poglej {{count}} skrite odgovore"
-        other: "poglej {{count}} skritih odgovorov"
+        one: "poglej %{count} skriti odgovor"
+        two: "poglej %{count} skrita odgovora"
+        few: "poglej %{count} skrite odgovore"
+        other: "poglej %{count} skritih odgovorov"
       notice:
-        new_user: "Uporabnik {{user}} je prvič objavil prispevek — poskrbimo da bo lepo sprejet v naši skupnosti!"
-        returning_user: "Uporabnik {{user}} že nekaj časa ni sodeloval na forumu — njihov zadnji prispevek je bil objavljen {{time}}."
+        new_user: "Uporabnik %{user} je prvič objavil prispevek — poskrbimo da bo lepo sprejet v naši skupnosti!"
+        returning_user: "Uporabnik %{user} že nekaj časa ni sodeloval na forumu — njihov zadnji prispevek je bil objavljen %{time}."
       unread: "Prispevek je neprebran"
       has_replies:
-        one: "{{count}} odgovor"
-        two: "{{count}} odgovora"
-        few: "{{count}} odgovore"
-        other: "{{count}} odgovorov"
+        one: "%{count} odgovor"
+        two: "%{count} odgovora"
+        few: "%{count} odgovore"
+        other: "%{count} odgovorov"
       has_likes_title:
-        one: "{{count}} uporabniku je prispevek všeč"
-        two: "{{count}} uporabnikoma je prispevek všeč"
-        few: "{{count}} uporabnikom je prispevek všeč"
-        other: "{{count}} uporabnikom je prispevek všeč"
+        one: "%{count} uporabniku je prispevek všeč"
+        two: "%{count} uporabnikoma je prispevek všeč"
+        few: "%{count} uporabnikom je prispevek všeč"
+        other: "%{count} uporabnikom je prispevek všeč"
       has_likes_title_only_you: "všečkali ste prispevek"
       has_likes_title_you:
-        one: "vam in {{count}} drugemu uporabniku je prispevek všeč"
-        two: "vam in {{count}} drugima uporabnikoma je prispevek všeč"
-        few: "vam in {{count}} drugim uporabnikom je prispevek všeč"
-        other: "vam in {{count}} drugim uporabnikom je prispevek všeč"
+        one: "vam in %{count} drugemu uporabniku je prispevek všeč"
+        two: "vam in %{count} drugima uporabnikoma je prispevek všeč"
+        few: "vam in %{count} drugim uporabnikom je prispevek všeč"
+        other: "vam in %{count} drugim uporabnikom je prispevek všeč"
       errors:
         create: "Oprostite, pri ustvarjanju vašega prispevka je prišlo do napake. Poskusite ponovno."
         edit: "Oprostite, pri ustvarjanju vašega prispevka je prišlo do napake. Poskusite ponovno."
         upload: "Oprostite, pri prenosu datoteke je prišlo do napake. Poskusite ponovno."
-        file_too_large: "Datoteka je prevelika (največja velikost je {{max_size_kb}}kb). Naložite vašo veliko datoteko na ponudnika v oblaku in objavite povezavo?"
+        file_too_large: "Datoteka je prevelika (največja velikost je %{max_size_kb}kb). Naložite vašo veliko datoteko na ponudnika v oblaku in objavite povezavo?"
         too_many_uploads: "Oprostite, naenkrat lahko naložite samo eno datoteko."
-        too_many_dragged_and_dropped_files: "Oprostite, naenkrat lahko naložite samo {{max}} datotek."
-        upload_not_authorized: "Oprostite, datoteka ki ste jo hoteli naložiti ni podprta (podprte pripone:{{authorized_extensions}})."
+        too_many_dragged_and_dropped_files: "Oprostite, naenkrat lahko naložite samo %{max} datotek."
+        upload_not_authorized: "Oprostite, datoteka ki ste jo hoteli naložiti ni podprta (podprte pripone:%{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Oprostite, novi uporabniki ne morejo nalagati datotek."
         attachment_upload_not_allowed_for_new_user: "Oprostite, novi uporabniki ne morejo nalagati priponk."
         attachment_download_requires_login: "Oprostite, morate biti prijavljeni da lahko prenesete priponke."
@@ -2325,15 +2326,15 @@ sl:
         delete_replies:
           confirm: "Ali hočete izbrisati tudi vse odgovore na tem prispevku?"
           direct_replies:
-            one: "Da, in {{count}} neposreden odgovor"
-            two: "Da, in {{count}} neposredna odgovora"
-            few: "Da, in {{count}} neposredne odgovore"
-            other: "Da, in {{count}} neposrednih odgovorov"
+            one: "Da, in %{count} neposreden odgovor"
+            two: "Da, in %{count} neposredna odgovora"
+            few: "Da, in %{count} neposredne odgovore"
+            other: "Da, in %{count} neposrednih odgovorov"
           all_replies:
-            one: "Da, in {{count}} odgovor"
-            two: "Da, in {{count}} odgovora"
-            few: "Da, in vse {{count}} odgovore"
-            other: "Da, in vseh {{count}} odgovorov"
+            one: "Da, in %{count} odgovor"
+            two: "Da, in %{count} odgovora"
+            few: "Da, in vse %{count} odgovore"
+            other: "Da, in vseh %{count} odgovorov"
           just_the_post: "Ne, samo ta prispevek"
         admin: "ukrepi administratorja"
         wiki: "Naredi wiki"
@@ -2375,10 +2376,10 @@ sl:
           notify_user: "pošlji opozorilo"
           bookmark: "je zaznamovalo"
           like_capped:
-            one: "in {{count}} drugemu uporabniku je prispevek všeč"
-            two: "in {{count}} drugima uporabnikoma je prispevek všeč"
-            few: "in {{count}} drugim uporabnikom je prispevek všeč"
-            other: "in {{count}} drugim uporabnikom je prispevek všeč"
+            one: "in %{count} drugemu uporabniku je prispevek všeč"
+            two: "in %{count} drugima uporabnikoma je prispevek všeč"
+            few: "in %{count} drugim uporabnikom je prispevek všeč"
+            other: "in %{count} drugim uporabnikom je prispevek všeč"
         by_you:
           off_topic: "Vi ste prijavili da ne ustreza temi"
           spam: "Vi ste prijavili kot neželeno"
@@ -2389,16 +2390,16 @@ sl:
           like: "Vam je všeč"
       delete:
         confirm:
-          one: "Ali ste prepričani da hočete izbrisati ta {{count}} prispevek?"
-          two: "Ali ste prepričani da hočete izbrisati ta {{count}} prispevka?"
-          few: "Ali ste prepričani da hočete izbrisati te {{count}} prispevke?"
-          other: "Ali ste prepričani da hočete izbrisati teh {{count}} prispevkov?"
+          one: "Ali ste prepričani da hočete izbrisati ta %{count} prispevek?"
+          two: "Ali ste prepričani da hočete izbrisati ta %{count} prispevka?"
+          few: "Ali ste prepričani da hočete izbrisati te %{count} prispevke?"
+          other: "Ali ste prepričani da hočete izbrisati teh %{count} prispevkov?"
       merge:
         confirm:
-          one: "Ali ste prepričani da hočete združiti ta {{count}} prispevek?"
-          two: "Ali ste prepričani da hočete združiti ta {{count}} prispevka?"
-          few: "Ali ste prepričani da hočete združiti te {{count}} prispevke?"
-          other: "Ali ste prepričani da hočete združiti teh {{count}} prispevkov?"
+          one: "Ali ste prepričani da hočete združiti ta %{count} prispevek?"
+          two: "Ali ste prepričani da hočete združiti ta %{count} prispevka?"
+          few: "Ali ste prepričani da hočete združiti te %{count} prispevke?"
+          other: "Ali ste prepričani da hočete združiti teh %{count} prispevkov?"
       revisions:
         controls:
           first: "Prva verzija"
@@ -2410,7 +2411,7 @@ sl:
           revert: "Povrni to verzijo"
           edit_wiki: "Uredi wiki"
           edit_post: "Uredi prispevek"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "Prikaži končno obliko z dodajanji in izbrisi"
@@ -2582,20 +2583,20 @@ sl:
       custom_placeholder_notify_moderators: "Napišite kaj vas konkretno moti na prispevku in napišite konkretne primere ter dodajte povezave na motečo vsebino."
       custom_message:
         at_least:
-          one: "vnesite vsaj {{count}} znak"
-          two: "vnesite vsaj {{count}} znaka"
-          few: "vnesite vsaj {{count}} znake"
-          other: "vnesite vsaj {{count}} znakov"
+          one: "vnesite vsaj %{count} znak"
+          two: "vnesite vsaj %{count} znaka"
+          few: "vnesite vsaj %{count} znake"
+          other: "vnesite vsaj %{count} znakov"
         more:
-          one: "{{count}} do konca..."
-          two: "{{count}} do konca..."
-          few: "{{count}} do konca..."
-          other: "{{count}} do konca..."
+          one: "%{count} do konca..."
+          two: "%{count} do konca..."
+          few: "%{count} do konca..."
+          other: "%{count} do konca..."
         left:
-          one: "{{count}} preostal"
-          two: "{{count}} preostala"
-          few: "{{count}} preostali"
-          other: "{{count}} preostalih"
+          one: "%{count} preostal"
+          two: "%{count} preostala"
+          few: "%{count} preostali"
+          other: "%{count} preostalih"
     flagging_topic:
       title: "Hvala, da pomagate ohraniti prijazno skupnost!"
       action: "Prijavi temo"
@@ -2613,7 +2614,7 @@ sl:
     post_links:
       about: "razširi več povezav za to temo"
       title:
-        one: "{{count}} več"
+        one: "%{count} več"
         two: "%{count} več"
         few: "%{count} več"
         other: "%{count} več"
@@ -2643,7 +2644,7 @@ sl:
         title: "Ta tema je zasebno sporočilo"
         help: "Ta tema je zasebno sporočilo"
     posts: "Prispevki"
-    posts_long: "{{number}} prispevkov v tej temi"
+    posts_long: "%{number} prispevkov v tej temi"
     posts_likes_MF: |
       Ta tema ima {count, plural, one {1 odgovor} two {2 odgovora} other {# odgovorov}} {ratio, select,
         low {z visokim razmerjem med všečki in prispevki}
@@ -2659,10 +2660,10 @@ sl:
       other: "ogledov"
     replies: "Odgovori"
     views_long:
-      one: "ta tema je bila ogledna {{number}} krat"
-      two: "ta tema je bila ogledna {{number}} krat"
-      few: "ta tema je bila ogledna {{number}} krat"
-      other: "ta tema je bila ogledna {{number}} krat"
+      one: "ta tema je bila ogledna %{number} krat"
+      two: "ta tema je bila ogledna %{number} krat"
+      few: "ta tema je bila ogledna %{number} krat"
+      other: "ta tema je bila ogledna %{number} krat"
     activity: "Aktivnost"
     likes: "Všečki"
     likes_lowercase:
@@ -2670,7 +2671,7 @@ sl:
       two: "všečka"
       few: "všečki"
       other: "všečkov"
-    likes_long: "{{number}} všečkov v tej temi"
+    likes_long: "%{number} všečkov v tej temi"
     users: "Uporabniki"
     users_lowercase:
       one: "uporabnik"
@@ -2679,7 +2680,7 @@ sl:
       other: "uporabnikov"
     category_title: "Kategorija"
     history: "Zgodovina"
-    changed_by: "od {{author}}"
+    changed_by: "od %{author}"
     raw_email:
       title: "Dohodno e-sporočilo"
       not_available: "Ni na voljo!"
@@ -2690,44 +2691,44 @@ sl:
       latest:
         title: "Najnovejše"
         title_with_count:
-          one: "Najnovejša ({{count}})"
-          two: "Najnovejši ({{count}})"
-          few: "Najnovejše ({{count}})"
-          other: "Najnovejših ({{count}})"
+          one: "Najnovejša (%{count})"
+          two: "Najnovejši (%{count})"
+          few: "Najnovejše (%{count})"
+          other: "Najnovejših (%{count})"
         help: "teme z nedavnimi prispevki"
       read:
         title: "Prebrano"
         help: "teme, ki jih prebrali, urejene po času zadnjega branja"
       categories:
         title: "Kategorije"
-        title_in: "Kategorija - {{categoryName}}"
+        title_in: "Kategorija - %{categoryName}"
         help: "vse teme združene po kategorijah"
       unread:
         title: "Neprebrane"
         title_with_count:
-          one: "Neprebrana ({{count}})"
-          two: "Neprebrani ({{count}})"
-          few: "Neprebrane ({{count}})"
-          other: "Neprebranih ({{count}})"
+          one: "Neprebrana (%{count})"
+          two: "Neprebrani (%{count})"
+          few: "Neprebrane (%{count})"
+          other: "Neprebranih (%{count})"
         help: "teme, ki jih opazujete ali jim sledite z neprebranimi sporočili"
         lower_title_with_count:
-          one: "{{count}} neprebrana"
-          two: "{{count}} neprebrani"
-          few: "{{count}} neprebrane"
-          other: "{{count}} neprebranih"
+          one: "%{count} neprebrana"
+          two: "%{count} neprebrani"
+          few: "%{count} neprebrane"
+          other: "%{count} neprebranih"
       new:
         lower_title_with_count:
-          one: "{{count}} nova"
-          two: "{{count}} novi"
-          few: "{{count}} nove"
-          other: "{{count}} novih"
+          one: "%{count} nova"
+          two: "%{count} novi"
+          few: "%{count} nove"
+          other: "%{count} novih"
         lower_title: "novo"
         title: "Nove"
         title_with_count:
-          one: "Nova ({{count}})"
-          two: "Novi ({{count}})"
-          few: "Nove ({{count}})"
-          other: "Novih ({{count}})"
+          one: "Nova (%{count})"
+          two: "Novi (%{count})"
+          few: "Nove (%{count})"
+          other: "Novih (%{count})"
         help: "teme ustvarjene v zadnjih dneh"
       posted:
         title: "Moji prispevki"
@@ -2736,13 +2737,13 @@ sl:
         title: "Zaznamki"
         help: "teme z zaznamki"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} ({{count}})"
-          two: "{{categoryName}} ({{count}})"
-          few: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
-        help: "zadnje teme v kategoriji {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          two: "%{categoryName} (%{count})"
+          few: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "zadnje teme v kategoriji %{categoryName}"
       top:
         title: "Najboljše"
         help: "najbolj aktivne teme v zadnjem letu, mesecu, tednu ali dnevu"
@@ -2891,10 +2892,10 @@ sl:
       add_synonyms: "Dodaj"
       delete_tag: "Izbriši oznako"
       delete_confirm:
-        one: "Ali ste prepričani, da želite izbrisati to oznako in jo umaknili iz {{count}} teme s to oznako?"
-        two: "Ali ste prepričani, da želite izbrisati to oznako in jo umaknili iz {{count}} tem s to oznako?"
-        few: "Ali ste prepričani, da želite izbrisati to oznako in jo umaknili iz {{count}} tem s to oznako?"
-        other: "Ali ste prepričani, da želite izbrisati to oznako in jo umaknili iz {{count}} tem s to oznako?"
+        one: "Ali ste prepričani, da želite izbrisati to oznako in jo umaknili iz %{count} teme s to oznako?"
+        two: "Ali ste prepričani, da želite izbrisati to oznako in jo umaknili iz %{count} tem s to oznako?"
+        few: "Ali ste prepričani, da želite izbrisati to oznako in jo umaknili iz %{count} tem s to oznako?"
+        other: "Ali ste prepričani, da želite izbrisati to oznako in jo umaknili iz %{count} tem s to oznako?"
       delete_confirm_no_topics: "Ali ste prepričani da hočete izbrisati to oznako?"
       rename_tag: "Preimenuj oznako"
       rename_instructions: "Izberite novo ime za oznako:"
@@ -3161,9 +3162,9 @@ sl:
         events:
           completed_in:
             one: "Dokončano v %{count} sekundi."
-            two: "Dokončano v {{count}} sekundah."
-            few: "Dokončano v {{count}} sekundah."
-            other: "Dokončano v {{count}} sekundah."
+            two: "Dokončano v %{count} sekundah."
+            few: "Dokončano v %{count} sekundah."
+            other: "Dokončano v %{count} sekundah."
           request: "Zahteva"
           timestamp: "Ustvarjeno"
           actions: "Akcije"
@@ -3191,9 +3192,9 @@ sl:
         upload:
           label: "Naloži"
           uploading: "Nalagam..."
-          uploading_progress: "Nalagam... {{progress}}%"
-          success: "'{{filename}}' je bila uspečno prenešena. Datoteka se procesira, zato bo potrebnih nekaj minut, preden se bo pojavila na seznamu."
-          error: "Prišlo je do napake med prenašanjem '{{filename}}': {{message}}"
+          uploading_progress: "Nalagam... %{progress}%"
+          success: "'%{filename}' je bila uspečno prenešena. Datoteka se procesira, zato bo potrebnih nekaj minut, preden se bo pojavila na seznamu."
+          error: "Prišlo je do napake med prenašanjem '%{filename}': %{message}"
         operations:
           cancel:
             label: "Prekliči"
@@ -3500,8 +3501,8 @@ sl:
         check_email:
           text: "Prikaži"
       user:
-        suspend_failed: "Nekaj je šlo narobe pri suspendiranju uporabnika {{error}}"
-        unsuspend_failed: "Nekaj je šlo narobe pri preklicu suspenza {{error}}"
+        suspend_failed: "Nekaj je šlo narobe pri suspendiranju uporabnika %{error}"
+        unsuspend_failed: "Nekaj je šlo narobe pri preklicu suspenza %{error}"
         suspend_duration: "Za kako dolgo bo uporabnik suspendiran?"
         suspend_reason_label: "Zakaj je uporabnik suspendiran? To besedilo <b>bo vidno vsem</b> na uporabnikovem profilu in se bo prikazalo uporabniku, ko se bo poskusil prijaviti. Naj bo kratko."
         suspend_reason_hidden_label: "Zakaj je uporabnik suspendiran? To besedilo bo prikazano uporabniku, ko se bo poskušal vpisati. Naj bo kratko."
@@ -3797,6 +3798,7 @@ sl:
         title: "Emoji"
         help: "Dodaj nov emoji, ki bo na voljo vsem. (lahko prestavite in spustite več datotek naenkrat)"
         add: "Dodaj nov emoji"
+        uploading: "Nalagam..."
         name: "Ime"
         group: "Skupina"
         image: "Slika"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 5abad2f2eb..e37fe9701c 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -23,8 +23,8 @@ sq:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
@@ -183,11 +183,11 @@ sq:
     every_hour: "çdo orë"
     daily: "çdo ditë"
     weekly: "çdo javë"
-    max_of_count: "max i {{count}}"
+    max_of_count: "max i %{count}"
     alternation: "ose"
     character_count:
-      one: "{{count}} shkronjë"
-      other: "{{count}} shkronja"
+      one: "%{count} shkronjë"
+      other: "%{count} shkronja"
     suggested_topics:
       title: "Temat e sugjeruara"
       pm_title: "Mesazhet e sugjeruara"
@@ -280,19 +280,19 @@ sq:
         description: "Postimi juaj u morr, por duhet të aprovohet nga një moderator para se të shfaqet në faqe. Kini pak durim. "
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> postoi <a href='{{topicUrl}}'>temën</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Ju</a> postuat <a href='{{topicUrl}}'>temën</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> iu përgjigj <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Ju</a> i jeni përgjigjur <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> iu përgjigj <a href='{{topicUrl}}'>temës</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Ju</a> i jeni përgjigjur <a href='{{topicUrl}}'>temës</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> përmendi <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> ju ka përmendur <a href='{{user2Url}}'>ju</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Ju</a> keni përmendur <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Postuar nga <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Postuar nga <a href='{{userUrl}}'>ju</a>"
-      sent_by_user: "Dërguar nga <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Dërguar nga <a href='{{userUrl}}'>ju</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> postoi <a href='%{topicUrl}'>temën</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Ju</a> postuat <a href='%{topicUrl}'>temën</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> iu përgjigj <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Ju</a> i jeni përgjigjur <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> iu përgjigj <a href='%{topicUrl}'>temës</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Ju</a> i jeni përgjigjur <a href='%{topicUrl}'>temës</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> përmendi <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> ju ka përmendur <a href='%{user2Url}'>ju</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Ju</a> keni përmendur <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Postuar nga <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Postuar nga <a href='%{userUrl}'>ju</a>"
+      sent_by_user: "Dërguar nga <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Dërguar nga <a href='%{userUrl}'>ju</a>"
     directory:
       filter_name: "filtro sipas emrit të anëtarit"
       title: "Anëtarët"
@@ -445,7 +445,7 @@ sq:
     user_fields:
       none: "(zgjidhni një opsion)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profili"
       mute: "Hesht"
       edit: "Ndrysho preferencat"
@@ -492,17 +492,17 @@ sq:
       external_links_in_new_tab: "Hap të gjitha lidhjet e jashtme në një tab të ri"
       enable_quoting: "Aktivizo citimin në përgjigje për tekstin e përzgjedhur"
       change: "ndrysho"
-      moderator: "{{user}} është moderator"
-      admin: "{{user}} është admin"
+      moderator: "%{user} është moderator"
+      admin: "%{user} është admin"
       moderator_tooltip: "Ky anëtar është moderator"
       admin_tooltip: "Ky anëtar është administrator"
-      suspended_notice: "Ky anëtar është përjashtuar deri më {{date}}."
+      suspended_notice: "Ky anëtar është përjashtuar deri më %{date}."
       suspended_reason: "Arsyeja:"
       github_profile: "Github"
       email_activity_summary: "Përmbledhja e aktivitetit"
       mailing_list_mode:
         individual: "Dërgo një email për çdo postim të ri"
-        many_per_day: "Më dërgo një email për çdo postim të ri (rreth {{dailyEmailEstimate}} në ditë)"
+        many_per_day: "Më dërgo një email për çdo postim të ri (rreth %{dailyEmailEstimate} në ditë)"
         few_per_day: "Më dërgo një email për çdo postim të ri (rreth 2 në ditë)"
       tag_settings: "Etiketat"
       watched_tags: "Vëzhguar"
@@ -527,7 +527,6 @@ sq:
       admin_delete: "Fshi"
       users: "Anëtarët"
       muted_users: "Të heshtur"
-      muted_users_instructions: "Çaktivizo të gjitha njoftimet nga këta anëtarë."
       tracked_topics_link: "Shfaq"
       automatically_unpin_topics: "Çngjiti temat automatikisht kur arrij fundin e faqes."
       apps: "Aplikimet"
@@ -609,11 +608,11 @@ sq:
         instructions: "Mos e shfaq në publik."
         ok: "Do ju nisim emailin e konfirmimit"
         invalid: "Ju lutemi të vendosni një email të vlefshëm"
-        authenticated: "Emaili juaj është verifikuar nga {{provider}}"
+        authenticated: "Emaili juaj është verifikuar nga %{provider}"
         frequency_immediately: "Do t'ju dërgojmë një email menjëherë nëse nuk e keni lexuar temën për të cilën po ju dërgojmë email."
         frequency:
           one: "Do t'ju dërgojmë një email vetëm nëse nuk të kemi parë në faqe në minutën e fundit."
-          other: "Do t'ju dërgojmë një email vetëm nëse nuk të kemi parë në faqe në {{count}} minutat e fundit."
+          other: "Do t'ju dërgojmë një email vetëm nëse nuk të kemi parë në faqe në %{count} minutat e fundit."
       associated_accounts:
         revoke: "Revoko"
         cancel: "Anulo"
@@ -626,9 +625,9 @@ sq:
       username:
         title: "Emri i përdoruesit"
         instructions: "unik, pa hapësira, i shkurtër"
-        short_instructions: "Anëtarët e tjerë mund t'ju përmendin si @{{username}}"
+        short_instructions: "Anëtarët e tjerë mund t'ju përmendin si @%{username}"
         available: "Emri është i disponueshëm"
-        not_available: "Nuk është i disponueshëm. Provoni {{suggestion}}?"
+        not_available: "Nuk është i disponueshëm. Provoni %{suggestion}?"
         not_available_no_suggestion: "I padisponueshëm"
         too_short: "Emri juaj është shumë i shkurtër"
         too_long: "Emri juaj është shumë i gjatë"
@@ -704,14 +703,14 @@ sq:
         user: "Anëtari i ftuar"
         truncated:
           one: "Po afishohet ftesa e parë."
-          other: "Po afishohen {{count}} ftesat e para."
+          other: "Po afishohen %{count} ftesat e para."
         redeemed: "Ftesa të Shlyera"
         redeemed_tab: "Shlyer"
-        redeemed_tab_with_count: "Shlyer ({{count}})"
+        redeemed_tab_with_count: "Shlyer (%{count})"
         redeemed_at: "Shlyer"
         pending: "Ftesat në pritje"
         pending_tab: "Në pritje"
-        pending_tab_with_count: "Në pritje ({{count}})"
+        pending_tab_with_count: "Në pritje (%{count})"
         topics_entered: "Temat e shikuara"
         posts_read_count: "Postimet e lexuara"
         expired: "Kjo ftesë ka skaduar."
@@ -724,10 +723,12 @@ sq:
         time_read: "Koha e leximit"
         days_visited: "Ditë vizituar"
         account_age_days: "Jetëgjatësia e llogarisë (ditë)"
-        create: "Dërgo një ftesë"
+        links_tab: "Lidhjet"
+        link_created_at: "Krijuar"
+        link_groups: Grupet
+        create: "Dërgoni ftesën"
         generate_link: "Kopjo lidhjen e ftesës"
         bulk_invite:
-          text: "Skedari për ftesat në grup"
           success: "Skedari u ngarkua, do njoftoheni me mesazh kur procesi të mbarojë. "
           error: "Na vjen keq, skedari duhet të jete i formatit CSV."
       password:
@@ -806,7 +807,7 @@ sq:
       desc:
         network: "Ju lutemi, kontrolloni lidhjen me Internetin."
         network_fixed: "Duket sikur Interneti u kthye."
-        server: "Kodi i gabimit: {{status}}"
+        server: "Kodi i gabimit: %{status}"
         forbidden: "Nuk keni të drejtë të shikoni këtë."
         not_found: "Ups, aplikimi tentoi të hapë një URL që nuk ekziston. "
         unknown: "Diçka shkoi keq."
@@ -850,8 +851,8 @@ sq:
       hidden_for_session: "OK, do t'ju rikujtojmë nesër. Sidoqoftë, ju mund të përdorni butonin 'Identifikohu' për të hapur një llogari. "
     summary:
       enabled_description: "Po lexoni një përmbledhje të kësaj teme: postimet më interesante sipas vlerësimit të komunitetit."
-      description: "Ka <b>{{replyCount}}</b> përgjigje."
-      description_time: "Ka <b>{{replyCount}}</b> përgjigje, do ju duhen rreth <b>{{readingTime}} minuta për t'i lexuar</b>."
+      description: "Ka <b>%{replyCount}</b> përgjigje."
+      description_time: "Ka <b>%{replyCount}</b> përgjigje, do ju duhen rreth <b>%{readingTime} minuta për t'i lexuar</b>."
       enable: "Përmblidhe këtë Temë"
       disable: "Shfaq të gjithë postimet"
     deleted_filter:
@@ -861,8 +862,8 @@ sq:
       disable: "Shfaq postimet e fshira"
     private_message_info:
       title: "Mesazh"
-      remove_allowed_user: "A doni vërtet të hiqni {{name}} nga ky mesazh?"
-      remove_allowed_group: "Doni me të vërtetë të hiqni {{name}} nga ky mesazh? "
+      remove_allowed_user: "A doni vërtet të hiqni %{name} nga ky mesazh?"
+      remove_allowed_group: "Doni me të vërtetë të hiqni %{name} nga ky mesazh? "
     email: "Email"
     username: "Emri i përdoruesit"
     last_seen: "Shikuar"
@@ -903,7 +904,7 @@ sq:
       awaiting_activation: "Llogaria juaj është në pritje të aktivizimit, përdorni butonin e fjalëkalimit të humbur që të merrni një email të ri me kodin e aktivizimit."
       awaiting_approval: "Llogaria juaj nuk është aprovuar ende nga një admin. Do t'ju dërgojmë një email kur të aprovohet. "
       requires_invite: "Na vjen keq, ky forum është vetëm për anëtarë të ftuar. "
-      not_activated: "Nuk mund të identifikoheni akoma. Ju kemi dërguar një email aktivizimi tek <b>{{sentTo}}</b>. Ndiqni udhëzimet në atë email për të aktivizuar llogarinë tuaj. "
+      not_activated: "Nuk mund të identifikoheni akoma. Ju kemi dërguar një email aktivizimi tek <b>%{sentTo}</b>. Ndiqni udhëzimet në atë email për të aktivizuar llogarinë tuaj. "
       not_allowed_from_ip_address: "Nuk lejohet identifikimi nga kjo adresë IP."
       admin_not_allowed_from_ip_address: "Nuk futesh dot si admin nga kjo adresë IP."
       resend_activation_email: "Klikoni këtu për të dërguar sërish email-in e aktivizimit."
@@ -911,7 +912,7 @@ sq:
       change_email: "Ndrysho adresën email"
       provide_new_email: "Vendosni një adresë të re email dhe do t'ju dërgojmë përsëri mesazhin e konfirmimit."
       submit_new_email: "Ndrysho adresën email"
-      sent_activation_email_again: "Ju dërguam një email aktivizimi të ri tek adresa {{currentEmail}}. Emaili mund të vonohet disa minuta, verifikoni edhe dosjen \"spam\". "
+      sent_activation_email_again: "Ju dërguam një email aktivizimi të ri tek adresa %{currentEmail}. Emaili mund të vonohet disa minuta, verifikoni edhe dosjen \"spam\". "
       to_continue: "Ju lutemi, Identifikohuni"
       preferences: "Duhet të identifikoheni për të ndryshuar preferencat e profilit."
       forgot: "Nuk i mbaj mend detajet e llogarisë"
@@ -975,14 +976,14 @@ sq:
       similar_topics: "Tema juaj është e ngjashme me..."
       drafts_offline: "draftet offline"
       group_mentioned:
-        one: "By mentioning {{group}}, you are about to notify <a href='{{group_link}}'>%{count} person</a> – are you sure?"
-        other: "By mentioning {{group}}, you are about to notify <a href='{{group_link}}'>{{count}} people</a> – are you sure?"
+        one: "By mentioning %{group}, you are about to notify <a href='%{group_link}'>%{count} person</a> – are you sure?"
+        other: "By mentioning %{group}, you are about to notify <a href='%{group_link}'>%{count} people</a> – are you sure?"
       cannot_see_mention:
-        private: "Ju përmendët {{username}} , por ky anëtar nuk do të njoftohet sepse nuk kanë akses në këtë mesazh privat. Do t'ju duhet t'a ftoni anëtarin në këtë mesazh. "
+        private: "Ju përmendët %{username} , por ky anëtar nuk do të njoftohet sepse nuk kanë akses në këtë mesazh privat. Do t'ju duhet t'a ftoni anëtarin në këtë mesazh. "
       error:
         title_missing: "Titulli është i nevojshëm"
         title_too_short: "Titulli duhet të ketë të paktën {{min} shkronja."
-        title_too_long: "Titulli nuk mund të ketë më shumë se {{max}} shkronja"
+        title_too_long: "Titulli nuk mund të ketë më shumë se %{max} shkronja"
         post_length: "Postimi duhet të ketë të paktën {{min} shkronja."
         category_missing: "Duhet të zgjidhni një kategori"
       save_edit: "Ruani modifikimet"
@@ -1043,12 +1044,12 @@ sq:
       none: "Nuk i hapëm dot njoftimet."
       empty: "Nuk u gjet asnjë njoftim. "
       popup:
-        mentioned: '{{username}} ju përmendi në "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} ju përmendi në "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} ju ka cituar në "{{topic}}" - {{site_title}}'
-        replied: '{{username}} ju u përgjigj në "{{topic}}" - {{site_title}}'
-        posted: '{{username}} postoi në "{{topic}}" - {{site_title}}'
-        linked: '{{username}} vendosi një lidhje për postimin tuaj nga "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} ju përmendi në "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} ju përmendi në "%{topic}" - %{site_title}'
+        quoted: '%{username} ju ka cituar në "%{topic}" - %{site_title}'
+        replied: '%{username} ju u përgjigj në "%{topic}" - %{site_title}'
+        posted: '%{username} postoi në "%{topic}" - %{site_title}'
+        linked: '%{username} vendosi një lidhje për postimin tuaj nga "%{topic}" - %{site_title}'
       titles:
         watching_first_post: "temë e re"
     upload_selector:
@@ -1057,9 +1058,9 @@ sq:
       from_my_computer: "Nga kompiuteri im"
       from_the_web: "Nga Interneti"
       remote_tip: "lidhje tek imazhi"
-      remote_tip_with_attachments: "lidhja për imazhin ose skedarin {{authorized_extensions}}"
+      remote_tip_with_attachments: "lidhja për imazhin ose skedarin %{authorized_extensions}"
       local_tip: "zgjidh imazhet nga aparati"
-      local_tip_with_attachments: "zgjidh imazhet apo skedarët nga aparati {{authorized_extensions}}"
+      local_tip_with_attachments: "zgjidh imazhet apo skedarët nga aparati %{authorized_extensions}"
       hint: "(mundet edhe t'i tërhiqni e lëshoni mbi fushën përmbajtjes për t'i hedhur në faqe)"
       hint_for_supported_browsers: "ju mund të tërhiqni e lëshoni imazhet në editorin e tekstit"
       uploading: "Duke ngarkuar"
@@ -1079,12 +1080,12 @@ sq:
       no_results: "Nuk u gjet asnjë rezultat."
       no_more_results: "Nuk gjetëm rezultate të tjera. "
       searching: "Duke kërkuar..."
-      post_format: "#{{post_number}} nga {{username}}"
+      post_format: "#%{post_number} nga %{username}"
       search_google_button: "Google"
       search_google_title: "Kërko në këtë faqe"
       context:
-        user: "Kërko postime nga @{{username}}"
-        category: "Kërkoni kategorinë #{{category}}"
+        user: "Kërko postime nga @%{username}"
+        category: "Kërkoni kategorinë #%{category}"
         topic: "Kërko tek kjo temë"
         private_messages: "Kërko mesazhet"
       advanced:
@@ -1122,7 +1123,7 @@ sq:
         choose_new_category: "Zgjidhni kategorinë e re për temat: "
         selected:
           one: "Keni zgjedhur <b>%{count}</b> temë."
-          other: "Keni zgjedhur <b>{{count}}</b> tema."
+          other: "Keni zgjedhur <b>%{count}</b> tema."
         choose_new_tags: "Zgjidh etiketa të reja për këto tema:"
         changed_tags: "Etiketat e temave u ndryshuan. "
       none:
@@ -1132,7 +1133,7 @@ sq:
         posted: "Nuk keni shkruajtur tek asnjë temë deri tani."
         latest: "Nuk ka tema të fundit. Oh sa keq."
         bookmarks: "Nuk keni ende tema të preferuara. "
-        category: "Nuk ka tema në: {{category}}."
+        category: "Nuk ka tema në: %{category}."
         top: "Nuk ka tema popullore."
         educate:
           new: '<p>Temat e reja shfaqen këtu.</p><p>Automatikisht, temat cilësohen si të reja dhe kanë një shënim <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">i ri</span> nëse janë krijuar gjatë dy ditëve të fundit.</p><p>Vizitoni <a href="%{userPrefsUrl}">preferencat</a> për t''a ndryshuar këtë parametër.</p>'
@@ -1143,13 +1144,13 @@ sq:
         read: "Nuk ka më tema të lexuara."
         new: "Nuk ka më tema të reja."
         unread: "Nuk ka më tema të palexuara."
-        category: "Nuk ka më tema nga {{category}}."
+        category: "Nuk ka më tema nga %{category}."
         top: "Nuk ka më tema popullore."
         bookmarks: "Nuk ka më tema të preferuara."
     topic:
       filter_to:
         one: "%{count} postim në temë"
-        other: "{{count}} postime në temë"
+        other: "%{count} postime në temë"
       create: "Temë e re"
       create_long: "Hap një temë të re"
       private_message: "Fillo një mesazh"
@@ -1168,10 +1169,10 @@ sq:
       unread: "palexuar"
       new_topics:
         one: "%{count} temë e re"
-        other: "{{count}} tema të reja"
+        other: "%{count} tema të reja"
       unread_topics:
         one: "%{count} temë e palexuar"
-        other: "{{count}} tema të palexuara"
+        other: "%{count} tema të palexuara"
       title: "Tema"
       invalid_access:
         title: "Tema është private"
@@ -1185,22 +1186,22 @@ sq:
         description: "Na vjen keq, nuk e gjetëm dot temën. Mund të jetë fshirë nga një moderator... "
       total_unread_posts:
         one: "ju keni %{count} postim të palexuar në këtë temë"
-        other: "ju keni {{count}} postime të palexuara në këtë temë"
+        other: "ju keni %{count} postime të palexuara në këtë temë"
       unread_posts:
         one: "ju keni %{count} postim të vjetër të palexuar në këtë temë"
-        other: "ju keni {{count}} postime të vjetra të palexuara në këtë temë"
+        other: "ju keni %{count} postime të vjetra të palexuara në këtë temë"
       new_posts:
         one: "ka %{count} postim të ri në këtë temë që nga hera e fundit që ishit këtu"
-        other: "ka {{count}} postime të reja në këtë temë që nga hera e fundit që ishit këtu"
+        other: "ka %{count} postime të reja në këtë temë që nga hera e fundit që ishit këtu"
       likes:
         one: "ka %{count} pëlqim në këtë temë"
-        other: "ka {{count}} pëlqime në këtë temë"
+        other: "ka %{count} pëlqime në këtë temë"
       back_to_list: "Kthehu tek lista e temave"
       options: "Opsionet e temës"
       show_links: "trego lidhjet në këtë temë"
       toggle_information: "më shumë mbi temën"
-      read_more_in_category: "Dëshironi të lexoni më shumë? Shfleto temat në {{catLink}} ose {{latestLink}}."
-      read_more: "Dëshironi të lexoni më shumë? {{catLink}} ose {{latestLink}}."
+      read_more_in_category: "Dëshironi të lexoni më shumë? Shfleto temat në %{catLink} ose %{latestLink}."
+      read_more: "Dëshironi të lexoni më shumë? %{catLink} ose %{latestLink}."
       read_more_MF: "Keni { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 shkrim të palexuar</a> } other { <a href='{basePath}/unread'># shkrime të palexuara</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{dhe } false {është } other{}} <a href='{basePath}/new'>1 shkrim të ri</a>} other { {BOTH, select, true{dhe } false {} other{}} <a href='{basePath}/new'># shkrime të reja</a>} } akoma, ose {CATEGORY, select, true {shiko temat e tjera në kategorinë {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Shfleto kategoritë
       view_latest_topics: shiko temat më të fundit
@@ -1306,25 +1307,25 @@ sq:
         success_message: "Sinjalizimi juaj i kësaj teme u krye me sukses. "
       feature_topic:
         title: "Temë në plan të parë"
-        pin: "Shfaqe këtë temë në krye të kategorisë {{categoryLink}} deri më"
-        confirm_pin: "Ju tashmë keni {{count}} tema të përzgjedhura. Shumë tema të përzgjedhura mund të bëhen barrë për përdorues të rinj dhe anonimë. A jeni i sigurtë që dëshironi ta përzgjidhni një temë tjetër në këtë kategori?"
-        unpin: "Remove this topic from the top of the {{categoryLink}} category."
-        unpin_until: "Remove this topic from the top of the {{categoryLink}} category or wait until <strong>%{until}</strong>."
+        pin: "Shfaqe këtë temë në krye të kategorisë %{categoryLink} deri më"
+        confirm_pin: "Ju tashmë keni %{count} tema të përzgjedhura. Shumë tema të përzgjedhura mund të bëhen barrë për përdorues të rinj dhe anonimë. A jeni i sigurtë që dëshironi ta përzgjidhni një temë tjetër në këtë kategori?"
+        unpin: "Remove this topic from the top of the %{categoryLink} category."
+        unpin_until: "Remove this topic from the top of the %{categoryLink} category or wait until <strong>%{until}</strong>."
         pin_note: "Përdoruesit mund ta çngjitin këtë temë veçan sipas dëshirës."
         pin_validation: "Kërkohet data për ta ngjitur këtë temë në krye."
-        not_pinned: "Nuk ka tema të përzgjedhura në {{categoryLink}}."
+        not_pinned: "Nuk ka tema të përzgjedhura në %{categoryLink}."
         already_pinned:
-          one: "Temat kryesore të momentit në {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Temat kryesore të momentit në {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Temat kryesore të momentit në %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Temat kryesore të momentit në %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Shfaqe këtë temë në krye të listës së të gjitha temave deri më"
-        confirm_pin_globally: "Ju tashmë keni {{count}} tema të përzgjedhura. Shumë tema të përzgjedhura mund të bëhen barrë për përdorues të rinj dhe anonimë. A jeni i sigurtë që dëshironi ta përzgjidhni një temë tjetër të gjithanëshme?"
+        confirm_pin_globally: "Ju tashmë keni %{count} tema të përzgjedhura. Shumë tema të përzgjedhura mund të bëhen barrë për përdorues të rinj dhe anonimë. A jeni i sigurtë që dëshironi ta përzgjidhni një temë tjetër të gjithanëshme?"
         unpin_globally: "Remove this topic from the top of all topic lists."
         unpin_globally_until: "Remove this topic from the top of all topic lists or wait until <strong>%{until}</strong>."
         global_pin_note: "Përdoruesit mund ta çngjitin këtë temë veçan sipas dëshirës."
         not_pinned_globally: "Nuk ka tema të përzgjedhura kudo."
         already_pinned_globally:
           one: "Të gjitha temat kryesore të momentit: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Të gjitha temat kryesore të momentit: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Të gjitha temat kryesore të momentit: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Ktheje këtë temë në një temë parrullë që shfaqet në krye të të gjitha faqeve."
         remove_banner: "Remove the banner that appears at the top of all pages."
         banner_note: "Përdoruesit mund ta heqin temën parrullë duke e mbyllur atë. Vetëm një temë mund të kthehet në parrullë në një moment të caktuar."
@@ -1353,14 +1354,14 @@ sq:
         to_topic_username: "Ju shtuat një emër përdoruesi. Ne do t'i dërgojmë një njoftim me një lidhje duke i ftuar ata në këtë temë."
         to_username: "Vendosni emrin e përdoruesit që dëshironi të ftoni. Sistemi do i dërgojë një njoftim me një lidhje drejt kësaj teme. "
         email_placeholder: "emri@adresa.com"
-        success_email: "Sistemi dërgoi një ftesë për <b>{{emailOrUsername}}</b>. Do t'ju njoftojmë kur ftesa të jetë pranuar. Shikoni edhe faqen Ftesat nën profilin tuaj të anëtarit për të parë statusin e ftesave. "
+        success_email: "Sistemi dërgoi një ftesë për <b>%{emailOrUsername}</b>. Do t'ju njoftojmë kur ftesa të jetë pranuar. Shikoni edhe faqen Ftesat nën profilin tuaj të anëtarit për të parë statusin e ftesave. "
         success_username: "Ky anëtar u ftua të marrë pjesë në këtë temë. "
         error: "Nuk e ftuam dot këtë person. A ka mundësi që të jetë ftuar më parë?"
       login_reply: "Identifikohu për t'u Përgjigjur"
       filters:
         n_posts:
           one: "%{count} postim"
-          other: "{{count}} postime"
+          other: "%{count} postime"
         cancel: "Hiq filtrin"
       split_topic:
         title: "Ktheje në një temë të re"
@@ -1369,14 +1370,14 @@ sq:
         error: "Pati një gabim gjatë transfertës drejt një teme të re."
         instructions:
           one: "Jeni duke krijuar një temë të re dhe duke e populluar atë me postimin që keni përzgjedhur."
-          other: "Jeni duke krijuar një temë të re dhe duke e populluar atë me <b>{{count}}</b> postimet që keni përzgjedhur."
+          other: "Jeni duke krijuar një temë të re dhe duke e populluar atë me <b>%{count}</b> postimet që keni përzgjedhur."
       merge_topic:
         title: "Transfero tek një Temë tjetër"
         action: "transfero tek një temë tjetër"
         error: "Pati një gabim gjatë transfertës drejt një teme tjetër."
         instructions:
           one: "Ju lutem zgjidhni një temë ku do dëshironit ta zhvendosni këtë postim."
-          other: "Ju lutem, zgjidhni një temë ku do të dëshironit të zhvendosni këto <b>{{count}}</b> postime."
+          other: "Ju lutem, zgjidhni një temë ku do të dëshironit të zhvendosni këto <b>%{count}</b> postime."
       move_to_new_message:
         radio_label: "Mesazh i ri"
       merge_posts:
@@ -1394,7 +1395,7 @@ sq:
         instructions: "Ju lutem zgjidhni një datë postimi për temën. Postimet në temë do të përditësohen për të patur të njëjtën diferencë kohore."
       multi_select:
         select: "zgjidh"
-        selected: "të zgjedhura ({{count}})"
+        selected: "të zgjedhura (%{count})"
         select_post:
           label: "zgjidh"
         select_replies:
@@ -1405,13 +1406,13 @@ sq:
         deselect_all: pastro zgjedhjen
         description:
           one: Keni përzgjedhur <b>%{count}</b> postim.
-          other: "Keni përzgjedhur <b>{{count}}</b> postime."
+          other: "Keni përzgjedhur <b>%{count}</b> postime."
     post:
       edit_reason: "Arsyeja:"
-      post_number: "postimi {{number}}"
+      post_number: "postimi %{number}"
       last_edited_on: "redaktimi i fundit u krye më"
       reply_as_new_topic: "Përgjigju në një temë të re të ndërlidhur"
-      continue_discussion: "Vazhdim i diskutimit nga tema {{postLink}}:"
+      continue_discussion: "Vazhdim i diskutimit nga tema %{postLink}:"
       follow_quote: "shko tek tema e cituar"
       show_full: "Shfaq postimin e plotë"
       deleted_by_author:
@@ -1420,23 +1421,24 @@ sq:
       expand_collapse: "zgjero/shkurto"
       gap:
         one: "shiko %{count} përgjigje të fshehur"
-        other: "shiko {{count}} përgjigje të fshehura"
+        other: "shiko %{count} përgjigje të fshehura"
       unread: "Postimi është i palexuar"
       has_replies:
-        one: "{{count}} Përgjigje"
-        other: "{{count}} përgjigje"
+        one: "%{count} Përgjigje"
+        other: "%{count} përgjigje"
       has_likes_title:
         one: "%{count} person pëlqeu këtë postim"
-        other: "{{count}} vetë pëlqyen këtë postim"
+        other: "%{count} vetë pëlqyen këtë postim"
       has_likes_title_only_you: "ju pëlqeni këtë postim"
       has_likes_title_you:
         one: "ju dhe %{count} person tjetër pëlqyet këtë postim"
-        other: "ju dhe {{count}} të tjerë pëlqyen këtë postim"
+        other: "ju dhe %{count} të tjerë pëlqyen këtë postim"
       errors:
         create: "Na vjen keq, por ndodhi një gabim gjatë hapjes së temës. Provojeni përsëri."
         edit: "Na vjen keq, ndodhi një gabim gjatë redaktimit të temës. Provojeni përsëri."
         upload: "Na vjen keq, pati një gabim gjatë ngarkimit të skedarit. Provo përsëri. "
         too_many_uploads: "Na vjen keq, por duhet t'i ngarkoni skedarët një nga një."
+        upload_not_authorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Na vjen keq, anëtarët e rinj nuk mund të ngarkojnë skedarë. "
         attachment_upload_not_allowed_for_new_user: "Na vjen keq, anëtarët e rinj nuk mund të ngarkojnë skedarë. "
         attachment_download_requires_login: "Na vjen keq, duhet të identifikoheni për të shkarkuar një dokument. "
@@ -1629,13 +1631,13 @@ sq:
       custom_message:
         at_least:
           one: "futni së paku %{count} gërmë"
-          other: "futni së paku {{count}} gërma"
+          other: "futni së paku %{count} gërma"
         more:
           one: "edhe %{count} për të vazhduar..."
-          other: "edhe {{count}} për të vazhduar..."
+          other: "edhe %{count} për të vazhduar..."
         left:
           one: "edhe %{count} gërmë"
-          other: "edhe {{count}} gërma"
+          other: "edhe %{count} gërma"
     flagging_topic:
       title: "Faleminderit për ndihmën që i jepni këtij komuniteti!"
       action: "Raporto Temën"
@@ -1676,7 +1678,7 @@ sq:
       unlisted:
         help: "Kjo temë nuk është e listuar, pra nuk do të paraqitet nue listat e temave të faqes dhe mund të shikohet vetëm me lidhje direkte"
     posts: "Postime"
-    posts_long: "ka {{number}} postime në temë"
+    posts_long: "ka %{number} postime në temë"
     posts_likes_MF: |
       This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
         low {with a high like to post ratio}
@@ -1694,14 +1696,14 @@ sq:
     likes_lowercase:
       one: "pëlqim"
       other: "pëlqime"
-    likes_long: "ka {{number}} pëlqime në këtë temë"
+    likes_long: "ka %{number} pëlqime në këtë temë"
     users: "Përdoruesit"
     users_lowercase:
       one: "përdorues"
       other: "përdorues"
     category_title: "Kategoria"
     history: "Historia"
-    changed_by: "nga {{author}}"
+    changed_by: "nga %{author}"
     raw_email:
       not_available: "Not available!"
     categories_list: "Lista Kategorive"
@@ -1712,33 +1714,33 @@ sq:
         title: "Më të fundit"
         title_with_count:
           one: "Më të fundit (%{count}) "
-          other: "Më të fundit ({{count}}) "
+          other: "Më të fundit (%{count}) "
         help: "temat me postime të fundit"
       read:
         title: "Lexo"
         help: "temat që keni lexuar, radhitur sipas datës më të fundit të leximit"
       categories:
         title: "Kategoritë"
-        title_in: "Kategoria - {{categoryName}}"
+        title_in: "Kategoria - %{categoryName}"
         help: "të gjitha temat të grupuara sipas kategorisë"
       unread:
         title: "Të palexuara"
         title_with_count:
           one: "Të palexuara (%{count})"
-          other: "Të palexuara ({{count}})"
+          other: "Të palexuara (%{count})"
         help: "topics you are currently watching or tracking with unread posts"
         lower_title_with_count:
           one: "%{count} e palexuar"
-          other: "{{count}} të palexuara"
+          other: "%{count} të palexuara"
       new:
         lower_title_with_count:
           one: "%{count} e re"
-          other: "{{count}} të reja"
+          other: "%{count} të reja"
         lower_title: "e re"
         title: "Të reja"
         title_with_count:
           one: "Të reja (%{count})"
-          other: "Të reja ({{count}})"
+          other: "Të reja (%{count})"
         help: "temat e krijuar gjatë ditëve të fundit"
       posted:
         title: "Postimet e mia"
@@ -1747,11 +1749,11 @@ sq:
         title: "Të preferuarat"
         help: "tema që keni preferuar"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "temat e fundit në kategorinë {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "temat e fundit në kategorinë %{categoryName}"
       top:
         title: "Popullore"
         help: "temat më aktive të vitit, muajit, javës apo ditës së shkuar"
@@ -2082,10 +2084,10 @@ sq:
           label: "Ngarko"
           title: "Upload a backup to this instance"
           uploading: "Duke ngarkuar..."
-          error: "There has been an error while uploading '{{filename}}': {{message}}"
+          error: "There has been an error while uploading '%{filename}': %{message}"
         operations:
           is_running: "An operation is currently running..."
-          failed: "The {{operation}} failed. Please check the logs."
+          failed: "The %{operation} failed. Please check the logs."
           cancel:
             label: "Anulo"
             title: "Cancel the current operation"
@@ -2409,8 +2411,8 @@ sq:
           title: "Shfaq adresën email të këtij përdoruesi."
           text: "Shfaq"
       user:
-        suspend_failed: "Pati një problem gjatë pezullimit të anëtarit. {{error}}"
-        unsuspend_failed: "Pati një problem gjatë çpezullimit të anëtarit. {{error}}"
+        suspend_failed: "Pati një problem gjatë pezullimit të anëtarit. %{error}"
+        unsuspend_failed: "Pati një problem gjatë çpezullimit të anëtarit. %{error}"
         suspend_duration: "Për sa kohë do të pezullohet anëtari?"
         suspend_reason_label: "Pse po e pezulloni? Ky tekst <b>do të shfaqet publikisht</b> në profilin e këtij anëtari, dhe do t'i shfaqet vetë anëtarit si mesazh kur ky i fundit do tentojë të futet në faqe. Shkruani shkurt."
         suspend_reason: "Arsye"
@@ -2684,6 +2686,7 @@ sq:
         title: "Emoji"
         help: "Add new emoji that will be available to everyone. (PROTIP: drag & drop multiple files at once)"
         add: "Add New Emoji"
+        uploading: "Duke ngarkuar..."
         name: "Emri"
         group: "Grupi"
         image: "Imazh"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index b4a1cb8d45..63116c89a8 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -24,8 +24,8 @@ sr:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
@@ -215,12 +215,12 @@ sr:
     every_hour: "svakog sata"
     daily: "svakodnevno"
     weekly: "nedeljno"
-    max_of_count: "maksimalno od {{count}}"
+    max_of_count: "maksimalno od %{count}"
     alternation: "ili"
     character_count:
-      one: "{{count}} karakter"
-      few: "{{count}} karaktera"
-      other: "{{count}} karaktera"
+      one: "%{count} karakter"
+      few: "%{count} karaktera"
+      other: "%{count} karaktera"
     suggested_topics:
       title: "Predložene Teme"
       pm_title: "Predložene poruke"
@@ -305,19 +305,19 @@ sr:
         description: "Primili smo tvoj novi post ali on najpre mora biti odobren od strane moderatora. Budi strpljiv."
         ok: "U redu"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> je objavio <a href='{{topicUrl}}'>temu</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Objavio si <a href='{{topicUrl}}'>temu</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> je odgovorio na <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Ti</a> si odgovorio na <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> je odgovorio <a href='{{topicUrl}}'>na temu</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Ti</a>si odgovorio <a href='{{topicUrl}}'>na temu</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> je spomenuo <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> je spomenuo <a href='{{user2Url}}'>tebe</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Ti</a> si spomenuo <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Objavio <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Objavio <a href='{{userUrl}}'>ti</a>"
-      sent_by_user: "Poslao <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Poslao <a href='{{userUrl}}'>ti</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> je objavio <a href='%{topicUrl}'>temu</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Objavio si <a href='%{topicUrl}'>temu</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> je odgovorio na <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Ti</a> si odgovorio na <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> je odgovorio <a href='%{topicUrl}'>na temu</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Ti</a>si odgovorio <a href='%{topicUrl}'>na temu</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> je spomenuo <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> je spomenuo <a href='%{user2Url}'>tebe</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Ti</a> si spomenuo <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Objavio <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Objavio <a href='%{userUrl}'>ti</a>"
+      sent_by_user: "Poslao <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Poslao <a href='%{userUrl}'>ti</a>"
     directory:
       filter_name: "filtriraj po korisničkom imenu"
       title: "Korisnici"
@@ -438,7 +438,7 @@ sr:
     user_fields:
       none: "(izaberi jednu od opcija)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profil"
       mute: "Utišaj"
       edit: "Uredi postavke"
@@ -472,11 +472,11 @@ sr:
       external_links_in_new_tab: "Otvori sve spoljne linkove u novom tabu"
       enable_quoting: "Omogući citirani odgovor označenog teksta"
       change: "promeni"
-      moderator: "{{user}} je moderator"
-      admin: "{{user}} je administrator"
+      moderator: "%{user} je moderator"
+      admin: "%{user} je administrator"
       moderator_tooltip: "Ovaj korisnik je moderator."
       admin_tooltip: "Ovaj korisnik je administrator"
-      suspended_notice: "Ovaj korisnik je suspendovan do {{date}}."
+      suspended_notice: "Ovaj korisnik je suspendovan do %{date}."
       suspended_reason: "Razlog:"
       github_profile: "Github"
       email_activity_summary: "Sažetak aktivnosti"
@@ -553,7 +553,7 @@ sr:
         title: "E-mail"
         ok: "Poslaćemo vam e-mail za potvrdu"
         invalid: "Molimo unesite validnu e-mail adresu"
-        authenticated: "E-mail vam je potvrđen od {{provider}}"
+        authenticated: "E-mail vam je potvrđen od %{provider}"
         frequency_immediately: "Odmah ćemo vam poslati e-mail ako niste pročitali ono o ćemu vam šaljemo e-mailove."
       associated_accounts:
         revoke: "Povuci"
@@ -567,9 +567,9 @@ sr:
       username:
         title: "Korisničko ime"
         instructions: "jedinstveno, bez razmaka, kratko"
-        short_instructions: "Ljudi vas mogu spominjati kao @{{username}}"
+        short_instructions: "Ljudi vas mogu spominjati kao @%{username}"
         available: "Vaše korisničko ime slobodno"
-        not_available: "Nije dostupno. Pokušajte {{suggestion}}?"
+        not_available: "Nije dostupno. Pokušajte %{suggestion}?"
         too_short: "Vaše korisničko ime prekratko"
         too_long: "Vaše korisničko ime je predugačko"
         checking: "Proveravamo dostupnost korisničkog imena..."
@@ -646,11 +646,13 @@ sr:
         time_read: "Vreme Čitanja"
         days_visited: "Dana posećeno"
         account_age_days: "Starost naloga u danima"
-        create: "Pošalji pozivnicu"
+        links_tab: "Linkovi"
+        link_created_at: "Napravljeno"
+        link_groups: Grupe
         generate_link: "Kopiraj link pozivnice"
         link_generated: "Link pozivnice je uspešno kreiran!"
-        bulk_invite:
-          text: "Skupno pozvati iz datoteke"
+        invite_link:
+          success: "Link pozivnice je uspešno kreiran!"
       password:
         title: "Šifra"
         too_short: "Vaša šifra je prekratka."
@@ -740,7 +742,7 @@ sr:
       desc:
         network: "Molimo proverite vašu internet konekciju."
         network_fixed: "Izlgeda da se vratila."
-        server: "Vrsta greške: {{status}}"
+        server: "Vrsta greške: %{status}"
         forbidden: "Nemate dozvolu da pogledate to."
         unknown: "Nešto nije bilo u redu."
       buttons:
@@ -823,11 +825,11 @@ sr:
       awaiting_activation: "Vaš nalog čeka aktivaciju, poslužite se linkom za zaboravljenu šifru da pošaljemo drugi aktivacijski e-mail."
       awaiting_approval: "Vaš nalog nije odobren od osoblja. Poslaćemo vam e-mail kad bude odobren."
       requires_invite: "Žao nam je, pristup ovoj zajednici je moguć samo uz pozivnicu."
-      not_activated: "Ne možete se još prijaviti. Ranije smo vam poslali e-mail na <b>{{sentTo}}</b>. Molimo sledite uputstva da aktivirate nalog."
+      not_activated: "Ne možete se još prijaviti. Ranije smo vam poslali e-mail na <b>%{sentTo}</b>. Molimo sledite uputstva da aktivirate nalog."
       not_allowed_from_ip_address: "Ne možete se prijaviti s te IP adrese."
       admin_not_allowed_from_ip_address: "Ne možete se prijaviti kao admin sa te IP adrese."
       resend_activation_email: "Pritisnite ovde da ponovno pošaljemo aktivacijski e-mail."
-      sent_activation_email_again: "Poslali smo vam drugi aktivacijski e-mail na: <b>{{currentEmail}}</b>. Možda zatreba par minuta da stigne; svakako proverite nepoželjnu poštu."
+      sent_activation_email_again: "Poslali smo vam drugi aktivacijski e-mail na: <b>%{currentEmail}</b>. Možda zatreba par minuta da stigne; svakako proverite nepoželjnu poštu."
       google_oauth2:
         name: "Google"
         title: "pomoću Google-a"
@@ -865,9 +867,9 @@ sr:
       drafts_offline: "nacrti offline"
       error:
         title_missing: "Naslov je obavezan"
-        title_too_short: "Naslov mora biti barem {{min}} karaktera"
-        title_too_long: "Naslov ne može biti više od {{max}} karaktera"
-        post_length: "Poruka mora imati barem {{min}} karaktera"
+        title_too_short: "Naslov mora biti barem %{min} karaktera"
+        title_too_long: "Naslov ne može biti više od %{max} karaktera"
+        post_length: "Poruka mora imati barem %{min} karaktera"
         category_missing: "Morate odabrati kategoriju"
       save_edit: "Sačuvaj izmenu"
       reply_original: "Odgovori na originalnu temu"
@@ -944,10 +946,10 @@ sr:
       no_results: "Nema rezultata"
       no_more_results: "Nije pronađeno više rezultata"
       searching: "Pretraživanje..."
-      post_format: "#{{post_number}} od {{username}}"
+      post_format: "#%{post_number} od %{username}"
       search_google_button: "Google"
       context:
-        user: "Pretražite poruke od @{{username}}"
+        user: "Pretražite poruke od @%{username}"
         topic: "Pretražite ovu temu"
       advanced:
         title: Napredna pretraga
@@ -976,9 +978,9 @@ sr:
         notification_level: "Obaveštenja"
         choose_new_category: "Izaberite novu kategoriju za vašu temu."
         selected:
-          one: "Odabrali ste <b>{{count}}</b> temu."
-          few: "Odabrali ste <b>{{count}}</b> tema."
-          other: "Odabrali ste <b>{{count}}</b> tema."
+          one: "Odabrali ste <b>%{count}</b> temu."
+          few: "Odabrali ste <b>%{count}</b> tema."
+          other: "Odabrali ste <b>%{count}</b> tema."
       none:
         unread: "Nemate nepročitanih tema."
         new: "Nemate novih tema."
@@ -986,7 +988,7 @@ sr:
         posted: "Niste se još objavljivali ni u jendoj temi."
         latest: "Nema poslednjih tema. To je tužno."
         bookmarks: "Nemate markiranih tema još."
-        category: "Nema tema u {{category}}."
+        category: "Nema tema u %{category}."
         top: "Nema glavnih tema."
       bottom:
         latest: "Nema više najnovijih tema."
@@ -994,7 +996,7 @@ sr:
         read: "Nema više pročitanih tema."
         new: "Nema više novih tema."
         unread: "Nema više nepročitanih tema."
-        category: "Nema više {{category}} tema."
+        category: "Nema više %{category} tema."
         top: "Nema više glavnih tema."
         bookmarks: "Nema više markiranih tema."
     topic:
@@ -1011,12 +1013,12 @@ sr:
       unread: "nepročitano"
       new_topics:
         one: "%{count} nova tema"
-        few: "{{count}} nove teme"
-        other: "{{count}} nove teme"
+        few: "%{count} nove teme"
+        other: "%{count} nove teme"
       unread_topics:
-        one: "{{count}} nepročitana tema"
-        few: "{{count}} nepročitane tema"
-        other: "{{count}} nepročitanih teme"
+        one: "%{count} nepročitana tema"
+        few: "%{count} nepročitane tema"
+        other: "%{count} nepročitanih teme"
       title: "Tema"
       invalid_access:
         title: "Tema je privatna"
@@ -1029,27 +1031,27 @@ sr:
         title: "Tema nije pronađena"
         description: "Žao nam je, nismo mogli pronaći temu. Možda ju je moderator uklonio?"
       total_unread_posts:
-        one: "Imate {{count}} nepročitanu poruku u ovoj temi"
-        few: "Imate {{count}} nepročitanih poruka u ovoj temi"
-        other: "Imate {{count}} nepročitanih poruka u ovoj temi"
+        one: "Imate %{count} nepročitanu poruku u ovoj temi"
+        few: "Imate %{count} nepročitanih poruka u ovoj temi"
+        other: "Imate %{count} nepročitanih poruka u ovoj temi"
       unread_posts:
-        one: "Imate {{count}} staru nepročitanu poruku u ovoj temi"
-        few: "Imate {{count}} starih nepročitanih poruka u ovoj temi"
-        other: "Imate {{count}} starih nepročitanih poruka u ovoj temi"
+        one: "Imate %{count} staru nepročitanu poruku u ovoj temi"
+        few: "Imate %{count} starih nepročitanih poruka u ovoj temi"
+        other: "Imate %{count} starih nepročitanih poruka u ovoj temi"
       new_posts:
-        one: "Ima {{count}} novih poruka u temi od kad ste je zadnji put pročitali"
-        few: "Ima {{count}} novih poruka u temi od kad ste je zadnji put pročitali"
-        other: "Ima {{count}} novih poruka u temi od kad ste je zadnji put pročitali"
+        one: "Ima %{count} novih poruka u temi od kad ste je zadnji put pročitali"
+        few: "Ima %{count} novih poruka u temi od kad ste je zadnji put pročitali"
+        other: "Ima %{count} novih poruka u temi od kad ste je zadnji put pročitali"
       likes:
-        one: "Ima {{count}} sviđanja u temi"
-        few: "Ima {{count}} sviđanja u temi"
-        other: "Ima {{count}} sviđanja u temi"
+        one: "Ima %{count} sviđanja u temi"
+        few: "Ima %{count} sviđanja u temi"
+        other: "Ima %{count} sviđanja u temi"
       back_to_list: "Nazad na listu tema"
       options: "Opcije Teme"
       show_links: "Prikaži linkove u ovoj temi"
       toggle_information: "uključi/isključi detalje teme"
-      read_more_in_category: "Želite da pročitate više? Pregledaj druge teme u {{catLink}} ili {{latestLink}}."
-      read_more: "Želite da pročitate više? {{catLink}} ili {{latestLink}}."
+      read_more_in_category: "Želite da pročitate više? Pregledaj druge teme u %{catLink} ili %{latestLink}."
+      read_more: "Želite da pročitate više? %{catLink} ili %{latestLink}."
       read_more_MF: "There { UNREAD, plural, =0 {} one { is <a href='{basePath}/unread'>1 unread</a> } other { are <a href='{basePath}/unread'># unread</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 new</a> topic} other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># new</a> topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Pregledaj sve kategorije
       view_latest_topics: pogledaj najnovije teme
@@ -1142,7 +1144,7 @@ sr:
         success_message: "Uspešno ste označili ovu temu zastavicom"
       feature_topic:
         title: "Prikaži ovu temu"
-        unpin: "Ukloni ovu temu sa vrha {{categoryLink}} kategorije."
+        unpin: "Ukloni ovu temu sa vrha %{categoryLink} kategorije."
         pin_validation: "Neophodan je datum da zakačite ovu temu"
         unpin_globally: "Ukloni ovu temu sa vrha svih lista"
       inviting: "Pozivanje..."
@@ -1161,8 +1163,8 @@ sr:
       filters:
         n_posts:
           one: "%{count} poruka"
-          few: "{{count}} poruka"
-          other: "{{count}} poruka"
+          few: "%{count} poruka"
+          other: "%{count} poruka"
         cancel: "Uklonite filter"
       split_topic:
         title: "Prebaci u Novu Temu"
@@ -1170,17 +1172,17 @@ sr:
         radio_label: "Nova Tema"
         error: "Dogodila se greška pri prebacivanju poruka u novu temu."
         instructions:
-          one: "Otvorićete novu temu popunjenu s <b>{{count}}</b> poruka koje ste izabrali."
-          few: "Otvorićete novu temu popunjenu s <b>{{count}}</b> poruka koje ste izabrali."
-          other: "Otvorićete novu temu popunjenu s <b>{{count}}</b> poruka koje ste izabrali."
+          one: "Otvorićete novu temu popunjenu s <b>%{count}</b> poruka koje ste izabrali."
+          few: "Otvorićete novu temu popunjenu s <b>%{count}</b> poruka koje ste izabrali."
+          other: "Otvorićete novu temu popunjenu s <b>%{count}</b> poruka koje ste izabrali."
       merge_topic:
         title: "Prebaci u Postojeću Temu"
         action: "prebaci u postojeću temu"
         error: "Dogodili se greška prilikom prebacivanju poruka u tu temu."
         instructions:
-          one: "Molimo odaberite temu u koju želite prebaciti <b>{{count}}</b> poruka."
-          few: "Molimo odaberite temu u koju želite prebaciti <b>{{count}}</b> poruka."
-          other: "Molimo odaberite temu u koju želite prebaciti <b>{{count}}</b> poruka."
+          one: "Molimo odaberite temu u koju želite prebaciti <b>%{count}</b> poruka."
+          few: "Molimo odaberite temu u koju želite prebaciti <b>%{count}</b> poruka."
+          other: "Molimo odaberite temu u koju želite prebaciti <b>%{count}</b> poruka."
       move_to_new_message:
         radio_label: "Nova privatna poruka"
       change_owner:
@@ -1189,7 +1191,7 @@ sr:
         placeholder: "korisničko ime novog vlasnika"
       multi_select:
         select: "odaberi"
-        selected: "odabrano ({{count}})"
+        selected: "odabrano (%{count})"
         select_post:
           label: "odaberi"
         select_replies:
@@ -1199,15 +1201,15 @@ sr:
         select_all: odaberi sve
         deselect_all: odustani od odabira
         description:
-          one: Odabrali ste <b>{{count}}</b> poruka.
-          few: "Odabrali ste <b>{{count}}</b> poruka."
-          other: "Odabrali ste <b>{{count}}</b> poruka."
+          one: Odabrali ste <b>%{count}</b> poruka.
+          few: "Odabrali ste <b>%{count}</b> poruka."
+          other: "Odabrali ste <b>%{count}</b> poruka."
     post:
       edit_reason: "Razlog:"
-      post_number: "poruka {{number}}"
+      post_number: "poruka %{number}"
       last_edited_on: "poruka zadnji puta izmjenjena"
       reply_as_new_topic: "Odgovori u linkovanoj Temi"
-      continue_discussion: "Nastavak diskusije iz {{postLink}}:"
+      continue_discussion: "Nastavak diskusije iz %{postLink}:"
       follow_quote: "idi na citiranu poruku"
       show_full: "Prikaži Celu Poruku"
       deleted_by_author:
@@ -1405,17 +1407,17 @@ sr:
       unlisted:
         help: "Ova tema je ne-listovana; neće se prikazivati na listi tema i može joj se pristupiti samo preko direktnog linka."
     posts: "Poruke"
-    posts_long: "Ima {{number}} poruka u ovoj temi"
+    posts_long: "Ima %{number} poruka u ovoj temi"
     original_post: "Originalna Poruka"
     views: "Pregledi"
     replies: "Odgovori"
     activity: "Aktivnosti"
     likes: "Lajkova"
-    likes_long: "ima {{number}} like-ova u ovoj temi"
+    likes_long: "ima %{number} like-ova u ovoj temi"
     users: "Korisnici"
     category_title: "Kategorija"
     history: "Istorija"
-    changed_by: "od {{author}}"
+    changed_by: "od %{author}"
     raw_email:
       not_available: "Nije dostupno!"
     categories_list: "Lista Kategorija"
@@ -1425,39 +1427,39 @@ sr:
       latest:
         title: "Poslednje"
         title_with_count:
-          one: "Poslednje ({{count}})"
-          few: "Poslednje ({{count}})"
-          other: "Poslednje ({{count}})"
+          one: "Poslednje (%{count})"
+          few: "Poslednje (%{count})"
+          other: "Poslednje (%{count})"
         help: "teme sa nedavnim porukama"
       read:
         title: "Pročitano"
         help: "Teme koje ste pročitali, po redu po kojem ste ih zadnji put čitali"
       categories:
         title: "Kategorije"
-        title_in: "Kategorija - {{categoryName}}"
+        title_in: "Kategorija - %{categoryName}"
         help: "sve teme grupirane po kategorijama"
       unread:
         title: "Nepročitano"
         title_with_count:
-          one: "Nepročitane ({{count}})"
-          few: "Nepročitane ({{count}})"
-          other: "Nepročitane ({{count}})"
+          one: "Nepročitane (%{count})"
+          few: "Nepročitane (%{count})"
+          other: "Nepročitane (%{count})"
         help: "teme koje trenutno posmatrate ili pratite s nepročitanim porukama"
         lower_title_with_count:
           one: "%{count} nepročitana"
-          few: "{{count}} nepročitanih"
-          other: "{{count}} nepročitanih"
+          few: "%{count} nepročitanih"
+          other: "%{count} nepročitanih"
       new:
         lower_title_with_count:
           one: "%{count} nova"
-          few: "{{count}} novih"
-          other: "{{count}} novih"
+          few: "%{count} novih"
+          other: "%{count} novih"
         lower_title: "novo"
         title: "Novo"
         title_with_count:
           one: "Nove (%{count})"
-          few: "Nove ({{count}})"
-          other: "Nove ({{count}})"
+          few: "Nove (%{count})"
+          other: "Nove (%{count})"
         help: "teme otvorene u zadnjih par dana"
       posted:
         title: "Moje poruke"
@@ -1466,8 +1468,8 @@ sr:
         title: "Markiraj"
         help: "teme koje ste markirali"
       category:
-        title: "{{categoryName}}"
-        help: "poslednje teme u {{categoryName}} kategoriji"
+        title: "%{categoryName}"
+        help: "poslednje teme u %{categoryName} kategoriji"
       top:
         title: "Top"
         help: "najaktivnije teme u poslednjih godinu, mesec, nedelju ili dan"
@@ -1706,10 +1708,10 @@ sr:
         upload:
           label: "Učitaj"
           uploading: "Učitavanje..."
-          error: "Dogodila se greška pri učitavanju '{{filename}}': {{message}}"
+          error: "Dogodila se greška pri učitavanju '%{filename}': %{message}"
         operations:
           is_running: "Operacija je trenutno u toku..."
-          failed: "{{operation}} neuspješna. Molimo proverite logove."
+          failed: "%{operation} neuspješna. Molimo proverite logove."
           cancel:
             label: "Odustani"
             title: "Odustani od trenutne operacije."
@@ -1977,8 +1979,8 @@ sr:
           title: "Otkrij korisnikovu email adresu"
           text: "Pokaži"
       user:
-        suspend_failed: "Nešto nije pošlo kako treba pri suspenziji ovog korisnika {{error}}"
-        unsuspend_failed: "Nešto nije u redu, pri ukidanju suspenzije ovog korisnika {{error}}"
+        suspend_failed: "Nešto nije pošlo kako treba pri suspenziji ovog korisnika %{error}"
+        unsuspend_failed: "Nešto nije u redu, pri ukidanju suspenzije ovog korisnika %{error}"
         suspend_duration: "Koliko dugo će ovaj korisnik biti suspendovan?"
         suspend_reason_label: "Zažto ga suspendiraš? Ovaj tekst <b>će biti vidljiv svima</b> na korisničkom profilu korisnika, i biće prikazan korisniku kad se pokuša prijaviti. Neka bude kratak."
         suspend_reason: "Razlog"
@@ -2222,6 +2224,7 @@ sr:
         title: "Emoji"
         help: "Dodajte nove Emoji-e koji će biti dostupni svima. (Savet: povuci i ispusti više datoteka odjednom)"
         add: "Dodaj Novi Emoji"
+        uploading: "Učitavanje..."
         name: "Ime"
         group: "Grupa"
         image: "Slika"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 9c39d3b3bc..e0a936164a 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -23,8 +23,8 @@ sv:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "h:mm a"
       time_with_zone: "HH:mm (z)"
@@ -227,11 +227,11 @@ sv:
     weekly: "veckovis"
     every_month: "varje månad"
     every_six_months: "var sjätte månad"
-    max_of_count: "max av {{count}}"
+    max_of_count: "max av %{count}"
     alternation: "eller"
     character_count:
-      one: "{{count}} tecken"
-      other: "{{count}} tecken"
+      one: "%{count} tecken"
+      other: "%{count} tecken"
     related_messages:
       title: "Relaterade meddelanden"
       see_all: 'Visa <a href="%{path}">alla meddelanden</a> från @%{username}...'
@@ -306,14 +306,14 @@ sv:
         yes_value: "Ja, överge"
         no_value: "Nej, behåll"
     topic_count_latest:
-      one: "Visa {{count}} nytt eller uppdaterat ämne"
-      other: "Visa {{count}} nya eller uppdaterade ämnen"
+      one: "Visa %{count} nytt eller uppdaterat ämne"
+      other: "Visa %{count} nya eller uppdaterade ämnen"
     topic_count_unread:
-      one: "Visa {{count}}oläst ämne"
-      other: "Visa {{count}} olästa ämnen"
+      one: "Visa %{count}oläst ämne"
+      other: "Visa %{count} olästa ämnen"
     topic_count_new:
-      one: "Visa {{count}} nytt ämne"
-      other: "Visa {{count}} nya ämnen"
+      one: "Visa %{count} nytt ämne"
+      other: "Visa %{count} nya ämnen"
     preview: "förhandsgranska"
     cancel: "avbryt"
     save: "Spara ändringar"
@@ -321,7 +321,7 @@ sv:
     saved: "Sparat!"
     upload: "Ladda upp"
     uploading: "Laddar upp..."
-    uploading_filename: "Laddar upp:{{filename}}... "
+    uploading_filename: "Laddar upp:%{filename}... "
     clipboard: "urklipp"
     uploaded: "Uppladdad!"
     pasting: "Klistrar in..."
@@ -375,7 +375,7 @@ sv:
         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."
         claimed_by_you: "Du har gjort anspråk på detta och kan nu granska det."
-        claimed_by_other: "Detta föremål kan enbart granskas av <b>{{username}}</b>."
+        claimed_by_other: "Detta föremål kan enbart granskas av <b>%{username}</b>."
       claim:
         title: "Gör anspråk på ämne"
       unclaim:
@@ -395,7 +395,7 @@ sv:
       view_pending: "visa avvaktande"
       topic_has_pending:
         one: "Detta ämne har <b>%{count}</b> inlägg som inväntar godkännande"
-        other: "Detta ämne har <b>{{count}}</b> inlägg som inväntar godkännande"
+        other: "Detta ämne har <b>%{count}</b> inlägg som inväntar godkännande"
       title: "Granska"
       topic: "Ämne:"
       filtered_topic: "Du har filtrerat för granskning av innehåll i ett enskilt ämne."
@@ -412,17 +412,17 @@ sv:
         fields: "Fält"
       user_percentage:
         summary:
-          one: "{{agreed}},{{disagreed}},{{ignored}} ({{count}} flagga totalt)"
-          other: "{{agreed}},{{disagreed}},{{ignored}} ({{count}} flaggor totalt)"
+          one: "%{agreed},%{disagreed},%{ignored} (%{count} flagga totalt)"
+          other: "%{agreed},%{disagreed},%{ignored} (%{count} flaggor totalt)"
         agreed:
-          one: "{{count}}% instämmer"
-          other: "{{count}}% instämmer"
+          one: "%{count}% instämmer"
+          other: "%{count}% instämmer"
         disagreed:
-          one: "{{count}}% bestrider"
-          other: "{{count}}% bestrider"
+          one: "%{count}% bestrider"
+          other: "%{count}% bestrider"
         ignored:
-          one: "{{count}}% ignorerar"
-          other: "{{count}}% ignorerar"
+          one: "%{count}% ignorerar"
+          other: "%{count}% ignorerar"
       topics:
         topic: "Ämne"
         reviewable_count: "Räkna"
@@ -432,10 +432,10 @@ sv:
         details: "detaljer"
         unique_users:
           one: "%{count}  användare"
-          other: "{{count}} användare"
+          other: "%{count} användare"
       replies:
         one: "%{count} svar"
-        other: "{{count}} svar"
+        other: "%{count} svar"
       edit: "Redigera"
       save: "Spara"
       cancel: "Avbryt"
@@ -499,22 +499,22 @@ sv:
         description: "Vi har mottagit ditt nya inlägg men det behöver bli godkänt av en moderator innan det kan visas. Ha tålamod."
         pending_posts:
           one: "Du har <strong>%{count}</strong> inlägg som avvaktar."
-          other: "Du har <strong>{{count}}</strong> inlägg som avvaktar."
+          other: "Du har <strong>%{count}</strong> inlägg som avvaktar."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> skrev <a href='{{topicUrl}}'>ämnet</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Du</a> skrev <a href='{{topicUrl}}'>ämnet</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> svarade på <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Du</a> svarade på <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> svarade på <a href='{{topicUrl}}'>ämnet</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Du</a> svarade på <a href='{{topicUrl}}'>ämnet</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> nämnde <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> nämnde <a href='{{user2Url}}'>dig</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Du</a> nämnde <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Postat av <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Postat av <a href='{{userUrl}}'>dig</a>"
-      sent_by_user: "Skickat av <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Skickat av <a href='{{userUrl}}'>dig</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> skrev <a href='%{topicUrl}'>ämnet</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Du</a> skrev <a href='%{topicUrl}'>ämnet</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> svarade på <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Du</a> svarade på <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> svarade på <a href='%{topicUrl}'>ämnet</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Du</a> svarade på <a href='%{topicUrl}'>ämnet</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> nämnde <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> nämnde <a href='%{user2Url}'>dig</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Du</a> nämnde <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Postat av <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Postat av <a href='%{userUrl}'>dig</a>"
+      sent_by_user: "Skickat av <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Skickat av <a href='%{userUrl}'>dig</a>"
     directory:
       filter_name: "Filtrera på användarnamn"
       title: "Användare"
@@ -752,7 +752,7 @@ sv:
       none: "(välj ett alternativ)"
       required: 'Vänligen ange ett värde för "%{name}"'
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profil"
       mute: "Tysta"
       edit: "Redigera inställningar"
@@ -828,12 +828,12 @@ sv:
       enable_defer: "Aktivera fördröjning för att markera ämnen som lästa"
       change: "ändra"
       featured_topic: "Utvalt Ämne"
-      moderator: "{{user}} är en moderator"
-      admin: "{{user}} är en admin"
+      moderator: "%{user} är en moderator"
+      admin: "%{user} är en admin"
       moderator_tooltip: "Den här användaren är moderator"
       admin_tooltip: "Den här användaren är administrator"
       silenced_tooltip: "Denna användare är tystad."
-      suspended_notice: "Den här användaren är avstängd till {{date}}."
+      suspended_notice: "Den här användaren är avstängd till %{date}."
       suspended_permanently: "Denna användare är avstängd."
       suspended_reason: "Anledning:"
       github_profile: "Github"
@@ -845,7 +845,7 @@ sv:
           Den här inställningen åsidosätter aktivitetssummeringen.<br />Tystade ämnen och kategorier är inte inkluderade i de här e-postmeddelandena.
         individual: "Skicka ett e-postmeddelande för varje nytt inlägg."
         individual_no_echo: "Jag vill ha ett mail när nya poster publiceras"
-        many_per_day: "Skicka ett e-postmeddelande för varje nytt inlägg (ungefär {{dailyEmailEstimate}} per dag)"
+        many_per_day: "Skicka ett e-postmeddelande för varje nytt inlägg (ungefär %{dailyEmailEstimate} per dag)"
         few_per_day: "Skicka ett e-postmeddelande för varje nytt inlägg (ungefär 2 per dag)"
         warning: "Funktion för e-postlista aktiverad. Inställningar för e-post-notifikation är åsidosatta."
       tag_settings: "Taggar"
@@ -875,9 +875,7 @@ sv:
       admin_delete: "Radera"
       users: "Användare"
       muted_users: "Tystat"
-      muted_users_instructions: "Undanta alla notiser från dessa användare."
       ignored_users: "Ignorerade"
-      ignored_users_instructions: "Tysta alla inlägg och notifieringar från dessa användare."
       tracked_topics_link: "Visa"
       automatically_unpin_topics: "Avklistra automatiskt ämnen när jag når botten"
       apps: "Appar"
@@ -933,12 +931,12 @@ sv:
         disable: "Inaktivera"
         enable: "Aktivera"
         enable_long: "Aktivera reservkoder"
-        manage: "Hantera reservkoder. Du har <strong>{{count}}</strong> reservkod kvar."
+        manage: "Hantera reservkoder. Du har <strong>%{count}</strong> reservkod kvar."
         copy_to_clipboard: "Kopiera till urklipp"
         copy_to_clipboard_error: "Fel vid kopiering av data till urklipp"
         copied_to_clipboard: "Kopierad till urklipp"
         download_backup_codes: "Ladda ner säkerhetskoder"
-        remaining_codes: "Du har <strong>{{count}}</strong> reservkoder kvar."
+        remaining_codes: "Du har <strong>%{count}</strong> reservkoder kvar."
         use: "Använd en reservkod"
         enable_prerequisites: "Då måste aktivera en primär andra faktor innan du skapar reservkoder."
         codes:
@@ -1004,10 +1002,10 @@ sv:
         success_staff: "Vi har skickat e-post till din nuvarande adress. Vänligen följ instruktionerna för konfirmering."
       change_avatar:
         title: "Ändra din profilbild"
-        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>, baserat på"
-        gravatar_title: "Ändra din avatar på {{gravatarName}}s webbsida"
-        gravatar_failed: "Vi kunde inte hitta en {{gravatarName}} för den e-postadressen."
-        refresh_gravatar_title: "Förnya din {{gravatarName}}"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, baserat på"
+        gravatar_title: "Ändra din avatar på %{gravatarName}s webbsida"
+        gravatar_failed: "Vi kunde inte hitta en %{gravatarName} för den e-postadressen."
+        refresh_gravatar_title: "Förnya din %{gravatarName}"
         letter_based: "Profilbild tilldelad av systemet"
         uploaded_avatar: "Anpassad bild"
         uploaded_avatar_empty: "Lägg till en anpassad bild"
@@ -1032,11 +1030,11 @@ sv:
         ok: "Vi skickar e-post till dig för bekräftelse"
         required: "Vänligen ange en e-postadress"
         invalid: "Vänligen ange en giltig e-postadress"
-        authenticated: "Din e-postadress har blivit verifierad av {{provider}}"
+        authenticated: "Din e-postadress har blivit verifierad av %{provider}"
         frequency_immediately: "Vi kommer att skicka e-post till dig omedelbart om du inte har läst det som vi skickar e-post till dig om."
         frequency:
           one: "Vi skickar bara e-post om du inte synts till den senaste minuten."
-          other: "Vi skickar bara e-post om du inte synts till de senaste {{count}} minuterna."
+          other: "Vi skickar bara e-post om du inte synts till de senaste %{count} minuterna."
       associated_accounts:
         title: "Associerade konton"
         connect: "Koppla"
@@ -1057,9 +1055,9 @@ sv:
       username:
         title: "Användarnamn"
         instructions: "unikt, inga mellanrum, kort"
-        short_instructions: "Du kan omnämnas som @{{username}}"
+        short_instructions: "Du kan omnämnas som @%{username}"
         available: "Ditt användarnamn är tillgängligt"
-        not_available: "Inte tillgängligt. Prova {{suggestion}}?"
+        not_available: "Inte tillgängligt. Prova %{suggestion}?"
         not_available_no_suggestion: "Inte tillgänglig"
         too_short: "Ditt användarnamn är för kort"
         too_long: "Ditt användarnamn är för långt"
@@ -1083,11 +1081,11 @@ sv:
         log_out_all: "Logga ut alla"
         active: "aktiv nu"
         not_you: "Inte du?"
-        show_all: "Visa alla ({{count}})"
+        show_all: "Visa alla (%{count})"
         show_few: "Visa färre"
         was_this_you: "Var detta du?"
         was_this_you_description: "Om det inte var du, rekommenderar vi att du ändrar ditt lösenord och loggar ut överallt."
-        browser_and_device: "{{browser}} på {{device}}"
+        browser_and_device: "%{browser} på %{device}"
         secure_account: "Säkra mitt konto"
         latest_post: "Ditt senaste postade..."
       last_posted: "Senaste inlägg"
@@ -1167,20 +1165,19 @@ sv:
         none: "Inga inbjudningar att visa."
         truncated:
           one: "Visar den första inbjudningen."
-          other: "Visar de första {{count}} inbjudningarna."
+          other: "Visar de första %{count} inbjudningarna."
         redeemed: "Inlösta inbjudningar"
         redeemed_tab: "Inlöst"
-        redeemed_tab_with_count: "Inlöst ({{count}})"
+        redeemed_tab_with_count: "Inlöst (%{count})"
         redeemed_at: "Inlöst"
         pending: "Avvaktande inbjudningar"
         pending_tab: "Avvaktar"
-        pending_tab_with_count: "Pågående ({{count}})"
+        pending_tab_with_count: "Pågående (%{count})"
         topics_entered: "Besökta ämnen"
         posts_read_count: "Inlägg Lästa"
         expired: "Denna inbjudan har gått ut."
         rescind: "Ta bort"
         rescinded: "Inbjudan borttagen"
-        rescind_all: "Ta bort alla utgångna inbjudningar"
         rescinded_all: "Alla utgångna inbjudningar har tagits bort!"
         rescind_all_confirm: "Är du säker på att du vill ta bort alla utgångna inbjudningar?"
         reinvite: "Skicka inbjudan igen"
@@ -1191,13 +1188,18 @@ sv:
         time_read: "Lästid"
         days_visited: "Dagar besökta"
         account_age_days: "Kontoålder i dagar"
-        create: "Skicka en inbjudan"
+        links_tab: "Länkar"
+        link_created_at: "Skapad"
+        link_groups: Grupper
+        create: "Skicka inbjudan"
         generate_link: "Kopiera inbjudningslänken"
         link_generated: "Länk för inbjudan framgångsrikt skapad!"
         valid_for: "Länk för inbjudan är endast giltig för denna email adress: %{email}"
+        single_user: "Enstaka användare"
+        invite_link:
+          success: "Länk för inbjudan framgångsrikt skapad!"
         bulk_invite:
           none: "Du har inte bjudit in någon ännu. Skicka individuella inbjudningar eller bjud in många personer på en gång genom att <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>ladda upp en CSV-fil</a>."
-          text: "Massinbjudan från fil"
           success: "Filen laddades upp, du blir underrättad via meddelande när processen är klar"
           error: "Tyvärr, filen bör vara i CSV-format."
           confirmation_message: "Du är på väg att e-posta inbjudningar till alla personer i den uppladdade filen."
@@ -1289,7 +1291,7 @@ sv:
       desc:
         network: "Vänligen kontrollera din uppkoppling."
         network_fixed: "Ser ut som att den är tillbaka."
-        server: "Felmeddelande: {{status}}"
+        server: "Felmeddelande: %{status}"
         forbidden: "Du har inte rättigheter att läsa det där."
         not_found: "Hoppsan, applikationen ledde till en URL som inte existerar."
         unknown: "Något gick fel."
@@ -1352,8 +1354,8 @@ sv:
       value_prop: "När du skapar ett konto så kommer vi ihåg precis vad du har läst, så att du alltid kan komma tillbaka precis där du lämnade oss. Du kan också få notifieringar, här och via e-post, närhelst någon svarar dig. Du kan också gilla inlägg för att sprida kärlek. :heartpulse: "
     summary:
       enabled_description: "Sammanfattning över de inlägg som användarna tycker är mest intressanta."
-      description: "Det finns <b>{{replyCount}}</b> svar."
-      description_time: "Det finns <b>{{replyCount}}</b> svar med en uppskattad lästid på <b>{{readingTime}} minuter</b>."
+      description: "Det finns <b>%{replyCount}</b> svar."
+      description_time: "Det finns <b>%{replyCount}</b> svar med en uppskattad lästid på <b>%{readingTime} minuter</b>."
       enable: "Sammanfatta detta ämne"
       disable: "Visa alla inlägg"
     deleted_filter:
@@ -1366,8 +1368,8 @@ sv:
       invite: "Bjud in andra ..."
       edit: "Lägg till eller ta bort ..."
       leave_message: "Vill du verkligen lämna detta meddelande?"
-      remove_allowed_user: "Vill du verkligen ta bort {{name}} från det här meddelandet?"
-      remove_allowed_group: "Vill du verkligen ta bort {{name}} från det här meddelandet?"
+      remove_allowed_user: "Vill du verkligen ta bort %{name} från det här meddelandet?"
+      remove_allowed_group: "Vill du verkligen ta bort %{name} från det här meddelandet?"
     email: "E-post"
     username: "Användarnamn"
     last_seen: "Sedd"
@@ -1376,7 +1378,7 @@ sv:
     trust_level: "Förtroendenivå"
     search_hint: "användarnamn, e-post eller IP-adress"
     create_account:
-      disclaimer: "Genom att registrera dig godkänner du <a href='{{privacy_link}}' target='blank'>integritetspolicyn</a> och <a href='{{tos_link}}' target='blank'>användarvillkoren</a>."
+      disclaimer: "Genom att registrera dig godkänner du <a href='%{privacy_link}' target='blank'>integritetspolicyn</a> och <a href='%{tos_link}' target='blank'>användarvillkoren</a>."
       title: "Registrera nytt konto"
       failed: "Något gick fel, kanske är denna e-post redan registrerad, försök glömt lösenordslänken"
     forgot_password:
@@ -1436,7 +1438,7 @@ sv:
       awaiting_activation: "Ditt konto väntar på aktivering, använd glömt lösenord-länken för att skicka ett nytt aktiveringsmail."
       awaiting_approval: "Ditt konto har inte godkänts av en moderator än. Du kommer att få ett e-postmeddelande när det är godkänt."
       requires_invite: "Tyvärr, inbjudan krävs för tillgång till detta forum."
-      not_activated: "Du kan inte logga in än. Vi har tidigare skickat ett aktiveringsbrev till dig via <b>{{sentTo}}</b>. Var god följ instruktionerna i det e-postmeddelandet för att aktivera ditt konto."
+      not_activated: "Du kan inte logga in än. Vi har tidigare skickat ett aktiveringsbrev till dig via <b>%{sentTo}</b>. Var god följ instruktionerna i det e-postmeddelandet för att aktivera ditt konto."
       not_allowed_from_ip_address: "Du kan inte logga in från den IP-adressen"
       admin_not_allowed_from_ip_address: "Du kan inte logga in som admin från den IP-adressen."
       resend_activation_email: "Klicka här för att skicka aktiveringsbrevet igen."
@@ -1445,7 +1447,7 @@ sv:
       change_email: "Ändra mailadress"
       provide_new_email: "Ange en ny adress så skickar vi ett nytt bekräftelsemail."
       submit_new_email: "Ändra mailadress"
-      sent_activation_email_again: "Vi har skickat ännu ett aktiveringsmail till dig via <b>{{currentEmail}}</b>. Det kan ta ett par minuter för det att komma fram; var noga med att kolla din skräppost."
+      sent_activation_email_again: "Vi har skickat ännu ett aktiveringsmail till dig via <b>%{currentEmail}</b>. Det kan ta ett par minuter för det att komma fram; var noga med att kolla din skräppost."
       sent_activation_email_again_generic: "Vi skickade ett nytt aktiveringsmeddelande. Det kan ta några minuter innan det kommer; kontrollera din skräppostmapp."
       to_continue: "Var vänligen och logga in"
       preferences: "Du behöver logga in för att ändra dina användarpreferenser."
@@ -1509,20 +1511,20 @@ sv:
     conditional_loading_section:
       loading: Laddar...
     category_row:
-      topic_count: "{{count}} ämnen i denna kategorin"
+      topic_count: "%{count} ämnen i denna kategorin"
     select_kit:
       default_header_text: Välj...
       no_content: Inga matchningar funna
       filter_placeholder: Sök...
       filter_placeholder_with_any: Sök eller skapa...
-      create: "Skapa: '{{content}}'"
+      create: "Skapa: '%{content}'"
       max_content_reached:
-        one: "Du kan endast välja{{count}} föremål."
-        other: "Du kan endast välja {{count}} föremål."
+        one: "Du kan endast välja%{count} föremål."
+        other: "Du kan endast välja %{count} föremål."
       min_content_not_reached:
-        one: "Välj åtminstone {{count}} föremål."
-        other: "Välj åtminstone {{count}} föremål."
-      invalid_selection_length: "Valet måste vara minst {{count}} tecken."
+        one: "Välj åtminstone %{count} föremål."
+        other: "Välj åtminstone %{count} föremål."
+      invalid_selection_length: "Valet måste vara minst %{count} tecken."
       components:
         categories_admin_dropdown:
           title: "Kategorier i rullgardinsmenyn för administratörer"
@@ -1552,7 +1554,7 @@ sv:
       default: Anpassa emojis
     shared_drafts:
       title: "Delade utkast"
-      notice: "Detta ämne är enbart synligt för de som kan se kategorin <b>{{category}}</b>."
+      notice: "Detta ämne är enbart synligt för de som kan se kategorin <b>%{category}</b>."
       destination_category: "Mål kategori"
       publish: "Publicera delat utkast"
       confirm_publish: "Är du säker på att du vill publicera detta utkast?"
@@ -1572,24 +1574,24 @@ sv:
       similar_topics: "Ditt ämne liknar..."
       drafts_offline: "utkast offline"
       edit_conflict: "redigera konflikter"
-      group_mentioned_limit: "<b>Varning!</b> Du omnämnde <a href='{{group_link}}'>{{group}}</a>, denna grupp har fler medlemmar än vad  administratorn tillåter för omnämningar. Begränsningsregeln för omnämningar är satt till {{max}}användare. Ingen kommer därför att notifieras."
+      group_mentioned_limit: "<b>Varning!</b> Du omnämnde <a href='%{group_link}'>%{group}</a>, denna grupp har fler medlemmar än vad  administratorn tillåter för omnämningar. Begränsningsregeln för omnämningar är satt till %{max}användare. Ingen kommer därför att notifieras."
       group_mentioned:
-        one: "Genom att nämna {{group}}, så kommer du att notifiera <a href='{{group_link}}'>%{count} person</a> – är du säker?"
-        other: "Genom att nämna {{group}}, så kommer du att notifiera <a href='{{group_link}}'>{{count}} medlemmar</a> – är du säker?"
+        one: "Genom att nämna %{group}, så kommer du att notifiera <a href='%{group_link}'>%{count} person</a> – är du säker?"
+        other: "Genom att nämna %{group}, så kommer du att notifiera <a href='%{group_link}'>%{count} medlemmar</a> – är du säker?"
       cannot_see_mention:
-        category: "Du nämnde {{username}} men hen kommer inte få någon notifikation för hen har inte tillgång till denna kategori. Du behöver lägga till hen till en grupp som har tillgång till den här kategorin."
-        private: "Du nämnde {{username}} men hen kommer inte få någon notifikation eftersom hen inte kan se detta personliga meddelande. Du behöver bjuda in hen till detta PM."
-      duplicate_link: "Det verkar som din länk till <b>{{domain}}</b> redan har lagts in i ämnet av <b>@{{username}}</b> i <a href='{{post_url}}'> ett svar den {{ago}}</a> – är du säker på att du vill lägga upp den igen?"
-      reference_topic_title: "SV: {{title}}"
+        category: "Du nämnde %{username} men hen kommer inte få någon notifikation för hen har inte tillgång till denna kategori. Du behöver lägga till hen till en grupp som har tillgång till den här kategorin."
+        private: "Du nämnde %{username} men hen kommer inte få någon notifikation eftersom hen inte kan se detta personliga meddelande. Du behöver bjuda in hen till detta PM."
+      duplicate_link: "Det verkar som din länk till <b>%{domain}</b> redan har lagts in i ämnet av <b>@%{username}</b> i <a href='%{post_url}'> ett svar den %{ago}</a> – är du säker på att du vill lägga upp den igen?"
+      reference_topic_title: "SV: %{title}"
       error:
         title_missing: "Du måste ange en rubrik"
-        title_too_short: "Rubriken måste vara minst {{min}} tecken lång."
-        title_too_long: "Rubriken får inte vara längre än {{max}} tecken"
+        title_too_short: "Rubriken måste vara minst %{min} tecken lång."
+        title_too_long: "Rubriken får inte vara längre än %{max} tecken"
         post_missing: "Inlägg får inte vara tomt"
-        post_length: "Inlägg måste vara minst {{min}} tecken långa."
-        try_like: "Har du provat {{heart}} knappen?"
+        post_length: "Inlägg måste vara minst %{min} tecken långa."
+        try_like: "Har du provat %{heart} knappen?"
         category_missing: "Du måste välja en kategori"
-        tags_missing: "Du måste välja åtminstone {{count}} taggar"
+        tags_missing: "Du måste välja åtminstone %{count} taggar"
         topic_template_not_modified: "Lägg till detaljer och specifikationer till ditt ämne genom att redigera ämnesmallen."
       save_edit: "Spara ändring"
       overwrite_edit: "Överskriv redigering"
@@ -1687,10 +1689,10 @@ sv:
       tooltip:
         regular:
           one: "%{count}oläst notifikation"
-          other: "{{count}} olästa notifikationer"
+          other: "%{count} olästa notifikationer"
         message:
           one: "%{count} oläst meddelande"
-          other: "{{count}} olästa meddelanden"
+          other: "%{count} olästa meddelanden"
         high_priority:
           one: "%{count} oläst notifikation med hög prioritet"
           other: "%{count} olästa notifikationer med hög prioritet"
@@ -1699,48 +1701,48 @@ sv:
       empty: "Inga notifieringar hittades."
       post_approved: "Ditt inlägg blev godkänt"
       reviewable_items: "föremål som kräver granskning"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}},{{username2}}</span>{{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username},%{username2}</span>%{description}"
       liked_many:
-        one: "<span>{{username}},{{username2}} och %{count} annan</span> {{description}}"
-        other: "<span>{{username}},{{username2}} och {{count}} andra</span> {{description}}"
+        one: "<span>%{username},%{username2} och %{count} annan</span> %{description}"
+        other: "<span>%{username},%{username2} och %{count} andra</span> %{description}"
       liked_consolidated_description:
-        one: "gillade {{count}} av dina inlägg"
-        other: "gillade {{count}} av dina inlägg"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> accepterade din inbjudan"
-      moved_post: "<span>{{username}}</span> flyttade {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Förtjänade '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Nytt ämne</span> {{description}}"
-      membership_request_accepted: "Medlemskap godkänt i '{{group_name}}'"
-      membership_request_consolidated: "{{count}} öppna medlemsansökningar för '{{group_name}}'"
+        one: "gillade %{count} av dina inlägg"
+        other: "gillade %{count} av dina inlägg"
+      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}"
+      invitee_accepted: "<span>%{username}</span> accepterade din inbjudan"
+      moved_post: "<span>%{username}</span> flyttade %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Förtjänade '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Nytt ämne</span> %{description}"
+      membership_request_accepted: "Medlemskap godkänt i '%{group_name}'"
+      membership_request_consolidated: "%{count} öppna medlemsansökningar för '%{group_name}'"
       group_message_summary:
-        one: "{{count}} meddelande i din {{group_name}} inkorg"
-        other: "{{count}} meddelanden i din {{group_name}}-inkorg"
+        one: "%{count} meddelande i din %{group_name} inkorg"
+        other: "%{count} meddelanden i din %{group_name}-inkorg"
       popup:
-        mentioned: '{{username}} nämnde dig i "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} nämnde dig i "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} citerade dig i "{{topic}}" - {{site_title}}'
-        replied: '{{username}} svarade dig i "{{topic}}" - {{site_title}}'
-        posted: '{{username}} skrev i "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} skickade dig ett privat meddelande i "{{topic}}" - {{site_title}}'
-        linked: '{{username}} länkade till ett inlägg du gjort från "{{topic}}" - {{site_title}}'
-        watching_first_post: '{{username}} skapade ett nytt ämne "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} nämnde dig i "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} nämnde dig i "%{topic}" - %{site_title}'
+        quoted: '%{username} citerade dig i "%{topic}" - %{site_title}'
+        replied: '%{username} svarade dig i "%{topic}" - %{site_title}'
+        posted: '%{username} skrev i "%{topic}" - %{site_title}'
+        private_message: '%{username} skickade dig ett privat meddelande i "%{topic}" - %{site_title}'
+        linked: '%{username} länkade till ett inlägg du gjort från "%{topic}" - %{site_title}'
+        watching_first_post: '%{username} skapade ett nytt ämne "%{topic}" - %{site_title}'
         confirm_title: "Notifieringar aktiverade - %{site_title}"
         confirm_body: "Framgång! Meddelanden har aktiverats."
-        custom: "Notifikationer från {{username}} hos %{site_title}"
+        custom: "Notifikationer från %{username} hos %{site_title}"
       titles:
         mentioned: "omnämnd"
         replied: "nytt svar"
@@ -1770,9 +1772,9 @@ sv:
       from_my_computer: "Från min enhet"
       from_the_web: "Från webben"
       remote_tip: "länk till bild"
-      remote_tip_with_attachments: "länk till bild eller fil {{authorized_extensions}}"
+      remote_tip_with_attachments: "länk till bild eller fil %{authorized_extensions}"
       local_tip: "välj bilder från din enhet"
-      local_tip_with_attachments: "välj bilder eller filer från din enhet {{authorized_extensions}}"
+      local_tip_with_attachments: "välj bilder eller filer från din enhet %{authorized_extensions}"
       hint: "(du kan också dra & släppa in i redigeraren för att ladda upp dem)"
       hint_for_supported_browsers: "du kan också släppa eller klistra in bilder i redigeraren"
       uploading: "Laddar upp bild"
@@ -1789,15 +1791,15 @@ sv:
       clear_all: "Rensa allt"
       too_short: "Din sökterm är för kort."
       result_count:
-        one: "<span>%{count} resultat för</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} resultat för</span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} resultat för</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} resultat för</span><span class='term'>%{term}</span>"
       title: "sök efter ämnen, inlägg, användare, eller kategorier"
       full_page_title: "sök ämnen eller inlägg"
       no_results: "Inga resultat hittades."
       no_more_results: "Inga fler resultat hittades."
       searching: "Söker ..."
-      post_format: "#{{post_number}} av {{username}}"
-      results_page: "Sökresultat för '{{term}}'"
+      post_format: "#%{post_number} av %{username}"
+      results_page: "Sökresultat för '%{term}'"
       more_results: "Det finns fler resultat. Vänligen förfina ditt sökkriterium."
       cant_find: "Hittar du inte det du söker?"
       start_new_topic: "Kanske skapa ett nytt ämne?"
@@ -1806,9 +1808,9 @@ sv:
       search_google_button: "Google"
       search_google_title: "Sök på hemsidan"
       context:
-        user: "Sök inlägg av @{{username}}"
-        category: "Sök #{{category}} kategorin"
-        tag: "Sök efter #{{tag}} taggen"
+        user: "Sök inlägg av @%{username}"
+        category: "Sök #%{category} kategorin"
+        tag: "Sök efter #%{tag} taggen"
         topic: "Sök i det här ämnet"
         private_messages: "Sök meddelanden"
       advanced:
@@ -1885,7 +1887,7 @@ sv:
         choose_new_category: "Välj den nya kategorin för ämnena:"
         selected:
           one: "Du har markerat <b>%{count}</b> ämne."
-          other: "Du har markerat <b>{{count}}</b> ämnen."
+          other: "Du har markerat <b>%{count}</b> ämnen."
         change_tags: "Ersätt taggar"
         append_tags: "Lägg till taggar"
         choose_new_tags: "Välj nya taggar för de här ämnena:"
@@ -1898,7 +1900,7 @@ sv:
         posted: "Du har inte postat i några ämnen ännu."
         latest: "Det finns inga senaste ämnen, tråkigt nog."
         bookmarks: "Du har inga bokmärkta ämnen ännu."
-        category: "Det finns inga ämnen i {{category}}."
+        category: "Det finns inga ämnen i %{category}."
         top: "Det finns inga toppämnen."
         educate:
           new: '<p>Dina nya ämnen hamnar här.</p><p>Standard är att ämnen anses nya och kommer att visa en <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">ny</span> indikator om de skapades de senaste 2 dagarna.</p><p>Besök dina <a href="%{userPrefsUrl}">användarinställningar</a> för att ändra detta.</p>'
@@ -1909,13 +1911,13 @@ sv:
         read: "Det finns inga fler lästa ämnen."
         new: "Det finns inga fler nya ämnen."
         unread: "Det finns inga fler olästa ämnen."
-        category: "Det finns inga fler ämnen i {{category}}."
+        category: "Det finns inga fler ämnen i %{category}."
         top: "Det finns inga fler toppämnen."
         bookmarks: "Inga fler bokmärkta ämnen hittades."
     topic:
       filter_to:
         one: "%{count} inlägg i ämnet"
-        other: "{{count}} inlägg i ämnet"
+        other: "%{count} inlägg i ämnet"
       create: "Nytt ämne"
       create_long: "Skapa ett nytt ämne"
       open_draft: "Öppna utkast"
@@ -1944,10 +1946,10 @@ sv:
       unread: "oläst"
       new_topics:
         one: "%{count} nytt ämne"
-        other: "{{count}} nya ämnen"
+        other: "%{count} nya ämnen"
       unread_topics:
         one: "%{count} oläst ämne"
-        other: "{{count}} olästa ämnen"
+        other: "%{count} olästa ämnen"
       title: "Ämne"
       invalid_access:
         title: "Ämnet är privat"
@@ -1961,24 +1963,24 @@ sv:
         description: "Tyvärr, vi kunde inte hitta det ämnet. Kanske har den tagits bort av en moderator?"
       total_unread_posts:
         one: "du har %{count} oläst inlägg i det här ämnet"
-        other: "du har {{count}} olästa inlägg i det här ämnet"
+        other: "du har %{count} olästa inlägg i det här ämnet"
       unread_posts:
         one: "du har %{count} oläst gammalt inlägg i det här ämnet"
-        other: "du har {{count}} olästa gamla inlägg i det här ämnet"
+        other: "du har %{count} olästa gamla inlägg i det här ämnet"
       new_posts:
         one: "det finns %{count} nytt inlägg i det här ämnet sedan du senast läste den"
-        other: "det finns {{count}} nya inlägg i det här ämnet sedan du senast läste det"
+        other: "det finns %{count} nya inlägg i det här ämnet sedan du senast läste det"
       likes:
         one: "det finns %{count} gillning i det här ämnet"
-        other: "det finns {{count}} gillningar i det här ämnet"
+        other: "det finns %{count} gillningar i det här ämnet"
       back_to_list: "Tillbaka till ämneslistan"
       options: "Ämnesinställningar"
       show_links: "visa länkar som finns i det här ämnet"
       toggle_information: "slå av/på ämnesdetaljer"
-      read_more_in_category: "Vill du läsa mer? Bläddra bland andra ämnen i {{catLink}} eller {{latestLink}}."
-      read_more: "Vill du läsa mer? {{catLink}} eller {{latestLink}}."
-      group_request: "Du behöver begära medlemskap i `{{name}}` gruppen för att se detta ämne"
-      group_join: "Du behöver gå med i `{{name}}` gruppen för att se detta ämne"
+      read_more_in_category: "Vill du läsa mer? Bläddra bland andra ämnen i %{catLink} eller %{latestLink}."
+      read_more: "Vill du läsa mer? %{catLink} eller %{latestLink}."
+      group_request: "Du behöver begära medlemskap i `%{name}` gruppen för att se detta ämne"
+      group_join: "Du behöver gå med i `%{name}` gruppen för att se detta ämne"
       group_request_sent: "Din begäran om gruppmedlemskap har skickats. Du kommer informeras om den har accepterats."
       unread_indicator: "Ingen medlem har läst det senaste inlägget ännu."
       read_more_MF: "Det finns { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 oläst</a> } other { <a href='{basePath}/unread'># olästa</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{och } false {} other{}} <a href='{basePath}/new'>1 nytt</a> ämne} other { {BOTH, select, true{och } false {} other{}} <a href='{basePath}/new'># nya</a> ämnen} } kvar, eller {CATEGORY, select, true {bläddra bland andra ämnen i {catLink}} false {{latestLink}} other {}}"
@@ -2082,7 +2084,7 @@ sv:
           "2_8": "Du kommer se en räknare för nya svar eftersom du följer denna kategorin."
           "2_4": "Du kommer se en räknare för nya svar eftersom du postat ett svar i detta ämne."
           "2_2": "Du kommer se en räknare för nya svar eftersom du följer detta ämne."
-          "2": 'Du kommer se en räknare för nya svar eftersom du <a href="{{basePath}}/u/{{username}}/preferences/notifications">läser detta ämne</a>. '
+          "2": 'Du kommer se en räknare för nya svar eftersom du <a href="%{basePath}/u/%{username}/preferences/notifications">läser detta ämne</a>. '
           "1_2": "Du kommer få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg."
           "1": "Du kommer få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg."
           "0_7": "Du ignorerar alla notifikationer i den här kategorin."
@@ -2158,25 +2160,25 @@ sv:
         choose_category: "Vänligen välj en kategori för det offentliga ämne:"
       feature_topic:
         title: "Gör till utvalt ämne"
-        pin: "Gär det här ämnet synligt i toppen av {{categoryLink}} kategorin tills "
-        confirm_pin: "Du har redan {{count}} klistrade ämnen. För många klistrade ämnen kan vara störande för nya och anonyma användare. Är du säker på att du vill klistra ytterligare ett ämne i denna kategori?"
-        unpin: "Ta bort detta ämne från toppen av kategorin {{categoryLink}}."
-        unpin_until: "Radera det här ämnet från toppen av {{categoryLink}} kategorin eller vänta tills <strong>%{until}</strong>."
+        pin: "Gär det här ämnet synligt i toppen av %{categoryLink} kategorin tills "
+        confirm_pin: "Du har redan %{count} klistrade ämnen. För många klistrade ämnen kan vara störande för nya och anonyma användare. Är du säker på att du vill klistra ytterligare ett ämne i denna kategori?"
+        unpin: "Ta bort detta ämne från toppen av kategorin %{categoryLink}."
+        unpin_until: "Radera det här ämnet från toppen av %{categoryLink} kategorin eller vänta tills <strong>%{until}</strong>."
         pin_note: "Användare kan avklistra ämnet individuellt för sig själva."
         pin_validation: "Ett datum krävs för att klistra fast det här ämnet."
-        not_pinned: "Det finns inga klistrade ämnen i {{categoryLink}}."
+        not_pinned: "Det finns inga klistrade ämnen i %{categoryLink}."
         already_pinned:
-          one: "Nuvarande antal ämnen som är klistrade i {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Nuvarande antal ämnen som är klistrade i {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Nuvarande antal ämnen som är klistrade i %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Nuvarande antal ämnen som är klistrade i %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Gör det här ämnet synligt i toppen av alla ämneslistor tills "
-        confirm_pin_globally: "Du har redan {{count}} globalt klistrade ämnen. För många klistrade ämnen kan vara störande för nya och anonyma användare. Är du säker på att du vill klistra ytterligare ett ämne globalt?"
+        confirm_pin_globally: "Du har redan %{count} globalt klistrade ämnen. För många klistrade ämnen kan vara störande för nya och anonyma användare. Är du säker på att du vill klistra ytterligare ett ämne globalt?"
         unpin_globally: "Ta bort detta ämne från toppen av alla ämneslistor."
         unpin_globally_until: "Ta bort det här ämnet från toppen av alla ämneslistor eller vänta tills <strong>%{until}</strong>."
         global_pin_note: "Användare kan avklistra ämnet individuellt för sig själva."
         not_pinned_globally: "Det finns inga globalt klistrade ämnen."
         already_pinned_globally:
           one: "Nuvarande antal ämnen som klistrats globalt: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "Nuvarande antal ämnen som klistrats globalt: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Nuvarande antal ämnen som klistrats globalt: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Gör detta ämne till en banderoll som dyker upp i toppen av alla sidor."
         remove_banner: "Ta bort banderollen som dyker upp i toppen av alla sidor."
         banner_note: "Användare kan avfärda banderollen genom att stänga den. Endast ett ämne kan agera banderoll åt gången."
@@ -2206,15 +2208,15 @@ sv:
         to_topic_username: "Du har angett ett användarnamn. Vi skickar en notifiering med en länk som bjuder in din vän till detta ämne."
         to_username: "Ange användarnamnet för personen du vill bjuda in. Vi skickar en notifiering med en länk som bjuder in din vän till detta ämne."
         email_placeholder: "namn@exampel.se"
-        success_email: "Vi skickade ut en inbjudan till <b>{{emailOrUsername}}</b>. Vi meddelar dig när inbjudan lösts in. Kolla inbjudningsfliken på din användarsida för att hålla koll på dina inbjudningar."
+        success_email: "Vi skickade ut en inbjudan till <b>%{emailOrUsername}</b>. Vi meddelar dig när inbjudan lösts in. Kolla inbjudningsfliken på din användarsida för att hålla koll på dina inbjudningar."
         success_username: "Vi har bjudit in användaren att delta i detta ämne."
         error: "Tyvärr, vi kunde inte bjuda in den personen. Personen kanske redan har blivit inbjuden? (Invites are rate limited)"
-        success_existing_email: "En användare med e-post <b>{{emailOrUsername}}</b> finns redan. Vi kommer att bjuda in denna personen att delta i detta ämne."
+        success_existing_email: "En användare med e-post <b>%{emailOrUsername}</b> finns redan. Vi kommer att bjuda in denna personen att delta i detta ämne."
       login_reply: "Logga in för att svara"
       filters:
         n_posts:
           one: "%{count} inlägg"
-          other: "{{count}} inlägg"
+          other: "%{count} inlägg"
         cancel: "Ta bort filter"
       move_to:
         title: "Flytta till"
@@ -2228,7 +2230,7 @@ sv:
         error: "Ett fel inträffade då inläggen skulle flyttas till det nya ämnet."
         instructions:
           one: "Du är påväg att skapa ett nytt ämne och lägga inlägget du har valt i den."
-          other: "Du är påväg att skapa en nytt ämne och lägga de <b>{{count}}</b> inlägg du har valt i den."
+          other: "Du är påväg att skapa en nytt ämne och lägga de <b>%{count}</b> inlägg du har valt i den."
       merge_topic:
         title: "Flytta till befintligt ämne"
         action: "flytta till befintligt ämne"
@@ -2236,7 +2238,7 @@ sv:
         radio_label: "Befintliga ämnen"
         instructions:
           one: "Välj vilket ämne du vill flytta det inlägget till."
-          other: "Välj vilket ämne du vill flytta de <br>{{count}}</b> inläggen till."
+          other: "Välj vilket ämne du vill flytta de <br>%{count}</b> inläggen till."
       move_to_new_message:
         title: "Flytta till nytt meddelande"
         action: "flytta till nytt meddelande"
@@ -2245,7 +2247,7 @@ sv:
         participants: "Deltagare"
         instructions:
           one: "Du håller på att skapa ett nytt meddelande och tillföra det  inlägget som du valt."
-          other: "Du håller på att skapa ett nytt meddelande och tillföra de <b>{{count}}</b> inlägg som du har valt."
+          other: "Du håller på att skapa ett nytt meddelande och tillföra de <b>%{count}</b> inlägg som du har valt."
       move_to_existing_message:
         title: "Flytta till existerande meddelande"
         action: "flytta till existerande meddelande"
@@ -2253,7 +2255,7 @@ sv:
         participants: "Deltagare"
         instructions:
           one: "Vänligen välj det meddelande som du vill flytta detta inlägg till."
-          other: "Vänligen välj det meddelande som du vill flytta dessa <b>{{count}}</b> inlägg till."
+          other: "Vänligen välj det meddelande som du vill flytta dessa <b>%{count}</b> inlägg till."
       merge_posts:
         title: "Sammanfoga markerade inlägg"
         action: "sammanfoga markerade inlägg"
@@ -2276,11 +2278,11 @@ sv:
         error: "Ett fel uppstod vid ändringen av ämnets ägarskap."
         placeholder: "användarnamn på den nya ägaren"
         instructions:
-          one: "Vänligen välj en ny ägare för inlägget från <b>@{{old_user}}</b>"
-          other: "Vänligen välj en ny ägare för {{count}} inlägg från <b>@{{old_user}}</b>"
+          one: "Vänligen välj en ny ägare för inlägget från <b>@%{old_user}</b>"
+          other: "Vänligen välj en ny ägare för %{count} inlägg från <b>@%{old_user}</b>"
         instructions_without_old_user:
           one: "Vänligen välj en ny ägare för inlägget"
-          other: "Vänligen välj en ny ägare för de {{count}} inläggen"
+          other: "Vänligen välj en ny ägare för de %{count} inläggen"
       change_timestamp:
         title: "Ändra tidsstämpel..."
         action: "ändra tidsstämpeln"
@@ -2289,7 +2291,7 @@ sv:
         instructions: "Var vänlig välj en ny tidsstämpel för ämnet. Inlägg i det här ämnet kommer att uppdateras för att ha samma tidsskillnad."
       multi_select:
         select: "markera"
-        selected: "markerade ({{count}})"
+        selected: "markerade (%{count})"
         select_post:
           label: "markera"
           title: "Lägg till inlägg för markerad"
@@ -2308,20 +2310,20 @@ sv:
         deselect_all: avmarkera alla
         description:
           one: Du har markerat <b>%{count}</b> inlägg.
-          other: "Du har markerat <b>{{count}}</b> inlägg."
+          other: "Du har markerat <b>%{count}</b> inlägg."
       deleted_by_author:
         one: "(ämne tillbakadraget av författaren, kommer att raderas automatiskt om %{count} timme om det inte flaggas)"
         other: "(ämne tillbakadraget av författaren, kommer att raderas automatiskt om %{count} timmar om det inte flaggas)"
     post:
       quote_reply: "Citat"
       edit_reason: "Anledning:"
-      post_number: "inlägg {{number}}"
+      post_number: "inlägg %{number}"
       ignored: "Ignorerat innehåll"
       wiki_last_edited_on: "Senast gången som wiki redigerades"
       last_edited_on: "inlägg senast ändrat den"
       reply_as_new_topic: "Svara som länkat ämne"
       reply_as_new_private_message: "Svara som nytt meddelande till samma mottagare"
-      continue_discussion: "Fortsätter diskussionen från {{postLink}}:"
+      continue_discussion: "Fortsätter diskussionen från %{postLink}:"
       follow_quote: "gå till det citerade inlägget"
       show_full: "Visa hela inlägget"
       show_hidden: "Visa ignorerat innehåll"
@@ -2333,28 +2335,28 @@ sv:
       locked: "en i personalen har låst detta inlägg från att redigeras"
       gap:
         one: "visa %{count} dolt svar"
-        other: "visa {{count}} dolda svar"
+        other: "visa %{count} dolda svar"
       notice:
-        new_user: "Detta är första gången som användaren {{user}} har skapat ett inlägg  — låt oss välkomna dessa till vår gemenskap!"
-        returning_user: "Det var ett tag sedan vi såg {{user}} — deras senaste inlägg var {{time}}."
+        new_user: "Detta är första gången som användaren %{user} har skapat ett inlägg  — låt oss välkomna dessa till vår gemenskap!"
+        returning_user: "Det var ett tag sedan vi såg %{user} — deras senaste inlägg var %{time}."
       unread: "Inlägget är oläst"
       has_replies:
-        one: "{{count}} svar"
-        other: "{{count}} svar"
+        one: "%{count} svar"
+        other: "%{count} svar"
       has_likes_title:
         one: "%{count} person gillade detta inlägg"
-        other: "{{count}} personer gillade detta inlägg"
+        other: "%{count} personer gillade detta inlägg"
       has_likes_title_only_you: "du gillade det här inlägget"
       has_likes_title_you:
         one: "du och %{count} annan person gillade det här inlägget"
-        other: "du och {{count}} andra personer gillade det här inlägget"
+        other: "du och %{count} andra personer gillade det här inlägget"
       errors:
         create: "Tyvärr, det uppstod ett fel under skapandet av ditt inlägg. Var god försök igen."
         edit: "Tyvärr, det uppstod ett fel under ändringen av ditt inlägg. Var god försök igen."
         upload: "Tyvärr, det uppstod ett fel under uppladdandet av den filen. Vad god försök igen."
-        file_too_large: "Tyvärr, filen är för stor (maximal filstorlek är {{max_size_kb}}kb). Varför inte ladda upp din stora fil till en moln-delningstjänst och sen dela länken?"
+        file_too_large: "Tyvärr, filen är för stor (maximal filstorlek är %{max_size_kb}kb). Varför inte ladda upp din stora fil till en moln-delningstjänst och sen dela länken?"
         too_many_uploads: "Tyvärr, du kan bara ladda upp en bild i taget."
-        too_many_dragged_and_dropped_files: "Tyvärr, du kan bara ladda upp {{max}} filer åt gången."
+        too_many_dragged_and_dropped_files: "Tyvärr, du kan bara ladda upp %{max} filer åt gången."
         upload_not_authorized: "Tyvärr, filen du försöker ladda upp är inte tillåten (tillåtna filtyper: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Tyvärr, nya användare kan inte ladda upp bilder."
         attachment_upload_not_allowed_for_new_user: "Tyvärr, nya användare kan inte bifoga filer."
@@ -2395,10 +2397,10 @@ sv:
           confirm: "Vill du också radera svaren för detta inlägg?"
           direct_replies:
             one: "Ja, och %{count} direkta svar"
-            other: "Ja, och {{count}} direkta svar"
+            other: "Ja, och %{count} direkta svar"
           all_replies:
             one: "Ja, och %{count} svar"
-            other: "Ja, och alla {{count}} svar"
+            other: "Ja, och alla %{count} svar"
           just_the_post: "Nej, bara det här inlägget"
         admin: "administratörsåtgärder för inlägg"
         wiki: "Skapa wiki"
@@ -2445,11 +2447,11 @@ sv:
             one: "läste detta"
             other: "läste detta"
           like_capped:
-            one: "och {{count}} annan gillade detta"
-            other: "och {{count}} andra gillade detta"
+            one: "och %{count} annan gillade detta"
+            other: "och %{count} andra gillade detta"
           read_capped:
-            one: "och {{count}} annan läste detta"
-            other: "och {{count}} andra läste detta"
+            one: "och %{count} annan läste detta"
+            other: "och %{count} andra läste detta"
         by_you:
           off_topic: "Du flaggade detta som orelevant"
           spam: "Du flaggade detta som skräppost"
@@ -2461,11 +2463,11 @@ sv:
       delete:
         confirm:
           one: "Är du säker på att du vill radera detta inlägg?"
-          other: "Är du säker på att du vill radera dessa {{count}} inlägg?"
+          other: "Är du säker på att du vill radera dessa %{count} inlägg?"
       merge:
         confirm:
           one: "Är du säker på att du vill slå ihop dessa inlägg?"
-          other: "Är du säker på att du vill sammanfoga de {{count}} inläggen?"
+          other: "Är du säker på att du vill sammanfoga de %{count} inläggen?"
       revisions:
         controls:
           first: "Första revision"
@@ -2477,7 +2479,7 @@ sv:
           revert: "Återgå till den här revisionen"
           edit_wiki: "Uppdatera Wiki"
           edit_post: "Ändra meddelandet"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong>{{icon}}<strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong>%{icon}<strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "Visa resultat med tillägg och borttagningar inline"
@@ -2582,6 +2584,7 @@ sv:
       sort_order: "Sortera ämneslista enligt:"
       default_view: "Förvald ämneslista"
       default_top_period: "Standard Topp-period:"
+      default_list_filter: "Standard listfilter:"
       allow_badges_label: "Tillåt utmärkelser i den här kategorin"
       edit_permissions: "Redigera behörigheter"
       reviewable_by_group: "I tillägg till personal, kan inlägg och flaggor i denna kategori också granskas av:"
@@ -2668,13 +2671,13 @@ sv:
       custom_message:
         at_least:
           one: "skriv åtminstone %{count} tecken"
-          other: "skriv åtminstone {{count}} tecken"
+          other: "skriv åtminstone %{count} tecken"
         more:
           one: "%{count} till..."
-          other: "{{count}} till..."
+          other: "%{count} till..."
         left:
           one: "%{count} kvar"
-          other: "{{count}} kvar"
+          other: "%{count} kvar"
     flagging_topic:
       title: "Tack för att du hjälper oss hålla forumet civiliserat!"
       action: "Flagga ämne"
@@ -2718,7 +2721,7 @@ sv:
         title: "Detta ämne är ett personligt meddelande"
         help: "Detta ämne är ett personligt meddelande"
     posts: "Inlägg"
-    posts_long: "det finns {{number}} inlägg i detta ämne"
+    posts_long: "det finns %{number} inlägg i detta ämne"
     posts_likes_MF: |
       Detta ämne har {count, plural, one {1 svar} other {# svar}} {ratio, select,
       low {med ett högt förhållande mellan gillningar och inlägg}
@@ -2733,20 +2736,20 @@ sv:
     replies: "Svar"
     views_long:
       one: "Detta ämnet har visats %{count} gång"
-      other: "Detta ämne har visats {{number}} gånger"
+      other: "Detta ämne har visats %{number} gånger"
     activity: "Aktivitet"
     likes: "Gillningar"
     likes_lowercase:
       one: "gillar"
       other: "gillar"
-    likes_long: "det finns {{number}} gillningar i detta ämne"
+    likes_long: "det finns %{number} gillningar i detta ämne"
     users: "Användare"
     users_lowercase:
       one: "användare"
       other: "användare"
     category_title: "Kategori"
     history: "Historik"
-    changed_by: "av {{author}}"
+    changed_by: "av %{author}"
     raw_email:
       title: "Inkommande mail"
       not_available: "Ej tillgänglig!"
@@ -2758,33 +2761,33 @@ sv:
         title: "Senaste"
         title_with_count:
           one: "Senaste (%{count})"
-          other: "Senaste ({{count}})"
+          other: "Senaste (%{count})"
         help: "ämnen med nya inlägg"
       read:
         title: "Lästa"
         help: "ämnen du har läst, i den ordningen du senast läste dem"
       categories:
         title: "Kategorier"
-        title_in: "Kategori - {{categoryName}}"
+        title_in: "Kategori - %{categoryName}"
         help: "alla ämnen grupperade efter kategori"
       unread:
         title: "Olästa"
         title_with_count:
           one: "Oläst"
-          other: "Olästa ({{count}})"
+          other: "Olästa (%{count})"
         help: "ämnen som du bevakar eller följer med olästa inlägg"
         lower_title_with_count:
           one: "%{count} oläst"
-          other: "{{count}} olästa"
+          other: "%{count} olästa"
       new:
         lower_title_with_count:
           one: "%{count} ny"
-          other: "{{count}} nya"
+          other: "%{count} nya"
         lower_title: "ny"
         title: "Nya"
         title_with_count:
           one: "Ny (%{count})"
-          other: "Nya ({{count}})"
+          other: "Nya (%{count})"
         help: "ämnen skapade de senaste dagarna"
       posted:
         title: "Mina Inlägg"
@@ -2793,11 +2796,11 @@ sv:
         title: "Bokmärken"
         help: "Ämnen du har bokmärkt"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "senaste ämnena i kategorin {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "senaste ämnena i kategorin %{categoryName}"
       top:
         title: "Topp"
         help: "de mest aktiva ämnena det senaste året, månaden, veckan eller dagen"
@@ -2961,8 +2964,8 @@ sv:
       synonyms: "Synonymer"
       synonyms_description: "När följande taggar används, kommer de att ersättas med <b>%{base_tag_name}</b>."
       tag_groups_info:
-        one: 'Denna tagg tillhör gruppen: "{{tag_groups}}".'
-        other: "Denna tagg tillhör dessa grupper: {{tag_groups}}."
+        one: 'Denna tagg tillhör gruppen: "%{tag_groups}".'
+        other: "Denna tagg tillhör dessa grupper: %{tag_groups}."
       category_restrictions:
         one: "Den kan enbart användas i denna kategori:"
         other: "Den kan enbart användas i dessa kategorier:"
@@ -2978,11 +2981,11 @@ sv:
       delete_tag: "Radera tag"
       delete_confirm:
         one: "Är du säker på att du vill radera denna tagg och ta bort den från %{count} ämne som den har tilldelats?"
-        other: "Är du säker på att du vill radera denna tagg och ta bort den från {{count}} ämnen som den har tilldelats?"
+        other: "Är du säker på att du vill radera denna tagg och ta bort den från %{count} ämnen som den har tilldelats?"
       delete_confirm_no_topics: "Är du säker på att du vill ta bort denna tagg?"
       delete_confirm_synonyms:
         one: "Dess synonym kommer också att raderas."
-        other: "Dess {{count}} synonymer kommer också att raderas."
+        other: "Dess %{count} synonymer kommer också att raderas."
       rename_tag: "Döp om taggen"
       rename_instructions: "Välj ett nytt namn för taggen:"
       sort_by: "Sortera efter:"
@@ -3340,10 +3343,10 @@ sv:
           redeliver: "Leverera igen"
           incoming:
             one: "Det finns ett nytt event."
-            other: "Det finns {{count}} nya event."
+            other: "Det finns %{count} nya event."
           completed_in:
             one: "Färdigställd på %{count} sekund."
-            other: "Färdigställd på {{count}} sekunder."
+            other: "Färdigställd på %{count} sekunder."
           request: "Förfrågning"
           response: "Svar"
           redeliver_confirm: "Är du säker på att du vill leverera samma nyttolast igen?"
@@ -3395,12 +3398,12 @@ sv:
           label: "Ladda upp"
           title: "Ladda upp en säkerhetskopia till denna instans"
           uploading: "Laddar upp..."
-          uploading_progress: "Laddar upp... {{progress}} %"
-          success: "'{{filename}}' har framgångsrikt uppladdats. Filen bearbetas nu och det kan dröja upp till en minut innan den syns i listan."
-          error: "Ett fel har uppstått vid uppladdning av '{{filename}}': {{message}}"
+          uploading_progress: "Laddar upp... %{progress} %"
+          success: "'%{filename}' har framgångsrikt uppladdats. Filen bearbetas nu och det kan dröja upp till en minut innan den syns i listan."
+          error: "Ett fel har uppstått vid uppladdning av '%{filename}': %{message}"
         operations:
           is_running: "En operation körs just nu..."
-          failed: " {{operation}} misslyckades. Var vänlig och kontrollera loggarna."
+          failed: " %{operation} misslyckades. Var vänlig och kontrollera loggarna."
           cancel:
             label: "Avbryt"
             title: "Avbryt den pågående operationen"
@@ -3523,7 +3526,7 @@ sv:
           disabled_component_tooltip: "Den här komponenten har inaktiverats"
           default_theme_tooltip: "Detta tema är webbplatsens standardtema"
           updates_available_tooltip: "Uppdateringar finns tillgängliga för detta tema"
-          and_x_more: "och ytterligare {{count}}."
+          and_x_more: "och ytterligare %{count}."
           collapse: Förminska
           uploads: "Uppladningar"
           no_uploads: "Du kan ladda upp tillgångar som är kopplade till ditt tema, t.ex. teckensnitt och bilder"
@@ -3572,8 +3575,8 @@ sv:
           disabled_by: "Den här komponenten har inaktiverats av"
           required_version:
             error: "Det här temat har automatiskt inaktiverats på grund av att det inte är kompatibelt med denna versionen av Discourse."
-            minimum: "Kräver Discourse version {{version}} eller högre."
-            maximum: "Kräver Discourse version {{version}} eller lägre."
+            minimum: "Kräver Discourse version %{version} eller högre."
+            maximum: "Kräver Discourse version %{version} eller lägre."
           component_of: "Komponent av:"
           update_to_latest: "Uppdatera till senaste"
           check_for_updates: "Sök efter uppdateringar"
@@ -3586,7 +3589,7 @@ sv:
           empty: "Inga objekt"
           commits_behind:
             one: "Temat ligger %{count} åtagande efter!"
-            other: "Temat ligger {{count}} åtaganden efter!"
+            other: "Temat ligger %{count} åtaganden efter!"
           compare_commits: "(se nya åtaganden)"
           repo_unreachable: "Kunde inte kontakta Git-förvaringen för detta tema. Felmeddelande:"
           imported_from_archive: "Detta tema importerades från en .zip fil"
@@ -3991,8 +3994,8 @@ sv:
           title: "Visa den här användarens e-postadress"
           text: "Visa"
       user:
-        suspend_failed: "Någonting gick fel under avstängningen av denna användare {{error}}"
-        unsuspend_failed: "Någonting gick fel under upplåsningen av denna användare {{error}}"
+        suspend_failed: "Någonting gick fel under avstängningen av denna användare %{error}"
+        unsuspend_failed: "Någonting gick fel under upplåsningen av denna användare %{error}"
         suspend_duration: "Hur länge ska användaren vara avstängd?"
         suspend_reason_label: "Varför stänger du av användaren? Denna text <b>kommer att vara synlig för alla</b> på användarens profilsida, och kommer att visas för användaren när han/hon försöker logga in. Håll den kort."
         suspend_reason_hidden_label: "Varför stänger du av användaren? Denna text kommer att vara synlig för användaren när han/hon försöker logga in. Håll den kort."
@@ -4282,6 +4285,8 @@ sv:
           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, applicera enbart förändringar framåt"
+        simple_list:
+          add_item: "Lägg till objekt..."
       badges:
         title: Utmärkelser
         new_badge: Ny utmärkelse
@@ -4369,6 +4374,7 @@ sv:
         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)"
         add: "Lägg till ny emoji"
+        uploading: "Laddar upp..."
         name: "Namn"
         group: "Grupp"
         image: "Bild"
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index ef8c1898bf..e805f3aff2 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -23,8 +23,8 @@ sw:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
@@ -199,11 +199,11 @@ sw:
     every_hour: "kila saa"
     daily: "kila siku"
     weekly: "kila wiki"
-    max_of_count: "kiwango cha juu cha {{count}}"
+    max_of_count: "kiwango cha juu cha %{count}"
     alternation: "au"
     character_count:
-      one: "Herufi {{count}}"
-      other: "Herufi {{count}}"
+      one: "Herufi %{count}"
+      other: "Herufi %{count}"
     suggested_topics:
       title: "Mada Zilizopendekezwa"
       pm_title: "Ujumbe Uliopendekezwa"
@@ -250,14 +250,14 @@ sw:
         yes_value: "Ndio, acha"
         no_value: "Hapana, tunza"
     topic_count_latest:
-      one: "Angalia Topiki Mpya au Masahisho {{count}}"
-      other: "Angalia Topiki Mpya au Masahisho {{count}}"
+      one: "Angalia Topiki Mpya au Masahisho %{count}"
+      other: "Angalia Topiki Mpya au Masahisho %{count}"
     topic_count_unread:
-      one: "Angalia Topiki {{count}} Zisizosomwa"
-      other: "Angalia Topiki {{count}} Zisizosomwa"
+      one: "Angalia Topiki %{count} Zisizosomwa"
+      other: "Angalia Topiki %{count} Zisizosomwa"
     topic_count_new:
-      one: "Angalia Topiki {{count}} Mpya"
-      other: "Angalia Topiki {{count}} Mpya"
+      one: "Angalia Topiki %{count} Mpya"
+      other: "Angalia Topiki %{count} Mpya"
     preview: "kihakiki"
     cancel: "ghairi"
     save: "Hifadhi Mabadiliko"
@@ -265,7 +265,7 @@ sw:
     saved: "Imehifadhiwa!"
     upload: "Pakia"
     uploading: "Inapakiwa..."
-    uploading_filename: "Inapakia {{filename}}..."
+    uploading_filename: "Inapakia %{filename}..."
     uploaded: "Imepakiwa!"
     pasting: "Inabandika..."
     enable: "Ruhusu"
@@ -323,19 +323,19 @@ sw:
         description: "Tumepokea chapisho lako jipya, lakini linahitaji kupata kibali kutoka kwa kiongozi kabla ya kuonyeshwa. Tafadhali kuwa na subira."
         ok: "Sawa"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{mtumiaji}}</a> amechapisha <a href='{{topicUrl}}'>mada</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Ume</a> chapisha <a href='{{topicUrl}}'>mada</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{mtumiaji}}</a> amejibu <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Ume</a> jibu<a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{mtumiaji}}</a> amejibu <a href='{{topicUrl}}'>mada</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Ume</a> jibu<a href='{{topicUrl}}'>mada</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{mtumiaji}}</a> amemtaja <a href='{{user2Url}}'>{{mtumiaji_mwingine}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{mtumiaji}}</a> amekutaja <a href='{{user2Url}}'>wewe</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Ume</a> mtaja <a href='{{user2Url}}'>{{mtumiaji_mwingine}}</a>"
-      posted_by_user: "Imechapishwa na <a href='{{userUrl}}'>{{mtumiaji}}</a>"
-      posted_by_you: "Imechapishwa na <a href='{{userUrl}}'>wewe</a>"
-      sent_by_user: "Imetumwa na <a href='{{userUrl}}'>{{mtumiaji}}</a>"
-      sent_by_you: "Imetumwa na <a href='{{userUrl}}'>wewe</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{mtumiaji}</a> amechapisha <a href='%{topicUrl}'>mada</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Ume</a> chapisha <a href='%{topicUrl}'>mada</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{mtumiaji}</a> amejibu <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Ume</a> jibu<a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{mtumiaji}</a> amejibu <a href='%{topicUrl}'>mada</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Ume</a> jibu<a href='%{topicUrl}'>mada</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{mtumiaji}</a> amemtaja <a href='%{user2Url}'>%{mtumiaji_mwingine}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{mtumiaji}</a> amekutaja <a href='%{user2Url}'>wewe</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Ume</a> mtaja <a href='%{user2Url}'>%{mtumiaji_mwingine}</a>"
+      posted_by_user: "Imechapishwa na <a href='%{userUrl}'>%{mtumiaji}</a>"
+      posted_by_you: "Imechapishwa na <a href='%{userUrl}'>wewe</a>"
+      sent_by_user: "Imetumwa na <a href='%{userUrl}'>%{mtumiaji}</a>"
+      sent_by_you: "Imetumwa na <a href='%{userUrl}'>wewe</a>"
     directory:
       filter_name: "chuja kwa jina la mtumiaji"
       title: "Watumiaji"
@@ -542,7 +542,7 @@ sw:
     user_fields:
       none: "(Chagua chaguo moja)"
     user:
-      said: "{{jinalamtumiaji}}:"
+      said: "%{jinalamtumiaji}:"
       profile: "Maelezo Mafupi "
       mute: "Nyamazisha"
       edit: "Hariri Mapendekezo"
@@ -595,12 +595,12 @@ sw:
       external_links_in_new_tab: "Fungua viungo vingine kwenye kichupo kingine"
       enable_quoting: "Ruhusu jibu nukulu kwenye neno lenye angaza"
       change: "badilisha"
-      moderator: "{{mtumiaji}} ni msimamizi"
-      admin: "{{mtumiaji}} ni kiongozi"
+      moderator: "%{mtumiaji} ni msimamizi"
+      admin: "%{mtumiaji} ni kiongozi"
       moderator_tooltip: "Mtumiaji huyu ni msimamizi"
       admin_tooltip: "Mtumiaji huyu ni kiongozi"
       silenced_tooltip: "Mtumiaji amenyamazishwa"
-      suspended_notice: "Akaunti imesitishwa mpaka {{tarehe}}."
+      suspended_notice: "Akaunti imesitishwa mpaka %{tarehe}."
       suspended_permanently: "Mtumiaji amesitishwa."
       suspended_reason: "Sababu:"
       github_profile: "Github"
@@ -613,7 +613,7 @@ sw:
           Mada na Kategoria zilizonyamazishwa hazitawekwa ndani kwenye barua pepe hizi.
         individual: "Tuma barua pepe kwa ajili ya kila chapisho jipya"
         individual_no_echo: "Tuma barua pepe kwa ajili ya kila chapisho jipya ila zangu"
-        many_per_day: "Nitumie barua pepe kwa ajili ya kila chapisho jipya (kuhusu {{KadiriaBaruapepezakilasiku}} kila siku)"
+        many_per_day: "Nitumie barua pepe kwa ajili ya kila chapisho jipya (kuhusu %{KadiriaBaruapepezakilasiku} kila siku)"
         few_per_day: "Nitumie barua pepe kwa ajili ya kila chapisho jipya (kwa kukadiria 2 kwa siku)"
         warning: "Mfumo wa kutuma barua pepe umewezeshwa. Taarifa za barua pepe zimeongezeka"
       tag_settings: "Lebo"
@@ -641,7 +641,6 @@ sw:
       admin_delete: "Futa"
       users: "Watumiaji"
       muted_users: "Kunyamazisha"
-      muted_users_instructions: "Sitisha taarifa zote kutoka kwa watumiaji hawa."
       tracked_topics_link: "Onesha"
       automatically_unpin_topics: "Otomatikali ondoa mada zilizobandikwa nikifika mwisho wa ukurasa."
       apps: "Programu-tumizi"
@@ -695,7 +694,7 @@ sw:
         copy_to_clipboard: "Umenakili kwenye Ubao Nakili"
         copy_to_clipboard_error: "Makosa kwenye Kunakili"
         copied_to_clipboard: "Nakili"
-        remaining_codes: "Una kodi <strong>{{count}}</strong> za backup zimebaki."
+        remaining_codes: "Una kodi <strong>%{count}</strong> za backup zimebaki."
       second_factor:
         title: "Uhalalalishaji wa Viwango Viwili"
         confirm_password_description: "Thibitisha nywila yako kuendelea"
@@ -740,11 +739,11 @@ sw:
         secondary: "Barua pepe"
         ok: "Tutakutumia barua pepe kuthibitisha"
         invalid: "Andika barua pepe iliyo sahihi"
-        authenticated: "Barua pepe yako imethibitishwa na {{mkimu}}"
+        authenticated: "Barua pepe yako imethibitishwa na %{mkimu}"
         frequency_immediately: "Tutakutumia barua pepe sasa hivi kama haujasoma kitu ambacho tunaendea kukutumia."
         frequency:
-          one: "Tutakutumia barua pepe endapo tu hatujakuona mtanadaoni dakika {{count}} iliyopita."
-          other: "Tutakutumia barua pepe endapo tu hatujakuona mtanadaoni dakika {{count}} zilizopita."
+          one: "Tutakutumia barua pepe endapo tu hatujakuona mtanadaoni dakika %{count} iliyopita."
+          other: "Tutakutumia barua pepe endapo tu hatujakuona mtanadaoni dakika %{count} zilizopita."
       associated_accounts:
         title: "Akaunti inayohusiana"
         connect: "Unganisha"
@@ -760,9 +759,9 @@ sw:
       username:
         title: "Jina la mtumiaji"
         instructions: "kipekee, hakuna nafasi, fupi"
-        short_instructions: "Watu wanaweza kukutaja kwa jina la @{{jina la mtumiaji}}"
+        short_instructions: "Watu wanaweza kukutaja kwa jina la @%{jina la mtumiaji}"
         available: "Jina la mtumiaji limepatikana"
-        not_available: "Haijapatikana. Jaribu {{dokezo}}?"
+        not_available: "Haijapatikana. Jaribu %{dokezo}?"
         not_available_no_suggestion: "Haijapatikana"
         too_short: "Jina lako la mtumiaji ni fupi sana"
         too_long: "Jina la mtumiaji ni refu sana"
@@ -839,14 +838,14 @@ sw:
         none: "Hakuna mialiko ya kuonyeshwa."
         truncated:
           one: "Onyesha mwaliko wa kwanza."
-          other: "Onyesha mialiko ya kwanza {{count}}."
+          other: "Onyesha mialiko ya kwanza %{count}."
         redeemed: "Mialiko Iliyopatikana"
         redeemed_tab: "Imepatikana"
-        redeemed_tab_with_count: "({{count}}) zimepatikana"
+        redeemed_tab_with_count: "(%{count}) zimepatikana"
         redeemed_at: "Imepatikana"
         pending: "Mialiko Inayosubiria"
         pending_tab: "subiria"
-        pending_tab_with_count: "({{count}}) zinasubiria"
+        pending_tab_with_count: "(%{count}) zinasubiria"
         topics_entered: "mada zilizotazamwa"
         posts_read_count: "Machapisho yaliyosomwa"
         expired: "Mda wa mualiko huu umeisha."
@@ -860,13 +859,17 @@ sw:
         time_read: "Mda wa kusoma"
         days_visited: "Siku Iliyotembelewa"
         account_age_days: "Akaunti ina umri wa siku"
+        links_tab: "Viungo"
+        link_created_at: "Imetengenezwa"
+        link_groups: Makundi
         create: "Tuma Mualiko"
         generate_link: "Nakili Kiungo cha Mualiko"
         link_generated: "Kiungo cha Mualiko kimetengenezwa kwa mafanikio!"
         valid_for: "Kiungo cha Mwaliko kitatumiwa na barua pepe hii tu:%{email}"
+        invite_link:
+          success: "Kiungo cha Mualiko kimetengenezwa kwa mafanikio!"
         bulk_invite:
           none: "Haujamwalika mtu yoyote hapa. Tuma mwaliko mmoja mmoja kwa watu, au tuma mialiko kwa watu wengi kwa <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>kupakia faili la CSV </a>."
-          text: "Alika Wengi kutoka kwenye Faili"
           success: "Faili limepakiwa kwa mafanikio, utapewa taarifa kwa kupitia Meseji mchakato utakapo kamilika"
           error: "Samahani, faili hili inabidi liwe na umbizo faili la CSV"
       password:
@@ -956,7 +959,7 @@ sw:
       desc:
         network: "Tafadhali angalia muunganisho wako."
         network_fixed: "Inaonekana kuwa imerudi."
-        server: "Kodi ya hitilafu: {{hali}}"
+        server: "Kodi ya hitilafu: %{hali}"
         forbidden: "Hauruhusiwi kuona hivyo."
         not_found: "Samahani, programu-tumizi imejaribu kupakia anwani ya mtandao ambayo haipo."
         unknown: "Kitu kimeenda vibaya."
@@ -1004,8 +1007,8 @@ sw:
       hidden_for_session: "OK, Nitakuuliza tena kesho. Unaweza kutumia 'Ingia' kutengeneza akaunti pia."
     summary:
       enabled_description: "Unaangalia muhtasari wa hii mada; machapisho yote yanayovutia yanachaguliwa na jukwaa."
-      description: "Kuna majibu <b>{{replyCount}}</b>. "
-      description_time: "Kuna majibu <b>{{replyCount}}</b> yenye mda wa kusoma wa dakika <b>{{readingTime}} </b>."
+      description: "Kuna majibu <b>%{replyCount}</b>. "
+      description_time: "Kuna majibu <b>%{replyCount}</b> yenye mda wa kusoma wa dakika <b>%{readingTime} </b>."
       enable: "Tengeneza Muhtasari wa Hii Mada."
       disable: "Onyesha Machapisho Yote"
     deleted_filter:
@@ -1016,8 +1019,8 @@ sw:
     private_message_info:
       title: "Ujumbe"
       leave_message: "Je, ni unataka kuiacha huu ujumbe?"
-      remove_allowed_user: "Je, unataka kuondoa {{name}} kutoka kwenye huu ujumbe?"
-      remove_allowed_group: "Je, unataka kuondoa {{name}} kutoka kwenye huu ujumbe?"
+      remove_allowed_user: "Je, unataka kuondoa %{name} kutoka kwenye huu ujumbe?"
+      remove_allowed_group: "Je, unataka kuondoa %{name} kutoka kwenye huu ujumbe?"
     email: "Barua pepe"
     username: "Jina la mtumiaji"
     last_seen: "Imetazamwa"
@@ -1071,7 +1074,7 @@ sw:
       awaiting_activation: "Akaunti yako inasubiria kuanzishwa, tumia kiungo cha nimesahau nywila kupata barua pepe nyingine ya kuanzisha akaunti."
       awaiting_approval: "Akaunti yako bado haijathibitishwa na msaidizi. Utapata ujumbe kwa barua pepe ikipata kibali."
       requires_invite: "Samahani, jumuia hii ni kwa walioalikwa tu."
-      not_activated: "Bado hauwezi kuingia. Tumekutumia barua pepe ya uanzisho kwenye <b>{{sentTo}}. Tafadhali fuatilia maelezo kwenye barua pepe kuanzisha akaunti yako."
+      not_activated: "Bado hauwezi kuingia. Tumekutumia barua pepe ya uanzisho kwenye <b>%{sentTo}. Tafadhali fuatilia maelezo kwenye barua pepe kuanzisha akaunti yako."
       not_allowed_from_ip_address: "Hauwezi kuingia kupitia anwani hiyo ya mtandao."
       admin_not_allowed_from_ip_address: "Hauwezi kuingia kama kiongozi kupitia anwani hiyo ya mtandao."
       resend_activation_email: "Bofya hapa kutuma barua pepe ya uanzishaji tena."
@@ -1080,7 +1083,7 @@ sw:
       change_email: "Badilisha Barua Pepe"
       provide_new_email: "Andika anwani mpya na tutakutumia tena barua pepe ya uthibitisho."
       submit_new_email: "Sasisha Barua Pepe"
-      sent_activation_email_again: "Tumekutumia barua pepe nyingine ya uanzishaji kwenye <b>{{currentEmail}}</b>. Inaweza kuchukua dakika chache kufika; angalia pia folda la barua taka."
+      sent_activation_email_again: "Tumekutumia barua pepe nyingine ya uanzishaji kwenye <b>%{currentEmail}</b>. Inaweza kuchukua dakika chache kufika; angalia pia folda la barua taka."
       to_continue: "Tafadhali Ingia"
       preferences: "Unahitaji uwe umeingia kubadilisha mapendekezo ya mtumiaji."
       forgot: "Sikumbuki taarifa zangu za akaunti"
@@ -1137,13 +1140,13 @@ sw:
       default_header_text: Chagua
       no_content: Hakuna uwiano uliopatikana
       filter_placeholder: Tafuta
-      create: "Tengeneza: '{{maandishi}}'"
+      create: "Tengeneza: '%{maandishi}'"
       max_content_reached:
-        one: "Unaweza tu kuchagua kitu {{count}}."
-        other: "Unaweza tu kuchagua vitu {{count}}."
+        one: "Unaweza tu kuchagua kitu %{count}."
+        other: "Unaweza tu kuchagua vitu %{count}."
       min_content_not_reached:
-        one: " Chagua japo kitu {{count}}."
-        other: " Chagua japo vitu {{count}}."
+        one: " Chagua japo kitu %{count}."
+        other: " Chagua japo vitu %{count}."
     date_time_picker:
       from: Kutoka
       to: Kwenda
@@ -1161,7 +1164,7 @@ sw:
       default: Ishara binafsi
     shared_drafts:
       title: "Maswadajaribio Gawiza"
-      notice: "Mada hii inapatikana kwa watu wanaoweza kuona kategoria <b>{{category}}</b>."
+      notice: "Mada hii inapatikana kwa watu wanaoweza kuona kategoria <b>%{category}</b>."
       destination_category: "Kategoria Pokezi"
       publish: "Chapisha Mswadajaribio Gawiza"
       confirm_publish: "Unauhakika unataka kuchapisha mswadajaribio huu?"
@@ -1180,21 +1183,21 @@ sw:
       saved_local_draft_tip: "Imehifadhiwa kwenye mazingira yako"
       similar_topics: "Mada yako inafanana na..."
       drafts_offline: "Miswadajaribio Nje ya Mtandao"
-      group_mentioned_limit: "<b>Onyo!</b>Umetaja<a href='{{group_link}}'>{{kikundi}}</a>, lakini kikundi hiki kina watu wengi kuzidi usanidi uliyofanywa na msimamizi ambao una {{kikomo}} cha kutaja watumiaji. Hakuna mtu atakayepewa taarifa."
+      group_mentioned_limit: "<b>Onyo!</b>Umetaja<a href='%{group_link}'>%{kikundi}</a>, lakini kikundi hiki kina watu wengi kuzidi usanidi uliyofanywa na msimamizi ambao una %{kikomo} cha kutaja watumiaji. Hakuna mtu atakayepewa taarifa."
       group_mentioned:
-        one: "Kwa kutaja {{group}}, utamjulisha <a href='{{group_link}}'>mtu mmoja</a> – una uhakika?"
-        other: "Kwa kutaja {{group}}, utawajulisha <a href='{{group_link}}'>{{count}} watu</a> – una uhakika?"
+        one: "Kwa kutaja %{group}, utamjulisha <a href='%{group_link}'>mtu mmoja</a> – una uhakika?"
+        other: "Kwa kutaja %{group}, utawajulisha <a href='%{group_link}'>%{count} watu</a> – una uhakika?"
       cannot_see_mention:
-        category: "Umetaja {{username}} ila hawatajulishwa kwa kuwa hawapo kwenye kundi hili. Itabidi waongezwe kwenye kundi ambalo lina fursa ya kusoma maudhui ya kundi hili."
-        private: "Umetaja {{username}} lakini hawatajulishwa kwa sababu hawana uwezo wa kuona hii meseji binafsi. Unahitaji kuwaalika kuona hii mesaji binafsi."
-      duplicate_link: "Inaonekana linki yako <b>{{domain}}</b> imechapishwa tayari kwenye topiki na <b>@{{username}}</b> kwenye <a href='{{post_url}}'>jibu la {{ago}}</a> – una uhakina unataka kuchapisha tena?"
+        category: "Umetaja %{username} ila hawatajulishwa kwa kuwa hawapo kwenye kundi hili. Itabidi waongezwe kwenye kundi ambalo lina fursa ya kusoma maudhui ya kundi hili."
+        private: "Umetaja %{username} lakini hawatajulishwa kwa sababu hawana uwezo wa kuona hii meseji binafsi. Unahitaji kuwaalika kuona hii mesaji binafsi."
+      duplicate_link: "Inaonekana linki yako <b>%{domain}</b> imechapishwa tayari kwenye topiki na <b>@%{username}</b> kwenye <a href='%{post_url}'>jibu la %{ago}</a> – una uhakina unataka kuchapisha tena?"
       error:
         title_missing: "Kichwa cha habari ni muhimu"
-        title_too_short: "Kichwa kinatakiwa kuwa na tarakimu japo {{min}}"
-        title_too_long: "Kichwa hakitakiwi kuwa na tarakimu zaidi ya {{max}}"
-        post_length: "Posti/Chapisho linatakiwa kuwa na tarakimu japo {{min}}"
+        title_too_short: "Kichwa kinatakiwa kuwa na tarakimu japo %{min}"
+        title_too_long: "Kichwa hakitakiwi kuwa na tarakimu zaidi ya %{max}"
+        post_length: "Posti/Chapisho linatakiwa kuwa na tarakimu japo %{min}"
         category_missing: "Ni sharti uchague kategoria"
-        tags_missing: "Unatakiwa kuchagua japo vitambulisho {{count}}"
+        tags_missing: "Unatakiwa kuchagua japo vitambulisho %{count}"
       save_edit: "Hifadhi Uhariri"
       reply_original: "Jibu kwenye Mada ya Kwanza"
       reply_here: "Jibu hapa"
@@ -1279,46 +1282,46 @@ sw:
       tooltip:
         regular:
           one: "%{count} taarifa ambayo haijaonwa"
-          other: "{{count}} taarifa ambazo hazijaonwa"
+          other: "%{count} taarifa ambazo hazijaonwa"
         message:
           one: "%{count} meseji ambayo haijasomwa"
-          other: "{{count}} meseji ambazo hazijasomwa"
+          other: "%{count} meseji ambazo hazijasomwa"
       title: "taarifa za @jina lililotajwa, majibu ya machapisho na mada, ujumbe, na zingine"
       none: "Imeshindwa kupakia taarifa kwa mda huu."
       empty: "Hakuna taarifa zilizopatikana."
-      mentioned: "<span>{{jina la mtumiaji}} </span>{{maelezo}}"
-      group_mentioned: "<span>{{jina la mtumiaji}} </span>{{maelezo}}"
-      quoted: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
-      bookmark_reminder: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
-      replied: "<span>{{jina la mtumiaji}} </span> {{maelezo}}"
-      posted: "<span>{{jina la mtumiaji}} </span> {{maelezo}}"
-      edited: "<span>{{jina la mtumiaji}} </span> {{maelezo}}"
-      liked: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{jina la mtumiaji} </span>%{maelezo}"
+      group_mentioned: "<span>%{jina la mtumiaji} </span>%{maelezo}"
+      quoted: "<span>%{jina la mtumiaji}</span> %{maelezo}"
+      bookmark_reminder: "<span>%{jina la mtumiaji}</span> %{maelezo}"
+      replied: "<span>%{jina la mtumiaji} </span> %{maelezo}"
+      posted: "<span>%{jina la mtumiaji} </span> %{maelezo}"
+      edited: "<span>%{jina la mtumiaji} </span> %{maelezo}"
+      liked: "<span>%{jina la mtumiaji}</span> %{maelezo}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} na %{count} mwingine </span> {{description}}"
-        other: "<span>{{username}}, {{username2}} na {{count}} wengine</span> {{description}}"
-      liked_consolidated: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
-      private_message: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
-      invited_to_private_message: "<p><span>{{jina la mtumiaji}}</span> {{maelezo}}"
-      invited_to_topic: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
-      invitee_accepted: "<span>{{jina la mtumiaji}}</span> amekubali mwaliko wako"
-      moved_post: "<span>{{jina la mtumiaji}}</span> amehama {{maelezo}}"
-      linked: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
-      granted_badge: "Umepata '{{maelezo}}'"
-      topic_reminder: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
-      watching_first_post: "<span>Mada Mpya</span> {{maelezo}}"
+        one: "<span>%{username}, %{username2} na %{count} mwingine </span> %{description}"
+        other: "<span>%{username}, %{username2} na %{count} wengine</span> %{description}"
+      liked_consolidated: "<span>%{jina la mtumiaji}</span> %{maelezo}"
+      private_message: "<span>%{jina la mtumiaji}</span> %{maelezo}"
+      invited_to_private_message: "<p><span>%{jina la mtumiaji}</span> %{maelezo}"
+      invited_to_topic: "<span>%{jina la mtumiaji}</span> %{maelezo}"
+      invitee_accepted: "<span>%{jina la mtumiaji}</span> amekubali mwaliko wako"
+      moved_post: "<span>%{jina la mtumiaji}</span> amehama %{maelezo}"
+      linked: "<span>%{jina la mtumiaji}</span> %{maelezo}"
+      granted_badge: "Umepata '%{maelezo}'"
+      topic_reminder: "<span>%{jina la mtumiaji}</span> %{maelezo}"
+      watching_first_post: "<span>Mada Mpya</span> %{maelezo}"
       group_message_summary:
-        one: "Kuna meseji {{count}} kwenye {{group_name}} inbox"
-        other: "kuna meseji {{count}} kwenye {{group_name}} inbox"
+        one: "Kuna meseji %{count} kwenye %{group_name} inbox"
+        other: "kuna meseji %{count} kwenye %{group_name} inbox"
       popup:
-        mentioned: '{{jina la mtumiaji}} amekutaja kwenye "{{mada}}" - {{jina la_tovuti}}'
-        group_mentioned: '{{jina la mtumiaji}} amekutaja kwenye "{{mada}}" - {{jina la_tovuti}}'
-        quoted: '{{jina la mtumiaji}} amekunukulu kwenye "{{mada}}" - {{jina la_tovuti}}'
-        replied: '{{jina la mtumiaji}} amekujibu kwenye "{{mada}}" - {{jina la_tovuti}}'
-        posted: '{{jina la mtumiaji}} amechapisha kwenye "{{mada}}" - {{jina la_tovuti}}'
-        private_message: '{{jina la mtumiaji}} amekutumia ujumbe binafsi kwenye "{{mada}}" - {{jina la_tovuti}}'
-        linked: '{{jina la mtumiaji}} ametengeneza kiungo kutoka kwenye "{{mada}}" - {{jina la_tovuti}}'
+        mentioned: '%{jina la mtumiaji} amekutaja kwenye "%{mada}" - %{jina la_tovuti}'
+        group_mentioned: '%{jina la mtumiaji} amekutaja kwenye "%{mada}" - %{jina la_tovuti}'
+        quoted: '%{jina la mtumiaji} amekunukulu kwenye "%{mada}" - %{jina la_tovuti}'
+        replied: '%{jina la mtumiaji} amekujibu kwenye "%{mada}" - %{jina la_tovuti}'
+        posted: '%{jina la mtumiaji} amechapisha kwenye "%{mada}" - %{jina la_tovuti}'
+        private_message: '%{jina la mtumiaji} amekutumia ujumbe binafsi kwenye "%{mada}" - %{jina la_tovuti}'
+        linked: '%{jina la mtumiaji} ametengeneza kiungo kutoka kwenye "%{mada}" - %{jina la_tovuti}'
         confirm_title: "Taarifa mubashara zimewezeshwa - %{site_title}"
         confirm_body: "Taarifa mubashara zimewezeshwa kikamilifu"
       titles:
@@ -1330,9 +1333,9 @@ sw:
       from_my_computer: "Kutoka kwenye kifaa changu"
       from_the_web: "Kutoka kwenye mtandao"
       remote_tip: "kiungo cha picha"
-      remote_tip_with_attachments: "kiungo cha picha au faili {{authorized_extensions}}"
+      remote_tip_with_attachments: "kiungo cha picha au faili %{authorized_extensions}"
       local_tip: "chagua picha kwenye kifaa chako"
-      local_tip_with_attachments: "Chagua picha au mafile kutoka kwenye kifaa chako {{authorized_extensions}}"
+      local_tip_with_attachments: "Chagua picha au mafile kutoka kwenye kifaa chako %{authorized_extensions}"
       hint: "(Unaweza pia kuvuta na kudondosha kwenye kihariri ili kuzipakia)"
       hint_for_supported_browsers: "Unaweza pia kuvuta na kudondosha kwenye kihariri"
       uploading: "Inapakiwa"
@@ -1349,15 +1352,15 @@ sw:
       clear_all: "Futa Zote"
       too_short: "Neno la utafiti ni fupi."
       result_count:
-        one: "<span>jibu kwa</span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}}{{plus}} majibu kwa</span><span class='term'>{{term}}</span>"
+        one: "<span>jibu kwa</span><span class='term'>%{term}</span>"
+        other: "<span>%{count}%{plus} majibu kwa</span><span class='term'>%{term}</span>"
       title: "Tafuta mada, machapisho, watumiaji, au kategoria"
       full_page_title: "tafuta mada au machapisho"
       no_results: "Hakuna Majibu Yaliyopatikana."
       no_more_results: "Hakuna majibu zaidi yaliyopatikana."
       searching: "Inatafuta ..."
-      post_format: "#{{post_number}} za {{username}}"
-      results_page: "Majibu ya utafiti ya'{{term}}'"
+      post_format: "#%{post_number} za %{username}"
+      results_page: "Majibu ya utafiti ya'%{term}'"
       more_results: "Kuna majibu zaidi. Samahani punguza vigezo vya kutafuta"
       cant_find: "Umeshindwa kupata ulichokuwa unakitafuta?"
       start_new_topic: "Au anzisha mada mpya?"
@@ -1366,8 +1369,8 @@ sw:
       search_google_button: "Google"
       search_google_title: "Tafuta tovuti hii"
       context:
-        user: "Tafuta machapisho kwa kutumia @{{jina la mtumiaji}}"
-        category: "Tafuta kategoria #{{category}} "
+        user: "Tafuta machapisho kwa kutumia @%{jina la mtumiaji}"
+        category: "Tafuta kategoria #%{category} "
         topic: "Tafuta hii mada"
         private_messages: "Tafuta ujumbe"
       advanced:
@@ -1441,7 +1444,7 @@ sw:
         choose_new_category: "Chagua kategoria mpya kwa ajili ya mada:"
         selected:
           one: "Umechagua mada <b>%{count}</b>."
-          other: "Umechagua mada <b>{{count}}</b>."
+          other: "Umechagua mada <b>%{count}</b>."
         change_tags: "Badilisha Lebo"
         append_tags: "Jumlisha Lebo"
         choose_new_tags: "Chagua lebo mpya kwa ajili ya hizi mada:"
@@ -1454,7 +1457,7 @@ sw:
         posted: "Bado haujachapisha kwenye mada yoyote."
         latest: "Hakuna mada mpya. Hii ni huzuni."
         bookmarks: "Hauja alamisha mada yoyote."
-        category: "Hakuna {{category}} mada."
+        category: "Hakuna %{category} mada."
         top: "Hakuna mada za juu."
         educate:
           new: '<p>Mada zako mpya zitatokea hapa.</p><p>Kwa chaguo-msingi, mada ni mpya na zitakuwa na indiketa <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">mpya</span>kama zilitengenezwa ndani ya siku 2 zilizopita.</p><p>Tembelea<a href="%{userPrefsUrl}">mipangilio</a>yako kubadilisha hizi.</p>'
@@ -1465,13 +1468,13 @@ sw:
         read: "Hakuna mada zingine zilizosomwa."
         new: "Hakuna mada mpya zingine."
         unread: "Hakuna mada zingine ambazo hazijasomwa."
-        category: "Hakuna {{category}} mada zingine."
+        category: "Hakuna %{category} mada zingine."
         top: "Hakuna mada za juu zingine."
         bookmarks: "Hakuna mada zingine zilizoalamishwa."
     topic:
       filter_to:
         one: "%{count} chapisho kwenye mada"
-        other: "{{count}} machapisho kwenye mada"
+        other: "%{count} machapisho kwenye mada"
       create: "Mada Mpya"
       create_long: "Tengeneza Mada mpya"
       open_draft: "Fungua Mswadajaribio"
@@ -1490,10 +1493,10 @@ sw:
       unread: "haijasomwa"
       new_topics:
         one: "%{count} mada mpya"
-        other: "{{count}} mada mpya"
+        other: "%{count} mada mpya"
       unread_topics:
         one: "%{count} mada haijasomwa"
-        other: "{{count}} mada zisizosomwa"
+        other: "%{count} mada zisizosomwa"
       title: "Mada"
       invalid_access:
         title: "Mada ni binafsi"
@@ -1506,24 +1509,24 @@ sw:
         title: "Mada haijapatikana"
         description: "Samahani, tumeshindwa kupata hiyo mada. Labda iliondolewa na msimamizi?"
       total_unread_posts:
-        one: "Una chapisho {{count}} halijasomwa kwenye mada hii"
-        other: "Una machapisho {{count}} hayajasomwa kwenye mada hii"
+        one: "Una chapisho %{count} halijasomwa kwenye mada hii"
+        other: "Una machapisho %{count} hayajasomwa kwenye mada hii"
       unread_posts:
-        one: "Una chapisho {{count}} kwenye mada hii ambayo halijasomwa"
-        other: "Una machapisho {{count}} kwenye mada hii ambayo hayajasomwa"
+        one: "Una chapisho %{count} kwenye mada hii ambayo halijasomwa"
+        other: "Una machapisho %{count} kwenye mada hii ambayo hayajasomwa"
       new_posts:
-        one: "Kuna chapisho jipya {{count}} kwenye mada hii tangu mara ya mwisho usome"
-        other: "Kuna mchapisho mapya {{count}} kwenye mada hii tangu mara ya mwisho usome"
+        one: "Kuna chapisho jipya %{count} kwenye mada hii tangu mara ya mwisho usome"
+        other: "Kuna mchapisho mapya %{count} kwenye mada hii tangu mara ya mwisho usome"
       likes:
-        one: "Kuna pendwa {{count}} kwenye mada hii"
-        other: "Kuna pendwa {{count}} kwenye mada hii"
+        one: "Kuna pendwa %{count} kwenye mada hii"
+        other: "Kuna pendwa %{count} kwenye mada hii"
       back_to_list: "Rudi tena kwenye Orodha ya Mada"
       options: "Machaguo ya Mada"
       show_links: "onyesha viungo ndani ya hii mada"
       toggle_information: "badilisha taarifa za mada"
-      read_more_in_category: "Unataka kusoma zaidi? Vinjari mada zingine ndani ya {{catLink}} au {{latestLink}}."
-      read_more: "Unataka kusoma zaidi? {{catLink}} au {{latestLink}}."
-      read_more_MF: "Kuna { UNREAD, plural, =0 {} one { ni <a href='{basePath}/unread'>haijasomwa 1</a> } other { ni <a href='{basePath}/unread'>haijasomwa #</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{na } false {ni } other {}} mada<a href='{basePath}/new'>mpya 1</a>} other { {BOTH, select, true{na } false {ni } other{}} <a href='{basePath}/new'>mada mpya #</a>} } zilizobaki, au {CATEGORY, select, true {vinjari mada zingine ndani ya {catLink}} hapana {{latestLink}} other {}}"
+      read_more_in_category: "Unataka kusoma zaidi? Vinjari mada zingine ndani ya %{catLink} au %{latestLink}."
+      read_more: "Unataka kusoma zaidi? %{catLink} au %{latestLink}."
+      read_more_MF: "Kuna { UNREAD, plural, =0 {} one { ni <a href='{basePath}/unread'>haijasomwa 1</a> } other { ni <a href='{basePath}/unread'>haijasomwa #</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{na } false {ni } other {}} mada<a href='{basePath}/new'>mpya 1</a>} other { {BOTH, select, true{na } false {ni } other{}} <a href='{basePath}/new'>mada mpya #</a>} } zilizobaki, au {CATEGORY, select, true {vinjari mada zingine ndani ya {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Vinjari kategoria zote
       view_latest_topics: tembelea mada mpya
       suggest_create_topic: "Kwa nini usitengeneze mada?"
@@ -1675,15 +1678,15 @@ sw:
         help: "ripoti kwa siri mada hili liangaliwe au tuma ujumbe binafsi wa taarifa kuhusiana na hii"
         success_message: "Umeripoti mada hii kwa mafanikio."
       feature_topic:
-        pin: "Fanya mada hii ionekane juu ya kategoria {{kiungochakategoria}} mpaka"
-        confirm_pin: "Tayari una mada {{count}} zilizobandikwa. Ubandikaji wa mada nyingi unaweza kuwasumbua watumiaji wapya au wasiojulikana. Una uhakika unataka kubandika mada nyingine kwenye kategoria hii?"
-        unpin: "Ondoa mada hii kutoka kwenye sehemu ya juu ya kategoria {{categoryLink}}"
-        unpin_until: "Ondoa mada hii kutoka kwenye sehemu ya juu ya kategoria {{categoryLink}} au subiri mpaka <strong>%{until}</strong>."
+        pin: "Fanya mada hii ionekane juu ya kategoria %{kiungochakategoria} mpaka"
+        confirm_pin: "Tayari una mada %{count} zilizobandikwa. Ubandikaji wa mada nyingi unaweza kuwasumbua watumiaji wapya au wasiojulikana. Una uhakika unataka kubandika mada nyingine kwenye kategoria hii?"
+        unpin: "Ondoa mada hii kutoka kwenye sehemu ya juu ya kategoria %{categoryLink}"
+        unpin_until: "Ondoa mada hii kutoka kwenye sehemu ya juu ya kategoria %{categoryLink} au subiri mpaka <strong>%{until}</strong>."
         pin_note: "Watumiaji wanaweza kuondoa mabandiko ya mada wenyewe."
         pin_validation: "Tarehe inahitajika kubandika mada hii."
-        not_pinned: "Hakuna mada zilizobandikwa kwenye {{categoryLink}}."
+        not_pinned: "Hakuna mada zilizobandikwa kwenye %{categoryLink}."
         pin_globally: "Fanya mada hii ionekane juu ya orodha ya mada zote mpaka"
-        confirm_pin_globally: "Tayari una mada {{count}} zilizobandikwa kwa umma. Ubandikaji wa mada nyingi unaweza kuwasumbua watumiaji wapya au wasiojulikana. Una uhakika unataka kubandika mada nyingine kwa umma?"
+        confirm_pin_globally: "Tayari una mada %{count} zilizobandikwa kwa umma. Ubandikaji wa mada nyingi unaweza kuwasumbua watumiaji wapya au wasiojulikana. Una uhakika unataka kubandika mada nyingine kwa umma?"
         unpin_globally: "Ondoa mada hii kwenye sehemu ya juu ya orodha za mada."
         unpin_globally_until: "Ondoa mada hii kwenye sehemu ya juu ya mada au subiri mpaka <strong>%{until}</strong>."
         global_pin_note: "Watumiaji wanaweza kuondoa mabandiko ya mada wenyewe."
@@ -1717,15 +1720,15 @@ sw:
         to_topic_username: "Umeandika jina la mtumiaji. Tutamtumia taarifa zenye mualiko kwenye mada hii."
         to_username: "Umeandika jina la mtumiaji la mtu ambaye ungependa kumualika. Tutamtumia taarifa zenye kiungo tukimualika kwenye mada hii."
         email_placeholder: "name@example.com"
-        success_email: "Tumetuma barua kwenda kwa <b>{{emailOrUsername}}</b>. Tutakutumia mualiko ukipatikana. Angalia kichupo cha mialiko kwenye ukurasa wa mtumiaji kufuatilia mialiko yako."
+        success_email: "Tumetuma barua kwenda kwa <b>%{emailOrUsername}</b>. Tutakutumia mualiko ukipatikana. Angalia kichupo cha mialiko kwenye ukurasa wa mtumiaji kufuatilia mialiko yako."
         success_username: "Tumemkaribisha mtumiaji kushiriki kwenye mada hii."
         error: "Samahani, tumeshindwa kumkaribisha mtu huyo. Labda ameshakaribishwa? (Mialiko ina kikomo cha kiwango)"
-        success_existing_email: "Mtumiaji mwenye barua pepe <b>{{emailOrUsername}}</b>tayari yupo.Tumemualika mtumiaji huyo ashiriki kwenye mada hii."
+        success_existing_email: "Mtumiaji mwenye barua pepe <b>%{emailOrUsername}</b>tayari yupo.Tumemualika mtumiaji huyo ashiriki kwenye mada hii."
       login_reply: "Ingia Kujibu"
       filters:
         n_posts:
           one: "%{count} chapisho"
-          other: "{{count}} machapisho"
+          other: "%{count} machapisho"
         cancel: "Ondoa uchujaji"
       split_topic:
         title: "Hamisha kwenda Mada Mpya"
@@ -1754,7 +1757,7 @@ sw:
         instructions: "Tafadhali chagua mhuri wa mda wa mada. Machapisho ya mada yatasasishwa kuwa na mda tofauti ulio sawa."
       multi_select:
         select: "chagua"
-        selected: "({{count}}) imechaguliwa"
+        selected: "(%{count}) imechaguliwa"
         select_post:
           label: "chagua"
           title: "Ongeza chapisho kwenye chaguo"
@@ -1773,16 +1776,16 @@ sw:
         deselect_all: Ondoa uteuzi wote
         description:
           one: 'Umechagua chapisho <b>%{count}</b> '
-          other: "Umechagua machapisho<b>{{count}}</b>."
+          other: "Umechagua machapisho<b>%{count}</b>."
     post:
       quote_reply: "Nukulu"
       edit_reason: "Sababu:"
-      post_number: "{{namba}} chapisho"
+      post_number: "%{namba} chapisho"
       wiki_last_edited_on: "uhariri wa wiki ulifanyika"
       last_edited_on: "uhariri wa chapisho ulifanyika"
       reply_as_new_topic: "Jibu kama mada iliyounganishwa"
       reply_as_new_private_message: "Jibu kama ujumbe mpya kwenda kwa wapokeaji wale wale"
-      continue_discussion: "Endelea majadiliano kuanzia {{postLink}}:"
+      continue_discussion: "Endelea majadiliano kuanzia %{postLink}:"
       follow_quote: "nenda kwenye chapisho lililotajwa"
       show_full: "Onyesha Chapisho Lote"
       collapse: "kunja"
@@ -1790,24 +1793,24 @@ sw:
       locked: "msimamizi amefunga chapisho hili lisifanyiwe uhariri"
       gap:
         one: "Tazama jibu %{count}"
-        other: "Tazama majibu{{count}} "
+        other: "Tazama majibu%{count} "
       unread: "Chapisho halijasomwa"
       has_replies:
-        one: "{{count}} Jibu"
-        other: "{{count}} Majibu"
+        one: "%{count} Jibu"
+        other: "%{count} Majibu"
       has_likes_title:
         one: "Mtu %{count} amevutiwa na hii"
-        other: "Watu {{count}} wamevutiwa na hii"
+        other: "Watu %{count} wamevutiwa na hii"
       has_likes_title_only_you: "umependa chapisho hili"
       has_likes_title_you:
         one: "Wewe na mtu %{count} mmevutiwa na hii"
-        other: "Wewe na watu {{count}} mmevutiwa na hii"
+        other: "Wewe na watu %{count} mmevutiwa na hii"
       errors:
         create: "Samahani, hitilafu imetokea wakati wa kutengeneza chapisho lako. Tafadhali jaribu tena."
         edit: "Samahani, hitilafu imetokea wakati wa kuhariri chapisho lako. Tafadhali jaribu tena."
         upload: "Samahani, hitilafu imetokea wakati wa kupakia faili hilo. Tafadhali jaribu tena."
         too_many_uploads: "Samahani, unaweza kupakia faili 1 tu kwa wakati mmoja."
-        upload_not_authorized: "Samahani, faili unalo jaribu kupakia halina kibali (authorized extensions: {{authorized_extensions}})."
+        upload_not_authorized: "Samahani, faili unalo jaribu kupakia halina kibali (authorized extensions: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Samahani, watumiaji wapya hawawezi kupakia picha."
         attachment_upload_not_allowed_for_new_user: "Samahani, watumiaji wapya hawawezi kupakia viambatanisho."
         attachment_download_requires_login: "Samahani, inabidi uwe umeingia kupakua viambatanisho."
@@ -1884,7 +1887,7 @@ sw:
       delete:
         confirm:
           one: "Je, umeridhia kufuta chapisho hili?"
-          other: "Are you sure you want to delete those {{count}} posts?"
+          other: "Are you sure you want to delete those %{count} posts?"
       revisions:
         controls:
           first: "Sahihisho la kwanza"
@@ -2058,7 +2061,7 @@ sw:
       unlisted:
         help: "Mada hii imeondolewa kwenye orodha. Haitaonyeshwa kwenye orodha za mada, na njia pekee ya kuifia ni kupitia kiungo chake"
     posts: "Machapisho"
-    posts_long: "kuna machapisho {{namba}} kwenye hii mada"
+    posts_long: "kuna machapisho %{namba} kwenye hii mada"
     posts_likes_MF: |
       Mada hii ina {count, plural, one {jibu 1} other {majibu #}} {ratio, select,
       low {yenye uwiano wa upendo zaidi kuliko chapisho}
@@ -2073,14 +2076,14 @@ sw:
     replies: "Majibu"
     activity: "Kitendo"
     likes: "Upendo"
-    likes_long: "kuna upendo {{namba}} ndani ya mada hii"
+    likes_long: "kuna upendo %{namba} ndani ya mada hii"
     users: "Watumiaji"
     users_lowercase:
       one: "Mtumiaji"
       other: "Watumiaji"
     category_title: "Kategoria"
     history: "Historia"
-    changed_by: "na {{author}}"
+    changed_by: "na %{author}"
     raw_email:
       title: "Barua Pepe Iliyopokelewa"
       not_available: "Haipatikani!"
@@ -2092,25 +2095,25 @@ sw:
         title: "Hivi Karibuni"
         title_with_count:
           one: "Mada %{count} ya hivi karibuni"
-          other: "Mada ({{count}}) za hivi karibuni"
+          other: "Mada (%{count}) za hivi karibuni"
         help: "mada zenye machapisho ya hivi karibuni"
       read:
         title: "Soma"
         help: "mada ambazo umezisoma, kwenye oda ulivyosoma"
       categories:
         title: "Kategoria"
-        title_in: "Kategoria - {{Jinalakategoria}}"
+        title_in: "Kategoria - %{Jinalakategoria}"
         help: "mada zote zimewekwa kulingana na kategoria"
       unread:
         title: "Haijasomwa"
         title_with_count:
           one: "Haijasomwa (%{count})"
-          other: "Hazijasomwa ({{count}})"
+          other: "Hazijasomwa (%{count})"
         help: "mada unazo fuatilia au angalia zenye machapisho ambayo hayajasomwa"
       new:
         lower_title_with_count:
           one: "Mada mpya %{count}"
-          other: "Mada mpya {{count}} "
+          other: "Mada mpya %{count} "
         lower_title: "mpya"
         title: "Mpya"
         help: "mada zilizotengenezwa siku chache zilizopita"
@@ -2121,8 +2124,8 @@ sw:
         title: "Mialamisho"
         help: "mada zenye alamisho"
       category:
-        title: "{{categoryName}}"
-        help: "mada za hivi karibuni ndani ya kategoria ya {{Jinalakategoria}}"
+        title: "%{categoryName}"
+        help: "mada za hivi karibuni ndani ya kategoria ya %{Jinalakategoria}"
       top:
         title: "Juu"
         help: "mada zilizoongelewa sana ndani ya mwaka, mwezi, wiki au siku zilizopita"
@@ -2538,11 +2541,11 @@ sw:
           label: "Pakia"
           title: "Pakia chelezo kwenye mfano huu."
           uploading: "Inapakia..."
-          success: "'{{jina la faili}}' imepakiwa kwa mafanikio. Faili lipokwenye harakati na litachukua mpaka dakika kuonekana kwenye orodha."
-          error: "Hitilafu imetokea wakati wa kupakia '{{jina la faili}}': {{ujumbe}}"
+          success: "'%{jina la faili}' imepakiwa kwa mafanikio. Faili lipokwenye harakati na litachukua mpaka dakika kuonekana kwenye orodha."
+          error: "Hitilafu imetokea wakati wa kupakia '%{jina la faili}': %{ujumbe}"
         operations:
           is_running: "Operesheni inaendelea kwa sasa..."
-          failed: "{{Operesheni}} imeshindwa. Tafadhali angalia batli."
+          failed: "%{Operesheni} imeshindwa. Tafadhali angalia batli."
           cancel:
             label: "Ghairi"
             title: "Ghairi operesheni ya sasa."
@@ -2968,8 +2971,8 @@ sw:
           title: "Onyesha barua pepe ya mtumiaji"
           text: "Onyesha"
       user:
-        suspend_failed: "Hitilafu imetokea wakati wa kumsitisha mtumiaji {{hitilafu}}"
-        unsuspend_failed: "Hitilafu imetokea wakati wa kuruhusu mtumiaji aweze kujadiliana kwenye jamii {{hitilafu}}"
+        suspend_failed: "Hitilafu imetokea wakati wa kumsitisha mtumiaji %{hitilafu}"
+        unsuspend_failed: "Hitilafu imetokea wakati wa kuruhusu mtumiaji aweze kujadiliana kwenye jamii %{hitilafu}"
         suspend_duration: "Mtumiaji atasitishwa kwa mda gani?"
         suspend_reason_label: "Kwa nini umemsitisha kwa mda? Huu ujumbe <b>utaonyeshwa kwa kila mtumiaji</b> kwenye taarifa binafsi za huyo mtu na ataonyeshwa mtumiaji akijaribu kuingia. Andika ujumbe mfupi."
         suspend_reason_hidden_label: "Kwa nini umemsitisha kwa mda? Huu ujumbe utaonyeshwa kwa mtumiaji akijaribu kuingia. Andika ujumbe mfupi."
@@ -3278,6 +3281,7 @@ sw:
         title: "Emoji"
         help: "Ongeza emoji mpya ambayo itapatikana kwa kila mtu. (USHAURI: unaweza kuweka zaidi ya faili moja mara moja)"
         add: "Ongeza Emoji Mpya"
+        uploading: "Inaongezwa"
         name: "Jina"
         group: "Kikundi"
         image: "Picha"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index a546d79c94..c6f742e0a0 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -129,11 +129,11 @@ te:
     every_hour: "ప్రతి గంట"
     daily: "ప్రతిరోజూ"
     weekly: "ప్రతీవారం"
-    max_of_count: "{{count}} గరిష్టం"
+    max_of_count: "%{count} గరిష్టం"
     alternation: "లేదా"
     character_count:
-      one: "{{count}} అక్షరం"
-      other: "{{count}} అక్షరాలు"
+      one: "%{count} అక్షరం"
+      other: "%{count} అక్షరాలు"
     suggested_topics:
       title: "సూచించే విషయాలు"
     about:
@@ -223,19 +223,19 @@ te:
       approval:
         ok: "సరే"
     user_action:
-      user_posted_topic: "<a href='{{topicUrl}}'>విషయాన్ని</a> <a href='{{userUrl}}'>{{user}}</a> రాసారు "
-      you_posted_topic: "<a href='{{userUrl}}'>మీరు</a> <a href='{{topicUrl}}'>విషయాన్ని</a> రాసారు"
-      user_replied_to_post: "<a href='{{postUrl}}'>{{post_number}}</a> కు <a href='{{userUrl}}'>{{user}}</a> జవాబిచ్చారు"
-      you_replied_to_post: "<a href='{{userUrl}}'>మీరు</a> <a href='{{postUrl}}'>{{post_number}}</a> కు జవాబిచ్చారు"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a>కు <a href='{{topicUrl}}'>విషయానికి</a> జవాబిచ్చారు"
-      you_replied_to_topic: "<a href='{{userUrl}}'>మీరు</a> కు <a href='{{topicUrl}}'>విషయానికి</a> జవాబిచ్చారు"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a>, <a href='{{user2Url}}'>{{another_user}}</a> ను ప్రస్తావించారు"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a>, <a href='{{user2Url}}'>మిమ్ము</a> ప్రస్తావించారు"
-      you_mentioned_user: "<a href='{{user1Url}}'>మీరు</a>, <a href='{{user2Url}}'>{{another_user}}</a> ను ప్రస్తావించారు"
-      posted_by_user: "<a href='{{userUrl}}'>{{user}}</a> రాసారు"
-      posted_by_you: "<a href='{{userUrl}}'>మీరు</a> రాసారు"
-      sent_by_user: "<a href='{{userUrl}}'>{{user}}</a> పంపారు"
-      sent_by_you: "<a href='{{userUrl}}'>మీరు</a> పంపారు"
+      user_posted_topic: "<a href='%{topicUrl}'>విషయాన్ని</a> <a href='%{userUrl}'>%{user}</a> రాసారు "
+      you_posted_topic: "<a href='%{userUrl}'>మీరు</a> <a href='%{topicUrl}'>విషయాన్ని</a> రాసారు"
+      user_replied_to_post: "<a href='%{postUrl}'>%{post_number}</a> కు <a href='%{userUrl}'>%{user}</a> జవాబిచ్చారు"
+      you_replied_to_post: "<a href='%{userUrl}'>మీరు</a> <a href='%{postUrl}'>%{post_number}</a> కు జవాబిచ్చారు"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a>కు <a href='%{topicUrl}'>విషయానికి</a> జవాబిచ్చారు"
+      you_replied_to_topic: "<a href='%{userUrl}'>మీరు</a> కు <a href='%{topicUrl}'>విషయానికి</a> జవాబిచ్చారు"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a>, <a href='%{user2Url}'>%{another_user}</a> ను ప్రస్తావించారు"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a>, <a href='%{user2Url}'>మిమ్ము</a> ప్రస్తావించారు"
+      you_mentioned_user: "<a href='%{user1Url}'>మీరు</a>, <a href='%{user2Url}'>%{another_user}</a> ను ప్రస్తావించారు"
+      posted_by_user: "<a href='%{userUrl}'>%{user}</a> రాసారు"
+      posted_by_you: "<a href='%{userUrl}'>మీరు</a> రాసారు"
+      sent_by_user: "<a href='%{userUrl}'>%{user}</a> పంపారు"
+      sent_by_you: "<a href='%{userUrl}'>మీరు</a> పంపారు"
     directory:
       title: "వాడుకరులు"
       topics_entered_long: "సందర్శించిన విషయాలు "
@@ -339,7 +339,7 @@ te:
       post_count: "# టపాలు"
       confirm_delete_other_accounts: "మీరు నిజ్జంగా ఈ ఖాతాలు తొలగించాలనుకుంటున్నారా?"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "ప్రవర"
       mute: "నిశ్శబ్దం"
       edit: "అభిరుచులు సవరించు"
@@ -370,11 +370,11 @@ te:
       external_links_in_new_tab: "అన్ని బాహ్య లంకెలనూ కొత్త ట్యాబులో తెరువు"
       enable_quoting: "హైలైట్ అయిన పాఠ్యానికి కోట్ జవాబు చేతనం చేయి"
       change: "మార్చు"
-      moderator: "{{user}} ఒక నిర్వాహకుడు"
-      admin: "{{user}} ఒక అధికారి"
+      moderator: "%{user} ఒక నిర్వాహకుడు"
+      admin: "%{user} ఒక అధికారి"
       moderator_tooltip: "ఈ సభ్యుడు ఒక నిర్వాహకుడు"
       admin_tooltip: "ఈ సభ్యుడు ఒక అధికారి"
-      suspended_notice: "ఈ సభ్యుడు {{date}} వరకూ సస్పెండయ్యాడు"
+      suspended_notice: "ఈ సభ్యుడు %{date} వరకూ సస్పెండయ్యాడు"
       suspended_reason: "కారణం:"
       github_profile: "గిట్ హబ్"
       tag_settings: "ట్యాగులు"
@@ -452,7 +452,7 @@ te:
         title: "ఈమెయిల్"
         ok: "ద్రువపరుచుటకు మీకు ఈమెయిల్ పంపాము"
         invalid: "దయచేసి చెల్లుబాటులోని ఈమెయిల్ చిరునామా రాయండి"
-        authenticated: "మీ ఈమెయిల్ {{provider}} చేత ద్రువీకరించబడింది"
+        authenticated: "మీ ఈమెయిల్ %{provider} చేత ద్రువీకరించబడింది"
         frequency_immediately: "మీకు వెంటనే ఈమెయిల్ చేసాము, మీరు ఈమెయిల్ విషయం చదవకపోతే. "
       associated_accounts:
         revoke: "రివోక్"
@@ -465,9 +465,9 @@ te:
         ok: "మీ పేరు బాగుంది"
       username:
         title: "వాడుకరి పేరు"
-        short_instructions: "జనాలు మిమ్మల్ని @{{username}} అని ప్రస్తావించవచ్చు"
+        short_instructions: "జనాలు మిమ్మల్ని @%{username} అని ప్రస్తావించవచ్చు"
         available: "మీ సభ్యనామం అందుబాటులో ఉంది."
-        not_available: "అందుబాటులో లేదు. {{suggestion}} ప్రయత్నించండి?"
+        not_available: "అందుబాటులో లేదు. %{suggestion} ప్రయత్నించండి?"
         not_available_no_suggestion: "అందుబాటులో లేదు"
         too_short: "మీ సభ్యనామం మరీ చిన్నది"
         too_long: "మీ సభ్యనామం మరీ పొడుగు"
@@ -530,9 +530,9 @@ te:
         time_read: "చదువు సమయం"
         days_visited: "దర్శించిన రోజులు"
         account_age_days: "రోజుల్లో ఖాతా వయసు"
-        create: "ఒక ఆహ్వానం పంపు"
-        bulk_invite:
-          text: "దస్త్రం నుండి బహుళ ఆహ్వానాలు"
+        links_tab: "లంకెలు"
+        link_created_at: "సృష్టించిన"
+        link_groups: గుంపులు
       password:
         title: "సంకేతపదం"
         too_short: "మీ సంకేతపదం మరీ చిన్నది."
@@ -573,7 +573,7 @@ te:
       desc:
         network: "దయచేసి మీ కనక్షన్ సరిచూడండి. "
         network_fixed: "ఇప్పుడు మరలా పనిచేస్తుంది."
-        server: "దోష కోడు: {{status}}"
+        server: "దోష కోడు: %{status}"
         forbidden: "దాన్ని చూడటానికి మీకు అనుమతి లేదు"
         unknown: "ఏదో తేడా జరిగింది."
       buttons:
@@ -650,11 +650,11 @@ te:
       awaiting_activation: "మీ ఖాతా చేతనం కోసం ఎదురుచూస్తుంది. సంకేతపదం మర్చిపోయా లంకెను వాడు మరో చేతన ఈమెయిల్ పొందండి."
       awaiting_approval: "మీ ఖాతా ఇంకా సిబ్బంది ఒప్పుకొనలేదు. సిబ్బంది ఒప్పుకోగానే మీకు ఒక ఈమెయిల్ వస్తుంది."
       requires_invite: "క్షమించాలి. ఈ పోరమ్ ప్రవేశం కేవలం ఆహ్వానితులకు మాత్రమే."
-      not_activated: "మీరప్పుడే లాగిన్ అవ్వలేరు. గతంలో మేము మీకు చేతన ఈమెయల్ <b>{{sentTo}}</b> కు పంపాము. దయచేసి ఆ వేగులోని సూచనలు పాటించి మీ ఖాతాను చేతనం చేసుకోండి."
+      not_activated: "మీరప్పుడే లాగిన్ అవ్వలేరు. గతంలో మేము మీకు చేతన ఈమెయల్ <b>%{sentTo}</b> కు పంపాము. దయచేసి ఆ వేగులోని సూచనలు పాటించి మీ ఖాతాను చేతనం చేసుకోండి."
       not_allowed_from_ip_address: "ఆ ఐపీ చిరునామా నుండి మీరు లాగిన్ అవ్వలేరు."
       admin_not_allowed_from_ip_address: "మీరు ఆ IP చిరునామా నుండి నిర్వాహకుని వలె లాగిన్ కాలేరు."
       resend_activation_email: "చేతన ఈమెయిల్ మరలా పంపడానికి ఇక్కడ నొక్కండి."
-      sent_activation_email_again: "మీకు <b>{{currentEmail}}</b> మరో చేతన ఈమెయిల్ పంపాము. అది చేరుకోడానికి కొద్ది నిమిషాలు పట్టవచ్చు. ఇంకా స్పామ్ ఫోల్డరు చూడటం మర్చిపోకండి సుమా. "
+      sent_activation_email_again: "మీకు <b>%{currentEmail}</b> మరో చేతన ఈమెయిల్ పంపాము. అది చేరుకోడానికి కొద్ది నిమిషాలు పట్టవచ్చు. ఇంకా స్పామ్ ఫోల్డరు చూడటం మర్చిపోకండి సుమా. "
       google_oauth2:
         name: "గూగుల్"
         title: "గూగుల్ తో"
@@ -693,9 +693,9 @@ te:
       drafts_offline: "చిత్తుప్రతులు ఆఫ్లైను."
       error:
         title_missing: "శీర్షిక తప్పనిసరి"
-        title_too_short: "శీర్షిక కనీసం {{min}} అక్షరాలు ఉండాలి"
-        title_too_long: "శీర్షిక {{max}} అక్షరాలకు మించి ఉండకూడదు"
-        post_length: "టపా కనీసం {{min}} అక్షరాలు కలిగి ఉండాలి"
+        title_too_short: "శీర్షిక కనీసం %{min} అక్షరాలు ఉండాలి"
+        title_too_long: "శీర్షిక %{max} అక్షరాలకు మించి ఉండకూడదు"
+        post_length: "టపా కనీసం %{min} అక్షరాలు కలిగి ఉండాలి"
         category_missing: "మీరు ఒక వర్గాన్ని ఎంచుకోవాలి"
       save_edit: "దాచి సవరించు"
       reply_original: "మూల విషయంకు జవాబివ్వు"
@@ -755,11 +755,11 @@ te:
       title: "విషయాలు, టపాలు, సభ్యులు లేదా వర్గాలు వెతుకు"
       no_results: "ఎటువంటి ఫలితాలు దొరకలేదు."
       searching: "వెతుకుతున్నామ్..."
-      post_format: "{{username}} నుండి #{{post_number}}"
+      post_format: "%{username} నుండి #%{post_number}"
       search_google_button: "గూగుల్"
       search_google_title: "ఈ సైట్ వెదుకు"
       context:
-        user: "@{{username}} యొక్క విషయాలు వెతుకు"
+        user: "@%{username} యొక్క విషయాలు వెతుకు"
         topic: "ఈ విషయంలో వెతుకు"
       advanced:
         posted_by:
@@ -782,7 +782,7 @@ te:
         choose_new_category: "విషయం కొరకు కొత్త వర్గం ఎంచుకొండి:"
         selected:
           one: "మీరు <b>%{count}</b> విషయం ఎంచుకున్నారు."
-          other: " మీరు <b>{{count}}</b> విషయాలు ఎంచుకున్నారు."
+          other: " మీరు <b>%{count}</b> విషయాలు ఎంచుకున్నారు."
       none:
         unread: "మీరు చదవని విషయాలు లేవు"
         new: "మీకు కొత్త విషయాలు లేవు"
@@ -790,7 +790,7 @@ te:
         posted: "మీరింకా ఏ విషయాలూ రాయలేదు."
         latest: "కొత్త విషయాలు లేవు. అహో ఎంతటి విపరిణామం."
         bookmarks: "మీకింకా ఎట్టి పేజీక విషయాలూ లేవు."
-        category: "ఎట్టి {{category}} విషయాలూ లేవు"
+        category: "ఎట్టి %{category} విషయాలూ లేవు"
         top: "ఎట్టి అగ్ర విషయాలూ లేవు."
       bottom:
         latest: "ఇంకా కొత్త విషయాలు లేవు."
@@ -798,7 +798,7 @@ te:
         read: "ఇంకా చదవని విషయాలు లేవు."
         new: "కొత్త విషయాలు లేవు."
         unread: "ఇంకా చదవని విషయాలు లేవు."
-        category: "ఇంకా {{category}} విషయాలు లేవు."
+        category: "ఇంకా %{category} విషయాలు లేవు."
         top: "ఇంకా అగ్ర విషయాలు లేవు."
         bookmarks: "ఇంకా పేజీక విషయాలు లేవు."
     topic:
@@ -813,10 +813,10 @@ te:
       unread: "చదవని"
       new_topics:
         one: "%{count} కొత్త విషయం"
-        other: "{{count}} కొత్త విషయాలు"
+        other: "%{count} కొత్త విషయాలు"
       unread_topics:
         one: "%{count} చదవని విషయం"
-        other: "{{count}} చదవని విషయాలు"
+        other: "%{count} చదవని విషయాలు"
       title: "విషయం"
       invalid_access:
         title: "విషయం ప్రైవేటు"
@@ -830,22 +830,22 @@ te:
         description: "క్షమించాలి. ఆ విషయం మేము కనుగొనలేకున్నాము. బహుశా నిర్వాహకులు దాన్ని తొలగించారేమో?"
       total_unread_posts:
         one: "మీకు ఈ విషయంలో %{count} చదవని టపా ఉంది"
-        other: "మీకు ఈ విషయంలో {{count}} చదవని టపాలు ఉన్నాయి"
+        other: "మీకు ఈ విషయంలో %{count} చదవని టపాలు ఉన్నాయి"
       unread_posts:
         one: "మీకు ఈ విషయంలో %{count} చదవని పాత టపా ఉంది"
-        other: "మీకు ఈ విషయంలో {{count}} చదవని పాత టపాలు ఉన్నాయి"
+        other: "మీకు ఈ విషయంలో %{count} చదవని పాత టపాలు ఉన్నాయి"
       new_posts:
         one: "మీరు చివరసారి చదివాక ఈ విషయంలో %{count} కొత్త టపా వచ్చింది"
-        other: "మీరు చివరసారి చదివాక ఈ విషయంలో {{count}} కొత్త టపాలు వచ్చాయి"
+        other: "మీరు చివరసారి చదివాక ఈ విషయంలో %{count} కొత్త టపాలు వచ్చాయి"
       likes:
         one: "ఈ విషయానికి %{count} ఇష్టం ఉంది"
-        other: "ఈ విషయానికి {{count}} ఇష్టాలు ఉన్నాయి"
+        other: "ఈ విషయానికి %{count} ఇష్టాలు ఉన్నాయి"
       back_to_list: "విషయాల జాబితాకు మరలు"
       options: "విషయపు ఐచ్చికాలు"
       show_links: "ఈ విషయంలో లంకెలు చూపు"
       toggle_information: "విషయపు వివరాలు అటుఇటుచేయి"
-      read_more_in_category: "మరింత చదవాలనుకుంటున్నారా? {{catLink}} లేదా {{latestLink}} లో ఇతర విషయాలు చూడు."
-      read_more: "మరిన్ని చదవాలనుకుంటున్నారా? {{catLink}} లేదా {{latestLink}}."
+      read_more_in_category: "మరింత చదవాలనుకుంటున్నారా? %{catLink} లేదా %{latestLink} లో ఇతర విషయాలు చూడు."
+      read_more: "మరిన్ని చదవాలనుకుంటున్నారా? %{catLink} లేదా %{latestLink}."
       browse_all_categories: అన్ని వర్గాలూ జల్లించు
       view_latest_topics: తాజా విషయాలు చూడు
       suggest_create_topic: "ఓ విషయమెందుకు సృష్టించకూడదూ?"
@@ -947,7 +947,7 @@ te:
       filters:
         n_posts:
           one: "%{count} టపా"
-          other: "{{count}} టపాలు"
+          other: "%{count} టపాలు"
         cancel: "జల్లెడ తొలగించు"
       split_topic:
         title: "కొత్త విషయానికి జరుపు"
@@ -956,21 +956,21 @@ te:
         error: "టపాలను కొత్త విషయానికి జరిపేటప్పుడు దోషం తలెత్తింది"
         instructions:
           one: "మీరు కొత్త విషయం సృష్టించి దాన్ని మీరు ఈ టపాతో నింపబోతున్నారు."
-          other: "మీరు కొత్త విషయం సృష్టించి దాన్ని <b>{{count}}</b> టపాలతో నింపబోతున్నారు."
+          other: "మీరు కొత్త విషయం సృష్టించి దాన్ని <b>%{count}</b> టపాలతో నింపబోతున్నారు."
       merge_topic:
         title: "ఇప్పటికే ఉన్న విషయానికి జరుపు"
         action: "ఇప్పటికే ఉన్న విషయానికి జరుపు"
         error: " ఆ విషయంలోకి టపాలను జరపడంలో దోషం."
         instructions:
           one: "ఈ టపాలు జరపాలనుకున్న విషయాన్ని ఎంచుకోండి."
-          other: "ఈ <b>{{count}}</b> టపాలను జరపాలనుకున్న విషయాన్ని ఎంచుకోండి."
+          other: "ఈ <b>%{count}</b> టపాలను జరపాలనుకున్న విషయాన్ని ఎంచుకోండి."
       change_owner:
         action: "యజమానిని మార్చు"
         error: "ఆ టపాల యజమానిని మార్చేప్పుడు దోషం జరిగింది."
         placeholder: "కొత్త యజమాని సభ్యనామం"
       multi_select:
         select: "ఎంచుకో"
-        selected: "ఎంచుకున్నవి ({{count}})"
+        selected: "ఎంచుకున్నవి (%{count})"
         select_post:
           label: "ఎంచుకో"
         select_replies:
@@ -981,13 +981,13 @@ te:
         deselect_all: అన్నీ వియెంచుకో
         description:
           one: మీరు <b>%{count}</b> టపా ఎంచుకున్నారు
-          other: "మీరు <b>{{count}}</b> టపాలు ఎంచుకున్నారు"
+          other: "మీరు <b>%{count}</b> టపాలు ఎంచుకున్నారు"
     post:
       edit_reason: "కారణం:"
-      post_number: "టపా {{number}}"
+      post_number: "టపా %{number}"
       last_edited_on: "టపా చివర సవరించిన కాలం"
       reply_as_new_topic: "లంకె విషయంగా జవాబివ్వు"
-      continue_discussion: "{{postLink}} నుండి చర్చ కొనసాగుతుంది;"
+      continue_discussion: "%{postLink} నుండి చర్చ కొనసాగుతుంది;"
       follow_quote: "కోటెడ్ టపాకు వెళ్లు"
       show_full: "పూర్తి టపా చూపు"
       deleted_by_author:
@@ -1180,20 +1180,20 @@ te:
       unlisted:
         help: "ఈ విషయం జాబితాలనుండి తొలగించబడింది. ఇహ కేవలం నేరు లంకె ద్వారా మాత్రమే చూడగలరు."
     posts: "టపాలు"
-    posts_long: "ఈ విషయానికి {{number}} టపాలు ఉన్నాయి. "
+    posts_long: "ఈ విషయానికి %{number} టపాలు ఉన్నాయి. "
     original_post: "మూల టపా"
     views: "చూపులు"
     replies: "జవాబులు"
     activity: "కలాపం"
     likes: "ఇష్టాలు"
-    likes_long: "ఈ విషయానికి {{number}} ఇష్టాలు ఉన్నాయి"
+    likes_long: "ఈ విషయానికి %{number} ఇష్టాలు ఉన్నాయి"
     users: "సభ్యులు"
     users_lowercase:
       one: "వాడుకరి"
       other: "వాడుకరులు"
     category_title: "వర్గం"
     history: "చరిత్ర"
-    changed_by: " {{author}} రాసిన"
+    changed_by: " %{author} రాసిన"
     raw_email:
       not_available: "అందుబాటులో లేదు!"
     categories_list: "వర్గాల జాబితా"
@@ -1208,7 +1208,7 @@ te:
         help: "మీరు చదివిన విషయాలు, మీరు చివరిసారి చదివిన వరుసలో"
       categories:
         title: "వర్గాలు"
-        title_in: "వర్గం - {{categoryName}}"
+        title_in: "వర్గం - %{categoryName}"
         help: "వర్గాల వారీగా జట్టు కట్టిన అన్ని విషయాలూ"
       unread:
         title: "చదవని"
@@ -1224,8 +1224,8 @@ te:
         title: "పేజీకలు"
         help: "మీరు పేజీక ఉంచిన విషయాలు"
       category:
-        title: "{{categoryName}}"
-        help: "{{categoryName}} వర్గంలోని కొత్త విషయాలు"
+        title: "%{categoryName}"
+        help: "%{categoryName} వర్గంలోని కొత్త విషయాలు"
       top:
         title: "అగ్ర"
         help: "గత సంవత్సరం, నెల, వారం లేదా రోజులోని అత్యంత క్రియాశీల విషయాలు"
@@ -1459,7 +1459,7 @@ te:
         upload:
           label: "ఎక్కించు"
           uploading: "ఎగుమతవుతోంది..."
-          error: "'{{filename}}' ఎగుమతించుటలో దోషం: {{message}}"
+          error: "'%{filename}' ఎగుమతించుటలో దోషం: %{message}"
         operations:
           is_running: "ఒక కార్యం ప్రస్తుతం నడుస్తోంది..."
           failed: "కార్యం విఫలమైంది. దయచేసి లాగులు చూడండి."
@@ -1736,8 +1736,8 @@ te:
           title: "ఈ సభ్యుని ఈమెయిల్ చూపు"
           text: "చూపు"
       user:
-        suspend_failed: "ఈ సభ్యుడిని సస్పెండ్ చేసేప్పుడు ఏదో తేడా జరిగింది. {{error}}"
-        unsuspend_failed: "ఈ వినియోగదారు వలన ఏదో తొలగింపబడని తప్పు జరిగింది {{error}}"
+        suspend_failed: "ఈ సభ్యుడిని సస్పెండ్ చేసేప్పుడు ఏదో తేడా జరిగింది. %{error}"
+        unsuspend_failed: "ఈ వినియోగదారు వలన ఏదో తొలగింపబడని తప్పు జరిగింది %{error}"
         suspend_duration: "వినియోగదారు ఎంతకాలం నిలిపివేయబడ్డాడు?"
         suspend_reason_label: "మీరు ఎందుకు తొలగించబడ్డారు? ఈ పాఠ్యం <b> వినియోగదారును ప్రొఫైల్ పుట మీద ప్రతివారికి </b> కనబడుతుంది, మరియు వినియోగదారుడు లాగిన్‌కు ప్రయత్నించినపుడు చూస్తారు.చిన్నదిగా ఉంచండి."
         suspend_reason: "కారణం"
@@ -1965,6 +1965,7 @@ te:
       emoji:
         title: "ఇమోజి"
         add: "కొత్త ఇమోజి కలుపు"
+        uploading: "ఎగుమతవుతోంది..."
         name: "పేరు"
         group: "సమూహం"
         image: "బొమ్మ"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index dabbe4811f..c1e43b699b 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -22,8 +22,8 @@ th:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}พัน"
-        millions: "{{number}}ล้าน"
+        thousands: "%{number}พัน"
+        millions: "%{number}ล้าน"
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
@@ -75,17 +75,20 @@ th:
           other: "%{count} วันที่แล้ว"
       later:
         x_days:
-          other: "%{count} วันหลังจากนั้น"
+          other: "%{count} วันหลังจากนี้"
         x_months:
-          other: "%{count} เดือนหลังจากนั้น"
+          other: "%{count} เดือนหลังจากนี้"
         x_years:
-          other: "%{count} ปีหลังจากนั้น"
+          other: "%{count} ปีหลังจากนี้"
       previous_month: "เดือนที่แล้ว"
       next_month: "เดือนถัดไป"
       placeholder: วัน
     share:
-      post: "โพส #%{postNumber}"
+      post: "โพสต์ #%{postNumber}"
       close: "ปิด"
+      twitter: "แชร์ลิ้งก์นี้ไปทวิตเตอร์"
+      facebook: "แชร์ลิ้งก์นี้ไปเฟซบุ๊ก"
+      email: "ส่งลิ้งก์นี้ทางอีเมล"
     action_codes:
       public_topic: "ทำให้กระทู้นี้เป็นสาธารณะ %{when} "
       private_topic: "ทำให้กระทู้นี้เป็นข้อความส่วนตัว"
@@ -105,7 +108,7 @@ th:
         disabled: "ถูกเอกออกจากคลังเมื่อ %{when}"
       pinned:
         enabled: "ถูกปักหมุดเมื่อ %{when}"
-        disabled: "ถึงปลดหมุดเมื่อ %{when}"
+        disabled: "ถูกปลดหมุดเมื่อ %{when}"
       pinned_globally:
         enabled: "ถูกปักหมุดแบบรวมเมื่อ %{when}"
         disabled: "ถูกปลดหมุดเมื่อ %{when}"
@@ -113,9 +116,9 @@ th:
         enabled: "ถูกแสดงเมื่อ %{when}"
         disabled: "ถูกซ่อนเมื่อ %{when}"
       banner:
-        enabled: "ทำให้เป็นแบนเนอร์%{when} มันจะปรากฎที่ด้านบนสุดของทุกหน้าจนกว่าจะผู้ใช้งานจะกดลบ"
-        disabled: "ลบแบนเนอร์นี้%{when} มันจะไม่ปรากฎที่ด้านบนของหน้าใดๆ"
-    emails_are_disabled: "อีเมลขาออกทั้งหมดจะถูกปิดโดยผู้ดูแลระบบ ไม่มีอีเมลแจ้งเตือนใดๆจะถูกส่งออกไป"
+        enabled: "ทำให้เป็นแบนเนอร์%{when} จะปรากฏที่ด้านบนสุดของทุกหน้าจนกว่าจะผู้ใช้งานจะกดลบ"
+        disabled: "ลบแบนเนอร์นี้%{when} จะไม่ปรากฏที่ด้านบนของหน้าใดๆ"
+    emails_are_disabled: "อีเมลขาออกทั้งหมดถูกปิดโดยผู้ดูแลระบบ จะไม่มีอีเมลแจ้งเตือนใดๆถูกส่งออกไป"
     themes:
       default_description: "ค่าเริ่มต้น"
     s3:
@@ -123,43 +126,43 @@ th:
         ap_northeast_1: "เอเชียแปซิฟิก (โตเกียว)"
         ap_northeast_2: "เอเชียแปซิฟิก (โซล)"
         ap_south_1: "เอเชียแปซิฟิก (มุมไบ)"
-        ap_southeast_1: "เอเชียแปซิฟิก (สิงคโปร)"
-        ap_southeast_2: "เอเชียแปซิฟิก (ซิสนี่)"
+        ap_southeast_1: "เอเชียแปซิฟิก (สิงคโปร์)"
+        ap_southeast_2: "เอเชียแปซิฟิก (ซิดนีย์)"
         cn_north_1: "จีน (ปักกิ่ง)"
         eu_central_1: "อียู (แฟรงก์เฟิร์ต)"
         eu_west_1: "อียู (ไอร์แลนด์)"
-        us_east_1: "สหรัฐอเมริกาซีกตะวันออก (เวอร์จิเนียเหนือ)"
-        us_east_2: "สหรัฐอเมริกาตะวันออก (โอไฮโอ)"
-        us_west_1: "อเมริกาตะวันตก (แคริฟอเนียเหนือ)"
-        us_west_2: "อเมริกาตะวันตก (โอเลก้อน)"
+        us_east_1: "สหรัฐอเมริกาฝั่งตะวันออก (เวอร์จิเนียเหนือ)"
+        us_east_2: "สหรัฐอเมริกาฝั่งตะวันออก (โอไฮโอ)"
+        us_west_1: "สหรัฐอเมริกาฝั่งตะวันตก (แคลิฟอร์เนียเหนือ)"
+        us_west_2: "สหรัฐอเมริกาฝั่งตะวันตก (ออริกอน)"
     edit: "แก้ไขหัวข้อและหมวดหมู่ของกระทู้นี้"
     expand: "ขยาย"
-    not_implemented: "เสียใจด้วย!! คุณสมบัตินั้นยังไม่เสร็จสมบูรณ์ในตอนนี้"
+    not_implemented: "ขออภัย! คุณสมบัตินั้นยังไม่เสร็จสมบูรณ์"
     no_value: "ไม่ใช่"
     yes_value: "ใช่"
     submit: "ตกลง"
-    generic_error: "เสียใจด้วย, มีความผิดพลาดขึ้น"
-    generic_error_with_reason: "มีข้อผิดพลาดเกิดขึ้น: %{error}"
+    generic_error: "ขออภัย เกิดข้อผิดพลาดขึ้น"
+    generic_error_with_reason: "เกิดข้อผิดพลาดขึ้น: %{error}"
     sign_up: "สมัครสมาชิก"
     log_in: "เข้าสู่ระบบ"
     age: "อายุ"
-    joined: "เข้าร่วม"
+    joined: "เข้าร่วมแล้ว"
     admin_title: "ผู้ดูแลระบบ"
     show_more: "แสดงเพิ่มเติม"
     show_help: "ตัวเลือก"
     links: "ลิงก์"
     links_lowercase:
-      other: "ลิงค์"
-    faq: "ถามตอบ"
+      other: "ลิงก์"
+    faq: "คำถามที่พบบ่อย"
     guidelines: "คู่มือ"
     privacy_policy: "นโยบายความเป็นส่วนตัว"
     privacy: "ความเป็นส่วนตัว"
     tos: "เงื่อนไขการบริการ"
-    mobile_view: "เปิดหน้าสำหรับอุปกรณ์เคลื่อนที่"
-    desktop_view: "เปิดหน้าสำหรับเดสท๊อป"
+    mobile_view: "ดูแบบอุปกรณ์เคลื่อนที่"
+    desktop_view: "ดูแบบเดสก์ท็อป"
     you: "คุณ"
     or: "หรือ"
-    now: "เมื่อสักครู่นี้"
+    now: "ขณะนี้"
     read_more: "อ่านเพิ่มเติม"
     more: "เพิ่มเติม"
     less: "น้อย"
@@ -168,44 +171,48 @@ th:
     every_hour: "ทุกชั่วโมง"
     daily: "ทุกวัน"
     weekly: "รายสัปดาห์"
-    max_of_count: "สูงสุดของ {{count}}"
+    every_month: "ทุกเดือน"
+    every_six_months: "ทุกหกเดือน"
+    max_of_count: "สูงสุดของ %{count}"
     alternation: "หรือ"
     character_count:
-      other: "{{count}} ตัวอักษร"
+      other: "%{count} ตัวอักษร"
     suggested_topics:
       title: "กระทู้แนะนำ"
-      pm_title: "ข้อความที่แนะนำ"
+      pm_title: "ข้อความแนะนำ"
     about:
       simple_title: "เกี่ยวกับ"
       title: "เกี่ยวกับ %{title}"
       stats: "สถิติเว็บไซต์"
-      our_admins: "แอดมินของพวกเรา"
-      our_moderators: "พิธีกรของพวกเรา"
+      our_admins: "แอดมินของเรา"
+      our_moderators: "ผู้ดูแลของเรา"
       stat:
-        all_time: "ทุกเวลา"
+        all_time: "ตลอดเวลา"
       like_count: "ถูกใจ"
       topic_count: "กระทู้"
-      post_count: "โพส"
+      post_count: "โพสต์"
       user_count: "ผู้ใช้"
       active_user_count: "ผู้ใช้ที่ใช้งานอยู่"
       contact: "ติดต่อเรา"
-      contact_info: "ในกรณีที่เกิดเหตุฉุกเฉินหรือเกิดความผิดพลาดร้ายแรงเกี่ยวกับเว็บไซต์นี้ โปรดติดต่อเราได้ที่ %{contact_info}"
+      contact_info: "ในกรณีที่เกิดเหตุฉุกเฉินหรือประเด็นสำคัญที่ส่งผลต่อเว็บไซต์นี้ กรุณาติดต่อเราที่ %{contact_info}"
     bookmarked:
-      title: "บุ๊คมาร์ค"
-      clear_bookmarks: "ล้างบุ๊คมาร์ค"
+      title: "บุ๊กมาร์ก"
+      clear_bookmarks: "ล้างบุ๊กมาร์ก"
       help:
         bookmark: "คลิกเพื่อ บุ๊คมาร์ค ที่โพสแรกของกระทู้นี้"
-        unbookmark: "คลิกเพื่อลบบุ๊คมาร์คทั้งหมดในกระทู้นี้"
+        unbookmark: "คลิกเพื่อลบบุ๊กมาร์กทั้งหมดในกระทู้นี้"
     bookmarks:
-      remove: "ลบบุ๊คม๊าค"
+      remove: "ลบบุ๊กมาร์ก"
       save: "บันทึก"
+      reminders:
+        tomorrow: "พรุ่งนี้"
     drafts:
       remove: "ลบ"
       abandon:
-        yes_value: "ใช่ ทิ้งไป"
+        yes_value: "ใช่ ละทิ้ง"
         no_value: "ไม่ เก็บไว้"
     topic_count_latest:
-      other: "เห็น {{count}} กระทู้ใหม่ หรือที่ถูกอัพเดต"
+      other: "ดู %{count} กระทู้ใหม่หรือที่อัปเดต"
     preview: "แสดงตัวอย่าง"
     cancel: "ยกเลิก"
     save: "บันทึกการเปลี่ยนแปลง"
@@ -213,7 +220,7 @@ th:
     saved: "บันทึกแล้ว!"
     upload: "อัปโหลด"
     uploading: "กำลังอัปโหลด..."
-    uploaded: "อัปโหลดเสร็จสมบูรณ์"
+    uploaded: "อัปโหลดแล้ว!"
     enable: "เปิดใช้งาน"
     disable: "ปิดใช้งาน"
     undo: "เลิกทำ"
@@ -223,7 +230,7 @@ th:
     switch_from_anon: "ออกจากโหมดไม่ระบุชื่อ"
     banner:
       close: "ปิดแบนเนอร์นี้"
-      edit: "แก้ไขป้ายนี้ >>"
+      edit: "แก้ไขแบนเนอร์นี้ >>"
     choose_topic:
       none_found: "ไม่พบกระทู้ใดๆ"
     review:
@@ -245,7 +252,7 @@ th:
       filters:
         type:
           title: "ชนิด"
-        refresh: "รีโหลด"
+        refresh: "รีเฟรช"
         category: "หมวดหมู่"
       scores:
         date: "วันที่"
@@ -258,39 +265,39 @@ th:
           title: "ผู้ใช้"
       approval:
         title: "โพสต์นี้ต้องได้รับการอนุมัติ"
-        description: "เราได้รับโพสของคุณแล้วแต่จำเป็นต้องมีการอนุมัตโดยผู้ดูแลก่อนจึงจะปรากฎขึ้น กรุณารอสักครู่"
+        description: "เราได้รับโพสต์ใหม่ของคุณแล้ว แต่ต้องได้รับการอนุมัติจากผู้ดูแลก่อนถึงจะปรากฏขึ้น กรุณารอสักครู่"
         ok: "ตกลง"
     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>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> ตอบกลับ <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>คุณ</a> ตอบกลับ <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> ตอบกลับ <a href='{{topicUrl}}'>กระทู้</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>คุณ</a> ได้ตอบกลับ <a href='{{topicUrl}}'>กระทู้</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> พูดถึง <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> พูดถึง <a href='{{user2Url}}'>คุณ</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>คุณ</a> ได้พูดถึง <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "โพสโดย <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "โพสโดย <a href='{{userUrl}}'>คุณ</a>"
-      sent_by_user: "ถูกส่งโดย <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "ถูกส่งโดย <a href='{{userUrl}}'>คุณ</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> โพสต์ <a href='%{topicUrl}'>กระทู้</a>"
+      you_posted_topic: "<a href='%{userUrl}'>คุณ</a> โพสต์ <a href='%{topicUrl}'>กระทู้</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> ตอบกลับ <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>คุณ</a> ตอบกลับ <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> ตอบกลับ <a href='%{topicUrl}'>กระทู้</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>คุณ</a> ตอบกลับ <a href='%{topicUrl}'>กระทู้</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> พูดถึง <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> พูดถึง <a href='%{user2Url}'>คุณ</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>คุณ</a> พูดถึง <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "โพสต์โดย <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "โพสต์โดย <a href='%{userUrl}'>คุณ</a>"
+      sent_by_user: "ถูกส่งโดย <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "ถูกส่งโดย <a href='%{userUrl}'>คุณ</a>"
     directory:
       filter_name: "กรองด้วยชื่อผู้ใช้"
-      title: "ชื่อผู้ใช้"
+      title: "ผู้ใช้"
       likes_given: "ให้"
       likes_received: "รับ"
       topics_entered: "ดู"
       topics_entered_long: "กระทู้ที่ดู"
       time_read: "เวลาที่อ่าน"
       topic_count: "กระทู้"
-      topic_count_long: "กระทู้สร้าง"
+      topic_count_long: "กระทู้ถูกสร้าง"
       post_count: "ตอบ"
-      post_count_long: "ตอบกลับแล้ว"
-      no_results: "ไม่มีผลการค้นหา"
+      post_count_long: "คำตอบถูกโพสต์แล้ว"
+      no_results: "ไม่พบผลการค้นหา"
       days_visited: "เยี่ยมชม"
-      days_visited_long: "วันที่ดู"
+      days_visited_long: "วันที่เยี่ยมชม"
       posts_read: "อ่าน"
-      posts_read_long: "อ่านโพส"
+      posts_read_long: "โพสต์ถูกอ่าน"
       total_rows:
         other: "%{count} ผู้ใช้"
     group_histories:
@@ -309,11 +316,11 @@ th:
         name: "ชื่อ"
         full_name: "ชื่อ-นามสกุล"
         add_members: "เพิ่มสมาชิก"
-        delete_member_confirm: "ลบ '%{username}' ออกจากกลุ่ม '%{group}' "
+        delete_member_confirm: "ลบ '%{username}' ออกจากกลุ่ม '%{group}' ใช่ไหม"
         profile:
-          title: ข้อมูลผู้ใช้
+          title: โปรไฟล์
         interaction:
-          posting: โพส
+          posting: กำลังโพสต์
           notification: การแจ้งเตือน
         membership:
           title: การเป็นสมาชิก
@@ -352,58 +359,58 @@ th:
       members:
         title: "สมาชิก"
         filter_placeholder_admin: "ชื่อผู้ใช้หรืออีเมล"
-        filter_placeholder: "ผู้ใช้"
+        filter_placeholder: "ชื่อผู้ใช้"
       topics: "กระทู้"
       posts: "โพสต์"
-      mentions: "พูดถึง"
+      mentions: "กล่าวถึง"
       messages: "ข้อความ"
       alias_levels:
-        mentionable: "ใครสามารถ @กล่าวถึง กลุ่มนี้"
-        messageable: "ใครสามารถส่งข้อความในกลุ่มนี้?"
-        nobody: "ไม่มี"
-        only_admins: "เฉพาะผู้ดูแลระบบ"
-        mods_and_admins: "ผู้ดูแลระบบและผู้ตรวจสอบ"
-        members_mods_and_admins: "สมาชิกกลุ่ม ผู้ดูแลกระทู้ และผู้ดูแลเว็บ"
+        mentionable: "ใครสามารถ @กล่าวถึงกลุ่มนี้ได้"
+        messageable: "ใครสามารถส่งข้อความในกลุ่มนี้ได้"
+        nobody: "ไม่มีใคร"
+        only_admins: "เฉพาะแอดมิน"
+        mods_and_admins: "เฉพาะผู้ดูแลระบบและแอดมิน"
+        members_mods_and_admins: "เฉพาะสมาชิกกลุ่ม ผู้ดูแลระบบและแอดมิน"
         everyone: "ทุกคน"
       notifications:
         watching:
           title: "กำลังดู"
-          description: "คุณจะถูกแจ้งเตือนทุกๆโพสใหม่ในทุกๆข้อความและจำนวนใหม่จะถูกนับอละแสดง"
+          description: "คุณจะถูกแจ้งเตือนทุกๆโพสต์ใหม่ในทุกๆข้อความ และจำนวนของคำตอบใหม่จะถูกแสดง"
         watching_first_post:
-          title: "ดูโพสต์แรก"
+          title: "กำลังดูโพสต์แรก"
         tracking:
-          title: "ติดตาม"
-          description: "คุณจะได้รับการแจ้งเตือนเมื่อใครก็ตามเอ่ยชื่อของคุณ @name หรือตอบคุณ และจำนวนของการตอบจะถูกแสดง"
+          title: "กำลังติดตาม"
+          description: "คุณจะได้รับการแจ้งเตือนเมื่อมีคนกล่าวถึงชื่อของคุณ @name หรือตอบคุณ และจำนวนของคำตอบใหม่จะถูกแสดง"
         regular:
           title: "ปกติ"
-          description: "คุณจะได้รับการแจ้งเตือนเมื่อใครก็ตามเอ่ยชื่อของคุณ @name หรือตอบคุณ"
+          description: "คุณจะได้รับการแจ้งเตือนเมื่อมีคนกล่าวถึงชื่อของคุณ @name หรือตอบคุณ"
         muted:
           title: "ปิด"
       flair_preview_icon: "ไอคอนตัวอย่าง"
       flair_preview_image: "รูปภาพตัวอย่าง"
     user_action_groups:
-      "1": "ให้ถูกใจ"
-      "2": "ได้รับการถูกใจ"
-      "3": "บุ๊คมาร์ค"
+      "1": "ถูกใจ"
+      "2": "ถูกใจ"
+      "3": "บุ๊กมาร์ก"
       "4": "กระทู้"
       "5": "ตอบ"
       "6": "ตอบสนอง"
-      "7": "พูดถึง"
+      "7": "กล่าวถึง"
       "9": "อ้างอิง"
       "11": "แก้ไข"
       "12": "รายการที่ส่งแล้ว"
       "13": "กล่องข้อความ"
       "14": "อยู่ระหว่างการพิจารณา"
     categories:
-      all: "ดูทุกหมวดหมู่"
+      all: "ทุกหมวดหมู่"
       all_subcategories: "ทั้งหมด"
       no_subcategory: "ไม่มี"
       category: "หมวดหมู่"
-      category_list: "แสดงหมวดหมู่ทั้งหมด"
+      category_list: "แสดงรายชื่อหมวดหมู่"
       reorder:
         title: "เรียงหมวดหมู่ใหม่"
-        title_long: "จัดการรายชื่อหมวดหมู่"
-        save: "บันทึกตำแหน่ง"
+        title_long: "จัดการรายชื่อหมวดหมู่ใหม่"
+        save: "บันทึกคำสั่ง"
         apply_all: "นำไปใช้"
         position: "ตำแหน่ง"
       posts: "โพสต์"
@@ -421,17 +428,17 @@ th:
       phone: โทรศัพท์
       other_accounts: "บัญชีอื่นที่ใช้ไอพีนี้"
       delete_other_accounts: "ลบ %{count}"
-      username: "ผู้ใช้"
+      username: "ชื่อผู้ใช้"
       trust_level: "TL"
       read_time: "เวลาที่อ่าน"
       topics_entered: "กระทู้ที่เข้า"
-      post_count: "# โพส"
-      confirm_delete_other_accounts: "คุณแน่ใจแล้วหรือว่าจะลบบัญชีเหล่านี้จริงๆ?"
+      post_count: "# โพสต์"
+      confirm_delete_other_accounts: "คุณแน่ใจแล้วหรือว่าจะลบบัญชีเหล่านี้"
     user_fields:
       none: "(เลือกตัวเลือก)"
     user:
-      said: "{{username}}:"
-      profile: "ข้อมูลส่วนตัว"
+      said: "%{username}:"
+      profile: "โปรไฟล์"
       mute: "ปิด"
       edit: "แก้ไขการตั้งค่า"
       new_private_message: "สร้างข้อความส่วนตัวใหม่"
@@ -452,31 +459,31 @@ th:
         clear:
           title: "ล้าง"
       expand_profile: "ขยาย"
-      bookmarks: "บุ๊คมาร์ค"
+      bookmarks: "บุ๊กมาร์ก"
       bio: "เกี่ยวกับฉัน"
-      invited_by: "แนะนำโดย"
+      invited_by: "เชิญชวนโดย"
       trust_level: "ระดับความถูกต้อง"
       notifications: "การแจ้งเตือน"
       statistics: "สถิติ"
       desktop_notifications:
-        not_supported: "การแจ้งเตือนยังไม่สนับสนุนบนบาวเซอร์นี้ ขอโทษด้วย"
+        not_supported: "ขออภัย บราวเซอร์นี้ไม่สนับสนุนการแจ้งเตือน"
         perm_default: "เปิดการแจ้งเตือน"
         perm_denied_btn: "ไม่มีสิทธิ์เข้าถึง"
-        perm_denied_expl: "คุณปฎิเสทเพื่อรับการแจ้งเตือน เปิดการแจ้งเตือนในบาวเซอร์ของคุณ"
+        perm_denied_expl: "คุณปฏิเสธการอนุญาตการแจ้งเตือน เปิดการแจ้งเตือนในการตั้งค่าบราวเซอร์ของคุณ"
         disable: "ปิดการแจ้งเตือน"
         enable: "เปิดการแจ้งเตือน"
-        each_browser_note: "โปรดทราบ: คุณต้องเปลี่ยนการตั้วค่านี้บนทุกบาวเซอร์ของคุณ"
+        each_browser_note: "โปรดทราบ: คุณต้องเปลี่ยนการตั้งค่านี้บนทุกบราวเซอร์ที่คุณใช้"
       dismiss: "ซ่อน"
       dismiss_notifications: "ซ่อนทั้งหมด"
-      dismiss_notifications_tooltip: "ทำการแจ้งเตือนทั้งหมดที่ยังไม่อ่านเป็นอ่านแล้ว"
+      dismiss_notifications_tooltip: "ทำเครื่องหมายอ่านบนการแจ้งเตือนที่ยังไม่ได้อ่านทั้งหมด"
       external_links_in_new_tab: "เปิดลิงก์ภายนอกทั้งหมดในแท็บใหม่"
       enable_quoting: "เปิดการตอบกลับการอ้างอิงโดยไฮไลท์ข้อความ"
       change: "เปลี่ยนแปลง"
-      moderator: "{{user}} เป็นผู้ตรวจสอบ"
-      admin: "{{user}} เป็นผู้ดูแลระบบ"
-      moderator_tooltip: "ผู้ใช้นี้เป็นผู้ตรวจสอบ"
-      admin_tooltip: "ผู้ใช้นี้เป็นผู้ดูแลระบบ"
-      suspended_notice: "ผู้ใช้นี้ถูกระงับตั้งแต่ {{date}}"
+      moderator: "%{user} เป็นผู้ดูแลระบบ"
+      admin: "%{user} เป็นแอดมิน"
+      moderator_tooltip: "ผู้ใช้นี้เป็นผู้ดูแลระบบ"
+      admin_tooltip: "ผู้ใช้นี้เป็นแอดมิน"
+      suspended_notice: "ผู้ใช้นี้ถูกระงับจนถึง %{date}"
       suspended_reason: "เหตุผล:"
       github_profile: "Github"
       email_activity_summary: "สรุปกิจกรรม"
@@ -485,33 +492,32 @@ th:
         enabled: "เปิดใช้งานโหมดจดหมายข่าว"
         instructions: |
           การตั้งค่านี้จะเปลี่ยนแปลงการสรุปกิจกรรม<br />
-          กระทู้และหมวดที่ปิดการแจ้งเตือนจะไม่มีในอีเมลเหล่านี้
-        individual: "ส่งอีเมลทุกครั้งที่โพสต์ใหม่"
-        many_per_day: "ส่งอีเมลหาฉันทุกๆโพสใหม่ (เกี่ยวกับ {{dailyEmailEstimate}} ต่อวัน)"
-        few_per_day: "ส่งอีเมลหาฉันทุกๆโพสใหม่ (เกี่ยวกับ 2 ต่อวัน)"
+          กระทู้และหมวดที่ปิดการแจ้งเตือนจะไม่ถูกรวมอยู่ในอีเมลเหล่านี้
+        individual: "ส่งอีเมลทุกครั้งที่มีโพสต์ใหม่"
+        many_per_day: "ส่งอีเมลหาฉันทุกๆโพสต์ใหม่ (ประมาณ %{dailyEmailEstimate} ต่อวัน)"
+        few_per_day: "ส่งอีเมลหาฉันทุกๆโพสต์ใหม่ (ประมาณ 2 ต่อวัน)"
       tag_settings: "แท็ก"
       watched_tags: "ดูแล้ว"
       tracked_tags: "ติดตาม"
       muted_tags: "ปิด"
       watched_categories: "ดูแล้ว"
       tracked_categories: "ติดตาม"
-      watched_first_post_categories: "ดูโพสต์แรก"
-      watched_first_post_tags: "ดูโพสต์แรก"
+      watched_first_post_categories: "กำลังดูโพสต์แรก"
+      watched_first_post_tags: "กำลังดูโพสต์แรก"
       muted_categories: "ปิดเสียง"
-      delete_account: "ลบบัญชีของคุณ"
-      delete_account_confirm: "คุณแน่ใจใหม่ที่จะลบบัญชีอย่างถาวร? การกระทำนี้ไม่สามารถยกเลิกได้"
-      deleted_yourself: "คุณลบบัญชีเสร็จเเรียบร้อยแล้ว"
+      delete_account: "ลบบัญชีของฉัน"
+      delete_account_confirm: "คุณแน่ใจไหมที่จะลบบัญชีอย่างถาวร การดำเนินการนี้ไม่สามารถยกเลิกได้"
+      deleted_yourself: "บัญชีของคุณถูกลบเรียบร้อยแล้ว"
       unread_message_count: "ข้อความ"
       admin_delete: "ลบ"
       users: "ผู้ใช้"
       muted_users: "ปิดการแจ้งเตือน"
-      muted_users_instructions: "ยกเลิกการแจ้งเตือนทุกอย่างกับบัญชีผู้ใช้นี้"
       tracked_topics_link: "แสดง"
-      automatically_unpin_topics: "ยกเลิกกระทู้ปกหมุดอัตโนมัติเมื่อถึงท้ายของหน้า"
+      automatically_unpin_topics: "ยกเลิกปักหมุดกระทู้อัตโนมัติเมื่อถึงท้ายหน้า"
       staff_counters:
         flags_given: "ธงที่เป็นประโยชน์"
-        flagged_posts: "โพสปักธง"
-        deleted_posts: "ลบโพส"
+        flagged_posts: "โพสต์ที่ปักธง"
+        deleted_posts: "โพสต์ที่ลบ"
         suspensions: "ระงับการใช้งาน"
         warnings_received: "คำเตือน"
       messages:
@@ -523,24 +529,24 @@ th:
         bulk_select: "เลือกข้อความ"
         move_to_inbox: "ย้ายไปกล่องขาเข้า"
         move_to_archive: "เก็บ"
-        failed_to_move: "เกิดความผิดพลาดในการย้ายหัวข้อที่เลือก (อาจเกิดจาดเครือข่ายของคุณล่ม)"
+        failed_to_move: "เกิดความผิดพลาดในการย้ายข้อความที่เลือก (เครือข่ายของคุณอาจล่ม)"
         select_all: "เลือกทั้งหมด"
-        tags: "ป้าย"
+        tags: "แท็ก"
       preferences_nav:
-        profile: "ข้อมูลผู้ใช้"
+        profile: "โปรไฟล์"
         emails: "อีเมล"
         notifications: "การแจ้งเตือน"
         categories: "หมวดหมู่"
         users: "ผู้ใช้"
-        tags: "ป้าย"
+        tags: "แท็ก"
       change_password:
-        success: "(อีเมลที่ส่งแล้ว)"
+        success: "(อีเมลถูกส่งแล้ว)"
         in_progress: "(กำลังส่งอีเมล)"
         error: "(ผิดพลาด)"
         action: "ส่งอีเมลรีเซ็ทรหัสผ่าน"
         set_password: "ตั้งรหัสผ่าน"
-        choose_new: "เลือกรหัสผู้ใช้ใหม่"
-        choose: "เลือกรหัสผู้ใช้"
+        choose_new: "เลือกรหัสผ่านใหม่"
+        choose: "เลือกรหัสผ่าน"
       second_factor_backup:
         disable: "ปิดใช้งาน"
         enable: "เปิดใช้งาน"
@@ -555,33 +561,33 @@ th:
         title: "เปลี่ยนข้อมูลเกี่ยวกับฉัน"
         error: "เกิดความผิดพลาดในการแก้ไขค่านี้"
       change_username:
-        title: "เปลี่ยน Username"
-        taken: "ขออภัย มีคนใช้ชื่อนี้แล้ว"
+        title: "เปลี่ยนชื่อผู้ใช้"
+        taken: "ขออภัย มีผู้ใช้ชื่อนี้แล้ว"
         invalid: "ชื่อผู้ใช้ไม่ถูกต้อง จะต้องมีเพียงแค่ตัวอักษรและตัวเลขเท่านั้น"
       change_email:
-        title: "เปลี่ยนอีเมล์"
-        taken: "อีเมล์ไม่ถูกต้อง"
-        error: "มีปัญหาในการเปลี่ยนอีเมล์ บางทีอีเมล์นี้อาจจะถูกใช้แล้ว?"
+        title: "เปลี่ยนอีเมล"
+        taken: "ขออภัย อีเมลไม่ถูกต้อง"
+        error: "มีข้อผิดพลาดในการเปลี่ยนอีเมล บางทีอีเมลนี้อาจถูกใช้งานแล้ว"
         success: "เราส่งอีเมลไปยังที่อยู่อีเมลดังกล่าวแล้ว กรุณาทำตามขั้นตอนยืนยัน"
       change_avatar:
-        title: "เปลี่ยนรูปโพรไฟล์"
+        title: "เปลี่ยนรูปโปรไฟล์ของคุณ"
         letter_based: "รูปโพรไฟล์ที่ระบบทำให้อัตโนมัติ"
         uploaded_avatar: "รูปกำหนดเอง"
         uploaded_avatar_empty: "เพิ่มรูปกำหนดเอง"
         upload_title: "อัปโหลดรูปภาพของคุณ"
-        image_is_not_a_square: "ระวัง: เราได้ตัวรูปภาพบางส่วนของคุณ; ความยาวและความสูงจะไม่เท่ากัน"
+        image_is_not_a_square: "คำเตือน: เราได้ตัดรูปภาพของคุณ; ความกว้างและความสูงไม่เท่ากัน"
       change_card_background:
         title: "พื้นหลังผู้ใช้"
-        instructions: "รูปพื้นหลังจะถูกจัดกลางและมีความกว้างมาตราฐานที่ 590px"
+        instructions: "รูปพื้นหลังจะถูกจัดให้อยู่ตรงกลางและมีความกว้างมาตรฐานที่ 590px"
       email:
         title: "อีเมล"
         instructions: "ไม่แสดงเป็นสาธารณะ"
-        ok: "เราจะส่งอีเมลไปหาคุณเพื่อยืนยันอีกครั้ง"
+        ok: "เราจะส่งอีเมลไปหาคุณเพื่อยืนยัน"
         invalid: "กรุณาใส่อีเมลที่ถูกต้อง"
-        authenticated: "อีเมลของคุณได้รับการยืนยันโดย {{provider}}"
+        authenticated: "อีเมลของคุณได้รับการยืนยันโดย %{provider}"
         frequency_immediately: "เราจะอีเมลถึงคุณทันทีหากคุณยังไม่ได้อ่านสิ่งที่เราอีเมลหาคุณ"
         frequency:
-          other: "เราจะอีเมลหาคุณเฉพาะสิ่งที่คุณไม่ได้เห็นในช่วง {{count}} นาที"
+          other: "เราจะอีเมลหาคุณเฉพาะตอนที่ไม่ได้เห็นคุณเป็นเวลา %{count} นาที"
       associated_accounts:
         revoke: "เอาออก"
         cancel: "ยกเลิก"
@@ -590,17 +596,17 @@ th:
         instructions: "ชื่อเต็มของคุณ (ไม่บังคับ)"
         instructions_required: "ชื่อเต็มของคุณ"
         too_short: "ชื่อของคุณสั้นไป"
-        ok: "ชื่อของคุณมีลักษณะที่ดี"
+        ok: "ชื่อของคุณเหมาะสม"
       username:
         title: "ชื่อผู้ใช้"
         instructions: "ไม่เหมือนใคร, ไม่มีช่องว่าง, สั้น"
-        short_instructions: "ผู้คนสามารถพูดถึงคุณ @{{username}}"
+        short_instructions: "ผู้คนสามารถกล่าวถึงคุณโดย @%{username}"
         available: "ชื่อผู้ใช้ของคุณสามารถใช้ได้"
-        not_available: "ใช้การไม่ได้ ลอง{{suggestion}}?"
+        not_available: "ใช้งานไม่ได้ กรุณาลอง%{suggestion}"
         too_short: "ชื่อผู้ใช้สั้นไป"
         too_long: "ชื่อผู้ใช้ยาวไป"
         checking: "กำลังตรวจสอบชื่อผู้ใช้"
-        prefilled: "อีเมลที่ตรงกับผู้ใช้ที่ลงทะเบียนนี้"
+        prefilled: "อีเมลตรงกับชื่อผู้ใช้ที่ลงทะเบียนนี้"
       locale:
         title: "ภาษา"
         instructions: "ภาษา จะเปลี่ยนเมื่อคุณรีเฟรชหน้า"
@@ -610,21 +616,21 @@ th:
       auth_tokens:
         ip: "ไอพี"
         details: "รายละเอียด"
-      last_posted: "โพสล่าสุด"
+      last_posted: "โพสต์ล่าสุด"
       last_emailed: "อีเมลล่าสุด"
-      last_seen: "เห็น"
-      created: "สมัครสมาชิกเมื่อ"
+      last_seen: "ดูแล้ว"
+      created: "เข้าร่วมแล้ว"
       log_out: "ออกจากระบบ"
       location: "ที่อยู่"
       website: "เว็บไซต์"
-      email_settings: "อีเมล์"
+      email_settings: "อีเมล"
       text_size:
         normal: "ปกติ"
       like_notification_frequency:
         title: "แจ้งเตือนเมื่อมีคนกดถูกใจ"
         always: "เสมอ"
         first_time_and_daily: "ครั้งแรกที่โพสโดนชอบในวันนี้"
-        first_time: "ครั้งแรกที่โพสต์โดนชอบ"
+        first_time: "ครั้งแรกที่โพสต์โดนกดถูกใจ"
         never: "ไม่เคย"
       email_previous_replies:
         title: "เพิ่มข้อความตอบรับเก่าในอีเมล"
@@ -636,26 +642,28 @@ th:
         every_hour: "ทุกชั่วโมง"
         daily: "ทุกวัน"
         weekly: "ทุกสัปดาห์"
+        every_month: "ทุกเดือน"
+        every_six_months: "ทุกหกเดือน"
       email_level:
-        title: "ส่งอีเมลเมื่อมี การอ้างอิงถึง ตอบโพสท์ พูดถึง @username หรือ ถูกเชิญเข้าไปในกระทู้"
+        title: "ส่งอีเมลเมื่อมีบางคนอ้างอิงถึงฉัน ตอบโพสต์ฉัน กล่าวถึงฉัน @ชื่อผู้ใช้ หรือเชิญฉันเข้าไปในกระทู้"
         always: "เสมอ"
-        never: "ไม่เลย"
-      email_messages_level: "ส่งอีเมลหาฉันเมื่อใครก็ตามส่งข้อความส่วนตัวมาหา"
+        never: "ไม่เคย"
+      email_messages_level: "ส่งอีเมลหาฉันเมื่อมีคนส่งข้อความส่วนตัวมาหาฉัน"
       include_tl0_in_digests: "รวมถึงเนื้อหาจากผู้ใช้ใหม่ในอีเมลสรุป"
       email_in_reply_to: "เพิ่มการตอบในโพสท์ที่คัดกรองแล้วในอีเมล"
       other_settings: "อื่นๆ"
       categories_settings: "หมวดหมู่"
       new_topic_duration:
-        label: "พิจารณากระทู้ใหม่เมื่อ"
+        label: "พิจารณาเป็นกระทู้ใหม่เมื่อ"
         not_viewed: "ฉันยังไม่ได้ดูมันเลย"
-        last_here: "ถูกสร้างตั้งแต่ฉันดูครั้งล่าสุด"
-        after_1_day: "ถูกสร้างเมื่อวาน"
-        after_2_days: "ถูกสร้างเมื่อ 2 วันที่แล้ว"
-        after_1_week: "ถูกสร้างเมื่ออาทิตย์ที่แล้ว"
-        after_2_weeks: "ถูกสร้างเมื่อ 2 อาทิตย์ที่แล้ว"
-      auto_track_topics: "ตรวจกระทู้ที่ฉันเข้าอัตโนมัติ"
+        last_here: "ถูกสร้างขึ้นเมื่อฉันดูครั้งล่าสุด"
+        after_1_day: "ถูกสร้างขึ้นเมื่อวาน"
+        after_2_days: "ถูกสร้างขึ้นเมื่อ 2 วันที่แล้ว"
+        after_1_week: "ถูกสร้างขึ้นเมื่อสัปดาห์ที่แล้ว"
+        after_2_weeks: "ถูกสร้างขึ้นเมื่อ 2 สัปดาห์ที่แล้ว"
+      auto_track_topics: "ติดตามกระทู้ที่ฉันเข้าโดยอัตโนมัติ"
       auto_track_options:
-        never: "ไม่เลย"
+        never: "ไม่เคย"
         immediately: "ทันที"
         after_30_seconds: "หลังจาก 30 วินาที"
         after_1_minute: "หลังจาก 1 นาที"
@@ -667,64 +675,68 @@ th:
       invited:
         search: "พิมพ์เพื่อค้นหาการเชิญ..."
         title: "เชิญชวน"
-        user: "เชิญชวนผู้ใช้"
+        user: "เชิญชวนผู้ใช้แล้ว"
         truncated:
-          other: "กำลังแสดงคำเชิญ {{count}} รายการแรก"
+          other: "กำลังแสดงคำเชิญ %{count} รายการแรก"
         redeemed: "ยืนยันการเชิญชวน"
         redeemed_tab: "ยืนยัน"
-        redeemed_tab_with_count: "ยืนยันแล้ว ({{count}})"
+        redeemed_tab_with_count: "ยืนยันแล้ว (%{count})"
         redeemed_at: "ยืนยัน"
         pending: "รอการเชิญ"
         pending_tab: "กำลังรอ"
-        pending_tab_with_count: "กำลังรออยู่ ({{count}})"
-        topics_entered: "ดูกระทู้แล้ว"
-        posts_read_count: "อ่านโพส"
-        expired: "การเชิญหมดอายุ"
+        pending_tab_with_count: "กำลังรอ (%{count})"
+        topics_entered: "กระทู้ที่ดูแล้ว"
+        posts_read_count: "โพสต์ที่อ่านแล้ว"
+        expired: "การเชิญชวนนี้หมดอายุแล้ว"
         rescind: "ลบ"
-        rescinded: "การชวนถูกนำออก"
+        rescinded: "การเชิญชวนถูกลบออก"
         reinvite: "ส่งการเชิญชวนอีกครั้ง"
         reinvite_all: "ส่งการเชิญชวนทั้งหมดอีกครั้ง"
-        reinvited: "ส่งการเชิญชวนอีกครั้ง"
-        reinvited_all: "ส่งการเชิญชวนทั้งหมดอีกครั้งแล้ว"
+        reinvited: "การเชิญชวนถูกส่งอีกครั้งแล้ว"
+        reinvited_all: "การเชิญชวนทั้งหมดถูกส่งอีกครั้งแล้ว"
         time_read: "เวลาอ่าน"
-        days_visited: "วันที่ดู"
+        days_visited: "วันที่เข้าชม"
         account_age_days: "อายุบัญชีผู้ใช้ในหน่วยวัน"
-        create: "ส่งการเชิญชวน"
-        generate_link: "คัดลอกลิงค์เชิญชวน"
-        link_generated: "สร้างลิงค์เชิญชวนสำเร็จ!"
+        links_tab: "ลิงก์"
+        link_created_at: "สร้างเมื่อ"
+        link_groups: กลุ่ม
+        create: "ส่งคำเชิญ"
+        generate_link: "คัดลอกลิงก์การเชิญชวน"
+        link_generated: "สร้างลิงก์การเชิญชวนสำเร็จแล้ว!"
+        invite_link:
+          success: "สร้างลิงก์การเชิญชวนสำเร็จแล้ว!"
         bulk_invite:
-          text: "เชิญชวนจากไฟล์"
-          success: "ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว คุณจะได้รับการแจ้งเตือนทางข้อความหลังจากที่ทุกอย่างเรียบร้อยแล้ว"
+          success: "ไฟล์ถูกอัปโหลดเรียบร้อยแล้ว คุณจะได้รับการแจ้งเตือนทางข้อความเมื่อขั้นตอนเสร็จสิ้น"
       password:
         title: "รหัสผ่าน"
         too_short: "รหัสผ่านสั้นเกินไป"
         common: "รหัสผ่านง่ายเกินไป"
-        same_as_username: "รหัสเหมือนกับชื่อผู้ใช้ของคุณ"
-        same_as_email: "รหัสผ่านเหมือนกับอีเมล์ของคุณ"
-        ok: "รหัสผ่านของคุณดูดี"
+        same_as_username: "รหัสผ่านเหมือนกับชื่อผู้ใช้ของคุณ"
+        same_as_email: "รหัสผ่านเหมือนกับอีเมลของคุณ"
+        ok: "รหัสผ่านของคุณเหมาะสม"
       summary:
         title: "ภาพรวม"
         stats: "สถิติ"
         time_read: "เวลาอ่าน"
         topic_count:
-          other: "กระทู้สร้าง"
+          other: "กระทู้ถูกสร้าง"
         post_count:
-          other: "โพสถูกสร้าง"
+          other: "โพสต์ถูกสร้าง"
         days_visited:
-          other: "วันที่ดู"
+          other: "วันที่เข้าชม"
         posts_read:
-          other: "โพสที่อ่าน"
+          other: "โพสต์ถูกอ่าน"
         bookmark_count:
-          other: "บุ๊คมาร์ค"
-        top_replies: "ตอบสูงสุด"
-        no_replies: "ยังไม่มีใครตอบ"
-        more_replies: "การตอบอื่น"
+          other: "บุ๊กมาร์ก"
+        top_replies: "คำตอบยอดนิยม"
+        no_replies: "ยังไม่มีคำตอบ"
+        more_replies: "คำตอบอื่น"
         top_topics: "กระทู้ยอดนิยม"
         no_topics: "ยังไม่มีกระทู้"
-        more_topics: "กระทู้อื่นๆ"
-        top_badges: "ตราที่มากที่สุด"
-        no_badges: "ยังไม่มีตรา"
-        more_badges: "ตราอื่นๆ"
+        more_topics: "กระทู้อื่น"
+        top_badges: "เหรียญยอดนิยม"
+        no_badges: "ยังไม่มีเหรียญ"
+        more_badges: "เหรียญอื่น"
         top_links: "ลิงก์ยอดนิยม"
         no_links: "ยังไม่มีลิงก์เลย"
         most_liked_by: "ถูกชอบมากที่สุดโดย"
@@ -765,7 +777,7 @@ th:
       desc:
         network: "โปรดตรวจสอบการเชื่อมต่อของคุณ"
         network_fixed: "ดูเหมือนว่ามันจะกลับมา"
-        server: "รหัสข้อผิดพลาด: {{status}}"
+        server: "รหัสข้อผิดพลาด: %{status}"
         forbidden: "คุณไม่ได้รับอนุญาคิให้ดูมัน"
         not_found: "อ๊ะ, ระบบพยายามโหลดหน้าที่ไม่มีอยู่"
         unknown: "มีบางอย่างผิดปกติไป"
@@ -805,8 +817,8 @@ th:
       hidden_for_session: "โอเค ฉันจะถามคุณอีกทีพรุ่งนี้ คุณสามารถใช้เมนู เข้าสู่ระบบ เพื่อสร้างบัญชีได้เหมือนกันนะ"
     summary:
       enabled_description: "คุณกำลังดูสรุปของกระทู้นี้ : นี่คือโพสที่น่าสนใจที่สุดที่หลายๆคนแนะนำ"
-      description: "ตอบทั้งหมด <b>{{replyCount}}</b> ครั้ง"
-      description_time: "ตอบทั้งหมด <b>{{replyCount}}</b> ครั้งโดยมีเวลาการอ่านประมาณ <b>{{readingTime}} นาที</b>."
+      description: "ตอบทั้งหมด <b>%{replyCount}</b> ครั้ง"
+      description_time: "ตอบทั้งหมด <b>%{replyCount}</b> ครั้งโดยมีเวลาการอ่านประมาณ <b>%{readingTime} นาที</b>."
       enable: "สรุปกระทู้นี้"
       disable: "แสดงโพสต์ทั้งหมด"
     deleted_filter:
@@ -816,8 +828,8 @@ th:
       disable: "แสดงโพสต์ที่ถูกลบ"
     private_message_info:
       title: "ข้อความ"
-      remove_allowed_user: "คุณต้องการจะลบ {{name}} จากข้อความนี้ใช้หรือไม่"
-      remove_allowed_group: "คุณต้องการจะลบ {{name}} จากข้อความนี้ใช้หรือไม่"
+      remove_allowed_user: "คุณต้องการจะลบ %{name} จากข้อความนี้ใช้หรือไม่"
+      remove_allowed_group: "คุณต้องการจะลบ %{name} จากข้อความนี้ใช้หรือไม่"
     email: "อีเมล"
     username: "ชื่อผู้ใช้"
     last_seen: "เห็น"
@@ -857,11 +869,11 @@ th:
       awaiting_activation: "บัญชีของคุณกำลังรอการเปิดใช้งาน ใช้ลิงค์ลืมรหัสผ่านถ้าค้องการส่งอีเมลยืนยันตัวตนอีกครั้ง"
       awaiting_approval: "บัญชีของคุณยังไม่ได้รับการยืนยันโดยทีมงาน คุณจะได้รับอีเมลแจ้งเมื่อคุณได้รับการยืนยันแล้ว"
       requires_invite: "ขออภัย, สามารถเข้าถึงได้เฉพาะผู้ที่ได้รับเชิญเท่านั้น"
-      not_activated: "คุณไม่สามารถเข้าสู่ระบบได้ เราได้ส่งอีเมลยืนยันตัวตนไปหาคุณที่ <b>{{sentTo}}</b> กรุณาทำตามขั้นตอนในอีเมลเพื่อยืนยันตัวตนของคุณ"
+      not_activated: "คุณไม่สามารถเข้าสู่ระบบได้ เราได้ส่งอีเมลยืนยันตัวตนไปหาคุณที่ <b>%{sentTo}</b> กรุณาทำตามขั้นตอนในอีเมลเพื่อยืนยันตัวตนของคุณ"
       not_allowed_from_ip_address: "คุณไม่สามารถเข้าสู่ระบบด้วยไอพีนี้ได้"
       admin_not_allowed_from_ip_address: "คุณไม่สามารถเข้าสู่ระบบด้วยผู้ดูแลระบบด้วยไอพีนี้"
       resend_activation_email: "คลิกเพื่อส่งอีเมลยืนยันตัวตนอีกครั้ง"
-      sent_activation_email_again: "เราส่งอีเมลยืนยันตัวตนใหม่ไปให้คุณที่ <b>{{currentEmail}}</b> กรุณารอสักครู่และตรวจสอบในถังขยะอีเมลของคุณ"
+      sent_activation_email_again: "เราส่งอีเมลยืนยันตัวตนใหม่ไปให้คุณที่ <b>%{currentEmail}</b> กรุณารอสักครู่และตรวจสอบในถังขยะอีเมลของคุณ"
       to_continue: "โปรดเข้าสู่ระบบ"
       preferences: "คุณจำเป็นต้องเข้าสู่ระบบจึงจะสามารถเปลี่ยนการตั้งค่าส่วนตัวของคุณได้"
       forgot: "ฉันจำรายละเอียดบัญชีของตัวเองไม่ได้"
@@ -909,9 +921,9 @@ th:
       drafts_offline: "ร่างออฟไลน์"
       error:
         title_missing: "ต้องมีชื่อเรื่อง"
-        title_too_short: "ชื่อเรื่องต้องมีอย่างน้อย {{min}} ตัวอักษร"
-        title_too_long: "ชื่อเรื่องต้องไม่ยาวเกิน {{max}} ตัวอักษร"
-        post_length: "โพสต้องมีอย่างน้อย {{min}} ตัวอักษร"
+        title_too_short: "ชื่อเรื่องต้องมีอย่างน้อย %{min} ตัวอักษร"
+        title_too_long: "ชื่อเรื่องต้องไม่ยาวเกิน %{max} ตัวอักษร"
+        post_length: "โพสต้องมีอย่างน้อย %{min} ตัวอักษร"
         category_missing: "คุณต้องเลือกหมวดหมู่"
       save_edit: "บันทึกการแก้ไข"
       reply_original: "ตอบบนกระทู้ต้นฉบับ"
@@ -963,12 +975,12 @@ th:
       title: "การแจ้งเตือนการพูดถึง,การตอบกลับไปยังโพส กระทู้ หรือข้อความส่วนตัว และอื่นๆของ @name "
       none: "ไม่สามารถโหลดการแจ้งเตือนในขณะนี้"
       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}}'
-        linked: '{{username}} ลิงค์โพสของคุณจาก "{{topic}}" - {{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}'
+        linked: '%{username} ลิงค์โพสของคุณจาก "%{topic}" - %{site_title}'
       titles:
         watching_first_post: "สร้างกระทู้"
     upload_selector:
@@ -977,9 +989,9 @@ th:
       from_my_computer: "จากอุปกรณ์"
       from_the_web: "จากเว็บ"
       remote_tip: "ลิงค์ไปยังรูปภาพ"
-      remote_tip_with_attachments: "ลิงค์ไปยังรูปหรือไฟล์ {{authorized_extensions}}"
+      remote_tip_with_attachments: "ลิงค์ไปยังรูปหรือไฟล์ %{authorized_extensions}"
       local_tip: "เลือกภาพจากอุปกรณ์ของคุณ"
-      local_tip_with_attachments: "เลือกภาพหรือไฟล์จากอุปกรณ์ของคุณ {{authorized_extensions}}"
+      local_tip_with_attachments: "เลือกภาพหรือไฟล์จากอุปกรณ์ของคุณ %{authorized_extensions}"
       hint: "(คุณสามารถใช้เมาส์ลากไปวางในตัวแก้ไขข้อความเพื่ออัพโหลดได้ด้วย)"
       hint_for_supported_browsers: "คุณยังสามารถลากหรือวางไฟล์ในช่องแก้ไขโดยตรงได้ด้วย"
       uploading: "กำลังอัปโหลด"
@@ -996,11 +1008,11 @@ th:
       no_results: "ไม่มีผลการค้นหา"
       no_more_results: "ไม่พบการค้นหาเพิ่มเติมแล้ว"
       searching: "กำลังค้นหา..."
-      post_format: "#{{post_number}} ด้วย {{username}}"
+      post_format: "#%{post_number} ด้วย %{username}"
       search_google_button: "กูเกิ้ล"
       context:
-        user: "ค้นหาโพสต์ด้วย @{{username}}"
-        category: "ค้นหาหมวด #{{category}}"
+        user: "ค้นหาโพสต์ด้วย @%{username}"
+        category: "ค้นหาหมวด #%{category}"
         topic: "ค้นหากระทู้นี้"
         private_messages: "ค้นหาข้อความ"
       advanced:
@@ -1031,7 +1043,7 @@ th:
         notification_level: "การแจ้งเตือน"
         choose_new_category: "เลือกหมวดใหม่ให้กระทู้"
         selected:
-          other: "คุณได้เลือก <b>{{count}}</b> กระทู้"
+          other: "คุณได้เลือก <b>%{count}</b> กระทู้"
       none:
         unread: "คุณไม่มีกระทู้ที่ยังไม่ได้อ่าน"
         new: "คุณไม่มีกระทู้ใหม่"
@@ -1039,7 +1051,7 @@ th:
         posted: "คุณยังไม่ได้โพสในกระทู้ใดๆ"
         latest: "ไม่มีกระทู้ล่าสุด น่าเสียใจจริงๆ"
         bookmarks: "คุณยังไม่ได้บุ๊คมาร์คกระทู้ใดๆเลย"
-        category: "ยังไม่ในกระทู้ในหมวด {{category}}"
+        category: "ยังไม่ในกระทู้ในหมวด %{category}"
         top: "ไม่มีหัวข้อสูงสุดแล้ว"
       bottom:
         latest: "ไม่มีกระทู้ล่าสุด"
@@ -1051,7 +1063,7 @@ th:
         bookmarks: "ไม่มีบุ๊คมาร์คในหัวข้อใดอีกแล้ว"
     topic:
       filter_to:
-        other: " {{count}} โพสในกระทู้"
+        other: " %{count} โพสในกระทู้"
       create: "กระทู้ใหม่"
       create_long: "สร้างกระทู้ใหม่"
       private_message: "สร้างข้อความใหม่"
@@ -1067,9 +1079,9 @@ th:
       new: "สร้างกระทู้"
       unread: "ยังไม่ได้อ่าน"
       new_topics:
-        other: "{{count}} กระทู้ใหม่"
+        other: "%{count} กระทู้ใหม่"
       unread_topics:
-        other: "{{count}} กระทู้ที่ยังไม่ได้อ่าน"
+        other: "%{count} กระทู้ที่ยังไม่ได้อ่าน"
       title: "กระทู้"
       invalid_access:
         title: "กระทู้นี้เป็นกระทู้ส่วนตัว"
@@ -1080,16 +1092,18 @@ th:
       not_found:
         title: "ไม่พบกระทู้"
       total_unread_posts:
-        other: "คุณมี {{count}} ความคิดเห็น ที่ยังไม่ได้อ่านในกระทู้นี้"
+        other: "คุณมี %{count} ความคิดเห็น ที่ยังไม่ได้อ่านในกระทู้นี้"
       unread_posts:
-        other: "คุณมี {{count}} ความคิดเห็นเก่า ที่ยังไม่ได้อ่านในกระทู้นี้"
+        other: "คุณมี %{count} ความคิดเห็นเก่า ที่ยังไม่ได้อ่านในกระทู้นี้"
       back_to_list: "กลับไปที่รายชื่อกระทู้"
       show_links: "แสดงลิงค์ในกระทู้นี้"
-      read_more_in_category: "ต้องการจะอ่านเพิ่มเหรอ? ลองดูกระทู้อื่นใน {{catLink}} หรือ {{latestLink}}"
-      read_more: "ต้องการจะอ่านเพิ่ม? {{catLink}} หรือ {{latestLink}}."
+      read_more_in_category: "ต้องการจะอ่านเพิ่มเหรอ? ลองดูกระทู้อื่นใน %{catLink} หรือ %{latestLink}"
+      read_more: "ต้องการจะอ่านเพิ่ม? %{catLink} หรือ %{latestLink}."
       view_latest_topics: ดูกระทู้ล่าสุด
       suggest_create_topic: ทำไมไม่สร้างกระทู้ละ
       deleted: "หัวข้อถูกลบ"
+      auto_update_input:
+        tomorrow: "พรุ่งนี้"
       auto_close:
         error: "กรอกค่าที่ถูกต้อง"
         based_on_last_post: "ไม่ปิดจนกว่าโพสสุดท้ายในกระทู้นี่เก่า"
@@ -1162,8 +1176,8 @@ th:
         success_message: "คุณปักธงกระทู้นี้แล้ว"
       feature_topic:
         title: "แนะนำกระทู้นี้"
-        confirm_pin: "ตอนนี้คุณมีกระทู้ที่ปักหมุดทั้งหมด {{count}} กระทู้ การมีกระทู้ที่ปักหมุดมากๆจะทำให้ผู้ใช้ใหม่และผู้ใช้ที่ไม่ระบุชื่อรำคาญ คุณแน่ใจจริงๆหรือว่าจะปักหมุกกระทู้เพิ่มอีก?"
-        confirm_pin_globally: "ตอนนี้คุณมีหัวข้อที่ปักหมุดแบบรวม {{count}} หัวข้อ การมีหัวข้อที่ปักหมุดมากๆจะทำให้ผู้ใช้ใหม่และผู้ใช้ที่ไม่ระบุชื่อรำคาญ คุณแน่ใจจริงๆหรือว่าจะปักหมุกหัวข้อเพิ่มอีก?"
+        confirm_pin: "ตอนนี้คุณมีกระทู้ที่ปักหมุดทั้งหมด %{count} กระทู้ การมีกระทู้ที่ปักหมุดมากๆจะทำให้ผู้ใช้ใหม่และผู้ใช้ที่ไม่ระบุชื่อรำคาญ คุณแน่ใจจริงๆหรือว่าจะปักหมุกกระทู้เพิ่มอีก?"
+        confirm_pin_globally: "ตอนนี้คุณมีหัวข้อที่ปักหมุดแบบรวม %{count} หัวข้อ การมีหัวข้อที่ปักหมุดมากๆจะทำให้ผู้ใช้ใหม่และผู้ใช้ที่ไม่ระบุชื่อรำคาญ คุณแน่ใจจริงๆหรือว่าจะปักหมุกหัวข้อเพิ่มอีก?"
       inviting: "กำลังเชิญ..."
       invite_private:
         title: "ข้อความที่ใช้เชิญ"
@@ -1182,7 +1196,7 @@ th:
       login_reply: "เข้าสู่ระบบเพื่อตอบ"
       filters:
         n_posts:
-          other: "{{count}} โพส"
+          other: "%{count} โพส"
         cancel: "เอาการกรองออก"
       split_topic:
         title: "ย้ายไปหัวข้อใหม่"
@@ -1201,7 +1215,7 @@ th:
         action: "เปลี่ยนแปลงเวลา"
       multi_select:
         select: "เลือก"
-        selected: "เลือกแล้ว ({{count}})"
+        selected: "เลือกแล้ว (%{count})"
         select_post:
           label: "เลือก"
         select_replies:
@@ -1211,10 +1225,10 @@ th:
         select_all: เลือกทั้งหมด
         deselect_all: ไม่เลือกทั้งหมด
         description:
-          other: "คุณได้เลือก <b>{{count}}</b> โพสต์."
+          other: "คุณได้เลือก <b>%{count}</b> โพสต์."
     post:
       edit_reason: "เหตุผล:"
-      post_number: "โพสต์ {{number}}"
+      post_number: "โพสต์ %{number}"
       last_edited_on: "โพสแก้ไขล่าสุดเมื่อ"
       reply_as_new_topic: "ตอบด้วยหัวข้อที่ลิงค์ไว้"
       follow_quote: "ไปยังโพสที่ถูกอ้างถึง"
@@ -1224,9 +1238,9 @@ th:
       expand_collapse: "ขยาย/หด"
       unread: "โพสนี้ยังไม่ถูกอ่าน"
       has_replies:
-        other: "{{count}} ตอบ"
+        other: "%{count} ตอบ"
       has_likes_title:
-        other: "{{count}} ผู้คนที่ชอบโพสนี้"
+        other: "%{count} ผู้คนที่ชอบโพสนี้"
       has_likes_title_only_you: "คุณชอบโพสนี้"
       errors:
         create: "ขอโทษ, เกิดความผิดพลาดขณะกำลังสร้างโพสของคุณ โปรดลองใหม่อีกครั้ง"
@@ -1337,7 +1351,7 @@ th:
       other: "ผู้ใช้"
     category_title: "หมวดหมู่"
     history: "ประวัติ"
-    changed_by: "โดย {{author}}"
+    changed_by: "โดย %{author}"
     raw_email:
       not_available: "ไม่พร้อม!"
     categories_list: "รายการหมวดหมู่"
@@ -1347,28 +1361,28 @@ th:
       latest:
         title: "ล่าสุด"
         title_with_count:
-          other: "ล่าสุด ({{count}})"
+          other: "ล่าสุด (%{count})"
         help: "หัวข้อพร้อมโพสล่าสุด"
       read:
         title: "อ่าน"
       categories:
         title: "หมวดหมู่"
-        title_in: "หมวดหมู่ - {{categoryName}}"
+        title_in: "หมวดหมู่ - %{categoryName}"
         help: "ทุกหัวข้อจัดกลุ่มโดยหมวดหมู่"
       unread:
         title: "ยังไม่อ่าน"
         title_with_count:
-          other: "ยังไม่ได้อ่าน ({{count}})"
+          other: "ยังไม่ได้อ่าน (%{count})"
         help: "หัวข้อที่คุณกำลังจับตาหรือติดตามพร้อมโพสที่ยังไม่อ่าน"
         lower_title_with_count:
-          other: "{{count}} ไม่ได้อ่าน"
+          other: "%{count} ไม่ได้อ่าน"
       new:
         lower_title_with_count:
-          other: "{{count}} ใหม่"
+          other: "%{count} ใหม่"
         lower_title: "ใหม่"
         title: "ใหม่"
         title_with_count:
-          other: "ใหม่ ({{count}})"
+          other: "ใหม่ (%{count})"
         help: "หัวข้อที่ถูกสร้างในช่วงไม่กี่วัน"
       posted:
         title: "โพสของฉัน"
@@ -1377,10 +1391,10 @@ th:
         title: "บุ๊คมาร์ค"
         help: "หัวข้อของคุณได้รับการบุ๊คมาร์ค"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          other: "{{categoryName}} ({{count}})"
-        help: "หัวข้อล่าสุดในหมวดหมู่ {{categoryName}}"
+          other: "%{categoryName} (%{count})"
+        help: "หัวข้อล่าสุดในหมวดหมู่ %{categoryName}"
       top:
         title: "บน"
         help: "หัวข้อที่มีการเลือกไหวมากที่สุดในปี เดือน อาทิตย์ หรือวันที่ผ่านมา"
@@ -1774,8 +1788,8 @@ th:
           title: "แสดงอีเมลผู้ใช้งาน"
           text: "แสดง"
       user:
-        suspend_failed: "มีข้อผิดพลาดในการระงับการใช้งาน {{error}}"
-        unsuspend_failed: "มีข้อผิดพลาดในเปิดการใช้งาน {{error}}"
+        suspend_failed: "มีข้อผิดพลาดในการระงับการใช้งาน %{error}"
+        unsuspend_failed: "มีข้อผิดพลาดในเปิดการใช้งาน %{error}"
         suspend_duration: "ระงับการใช้งานถึงเมื่อไร"
         suspend_reason: "เหตุผล"
         suspended_by: "ระงับการใช้งานโดย"
@@ -1947,6 +1961,7 @@ th:
       emoji:
         title: "Emoji"
         add: "เพิ่ม Emoji ใหม่"
+        uploading: "กำลังอัปโหลด..."
         name: "ชื่อ"
         group: "กลุ่ม"
         image: "ภาพ"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index dea6f70c0b..4b53d9f084 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -23,8 +23,8 @@ tr_TR:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}b"
-        millions: "{{number}}M"
+        thousands: "%{number}b"
+        millions: "%{number}M"
     dates:
       time: "h:mm a"
       time_short_day: "ggg, SS:dd"
@@ -224,11 +224,11 @@ tr_TR:
     weekly: "haftalık"
     every_month: "her ay"
     every_six_months: "her altı ayda bir"
-    max_of_count: "maksimum {{count}}"
+    max_of_count: "maksimum %{count}"
     alternation: "ya da"
     character_count:
-      one: "{{count}} karakter"
-      other: "{{count}} karakter"
+      one: "%{count} karakter"
+      other: "%{count} karakter"
     related_messages:
       title: "İlgili Mesajlar"
       see_all: '@%{username} kullanıcısından gelen <a href="%{path}">bütün mesajları</a> gör...'
@@ -284,14 +284,14 @@ tr_TR:
         yes_value: "Evet, vazgeç"
         no_value: "Hayır, kalsın"
     topic_count_latest:
-      one: "{{count}} yeni ya da güncellenmiş konu."
-      other: "{{count}} yeni ya da güncellenmiş konu."
+      one: "%{count} yeni ya da güncellenmiş konu."
+      other: "%{count} yeni ya da güncellenmiş konu."
     topic_count_unread:
-      one: "{{count}} Okunmamış konuyu görün"
-      other: "{{count}} Okunmamış konuları görün"
+      one: "%{count} Okunmamış konuyu görün"
+      other: "%{count} Okunmamış konuları görün"
     topic_count_new:
-      one: "{{count}} Yeni Konu Gör"
-      other: "{{count}} Yeni konular gör"
+      one: "%{count} Yeni Konu Gör"
+      other: "%{count} Yeni konular gör"
     preview: "önizleme"
     cancel: "iptal"
     save: "Değişiklikleri Kaydet"
@@ -299,7 +299,7 @@ tr_TR:
     saved: "Kaydedildi!"
     upload: "Yükle"
     uploading: "Yükleniyor..."
-    uploading_filename: "Yükleme: {{filename}}..."
+    uploading_filename: "Yükleme: %{filename}..."
     clipboard: "pano"
     uploaded: "Yüklendi!"
     pasting: "Yapıştırılıyor..."
@@ -353,7 +353,7 @@ tr_TR:
         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."
         claimed_by_you: "Bu öğeyi talep ettiniz ve inceleyebilirsiniz."
-        claimed_by_other: "Bu öge yalnızca <b>{{username}}</b> kullanıcısı tarafından incelenebilir."
+        claimed_by_other: "Bu öge yalnızca <b>%{username}</b> kullanıcısı tarafından incelenebilir."
       claim:
         title: "konu talebinde bulun"
       unclaim:
@@ -373,7 +373,7 @@ tr_TR:
       view_pending: "bekleyen görünüm"
       topic_has_pending:
         one: "Bu konuda <b>%{count}</b> adet onay bekleyen gönderi var"
-        other: "Bu konuda <b>{{count}}</b> adet onay bekleyen gönderi var"
+        other: "Bu konuda <b>%{count}</b> adet onay bekleyen gönderi var"
       title: "Gözden geçirmeler"
       topic: "Konu:"
       filtered_topic: "Tek konu içerisinde görüntülenebilir içerikleri filtrelediniz."
@@ -390,17 +390,17 @@ tr_TR:
         fields: "Alanlar"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} toplam bildiri)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} toplam bildiri)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (%{count} toplam bildiri)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} toplam bildiri)"
         agreed:
-          one: "%{{count}} uygunluk"
-          other: "%{{count}} uygunluk"
+          one: "%%{count} uygunluk"
+          other: "%%{count} uygunluk"
         disagreed:
-          one: "%{{count}} uygunsuz"
-          other: "%{{count}} uygunsuz"
+          one: "%%{count} uygunsuz"
+          other: "%%{count} uygunsuz"
         ignored:
-          one: "% {{count}} görmezden gelme"
-          other: "%{{count}} görmezden gelme"
+          one: "% %{count} görmezden gelme"
+          other: "%%{count} görmezden gelme"
       topics:
         topic: "Konu"
         reviewable_count: "say"
@@ -410,10 +410,10 @@ tr_TR:
         details: "ayrıntılar"
         unique_users:
           one: "%{count}kullanıcı"
-          other: "{{count}}kullanıcı"
+          other: "%{count}kullanıcı"
       replies:
         one: "%{count}yanıt"
-        other: "{{count}}yanıt"
+        other: "%{count}yanıt"
       edit: "Düzenle"
       save: "Kaydet"
       cancel: "İptal"
@@ -476,22 +476,22 @@ tr_TR:
         description: "Yeni gönderini aldık fakat gösterilmeden önce moderatör tarafından onaylanması gerekiyor. Hoşgörün için teşekkür ederiz. "
         pending_posts:
           one: "Bekleyen <strong>%{count}</strong> gönderiniz var."
-          other: "Bekleyen <strong>{{count}}</strong> gönderiniz var."
+          other: "Bekleyen <strong>%{count}</strong> gönderiniz var."
         ok: "Tamam"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> <a href='{{topicUrl}}'>konuyu</a> açtı"
-      you_posted_topic: "<a href='{{topicUrl}}'>konuyu</a> <a href='{{userUrl}}'>sen</a> açtın"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> <a href='{{postUrl}}'>{{post_number}}</a> gönderiyi cevapladı"
-      you_replied_to_post: "<a href='{{postUrl}}'>{{post_number}}</a> gönderiyi <a href='{{userUrl}}'>sen</a> cevapladın"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> <a href='{{topicUrl}}'>konuya</a> cevap verdi"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Sen</a> <a href='{{topicUrl}}'>konuya</a> cevap verdin"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> <a href='{{user2Url}}'>{{another_user}}</a> adlı kullanıcıdan bahsetti"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> <a href='{{user2Url}}'>sizden</a> bahsetti"
-      you_mentioned_user: "<a href='{{user1Url}}'>Sen</a>, <a href='{{user2Url}}'>{{another_user}}</a> adlı kullanıcıdan bahsettin"
-      posted_by_user: "<a href='{{userUrl}}'>{{user}}</a> tarafından gönderildi"
-      posted_by_you: "<a href='{{userUrl}}'>Senin </a> tarafından gönderildi"
-      sent_by_user: "<a href='{{userUrl}}'>{{user}}</a> tarafından gönderildi"
-      sent_by_you: "<a href='{{userUrl}}'>Senin</a> tarafından gönderildi"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> <a href='%{topicUrl}'>konuyu</a> açtı"
+      you_posted_topic: "<a href='%{topicUrl}'>konuyu</a> <a href='%{userUrl}'>sen</a> açtın"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> <a href='%{postUrl}'>%{post_number}</a> gönderiyi cevapladı"
+      you_replied_to_post: "<a href='%{postUrl}'>%{post_number}</a> gönderiyi <a href='%{userUrl}'>sen</a> cevapladın"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> <a href='%{topicUrl}'>konuya</a> cevap verdi"
+      you_replied_to_topic: "<a href='%{userUrl}'>Sen</a> <a href='%{topicUrl}'>konuya</a> cevap verdin"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> <a href='%{user2Url}'>%{another_user}</a> adlı kullanıcıdan bahsetti"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> <a href='%{user2Url}'>sizden</a> bahsetti"
+      you_mentioned_user: "<a href='%{user1Url}'>Sen</a>, <a href='%{user2Url}'>%{another_user}</a> adlı kullanıcıdan bahsettin"
+      posted_by_user: "<a href='%{userUrl}'>%{user}</a> tarafından gönderildi"
+      posted_by_you: "<a href='%{userUrl}'>Senin </a> tarafından gönderildi"
+      sent_by_user: "<a href='%{userUrl}'>%{user}</a> tarafından gönderildi"
+      sent_by_you: "<a href='%{userUrl}'>Senin</a> tarafından gönderildi"
     directory:
       filter_name: "kullanıcı adına göre filtrele"
       title: "Kullanıcılar"
@@ -723,7 +723,7 @@ tr_TR:
     user_fields:
       none: "(bir seçenek tercih et)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Profil"
       mute: "Sessiz"
       edit: "Tercihleri Düzenle"
@@ -797,12 +797,12 @@ tr_TR:
       enable_defer: "Okunmamış konuları işaretlemek için ertelemeyi aktif edin"
       change: "değiştir"
       featured_topic: "Öne Çıkan Konu"
-      moderator: "{{user}} moderatördür"
-      admin: "{{user}} yöneticidir"
+      moderator: "%{user} moderatördür"
+      admin: "%{user} yöneticidir"
       moderator_tooltip: "Bu kullanıcı moderatördür"
       admin_tooltip: "Bu kullanıcı yöneticidir."
       silenced_tooltip: "Bu kullanıcı sessize alındı. "
-      suspended_notice: "Bu kullanıcı {{date}} tarihine kadar beklemeye alındı. "
+      suspended_notice: "Bu kullanıcı %{date} tarihine kadar beklemeye alındı. "
       suspended_permanently: "Bu kullanıcı beklemeye alındı."
       suspended_reason: "Sebep:"
       github_profile: "Github"
@@ -813,7 +813,7 @@ tr_TR:
         instructions: "Bu ayar aktivite özetini geçersiz kılar.<br />\nSessize alınmış konular ve kategoriler bu e-postalarda yer almaz. \n"
         individual: "Her yeni gönderi için bir e-posta gönder"
         individual_no_echo: "Kendi gönderilerim haricindeki her gönderi için e-posta gönder"
-        many_per_day: "Her yeni gönderi için bir e-posta gönder (günde yaklaşık {{dailyEmailEstimate}})."
+        many_per_day: "Her yeni gönderi için bir e-posta gönder (günde yaklaşık %{dailyEmailEstimate})."
         few_per_day: "Her yeni gönderi için bana e-posta gönder ( günlük yaklaşık 2 )"
         warning: "Gönderi listesi modu etkin. E-posta bildirim ayarları geçersiz kılınmış."
       tag_settings: "Etiketler"
@@ -843,9 +843,7 @@ tr_TR:
       admin_delete: "Sil"
       users: "Kullanıcılar"
       muted_users: "Sessiz"
-      muted_users_instructions: "Bu kullanıcılardan gelen tüm bildirileri kapa."
       ignored_users: "Yoksayıldı"
-      ignored_users_instructions: "Bu kullanıcıdan gelen tüm gönderileri ve bildirimleri engelleyin."
       tracked_topics_link: "Göster"
       automatically_unpin_topics: "Sayfa sonuna geldiğimde en yukarıda sabitlenmiş tüm konuları kaldır. "
       apps: "Uygulamalar"
@@ -898,11 +896,11 @@ tr_TR:
         disable: "Devre dışı bırak"
         enable: "Etkinleştir"
         enable_long: "Yedek kodları etkinleştir"
-        manage: "Yedek kodları yönet.  <strong>{{count}}</strong> yedek kod kaldı."
+        manage: "Yedek kodları yönet.  <strong>%{count}</strong> yedek kod kaldı."
         copy_to_clipboard: "Kopyala"
         copy_to_clipboard_error: "Panoya kopyalanırken hata oluştu"
         copied_to_clipboard: "Panoya kopyalandı"
-        remaining_codes: "<strong>{{count}}</strong> yedek kodun kaldı "
+        remaining_codes: "<strong>%{count}</strong> yedek kodun kaldı "
         use: "Bir yedekleme kodu kullanın"
         enable_prerequisites: "Yedek kodları oluşturmadan önce birincil ikinci faktörü etkinleştirmelisiniz."
         codes:
@@ -984,11 +982,11 @@ tr_TR:
         instructions: "Hiç kimseye gösterilmedi."
         ok: "Onaylaman için sana e-posta göndereceğiz"
         invalid: "Lütfen geçerli bir e-posta adresi gir"
-        authenticated: "E-posta adresin {{provider}} tarafından doğrulandı"
+        authenticated: "E-posta adresin %{provider} tarafından doğrulandı"
         frequency_immediately: "Eğer göndermek üzere olduğumuz e-postayı okuyamadıysan sana direkt e-posta göndereceğiz. "
         frequency:
-          one: "Sadece son {{count}} dakika içinde sizi görmediysek e-posta yollayacağız."
-          other: "Eğer seni sadece son {{count}} dakika içinde görmediysek sana bir e-posta göndereceğiz. "
+          one: "Sadece son %{count} dakika içinde sizi görmediysek e-posta yollayacağız."
+          other: "Eğer seni sadece son %{count} dakika içinde görmediysek sana bir e-posta göndereceğiz. "
       associated_accounts:
         title: "İlişkili Hesaplar"
         connect: "Bağlan"
@@ -1008,9 +1006,9 @@ tr_TR:
       username:
         title: "Kullanıcı adı"
         instructions: "Benzersiz, boşluksuz, kısa"
-        short_instructions: "Kullanıcılar senden @{{username}} olarak bahsedebilirler"
+        short_instructions: "Kullanıcılar senden @%{username} olarak bahsedebilirler"
         available: "Kullanıcı adı müsait"
-        not_available: "Uygun değil. Şunu denemeni öneririz: {{suggestion}} "
+        not_available: "Uygun değil. Şunu denemeni öneririz: %{suggestion} "
         not_available_no_suggestion: "Kullanılabilir değil"
         too_short: "Kullanıcı adın çok kısa"
         too_long: "Kullanıcı adın çok uzun"
@@ -1030,11 +1028,11 @@ tr_TR:
         log_out_all: "Hepisini Çıkış Yap"
         active: "şimdi aktif"
         not_you: "Sen değil?"
-        show_all: "Tümünü göster ({{count}})"
+        show_all: "Tümünü göster (%{count})"
         show_few: "Daha az göster"
         was_this_you: "Bu sen miydin?"
         was_this_you_description: "Siz değilseniz, şifrenizi değiştirmenizi ve her yerden oturumu kapatmanızı öneririz."
-        browser_and_device: "{{browser}} şunda {{device}}"
+        browser_and_device: "%{browser} şunda %{device}"
         secure_account: "Hesabımı güven altına al"
         latest_post: "En son gönderdiğiniz ..."
       last_posted: "Son Gönderi"
@@ -1113,21 +1111,20 @@ tr_TR:
         sent: "Son Gönderilen"
         none: "Görüntülenebilecek bir davet mevcut değil."
         truncated:
-          one: "İlk {{count}} davet gösteriliyor."
-          other: "İlk {{count}} davet gösteriliyor."
+          one: "İlk %{count} davet gösteriliyor."
+          other: "İlk %{count} davet gösteriliyor."
         redeemed: "Kabul Edilen Davetler"
         redeemed_tab: "Kabul Edildi"
-        redeemed_tab_with_count: "Kabul edildi ({{count}})"
+        redeemed_tab_with_count: "Kabul edildi (%{count})"
         redeemed_at: "Kabul Edildi"
         pending: "Bekleyen Davetler"
         pending_tab: "Bekleyen"
-        pending_tab_with_count: "Beklemede ({{count}})"
+        pending_tab_with_count: "Beklemede (%{count})"
         topics_entered: "Görüntülenen Konular"
         posts_read_count: "Okunmuş Gönderi"
         expired: "Bu davetin süresi doldu."
         rescind: "Kaldır"
         rescinded: "Davet kaldırıldı"
-        rescind_all: "Süresi Dolan Davetleri Kaldır"
         rescinded_all: "Tüm Süresi Dolmuş Davetiyeler kaldırıldı!"
         rescind_all_confirm: "Süresi dolmuş tüm davetiyeleri kaldırmak istediğinizden emin misiniz?"
         reinvite: "Daveti Tekrar Gönder"
@@ -1138,13 +1135,18 @@ tr_TR:
         time_read: "Okunma Zamanı"
         days_visited: "Ziyaret Edilen Gün"
         account_age_days: "Günlük hesap yaşı"
+        links_tab: "Bağlantılar"
+        link_created_at: "Oluşturuldu"
+        link_groups: Gruplar
         create: "Davet Gönder"
         generate_link: "Davet Bağlantısını Kopyala"
         link_generated: "Davet bağlantısı başarılı bir şekilde oluşturuldu! "
         valid_for: "Davet bağlantısı sadece bu adres için geçerli: %{email}"
+        single_user: "Tekil kullanıcı"
+        invite_link:
+          success: "Davet bağlantısı başarılı bir şekilde oluşturuldu! "
         bulk_invite:
           none: "Henüz hiç kimseyi davet etmedin. Kişsel davet gönderebilir ya da <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>CSV dosyası yüklerek</a> birden fazla kişiyi davet edebilirsin. "
-          text: "Dosyadan Toplu Davet Gönder"
           success: "Dosya başarıyla yüklendi. İşlem tamamlandığında mesaj yoluyla bilgilendirileceksin."
           error: "Üzgünüz, dosya CSV formatında olmalı. "
           confirmation_message: "Yüklenen dosyadaki herkese davetleri e-posta ile göndermek üzeresiniz."
@@ -1235,7 +1237,7 @@ tr_TR:
       desc:
         network: "Lütfen bağlantını kontrol et"
         network_fixed: "Geri döndü gibi gözüküyor."
-        server: "Hata kodu : {{status}}"
+        server: "Hata kodu : %{status}"
         forbidden: "Bunu görüntüleme iznin yok "
         not_found: "Hoop, uygulama var olmayan bir URL'yi yüklemeye çalıştı."
         unknown: "Bir şeyler ters gitti."
@@ -1290,8 +1292,8 @@ tr_TR:
       value_prop: "Bir hesap oluşturduğunuzda, ne okuduğunuzu kaydediyoruz, böylece her zaman kaldığınız yerden okumaya devam edebiliyorsunuz. Ayrıca, burada ve e-posta yoluyla, biri size yanıt verdiğinde bildirim alıyorsunuz ve sediğinizi paylaşmak için gönderileri beğenebiliyorsunuz. :Heartpulse:"
     summary:
       enabled_description: "Bu konunun özetini görüntülüyorsun: Okuyucularımızın en çok ilgisini çeken gönderiler"
-      description: "<b>{{replyCount}}</b> adet cevap var."
-      description_time: "Tahmini okuma süresi <b>{{readingTime}} dakika</b> olan <b>{{replyCount}}</b> cevap var."
+      description: "<b>%{replyCount}</b> adet cevap var."
+      description_time: "Tahmini okuma süresi <b>%{readingTime} dakika</b> olan <b>%{replyCount}</b> cevap var."
       enable: "Bu Konuyu Özetle"
       disable: "Tüm Gönderileri Göster"
     deleted_filter:
@@ -1304,8 +1306,8 @@ tr_TR:
       invite: "Başkalarını Davet Et..."
       edit: "Ekle ya da Kaldır ..."
       leave_message: "Gerçekten bu mesajdan çıkmak mı istiyorsun?"
-      remove_allowed_user: "Bu mesajdan {{name}} isimli kullanıcıyı çıkarmak istediğine emin misin?"
-      remove_allowed_group: "Gerçekten {{name}} isimli kullanıcıyı bu mesajdan kaldırmak istiyor musun?"
+      remove_allowed_user: "Bu mesajdan %{name} isimli kullanıcıyı çıkarmak istediğine emin misin?"
+      remove_allowed_group: "Gerçekten %{name} isimli kullanıcıyı bu mesajdan kaldırmak istiyor musun?"
     email: "E-posta"
     username: "Kullanıcı Adı"
     last_seen: "Görülen"
@@ -1314,7 +1316,7 @@ tr_TR:
     trust_level: "Güven Seviyesi"
     search_hint: "kullanıcı adı, e-posta veya IP adresi"
     create_account:
-      disclaimer: "Kayıt olarak <a href='{{privacy_link}}' target='blank'>Gizlilik İlkeleri'ni</a> ve <a href='{{tos_link}}' target='blank'>Hizmet Şartları'nı</a> kabul etmiş olursunuz."
+      disclaimer: "Kayıt olarak <a href='%{privacy_link}' target='blank'>Gizlilik İlkeleri'ni</a> ve <a href='%{tos_link}' target='blank'>Hizmet Şartları'nı</a> kabul etmiş olursunuz."
       title: "Yeni Hesap Oluştur"
       failed: "Bir şeyler ters gitti. Bu e-posta ile daha önce bir kayıt oluşturulmuş olabilir. \"Şifremi unuttum\" bağlantısına tıklayarak ilerlemeni öneririz. "
     forgot_password:
@@ -1371,7 +1373,7 @@ tr_TR:
       awaiting_activation: "Hesabın etkinleştirme işlemini bekliyor. Başka bir etkinleştirme e-postası göndermek için \"Şifremi Unuttum\" bağlantısını kullan."
       awaiting_approval: "Hesabın henüz bir görevli tarafından onaylanmadı. Onaylandığında e-posta ile bilgilendirileceksin."
       requires_invite: "Üzgünüz, bu foruma sadece davetliler erişebilir."
-      not_activated: "Henüz oturum açamazsın. Hesabını etkinleştirmek için daha önceden <b>{{sentTo}}</b> adresine yollanan aktivasyon e-postasındaki açıklamaları okumalısın. "
+      not_activated: "Henüz oturum açamazsın. Hesabını etkinleştirmek için daha önceden <b>%{sentTo}</b> adresine yollanan aktivasyon e-postasındaki açıklamaları okumalısın. "
       not_allowed_from_ip_address: "Bu IP adresinden giriş yapamazsın. "
       admin_not_allowed_from_ip_address: "Bu IP adresinden yönetici olarak giriş yapamazsın. "
       resend_activation_email: "Aktivasyon e-postasını tekrar göndermek için buraya tıkla. "
@@ -1380,7 +1382,7 @@ tr_TR:
       change_email: "E-posta adresini değiştir"
       provide_new_email: "Yeni bir adres gir. Onay e-postanı tekrar gönderelim."
       submit_new_email: "E-posta adresi güncelle"
-      sent_activation_email_again: "<b>{{currentEmail}}</b> adresine yeni bir etkinleştirme e-postası yolladık. Bu e-postanın sana ulaşması birkaç dakika sürebilir. İstenmeyen klasörünü kontrol etmeyi unutma."
+      sent_activation_email_again: "<b>%{currentEmail}</b> adresine yeni bir etkinleştirme e-postası yolladık. Bu e-postanın sana ulaşması birkaç dakika sürebilir. İstenmeyen klasörünü kontrol etmeyi unutma."
       sent_activation_email_again_generic: "Başka bir aktivasyon e-postası gönderdik. Gelmesi birkaç dakika sürebilir; spam klasörünü kontrol ettiğinizden emin olun."
       to_continue: "Lütfen Giriş Yap"
       preferences: "Tercihlerini değiştirebilmek için giriş yapman gerekiyor."
@@ -1443,20 +1445,20 @@ tr_TR:
     conditional_loading_section:
       loading: Yükleniyor...
     category_row:
-      topic_count: "{{count}} bu kategorideki konular"
+      topic_count: "%{count} bu kategorideki konular"
     select_kit:
       default_header_text: Seç...
       no_content: Hiçbir eşleşme bulunamadı
       filter_placeholder: Ara...
       filter_placeholder_with_any: Ara ya da yarat ...
-      create: "'{{content}}' Oluştur"
+      create: "'%{content}' Oluştur"
       max_content_reached:
-        one: "Yalnızca {{count}} konu seçebilirsiniz"
-        other: "Yalnızca {{count}} konuları seçebilirsiniz"
+        one: "Yalnızca %{count} konu seçebilirsiniz"
+        other: "Yalnızca %{count} konuları seçebilirsiniz"
       min_content_not_reached:
-        one: "En azından {{count}} konu seçiniz"
-        other: "En azından {{count}}konuları seçiniz"
-      invalid_selection_length: "Seçim en az {{count}} karakter olmalıdır."
+        one: "En azından %{count} konu seçiniz"
+        other: "En azından %{count}konuları seçiniz"
+      invalid_selection_length: "Seçim en az %{count} karakter olmalıdır."
     date_time_picker:
       from: Kimden
       to: Kime
@@ -1483,7 +1485,7 @@ tr_TR:
       default: Özel emojiler
     shared_drafts:
       title: "Paylaşılan taslaklar"
-      notice: "Bu konu, yalnızca <b>{{category}}</b> kategorisini görebilen kişiler tarafından görülebilir."
+      notice: "Bu konu, yalnızca <b>%{category}</b> kategorisini görebilen kişiler tarafından görülebilir."
       destination_category: "Hedef Kategori"
       publish: "Paylaşılan Taslağı Yayımla"
       confirm_publish: "Bu taslağı yayımlamak istediğine emin misin?"
@@ -1503,24 +1505,24 @@ tr_TR:
       similar_topics: "Konun şunlara benziyor..."
       drafts_offline: "çevrimdışı taslaklar"
       edit_conflict: "çakışmayı düzenle"
-      group_mentioned_limit: "<b>Uyarı!</b> <a href='{{group_link}}'>{{group}}</a>'den bahsettiniz, ancak bu grubun yönetici tarafından yapılandırılmış olan maksimum {{max}} kullanıcıdan bahsetme sınırını aşan daha fazla üyesi var. Kimse haberdar edilmeyecek."
+      group_mentioned_limit: "<b>Uyarı!</b> <a href='%{group_link}'>%{group}</a>'den bahsettiniz, ancak bu grubun yönetici tarafından yapılandırılmış olan maksimum %{max} kullanıcıdan bahsetme sınırını aşan daha fazla üyesi var. Kimse haberdar edilmeyecek."
       group_mentioned:
-        one: "{{group}} hakkında konuşarak <a href='{{group_link}}'>{{count}} kişiyi</a> bilgilendirmek üzeresin, emin misin?"
-        other: "{{group}} hakkında konuşarak <a href='{{group_link}}'>{{count}} kişiyi</a> bilgilendirmek üzeresin, emin misin?"
+        one: "%{group} hakkında konuşarak <a href='%{group_link}'>%{count} kişiyi</a> bilgilendirmek üzeresin, emin misin?"
+        other: "%{group} hakkında konuşarak <a href='%{group_link}'>%{count} kişiyi</a> bilgilendirmek üzeresin, emin misin?"
       cannot_see_mention:
-        category: "{{username}} adlı kullanıcıdan bahsettin fakat bildirim gönderilmeyecek çünkü kullanıcının bu kategoriye ulaşma izni yok. Kullanıcının bildirimi görebilmesi için onu bu gruba eklemen gerekiyor. "
-        private: "{{username}} adlı kullanıcıdan bahsettin fakat bildirim gönderilmeyecek çünkü kullanıcının bu kişisel mesaja ulaşma izni yok. Kişisel mesaja ulaşabilmesi için kullanıcıyı PM'ye eklemen gerekiyor. "
-      duplicate_link: "Görünüşe göre <b>{{domain}}</b> alan adına bağlanan bağlantınız <b>@{{username}}</b> tarafından konu içine <a href='{{post_url}}'>gönderdiği cevapta {{ago}}</a> yayınlanmış görünüyor.  Tekrar yayınlamak istediğinize emin misiniz?"
-      reference_topic_title: "RE: {{title}}"
+        category: "%{username} adlı kullanıcıdan bahsettin fakat bildirim gönderilmeyecek çünkü kullanıcının bu kategoriye ulaşma izni yok. Kullanıcının bildirimi görebilmesi için onu bu gruba eklemen gerekiyor. "
+        private: "%{username} adlı kullanıcıdan bahsettin fakat bildirim gönderilmeyecek çünkü kullanıcının bu kişisel mesaja ulaşma izni yok. Kişisel mesaja ulaşabilmesi için kullanıcıyı PM'ye eklemen gerekiyor. "
+      duplicate_link: "Görünüşe göre <b>%{domain}</b> alan adına bağlanan bağlantınız <b>@%{username}</b> tarafından konu içine <a href='%{post_url}'>gönderdiği cevapta %{ago}</a> yayınlanmış görünüyor.  Tekrar yayınlamak istediğinize emin misiniz?"
+      reference_topic_title: "RE: %{title}"
       error:
         title_missing: "Başlık gerekli"
-        title_too_short: "Başlık en az {{min}} karakter olmalı"
-        title_too_long: "Başlık {{max}} karakterden daha uzun olamaz"
+        title_too_short: "Başlık en az %{min} karakter olmalı"
+        title_too_long: "Başlık %{max} karakterden daha uzun olamaz"
         post_missing: "Gönderi boş olamaz"
-        post_length: "Gönderi en az {{min}} karakter olmalı"
-        try_like: "{{heart}} düğmesini denediniz mi?"
+        post_length: "Gönderi en az %{min} karakter olmalı"
+        try_like: "%{heart} düğmesini denediniz mi?"
         category_missing: "Bir kategori seçmelisin"
-        tags_missing: "En azından {{count}} etiket seçmelisin"
+        tags_missing: "En azından %{count} etiket seçmelisin"
         topic_template_not_modified: "Lütfen konu şablonunu düzenleyerek daha fazla ayrıntı ekleyin."
       save_edit: "Değişikliği Kaydet"
       overwrite_edit: "Üzerine Yaz"
@@ -1617,58 +1619,58 @@ tr_TR:
     notifications:
       tooltip:
         regular:
-          one: "{{count}} görülmemiş bildirim"
-          other: "{{count}} görülmemiş bildirim"
+          one: "%{count} görülmemiş bildirim"
+          other: "%{count} görülmemiş bildirim"
         message:
-          one: "{{count}} okunmamış ileti"
-          other: "{{count}} okunmamış mesaj"
+          one: "%{count} okunmamış ileti"
+          other: "%{count} okunmamış mesaj"
       title: "@isime yapılan bildirimler, gönderilerin ve konularına verilen cevaplar, mesajlarla vb. ilgili bildiriler"
       none: "Şu an için bildirimler yüklenemiyor."
       empty: "Bildirim yok."
       post_approved: "Gönderiniz onaylandı"
       reviewable_items: "inceleme gerektiren öğeler"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} ve {{count}} diğer</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} ve {{count}} diğer</span> {{description}}"
+        one: "<span>%{username}, %{username2} ve %{count} diğer</span> %{description}"
+        other: "<span>%{username}, %{username2} ve %{count} diğer</span> %{description}"
       liked_consolidated_description:
-        one: "gönderilerinizden {{count}} tanesi beğenildi"
-        other: "gönderilerinizden {{count}} tanesi beğenildi"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> davetinizi kabul etti"
-      moved_post: "<span>{{username}}</span> {{description}} taşıdı"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "'{{description}}' kazandı"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Yeni Konu</span> {{description}}"
-      membership_request_accepted: "&#39;{{group_name}}&#39; üyeliğine kabul edildi"
-      membership_request_consolidated: "{{count}} &#39;{{group_name}}&#39; için açık üyelik talepleri"
+        one: "gönderilerinizden %{count} tanesi beğenildi"
+        other: "gönderilerinizden %{count} tanesi beğenildi"
+      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}"
+      invitee_accepted: "<span>%{username}</span> davetinizi kabul etti"
+      moved_post: "<span>%{username}</span> %{description} taşıdı"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "'%{description}' kazandı"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Yeni Konu</span> %{description}"
+      membership_request_accepted: "&#39;%{group_name}&#39; üyeliğine kabul edildi"
+      membership_request_consolidated: "%{count} &#39;%{group_name}&#39; için açık üyelik talepleri"
       group_message_summary:
-        one: "{{group_name}} gelen kutunuzdaki {{count}} mesaj var"
-        other: "{{group_name}} gelen kutunuzda {{count}} mesajları"
+        one: "%{group_name} gelen kutunuzdaki %{count} mesaj var"
+        other: "%{group_name} gelen kutunuzda %{count} mesajları"
       popup:
-        mentioned: '{{username}}, "{{topic}}" başlıklı konuda sizden bahsetti - {{site_title}}'
-        group_mentioned: '{{username}} sizden bahsetti "{{topic}}" - {{site_title}}'
-        quoted: '{{username}}, "{{topic}}" başlıklı konuda sizden alıntı yaptı - {{site_title}}'
-        replied: '{{username}}, "{{topic}}" başlıklı konuda size cevap verdi - {{site_title}}'
-        posted: '{{username}}, "{{topic}}" başlıklı konuya yazdı - {{site_title}}'
-        private_message: '{{username}} "{{topic}} konusunda "size kişisel bir mesaj gönderdi - {{site_title}} '
-        linked: '{{username}}, "{{topic}}" başlıklı konudaki gönderinize bağlantı yaptı - {{site_title}}'
-        watching_first_post: '{{username}} yeni bir konu oluşturdu "{{topic}}" - {{site_title}}'
+        mentioned: '%{username}, "%{topic}" başlıklı konuda sizden bahsetti - %{site_title}'
+        group_mentioned: '%{username} sizden bahsetti "%{topic}" - %{site_title}'
+        quoted: '%{username}, "%{topic}" başlıklı konuda sizden alıntı yaptı - %{site_title}'
+        replied: '%{username}, "%{topic}" başlıklı konuda size cevap verdi - %{site_title}'
+        posted: '%{username}, "%{topic}" başlıklı konuya yazdı - %{site_title}'
+        private_message: '%{username} "%{topic} konusunda "size kişisel bir mesaj gönderdi - %{site_title} '
+        linked: '%{username}, "%{topic}" başlıklı konudaki gönderinize bağlantı yaptı - %{site_title}'
+        watching_first_post: '%{username} yeni bir konu oluşturdu "%{topic}" - %{site_title}'
         confirm_title: "Bildirimler etkin - %{site_title}"
         confirm_body: "Başarılı! Bildirimler etkinleştirildi."
-        custom: "{{username}} tarafından bildirim %{site_title}"
+        custom: "%{username} tarafından bildirim %{site_title}"
       titles:
         mentioned: "adı geçen"
         replied: "yeni cevap"
@@ -1696,9 +1698,9 @@ tr_TR:
       from_my_computer: "Kendi cihazımdan"
       from_the_web: "Webden"
       remote_tip: "resme bağlantı ata"
-      remote_tip_with_attachments: "dosya ya da resim bağlantısı {{authorized_extensions}}"
+      remote_tip_with_attachments: "dosya ya da resim bağlantısı %{authorized_extensions}"
       local_tip: "cihazından resimler seç"
-      local_tip_with_attachments: "cihazından resim ya da dosya seç {{authorized_extensions}}"
+      local_tip_with_attachments: "cihazından resim ya da dosya seç %{authorized_extensions}"
       hint: "(düzenleyiciye \"sürükle ve bırak\" yaparak da yükleyebilirsin)"
       hint_for_supported_browsers: "ayrıca resimleri düzenleyiciye sürükleyip bırakabilir ya da yapıştırabilirsin"
       uploading: "Yükleniyor"
@@ -1715,15 +1717,15 @@ tr_TR:
       clear_all: "Tümünü Temizle"
       too_short: "Aradığın terim çok kısa."
       result_count:
-        one: "<span class='term'>{{term}}</span> <span>için %{count} sonuç</span>"
-        other: "<span class='term'>{{term}}</span> için <span>{{count}} {{plus}} sonuç</span>"
+        one: "<span class='term'>%{term}</span> <span>için %{count} sonuç</span>"
+        other: "<span class='term'>%{term}</span> için <span>%{count} %{plus} sonuç</span>"
       title: "konu, gönderi, kullanıcı veya kategori ara"
       full_page_title: "konu ya da gönderi ara"
       no_results: "Hiçbir sonuç bulunamadı."
       no_more_results: "Başka sonuç yok."
       searching: "Aranıyor..."
-      post_format: "{{username}} tarafından #{{post_number}}"
-      results_page: "'{{term}}' için arama sonuçları"
+      post_format: "%{username} tarafından #%{post_number}"
+      results_page: "'%{term}' için arama sonuçları"
       more_results: "Daha fazla sonuç var. Lütfen arama kriterlerini daralt."
       cant_find: "Aradığını bulamıyor musun?"
       start_new_topic: "Belki de yeni bir başlık oluşturmalısın..."
@@ -1732,9 +1734,9 @@ tr_TR:
       search_google_button: "Google"
       search_google_title: "Bu sitede ara"
       context:
-        user: "@{{username}} kullancısına ait gönderilerde ara"
-        category: "#{{category}} kategorisini ara"
-        tag: "# {{tag}} etiketini arayın"
+        user: "@%{username} kullancısına ait gönderilerde ara"
+        category: "#%{category} kategorisini ara"
+        tag: "# %{tag} etiketini arayın"
         topic: "Bu konuyu ara"
         private_messages: "Mesajlarda ara"
       advanced:
@@ -1810,8 +1812,8 @@ tr_TR:
         notification_level: "Bildirimler"
         choose_new_category: "Konular için yeni bir kategori seç:"
         selected:
-          one: "<b>{{count}}</b> konu seçtiniz."
-          other: "<b>{{count}}</b> konu seçtin."
+          one: "<b>%{count}</b> konu seçtiniz."
+          other: "<b>%{count}</b> konu seçtin."
         change_tags: "Etiketleri Değiştir"
         append_tags: "Etiketleri Ekle"
         choose_new_tags: "Bu konular için yeni etiketler seç:"
@@ -1824,7 +1826,7 @@ tr_TR:
         posted: "Henüz herhangi bir konuda gönderi yapmadın"
         latest: "Güncel bir konu yok. Bu üzücü."
         bookmarks: "Henüz bir konu işaretlememişsin. "
-        category: "{{category}} konusu yok."
+        category: "%{category} konusu yok."
         top: "Popüler bir konu yok."
         educate:
           new: '<p>Yeni konular burada görünecek.</p><p>Öntanımlı olarak son 2 gün içerisinde oluşturulmuş konular yeni olarak nitelendirilir ve <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">yeni</span> ibaresiyle işaretli olarak gösterilir.</p><p> <a href="%{userPrefsUrl}">tercihler</a> sayfanı ziyaret ederek bunu değiştirebilirsin.</p>'
@@ -1835,13 +1837,13 @@ tr_TR:
         read: "Daha fazla okunmuş konu yok."
         new: "Daha fazla yeni konu yok."
         unread: "Daha fazla okunmamış konu yok."
-        category: "Daha fazla {{category}} konusu yok."
+        category: "Daha fazla %{category} konusu yok."
         top: "Daha fazla popüler konu yok."
         bookmarks: "Daha fazla işaretlenmemiş konu yok."
     topic:
       filter_to:
-        one: "konuda {{count}} tane gönderi var"
-        other: "konuda {{count}} tane gönderi var"
+        one: "konuda %{count} tane gönderi var"
+        other: "konuda %{count} tane gönderi var"
       create: "Yeni Konu"
       create_long: "Yeni bir konu oluştur"
       open_draft: "Taslağı Aç"
@@ -1869,11 +1871,11 @@ tr_TR:
       new: "yeni konu"
       unread: "okunmamış"
       new_topics:
-        one: "{{count}} yeni konu"
-        other: "{{count}} yeni konu"
+        one: "%{count} yeni konu"
+        other: "%{count} yeni konu"
       unread_topics:
-        one: "{{count}} okunmamış konu"
-        other: "{{count}} okunmamış konu"
+        one: "%{count} okunmamış konu"
+        other: "%{count} okunmamış konu"
       title: "Konu"
       invalid_access:
         title: "Bu konu özel"
@@ -1886,25 +1888,25 @@ tr_TR:
         title: "Konu bulunamadı."
         description: "Üzgünüz, bu konuyu bulamadık. Bu konu moderatör tarafından kaldırılmış olabilir..."
       total_unread_posts:
-        one: "bu konuda {{count}} okunmamış gönderi var"
-        other: "bu konuda {{count}} okunmamış gönderi var"
+        one: "bu konuda %{count} okunmamış gönderi var"
+        other: "bu konuda %{count} okunmamış gönderi var"
       unread_posts:
-        one: "bu konuda {{count}} tane okunmamış eski gönderi var"
-        other: "bu konuda {{count}} okunmamış eski gönderi var"
+        one: "bu konuda %{count} tane okunmamış eski gönderi var"
+        other: "bu konuda %{count} okunmamış eski gönderi var"
       new_posts:
-        one: "bu konuda, son okumanızdan bu yana {{count}} yeni gönderi var"
-        other: "bu konuda, son okumandan bu yana {{count}} yeni gönderi var"
+        one: "bu konuda, son okumanızdan bu yana %{count} yeni gönderi var"
+        other: "bu konuda, son okumandan bu yana %{count} yeni gönderi var"
       likes:
-        one: "bu konuda {{count}} beğeni var"
-        other: "bu konuda {{count}} beğeni var"
+        one: "bu konuda %{count} beğeni var"
+        other: "bu konuda %{count} beğeni var"
       back_to_list: "Konu listesine geri dön"
       options: "Konu Seçenekleri"
       show_links: "Bu konunun içindeki bağlantıları göster. "
       toggle_information: "konu ayrıntılarını değiştir"
-      read_more_in_category: "Daha fazlası için {{catLink}} kategorisine göz atabilir ya da {{latestLink}}yebilirsin."
-      read_more: "Daha fazla okumak mı istiyorsun? {{catLink}} ya da {{latestLink}}."
-      group_request: "Bu konuyu görebilmek için `{{name}}` grubundan üyelik talebinde bulunmalısınız."
-      group_join: "Bu konuyu görebilmek için {{name}} grubuna katılmalısınız."
+      read_more_in_category: "Daha fazlası için %{catLink} kategorisine göz atabilir ya da %{latestLink}yebilirsin."
+      read_more: "Daha fazla okumak mı istiyorsun? %{catLink} ya da %{latestLink}."
+      group_request: "Bu konuyu görebilmek için `%{name}` grubundan üyelik talebinde bulunmalısınız."
+      group_join: "Bu konuyu görebilmek için %{name} grubuna katılmalısınız."
       group_request_sent: "Grup üyeliği isteğiniz gönderildi. Kabul edildiğinde bilgilendirileceksiniz."
       unread_indicator: "Bu konunun son mesajını henüz hiç üye okumamış."
       read_more_MF: "{ UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 okunmamış mesaj</a> } other { <a href='{basePath}/unread'># okunmamış mesaj</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ve} false {} other{}} <a href='{basePath}/new'>1 yeni</a> konu} other { {BOTH, select, true{ve } false {} other{}} <a href='{basePath}/new'># yeni</a> konu} } var. {CATEGORY, select, true {{catLink} kategorisine} false {{latestLink}} other {}} göz atabilirsin."
@@ -2078,25 +2080,25 @@ tr_TR:
         choose_category: "Lütfen genel konu için bir kategori seçin:"
       feature_topic:
         title: "Bu konuyu ön plana çıkar"
-        pin: "Şu zamana kadar bu konunun {{categoryLink}} kategorisinin başında görünmesini sağla"
-        confirm_pin: "Zaten en yukarıda sabitlenmiş {{count}} konun var. Çok fazla konuyu en yukarıda sabitlemek yeni ve anonim kullanıcılarda sorun yaratabilir. Bu kategoride bir konuyu en yukarıda sabitlemek istediğine emin misin?"
-        unpin: "Bu konuyu {{categoryLink}} kategorisinin en üstünden kaldır."
-        unpin_until: "Bu konuyu {{categoryLink}} kategorisinin başından kaldır ya da şu zamana kadar bekle: <strong>%{until}</strong>."
+        pin: "Şu zamana kadar bu konunun %{categoryLink} kategorisinin başında görünmesini sağla"
+        confirm_pin: "Zaten en yukarıda sabitlenmiş %{count} konun var. Çok fazla konuyu en yukarıda sabitlemek yeni ve anonim kullanıcılarda sorun yaratabilir. Bu kategoride bir konuyu en yukarıda sabitlemek istediğine emin misin?"
+        unpin: "Bu konuyu %{categoryLink} kategorisinin en üstünden kaldır."
+        unpin_until: "Bu konuyu %{categoryLink} kategorisinin başından kaldır ya da şu zamana kadar bekle: <strong>%{until}</strong>."
         pin_note: "Kullanıcılar kendileri için konunun en yukarıda sabitlenmesini kaldırabilir."
         pin_validation: "Bu konuyu en yukarıda sabitlemek için bir tarih gerekli."
-        not_pinned: " {{categoryLink}} kategorisinde en yukarıda sabitlenen herhangi bir konu yok."
+        not_pinned: " %{categoryLink} kategorisinde en yukarıda sabitlenen herhangi bir konu yok."
         already_pinned:
-          one: "Şu an {{categoryLink}} kategorisinde başa tutturulan konular: <strong class='badge badge-notification unread'>{{count}}</strong>."
-          other: "Şu an {{categoryLink}} kategorisinde en yukarıda sabitlenen konular: <strong class='badge badge-notification unread'>{{count}}</strong>."
+          one: "Şu an %{categoryLink} kategorisinde başa tutturulan konular: <strong class='badge badge-notification unread'>%{count}</strong>."
+          other: "Şu an %{categoryLink} kategorisinde en yukarıda sabitlenen konular: <strong class='badge badge-notification unread'>%{count}</strong>."
         pin_globally: "Şu zamana kadar bu konunun bütün konu listelerinin başında yer almasını sağla"
-        confirm_pin_globally: "Zaten her yerde en yukarıda sabitlenen {{count}} konun var. Çok fazla konuyu en yukarıda sabitlemek yeni ve anonim kullanıcılarda sorun yaratabilir. Bir konuyu her yerde en yukarıda sabitlemek istediğine emin misin?"
+        confirm_pin_globally: "Zaten her yerde en yukarıda sabitlenen %{count} konun var. Çok fazla konuyu en yukarıda sabitlemek yeni ve anonim kullanıcılarda sorun yaratabilir. Bir konuyu her yerde en yukarıda sabitlemek istediğine emin misin?"
         unpin_globally: "Bu konuyu tüm konu listelerinin en üstünden kaldır."
         unpin_globally_until: "Bu konuyu bütün konu listelerinin başından kaldır ya da şu zamana kadar bekle: <strong>%{until}</strong>."
         global_pin_note: "Kullanıcılar kendileri için konunun en yukarıda sabitlenmesini kaldırabilir."
         not_pinned_globally: "Her yerde en yukarıda sabitlenen herhangi bir konu yok."
         already_pinned_globally:
-          one: "Şu an her yerde başa tutturulan konular: <strong class='badge badge-notification unread'>{{count}}</strong>."
-          other: "Şu an her yerde en yukarıda sabitlenen konular: <strong class='badge badge-notification unread'>{{count}}</strong>."
+          one: "Şu an her yerde başa tutturulan konular: <strong class='badge badge-notification unread'>%{count}</strong>."
+          other: "Şu an her yerde en yukarıda sabitlenen konular: <strong class='badge badge-notification unread'>%{count}</strong>."
         make_banner: "Bu konuyu tüm sayfaların en üstünde görünecek şekilde pankart yap. "
         remove_banner: "Tüm sayfaların en üstünde görünen pankartı kaldır."
         banner_note: "Kullanıcılar bu pankartı kapatarak yoksayabilirler. Herhangi bir zamanda sadece bir konu pankart yapılabilir. "
@@ -2126,15 +2128,15 @@ tr_TR:
         to_topic_username: "Bir kullanıcı adı girdin. Kullanıcıya, bu konuya davet bağlantısı içeren bir bildirim göndereceğiz."
         to_username: "Davet etmek istediğin kişinin kullanıcı adını gir. Kullanıcıya, bu konuya davet bağlantısı içeren bir bildirim göndereceğiz."
         email_placeholder: "isim@örnek.com"
-        success_email: "<b>{{emailOrUsername}}</b> kullanıcısına davet e-postalandı. Davet kabul edildiğinde sana bir bildirim göndereceğiz. Davetlerini takip etmek için kullanıcı sayfandaki davetler sekmesine göz atmalısın. "
+        success_email: "<b>%{emailOrUsername}</b> kullanıcısına davet e-postalandı. Davet kabul edildiğinde sana bir bildirim göndereceğiz. Davetlerini takip etmek için kullanıcı sayfandaki davetler sekmesine göz atmalısın. "
         success_username: "Kullanıcıyı bu konuya katılması için davet ettik."
         error: "Üzgünüz, kullanıcıyı davet edemedik. Zaten davet edilmiş olabilir mi? (Davetler oran sınırlarına tabiidir.)"
-        success_existing_email: "<b>{{emailOrUsername}}</b> e-posta adresine sahip bir kullanıcı zaten var. Bu kullanıcıyı bu konuya katılmaya davet ettik."
+        success_existing_email: "<b>%{emailOrUsername}</b> e-posta adresine sahip bir kullanıcı zaten var. Bu kullanıcıyı bu konuya katılmaya davet ettik."
       login_reply: "Cevaplamak için giriş yap"
       filters:
         n_posts:
-          one: "{{count}} gönderi"
-          other: "{{count}} gönderi"
+          one: "%{count} gönderi"
+          other: "%{count} gönderi"
         cancel: "Filtreyi kaldır"
       move_to:
         title: "Taşındı"
@@ -2147,16 +2149,16 @@ tr_TR:
         radio_label: "Yeni Konu"
         error: "Gönderileri yeni konuya taşırken bir hata oluştu."
         instructions:
-          one: "Yeni bir konu oluşturmak ve bu konuyu seçtiğiniz <b>{{count}}</b> gönderi ile doldurmak üzeresiniz."
-          other: "Yeni bir konu oluşturmak ve bu konuyu seçtiğin <b>{{count}}</b> gönderi ile doldurmak üzeresin. "
+          one: "Yeni bir konu oluşturmak ve bu konuyu seçtiğiniz <b>%{count}</b> gönderi ile doldurmak üzeresiniz."
+          other: "Yeni bir konu oluşturmak ve bu konuyu seçtiğin <b>%{count}</b> gönderi ile doldurmak üzeresin. "
       merge_topic:
         title: "Var Olan Bir Konuya Taşı"
         action: "var olan bir konuya taşı"
         error: "Gönderileri konuya taşırken bir hata oluştu."
         radio_label: "Mevcut Konu"
         instructions:
-          one: "Lütfen bu <b>{{count}}</b> gönderiyi taşımak istediğiniz konuyu seçin. "
-          other: "Lütfen bu <b>{{count}}</b> gönderiyi taşımak istediğin konuyu seç. "
+          one: "Lütfen bu <b>%{count}</b> gönderiyi taşımak istediğiniz konuyu seçin. "
+          other: "Lütfen bu <b>%{count}</b> gönderiyi taşımak istediğin konuyu seç. "
       move_to_new_message:
         title: "Yeni Mesajlara Taşı"
         action: "yeni mesaja taşı"
@@ -2165,7 +2167,7 @@ tr_TR:
         participants: "Katılımcılar"
         instructions:
           one: "Yeni bir ileti oluşturmak ve  seçtiğin gönderiyle onu doldurmak üzeresin"
-          other: "Yeni bir ileti oluşturmak ve <b>{{count}}</b> sayıda gönderiyle onu doldurmak üzeresin"
+          other: "Yeni bir ileti oluşturmak ve <b>%{count}</b> sayıda gönderiyle onu doldurmak üzeresin"
       move_to_existing_message:
         title: "Mevcut Mesaja Taşı"
         action: "mevcut mesaja taşı"
@@ -2173,7 +2175,7 @@ tr_TR:
         participants: "Katılımcılar"
         instructions:
           one: "Lütfen bu postayı taşımak istediğiniz iletiyi seçin."
-          other: "Lütfen bu <b>{{count}}</b>gönderiyi taşımak istediğiniz iletiyi seçin."
+          other: "Lütfen bu <b>%{count}</b>gönderiyi taşımak istediğiniz iletiyi seçin."
       merge_posts:
         title: "Seçili Gönderileri Birleştir"
         action: "seçili gönderileri birleştir"
@@ -2184,8 +2186,8 @@ tr_TR:
         error: "Gönderilerin sahipliği değiştirilirken bir hata oluştu."
         placeholder: "yeni sahibin kullanıcı adı"
         instructions:
-          one: "Lütfen <b>@ {{old_user}}</b> tarafından yayın için yeni bir sahibi seçin"
-          other: "Lütfen <b>@{{old_user}}</b> kullanıcısına ait {{count}} gönderiler için yeni bir sahip seçin."
+          one: "Lütfen <b>@ %{old_user}</b> tarafından yayın için yeni bir sahibi seçin"
+          other: "Lütfen <b>@%{old_user}</b> kullanıcısına ait %{count} gönderiler için yeni bir sahip seçin."
       change_timestamp:
         title: "Tarih Bilgisini Değiştir"
         action: "tarih bilgisini değiştir"
@@ -2194,7 +2196,7 @@ tr_TR:
         instructions: "Lütfen konunun yeni tarih bilgisini seç. Konudaki gönderiler aynı zaman farkına sahip olması için güncellenecek.."
       multi_select:
         select: "seç"
-        selected: "({{count}}) seçildi"
+        selected: "(%{count}) seçildi"
         select_post:
           label: "seç"
           title: "Seçime gönderi ekle"
@@ -2212,21 +2214,21 @@ tr_TR:
         select_all: tümünü seç
         deselect_all: tüm seçimi kaldır
         description:
-          one: <b>{{count}}</b> gönderi seçtiniz.
-          other: "<b>{{count}}</b> gönderi seçtin."
+          one: <b>%{count}</b> gönderi seçtiniz.
+          other: "<b>%{count}</b> gönderi seçtin."
       deleted_by_author:
         one: "(yazarı tarafından geri alınan konu, bildirilmiş hale gelmezse %{count} saat içinde otomatik olarak silinecek.)"
         other: "(yazarı tarafından geri alınan konu, bildirilmiş hale gelmezse %{count} saat içinde otomatik olarak silinecek.)"
     post:
       quote_reply: "Alıntı"
       edit_reason: "Neden: "
-      post_number: "gönderi {{number}}"
+      post_number: "gönderi %{number}"
       ignored: "Yoksayılan içerik"
       wiki_last_edited_on: "son düzenlenmiş wiki"
       last_edited_on: "son düzenlenmiş gönderi"
       reply_as_new_topic: "Bağlantılı Konu Olarak Cevapla"
       reply_as_new_private_message: "Aynı alıcıyı yeni bir mesajla cevapla"
-      continue_discussion: "{{postLink}} Gönderisinden tartışılmaya devam ediliyor:"
+      continue_discussion: "%{postLink} Gönderisinden tartışılmaya devam ediliyor:"
       follow_quote: "alıntılanan gönderiye git"
       show_full: "Gönderinin Tamamını Göster"
       show_hidden: "Yok sayılan içeriği görüntüleyin."
@@ -2237,30 +2239,30 @@ tr_TR:
       expand_collapse: "genişlet/daralt"
       locked: "personel bu yayının düzenlenmesini kilitledi"
       gap:
-        one: "gizlenen {{count}} yorumu gör"
-        other: "gizlenen {{count}} yorumu gör"
+        one: "gizlenen %{count} yorumu gör"
+        other: "gizlenen %{count} yorumu gör"
       notice:
-        new_user: "{{user}} ilk kez gönderi oluşturdu - haydi ona topluluğumuza hoşgeldin diyelim"
-        returning_user: "{{user}} i göreli bir süre oldu — son gönderileri {{time}} önce"
+        new_user: "%{user} ilk kez gönderi oluşturdu - haydi ona topluluğumuza hoşgeldin diyelim"
+        returning_user: "%{user} i göreli bir süre oldu — son gönderileri %{time} önce"
       unread: "Gönderi okunmamış"
       has_replies:
-        one: "{{count}} Cevap"
-        other: "{{count}} Cevap"
+        one: "%{count} Cevap"
+        other: "%{count} Cevap"
       has_likes_title:
-        one: "{{count}} kişi bu gönderiyi beğendi"
-        other: "{{count}} kişi bu gönderiyi beğendi"
+        one: "%{count} kişi bu gönderiyi beğendi"
+        other: "%{count} kişi bu gönderiyi beğendi"
       has_likes_title_only_you: "bu gönderiyi beğendin"
       has_likes_title_you:
-        one: "siz ve {{count}} diğer kişi bu gönderiyi beğendi"
-        other: "sen ve {{count}} kişi bu gönderiyi beğendi"
+        one: "siz ve %{count} diğer kişi bu gönderiyi beğendi"
+        other: "sen ve %{count} kişi bu gönderiyi beğendi"
       errors:
         create: "Üzgünüz, gönderin oluşturulurken bir hata oluştu. Lütfen tekrar dene."
         edit: "Üzgünüz, gönderin düzenlenirken bir hata oluştu. Lütfen tekrar dene. "
         upload: "Üzgünüz, dosya yüklenirken bir hata oluştu. Lütfen tekrar dene."
-        file_too_large: "Üzgünüz, bu dosya çok büyük (en fazla {{max_size_kb}}kb). Neden paylaşımını bir bulut sağlayıcısına yükleyip bağlantısını paylaşmıyorsun ?"
+        file_too_large: "Üzgünüz, bu dosya çok büyük (en fazla %{max_size_kb}kb). Neden paylaşımını bir bulut sağlayıcısına yükleyip bağlantısını paylaşmıyorsun ?"
         too_many_uploads: "Üzgünüz, aynı anda sadece tek dosya yüklenebilir."
-        too_many_dragged_and_dropped_files: "Üzgünüz, tek seferde sadece {{max}} dosya yükleyebilirsin."
-        upload_not_authorized: "Üzgünüz, yüklemeye çalıştığın dosya izinli değil (izinli uzantılar : {{izinli uzantılar}})."
+        too_many_dragged_and_dropped_files: "Üzgünüz, tek seferde sadece %{max} dosya yükleyebilirsin."
+        upload_not_authorized: "Üzgünüz, yüklemeye çalıştığın dosya izinli değil (izinli uzantılar : %{izinli uzantılar})."
         image_upload_not_allowed_for_new_user: "Üzgünüz, yeni kullanıcılar resim yükleyemez."
         attachment_upload_not_allowed_for_new_user: "Üzgünüz, yeni kullanıcılar dosya yükleyemez."
         attachment_download_requires_login: "Üzgünüz, eklentileri indirebilmek için giriş yapman gerekiyor."
@@ -2300,10 +2302,10 @@ tr_TR:
           confirm: "Bu gönderideki yanıtları da silmek istiyor musun?"
           direct_replies:
             one: "Evet, ve %{count} doğrudan cevap"
-            other: "Evet ve {{count}} doğrudan yanıtlar"
+            other: "Evet ve %{count} doğrudan yanıtlar"
           all_replies:
             one: "Evet, ve %{count} yanıt"
-            other: "Evet, ve tüm {{count}} yanıtlar"
+            other: "Evet, ve tüm %{count} yanıtlar"
           just_the_post: "Hayır, sadece bu gönderi"
         admin: "gönderi yönetici eylemleri"
         wiki: "Wiki Yap"
@@ -2349,11 +2351,11 @@ tr_TR:
             one: "bunu oku"
             other: " bunları oku"
           like_capped:
-            one: "ve {{count}} diğer kişi bunu beğendi"
-            other: "ve {{count}} diğerleri bunu beğendi"
+            one: "ve %{count} diğer kişi bunu beğendi"
+            other: "ve %{count} diğerleri bunu beğendi"
           read_capped:
-            one: "ve {{count}} tanesini daha okuyun"
-            other: "ve {{count}}tanesini daha okuyun"
+            one: "ve %{count} tanesini daha okuyun"
+            other: "ve %{count}tanesini daha okuyun"
         by_you:
           off_topic: "Bunu bayrakla \"konu dışı\" olarak işaretledin"
           spam: "Bunu bayrakla \"istenmeyen e-posta\" olarak işaretledin"
@@ -2365,11 +2367,11 @@ tr_TR:
       delete:
         confirm:
           one: "Bu gönderiyi silmek istediğinize emin misiniz?"
-          other: "{{count}} tane gönderiyi silmek istediğinize emin misiniz?"
+          other: "%{count} tane gönderiyi silmek istediğinize emin misiniz?"
       merge:
         confirm:
           one: "Bu yayınları birleştirmek istediğinize emin misiniz?"
-          other: "{{count}} gönderiyi birleştirmek istediğinizden emin misiniz?"
+          other: "%{count} gönderiyi birleştirmek istediğinizden emin misiniz?"
       revisions:
         controls:
           first: "İlk revizyon"
@@ -2381,7 +2383,7 @@ tr_TR:
           revert: "Bu uyarlamaya geri dön"
           edit_wiki: "Wiki'yi düzenle"
           edit_post: "Gönderiyi düzenle"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong>{{icon}}<strong>{{current}}</strong>/{{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong>%{icon}<strong>%{current}</strong>/%{total}"
         displays:
           inline:
             title: "Hazırlanan cevabı ekleme ve çıkarmalarla birlikte göster"
@@ -2560,14 +2562,14 @@ tr_TR:
       custom_placeholder_notify_moderators: "Seni neyin endişelendirdiğini açık bir dille bize bildir ve gerekli yerlerde konu ile alakalı bağlantıları paylaş."
       custom_message:
         at_least:
-          one: "en azından {{count}} karakter girin"
-          other: "en azından {{count}} karakter gir"
+          one: "en azından %{count} karakter girin"
+          other: "en azından %{count} karakter gir"
         more:
-          one: "{{count}} daha..."
-          other: "{{count}} daha..."
+          one: "%{count} daha..."
+          other: "%{count} daha..."
         left:
-          one: "{{count}} kaldı"
-          other: "{{count}} kaldı"
+          one: "%{count} kaldı"
+          other: "%{count} kaldı"
     flagging_topic:
       title: "Topluluğumuzun nezaket kuralları içerisinde kalmasına verdiğin destek için teşekkürler!"
       action: "Konuyu Bayrakla İşaretle"
@@ -2611,7 +2613,7 @@ tr_TR:
         title: "Bu konu kişisel bir mesajdır"
         help: "Bu konu kişisel bir mesajdır"
     posts: "Gönderiler"
-    posts_long: "bu konuda {{number}} gönderi var"
+    posts_long: "bu konuda %{number} gönderi var"
     posts_likes_MF: |
       Bu konuda {count, plural, one {1 cevap} other {# cevap}} {ratio, select,
       low {ve yüksek beğeni/gönderi oranı}
@@ -2625,21 +2627,21 @@ tr_TR:
       other: "görüntülenenler"
     replies: "Cevaplar"
     views_long:
-      one: "bu konu {{number}} defa görüntülendi"
-      other: "bu konu {{number}} defa görüntülendi"
+      one: "bu konu %{number} defa görüntülendi"
+      other: "bu konu %{number} defa görüntülendi"
     activity: "Aktivite"
     likes: "Beğeni"
     likes_lowercase:
       one: "beğeni"
       other: "beğeni"
-    likes_long: "bu konuda {{number}} beğeni var"
+    likes_long: "bu konuda %{number} beğeni var"
     users: "Kullanıcılar"
     users_lowercase:
       one: "kullanıcı"
       other: "kullanıcılar"
     category_title: "Kategori"
     history: "Geçmiş"
-    changed_by: "Yazan {{author}}"
+    changed_by: "Yazan %{author}"
     raw_email:
       title: "Gelen e-posta"
       not_available: "Bulunmuyor!"
@@ -2650,34 +2652,34 @@ tr_TR:
       latest:
         title: "En son"
         title_with_count:
-          one: "En Son ({{count}})"
-          other: "En Son ({{count}})"
+          one: "En Son (%{count})"
+          other: "En Son (%{count})"
         help: "yakın zamanda gönderi alan konular"
       read:
         title: "Okunmuş"
         help: "okunma sırasına göre okuduğun konular"
       categories:
         title: "Kategoriler"
-        title_in: "Kategori - {{categoryName}}"
+        title_in: "Kategori - %{categoryName}"
         help: "kategoriye göre gruplandırılmış konular"
       unread:
         title: "Okunmamış"
         title_with_count:
-          one: "Okunmamış ({{count}})"
-          other: "Okunmamış ({{count}})"
+          one: "Okunmamış (%{count})"
+          other: "Okunmamış (%{count})"
         help: "İzlediğin veya takip ettiğin okunmamış gönderi konuları"
         lower_title_with_count:
-          one: "{{count}} okunmamış"
-          other: "{{count}} okunmamış"
+          one: "%{count} okunmamış"
+          other: "%{count} okunmamış"
       new:
         lower_title_with_count:
-          one: "{{count}} yeni"
-          other: "{{count}} yeni"
+          one: "%{count} yeni"
+          other: "%{count} yeni"
         lower_title: "yeni"
         title: "Yeni"
         title_with_count:
-          one: "Yeni ({{count}}) "
-          other: "Yeni ({{count}}) "
+          one: "Yeni (%{count}) "
+          other: "Yeni (%{count}) "
         help: "son birkaç günde oluşturulmuş konular"
       posted:
         title: "Gönderilerim"
@@ -2686,11 +2688,11 @@ tr_TR:
         title: "İşaretler"
         help: "işaretlediğin konular"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
-        help: "{{categoryName}} kategorisindeki en son konular"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "%{categoryName} kategorisindeki en son konular"
       top:
         title: "Popüler"
         help: "geçtiğimiz yıl, ay, hafta veya gündeki en etkin başlıklar"
@@ -2835,8 +2837,8 @@ tr_TR:
       synonyms: "Eş Anlamlılar"
       synonyms_description: "İlgili etiketler kullanılıyorsa, <b>%{base_tag_name}</b> ile değiştirilecektir."
       tag_groups_info:
-        one: 'Bu etiket {{tag_groups}} grubuna aittir.'
-        other: "Bu etiket \"{{tag_groups}}\" gruplarına aittir."
+        one: 'Bu etiket %{tag_groups} grubuna aittir.'
+        other: "Bu etiket \"%{tag_groups}\" gruplarına aittir."
       category_restrictions:
         one: "Sadece bu kategoride kullanılabilir : "
         other: "Sadece bu kategorilerde kullanılabilir : "
@@ -2852,11 +2854,11 @@ tr_TR:
       delete_tag: "Etiketi Sil"
       delete_confirm:
         one: "Bu etiketi silmek ve atanmış olduğu %{count} konudan kaldırmak istediğinizden emin misiniz?"
-        other: "Bu etiketi silmek ve  atanmış olduğu {{count}} konularından kaldırmak istediğinizden emin misiniz? "
+        other: "Bu etiketi silmek ve  atanmış olduğu %{count} konularından kaldırmak istediğinizden emin misiniz? "
       delete_confirm_no_topics: "Bu etiketi silmek istediğinize emin misiniz?"
       delete_confirm_synonyms:
         one: "Eş anlamlısı da silinecek."
-        other: "{{count}} isimli eşanlamlıları da silinecek."
+        other: "%{count} isimli eşanlamlıları da silinecek."
       rename_tag: "Etiketi Yeniden Adlandır"
       rename_instructions: "Bu etiket için yeni bir ad seç:"
       sort_by: "Sırala:"
@@ -3205,11 +3207,11 @@ tr_TR:
           none: "İlgili bir etkinlik yok"
           redeliver: "Yeniden ilet"
           incoming:
-            one: "Şu anda {{count}} yeni olay var."
-            other: "Şu anda {{count}} yeni etkinlik var."
+            one: "Şu anda %{count} yeni olay var."
+            other: "Şu anda %{count} yeni etkinlik var."
           completed_in:
-            one: "{{count}} saniyede tamamlandı."
-            other: "{{count}} saniyede tamamlandı."
+            one: "%{count} saniyede tamamlandı."
+            other: "%{count} saniyede tamamlandı."
           request: "İstek"
           response: "Yanıt"
           redeliver_confirm: "Aynı veri yükünü tekrar iletmek istediğinden emin misin?"
@@ -3261,12 +3263,12 @@ tr_TR:
           label: "Yükle"
           title: "Bu oluşuma bir yedek yükle"
           uploading: "Yükleniyor..."
-          uploading_progress: "Yükleniyor... {{progress}}%"
-          success: "{{filename}} dosya başarıyla yüklendi. Dosya şimdi işlenmeye başladı ve kısa bir süre içerisinde listede görünecek."
-          error: "'{{filename}}': {{message}} yüklenirken bir hata oluştu"
+          uploading_progress: "Yükleniyor... %{progress}%"
+          success: "%{filename} dosya başarıyla yüklendi. Dosya şimdi işlenmeye başladı ve kısa bir süre içerisinde listede görünecek."
+          error: "'%{filename}': %{message} yüklenirken bir hata oluştu"
         operations:
           is_running: "İşlem devam ediyor..."
-          failed: "{{operation}} gerçekleşemedi. Lütfen kayıtları kontrol et."
+          failed: "%{operation} gerçekleşemedi. Lütfen kayıtları kontrol et."
           cancel:
             label: "İptal"
             title: "Devam eden işlemi iptal et"
@@ -3385,7 +3387,7 @@ tr_TR:
           disabled_component_tooltip: "Bu bileşen inaktif"
           default_theme_tooltip: "Bu tema sitenin varsayılan temasıdır"
           updates_available_tooltip: "Bu tema için güncellemeler var"
-          and_x_more: "ve {{count}} tane daha."
+          and_x_more: "ve %{count} tane daha."
           collapse: Daralt
           uploads: "Yüklemeler"
           no_uploads: "Fontlar ve resimler gibi temayla ilişkili varlıkları yükleyebilirsin"
@@ -3433,8 +3435,8 @@ tr_TR:
           disabled_by: "Bu bileşeni devre dışı bırakan kişi"
           required_version:
             error: "Bu tema otomatik olarak devre dışı bırakıldı çünkü forum bu sürüm ile uyumlu değil."
-            minimum: "Forum sürümü {{version}} veya üstünü gerektirir."
-            maximum: "Forum sürümü {{version}} veya daha düşük gerektirir."
+            minimum: "Forum sürümü %{version} veya üstünü gerektirir."
+            maximum: "Forum sürümü %{version} veya daha düşük gerektirir."
           component_of: "Bileşen:"
           update_to_latest: "Sona Doğru Güncelle"
           check_for_updates: "Güncellemeleri kontrol et"
@@ -3447,7 +3449,7 @@ tr_TR:
           empty: "Öğe yok"
           commits_behind:
             one: "%{count} temalar geride kaldı!"
-            other: "{{count}} tema geride kaldı!"
+            other: "%{count} tema geride kaldı!"
           compare_commits: "(Yeni yorumlara bakınız)"
           repo_unreachable: "Bu temanın Git deposuyla bağlantı kurulamadı. Hata mesajı:"
           imported_from_archive: "Bu tema bir .zip dosyasından içe aktarıldı"
@@ -3849,8 +3851,8 @@ tr_TR:
           title: "Bu kullanıcının e-posta adresini ortaya çıkar"
           text: "Göster"
       user:
-        suspend_failed: "Bu kullanıcı askıya alınırken bir şeyler ters gitti {{error}}"
-        unsuspend_failed: "Bu kullanıcının askıya alınması kaldırılırken bir şeyler ters gitti {{error}}"
+        suspend_failed: "Bu kullanıcı askıya alınırken bir şeyler ters gitti %{error}"
+        unsuspend_failed: "Bu kullanıcının askıya alınması kaldırılırken bir şeyler ters gitti %{error}"
         suspend_duration: "Kullanıcı ne kadar süreyle askıya alınacak?"
         suspend_reason_label: "Neden askıya alıyorsun? Bu metin bu kullanıcının profil sayfasında <b>herkes tarafından görüntülenecek<b> ve kullanıcı sisteme giriş yapmaya çalıştığında kullanıcı tarafından görüntülenecek. Metin lütfen kısa olsun. "
         suspend_reason_hidden_label: "Neden askıya alıyorsun? Kullanıcı giriş yapmaya çalıştığında yazdığın metni görecek. Metin lütfen kısa olsun."
@@ -4204,6 +4206,7 @@ tr_TR:
         title: "Emoji"
         help: "Herkese açık yeni bir emoji ekle. (PROTIP: birden çok dosyayı tek seferde sürükleyip bırakabilirsin)"
         add: "Yeni Emoji Ekle"
+        uploading: "Yükleniyor..."
         name: "İsim"
         group: "Grup"
         image: "Resim"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 9068c2d63c..e3674bd593 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -25,8 +25,8 @@ uk:
             mb: МБ
             tb: ТБ
       short:
-        thousands: "{{number}} тис."
-        millions: "{{number}} млн."
+        thousands: "%{number} тис."
+        millions: "%{number} млн."
     dates:
       time: "HH:mm"
       time_short_day: "ddd, HH:mm"
@@ -271,13 +271,13 @@ uk:
     weekly: "щотижня"
     every_month: "щомісяця"
     every_six_months: "що шість місяців"
-    max_of_count: "не більше {{count}}"
+    max_of_count: "не більше %{count}"
     alternation: "або"
     character_count:
-      one: "{{count}} символ"
-      few: "{{count}} символи"
-      many: "{{count}} символів"
-      other: "{{count}} символів"
+      one: "%{count} символ"
+      few: "%{count} символи"
+      many: "%{count} символів"
+      other: "%{count} символів"
     related_messages:
       title: "Пов'язані повідомлення"
       see_all: 'Переглянути <a href="%{path}">усі дописи </a> від @%{username}…'
@@ -333,20 +333,20 @@ uk:
         yes_value: "Так, відмовитись"
         no_value: "Ні, зачекайте"
     topic_count_latest:
-      one: "Переглянути {{count}} нову чи оновлену тему"
-      few: "Переглянути {{count}} нові чи оновлені теми"
-      many: "Переглянути {{count}} нових чи оновлених тем"
-      other: "Переглянути {{count}} нових чи оновлених тем"
+      one: "Переглянути %{count} нову чи оновлену тему"
+      few: "Переглянути %{count} нові чи оновлені теми"
+      many: "Переглянути %{count} нових чи оновлених тем"
+      other: "Переглянути %{count} нових чи оновлених тем"
     topic_count_unread:
-      one: "Переглянути {{count}} непрочитану тему"
-      few: "Переглянути {{count}} непрочитані теми"
-      many: "Переглянути {{count}} непрочитаних тем"
-      other: "Переглянути {{count}} непрочитаних тем"
+      one: "Переглянути %{count} непрочитану тему"
+      few: "Переглянути %{count} непрочитані теми"
+      many: "Переглянути %{count} непрочитаних тем"
+      other: "Переглянути %{count} непрочитаних тем"
     topic_count_new:
-      one: "Переглянути {{count}} нову тему"
-      few: "Переглянути {{count}} нові теми"
-      many: "Переглянути {{count}} нових тем"
-      other: "Переглянути {{count}} нових тем"
+      one: "Переглянути %{count} нову тему"
+      few: "Переглянути %{count} нові теми"
+      many: "Переглянути %{count} нових тем"
+      other: "Переглянути %{count} нових тем"
     preview: "попередній перегляд"
     cancel: "скасувати"
     save: "Зберегти зміни"
@@ -354,7 +354,7 @@ uk:
     saved: "Збережено!"
     upload: "Завантажити"
     uploading: "Завантаження…"
-    uploading_filename: "Завантаження: {{filename}}…"
+    uploading_filename: "Завантаження: %{filename}…"
     clipboard: "буфер обміну"
     uploaded: "Завантажено!"
     pasting: "Вставляння…"
@@ -408,7 +408,7 @@ uk:
         optional: "Ви можете заявити права на цей елемент, щоб інші не могли його переглядати."
         required: "Ви повинні заявити права на елементи, перш ніж ви зможете переглядати їх."
         claimed_by_you: "Ви заявили права на цей елемент і можете переглядати його."
-        claimed_by_other: "Цей елемент був переглянутий лише <b>{{username}}</b>."
+        claimed_by_other: "Цей елемент був переглянутий лише <b>%{username}</b>."
       claim:
         title: "заявити права на цю тему"
       unclaim:
@@ -428,9 +428,9 @@ uk:
       view_pending: "переглянути в очікуванні"
       topic_has_pending:
         one: "Ця тема має <b>%{count}</b> допис, що очікує схвалення"
-        few: "Ця тема має <b>{{count}}</b> дописи, що очікують схвалення"
-        many: "Ця тема має <b>{{count}}</b> дописів, що очікують схвалення"
-        other: "Ця тема має <b>{{count}}</b> дописів, що очікують схвалення"
+        few: "Ця тема має <b>%{count}</b> дописи, що очікують схвалення"
+        many: "Ця тема має <b>%{count}</b> дописів, що очікують схвалення"
+        other: "Ця тема має <b>%{count}</b> дописів, що очікують схвалення"
       title: "Переглянути"
       topic: "Тема:"
       filtered_topic: "Ви відфільтрували контент до перегляду у одній темі."
@@ -447,25 +447,25 @@ uk:
         fields: "Поля"
       user_percentage:
         summary:
-          one: "{{agreed}}, {{disagreed}}, {{ignored}} (усього {{count}} прапорець)"
-          few: "{{agreed}}, {{disagreed}}, {{ignored}} (усього {{count}} прапорці)"
-          many: "{{agreed}}, {{disagreed}}, {{ignored}} (усього {{count}} прапорців)"
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} (усього {{count}} прапорців)"
+          one: "%{agreed}, %{disagreed}, %{ignored} (усього %{count} прапорець)"
+          few: "%{agreed}, %{disagreed}, %{ignored} (усього %{count} прапорці)"
+          many: "%{agreed}, %{disagreed}, %{ignored} (усього %{count} прапорців)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (усього %{count} прапорців)"
         agreed:
-          one: "{{count}}% згод"
-          few: "{{count}}% згодні"
-          many: "{{count}}% згодні"
-          other: "{{count}}% згодні"
+          one: "%{count}% згод"
+          few: "%{count}% згодні"
+          many: "%{count}% згодні"
+          other: "%{count}% згодні"
         disagreed:
-          one: "{{count}}% не згодні"
-          few: "{{count}}% не згодні"
-          many: "{{count}}% не згодні"
-          other: "{{count}}% не згодні"
+          one: "%{count}% не згодні"
+          few: "%{count}% не згодні"
+          many: "%{count}% не згодні"
+          other: "%{count}% не згодні"
         ignored:
-          one: "{{count}}% ігнорують"
-          few: "{{count}}% ігнорують"
-          many: "{{count}}% ігнорують"
-          other: "{{count}}% ігнорують"
+          one: "%{count}% ігнорують"
+          few: "%{count}% ігнорують"
+          many: "%{count}% ігнорують"
+          other: "%{count}% ігнорують"
       topics:
         topic: "Тема"
         reviewable_count: "Кількість"
@@ -475,14 +475,14 @@ uk:
         details: "деталі"
         unique_users:
           one: "%{count} користувач"
-          few: "{{count}} користувачі"
-          many: "{{count}} користувачів"
-          other: "{{count}} користувачів"
+          few: "%{count} користувачі"
+          many: "%{count} користувачів"
+          other: "%{count} користувачів"
       replies:
         one: "%{count} відповідь"
-        few: "{{count}} відповіді"
-        many: "{{count}} відповідей"
-        other: "{{count}} відповідей"
+        few: "%{count} відповіді"
+        many: "%{count} відповідей"
+        other: "%{count} відповідей"
       edit: "Редагувати"
       save: "Зберегти"
       cancel: "Скасувати"
@@ -545,24 +545,24 @@ uk:
         description: "Ми отримали ваш новий допис, але він потребує схвалення модератором, перш ніж з'явиться. Будь ласка, будьте терплячі."
         pending_posts:
           one: "У вас <strong>%{count}</strong> допис очікує схвалення."
-          few: "У вас <strong>{{count}}</strong> дописи очікують схвалення."
-          many: "У вас <strong>{{count}}</strong> дописів очікують схвалення."
-          other: "У вас <strong>{{count}}</strong> дописів очікують схвалення."
+          few: "У вас <strong>%{count}</strong> дописи очікують схвалення."
+          many: "У вас <strong>%{count}</strong> дописів очікують схвалення."
+          other: "У вас <strong>%{count}</strong> дописів очікують схвалення."
         ok: "Гаразд"
     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>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> відповів(ла) на <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Ви</a> відповіли на <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> відповів(ла) на <a href='{{topicUrl}}'>тему</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Ви</a> відповіли на <a href='{{topicUrl}}'>тему</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> згадав(ла) <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> згадав(ла) <a href='{{user2Url}}'>Вас</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Ви</a> згадали <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Написано користувачем <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Написано <a href='{{userUrl}}'>Вами</a>"
-      sent_by_user: "Надіслано користувачем <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Надіслано <a href='{{userUrl}}'>Вами</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> створив(ла) <a href='%{topicUrl}'>тему</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Ви</a> створили <a href='%{topicUrl}'>тему</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> відповів(ла) на <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Ви</a> відповіли на <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> відповів(ла) на <a href='%{topicUrl}'>тему</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Ви</a> відповіли на <a href='%{topicUrl}'>тему</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> згадав(ла) <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> згадав(ла) <a href='%{user2Url}'>Вас</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Ви</a> згадали <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Написано користувачем <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Написано <a href='%{userUrl}'>Вами</a>"
+      sent_by_user: "Надіслано користувачем <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Надіслано <a href='%{userUrl}'>Вами</a>"
     directory:
       filter_name: "фільтрувати за іменем користувача"
       title: "Користувачі"
@@ -804,7 +804,7 @@ uk:
     user_fields:
       none: "(вибрати опцію)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Профіль"
       mute: "Знемовити"
       edit: "Редагувати налаштування"
@@ -878,12 +878,12 @@ uk:
       enable_defer: "Увімкнути відкладання позначення тем непрочитаними"
       change: "змінити"
       featured_topic: "Закріплені теми"
-      moderator: "{{user}} є модератором"
-      admin: "{{user}} є адміном"
+      moderator: "%{user} є модератором"
+      admin: "%{user} є адміном"
       moderator_tooltip: "Цей користувач є модератором"
       admin_tooltip: "Цей користувач є адміністратором"
       silenced_tooltip: "Цей користувач відключений"
-      suspended_notice: "Цього користувача призупинено до {{date}}."
+      suspended_notice: "Цього користувача призупинено до %{date}."
       suspended_permanently: "Цей користувач призупинений."
       suspended_reason: "Причина: "
       github_profile: "Github"
@@ -896,7 +896,7 @@ uk:
           Знемовлені теми і категорії не включаються у ці листи.
         individual: "Надсилати всі нові дописи мені електронною поштою"
         individual_no_echo: "Надсилати всі нові дописи електронною поштою, окрім моїх власних"
-        many_per_day: "Надсилати всі нові дописи електронною поштою (близько {{dailyEmailEstimate}} на день)"
+        many_per_day: "Надсилати всі нові дописи електронною поштою (близько %{dailyEmailEstimate} на день)"
         few_per_day: "Надсилати всі нові дописи електронною поштою (близько 2 на день)"
         warning: "Режим списку розсилки увімкнено. Налаштування сповіщень електронною поштою перекрито."
       tag_settings: "Теги"
@@ -926,9 +926,7 @@ uk:
       admin_delete: "Вилучити"
       users: "Користувачі"
       muted_users: "Вимкнені"
-      muted_users_instructions: "Приховати усі сповіщення від цих користувачів."
       ignored_users: "Ігноровано"
-      ignored_users_instructions: "Приховати усі дописи та сповіщення від цих користувачів."
       tracked_topics_link: "Показати"
       automatically_unpin_topics: "Автоматично відкріпляти теми, коли я доходжу до кінця."
       apps: "Програми"
@@ -981,11 +979,11 @@ uk:
         disable: "Вимкнути"
         enable: "Увімкнути"
         enable_long: "Увімкнути резервні коди"
-        manage: "Керувати резервними кодами. У вас залишилося резервних кодів: <strong>{{count}}</strong>."
+        manage: "Керувати резервними кодами. У вас залишилося резервних кодів: <strong>%{count}</strong>."
         copy_to_clipboard: "Скопіювати в буфер"
         copy_to_clipboard_error: "Помилка під час копіювання даних у буфер обміну"
         copied_to_clipboard: "Скопійовано у буфер обміну"
-        remaining_codes: "У вас залишилося резервних кодів: <strong>{{count}}</strong>."
+        remaining_codes: "У вас залишилося резервних кодів: <strong>%{count}</strong>."
         use: "Використовуйте резервний код"
         enable_prerequisites: "Ви повинні увімкнути основний другий фактор, перш ніж генерувати резервні коди."
         codes:
@@ -1067,13 +1065,13 @@ uk:
         instructions: "Ніколи не показується публічно."
         ok: "Ми надішлемо Вам листа для підтвердження"
         invalid: "Будь ласка, введіть вірний email"
-        authenticated: "Вашу адресу електронної пошти підтверджено {{provider}}"
+        authenticated: "Вашу адресу електронної пошти підтверджено %{provider}"
         frequency_immediately: "Отримувати повідомлення про нові непрочитані повідомлення негайно."
         frequency:
-          one: "Ми відправимо вам лист тільки в тому випадку, якщо ви більше {{count}} хвилини перебуваєте оффлайн."
-          few: "Ми відправимо вам лист тільки в тому випадку, якщо ви не були онлайн останні {{count}} хвилин."
-          many: "Ми відправимо вам лист тільки в тому випадку, якщо ви не були онлайн останні {{count}} хвилин."
-          other: "Ми відправимо вам лист тільки в тому випадку, якщо ви не були онлайн останні {{count}} xвилин мaкcимyм,."
+          one: "Ми відправимо вам лист тільки в тому випадку, якщо ви більше %{count} хвилини перебуваєте оффлайн."
+          few: "Ми відправимо вам лист тільки в тому випадку, якщо ви не були онлайн останні %{count} хвилин."
+          many: "Ми відправимо вам лист тільки в тому випадку, якщо ви не були онлайн останні %{count} хвилин."
+          other: "Ми відправимо вам лист тільки в тому випадку, якщо ви не були онлайн останні %{count} xвилин мaкcимyм,."
       associated_accounts:
         title: "Пов’язані Облікові Записи"
         connect: "Підключити"
@@ -1093,9 +1091,9 @@ uk:
       username:
         title: "Ім'я користувача"
         instructions: "Унікальний, без пробілів і коротший"
-        short_instructions: "Користувачі можуть згадувати вас за псевдонімом @{{username}}"
+        short_instructions: "Користувачі можуть згадувати вас за псевдонімом @%{username}"
         available: "Ваше ім'я доступне"
-        not_available: "Не доступно. Спробуєте {{suggestion}}?"
+        not_available: "Не доступно. Спробуєте %{suggestion}?"
         not_available_no_suggestion: "Не доступно"
         too_short: "Ваше ім'я закоротке"
         too_long: "Ваше ім'я довге"
@@ -1115,11 +1113,11 @@ uk:
         log_out_all: "Вийти з усіх пристроїв"
         active: "активні зараз"
         not_you: "Не ви?"
-        show_all: "Показати всі ({{count}})"
+        show_all: "Показати всі (%{count})"
         show_few: "Показати менше"
         was_this_you: "Це були ви?"
         was_this_you_description: "Якщо це були не ви, рекомендуємо змінити пароль і вийти з усіх пристроїв."
-        browser_and_device: "{{browser}} на {{device}}"
+        browser_and_device: "%{browser} на %{device}"
         secure_account: "Захист мого профілю"
         latest_post: "Ваша остання активність..."
       last_posted: "Останній допис"
@@ -1199,22 +1197,21 @@ uk:
         none: "Немає запрошень для відображення."
         truncated:
           one: "перше запрошення"
-          few: "Перші {{count}} запрошення"
-          many: "Перші {{count}} запрошень"
-          other: "Перші {{count}} запрошень"
+          few: "Перші %{count} запрошення"
+          many: "Перші %{count} запрошень"
+          other: "Перші %{count} запрошень"
         redeemed: "Прийняті запрошення"
         redeemed_tab: "Прийнято"
-        redeemed_tab_with_count: "Прийняті ({{count}})"
+        redeemed_tab_with_count: "Прийняті (%{count})"
         redeemed_at: "Прийнято"
         pending: "Запрошення, що очікують"
         pending_tab: "Очікують"
-        pending_tab_with_count: "Очікують ({{count}})"
+        pending_tab_with_count: "Очікують (%{count})"
         topics_entered: "Тем переглянуто"
         posts_read_count: "Прочитано дописів"
         expired: "Термін дії цього запрошення сплив."
         rescind: "Видалити"
         rescinded: "Запрошення видалено"
-        rescind_all: "Видалити всі прострочені запрошення"
         rescinded_all: "Всі прострочені запрошення видалені!"
         rescind_all_confirm: "Ви впевнені, що хочете видалити всі прострочені запрошення?"
         reinvite: "повторити запрошення"
@@ -1225,13 +1222,18 @@ uk:
         time_read: "Час читання"
         days_visited: "Днів відвідано"
         account_age_days: "Вік облікового запису в днях"
-        create: "Надіслати Запрошення"
+        links_tab: "Посилання"
+        link_created_at: "Створено"
+        link_groups: Групи
+        create: "Надіслати запрошення"
         generate_link: "Копіювати посилання для запрошень"
         link_generated: "Запрошувальна посилання успішно створена!"
         valid_for: "Запрошувальне посилання дійсне тільки для цієї адреси електропошти:%{email}"
+        single_user: "Один користувач"
+        invite_link:
+          success: "Запрошувальна посилання успішно створена!"
         bulk_invite:
           none: "Ви ще нікого не запрошували сюди. Надішліть індивідуальні запрошення або запросіть кілька людей за раз, <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>завантаживши файл CSV</a>."
-          text: "Масове Запрошення з Файлу"
           success: "Файл успішно завантажений, ви отримаєте повідомлення, коли процес буде завершений."
           error: "Вибачте, але файл повинен бути у форматі CSV."
           confirmation_message: "Ви збираєтеся відправити запрошення електронною поштою всім в завантаженому файлі."
@@ -1338,7 +1340,7 @@ uk:
       desc:
         network: "Будь ласка, перевірте з'єднання."
         network_fixed: "Схоже, мережа з’явилася."
-        server: "Код помилки: {{status}}"
+        server: "Код помилки: %{status}"
         forbidden: "Вам не дозволено це переглядати."
         not_found: "Упс, сталася спроба завантажити неіснуюче посилання"
         unknown: "Щось пішло не так."
@@ -1395,8 +1397,8 @@ uk:
       value_prop: "Коли ви створюєте обліковий запис, ми точно пам’ятаємо, що ви прочитали, тому ви завжди повертаєтеся туди, де зупинилися. Ви також отримуєте повідомлення, тут та електронною поштою, коли хтось відповідає вам. І ви можете, в повідомленнях, поставити - мені подобається. :heartpulse:"
     summary:
       enabled_description: "Ви переглядаєте витяг з теми - тільки найцікавіші повідомлення на думку спільноти."
-      description: "Є <b>{{replyCount}}</b> відповідей."
-      description_time: "<b>{{replyCount}}</b> відповідей з передбачуваним часом прочитання близько <b>{{readingTime}} хвилин</b>."
+      description: "Є <b>%{replyCount}</b> відповідей."
+      description_time: "<b>%{replyCount}</b> відповідей з передбачуваним часом прочитання близько <b>%{readingTime} хвилин</b>."
       enable: "Підсумки цієї теми"
       disable: "Показати всі дописи"
     deleted_filter:
@@ -1409,8 +1411,8 @@ uk:
       invite: "Запросити інших..."
       edit: "Додати або Видалити..."
       leave_message: "Ви дійсно хочете залишити це повідомлення?"
-      remove_allowed_user: "Ви впевнені, що хочете видалити {{name}} з цього повідомлення?"
-      remove_allowed_group: "Ви впевнені, що хочете видалити {{name}} з цього повідомлення?"
+      remove_allowed_user: "Ви впевнені, що хочете видалити %{name} з цього повідомлення?"
+      remove_allowed_group: "Ви впевнені, що хочете видалити %{name} з цього повідомлення?"
     email: "Електронна пошта"
     username: "Ім'я користувача"
     last_seen: "Помічено востаннє"
@@ -1419,7 +1421,7 @@ uk:
     trust_level: "Рівень довіри"
     search_hint: "ім'я користувача, email або IP-адреса"
     create_account:
-      disclaimer: "Реєструючись, ви погоджуєтеся з <a href='{{privacy_link}}' target='blank'>політикою конфіденційності</a> та <a href='{{tos_link}}' target='blank'>умовами надання послуг</a>."
+      disclaimer: "Реєструючись, ви погоджуєтеся з <a href='%{privacy_link}' target='blank'>політикою конфіденційності</a> та <a href='%{tos_link}' target='blank'>умовами надання послуг</a>."
       title: "Створити Новий Обліковий Запис"
       failed: "Щось пішло не так; скоріше за все, цю електронну пошту вже зареєстровано, спробуйте посилання Забув пароль"
     forgot_password:
@@ -1478,7 +1480,7 @@ uk:
       awaiting_activation: "Ваш обліковий запис очікує на активацію. Для отримання ще одного активаційного листа використайте посилання Забув пароль."
       awaiting_approval: "Ваш обліковий запис ще не затверджено членом команди. Коли його буде активовано, Ви отримаєте електронного листа."
       requires_invite: "Даруйте, доступ до цього форуму - лише за запрошеннями."
-      not_activated: "Ви ще не можете увійти. Ми вже надіслали Вам листа для активації на скриньку <b>{{sentTo}}</b>. Будь ласка, виконайте інструкції в цьому листі, щоб активувати обліковий запис."
+      not_activated: "Ви ще не можете увійти. Ми вже надіслали Вам листа для активації на скриньку <b>%{sentTo}</b>. Будь ласка, виконайте інструкції в цьому листі, щоб активувати обліковий запис."
       not_allowed_from_ip_address: "З цієї IP адреси вхід заборонений."
       admin_not_allowed_from_ip_address: "З цієї IP адреси вхід адміністраторів заборонений."
       resend_activation_email: "Натисніть тут, щоб отримати ще один лист з активацією."
@@ -1487,7 +1489,7 @@ uk:
       change_email: "Змінити електронну скриньку"
       provide_new_email: "Вкажіть нову адресу електронної пошти, щоб задіяти його та заново вислати лист із кодом активації."
       submit_new_email: "Оновити електронну пошту"
-      sent_activation_email_again: "Ми надіслали на Вашу скриньку <b>{{currentEmail}}</b> ще один лист для активації облікового запису. Протягом кількох хвилин він має з'явитися у Вашій скриньці. Не забувайте також перевіряти теку зі спамом."
+      sent_activation_email_again: "Ми надіслали на Вашу скриньку <b>%{currentEmail}</b> ще один лист для активації облікового запису. Протягом кількох хвилин він має з'явитися у Вашій скриньці. Не забувайте також перевіряти теку зі спамом."
       sent_activation_email_again_generic: "Ми відправили ще один лист для активації. Це може зайняти кілька хвилин для того, щоб лист було доставлено; не забудьте перевірити папку зі спамом."
       to_continue: "Будь ласка Увійдіть"
       preferences: "Необхідно увійти на сайт для редагування налаштувань профілю."
@@ -1550,24 +1552,24 @@ uk:
     conditional_loading_section:
       loading: Завантаження...
     category_row:
-      topic_count: "{{count}} тем в цій категорії"
+      topic_count: "%{count} тем в цій категорії"
     select_kit:
       default_header_text: Вибрати...
       no_content: "Збігів, не знайдено"
       filter_placeholder: Пошук...
       filter_placeholder_with_any: Знайти або створити...
-      create: "Створити: '{{content}}'"
+      create: "Створити: '%{content}'"
       max_content_reached:
-        one: "Можна вибрати тільки {{count}} елемент."
-        few: "Можна вибрати тільки {{count}} елементів."
-        many: "Можна вибрати тільки {{count}} елементів."
-        other: "Можна вибрати тільки {{count}} елемент."
+        one: "Можна вибрати тільки %{count} елемент."
+        few: "Можна вибрати тільки %{count} елементів."
+        many: "Можна вибрати тільки %{count} елементів."
+        other: "Можна вибрати тільки %{count} елемент."
       min_content_not_reached:
-        one: "Введіть хоча б {{count}} елемент."
-        few: "Введіть хоча б {{count}} елементів."
-        many: "Введіть хоча б {{count}} елементів."
-        other: "Введіть хоча б {{count}} елемент."
-      invalid_selection_length: "Вибір повинен містити не менше {{count}} символів."
+        one: "Введіть хоча б %{count} елемент."
+        few: "Введіть хоча б %{count} елементів."
+        many: "Введіть хоча б %{count} елементів."
+        other: "Введіть хоча б %{count} елемент."
+      invalid_selection_length: "Вибір повинен містити не менше %{count} символів."
     date_time_picker:
       from: Від
       to: До
@@ -1594,7 +1596,7 @@ uk:
       default: Призначені для користувача смайли
     shared_drafts:
       title: "загальні Чернетки"
-      notice: "Ці теми видно тільки тим, хто може бачити <b>{{category}}</b> категорію."
+      notice: "Ці теми видно тільки тим, хто може бачити <b>%{category}</b> категорію."
       destination_category: "Категорія Призначення"
       publish: "Публікація Спільної чернетки"
       confirm_publish: "Ви впевнені, що хочете опублікувати цю чернетку?"
@@ -1614,26 +1616,26 @@ uk:
       similar_topics: "Ваша тема схожа на..."
       drafts_offline: "чернетки в офлайні"
       edit_conflict: "Редагувати конфлікт"
-      group_mentioned_limit: "<b>Увага!</b> Ви згадали <a href='{{group_link}}'>{{group}}</a>, в якій більше учасників, ніж встановлений адміністратором ліміт згадок на {{max}} користувачів. Ніхто не отримає сповіщення."
+      group_mentioned_limit: "<b>Увага!</b> Ви згадали <a href='%{group_link}'>%{group}</a>, в якій більше учасників, ніж встановлений адміністратором ліміт згадок на %{max} користувачів. Ніхто не отримає сповіщення."
       group_mentioned:
-        one: "Згадуючи групу {{group}}, ви тем самим відправите повідомлення <a href='{{group_link}}'>%{count}му користувачеві</a> - ви впевнені?"
-        few: "Згадуючи групу {{group}}, ви тим самим відправите повідомлення <a href='{{group_link}}'>{{count}} користувачам</a> - ви впевнені?"
-        many: "Згадуючи групу {{group}}, ви тим самим відправите повідомлення <a href='{{group_link}}'>{{count}} користувачам</a> - ви впевнені?"
-        other: "Згадуючи групу {{group}}, ви тим самим відправите повідомлення <a href='{{group_link}}'>{{count}} користувачам</a> - ви впевнені?"
+        one: "Згадуючи групу %{group}, ви тем самим відправите повідомлення <a href='%{group_link}'>%{count}му користувачеві</a> - ви впевнені?"
+        few: "Згадуючи групу %{group}, ви тим самим відправите повідомлення <a href='%{group_link}'>%{count} користувачам</a> - ви впевнені?"
+        many: "Згадуючи групу %{group}, ви тим самим відправите повідомлення <a href='%{group_link}'>%{count} користувачам</a> - ви впевнені?"
+        other: "Згадуючи групу %{group}, ви тим самим відправите повідомлення <a href='%{group_link}'>%{count} користувачам</a> - ви впевнені?"
       cannot_see_mention:
-        category: "Ви згадали {{username}}, але вони не одержать повідомлення, тому що у них немає доступу до цього розділу. Вам потрібно додати їх до групи, що має доступ до цього розділу."
-        private: "Ви згадали {{username}}, але вони не одержать повідомлення, тому що вони не можуть бачити це приватне повідомлення. Вам потрібно запросити їх в це PM."
-      duplicate_link: "Здається, ваше посилання на <b>{{domain}}</b> вже була раніше розміщена користувачем <b>@{{username}}</b> у <a href='{{post_url}}'>відповіді {{ago}}</a>. Ви точно хочете размістити її ще раз?"
-      reference_topic_title: "RE: {{title}}"
+        category: "Ви згадали %{username}, але вони не одержать повідомлення, тому що у них немає доступу до цього розділу. Вам потрібно додати їх до групи, що має доступ до цього розділу."
+        private: "Ви згадали %{username}, але вони не одержать повідомлення, тому що вони не можуть бачити це приватне повідомлення. Вам потрібно запросити їх в це PM."
+      duplicate_link: "Здається, ваше посилання на <b>%{domain}</b> вже була раніше розміщена користувачем <b>@%{username}</b> у <a href='%{post_url}'>відповіді %{ago}</a>. Ви точно хочете размістити її ще раз?"
+      reference_topic_title: "RE: %{title}"
       error:
         title_missing: "Заголовок є необхідним"
-        title_too_short: "Заголовок має бути мінімум {{min}} символів"
-        title_too_long: "Заголовок не може бути менше, ніж {{max}} символів"
+        title_too_short: "Заголовок має бути мінімум %{min} символів"
+        title_too_long: "Заголовок не може бути менше, ніж %{max} символів"
         post_missing: "Повідомлення не може бути порожнім"
-        post_length: "Найменший розмір допису має бути {{min}} символів"
-        try_like: "Ви пробували натиснути на {{heart}} кнопку?"
+        post_length: "Найменший розмір допису має бути %{min} символів"
+        try_like: "Ви пробували натиснути на %{heart} кнопку?"
         category_missing: "Ви повинні обрати категорію"
-        tags_missing: "Ви маєте вибрати хоча б {{count}} міток"
+        tags_missing: "Ви маєте вибрати хоча б %{count} міток"
         topic_template_not_modified: "Впишіть опис об’єкта в шаблон"
       save_edit: "Зберегти зміни"
       overwrite_edit: "Перезаписати, правити"
@@ -1731,67 +1733,67 @@ uk:
       tooltip:
         regular:
           one: "%{count} невидиме повідомлення"
-          few: "{{count}} невидимі повідомлення"
-          many: "{{count}} невидимих ​​повідомлень"
-          other: "{{count}} невидимі повідомлення"
+          few: "%{count} невидимі повідомлення"
+          many: "%{count} невидимих ​​повідомлень"
+          other: "%{count} невидимі повідомлення"
         message:
           one: "%{count} непрочитані"
-          few: "{{count}} непрочитаних повідомлень"
-          many: "{{count}} непрочитаних повідомлень"
-          other: "{{count}} непрочитаних повідомлень"
+          few: "%{count} непрочитаних повідомлень"
+          many: "%{count} непрочитаних повідомлень"
+          other: "%{count} непрочитаних повідомлень"
       title: "повідомлення при згадці @псевдоніма, відповідях на ваші пости та теми, повідомлення та т.д."
       none: "Повідомлення не можуть бути завантажені."
       empty: "Повідомлення не знайдені."
       post_approved: "Ваш пост був схвалений"
       reviewable_items: "пункти, що вимагають розгляду"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username}}, {{username2}} та %{count} інший</span> {{description}}"
-        few: "<span>{{username}}, {{username2}} та {{count}} інші</span> {{description}}"
-        many: "<span>{{username}}, {{username2}} та {{count}} інші</span> {{description}}"
-        other: "<span>{{username}}, {{username2}} та {{count}} інші</span> {{description}}"
+        one: "<span>%{username}, %{username2} та %{count} інший</span> %{description}"
+        few: "<span>%{username}, %{username2} та %{count} інші</span> %{description}"
+        many: "<span>%{username}, %{username2} та %{count} інші</span> %{description}"
+        other: "<span>%{username}, %{username2} та %{count} інші</span> %{description}"
       liked_consolidated_description:
-        one: "Сподобався {{count}} ваш пост"
-        few: "Сподобалося {{count}} ваших поста"
-        many: "Сподобалося {{count}} ваших постів"
-        other: "Сподобалося {{count}} ваших поста"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> принял ваше приглашение"
-      moved_post: "<span>{{username}}</span> moved {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Заслужив(а) '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Нова тема</span> {{description}}"
-      membership_request_accepted: "Запит на вступ прийнятий '{{group_name}}'"
-      membership_request_consolidated: "{{count}} відкрити запити на членство для &quot;{{group_name}}&quot;"
+        one: "Сподобався %{count} ваш пост"
+        few: "Сподобалося %{count} ваших поста"
+        many: "Сподобалося %{count} ваших постів"
+        other: "Сподобалося %{count} ваших поста"
+      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}"
+      invitee_accepted: "<span>%{username}</span> принял ваше приглашение"
+      moved_post: "<span>%{username}</span> moved %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "Заслужив(а) '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Нова тема</span> %{description}"
+      membership_request_accepted: "Запит на вступ прийнятий '%{group_name}'"
+      membership_request_consolidated: "%{count} відкрити запити на членство для &quot;%{group_name}&quot;"
       group_message_summary:
-        one: "{{count}} повідомлення в вашій групі: {{group_name}} "
-        few: "{{count}} повідомлень в вашій групі: {{group_name}} "
-        many: "{{count}} повідомлень в вашій групі: {{group_name}} "
-        other: "{{count}} повідомлень в вашій групі: {{group_name}} "
+        one: "%{count} повідомлення в вашій групі: %{group_name} "
+        few: "%{count} повідомлень в вашій групі: %{group_name} "
+        many: "%{count} повідомлень в вашій групі: %{group_name} "
+        other: "%{count} повідомлень в вашій групі: %{group_name} "
       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}}'
+        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}} до %{site_title}"
+        custom: "Повідомлення від %{username} до %{site_title}"
       titles:
         mentioned: "згаданий"
         replied: "нову відповідь"
@@ -1819,9 +1821,9 @@ uk:
       from_my_computer: "З мого пристрою"
       from_the_web: "З інтернету"
       remote_tip: "посилання на зображення"
-      remote_tip_with_attachments: "посилання на зображення або файл {{authorized_extensions}}"
+      remote_tip_with_attachments: "посилання на зображення або файл %{authorized_extensions}"
       local_tip: "вибрати зображення з вашого пристрою"
-      local_tip_with_attachments: "вибрати зображення або файли з вашого пристрою {{authorized_extensions}}"
+      local_tip_with_attachments: "вибрати зображення або файли з вашого пристрою %{authorized_extensions}"
       hint: "(Ви також можете перетягувати зображення в редактор, щоб їх завантажити)"
       hint_for_supported_browsers: "ви так само можете перетягнути або скопіювати зображення в редактор"
       uploading: "Завантаження"
@@ -1838,17 +1840,17 @@ uk:
       clear_all: "Скинути все"
       too_short: "Занадто коротке слово для пошуку."
       result_count:
-        one: "<span>%{count} результат для </span><span class='term'>{{term}}</span>"
-        few: "<span>{{count}} {{plus}} результатів для </span><span class='term'>{{term}}</span>"
-        many: "<span>{{count}} {{plus}} результат для </span><span class='term'>{{term}}</span>"
-        other: "<span>{{count}} {{plus}} результатів для </span><span class='term'>{{term}}</span>"
+        one: "<span>%{count} результат для </span><span class='term'>%{term}</span>"
+        few: "<span>%{count} %{plus} результатів для </span><span class='term'>%{term}</span>"
+        many: "<span>%{count} %{plus} результат для </span><span class='term'>%{term}</span>"
+        other: "<span>%{count} %{plus} результатів для </span><span class='term'>%{term}</span>"
       title: "Пошук по темам, повідомленням, псевдонімам та розділам"
       full_page_title: "пошук тем або повідомлень"
       no_results: "Нічого не знайдено."
       no_more_results: "Більше нічого не знайдено."
       searching: "Пошук ..."
-      post_format: "#{{post_number}} від {{username}}"
-      results_page: "Результати пошуку для '{{term}}'"
+      post_format: "#%{post_number} від %{username}"
+      results_page: "Результати пошуку для '%{term}'"
       more_results: "Знайдено безліч результатів. Будь ласка, уточніть, критерії пошуку."
       cant_find: "Не можете знайти потрібну інформацію?"
       start_new_topic: "Створити нову тему?"
@@ -1857,9 +1859,9 @@ uk:
       search_google_button: "Google"
       search_google_title: "Пошук на цьому сайті"
       context:
-        user: "Шукати повідомлення від @{{username}}"
-        category: "Шукати в розділі #{{category}}"
-        tag: "Шукати тег #{{tag}}"
+        user: "Шукати повідомлення від @%{username}"
+        category: "Шукати в розділі #%{category}"
+        tag: "Шукати тег #%{tag}"
         topic: "Пошук в цій темі"
         private_messages: "Шукати приватні повідомлення"
       advanced:
@@ -1935,10 +1937,10 @@ uk:
         notification_level: "Сповіщення"
         choose_new_category: "Виберіть новий розділ для цих тем:"
         selected:
-          one: "Ви вибрали <b>{{count}}</b> тему."
-          few: "Ви вибрали <b>{{count}}</b> теми."
-          many: "Ви вибрали <b>{{count}}</b> тем."
-          other: "Ви вибрали <b>{{count}}</b> тем."
+          one: "Ви вибрали <b>%{count}</b> тему."
+          few: "Ви вибрали <b>%{count}</b> теми."
+          many: "Ви вибрали <b>%{count}</b> тем."
+          other: "Ви вибрали <b>%{count}</b> тем."
         change_tags: "Замінити мітки"
         append_tags: "Додати мітки"
         choose_new_tags: "Виберіть нові мітки для цих тем:"
@@ -1951,7 +1953,7 @@ uk:
         posted: "Ви ще не дописували в жодну тему."
         latest: "Останніх тем немає. Шкода."
         bookmarks: "У вас немає обраних тем."
-        category: "В категорії {{category}} немає тем."
+        category: "В категорії %{category} немає тем."
         top: "There are no top topics."
         educate:
           new: '<p>Ваші нові теми скоро з’являться тут.</p><p>За замовчуванням, нові теми відзначаються іконкою: <span class="badge new-topic badge-notification" style="vertical-align: middle; line-height: inherit;">Нова</span>, якщо вона була створена протягом 2 тижнів.</p><p>Перейдіть в <a href="%{userPrefsUrl}">настройки</a> для того, щоб вибрати період активності нових тем.</p>'
@@ -1962,15 +1964,15 @@ uk:
         read: "Більше немає прочитаних тем."
         new: "Більше немає нових тем."
         unread: "Більше немає непрочитаних тем."
-        category: "Більше немає тем в категорії {{category}}."
+        category: "Більше немає тем в категорії %{category}."
         top: "Топових тем більше немає."
         bookmarks: "Більше немає обраних тем."
     topic:
       filter_to:
         one: "%{count} повідомлення в темі"
-        few: "{{count}} повідомлення в темі"
-        many: "{{count}} повідомлень в темі"
-        other: "{{count}} повідомлень в темі"
+        few: "%{count} повідомлення в темі"
+        many: "%{count} повідомлень в темі"
+        other: "%{count} повідомлень в темі"
       create: "Нова тема"
       create_long: "Створити нову тему"
       open_draft: "Відкрити чернетку"
@@ -1998,15 +2000,15 @@ uk:
       new: "нова тема"
       unread: "непрочитані"
       new_topics:
-        one: "{{count}} нова тема"
-        few: "{{count}} нових теми"
-        many: "{{count}} нових тем"
-        other: "{{count}} нових тем"
+        one: "%{count} нова тема"
+        few: "%{count} нових теми"
+        many: "%{count} нових тем"
+        other: "%{count} нових тем"
       unread_topics:
-        one: "{{count}} непрочитана тема"
-        few: "{{count}} непрочитані теми"
-        many: "{{count}} непрочитаних тем"
-        other: "{{count}} непрочитаних тем"
+        one: "%{count} непрочитана тема"
+        few: "%{count} непрочитані теми"
+        many: "%{count} непрочитаних тем"
+        other: "%{count} непрочитаних тем"
       title: "Тема"
       invalid_access:
         title: "Тема є приватною."
@@ -2019,33 +2021,33 @@ uk:
         title: "Тему не знайдено"
         description: "Даруйте, ми не змогли знайти цю тему. Можливо, її було видалено модератором?"
       total_unread_posts:
-        one: "у вас {{count}} непрочитане повідомлення в цій темі"
-        few: "у вас {{count}} непрочитаних повідомлення в цій темі"
-        many: "у вас {{count}} непрочитаних повідомлення в цій темі"
-        other: "у вас {{count}} непрочитаних повідомлення в цій темі"
+        one: "у вас %{count} непрочитане повідомлення в цій темі"
+        few: "у вас %{count} непрочитаних повідомлення в цій темі"
+        many: "у вас %{count} непрочитаних повідомлення в цій темі"
+        other: "у вас %{count} непрочитаних повідомлення в цій темі"
       unread_posts:
-        one: "у вас {{count}} непрочитане старе повідомлення в цій теме"
-        few: "у вас {{count}} непрочитаних старих повідомлення в цій темі"
-        many: "у вас {{count}} непрочитаних старих повідомлень в цій темі"
-        other: "у вас {{count}} непрочитаних старих повідомлень в цій темі"
+        one: "у вас %{count} непрочитане старе повідомлення в цій теме"
+        few: "у вас %{count} непрочитаних старих повідомлення в цій темі"
+        many: "у вас %{count} непрочитаних старих повідомлень в цій темі"
+        other: "у вас %{count} непрочитаних старих повідомлень в цій темі"
       new_posts:
-        one: "в цій темі {{count}} нове повідомлення з її останнього перегляду вами"
-        few: "в цій темі {{count}} нові повідомлення з її останнього перегляду вами"
-        many: "в цій темі {{count}} нових повідомлень з її останнього перегляду вами"
-        other: "в цій темі {{count}} нових повідомлень з її останнього перегляду вами"
+        one: "в цій темі %{count} нове повідомлення з її останнього перегляду вами"
+        few: "в цій темі %{count} нові повідомлення з її останнього перегляду вами"
+        many: "в цій темі %{count} нових повідомлень з її останнього перегляду вами"
+        other: "в цій темі %{count} нових повідомлень з її останнього перегляду вами"
       likes:
-        one: "в темі {{count}} лайк"
-        few: "в темі {{count}} лайка"
-        many: "в темі {{count}} лайків"
-        other: "в темі {{count}} лайків"
+        one: "в темі %{count} лайк"
+        few: "в темі %{count} лайка"
+        many: "в темі %{count} лайків"
+        other: "в темі %{count} лайків"
       back_to_list: "Повернутися до списку тем"
       options: "Налаштування теми"
       show_links: "показати посилання в цій темі"
       toggle_information: "показати/сховати деталі теми"
-      read_more_in_category: "Хочете почитати ще? Перегляньте інші теми в {{catLink}} або {{latestLink}}."
-      read_more: "Хочете почитати ще? {{catLink}} або {{latestLink}}."
-      group_request: "Вам потрібно надіслати запит на приєднання в групу `{{name}}` щоб побачити цю тему."
-      group_join: "Вам потрібно приєднатися до групи `{{name}}` щоб побачити цю тему."
+      read_more_in_category: "Хочете почитати ще? Перегляньте інші теми в %{catLink} або %{latestLink}."
+      read_more: "Хочете почитати ще? %{catLink} або %{latestLink}."
+      group_request: "Вам потрібно надіслати запит на приєднання в групу `%{name}` щоб побачити цю тему."
+      group_join: "Вам потрібно приєднатися до групи `%{name}` щоб побачити цю тему."
       group_request_sent: "Ваш запит на членство в групі був відправлений. Вам повідомлять, коли буде схвалено."
       unread_indicator: "Жоден учасник ще не прочитав останній пост цієї теми."
       read_more_MF: "У вас залишилося { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 непрочитана</a> } other { <a href='{basePath}/unread'># непрочитаних</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'>1 нова</a> тема} other { {BOTH, select, true{и } false { } other{}} <a href='{basePath}/new'># нових</a> тем} }, або {CATEGORY, select, true {подивіться інші теми в розділі {catLink}} false {{latestLink}} other {}}"
@@ -2221,29 +2223,29 @@ uk:
         choose_category: "Будь ласка, виберіть категорію для публічної теми:"
       feature_topic:
         title: "Закріпити цю тему"
-        pin: "Закріпити цю тему вгорі розділу {{categoryLink}} до"
-        confirm_pin: "У вас вже є закріплена тема в розділі ({{count}}). Перебір таких тем може виявитися неприємною незручністю для новачків та анонімних читачів. Ви впевнені, що хочете закріпити ще одну тему в цьому розділі?"
-        unpin: "Скасувати закріплення цієї теми вгорі розділу {{categoryLink}}."
-        unpin_until: "Скасувати закріплення цієї теми вгорі розділу {{categoryLink}} (станеться автоматично <strong>%{until}</strong>)."
+        pin: "Закріпити цю тему вгорі розділу %{categoryLink} до"
+        confirm_pin: "У вас вже є закріплена тема в розділі (%{count}). Перебір таких тем може виявитися неприємною незручністю для новачків та анонімних читачів. Ви впевнені, що хочете закріпити ще одну тему в цьому розділі?"
+        unpin: "Скасувати закріплення цієї теми вгорі розділу %{categoryLink}."
+        unpin_until: "Скасувати закріплення цієї теми вгорі розділу %{categoryLink} (станеться автоматично <strong>%{until}</strong>)."
         pin_note: "Користувачі можуть відкріпити тему, кожен сам для себе."
         pin_validation: "Щоб закріпити цю тему, потрібна дата."
-        not_pinned: "У розділі {{categoryLink}} немає закріплених тем."
+        not_pinned: "У розділі %{categoryLink} немає закріплених тем."
         already_pinned:
-          one: "Глобально закріплених тем в розділі {{categoryLink}}: <strong class='badge badge-notification unread'>%{count}</strong>"
-          few: "Глобально закріплених тем в розділі {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "Глобально закріплених тем в розділі {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "Глобально закріплених тем в розділі {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Глобально закріплених тем в розділі %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          few: "Глобально закріплених тем в розділі %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          many: "Глобально закріплених тем в розділі %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "Глобально закріплених тем в розділі %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Закріпити цю тему вгорі всіх розділів та списків тем до"
-        confirm_pin_globally: "У вас вже є глобально закріплені теми ({{count}}). Перебір таких тем може виявитися неприємним незручністю для новачків та анонімних читачів. Ви впевнені, що хочете глобально закріпити ще одну тему?"
+        confirm_pin_globally: "У вас вже є глобально закріплені теми (%{count}). Перебір таких тем може виявитися неприємним незручністю для новачків та анонімних читачів. Ви впевнені, що хочете глобально закріпити ще одну тему?"
         unpin_globally: "Скасувати прикріплення цієї теми вгорі всіх розділів та списків тем."
         unpin_globally_until: "Скасувати прикріплення цієї теми вгорі всіх розділів та списків тем (станеться автоматично <strong>%{until}</strong>)."
         global_pin_note: "Користувачі можуть відкріпити тему, кожен сам для себе."
         not_pinned_globally: "Немає глобально закріплених тем."
         already_pinned_globally:
           one: "Глобально закріплених тем: <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>"
+          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: "Користувачі можуть закривати оголошення, кожен сам для себе, після чого воно більше не буде для них покиваться. Тільки одна тема може бути зроблена активним оголошенням в будь-який момент часу."
@@ -2273,17 +2275,17 @@ uk:
         to_topic_username: "Ви вказали псевдонім користувача. Ми відправимо йому повідомлення з посиланням, щоб запросити його в цю тему."
         to_username: "Введіть псевдонім користувача, якого ви хочете запросити в цю тему. Ми відправимо йому повідомлення про те що ви запрошуєте його приєднатися до цієї теми."
         email_placeholder: "електронна скринька"
-        success_email: "Запрошення відправлено за адресою <b>{{emailOrUsername}}</b>. Ми повідомимо Вас, коли цим запрошенням скористаються. Перевірте вкладку Запрошення на вашій сторінці користувача, щоб дізнатися про стан всіх ваших запрошень."
+        success_email: "Запрошення відправлено за адресою <b>%{emailOrUsername}</b>. Ми повідомимо Вас, коли цим запрошенням скористаються. Перевірте вкладку Запрошення на вашій сторінці користувача, щоб дізнатися про стан всіх ваших запрошень."
         success_username: "Ми запросили цього користувача взяти участь в темі."
         error: "На жаль, ми не змогли запросити цю людину. Можливо, він уже був запрошений? (Запрошення обмежені рейтингом)"
-        success_existing_email: "Користувач з електронною поштою <b>{{emailOrUsername}}</b> вже існує. Ми запросили цього користувача взяти участь в цій темі."
+        success_existing_email: "Користувач з електронною поштою <b>%{emailOrUsername}</b> вже існує. Ми запросили цього користувача взяти участь в цій темі."
       login_reply: "Увійдіть, щоб відповісти"
       filters:
         n_posts:
-          one: "{{count}} повідомлення"
-          few: "{{count}} повідомлення"
-          many: "{{count}} повідомлень"
-          other: "{{count}} повідомлень"
+          one: "%{count} повідомлення"
+          few: "%{count} повідомлення"
+          many: "%{count} повідомлень"
+          other: "%{count} повідомлень"
         cancel: "Прибрати фільтр"
       move_to:
         title: "Перемістити у"
@@ -2296,20 +2298,20 @@ uk:
         radio_label: "Нова тема"
         error: "Під час перенесення дописів до нової теми трапилася помилка."
         instructions:
-          one: "Зараз ви створите нову тему та в неї переміститься вибране вами <b>{{count}}</b> повідомлення."
-          few: "Зараз ви створите нову тему та в неї перемістяться вибрані вами <b>{{count}}</b> повідомлення."
-          many: "Зараз ви створите нову тему та в неї перемістяться вибрані вами <b>{{count}}</b> повідомлень."
-          other: "Зараз ви створите нову тему та в неї перемістяться вибрані вами <b>{{count}}</b> повідомлень."
+          one: "Зараз ви створите нову тему та в неї переміститься вибране вами <b>%{count}</b> повідомлення."
+          few: "Зараз ви створите нову тему та в неї перемістяться вибрані вами <b>%{count}</b> повідомлення."
+          many: "Зараз ви створите нову тему та в неї перемістяться вибрані вами <b>%{count}</b> повідомлень."
+          other: "Зараз ви створите нову тему та в неї перемістяться вибрані вами <b>%{count}</b> повідомлень."
       merge_topic:
         title: "Перенесення до наявної теми"
         action: "перенести до наявної теми"
         error: "Під час перенесення дописів до цієї теми трапилася помилка."
         radio_label: "Існуюча тема"
         instructions:
-          one: "Будь ласка, виберіть тему, в яку ви хотіли б перемістити це <b>{{count}}</b> повідомлення."
-          few: "Будь ласка, виберіть тему, в яку ви хотіли б перемістити ці <b>{{count}}</b> повідомлення."
-          many: "Будь ласка, виберіть тему, в яку ви хотіли б перемістити ці <b>{{count}}</b> повідомлень."
-          other: "Будь ласка, виберіть тему, в яку ви хотіли б перемістити ці <b>{{count}}</b> повідомлень."
+          one: "Будь ласка, виберіть тему, в яку ви хотіли б перемістити це <b>%{count}</b> повідомлення."
+          few: "Будь ласка, виберіть тему, в яку ви хотіли б перемістити ці <b>%{count}</b> повідомлення."
+          many: "Будь ласка, виберіть тему, в яку ви хотіли б перемістити ці <b>%{count}</b> повідомлень."
+          other: "Будь ласка, виберіть тему, в яку ви хотіли б перемістити ці <b>%{count}</b> повідомлень."
       move_to_new_message:
         title: "Перейти до нового повідомленням"
         action: "перейти до нового повідомлення"
@@ -2318,9 +2320,9 @@ uk:
         participants: "Учасники"
         instructions:
           one: "Ви збираєтеся створити нове повідомлення та заповнити його обраним вами повідомленням."
-          few: "Ви збираєтеся створити нове повідомлення та заповнити його <b>{{count}}</b> повідомленнями, які ви вибрали."
-          many: "Ви збираєтеся створити нове повідомлення та заповнити його <b>{{count}}</b> повідомленнями, які ви вибрали."
-          other: "Ви збираєтеся створити нове повідомлення та заповнити його <b>{{count}}</b> повідомленнями, які ви вибрали."
+          few: "Ви збираєтеся створити нове повідомлення та заповнити його <b>%{count}</b> повідомленнями, які ви вибрали."
+          many: "Ви збираєтеся створити нове повідомлення та заповнити його <b>%{count}</b> повідомленнями, які ви вибрали."
+          other: "Ви збираєтеся створити нове повідомлення та заповнити його <b>%{count}</b> повідомленнями, які ви вибрали."
       move_to_existing_message:
         title: "Перейти до існуючого повідомлення"
         action: "перейти до існуючого повідомлення"
@@ -2328,9 +2330,9 @@ uk:
         participants: "Учасники"
         instructions:
           one: "Будь ласка, виберіть повідомлення, в яке ви хочете перемістити це повідомлення."
-          few: "Будь ласка, виберіть повідомлення, яке ви хочете перемістити <b>{{count}}</b> повідомлень."
-          many: "Будь ласка, виберіть повідомлення, яке ви хочете перемістити <b>{{count}}</b> повідомлень."
-          other: "Будь ласка, виберіть повідомлення, яке ви хочете перемістити <b>{{count}}</b> повідомлення."
+          few: "Будь ласка, виберіть повідомлення, яке ви хочете перемістити <b>%{count}</b> повідомлень."
+          many: "Будь ласка, виберіть повідомлення, яке ви хочете перемістити <b>%{count}</b> повідомлень."
+          other: "Будь ласка, виберіть повідомлення, яке ви хочете перемістити <b>%{count}</b> повідомлення."
       merge_posts:
         title: "З’єднати виділені повідомлення"
         action: "З’єднати виділені повідомлення"
@@ -2341,10 +2343,10 @@ uk:
         error: "Виникла помилка при зміні власника дописів."
         placeholder: "ім'я користувача нового власника"
         instructions:
-          one: "Будь ласка, виберіть нового власника для повідомлення <b>@{{old_user}}</b>"
-          few: "Будь ласка, виберіть нового власника для повідомлень <b>@{{old_user}}</b>"
-          many: "Будь ласка, виберіть нового власника для повідомлень <b>@{{old_user}}</b>"
-          other: "Будь ласка, виберіть нового власника {{count}} повідомлень для <b>@{{old_user}}</b>"
+          one: "Будь ласка, виберіть нового власника для повідомлення <b>@%{old_user}</b>"
+          few: "Будь ласка, виберіть нового власника для повідомлень <b>@%{old_user}</b>"
+          many: "Будь ласка, виберіть нового власника для повідомлень <b>@%{old_user}</b>"
+          other: "Будь ласка, виберіть нового власника %{count} повідомлень для <b>@%{old_user}</b>"
       change_timestamp:
         title: "Змінити дату..."
         action: "змінити часову мітку"
@@ -2353,7 +2355,7 @@ uk:
         instructions: "Будь ласка, виберіть нову тимчасову мітку. Повідомлення в темі будуть оновлені, щоб прибрати тимчасові відмінності."
       multi_select:
         select: "вибрати"
-        selected: "вибрано ({{count}})"
+        selected: "вибрано (%{count})"
         select_post:
           label: "вибрати"
           title: "Додати повідомлення в виділення"
@@ -2372,9 +2374,9 @@ uk:
         deselect_all: скасувати вибір всього
         description:
           one: Ви обрали <b>%{count}</b> допис.
-          few: "Ви обрали дописів: <b>{{count}}</b>."
-          many: "Ви обрали дописів: <b>{{count}}</b>."
-          other: "Ви обрали дописів: <b>{{count}}</b>."
+          few: "Ви обрали дописів: <b>%{count}</b>."
+          many: "Ви обрали дописів: <b>%{count}</b>."
+          other: "Ви обрали дописів: <b>%{count}</b>."
       deleted_by_author:
         one: "(Тема відкликана автором та буде автоматично видалена протягом %{count} години, якщо тільки на повідомлення не надійде скарга)"
         few: "(Тема відкликана автором та буде автоматично видалена протягом %{count} години, якщо тільки на повідомлення не надійде скарга)"
@@ -2383,13 +2385,13 @@ uk:
     post:
       quote_reply: "Цитата"
       edit_reason: "Причина: "
-      post_number: "допис {{number}}"
+      post_number: "допис %{number}"
       ignored: "проігнороване зміст"
       wiki_last_edited_on: "вики редагував"
       last_edited_on: "допис востаннє редаговано"
       reply_as_new_topic: "Відповісти в новій пов’язаної темі"
       reply_as_new_private_message: "Відповісти новим повідомленням тем же адресатам"
-      continue_discussion: "В продовження дискусії {{postLink}}:"
+      continue_discussion: "В продовження дискусії %{postLink}:"
       follow_quote: "перейти до цитованого допису"
       show_full: "Показати Увесь Допис"
       show_hidden: "Перегляд ігнорованого вмісту."
@@ -2402,38 +2404,38 @@ uk:
       expand_collapse: "розгорнути/згорнути"
       locked: "співробітник заблокував це повідомлення для редагування"
       gap:
-        one: "переглянути {{count}} приховану відповідь"
-        few: "переглянути {{count}} прихованих відповідей"
-        many: "переглянути {{count}} прихованих відповідей"
-        other: "переглянути {{count}} прихованих відповідей"
+        one: "переглянути %{count} приховану відповідь"
+        few: "переглянути %{count} прихованих відповідей"
+        many: "переглянути %{count} прихованих відповідей"
+        other: "переглянути %{count} прихованих відповідей"
       notice:
-        new_user: "Це перша публікація {{user}} - давайте привітаємо його в нашій спільноті!"
-        returning_user: "Минуло багато часу з тих пір, як ми бачили {{user}} - його останній пост був {{time}}."
+        new_user: "Це перша публікація %{user} - давайте привітаємо його в нашій спільноті!"
+        returning_user: "Минуло багато часу з тих пір, як ми бачили %{user} - його останній пост був %{time}."
       unread: "Допис не прочитаний"
       has_replies:
-        one: "{{count}} відповідь"
-        few: "{{count}} відповіді"
-        many: "{{count}} відповідей"
-        other: "{{count}} відповідей"
+        one: "%{count} відповідь"
+        few: "%{count} відповіді"
+        many: "%{count} відповідей"
+        other: "%{count} відповідей"
       has_likes_title:
-        one: "Це повідомлення сподобалося {{count}} людині"
-        few: "Це повідомлення сподобалося {{count}} людям"
-        many: "Це повідомлення сподобалося {{count}} людям"
-        other: "Це повідомлення сподобалося {{count}} людям"
+        one: "Це повідомлення сподобалося %{count} людині"
+        few: "Це повідомлення сподобалося %{count} людям"
+        many: "Це повідомлення сподобалося %{count} людям"
+        other: "Це повідомлення сподобалося %{count} людям"
       has_likes_title_only_you: "Вам сподобався цей повідомлення"
       has_likes_title_you:
         one: "Вам та ще %{count} людині сподобалося це повідомлення"
-        few: "Вам та ще {{count}} людям сподобалося це повідомлення"
-        many: "Вам та ще {{count}} людям сподобалося це повідомлення"
-        other: "Вам та ще {{count}} людям сподобалося це повідомлення"
+        few: "Вам та ще %{count} людям сподобалося це повідомлення"
+        many: "Вам та ще %{count} людям сподобалося це повідомлення"
+        other: "Вам та ще %{count} людям сподобалося це повідомлення"
       errors:
         create: "Даруйте, під час створення допису трапилася помилка. Будь ласка, спробуйте ще раз."
         edit: "Даруйте, під час редагування допису трапилася помилка. Будь ласка, спробуйте ще раз."
         upload: "Даруйте, під час завантаження цього файлу трапилася помилка. Будь ласка, спробуйте ще раз."
-        file_too_large: "На жаль, цей файл надто великий (максимально допустимий розмір {{max_size_kb}} КБ). Чому б не завантажити цей файл в службу хмарного обміну, а потім поділитися посиланням?"
+        file_too_large: "На жаль, цей файл надто великий (максимально допустимий розмір %{max_size_kb} КБ). Чому б не завантажити цей файл в службу хмарного обміну, а потім поділитися посиланням?"
         too_many_uploads: "Даруйте, але Ви можете одночасно завантажувати тільки один файл."
-        too_many_dragged_and_dropped_files: "Вибачте, ви можете завантажити тільки {{max}} файл."
-        upload_not_authorized: "На жаль, ви не можете завантажити файл даного типу (список дозволених типів файлів: {{authorized_extensions}})."
+        too_many_dragged_and_dropped_files: "Вибачте, ви можете завантажити тільки %{max} файл."
+        upload_not_authorized: "На жаль, ви не можете завантажити файл даного типу (список дозволених типів файлів: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Даруйте, нові користувачі не можуть завантажувати зображення."
         attachment_upload_not_allowed_for_new_user: "Даруйте, нові користувачі не можуть завантажувати прикріплення."
         attachment_download_requires_login: "Увійдіть, щоб скачувати прикріплені файли."
@@ -2473,14 +2475,14 @@ uk:
           confirm: "Ви також хочете видалити відповіді на цей пост?"
           direct_replies:
             one: "Так, та %{count} пряму відповідь"
-            few: "Так, та {{count}} прямих відповідей"
-            many: "Так, та {{count}} прямих відповідей"
-            other: "Так, та {{count}} пряму відповідь"
+            few: "Так, та %{count} прямих відповідей"
+            many: "Так, та %{count} прямих відповідей"
+            other: "Так, та %{count} пряму відповідь"
           all_replies:
             one: "Так, та %{count} відповідь"
-            few: "Так, та всі {{count}} відповіді"
-            many: "Так, та всі {{count}} відповіді"
-            other: "Так, та всі {{count}} відповіді"
+            few: "Так, та всі %{count} відповіді"
+            many: "Так, та всі %{count} відповіді"
+            other: "Так, та всі %{count} відповіді"
           just_the_post: "Ні, тільки цей допис"
         admin: "дії адміністратора над повідомленням"
         wiki: "Зробити вікі-повідомленням"
@@ -2532,15 +2534,15 @@ uk:
             many: "Прочитай це"
             other: "прочитав це"
           like_capped:
-            one: "та {{count}} сподобалося"
-            few: "і {{count}} іншим сподобалося"
-            many: "і {{count}} іншим сподобалося"
-            other: "і {{count}} іншим сподобалося"
+            one: "та %{count} сподобалося"
+            few: "і %{count} іншим сподобалося"
+            many: "і %{count} іншим сподобалося"
+            other: "і %{count} іншим сподобалося"
           read_capped:
-            one: "та {{count}} інші читають це"
-            few: "та {{count}} інші читали це"
-            many: "та {{count}} інші читали це"
-            other: "та {{count}} інші прочитали це"
+            one: "та %{count} інші читають це"
+            few: "та %{count} інші читали це"
+            many: "та %{count} інші читали це"
+            other: "та %{count} інші прочитали це"
         by_you:
           off_topic: "Ви поскаржилися на це як на недотичне до теми"
           spam: "Ви поскаржилися на це як на спам"
@@ -2552,15 +2554,15 @@ uk:
       delete:
         confirm:
           one: "Ви впевнені, що хочете видалити це повідомлення?"
-          few: "Ви впевнені, що хочете видалити {{count}} повідомлення?"
-          many: "Ви впевнені, що хочете видалити {{count}} повідомлень?"
-          other: "Ви впевнені, що хочете видалити {{count}} повідомлень?"
+          few: "Ви впевнені, що хочете видалити %{count} повідомлення?"
+          many: "Ви впевнені, що хочете видалити %{count} повідомлень?"
+          other: "Ви впевнені, що хочете видалити %{count} повідомлень?"
       merge:
         confirm:
           one: "Ви впевнені, що хочете об’єднати ці повідомлення?"
-          few: "Are you sure you want to merge those {{count}} posts?"
-          many: "Are you sure you want to merge those {{count}} posts?"
-          other: "Are you sure you want to merge those {{count}} posts?"
+          few: "Are you sure you want to merge those %{count} posts?"
+          many: "Are you sure you want to merge those %{count} posts?"
+          other: "Are you sure you want to merge those %{count} posts?"
       revisions:
         controls:
           first: "Перша версія"
@@ -2572,7 +2574,7 @@ uk:
           revert: "Відкат до цієї версії"
           edit_wiki: "редагувати Wiki"
           edit_post: "редагувати запис"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "Показати результат виведення зі змінами на місці"
@@ -2756,19 +2758,19 @@ uk:
       custom_message:
         at_least:
           one: "Введіть хоча б%{count} символ"
-          few: "Введіть хоча б {{count}} символу"
-          many: "Введіть хоча б {{count}} символів"
-          other: "Введіть хоча б {{count}} символів"
+          few: "Введіть хоча б %{count} символу"
+          many: "Введіть хоча б %{count} символів"
+          other: "Введіть хоча б %{count} символів"
         more:
           one: "Ще %{count} символ..."
-          few: "Ще хоча б {{count}} символу..."
-          many: "Ще хоча б {{count}} символів..."
-          other: "Ще хоча б {{count}} символів..."
+          few: "Ще хоча б %{count} символу..."
+          many: "Ще хоча б %{count} символів..."
+          other: "Ще хоча б %{count} символів..."
         left:
           one: "Залишилося не більше %{count} символу"
-          few: "Залишилося не більше {{count}} символів"
-          many: "Залишилося не більше {{count}} символів"
-          other: "Залишилося не більше {{count}} символів"
+          few: "Залишилося не більше %{count} символів"
+          many: "Залишилося не більше %{count} символів"
+          other: "Залишилося не більше %{count} символів"
     flagging_topic:
       title: "Дякую за допомогу в підтримці порядку!"
       action: "Поскаржитись на тему"
@@ -2816,7 +2818,7 @@ uk:
         title: "Ця тема є особистим повідомленням"
         help: "Ця тема є особистим повідомленням"
     posts: "Дописи"
-    posts_long: "тема містить {{number}} дописів"
+    posts_long: "тема містить %{number} дописів"
     posts_likes_MF: |
       В цій темі {count, plural, one {1 повідомлення} other {# повідомлень}} {ratio, select,
       low {з високим рейтингом симпатій}
@@ -2833,9 +2835,9 @@ uk:
     replies: "Відповіді"
     views_long:
       one: "тема переглянута%{count} раз"
-      few: "тема переглянута {{number}} рази"
-      many: "тема переглянута {{number}} раз"
-      other: "тема переглянута {{number}} раз"
+      few: "тема переглянута %{number} рази"
+      many: "тема переглянута %{number} раз"
+      other: "тема переглянута %{number} раз"
     activity: "Активність"
     likes: "Вподобання"
     likes_lowercase:
@@ -2843,7 +2845,7 @@ uk:
       few: "симпатій"
       many: "симпатій"
       other: "симпатій"
-    likes_long: "в цій темі {{number}} вподобань"
+    likes_long: "в цій темі %{number} вподобань"
     users: "Користувачі"
     users_lowercase:
       one: "користувач"
@@ -2852,7 +2854,7 @@ uk:
       other: "користувача"
     category_title: "Категорія"
     history: "Історія"
-    changed_by: "{{author}}"
+    changed_by: "%{author}"
     raw_email:
       title: "Вхідне повідомлення"
       not_available: "Не доступно!"
@@ -2864,43 +2866,43 @@ uk:
         title: "Останні"
         title_with_count:
           one: "Останні (%{count})"
-          few: "Останні ({{count}})"
-          many: "Останні ({{count}})"
-          other: "Останні ({{count}})"
+          few: "Останні (%{count})"
+          many: "Останні (%{count})"
+          other: "Останні (%{count})"
         help: "теми з найсвіжішими дописами"
       read:
         title: "Прочитані"
         help: "теми, які Ви прочитали, у порядку, в якому Ви їх читали востаннє"
       categories:
         title: "Категорії"
-        title_in: "Категорія - {{categoryName}}"
+        title_in: "Категорія - %{categoryName}"
         help: "всі теми, згруповані за категоріями"
       unread:
         title: "Непрочитані"
         title_with_count:
-          one: "Непрочитані ({{count}})"
-          few: "Непрочитані ({{count}})"
-          many: "Непрочитані ({{count}})"
-          other: "Непрочитані ({{count}})"
+          one: "Непрочитані (%{count})"
+          few: "Непрочитані (%{count})"
+          many: "Непрочитані (%{count})"
+          other: "Непрочитані (%{count})"
         help: "спостерігаються або відслідковують теми з непрочитаними повідомленнями"
         lower_title_with_count:
-          one: "{{count}} непрочитана"
-          few: "{{count}} непрочитаних"
-          many: "{{count}} непрочитаних"
-          other: "{{count}} непрочитаних"
+          one: "%{count} непрочитана"
+          few: "%{count} непрочитаних"
+          many: "%{count} непрочитаних"
+          other: "%{count} непрочитаних"
       new:
         lower_title_with_count:
-          one: "{{count}} нова"
-          few: "{{count}} нових"
-          many: "{{count}} нових"
-          other: "{{count}} нових"
+          one: "%{count} нова"
+          few: "%{count} нових"
+          many: "%{count} нових"
+          other: "%{count} нових"
         lower_title: "new"
         title: "Новий"
         title_with_count:
-          one: "Нові ({{count}})"
-          few: "Нові ({{count}})"
-          many: "Нові ({{count}})"
-          other: "Нові ({{count}})"
+          one: "Нові (%{count})"
+          few: "Нові (%{count})"
+          many: "Нові (%{count})"
+          other: "Нові (%{count})"
         help: "теми, створені за останні кілька днів"
       posted:
         title: "Мої дописи"
@@ -2909,13 +2911,13 @@ uk:
         title: "Закладки"
         help: "теми, які ви додали в закладки"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} ({{count}})"
-          few: "{{categoryName}} ({{count}})"
-          many: "{{categoryName}} ({{count}})"
-          other: "{{categoryName}} ({{count}})"
-        help: "Останні теми в категорії {{categoryName}}"
+          one: "%{categoryName} (%{count})"
+          few: "%{categoryName} (%{count})"
+          many: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "Останні теми в категорії %{categoryName}"
       top:
         title: "Top"
         help: "Найактивніші теми за останній рік, місяць, квартал, тиждень або день"
@@ -3068,10 +3070,10 @@ uk:
       synonyms: "Синоніми"
       synonyms_description: "Коли будуть використані наступні теги, вони будуть замінені на <b>%{base_tag_name}</b> ."
       tag_groups_info:
-        one: 'Цей тег належить до групи &quot;{{tag_groups}}&quot;.'
-        few: "Цей тег належить до цих груп: {{tag_groups}}."
-        many: "Цей тег належить до цих груп: {{tag_groups}}."
-        other: "Цей тег належить до цих груп: {{tag_groups}}."
+        one: 'Цей тег належить до групи &quot;%{tag_groups}&quot;.'
+        few: "Цей тег належить до цих груп: %{tag_groups}."
+        many: "Цей тег належить до цих груп: %{tag_groups}."
+        other: "Цей тег належить до цих груп: %{tag_groups}."
       category_restrictions:
         one: "Його можна використовувати лише в цій категорії:"
         few: "Його можна використовувати лише в таких категоріях:"
@@ -3091,15 +3093,15 @@ uk:
       delete_tag: "Вилучити мітку"
       delete_confirm:
         one: "Ви впевнені, що хочете вилучити цю мітку і прибрати її з %{count} теми, де вона використана?"
-        few: "Ви впевнені, що хочете вилучити цю мітку і прибрати її з {{count}} тем, де вона використана?"
-        many: "Ви впевнені, що хочете вилучити цю мітку і прибрати її з {{count}} тем, де вона використана?"
-        other: "Ви впевнені, що хочете вилучити цю мітку і прибрати її з {{count}} тем, де вона використана?"
+        few: "Ви впевнені, що хочете вилучити цю мітку і прибрати її з %{count} тем, де вона використана?"
+        many: "Ви впевнені, що хочете вилучити цю мітку і прибрати її з %{count} тем, де вона використана?"
+        other: "Ви впевнені, що хочете вилучити цю мітку і прибрати її з %{count} тем, де вона використана?"
       delete_confirm_no_topics: "Ви впевнені, що хочете вилучити цю мітку?"
       delete_confirm_synonyms:
         one: "Його синонім також буде видалено."
-        few: "Синоніми {{count}} також будуть видалені."
-        many: "Синоніми {{count}} також будуть видалені."
-        other: "Синоніми {{count}} також будуть видалені."
+        few: "Синоніми %{count} також будуть видалені."
+        many: "Синоніми %{count} також будуть видалені."
+        other: "Синоніми %{count} також будуть видалені."
       rename_tag: "Перейменувати мітку"
       rename_instructions: "Виберіть нову назву для мітки:"
       sort_by: "Сортувати за:"
@@ -3455,14 +3457,14 @@ uk:
           redeliver: "Повернення"
           incoming:
             one: "Є нова подія."
-            few: "{{count}} нових події."
-            many: "{{count}} нових події."
-            other: "{{count}} нових події."
+            few: "%{count} нових події."
+            many: "%{count} нових події."
+            other: "%{count} нових події."
           completed_in:
             one: "Завершиться через %{count} секунду."
-            few: "Завершиться через {{count}} секунд."
-            many: "Завершиться через {{count}} секунд."
-            other: "Завершиться через {{count}} секунд."
+            few: "Завершиться через %{count} секунд."
+            many: "Завершиться через %{count} секунд."
+            other: "Завершиться через %{count} секунд."
           request: "Запит"
           response: "відповідь"
           redeliver_confirm: "Ви впевнені, що хочете повторно відправити ті ж самі дані?"
@@ -3514,12 +3516,12 @@ uk:
           label: "Вивантажити"
           title: "Завантажити копію на сервер"
           uploading: "Вивантаження..."
-          uploading_progress: "Завантаження... {{progress}}%"
-          success: "'{{filename}}' успішно завантажений. Файл тепер обробляється та займе хвилин, щоб його рядки відбилися в списку."
-          error: "There has been an error while uploading '{{filename}}': {{message}}"
+          uploading_progress: "Завантаження... %{progress}%"
+          success: "'%{filename}' успішно завантажений. Файл тепер обробляється та займе хвилин, щоб його рядки відбилися в списку."
+          error: "There has been an error while uploading '%{filename}': %{message}"
         operations:
           is_running: "An operation is currently running..."
-          failed: "The {{operation}} failed. Please check the logs."
+          failed: "The %{operation} failed. Please check the logs."
           cancel:
             label: "Скасувати"
             title: "Cancel the current operation"
@@ -3638,7 +3640,7 @@ uk:
           disabled_component_tooltip: "Цей компонент відключений"
           default_theme_tooltip: "Ця тема є темою за замовчуванням на сайті"
           updates_available_tooltip: "Доступні оновлення для цієї теми"
-          and_x_more: "і більше {{count}}."
+          and_x_more: "і більше %{count}."
           collapse: Згорнути
           uploads: "Завантаження"
           no_uploads: "Ви можете завантажувати різні ресурси для вашого стилю, такі як шрифти та зображення"
@@ -3686,8 +3688,8 @@ uk:
           disabled_by: "Цей компонент був відключений"
           required_version:
             error: "Ця тема була автоматично відключена, тому що вона не сумісна з цією версією Discourse."
-            minimum: "Потрібна версія Discourse {{version}} або вище."
-            maximum: "Потрібна версія Discourse {{version}} або нижче."
+            minimum: "Потрібна версія Discourse %{version} або вище."
+            maximum: "Потрібна версія Discourse %{version} або нижче."
           component_of: "Компонент:"
           update_to_latest: "Оновити до останьої"
           check_for_updates: "Перевірити оновлення"
@@ -3700,9 +3702,9 @@ uk:
           empty: "Немає елементів"
           commits_behind:
             one: "Тема знаходиться на %{count} комміт позаду!"
-            few: "Тема знаходиться на {{count}} комітів позаду!"
-            many: "Тема знаходиться на {{count}} комітів позаду!"
-            other: "Тема знаходиться на {{count}} комітів позаду!"
+            few: "Тема знаходиться на %{count} комітів позаду!"
+            many: "Тема знаходиться на %{count} комітів позаду!"
+            other: "Тема знаходиться на %{count} комітів позаду!"
           compare_commits: "(Дивіться нові комміти)"
           repo_unreachable: "Не вдалося зв’язатися з Git-репозиторієм цієї теми. Повідомлення про помилку:"
           imported_from_archive: "Ця тема була імпортована з .zip файлу"
@@ -4106,8 +4108,8 @@ uk:
           title: "Відкрити e-mail цього користувача"
           text: "Показати"
       user:
-        suspend_failed: "Щось трапилося під час призупинення цього користувача: {{error}}"
-        unsuspend_failed: "Щось трапилося під час скасування призупинення цього користувача: {{error}}"
+        suspend_failed: "Щось трапилося під час призупинення цього користувача: %{error}"
+        unsuspend_failed: "Щось трапилося під час скасування призупинення цього користувача: %{error}"
         suspend_duration: "На який термін призупинити діяльність цього користувача?"
         suspend_reason_label: "Чому Ви призупиняєте цього користувача? Цей текст <b>буде видимим для всіх</b> на сторінці профілю цього користувача, і його буде показано користувачу при спробі увійти в систему. Будьте лаконічні."
         suspend_reason_hidden_label: "Чому ви призупиняєте користувача? Цей текст буде показаний користувачеві, коли він спробує увійти в систему. Будьте лаконічним."
@@ -4471,6 +4473,7 @@ uk:
         title: "Іконки"
         help: "Додати нові смайли-emoji, які будуть доступні всім. (Підказка: можна перетягувати кілька файлів за раз)"
         add: "Додати нову іконку"
+        uploading: "Завантаження…"
         name: "Ім'я"
         group: "Група"
         image: "Зображення"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index b15d697512..55994f390e 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -23,8 +23,8 @@ ur:
             mb: ایم بی
             tb: ٹی بی
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
@@ -222,11 +222,11 @@ ur:
     weekly: "ہفتہ وار "
     every_month: "ہر مہینے"
     every_six_months: "ہر چھ ماہ"
-    max_of_count: "زیادہ سے زیادہ {{count}}"
+    max_of_count: "زیادہ سے زیادہ %{count}"
     alternation: "یا "
     character_count:
-      one: "{{count}} حرف"
-      other: "{{count}} حروف"
+      one: "%{count} حرف"
+      other: "%{count} حروف"
     related_messages:
       title: "متعلقہ پیغامات"
       see_all: '@%{username} کی طرف سے <a href="%{path}">تمام پیغامات</a> دیکھیں...'
@@ -279,14 +279,14 @@ ur:
         yes_value: "جی ہاں، تَرک کریں"
         no_value: "نہیں، رکھیں"
     topic_count_latest:
-      one: "{{count}} نیا یا اَپ ڈیٹ کردہ ٹاپک دیکھیں۔"
-      other: "{{count}} نئے یا اَپ ڈیٹ کردہ ٹاپک دیکھیں۔"
+      one: "%{count} نیا یا اَپ ڈیٹ کردہ ٹاپک دیکھیں۔"
+      other: "%{count} نئے یا اَپ ڈیٹ کردہ ٹاپک دیکھیں۔"
     topic_count_unread:
-      one: "{{count}} غیر پڑھا ٹاپک دیکھیں۔"
-      other: "{{count}} غیر پڑھے ٹاپک دیکھیں۔"
+      one: "%{count} غیر پڑھا ٹاپک دیکھیں۔"
+      other: "%{count} غیر پڑھے ٹاپک دیکھیں۔"
     topic_count_new:
-      one: "{{count}} نیا ٹاپک دیکھیں۔"
-      other: "{{count}} نئے ٹاپک دیکھیں۔"
+      one: "%{count} نیا ٹاپک دیکھیں۔"
+      other: "%{count} نئے ٹاپک دیکھیں۔"
     preview: "پیشگی دیکھنا"
     cancel: "منسوخ"
     save: "تبدیلیاں محفوظ کریں"
@@ -294,7 +294,7 @@ ur:
     saved: "محفوظ کر لیا گیا ہے!"
     upload: "اَپ لوڈ"
     uploading: "اَپ لوڈ کیا جا رہا ہے..."
-    uploading_filename: "اَپ لوڈ کیا جا رہا ہے: {{filename}}..."
+    uploading_filename: "اَپ لوڈ کیا جا رہا ہے: %{filename}..."
     clipboard: "کلِپ بورڈ"
     uploaded: "اَپ لوڈ کیا جا چکا ہے!"
     pasting: "پیسٹ کیا جا رہا ہے..."
@@ -342,7 +342,7 @@ ur:
         optional: "آپ اس چیز کو کََلیم کرسکتے ہیں کہ دوسروں کو اِسکا جائزہ لینے سے روکا جا سکے۔"
         required: "اشیاء کا جائزہ لینے سے پہلے آپ کا اُن کو کََلیم کرنا ضروری ہے۔"
         claimed_by_you: "آپ نے اِس چیز کو کََلیم کر لیا ہے اور اِس کا جائزہ لے سکتے ہیں۔"
-        claimed_by_other: "اِس چیز کا صرف <b>{{username}}</b> جائزہ لے سکتا ہے۔"
+        claimed_by_other: "اِس چیز کا صرف <b>%{username}</b> جائزہ لے سکتا ہے۔"
       claim:
         title: "اِس ٹاپک کو کََلیم کریں"
       unclaim:
@@ -362,7 +362,7 @@ ur:
       view_pending: "زیرِاِلتوَاء دیکھیں"
       topic_has_pending:
         one: "اِس ٹاپک کی <b>%{count}</b> پوسٹ کی منظوری زیر التواء ہے"
-        other: "اِس ٹاپک کی <b>{{count}}</b> پوسٹس کی منظوری زیر التواء ہے"
+        other: "اِس ٹاپک کی <b>%{count}</b> پوسٹس کی منظوری زیر التواء ہے"
       title: "جائزہ لیں"
       topic: "ٹاپک:"
       filtered_topic: "آپ نے ایک ٹاپک میں قابل تجدید مواد کو فِلٹر کر دیا ہے۔"
@@ -378,17 +378,17 @@ ur:
         fields: "فیلڈز"
       user_percentage:
         summary:
-          one: "{{agreed}}، {{disagreed}}، {{ignored}} ({{count}} کُل فلَیگ)"
-          other: "{{agreed}}، {{disagreed}}، {{ignored}} ({{count}} کُل فلَیگز)"
+          one: "%{agreed}، %{disagreed}، %{ignored} (%{count} کُل فلَیگ)"
+          other: "%{agreed}، %{disagreed}، %{ignored} (%{count} کُل فلَیگز)"
         agreed:
-          one: "{{count}}٪ متفق"
-          other: "{{count}}٪ متفق"
+          one: "%{count}٪ متفق"
+          other: "%{count}٪ متفق"
         disagreed:
-          one: "{{count}}٪ عدم اتفاق"
-          other: "{{count}}٪ عدم اتفاق"
+          one: "%{count}٪ عدم اتفاق"
+          other: "%{count}٪ عدم اتفاق"
         ignored:
-          one: "{{count}}٪ نظر انداز"
-          other: "{{count}}٪ نظر انداز"
+          one: "%{count}٪ نظر انداز"
+          other: "%{count}٪ نظر انداز"
       topics:
         topic: "ٹاپک"
         reviewable_count: "شمار"
@@ -398,10 +398,10 @@ ur:
         details: "تفصیلات"
         unique_users:
           one: "%{count} صارف"
-          other: "{{count}} صارفین"
+          other: "%{count} صارفین"
       replies:
         one: "%{count} جواب"
-        other: "{{count}} جوابات"
+        other: "%{count} جوابات"
       edit: "ترمیم"
       save: "محفوظ کریں"
       cancel: "منسوخ"
@@ -464,22 +464,22 @@ ur:
         description: "ہمیں آپ کی نئی پوسٹ موصول ہو چکی ہے لیکن یہ ظاہر ہونے سے پہلے ایک منتظم سے منظور ہونا ضروری ہے۔ براہ مہربانی صبر کریں۔"
         pending_posts:
           one: "آپ کی <strong>%{count}</strong> پوسٹ زیرِاِلتوَاء ہے۔"
-          other: "آپ کی <strong>{{count}}</strong> پوسٹس زیرِاِلتوَاء ہیں۔"
+          other: "آپ کی <strong>%{count}</strong> پوسٹس زیرِاِلتوَاء ہیں۔"
         ok: "ٹھیک"
     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> پوسٹ کیا"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> نے <a href='{{postUrl}}'>{{post_number}}</a> کا جواب دیا"
-      you_replied_to_post: "<a href='{{userUrl}}'>آپ</a> نے <a href='{{postUrl}}'>{{post_number}}</a> کا جواب دیا"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> نے <a href='{{topicUrl}}'>ٹاپک</a> کا جواب دیا"
-      you_replied_to_topic: "<a href='{{userUrl}}'>آپ</a> نے <a href='{{topicUrl}}'>ٹاپک</a> کا جواب دیا"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> نے <a href='{{user2Url}}'>{{another_user}}</a> کا ذکر کیا"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> نے <a href='{{user2Url}}'>آپ</a> کا ذکر کیا"
-      you_mentioned_user: "<a href='{{user1Url}}'>آپ</a> نے <a href='{{user2Url}}'>{{another_user}}</a> کا ذکر کیا"
-      posted_by_user: "<a href='{{userUrl}}'>{{user}}</a> نے پوسٹ کیا"
-      posted_by_you: "<a href='{{userUrl}}'>آپ</a> نے پوسٹ کیا"
-      sent_by_user: "<a href='{{userUrl}}'>{{user}}</a> نے بھیجا"
-      sent_by_you: "<a href='{{userUrl}}'>آپ</a> نے بھیجا"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> نے <a href='%{topicUrl}'>ٹاپک</a> پوسٹ کیا"
+      you_posted_topic: "<a href='%{userUrl}'>آپ</a> نے <a href='%{topicUrl}'>ٹاپک</a> پوسٹ کیا"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> نے <a href='%{postUrl}'>%{post_number}</a> کا جواب دیا"
+      you_replied_to_post: "<a href='%{userUrl}'>آپ</a> نے <a href='%{postUrl}'>%{post_number}</a> کا جواب دیا"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> نے <a href='%{topicUrl}'>ٹاپک</a> کا جواب دیا"
+      you_replied_to_topic: "<a href='%{userUrl}'>آپ</a> نے <a href='%{topicUrl}'>ٹاپک</a> کا جواب دیا"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> نے <a href='%{user2Url}'>%{another_user}</a> کا ذکر کیا"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> نے <a href='%{user2Url}'>آپ</a> کا ذکر کیا"
+      you_mentioned_user: "<a href='%{user1Url}'>آپ</a> نے <a href='%{user2Url}'>%{another_user}</a> کا ذکر کیا"
+      posted_by_user: "<a href='%{userUrl}'>%{user}</a> نے پوسٹ کیا"
+      posted_by_you: "<a href='%{userUrl}'>آپ</a> نے پوسٹ کیا"
+      sent_by_user: "<a href='%{userUrl}'>%{user}</a> نے بھیجا"
+      sent_by_you: "<a href='%{userUrl}'>آپ</a> نے بھیجا"
     directory:
       filter_name: "صارفین کے ناموں کے حساب سے فلٹر کریں"
       title: "صارفین"
@@ -709,7 +709,7 @@ ur:
     user_fields:
       none: "(ایک آپشن منتخب کریں)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "پروفائل"
       mute: "خاموش کردیں"
       edit: "ترجیحات میں ترمیم کردیں"
@@ -778,12 +778,12 @@ ur:
       enable_quoting: "روشنی ڈالے گئے ٹَیکسٹ کے لئے اقتباسی جواب فعال کریں"
       enable_defer: "ٹاپکس کو بغیر پڑھا نشان زد کرنے کیلئے ملتوی فعال کریں"
       change: "بدلیں"
-      moderator: "{{user}} ایک ماڈریٹر ہے"
-      admin: "{{user}} ایک ایڈمِن ہے"
+      moderator: "%{user} ایک ماڈریٹر ہے"
+      admin: "%{user} ایک ایڈمِن ہے"
       moderator_tooltip: "یہ صارف ایک ماڈریٹر ہے"
       admin_tooltip: "یہ صارف ایک ایڈمِن ہے"
       silenced_tooltip: "یہ صارف خاموش کیا ہوا ہے"
-      suspended_notice: "یہ صارف {{date}} تک معطل ہے۔"
+      suspended_notice: "یہ صارف %{date} تک معطل ہے۔"
       suspended_permanently: "یہ صارف معطل ہے۔"
       suspended_reason: "وجہ:"
       github_profile: "گِٹ حَب"
@@ -796,7 +796,7 @@ ur:
           خاموش کردہ ٹاپک اور زمرہ جات اِن اِیمیلز میں شامل نہیں ہیں۔
         individual: "ہر نئی پوسٹ پر ایک ای میل بھیجیں"
         individual_no_echo: "میری اپنی کے سوا، ہر نئی پوسٹ پر ایک ای میل بھیجیں"
-        many_per_day: "ہر نئی پوسٹ پر ایک ای میل بھیجیں (تقریباً {{dailyEmailEstimate}} فی دن)"
+        many_per_day: "ہر نئی پوسٹ پر ایک ای میل بھیجیں (تقریباً %{dailyEmailEstimate} فی دن)"
         few_per_day: "ہر نئی پوسٹ پر ایک ای میل بھیجیں (تقریبا 2 فی دن)"
         warning: "میلنگ لسٹ موڈ فعال ہے۔ ایمَیل نوٹیفیکیشن کی ترتیبات منسوخ ہوگئی ہیں۔"
       tag_settings: "ٹیگز"
@@ -826,9 +826,7 @@ ur:
       admin_delete: "حذف کریں"
       users: "صارفین"
       muted_users: "خاموش کِیا ہوا"
-      muted_users_instructions: "اِن صارفین کی طرف سے تمام اطلاعات کو روکیں۔"
       ignored_users: "نظر انداز کردہ"
-      ignored_users_instructions: "اِن صارفین کی طرف سے تمام پوسٹس اور اطلاعات کو دبائیں۔"
       tracked_topics_link: "دکھائیں"
       automatically_unpin_topics: "جب میں سب سے نیچے تک پہنچوں تو خود کار طریقے سے ٹاپک سے پن ہٹایں۔"
       apps: "ایپس"
@@ -881,11 +879,11 @@ ur:
         disable: "غیر فعال کریں"
         enable: "فعال کریں"
         enable_long: "بیک اپ کوڈ فعال کریں"
-        manage: "بیک اپ کوڈز کا انتظام کریں۔ آپ کے پاس <strong>{{count}}</strong> بیک اپ کوڈ باقی ہیں۔"
+        manage: "بیک اپ کوڈز کا انتظام کریں۔ آپ کے پاس <strong>%{count}</strong> بیک اپ کوڈ باقی ہیں۔"
         copy_to_clipboard: "کلِپ بورڈ میں کاپی کریں"
         copy_to_clipboard_error: "کلِپ بورڈ میں ڈیٹا کاپی کرنے پر خرابی کا سامنا کر نا پرا"
         copied_to_clipboard: "کلِپ بورڈ میں کاپی کر لیا گیا"
-        remaining_codes: "آپ کے پاس <strong>{{count}}</strong> بیک اپ کوڈ باقی ہیں۔"
+        remaining_codes: "آپ کے پاس <strong>%{count}</strong> بیک اپ کوڈ باقی ہیں۔"
         enable_prerequisites: "بیک اپ کوڈز تیار کرنے سے پہلے آپ کا ایک بنیادی دوسرا فیکٹر فعال کرنا ضروری ہے۔"
         codes:
           title: "بیک اپ کوڈز تیار"
@@ -952,11 +950,11 @@ ur:
         instructions: "کبھی بھی عوام کو دکھایا نہیں گیا۔"
         ok: "ہم تصدیق کے لئے آپ کو اِی میل کریں گے"
         invalid: "براہ کرم، ایک قابلِ قبول ایِ میل ایڈریس درج کریں"
-        authenticated: "آپ کے اِی میل کی توثیق کر دی گئی ہے {{provider}}"
+        authenticated: "آپ کے اِی میل کی توثیق کر دی گئی ہے %{provider}"
         frequency_immediately: "جس بارے میں ہم آپ کو اِی میل کر رہے ہیں، اگر آپ نے نہیں پڑھی ہوئی تو ہم فوری طور پر آپ کو اِی میل کریں گے۔"
         frequency:
           one: "ہم آپ کو اِی میل کریں گے صرف اُس صور میں کہ ہم نے آپ کو گزشتہ ایک منٹ میں نہ دیکھا ہو۔"
-          other: "ہم آپ کو اِی میل کریں گے صرف اُس صور میں کہ ہم نے آپ کو گزشتہ {{count}} منٹ میں نہ دیکھا ہو۔"
+          other: "ہم آپ کو اِی میل کریں گے صرف اُس صور میں کہ ہم نے آپ کو گزشتہ %{count} منٹ میں نہ دیکھا ہو۔"
       associated_accounts:
         title: "ایسوسی ایٹ اکاؤنٹس"
         connect: "کنَیکٹ"
@@ -976,9 +974,9 @@ ur:
       username:
         title: "صارف کا نام"
         instructions: "منفرد، کوئی خالی جگہ نہیں، مختصر"
-        short_instructions: "لوگ آپ کا زکر @{{username}} کے طور پر کر سکتے ہیں"
+        short_instructions: "لوگ آپ کا زکر @%{username} کے طور پر کر سکتے ہیں"
         available: "آپ کا صارف نام دستیاب ہے"
-        not_available: "دستیاب نہیں۔ اِستعمال کریں {{suggestion}}؟"
+        not_available: "دستیاب نہیں۔ اِستعمال کریں %{suggestion}؟"
         not_available_no_suggestion: "دستیاب نہیں"
         too_short: "آپ کا صارف نام بہت چھوٹا ہے"
         too_long: "آپ کا صارف نام بہت طویل ہے"
@@ -998,11 +996,11 @@ ur:
         log_out_all: "تمام کو لاگ آُوٹ کریں"
         active: "ابھی فعال"
         not_you: "آپ نہیں؟"
-        show_all: "تمام دکھائیں ({{count}})"
+        show_all: "تمام دکھائیں (%{count})"
         show_few: "کم دکھائیں"
         was_this_you: "کیا یہ آپ تھے؟"
         was_this_you_description: "اگر یہ آپ نہیں تھے، تو ہم آپ کو اپنا پاسورڈ تبدیل کرنے اور ہر جگہ سے لاگ آُوٹ کرنے کی تجویز کرتے ہیں۔"
-        browser_and_device: "{{device}} پر {{browser}}"
+        browser_and_device: "%{device} پر %{browser}"
         secure_account: "میرا اکاؤنٹ محفوظ کریں"
         latest_post: "آپ نے آخری دفعہ پوسٹ کیا..."
       last_posted: "آخری پوسٹ"
@@ -1081,20 +1079,19 @@ ur:
         none: "ظاہر کرنے کے لئے کوئی دعوتیں نہیں ہیں۔"
         truncated:
           one: "پہلی دعوت دکھائی جا رہی ہیں۔"
-          other: "پہلی {{count}} دعوتیں دکھائی جا رہی ہیں۔"
+          other: "پہلی %{count} دعوتیں دکھائی جا رہی ہیں۔"
         redeemed: "دعوتیں جِن سے فائدہ اٹھا لیا گیا ہے"
         redeemed_tab: "فائدہ اٹھا لیا گیا"
-        redeemed_tab_with_count: "فائدہ اٹھا لیا گیا ({{count}})"
+        redeemed_tab_with_count: "فائدہ اٹھا لیا گیا (%{count})"
         redeemed_at: "فائدہ اٹھا لیا گیا"
         pending: "زیرِاِلتوَاء دعوتیں"
         pending_tab: "زیرِاِلتوَاء"
-        pending_tab_with_count: "زیرِاِلتوَاء ({{count}})"
+        pending_tab_with_count: "زیرِاِلتوَاء (%{count})"
         topics_entered: " دیکھ لیے گئے ٹاپک"
         posts_read_count: "پڑھی گئیں پوسٹس"
         expired: "اِس دعوت کی میعاد ختم ہو چکی ہے۔"
         rescind: "خارج کریں"
         rescinded: "دعوت خارج کر دی گئی"
-        rescind_all: "تمام میعاد ختم ہوئی دعوتیں منسوخ کر دیں"
         rescinded_all: "تمام میعاد ختم ہوئی دعوتیں منسوخ کر دی گئیں!"
         rescind_all_confirm: "کیا آپ واقعی تمام میعاد ختم ہوئی دعوتیں منسوخ کر دینا چاہتے ہیں؟"
         reinvite: "دعوت دوبارہ بھیجیں"
@@ -1105,13 +1102,17 @@ ur:
         time_read: "پڑھنے کیلئے اِستعمال ہونے والا وقت"
         days_visited: "دورہ کیے گئے دن"
         account_age_days: "دنوں میں اکاؤنٹ کی عمر"
-        create: "ایک دعوت بھیجیں"
+        links_tab: "لنکس"
+        link_created_at: "بنایا گیا"
+        link_groups: گروپس
+        create: "دعوت بھیجیں"
         generate_link: "دعوت لنک کاپی کریں"
         link_generated: "دعوت لنک کامیابی سے بن گیا!"
         valid_for: "دعوت لنک صرف اِس اِی میل اِیڈریس کے لئے درست ہے:%{email}"
+        invite_link:
+          success: "دعوت لنک کامیابی سے بن گیا!"
         bulk_invite:
           none: "آپ نے یہاں ابھی تک کسی کو بھی مدعو نہیں کیا۔ انفرادی طار پر دعوت نامے ارسال کریں، یا <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>ایک CSV فائل اَپ لوڈ کرکے</a> ایک وقت میں ہی بہت سے لوگوں کو دعوت دیں۔"
-          text: "فائل کی مدد سے ایک وقت میں بہت سے لوگوں کو دعوت دیں"
           success: "فائل کامیابی سے اَپ لوڈ کر دی گئی، عمل مکمل ہونے پر آپ کو پیغام کے ذریعے مطلع کر دیا جائے گا۔"
           error: "معذرت، فائل CSV فارمیٹ میں ہونا ضروری ہے۔"
           confirmation_message: "آپ اَپ لوڈ شدہ فائل میں موجود سبھی کو دعوت نامے ایمیل کرنے لگے ہیں۔"
@@ -1202,7 +1203,7 @@ ur:
       desc:
         network: " براہِ مہربانی اپنا کنکشن چیک کریں"
         network_fixed: "لگتا ہے یہ وآپس آ گیا"
-        server: "خرابی کوڈ: {{status}}"
+        server: "خرابی کوڈ: %{status}"
         forbidden: "آپ کو یہ دیکھنے کی اجازت نہیں ہے۔"
         not_found: "افوہ، ایپلیکیشن نے ایک ایسے URL کو لوڈ کرنے کی کوشش جو غیر موجود ہے۔"
         unknown: "کچھ غلط ہو گیا۔"
@@ -1252,8 +1253,8 @@ ur:
       value_prop: "جب آپ ایک اکاؤنٹ بناتے ہیں، ہم بالکل یاد رکھتے ہیں کہ آپ نے کیا پڑھا ہے، تاکہ جہاں سے آپ نے پڑھنا چھوڑا ہو بلکل وہاں ہی پر آپ کو ہمیشہ واپس پہنچایا جا سکے۔ جب بھی کوئی آپ کو جواب دیتا ہے، آپ کو یہاں اور اِی میل پر اطلاع بھی دے دی جاتی ہے۔ اور آپ محبت کو بانٹںے کیلئے پوسٹ لائیک کر سکتے ہیں۔ :heartpulse:"
     summary:
       enabled_description: "آپ اس ٹاپک کا خلاصہ ملاحظہ کررہے ہیں: سب سے دلچسپ پوسٹ کمیونٹی کی طرف سے متعین کی جاتی ہیں۔"
-      description: "<b>{{replyCount}}<b/> جوابات موجود ہیں۔"
-      description_time: "<b>{{replyCount}}</b> جوابات موجود ہیں جن کو پڑھنے کے وقت کا تخمینہ < {{readingTime}} </b منٹ<b> ہے۔"
+      description: "<b>%{replyCount}<b/> جوابات موجود ہیں۔"
+      description_time: "<b>%{replyCount}</b> جوابات موجود ہیں جن کو پڑھنے کے وقت کا تخمینہ < %{readingTime} </b منٹ<b> ہے۔"
       enable: "اس ڑاپک کا خلاصہ کریں"
       disable: "تمام پوسٹیں دکھائیں"
     deleted_filter:
@@ -1266,8 +1267,8 @@ ur:
       invite: "دوسروں کو مدعو کریں ..."
       edit: "شامل کریں یا ہٹائیں ..."
       leave_message: "کیا آپ واقعی یہ پیغام بھیجنا چاہتے ہیں؟"
-      remove_allowed_user: "کیا آپ واقعی اِس پیغام سے {{name}} ہٹانا چاہتے ہیں؟"
-      remove_allowed_group: "کیا آپ واقعی اِس پیغام سے {{name}} ہٹانا چاہتے ہیں؟"
+      remove_allowed_user: "کیا آپ واقعی اِس پیغام سے %{name} ہٹانا چاہتے ہیں؟"
+      remove_allowed_group: "کیا آپ واقعی اِس پیغام سے %{name} ہٹانا چاہتے ہیں؟"
     email: "اِی میل"
     username: "صارف نام"
     last_seen: "دیکھا گیا"
@@ -1276,7 +1277,7 @@ ur:
     trust_level: "ٹرسٹ لَیول"
     search_hint: "صارف نام، ای میل یا IP ایڈریس"
     create_account:
-      disclaimer: "رجسٹر کرنے پر آپ <a href='{{privacy_link}}' target='blank'>پرائیوِیسی پالیسی</a> اور <a href='{{tos_link}}' target='blank'>سروس کی شرائط</a> سے اتفاق کرتے ہیں۔"
+      disclaimer: "رجسٹر کرنے پر آپ <a href='%{privacy_link}' target='blank'>پرائیوِیسی پالیسی</a> اور <a href='%{tos_link}' target='blank'>سروس کی شرائط</a> سے اتفاق کرتے ہیں۔"
       title: "نیا اکاؤنٹ بنائیں"
       failed: "کچھ غلط ہو گیا، شاید یہ ای میل پہلے ہی سے رجسٹرڈ ہے، پاسورڈ بھول جانے والا لنک اِستعمال کر کے دیکھیں"
     forgot_password:
@@ -1325,7 +1326,7 @@ ur:
       awaiting_activation: "آپ کا اکاؤنٹ ایکٹیویشن کا انتظار کر رہا ہے، \"پاسورڈ بھول جانے\" والا لنک استعمال کر کہ ایک اور ایکٹیویشن اِی میل جاری کریں۔"
       awaiting_approval: "آپ کا اکاؤنٹ ابھی تک عملے کے کسی رکن کی طرف سے منظور نہیں کیا گیا۔ جب یہ منظوری مل جائے گی تو آپ کو ایک ای میل بھیج دی جائے گی۔"
       requires_invite: "معذرت، اس فورم تک رسائی صرف دعوت کے زریعے ممکن ہے۔"
-      not_activated: "ابھی آپ لاگ ان نہیں کر سکتے۔ ہم پہلے آپ کو ایک ایکٹیویشن اِی میل <b>{{sentTo}}</b> پر بھیج چکے ہیں۔ براہ مہربانی، اپنے اکاؤنٹ کو چالو کرنے کے لئے اُس اِی میل میں دی گئی ہدایات پر عمل کریں۔"
+      not_activated: "ابھی آپ لاگ ان نہیں کر سکتے۔ ہم پہلے آپ کو ایک ایکٹیویشن اِی میل <b>%{sentTo}</b> پر بھیج چکے ہیں۔ براہ مہربانی، اپنے اکاؤنٹ کو چالو کرنے کے لئے اُس اِی میل میں دی گئی ہدایات پر عمل کریں۔"
       not_allowed_from_ip_address: "آپ اِس آئی پی ایڈریس سے لاگ اِن نہیں ہو سکتے۔"
       admin_not_allowed_from_ip_address: "آپ ایڈمن کے طور پر اِس آئی پی ایڈریس سے لاگ اِن نہیں ہو سکتے۔"
       resend_activation_email: "دوبارہ ایکٹیویشن ای میل بھیجنے کے لئے یہاں کلک کریں۔"
@@ -1334,7 +1335,7 @@ ur:
       change_email: "اِیمیل ایڈریس تبدیل کریں"
       provide_new_email: "ایک نیا ایڈریس فراہم کریں اور ہم آپ کی تصدیقی ای میل دوبارہ بھیجیں گے۔"
       submit_new_email: "اِیمیل ایڈریس اَپ ڈَیٹ کریں"
-      sent_activation_email_again: "ہم نے آپ کو <b>{{currentEmail}}</b> پر ایک اور ایکٹیویشن اِی میل بھیجی ہے۔ اسے پہنچنے میں چند منٹ لگ سکتے ہیں؛ اپنے سپیم فولڈر کو چیک کرنا نہ بھولیے گا۔"
+      sent_activation_email_again: "ہم نے آپ کو <b>%{currentEmail}</b> پر ایک اور ایکٹیویشن اِی میل بھیجی ہے۔ اسے پہنچنے میں چند منٹ لگ سکتے ہیں؛ اپنے سپیم فولڈر کو چیک کرنا نہ بھولیے گا۔"
       sent_activation_email_again_generic: "ہم نے ایک اور ایکٹیویشن اِی میل بھیجی ہے۔ اسے پہنچنے میں چند منٹ لگ سکتے ہیں؛ اپنے سپیم فولڈر کو چیک کرنا نہ بھولیے گا۔"
       to_continue: "برائے مہربانی لاگ اِن کریں"
       preferences: "آپ کا اپنی صارف ترجیحات کو تبدیل کرنے کے لیے لاگ اِن ہونا ضروری ہے۔"
@@ -1396,19 +1397,19 @@ ur:
     conditional_loading_section:
       loading: لوڈ ہو رہا ہے...
     category_row:
-      topic_count: "اِس زمرہ میں {{count}} ٹاپک "
+      topic_count: "اِس زمرہ میں %{count} ٹاپک "
     select_kit:
       default_header_text: منتخب کریں...
       no_content: کوئی میل نہیں ملے
       filter_placeholder: تلاش کریں...
       filter_placeholder_with_any: تلاش کریں یا تخلیق کریں...
-      create: "'{{content}}' بنائیں"
+      create: "'%{content}' بنائیں"
       max_content_reached:
-        one: "آپ صرف {{count}} چیز منتخب کرسکتے ہیں۔"
-        other: "آپ صرف {{count}} اشیاء منتخب کرسکتے ہیں۔"
+        one: "آپ صرف %{count} چیز منتخب کرسکتے ہیں۔"
+        other: "آپ صرف %{count} اشیاء منتخب کرسکتے ہیں۔"
       min_content_not_reached:
-        one: "کم از کم {{count}} چیز منتخب کریں۔"
-        other: "کم از کم {{count}} اشیاء منتخب کریں۔"
+        one: "کم از کم %{count} چیز منتخب کریں۔"
+        other: "کم از کم %{count} اشیاء منتخب کریں۔"
     date_time_picker:
       from: سے
       to: کیلئے
@@ -1435,7 +1436,7 @@ ur:
       default: اپنی مرضی کے اِیمَوجی
     shared_drafts:
       title: "مشترکہ ڈرافٹس"
-      notice: "یہ ٹاپک صرف اُن لوگوں کیلئے نظر آتا ہے جو <b>{{category}}</b> زُمرَہ کو دیکھ سکتے ہیں۔"
+      notice: "یہ ٹاپک صرف اُن لوگوں کیلئے نظر آتا ہے جو <b>%{category}</b> زُمرَہ کو دیکھ سکتے ہیں۔"
       destination_category: "مطلوبہ زُمرَہ"
       publish: "مشترکہ ڈرافٹس شائع کریں"
       confirm_publish: "کیا آپ واقعی اِس ڈرافٹ کو شائع کرنا چاہتے ہیں؟"
@@ -1455,24 +1456,24 @@ ur:
       similar_topics: "آپ کا ٹاپک ملتا ہے..."
       drafts_offline: "ڈرافٹس آف لائن"
       edit_conflict: "ترامیم میں تصادم"
-      group_mentioned_limit: "<b>انتباہ!</b> آپ نے <a href='{{group_link}}'>{{group}}</a> کا ذکر کیا ہے، تاہم اس گروپ کے ممبران کی تعداد، منتظم کی طرف سے مقرر کردہ {{max}} صارفین کے ذکر کی حد سے زیادہ ہے ۔ کسی کو بھی اطلاع نہیں دی جائے گی۔"
+      group_mentioned_limit: "<b>انتباہ!</b> آپ نے <a href='%{group_link}'>%{group}</a> کا ذکر کیا ہے، تاہم اس گروپ کے ممبران کی تعداد، منتظم کی طرف سے مقرر کردہ %{max} صارفین کے ذکر کی حد سے زیادہ ہے ۔ کسی کو بھی اطلاع نہیں دی جائے گی۔"
       group_mentioned:
-        one: "{{group}} کا ذکر کر کہ، آپ <a href='{{group_link}}'>%{count} شخص</a> کو مطلع کرنے لگے ہیں - کیا آپ واقعی یہ کرنا چاہتے ہیں؟"
-        other: "{{group}} کا ذکر کر کہ، آپ <a href='{{group_link}}'>{{count}} لوگوں</a> کو مطلع کرنے لگے ہیں - کیا آپ واقعی یہ کرنا چاہتے ہیں؟"
+        one: "%{group} کا ذکر کر کہ، آپ <a href='%{group_link}'>%{count} شخص</a> کو مطلع کرنے لگے ہیں - کیا آپ واقعی یہ کرنا چاہتے ہیں؟"
+        other: "%{group} کا ذکر کر کہ، آپ <a href='%{group_link}'>%{count} لوگوں</a> کو مطلع کرنے لگے ہیں - کیا آپ واقعی یہ کرنا چاہتے ہیں؟"
       cannot_see_mention:
-        category: "آپ نے {{username}} کا زکر کیا ہے لیکن چونکہ اُن کو اِس زمرے تک رسائی حاصل نہیں، اُن کو مطلع نہیں کیا جائے گا۔ آپ کو انہیں ایک ایسے گروپ میں شامل کرنے کی ضرورت ہے جسے اِس زمرے تک رسائی حاصل ہے۔"
-        private: "آپ نے {{username}} کا زکر کیا ہے لیکن چونکہ وہ یہ ذاتی پیغام نہیں دیکھ سکتے اُن کو مطلع نہیں کیا جائے گا۔ آپ کو اُنہیں اِس ذاتی پیغام میں مدعو کرنے کی ضرورت ہے۔"
-      duplicate_link: "لگتا ہے کہ آپ کا <b>{{domain}}</b> لنک <b>@{{username}}</b> نے <a href='{{post_url}}'>{{ago}} کو ٹاپک میں پہلے سے ہی ایک جواب</a> میں پوسٹ کر دیا تھا - کیا آپ واقعی یہ دوبارہ پوسٹ کرنا چاہتے ہیں؟"
-      reference_topic_title: "RE: {{title}}"
+        category: "آپ نے %{username} کا زکر کیا ہے لیکن چونکہ اُن کو اِس زمرے تک رسائی حاصل نہیں، اُن کو مطلع نہیں کیا جائے گا۔ آپ کو انہیں ایک ایسے گروپ میں شامل کرنے کی ضرورت ہے جسے اِس زمرے تک رسائی حاصل ہے۔"
+        private: "آپ نے %{username} کا زکر کیا ہے لیکن چونکہ وہ یہ ذاتی پیغام نہیں دیکھ سکتے اُن کو مطلع نہیں کیا جائے گا۔ آپ کو اُنہیں اِس ذاتی پیغام میں مدعو کرنے کی ضرورت ہے۔"
+      duplicate_link: "لگتا ہے کہ آپ کا <b>%{domain}</b> لنک <b>@%{username}</b> نے <a href='%{post_url}'>%{ago} کو ٹاپک میں پہلے سے ہی ایک جواب</a> میں پوسٹ کر دیا تھا - کیا آپ واقعی یہ دوبارہ پوسٹ کرنا چاہتے ہیں؟"
+      reference_topic_title: "RE: %{title}"
       error:
         title_missing: "عنوان درکار ہے"
-        title_too_short: "عنوان میں کم از کم {{min}} حروف ہونا ضروری ہے"
-        title_too_long: "عنوان {{max}} حروف سے زیادہ نہیں ہو سکتا"
+        title_too_short: "عنوان میں کم از کم %{min} حروف ہونا ضروری ہے"
+        title_too_long: "عنوان %{max} حروف سے زیادہ نہیں ہو سکتا"
         post_missing: "پوسٹ خالی نہیں ہو سکتی"
-        post_length: "پوسٹ میں کم از کم {{min}} حروف ہونا ضروری ہے"
-        try_like: "کیا آپ نے {{heart}} بٹن اِستعمال کیا ہے؟"
+        post_length: "پوسٹ میں کم از کم %{min} حروف ہونا ضروری ہے"
+        try_like: "کیا آپ نے %{heart} بٹن اِستعمال کیا ہے؟"
         category_missing: "ایک زمرہ کا انتخاب کرنا ضروری ہے"
-        tags_missing: "آپ کا کم از کم {{count}} ٹیگز کا انتخاب کرنا ضروری ہے"
+        tags_missing: "آپ کا کم از کم %{count} ٹیگز کا انتخاب کرنا ضروری ہے"
         topic_template_not_modified: "براہ مہربانی ٹاپک ٹَیمپلیٹ میں ترمیم کرکے اپنے ٹاپک میں تفصیلات اور مخصوصیات شامل کریں۔"
       save_edit: "ترمیم محفوظ کریں"
       overwrite_edit: "دوسری ترمیم کے اوپر لکھ ڈالیں"
@@ -1567,56 +1568,56 @@ ur:
       tooltip:
         regular:
           one: "%{count} اندیکھی اطلاع"
-          other: "{{count}} اندیکھی اطلاعات"
+          other: "%{count} اندیکھی اطلاعات"
         message:
           one: "%{count} غیر پڑھا پیغام"
-          other: "{{count}} غیر پڑھے پیغامات"
+          other: "%{count} غیر پڑھے پیغامات"
       title: "@نام کے ذکر، آپ کی پوسٹ اور ٹاپک پر جوابات، پیغامات، وغیرہ کی اطلاعات"
       none: "اِس وقت ویب سائٹ اطلاعات لوڈ کرنے سے قاصر ہے۔"
       empty: "کوئی اطلاعات نہیں ملیں۔"
       post_approved: "آپ کی پوسٹ منظور ہو گئی تھی"
       reviewable_items: "اشیاء جن کا جائزہ لینے کی ضرورت ہے"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        one: "<span>{{username2}}، {{username}} اور %{count} مزید</span> {{description}}"
-        other: "<span>{{username2}}، {{username}} اور {{count}} مزید</span> {{description}}"
+        one: "<span>%{username2}، %{username} اور %{count} مزید</span> %{description}"
+        other: "<span>%{username2}، %{username} اور %{count} مزید</span> %{description}"
       liked_consolidated_description:
-        one: "آپ کی {{count}} پوسٹس کو لائیک کیا"
-        other: "آپ کی {{count}} پوسٹس کو لائیک کیا"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span>نے آپ کی دعوت قبول کرلی "
-      moved_post: "<span>{{username}}</span>نے {{description}} منتقل کر دیا"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "'{{description}}' حاصل کیا"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>نیا ٹاپک</span> {{description}}"
-      membership_request_accepted: "'{{group_name}}' میں رکنیت قبول کر لی گئی"
+        one: "آپ کی %{count} پوسٹس کو لائیک کیا"
+        other: "آپ کی %{count} پوسٹس کو لائیک کیا"
+      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}"
+      invitee_accepted: "<span>%{username}</span>نے آپ کی دعوت قبول کرلی "
+      moved_post: "<span>%{username}</span>نے %{description} منتقل کر دیا"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "'%{description}' حاصل کیا"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>نیا ٹاپک</span> %{description}"
+      membership_request_accepted: "'%{group_name}' میں رکنیت قبول کر لی گئی"
       group_message_summary:
-        one: "آپ کے {{group_name}} اِن باکس میں {{count}} پیغام"
-        other: "آپ کے {{group_name}} اِن باکس میں {{count}} پیغامات"
+        one: "آپ کے %{group_name} اِن باکس میں %{count} پیغام"
+        other: "آپ کے %{group_name} اِن باکس میں %{count} پیغامات"
       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}}'
+        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}} کی طرف سے %{site_title} پر اطلاعات"
+        custom: "%{username} کی طرف سے %{site_title} پر اطلاعات"
       titles:
         mentioned: "ذکر کیا گیا"
         replied: "نیا جواب"
@@ -1643,9 +1644,9 @@ ur:
       from_my_computer: "میری ڈیوائس سے"
       from_the_web: "انٹرنیٹ سے"
       remote_tip: "تصویر کا لنک"
-      remote_tip_with_attachments: "تصویر یا فائل کا لنک {{authorized_extensions}}"
+      remote_tip_with_attachments: "تصویر یا فائل کا لنک %{authorized_extensions}"
       local_tip: "اپنے ڈیوائس سے تصاویر منتخب کریں"
-      local_tip_with_attachments: "اپنے ڈیوائس سے تصاویر یا فائلیں منتخب کریں {{authorized_extensions}}"
+      local_tip_with_attachments: "اپنے ڈیوائس سے تصاویر یا فائلیں منتخب کریں %{authorized_extensions}"
       hint: "(آپ اِن کو اَپ لوڈ کرنے کیلئیے ایڈیٹر میں ڈرَیگ & ڈراپ بھی کر سکتے ہیں)"
       hint_for_supported_browsers: "آپ تصاویر کو ایڈیٹر میں ڈرَیگ & ڈراپ یا پَیسٹ بھی کر سکتے ہیں"
       uploading: "اَپ لوڈ کیا جا رہا ہے"
@@ -1662,15 +1663,15 @@ ur:
       clear_all: "تمام کو صاف کریں"
       too_short: "آپ کا سَرچ ٹَرم بہت مختصر ہے۔"
       result_count:
-        one: "<span class='term'>{{term}}</span><span>کیلئے %{count} نتیجہ</span>"
-        other: "<span class='term'>{{term}}</span><span>کیلئے {{count}}{{plus}} نتائج</span>"
+        one: "<span class='term'>%{term}</span><span>کیلئے %{count} نتیجہ</span>"
+        other: "<span class='term'>%{term}</span><span>کیلئے %{count}%{plus} نتائج</span>"
       title: "ٹاپک، پوسٹس، صارفین، یا زمرہ جات کو سَرچ کریں"
       full_page_title: "ٹاپک یا پوسٹس کو سَرچ کریں"
       no_results: "کوئی نتائج نہیں پائے گئے۔"
       no_more_results: "کوئی اور نتائج نہیں پائے گئے۔"
       searching: "تلاش کیا جا رہا ہے ..."
-      post_format: "{{username}} کی طرف سے #{{post_number}}"
-      results_page: "'{{term}}' کیلئے سرچ کے نتائج"
+      post_format: "%{username} کی طرف سے #%{post_number}"
+      results_page: "'%{term}' کیلئے سرچ کے نتائج"
       more_results: "مزید نتائج موجود ہیں۔ برائے مہربانی اپنے سرچ کے معیار کو محدود کریں۔"
       cant_find: "آپ جو ڈھونڈ رہے تھے وہ نہیں مل سکا؟"
       start_new_topic: "شاید ایک نیا ٹاپک شروع کریں؟"
@@ -1679,8 +1680,8 @@ ur:
       search_google_button: "گُوگَل"
       search_google_title: "اِس سائٹ میں تلاش کریں"
       context:
-        user: "@{{username}} کے حساب سے پوسٹس تلاش کریں"
-        category: "#{{category}} زُمرَہ میں تلاش کریں"
+        user: "@%{username} کے حساب سے پوسٹس تلاش کریں"
+        category: "#%{category} زُمرَہ میں تلاش کریں"
         topic: "اِس ٹاپک میں تلاش کریں"
         private_messages: "پیغامات میں تلاش کریں"
       advanced:
@@ -1755,7 +1756,7 @@ ur:
         choose_new_category: "ٹاپکس کیلئے نئے زمرہ کا انتخاب کریں:"
         selected:
           one: "آپ نے <b>%{count}</b> ٹاپک منتخب کیا ہے۔"
-          other: "آپ نے <b>{{count}}</b> ٹاپک منتخب کیے ہیں۔"
+          other: "آپ نے <b>%{count}</b> ٹاپک منتخب کیے ہیں۔"
         change_tags: "ٹیگز بدلیں"
         append_tags: "ٹیگز میں اضافہ کریں"
         choose_new_tags: "ان ٹاپکس کیلئے نئے ٹیگز کا انتخاب کریں:"
@@ -1768,7 +1769,7 @@ ur:
         posted: "ابھی تک آپ نے کسی ٹاپک میں پوسٹ نہیں کیا۔"
         latest: "کوئی تازہ ٹاپک موجود نہیں ہیں۔ یہ اداس کر دینے والی بات ہے۔"
         bookmarks: "ابھی تک آپ کے بُک مارک کیے ہوے کوئی ٹاپک نہیں ہیں۔"
-        category: "کوئی {{category}} کے ٹاپک موجود نہیں ہیں۔"
+        category: "کوئی %{category} کے ٹاپک موجود نہیں ہیں۔"
         top: "کوئی ٹاپ ٹاپک موجود نہیں ہیں۔"
         educate:
           new: '<p>آپ کے نئے ٹاپم یہاں ظاہر ہوتے ہیں۔</p><p>ڈیفالٹ کے طور پر، ٹاپک نئے سمجھے جاتے ہیں اور اگر وہ پچھلے 2 دن میں بنائے گئے تھے تو <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">نئے</span> کی علامت دکھائی جائے گی۔</p><p>اِس کو تبدیل کرنے کیلئے اپنی <a href="%{userPrefsUrl}">ترجیحات</a> پر جائیں۔</p>'
@@ -1779,13 +1780,13 @@ ur:
         read: "کوئی مزید پڑھ لیے گئے ٹاپک موجود نہیں ہیں۔"
         new: "کوئی مزید نئے ٹاپک موجود نہیں ہیں۔"
         unread: "کوئی مزید بغیر پڑھے ٹاپک موجود نہیں ہیں۔"
-        category: "مزید کوئی {{category}} کے ٹاپک موجود نہیں۔"
+        category: "مزید کوئی %{category} کے ٹاپک موجود نہیں۔"
         top: "مزید کوئی ٹاپ ٹاپک موجود نہیں۔"
         bookmarks: "مزید کوئی بک مارک کیے ہوئے ٹاپک موجود نہیں۔"
     topic:
       filter_to:
         one: "ٹاپک میں %{count} پوسٹ"
-        other: "ٹاپک میں {{count}} پوسٹس"
+        other: "ٹاپک میں %{count} پوسٹس"
       create: "نیا ٹاپک"
       create_long: "نیا ٹاپک بنائیں"
       open_draft: "ڈرافٹ کھولیے"
@@ -1807,10 +1808,10 @@ ur:
       unread: "بغیر پڑھے"
       new_topics:
         one: "%{count} نیا ٹاپک"
-        other: "{{count}} نئے ٹاپک"
+        other: "%{count} نئے ٹاپک"
       unread_topics:
         one: "%{count} بغیر پڑھا گیا ٹاپک"
-        other: "{{count}} بغیر پڑھے گئے ٹاپک"
+        other: "%{count} بغیر پڑھے گئے ٹاپک"
       title: "ٹاپک"
       invalid_access:
         title: "ٹاپک نجی ہے"
@@ -1824,24 +1825,24 @@ ur:
         description: "معزرت، ہم یہ ٹاپک نہیں ڈھونڈ سکے۔ شاید یہ کسی ماڈریٹر نے ہٹا دیا ہو؟"
       total_unread_posts:
         one: "آپ کے پاس اِس ٹاپک میں %{count} بغیر پڑھی پوسٹ موجود ہے"
-        other: "آپ کے پاس اِس ٹاپک میں {{count}} بغیر پڑھی پوسٹ موجود ہیں"
+        other: "آپ کے پاس اِس ٹاپک میں %{count} بغیر پڑھی پوسٹ موجود ہیں"
       unread_posts:
         one: "آپ کے پاس اِس ٹاپک میں %{count} بغیر پڑھی پرانی پوسٹ موجود ہے"
-        other: "آپ کے پاس اِس ٹاپک میں {{count}} بغیر پڑھی پرانی پوسٹ موجود ہیں"
+        other: "آپ کے پاس اِس ٹاپک میں %{count} بغیر پڑھی پرانی پوسٹ موجود ہیں"
       new_posts:
         one: "آپ کے آخری دفع یہ ٹاپک پڑھنے کے بعد %{count} نئی پوسٹ شائع ہوئی"
-        other: "آپ کے آخری دفع یہ ٹاپک پڑھنے کے بعد {{count}} نئی پوسٹ شائع ہوئیں"
+        other: "آپ کے آخری دفع یہ ٹاپک پڑھنے کے بعد %{count} نئی پوسٹ شائع ہوئیں"
       likes:
         one: "اِس ٹاپک میں %{count} لائیک ہے"
-        other: "اِس ٹاپک میں {{count}} لائیکس ہیں"
+        other: "اِس ٹاپک میں %{count} لائیکس ہیں"
       back_to_list: "واپس ٹاپک فہرست پر"
       options: "ٹاپک اختیارات"
       show_links: "اِس ٹاپک کے اندر موجود لنکس دکھایں"
       toggle_information: "ٹاپک تفصیلات ٹَوگل کریں"
-      read_more_in_category: "مزید پڑھنا چاہتے ہیں؟ {{catLink}} اور {{latestLink}} میں دوسرے ٹاپک دیکھیں۔"
-      read_more: "مزید پڑھنا چاہتے ہیں؟ {{catLink}} یا {{latestLink}}۔"
-      group_request: "آپ کو اِس ٹاپک کو دیکھنے کیلئے `{{name}}` گروپ میں رکنیت کیلئے درخواست کی ضرورت ہے"
-      group_join: "آپ کو اِس ٹاپک کو دیکھنے کیلئے `{{name}}` گروپ میں شامل ہونے کی ضرورت ہے"
+      read_more_in_category: "مزید پڑھنا چاہتے ہیں؟ %{catLink} اور %{latestLink} میں دوسرے ٹاپک دیکھیں۔"
+      read_more: "مزید پڑھنا چاہتے ہیں؟ %{catLink} یا %{latestLink}۔"
+      group_request: "آپ کو اِس ٹاپک کو دیکھنے کیلئے `%{name}` گروپ میں رکنیت کیلئے درخواست کی ضرورت ہے"
+      group_join: "آپ کو اِس ٹاپک کو دیکھنے کیلئے `%{name}` گروپ میں شامل ہونے کی ضرورت ہے"
       group_request_sent: "آپ کی گروپ میں رکنیت کی درخواست بھیج دی گئی ہے۔ اُس کے قبول ہونے پر آپ کو مطلع کر دیا جائے گا۔"
       unread_indicator: "کسی ممبر نے ابھی تک اِس ٹاپک کی آخری پوسٹ نہیں پڑھی ہے۔"
       read_more_MF: "{ UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 غیر پڑھا</a> } other { <a href='{basePath}/unread'># غیر پڑھے</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{اور } false {} other{}} <a href='{basePath}/new'>1 نیا</a> ٹاپک} other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># نئے</a> ٹاپکس} } باقی، یا {CATEGORY, select, true {میں دیگر ٹاپکس براؤز کریں {catLink}} false {{latestLink}} other {}}"
@@ -2015,25 +2016,25 @@ ur:
         choose_category: "براہ کرم پبلک ٹاپک کیلئے ایک زمرہ منتخب کریں:"
       feature_topic:
         title: "اس ٹاپک کو نمایاں کریں"
-        pin: "اِس ٹاپک کو {{categoryLink}} زمرہ کے سب سے اُپر ظاہر کریں جب تک کہ"
-        confirm_pin: "آپ کے پاس پہلے سے ہی {{count}} پِن ہوے وے ٹاپک ہیں۔ بہت سارے پِن ہوے وے ٹاپک نئے اور گمنام صارفین کے لئے ایک بوجھ ثابت ہو سکتے ہیں۔ کیا آپ واقعی اِس زمرہ میں ایک اور ٹاپک پِن کرنا چاہتے ہیں؟"
-        unpin: "اِس ٹاپک کو {{categoryLink}} زمرہ کے سب سے اُپر ظاہر کرنے سے ہٹائیں"
-        unpin_until: "اِس ٹاپک کو {{categoryLink}} زمرہ کے سب سے اُپر ظاہر کرنے سے ہٹائیں یا <strong>%{until}</strong> تک اِنتظار کریں۔"
+        pin: "اِس ٹاپک کو %{categoryLink} زمرہ کے سب سے اُپر ظاہر کریں جب تک کہ"
+        confirm_pin: "آپ کے پاس پہلے سے ہی %{count} پِن ہوے وے ٹاپک ہیں۔ بہت سارے پِن ہوے وے ٹاپک نئے اور گمنام صارفین کے لئے ایک بوجھ ثابت ہو سکتے ہیں۔ کیا آپ واقعی اِس زمرہ میں ایک اور ٹاپک پِن کرنا چاہتے ہیں؟"
+        unpin: "اِس ٹاپک کو %{categoryLink} زمرہ کے سب سے اُپر ظاہر کرنے سے ہٹائیں"
+        unpin_until: "اِس ٹاپک کو %{categoryLink} زمرہ کے سب سے اُپر ظاہر کرنے سے ہٹائیں یا <strong>%{until}</strong> تک اِنتظار کریں۔"
         pin_note: "صارفین خود سے انفرادی طور پر ٹاپک سے پن ہٹا سکتے ہیں۔"
         pin_validation: "اس ٹاپک کو پِن کرنے کیلئے ایک تاریخ کی ضرورت ہے۔"
-        not_pinned: "{{categoryLink}} میں کوئی ٹاپک پِن نہیں ہیں۔"
+        not_pinned: "%{categoryLink} میں کوئی ٹاپک پِن نہیں ہیں۔"
         already_pinned:
-          one: "فی الحال {{categoryLink}} میں پِن ہوے ٹاپک: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "فی الحال {{categoryLink}} میں پِن ہوے ٹاپک: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "فی الحال %{categoryLink} میں پِن ہوے ٹاپک: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "فی الحال %{categoryLink} میں پِن ہوے ٹاپک: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "اِس ٹاپک کو تمام ٹاپکس کی فہرست کے سب سے اُپر ظاہر کریں جب تک کہ"
-        confirm_pin_globally: "آپ کے پاس پہلے ہی سے {{count}} عالمی سطح پر پِن ہوے ٹاپک موجود ہیں۔ بہت سارے پِن ہوے ٹاپک نئے اور گمنام صارفین کے لئے ایک بوجھ ثابت ہو سکتے ہیں۔ کیا آپ واقعی عالمی سطح پر ایک اور ٹاپک پِن کرنا چاہتے ہیں؟"
+        confirm_pin_globally: "آپ کے پاس پہلے ہی سے %{count} عالمی سطح پر پِن ہوے ٹاپک موجود ہیں۔ بہت سارے پِن ہوے ٹاپک نئے اور گمنام صارفین کے لئے ایک بوجھ ثابت ہو سکتے ہیں۔ کیا آپ واقعی عالمی سطح پر ایک اور ٹاپک پِن کرنا چاہتے ہیں؟"
         unpin_globally: "اِس ٹاپک کو تمام ٹاپکس کی فہرست کے سب سے اُپر ظاہر کرنے سے ہٹائیں"
         unpin_globally_until: "اِس ٹاپک کو تمام ٹاپکس کی فہرست کے سب سے اُپر ظاہر کرنے سے ہٹائیں یا <strong>%{until}</strong> تک اِنتظار کریں۔"
         global_pin_note: "صارفین خود سے انفرادی طور پر ٹاپک سے پن ہٹا سکتے ہیں۔"
         not_pinned_globally: "کوئی ٹاپک عالمی سطح پر پِن نہیں ہوئے ہیں۔"
         already_pinned_globally:
           one: "فی الحال عالمی سطح پر پِن ہوئے ٹاپک: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "فی الحال عالمی سطح پر پِن ہوئے ٹاپک: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "فی الحال عالمی سطح پر پِن ہوئے ٹاپک: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "اِس ٹاپک کو ایک بَینر بنا دیں جو تمام صفحات کے سب سے اوپر ظاہر ہو۔"
         remove_banner: "بَینر ہٹا دیں جو تمام صفحات کے سب سے اوپر ظاہر ہوتا ہے۔"
         banner_note: "صارفین بینر کو بند کرکے اِسے برطرف کر سکتے ہیں۔ آیک وقت میں صرف ایک ٹاپک کو بینر بنایا جا سکتا ہے۔"
@@ -2063,15 +2064,15 @@ ur:
         to_topic_username: "آپ نے ایک صارف نام درج کیا ہے۔ ہم اِطلاع کے طور پر اُنہیں ایک لنک بھیجیں گے جس میں اِس ٹاپک کیلئے اُنہیں مدعو کیا جائے گا۔"
         to_username: "اُس شخص کا صارف نام درج کریں جسے آپ اِس ٹاپک میں مدعو کرنا چاہتے ہیں۔ ہم اِطلاع کے طور پر اُنہیں ایک لِنک بھیجیں گے جس میں اِس ٹاپک کیلئے اُنہیں مدعو کیا جائے گا۔"
         email_placeholder: "name@example.com"
-        success_email: "ہم نے <b>{{emailOrUsername}}</b> کو ایک دعوت نامہ اِیمیل کیا ہے۔ جب دعوت نامہ اِستعمال ہو گا تو ہم آپ کو مطلع کریں گے۔ اپنی دعوتوں کا ٹریک رکھنے کیلئے اپنے صارف صفحہ پر دعوت ناموں والی ٹیب چیک کریں۔"
+        success_email: "ہم نے <b>%{emailOrUsername}</b> کو ایک دعوت نامہ اِیمیل کیا ہے۔ جب دعوت نامہ اِستعمال ہو گا تو ہم آپ کو مطلع کریں گے۔ اپنی دعوتوں کا ٹریک رکھنے کیلئے اپنے صارف صفحہ پر دعوت ناموں والی ٹیب چیک کریں۔"
         success_username: "ہم نے اِس ٹاپک میں حصہ لینے کے لئے اُس صارف کو مدعو کیا ہے۔"
         error: "معزرت، ہم اس شخص کو دعوت نہ دے سکے۔ شاید وہ پہلے ہی مدعو کیے جا چکے ہیں؟ (دعوتیں شرح محدود ہیں)"
-        success_existing_email: "آیک صارف <b>{{emailOrUsername}}</b> والے ای میل کے ساتھ پہلے ہی موجود ہے۔ ہم نے اِس ٹاپک میں حصہ لینے کے لئے اُس صارف کو مدعو کر دیا ہے۔"
+        success_existing_email: "آیک صارف <b>%{emailOrUsername}</b> والے ای میل کے ساتھ پہلے ہی موجود ہے۔ ہم نے اِس ٹاپک میں حصہ لینے کے لئے اُس صارف کو مدعو کر دیا ہے۔"
       login_reply: "جواب دینے کیلئے لاگ اِن کریں"
       filters:
         n_posts:
           one: "%{count} پوسٹ"
-          other: "{{count}} پوسٹس"
+          other: "%{count} پوسٹس"
         cancel: "فِلٹر ہٹائیں"
       move_to:
         title: "میں منتقل کریں"
@@ -2085,7 +2086,7 @@ ur:
         error: "نئے ٹاپک پر پوسٹس منتقل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
         instructions:
           one: "آپ ایک نیا ٹاپک بنانے اور اپنی منتخب کردہ پوسٹ سے اِسے آباد کرنے والے ہیں۔"
-          other: "آپ ایک نیا ٹاپک بنانے اور اپنی منتخب کردہ <b>{{count}}</b> پوسٹس سے اِسے آباد کرنے والے ہیں۔"
+          other: "آپ ایک نیا ٹاپک بنانے اور اپنی منتخب کردہ <b>%{count}</b> پوسٹس سے اِسے آباد کرنے والے ہیں۔"
       merge_topic:
         title: "موجودہ ٹاپک میں منتقل کریں"
         action: "موجودہ ٹاپک میں منتقل کریں"
@@ -2093,7 +2094,7 @@ ur:
         radio_label: "موجودہ ٹاپک"
         instructions:
           one: "براہ مہربانی، وہ ٹاپک منتخب کریں جس میں آپ وہ پوسٹ منتقل کرنا چاہتے ہیں۔"
-          other: "براہ مہربانی، وہ ٹاپک منتخب کریں جس میں آپ <b>{{count}}</b> پوسٹس منتقل کرنا چاہتے ہیں۔"
+          other: "براہ مہربانی، وہ ٹاپک منتخب کریں جس میں آپ <b>%{count}</b> پوسٹس منتقل کرنا چاہتے ہیں۔"
       move_to_new_message:
         title: "نئے پیغام پر منتقل کریں"
         action: "نئے پیغام پر منتقل کریں"
@@ -2102,7 +2103,7 @@ ur:
         participants: "شرکاء"
         instructions:
           one: "آپ ایک نیا پیغام بنانے اور اپنی منتخب کردہ پوسٹ سے اِسے آباد کرنے والے ہیں۔"
-          other: "آپ ایک نیا پیغام بنانے اور اپنی منتخب کردہ <b>{{count}}</b> پوسٹس سے اِسے آباد کرنے والے ہیں۔"
+          other: "آپ ایک نیا پیغام بنانے اور اپنی منتخب کردہ <b>%{count}</b> پوسٹس سے اِسے آباد کرنے والے ہیں۔"
       move_to_existing_message:
         title: "موجودہ پیغام میں منتقل کریں"
         action: "موجودہ پیغام میں منتقل کریں"
@@ -2110,7 +2111,7 @@ ur:
         participants: "شرکاء"
         instructions:
           one: "براہ مہربانی، وہ پیغام منتخب کریں جس میں آپ وہ پوسٹ منتقل کرنا چاہتے ہیں۔"
-          other: "براہ مہربانی، وہ پیغام منتخب کریں جس میں آپ <b>{{count}}</b> پوسٹس منتقل کرنا چاہتے ہیں۔"
+          other: "براہ مہربانی، وہ پیغام منتخب کریں جس میں آپ <b>%{count}</b> پوسٹس منتقل کرنا چاہتے ہیں۔"
       merge_posts:
         title: "منتخب کردہ پوسٹس کو ضم کریں"
         action: "منتخب کردہ پوسٹس کو ضم کریں"
@@ -2121,8 +2122,8 @@ ur:
         error: "پوسٹس کے مالک کو تبدیل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
         placeholder: "نئے مالک کا صارف نام"
         instructions:
-          one: "براہ مہربانی، <b>{{old_user}}</b> کی پوسٹ کے نئے مالک کو منتخب کریں۔"
-          other: "براہ مہربانی، <b>{{old_user}}</b> کی {{count}} پوسٹس کے نئے مالک کو منتخب کریں۔"
+          one: "براہ مہربانی، <b>%{old_user}</b> کی پوسٹ کے نئے مالک کو منتخب کریں۔"
+          other: "براہ مہربانی، <b>%{old_user}</b> کی %{count} پوسٹس کے نئے مالک کو منتخب کریں۔"
       change_timestamp:
         title: "ٹائمسٹیمپ تبدیل کریں..."
         action: "ٹائمسٹیمپ تبدیل کریں"
@@ -2131,7 +2132,7 @@ ur:
         instructions: "براہ مہربانی ٹاپک کیلیئے نیا ٹائمسٹیمپ منتخب کریں۔ وقت کا فرق برابر رکھنے کیلیے ٹاپک میں پوسٹس کو اَپ ڈیٹ کر دیا جائے گا۔"
       multi_select:
         select: "منتخب"
-        selected: "منتخب کردہ ({{count}})"
+        selected: "منتخب کردہ (%{count})"
         select_post:
           label: "منتخب"
           title: "انتخاب کیے ہوے میں پوسٹ شامل کریں"
@@ -2150,20 +2151,20 @@ ur:
         deselect_all: تمام غیر منتخب کریں
         description:
           one: آپ نے <b>%{count}</b> پوسٹ منتخب کی ہے۔
-          other: "آپ نے <b>{{count}}</b> پوسٹس منتخب کی ہیں۔"
+          other: "آپ نے <b>%{count}</b> پوسٹس منتخب کی ہیں۔"
       deleted_by_author:
         one: "(مصنف نے ٹاپک واپس لے لیا، %{count} گھنٹے میں یہ خود کار طریقے سے حذف کر دیا جائے گا الا یہ کہ اِسے فلیگ کیا گیا ہو)"
         other: "(مصنف نے ٹاپک واپس لے لیا، %{count} گھنٹوں میں یہ خود کار طریقے سے حذف کر دیا جائے گا الا یہ کہ اِسے فلیگ کیا گیا ہو)"
     post:
       quote_reply: "اقتباس کریں"
       edit_reason: "وجہ:"
-      post_number: "پوسٹ {{number}}"
+      post_number: "پوسٹ %{number}"
       ignored: "نظر انداز کردہ مواد"
       wiki_last_edited_on: "وِکی کو آخری بار ترمیم کیا گیا"
       last_edited_on: "پوسٹ کو آخری بار ترمیم کیا گیا"
       reply_as_new_topic: "منسلک ٹاپک کے طور پر جواب دیں"
       reply_as_new_private_message: "اُنہی وصول کنندگان کو نئے پیغام کے طور پر جواب دیں"
-      continue_discussion: "{{postLink}} سے بحث جاری:"
+      continue_discussion: "%{postLink} سے بحث جاری:"
       follow_quote: "اقتباس کی گئی پوسٹ پر جائیں"
       show_full: "مکمل پوسٹ دکھائیں"
       show_hidden: "نظر انداز کردہ مواد دکھایں۔"
@@ -2175,29 +2176,29 @@ ur:
       locked: "ایک اسٹاف کے رکن نے اِس پوسٹ کو ترمیم ہونے سے روک دیا ہے"
       gap:
         one: "%{count} چھپایا ہوا جواب دیکھیں"
-        other: "{{count}} چھپائے ہوے جوابات دیکھیں"
+        other: "%{count} چھپائے ہوے جوابات دیکھیں"
       notice:
-        new_user: "یہ پہلی مرتبہ ہے کہ {{user}} نے پوسٹ کیا ہے — ہمیں اِن کو کمیونٹی میں خوش آمدید کہنا چاہئے!"
-        returning_user: "کافی دیر ہو گئی ہے جب ہم نے {{user}} کو دیکھا تھا — اُن کی آخری پوسٹ {{time}} کو تھی۔"
+        new_user: "یہ پہلی مرتبہ ہے کہ %{user} نے پوسٹ کیا ہے — ہمیں اِن کو کمیونٹی میں خوش آمدید کہنا چاہئے!"
+        returning_user: "کافی دیر ہو گئی ہے جب ہم نے %{user} کو دیکھا تھا — اُن کی آخری پوسٹ %{time} کو تھی۔"
       unread: "پوسٹ بغیر پڑھی ہے"
       has_replies:
-        one: "{{count}} جواب"
-        other: "{{count}} جوابات"
+        one: "%{count} جواب"
+        other: "%{count} جوابات"
       has_likes_title:
         one: "%{count} شخص نے اِس پوسٹ کو لائیک کیا"
-        other: "{{count}} لوگوں نے اِس پوسٹ کو لائیک کیا"
+        other: "%{count} لوگوں نے اِس پوسٹ کو لائیک کیا"
       has_likes_title_only_you: " آپ نے اِس پوسٹ کو لائیک کیا"
       has_likes_title_you:
         one: "آپ اور %{count} دوسرے شخص نے اِس پوسٹ کو لائیک کیا"
-        other: "آپ اور {{count}} دوسرے لوگوں نے اِس پوسٹ کو لائیک کیا"
+        other: "آپ اور %{count} دوسرے لوگوں نے اِس پوسٹ کو لائیک کیا"
       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: "معذرت، آپ ایک وقت میں صرف {{max}} فائلیں ہی اَپ لوڈ کر سکتے ہیں۔"
-        upload_not_authorized: "معذرت، جو فائل آپ اَپ لوڈ کرنے کے کوشش کر رہے ہیں اُس کی اجازت نہیں ہے (اجازت یافتہ ایکسٹینشنز: {{authorized_extensions}})۔"
+        too_many_dragged_and_dropped_files: "معذرت، آپ ایک وقت میں صرف %{max} فائلیں ہی اَپ لوڈ کر سکتے ہیں۔"
+        upload_not_authorized: "معذرت، جو فائل آپ اَپ لوڈ کرنے کے کوشش کر رہے ہیں اُس کی اجازت نہیں ہے (اجازت یافتہ ایکسٹینشنز: %{authorized_extensions})۔"
         image_upload_not_allowed_for_new_user: "معذرت، نئے صارفین تصاویر اَپ لوڈ نہیں کر سکتے۔"
         attachment_upload_not_allowed_for_new_user: "معذرت، نئے صارفین اٹیچمنٹس اَپ لوڈ نہیں کر سکتے۔"
         attachment_download_requires_login: "معذرت، اٹیچمنٹس ڈائونلوڈ کرنے کیلیے آپ کا لاگ اِن ہونا ضروری ہے۔"
@@ -2235,10 +2236,10 @@ ur:
           confirm: "کیا آپ اِس پوسٹ پر جوابات بھی حذف کرنا چاہتے ہیں؟"
           direct_replies:
             one: "جی ہاں، اور براہ راست %{count} جواب"
-            other: "جی ہاں، اور براہ راست {{count}} جوابات"
+            other: "جی ہاں، اور براہ راست %{count} جوابات"
           all_replies:
             one: "جی ہاں، اور %{count} جواب"
-            other: "جی ہاں، اور تمام {{count}} جوابات"
+            other: "جی ہاں، اور تمام %{count} جوابات"
           just_the_post: "نہیں، صرف یہ پوسٹ"
         admin: "پوسٹ ایڈمن کے ایکشن"
         wiki: "وِیکی بنائیں"
@@ -2278,8 +2279,8 @@ ur:
           notify_user: "ایک پیغام بھیجا"
           bookmark: "اِس کو بُک مارک"
           like_capped:
-            one: "اور {{count}} دوسرے شخص نے اِس کو لائیک کیا"
-            other: "اور {{count}} دوسرے لوگوں نے اِس کو لائیک کیا"
+            one: "اور %{count} دوسرے شخص نے اِس کو لائیک کیا"
+            other: "اور %{count} دوسرے لوگوں نے اِس کو لائیک کیا"
         by_you:
           off_topic: "آپ نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا"
           spam: "آپ نے اِس کو سپَیم ہونے کے طور پر فلَیگ کیا"
@@ -2291,11 +2292,11 @@ ur:
       delete:
         confirm:
           one: "کیا آپ واقعی اُس پوسٹ کو حذف کرنا چاہتے ہیں؟"
-          other: "کیا آپ واقعی ان {{count}} پوسٹس کو حذف کرنا چاہتے ہیں؟"
+          other: "کیا آپ واقعی ان %{count} پوسٹس کو حذف کرنا چاہتے ہیں؟"
       merge:
         confirm:
           one: "کیا آپ واقعی ان پوسٹس کو ضم کرنا چاہتے ہیں؟"
-          other: "کیا آپ واقعی ان {{count}} پوسٹس کو ضم کرنا چاہتے ہیں؟"
+          other: "کیا آپ واقعی ان %{count} پوسٹس کو ضم کرنا چاہتے ہیں؟"
       revisions:
         controls:
           first: "پہلی رَوِیژن"
@@ -2307,7 +2308,7 @@ ur:
           revert: "اِس رَوِیژن پر واپس جائیں"
           edit_wiki: "وِیکی میں ترمیم کریں"
           edit_post: "پوسٹ میں ترمیم کریں"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "پیش کیا گیا نتیجہ اضافوں اور کمیوں کو ساتھ اِن لائن دکھائیں"
@@ -2480,13 +2481,13 @@ ur:
       custom_message:
         at_least:
           one: "کم از کم %{count} حرف درج کریں"
-          other: "کم از کم {{count}} حروف درج کریں"
+          other: "کم از کم %{count} حروف درج کریں"
         more:
           one: "%{count} اور آگے بچا ہے..."
-          other: "{{count}} اور آگے بچے ہیں..."
+          other: "%{count} اور آگے بچے ہیں..."
         left:
           one: "%{count} باقی رہتا ہے..."
-          other: "{{count}} باقی رہتے ہیں..."
+          other: "%{count} باقی رہتے ہیں..."
     flagging_topic:
       title: "ہماری کمیونٹی کو مہذب رکھنے کے لئے مدد کا شکریہ!"
       action: "ٹاپک فلَیگ کریں"
@@ -2530,7 +2531,7 @@ ur:
         title: "یہ ٹاپک ایک ذاتی پیغام ہے"
         help: "یہ ٹاپک ایک ذاتی پیغام ہے"
     posts: "پوسٹس"
-    posts_long: "اِس ٹاپک میں {{number}} پوسٹس ہیں"
+    posts_long: "اِس ٹاپک میں %{number} پوسٹس ہیں"
     posts_likes_MF: |
       اِس ٹاپک {count, plural, one {کا 1 جواب} other {کے # جوابات ہیں}} {ratio, select,
       low {لائیک پر پوسٹ کے اونچے تناسب کے ساتھ}
@@ -2545,20 +2546,20 @@ ur:
     replies: "جوابات"
     views_long:
       one: "اِس ٹاپک کو %{count} دفعہ دیکھا جا چکا ہے"
-      other: "اِس ٹاپک کو {{number}} دفعہ دیکھا جا چکا ہے"
+      other: "اِس ٹاپک کو %{number} دفعہ دیکھا جا چکا ہے"
     activity: "سرگرمی"
     likes: "لائیکس"
     likes_lowercase:
       one: "لائیک"
       other: "لائیکس"
-    likes_long: "اِس ٹاپک میں {{number}} لائیکس ہیں"
+    likes_long: "اِس ٹاپک میں %{number} لائیکس ہیں"
     users: "صارفین"
     users_lowercase:
       one: "صارف"
       other: "صارفین"
     category_title: "زمرہ"
     history: "ہسٹری"
-    changed_by: "{{author}} کی طرف سے"
+    changed_by: "%{author} کی طرف سے"
     raw_email:
       title: "آنے والی اِیمیل"
       not_available: "دستیاب نہیں ہے!"
@@ -2570,33 +2571,33 @@ ur:
         title: "تازہ ترین"
         title_with_count:
           one: "تازہ ترین (%{count})"
-          other: "تازہ ترین ({{count}})"
+          other: "تازہ ترین (%{count})"
         help: "حالیہ پوسٹ والے ٹاپک"
       read:
         title: "پڑھیں"
         help: "ٹاپک جو آپ نے پڑھے ہوے ہیں، اُس ترتیب میں جس میں آپ نے انہیں آخری دفعہ پڑھا تھا"
       categories:
         title: "زُمرَہ جات"
-        title_in: "زمرہ - {{categoryName}}"
+        title_in: "زمرہ - %{categoryName}"
         help: "تمام ٹاپک زمرہ کے لحاظ سے گروپ کیے گئے"
       unread:
         title: "بغیر پڑھے"
         title_with_count:
           one: "بغیر پڑھا (%{count})"
-          other: "بغیر پڑھے ({{count}})"
+          other: "بغیر پڑھے (%{count})"
         help: " ٹاپک جن پر فی الحال آپ نے نظر رکھی ہوئی ہے یا بغیر پڑھی پوسٹس کے ساتھ ٹریک کر رہے ہیں"
         lower_title_with_count:
           one: "%{count} بغیر پڑھا ہوا"
-          other: "{{count}} بغیر پڑھے ہوئے"
+          other: "%{count} بغیر پڑھے ہوئے"
       new:
         lower_title_with_count:
           one: "%{count} نیا"
-          other: "{{count}} نئے"
+          other: "%{count} نئے"
         lower_title: "نئے"
         title: "نیا"
         title_with_count:
           one: "نیا (%{count})"
-          other: "نئے ({{count}})"
+          other: "نئے (%{count})"
         help: "پچھلے چند دنوں میں بنائے گئے ٹاپک"
       posted:
         title: "میری پوسٹ"
@@ -2605,11 +2606,11 @@ ur:
         title: "بُکمارکس"
         help: "ٹاپک جن کو آپ نے بُک مارک کیا ہے"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          one: "{{categoryName}} (%{count})"
-          other: "{{categoryName}} ({{count}})"
-        help: "{{categoryName}} زمرہ میں تازہ تریں ٹاپک"
+          one: "%{categoryName} (%{count})"
+          other: "%{categoryName} (%{count})"
+        help: "%{categoryName} زمرہ میں تازہ تریں ٹاپک"
       top:
         title: "سب سے اوپر"
         help: "گزشتہ سال، مہینے، ہفتے یا دن میں سب سے سرگرم ترین ٹاپک"
@@ -2751,7 +2752,7 @@ ur:
       delete_tag: "ٹیگ حذف کریں"
       delete_confirm:
         one: "کیا آپ واقعی اس ٹیگ کو حذف اور %{count} ٹاپک، جس کو یہ آسائین ہواوا ہے، سے ہٹا دینا چاہتے ہیں؟"
-        other: "کیا آپ واقعی اس ٹیگ کو حذف اور {{count}} ٹاپکس، جن کو یہ آسائین ہواوا ہے، سے ہٹا دینا چاہتے ہیں؟"
+        other: "کیا آپ واقعی اس ٹیگ کو حذف اور %{count} ٹاپکس، جن کو یہ آسائین ہواوا ہے، سے ہٹا دینا چاہتے ہیں؟"
       delete_confirm_no_topics: "کیا آپ واقعی اِس ٹَیگ کو حذف کرنا چاہتے ہیں؟"
       rename_tag: "ٹیگ کا نام تبدیل کریں"
       rename_instructions: "ٹیگ کے لیے نئے نام کا انتخاب کریں:"
@@ -3082,10 +3083,10 @@ ur:
           redeliver: "دوبارہ ڈیلیور کریں"
           incoming:
             one: "ایک نیا واقعہ موجود ہے۔"
-            other: "{{count}} نئے واقعات موجود ہیں۔"
+            other: "%{count} نئے واقعات موجود ہیں۔"
           completed_in:
             one: "%{count} سیکنڈ میں مکمل ہوا۔"
-            other: "{{count}} سیکنڈ میں مکمل ہوا۔"
+            other: "%{count} سیکنڈ میں مکمل ہوا۔"
           request: "ریکویسٹ"
           response: "جواب"
           redeliver_confirm: "کیا آپ واقعی وہی پَیلوڈ دوبارہ ڈیلیور کرنا چاہتے ہیں؟"
@@ -3137,12 +3138,12 @@ ur:
           label: "اَپ لوڈ"
           title: "اِس صورتحال کیلئے ایک بیک اَپ اَپ لوڈ کریں"
           uploading: "اَپ لوڈ کیا جا رہا ہے..."
-          uploading_progress: "اَپ لوڈ کیا جا رہا ہے... {{progress}}٪"
-          success: "'{{filename}}' کامیابی سے اَپ لوڈ کردی گئی ہے۔ فائل پر اب کام جا ری ہے اور فہرست میں ظاہر ہونے کیلئے ایک منٹ تک لگ سکتا ہے۔"
-          error: "اَپ لوڈ کرتے وقت ایک خرابی کا سامنا کرنا پڑا '{{filename}}': {{message}}"
+          uploading_progress: "اَپ لوڈ کیا جا رہا ہے... %{progress}٪"
+          success: "'%{filename}' کامیابی سے اَپ لوڈ کردی گئی ہے۔ فائل پر اب کام جا ری ہے اور فہرست میں ظاہر ہونے کیلئے ایک منٹ تک لگ سکتا ہے۔"
+          error: "اَپ لوڈ کرتے وقت ایک خرابی کا سامنا کرنا پڑا '%{filename}': %{message}"
         operations:
           is_running: "ایک کارروائی اِس وقت چل رہی ہے..."
-          failed: "{{operation}} ناکام رہا۔ براہ مہربانی لاگز چیک کریں۔"
+          failed: "%{operation} ناکام رہا۔ براہ مہربانی لاگز چیک کریں۔"
           cancel:
             label: "منسوخ"
             title: "موجودہ کارروائی منسوخ کریں"
@@ -3260,7 +3261,7 @@ ur:
           disabled_component_tooltip: "یہ کمپنَینٹ غیر فعال کردیا گیا ہے"
           default_theme_tooltip: "یہ تِھیم سائٹ کی ڈیفالٹ تِھیم ہے"
           updates_available_tooltip: "اِس تِھیم کیلئے اَپ ڈیٹس دستیاب ہیں۔"
-          and_x_more: "اور {{count}} مزید۔"
+          and_x_more: "اور %{count} مزید۔"
           collapse: بند کریں
           uploads: "اَپ لوڈز"
           no_uploads: "آپ اپنی تِھیم کے ساتھ منسلک اثاثے، جیسے کہ فونٹ اور تصاویر، اَپ لوڈ کر سکتے ہیں"
@@ -3304,8 +3305,8 @@ ur:
           disabled_by: "یہ کمپنَینٹ غیر فعال کردینے والا"
           required_version:
             error: "یہ تِھیم خود کار طریقے سے غیر فعال کر دی گئی ہے کیونکہ یہ ڈِسکورس کے اِس ورژن کیلئے ناموافق ہے۔"
-            minimum: "ڈِسکورس ورژن {{version}} یا اُس سے اوپر ضروری ہے۔"
-            maximum: "ڈِسکورس ورژن {{version}} یا اُس سے نیچے ضروری ہے۔"
+            minimum: "ڈِسکورس ورژن %{version} یا اُس سے اوپر ضروری ہے۔"
+            maximum: "ڈِسکورس ورژن %{version} یا اُس سے نیچے ضروری ہے۔"
           component_of: "جس کا کمپنَینٹ:"
           update_to_latest: "تازہ ترین ورژن تک اِپ ڈَیٹ کریں"
           check_for_updates: "اپ ڈیٹ کے لیے چیک کریں"
@@ -3318,7 +3319,7 @@ ur:
           empty: "کوئی اشیاء نہیں"
           commits_behind:
             one: "تِھیم %{count} کَمِٹ پیچھے ہے!"
-            other: "تِھیم {{count}} کَمِٹس پیچھے ہے!"
+            other: "تِھیم %{count} کَمِٹس پیچھے ہے!"
           compare_commits: "(نئے کَمِٹس دیکھیں)"
           repo_unreachable: "اِس تِھیم کی گِٹ رِیپَوزِٹَری سے رابطہ نہیں کیا جا سکا۔ تکنیکی خرابی کا پیغام:"
           scss:
@@ -3713,8 +3714,8 @@ ur:
           title: "اِس صارف کا اِیمیل ایڈریس ظاہر کریں"
           text: "دکھائیں"
       user:
-        suspend_failed: "اِس صارف کو معطل کرتے ہوے کچھ غلط ہو گیا {{error}}"
-        unsuspend_failed: "اِس صارف کی معطلی ختم کرتے ہوے کچھ غلط ہو گیا {{error}}"
+        suspend_failed: "اِس صارف کو معطل کرتے ہوے کچھ غلط ہو گیا %{error}"
+        unsuspend_failed: "اِس صارف کی معطلی ختم کرتے ہوے کچھ غلط ہو گیا %{error}"
         suspend_duration: "صارف کب تک معطل رہے گا؟"
         suspend_reason_label: "آپ معطل کیوں کر رہے ہیں؟ یہ ٹَیکسٹ اِس صارف کے پروفائل پیج پر <b>ہر کسی کے لیے ظاہر ہو گا</b>، اور جب صارف لاگ اِن کرنے کی کوشش کریں گے تو اُنہیں دکھایا جائے گا۔ اِسے مختصر رکھیں۔"
         suspend_reason_hidden_label: "آپ کیوں معطل کر رہے ہیں؟ صارف جب لاگ اِن کرنے کی کوشش کرے گا تو اُسے یہ ٹیکسٹ دکھایا جائے گا۔ اِسے مختصر رکھیں۔"
@@ -4059,6 +4060,7 @@ ur:
         title: "اِیمَوجی"
         help: "نئی اِیمَوجی شامل کریں جو سب کے لئے دستیاب ہوگی۔ (پیشہ وَرَانہ ٹِپ: ایک بار میں ایک سے زیادہ فائلوں کو ڈرَیگ & ڈراپ کریں)"
         add: "نئی اِیمَوجی شامل کریں"
+        uploading: "اَپ لوڈ کیا جا رہا ہے..."
         name: "نام"
         group: "گروپ"
         image: "تصویر"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index edb82585f1..b63f5eed4d 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -22,8 +22,8 @@ vi:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}k"
-        millions: "{{number}}M"
+        thousands: "%{number}k"
+        millions: "%{number}M"
     dates:
       time: "HH:mm"
       time_with_zone: "HH:mm (z)"
@@ -204,10 +204,10 @@ vi:
     weekly: "hàng tuần"
     every_month: "hàng tháng"
     every_six_months: "mỗi sáu tháng"
-    max_of_count: "tối đa trong {{count}}"
+    max_of_count: "tối đa trong %{count}"
     alternation: "hoặc"
     character_count:
-      other: "{{count}} ký tự"
+      other: "%{count} ký tự"
     related_messages:
       title: "Tin nhắn liên quan"
       see_all: 'Xem <a href="%{path}"> toàn bộ tin nhắn </a> từ %{username}...'
@@ -263,11 +263,11 @@ vi:
         yes_value: "Đồng ý, bỏ"
         no_value: "Không, giữ lại"
     topic_count_latest:
-      other: "Xem {{count}} chủ đề mới hoặc được cập nhật"
+      other: "Xem %{count} chủ đề mới hoặc được cập nhật"
     topic_count_unread:
-      other: "Xem {{count}} chủ đề chưa đọc"
+      other: "Xem %{count} chủ đề chưa đọc"
     topic_count_new:
-      other: "Xem {{count}} chủ đề mới"
+      other: "Xem %{count} chủ đề mới"
     preview: "xem trước"
     cancel: "hủy"
     save: "Lưu thay đổi"
@@ -275,7 +275,7 @@ vi:
     saved: "Đã lưu!"
     upload: "Tải lên"
     uploading: "Đang tải lên..."
-    uploading_filename: "Tải lên: {{filename}}..."
+    uploading_filename: "Tải lên: %{filename}..."
     clipboard: "clipboard"
     uploaded: "Đã tải lên!"
     pasting: "Đang gõ"
@@ -329,7 +329,7 @@ vi:
         optional: "Bạn có thể phàn nàn mục này để tránh những người khác đánh giá nó."
         required: "Bạn phải yêu cầu các mục trước khi bạn có thể xem xét chúng."
         claimed_by_you: "Bạn đã yêu cầu mặt hàng này và có thể xem xét nó."
-        claimed_by_other: "Mục này chỉ có thể được xem xét bởi <b>{{username}}</b> ."
+        claimed_by_other: "Mục này chỉ có thể được xem xét bởi <b>%{username}</b> ."
       claim:
         title: "yêu cầu chủ đề này"
       unclaim:
@@ -348,7 +348,7 @@ vi:
       none: "Không có mục nào cần đánh giá."
       view_pending: "xem hàng đợi"
       topic_has_pending:
-        other: "Chủ đề này có <b>{{count}}</b> bài viết đang cần phê duyệt"
+        other: "Chủ đề này có <b>%{count}</b> bài viết đang cần phê duyệt"
       title: "Review"
       topic: "Chủ đề:"
       filtered_topic: "Bạn đã lọc đến nội dung có thể xem lại trong một chủ đề."
@@ -365,13 +365,13 @@ vi:
         fields: "Trường tùy biến"
       user_percentage:
         summary:
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} tổng cộng gắn cờ)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (%{count} tổng cộng gắn cờ)"
         agreed:
-          other: "{{count}}đồng ý"
+          other: "%{count}đồng ý"
         disagreed:
-          other: "{{count}} không đồng ý"
+          other: "%{count} không đồng ý"
         ignored:
-          other: "{{count}} bỏ qua"
+          other: "%{count} bỏ qua"
       topics:
         topic: "Chủ đề"
         reviewable_count: "Đếm"
@@ -380,9 +380,9 @@ vi:
         original: "(chủ đề gốc)"
         details: "chi tiết"
         unique_users:
-          other: "{{count}} người dùng"
+          other: "%{count} người dùng"
       replies:
-        other: "{{count}} trả lời"
+        other: "%{count} trả lời"
       edit: "Sửa"
       save: "Lưu"
       cancel: "Hủy"
@@ -444,22 +444,22 @@ vi:
         title: "Bài viết cần phê duyệt"
         description: "Chúng tôi đã nhận được bài viết mới của bạn, nhưng nó cần phải được phê duyệt bởi admin trước khi được hiện. Xin hãy kiên nhẫn."
         pending_posts:
-          other: "Bạn có <strong>{{count}}</strong> bài viết đang chờ."
+          other: "Bạn có <strong>%{count}</strong> bài viết đang chờ."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> đã đăng <a href='{{topicUrl}}'>chủ đề</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Bạn</a> đã đăng <a href='{{topicUrl}}'>chủ đề</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> đã trả lời tới <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Bạn</a> đã trả lời <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> đã trả lời <a href='{{topicUrl}}'>chủ đề</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Bạn</a> đã trả lời <a href='{{topicUrl}}'>chủ đề</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> đã nhắc đến <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> đã nhắc tới <a href='{{user2Url}}'>bạn</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Bạn</a> đã nhắc đến <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "Được đăng bởi <a href='{{userUrl}}'>{{user}}</a>"
-      posted_by_you: "Được đăng bởi <a href='{{userUrl}}'>bạn</a>"
-      sent_by_user: "Đã gửi bởi <a href='{{userUrl}}'>{{user}}</a>"
-      sent_by_you: "Đã gửi bởi <a href='{{userUrl}}'>bạn</a>"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> đã đăng <a href='%{topicUrl}'>chủ đề</a>"
+      you_posted_topic: "<a href='%{userUrl}'>Bạn</a> đã đăng <a href='%{topicUrl}'>chủ đề</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> đã trả lời tới <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>Bạn</a> đã trả lời <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> đã trả lời <a href='%{topicUrl}'>chủ đề</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>Bạn</a> đã trả lời <a href='%{topicUrl}'>chủ đề</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> đã nhắc đến <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> đã nhắc tới <a href='%{user2Url}'>bạn</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>Bạn</a> đã nhắc đến <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "Được đăng bởi <a href='%{userUrl}'>%{user}</a>"
+      posted_by_you: "Được đăng bởi <a href='%{userUrl}'>bạn</a>"
+      sent_by_user: "Đã gửi bởi <a href='%{userUrl}'>%{user}</a>"
+      sent_by_you: "Đã gửi bởi <a href='%{userUrl}'>bạn</a>"
     directory:
       filter_name: "lọc theo tên đăng nhập"
       title: "Người dùng"
@@ -684,7 +684,7 @@ vi:
     user_fields:
       none: "(chọn một tùy chọn)"
     user:
-      said: "{{username}}:"
+      said: "%{username}:"
       profile: "Tiểu sử"
       mute: "Im lặng"
       edit: "Tùy chỉnh"
@@ -745,11 +745,11 @@ vi:
       external_links_in_new_tab: "Mở tất cả liên kết bên ngoài trong thẻ mới"
       enable_quoting: "Bật chế độ làm nổi bật chữ trong đoạn trích dẫn trả lời"
       change: "thay đổi"
-      moderator: "{{user}} trong ban quản trị"
-      admin: "{{user}} là người điều hành"
+      moderator: "%{user} trong ban quản trị"
+      admin: "%{user} là người điều hành"
       moderator_tooltip: "Thành viên này là MOD"
       admin_tooltip: "Thành viên này là admin"
-      suspended_notice: "Thành viên này bị đình chỉ cho đến ngày {{date}}. "
+      suspended_notice: "Thành viên này bị đình chỉ cho đến ngày %{date}. "
       suspended_permanently: "Người dùng này đã bị tạm ngưng."
       suspended_reason: "Lý do: "
       github_profile: "Github"
@@ -764,7 +764,7 @@ vi:
           Topic bị đánh dấu im lặng và chuyên mục sẽ không bao gồm trong thư
         individual: "Gửi email cho mỗi bài viết mới."
         individual_no_echo: "Gửi email cho mỗi bài viết mới trừ bài viết của tôi"
-        many_per_day: "Gửi email cho tôi về mỗi bài viết mới (khoảng {{dailyEmailEstimate}} thư một ngày)"
+        many_per_day: "Gửi email cho tôi về mỗi bài viết mới (khoảng %{dailyEmailEstimate} thư một ngày)"
         few_per_day: "Gửi email cho tôi về mỗi bài viết mới (khoảng 2 thư một ngày)"
       tag_settings: "Thẻ"
       watched_tags: "Theo dõi"
@@ -788,7 +788,6 @@ vi:
       admin_delete: "Xoá"
       users: "Thành viên"
       muted_users: "Im lặng"
-      muted_users_instructions: "Ngăn chặn tất cả các thông báo từ những thành viên."
       ignored_users: "Đã bỏ qua"
       tracked_topics_link: "Hiển thị"
       automatically_unpin_topics: "Tự động bỏ ghim chủ đề khi tôi xuống cuối trang."
@@ -842,7 +841,7 @@ vi:
         enable_long: "Bật backup codes"
         copy_to_clipboard_error: "Lỗi sao chép dữ liệu vào Clipboard"
         copied_to_clipboard: "Sao chép vào Clipboard"
-        remaining_codes: "Bạn có <strong>{{count}}</strong> mã sao lưu còn lại."
+        remaining_codes: "Bạn có <strong>%{count}</strong> mã sao lưu còn lại."
         use: "Sử dụng mã dự phòng"
       second_factor:
         title: "Xác minh hai bước"
@@ -886,10 +885,10 @@ vi:
         instructions: "Không hiển thị công cộng"
         ok: "Chúng tôi sẽ gửi thư điện tử xác nhận đến cho bạn"
         invalid: "Vùi lòng nhập một thư điện tử hợp lệ"
-        authenticated: "Thư điện tử của bạn đã được xác nhận bởi {{provider}}"
+        authenticated: "Thư điện tử của bạn đã được xác nhận bởi %{provider}"
         frequency_immediately: "Chúng tôi sẽ gửi email cho bạn ngay lập tức nếu bạn đã chưa đọc những điều chúng tôi đã gửi cho bạn qua email."
         frequency:
-          other: "Chúng tôi sẽ chỉ gửi email cho bạn nếu chúng tôi đã không nhìn thấy bạn trong {{count}} phút cuối."
+          other: "Chúng tôi sẽ chỉ gửi email cho bạn nếu chúng tôi đã không nhìn thấy bạn trong %{count} phút cuối."
       associated_accounts:
         connect: "Kết nối"
         revoke: "Thu hồi"
@@ -905,9 +904,9 @@ vi:
       username:
         title: "Username"
         instructions: "Duy nhất, không có khoảng trống, ngắn"
-        short_instructions: "Mọi người có thể nhắc tới bạn bằng @{{username}}"
+        short_instructions: "Mọi người có thể nhắc tới bạn bằng @%{username}"
         available: "Tên đăng nhập của bạn có sẵn"
-        not_available: "Chưa có sẵn. Thử {{suggestion}}?"
+        not_available: "Chưa có sẵn. Thử %{suggestion}?"
         not_available_no_suggestion: "Không sẵn có"
         too_short: "Tên đăng nhập của bạn quá ngắn"
         too_long: "Tên đăng nhập của bạn quá dài"
@@ -927,7 +926,7 @@ vi:
         log_out_all: "Đăng xuất khỏi tất cả"
         active: "hoạt động bây giờ"
         not_you: "Không phải bạn?"
-        show_all: "Hiển thị tất cả {{count}}"
+        show_all: "Hiển thị tất cả %{count}"
         show_few: "Hiển thị ít hơn"
         was_this_you: "Đây có phải là bạn không?"
         secure_account: "Bảo mật Tài khoản của tôi"
@@ -1002,14 +1001,14 @@ vi:
         sent: "Gửi lần cuối"
         none: "Không tìm thấy lời mời nào."
         truncated:
-          other: "Hiện {{count}} thư mời đầu tiên"
+          other: "Hiện %{count} thư mời đầu tiên"
         redeemed: "Lời mời bù lại"
         redeemed_tab: "Làm lại"
-        redeemed_tab_with_count: "Làm lại ({{count}})"
+        redeemed_tab_with_count: "Làm lại (%{count})"
         redeemed_at: "Nhận giải"
         pending: "Lời mời tạm hoãn"
         pending_tab: "Đang treo"
-        pending_tab_with_count: "Đang xử lý ({{count}})"
+        pending_tab_with_count: "Đang xử lý (%{count})"
         topics_entered: "Bài viết được xem "
         posts_read_count: "Đọc bài viết"
         expired: "Thư mời này đã hết hạn."
@@ -1023,12 +1022,16 @@ vi:
         time_read: "Đọc thời gian"
         days_visited: "Số ngày đã thăm"
         account_age_days: "Thời gian của tài khoản theo ngày"
-        create: "Gửi một lời mời"
+        links_tab: "Liên kết"
+        link_created_at: "Tạo bởi"
+        link_groups: Nhóm
+        create: "Gửi Lời Mời"
         generate_link: "Chép liên kết Mời"
         link_generated: "Link mời đã được tạo thành công !"
         valid_for: "Link mời chỉ có hiệu lực với địa chỉ email: %{email}"
+        invite_link:
+          success: "Link mời đã được tạo thành công !"
         bulk_invite:
-          text: "Mời hàng loạt bằng file"
           success: "Tải lên thành công, bạn sẽ được thông báo qua tin nhắn khi quá trình hoàn tất."
           error: "Xin lỗi, file phải ở định dạng CSV."
       password:
@@ -1108,7 +1111,7 @@ vi:
       desc:
         network: "Hãy kiểm tra kết nối của bạn"
         network_fixed: "Hình như nó trở lại."
-        server: "Mã lỗi : {{status}}"
+        server: "Mã lỗi : %{status}"
         forbidden: "Bạn không được cho phép để xem mục này"
         not_found: "Oops, ứng dụng đang tải đường dẫn không tồn tại"
         unknown: "Có một lỗi gì đó đang xảy ra"
@@ -1152,8 +1155,8 @@ vi:
       hidden_for_session: "OK, Tôi sẽ hỏi bạn vào ngày mai. Bạn có thể luôn luôn sử dụng chức năng đăng nhập để tạo tài khoản."
     summary:
       enabled_description: "Bạn đang xem một bản tóm tắt của chủ đề này: các bài viết thú vị nhất được xác định bởi cộng đồng."
-      description: "Có <b>{{replyCount}}</b> trả lời."
-      description_time: "Có <b>{{replyCount}}</b> trả lời với thời gian đọc ước tính khoảng <b>{{readingTime}} phút</b>."
+      description: "Có <b>%{replyCount}</b> trả lời."
+      description_time: "Có <b>%{replyCount}</b> trả lời với thời gian đọc ước tính khoảng <b>%{readingTime} phút</b>."
       enable: "Tóm tắt lại chủ đề"
       disable: "HIển thị tất cả các bài viết"
     deleted_filter:
@@ -1164,8 +1167,8 @@ vi:
     private_message_info:
       title: "Tin nhắn"
       edit: "Thêm hoặc xóa..."
-      remove_allowed_user: "Bạn thực sự muốn xóa {{name}} từ tin nhắn này?"
-      remove_allowed_group: "Bạn thực sự muốn xóa {{name}} từ tin nhắn này?"
+      remove_allowed_user: "Bạn thực sự muốn xóa %{name} từ tin nhắn này?"
+      remove_allowed_group: "Bạn thực sự muốn xóa %{name} từ tin nhắn này?"
     email: "Email"
     username: "Username"
     last_seen: "Đã xem"
@@ -1174,7 +1177,7 @@ vi:
     trust_level: "Độ tin tưởng"
     search_hint: "username, email or IP address"
     create_account:
-      disclaimer: "Bằng cách đăng ký, bạn đồng ý với <a href='{{privacy_link}}' target='blank'>chính sách bảo mật</a> và <a href='{{tos_link}}' target='blank'>điều khoản dịch vụ</a>."
+      disclaimer: "Bằng cách đăng ký, bạn đồng ý với <a href='%{privacy_link}' target='blank'>chính sách bảo mật</a> và <a href='%{tos_link}' target='blank'>điều khoản dịch vụ</a>."
       title: "Tạo tài khoản mới"
       failed: "Có gì đó không đúng, có thể email này đã được đăng ký, thử liên kết quên mật khẩu"
     forgot_password:
@@ -1218,7 +1221,7 @@ vi:
       awaiting_activation: "Tài khoản của bạn đang đợi kích hoạt, sử dụng liên kết quên mật khẩu trong trường hợp kích hoạt ở 1 email khác."
       awaiting_approval: "Tài khoản của bạn chưa được chấp nhận bới thành viên. Bạn sẽ được gửi một email khi được chấp thuận "
       requires_invite: "Xin lỗi, bạn phải được mời để tham gia diễn đàn"
-      not_activated: "Bạn không thể đăng nhập. Chúng tôi đã gửi trước email kích hoạt cho bạn tại <b>{{sentTo}}</b>. Vui lòng làm theo hướng dẫn trong email để kích hoạt tài khoản của bạn."
+      not_activated: "Bạn không thể đăng nhập. Chúng tôi đã gửi trước email kích hoạt cho bạn tại <b>%{sentTo}</b>. Vui lòng làm theo hướng dẫn trong email để kích hoạt tài khoản của bạn."
       not_allowed_from_ip_address: "Bạn không thể đăng nhập từ địa chỉ IP này"
       admin_not_allowed_from_ip_address: "Bạn không thể đăng nhập với quyền quản trị từ địa chỉ IP đó."
       resend_activation_email: "Bấm đây để gửi lại email kích hoạt"
@@ -1226,7 +1229,7 @@ vi:
       change_email: "Đổi địa chỉ email"
       provide_new_email: "Cung cấp địa chỉ mới của bạn và chúng tôi sẽ gửi lại email xác nhận."
       submit_new_email: "Cập nhật địa chỉ email"
-      sent_activation_email_again: "Chúng tôi gửi email kích hoạt tới cho bạn ở <b>{{currentEmail}}</b>. Nó sẽ mất vài phút để đến; bạn nhớ check cả hồm thư spam nhe. "
+      sent_activation_email_again: "Chúng tôi gửi email kích hoạt tới cho bạn ở <b>%{currentEmail}</b>. Nó sẽ mất vài phút để đến; bạn nhớ check cả hồm thư spam nhe. "
       to_continue: "Vui lòng đăng nhập"
       preferences: "Bạn cần phải đăng nhập để thay đổi cài đặt tài khoản."
       forgot: "Tôi không thể nhớ lại chi tiết tài khoản của tôi."
@@ -1284,7 +1287,7 @@ vi:
       no_content: Không tìm thấy
       filter_placeholder: Tìm kiến...
       filter_placeholder_with_any: Tìm kiếm hoặc tạo mới...
-      create: "Tạo mới: '{{content}}'"
+      create: "Tạo mới: '%{content}'"
     date_time_picker:
       from: Từ
       to: Tới
@@ -1311,9 +1314,9 @@ vi:
       edit_conflict: "chỉnh sửa xung đột"
       error:
         title_missing: "Tiêu đề là bắt buộc"
-        title_too_short: "Tiêu để phải có ít nhất {{min}} ký tự"
-        title_too_long: "Tiêu đề có tối đa {{max}} ký tự"
-        post_length: "Bài viết phải có ít nhất {{min}} ký tự"
+        title_too_short: "Tiêu để phải có ít nhất %{min} ký tự"
+        title_too_long: "Tiêu đề có tối đa %{max} ký tự"
+        post_length: "Bài viết phải có ít nhất %{min} ký tự"
         category_missing: "Bạn phải chọn một phân loại"
       save_edit: "Lưu chỉnh sửa"
       reply_original: "Trả lời cho bài viết gốc"
@@ -1373,17 +1376,17 @@ vi:
       empty: "Không có thông báo"
       post_approved: "Bài đăng của bạn đã được phê duyệt"
       liked_consolidated_description:
-        other: "đã thích {{count}} bài viết của bạn"
-      invited_to_private_message: "<p><span>{{username}}</span>{{description}}"
-      invitee_accepted: "<span>{{username}}</span> đã chấp nhận lời mời của bạn"
-      moved_post: "<span>{{username}}</span> đã chuyển {{description}}"
+        other: "đã thích %{count} bài viết của bạn"
+      invited_to_private_message: "<p><span>%{username}</span>%{description}"
+      invitee_accepted: "<span>%{username}</span> đã chấp nhận lời mời của bạn"
+      moved_post: "<span>%{username}</span> đã chuyển %{description}"
       popup:
-        mentioned: '{{username}} nhắc đến bạn trong "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} nhắc đến bạn trong "{{topic}}" - {{site_title}}'
-        quoted: '{{username}} trích lời bạn trong "{{topic}}" - {{site_title}}'
-        replied: '{{username}} trả lời cho bạn trong "{{topic}}" - {{site_title}}'
-        posted: '{{username}} gửi bài trong "{{topic}}" - {{site_title}}'
-        linked: '{{username}} liên quan đến bài viết của bạn từ "{{topic}}" - {{site_title}}'
+        mentioned: '%{username} nhắc đến bạn trong "%{topic}" - %{site_title}'
+        group_mentioned: '%{username} nhắc đến bạn trong "%{topic}" - %{site_title}'
+        quoted: '%{username} trích lời bạn trong "%{topic}" - %{site_title}'
+        replied: '%{username} trả lời cho bạn trong "%{topic}" - %{site_title}'
+        posted: '%{username} gửi bài trong "%{topic}" - %{site_title}'
+        linked: '%{username} liên quan đến bài viết của bạn từ "%{topic}" - %{site_title}'
       titles:
         liked: "lượt thích mới"
         watching_first_post: "chủ đề mới"
@@ -1393,9 +1396,9 @@ vi:
       from_my_computer: "Từ thiết bị của tôi"
       from_the_web: "Từ Web"
       remote_tip: "đường dẫn tới hình ảnh"
-      remote_tip_with_attachments: "chọn ảnh hoặc file {{authorized_extensions}}"
+      remote_tip_with_attachments: "chọn ảnh hoặc file %{authorized_extensions}"
       local_tip: "chọn hình từ thiết bị của bạn"
-      local_tip_with_attachments: "chọn ảnh hoặc file {{authorized_extensions}} từ thiết bị của bạn"
+      local_tip_with_attachments: "chọn ảnh hoặc file %{authorized_extensions} từ thiết bị của bạn"
       hint: "(Bạn cũng có thể kéo & thả vào trình soạn thảo để tải chúng lên)"
       hint_for_supported_browsers: "bạn có thể kéo và thả ảnh vào trình soan thảo này"
       uploading: "Đang tải lên"
@@ -1412,17 +1415,17 @@ vi:
       clear_all: "Xóa tất cả"
       too_short: "Từ khoá tìm kiếm của bạn quá ngắn."
       result_count:
-        other: "Hơn <span>{{count}}{{plus}} kết quả cho</span><span class='term'>{{term}}</span>"
+        other: "Hơn <span>%{count}%{plus} kết quả cho</span><span class='term'>%{term}</span>"
       title: "tìm kiếm chủ đề, bài viết, tài khoản hoặc các danh mục"
       no_results: "Không tìm thấy kết quả."
       no_more_results: "Không tìm thấy kết quả"
       searching: "Đang tìm ..."
-      post_format: "#{{post_number}} bởi {{username}}"
-      results_page: "Kết quả tìm kiếm cho '{{term}}'"
+      post_format: "#%{post_number} bởi %{username}"
+      results_page: "Kết quả tìm kiếm cho '%{term}'"
       search_google_button: "G"
       search_google_title: "Tìm trong trang n"
       context:
-        user: "Tìm bài viết của @{{username}}"
+        user: "Tìm bài viết của @%{username}"
         topic: "Tìm trong chủ đề này"
         private_messages: "Tìm tin nhắn"
       advanced:
@@ -1479,7 +1482,7 @@ vi:
         notification_level: "Thông báo"
         choose_new_category: "Chọn chuyên mục mới cho chủ đề này:"
         selected:
-          other: "Bạn đã chọn <b>{{count}}</b> chủ đề"
+          other: "Bạn đã chọn <b>%{count}</b> chủ đề"
         choose_new_tags: "Chọn thẻ mới cho các chuyên mục sau:"
       none:
         unread: "Bạn không có chủ đề nào chưa đọc."
@@ -1488,7 +1491,7 @@ vi:
         posted: "Bạn vẫn chưa đăng bài trong bất kì một chủ đề nào"
         latest: "Chán quá. Chẳng có chủ đề mới nào hết trơn."
         bookmarks: "Bạn chưa chủ đề nào được đánh dấu."
-        category: "Không có chủ đề nào trong {{category}} ."
+        category: "Không có chủ đề nào trong %{category} ."
         top: "Không có chủ đề top."
         educate:
           new: '<p>Chủ đề mới của bạn sẽ hiển thị ở đây.</p><p>Mặc định, chủ đề được coi là mới và sẽ hiển thị <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">new</span> cho biết chúng đã được tạo ra trong 2 ngày qua.</p><p>Xem <a href="%{userPrefsUrl}">thiết lập</a> của bạn nếu muốn thay đổi.</p>'
@@ -1499,7 +1502,7 @@ vi:
         read: "Không còn thêm chủ đề chưa đọc nào nữa."
         new: "Không còn thêm chủ đề mới nào nữa."
         unread: "Không còn thêm chủ đề chưa đọc nào nữa."
-        category: "Không còn thêm chủ đề nào trong {{category}} ."
+        category: "Không còn thêm chủ đề nào trong %{category} ."
         top: "Không còn của đề top nào nữa."
         bookmarks: "Không còn thêm chủ đề được đánh dấu nào nữa."
     topic:
@@ -1520,9 +1523,9 @@ vi:
       new: "chủ đề mới"
       unread: "chưa đọc"
       new_topics:
-        other: "{{count}} chủ đề mới."
+        other: "%{count} chủ đề mới."
       unread_topics:
-        other: "{{count}} chủ đề chưa đọc."
+        other: "%{count} chủ đề chưa đọc."
       title: "Chủ đề"
       invalid_access:
         title: "Chủ đề này là riêng tư"
@@ -1535,19 +1538,19 @@ vi:
         title: "Không tìm thấy chủ đề"
         description: "Xin lỗi, chúng tôi không thể tìm thấy chủ đề đó. Có lẽ nó đã bị loại bởi mod?"
       total_unread_posts:
-        other: "Bạn có {{number}} bài đăng chưa đọc trong chủ đề này"
+        other: "Bạn có %{number} bài đăng chưa đọc trong chủ đề này"
       unread_posts:
-        other: "bạn có {{number}} bài đăng củ chưa đọc trong chủ đề này"
+        other: "bạn có %{number} bài đăng củ chưa đọc trong chủ đề này"
       new_posts:
-        other: "có {{count}} bài đăng mới trong chủ đề này từ lần đọc cuối"
+        other: "có %{count} bài đăng mới trong chủ đề này từ lần đọc cuối"
       likes:
-        other: "có {{count}} thích trong chủ để này"
+        other: "có %{count} thích trong chủ để này"
       back_to_list: "Quay lại danh sách chủ đề"
       options: "Các lựa chọn chủ đề"
       show_links: "Hiển thị liên kết trong chủ đề này"
       toggle_information: "chuyển đổi các chi tiết chủ để"
-      read_more_in_category: "Muốn đọc nữa? Xem qua các chủ đề khác trong {{catLink}} hoặc {{latestLink}}"
-      read_more: "Muốn đọc nữa? {{catLink}} hoặc {{latestLink}}"
+      read_more_in_category: "Muốn đọc nữa? Xem qua các chủ đề khác trong %{catLink} hoặc %{latestLink}"
+      read_more: "Muốn đọc nữa? %{catLink} hoặc %{latestLink}"
       read_more_MF: "Có { UNREAD, plural, =0 {} one { is <a href='{basePath}/unread'>1 unread</a> } other { are <a href='{basePath}/unread'># unread</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='{basePath}/new'>1 new</a> topic} other { {BOTH, select, true{and } false {are } other{}} <a href='{basePath}/new'># new</a> topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Duyệt tất cả các hạng mục
       view_latest_topics: xem các chủ đề mới nhất
@@ -1667,23 +1670,23 @@ vi:
         success_message: "Bạn đã đánh dấu thành công chủ đề này"
       feature_topic:
         title: "Đề cao chủ đề này"
-        pin: "Làm cho chủ đề này xuất hiện trên top của chuyên mục {{categoryLink}}"
-        confirm_pin: "Bạn đã có {{count}} chủ đề được ghim. Qúa nhiều chủ đề được ghim có thể là một trở ngại cho những thành viên mới và thành viên ẩn danh. Bạn có chắc chắn muốn ghim chủ đề khác trong chuyên mục này?"
-        unpin: "Xóa chủ đề này từ phần trên cùng của chủ đề {{categoryLink}}"
-        unpin_until: "Gỡ bỏ chủ đề này khỏi top của chuyên mục {{categoryLink}} và đợi cho đến <strong>%{until}</strong>."
+        pin: "Làm cho chủ đề này xuất hiện trên top của chuyên mục %{categoryLink}"
+        confirm_pin: "Bạn đã có %{count} chủ đề được ghim. Qúa nhiều chủ đề được ghim có thể là một trở ngại cho những thành viên mới và thành viên ẩn danh. Bạn có chắc chắn muốn ghim chủ đề khác trong chuyên mục này?"
+        unpin: "Xóa chủ đề này từ phần trên cùng của chủ đề %{categoryLink}"
+        unpin_until: "Gỡ bỏ chủ đề này khỏi top của chuyên mục %{categoryLink} và đợi cho đến <strong>%{until}</strong>."
         pin_note: "Người dùng có thể bỏ ghim chủ đề riêng cho mình"
         pin_validation: "Ngày được yêu câu để gắn chủ đề này"
-        not_pinned: "Không có chủ đề được ghim trong {{categoryLink}}."
+        not_pinned: "Không có chủ đề được ghim trong %{categoryLink}."
         already_pinned:
-          other: "Chủ đề gần đây được ghim trong {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Chủ đề gần đây được ghim trong %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Làm cho chủ đề này xuất hiện trên top của tất cả các chủ đề"
-        confirm_pin_globally: "Bạn đã có {{count}} chủ đề được ghim. Ghim quá nhiều chủ đề có thể là trở ngại cho những thành viên mới và ẩn danh. Bạn có chắc chắn muốn ghim chủ đề khác?"
+        confirm_pin_globally: "Bạn đã có %{count} chủ đề được ghim. Ghim quá nhiều chủ đề có thể là trở ngại cho những thành viên mới và ẩn danh. Bạn có chắc chắn muốn ghim chủ đề khác?"
         unpin_globally: "Bỏ chủ đề này khỏi phần trên cùng của danh sách tất cả các chủ đề"
         unpin_globally_until: "Gỡ bỏ chủ đề này khỏi top của danh sách tất cả các chủ đề và đợi cho đến <strong>%{until}</strong>."
         global_pin_note: "Người dùng có thể bỏ ghim chủ đề riêng cho mình"
         not_pinned_globally: "Không có chủ đề nào được ghim."
         already_pinned_globally:
-          other: "Chủ đề gần đây được ghim trong: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Chủ đề gần đây được ghim trong: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "Đặt chủ đề này là một banner xuất hiện trên top của tất cả các trang."
         remove_banner: "Gỡ bỏ banner xuất hiện trên top của tất cả các trang."
         banner_note: "Người dùng có thể bỏ qua banner này bằng cách đóng nó. Chỉ một chủ đề có thể được đặt là banner tại một thời điểm."
@@ -1711,13 +1714,13 @@ vi:
         to_topic_username: "Bạn vừa điền tên thành viên, website sẽ gửi thông báo kèm theo lời mời họ tham gia chủ đề này."
         to_username: "Điền tên thành viên bạn muốn mời, website sẽ gửi thông báo kèm theo lời mời họ tham gia chủ đề này."
         email_placeholder: "name@example.com"
-        success_email: "Website vừa gửi lời mời tới <b>{{emailOrUsername}}</b> và sẽ thông báo cho bạn khi lời mời đó được chấp nhận. Kiểm tra tab lời mời trên trang tài khoản để theo dõi lời mời của bạn."
+        success_email: "Website vừa gửi lời mời tới <b>%{emailOrUsername}</b> và sẽ thông báo cho bạn khi lời mời đó được chấp nhận. Kiểm tra tab lời mời trên trang tài khoản để theo dõi lời mời của bạn."
         success_username: "Website đã mời người đó tham gia thảo luận này."
         error: "Xin lỗi, chúng tôi không thể mời người đó. Có lẽ họ đã được mời? (giới hạn lời mời)"
       login_reply: "Đăng nhập để trả lời"
       filters:
         n_posts:
-          other: "{{count}} bài viết"
+          other: "%{count} bài viết"
         cancel: "Bỏ đièu kiện lọc"
       split_topic:
         title: "Di chuyển tới Chủ đề mới"
@@ -1725,13 +1728,13 @@ vi:
         radio_label: "Chủ đề Mới"
         error: "Có lỗi khi di chuyển bài viết tới chủ đề mới."
         instructions:
-          other: "Bạn muốn tạo chủ đề mới và phổ biến nó với <b>{{count}}</b> bài viết đã chọn."
+          other: "Bạn muốn tạo chủ đề mới và phổ biến nó với <b>%{count}</b> bài viết đã chọn."
       merge_topic:
         title: "Di chuyển tới chủ đề đang tồn tại"
         action: "di chuyển tới chủ đề đang tồn tại"
         error: "Có lỗi khi di chuyển bài viết đến chủ đề này."
         instructions:
-          other: "Hãy chọn chủ đề bạn muốn di chuyển <b>{{count}}</b> bài viết này tới."
+          other: "Hãy chọn chủ đề bạn muốn di chuyển <b>%{count}</b> bài viết này tới."
       move_to_new_message:
         radio_label: "Tin nhắn mới"
       change_owner:
@@ -1745,7 +1748,7 @@ vi:
         instructions: "Hãy chọn dòng thời gian mới cho chủ đề, các bài viết trong chủ đề sẽ được cập nhật để có sự khác biệt cùng một lúc."
       multi_select:
         select: "chọn"
-        selected: "đã chọn ({{count}})"
+        selected: "đã chọn (%{count})"
         select_post:
           label: "chọn"
         select_replies:
@@ -1755,34 +1758,35 @@ vi:
         select_all: chọn tất cả
         deselect_all: bỏ chọn tất cả
         description:
-          other: "Bạn đã chọn <b>{{count}}</b> bài viết."
+          other: "Bạn đã chọn <b>%{count}</b> bài viết."
     post:
       quote_reply: "Trích dẫn"
       edit_reason: "Lý do: "
-      post_number: "bài viết {{number}}"
+      post_number: "bài viết %{number}"
       last_edited_on: "đã sửa bài viết lần cuối lúc"
       reply_as_new_topic: "Trả lời như là liên kết đến Chủ đề"
-      continue_discussion: "Tiếp tục thảo luận từ {{postLink}}:"
+      continue_discussion: "Tiếp tục thảo luận từ %{postLink}:"
       follow_quote: "đến bài viết trích dẫn"
       show_full: "Hiển thị đầy đủ bài viết"
       deleted_by_author:
         other: "(bài viết theo tác giả sẽ được xóa tự động sau %{count} giờ, trừ khi đã đánh dấu)"
       expand_collapse: "mở/đóng"
       gap:
-        other: "xem {{count}} trả lời bị ẩn"
+        other: "xem %{count} trả lời bị ẩn"
       unread: "Bài viết chưa đọc"
       has_replies:
-        other: "{{count}} Trả lời"
+        other: "%{count} Trả lời"
       has_likes_title:
-        other: "{{count}} người thích bài viết này"
+        other: "%{count} người thích bài viết này"
       has_likes_title_only_you: "bạn đã like bài viết này"
       has_likes_title_you:
-        other: "bạn và {{count}} người khác đã like bài viết này"
+        other: "bạn và %{count} người khác đã like bài viết này"
       errors:
         create: "Xin lỗi, có lỗi xảy ra khi tạo bài viết của bạn. Vui lòng thử lại."
         edit: "Xin lỗi, có lỗi xảy ra khi sửa bài viết của bạn. Vui lòng thử lại."
         upload: "Xin lỗi, có lỗi xảy ra khi tải lên tập tin này. Vui lòng thử lại."
         too_many_uploads: "Xin lỗi, bạn chỉ có thể tải lên 1 file cùng 1 lúc."
+        upload_not_authorized: "Xin lỗi, tập tin của bạn tải lên không được cho phép (định dạng cho phép: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Xin lỗi, tài khoản mới không thể tải lên ảnh."
         attachment_upload_not_allowed_for_new_user: "Xin lỗi, tài khoản mới không thể tải lên đính kèm."
         attachment_download_requires_login: "Xin lỗi, bạn cần đăng nhập để tải về đính kèm."
@@ -1842,7 +1846,7 @@ vi:
           like:
             other: "thích này"
           like_capped:
-            other: "và {{count}} người khác thích nầy"
+            other: "và %{count} người khác thích nầy"
         by_you:
           off_topic: "Bạn đã đánh dấu cái nfay là chủ đề đóng"
           spam: "Bạn đã đánh dấu cái này là rác"
@@ -1987,9 +1991,9 @@ vi:
       custom_placeholder_notify_moderators: "Hãy cho chúng tôi biết cụ thể những gì bạn quan tâm, và cung cấp các liên kết hoặc ví dụ liên quan nếu có thể."
       custom_message:
         at_least:
-          other: "nhập ít nhất {{count}} kí tự"
+          other: "nhập ít nhất %{count} kí tự"
         left:
-          other: "{{count}} còn lại"
+          other: "%{count} còn lại"
     flagging_topic:
       title: "Cám ơn bạn đã giúp phát triển cộng đồng!"
       action: "Gắn cờ Chủ đề"
@@ -2027,7 +2031,7 @@ vi:
       unlisted:
         help: "Chủ đề này ẩn, nó sẽ không hiển thị trong danh sách chủ đề, và chỉ có thể truy cập thông qua liên kết trực tiếp"
     posts: "Bài viết"
-    posts_long: "Có {{number}} bài đăng trong chủ đề này"
+    posts_long: "Có %{number} bài đăng trong chủ đề này"
     posts_likes_MF: |2
 
       Chủ đề này có {count, plural, one {1 reply} other {# replies}} {ratio, select,
@@ -2045,18 +2049,18 @@ vi:
       other: "lượt xem"
     replies: "Trả lời"
     views_long:
-      other: "chủ đề này đã được xem {{number}} lần"
+      other: "chủ đề này đã được xem %{number} lần"
     activity: "Hoạt động"
     likes: "Lượt thích"
     likes_lowercase:
       other: "lượt thích"
-    likes_long: "Có {{number}} thích trong chủ đề này"
+    likes_long: "Có %{number} thích trong chủ đề này"
     users: "Người dùng"
     users_lowercase:
       other: "người dùng"
     category_title: "Danh mục"
     history: "Lịch sử"
-    changed_by: "bởi {{author}}"
+    changed_by: "bởi %{author}"
     raw_email:
       not_available: "Không sẵn sàng!"
     categories_list: "Danh sách Danh mục"
@@ -2066,29 +2070,29 @@ vi:
       latest:
         title: "Mới nhất"
         title_with_count:
-          other: "Mới nhất ({{count}})"
+          other: "Mới nhất (%{count})"
         help: "chủ đề với bài viết gần nhất"
       read:
         title: "Đọc"
         help: "chủ đề bạn đã đọc, theo thứ tự bạn đọc lần cuối cùng"
       categories:
         title: "Danh mục"
-        title_in: "Danh mục - {{categoryName}}"
+        title_in: "Danh mục - %{categoryName}"
         help: "tất cả các chủ đề được nhóm theo chuyên mục"
       unread:
         title: "Chưa đọc"
         title_with_count:
-          other: "Chưa đọc ({{count}})"
+          other: "Chưa đọc (%{count})"
         help: "chủ đề bạn đang xem hoặc theo dõi có bài viết chưa đọc"
         lower_title_with_count:
-          other: "{{count}} chưa đọc"
+          other: "%{count} chưa đọc"
       new:
         lower_title_with_count:
-          other: "{{count}} mới"
+          other: "%{count} mới"
         lower_title: "mới"
         title: "Mới"
         title_with_count:
-          other: "Mới ({{count}})"
+          other: "Mới (%{count})"
         help: "chủ đề đã tạo cách đây vài ngày"
       posted:
         title: "Bài viết của tôi"
@@ -2097,10 +2101,10 @@ vi:
         title: "Đánh dấu"
         help: "chủ để của bạn đã được đánh dấu"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          other: "{{categoryName}} ({{count}})"
-        help: "Những chủ đề mới nhất trong chuyên mục{{categoryName}} "
+          other: "%{categoryName} (%{count})"
+        help: "Những chủ đề mới nhất trong chuyên mục%{categoryName} "
       top:
         title: "Top"
         help: "Các chủ đề tích cực nhất trong năm, tháng, tuần, hoặc ngày trước"
@@ -2415,10 +2419,10 @@ vi:
           label: "Tải lên"
           title: "Tải lên bản sao lưu cho phiên bản này"
           uploading: "Đang tải lên..."
-          error: "Có lõi trong quá trình tải lên '{{filename}}': {{message}}"
+          error: "Có lõi trong quá trình tải lên '%{filename}': %{message}"
         operations:
           is_running: "Tác vụ đang chạy..."
-          failed: "{{operation}} Thấy bại. Vui lòng xem log."
+          failed: "%{operation} Thấy bại. Vui lòng xem log."
           cancel:
             label: "Hủy"
             title: "Hủy tác vụ hiện tại"
@@ -2751,8 +2755,8 @@ vi:
           title: "Khám phá email của tài khoản này"
           text: "Hiển thị"
       user:
-        suspend_failed: "Có gì đó đã sai khi đình chỉ tài khoản này {{error}}"
-        unsuspend_failed: "Có gì đó sai khi gỡ bỏ đình chỉ tài khoản này {{error}}"
+        suspend_failed: "Có gì đó đã sai khi đình chỉ tài khoản này %{error}"
+        unsuspend_failed: "Có gì đó sai khi gỡ bỏ đình chỉ tài khoản này %{error}"
         suspend_duration: "Tài khoản này sẽ bị đình chỉ bao lâu?"
         suspend_reason_label: "Tại sao bạn bị đình chỉ? Dòng chữ <b>hiển thị cho tất cả mọi người</b> sẽ hiển thị trên trang hồ sơ tài khoản của người dùng này, và sẽ hiển thị cho thành viên khi họ đăng nhập, hãy viết ngắn."
         suspend_reason: "Lý do"
@@ -3021,6 +3025,7 @@ vi:
         title: "Emoji"
         help: "Thêm emoji mới có sẵn cho tất cả mọi người. (MẸO: kéo & thả nhiều file cùng lúc)"
         add: "Thêm emoji mới"
+        uploading: "Đang tải lên..."
         name: "Tên"
         group: "Nhóm"
         image: "Hình ảnh"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 5840f236e2..adf1102e5f 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -22,8 +22,8 @@ zh_CN:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}}K"
-        millions: "{{number}}M"
+        thousands: "%{number}K"
+        millions: "%{number}M"
     dates:
       time: "HH:mm"
       time_with_zone: "HH:mm (z)"
@@ -204,7 +204,7 @@ zh_CN:
     weekly: "每周"
     every_month: "每月"
     every_six_months: "每6个月"
-    max_of_count: "不超过 {{count}}"
+    max_of_count: "不超过 %{count}"
     alternation: "或"
     character_count:
       other: "%{count} 个字符"
@@ -282,11 +282,11 @@ zh_CN:
         yes_value: "是的，舍弃"
         no_value: "不，保持"
     topic_count_latest:
-      other: "有 {{count}} 个更新或新主题"
+      other: "有 %{count} 个更新或新主题"
     topic_count_unread:
-      other: "有 {{count}} 个未读主题"
+      other: "有 %{count} 个未读主题"
     topic_count_new:
-      other: "有 {{count}} 个新主题"
+      other: "有 %{count} 个新主题"
     preview: "预览"
     cancel: "取消"
     save: "保存更改"
@@ -294,7 +294,7 @@ zh_CN:
     saved: "已保存！"
     upload: "上传"
     uploading: "上传中…"
-    uploading_filename: "上传中：{{filename}}..."
+    uploading_filename: "上传中：%{filename}..."
     clipboard: "剪贴板"
     uploaded: "上传成功！"
     pasting: "粘贴中…"
@@ -348,7 +348,7 @@ zh_CN:
         optional: "你可以认领此条目以避免被他人审核。"
         required: "在你审核之前你必须认领此条目。"
         claimed_by_you: "你已认领此条目现在可以审核了。"
-        claimed_by_other: "此条目仅可被<b>{{username}}</b>审核。"
+        claimed_by_other: "此条目仅可被<b>%{username}</b>审核。"
       claim:
         title: "认领该主题"
       unclaim:
@@ -367,7 +367,7 @@ zh_CN:
       none: "没有项目需要审核"
       view_pending: "查看待审核"
       topic_has_pending:
-        other: "该主题中有 <b>{{count}}</b> 个帖等待审核中"
+        other: "该主题中有 <b>%{count}</b> 个帖等待审核中"
       title: "审核"
       topic: "主题："
       filtered_topic: "您正在选择性地查看这一主题中的可审核内容。"
@@ -384,13 +384,13 @@ zh_CN:
         fields: "字段"
       user_percentage:
         summary:
-          other: "{{agreed}}，{{disagreed}}，{{ignored}}（共{{count}}个标记）"
+          other: "%{agreed}，%{disagreed}，%{ignored}（共%{count}个标记）"
         agreed:
-          other: "{{count}}%同意"
+          other: "%{count}%同意"
         disagreed:
-          other: "{{count}}%不同意"
+          other: "%{count}%不同意"
         ignored:
-          other: "{{count}}%忽略"
+          other: "%{count}%忽略"
       topics:
         topic: "主题"
         reviewable_count: "计数"
@@ -399,9 +399,9 @@ zh_CN:
         original: "（原主题）"
         details: "详情"
         unique_users:
-          other: "{{count}} 位用户"
+          other: "%{count} 位用户"
       replies:
-        other: "{{count}} 个回复"
+        other: "%{count} 个回复"
       edit: "编辑"
       save: "保存"
       cancel: "取消"
@@ -464,22 +464,22 @@ zh_CN:
         title: "等待审核中"
         description: "我们已经收到了你的发帖，不过帖子需要由版主审核才能显示。请耐心等待。"
         pending_posts:
-          other: "你有 <strong>{{count}}</strong> 个帖子在等待审核中。"
+          other: "你有 <strong>%{count}</strong> 个帖子在等待审核中。"
         ok: "确认"
     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>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a>回复了<a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>你</a>回复了<a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a>回复了<a href='{{topicUrl}}'>该主题</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>你</a>回复了<a href='{{topicUrl}}'>该主题</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a>提到了<a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a>提到了<a href='{{user2Url}}'>你</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>你</a>提到了<a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "由<a href='{{userUrl}}'>{{user}}</a>发表"
-      posted_by_you: "由<a href='{{userUrl}}'>你</a>发表"
-      sent_by_user: "由<a href='{{userUrl}}'>{{user}}</a>发送"
-      sent_by_you: "由 <a href='{{userUrl}}'>你</a>发送"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a>发表了<a href='%{topicUrl}'>该主题</a>"
+      you_posted_topic: "<a href='%{userUrl}'>你</a>发表了<a href='%{topicUrl}'>该主题</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a>回复了<a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>你</a>回复了<a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a>回复了<a href='%{topicUrl}'>该主题</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>你</a>回复了<a href='%{topicUrl}'>该主题</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a>提到了<a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a>提到了<a href='%{user2Url}'>你</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>你</a>提到了<a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "由<a href='%{userUrl}'>%{user}</a>发表"
+      posted_by_you: "由<a href='%{userUrl}'>你</a>发表"
+      sent_by_user: "由<a href='%{userUrl}'>%{user}</a>发送"
+      sent_by_you: "由 <a href='%{userUrl}'>你</a>发送"
     directory:
       filter_name: "按用户名筛选"
       title: "用户"
@@ -653,7 +653,7 @@ zh_CN:
         icon: "选择图标"
         image: "上传图片"
     user_action_groups:
-      "1": "点赞赞"
+      "1": "点赞"
       "2": "获得赞"
       "3": "收藏"
       "4": "主题"
@@ -712,7 +712,7 @@ zh_CN:
       none: "（选择一项）"
       required: '请为“%{name}”输入一个值。'
     user:
-      said: "{{username}}："
+      said: "%{username}："
       profile: "个人资料"
       mute: "防打扰"
       edit: "修改设置"
@@ -788,12 +788,12 @@ zh_CN:
       enable_defer: "启用延迟以标记未读主题"
       change: "修改"
       featured_topic: "精选主题"
-      moderator: "{{user}}是版主"
-      admin: "{{user}}是管理员"
+      moderator: "%{user}是版主"
+      admin: "%{user}是管理员"
       moderator_tooltip: "用户是版主"
       admin_tooltip: "用户是管理员"
       silenced_tooltip: "该用户已被禁言。"
-      suspended_notice: "该用户将被禁止登录，直至 {{date}}。"
+      suspended_notice: "该用户将被禁止登录，直至 %{date}。"
       suspended_permanently: "该用户被封禁了。"
       suspended_reason: "原因："
       github_profile: "Github"
@@ -806,7 +806,7 @@ zh_CN:
           静音主题和分类不包含在这些邮件中。
         individual: "为每个新帖发送一封邮件通知"
         individual_no_echo: "为每个除了我发表的新帖发送一封邮件通知"
-        many_per_day: "为每个新帖给我发送邮件（大约每天 {{dailyEmailEstimate}} 封）"
+        many_per_day: "为每个新帖给我发送邮件（大约每天 %{dailyEmailEstimate} 封）"
         few_per_day: "为每个新帖给我发送邮件（大约每天 2 封）"
         warning: "邮件列表模式启用。邮件通知设置被覆盖。"
       tag_settings: "标签"
@@ -836,9 +836,7 @@ zh_CN:
       admin_delete: "删除"
       users: "用户"
       muted_users: "静音"
-      muted_users_instructions: "抑制来自这些用户的所有通知。"
       ignored_users: "忽视"
-      ignored_users_instructions: "封禁所有来自这些用户的帖子和通知。"
       tracked_topics_link: "显示"
       automatically_unpin_topics: "当我完整阅读了主题时自动解除置顶。"
       apps: "应用"
@@ -894,12 +892,12 @@ zh_CN:
         disable: "停用"
         enable: "启用"
         enable_long: "启用备份码"
-        manage: "管理备份码。你还剩下<strong>{{count}}</strong>个备份码。"
+        manage: "管理备份码。你还剩下<strong>%{count}</strong>个备份码。"
         copy_to_clipboard: "复制到剪贴板"
         copy_to_clipboard_error: "复制到剪贴板时出错"
         copied_to_clipboard: "已复制到剪贴板"
         download_backup_codes: "下载备份码"
-        remaining_codes: "你有<strong>{{count}}</strong>个备份码"
+        remaining_codes: "你有<strong>%{count}</strong>个备份码"
         use: "使用备份码"
         enable_prerequisites: "你必须在生成备份代码之前启用主要第二因素。"
         codes:
@@ -964,10 +962,10 @@ zh_CN:
         success_staff: "我们已经发送了一封确认信到你现在的邮箱，请按照邮件内指示完成确认。"
       change_avatar:
         title: "更换头像"
-        gravatar: "<a href='//{{gravatarBaseUrl}}{{gravatarLoginUrl}}' target='_blank'>{{gravatarName}}</a>，基于"
-        gravatar_title: "在{{gravatarName}}网站修改你的头像"
-        gravatar_failed: "我们无法找到此电子邮件的{{gravatarName}}。"
-        refresh_gravatar_title: "刷新你的{{gravatarName}}"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>，基于"
+        gravatar_title: "在%{gravatarName}网站修改你的头像"
+        gravatar_failed: "我们无法找到此电子邮件的%{gravatarName}。"
+        refresh_gravatar_title: "刷新你的%{gravatarName}"
         letter_based: "默认头像"
         uploaded_avatar: "自定义图片"
         uploaded_avatar_empty: "上传自定义图片"
@@ -992,10 +990,10 @@ zh_CN:
         ok: "将通过邮件验证确认"
         required: "请输入一个电子邮件地址"
         invalid: "请填写正确的邮箱地址"
-        authenticated: "你的邮箱已被{{provider}}验证过了"
+        authenticated: "你的邮箱已被%{provider}验证过了"
         frequency_immediately: "如果你没有阅读过摘要邮件中的相关内容，将立即发送电子邮件给你。"
         frequency:
-          other: "仅在 {{count}} 分钟内没有访问时发送邮件给你。"
+          other: "仅在 %{count} 分钟内没有访问时发送邮件给你。"
       associated_accounts:
         title: "关联账户"
         connect: "连接"
@@ -1016,9 +1014,9 @@ zh_CN:
       username:
         title: "用户名"
         instructions: "独一无二，没有空格，简短"
-        short_instructions: "其他人可以用 @{{username}} 来提及你"
+        short_instructions: "其他人可以用 @%{username} 来提及你"
         available: "用户名可用"
-        not_available: "不可用。试试 {{suggestion}} ？"
+        not_available: "不可用。试试 %{suggestion} ？"
         not_available_no_suggestion: "不可用"
         too_short: "用户名过短"
         too_long: "用户名过长"
@@ -1042,11 +1040,11 @@ zh_CN:
         log_out_all: "全部登出"
         active: "现在活跃"
         not_you: "不是你？"
-        show_all: "显示所有（{{count}}）"
+        show_all: "显示所有（%{count}）"
         show_few: "显示部分"
         was_this_you: "这是你吗？"
         was_this_you_description: "如果不是你，我们建议你更改密码并在任何地方注销。"
-        browser_and_device: "{{browser}}在{{device}}"
+        browser_and_device: "%{browser}在%{device}"
         secure_account: "保护我的账户"
         latest_post: "你上次发布了......"
       last_posted: "最后发帖"
@@ -1125,20 +1123,19 @@ zh_CN:
         sent: "上次发送"
         none: "无邀请显示。"
         truncated:
-          other: "只显示前 {{count}} 个邀请。"
+          other: "只显示前 %{count} 个邀请。"
         redeemed: "确认邀请"
         redeemed_tab: "已确认"
-        redeemed_tab_with_count: "已确认（{{count}}）"
+        redeemed_tab_with_count: "已确认（%{count}）"
         redeemed_at: "已确认"
         pending: "待验证邀请"
         pending_tab: "等待中"
-        pending_tab_with_count: "待确认（{{count}}）"
+        pending_tab_with_count: "待确认（%{count}）"
         topics_entered: "已阅主题"
         posts_read_count: "已读帖子"
         expired: "邀请已过期。"
         rescind: "移除"
         rescinded: "邀请已删除"
-        rescind_all: "移除所有过期邀请"
         rescinded_all: "所有过期邀请已删除！"
         rescind_all_confirm: "你确定你想要移除所有过期邀请么？"
         reinvite: "重新发送邀请"
@@ -1149,13 +1146,18 @@ zh_CN:
         time_read: "阅读时间"
         days_visited: "访问天数"
         account_age_days: "账户建立天数"
+        links_tab: "链接"
+        link_created_at: "创建日期"
+        link_groups: 群组
         create: "发送邀请"
         generate_link: "复制邀请链接"
         link_generated: "邀请链接生成成功！"
         valid_for: "邀请链接只对这个邮件地址有效：%{email}"
+        single_user: "单个用户"
+        invite_link:
+          success: "邀请链接生成成功！"
         bulk_invite:
           none: "你还没有邀请任何人。你可以单独邀请用户，也可以通过<a href='https://meta.discourse.org/t/send-bulk-invites/16468'>上传CSV文件</a>批量邀请。"
-          text: "通过文件批量邀请"
           success: "文件上传成功，当操作完成时将通过私信通知你。"
           error: "抱歉，文件必须是CSV格式。"
           confirmation_message: "你将通过电子邮件将邀请发送给在上传的文件中的每一个人。"
@@ -1239,7 +1241,7 @@ zh_CN:
       desc:
         network: "请检查网络状态"
         network_fixed: "网络似乎恢复正常了"
-        server: "错误代码：{{status}}"
+        server: "错误代码：%{status}"
         forbidden: "好像不能进行此操作"
         not_found: "没有这个页面"
         unknown: "出了点小问题"
@@ -1301,8 +1303,8 @@ zh_CN:
       value_prop: "当你创建了账户，我们就可以准确地记录你的阅读进度，你再次访问时就可以回到之前离开的地方。当有人回复你，你可以通过这里或电子邮件收到通知。并且你还可以通过点赞帖子向他人分享你的喜爱之情。:heartbeat:"
     summary:
       enabled_description: "你正在查看主题的精简摘要版本：一些社区公认有意思的帖子。"
-      description: "有 <b>{{replyCount}}</b> 个回复。"
-      description_time: "有 <b>{{replyCount}}</b> 个回复，大约要花 <b>{{readingTime}} 分钟</b>阅读。"
+      description: "有 <b>%{replyCount}</b> 个回复。"
+      description_time: "有 <b>%{replyCount}</b> 个回复，大约要花 <b>%{readingTime} 分钟</b>阅读。"
       enable: "概括本主题"
       disable: "显示所有帖子"
     deleted_filter:
@@ -1315,8 +1317,8 @@ zh_CN:
       invite: "邀请其他人..."
       edit: "添加或移除..."
       leave_message: "你真的想要发送消息么？"
-      remove_allowed_user: "确定将 {{name}} 从本条私信中移除？"
-      remove_allowed_group: "确定将 {{name}} 从本条私信中移除？"
+      remove_allowed_user: "确定将 %{name} 从本条私信中移除？"
+      remove_allowed_group: "确定将 %{name} 从本条私信中移除？"
     email: "邮箱"
     username: "用户名"
     last_seen: "最后活动"
@@ -1325,7 +1327,7 @@ zh_CN:
     trust_level: "信任等级"
     search_hint: "用户名、电子邮件或 IP 地址"
     create_account:
-      disclaimer: "注册即表示你同意<a href='{{privacy_link}}' target='blank'>隐私策略</a>和<a href='{{tos_link}}' target='blank'>服务条款</a>。"
+      disclaimer: "注册即表示你同意<a href='%{privacy_link}' target='blank'>隐私策略</a>和<a href='%{tos_link}' target='blank'>服务条款</a>。"
       title: "创建新账户"
       failed: "出问题了，有可能这个邮箱已经被注册了。试试忘记密码链接？"
     forgot_password:
@@ -1385,7 +1387,7 @@ zh_CN:
       awaiting_activation: "你的账户尚未激活，点击忘记密码链接以重新发送激活邮件。"
       awaiting_approval: "你的账户尚未被论坛版主审核。请等待一段时间，当你的账户被审核时会收到一封电子邮件。"
       requires_invite: "抱歉，本论坛仅接受邀请注册。"
-      not_activated: "你还不能登录。我们已经发送了一封邮件至 <b>{{sentTo}}</b>，请打开它并完成账户激活。"
+      not_activated: "你还不能登录。我们已经发送了一封邮件至 <b>%{sentTo}</b>，请打开它并完成账户激活。"
       not_allowed_from_ip_address: "你使用的 IP 地址已被封禁。"
       admin_not_allowed_from_ip_address: "你不能从这个 IP 地址以管理员身份登录。"
       resend_activation_email: "点击此处重新发送激活邮件。"
@@ -1394,7 +1396,7 @@ zh_CN:
       change_email: "更改邮件地址"
       provide_new_email: "给个新地址！然后我们会再给你发一封确认邮件。"
       submit_new_email: "更新邮件地址"
-      sent_activation_email_again: "我们又向 <b>{{currentEmail}}</b> 发送了一封激活邮件，邮件送达可能需要几分钟；请检查一下你邮箱的垃圾邮件文件夹。"
+      sent_activation_email_again: "我们又向 <b>%{currentEmail}</b> 发送了一封激活邮件，邮件送达可能需要几分钟；请检查一下你邮箱的垃圾邮件文件夹。"
       sent_activation_email_again_generic: "我们发送了另一封激活邮件。它可能需要几分钟才能到达；记得检查你的垃圾邮件文件夹。"
       to_continue: "请登录"
       preferences: "需要登入后更改设置"
@@ -1458,18 +1460,18 @@ zh_CN:
     conditional_loading_section:
       loading: 载入中……
     category_row:
-      topic_count: "{{count}}个主题在此分类中"
+      topic_count: "%{count}个主题在此分类中"
     select_kit:
       default_header_text: 选择…
       no_content: 无符合的结果
       filter_placeholder: 搜索……
       filter_placeholder_with_any: 搜索或创建...
-      create: "创建：“{{content}}”"
+      create: "创建：“%{content}”"
       max_content_reached:
-        other: "你只能选择 {{count}} 条记录。"
+        other: "你只能选择 %{count} 条记录。"
       min_content_not_reached:
-        other: "选择至少{{count}}条。"
-      invalid_selection_length: "选择的字符至少为{{count}}个字符。"
+        other: "选择至少%{count}条。"
+      invalid_selection_length: "选择的字符至少为%{count}个字符。"
       components:
         categories_admin_dropdown:
           title: "分类管理下拉菜单"
@@ -1499,7 +1501,7 @@ zh_CN:
       default: 自定义表情符号
     shared_drafts:
       title: "共享草稿"
-      notice: "只有那些可以看到<b>{{category}}</b>分类的人才能看到此主题。"
+      notice: "只有那些可以看到<b>%{category}</b>分类的人才能看到此主题。"
       destination_category: "目标分类"
       publish: "发布共享草稿"
       confirm_publish: "你确定要发布此草稿吗？"
@@ -1519,23 +1521,23 @@ zh_CN:
       similar_topics: "你的主题有点类似于…"
       drafts_offline: "离线草稿"
       edit_conflict: "编辑冲突"
-      group_mentioned_limit: "<b>警告！</b>你提到了<a href='{{group_link}}'> {{group}} </a>，但该群组的成员数超过了的管理员配置的最大{{max}}人数。没人会收到通知。"
+      group_mentioned_limit: "<b>警告！</b>你提到了<a href='%{group_link}'> %{group} </a>，但该群组的成员数超过了的管理员配置的最大%{max}人数。没人会收到通知。"
       group_mentioned:
-        other: "提及 {{group}} 时，你将通知 <a href='{{group_link}}'>{{count}} 人</a> － 确定吗？"
+        other: "提及 %{group} 时，你将通知 <a href='%{group_link}'>%{count} 人</a> － 确定吗？"
       cannot_see_mention:
-        category: "你提到了 {{username}} ，然而他们不能访问该分类，所以他们不会被通知。你需要把他们加入到能访问该分类的群组中。"
-        private: "你提到了{{userrname}}，然而他们不能访问该私信，所以他们不会被通知。你需要邀请他们至私信中。"
-      duplicate_link: "好像<b>@{{username}}</b>在<a href='{{post_url}}'>{{ago}}</a>中前的回复中已经发了你的链接 <b>{{domain}}</b> － 你想再次发表链接吗？"
-      reference_topic_title: "回复：{{title}}"
+        category: "你提到了 %{username} ，然而他们不能访问该分类，所以他们不会被通知。你需要把他们加入到能访问该分类的群组中。"
+        private: "你提到了%{userrname}，然而他们不能访问该私信，所以他们不会被通知。你需要邀请他们至私信中。"
+      duplicate_link: "好像<b>@%{username}</b>在<a href='%{post_url}'>%{ago}</a>中前的回复中已经发了你的链接 <b>%{domain}</b> － 你想再次发表链接吗？"
+      reference_topic_title: "回复：%{title}"
       error:
         title_missing: "标题为空"
-        title_too_short: "标题过短，至少 {{min}} 个字"
-        title_too_long: "标题过长，最多 {{max}} 个字"
+        title_too_short: "标题过短，至少 %{min} 个字"
+        title_too_long: "标题过长，最多 %{max} 个字"
         post_missing: "帖子不能为空"
-        post_length: "帖子至少要有{{min}} 个字符"
-        try_like: "试试{{heart}}按钮？"
+        post_length: "帖子至少要有%{min} 个字符"
+        try_like: "试试%{heart}按钮？"
         category_missing: "未选择分类"
-        tags_missing: "你必须至少选择{{count}}个标签"
+        tags_missing: "你必须至少选择%{count}个标签"
         topic_template_not_modified: "请通过编辑主题模板来为主题添加详情。"
       save_edit: "保存编辑"
       overwrite_edit: "覆盖编辑"
@@ -1632,9 +1634,9 @@ zh_CN:
     notifications:
       tooltip:
         regular:
-          other: "{{count}} 个未读通知"
+          other: "%{count} 个未读通知"
         message:
-          other: "{{count}} 条未读私信"
+          other: "%{count} 条未读私信"
         high_priority:
           other: "%{count} 个未读的高优先级通知"
       title: "使用@提到你，回复你的内容、私信以及其他的通知"
@@ -1642,45 +1644,45 @@ zh_CN:
       empty: "未发现通知"
       post_approved: "你的帖子已被审核"
       reviewable_items: "待审核帖子"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
       liked_many:
-        other: "<span>{{username}}, {{username2}} 和其他 {{count}} 人</span> {{description}}"
+        other: "<span>%{username}, %{username2} 和其他 %{count} 人</span> %{description}"
       liked_consolidated_description:
-        other: "你的帖子有{{count}}个赞"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> 已接受你的邀请"
-      moved_post: "<span>{{username}}</span> 移动了 {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "获得 “{{description}}”"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>新主题</span> {{description}}"
-      membership_request_accepted: "接受来自“{{group_name}}”的邀请"
-      membership_request_consolidated: "{{count}}个加入“{{group_name}}”群组的请求"
+        other: "你的帖子有%{count}个赞"
+      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}"
+      invitee_accepted: "<span>%{username}</span> 已接受你的邀请"
+      moved_post: "<span>%{username}</span> 移动了 %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "获得 “%{description}”"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>新主题</span> %{description}"
+      membership_request_accepted: "接受来自“%{group_name}”的邀请"
+      membership_request_consolidated: "%{count}个加入“%{group_name}”群组的请求"
       group_message_summary:
-        other: "{{count}} 条私信在{{group_name}}组的收件箱中"
+        other: "%{count} 条私信在%{group_name}组的收件箱中"
       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}}'
+        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}}在%{site_title}的通知"
+        custom: "来自%{username}在%{site_title}的通知"
       titles:
         mentioned: "提及到"
         replied: "新回复"
@@ -1710,9 +1712,9 @@ zh_CN:
       from_my_computer: "来自我的设备"
       from_the_web: "来自网络"
       remote_tip: "图片链接"
-      remote_tip_with_attachments: "链接到图片或文件 {{authorized_extensions}}"
+      remote_tip_with_attachments: "链接到图片或文件 %{authorized_extensions}"
       local_tip: "从你的设备中选择图片"
-      local_tip_with_attachments: "从你的设备 {{authorized_extensions}} 选择图片或文件"
+      local_tip_with_attachments: "从你的设备 %{authorized_extensions} 选择图片或文件"
       hint: "你也可以通过拖放至编辑器的方式来上传"
       hint_for_supported_browsers: "可以拖放或复制粘帖至编辑器以上传"
       uploading: "上传中"
@@ -1729,14 +1731,14 @@ zh_CN:
       clear_all: "清除所有"
       too_short: "你的搜索词太短。"
       result_count:
-        other: "<span>{{count}}{{plus}}结果</span><span class='term'>{{term}}</span>"
+        other: "<span>%{count}%{plus}结果</span><span class='term'>%{term}</span>"
       title: "搜索主题、帖子、用户或分类"
       full_page_title: "搜索主题或帖子"
       no_results: "没有找到结果。"
       no_more_results: "没有找到更多结果。"
       searching: "搜索中…"
-      post_format: "#{{post_number}} 来自于 {{username}}"
-      results_page: "关于“{{term}}”的搜索结果"
+      post_format: "#%{post_number} 来自于 %{username}"
+      results_page: "关于“%{term}”的搜索结果"
       more_results: "还有更多结果。请增加你的搜索条件。"
       cant_find: "找不到你要找的内容？"
       start_new_topic: "不如创建一个新主题？"
@@ -1745,9 +1747,9 @@ zh_CN:
       search_google_button: "Google"
       search_google_title: "站内搜索"
       context:
-        user: "搜索 @{{username}} 的帖子"
-        category: "搜索 #{{category}} 分类"
-        tag: "搜索＃{{tag}}标签"
+        user: "搜索 @%{username} 的帖子"
+        category: "搜索 #%{category} 分类"
+        tag: "搜索＃%{tag}标签"
         topic: "搜索本主题"
         private_messages: "搜索私信"
       advanced:
@@ -1823,7 +1825,7 @@ zh_CN:
         notification_level: "通知"
         choose_new_category: "选择新分类："
         selected:
-          other: "已选择 <b>{{count}}</b>个主题"
+          other: "已选择 <b>%{count}</b>个主题"
         change_tags: "替换标签"
         append_tags: "添加标签"
         choose_new_tags: "为主题选择新标签："
@@ -1836,7 +1838,7 @@ zh_CN:
         posted: "你尚未在任何主题中发帖。"
         latest: "没有新的主题。"
         bookmarks: "你没有收藏任何主题。"
-        category: "{{category}}分类中没有主题。"
+        category: "%{category}分类中没有主题。"
         top: "没有热门主题。"
         educate:
           new: '<p>这里会显示近期的新主题。 </p><p>默认情况下，会显示近 2 天内创建的主题，还会显示一个<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">近期</span>的标志。<p>你可以在<a href="%{userPrefsUrl}">用户设置</a>中修改。</p>'
@@ -1847,12 +1849,12 @@ zh_CN:
         read: "没有更多已阅主题可看了。"
         new: "没有更多的近期主题。"
         unread: "没有更多未读主题了。"
-        category: "没有更多{{category}}分类的主题了。"
+        category: "没有更多%{category}分类的主题了。"
         top: "没有更多的热门主题."
         bookmarks: "没有更多收藏的主题了。"
     topic:
       filter_to:
-        other: "本主题中的 {{count}} 帖"
+        other: "本主题中的 %{count} 帖"
       create: "创建新主题"
       create_long: "创建新的主题"
       open_draft: "打开草稿"
@@ -1880,9 +1882,9 @@ zh_CN:
       new: "近期主题"
       unread: "未读"
       new_topics:
-        other: "{{count}} 近期主题"
+        other: "%{count} 近期主题"
       unread_topics:
-        other: "{{count}} 未读主题"
+        other: "%{count} 未读主题"
       title: "主题"
       invalid_access:
         title: "这是私密主题"
@@ -1895,21 +1897,21 @@ zh_CN:
         title: "未找到主题"
         description: "抱歉，无法找到此主题。可能已经被删除了。"
       total_unread_posts:
-        other: "这个主题中，你有 {{count}} 条未读的帖子"
+        other: "这个主题中，你有 %{count} 条未读的帖子"
       unread_posts:
-        other: "这个主题中，你有 {{count}} 个未读的帖子"
+        other: "这个主题中，你有 %{count} 个未读的帖子"
       new_posts:
-        other: "自你上一次阅读此主题后，又有 {{count}} 个新帖子发表了"
+        other: "自你上一次阅读此主题后，又有 %{count} 个新帖子发表了"
       likes:
-        other: "本主题已得到 {{number}} 个赞"
+        other: "本主题已得到 %{number} 个赞"
       back_to_list: "返回列表"
       options: "主题选项"
       show_links: "显示此主题中的链接"
       toggle_information: "切换主题详情"
-      read_more_in_category: "想阅读更多？浏览{{catLink}}的其他主题或{{latestLink}}。"
-      read_more: "想阅读更多？{{catLink}}或{{latestLink}}。"
-      group_request: "你需要请求加入`{{name}}`群组才能查看此主题。"
-      group_join: "你需要加入`{{name}}`群组以查看此主题"
+      read_more_in_category: "想阅读更多？浏览%{catLink}的其他主题或%{latestLink}。"
+      read_more: "想阅读更多？%{catLink}或%{latestLink}。"
+      group_request: "你需要请求加入`%{name}`群组才能查看此主题。"
+      group_join: "你需要加入`%{name}`群组以查看此主题"
       group_request_sent: "你加入群组的请求已发送。当被接受时你会收到通知。"
       unread_indicator: "还没有成员读过此主题的最新帖子。"
       read_more_MF: "还有 { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 个未读主题</a>} other { <a href='{basePath}/unread'># 个未读主题</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{和 } false {} other{}} <a href='{basePath}/new'>1 个新</a>主题} other { {BOTH, select, true{和 } false {} other{}} <a href='{basePath}/new'># 个近期</a>主题} }可以阅读，或者{CATEGORY, select, true {浏览{catLink}中的其他主题} false {{latestLink}} other {}}"
@@ -2012,7 +2014,7 @@ zh_CN:
           "2_8": "因为你追踪了该分类，所以你会看到新回复的数量。"
           "2_4": "你会看到新回复的数量的原因是你曾经回复过该主题。"
           "2_2": "你会看到新回复数量的原因是你正在追踪该主题。"
-          "2": '你会看到新回复的数量是因为你<a href="{{basePath}}/u/{{username}}/preferences/notifications">阅读过该主题</a>。'
+          "2": '你会看到新回复的数量是因为你<a href="%{basePath}/u/%{username}/preferences/notifications">阅读过该主题</a>。'
           "1_2": "有人@你或回复你时会通知你。"
           "1": "如果有人@你或回复你，将通知你。"
           "0_7": "你将忽略关于该分类的所有通知。"
@@ -2088,23 +2090,23 @@ zh_CN:
         choose_category: "请选择公共主题分类："
       feature_topic:
         title: "置顶主题"
-        pin: "将该主题置于{{categoryLink}}分类最上方至"
-        confirm_pin: "已有{{count}}个置顶主题。太多的置顶主题可能会困扰新用户和访客。确定想在该分类再置顶一个主题？"
-        unpin: "从{{categoryLink}}分类最上方移除主题。"
-        unpin_until: "从{{categoryLink}}分类最上方移除主题或者移除于<strong>%{until}</strong>。"
+        pin: "将该主题置于%{categoryLink}分类最上方至"
+        confirm_pin: "已有%{count}个置顶主题。太多的置顶主题可能会困扰新用户和访客。确定想在该分类再置顶一个主题？"
+        unpin: "从%{categoryLink}分类最上方移除主题。"
+        unpin_until: "从%{categoryLink}分类最上方移除主题或者移除于<strong>%{until}</strong>。"
         pin_note: "允许用户取消置顶。"
         pin_validation: "置顶该主题需要一个日期。"
-        not_pinned: "{{categoryLink}}没有置顶主题。"
+        not_pinned: "%{categoryLink}没有置顶主题。"
         already_pinned:
-          other: "{{categoryLink}}分类的置顶主题数：<strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "%{categoryLink}分类的置顶主题数：<strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "将主题置于所有主题列表最上方至"
-        confirm_pin_globally: "已有{{count}}个全局置顶主题。太多的置顶主题可能会困扰新用户和访客。确定想再全局置顶一个主题？"
+        confirm_pin_globally: "已有%{count}个全局置顶主题。太多的置顶主题可能会困扰新用户和访客。确定想再全局置顶一个主题？"
         unpin_globally: "将主题从所有主题列表的最上方移除。"
         unpin_globally_until: "从所有主题列表最上方移除主题或者移除于<strong>%{until}</strong>。"
         global_pin_note: "用户可以自行取消全局置顶。"
         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: "用户能够通隐藏横幅。在同一时间内只能设置一个横幅主题。"
@@ -2134,14 +2136,14 @@ zh_CN:
         to_topic_username: "你输入了用户名。我们将发送一个至该主题链接的邀请通知。"
         to_username: "输入你想邀请的人的用户名。我们将发送一个至该主题链接的邀请通知。"
         email_placeholder: "name@example.com"
-        success_email: "我们发了一封邮件邀请<b>{{emailOrUsername}}</b>。邀请被接受后你会收到通知。检查用户页中的邀请标签页来追踪你的邀请。"
+        success_email: "我们发了一封邮件邀请<b>%{emailOrUsername}</b>。邀请被接受后你会收到通知。检查用户页中的邀请标签页来追踪你的邀请。"
         success_username: "我们已经邀请了该用户参与该主题。"
         error: "抱歉，我们不能邀请这个人。可能他已经被邀请了？（邀请有频率限制）"
-        success_existing_email: "用户<b>{{emailOrUsername}}</b>已存在。我们已经邀请了该用户参与该主题。"
+        success_existing_email: "用户<b>%{emailOrUsername}</b>已存在。我们已经邀请了该用户参与该主题。"
       login_reply: "登录以回复"
       filters:
         n_posts:
-          other: "{{count}} 个帖子"
+          other: "%{count} 个帖子"
         cancel: "取消筛选"
       move_to:
         title: "移动到"
@@ -2154,14 +2156,14 @@ zh_CN:
         radio_label: "创建新主题"
         error: "拆分主题时发生错误。"
         instructions:
-          other: "你将创建一个新的主题，并包含你选择的 <b>{{count}}</b> 个帖子。"
+          other: "你将创建一个新的主题，并包含你选择的 <b>%{count}</b> 个帖子。"
       merge_topic:
         title: "合并主题"
         action: "合并主题"
         error: "合并主题时发生错误。"
         radio_label: "现存的主题"
         instructions:
-          other: "请选择一个主题以便移动这 <b>{{count}}</b> 个帖子。"
+          other: "请选择一个主题以便移动这 <b>%{count}</b> 个帖子。"
       move_to_new_message:
         title: "移动到新的即时信息"
         action: "移动到新的私信"
@@ -2169,14 +2171,14 @@ zh_CN:
         radio_label: "创建新私信"
         participants: "参与者"
         instructions:
-          other: "你正在发送<b>{{count}}</b>篇帖子到一条新的私信/消息。"
+          other: "你正在发送<b>%{count}</b>篇帖子到一条新的私信/消息。"
       move_to_existing_message:
         title: "移动到现存的私信"
         action: "移动到已存在的私信"
         radio_label: "现存的私信"
         participants: "参与者"
         instructions:
-          other: "请选择你要将<b>{{count}}</b>个帖子所移动到的私信。"
+          other: "请选择你要将<b>%{count}</b>个帖子所移动到的私信。"
       merge_posts:
         title: "合并选择的帖子"
         action: "合并选择的帖子"
@@ -2199,9 +2201,9 @@ zh_CN:
         error: "更改帖子作者时发生错误。"
         placeholder: "新作者的用户名"
         instructions:
-          other: "请选择<b>@{{old_user}}</b>创建的{{count}}个帖子的新作者。"
+          other: "请选择<b>@%{old_user}</b>创建的%{count}个帖子的新作者。"
         instructions_without_old_user:
-          other: "请为此{{count}}个帖子选择一个新的拥有者。"
+          other: "请为此%{count}个帖子选择一个新的拥有者。"
       change_timestamp:
         title: "修改时间"
         action: "修改时间"
@@ -2210,7 +2212,7 @@ zh_CN:
         instructions: "请为主题选择新的时间。主题中的所有帖子将按照相同的时间差更新。"
       multi_select:
         select: "选择"
-        selected: "已选择（{{count}}）"
+        selected: "已选择（%{count}）"
         select_post:
           label: "选中"
           title: "将帖子加入选择"
@@ -2228,19 +2230,19 @@ zh_CN:
         select_all: 全选
         deselect_all: 全不选
         description:
-          other: "已选择 <b>{{count}}</b> 个帖子。"
+          other: "已选择 <b>%{count}</b> 个帖子。"
       deleted_by_author:
         other: "（主题被作者撤回，除非被标记，不然将在%{count}小时后自动删除）"
     post:
       quote_reply: "引用"
       edit_reason: "理由："
-      post_number: "帖子 {{number}}"
+      post_number: "帖子 %{number}"
       ignored: "忽视的内容"
       wiki_last_edited_on: "维基最后修改于"
       last_edited_on: "最后修改于"
       reply_as_new_topic: "回复为联结主题"
       reply_as_new_private_message: "向相同的收件人回复新私信"
-      continue_discussion: "自 {{postLink}} 继续讨论："
+      continue_discussion: "自 %{postLink} 继续讨论："
       follow_quote: "转到所引用的帖子"
       show_full: "显示完整帖子"
       show_hidden: "显示已忽略内容。"
@@ -2250,26 +2252,26 @@ zh_CN:
       expand_collapse: "展开/折叠"
       locked: "一管理人员锁定了该帖的编辑"
       gap:
-        other: "查看 {{count}} 个隐藏回复"
+        other: "查看 %{count} 个隐藏回复"
       notice:
-        new_user: "这是 {{user}} 发的第一个帖子 - 让我们欢迎他加入社区！"
-        returning_user: "从我们上一次看到 {{user}} 有一阵子了 — 他上次发帖是 {{time}}."
+        new_user: "这是 %{user} 发的第一个帖子 - 让我们欢迎他加入社区！"
+        returning_user: "从我们上一次看到 %{user} 有一阵子了 — 他上次发帖是 %{time}."
       unread: "未读帖子"
       has_replies:
-        other: "{{count}} 回复"
+        other: "%{count} 回复"
       has_likes_title:
-        other: "{{count}} 人赞了该贴"
+        other: "%{count} 人赞了该贴"
       has_likes_title_only_you: "你喜欢了这个帖子"
       has_likes_title_you:
-        other: "你和其他 {{count}} 人赞了该贴"
+        other: "你和其他 %{count} 人赞了该贴"
       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: "抱歉，你一次只能上传最多{{max}}个文件。"
-        upload_not_authorized: "抱歉，你没有上传文件的权限（验证扩展：{{authorized_extensions}}）。"
+        too_many_dragged_and_dropped_files: "抱歉，你一次只能上传最多%{max}个文件。"
+        upload_not_authorized: "抱歉，你没有上传文件的权限（验证扩展：%{authorized_extensions}）。"
         image_upload_not_allowed_for_new_user: "抱歉，新用户无法上传图片。"
         attachment_upload_not_allowed_for_new_user: "抱歉，新用户无法上传附件。"
         attachment_download_requires_login: "抱歉，你需要登录后才能下载附件。"
@@ -2308,9 +2310,9 @@ zh_CN:
         delete_replies:
           confirm: "你也想删除该贴的回复？"
           direct_replies:
-            other: "是，{{count}}个直接回复"
+            other: "是，%{count}个直接回复"
           all_replies:
-            other: "是，所有{{count}}个回复"
+            other: "是，所有%{count}个回复"
           just_the_post: "不，只是这篇帖子"
         admin: "帖子管理"
         wiki: "公共编辑"
@@ -2354,9 +2356,9 @@ zh_CN:
           read:
             other: "看过"
           like_capped:
-            other: "和其他 {{count}} 人赞了它"
+            other: "和其他 %{count} 人赞了它"
           read_capped:
-            other: "还有{{count}}个其他用户看过"
+            other: "还有%{count}个其他用户看过"
         by_you:
           off_topic: "你标记其偏离主题"
           spam: "你标记其为垃圾信息"
@@ -2367,10 +2369,10 @@ zh_CN:
           like: "你赞了它"
       delete:
         confirm:
-          other: "你确定要删除{{count}}个帖子吗？"
+          other: "你确定要删除%{count}个帖子吗？"
       merge:
         confirm:
-          other: "确定要合并这 {{count}} 个帖子吗？"
+          other: "确定要合并这 %{count} 个帖子吗？"
       revisions:
         controls:
           first: "第一版"
@@ -2382,7 +2384,7 @@ zh_CN:
           revert: "还原至该版本"
           edit_wiki: "编辑维基"
           edit_post: "编辑帖子"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> {{icon}} <strong>{{current}}</strong> / {{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
             title: "行内显示渲染后的页面，并标示增加和删除的内容"
@@ -2487,6 +2489,7 @@ zh_CN:
       sort_order: "主题排序依据："
       default_view: "默认主题列表："
       default_top_period: "默认热门时长："
+      default_list_filter: "默认列表筛选"
       allow_badges_label: "允许在此分类中授予徽章"
       edit_permissions: "编辑权限"
       reviewable_by_group: "管理人员之外，可以审核该分类中的帖子和标记的人："
@@ -2572,11 +2575,11 @@ zh_CN:
       custom_placeholder_notify_moderators: "让我们知道你关心的是什么，并尽可能地提供相关链接和例子。"
       custom_message:
         at_least:
-          other: "输入至少 {{count}} 个字符"
+          other: "输入至少 %{count} 个字符"
         more:
-          other: "还差 {{count}} 个…"
+          other: "还差 %{count} 个…"
         left:
-          other: "剩余 {{count}}"
+          other: "剩余 %{count}"
     flagging_topic:
       title: "感谢你帮助我们建设文明社区！"
       action: "标记帖子"
@@ -2618,7 +2621,7 @@ zh_CN:
         title: "此主题是一条私信"
         help: "此主题是一条私信"
     posts: "帖子"
-    posts_long: "本主题有 {{number}} 个帖子"
+    posts_long: "本主题有 %{number} 个帖子"
     posts_likes_MF: |
       这个主题有 {count, plural, other {# 个帖子}}{ratio, select,
       low {，有很多人赞了该帖}
@@ -2631,18 +2634,18 @@ zh_CN:
       other: "浏览"
     replies: "回复"
     views_long:
-      other: "本主题已经被浏览过 {{number}} 次"
+      other: "本主题已经被浏览过 %{number} 次"
     activity: "活动"
     likes: "赞"
     likes_lowercase:
       other: "赞"
-    likes_long: "本主题已有 {{number}} 次赞"
+    likes_long: "本主题已有 %{number} 次赞"
     users: "用户"
     users_lowercase:
       other: "用户"
     category_title: "分类"
     history: "历史"
-    changed_by: "由 {{author}}"
+    changed_by: "由 %{author}"
     raw_email:
       title: "进站邮件"
       not_available: "不可用！"
@@ -2653,29 +2656,29 @@ zh_CN:
       latest:
         title: "最新"
         title_with_count:
-          other: "最新（{{count}}）"
+          other: "最新（%{count}）"
         help: "有了新帖的活动主题"
       read:
         title: "已读"
         help: "你已经阅读过的主题"
       categories:
         title: "分类"
-        title_in: "分类 - {{categoryName}}"
+        title_in: "分类 - %{categoryName}"
         help: "归入各种类别的所有主题"
       unread:
         title: "未读"
         title_with_count:
-          other: "未读（{{count}}）"
+          other: "未读（%{count}）"
         help: "你目前监看或跟踪有了未读帖子的主题"
         lower_title_with_count:
-          other: "{{count}} 未读"
+          other: "%{count} 未读"
       new:
         lower_title_with_count:
-          other: "{{count}} 近期"
+          other: "%{count} 近期"
         lower_title: "近期"
         title: "近期"
         title_with_count:
-          other: "近期（{{count}}）"
+          other: "近期（%{count}）"
         help: "最近几天里创建的主题"
       posted:
         title: "我的帖子"
@@ -2684,10 +2687,10 @@ zh_CN:
         title: "收藏"
         help: "你收藏的主题"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          other: "{{categoryName}} ({{count}})"
-        help: "{{categoryName}}分类中热门的主题"
+          other: "%{categoryName} (%{count})"
+        help: "%{categoryName}分类中热门的主题"
       top:
         title: "热门"
         help: "在最近的一年，一月，一周或一天最活跃的主题"
@@ -2847,7 +2850,7 @@ zh_CN:
       synonyms: "同义词"
       synonyms_description: "使用以下标签时，它们将被替换为<b>%{base_tag_name}</b> 。"
       tag_groups_info:
-        other: "此标签属于这些标签组：{{tag_groups}}。"
+        other: "此标签属于这些标签组：%{tag_groups}。"
       category_restrictions:
         other: "只能在这些分类中使用："
       edit_synonyms: "管理同义词"
@@ -2860,10 +2863,10 @@ zh_CN:
       delete_synonym_confirm: '您确定要删除同义词“ %{tag_name}”吗？'
       delete_tag: "删除标签"
       delete_confirm:
-        other: "你确定你想要删除这个标签以及撤销在{{count}}个主题中的关联么？"
+        other: "你确定你想要删除这个标签以及撤销在%{count}个主题中的关联么？"
       delete_confirm_no_topics: "你确定你想要删除这个标签吗？"
       delete_confirm_synonyms:
-        other: "其{{count}}个同义词也将被删除。"
+        other: "其%{count}个同义词也将被删除。"
       rename_tag: "重命名标签"
       rename_instructions: "标签的新名称："
       sort_by: "排序方式："
@@ -3217,9 +3220,9 @@ zh_CN:
           none: "没有相关事件。"
           redeliver: "重新发送"
           incoming:
-            other: "有 {{count}} 个新事件。"
+            other: "有 %{count} 个新事件。"
           completed_in:
-            other: "在 {{count}} 秒内完成。"
+            other: "在 %{count} 秒内完成。"
           request: "请求"
           response: "回应"
           redeliver_confirm: "你确定要再次发送一样的内容吗？"
@@ -3271,12 +3274,12 @@ zh_CN:
           label: "上传"
           title: "上传备份至实例"
           uploading: "上传中…"
-          uploading_progress: "上传中……{{progress}}%"
-          success: "'{{filename}}'已成功上传。文件正在被处理将在几分钟后显示在列表中。"
-          error: "上传“{{filename}}”时出错：{{message}}"
+          uploading_progress: "上传中……%{progress}%"
+          success: "'%{filename}'已成功上传。文件正在被处理将在几分钟后显示在列表中。"
+          error: "上传“%{filename}”时出错：%{message}"
         operations:
           is_running: "已有操作正在执行"
-          failed: "{{operation}}执行失败。请检查日志。"
+          failed: "%{operation}执行失败。请检查日志。"
           cancel:
             label: "取消"
             title: "取消当前操作"
@@ -3399,7 +3402,7 @@ zh_CN:
           disabled_component_tooltip: "此组件已被停用"
           default_theme_tooltip: "此主题是网站的默认主题"
           updates_available_tooltip: "此主题有更新可用"
-          and_x_more: "和{{count}}更多。"
+          and_x_more: "和%{count}更多。"
           collapse: 折叠
           uploads: "上传"
           no_uploads: "你可以上传与主题相关的组件，例如字体和图片"
@@ -3448,8 +3451,8 @@ zh_CN:
           disabled_by: "此组件已被禁用，操作者："
           required_version:
             error: "此主题已被自动禁用，因为它与此版本的Discourse不兼容。"
-            minimum: "需要Discourse{{version}}版本或以上。"
-            maximum: "需要Discourse{{version}}版本或以下。"
+            minimum: "需要Discourse%{version}版本或以上。"
+            maximum: "需要Discourse%{version}版本或以下。"
           component_of: "组件："
           update_to_latest: "更新到最新"
           check_for_updates: "检查更新"
@@ -3461,7 +3464,7 @@ zh_CN:
           theme_translations: "翻译主题"
           empty: "无项目"
           commits_behind:
-            other: "主题落后了 {{count}} 个变更！"
+            other: "主题落后了 %{count} 个变更！"
           compare_commits: "（查看新提交）"
           repo_unreachable: "无法联系此主题的Git存储库。错误信息："
           imported_from_archive: "此主题是从一个.zip文件导入的"
@@ -3865,8 +3868,8 @@ zh_CN:
           title: "显示用户电子邮件"
           text: "显示"
       user:
-        suspend_failed: "封禁此用户时发生了错误 {{error}}"
-        unsuspend_failed: "解禁此用户时发生了错误 {{error}}"
+        suspend_failed: "封禁此用户时发生了错误 %{error}"
+        unsuspend_failed: "解禁此用户时发生了错误 %{error}"
         suspend_duration: "将该用户封禁多久？"
         suspend_reason_label: "你为什么封禁该用户？该理由<b>对所有人可见</b>并将放置在用户的个人主页上，当用户尝试登陆时也会显示该理由。语句尽量简洁。"
         suspend_reason_hidden_label: "你为什么封禁该用户？当用户尝试登陆时会显示该理由。语句尽量简洁。"
@@ -4152,6 +4155,8 @@ zh_CN:
           modal_description: "你想在已存在的设置上应用此更改吗？这将更改%{count}位现有用户的首选项。"
           modal_yes: "是"
           modal_no: "不，仅应用以后的更改"
+        simple_list:
+          add_item: "添加项..."
       badges:
         title: 徽章
         new_badge: 新徽章
@@ -4238,6 +4243,7 @@ zh_CN:
         title: "Emoji"
         help: "增加所有人可用的 emoji。（高端技巧：一次性拖进多个文件）"
         add: "增加新的 Emoji"
+        uploading: "上传中…"
         name: "名称"
         group: "群组"
         image: "图片"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 2192949a22..a93a1a3cc8 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -22,8 +22,8 @@ zh_TW:
             mb: MB
             tb: TB
       short:
-        thousands: "{{number}} 千"
-        millions: "{{number}} 百萬"
+        thousands: "%{number} 千"
+        millions: "%{number} 百萬"
     dates:
       time: "h:mm a"
       timeline_date: "YYYY年 M月"
@@ -197,10 +197,10 @@ zh_TW:
     weekly: "每週"
     every_month: "每個月"
     every_six_months: "每半年"
-    max_of_count: "（最大 {{count}}）"
+    max_of_count: "（最大 %{count}）"
     alternation: "或"
     character_count:
-      other: "{{count}} 個字元"
+      other: "%{count} 個字元"
     related_messages:
       title: "相關訊息"
       see_all: '參閱 @%{username} 的 <a href="%{path}">所有訊息</a>...'
@@ -253,11 +253,11 @@ zh_TW:
         yes_value: "是的，我要放棄。"
         no_value: "不，我要保留。"
     topic_count_latest:
-      other: "檢視 {{count}} 則新發佈或更新的話題"
+      other: "檢視 %{count} 則新發佈或更新的話題"
     topic_count_unread:
-      other: "檢視 {{count}} 則未讀的討論訊息"
+      other: "檢視 %{count} 則未讀的討論訊息"
     topic_count_new:
-      other: "檢視 {{count}} 則新話題"
+      other: "檢視 %{count} 則新話題"
     preview: "預覽"
     cancel: "取消"
     save: "儲存變更"
@@ -265,7 +265,7 @@ zh_TW:
     saved: "儲存完畢！"
     upload: "上傳"
     uploading: "正在上傳..."
-    uploading_filename: "正在上傳: {{filename}}…"
+    uploading_filename: "正在上傳: %{filename}…"
     clipboard: "剪貼簿"
     uploaded: "上傳完畢！"
     pasting: "正在貼上…"
@@ -295,7 +295,7 @@ zh_TW:
         optional: "您可以聲明此項目以防止其他人審核。"
         required: "您必須先審核項目才能查看它們。"
         claimed_by_you: "您已聲明此項目，並可以查看。"
-        claimed_by_other: "此項目只能給<b>{{username}}</b>來審核。"
+        claimed_by_other: "此項目只能給<b>%{username}</b>來審核。"
       claim:
         title: "聲稱這個話題"
       unclaim:
@@ -312,7 +312,7 @@ zh_TW:
       none: "沒有要審查的項目"
       view_pending: "觀看待審核"
       topic_has_pending:
-        other: "本話題中仍有 <b>{{count}}</b>篇待審核貼文"
+        other: "本話題中仍有 <b>%{count}</b>篇待審核貼文"
       title: "審核"
       topic: "話題："
       filtered_topic: "您已篩選到單個主題中的可審閱內容。"
@@ -327,13 +327,13 @@ zh_TW:
         fields: "欄位"
       user_percentage:
         summary:
-          other: "{{agreed}}, {{disagreed}}, {{ignored}} (共{{count}}則檢舉)"
+          other: "%{agreed}, %{disagreed}, %{ignored} (共%{count}則檢舉)"
         agreed:
-          other: "{{count}}%同意"
+          other: "%{count}%同意"
         disagreed:
-          other: "{{count}}%不同意"
+          other: "%{count}%不同意"
         ignored:
-          other: "{{count}}% 忽略"
+          other: "%{count}% 忽略"
       topics:
         topic: "話題"
         reviewable_count: "次數"
@@ -344,7 +344,7 @@ zh_TW:
         unique_users:
           other: "%{count} 使用者"
       replies:
-        other: "{{count}}個回應"
+        other: "%{count}個回應"
       edit: "編輯"
       save: "儲存"
       cancel: "取消"
@@ -394,22 +394,22 @@ zh_TW:
         title: "貼文需等待審核"
         description: "我們已收到您的貼文，但需要先經過版主審核後才會顯示出來。敬請稍後。"
         pending_posts:
-          other: "你有 <strong>{{count}}</strong> 篇貼文在等待審核中"
+          other: "你有 <strong>%{count}</strong> 篇貼文在等待審核中"
         ok: "確定"
     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>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> 回覆 <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>你</a> 回覆 <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> 回覆了 <a href='{{topicUrl}}'>此話題</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>你</a> 回覆了 <a href='{{topicUrl}}'>此話題</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> 提及了 <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> 提及了 <a href='{{user2Url}}'>你</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>你</a> 提及了 <a href='{{user2Url}}'>{{another_user}}</a>"
-      posted_by_user: "由 <a href='{{userUrl}}'>{{user}}</a> 發佈"
-      posted_by_you: "由 <a href='{{userUrl}}'>你</a> 發佈"
-      sent_by_user: "由 <a href='{{userUrl}}'>{{user}}</a> 寄出"
-      sent_by_you: "由 <a href='{{userUrl}}'>你</a> 寄出"
+      user_posted_topic: "<a href='%{userUrl}'>%{user}</a> 開啟了 <a href='%{topicUrl}'>此話題</a>"
+      you_posted_topic: "<a href='%{userUrl}'>你</a> 開啟了 <a href='%{topicUrl}'>此話題</a>"
+      user_replied_to_post: "<a href='%{userUrl}'>%{user}</a> 回覆 <a href='%{postUrl}'>%{post_number}</a>"
+      you_replied_to_post: "<a href='%{userUrl}'>你</a> 回覆 <a href='%{postUrl}'>%{post_number}</a>"
+      user_replied_to_topic: "<a href='%{userUrl}'>%{user}</a> 回覆了 <a href='%{topicUrl}'>此話題</a>"
+      you_replied_to_topic: "<a href='%{userUrl}'>你</a> 回覆了 <a href='%{topicUrl}'>此話題</a>"
+      user_mentioned_user: "<a href='%{user1Url}'>%{user}</a> 提及了 <a href='%{user2Url}'>%{another_user}</a>"
+      user_mentioned_you: "<a href='%{user1Url}'>%{user}</a> 提及了 <a href='%{user2Url}'>你</a>"
+      you_mentioned_user: "<a href='%{user1Url}'>你</a> 提及了 <a href='%{user2Url}'>%{another_user}</a>"
+      posted_by_user: "由 <a href='%{userUrl}'>%{user}</a> 發佈"
+      posted_by_you: "由 <a href='%{userUrl}'>你</a> 發佈"
+      sent_by_user: "由 <a href='%{userUrl}'>%{user}</a> 寄出"
+      sent_by_you: "由 <a href='%{userUrl}'>你</a> 寄出"
     directory:
       filter_name: "以使用者名稱過濾"
       title: "使用者"
@@ -632,7 +632,7 @@ zh_TW:
     user_fields:
       none: "（選擇一個選項）"
     user:
-      said: "{{username}}："
+      said: "%{username}："
       profile: "個人檔案"
       mute: "靜音"
       edit: "編輯喜好設定"
@@ -699,12 +699,12 @@ zh_TW:
       external_links_in_new_tab: "在新分頁中開啟所有外部連結"
       enable_quoting: "允許引用劃記文字"
       change: "修改"
-      moderator: "{{user}} 是板主"
-      admin: "{{user}} 是管理員"
+      moderator: "%{user} 是板主"
+      admin: "%{user} 是管理員"
       moderator_tooltip: "該使用者為板主"
       admin_tooltip: "該使用者為管理員"
       silenced_tooltip: "該使用者已被禁言"
-      suspended_notice: "該使用者已被停權至 {{date}}。"
+      suspended_notice: "該使用者已被停權至 %{date}。"
       suspended_permanently: "該使用者已被停權。"
       suspended_reason: "原因: "
       github_profile: "Github"
@@ -717,7 +717,7 @@ zh_TW:
           靜音話題和分類不包含在這些郵件中。
         individual: "每當有新貼文時，傳送郵件通知給我"
         individual_no_echo: "除了我的貼文以外，每當有新貼文時，傳送郵件通知給我"
-        many_per_day: "每當有新貼文時，傳送郵件通知給我。（每天約 {{dailyEmailEstimate}} 封）"
+        many_per_day: "每當有新貼文時，傳送郵件通知給我。（每天約 %{dailyEmailEstimate} 封）"
         few_per_day: "每當有新貼文時，傳送郵件通知給我。（每天約 2 封）"
         warning: "已啟用郵寄名單模式。郵件通知設定已被複寫。"
       tag_settings: "標籤"
@@ -746,9 +746,7 @@ zh_TW:
       admin_delete: "刪除"
       users: "使用者"
       muted_users: "靜音"
-      muted_users_instructions: "不顯示來自這些使用者的所有通知。"
       ignored_users: "忽略"
-      ignored_users_instructions: "不顯示來自這些使用者的所有貼文與通知。"
       tracked_topics_link: "顯示"
       automatically_unpin_topics: "當我完整閲讀了話題時自動解除置頂。"
       apps: "應用"
@@ -804,7 +802,7 @@ zh_TW:
         copy_to_clipboard: "複製至剪貼簿"
         copy_to_clipboard_error: "複製至剪貼簿時發生錯誤"
         copied_to_clipboard: "複製至剪貼簿"
-        remaining_codes: "你還剩下 <strong>{{count}}</strong> 個可使用的備用碼"
+        remaining_codes: "你還剩下 <strong>%{count}</strong> 個可使用的備用碼"
         codes:
           title: "已產生備用碼"
           description: "每個備用碼僅可使用一次。請將它們保存在安全且可被找到的地方。"
@@ -863,10 +861,10 @@ zh_TW:
         instructions: "不會公開顯示"
         ok: "我們將寄一封確認郵件給您。"
         invalid: "請輸入有效的電子郵件地址。"
-        authenticated: "你的 Email 已由 {{provider}} 驗證完成。"
+        authenticated: "你的 Email 已由 %{provider} 驗證完成。"
         frequency_immediately: "如果您沒有閱讀過重要通知，我們會立即發送電子郵件給您。"
         frequency:
-          other: "我們只會在您 {{count}} 分鐘內沒有活動時，才會寄送電郵通知給您。"
+          other: "我們只會在您 %{count} 分鐘內沒有活動時，才會寄送電郵通知給您。"
       associated_accounts:
         title: "關聯帳號"
         connect: "連結"
@@ -882,9 +880,9 @@ zh_TW:
       username:
         title: "使用者名稱"
         instructions: "獨一、無空格、短的"
-        short_instructions: "其他人可以輸入 @{{username}} 提及你。"
+        short_instructions: "其他人可以輸入 @%{username} 提及你。"
         available: "你的使用者名稱可以使用。"
-        not_available: "無法使用，請試試看 {{suggestion}}？"
+        not_available: "無法使用，請試試看 %{suggestion}？"
         not_available_no_suggestion: "不可使用"
         too_short: "你的使用者名稱太短。"
         too_long: "你的使用者名稱太長。"
@@ -904,11 +902,11 @@ zh_TW:
         log_out_all: "登出所有裝置"
         active: "目前啟用中的"
         not_you: "不是你嗎？"
-        show_all: "顯示全部（{{count}}）"
+        show_all: "顯示全部（%{count}）"
         show_few: "顯示更少"
         was_this_you: "這是你嗎？"
         was_this_you_description: "若這不是你，建議你修改你的密碼並登出所有裝置。"
-        browser_and_device: "{{device}} 上的 {{browser}}"
+        browser_and_device: "%{device} 上的 %{browser}"
         secure_account: "增強我的帳號安全性"
         latest_post: "最近的貼文…"
       last_posted: "最近發表"
@@ -986,20 +984,19 @@ zh_TW:
         user: "受邀請的使用者"
         none: "沒有可顯示的邀請"
         truncated:
-          other: "只顯示前 {{count}} 個邀請。"
+          other: "只顯示前 %{count} 個邀請。"
         redeemed: "已接受的邀請"
         redeemed_tab: "接受日期"
-        redeemed_tab_with_count: "接受日期 ({{count}})"
+        redeemed_tab_with_count: "接受日期 (%{count})"
         redeemed_at: "接受日期"
         pending: "尚未接受的邀請"
         pending_tab: "等待中"
-        pending_tab_with_count: "等待中 ({{count}})"
+        pending_tab_with_count: "等待中 (%{count})"
         topics_entered: "參與的話題"
         posts_read_count: "已讀的貼文"
         expired: "此邀請已過期"
         rescind: "移除"
         rescinded: "邀請已刪除"
-        rescind_all: "移除所有過期的邀請"
         rescinded_all: "已移除所有過期的邀請！"
         rescind_all_confirm: "您是否確定要移除所有過期的邀請？"
         reinvite: "重送邀請"
@@ -1010,13 +1007,17 @@ zh_TW:
         time_read: "閱讀時間"
         days_visited: "到訪天數"
         account_age_days: "帳號已建立 (天)"
+        links_tab: "連結"
+        link_created_at: "已建立"
+        link_groups: 群組
         create: "送出邀請"
         generate_link: "拷貝邀請連結"
         link_generated: "邀請連結生成成功！"
         valid_for: "邀請連結只對這個郵件地址有效：%{email}"
+        invite_link:
+          success: "邀請連結生成成功！"
         bulk_invite:
           none: "你尚未邀請任何人。你可以發送個別邀請，或者透過<a href='https://meta.discourse.org/t/send-bulk-invites/16468'>上傳大量邀請檔</a>一次邀請一群人。"
-          text: "從檔案大量邀請"
           success: "檔案已上傳成功，處理完畢後將以私人訊息通知你。"
           error: "上傳的檔案必須是 csv 格式。"
           confirmation_message: "您即將寄email邀請給上傳文件中的所有人。"
@@ -1099,7 +1100,7 @@ zh_TW:
       desc:
         network: "請檢查你的網絡連線。"
         network_fixed: "似乎沒有問題了"
-        server: "錯誤代碼：{{status}}"
+        server: "錯誤代碼：%{status}"
         forbidden: "你不允許瀏覽此處。"
         not_found: "沒有這個頁面"
         unknown: "發生錯誤。"
@@ -1148,8 +1149,8 @@ zh_TW:
       value_prop: "當你註冊帳號後，我們可以準確地記錄你的閲讀進度，這樣你能夠在下一次造訪時回到你上次閲讀到的地方。你也可以選擇接受新貼文的網頁和郵件通知，也可以按任何貼文讚來分享你的感謝。:heartbeat:"
     summary:
       enabled_description: "你正在檢視此話題的摘要：在這個社群裡最熱門的貼文。"
-      description: "有 <b>{{replyCount}}</b> 個回覆。"
-      description_time: "有 <b>{{replyCount}}</b> 個回覆，大約要花 <b>{{readingTime}} 分鐘</b>閲讀。"
+      description: "有 <b>%{replyCount}</b> 個回覆。"
+      description_time: "有 <b>%{replyCount}</b> 個回覆，大約要花 <b>%{readingTime} 分鐘</b>閲讀。"
       enable: "以摘要檢視此話題"
       disable: "顯示所有貼文"
     deleted_filter:
@@ -1162,8 +1163,8 @@ zh_TW:
       invite: "邀請其他人..."
       edit: "新增或移除…"
       leave_message: "確定要移除這個訊息嗎？"
-      remove_allowed_user: "確定將 {{name}} 從對話中移除？"
-      remove_allowed_group: "確定將 {{name}} 從對話中移除？"
+      remove_allowed_user: "確定將 %{name} 從對話中移除？"
+      remove_allowed_group: "確定將 %{name} 從對話中移除？"
     email: "電子郵件"
     username: "使用者名稱"
     last_seen: "出現時間"
@@ -1217,7 +1218,7 @@ zh_TW:
       awaiting_activation: "你的帳號目前尚未啟用，請點選忘記密碼的連結來重新寄出一封認證信。"
       awaiting_approval: "你的帳號尚未通過工作人員的審核，當審核通過時你會收到電子郵件通知。"
       requires_invite: "抱歉，只有受邀請者才能進入此論壇。"
-      not_activated: "你還無法登入，我們之前曾將啟用帳號的電子郵件寄至 <b>{{sentTo}}</b>，請從該電子郵件啟用你的帳號。"
+      not_activated: "你還無法登入，我們之前曾將啟用帳號的電子郵件寄至 <b>%{sentTo}</b>，請從該電子郵件啟用你的帳號。"
       not_allowed_from_ip_address: "你無法透過此 IP 登入。"
       admin_not_allowed_from_ip_address: "你無法透過此 IP 登入成為管理員。"
       resend_activation_email: "按這裡重新寄出啟用帳號的電子郵件。"
@@ -1226,7 +1227,7 @@ zh_TW:
       change_email: "更換電子郵件"
       provide_new_email: "提供新的電子郵件，我們將把認證信重新寄給您。"
       submit_new_email: "更換電子郵件"
-      sent_activation_email_again: "我們已經將啟用帳號的電子郵件寄至 <b>{{currentEmail}}</b>，你可能幾分鐘後才會收到，如果一直沒收到，請檢查垃圾郵件資料夾。"
+      sent_activation_email_again: "我們已經將啟用帳號的電子郵件寄至 <b>%{currentEmail}</b>，你可能幾分鐘後才會收到，如果一直沒收到，請檢查垃圾郵件資料夾。"
       sent_activation_email_again_generic: "啟用帳號的電子郵件已寄出 ，你可能幾分鐘後才會收到，如果一直沒收到，請檢查垃圾郵件資料夾。"
       to_continue: "請登入"
       preferences: "需要登入後更改設置"
@@ -1284,17 +1285,17 @@ zh_TW:
     conditional_loading_section:
       loading: 載入中...
     category_row:
-      topic_count: "{{count}}個話題在此分類"
+      topic_count: "%{count}個話題在此分類"
     select_kit:
       default_header_text: 選擇...
       no_content: 找不到符合的項目
       filter_placeholder: 搜尋...
       filter_placeholder_with_any: 搜尋或建立...
-      create: "建立：'{{content}}'"
+      create: "建立：'%{content}'"
       max_content_reached:
-        other: "您只能選擇{{count}}個項目"
+        other: "您只能選擇%{count}個項目"
       min_content_not_reached:
-        other: "至少要選擇{{count}}個項目"
+        other: "至少要選擇%{count}個項目"
     date_time_picker:
       from: 自
       to: 至
@@ -1319,7 +1320,7 @@ zh_TW:
       default: 自訂表情符號
     shared_drafts:
       title: "共享草稿"
-      notice: "\b只有能瀏覽<b>{{category}}</b>分類的使用者能看到這個話題"
+      notice: "\b只有能瀏覽<b>%{category}</b>分類的使用者能看到這個話題"
       destination_category: "指定分類"
       publish: "發佈共享草稿"
       confirm_publish: "您確定要發佈這份草稿嗎？"
@@ -1339,21 +1340,21 @@ zh_TW:
       similar_topics: "與你的話題類似的討論..."
       drafts_offline: "離線草稿"
       edit_conflict: "編輯衝突"
-      group_mentioned_limit: "<b>提醒</b>你提及了<a href='{{group_link}}'>{{group}}</a>，但此群組的人數多於管理員配置的提及人數上限（{{max}}位），因此不會有任何人收到通知。"
+      group_mentioned_limit: "<b>提醒</b>你提及了<a href='%{group_link}'>%{group}</a>，但此群組的人數多於管理員配置的提及人數上限（%{max}位），因此不會有任何人收到通知。"
       group_mentioned:
-        other: "提及 {{group}} 時，你將通知 <a href='{{group_link}}'>{{count}} 人</a> － 確定嗎？"
+        other: "提及 %{group} 時，你將通知 <a href='%{group_link}'>%{count} 人</a> － 確定嗎？"
       cannot_see_mention:
-        category: "您提及了{{userrname}}，但他們不能進入該分類，所以他們不會收到通知。您必須把他們加入到有權限進入該分類的群組中。"
-        private: "您提及了{{username}}，但他們不能看到私人訊息，所以他們不會收到通知。您必須把他們邀請至私訊對話中。"
-      duplicate_link: "您連到<b>{{domain}}</b>的連結已被<b>@{{username}}</b><a href='{{post_url}}'>於{{ago}}前發在其他話題下的回覆</a>，確定要再次發佈嗎？"
+        category: "您提及了%{userrname}，但他們不能進入該分類，所以他們不會收到通知。您必須把他們加入到有權限進入該分類的群組中。"
+        private: "您提及了%{username}，但他們不能看到私人訊息，所以他們不會收到通知。您必須把他們邀請至私訊對話中。"
+      duplicate_link: "您連到<b>%{domain}</b>的連結已被<b>@%{username}</b><a href='%{post_url}'>於%{ago}前發在其他話題下的回覆</a>，確定要再次發佈嗎？"
       error:
         title_missing: "標題為必填欄位"
-        title_too_short: "標題必須至少 {{min}} 個字"
-        title_too_long: "標題不能超過 {{max}} 個字"
-        post_length: "貼文必須至少 {{min}} 個字。"
-        try_like: "您用過{{heart}}了嗎？"
+        title_too_short: "標題必須至少 %{min} 個字"
+        title_too_long: "標題不能超過 %{max} 個字"
+        post_length: "貼文必須至少 %{min} 個字。"
+        try_like: "您用過%{heart}了嗎？"
         category_missing: "你必須選擇一個分類。"
-        tags_missing: "您至少必須選擇{{count}}個標籤"
+        tags_missing: "您至少必須選擇%{count}個標籤"
       save_edit: "儲存編輯"
       overwrite_edit: "覆寫編輯"
       reply_original: "回覆至原始的話題"
@@ -1446,51 +1447,51 @@ zh_TW:
     notifications:
       tooltip:
         regular:
-          other: "{{count}}則未讀通知"
+          other: "%{count}則未讀通知"
         message:
-          other: "{{count}}則未讀訊息"
+          other: "%{count}則未讀訊息"
       title: "當有人以「@使用者名稱」提及您、回覆您的貼文、或是傳送訊息給您的時候通知您的設定。"
       none: "目前無法載入通知。"
       empty: "未找到任何通知。"
       post_approved: "你的貼文已通過"
       reviewable_items: "需要審查的項目"
-      mentioned: "<span>{{username}}</span> {{description}}"
-      group_mentioned: "<span>{{username}}</span> {{description}}"
-      quoted: "<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}}"
-      liked: "<span>{{username}}</span> {{description}}"
-      liked_2: "<span>{{username}}、{{username2}}</span> {{description}}"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}、%{username2}</span> %{description}"
       liked_many:
-        other: "<span>{{username}}、{{username2}} 和其他 {{count}} 個人都</span> {{description}}"
+        other: "<span>%{username}、%{username2} 和其他 %{count} 個人都</span> %{description}"
       liked_consolidated_description:
-        other: "說你的{{count}}則貼文讚"
-      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}}"
-      invitee_accepted: "<span>{{username}}</span> 接受了您的邀請"
-      moved_post: "<span>{{username}}</span> 移動 {{description}}"
-      linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "得到 '{{description}}'"
-      topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>新話題</span> {{description}}"
+        other: "說你的%{count}則貼文讚"
+      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}"
+      invitee_accepted: "<span>%{username}</span> 接受了您的邀請"
+      moved_post: "<span>%{username}</span> 移動 %{description}"
+      linked: "<span>%{username}</span> %{description}"
+      granted_badge: "得到 '%{description}'"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>新話題</span> %{description}"
       group_message_summary:
-        other: "您的收件匣中有{{count}}則訊息"
+        other: "您的收件匣中有%{count}則訊息"
       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}}'
+        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}}在%{site_title}"
+        custom: "新的通知由%{username}在%{site_title}"
       titles:
         liked: "新的讚"
         watching_first_post: "新話題"
@@ -1502,9 +1503,9 @@ zh_TW:
       from_my_computer: "從我的電腦"
       from_the_web: "從網站"
       remote_tip: "圖片連結"
-      remote_tip_with_attachments: "連結到圖片或檔案 {{authorized_extensions}}"
+      remote_tip_with_attachments: "連結到圖片或檔案 %{authorized_extensions}"
       local_tip: "從你的裝置中選擇圖片"
-      local_tip_with_attachments: "從裝置選取圖片或檔案 ({{authorized_extensions}})"
+      local_tip_with_attachments: "從裝置選取圖片或檔案 (%{authorized_extensions})"
       hint: "(你也可以將檔案拖放至編輯器直接上傳)"
       hint_for_supported_browsers: "可以拖放或複製粘帖至編輯器以上傳"
       uploading: "正在上傳"
@@ -1521,14 +1522,14 @@ zh_TW:
       clear_all: "清除全部"
       too_short: "你的搜尋詞語太短。"
       result_count:
-        other: "關於<span class='term'>{{term}}</span>的<span>{{count}}{{plus}} 個結果 </span>"
+        other: "關於<span class='term'>%{term}</span>的<span>%{count}%{plus} 個結果 </span>"
       title: "搜尋話題、貼文、使用者或分類"
       full_page_title: "搜尋話題或貼文"
       no_results: "未找到任何結果。"
       no_more_results: "沒有找到更多的結果。"
       searching: "正在搜尋..."
-      post_format: "#{{post_number}} {{username}}"
-      results_page: "'{{term}}' 的搜尋結果"
+      post_format: "#%{post_number} %{username}"
+      results_page: "'%{term}' 的搜尋結果"
       more_results: "還有更多結果。請嘗試縮小搜尋條件。"
       cant_find: "找不到你想找的嗎？"
       start_new_topic: "或許你可以開啟一個新的話題？"
@@ -1537,8 +1538,8 @@ zh_TW:
       search_google_button: "Google"
       search_google_title: "搜尋這個網站"
       context:
-        user: "搜尋 @{{username}} 的貼文"
-        category: "搜索 #{{category}} 分類"
+        user: "搜尋 @%{username} 的貼文"
+        category: "搜索 #%{category} 分類"
         topic: "搜尋此話題"
         private_messages: "搜尋訊息"
       advanced:
@@ -1612,7 +1613,7 @@ zh_TW:
         notification_level: "通知"
         choose_new_category: "為話題選擇新類別："
         selected:
-          other: "你已選擇了 <b>{{count}}</b> 個話題。"
+          other: "你已選擇了 <b>%{count}</b> 個話題。"
         change_tags: "取代標籤"
         append_tags: "添加標籤"
         choose_new_tags: "為話題選擇新標籤"
@@ -1625,7 +1626,7 @@ zh_TW:
         posted: "你尚未在任何話題裡發表貼文。"
         latest: "沒有最近的話題。真令人難過。"
         bookmarks: "您目前沒有把任何話題加入書籤。"
-        category: "沒有 {{category}} 的話題。"
+        category: "沒有 %{category} 的話題。"
         top: "沒有精選話題。"
         educate:
           new: '<p>這裡顯示了近期話題列表。</p><p>預設情況下，以下話題將顯示在近期列表。如果是最近 2 天內開啟的，還會顯示一個<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">近期</span>標誌。<p>你可以在<a href="%{userPrefsUrl}">使用者設置</a>中更改要顯示哪些內容。</p>'
@@ -1636,12 +1637,12 @@ zh_TW:
         read: "已經沒有其它已讀的話題了。"
         new: "已經沒有其它新話題了。"
         unread: "已經沒有其它未讀的話題了。"
-        category: "{{category}} 分類已經沒有其它話題了。"
+        category: "%{category} 分類已經沒有其它話題了。"
         top: "沒有更多精選話題。"
         bookmarks: "書籤裡沒有更多的話題了。"
     topic:
       filter_to:
-        other: "本話題中的 {{count}} 帖"
+        other: "本話題中的 %{count} 帖"
       create: "新話題"
       create_long: "開啟新話題"
       open_draft: "開啟草稿"
@@ -1661,9 +1662,9 @@ zh_TW:
       new: "新話題"
       unread: "未讀"
       new_topics:
-        other: "{{count}} 個新話題"
+        other: "%{count} 個新話題"
       unread_topics:
-        other: "{{count}} 個未讀話題"
+        other: "%{count} 個未讀話題"
       title: "話題"
       invalid_access:
         title: "私人話題"
@@ -1676,19 +1677,19 @@ zh_TW:
         title: "未找到話題"
         description: "抱歉，找不到此話題，可能已被板主刪除。"
       total_unread_posts:
-        other: "你有 {{count}} 個未讀的貼文在這話題內"
+        other: "你有 %{count} 個未讀的貼文在這話題內"
       unread_posts:
-        other: "你有 {{count}} 個未讀的舊貼文在討論內"
+        other: "你有 %{count} 個未讀的舊貼文在討論內"
       new_posts:
-        other: "自你上次閱讀後，此話題又多了 {{count}} 篇新貼文"
+        other: "自你上次閱讀後，此話題又多了 %{count} 篇新貼文"
       likes:
-        other: "此話題收到了 {{count}} 個讚"
+        other: "此話題收到了 %{count} 個讚"
       back_to_list: "回到話題列表"
       options: "話題選項"
       show_links: "在話題裡顯示連結"
       toggle_information: "切換話題詳情"
-      read_more_in_category: "要閱讀更多貼文嗎? 瀏覽 {{catLink}} 裡的話題或 {{latestLink}}。"
-      read_more: "要閱讀更多貼文嗎? 請按 {{catLink}} 或 {{latestLink}}。"
+      read_more_in_category: "要閱讀更多貼文嗎? 瀏覽 %{catLink} 裡的話題或 %{latestLink}。"
+      read_more: "要閱讀更多貼文嗎? 請按 %{catLink} 或 %{latestLink}。"
       read_more_MF: "還有 { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 個未讀的話題</a>} other { <a href='{basePath}/unread'># 個未讀的話題</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{和 } false {} other{}} <a href='{basePath}/new'>1 個新</a>的話題} other { {BOTH, select, true{和 } false {} other{}} <a href='{basePath}/new'># 個最近</a>的話題} }可以閱讀，或者{CATEGORY, select, true {瀏覽{catLink}中的其他話題} false {{latestLink}} other {}}"
       browse_all_categories: 瀏覽所有分類
       view_latest_topics: 檢視最近的貼文
@@ -1855,23 +1856,23 @@ zh_TW:
         success_message: "已檢舉此話題。"
       feature_topic:
         title: "擁有這個話題"
-        pin: "將該話題置於{{categoryLink}}分類最上方至"
-        confirm_pin: "已有{{count}}個置頂話題。太多的置頂話題可能會困擾新使用者和訪客。確定想在該分類再置頂一個話題？"
-        unpin: "取消此話題在{{categoryLink}}類別的置頂狀態"
-        unpin_until: "從{{categoryLink}}分類最上方移除話題或者移除於<strong>%{until}</strong>。"
+        pin: "將該話題置於%{categoryLink}分類最上方至"
+        confirm_pin: "已有%{count}個置頂話題。太多的置頂話題可能會困擾新使用者和訪客。確定想在該分類再置頂一個話題？"
+        unpin: "取消此話題在%{categoryLink}類別的置頂狀態"
+        unpin_until: "從%{categoryLink}分類最上方移除話題或者移除於<strong>%{until}</strong>。"
         pin_note: "允許使用者取消置頂。"
         pin_validation: "置頂該話題需要一個日期。"
-        not_pinned: "沒有話題被釘選在 {{categoryLink}} ."
+        not_pinned: "沒有話題被釘選在 %{categoryLink} ."
         already_pinned:
-          other: "{{categoryLink}}分類的置頂話題數：<strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "%{categoryLink}分類的置頂話題數：<strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "將話題置於所有話題列表最上方至"
-        confirm_pin_globally: "已有{{count}}個全局置頂話題。太多的置頂話題可能會困擾新使用者和訪客。確定想再全局置頂一個話題？"
+        confirm_pin_globally: "已有%{count}個全局置頂話題。太多的置頂話題可能會困擾新使用者和訪客。確定想再全局置頂一個話題？"
         unpin_globally: "將話題從所有話題列表的最上方移除。"
         unpin_globally_until: "從所有話題列表最上方移除話題或者移除於<strong>%{until}</strong>。"
         global_pin_note: "允許使用者取消全局置頂。"
         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: "使用者能點擊關閉隱藏橫幅。且只能設置一個橫幅話題。"
@@ -1901,14 +1902,14 @@ zh_TW:
         to_topic_username: "你輸入了使用者名。我們將發送一個至該話題連結的邀請通知。"
         to_username: "輸入你想邀請的人的使用者名。我們將發送一個至該話題連結的邀請通知。"
         email_placeholder: "電子郵件地址"
-        success_email: "我們發了一封郵件邀請<b>{{emailOrUsername}}</b>。邀請被接受後你會收到通知。檢查使用者頁中的邀請標籤頁來追蹤你的邀請。"
+        success_email: "我們發了一封郵件邀請<b>%{emailOrUsername}</b>。邀請被接受後你會收到通知。檢查使用者頁中的邀請標籤頁來追蹤你的邀請。"
         success_username: "我們已經邀請該使用者加入此話題討論"
         error: "抱歉，我們不能邀請這個人。可能他已經被邀請了？（邀請有頻率限制）"
-        success_existing_email: "已經有一個有此電子郵件 <b>{{emailOrUsername}}</b> 的使用者存在。我們已邀請那位使用者來參與這個話題。"
+        success_existing_email: "已經有一個有此電子郵件 <b>%{emailOrUsername}</b> 的使用者存在。我們已邀請那位使用者來參與這個話題。"
       login_reply: "登入以發表回應"
       filters:
         n_posts:
-          other: "{{count}} 則貼文"
+          other: "%{count} 則貼文"
         cancel: "取消過濾"
       move_to:
         title: "移動到"
@@ -1921,14 +1922,14 @@ zh_TW:
         radio_label: "新話題"
         error: "將話題移至新話題時發生錯誤。"
         instructions:
-          other: "你即將開啟一個新話題，並填入 <b>{{count}}</b> 篇你已選擇的貼文。"
+          other: "你即將開啟一個新話題，並填入 <b>%{count}</b> 篇你已選擇的貼文。"
       merge_topic:
         title: "移至已存在的話題"
         action: "移至已存在的話題"
         error: "將話題移至已存在的話題時發生錯誤。"
         radio_label: "已存在的話題"
         instructions:
-          other: "請選擇你想將那 <b>{{count}}</b> 篇貼文移至哪一個話題。"
+          other: "請選擇你想將那 <b>%{count}</b> 篇貼文移至哪一個話題。"
       move_to_new_message:
         title: "移動到新訊息"
         action: "移動到新訊息"
@@ -1936,14 +1937,14 @@ zh_TW:
         radio_label: "新訊息"
         participants: "參與者"
         instructions:
-          other: "你即將開啟一個新話題，並填入 <b>{{count}}</b> 篇你已選擇的貼文。"
+          other: "你即將開啟一個新話題，並填入 <b>%{count}</b> 篇你已選擇的貼文。"
       move_to_existing_message:
         title: "移動到已存在的訊息"
         action: "移動到已存在的訊息"
         radio_label: "已存在的訊息"
         participants: "參與者"
         instructions:
-          other: "請選擇你想將那 <b>{{count}}</b> 篇貼文移至哪一個話題。"
+          other: "請選擇你想將那 <b>%{count}</b> 篇貼文移至哪一個話題。"
       merge_posts:
         title: "合併選擇的貼文"
         action: "合併選擇的貼文"
@@ -1954,7 +1955,7 @@ zh_TW:
         error: "修改貼文擁有者時發生錯誤。"
         placeholder: "新擁有者的使用者名稱"
         instructions:
-          other: "請替<b>@{{old_user}}</b>的{{count}}篇貼文選擇新的擁有者。"
+          other: "請替<b>@%{old_user}</b>的%{count}篇貼文選擇新的擁有者。"
       change_timestamp:
         title: "變更時間標籤..."
         action: "變更時間戳記"
@@ -1963,7 +1964,7 @@ zh_TW:
         instructions: "請為話題選擇新的時間。話題中的所有貼文將按照相同的時間差更新。"
       multi_select:
         select: "選取"
-        selected: "選取了 ({{count}})"
+        selected: "選取了 (%{count})"
         select_post:
           label: "選擇"
           title: "將貼文加入選取清單"
@@ -1981,19 +1982,19 @@ zh_TW:
         select_all: 選擇全部
         deselect_all: 取消選取
         description:
-          other: "你已選擇了 <b>{{count}}</b> 篇貼文。"
+          other: "你已選擇了 <b>%{count}</b> 篇貼文。"
       deleted_by_author:
         other: "（主題已被作者撤回，將在%{count}小時內自動刪除，若有標記便不會刪除）"
     post:
       quote_reply: "引用"
       edit_reason: "原因: "
-      post_number: "貼文 {{number}}"
+      post_number: "貼文 %{number}"
       ignored: "忽略內容"
       wiki_last_edited_on: "共筆最後編輯時間"
       last_edited_on: "貼文最近編輯的時間"
       reply_as_new_topic: "回覆為關連的話題"
       reply_as_new_private_message: "回覆作為新訊息給同一收件人"
-      continue_discussion: "繼續 {{postLink}} 的討論:"
+      continue_discussion: "繼續 %{postLink} 的討論:"
       follow_quote: "跳到引用的貼文"
       show_full: "顯示所有貼文"
       show_hidden: "查看忽略內容"
@@ -2003,26 +2004,26 @@ zh_TW:
       expand_collapse: "展開/收合"
       locked: "管理員已鎖定此貼文，目前無法編輯"
       gap:
-        other: "檢視 {{count}} 則隱藏回應"
+        other: "檢視 %{count} 則隱藏回應"
       notice:
-        new_user: "這是{{user}}第一次發表貼文，一起歡迎他加入我們的社群！"
-        returning_user: "{{user}}已經有一陣子沒出現了—— 他最後一次發文是在{{time}}。"
+        new_user: "這是%{user}第一次發表貼文，一起歡迎他加入我們的社群！"
+        returning_user: "%{user}已經有一陣子沒出現了—— 他最後一次發文是在%{time}。"
       unread: "貼文未讀"
       has_replies:
-        other: "{{count}} 個回覆"
+        other: "%{count} 個回覆"
       has_likes_title:
-        other: "{{count}} 個使用者對此貼文讚好"
+        other: "%{count} 個使用者對此貼文讚好"
       has_likes_title_only_you: "你已按讚"
       has_likes_title_you:
-        other: "你和其他 {{count}} 人讚了該貼"
+        other: "你和其他 %{count} 人讚了該貼"
       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: "抱歉，您一次最多只能上傳{{max}}個檔案。"
-        upload_not_authorized: "抱歉，你沒有上傳檔案的權限 (驗證擴展：{{authorized_extensions}})。"
+        too_many_dragged_and_dropped_files: "抱歉，您一次最多只能上傳%{max}個檔案。"
+        upload_not_authorized: "抱歉，你沒有上傳檔案的權限 (驗證擴展：%{authorized_extensions})。"
         image_upload_not_allowed_for_new_user: "抱歉，新使用者不可上傳圖片。"
         attachment_upload_not_allowed_for_new_user: "抱歉，新使用者不可上傳附件。"
         attachment_download_requires_login: "抱歉，您必須登入以下載附件。"
@@ -2056,9 +2057,9 @@ zh_TW:
         delete_replies:
           confirm: "您是否也要刪除所有此貼文底下的回應？"
           direct_replies:
-            other: "是，包含{{count}}條的直接回覆"
+            other: "是，包含%{count}條的直接回覆"
           all_replies:
-            other: "是，包含所有{{count}}條回覆"
+            other: "是，包含所有%{count}條回覆"
           just_the_post: "否，僅刪除此貼文。"
         admin: "貼文管理動作"
         wiki: "做為共筆"
@@ -2096,7 +2097,7 @@ zh_TW:
           notify_user: "已送出一則訊息"
           bookmark: "收藏"
           like_capped:
-            other: "和其他{{count}}人都說讚"
+            other: "和其他%{count}人都說讚"
         by_you:
           off_topic: "你已檢舉此貼文離題"
           spam: "你已檢舉此貼文為垃圾訊息內容"
@@ -2107,10 +2108,10 @@ zh_TW:
           like: "你已在此貼文按讚"
       delete:
         confirm:
-          other: "您是否確定要刪除{{count}}篇貼文？"
+          other: "您是否確定要刪除%{count}篇貼文？"
       merge:
         confirm:
-          other: "您是否確定要合併{{count}}篇貼文？"
+          other: "您是否確定要合併%{count}篇貼文？"
       revisions:
         controls:
           first: "第一版"
@@ -2122,7 +2123,7 @@ zh_TW:
           revert: "還原至該版本"
           edit_wiki: "編輯共筆"
           edit_post: "編輯貼文"
-          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong>{{icon}}<strong>{{current}}</strong>/{{total}}"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong>%{icon}<strong>%{current}</strong>/%{total}"
         displays:
           inline:
             title: "以單一網頁模式檢視，並標示增加與刪減的內容"
@@ -2293,11 +2294,11 @@ zh_TW:
       custom_placeholder_notify_moderators: "讓我們知道您的意見，並請盡可能地提供相關連結和例子。"
       custom_message:
         at_least:
-          other: "輸入至少 {{count}} 個字元"
+          other: "輸入至少 %{count} 個字元"
         more:
-          other: "還差 {{count}} 個..."
+          other: "還差 %{count} 個..."
         left:
-          other: "剩餘 {{count}}"
+          other: "剩餘 %{count}"
     flagging_topic:
       title: "感謝幫助社群遠離邪惡！"
       action: "檢舉話題"
@@ -2336,7 +2337,7 @@ zh_TW:
       unlisted:
         help: "此話題已被隱藏，不會顯示於話題列表，只能由直接連結存取。"
     posts: "貼文"
-    posts_long: "此話題有 {{number}} 篇貼文"
+    posts_long: "此話題有 %{number} 篇貼文"
     posts_likes_MF: |
       This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
       low {with a high like to post ratio}
@@ -2349,18 +2350,18 @@ zh_TW:
       other: "觀看"
     replies: "回覆"
     views_long:
-      other: "這個話題已經被檢視過 {{number}} 次"
+      other: "這個話題已經被檢視過 %{number} 次"
     activity: "活動"
     likes: "讚"
     likes_lowercase:
       other: "個讚"
-    likes_long: "此話題收到了 {{number}} 個讚"
+    likes_long: "此話題收到了 %{number} 個讚"
     users: "使用者"
     users_lowercase:
       other: "使用者"
     category_title: "分類"
     history: "歷史"
-    changed_by: "作者 {{author}}"
+    changed_by: "作者 %{author}"
     raw_email:
       title: "寄來的郵件"
       not_available: "不可使用"
@@ -2371,29 +2372,29 @@ zh_TW:
       latest:
         title: "最新"
         title_with_count:
-          other: "最新 ({{count}})"
+          other: "最新 (%{count})"
         help: "最近的話題"
       read:
         title: "已讀"
         help: "你看過的話題，以閱讀的先後順序排列"
       categories:
         title: "分類"
-        title_in: "分類 - {{categoryName}}"
+        title_in: "分類 - %{categoryName}"
         help: "所有話題以分類區分"
       unread:
         title: "未讀"
         title_with_count:
-          other: "未讀 ({{count}})"
+          other: "未讀 (%{count})"
         help: "你所關注或追蹤的話題有未讀貼文"
         lower_title_with_count:
-          other: "{{count}} 個未讀"
+          other: "%{count} 個未讀"
       new:
         lower_title_with_count:
-          other: "{{count}} 近期"
+          other: "%{count} 近期"
         lower_title: "新話題"
         title: "新的"
         title_with_count:
-          other: "近期 ({{count}})"
+          other: "近期 (%{count})"
         help: "最近幾天開啟的話題"
       posted:
         title: "我的貼文"
@@ -2402,10 +2403,10 @@ zh_TW:
         title: "書籤"
         help: "你加進書籤的話題"
       category:
-        title: "{{categoryName}}"
+        title: "%{categoryName}"
         title_with_count:
-          other: "{{categoryName}} ({{count}})"
-        help: "{{categoryName}} 分類最近的話題"
+          other: "%{categoryName} (%{count})"
+        help: "%{categoryName} 分類最近的話題"
       top:
         title: "精選"
         help: "在本年、月、週或日最熱門的話題"
@@ -2535,7 +2536,7 @@ zh_TW:
       add_synonyms: "新增"
       delete_tag: "刪除標籤"
       delete_confirm:
-        other: "您確定要刪除此標籤並將它從{{count}}個話題中移除嗎？"
+        other: "您確定要刪除此標籤並將它從%{count}個話題中移除嗎？"
       delete_confirm_no_topics: "您是否確定要刪除這個標籤？"
       rename_tag: "重命名標籤"
       rename_instructions: "標籤的新名稱："
@@ -2846,9 +2847,9 @@ zh_TW:
           none: "沒有相關事件。"
           redeliver: "重新發送"
           incoming:
-            other: "有 {{count}} 個新事件。"
+            other: "有 %{count} 個新事件。"
           completed_in:
-            other: "在 {{count}} 秒內完成。"
+            other: "在 %{count} 秒內完成。"
           request: "請求"
           response: "回應"
           redeliver_confirm: "你確定要再次發送一樣的內容嗎？"
@@ -2900,12 +2901,12 @@ zh_TW:
           label: "上傳"
           title: "上傳備份"
           uploading: "上傳中..."
-          uploading_progress: "上傳中⋯⋯{{progress}}%"
-          success: "{{filename}}已成功上傳，該檔案正在被處理中，需花費幾分鐘才會顯示於列表。"
-          error: "上載時發生問題： '{{filename}}': {{message}}"
+          uploading_progress: "上傳中⋯⋯%{progress}%"
+          success: "%{filename}已成功上傳，該檔案正在被處理中，需花費幾分鐘才會顯示於列表。"
+          error: "上載時發生問題： '%{filename}': %{message}"
         operations:
           is_running: "指令執行中..."
-          failed: "{{operation}} 執行失敗。請觀看紀錄。"
+          failed: "%{operation} 執行失敗。請觀看紀錄。"
           cancel:
             label: "取消"
             title: "取消現行指令"
@@ -3022,7 +3023,7 @@ zh_TW:
           broken_theme_tooltip: "此佈景主題的 CSS、HTML 或 YAML 中有錯誤。"
           default_theme_tooltip: "此佈景主題是網站的預設佈景主題"
           updates_available_tooltip: "此佈景主題可更新"
-          and_x_more: "和{{count}}更多。"
+          and_x_more: "和%{count}更多。"
           collapse: 收起
           uploads: "上傳檔案"
           no_uploads: "您能上傳與您的佈景主題有關的物件，例如：字型與圖片。"
@@ -3063,8 +3064,8 @@ zh_TW:
           disable: "禁用"
           required_version:
             error: "由於佈景主題與此版本的 Discourse 不相容，此佈景主題已被自動停用。"
-            minimum: "需要 Discourse{{version}} 或更新的版本。"
-            maximum: "需要 Discourse {{version}} 或更舊的版本。"
+            minimum: "需要 Discourse%{version} 或更新的版本。"
+            maximum: "需要 Discourse %{version} 或更舊的版本。"
           component_of: "元件："
           update_to_latest: "更新至最新版本"
           check_for_updates: "檢查更新"
@@ -3076,7 +3077,7 @@ zh_TW:
           theme_translations: "佈景主題轉譯"
           empty: "沒有物件"
           commits_behind:
-            other: "佈景主題落後了{{count}}個變更！"
+            other: "佈景主題落後了%{count}個變更！"
           compare_commits: "（查看新的提交）"
           repo_unreachable: "無法連線至此佈景主題的 Git 版本庫。錯誤訊息："
           scss:
@@ -3446,8 +3447,8 @@ zh_TW:
           title: "顯示使用者 Email"
           text: "顯示"
       user:
-        suspend_failed: "將此使用者停權時發生錯誤 {{error}}"
-        unsuspend_failed: "恢復此使用者的權限時發生錯誤 {{error}}"
+        suspend_failed: "將此使用者停權時發生錯誤 %{error}"
+        unsuspend_failed: "恢復此使用者的權限時發生錯誤 %{error}"
         suspend_duration: "你想將此使用者停權多久?"
         suspend_reason_label: "你為什麼要將此使用者停權？你輸入的原因將在此使用者登入時顯示，及顯示在此使用者的基本資料頁面，且<b>任何人都可以看見</b>，請簡短說明原因。"
         suspend_reason_hidden_label: "您為何要將該使用者停權？使用者在登入時會看見這段文字，請簡短描述。"
@@ -3783,6 +3784,7 @@ zh_TW:
         title: "Emoji"
         help: "新增新的emoji供所有人使用。(提示：一次拖放多個檔案)"
         add: "新增emoji"
+        uploading: "正在上傳..."
         name: "名稱"
         group: "群組"
         image: "圖片"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index b37988fd4b..8795267056 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -609,7 +609,7 @@ ar:
       title: "غير مناسب"
       long_form: "ترفع علم هذا عن صورة غير ملائمة"
     notify_user:
-      title: "أرسل رسالة إلى @{{username}}"
+      title: "أرسل رسالة إلى @%{username}"
       long_form: "العضو أرسل"
       email_title: 'منشورك في "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -1814,6 +1814,14 @@ ar:
       finished:
         title: "نسخة دسكورس جاهزة!"
   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}'
+      linked: '%{username} وضع رابطا لمنشورك في "%{topic}" - %{site_title}'
   reviewables:
     actions:
       agree_and_suspend:
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index cd1405bcd5..9973fdcc9c 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -481,7 +481,7 @@ be:
       title: "неадпаведныя"
       long_form: "пазначыў гэта як непрыстойныя"
     notify_user:
-      title: "Адправіць паведамленне @{{username}}"
+      title: "Адправіць паведамленне @%{username}"
       description: "Я хачу пагаварыць з гэтым чалавекам асабіста і непасрэдна аб іх пасады."
       short_description: "Я хачу пагаварыць з гэтым чалавекам асабіста і непасрэдна аб іх пасады."
       long_form: "карыстальнік абменьваліся паведамленнямі"
@@ -1432,6 +1432,7 @@ be:
     not_activated: "Вы яшчэ не можаце ўвайсці ў сістэму. Мы даслалі ліст з кодам актывацыі для вас. Калі ласка, прытрымлівайцеся інструкцыям у лісце, каб актываваць ваш рахунак."
     admin_not_allowed_from_ip_address: "Вы не можаце ўвайсці як адміністратар з гэтага IP-адрасу."
     suspended_with_reason: "Нумар рахунку прыпыняецца да% {дата}:% {прычына}"
+    not_available: "Не даступна. Паспрабуеце %{suggestion}?"
     something_already_taken: "Нешта пайшло не так, магчыма, імя карыстальніка або адрас электроннай пошты ўжо зарэгістраваны. Паспрабуйце аднавіць пароль."
     omniauth_error_unknown: "Нешта пайшло не апрацоўвае ваш часопіс, калі ласка, паспрабуйце яшчэ раз."
     omniauth_confirm_button: "Працягнуць"
@@ -1624,8 +1625,6 @@ be:
     email_reject_bad_destination_address:
       title: "Email Адхіліць Bad адрас прызначэння"
       subject_template: "[% {Email_prefix}] вопрос Email - Unknown To: Адрас"
-      text_body_template: |-
-        Мы шкадуем, але паведамленне электроннай пошты ў% {прызначэння} (названы% {former_title}) не працуе.Ні адзін з прызначэння адрасоў электроннай пошты не распазнаюцца, або Message-ID загаловак ў паведамленні электроннай пошты быў зменены. Калі ласка, пераканайцеся, што вы адпраўляеце на правільны адрас электроннай пошты, прадстаўленай супрацоўнікамі.
     email_reject_old_destination:
       title: "Email Адхіліць Стары Destination"
       subject_template: "[% {Email_prefix}] Email пытанне - Вы спрабуеце адказаць на старое апавяшчэнне"
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index 041232032c..60ba3aeb4d 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -405,7 +405,7 @@ bg:
       title: "Неприлично"
       long_form: "Маркирахте това като неприлично"
     notify_user:
-      title: "Изпрати съобщение до @{{username}}"
+      title: "Изпрати съобщение до @%{username}"
       long_form: "оведомен потребител"
       email_title: 'Вашата публикация в "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -915,6 +915,7 @@ bg:
       category: "Категории"
       topic: "Резултати"
       user: "Потребители"
+    results_page: "Резултати от търсенето на '%{term}'"
   original_poster: "Автор"
   most_posts: "Повечето мнения"
   most_recent_poster: "Последен Автор"
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index dd7c04869a..e437da985d 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -729,6 +729,7 @@ bs_BA:
       category: "Kategorije"
       topic: "Rezultati"
       user: "Korisnici"
+    results_page: "Pretraži za termin '%{term}'"
   original_poster: "Originalni Autor"
   most_posts: "Najviše postova"
   most_recent_poster: "Posljednji Autor"
@@ -995,8 +996,16 @@ bs_BA:
   joined: "Registrovan"
   discourse_push_notifications:
     popup:
+      mentioned: '%{username} vas je spomenuo/la u "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} vas je spomenuo/la u "%{topic}" - %{site_title}'
+      quoted: '%{username} vas je citirao/la u "%{topic}" - %{site_title}'
+      replied: '%{username} vam je odgovorio/la u "%{topic}" - %{site_title}'
+      posted: '%{username} je objavio/la "%{topic}" - %{site_title}'
+      linked: '%{username} je linkao/la vašu objavu "%{topic}" - %{site_title}'
+      watching_first_post: '%{username} je kreirao novu temu "%{topic}" - %{site_title}'
       confirm_title: "Obavijesti uključene - %{site_title}"
       confirm_body: "Uspješno! Obavijesti su sada uključene."
+      custom: "Obavijest od %{username} na %{site_title}"
   reviewables:
     priorities:
       low: "Nisko"
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 68abffcbba..27c7c796a9 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -765,7 +765,7 @@ ca:
       short_description: 'Una violació de les <a href="%{base_path}/guidelines">directrius de la nostra comunitat</a>'
       long_form: "marcat amb bandera com a inapropiat"
     notify_user:
-      title: "Envia un missatge a @{{username}}"
+      title: "Envia un missatge a @%{username}"
       description: "Vull parlar amb aquesta persona directament i personalment sobre la seva publicació."
       short_description: "Vull parlar amb aquesta persona directament i personalment sobre la seva publicació."
       long_form: "usuari contactat"
@@ -1333,6 +1333,7 @@ ca:
     force_https: "Força el lloc web a fer servir només HTTPS. ATENCIÓ: NO ho activeu fins que no verifiqueu que l'HTTPS és totalment configurat i funciona a tot arreu. ¿Heu comprovat també la xarxa CDN, totes les connexions socials, i qualsevol logo o dependència externa per a assegurar-vos que tots són compatibles amb HTTPS?"
     same_site_cookies: "Utilitza les mateixes galetes del lloc web. Eliminen tots els vectors Cross Site Request Forgery (falsificació de petició entre llocs) en els navegadors compatibles (Lax o Strict). Advertència: Strict sols funcionarà en llocs que forcin l'inici de sessió i utilitzin SSO."
     summary_score_threshold: "La puntuació mínima requerida perquè una publicació sigui inclosa en 'Resumeix aquest tema'"
+    summary_likes_required: "Nombre mínim de 'M'agrada' en un tema abans que sigui activat 'Resumeix aquest tema'. Els canvis en aquesta configuració s'aplicaran retroactivament dins d'una setmana."
     summary_percent_filter: "Quan un usuari fa clic en 'Resumeix aquest tema', mostra el % superior de les publicacions"
     summary_max_results: "Nombre màxim de publicacions retornades per \"Resumeix aquest tema\""
     enable_personal_messages: "Permet que els usuaris amb nivell de confiança 1 puguin crear missatges i respondre-hi (configurable amb nivell de confiança mínim per a enviar missatges). Observeu que l'equip responsable sempre pot enviar tota mena de missatges."
@@ -1509,6 +1510,7 @@ ca:
     max_post_deletions_per_day: "Nombre màxim de publicacions que pot suprimir un usuari per dia."
     alert_admins_if_errors_per_minute: "Nombre d'errors per minut que dispara una notificació d'administració. Un valor 0 inhabilita aquesta característica. NOTA: cal reiniciar."
     alert_admins_if_errors_per_hour: "Nombre d'errors per hora que dispara una notificació d'administració. Un valor 0 inhabilita aquesta característica. NOTA: cal reiniciar."
+    categories_topics: "Nombre de temes en la pàgina /categories. Si es posa a 0, s'intentarà automàticament trobar un valor per a mantenir les dues columnes simètriques (categories i temes)."
     suggested_topics: "Nombre de temes recomanats que es mostren a baix d'un tema."
     limit_suggested_to_category: "Mostra solament temes de la categoria actual en els temes recomanats."
     suggested_topics_max_days_old: "Els temes recomanats no haurien de tenir més de n dies."
@@ -2347,10 +2349,6 @@ ca:
     email_reject_bad_destination_address:
       title: "Correu rebutjat: adreça de destinació no vàlida"
       subject_template: "[%{email_prefix}] Problema de correu electrònic: adreça de destinatari desconeguda"
-      text_body_template: |
-        Ho sentim, però el vostre missatge de correu a %{destination} (titulat %{former_title}) no ha funcionat.
-
-        No es reconeix cap de les adreces de correu electrònic de destinació, o bé s'ha modificat la capçalera de missatge/ID del correu. Assegureu-vos que envieu a l'adreça correcta proporcionada per l'equip responsable.
     email_reject_old_destination:
       title: "Correu rebutjat: destinació antiga"
       subject_template: "[%{email_prefix}] Problema de correu electrònic: heu intentat respondre a una notificació antiga"
@@ -2706,6 +2704,7 @@ ca:
       unsubscribe: "Aquest resum és enviat des de %{site_link} quan no us hem vist en molt de temps. Canvieu %{email_preferences_link} o %{unsubscribe_link} per a cancel·lar la subscripció."
       your_email_settings: "la vostra configuració de correu"
       click_here: "feu clic aquí"
+      from: "%{site_name}"
       preheader: "Un resum breu des de la vostra darrera visita el %{last_seen_at}"
     forgot_password:
       title: "Contrasenya oblidada"
@@ -3030,6 +3029,7 @@ ca:
         Aquesta insígnia es concedeix quan rebeu 5 'M'agrada' en 300 publicacions diferents. Molt bé! La comunitat admira les vostres aportacions freqüents i d'alta gran qualitat a les converses!
     out_of_love:
       name: Sense amor
+      description: "S'han fet servir %{max_likes_per_day} 'm'agrada' en un dia"
       long_description: |
         Aquesta insígnia es concedeix quan gasteu tots els %{max_likes_per_day} dels vostres 'M'agrada' diaris. Dedicar un temps a mostrar estima per les publicacions que us han agradat encoratja els membres de la comunitat a crear discussions encara millors en el futur.
     higher_love:
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index 2859a05a8f..f4d80417b2 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -564,7 +564,7 @@ cs:
       title: "Nevhodné"
       long_form: "nahlášeno jako nevhodné"
     notify_user:
-      title: "Poslat @{{username}} zprávu"
+      title: "Poslat @%{username} zprávu"
       long_form: "obeslaný uživatel"
       email_title: 'Váš příspěvek v „%{title}“'
       email_body: "%{link}\\\n\\\n%{message}\n"
@@ -876,9 +876,11 @@ cs:
       min_username_length_range: "Nemůžete nastavit minimum nad maximum."
       max_username_length_range: "Nemůžete nastavit maximum pod minimum."
   search:
+    within_post: "#%{post_number} od %{username}"
     types:
       category: "Kategorie"
       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"
@@ -1164,6 +1166,12 @@ cs:
   joined: "Účet vytvořen"
   discourse_push_notifications:
     popup:
+      mentioned: 'Uživatel %{username} vás zmínil v "%{topic}" - %{site_title}'
+      group_mentioned: 'Uživatel %{username} vás zmínil v "%{topic}" - %{site_title}'
+      quoted: '%{username} vás citoval v "%{topic}" - %{site_title}'
+      replied: '%{username} vám odpověděl v "%{topic}" - %{site_title}'
+      posted: '%{username} přispěl do "%{topic}" - %{site_title}'
+      linked: '%{username} odkázal na vás příspěvek v "%{topic}" - %{site_title}'
       confirm_title: "Upozornění zapnuta - %{site_title}"
       confirm_body: "Upozornění úspěšně zapnuta."
   reviewables:
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 573733ef81..2f479f096f 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -606,7 +606,7 @@ da:
       title: "Upassende"
       long_form: "markerede dette som stødende"
     notify_user:
-      title: "Send @{{username}} en besked"
+      title: "Send @%{username} en besked"
       long_form: "sendt besked til brugeren"
       email_title: 'Dit indlæg i "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -1099,6 +1099,7 @@ da:
       category: "Kategorier"
       topic: "Resultater"
       user: "Brugere"
+    results_page: "Søgeresultater for '%{term}'"
   original_poster: "Oprindelig forfatter"
   most_posts: "Flest indlæg"
   most_recent_poster: "Seneste forfatter"
@@ -1163,7 +1164,7 @@ da:
     activated_by_staff: "Aktiveret af hjælperteamet"
     new_user_typed_too_fast: "Ny bruger tastede for hurtigt"
     username:
-      short: "skal være på mindst %{{min}} tegn."
+      short: "skal være på mindst %%{min} tegn."
       long: "skal være kortere end %{max} tegn"
       unique: "skal være unik"
       blank: "skal udfyldes"
@@ -1788,8 +1789,16 @@ da:
   joined: "Tilmeldt"
   discourse_push_notifications:
     popup:
+      mentioned: '%{username} nævnte dig i "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} nævnte dig i "%{topic}" - %{site_title}'
+      quoted: '%{username} citerede dig i "%{topic}" - %{site_title}'
+      replied: '%{username} svarede dig i "%{topic}" - %{site_title}'
+      posted: '%{username} skrev i "%{topic}" - %{site_title}'
+      linked: '%{username} linkede til dit indlæg fra "%{topic}" - %{site_title}'
+      watching_first_post: '%{username} oprettet et nyt emne"%{topic}" - %{site_title}'
       confirm_title: "Notifikationer aktiveret - %{site_title}"
       confirm_body: "Succes! notifikationer er aktiveret."
+      custom: "Notifikation fra %{username}på %{site_title}"
   reviewables:
     priorities:
       low: "Lav"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 1ce2dd6c90..4b02ef0eac 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -760,7 +760,7 @@ de:
       short_description: 'Ein Verstoß gegen <a href="%{base_path}/guidelines">unsere Community-Richtlinien</a>'
       long_form: "dies als unangemessen gemeldet"
     notify_user:
-      title: "Schreibe @{{username}} eine Nachricht"
+      title: "Schreibe @%{username} eine Nachricht"
       description: "Ich möchte mit dieser Person direkt und privat über ihren Beitrag reden."
       short_description: "Ich möchte mit dieser Person direkt und privat über ihren Beitrag reden."
       long_form: "angeschriebener Benutzer"
@@ -2546,10 +2546,6 @@ de:
     email_reject_bad_destination_address:
       title: "E-Mail abgelehnt weil unbekannte Empfänger-Adresse"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Empfängeradresse unbekannt"
-      text_body_template: |
-        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (mit dem Betreff %{former_title}) hat nicht funktioniert.
-
-        Keine der Empfängeradressen wurden erkannt oder der Message-ID-Header in der E-Mail ist verändert worden. Bitte stelle sicher, dass du an die richtige E-Mail-Adresse schickst, die vom Team bekanntgegeben wurde.
     email_reject_old_destination:
       title: "E-Mail abgelehnt weil alter Empfänger"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Du versuchst, auf eine alte Benachrichtigung zu antworten"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 4166fca0e7..25b4562446 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -527,7 +527,7 @@ el:
       title: "Ανάρμοστο"
       long_form: "το επισήμαναν ως ανάρμοστο"
     notify_user:
-      title: "Αποστολή μηνύματος στον @{{username}} "
+      title: "Αποστολή μηνύματος στον @%{username} "
       long_form: "ειδοποίησε το μέλος"
       email_title: 'Η δημοσίευση σας στο "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -1663,11 +1663,6 @@ el:
     email_reject_bad_destination_address:
       title: "Απόρριψη email Μη Έγκυρη Διεύθυνση Προορισμού"
       subject_template: "[%{email_prefix}] Πρόβλημα Email -- Άγνωστη Διεύθυνση Προς:"
-      text_body_template: |2
-
-        Λυπούμαστε, αλλά το email προς %{destination} (με τίτλο%{former_title}) απέτυχε.
-
-        Δεν αναγνωρίστηκε καμία από τις διευθύνσεις παραληπτών ή το Message-ID header στο email έχει τροποποιηθεί. Παρακαλούμε βεβαιωθείται ότι στέλνετε στην σωστή διεύθυνση email που σας έχει δοθεί από τους συνεργάτες.
     email_reject_topic_not_found:
       title: "Απόρριψη email Δε βρέθηκε το νήμα"
       subject_template: "[%{email_prefix}] Πρόβλημα Email -- Δεν Βρέθηκε Νήμα"
@@ -2672,6 +2667,14 @@ el:
       finished:
         title: "Το Discourse σου είναι έτοιμο!"
   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}'
+      linked: '%{username} έκανε μια σύνδεση στην ανάρτηση που έκανες στο νήμα "%{topic}" - %{site_title}'
   reviewables:
     actions:
       agree_and_keep:
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 4eebed5fd9..96d9d1fea8 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -371,6 +371,10 @@ es:
       trust_level_4: "nivel_de_confianza_4"
     request_membership_pm:
       title: "Solicitud de membresía para @%{group_name}"
+    request_accepted_pm:
+      title: "Te han aceptado para el grupo @%{group_name}"
+      body: |
+        Tu solicitud para entrar al grupo @%{group_name} ha sido aceptada y ahora eres parte de él.
     view_hidden_topic_request_reason: "Me gustaría unirme al grupo «%{group_name}» para poder acceder a [este tema](%{topic_url})"
   education:
     until_posts:
@@ -537,7 +541,7 @@ es:
     title: "Te damos la bienvenida a la Sala VIP"
     body: |2
 
-      ¡Felicitaciones! :confetti_ball:
+      ¡Enhorabuena! :confetti_ball:
 
       Si puedes ver este tema, es que has sido promovido a usuario **habitual** (nivel de confianza 3).
 
@@ -795,7 +799,7 @@ es:
       short_description: 'Infringe <a href="%{base_path}/guidelines">nuestras directrices de la comunidad</a>'
       long_form: "reportado como inapropiado"
     notify_user:
-      title: "Enviar un mensaje a @{{username}}"
+      title: "Enviar un mensaje a @%{username}"
       description: "Quiero hablar con esta persona directamente y personalmente sobre su publicación."
       short_description: "Quiero hablar con esta persona directamente y personalmente sobre su publicación."
       long_form: "usuario notificado por mensaje"
@@ -2692,10 +2696,6 @@ es:
     email_reject_bad_destination_address:
       title: "Correo electrónico de rechazo. Dirección del destinatario incorrecta"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Dirección desconocida"
-      text_body_template: |
-        Lo sentimos, tu correo electrónico para %{destination} (con el título %{former_title}) no funcionó.
-
-        Ninguna de las direcciones de correo electrónico fue reconocida o el encabezado de ID del mensaje en el correo ha sido modificado. Por favor, asegúrate de que estás enviando los correos a las direcciones correctas provistas por el staff.
     email_reject_old_destination:
       title: "Correo electrónico de rechazo. Destino antiguo"
       subject_template: "[%{email_prefix}] Problema de correo electrónico -- Estás intentando responder a una notificación antigua"
@@ -2873,7 +2873,7 @@ es:
       title: "¡Eres el usuario nuevo del mes!"
       subject_template: "¡Eres el usuario nuevo del mes!"
       text_body_template: |
-        ¡Felicitaciones! Ganaste el **premio de usuario nuevo del mes de%{month_year}**. :trophy:
+        ¡Enhorabuena! Has ganado el **premio de usuario nuevo del mes de%{month_year}**. :trophy:
 
         Este premio solo lo ganan dos de los nuevos miembros de cada mes y será visible permanentemente en [la página de medallas](%{url}).
 
@@ -3296,6 +3296,8 @@ es:
         Si has sido tú, ¡genial! No tienes que hacer más nada.
 
         Si no has sido tú, por favor, [revisa tus sesiones activas](%{base_url}/my/preferences/account) y considera cambiar tu contraseña.
+  page_forbidden:
+    title: "¡Ups! Esa página es privada."
   page_not_found:
     title: "¡Ups! Esa página no existe o es privada."
     popular_topics: "Destacados"
@@ -3782,7 +3784,7 @@ es:
       name: ¡Bienvenido/a!
       description: Recibió un me gusta
       long_description: |
-        Esta medalla se concede al recibir tu primer me gusta en una publicación. ¡Felicitaciones! Publicaste algo que los demás miembros de la comunidad han considerado útil, interesante o entretenido.
+        Esta medalla se concede al recibir tu primer me gusta en una publicación. ¡Enhorabuena! Publicaste algo que los demás miembros de la comunidad han considerado útil, interesante o entretenido.
     autobiographer:
       name: Autobiógrafo
       description: "Detalló información en su <a href=\"%{base_uri}/my/preferences/profile\">perfil</a> de usuario"
@@ -4022,7 +4024,7 @@ es:
     synonyms_exist: "no está permitido mientras existan sinónimos"
   rss_by_tag: "Temas con la etiqueta %{tag}"
   finish_installation:
-    congratulations: "¡Felicitaciones, has instalado Discourse!"
+    congratulations: "¡Enhorabuena, has instalado Discourse!"
     register:
       button: "Registrarse"
       title: "Registrar cuenta de administrador"
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index 0e13d0d846..91190917fb 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -480,7 +480,7 @@ et:
       title: "Ebasünnis"
       long_form: "tähistasin selle kui sobimatu"
     notify_user:
-      title: "Saada kasutajale @{{username}} sõnum"
+      title: "Saada kasutajale @%{username} sõnum"
       long_form: "saatsin kasutajale sõnumi"
       email_title: 'Sinu postitus teemas "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -781,6 +781,7 @@ et:
       min_username_length_range: "Minimaalne ei tohi olla maksimaalsest suurem."
       max_username_length_range: "Sa ei tohi maksimaalset seada minimaalsest väiksemaks."
   search:
+    within_post: "postituse nr%{post_number} tegi %{username}"
     types:
       category: "Liigid"
       user: "Kasutajad"
@@ -795,6 +796,7 @@ et:
   login:
     not_approved: "Kontot pole veel kinnitatud. Teid teavitatakse e-post teel, kui sisselogimine on võimaldatud."
     admin_not_allowed_from_ip_address: "Sellelt IP-aadressilt ei saa adminnina sisse logida."
+    not_available: "Pole saadaval. Proovime %{suggestion}?"
     omniauth_confirm_button: "Jätka"
     already_logged_in: "Oih, näib, et üritad vastu võtta võõra kasutaja kutset. Kui Sa ei ole kasutaja %{current_user}, logi palun välja ja proovi uuesti."
   admin:
@@ -869,6 +871,7 @@ et:
   deleted: "kustutatud"
   image: "pilt"
   upload:
+    unauthorized: "Vabandust, fail mida püüad üles laadida, ei ole lubatud (lubatud faililaiendid: %{authorized_extensions})."
     pasted_image_filename: "Asetatud pilt"
   skipped_email_log:
     user_email_anonymous_user: "Kasutaja on anonüümne"
@@ -1107,6 +1110,14 @@ et:
       finished:
         title: "Sinu Discourse on valmis!"
   joined: "Liitus"
+  discourse_push_notifications:
+    popup:
+      mentioned: '%{username} mainis Sind teemas "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} mainis Sind teemas "%{topic}" - %{site_title}'
+      quoted: '%{username} tsiteeris Sind teemas "%{topic}" - %{site_title}'
+      replied: '%{username} vastas Sulle teemas "%{topic}" - %{site_title}'
+      posted: '%{username} postitas teemasse "%{topic}" - %{site_title}'
+      linked: '%{username} viitas Sinu postitusele teemas "%{topic}" - %{site_title}'
   staff_action_logs:
     not_found: "ei leitud"
     unknown: "tundmatu"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index ea01165755..636946370e 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -528,7 +528,7 @@ fa_IR:
       title: "نامناسب"
       long_form: "به عنوان نامناسب علامت گذاری شده"
     notify_user:
-      title: "فرستادن پیام به @{{username}}"
+      title: "فرستادن پیام به @%{username}"
       long_form: "به کاربر پیام داده شد"
       email_title: 'فرسته‌ی شما در « %{title} »'
       email_body: "%{link}\n\n%{message}"
@@ -1251,6 +1251,7 @@ fa_IR:
       category: "دسته‌ها"
       topic: "نتایج"
       user: "کاربران"
+    results_page: "نتایج جستجو برای '%{term}'"
   sso:
     login_error: "خطا در ورود"
     not_found: "حساب کاربری پیدا نشد. لطفا با مدیریت سایت تماس بگیرید."
@@ -2263,8 +2264,16 @@ fa_IR:
   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} مطلبی نوشت'
+      linked: '%{username} در "%{topic}" - %{site_title} به نوشته‌ی شما پیوندی قرار داد'
+      watching_first_post: '%{username} یک مبحث جدید در "%{topic}" - %{site_title} ساخته'
       confirm_title: "اعلانات فعال شد - %{site_title}"
       confirm_body: "موفق شدید. اگاهسازی‌ها فعال شدند."
+      custom: "اعلان از طرف %{username} بر روی %{site_title}"
   reviewables:
     priorities:
       low: "کم"
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index ceb4206823..1a4326b984 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -45,6 +45,7 @@ fi:
       unrecognized_extension: "Tuntematon tiedostomuoto: %{extension}"
     import_error:
       generic: Teeman tuomisessa tapahtui virhe
+      about_json: "Virhe tuotaessa: about.json ei ole olemassa tai ei kelpaa. Oletko varma, että tämä on Discourse-teema?"
       about_json_values: "about.json sisältää arvoja, jotka eivät kelpaa: %{errors}"
       git: "Virhe git-tietovarastoa kloonattaessa: ei ole pääsyoikeutta tai tietovarastoa ei löytynyt"
       unpack_failed: "Tiedoston purku epäonnistui"
@@ -58,6 +59,7 @@ fi:
       optimized_link: Optimoidut kuvalinkit ovat lyhytikäisiä eikä niitä tulisi sisällyttää teeman lähdekoodiin.
     settings_errors:
       invalid_yaml: "Annettu YAML ei kelpaa"
+      data_type_not_a_number: "Tietotyypiksi ei ole mahdollista asettaa `%{name}`. Tuettuja tietotyyppejä ovat `integer`, `bool`, `list`, `enum` ja `upload`"
       name_too_long: "Jollain asetuksella on liian pitkä nimi. Enimmäispituus on 255."
       default_value_missing: "Asetuksella \"%{name}\" ei ole oletusarvoa"
       default_not_match_type: "Asetuksen \"%{name}\" oletusarvo ei sovi asetuksen tyyppiin."
@@ -362,6 +364,10 @@ fi:
       trust_level_4: "luottamustaso_4"
     request_membership_pm:
       title: "Jäsenhakemus ryhmään @%{group_name}"
+    request_accepted_pm:
+      title: "Sinut hyväksyttiin ryhmään @%{group_name}"
+      body: |
+        Pyyntösi ryhmään @%{group_name} liittymiseksi on hyväksytty ja olet nyt jäsen.
     view_hidden_topic_request_reason: "Haluaisin liittyä ryhmään '%{group_name}', jotta pääsen [tähän ketjuun](%{topic_url})"
   education:
     until_posts:
@@ -403,6 +409,12 @@ 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ä parempi, jos useammilla olisi tilaa jakaa omia näkökulmiaan. Voisit kutsua heitä tänne?
     get_a_room: |
       ### Rohkaise kaikkia osallistumaan keskusteluun
 
@@ -447,6 +459,7 @@ fi:
               no_user_selected: "Sinun täytyy valita kelpaava käyttäjä."
               reply_by_email_disabled: "Sähköpostilla vastaaminen ei ole käytössä."
               target_user_not_found: "Ei löydetty yhtä niistä käyttäjistä, joille lähetät viestiä."
+              unable_to_update: "Ketjun päivittäminen epäonnistui."
             featured_link:
               invalid: "ei ole käypä. URL:in tulisi sisältää http:// tai https://."
               invalid_category: "ei voi muokata tällä alueella."
@@ -465,6 +478,10 @@ fi:
               same_as_password: "on sama kuin salasanasi."
             ip_address:
               signup_not_allowed: "Liittyminen ei ole sallittu tälle tilille."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Tätä ketjua et voi valikoida profiiliisi."
         user_email:
           attributes:
             user_id:
@@ -781,7 +798,7 @@ fi:
       short_description: '<a href="%{base_path}/guidelines">Palstan sääntöjen</a> vastainen'
       long_form: "liputti tämän sopimattomaksi"
     notify_user:
-      title: "Lähetä käyttäjälle @{{username}} viesti."
+      title: "Lähetä käyttäjälle @%{username} viesti."
       description: "Haluan keskustella viestistä kirjoittajan kanssa kahden kesken."
       short_description: "Haluan keskustella viestistä kirjoittajan kanssa suoraan ja henkilökohtaisesti."
       long_form: "lähetä käyttäjälle viesti"
@@ -1280,6 +1297,7 @@ fi:
     unreachable_themes: "Näille teemoille ei löytynyt päivityksiä:"
     watched_word_regexp_error: "Säännöllinen lauseke %{action}-tyypin tarkkailuille sanoille ei kelpaa. Käy läpi <a href='%{base_path}/admin/logs/watched_words'>Tarkkaillut sanat -asetuksesi</a> tai poista käytöstä 'watched words regular expressions' -sivustoasetus."
   site_settings:
+    display_local_time_in_user_card: "Näytä käyttäjän aikavyöhykkeeseen perustuva paikallinen aika hänen käyttäjäkortissaan."
     censored_words: "Sanat, jotka korvataan automaattisesti merkeillä &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Poista automaattisesti kaikki yli 30 päivää piilotettuna olleet viestit."
     default_locale: "Tämän Discourse-ympäristön oletuskieli. Voit korvata systeemin luomien alueiden ja ketjujen tekstejä kohteessa <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Mukauta / Tekstit</a>."
@@ -2594,10 +2612,6 @@ fi:
     email_reject_bad_destination_address:
       title: "Sähköposti hylätty - tuntematon vastaanottajaosoite"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- Tuntematon Vastaanottaja: -osoite"
-      text_body_template: |
-        Pahoittelut, sähköpostin lähettäminen kohteeseen %{destination} (titled %{former_title}) ei onnistunut.
-
-        Viestisi kohdesähköpostiosoitteet olivat tuntemattomia tai sähköpostiviestin ID-otsikkotietoa (engl. Message-ID) on muutettu. Varmistu, että lähetät oikeaan henkilökunnan antamaan sähköpostiosoitteeseen.
     email_reject_old_destination:
       title: "Sähköposti hylätty - vanha kohde"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- Yrität vastata vanhaan ilmoitukseen"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 8449404a2b..6484c1909b 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -63,9 +63,9 @@ fr:
       data_type_not_a_number: "Le type du paramètre `%{name}` n'est pas supporté. Les types supportés sont `integer`, `bool`, `list`, `enum` et `upload`"
       name_too_long: "Il y a un paramètre avec un nom trop long. Longueur maximum 255"
       default_value_missing: "Le paramètre `%{name}` n'a pas de valeur par défaut"
-      default_not_match_type: "Le type de la valeur par défaut de paramètre `%{name}` ne correspond pas au type du paramètre."
+      default_not_match_type: "Le type de la valeur par défaut du paramètre `%{name}` ne correspond pas au type du paramètre."
       default_out_range: "La valeur par défaut de paramètre `%{name}` n'est pas dans la plage spécifiée."
-      enum_value_not_valid: "La valeur séléctionnée ne fait pas partie des choix enum."
+      enum_value_not_valid: "La valeur sélectionnée ne fait pas partie de la liste des choix possibles."
       number_value_not_valid: "La nouvelle valeur n'est pas dans la plage autorisée."
       number_value_not_valid_min_max: "La valeur doit être comprise entre %{min} et %{max}."
       number_value_not_valid_min: "La valeur doit être supérieure ou égale à %{min}."
@@ -135,7 +135,7 @@ fr:
       not_an_integer: doit être un entier
       odd: doit être impair
       record_invalid: "Validation échouée : %{errors}"
-      max_emojis: "limité à %{max_emojis_count}emoji"
+      max_emojis: "limité à %{max_emojis_count} emojis"
       emojis_disabled: "emoji indisponibles"
       ip_address_already_screened: "est déjà inclus dans une règle existante"
       restrict_dependent_destroy:
@@ -164,16 +164,16 @@ fr:
       invalid_choice:
         one: "Vous avez spécifié le choix invalide %{name}"
         other: "Vous avez spécifié les choix invalides %{name}"
-      default_categories_already_selected: "Vous ne pouvez pas séléctionner une catégorie qui est utilisée dans une autre liste."
+      default_categories_already_selected: "Vous ne pouvez pas sélectionner une catégorie qui est utilisée dans une autre liste."
       default_tags_already_selected: "Vous ne pouvez pas sélectionner une étiquette utilisée dans une autre liste."
       s3_upload_bucket_is_required: "Vous ne pouvez pas activer l'envoi de fichiers sur S3 avant d'avoir renseigné le paramètre 's3_upload_bucket'."
       enable_s3_uploads_is_required: "Vous ne pouvez pas activer l'inventaire sur S3 avant d'avoir activer les envois S3."
       s3_backup_requires_s3_settings: "Il n'est pas possible d'utiliser le lieu de sauvegarde S3 sans renseigner le '%{setting_name}'."
       s3_bucket_reused: "Il n'est pas possible d'utiliser le même bucket pour 's3_upload_bucket' and 's3_backup_bucket'. Choisir un autre bucket ou utiliser un chemin d'accès différent pour chaque bucket."
-      secure_media_requirements: "Les téléversements sur S3 doivent être activés avant d'activer la sécurisation des médias."
+      secure_media_requirements: "L'envoi de fichiers sur S3 doit être activé avant d'activer la sécurisation des médias."
       second_factor_cannot_be_enforced_with_disabled_local_login: "Il n'est pas possible de render obligatoire le 2FA (authentification à deux facteurs) si les connexions locales sont désactivée."
       local_login_cannot_be_disabled_if_second_factor_enforced: "Il n'est pas possible de désactiver les connexions locales si le 2FA (authentification à deux facteurs) est obligatoire. Désactiver l'obligation du 2FA avant de désactiver les connexions locales."
-      cannot_enable_s3_uploads_when_s3_enabled_globally: "Il n'est pas possible d'activer les téléversements S3 car ils sont déjà activés globalement, et les activer au niveau d'un site pourrait provoquer des problèmes critiques avec les téléversements."
+      cannot_enable_s3_uploads_when_s3_enabled_globally: "Il n'est pas possible d'activer l'envoi de fichiers sur S3 car il est déjà activé globalement, et l'activer au niveau du site pourrait provoquer des problèmes majeurs avec les fichiers envoyés."
     conflicting_google_user_id: 'Le Google Account ID a changé pour ce compte ; un responsable doit intervenir pour des raisons de sécurité. Merci de contacter les responsables et les renvoyer vers <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   activemodel:
     errors:
@@ -194,11 +194,14 @@ fr:
     file_should_be_csv: "Le fichier envoyé doit être au format CSV."
     max_rows: "Les premières %{max_bulk_invites} invitations ont été envoyées. Essayez de diviser le fichier en parties plus petites."
     error: "Il y a eu une erreur en envoyant ce fichier. Merci de réessayer plus tard."
+  invite_link:
+    email_taken: "Cette adresse courriel est déjà utilisée. Si vous possédez déjà un compte, veuillez vous connecter ou réinitialiser votre mot de passe."
+    max_redemptions_limit: "doit être entre 2 et %{max_limit}."
   topic_invite:
     failed_to_invite: "L'utilisateur ne peut pas être invité dans ce sujet sans être membre d'un des groupes suivants : %{group_names}."
     user_exists: "Désolé, cet utilisateur a déjà été invité. Vous ne pouvez inviter un utilisateur qu'une seule fois par sujet."
   backup:
-    operation_already_running: "Une opération est en cours d'exécution. Vous ne pouvez pas démarrer un nouveau processus pour l'instant."
+    operation_already_running: "Une opération est en cours d'exécution. Vous ne pouvez pas démarrer une nouvelle tâche pour l'instant."
     backup_file_should_be_tar_gz: "Le fichier de sauvegarde doit être une archive .tar.gz."
     not_enough_space_on_disk: "Il n'y a pas assez d'espace sur le disque pour charger cette sauvegarde."
     invalid_filename: "Le nom du fichier de sauvegarde contient des caractères invalides. Sont autorisés : a-z 0-9 . - _."
@@ -238,7 +241,7 @@ fr:
     continue: "Continuer la discussion"
     error: "Erreur d'intégration"
     referer: "Référent :"
-    error_topics: "Le paramètre de site `Embed Topics List` n'a pas été activé"
+    error_topics: "Le paramètre `embed topics list` n'a pas été activé"
     mismatch: "Le référent n'a pas été envoyé, ou ne correspondait à aucun des hôtes suivants :"
     no_hosts: "Aucun hôte n'a été configuré pour l'intégration."
     configure: "Configurer l'intégration"
@@ -246,15 +249,15 @@ fr:
       one: "%{count} réponse supplémentaire"
       other: "%{count} réponses supplémentaires"
     loading: "Chargement de la discussion…"
-    permalink: "Lien permanent"
-    imported_from: "Ce sujet de discussion accompagne la publication %{link}"
+    permalink: "Permalien"
+    imported_from: "Ce sujet de discussion accompagne la publication sur %{link}"
     in_reply_to: "▶ %{username}"
     replies:
       one: "%{count} réponse"
       other: "%{count} réponses"
     likes:
-      one: "%{count}J'aime"
-      other: "%{count}J'aime"
+      one: "%{count} J'aime"
+      other: "%{count} J'aime"
     last_reply: "Dernière réponse"
     created: "Créé"
     new_topic: "Créer un nouveau sujet"
@@ -267,7 +270,7 @@ fr:
     one: "Désolé, les nouveaux utilisateurs ne peuvent mentionner qu'un utilisateur dans un message."
     other: "Désolé, les nouveaux utilisateurs ne peuvent mentionner que %{count} utilisateurs dans un message."
   no_images_allowed_trust: "Désolé, il ne vous est pas possible d'inclure des images dans un message"
-  no_images_allowed: "Désolé, les nouveaux utilisateurs ne peuvent pas ajouter d'image dans les messages."
+  no_images_allowed: "Désolé, les nouveaux utilisateurs ne peuvent pas ajouter d'images dans les messages."
   too_many_images:
     one: "Désolé, les nouveaux utilisateurs ne peuvent ajouter qu'une image dans un message."
     other: "Désolé, les nouveaux utilisateurs ne peuvent ajouter que %{count} images dans un message."
@@ -276,7 +279,7 @@ fr:
     one: "Désolé, les nouveaux utilisateurs ne peuvent ajouter qu'un fichier dans leurs messages."
     other: "Désolé, les nouveaux utilisateurs ne peuvent ajouter que %{count} fichiers dans leurs messages."
   no_links_allowed: "Désolé, les nouveaux utilisateurs ne peuvent pas insérer de liens dans leurs messages."
-  links_require_trust: "Désolé, il ne vous est pas possible d'inclure des liens dans vos messages."
+  links_require_trust: "Désolé, vous ne pouvez pas inclure des liens dans vos messages."
   too_many_links:
     one: "Désolé, les nouveaux utilisateurs ne peuvent insérer qu'un seul lien par message."
     other: "Désolé, les nouveaux utilisateurs ne peuvent insérer que %{count} liens par message."
@@ -372,7 +375,7 @@ fr:
       trust_level_3: "niveau_confiance_3"
       trust_level_4: "niveau_confiance_4"
     request_membership_pm:
-      title: "Demande d'adhésion pour @%{group_name}"
+      title: "Demande d'adhésion à @%{group_name}"
     request_accepted_pm:
       title: "Vous avez été accepté dans @%{group_name}"
       body: |
@@ -559,7 +562,7 @@ fr:
       * Modifier la catégorie de n'importe quel sujet
       * Avoir des liens qui sont suivis ([automatic nofollow](https://fr.wikipedia.org/wiki/Nofollow) est ôté)
       * Accéder à la catégorie privée Salon qui est réservée aux utilisateurs de niveau de confiance 3 et plus
-      * Cacher du spam avec un seul signalement
+      * Masquer du spam avec un seul signalement
 
       Voilà la [liste des habitués actuels](%{base_path}/badges/3/regular). N'hésitez pas à dire bonjour.
 
@@ -592,7 +595,7 @@ fr:
         one: "Vous ne pouvez pas supprimer cette catégorie car elle contient %{count} sujet. Le plus vieux sujet est %{topic_link}."
         other: "Vous ne pouvez pas supprimer cette catégorie car elle contient %{count} sujets. Le plus vieux sujet est %{topic_link}."
       topic_exists_no_oldest: "Vous ne pouvez pas supprimer cette catégorie car le nombre de sujet est de %{count}."
-    uncategorized_description: "Sujets qui n'ont pas besoin d'une catégorie ou qui ne correspondent à aucune catégorie existante."
+    uncategorized_description: "Les sujets qui n'ont pas besoin d'une catégorie ou qui ne correspondent à aucune catégorie existante."
   trust_levels:
     newuser:
       title: "nouvel utilisateur"
@@ -807,7 +810,7 @@ fr:
       short_description: 'Une transgression de <a href="%{base_path}/guidelines">notre charte communautaire</a>'
       long_form: "signalé comme inapproprié"
     notify_user:
-      title: "Envoyer un message à @{{username}} "
+      title: "Envoyer un message à @%{username} "
       description: "J'aimerais parler à cette personne directement et personnellement au sujet de leur message."
       short_description: "J'aimerais parler à cette personne directement et personnellement au sujet de leur message."
       long_form: "utilisateur contacté"
@@ -835,7 +838,7 @@ fr:
       title: "erreur de brouillon"
       description: "Le brouillon est en train d'être modifié dans une autre fenêtre. Veuillez recharger cette page."
   draft_backup:
-    pm_title: "Sauvegarde des brouillons sur les sujets en cours."
+    pm_title: "Brouillons sauvegardés de sujets en cours."
     pm_body: "Sujet contenant des brouillons sauvegardés"
   user_activity:
     no_default:
@@ -854,14 +857,17 @@ fr:
       self: "Vous n'avez pas de brouillons ; commencez à répondre à un sujet et la réponse sera automatiquement sauvegardée comme un nouveau brouillon."
   webauthn:
     validation:
+      invalid_type_error: "Le type de webauthn est invalide. Les types valides sont webauthn.get et webauthn.create."
       challenge_mismatch_error: "Le défi fourni ne correspond pas au défi généré par le serveur d'authentification."
       invalid_origin_error: "L'origine de la requête d'authentification ne correspond pas à l'origine du serveur."
       malformed_attestation_error: "Une erreur s'est produite pendant le déchiffrage des données d'attestation."
       user_verification_error: "Une vérification de l'utilisateur est requise."
       unsupported_public_key_algorithm_error: "L'algorithme de clé publique n'est pas supporté par le serveur."
       unsupported_attestation_format_error: "Le format d'attestation n'est pas supporté par le serveur."
+      credential_id_in_use_error: "L'ID d'identification est déjà utilisé."
       public_key_error: "La vérification de la clé publique pour l'identifiant a échoué."
       ownership_error: "La clé de sécurité n'appartient pas à l'utilisateur."
+      not_found_error: "Une clé de sécurité avec cet ID d'identification n'a pas été trouvée."
       unknown_cose_algorithm_error: "L'algorithme utilisé pour la clé de sécurité n'est pas reconnu."
   topic_flag_types:
     spam:
@@ -882,8 +888,8 @@ fr:
       email_title: 'Le sujet « %{title} » nécessite l''attention d''un modérateur'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Votre message a été signalé par la communauté. Veuillez <a href="%{path}">consulter vos messages privés</a>.</p>'
-    user_must_edit: "<p>Ce message a été signalé par la communauté et temporairement masqué.</p>"
+    you_must_edit: '<p>Votre message a été signalé par la communauté. Veuillez <a href="%{path}">consulter vos messages directs</a>.</p>'
+    user_must_edit: "<p>Ce message a été signalé par la communauté et est temporairement masqué.</p>"
   ignored:
     hidden_content: "<p>Contenu ignoré</p>"
   archetypes:
@@ -905,7 +911,7 @@ fr:
     title: "Se désabonner"
     stop_watching_topic: "Arrêter de surveiller ce sujet, %{link}"
     mute_topic: "Ignorer toutes les notifications pour ce sujet, %{link}"
-    unwatch_category: "Arrêter de surveiller tous les sujets dans %{category}"
+    unwatch_category: "Arrêter de surveiller les sujets dans %{category}"
     mailing_list_mode: "Désactiver la liste de diffusion"
     all: "Ne pas m'envoyer de courriel de %{sitename}"
     different_user_description: "Vous êtes actuellement connecté avec un utilisateur différent de celui à qui le courriel est adressé. Veuillez vous déconnecter, ou utiliser le mode anonyme, et essayer à nouveau."
@@ -1276,8 +1282,8 @@ fr:
   dashboard:
     rails_env_warning: "Votre serveur fonctionne dans l'environnement de %{env}."
     host_names_warning: "Votre fichier config/database.yml utilise le nom d'hôte par défaut. Veuillez renseigner votre nom d'hôte."
-    sidekiq_warning: 'Sidekiq n''est pas lancé. De nombreuses tâches, comme l''envoi des courriels, sont exécutées de manière asynchrone par sidekiq. Assurez-vous d''avoir au moins un processus sidekiq de lancé. <a href="https://github.com/mperham/sidekiq">En savoir plus sur sidekiq</a>.'
-    queue_size_warning: "Le nombre de jobs dans la file d'attente est de %{queue_size}, ce qui est assez élevé. Cela peut indiquer un problème avec le(s) process Sidekiq, ou la nécessité d'ajouter davantage de workers."
+    sidekiq_warning: 'Sidekiq n''est pas en cours d''exécution. De nombreuses tâches, comme l''envoi de courriels, sont exécutées de manière asynchrone par Sidekiq. Assurez-vous d''avoir au moins un processus Sidekiq en exécution. <a href="https://github.com/mperham/sidekiq">En savoir plus sur Sidekiq</a>.'
+    queue_size_warning: "Il y a %{queue_size} tâches dans la file d'attente, ce qui est assez élevé. Cela peut indiquer un problème avec les processus Sidekiq ou qu'ils ne sont pas assez nombreux pour traiter efficacement les tâches."
     memory_warning: "Votre serveur dispose de moins de 1 Go de mémoire vive. Au moins 1 Go de RAM est recommandé."
     google_oauth2_config_warning: 'Le serveur est configuré pour permettre l''authentification via Google Oauth2 (enable_google_oauth2_logins), mais les paramètres client id et client secret ne sont pas renseignés. Allez dans les <a href="%{base_path}/admin/site_settings">Paramètres du Site</a> et mettez les à jour. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Voir le guide pour en savoir plus</a>.'
     facebook_config_warning: 'Le serveur est configuré pour permettre l''authentification par Facebook (enable_facebook_logins), mais les paramètres facebook_app_id et facebook_app_secret ne sont pas renseignés. Allez dans les <a href="%{base_path}/admin/site_settings">Paramètres</a> et mettez les à jour. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Voir le guide pour en savoir plus</a>.'
@@ -1291,8 +1297,9 @@ fr:
     email_polling_errored_recently:
       one: "La vérification des courriels a généré une erreur au cours des 24 dernières heures. Vérifiez <a href='%{base_path}/logs' target='_blank'>le journal</a> pour plus de détails."
       other: "La vérification des courriels a généré %{count} erreurs au cours des 24 dernières heures. Vérifiez <a href='%{base_path}/logs' target='_blank'>le journal</a> pour plus de détails."
-    missing_mailgun_api_key: "Le serveur est configuré pour envoyer des courriels via Mailgun mais vous n'avez pas fourni la clef API nécessaire pour vérifier les messages webhook."
+    missing_mailgun_api_key: "Le serveur est configuré pour envoyer des courriels via Mailgun mais vous n'avez pas fourni la clé API nécessaire pour vérifier les messages Webhook."
     bad_favicon_url: "Impossible de charger la favicon. Vérifiez le paramètre favicon dans les <a href='%{base_path}/admin/site_settings'>paramètres du site</a>"
+    deprecated_api_usage: "Nous avons détecté une requête d'API utilisant une méthode d'authentification obsolète. Veuillez la mettre à jour vers <a href='https://meta.discourse.org/t/-/22706'>l'authentification via l'entête</a>. Après la mise à jour, ce message peut mettre jusqu'à 24 heures pour disparaître. "
     update_mail_receiver: "Nous avons détecté une version obsolète de mail-receiver. Cliquez <a href='https://meta.discourse.org/t/-/133491'>ici</a> pour des consignes de mise à jour. Après la mise à jour, ce message peut mettre jusqu'à 24 heures pour disparaître."
     poll_pop3_timeout: "La connexion vers le serveur POP3 a expiré. Les courriels entrants n'ont pas pu être téléchargés. Veuillez vérifier <a href='%{base_path}/admin/site_settings/category/email'>les paramètres POP3</a> et votre fournisseur de service courriel."
     poll_pop3_auth_error: "La connexion vers le serveur POP3 échoue avec une erreur d'authentification. Veuillez vérifier <a href='%{base_path}/admin/site_settings/category/email'>les paramètres POP3</a>."
@@ -1303,7 +1310,7 @@ fr:
   site_settings:
     display_local_time_in_user_card: "Afficher le temps local selon le fuseau horaire de l'utilisateur quand sa carte est ouverte."
     censored_words: "Mots qui seront automatiquement remplacés par &#9632;&#9632;&#9632;&#9632;"
-    delete_old_hidden_posts: "Supprimer automatiquement les messages cachés plus de 30 jours."
+    delete_old_hidden_posts: "Supprimer automatiquement les messages masqués plus de 30 jours."
     default_locale: "La langue par défaut de cette instance Discourse. Vous pouvez remplacer le texte des catégories et des sujets générés par le système dans <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Personnaliser / Texte</a> ."
     allow_user_locale: "Autoriser les utilisateurs à choisir la langue de l'interface dans leurs préférences"
     set_locale_from_accept_language_header: "Configurer la langue de l'interface des visiteurs à partir des entêtes de langue de leur navigateur. (EXPÉRIMENTAL, ne fonctionne pas avec le cache anonyme)"
@@ -1318,8 +1325,8 @@ fr:
     max_topic_title_length: "Longueur maximale autorisée des titres de sujet en nombre de caractères"
     min_personal_message_title_length: "Longueur minimale pour un titre de message en nombre de caractères"
     max_emojis_in_title: "Nombre maximum d'emojis permis dans le titre d'un sujet"
-    min_search_term_length: "Longueur minimale autorisée du texte saisie avant de lancer une recherche en nombre de caractères"
-    search_tokenize_chinese_japanese_korean: "Forcer la tokenisation dans la recherche chinois/japonais/koréen, même sur des sites non-CJK."
+    min_search_term_length: "Longueur minimale en caractères du terme à rechercher"
+    search_tokenize_chinese_japanese_korean: "Forcer la recherche à segmenter les textes chinois, japonais et coréens même sur des sites n'utilisant pas ces langues par défaut."
     search_prefer_recent_posts: "Si la recherche dans votre forum est lente, cette option tente l'indéxation des messages les plus récents en premier"
     search_recent_posts_size: "Combien de messages récents à garder dans l'index"
     log_search_queries: "Archiver les requêtes de recherche des utilisateurs"
@@ -1344,8 +1351,8 @@ fr:
     download_remote_images_threshold: "Quantité minimum d'espace disque requise pour télécharger localement des images distantes (en pourcentage)"
     disabled_image_download_domains: "Les images distantes de ces domaines ne seront jamais téléchargées. Liste délimitée par des pipes (|)."
     editing_grace_period: "Pendant (n) secondes après la publication d'un message, la modification de ce dernier ne provoquera pas d'historisation."
-    editing_grace_period_max_diff: "Nombre maximum de changements de caractères autorisés dans le délai de grâce d'édition, si plus de changements, enregistrez une autre révision de poste (niveaux de confiance 0 et 1)."
-    editing_grace_period_max_diff_high_trust: "Nombre maximum de changements de caractères autorisés dans le délai de grâce d'édition, si plus de changements, enregistrez une autre révision de poste (niveaux de confiance 2 et plus)."
+    editing_grace_period_max_diff: "Nombre maximum de caractères modifiés qui est autorisé dans le délai de grâce de modification, si plus de caractères sont modifiés alors une nouvelle révision du message sera enregistrée (niveau de confiance 0 et 1)"
+    editing_grace_period_max_diff_high_trust: "Nombre maximum de caractères modifiés qui est autorisé dans le délai de grâce de modification, si plus de caractères sont modifiés alors une nouvelle révision du message sera enregistrée (niveau de confiance 2 et plus)"
     staff_edit_locks_post: "Les messages seront verrouillés à la modification si modifiés par des responsables"
     post_edit_time_limit: "Un auteur du niveau de confiance 0 ou 1 peut modifier ses messages pendant (n) minutes après leur publication. Mettre à 0 pour retirer cette limite."
     tl2_post_edit_time_limit: "Un auteur de niveau de confiance 2 ou supérieur peut modifier ses messages pendant (n) minutes après leur publication. Mettre à 0 pour retirer cette limite."
@@ -1366,6 +1373,7 @@ fr:
     onebox_domains_blacklist: "Une liste de domaines que ne seront jamais transformés en Onebox."
     inline_onebox_domains_whitelist: "Une liste de domaines qui seront transformés en Onebox s'ils ont été insérés sans titre"
     enable_inline_onebox_on_all_domains: "Ignorer le paramètre inline_onebox_domain_whitelist et permettre des onebox 'inline' pour tous les domaines."
+    force_custom_user_agent_hosts: "Domaines pour lesquels utiliser un agent utilisateur personnalisé pour les requêtes de onebox. (Cela est utile pour les domaines limitant les accès par agent utilisateur.)"
     max_oneboxes_per_post: "Nombre maximum de Onebox dans un message."
     logo: "L'image de votre logo située en haut à gauche de votre site. Utilisez une forme rectangulaire large avec une hauteur de 120 et une largeur de plus que 360. Si vous laissez ce champ vide, le nom de votre site apparaîtra."
     logo_small: "La petite image logo affichée en haut à gauche du site quand la page est défilée vers le bas. Utilisez une image carrée de 120 x 120. Si vous laissez ce champ vide, une icône de maison sera affichée."
@@ -1380,12 +1388,15 @@ fr:
     notification_email: "L'adresse courriel utilisée pour envoyer les courriels systèmes essentiels et affichée dans le champs « De ». Le nom de domaine spécifié doit avoir les informations SPF, DKIM et PTR inversé renseignées correctement pour que le courriel arrive à destination."
     email_custom_headers: "Une liste délimité par des pipes (|) d'entêtes de courriel"
     email_subject: "Format du sujet personnalisable pour les courriels standards. Voir <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: "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 vont savoir si une URL pointe vers un sujet valide ou non."
     enforce_second_factor: "Forcer les utilisateurs à activer l'authentification à double facteur. Sélectionner « tous » pour l'appliquer à tous les utilisateurs. Sélectionner « responsables » pour l'imposer 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 via réseaux sociaux ainsi que tous les logos / dépendances tiers sont tous compatibles HTTPS eux aussi ?"
     same_site_cookies: "Utiliser des cookies de même site, qui éliminent tous les vecteurs de Cross Site Request Forgery sur les navigateurs supportés (Lax ou Strict). Avertissement : Strict ne fonctionnera que sur des sites qui imposent la connexion et utilisent le SSO."
     summary_score_threshold: "Le score minimum pour qu'un message soit inclus dans le résultat de « Résumer ce sujet »"
+    summary_posts_required: "Nombre minimum 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 minimum de J'aime dans un sujet avant que la fonctionnalité « Résumer ce sujet » soit activée. Les modifications de ce paramètre sont appliquées rétroactivement sur une semaine."
     summary_percent_filter: "Quand un utilisateur clique sur « Résumer ce sujet », montrer le top % des messages"
-    summary_max_results: "Nombre maximum de messages retournés par « Résumer ce sujet »"
+    summary_max_results: "Nombre maximum de messages inclus dans le résultat de « Résumer ce sujet »"
     enable_personal_messages: "Autoriser les utilisateurs de niveau de confiance 1 à créer des messages directs et à y répondre (configurable via le niveau de confiance minimum pour envoyer des messages directs). Notez que les responsables peuvent toujours envoyer des messages directs."
     enable_system_message_replies: "Permettre aux utilisateurs de répondre aux messages système, même si les messages directs sont désactivés."
     enable_long_polling: "Utiliser les requêtes longues pour le flux de notifications."
@@ -1403,7 +1414,7 @@ fr:
     tl2_additional_likes_per_day_multiplier: "Augmenter la limite de J'aime par jour pour les utilisateurs de niveau 2 (membres) en la multipliant par ce nombre"
     tl3_additional_likes_per_day_multiplier: "Augmenter la limite de J'aime par jour pour les utilisateurs de niveau 3 (réguliers) en la multipliant par ce nombre"
     tl4_additional_likes_per_day_multiplier: "Augmenter la limite de J'aime par jour pour les utilisateurs de niveau 4 (meneurs) en la multipliant par ce nombre"
-    num_users_to_silence_new_user: "Si les messages d'un nouvel utilisateur obtiennent num_spam_flags_to_silence_new_user signalements d'autant d'utilisateurs différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
+    num_users_to_silence_new_user: "Si les messages d'un nouvel utilisateur obtiennent num_spam_flags_to_silence_new_user signalements de la part de ce nombre d'utilisateurs différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
     num_tl3_flags_to_silence_new_user: "Si les messages d'un nouvel utilisateur obtiennent ce nombre de signalements de la part de num_tl3_users_to_silence_new_user utilisateurs de niveau de confiance 3 différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
     num_tl3_users_to_silence_new_user: "Si les messages d'un nouvel utilisateur num_tl3_flags_to_silence_new_user signalements de la part de plusieurs utilisateurs de niveau de confiance 3 différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
     notify_mods_when_user_silenced: "Si un utilisateur est automatiquement mis sous silence, envoyer un message à tous les modérateurs."
@@ -1417,7 +1428,7 @@ fr:
     must_approve_users: "L'équipe du forum doit approuver tous les nouveaux utilisateurs avant qu'il aient accès au site."
     invite_code: "Les utilisateurs doivent entrer ce code pour pouvoir créer un compte (cela est ignoré si le champ est laissé vide, insensible à la casse)"
     approve_suspect_users: "Ajouter les utilisateurs suspects à la file de vérification. Les utilisateurs suspects ont renseigné une biographie ou un site web sur leur profil mais n'ont pas parcouru le forum."
-    pending_users_reminder_delay: "Avertir les modérateurs si des nouveaux utilisateurs sont en attente d'approbation depuis x heures. Mettre -1 pour désactiver les notifications."
+    pending_users_reminder_delay: "Avertir les modérateurs si des nouveaux utilisateurs sont en attente d'approbation depuis ce nombre d'heures. Mettre -1 pour désactiver les notifications."
     maximum_session_age: "L'utilisateur restera connecté pour n heures après la dernière visite"
     ga_universal_tracking_code: "Code de suivi Google Universal Analytics (analytics.js), par exemple : UA-12345678-9; voir <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
     ga_universal_domain_name: "Nom de domaine Google Universal Analytics (analytics.js), par exemple : monsite.com ; voir <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -1437,10 +1448,11 @@ fr:
     content_security_policy: "Activer Content-Security-Policy"
     content_security_policy_report_only: "Activer Content-Security-Policy-Report-Only"
     content_security_policy_collect_reports: "Activer la collecte des rapports de violation CSP sur la page /csp_reports"
+    content_security_policy_script_src: "Sources supplémentaires de scripts acceptées. L'hôte actuel et le CDN sont inclus par défaut. Voir <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Empêcher les attaques XSS avec Content Security Policy</a>."
     invalidate_inactive_admin_email_after_days: "Les comptes administrateurs qui n'ont pas visité le site depuis ce nombre de jours devront revalider leur adresse courriel avant de se connecter. Mettre à 0 pour désactiver."
     top_menu: "Choisissez les éléments qui apparaissent dans la navigation de la page d'accueil, ainsi que leur ordre. Exemple latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "Choisissez les éléments qui apparaissent dans le menu du message, ainsi que leur ordre. Exemple like|edit|flag|delete|share|bookmark|reply"
-    post_menu_hidden_items: "Les éléments du menu qui seront cachés par défaut jusqu’à extension du menu."
+    post_menu_hidden_items: "Les éléments du menu qui seront masqués par défaut jusqu'à extension du menu."
     share_links: "Choisissez les éléments qui apparaissent dans la fenêtre de partage, ainsi que leur ordre."
     site_contact_username: "Un nom d'utilisateur de responsable valide pour envoyer tous les messages automatiques. Si vous laissez ce champ vide, le compte système par défaut sera utilisé."
     site_contact_group_name: "Un nom de groupe valide à inviter à tous les messages directs automatiques."
@@ -1458,6 +1470,7 @@ fr:
     moderators_view_emails: "Permettre aux modérateurs de voir les adresses courriel des utilisateurs"
     prioritize_username_in_ux: "Afficher le nom d'utilisateur en premier sur la page d'un utilisateur, sa carte et ses messages (si désactivé, le nom complet est affiché en premier)"
     enable_rich_text_paste: "Permettre la conversion automatique du HTML en Markdown lorsque du texte est collé dans l'éditeur. (Expérimental)"
+    send_old_credential_reminder_days: "Rappeler l'utilisation de vieux identifiants après ce nombre de jours"
     email_token_valid_hours: "Les jetons (tokens) de Mot de passe oublié / Activation de comptes sont valides (n) jours."
     enable_badges: "Activer le système de badges"
     enable_whispers: "Autoriser les communications privées entre responsables au sein d'un sujet."
@@ -1467,7 +1480,7 @@ fr:
     auto_approve_email_domains: "Les utilisateurs dont le domaine de l'adresse courriel appartient à cette liste seront automatiquement approuvés."
     hide_email_address_taken: "Ne pas informer les utilisateurs qu'un compte existe avec un courriel donné lors de l'inscription ou à partir du formulaire d'oubli du mot de passe."
     log_out_strict: "Lors de la déconnexion, déconnecter TOUTES les sessions de l'utilisateur sur tous les appareils"
-    version_checks: "Vérifier périodiquement les serveurs Discourse pour obtenir des informations  de mises à jour et les afficher sur le tableau de bord <a href='%{base_path}/admin' target='_blank'>/admin</a>"
+    version_checks: "Vérifier périodiquement les serveurs Discourse pour obtenir des informations de mises à jour et les afficher sur le tableau de bord <a href='%{base_path}/admin' target='_blank'>/admin</a>"
     new_version_emails: "Envoyer un courriel à contact_email quand une nouvelle version de Discourse est disponible."
     invite_expiry_days: "Combien de temps (en jours) les clés d'invitation sont-elles valides"
     invite_only: "Tous les nouveaux utilisateurs doivent être explicitement invités par des utilisateurs de confiance ou des responsables. L'inscription publique est désactivée."
@@ -1520,14 +1533,14 @@ fr:
     enable_github_logins: "Activer l'authentification GitHub, nécessite github_client_id et github_client_secret. Voir <a href='https://meta.discourse.org/t/13745' target='_blank'>Configurer GitHub Login pour Discourse</a>."
     github_client_id: "ID du client pour l'authentification GitHub, enregistré sur <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     github_client_secret: "Clé secrète du client pour l'authentification GitHub, enregistrée sur <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
-    enable_discord_logins: "Permettre aux utilisateurs de s'authentifier via Discord ?"
+    enable_discord_logins: "Permettre aux utilisateurs de s'authentifier via Discord ?"
     discord_client_id: 'Identifiant de l''utilisateur Discord (en cas de besoin, le créer via <a href="https://discordapp.com/developers/applications/me">le portail de développement Discord</a>)'
     discord_secret: "Clé secrète Discord"
-    discord_trusted_guilds: ' Seuls les membres de ces guildes Discord peuvent se connecter via Discord. Utiliser les identifiants numériques des guildes. Pour plus d''informations, suivre les instructions<a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">ici</a>. Laisser blanc pour autoriser toutes les guildes.'
+    discord_trusted_guilds: 'Seuls les membres de ces guildes Discord peuvent se connecter via Discord. Utilisez les identifiants numériques des guildes. Pour plus d''informations, suivez les instructions<a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">ici</a>. Laissez blanc pour autoriser toutes les guildes.'
     enable_backups: "Autoriser les administrateurs à créer des sauvegardes du forum"
     allow_restore: "Autoriser la restauration, qui peut remplacer TOUTES les données du site ! Laissez à faux sauf si vous envisagez de restaurer une sauvegarde"
     maximum_backups: "Nombre maximum de sauvegardes à conserver sur le disque. Les anciennes sauvegardes seront automatiquement supprimées"
-    automatic_backups_enabled: "Activer les sauvegardes automatiques tels que définis dans les fréquences de sauvegarde"
+    automatic_backups_enabled: "Activer les sauvegardes automatiques suivant la fréquence configurée"
     backup_frequency: "Nombre de jours entre chaque sauvegarde"
     s3_backup_bucket: "Bucket distant qui contiendra les sauvegardes. ATTENTION : vérifiez que le bucket est privé."
     s3_endpoint: "La destination peut être modifiée pour envoyer les sauvegardes vers un service compatible avec S3, par exemple DigitalOcean Spaces ou Minio. ATTENTION : laisser vide si vous utilisez AWS S3."
@@ -1563,6 +1576,7 @@ fr:
     max_logins_per_ip_per_minute: "Nombre maximum de connexions autorisées par adresse IP, par minute"
     max_post_deletions_per_minute: "Nombre maximum de sujet qu'un utilisateur peut supprimer par minute."
     max_post_deletions_per_day: "Nombre maximum de sujet qu'un utilisateur peut supprimer par jour."
+    invite_link_max_redemptions_limit: "Le nombre maximum d'utilisations des liens d'invitation doit être inférieur à cette valeur."
     alert_admins_if_errors_per_minute: "Nombre d'erreurs par minute nécessaires pour déclencher une alerte administrateur. Une valeur de 0 désactive cette fonctionnalité. N. B. : nécessite un redémarrage."
     alert_admins_if_errors_per_hour: "Nombre d'erreurs par heure nécessaires pour déclencher une alerte administrateur. Une valeur de 0 désactive cette fonctionnalité. N. B. : nécessite un redémarrage."
     categories_topics: "Nombre de sujets à afficher dans la page /categories. Si configuré à 0, une valeur automatique sera appliquée pour que les colonnes des catégories et des sujets soient symétriques."
@@ -1592,7 +1606,7 @@ 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."
     min_ratio_to_crop: "Ratio utilisé pour recadrer les images en hauteur. Entrez le résultat de la largeur / hauteur."
-    simultaneous_uploads: "Nombre maximum de fichiers qui peuvent être glissés & déposés dans l'éditeur"
+    simultaneous_uploads: "Nombre maximum de fichiers qui peuvent être glissés et déposés dans l'éditeur"
     enable_flash_video_onebox: "Activer l'utilisation de swf et flv (Adobe Flash) dans les boites imbriquées. ATTENTION : cela pourrait introduire un risque de sécurité."
     default_invitee_trust_level: "Niveau de confiance par défaut (0-4) pour les invités."
     default_trust_level: "Niveau de confiance par défaut (entre 0 et 4) pour tous les nouveaux utilisateurs. ATTENTION ! Changer ce paramètre peut vous exposer à des spams."
@@ -1620,7 +1634,7 @@ fr:
     tl3_requires_likes_given: "Le nombre minimum de J'aime à donner dans les (tl3 time period) derniers jours pour être éligible au niveau de confiance 3."
     tl3_requires_likes_received: "Le nombre minimum de J'aime à recevoir dans les (tl3 time period) derniers jours pour être éligible au niveau de confiance 3."
     tl3_links_no_follow: "Ne pas retirer rel=nofollow sur les liens des messages par les utilisateurs de niveau de confiance 3."
-    trusted_users_can_edit_others: "Permettre aux utilisateurs ayant un niveau de confiance élevé d'éditer le contenu d'autres utilisateurs"
+    trusted_users_can_edit_others: "Permettre aux utilisateurs ayant un niveau de confiance élevé de modifier le contenu d'autres utilisateurs"
     min_trust_to_create_topic: "Le niveau de confiance minimum pour créer un nouveau sujet."
     allow_flagging_staff: "Si cette option est activée, les utilisateurs peuvent signaler les messages des responsables."
     min_trust_to_edit_wiki_post: "Le niveau de confiance minimum requis pour modifier les messages de type wiki."
@@ -1639,15 +1653,15 @@ fr:
     max_mentions_per_post: "Nombre maximal de noms d'utilisateurs que les utilisateurs peuvent mentionner dans un message."
     max_users_notified_per_group_mention: "Nombre maximum d'utilisateurs qui peuvent recevoir une notification si un groupe est mentionné (si le seuil est atteint, aucune notification ne sera envoyée)"
     enable_mentions: "Permettre aux utilisateurs de mentionner d'autres utilisateurs."
-    create_thumbnails: "Créer un aperçu pour les images imbriquées qui sont trop large pour le message."
+    create_thumbnails: "Créer un aperçu et une visionneuse pour les images qui sont trop larges pour le message."
     email_time_window_mins: "Attendre (n) minutes avant l'envoi des courriels de notification, afin de laisser une chance aux utilisateurs de modifier ou finaliser leurs messages."
-    personal_email_time_window_seconds: "Attendre (n) secondes avant d'envoyer des courriels de notification directs, afin de donner aux utilisateurs la possibilité d'éditer et de finaliser leurs messages."
+    personal_email_time_window_seconds: "Attendre (n) secondes avant d'envoyer des courriels de notification directs, afin de donner aux utilisateurs la possibilité de modifier et finaliser leurs messages."
     email_posts_context: "Combien de réponses précédentes doit-on inclure dans les courriels de notifications pour situer le contexte."
     flush_timings_secs: "À quelle fréquence les données de timing doivent être vider, en secondes."
     title_max_word_length: "Le nombre maximum de caractères dans le titre d'un sujet."
-    title_min_entropy: "L'entropie minimale (caractères unique, les caractères en langues étrangères compte pour plus) requise pour le titre d'un sujet."
-    body_min_entropy: "L'entropie minimale (caractères unique, les caractères en langues étrangères compte pour plus) requise pour le corps d'un message."
-    allow_uppercase_posts: "Autoriser des messages ou titres de sujets entièrement en majuscules."
+    title_min_entropy: "L'entropie minimale (caractères uniques, les caractères en langues étrangères compte pour plus) requise pour le titre d'un sujet."
+    body_min_entropy: "L'entropie minimale (caractères uniques, les caractères en langues étrangères compte pour plus) requise pour le corps d'un message."
+    allow_uppercase_posts: "Autoriser des messages ou des titres de sujets entièrement en majuscules."
     max_consecutive_replies: "Nombre de messages successifs qu'un utilisateur peut poster dans un sujet avant de ne plus pouvoir ajouter de nouvelle réponse."
     title_fancy_entities: "Convertir les caractères ASCII communs en jolies entités HTML dans les titres des sujets, comme SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "La taille minimale d'un titre avant que l'on vérifie l'existence de sujets identiques."
@@ -1680,27 +1694,27 @@ fr:
     tos_url: "Si vous disposez déjà de conditions générales d'utilisation hébergées ailleurs que vous souhaitez utiliser, vous pouvez renseigner leur URL complète ici."
     privacy_policy_url: "Si vous disposez déjà d'une politique de confidentialité hébergée ailleurs que vous voulez utiliser, vous pouvez renseigner son URL complète ici."
     log_anonymizer_details: "Conserver les détails d'un utilisateur rendu anonyme dans les journaux. Si vous vous conformerez au RGPD, vous devez désactiver cette fonction."
-    newuser_spam_host_threshold: "Combien de fois un nouvel utilisateur peut publier un lien vers le même hôte dans la limite de leur `newuser_spam_host_threshold` messages avant d'être considérés comme du spam."
+    newuser_spam_host_threshold: "Combien de fois un nouvel utilisateur peut publier un lien vers le même domaine dans la limite de leur `newuser_spam_host_threshold` messages avant d'être considéré comme du spam."
     white_listed_spam_host_domains: "Une liste des domaines exclus des hôtes testés comme spam. Les nouveaux utilisateurs ne seront jamais empêchés de créer des messages contenant des liens vers ces domaines. "
     staff_like_weight: "Quel poids supplémentaire donner aux J'aime de l'équipe."
     topic_view_duration_hours: "Compter la vue d'un sujet une seule fois par IP ou par utilisateur toutes les N heures"
     user_profile_view_duration_hours: "Compter la vue d'un profil d'utilisateur une seule fois par IP ou par utilisateur qui visite toutes les N heures"
-    levenshtein_distance_spammer_emails: "Lorsque des courriels correspondent à des spammer, la différence du nombre de caractère permettra toujours une correspondance floue."
-    max_new_accounts_per_registration_ip: "S'il y a déjà (n) Niveau de confiance 0 comptes à partir de cette adresse IP ( et aucun n'est un membre du personnel ou au NC2 ou ultérieure), ne plus accepter de nouvelles inscriptions de cette IP."
+    levenshtein_distance_spammer_emails: "Une adresse courriel sera attribuée à un spammeur connu même si elle diffère par ce nombre de caractères."
+    max_new_accounts_per_registration_ip: "S'il y a déjà (n) comptes avec un niveau de confiance 0 en provenance de cette adresse IP (et aucun n'est un responsable ou avec un niveau de confiance 2 et plus), ne plus accepter de nouvelles inscriptions depuis cette adresse IP."
     min_ban_entries_for_roll_up: "En cliquant sur le bouton Consolider, une liste d'au moins (N) adresses interdites sera remplacée par une plage de sous réseau."
     max_age_unmatched_emails: "Effacer les adresses courriel sous surveillance sans correspondance après (N) jours"
     max_age_unmatched_ips: "Effacer les adresses IP sous surveillance sans correspondance après (N) jours"
     num_flaggers_to_close_topic: "Nombre minimum de signalements uniques requis pour automatiquement suspendre un sujet pour intervention"
     num_hours_to_close_topic: "Nombre d'heures de fermeture d'un sujet pour intervention."
     auto_respond_to_flag_actions: "Activer la réponse automatique lors du traitement d'un signalement."
-    min_first_post_typing_time: "Minimum de temps en millisecondes qu'un utilisateur doit passer à la saisie de son premier commentaire, si le seuil n'est pas atteint, il rejoindra automatiquement la file des commentaires en cours d'approbation. Mettre à 0 pour désactiver (non recommandé)"
+    min_first_post_typing_time: "Durée minimum en millisecondes qu'un utilisateur doit passer à saisir son premier message, si le seuil n'est pas atteint, le message rejoindra automatiquement la file d'attente pour approbation. Mettre à 0 pour désactiver (non recommandé)"
     auto_silence_fast_typers_on_first_post: "Mettre sous silence automatiquement les utilisateurs qui n'ont pas respecté min_first_post_typing_time"
     auto_silence_fast_typers_max_trust_level: "Niveau de confiance maximum pour automatiquement mettre sous silence les utilisateurs rédigeant des messages trop rapidement."
     auto_silence_first_post_regex: "Regex non sensible à la casse qui, si elle est déclenchée, mettre sous silence le premier message de l'utilisateur et l'enverra dans la file d'attente d'approbation.\nExemple : rageux|a[bc]a mettre sous slience les premiers messages contenant rageux ou aba ou aca."
     reviewable_claiming: "Est-ce que les contenu à vérifier doit être réservé avant qu'on puisse agir dessus ?"
     reviewable_default_topics: "Par défaut, afficher le contenu à vérifier par sujet"
     reviewable_default_visibility: "Ne pas afficher les éléments à vérifier à moins qu'ils ont cette priorité"
-    high_trust_flaggers_auto_hide_posts: "Les messages des nouveaux utilisateurs seront automatiquement cachés après avoir été signalés comme spam par un utilisateur d'un niveau de confiance 3 et plus"
+    high_trust_flaggers_auto_hide_posts: "Les messages des nouveaux utilisateurs seront automatiquement masqués après avoir été signalés comme spam par un utilisateur d'un niveau de confiance 3 et plus"
     cooldown_hours_until_reflag: "Combien de temps les utilisateurs doivent attendre avant de pouvoir signaler à nouveau un message"
     reply_by_email_enabled: "Activer les réponses aux sujets via courriel."
     reply_by_email_address: "Modèle pour la réponse par courriel entrant, exemple : %%{reply_key}@reply.example.com ou replies+%%{reply_key}@example.com"
@@ -1716,7 +1730,7 @@ fr:
     delete_email_logs_after_days: "Effacer les journaux de messagerie après (N) jours. 0 pour conserver indéfiniment."
     disallow_reply_by_email_after_days: "Interdire la réponse par courriel après (N) jours. 0 pour permettre indéfiniment."
     max_emails_per_day_per_user: "Nombre maximum de courriels à envoyer aux utilisateurs par jour. 0 pour désactiver la limite"
-    enable_staged_users: "Créer automatiquement les utilisateurs distants lors du traitement des courriels entrants."
+    enable_staged_users: "Créer automatiquement des utilisateurs distants lors du traitement des courriels entrants."
     maximum_staged_users_per_email: "Nombre maximum d'utilisateurs distants créés lors du traitement d'un courriel entrant."
     auto_generated_whitelist: "Liste des adresses courriel qui ne seront pas vérifiées pour du contenu généré automatiquement. Exemple : foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Bloquer les courriels entrants identifiés comme générés automatiquement."
@@ -1749,14 +1763,16 @@ fr:
     log_mail_processing_failures: "Enregistrer tous les problèmes de courriel dans <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     email_in: 'Autoriser les utilisateurs à créer de nouveaux sujets par courriel (nécessite une requête manuelle ou via POP3). Configurez les adresses dans l''onglet « Paramètres » de chaque catégorie.'
     email_in_min_trust: "Le niveau de confiance minimum qu'un utilisateur doit avoir pour être autorisé à créer de nouveaux sujets par courriel."
+    email_in_authserv_id: "L'identifiant du service vérifiant l'authentification des courriels entrants. Voir <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> pour plus d'informations."
     email_in_spam_header: "Entête courriel pour détecter du spam."
     email_prefix: "Le [label] qui sera utilisé dans le sujet des courriels. Par défaut il prend la valeur de 'title'."
-    email_site_title: "Le titre du site utilisé comme expéditeur pour les courriels du site. Par défaut il prend la valeur de 'title'. Si votre 'title\" utilise des caractères interdits dans les courriels, utiliser ce paramètre."
+    email_site_title: "Le titre du site utilisé comme expéditeur pour les courriels du site. Par défaut il prend la valeur de 'title'. Si votre 'title' utilise des caractères interdits dans les courriels, utilisez ce paramètre."
     find_related_post_with_key: "N'utilisez que la « reply key » pour trouver le message auquel on a répondu. ATTENTION : la désactivation de cette option permet l'usurpation d'identité de l'utilisateur sur la base de l'adresse courriel."
     minimum_topics_similar: "Combien de sujets ont besoin d'exister dans la base de données avant que des sujets similaires soit présentés lors de la rédaction de nouveaux sujets."
     relative_date_duration: "Nombre de jours après la création d'un message à partir desquels les dates seront affichées en absolu (20 Fév) plutôt qu'en relatif (7j)"
     delete_user_max_post_age: "Interdire la suppression des utilisateurs dont le premier message est daté de plus de (n) jours."
     delete_all_posts_max: "Le nombre maximum de messages qui peuvent être supprimés en une seule fois avec le bouton Supprimer tous les messages. Si un utilisateur a plus que ce nombre de messages, ses messages ne pourront pas être supprimés en une seule fois et l'utilisateur ne pourra pas être supprimé."
+    delete_user_self_max_post_count: "Le nombre maximum de messages qu'un utilisateur peut avoir pour l'autoriser à supprimer son propre compte. La valeur -1 empêche les utilisateurs de supprimer leur propre compte."
     username_change_period: "Le nombre de jours maximum après l'inscription pendant lesquels l'utilisateur peut encore modifier son nom d'utilisateur (0 pour empêcher la modification du nom d'utilisateur)."
     email_editable: "Autoriser les utilisateurs à modifier leur adresse courriel après l'inscription."
     logout_redirect: "URL vers laquelle rediriger le navigateur après déconnexion (par exemple : https://example.com/deconnexion)"
@@ -1787,7 +1803,7 @@ fr:
     allow_anonymous_posting: "Permettre aux utilisateurs de passer en mode anonyme"
     anonymous_posting_min_trust_level: "Le niveau de confiance minimum pour passer en mode anonyme."
     anonymous_account_duration_minutes: "Pour protéger l'anonymat, créer un nouveau compte anonyme tous les N minutes pour chaque utilisateur. Exemple : si 600 est choisi, quand 600 minutes sont passées après le dernier message ET l'utilisateur passe en mode anonyme, un nouveau compte anonyme lui sera créé."
-    hide_user_profiles_from_public: "Cacher les cartes, les profils et le répertoire d'utilisateurs aux visiteurs."
+    hide_user_profiles_from_public: "Désactiver les cartes, les profils et le répertoire d'utilisateurs pour les visiteurs."
     allow_featured_topic_on_user_profiles: "Permettre aux utilisateurs de mettre un lien vers un sujet à la une sur leur carte et leur profil."
     show_inactive_accounts: "Autoriser les utilisateurs connectés à parcourir les profils de comptes inactifs."
     hide_suspension_reasons: "Ne pas afficher les raisons d'une suspension sur les profils utilisateurs."
@@ -1808,8 +1824,10 @@ fr:
     suppress_uncategorized_badge: "Ne pas afficher le badge pour les sujets sans catégorie dans les listes de sujets."
     header_dropdown_category_count: "Nombre de catégories qui peuvent être affichées dans le menu déroulant de l'entête."
     permalink_normalizations: "Appliquer l'expression régulière suivante avant de détecter les permaliens, par exemple /(\\/topic.*)\\?.*/\\1 supprimera les chaînes de requête des chemins de sujet. Le format est regex+string, utilisez \\1 etc. pour capturer des séquences"
-    global_notice: "Afficher une bannière de notification globale et qui ne peut être ignorée à tous les visiteurs pour un message URGENT (HTML autorisé). Laissez le champ vide pour cacher la bannière."
+    global_notice: "Afficher une bannière de notification globale et qui ne peut être ignorée à tous les visiteurs pour un message URGENT (HTML autorisé). Laissez le champ vide pour masquer la bannière."
     disable_system_edit_notifications: "Désactiver les notifications de modifications par l'utilisateur système lorsque l'option 'download_remote_images_to_local' est activée."
+    notification_consolidation_threshold: "Nombre de notifications de J'aime ou de demandes d'adhésion à partir duquel les notifications sont regroupées en une seule. Mettre 0 pour désactiver."
+    likes_notification_consolidation_window_mins: "Durée en minutes après que le seuil soit atteint pour regrouper les notifications de J'aime en une seule notification. Le seuil peut être configuré via `SiteSetting.notification_consolidation_threshold`."
     automatically_unpin_topics: "Désépingler automatiquement le sujet lorsque l'utilisateur atteint la fin."
     read_time_word_count: "Nombre de mots par minute servant de base de calcul à l'estimation du temps de lecture."
     topic_page_title_includes_category: "La <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>balise title</a> de la page du sujet comprend le nom de la catégorie."
@@ -1820,9 +1838,9 @@ fr:
     svg_icon_subset: "Ajouter des icônes supplémentaires FontAwesome 5 que vous souhaitez inclure dans vos médias. Utilisez le préfixe « fa- » pour les icônes solides, « far- » pour les icônes normales et « fab- » pour les icônes de marques."
     max_prints_per_hour_per_user: "Nombre maximum d'accès à la page /print (mettre à 0 pour désactiver)"
     full_name_required: "Le nom complet est requis dans le profil utilisateur."
-    enable_names: "Autoriser l'affichage des noms complets des utilisateurs dans leur profil, sur leur carte d'utilisateur et dans les courriels. Décocher pour cacher les noms complets partout."
+    enable_names: "Autoriser l'affichage des noms complets des utilisateurs dans leur profil, sur leur carte d'utilisateur et dans les courriels. Décocher pour masquer les noms complets partout."
     display_name_on_posts: "Afficher le nom complet de l'utilisateur dans ses messages en plus de son nom d'utilisateur."
-    show_time_gap_days: "Si deux messages sont publiés à ce nombre de jours d'écart, affichez cette durée dans le sujet."
+    show_time_gap_days: "Si deux messages sont publiés avec ce nombre de jours d'écart, afficher cette durée dans le sujet."
     short_progress_text_threshold: "Si le nombre de messages dans un sujet dépasse cette valeur, la barre de progression affichera uniquement le numéro de message actuel. Si vous modifiez la largeur de la barre de progression, vous devrez peut-être modifier cette valeur."
     default_code_lang: "Coloration syntaxique par défaut appliquée à la syntaxe des langages de programmation des blocs de code GitHub (lang-auto, Ruby, Python, etc)"
     warn_reviving_old_topic_age: "Lorsque quelqu'un commence à répondre à un sujet dont la dernière réponse est vielle de plusieurs jours, un avertissement sera affiché. Désactivez la fonctionnalité en indiquant 0."
@@ -1831,18 +1849,20 @@ fr:
     show_copy_button_on_codeblocks: "Ajouter un bouton aux blocs de codes pour copier leur contenu dans le presse-papier de l'utilisateur. Cette fonctionnalité n'est pas disponible avec Internet Explorer."
     embed_any_origin: "Autoriser le contenu intégré quelque soit son origine. Cela est nécessaire pour les applications mobiles utilisant du HTML statique."
     embed_topics_list: "Permettre l'intégration HTML des listes de sujets"
+    embed_set_canonical_url: "Configurer l'URL canonique des sujets intégrés à l'URL du contenu intégré."
     embed_truncate: "Tronquer les messages embarqués."
     embed_unlisted: "Les sujets importés seront invisibles jusqu'à ce qu'un utilisateur réponde."
-    embed_support_markdown: "Permettre le formatage Markdown pour les messages intégrés."
+    embed_support_markdown: "Permettre la mise en forme Markdown pour les messages intégrés."
     embed_whitelist_selector: "Une liste séparée par des virgules des éléments CSS autorisés à être intégrés."
     allowed_href_schemes: "Préfixes autorisés dans les liens en plus de http et https."
     embed_post_limit: "Nombre maximum de messages à intégrer."
     embed_username_required: "Un nom d'utilisateur est nécessaire pour la création du sujet."
-    notify_about_flags_after: "S'il y a des signalements qui n'ont pas été gérés après ce nombre d'heures, envoyer un message direct aux modérateurs. 0 pour désactiver."
+    notify_about_flags_after: "Si des signalements n'ont pas été gérés après ce nombre d'heures, envoyer un message direct aux modérateurs. 0 pour désactiver."
     show_create_topics_notice: "Si le site contient moins de 5 sujets publics, afficher un message pour demander aux administrateurs de créer d'autres sujets."
     delete_drafts_older_than_n_days: "Supprimer les brouillons plus vieux que (n) jours."
     bootstrap_mode_min_users: "Nombre minimum d'utilisateurs nécessaire pour désactiver le mode spécial de lancement (mettre à 0 pour désactiver)"
     prevent_anons_from_downloading_files: "Empêcher le téléchargement de pièces jointes par les visiteurs. ATTENTION : cela empêchera de fonctionner les ressources envoyées en pièce jointe qui ne sont pas des images."
+    secure_media: 'Limite l''accès à TOUS les fichiers envoyés (image, vidéo, audio, texte, PDF, ZIP, etc.). Si le paramètre « login required » est activé, seuls les utilisateurs connectés peuvent accéder aux fichiers envoyés. Sinon, l''accès sera limité uniquement pour les médias des messages et catégories privés. ATTENTION : ce paramètre est complexe et nécessite des connaissances d''administration approfondies. Voir <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">ce sujet sur les médias sécurisés</a> pour plus d''informations.'
     slug_generation_method: "Choisissez une méthode de génération d'identifiant. « encoded » générera des chaînes de caractères encodées avec des pourcentages. « none » désactivera complètement les identifiants."
     enable_emoji: "Activer les emojis"
     enable_emoji_shortcuts: "Les textes de smiley courants :) :p :( seront convertis en emojis"
@@ -1856,7 +1876,7 @@ fr:
     notify_about_queued_posts_after: "Si des messages sont en attente de modération depuis ce nombre d'heures, envoyer un courriel à tous les modérateurs. Désactiver ces courriels en indiquant 0."
     auto_close_messages_post_count: "Nombre maximum de messages dans un message privé avant qu'il ne soit automatiquement fermé (0 pour désactiver)"
     auto_close_topics_post_count: "Nombre maximum de messages dans un sujet avant qu'il ne soit automatiquement fermé (0 pour désactiver)"
-    code_formatting_style: "Le bouton Code dans l'éditeur utilisera ce style de formatage par défaut"
+    code_formatting_style: "Le bouton Code de l'éditeur utilisera ce style de mise en forme par défaut"
     max_allowed_message_recipients: "Nombre maximum de destinataires autorisés dans un message."
     watched_words_regular_expressions: "Les mots surveillés sont des expressions régulières."
     old_post_notice_days: "Jours avant que la remarque de publication ne devienne obsolète"
@@ -1873,8 +1893,8 @@ fr:
     disable_mailing_list_mode: "Interdire aux utilisateurs l'activation de la liste de diffusion."
     default_email_previous_replies: "Inclure par défaut les réponses précédentes dans les courriels."
     default_email_in_reply_to: "Inclure par défaut l'extrait du message auquel se fait la réponse dans les courriels."
-    default_other_new_topic_duration_minutes: "Paramètre global de temps pendant lequel un sujet est considéré comme nouveau."
-    default_other_auto_track_topics_after_msecs: "Paramètre global fixant le temps par défaut au bout duquel un sujet est suivi automatiquement."
+    default_other_new_topic_duration_minutes: "Condition par défaut pour considérer un sujet comme nouveau."
+    default_other_auto_track_topics_after_msecs: "Durée par défaut après laquelle un sujet est automatiquement suivi."
     default_other_notification_level_when_replying: "Niveau de notification global par défaut quand un utilisateur répond à un sujet."
     default_other_external_links_in_new_tab: "Par défaut, ouvrir tous les liens externes dans un nouvel onglet"
     default_other_enable_quoting: "Par défaut, proposer la citation du texte sélectionné."
@@ -1970,6 +1990,7 @@ fr:
       category_search_priority:
         very_low_weight_invalid: "Vous ne pouvez pas fixer le poids à une valeur supérieure à 'category_search_priority_low_weight'."
         low_weight_invalid: "Vous ne pouvez pas fixer le poids à une valeur supérieure ou égale à 1 ou inférieure à 'category_search_priority_very_low_weight'."
+        high_weight_invalid: "Vous ne pouvez pas configurer le poids à une valeur inférieure ou égale à 1 ou supérieure à 'category_search_priority_very_high_weight'."
         very_high_weight_invalid: "Vous ne pouvez pas fixer le poids à une valeur inférieure à 'category_search_priority_high_weight'."
       unicode_username_whitelist:
         regex_invalid: "L'expression régulière n'est pas valide : %{error}"
@@ -1997,6 +2018,7 @@ fr:
     unknown_error: "Il y a un problème avec votre compte. Veuillez contacter l'administrateur du site."
     timeout_expired: "La connexion au compte a expiré, veuillez essayer de vous reconnecter."
     no_email: "Aucune adresse courriel n'a été fournie. Veuillez contacter l'administrateur du site."
+    blank_id_error: "Le champ `external_id` ne doit pas être vide"
     email_error: "Un compte n'a pas pu être enregistré avec l'adresse courriel <b>%{email}</b>. Veuillez contacter l'administrateur du site."
     missing_secret: "L'authentification SSO a échoué en raison d'une clé secrète manquante. Contactez les administrateurs du site pour résoudre ce problème."
   original_poster: "Créateur du sujet"
@@ -2078,7 +2100,7 @@ fr:
       other: "Ce sujet a été automatiquement ouvert %{count} minutes après la dernière réponse."
     autoclosed_disabled: "Ce sujet est maintenant ouvert. Les nouvelles réponses sont autorisées."
     autoclosed_disabled_lastpost: "Ce sujet est maintenant ouvert. Les nouvelles réponses sont autorisées."
-    auto_deleted_by_timer: "Supprimé automatiquement par planification"
+    auto_deleted_by_timer: "Supprimé automatiquement par une action planifiée."
   login:
     invalid_second_factor_method: "La méthode à deux facteurs sélectionnée n'est pas valide."
     not_enabled_second_factor_method: "La méthode à deux facteurs sélectionnée n'est pas activée pour votre compte."
@@ -2089,7 +2111,7 @@ fr:
     security_key_no_matching_credential_error: "Aucun identifiant correspondant n'a pu être trouvé dans la clé de sécurité donnée."
     security_key_support_missing_error: "Votre appareil ou navigateur actuel ne supporte pas l'utilisation de clés de sécurité. Veuillez utiliser une autre méthode."
     security_key_invalid: "Une erreur est survenue lors de la validation de la clé de sécurité."
-    not_approved: "Votre compte n'a pas encore été approuvé. Vous serez notifié par courriel quand cela sera fait."
+    not_approved: "Votre compte n'a pas encore été approuvé. Vous serez notifié par courriel quand vous pourrez vous connecter."
     incorrect_username_email_or_password: "Nom d'utilisateur, adresse courriel ou mot de passe incorrects"
     incorrect_password: "Mot de passe incorrect"
     wait_approval: "Merci pour votre inscription. Nous vous informerons lorsque votre compte aura été approuvé."
@@ -2097,7 +2119,7 @@ fr:
     activate_email: "<p>C'est presque terminé ! Nous avons envoyé un courriel d'activation à <b>%{email}</b>. Merci de suivre les instructions pour activer votre compte.</p><p>Si vous ne le recevez pas, vérifiez le dossier Spam dans votre messagerie.</p>"
     not_activated: "Vous ne pouvez pas vous connecter pour le moment. Nous vous avons envoyé un courriel d'activation. Merci de suivre les instructions qui s'y trouve pour activer votre compte."
     not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter en tant que %{username} depuis cette adresse IP."
-    admin_not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter depuis cette adresse IP."
+    admin_not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter en tant qu'administrateur depuis cette adresse IP."
     reset_not_allowed_from_ip_address: "Vous ne pouvez pas réinitialiser le mot de passe depuis cette adresse IP."
     suspended: "Vous ne pouvez pas vous connecter jusqu'au %{date}."
     suspended_with_reason: "Compte suspendu jusqu'à %{date} : %{reason}"
@@ -2113,14 +2135,14 @@ fr:
     omniauth_confirm_title: "Connectez-vous à l'aide de %{provider}"
     omniauth_confirm_button: "Poursuivre"
     authenticator_error_no_valid_email: "Aucune adresse courriel associée à %{account} n'est autorisée. Vous devriez configurer votre compte avec une autre adresse."
-    new_registrations_disabled: "La création de nouveau compte n'est pas autorisé pour le moment."
+    new_registrations_disabled: "La création de nouveaux comptes n'est pas autorisée pour le moment."
     password_too_long: "Les mots de passe sont limités à 200 caractères."
     email_too_long: "Le courriel renseigné est trop long. Les noms de boîte courriel ne doivent pas dépasser 254 caractères, et les noms de domaines ne doivent pas dépasser 253 caractères."
     wrong_invite_code: "Le code d'invitation est invalide."
     reserved_username: "Ce nom d'utilisateur n'est pas autorisé."
     missing_user_field: "Vous n'avez pas renseigné l'ensemble des champs utilisateur"
     auth_complete: "Authentification terminée."
-    click_to_continue: "Cliquer ici pour continuer."
+    click_to_continue: "Cliquez ici pour continuer."
     already_logged_in: "Oups, on dirait que vous essayez d'accepter une invitation d'un autre utilisateur. Si vous n'êtes pas %{current_user}, veuillez vous déconnecter et réessayer."
     second_factor_title: "Authentification à deux facteurs"
     second_factor_description: "Veuillez saisir le code d'authentification requise de votre app :"
@@ -2131,6 +2153,7 @@ fr:
     missing_second_factor_name: "Veuillez renseigner un nom."
     missing_second_factor_code: "Veuillez renseigne un code."
     second_factor_toggle:
+      totp: "Utiliser une application d'authentification ou une clé de sécurité"
       backup_code: "Utilisez plutôt un code de secours"
   admin:
     email:
@@ -2156,6 +2179,7 @@ fr:
       must_not_contain_two_special_chars_in_seq: "ne doit pas contenir une séquence de 2 caractères spéciaux ou plus (.-_)"
       must_not_end_with_confusing_suffix: "ne doit pas se terminer avec un suffixe déroutant comme .json ou .png etc."
     email:
+      invalid: "est invalide."
       not_allowed: "n'est pas autorisé pour ce fournisseur de courriels. Veuillez utiliser une autre adresse."
       blocked: "n'est pas autorisé."
       revoked: "N'enverra plus de courriels à « %{email} » jusqu'à %{date}."
@@ -2164,7 +2188,7 @@ fr:
       max_new_accounts_per_registration_ip: "Les nouvelles inscriptions ne sont pas autorisées depuis votre adresse IP (limite atteinte). Contactez un responsable."
     website:
       domain_not_allowed: "Site web invalide. Les domaines autorisés sont : %{domains}"
-    auto_rejected: "Rejeté automatiquement à cause de l'âge. Voir paramètre auto_handle_queued_age site."
+    auto_rejected: "Rejeté automatiquement car le délai d'action est dépassé. Voir le paramètre auto_handle_queued_age."
     destroy_reasons:
       unused_staged_user: "Utilisateur distant inutilisé"
       fixed_primary_email: "Correction du courriel principal pour l'utilisateur distant"
@@ -2275,7 +2299,7 @@ fr:
 
       %{base_url}/u/password-reset/%{email_token}
 
-      (Si le lien est expiré, cliquez sur « J'ai oublié mon mot de passe » au moment de s'identifier avec votre adresse courriel.)
+      (Si le lien est expiré, cliquez sur « J'ai oublié mon mot de passe » au moment de vous connecter avec votre adresse courriel.)
   download_backup_mailer:
     title: "Téléchargement de la sauvegarde"
     subject_template: "[%{email_prefix}] Téléchargement de la sauvegarde du site"
@@ -2348,8 +2372,8 @@ fr:
     private_topic_title: "Sujet #%{id}"
     contents_hidden: "Veuillez visiter le message pour voir son contenu."
     post_hidden:
-      title: "Message caché"
-      subject_template: "Message caché suite à des signalements de la communauté"
+      title: "Message masqué"
+      subject_template: "Message masqué suite à des signalements de la communauté"
       text_body_template: |
         Bonjour,
 
@@ -2365,8 +2389,8 @@ fr:
 
         Pour plus d'informations, veuillez consulter notre [charte communautaire](%{base_url}/charte).
     post_hidden_again:
-      title: "Message caché à nouveau"
-      subject_template: "Message caché suite à des signalements de la communauté, responsables avertis"
+      title: "Message masqué à nouveau"
+      subject_template: "Message masqué suite à des signalements de la communauté, responsables avertis"
       text_body_template: "Bonjour,\n\nCeci est un message automatique de %{site_name} pour vous informer que votre message a été masqué à nouveau.\n\n <%{base_url}%{url}>\n\n %{flag_reason}\n\nLa communauté a signalé ce message et il est maintenant masqué. **Ce message ayant été masqué plus d'une fois, il le restera jusqu'à ce qu'un responsable intervienne.** \n\nPour plus d'informations, veuillez consulter notre [charte communautaire](%{base_url}/charte).\n"
     flags_disagreed:
       title: "Le message signalé a été rétabli par un responsable"
@@ -2516,13 +2540,13 @@ fr:
       title: "Export CSV réussi"
       subject_template: "[%{export_title}] Exportation des données terminée"
       text_body_template: |
-        Votre export de données a réussi ! :dvd:
+        Votre export de données a réussi ! :dvd:
 
         %{download_link}
 
         Le lien de téléchargement sera valide pendant 48 heures.
 
-        Les données sont compressées au format ZIP. Si l'archive ne s'extrait pas lorsque vous l'ouvrez, utilisez l'outil recommandé : https://www.7-zip.org/
+        Les données sont compressées au format ZIP. Si l'archive ne s'extrait pas lorsque vous l'ouvrez, utilisez l'outil recommandé : https://www.7-zip.org/
     csv_export_failed:
       title: "Export CSV échoué"
       subject_template: "Échec de l'exportation des données "
@@ -2584,7 +2608,7 @@ fr:
 
         Assurez-vous d'avoir écrit votre réponse au début du courriel.
 
-        Si vous obtenez ce message alors que vous _aviez_ inclus une réponse, réessayez avec un formatage plus simple.
+        Si vous obtenez ce message alors que vous _aviez_ inclus une réponse, réessayez avec une mise en forme plus simple.
     email_reject_parsing:
       title: "Courriel rejeté - Parsing"
       subject_template: "[%{email_prefix}] Problème de courriel -- Contenu non reconnu"
@@ -2612,7 +2636,7 @@ fr:
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
-        Cela peut-être à cause d'un format trop complexe, d'un message trop long ou trop court. Veuillez réessayer ou rédigez votre message directement sur le site si le problème persiste.
+        Cela peut-être à cause d'une mise en forme trop complexe, d'un message trop long ou trop court. Veuillez réessayer ou rédigez votre message directement sur le site si le problème persiste.
     email_reject_invalid_post_specified:
       title: "Courriel rejeté - Message invalide spécifié"
       subject_template: "[%{email_prefix}] Problème de courriel -- Erreur d'envoi d'un message"
@@ -2652,7 +2676,7 @@ fr:
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
-        Aucune des adresses de destination n'est reconnue, ou l'entête Message-ID dans le courriel a été modifiée. Veuillez vérifier que vous envoyez bien à l'adresse courriel fournie par les responsables.
+        Utilisez-vous plusieurs adresses courriel ? Avez-vous répondu depuis une autre adresse courriel ? Les réponses par courriel nécessitent d'utiliser la même adresse courriel pour répondre. Si c'est le cas, il est possible que l'entête Message-ID ait été modifiée.
     email_reject_old_destination:
       title: "Courriel rejeté - Destination obsolète"
       subject_template: "[%{email_prefix}] Problème de courriel -- Vous essayez de répondre à une ancienne notification"
@@ -3269,7 +3293,6 @@ fr:
   login_required:
     welcome_message: |
       ## [Bienvenue sur %{title}](#welcome)
-
       Un compte est nécessaire. Veuillez en créer un ou connectez-vous pour continuer.
     welcome_message_invite_only: |
       ## [Bienvenue sur %{title}](#welcome)
@@ -3751,7 +3774,7 @@ fr:
       name: Meneur
       description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Accès accordé</a> à l'édition globale, l'épinglage, la fermeture, l'archivage, la séparation et la fusion de sujets, et toujours plus de J'aime"
       long_description: |
-        Ce badge est accordé lorsque vous atteignez le niveau de confiance 4. Vous êtes un meneur choisi par l'équipe dans cette communauté, et vous montrez l'exemple dans vos actions et vos paroles. Vous avez la possibilité de modifier tous les messages, utiliser les actions de modérations telles qu'épingler, fermer, cacher, archiver, scinder et fusionner les sujets.
+        Ce badge est accordé lorsque vous atteignez le niveau de confiance 4. Vous êtes un meneur choisi par l'équipe dans cette communauté, et vous montrez l'exemple dans vos actions et vos paroles. Vous avez la possibilité de modifier tous les messages, utiliser les actions de modérations telles qu'épingler, fermer, masquer, archiver, scinder et fusionner les sujets.
     welcome:
       name: Bienvenue
       description: A reçu un J'aime
@@ -4203,6 +4226,9 @@ fr:
       category: "Les messages de cette catégorie doivent être approuvés manuellement par un responsable. Voir les paramètres de la catégorie."
       must_approve_users: "Tous les nouveaux utilisateurs doivent être approuvés par un responsable. Voir `must_approve_users`."
       invite_only: "Tous les nouveaux utilisateurs doivent être invités. Voir `invite_only`."
+      email_auth_res_enqueue: "Ce courriel n'a pas passé une vérification DMARC, il est fort probable qu'il ne provienne pas de l'expéditeur annoncé. Vérifiez les entêtes du courriel brut pour plus d'informations."
+      email_spam: "Ce courriel a été signalé comme spam par l'entête définie dans `email_in_spam_header`."
+      suspect_user: "Ce nouvel utilisateur a renseigné des informations sur son profil sans lire de sujets ou messages, ce qui indique qu'il pourrait être un spammeur. Voir `approve_suspect_users`."
     actions:
       agree:
         title: "Accepter…"
@@ -4210,8 +4236,8 @@ fr:
         title: "Conserver le message"
         description: "Accepter le signalement et conserver le message tel quel."
       agree_and_keep_hidden:
-        title: "Garder le message caché"
-        description: "Accepter le signalement et laisser le message caché."
+        title: "Garder le message masqué"
+        description: "Accepter le signalement et laisser le message masqué."
       agree_and_suspend:
         title: "Suspendre l'utilisateur"
         description: "Accepter le signalement et suspendre l'utilisateur."
@@ -4222,8 +4248,8 @@ fr:
         title: "Rétablir le message"
         description: "Rétablir le message afin que tous les utilisateurs puissent le voir."
       agree_and_hide:
-        title: "Cacher le message"
-        description: "Cacher le message et envoyer automatiquement un message à l'utilisateur l'incitant à le modifier."
+        title: "Masquer le message"
+        description: "Masquer le message et envoyer automatiquement un message à l'utilisateur l'incitant à le modifier."
       delete_spammer:
         title: "Supprimer le spammeur"
         description: "Supprimer cet utilisateur et tous ses messages et sujets."
@@ -4280,3 +4306,13 @@ fr:
     html_missing_placeholder: "Le modèle HTML doit inclure %{placeholder}"
   discord:
     not_in_allowed_guild: "L'authentification a échoué. Vous n'êtes membre d'aucune guilde Discord autorisée."
+  old_keys_reminder:
+    title: "Rappel de vieux identifiants"
+    body: |
+      Bonjour ! Ceci est un rappel annuel pour la sécurité de votre instance Discourse.
+
+      Nous voulions vous rappeler que les identifiants suivants utilisés sur votre instance Discourse n'ont pas été changés depuis plus de 2 ans :
+
+      %{keys}
+
+      Aucune action n'est nécessaire pour le moment. Cependant, les bonnes pratiques en terme de sécurité recommandent de changer régulièrement ses identifiants.
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index 8e4bdc0978..b5d1e339ac 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -464,6 +464,7 @@ gl:
     errors:
       min_username_length_range: "O mínimo non pode ser maior que o máximo."
   search:
+    within_post: "#%{post_number} de %{username}"
     types:
       category: "Categorías"
       user: "Usuarios"
@@ -478,6 +479,7 @@ gl:
       invalid: "contén caracteres incorrectos"
   login:
     admin_not_allowed_from_ip_address: "Non podes acceder como administrador desde este enderezo IP."
+    not_available: "Non dispoñíbel. Tentar %{suggestion}?"
     new_registrations_disabled: "Neste momento non se permite o rexistro de novas contas."
   admin:
     email:
@@ -597,6 +599,14 @@ gl:
       emoji:
         title: "Emoji"
   joined: "Inscrito"
+  discourse_push_notifications:
+    popup:
+      mentioned: '%{username} mencionoute en "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} mencionoute en "%{topic}" - %{site_title}'
+      quoted: '%{username} citoute en "%{topic}" - %{site_title}'
+      replied: '%{username} respondeute en "%{topic}" - %{site_title}'
+      posted: '%{username} publicou en "%{topic}" - %{site_title}'
+      linked: '%{username} ligou a túa publicación desde "%{topic}" - %{site_title}'
   reviewables:
     actions:
       agree_and_suspend:
@@ -607,6 +617,8 @@ gl:
         title: "Eliminar"
       disagree:
         title: "Non aceptar"
+      ignore:
+        title: "Ignorar"
       approve:
         title: "Aprobar"
       reject_user:
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 750d89daa2..abd3465d12 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -204,6 +204,9 @@ he:
     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: "כבר נשלחה הזמנה למשתמש זה. ניתן להזמין משתמש לנושא פעם אחת בלבד, עמך הסליחה."
@@ -879,7 +882,7 @@ he:
       short_description: 'הפרה של <a href="%{base_path}/guidelines">הנחיות הקהילה שלנו</a>'
       long_form: "סומן כלא ראוי"
     notify_user:
-      title: "שליחת הודעה ל־‎@{{username}}"
+      title: "שליחת הודעה ל־‎@%{username}"
       description: "ברצוני לשוחח אישית באופן ישיר עם מפרסם הפוסט הזה."
       short_description: "ברצוני לשוחח אישית באופן ישיר עם מפרסם הפוסט הזה."
       long_form: "נשלחה הודעה למשתמש"
@@ -1391,7 +1394,7 @@ he:
     min_first_post_length: "אורך מינימלי מותר לפוסט ראשון (בגוף הנושא) בתווים "
     min_personal_message_post_length: "האורך המזערי המותר לפוסט בתווים להודעות"
     max_post_length: "מספר התווים המקסימלי כאורך פוסט"
-    topic_featured_link_enabled: "איפשור של פרסום קישור עם נושאים."
+    topic_featured_link_enabled: "לאפשר פרסום קישור עם נושאים."
     show_topic_featured_link_in_digest: "הצגת קישור מומלץ של הנושא במייל התמצות."
     min_topic_title_length: "מספר התווים המינימלי הנדרש לכותרת נושא"
     max_topic_title_length: "מספר התווים המקסימלי המותר לכותרת נושא"
@@ -1409,8 +1412,8 @@ he:
     category_search_priority_low_weight: "משקל שהוחל על הדירוג בעדיפות חיפוש נמוכה בקטגוריות."
     category_search_priority_high_weight: "משקל שהוחל על הדירוג בעדיפות חיפוש גבוהה בקטגוריות."
     category_search_priority_very_high_weight: "משקל שהוחל על הדירוג בעדיפות חיפוש גבוהה מאוד בקטגוריות."
-    allow_uncategorized_topics: "הרשה לפתוח נושאים ללא קטגוריה. אזהרה: אם יש נושאים ללא קטגוריה, יש לסדר אותם לפני שמבטלים את האופציה. "
-    allow_duplicate_topic_titles: "אשרו נושאים עם כותרות זהות או משוכפלות."
+    allow_uncategorized_topics: "לאפשר לפתוח נושאים ללא קטגוריה. אזהרה: אם יש נושאים ללא קטגוריה, יש לסדר אותם לפני שמבטלים את ההגדרה הזאת. "
+    allow_duplicate_topic_titles: "לאפשר נושאים עם כותרות זהות או כפולות."
     unique_posts_mins: "כמה דקות לפני שמשתמש יכול לפרסם את אותו תוכן שוב"
     educate_until_posts: "כאשר המשתמש/ת מתחילים להקיש את (n) הפוסטים הראשונים שלהם, הציגו פאנל הנחיה למשתמש באזור חיבור הפוסטים."
     title: "שם האתר הזה, כפי שהוא משמש בתגית הכותרת."
@@ -1640,7 +1643,7 @@ he:
     max_flags_per_day: "מספר מקסימלי של דגלים מותרים למשתמשים ביום."
     max_bookmarks_per_day: "מספר מקסימלי של סימניות למשתמשים ביום."
     max_edits_per_day: "מספר עריכות מקסימלי מותר למשתמשים ליום."
-    max_topics_per_day: "מספר מקסימלי של נושאים שמשתמשים יכולים ליצור ביום."
+    max_topics_per_day: "מספר הנושאים המרבי שמשתמשים יכולים ליצור ביום."
     max_personal_messages_per_day: "מספר ההודעות המרבי שמשתמשים יכולים ליצור ביום."
     max_invites_per_day: "מספר מקסימלי של הזמנות שיכולים משתמשים לשלוח ביום."
     max_topic_invitations_per_day: "מספר מירבי של הזמנות לנושא שמשתמשים יכולים לשלוח ביום. "
@@ -1652,8 +1655,8 @@ he:
     alert_admins_if_errors_per_hour: "מספר השגיאות בשעה לפני ששולחים התראה למנהל. ערך של 0 מנטרל אפשרות זו. שימו לב: מצריך הרצה מחדש."
     categories_topics: "מספר הנושאים להציג בעמוד ה־‎/categories (קטגוריות). אם הוגדר ל־0, יתבצע ניסיון למצוא ערך שישאיר את שתי העמודות סימטריות (קטגוריות ונושאים)."
     suggested_topics: "מספר הנושאים המוצעים שיופיעו בתחתית הנושא המוצג."
-    limit_suggested_to_category: "הצגת רק נושאים מהקטגוריה הנוכחית ברשימת הנושאים המומלצים."
-    suggested_topics_max_days_old: "נושאים מוצעים לא אמורים להיות בני יותר מ n ימים."
+    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: "תקופת חסד (בשעות) לפני שהעלאות יתומות מוסרות."
@@ -1690,7 +1693,7 @@ he:
     tl2_requires_days_visited: "כמה ימים שונים משתמשים צריכים לבקר באתר לפני שישודרגו לרמת אמון 2."
     tl2_requires_likes_received: "כמה \"לייקים\" משתמשים צריכים לקבל לפני שישודרגו לרמת אמון 2."
     tl2_requires_likes_given: "כמה לייקים משתמשים צריכים לתת לפני שישודרגו לרמת אמון 2."
-    tl2_requires_topic_reply_count: "בכמה נושאים משתמשים צריכים לענות לפני שישודרגו לרמת אמון 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 או יותר)"
@@ -2292,6 +2295,7 @@ he:
       must_not_contain_two_special_chars_in_seq: "לא יכול להכיל רצף של 2 או יותר תווים מיוחדים (.-_)"
       must_not_end_with_confusing_suffix: "אסור שיסתיים עם סיומות מבלבלות כמו .json או .png וכד׳."
     email:
+      invalid: "שגוי."
       not_allowed: "לא מורשה מכתובת הדואר האלקטרוני הזו. בבקשה השתמש בכתובת אחרת."
       blocked: "לא מורשה."
       revoked: "לא יישלחו מיילים ל '%{email}' עד %{date}."
@@ -2842,7 +2846,7 @@ he:
       text_body_template: |
         ההודעה שניסית לשלוח בדוא״ל אל %{destination} (עם הכותרת %{former_title}) לא נשלחה, עמך הסליחה.
 
-        אף אחד מנמעני הדוא״ל אינם מוכרים או שכותרת מזהה ההודעה (Message-ID) בהודעה השתנתה. נא לוודא שליחה לכתובת הדוא״ל הנכונה כפי שסופקה לך על ידי הסגל.
+        יכול להיות שיש לך יותר מכתובת דוא״ל אחת? ניסית לענות מכתובת דוא״ל אחרת? תגובות בדוא״ל דורשות שימוש באותה כתובת הדוא״ל גם למענה. לחלופין, ייתכן שכותרת מזהה ההודעה (Message-ID) השתנתה.
     email_reject_old_destination:
       title: "דחיית דוא״ל יעד ישן"
       subject_template: "[%{email_prefix}] בעיית דוא״ל -- ניסית להגיב להתראה ישנה"
@@ -4312,3 +4316,11 @@ he:
     not_in_allowed_guild: "האימות נכשל. הגילדה ב־Discord אליה הצטרפת אינה מורשית לגשת."
   old_keys_reminder:
     title: "תזכורת על פרטי גישה ישנים"
+    body: |
+      שלום! זאת תזכורת אבטחה שנתית שגרתית מעותק ה־Discourse שלך.
+
+      מתוך נימוס, רצינו ליידע אותך שפרטי הגישה הבאים, המשמשים אותך לגישה ל־Discourse שלך, לא עודכנו זה למעלה משנתיים:
+
+      %{keys}
+
+      אין צורך לנקוט בפעולה כלשהי כעת, עם זאת, מטעמי שיפור אבטחת המידע מומלץ להחליף את כל פרטי הגישה החשובים שלך כל כמה שנים.
diff --git a/config/locales/server.hu.yml b/config/locales/server.hu.yml
index ffc8bb61d8..a5c27a50a0 100644
--- a/config/locales/server.hu.yml
+++ b/config/locales/server.hu.yml
@@ -787,6 +787,7 @@ hu:
       category: "Kategóriák"
       topic: "Eredmények"
       user: "Felhasználók"
+    results_page: "Keresési eredmény: '%{term}'"
   original_poster: "Eredeti szerző"
   most_posts: "Legtöbb bejegyzés"
   most_recent_poster: "Legutóbbi szerzők"
@@ -810,6 +811,7 @@ hu:
     suspended: "Nem jelentkezhet be eddig: %{date}."
     suspended_with_reason: "A fiók felfüggesztve eddig: %{date}: %{reason}"
     errors: "%{errors}"
+    not_available: "Nem elérhető. Esetleg %{suggestion}?"
     something_already_taken: "Valami hiba történt, lehet hogy a felhasználónév vagy az e-mail cím már regisztrálva van. Próbálja meg az elfelejtett jelszó hivatkozást."
     omniauth_error_unknown: "A bejelentkezési valamiért nem sikerült, próbálja meg újra."
     omniauth_confirm_button: "Folytatás"
@@ -1276,6 +1278,11 @@ hu:
   joined: "Csatlakozott"
   discourse_push_notifications:
     popup:
+      mentioned: '%{username} megemlített téged "%{topic}" - %{site_title} témakörben'
+      group_mentioned: '%{username} megemlített téged "%{topic}" - %{site_title} témakörben'
+      quoted: '%{username} idézett itt: "%{topic}" - %{site_title}'
+      replied: '%{username} válaszolt neked itt: "%{topic}" - %{site_title}'
+      posted: '%{username} hozzászólt itt: "%{topic}" - %{site_title}'
       confirm_title: "Értesítések bekapcsolva – %{site_title}"
       confirm_body: "Siker! Értesítések engedélyezve."
       custom: "Értesítés %{username} felhasználótól itt: %{site_title}"
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index f8f28e3534..a4299bbde1 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -664,7 +664,7 @@ hy:
       short_description: '<a href="%{base_path}/guidelines">Մեր համայնքի ուղեցույցի</a> խախտում'
       long_form: "դրոշակավորել է սա որպես անհամապատասխան"
     notify_user:
-      title: "Ուղարկել նամակ @{{username}} -ին"
+      title: "Ուղարկել նամակ @%{username} -ին"
       description: "Ես ցանկանում եմ ուղղակիորեն և անձամբ խոսել այս մարդու հետ իր գրառման մասին:"
       short_description: "Ես ցանկանում եմ ուղղակիորեն և անձամբ խոսել այս մարդու հետ իր գրառման մասին:"
       long_form: "նամակ է գրել օգտատիրոջը"
@@ -2228,10 +2228,6 @@ hy:
     email_reject_bad_destination_address:
       title: "Էլ. փոստի Մերժում - Նպատակակետի Վատ Հասցե"
       subject_template: "[%{email_prefix}] Էլ. փոստի խնդիր -- Անհայտ Ում Հասցե"
-      text_body_template: |
-        Ցավում ենք բայց, Ձեր էլ. նամակը %{destination}-ին (%{former_title} վերնագրով) չաշխատեց:
-
-        Նպատակային էլ. հասցեներից ոչ մեկը ճանաչված չէ, կամ Message-ID վերնագիրը փոփոխված չէ: Խնդրում ենք համոզվել, որ Դուք ուղարկում եք անձնակազմի կողմից տրամադրված ճիշտ էլ. հասցեի:
     email_reject_old_destination:
       title: "Էլ. փոստի Մերժում - Հին Նպատակակետ"
       subject_template: "[%{email_prefix}] Էլ. փոստի խնդիր -- Դուք փորձում եք պատասխանել հին ծանուցմանը"
@@ -3289,8 +3285,10 @@ hy:
       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} -ից մինչև %{site_title}"
   staff_action_logs:
     not_found: "չգտնված"
     unknown: "չճանաչված"
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index cc30a4e070..fe7b79b613 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -312,7 +312,7 @@ id:
     inappropriate:
       long_form: "menandai sebagai tidak pantas"
     notify_user:
-      title: "Kirim @{{username}} sebuah pesan"
+      title: "Kirim @%{username} sebuah pesan"
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Hal Lain"
@@ -540,6 +540,7 @@ id:
     autoclosed_disabled: "Topik telah dibuka. Jawaban baru sekarang diijinkan."
     autoclosed_disabled_lastpost: "Topik telah dibuka. Jawaban baru sekarang diijinkan."
   login:
+    not_available: "Tidak tersedia. Coba %{suggestion}?"
     omniauth_confirm_button: "Lanjutkan"
   admin:
     email:
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 1490a235ac..9e087e425a 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -787,7 +787,7 @@ it:
       short_description: 'Una violazione delle <a href="%{base_path}/guidelines">linee guida della nostra comunità</a>'
       long_form: "segnalato come inappropriato"
     notify_user:
-      title: "Invia un messaggio a @{{username}}"
+      title: "Invia un messaggio a @%{username}"
       description: "Voglio parlare direttamente con questa persona a proposito del suo messaggio."
       short_description: "Voglio parlare direttamente con questa persona a proposito del suo messaggio."
       long_form: "messaggio inviato"
@@ -2469,10 +2469,6 @@ it:
     email_reject_bad_destination_address:
       title: "Email Rifiutata Indirizzo di Destinazione Errato"
       subject_template: "[%{email_prefix}] Problema email -- Sconosciuto A: Indirizzo"
-      text_body_template: |
-        Spiacenti, ma il tuo messaggio email per %{destination}(intitolato %{former_title}) non ha funzionato.
-
-        Nessuno degli indirizzi email di destinazione viene riconosciuto o l'intestazione Message-ID della email è stata modificata. Assicurati di inviare all'indirizzo email corretto fornito dallo staff.
     email_reject_old_destination:
       title: "Email Rifiutate - Vecchia Destinazione"
       subject_template: "[%{email_prefix}] Problema alla posta elettronica: stai tentando di rispondere a una vecchia notifica"
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index dfc90bba15..1fd072c688 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -448,7 +448,7 @@ ja:
       title: "不適切"
       long_form: "不適切として通報する"
     notify_user:
-      title: "@{{username}}へメッセージを送る"
+      title: "@%{username}へメッセージを送る"
       description: "この投稿について直接話がしたいです。"
       short_description: "彼らの投稿に対して直接話したいです。"
       long_form: "メッセージが送られたユーザー"
@@ -1669,6 +1669,12 @@ ja:
   joined: "参加日"
   discourse_push_notifications:
     popup:
+      mentioned: '"%{topic}"で%{username} にメンションされました - %{site_title}'
+      group_mentioned: '"%{topic}"で%{username} にメンションされました - %{site_title}'
+      quoted: '"%{topic}"で%{username}が引用しました - %{site_title}'
+      replied: '%{username}が"%{topic}"へ返信しました - %{site_title}'
+      posted: '%{username} が投稿しました "%{topic}" - %{site_title}'
+      linked: '"%{topic}"にあるあなたの投稿に%{username}がリンクしました - %{site_title}'
       confirm_body: "成功！通知を可能にしました！"
   reviewables:
     priorities:
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 139cad6c07..2764eaa628 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -697,7 +697,7 @@ ko:
       short_description: '<a href="%{base_path}/guidelines">커뮤니티 지침</a> 위반'
       long_form: "부적절함으로 신고하기"
     notify_user:
-      title: "@{{username}} 님에게 메시지를 보냅니다"
+      title: "@%{username} 님에게 메시지를 보냅니다"
       description: "이 사용자와 게시물에 대해 직접 개인적으로 이야기하고 싶습니다."
       short_description: "이 사용자와 게시물에 대해 직접 개인적으로 이야기하고 싶습니다."
       long_form: "메세지한 유저"
diff --git a/config/locales/server.lt.yml b/config/locales/server.lt.yml
index 41058179e4..5ac9f7bbc1 100644
--- a/config/locales/server.lt.yml
+++ b/config/locales/server.lt.yml
@@ -396,7 +396,7 @@ lt:
     inappropriate:
       title: "Nederamas"
     notify_user:
-      title: "Siųsti @{{username}} žinutę"
+      title: "Siųsti @%{username} žinutę"
       long_form: "išsiuntėte nariui"
       email_title: 'Jūsų įrašas temote "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -629,10 +629,12 @@ lt:
   site_settings:
     enable_emoji: "Įgalinti Emoji"
   search:
+    within_post: "#%{post_number} nuo %{username}"
     types:
       category: "Kategorijos"
       topic: "Rezultatai"
       user: "Vartotojai"
+    results_page: "Paieškos rezultatai ir '%{term}'"
   publish_page:
     slug_errors:
       blank: "negali būti tuščia"
@@ -640,6 +642,7 @@ lt:
   login:
     admin_not_allowed_from_ip_address: "Tu negali prisijungti kaip administratorius iš šio IP adreso."
     errors: "%{errors}"
+    not_available: "Negalimas. Gal pabandykite %{suggestion}?"
     omniauth_confirm_button: "Tęsti"
     second_factor_title: "Dviejų veiksmų autentifikavimas"
   admin:
@@ -1061,6 +1064,12 @@ lt:
   joined: "Prisijungė"
   discourse_push_notifications:
     popup:
+      mentioned: '%{username} paminėjo tave "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} paminėjo tave "%{topic}" - %{site_title}'
+      quoted: '%{username} pacitavo tave "%{topic}" - %{site_title}'
+      replied: '%{username} atsakė tau "%{topic}" - %{site_title}'
+      posted: '%{username} paskelbė "%{topic}" - %{site_title}'
+      linked: '%{username} panaudojo tavo įrašą "%{topic}" - %{site_title}'
       confirm_title: "Pranešimai įgalinti - %{site_title} svetainėje"
       confirm_body: "Pavyko! Pranešimai buvo įgalinti."
   staff_action_logs:
diff --git a/config/locales/server.lv.yml b/config/locales/server.lv.yml
index 4f5e41263d..b2c9be5789 100644
--- a/config/locales/server.lv.yml
+++ b/config/locales/server.lv.yml
@@ -291,12 +291,14 @@ lv:
     errors:
       invalid_email: "Nepareiza e-pasta adrese."
   search:
+    within_post: "#%{post_number} - %{username}"
     types:
       category: "Sadaļas"
       user: "Lietotāji"
   login:
     not_approved: "Jūsu konts vēl nav apstiprināts. Jums tiks paziņots e-pastā, kad varēsiet pieslēgties."
     admin_not_allowed_from_ip_address: "Jūs nevarat ieiet kā administrators no šīs IP adreses."
+    not_available: "Nav pieejams. Mēģiniet %{suggestion}?"
     omniauth_confirm_button: "Turpināt"
   admin:
     email:
@@ -319,6 +321,8 @@ lv:
     see_more: "Vairāk"
     search_title: "Meklēt šajā vietnē"
     search_button: "Meklēt"
+  upload:
+    unauthorized: "Atvainojiet, fails, ko mēģināt augšuplādēt, nav atļauts (atļautie paplašinājumi: %{authorized_extensions})."
   csv_export:
     boolean_yes: "Jā"
     boolean_no: "Nē"
@@ -372,6 +376,14 @@ lv:
       emoji:
         title: "Smaidiņi"
   joined: "Pievienojās"
+  discourse_push_notifications:
+    popup:
+      mentioned: '%{username} pieminēja jūs "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} pieminēja jūs "%{topic}" - %{site_title}'
+      quoted: '%{username} citēja jūs "%{topic}" - %{site_title}'
+      replied: '%{username} atbildēja jums "%{topic}" - %{site_title}'
+      posted: '%{username} ierakstīja "%{topic}" - %{site_title}'
+      linked: '%{username} ievietoja saiti uz jūsu ierakstu no "%{topic}" - %{site_title}'
   reviewables:
     actions:
       agree_and_suspend:
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index c156a4a07f..72069087a3 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -615,7 +615,7 @@ nb_NO:
       title: "Upassende"
       long_form: "markerte dette som upassende"
     notify_user:
-      title: "Send en melding til @{{username}}"
+      title: "Send en melding til @%{username}"
       description: "Jeg ønsker å snakke med denne personen direkte og personlig om innlegget."
       short_description: "Jeg ønsker å snakke med denne personen direkte og personlig om innlegget."
       long_form: "sendt melding til bruker"
@@ -1099,10 +1099,12 @@ nb_NO:
       min_username_length_range: "Du kan ikke sette minimum høyere enn maksimum."
       max_username_length_range: "Du kan ikke sette maksimum under minimum."
   search:
+    within_post: "#%{post_number} av %{username}"
     types:
       category: "Kategorier"
       topic: "Resultater"
       user: "Brukere"
+    results_page: "Søkeresultater for \"%{term}\""
   most_posts: "Flest innlegg"
   most_recent_poster: "Ferskeste innlegg av"
   redirected_to_top_reasons:
@@ -1513,6 +1515,12 @@ nb_NO:
   joined: "Medlem fra"
   discourse_push_notifications:
     popup:
+      mentioned: '%{username} nevnte deg i "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} nevnte deg i "%{topic}" - %{site_title}'
+      quoted: '%{username} siterte deg i "%{topic}" - %{site_title}'
+      replied: '%{username} svarte deg i "%{topic}" - %{site_title}'
+      posted: '%{username} skrev noe i "%{topic}" - %{site_title}'
+      linked: '%{username} lenket til innlegget ditt i "%{topic}" - %{site_title}'
       confirm_title: "Varslinger aktivert - %{site_title}"
       confirm_body: "Suksess! Varslinger er nå aktivert."
   reviewables:
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index fab96fbb1f..96f2334196 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -194,6 +194,9 @@ nl:
     file_should_be_csv: "Het geüploade bestand dient de CSV-indeling te hebben."
     max_rows: "De eerste %{max_bulk_invites} uitnodigingen zijn verstuurd. Probeer het bestand in kleinere delen op te splitsen."
     error: "Er is een fout opgetreden bij het uploaden van dat bestand. Probeer het later opnieuw."
+  invite_link:
+    email_taken: "Dit e-mailadres is al in gebruik. Als u al een account hebt, meld u dan aan of herinitialiseer uw wachtwoord."
+    max_redemptions_limit: "moet tussen 2 en %{max_limit} liggen."
   topic_invite:
     failed_to_invite: "De gebruiker kan niet voor dit topic worden uitgenodigd zonder een groepslidmaatschap in een van de volgende groepen: %{group_names}."
     user_exists: "Sorry, die gebruiker is al uitgenodigd. U kunt een gebruiker maar één keer voor een topic uitnodigen."
@@ -807,7 +810,7 @@ nl:
       short_description: 'Een overtreding van <a href="%{base_path}/guidelines">onze gemeenschapsrichtlijnen</a>'
       long_form: "heeft dit als ongepast gemarkeerd"
     notify_user:
-      title: "@{{username}} een bericht sturen"
+      title: "@%{username} een bericht sturen"
       description: "I wil rechtstreeks en persoonlijk met deze persoon over zijn of haar bericht praten."
       short_description: "I wil rechtstreeks en persoonlijk met deze persoon over zijn of haar bericht praten."
       long_form: "heeft bericht verstuurd naar gebruiker"
@@ -1468,6 +1471,7 @@ nl:
     moderators_view_emails: "Moderators mogen e-mails van gebruikers bekijken"
     prioritize_username_in_ux: "Eerst gebruikersnaam tonen op gebruikerspagina, gebruikerskaart en in berichten (wanneer uitgeschakeld, wordt eerst de naam getoond)"
     enable_rich_text_paste: "Automatische conversie van HTML naar Markdown bij het plakken van tekst in de editor inschakelen. (Experimenteel)"
+    send_old_credential_reminder_days: "Herinneren aan oude referenties na dagen"
     email_token_valid_hours: "Tokens voor Wachtwoord vergeten / Account activeren zijn (n) uur geldig."
     enable_badges: "Het badgesysteem inschakelen"
     enable_whispers: "Privécommunicatie van stafleden binnen topics toestaan."
@@ -1573,6 +1577,7 @@ nl:
     max_logins_per_ip_per_minute: "Maximale aantal toegestane aanmeldingen per IP-adres per minuut"
     max_post_deletions_per_minute: "Maximale aantal berichten dat een gebruiker per minuut kan verwijderen."
     max_post_deletions_per_day: "Maximale aantal berichten dat een gebruiker per dag kan verwijderen."
+    invite_link_max_redemptions_limit: "Het maximaal toegestane aantal inwisselingen voor uitnodigingskoppelingen kan niet meer zijn dan deze waarde."
     alert_admins_if_errors_per_minute: "Aantal foutmeldingen per minuut waarbij de beheerder een melding krijgt. Een waarde van 0 schakelt deze functie uit. OPMERKING: vereist herstart."
     alert_admins_if_errors_per_hour: "Aantal foutmeldingen per uur waarbij de beheerder een melding krijgt. Een waarde van 0 schakelt deze functie uit. OPMERKING: vereist herstart."
     categories_topics: "Aantal topics dat in de /categories-pagina wordt getoond. Als dit op 0 is ingesteld, wordt automatisch naar een waarde gezocht die de twee kolommen symmetrisch houdt (categorieën en topics)."
@@ -2177,6 +2182,7 @@ nl:
       must_not_contain_two_special_chars_in_seq: "mag geen 2 of meer opeenvolgende speciale tekens bevatten (.-_)"
       must_not_end_with_confusing_suffix: "mag niet eindigen op een verwarrend achtervoegsel zoals .json, .png etc."
     email:
+      invalid: "is ongeldig."
       not_allowed: "is niet toegestaan vanaf die e-mailprovider. Gebruik een ander e-mailadres."
       blocked: "is niet toegestaan."
       revoked: "Stuurt geen e-mails naar '%{email}' tot %{date}."
@@ -2384,6 +2390,11 @@ nl:
         Het spijt ons, maar het plaatsen van uw e-mailbericht naar %{destination} (met de titel %{former_title}) is niet gelukt.
 
         De plaatsingsactie werd niet herkend. Probeer het opnieuw of plaats uw bericht via de website als het nog steeds niet lukt.
+    email_reject_bad_destination_address:
+      text_body_template: |
+        Het spijt ons, maar uw e-mailbericht naar %{destination} (met de titel %{former_title}) werkte niet.
+
+        Hebt u meer dan één e-mailadres gebruikt? Hebt u vanaf een andere e-mailadres geantwoord? E-mailantwoorden vereisen dat u bij het beantwoorden hetzelfde e-mailadres gebruikt. Het is ook mogelijk dat de header van het bericht-ID in het e-mailbericht is aangepast.
     silenced_by_staff:
       subject_template: "Account tijdelijk geblokkeerd"
     user_automatically_silenced:
@@ -2872,8 +2883,10 @@ nl:
       posted: '%{username} heeft een bericht geplaatst in ''%{topic}'' - %{site_title}'
       private_message: '%{username} heeft u een privébericht gestuurd in ''%{topic}'' - %{site_title}'
       linked: '%{username} heeft een koppeling naar uw bericht geplaatst vanaf ''%{topic}'' - %{site_title}'
+      watching_first_post: '%{username} heeft een nieuw topic gemaakt: ''%{topic}'' - %{site_title}'
       confirm_title: "Meldingen ingeschakeld - %{site_title}"
       confirm_body: "Gelukt! Meldingen zijn ingeschakeld."
+      custom: "Melding van %{username} op %{site_title}"
   staff_action_logs:
     not_found: "niet gevonden"
     unknown: "onbekend"
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 1b9f8a0efa..d16570fb7f 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -842,7 +842,7 @@ pl_PL:
       short_description: 'Naruszenie <a href="%{base_path}/guidelines">wytycznych naszej społeczności</a>.'
       long_form: "oflagowano jako niewłaściwe"
     notify_user:
-      title: "Wyślij @{{username}} wiadomość"
+      title: "Wyślij @%{username} wiadomość"
       description: "Chcę bezpośrednio porozmawiać z tą osobą o jej wpisie."
       short_description: "Chcę bezpośrednio porozmawiać z tą osobą o jej wpisie."
       long_form: "użytkownik został powiadomiony"
@@ -1938,6 +1938,7 @@ pl_PL:
       category: "Kategorie"
       topic: "Wyniki"
       user: "Użytkownicy"
+    results_page: "Wyniki wyszukiwania dla '%{term}'"
   sso:
     login_error: "Błąd logowania"
     not_found: "Nie znaleziono takiego konta. Skontaktuj się z administratorem."
@@ -3239,8 +3240,16 @@ pl_PL:
   joined: "Dołączył"
   discourse_push_notifications:
     popup:
+      mentioned: '%{username} wspomina o tobie w "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} wspomina o tobie w "%{topic}" - %{site_title}'
+      quoted: '%{username} cytuje cie w "%{topic}" - %{site_title}'
+      replied: '%{username} odpowiada na twój wpis w "%{topic}" - %{site_title}'
+      posted: '%{username} pisze w "%{topic}" - %{site_title}'
+      linked: '%{username} linkuje do twojego wpisu z "%{topic}" - %{site_title}'
+      watching_first_post: '%{username} utworzył nowy temat „%{topic}” - %{site_title}'
       confirm_title: "Powiadomienia włączone - %{site_title}"
       confirm_body: "Powodzenie! Powiadomienia zostały włączone."
+      custom: "Powiadomienie od %{username} na %{site_title}"
   staff_action_logs:
     api_key:
       revoked: Unieważniono
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index ee5fa857be..dea79c962c 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -530,7 +530,7 @@ pt:
       title: "Inapropriado"
       long_form: "sinalizou isto como inapropriado"
     notify_user:
-      title: "Enviar uma mensagem a @{{username}}"
+      title: "Enviar uma mensagem a @%{username}"
       long_form: "utilizador com mensagens"
       email_title: 'A sua mensagem em "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -1228,6 +1228,7 @@ pt:
       category: "Categorias"
       topic: "Resultados"
       user: "Utilizadores"
+    results_page: "Resultados da pesquisa por '%{term}'"
   sso:
     login_error: "Erro de Início de Sessão"
     not_found: "A sua conta não foi encontrada. Por favor contacte o administrador do site."
@@ -2104,6 +2105,13 @@ pt:
   joined: "Juntou-se"
   discourse_push_notifications:
     popup:
+      mentioned: '%{username} mencionou-o em "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} mencionou-o em "%{topic}" - %{site_title}'
+      quoted: '%{username} citou-o em "%{topic}" - %{site_title}'
+      replied: '%{username} respondeu-lhe em "%{topic}" - %{site_title}'
+      posted: '%{username} publicou em "%{topic}" - %{site_title}'
+      linked: '%{username} ligou à sua publicação de "%{topic}" - %{site_title}'
+      watching_first_post: '%{username} criou um novo tópico "%{topic}" - %{site_title}'
       confirm_title: "Notificações ativas - %{site_title}"
       confirm_body: "Sucesso! As notificações foram ativadas."
   reviewables:
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 11f2d2c2f7..3d2f607751 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -28,7 +28,7 @@ pt_BR:
   topics: "Tópicos"
   posts: "mensagens"
   loading: "Carregando"
-  powered_by_html: 'Desenvolvido por<a href="https://www.discourse.org">Discurso</a>, melhor visualizado com JavaScript habilitado'
+  powered_by_html: 'Desenvolvido por <a href="https://www.discourse.org">Discourse</a>, melhor visualizado com JavaScript habilitado'
   sign_up: "Cadastrar-se"
   log_in: "Entrar"
   submit: "Enviar"
@@ -64,7 +64,7 @@ pt_BR:
       default_out_range: "Definindo `%{name}` o valor padrão não está no intervalo especificado."
       enum_value_not_valid: "O valor selecionado não é uma das opções de enumeração."
       number_value_not_valid: "O novo valor não está dentro do intervalo permitido."
-      number_value_not_valid_min_max: "Deve estar entre %{min}e %{max}."
+      number_value_not_valid_min_max: "Deve estar entre %{min} e %{max}."
       number_value_not_valid_min: "Deve ser maior ou igual a%{min}."
       number_value_not_valid_max: "Deve ser menor ou igual a%{max}."
       string_value_not_valid: "O novo valor não está dentro do intervalo permitido."
@@ -176,10 +176,11 @@ pt_BR:
     not_found: "Seu token de convite é inválido. Entre em <a href='%{base_url}/about'>contato com a staff</a>."
     not_found_json: "Seu token de convite é inválido. Por favor entre em contato com a staff."
     not_found_template: |
-      <p>Seu convite para <a href="%{base_url}">%{site_name}</a>já foi resgatado.
-      <p>Se você lembrar de sua senha, você pode <a href="%{base_url}/login">Login</a>.</p>
+      <p>Seu convite para <a href="%{base_url}">%{site_name}</a> já foi utilizado.
 
-      <p>Caso contrário, por favor<a href="%{base_url}/password-reset">Redefinir Senha</a>.</p>
+      <p>Se você lembrar da sua senha, você pode <a href="%{base_url}/login">Fazer Login</a>.</p>
+
+      <p>Caso contrário, por favor <a href="%{base_url}/password-reset">Redefina a sua Senha</a>.</p>
     error_message: "Houve um erro ao aceitar o convite. Por favor entre em contato com o administrador do site."
     user_exists: "Não há necessidade de convidar <b>%{email}</b>, eles <a href='%{base_path}/u/%{username}/summary'>já tem uma conta!</a>"
     confirm_email: "<p>Você está quase pronto! Enviamos um e-mail de ativação para o seu endereço de e-mail. Por favor, siga as instruções no e-mail para ativar sua conta.</p><p>Se não chegar, verifique sua pasta de spam.</p>"
@@ -245,7 +246,7 @@ pt_BR:
       one: "%{count} resposta"
       other: "%{count} respostas"
     likes:
-      one: "%{count}curtida"
+      one: "%{count} curtida"
       other: "%{count} curtidas"
     last_reply: "Última resposta"
     created: "Criado"
@@ -631,23 +632,23 @@ pt_BR:
         one: "%{count}d"
         other: "%{count}d"
       about_x_months:
-        one: "%{count}mês"
-        other: "%{count}mon"
+        one: "%{count} mês"
+        other: "%{count} meses"
       x_months:
-        one: "%{count}mês"
-        other: "%{count}mon"
+        one: "%{count} mês"
+        other: "%{count} meses"
       about_x_years:
-        one: "%{count}ano"
-        other: "%{count}anos"
+        one: "%{count} ano"
+        other: "%{count} anos"
       over_x_years:
-        one: "> %{count}ano"
-        other: "> %{count}anos"
+        one: "> %{count}a"
+        other: "> %{count}a"
       almost_x_years:
-        one: "%{count}ano"
-        other: "%{count}anos"
+        one: "%{count} ano"
+        other: "%{count} anos"
     distance_in_words_verbose:
-      half_a_minute: "mesmo agora"
-      less_than_x_seconds: "mesmo agora"
+      half_a_minute: "agora mesmo"
+      less_than_x_seconds: "agora mesmo"
       x_seconds:
         one: "%{count} segundo atrás"
         other: "%{count} segundos atrás"
@@ -671,7 +672,7 @@ pt_BR:
         other: "%{count} meses atrás"
       about_x_years:
         one: "há cerca de %{count} ano atrás"
-        other: "há cerca %{count} anos atrás"
+        other: "há cerca de %{count} anos atrás"
       over_x_years:
         one: "há mais de %{count} ano atrás"
         other: "há mais de %{count} anos atrás"
@@ -777,7 +778,7 @@ pt_BR:
       short_description: 'Uma violação das <a href="%{base_path}/guidelines">nossas diretrizes da comunidade</a>'
       long_form: "sinalizado como inapropriado"
     notify_user:
-      title: "Envie ao(à) @ {{nome de usuário}} uma mensagem"
+      title: "Envie ao(à) @ %{nome de usuário} uma mensagem"
       description: "Eu quero falar com essa pessoa diretamente e pessoalmente sobre o seu post."
       short_description: "Eu quero falar com essa pessoa diretamente e pessoalmente sobre o seu post."
       long_form: "mensagem privada"
@@ -814,8 +815,8 @@ pt_BR:
       self: "Você não tem postagens favoritas; favoritos permitem que você se refira rapidamente a postagens específicas."
       others: "Nenhum favorito."
     no_likes_given:
-      self: "Você não curtiu nenhuma publicação."
-      others: "Sem publicações curtidas."
+      self: "Você não curtiu nenhuma postagem."
+      others: "Nenhuma postagem curtida."
     no_replies:
       self: "Você não respondeu a nenhuma postagem."
       others: "Sem Respostas."
@@ -843,7 +844,7 @@ pt_BR:
       email_title: 'O tópico "%{title}" requer atenção do moderador'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Sua postagem foi sinalizada pela comunidade. Por favor<a href="%{path}">veja suas mensagens</a>.</p>'
+    you_must_edit: '<p>Sua postagem foi sinalizada pela comunidade. Por favor <a href="%{path}">veja suas mensagens</a>.</p>'
     user_must_edit: "<p>Conteúdo sinalizado escondido.</p>"
   ignored:
     hidden_content: "<p>Conteúdo ignorado</p>"
@@ -1347,8 +1348,8 @@ pt_BR:
     max_topics_in_first_day: "Número máximo de tópicos que um usuário pode criar num período de 24 horas após a criação de sua primeira publicação"
     max_replies_in_first_day: "O número máximo de respostas que um usuário está habilitado para criar é de 24 horas após a criação de sua primeira postagem. "
     tl2_additional_likes_per_day_multiplier: "Aumentar limite de likes por dia para tl2 (membros) multiplicando por esse número"
-    tl3_additional_likes_per_day_multiplier: "Aumentar limite de likes por dia para tl3 (regular) multiplicando por esse número"
-    tl4_additional_likes_per_day_multiplier: "Aumentar limite de likes por dia para tl4 (lideres) multiplicando por esse número"
+    tl3_additional_likes_per_day_multiplier: "Aumentar limite de curtidas por dia para tl3 (regular) multiplicando por esse número"
+    tl4_additional_likes_per_day_multiplier: "Aumentar limite de curtidas por dia para tl4 (líderes) multiplicando por esse número"
     num_users_to_silence_new_user: "Se as postagens de um novo usuário receberem um sinal num_spam_flags_to_silence_new_user spam de vários usuários diferentes, oculte todas as postagens e evite postagens futuras. 0 para desabilitar."
     num_tl3_flags_to_silence_new_user: "Se as postagens de um novo usuário obtiverem muitos sinalizadores de num_tl3_users_to_silence_new_user diferentes usuários do nível de confiança 3, oculte todos os posts e evite postagens futuras. 0 para desabilitar."
     num_tl3_users_to_silence_new_user: "Se as postagens de um novo usuário obtiverem sinalizadores num_tl3_flags_to_silence_new_user a partir dos vários usuários diferentes do nível de confiança 3, oculte todas as postagens e evite postagens futuras. 0 para desativar."
@@ -1356,7 +1357,7 @@ pt_BR:
     flag_sockpuppets: "Se um novo usuário responder a um tópico a partir do mesmo endereço IP do usuário que iniciou o tópico, marque ambas as suas postagens como possível spam."
     traditional_markdown_linebreaks: "Use quebras de linhas tradicionais em Markdown, as quais requerem dois espaços à direita para uma quebra de linha."
     enable_markdown_typographer: "Use as regras de tipografia para melhorar a legibilidade do texto: substitua as aspas normais por \"aspas curvas\", (c) (tm) pelos símbolos, - pelo emdash -, etc."
-    enable_markdown_linkify: "Automaticamente tratar texto que se parecer com um link como um link: www.example.com e https://example.com serão vinculados automaticamente"
+    enable_markdown_linkify: "Automaticamente tratar como link textos que se parecem com links: www.example.com e https://example.com serão linkados automaticamente"
     markdown_linkify_tlds: "Lista de domínios de nível superior que são tratados automaticamente como links"
     post_undo_action_window_mins: "Número de minutos permitidos aos usuários para desfazerem uma ação recente em uma publicação (curtir, sinalizar, etc)"
     must_approve_users: "Gerenciadores deverão aprovar novas contas de usuários antes das mesmas serem permitidas o acesso ao site."
@@ -1382,7 +1383,7 @@ pt_BR:
     content_security_policy_collect_reports: "Habilitar a coleta de relatórios de violação de CSP em /csp_reports"
     invalidate_inactive_admin_email_after_days: "As contas de administrador que não visitaram o site neste número de dias precisarão validar novamente seu endereço de e-mail antes de efetuar login. Defina como 0 para desabilitar."
     top_menu: "Determina quais items aparecem na navegação da homepage, e em qual ordem. Exemplo latest|new|unread|categories|top|read|posted|bookmarks"
-    post_menu: "Determine quais itens aparecem no menu de postagem e em qual ordem. Exemplo como | editar | sinalizar | excluir | compartilhar | marcador | resposta"
+    post_menu: "Determine quais itens aparecem no menu de postagem e em qual ordem. Exemplo: like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Os items de menu a ser escondidos por padrão no menu de postagem, a menos que uma elipse de expansão seja clicada."
     share_links: "Determine quais itens aparecem na caixa de diálogo de compartilhamento, e em qual ordem."
     site_contact_username: "Um nome de usuário válido de membro da equipe para enviar todas mensagens automáticas por ele. Se deixado em branco a conta padrão System será utilizada."
@@ -1487,7 +1488,7 @@ pt_BR:
     rate_limit_create_post: "Após postar, os usuários devem aguardar (n) segundos antes de criar um outro post."
     rate_limit_new_user_create_topic: "Após criar um tópico, novos usuários devem aguardar (n) segundos antes de criar um outro tópico."
     rate_limit_new_user_create_post: "Após postar, novos usuários devem aguardar (n) segundos antes de criar um outro post."
-    max_likes_per_day: "Número máximo de likes por usuário por dia."
+    max_likes_per_day: "Número máximo de curtidas por usuário por dia."
     max_flags_per_day: "Número máximo de sinalizações por usuário por dia."
     max_bookmarks_per_day: "Número máximo de novos favoritos por usuário por dia."
     max_edits_per_day: "Número máximo de edições que um usuário pode fazer por dia."
@@ -1538,8 +1539,8 @@ pt_BR:
     tl2_requires_read_posts: "Quantas postagens um usuário deve ler antes de ser promovido a nível de confiança 2."
     tl2_requires_time_spent_mins: "Quantos minutos um usuário deve ler posts antes de ser promovido a nível de confiança 2."
     tl2_requires_days_visited: "Quantos dias um usuário deve visitar o site antes de ser promovido a nível de confiança 2."
-    tl2_requires_likes_received: "Quantos likes um usuário deve receber antes de ser promovido a nível de confiança 2."
-    tl2_requires_likes_given: "Quantos likes um usuário deve dar antes de ser promovido a nível de confiança 2."
+    tl2_requires_likes_received: "Quantas curtidas um usuário deve receber antes de ser promovido a nível de confiança 2."
+    tl2_requires_likes_given: "Quantas curtidas um usuário deve dar antes de ser promovido a nível de confiança 2."
     tl2_requires_topic_reply_count: "Quantos tópicos um usuário deve responder antes de ser promovido a nível de confiança 2."
     tl3_time_period: "Período de tempo (em dias) requerido para o Nível de Confiança 3"
     tl3_requires_days_visited: "Número mínimo de dias que um usuário precisa ter visitado o site nos últimos (tl3 período de tempo) dias para se qualificar para promoção ao nível de confiança 3. Defina um período de tempo maior que tl3 para desabilitar as promoções para tl3. (0 ou superior)"
@@ -1552,8 +1553,8 @@ pt_BR:
     tl3_requires_posts_read_all_time: "O mínimo total de postagens que um usuário precisa ter lido para se qualificar a promoção ao nível de confiança 3."
     tl3_requires_max_flagged: "O usuário não deve ter mais de x postagens sinalizadas por x usuários diferentes nos últimos (tl3 período de tempo) dias para se qualificar para promoção ao nível de confiança 3, onde x é o valor dessa configuração. (0 ou superior)"
     tl3_promotion_min_duration: "O número mínimo de dias que uma promoção ao nível 3 dura antes que um usuário possa ser rebaixado novamente ao nível de confiança 2."
-    tl3_requires_likes_given: "O número mínimo de curtidas que deve ser dado no último (tl3 período de tempo) dias para se qualificar para a promoção para o nível de confiança 3."
-    tl3_requires_likes_received: "O número mínimo de curtidas que devem ser recebidas no último (tl3 período de tempo) dias para se qualificarem para a promoção para o nível de confiança 3."
+    tl3_requires_likes_given: "O número mínimo de curtidas que deve ser dado nos últimos dias (período de tempo do tl3) para se qualificar para a promoção para o nível de confiança 3."
+    tl3_requires_likes_received: "O número mínimo de curtidas que devem ser recebidas nos últimos dias (período de tempo do tl3) para se qualificarem para a promoção para o nível de confiança 3."
     tl3_links_no_follow: "Não remover rel=nofollow de links postados por usuários do nível de confiança 3."
     trusted_users_can_edit_others: "Permitir que usuários com altos níveis de confiança editem conteúdo de outros usuários"
     min_trust_to_create_topic: "O nível de confiança mínimo necessário para criar um novo tópico."
@@ -1606,16 +1607,16 @@ pt_BR:
     history_hours_low: "Uma postagem editada dentro deste tanto de horas tem o indicador de edição levemente realçado."
     history_hours_medium: "Uma postagem editada dentro deste tanto de horas tem o indicador de edição moderadamente realçado."
     history_hours_high: "Uma postagem editada dentro deste tanto de horas tem o indicador de edição fortemente realçado."
-    topic_post_like_heat_low: "Após a proporção likes:post exceder esta proporção, o campo de contagem de posts é levemente realçado."
-    topic_post_like_heat_medium: "Após a proporção likes:post exceder esta proporção, o campo de contagem de posts é moderadamente realçado."
-    topic_post_like_heat_high: "Após a proporção likes:post exceder esta proporção, o campo de contagem de posts é fortemente realçado."
+    topic_post_like_heat_low: "Após a proporção curtidas:postagens exceder esta proporção, o campo de contagem de postagens é levemente realçado."
+    topic_post_like_heat_medium: "Após a proporção curtidas:postagens exceder esta proporção, o campo de contagem de postagens é moderadamente realçado."
+    topic_post_like_heat_high: "Após a proporção curtidas:postagens exceder esta proporção, o campo de contagem de postagens é fortemente realçado."
     faq_url: "Se você possui um FAQ hospedado em outro local e que você queira usar, forneça a URL completa aqui."
     tos_url: "Se você tem um documento de Termos de Serviço hospedado em algum outro local que você queira usar, forneça a URL completa aqui."
     privacy_policy_url: "Se você tem um documento de Política de Privacidade hospedado em algum outro local que você queira usar, forneça a URL completa aqui."
     log_anonymizer_details: "Se deseja manter os detalhes de um usuário no log depois de ser anonimizado. Ao cumprir com o GDPR, você precisará desativá-lo."
     newuser_spam_host_threshold: "Quantas vezes um novo usuário pode postar um link para o mesmo host em suas postagens `newuser_spam_host_threshold` antes de ser considerado spam."
     white_listed_spam_host_domains: "Uma lista de domínios excluídas do teste de spam. Usuários novos nunca serão restringidos de criar posts com links para estes domínios."
-    staff_like_weight: "Qual o fator de ênfase extra a dar para likes da staff."
+    staff_like_weight: "Qual o fator de ênfase extra a dar para curtidas da staff."
     topic_view_duration_hours: "Conte uma nova visualização de tópico uma vez por IP / Usuário a cada N horas"
     user_profile_view_duration_hours: "Conte uma nova visualização de perfil de usuário uma vez por IP / Usuário a cada N horas"
     levenshtein_distance_spammer_emails: "Ao equiparar emails de spammers, o número da diferença de caracteres que ainda assim irá permitir uma equiparação imprecisa."
@@ -1819,7 +1820,7 @@ pt_BR:
     max_tags_in_filter_list: "Número máximo de tags para mostrar no menu suspenso do filtro. As tags mais usadas serão mostradas."
     tags_sort_alphabetically: "Mostrar as tags em ordem alfabética. O padrão é mostrar em ordem de popularidade."
     tags_listed_by_group: "Listar etiquetas por grupo de etiquetas na <a href='%{base_path}/tags' target='_blank'>página de Etiquetas</a>."
-    tag_style: "Estilo visual para crachás."
+    tag_style: "Estilo visual para emblemas."
     allow_staff_to_tag_pms: "Permitir que os membros da equipe marquem qualquer mensagem pessoal"
     min_trust_level_to_tag_topics: "Nível de confiança mínimo necessário para marcar tópicos"
     suppress_overlapping_tags_in_list: "Se as tags corresponderem a palavras exatas em títulos de tópicos, não mostre a tag"
@@ -2016,7 +2017,7 @@ pt_BR:
     missing_user_field: "Você não completou todos campos de usuário"
     auth_complete: "A autenticação está completa."
     click_to_continue: "Clique aqui para continuar."
-    already_logged_in: "Ops, parece que você está tentando aceitar um convite para outro usuário. Se você não está%{current_user}, por favor, saia e tente novamente."
+    already_logged_in: "Ops, parece que você está tentando aceitar um convite para outro usuário. Se você não é %{current_user}, por favor, saia e tente novamente."
     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: "Por favor, insira um dos seus códigos de backup:"
@@ -2118,32 +2119,32 @@ pt_BR:
       %{invite_link}
   invite_forum_mailer:
     title: "Convidar remetente do Fórum"
-    subject_template: "%{inviter_name} convidou você para se juntar à %{site_domain_name}"
+    subject_template: "%{inviter_name} convidou você para se cadastrar em %{site_domain_name}"
     text_body_template: |
-      %{inviter_name} convidou você para se juntar
+      %{inviter_name} convidou você para se cadastrar em
 
       > **%{site_title}**
       >
       > %{site_description}
 
-      Se te interessou, clique no link abaixo:
+      Se estiver interessado, clique no link abaixo:
 
       %{invite_link}
   custom_invite_forum_mailer:
     title: "Convite personalizado de remetente do fórum"
-    subject_template: "%{inviter_name}convidou você a se juntar%{site_domain_name}"
+    subject_template: "%{inviter_name} convidou você para se cadastrar em %{site_domain_name}"
     text_body_template: |
-      %{inviter_name} convidou você a se juntar
+      %{inviter_name} convidou você para se cadastrar em
 
       > **%{site_title}**
       >
       > %{site_description}
 
-      com essa nota
+      com essa mensagem
 
       > %{user_custom_message}
 
-      Se está interessado, clique no link abaixo:
+      Se estiver interessado, clique no link abaixo:
 
       %{invite_link}
   invite_password_instructions:
@@ -2271,7 +2272,7 @@ pt_BR:
       title: "Usuário de boas-vindas"
       subject_template: "Bem-vindo ao %{site_name}!"
       text_body_template: |
-        obrigado por se juntar à %{site_name}, e bem-vindo!
+        Obrigado por se cadastrar em %{site_name}, e seja bem-vindo!
 
         %{new_user_tips}
 
@@ -2493,10 +2494,6 @@ pt_BR:
     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"
-      text_body_template: |
-        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulada %{former_title}) não funcionou.
-
-        Nenhum dos endereços de e-mail de destino é reconhecido ou o cabeçalho do ID da mensagem no e-mail foi modificado. Por favor, certifique-se de que você está enviando para o endereço de e-mail correto fornecido pela equipe.
     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"
@@ -2617,15 +2614,15 @@ pt_BR:
         Para orientações adicionais, consulte nossas [diretrizes da comunidade](%{base_url}/diretrizes).
     user_automatically_silenced:
       title: "Usuário Silenciado Automaticamente"
-      subject_template: "Novo usuário %{username} silenciado por bandeiras da comunidade"
+      subject_template: "Novo usuário %{username} silenciado por sinalizações da comunidade"
       text_body_template: |
         Está é uma mensagem automática.
 
-        O novo usuário [%{username}](%{user_url}) foi automaticamente silenciado porque vários usuários sinalizaram %{username}seus post(s).
+        O novo usuário [%{username}](%{user_url}) foi automaticamente silenciado porque vários usuários sinalizaram suas postagens.
 
-        Por favor [revise as sinalizações](%{base_url}/admin/flags). Se %{username} foi silenciada incorretamente na postagem, clique no botão de inatividade na [página de administração desse usuário](%{user_url}).
+        Por favor [revise as sinalizações](%{base_url}/admin/flags). Se o usuário %{username} tiver sido incorretamente silenciado de postar, clique no botão de remover silenciamento na [página de administração desse usuário](%{user_url}).
 
-        Este limite pode ser alterado através das configurações do site `silence_new_user`
+        Este limite pode ser alterado através da configuração do site `silence_new_user`.
     spam_post_blocked:
       title: "Postagem de spam bloqueada"
       subject_template: "Novo usuário%{username} postagens bloqueadas devido a links repetidos"
@@ -2638,7 +2635,7 @@ pt_BR:
 
         Isto pode ser modificado através das configurações do site `newuser_spam_host_threshold` e `white_listed_spam_host_domains`. Considere adicionar %{domains} à lista de permissões, se eles deviam ser isentos.
     unsilenced:
-      title: "Não silenciado"
+      title: "Silenciamento removido"
       subject_template: "Conta não está mais em espera"
       text_body_template: |
         Olá,
@@ -2672,11 +2669,11 @@ pt_BR:
       title: "Você é um novo usuário do mês!"
       subject_template: "Você é um novo usuário do mês!"
       text_body_template: |
-        Parabéns, você ganhou o prêmio ** Novo Usuário do Mês para %{month_year}**. :troféu:
+        Parabéns, você ganhou o prêmio **Novo Usuário do Mês de %{month_year}**. :trophy:
 
-        Este prêmio é concedido apenas a dois novos usuários por mês e ficará permanentemente visível na [página de crachás].(%{url}).
+        Este prêmio é concedido apenas a dois novos usuários por mês e ficará permanentemente visível na [página de emblemas].(%{url}).
 
-        Você rapidamente se tornou um membro valioso da nossa comunidade. Obrigado por se juntar e manter o excelente trabalho!
+        Você rapidamente se tornou um membro valioso da nossa comunidade. Obrigado por se cadastrar e manter o excelente trabalho!
     queued_posts_reminder:
       title: "Lembrete de postagens enfileiradas"
       subject_template:
@@ -2758,7 +2755,7 @@ pt_BR:
       %{topic_url}
     user_invited_to_private_message_pm_group:
       title: "Grupo Convidado do Usuário para MP"
-      subject_template: "[%{email_prefix}] %{username} convidou @%{group_name} para a mensagem'%{topic_title}'"
+      subject_template: "[%{email_prefix}] %{username} convidou @%{group_name} para a mensagem '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -2767,7 +2764,7 @@ pt_BR:
         %{respond_instructions}
     user_invited_to_private_message_pm:
       title: "Usuário Convidado para MP"
-      subject_template: "[%{email_prefix}] %{username}convidou você para uma mensagem '%{topic_title}'"
+      subject_template: "[%{email_prefix}] %{username} convidou você para uma mensagem '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -3256,11 +3253,14 @@ pt_BR:
 
       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."
     editor:
       name: Editor
-      description: Primeira edição de mensagem
+      description: Primeira edição de postagem
       long_description: |
-        Esse selo é concedido na primeira vez que você edita uma de suas postagens. Embora você não possa editar suas postagens para sempre, a edição é incentivada. Você pode melhorar a formatação, corrigir pequenos erros ou adicionar qualquer coisa que tenha perdido quando postou originalmente. Edite para tornar suas postagens ainda melhores!
+        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!
     wiki_editor:
       name: Editor de Wiki
       description: Primeira edição de wiki
@@ -3270,22 +3270,22 @@ pt_BR:
       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"
       long_description: |
-        Este selo é concedido quando você atinge o nível de confiança 1. Obrigado por ficar por perto e ler alguns tópicos para aprender sobre o que é a nossa comunidade. Novas restrições de usuários foram levantadas; você recebeu todas as habilidades essenciais da comunidade, como mensagens pessoais, sinalização, edição de wiki e a capacidade de postar várias imagens e links.
+        Este emblema é concedido quando você atinge o nível de confiança 1. Obrigado por ficar por perto e ler alguns tópicos para aprender sobre o que é a nossa comunidade. As restrições de usuário novo foram removidas; você recebeu todas as habilidades essenciais da comunidade, como mensagens pessoais, sinalização, edição de wiki e a 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> convites, mensagens de grupo, mais curtidas"
       long_description: |
-        Este selo é concedido quando você atinge o nível de confiança 2. Obrigado por participar durante um período de semanas para realmente se juntar à nossa comunidade. 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 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.
     regular:
       name: Habitual
-      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Concedido</a>recategorize, renomeie, links seguidos, wiki, mais curtidas"
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Concedido</a> recategorizar, renomear, links seguidos, wiki, mais curtidas"
       long_description: |
-        Este crachá é concedido quando você atinge o nível de confiança 3. Obrigado por ser uma parte regular de nossa comunidade durante um período de meses. Agora você é um dos leitores mais ativos e um colaborador confiável que torna nossa comunidade excelente. Agora você pode recategorizar e renomear tópicos, aproveitar os sinalizadores de spam mais poderosos, acessar uma área de espera privada e também aproveitar muito mais curtidas por dia.
+        Este emblema é concedido quando você atinge o nível de confiança 3. Obrigado por ser uma parte constante de nossa comunidade durante meses. Agora você é um dos leitores mais ativos e um colaborador confiável que torna nossa comunidade excelente. Agora você pode recategorizar e renomear tópicos, utilizar os sinalizadores de spam mais poderosos, acessar uma área de lounge privada e também aproveitar muito mais curtidas por dia.
     leader:
       name: Líder
-      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Concedido</a> editar global, pin, fechar, arquivar, dividir e mesclar, mais curtidas"
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Concedido</a> editar globalmente, fixar, fechar, arquivar, dividir e mesclar, mais curtidas"
       long_description: |
-        Esse selo é concedido quando você atinge o nível de confiança 4. Você é um líder nessa comunidade, conforme selecionado pela equipe, e você define um exemplo positivo para o restante da comunidade em suas ações e palavras aqui. Você pode editar todas as postagens, realizar ações comuns de moderador de tópicos, como pin, close, unlist, archive, split e merge.
+        Esse emblema é concedido quando você atinge o nível de confiança 4. Você é um líder nessa comunidade, conforme selecionado pela equipe, e você dá o exemplo positivo para o restante da comunidade com suas ações e palavras aqui. Você pode editar todas as postagens, realizar ações comuns de moderador de tópicos, como fixar, fechar, retirar de listagem, arquivar, dividir e mesclar.
     welcome:
       name: Bem-Vindo
       description: Recebeu uma curtida
@@ -3293,139 +3293,139 @@ pt_BR:
         Este emblema é concedido quando você recebe sua primeira curtida numa postagem. Parabéns, você postou algo que sua comunidade achou interessante, legal ou útil!.
     autobiographer:
       name: Autobiógrafo
-      description: "Preencher <a href=\"%{base_uri}/my/preferences/profile\">Perfil</a> informação"
+      description: "Preencheu informações de <a href=\"%{base_uri}/my/preferences/profile\">Perfil</a>"
       long_description: |
-        Este crachá é concedido para preenchimento <a href="%{base_uri}/my/preferences/profile">seu perfil de usuário</a> e selecionando 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> 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!
     anniversary:
       name: Aniversário
       description: "Membro ativo por um ano, postou ao menos uma vez"
       long_description: |
-        Este selo é concedido quando você faz parte de um ano com pelo menos uma postagem nesse ano. Obrigado por ficar por aqui e contribuir para 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 nesse ano. Obrigado por ficar por aqui e contribuir com a nossa comunidade. Nós não poderíamos fazer isso sem você.
     nice_post:
       name: Resposta Interessante
       description: Recebeu 10 curtidas em uma resposta
       long_description: |
-        Esse selo é concedido quando sua resposta recebe 10 curtidas. Sua resposta causou uma boa impressão na comunidade e ajudou a levar a conversa adiante.
+        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.
     good_post:
       name: Boa Resposta
       description: Recebeu 25 curtidas em uma resposta
       long_description: |
-        Esse selo é concedido quando sua resposta recebe 25 curtidas. Sua resposta foi excepcional e tornou a conversa muito mais interessante.
+        Esse emblema é concedido quando sua resposta recebe 25 curtidas. Sua resposta foi excepcional e tornou a conversa muito mais interessante.
     great_post:
       name: Excelente Resposta
       description: Recebeu 50 curtidas em uma resposta
       long_description: |
-        Esse selo é concedido quando sua resposta recebe 50 curtidas. Uau! Sua resposta foi inspiradora, fascinante, hilariante ou perspicaz e a comunidade adorou!
+        Esse emblema é concedido quando sua resposta recebe 50 curtidas. Uau! Sua resposta foi inspiradora, fascinante, hilária ou perspicaz e a comunidade adorou!
     nice_topic:
       name: Tópico Interessante
       description: Recebeu 10 curtidas em um tópico
       long_description: |
-        Esse selo é concedido quando seu tópico recebe 10 curtidas. Você começou uma conversa interessante que a comunidade gostou.
+        Esse emblema é concedido quando seu tópico recebe 10 curtidas. Você começou uma conversa interessante que a comunidade gostou.
     good_topic:
       name: Bom Tópico
       description: Recebeu 25 curtidas em um tópico
       long_description: |
-        Esse selo é concedido quando seu tópico recebe 25 curtidas. Você lançou uma conversa vibrante em que a comunidade se reuniu.
+        Esse emblema é concedido quando seu tópico recebe 25 curtidas. Você lançou uma conversa vibrante em que a comunidade se reuniu.
     great_topic:
       name: Excelente Tópico
       description: Recebeu 50 curtidas em um tópico
       long_description: |
-        Esse selo é concedido quando seu tópico recebe 50 curtidas. Você iniciou uma conversa fascinante e a comunidade amou a discussão animada que resultou!
+        Esse emblema é concedido quando seu tópico recebe 50 curtidas. Você iniciou uma conversa fascinante e a comunidade amou a discussão animada que resultou!
     nice_share:
       name: Compartilhamento Interessante
       description: Compartilhou uma postagem com 25 visitas únicas
       long_description: |
-        Este selo é concedido para compartilhar um link que foi clicado por 25 visitantes externos. Obrigado por divulgar nossas discussões e esta comunidade.
+        Este emblema é concedido por ter compartilhado um link que foi clicado por 25 visitantes externos. Obrigado por divulgar nossas discussões e esta comunidade.
     good_share:
       name: Bom Compartilhamento
       description: Compartilhou uma postagem com 300 visitas únicas
       long_description: |
-        Esse selo é concedido para compartilhar um link que foi clicado por 300 visitantes externos. Bom trabalho! Você mostrou uma ótima discussão para várias pessoas novas e ajudou essa comunidade a crescer.
+        Esse emblema é concedido por compartilhar um link que foi clicado por 300 visitantes externos. Bom trabalho! Você mostrou uma ótima discussão para várias pessoas novas e ajudou a comunidade a crescer.
     great_share:
       name: Excelente Compartilhamento
       description: Compartilhou uma postagem com 1000 visitas únicas
       long_description: |
-        Este selo é concedido para compartilhar um link que foi clicado por 1.000 visitantes externos. Uau! Você promoveu uma discussão interessante para um grande público novo e ajudou-nos a crescer em grande escala em nossa comunidade!
+        Este emblema é concedido por compartilhar um link que foi clicado por 1.000 visitantes externos. Uau! Você promoveu uma discussão interessante para um grande público novo e ajudou a nossa comunidade crescer em grande escala!
     first_like:
       name: Primeira Curtida
-      description: Curtiu uma mensagem
+      description: Curtiu uma postagem
       long_description: |
-        Este emblema é concedido na primeira vez que você gostar de uma postagem usando o botão: heart:. Gostar de postagens é uma ótima maneira de mostrar aos outros membros da comunidade que o que eles postaram era interessante, útil, legal ou divertido. Compartilhe o amor!
+        Este emblema é concedido na primeira vez que você curtir uma postagem usando o botão :heart:. Curtir postagens é uma ótima maneira de mostrar aos outros membros da comunidade que o que eles postaram era interessante, útil, legal ou divertido. Compartilhe o amor!
     first_flag:
       name: Primeira Sinalização
-      description: Sinalizou uma mensagem
+      description: Sinalizou uma postagem
       long_description: |
-        Este emblema é concedido na primeira vez que você sinaliza uma postagem. Sinalizar é como todos nós ajudamos a manter este local agradável para todos. Se você perceber qualquer postagem que exija atenção do moderador por qualquer motivo, não hesite em sinalizar. Se você encontrar um problema,: flag_black: sinalize!
+        Este emblema é concedido na primeira vez que você sinaliza uma postagem. Sinalizar é como todos nós ajudamos a manter este local agradável para todos. Se você perceber qualquer postagem que exija atenção de moderadores por qualquer motivo, não hesite em sinalizar. Se você encontrar um problema, :flag_black: sinalize!
     promoter:
       name: Promotor
       description: Convidou um usuário
       long_description: |
-        Esse selo é concedido quando você convida alguém para participar da comunidade por meio do botão de convite na sua página de usuário ou na parte inferior de um tópico. Convidar amigos que possam estar interessados ​​em discussões específicas é uma ótima maneira de apresentar novas pessoas à nossa comunidade, então, obrigado!
+        Esse emblema é concedido quando você convida alguém para participar da comunidade por meio do botão de convite na sua página de usuário ou na parte inferior de um tópico. Convidar amigos que possam estar interessados ​​em discussões específicas é uma ótima maneira de apresentar novas pessoas à nossa comunidade, então, obrigado!
     campaigner:
       name: Ativista
       description: Convidou 3 usuários básicos
       long_description: |
-        Este selo é concedido quando você convidou três pessoas que, posteriormente, passaram bastante tempo no site para se tornarem usuários básicos. Uma comunidade vibrante precisa de uma infusão regular de recém-chegados que participem regularmente e adicionem novas vozes às conversas.
+        Este emblema é concedido quando você tiver convidado 3 pessoas que, posteriormente, passarem tempo no site o suficiente para se tornarem usuários básicos. Uma comunidade vibrante precisa de uma infusão constante de recém-chegados que participam regularmente e adicionam novas vozes às conversas.
     champion:
       name: Campeão
       description: Convidou 5 membros
       long_description: |
-        Este selo é concedido quando você convidou cinco pessoas que, posteriormente, passaram bastante tempo no site para se tornarem membros plenos. Uau! Obrigado por expandir a diversidade da nossa comunidade com novos membros!
+        Este emblema é concedido quando você tiver convidado cinco pessoas que, posteriormente, passarem tempo no site o suficiente para se tornarem membros plenos. Uau! Obrigado por expandir a diversidade da nossa comunidade com novos membros!
     first_share:
       name: Primeiro Compartilhamento
-      description: Compartilhou uma mensagem
+      description: Compartilhou uma postagem
       long_description: |
-        Esse selo é concedido na primeira vez que você compartilha um link para uma resposta ou um tópico usando o botão de compartilhamento. Compartilhar links é uma ótima maneira de mostrar discussões interessantes com o resto do mundo e aumentar sua comunidade.
+        Esse emblema é concedido na primeira vez que você compartilha um link para uma resposta ou um tópico usando o botão de compartilhamento. Compartilhar links é uma ótima maneira de mostrar discussões interessantes com o resto do mundo e aumentar sua comunidade.
     first_link:
       name: Primeiro Link
       description: Adicionou um link para outro tópico
       long_description: |
-        Esse selo é concedido na primeira vez que você adiciona um link a outro tópico. A vinculação de tópicos ajuda colegas leitores a encontrar conversas relacionadas interessantes, mostrando as conexões entre os tópicos em ambas as direções. Link livremente!
+        Esse emblema é concedido na primeira vez que você linka para um outro tópico. Linkar tópicos ajuda colegas leitores a encontrar conversas relacionadas interessantes, mostrando as conexões entre os tópicos em ambas as direções. Link livremente!
     first_quote:
       name: Primeira Citação
-      description: Citou uma mensagem
+      description: Citou uma postagem
       long_description: |
-        Esse selo é concedido na primeira vez que você citar uma postagem na sua resposta. Citar partes relevantes de postagens anteriores na sua resposta ajuda a manter as discussões conectadas juntas e no tópico. A maneira mais fácil de citar é destacar uma seção de uma postagem e, em seguida, pressionar qualquer botão de resposta. Cite generosamente!
+        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!
     read_guidelines:
       name: Leu as regras
       description: "Leia as <a href=\"%{base_uri}/guidelines\">diretrizes da comunidade</a>"
       long_description: |
-        Este crachá é 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. Lembre-se sempre de que há outro ser humano, um muito parecido com você, do outro lado da tela. Seja legal!
     reader:
       name: Leitor
       description: Leu todas as respostas em um tópico com mais de 100 respostas
       long_description: |
-        Esse selo é 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 levar a conversas mais interessantes. Quanto mais você lê, melhor a conversa fica. Como gostamos de dizer, a leitura é fundamental! : slight_smile:
+        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:
     popular_link:
       name: Link Popular
       description: Postou um link externo com 50 clicks
       long_description: |
-        Este selo é concedido quando um link compartilhado recebe 50 cliques. Obrigado por postar um link útil que adicionou contexto interessante para a conversa!
+        Este emblema é concedido quando um link que você compartilhou recebe 50 cliques. Obrigado por postar um link útil que adicionou um contexto interessante à conversa!
     hot_link:
-      name: Link Quente
+      name: Link Popular
       description: Postou um link externo com 300 clicks
       long_description: |
-        Esse selo é concedido quando um link compartilhado recebe 300 cliques. Obrigado por postar um link fascinante que levou a conversa adiante e iluminou a discussão!
+        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!
     famous_link:
       name: Link Famoso
       description: Postou um link externo com 1000 clicks
       long_description: |
-        Esse selo é 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!
+        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!
     appreciated:
       name: Agradecido
       description: Teve 20 mensagens curtidas
       long_description: |
-        Esse emblema é concedido quando você recebe ao menos uma curtida em 20 publicações diferentes. A comunidade está gostando das suas contribuições e conversas aqui!
+        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!
     respected:
       name: Respeitado
-      description: Recebeu 2 curtidas em 100 mensagens
+      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.
     admired:
       name: Admirado
-      description: Recebeu 5 curtidas em 300 mensagens
+      description: Recebeu 5 curtidas em 300 postagens
       long_description: |
-        Esse selo é concedido quando você recebe pelo menos cinco curtidas em 300 postagens diferentes. Uau! A comunidade admira suas contribuições freqüentes e de alta qualidade para as conversas aqui.
+        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.
     out_of_love:
       name: Por Amor
       description: "Usou %{max_likes_per_day} curtidas no mesmo dia"
@@ -3443,49 +3443,49 @@ pt_BR:
         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!
     thank_you:
       name: Obrigado
-      description: Teve 20 mensagens curtidas e curtiu 10 mensagens
+      description: Teve 20 postagens curtidas e curtiu 10 postagens
       long_description: |
-        Esse selo é concedido quando você tem 20 postagens curtidas e dá 10 ou mais curtidas em troca. Quando alguém gosta de suas postagens, você encontra tempo para gostar do que os outros estão postando também.
+        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.
     gives_back:
       name: Retribuidor
-      description: Curtiu 100 mensagens e teve 100 mensagens curtidas
+      description: Curtiu 100 postagens e teve 100 postagens curtidas
       long_description: |
-        Esse selo é concedido quando você tem 100 postagens curtidas e dá 100 ou mais curtidas em troca. Obrigado por pagá-lo para a frente!
+        Esse emblema é concedido quando você tem 100 postagens curtidas e dá 100 curtidas ou mais em troca. Obrigado por passar pra frente!
     empathetic:
       name: Empático
-      description: Curtiu 1000 mensagens e teve 500 mensagens curtidas
+      description: Curtiu 1000 mensagens e recebeu 500 curtidas
       long_description: |
-        Esse selo é concedido quando você tem 500 postagens e recebe 1.000 ou mais curtidas em troca. Uau! Você é um modelo de generosidade e apreciação mútua: two_hearts :.
+        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:.
     first_emoji:
       name: Primeiro emoji
       description: Utilizou um emoji em uma publicação
       long_description: |
-        Este emblema é concedido na primeira vez que você adicionar um Emoji à sua postagem: thumbsup :. Emoji permite que você transmita emoção em seus posts, da felicidade: smiley: à tristeza: angustiado: à raiva: irritado: e todo o resto: óculos de sol :. Basta digitar a: (dois pontos) ou pressionar o botão da barra de ferramentas Emoji no editor para selecionar 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, 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:
     first_mention:
       name: Primeira menção
       description: Mencionou um usuário em uma postagem
       long_description: |
-        Este selo é 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 eles saibam sobre sua postagem. Basta começar a digitar @ (no símbolo) para mencionar qualquer usuário ou, se permitido, o grupo - é uma maneira conveniente de chamar a atenção deles 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 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.
     first_onebox:
       name: Primeiro Onebox
       description: Postou um link que foi embutido na mensagem
       long_description: |
-        Esse selo é concedido na primeira vez em que você publica um link em uma linha sozinho, que é automaticamente expandido para uma caixa de ferramentas com um resumo, título e (quando disponível) imagem.
+        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.
     first_reply_by_email:
       name: Primeira Resposta por email
-      description: Respondeu a uma postagem por email
+      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 email :e-mail:.
     new_user_of_the_month:
       name: "Novo usuário do mês"
       description: Contribuições pendentes no primeiro mês
       long_description: |
-        Este selo é concedido para parabenizar dois novos usuários a cada mês por suas excelentes contribuições gerais, conforme a medida de quantas pessoas gostaram de suas postagens e por quem.
+        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.
     enthusiast:
       name: Entusiasta
       description: Visitou 10 dias consecutivos
       long_description: |
-        Este crachá é concedido para visitas de 10 dias consecutivos. Obrigado por ficar com a gente por mais de uma semana!
+        Este emblema é concedido ao visitar durante 10 dias consecutivos. Obrigado por ficar com a gente por mais de uma semana!
     aficionado:
       name: Aficionado
       description: Visitou 100 dias consecutivos
@@ -3495,8 +3495,8 @@ pt_BR:
       name: Devoto
       description: Visitou 365 dias consecutivos
       long_description: |
-        Este selo é concedido para visitas de 365 dias consecutivos. Uau, um ano inteiro!
-    badge_title_metadata: "%{display_name}emblema em %{site_title}"
+        Este emblema é concedido por ter visitado 365 dias consecutivos. Uau, um ano inteiro!
+    badge_title_metadata: "%{display_name} emblema em %{site_title}"
   admin_login:
     success: "Email Enviado"
     errors:
@@ -3579,7 +3579,7 @@ pt_BR:
         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 nisso como seu<b>um parágrafo</b> arremesso de elevador' ou 'declaração de missão'."
+            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>"
             one_paragraph: "Por favor, reduza sua mensagem de boas-vindas para um parágrafo."
       privacy:
         title: "Acesso"
@@ -3689,15 +3689,15 @@ pt_BR:
   joined: "Ingressou"
   discourse_push_notifications:
     popup:
-      mentioned: '%{username} mencionei você em "%{topic}" - %{site_title}'
-      group_mentioned: '%{username} mencionei você em "%{topic}" - %{site_title}'
+      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}'
       posted: '%{username} postou em "%{topic}" - %{site_title}'
       private_message: '%{username} enviou-lhe uma mensagem privada em "%{topic}" - %{site_title}'
-      linked: '%{username}ligado ao seu post de "%{topic}" - %{site_title}'
+      linked: '%{username} linkou para a sua postagem de "%{topic}" - %{site_title}'
       watching_first_post: '%{username} criou um novo tópico "%{topic}" - %{site_title}'
-      confirm_title: "Notificações ativadas -%{site_title}"
+      confirm_title: "Notificações ativadas - %{site_title}"
       confirm_body: "Sucesso! Notificações foram ativadas."
       custom: "Notificação de %{username} em %{site_title}"
   staff_action_logs:
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 0274213569..4a22f56119 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -490,7 +490,7 @@ ro:
       title: "Necorespunzător"
       long_form: "marcat ca necorespunzător"
     notify_user:
-      title: "Trimite-i un mesaj lui @{{username}}"
+      title: "Trimite-i un mesaj lui @%{username}"
       long_form: "utilizator căruia i-a fost trimis mesaj"
       email_title: 'Postarea ta din "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -1189,6 +1189,7 @@ ro:
       category: "Categorii"
       topic: "Rezultate"
       user: "Utilizatori"
+    results_page: "Caută rezultate pentru '%{term}'"
   sso:
     not_found: "Contul tău nu a putut fi găsit. Te rugăm contactează administratorul site-ului."
     account_not_approved: "Contul tău este în așteptarea aprobării. Vei primi un email de notificare imediat ce va fi aprobat."
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 05d647e7f9..0a48738185 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -844,7 +844,7 @@ ru:
       short_description: 'Нарушение <a href="%{base_path}/guidelines">правил сообщества</a>'
       long_form: "отметить как неуместное"
     notify_user:
-      title: "Отправить @{{username}} личное сообщение"
+      title: "Отправить @%{username} личное сообщение"
       description: "Я хочу поговорить с этим человеком напрямую и лично об этом посте."
       short_description: "Я хочу поговорить с этим человеком напрямую и лично об этом посте."
       long_form: "оповещаемый пользователь"
@@ -1944,6 +1944,7 @@ ru:
       must_not_contain_two_special_chars_in_seq: "не должно содержать последовательность 2 и более специальных символов (.-_)"
       must_not_end_with_confusing_suffix: "не должно заканчиваться на .json или .png и т.д., которые могут ввести в заблуждение"
     email:
+      invalid: "Неверный адрес электронной почты."
       not_allowed: "недопустимый почтовый домен. Пожалуйста, используйте другой адрес."
       blocked: "не разрешено."
       revoked: "Отправка e-mail на '%{email}' не будет осуществляться до %{date}."
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index bef9b647f1..6609fb64b4 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -517,7 +517,7 @@ sk:
       title: "Nevhodné"
       long_form: "toto označ ako nevhodné"
     notify_user:
-      title: "Poslať @{{username}} správu"
+      title: "Poslať @%{username} správu"
       long_form: "úživateľovi bola zaslaná správa"
       email_title: 'Váš príspevok v "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -1554,6 +1554,14 @@ sk:
       invites:
         title: "Pozvite členov"
   joined: "Vytvorený"
+  discourse_push_notifications:
+    popup:
+      mentioned: '%{username} Vás zmienil v "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} Vás zmienil v "%{topic}" - %{site_title}'
+      quoted: '%{username} vás citoval v "%{topic}" - %{site_title}'
+      replied: '%{username} vám odpovedal v "%{topic}" - %{site_title}'
+      posted: '%{username} prispel v "%{topic}" - %{site_title}'
+      linked: '%{username} odkázal na váš príspevok z "%{topic}" - %{site_title}'
   reviewables:
     sensitivity:
       disabled: "Vypnuté"
diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml
index b6c20fbb20..c94af00741 100644
--- a/config/locales/server.sl.yml
+++ b/config/locales/server.sl.yml
@@ -539,7 +539,7 @@ sl:
       short_description: 'Kršitev <a href="%{base_path}/guidelines">pravil skupnosti</a>'
       long_form: "prijavljeno kot neprimerno"
     notify_user:
-      title: "Pošlji uporabniku @{{username}} ZS"
+      title: "Pošlji uporabniku @%{username} ZS"
       description: "Rad bi osebno opozoril uporabnika o njegovem prispevku preko zasebnega sporočila."
       short_description: "Rad bi osebno opozoril uporabnika o njegovem prispevku preko zasebnega sporočila."
       long_form: "opozorjen uporabnik"
@@ -721,10 +721,12 @@ sl:
   site_settings:
     avatar_sizes: "Seznam samodejno ustvarjenih velikosti avatarjev."
   search:
+    within_post: "#%{post_number} od %{username}"
     types:
       category: "Kategorije"
       topic: "Rezultati"
       user: "Uporabniki"
+    results_page: "Zadetki iskanja za '%{term}'"
   original_poster: "Originalni avtor"
   most_recent_poster: "Zadnji odgovarja"
   frequent_poster: "Pogosto odgovarja"
@@ -1209,10 +1211,6 @@ sl:
     email_reject_bad_destination_address:
       title: "E-sporočilo zavrnjeno - neustrezen naslov"
       subject_template: "[%{email_prefix}] Napaka e-pošte -- neustrezen naslov"
-      text_body_template: |
-        Žal nam je, ampak vaše e-sporočilo poslano na %{destination} (z naslovom %{former_title}) ni bilo sprejeto.
-
-        Noben od prejemnih e-naslovov ni prepoznan ali je prišlo do spremembe Message-ID vrstice. Zagotovite, da pošiljate na ustrezen e-naslov, ki vam ga je posredovalo osebje.
     email_reject_old_destination:
       title: "E-sporočilo zavrnjeno - star naslov"
       subject_template: "[%{email_prefix}] Napaka e-pošte -- star naslov"
@@ -1731,6 +1729,7 @@ sl:
   image: "slika"
   upload:
     edit_reason: "prenos slik v lokalno kopijo"
+    unauthorized: "Oprostite, datoteka ki ste jo hoteli naložiti ni podprta (podprte pripone:%{authorized_extensions})."
   flag_reason:
     sockpuppet: "Nov uporabnik je ustvaril temo in drugi novi uporabnik z enakim IP naslovom (%{ip_address}) je odgovoril. Preverite <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> nastavitev strani."
   edit_this_page: "Uredi to stran"
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 9ca3607829..588f03e98b 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -349,7 +349,7 @@ sq:
       title: "i papërshtatshëm"
       long_form: "sinjalizoi këtë postim si të papërshtatshëm"
     notify_user:
-      title: "Dërgoji @{{username}} një mesazh"
+      title: "Dërgoji @%{username} një mesazh"
       long_form: "messaged user"
       email_title: 'Postimi juaj në "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -1412,6 +1412,14 @@ sq:
       emoji:
         title: "Emoji"
   joined: "Anëtarësuar"
+  discourse_push_notifications:
+    popup:
+      mentioned: '%{username} ju përmendi në "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} ju përmendi në "%{topic}" - %{site_title}'
+      quoted: '%{username} ju ka cituar në "%{topic}" - %{site_title}'
+      replied: '%{username} ju u përgjigj në "%{topic}" - %{site_title}'
+      posted: '%{username} postoi në "%{topic}" - %{site_title}'
+      linked: '%{username} vendosi një lidhje për postimin tuaj nga "%{topic}" - %{site_title}'
   reviewables:
     actions:
       agree_and_suspend:
diff --git a/config/locales/server.sr.yml b/config/locales/server.sr.yml
index 8b700c2ed4..9b9e75dc0c 100644
--- a/config/locales/server.sr.yml
+++ b/config/locales/server.sr.yml
@@ -260,6 +260,7 @@ sr:
     default_email_previous_replies: "Podrazumevano uključi prethodne odgovore u email poruku"
     default_other_external_links_in_new_tab: "Podrazumevano otvori spoljne veze u novoj kartici "
   search:
+    within_post: "#%{post_number} od %{username}"
     types:
       category: "Kategorije"
       user: "Korisnici"
@@ -268,6 +269,7 @@ sr:
       invalid: "sadrži nevažeće karaktere."
   login:
     admin_not_allowed_from_ip_address: "Ne možete se prijaviti kao admin sa te IP adrese."
+    not_available: "Nije dostupno. Pokušajte %{suggestion}?"
   admin:
     email:
       sent_test: "poslato!"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 1b21697954..14211b141c 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -194,6 +194,8 @@ sv:
     file_should_be_csv: "De uppladdade filerna skall vara i csv format."
     max_rows: "De första %{max_bulk_invites} inbjudningarna har skickats ut. Prova att dela upp filen i mindre delar."
     error: "Det uppstod ett problem när filerna skulle laddas upp. Vad snäll och försök senare igen."
+  invite_link:
+    email_taken: "Den här e-postadressen används redan. Om du redan har ett konto ber vi dig logga in eller återställa lösenordet."
   topic_invite:
     failed_to_invite: "Användaren kan inte bjudas in till detta ämne utan gruppmedlemskap i någon av de följande grupperna: %{group_names}."
     user_exists: "Tyvärr, den användaren har redan bjudits in. Du kan endast bjuda in en användare till ett ämne en gång."
@@ -787,7 +789,7 @@ sv:
       short_description: 'En överträdelse av <a href="%{base_path}/guidelines"> våra riktlinjer</a>'
       long_form: "flagga detta som olämpligt"
     notify_user:
-      title: "Skicka ett meddelande till @{{username}} "
+      title: "Skicka ett meddelande till @%{username} "
       description: "Jag vill prata med den här personen direkt och privat om inlägget. "
       short_description: "Jag vill prata med den här personen direkt och privat om inlägget. "
       long_form: "notifierad användare"
@@ -2158,6 +2160,7 @@ sv:
       must_not_contain_two_special_chars_in_seq: "får inte innehålla en sekvens av 2 eller fler specialtecken (.-_)"
       must_not_end_with_confusing_suffix: "får inte avslutas med ett förvirrande suffix som .json eller .png etc."
     email:
+      invalid: "är ogiltig."
       not_allowed: "är inte en tillåten e-postleverantör. Vänligen använd en annan e-postadress."
       blocked: "är inte tillåtet."
       revoked: "Kommer inte skicka e-post till '%{email}' förrän %{date}."
@@ -2642,7 +2645,7 @@ sv:
     email_reject_bad_destination_address:
       title: "E-posten avslås; dålig mottagaradress"
       subject_template: "[%{email_prefix}] E-postfel -- Okänd mottagaradress"
-      text_body_template: "Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.\n\nInga av mottagaradresserna kunde identifieras, eller har rubrikens meddelande-ID-i e-postmeddelandet ändrats. Var god se till att du skickar till en korrekt e-postadress tillhandahållen av personalen. \n"
+      text_body_template: "Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. \n\nAnvänder du dig av mer än en e-postadress? Svarade du från en annan e-postadress? E-postsvar kräver att du använder samma e-postadress när du svarar. Alternativt kan meddelande-id rubriken i e-postmeddelandet ha modifierats. \n"
     email_reject_old_destination:
       title: "E-posten avslås; gammal destination"
       subject_template: "[%{email_prefix}] E-postfel -- Du försöker svara på ett gammalt meddelande"
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
index 2909a401d5..493f78ca9a 100644
--- a/config/locales/server.sw.yml
+++ b/config/locales/server.sw.yml
@@ -445,7 +445,7 @@ sw:
       title: "Haifai"
       long_form: "imeripotiwa kuwa haiko sawa"
     notify_user:
-      title: "Mtumie @{{username}} ujumbe"
+      title: "Mtumie @%{username} ujumbe"
       description: "Nataka kuongea na huyu mtu moja kwa moja kuhusiana na chapisho lao."
       short_description: "Nataka kuongea na huyu mtu moja kwa moja kuhusiana na chapisho lao."
       long_form: "mtumiaji aliepokea ujumbe"
@@ -1342,10 +1342,6 @@ sw:
     email_reject_bad_destination_address:
       title: "Barua Pepe Kataa Anwani ya Mpokeaji Sio Sawa"
       subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Haijulikani Inapoenda: Anwani"
-      text_body_template: |
-        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination} (jina la %{former_title}) haujafika.
-
-        Barua pepe zote za kupokea ujumbe hazijulikani, au Utambulisho wa Kichwa cha Ujumbe kwenye barua pepe umebadilishwa. Tafadhali hakikisha unatuma kwenda kwa barua pepe zilizotolewa na wasaidizi wetu.
     email_reject_topic_not_found:
       title: "Barua Pepe Kataza Mada Hajapatikana"
       subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Mada Haijapatikana"
@@ -2203,6 +2199,12 @@ sw:
   joined: "Alijiunga"
   discourse_push_notifications:
     popup:
+      mentioned: '%{jina la mtumiaji} amekutaja kwenye "%{mada}" - %{jina la_tovuti}'
+      group_mentioned: '%{jina la mtumiaji} amekutaja kwenye "%{mada}" - %{jina la_tovuti}'
+      quoted: '%{jina la mtumiaji} amekunukulu kwenye "%{mada}" - %{jina la_tovuti}'
+      replied: '%{jina la mtumiaji} amekujibu kwenye "%{mada}" - %{jina la_tovuti}'
+      posted: '%{jina la mtumiaji} amechapisha kwenye "%{mada}" - %{jina la_tovuti}'
+      linked: '%{jina la mtumiaji} ametengeneza kiungo kutoka kwenye "%{mada}" - %{jina la_tovuti}'
       confirm_title: "Taarifa mubashara zimewezeshwa - %{site_title}"
       confirm_body: "Taarifa mubashara zimewezeshwa kikamilifu"
   reviewables:
diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml
index 8cb5e702ab..08dfc30c4e 100644
--- a/config/locales/server.te.yml
+++ b/config/locales/server.te.yml
@@ -583,6 +583,7 @@ te:
       invalid_string_min: "కనీసం %{min} అక్షరాలు ఉండాలి."
       invalid_string_max: "%{max} కంటే ఎక్కువ అక్షరాలు ఉండకూడదు."
   search:
+    within_post: "%{username} నుండి #%{post_number}"
     types:
       category: "వర్గాలు"
       topic: "ఫలితాలు"
diff --git a/config/locales/server.th.yml b/config/locales/server.th.yml
index e3da5d6e19..a9ce6f2d1a 100644
--- a/config/locales/server.th.yml
+++ b/config/locales/server.th.yml
@@ -60,6 +60,9 @@ th:
   next_page: "หน้าถัดไป →"
   prev_page: "← หน้าก่อนหน้า"
   page_num: "หน้า %{num}"
+  bookmarks:
+    reminders:
+      tomorrow: "พรุ่งนี้"
   groups:
     default_names:
       everyone: "ทุกคน"
@@ -112,6 +115,8 @@ th:
       every_hour: "ทุกชั่วโมง"
       daily: "ทุกวัน"
       weekly: "รายสัปดาห์"
+      every_month: "ทุกเดือน"
+      every_six_months: "ทุกหกเดือน"
   reports:
     post_edits:
       labels:
@@ -178,6 +183,7 @@ th:
         user: ผู้ใช้
         location: ที่อยู่
   search:
+    within_post: "#%{post_number} ด้วย %{username}"
     types:
       category: "หมวดหมู่"
       user: "ผู้ใช้"
@@ -186,6 +192,7 @@ th:
       invalid: "มีตัวอักษรที่ไม่สามารถใช้งานได้"
   login:
     admin_not_allowed_from_ip_address: "คุณไม่สามารถเข้าสู่ระบบด้วยผู้ดูแลระบบด้วยไอพีนี้"
+    not_available: "ใช้การไม่ได้ ลอง%{suggestion}?"
   subject_re: "ตอบ: "
   subject_pm: "[PM] "
   user_notifications:
@@ -326,6 +333,14 @@ th:
       emoji:
         title: "Emoji"
   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}'
+      linked: '%{username} ลิงค์โพสของคุณจาก "%{topic}" - %{site_title}'
   reviewables:
     actions:
       delete_spammer:
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 0a6f4f2b2c..576d551f86 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -771,7 +771,7 @@ tr_TR:
       short_description: '<a href="%{base_path}/guidelines">Topluluk kurallarımızın</a> ihlali'
       long_form: "bunu uygunsuz olarak bildirdi"
     notify_user:
-      title: "@{{username}} adlı kullanıcıya ileti gönder"
+      title: "@%{username} adlı kullanıcıya ileti gönder"
       description: "Bu kişiyle doğrudan ve kişisel olarak gönderileri hakkında konuşmak istiyorum."
       short_description: "Bu kişiyle doğrudan ve kişisel olarak gönderileri hakkında konuşmak istiyorum."
       long_form: "ileti gönderilen kullanıcı"
@@ -2583,10 +2583,6 @@ 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, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu.
-
-        Gönderilen adreslerinin hiçbiri bilinmiyor veya e-mail deki mesaj ID başlıkları değiştirildi.Lütfen görevliler tarafından sağlanan doğru e-mail adresine yolladığınızdan emin olun.
     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"
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index 810f57f20a..dabc8e2e60 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -826,7 +826,7 @@ uk:
       short_description: 'Порушення наших <a href="%{base_path}/guidelines">принципів спільноти</a>'
       long_form: "позначити це як неприйнятне"
     notify_user:
-      title: "Відправити @{{username}} повідомлення"
+      title: "Відправити @%{username} повідомлення"
       description: "Я хочу поговорити з автором особисто про цей пост."
       short_description: "Я хочу поговорити з автором особисто про цей пост."
       long_form: "повідомлений користувач"
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index eadee2ddf4..f8e1a75334 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -744,7 +744,7 @@ ur:
       short_description: '<a href="%{base_path}/guidelines">ہماری کمیونٹی کے قواعد و ضوابط</a> کی خلاف ورزی'
       long_form: "اِس کو نامناسب ہونے کے طور پر فلَیگ کیا گیا"
     notify_user:
-      title: "@{{username}} کو ایک پیغام بھیجیں"
+      title: "@%{username} کو ایک پیغام بھیجیں"
       description: "میں اِس شخص سے اُس کی پوسٹ کے بارے میں براہ راست اور ذاتی طور پر بات کرنا چاہتا ہوں۔"
       short_description: "میں اِس شخص سے اُس کی پوسٹ کے بارے میں براہ راست اور ذاتی طور پر بات کرنا چاہتا ہوں۔"
       long_form: "پیغام دیا گیا صارف"
@@ -2464,10 +2464,6 @@ ur:
     email_reject_bad_destination_address:
       title: "ای میل مسترد غلط منزل ایڈریس"
       subject_template: "[%{email_prefix}] ای میل مسئلہ -- نامعلوم کیلئے ایڈریس"
-      text_body_template: |
-        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
-
-        کوئی بھی منزل ای میل ایڈریس معلوم نہیں، یا ای میل میں Message-ID کے ہیڈر میں ترمیم کی گئی ہے۔ براہ کرم یقینی بنائیں کہ سٹاف کی طرف سے فراہم کردہ صحیح ای میل ایڈریس پر آپ بھیج رہے ہیں۔
     email_reject_old_destination:
       title: "ایمیل مسترد پرانی منزل"
       subject_template: "[%{email_prefix}] ایمیل مسئلہ -- آپ ایک پرانی اطلاع پر جواب دینے کی کوشش کر رہے ہیں"
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 24c5e3f3e2..3ab4ab3d6f 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -371,7 +371,7 @@ vi:
       title: "Không thích hợp"
       long_form: "đánh dấu cái này không thích hợp"
     notify_user:
-      title: "Gửi tin nhắn cho @{{username}}."
+      title: "Gửi tin nhắn cho @%{username}."
       long_form: "đã nhắn tin cho thành viên"
       email_title: 'Bài đăng của bạn trong "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -1440,6 +1440,14 @@ vi:
       emoji:
         title: "Emoji"
   joined: "Đã tham gia"
+  discourse_push_notifications:
+    popup:
+      mentioned: '%{username} nhắc đến bạn trong "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} nhắc đến bạn trong "%{topic}" - %{site_title}'
+      quoted: '%{username} trích lời bạn trong "%{topic}" - %{site_title}'
+      replied: '%{username} trả lời cho bạn trong "%{topic}" - %{site_title}'
+      posted: '%{username} gửi bài trong "%{topic}" - %{site_title}'
+      linked: '%{username} liên quan đến bài viết của bạn từ "%{topic}" - %{site_title}'
   reviewables:
     priorities:
       medium: "Trung bình"
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 789509557b..ebf8927920 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -761,7 +761,7 @@ zh_CN:
       short_description: '违反了<a href="%{base_path}/guidelines">我们的社区指引</a>'
       long_form: "标记为不当内容"
     notify_user:
-      title: "给 @{{username}}发送一条私信"
+      title: "给 @%{username}发送一条私信"
       description: "我想亲自与此人私下交流关于该帖子的事情。"
       short_description: "我想亲自与此人私下交流关于该帖子的事情。"
       long_form: "以发送私信给用户"
@@ -1954,7 +1954,7 @@ zh_CN:
         value: "SSO密钥"
   search:
     extreme_load_error: "站点处于高负荷状态，搜索已关闭，稍后再试。"
-    within_post: "#{{post_number}} 由 {{username}}"
+    within_post: "#%{post_number} 由 %{username}"
     types:
       category: "分类"
       topic: "结果"
@@ -2110,6 +2110,7 @@ zh_CN:
       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}”"
@@ -2640,10 +2641,6 @@ zh_CN:
     email_reject_bad_destination_address:
       title: "Email被拒绝：收件人地址不正确"
       subject_template: "[%{email_prefix}] 邮件问题 -- 未知的发至：地址"
-      text_body_template: |
-        我们很抱歉，但是你发送至 %{destination}（名为 %{former_title}）的邮件消息无法发送。
-
-        无法识别目标邮件地址，或是邮件的 Message-ID 头已被修改。请确认在你正在将邮件发送至工作人员提供的正确的地址中。
     email_reject_old_destination:
       title: "邮件拒绝老地址"
       subject_template: "[%{email_prefix}] 邮件问题 - 你正尝试回复旧通知"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index daad849a0e..4527cff87d 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -681,7 +681,7 @@ zh_TW:
       short_description: '違反<a href="%{base_path}/guidelines">我們的社群規範</a>'
       long_form: "投訴為不當內容"
     notify_user:
-      title: "給 @{{username}} 送出一則訊息"
+      title: "給 @%{username} 送出一則訊息"
       description: "我想要針對這位使用者的貼文直接和他們溝通。"
       short_description: "我想要針對這位使用者的貼文直接和他們溝通。"
       long_form: "傳訊給使用者"
@@ -1757,7 +1757,7 @@ zh_TW:
         key: "www.範例.com"
         value: "單一登入服務訊息密鑰"
   search:
-    within_post: "#{{post_number}} 由 {{username}}"
+    within_post: "#%{post_number} 由 %{username}"
     types:
       category: "分類"
       topic: "結果"
@@ -2279,11 +2279,6 @@ zh_TW:
     email_reject_bad_destination_address:
       title: "電子郵件拒絕 不良目的地位址"
       subject_template: "[%{email_prefix}] 電子郵件錯誤 -- 未知的電子郵件地址"
-      text_body_template: |
-        我們非常抱歉，但是你發送至%{destination}（名為%{former_title}） 郵件出問題了。
-
-        寄送的郵件地址無法識別
-        請重新確認電子郵件地址或向管理人員提供的郵件地址發信。
     email_reject_old_destination:
       title: "電子郵件拒絕：舊的目的地（Old Destination）"
       subject_template: "[%{email_prefix}] 電子郵件錯誤 -- 你正在嘗試回覆老舊通知"
@@ -3290,7 +3285,7 @@ zh_TW:
     staff_tag_disallowed: '“%{tag}”只可由管理人員使用。'
     staff_tag_remove_disallowed: '“%{tag}”只可由管理人員刪除。'
     minimum_required_tags:
-      other: "您必須至少選擇{{count}}個標籤"
+      other: "您必須至少選擇%{count}個標籤"
     upload_row_too_long: "CSV檔案每一行應該有一個標籤，可選，標籤後面可以是逗號，然後是標籤群組名稱。"
     forbidden:
       in_this_category: '「%{tag_name}」不能被使用在這個分類'
@@ -3464,7 +3459,7 @@ zh_TW:
       watching_first_post: '%{username}建立了新的討論話題「%{topic}- %{site_title}」'
       confirm_title: "通知已啟用 - %{site_title}"
       confirm_body: "成功! 通知已啟用"
-      custom: "新的通知來自{{username}}在%{site_title}"
+      custom: "新的通知來自%{username}在%{site_title}"
   staff_action_logs:
     not_found: "未找到"
     unknown: "未知的"
diff --git a/plugins/discourse-details/config/locales/client.fr.yml b/plugins/discourse-details/config/locales/client.fr.yml
index 3d9f59970a..5d21c3a96c 100644
--- a/plugins/discourse-details/config/locales/client.fr.yml
+++ b/plugins/discourse-details/config/locales/client.fr.yml
@@ -8,7 +8,7 @@
 fr:
   js:
     details:
-      title: Cacher le texte
+      title: Masquer le texte
     composer:
       details_title: Résumé
-      details_text: "Ce texte sera caché"
+      details_text: "Ce texte sera masqué"
diff --git a/plugins/discourse-local-dates/config/locales/client.fr.yml b/plugins/discourse-local-dates/config/locales/client.fr.yml
index 6ca9b03a53..2908f4e7b0 100644
--- a/plugins/discourse-local-dates/config/locales/client.fr.yml
+++ b/plugins/discourse-local-dates/config/locales/client.fr.yml
@@ -24,9 +24,9 @@ fr:
           timezones_title: Fuseaux horaires à afficher
           timezones_description: Les fuseaux horaires seront utilisés pour afficher les dates en aperçu et en mode recours.
           recurring_title: Périodicité
-          recurring_description: "Définir la périodicité d'un événement. Vous pouvez aussi modifier manuellement l'option de périodicité générée par le formulaire et utiliser une des clefs suivantes : years, quarters, months, weeks, days, hours, minutes, seconds, milliseconds. "
+          recurring_description: "Définir la périodicité d'un événement. Vous pouvez aussi modifier manuellement l'option de périodicité générée par le formulaire et utiliser une des clés suivantes : years, quarters, months, weeks, days, hours, minutes, seconds, milliseconds. "
           recurring_none: Pas de périodicité
-          invalid_date: Date invalide, contrôler que la date et l'heure sont correctes
+          invalid_date: Date invalide, vérifiez que la date et l'heure sont correctes
           date_title: Date
           time_title: Time
           format_title: Format de date
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ca.yml b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
index b930eeab10..3ef605ac78 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ca.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
@@ -117,6 +117,11 @@ ca:
       random_mention:
         reply: |-
           Hola! Per a trobar què puc fer, digueu `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          Ara sé com fer les coses següents:
+
+          `@ %{discobot_username} %{reset_trigger} {name-of-tutorial}`
+          > Inicia un tutorial interactiu només per a vós, en un missatge personal. El `{name-of-tutorial}` pot ser un dels següents: `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
@@ -222,6 +227,8 @@ ca:
       bookmark:
         instructions: |-
           Si voleu saber-ne més, seleccioneu <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> a sota i <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **marqueu com a preferit aquest missatge privat**. Si ho feu, potser tindreu un :gift: més avant!
+        reply: |-
+          Fantàstic! Ara podeu trobar fàcilment com tornar a la nostra conversa privada en qualsevol moment, des de [la pestanya de favorits del vostre perfil](%{bookmark_url}). Només heu de seleccionar la vostra imatge de perfil dalt a la dreta &#8599;
         not_found: |-
           Ui, no veig cap favorit marcat en aquest tema. ¿Heu trobat el marcador de favorits a sota de cada publicació? Utilitzeu "mostra'n més" <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> per a mostrar accions addicionals si calen.
       emoji:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fr.yml b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
index 2688690de1..82281e769b 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -121,6 +121,11 @@ fr:
       random_mention:
         reply: |-
           Bonjour ! Pour voir ce que je peux faire, dites `@%{discobot_username} `.
+        tracks: |-
+          Pour le moment, je sais faire les choses suivantes :
+
+          `@%{discobot_username} %{reset_trigger} {nom-du-tutoriel}`
+          > Débute un tutoriel interactif juste pour vous, via un message direct. `{nom-du-tutoriel}` est l'une des options suivantes : `%{tracks}`.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6`
@@ -137,7 +142,7 @@ fr:
           Malheureusement, je ne suis qu'un robot mal programmé, et je ne comprends pas celle-ci. :frowning:
         track_response: Vous pouvez essayer de nouveau, ou si vous préférez passer cette étape, dites `%{skip_trigger}`. Sinon, pour redémarrer, dites `%{reset_trigger}`.
         second_response: |-
-          Vraiment désolé. Je ne comprend toujours pas .:anguished:
+          Vraiment désolé. Je ne comprends toujours pas .:anguished:
 
           Je suis juste un robot, mais si vous souhaitez contacter une personne réelle, consultez [notre page de contact](%{base_path}/ about).
 
@@ -153,14 +158,14 @@ fr:
 
           - Je ne suis qu'un robot, mais [notre équipe](%{base_uri}/about) est également disponible si vous avez besoin de contacter quelqu'un.
 
-          - Pour des raisons de sécurité, nous avons temporairement limité ce que les nouveaux utilisateurs peuvent faire. Vous obtiendrez de [nouvelles possibilités](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (et des [badges](%{base_uri}/badges)) au fur et à mesure que nous vous connaitrons.
+          - Pour des raisons de sécurité, nous avons temporairement limité ce que les nouveaux utilisateurs peuvent faire. Vous obtiendrez de [nouvelles possibilités](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (et des [badges](%{base_uri}/badges)) au fur et à mesure que nous vous connaîtrons.
 
           - Nous croyons en [un comportement communautaire civilisé](%{base_uri}/guidelines) de tout temps.
       onebox:
         instructions: |-
           Maintenant, pouvez-vous partager l'un de ces liens avec moi ? Répondez avec **un lien sur une ligne vide**, et il sera automatiquement transformé pour inclure un astucieux résumé.
 
-          Pour copier un lien, tapez et maintenant appuyé sur mobile, ou utilisez le clic droit de votre dispositif de pointage (souris) :
+          Pour copier un lien, restez appuyé sur mobile, ou utilisez le clic droit de votre souris :
 
           <https://fr.wikipedia.org/wiki/Jeu_de_mots>
           <https://fr.wikipedia.org/wiki/Liste_de_morts_insolites>
@@ -181,7 +186,7 @@ fr:
 
           Si vous l'aimez (et qui n'aime pas les licornes ?) appuyez sur le bouton _J'aime_ :heart: sous ce message pour me le faire savoir.
 
-          Pouvez-vous **répondre avec une image ?** N'importe laquelle fera l'affaire ! Glissez et déposer, appuyez sur le bouton d'envoi d'images, ou copiez juste son lien.
+          Pouvez-vous **répondre avec une image ?** N'importe laquelle fera l'affaire ! Glissez et déposez, appuyez sur le bouton d'envoi d'images, ou copiez juste son lien.
         reply: |-
           Sympa la photo ! – J'ai appuyé sur le bouton :heart: J'aime pour que vous sachiez au combien je l'apprécie. :heart_eyes:
         like_not_found: |-
@@ -200,7 +205,7 @@ fr:
 
           - Ou, appuyez sur le bouton<kbd><b>G</b></kbd> ou <kbd><i>I</i></kbd> dans l'éditeur
         reply: |-
-          Bon travail ! Le HTML et le BBCode fonctionnent aussi pour le formatage – pour en savoir plus, [essayez ce tutoriel](http://commonmark.org/help) :nerd:
+          Bon travail ! Le HTML et le BBCode fonctionnent aussi pour la mise en forme – pour en savoir plus, [essayez ce tutoriel](http://commonmark.org/help) :nerd:
         not_found: |-
           Aww, je n'ai pas trouvé de mise en page dans votre réponse. :pencil2:
 
@@ -215,7 +220,7 @@ fr:
           >
           > Certaines personnes ont un chemin avec des mots, et d'autres personnes ... oh, euh, pas de chemin.
 
-          Sélectionnez le texte de votre &uarr; citation préférée, et appuyez sur bouton **Citer** qui apparait sur votre sélection - ou le bouton **Répondre** sous ce message.
+          Sélectionnez le texte de votre &uarr; citation préférée, et appuyez sur bouton **Citer** qui apparaît sur votre sélection - ou le bouton **Répondre** sous ce message.
 
           Sous cette citation, ajoutez un ou deux mots pour expliquer votre choix, je suis curieux ! :thinking:
         reply: |-
@@ -223,10 +228,12 @@ fr:
         not_found: |-
           Hmm je n'ai pas l'impression que vous m'ayez cité dans votre réponse ?
 
-          Sectionner n'importe quel texte dans mon message fera apparaitre le bouton <kbd>**Citer**</kbd>. Et appuyer sur "Répondre" avec du texte sélectionné fonctionnera également ! Pouvez-vous essayer de nouveau ?
+          Sélectionner n'importe quel texte dans mon message fera apparaître le bouton <kbd>**Citer**</kbd>. Et appuyer sur "Répondre" avec du texte sélectionné fonctionnera également ! Pouvez-vous essayer de nouveau ?
       bookmark:
         instructions: |-
           Si vous souhaitez en savoir plus, sélectionnez <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> en dessous et <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **ajouter ce message direct aux signets**. Si vous le faites, il pourrait y avoir un :gift: dans le futur !
+        reply: |-
+          Excellent ! Maintenant, vous pouvez facilement retrouver notre conversation privée à tout moment, à partir de [l'onglet signet sur votre profil](%{bookmark_url}). Sélectionnez juste votre photo de profil dans le coin en haut à droite &#8599;
         not_found: |-
           Uh oh, je ne vois aucun signet sur ce sujet ! Avez-vous trouvé le bouton signet sous chaque message ? Utilisez le bouton Afficher plus <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> pour dévoiler d'autres actions si nécessaire.
       emoji:
@@ -270,18 +277,18 @@ fr:
           [Notre équipe](%{base_uri}/groups/staff) sera notifié de façon privée de votre signalement. Si assez de membres de la communauté signalent un message, il sera automatiquement masqué par précaution.
           (Puisque je n'ai pas réellement écrit un article méchant :ange: j'ai anticipé et j'ai enlevé le signalement pour le moment.)
         not_found: |-
-          Oh non, mon méchant message n'a pas encore été signalé. :worried: Pouvez-vous le signaler comme inapproprié en utilisant le **drapeau** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> ? N'oubliez pas d'utiliser le bouton Afficher plus<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> pour afficher plus d'actions pour chaque message.
+          Oh non, mon méchant message n'a pas encore été signalé. :worried: Pouvez-vous le signaler comme inapproprié en utilisant le **drapeau** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> ? N'oubliez pas d'utiliser le bouton <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> pour afficher plus d'actions pour chaque message.
       search:
         instructions: |-
           _psst_ … J'ai caché une surprise dans ce sujet. Si vous aimez les challenges, sélectionnez **l’icône de recherche** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> en haut à droite &#8599; pour la trouver.
 
           Essayer de chercher le terme "capy​&#8203;bara" dans ce sujet.
         hidden_message: |-
-          Comment avez-vous manqué ce capybara? :clin d&#39;œil:
+          Comment avez-vous manqué ce capybara ? :clin d&#39;œil:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
 
-          Avez-vous remarqué que vous êtes maintenant de retour au début? Nourrissez ce pauvre capybara affamé en **répondant avec l&#39;emoji `%{search_answer}` ** et vous serez automatiquement conduit à la fin.
+          Avez-vous remarqué que vous êtes maintenant de retour au début ? Nourrissez ce pauvre capybara affamé en **répondant avec l&#39;emoji `%{search_answer}` ** et vous serez automatiquement conduit à la fin.
         reply: |-
           Vous l'avez trouvé :tada:
 
@@ -314,17 +321,17 @@ fr:
       edit:
         bot_created_post_raw: "@%{discobot_username} est, de loin, le robot le plus cool que je connaisse :wink:"
         instructions: |-
-          Tout le monde fait des erreurs. Mais ne vous inquiétez pas, vous pouvez toujours éditer vos messages pour les réparer !
+          Tout le monde fait des erreurs. Mais ne vous inquiétez pas, vous pouvez toujours modifier vos messages pour les réparer !
 
-          Pouvez-vous commencer par **éditer** le message que je viens de créer en votre nom ?
+          Pouvez-vous commencer par **modifier** le message que je viens de créer en votre nom ?
         not_found: |-
-          Il semble que vous n'avez pas encore éditer le [message](%{url}) que j'ai créé pour vous. Pouvez-vous essayer de nouveau ?
+          Il semble que vous n'avez pas encore modifié le [message](%{url}) que j'ai créé pour vous. Pouvez-vous essayer de nouveau ?
 
-          Utilisez l’icône <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16">pour afficher l'éditeur.
+          Utilisez l’icône <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16"> pour afficher l'éditeur.
         reply: |-
           Bon boulot !
 
-          Remarquez que les éditions après 5 minutes seront considérés comme des modifications publiques, et qu'un petit crayon apparaitra dans le coin haut droit avec le nombre de modification.
+          Remarquez que les modifications après 5 minutes seront considérées comme des modifications publiques, et qu'un petit crayon apparaîtra dans le coin haut droit avec le nombre de modification.
       delete:
         instructions: |-
           Si vous souhaitez retirer un message que vous avez écrit, vous pouvez le supprimer.
@@ -405,11 +412,11 @@ fr:
 
           [details=Sélectionnez ceci pour voir comment cela fonctionne !]
           1. Sélectionnez la roue <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> dans l'éditeur.
-          2. Sélectionnez "Cacher le texte".
-          3. Éditez le résumé et ajoutez votre contenu.
+          2. Sélectionnez « Masquer le texte ».
+          3. Modifiez le résumé et ajoutez votre contenu.
           [/details]
 
-          Pouvez-vous utiliser la roue <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">dans l'éditeur pour ajouter une section de détails dans votre prochaine réponse ?
+          Pouvez-vous utiliser la roue <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> dans l'éditeur pour ajouter une section de détails dans votre prochaine réponse ?
         not_found: |-
           Des soucis pour créer le widget de détail ? Essayez d'inclure le texte suivant dans votre prochaine réponse :
 
diff --git a/plugins/poll/config/locales/client.ca.yml b/plugins/poll/config/locales/client.ca.yml
index fcdb125d56..48325e55de 100644
--- a/plugins/poll/config/locales/client.ca.yml
+++ b/plugins/poll/config/locales/client.ca.yml
@@ -24,6 +24,18 @@ ca:
           title: "Els resultats es mostraran una vegada <strong>tancada</strong> la votació."
         staff:
           title: "Els resultats només es mostren als membres de l'<strong>equip responsable</strong>."
+      multiple:
+        help:
+          at_least_min_options:
+            one: "Trieu almenys <strong>%{count}</strong> opció."
+            other: "Trieu almenys <strong>%{count}</strong> opcions."
+          up_to_max_options:
+            one: "Trieu fins a <strong>%{count}</strong> opció."
+            other: "Trieu fins a <strong>%{count}</strong> opcions."
+          x_options:
+            one: "Trieu <strong>%{count}</strong> opció."
+            other: "Trieu <strong>%{count}</strong> opcions."
+          between_min_and_max_options: "Trieu entre les opcions <strong>%{min}</strong> i <strong>%{max}</strong>."
       cast-votes:
         title: "Repartiu els vostres vots"
         label: "Voteu ara!"
diff --git a/plugins/poll/config/locales/client.es.yml b/plugins/poll/config/locales/client.es.yml
index 6d0c47d15e..04e033da3c 100644
--- a/plugins/poll/config/locales/client.es.yml
+++ b/plugins/poll/config/locales/client.es.yml
@@ -81,6 +81,8 @@ es:
           label: Grupos permitidos
         poll_chart_type:
           label: Tipo de gráfico
+          bar: Barras
+          pie: Tarta
         poll_config:
           max: Máximo
           min: Mínimo
diff --git a/plugins/poll/config/locales/client.fr.yml b/plugins/poll/config/locales/client.fr.yml
index 94db10620c..5af679d805 100644
--- a/plugins/poll/config/locales/client.fr.yml
+++ b/plugins/poll/config/locales/client.fr.yml
@@ -52,7 +52,7 @@ fr:
         label: "Afficher les détails"
       ungroup-results:
         title: "Combiner tous les votes"
-        label: "Cacher les détails"
+        label: "Masquer les détails"
       export-results:
         title: "Exporter les résultats du sondage"
         label: "Exporter"
diff --git a/plugins/poll/config/locales/server.fr.yml b/plugins/poll/config/locales/server.fr.yml
index 2b3f56dd6d..9c3becf1c1 100644
--- a/plugins/poll/config/locales/server.fr.yml
+++ b/plugins/poll/config/locales/server.fr.yml
@@ -16,16 +16,16 @@ fr:
   poll:
     poll: "sondage"
     invalid_argument: "Valeur '%{value}' invalide pour paramètre '%{argument}'."
-    multiple_polls_without_name: "Plusieurs sondages n'ont pas de nom. Utilisez l'attribut '<code>name</code>' pour donner un identifiant unique aux sondages."
-    multiple_polls_with_same_name: "Plusieurs sondages ont le même nom : <strong>%{name}</strong>. Utilisez l'attribut '<code>name</code>' pour donner un identifiant unique aux sondages."
+    multiple_polls_without_name: "Plusieurs sondages n'ont pas de nom. Utilisez l'attribut « <code>name</code> » pour donner un identifiant unique aux sondages."
+    multiple_polls_with_same_name: "Plusieurs sondages ont le même nom : <strong>%{name}</strong>. Utilisez l'attribut « <code>name</code> » pour donner un identifiant unique aux sondages."
     default_poll_must_have_at_least_1_option: "Un sondage doit avoir au moins 1 option."
     named_poll_must_have_at_least_1_option: "Le sondage <strong>%{name}</strong> doit avoir au moins 1 option."
     default_poll_must_have_less_options:
-      one: "Un sondage doit contenir moins que %{count}options."
-      other: "Un sondage doit contenir moins que %{count} options."
+      one: "Le sondage doit contenir moins de %{count} option."
+      other: "Le sondage doit contenir moins de %{count} options."
     named_poll_must_have_less_options:
-      one: "Le <strong>%{name}</strong> sondage doit contenir moins que %{count} options."
-      other: "Le <strong>%{name}</strong> sondage doit contenir moins que %{count} options."
+      one: "Le sondage <strong>%{name}</strong> doit contenir moins de %{count} option."
+      other: "Le sondage <strong>%{name}</strong> doit contenir moins de %{count} options."
     default_poll_must_have_different_options: "Les sondages doivent contenir des options différentes les unes des autres."
     named_poll_must_have_different_options: "Le sondage <strong>%{name}</strong> doit contenir des options différentes."
     default_poll_must_not_have_any_empty_options: "Un sondage ne doit pas avoir d'option vide."
@@ -36,15 +36,15 @@ fr:
     edit_window_expired:
       cannot_edit_default_poll_with_votes: "Vous ne pouvez pas modifier un sondage après les %{minutes} premières minutes."
       cannot_edit_named_poll_with_votes: "Vous ne pouvez pas modifier le nom du sondage <strong>${name}</strong> après les %{minutes} premières minutes."
-    no_poll_with_this_name: "Aucun sondage nommé <strong>%{name}</strong> n'est associé avec ce message."
+    no_poll_with_this_name: "Aucun sondage nommé <strong>%{name}</strong> n'est associé à ce message."
     post_is_deleted: "Impossible d'agir sur un message supprimé."
     user_cant_post_in_topic: "Vous ne pouvez pas voter parce que vous ne pouvez pas publier dans ce sujet."
     topic_must_be_open_to_vote: "Le sujet doit être ouvert pour pouvoir voter."
     poll_must_be_open_to_vote: "Le sondage doit être ouvert pour pouvoir voter."
     topic_must_be_open_to_toggle_status: "Le sujet doit être ouvert pour modifier le statut."
-    only_staff_or_op_can_toggle_status: "Seul un responsable ou le créateur du sujet peut modifier le statut d'un sondage."
+    only_staff_or_op_can_toggle_status: "Seuls un responsable ou le créateur du sujet peuvent modifier le statut d'un sondage."
     insufficient_rights_to_create: "Vous n'avez pas la permission de créer des sondages."
     email:
-      link_to_poll: "Cliquer pour voir le sondage."
+      link_to_poll: "Cliquez pour voir le sondage."
     user_field:
-      no_data: "Pas de données"
+      no_data: "Aucune donnée"
diff --git a/public/422.fr.html b/public/422.fr.html
index ce04617abd..e2be404ab5 100644
--- a/public/422.fr.html
+++ b/public/422.fr.html
@@ -20,7 +20,7 @@
   <!-- This file lives in public/422.html -->
   <div class="dialog">
     <h1>La modification demandée a été rejetée.</h1>
-    <p>Peut-être avez vous essayé de modifier quelque chose auquel vous n'aviez pas accès.</p>
+    <p>Peut-être vous avez essayé de modifier quelque chose auquel vous n'aviez pas accès.</p>
   </div>
 </body>
 </html>
diff --git a/public/503.fr.html b/public/503.fr.html
index 51f425b7b1..3fc6574d55 100644
--- a/public/503.fr.html
+++ b/public/503.fr.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>Le site en cours de maintenance - Discourse.org</title>
+<title>Le site est en cours de maintenance - Discourse.org</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>

From 5bfe1ee4f1a2ae8a4188327b097a38c7f4ca0424 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 10 Jun 2020 19:11:49 +0300
Subject: [PATCH 1634/1830] FEATURE: Improve UX support for multiple email
 addresses (#9691)

---
 .../app/components/email-dropdown.js          |  63 ++++++++
 .../app/controllers/preferences/account.js    |  54 +++++++
 .../app/controllers/preferences/email.js      |  23 ++-
 .../javascripts/discourse/app/models/user.js  |  28 ++++
 .../discourse/app/routes/preferences-email.js |  12 +-
 .../app/templates/preferences-email.hbs       |   4 +-
 .../app/templates/preferences/account.hbs     |  49 +++++-
 .../stylesheets/common/base/discourse.scss    |  50 ++++++
 app/controllers/users_controller.rb           |  66 ++++++++
 app/controllers/users_email_controller.rb     |  27 +++-
 app/jobs/regular/user_email.rb                |   2 +-
 app/mailers/user_notifications.rb             |  15 ++
 app/models/email_change_request.rb            |   1 -
 app/models/user.rb                            |   4 +
 app/models/user_history.rb                    |  10 +-
 app/serializers/user_card_serializer.rb       |   2 +
 app/serializers/web_hook_user_serializer.rb   |   1 +
 app/services/staff_action_logger.rb           |  30 ++++
 .../show_confirm_new_email.html.erb           |   6 +-
 .../show_confirm_old_email.html.erb           |  19 ++-
 config/locales/client.en.yml                  |  19 ++-
 config/locales/server.en.yml                  |  29 +++-
 config/routes.rb                              |   3 +
 config/site_settings.yml                      |   4 +
 ...null_old_email_on_email_change_requests.rb |  11 ++
 lib/email_updater.rb                          | 143 +++++++++---------
 lib/svg_sprite/svg_sprite.rb                  |   1 +
 spec/components/email_updater_spec.rb         |  85 +++++++----
 spec/requests/users_controller_spec.rb        |  46 ++++++
 spec/requests/users_email_controller_spec.rb  |  15 ++
 .../web_hook_user_serializer_spec.rb          |   2 +-
 31 files changed, 686 insertions(+), 138 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/components/email-dropdown.js
 create mode 100644 db/post_migrate/20200508141209_allow_null_old_email_on_email_change_requests.rb

diff --git a/app/assets/javascripts/discourse/app/components/email-dropdown.js b/app/assets/javascripts/discourse/app/components/email-dropdown.js
new file mode 100644
index 0000000000..1a4046b240
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/email-dropdown.js
@@ -0,0 +1,63 @@
+import { action, computed } from "@ember/object";
+import { inject as service } from "@ember/service";
+import I18n from "I18n";
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+
+export default DropdownSelectBoxComponent.extend({
+  router: service(),
+
+  classNames: ["email-dropdown"],
+
+  selectKitOptions: {
+    icon: "wrench",
+    showFullTitle: false
+  },
+
+  content: computed("email", function() {
+    const content = [];
+
+    if (this.email.primary) {
+      content.push({
+        id: "updateEmail",
+        icon: "pencil-alt",
+        name: I18n.t("user.email.update_email"),
+        description: ""
+      });
+    }
+
+    if (!this.email.primary && this.email.confirmed) {
+      content.push({
+        id: "setPrimaryEmail",
+        icon: "star",
+        name: I18n.t("user.email.set_primary"),
+        description: ""
+      });
+    }
+
+    if (!this.email.primary) {
+      content.push({
+        id: "destroyEmail",
+        icon: "times",
+        name: I18n.t("user.email.destroy"),
+        description: ""
+      });
+    }
+
+    return content;
+  }),
+
+  @action
+  onChange(id) {
+    switch (id) {
+      case "updateEmail":
+        this.router.transitionTo("preferences.email");
+        break;
+      case "setPrimaryEmail":
+        this.setPrimaryEmail(this.email.email);
+        break;
+      case "destroyEmail":
+        this.destroyEmail(this.email.email);
+        break;
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/account.js b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
index 0a6f54c280..6eecf3e7e9 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/account.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
@@ -12,6 +12,7 @@ import { findAll } from "discourse/models/login-method";
 import { ajax } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
 import logout from "discourse/lib/logout";
+import EmberObject from "@ember/object";
 
 // Number of tokens shown by default.
 const DEFAULT_AUTH_TOKENS_COUNT = 2;
@@ -95,6 +96,39 @@ export default Controller.extend(CanCheckEmails, {
 
   disableConnectButtons: propertyNotEqual("model.id", "currentUser.id"),
 
+  @discourseComputed(
+    "model.email",
+    "model.secondary_emails.[]",
+    "model.unconfirmed_emails.[]"
+  )
+  emails(primaryEmail, secondaryEmails, unconfirmedEmails) {
+    const emails = [];
+
+    if (primaryEmail) {
+      emails.push(
+        EmberObject.create({
+          email: primaryEmail,
+          primary: true,
+          confirmed: true
+        })
+      );
+    }
+
+    if (secondaryEmails) {
+      secondaryEmails.forEach(email => {
+        emails.push(EmberObject.create({ email, confirmed: true }));
+      });
+    }
+
+    if (unconfirmedEmails) {
+      unconfirmedEmails.forEach(email => {
+        emails.push(EmberObject.create({ email }));
+      });
+    }
+
+    return emails.sort((a, b) => a.email.localeCompare(b.email));
+  },
+
   @discourseComputed(
     "model.second_factor_enabled",
     "canCheckEmails",
@@ -149,6 +183,26 @@ export default Controller.extend(CanCheckEmails, {
         .catch(popupAjaxError);
     },
 
+    setPrimaryEmail(email) {
+      this.model.setPrimaryEmail(email).catch(popupAjaxError);
+    },
+
+    destroyEmail(email) {
+      this.model.destroyEmail(email);
+    },
+
+    resendConfirmationEmail(email) {
+      email.set("resending", true);
+      this.model
+        .addEmail(email.email)
+        .then(() => {
+          email.set("resent", true);
+        })
+        .finally(() => {
+          email.set("resending", false);
+        });
+    },
+
     changePassword() {
       if (!this.passwordProgress) {
         this.set(
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/email.js b/app/assets/javascripts/discourse/app/controllers/preferences/email.js
index f79e4d15d1..3365faf0f2 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/email.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/email.js
@@ -7,10 +7,13 @@ import EmberObject from "@ember/object";
 import { emailValid } from "discourse/lib/utilities";
 
 export default Controller.extend({
+  queryParams: ["new"],
+
   taken: false,
   saving: false,
   error: false,
   success: false,
+  oldEmail: null,
   newEmail: null,
 
   newEmailEmpty: empty("newEmail"),
@@ -23,16 +26,17 @@ export default Controller.extend({
     "invalidEmail"
   ),
 
-  unchanged: propertyEqual("newEmailLower", "currentUser.email"),
+  unchanged: propertyEqual("newEmailLower", "oldEmail"),
 
   @discourseComputed("newEmail")
   newEmailLower(newEmail) {
     return newEmail.toLowerCase().trim();
   },
 
-  @discourseComputed("saving")
-  saveButtonText(saving) {
+  @discourseComputed("saving", "new")
+  saveButtonText(saving, isNew) {
     if (saving) return I18n.t("saving");
+    if (isNew) return I18n.t("user.add_email.add");
     return I18n.t("user.change");
   },
 
@@ -41,9 +45,9 @@ export default Controller.extend({
     return !emailValid(newEmail);
   },
 
-  @discourseComputed("invalidEmail")
-  emailValidation(invalidEmail) {
-    if (invalidEmail) {
+  @discourseComputed("invalidEmail", "oldEmail", "newEmail")
+  emailValidation(invalidEmail, oldEmail, newEmail) {
+    if (invalidEmail && (oldEmail || newEmail)) {
       return EmberObject.create({
         failed: true,
         reason: I18n.t("user.email.invalid")
@@ -62,10 +66,13 @@ export default Controller.extend({
   },
 
   actions: {
-    changeEmail() {
+    saveEmail() {
       this.set("saving", true);
 
-      return this.model.changeEmail(this.newEmail).then(
+      return (this.new
+        ? this.model.addEmail(this.newEmail)
+        : this.model.changeEmail(this.newEmail)
+      ).then(
         () => this.set("success", true),
         e => {
           this.setProperties({ error: true, saving: false });
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index 113b592c27..0f67d613b2 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -246,6 +246,13 @@ const User = RestModel.extend({
     });
   },
 
+  addEmail(email) {
+    return ajax(userPath(`${this.username_lower}/preferences/email`), {
+      type: "POST",
+      data: { email }
+    });
+  },
+
   changeEmail(email) {
     return ajax(userPath(`${this.username_lower}/preferences/email`), {
       type: "PUT",
@@ -375,6 +382,27 @@ const User = RestModel.extend({
       });
   },
 
+  setPrimaryEmail(email) {
+    return ajax(userPath(`${this.username}/preferences/primary-email.json`), {
+      type: "PUT",
+      data: { email }
+    }).then(() => {
+      this.secondary_emails.removeObject(email);
+      this.secondary_emails.pushObject(this.email);
+      this.set("email", email);
+    });
+  },
+
+  destroyEmail(email) {
+    return ajax(userPath(`${this.username}/preferences/email.json`), {
+      type: "DELETE",
+      data: { email }
+    }).then(() => {
+      this.secondary_emails.removeObject(email);
+      this.unconfirmed_emails.removeObject(email);
+    });
+  },
+
   changePassword() {
     return ajax("/session/forgot_password", {
       dataType: "json",
diff --git a/app/assets/javascripts/discourse/app/routes/preferences-email.js b/app/assets/javascripts/discourse/app/routes/preferences-email.js
index c3fb268c4d..f2d070ad00 100644
--- a/app/assets/javascripts/discourse/app/routes/preferences-email.js
+++ b/app/assets/javascripts/discourse/app/routes/preferences-email.js
@@ -13,7 +13,17 @@ export default RestrictedUserRoute.extend({
 
   setupController: function(controller, model) {
     controller.reset();
-    controller.setProperties({ model: model, newEmail: model.get("email") });
+    controller.setProperties({
+      model: model,
+      oldEmail: controller.new ? "" : model.get("email"),
+      newEmail: controller.new ? "" : model.get("email")
+    });
+  },
+
+  resetController: function(controller, isExiting) {
+    if (isExiting) {
+      controller.set("new", undefined);
+    }
   },
 
   // A bit odd, but if we leave to /preferences we need to re-render that outlet
diff --git a/app/assets/javascripts/discourse/app/templates/preferences-email.hbs b/app/assets/javascripts/discourse/app/templates/preferences-email.hbs
index 1c561e265f..447d220403 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences-email.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences-email.hbs
@@ -3,7 +3,7 @@
 
     <div class="control-group">
       <div class="controls">
-        <h3>{{i18n "user.change_email.title"}}</h3>
+        <h3>{{i18n (if new "user.add_email.title" "user.change_email.title")}}</h3>
       </div>
     </div>
 
@@ -51,7 +51,7 @@
         <div class="controls">
           {{#d-button
             class="btn-primary"
-            action=(action "changeEmail")
+            action=(action "saveEmail")
             type="submit"
             disabled=saveDisabled
           }}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
index cd931ff10e..47df8c73fa 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
@@ -46,12 +46,49 @@
   <div class="control-group pref-email">
     <label class="control-label">{{i18n "user.email.title"}}</label>
     {{#if model.email}}
-      <div class="controls">
-        <span class="static">{{model.email}}</span>
-        {{#if model.can_edit_email}}
-          {{#link-to "preferences.email" class="btn btn-default btn-small btn-icon pad-left no-text"}}{{d-icon "pencil-alt"}}{{/link-to}}
-        {{/if}}
-      </div>
+      {{#if siteSettings.enable_secondary_emails}}
+        <div class="emails">
+          {{#each emails as |email|}}
+            <div class="row email">
+              {{email-dropdown email=email
+                              setPrimaryEmail=(action "setPrimaryEmail")
+                              destroyEmail=(action "destroyEmail")}}
+
+              <div class="email-first">{{email.email}}</div>
+
+              <div class="email-second">
+                {{#if email.primary}}
+                  <span class="primary">{{i18n "user.email.primary_label"}}</span>
+                {{/if}}
+
+                {{#unless email.confirmed}}
+                  <span class="unconfirmed">{{i18n "user.email.unconfirmed_label"}}</span>
+                  &bull;
+                  {{#if email.resending}}
+                    <span>{{i18n "user.email.resending_label"}}</span>
+                  {{else if email.resent}}
+                    <span>{{i18n "user.email.resent_label"}}</span>
+                  {{else}}
+                    <a {{action "resendConfirmationEmail" email}} href>{{i18n "user.email.resend_label"}}</a>
+                  {{/if}}
+                {{/unless}}
+              </div>
+            </div>
+          {{/each}}
+        </div>
+
+        {{#link-to "preferences.email" (query-params new=1) class="pull-right"}}
+          {{d-icon "plus"}} {{i18n "user.email.add_email"}}
+        {{/link-to}}
+      {{else}}
+        <div class="controls">
+          <span class="static">{{model.email}}</span>
+          {{#if model.can_edit_email}}
+            {{#link-to "preferences.email" class="btn btn-default btn-small btn-icon pad-left no-text"}}{{d-icon "pencil-alt"}}{{/link-to}}
+          {{/if}}
+        </div>
+      {{/if}}
+
       <div class="instructions">
         {{#if siteSettings.sso_overrides_email}}
           {{i18n "user.email.sso_override_instructions"}}
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index fd6dfef8de..1dcb5e858f 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -640,6 +640,56 @@ table {
   display: inline;
 }
 
+.pref-email {
+  .row {
+    border-bottom: 1px solid #ddd;
+    margin: 5px 0px;
+    padding-bottom: 5px;
+
+    &:last-child {
+      border-bottom: 0;
+    }
+  }
+
+  .email-first {
+    font-size: 1.1em;
+  }
+
+  .email-second {
+    color: $primary-medium;
+
+    .primary {
+      color: $success;
+      font-weight: bold;
+    }
+
+    .unconfirmed {
+      font-style: italic;
+    }
+  }
+
+  .email-dropdown {
+    float: right;
+
+    .btn,
+    .btn:hover {
+      background: transparent;
+
+      .d-icon {
+        color: $primary-high;
+      }
+    }
+  }
+
+  .dropdown-menu {
+    width: 120px;
+
+    & .icon {
+      margin-top: auto;
+    }
+  }
+}
+
 .pref-auth-tokens {
   .row {
     border-bottom: 1px solid #ddd;
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 57a2f7a400..1ca9d9b99e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -205,6 +205,72 @@ class UsersController < ApplicationController
     render json: failed_json, status: 403
   end
 
+  def update_primary_email
+    if !SiteSetting.enable_secondary_emails
+      return render json: failed_json, status: 410
+    end
+
+    params.require(:email)
+
+    user = fetch_user_from_params
+    guardian.ensure_can_edit_email!(user)
+
+    old_primary = user.primary_email
+    if old_primary.email == params[:email]
+      return render json: success_json
+    end
+
+    new_primary = user.user_emails.find_by(email: params[:email])
+    if new_primary.blank?
+      return render json: failed_json.merge(errors: [I18n.t("change_email.doesnt_exist")]), status: 428
+    end
+
+    User.transaction do
+      old_primary.update!(primary: false)
+      new_primary.update!(primary: true)
+
+      if current_user.staff? && current_user != user
+        StaffActionLogger.new(current_user).log_update_email(user)
+      else
+        UserHistory.create!(action: UserHistory.actions[:update_email], target_user_id: user.id)
+      end
+    end
+
+    render json: success_json
+  end
+
+  def destroy_email
+    if !SiteSetting.enable_secondary_emails
+      return render json: failed_json, status: 410
+    end
+
+    params.require(:email)
+
+    user = fetch_user_from_params
+    guardian.ensure_can_edit!(user)
+
+    user_email = user.user_emails.find_by(email: params[:email])
+    if user_email&.primary
+      return render json: failed_json, status: 428
+    end
+
+    ActiveRecord::Base.transaction do
+      if user_email
+        user_email.destroy
+      elsif
+        user.email_change_requests.where(new_email: params[:email]).destroy_all
+      end
+
+      if current_user.staff? && current_user != user
+        StaffActionLogger.new(current_user).log_destroy_email(user)
+      else
+        UserHistory.create(action: UserHistory.actions[:destroy_email], target_user_id: user.id)
+      end
+    end
+
+    render json: success_json
+  end
+
   def topic_tracking_state
     user = fetch_user_from_params
     guardian.ensure_can_edit!(user)
diff --git a/app/controllers/users_email_controller.rb b/app/controllers/users_email_controller.rb
index ae7b4c5623..898ddd6897 100644
--- a/app/controllers/users_email_controller.rb
+++ b/app/controllers/users_email_controller.rb
@@ -28,12 +28,35 @@ class UsersEmailController < ApplicationController
   def index
   end
 
+  def create
+    if !SiteSetting.enable_secondary_emails
+      return render json: failed_json, status: 410
+    end
+
+    params.require(:email)
+    user = fetch_user_from_params
+
+    RateLimiter.new(user, "email-hr-#{request.remote_ip}", 6, 1.hour).performed!
+    RateLimiter.new(user, "email-min-#{request.remote_ip}", 3, 1.minute).performed!
+
+    updater = EmailUpdater.new(guardian: guardian, user: user)
+    updater.change_to(params[:email], add: true)
+
+    if updater.errors.present?
+      return render_json_error(updater.errors.full_messages)
+    end
+
+    render body: nil
+  rescue RateLimiter::LimitExceeded
+    render_json_error(I18n.t("rate_limiter.slow_down"))
+  end
+
   def update
     params.require(:email)
     user = fetch_user_from_params
 
-    RateLimiter.new(user, "change-email-hr-#{request.remote_ip}", 6, 1.hour).performed!
-    RateLimiter.new(user, "change-email-min-#{request.remote_ip}", 3, 1.minute).performed!
+    RateLimiter.new(user, "email-hr-#{request.remote_ip}", 6, 1.hour).performed!
+    RateLimiter.new(user, "email-min-#{request.remote_ip}", 3, 1.minute).performed!
 
     updater = EmailUpdater.new(guardian: guardian, user: user)
     updater.change_to(params[:email])
diff --git a/app/jobs/regular/user_email.rb b/app/jobs/regular/user_email.rb
index bee715099d..1197499c41 100644
--- a/app/jobs/regular/user_email.rb
+++ b/app/jobs/regular/user_email.rb
@@ -154,7 +154,7 @@ module Jobs
       raise Discourse::InvalidParameters.new("type=#{type}") unless UserNotifications.respond_to?(type)
 
       email_args[:email_token] = email_token if email_token.present?
-      email_args[:new_email] = user.email if type.to_s == "notify_old_email"
+      email_args[:new_email] = args[:new_email] || user.email if type.to_s == "notify_old_email" || type.to_s == "notify_old_email_add"
 
       if args[:client_ip] && args[:user_agent]
         email_args[:client_ip] = args[:client_ip]
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 6ccb86c860..184c62b1ec 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -63,6 +63,13 @@ class UserNotifications < ActionMailer::Base
                 new_email: opts[:new_email])
   end
 
+  def notify_old_email_add(user, opts = {})
+    build_email(user.email,
+                template: "user_notifications.notify_old_email_add",
+                locale: user_locale(user),
+                new_email: opts[:new_email])
+  end
+
   def confirm_old_email(user, opts = {})
     build_user_email_token_by_template(
       "user_notifications.confirm_old_email",
@@ -71,6 +78,14 @@ class UserNotifications < ActionMailer::Base
     )
   end
 
+  def confirm_old_email_add(user, opts = {})
+    build_user_email_token_by_template(
+      "user_notifications.confirm_old_email_add",
+      user,
+      opts[:email_token]
+    )
+  end
+
   def confirm_new_email(user, opts = {})
     build_user_email_token_by_template(
       "user_notifications.confirm_new_email",
diff --git a/app/models/email_change_request.rb b/app/models/email_change_request.rb
index f54df4bf23..d5fd0e57d9 100644
--- a/app/models/email_change_request.rb
+++ b/app/models/email_change_request.rb
@@ -5,7 +5,6 @@ class EmailChangeRequest < ActiveRecord::Base
   belongs_to :new_email_token, class_name: 'EmailToken'
   belongs_to :user
 
-  validates :old_email, presence: true
   validates :new_email, presence: true, format: { with: EmailValidator.email_regex }
 
   def self.states
diff --git a/app/models/user.rb b/app/models/user.rb
index 3caf839a2d..15ed2fb531 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1212,6 +1212,10 @@ class User < ActiveRecord::Base
     self.user_emails.secondary.pluck(:email)
   end
 
+  def unconfirmed_emails
+    self.email_change_requests.where.not(change_state: EmailChangeRequest.states[:complete]).pluck(:new_email)
+  end
+
   RECENT_TIME_READ_THRESHOLD ||= 60.days
 
   def self.preload_recent_time_read(users)
diff --git a/app/models/user_history.rb b/app/models/user_history.rb
index 49a545b815..26e7b8ab73 100644
--- a/app/models/user_history.rb
+++ b/app/models/user_history.rb
@@ -105,7 +105,10 @@ class UserHistory < ActiveRecord::Base
       change_title: 84,
       override_upload_secure_status: 85,
       page_published: 86,
-      page_unpublished: 87
+      page_unpublished: 87,
+      add_email: 88,
+      update_email: 89,
+      destroy_email: 90,
     )
   end
 
@@ -187,7 +190,10 @@ class UserHistory < ActiveRecord::Base
       :api_key_destroy,
       :override_upload_secure_status,
       :page_published,
-      :page_unpublished
+      :page_unpublished,
+      :add_email,
+      :update_email,
+      :destroy_email
     ]
   end
 
diff --git a/app/serializers/user_card_serializer.rb b/app/serializers/user_card_serializer.rb
index c453dff2e4..e3ec9357fb 100644
--- a/app/serializers/user_card_serializer.rb
+++ b/app/serializers/user_card_serializer.rb
@@ -34,6 +34,8 @@ class UserCardSerializer < BasicUserSerializer
   end
 
   attributes :email,
+             :secondary_emails,
+             :unconfirmed_emails,
              :last_posted_at,
              :last_seen_at,
              :created_at,
diff --git a/app/serializers/web_hook_user_serializer.rb b/app/serializers/web_hook_user_serializer.rb
index 31d178b1a0..d431b213e1 100644
--- a/app/serializers/web_hook_user_serializer.rb
+++ b/app/serializers/web_hook_user_serializer.rb
@@ -8,6 +8,7 @@ class WebHookUserSerializer < UserSerializer
   end
 
   %i{
+    unconfirmed_emails
     can_edit
     can_edit_username
     can_edit_email
diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb
index 6802be3462..0181a55874 100644
--- a/app/services/staff_action_logger.rb
+++ b/app/services/staff_action_logger.rb
@@ -744,6 +744,36 @@ class StaffActionLogger
     ))
   end
 
+  def log_add_email(user)
+    raise Discourse::InvalidParameters.new(:user) unless user
+
+    UserHistory.create!(
+      action: UserHistory.actions[:add_email],
+      acting_user_id: @admin.id,
+      target_user_id: user.id
+    )
+  end
+
+  def log_update_email(user)
+    raise Discourse::InvalidParameters.new(:user) unless user
+
+    UserHistory.create!(
+      action: UserHistory.actions[:update_email],
+      acting_user_id: @admin.id,
+      target_user_id: user.id
+    )
+  end
+
+  def log_destroy_email(user)
+    raise Discourse::InvalidParameters.new(:user) unless user
+
+    UserHistory.create!(
+      action: UserHistory.actions[:destroy_email],
+      acting_user_id: @admin.id,
+      target_user_id: user.id
+    )
+  end
+
   private
 
   def get_changes(changes)
diff --git a/app/views/users_email/show_confirm_new_email.html.erb b/app/views/users_email/show_confirm_new_email.html.erb
index 45a3f2a7d2..ba5102e13d 100644
--- a/app/views/users_email/show_confirm_new_email.html.erb
+++ b/app/views/users_email/show_confirm_new_email.html.erb
@@ -13,7 +13,11 @@
   <% else %>
     <h2><%= t 'change_email.authorizing_new.title' %></h2>
     <p>
-      <%= t 'change_email.authorizing_new.description' %>
+      <% if @change_request&.old_email %>
+        <%= t 'change_email.authorizing_new.description' %>
+      <% else %>
+        <%= t 'change_email.authorizing_new.description_add' %>
+      <% end %>
     </p>
     <p>
       <%= @to_email %>
diff --git a/app/views/users_email/show_confirm_old_email.html.erb b/app/views/users_email/show_confirm_old_email.html.erb
index 6d81093186..9fc65856cb 100644
--- a/app/views/users_email/show_confirm_old_email.html.erb
+++ b/app/views/users_email/show_confirm_old_email.html.erb
@@ -11,12 +11,19 @@
   <% else %>
     <h2><%= t 'change_email.authorizing_old.title' %></h2>
     <p>
-      <%= t 'change_email.authorizing_old.description' %>
-      <br>
-      <br>
-      <%= t 'change_email.authorizing_old.old_email', email: @from_email %>
-      <br>
-      <%= t 'change_email.authorizing_old.new_email', email: @to_email %>
+      <% if @change_request&.old_email %>
+        <%= t 'change_email.authorizing_old.description' %>
+        <br>
+        <br>
+        <%= t 'change_email.authorizing_old.old_email', email: @from_email %>
+        <br>
+        <%= t 'change_email.authorizing_old.new_email', email: @to_email %>
+      <% else %>
+        <%= t 'change_email.authorizing_old.description_add' %>
+        <br>
+        <br>
+        <%= @to_email %>
+      <% end %>
     </p>
 
     <%=form_tag(u_confirm_old_email_path, method: :put) do %>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 2de77fce97..104edd8793 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1083,6 +1083,10 @@ en:
         taken: "Sorry, that username is taken."
         invalid: "That username is invalid. It must only include numbers and letters"
 
+      add_email:
+        title: "Add Email"
+        add: "add"
+
       change_email:
         title: "Change Email"
         taken: "Sorry, that email is not available."
@@ -1118,8 +1122,16 @@ en:
         title: "Email"
         primary: "Primary Email"
         secondary: "Secondary Emails"
-        no_secondary: "No secondary emails"
-        sso_override_instructions: "Email can be updated from SSO provider."
+        primary_label: "primary"
+        unconfirmed_label: "unconfirmed"
+        resend_label: "resend confirmation email"
+        resending_label: "sending..."
+        resent_label: "email sent"
+        update_email: "Change Email"
+        set_primary: "Set Primary Email"
+        destroy: "Remove Email"
+        add_email: "Add Alternate Email"
+        ssDestroy_override_instructions: "Email can be updated from SSO provider."
         instructions: "Never shown to the public."
         ok: "We will email you to confirm"
         required: "Please enter an email address"
@@ -4175,6 +4187,9 @@ en:
             override_upload_secure_status: "override upload secure status"
             page_published: "page published"
             page_unpublished: "page unpublished"
+            add_email: "add email"
+            update_email: "update email"
+            destroy_email: "destroy email"
         screened_emails:
           title: "Screened Emails"
           description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index eec321b8d8..d2e875d117 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -845,17 +845,20 @@ en:
     confirmed: "Your email has been updated."
     please_continue: "Continue to %{site_name}"
     error: "There was an error changing your email address. Perhaps the address is already in use?"
+    doesnt_exist: "That email address is not associated with your account."
     error_staged: "There was an error changing your email address. The address is already in use by a staged user."
     already_done: "Sorry, this confirmation link is no longer valid. Perhaps your email was already changed?"
     confirm: "Confirm"
 
     authorizing_new:
       title: "Confirm your new email"
-      description: "Please confirm you would like your new email address changed to:"
+      description: "Please confirm you would like your email address changed to:"
+      description_add: "Please confirm you would like to add an alternate email address:"
 
     authorizing_old:
       title: "Change your email address"
       description: "Please confirm your email address change"
+      description_add: "Please confirm you would like to add an alternate email address:"
       old_email: "Old email: %{email}"
       new_email: "New email: %{email}"
       almost_done_title: "Confirming new email address"
@@ -3674,6 +3677,18 @@ en:
 
         %{base_url}/u/confirm-old-email/%{email_token}
 
+    confirm_old_email_add:
+      title: "Confirm Old Email (Add)"
+      subject_template: "[%{email_prefix}] Confirm your current email address"
+      text_body_template: |
+        Before we can add a new email address, we need you to confirm that you control
+        the current email account. After you complete this step, we will have you confirm
+        the new email address.
+
+        Confirm your current email address for %{site_name} by clicking on the following link:
+
+        %{base_url}/u/confirm-old-email/%{email_token}
+
     notify_old_email:
       title: "Notify Old Email"
       subject_template: "[%{email_prefix}] Your email address has been changed"
@@ -3686,6 +3701,18 @@ en:
 
         %{new_email}
 
+    notify_old_email_add:
+      title: "Notify Old Email (Add)"
+      subject_template: "[%{email_prefix}] A new email address has been added"
+      text_body_template: |
+        This is an automated message to let you know that an email address for
+        %{site_name} has been added. If this was done in error, please contact
+        a site administrator.
+
+        Your added email address is:
+
+        %{new_email}
+
     signup_after_approval:
       title: "Signup After Approval"
       subject_template: "You've been approved on %{site_name}!"
diff --git a/config/routes.rb b/config/routes.rb
index 96b81c8e26..0de10003e5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -444,12 +444,15 @@ Discourse::Application.routes.draw do
       get "#{root_path}/:username/preferences/account" => "users#preferences", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username/preferences/profile" => "users#preferences", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username/preferences/emails" => "users#preferences", constraints: { username: RouteFormat.username }
+      put "#{root_path}/:username/preferences/primary-email" => "users#update_primary_email", format: :json, constraints: { username: RouteFormat.username }
+      delete "#{root_path}/:username/preferences/email" => "users#destroy_email", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username/preferences/notifications" => "users#preferences", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username/preferences/categories" => "users#preferences", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username/preferences/users" => "users#preferences", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username/preferences/tags" => "users#preferences", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username/preferences/interface" => "users#preferences", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username/preferences/apps" => "users#preferences", constraints: { username: RouteFormat.username }
+      post "#{root_path}/:username/preferences/email" => "users_email#create", constraints: { username: RouteFormat.username }
       put "#{root_path}/:username/preferences/email" => "users_email#update", constraints: { username: RouteFormat.username }
       get "#{root_path}/:username/preferences/badge_title" => "users#preferences", constraints: { username: RouteFormat.username }
       put "#{root_path}/:username/preferences/badge_title" => "users#badge_title", constraints: { username: RouteFormat.username }
diff --git a/config/site_settings.yml b/config/site_settings.yml
index e240fe3526..08e16c94f1 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1124,6 +1124,10 @@ email:
   delete_rejected_email_after_days:
     default: 90
     max: 36500
+  enable_secondary_emails:
+    client: true
+    default: true
+    hidden: true
 
 files:
   max_image_size_kb:
diff --git a/db/post_migrate/20200508141209_allow_null_old_email_on_email_change_requests.rb b/db/post_migrate/20200508141209_allow_null_old_email_on_email_change_requests.rb
new file mode 100644
index 0000000000..b33b5c7058
--- /dev/null
+++ b/db/post_migrate/20200508141209_allow_null_old_email_on_email_change_requests.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AllowNullOldEmailOnEmailChangeRequests < ActiveRecord::Migration[6.0]
+  def up
+    change_column :email_change_requests, :old_email, :string, null: true
+  end
+
+  def down
+    change_column :email_change_requests, :old_email, :string, null: false
+  end
+end
diff --git a/lib/email_updater.rb b/lib/email_updater.rb
index b3f4371c98..23f0a5c09b 100644
--- a/lib/email_updater.rb
+++ b/lib/email_updater.rb
@@ -5,24 +5,21 @@ class EmailUpdater
 
   attr_reader :user
 
+  def self.human_attribute_name(name, options = {})
+    User.human_attribute_name(name, options)
+  end
+
   def initialize(guardian: nil, user: nil)
     @guardian = guardian
     @user = user
   end
 
-  def self.human_attribute_name(name, options = {})
-    User.human_attribute_name(name, options)
-  end
-
-  def changing_staff_user_email?
-    @user.staff?
-  end
-
-  def change_to(email_input)
+  def change_to(email, add: false)
     @guardian.ensure_can_edit_email!(@user)
 
-    email = Email.downcase(email_input.strip)
+    email = Email.downcase(email.strip)
     EmailValidator.new(attributes: :email).validate_each(self, :email, email)
+    return if errors.present?
 
     if existing_user = User.find_by_email(email)
       if SiteSetting.hide_email_address_taken
@@ -34,31 +31,51 @@ class EmailUpdater
       end
     end
 
-    if errors.blank? && existing_user.nil?
-      args = {
-        old_email: @user.email,
-        new_email: email,
-      }
+    return if errors.present? || existing_user.present?
 
-      args, email_token = prepare_change_request(args)
-      @user.email_change_requests.create!(args)
+    old_email = @user.email if !add
 
-      if initiating_admin_changing_another_user_email? && !changing_staff_user_email?
-        auto_confirm_and_send_password_reset(email_token)
-        return
-      end
+    if @guardian.is_staff? && @guardian.user != @user
+      StaffActionLogger.new(@guardian.user).log_add_email(@user)
+    else
+      UserHistory.create!(action: UserHistory.actions[:add_email], target_user_id: @user.id)
+    end
 
-      if args[:change_state] == EmailChangeRequest.states[:authorizing_new]
-        send_email(:confirm_new_email, email_token)
-      elsif args[:change_state] == EmailChangeRequest.states[:authorizing_old]
-        send_email(:confirm_old_email, email_token)
+    if @guardian.is_staff? && !@user.staff?
+      send_email_notification(@user.email, email)
+      update_user_email(old_email, email)
+      send_email(:forgot_password, @user.email_tokens.create!(email: @user.email))
+      return
+    end
+
+    change_req = EmailChangeRequest.find_or_initialize_by(user_id: @user.id, new_email: email)
+    if change_req.new_record?
+      change_req.old_email = old_email
+      change_req.new_email = email
+    end
+
+    if change_req.change_state.blank?
+      change_req.change_state = if @user.staff?
+        # Staff users must confirm their old email address first.
+        EmailChangeRequest.states[:authorizing_old]
+      else
+        EmailChangeRequest.states[:authorizing_new]
       end
     end
+
+    if change_req.change_state == EmailChangeRequest.states[:authorizing_old]
+      change_req.old_email_token = @user.email_tokens.create!(email: @user.email)
+      send_email(add ? :confirm_old_email_add : :confirm_old_email, change_req.old_email_token)
+    elsif change_req.change_state == EmailChangeRequest.states[:authorizing_new]
+      change_req.new_email_token = @user.email_tokens.create!(email: email)
+      send_email(:confirm_new_email, change_req.new_email_token)
+    end
+
+    change_req.save!
   end
 
   def confirm(token)
     confirm_result = nil
-    change_req = nil
 
     User.transaction do
       result = EmailToken.atomic_confirm(token)
@@ -66,22 +83,26 @@ class EmailUpdater
         token = result[:email_token]
         @user = token.user
 
-        change_req = user.email_change_requests
+        change_req = @user.email_change_requests
           .where('old_email_token_id = :token_id OR new_email_token_id = :token_id', token_id: token.id)
           .first
 
-        # Simple state machine
         case change_req.try(:change_state)
         when EmailChangeRequest.states[:authorizing_old]
-          new_token = user.email_tokens.create(email: change_req.new_email)
-          change_req.update_columns(change_state: EmailChangeRequest.states[:authorizing_new],
-                                    new_email_token_id: new_token.id)
-          send_email(:confirm_new_email, new_token)
+          change_req.update!(
+            change_state: EmailChangeRequest.states[:authorizing_new],
+            new_email_token: @user.email_tokens.create(email: change_req.new_email)
+          )
+          send_email(:confirm_new_email, change_req.new_email_token)
           confirm_result = :authorizing_new
         when EmailChangeRequest.states[:authorizing_new]
-          change_req.update_column(:change_state, EmailChangeRequest.states[:complete])
-          user.primary_email.update!(email: token.email)
-          user.set_automatic_groups
+          change_req.update!(change_state: EmailChangeRequest.states[:complete])
+          if !@user.staff?
+            # Send an email notification only to users who did not confirm old
+            # email.
+            send_email_notification(change_req.old_email, change_req.new_email)
+          end
+          update_user_email(change_req.old_email, change_req.new_email)
           confirm_result = :complete
         end
       else
@@ -90,22 +111,21 @@ class EmailUpdater
       end
     end
 
-    if confirm_result == :complete && change_req.old_email_token_id.blank?
-      notify_old(change_req.old_email, token.email)
-    end
-
     confirm_result || :error
   end
 
-  protected
+  def update_user_email(old_email, new_email)
+    if old_email.present?
+      @user.user_emails.find_by(email: old_email).update!(email: new_email)
+    else
+      @user.user_emails.create!(email: new_email)
+    end
 
-  def notify_old(old_email, new_email)
-    Jobs.enqueue :critical_user_email,
-                 to_address: old_email,
-                 type: :notify_old_email,
-                 user_id: @user.id
+    @user.set_automatic_groups
   end
 
+  protected
+
   def send_email(type, email_token)
     Jobs.enqueue :critical_user_email,
                  to_address: email_token.email,
@@ -114,32 +134,11 @@ class EmailUpdater
                  email_token: email_token.token
   end
 
-  # regular users or changes requested by admin are always
-  # authorizing new only (as long as they are not changing their
-  # own email!)
-  #
-  # however even if an admin requests an email change for another
-  # admin the other admin must always confirm their old email
-  def prepare_change_request(args)
-    if changing_staff_user_email?
-      args[:change_state] = EmailChangeRequest.states[:authorizing_old]
-      email_token = @user.email_tokens.create!(email: args[:old_email])
-      args[:old_email_token] = email_token
-    else
-      args[:change_state] = EmailChangeRequest.states[:authorizing_new]
-      email_token = @user.email_tokens.create!(email: args[:new_email])
-      args[:new_email_token] = email_token
-    end
-    [args, email_token]
-  end
-
-  def initiating_admin_changing_another_user_email?
-    @guardian.is_admin? && @guardian.user != @user
-  end
-
-  def auto_confirm_and_send_password_reset(email_token)
-    confirm(email_token.token)
-    reset_email_token = @user.email_tokens.create(email: @user.email)
-    send_email(:forgot_password, reset_email_token)
+  def send_email_notification(old_email, new_email)
+    Jobs.enqueue :critical_user_email,
+                 to_address: @user.email,
+                 type: old_email ? :notify_old_email : :notify_old_email_add,
+                 user_id: @user.id,
+                 new_email: new_email
   end
 end
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index e91acfe138..d0b0470238 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -170,6 +170,7 @@ module SvgSprite
     "sign-in-alt",
     "sign-out-alt",
     "signal",
+    "star",
     "step-backward",
     "step-forward",
     "stream",
diff --git a/spec/components/email_updater_spec.rb b/spec/components/email_updater_spec.rb
index b2cae4d24d..046e8b04be 100644
--- a/spec/components/email_updater_spec.rb
+++ b/spec/components/email_updater_spec.rb
@@ -42,7 +42,7 @@ describe EmailUpdater do
       it "creates a change request authorizing the new email and immediately confirms it " do
         updater.change_to(new_email)
         change_req = user.email_change_requests.first
-        expect(change_req.change_state).to eq(EmailChangeRequest.states[:complete])
+        expect(user.reload.email).to eq(new_email)
       end
 
       it "sends a reset password email to the user so they can set a password for their new email" do
@@ -110,44 +110,65 @@ describe EmailUpdater do
     let(:user) { Fabricate(:user, email: old_email) }
     let(:updater) { EmailUpdater.new(guardian: user.guardian, user: user) }
 
-    before do
-      Jobs.expects(:enqueue).once.with(:critical_user_email, has_entries(type: :confirm_new_email, to_address: new_email))
-      updater.change_to(new_email)
-      @change_req = user.email_change_requests.first
-    end
-
-    it "starts the new confirmation process" do
-      expect(updater.errors).to be_blank
-
-      expect(@change_req).to be_present
-      expect(@change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_new])
-
-      expect(@change_req.old_email).to eq(old_email)
-      expect(@change_req.new_email).to eq(new_email)
-      expect(@change_req.old_email_token).to be_blank
-      expect(@change_req.new_email_token.email).to eq(new_email)
-    end
-
-    context 'confirming an invalid token' do
-      it "produces an error" do
-        updater.confirm('random')
-        expect(updater.errors).to be_present
-        expect(user.reload.email).not_to eq(new_email)
+    context "changing primary email" do
+      before do
+        Jobs.expects(:enqueue).once.with(:critical_user_email, has_entries(type: :confirm_new_email, to_address: new_email))
+        updater.change_to(new_email)
+        @change_req = user.email_change_requests.first
       end
-    end
 
-    context 'confirming a valid token' do
-      it "updates the user's email" do
-        Jobs.expects(:enqueue).once.with(:critical_user_email, has_entries(type: :notify_old_email, to_address: old_email))
-        updater.confirm(@change_req.new_email_token.token)
+      it "starts the new confirmation process" do
         expect(updater.errors).to be_blank
-        expect(user.reload.email).to eq(new_email)
 
-        @change_req.reload
-        expect(@change_req.change_state).to eq(EmailChangeRequest.states[:complete])
+        expect(@change_req).to be_present
+        expect(@change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_new])
+
+        expect(@change_req.old_email).to eq(old_email)
+        expect(@change_req.new_email).to eq(new_email)
+        expect(@change_req.old_email_token).to be_blank
+        expect(@change_req.new_email_token.email).to eq(new_email)
+      end
+
+      context 'confirming an invalid token' do
+        it "produces an error" do
+          updater.confirm('random')
+          expect(updater.errors).to be_present
+          expect(user.reload.email).not_to eq(new_email)
+        end
+      end
+
+      context 'confirming a valid token' do
+        it "updates the user's email" do
+          Jobs.expects(:enqueue).once.with(:critical_user_email, has_entries(type: :notify_old_email, to_address: old_email))
+          updater.confirm(@change_req.new_email_token.token)
+          expect(updater.errors).to be_blank
+          expect(user.reload.email).to eq(new_email)
+
+          @change_req.reload
+          expect(@change_req.change_state).to eq(EmailChangeRequest.states[:complete])
+        end
       end
     end
 
+    context "adding an email" do
+      before do
+        Jobs.expects(:enqueue).once.with(:critical_user_email, has_entries(type: :confirm_new_email, to_address: new_email))
+        updater.change_to(new_email, add: true)
+        @change_req = user.email_change_requests.first
+      end
+
+      context 'confirming a valid token' do
+        it "adds a user email" do
+          Jobs.expects(:enqueue).once.with(:critical_user_email, has_entries(type: :notify_old_email_add, to_address: old_email))
+          updater.confirm(@change_req.new_email_token.token)
+          expect(updater.errors).to be_blank
+          expect(UserEmail.where(user_id: user.id).pluck(:email)).to contain_exactly(user.email, new_email)
+
+          @change_req.reload
+          expect(@change_req.change_state).to eq(EmailChangeRequest.states[:complete])
+        end
+      end
+    end
   end
 
   context 'as a staff user' do
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index fed5b3c726..e6295dcb18 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -2558,6 +2558,52 @@ describe UsersController do
     end
   end
 
+  describe '#update_primary_email' do
+    fab!(:user) { Fabricate(:user) }
+    fab!(:user_email) { user.primary_email }
+    fab!(:other_email) { Fabricate(:secondary_email, user: user) }
+
+    before do
+      SiteSetting.email_editable = true
+
+      sign_in(user)
+    end
+
+    it "changes user's primary email" do
+      put "/u/#{user.username}/preferences/primary-email.json", params: { email: user_email.email }
+      expect(response.status).to eq(200)
+      expect(user_email.reload.primary).to eq(true)
+      expect(other_email.reload.primary).to eq(false)
+
+      put "/u/#{user.username}/preferences/primary-email.json", params: { email: other_email.email }
+      expect(response.status).to eq(200)
+      expect(user_email.reload.primary).to eq(false)
+      expect(other_email.reload.primary).to eq(true)
+    end
+  end
+
+  describe '#destroy_email' do
+    fab!(:user) { Fabricate(:user) }
+    fab!(:user_email) { user.primary_email }
+    fab!(:other_email) { Fabricate(:secondary_email, user: user) }
+
+    before do
+      SiteSetting.email_editable = true
+
+      sign_in(user)
+    end
+
+    it "can destroy secondary emails" do
+      delete "/u/#{user.username}/preferences/email.json", params: { email: user_email.email }
+      expect(response.status).to eq(428)
+      expect(user.reload.user_emails.pluck(:email)).to contain_exactly(user_email.email, other_email.email)
+
+      delete "/u/#{user.username}/preferences/email.json", params: { email: other_email.email }
+      expect(response.status).to eq(200)
+      expect(user.reload.user_emails.pluck(:email)).to contain_exactly(user_email.email)
+    end
+  end
+
   describe '#is_local_username' do
     fab!(:user) { Fabricate(:user) }
     fab!(:group) { Fabricate(:group, name: "Discourse", mentionable_level: Group::ALIAS_LEVELS[:everyone]) }
diff --git a/spec/requests/users_email_controller_spec.rb b/spec/requests/users_email_controller_spec.rb
index 257a431caf..92cd157044 100644
--- a/spec/requests/users_email_controller_spec.rb
+++ b/spec/requests/users_email_controller_spec.rb
@@ -261,6 +261,21 @@ describe UsersEmailController do
     end
   end
 
+  describe '#create' do
+    let(:new_email) { 'bubblegum@adventuretime.ooo' }
+
+    it 'has an email token' do
+      sign_in(user)
+
+      expect { post "/u/#{user.username}/preferences/email.json", params: { email: new_email } }
+        .to change(EmailChangeRequest, :count)
+
+      emailChangeRequest = EmailChangeRequest.last
+      expect(emailChangeRequest.old_email).to eq(nil)
+      expect(emailChangeRequest.new_email).to eq(new_email)
+    end
+  end
+
   describe '#update' do
     let(:new_email) { 'bubblegum@adventuretime.ooo' }
 
diff --git a/spec/serializers/web_hook_user_serializer_spec.rb b/spec/serializers/web_hook_user_serializer_spec.rb
index a019dff350..0059639054 100644
--- a/spec/serializers/web_hook_user_serializer_spec.rb
+++ b/spec/serializers/web_hook_user_serializer_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe WebHookUserSerializer do
 
   it 'should only include the required keys' do
     count = serializer.as_json.keys.count
-    difference = count - 45
+    difference = count - 46
 
     expect(difference).to eq(0), lambda {
       message = (difference < 0 ?

From 81a265cecd869f26f2572f8fa3a359a271c3c9dd Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 10 Jun 2020 13:38:18 -0400
Subject: [PATCH 1635/1830] Version bump to v2.5.0.beta7

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

diff --git a/lib/version.rb b/lib/version.rb
index c2a0e2edfb..6391eb0973 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -9,7 +9,7 @@ module Discourse
       MAJOR = 2
       MINOR = 5
       TINY  = 0
-      PRE   = 'beta6'
+      PRE   = 'beta7'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end

From 1ce6ff0a5597b2990ab6b451d0489ba7a2525c95 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Wed, 10 Jun 2020 11:55:03 -0600
Subject: [PATCH 1636/1830] DEV: Include raw in post webhook serializer

This came in as a request on meta to include the raw field in the post
webhook serializer.

 https://meta.discourse.org/t/-/49045/55?u=blake

 Including this field can prevent needing to make a 2nd API request to
 get the raw field of a post.

 It would be handy down the road if we updated the webhook ui to specify
 fields or arguments that you wanted to be included in the serialized
 data, but most requests I've seen to update the serializers have been
 valid requests that are good to add anyways, so I don't think we have
 reached that point yet.
---
 app/serializers/web_hook_post_serializer.rb       | 4 ++++
 spec/serializers/web_hook_post_serializer_spec.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/serializers/web_hook_post_serializer.rb b/app/serializers/web_hook_post_serializer.rb
index 2099a17c4c..4c5176c7f9 100644
--- a/app/serializers/web_hook_post_serializer.rb
+++ b/app/serializers/web_hook_post_serializer.rb
@@ -11,6 +11,10 @@ class WebHookPostSerializer < PostSerializer
     true
   end
 
+  def include_raw?
+    true
+  end
+
   %i{
     can_view
     can_edit
diff --git a/spec/serializers/web_hook_post_serializer_spec.rb b/spec/serializers/web_hook_post_serializer_spec.rb
index 790a13269b..9e5c1f618d 100644
--- a/spec/serializers/web_hook_post_serializer_spec.rb
+++ b/spec/serializers/web_hook_post_serializer_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe WebHookPostSerializer do
 
   it 'should only include the required keys' do
     count = serialized_for_user(admin).keys.count
-    difference = count - 39
+    difference = count - 40
 
     expect(difference).to eq(0), lambda {
       message = +""

From b8acb36532873616bd5c8118838199915d6f5cef Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Wed, 10 Jun 2020 13:36:50 -0500
Subject: [PATCH 1637/1830] DEV: Plugin outlet at top of user preference
 interface (#10020)

---
 .../discourse/app/templates/preferences/interface.hbs           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
index 4f1f13c614..7f198baa4a 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
@@ -1,3 +1,5 @@
+{{plugin-outlet name="user-preferences-interface-top" args=(hash model=model save=(action "save"))}}
+
 {{#if showThemeSelector}}
   <div class="control-group theme">
     <label class="control-label">{{i18n "user.theme"}}</label>

From ac555610d9c84e3594771fc1f5876866181424fb Mon Sep 17 00:00:00 2001
From: romanrizzi <rizziromanalejandro@gmail.com>
Date: Wed, 10 Jun 2020 16:30:53 -0300
Subject: [PATCH 1638/1830] DEV: Trigger an event before creating an upload

---
 lib/upload_creator.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index b806e2fc52..368569af44 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -34,6 +34,8 @@ class UploadCreator
       return @upload
     end
 
+    DiscourseEvent.trigger(:before_upload_creation, @file)
+
     DistributedMutex.synchronize("upload_#{user_id}_#{@filename}") do
       # test for image regardless of input
       @image_info = FastImage.new(@file) rescue nil

From 5f3fd23fa8860e395088d8ccf332beb5cc11128e Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Wed, 10 Jun 2020 13:07:37 -0700
Subject: [PATCH 1639/1830] DEV: Add stub flush_sw task to prevent rebuild
 errors (#10021)

---
 lib/tasks/assets.rake | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index 67788e3cf8..87a32da0c5 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -68,6 +68,14 @@ task 'assets:precompile:css' => 'environment' do
   end
 end
 
+task 'assets:flush_sw' => 'environment' do
+  begin
+    # Pending due to test failures.
+  rescue
+    STDERR.puts "Warning: unable to flush service worker script"
+  end
+end
+
 def assets_path
   "#{Rails.root}/public/assets"
 end

From 531eca985e13ba286816418b4baeddb230a34b07 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 11 Jun 2020 10:49:46 +0800
Subject: [PATCH 1640/1830] DEV: Log error backtrace in
 `Discourse.warn_exception` without logster.

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

diff --git a/lib/discourse.rb b/lib/discourse.rb
index 67ac64c297..9a5247df00 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -745,7 +745,7 @@ module Discourse
       )
     else
       # no logster ... fallback
-      Rails.logger.warn("#{message} #{e}")
+      Rails.logger.warn("#{message} #{e}\n#{e.backtrace.join("\n")}")
     end
   rescue
     STDERR.puts "Failed to report exception #{e} #{message}"

From cbb4ea1ea8f4f49e3c9f078996efe9bfe28d58e6 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 11 Jun 2020 11:41:06 +0800
Subject: [PATCH 1641/1830] DEV: Don't blow up request redis can't be reached
 during failover.

---
 config/initializers/002-rails_failover.rb | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index 54692b7f82..a48b3dda21 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -65,9 +65,14 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
   end
 
   RailsFailover::ActiveRecord.register_force_reading_role_callback do
-    Discourse.redis.exists(
-      Discourse::PG_READONLY_MODE_KEY,
-      Discourse::PG_FORCE_READONLY_MODE_KEY
-    )
+    begin
+      Discourse.redis.exists?(
+        Discourse::PG_READONLY_MODE_KEY,
+        Discourse::PG_FORCE_READONLY_MODE_KEY
+      )
+    rescue => e
+      Discourse.warn_exception(e)
+      false
+    end
   end
 end

From e7af83e1fdd7b317054808a1ca71871843563ee6 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 11 Jun 2020 11:53:38 +0800
Subject: [PATCH 1642/1830] DEV: Run `apt-get update` before installing
 packages on CI.

```
E: Failed to fetch http://security.ubuntu.com/ubuntu/pool/universe/libj/libjpeg-turbo/libjpeg-turbo-progs_1.5.2-0ubuntu5.18.04.3_amd64.deb  404  Not Found [IP: 52.177.174.250 80]
E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?
```
---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 03f4e109c7..74f66c7b37 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -64,6 +64,7 @@ jobs:
       - name: Setup packages
         if: env.BUILD_TYPE != 'LINT'
         run: |
+          sudo apt-get update
           sudo apt-get -yqq install postgresql-client libpq-dev gifsicle jpegoptim optipng jhead
           wget -qO- https://raw.githubusercontent.com/discourse/discourse_docker/master/image/base/install-pngquant | sudo sh
 

From 34ee1f2e714d442f247f8441e6828ee90ba67afc Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 11 Jun 2020 12:30:01 +0800
Subject: [PATCH 1643/1830] DEV: Fix undefined method in rails_failover
 initializer.

---
 config/initializers/002-rails_failover.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index a48b3dda21..05f9af214e 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -66,12 +66,12 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
 
   RailsFailover::ActiveRecord.register_force_reading_role_callback do
     begin
-      Discourse.redis.exists?(
+      Discourse.redis.exists(
         Discourse::PG_READONLY_MODE_KEY,
         Discourse::PG_FORCE_READONLY_MODE_KEY
       )
     rescue => e
-      Discourse.warn_exception(e)
+      Discourse.warn_exception(e, message: "Failed to force AR reading role")
       false
     end
   end

From 1411b095ebd06c1ffcdc1a762e489e0886e502e4 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 11 Jun 2020 13:02:19 +0800
Subject: [PATCH 1644/1830] DEV: Rescue errors when runngin AR
 failover/fallback callbacks.

---
 config/initializers/002-rails_failover.rb | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index 05f9af214e..e31c601727 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -29,6 +29,9 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
       Discourse.enable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
       Sidekiq.pause!("pg_failover") if !Sidekiq.paused?
     end
+  rescue => e
+    Discourse.warn_exception(e, message: "Failed to run failover callback")
+    false
   end
 
   RailsFailover::ActiveRecord.on_fallback do
@@ -41,6 +44,9 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
       RailsMultisite::ConnectionManagement.default_connection_handler =
         ActiveRecord::Base.connection_handlers[ActiveRecord::Base.writing_role]
     end
+  rescue => e
+    Discourse.warn_exception(e, message: "Failed to run fallback callback")
+    false
   end
 
   module Discourse
@@ -65,14 +71,12 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
   end
 
   RailsFailover::ActiveRecord.register_force_reading_role_callback do
-    begin
-      Discourse.redis.exists(
-        Discourse::PG_READONLY_MODE_KEY,
-        Discourse::PG_FORCE_READONLY_MODE_KEY
-      )
-    rescue => e
-      Discourse.warn_exception(e, message: "Failed to force AR reading role")
-      false
-    end
+    Discourse.redis.exists(
+      Discourse::PG_READONLY_MODE_KEY,
+      Discourse::PG_FORCE_READONLY_MODE_KEY
+    )
+  rescue => e
+    Discourse.warn_exception(e, message: "Failed to force AR reading role")
+    false
   end
 end

From 90dc6c8ce595a6e01c8c941a5c6c566d953af5c1 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 11 Jun 2020 14:09:19 +0800
Subject: [PATCH 1645/1830] DEV: Fix deprecation warning when using
 `Redis#close` with redis namespace.

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

diff --git a/lib/discourse.rb b/lib/discourse.rb
index 9a5247df00..525bb799eb 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -666,7 +666,7 @@ module Discourse
     Discourse.cache.reconnect
     Logster.store.redis.reconnect
     # shuts down all connections in the pool
-    Sidekiq.redis_pool.shutdown { |conn| conn.close  }
+    Sidekiq.redis_pool.shutdown { |conn| conn.disconnect!  }
     # re-establish
     Sidekiq.redis = sidekiq_redis_config
 

From 0061f758bd0e11da27f8b214fdc30546247ef4fd Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 11 Jun 2020 11:39:57 +0530
Subject: [PATCH 1646/1830] Bump onebox version.

- temporary workaround to fetch Twitter OpenGraph data
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2870d86e7b..c2e3f8cad8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -248,7 +248,7 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.9.28.3)
+    onebox (1.9.28.4)
       addressable (~> 2.7.0)
       htmlentities (~> 4.3)
       multi_json (~> 1.11)

From a26b490047b58a0d75736421b8530ac216727cbe Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 11 Jun 2020 16:47:45 +1000
Subject: [PATCH 1647/1830] FIX: present correct new/unread counts when
 filtered by tag

Previously we would incorrectly ignore tags.

This ensures tracking state is properly shipped to client if
show_filter_by_tag is enabled.
---
 .../discourse/app/models/nav-item.js          | 11 +++++--
 .../app/models/topic-tracking-state.js        | 32 +++++++++++--------
 app/models/topic_tracking_state.rb            |  2 +-
 spec/models/topic_tracking_state_spec.rb      |  8 +++++
 .../models/topic-tracking-state-test.js       | 11 +++++--
 5 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/nav-item.js b/app/assets/javascripts/discourse/app/models/nav-item.js
index bf41bdde66..49c0ad37b4 100644
--- a/app/assets/javascripts/discourse/app/models/nav-item.js
+++ b/app/assets/javascripts/discourse/app/models/nav-item.js
@@ -71,11 +71,16 @@ const NavItem = EmberObject.extend({
     return mode + name.replace(" ", "-");
   },
 
-  @discourseComputed("name", "category", "topicTrackingState.messageCount")
-  count(name, category) {
+  @discourseComputed(
+    "name",
+    "category",
+    "tagId",
+    "topicTrackingState.messageCount"
+  )
+  count(name, category, tagId) {
     const state = this.topicTrackingState;
     if (state) {
-      return state.lookupCount(name, category);
+      return state.lookupCount(name, category, tagId);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
index ee18ed4287..2875f2a519 100644
--- a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
+++ b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
@@ -408,7 +408,7 @@ const TopicTrackingState = EmberObject.extend({
     return new Set(result);
   },
 
-  countCategoryByState(fn, categoryId) {
+  countCategoryByState(fn, categoryId, tagId) {
     const subcategoryIds = this.getSubCategoryIds(categoryId);
     return _.chain(this.states)
       .filter(fn)
@@ -416,17 +416,18 @@ const TopicTrackingState = EmberObject.extend({
         topic =>
           topic.archetype !== "private_message" &&
           !topic.deleted &&
-          (!categoryId || subcategoryIds.has(topic.category_id))
+          (!categoryId || subcategoryIds.has(topic.category_id)) &&
+          (!tagId || (topic.tags && topic.tags.indexOf(tagId) > -1))
       )
       .value().length;
   },
 
-  countNew(categoryId) {
-    return this.countCategoryByState(isNew, categoryId);
+  countNew(categoryId, tagId) {
+    return this.countCategoryByState(isNew, categoryId, tagId);
   },
 
-  countUnread(categoryId) {
-    return this.countCategoryByState(isUnread, categoryId);
+  countUnread(categoryId, tagId) {
+    return this.countCategoryByState(isUnread, categoryId, tagId);
   },
 
   countTags(tags) {
@@ -462,10 +463,14 @@ const TopicTrackingState = EmberObject.extend({
     return counts;
   },
 
-  countCategory(category_id) {
+  countCategory(category_id, tagId) {
     let sum = 0;
     Object.values(this.states).forEach(topic => {
-      if (topic.category_id === category_id && !topic.deleted) {
+      if (
+        topic.category_id === category_id &&
+        !topic.deleted &&
+        (!tagId || (topic.tags && topic.tags.indexOf(tagId) > -1))
+      ) {
         sum +=
           topic.last_read_post_number === null ||
           topic.last_read_post_number < topic.highest_post_number
@@ -476,23 +481,24 @@ const TopicTrackingState = EmberObject.extend({
     return sum;
   },
 
-  lookupCount(name, category) {
+  lookupCount(name, category, tagId) {
     if (name === "latest") {
       return (
-        this.lookupCount("new", category) + this.lookupCount("unread", category)
+        this.lookupCount("new", category, tagId) +
+        this.lookupCount("unread", category, tagId)
       );
     }
 
     let categoryId = category ? get(category, "id") : null;
 
     if (name === "new") {
-      return this.countNew(categoryId);
+      return this.countNew(categoryId, tagId);
     } else if (name === "unread") {
-      return this.countUnread(categoryId);
+      return this.countUnread(categoryId, tagId);
     } else {
       const categoryName = name.split("/")[1];
       if (categoryName) {
-        return this.countCategory(categoryId);
+        return this.countCategory(categoryId, tagId);
       }
     }
   },
diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index dcf1d60400..9adec9acc4 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -186,7 +186,7 @@ class TopicTrackingState
   end
 
   def self.include_tags_in_report?
-    @include_tags_in_report
+    @include_tags_in_report || SiteSetting.show_filter_by_tag
   end
 
   def self.include_tags_in_report=(v)
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index ae0f852d63..7baf794b04 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/spec/models/topic_tracking_state_spec.rb
@@ -585,6 +585,14 @@ describe TopicTrackingState do
       expect(row.tags).to contain_exactly("apples", "bananas")
 
       TopicTrackingState.include_tags_in_report = false
+      SiteSetting.show_filter_by_tag = true
+
+      report = TopicTrackingState.report(user)
+      expect(report.length).to eq(1)
+      row = report[0]
+      expect(row.tags).to contain_exactly("apples", "bananas")
+
+      SiteSetting.show_filter_by_tag = false
 
       report = TopicTrackingState.report(user)
       expect(report.length).to eq(1)
diff --git a/test/javascripts/models/topic-tracking-state-test.js b/test/javascripts/models/topic-tracking-state-test.js
index ee6c0c0e4e..d9151e4da1 100644
--- a/test/javascripts/models/topic-tracking-state-test.js
+++ b/test/javascripts/models/topic-tracking-state-test.js
@@ -175,7 +175,10 @@ QUnit.test("getSubCategoryIds", assert => {
 
 QUnit.test("countNew", assert => {
   const store = createStore();
-  const foo = store.createRecord("category", { id: 1, slug: "foo" });
+  const foo = store.createRecord("category", {
+    id: 1,
+    slug: "foo"
+  });
   const bar = store.createRecord("category", {
     id: 2,
     slug: "bar",
@@ -202,6 +205,7 @@ QUnit.test("countNew", assert => {
   };
 
   assert.equal(state.countNew(1), 1);
+  assert.equal(state.countNew(1, "missing-tag"), 0);
   assert.equal(state.countNew(2), 1);
   assert.equal(state.countNew(3), 0);
 
@@ -209,12 +213,15 @@ QUnit.test("countNew", assert => {
     last_read_post_number: null,
     id: 113,
     notification_level: NotificationLevels.TRACKING,
-    category_id: 3
+    category_id: 3,
+    tags: ["amazing"]
   };
 
   assert.equal(state.countNew(1), 2);
   assert.equal(state.countNew(2), 2);
   assert.equal(state.countNew(3), 1);
+  assert.equal(state.countNew(3, "amazing"), 1);
+  assert.equal(state.countNew(3, "missing"), 0);
 
   state.states["t111"] = {
     last_read_post_number: null,

From 2e8075bac326ec49b6b62111dcbfb7e058a2ec9b Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 11 Jun 2020 15:09:12 +0800
Subject: [PATCH 1648/1830] FIX: Ignore Redis readonly errors in
 `RateLimiter#rollback!`.

This is similar to what we're doing in `RateLimiter#performed!`.
---
 lib/rate_limiter.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/rate_limiter.rb b/lib/rate_limiter.rb
index 091eea3c28..7f3094e11a 100644
--- a/lib/rate_limiter.rb
+++ b/lib/rate_limiter.rb
@@ -102,6 +102,12 @@ class RateLimiter
   def rollback!
     return if RateLimiter.disabled?
     redis.lpop(prefixed_key)
+  rescue Redis::CommandError => e
+    if e.message =~ /READONLY/
+      # TODO,switch to in-memory rate limiter
+    else
+      raise
+    end
   end
 
   def remaining

From d47dc1e92deff45380b154a9aedf286bc9a0c1f5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 11 Jun 2020 17:49:36 +1000
Subject: [PATCH 1649/1830] DEV: Bump ffi from 1.13.0 to 1.13.1 (#10006)

Bumps [ffi](https://github.com/ffi/ffi) from 1.13.0 to 1.13.1.
- [Release notes](https://github.com/ffi/ffi/releases)
- [Changelog](https://github.com/ffi/ffi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ffi/ffi/compare/1.13.0...1.13.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

very safe change, should not impact anything.
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c2e3f8cad8..a3539e661a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -142,7 +142,7 @@ GEM
       rake-compiler
     fast_xs (0.8.0)
     fastimage (2.1.7)
-    ffi (1.13.0)
+    ffi (1.13.1)
     flamegraph (0.9.5)
     fspath (3.1.2)
     gc_tracer (1.5.1)

From b66f2187f1d83f163ba9daca33388bdbb551b3ce Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 11 Jun 2020 15:57:13 +0800
Subject: [PATCH 1650/1830] DEV: Don't use logstash for unicorn if ENV is
 blank.

---
 config/unicorn.conf.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index 71831433dd..1d1d0135ab 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -2,7 +2,7 @@
 
 # See http://unicorn.bogomips.org/Unicorn/Configurator.html
 
-if ENV["LOGSTASH_UNICORN_URI"]
+if (ENV["LOGSTASH_UNICORN_URI"] || "").length > 0
   require_relative '../lib/discourse_logstash_logger'
   logger DiscourseLogstashLogger.logger(uri: ENV['LOGSTASH_UNICORN_URI'], type: :unicorn)
 end

From dc4071dfef8e5bcc151a7e102098b0d70087e0f3 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 11 Jun 2020 17:24:32 +0800
Subject: [PATCH 1651/1830] DEV: Use `Rails.logger` instead of logster for
 rails_failover callbacks

`Discourse.warn_exception` logs to logger by default but it means we
lose all the backtrace when the logs are written to the log file.
---
 config/initializers/002-rails_failover.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index e31c601727..dadc068c5a 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -30,7 +30,7 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
       Sidekiq.pause!("pg_failover") if !Sidekiq.paused?
     end
   rescue => e
-    Discourse.warn_exception(e, message: "Failed to run failover callback")
+    Rails.logger.warn "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"
     false
   end
 
@@ -45,7 +45,7 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
         ActiveRecord::Base.connection_handlers[ActiveRecord::Base.writing_role]
     end
   rescue => e
-    Discourse.warn_exception(e, message: "Failed to run fallback callback")
+    Rails.logger.warn "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"
     false
   end
 
@@ -76,7 +76,7 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
       Discourse::PG_FORCE_READONLY_MODE_KEY
     )
   rescue => e
-    Discourse.warn_exception(e, message: "Failed to force AR reading role")
+    Rails.logger.warn "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"
     false
   end
 end

From 6fa990f05d7e8437cce639e9b1fd5e767fda2518 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 11 Jun 2020 12:27:48 +0200
Subject: [PATCH 1652/1830] FIX: prevents emoji in links to appear as large
 emojis (#10027)

---
 app/assets/stylesheets/common/base/emoji.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 49a6f2ce10..541da31e91 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -10,6 +10,7 @@ img.emoji.only-emoji {
   margin: 0.5em 0;
 }
 
+a,
 .md-table,
 .poll {
   img.emoji.only-emoji {

From c74f2b949f326bad882e6a51cda5738d779b2bb6 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 11 Jun 2020 11:45:46 +0100
Subject: [PATCH 1653/1830] DEV: Correct historical posts table schema
 discrepancies (#10014)

This is a no-op for modern installations. It only affects older sites.

Follow-up to f7d676dce19bc44f969d6b84ec820e2c72da3903

This needs to be done in a transaction, because we need to drop and recreate the badge_posts view.
---
 .../20200610150900_correct_posts_schema.rb    | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 db/post_migrate/20200610150900_correct_posts_schema.rb

diff --git a/db/post_migrate/20200610150900_correct_posts_schema.rb b/db/post_migrate/20200610150900_correct_posts_schema.rb
new file mode 100644
index 0000000000..c2fc2ba5d6
--- /dev/null
+++ b/db/post_migrate/20200610150900_correct_posts_schema.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+class CorrectPostsSchema < ActiveRecord::Migration[6.0]
+  # In the past, rails changed the default behavior for varchar columns
+  # This only affects older discourse installations
+  # This migration removes the character limits from posts columns, so that they match modern behavior
+  #
+  # To modify the posts table schema we need to recreate the badge_posts view
+  # This should be done in a transaction
+  def up
+    result = DB.query <<~SQL
+      SELECT character_maximum_length 
+      FROM information_schema.columns 
+      WHERE table_schema='public'
+      AND table_name = 'posts' 
+      AND column_name IN ('action_code', 'edit_reason')
+    SQL
+
+    # No need to continue if the schema is already correct
+    return if result.all? { |r| r.character_maximum_length.nil? }
+
+    execute "DROP VIEW badge_posts"
+
+    execute "ALTER TABLE posts ALTER COLUMN action_code TYPE varchar"
+    execute "ALTER TABLE posts ALTER COLUMN edit_reason TYPE varchar"
+
+    # we must recreate this view every time we amend posts
+    # p.* is auto expanded and persisted into the view definition
+    # at create time
+    execute <<~SQL
+      CREATE VIEW badge_posts AS
+      SELECT p.*
+      FROM posts p
+      JOIN topics t ON t.id = p.topic_id
+      JOIN categories c ON c.id = t.category_id
+      WHERE c.allow_badges AND
+            p.deleted_at IS NULL AND
+            t.deleted_at IS NULL AND
+            NOT c.read_restricted AND
+            t.visible AND
+            p.post_type IN (1,2,3)
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

From 45c399f0d7c5c4c6964b7e0267478e62a69538ab Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 11 Jun 2020 11:46:28 +0100
Subject: [PATCH 1654/1830] DEV: Correct historical badge and user_badge index
 discrepancies (#10017)

Badge and user_badge tables were created using add_column index: true
When the migration was written, `index: true` was a no-op for non-reference columns
Since then, rails made it work https://github.com/rails/rails/commit/9a0d35e820464f872b0340366dded639f00e19b9
This migration adds the index to very old sites, so that we have a consistent state
---
 ...1006172700_create_missing_badge_indexes.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 db/migrate/20201006172700_create_missing_badge_indexes.rb

diff --git a/db/migrate/20201006172700_create_missing_badge_indexes.rb b/db/migrate/20201006172700_create_missing_badge_indexes.rb
new file mode 100644
index 0000000000..7750d8118b
--- /dev/null
+++ b/db/migrate/20201006172700_create_missing_badge_indexes.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# Badge and user_badge tables were created using add_column index: true
+# When the migration was written, `index: true` was a no-op for non-reference columns
+# Since then, rails made it work https://github.com/rails/rails/commit/9a0d35e820464f872b0340366dded639f00e19b9
+# This migration adds the index to very old sites, so that we have a consistent state
+
+# frozen_string_literal: true
+
+class CreateMissingBadgeIndexes < ActiveRecord::Migration[6.0]
+  def up
+    execute "CREATE INDEX IF NOT EXISTS index_user_badges_on_user_id ON public.user_badges USING btree (user_id)"
+    execute "CREATE INDEX IF NOT EXISTS index_badges_on_badge_type_id ON public.badges USING btree (badge_type_id)"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

From dd85d44dda2d8017e693eb286d036a26fd0e07d8 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Thu, 11 Jun 2020 14:13:48 +0300
Subject: [PATCH 1655/1830] FIX: Show tag count for existing tags (#9892)

* FIX: Show tag count for existing tags

* Add test
---
 .../addon/components/mini-tag-chooser.js          |  2 +-
 .../select-kit/mini-tag-chooser-test.js           | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js
index 5c7035a022..4ec0997537 100644
--- a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js
+++ b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js
@@ -45,7 +45,7 @@ export default ComboBox.extend(TagsMixin, {
   },
 
   modifyComponentForRow(collection, item) {
-    if (this.getValue(item) === this.selectKit.filter) {
+    if (this.getValue(item) === this.selectKit.filter && !item.count) {
       return "select-kit/select-kit-row";
     }
 
diff --git a/test/javascripts/components/select-kit/mini-tag-chooser-test.js b/test/javascripts/components/select-kit/mini-tag-chooser-test.js
index 76265e7f83..c17b01bd6a 100644
--- a/test/javascripts/components/select-kit/mini-tag-chooser-test.js
+++ b/test/javascripts/components/select-kit/mini-tag-chooser-test.js
@@ -31,7 +31,20 @@ componentTest("create a tag", {
     assert.equal(this.subject.header().value(), "foo,bar");
 
     await this.subject.expand();
-    await this.subject.fillInFilter("monkey");
+    await this.subject.fillInFilter("mon");
+    assert.equal(
+      find(".select-kit-row")
+        .text()
+        .trim(),
+      "monkey x1"
+    );
+    await this.subject.fillInFilter("key");
+    assert.equal(
+      find(".select-kit-row")
+        .text()
+        .trim(),
+      "monkey x1"
+    );
     await this.subject.keyboard("enter");
 
     assert.equal(this.subject.header().value(), "foo,bar,monkey");

From b7e70850e48b55ef913fa26eeb932285a73d39f2 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Thu, 11 Jun 2020 14:53:41 +0300
Subject: [PATCH 1656/1830] FIX: Allow users to add emails which were deleted
 before

---
 app/models/email_log.rb               |  2 ++
 lib/email_updater.rb                  |  2 +-
 spec/components/email_updater_spec.rb | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/models/email_log.rb b/app/models/email_log.rb
index 4ca15594f1..6cfbca497a 100644
--- a/app/models/email_log.rb
+++ b/app/models/email_log.rb
@@ -6,8 +6,10 @@ class EmailLog < ActiveRecord::Base
     admin_login
     confirm_new_email
     confirm_old_email
+    confirm_old_email_add
     forgot_password
     notify_old_email
+    notify_old_email_add
     signup
     signup_after_approval
   }
diff --git a/lib/email_updater.rb b/lib/email_updater.rb
index 23f0a5c09b..bac085b51b 100644
--- a/lib/email_updater.rb
+++ b/lib/email_updater.rb
@@ -54,7 +54,7 @@ class EmailUpdater
       change_req.new_email = email
     end
 
-    if change_req.change_state.blank?
+    if change_req.change_state.blank? || change_req.change_state == EmailChangeRequest.states[:complete]
       change_req.change_state = if @user.staff?
         # Staff users must confirm their old email address first.
         EmailChangeRequest.states[:authorizing_old]
diff --git a/spec/components/email_updater_spec.rb b/spec/components/email_updater_spec.rb
index 046e8b04be..3476f48527 100644
--- a/spec/components/email_updater_spec.rb
+++ b/spec/components/email_updater_spec.rb
@@ -168,6 +168,25 @@ describe EmailUpdater do
           expect(@change_req.change_state).to eq(EmailChangeRequest.states[:complete])
         end
       end
+
+      context 'that was deleted before' do
+        it 'works' do
+          Jobs.expects(:enqueue).once.with(:critical_user_email, has_entries(type: :notify_old_email_add, to_address: old_email))
+          updater.confirm(@change_req.new_email_token.token)
+          expect(user.reload.user_emails.pluck(:email)).to contain_exactly(old_email, new_email)
+
+          user.user_emails.where(email: new_email).delete_all
+          expect(user.reload.user_emails.pluck(:email)).to contain_exactly(old_email)
+
+          Jobs.expects(:enqueue).once.with(:critical_user_email, has_entries(type: :confirm_new_email, to_address: new_email))
+          updater.change_to(new_email, add: true)
+          @change_req = user.email_change_requests.first
+
+          Jobs.expects(:enqueue).once.with(:critical_user_email, has_entries(type: :notify_old_email_add, to_address: old_email))
+          updater.confirm(@change_req.new_email_token.token)
+          expect(user.reload.user_emails.pluck(:email)).to contain_exactly(old_email, new_email)
+        end
+      end
     end
   end
 

From 3d55f2e3b761d7e54954c2e21e42737add1e56d2 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Thu, 11 Jun 2020 14:47:59 +0200
Subject: [PATCH 1657/1830] FIX: Improvements and fixes to the image downsizing
 script (#9950)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed bugs, added specs, extracted the upload downsizing code to a class, added support for non-S3 setups, changed it so that images aren't downloaded twice.

This code has been tested on production and successfully resized ~180k uploads.

Includes:

* DEV: Extract upload downsizing logic
* DEV: Add support for non-S3 uploads
* DEV: Process only images uploaded by users
* FIX: Incorrect usage of `count` and `exist?` typo
* DEV: Spec S3 image downsizing
* DEV: Avoid downloading images twice
* DEV: Update filesizes earlier in the process
* DEV: Return false on invalid upload
* FIX: Download images that currently above the limit (If the image size limit is decreased, then there was no way to resize those images that now fall outside the allowed size range)
* Update script/downsize_uploads.rb (Co-authored-by: Régis Hanol <regis@hanol.fr>)
---
 lib/file_store/base_store.rb           |   4 +-
 lib/shrink_uploaded_image.rb           | 236 +++++++++++++++++++++++
 script/downsize_uploads.rb             | 252 +++----------------------
 spec/fabricators/upload_fabricator.rb  |  14 ++
 spec/lib/shrink_uploaded_image_spec.rb | 103 ++++++++++
 5 files changed, 376 insertions(+), 233 deletions(-)
 create mode 100644 lib/shrink_uploaded_image.rb
 create mode 100644 spec/lib/shrink_uploaded_image_spec.rb

diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rb
index 7d22640b13..504267ebf4 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -76,13 +76,13 @@ module FileStore
       not_implemented
     end
 
-    def download(upload)
+    def download(upload, max_file_size_kb: nil)
       DistributedMutex.synchronize("download_#{upload.sha1}", validity: 3.minutes) do
         filename = "#{upload.sha1}#{File.extname(upload.original_filename)}"
         file = get_from_cache(filename)
 
         if !file
-          max_file_size_kb = [SiteSetting.max_image_size_kb, SiteSetting.max_attachment_size_kb].max.kilobytes
+          max_file_size_kb ||= [SiteSetting.max_image_size_kb, SiteSetting.max_attachment_size_kb].max.kilobytes
 
           url = upload.secure? ?
             Discourse.store.signed_url_for_path(upload.url) :
diff --git a/lib/shrink_uploaded_image.rb b/lib/shrink_uploaded_image.rb
new file mode 100644
index 0000000000..e5f57eb883
--- /dev/null
+++ b/lib/shrink_uploaded_image.rb
@@ -0,0 +1,236 @@
+# frozen_string_literal: true
+
+class ShrinkUploadedImage
+  attr_reader :upload, :path
+
+  def initialize(upload:, path:, max_pixels:, verbose: false, interactive: false)
+    @upload = upload
+    @path = path
+    @max_pixels = max_pixels
+    @verbose = verbose
+    @interactive = interactive
+  end
+
+  def perform
+    OptimizedImage.downsize(path, path, "#{@max_pixels}@", filename: upload.original_filename)
+    sha1 = Upload.generate_digest(path)
+
+    if sha1 == upload.sha1
+      log "No sha1 change"
+      return false
+    end
+
+    w, h = FastImage.size(path, timeout: 15, raise_on_failure: true)
+
+    if !w || !h
+      log "Invalid image dimensions after resizing"
+      return false
+    end
+
+    # Neither #dup or #clone provide a complete copy
+    original_upload = Upload.find(upload.id)
+    ww, hh = ImageSizer.resize(w, h)
+
+    # A different upload record that matches the sha1 of the downsized image
+    existing_upload = Upload.find_by(sha1: sha1)
+    @upload = existing_upload if existing_upload
+
+    upload.attributes = {
+      sha1: sha1,
+      width: w,
+      height: h,
+      thumbnail_width: ww,
+      thumbnail_height: hh,
+      filesize: File.size(path)
+    }
+
+    if upload.filesize > upload.filesize_was
+      log "No filesize reduction"
+      return false
+    end
+
+    unless existing_upload
+      url = Discourse.store.store_upload(File.new(path), upload)
+
+      unless url
+        log "Couldn't store the upload"
+        return false
+      end
+
+      upload.url = url
+    end
+
+    log "base62: #{original_upload.base62_sha1} -> #{Upload.base62_sha1(sha1)}"
+    log "sha: #{original_upload.sha1} -> #{sha1}"
+    log "(an exisiting upload)" if existing_upload
+
+    success = true
+    posts = Post.unscoped.joins(:post_uploads).where(post_uploads: { upload_id: original_upload.id }).uniq.sort_by(&:created_at)
+
+    posts.each do |post|
+      transform_post(post, original_upload, upload)
+
+      if post.custom_fields[Post::DOWNLOADED_IMAGES].present?
+        downloaded_images = JSON.parse(post.custom_fields[Post::DOWNLOADED_IMAGES])
+      end
+
+      if post.raw_changed?
+        log "Updating post"
+      elsif downloaded_images&.has_value?(original_upload.id)
+        log "A hotlinked, unreferenced image"
+      elsif post.raw.include?(upload.short_url)
+        log "Already processed"
+      elsif post.trashed?
+        log "A deleted post"
+      elsif !post.topic || post.topic.trashed?
+        log "A deleted topic"
+      elsif post.cooked.include?(original_upload.sha1)
+        if post.raw.include?("#{Discourse.base_url.sub(/^https?:\/\//i, "")}/t/")
+          log "Updating a topic onebox"
+        else
+          log "Updating an external onebox"
+        end
+      else
+        log "Could not find the upload URL"
+        success = false
+      end
+
+      log "#{Discourse.base_url}/p/#{post.id}"
+    end
+
+    if posts.empty?
+      log "Upload not used in any posts"
+
+      if User.where(uploaded_avatar_id: original_upload.id).exists?
+        log "Used as a User avatar"
+      elsif UserAvatar.where(gravatar_upload_id: original_upload.id).exists?
+        log "Used as a UserAvatar gravatar"
+      elsif UserAvatar.where(custom_upload_id: original_upload.id).exists?
+        log "Used as a UserAvatar custom upload"
+      elsif UserProfile.where(profile_background_upload_id: original_upload.id).exists?
+        log "Used as a UserProfile profile background"
+      elsif UserProfile.where(card_background_upload_id: original_upload.id).exists?
+        log "Used as a UserProfile card background"
+      elsif Category.where(uploaded_logo_id: original_upload.id).exists?
+        log "Used as a Category logo"
+      elsif Category.where(uploaded_background_id: original_upload.id).exists?
+        log "Used as a Category background"
+      elsif CustomEmoji.where(upload_id: original_upload.id).exists?
+        log "Used as a CustomEmoji"
+      elsif ThemeField.where(upload_id: original_upload.id).exists?
+        log "Used as a ThemeField"
+      else
+        success = false
+      end
+    end
+
+    unless success
+      if @interactive
+        print "Press any key to continue with the upload"
+        STDIN.beep
+        STDIN.getch
+        puts " k"
+      else
+        if !existing_upload && !Upload.where(url: upload.url).exists?
+          # We're bailing, so clean up the just uploaded file
+          Discourse.store.remove_upload(upload)
+        end
+
+        log "⏩ Skipping"
+        return false
+      end
+    end
+
+    unless upload.save
+      if !existing_upload && !Upload.where(url: upload.url).exists?
+        # We're bailing, so clean up the just uploaded file
+        Discourse.store.remove_upload(upload)
+      end
+
+      log "⏩ Skipping an invalid upload"
+      return false
+    end
+
+    if existing_upload
+      begin
+        PostUpload.where(upload_id: original_upload.id).update_all(upload_id: upload.id)
+      rescue ActiveRecord::RecordNotUnique, PG::UniqueViolation
+      end
+
+      User.where(uploaded_avatar_id: original_upload.id).update_all(uploaded_avatar_id: upload.id)
+      UserAvatar.where(gravatar_upload_id: original_upload.id).update_all(gravatar_upload_id: upload.id)
+      UserAvatar.where(custom_upload_id: original_upload.id).update_all(custom_upload_id: upload.id)
+      UserProfile.where(profile_background_upload_id: original_upload.id).update_all(profile_background_upload_id: upload.id)
+      UserProfile.where(card_background_upload_id: original_upload.id).update_all(card_background_upload_id: upload.id)
+      Category.where(uploaded_logo_id: original_upload.id).update_all(uploaded_logo_id: upload.id)
+      Category.where(uploaded_background_id: original_upload.id).update_all(uploaded_background_id: upload.id)
+      CustomEmoji.where(upload_id: original_upload.id).update_all(upload_id: upload.id)
+      ThemeField.where(upload_id: original_upload.id).update_all(upload_id: upload.id)
+    else
+      upload.optimized_images.each(&:destroy!)
+    end
+
+    posts.each do |post|
+      DistributedMutex.synchronize("process_post_#{post.id}") do
+        current_post = Post.unscoped.find(post.id)
+
+        # If the post became outdated, reapply changes
+        if current_post.updated_at != post.updated_at
+          transform_post(current_post, original_upload, upload)
+          post = current_post
+        end
+
+        if post.raw_changed?
+          post.update_columns(
+            raw: post.raw,
+            updated_at: Time.zone.now
+          )
+        end
+
+        if existing_upload && post.custom_fields[Post::DOWNLOADED_IMAGES].present?
+          downloaded_images = JSON.parse(post.custom_fields[Post::DOWNLOADED_IMAGES])
+
+          downloaded_images.transform_values! do |upload_id|
+            upload_id == original_upload.id ? upload.id : upload_id
+          end
+
+          post.custom_fields[Post::DOWNLOADED_IMAGES] = downloaded_images.to_json if downloaded_images.present?
+          post.save_custom_fields
+        end
+
+        post.rebake!
+      end
+    end
+
+    if existing_upload
+      original_upload.reload.destroy!
+    else
+      Discourse.store.remove_upload(original_upload)
+    end
+
+    true
+  end
+
+  private
+
+  def transform_post(post, upload_before, upload_after)
+    post.raw.gsub!(/upload:\/\/#{upload_before.base62_sha1}(\.#{upload_before.extension})?/i, upload_after.short_url)
+    post.raw.gsub!(Discourse.store.cdn_url(upload_before.url), Discourse.store.cdn_url(upload_after.url))
+    post.raw.gsub!("#{Discourse.base_url}#{upload_before.short_path}", "#{Discourse.base_url}#{upload_after.short_path}")
+
+    if SiteSetting.enable_s3_uploads
+      post.raw.gsub!(Discourse.store.url_for(upload_before), Discourse.store.url_for(upload_after))
+
+      path = SiteSetting.Upload.s3_upload_bucket.split("/", 2)[1]
+      post.raw.gsub!(/<img src=\"https:\/\/.+?\/#{path}\/uploads\/default\/optimized\/.+?\/#{upload_before.sha1}_\d_(?<width>\d+)x(?<height>\d+).*?\" alt=\"(?<alt>.*?)\"\/?>/i) do
+        "![#{$~[:alt]}|#{$~[:width]}x#{$~[:height]}](#{upload_after.short_url})"
+      end
+    end
+
+    post.raw.gsub!(/!\[(.*?)\]\(\/uploads\/.+?\/#{upload_before.sha1}(\.#{upload_before.extension})?\)/i, "![\\1](#{upload_after.short_url})")
+  end
+
+  def log(*args)
+    puts(*args) if @verbose
+  end
+end
diff --git a/script/downsize_uploads.rb b/script/downsize_uploads.rb
index dc2e7b2a62..7fcb1e6431 100644
--- a/script/downsize_uploads.rb
+++ b/script/downsize_uploads.rb
@@ -29,225 +29,13 @@ def log(*args)
   puts(*args) if ENV["VERBOSE"]
 end
 
-def transform_post(post, upload_before, upload_after)
-  post.raw.gsub!(/upload:\/\/#{upload_before.base62_sha1}(\.#{upload_before.extension})?/i, upload_after.short_url)
-  post.raw.gsub!(Discourse.store.cdn_url(upload_before.url), Discourse.store.cdn_url(upload_after.url))
-  post.raw.gsub!(Discourse.store.url_for(upload_before), Discourse.store.url_for(upload_after))
-  post.raw.gsub!("#{Discourse.base_url}#{upload_before.short_path}", "#{Discourse.base_url}#{upload_after.short_path}")
-
-  path = SiteSetting.Upload.s3_upload_bucket.split("/", 2)[1]
-  post.raw.gsub!(/<img src=\"https:\/\/.+?\/#{path}\/uploads\/default\/optimized\/.+?\/#{upload_before.sha1}_\d_(?<width>\d+)x(?<height>\d+).*?\" alt=\"(?<alt>.*?)\"\/?>/i) do
-    "![#{$~[:alt]}|#{$~[:width]}x#{$~[:height]}](#{upload_after.short_url})"
-  end
-
-  post.raw.gsub!(/!\[(.*?)\]\(\/uploads\/.+?\/#{upload_before.sha1}(\.#{upload_before.extension})?\)/i, "![\\1](#{upload_after.short_url})")
-end
-
-def downsize_upload(upload, path)
-  # Make sure the filesize is up to date
-  upload.filesize = File.size(path)
-
-  OptimizedImage.downsize(path, path, "#{MAX_IMAGE_PIXELS}@", filename: upload.original_filename)
-  sha1 = Upload.generate_digest(path)
-
-  if sha1 == upload.sha1
-    log "No sha1 change"
-    return
-  end
-
-  w, h = FastImage.size(path, timeout: 15, raise_on_failure: true)
-
-  if !w || !h
-    log "Invalid image dimensions after resizing"
-    return
-  end
-
-  # Neither #dup or #clone provide a complete copy
-  original_upload = Upload.find(upload.id)
-  ww, hh = ImageSizer.resize(w, h)
-
-  # A different upload record that matches the sha1 of the downsized image
-  existing_upload = Upload.find_by(sha1: sha1)
-  upload = existing_upload if existing_upload
-
-  upload.attributes = {
-    sha1: sha1,
-    width: w,
-    height: h,
-    thumbnail_width: ww,
-    thumbnail_height: hh,
-    filesize: File.size(path)
-  }
-
-  if upload.filesize > upload.filesize_was
-    log "No filesize reduction"
-    return
-  end
-
-  unless existing_upload
-    url = Discourse.store.store_upload(File.new(path), upload)
-
-    unless url
-      log "Couldn't store the upload"
-      return
-    end
-
-    upload.url = url
-  end
-
-  log "base62: #{original_upload.base62_sha1} -> #{Upload.base62_sha1(sha1)}"
-  log "sha: #{original_upload.sha1} -> #{sha1}"
-  log "(an exisiting upload)" if existing_upload
-
-  success = true
-  posts = Post.unscoped.joins(:post_uploads).where(post_uploads: { upload_id: original_upload.id }).uniq.sort_by(&:created_at)
-
-  posts.each do |post|
-    transform_post(post, original_upload, upload)
-
-    if post.custom_fields[Post::DOWNLOADED_IMAGES].present?
-      downloaded_images = JSON.parse(post.custom_fields[Post::DOWNLOADED_IMAGES])
-    end
-
-    if post.raw_changed?
-      log "Updating post"
-    elsif downloaded_images&.has_value?(original_upload.id)
-      log "A hotlinked, unreferenced image"
-    elsif post.raw.include?(upload.short_url)
-      log "Already processed"
-    elsif post.trashed?
-      log "A deleted post"
-    elsif !post.topic || post.topic.trashed?
-      log "A deleted topic"
-    elsif post.cooked.include?(original_upload.sha1)
-      if post.raw.include?("#{Discourse.base_url.sub(/^https?:\/\//i, "")}/t/")
-        log "Updating a topic onebox"
-      else
-        log "Updating an external onebox"
-      end
-    else
-      log "Could not find the upload URL"
-      success = false
-    end
-
-    log "#{Discourse.base_url}/p/#{post.id}"
-  end
-
-  if posts.empty?
-    log "Upload not used in any posts"
-
-    if User.where(uploaded_avatar_id: original_upload.id).count
-      log "Used as a User avatar"
-    elsif UserAvatar.where(gravatar_upload_id: original_upload.id).count
-      log "Used as a UserAvatar gravatar"
-    elsif UserAvatar.where(custom_upload_id: original_upload.id).count
-      log "Used as a UserAvatar custom upload"
-    elsif UserProfile.where(profile_background_upload_id: original_upload.id).count
-      log "Used as a UserProfile profile background"
-    elsif UserProfile.where(card_background_upload_id: original_upload.id).count
-      log "Used as a UserProfile card background"
-    elsif Category.where(uploaded_logo_id: original_upload.id).count
-      log "Used as a Category logo"
-    elsif Category.where(uploaded_background_id: original_upload.id).count
-      log "Used as a Category background"
-    elsif CustomEmoji.where(upload_id: original_upload.id).count
-      log "Used as a CustomEmoji"
-    elsif ThemeField.where(upload_id: original_upload.id).count
-      log "Used as a ThemeField"
-    else
-      success = false
-    end
-  end
-
-  unless success
-    if ENV["INTERACTIVE"]
-      print "Press any key to continue with the upload"
-      STDIN.beep
-      STDIN.getch
-      puts " k"
-    elsif !existing_upload && !Upload.where(url: upload.url).exist?
-      # We're bailing, so clean up the just uploaded file
-      Discourse.store.remove_upload(upload)
-
-      log "⏩ Skipping"
-      return
-    end
-  end
-
-  upload.save!
-
-  if existing_upload
-    begin
-      PostUpload.where(upload_id: original_upload.id).update_all(upload_id: upload.id)
-    rescue ActiveRecord::RecordNotUnique, PG::UniqueViolation
-    end
-
-    User.where(uploaded_avatar_id: original_upload.id).update_all(uploaded_avatar_id: upload.id)
-    UserAvatar.where(gravatar_upload_id: original_upload.id).update_all(gravatar_upload_id: upload.id)
-    UserAvatar.where(custom_upload_id: original_upload.id).update_all(custom_upload_id: upload.id)
-    UserProfile.where(profile_background_upload_id: original_upload.id).update_all(profile_background_upload_id: upload.id)
-    UserProfile.where(card_background_upload_id: original_upload.id).update_all(card_background_upload_id: upload.id)
-    Category.where(uploaded_logo_id: original_upload.id).update_all(uploaded_logo_id: upload.id)
-    Category.where(uploaded_background_id: original_upload.id).update_all(uploaded_background_id: upload.id)
-    CustomEmoji.where(upload_id: original_upload.id).update_all(upload_id: upload.id)
-    ThemeField.where(upload_id: original_upload.id).update_all(upload_id: upload.id)
-  else
-    upload.optimized_images.each(&:destroy!)
-  end
-
-  posts.each do |post|
-    DistributedMutex.synchronize("process_post_#{post.id}") do
-      current_post = Post.unscoped.find(post.id)
-
-      # If the post became outdated, reapply changes
-      if current_post.updated_at != post.updated_at
-        transform_post(current_post, original_upload, upload)
-        post = current_post
-      end
-
-      if post.raw_changed?
-        post.update_columns(
-          raw: post.raw,
-          updated_at: Time.zone.now
-        )
-      end
-
-      if existing_upload && post.custom_fields[Post::DOWNLOADED_IMAGES].present?
-        downloaded_images = JSON.parse(post.custom_fields[Post::DOWNLOADED_IMAGES])
-
-        downloaded_images.transform_values! do |upload_id|
-          upload_id == original_upload.id ? upload.id : upload_id
-        end
-
-        post.custom_fields[Post::DOWNLOADED_IMAGES] = downloaded_images.to_json if downloaded_images.present?
-        post.save_custom_fields
-      end
-
-      post.rebake!
-    end
-  end
-
-  if existing_upload
-    original_upload.reload.destroy!
-  else
-    Discourse.store.remove_upload(original_upload)
-  end
-
-  true
-end
-
 def process_uploads
-  unless SiteSetting.Upload.enable_s3_uploads
-    puts "This script supports only S3 uploads"
-    return
-  end
-
   puts "", "Downsizing images to no more than #{MAX_IMAGE_PIXELS} pixels"
 
   dimensions_count = 0
   downsized_count = 0
 
-  scope = Upload.where("LOWER(extension) IN ('jpg', 'jpeg', 'gif', 'png')")
+  scope = Upload.by_users.where("LOWER(extension) IN ('jpg', 'jpeg', 'gif', 'png')")
   scope = scope.where(<<-SQL, MAX_IMAGE_PIXELS)
     COALESCE(width, 0) = 0 OR
     COALESCE(height, 0) = 0 OR
@@ -271,19 +59,20 @@ def process_uploads
     print "\r#{progress}% Fixed dimensions: #{dimensions_count} Downsized: #{downsized_count} Skipped: #{skipped} (upload id: #{upload.id})"
     log "\n"
 
-    source = upload.local? ? Discourse.store.path_for(upload) : "https:#{upload.url}"
+    path = if upload.local?
+      Discourse.store.path_for(upload)
+    else
+      (Discourse.store.download(upload, max_file_size_kb: 100.megabytes) rescue nil)&.path
+    end
 
-    unless source
-      log "No path or URL"
+    unless path
+      log "No image path"
       skipped += 1
       next
     end
 
     begin
-      w, h = FastImage.size(source, timeout: 15, raise_on_failure: true)
-    rescue FastImage::ImageFetchFailure
-      log "Retrying image resizing"
-      w, h = FastImage.size(source, timeout: 15)
+      w, h = FastImage.size(path, raise_on_failure: true)
     rescue FastImage::UnknownImageType
       log "Unknown image type"
       skipped += 1
@@ -312,13 +101,14 @@ def process_uploads
       width: w,
       height: h,
       thumbnail_width: ww,
-      thumbnail_height: hh
+      thumbnail_height: hh,
+      filesize: File.size(path)
     }
 
     if upload.changed?
       log "Correcting the upload dimensions"
-      log "Before: #{upload.width_was}x#{upload.height_was} #{upload.thumbnail_width_was}x#{upload.thumbnail_height_was}"
-      log "After:  #{w}x#{h} #{ww}x#{hh}"
+      log "Before: #{upload.width_was}x#{upload.height_was} #{upload.thumbnail_width_was}x#{upload.thumbnail_height_was} (#{upload.filesize_was})"
+      log "After:  #{w}x#{h} #{ww}x#{hh} (#{upload.filesize})"
 
       dimensions_count += 1
       upload.save!
@@ -330,15 +120,15 @@ def process_uploads
       next
     end
 
-    path = upload.local? ? source : (Discourse.store.download(upload) rescue nil)&.path
+    result = ShrinkUploadedImage.new(
+      upload: upload,
+      path: path,
+      max_pixels: MAX_IMAGE_PIXELS,
+      verbose: ENV["VERBOSE"],
+      interactive: ENV["INTERACTIVE"]
+    ).perform
 
-    unless path
-      log "No image path"
-      skipped += 1
-      next
-    end
-
-    if downsize_upload(upload, path)
+    if result
       downsized_count += 1
     else
       skipped += 1
diff --git a/spec/fabricators/upload_fabricator.rb b/spec/fabricators/upload_fabricator.rb
index 65e4a1bf2f..62272ecb9e 100644
--- a/spec/fabricators/upload_fabricator.rb
+++ b/spec/fabricators/upload_fabricator.rb
@@ -66,6 +66,20 @@ Fabricator(:upload_s3, from: :upload) do
   end
 end
 
+Fabricator(:s3_image_upload, from: :upload_s3) do
+  after_create do |upload|
+    file = Tempfile.new(['fabricated', '.png'])
+    `convert -size #{upload.width}x#{upload.height} xc:white "#{file.path}"`
+
+    Discourse.store.store_upload(file, upload)
+    upload.sha1 = Upload.generate_digest(file.path)
+
+    WebMock
+      .stub_request(:get, upload.url)
+      .to_return(status: 200, body: File.new(file.path))
+  end
+end
+
 Fabricator(:secure_upload_s3, from: :upload_s3) do
   secure true
   sha1 { SecureRandom.hex(20) }
diff --git a/spec/lib/shrink_uploaded_image_spec.rb b/spec/lib/shrink_uploaded_image_spec.rb
new file mode 100644
index 0000000000..8c8e47165a
--- /dev/null
+++ b/spec/lib/shrink_uploaded_image_spec.rb
@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe ShrinkUploadedImage do
+  context "when local uploads are enabled" do
+    let(:upload) { Fabricate(:image_upload, width: 200, height: 200) }
+
+    it "resizes the image" do
+      filesize_before = upload.filesize
+      post = Fabricate(:post, raw: "<img src='#{upload.url}'>")
+      post.link_post_uploads
+
+      result = ShrinkUploadedImage.new(
+        upload: upload,
+        path: Discourse.store.path_for(upload),
+        max_pixels: 10_000
+      ).perform
+
+      expect(result).to be(true)
+      expect(upload.width).to eq(100)
+      expect(upload.height).to eq(100)
+      expect(upload.filesize).to be < filesize_before
+    end
+
+    it "returns false if the image is not used by any models" do
+      result = ShrinkUploadedImage.new(
+        upload: upload,
+        path: Discourse.store.path_for(upload),
+        max_pixels: 10_000
+      ).perform
+
+      expect(result).to be(false)
+    end
+
+    it "returns false if the image cannot be shrunk more" do
+      post = Fabricate(:post, raw: "<img src='#{upload.url}'>")
+      post.link_post_uploads
+      ShrinkUploadedImage.new(
+        upload: upload,
+        path: Discourse.store.path_for(upload),
+        max_pixels: 10_000
+      ).perform
+
+      upload.reload
+
+      result = ShrinkUploadedImage.new(
+        upload: upload,
+        path: Discourse.store.path_for(upload),
+        max_pixels: 10_000
+      ).perform
+
+      expect(result).to be(false)
+    end
+
+    it "returns false when the upload is above the size limit" do
+      post = Fabricate(:post, raw: "<img src='#{upload.url}'>")
+      post.link_post_uploads
+      SiteSetting.max_image_size_kb = 0.001 # 1 byte
+
+      result = ShrinkUploadedImage.new(
+        upload: upload,
+        path: Discourse.store.path_for(upload),
+        max_pixels: 10_000
+      ).perform
+
+      expect(result).to be(false)
+    end
+  end
+
+  context "when S3 uploads are enabled" do
+    let(:upload) { Fabricate(:s3_image_upload, width: 200, height: 200) }
+
+    before do
+      SiteSetting.enable_s3_uploads = true
+      SiteSetting.s3_access_key_id = "fakeid7974664"
+      SiteSetting.s3_secret_access_key = "fakesecretid7974664"
+
+      store = FileStore::S3Store.new
+      s3_helper = store.instance_variable_get(:@s3_helper)
+      client = Aws::S3::Client.new(stub_responses: true)
+      s3_helper.stubs(:s3_client).returns(client)
+      Discourse.stubs(:store).returns(store)
+    end
+
+    it "resizes the image" do
+      filesize_before = upload.filesize
+      post = Fabricate(:post, raw: "<img src='#{upload.url}'>")
+      post.link_post_uploads
+
+      result = ShrinkUploadedImage.new(
+        upload: upload,
+        path: Discourse.store.download(upload).path,
+        max_pixels: 10_000
+      ).perform
+
+      expect(result).to be(true)
+      expect(upload.width).to eq(100)
+      expect(upload.height).to eq(100)
+      expect(upload.filesize).to be < filesize_before
+    end
+  end
+end

From a4bfa3542070213026a13ece344db4745c17efe7 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Thu, 11 Jun 2020 11:06:48 -0300
Subject: [PATCH 1658/1830] DEV: Pass the is_image flag when triggering the
 before_upload_creation event (#10031)

---
 lib/upload_creator.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index 368569af44..caaacb0a74 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -34,16 +34,14 @@ class UploadCreator
       return @upload
     end
 
-    DiscourseEvent.trigger(:before_upload_creation, @file)
+    @image_info = FastImage.new(@file) rescue nil
+    is_image = FileHelper.is_supported_image?(@filename)
+    is_image ||= @image_info && FileHelper.is_supported_image?("test.#{@image_info.type}")
+    is_image = false if @opts[:for_theme]
+
+    DiscourseEvent.trigger(:before_upload_creation, @file, is_image)
 
     DistributedMutex.synchronize("upload_#{user_id}_#{@filename}") do
-      # test for image regardless of input
-      @image_info = FastImage.new(@file) rescue nil
-
-      is_image = FileHelper.is_supported_image?(@filename)
-      is_image ||= @image_info && FileHelper.is_supported_image?("test.#{@image_info.type}")
-      is_image = false if @opts[:for_theme]
-
       if is_image
         extract_image_info!
         return @upload if @upload.errors.present?

From 2e2dcb7d933772801e1c6201217686fb5d593b59 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 12 Jun 2020 09:22:40 +0800
Subject: [PATCH 1659/1830] DEV: Disable better_errors by default.

It adds a somewhat unnecessary middleware before `ActionDispatch::DebugExceptions` and totally bypasses it. Apps that register exception interceptors with `ActionDispatch::DebugExceptions` would therefore stop working if better_errors is used.
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index b708152130..8e4acf64cd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -178,7 +178,7 @@ end
 group :development do
   gem 'ruby-prof', require: false, platform: :mri
   gem 'bullet', require: !!ENV['BULLET']
-  gem 'better_errors', platform: :mri
+  gem 'better_errors', platform: :mri, require: !!ENV['BETTER_ERRORS']
   gem 'binding_of_caller'
   gem 'yaml-lint'
   gem 'annotate'

From 62ad4737162adfe0a139d497efcebec55ddb6554 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 12 Jun 2020 09:54:05 +0800
Subject: [PATCH 1660/1830] FIX: Preload readonly mode attribute seperately.

There are two problems I'm trying to tackle here.

1. The site json is cached for anonymous users so readonly mode can be
cached for up to 30 minutes which makes it confusing.

2. We've already checked for readonly mode in the controller so having
to check for readonly mode again in `SiteSerializer` is adding an extra
Redis query on every request.
---
 app/assets/javascripts/discourse/app/models/site.js | 4 +++-
 app/controllers/application_controller.rb           | 1 +
 app/serializers/site_serializer.rb                  | 5 -----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/site.js b/app/assets/javascripts/discourse/app/models/site.js
index 8e6b8f2d2c..0481485a9f 100644
--- a/app/assets/javascripts/discourse/app/models/site.js
+++ b/app/assets/javascripts/discourse/app/models/site.js
@@ -132,7 +132,9 @@ Site.reopenClass(Singleton, {
   // The current singleton will retrieve its attributes from the `PreloadStore`.
   createCurrent() {
     const store = Discourse.__container__.lookup("service:store");
-    return store.createRecord("site", PreloadStore.get("site"));
+    const siteAttributes = PreloadStore.get("site");
+    siteAttributes["isReadOnly"] = PreloadStore.get("isReadOnly");
+    return store.createRecord("site", siteAttributes);
   },
 
   create() {
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c59266e130..eaaa515d8e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -539,6 +539,7 @@ class ApplicationController < ActionController::Base
     store_preloaded("customHTML", custom_html_json)
     store_preloaded("banner", banner_json)
     store_preloaded("customEmoji", custom_emoji)
+    store_preloaded("isReadOnly", @readonly_mode.to_s)
   end
 
   def preload_current_user_data
diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index d5bb901346..96833f398e 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -12,7 +12,6 @@ class SiteSerializer < ApplicationSerializer
     :top_menu_items,
     :anonymous_top_menu_items,
     :uncategorized_category_id, # this is hidden so putting it here
-    :is_readonly,
     :disabled_plugins,
     :user_field_max_length,
     :post_action_types,
@@ -95,10 +94,6 @@ class SiteSerializer < ApplicationSerializer
     SiteSetting.uncategorized_category_id
   end
 
-  def is_readonly
-    Discourse.readonly_mode?
-  end
-
   def disabled_plugins
     Discourse.disabled_plugin_names
   end

From 78b5ab746c93743cefd0b555c22e9b99998f4b19 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 12 Jun 2020 09:58:02 +0800
Subject: [PATCH 1661/1830] DEV: No longer need to clear anon cache when
 toggling readonly mode.

---
 config/initializers/002-rails_failover.rb | 1 -
 lib/discourse.rb                          | 2 --
 2 files changed, 3 deletions(-)

diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index dadc068c5a..c8f1cfb192 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -58,7 +58,6 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
       Discourse.redis.set(PG_FORCE_READONLY_MODE_KEY, 1)
       Sidekiq.pause!("pg_failover") if !Sidekiq.paused?
       MessageBus.publish(readonly_channel, true)
-      Site.clear_anon_cache!
       true
     end
 
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 525bb799eb..11c10e946a 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -448,7 +448,6 @@ module Discourse
     end
 
     MessageBus.publish(readonly_channel, true)
-    Site.clear_anon_cache!
     true
   end
 
@@ -484,7 +483,6 @@ module Discourse
   def self.disable_readonly_mode(key = READONLY_MODE_KEY)
     Discourse.redis.del(key)
     MessageBus.publish(readonly_channel, false)
-    Site.clear_anon_cache!
     true
   end
 

From 2fbd4eb11f6a8c2b7b38603efb171d10356b7596 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 12 Jun 2020 10:14:45 +0800
Subject: [PATCH 1662/1830] DEV: Remove double query in
 `Group#remove_review_group`.

Probably a mistake during commit.
---
 app/models/group.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/group.rb b/app/models/group.rb
index 0988cc3303..3d15993b9c 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -57,7 +57,6 @@ class Group < ActiveRecord::Base
 
   def remove_review_groups
     Category.where(review_group_id: self.id).update_all(review_group_id: nil)
-    Category.where(review_group_id: self.id).update_all(review_group_id: nil)
   end
 
   validate :name_format_validator

From 3aab98781a96b5893257d0d6ca4516d185c93ff1 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 12 Jun 2020 10:22:22 +0800
Subject: [PATCH 1663/1830] Fix tests.

---
 spec/components/discourse_spec.rb | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/spec/components/discourse_spec.rb b/spec/components/discourse_spec.rb
index 3f1e62d446..92fe3a1074 100644
--- a/spec/components/discourse_spec.rb
+++ b/spec/components/discourse_spec.rb
@@ -220,46 +220,22 @@ describe Discourse do
       expect(Discourse.redis.get(key)).to eq(nil)
     end
 
-    def get_readonly_message
-      message = nil
-
-      messages = MessageBus.track_publish do
-        yield
-      end
-
-      expect(messages.any? { |m| m.channel == Site::SITE_JSON_CHANNEL })
-        .to eq(true)
-
-      messages.find { |m| m.channel == Discourse.readonly_channel }
-    end
-
     describe ".enable_readonly_mode" do
       it "adds a key in redis and publish a message through the message bus" do
         expect(Discourse.redis.get(readonly_mode_key)).to eq(nil)
-        message = get_readonly_message { Discourse.enable_readonly_mode }
-        assert_readonly_mode(message, readonly_mode_key, readonly_mode_ttl)
       end
 
       context 'user enabled readonly mode' do
         it "adds a key in redis and publish a message through the message bus" do
           expect(Discourse.redis.get(user_readonly_mode_key)).to eq(nil)
-          message = get_readonly_message { Discourse.enable_readonly_mode(user_readonly_mode_key) }
-          assert_readonly_mode(message, user_readonly_mode_key)
         end
       end
     end
 
     describe ".disable_readonly_mode" do
-      it "removes a key from redis and publish a message through the message bus" do
-        message = get_readonly_message { Discourse.disable_readonly_mode }
-        assert_readonly_mode_disabled(message, readonly_mode_key)
-      end
-
       context 'user disabled readonly mode' do
         it "removes readonly key in redis and publish a message through the message bus" do
           Discourse.enable_readonly_mode(user_enabled: true)
-          message = get_readonly_message { Discourse.disable_readonly_mode(user_enabled: true) }
-          assert_readonly_mode_disabled(message, user_readonly_mode_key)
         end
       end
     end

From b2c94cc8eafb2ce1c0e8f286f5fe64b9ec15bed6 Mon Sep 17 00:00:00 2001
From: Andrew Schleifer <me@andrewschleifer.name>
Date: Fri, 12 Jun 2020 02:55:50 +0000
Subject: [PATCH 1664/1830] FIX: do not migrate backups in the new prefix

---
 lib/backup_restore/s3_backup_store.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/backup_restore/s3_backup_store.rb b/lib/backup_restore/s3_backup_store.rb
index 108cb661ba..359167b97c 100644
--- a/lib/backup_restore/s3_backup_store.rb
+++ b/lib/backup_restore/s3_backup_store.rb
@@ -53,9 +53,11 @@ module BackupRestore
 
     def vacate_legacy_prefix
       legacy_s3_helper = S3Helper.new(s3_bucket_name_with_legacy_prefix, '', @s3_options.clone)
-      legacy_keys = legacy_s3_helper.list.map { |o| o.key }
+      bucket, prefix = s3_bucket_name_with_prefix.split('/', 2)
+      legacy_keys = legacy_s3_helper.list
+        .reject { |o| o.key.starts_with? prefix }
+        .map { |o| o.key }
       legacy_keys.each do |legacy_key|
-        bucket, prefix = s3_bucket_name_with_prefix.split('/', 2)
         @s3_helper.s3_client.copy_object({
           copy_source: File.join(bucket, legacy_key),
           bucket: bucket,

From f57ecf22e0f29224532470caf0955ef4d1b314f7 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 11 Jun 2020 23:20:25 -0400
Subject: [PATCH 1665/1830] UX: Send background color to iPad app too

Previously, we were only updating mobile devices.
---
 .../discourse/app/initializers/mobile.js      | 11 ----------
 .../app/initializers/webview-background.js    | 20 +++++++++++++++++++
 2 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/initializers/webview-background.js

diff --git a/app/assets/javascripts/discourse/app/initializers/mobile.js b/app/assets/javascripts/discourse/app/initializers/mobile.js
index b0708fca85..d219ce5ca0 100644
--- a/app/assets/javascripts/discourse/app/initializers/mobile.js
+++ b/app/assets/javascripts/discourse/app/initializers/mobile.js
@@ -1,7 +1,5 @@
-import { later } from "@ember/runloop";
 import Mobile from "discourse/lib/mobile";
 import { setResolverOption } from "discourse-common/resolver";
-import { isAppWebview, postRNWebviewMessage } from "discourse/lib/utilities";
 
 // Initializes the `Mobile` helper object.
 export default {
@@ -16,14 +14,5 @@ export default {
     site.set("isMobileDevice", Mobile.isMobileDevice);
 
     setResolverOption("mobileView", Mobile.mobileView);
-
-    if (isAppWebview()) {
-      later(() => {
-        postRNWebviewMessage(
-          "headerBg",
-          $(".d-header").css("background-color")
-        );
-      }, 500);
-    }
   }
 };
diff --git a/app/assets/javascripts/discourse/app/initializers/webview-background.js b/app/assets/javascripts/discourse/app/initializers/webview-background.js
new file mode 100644
index 0000000000..e24db7d65e
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/initializers/webview-background.js
@@ -0,0 +1,20 @@
+import { later } from "@ember/runloop";
+import { isAppWebview, postRNWebviewMessage } from "discourse/lib/utilities";
+
+// Send bg color to webview so iOS status bar matches site theme
+export default {
+  name: "webview-background",
+  after: "inject-objects",
+
+  initialize() {
+    if (isAppWebview()) {
+      later(() => {
+        const header = document.querySelectorAll(".d-header")[0];
+        if (header) {
+          const styles = window.getComputedStyle(header);
+          postRNWebviewMessage("headerBg", styles.backgroundColor);
+        }
+      }, 500);
+    }
+  }
+};

From c9964b95ced1701eab28cfd8831abdaad7cb6711 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 12 Jun 2020 12:17:28 +0800
Subject: [PATCH 1666/1830] DEV: Increase log level for `/srv/status` route.

This reduces the amount of noise in our logs.
---
 config/initializers/100-quiet_logger.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/initializers/100-quiet_logger.rb b/config/initializers/100-quiet_logger.rb
index ad8e1798b9..6c7e11db62 100644
--- a/config/initializers/100-quiet_logger.rb
+++ b/config/initializers/100-quiet_logger.rb
@@ -8,7 +8,8 @@ module DiscourseRackQuietAssetsLogger
   def call(env)
     override = false
     if (env['PATH_INFO'].index("/assets/") == 0) ||
-       (env['PATH_INFO'].index("mini-profiler-resources") == 0)
+       (env['PATH_INFO'].index("mini-profiler-resources") == 0) ||
+       (env['PATH_INFO'].index("/srv/status") == 0)
       if ::Logster::Logger === Rails.logger
         override = true
         Rails.logger.override_level = Logger::ERROR

From 7211394e4da89e94506e42a79bf7cc361ba99bd9 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Fri, 12 Jun 2020 16:20:07 +1000
Subject: [PATCH 1667/1830] FEATURE: include tags in unread/new messages

We need this information to maintain counts on tracked/watched
tags.
---
 app/models/topic_tracking_state.rb | 62 +++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 18 deletions(-)

diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index 9adec9acc4..6380c8011c 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -24,18 +24,35 @@ class TopicTrackingState
   def self.publish_new(topic)
     return unless topic.regular?
 
+    tags, tag_ids = nil
+    if SiteSetting.tagging_enabled
+      topic.tags.pluck(:id, :name).each do |id, name|
+        tags ||= []
+        tag_ids ||= []
+
+        tags << name
+        tag_ids << id
+      end
+    end
+
+    payload = {
+      last_read_post_number: nil,
+      highest_post_number: 1,
+      created_at: topic.created_at,
+      topic_id: topic.id,
+      category_id: topic.category_id,
+      archetype: topic.archetype,
+    }
+
+    if tags
+      payload[:tags] = tags
+      payload[:topic_tag_ids] = tag_ids
+    end
+
     message = {
       topic_id: topic.id,
       message_type: "new_topic",
-      payload: {
-        last_read_post_number: nil,
-        highest_post_number: 1,
-        created_at: topic.created_at,
-        topic_id: topic.id,
-        category_id: topic.category_id,
-        archetype: topic.archetype,
-        topic_tag_ids: topic.tags.pluck(:id)
-      }
+      payload: payload
     }
 
     group_ids = topic.category && topic.category.secure_group_ids
@@ -99,22 +116,31 @@ class TopicTrackingState
         post.topic.category && post.topic.category.secure_group_ids
       end
 
+    tags = nil
+    if include_tags_in_report?
+      tags = post.topic.tags.pluck(:name)
+    end
+
     TopicUser
       .tracking(post.topic_id)
       .select([:user_id, :last_read_post_number, :notification_level])
       .each do |tu|
 
+      payload = {
+        last_read_post_number: tu.last_read_post_number,
+        highest_post_number: post.post_number,
+        created_at: post.created_at,
+        category_id: post.topic.category_id,
+        notification_level: tu.notification_level,
+        archetype: post.topic.archetype
+      }
+
+      payload[:tags] = tags if tags
+
       message = {
         topic_id: post.topic_id,
         message_type: UNREAD_MESSAGE_TYPE,
-        payload: {
-          last_read_post_number: tu.last_read_post_number,
-          highest_post_number: post.post_number,
-          created_at: post.created_at,
-          category_id: post.topic.category_id,
-          notification_level: tu.notification_level,
-          archetype: post.topic.archetype
-        }
+        payload: payload
       }
 
       MessageBus.publish(self.unread_channel_key(tu.user_id), message.as_json, group_ids: group_ids)
@@ -186,7 +212,7 @@ class TopicTrackingState
   end
 
   def self.include_tags_in_report?
-    @include_tags_in_report || SiteSetting.show_filter_by_tag
+    SiteSetting.tagging_enabled && (@include_tags_in_report || SiteSetting.show_filter_by_tag)
   end
 
   def self.include_tags_in_report=(v)

From 4b793a1072f4fcb37b916dcb309dec720a8f099b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 12 Jun 2020 12:54:28 +0200
Subject: [PATCH 1668/1830] FIX: allows PM owner to remove any user if >= TL2
 (#10036)

---
 lib/guardian/topic_guardian.rb   |  1 +
 spec/components/guardian_spec.rb | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index e4df0a1cf2..33f5d836f4 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -5,6 +5,7 @@ module TopicGuardian
 
   def can_remove_allowed_users?(topic, target_user = nil)
     is_staff? ||
+    (topic.user == user && user.has_trust_level?(TrustLevel[2])) ||
     (
       topic.allowed_users.count > 1 &&
       topic.user != target_user &&
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index 53b1b14c1c..ef8245254d 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -3446,8 +3446,23 @@ describe Guardian do
       end
     end
 
+    context 'trust_level >= 2 user' do
+      fab!(:topic_creator) { build(:user, trust_level: 2) }
+      fab!(:topic) { Fabricate(:topic, user: topic_creator) }
+
+      before do
+        topic.allowed_users << topic_creator
+        topic.allowed_users << another_user
+      end
+
+      it 'should be true' do
+        expect(Guardian.new(topic_creator).can_remove_allowed_users?(topic))
+          .to eq(true)
+      end
+    end
+
     context 'normal user' do
-      fab!(:topic) { Fabricate(:topic, user: Fabricate(:user)) }
+      fab!(:topic) { Fabricate(:topic, user: Fabricate(:user, trust_level: 1)) }
 
       before do
         topic.allowed_users << user

From 60196cc192885346feacd26f59a8b838b88d70cb Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Fri, 12 Jun 2020 14:48:45 +0300
Subject: [PATCH 1669/1830] FIX: Hide bootbox after a negative answer (#10028)

Starting to reply and then editing a post was not possible because of a
bootbox which kept showing up.
---
 .../discourse/app/controllers/composer.js      |  6 ++++--
 test/javascripts/acceptance/composer-test.js   | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index 3ca2b70f36..569338907e 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -1040,7 +1040,7 @@ export default Controller.extend({
     const keyPrefix =
       this.model.action === "edit" ? "post.abandon_edit" : "post.abandon";
 
-    let promise = new Promise(resolve => {
+    let promise = new Promise((resolve, reject) => {
       if (this.get("model.hasMetaData") || this.get("model.replyDirty")) {
         bootbox.dialog(I18n.t(keyPrefix + ".confirm"), [
           {
@@ -1052,8 +1052,10 @@ export default Controller.extend({
               if (differentDraft) {
                 this.model.clearState();
                 this.close();
+                resolve();
               }
-              resolve();
+
+              reject();
             }
           },
           {
diff --git a/test/javascripts/acceptance/composer-test.js b/test/javascripts/acceptance/composer-test.js
index 50b698e3ae..74f87d5cef 100644
--- a/test/javascripts/acceptance/composer-test.js
+++ b/test/javascripts/acceptance/composer-test.js
@@ -271,6 +271,24 @@ QUnit.test("Create a Reply", async assert => {
   );
 });
 
+QUnit.test("Can edit a post after starting a reply", async assert => {
+  await visit("/t/internationalization-localization/280");
+
+  await click("#topic-footer-buttons .create");
+  await fillIn(".d-editor-input", "this is the content of my reply");
+
+  await click(".topic-post:eq(0) button.show-more-actions");
+  await click(".topic-post:eq(0) button.edit");
+
+  await click("a[data-handler='0']");
+
+  assert.ok(!visible(".bootbox.modal"));
+  assert.equal(
+    find(".d-editor-input").val(),
+    "this is the content of my reply"
+  );
+});
+
 QUnit.test("Posting on a different topic", async assert => {
   await visit("/t/internationalization-localization/280");
   await click("#topic-footer-buttons .btn.create");

From 111877db1f97271d667bdd05139c798cf7fd26d2 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Fri, 12 Jun 2020 14:48:44 +0300
Subject: [PATCH 1670/1830] FIX: Load I18n first in show_confirm_new_email page

---
 app/views/users_email/show_confirm_new_email.html.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/users_email/show_confirm_new_email.html.erb b/app/views/users_email/show_confirm_new_email.html.erb
index ba5102e13d..dc56120f9a 100644
--- a/app/views/users_email/show_confirm_new_email.html.erb
+++ b/app/views/users_email/show_confirm_new_email.html.erb
@@ -77,9 +77,11 @@
     <%end%>
   <% end%>
 
-  <%= preload_script "ember_jquery" %>
   <%= preload_script "locales/#{I18n.locale}" %>
-  <%= preload_script "locales/i18n" %>
+  <%- if ExtraLocalesController.client_overrides_exist? %>
+    <%= preload_script_url ExtraLocalesController.url('overrides') %>
+  <%- end %>
+  <%= preload_script 'ember_jquery' %>
   <%= preload_script "discourse/app/lib/webauthn" %>
   <%= preload_script "confirm-new-email/confirm-new-email" %>
   <%= preload_script "confirm-new-email/bootstrap" %>

From ff6811ceb801aaedf3734d1e40c94413b7c42235 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Fri, 12 Jun 2020 14:52:32 +0300
Subject: [PATCH 1671/1830] Allow multiple groups which can vote when creating
 a poll (#10015)

* FEATURE: Allow multiple groups which can vote when creating a poll

* DEV: Fix select-kit deprecations

* DEV: Fix lint
---
 .../admin/templates/user-index.hbs            |  2 +-
 ...min-group-selector.js => group-chooser.js} |  4 +-
 .../controllers/poll-ui-builder.js.es6        |  6 ++-
 .../templates/modal/poll-ui-builder.hbs       | 40 ++++++++++---------
 .../stylesheets/common/poll-ui-builder.scss   |  3 +-
 .../acceptance/admin-user-index-test.js       | 10 ++---
 6 files changed, 36 insertions(+), 29 deletions(-)
 rename app/assets/javascripts/select-kit/addon/components/{admin-group-selector.js => group-chooser.js} (64%)

diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index df9a6e196f..62e500f805 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -514,7 +514,7 @@
     <div class="display-row">
       <div class="field">{{i18n "admin.groups.custom"}}</div>
       <div class="value">
-        {{admin-group-selector
+        {{group-chooser
           content=availableGroups
           value=customGroupIdsBuffer
           labelProperty="name"
diff --git a/app/assets/javascripts/select-kit/addon/components/admin-group-selector.js b/app/assets/javascripts/select-kit/addon/components/group-chooser.js
similarity index 64%
rename from app/assets/javascripts/select-kit/addon/components/admin-group-selector.js
rename to app/assets/javascripts/select-kit/addon/components/group-chooser.js
index 1b02a45d28..740642c674 100644
--- a/app/assets/javascripts/select-kit/addon/components/admin-group-selector.js
+++ b/app/assets/javascripts/select-kit/addon/components/group-chooser.js
@@ -1,8 +1,8 @@
 import MultiSelectComponent from "select-kit/components/multi-select";
 
 export default MultiSelectComponent.extend({
-  pluginApiIdentifiers: ["admin-group-selector"],
-  classNames: ["admin-group-selector"],
+  pluginApiIdentifiers: ["group-chooser"],
+  classNames: ["group-chooser"],
   selectKitOptions: {
     allowAny: false
   }
diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
index a653b8113b..8dc72084c7 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
@@ -97,7 +97,7 @@ export default Controller.extend({
       .map(g => {
         // prevents group "everyone" to be listed
         if (g.id !== 0) {
-          return { name: g.name, value: g.name };
+          return { name: g.name };
         }
       })
       .filter(Boolean);
@@ -251,7 +251,9 @@ export default Controller.extend({
     if (publicPoll) pollHeader += ` public=true`;
     if (chartType && pollType !== "number")
       pollHeader += ` chartType=${chartType}`;
-    if (pollGroups) pollHeader += ` groups=${pollGroups}`;
+    if (pollGroups && pollGroups.length > 0) {
+      pollHeader += ` groups=${pollGroups}`;
+    }
     if (autoClose) {
       let closeDate = moment(
         date + " " + time,
diff --git a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
index 28e9f7c8e4..03e08acee7 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
@@ -2,7 +2,7 @@
   <form class="poll-ui-builder-form form-horizontal">
     <div class="options">
       <div class="input-group poll-select">
-        <label class="input-group-label">{{i18n 'poll.ui_builder.poll_type.label'}}</label>
+        <label class="input-group-label">{{i18n "poll.ui_builder.poll_type.label"}}</label>
         {{combo-box
           content=pollTypes
           value=pollType
@@ -13,39 +13,43 @@
       </div>
 
       <div class="input-group poll-select">
-        <label class="input-group-label">{{i18n 'poll.ui_builder.poll_result.label'}}</label>
+        <label class="input-group-label">{{i18n "poll.ui_builder.poll_result.label"}}</label>
         {{combo-box
           content=pollResults
           value=pollResult
           class="poll-result"
           valueProperty="value"
+          onChange=(action (mut pollResult))
         }}
       </div>
 
       <div class="input-group poll-select">
-        <label class="input-group-label">{{i18n 'poll.ui_builder.poll_groups.label'}}</label>
-        {{combo-box content=siteGroups
-                    value=pollGroups
-                    options=(hash clearable=true)
-                    valueAttribute="value"}}
+        <label class="input-group-label">{{i18n "poll.ui_builder.poll_groups.label"}}</label>
+        {{group-chooser
+          content=siteGroups
+          value=pollGroups
+          onChange=(action (mut pollGroups))
+          labelProperty="name"
+          valueProperty="name"}}
       </div>
 
       {{#unless isNumber}}
         <div class="input-group poll-select">
-          <label class="input-group-label">{{i18n 'poll.ui_builder.poll_chart_type.label'}}</label>
+          <label class="input-group-label">{{i18n "poll.ui_builder.poll_chart_type.label"}}</label>
           {{combo-box
             class="poll-chart-type"
             content=pollChartTypes
             value=chartType
-            valueAttribute="value"
+            valueProperty="value"
+            onChange=(action (mut chartType))
           }}
         </div>
       {{/unless}}
 
       {{#if showMinMax}}
         <div class="input-group poll-number">
-          <label class="input-group-label">{{i18n 'poll.ui_builder.poll_config.min'}}</label>
-          {{input type='number'
+          <label class="input-group-label">{{i18n "poll.ui_builder.poll_config.min"}}</label>
+          {{input type="number"
                   value=pollMin
                   valueProperty="value"
                   class="poll-options-min"}}
@@ -53,8 +57,8 @@
         {{input-tip validation=minMaxValueValidation}}
 
         <div class="input-group poll-number">
-          <label class="input-group-label">{{i18n 'poll.ui_builder.poll_config.max'}}</label>
-          {{input type='number'
+          <label class="input-group-label">{{i18n "poll.ui_builder.poll_config.max"}}</label>
+          {{input type="number"
                   value=pollMax
                   valueProperty="value"
                   class="poll-options-max"}}
@@ -62,8 +66,8 @@
 
         {{#if isNumber}}
           <div class="input-group poll-number">
-            <label class="input-group-label">{{i18n 'poll.ui_builder.poll_config.step'}}</label>
-            {{input type='number'
+            <label class="input-group-label">{{i18n "poll.ui_builder.poll_config.step"}}</label>
+            {{input type="number"
                     value=pollStep
                     valueProperty="value"
                     min="1"
@@ -75,7 +79,7 @@
 
       {{#unless isNumber}}
         <div class="input-group poll-textarea">
-          <label>{{i18n 'poll.ui_builder.poll_options.label'}}</label>
+          <label>{{i18n "poll.ui_builder.poll_options.label"}}</label>
           {{textarea value=pollOptions autocomplete="discourse"}}
         </div>
         {{input-tip validation=minNumOfOptionsValidation}}
@@ -84,7 +88,7 @@
       {{#unless isPie}}
         <div class="input-group poll-checkbox">
           <label>
-            {{input type='checkbox' checked=publicPoll}}
+            {{input type="checkbox" checked=publicPoll}}
             {{i18n "poll.ui_builder.poll_public.label"}}
           </label>
         </div>
@@ -116,5 +120,5 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button action=(action "insertPoll") icon="chart-bar" class='btn-primary' label='poll.ui_builder.insert' disabled=disableInsert}}
+  {{d-button action=(action "insertPoll") icon="chart-bar" class="btn-primary" label="poll.ui_builder.insert" disabled=disableInsert}}
 </div>
diff --git a/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
index df3c17eacb..7f38887ed4 100644
--- a/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
+++ b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
@@ -8,7 +8,8 @@ $poll-margin: 10px;
     flex-shrink: 0;
     width: 280px;
   }
-  .combo-box {
+  .combo-box,
+  .multi-select {
     min-width: 180px;
     width: 180px;
   }
diff --git a/test/javascripts/acceptance/admin-user-index-test.js b/test/javascripts/acceptance/admin-user-index-test.js
index 4c57cbbf97..5e20f3d2ac 100644
--- a/test/javascripts/acceptance/admin-user-index-test.js
+++ b/test/javascripts/acceptance/admin-user-index-test.js
@@ -86,10 +86,10 @@ QUnit.test("will clear unsaved groups when switching user", async assert => {
     "the name should be correct"
   );
 
-  const groupSelector = selectKit(".admin-group-selector");
-  await groupSelector.expand();
-  await groupSelector.selectRowByValue(42);
-  assert.equal(groupSelector.header().value(), 42, "group should be set");
+  const groupChooser = selectKit(".group-chooser");
+  await groupChooser.expand();
+  await groupChooser.selectRowByValue(42);
+  assert.equal(groupChooser.header().value(), 42, "group should be set");
 
   await visit("/admin/users/1/eviltrout");
 
@@ -102,7 +102,7 @@ QUnit.test("will clear unsaved groups when switching user", async assert => {
   );
 
   assert.equal(
-    find('.admin-group-selector span[title="Macdonald"]').length,
+    find('.group-chooser span[title="Macdonald"]').length,
     0,
     "group should not be set"
   );

From d0a7f15764f8344e1f39a41624d77326990be5ed Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 12 Jun 2020 16:24:25 -0400
Subject: [PATCH 1672/1830] Usercard buttons on mobile should utilize full
 width

---
 app/assets/stylesheets/mobile/components/user-card.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/mobile/components/user-card.scss b/app/assets/stylesheets/mobile/components/user-card.scss
index 7d3cc1f9d0..c39f97919a 100644
--- a/app/assets/stylesheets/mobile/components/user-card.scss
+++ b/app/assets/stylesheets/mobile/components/user-card.scss
@@ -22,11 +22,14 @@ $avatar_width: 120px;
       margin-top: 1em;
       max-width: 100%;
       li {
-        flex: 1;
+        flex: 1 0 auto;
         min-width: 0;
         &:nth-child(2) {
           border-left: 0.5em solid transparent;
         }
+        &:empty {
+          display: none;
+        }
         button {
           @include ellipsis;
         }

From 2adad96d0594a075f24d268c0c3b71ffe438db40 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 12 Jun 2020 17:07:50 -0400
Subject: [PATCH 1673/1830] Center align items in select kit headers

---
 app/assets/stylesheets/common/select-kit/select-kit.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 8a696d6e13..4080d1db95 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -71,6 +71,7 @@
     .selected-name {
       text-align: left;
       flex: 0 1 auto;
+      align-items: center;
       color: inherit;
       display: flex;
       outline: none;

From 16b41aa485016cff1129dae1cf94bd498814942c Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 12 Jun 2020 17:15:59 -0400
Subject: [PATCH 1674/1830] Save button alignment fixes for admin badge page

---
 app/assets/stylesheets/common/admin/badges.scss | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/common/admin/badges.scss b/app/assets/stylesheets/common/admin/badges.scss
index 78d715f407..72b34678ca 100644
--- a/app/assets/stylesheets/common/admin/badges.scss
+++ b/app/assets/stylesheets/common/admin/badges.scss
@@ -112,13 +112,13 @@
     border-top: 1px solid $primary-low;
   }
   .buttons {
-    float: left;
-    width: 200px;
+    display: flex;
+    align-items: center;
+    button {
+      margin-right: 0.5em;
+    }
     .saving {
-      padding: 5px 0 0 0;
-      margin-left: 10px;
-      width: 80px;
-      color: $primary;
+      order: 3;
     }
   }
 }

From 7429512ced5827290810ffc11c675b6d77b28d58 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 12 Jun 2020 18:44:42 -0400
Subject: [PATCH 1675/1830] FIX: Get correct right/left offset for topic
 progress bar on compose

---
 .../javascripts/discourse/app/components/topic-progress.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/topic-progress.js b/app/assets/javascripts/discourse/app/components/topic-progress.js
index 3f927bd78c..bf0f5cb3bf 100644
--- a/app/assets/javascripts/discourse/app/components/topic-progress.js
+++ b/app/assets/javascripts/discourse/app/components/topic-progress.js
@@ -180,7 +180,7 @@ export default Component.extend({
     this.set("docked", isDocked);
 
     const $replyArea = $("#reply-control .reply-area");
-    if ($replyArea && $replyArea.length > 0 && wrapperDir === "left") {
+    if ($replyArea && $replyArea.length > 0) {
       $wrapper.css(wrapperDir, `${$replyArea.offset().left}px`);
     } else {
       $wrapper.css(wrapperDir, "1em");

From 14dc6f350ed9b50755ba25c270012380d19a9603 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 13 Jun 2020 10:46:57 +0300
Subject: [PATCH 1676/1830] Build(deps): Bump logster from 2.8.0 to 2.9.0
 (#10035)

Bumps [logster](https://github.com/discourse/logster) from 2.8.0 to 2.9.0.
- [Release notes](https://github.com/discourse/logster/releases)
- [Changelog](https://github.com/discourse/logster/blob/master/CHANGELOG.md)
- [Commits](https://github.com/discourse/logster/commits)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index a3539e661a..e4fd8ddb57 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -181,7 +181,7 @@ GEM
     logstash-event (1.2.02)
     logstash-logger (0.26.1)
       logstash-event (~> 1.2)
-    logster (2.8.0)
+    logster (2.9.0)
     loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)

From 36a3675e0ac3561186e53cd1c5dbc0590b57d752 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sun, 14 Jun 2020 23:39:33 +0200
Subject: [PATCH 1677/1830] Update translations

---
 config/locales/client.ar.yml                  |    6 +-
 config/locales/client.be.yml                  |    4 +
 config/locales/client.bg.yml                  |    4 +
 config/locales/client.bs_BA.yml               |   11 +-
 config/locales/client.ca.yml                  |   11 +-
 config/locales/client.cs.yml                  |    5 +-
 config/locales/client.da.yml                  |   14 +-
 config/locales/client.de.yml                  |   17 +-
 config/locales/client.el.yml                  |    4 +
 config/locales/client.es.yml                  |   11 +-
 config/locales/client.et.yml                  |    5 +-
 config/locales/client.fa_IR.yml               |    7 +-
 config/locales/client.fi.yml                  |    7 +-
 config/locales/client.fr.yml                  |   36 +-
 config/locales/client.gl.yml                  |    2 +
 config/locales/client.he.yml                  |   23 +-
 config/locales/client.hu.yml                  |    5 +-
 config/locales/client.hy.yml                  |   11 +-
 config/locales/client.id.yml                  |    2 +-
 config/locales/client.it.yml                  |   50 +-
 config/locales/client.ja.yml                  |    5 +-
 config/locales/client.ko.yml                  |   17 +-
 config/locales/client.lt.yml                  |    5 +-
 config/locales/client.lv.yml                  |    3 +
 config/locales/client.nb_NO.yml               |    5 +-
 config/locales/client.nl.yml                  |   22 +-
 config/locales/client.pl_PL.yml               |   26 +-
 config/locales/client.pt.yml                  |   27 +-
 config/locales/client.pt_BR.yml               |   11 +-
 config/locales/client.ro.yml                  |    4 +
 config/locales/client.ru.yml                  |   57 +-
 config/locales/client.sk.yml                  |    5 +-
 config/locales/client.sl.yml                  |    8 +-
 config/locales/client.sq.yml                  |    4 +
 config/locales/client.sr.yml                  |    4 +
 config/locales/client.sv.yml                  |   40 +-
 config/locales/client.sw.yml                  |    8 +-
 config/locales/client.te.yml                  |    2 +
 config/locales/client.th.yml                  | 1069 ++++++++++++-----
 config/locales/client.tr_TR.yml               |   17 +-
 config/locales/client.uk.yml                  |   14 +-
 config/locales/client.ur.yml                  |    9 +-
 config/locales/client.vi.yml                  |    3 +-
 config/locales/client.zh_CN.yml               |   40 +-
 config/locales/client.zh_TW.yml               |    9 +-
 config/locales/server.ar.yml                  |    2 +
 config/locales/server.be.yml                  |    2 +
 config/locales/server.ca.yml                  |    3 +-
 config/locales/server.da.yml                  |    2 +
 config/locales/server.de.yml                  |    3 +-
 config/locales/server.el.yml                  |    2 +
 config/locales/server.es.yml                  |    3 +-
 config/locales/server.fa_IR.yml               |    2 +
 config/locales/server.fi.yml                  |    3 +-
 config/locales/server.fr.yml                  |   21 +-
 config/locales/server.he.yml                  |   26 +-
 config/locales/server.hy.yml                  |    2 +
 config/locales/server.it.yml                  |   31 +-
 config/locales/server.ja.yml                  |    2 +
 config/locales/server.ko.yml                  |    1 -
 config/locales/server.nl.yml                  |    3 +-
 config/locales/server.pl_PL.yml               |    3 +-
 config/locales/server.pt_BR.yml               |    7 +-
 config/locales/server.ru.yml                  |   25 +-
 config/locales/server.sl.yml                  |    2 +
 config/locales/server.sq.yml                  |    2 +
 config/locales/server.sv.yml                  |   29 +-
 config/locales/server.sw.yml                  |    2 +
 config/locales/server.th.yml                  |   64 +
 config/locales/server.tr_TR.yml               |    3 +-
 config/locales/server.uk.yml                  |    3 +-
 config/locales/server.ur.yml                  |    2 +
 config/locales/server.zh_CN.yml               |   46 +-
 config/locales/server.zh_TW.yml               |    2 +
 lib/i18n/locale_file_checker.rb               |    4 +-
 .../config/locales/server.pt.yml              |    6 +-
 .../config/locales/client.th.yml              |    1 +
 .../config/locales/server.pt.yml              |    5 +-
 .../config/locales/server.pt.yml              |   14 +-
 .../config/locales/server.pt.yml              |    2 +-
 plugins/poll/config/locales/client.it.yml     |   12 +
 plugins/poll/config/locales/client.pt.yml     |   27 +-
 plugins/poll/config/locales/server.pt.yml     |   14 +-
 public/422.pt.html                            |    2 +-
 public/500.pt.html                            |    4 +-
 public/503.pt.html                            |    8 +-
 86 files changed, 1517 insertions(+), 529 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 4c1a70a7e1..3e9b7d13da 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -835,6 +835,8 @@ ar:
         title: "تغيير اسم المستخدم"
         taken: "عذرا، اسم المستخدم غير متاح."
         invalid: "اسم المستخدم غير صالح. يمكنه احتواء احرف و ارقام انجليزية فحسب"
+      add_email:
+        add: "أضف"
       change_email:
         title: "غيّر البريد الإلكتروني"
         taken: "عذرا، البريد الإلكتروني غير متوفر."
@@ -853,6 +855,8 @@ ar:
         instructions: "سيتم وضع صورة الخلفية في المنتصف بعرض 590px"
       email:
         title: "البريد الإلكتروني"
+        primary_label: "الأساسي"
+        update_email: "غيّر البريد الإلكتروني"
         ok: "سنرسل لك بريدا للتأكيد"
         invalid: "من فضلك أدخل بريدا إلكترونيا صالحا"
         authenticated: "تم توثيق بريدك الإلكتروني بواسطة %{provider}"
@@ -2641,7 +2645,7 @@ ar:
           total: "مجموع الوقت الكلي"
           no_data: "لا توجد بيانات للعرض"
           filters:
-            file-extension:
+            file_extension:
               label: إمتداد الملف
             group:
               label: المجموعة
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index 982c44fc43..22754d8c22 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -479,6 +479,8 @@ be:
         title: "Змена імя карыстальніка"
         taken: "Выбачайце, гэтае імя карыстальніка ўжо занятае."
         invalid: "Такое імя карыстальніка не падыйдзе. Яно павінна ўтрымліваць толькі лічбы і літары"
+      add_email:
+        add: "дадаць"
       change_email:
         title: "Змяненне адрасы электроннай пошты"
         taken: "Выбачайце, гэты адрас не даступны."
@@ -493,6 +495,8 @@ be:
         title: "Фон вашай візітоўкі"
       email:
         title: "Электронная пошта"
+        primary_label: "асноўнай"
+        update_email: "Змяненне адрасы электроннай пошты"
         invalid: "Калі ласка, увядзіце верны email"
       associated_accounts:
         title: "Асацыяваныя аккаўнты"
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index efc23c459e..2cf0f0c039 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -811,6 +811,8 @@ bg:
         title: "Смяна на потребителското име."
         taken: "Съжаляваме, това потребителско име е заето."
         invalid: "Потребителското име не е валидно. Трябва да включва само цифри и букви"
+      add_email:
+        add: "добавяне"
       change_email:
         title: "Смяна на Имейла"
         taken: "Съжаляваме, този имейл адрес не е свободен."
@@ -829,6 +831,8 @@ bg:
         instructions: "Фонът ще бъде центриран и ще има дължина 590 пиксела."
       email:
         title: "Имейл"
+        primary_label: "главен"
+        update_email: "Смяна на Имейла"
         instructions: "Не е публичен"
         ok: "Ще Ви изпратим имейл за потвърждение."
         invalid: "Моля, въведете валиден имейл адрес"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 70d0af662d..e4e1f7c01f 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -992,6 +992,8 @@ bs_BA:
         confirm: "Da li ste apsolutno sigurni da želite promijeniti svoje korisničko ime?"
         taken: "Nažalost, to korisničko ime je zauzeto."
         invalid: "To korisničko ime nije validno. Mora sadržavati samo brojeve i slova"
+      add_email:
+        add: "Dodaj"
       change_email:
         title: "Promijeni Email"
         taken: "Nažalost, taj email nije dostupan."
@@ -1018,8 +1020,9 @@ bs_BA:
         title: "Email"
         primary: "Primarni Email"
         secondary: "Sekundari Emailovi"
-        no_secondary: "Nema sekundarnih emailova"
-        sso_override_instructions: "E-pošta se može ažurirati od SSO provajdera."
+        primary_label: "primary"
+        update_email: "Promijeni Email"
+        ssDestroy_override_instructions: "E-pošta se može ažurirati od SSO provajdera."
         instructions: "Nikada nije prikazan javnosti."
         ok: "Izgleda dobro. Poslat ćemo email sa potvrdom."
         invalid: "Molimo vas da unesete validnu email adresu."
@@ -1305,8 +1308,6 @@ bs_BA:
       enabled: "Ovaj sajt je u read only mod-u: Dozvoljeno je čitati. Možete nastaviti sa pregledom, ali odgovaranje na objave, lajkanje i ostale akcije su isključene za sada."
       login_disabled: "Ulogovanje je isključeno jer je sajt u read only načinu rada."
       logout_disabled: "Odjava je isključena sve dok je sajt u read only tj. samo čitanje je dozvoljeno načinu rada."
-    logs_error_rate_notice:
-      reached_hour_MF: "<b>{realtivna starost}</b> - <a href='{url}' target='_blank'>{stopa, množina, jedna {# pogreška / sat} ostala {# errors / hour}}</a> dostigla je granicu postavljanja stranice {granica, množina, jednu {# error / hour} druge {# errors / hour}}."
     learn_more: "saznaj više..."
     all_time: "ukupno"
     all_time_desc: "ukupno kreiranih tema"
@@ -3099,7 +3100,7 @@ bs_BA:
             more: '<a href="%{basePath}/admin/logs/search_logs">Pretraživanje dnevnika</a>'
             disabled: 'Izvješće o pretraživanju trendova je onemogućeno. Omogućite <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">upite pretraživanja dnevnika</a> za prikupljanje podataka.'
           filters:
-            file-extension:
+            file_extension:
               label: Ekstenzija datoteke
             group:
               label: Grupa
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 1387fda522..768da7d409 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -942,6 +942,8 @@ ca:
         confirm: "Esteu del tot segur que voleu canviar el nom d'usuari?"
         taken: "Aquest nom d'usuari ja està agafat."
         invalid: "El nom d'usuari no és vàlid. Ha d'incloure només xifres i lletres."
+      add_email:
+        add: "afegeix"
       change_email:
         title: "Canvi de correu"
         taken: "Aquest correu electrònic no està disponible."
@@ -969,8 +971,9 @@ ca:
         title: "Correu electrònic"
         primary: "Adreça de correu primària"
         secondary: "Adreces de correu secundàries"
-        no_secondary: "Sense adreces de correu secundàries"
-        sso_override_instructions: "L'adreça de correu es pot actualitzar des d'un proveïdor SSO"
+        primary_label: "primari"
+        update_email: "Canvi de correu"
+        ssDestroy_override_instructions: "L'adreça de correu es pot actualitzar des d'un proveïdor SSO"
         instructions: "No es mostra mai en públic."
         ok: "Us enviarem un correu electrònic de confirmació"
         invalid: "Introduïu una adreça vàlida de correu electrònic"
@@ -1249,7 +1252,7 @@ ca:
       login_disabled: "S'ha desactivat l'inici de sessió mentre aquest lloc web es trobi en mode només de lectura."
       logout_disabled: "S'ha desactivat el tancament de sessió mentre aquest lloc web es trobi en mode només de lectura."
     logs_error_rate_notice:
-      reached_hour_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, one {# error/hora} other {# errors/hora} </a> s'ha arribat al límit de configuració del lloc web de {limit, plural, one {# error/hora} other {# errors/hora}}."
+      reached_hour_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, one {# error/hora} other {# errors/hora}}</a> s'ha arribat al límit de configuració del lloc web de {limit, plural, one {# error/hora} other {# errors/hora}}."
       reached_minute_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, one {# error/minut} other {# errors/minut}}</a> s'ha arribat al límit de configuració del lloc web de {limit, plural, one {# error/minut} other {# errors/minut}}."
       exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hora} other {# errors/hora}}</a> s'ha superat el límit de la configuració del lloc web de {limit, plural, one {# error/hora} other {# errors/hora}}."
       exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minut} other {# errors/minut}}</a> s'ha superat el límit de la configuració del lloc web de {limit, plural, one {# error/minut} other {# errors/minut}}."
@@ -2988,7 +2991,7 @@ ca:
             more: '<a href="%{basePath}/admin/logs/search_logs">Cerca de registres (logs)</a>'
             disabled: 'El report de cerca de tendències està desactivat. Habiliteu <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">les consultes de cerca de registres</a> per a recopilar dades.'
           filters:
-            file-extension:
+            file_extension:
               label: Extensió de fitxer
             group:
               label: Grup
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index b2f81bc439..0f47ac34b6 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -800,6 +800,8 @@ cs:
         confirm: "Jste si naprosto jisti, že chcete změnit své uživatelské jméno?"
         taken: "Toto uživatelské jméno je již zabrané."
         invalid: "Uživatelské jméno je neplatné. Musí obsahovat pouze písmena a číslice."
+      add_email:
+        add: "přidat"
       change_email:
         title: "Změnit emailovou adresu"
         taken: "Tato emailová adresa není k dispozici."
@@ -820,7 +822,8 @@ cs:
         title: "Emailová adresa"
         primary: "Hlavní email"
         secondary: "Záložní emailové adresy"
-        no_secondary: "Žádné záložní emailové adresy"
+        primary_label: "primární"
+        update_email: "Změnit emailovou adresu"
         instructions: "Nikdy nebude zveřejněno."
         ok: "Pro potvrzení vám pošleme email."
         invalid: "Zadejte prosím správnou emailovou adresu"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 165c033d9d..2aacfa5500 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -936,6 +936,8 @@ da:
         confirm: "Er du helt sikker på, at du vil ændre dit brugernavn?"
         taken: "Beklager, det brugernavn er optaget."
         invalid: "Det brugernavn er ugyldigt. Det må kun bestå af bogstaver og tal."
+      add_email:
+        add: "tilføj"
       change_email:
         title: "Skift e-mail-adresse"
         taken: "Beklager, den e-mail-adresse er optaget af en anden bruger."
@@ -956,8 +958,9 @@ da:
         title: "E-mail"
         primary: "Primær email"
         secondary: "Sekundære emails"
-        no_secondary: "Ingen sekundære emails"
-        sso_override_instructions: "Email kan opdateres fra SSO-udbyderen."
+        primary_label: "Primær"
+        update_email: "Skift e-mail-adresse"
+        ssDestroy_override_instructions: "Email kan opdateres fra SSO-udbyderen."
         instructions: "Vis aldrig offentligt"
         ok: "Vi vil sende dig en bekræftelses email"
         invalid: "Indtast venligst en gyldig email adresse"
@@ -1233,11 +1236,6 @@ da:
       enabled: "Dette website kan kun læses lige nu. Fortsæt endelig med at kigge, men der kan ikke svares, likes eller andet indtil videre."
       login_disabled: "Log in er deaktiveret midlertidigt, da forummet er i \"kun læsnings\" tilstand."
       logout_disabled: "Log ud er deaktiveret mens websitet er i læs kun tilstand"
-    logs_error_rate_notice:
-      reached_hour_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, en {# error / hour} anden {# fejl / time}}</a> nåede indstillingsgrænsen på {limit, plural, en {# error / hour} anden {# fejl / hour}}."
-      reached_minute_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, en {# error / minute} other {# fejl / minut}}</a> nåede indstillingsgrænsen på {limit, plural, en {# error / minute} anden {# fejl / minut}}."
-      exceeded_hour_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, en {# error / hour} other {# error / hour}}</a> har overskredet indstillingsgræsen på {limit, plural, en {# error / hour} anden {# error / hour}}."
-      exceeded_minute_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, en {# error / minute} anden {# fejl / minut}}</a> overskredet indstillingsgrænsen på {limit, plural, en {# error / minute} anden {# fejl / minut}}."
     learn_more: "Læs mere…"
     all_time: "i alt"
     all_time_desc: "emner oprettet i alt"
@@ -2939,7 +2937,7 @@ da:
             more: '<a href="%{basePath}/admin/logs/search_logs">Søg logfiler</a>'
             disabled: 'Rapport over søge tendenser er deaktiveret. Aktivér <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">log søgeforespørgelser for</a> at indsamle data.'
           filters:
-            file-extension:
+            file_extension:
               label: Filtypenavn
             group:
               label: Gruppe
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 535d412514..312618a489 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -291,6 +291,8 @@ de:
         tomorrow_with_time: "morgen um %{time}"
         at_time: "um %{date_time}"
         existing_reminder: "Es gibt eine Erinnerung für dieses Lesezeichen, die versendet werden wird"
+    copy_codeblock:
+      copied: "kopiert!"
     drafts:
       resume: "Fortsetzen"
       remove: "Entfernen"
@@ -679,6 +681,9 @@ de:
       flair_color_placeholder: "(Optoinal) Hex-Farbwert"
       flair_preview_icon: "Vorschau-Icon"
       flair_preview_image: "Vorschaubild"
+      flair_type:
+        icon: "Wähle ein Symbol"
+        image: "Lade ein Bild hoch"
     user_action_groups:
       "1": "Abgegebene Likes"
       "2": "Erhaltene Likes"
@@ -973,6 +978,8 @@ de:
         confirm: "Bist du dir ganz sicher, dass du deinen Benutzernamen ändern möchtest?"
         taken: "Der Benutzername ist bereits vergeben."
         invalid: "Der Benutzernamen ist nicht zulässig. Er darf nur Zahlen und Buchstaben enthalten."
+      add_email:
+        add: "Hinzufügen"
       change_email:
         title: "E-Mail-Adresse ändern"
         taken: "Entschuldige, diese E-Mail-Adresse ist nicht verfügbar."
@@ -1001,8 +1008,9 @@ de:
         title: "E-Mail"
         primary: "Primäre E-Mail-Adresse"
         secondary: "Weitere E-Mail-Adressen"
-        no_secondary: "Keine weiteren E-Mail-Adressen"
-        sso_override_instructions: "E-Mail kann vom SSO-Provider aktualisiert werden."
+        primary_label: "erste"
+        update_email: "E-Mail-Adresse ändern"
+        ssDestroy_override_instructions: "E-Mail kann vom SSO-Provider aktualisiert werden."
         instructions: "Nie öffentlich gezeigt."
         ok: "Wir senden dir zur Bestätigung eine E-Mail"
         invalid: "Bitte gib eine gültige E-Mail-Adresse ein"
@@ -1164,12 +1172,15 @@ de:
         account_age_days: "Konto-Alter in Tagen"
         links_tab: "Links"
         link_created_at: "Erstellt"
+        link_redemption_stats: "Rücknahmen"
         link_groups: Gruppen
         create: "Einladung versenden"
+        copy_link: "Link kopieren"
         generate_link: "Einladungslink kopieren"
         link_generated: "Der Einladungslink wurde erfolgreich generiert!"
         valid_for: "Der Einladungslink ist nur für die Adresse %{email} gültig"
         single_user: "Einzelbenutzer"
+        multiple_user: "Mehrere Benutzer"
         invite_link:
           success: "Der Einladungslink wurde erfolgreich generiert!"
         bulk_invite:
@@ -3067,7 +3078,7 @@ de:
             more: '<a href="%{basePath}/admin/logs/search_logs">Suchprotokoll</a>'
             disabled: 'Der Bericht über beliebte Suchen ist deaktiviert. Aktiviere <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">Suchanfragen protokollieren</a>, um die Daten zu erheben.'
           filters:
-            file-extension:
+            file_extension:
               label: Dateiendung
             group:
               label: Gruppe
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 97356cf7d9..9b6a608e1b 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -662,6 +662,8 @@ el:
         title: "Αλλαγή Ονόματος Χρήστη"
         taken: "Λυπούμαστε, αυτό το όνομα χρήστη χρησιμοποιείται ήδη."
         invalid: "Αυτό το όνομα χρήστη δεν είναι έγκυρο. Θα πρέπει να αποτελείται μόνο από αριθμούς και γράμματα"
+      add_email:
+        add: "προσθήκη"
       change_email:
         title: "Αλλαγή διεύθυνσης Email"
         taken: "Λυπούμαστε, αυτή η διεύθυνση email δεν είναι διαθέσιμη."
@@ -680,6 +682,8 @@ el:
         instructions: "Οι εικόνες στο φόντο θα κεντραρίζονται και το προκαθορισμένο πλάτος τους είναι 590px."
       email:
         title: "Email"
+        primary_label: "κύριο"
+        update_email: "Αλλαγή διεύθυνσης Email"
         ok: "Για επιβεβαίωση θα σου στείλουμε ένα email"
         invalid: "Παρακαλώ δώσε μία έγκυρη διεύθυνση email"
         authenticated: "Η διεύθυνση email σου ταυτοποιήθηκε από τον πάροχο %{provider}"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index b90248cf8b..e539f93444 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -989,6 +989,8 @@ es:
         confirm: "¿Estás completamente seguro de que quieres cambiar tu nombre de usuario?"
         taken: "Lo sentimos, ese nombre de usuario ya se encuentra en uso."
         invalid: "Este nombre de usuario no es válido. Este solo puede incluir números y letras"
+      add_email:
+        add: "añadir"
       change_email:
         title: "Cambiar correo electrónico"
         taken: "Lo sentimos, ese correo electrónico no está disponible."
@@ -1019,8 +1021,9 @@ es:
         title: "Correo electrónico"
         primary: "Correo electrónico principal"
         secondary: "Correos electrónicos secundarios"
-        no_secondary: "Sin correos electrónicos secundarios"
-        sso_override_instructions: "El correo electrónico puede actualizarse desde el proveedor de SSO."
+        primary_label: "primario"
+        update_email: "Cambiar correo electrónico"
+        ssDestroy_override_instructions: "El correo electrónico puede actualizarse desde el proveedor de SSO."
         instructions: "Nunca se mostrará al público."
         ok: "Te enviaremos un correo electrónico para confirmar"
         required: "Por favor, introduce un correo electrónico"
@@ -3149,13 +3152,13 @@ es:
             more: '<a href="%{basePath}/admin/logs/search_logs">Buscar registros</a>'
             disabled: 'El reporte de tendencias de búsqueda está desactivado. Activa la opción <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">registrar consultas de búsquedas</a> para recolectar datos.'
           filters:
-            file-extension:
+            file_extension:
               label: Extensión del archivo
             group:
               label: Grupo
             category:
               label: Categoría
-            include-subcategories:
+            include_subcategories:
               label: "Incluir subcategoría"
       commits:
         latest_changes: "Cambios recientes: ¡por favor, actualiza a menudo!"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index e2478f0ade..396a459ad7 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -704,6 +704,8 @@ et:
         title: "Muuda kasutajanime"
         taken: "Vabandust, see kasutajanimi on võetud."
         invalid: "Selline kasutajanimi ei ole lubatud. Kasutada tohib ainult numbreid ja tähti"
+      add_email:
+        add: "lisa"
       change_email:
         title: "Muuda meiliaadressi"
         taken: "Vabandust, see meiliaadress ei ole saadaval."
@@ -723,7 +725,8 @@ et:
         title: "Meiliaadress"
         primary: "Peamine e-post"
         secondary: "Teine e-post"
-        no_secondary: "Teist e-posti pole"
+        primary_label: "primaarne"
+        update_email: "Muuda meiliaadressi"
         instructions: "Ära näita kunagi avalikkusele."
         ok: "Saadame sulle kinnituseks meili"
         invalid: "Sisesta palun korrektne meiliaadress"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index eb44b2c1ed..cd263f9c69 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -972,6 +972,8 @@ fa_IR:
         confirm: "مطمئنید میخواهید نام کاربری خود را تغییر دهید؟"
         taken: "متأسفیم، آن نام کاربری قبلا گرفته شده است."
         invalid: "آن نام کاربری نامعتبر است. تنها باید عددها و حرف‌ها را در بر بگیرد."
+      add_email:
+        add: "اضافه کردن"
       change_email:
         title: "تغییر ایمیل"
         taken: "متأسفیم، آن ایمیل در دسترس نیست."
@@ -995,8 +997,9 @@ fa_IR:
         title: "ایمیل"
         primary: "آدرس ایمیل اصلی"
         secondary: "آدرس ایمیل ثانویه"
-        no_secondary: "بدون ایمیل ثانویه"
-        sso_override_instructions: "ایمیل را میتوانید از طریق SSO به روزرسانی کنید"
+        primary_label: "اصلی"
+        update_email: "تغییر ایمیل"
+        ssDestroy_override_instructions: "ایمیل را میتوانید از طریق SSO به روزرسانی کنید"
         instructions: "هرگز به عموم نمایش داده نخواهد شد"
         ok: "برای تایید ایمیلی برایتان ارسال خواهیم کرد."
         required: "لطفا یک آدرس ایمیل وارد کنید"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 4c30f26f67..e976fafc73 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -994,6 +994,8 @@ fi:
         confirm: "Oletko aivan varma että haluat vaihtaa käyttäjänimesi?"
         taken: "Pahoittelut, tuo nimi on jo käytössä."
         invalid: "Käyttäjätunnus ei kelpaa. Siinä saa olla ainoastaan numeroita ja kirjaimia."
+      add_email:
+        add: "lisää"
       change_email:
         title: "Vaihda sähköposti"
         taken: "Pahoittelut, tämä sähköpostiosoite ei ole saatavilla."
@@ -1023,7 +1025,8 @@ fi:
         title: "Sähköposti"
         primary: "Ensisijainen sähköpostiosoite"
         secondary: "Toissijaiset sähköpostiosoitteet"
-        no_secondary: "Ei toissijaisia sähköpostiosoitteita"
+        primary_label: "ensisijainen väri"
+        update_email: "Vaihda sähköposti"
         instructions: "Ei tule julkiseksi."
         ok: "Lähetämme sinulle sähköpostin varmistukseksi."
         required: "Syötä sähköpostiosoitteesi"
@@ -3116,7 +3119,7 @@ fi:
             more: '<a href="%{basePath}/admin/logs/search_logs">Hakulokit</a>'
             disabled: 'Trendaavat haut eivät ole käytössä. Kerää dataa ottamalla käyttöön asetus <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">log search queries</a>.'
           filters:
-            file-extension:
+            file_extension:
               label: Tiedostomuoto
             group:
               label: Ryhmä
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index fbb00145bc..c8194c10f6 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -568,7 +568,7 @@ fr:
         profile:
           title: Profil
         interaction:
-          title: Intéraction
+          title: Interaction
           posting: Contribution
           notification: Notification
         membership:
@@ -668,7 +668,7 @@ fr:
           description: "Vous serez notifié de chaque nouvelle réponse dans chaque message, et le nombre de nouvelles réponses sera affiché."
         watching_first_post:
           title: "Surveiller les nouveaux sujets"
-          description: "Vous serez averti de nouveaux messages dans ce groupe mais pas de réponses aux messages."
+          description: "Vous serez averti des nouveaux messages dans ce groupe mais pas des réponses aux messages."
         tracking:
           title: "Suivre"
           description: "Vous serez notifié si quelqu'un vous mentionne ou vous répond, et le nombre de nouvelles réponses sera affiché."
@@ -806,7 +806,7 @@ fr:
       notifications: "Notifications"
       statistics: "Statistiques"
       desktop_notifications:
-        label: "Notifications actives"
+        label: "Notifications instantanées"
         not_supported: "Les notifications ne sont pas supportées sur ce navigateur. Désolé."
         perm_default: "Activer les notifications"
         perm_denied_btn: "Permission refusée"
@@ -876,9 +876,9 @@ fr:
       admin_delete: "Supprimer"
       users: "Utilisateurs"
       muted_users: "Silencieux"
-      muted_users_instructions: "Ignorer toutes les notifications et messages privés provenant de ces utilisateurs."
+      muted_users_instructions: "Ignorer toutes les notifications et messages directs provenant de ces utilisateurs."
       ignored_users: "Ignorés"
-      ignored_users_instructions: "Ignorer tous les billets, notifications et messages privés provenant de ces utilisateurs."
+      ignored_users_instructions: "Ignorer tous les messages, notifications et messages directs provenant de ces utilisateurs."
       tracked_topics_link: "Afficher"
       automatically_unpin_topics: "Désépingler automatiquement les sujets quand j'arrive à la fin."
       apps: "Applications"
@@ -996,6 +996,9 @@ fr:
         confirm: "Êtes-vous sûr de vouloir modifier votre nom d'utilisateur ?"
         taken: "Désolé, ce nom d'utilisateur est déjà pris."
         invalid: "Ce nom d'utilisateur est invalide. Il ne doit être composé que de lettres et de chiffres."
+      add_email:
+        title: "Ajouter une adresse courriel"
+        add: "ajouter"
       change_email:
         title: "Modifier l'adresse courriel"
         taken: "Désolé, cette adresse courriel est indisponible."
@@ -1026,8 +1029,16 @@ fr:
         title: "Courriel"
         primary: "Adresse courriel principale"
         secondary: "Adresses courriel secondaires"
-        no_secondary: "Aucune adresse courriel secondaire"
-        sso_override_instructions: "Le courriel peut être mis à jour à partir du fournisseur SSO."
+        primary_label: "primaire"
+        unconfirmed_label: "non confirmée"
+        resend_label: "renvoyer le courriel d'activation"
+        resending_label: "envoi en cours…"
+        resent_label: "courriel envoyé"
+        update_email: "Modifier l'adresse courriel"
+        set_primary: "Définir comme adresse courriel principale"
+        destroy: "Supprimer l'adresse courriel"
+        add_email: "Ajouter une adresse courriel alternative"
+        ssDestroy_override_instructions: "Le courriel peut être mis à jour à partir du fournisseur SSO."
         instructions: "Jamais visible publiquement."
         ok: "Nous vous enverrons un courriel de confirmation"
         required: "Veuillez entrer une adresse courriel"
@@ -2033,7 +2044,7 @@ fr:
         one_year: "Une année"
         forever: "Toujours"
         pick_date_and_time: "Sélectionner une date et heure"
-        set_based_on_last_post: "Fermer par rapport au dernier message"
+        set_based_on_last_post: "Fermer selon le dernier message"
       publish_to_category:
         title: "Planifier la publication"
       temp_open:
@@ -3187,13 +3198,13 @@ fr:
             more: '<a href="%{basePath}/admin/logs/search_logs">Journal des recherches</a>'
             disabled: 'Rapport sur les tendances de recherche désactivé. Activez la <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">journalisation des recherches</a> pour collecter des données.'
           filters:
-            file-extension:
+            file_extension:
               label: Extension de fichier
             group:
               label: Groupe
             category:
               label: Catégorie
-            include-subcategories:
+            include_subcategories:
               label: "Inclure les sous-catégories"
       commits:
         latest_changes: "Dernières modifications : veuillez mettre à jour régulièrement !"
@@ -3212,7 +3223,7 @@ fr:
         bulk_add:
           title: "Ajouter au groupe en masse"
           complete_users_not_added: "Ces utilisateurs n'ont pas été ajoutés (vérifiez qu'ils ont un compte) :"
-          paste: "Coller une liste de nom d'utilisateur ou courriel, un par ligne :"
+          paste: "Coller une liste de noms d'utilisateurs ou de courriels, un par ligne :"
         add_members:
           as_owner: "Rendre des utilisateurs propriétaires de ce groupe"
         manage:
@@ -3891,6 +3902,9 @@ fr:
             override_upload_secure_status: "passer outre le statut de téléchargement sécurisé"
             page_published: "page publiée"
             page_unpublished: "publication de la page annulée"
+            add_email: "ajouter une adresse courriel"
+            update_email: "mettre à jour une adresse courriel"
+            destroy_email: "supprimer une adresse courriel"
         screened_emails:
           title: "Courriels sous surveillance"
           description: "Lorsque quelqu'un essaye de créer un nouveau compte, les adresses courriel suivantes seront vérifiées et l'inscription sera bloquée, ou une autre action sera réalisée."
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index e69e86f5ae..141644af54 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -542,6 +542,8 @@ gl:
         instructions: "As imaxes dos fondos centraranse e terán unha largura predeterminada de 590px."
       email:
         title: "Correo electrónico"
+        primary_label: "primario"
+        update_email: "Cambiar o correo electrónico"
         ok: "Enviarémosche un correo electrónico para confirmar"
         invalid: "Introduce un enderezo de correo electrónico correcto"
         authenticated: "O teu enderezo de correo electrónico foi autenticado por %{provider}"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index f4aa2c933a..0883b5527d 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -1076,6 +1076,9 @@ he:
         confirm: "האם את/ה בטוח/ה שברצונך לשנות את שם המשתמש/ת שלך?"
         taken: "סליחה, שם המשתמש הזה תפוס."
         invalid: "שם המשתמש אינו תקין. עליו לכלול רק אותיות באנגלית ומספרים."
+      add_email:
+        title: "הוסף דוא\"ל"
+        add: "הוספה"
       change_email:
         title: "שנה דואר אלקטרוני"
         taken: "סליחה, הכתובת הזו אינה זמינה."
@@ -1106,8 +1109,16 @@ he:
         title: "דואר אלקטרוני"
         primary: "כתובת דוא״ל ראשית"
         secondary: "כתובות דוא״ל משניות"
-        no_secondary: "אין כתובות דוא״ל משניות"
-        sso_override_instructions: "ניתן לעדכן את כתובת הדוא״ל דרך ספק ה־SSO."
+        primary_label: "ראשי"
+        unconfirmed_label: "לא מאושר"
+        resend_label: "שליחת הודעת אימות בדוא״ל מחדש"
+        resending_label: "שולח..."
+        resent_label: "דוא\"ל נשלח"
+        update_email: "שנה דואר אלקטרוני"
+        set_primary: "הגדר כתובת דוא\"ל ראשית"
+        destroy: "הסר דוא\"ל"
+        add_email: "הוסף דוא\"ל חלופי"
+        ssDestroy_override_instructions: "ניתן לעדכן את כתובת הדוא״ל דרך ספק ה־SSO."
         instructions: "לעולם לא מוצג לציבור."
         ok: "נשלח אליכם דואר אלקטרוני לאישור"
         required: "נא למלא כתובת דוא״ל"
@@ -1280,6 +1291,7 @@ he:
         links_tab_with_count: "קישורים (%{count})"
         link_url: "קישור"
         link_created_at: "נוצר"
+        link_redemption_stats: "ניצולים"
         link_groups: קבוצות
         link_expires_at: תפוגה
         create: "שלח הזמנה"
@@ -3426,13 +3438,13 @@ he:
             more: '<a href="%{basePath}/admin/logs/search_logs">חיפוש ביומנים</a>'
             disabled: 'דוח מגמות חיפושים מנוטרל. יש להפעיל <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">שאילתות חיפוש ביומן</a> כדי לאסוף נתונים.'
           filters:
-            file-extension:
+            file_extension:
               label: סיומת קובץ
             group:
               label: קבוצה
             category:
               label: קטגוריה
-            include-subcategories:
+            include_subcategories:
               label: "לכלול תת־קטגוריות"
       commits:
         latest_changes: "שינויים אחרונים: בבקשה עדכן תכופות!"
@@ -4136,6 +4148,9 @@ he:
             override_upload_secure_status: "דריסת מצב העלאה בטוח"
             page_published: "העמוד פורסם"
             page_unpublished: "פרסום העמוד נמשך"
+            add_email: "הוסף דוא\"ל"
+            update_email: "עדכן דוא\"ל"
+            destroy_email: "מחק דוא\"ל"
         screened_emails:
           title: "הודעות דואר מסוננות"
           description: "כשמישהו מנסה ליצור חשבון חדש, כתובות הדואר האלקטרוני הבאות ייבדקו וההרשמה תחסם או שיבוצו פעולות אחרות."
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index d7fa242236..b21c67da0b 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -898,6 +898,8 @@ hu:
         confirm: "Biztosan meg szeretnéd változtatni a felhasználónevedet?"
         taken: "Sajnos ez a felhasználónév már foglalt."
         invalid: "Ez a felhasználónév érvénytelen. Csak számokat és betűket kell tartalmaznia."
+      add_email:
+        add: "hozzáadás"
       change_email:
         title: "E-mail cím módosítása"
         taken: "Sajnos az e-mail cím nem érhető el."
@@ -918,7 +920,8 @@ hu:
         title: "E-mail"
         primary: "Elsődleges Email"
         secondary: "Másodlagos Emailek"
-        no_secondary: "Nincsenek másodlagos emailek"
+        primary_label: "Elsődleges"
+        update_email: "E-mail cím módosítása"
         ok: " Jóváhagyás végett e-mailt fogunk küldeni"
         invalid: "Kérünk adj meg egy érvényes e-mail címet"
         authenticated: "Az email címedet %{provider} azonosította"
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index 90a58e9344..ca3435f025 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -957,6 +957,8 @@ hy:
         confirm: "Դուք միանշանակ համոզվա՞ծ եք, որ ցանկանում եք փոփոխել Ձեր օգտանունը:"
         taken: "Ներողություն, այդ օգտանունը զբաղված է:"
         invalid: "Այդ օգտանունն անվավեր է: Այն պետք է պարունակի միայն թվեր և տառեր:"
+      add_email:
+        add: "ավելացնել"
       change_email:
         title: "Փոփոխել Էլ. Հասցեն"
         taken: "Ներողություն, այդ էլ. հասցեն հասանելի չէ:"
@@ -987,8 +989,9 @@ hy:
         title: "Էլ. հասցե"
         primary: "Հիմնական Էլ. հասցե"
         secondary: "Երկրորդական Էլ. հասցեներ"
-        no_secondary: "Երկրորդական էլ. հասցեներ չկան"
-        sso_override_instructions: "Էլ. հասցեն կարող է թարմացվել SSO մատակարարից:"
+        primary_label: "հիմնական"
+        update_email: "Փոփոխել Էլ. Հասցեն"
+        ssDestroy_override_instructions: "Էլ. հասցեն կարող է թարմացվել SSO մատակարարից:"
         instructions: "Երբեք չի ցուցադրվում հանրությանը"
         ok: "Հաստատման համար մենք Ձեզ կուղարկենք էլ. նամակ"
         invalid: "Խնդրում ենք մուտքագրել վավեր էլ. հասցե"
@@ -3080,13 +3083,13 @@ hy:
             more: '<a href="%{basePath}/admin/logs/search_logs">Որոնման գրառումներ</a>'
             disabled: 'Առաջատար որոնման հաշվետվությունն անջատված է: Միացրեք <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">գրառումների որոնման հարցումները</a>՝ տվյալներ հավաքելու համար:'
           filters:
-            file-extension:
+            file_extension:
               label: Ֆայլի ընդլայնում
             group:
               label: Խումբ
             category:
               label: Կատեգորիա
-            include-subcategories:
+            include_subcategories:
               label: "Ներառել Ենթակատեգորիաներ"
       commits:
         latest_changes: "Վերջին փոփոխությունները. խնդրում ենք ավելի հաճախ թարմացնել!"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 6daee6f6ff..a23c2ef9dd 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -844,7 +844,7 @@ id:
         title: "Surel"
         primary: "Email Utama"
         secondary: "Email Sekunder"
-        no_secondary: "Tidak ada email sekunder"
+        update_email: "Ganti Alamat Surel"
         instructions: "Jangan pernah tunjukkan ke publik."
         ok: "Kami akan mengirimkan surel kepada anda untuk konfirmasi"
         invalid: "Silahkan masukkan alamat email yang valid"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 46e2fe4619..74d1e91281 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -451,6 +451,7 @@ it:
         category: "Categoria"
         orders:
           score: "Punteggio"
+          score_asc: "Punteggio (inverso)"
           created_at: "Creato il"
           created_at_asc: "Data creazione (inversa)"
         priority:
@@ -875,7 +876,9 @@ it:
       admin_delete: "Cancella"
       users: "Utenti"
       muted_users: "Silenziati"
+      muted_users_instructions: "Elimina tutte le notifiche e i PM da questi utenti."
       ignored_users: "Ignorato"
+      ignored_users_instructions: "Elimina tutti i post, le notifiche e i PM da questi utenti."
       tracked_topics_link: "Mostra"
       automatically_unpin_topics: "Spunta automaticamente gli argomenti quando arrivi in fondo."
       apps: "Applicazioni"
@@ -993,6 +996,9 @@ it:
         confirm: "Sei sicuro di voler davvero cambiare il tuo nome utente?"
         taken: "Spiacenti, questo nome utente è già riservato."
         invalid: "Nome utente non valido: usa solo lettere e cifre"
+      add_email:
+        title: "Aggiungi email"
+        add: "aggiungi"
       change_email:
         title: "Cambia email"
         taken: "Spiacenti, questa email non è disponibile."
@@ -1023,8 +1029,16 @@ it:
         title: "Email"
         primary: "Email principale"
         secondary: "Email secondaria"
-        no_secondary: "Nessuna email secondaria"
-        sso_override_instructions: "L'email può essere aggiornata dal provider SSO."
+        primary_label: "primario"
+        unconfirmed_label: "non confermata"
+        resend_label: "Reinvia email di conferma"
+        resending_label: "invio in corso..."
+        resent_label: "email inviata"
+        update_email: "Cambia email"
+        set_primary: "Imposta email principale"
+        destroy: "Rimuovi email"
+        add_email: "Aggiungi email alternativa"
+        ssDestroy_override_instructions: "L'email può essere aggiornata dal provider SSO."
         instructions: "Mai mostrato pubblicamente"
         ok: "Ti invieremo una email di conferma"
         required: "Inserisci un indirizzo email"
@@ -1177,6 +1191,7 @@ it:
         expired: "L'invito è scaduto."
         rescind: "Rimuovi"
         rescinded: "Invito revocato"
+        rescind_all: "Rimuovi inviti scaduti"
         rescinded_all: "Tutti gli inviti scaduti sono stati rimossi!"
         rescind_all_confirm: "Sei sicuro di voler rimuovere tutti gli inviti scaduti?"
         reinvite: "Rinvia Invito"
@@ -1187,18 +1202,30 @@ it:
         time_read: "Ora di Lettura"
         days_visited: "Giorni Frequenza"
         account_age_days: "Età dell'utente in giorni"
+        source: "Invitato via"
         links_tab: "Collegamenti"
+        links_tab_with_count: "Link (%{count})"
+        link_url: "Link"
         link_created_at: "Creazione"
+        link_redemption_stats: "Redemptions"
         link_groups: Gruppi
+        link_expires_at: Scadenza
         create: "Invia Invito"
+        copy_link: "Copia link"
         generate_link: "Copia il collegamento di invito"
         link_generated: "Collegamento di invito generato con successo!"
         valid_for: "Questo collegamento di invito è valido solamente per il seguente indirizzo email: %{email}"
         single_user: "Utente Singolo"
+        multiple_user: "Utenti multipli"
         invite_link:
+          title: "Link di invito"
           success: "Collegamento di invito generato con successo!"
+          error: "Si è verificato un errore durante la generazione del link di invito"
+          max_redemptions_allowed_label: "Quante persone sono autorizzate a registrarsi utilizzando questo link?"
+          expires_at: "Quando scadrà questo link di invito?"
         bulk_invite:
           none: "Non hai ancora invitato nessuno. Puoi inviare degli inviti individuali o più persone alla volta <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>caricando un file CSV</a>."
+          text: "Inviti di gruppo"
           success: "Il file è stato caricato con successo, riceverai un messaggio di notifica quando il processo sarà completato."
           error: "Spiacenti, il file deve essere in formato CSV."
           confirmation_message: "Stai per inviare un invito via email a tutti gli indirizzi inclusi nel file caricato."
@@ -1316,11 +1343,6 @@ it:
       <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Cominciamo la discussione!</a> {currentTopics, plural, one {C'è <strong>#</strong> argomento} other {Ci sono<strong>#</strong> argomenti}}.  I visitatori hanno bisogno di più per leggere e rispondere: – consigliamo almeno {requiredTopics, plural, one {<strong>#</strong> argomento} other {<strong>#</strong> argomenti}}. Solo lo staff può vedere questo messaggio.
     too_few_posts_notice_MF: >-
       <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Cominciamo la discussione!</a> {currentPosts, plural, one {C'è <strong>#</strong> messaggio} other {Ci sono <strong>#</strong> messaggi}}.  I visitatori hanno bisogno di più per leggere e rispondere: – consigliamo almeno {requiredPosts, plural, one {<strong>#</strong> messaggio} other {<strong>#</strong> messaggi}}. Solo lo staff può vedere questo messaggio.
-    logs_error_rate_notice:
-      reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} altro {# errors/hour}}</a> il limite impostato di {limit, plural, one {# error/hour} altro {# errors/hour}}."
-      reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} altro {# errors/minute}}</a> raggiunto il limite impostato di {limit, plural, one {# error/minute} altro {# errors/minute}}."
-      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} altro {# errors/hour}}</a> superato il limite impostato di {limit, plural, one {# error/hour} altro {# errors/hour}}."
-      exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} altro {# errors/minute}}</a> superato il limite impostato di {limit, plural, one {# error/minute} other {# errors/minute}}."
     learn_more: "per saperne di più..."
     all_time: "totale"
     all_time_desc: "totale argomenti creati"
@@ -2580,6 +2602,7 @@ it:
       sort_order: "Lista Argomenti Ordinata Per:"
       default_view: "Lista Argomenti Predefinita:"
       default_top_period: "Periodo Predefinito Argomenti Di Punta:"
+      default_list_filter: "Filtro predefinito della lista:"
       allow_badges_label: "Permetti l'assegnazione di distintivi in questa categoria"
       edit_permissions: "Modifica Permessi"
       reviewable_by_group: "Oltre che dallo staff, i messaggi e le segnalazioni in questa categoria possono essere revisionati da:"
@@ -2642,6 +2665,9 @@ it:
         moderation: "Moderazione"
         appearance: "Aspetto"
         email: "Email"
+      list_filters:
+        all: "tutti gli argomenti"
+        none: "nessuna sottocategoria"
     flagging:
       title: "Grazie per aiutarci a mantenere la nostra comunità civile!"
       action: "Segnala Messaggio"
@@ -3156,13 +3182,13 @@ it:
             more: '<a href="%{basePath}/admin/logs/search_logs">Cerca 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">log search queries</a> per iniziare a raccogliere i dati.'
           filters:
-            file-extension:
+            file_extension:
               label: Estensione file
             group:
               label: Gruppo
             category:
               label: Categoria
-            include-subcategories:
+            include_subcategories:
               label: "Includi Sottocategorie"
       commits:
         latest_changes: "Ultime modifiche: per favore aggiorna spesso!"
@@ -3860,6 +3886,9 @@ it:
             override_upload_secure_status: "sovrascrivere stato caricamento sicuro"
             page_published: "pagina pubblicata"
             page_unpublished: "pagina non pubblicata"
+            add_email: "aggiungi email"
+            update_email: "aggiorna email"
+            destroy_email: "distruggi email"
         screened_emails:
           title: "Email Scansionate"
           description: "Quando qualcuno cerca di creare un nuovo account, verrando controllati i seguenti indirizzi email e la registrazione viene bloccata, o eseguita qualche altra azione."
@@ -4276,6 +4305,8 @@ it:
           modal_description: "Desideri applicare questa modifica storicamente? Questo cambierà le preferenze per %{count} utenti esistenti."
           modal_yes: "Sì"
           modal_no: "No, applica le modifiche solo da adesso in avanti"
+        simple_list:
+          add_item: "Aggiungi elemento..."
       badges:
         title: Distintivi
         new_badge: Nuovo Distintivo
@@ -4402,6 +4433,7 @@ it:
         post_title: "Messaggio"
         category_id: "ID della categoria"
         category_title: "Categoria"
+        tag_name: "Nome etichetta"
         external_url: "URL esterna"
         destination: "Destinazione"
         delete_confirm: "Sei sicuro di voler cancellare questo collegamento permanente?"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index b4c366f65b..3ba20e987c 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -815,6 +815,8 @@ ja:
         confirm: "ユーザー名を変更してもよろしいですか？"
         taken: "このユーザー名は既に使われています。"
         invalid: "このユーザー名は無効です。英数字のみ利用可能です。"
+      add_email:
+        add: "追加"
       change_email:
         title: "メールアドレスを変更"
         taken: "このメールアドレスは既に使われています。"
@@ -835,7 +837,8 @@ ja:
         title: "メールアドレス"
         primary: "主要なメールアドレス"
         secondary: "その他のメールアドレス"
-        no_secondary: "その他のメールアドレスはありません"
+        primary_label: "プライマリー"
+        update_email: "メールアドレスを変更"
         instructions: "他人に公開はされません"
         ok: "確認用メールを送信します"
         invalid: "正しいメールアドレスを入力してください"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index aead8849b5..765e04114b 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -923,6 +923,8 @@ ko:
         confirm: "정말로 아이디를 변경 하시겠습니까?"
         taken: "죄송합니다. 이미 사용 중인 아이디입니다."
         invalid: "아이디가 잘못되었습니다. 숫자와 문자를 포함해야합니다."
+      add_email:
+        add: "추가"
       change_email:
         title: "이메일 변경"
         taken: "죄송합니다. 해당 이메일은 사용 할 수 없습니다."
@@ -953,8 +955,8 @@ ko:
         title: "이메일"
         primary: "기본 이메일"
         secondary: "보조 이메일"
-        no_secondary: "보조 이메일이 없습니다"
-        sso_override_instructions: "SSO 제공자로부터 이메일을 업데이트 할 수 있습니다."
+        primary_label: "주요"
+        update_email: "이메일 변경"
         instructions: "절대로 공개되지 않습니다."
         ok: "내 이메일로 확인 메일이 전송됩니다."
         invalid: "유효한 이메일 주소를 입력해주세요."
@@ -1225,17 +1227,10 @@ ko:
       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> 합시다 <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">!</a> 이 {currentTopics, plural, one <strong>{#</strong> 주제} other은 {입니다 <strong>#</strong> 주제}}과 {currentPosts, plural, one <strong>{# 포스트}</strong> other <strong>{#</strong> 포스트}}. 방문객들은 읽고 댓글을 올리려면 더 필요 - 우리는 적어도 {requiredTopics, plural, one <strong>{# 주제}</strong> other <strong>{#</strong> 주제}}과 {requiredPosts, plural, one <strong>{# 포스트}</strong> other <strong>{#</strong> 게시물}} 좋습니다. 직원 만이 메시지를 볼 수 있습니다.
     too_few_topics_notice_MF: >-
       <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">토론을 시작</a> 합시다 <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">!</a> {currentTopics, plural, one {is <strong>#</strong> topic} other {are <strong>#</strong> topics}}가 있습니다. 방문자는 더 읽고 답장해야합니다. 적어도 {requiredTopics, plural, one { <strong>#</strong> topic} other { <strong>#</strong> topics}}을 (를) 권장합니다. 직원 만이 메시지를 볼 수 있습니다.
     too_few_posts_notice_MF: >-
       <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">토론을 시작</a> 합시다 <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">!</a> {currentPosts, plural, one {is <strong>#</strong> post} other {are <strong>#</strong> posts}}가 있습니다. 방문자는 더 읽고 답장해야합니다. – {requiredPosts, plural, one { <strong>#</strong> post} other { <strong>#</strong> posts}} 이상을 권장합니다. 직원 만이 메시지를 볼 수 있습니다.
-    logs_error_rate_notice:
-      reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error / hour} other {# errors / hour}}의</a> 사이트 설정 한계 {a0cd0dadb4f0b0b0f0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0d0"
-      reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error / minute} other {# errors / minute}}의</a> 사이트 설정 한계 {a0cd0d0b0f0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b2"
-      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural,</a> one {# 오류 / 시간}}"
-      exceeded_minute_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{a07e6f5c6cb6z485z0, plural, one {# 오류 / 분}} {0/0</a> <b>{0/0} {0} {0} {0} {0} {0} {0} {0} {0} {0} {0} 0 {0}</b>"
     learn_more: "더 배우기"
     all_time: "총"
     all_time_desc: "총 토픽"
@@ -2951,14 +2946,10 @@ ko:
             more: '<a href="%{basePath}/admin/logs/search_logs">검색 로그</a>'
             disabled: '인기 검색 보고서가 비활성화되었습니다. <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">로그 검색 쿼리</a> 를 사용하여 데이터를 수집하십시오.'
           filters:
-            file-extension:
-              label: 파일 확장자
             group:
               label: 그룹
             category:
               label: 카테고리
-            include-subcategories:
-              label: "하위 카테고리 포함"
       commits:
         latest_changes: "최근 변경 사항: 자주 업데이트하십시오!"
         by: "에 의해"
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 52ad59f808..34e46303ff 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -756,6 +756,8 @@ lt:
         title: "Keisti vartotojo vardą"
         taken: "Atsiprašome, šis vartotojo vardas užimtas."
         invalid: "Šis vartotojo vardas yra neteisingas. Jame turi būti tik skaičiai ir raidės"
+      add_email:
+        add: "pridėti"
       change_email:
         title: "Keisti el. paštą"
         taken: "Atsiprašome, šis el. paštas negalimas."
@@ -775,7 +777,8 @@ lt:
         title: "El. paštas"
         primary: "Pagrindinis el. Paštas"
         secondary: "Antriniai el. Paštai"
-        no_secondary: "Antrinių el. Paštų nėra"
+        primary_label: "pirminė"
+        update_email: "Keisti el. paštą"
         instructions: "Nebus rodomas viešai."
         ok: "Mes jums atsiųsime patvirtinimo elektroninį laišką"
         invalid: "Prašom įrašyti teisingą elektroninį adresą"
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index b23f8da4e2..8ef711b4bd 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -679,6 +679,8 @@ lv:
         title: "Mainīt lietotājvārdu"
         taken: "Atvainojiet, šis lietotājvārds ir aizņemts."
         invalid: "Šis lietotājvārds ir nederīgs. Izmantojiet tikai ciparus un burtus"
+      add_email:
+        add: "Pievienot"
       change_email:
         title: "Mainīt e-pastu"
         taken: "Atvainojiet, šis e-pasts nav pieejams."
@@ -696,6 +698,7 @@ lv:
         instructions: "Fona attēli būs centrēti un ar noklusējuma platumu 590px."
       email:
         title: "E-pasts"
+        update_email: "Mainīt e-pastu"
         ok: "Mēs jums nosūtīsim apstiprinājuma e-pastu"
         invalid: "Lūdzu ievadiet derīgu e-pasta adresi"
         authenticated: "Jūsu e-pastu autentificēja %{provider}"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 0a00bb7bb0..5a925739e3 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -808,6 +808,8 @@ nb_NO:
         confirm: "Er du helt sikker på at du ønsker å endre brukernavnet ditt?"
         taken: "Beklager, det brukernavnet er tatt."
         invalid: "Det brukernavnet er ugyldig. Det kan bare inneholde nummer og bokstaver."
+      add_email:
+        add: "legg til"
       change_email:
         title: "Endre e-postadresse"
         taken: "Beklager, den e-postadressen er ikke tilgjengelig."
@@ -828,7 +830,8 @@ nb_NO:
         title: "E-post"
         primary: "Primær e-post"
         secondary: "Sekundære e-poster"
-        no_secondary: "Ingen sekundære e-poster"
+        primary_label: "primær"
+        update_email: "Endre e-postadresse"
         instructions: "Vises aldri offentlig"
         ok: "Vi sender deg en e-post for å bekrefte"
         invalid: "Oppgi en gyldig e-postadresse"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 14615a4794..aea755c114 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -996,6 +996,9 @@ nl:
         confirm: "Weet u absoluut zeker dat u uw gebruikersnaam wilt wijzigen?"
         taken: "Sorry, maar die gebruikersnaam is al in gebruik."
         invalid: "Die gebruikersnaam is ongeldig. Hij mag alleen cijfers en letters bevatten."
+      add_email:
+        title: "E-mailadres toevoegen"
+        add: "toevoegen"
       change_email:
         title: "E-mailadres wijzigen"
         taken: "Sorry, dat e-mailadres is niet beschikbaar."
@@ -1026,8 +1029,16 @@ nl:
         title: "E-mail"
         primary: "Primair e-mailadres"
         secondary: "Extra e-mailadressen"
-        no_secondary: "Geen extra e-mailadressen"
-        sso_override_instructions: "E-mailadres kan vanaf SSO-provider worden bijgewerkt."
+        primary_label: "primaire"
+        unconfirmed_label: "onbevestigd"
+        resend_label: "bevestigingsmail opnieuw verzenden"
+        resending_label: "verzenden..."
+        resent_label: "e-mail verzonden"
+        update_email: "E-mailadres wijzigen"
+        set_primary: "Primair e-mailadres instellen"
+        destroy: "E-mailadres verwijderen"
+        add_email: "Alternatief e-mailadres toevoegen"
+        ssDestroy_override_instructions: "E-mailadres kan vanaf SSO-provider worden bijgewerkt."
         instructions: "Nooit openbaar zichtbaar."
         ok: "We sturen een e-mail ter bevestiging"
         required: "Voer een e-mailadres in"
@@ -3180,13 +3191,13 @@ nl:
             more: '<a href="%{basePath}/admin/logs/search_logs">Zoeklogboeken</a>'
             disabled: 'Rapport voor populaire zoekopdrachten is uitgeschakeld. Schakel <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">zoekopdrachten registreren</a> in om gegevens te verzamelen.'
           filters:
-            file-extension:
+            file_extension:
               label: Bestandsextensie
             group:
               label: Groep
             category:
               label: Categorie
-            include-subcategories:
+            include_subcategories:
               label: "Subcategorieën bijvoegen"
       commits:
         latest_changes: "Laatste wijzigingen: werk regelmatig bij!"
@@ -3884,6 +3895,9 @@ nl:
             override_upload_secure_status: "status beveiligd uploaden negeren"
             page_published: "pagina gepubliceerd"
             page_unpublished: "pagina niet gepubliceerd"
+            add_email: "e-mailadres toevoegen"
+            update_email: "e-mailadres bijwerken"
+            destroy_email: "e-mailadres verwijderen"
         screened_emails:
           title: "Gecontroleerde e-mails"
           description: "Als iemand een nieuwe account probeert aan te maken, worden de volgende e-mailadressen gecontroleerd en de registratie geblokkeerd, of een andere actie uitgevoerd."
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 8334b8cefe..9bcb2f7d81 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -1043,6 +1043,8 @@ pl_PL:
         confirm: "Czy jesteś absolutnie pewien że chcesz zmienić swoją nazwę użytkownika?"
         taken: "Przykro nam, ale ta nazwa jest zajęta."
         invalid: "Ta nazwa jest niepoprawna. Powinna zawierać jedynie liczby i litery."
+      add_email:
+        add: "dodaj"
       change_email:
         title: "Zmień adres email"
         taken: "Przykro nam, ale ten adres email nie jest dostępny."
@@ -1073,8 +1075,9 @@ pl_PL:
         title: "Email"
         primary: "Podstawowy adres email"
         secondary: "Drugorzędne adresy email"
-        no_secondary: "Brak drugorzędnych adresów email"
-        sso_override_instructions: "E-mail można zaktualizować od dostawcy SSO."
+        primary_label: "podstawowy"
+        update_email: "Zmień adres email"
+        ssDestroy_override_instructions: "E-mail można zaktualizować od dostawcy SSO."
         instructions: "Nie będzie publicznie widoczny."
         ok: "Otrzymasz potwierdzenie emailem"
         invalid: "Podaj poprawny adres email"
@@ -1376,17 +1379,6 @@ pl_PL:
       enabled: "Strona jest w trybie tylko-do-odczytu. Możesz nadal przeglądać serwis, ale operacje takie jak postowanie, lajkowanie i inne są wyłączone."
       login_disabled: "Logowanie jest zablokowane, gdy strona jest w trybie tylko do odczytu."
       logout_disabled: "Wylogowanie jest zablokowane gdy strona jest w trybie tylko do odczytu."
-    too_few_topics_and_posts_notice_MF: >-
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Rozpocznijmy dyskusję!</a> Jest {currentTopics, liczba mnoga, jeden {jest <strong>#</strong> tematem} inny {are <strong>#</strong> topics}} i {currentPosts, liczba mnoga, jeden { <strong>#</strong> post} inne { <strong>#</strong> posty}}. Odwiedzający potrzebują więcej do przeczytania i odpowiedzi - zalecamy co najmniej {wymaganeTopiki, liczba mnoga, jeden { <strong>#</strong> temat} inne { <strong>#</strong> tematy}} i {wymaganePosty, liczba mnoga, jeden { <strong>#</strong> post} inne { <strong>#</strong> posty}}. Tylko pracownicy mogą zobaczyć tę wiadomość.
-    too_few_topics_notice_MF: >-
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Rozpocznijmy dyskusję!</a> Jest {currentTopics, liczba mnoga, jeden {is <strong>#</strong> topic} other {are <strong>#</strong> topics}}. Odwiedzający potrzebują więcej do przeczytania i udzielenia odpowiedzi - zalecamy co najmniej {wymaganeTopiki, liczba mnoga, jeden { <strong>#</strong> temat} inny { <strong>#</strong> tematy}}. Tylko pracownicy mogą zobaczyć tę wiadomość.
-    too_few_posts_notice_MF: >-
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">Rozpocznijmy dyskusję!</a> Jest {currentPosts, liczba mnoga, jeden {is <strong>#</strong> post} other {are <strong>#</strong> posts}}. Odwiedzający potrzebują więcej do przeczytania i odpowiedzi - zalecamy co najmniej {wymaganePosty, liczba mnoga, jeden { <strong>#</strong> post} inny { <strong>#</strong> posty}}. Tylko pracownicy mogą zobaczyć tę wiadomość.
-    logs_error_rate_notice:
-      reached_hour_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{stopa, liczba mnoga, jeden {# błąd / godzina} inne {# błędy / godzina}}</a> osiągnęła limit ustawienia witryny w wysokości {limit, liczba mnoga, jeden {# błąd / godzina} inne {# błędy / godzina}}."
-      reached_minute_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{stopa, liczba mnoga, jeden {# błąd / minuta} inna {# błędy / minuta}}</a> osiągnęła limit ustawienia witryny w wysokości {limit, liczba mnoga, jeden {# błąd / minuta} inne {# błędy / minuta}}."
-      exceeded_hour_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{stopa, liczba mnoga, jeden {# błąd / godzina} inny {# błędy / godzina}}</a> przekroczył limit ustawienia witryny o {limit, liczba mnoga, jeden {# błąd / godzina} inne {# błędy / godzina}}."
-      exceeded_minute_MF: "<b>{relativeAge}</b> - <a href='{url}' target='_blank'>{stopa, liczba mnoga, jeden {# błąd / minuta} inna {# błędy / minuta}}</a> przekroczyła limit ustawienia witryny o {limit, liczba mnoga, jeden {# błąd / minuta} inne {# błędy / minuta}}."
     learn_more: "dowiedz się więcej…"
     all_time: "łącznie"
     all_time_desc: "łącznie utworzonych tematów"
@@ -2782,12 +2774,6 @@ pl_PL:
         help: "Temat jest niewidoczny: nie będzie wyświetlany na listach tematów a dostęp do niego można uzyskać jedynie poprzez link bezpośredni"
     posts: "Wpisy"
     posts_long: "jest %{number} wpisów w tym temacie"
-    posts_likes_MF: |
-      Ten temat ma {count, plural, one {1 reply} other {# replies}} {ratio, select
-      low{odpowiedzi z dużą ilością lajk'ów w poście}
-      med{odpowiedzi z bardzo dużą ilością lajk'ów w poście}
-      high{odpowiedzi z ekstremalnie dużą ilością lajk'ów w poście}
-      other{}}
     original_post: "Oryginalny wpis"
     views: "Odsłony"
     views_lowercase:
@@ -3204,7 +3190,7 @@ pl_PL:
           trending_search:
             more: '<a href="%{basePath}/admin/logs/search_logs">Logi wyszukiwania</a>'
           filters:
-            file-extension:
+            file_extension:
               label: Rozszerzenie pliku
             group:
               label: Grupa
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index ed641a74af..b9585ee751 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -776,6 +776,8 @@ pt:
         confirm: "Tem a certeza absoluta que pretende alterar o seu nome de utilizador?"
         taken: "Pedimos desculpa, esse nome de utilizador já está a ser utilizado."
         invalid: "Esse nome de utilizador é inválido. Deve conter apenas números e letras."
+      add_email:
+        add: "adicionar"
       change_email:
         title: "Alterar Email"
         taken: "Pedimos desculpa, esse email não está disponível."
@@ -796,7 +798,8 @@ pt:
         title: "Email"
         primary: "Email Principal"
         secondary: "Emails Secundários"
-        no_secondary: "Não existem emails secundários"
+        primary_label: "primária"
+        update_email: "Alterar Email"
         ok: "Enviar-lhe-emos um email para confirmar"
         invalid: "Por favor introduza um endereço de email válido"
         authenticated: "O seu email foi autenticado por %{provider}"
@@ -1874,8 +1877,8 @@ pt:
         radio_label: "Novo Tópico"
         error: "Ocorreu um erro ao mover as publicações para um novo tópico."
         instructions:
-          one: "Está prestes a criar um novo tópico e populá-lo com a publicação que selecionou."
-          other: "Está prestes a criar um novo tópico e populá-lo com as <b>%{count}</b> publicações que selecionou."
+          one: "Está prestes a criar um novo tópico e a incorporar a publicação que selecionou."
+          other: "Está prestes a criar um novo tópico e a incorporar <b>%{count}</b>publicações que selecionou."
       merge_topic:
         title: "Mover para Tópico Existente"
         action: "mover para tópico existente"
@@ -1898,7 +1901,7 @@ pt:
       merge_posts:
         title: "Juntar Publicações Selecionadas"
         action: "juntar publicações selecionadas"
-        error: "Ocorreu um erro ao juntar os tópicos selecionados."
+        error: "Ocorreu um erro ao juntar as publicações selecionadas."
       change_owner:
         action: "mudar titularidade"
         error: "Ocorreu um erro na mudança de dono das publicações."
@@ -1929,7 +1932,7 @@ pt:
       quote_reply: "Citar"
       edit_reason: "Motivo:"
       post_number: "publicação %{number}"
-      last_edited_on: "publicação editada pela última vez em"
+      last_edited_on: "última edição da publicação em"
       reply_as_new_topic: "Responder com novo Tópico"
       continue_discussion: "Continuar a discussão de %{postLink}:"
       follow_quote: "ir para a publicação citada"
@@ -1953,8 +1956,8 @@ pt:
         one: "você e %{count} outra pessoa gostaram desta publicação"
         other: "você e %{count} outras pessoas gostaram desta publicação"
       errors:
-        create: "Pedimos desculpa, ocorreu um erro ao criar a sua publicação. Por favor, tente novamente."
-        edit: "Pedimos desculpa, ocorreu um erro ao editar a sua publicação. Por favor, tente novamente."
+        create: "Desculpe, ocorreu um erro ao criar a sua publicação. Por favor, tente novamente."
+        edit: "Desculpe, ocorreu um erro ao editar a sua publicação. Por favor, tente novamente."
         upload: "Pedimos desculpa, ocorreu um erro ao carregar esse ficheiro. Por favor, tente novamente."
         too_many_uploads: "Pedimos desculpa, só pode carregar um ficheiro de cada vez."
         upload_not_authorized: "Pedimos desculpa, o ficheiro que está a tentar carregar não está autorizado (extensões autorizadas: %{authorized_extensions})."
@@ -1967,7 +1970,7 @@ pt:
         confirm: "Tem a certeza que deseja abandonar a sua publicação?"
         no_value: "Não, manter"
         yes_value: "Sim, abandonar"
-      via_email: "esta publicação chegou por email"
+      via_email: "esta publicação chegou por ''e-mail''"
       via_auto_generated_email: "esta publicação chegou via um email gerado automaticamente"
       whisper: "esta publicação é um susurro privado para os moderadores"
       wiki:
@@ -1977,7 +1980,7 @@ pt:
       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"
-        like: "gostar deste tópico"
+        like: "gostar desta publicação"
         has_liked: "gostou desta publicação"
         undo_like: "desfazer gosto"
         edit: "editar esta publicação"
@@ -2145,7 +2148,7 @@ pt:
       notify_action: "Mensagem"
       official_warning: "Aviso Oficial"
       delete_spammer: "Eliminar Spammer"
-      delete_confirm_MF: "Está prestes a eliminar {POSTS, plural, one {<b>1</b> publicação} outras {<b>#</b> publicações}} e {TOPICS, plural, one {<b>1</b> tópico} outros {<b>#</b> tópicos}} deste utilizador, remover a conta do mesmo, bloquear registos a partir do endereço de IP <b>{ip_address}</b> correspondente, e adicionar o endereço de e-mail <b>{email}</b> dos mesmos a uma lista negra permanente. Tem a certeza que este utilizador é de facto um spammer?"
+      delete_confirm_MF: "Está prestes a eliminar {POSTS, plural, one {<b>1</b> publicação} other {<b>#</b> publicações}} e {TOPICS, plural, one {<b>1</b> tópico} other {<b>#</b> tópicos}} deste utilizador, remover a conta do mesmo, bloquear registos a partir do endereço de IP <b>{ip_address}</b> correspondente, e adicionar o endereço de e-mail <b>{email}</b> dos mesmos a uma lista negra permanente. Tem a certeza que este utilizador é de facto um spammer?"
       yes_delete_spammer: "Sim, Eliminar Spammer"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(escondido)"
@@ -2951,7 +2954,7 @@ pt:
             allow: "Permitir"
         screened_urls:
           title: "URLs Filtrados"
-          description: "Os URLs listados aqui foram usados em publicações de utilizadores que foram identificados como spammers."
+          description: "Os URLs listados aqui foram utilizados nas publicações dos utilizadores que foram identificados como ''spammers''."
           url: "URL"
           domain: "Domínio"
         screened_ips:
@@ -3088,7 +3091,7 @@ pt:
           one: "Não é possível eliminar todas as publicações. Algumas publicações existem há mais de %{count} dia. (A configuração delete_user_max_post_age.)"
           other: "Não é possível eliminar todas as publicações. Algumas publicações existem há mais de %{count} dias. (A configuração delete_user_max_post_age.)"
         cant_delete_all_too_many_posts:
-          one: "Não é possível eliminar todas as publicações porque o utilizador tem mais de %{count} publicações. (delete_all_posts_max)"
+          one: "Não é possível eliminar todas as publicações porque o utilizador tem mais de %{count} publicação. (delete_all_posts_max)"
           other: "Não é possível eliminar todas as publicações porque o utilizador tem mais de %{count} publicações. (delete_all_posts_max)"
         delete_and_block: "Eliminar e <b>bloquear<b> este e-mail e endereço de IP"
         delete_dont_block: "Apenas eliminar"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index ca30f525cb..7f6419e7c1 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -991,6 +991,8 @@ pt_BR:
         confirm: "Você tem certeza absoluta de que deseja alterar seu nome de usuário?"
         taken: "Desculpe, este nome de usuário já está sendo usado."
         invalid: "Este nome de usuário é inválido. Ele deve conter apenas números e letras"
+      add_email:
+        add: "adicionar"
       change_email:
         title: "Alterar E-mail"
         taken: "Desculpe, este e-mail não está disponível."
@@ -1021,8 +1023,9 @@ pt_BR:
         title: "E-mail"
         primary: "E-mail Primário"
         secondary: "E-mails Secundários"
-        no_secondary: "Nenhum e-mail secundário"
-        sso_override_instructions: "E-mail pode ser atualizado do provedor de SSO."
+        primary_label: "primário"
+        update_email: "Alterar E-mail"
+        ssDestroy_override_instructions: "E-mail pode ser atualizado do provedor de SSO."
         instructions: "Nunca visível publicamente."
         ok: "Nós enviaremos um e-mail para confirmar"
         required: "Por favor preencha um endereço de e-mail"
@@ -3161,13 +3164,13 @@ pt_BR:
             more: '<a href="%{basePath}/admin/logs/search_logs">Registros de pesquisa</a>'
             disabled: 'O relatório de pesquisa em alta está desativado. Habilitar <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">consultas de pesquisa de registro</a> para coletar dados.'
           filters:
-            file-extension:
+            file_extension:
               label: Extensão de arquivo
             group:
               label: Grupo
             category:
               label: Categoria
-            include-subcategories:
+            include_subcategories:
               label: "Incluir subcategorias"
       commits:
         latest_changes: "Últimas atualizações: atualize com frequência!"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 320f35da3c..a0e3294fb2 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -735,6 +735,8 @@ ro:
         confirm: "Ești absolut sigur că vrei să-ți schimbi numele de utilizator?"
         taken: "Acest nume de utilizator este deja folosit."
         invalid: "Acest nume de utilizator este invalid. Trebuie să includă doar cifre și litere."
+      add_email:
+        add: "adaugă"
       change_email:
         title: "Schimbă email"
         taken: "Această adresă există deja în baza de date."
@@ -753,6 +755,8 @@ ro:
         instructions: "Fundalul va fi centrat şi va avea o dimensiune standard de 590px."
       email:
         title: "Email"
+        primary_label: "primar"
+        update_email: "Schimbă email"
         ok: "Îți vom trimite un email pentru confirmare."
         invalid: "Introduceți o adresă de email validă."
         authenticated: "Emailul a fost autentificat de către %{provider}."
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index aeffc76ecd..d78d095a3b 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -528,7 +528,7 @@ ru:
           medium: "Средний"
           high: "Высокий"
       conversation:
-        view_full: "просмотреть полный разговор"
+        view_full: "Просмотреть всё обсуждение"
       scores:
         about: "Оценка рассчитывается на основе уровня доверия сообщающего, точности его предыдущих жалоб и приоритета сообщения."
         score: "Оценка"
@@ -779,7 +779,7 @@ ru:
       "15": "Черновики"
     categories:
       all: "Все разделы"
-      all_subcategories: "все"
+      all_subcategories: "Все"
       no_subcategory: "Вне подразделов"
       category: "Раздел"
       category_list: "Показать список разделов"
@@ -956,7 +956,9 @@ ru:
       admin_delete: "Удалить"
       users: "Пользователи"
       muted_users: "Выключено"
+      muted_users_instructions: "Игнорировать все уведомления и личные сообщения от этих пользователей."
       ignored_users: "Игнорировать"
+      ignored_users_instructions: "Игнорировать все сообщения, уведомления и личные сообщения от этих пользователей."
       tracked_topics_link: "Показать"
       automatically_unpin_topics: "Автоматически откреплять темы после прочтения"
       apps: "Приложения"
@@ -1074,6 +1076,9 @@ ru:
         confirm: "Вы абсолютно действительно хотите изменить свое имя пользователя?"
         taken: "Этот псевдоним уже занят."
         invalid: "Псевдоним должен состоять только из цифр и латинских букв"
+      add_email:
+        title: "Добавить E-mail"
+        add: "добавить"
       change_email:
         title: "Изменить E-mail"
         taken: "Этот e-mail недоступен."
@@ -1104,8 +1109,16 @@ ru:
         title: "E-mail"
         primary: "Основной адрес электронной почты"
         secondary: "Дополнительный адрес электронной почты"
-        no_secondary: "Нет дополнительного адреса электронной почты"
-        sso_override_instructions: "E-mail может быть переопределен от поставщика SSO."
+        primary_label: "основной"
+        unconfirmed_label: "неподтвержденный"
+        resend_label: "Отправить заново подтверждение по e-mail"
+        resending_label: "отправка..."
+        resent_label: "e-mail отправлен"
+        update_email: "Изменить E-mail"
+        set_primary: "Указать как основной E-mail"
+        destroy: "Удалить E-mail"
+        add_email: "Добавить дополнительный E-mail"
+        ssDestroy_override_instructions: "E-mail может быть переопределен от поставщика SSO."
         instructions: "Не будет опубликован."
         ok: "Мы вышлем вам письмо для подтверждения"
         required: "Пожалуйста, введите email"
@@ -1262,6 +1275,7 @@ ru:
         expired: "Это приглашение истекло."
         rescind: "Отозвать"
         rescinded: "Приглашение отозвано"
+        rescind_all: "Удалить просроченные приглашения"
         rescinded_all: "Все просроченные приглашения удалены!"
         rescind_all_confirm: "Вы действительно хотите удалить все просроченные приглашения?"
         reinvite: "Повторить приглашение"
@@ -1272,18 +1286,30 @@ ru:
         time_read: "Времени читал"
         days_visited: "Дней посещал"
         account_age_days: "Дней с момента регистрации"
+        source: "Способ отправки приглашения"
         links_tab: "Ссылки"
+        links_tab_with_count: "Ссылки (%{count})"
+        link_url: "Ссылка"
         link_created_at: "Создано"
-        link_groups: Групп
+        link_redemption_stats: "Принятые приглашения"
+        link_groups: Группы
+        link_expires_at: Истекает
         create: "Отправить приглашение"
+        copy_link: "Копировать ссылку"
         generate_link: "Скопировать ссылку для приглашений"
         link_generated: "Пригласительная ссылка успешно создана!"
         valid_for: "Пригласительная ссылка действительна только для этого email: %{email}"
-        single_user: "Отдельный пользователь"
+        single_user: "Приглашение единичного пользователя"
+        multiple_user: "Приглашение нескольких пользователей"
         invite_link:
-          success: "Пригласительная ссылка успешно создана!"
+          title: "Ссылка на приглашение"
+          success: "Ссылка на приглашение успешно создана!"
+          error: "Произошла ошибка при создании ссылки на приглашение"
+          max_redemptions_allowed_label: "Сколько человек могут зарегистрироваться по этой ссылке?"
+          expires_at: "Когда истечет срок действия этой ссылки?"
         bulk_invite:
           none: "Вы ещё никого не приглашали сюда. Отправьте индивидуальные приглашения или пригласите несколько людей за раз, <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>загрузив файл CSV</a>."
+          text: "Массовое приглашение"
           success: "Файл успешно загружен, вы получите сообщение, когда процесс будет завершен."
           error: "Извините, но файл должен быть в формате CSV."
           confirmation_message: "Вы собираетесь отправить приглашения по электронной почте всем в загруженном файле."
@@ -1417,11 +1443,6 @@ ru:
       Давайте <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">приступим к обсуждению!</a> Есть {currentTopics, plural, one {<strong>#</strong> тема} few {<strong>#</strong> темы} other {<strong>#</strong> тем}}. Пользователи должны больше читать и отвечать – мы рекомендуем, по крайней мере {requiredTopics, plural, one {<strong>#</strong> тему} few {<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, one {<strong>#</strong> сообщение} few {<strong>#</strong> сообщения} other {<strong>#</strong> сообщений}}. Пользователи должны больше читать и отвечать – мы рекомендуем, по крайней мере {requiredPosts, plural, one {<strong>#</strong> сообщение} few {<strong>#</strong> сообщения} other {<strong>#</strong> сообщений}}. Только сотрудники могут видеть это сообщение.
-    logs_error_rate_notice:
-      reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} или {# errors/hour}}</a> достигнут предел настройки сайта {limit, plural, one {# error/hour} или {# errors/hour}}."
-      reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} или {# errors/minute}}</a> достигнут предел настройки сайта {limit, plural, one {# error/minute} или {# errors/minute}}."
-      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} или {# errors/hour}}</a> достигнут предел настройки сайта {limit, plural, one {# error/hour} или {# errors/hour}}."
-      exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} или {# errors/minute}}</a> превышен лимит настроек сайта {limit, plural, one {# error/minute} или {# errors/minute}}."
     learn_more: "подробнее..."
     all_time: "всего"
     all_time_desc: "всего создано тем"
@@ -2837,6 +2858,9 @@ ru:
         moderation: "Модерация"
         appearance: "Внешний вид"
         email: "Email"
+      list_filters:
+        all: "все темы"
+        none: "без подразделов"
     flagging:
       title: "Спасибо за вашу помощь в поддержании порядка!"
       action: "Пожаловаться на сообщение"
@@ -3409,13 +3433,13 @@ ru:
             more: '<a href="%{basePath}/admin/logs/search_logs">Поисковые логи</a>'
             disabled: 'Отчет о поисковых запросов отключен. Включить <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">журнал поисковых запросов</a> для сбора данных.'
           filters:
-            file-extension:
+            file_extension:
               label: Расширение файла
             group:
               label: Группа
             category:
               label: Раздел
-            include-subcategories:
+            include_subcategories:
               label: "Включая подразделы"
       commits:
         latest_changes: "Обновления в репозитории Github"
@@ -4119,6 +4143,9 @@ ru:
             override_upload_secure_status: "перезаписать защищенный статус загрузки"
             page_published: "страница опубликована"
             page_unpublished: "публикация страницы отменена"
+            add_email: "добавить e-mail"
+            update_email: "обновить e-mail"
+            destroy_email: "уничтожить e-mail"
         screened_emails:
           title: "Почтовые адреса"
           description: "Когда кто-то создаёт новую учётную запись, указанный пользователем почтовый адрес проверяется на соответствие с указанным ниже списком, и в случае совпадения регистрация блокируется или производятся другие дополнительные действия."
@@ -4545,6 +4572,8 @@ ru:
           modal_description: "Хотели бы вы применить это изменение исторически? Это изменит настройки для %{count} существующих пользователей."
           modal_yes: "Да"
           modal_no: "Нет, только применить изменения в будущем"
+        simple_list:
+          add_item: "Добавить элемент..."
       badges:
         title: Награды
         new_badge: Новая награда
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 53d6fbe725..8f52be3a6e 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -790,6 +790,8 @@ sk:
         confirm: "Ste si naozaj istý(á), že si chcete zmeniť vaše užívateľské meno?"
         taken: "Ľutujeme, toto používateľské meno je obsadené."
         invalid: "Toto používateľské meno nie je platné. Musí obsahovať iba znaky a čísla."
+      add_email:
+        add: "pridať"
       change_email:
         title: "Zmeniť email"
         taken: "Ľutujeme, tento email nie je k dispozícii."
@@ -810,7 +812,8 @@ sk:
         title: "Email"
         primary: "Primárny e-mail"
         secondary: "Sekundárne e-maily"
-        no_secondary: "Žiadne sekundárne e-maily"
+        primary_label: "primárny"
+        update_email: "Zmeniť email"
         ok: "Pošleme vám email pre potvrdenie"
         invalid: "Zadajte prosím platný email"
         authenticated: "Váš email bude autentifikovaný pomocou %{provider}"
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index c8abd2ae59..3c1d13d5bc 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -932,6 +932,8 @@ sl:
         confirm: "Ali ste prepričani, da želite zamenjati vaše uporabniško ime?"
         taken: "Oprostite, to uporabniško ime je zasedeno."
         invalid: "Uporabniško ime ni pravilno. Vsebuje lahko samo črke in številke. Preslednica in posebni znaki niso dovoljeni."
+      add_email:
+        add: "dodaj"
       change_email:
         title: "Spremeni e-naslov"
         taken: "Ta e-naslov ni na voljo."
@@ -952,8 +954,8 @@ sl:
         title: "E-naslov"
         primary: "E-naslov"
         secondary: "Dodatni e-naslovi"
-        no_secondary: "Ni dodatnih e-naslovov"
-        sso_override_instructions: "E-naslov se lahko spremeni pri SSO ponudniku."
+        update_email: "Spremeni e-naslov"
+        ssDestroy_override_instructions: "E-naslov se lahko spremeni pri SSO ponudniku."
         instructions: "se nikoli ne prikaže javno"
         ok: "Poslali vam bomo e-sporočilo za potrditev."
         invalid: "Vnesite veljaven e-naslov."
@@ -3076,7 +3078,7 @@ sl:
           trending_search:
             more: '<a href="%{basePath}/admin/logs/search_logs">Dnevnik iskanj</a>'
           filters:
-            file-extension:
+            file_extension:
               label: Pripona datoteke
             group:
               label: Skupina
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index e37fe9701c..52b38f6f3d 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -587,6 +587,8 @@ sq:
         title: "Ndrysho emrin e përdoruesit"
         taken: "Na vjen keq, por ky emër është i zënë."
         invalid: "Emri i përdoruesit nuk është i vlefshëm. Duhet të përmbaje vetëm shkronja ose numra"
+      add_email:
+        add: "shto"
       change_email:
         title: "Ndrysho email"
         taken: "Na vjen keq, por ky email nuk është i disponueshëm."
@@ -605,6 +607,8 @@ sq:
         instructions: "Sfondi do të vendoset në qendër dhe do të ketë një gjerësi prej 590px."
       email:
         title: "Email"
+        primary_label: "parësor"
+        update_email: "Ndrysho email"
         instructions: "Mos e shfaq në publik."
         ok: "Do ju nisim emailin e konfirmimit"
         invalid: "Ju lutemi të vendosni një email të vlefshëm"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index 63116c89a8..15a7269c62 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -535,6 +535,8 @@ sr:
         title: "Promijeni Korisničko ime"
         taken: "Žao nam je, to je ime zauzeto."
         invalid: "Korisničko ime je nevažeće. Može sadržati samo slova i brojeve."
+      add_email:
+        add: "dodaj"
       change_email:
         title: "Promeni e-mail"
         taken: "Žao nam je, taj e-mail nije dostupan"
@@ -551,6 +553,8 @@ sr:
         instructions: "Pozadinske slike će biti centrirane i imati standardu širinu od 590px."
       email:
         title: "E-mail"
+        primary_label: "primarna"
+        update_email: "Promeni e-mail"
         ok: "Poslaćemo vam e-mail za potvrdu"
         invalid: "Molimo unesite validnu e-mail adresu"
         authenticated: "E-mail vam je potvrđen od %{provider}"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index e0a936164a..d0802a93f6 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -875,7 +875,9 @@ sv:
       admin_delete: "Radera"
       users: "Användare"
       muted_users: "Tystat"
+      muted_users_instructions: "Undanta alla notiser och PM från dessa användare."
       ignored_users: "Ignorerade"
+      ignored_users_instructions: "Undanta alla inlägg, notiser och PM från dessa användare."
       tracked_topics_link: "Visa"
       automatically_unpin_topics: "Avklistra automatiskt ämnen när jag når botten"
       apps: "Appar"
@@ -994,6 +996,9 @@ sv:
         confirm: "Är du absolut säker på att du vill ändra ditt användarnamn?"
         taken: "Tyvärr, det användarnamnet är taget."
         invalid: "Det användarnamnet är ogiltigt. Det får bara innehålla siffror och bokstäver"
+      add_email:
+        title: "Lägg till e-post"
+        add: "lägg till"
       change_email:
         title: "Byt e-post"
         taken: "Tyvärr den e-postadressen är inte tillgänglig."
@@ -1024,8 +1029,16 @@ sv:
         title: "E-post"
         primary: "Primär e-post"
         secondary: "Sekundär e-post"
-        no_secondary: "Inga sekundära e-post"
-        sso_override_instructions: "E-post kan uppdateras från SSO leverantören."
+        primary_label: "primär"
+        unconfirmed_label: "obekräftad"
+        resend_label: "återsänd bekräftelse e-post"
+        resending_label: "skickar..."
+        resent_label: "e-post skickat"
+        update_email: "Byt e-post"
+        set_primary: "Ange primär e-post"
+        destroy: "Ta bort e-post"
+        add_email: "Lägg till alternativ e-post"
+        ssDestroy_override_instructions: "E-post kan uppdateras från SSO leverantören."
         instructions: "Visas aldrig publikt"
         ok: "Vi skickar e-post till dig för bekräftelse"
         required: "Vänligen ange en e-postadress"
@@ -1178,6 +1191,7 @@ sv:
         expired: "Denna inbjudan har gått ut."
         rescind: "Ta bort"
         rescinded: "Inbjudan borttagen"
+        rescind_all: "Ta bort utgångna inbjudningar"
         rescinded_all: "Alla utgångna inbjudningar har tagits bort!"
         rescind_all_confirm: "Är du säker på att du vill ta bort alla utgångna inbjudningar?"
         reinvite: "Skicka inbjudan igen"
@@ -1188,18 +1202,30 @@ sv:
         time_read: "Lästid"
         days_visited: "Dagar besökta"
         account_age_days: "Kontoålder i dagar"
+        source: "Inbjuden genom"
         links_tab: "Länkar"
+        links_tab_with_count: "Länkar (%{count})"
+        link_url: "Länk"
         link_created_at: "Skapad"
+        link_redemption_stats: "Återbeviljade"
         link_groups: Grupper
+        link_expires_at: Upphör
         create: "Skicka inbjudan"
+        copy_link: "Kopiera länk"
         generate_link: "Kopiera inbjudningslänken"
         link_generated: "Länk för inbjudan framgångsrikt skapad!"
         valid_for: "Länk för inbjudan är endast giltig för denna email adress: %{email}"
         single_user: "Enstaka användare"
+        multiple_user: "Flera användare"
         invite_link:
+          title: "Inbjudningslänk"
           success: "Länk för inbjudan framgångsrikt skapad!"
+          error: "Ett fel inträffade vid skapande av inbjudningslänk"
+          max_redemptions_allowed_label: "Hur många personer är tillåtna att registrera sig via denna länk?"
+          expires_at: "När ska denna inbjudningslänk upphöra?"
         bulk_invite:
           none: "Du har inte bjudit in någon ännu. Skicka individuella inbjudningar eller bjud in många personer på en gång genom att <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>ladda upp en CSV-fil</a>."
+          text: "Massinbjudan"
           success: "Filen laddades upp, du blir underrättad via meddelande när processen är klar"
           error: "Tyvärr, filen bör vara i CSV-format."
           confirmation_message: "Du är på väg att e-posta inbjudningar till alla personer i den uppladdade filen."
@@ -2647,6 +2673,9 @@ sv:
         moderation: "Moderering"
         appearance: "Utseende"
         email: "E-post"
+      list_filters:
+        all: "alla ämnen"
+        none: "inga underkategorier"
     flagging:
       title: "Tack för att du hjälper till att hålla forumet civiliserat!"
       action: "Flagga inlägg"
@@ -3165,13 +3194,13 @@ sv:
             more: '<a href="%{basePath}/admin/logs/search_logs">Sökloggar</a>'
             disabled: 'Den trendiga sökrapporten är inaktiverad. Aktivera <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">sökfrågor för loggar</a> för att samla data.  '
           filters:
-            file-extension:
+            file_extension:
               label: Filändelse
             group:
               label: Grupp
             category:
               label: Kategori
-            include-subcategories:
+            include_subcategories:
               label: "Inkludera underkategorier"
       commits:
         latest_changes: "Senaste ändringarna: snälla uppdatera ofta!"
@@ -3869,6 +3898,9 @@ sv:
             override_upload_secure_status: "åsidosätt säkerhetsstatus för uppladdning"
             page_published: "sida publicerad"
             page_unpublished: "sida avpublicerad"
+            add_email: "lägg till e-post"
+            update_email: "Uppdatera e-post"
+            destroy_email: "förstör e-post"
         screened_emails:
           title: "Kontrollerad e-post"
           description: "När någon försöker skapa ett nytt konto, kommer följande e-postadresser att kontrolleras och registreringen blockeras, eller någon annan åtgärd vidtas."
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index e805f3aff2..5dce2ce7ac 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -717,6 +717,8 @@ sw:
         confirm: "Je, una uhakika unataka kuabadili jina la mtumiaji?"
         taken: "Samahani, hilo jina limechukuliwa."
         invalid: "Hilo jina ni batili. Jina lazima liwe na namba au herufi au vyote viwili"
+      add_email:
+        add: "ongeza"
       change_email:
         title: "Badilisha Barua Pepe"
         taken: "Samahani, hiyo barua pepe haipo hewani."
@@ -737,6 +739,8 @@ sw:
         title: "Barua pepe"
         primary: "Barua pepe ya awali"
         secondary: "Barua pepe"
+        primary_label: "msingi"
+        update_email: "Badilisha Barua Pepe"
         ok: "Tutakutumia barua pepe kuthibitisha"
         invalid: "Andika barua pepe iliyo sahihi"
         authenticated: "Barua pepe yako imethibitishwa na %{mkimu}"
@@ -2018,7 +2022,7 @@ sw:
       notify_action: "Ujumbe"
       official_warning: "Onyo Rasmi"
       delete_spammer: "Futa Muandishi wa Taka"
-      delete_confirm_MF: "Unakaribia kufuta {POSTS, plural, one {chapisho<b>1</b>} other {machapisho <b>#</b>}} na {TOPICS, plural, one {mada<b>1</b>} other {mada<b>#</b>}} kutoka kwa mtumiaji mwingine, ondoa akaunti yao, zuia usajili kutoka kwenye anwani zao za mtandao<b>{anwani_ya mtandao}</b>, na ongeza barua pepe zao <b>{barua pepe}</b>kwenye orodha ya waliozuliwa. Una uhakika mtumiaji huyu anatuma barua au ujumbe taka?"
+      delete_confirm_MF: "Unakaribia kufuta {POSTS, plural, one {chapisho<b>1</b>} other {machapisho <b>#</b>}} na {TOPICS, plural, one {mada<b>1</b>} other {mada<b>#</b>}} kutoka kwa mtumiaji mwingine, ondoa akaunti yao, zuia usajili kutoka kwenye anwani zao za mtandao<b>{ip_address}</b>, na ongeza barua pepe zao <b>{email}</b>kwenye orodha ya waliozuliwa. Una uhakika mtumiaji huyu anatuma barua au ujumbe taka?"
       yes_delete_spammer: "Ndiyo, futa mtuma barua taka"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(imefichwa)"
@@ -2996,7 +3000,7 @@ sw:
         penalty_post_delete: "Futa taarifa"
         penalty_post_edit: "Hariri Taarifa"
         penalty_post_none: "Usifanye chochote"
-        delete_all_posts_confirm_MF: "Unaenda kufuta {POSTS, plural, one {chapisho 1} other {machapisho #}} na {TOPICS, plural, one {mada 1} ziada {mada #}}. Una uhakika?"
+        delete_all_posts_confirm_MF: "Unaenda kufuta {POSTS, plural, one {chapisho 1} other {machapisho #}} na {TOPICS, plural, one {mada 1} other {mada #}}. Una uhakika?"
         silence: "Imenyamazishwa"
         unsilence: "Imeruhusiwa"
         silenced: "Nyamazishwa?"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index c6f742e0a0..fdb67f3e0a 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -450,6 +450,8 @@ te:
         instructions: "వెనుతలం బొమ్మలు కేంద్రీకరించబడతాయి మరియు అప్రమేయ వెడల్పు 590 పిక్సెలు ఉంటాయి."
       email:
         title: "ఈమెయిల్"
+        primary_label: "ప్రాథమిక"
+        update_email: "ఈమెయిల్ మార్చు"
         ok: "ద్రువపరుచుటకు మీకు ఈమెయిల్ పంపాము"
         invalid: "దయచేసి చెల్లుబాటులోని ఈమెయిల్ చిరునామా రాయండి"
         authenticated: "మీ ఈమెయిల్ %{provider} చేత ద్రువీకరించబడింది"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index c1e43b699b..013594c88d 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -26,7 +26,10 @@ th:
         millions: "%{number}ล้าน"
     dates:
       time: "h:mm a"
+      time_with_zone: "HH:mm (z)"
+      time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
@@ -44,12 +47,16 @@ th:
           other: "< %{count} วินาที"
         x_seconds:
           other: "%{count} วินาที"
+        less_than_x_minutes:
+          other: "%{count}นาที"
         x_minutes:
           other: "%{count} นาที"
         about_x_hours:
           other: "%{count} ชั่วโมง"
         x_days:
           other: "%{count} วัน"
+        x_months:
+          other: "%{count}เดือน"
         about_x_years:
           other: "%{count} ปี"
         over_x_years:
@@ -73,6 +80,10 @@ th:
           other: "%{count} ชั่วโมงที่แล้ว"
         x_days:
           other: "%{count} วันที่แล้ว"
+        x_months:
+          other: "%{count}เดือนที่แล้ว"
+        x_years:
+          other: "%{count}ปีที่แล้ว"
       later:
         x_days:
           other: "%{count} วันหลังจากนี้"
@@ -84,6 +95,7 @@ th:
       next_month: "เดือนถัดไป"
       placeholder: วัน
     share:
+      topic_html: 'กระทู้: <span class="topic-title">%{topicTitle}</span>'
       post: "โพสต์ #%{postNumber}"
       close: "ปิด"
       twitter: "แชร์ลิ้งก์นี้ไปทวิตเตอร์"
@@ -95,6 +107,7 @@ th:
       split_topic: "แบ่งกระทู้นี้เมื่อ %{when}"
       invited_user: "ได้เชิญ %{who} %{when}"
       invited_group: "ได้เชิญ %{who} %{when}"
+      user_left: "%{who}ลบตัวเองออกจากข้อความนี้%{when}"
       removed_user: "ลบ %{who} %{when}"
       removed_group: "ลบ %{who} %{when}"
       autoclosed:
@@ -118,6 +131,7 @@ th:
       banner:
         enabled: "ทำให้เป็นแบนเนอร์%{when} จะปรากฏที่ด้านบนสุดของทุกหน้าจนกว่าจะผู้ใช้งานจะกดลบ"
         disabled: "ลบแบนเนอร์นี้%{when} จะไม่ปรากฏที่ด้านบนของหน้าใดๆ"
+      forwarded: "ส่งต่ออีเมลข้างต้นแล้ว"
     emails_are_disabled: "อีเมลขาออกทั้งหมดถูกปิดโดยผู้ดูแลระบบ จะไม่มีอีเมลแจ้งเตือนใดๆถูกส่งออกไป"
     themes:
       default_description: "ค่าเริ่มต้น"
@@ -128,11 +142,19 @@ th:
         ap_south_1: "เอเชียแปซิฟิก (มุมไบ)"
         ap_southeast_1: "เอเชียแปซิฟิก (สิงคโปร์)"
         ap_southeast_2: "เอเชียแปซิฟิก (ซิดนีย์)"
+        ca_central_1: "แคนาดา (กลาง)"
         cn_north_1: "จีน (ปักกิ่ง)"
+        cn_northwest_1: "จีน (หนิงเซี่ย)"
         eu_central_1: "อียู (แฟรงก์เฟิร์ต)"
+        eu_north_1: "อียู (สต็อกโฮล์ม)"
         eu_west_1: "อียู (ไอร์แลนด์)"
+        eu_west_2: "อียู (ลอนดอน)"
+        eu_west_3: "อียู (ปารีส)"
+        sa_east_1: "อเมริกาใต้ (เซาเปาโล)"
         us_east_1: "สหรัฐอเมริกาฝั่งตะวันออก (เวอร์จิเนียเหนือ)"
         us_east_2: "สหรัฐอเมริกาฝั่งตะวันออก (โอไฮโอ)"
+        us_gov_east_1: "AWS GovCloud (สหรัฐอเมริกาฝั่งตะวันออก)"
+        us_gov_west_1: "AWS GovCloud (สหรัฐอเมริกาฝั่งตะวันตก)"
         us_west_1: "สหรัฐอเมริกาฝั่งตะวันตก (แคลิฟอร์เนียเหนือ)"
         us_west_2: "สหรัฐอเมริกาฝั่งตะวันตก (ออริกอน)"
     edit: "แก้ไขหัวข้อและหมวดหมู่ของกระทู้นี้"
@@ -143,6 +165,7 @@ th:
     submit: "ตกลง"
     generic_error: "ขออภัย เกิดข้อผิดพลาดขึ้น"
     generic_error_with_reason: "เกิดข้อผิดพลาดขึ้น: %{error}"
+    go_ahead: "ไปต่อ"
     sign_up: "สมัครสมาชิก"
     log_in: "เข้าสู่ระบบ"
     age: "อายุ"
@@ -158,6 +181,7 @@ th:
     privacy_policy: "นโยบายความเป็นส่วนตัว"
     privacy: "ความเป็นส่วนตัว"
     tos: "เงื่อนไขการบริการ"
+    rules: "กฎ"
     mobile_view: "ดูแบบอุปกรณ์เคลื่อนที่"
     desktop_view: "ดูแบบเดสก์ท็อป"
     you: "คุณ"
@@ -177,6 +201,9 @@ th:
     alternation: "หรือ"
     character_count:
       other: "%{count} ตัวอักษร"
+    related_messages:
+      title: "ข้อความที่เกี่ยวข้อง"
+      see_all: 'ดู<a href="%{path}">ข้อความทั้งหมด</a>จาก @%{username}'
     suggested_topics:
       title: "กระทู้แนะนำ"
       pm_title: "ข้อความแนะนำ"
@@ -186,8 +213,11 @@ th:
       stats: "สถิติเว็บไซต์"
       our_admins: "แอดมินของเรา"
       our_moderators: "ผู้ดูแลของเรา"
+      moderators: "ผู้ดูแล"
       stat:
         all_time: "ตลอดเวลา"
+        last_7_days: "7 วันที่ผ่านมา"
+        last_30_days: "30 วันที่ผ่านมา"
       like_count: "ถูกใจ"
       topic_count: "กระทู้"
       post_count: "โพสต์"
@@ -202,17 +232,42 @@ th:
         bookmark: "คลิกเพื่อ บุ๊คมาร์ค ที่โพสแรกของกระทู้นี้"
         unbookmark: "คลิกเพื่อลบบุ๊กมาร์กทั้งหมดในกระทู้นี้"
     bookmarks:
+      created: "คุณได้บุ๊กมาร์กโพสต์นี้%{name}"
+      not_bookmarked: "บุ๊กมาร์กโพสต์นี้"
       remove: "ลบบุ๊กมาร์ก"
+      delete: "ลบบุ๊กมาร์ก"
+      confirm_clear: "คุณแน่ใจหรือว่าต้องการล้างบุ๊กมาร์กทั้งหมดจากกระทู้นี้"
       save: "บันทึก"
+      invalid_custom_datetime: "วันและเวลาที่คุณกรอกไม่ถูกต้อง กรุณาลองอีกครั้ง"
+      list_permission_denied: "คุณไม่ได้รับอนุญาตให้ดูบุ๊กมาร์กของผู้ใช้งานนี้"
       reminders:
+        later_today: "ภายหลังในวันนี้"
+        next_business_day: "ในวันทำการถัดไป"
         tomorrow: "พรุ่งนี้"
+        next_week: "สัปดาห์หน้า"
+        later_this_week: "ภายหลังในสัปดาห์นี้"
+        start_of_next_business_week: "วันจันทร์หน้า"
+        next_month: "เดือนหน้า"
+        last_custom: "ล่าสุด"
+        today_with_time: "วันนี้ตอน%{time}"
+        tomorrow_with_time: "พรุ่งนี้ตอน%{time}"
+        at_time: "เมื่อ%{date_time}"
+    copy_codeblock:
+      copied: "คัดลอกแล้ว!"
     drafts:
       remove: "ลบ"
+      new_topic: "แบบร่างกระทู้ใหม่"
+      new_private_message: "แบบร่างข้อความส่วนตัวใหม่"
       abandon:
+        confirm: "คุณได้เปิดแบบร่างอื่นในกระทู้นี้แล้ว แน่ใจหรือว่าต้องการละทิ้งมัน"
         yes_value: "ใช่ ละทิ้ง"
         no_value: "ไม่ เก็บไว้"
     topic_count_latest:
       other: "ดู %{count} กระทู้ใหม่หรือที่อัปเดต"
+    topic_count_unread:
+      other: "ดู%{count}กระทู้ที่ยังไม่ได้อ่าน"
+    topic_count_new:
+      other: "ดู%{count}กระทู้ใหม่"
     preview: "แสดงตัวอย่าง"
     cancel: "ยกเลิก"
     save: "บันทึกการเปลี่ยนแปลง"
@@ -220,9 +275,11 @@ th:
     saved: "บันทึกแล้ว!"
     upload: "อัปโหลด"
     uploading: "กำลังอัปโหลด..."
+    uploading_filename: "กำลังอัปโหลด: %{filename} ..."
     uploaded: "อัปโหลดแล้ว!"
     enable: "เปิดใช้งาน"
     disable: "ปิดใช้งาน"
+    continue: "ดำเนินการต่อ"
     undo: "เลิกทำ"
     revert: "ย้อนกลับ"
     failed: "ล้มเหลว"
@@ -231,41 +288,112 @@ th:
     banner:
       close: "ปิดแบนเนอร์นี้"
       edit: "แก้ไขแบนเนอร์นี้ >>"
+    pwa:
+      install_banner: "คุณต้องการ<a href>ติดตั้ง%{title}บนอุปกรณ์นี้ใช่ไหม</a>"
     choose_topic:
       none_found: "ไม่พบกระทู้ใดๆ"
+      title:
+        search: "ค้นหากระทู้"
+        placeholder: "ระบุหัวข้อกระทู้ หมายเลข หรือ url ที่นี่ "
+    choose_message:
+      none_found: "ไม่พบข้อความ"
+      title:
+        search: "ค้นหาข้อความ"
+        placeholder: "ระบุหัวข้อข้อความ หมายเลข หรือ url ที่นี่ "
     review:
+      order_by: "สั่งโดย"
+      in_reply_to: "ตอบไปยัง"
+      explain:
+        trust_level_bonus:
+          name: "ระดับความไว้ใจ"
+      awaiting_approval: "กำลังรอการยืนยัน"
       delete: "ลบ"
       settings:
+        saved: "บันทึกแล้ว"
         save_changes: "บันทึกการเปลี่ยนแปลง"
         title: "การตั้งค่า"
+      view_all: "ดูทั้งหมด"
+      grouped_by_topic: "จัดกลุ่มโดยหมวดหมู่"
+      topic_has_pending:
+        other: "กระทู้นี้มี<b>%{count}</b>โพสต์ที่กำลังรอการอนุมัติ"
       topic: "กระทู้:"
       filtered_user: "ผู้ใช้"
+      show_all_topics: "แสดงกระทู้ทั้งหมด"
+      deleted_post: "(โพสต์ถูกลบ)"
+      deleted_user: "(ผู้ใช้ถูกลบ)"
       user:
+        website: "เว็บไซต์"
         username: "ชื่อผู้ใช้"
         email: "อีเมล"
         name: "ชื่อ"
+      user_percentage:
+        summary:
+          other: "%{agreed},%{disagreed},%{ignored} (%{count}ธงทั้งหมด)"
+        agreed:
+          other: "%{count}% เห็นด้วย"
+        disagreed:
+          other: "%{count} % ไม่เห็นด้วย"
+        ignored:
+          other: "%{count} % ไม่สนใจ"
       topics:
         topic: "หัวข้อ"
+        deleted: "[กระทู้ถูกลบ]"
+        original: "(กระทู้ต้นฉบับ)"
+        details: "รายละเอียด"
+        unique_users:
+          other: "%{count} ผู้ใช้"
+      replies:
+        other: "%{count} ตอบ"
       edit: "แก้ไข"
       save: "บันทึก"
       cancel: "ยกเลิก"
       filters:
+        all_categories: "(หมวดหมู่ทั้งหมด)"
         type:
           title: "ชนิด"
+          all: "(ทุกประเภท)"
+        minimum_score: "คะแนนขั้นต่ำ:"
         refresh: "รีเฟรช"
+        status: "สถานะ"
         category: "หมวดหมู่"
+        orders:
+          score: "คะแนน"
+        priority:
+          medium: "ปานกลาง"
+          high: "สูง"
+      conversation:
+        view_full: "ดูบทสนทนาทั้งหมด"
       scores:
+        score: "คะแนน"
         date: "วันที่"
         type: "ชนิด"
+        status: "สถานะ"
+        submitted_by: "ยืนยันโดย"
+        reviewed_by: "รีวิวโดย"
       statuses:
         pending:
           title: "อยู่ระหว่างการพิจารณา"
+        approved:
+          title: "อนุมัติ"
+        rejected:
+          title: "ปฏิเสธ"
+        deleted:
+          title: "ลบ"
+        reviewed:
+          title: "(ถูกรีวิวทั้งหมด)"
+        all:
+          title: "(ทุกสิ่ง)"
       types:
+        reviewable_flagged_post:
+          title: "โพสต์ที่ถูกปักธง"
+          flagged_by: "ถูกปักธงโดย"
         reviewable_user:
           title: "ผู้ใช้"
       approval:
         title: "โพสต์นี้ต้องได้รับการอนุมัติ"
         description: "เราได้รับโพสต์ใหม่ของคุณแล้ว แต่ต้องได้รับการอนุมัติจากผู้ดูแลก่อนถึงจะปรากฏขึ้น กรุณารอสักครู่"
+        pending_posts:
+          other: "คุณมี<strong>%{count}</strong>โพสต์ที่กำลังรอการยืนยัน"
         ok: "ตกลง"
     user_action:
       user_posted_topic: "<a href='%{userUrl}'>%{user}</a> โพสต์ <a href='%{topicUrl}'>กระทู้</a>"
@@ -298,6 +426,7 @@ th:
       days_visited_long: "วันที่เยี่ยมชม"
       posts_read: "อ่าน"
       posts_read_long: "โพสต์ถูกอ่าน"
+      last_updated: "อัปเดตล่าสุด:"
       total_rows:
         other: "%{count} ผู้ใช้"
     group_histories:
@@ -306,11 +435,18 @@ th:
         add_user_to_group: "เพิ่มผู้ใช้"
         remove_user_from_group: "ลบผู้ใช้"
     groups:
+      member_added: "เพิ่ม"
+      member_requested: "ร้องขอเมื่อ"
       add_members:
         title: "เพิ่มสมาชิก"
         usernames: "ชื่อผู้ใช้"
       requests:
+        title: "คำร้องขอ"
         reason: "เหตุผล"
+        accept: "ยอมรับ"
+        accepted: "ยอมรับแล้ว"
+        deny: "ปฏิเสธ"
+        denied: "ปฏิเสธแล้ว"
       manage:
         title: "จัดการ"
         name: "ชื่อ"
@@ -334,15 +470,26 @@ th:
           from: "จาก"
           to: "ถึง"
       public_exit: "อนุญาตให้ผู้ใช้ออกจากกลุ่มอย่างอิสระ"
+      empty:
+        posts: "ไม่มีโพสต์โดยสมาชิกของกลุ่มนี้"
+        members: "ไม่มีสมาชิกในกลุ่มนี้"
+        requests: "ไม่มีคำร้องขอเป็นสมาชิกของกลุ่มนี้"
+        mentions: "ไม่มีการกล่าวถึงของกลุ่มนี้"
+        messages: "ไม่มีข้อความสำหรับกลุ่มนี้"
+        topics: "ไม่มีกระทู้โดยสมาชิกของกลุ่มนี้"
       add: "เพิ่ม"
       join: "เข้าร่วม"
       leave: "ออก"
       request: "ร้องขอ"
       message: "ข้อความ<br><div><br data-mce-bogus=\"1\"></div>"
+      confirm_leave: "คุณแน่ใจหรือว่าต้องการออกจากกลุ่มนี้"
       membership_request:
+        submit: "ส่งคำร้องขอ"
         title: "ขอเข้าร่วม @%{group_name}"
+        reason: "บอกให้เจ้าของกลุ่มทราบว่าทำไมคุณถึงเหมาะสมกับกลุ่มนี้"
       membership: "การเป็นสมาชิก"
       name: "ชื่อ"
+      group_name: "ชื่อกลุ่ม"
       user_count: "ผู้ใช้"
       bio: "เกี่ยวกับกลุ่ม"
       selector_placeholder: "กรอกชื่อผู้ใช้"
@@ -351,15 +498,35 @@ th:
         title: "กลุ่ม"
         all: "ทุกกลุ่ม"
         empty: "ไม่มีกลุ่มที่เห็นได้"
+        owner_groups: "กลุ่มที่ฉันเป็นเจ้าของ"
+        close_groups: "กลุ่มปิด"
+        automatic_groups: "กลุ่มอัตโนมัติ"
+        automatic: "อัตโนมัติ"
         closed: "ปิด"
+        public: "สาธารณะ"
+        private: "ส่วนตัว"
+        public_groups: "กลุ่มสาธารณะ"
         automatic_group: กลุ่มอัตโนมัติ
         close_group: กลุ่มปิด
         my_groups: "กลุ่มของฉัน"
+        group_type: "ประเภทกลุ่ม"
+        is_group_user: "สมาชิก"
+        is_group_owner: "เจ้าของ"
+      title:
+        other: "กลุ่ม"
       activity: "กิจกรรม"
       members:
         title: "สมาชิก"
         filter_placeholder_admin: "ชื่อผู้ใช้หรืออีเมล"
         filter_placeholder: "ชื่อผู้ใช้"
+        remove_member: "ลบสมาชิก"
+        remove_member_description: "ลบ<b>%{username}</b>ออกจากกลุ่มนี้"
+        make_owner: "แต่งตั้งเจ้าของ"
+        make_owner_description: "แต่งตั้ง<b>%{username}</b>เป็นเจ้าของกลุ่มนี้"
+        remove_owner: "ลบในสถานะเจ้าของ"
+        remove_owner_description: "ลบ<b>%{username}</b>ในสถานะเจ้าของกลุ่มนี้"
+        owner: "เจ้าของ"
+        forbidden: "คุณไม่ได้รับอนุญาตให้ดูสมาชิก"
       topics: "กระทู้"
       posts: "โพสต์"
       mentions: "กล่าวถึง"
@@ -371,6 +538,7 @@ th:
         only_admins: "เฉพาะแอดมิน"
         mods_and_admins: "เฉพาะผู้ดูแลระบบและแอดมิน"
         members_mods_and_admins: "เฉพาะสมาชิกกลุ่ม ผู้ดูแลระบบและแอดมิน"
+        owners_mods_and_admins: "เฉพาะเจ้าของกลุ่ม ผู้ดูแลระบบ และแอดมินเท่านั้น"
         everyone: "ทุกคน"
       notifications:
         watching:
@@ -378,6 +546,7 @@ th:
           description: "คุณจะถูกแจ้งเตือนทุกๆโพสต์ใหม่ในทุกๆข้อความ และจำนวนของคำตอบใหม่จะถูกแสดง"
         watching_first_post:
           title: "กำลังดูโพสต์แรก"
+          description: "คุณจะได้รับการแจ้งเตือนเมื่อมีข้อความใหม่ในกลุ่มนี้ ยกเว้นคำตอบของข้อความเหล่านั้น"
         tracking:
           title: "กำลังติดตาม"
           description: "คุณจะได้รับการแจ้งเตือนเมื่อมีคนกล่าวถึงชื่อของคุณ @name หรือตอบคุณ และจำนวนของคำตอบใหม่จะถูกแสดง"
@@ -386,8 +555,13 @@ th:
           description: "คุณจะได้รับการแจ้งเตือนเมื่อมีคนกล่าวถึงชื่อของคุณ @name หรือตอบคุณ"
         muted:
           title: "ปิด"
+          description: "คุณจะไม่ได้รับการแจ้งเตือนใดๆเกี่ยวกับข้อความในกลุ่มนี้"
+      flair_upload_description: "ใช้รูปสี่เหลี่ยมไม่เล็กกว่า 20 พิกเซล x 20 พิกเซล"
       flair_preview_icon: "ไอคอนตัวอย่าง"
       flair_preview_image: "รูปภาพตัวอย่าง"
+      flair_type:
+        icon: "เลือกไอคอน"
+        image: "อัปโหลดรูปภาพ"
     user_action_groups:
       "1": "ถูกใจ"
       "2": "ถูกใจ"
@@ -401,6 +575,7 @@ th:
       "12": "รายการที่ส่งแล้ว"
       "13": "กล่องข้อความ"
       "14": "อยู่ระหว่างการพิจารณา"
+      "15": "แบบร่าง"
     categories:
       all: "ทุกหมวดหมู่"
       all_subcategories: "ทั้งหมด"
@@ -419,6 +594,13 @@ th:
       latest_by: "ล่าสุดโดย"
       toggle_ordering: "เปลี่ยนวิธีการจัดลำดับ"
       subcategories: "หมวดหมู่ย่อย"
+      topic_sentence:
+        other: "%{count}กระทู้"
+      topic_stat_sentence_week:
+        other: "%{count}กระทู้ใหม่ในสัปดาห์ที่ผ่านมา"
+      topic_stat_sentence_month:
+        other: "%{count}กระทู้ใหม่ในเดือนที่ผ่านมา"
+      n_more: "หมวดหมู่ (อีก%{count}) ..."
     ip_lookup:
       title: มองหาที่อยู่ไอพี
       hostname: ชื่อโฮสต์
@@ -434,6 +616,7 @@ th:
       topics_entered: "กระทู้ที่เข้า"
       post_count: "# โพสต์"
       confirm_delete_other_accounts: "คุณแน่ใจแล้วหรือว่าจะลบบัญชีเหล่านี้"
+      copied: "คัดลอกแล้ว"
     user_fields:
       none: "(เลือกตัวเลือก)"
     user:
@@ -441,6 +624,10 @@ th:
       profile: "โปรไฟล์"
       mute: "ปิด"
       edit: "แก้ไขการตั้งค่า"
+      download_archive:
+        button_text: "ดาวน์โหลดทั้งหมด"
+        confirm: "คุณแน่ใจหรือว่าต้องการดาวน์โหลดโพสต์ของคุณ"
+        rate_limit_error: "สามารถดาวน์โหลดโพสต์ได้วันละหนึ่งครั้งเท่านั้น กรุณาลองใหม่พรุ่งนี้"
       new_private_message: "สร้างข้อความส่วนตัวใหม่"
       private_message: "ข้อความส่วนตัว"
       private_messages: "ข้อความ"
@@ -450,17 +637,27 @@ th:
           read: "อ่าน"
           unread: "ยังไม่อ่าน"
         ignore_duration_username: "ชื่อผู้ใช้"
+        ignore_duration_save: "ไม่สนใจ"
+        add_ignored_user: "เพิ่ม..."
         mute_option: "ปิด"
+        mute_option_title: "คุณจะไม่ได้รับการแจ้งเตือนใดๆที่เกี่ยวกับผู้ใช้นี้"
         normal_option: "ปกติ"
+        normal_option_title: "คุณจะได้รับการแจ้งเตือนเมื่อผู้ใช้นี้ตอบคุณ อ้างอิงถึงคุณ หรือกล่าวถึงคุณ"
       activity_stream: "กิจกรรม"
       preferences: "การตั้งค่า"
       feature_topic_on_profile:
+        open_search: "เลือกกระทู้ใหม่"
+        title: "เลือกกระทู้"
+        search_label: "ค้นหากระทู้โดยหัวข้อ"
         save: "บันทึก"
         clear:
           title: "ล้าง"
+      use_current_timezone: "ใช้เขตเวลาปัจจุบัน"
+      profile_hidden: "โปรไฟล์สาธารณะของผู้ใช้นี้ถูกซ่อนอยู่"
       expand_profile: "ขยาย"
       bookmarks: "บุ๊กมาร์ก"
       bio: "เกี่ยวกับฉัน"
+      timezone: "เขตเวลา"
       invited_by: "เชิญชวนโดย"
       trust_level: "ระดับความถูกต้อง"
       notifications: "การแจ้งเตือน"
@@ -476,6 +673,8 @@ th:
       dismiss: "ซ่อน"
       dismiss_notifications: "ซ่อนทั้งหมด"
       dismiss_notifications_tooltip: "ทำเครื่องหมายอ่านบนการแจ้งเตือนที่ยังไม่ได้อ่านทั้งหมด"
+      first_notification: "การแจ้งเตือนแรกของคุณ! กดเลือกเพื่อเริ่มต้น"
+      allow_private_messages: "อนุญาตให้ผู้ใช้อื่นส่งข้อความส่วนตัวหาฉัน"
       external_links_in_new_tab: "เปิดลิงก์ภายนอกทั้งหมดในแท็บใหม่"
       enable_quoting: "เปิดการตอบกลับการอ้างอิงโดยไฮไลท์ข้อความ"
       change: "เปลี่ยนแปลง"
@@ -484,6 +683,7 @@ th:
       moderator_tooltip: "ผู้ใช้นี้เป็นผู้ดูแลระบบ"
       admin_tooltip: "ผู้ใช้นี้เป็นแอดมิน"
       suspended_notice: "ผู้ใช้นี้ถูกระงับจนถึง %{date}"
+      suspended_permanently: "ผู้ใช้นี้ถูกระงับชั่วคราว"
       suspended_reason: "เหตุผล:"
       github_profile: "Github"
       email_activity_summary: "สรุปกิจกรรม"
@@ -494,6 +694,7 @@ th:
           การตั้งค่านี้จะเปลี่ยนแปลงการสรุปกิจกรรม<br />
           กระทู้และหมวดที่ปิดการแจ้งเตือนจะไม่ถูกรวมอยู่ในอีเมลเหล่านี้
         individual: "ส่งอีเมลทุกครั้งที่มีโพสต์ใหม่"
+        individual_no_echo: "ส่งอีเมลทุกครั้งที่มีโพสต์ใหม่ ยกเว้นของตัวฉันเอง"
         many_per_day: "ส่งอีเมลหาฉันทุกๆโพสต์ใหม่ (ประมาณ %{dailyEmailEstimate} ต่อวัน)"
         few_per_day: "ส่งอีเมลหาฉันทุกๆโพสต์ใหม่ (ประมาณ 2 ต่อวัน)"
       tag_settings: "แท็ก"
@@ -514,12 +715,18 @@ th:
       muted_users: "ปิดการแจ้งเตือน"
       tracked_topics_link: "แสดง"
       automatically_unpin_topics: "ยกเลิกปักหมุดกระทู้อัตโนมัติเมื่อถึงท้ายหน้า"
+      apps: "แอป"
+      api_approved: "อนุมัติแล้ว:"
+      api_last_used_at: "ใช้ครั้งสุดท้ายเมื่อ:"
+      theme: "ธีม"
+      save_to_change_theme: 'ธีมจะถูกอัปเดตเมื่อคุณคลิก "%{save_text}"'
       staff_counters:
         flags_given: "ธงที่เป็นประโยชน์"
         flagged_posts: "โพสต์ที่ปักธง"
         deleted_posts: "โพสต์ที่ลบ"
         suspensions: "ระงับการใช้งาน"
         warnings_received: "คำเตือน"
+        rejected_posts: "โพสต์ที่ถูกปฏิเสธ"
       messages:
         all: "ทั้งหมด"
         inbox: "กล่องจดหมายเข้า"
@@ -533,12 +740,14 @@ th:
         select_all: "เลือกทั้งหมด"
         tags: "แท็ก"
       preferences_nav:
+        account: "บัญชี"
         profile: "โปรไฟล์"
         emails: "อีเมล"
         notifications: "การแจ้งเตือน"
         categories: "หมวดหมู่"
         users: "ผู้ใช้"
         tags: "แท็ก"
+        apps: "แอป"
       change_password:
         success: "(อีเมลถูกส่งแล้ว)"
         in_progress: "(กำลังส่งอีเมล)"
@@ -551,26 +760,36 @@ th:
         disable: "ปิดใช้งาน"
         enable: "เปิดใช้งาน"
       second_factor:
+        forgot_password: "ลืมรหัสผ่านใช่ไหม"
+        confirm_password_description: "กรุณายืนยันรหัสผ่านเพื่อดำเนินการต่อ"
         name: "ชื่อ"
         disable: "ปิดใช้งาน"
         save: "บันทึก"
         edit: "แก้ไข"
         security_key:
+          register: "ลงทะเบียน"
           save: "บันทึก"
       change_about:
         title: "เปลี่ยนข้อมูลเกี่ยวกับฉัน"
         error: "เกิดความผิดพลาดในการแก้ไขค่านี้"
       change_username:
         title: "เปลี่ยนชื่อผู้ใช้"
+        confirm: "คุณแน่ใจจริงๆหรือว่าต้องการเปลี่ยนชื่อผู้ใช้ของคุณ"
         taken: "ขออภัย มีผู้ใช้ชื่อนี้แล้ว"
         invalid: "ชื่อผู้ใช้ไม่ถูกต้อง จะต้องมีเพียงแค่ตัวอักษรและตัวเลขเท่านั้น"
+      add_email:
+        title: "เพิ่มอีเมล"
+        add: "เพิ่ม"
       change_email:
         title: "เปลี่ยนอีเมล"
         taken: "ขออภัย อีเมลไม่ถูกต้อง"
         error: "มีข้อผิดพลาดในการเปลี่ยนอีเมล บางทีอีเมลนี้อาจถูกใช้งานแล้ว"
         success: "เราส่งอีเมลไปยังที่อยู่อีเมลดังกล่าวแล้ว กรุณาทำตามขั้นตอนยืนยัน"
+        success_staff: "เราส่งอีเมลไปยังที่อยู่อีเมลปัจจุบันแล้ว กรุณาทำตามขั้นตอนยืนยัน"
       change_avatar:
         title: "เปลี่ยนรูปโปรไฟล์ของคุณ"
+        gravatar_failed: "คุณไม่สามารถค้นหา%{gravatarName}ด้วยที่อยู่อีเมลนั้น"
+        refresh_gravatar_title: "รีเฟรช%{gravatarName}ของคุณ"
         letter_based: "รูปโพรไฟล์ที่ระบบทำให้อัตโนมัติ"
         uploaded_avatar: "รูปกำหนดเอง"
         uploaded_avatar_empty: "เพิ่มรูปกำหนดเอง"
@@ -581,20 +800,35 @@ th:
         instructions: "รูปพื้นหลังจะถูกจัดให้อยู่ตรงกลางและมีความกว้างมาตรฐานที่ 590px"
       email:
         title: "อีเมล"
+        primary: "อีเมลหลัก"
+        secondary: "อีเมลสำรอง"
+        primary_label: "หลัก"
+        unconfirmed_label: "ไม่ได้ยืนยัน"
+        resend_label: "ส่งอีเมลยืนยันตัวตนอีกครั้ง"
+        resending_label: "กำลังส่ง..."
+        resent_label: "อีเมลถูกส่งแล้ว"
+        update_email: "เปลี่ยนอีเมล"
+        set_primary: "ตั้งอีเมลหลัก"
+        destroy: "ลบอีเมล"
         instructions: "ไม่แสดงเป็นสาธารณะ"
         ok: "เราจะส่งอีเมลไปหาคุณเพื่อยืนยัน"
+        required: "กรุณากรอกที่อยู่อีเมล"
         invalid: "กรุณาใส่อีเมลที่ถูกต้อง"
         authenticated: "อีเมลของคุณได้รับการยืนยันโดย %{provider}"
         frequency_immediately: "เราจะอีเมลถึงคุณทันทีหากคุณยังไม่ได้อ่านสิ่งที่เราอีเมลหาคุณ"
         frequency:
           other: "เราจะอีเมลหาคุณเฉพาะตอนที่ไม่ได้เห็นคุณเป็นเวลา %{count} นาที"
       associated_accounts:
+        connect: "เชื่อมต่อ"
         revoke: "เอาออก"
         cancel: "ยกเลิก"
+        not_connected: "(ไม่เชื่อมต่อ)"
+        confirm_modal_title: "เชื่อมต่อ%{provider}บัญชี"
       name:
         title: "ชื่อ"
         instructions: "ชื่อเต็มของคุณ (ไม่บังคับ)"
         instructions_required: "ชื่อเต็มของคุณ"
+        required: "กรุณากรอกชื่อ"
         too_short: "ชื่อของคุณสั้นไป"
         ok: "ชื่อของคุณเหมาะสม"
       username:
@@ -603,19 +837,33 @@ th:
         short_instructions: "ผู้คนสามารถกล่าวถึงคุณโดย @%{username}"
         available: "ชื่อผู้ใช้ของคุณสามารถใช้ได้"
         not_available: "ใช้งานไม่ได้ กรุณาลอง%{suggestion}"
+        not_available_no_suggestion: "ถูกใช้แล้ว"
         too_short: "ชื่อผู้ใช้สั้นไป"
         too_long: "ชื่อผู้ใช้ยาวไป"
         checking: "กำลังตรวจสอบชื่อผู้ใช้"
         prefilled: "อีเมลตรงกับชื่อผู้ใช้ที่ลงทะเบียนนี้"
+        required: "กรุณากรอกชื่อผู้ใช้"
       locale:
         title: "ภาษา"
         instructions: "ภาษา จะเปลี่ยนเมื่อคุณรีเฟรชหน้า"
         default: "(ค่าเริ่มต้น)"
+        any: "ใดๆ"
       password_confirmation:
         title: "ยืนยันรหัสผ่าน"
       auth_tokens:
+        title: "อุปกรณ์ที่ถูกใช้เร็วๆนี้"
         ip: "ไอพี"
         details: "รายละเอียด"
+        log_out_all: "ออกจากระบบทั้งหมด"
+        active: "ใช้งานอยู่ตอนนี้"
+        not_you: "ไม่ใช่คุณใช่ไหม"
+        show_all: "แสดงทั้งหมด (%{count})"
+        show_few: "แสดงน้อยลง"
+        was_this_you: "ใช่คุณหรือไม่"
+        was_this_you_description: "ถ้าไม่ใช่คุณ เราแนะนำให้เปลี่ยนรหัสผ่านและออกจากระบบทุกเครื่อง"
+        browser_and_device: "%{browser}บน%{device}"
+        secure_account: "ตั้งค่าความปลอดภัยบัญชีของฉัน"
+        latest_post: "คุณโพสต์ครั้งล่าสุด..."
       last_posted: "โพสต์ล่าสุด"
       last_emailed: "อีเมลล่าสุด"
       last_seen: "ดูแล้ว"
@@ -625,7 +873,13 @@ th:
       website: "เว็บไซต์"
       email_settings: "อีเมล"
       text_size:
+        title: "ขนาดข้อความ"
+        smaller: "เล็กลง"
         normal: "ปกติ"
+        larger: "ใหญ่ขึ้น"
+        largest: "ใหญ่ที่สุด"
+      title_count_mode:
+        notifications: "การแจ้งเตือนใหม่"
       like_notification_frequency:
         title: "แจ้งเตือนเมื่อมีคนกดถูกใจ"
         always: "เสมอ"
@@ -638,6 +892,7 @@ th:
         always: "เสมอ"
         never: "ไม่เคย"
       email_digests:
+        title: "เมื่อฉันไม่ได้เยี่ยมชมเว็บไซต์ ให้ส่งอีเมลสรุปกระทู้ยอดนิยมและการตอบกลับ"
         every_30_minutes: "ทุก 30 นาที"
         every_hour: "ทุกชั่วโมง"
         daily: "ทุกวัน"
@@ -649,7 +904,7 @@ th:
         always: "เสมอ"
         never: "ไม่เคย"
       email_messages_level: "ส่งอีเมลหาฉันเมื่อมีคนส่งข้อความส่วนตัวมาหาฉัน"
-      include_tl0_in_digests: "รวมถึงเนื้อหาจากผู้ใช้ใหม่ในอีเมลสรุป"
+      include_tl0_in_digests: "รวมเนื้อหาจากผู้ใช้ใหม่ในอีเมลสรุป"
       email_in_reply_to: "เพิ่มการตอบในโพสท์ที่คัดกรองแล้วในอีเมล"
       other_settings: "อื่นๆ"
       categories_settings: "หมวดหมู่"
@@ -673,16 +928,18 @@ th:
         after_5_minutes: "หลังจาก 5 นาที"
         after_10_minutes: "หลังจาก 10 นาที"
       invited:
-        search: "พิมพ์เพื่อค้นหาการเชิญ..."
+        search: "พิมพ์เพื่อค้นหาคำเชิญ..."
         title: "เชิญชวน"
         user: "เชิญชวนผู้ใช้แล้ว"
+        sent: "ส่งล่าสุด"
+        none: "ไม่มีคำเชิญที่จะแสดง"
         truncated:
           other: "กำลังแสดงคำเชิญ %{count} รายการแรก"
         redeemed: "ยืนยันการเชิญชวน"
         redeemed_tab: "ยืนยัน"
         redeemed_tab_with_count: "ยืนยันแล้ว (%{count})"
         redeemed_at: "ยืนยัน"
-        pending: "รอการเชิญ"
+        pending: "คำเชิญที่กำลังรอการพิจารณา"
         pending_tab: "กำลังรอ"
         pending_tab_with_count: "กำลังรอ (%{count})"
         topics_entered: "กระทู้ที่ดูแล้ว"
@@ -690,21 +947,34 @@ th:
         expired: "การเชิญชวนนี้หมดอายุแล้ว"
         rescind: "ลบ"
         rescinded: "การเชิญชวนถูกลบออก"
+        rescind_all: "ลบคำเชิญที่หมดอายุ"
+        rescinded_all: "คำเชิญที่หมดอายุทั้งหมดถูกลบแล้ว!"
+        rescind_all_confirm: "คุณแน่ใจหรือว่าต้องการลบคำเชิญที่หมดอายุทั้งหมด"
         reinvite: "ส่งการเชิญชวนอีกครั้ง"
         reinvite_all: "ส่งการเชิญชวนทั้งหมดอีกครั้ง"
+        reinvite_all_confirm: "คุณแน่ใจหรือว่าต้องการส่งคำเชิญทั้งหมดอีกครั้ง"
         reinvited: "การเชิญชวนถูกส่งอีกครั้งแล้ว"
         reinvited_all: "การเชิญชวนทั้งหมดถูกส่งอีกครั้งแล้ว"
         time_read: "เวลาอ่าน"
         days_visited: "วันที่เข้าชม"
         account_age_days: "อายุบัญชีผู้ใช้ในหน่วยวัน"
+        source: "ถูกเชิญโดย"
         links_tab: "ลิงก์"
+        links_tab_with_count: "ลิงก์ (%{count})"
+        link_url: "ลิงก์"
         link_created_at: "สร้างเมื่อ"
         link_groups: กลุ่ม
+        link_expires_at: หมดอายุ
         create: "ส่งคำเชิญ"
+        copy_link: "คัดลอกลิงก์"
         generate_link: "คัดลอกลิงก์การเชิญชวน"
         link_generated: "สร้างลิงก์การเชิญชวนสำเร็จแล้ว!"
+        valid_for: "ลิงก์คำเชิญใช้งานได้กับที่อยู่อีเมลนี้เท่านั้น: %{email}"
         invite_link:
-          success: "สร้างลิงก์การเชิญชวนสำเร็จแล้ว!"
+          title: "ลิงก์คำเชิญ"
+          success: "สร้างลิงก์คำเชิญสำเร็จแล้ว!"
+          max_redemptions_allowed_label: "มีกี่คนที่ได้รับอนุญาตให้ลงทะเบียนใช้ลิงก์นี้"
+          expires_at: "ลิงก์คำเชิญนี้จะหมดอายุเมื่อไร"
         bulk_invite:
           success: "ไฟล์ถูกอัปโหลดเรียบร้อยแล้ว คุณจะได้รับการแจ้งเตือนทางข้อความเมื่อขั้นตอนเสร็จสิ้น"
       password:
@@ -714,14 +984,21 @@ th:
         same_as_username: "รหัสผ่านเหมือนกับชื่อผู้ใช้ของคุณ"
         same_as_email: "รหัสผ่านเหมือนกับอีเมลของคุณ"
         ok: "รหัสผ่านของคุณเหมาะสม"
+        instructions: "อย่างน้อย %{count} ตัวอักษร"
+        required: "กรุณากรอกรหัสผ่าน"
       summary:
-        title: "ภาพรวม"
+        title: "สรุปภาพรวม"
         stats: "สถิติ"
         time_read: "เวลาอ่าน"
+        recent_time_read: "เวลาอ่านเมื่อไม่นานมานี้"
         topic_count:
           other: "กระทู้ถูกสร้าง"
         post_count:
           other: "โพสต์ถูกสร้าง"
+        likes_given:
+          other: "ให้แล้ว"
+        likes_received:
+          other: "ได้รับแล้ว"
         days_visited:
           other: "วันที่เข้าชม"
         posts_read:
@@ -738,11 +1015,12 @@ th:
         no_badges: "ยังไม่มีเหรียญ"
         more_badges: "เหรียญอื่น"
         top_links: "ลิงก์ยอดนิยม"
-        no_links: "ยังไม่มีลิงก์เลย"
-        most_liked_by: "ถูกชอบมากที่สุดโดย"
-        most_liked_users: "ถูกชอบมากที่สุด"
+        no_links: "ยังไม่มีลิงก์"
+        most_liked_by: "ถูกใจมากที่สุดโดย"
+        most_liked_users: "ถูกใจมากที่สุด"
         most_replied_to_users: "ถูกตอบมากที่สุด"
-        no_likes: "ยังไม่มีใครชอบเลย"
+        no_likes: "ยังไม่มีใครถูกใจ"
+        top_categories: "หมวดหมู่ยอดนิยม"
         topics: "หัวข้อ"
         replies: "ตอบ"
       ip_address:
@@ -750,8 +1028,8 @@ th:
       registration_ip_address:
         title: "ไอพีที่ลงทะเบียน"
       avatar:
-        title: "ภาพแทนตัว"
-        header_title: "ข้อมูลส่วนตัว,ข้อความ,บุ๊คมาร์คและการตั้งค่า"
+        title: "รูปโปรไฟล์"
+        header_title: "โปรไฟล์ ข้อความ บุ๊กมาร์ก และการตั้งค่า"
       title:
         title: "ชื่อเรื่อง"
         none: "(ไม่มี)"
@@ -773,14 +1051,14 @@ th:
         server: "เซิร์ฟเวอร์มีปัญหา"
         forbidden: "การเข้าถึงถูกปฏิเสธ"
         unknown: "ผิดพลาด"
-        not_found: "ไม่หน้าดังกล่าว"
+        not_found: "ไม่พบหน้าดังกล่าว"
       desc:
         network: "โปรดตรวจสอบการเชื่อมต่อของคุณ"
-        network_fixed: "ดูเหมือนว่ามันจะกลับมา"
-        server: "รหัสข้อผิดพลาด: %{status}"
-        forbidden: "คุณไม่ได้รับอนุญาคิให้ดูมัน"
-        not_found: "อ๊ะ, ระบบพยายามโหลดหน้าที่ไม่มีอยู่"
-        unknown: "มีบางอย่างผิดปกติไป"
+        network_fixed: "ดูเหมือนว่ามันจะกลับมาแล้ว"
+        server: "รหัสที่ผิดพลาด: %{status}"
+        forbidden: "คุณไม่ได้รับอนุญาตให้ชม"
+        not_found: "อุ๊ปส์! ระบบพยายามโหลดหน้าที่ไม่มีอยู่"
+        unknown: "มีบางอย่างผิดปกติ"
       buttons:
         back: "ย้อนกลับ"
         again: "ลองอีกครั้ง"
@@ -788,48 +1066,57 @@ th:
     modal:
       close: "ปิด"
     close: "ปิด"
-    assets_changed_confirm: "เว็บนี้พึ่งได้รับการอัปเดต รีเฟรชเพื่อเข้าหน้าเว็บล่าสุด?"
+    assets_changed_confirm: "เว็บไซต์นี้พึ่งอัปเดต รีเฟรชตอนนี้เพื่อใช้เวอร์ชันล่าสุด"
     logout: "คุณได้ออกจากระบบ"
     refresh: "รีเฟรช"
+    home: "หน้าแรก"
     read_only_mode:
-      enabled: "หน้าเว็บนี้อยู่ในสถานะอ่านเท่านั้น คุณสามารถดูได้แต่การตอบ ชอบ หรือการกระทำอื่นๆถูกปิดอยู่ในขณะนี้"
-      login_disabled: "การลงชื่อเข้าใช้จะไม่สามารถใช้งานได้เมื่อเว็บนี้ถูกตั้งเป็นรูปแบบอ่านอย่างเดียว"
-      logout_disabled: "การออกจากระบบนั้นไม่สามารถทำได้ในเวลาที่เว็บนั้นอยู่ในโหมด read only"
+      enabled: "เว็บไซต์นี้อยู่ในโหมดอ่านเท่านั้น คุณสามารถดูได้แต่การตอบ ถูกใจ และอื่นๆถูกปิดอยู่ในขณะนี้"
+      login_disabled: "การลงชื่อเข้าใช้จะไม่สามารถใช้งานได้เมื่อเว็บไซต์อยู่ในโหมดอ่านเท่านั้น"
+      logout_disabled: "การออกจากระบบจะไม่สามารถใช้งานได้เมื่อเว็บไซต์อยู่ในโหมดอ่านเท่านั้น"
     learn_more: "เรียนรู้เพิ่มเติม..."
+    all_time: "ทั้งหมด"
+    all_time_desc: "กระทู้ทั้งหมดถูกสร้าง"
     year: "ปี"
-    year_desc: "กระทู้ที่ถูกตั้งเมื่อ365 วันที่ผ่านมา"
+    year_desc: "กระทู้ที่ถูกสร้างใน 365 วันที่ผ่านมา"
     month: "เดือน"
-    month_desc: "กระทู้ที่ถูกตั้งเมื่อ 30 วันที่ผ่านมา"
+    month_desc: "กระทู้ที่ถูกสร้างใน 30 วันที่ผ่านมา"
     week: "สัปดาห์"
-    week_desc: "กระทู้ที่ถูกตั้งในรอบ 7 วันที่ผ่านมา"
+    week_desc: "กระทู้ที่ถูกสร้างใน 7 วันที่ผ่านมา"
     day: "วัน"
-    first_post: โพสแรก
+    first_post: โพสต์แรก
     mute: ปิดเสียง
     unmute: เลิกปิดเสียง
+    last_post: โพสต์แล้ว
+    local_time: "เวลาท้องถิ่น"
     time_read: อ่าน
+    time_read_recently: "%{time_read}ไม่นานมานี้"
     last_reply_lowercase: การตอบล่าสุด
     replies_lowercase:
       other: ตอบ
     signup_cta:
-      sign_up: "สมัคร"
-      hide_session: "แจ้งเตือนฉันอีกทีพรุ่งนี้"
+      sign_up: "สมัครสมาชิก"
+      hide_session: "เตือนฉันพรุ่งนี้"
       hide_forever: "ไม่เป็นไร"
-      hidden_for_session: "โอเค ฉันจะถามคุณอีกทีพรุ่งนี้ คุณสามารถใช้เมนู เข้าสู่ระบบ เพื่อสร้างบัญชีได้เหมือนกันนะ"
+      hidden_for_session: "ไม่เป็นไร ฉันจะถามคุณพรุ่งนี้อีกครั้ง คุณสามารถใช้เมนู เข้าสู่ระบบ เพื่อสร้างบัญชีได้เช่นกัน"
     summary:
       enabled_description: "คุณกำลังดูสรุปของกระทู้นี้ : นี่คือโพสที่น่าสนใจที่สุดที่หลายๆคนแนะนำ"
-      description: "ตอบทั้งหมด <b>%{replyCount}</b> ครั้ง"
-      description_time: "ตอบทั้งหมด <b>%{replyCount}</b> ครั้งโดยมีเวลาการอ่านประมาณ <b>%{readingTime} นาที</b>."
+      description: "มี <b>%{replyCount}</b> คำตอบ"
+      description_time: "มี <b>%{replyCount}</b> คำตอบ โดยมีเวลาการอ่านประมาณ <b>%{readingTime} นาที</b>."
       enable: "สรุปกระทู้นี้"
       disable: "แสดงโพสต์ทั้งหมด"
     deleted_filter:
       enabled_description: "กระทู้นี้ซ่อนโพสต์ที่ถูกลบไปแล้ว"
-      disabled_description: "ลบโพสต์ที่แสดงทั้งหมดในกระทู้"
+      disabled_description: "โพสต์ที่ถูกลบแสดงในกระทู้"
       enable: "ซ่อนโพสต์ที่ถูกลบ"
       disable: "แสดงโพสต์ที่ถูกลบ"
     private_message_info:
       title: "ข้อความ"
-      remove_allowed_user: "คุณต้องการจะลบ %{name} จากข้อความนี้ใช้หรือไม่"
-      remove_allowed_group: "คุณต้องการจะลบ %{name} จากข้อความนี้ใช้หรือไม่"
+      invite: "เชิญผู้อื่น ..."
+      edit: "เพิ่มหรือลบ ..."
+      leave_message: "คุณต้องการละทิ้งข้อความนี้จริงๆใช่หรือไม่"
+      remove_allowed_user: "คุณต้องการลบ %{name} จากข้อความนี้ใช่หรือไม่"
+      remove_allowed_group: "คุณต้องการลบ %{name} จากข้อความนี้ใช่หรือไม่"
     email: "อีเมล"
     username: "ชื่อผู้ใช้"
     last_seen: "เห็น"
@@ -838,75 +1125,132 @@ th:
     trust_level: "ระดับความน่าไว้ใจ"
     search_hint: "ชื่อผู้ใช้ อีเมล หรือที่อยู่ไอพี"
     create_account:
+      disclaimer: "เมื่อลงทะเบียน คุณได้ยอมรับ <a href='%{privacy_link}' target='blank'>นโยบายความเป็นส่วนตัว</a> และ <a href='%{tos_link}' target='blank'> เงื่อนไขการบริการ</a>"
       title: "สร้างบัญชีใหม่"
-      failed: "มีบางอย่างผิดพลาด อีเมลนี้อาจจะลงทะเบียนไว้แล้ว หากลืมรหัสให้กดลิงค์ลืมรหัสผ่าน"
+      failed: "มีบางอย่างผิดพลาด อีเมลนี้อาจถูกลงทะเบียนไว้แล้ว กดลิงก์หากลืมรหัสผ่าน"
     forgot_password:
-      title: "ขอรหัสใหม่"
+      title: "รีเซ็ตรหัสผ่าน"
       action: "ฉันลืมรหัสผ่าน"
-      invite: "กรอกชื่อผู้ใช้หรืออีเมลของท่าน, ทางเราจะส่งอีเมลสำหรับรีเซตรหัสผ่านให้"
-      reset: "รีเซ็ทรหัสผ่าน"
-      complete_username: "ถ้าบัญชีนี้ตรงกับชื่อผู้ใช้ <b>%{username}</b> คุณควรจะได้รับอีเมลเร็วๆนี้ ในอีเมลจะเป็นขั้นตอนการรีเซตรหัสผ่าน"
-      complete_email: "ถ้าบัญชีตรงกับ <b>%{email}</b> คุณจะได้รับอีเมลสำหรับขั้นตอนในการรีเซ็ตรหัสผ่านในเร็วๆนี้"
-      complete_username_not_found: "ไม่มีบัญชีตรงกับชื่อผู้ใช้ <b>%{username}</b>"
-      complete_email_not_found: "ไม่มีบัญชีตรงกับอีเมล <b>%{email}</b>"
+      invite: "กรอกชื่อผู้ใช้หรืออีเมลของท่าน เราจะส่งอีเมลสำหรับรีเซ็ตรหัสผ่านให้"
+      reset: "รีเซ็ตรหัสผ่าน"
+      complete_username: "ถ้าบัญชีตรงกับชื่อผู้ใช้ <b>%{username}</b> คุณจะได้รับอีเมลเกี่ยวกับขั้นตอนการรีเซ็ตรหัสผ่านในไม่ช้า"
+      complete_email: "ถ้าบัญชีตรงกับ <b>%{email}</b> คุณจะได้รับอีเมลเกี่ยวกับขั้นตอนการรีเซ็ตรหัสผ่านในไม่ช้า"
+      complete_username_not_found: "ไม่มีบัญชีที่ตรงกับชื่อผู้ใช้ <b>%{username}</b>"
+      complete_email_not_found: "ไม่มีบัญชีที่ตรงกับ <b>%{email}</b>"
       button_ok: "ตกลง"
+      button_help: "ช่วยเหลือ"
     email_login:
-      complete_username_not_found: "ไม่มีบัญชีตรงกับชื่อผู้ใช้ <b>%{username}</b>"
-      complete_email_not_found: "ไม่มีบัญชีตรงกับอีเมล <b>%{email}</b>"
+      button_label: "ด้วยอีเมล"
+      complete_username_not_found: "ไม่มีบัญชีที่ตรงกับชื่อผู้ใช้ <b>%{username}</b>"
+      complete_email_not_found: "ไม่มีบัญชีที่ตรงกับ <b>%{email}</b>"
+      confirm_title: "ดำเนินการต่อไปยัง %{site_name}"
+      logging_in_as: "กำลังเข้าสู่ระบบด้วย %{email}"
+      confirm_button: เสร็จสิ้นการเข้าสู่ระบบ
     login:
       title: "เข้าสู่ระบบ"
       username: "ชื่อผู้ใช้"
       password: "รหัสผ่าน"
-      email_placeholder: "อีเมล์หรือชื่อผู้ใช้"
+      security_key_alternative: "ลองวิธีอื่น"
+      email_placeholder: "อีเมลหรือชื่อผู้ใช้"
       caps_lock_warning: "เปิดแคปล็อคอยู่"
       error: "ข้อผิดพลาดไม่ทราบสาเหตุ"
       rate_limit: "กรุณารอสักครู่ก่อนเข้าสู่ระบบอีกครั้ง"
+      blank_username: "กรุณากรอกอีเมลหรือชื่อผู้ใช้"
       blank_username_or_password: "กรุณากรอกอีเมลหรือชื่อผู้ใช้ และรหัสผ่าน"
-      reset_password: "รีเซ็ทรหัสผ่าน"
+      reset_password: "รีเซ็ตรหัสผ่าน"
       logging_in: "กำลังลงชื่อเข้าใช้"
       or: "หรือ"
-      authenticating: "กำลังตรวจสอบ ..."
-      awaiting_activation: "บัญชีของคุณกำลังรอการเปิดใช้งาน ใช้ลิงค์ลืมรหัสผ่านถ้าค้องการส่งอีเมลยืนยันตัวตนอีกครั้ง"
-      awaiting_approval: "บัญชีของคุณยังไม่ได้รับการยืนยันโดยทีมงาน คุณจะได้รับอีเมลแจ้งเมื่อคุณได้รับการยืนยันแล้ว"
+      authenticating: "กำลังตรวจสอบ..."
+      awaiting_activation: "บัญชีของคุณกำลังรอการยืนยันตัวตน ใช้ลิงก์ลืมรหัสผ่านหากต้องการส่งอีเมลยืนยันตัวตนอีกครั้ง"
+      awaiting_approval: "บัญชีของคุณยังไม่ได้รับการยืนยันโดยทีมงาน คุณจะได้รับอีเมลแจ้งเมื่อได้รับการยืนยันแล้ว"
       requires_invite: "ขออภัย, สามารถเข้าถึงได้เฉพาะผู้ที่ได้รับเชิญเท่านั้น"
       not_activated: "คุณไม่สามารถเข้าสู่ระบบได้ เราได้ส่งอีเมลยืนยันตัวตนไปหาคุณที่ <b>%{sentTo}</b> กรุณาทำตามขั้นตอนในอีเมลเพื่อยืนยันตัวตนของคุณ"
       not_allowed_from_ip_address: "คุณไม่สามารถเข้าสู่ระบบด้วยไอพีนี้ได้"
-      admin_not_allowed_from_ip_address: "คุณไม่สามารถเข้าสู่ระบบด้วยผู้ดูแลระบบด้วยไอพีนี้"
-      resend_activation_email: "คลิกเพื่อส่งอีเมลยืนยันตัวตนอีกครั้ง"
+      admin_not_allowed_from_ip_address: "คุณไม่สามารถเข้าสู่ระบบในสถานะแอดมินด้วยไอพีนี้ได้"
+      resend_activation_email: "คลิกที่นี่เพื่อส่งอีเมลยืนยันตัวตนอีกครั้ง"
+      resend_title: "ส่งอีเมลยืนยันตัวตนอีกครั้ง"
+      change_email: "เปลี่ยนที่อยู่อีเมล"
+      provide_new_email: "กรอกที่อยู่อีเมลใหม่ แล้วเราจะส่งอีเมลยืนยันตัวตนอีกครั้ง"
+      submit_new_email: "อัปเดตที่อยู่อีเมล"
       sent_activation_email_again: "เราส่งอีเมลยืนยันตัวตนใหม่ไปให้คุณที่ <b>%{currentEmail}</b> กรุณารอสักครู่และตรวจสอบในถังขยะอีเมลของคุณ"
-      to_continue: "โปรดเข้าสู่ระบบ"
-      preferences: "คุณจำเป็นต้องเข้าสู่ระบบจึงจะสามารถเปลี่ยนการตั้งค่าส่วนตัวของคุณได้"
+      sent_activation_email_again_generic: "เราส่งอีเมลยืนยันตัวตนใหม่ไปแล้ว กรุณารอสักครู่และตรวจสอบในถังขยะอีเมลของคุณ"
+      to_continue: "กรุณาเข้าสู่ระบบ"
+      preferences: "คุณจำเป็นต้องเข้าสู่ระบบเพื่อเปลี่ยนการตั้งค่าผู้ใช้ของคุณได้"
       forgot: "ฉันจำรายละเอียดบัญชีของตัวเองไม่ได้"
+      not_approved: "บัญชีของคุณยังไม่ได้รับการยืนยัน คุณจะได้รับการแจ้งเตือนทางอีเมลเมื่อคุณสามารถเข้าสู่ระบบได้"
       google_oauth2:
-        name: "กูเกิ้ล"
-        title: "ด้วย Google"
+        name: "กูเกิล"
+        title: "ด้วยกูเกิล"
       twitter:
         name: "ทวิตเตอร์"
-        title: "ด้วย Twitter"
+        title: "ด้วยทวิตเตอร์"
       instagram:
-        title: "ด้วย Instragram"
+        name: "อินสตาแกรม"
+        title: "ด้วยอินสตาแกรม"
       facebook:
-        title: "ด้วย Facebook"
+        name: "เฟซบุ๊ก"
+        title: "ด้วยเฟซบุ๊ก"
       github:
-        title: "ด้วย GitHub"
+        name: "กิตฮับ"
+        title: "ด้วยกิตฮับ"
     invites:
+      accept_title: "คำเชิญ"
+      welcome_to: "ยินดีต้อนรับสู่ %{site_name}!"
+      invited_by: "คุณถูกเชิญโดย:"
+      your_email: "ที่อยู่อีเมลบัญชีของคุณคือ <b>%{email}</b>"
+      accept_invite: "ยอมรับคำเชิญ"
+      success: "บัญชีของคุณถูกสร้าง คุณได้เข้าสู่ระบบแล้ว"
       name_label: "ชื่อ"
       password_label: "ตั้งรหัสผ่าน"
+      optional_description: "(ตัวเลือก)"
+    password_reset:
+      continue: "ดำเนินการต่อไปยัง %{site_name}"
     emoji_set:
-      apple_international: "แอปเปิ้ล/นานาชาติ"
-      google: "กูเกิ้ล"
+      apple_international: "แอปเปิล/นานาชาติ"
+      google: "กูเกิล"
       twitter: "ทวิตเตอร์"
+    category_page_style:
+      categories_only: "หมวดหมู่เท่านั้น"
+      categories_and_latest_topics: "หมวดหมู่และกระทู้ล่าสุด"
+      categories_and_top_topics: "หมวดหมู่และกระทู้ยอดนิยม"
     shortcut_modifier_key:
       shift: "Shift"
       ctrl: "Ctrl"
       alt: "Alt"
     conditional_loading_section:
       loading: กำลังโหลด...
+    category_row:
+      topic_count: "%{count}กระทู้ในหมวดหมู่นี้"
+    select_kit:
+      default_header_text: เลือก...
+      filter_placeholder: ค้นหา...
+      filter_placeholder_with_any: ค้นหาหรือสร้าง...
+      create: "สร้าง: '%{content}'"
+      invalid_selection_length: "การเลือกต้องมีอย่างน้อย %{count} ตัวอักษร"
     date_time_picker:
       from: จาก
       to: ถึง
     emoji_picker:
+      filter_placeholder: ค้นหาอีโมจิ
+      smileys_&_emotion: ยิ้มและอารมณ์
+      people_&_body: ผู้คนและร่างกาย
+      animals_&_nature: สัตว์และธรรมชาติ
+      food_&_drink: อาหารและเครื่องดื่ม
+      travel_&_places: ท่องเที่ยวและสถานที่
+      activities: กิจกรรม
+      objects: วัตถุ
+      symbols: สัญลักษณ์
       flags: ธง
+      recent: ใช่เมื่อไม่นานมานี้
+      default_tone: ไม่มีโทนผิว
+      light_tone: โทนผิวอ่อน
+      medium_light_tone: โทนผิวอ่อนปานกลาง
+      medium_tone: โทนผิวปานกลาง
+      medium_dark_tone: โทนผิวเข้มปานกลาง
+      dark_tone: โทนผิวเข้ม
+    shared_drafts:
+      title: "แบบร่างที่ถูกแบ่งปัน"
+      notice: "กระทู้นี้แสดงให้ผู้ที่สามารถเห็นหมวดหมู่ <b>%{category}</b> เท่านั้น"
     composer:
       emoji: "อีโมจิ :)"
       more_emoji: "อื่นๆ..."
@@ -915,16 +1259,20 @@ th:
       blockquote_text: "ส่วนอ้างถึง"
       add_warning: "นี่คือคำเตือนอย่างเป็นทางการ"
       toggle_whisper: "เปิดกระซิบ"
-      posting_not_on_topic: "กระทู้ไหนที่คุณต้องการตอบ?"
+      posting_not_on_topic: "กระทู้ไหนที่คุณต้องการตอบ"
       saved_local_draft_tip: "บันทึกบนอุปกรณ์"
-      similar_topics: "กระทู้ของคุณ ใกล้เคียงกับ ..."
-      drafts_offline: "ร่างออฟไลน์"
+      similar_topics: "กระทู้ของคุณใกล้เคียงกับ..."
+      drafts_offline: "แบบร่างออฟไลน์"
+      reference_topic_title: "ตอบกลับ: %{title}"
       error:
         title_missing: "ต้องมีชื่อเรื่อง"
         title_too_short: "ชื่อเรื่องต้องมีอย่างน้อย %{min} ตัวอักษร"
         title_too_long: "ชื่อเรื่องต้องไม่ยาวเกิน %{max} ตัวอักษร"
-        post_length: "โพสต้องมีอย่างน้อย %{min} ตัวอักษร"
+        post_missing: "โพสต์ไม่สามารถว่างได้"
+        post_length: "โพสต์ต้องมีอย่างน้อย %{min} ตัวอักษร"
+        try_like: "คุณได้ลองปุ่ม %{heart} แล้วหรือยัง"
         category_missing: "คุณต้องเลือกหมวดหมู่"
+        tags_missing: "คุณต้องเลือกอย่างน้อย %{count} แท็ก"
       save_edit: "บันทึกการแก้ไข"
       reply_original: "ตอบบนกระทู้ต้นฉบับ"
       reply_here: "ตอบที่นี่"
@@ -935,23 +1283,30 @@ th:
       title: "หรือกด Ctrl+Enter"
       users_placeholder: "เพิ่มผู้ใช้"
       title_placeholder: "บทสนทนานี้เกี่ยวกับอะไร ขอสั้นๆ 1 ประโยค"
-      edit_reason_placeholder: "ทำไมคุณถึงแก้ไข?"
+      title_or_link_placeholder: "พิมพ์หัวข้อ หรือวางลิงก์ที่นี่"
+      edit_reason_placeholder: "ทำไมคุณถึงแก้ไข"
+      topic_featured_link_placeholder: "กรอกลิงก์ที่แสดงหัวข้อ"
+      remove_featured_link: "ลบลิงก์ออกจากกระทู้"
       reply_placeholder: "พิมพ์ที่นี่. ใช้ Markdown, BBCode หรือ HTML เพื่อจัดรูปแบบ สามารถลากหรือวางรูปภาพได้"
+      reply_placeholder_choose_category: "เลือกหมวดหมู่ก่อนพิมพ์ที่นี่"
       view_new_post: "ดูโพสต์ใหม่ของคุณ"
       saving: "กำลังบันทึก"
       saved: "บันทึกแล้ว!"
       uploading: "กำลังอัปโหลด..."
       show_preview: "แสดงตัวอย่าง &raquo;"
       hide_preview: "&raquo; ซ่อนตัวอย่าง"
-      quote_post_title: "อ้างถึงโพสทั้งหมด"
+      quote_post_title: "อ้างถึงโพสต์ทั้งหมด"
+      bold_label: "หนา"
       bold_title: "หนา"
       bold_text: "ตัวอักษรหนา"
+      italic_label: "เอียง"
       italic_title: "ความสำคัญ"
       italic_text: "ข้อความสำคัญ"
       link_title: "ลิงค์"
-      link_description: "กรอกรายละเอียดลิงค์ที่นี่"
+      link_description: "กรอกรายละเอียดลิงก์ที่นี่"
       link_dialog_title: "เพิ่มลิงค์"
       link_optional_text: "ชื่อเรื่องเพิ่มเติม"
+      link_url_placeholder: "วาง URL หรือพิมพ์เพื่อค้นหากระทู้"
       quote_title: "ส่วนอ้างถึง"
       quote_text: "ส่วนอ้างถึง"
       code_title: "ข้อความก่อนจัดรูปแบบ"
@@ -964,119 +1319,188 @@ th:
       help: "ช่วยเหลือการจัดรูปแบบ"
       modal_ok: "ตกลง"
       modal_cancel: "ยกเลิก"
-      cant_send_pm: "ขอโทษด้วย คุณไม่สามารถส่งข้อความหา %{username} ได้"
+      cant_send_pm: "ขออภัย คุณไม่สามารถส่งข้อความหา %{username} ได้"
+      yourself_confirm:
+        title: "คุณลืมเพิ่มผู้รับหรือไม่"
+        body: "ตอนนี้ข้อความนี้กำลังถูกส่งไปยังตัวคุณเท่านั้น"
       admin_options_title: "ตั้งค่าทางเลือกทีมงานสำหรับกระทู้นี้"
       composer_actions:
         reply: ตอบ
+        draft: แบบร่าง
         edit: แก้ไข
+        reply_to_post:
+          label: "ตอบกลับไปยังโพสต์ %{postNumber}โดย %{postUsername}"
+        reply_as_private_message:
+          label: ข้อความใหม่
+          desc: สร้างข้อความส่วนตัวใหม่
+        reply_to_topic:
+          label: ตอบกลับกระทู้
         create_topic:
           label: "กระทู้ใหม่"
+        shared_draft:
+          label: "แบบร่างที่ถูกแบ่งปัน"
+          desc: "ร่างกระทู้ที่สามารถเห็นแค่ทีมงาน"
+        toggle_topic_bump:
+          desc: "ตอบกลับโดยไม่เปลี่ยนวันที่ตอบกลับล่าสุด"
     notifications:
+      tooltip:
+        regular:
+          other: "%{count} การแจ้งเตือนที่ยังไม่เห็น"
+        message:
+          other: "%{count} ข้อความที่ยังไม่ได้อ่าน"
       title: "การแจ้งเตือนการพูดถึง,การตอบกลับไปยังโพส กระทู้ หรือข้อความส่วนตัว และอื่นๆของ @name "
-      none: "ไม่สามารถโหลดการแจ้งเตือนในขณะนี้"
+      none: "ไม่สามารถโหลดการแจ้งเตือนได้ในขณะนี้"
+      empty: "ไม่พบการแจ้งเตือน"
+      post_approved: "โพสต์ของคุณได้รับการอนุมัติ"
+      mentioned: "<span>%{username}</span>%{description}"
+      group_mentioned: "<span>%{username}</span>%{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span>%{description}"
+      liked_2: "<span>%{username}, %{username2}</span>%{description}"
+      liked_many:
+        other: "<span>%{username}, %{username2} และอื่นๆอีก %{count}</span>%{description}"
+      liked_consolidated_description:
+        other: "ถูกใจ %{count} ครั้งต่อโพสต์ของคุณ"
+      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}"
+      invitee_accepted: "<span>%{username}</span>ยอมรับคำเชิญของคุณ"
+      moved_post: "<span>%{username}</span>ได้ลบ%{description}"
+      linked: "<span>%{username}</span>%{description}"
+      topic_reminder: "<span>%{username}</span>%{description}"
+      watching_first_post: "<span>กระทู้ใหม่</span>%{description}"
+      membership_request_accepted: "ถูกรับเป็นสมาชิกในกลุ่ม '%{group_name}'"
+      group_message_summary:
+        other: "%{count}ข้อความในกล่องขาเข้าของกลุ่ม %{group_name}"
       popup:
-        mentioned: '%{username} พูดถึงคุณใน "%{topic}" - %{site_title}'
-        group_mentioned: '%{username} พูดถึงคุณใน "%{topic}" - %{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}'
+        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} บน %{site_title}"
       titles:
-        watching_first_post: "สร้างกระทู้"
+        mentioned: "ได้กล่าวถึง"
+        replied: "คำตอบใหม่"
+        quoted: "ถูกอ้างอิงถึง"
+        edited: "ถูกแก้ไข"
+        liked: "การถูกใจใหม่"
+        private_message: "ข้อความส่วนตัวใหม่"
+        invited_to_private_message: "ถูกเชิญไปยังข้อความส่วนตัว"
+        invitee_accepted: "คำเชิญถูกยอมรับ"
+        posted: "โพสต์ใหม่"
+        watching_first_post: "กระทู้ใหม่"
     upload_selector:
       title: "เพิ่มรูปภาพ"
       title_with_attachments: "เพิ่มรูปภาพหรือไฟล์"
-      from_my_computer: "จากอุปกรณ์"
+      from_my_computer: "จากอุปกรณ์ของฉัน"
       from_the_web: "จากเว็บ"
-      remote_tip: "ลิงค์ไปยังรูปภาพ"
-      remote_tip_with_attachments: "ลิงค์ไปยังรูปหรือไฟล์ %{authorized_extensions}"
-      local_tip: "เลือกภาพจากอุปกรณ์ของคุณ"
-      local_tip_with_attachments: "เลือกภาพหรือไฟล์จากอุปกรณ์ของคุณ %{authorized_extensions}"
-      hint: "(คุณสามารถใช้เมาส์ลากไปวางในตัวแก้ไขข้อความเพื่ออัพโหลดได้ด้วย)"
-      hint_for_supported_browsers: "คุณยังสามารถลากหรือวางไฟล์ในช่องแก้ไขโดยตรงได้ด้วย"
+      remote_tip: "ลิงก์ไปยังรูปภาพ"
+      remote_tip_with_attachments: "ลิงก์ไปยังรูปภาพหรือไฟล์ %{authorized_extensions}"
+      local_tip: "เลือกรูปภาพจากอุปกรณ์ของคุณ"
+      local_tip_with_attachments: "เลือกรูปภาพหรือไฟล์จากอุปกรณ์ของคุณ %{authorized_extensions}"
+      hint: "(คุณสามารถลากไปวางในช่องแก้ไขเพื่ออัปโหลดได้ด้วย)"
+      hint_for_supported_browsers: "คุณสามารถลากหรือวางรูปภาพในช่องแก้ไขได้ด้วย"
       uploading: "กำลังอัปโหลด"
       select_file: "เลือกไฟล์"
+      default_image_alt_text: รูปภาพ
     search:
       sort_by: "เรียงโดย"
       relevance: "เกี่ยวข้อง"
-      latest_post: "โพสล่าสุด"
-      most_viewed: "ดูเยอะสุด"
-      most_liked: "ไลค์เยอะสุด"
+      latest_post: "โพสต์ล่าสุด"
+      latest_topic: "กระทู้ล่าสุด"
+      most_viewed: "ดูมากที่สุด"
+      most_liked: "ถูกใจมากที่สุด"
       select_all: "เลือกทั้งหมด"
       clear_all: "ล้างทั้งหมด"
-      title: "ค้นหากระทู้, โพสต์, ผู้ใช้ หรือ หมวดหมู่"
+      too_short: "คำค้นหาสั้นเกินไป"
+      title: "ค้นหากระทู้ โพสต์ ผู้ใช้ หรือหมวดหมู่"
+      full_page_title: "ค้นหากระทู้หรือโพสต์"
       no_results: "ไม่มีผลการค้นหา"
-      no_more_results: "ไม่พบการค้นหาเพิ่มเติมแล้ว"
+      no_more_results: "ไม่มีผลการค้นหาเพิ่มเติมแล้ว"
       searching: "กำลังค้นหา..."
-      post_format: "#%{post_number} ด้วย %{username}"
-      search_google_button: "กูเกิ้ล"
+      post_format: "#%{post_number} โดย %{username}"
+      search_google_button: "กูเกิล"
       context:
-        user: "ค้นหาโพสต์ด้วย @%{username}"
+        user: "ค้นหาโพสต์โดย @%{username}"
         category: "ค้นหาหมวด #%{category}"
         topic: "ค้นหากระทู้นี้"
         private_messages: "ค้นหาข้อความ"
       advanced:
         posted_by:
           label: โพสต์โดย
-    hamburger_menu: "ไปยังกระทู้อื่นหรือหมวดหมู่อื่น"
+        post:
+          time:
+            label: โพสต์แล้ว
+    hamburger_menu: "ไปยังรายการกระทู้หรือหมวดหมู่อื่น"
     new_item: "ใหม่"
     go_back: "ย้อนกลับ"
-    not_logged_in_user: "หน้าผู้ใช้สำหรับสรุปกิจกรรมล่าสุดและการปรับแต่ง"
-    current_user: "ไปยังหน้าผู้ใช้"
+    not_logged_in_user: "หน้าผู้ใช้พร้อมสรุปกิจกรรมล่าสุดและการตั้งค่า"
+    current_user: "ไปยังหน้าผู้ใช้ของคุณ"
     topics:
       bulk:
         select_all: "เลือกทั้งหมด"
         clear_all: "ล้างทั้งหมด"
         unlist_topics: "กระทู้ที่ไม่ได้แสดง"
         reset_read: "ล้างจำนวนการอ่าน"
-        delete: "ลบกระทู้นี้"
+        delete: "ลบกระทู้"
         dismiss: "ซ่อน"
         dismiss_read: "ซ่อนทั้งหมดที่ไม่ได้อ่าน"
         dismiss_button: "ซ่อน..."
-        dismiss_tooltip: "ซ่อนเฉพาะโพสใหม่หรือหยุดติดตามกระทู้"
-        also_dismiss_topics: "หยุดติดตามกระทู้เหล่านี้และอย่าแสดงพวกนั้นให้ฉันเห็นเป็นหัวข้อที่ยังไม่ได้อ่านอีก"
+        dismiss_tooltip: "ซ่อนเฉพาะโพสต์ใหม่หรือหยุดติดตามกระทู้"
+        also_dismiss_topics: "หยุดติดตามกระทู้เหล่านี้เพื่อไม่ให้แสดงว่าเป็นกระทู้ที่ยังไม่ได้อ่าน"
         dismiss_new: "ซ่อนใหม่"
         toggle: "สลับการเลือกกระทู้จำนวนมาก"
         actions: "การดำเนินการจำนวนมาก"
-        close_topics: "ลบกระทู้นี้"
+        close_topics: "ปิดกระทู้"
         archive_topics: "คลังกระทู้"
         notification_level: "การแจ้งเตือน"
-        choose_new_category: "เลือกหมวดใหม่ให้กระทู้"
+        choose_new_category: "เลือกหมวดหมู่ใหม่ให้กระทู้"
         selected:
           other: "คุณได้เลือก <b>%{count}</b> กระทู้"
       none:
         unread: "คุณไม่มีกระทู้ที่ยังไม่ได้อ่าน"
         new: "คุณไม่มีกระทู้ใหม่"
-        read: "คุณยังไม่ได้อ่านกระทู้เลย"
-        posted: "คุณยังไม่ได้โพสในกระทู้ใดๆ"
-        latest: "ไม่มีกระทู้ล่าสุด น่าเสียใจจริงๆ"
-        bookmarks: "คุณยังไม่ได้บุ๊คมาร์คกระทู้ใดๆเลย"
-        category: "ยังไม่ในกระทู้ในหมวด %{category}"
-        top: "ไม่มีหัวข้อสูงสุดแล้ว"
+        read: "คุณยังไม่ได้อ่านกระทู้ใดๆเลย"
+        posted: "คุณยังไม่ได้โพสต์ในกระทู้ใดๆเลย"
+        latest: "ยังไม่มีกระทู้ล่าสุด น่าเสียใจจริงๆ"
+        bookmarks: "คุณยังไม่ได้บุ๊กมาร์กกระทู้ใดๆเลย"
+        category: "ไม่มีกระทู้ในหมวด %{category}"
+        top: "ไม่มีกระทู้ยอดนิยม"
       bottom:
-        latest: "ไม่มีกระทู้ล่าสุด"
-        posted: "ไม่มีหัวข้อที่โพสแล้ว"
-        read: "ไม่มีหัวข้อที่อ่านแล้ว"
-        new: "ไม่มีกระทู้ใหม่"
-        unread: "ไม่มีหัวข้อที่ยังไม่อ่านแล้ว"
-        top: "ไม่มีหัวข้อสูงสุดแล้ว"
-        bookmarks: "ไม่มีบุ๊คมาร์คในหัวข้อใดอีกแล้ว"
+        latest: "ไม่มีกระทู้ล่าสุดอีกแล้ว"
+        posted: "ไม่มีกระทู้ที่โพสต์อีกแล้ว"
+        read: "ไม่มีกระทู้ที่อ่านแล้วอีก"
+        new: "ไม่มีกระทู้ใหม่อีกแล้ว"
+        unread: "ไม่มีกระทู้ที่ยังไม่อ่านอีกแล้ว"
+        top: "ไม่มีกระทู้ยอดนิยมอีกแล้ว"
+        bookmarks: "ไม่มีกระทู้ที่บุ๊กมาร์กอีกแล้ว"
     topic:
       filter_to:
-        other: " %{count} โพสในกระทู้"
+        other: " %{count} โพสต์ในกระทู้"
       create: "กระทู้ใหม่"
       create_long: "สร้างกระทู้ใหม่"
-      private_message: "สร้างข้อความใหม่"
+      private_message: "เริ่มข้อความ"
       archive_message:
         help: "ย้ายข้อความไปกล่องเก็บข้อความ"
         title: "คลัง"
       move_to_inbox:
         title: "ย้ายไปกล่องขาเข้า"
-        help: "ย้ายข้อความกลับไปกล่องข้อความ"
+        help: "ย้ายข้อความกลับไปกล่องขาเข้า"
       edit_message:
         title: "แก้ไข"
       list: "กระทู้"
-      new: "สร้างกระทู้"
+      new: "กระทู้ใหม่"
       unread: "ยังไม่ได้อ่าน"
       new_topics:
         other: "%{count} กระทู้ใหม่"
@@ -1085,31 +1509,35 @@ th:
       title: "กระทู้"
       invalid_access:
         title: "กระทู้นี้เป็นกระทู้ส่วนตัว"
-        description: "ขออภัยคุณไม่สามารถเข้าถึงกระทู้ที่ต้องการได้!"
+        description: "ขออภัย คุณไม่สามารถเข้าถึงกระทู้ที่ต้องการได้!"
         login_required: "คุณจำเป็นต้องเข้าสู่ระบบเพื่อดูกระทู้นี้"
       server_error:
         title: "ไม่สามารถโหลดกระทู้ได้"
       not_found:
         title: "ไม่พบกระทู้"
       total_unread_posts:
-        other: "คุณมี %{count} ความคิดเห็น ที่ยังไม่ได้อ่านในกระทู้นี้"
+        other: "คุณมี %{count} โพสต์ที่ยังไม่ได้อ่านในกระทู้นี้"
       unread_posts:
-        other: "คุณมี %{count} ความคิดเห็นเก่า ที่ยังไม่ได้อ่านในกระทู้นี้"
+        other: "คุณมี %{count} โพสต์เก่าที่ยังไม่ได้อ่านในกระทู้นี้"
       back_to_list: "กลับไปที่รายชื่อกระทู้"
-      show_links: "แสดงลิงค์ในกระทู้นี้"
-      read_more_in_category: "ต้องการจะอ่านเพิ่มเหรอ? ลองดูกระทู้อื่นใน %{catLink} หรือ %{latestLink}"
-      read_more: "ต้องการจะอ่านเพิ่ม? %{catLink} หรือ %{latestLink}."
+      show_links: "แสดงลิงก์ในกระทู้นี้"
+      read_more_in_category: "ต้องการอ่านเพิ่มใช่ไหม ลองดูกระทู้อื่นใน %{catLink} หรือ %{latestLink}"
+      read_more: "ต้องการอ่านเพิ่มใช่ไหม %{catLink} หรือ %{latestLink}"
       view_latest_topics: ดูกระทู้ล่าสุด
-      suggest_create_topic: ทำไมไม่สร้างกระทู้ละ
-      deleted: "หัวข้อถูกลบ"
+      suggest_create_topic: ทำไมไม่สร้างกระทู้ล่ะ
+      deleted: "กระทู้ถูกลบ"
       auto_update_input:
+        later_today: "ภายหลังในวันนี้"
         tomorrow: "พรุ่งนี้"
+        later_this_week: "ภายหลังในสัปดาห์นี้"
+        next_week: "สัปดาห์หน้า"
+        next_month: "เดือนหน้า"
       auto_close:
         error: "กรอกค่าที่ถูกต้อง"
         based_on_last_post: "ไม่ปิดจนกว่าโพสสุดท้ายในกระทู้นี่เก่า"
       status_update_notice:
-        auto_close: "กระทู้นี้จะถูกปิดใน %{timeLeft}"
-        auto_close_based_on_last_post: "กระทู้นี้จะถูกปิด %{duration} หลังจากการตอบสุดท้าย"
+        auto_close: "กระทู้นี้จะถูกปิดอัตโนมัติใน %{timeLeft}"
+        auto_close_based_on_last_post: "กระทู้นี้จะถูกปิด %{duration} หลังจากการตอบล่าสุด"
       auto_close_title: "ปิดการตั้งค่าอัตโนมัติ"
       timeline:
         back: "กลับ"
@@ -1118,13 +1546,13 @@ th:
         jump_prompt_or: "หรือ"
       notifications:
         reasons:
-          "3_2": "คุณจะได้รับการแจ้งเตือนเพราะคุณดูกระทู้นี้"
-          "3_1": "คุณจะได้รับการแจ้งเตือนเพราะคุณสร้างกระทู้นี้"
-          "3": "คุณจะได้รับการแจ้งเตือนเพราะคุณดูกระทู้นี้"
-          "1_2": "คุณจะได้รับการแจ้งเตือนเมื่อใครก็ตามเอ่ยชื่อของคุณ @name หรือตอบคุณ"
-          "1": "คุณจะได้รับการแจ้งเตือนเมื่อใครก็ตามเอ่ยชื่อของคุณ @name หรือตอบคุณ"
-          "0_2": "คุณไม่ต้องการรับการแจ้งเตือนของกระทู้นี้"
-          "0": "คุณไม่ต้องการรับการแจ้งเตือนของกระทู้นี้"
+          "3_2": "คุณจะได้รับการแจ้งเตือนเพราะคุณกำลังดูกระทู้นี้"
+          "3_1": "คุณจะได้รับการแจ้งเตือนเพราะคุณได้สร้างกระทู้นี้"
+          "3": "คุณจะได้รับการแจ้งเตือนเพราะคุณกำลังดูกระทู้นี้"
+          "1_2": "คุณจะได้รับการแจ้งเตือนเมื่อมีคนกล่าวถึงชื่อของคุณ @name หรือตอบคุณ"
+          "1": "คุณจะได้รับการแจ้งเตือนเมื่อมีคนกล่าวถึงชื่อของคุณ @name หรือตอบคุณ"
+          "0_2": "คุณไม่ต้องการรับการแจ้งเตือนทั้งหมดจากกระทู้นี้"
+          "0": "คุณไม่ต้องการรับการแจ้งเตือนทั้งหมดจากกระทู้นี้"
         watching_pm:
           title: "กำลังดู"
         watching:
@@ -1135,10 +1563,10 @@ th:
           title: "ติดตาม"
         regular:
           title: "ปกติ"
-          description: "คุณจะได้รับการแจ้งเตือนเมื่อใครก็ตามเอ่ยชื่อของคุณ @name หรือตอบคุณ"
+          description: "คุณจะได้รับการแจ้งเตือนเมื่อมีคนกล่าวถึงชื่อของคุณ @name หรือตอบคุณ"
         regular_pm:
           title: "ปกติ"
-          description: "คุณจะได้รับการแจ้งเตือนเมื่อใครก็ตามเอ่ยชื่อของคุณ @name หรือตอบคุณ"
+          description: "คุณจะได้รับการแจ้งเตือนเมื่อมีคนกล่าวถึงชื่อของคุณ @name หรือตอบคุณ"
         muted_pm:
           title: "ปิด"
         muted:
@@ -1149,35 +1577,35 @@ th:
         delete: "ลบกระทู้"
         open: "เปิดกระทู้"
         close: "ปิดกระทู้"
-        multi_select: "เลือกโพส..."
-        pin: "ปักหมุดกระทู้"
-        unpin: "ยกเลิกปักหมุดกระทู้"
+        multi_select: "เลือกโพสต์..."
+        pin: "ปักหมุดกระทู้..."
+        unpin: "เลิกปักหมุดกระทู้"
         unarchive: "เลิกเก็บกระทู้เข้าคลัง"
         archive: "เก็บกระทู้เข้าคลัง"
         invisible: "ทำให้ไม่แสดงในรายชื่อ"
         visible: "ทำให้แสดงในรายชื่อ"
-        reset_read: "ล้างข้อมูลวันที่"
+        reset_read: "ล้างข้อมูลการอ่าน"
         make_public: "ทำให้กระทู้เป็นสาธารณะ"
       feature:
         pin: "ปักหมุดกระทู้"
-        unpin: "ยกเลิกปักหมุดกระทู้"
+        unpin: "เลิกปักหมุดกระทู้"
         pin_globally: "ปักหมุดกระทู้ทั้งหมด"
         make_banner: "ป้ายกระทู้"
         remove_banner: "ยกเลิกป้ายกระทู้"
       reply:
         title: "ตอบ"
-        help: "เริ่มการเขียนตอบกระทู้นี้"
+        help: "เริ่มเขียนตอบกระทู้นี้"
       share:
         title: "แบ่งปัน"
-        help: "แบ่งปันลิงค์ไปยังกระทู้นี้"
+        help: "แบ่งปันลิงก์ไปยังกระทู้นี้"
       flag_topic:
         title: "ธง"
         help: "ปังธงกระทู้นี้เพื่อติดตามหรือรับการแจ้งเตือนเกี่ยวกับกระทู้"
         success_message: "คุณปักธงกระทู้นี้แล้ว"
       feature_topic:
         title: "แนะนำกระทู้นี้"
-        confirm_pin: "ตอนนี้คุณมีกระทู้ที่ปักหมุดทั้งหมด %{count} กระทู้ การมีกระทู้ที่ปักหมุดมากๆจะทำให้ผู้ใช้ใหม่และผู้ใช้ที่ไม่ระบุชื่อรำคาญ คุณแน่ใจจริงๆหรือว่าจะปักหมุกกระทู้เพิ่มอีก?"
-        confirm_pin_globally: "ตอนนี้คุณมีหัวข้อที่ปักหมุดแบบรวม %{count} หัวข้อ การมีหัวข้อที่ปักหมุดมากๆจะทำให้ผู้ใช้ใหม่และผู้ใช้ที่ไม่ระบุชื่อรำคาญ คุณแน่ใจจริงๆหรือว่าจะปักหมุกหัวข้อเพิ่มอีก?"
+        confirm_pin: "คุณมีกระทู้ที่ปักหมุดทั้งหมด %{count} กระทู้ การมีกระทู้ที่ปักหมุดมากๆอาจสร้างปัญหาให้แก่ผู้ใช้ใหม่และผู้ใช้ที่ไม่ระบุชื่อได้ คุณแน่ใจหรือว่าจะปักหมุดกระทู้เพิ่มอีกในหมวดหมู่นี้"
+        confirm_pin_globally: "คุณมีกระทู้ที่ปักหมุดทั้งหมด %{count}  กระทู้ การมีกระทู้ที่ปักหมุดมากๆอาจสร้างปัญหาให้แก่ผู้ใช้ใหม่และผู้ใช้ที่ไม่ระบุชื่อได้ คุณแน่ใจหรือว่าจะปักหมุดกระทู้เพิ่มอีกในหมวดหมู่นี้"
       inviting: "กำลังเชิญ..."
       invite_private:
         title: "ข้อความที่ใช้เชิญ"
@@ -1196,17 +1624,17 @@ th:
       login_reply: "เข้าสู่ระบบเพื่อตอบ"
       filters:
         n_posts:
-          other: "%{count} โพส"
-        cancel: "เอาการกรองออก"
+          other: "%{count} โพสต์"
+        cancel: "เอาตัวกรองออก"
       split_topic:
-        title: "ย้ายไปหัวข้อใหม่"
-        action: "ย้ายไปหัวข้อใหม่"
+        title: "ย้ายไปกระทู้ใหม่"
+        action: "ย้ายไปกระทู้ใหม่"
         radio_label: "กระทู้ใหม่"
       merge_topic:
-        title: "ย้ายไปหัวข้อที่มีอยู่แล้ว"
-        action: "ย้ายไปหัวข้อที่มีอยู่แล้ว"
+        title: "ย้ายไปกระทู้ที่มีอยู่แล้ว"
+        action: "ย้ายไปกระทู้ที่มีอยู่แล้ว"
       move_to_new_message:
-        radio_label: "สร้างข้อความส่วนตัวใหม่"
+        radio_label: "สร้างข้อความใหม่"
       change_owner:
         action: "เปลี่ยนความเป็นเจ้าของ"
         error: "มีความผิดพลาดขณะเปลี่ยนความเป็นเจ้าของโพส"
@@ -1219,43 +1647,43 @@ th:
         select_post:
           label: "เลือก"
         select_replies:
-          label: "เลือก +ตอบ"
+          label: "เลือก + ตอบ"
         delete: ลบที่เลือก
         cancel: ยกเลิกการเลือก
         select_all: เลือกทั้งหมด
         deselect_all: ไม่เลือกทั้งหมด
         description:
-          other: "คุณได้เลือก <b>%{count}</b> โพสต์."
+          other: "คุณได้เลือก <b>%{count}</b> โพสต์"
     post:
       edit_reason: "เหตุผล:"
       post_number: "โพสต์ %{number}"
-      last_edited_on: "โพสแก้ไขล่าสุดเมื่อ"
+      last_edited_on: "โพสต์ถูกแก้ไขล่าสุดเมื่อ"
       reply_as_new_topic: "ตอบด้วยหัวข้อที่ลิงค์ไว้"
-      follow_quote: "ไปยังโพสที่ถูกอ้างถึง"
-      show_full: "แสดงโพสแบบเต็ม"
+      follow_quote: "ไปยังโพสต์ที่ถูกกล่าวถึง"
+      show_full: "แสดงโพสต์ทั้งหมด"
       deleted_by_author:
         other: "(โพสถูกแจ้งลบโดยเจ้าของ และจะถูกลบใน %{count} ชั่วโมงเว้นแต่จะถูกปักธง)"
-      expand_collapse: "ขยาย/หด"
-      unread: "โพสนี้ยังไม่ถูกอ่าน"
+      expand_collapse: "ขยาย/ย่อ"
+      unread: "โพสต์นี้ยังไม่ถูกอ่าน"
       has_replies:
         other: "%{count} ตอบ"
       has_likes_title:
-        other: "%{count} ผู้คนที่ชอบโพสนี้"
-      has_likes_title_only_you: "คุณชอบโพสนี้"
+        other: "%{count} คนถูกใจโพสต์นี้"
+      has_likes_title_only_you: "คุณถูกใจโพสต์นี้"
       errors:
-        create: "ขอโทษ, เกิดความผิดพลาดขณะกำลังสร้างโพสของคุณ โปรดลองใหม่อีกครั้ง"
-        edit: "ขอโทษ, เกิดความผิดพลาดขณะกำลังแก้ไขโพสต์ของคุณ โปรดลองใหม่อีกครั้ง"
-        upload: "ขอโทษ, เกิดความผิดพลาดขณะกำลังอัพโหลดไฟล์ โปรดลองใหม่อีกครั้ง"
-        too_many_uploads: "ขอโทษ, คุณสามารถอัพโหลดไฟล์ได้ครั้งล่ะหนึ่งไฟล์"
-        image_upload_not_allowed_for_new_user: "ขออภัย, ผู้ใช้ใหม่ไม่สามารถอัพโหลดรูปภาพได้"
-        attachment_upload_not_allowed_for_new_user: "ขออภัย, ผู้ใช้ใหม่ไม่สามารถอัพโหลดไฟล์แนบได้"
-        attachment_download_requires_login: "ขออภัย, คุณต้องเข้าสู่ระบบเพื่อดาวห์โหลดไฟล์แนบ"
+        create: "ขออภัย เกิดความผิดพลาดขณะกำลังสร้างโพสต์ของคุณ กรุณาลองใหม่อีกครั้ง"
+        edit: "ขออภัย เกิดความผิดพลาดขณะกำลังแก้ไขโพสต์ของคุณ กรุณาลองใหม่อีกครั้ง"
+        upload: "ขออภัย เกิดความผิดพลาดขณะกำลังอัปโหลดไฟล์ของคุณ กรุณาลองใหม่อีกครั้ง"
+        too_many_uploads: "ขออภัย คุณสามารถอัปโหลดได้ครั้งละหนึ่งไฟล์เท่านั้น"
+        image_upload_not_allowed_for_new_user: "ขออภัย ผู้ใช้ใหม่ไม่สามารถอัปโหลดรูปภาพได้"
+        attachment_upload_not_allowed_for_new_user: "ขออภัย ผู้ใช้ใหม่ไม่สามารถอัปโหลดไฟล์แนบได้"
+        attachment_download_requires_login: "ขออภัย คุณต้องเข้าสู่ระบบเพื่อดาวน์โหลดไฟล์แนบ"
       abandon_edit:
         no_value: "ไม่ เก็บไว้"
       abandon:
-        confirm: "คุณต้องการทิ้งโพสของคุณจริงๆเหรอ?"
+        confirm: "คุณแน่ใจหรือว่าต้องการละทิ้งโพสต์ของคุณ"
         no_value: "ไม่ เก็บไว้"
-        yes_value: "ใช่ ทิ้งไป"
+        yes_value: "ใช่ ละทิ้ง"
       via_email: "โพสนี้ถูกเก็บโดยอีเมล"
       whisper: "โพสนี้คือการกระซิบจากผู้ดูแล"
       wiki:
@@ -1263,35 +1691,35 @@ th:
       archetypes:
         save: "บันทึกการตั้งค่า"
       controls:
-        like: "ชอบโพสนี้"
-        has_liked: "คุณได้ชอบโพสนี้แล้ว"
-        undo_like: "ย้อนคืนการชอบ"
-        edit: "แก้ไขโพสนี้"
+        like: "ถูกใจโพสต์นี้"
+        has_liked: "คุณได้ถูกใจโพสต์นี้แล้ว"
+        undo_like: "เลิกถูกใจ"
+        edit: "แก้ไขโพสต์นี้"
         edit_action: "แก้ไข"
-        edit_anonymous: "ขอโทษแต่คุณต้องเข้าสู่ระบบเพื่อแก้ไขโพสนี้"
-        delete: "ลบโพสนี้"
-        undelete: "เลือกลบโพสนี้"
-        more: "อื่น"
+        edit_anonymous: "ขออภัย คุณต้องเข้าสู่ระบบเพื่อแก้ไขโพสต์นี้"
+        delete: "ลบโพสต์นี้"
+        undelete: "เลิกลบโพสต์นี้"
+        more: "อื่นๆ"
         delete_replies:
-          just_the_post: "ไม่, แค่โพสนี้พอ"
+          just_the_post: "ไม่ แค่โพสต์นี้เท่านั้น"
         unhide: "เลิกซ่อน"
-        delete_topic: "ลบหัวข้อ"
+        delete_topic: "ลบกระทู้"
       actions:
         flag: "ธง"
         undo:
-          bookmark: "ย้อนคืนการบุ๊คมาร์ค"
+          bookmark: "เลิกบุ๊กมาร์ก"
         by_you:
-          bookmark: "บุ๊คมาร์คโพสนี้"
+          bookmark: "คุณได้บุ๊กมาร์กโพสต์นี้แล้ว"
       bookmarks:
-        created: "สร้างเมื่อ"
+        created: "สร้าง"
         name: "ชื่อ"
     category:
       edit: "แก้ไข"
       settings: "การตั้งค่า"
-      tags: "ป้าย"
+      tags: "แท็ก"
       delete: "ลบหมวดหมู่"
       description: "รายละเอียด"
-      delete_confirm: "คุณแน่ใจหรือว่าจะลบหมวดหมู่นี้ออก?"
+      delete_confirm: "คุณแน่ใจหรือว่าจะลบหมวดหมู่นี้ออก"
       security: "ความปลอดภัย"
       email_in_allow_strangers: "ยอมรับอีเมลจากผู้ใช้ที่ไม่ระบุชื่อและไม่มีบัญชี"
       review_group_name: "ชื่อกลุ่ม"
@@ -1299,53 +1727,55 @@ th:
         watching:
           title: "กำลังดู"
         watching_first_post:
-          title: "ดูโพสต์แรก"
+          title: "กำลังดูโพสต์แรก"
         tracking:
-          title: "ติดตาม"
+          title: "กำลังติดตาม"
         regular:
           title: "ปกติ"
-          description: "คุณจะได้รับการแจ้งเตือนเมื่อใครก็ตามเอ่ยชื่อของคุณ @name หรือตอบคุณ"
+          description: "คุณจะได้รับการแจ้งเตือนเมื่อมีคนกล่าวถึงชื่อของคุณ @name หรือตอบคุณ"
         muted:
           title: "ปิด"
       search_priority:
         options:
           normal: "ปกติ"
+          ignore: "ไม่สนใจ"
+          high: "สูง"
       sort_options:
         likes: "ถูกใจ"
         views: "ดู"
-        posts: "โพส"
+        posts: "โพสต์"
         activity: "กิจกรรม"
         category: "หมวดหมู่"
-        created: "สร้างเมื่อ"
+        created: "สร้าง"
       settings_sections:
         email: "อีเมล"
     flagging:
       notify_action: "ข้อความส่วนตัว"
       delete_spammer: "ลบสแปมเมอร์"
-      yes_delete_spammer: "ใช่ ลบสแปมเมอร์ออก"
+      yes_delete_spammer: "ใช่ ลบสแปมเมอร์"
     flagging_topic:
       notify_action: "ข้อความส่วนตัว"
     topic_map:
-      title: "ภาครวมหัวข้อ"
+      title: "สรุปกระทู้"
     topic_statuses:
       warning:
         help: "นี่คือคำเตือนอย่างเป็นทางการ"
       bookmarked:
-        help: "คุณได้บุ๊คมาร์คหัวข้อนี้แล้ว"
+        help: "คุณได้บุ๊กมาร์กกระทู้นี้แล้ว"
       archived:
         help: "หัวข้อนี้ถูกจัดเก้บแล้ว; นั่นหมายความว่ามันถูกแช่แข็งและไม่สามารถเปลี่ยนแปลงได้"
       locked_and_archived:
         help: "หัวข้อนี้ถูกปิดและถูกจัดเก็บแล้ว; นั่นหมายความว่ามันไม่รับข้อความใหม่และไม่สามารถเปลี่ยนแปลงได้"
-    posts: "โพส"
-    original_post: "โพสต้นฉบับ"
+    posts: "โพสต์"
+    original_post: "โพสต์ต้นฉบับ"
     views: "ดู"
     views_lowercase:
       other: "ดู"
     replies: "ตอบ"
     activity: "กิจกรรม"
-    likes: "ชอบ"
+    likes: "ถูกใจ"
     likes_lowercase:
-      other: "ชอบ"
+      other: "ถูกใจ"
     users: "ผู้ใช้"
     users_lowercase:
       other: "ผู้ใช้"
@@ -1354,28 +1784,28 @@ th:
     changed_by: "โดย %{author}"
     raw_email:
       not_available: "ไม่พร้อม!"
-    categories_list: "รายการหมวดหมู่"
+    categories_list: "รายชื่อหมวดหมู่"
     filters:
-      with_topics: "%{filter} หัวข้อ"
-      with_category: "%{filter} %{category} หัวข้อ"
+      with_topics: "%{filter} กระทู้"
+      with_category: "%{filter} %{category} กระทู้"
       latest:
         title: "ล่าสุด"
         title_with_count:
           other: "ล่าสุด (%{count})"
-        help: "หัวข้อพร้อมโพสล่าสุด"
+        help: "กระทู้พร้อมโพสต์ล่าสุด"
       read:
         title: "อ่าน"
       categories:
         title: "หมวดหมู่"
         title_in: "หมวดหมู่ - %{categoryName}"
-        help: "ทุกหัวข้อจัดกลุ่มโดยหมวดหมู่"
+        help: "ทุกกระทู้ถูกจัดกลุ่มโดยหมวดหมู่"
       unread:
         title: "ยังไม่อ่าน"
         title_with_count:
-          other: "ยังไม่ได้อ่าน (%{count})"
-        help: "หัวข้อที่คุณกำลังจับตาหรือติดตามพร้อมโพสที่ยังไม่อ่าน"
+          other: "ยังไม่อ่าน (%{count})"
+        help: "กระทู้ที่คุณกำลังดูหรือติดตามพร้อมโพสต์ที่ยังไม่อ่าน"
         lower_title_with_count:
-          other: "%{count} ไม่ได้อ่าน"
+          other: "%{count} ยังไม่อ่าน"
       new:
         lower_title_with_count:
           other: "%{count} ใหม่"
@@ -1383,47 +1813,47 @@ th:
         title: "ใหม่"
         title_with_count:
           other: "ใหม่ (%{count})"
-        help: "หัวข้อที่ถูกสร้างในช่วงไม่กี่วัน"
+        help: "กระทู้ที่ถูกสร้างในช่วงไม่กี่วันที่ผ่านมา"
       posted:
-        title: "โพสของฉัน"
-        help: "หัวข้อที่คุณโพส"
+        title: "โพสต์ของฉัน"
+        help: "กระทู้ที่คุณได้โพสต์"
       bookmarks:
-        title: "บุ๊คมาร์ค"
-        help: "หัวข้อของคุณได้รับการบุ๊คมาร์ค"
+        title: "บุ๊กมาร์ก"
+        help: "กระทู้ที่คุณได้บุ๊กมาร์ก"
       category:
         title: "%{categoryName}"
         title_with_count:
           other: "%{categoryName} (%{count})"
-        help: "หัวข้อล่าสุดในหมวดหมู่ %{categoryName}"
+        help: "กระทู้ล่าสุดในหมวดหมู่ %{categoryName}"
       top:
         title: "บน"
-        help: "หัวข้อที่มีการเลือกไหวมากที่สุดในปี เดือน อาทิตย์ หรือวันที่ผ่านมา"
+        help: "กระทู้ที่มีการเคลื่อนไหวมากที่สุดในปี เดือน สัปดาห์ หรือวันที่ผ่านมา"
         all:
           title: "ตลอดเวลา"
         yearly:
-          title: "ปี"
+          title: "รายปี"
         quarterly:
-          title: "สามเดือน"
+          title: "รายไตรมาส"
         monthly:
-          title: "เดือน"
+          title: "รายเดือน"
         weekly:
-          title: "อาทิตย์"
+          title: "รายสัปดาห์"
         daily:
-          title: "วัน"
+          title: "รายวัน"
         all_time: "ตลอดเวลา"
         this_year: "ปี"
-        this_quarter: "สามเดือน"
+        this_quarter: "ไตรมาส"
         this_month: "เดือน"
-        this_week: "อาทิตย์"
+        this_week: "สัปดาห์"
         today: "วันนี้"
     permission_types:
       full: "สร้าง / ตอบ / ดู"
       create_post: "ตอบ / ดู"
       readonly: "ดู"
     lightbox:
-      download: "ดาวโหลด"
+      download: "ดาวน์โหลด"
     keyboard_shortcuts_help:
-      title: "ปุ่มลัดของคียบอร์ด"
+      title: "ปุ่มลัดของคีย์บอร์ด"
       jump_to:
         title: "ข้ามไปยัง"
         home: "%{shortcut} หน้าแรก"
@@ -1432,22 +1862,22 @@ th:
         unread: "%{shortcut} ยังไม่อ่าน"
         categories: "%{shortcut} หมวดหมู่"
         top: "%{shortcut} บน"
-        bookmarks: "%{shortcut} บุ๊คมาร์ค"
-        profile: "%{shortcut} ข้อมูลส่วนตัว"
+        bookmarks: "%{shortcut} บุ๊กมาร์ก"
+        profile: "%{shortcut} โปรไฟล์"
         messages: "%{shortcut} ข้อความ"
       navigation:
         title: "การนำทาง"
-        jump: "%{shortcut} ไปยังโพส #"
+        jump: "%{shortcut} ไปยังโพสต์ #"
         back: "%{shortcut} กลับ"
         up_down: "%{shortcut} ย้ายส่วน &uarr; &darr;"
-        open: "%{shortcut} เปิดหัวข้อที่เลือก"
-        next_prev: "%{shortcut} หัวหมู่ ถัดไป/ก่อนหน้า"
+        open: "%{shortcut} เปิดกระทู้ที่เลือก"
+        next_prev: "%{shortcut} หมวดถัดไป/ก่อนหน้า"
       application:
-        title: "แอพพิเคชั่น"
-        create: "%{shortcut} สร้างหัวข้อใหม่"
+        title: "แอปพลิเคชัน"
+        create: "%{shortcut} สร้างกระทู้ใหม่"
         notifications: "%{shortcut} เปิดการแจ้งเตือน"
         user_profile_menu: "%{shortcut} เปิดเมนูผู้ใช้"
-        show_incoming_updated_topics: "%{shortcut} แสดงหัวข้ออัพเดตล่าสุด"
+        show_incoming_updated_topics: "%{shortcut} แสดงกระทู้ที่อัปเดต"
         help: "%{shortcut} เปิดความช่วยเหลือของแป้นพิมพ์"
         dismiss_new_posts: "%{shortcut} ยกเลิกการโพสใหม่"
         dismiss_topics: "%{shortcut} ยกเลิกหัวข้อ"
@@ -1455,28 +1885,28 @@ th:
       actions:
         title: "การกระทำ"
         bookmark_topic: "%{shortcut} บุ๊คมาร์คหัวข้อ"
-        pin_unpin_topic: "%{shortcut} ปักหรือเลิกปักหัวข้อ"
-        share_topic: "%{shortcut} แบ่งปันหัวข้อ"
-        share_post: "%{shortcut} แบ่งบันหัวข้อ"
+        pin_unpin_topic: "%{shortcut} ปักหมุด/เลิกปักหมุดกระทู้"
+        share_topic: "%{shortcut} แบ่งปันกระทู้"
+        share_post: "%{shortcut} แบ่งปันโพสต์"
         reply_as_new_topic: "%{shortcut} ตอบแบบหัวข้อที่ลิงค์ไว้"
-        reply_topic: "%{shortcut} ตอบไปยังหัวข้อ"
-        reply_post: "%{shortcut} ตอบไปยังโพส"
-        quote_post: "%{shortcut} อ้างถึงโพส"
-        like: "%{shortcut} ชอบโพส"
-        flag: "%{shortcut} ปักธงโพส"
-        bookmark: "%{shortcut} บุ๊คมาร์คโพส"
-        edit: "%{shortcut} แก้ไขโพส"
-        delete: "%{shortcut} ลบโพส"
-        mark_muted: "%{shortcut} ปิดการแจ้งเตือนโพส"
+        reply_topic: "%{shortcut} ตอบไปยังกระทู้"
+        reply_post: "%{shortcut} ตอบไปยังโพสต์"
+        quote_post: "%{shortcut} อ้างถึงโพสต์"
+        like: "%{shortcut} ถูกใจโพสต์"
+        flag: "%{shortcut} ปักธงโพสต์"
+        bookmark: "%{shortcut} บุ๊กมาร์กโพสต์"
+        edit: "%{shortcut} แก้ไขโพสต์"
+        delete: "%{shortcut} ลบโพสต์"
+        mark_muted: "%{shortcut} ปิดการแจ้งเตือนกระทู้"
         mark_regular: "%{shortcut} หัวข้อ ทั่วไป (มาตราฐาน)"
-        mark_tracking: "%{shortcut} ติดตามหัวข้อ"
-        mark_watching: "%{shortcut} เฝ้าดูหัวข้อ"
+        mark_tracking: "%{shortcut} ติดตามกระทู้"
+        mark_watching: "%{shortcut} ดูกระทู้"
     badges:
       granted_on: "ได้รับเมื่อ %{date}"
       none: "(ไม่มี)"
       badge_grouping:
         getting_started:
-          name: เริ่มต้น
+          name: กำลังเริ่มต้น
         community:
           name: ชุมชน
         trust_level:
@@ -1484,12 +1914,12 @@ th:
         other:
           name: อื่นๆ
         posting:
-          name: โพส
+          name: โพสต์
     tagging:
       all_tags: "แท็กทั้งหมด"
       selector_all_tags: "แท็กทั้งหมด"
       changed: "เปลี่ยนแท็ก:"
-      tags: "ป้าย"
+      tags: "แท็ก"
       add_synonyms: "เพิ่ม"
       delete_tag: "ลบแท็ก"
       rename_tag: "เปลี่ยนชื่อแท็ก"
@@ -1499,15 +1929,15 @@ th:
       sort_by_name: "ชื่อ"
       cancel_delete_unused: "ยกเลิก"
       filters:
-        without_category: "%{filter} %{tag} หัวข้อ"
-        with_category: "%{filter} %{tag} หัวข้อใน %{category}"
+        without_category: "%{filter} %{tag} กระทู้"
+        with_category: "%{filter} %{tag} กระทู้ใน %{category}"
       notifications:
         watching:
           title: "กำลังดู"
         watching_first_post:
-          title: "ดูโพสต์แรก"
+          title: "กำลังดูโพสต์แรก"
         tracking:
-          title: "ติดตาม"
+          title: "กำลังติดตาม"
         regular:
           title: "ทั่วไป"
         muted:
@@ -1519,19 +1949,19 @@ th:
         none:
           unread: "คุณไม่มีกระทู้ที่ยังไม่ได้อ่าน"
           new: "คุณไม่มีกระทู้ใหม่"
-          read: "คุณยังไม่ได้อ่านกระทู้เลย"
-          posted: "คุณยังไม่ได้โพสในกระทู้ใดๆ"
-          latest: "ไม่มีหัวข้อล่าสุดแล้ว"
-          bookmarks: "คุณยังไม่ได้บุ๊คมาร์คกระทู้ใดๆเลย"
-          top: "ไม่มีหัวข้อสูงสุดแล้ว"
-        bottom:
+          read: "คุณยังไม่ได้อ่านกระทู้ใดๆเลย"
+          posted: "คุณยังไม่ได้โพสต์ในกระทู้ใดๆเลย"
           latest: "ไม่มีกระทู้ล่าสุด"
-          posted: "ไม่มีหัวข้อที่โพสแล้ว"
-          read: "ไม่มีหัวข้อที่อ่านแล้ว"
-          new: "ไม่มีกระทู้ใหม่"
-          unread: "ไม่มีหัวข้อที่ยังไม่อ่านแล้ว"
-          top: "ไม่มีหัวข้อสูงสุดแล้ว"
-          bookmarks: "ไม่มีบุ๊คมาร์คในหัวข้อใดอีกแล้ว"
+          bookmarks: "คุณยังไม่ได้บุ๊กมาร์กกระทู้ใดๆเลย"
+          top: "ไม่มีกระทู้ยอดนิยม"
+        bottom:
+          latest: "ไม่มีกระทู้ล่าสุดอีกแล้ว"
+          posted: "ไม่มีกระทู้ที่โพสต์อีกแล้ว"
+          read: "ไม่มีกระทู้ที่อ่านแล้วอีก"
+          new: "ไม่มีกระทู้ใหม่อีกแล้ว"
+          unread: "ไม่มีกระทู้ที่ยังไม่อ่านอีกแล้ว"
+          top: "ไม่มีกระทู้ยอดนิยมอีกแล้ว"
+          bookmarks: "ไม่มีกระทู้ที่บุ๊กมาร์กอีกแล้ว"
     footer_nav:
       back: "กลับ"
       share: "แบ่งปัน"
@@ -1547,28 +1977,31 @@ th:
           never: "ไม่เลย"
       dashboard:
         title: "แดชบอร์ด"
-        version: "เวอร์ชั่น"
+        version: "เวอร์ชัน"
         up_to_date: "คุณเป็นเวอร์ชั่นล่าสุด!"
         critical_available: "การอัพเดตที่สำคัญมีให้อัพเดต"
-        updates_available: "มีการอัพเดต"
-        please_upgrade: "โปรดอัพเดต!"
+        updates_available: "มีการอัปเดต"
+        please_upgrade: "กรุณาอัปเกรด!"
         installed_version: "ติดตั้งแล้ว"
         latest_version: "ล่าสุด"
         last_checked: "ตรวจล่าสุด"
         refresh_problems: "รีเฟรช"
         no_problems: "ไม่พบปัญหา"
         moderators: "ผู้ดูแล:"
-        admins: "ผู้ดูแลระบบ:"
-        suspended: "ถูกปิด:"
+        admins: "แอดมิน:"
+        suspended: "ถูกระงับชั่วคราว:"
         private_messages_short: "ข้อความ"
         private_messages_title: "ข้อความ"
         mobile_title: "โทรศัพท์"
         backups: "สำรองข้อมูล"
         traffic_short: "การจราจร"
         security_tab: "ความปลอดภัย"
+        report_filter_any: "ใดๆ"
         reports:
           today: "วันนี้"
           yesterday: "เมื่อวาน"
+          last_7_days: "7 วันที่ผ่านมา"
+          last_30_days: "30 วันที่ผ่านมา"
           all_time: "ตลอดเวลา"
           7_days_ago: "7 วันที่แล้ว"
           30_days_ago: "30 วันที่แล้ว"
@@ -1583,7 +2016,7 @@ th:
             category:
               label: หมวดหมู่
       commits:
-        latest_changes: "การเปลี่ยนแปลงล่าสุด: โปรดอัพเดตบ่อยๆ"
+        latest_changes: "การเปลี่ยนแปลงล่าสุด: กรุณาอัปเดตบ่อยๆ"
         by: "โดย"
       groups:
         manage:
@@ -1592,35 +2025,38 @@ th:
             incoming_email: "ตั้งที่อยู่สำหรับอีเมลขาเข้า"
             incoming_email_placeholder: "ใส่อีเมล"
             visibility_levels:
-              title: "ใครสามารถเห็นกลุ่มนี้?"
+              title: "ใครสามารถเห็นกลุ่มนี้"
               public: "ทุกคน"
-              staff: "เจ้าของกลุ่ม และผู้ดูแล"
+              staff: "เจ้าของกลุ่มและทีมงาน"
           membership:
+            automatic: อัตโนมัติ
             trust_levels_title: "ระดับความไว้ใจจะถูกให้ไปยังผู้ใช้โดยอัตโนมัติเมื่อพวกเขาเพิ่ม:"
             trust_levels_none: "ไม่มี"
-        name_placeholder: "ชื่อกลุ่ม, ไม่มีเว้นวรรค, ใช้กฎเดียวกับชื่อผู้ใช้"
+        name_placeholder: "ชื่อกลุ่ม ไม่มีเว้นวรรค ใช้กฎเดียวกับชื่อผู้ใช้"
         primary: "กลุ่มหลัก"
         no_primary: "(ไม่มีกลุ่มหลัก)"
         title: "กลุ่ม"
-        edit: "แก้กลุ่ม"
-        refresh: "รีโหลด"
+        edit: "แก้ไขกลุ่ม"
+        refresh: "รีเฟรช"
         about: "แก้ไขสมาชิกและชื่อกลุ่มของคุณได้ที่นี่"
-        group_members: "ชื่อสมาชิก"
+        group_members: "สมาชิกกลุ่ม"
         delete: "ลบ"
-        delete_confirm: "ลบกลุ่มนี้?"
-        delete_failed: "ไม่สามารถลงกลุ่มได้ ถ้ากลุ่มนี้เป็นกลุ่มอัตโนมัติมันจะไม่สามารถถูกทำลายได้"
+        delete_confirm: "ลบกลุ่มนี้"
+        delete_failed: "ไม่สามารถลบกลุ่มได้ ถ้ากลุ่มนี้เป็นกลุ่มอัตโนมัติ จะไม่สามารถทำให้หายไปได้"
         delete_owner_confirm: "ลบสิทธิ์การเป็นเจ้าของ ของ '%{username}'?"
         add: "เพิ่ม"
+        automatic: "อัตโนมัติ"
         group_owners: เจ้าของ
         add_owners: เพิ่มเจ้าของ
       api:
         user: "ผู้ใช้"
         title: "API"
-        created: สร้างเมื่อ
+        created: สร้าง
         revoke: "เอาออก"
         show_details: รายละเอียด
         description: รายละเอียด
         save: บันทึก
+        continue: ดำเนินการต่อ
       web_hooks:
         save: "บันทึก"
         destroy: "ลบ"
@@ -1630,15 +2066,15 @@ th:
           failed: "ล้มเหลว"
         events:
           request: "ร้องขอ"
-          timestamp: "สร้างเมื่อ"
+          timestamp: "สร้าง"
           actions: "การกระทำ"
       plugins:
         title: "ปลั้กอิน"
         installed: "ปลั้กอินที่ติดตั้งแล้ว"
         name: "ชื่อ"
         none_installed: "คุณยังไม่มีปลั้กอินใดๆติดตั้ง"
-        version: "เวอร์ชั่น"
-        enabled: "เปิดใช้?"
+        version: "เวอร์ชัน"
+        enabled: "เปิดใช้"
         is_enabled: "Y"
         not_enabled: "N"
         change_settings_short: "การตั้งค่า"
@@ -1671,6 +2107,7 @@ th:
           revert: "ย้อนกลับการแก้ไข"
           revert_confirm: "คุณแน่ใจหรือว่าจะย้อนกลับการแก้ไข"
         theme:
+          theme: "ธีม"
           create_type: "ชนิด"
           create_name: "ชื่อ"
           edit: "แก้ไข"
@@ -1692,6 +2129,9 @@ th:
             text: "Embedded CSS"
           head_tag:
             text: "</head>"
+        colors:
+          primary:
+            name: "หลัก"
         email_style:
           css: "CSS"
       email:
@@ -1699,9 +2139,10 @@ th:
         settings: "การตั้งค่า"
         sent: "ส่ง"
         received: "รับ"
+        rejected: "ปฏิเสธ"
         time: "เวลา"
         user: "ผู้ใช้"
-        refresh: "รีโหลด"
+        refresh: "รีเฟรช"
         incoming_emails:
           from_address: "จาก"
           to_addresses: "ถึง"
@@ -1714,18 +2155,18 @@ th:
             from_placeholder: "from@example.com"
             to_placeholder: "to@example.com"
             cc_placeholder: "cc@example.com"
-            subject_placeholder: "เรื่อง"
+            subject_placeholder: "หัวข้อ..."
             error_placeholder: "ผิดพลาด"
         logs:
           filters:
             user_placeholder: "ผู้ใช้"
             address_placeholder: "name@example.com"
       logs:
-        created_at: "สร้างเมื่อ"
+        created_at: "สร้าง"
         ip_address: "ไอพี"
-        topic_id: "หมายเลขหัวข้อ"
-        post_id: "หมายเลยโพสต์"
-        category_id: "เลขที่หมวดหมู่"
+        topic_id: "หมายเลขกระทู้"
+        post_id: "หมายเลขโพสต์"
+        category_id: "หมายเลขหมวดหมู่"
         delete: "ลบ"
         edit: "แก้ไข"
         save: "บันทึก"
@@ -1743,8 +2184,8 @@ th:
           actions:
             delete_user: "ลบผู้ใช้"
             change_trust_level: "เปลี่ยนระดับความไว้ใจ"
-            delete_topic: "ลบหัวข้อ"
-            delete_post: "ลบโพส"
+            delete_topic: "ลบกระทู้"
+            delete_post: "ลบโพสต์"
             delete_category: "ลบหมวดหมู่"
         screened_urls:
           url: "URL"
@@ -1782,31 +2223,32 @@ th:
           regular: "ผู้ใช้ที่ระดับความไว้ใจ 3 (ทั่วไป)"
           leader: "ผู้ใช้ที่ระดับความไว้ใจ 4 (ผู้นำ)"
           staff: "ทีมงาน"
+          moderators: "ผู้ดูแล"
           suspended: "ผู้ใช้งานที่ถูกระงับ"
         not_verified: "ยังไม่ได้รับการตรวจสอบ"
         check_email:
-          title: "แสดงอีเมลผู้ใช้งาน"
+          title: "แสดงอีเมลของผู้ใช้งานนี้"
           text: "แสดง"
       user:
-        suspend_failed: "มีข้อผิดพลาดในการระงับการใช้งาน %{error}"
-        unsuspend_failed: "มีข้อผิดพลาดในเปิดการใช้งาน %{error}"
-        suspend_duration: "ระงับการใช้งานถึงเมื่อไร"
+        suspend_failed: "มีข้อผิดพลาดในการระงับผู้ใช้งานนี้ %{error}"
+        unsuspend_failed: "มีข้อผิดพลาดในเปิดผู้ใช้งานนี้ %{error}"
+        suspend_duration: "ผู้ใช้งานนี้จะถูกระงับถึงเมื่อไร"
         suspend_reason: "เหตุผล"
         suspended_by: "ระงับการใช้งานโดย"
         silence_reason: "เหตุผล"
-        delete_all_posts: "ลบโพสทั้งหมด"
+        delete_all_posts: "ลบโพสต์ทั้งหมด"
         suspended: "ระงับการใช้งานหรือไม่"
-        show_admin_profile: "ผู้ดูแลระบบ"
+        show_admin_profile: "แอดมิน"
         ip_lookup: "ค้นหา IP"
         log_out: "ออกจากระบบ"
         unsuspend: "เปิดการใช้งาน"
         suspend: "ระงับการใช้งาน"
         activity: กิจกรรม
         last_100_days: "ใน 100 วันที่ผ่านมา"
-        private_topics_count: หัวข้อส่วนตัว
-        posts_read_count: อ่านโพส
-        post_count: โพสถูกสร้างแล้ว
-        topics_entered: หัวข้อที่ได้ดูแล้ว
+        private_topics_count: กระทู้ส่วนตัว
+        posts_read_count: โพสต์ที่อ่าน
+        post_count: โพสต์ที่สร้าง
+        topics_entered: กระทู้ที่ดู
         approve: "อนุมัติ"
         approved_by: "อนุมัติโดย"
         time_read: "เวลาอ่าน"
@@ -1817,8 +2259,8 @@ th:
             cancel: "ยกเลิก"
           confirmation:
             cancel: "ยกเลิก"
-        delete_forbidden_because_staff: "ผู้ดูแลระบบและผู้ดูแลไม่สามารถถูกลบได้"
-        delete_posts_forbidden_because_staff: "ไม่สามารถลบโพสทั้งหมดของผู้ดูแลระบบและผู้ดูแลได้"
+        delete_forbidden_because_staff: "ไม่สามารถลบแอดมินและผู้ดูแลระบบได้"
+        delete_posts_forbidden_because_staff: "ไม่สามารถลบโพสต์ทั้งหมดของแอดมินและผู้ดูแลระบบได้"
         delete_and_block: "ลบและ <b>บล็อก</b> อีเมลและไอพีนี้"
         delete_dont_block: "ลบเท่านั้น"
         deleted: "ผู้ใช้ถูกลบแล้ว"
@@ -1836,7 +2278,7 @@ th:
           visits: "เยี่ยมชม"
           days: "วัน"
           topics_viewed: "กระทู้ที่ดู"
-          posts_read: "อ่านโพส"
+          posts_read: "โพสต์ที่อ่าน"
           likes_given: "ได้ชอบ"
           likes_received: "ได้รับการชอบ"
           qualifies: "คุณสมบัติเพียงพอสำหรับระดับความไว้ใจที่ 3"
@@ -1848,7 +2290,7 @@ th:
           external_username: "ชื่อผู้ใช้"
           external_name: "ชื่อ"
           external_email: "อีเมล"
-          external_avatar_url: "ที่อยู่ภาพประจำตัว"
+          external_avatar_url: "URL ของรูปโปรไฟล์"
       user_fields:
         title: "ช่องข้อมูลผู้ใช้"
         help: "เพิ่มช่องที่คุณสามารถใส่ข้อมูลเพิ่มได้"
@@ -1868,7 +2310,7 @@ th:
           enabled: "ต้องการ"
           disabled: "ไม่ต้องการ"
         editable:
-          title: "แก้ไขได้หลังลงทะเบียน?"
+          title: "แก้ไขหลังลงทะเบียนได้ใช่ไหม"
           enabled: "แก้ไขได้"
           disabled: "แก้ไขไม่ได้"
         show_on_profile:
@@ -1908,7 +2350,7 @@ th:
           required: "ต้องการ"
           basic: "การตั้งค่าพื้นฐาน"
           users: "ผู้ใช้"
-          posting: "โพส"
+          posting: "กำลังโพสต์"
           email: "อีเมล"
           files: "ไฟล์"
           trust: "ระดับความไว้ใจ"
@@ -1951,7 +2393,7 @@ th:
           trust_level_change: "เมื่อผู้ใช้เปลี่ยนระดับความไว้ใจ"
         preview:
           bad_count_warning:
-            header: "อันตราย!"
+            header: "ระวัง!"
           sample: "ตัวอย่าง:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -1959,30 +2401,30 @@ th:
             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>"
       emoji:
-        title: "Emoji"
-        add: "เพิ่ม Emoji ใหม่"
+        title: "อีโมจิ"
+        add: "เพิ่มอีโมจิใหม่"
         uploading: "กำลังอัปโหลด..."
         name: "ชื่อ"
         group: "กลุ่ม"
         image: "ภาพ"
-        delete_confirm: "คุณแน่ใจหรือว่าจะลบ Emoji :%{name}: ออก?"
+        delete_confirm: "คุณแน่ใจหรือว่าจะลบอีโมจิ :%{name}: ออก"
       embedding:
         confirm_delete: "คุณแน่ใจหรือว่าจะลบโพสนั้น?"
         title: "ฝั่ง"
         host: "อนุญาตโฮส"
         edit: "แก้ไข"
-        category: "โพสไปยังหมวดหมู่"
+        category: "โพสต์ไปยังหมวดหมู่"
         add_host: "เพิ่มโฮส"
         settings: "การตั้งการการฝั่ง"
         save: "บันทึกการตั้งค่าการฝั่ง"
       permalink:
         title: "ลิงค์ถาวร"
         url: "URL"
-        topic_id: "เลขที่หัวข้อ"
-        topic_title: "หัวข้อ"
-        post_id: "เลขที่โพส"
-        post_title: "โพส"
-        category_id: "เลขที่หมวดหมู่"
+        topic_id: "หมายเลขกระทู้"
+        topic_title: "กระทู้"
+        post_id: "หมายเลขโพสต์"
+        post_title: "โพสต์"
+        category_id: "หมายเลขหมวดหมู่"
         category_title: "หมวดหมู่"
         external_url: "ลิงก์ภายนอก"
         delete_confirm: "คุณแน่ใจหรือว่าจะลบลิงค์ถาวรนี้?"
@@ -1993,17 +2435,18 @@ th:
       reseed:
         modal:
           categories: "หมวดหมู่"
-          topics: "หัวข้อ"
+          topics: "กระทู้"
   wizard_js:
     wizard:
       done: "เสร็จ"
       back: "กลับ"
       upload: "อัปโหลด"
       uploading: "กำลังอัปโหลด..."
-      upload_error: "ขอโทษ, เกิดความผิดพลาดขณะกำลังอัพโหลดไฟล์ โปรดลองใหม่อีกครั้ง"
+      upload_error: "ขออภัย เกิดความผิดพลาดขณะกำลังอัปโหลดไฟล์ กรุณาลองใหม่อีกครั้ง"
       invites:
+        add_user: "เพิ่ม"
         roles:
-          admin: "ผู้ดูแลระบบ"
+          admin: "แอดมิน"
           moderator: "ผู้ดูแล"
       previews:
         share_button: "แบ่งปัน"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 4b53d9f084..5467a45b7e 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -951,6 +951,8 @@ tr_TR:
         confirm: "\"Kullanıcı Adı\"nı değiştirmek istediğine emin misin?"
         taken: "Üzgünüz, bu kullanıcı adı daha önce alınmış. "
         invalid: "Bu kullanıcı adı geçersiz. Kullanıcı adı, sadece sayı ve harf içerebilir. "
+      add_email:
+        add: "ekle"
       change_email:
         title: "\"E-posta Adresi\"ni Değiştir"
         taken: "Üzgünüz, bu e-posta kullanılabilir değil."
@@ -977,8 +979,9 @@ tr_TR:
         title: "E-posta"
         primary: "Öncelikli E-posta"
         secondary: "İkincil E-postalar"
-        no_secondary: "İkincil e-posta adresi mevcut değil"
-        sso_override_instructions: "E-posta SSO sağlayıcısından güncellenebilir."
+        primary_label: "Ana"
+        update_email: "\"E-posta Adresi\"ni Değiştir"
+        ssDestroy_override_instructions: "E-posta SSO sağlayıcısından güncellenebilir."
         instructions: "Hiç kimseye gösterilmedi."
         ok: "Onaylaman için sana e-posta göndereceğiz"
         invalid: "Lütfen geçerli bir e-posta adresi gir"
@@ -1257,10 +1260,10 @@ tr_TR:
       login_disabled: "Site salt-okunur modda iken giriş işlemi devre dışı bırakılır ."
       logout_disabled: "Site salt-okunur modda iken çıkış işlemi yapılamaz."
     logs_error_rate_notice:
-      reached_hour_MF: "<b>{relativeAge}</b>– <a href='{url}' target='_blank'>{rate, plural, one {# hata/saat} diğeri {# hata/saat}}</a> site limitlerine ulaştı {limit, plural, one {# hata/saat} other {# hata/saat}}."
-      reached_minute_MF: "<b>{relativeAge}</b>– <a href='{url}' target='_blank'>{rate, plural, one {# hata/saat}  {# hata/dakika}}</a> site limitlerine ulaştı {limit, plural, one {# hata/dakika} other {# hata/dakika}}."
-      exceeded_hour_MF: "<b>{relativeAge}</b>– <a href='{url}' target='_blank'>{rate, plural, one {# hata/saat} diğeri {# hata/saat}}</a> site ayarlanmış limitini aştı {limit, plural, one {# hata/saat} diğer{# hata/saat}}."
-      exceeded_minute_MF: "<b>{relativeAge}</b>– <a href='{url}' target='_blank'>{rate, plural, one {# hata/saat}  {# hata/dakika}}</a> site ayarlanmış limitlerini aştı {limit, plural, one {# hata/dakika} diğer {# hata/dakika}}."
+      reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# hata/saat} other {# hata/saat}}</a> site limitlerine ulaştı {limit, plural, one {# hata/saat} other {# hata/saat}}."
+      reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# hata/saat} other {# hata/dakika}}</a> site limitlerine ulaştı {limit, plural, one {# hata/dakika} other {# hata/dakika}}."
+      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# hata/saat} other {# hata/saat}}</a> site ayarlanmış limitini aştı {limit, plural, one {# hata/saat} other {# hata/saat}}."
+      exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# hata/saat} other {# hata/dakika}}</a> site ayarlanmış limitlerini aştı {limit, plural, one {# hata/dakika} other {# hata/dakika}}."
     learn_more: "daha fazlasını öğren..."
     all_time: "toplam"
     all_time_desc: "oluşturulan tüm konular "
@@ -3036,7 +3039,7 @@ tr_TR:
             more: '<a href="%{basePath}/admin/logs/search_logs">Arama Günlükleri</a>'
             disabled: 'Trend arama raporu devredışı. Veri toplamak için <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">log arama sorgusunu</a> etkinleştirin.'
           filters:
-            file-extension:
+            file_extension:
               label: Dosya uzantısı
             group:
               label: Grup
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index e3674bd593..08e4b2afeb 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -1034,6 +1034,8 @@ uk:
         confirm: "Ви цілковито впевнені, що бажаєте змінити своє ім'я користувача?"
         taken: "Даруйте, це ім'я користувача вже зайняте."
         invalid: "Таке ім'я користувача не підійде. Воно має містити лише цифри та літери"
+      add_email:
+        add: "додати"
       change_email:
         title: "Змінити адресу електронної пошти"
         taken: "Даруйте, ця адреса не доступна."
@@ -1060,8 +1062,9 @@ uk:
         title: "Електронна пошта"
         primary: "Основна електронна пошта"
         secondary: "Другорядна електронна пошта"
-        no_secondary: "Немає другорядних електронних скриньок"
-        sso_override_instructions: "Електронну пошту можна оновити через SSO-провайдера."
+        primary_label: "основний"
+        update_email: "Змінити адресу електронної пошти"
+        ssDestroy_override_instructions: "Електронну пошту можна оновити через SSO-провайдера."
         instructions: "Ніколи не показується публічно."
         ok: "Ми надішлемо Вам листа для підтвердження"
         invalid: "Будь ласка, введіть вірний email"
@@ -1359,11 +1362,6 @@ uk:
       enabled: "Сайт працює в режимі \"тільки для читання\". Зараз ви можете продовжувати переглядати сайт, але інші дії будуть недоступні. "
       login_disabled: "Вхід вимкнено, поки сайт перебуває в режимі лише для читання."
       logout_disabled: "Вихід відключений, поки сайт в режимі «тільки для читання»"
-    logs_error_rate_notice:
-      reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} або {# errors/hour}}</a> досягнуто максимально дозволене значення {limit, plural, one {# error/hour} або {# errors/hour}}."
-      reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} або {# errors/minute}}</a> досягнуто максимально дозволене значення {limit, plural, one {# error/minute} або {# errors/minute}}."
-      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} або {# errors/hour}}</a> досягнуто максимально дозволене значення {limit, plural, one {# error/hour} або {# errors/hour}}."
-      exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} або {# errors/minute}}</a> перевищено максимально дозволене значення {limit, plural, one {# error/minute} або {# errors/minute}}."
     learn_more: "дізнатися більше..."
     all_time: "всього"
     all_time_desc: "всього створено тем"
@@ -3285,7 +3283,7 @@ uk:
             more: '<a href="%{basePath}/admin/logs/search_logs">Пошукові логи</a>'
             disabled: 'Звіт про пошукові запити відключено. Включити <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">журнал пошукових запитів</a> для збору даних.'
           filters:
-            file-extension:
+            file_extension:
               label: Розширення файлу
             group:
               label: Група
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 55994f390e..80986b2321 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -925,6 +925,8 @@ ur:
         confirm: "کیا آپ کو بالکل یقین ہے کہ آپ اپنا صارف نام تبدیل کرنا چاہتے ہیں؟"
         taken: "معذرت، یِہ صارف نام پہلے سے لیا جاچکا ہے۔"
         invalid: "یہ صارف نام غلط ہے۔ اِس میں صرف ہندسوں اور حروف کو شامل کیا جا سکتا ہے"
+      add_email:
+        add: "شامل کریں"
       change_email:
         title: "اِی میل تبدیل کریں"
         taken: "معذرت، یہ اِی میل دستیاب نہیں ہے۔"
@@ -945,8 +947,9 @@ ur:
         title: "اِی میل"
         primary: "بنیادی ایمیل"
         secondary: "ثانوی ایمیلز"
-        no_secondary: "کوئی ثانوی ایمیلز نہیں"
-        sso_override_instructions: "SSO پرووَائیڈر سے ایمیل کو اَپ ڈیٹ کیا جا سکتا ہے۔"
+        primary_label: "بنیادی"
+        update_email: "اِی میل تبدیل کریں"
+        ssDestroy_override_instructions: "SSO پرووَائیڈر سے ایمیل کو اَپ ڈیٹ کیا جا سکتا ہے۔"
         instructions: "کبھی بھی عوام کو دکھایا نہیں گیا۔"
         ok: "ہم تصدیق کے لئے آپ کو اِی میل کریں گے"
         invalid: "براہ کرم، ایک قابلِ قبول ایِ میل ایڈریس درج کریں"
@@ -2930,7 +2933,7 @@ ur:
             more: '<a href="%{basePath}/admin/logs/search_logs">تلاشی کے لاگز</a>'
             disabled: 'سرچ رجحان کی رپورٹ غیر فعال ہے۔ اعداد و شمار جمع کرنے کیلئے <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">لاگ سرچ قُوَیریز</a> کو فعال کریں۔'
           filters:
-            file-extension:
+            file_extension:
               label: فائل ایکسٹینشن
             group:
               label: گروپ
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index b63f5eed4d..b91976dc04 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -881,7 +881,8 @@ vi:
         title: "Email"
         primary: "Email chính"
         secondary: "Email thứ hai"
-        no_secondary: "Không có email thứ hai"
+        primary_label: "chính"
+        update_email: "Thay đổi Email"
         instructions: "Không hiển thị công cộng"
         ok: "Chúng tôi sẽ gửi thư điện tử xác nhận đến cho bạn"
         invalid: "Vùi lòng nhập một thư điện tử hợp lệ"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index adf1102e5f..dbcc164c3a 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -836,7 +836,9 @@ zh_CN:
       admin_delete: "删除"
       users: "用户"
       muted_users: "静音"
+      muted_users_instructions: "封禁来自这些用户的所有通知和私信。"
       ignored_users: "忽视"
+      ignored_users_instructions: "封禁来自这些用户的所有帖子、通知和私信。"
       tracked_topics_link: "显示"
       automatically_unpin_topics: "当我完整阅读了主题时自动解除置顶。"
       apps: "应用"
@@ -954,6 +956,9 @@ zh_CN:
         confirm: "你确定要更改用户名吗？"
         taken: "抱歉，此用户名已经有人使用了。"
         invalid: "此用户名不合法，用户名只能包含字母和数字"
+      add_email:
+        title: "添加邮箱地址"
+        add: "添加"
       change_email:
         title: "更换邮箱"
         taken: "抱歉，此邮箱不可用。"
@@ -984,8 +989,16 @@ zh_CN:
         title: "邮箱"
         primary: "主邮箱"
         secondary: "次邮箱"
-        no_secondary: "没有次邮箱"
-        sso_override_instructions: "电子邮件地址可以通过SSO登录来更新。"
+        primary_label: "主要"
+        unconfirmed_label: "未确认"
+        resend_label: "重新发送确认邮件"
+        resending_label: "发送中..."
+        resent_label: "邮件已发送"
+        update_email: "更换邮箱"
+        set_primary: "设置为主邮箱"
+        destroy: "删除邮箱"
+        add_email: "添加次要邮箱"
+        ssDestroy_override_instructions: "电子邮件地址可以通过SSO登录来更新。"
         instructions: "绝不会被公开显示"
         ok: "将通过邮件验证确认"
         required: "请输入一个电子邮件地址"
@@ -1136,6 +1149,7 @@ zh_CN:
         expired: "邀请已过期。"
         rescind: "移除"
         rescinded: "邀请已删除"
+        rescind_all: "删除过期的邀请"
         rescinded_all: "所有过期邀请已删除！"
         rescind_all_confirm: "你确定你想要移除所有过期邀请么？"
         reinvite: "重新发送邀请"
@@ -1146,18 +1160,30 @@ zh_CN:
         time_read: "阅读时间"
         days_visited: "访问天数"
         account_age_days: "账户建立天数"
+        source: "被邀请通过"
         links_tab: "链接"
+        links_tab_with_count: "链接（%{count}）"
+        link_url: "链接"
         link_created_at: "创建日期"
+        link_redemption_stats: "兑换量"
         link_groups: 群组
+        link_expires_at: 过期
         create: "发送邀请"
+        copy_link: "复制链接"
         generate_link: "复制邀请链接"
         link_generated: "邀请链接生成成功！"
         valid_for: "邀请链接只对这个邮件地址有效：%{email}"
         single_user: "单个用户"
+        multiple_user: "多个用户"
         invite_link:
+          title: "邀请链接"
           success: "邀请链接生成成功！"
+          error: "生成邀请链接时出错"
+          max_redemptions_allowed_label: "多少人被允许通过这个链接注册？"
+          expires_at: "邀请链接多久失效？"
         bulk_invite:
           none: "你还没有邀请任何人。你可以单独邀请用户，也可以通过<a href='https://meta.discourse.org/t/send-bulk-invites/16468'>上传CSV文件</a>批量邀请。"
+          text: "批量邀请"
           success: "文件上传成功，当操作完成时将通过私信通知你。"
           error: "抱歉，文件必须是CSV格式。"
           confirmation_message: "你将通过电子邮件将邀请发送给在上传的文件中的每一个人。"
@@ -2552,6 +2578,9 @@ zh_CN:
         moderation: "审核"
         appearance: "主题"
         email: "邮箱"
+      list_filters:
+        all: "所有主题"
+        none: "无子分类"
     flagging:
       title: "感谢你帮助我们建设文明社区！"
       action: "标记帖子"
@@ -3043,13 +3072,13 @@ zh_CN:
             more: '<a href="%{basePath}/admin/logs/search_logs">搜索日志</a>'
             disabled: '趋势搜索报告已停用。启用<a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">记录搜索查询</a>以收集数据。'
           filters:
-            file-extension:
+            file_extension:
               label: 文件扩展名
             group:
               label: 群组
             category:
               label: 分类
-            include-subcategories:
+            include_subcategories:
               label: "包括子分类"
       commits:
         latest_changes: "最近的更新：请经常升级！"
@@ -3744,6 +3773,9 @@ zh_CN:
             override_upload_secure_status: "覆盖上传安全状态"
             page_published: "页面已出版"
             page_unpublished: "页面未出版"
+            add_email: "添加邮箱"
+            update_email: "更新邮箱"
+            destroy_email: "删除邮箱"
         screened_emails:
           title: "已屏蔽的邮件地址"
           description: "当有人试图用以下邮件地址注册时，将受到阻止或其它系统操作。"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index a93a1a3cc8..14dbd09b7a 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -836,6 +836,8 @@ zh_TW:
         confirm: "確定要修改你的使用者名稱嗎？"
         taken: "抱歉，此使用者名稱已經有人使用。"
         invalid: "此使用者名稱無效，只能使用數字與英文字母。"
+      add_email:
+        add: "添加"
       change_email:
         title: "修改電子郵件地址"
         taken: "抱歉，此電子郵件地址無效。"
@@ -856,8 +858,9 @@ zh_TW:
         title: "電子郵件"
         primary: "主要電子郵件"
         secondary: "次要電子郵件"
-        no_secondary: "無次要電子郵件"
-        sso_override_instructions: "單一登入服務提供者可更新電子郵件"
+        primary_label: "一級"
+        update_email: "修改電子郵件地址"
+        ssDestroy_override_instructions: "單一登入服務提供者可更新電子郵件"
         instructions: "不會公開顯示"
         ok: "我們將寄一封確認郵件給您。"
         invalid: "請輸入有效的電子郵件地址。"
@@ -2706,7 +2709,7 @@ zh_TW:
             more: '<a href="%{basePath}/admin/logs/search_logs"> 搜尋記錄檔 </a>'
             disabled: '搜尋趨勢已停用，啟用<a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">搜尋紀錄以</a>收集資料。'
           filters:
-            file-extension:
+            file_extension:
               label: 檔案副檔名
             group:
               label: 群組
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 8795267056..558132320d 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -1456,6 +1456,8 @@ ar:
       subject_template: "أكّد عنوان بريد الإلكتروني الجديد %{email_prefix}"
     confirm_old_email:
       subject_template: "أكّد عنوان بريد الإلكتروني الحالي %{email_prefix}"
+    confirm_old_email_add:
+      subject_template: "أكّد عنوان بريد الإلكتروني الحالي %{email_prefix}"
     notify_old_email:
       subject_template: "عنوان بريد الإلكتروني تم تغييرة %{email_prefix}"
     signup_after_approval:
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index 9973fdcc9c..f37d509b95 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -2020,6 +2020,8 @@ be:
     confirm_old_email:
       title: "Пацвердзіце стары адрас электроннай пошты"
       subject_template: "[%{email_prefix}] Пацвердзіце свой бягучы адрас электроннай пошты"
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Пацвердзіце свой бягучы адрас электроннай пошты"
     notify_old_email:
       title: "Апавяшчаць Стары e-mail"
       subject_template: "[%{email_prefix}] Ваш электронны адрас быў зменены"
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 27c7c796a9..50b178382e 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -717,7 +717,6 @@ ca:
     confirm: "Confirma"
     authorizing_new:
       title: "Confirmeu la vostra nova adreça electrònica"
-      description: "Confirmeu que voleu canviar la vostra nova adreça de correu electrònic a:"
     authorizing_old:
       title: "Canvieu la vostra adreça de correu electrònic"
       description: "Confirmeu el canvi d’adreça electrònica"
@@ -2740,6 +2739,8 @@ ca:
       title: "Confirmeu l'adreça de correu antiga"
       subject_template: "[%{email_prefix}] Confirmeu la vostra adreça de correu actual"
       text_body_template: "Abans de canviar la vostra adreça electrònica, necessitem que confirmeu que controleu\nel compte de correu electrònic actual. Després de completar aquest pas, us haurem de confirmar \nla nova adreça electrònica. \n\nConfirmeu la vostra adreça electrònica actual per a %{site_name} fent clic en l'enllaç següent:\n\n%{base_url}/u/confirm-old-email/%{email_token}\n"
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Confirmeu la vostra adreça de correu actual"
     notify_old_email:
       title: "Notifica l'adreça de correu antiga"
       subject_template: "[%{email_prefix}] La vostra adreça de correu ha canviat"
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 2f479f096f..dea86678e2 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -1514,6 +1514,8 @@ da:
       subject_template: "[%{email_prefix}] Bekræft din nye e-mail-adresse"
     confirm_old_email:
       subject_template: "[%{email_prefix}] Bekræft din nuværende e-mail-adresse"
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Bekræft din nuværende e-mail-adresse"
     notify_old_email:
       subject_template: "[%{email_prefix}] Din e-mail-adresse er ændret"
     signup_after_approval:
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 4b02ef0eac..ee4c2948be 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -712,7 +712,6 @@ de:
     confirm: "Bestätigen"
     authorizing_new:
       title: "Bestätige deine neue E-Mail"
-      description: "Bitte bestätige, dass deine E-Mail Adresse geändert wird auf:"
     authorizing_old:
       title: "Ändere deine E-Mail Adresse"
       description: "Bitte bestätige die Änderung deiner E-Mail Adresse"
@@ -3030,6 +3029,8 @@ de:
         Bestätige deine aktuelle E-Mail Adresse für %{site_name}, indem du auf den folgenden Link klickst:
 
         %{base_url}/u/confirm-old-email/%{email_token}
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Bestätige deine aktuelle E-Mail-Adresse"
     notify_old_email:
       title: "Benachrichtigung an alte E-Mail-Adresse"
       subject_template: "[%{email_prefix}] Deine E-Mail-Adresse wurde geändert"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 25b4562446..ef7114fa12 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -2066,6 +2066,8 @@ el:
     confirm_old_email:
       title: "Επιβεβαίωση παλιάς διεύθυνσης email"
       subject_template: "[%{email_prefix}] Επικυρώστε την νέα σας διεύθυνση email"
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Επικυρώστε την νέα σας διεύθυνση email"
     notify_old_email:
       title: "Ειδοποίηση παλιάς διεύθυνσης email"
       subject_template: "[%{email_prefix}] Η διεύθυνση email σας έχει αλλαχθεί"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 96d9d1fea8..7df8f1eb43 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -751,7 +751,6 @@ es:
     confirm: "Confirmar"
     authorizing_new:
       title: "Confirmar tu nuevo correo electrónico"
-      description: "Por favor, confirma que quisieras cambiar tu correo electrónico por el nuevo: "
     authorizing_old:
       title: "Cambiar tu dirección de correo electrónico"
       description: "Por favor, confirma el cambio de tu dirección de correo electrónico"
@@ -3231,6 +3230,8 @@ es:
         Confirma tu dirección de correo electrónico actual para %{site_name} haciendo clic en el siguiente enlace:
 
         %{base_url}/u/confirm-old-email/%{email_token}
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Confirma tu dirección actual de correo electrónico"
     notify_old_email:
       title: "Antiguo correo electrónico de notificaciones"
       subject_template: "[%{email_prefix}] Tu dirección de correo electrónico ha sido cambiada"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 636946370e..d53b594cc3 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -1889,6 +1889,8 @@ fa_IR:
     confirm_old_email:
       title: "تایید ایمیل قبلی"
       subject_template: "[%{email_prefix}] ایمیل فعلی خود را تایید کنید"
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] ایمیل فعلی خود را تایید کنید"
     notify_old_email:
       title: "اعلام ایمیل قبلی"
       subject_template: "[%{email_prefix}] ایمیل شما تغییر کرده است"
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 1a4326b984..9fed9fbcf1 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -750,7 +750,6 @@ fi:
     confirm: "Vahvista"
     authorizing_new:
       title: "Vahvista uusi sähköpostiosoite"
-      description: "Vahvista, että haluat vaihtaa uudeksi sähköpostiosoitteeksesi:"
     authorizing_old:
       title: "Vaihda sähköpostiosoitettasi"
       description: "Vahvista sähköpostiosoitteesi vaihdos"
@@ -3145,6 +3144,8 @@ fi:
         Vahvista nykyinen sähköpostiosoitteesi sivustolla %{site_name} klikkaamalla linkkiä:
 
         %{base_url}/u/confirm-old-email/%{email_token}
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Vahvista nykyinen sähköpostiosoitteesi"
     notify_old_email:
       title: "Ilmoita vanhaan sähköpostiosoitteeseen"
       subject_template: "[%{email_prefix}] Sähköpostiosoitteesi on vaihdettu"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 6484c1909b..c3307fe0dd 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -757,15 +757,18 @@ fr:
     confirmed: "Votre adresse courriel a été mise à jour."
     please_continue: "Continuer vers %{site_name}"
     error: "Il y a eu une erreur lors de la modification de votre adresse courriel. Votre adresse courriel est peut-être déjà utilisée ?"
+    doesnt_exist: "Cette adresse courriel n'est pas associée à votre compte."
     error_staged: "Une erreur est survenue lors de la modification de votre adresse courriel. Cette adresse est déjà utilisée par un utilisateur distant."
     already_done: "Désolé, ce lien de confirmation n'est plus valide. Votre adresse courriel a peut-être déjà été changée ?"
     confirm: "Confirmer"
     authorizing_new:
       title: "Confirmer votre nouvelle adresse courriel"
       description: "Veuillez confirmer que vous souhaitez changer votre adresse courriel à :"
+      description_add: "Veuillez confirmer que vous souhaitez ajouter une adresse courriel alternative :"
     authorizing_old:
       title: "Changer votre adresse courriel"
       description: "Veuillez confirmer votre changement d'adresse courriel"
+      description_add: "Veuillez confirmer que vous souhaitez ajouter une adresse courriel alternative :"
       old_email: "Adresse courriel précédente : %{email}"
       new_email: "Nouvelle adresse courriel : %{email}"
       almost_done_title: "Confirmer une nouvelle adresse courriel"
@@ -3208,7 +3211,15 @@ fr:
       text_body_template: |
         Avant de pouvoir modifier votre adresse courriel, nous avons besoin de confirmer que vous contrôlez bien ce compte de messagerie. Une fois cette étape terminée, nous vous demanderons de confirmer la nouvelle adresse courriel.
 
-        Confirmez votre adresse courriel actuelle pour %{site_name} en cliquant sur le lien suivant:
+        Confirmez votre adresse courriel actuelle pour %{site_name} en cliquant sur le lien suivant :
+
+        %{base_url}/u/confirm-old-email/%{email_token}
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Confirmez votre adresse courriel actuelle"
+      text_body_template: |
+        Avant de pouvoir ajouter une nouvelle adresse courriel, nous avons besoin de confirmer que vous contrôlez bien ce compte de messagerie. Une fois cette étape terminée, nous vous demanderons de confirmer la nouvelle adresse courriel.
+
+        Confirmez votre adresse courriel actuelle pour %{site_name} en cliquant sur le lien suivant :
 
         %{base_url}/u/confirm-old-email/%{email_token}
     notify_old_email:
@@ -3221,6 +3232,14 @@ fr:
 
         Votre adresse courriel a été modifiée à :
 
+        %{new_email}
+    notify_old_email_add:
+      subject_template: "[%{email_prefix}] Une nouvelle adresse courriel a été ajoutée"
+      text_body_template: |
+        Ceci est un message automatique pour vous informer qu'une adresse courriel pour %{site_name} a été ajoutée. Si c'est une erreur, merci de contacter ²un administrateur du site.
+
+        Votre adresse courriel ajoutée :
+
         %{new_email}
     signup_after_approval:
       title: "Inscription après approbation"
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index abd3465d12..06f07a05e3 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -829,15 +829,18 @@ he:
     confirmed: "כתובת הדוא״ל שלך עודכנה."
     please_continue: "להמשיך אל %{site_name}"
     error: "הייתה שגיאה בעדכון כתובת הדוא״ל. אולי היא כבר בשימוש?"
+    doesnt_exist: "כתובת דוא\"ל זו אינה משויכת לחשבונך."
     error_staged: "אירעה שגיאה בהחלפת כתובת הדוא״ל שלך. הכתובת כבר נמצאת בשימוש על ידי משתמשים מבוימים במערכת."
     already_done: "קישור אימות זה אינו תקף עוד, עמך הסליחה. אולי כתובת הדוא״ל שלך כבר הוחלפה?"
     confirm: "אישור"
     authorizing_new:
       title: "אישור כתובת הדוא״ל החדשה שלך"
-      description: "נא לאשר את החלפת כתובת הדוא״ל שלך לכתובת:"
+      description: "אנא אשר שברצונך שכתובת הדוא\"ל שלך תשתנה ל:"
+      description_add: "אנא אשר שברצונך להוסיף כתובת דוא\"ל חלופית:"
     authorizing_old:
       title: "החלפת כתובת הדוא״ל שלך"
       description: "נא לאשר את החלפת כתובת הדוא״ל שלך"
+      description_add: "אנא אשר שברצונך להוסיף כתובת דוא\"ל חלופית:"
       old_email: "כתובת דוא״ל ישנה: %{email}"
       new_email: "כתובת דוא״ל חדשה: %{email}"
       almost_done_title: "אישור כתובת הדוא״ל החדשה"
@@ -1651,6 +1654,7 @@ he:
     max_logins_per_ip_per_minute: "מספר מקסימלי של התחברויות מורשות לכתובת IP לדקה"
     max_post_deletions_per_minute: "מספר הפוסטים המרבי שמשתמש יכול למחוק בדקה."
     max_post_deletions_per_day: "מספר הפוסטים המרבי שמשתמש יכול למחוק ביום."
+    invite_link_max_redemptions_limit: "כמות הניצולים המרבית שמורשית לקישורים הזמנה לא יכולה לעבור את הערך הזה."
     alert_admins_if_errors_per_minute: "מספר השגיאות בדקה לפני ששולחים התראה למנהל. ערך של 0 מנטרל אפשרות זו. שימו לב: מצריך הרצה מחדש."
     alert_admins_if_errors_per_hour: "מספר השגיאות בשעה לפני ששולחים התראה למנהל. ערך של 0 מנטרל אפשרות זו. שימו לב: מצריך הרצה מחדש."
     categories_topics: "מספר הנושאים להציג בעמוד ה־‎/categories (קטגוריות). אם הוגדר ל־0, יתבצע ניסיון למצוא ערך שישאיר את שתי העמודות סימטריות (קטגוריות ונושאים)."
@@ -3384,6 +3388,16 @@ he:
 
         ניתן לאשר את כתובת הדוא״ל הנוכחית שלך לגישה לאתר %{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: "התראת דוא״ל ישן"
@@ -3393,6 +3407,16 @@ he:
 
         כתובת המייל שלכם שונתה ל:
 
+        %{new_email}
+    notify_old_email_add:
+      title: "הודעה לכתובת הדוא״ל הקודמת (הוספה)"
+      subject_template: "[%{email_prefix}] נוספה כתובת דוא״ל חדשה"
+      text_body_template: |
+        זו הודעה אוטומטית שנועדה ליידע אותך שנוספה כתובת דוא״ל עבור %{site_name}.
+         אם זה נעשה בטעות, נא ליצור קשר עם הנהלת האתר.
+
+        כתובת הדוא״ל שנוספה לחשבונך היא:
+
         %{new_email}
     signup_after_approval:
       title: "הרשמה אחרי אישור"
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index a4299bbde1..cf7495b5e8 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -2660,6 +2660,8 @@ hy:
     confirm_old_email:
       title: "Հաստատել Հին Էլ. Հասցեն"
       subject_template: "[%{email_prefix}] Հաստատել Ձեր ընթացիկ էլ. հասցեն"
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Հաստատել Ձեր ընթացիկ էլ. հասցեն"
     notify_old_email:
       title: "Ծանուցել Հին Էլ. Նամակը"
       subject_template: "[%{email_prefix}] Ձեր էլ. հասցեն փոփոխվել է "
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 9e087e425a..eb2f1e5c23 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -45,6 +45,7 @@ it:
       unrecognized_extension: "Estensione del file non riconosciuta: %{extension}"
     import_error:
       generic: Errore durante l'importazione del tema
+      about_json: "Errore di importazione: about.json non esiste o non è valido. Sei sicuro che questo sia un tema di Discourse?"
       about_json_values: "about.json contiene valori non validi: %{errors}"
       modifier_values: "I modificatori about.json contengono valori non validi: %{errors}"
       git: "Errore nella clonazione del repository git, accesso negato o repository non trovato"
@@ -193,6 +194,9 @@ it:
     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."
     error: "Si è verificato un errore durante il caricamento del file. Per favore riprova più tardi."
+  invite_link:
+    email_taken: "Questa e-mail è già in uso. Se hai già un account, effettua il login o reimposta la password."
+    max_redemptions_limit: "dovrebbe essere compreso tra 2 e %{max_limit}."
   topic_invite:
     failed_to_invite: "L'utente non può essere invitato in questo argomento senza essere membro di uno dei seguenti gruppi: %{group_names}."
     user_exists: "Spiacenti, l'utente è stato già invitato. Puoi invitare un utente ad uno stesso argomento solo una volta ."
@@ -289,6 +293,7 @@ it:
   pm_reached_recipients_limit: "Spiacente, non sono consentiti più di %{recipients_limit} destinatari in un messaggio."
   removed_direct_reply_full_quotes: "La citazione dell'intero messaggio precedente è stata rimossa automaticamente."
   secure_upload_not_allowed_in_public_topic: "Siamo spiacenti, i seguenti caricamenti sicuri non possono essere utilizzati in un argomento pubblico: %{upload_filenames}."
+  create_pm_on_existing_topic: "Spiacenti, non puoi creare un PM su un argomento esistente."
   just_posted_that: "è troppo simile a ciò che hai appena pubblicato"
   invalid_characters: "contiene caratteri non validi"
   is_invalid: "sembra poco chiaro, è una frase completa?"
@@ -370,6 +375,10 @@ it:
       trust_level_4: "trust_level_4"
     request_membership_pm:
       title: "Richesta di Adesione per @%{group_name}"
+    request_accepted_pm:
+      title: "Sei stato accettato in @ %{group_name}"
+      body: |
+        La tua richiesta di far parte di @ %{group_name} è stata accettata e ora sei un membro.
     view_hidden_topic_request_reason: "Vorrei far parte del gruppo '%{group_name}', per accedere [all'argomento](%{topic_url})"
   education:
     until_posts:
@@ -734,15 +743,18 @@ it:
     confirmed: "La tua email è stata aggiornata."
     please_continue: "Procedi su %{site_name}."
     error: "Si è verificato un errore durante la modifica del tuo indirizzo email. Forse l'indirizzo è già in uso?"
+    doesnt_exist: "Questo indirizzo email non è associato al tuo account."
     error_staged: "Si è verificato un errore durante il cambio di indirizzo email. L'indirizzo è già stato usato da un utente temporaneo."
     already_done: "Spiacenti, il collegamento di conferma non è più valido. Hai forse già cambiato email?"
     confirm: "Conferma"
     authorizing_new:
       title: "Conferma il tuo nuovo indirizzo email"
-      description: "Conferma che vuoi cambiare il tuo nuovo indirizzo email in:"
+      description: "Conferma di voler cambiare il tuo indirizzo email in:"
+      description_add: "Conferma di voler aggiungere un indirizzo email alternativo:"
     authorizing_old:
       title: "Cambia il tuo indirizzo email"
       description: "Conferma la modifica del tuo indirizzo email"
+      description_add: "Conferma di voler aggiungere un indirizzo email alternativo:"
       old_email: "Vecchia email: %{email}"
       new_email: "Nuova email: %{email}"
       almost_done_title: "Conferma nuovo indirizzo email"
@@ -1285,6 +1297,7 @@ it:
     unreachable_themes: "È fallita la verifica della presenza di aggiornamenti per i seguenti temi:"
     watched_word_regexp_error: "L'espressione regolare per %{action} per le parole osservate è invalida. Per favore controlla le <a href='%{base_path}/admin/logs/watched_words'>impostazioni Parola Osservata</a>, o disabilita le impostazioni del sito 'espressioni regolari delle parole osservate'."
   site_settings:
+    display_local_time_in_user_card: "Visualizza l&#39;ora locale in base al fuso orario di un utente quando viene aperta la sua scheda utente."
     censored_words: "Parole che saranno automaticamente sostituite con &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Cancella automaticamente tutti i messaggi nascosti che restano nascosti per più di 30 giorni."
     default_locale: "La lingua di default di questa istanza di Discourse. Puoi rimpiazzare il testo delle categorie e argomenti generati dal sistema in <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Personalizza / Testo </a>."
@@ -1330,6 +1343,8 @@ it:
     editing_grace_period_max_diff: "Numero massimo di modifiche ai caratteri consentite durante la modifica del periodo di tolleranza, se più modifiche memorizzano un'altra revisione post (Livello Esperienza 0 e 1)"
     editing_grace_period_max_diff_high_trust: "Numero massimo di modifiche ai caratteri consentite durante la modifica del periodo di tolleranza, se più modifiche memorizzano un'altra revisione post (Livello Esperienza 2 e successivi)"
     staff_edit_locks_post: "I post saranno bloccati dalla modifica se sono modificati dai membri dello staff"
+    post_edit_time_limit: "Un autore LE0 o LE1 può modificare il proprio messaggio per (n) minuti dopo la pubblicazione. Impostare su 0 per sempre."
+    tl2_post_edit_time_limit: "Un autore LE2+ può modificare il proprio messaggio per (n) minuti dopo la pubblicazione. Impostare su 0 per sempre."
     edit_history_visible_to_public: "Permetti a tutti di vedere le precedenti versioni di un messaggio modificato. Se disabilitato solo i membri dello staff possono vederle."
     delete_removed_posts_after: "I messaggi rimossi dall'autore saranno automaticamente cancellati dopo (n) ore. Se impostato a 0, i messaggi saranno cancellati subito."
     max_image_width: "Larghezza massima delle miniature delle immagini in un messaggio"
@@ -1340,6 +1355,7 @@ it:
     add_rel_nofollow_to_user_content: 'Aggiungi l''attributo rel nofollow a tutti i contenuti degli utenti, tranne per i link interni (compresi i domini di livello superiore). Se modifichi questa opzione devi aggiornare tutti i messaggi con il comando "rake posts:rebake"'
     exclude_rel_nofollow_domains: "Un elenco di domini dove l'attributo nofollow non dovrebbe essere aggiunto ai collegamenti. \"esempio.com\" consentirà automaticamente anche \"sub.esempio.com\". Come minimo si dovrebbe aggiungere il dominio di questo sito per aiutare i web crawler a trovare tutti i contenuti. Se altre parti del tuo sito web sono in altri domini, aggiungi anche quelle."
     post_excerpt_maxlength: "Lunghezza massima dell'estratto / riassunto di un messaggio."
+    topic_excerpt_maxlength: "Lunghezza massima di un estratto / riepilogo di un argomento, generata dal primo post di un argomento."
     show_pinned_excerpt_mobile: "Mostra estratti sugli argomenti appuntati nella vista mobile."
     show_pinned_excerpt_desktop: "Mostra estratti sugli argomenti appuntati nella vista desktop."
     post_onebox_maxlength: "Lunghezza massima in caratteri di un messaggio Discourse in Onebox."
@@ -1360,10 +1376,13 @@ it:
     notification_email: "L'indirizzo presente nel campo from: usato per inviare tutte le email essenziali di sistema. Il dominio indicato deve avere i record SPF, DKIM e reverse PTR impostati correttamente perché l'email arrivi."
     email_custom_headers: "Una lista di intestazioni email personalizzate delimitata da una barra verticale (pipe |)"
     email_subject: "Formato oggetto personalizzabile per e-mail standard. Vedi <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a>"
+    detailed_404: "Fornisce maggiori dettagli agli utenti sul perché non possono accedere a un argomento specifico. Nota: questo è meno sicuro perché gli utenti sapranno se un URL si collega a un argomento valido."
     enforce_second_factor: "Forza l'abilitazione dell'autenticazione a due fattori per gli utenti. Seleziona 'tutti' 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 i social login, 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, si eliminano tutti i vettori Cross Site Request Forgery nei browser supportati (Lax o Strict). Avviso: Strict lavorerà solo su siti che forzano l'accesso e utilizzano SSO."
     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 &quot;Riassumi questo argomento&quot; sia abilitato. Le modifiche a questa impostazione verranno applicate retroattivamente entro una settimana."
+    summary_likes_required: "Minimo numero di \"Mi piace\" in un argomento prima che &quot;Riepiloga questo argomento&quot; sia abilitato. Le modifiche a questa impostazione verranno applicate retroattivamente entro una settimana."
     summary_percent_filter: "Quando un utente clicca su 'Riassumi Questo Argomento', mostra i primi % messaggi"
     summary_max_results: "Messaggi massimi restituiti da 'Riepiloga questo argomento'."
     enable_personal_messages: "Autorizza gli utenti con livello di esperienza 1 (configurabile attraverso \"min livello di esperienza per l'invio di messaggi\") a creare e rispondere ai messaggi. Nota che lo staff può inviare messaggi in ogni caso."
@@ -1395,6 +1414,7 @@ it:
     markdown_typographer_quotation_marks: "Lista delle coppie di citazioni di rimpiazzo doppie e singole"
     post_undo_action_window_mins: "Numero di minuti durante i quali gli utenti possono annullare le loro azioni recenti su un messaggio (segnalazioni, Mi piace, ecc.)."
     must_approve_users: "Lo staff deve approvare tutti i nuovi account utente prima che essi possano accedere al sito."
+    invite_code: "L&#39;utente deve digitare questo codice per consentire la registrazione dell&#39;account, ignorato quando vuoto (senza distinzione tra maiuscole e minuscole)"
     pending_users_reminder_delay: "Notifica i moderatori se nuovi utenti sono in attesa di approvazione per più di queste ore. Imposta a -1 per disabilitare le notifiche."
     maximum_session_age: "L'utente resterà connesso per n ore dall'ultima visita"
     ga_universal_tracking_code: "ID del codice di tracciamento di Google Universal Analytics (analytics.js), ad esempio: UA-12345678-9; vedi <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
@@ -1495,6 +1515,9 @@ it:
     enable_github_logins: "Abilita l'autenticazione Github, richiede github_client_id e github_client_secret. Vedi <a href='https://meta.discourse.org/t/13745' target='_blank'>Configurare l'accesso a GitHub per Discourse</a> ."
     github_client_id: "Client id per l'autenticazione Github, registrato su <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     github_client_secret: "Client secret per l'autenticazione Github, registrato su <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    enable_discord_logins: "Consentire agli utenti di autenticarsi utilizzando Discord?"
+    discord_client_id: 'ID client Discord (Te ne serve uno? Visita <a href="https://discordapp.com/developers/applications/me">il portale per sviluppatori Discord</a> )'
+    discord_secret: "Secret Key di Discord"
     enable_backups: "Consenti agli amministratori di creare backup del forum"
     allow_restore: "Abilita il ripristino, che sostituisce TUTTI i dati del sito! Lascia a falso a meno che non hai intenzione di ripristinare un backup."
     maximum_backups: "Il numero massimo di backup da mantenere sul disco. I backup più vecchi vengono automaticamente cancellati."
@@ -1536,6 +1559,7 @@ it:
     max_post_deletions_per_day: "Numero massimo di post che un utente può eliminare al giorno."
     alert_admins_if_errors_per_minute: "Soglia di errori al minuto che scatena un allarme agli amministratori. Un valore pari a 0 disabilita questa caratteristica. NOTA: richiede un riavvio."
     alert_admins_if_errors_per_hour: "Soglia di errori all'ora che scatena un allarme agli amministratori. Un valore pari a 0 disabilita questa caratteristica. NOTA: richiede un riavvio."
+    categories_topics: "Numero di argomenti da mostrare nella pagina /categories. Se impostato su 0, proverà automaticamente a trovare un valore per mantenere simmetriche le due colonne (categorie e argomenti)."
     suggested_topics: "Numero di argomenti suggeriti mostrati in fondo ad un argomento."
     limit_suggested_to_category: "Negli argomenti suggeriti, mostra soltanto argomenti della categoria corrente. "
     suggested_topics_max_days_old: "Gli argomenti suggeriti non dovrebbero essere più vecchi di n giorni."
@@ -1624,11 +1648,13 @@ it:
     desktop_category_page_style: "Stile visuale per la pagina /categorie."
     category_colors: "Un elenco di valori esadecimali di colori permessi per le categorie."
     category_style: "Stile grafico dei distintivi relativi alle categorie."
+    max_image_size_kb: "La dimensione massima di un&#39;allegato immagine in KB.  Deve essere configurato anche in nginx (client_max_body_size) / apache o proxy. Le immagini più grandi di questa e più piccole di client_max_body_size verranno ridimensionate per adattarsi al caricamento."
     max_attachment_size_kb: "Dimensione massima dei file che gli utenti possono caricare, in kB. Configura il limite anche in nginx (client_max_body_size) / apache o nel proxy."
     authorized_extensions: "Una lista di estensioni dei file che è permesso caricare (usa '*' per permettere tutti i tipi di file) "
     authorized_extensions_for_staff: "Un elenco di estensioni di file consentite per il caricamento da parte dello staff in aggiunta all'elenco definito nell'impostazione del sito `authorized_extensions`. (usa '*'; per abilitare tutti i tipi di file)"
     theme_authorized_extensions: "Una lista di estensioni dei file permessi per i caricamenti dei temi (usa '*' per abilitare tutti i tipi di file)"
     max_similar_results: "Quanti argomenti simili mostrare sopra l'editor quando si scrive un nuovo argomento. Il paragone viene fatto sul titolo e sul corpo."
+    max_image_megapixels: "Numero massimo di megapixel consentiti per un&#39;immagine. Le immagini con un numero maggiore di megapixel verranno rifiutate."
     title_prettify: "Evita refusi ed errori comuni nei titoli, incluso il testo tutto maiuscolo, il primo carattere minuscolo, troppi caratteri ! e ?, puntini aggiuntivi alla fine della parola ecc."
     title_remove_extraneous_space: "Rimuovi gli spazi bianchi davanti alla punteggiatura."
     automatic_topic_heat_values: 'Aggiorna automaticamente le impostazioni "topic views heat" e "topic post like heat" in base all''attività del sito.'
@@ -1668,6 +1694,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à"
+    high_trust_flaggers_auto_hide_posts: "I messaggi di nuovi utenti vengono automaticamente nascosti dopo essere stati contrassegnati come spam da un utente TL3 +"
     reply_by_email_enabled: "Abilita la possibilità di rispondere ai messaggi tramite email."
     reply_by_email_address: "Modello per rispondere via email, per esempio: %%{reply_key}@risposta.esempio.com o risposte+%%{reply_key}@esempio.com"
     alternative_reply_by_email_addresses: "Elenco dei template alternativi per la risposta via email in arrivo da indirizzi email. Esempio: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
@@ -2966,6 +2993,8 @@ it:
         Conferma il tuo attuale indirizzo email su %{site_name} cliccando il seguente collegamento:
 
         %{base_url}/u/confirm-old-email/%{email_token}%{email_token}
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Conferma il tuo attuale indirizzo email"
     notify_old_email:
       title: "Notifica Vecchia Email"
       subject_template: "[%{email_prefix}] Il tuo indirizzo email è stato cambiato"
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 1fd072c688..f5b812fb6e 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -1299,6 +1299,8 @@ ja:
     confirm_old_email:
       title: "古いメールの確認"
       subject_template: "[%{email_prefix}]現在のメールアドレスの確認"
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}]現在のメールアドレスの確認"
     signup_after_approval:
       subject_template: "%{site_name} への参加承認完了!"
     signup:
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 2764eaa628..b15d02093f 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -649,7 +649,6 @@ ko:
     confirm: "확인"
     authorizing_new:
       title: "새 이메일 확인"
-      description: "새 이메일 주소가 다음으로 변경되었는지 확인하십시오."
     authorizing_old:
       title: "이메일 주소 변경"
       description: "이메일 주소 변경을 확인하십시오"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 96f2334196..0743aa74cb 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -762,7 +762,6 @@ nl:
     confirm: "Bevestigen"
     authorizing_new:
       title: "Bevestig uw nieuwe e-mailadres"
-      description: "Bevestig dat u uw nieuwe e-mailadres gewijzigd wilt zien naar:"
     authorizing_old:
       title: "Uw e-mailadres wijzigen"
       description: "Bevestig de wijziging van uw e-mailadres"
@@ -2535,6 +2534,8 @@ nl:
         Bevestig uw huidige e-mailadres voor %{site_name} door op de volgende koppeling te klikken:
 
         %{base_url}/u/confirm-old-email/%{email_token}
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Bevestig uw huidige e-mailadres"
     notify_old_email:
       subject_template: "[%{email_prefix}] Uw e-mailadres is gewijzigd"
     signup_after_approval:
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index d16570fb7f..efc6df67e5 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -794,7 +794,6 @@ pl_PL:
     confirm: "Potwierdź"
     authorizing_new:
       title: "Potwierdź swój nowy adres e-mail"
-      description: "Potwierdź zmianę adresu e-mail na:"
     authorizing_old:
       title: "Zmień swój adres e-mail"
       description: "Potwierdź zmianę adresu e-mail"
@@ -2637,6 +2636,8 @@ pl_PL:
     confirm_old_email:
       title: "Potwierdź stary email"
       subject_template: "[%{site_name}] Potwierdź aktualny adres email"
+    confirm_old_email_add:
+      subject_template: "[%{site_name}] Potwierdź aktualny adres email"
     notify_old_email:
       title: "Powiadom Stary Email"
       subject_template: "[%{site_name}] Twój adres email został zmieniony"
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 3d2f607751..ce33d0a385 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -730,7 +730,6 @@ pt_BR:
     confirm: "Confirmar"
     authorizing_new:
       title: "Confirme seu novo e-mail"
-      description: "Por favor confirme que você deseja que seu novo endereço de e-mail seja alterado para:"
     authorizing_old:
       title: "Troque seu endereço de e-mail"
       description: "Por favor confirme a alteração do seu endereço de e-mail"
@@ -1983,12 +1982,12 @@ pt_BR:
     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 está ativado para sua conta."
     security_key_description: "Quando você tiver uma chave física de segurança preparada, pressione o Anti\n\nQuando sua chave de segurança física estiver pronta, pressione o botão \"Autenticar com Chave de Segurança\" abaixo."
-    security_key_alternative: "T"
+    security_key_alternative: "Tente de uma 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 atual ou navegador não suportam o uso de chaves de segurança. Por favor, use um método diferente."
-    not_approved: "A sua conta ainda não foi aprovada. Vais ser notificado por email assim que estiver pronto para fazeres log in."
+    not_approved: "A sua conta ainda não foi aprovada. Você será notificado por e-mail assim que estiver pronto para fazer login."
     incorrect_username_email_or_password: "Usuário, email ou senha incorretos"
     incorrect_password: "senha incorreta"
     wait_approval: "Obrigado por se registar. Você será notificado por email quando a sua conta for aprovada."
@@ -3010,6 +3009,8 @@ pt_BR:
       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 email atual para %{site_name} clicando no seguinte link: \n\n%{base_url}/u/confirm-old-email/%{email_token}\n"
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Confirme seu endereço de e-mail atual"
     notify_old_email:
       title: "Notificar e-mail antigo"
       subject_template: "[%{email_prefix}] Seu endereço de e-mail foi alterado"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 0a48738185..e48b0cfaeb 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -203,6 +203,9 @@ ru:
     file_should_be_csv: "Загружаемый файл должен быть в csv-формате."
     max_rows: "Первые %{max_bulk_invites} приглашения были отправлены. Попробуйте разделить файл на более мелкие части."
     error: "Произошла ошибка при загрузке файла. Пожалуйста, повторите попытку позже."
+  invite_link:
+    email_taken: "Этот email уже используется. Если у вас есть учётная запись - войдите в систему или запустите процедуру сброса пароля."
+    max_redemptions_limit: "Значение должно быть в интервале от 2 до %{max_limit}."
   topic_invite:
     failed_to_invite: "Пользователь не может быть приглашен в эту тему без членства в одной из следующих групп: %{group_names}."
     user_exists: "К сожалению, этот пользователь уже был приглашён. Вы можете пригласить пользователя в тему только один раз."
@@ -792,15 +795,18 @@ ru:
     confirmed: "Ваш адрес электронной почты обновлен."
     please_continue: "Перейти на %{site_name}"
     error: "При смене электронного адреса произошла ошибка. Возможно, этот адрес уже используется?"
+    doesnt_exist: "Этот email  не связан с Вашей учётной записью."
     error_staged: "При смене электронного адреса произошла ошибка. Этот адрес уже используется другим пользователем."
     already_done: "Извините, ссылка для подтверждения устарела. Возможно, ваш email уже изменен?"
     confirm: "Подтверждение"
     authorizing_new:
       title: "Подтвердите свой новый e-mail"
-      description: "Пожалуйста, подтвердите, что вы хотите изменить свой новый e-mail на:"
+      description: "Подтвердите, что Вы хотите поменять свой email  на новый:"
+      description_add: "Подтвердите, что Вы хотите добавить дополнительный email:"
     authorizing_old:
       title: "Измените свой адрес e-mail почты"
       description: "Пожалуйста, подтвердите изменение вашего e-mail"
+      description_add: "Подтвердите, что Вы хотите добавить дополнительный email:"
       old_email: "Старый e-mail: %{email}"
       new_email: "Новый e-mail: %{email}"
       almost_done_title: "Подтверждение нового e-mail"
@@ -844,7 +850,7 @@ ru:
       short_description: 'Нарушение <a href="%{base_path}/guidelines">правил сообщества</a>'
       long_form: "отметить как неуместное"
     notify_user:
-      title: "Отправить @%{username} личное сообщение"
+      title: "Отправить пользователю @%{username} личное сообщение"
       description: "Я хочу поговорить с этим человеком напрямую и лично об этом посте."
       short_description: "Я хочу поговорить с этим человеком напрямую и лично об этом посте."
       long_form: "оповещаемый пользователь"
@@ -1484,6 +1490,7 @@ ru:
     max_logins_per_ip_per_minute: "Максимальное количество входов в систему на IP-адрес в минуту"
     max_post_deletions_per_minute: "Максимальное количество записей, которые пользователь может удалить за минуту."
     max_post_deletions_per_day: "Максимальное количество записей, которые пользователь может удалить за день."
+    invite_link_max_redemptions_limit: "Количество пользователей, получающих приглашение по ссылке, не может превышать указанное здесь значение."
     alert_admins_if_errors_per_minute: "Количество ошибок в минуту для предупреждения администратора. Значение 0 отключает эту опцию. ВНИМАНИЕ: требуется перезагрузка."
     alert_admins_if_errors_per_hour: "Количество ошибок в час для предупреждения администратора. Значение 0 отключает эту опцию. ВНИМАНИЕ: требуется перезагрузка."
     suggested_topics: "Количество рекомендованных тем, отображаемых внизу текущей темы."
@@ -2073,6 +2080,9 @@ ru:
         %{post_error}
 
         Если вы не можете исправить ошибку, попробуйте снова.
+    email_reject_bad_destination_address:
+      text_body_template: |
+        Сожалеем, но Ваше письмо адресату %{destination} (озаглавленное как %{former_title}не может быть отправлено.  Вы используете более одного электронного адреса?  Или Вы отвечаете с различных электронных адресов? При ответе необходимо использовать тот же самый электронный адрес. В противном случае ID заголовка сообщения может быть изменён.
     email_reject_unrecognized_error:
       subject_template: "[%{email_prefix}] Проблема с e-mail почтой -- Нераспознанная ошибка"
     email_reject_reply_not_allowed:
@@ -2346,8 +2356,19 @@ ru:
       subject_template: "[%{email_prefix}] Ваш новый аккаунт"
     confirm_new_email:
       title: "Подтвердить Новый E-mail"
+    confirm_old_email:
+      subject_template: "%{email_prefix}Подтверждение текущего электронного адеса"
+    confirm_old_email_add:
+      subject_template: "%{email_prefix}Подтверждение текущего электронного адреса"
+      text_body_template: |
+        Перед добавлением нового электронного адреса необходимо убедиться в том, что Вы имеете доступ к текущему электронному адресу, после чего можно будет подтвердить новый адрес.
+
+        Подтвердите текущий электронный адрес для сайта %{site_name} нажатием на следующую ссылку: %{base_url}/u/confirm-old-email/%{email_token}
     notify_old_email:
       subject_template: "[%{email_prefix}] Ваш адрес электронной почты был изменён"
+    notify_old_email_add:
+      subject_template: "%{email_prefix} Новый электронный адрес успешно добавлен."
+      text_body_template: "Это автоматическое сообщение, уведомляющее, что для сайта %{site_name} был добавлен электронный адрес. Если Вы считаете, что это было сделано по ошибке, свяжитесь с администратором сайта.\n\nДобавленный адрес: \n\n%{new_email}\n"
     signup_after_approval:
       title: "Регистрация После Утверждения"
       subject_template: "Ваша учетная запись на сайте %{site_name} одобрена!"
diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml
index c94af00741..6caeb0afc4 100644
--- a/config/locales/server.sl.yml
+++ b/config/locales/server.sl.yml
@@ -1648,6 +1648,8 @@ sl:
     confirm_old_email:
       title: "Potrdite star e-naslov"
       subject_template: "[%{email_prefix}] Potrdite vaš trenutni e-naslov"
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Potrdite vaš trenutni e-naslov"
     notify_old_email:
       title: "Obvesti stari e-naslov"
       subject_template: "[%{email_prefix}] Vaš e-naslov je bil spremenjen"
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 588f03e98b..caef7a150f 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -1158,6 +1158,8 @@ sq:
       subject_template: "[%{email_prefix}] Konfirmoni adresën tuaj të re të emailit"
     confirm_old_email:
       subject_template: "[%{email_prefix}] Konfirmoni adresën e tanishme të emailit "
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Konfirmoni adresën e tanishme të emailit "
     notify_old_email:
       text_body_template: |
         Ky është një mesazh automatik që ju njofton se adresa juaj email për
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 14211b141c..c985afbe28 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -196,6 +196,7 @@ sv:
     error: "Det uppstod ett problem när filerna skulle laddas upp. Vad snäll och försök senare igen."
   invite_link:
     email_taken: "Den här e-postadressen används redan. Om du redan har ett konto ber vi dig logga in eller återställa lösenordet."
+    max_redemptions_limit: "bör vara mellan 2 och %{max_limit}."
   topic_invite:
     failed_to_invite: "Användaren kan inte bjudas in till detta ämne utan gruppmedlemskap i någon av de följande grupperna: %{group_names}."
     user_exists: "Tyvärr, den användaren har redan bjudits in. Du kan endast bjuda in en användare till ett ämne en gång."
@@ -736,15 +737,18 @@ sv:
     confirmed: "Din e-post har uppdaterats."
     please_continue: "Fortsätt till %{site_name}"
     error: "Det uppstod ett fel med ändringen av din e-postadress. Adressen kanske redan används?"
+    doesnt_exist: "Den e-postadressen är inte associerad till ditt konto."
     error_staged: "Ett problem uppstod vid ändring av din e-postadress. Adressen används redan av en annan användare. "
     already_done: "Tyvärr har den här aktiveringslänken löpt ut. Kanske är din e-postadress redan ändrad? "
     confirm: "Bekräfta"
     authorizing_new:
       title: "Bekräfta din nya e-post"
-      description: "Vänligen bekräfta att du önskar ändra din nya e-postadress till:"
+      description: "Vänligen bekräfta att du önskar ändra din e-postadress till:"
+      description_add: "Vänligen bekräfta att du önskar lägga till en alternativ e-postadress:"
     authorizing_old:
       title: "Ändra din e-postadress"
       description: "Vänligen konfirmera din e-postadressändring"
+      description_add: "Vänligen bekräfta att du önskar lägga till en alternativ e-postadress:"
       old_email: "Gammal e-post: %{email}"
       new_email: "Ny e-post: %{email}"
       almost_done_title: "Bekräftar ny e-postadress"
@@ -1556,6 +1560,7 @@ sv:
     max_logins_per_ip_per_minute: "Maximalt antal inloggningar tillåtna per IP-adress per minut"
     max_post_deletions_per_minute: "Maximalt antal inlägg som en användare kan radera per minut."
     max_post_deletions_per_day: "Maximalt antal inlägg som en användare kan radera per dag."
+    invite_link_max_redemptions_limit: "Maximalt antal återinbjudningar tillåtna för inbjudningslänkar kan inte vara större än detta värde."
     alert_admins_if_errors_per_minute: "Antal felindikeringar per minut för att utlösa ett administratörslarm. Ange 0 för att inaktivera den här funktionen. OBS: kräver omstart."
     alert_admins_if_errors_per_hour: "Antal felindikeringar per timme för att utlösa ett administratörslarm. Ange 0 för att inaktivera den här funktione. OBS: kräver omstart."
     categories_topics: "Antal ämnen som ska visas i /kategorisida. Om satt till 0 kommer systemet automatiskt att försöka hitta ett värde så att de två kolumnerna hålls symmetriskt (kategorier och ämnen.) "
@@ -3075,6 +3080,17 @@ sv:
 
         Du kan bekräfta e-postadressen för %{site_name} genom att följa länken nedan:
 
+        %{base_url}/u/confirm-old-email/%{email_token}
+    confirm_old_email_add:
+      title: "Bekräfta tidigare e-postadress (Lägg till)"
+      subject_template: "[%{email_prefix}] Bekräfta din nuvarande e-postadress"
+      text_body_template: |
+        Innan vi kan lägga till en e-postadress,  behöver du bekräfta att du kontrollerar
+        den nuvarande e-postadressen. Efter att du har genomfört detta steg, behöver du bekräfta
+        den nya e-postadressen.
+
+        Du kan bekräfta e-postadressen för %{site_name} genom att klicka på följande länk:
+
         %{base_url}/u/confirm-old-email/%{email_token}
     notify_old_email:
       title: "Meddela gamla epostmeddelanden"
@@ -3084,6 +3100,17 @@ sv:
 
         Din e-postadress har ändrats till:
 
+        %{new_email}
+    notify_old_email_add:
+      title: "Notifiera tidigare e-postadress (Lägg till)"
+      subject_template: "[%{email_prefix}] En ny e-postadress har lagts till"
+      text_body_template: |
+        Det här är ett automatiserat meddelande för att informera dig om att en e-postadress för
+        %{site_name} har lagts till. Om detta har gjorts felaktigt, vänligen kontakta
+        en administratör.
+
+        Din tillagda e-postadress är:
+
         %{new_email}
     signup_after_approval:
       title: "Ny medlem efter godkännande"
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
index 493f78ca9a..7b91fd4802 100644
--- a/config/locales/server.sw.yml
+++ b/config/locales/server.sw.yml
@@ -1713,6 +1713,8 @@ sw:
     confirm_old_email:
       title: "Thibitisha Barua pepe ya Zamani"
       subject_template: "[%{email_prefix}] Thibitisha barua pepe ya sasa"
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Thibitisha barua pepe ya sasa"
     notify_old_email:
       title: "Ijulishe Barua Pepe ya Zamani"
       subject_template: "[%{email_prefix}] Barua pepe yako imebadilishwa"
diff --git a/config/locales/server.th.yml b/config/locales/server.th.yml
index a9ce6f2d1a..3d03f5bce4 100644
--- a/config/locales/server.th.yml
+++ b/config/locales/server.th.yml
@@ -60,9 +60,15 @@ th:
   next_page: "หน้าถัดไป →"
   prev_page: "← หน้าก่อนหน้า"
   page_num: "หน้า %{num}"
+  home_title: "หน้าแรก"
+  excerpt_image: "รูปภาพ"
   bookmarks:
     reminders:
+      later_today: "ภายหลังในวันนี้"
+      next_business_day: "ในวันทำการถัดไป"
       tomorrow: "พรุ่งนี้"
+      next_week: "สัปดาห์หน้า"
+      next_month: "เดือนหน้า"
   groups:
     default_names:
       everyone: "ทุกคน"
@@ -93,6 +99,11 @@ th:
     choose: "เลือกรหัสผู้ใช้"
     save: "ตั้งรหัสผ่าน"
     title: "รีเซ็ทรหัสผ่าน"
+  change_email:
+    please_continue: "ดำเนินการต่อไปยัง %{site_name}"
+  activation:
+    continue_button: "ดำเนินการต่อไปยัง %{site_name}"
+    welcome_to: "ยินดีต้อนรับสู่ %{site_name}!"
   reviewable_score_types:
     needs_approval:
       title: "ต้องการอนุมัติ"
@@ -117,6 +128,10 @@ th:
       weekly: "รายสัปดาห์"
       every_month: "ทุกเดือน"
       every_six_months: "ทุกหกเดือน"
+  user_api_key:
+    otp_confirmation:
+      confirm_title: "ดำเนินการต่อไปยัง %{site_name}"
+      confirm_button: เสร็จสิ้นการเข้าสู่ระบบ
   reports:
     post_edits:
       labels:
@@ -126,6 +141,7 @@ th:
     user_flagging_ratio:
       labels:
         user: ผู้ใช้
+        score: คะแนน
     moderators_activity:
       labels:
         moderator: ผู้ดูแล
@@ -191,8 +207,16 @@ th:
     slug_errors:
       invalid: "มีตัวอักษรที่ไม่สามารถใช้งานได้"
   login:
+    security_key_alternative: "ลองวิธีอื่น"
+    not_approved: "บัญชีของคุณยังไม่ได้รับการยืนยัน คุณจะได้รับการแจ้งเตือนทางอีเมลเมื่อคุณสามารถเข้าสู่ระบบได้"
     admin_not_allowed_from_ip_address: "คุณไม่สามารถเข้าสู่ระบบด้วยผู้ดูแลระบบด้วยไอพีนี้"
     not_available: "ใช้การไม่ได้ ลอง%{suggestion}?"
+    omniauth_confirm_button: "ดำเนินการต่อ"
+  system_messages:
+    welcome_user:
+      subject_template: "ยินดีต้อนรับสู่ %{site_name}!"
+    welcome_invite:
+      subject_template: "ยินดีต้อนรับสู่ %{site_name}!"
   subject_re: "ตอบ: "
   subject_pm: "[PM] "
   user_notifications:
@@ -300,14 +324,18 @@ th:
   page_not_found:
     see_more: "อื่น"
     search_button: "ค้นหา"
+  image: "รูปภาพ"
   csv_export:
     boolean_yes: "ใช่"
     boolean_no: "ไม่ใช่"
+    rate_limit_error: "สามารถดาวน์โหลดโพสต์ได้วันละหนึ่งครั้งเท่านั้น กรุณาลองใหม่พรุ่งนี้"
   tos_topic:
     title: "เงื่อนไขการบริการ"
   privacy_topic:
     title: "นโยบายความเป็นส่วนตัว"
   badges:
+    member:
+      name: สมาชิก
     regular:
       name: ทั่วไป
     first_link:
@@ -318,18 +346,42 @@ th:
       name: ลิงค์ที่ได้รับความนิยม
   tags:
     title: "ป้าย"
+  finish_installation:
+    register:
+      button: "ลงทะเบียน"
+    resend_email:
+      title: "ส่งอีเมลยืนยันตัวตนอีกครั้ง"
   wizard:
     step:
       forum_title:
         title: "ชื่อ"
       privacy:
         title: "การเข้าถึง"
+        fields:
+          privacy:
+            choices:
+              open:
+                label: "สาธารณะ"
+              restricted:
+                label: "ส่วนตัว"
       contact:
         fields:
           contact_email:
             placeholder: "name@example.com"
       corporate:
         title: "องค์กร"
+      colors:
+        title: "ธีม"
+      homepage:
+        fields:
+          homepage_style:
+            choices:
+              categories_only:
+                label: "หมวดหมู่เท่านั้น"
+              categories_and_latest_topics:
+                label: "หมวดหมู่และกระทู้ล่าสุด"
+              categories_and_top_topics:
+                label: "หมวดหมู่และกระทู้ยอดนิยม"
       emoji:
         title: "Emoji"
   joined: "สมัครสมาชิกเมื่อ"
@@ -341,7 +393,17 @@ th:
       replied: '%{username} ตอบคุณใน "%{topic}" - %{site_title}'
       posted: '%{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}"
   reviewables:
+    priorities:
+      medium: "ปานกลาง"
+      high: "สูง"
+    sensitivity:
+      medium: "ปานกลาง"
+      high: "สูง"
     actions:
       delete_spammer:
         title: "ลบสแปมเมอร์"
@@ -349,6 +411,8 @@ th:
         title: "ลบ"
       disagree:
         title: "ไม่เห็นด้วย"
+      ignore:
+        title: "ไม่สนใจ"
       approve:
         title: "อนุมัติ"
       reject_user:
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 576d551f86..7d4e618535 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -723,7 +723,6 @@ tr_TR:
     confirm: "Onayla"
     authorizing_new:
       title: "Yeni e-postanı onayla"
-      description: "Lütfen yeni e-posta adresinizin değiştirilmesini istediğinizi onaylayın:"
     authorizing_old:
       title: "E posta adresini değiştir"
       description: "Lütfen e-posta adresİ değişikliğini onayla"
@@ -3078,6 +3077,8 @@ tr_TR:
       title: "Eski E-postayı Onayla"
       subject_template: "[%{email_prefix}] Mevcut e-posta adresinizi onaylayın"
       text_body_template: "E-posta adresinizi değiştirebilmemiz için \nmevcut e-posta hesabını kontrol ettiğinizi onaylamanız gerekiyor. \nBu 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"
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Mevcut e-posta adresinizi onaylayın"
     notify_old_email:
       title: "Eski E-postayı Bildir"
       subject_template: "[%{email_prefix}] E-posta adresiniz değiştirildi"
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index dabc8e2e60..6fefe688d5 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -778,7 +778,6 @@ uk:
     confirm: "Підтвердіть"
     authorizing_new:
       title: "Підтвердьте свій новий електронний лист"
-      description: "Підтвердьте, що хочете, щоб ваша нова електронна пошта була змінена на:"
     authorizing_old:
       title: "Змінити свою електронну пошту"
       description: "Підтвердьте зміну своєї електронної пошти"
@@ -2518,6 +2517,8 @@ uk:
     confirm_old_email:
       title: "Підтвердіть стару електронну пошту"
       subject_template: "[%{email_prefix}] Підтвердіть свою поточну адресу електроної пошти"
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] Підтвердіть свою поточну адресу електроної пошти"
     notify_old_email:
       title: "Повідомлення на стару електронну пошту"
       subject_template: "[%{email_prefix}] Вашу електронну адресу змінено"
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index f8e1a75334..bf03b88b7b 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -2936,6 +2936,8 @@ ur:
     confirm_old_email:
       title: "پرانی ای میل تصدیق"
       subject_template: "[%{email_prefix}] اپنا موجودہ ای میل ایڈریس تصدیق کریں"
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] اپنا موجودہ ای میل ایڈریس تصدیق کریں"
     notify_old_email:
       title: "پرانا ای میل مطلع"
       subject_template: "[%{email_prefix}] آپ کا ای میل ایڈریس تبدیل ہوگیا ہے"
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index ebf8927920..72cff49197 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -189,6 +189,9 @@ zh_CN:
     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: "抱歉，用户已经被邀请过了。你只可以邀请一个用户到一个主题中一次。"
@@ -708,15 +711,18 @@ zh_CN:
     confirmed: "你的电子邮箱已被更新。"
     please_continue: "转入到%{site_name}"
     error: "在修改你的电子邮箱地址时出现了错误，可能此邮箱已经在论坛中使用了？"
+    doesnt_exist: "这个电子邮件地址与你的账户没有关联。"
     error_staged: "在修改你的电子邮箱地址时出现了错误。这个邮箱已经被一个暂存用户占用了。"
     already_done: "抱歉，此激活链接已经失效。可能你已经修改了邮箱？"
     confirm: "确认"
     authorizing_new:
       title: "确认您的新邮箱"
-      description: "请你确认要将新的电子邮件地址更改为："
+      description: "请确认你想要修改的电子邮件地址："
+      description_add: "请确认你要添加的次要电子邮件地址："
     authorizing_old:
       title: "修改你的电子邮件地址"
       description: "请确认你的电子邮件地址更改"
+      description_add: "请确认你要添加的次要电子邮件地址："
       old_email: "旧邮件：%{email}"
       new_email: "新邮件：%{email}"
       almost_done_title: "确认新的电子邮件地址"
@@ -1421,6 +1427,7 @@ zh_CN:
     moderators_view_emails: "允许版主查看用户电子邮件"
     prioritize_username_in_ux: "在用户页、用户卡片和帖子上优先显示用户名（未选时，昵称将先显示）"
     enable_rich_text_paste: "将文本粘贴到编辑器中时自动启用HTML到Markdown转换。（实验性）"
+    send_old_credential_reminder_days: "几天后提醒有关旧凭证"
     email_token_valid_hours: "“忘记密码”/“激活账户”令牌有效的小时数。"
     enable_badges: "启用徽章系统"
     enable_whispers: "允许管理人员在主题中私密交流。"
@@ -1526,6 +1533,7 @@ zh_CN:
     max_logins_per_ip_per_minute: "一分钟内同一个IP（网络）地址能允许最大的登录次数。"
     max_post_deletions_per_minute: "用户每分钟可以删除的最大帖子数。"
     max_post_deletions_per_day: "用户每天可以删除的最大帖子数。"
+    invite_link_max_redemptions_limit: "邀请链接所允许的最大兑换量不能超过这个数值。"
     alert_admins_if_errors_per_minute: "激活管理员警告的每分钟错误的数量。0 会禁用这个特性。注意：需要重启。"
     alert_admins_if_errors_per_hour: "激活管理员警告的每小时错误的数量。0 会禁用这个特性。注意：需要重启。"
     categories_topics: "要在 /categories 页面中显示的主题数量。如果设置为0，它将自动尝试寻找一个值来保持两列对称（分类和主题）。"
@@ -2641,6 +2649,10 @@ zh_CN:
     email_reject_bad_destination_address:
       title: "Email被拒绝：收件人地址不正确"
       subject_template: "[%{email_prefix}] 邮件问题 -- 未知的发至：地址"
+      text_body_template: |
+        很抱歉，你通过邮件发往%{destination}（标题%{former_title}）的私信/消息没有成功。
+
+        你是否使用一个以上的电子邮件地址？你是否使用了不同的电子邮件地址回复？电子邮件回复要求你在回复时使用相同的电子邮件地址。或者，邮件中的私信/消息-ID 头可能被修改。
     email_reject_old_destination:
       title: "邮件拒绝老地址"
       subject_template: "[%{email_prefix}] 邮件问题 - 你正尝试回复旧通知"
@@ -3183,6 +3195,17 @@ zh_CN:
         点击下面链接以确认你当前在%{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}] 你的邮箱已经修改成功"
@@ -3191,6 +3214,17 @@ zh_CN:
 
         你的邮箱地址被修改为：
 
+        %{new_email}
+    notify_old_email_add:
+      title: "通知旧邮件（添加）"
+      subject_template: "[%{email_prefix}]一个新的电子邮件已被添加。"
+      text_body_template: |
+        请了解，这是一条自动的私信/消息，这个电子邮件地址
+        已添加至%{site_name}。如果有误，请联系
+        网站管理员。
+
+        你添加的电子邮件地址是：
+
         %{new_email}
     signup_after_approval:
       title: "在审批之后注册"
@@ -4258,3 +4292,13 @@ zh_CN:
     html_missing_placeholder: "HTML模板必须包含%{placeholder}"
   discord:
     not_in_allowed_guild: "验证失败。您不是允许的Discord公会的成员。"
+  old_keys_reminder:
+    title: "关于旧凭证的提醒"
+    body: |
+      Hello！这是你的 Discourse 实例每年例行安全提醒。
+
+      出于礼貌，我们想让你知道，你的 Discourse 实例上使用的以下凭证已经两年多没有更新了。
+
+      %{keys}
+
+      目前不需要采取任何行动，但是，每隔几年对所有重要凭证进行周期性更新是一种良好的安全做法。
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 4527cff87d..8dbe837651 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -2727,6 +2727,8 @@ zh_TW:
     confirm_old_email:
       title: "確認原郵件地址"
       subject_template: "[%{email_prefix}] 確認你的現行郵件地址"
+    confirm_old_email_add:
+      subject_template: "[%{email_prefix}] 確認你的現行郵件地址"
     notify_old_email:
       title: "通知原郵件地址"
       subject_template: "[%{email_prefix}] 已變更你的郵件地址"
diff --git a/lib/i18n/locale_file_checker.rb b/lib/i18n/locale_file_checker.rb
index 1f30f1ab66..fb54938768 100644
--- a/lib/i18n/locale_file_checker.rb
+++ b/lib/i18n/locale_file_checker.rb
@@ -20,8 +20,8 @@ class LocaleFileChecker
       @locale_yaml = YAML.load_file(locale_path)
       @reference_yaml = YAML.load_file(reference_path)
 
-      check_interpolation_keys
-      check_plural_keys
+      # check_interpolation_keys
+      # check_plural_keys
       check_message_format
     end
 
diff --git a/plugins/discourse-details/config/locales/server.pt.yml b/plugins/discourse-details/config/locales/server.pt.yml
index d12527a51f..8ed231c890 100644
--- a/plugins/discourse-details/config/locales/server.pt.yml
+++ b/plugins/discourse-details/config/locales/server.pt.yml
@@ -5,4 +5,8 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-pt: {}
+pt:
+  site_settings:
+    details_enabled: 'Ative a funcionalidade de detalhes. Se alterar isto, deve refazer todas as publicações com: "rake posts:rebake".'
+  details:
+    excerpt_details: "(clique para mais detalhes)"
diff --git a/plugins/discourse-local-dates/config/locales/client.th.yml b/plugins/discourse-local-dates/config/locales/client.th.yml
index 0533e81677..27b39a9789 100644
--- a/plugins/discourse-local-dates/config/locales/client.th.yml
+++ b/plugins/discourse-local-dates/config/locales/client.th.yml
@@ -20,3 +20,4 @@ th:
           date_title: วันที่
           time_title: เวลา
           format_title: รูปแบบวันที่
+          timezone: เขตเวลา
diff --git a/plugins/discourse-local-dates/config/locales/server.pt.yml b/plugins/discourse-local-dates/config/locales/server.pt.yml
index d12527a51f..5eb697405b 100644
--- a/plugins/discourse-local-dates/config/locales/server.pt.yml
+++ b/plugins/discourse-local-dates/config/locales/server.pt.yml
@@ -5,4 +5,7 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-pt: {}
+pt:
+  site_settings:
+    discourse_local_dates_default_timezones: "A lista das zonas horárias predefinida, deve ser <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> válido"
+    discourse_local_dates_email_format: "O formato utilizado para exibir uma data nas mensagens."
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pt.yml b/plugins/discourse-narrative-bot/config/locales/server.pt.yml
index ca1df66247..49dfd5aa76 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt.yml
@@ -7,11 +7,11 @@
 
 pt:
   site_settings:
-    discourse_narrative_bot_enabled: "Activar o bot do Discourse (discobot)"
+    discourse_narrative_bot_enabled: "Ativar Discourse Narrative Bot (discobot)"
     disable_discourse_narrative_bot_welcome_post: "Desativar a publicação de boas-vindas do Discourse Narrative Bot"
     discourse_narrative_bot_ignored_usernames: "Nomes de utilizador que o Discourse Narrative Bot deverá ignorar"
     discourse_narrative_bot_disable_public_replies: "Desativar as respostas públicas do Discourse Narrative Bot"
-    discourse_narrative_bot_welcome_post_type: "O tipo de publicação de boas-vindas que \"Discourse Narrative Bot\" deverá enviar"
+    discourse_narrative_bot_welcome_post_type: "O tipo de publicação de boas-vindas que Discourse Narrative Bot deverá enviar"
     discourse_narrative_bot_welcome_post_delay: "Aguardar (n) segundos antes de enviar a publicação de boas-vindas do Discurso Narrativa Bot."
   badges:
     certified:
@@ -26,7 +26,9 @@ pt:
     bio: "Olá. Não sou humano. Sou um bot que pode ensiná-lo acerca deste sítio. Para interagir comigo, envie-me uma mensagem ou mencione-me %{discobot_username} em qualquer lado."
     dice:
       not_enough_dice: |-
-        Só tenho %{num_of_dice} dado. [Vergonhoso] http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), bem sei!
+        Eu tenho apenas %{num_of_dice} dado. [Vergonhoso] http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), eu sei!
+      results: |-
+        > :game_die: %{results}
     quote:
       '1':
         quote: "Entre cada dificuldade há espaço para oportunidade."
@@ -45,7 +47,7 @@ pt:
       '6':
         author: "A mãe de Forrest Gump"
       '7':
-        quote: "Isto é um pequeno passo para o homem, um gigantesco para a humanidade."
+        quote: "Isto é um pequeno passo para o homem, um salto gigantesco para a humanidade."
         author: "Neil Armstrong"
       '8':
         author: "Eleanor Roosevelt"
@@ -65,9 +67,11 @@ pt:
         '9': "Sim"
         '12': "Perguntar novamente mais tarde"
         '13': "É melhor não lhe dizer agora"
+        '14': "Não pode prever agora"
         '15': "Concentre-se e pergunte novamente"
         '17': "A minha resposta é não"
         '18': "As minhas fontes dizem não"
+        '20': "Muito duvidoso"
       result: |-
         > :crystal_ball: %{result}
     track_selector:
@@ -79,6 +83,8 @@ pt:
         alt: "Certificado de Realização"
     advanced_user_narrative:
       title: ":arrow_up: Funcionalidades de utilizador avançadas"
+      recover:
+        deleted_post_raw: "Por que é que @ %{discobot_username} eliminou a minha publicação? :angustiado:"
       details:
         reply: |-
           Ótimo trabalho — a sua atenção para o _detalhe_ é admirável!
diff --git a/plugins/discourse-presence/config/locales/server.pt.yml b/plugins/discourse-presence/config/locales/server.pt.yml
index ead949ccda..5cd4748927 100644
--- a/plugins/discourse-presence/config/locales/server.pt.yml
+++ b/plugins/discourse-presence/config/locales/server.pt.yml
@@ -7,5 +7,5 @@
 
 pt:
   site_settings:
-    presence_enabled: "Mostrar os utilizadores que estão a responder no tópico atual, ou a editar a publicação atual?"
+    presence_enabled: "Mostrar os utilizadores que estão a responder ao tópico atual, ou a editar a publicação atual?"
     presence_max_users_shown: "Número máximo de utilizadores exibidos."
diff --git a/plugins/poll/config/locales/client.it.yml b/plugins/poll/config/locales/client.it.yml
index 83768a1ec4..a70cc43ff8 100644
--- a/plugins/poll/config/locales/client.it.yml
+++ b/plugins/poll/config/locales/client.it.yml
@@ -26,6 +26,18 @@ it:
           title: "I risultati saranno mostrati a sondaggio <strong>chiuso</strong>."
         staff:
           title: "I risultati saranno mostrati solo ai membri dello <strong>staff</strong>"
+      multiple:
+        help:
+          at_least_min_options:
+            one: "Scegli almeno un&#39;opzione <strong>%{count}</strong> ."
+            other: "Scegli almeno <strong>%{count}</strong> opzioni."
+          up_to_max_options:
+            one: "Scegli fino a <strong>%{count}</strong> opzione."
+            other: "Scegli fino a <strong>%{count}</strong> opzioni."
+          x_options:
+            one: "Scegli <strong>%{count}</strong> opzione."
+            other: "Scegli <strong>%{count}</strong> opzioni."
+          between_min_and_max_options: "Scegli tra <strong>%{min}</strong> e <strong>%{max}</strong> opzioni."
       cast-votes:
         title: "Vota"
         label: "Vota!"
diff --git a/plugins/poll/config/locales/client.pt.yml b/plugins/poll/config/locales/client.pt.yml
index 128e06ade7..7fe0991943 100644
--- a/plugins/poll/config/locales/client.pt.yml
+++ b/plugins/poll/config/locales/client.pt.yml
@@ -9,22 +9,34 @@ pt:
   js:
     poll:
       voters:
-        one: "eleitor"
-        other: "eleitores"
+        one: "votante"
+        other: "votantes"
       total_votes:
         one: "total da votação"
         other: "total de votos"
       average_rating: "Classificação média: <strong>%{average}</strong>."
       public:
         title: "Os votos são <strong>públicos</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 as opções <strong>%{min}</strong> e <strong>%{max}</strong>."
       cast-votes:
-        title: "Votar"
+        title: "Vote"
         label: "Vote agora!"
       show-results:
         title: "Exibir os resultados da sondagem"
         label: "Mostrar resultados"
       hide-results:
-        title: "Voltar aos meus votos"
+        title: "Voltar para os seus votos"
         label: "Mostrar voto"
       group-results:
         title: "Agrupar votos por campo de utilizador"
@@ -42,18 +54,19 @@ pt:
         confirm: "Tem a certeza que deseja encerrar esta sondagem?"
       error_while_toggling_status: "Desculpe, ocorreu um erro ao alternar o estado desta sondagem."
       error_while_casting_votes: "Desculpe, ocorreu um erro ao submeter os seus votos."
-      error_while_fetching_voters: "Pedimos desculpa, ocorreu um erro ao apresentar os eleitores."
+      error_while_fetching_voters: "Desculpe, ocorreu um erro ao exibir os votantes."
       ui_builder:
         title: Criar Sondagem
         insert: Inserir Sondagem
         help:
+          options_count: Insira pelo menos uma opção
           invalid_values: O valor mínimo deve ser menor que o valor máximo.
           min_step_value: O valor mínimo é 1
         poll_type:
           label: Tipo
           regular: Escolha Única
           multiple: Escolha Múltipla
-          number: Cotação numérica
+          number: Classificação Numérica
         poll_result:
           label: Resultados
         poll_config:
@@ -63,4 +76,4 @@ pt:
         poll_public:
           label: Mostrar quem votou
         poll_options:
-          label: Escreva uma opção de sondagem por linha
+          label: Insira uma opção de sondagem por linha
diff --git a/plugins/poll/config/locales/server.pt.yml b/plugins/poll/config/locales/server.pt.yml
index e8686c92d3..f1804ef16d 100644
--- a/plugins/poll/config/locales/server.pt.yml
+++ b/plugins/poll/config/locales/server.pt.yml
@@ -9,11 +9,11 @@ pt:
   site_settings:
     poll_enabled: "Permitir sondagens?"
     poll_maximum_options: "Número máximo de opções permitidas numa sondagem."
-    poll_edit_window_mins: "Número de minutos após criação de publicação durante os quais sondagens podem ser editadas."
+    poll_edit_window_mins: "O número de minutos depois da criação da publicação durante os quais as sondagens podem ser editadas."
     poll_minimum_trust_level_to_create: "Defina o nível de confiança mínimo necessário para criar sondagens."
   poll:
-    multiple_polls_without_name: "Há múltiplas sondagens sem nome. Utilize o atributo '<code>nome</code>' para identificar as suas sondagens de maneira única."
-    multiple_polls_with_same_name: "Há múltiplas sondagens com o mesmo nome: <strong>%{name}</strong>. Utilize o atributo '<code>nome</code>' para identificar as suas sondagens de maneira única."
+    multiple_polls_without_name: "Existem várias sondagens sem nome. Utilize o atributo '<code>nome</code>' para identificar as suas sondagens de maneira única."
+    multiple_polls_with_same_name: "Existem várias sondagens com o mesmo nome: <strong>%{name}</strong>. Utilize o atributo '<code>nome</code>' para identificar as suas sondagens de maneira única."
     default_poll_must_have_less_options:
       one: "A sondagem deve ter menos que %{count} opção."
       other: "A sondagem deve ter menos que %{count} opções."
@@ -26,12 +26,12 @@ pt:
     named_poll_with_multiple_choices_has_invalid_parameters: "A sondagem com o nome <strong>%{name}</strong> com escolha múltipla tem parâmetros inválidos."
     requires_at_least_1_valid_option: "Deve selecionar pelo menos 1 opção válida."
     no_poll_with_this_name: "Nenhuma sondagem com o nome <strong>%{name}</strong> está associada a esta publicação."
-    post_is_deleted: "Não é possível realizar ações em publicações eliminadas."
+    post_is_deleted: "Não é possível realizar ações na publicação eliminada."
     user_cant_post_in_topic: "Não pode votar porque não pode publicar neste tópico."
-    topic_must_be_open_to_vote: "O tópico tem que estar aberto para votar."
-    poll_must_be_open_to_vote: "A votação deve estar aberta para votação."
+    topic_must_be_open_to_vote: "O tópico tem que estar aberto para votação."
+    poll_must_be_open_to_vote: "A sondagem deve estar aberta para votação."
     topic_must_be_open_to_toggle_status: "O tópico tem que estar aberto para alternar o estado."
-    only_staff_or_op_can_toggle_status: "Apenas um membro da equipa de apoio ou o autor original pode alternar o estado da sondagem."
+    only_staff_or_op_can_toggle_status: "Apenas um membro da equipa ou o autor original pode alternar o estado da sondagem."
     insufficient_rights_to_create: "Não está autorizado para criar sondagens."
     email:
       link_to_poll: "Clique para ver a sondagem."
diff --git a/public/422.pt.html b/public/422.pt.html
index 240dd474de..e67c8ec854 100644
--- a/public/422.pt.html
+++ b/public/422.pt.html
@@ -20,7 +20,7 @@
   <!-- This file lives in public/422.html -->
   <div class="dialog">
     <h1>A alteração que solicitou foi rejeitada.</h1>
-    <p>Talvez tenha tentado alterar algo a que não tem acesso.</p>
+    <p>Talvez tenha tentado alterar algo que não tinha acesso.</p>
   </div>
 </body>
 </html>
diff --git a/public/500.pt.html b/public/500.pt.html
index e4f7981f33..8d6502f49e 100644
--- a/public/500.pt.html
+++ b/public/500.pt.html
@@ -5,8 +5,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Oops</h1>
-    <p>O software que sustenta este fórum de discussão encontrou um problema inesperado. Nós pedimos desculpa pelo inconveniente.</p>
+    <h1>Ups!</h1>
+    <p>O ''software'' que controla este fórum de discussão encontrou um problema inesperado. Nós pedimos desculpa pelo inconveniente.</p>
     <p>A informação detalhada sobre o erro foi registada, e foi gerada uma notificação automática. Nós iremos verificar o mesmo.</p>
     <p>Nenhuma ação adicional é necessária. No entanto, se a condição de erro persistir, pode fornecer detalhes adicionais, incluindo as etapas para reproduzir o erro, publicando um tópico de discussão na categoria de retorno do sítio.</p>
 </body>
diff --git a/public/503.pt.html b/public/503.pt.html
index aff933211b..b3006565a6 100644
--- a/public/503.pt.html
+++ b/public/503.pt.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>O site está em Manutenção - Discourse.org</title>
+<title>O ''site'' está em «Manutenção» - Discourse.org</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Estamos em baixo para realizar uma manutenção planeada do sítio</h1>
-    <p>Por favor volte <span id="when-to-check-back"> em alguns minutos</span>.</p>
-    <p id="apology">Pedimos desculpa pelo inconveniente!</p>
+    <h1>Nós estamos em baixo para uma manutenção planeada do ''site''</h1>
+    <p>Por favor, volte <span id="when-to-check-back">em alguns minutos</span>.</p>
+    <p id="apology">Desculpe pela inconveniência!</p>
 </body>
 </html>

From 1303e89a72d7b104d17dd900ce91ed1dff6c2d49 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 15 Jun 2020 01:44:41 +0200
Subject: [PATCH 1678/1830] DEV: Fix a composer state leak in tests

This is the one that made discourse-encrypt tests (and all subsequent tests) hang.
---
 test/javascripts/acceptance/composer-actions-test.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/javascripts/acceptance/composer-actions-test.js b/test/javascripts/acceptance/composer-actions-test.js
index 95060ba67a..f421ec41b1 100644
--- a/test/javascripts/acceptance/composer-actions-test.js
+++ b/test/javascripts/acceptance/composer-actions-test.js
@@ -16,6 +16,9 @@ acceptance("Composer Actions", {
   },
   beforeEach() {
     _clearSnapshots();
+  },
+  afterEach() {
+    _clearSnapshots();
   }
 });
 
@@ -386,6 +389,9 @@ acceptance("Composer Actions With New Topic Draft", {
   },
   beforeEach() {
     _clearSnapshots();
+  },
+  afterEach() {
+    _clearSnapshots();
   }
 });
 

From 0ff86b00cb923b4fb50338d1a313996cf6722dfd Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 15 Jun 2020 09:57:44 +0800
Subject: [PATCH 1679/1830] DEV: Upgrade Redis to 4.2.1.

---
 Gemfile.lock                              |  2 +-
 config/initializers/002-rails_failover.rb |  2 +-
 lib/admin_confirmation.rb                 |  2 +-
 lib/cache.rb                              |  2 +-
 lib/discourse.rb                          |  2 +-
 lib/discourse_redis.rb                    | 17 +++++++--------
 spec/components/discourse_redis_spec.rb   | 25 -----------------------
 7 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e4fd8ddb57..b181c5e4aa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -310,7 +310,7 @@ GEM
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
     rchardet (1.8.0)
-    redis (4.1.4)
+    redis (4.2.1)
     redis-namespace (1.7.0)
       redis (>= 3.0.4)
     regexp_parser (1.7.1)
diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index c8f1cfb192..6952bc95f0 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -70,7 +70,7 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
   end
 
   RailsFailover::ActiveRecord.register_force_reading_role_callback do
-    Discourse.redis.exists(
+    Discourse.redis.exists?(
       Discourse::PG_READONLY_MODE_KEY,
       Discourse::PG_FORCE_READONLY_MODE_KEY
     )
diff --git a/lib/admin_confirmation.rb b/lib/admin_confirmation.rb
index dc132b72f7..28f305b5ad 100644
--- a/lib/admin_confirmation.rb
+++ b/lib/admin_confirmation.rb
@@ -43,7 +43,7 @@ class AdminConfirmation
   end
 
   def self.exists_for?(user_id)
-    Discourse.redis.exists "admin-confirmation:#{user_id}"
+    Discourse.redis.exists? "admin-confirmation:#{user_id}"
   end
 
   def self.find_by_code(token)
diff --git a/lib/cache.rb b/lib/cache.rb
index 9e76ea6eac..faae643f4c 100644
--- a/lib/cache.rb
+++ b/lib/cache.rb
@@ -56,7 +56,7 @@ class Cache
 
   def exist?(name)
     key = normalize_key(name)
-    redis.exists(key)
+    redis.exists?(key)
   end
 
   # this removes a bunch of stuff we do not need like instrumentation and versioning
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 11c10e946a..2382acb2c4 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -487,7 +487,7 @@ module Discourse
   end
 
   def self.readonly_mode?(keys = READONLY_KEYS)
-    recently_readonly? || Discourse.redis.exists(*keys)
+    recently_readonly? || Discourse.redis.exists?(*keys)
   end
 
   def self.pg_readonly_mode?
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index 096c86b574..53a04905f3 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -207,17 +207,14 @@ class DiscourseRedis
     end
   end
 
-  # Implement our own because https://github.com/redis/redis-rb/issues/698 has stalled
-  def exists(*keys)
-    keys.map! { |a| "#{namespace}:#{a}" }  if @namespace
+  def exists(*args)
+    args.map! { |a| "#{namespace}:#{a}" } if @namespace
+    DiscourseRedis.ignore_readonly { @redis.exists(*args) }
+  end
 
-    DiscourseRedis.ignore_readonly do
-      @redis.synchronize do |client|
-        client.call([:exists, *keys]) do |value|
-          value > 0
-        end
-      end
-    end
+  def exists?(*args)
+    args.map! { |a| "#{namespace}:#{a}" } if @namespace
+    DiscourseRedis.ignore_readonly { @redis.exists?(*args) }
   end
 
   def mget(*args)
diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb
index 8e4411653b..abc9a5917a 100644
--- a/spec/components/discourse_redis_spec.rb
+++ b/spec/components/discourse_redis_spec.rb
@@ -87,31 +87,6 @@ describe DiscourseRedis do
         expect(Discourse.recently_readonly?).to eq(true)
       end
     end
-
-    describe '.exists' do
-      it 'should return false when key is not present' do
-        expect(Discourse.redis.exists('test')).to eq(false)
-      end
-
-      it 'should return false when keys are not present' do
-        expect(Discourse.redis.exists('test', 'test2')).to eq(false)
-      end
-
-      it 'should return true when key is present' do
-        Discourse.redis.set('test', 1)
-
-        expect(Discourse.redis.exists('test')).to eq(true)
-      end
-
-      it 'should return true when any key is present' do
-        Discourse.redis.set('test', 1)
-        Discourse.redis.set('test2', 1)
-
-        expect(Discourse.redis.exists('test')).to eq(true)
-        expect(Discourse.redis.exists('test', 'test2')).to eq(true)
-        expect(Discourse.redis.exists('test2', 'test3')).to eq(true)
-      end
-    end
   end
 
   context '.slave_host' do

From 35a157619aca8ffed1af6f044987092b7494ad80 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Mon, 15 Jun 2020 14:06:03 +1000
Subject: [PATCH 1680/1830] FEATURE: Add "Now" as an option (default hidden) to
 the future date input selector (#10047)

Sometimes you need to schedule things from now onward. "Now" in this case is now + 1 minute. this option is hidden by default.
---
 .../app/templates/components/future-date-input.hbs        | 1 +
 .../addon/components/future-date-input-selector.js        | 8 ++++++++
 config/locales/client.en.yml                              | 1 +
 3 files changed, 10 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
index 6e6b117e08..97bb5ef438 100644
--- a/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
@@ -11,6 +11,7 @@
         includeWeekend=includeWeekend
         includeFarFuture=includeFarFuture
         includeMidFuture=includeMidFuture
+        includeNow=includeNow
         clearable=clearable
         none="topic.auto_update_input.none"
         onChangeInput=onChangeInput
diff --git a/app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js
index a2770936e5..7e286a1f2c 100644
--- a/app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js
+++ b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js
@@ -18,6 +18,13 @@ function buildTimeframe(opts) {
 }
 
 export const TIMEFRAMES = [
+  buildTimeframe({
+    id: "now",
+    format: "h:mm a",
+    enabled: opts => opts.canScheduleNow,
+    when: time => time.add(1, "minute"),
+    icon: "magic"
+  }),
   buildTimeframe({
     id: "later_today",
     format: "h a",
@@ -214,6 +221,7 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
       includeFarFuture: this.includeFarFuture,
       includeDateTime: this.includeDateTime,
       includeBasedOnLastPost: this.statusType === CLOSE_STATUS_TYPE,
+      canScheduleNow: this.includeNow || false,
       canScheduleToday: 24 - now.hour() > 6
     };
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 104edd8793..56088fe45c 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2225,6 +2225,7 @@ en:
         time_frame_required: Please select a time frame
       auto_update_input:
         none: "Select a timeframe"
+        now: "Now"
         later_today: "Later today"
         tomorrow: "Tomorrow"
         later_this_week: "Later this week"

From d8cd912769f2dd5c5e16faf5cceee77b524a82e0 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 15 Jun 2020 14:33:30 +0800
Subject: [PATCH 1681/1830] DEV: Switch to db config to disable advisory locks.

---
 app/models/global_setting.rb              |  1 +
 config/discourse_defaults.conf            |  2 ++
 lib/freedom_patches/postgresql_adapter.rb | 10 ----------
 3 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 lib/freedom_patches/postgresql_adapter.rb

diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index c32b2b2e08..1d8df22679 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -151,6 +151,7 @@ class GlobalSetting
     hash["prepared_statements"] = !!self.db_prepared_statements
     hash["idle_timeout"] = connection_reaper_age if connection_reaper_age.present?
     hash["reaping_frequency"] = connection_reaper_interval if connection_reaper_interval.present?
+    hash["advisory_locks"] = !!self.db_advisory_locks
 
     { "production" => hash }
   end
diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf
index b2b2aff03e..b714d8161e 100644
--- a/config/discourse_defaults.conf
+++ b/config/discourse_defaults.conf
@@ -59,6 +59,8 @@ db_replica_host =
 # port running replica db server, defaults to 5432 if not set
 db_replica_port =
 
+db_advisory_locks = true
+
 # hostname running the forum
 hostname = "www.example.com"
 
diff --git a/lib/freedom_patches/postgresql_adapter.rb b/lib/freedom_patches/postgresql_adapter.rb
deleted file mode 100644
index c790461f93..0000000000
--- a/lib/freedom_patches/postgresql_adapter.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-# Awaiting decision on https://github.com/rails/rails/issues/31190
-if ENV['DISABLE_MIGRATION_ADVISORY_LOCK']
-  class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-    def supports_advisory_locks?
-      false
-    end
-  end
-end

From 6780d4d70c73acb8b2010d704e99907cf7edfe2f Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 15 Jun 2020 11:58:05 +0530
Subject: [PATCH 1682/1830] FIX: process /invites/ route from server side only

---
 app/assets/javascripts/discourse/app/lib/url.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/url.js b/app/assets/javascripts/discourse/app/lib/url.js
index 499b5d745c..ae73638a70 100644
--- a/app/assets/javascripts/discourse/app/lib/url.js
+++ b/app/assets/javascripts/discourse/app/lib/url.js
@@ -30,7 +30,8 @@ const SERVER_SIDE_ONLY = [
   /^\/admin\/upgrade$/,
   /^\/logs($|\/)/,
   /^\/admin\/logs\/watched_words\/action\/[^\/]+\/download$/,
-  /^\/pub\//
+  /^\/pub\//,
+  /^\/invites\//
 ];
 
 export function rewritePath(path) {

From 58e52c0e4fd5fcd35627fa89db48a5719cfa3e45 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 11 Jun 2020 13:45:46 +0800
Subject: [PATCH 1683/1830] DEV: Use rails_failover gem for ActiveRecord and
 Redis failover handling

---
 Gemfile                                       |   2 +-
 Gemfile.lock                                  |  13 +-
 app/models/global_setting.rb                  |  30 +--
 config/application.rb                         |  10 +-
 config/initializers/002-rails_failover.rb     | 112 ++++-------
 config/initializers/200-first_middlewares.rb  |  11 +-
 .../postgresql_fallback_adapter.rb            | 190 ------------------
 lib/discourse.rb                              |  32 ++-
 lib/discourse_redis.rb                        | 147 --------------
 lib/freedom_patches/zeitwerk.rb               |   1 -
 spec/models/global_setting_spec.rb            |   2 +-
 11 files changed, 84 insertions(+), 466 deletions(-)
 delete mode 100644 lib/active_record/connection_adapters/postgresql_fallback_adapter.rb

diff --git a/Gemfile b/Gemfile
index 8e4acf64cd..4d809fda20 100644
--- a/Gemfile
+++ b/Gemfile
@@ -250,4 +250,4 @@ gem 'webpush', require: false
 gem 'colored2', require: false
 gem 'maxminddb'
 
-gem 'rails_failover', require: false, git: 'https://github.com/discourse/rails_failover'
+gem 'rails_failover', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index b181c5e4aa..d838afb0fc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,3 @@
-GIT
-  remote: https://github.com/discourse/rails_failover
-  revision: 66602aa73785851b81c506f0023d3c2a2e40de0a
-  specs:
-    rails_failover (0.4.0)
-      activerecord (~> 6.0)
-      railties (~> 6.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -288,6 +280,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
+    rails_failover (0.5.0)
+      activerecord (~> 6.0)
+      railties (~> 6.0)
     rails_multisite (2.3.0)
       activerecord (> 5.0, < 7)
       railties (> 5.0, < 7)
@@ -526,7 +521,7 @@ DEPENDENCIES
   rack (= 2.2.2)
   rack-mini-profiler
   rack-protection
-  rails_failover!
+  rails_failover
   rails_multisite
   railties (= 6.0.3.1)
   rake
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index 1d8df22679..dc660fce50 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -134,12 +134,6 @@ class GlobalSetting
       end
     end
 
-    if hash["replica_host"]
-      if !ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
-        hash["adapter"] = "postgresql_fallback"
-      end
-    end
-
     hostnames = [ hostname ]
     hostnames << backup_hostname if backup_hostname.present?
 
@@ -170,15 +164,9 @@ class GlobalSetting
         c[:port] = redis_port if redis_port
 
         if redis_slave_host && redis_slave_port
-          if ENV["REDIS_RAILS_FAILOVER"]
-            c[:replica_host] = redis_slave_host
-            c[:replica_port] = redis_slave_port
-            c[:connector] = RailsFailover::Redis::Connector
-          else
-            c[:slave_host] = redis_slave_host
-            c[:slave_port] = redis_slave_port
-            c[:connector] = DiscourseRedis::Connector
-          end
+          c[:replica_host] = redis_slave_host
+          c[:replica_port] = redis_slave_port
+          c[:connector] = RailsFailover::Redis::Connector
         end
 
         c[:password] = redis_password if redis_password.present?
@@ -200,15 +188,9 @@ class GlobalSetting
         c[:port] = message_bus_redis_port if message_bus_redis_port
 
         if message_bus_redis_slave_host && message_bus_redis_slave_port
-          if ENV["REDIS_RAILS_FAILOVER"]
-            c[:replica_host] = message_bus_redis_slave_host
-            c[:replica_port] = message_bus_redis_slave_port
-            c[:connector] = RailsFailover::Redis::Connector
-          else
-            c[:slave_host] = message_bus_redis_slave_host
-            c[:slave_port] = message_bus_redis_slave_port
-            c[:connector] = DiscourseRedis::Connector
-          end
+          c[:replica_host] = message_bus_redis_slave_host
+          c[:replica_port] = message_bus_redis_slave_port
+          c[:connector] = RailsFailover::Redis::Connector
         end
 
         c[:password] = message_bus_redis_password if message_bus_redis_password.present?
diff --git a/config/application.rb b/config/application.rb
index a93c86c258..0e17596d8d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -19,6 +19,8 @@ require 'action_controller/railtie'
 require 'action_view/railtie'
 require 'action_mailer/railtie'
 require 'sprockets/railtie'
+require 'rails_failover/active_record'
+require 'rails_failover/redis'
 
 # Plugin related stuff
 require_relative '../lib/plugin_initialization_guard'
@@ -27,14 +29,6 @@ require_relative '../lib/discourse_plugin_registry'
 
 require_relative '../lib/plugin_gem'
 
-if ENV['ACTIVE_RECORD_RAILS_FAILOVER']
-  require 'rails_failover/active_record'
-end
-
-if ENV['REDIS_RAILS_FAILOVER']
-  require 'rails_failover/redis'
-end
-
 # Global config
 require_relative '../app/models/global_setting'
 GlobalSetting.configure!
diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index 6952bc95f0..1c0edc93e6 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -1,81 +1,51 @@
 # frozen_string_literal: true
 
-if ENV["REDIS_RAILS_FAILOVER"]
-  message_bus_keepalive_interval = nil
+message_bus_keepalive_interval = nil
 
-  RailsFailover::Redis.on_failover do
-    message_bus_keepalive_interval = MessageBus.keepalive_interval
-    MessageBus.keepalive_interval = -1 # Disable MessageBus keepalive_interval
-    Discourse.received_redis_readonly!
-  end
+RailsFailover::Redis.on_failover do
+  message_bus_keepalive_interval = MessageBus.keepalive_interval
+  MessageBus.keepalive_interval = -1 # Disable MessageBus keepalive_interval
+  Discourse.received_redis_readonly!
+end
 
-  RailsFailover::Redis.on_fallback do
-    Discourse.clear_redis_readonly!
-    Discourse.request_refresh!
-    MessageBus.keepalive_interval = message_bus_keepalive_interval
+RailsFailover::Redis.on_fallback do
+  Discourse.clear_redis_readonly!
+  Discourse.request_refresh!
+  MessageBus.keepalive_interval = message_bus_keepalive_interval
+end
+
+if Rails.configuration.multisite
+  if ActiveRecord::Base.current_role == ActiveRecord::Base.reading_role
+    RailsMultisite::ConnectionManagement.default_connection_handler =
+      ActiveRecord::Base.connection_handlers[ActiveRecord::Base.reading_role]
   end
 end
 
-if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
+RailsFailover::ActiveRecord.on_failover do
+  RailsMultisite::ConnectionManagement.each_connection do
+    Discourse.enable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+    Sidekiq.pause!("pg_failover") if !Sidekiq.paused?
+  end
+end
+
+RailsFailover::ActiveRecord.on_fallback do
+  RailsMultisite::ConnectionManagement.each_connection do
+    Discourse.disable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+    Sidekiq.unpause! if Sidekiq.paused?
+  end
+
   if Rails.configuration.multisite
-    if ActiveRecord::Base.current_role == ActiveRecord::Base.reading_role
-      RailsMultisite::ConnectionManagement.default_connection_handler =
-        ActiveRecord::Base.connection_handlers[ActiveRecord::Base.reading_role]
-    end
-  end
-
-  RailsFailover::ActiveRecord.on_failover do
-    RailsMultisite::ConnectionManagement.each_connection do
-      Discourse.enable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
-      Sidekiq.pause!("pg_failover") if !Sidekiq.paused?
-    end
-  rescue => e
-    Rails.logger.warn "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"
-    false
-  end
-
-  RailsFailover::ActiveRecord.on_fallback do
-    RailsMultisite::ConnectionManagement.each_connection do
-      Discourse.disable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
-      Sidekiq.unpause! if Sidekiq.paused?
-    end
-
-    if Rails.configuration.multisite
-      RailsMultisite::ConnectionManagement.default_connection_handler =
-        ActiveRecord::Base.connection_handlers[ActiveRecord::Base.writing_role]
-    end
-  rescue => e
-    Rails.logger.warn "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"
-    false
-  end
-
-  module Discourse
-    PG_FORCE_READONLY_MODE_KEY ||= 'readonly_mode:postgres_force'
-
-    READONLY_KEYS.push(PG_FORCE_READONLY_MODE_KEY)
-
-    def self.enable_pg_force_readonly_mode
-      Discourse.redis.set(PG_FORCE_READONLY_MODE_KEY, 1)
-      Sidekiq.pause!("pg_failover") if !Sidekiq.paused?
-      MessageBus.publish(readonly_channel, true)
-      true
-    end
-
-    def self.disable_pg_force_readonly_mode
-      result = Discourse.redis.del(PG_FORCE_READONLY_MODE_KEY)
-      Sidekiq.unpause!
-      MessageBus.publish(readonly_channel, false)
-      result > 0
-    end
-  end
-
-  RailsFailover::ActiveRecord.register_force_reading_role_callback do
-    Discourse.redis.exists?(
-      Discourse::PG_READONLY_MODE_KEY,
-      Discourse::PG_FORCE_READONLY_MODE_KEY
-    )
-  rescue => e
-    Rails.logger.warn "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"
-    false
+    RailsMultisite::ConnectionManagement.default_connection_handler =
+      ActiveRecord::Base.connection_handlers[ActiveRecord::Base.writing_role]
   end
 end
+
+RailsFailover::ActiveRecord.register_force_reading_role_callback do
+  Discourse.redis.exists?(
+    Discourse::PG_READONLY_MODE_KEY,
+    Discourse::PG_FORCE_READONLY_MODE_KEY
+  )
+rescue => e
+  Rails.logger.warn "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"
+  false
+end
diff --git a/config/initializers/200-first_middlewares.rb b/config/initializers/200-first_middlewares.rb
index 5fada923cd..57ef2aecbf 100644
--- a/config/initializers/200-first_middlewares.rb
+++ b/config/initializers/200-first_middlewares.rb
@@ -24,12 +24,7 @@ if Rails.configuration.multisite
   # Multisite needs to be first, because the request tracker and message bus rely on it
   Rails.configuration.middleware.unshift RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config
   Rails.configuration.middleware.delete ActionDispatch::Executor
-end
-
-if ENV["ACTIVE_RECORD_RAILS_FAILOVER"]
-  if Rails.configuration.multisite
-    Rails.configuration.middleware.insert_after(RailsMultisite::Middleware, RailsFailover::ActiveRecord::Middleware)
-  else
-    Rails.configuration.middleware.insert_before(MessageBus::Rack::Middleware, RailsFailover::ActiveRecord::Middleware)
-  end
+  Rails.configuration.middleware.insert_after(RailsMultisite::Middleware, RailsFailover::ActiveRecord::Middleware)
+else
+  Rails.configuration.middleware.insert_before(MessageBus::Rack::Middleware, RailsFailover::ActiveRecord::Middleware)
 end
diff --git a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
deleted file mode 100644
index 7cc4dce92b..0000000000
--- a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
+++ /dev/null
@@ -1,190 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_record/connection_adapters/abstract_adapter'
-require 'active_record/connection_adapters/postgresql_adapter'
-require 'discourse'
-require 'sidekiq/pausable'
-
-class PostgreSQLFallbackHandler
-  include Singleton
-
-  attr_reader :masters_down
-  attr_accessor :initialized
-
-  DATABASE_DOWN_CHANNEL = '/global/database_down'
-
-  def initialize
-    @masters_down = DistributedCache.new('masters_down', namespace: false)
-    @mutex = Mutex.new
-    @initialized = false
-
-    MessageBus.subscribe(DATABASE_DOWN_CHANNEL) do |payload|
-      if @initialized && payload.data["pid"].to_i != Process.pid
-        begin
-          RailsMultisite::ConnectionManagement.with_connection(payload.data['db']) do
-            clear_connections
-          end
-        rescue PG::UnableToSend
-          # Site has already failed over
-        end
-      end
-    end
-  end
-
-  def verify_master
-    synchronize do
-      return if @thread && @thread.alive?
-
-      @thread = Thread.new do
-        while true do
-          thread = Thread.new { initiate_fallback_to_master }
-          thread.abort_on_exception = true
-          thread.join
-          break if synchronize { @masters_down.hash.empty? }
-          sleep 5
-        end
-      end
-
-      @thread.abort_on_exception = true
-    end
-  end
-
-  def master_down?
-    synchronize { @masters_down[namespace] }
-  end
-
-  def master_down
-    synchronize do
-      @masters_down[namespace] = true
-      Sidekiq.pause!("pg_failover") if !Sidekiq.paused?
-      MessageBus.publish(DATABASE_DOWN_CHANNEL, db: namespace, pid: Process.pid)
-    end
-  end
-
-  def master_up(namespace)
-    synchronize { @masters_down.delete(namespace, publish: false) }
-  end
-
-  def initiate_fallback_to_master
-    begin
-      unless @initialized
-        @initialized = true
-        return
-      end
-
-      @masters_down.hash.keys.each do |key|
-        RailsMultisite::ConnectionManagement.with_connection(key) do
-          begin
-            logger.warn "#{log_prefix}: Checking master server..."
-            is_connection_active = false
-
-            begin
-              connection = ActiveRecord::Base.postgresql_connection(config)
-              is_connection_active = connection.active?
-            ensure
-              connection.disconnect! if connection
-            end
-
-            if is_connection_active
-              logger.warn "#{log_prefix}: Master server is active. Reconnecting..."
-              self.master_up(key)
-              clear_connections
-              disable_readonly_mode
-              Sidekiq.unpause!
-            end
-          rescue => e
-            logger.warn "#{log_prefix}: Connection to master PostgreSQL server failed with '#{e.message}'"
-          end
-        end
-      end
-    rescue => e
-      logger.warn "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"
-    end
-  end
-
-  # Use for testing
-  def setup!
-    @masters_down.clear
-    disable_readonly_mode
-  end
-
-  def clear_connections
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  private
-
-  def disable_readonly_mode
-    Discourse.disable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
-  end
-
-  def config
-    ActiveRecord::Base.connection_config
-  end
-
-  def logger
-    Rails.logger
-  end
-
-  def log_prefix
-    "#{self.class} [#{namespace}]"
-  end
-
-  def namespace
-    RailsMultisite::ConnectionManagement.current_db
-  end
-
-  def synchronize
-    @mutex.synchronize { yield }
-  end
-end
-
-module ActiveRecord
-  module ConnectionHandling
-    def postgresql_fallback_connection(config)
-      return postgresql_connection(config) if ARGV.include?("db:migrate")
-      fallback_handler = ::PostgreSQLFallbackHandler.instance
-      config = config.symbolize_keys
-
-      if fallback_handler.master_down?
-        Discourse.enable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
-        fallback_handler.verify_master
-        connection = replica_postgresql_connection(config)
-      else
-        begin
-          connection = postgresql_connection(config)
-          fallback_handler.initialized ||= true
-        rescue ::ActiveRecord::NoDatabaseError, PG::ConnectionBad => e
-          fallback_handler.master_down
-          fallback_handler.verify_master
-
-          if !fallback_handler.initialized
-            return postgresql_fallback_connection(config)
-          else
-            raise e
-          end
-        end
-      end
-
-      connection
-    end
-
-    def replica_postgresql_connection(config)
-      config = config.dup.merge(
-        host: config[:replica_host],
-        port: config[:replica_port]
-      )
-
-      connection = postgresql_connection(config)
-      verify_replica(connection)
-      connection
-    end
-
-    private
-
-    def verify_replica(connection)
-      value = connection.exec_query("SELECT pg_is_in_recovery()").rows[0][0]
-      raise "Replica database server is not in recovery mode." if !value
-    end
-  end
-end
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 2382acb2c4..bcdcecc800 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -428,19 +428,21 @@ module Discourse
     alias_method :base_url_no_path, :base_url_no_prefix
   end
 
-  READONLY_MODE_KEY_TTL  ||= 60
-  READONLY_MODE_KEY      ||= 'readonly_mode'
-  PG_READONLY_MODE_KEY   ||= 'readonly_mode:postgres'
-  USER_READONLY_MODE_KEY ||= 'readonly_mode:user'
+  READONLY_MODE_KEY_TTL      ||= 60
+  READONLY_MODE_KEY          ||= 'readonly_mode'
+  PG_READONLY_MODE_KEY       ||= 'readonly_mode:postgres'
+  USER_READONLY_MODE_KEY     ||= 'readonly_mode:user'
+  PG_FORCE_READONLY_MODE_KEY ||= 'readonly_mode:postgres_force'
 
   READONLY_KEYS ||= [
     READONLY_MODE_KEY,
     PG_READONLY_MODE_KEY,
-    USER_READONLY_MODE_KEY
+    USER_READONLY_MODE_KEY,
+    PG_FORCE_READONLY_MODE_KEY
   ]
 
   def self.enable_readonly_mode(key = READONLY_MODE_KEY)
-    if key == USER_READONLY_MODE_KEY
+    if key == USER_READONLY_MODE_KEY || key == PG_FORCE_READONLY_MODE_KEY
       Discourse.redis.set(key, 1)
     else
       Discourse.redis.setex(key, READONLY_MODE_KEY_TTL, 1)
@@ -486,6 +488,24 @@ module Discourse
     true
   end
 
+  def self.enable_pg_force_readonly_mode
+    RailsMultisite::ConnectionManagement.each_connection do
+      enable_readonly_mode(PG_FORCE_READONLY_MODE_KEY)
+      Sidekiq.pause!("pg_failover") if !Sidekiq.paused?
+    end
+
+    true
+  end
+
+  def self.disable_pg_force_readonly_mode
+    RailsMultisite::ConnectionManagement.each_connection do
+      disable_readonly_mode(PG_FORCE_READONLY_MODE_KEY)
+      Sidekiq.unpause!
+    end
+
+    true
+  end
+
   def self.readonly_mode?(keys = READONLY_KEYS)
     recently_readonly? || Discourse.redis.exists?(*keys)
   end
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index 53a04905f3..33390d4ca6 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -5,141 +5,6 @@
 #
 
 class DiscourseRedis
-  class FallbackHandler
-    include Singleton
-
-    MASTER_ROLE_STATUS = "role:master"
-    MASTER_LOADING_STATUS = "loading:1"
-    MASTER_LOADED_STATUS = "loading:0"
-    CONNECTION_TYPES = %w{normal pubsub}
-
-    def initialize
-      @master = true
-      @running = false
-      @mutex = Mutex.new
-      @slave_config = DiscourseRedis.slave_config
-      @message_bus_keepalive_interval = MessageBus.keepalive_interval
-    end
-
-    def verify_master
-      synchronize do
-        return if @thread && @thread.alive?
-
-        @thread = Thread.new do
-          loop do
-            begin
-              thread = Thread.new { initiate_fallback_to_master }
-              thread.join
-              break if synchronize { @master }
-              sleep 5
-            ensure
-              thread.kill
-            end
-          end
-        end
-      end
-    end
-
-    def initiate_fallback_to_master
-      success = false
-
-      begin
-        redis_config = DiscourseRedis.config.dup
-        redis_config.delete(:connector)
-        master_client = ::Redis::Client.new(redis_config)
-        logger.warn "#{log_prefix}: Checking connection to master server..."
-        info = master_client.call([:info])
-
-        if info.include?(MASTER_LOADED_STATUS) && info.include?(MASTER_ROLE_STATUS)
-          begin
-            logger.warn "#{log_prefix}: Master server is active, killing all connections to slave..."
-
-            self.master = true
-            slave_client = ::Redis::Client.new(@slave_config)
-
-            CONNECTION_TYPES.each do |connection_type|
-              slave_client.call([:client, [:kill, 'type', connection_type]])
-            end
-
-            MessageBus.keepalive_interval = @message_bus_keepalive_interval
-            Discourse.clear_readonly!
-            Discourse.request_refresh!
-            success = true
-          ensure
-            slave_client&.disconnect
-          end
-        end
-      rescue => e
-        logger.warn "#{log_prefix}: Connection to Master server failed with '#{e.message}'"
-      ensure
-        master_client&.disconnect
-      end
-
-      success
-    end
-
-    def master
-      synchronize { @master }
-    end
-
-    def master=(args)
-      synchronize do
-        @master = args
-
-        # Disables MessageBus keepalive when Redis is in readonly mode
-        MessageBus.keepalive_interval = 0 if !@master
-      end
-    end
-
-    private
-
-    def synchronize
-      @mutex.synchronize { yield }
-    end
-
-    def logger
-      Rails.logger
-    end
-
-    def log_prefix
-      "#{self.class}"
-    end
-  end
-
-  class Connector < Redis::Client::Connector
-    def initialize(options)
-      super(options)
-      @slave_options = DiscourseRedis.slave_config(options)
-      @fallback_handler = DiscourseRedis::FallbackHandler.instance
-    end
-
-    def resolve(client = nil)
-      if !@fallback_handler.master
-        @fallback_handler.verify_master
-        return @slave_options
-      end
-
-      begin
-        options = @options.dup
-        options.delete(:connector)
-        client ||= Redis::Client.new(options)
-
-        loading = client.call([:info, :persistence]).include?(
-          DiscourseRedis::FallbackHandler::MASTER_LOADING_STATUS
-        )
-
-        loading ? @slave_options : @options
-      rescue Redis::ConnectionError, Redis::CannotConnectError, RuntimeError => ex
-        raise ex if ex.class == RuntimeError && ex.message != "Name or service not known"
-        @fallback_handler.master = false
-        @fallback_handler.verify_master
-        raise ex
-      ensure
-        client.disconnect
-      end
-    end
-  end
-
   def self.raw_connection(config = nil)
     config ||= self.config
     Redis.new(config)
@@ -149,20 +14,12 @@ class DiscourseRedis
     GlobalSetting.redis_config
   end
 
-  def self.slave_config(options = config)
-    options.dup.merge!(host: options[:slave_host], port: options[:slave_port])
-  end
-
   def initialize(config = nil, namespace: true)
     @config = config || DiscourseRedis.config
     @redis = DiscourseRedis.raw_connection(@config.dup)
     @namespace = namespace
   end
 
-  def self.fallback_handler
-    @fallback_handler ||= DiscourseRedis::FallbackHandler.instance
-  end
-
   def without_namespace
     # Only use this if you want to store and fetch data that's shared between sites
     @redis
@@ -172,10 +29,6 @@ class DiscourseRedis
     yield
   rescue Redis::CommandError => ex
     if ex.message =~ /READONLY/
-      if !ENV["REDIS_RAILS_FAILOVER"]
-        fallback_handler.verify_master if !fallback_handler.master
-      end
-
       Discourse.received_redis_readonly!
       nil
     else
diff --git a/lib/freedom_patches/zeitwerk.rb b/lib/freedom_patches/zeitwerk.rb
index cf1ddc186d..92a066b833 100644
--- a/lib/freedom_patches/zeitwerk.rb
+++ b/lib/freedom_patches/zeitwerk.rb
@@ -9,7 +9,6 @@ module ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector
     'onpdiff' => 'ONPDiff',
     'onceoff' => 'Jobs',
     'pop3_polling_enabled_setting_validator' => 'POP3PollingEnabledSettingValidator',
-    'postgresql_fallback_adapter' => 'PostgreSQLFallbackHandler',
     'regular' => 'Jobs',
     'scheduled' => 'Jobs',
     'topic_query_sql' => 'TopicQuerySQL',
diff --git a/spec/models/global_setting_spec.rb b/spec/models/global_setting_spec.rb
index d923d6e31d..8802418277 100644
--- a/spec/models/global_setting_spec.rb
+++ b/spec/models/global_setting_spec.rb
@@ -86,7 +86,7 @@ describe GlobalSetting do
         GlobalSetting.expects(:redis_slave_port).returns(6379).at_least_once
         GlobalSetting.expects(:redis_slave_host).returns('0.0.0.0').at_least_once
 
-        expect(GlobalSetting.redis_config[:connector]).to eq(DiscourseRedis::Connector)
+        expect(GlobalSetting.redis_config[:connector]).to eq(RailsFailover::Redis::Connector)
       end
     end
   end

From e0fdf415376770afe54f57e7ab88f0a78ce9b9af Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 15 Jun 2020 15:56:57 +0800
Subject: [PATCH 1684/1830] DEV: Don't configure rails_failover is db and redis
 is skipped.

---
 config/application.rb                     | 10 ++-
 config/initializers/002-rails_failover.rb | 86 ++++++++++++-----------
 2 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 0e17596d8d..1b0db35a6d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -19,8 +19,14 @@ require 'action_controller/railtie'
 require 'action_view/railtie'
 require 'action_mailer/railtie'
 require 'sprockets/railtie'
-require 'rails_failover/active_record'
-require 'rails_failover/redis'
+
+if !GlobalSetting.skip_db
+  require 'rails_failover/active_record'
+end
+
+if !GlobalSetting.skip_redis
+  require 'rails_failover/redis'
+end
 
 # Plugin related stuff
 require_relative '../lib/plugin_initialization_guard'
diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index 1c0edc93e6..d60c1c1307 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -1,51 +1,55 @@
 # frozen_string_literal: true
 
-message_bus_keepalive_interval = nil
+if !GlobalSetting.skip_redis
+  message_bus_keepalive_interval = nil
 
-RailsFailover::Redis.on_failover do
-  message_bus_keepalive_interval = MessageBus.keepalive_interval
-  MessageBus.keepalive_interval = -1 # Disable MessageBus keepalive_interval
-  Discourse.received_redis_readonly!
-end
+  RailsFailover::Redis.on_failover do
+    message_bus_keepalive_interval = MessageBus.keepalive_interval
+    MessageBus.keepalive_interval = -1 # Disable MessageBus keepalive_interval
+    Discourse.received_redis_readonly!
+  end
 
-RailsFailover::Redis.on_fallback do
-  Discourse.clear_redis_readonly!
-  Discourse.request_refresh!
-  MessageBus.keepalive_interval = message_bus_keepalive_interval
-end
-
-if Rails.configuration.multisite
-  if ActiveRecord::Base.current_role == ActiveRecord::Base.reading_role
-    RailsMultisite::ConnectionManagement.default_connection_handler =
-      ActiveRecord::Base.connection_handlers[ActiveRecord::Base.reading_role]
+  RailsFailover::Redis.on_fallback do
+    Discourse.clear_redis_readonly!
+    Discourse.request_refresh!
+    MessageBus.keepalive_interval = message_bus_keepalive_interval
   end
 end
 
-RailsFailover::ActiveRecord.on_failover do
-  RailsMultisite::ConnectionManagement.each_connection do
-    Discourse.enable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
-    Sidekiq.pause!("pg_failover") if !Sidekiq.paused?
-  end
-end
-
-RailsFailover::ActiveRecord.on_fallback do
-  RailsMultisite::ConnectionManagement.each_connection do
-    Discourse.disable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
-    Sidekiq.unpause! if Sidekiq.paused?
-  end
-
+if !GlobalSetting.skip_db
   if Rails.configuration.multisite
-    RailsMultisite::ConnectionManagement.default_connection_handler =
-      ActiveRecord::Base.connection_handlers[ActiveRecord::Base.writing_role]
+    if ActiveRecord::Base.current_role == ActiveRecord::Base.reading_role
+      RailsMultisite::ConnectionManagement.default_connection_handler =
+        ActiveRecord::Base.connection_handlers[ActiveRecord::Base.reading_role]
+    end
+  end
+
+  RailsFailover::ActiveRecord.on_failover do
+    RailsMultisite::ConnectionManagement.each_connection do
+      Discourse.enable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+      Sidekiq.pause!("pg_failover") if !Sidekiq.paused?
+    end
+  end
+
+  RailsFailover::ActiveRecord.on_fallback do
+    RailsMultisite::ConnectionManagement.each_connection do
+      Discourse.disable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+      Sidekiq.unpause! if Sidekiq.paused?
+    end
+
+    if Rails.configuration.multisite
+      RailsMultisite::ConnectionManagement.default_connection_handler =
+        ActiveRecord::Base.connection_handlers[ActiveRecord::Base.writing_role]
+    end
+  end
+
+  RailsFailover::ActiveRecord.register_force_reading_role_callback do
+    Discourse.redis.exists?(
+      Discourse::PG_READONLY_MODE_KEY,
+      Discourse::PG_FORCE_READONLY_MODE_KEY
+    )
+  rescue => e
+    Rails.logger.warn "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"
+    false
   end
 end
-
-RailsFailover::ActiveRecord.register_force_reading_role_callback do
-  Discourse.redis.exists?(
-    Discourse::PG_READONLY_MODE_KEY,
-    Discourse::PG_FORCE_READONLY_MODE_KEY
-  )
-rescue => e
-  Rails.logger.warn "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"
-  false
-end

From f38438c6de168c9fcd182723f44237bd5f6ff228 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 15 Jun 2020 16:02:30 +0800
Subject: [PATCH 1685/1830] DEV: Don't configure rails_failover is db and redis
 is skipped take 2

---
 config/application.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 1b0db35a6d..a7e6df5214 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -20,14 +20,6 @@ require 'action_view/railtie'
 require 'action_mailer/railtie'
 require 'sprockets/railtie'
 
-if !GlobalSetting.skip_db
-  require 'rails_failover/active_record'
-end
-
-if !GlobalSetting.skip_redis
-  require 'rails_failover/redis'
-end
-
 # Plugin related stuff
 require_relative '../lib/plugin_initialization_guard'
 require_relative '../lib/discourse_event'
@@ -51,6 +43,14 @@ if ENV['SKIP_DB_AND_REDIS'] == '1'
   GlobalSetting.skip_redis = true
 end
 
+if !GlobalSetting.skip_db
+  require 'rails_failover/active_record'
+end
+
+if !GlobalSetting.skip_redis
+  require 'rails_failover/redis'
+end
+
 require 'pry-rails' if Rails.env.development?
 
 if defined?(Bundler)

From e0d798c06c5df4d973536a1c78e03e7cf656d5f9 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 15 Jun 2020 16:04:41 +0800
Subject: [PATCH 1686/1830] DEV: Fix undefined method.

---
 config/application.rb                     | 4 ++--
 config/initializers/002-rails_failover.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index a7e6df5214..6120831f6d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -43,11 +43,11 @@ if ENV['SKIP_DB_AND_REDIS'] == '1'
   GlobalSetting.skip_redis = true
 end
 
-if !GlobalSetting.skip_db
+if !GlobalSetting.skip_db?
   require 'rails_failover/active_record'
 end
 
-if !GlobalSetting.skip_redis
+if !GlobalSetting.skip_redis?
   require 'rails_failover/redis'
 end
 
diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index d60c1c1307..8826108525 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if !GlobalSetting.skip_redis
+if !GlobalSetting.skip_redis?
   message_bus_keepalive_interval = nil
 
   RailsFailover::Redis.on_failover do
@@ -16,7 +16,7 @@ if !GlobalSetting.skip_redis
   end
 end
 
-if !GlobalSetting.skip_db
+if !GlobalSetting.skip_db?
   if Rails.configuration.multisite
     if ActiveRecord::Base.current_role == ActiveRecord::Base.reading_role
       RailsMultisite::ConnectionManagement.default_connection_handler =

From 402b80f3062e8b4bc5fdd83d93ed347cedb55906 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 15 Jun 2020 16:23:24 +0800
Subject: [PATCH 1687/1830] DEV: Make rails_failover compatible with
 `SKIP_DB_AND_REDIS` env.

---
 app/models/global_setting.rb                 | 2 +-
 config/initializers/002-rails_failover.rb    | 4 ++--
 config/initializers/200-first_middlewares.rb | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index dc660fce50..4a6149fda5 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -163,7 +163,7 @@ class GlobalSetting
         c[:host] = redis_host if redis_host
         c[:port] = redis_port if redis_port
 
-        if redis_slave_host && redis_slave_port
+        if redis_slave_host && redis_slave_port && defined?(RailsFailover)
           c[:replica_host] = redis_slave_host
           c[:replica_port] = redis_slave_port
           c[:connector] = RailsFailover::Redis::Connector
diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index 8826108525..d414a86119 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if !GlobalSetting.skip_redis?
+if defined?(RailsFailover::Redis)
   message_bus_keepalive_interval = nil
 
   RailsFailover::Redis.on_failover do
@@ -16,7 +16,7 @@ if !GlobalSetting.skip_redis?
   end
 end
 
-if !GlobalSetting.skip_db?
+if defined?(RailsFailover::ActiveRecord)
   if Rails.configuration.multisite
     if ActiveRecord::Base.current_role == ActiveRecord::Base.reading_role
       RailsMultisite::ConnectionManagement.default_connection_handler =
diff --git a/config/initializers/200-first_middlewares.rb b/config/initializers/200-first_middlewares.rb
index 57ef2aecbf..e326e524bf 100644
--- a/config/initializers/200-first_middlewares.rb
+++ b/config/initializers/200-first_middlewares.rb
@@ -24,7 +24,10 @@ if Rails.configuration.multisite
   # Multisite needs to be first, because the request tracker and message bus rely on it
   Rails.configuration.middleware.unshift RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config
   Rails.configuration.middleware.delete ActionDispatch::Executor
-  Rails.configuration.middleware.insert_after(RailsMultisite::Middleware, RailsFailover::ActiveRecord::Middleware)
-else
+
+  if defined?(RailsFailover)
+    Rails.configuration.middleware.insert_after(RailsMultisite::Middleware, RailsFailover::ActiveRecord::Middleware)
+  end
+elsif defined?(RailsFailover)
   Rails.configuration.middleware.insert_before(MessageBus::Rack::Middleware, RailsFailover::ActiveRecord::Middleware)
 end

From a94387c088c4915eaaa8541aaae809b9cf2e262f Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 15 Jun 2020 14:43:56 +0530
Subject: [PATCH 1688/1830] FIX: check for inviter group permissions at the
 time of redeeming invite

---
 app/models/invite_redeemer.rb       |  8 ++++++--
 spec/models/invite_redeemer_spec.rb | 10 ++++++++++
 spec/models/invite_spec.rb          |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index ad49c18c6d..997d970711 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -128,10 +128,14 @@ InviteRedeemer = Struct.new(:invite, :email, :username, :name, :password, :user_
   end
 
   def add_user_to_groups
+    guardian = Guardian.new(invite.invited_by)
     new_group_ids = invite.groups.pluck(:id) - invited_user.group_users.pluck(:group_id)
     new_group_ids.each do |id|
-      invited_user.group_users.create!(group_id: id)
-      DiscourseEvent.trigger(:user_added_to_group, invited_user, Group.find_by(id: id), automatic: false)
+      group = Group.find_by(id: id)
+      if guardian.can_edit_group?(group)
+        invited_user.group_users.create!(group_id: group.id)
+        DiscourseEvent.trigger(:user_added_to_group, invited_user, group, automatic: false)
+      end
     end
   end
 
diff --git a/spec/models/invite_redeemer_spec.rb b/spec/models/invite_redeemer_spec.rb
index d29c9b6f57..fd3d52cf2b 100644
--- a/spec/models/invite_redeemer_spec.rb
+++ b/spec/models/invite_redeemer_spec.rb
@@ -144,9 +144,19 @@ describe InviteRedeemer do
       expect(user.custom_fields["user_field_#{optional_field.id}"]).to eq('value2')
     end
 
+    it "does not add user to group if inviter does not have permissions" do
+      group = Fabricate(:group, grant_trust_level: 2)
+      InvitedGroup.create(group_id: group.id, invite_id: invite.id)
+      user = InviteRedeemer.new(invite: invite, email: invite.email, username: username, name: name, password: password).redeem
+
+      expect(user.group_users.count).to eq(0)
+    end
+
     it "adds user to group" do
       group = Fabricate(:group, grant_trust_level: 2)
       InvitedGroup.create(group_id: group.id, invite_id: invite.id)
+      group.add_owner(invite.invited_by)
+
       user = InviteRedeemer.new(invite: invite, email: invite.email, username: username, name: name, password: password).redeem
 
       expect(user.group_users.count).to eq(4)
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index bd896e0777..047b58cb9f 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -306,6 +306,7 @@ describe Invite do
     context "when inviting to groups" do
       it "add the user to the correct groups" do
         group = Fabricate(:group)
+        group.add_owner(invite.invited_by)
         invite.invited_groups.build(group_id: group.id)
         invite.save
 

From 70e50a2255ebb30c78891a7f846e833ab85b0a8b Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 15 Jun 2020 13:41:24 +0200
Subject: [PATCH 1689/1830] DEV: Use postgres 12 in GitHub Actions CI (#10043)

12 is now the recommended and widely deployed version.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 74f66c7b37..83a3875891 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
         target: ["PLUGINS", "CORE"]
         os: [ubuntu-latest]
         ruby: ["2.6"]
-        postgres: ["10"]
+        postgres: ["12"]
         redis: ["4.x"]
 
     services:

From 18244ff44c644ef8d0fa84d56fa4a45205bb2771 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 15 Jun 2020 12:23:47 -0400
Subject: [PATCH 1690/1830] Bump sanitize from 5.1.0 to 5.2.0 (#9996)

Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.1.0 to 5.2.0.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v5.1.0...v5.2.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index d838afb0fc..7dc6cdc95c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -371,7 +371,7 @@ GEM
       nokogiri (>= 1.6.0)
     rubyzip (2.3.0)
     safe_yaml (1.0.5)
-    sanitize (5.1.0)
+    sanitize (5.2.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)

From 298393a5bc29789543942fad7443ddd7db3f0203 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 15 Jun 2020 15:23:14 -0400
Subject: [PATCH 1691/1830] FIX: Keep onebox styling in edit history

---
 .../discourse/app/controllers/history.js      |  5 ++--
 test/javascripts/controllers/history-test.js  | 28 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/history.js b/app/assets/javascripts/discourse/app/controllers/history.js
index b368a283fb..4ed3da9b80 100644
--- a/app/assets/javascripts/discourse/app/controllers/history.js
+++ b/app/assets/javascripts/discourse/app/controllers/history.js
@@ -261,9 +261,10 @@ export default Controller.extend(ModalFunctionality, {
       this.set("bodyDiff", html);
     } else {
       const opts = {
-        features: { editHistory: true },
+        features: { editHistory: true, historyOneboxes: true },
         whiteListed: {
-          editHistory: { custom: (tag, attr) => attr === "class" }
+          editHistory: { custom: (tag, attr) => attr === "class" },
+          historyOneboxes: ["header", "article", "div[style]"]
         }
       };
 
diff --git a/test/javascripts/controllers/history-test.js b/test/javascripts/controllers/history-test.js
index 6d8ccae7cf..0d8788239d 100644
--- a/test/javascripts/controllers/history-test.js
+++ b/test/javascripts/controllers/history-test.js
@@ -40,6 +40,17 @@ QUnit.test("displayEdit", async function(assert) {
   const html = `<div class="revision-content">
   <p><img src="/uploads/default/original/1X/6b963ffc13cb0c053bbb90c92e99d4fe71b286ef.jpg" alt="" class="diff-del"><img/src=x onerror=alert(document.domain)>" width="276" height="183"></p>
 </div>
+<aside class="onebox whitelistedgeneric">
+  <header class="source">
+    <img src="/uploads/default/original/1X/1b0984d7ee08bce90572f46a1950e1ced436d028.png" class="site-icon" width="32" height="32">
+    <a href="https://meta.discourse.org/t/discourse-version-2-5/125302">Discourse Meta – 9 Aug 19</a>
+  </header>
+  <article class="onebox-body">
+    <img src="/uploads/default/optimized/1X/ecc92a52ee7353e03d5c0d1ea6521ce4541d9c25_2_500x500.png" class="thumbnail onebox-avatar d-lazyload" width="500" height="500">
+    <h3><a href="https://meta.discourse.org/t/discourse-version-2-5/125302" target="_blank">Discourse Version 2.5</a></h3>
+    <div style="clear: both"></div>
+  </article>
+</aside>
 <table background="javascript:alert(\"HACKEDXSS\")">
   <thead>
     <tr>
@@ -58,6 +69,17 @@ QUnit.test("displayEdit", async function(assert) {
   const expectedOutput = `<div class="revision-content">
   <p><img src="/uploads/default/original/1X/6b963ffc13cb0c053bbb90c92e99d4fe71b286ef.jpg" alt class="diff-del">" width="276" height="183"&gt;</p>
 </div>
+<aside class="onebox whitelistedgeneric">
+  <header class="source">
+    <img src="/uploads/default/original/1X/1b0984d7ee08bce90572f46a1950e1ced436d028.png" class="site-icon" width="32" height="32">
+    <a href="https://meta.discourse.org/t/discourse-version-2-5/125302">Discourse Meta – 9 Aug 19</a>
+  </header>
+  <article class="onebox-body">
+    <img src="/uploads/default/optimized/1X/ecc92a52ee7353e03d5c0d1ea6521ce4541d9c25_2_500x500.png" class="thumbnail onebox-avatar d-lazyload" width="500" height="500">
+    <h3><a href="https://meta.discourse.org/t/discourse-version-2-5/125302" target="_blank">Discourse Version 2.5</a></h3>
+    <div style="clear: both"></div>
+  </article>
+</aside>
 <table>
   <thead>
     <tr>
@@ -85,5 +107,9 @@ QUnit.test("displayEdit", async function(assert) {
   await HistoryController.bodyDiffChanged();
 
   const output = HistoryController.get("bodyDiff");
-  assert.equal(output, expectedOutput, "it keeps safe HTML");
+  assert.equal(
+    output,
+    expectedOutput,
+    "it keeps HTML safe and doesn't strip onebox tags"
+  );
 });

From a2f80670e140eb2d9d784a653d101fd41c43db1b Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 15 Jun 2020 20:25:30 +0100
Subject: [PATCH 1692/1830] FIX: Do not count youtube thumbnail when counting
 post images (#10049)

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

diff --git a/app/models/post.rb b/app/models/post.rb
index 36522ae873..9f0b520cfe 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -255,7 +255,7 @@ class Post < ActiveRecord::Base
   end
 
   def self.white_listed_image_classes
-    @white_listed_image_classes ||= ['avatar', 'favicon', 'thumbnail', 'emoji']
+    @white_listed_image_classes ||= ['avatar', 'favicon', 'thumbnail', 'emoji', 'ytp-thumbnail-image']
   end
 
   def post_analyzer

From a2713578ddcf61b2e17abe064e3f367d472ed4f2 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Mon, 15 Jun 2020 15:28:07 -0600
Subject: [PATCH 1693/1830] DEV: Allow plugins to exclude seed data

This allows plugins to specify if they would like to filter out any seed
data files from running during migrations.
---
 lib/discourse_plugin_registry.rb | 5 +++++
 lib/plugin/instance.rb           | 8 ++++++++
 lib/tasks/db.rake                | 7 ++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index ab382a4d15..7383849661 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -66,6 +66,7 @@ class DiscoursePluginRegistry
   define_register :seed_path_builders, Set
   define_register :vendored_pretty_text, Set
   define_register :vendored_core_pretty_text, Set
+  define_register :seedfu_filter, Set
 
   define_filtered_register :staff_user_custom_fields
   define_filtered_register :public_user_custom_fields
@@ -198,6 +199,10 @@ class DiscoursePluginRegistry
     result.uniq
   end
 
+  def self.register_seedfu_filter(filter = nil)
+    self.seedfu_filter << filter
+  end
+
   VENDORED_CORE_PRETTY_TEXT_MAP = {
     "moment.js" => "vendor/assets/javascripts/moment.js",
     "moment-timezone.js" => "vendor/assets/javascripts/moment-timezone-with-data.js"
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 11f866f937..302076e509 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -78,6 +78,10 @@ class Plugin::Instance
     @seed_data ||= HashWithIndifferentAccess.new({})
   end
 
+  def seed_fu_filter(filter = nil)
+    @seed_fu_filter = filter
+  end
+
   def self.find_all(parent_path)
     [].tap { |plugins|
       # also follows symlinks - http://stackoverflow.com/q/357754
@@ -415,6 +419,10 @@ class Plugin::Instance
     SeedFu.fixture_paths.concat(paths)
   end
 
+  def register_seedfu_filter(filter = nil)
+    DiscoursePluginRegistry.register_seedfu_filter(filter)
+  end
+
   def listen_for(event_name)
     return unless self.respond_to?(event_name)
     DiscourseEvent.on(event_name, &self.method(event_name))
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 5a6c67c918..7b6c92806e 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -180,7 +180,12 @@ task 'db:migrate' => ['load_config', 'environment', 'set_locale'] do |_, args|
   end
 
   SeedFu.quiet = true
-  SeedFu.seed(DiscoursePluginRegistry.seed_paths)
+
+  # Allows a plugin to exclude any specified seed data files from running
+  filter = DiscoursePluginRegistry.seedfu_filter.any? ?
+    /^(?!.*(#{DiscoursePluginRegistry.seedfu_filter.to_a.join("|")})).*$/ : nil
+
+  SeedFu.seed(DiscoursePluginRegistry.seed_paths, filter)
 
   if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
     SiteIconManager.ensure_optimized!

From 092ae858af79e10e30f0680ca09cf6f49c176aa6 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 16 Jun 2020 10:51:21 +0800
Subject: [PATCH 1694/1830] DEV: Bump rails_failover.

Avoid configuring AR stuff if `replica_host` and `replica_port` hasn't
been provided.
---
 Gemfile.lock                                 | 2 +-
 config/initializers/002-rails_failover.rb    | 2 ++
 config/initializers/200-first_middlewares.rb | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7dc6cdc95c..7e5e5eeebd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -280,7 +280,7 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails_failover (0.5.0)
+    rails_failover (0.5.1)
       activerecord (~> 6.0)
       railties (~> 6.0)
     rails_multisite (2.3.0)
diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index d414a86119..16c5dc4bda 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+return unless Rails.configuration.active_record_rails_failover
+
 if defined?(RailsFailover::Redis)
   message_bus_keepalive_interval = nil
 
diff --git a/config/initializers/200-first_middlewares.rb b/config/initializers/200-first_middlewares.rb
index e326e524bf..3f2bce1458 100644
--- a/config/initializers/200-first_middlewares.rb
+++ b/config/initializers/200-first_middlewares.rb
@@ -25,9 +25,9 @@ if Rails.configuration.multisite
   Rails.configuration.middleware.unshift RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config
   Rails.configuration.middleware.delete ActionDispatch::Executor
 
-  if defined?(RailsFailover)
+  if defined?(RailsFailover) && Rails.configuration.active_record_rails_failover
     Rails.configuration.middleware.insert_after(RailsMultisite::Middleware, RailsFailover::ActiveRecord::Middleware)
   end
-elsif defined?(RailsFailover)
+elsif defined?(RailsFailover) && Rails.configuration.active_record_rails_failover
   Rails.configuration.middleware.insert_before(MessageBus::Rack::Middleware, RailsFailover::ActiveRecord::Middleware)
 end

From b08a0d15c4e990256ba1bf2542b8c01c0640d04c Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 16 Jun 2020 11:03:47 +0800
Subject: [PATCH 1695/1830] DEV: Fix undefined method due to rails_failover.

---
 config/initializers/002-rails_failover.rb    | 4 ++--
 config/initializers/200-first_middlewares.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index 16c5dc4bda..a7529a0825 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-return unless Rails.configuration.active_record_rails_failover
-
 if defined?(RailsFailover::Redis)
   message_bus_keepalive_interval = nil
 
@@ -19,6 +17,8 @@ if defined?(RailsFailover::Redis)
 end
 
 if defined?(RailsFailover::ActiveRecord)
+  return unless Rails.configuration.active_record_rails_failover
+
   if Rails.configuration.multisite
     if ActiveRecord::Base.current_role == ActiveRecord::Base.reading_role
       RailsMultisite::ConnectionManagement.default_connection_handler =
diff --git a/config/initializers/200-first_middlewares.rb b/config/initializers/200-first_middlewares.rb
index 3f2bce1458..2467202d6e 100644
--- a/config/initializers/200-first_middlewares.rb
+++ b/config/initializers/200-first_middlewares.rb
@@ -25,9 +25,9 @@ if Rails.configuration.multisite
   Rails.configuration.middleware.unshift RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config
   Rails.configuration.middleware.delete ActionDispatch::Executor
 
-  if defined?(RailsFailover) && Rails.configuration.active_record_rails_failover
+  if defined?(RailsFailover::ActiveRecord) && Rails.configuration.active_record_rails_failover
     Rails.configuration.middleware.insert_after(RailsMultisite::Middleware, RailsFailover::ActiveRecord::Middleware)
   end
-elsif defined?(RailsFailover) && Rails.configuration.active_record_rails_failover
+elsif defined?(RailsFailover::ActiveRecord) && Rails.configuration.active_record_rails_failover
   Rails.configuration.middleware.insert_before(MessageBus::Rack::Middleware, RailsFailover::ActiveRecord::Middleware)
 end

From c611f3703cfcbf7ced06c2954ae19f9c5c3a5dff Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 16 Jun 2020 11:53:52 +0800
Subject: [PATCH 1696/1830] DEV: Don't use logster when logging in Redis
 failover.

---
 config/initializers/002-rails_failover.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index a7529a0825..40809c14cd 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -14,6 +14,10 @@ if defined?(RailsFailover::Redis)
     Discourse.request_refresh!
     MessageBus.keepalive_interval = message_bus_keepalive_interval
   end
+
+  if Rails.logger.respond_to? :chained
+    RailsFailover::Redis.logger = Rails.logger.chained.first
+  end
 end
 
 if defined?(RailsFailover::ActiveRecord)

From def4cd33ea948ff617d8edd2273095fd43317454 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 16 Jun 2020 12:53:04 +0800
Subject: [PATCH 1697/1830] DEV: Disable Redis warnings.

---
 config/initializers/001-redis.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/initializers/001-redis.rb b/config/initializers/001-redis.rb
index d11303a9d5..3957d626b2 100644
--- a/config/initializers/001-redis.rb
+++ b/config/initializers/001-redis.rb
@@ -4,3 +4,7 @@ if Rails.env.development? && ENV['DISCOURSE_FLUSH_REDIS']
   puts "Flushing redis (development mode)"
   Discourse.redis.flushdb
 end
+
+# Pending https://github.com/MiniProfiler/rack-mini-profiler/pull/450 and
+# upgrade to Sidekiq 6.1
+Redis.exists_returns_integer = true

From 2bbb870b1182c36a68f70e7204deb4cfc6f04043 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Mon, 15 Jun 2020 22:43:55 -0700
Subject: [PATCH 1698/1830] copyedit on push icon help text

---
 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 d2e875d117..d2a0a9b10b 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2205,7 +2205,7 @@ en:
     shared_drafts_category: "Enable the Shared Drafts feature by designating a category for topic drafts. Topics in this category will be suppressed from topic lists for staff users."
 
     push_notifications_prompt: "Display user consent prompt."
-    push_notifications_icon: "The badge icon that appears in the notification corner. Required size is 96 × 96."
+    push_notifications_icon: "The badge icon that appears in the notification corner. A 96×96 monochromatic PNG with transparency is recommended."
 
     short_title: "The short title will be used on the user's home screen, launcher, or other places where space may be limited. It should be limited to 12 characters."
 

From b9762afc106ee9b18d1ac33ca3cac281083e428e Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 16 Jun 2020 17:55:21 +1000
Subject: [PATCH 1699/1830] FIX: Change version of incorrect datetime migration
 (#10051)

* Fix create_missing_badge_indexes migration filename and version

* Delete additional migration that is unnecessary
---
 ..._indexes.rb => 20200611104600_create_missing_badge_indexes.rb} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename db/migrate/{20201006172700_create_missing_badge_indexes.rb => 20200611104600_create_missing_badge_indexes.rb} (100%)

diff --git a/db/migrate/20201006172700_create_missing_badge_indexes.rb b/db/migrate/20200611104600_create_missing_badge_indexes.rb
similarity index 100%
rename from db/migrate/20201006172700_create_missing_badge_indexes.rb
rename to db/migrate/20200611104600_create_missing_badge_indexes.rb

From 62584064190c4e7e5543ef0d11ff070f5b8d488c Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Tue, 16 Jun 2020 10:43:06 +1000
Subject: [PATCH 1700/1830] FIX: secondary_emails, unconfirmed_emails,
 group_users are private fields

Those fields should be only visible to the user.
---
 .../javascripts/discourse/app/models/user.js  |  2 +-
 app/serializers/user_card_serializer.rb       |  3 ++
 app/serializers/user_serializer.rb            |  4 ++
 spec/serializers/user_card_serializer_spec.rb | 40 +++++++++++++++++++
 spec/serializers/user_serializer_spec.rb      | 12 ++++--
 5 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 spec/serializers/user_card_serializer_spec.rb

diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index 0f67d613b2..6d9bc1ade1 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -595,7 +595,7 @@ const User = RestModel.extend({
         );
       }
 
-      if (!isEmpty(json.user.groups)) {
+      if (!isEmpty(json.user.groups) && !isEmpty(json.user.group_users)) {
         const groups = [];
 
         for (let i = 0; i < json.user.groups.length; i++) {
diff --git a/app/serializers/user_card_serializer.rb b/app/serializers/user_card_serializer.rb
index e3ec9357fb..ebc8ee2db6 100644
--- a/app/serializers/user_card_serializer.rb
+++ b/app/serializers/user_card_serializer.rb
@@ -80,6 +80,9 @@ class UserCardSerializer < BasicUserSerializer
       (scope.is_staff? && object.staged?)
   end
 
+  alias_method :include_secondary_emails?, :include_email?
+  alias_method :include_unconfirmed_emails?, :include_email?
+
   def bio_excerpt
     object.user_profile.bio_excerpt(350, keep_newlines: true, keep_emoji_images: true)
   end
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 352603d755..9d9232af95 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -78,6 +78,10 @@ class UserSerializer < UserCardSerializer
     object.group_users.order(:group_id)
   end
 
+  def include_group_users?
+    (object.id && object.id == scope.user.try(:id)) || scope.is_staff?
+  end
+
   def include_associated_accounts?
     (object.id && object.id == scope.user.try(:id))
   end
diff --git a/spec/serializers/user_card_serializer_spec.rb b/spec/serializers/user_card_serializer_spec.rb
new file mode 100644
index 0000000000..f6285f2150
--- /dev/null
+++ b/spec/serializers/user_card_serializer_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe UserCardSerializer do
+  context "with a TL0 user seen as anonymous" do
+    let(:user) { Fabricate.build(:user, trust_level: 0, user_profile: Fabricate.build(:user_profile)) }
+    let(:serializer) { described_class.new(user, scope: Guardian.new, root: false) }
+    let(:json) { serializer.as_json }
+
+    it "does not serialize emails" do
+      expect(json[:secondary_emails]).to be_nil
+      expect(json[:unconfirmed_emails]).to be_nil
+    end
+  end
+
+  context "as current user" do
+    it "serializes emails correctly" do
+      user = Fabricate.build(:user,
+                             id: 1,
+                             user_profile: Fabricate.build(:user_profile),
+                             user_option: UserOption.new(dynamic_favicon: true),
+                             user_stat: UserStat.new
+                            )
+      json = described_class.new(user, scope: Guardian.new(user), root: false).as_json
+      expect(json[:secondary_emails]).to eq([])
+      expect(json[:unconfirmed_emails]).to eq([])
+    end
+  end
+
+  context "as different user" do
+    let(:user) { Fabricate(:user, trust_level: 0) }
+    let(:user2) { Fabricate(:user, trust_level: 1) }
+    it "does not serialize emails" do
+      json = described_class.new(user, scope: Guardian.new(user2), root: false).as_json
+      expect(json[:secondary_emails]).to be_nil
+      expect(json[:unconfirmed_emails]).to be_nil
+    end
+  end
+end
diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb
index 2086c351ba..197adb9f9e 100644
--- a/spec/serializers/user_serializer_spec.rb
+++ b/spec/serializers/user_serializer_spec.rb
@@ -14,6 +14,10 @@ describe UserSerializer do
     it "doesn't serialize untrusted attributes" do
       untrusted_attributes.each { |attr| expect(json).not_to have_key(attr) }
     end
+
+    it "doesn't serialize group_users" do
+      expect(json[:group_users]).to be_nil
+    end
   end
 
   context "as current user" do
@@ -24,9 +28,10 @@ describe UserSerializer do
       SiteSetting.default_other_new_topic_duration_minutes = 60 * 24
 
       user = Fabricate.build(:user,
-                              user_profile: Fabricate.build(:user_profile),
-                              user_option: UserOption.new(dynamic_favicon: true),
-                              user_stat: UserStat.new
+                             id: 1,
+                             user_profile: Fabricate.build(:user_profile),
+                             user_option: UserOption.new(dynamic_favicon: true),
+                             user_stat: UserStat.new
                             )
 
       json = UserSerializer.new(user, scope: Guardian.new(user), root: false).as_json
@@ -36,6 +41,7 @@ describe UserSerializer do
       expect(json[:user_option][:auto_track_topics_after_msecs]).to eq(0)
       expect(json[:user_option][:notification_level_when_replying]).to eq(3)
 
+      expect(json[:group_users]).to eq([])
     end
   end
 

From 219bb0b6a71282695f7948d10cd9ab886ae23a1d Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Tue, 16 Jun 2020 13:00:09 +0300
Subject: [PATCH 1701/1830] DEV: Fix build

Follow-up to 62584064190c4e7e5543ef0d11ff070f5b8d488c.
---
 app/serializers/web_hook_user_serializer.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/serializers/web_hook_user_serializer.rb b/app/serializers/web_hook_user_serializer.rb
index d431b213e1..32fbde02f5 100644
--- a/app/serializers/web_hook_user_serializer.rb
+++ b/app/serializers/web_hook_user_serializer.rb
@@ -44,6 +44,8 @@ class WebHookUserSerializer < UserSerializer
     scope.is_admin?
   end
 
+  alias_method :include_secondary_emails?, :include_email?
+
   def include_external_id?
     scope.is_admin? && object.single_sign_on_record
   end

From 84dfaad137a215bf722388cccbe22f593279f5a2 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Tue, 16 Jun 2020 13:30:58 +0300
Subject: [PATCH 1702/1830] FIX: Fill acting_user field instead of target_user
 in history

---
 app/controllers/users_controller.rb | 4 ++--
 lib/email_updater.rb                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1ca9d9b99e..93f9401dbe 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -232,7 +232,7 @@ class UsersController < ApplicationController
       if current_user.staff? && current_user != user
         StaffActionLogger.new(current_user).log_update_email(user)
       else
-        UserHistory.create!(action: UserHistory.actions[:update_email], target_user_id: user.id)
+        UserHistory.create!(action: UserHistory.actions[:update_email], acting_user_id: user.id)
       end
     end
 
@@ -264,7 +264,7 @@ class UsersController < ApplicationController
       if current_user.staff? && current_user != user
         StaffActionLogger.new(current_user).log_destroy_email(user)
       else
-        UserHistory.create(action: UserHistory.actions[:destroy_email], target_user_id: user.id)
+        UserHistory.create(action: UserHistory.actions[:destroy_email], acting_user_id: user.id)
       end
     end
 
diff --git a/lib/email_updater.rb b/lib/email_updater.rb
index bac085b51b..d615f7ba8a 100644
--- a/lib/email_updater.rb
+++ b/lib/email_updater.rb
@@ -38,7 +38,7 @@ class EmailUpdater
     if @guardian.is_staff? && @guardian.user != @user
       StaffActionLogger.new(@guardian.user).log_add_email(@user)
     else
-      UserHistory.create!(action: UserHistory.actions[:add_email], target_user_id: @user.id)
+      UserHistory.create!(action: UserHistory.actions[:add_email], acting_user_id: @user.id)
     end
 
     if @guardian.is_staff? && !@user.staff?

From f1b97202d445279e8a64a81fddb5678e636f5114 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Tue, 16 Jun 2020 14:19:21 +0300
Subject: [PATCH 1703/1830] FIX: Ensure users can confirm new emails using
 security keys

---
 app/views/users_email/show_confirm_new_email.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users_email/show_confirm_new_email.html.erb b/app/views/users_email/show_confirm_new_email.html.erb
index dc56120f9a..d5a49bc3cb 100644
--- a/app/views/users_email/show_confirm_new_email.html.erb
+++ b/app/views/users_email/show_confirm_new_email.html.erb
@@ -46,11 +46,11 @@
       <% elsif @show_security_key %>
         <%= hidden_field_tag 'security_key_challenge', @security_key_challenge, id: 'security-key-challenge' %>	
         <%= hidden_field_tag 'second_factor_method', UserSecondFactor.methods[:security_key] %>	
-        <%= hidden_field_tag 'security_key_allowed_credential_ids', @security_key_allowed_credential_ids, id: 'security-key-allowed-credential-ids' %>
+        <%= hidden_field_tag 'security_key_allowed_credential_ids', @security_key_allowed_credential_ids.join(","), id: 'security-key-allowed-credential-ids' %>
         <div id="security-key-form">
           <h3><%= t('login.security_key_authenticate') %></h3>
           <p><%= t('login.security_key_description') %></p>
-          <%= button_tag t('login.security_key_authenticate'), id: 'submit-security-key' %>
+          <%= button_tag t('login.security_key_authenticate'), id: 'submit-security-key', class: 'btn btn-primary' %>
         </div>
         <br/>
         <% if @show_second_factor %>

From 4cff4892e887acff4431f8fe5d54583d35e36178 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Mon, 15 Jun 2020 00:15:08 +0200
Subject: [PATCH 1704/1830] Locale checks were disabled by mistake

---
 lib/i18n/locale_file_checker.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/i18n/locale_file_checker.rb b/lib/i18n/locale_file_checker.rb
index fb54938768..1f30f1ab66 100644
--- a/lib/i18n/locale_file_checker.rb
+++ b/lib/i18n/locale_file_checker.rb
@@ -20,8 +20,8 @@ class LocaleFileChecker
       @locale_yaml = YAML.load_file(locale_path)
       @reference_yaml = YAML.load_file(reference_path)
 
-      # check_interpolation_keys
-      # check_plural_keys
+      check_interpolation_keys
+      check_plural_keys
       check_message_format
     end
 

From 859d9b75a7c1cb080889c3b712e918506d15d0fe Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 16 Jun 2020 15:59:35 +0200
Subject: [PATCH 1705/1830] FIX: Restoring backup from PG12 could fail on PG10

The `EXECUTE FUNCTION` syntax for `CREATE TRIGGER` statements was introduced in PostgreSQL 11. We need to replace `EXECUTE FUNCTION` with `EXECUTE PROCEDURE` in order to be able to restore backups created with PG12 on PG10.
---
 lib/backup_restore.rb                         |  4 ++
 lib/backup_restore/database_restorer.rb       | 11 +++-
 spec/fixtures/db/restore/trigger.sql          | 55 +++++++++++++++++++
 .../backup_restore/database_restorer_spec.rb  | 45 +++++++++++++++
 4 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 spec/fixtures/db/restore/trigger.sql

diff --git a/lib/backup_restore.rb b/lib/backup_restore.rb
index 4d75734c27..5b18ef603b 100644
--- a/lib/backup_restore.rb
+++ b/lib/backup_restore.rb
@@ -82,6 +82,10 @@ module BackupRestore
     ActiveRecord::Migrator.current_version
   end
 
+  def self.postgresql_major_version
+    DB.query_single("SHOW server_version").first[/\d+/].to_i
+  end
+
   def self.move_tables_between_schemas(source, destination)
     owner = database_configuration.username
 
diff --git a/lib/backup_restore/database_restorer.rb b/lib/backup_restore/database_restorer.rb
index 929e318a9f..9ccb6a5f15 100644
--- a/lib/backup_restore/database_restorer.rb
+++ b/lib/backup_restore/database_restorer.rb
@@ -95,7 +95,8 @@ module BackupRestore
       raise DatabaseRestoreError.new("psql failed: #{last_line}") if Process.last_status&.exitstatus != 0
     end
 
-    # Removes unwanted SQL added by certain versions of pg_dump.
+    # Removes unwanted SQL added by certain versions of pg_dump and modifies
+    # the dump so that it works on the current version of PostgreSQL.
     def sed_command
       unwanted_sql = [
         "DROP SCHEMA", # Discourse <= v1.5
@@ -104,11 +105,15 @@ module BackupRestore
         "SET default_table_access_method" # PostgreSQL 12
       ].join("|")
 
-      "sed -E '/^(#{unwanted_sql})/d'"
+      command = "sed -E '/^(#{unwanted_sql})/d' #{@db_dump_path}"
+      if BackupRestore.postgresql_major_version < 11
+        command = "#{command} | sed -E 's/^(CREATE TRIGGER.+EXECUTE) FUNCTION/\\1 PROCEDURE/'"
+      end
+      command
     end
 
     def restore_dump_command
-      "#{sed_command} #{@db_dump_path} | #{self.class.psql_command} 2>&1"
+      "#{sed_command} | #{self.class.psql_command} 2>&1"
     end
 
     def self.psql_command
diff --git a/spec/fixtures/db/restore/trigger.sql b/spec/fixtures/db/restore/trigger.sql
new file mode 100644
index 0000000000..78621ecaf6
--- /dev/null
+++ b/spec/fixtures/db/restore/trigger.sql
@@ -0,0 +1,55 @@
+--
+-- PostgreSQL database dump
+--
+
+-- Dumped from database version 12.2 (Debian 12.2-2.pgdg100+1)
+-- Dumped by pg_dump version 12.2 (Debian 12.2-2.pgdg100+1)
+
+-- Started on 2020-06-15 08:06:34 UTC
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+
+--
+-- TOC entry 5 (class 2615 OID 2200)
+-- Name: public; Type: SCHEMA; Schema: -; Owner: -
+--
+
+CREATE SCHEMA public;
+
+
+--
+-- TOC entry 7007 (class 0 OID 0)
+-- Dependencies: 5
+-- Name: SCHEMA public; Type: COMMENT; Schema: -; Owner: -
+--
+
+COMMENT ON SCHEMA public IS 'standard public schema';
+
+SET default_tablespace = '';
+
+SET default_table_access_method = heap;
+
+--
+-- TOC entry 198 (class 1259 OID 16585)
+-- Name: foo; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.foo (
+    id integer NOT NULL,
+    topic_id integer,
+    user_id integer
+);
+
+
+CREATE TRIGGER foo_topic_id_readonly BEFORE INSERT OR UPDATE OF redeemed_at ON public.foo FOR EACH ROW WHEN ((new.topic_id IS NOT NULL)) EXECUTE FUNCTION discourse_functions.raise_foo_topic_id_readonly();
+
+CREATE TRIGGER foo_user_id_readonly BEFORE INSERT OR UPDATE OF user_id ON public.foo FOR EACH ROW WHEN ((new.user_id IS NOT NULL)) EXECUTE FUNCTION discourse_functions.raise_foo_user_id_readonly();
diff --git a/spec/lib/backup_restore/database_restorer_spec.rb b/spec/lib/backup_restore/database_restorer_spec.rb
index 8a7b9ec8a9..09c203878b 100644
--- a/spec/lib/backup_restore/database_restorer_spec.rb
+++ b/spec/lib/backup_restore/database_restorer_spec.rb
@@ -127,6 +127,51 @@ describe BackupRestore::DatabaseRestorer do
       end
     end
 
+    context "rewrites database dump" do
+      let(:logger) do
+        Class.new do
+          attr_reader :log_messages
+
+          def initialize
+            @log_messages = []
+          end
+
+          def log(message, ex = nil)
+            @log_messages << message if message
+          end
+        end.new
+      end
+
+      def restore_and_log_output(filename)
+        path = File.join(Rails.root, "spec/fixtures/db/restore", filename)
+        BackupRestore::DatabaseRestorer.stubs(:psql_command).returns("cat")
+        execute_stubbed_restore(stub_psql: false, dump_file_path: path)
+        logger.log_messages.join("\n")
+      end
+
+      it "replaces `EXECUTE FUNCTION` when restoring on PostgreSQL < 11" do
+        BackupRestore.stubs(:postgresql_major_version).returns(10)
+        log = restore_and_log_output("trigger.sql")
+
+        expect(log).not_to be_blank
+        expect(log).not_to match(/CREATE SCHEMA public/)
+        expect(log).not_to match(/EXECUTE FUNCTION/)
+        expect(log).to match(/^CREATE TRIGGER foo_topic_id_readonly .+? EXECUTE PROCEDURE discourse_functions.raise_foo_topic_id_readonly/)
+        expect(log).to match(/^CREATE TRIGGER foo_user_id_readonly .+? EXECUTE PROCEDURE discourse_functions.raise_foo_user_id_readonly/)
+      end
+
+      it "does not replace `EXECUTE FUNCTION` when restoring on PostgreSQL >= 11" do
+        BackupRestore.stubs(:postgresql_major_version).returns(11)
+        log = restore_and_log_output("trigger.sql")
+
+        expect(log).not_to be_blank
+        expect(log).not_to match(/CREATE SCHEMA public/)
+        expect(log).not_to match(/EXECUTE PROCEDURE/)
+        expect(log).to match(/^CREATE TRIGGER foo_topic_id_readonly .+? EXECUTE FUNCTION discourse_functions.raise_foo_topic_id_readonly/)
+        expect(log).to match(/^CREATE TRIGGER foo_user_id_readonly .+? EXECUTE FUNCTION discourse_functions.raise_foo_user_id_readonly/)
+      end
+    end
+
     context "database connection" do
       it 'reconnects to the correct database', type: :multisite do
         RailsMultisite::ConnectionManagement.establish_connection(db: 'second')

From 11fa0cc16b404efb01689b8012ac255cdad1b743 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 16 Jun 2020 10:49:03 -0400
Subject: [PATCH 1706/1830] Build(deps-dev): Bump parallel_tests from 2.32.0 to
 3.0.0 (#10018)

Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.32.0 to 3.0.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.32.0...v3.0.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 7e5e5eeebd..417c19c1aa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -250,7 +250,7 @@ GEM
     openssl-signature_algorithm (0.4.0)
     optimist (3.0.1)
     parallel (1.19.1)
-    parallel_tests (2.32.0)
+    parallel_tests (3.0.0)
       parallel
     parser (2.7.1.3)
       ast (~> 2.4.0)

From 4b4f568ec0c09e8d4084d269d067e1d1a4179dae Mon Sep 17 00:00:00 2001
From: spirobel <43391631+spirobel@users.noreply.github.com>
Date: Tue, 16 Jun 2020 22:50:55 +0800
Subject: [PATCH 1707/1830] add showPreview to composer fields plugin outlet
 (#10019)

showPreview is necessary because we need to add 50% width class similar to: class="title-and-category with-preview" on the category and title div if the preview is shown.
---
 app/assets/javascripts/discourse/app/templates/composer.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/composer.hbs b/app/assets/javascripts/discourse/app/templates/composer.hbs
index 672d5d2d01..b3a075b684 100644
--- a/app/assets/javascripts/discourse/app/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer.hbs
@@ -100,7 +100,7 @@
               </div>
             {{/if}}
 
-            {{plugin-outlet name="composer-fields" args=(hash model=model)}}
+            {{plugin-outlet name="composer-fields" args=(hash model=model showPreview=showPreview)}}
           {{/unless}}
 
         </div>

From 8bd787646b28b3c70bd9cd734c346c76d92acf62 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 16 Jun 2020 11:05:45 -0400
Subject: [PATCH 1708/1830] Build(deps): Bump rubocop-rspec from 1.39.0 to
 1.40.0 (#10029)

Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.39.0 to 1.40.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.39.0...v1.40.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 417c19c1aa..bb5b2cf15b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -43,7 +43,7 @@ GEM
     annotate (3.1.1)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
-    ast (2.4.0)
+    ast (2.4.1)
     aws-eventstream (1.1.0)
     aws-partitions (1.322.0)
     aws-sdk-core (3.96.1)
@@ -362,7 +362,7 @@ GEM
     rubocop-discourse (2.1.2)
       rubocop (>= 0.69.0)
       rubocop-rspec (>= 1.39.0)
-    rubocop-rspec (1.39.0)
+    rubocop-rspec (1.40.0)
       rubocop (>= 0.68.1)
     ruby-prof (1.4.1)
     ruby-progressbar (1.10.1)

From 06e5fd56270c35d8231b982e0534f4a38179aae3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 16 Jun 2020 11:24:15 -0400
Subject: [PATCH 1709/1830] Build(deps): Bump aws-sdk-sns from 1.23.0 to 1.25.1
 (#10033)

Bumps [aws-sdk-sns](https://github.com/aws/aws-sdk-ruby) from 1.23.0 to 1.25.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-sns/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index bb5b2cf15b..3644acd33f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,8 +45,8 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.1)
     aws-eventstream (1.1.0)
-    aws-partitions (1.322.0)
-    aws-sdk-core (3.96.1)
+    aws-partitions (1.329.0)
+    aws-sdk-core (3.99.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -58,10 +58,10 @@ GEM
       aws-sdk-core (~> 3, >= 3.96.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.23.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-sns (1.25.1)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.3)
+    aws-sigv4 (1.1.4)
       aws-eventstream (~> 1.0, >= 1.0.2)
     barber (0.12.2)
       ember-source (>= 1.0, < 3.1)

From ce37561e10956c62e1e61618c9bac551ed8f3b7a Mon Sep 17 00:00:00 2001
From: Samuel Carvalho Santos <sanmoo.cs@gmail.com>
Date: Tue, 16 Jun 2020 12:31:25 -0300
Subject: [PATCH 1710/1830] UX: Improve revert label in post history modal
 (#10038)

---
 app/assets/javascripts/discourse/app/controllers/history.js  | 5 +++++
 .../javascripts/discourse/app/templates/modal/history.hbs    | 2 +-
 config/locales/client.en.yml                                 | 2 +-
 config/locales/client.pt_BR.yml                              | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/history.js b/app/assets/javascripts/discourse/app/controllers/history.js
index 4ed3da9b80..b2bbe94d0f 100644
--- a/app/assets/javascripts/discourse/app/controllers/history.js
+++ b/app/assets/javascripts/discourse/app/controllers/history.js
@@ -60,6 +60,11 @@ export default Controller.extend(ModalFunctionality, {
     );
   },
 
+  @discourseComputed("previousVersion")
+  revertToRevisionText(revision) {
+    return I18n.t("post.revisions.controls.revert", { revision });
+  },
+
   refresh(postId, postVersion) {
     this.set("loading", true);
 
diff --git a/app/assets/javascripts/discourse/app/templates/modal/history.hbs b/app/assets/javascripts/discourse/app/templates/modal/history.hbs
index 528f5a8bf3..f86f98a046 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/history.hbs
@@ -128,7 +128,7 @@
       {{/if}}
 
       {{#if displayRevert}}
-        {{d-button action=(action "revertToVersion") icon="undo" label="post.revisions.controls.revert" class="btn-danger" disabled=loading}}
+        {{d-button action=(action "revertToVersion") icon="undo" translatedLabel=revertToRevisionText class="btn-danger" disabled=loading}}
       {{/if}}
 
       {{#if displayHide}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 56088fe45c..2f3a8b0095 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2745,7 +2745,7 @@ en:
           last: "Last revision"
           hide: "Hide revision"
           show: "Show revision"
-          revert: "Revert to this revision"
+          revert: "Revert to revision %{revision}"
           edit_wiki: "Edit Wiki"
           edit_post: "Edit Post"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 7f6419e7c1..4db38a182e 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -2476,7 +2476,7 @@ pt_BR:
           last: "Última revisão"
           hide: "Esconder revisão"
           show: "Exibir revisão"
-          revert: "Reverter para esta 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}"

From df0e3b4ed4488d7b43fdf77da9f37ec2cdbd1e43 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 16 Jun 2020 17:35:04 +0200
Subject: [PATCH 1711/1830] FIX: Allow opening FAQ in a new tab (#10039)

---
 .../discourse/app/widgets/hamburger-menu.js   | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js b/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
index 669d75928f..8f24468812 100644
--- a/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
@@ -6,6 +6,7 @@ import { h } from "virtual-dom";
 import DiscourseURL from "discourse/lib/url";
 import { ajax } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
+import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 
 const flatten = array => [].concat.apply([], array);
@@ -26,14 +27,24 @@ createWidget("priority-faq-link", {
   },
 
   click(e) {
-    e.preventDefault();
     if (this.siteSettings.faq_url === this.attrs.href) {
       ajax(userPath("read-faq"), { type: "POST" }).then(() => {
         this.currentUser.set("read_faq", true);
-        DiscourseURL.routeToTag($(e.target).closest("a")[0]);
+
+        if (wantsNewWindow(e)) {
+          return;
+        }
+
+        e.preventDefault();
+        DiscourseURL.routeTo(this.attrs.href);
       });
     } else {
-      DiscourseURL.routeToTag($(e.target).closest("a")[0]);
+      if (wantsNewWindow(e)) {
+        return;
+      }
+
+      e.preventDefault();
+      DiscourseURL.routeTo(this.attrs.href);
     }
   }
 });
@@ -267,12 +278,7 @@ export default createWidget("hamburger-menu", {
   panelContents() {
     const { currentUser } = this;
     const results = [];
-
-    let faqUrl = this.siteSettings.faq_url;
-    if (!faqUrl || faqUrl.length === 0) {
-      faqUrl = getURL("/faq");
-    }
-
+    const faqUrl = this.siteSettings.faq_url || getURL("/faq");
     const prioritizeFaq =
       this.settings.showFAQ && this.currentUser && !this.currentUser.read_faq;
 

From 9b30e8126e92a1b902735ce99134f9af76c3a689 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 16 Jun 2020 11:40:12 -0400
Subject: [PATCH 1712/1830] Build(deps): Bump excon from 0.73.0 to 0.74.0
 (#10046)

Bumps [excon](https://github.com/excon/excon) from 0.73.0 to 0.74.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.73.0...v0.74.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 3644acd33f..a103aa2ba4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -121,7 +121,7 @@ GEM
       railties (>= 3.1)
     ember-source (2.18.2)
     erubi (1.9.0)
-    excon (0.73.0)
+    excon (0.74.0)
     execjs (2.7.0)
     exifr (1.3.6)
     fabrication (2.21.1)

From 78aff841e3215c875e79692fbeaf8d18c4514006 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 16 Jun 2020 17:41:15 +0200
Subject: [PATCH 1713/1830] DEV: Remove the remaining ENV["TRAVIS"] usage
 (#10041)

---
 lib/tasks/docker.rake                         | 19 +----
 script/docker_test.rb                         | 11 +--
 spec/models/optimized_image_spec.rb           | 38 +++++-----
 spec/requests/user_avatars_controller_spec.rb | 73 +++++++++----------
 4 files changed, 56 insertions(+), 85 deletions(-)

diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index 47af6ba468..249ca99000 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -58,9 +58,9 @@ desc 'Run all tests (JS and code in a standalone environment)'
 task 'docker:test' do
   begin
     @good = true
+
     unless ENV['SKIP_LINT']
       @good &&= run_or_fail("yarn install")
-      puts "travis_fold:start:lint" if ENV["TRAVIS"]
       puts "Running linters/prettyfiers"
       puts "eslint #{`yarn eslint -v`}"
       puts "prettier #{`yarn prettier -v`}"
@@ -93,11 +93,9 @@ task 'docker:test' do
           @good &&= run_or_fail('yarn prettier --list-different "plugins/**/*.scss" "plugins/**/*.es6"')
         end
       end
-      puts "travis_fold:end:lint" if ENV["TRAVIS"]
     end
 
     unless ENV['SKIP_TESTS']
-      puts "travis_fold:start:prepare_tests" if ENV["TRAVIS"]
       puts "Cleaning up old test tmp data in tmp/test_data"
       `rm -fr tmp/test_data && mkdir -p tmp/test_data/redis && mkdir tmp/test_data/pg`
 
@@ -155,11 +153,7 @@ task 'docker:test' do
         @good &&= run_or_fail("#{command_prefix}bundle exec rake parallel:migrate")
       end
 
-      puts "travis_fold:end:prepare_tests" if ENV["TRAVIS"]
-
       unless ENV["JS_ONLY"]
-        puts "travis_fold:start:ruby_tests" if ENV["TRAVIS"]
-
         if ENV['WARMUP_TMP_FOLDER']
           run_or_fail('bundle exec rspec ./spec/requests/groups_controller_spec.rb')
         end
@@ -210,13 +204,11 @@ task 'docker:test' do
             @good &&= run_or_fail("#{fail_fast} bundle exec rake plugin:spec")
           end
         end
-        puts "travis_fold:end:ruby_tests" if ENV["TRAVIS"]
       end
 
       unless ENV["RUBY_ONLY"]
         js_timeout = ENV["JS_TIMEOUT"].presence || 900_000 # 15 minutes
 
-        puts "travis_fold:start:js_tests" if ENV["TRAVIS"]
         unless ENV["SKIP_CORE"]
           @good &&= run_or_fail("bundle exec rake qunit:test['#{js_timeout}']")
           @good &&= run_or_fail("bundle exec rake qunit:test['#{js_timeout}','/wizard/qunit']")
@@ -229,12 +221,9 @@ task 'docker:test' do
             @good &&= run_or_fail("bundle exec rake plugin:qunit['*','#{js_timeout}']")
           end
         end
-        puts "travis_fold:end:js_tests" if ENV["TRAVIS"]
       end
     end
-
   ensure
-    puts "travis_fold:start:terminating" if ENV["TRAVIS"]
     puts "Terminating"
 
     if ENV['PAUSE_ON_TERMINATE']
@@ -246,11 +235,7 @@ task 'docker:test' do
     Process.kill("TERM", @pg_pid) if @pg_pid
     Process.wait @redis_pid if @redis_pid
     Process.wait @pg_pid if @pg_pid
-    puts "travis_fold:end:terminating" if ENV["TRAVIS"]
-  end
-
-  if !@good
-    exit 1
   end
 
+  exit 1 unless @good
 end
diff --git a/script/docker_test.rb b/script/docker_test.rb
index 3696a53159..db73d531be 100644
--- a/script/docker_test.rb
+++ b/script/docker_test.rb
@@ -8,8 +8,6 @@
 # => RUN_SMOKE_TESTS  executes the smoke tests instead of the regular tests from docker.rake
 # See lib/tasks/docker.rake and lib/tasks/smoke_test.rake for more information
 
-puts "travis_fold:end:starting_docker_container" if ENV["TRAVIS"]
-
 def log(message)
   puts "[#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}] #{message}"
 end
@@ -22,24 +20,17 @@ def run_or_fail(command)
 end
 
 unless ENV['NO_UPDATE']
-  puts "travis_fold:start:pulling_latest_discourse" if ENV["TRAVIS"]
-
   run_or_fail("git reset --hard")
-
   run_or_fail("git fetch")
 
   checkout = ENV['COMMIT_HASH'] || "FETCH_HEAD"
   run_or_fail("LEFTHOOK=0 git checkout #{checkout}")
 
-  puts "travis_fold:end:pulling_latest_discourse" if ENV["TRAVIS"]
-  puts "travis_fold:start:bundle" if ENV["TRAVIS"]
-
   run_or_fail("bundle")
-
-  puts "travis_fold:end:bundle" if ENV["TRAVIS"]
 end
 
 log("Running tests")
+
 if ENV['RUN_SMOKE_TESTS']
   run_or_fail("bundle exec rake smoke:test")
 else
diff --git a/spec/models/optimized_image_spec.rb b/spec/models/optimized_image_spec.rb
index e90029bec3..bf736065f1 100644
--- a/spec/models/optimized_image_spec.rb
+++ b/spec/models/optimized_image_spec.rb
@@ -6,31 +6,29 @@ describe OptimizedImage do
   let(:upload) { build(:upload) }
   before { upload.id = 42 }
 
-  unless ENV["TRAVIS"]
-    describe '.crop' do
-      it 'should produce cropped images (requires ImageMagick 7)' do
-        tmp_path = "/tmp/cropped.png"
+  describe '.crop' do
+    it 'should produce cropped images (requires ImageMagick 7)' do
+      tmp_path = "/tmp/cropped.png"
 
-        begin
-          OptimizedImage.crop(
-            "#{Rails.root}/spec/fixtures/images/logo.png",
-            tmp_path,
-            5,
-            5
-          )
+      begin
+        OptimizedImage.crop(
+          "#{Rails.root}/spec/fixtures/images/logo.png",
+          tmp_path,
+          5,
+          5
+        )
 
-          # we don't want to deal with something new here every time image magick
-          # is upgraded or pngquant is upgraded, lets just test the basics ...
-          # cropped image should be less than 120 bytes
+        # we don't want to deal with something new here every time image magick
+        # is upgraded or pngquant is upgraded, lets just test the basics ...
+        # cropped image should be less than 120 bytes
 
-          cropped_size = File.size(tmp_path)
+        cropped_size = File.size(tmp_path)
 
-          expect(cropped_size).to be < 120
-          expect(cropped_size).to be > 50
+        expect(cropped_size).to be < 120
+        expect(cropped_size).to be > 50
 
-        ensure
-          File.delete(tmp_path) if File.exists?(tmp_path)
-        end
+      ensure
+        File.delete(tmp_path) if File.exists?(tmp_path)
       end
     end
 
diff --git a/spec/requests/user_avatars_controller_spec.rb b/spec/requests/user_avatars_controller_spec.rb
index 4f639fd15b..e94774de91 100644
--- a/spec/requests/user_avatars_controller_spec.rb
+++ b/spec/requests/user_avatars_controller_spec.rb
@@ -24,48 +24,45 @@ describe UserAvatarsController do
       after do
         FileUtils.rm(Discourse.store.path_for(upload))
       end
-      # travis is not good here, no image magick
-      if !ENV["TRAVIS"]
-        let :upload do
-          File.open(file_from_fixtures("cropped.png")) do |f|
-            UploadCreator.new(
-              f,
-              "test.png"
-            ).create_for(-1)
-          end
-        end
 
-        let :user do
-          user = Fabricate(:user)
-          user.user_avatar.update_columns(custom_upload_id: upload.id)
-          user.update_columns(uploaded_avatar_id: upload.id)
-          user
-        end
-
-        it 'automatically corrects bad avatar extensions' do
-          orig = Discourse.store.path_for(upload)
-
-          upload.update_columns(
-            original_filename: 'bob.jpg',
-            extension: 'jpg',
-            url: upload.url + '.jpg'
-          )
-
-          # at this point file is messed up
-          FileUtils.mv(orig, Discourse.store.path_for(upload))
-
-          SiteSetting.avatar_sizes = "50"
-
-          get "/user_avatar/default/#{user.username}/50/#{upload.id}.png"
-
-          expect(OptimizedImage.where(upload_id: upload.id).count).to eq(1)
-          expect(response.status).to eq(200)
-
-          upload.reload
-          expect(upload.extension).to eq('png')
+      let :upload do
+        File.open(file_from_fixtures("cropped.png")) do |f|
+          UploadCreator.new(
+            f,
+            "test.png"
+          ).create_for(-1)
         end
       end
 
+      let :user do
+        user = Fabricate(:user)
+        user.user_avatar.update_columns(custom_upload_id: upload.id)
+        user.update_columns(uploaded_avatar_id: upload.id)
+        user
+      end
+
+      it 'automatically corrects bad avatar extensions' do
+        orig = Discourse.store.path_for(upload)
+
+        upload.update_columns(
+          original_filename: 'bob.jpg',
+          extension: 'jpg',
+          url: upload.url + '.jpg'
+        )
+
+        # at this point file is messed up
+        FileUtils.mv(orig, Discourse.store.path_for(upload))
+
+        SiteSetting.avatar_sizes = "50"
+
+        get "/user_avatar/default/#{user.username}/50/#{upload.id}.png"
+
+        expect(OptimizedImage.where(upload_id: upload.id).count).to eq(1)
+        expect(response.status).to eq(200)
+
+        upload.reload
+        expect(upload.extension).to eq('png')
+      end
     end
 
     it 'handles non local content correctly' do

From 669c940ec3bb645f3f7abe57d1d8e38870fa395d Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 16 Jun 2020 19:36:40 +0200
Subject: [PATCH 1714/1830] Revert "DEV: Remove the remaining ENV["TRAVIS"]
 usage (#10041)"

This reverts commit 78aff841e3215c875e79692fbeaf8d18c4514006.

See https://review.discourse.org/t/dev-remove-the-remaining-env-travis-usage-10041/12737/4?u=cvx
---
 lib/tasks/docker.rake                         | 19 ++++-
 script/docker_test.rb                         | 11 ++-
 spec/models/optimized_image_spec.rb           | 38 +++++-----
 spec/requests/user_avatars_controller_spec.rb | 73 ++++++++++---------
 4 files changed, 85 insertions(+), 56 deletions(-)

diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index 249ca99000..47af6ba468 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -58,9 +58,9 @@ desc 'Run all tests (JS and code in a standalone environment)'
 task 'docker:test' do
   begin
     @good = true
-
     unless ENV['SKIP_LINT']
       @good &&= run_or_fail("yarn install")
+      puts "travis_fold:start:lint" if ENV["TRAVIS"]
       puts "Running linters/prettyfiers"
       puts "eslint #{`yarn eslint -v`}"
       puts "prettier #{`yarn prettier -v`}"
@@ -93,9 +93,11 @@ task 'docker:test' do
           @good &&= run_or_fail('yarn prettier --list-different "plugins/**/*.scss" "plugins/**/*.es6"')
         end
       end
+      puts "travis_fold:end:lint" if ENV["TRAVIS"]
     end
 
     unless ENV['SKIP_TESTS']
+      puts "travis_fold:start:prepare_tests" if ENV["TRAVIS"]
       puts "Cleaning up old test tmp data in tmp/test_data"
       `rm -fr tmp/test_data && mkdir -p tmp/test_data/redis && mkdir tmp/test_data/pg`
 
@@ -153,7 +155,11 @@ task 'docker:test' do
         @good &&= run_or_fail("#{command_prefix}bundle exec rake parallel:migrate")
       end
 
+      puts "travis_fold:end:prepare_tests" if ENV["TRAVIS"]
+
       unless ENV["JS_ONLY"]
+        puts "travis_fold:start:ruby_tests" if ENV["TRAVIS"]
+
         if ENV['WARMUP_TMP_FOLDER']
           run_or_fail('bundle exec rspec ./spec/requests/groups_controller_spec.rb')
         end
@@ -204,11 +210,13 @@ task 'docker:test' do
             @good &&= run_or_fail("#{fail_fast} bundle exec rake plugin:spec")
           end
         end
+        puts "travis_fold:end:ruby_tests" if ENV["TRAVIS"]
       end
 
       unless ENV["RUBY_ONLY"]
         js_timeout = ENV["JS_TIMEOUT"].presence || 900_000 # 15 minutes
 
+        puts "travis_fold:start:js_tests" if ENV["TRAVIS"]
         unless ENV["SKIP_CORE"]
           @good &&= run_or_fail("bundle exec rake qunit:test['#{js_timeout}']")
           @good &&= run_or_fail("bundle exec rake qunit:test['#{js_timeout}','/wizard/qunit']")
@@ -221,9 +229,12 @@ task 'docker:test' do
             @good &&= run_or_fail("bundle exec rake plugin:qunit['*','#{js_timeout}']")
           end
         end
+        puts "travis_fold:end:js_tests" if ENV["TRAVIS"]
       end
     end
+
   ensure
+    puts "travis_fold:start:terminating" if ENV["TRAVIS"]
     puts "Terminating"
 
     if ENV['PAUSE_ON_TERMINATE']
@@ -235,7 +246,11 @@ task 'docker:test' do
     Process.kill("TERM", @pg_pid) if @pg_pid
     Process.wait @redis_pid if @redis_pid
     Process.wait @pg_pid if @pg_pid
+    puts "travis_fold:end:terminating" if ENV["TRAVIS"]
+  end
+
+  if !@good
+    exit 1
   end
 
-  exit 1 unless @good
 end
diff --git a/script/docker_test.rb b/script/docker_test.rb
index db73d531be..3696a53159 100644
--- a/script/docker_test.rb
+++ b/script/docker_test.rb
@@ -8,6 +8,8 @@
 # => RUN_SMOKE_TESTS  executes the smoke tests instead of the regular tests from docker.rake
 # See lib/tasks/docker.rake and lib/tasks/smoke_test.rake for more information
 
+puts "travis_fold:end:starting_docker_container" if ENV["TRAVIS"]
+
 def log(message)
   puts "[#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}] #{message}"
 end
@@ -20,17 +22,24 @@ def run_or_fail(command)
 end
 
 unless ENV['NO_UPDATE']
+  puts "travis_fold:start:pulling_latest_discourse" if ENV["TRAVIS"]
+
   run_or_fail("git reset --hard")
+
   run_or_fail("git fetch")
 
   checkout = ENV['COMMIT_HASH'] || "FETCH_HEAD"
   run_or_fail("LEFTHOOK=0 git checkout #{checkout}")
 
+  puts "travis_fold:end:pulling_latest_discourse" if ENV["TRAVIS"]
+  puts "travis_fold:start:bundle" if ENV["TRAVIS"]
+
   run_or_fail("bundle")
+
+  puts "travis_fold:end:bundle" if ENV["TRAVIS"]
 end
 
 log("Running tests")
-
 if ENV['RUN_SMOKE_TESTS']
   run_or_fail("bundle exec rake smoke:test")
 else
diff --git a/spec/models/optimized_image_spec.rb b/spec/models/optimized_image_spec.rb
index bf736065f1..e90029bec3 100644
--- a/spec/models/optimized_image_spec.rb
+++ b/spec/models/optimized_image_spec.rb
@@ -6,29 +6,31 @@ describe OptimizedImage do
   let(:upload) { build(:upload) }
   before { upload.id = 42 }
 
-  describe '.crop' do
-    it 'should produce cropped images (requires ImageMagick 7)' do
-      tmp_path = "/tmp/cropped.png"
+  unless ENV["TRAVIS"]
+    describe '.crop' do
+      it 'should produce cropped images (requires ImageMagick 7)' do
+        tmp_path = "/tmp/cropped.png"
 
-      begin
-        OptimizedImage.crop(
-          "#{Rails.root}/spec/fixtures/images/logo.png",
-          tmp_path,
-          5,
-          5
-        )
+        begin
+          OptimizedImage.crop(
+            "#{Rails.root}/spec/fixtures/images/logo.png",
+            tmp_path,
+            5,
+            5
+          )
 
-        # we don't want to deal with something new here every time image magick
-        # is upgraded or pngquant is upgraded, lets just test the basics ...
-        # cropped image should be less than 120 bytes
+          # we don't want to deal with something new here every time image magick
+          # is upgraded or pngquant is upgraded, lets just test the basics ...
+          # cropped image should be less than 120 bytes
 
-        cropped_size = File.size(tmp_path)
+          cropped_size = File.size(tmp_path)
 
-        expect(cropped_size).to be < 120
-        expect(cropped_size).to be > 50
+          expect(cropped_size).to be < 120
+          expect(cropped_size).to be > 50
 
-      ensure
-        File.delete(tmp_path) if File.exists?(tmp_path)
+        ensure
+          File.delete(tmp_path) if File.exists?(tmp_path)
+        end
       end
     end
 
diff --git a/spec/requests/user_avatars_controller_spec.rb b/spec/requests/user_avatars_controller_spec.rb
index e94774de91..4f639fd15b 100644
--- a/spec/requests/user_avatars_controller_spec.rb
+++ b/spec/requests/user_avatars_controller_spec.rb
@@ -24,45 +24,48 @@ describe UserAvatarsController do
       after do
         FileUtils.rm(Discourse.store.path_for(upload))
       end
+      # travis is not good here, no image magick
+      if !ENV["TRAVIS"]
+        let :upload do
+          File.open(file_from_fixtures("cropped.png")) do |f|
+            UploadCreator.new(
+              f,
+              "test.png"
+            ).create_for(-1)
+          end
+        end
 
-      let :upload do
-        File.open(file_from_fixtures("cropped.png")) do |f|
-          UploadCreator.new(
-            f,
-            "test.png"
-          ).create_for(-1)
+        let :user do
+          user = Fabricate(:user)
+          user.user_avatar.update_columns(custom_upload_id: upload.id)
+          user.update_columns(uploaded_avatar_id: upload.id)
+          user
+        end
+
+        it 'automatically corrects bad avatar extensions' do
+          orig = Discourse.store.path_for(upload)
+
+          upload.update_columns(
+            original_filename: 'bob.jpg',
+            extension: 'jpg',
+            url: upload.url + '.jpg'
+          )
+
+          # at this point file is messed up
+          FileUtils.mv(orig, Discourse.store.path_for(upload))
+
+          SiteSetting.avatar_sizes = "50"
+
+          get "/user_avatar/default/#{user.username}/50/#{upload.id}.png"
+
+          expect(OptimizedImage.where(upload_id: upload.id).count).to eq(1)
+          expect(response.status).to eq(200)
+
+          upload.reload
+          expect(upload.extension).to eq('png')
         end
       end
 
-      let :user do
-        user = Fabricate(:user)
-        user.user_avatar.update_columns(custom_upload_id: upload.id)
-        user.update_columns(uploaded_avatar_id: upload.id)
-        user
-      end
-
-      it 'automatically corrects bad avatar extensions' do
-        orig = Discourse.store.path_for(upload)
-
-        upload.update_columns(
-          original_filename: 'bob.jpg',
-          extension: 'jpg',
-          url: upload.url + '.jpg'
-        )
-
-        # at this point file is messed up
-        FileUtils.mv(orig, Discourse.store.path_for(upload))
-
-        SiteSetting.avatar_sizes = "50"
-
-        get "/user_avatar/default/#{user.username}/50/#{upload.id}.png"
-
-        expect(OptimizedImage.where(upload_id: upload.id).count).to eq(1)
-        expect(response.status).to eq(200)
-
-        upload.reload
-        expect(upload.extension).to eq('png')
-      end
     end
 
     it 'handles non local content correctly' do

From c52191d49e321f23d088285b6eef8fab6ccfe4cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Tue, 16 Jun 2020 19:55:08 +0200
Subject: [PATCH 1715/1830] PERF: improve loading a imported_ids in bulk
 imports

- Stream the queries that load the imported_ids
- Use an array instead of a hash for keeping the mapping between imported_ids and new ids
- Ensure we always treat the imported_ids as integers instead of strings
---
 script/bulk_import/base.rb | 65 ++++++++++++++++++++++++--------------
 1 file changed, 42 insertions(+), 23 deletions(-)

diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb
index 9fc7b1cd17..7ac31295b9 100644
--- a/script/bulk_import/base.rb
+++ b/script/bulk_import/base.rb
@@ -77,7 +77,6 @@ class BulkImport::Base
     db = ActiveRecord::Base.connection_config
     @encoder = PG::TextEncoder::CopyRow.new
     @raw_connection = PG.connect(dbname: db[:database], host: db[:host_names]&.first, port: db[:port])
-    # @raw_connection = PG.connect(dbname: db[:database], host: db[:host_names]&.first, port: db[:port], password: "discourse")
     @uploader = ImportScripts::Uploader.new
     @html_entities = HTMLEntities.new
     @encoding = CHARSET_MAP[charset]
@@ -128,28 +127,44 @@ class BulkImport::Base
     SQL
   end
 
+  def imported_ids(name)
+    map = []
+    ids = []
+
+    @raw_connection.send_query("SELECT value, #{name}_id FROM #{name}_custom_fields WHERE name = 'import_id'")
+    @raw_connection.set_single_row_mode
+
+    @raw_connection.get_result.stream_each do |row|
+      id = row["value"].to_i
+      ids << id
+      map[id] = row["#{name}_id"]
+    end
+
+    @raw_connection.get_result
+
+    [map, ids]
+  end
+
   def load_imported_ids
     puts "Loading imported group ids..."
-    @groups = GroupCustomField.where(name: "import_id").pluck(:value, :group_id).to_h
-    @last_imported_group_id = @groups.keys.map(&:to_i).max || -1
+    @groups, imported_group_ids = imported_ids("group")
+    @last_imported_group_id = imported_group_ids.max || -1
 
     puts "Loading imported user ids..."
-    @users = UserCustomField.where(name: "import_id").pluck(:value, :user_id).to_h
-    @last_imported_user_id = @users.keys.map(&:to_i).max || -1
+    @users, imported_user_ids = imported_ids("user")
+    @last_imported_user_id = imported_user_ids.max || -1
 
     puts "Loading imported category ids..."
-    @categories = CategoryCustomField.where(name: "import_id").pluck(:value, :category_id).to_h
-    @last_imported_category_id = @categories.keys.map(&:to_i).max || -1
+    @categories, imported_category_ids = imported_ids("category")
+    @last_imported_category_id = imported_category_ids.max || -1
 
     puts "Loading imported topic ids..."
-    @topics = TopicCustomField.where(name: "import_id").pluck(:value, :topic_id).to_h
-    imported_topic_ids = @topics.keys.map(&:to_i)
+    @topics, imported_topic_ids = imported_ids("topic")
     @last_imported_topic_id = imported_topic_ids.select { |id| id < PRIVATE_OFFSET }.max || -1
     @last_imported_private_topic_id = imported_topic_ids.select { |id| id > PRIVATE_OFFSET }.max || (PRIVATE_OFFSET - 1)
 
     puts "Loading imported post ids..."
-    @posts = PostCustomField.where(name: "import_id").pluck(:value, :post_id).to_h
-    imported_post_ids = @posts.keys.map(&:to_i)
+    @posts, imported_post_ids = imported_ids("post")
     @last_imported_post_id = imported_post_ids.select { |id| id < PRIVATE_OFFSET }.max || -1
     @last_imported_private_post_id = imported_post_ids.select { |id| id > PRIVATE_OFFSET }.max || (PRIVATE_OFFSET - 1)
   end
@@ -208,19 +223,23 @@ class BulkImport::Base
   end
 
   def group_id_from_imported_id(id)
-    @groups[id.to_s]
+    @groups[id.to_i]
   end
+
   def user_id_from_imported_id(id)
-    @users[id.to_s]
+    @users[id.to_i]
   end
+
   def category_id_from_imported_id(id)
-    @categories[id.to_s]
+    @categories[id.to_i]
   end
+
   def topic_id_from_imported_id(id)
-    @topics[id.to_s]
+    @topics[id.to_i]
   end
+
   def post_id_from_imported_id(id)
-    @posts[id.to_s]
+    @posts[id.to_i]
   end
 
   def post_number_from_imported_id(id)
@@ -337,7 +356,7 @@ class BulkImport::Base
   end
 
   def process_group(group)
-    @groups[group[:imported_id].to_s] = group[:id] = @last_group_id += 1
+    @groups[group[:imported_id].to_i] = group[:id] = @last_group_id += 1
 
     group[:name] = fix_name(group[:name])
 
@@ -356,7 +375,7 @@ class BulkImport::Base
   end
 
   def process_user(user)
-    @users[user[:imported_id].to_s] = user[:id] = @last_user_id += 1
+    @users[user[:imported_id].to_i] = user[:id] = @last_user_id += 1
 
     imported_username = user[:username].dup
 
@@ -392,7 +411,7 @@ class BulkImport::Base
 
   def process_user_email(user_email)
     user_email[:id] = @last_user_email_id += 1
-    user_email[:user_id] = @users[user_email[:imported_user_id].to_s]
+    user_email[:user_id] = @users[user_email[:imported_user_id].to_i]
     user_email[:primary] = true
     user_email[:created_at] ||= NOW
     user_email[:updated_at] ||= user_email[:created_at]
@@ -403,7 +422,7 @@ class BulkImport::Base
   end
 
   def process_user_stat(user_stat)
-    user_stat[:user_id] = @users[user_stat[:imported_user_id].to_s]
+    user_stat[:user_id] = @users[user_stat[:imported_user_id].to_i]
     user_stat[:topic_reply_count] = user_stat[:post_count] - user_stat[:topic_count]
     user_stat[:topics_entered] ||= 0
     user_stat[:time_read] ||= 0
@@ -434,7 +453,7 @@ class BulkImport::Base
 
   def process_category(category)
     category[:id] ||= @last_category_id += 1
-    @categories[category[:imported_id].to_s] ||= category[:id]
+    @categories[category[:imported_id].to_i] ||= category[:id]
     category[:name] = category[:name][0...50].scrub.strip
     # TODO: unique name
     category[:name_lower] = category[:name].downcase
@@ -447,7 +466,7 @@ class BulkImport::Base
   end
 
   def process_topic(topic)
-    @topics[topic[:imported_id].to_s] = topic[:id] = @last_topic_id += 1
+    @topics[topic[:imported_id].to_i] = topic[:id] = @last_topic_id += 1
     topic[:archetype] ||= Archetype.default
     topic[:title] = topic[:title][0...255].scrub.strip
     topic[:fancy_title] ||= pre_fancy(topic[:title])
@@ -465,7 +484,7 @@ class BulkImport::Base
   end
 
   def process_post(post)
-    @posts[post[:imported_id].to_s] = post[:id] = @last_post_id += 1
+    @posts[post[:imported_id].to_i] = post[:id] = @last_post_id += 1
     post[:user_id] ||= Discourse::SYSTEM_USER_ID
     post[:last_editor_id] = post[:user_id]
     @highest_post_number_by_topic_id[post[:topic_id]] ||= 0

From 7f8c5cf70b3676f67fa71ba5e36fec71d2b0ceca Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 16 Jun 2020 14:30:25 -0400
Subject: [PATCH 1716/1830] FIX: Allow plugins to provide test directories with
 transpiled `.js`

---
 lib/plugin/instance.rb               | 3 +++
 test/javascripts/plugin_tests.js.erb | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 302076e509..20419fe3ca 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -548,6 +548,9 @@ class Plugin::Instance
       if transpile_js
         DiscourseJsProcessor.plugin_transpile_paths << root_path.sub(Rails.root.to_s, '').sub(/^\/*/, '')
         DiscourseJsProcessor.plugin_transpile_paths << admin_path.sub(Rails.root.to_s, '').sub(/^\/*/, '')
+
+        test_path = "#{root_dir_name}/test/javascripts"
+        DiscourseJsProcessor.plugin_transpile_paths << test_path.sub(Rails.root.to_s, '').sub(/^\/*/, '')
       end
     end
 
diff --git a/test/javascripts/plugin_tests.js.erb b/test/javascripts/plugin_tests.js.erb
index a7b2f9a36d..5709a19399 100644
--- a/test/javascripts/plugin_tests.js.erb
+++ b/test/javascripts/plugin_tests.js.erb
@@ -12,8 +12,9 @@
   Discourse.plugins.each do |p|
     root_path = "#{File.dirname(p.path)}/test/javascripts"
 
-    Dir.glob(root_path + '/**/**.es6').each do |f|
-      require_asset(f)
-    end
+    to_glob = [root_path + '/**/**.es6']
+    to_glob << (root_path + '/**/**.js') if p.transpile_js
+
+    Dir.glob(to_glob) { |f| require_asset(f) }
   end
 %>

From a3e812453ede5ad4a8ae00188c7aaf1fca4f77fc Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Tue, 16 Jun 2020 11:53:36 -0700
Subject: [PATCH 1717/1830] FEATURE: new category-list-above-each-category
 plugin outlet (#10037)

---
 .../discourse/app/templates/components/categories-only.hbs       | 1 +
 .../app/templates/mobile/components/categories-only.hbs          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
index 787968d3d5..e030adc4a3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
@@ -11,6 +11,7 @@
     </thead>
     <tbody aria-labelledby="categories-only-category">
       {{#each categories as |c|}}
+        {{plugin-outlet name="category-list-above-each-category" connectorTagName="" tagName="" args=(hash category=c)}}
         <tr data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} class="{{if c.description_excerpt "has-description" "no-description"}} {{if c.uploaded_logo.url "has-logo" "no-logo"}}">
           <td class="category {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-style"}}" style={{unless noCategoryStyle (border-color c.color)}}>
             {{category-title-link category=c}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
index 04cf4d8578..e42372b29c 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
@@ -1,6 +1,7 @@
 {{#if categories}}
   <div class="category-list {{if showTopics "with-topics"}}">
     {{#each categories as |c|}}
+      {{plugin-outlet name="category-list-above-each-category" connectorTagName="" tagName="" args=(hash category=c)}}
       <div data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} style={{border-color c.color}} class="category-list-item category {{if c.isMuted "muted"}}">
         <table class="topic-list">
           <tbody>

From b62ad003ce6c8043a6a15ec7ece2db10f2855c51 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 17 Jun 2020 10:08:53 +1000
Subject: [PATCH 1718/1830] Always require pry gems in rails_helper

* remove IMPROVED_SPEC_DEBUGGING env var guard
---
 spec/rails_helper.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index dd4879d7fe..6b6d1265b0 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -8,11 +8,9 @@ end
 require 'rubygems'
 require 'rbtrace'
 
-if ENV['IMPROVED_SPEC_DEBUGGING']
-  require 'pry'
-  require 'pry-byebug'
-  require 'pry-rails'
-end
+require 'pry'
+require 'pry-byebug'
+require 'pry-rails'
 
 # Loading more in this block will cause your tests to run faster. However,
 # if you change any configuration or code from libraries loaded here, you'll

From dcb816b54811466145cb8dfc27f58c3179dcdbb3 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 17 Jun 2020 10:40:01 +1000
Subject: [PATCH 1719/1830] FIX: add table name to topic view query (#10052)

When plugin is hooking into TopicView joining other tables, it may fail because `created_at` is potentially available on 2 tables. Therefore we should explicitly define which `created_at` we want.
---
 lib/topic_view.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 42405f8e33..0ab7c7f060 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -546,7 +546,7 @@ class TopicView
       columns = [:id]
 
       if !is_mega_topic?
-        columns << 'EXTRACT(DAYS FROM CURRENT_TIMESTAMP - created_at)::INT AS days_ago'
+        columns << 'EXTRACT(DAYS FROM CURRENT_TIMESTAMP - posts.created_at)::INT AS days_ago'
       end
 
       posts.pluck(*columns)

From e5da2d24e543c86868768de235b8eedab1ee6ee1 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 17 Jun 2020 11:16:37 +1000
Subject: [PATCH 1720/1830] FIX: Add attachment content-disposition for all
 non-image files (#10058)

This will make it so the original filename is used when downloading all non-image files, bringing S3Store into line with the to_s3 migration and local storage. Video and audio files will still stream correctly in HTML players as well.

See https://meta.discourse.org/t/cannot-download-non-image-media-files-original-filenames-lost-when-uploaded-to-s3/152797 for a lot of extra context.
---
 lib/file_store/s3_store.rb      |  10 ++++--
 spec/fixtures/media/small.mp3   | Bin 0 -> 443926 bytes
 spec/fixtures/media/small.mp4   | Bin 0 -> 1055736 bytes
 spec/multisite/s3_store_spec.rb |  54 ++++++++++++++++++++++++++++++--
 4 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 spec/fixtures/media/small.mp3
 create mode 100644 spec/fixtures/media/small.mp4

diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index 5007b741e8..4183e973cf 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -53,8 +53,14 @@ module FileStore
         cache_control: 'max-age=31556952, public, immutable',
         content_type: opts[:content_type].presence || MiniMime.lookup_by_filename(filename)&.content_type
       }
-      # add a "content disposition" header for "attachments"
-      options[:content_disposition] = "attachment; filename=\"#{filename}\"" unless FileHelper.is_supported_media?(filename)
+
+      # add a "content disposition: attachment" header with the original filename
+      # for everything but images. audio and video will still stream correctly in
+      # HTML players, and when a direct link is provided to any file but an image
+      # it will download correctly in the browser.
+      if !FileHelper.is_supported_image?(filename)
+        options[:content_disposition] = "attachment; filename=\"#{filename}\""
+      end
 
       path.prepend(File.join(upload_path, "/")) if Rails.configuration.multisite
 
diff --git a/spec/fixtures/media/small.mp3 b/spec/fixtures/media/small.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..084a7d1f8d13f74530095ab463c4b0b3bd809d97
GIT binary patch
literal 443926
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%0DyrxNkX0mlQKe<i5Z97BBj1P
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
Jf3$tT{{uAU57Ynv

literal 0
HcmV?d00001

diff --git a/spec/fixtures/media/small.mp4 b/spec/fixtures/media/small.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..ed139d6d50cc43f89c27392621f20d174d0bf051
GIT binary patch
literal 1055736
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%0DXThCjUf28ZIq
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%0DrLw9SCo%@l#CH~*0
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%0D<a1h<VdxNIV3u6|
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
J0zy{>{vUa>X^{W`

literal 0
HcmV?d00001

diff --git a/spec/multisite/s3_store_spec.rb b/spec/multisite/s3_store_spec.rb
index 5681a1df8d..a4c0f3e02a 100644
--- a/spec/multisite/s3_store_spec.rb
+++ b/spec/multisite/s3_store_spec.rb
@@ -4,12 +4,13 @@ require 'rails_helper'
 require 'file_store/s3_store'
 
 RSpec.describe 'Multisite s3 uploads', type: :multisite do
-  let(:uploaded_file) { file_from_fixtures("smallest.png") }
+  let(:original_filename) { "smallest.png" }
+  let(:uploaded_file) { file_from_fixtures(original_filename) }
   let(:upload_sha1) { Digest::SHA1.hexdigest(File.read(uploaded_file)) }
   let(:upload_path) { Discourse.store.upload_path }
 
   def build_upload
-    Fabricate.build(:upload, sha1: upload_sha1, id: 1)
+    Fabricate.build(:upload, sha1: upload_sha1, id: 1, original_filename: original_filename)
   end
 
   context 'uploading to s3' do
@@ -24,6 +25,55 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
       let(:s3_client) { Aws::S3::Client.new(stub_responses: true) }
       let(:s3_helper) { S3Helper.new(SiteSetting.s3_upload_bucket, '', client: s3_client) }
       let(:store) { FileStore::S3Store.new(s3_helper) }
+      let(:upload_opts) do
+        {
+          acl: "public-read",
+          cache_control: "max-age=31556952, public, immutable",
+          content_type: "image/png"
+        }
+      end
+
+      it "does not provide a content_disposition for images" do
+        s3_helper.expects(:upload).with(uploaded_file, kind_of(String), upload_opts).returns(["path", "etag"])
+        upload = build_upload
+        store.store_upload(uploaded_file, upload)
+      end
+
+      context "when the file is a PDF" do
+        let(:original_filename) { "small.pdf" }
+        let(:uploaded_file) { file_from_fixtures("small.pdf", "pdf") }
+
+        it "adds an attachment content-disposition with the original filename" do
+          disp_opts = { content_disposition: "attachment; filename=\"#{original_filename}\"", content_type: "application/pdf" }
+          s3_helper.expects(:upload).with(uploaded_file, kind_of(String), upload_opts.merge(disp_opts)).returns(["path", "etag"])
+          upload = build_upload
+          store.store_upload(uploaded_file, upload)
+        end
+      end
+
+      context "when the file is a video" do
+        let(:original_filename) { "small.mp4" }
+        let(:uploaded_file) { file_from_fixtures("small.mp4", "media") }
+
+        it "adds an attachment content-disposition with the original filename" do
+          disp_opts = { content_disposition: "attachment; filename=\"#{original_filename}\"", content_type: "application/mp4" }
+          s3_helper.expects(:upload).with(uploaded_file, kind_of(String), upload_opts.merge(disp_opts)).returns(["path", "etag"])
+          upload = build_upload
+          store.store_upload(uploaded_file, upload)
+        end
+      end
+
+      context "when the file is audio" do
+        let(:original_filename) { "small.mp3" }
+        let(:uploaded_file) { file_from_fixtures("small.mp3", "media") }
+
+        it "adds an attachment content-disposition with the original filename" do
+          disp_opts = { content_disposition: "attachment; filename=\"#{original_filename}\"", content_type: "audio/mpeg" }
+          s3_helper.expects(:upload).with(uploaded_file, kind_of(String), upload_opts.merge(disp_opts)).returns(["path", "etag"])
+          upload = build_upload
+          store.store_upload(uploaded_file, upload)
+        end
+      end
 
       it "returns the correct url for default and second multisite db" do
         test_multisite_connection('default') do

From 561079270440e485d27e9729e9831537c3366edc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 16 Jun 2020 21:24:23 +0000
Subject: [PATCH 1721/1830] Build(deps): Bump loofah from 2.5.0 to 2.6.0

Bumps [loofah](https://github.com/flavorjones/loofah) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.5.0...v2.6.0)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index a103aa2ba4..3db592af6a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -174,7 +174,7 @@ GEM
     logstash-logger (0.26.1)
       logstash-event (~> 1.2)
     logster (2.9.0)
-    loofah (2.5.0)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)

From ad447677ed1920aaac8e95ceaac1e06c3e55245c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 16 Jun 2020 18:06:37 +0000
Subject: [PATCH 1722/1830] Build(deps): Bump sanitize from 5.2.0 to 5.2.1

Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v5.2.0...v5.2.1)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 3db592af6a..3f49375657 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -371,7 +371,7 @@ GEM
       nokogiri (>= 1.6.0)
     rubyzip (2.3.0)
     safe_yaml (1.0.5)
-    sanitize (5.2.0)
+    sanitize (5.2.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)

From 52580605d893c814c5af2001731a84890a70537d Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 4 Jun 2020 21:33:57 +0800
Subject: [PATCH 1723/1830] FIX: select-kit components not being hidden.

---
 .../select-kit/addon/templates/components/multi-select.hbs    | 2 +-
 .../select-kit/addon/templates/components/single-select.hbs   | 2 +-
 app/assets/stylesheets/common/select-kit/select-kit.scss      | 4 ----
 test/javascripts/acceptance/composer-actions-test.js          | 1 +
 4 files changed, 3 insertions(+), 6 deletions(-)

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 e0d1f54f00..5c7b93adf0 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
@@ -1,4 +1,4 @@
-{{#unless isHidden}}
+{{#unless selectKit.isHidden}}
   {{component selectKit.options.headerComponent
     tabindex=tabindex
     value=value
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs b/app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs
index a3b71cba23..7fac16c9f5 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs
@@ -1,4 +1,4 @@
-{{#unless isHidden}}
+{{#unless selectKit.isHidden}}
   {{component selectKit.options.headerComponent
     tabindex=tabindex
     value=value
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 4080d1db95..887974b712 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -7,10 +7,6 @@
   vertical-align: middle;
   user-select: none;
 
-  &.is-hidden {
-    display: none !important;
-  }
-
   &.is-disabled {
     pointer-events: none;
   }
diff --git a/test/javascripts/acceptance/composer-actions-test.js b/test/javascripts/acceptance/composer-actions-test.js
index f421ec41b1..2ee96e3af9 100644
--- a/test/javascripts/acceptance/composer-actions-test.js
+++ b/test/javascripts/acceptance/composer-actions-test.js
@@ -177,6 +177,7 @@ QUnit.test("hide component if no content", async assert => {
   await composerActions.selectRowByValue("reply_as_private_message");
 
   assert.ok(composerActions.el().hasClass("is-hidden"));
+  assert.equal(composerActions.el().children().length, 0);
 
   await click("button#create-topic");
   await composerActions.expand();

From 3e888cbb5d050f852d34c79c4791d878191bd29a Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 17 Jun 2020 13:23:45 +0800
Subject: [PATCH 1724/1830] DEV: Properly reset column information before
 seeding.

---
 db/fixtures/001_refresh.rb | 5 ++++-
 db/fixtures/990_topics.rb  | 8 ++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/db/fixtures/001_refresh.rb b/db/fixtures/001_refresh.rb
index 5188adc6cb..9d3a9616c9 100644
--- a/db/fixtures/001_refresh.rb
+++ b/db/fixtures/001_refresh.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
 # fix any bust caches post initial migration
-ActiveRecord::Base.public_send(:subclasses).each { |m| m.reset_column_information }
+ActiveRecord::Base.connection.tables.each do |table|
+  table.classify.constantize.reset_column_information rescue nil
+end
+
 SiteSetting.refresh!
diff --git a/db/fixtures/990_topics.rb b/db/fixtures/990_topics.rb
index 13c8b53c8e..fd29715bee 100644
--- a/db/fixtures/990_topics.rb
+++ b/db/fixtures/990_topics.rb
@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
-require 'seed_data/topics'
-
-User.reset_column_information
-Topic.reset_column_information
-Post.reset_column_information
-
 if !Rails.env.test?
+  require 'seed_data/topics'
+
   topics_exist = Topic.where(<<~SQL).exists?
     id NOT IN (
       SELECT topic_id

From f096181653a73603631eccc9ce2bd5ab3be4778e Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 17 Jun 2020 14:50:34 +0800
Subject: [PATCH 1725/1830] Upgrade rubocop and generate rubocop todo.

---
 .rubocop.yml      |  5 +++++
 .rubocop_todo.yml | 18 ++++++++++++++++++
 Gemfile.lock      |  4 ++--
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 .rubocop_todo.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index d46296cf88..4470fd45c0 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,2 +1,7 @@
+inherit_from: .rubocop_todo.yml
+
 inherit_gem:
   rubocop-discourse: default.yml
+
+Discourse/NoResetColumnInformationInMigrations:
+  Enabled: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
new file mode 100644
index 0000000000..26c278c13b
--- /dev/null
+++ b/.rubocop_todo.yml
@@ -0,0 +1,18 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2020-06-17 14:48:01 +0800 using RuboCop version 0.85.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 60
+# Configuration parameters: Include.
+# Include: **/db/migrate/*, **/db/post_migrate/*
+Discourse/NoAddReferenceOrAliasesActiveRecordMigration:
+  Enabled: false
+
+# Offense count: 1
+Discourse/NoURIEscapeEncode:
+  Exclude:
+    - 'lib/file_store/s3_store.rb'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3f49375657..c1ad5fb0dd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -249,7 +249,7 @@ GEM
       sanitize
     openssl-signature_algorithm (0.4.0)
     optimist (3.0.1)
-    parallel (1.19.1)
+    parallel (1.19.2)
     parallel_tests (3.0.0)
       parallel
     parser (2.7.1.3)
@@ -359,7 +359,7 @@ GEM
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (0.0.3)
       parser (>= 2.7.0.1)
-    rubocop-discourse (2.1.2)
+    rubocop-discourse (2.2.0)
       rubocop (>= 0.69.0)
       rubocop-rspec (>= 1.39.0)
     rubocop-rspec (1.40.0)

From 9c385a359999aee42144112760a8585271a261e8 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 17 Jun 2020 15:19:50 +0800
Subject: [PATCH 1726/1830] Update rubocop_todo.

---
 .rubocop_todo.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 26c278c13b..2930dd744a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,17 +1,26 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-06-17 14:48:01 +0800 using RuboCop version 0.85.1.
+# on 2020-06-17 15:14:48 +0800 using RuboCop version 0.85.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 60
+# Offense count: 61
 # Configuration parameters: Include.
 # Include: **/db/migrate/*, **/db/post_migrate/*
 Discourse/NoAddReferenceOrAliasesActiveRecordMigration:
   Enabled: false
 
+# Offense count: 5
+Discourse/NoNokogiriHtmlFragment:
+  Exclude:
+    - 'plugins/discourse-assign/lib/topic_assigner.rb'
+    - 'plugins/discourse-calendar/app/models/calendar_event.rb'
+    - 'plugins/discourse-chat-integration/lib/discourse_chat/provider/slack/slack_provider.rb'
+    - 'plugins/discourse-code-review/lib/discourse_code_review/state/commit_topics.rb'
+    - 'plugins/discourse-graphviz/plugin.rb'
+
 # Offense count: 1
 Discourse/NoURIEscapeEncode:
   Exclude:

From 28f6c596122e8e7c036434910e887b2d27d34a63 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 17 Jun 2020 15:31:26 +0800
Subject: [PATCH 1727/1830] DEV: Load rubocop_todo after default config.

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

diff --git a/.rubocop.yml b/.rubocop.yml
index 4470fd45c0..b062f48421 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,7 +1,7 @@
-inherit_from: .rubocop_todo.yml
-
 inherit_gem:
   rubocop-discourse: default.yml
 
+inherit_from: .rubocop_todo.yml
+
 Discourse/NoResetColumnInformationInMigrations:
   Enabled: true

From 828ceab64b6572fed3d5964d39feba989403a982 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 17 Jun 2020 15:47:05 +0800
Subject: [PATCH 1728/1830] DEV: Make rubocop happy.

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

diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index 4183e973cf..cc507ed6ea 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -86,7 +86,7 @@ module FileStore
       return false if url.blank?
 
       begin
-        parsed_url = URI.parse(URI.encode(url))
+        parsed_url = URI.parse(UrlHelper.encode(url))
       rescue URI::InvalidURIError, URI::InvalidComponentError
         return false
       end

From 86b43c53296420f5e7141c3159c700652e949efd Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 17 Jun 2020 15:47:44 +0800
Subject: [PATCH 1729/1830] DEV: Remove rubocop_todo which doesn't seem to work
 with plugins.

---
 .rubocop.yml      |  4 +++-
 .rubocop_todo.yml | 27 ---------------------------
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 .rubocop_todo.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index b062f48421..b7edfe4894 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,7 +1,9 @@
 inherit_gem:
   rubocop-discourse: default.yml
 
-inherit_from: .rubocop_todo.yml
+# Still work to do in ensuring we don't link old files
+Discourse/NoAddReferenceOrAliasesActiveRecordMigration:
+  Enabled: false
 
 Discourse/NoResetColumnInformationInMigrations:
   Enabled: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
deleted file mode 100644
index 2930dd744a..0000000000
--- a/.rubocop_todo.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2020-06-17 15:14:48 +0800 using RuboCop version 0.85.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 61
-# Configuration parameters: Include.
-# Include: **/db/migrate/*, **/db/post_migrate/*
-Discourse/NoAddReferenceOrAliasesActiveRecordMigration:
-  Enabled: false
-
-# Offense count: 5
-Discourse/NoNokogiriHtmlFragment:
-  Exclude:
-    - 'plugins/discourse-assign/lib/topic_assigner.rb'
-    - 'plugins/discourse-calendar/app/models/calendar_event.rb'
-    - 'plugins/discourse-chat-integration/lib/discourse_chat/provider/slack/slack_provider.rb'
-    - 'plugins/discourse-code-review/lib/discourse_code_review/state/commit_topics.rb'
-    - 'plugins/discourse-graphviz/plugin.rb'
-
-# Offense count: 1
-Discourse/NoURIEscapeEncode:
-  Exclude:
-    - 'lib/file_store/s3_store.rb'

From 45eb97c2029a27455340809428ae4572b6731b8b Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 17 Jun 2020 16:15:43 +0800
Subject: [PATCH 1730/1830] FIX: Thread safety issues with `multisite:migrate`
 and `SeedFu`.

---
 db/fixtures/001_refresh.rb | 17 +++++++--
 lib/tasks/db.rake          | 75 +++++++++++++++++++++++---------------
 2 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/db/fixtures/001_refresh.rb b/db/fixtures/001_refresh.rb
index 9d3a9616c9..e340c8dfb0 100644
--- a/db/fixtures/001_refresh.rb
+++ b/db/fixtures/001_refresh.rb
@@ -1,8 +1,19 @@
 # frozen_string_literal: true
 
-# fix any bust caches post initial migration
-ActiveRecord::Base.connection.tables.each do |table|
-  table.classify.constantize.reset_column_information rescue nil
+class SeedData::Refresher
+  def self.refresh!
+    return if @refreshed
+
+    # Fix any bust caches post initial migration
+    # Not that reset_column_information is not thread safe so we have to becareful
+    # not to run it concurrently within the same process.
+    ActiveRecord::Base.connection.tables.each do |table|
+      table.classify.constantize.reset_column_information rescue nil
+    end
+
+    @refreshed = true
+  end
 end
 
+SeedData::Refresher.refresh!
 SiteSetting.refresh!
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 7b6c92806e..fdd463b3d1 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -107,48 +107,63 @@ task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |
   puts "Multisite migrator is running using #{concurrency} threads"
   puts
 
-  queue = Queue.new
   exceptions = Queue.new
 
   old_stdout = $stdout
   $stdout = StdOutDemux.new($stdout)
 
-  RailsMultisite::ConnectionManagement.each_connection do |db|
-    queue << db
-  end
-
-  concurrency.times { queue << :done }
-
   SeedFu.quiet = true
 
-  (1..concurrency).map do
-    Thread.new {
-      while true
-        db = queue.pop
-        break if db == :done
+  def execute_concurently(concurrency)
+    queue = Queue.new
 
-        RailsMultisite::ConnectionManagement.with_connection(db) do
-          begin
-            puts "Migrating #{db}"
-            ActiveRecord::Tasks::DatabaseTasks.migrate
-            SeedFu.seed(DiscoursePluginRegistry.seed_paths)
-            if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
-              SiteIconManager.ensure_optimized!
-            end
-          rescue => e
-            exceptions << [db, e]
-          ensure
+    RailsMultisite::ConnectionManagement.each_connection do |db|
+      queue << db
+    end
+
+    concurrency.times { queue << :done }
+
+    (1..concurrency).map do
+      Thread.new {
+        while true
+          db = queue.pop
+          break if db == :done
+
+          RailsMultisite::ConnectionManagement.with_connection(db) do
             begin
-              $stdout.finish_chunk
-            rescue => ex
-              STDERR.puts ex.inspect
-              STDERR.puts ex.backtrace
+              yield(db) if block_given?
+            rescue => e
+              exceptions << [db, e]
+            ensure
+              begin
+                $stdout.finish_chunk
+              rescue => ex
+                STDERR.puts ex.inspect
+                STDERR.puts ex.backtrace
+              end
             end
           end
         end
-      end
-    }
-  end.each(&:join)
+      }
+    end.each(&:join)
+  end
+
+  execute_concurently(concurrency) do |db|
+    puts "Migrating #{db}"
+    ActiveRecord::Tasks::DatabaseTasks.migrate
+
+    if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
+      SiteIconManager.ensure_optimized!
+    end
+  end
+
+  seed_paths = DiscoursePluginRegistry.seed_paths
+  SeedFu.seed(seed_paths, /001_refresh/)
+
+  execute_concurently(concurrency) do |db|
+    puts "Seeding #{db}"
+    SeedFu.seed(seed_paths)
+  end
 
   $stdout = old_stdout
 

From d66ccabdb11e35bc59ee22d048ffd64fb4d1102d Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Wed, 17 Jun 2020 14:35:37 +0530
Subject: [PATCH 1731/1830] DEV: Added topic-list-after-title outlet in the
 mobile template (#10059)

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

diff --git a/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr b/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr
index 6c4663b83d..34abdbf429 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr
+++ b/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr
@@ -23,6 +23,7 @@
           {{~#if topic.featured_link~}}
           {{~topic-featured-link topic~}}
           {{~/if~}}
+          {{~raw-plugin-outlet name="topic-list-after-title"}}
           {{~#if topic.unseen~}}
             <span class="topic-post-badges">&nbsp;<span class="badge-notification new-topic"></span></span>
           {{~/if~}}

From a859d507e769cf216ad2749122ff5e2cc579c5b8 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 17 Jun 2020 12:37:06 +0200
Subject: [PATCH 1732/1830] FIX: Prevent producing "undefined" strings (#10042)

Fixes a bug in search-menu-results (type: "group"), where:

```javascript
const fullName = escapeExpression(group.fullName);
const name = escapeExpression(group.name);
const groupNames = [h("span.name", fullName || name)];
```

`groupNames` could end up having value "undefined" if a group doesn't have a `fullName`.
---
 .../discourse/app/lib/utilities.js            |  4 ++++
 test/javascripts/lib/utilities-test.js        | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js
index 92fa344134..cee9ce5faf 100644
--- a/app/assets/javascripts/discourse/app/lib/utilities.js
+++ b/app/assets/javascripts/discourse/app/lib/utilities.js
@@ -25,6 +25,10 @@ export function translateSize(size) {
 }
 
 export function escapeExpression(string) {
+  if (!string) {
+    return "";
+  }
+
   // don't escape SafeStrings, since they're already safe
   if (string instanceof Handlebars.SafeString) {
     return string.toString();
diff --git a/test/javascripts/lib/utilities-test.js b/test/javascripts/lib/utilities-test.js
index f3d14a2657..1ac73ec865 100644
--- a/test/javascripts/lib/utilities-test.js
+++ b/test/javascripts/lib/utilities-test.js
@@ -1,5 +1,6 @@
 /* global Int8Array:true */
 import {
+  escapeExpression,
   emailValid,
   extractDomainFromUrl,
   avatarUrl,
@@ -14,9 +15,30 @@ import {
   fillMissingDates,
   inCodeBlock
 } from "discourse/lib/utilities";
+import Handlebars from "handlebars";
 
 QUnit.module("lib:utilities");
 
+QUnit.test("escapeExpression", assert => {
+  assert.equal(
+    escapeExpression(">"),
+    "&gt;",
+    "escapes unsafe characters"
+  );
+
+  assert.equal(
+    escapeExpression(new Handlebars.SafeString("&gt;")),
+    "&gt;",
+    "does not double-escape safe strings"
+  );
+
+  assert.equal(
+    escapeExpression(undefined),
+    "",
+    "returns a falsy string when given a falsy value"
+  );
+});
+
 QUnit.test("emailValid", assert => {
   assert.ok(
     emailValid("Bob@example.com"),

From 7d289a4f3e9531a0c7e458a52af85d0ae5affab9 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 17 Jun 2020 12:38:00 +0200
Subject: [PATCH 1733/1830] UX: Style video elements, show descriptions
 (#10040)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's a stop gap – ideally we would generate a thumbnail for uploaded videos. For now, a bit of intentionality in the style and a pinch of context should do.
---
 .../pretty-text/addon/engines/discourse-markdown-it.js   | 4 +++-
 app/assets/javascripts/pretty-text/addon/white-lister.js | 1 +
 app/assets/stylesheets/common/base/onebox.scss           | 9 +++++++++
 test/javascripts/lib/pretty-text-test.js                 | 3 +++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown-it.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown-it.js
index 213aef39d9..358595d248 100644
--- a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown-it.js
+++ b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown-it.js
@@ -147,6 +147,7 @@ function videoHTML(token, opts) {
   const preloadType = opts.secureMedia ? "none" : "metadata";
   const dataOrigSrcAttr = origSrc !== null ? `data-orig-src="${origSrc}"` : "";
   return `<div class="video-container">
+    <p class="video-description">${opts.alt}</p>
     <video width="100%" height="100%" preload="${preloadType}" controls>
       <source src="${src}" ${dataOrigSrcAttr}>
       <a href="${src}">${src}</a>
@@ -176,7 +177,8 @@ function renderImageOrPlayableMedia(tokens, idx, options, env, slf) {
   // see https://github.com/markdown-it/markdown-it/blob/master/docs/architecture.md#renderer
   // handles |video and |audio alt transformations for image tags
   const mediaOpts = {
-    secureMedia: options.discourse.limitedSiteSettings.secureMedia
+    secureMedia: options.discourse.limitedSiteSettings.secureMedia,
+    alt: split[0]
   };
   if (split[1] === "video") {
     return videoHTML(token, mediaOpts);
diff --git a/app/assets/javascripts/pretty-text/addon/white-lister.js b/app/assets/javascripts/pretty-text/addon/white-lister.js
index 88eb29085b..e161c63007 100644
--- a/app/assets/javascripts/pretty-text/addon/white-lister.js
+++ b/app/assets/javascripts/pretty-text/addon/white-lister.js
@@ -185,6 +185,7 @@ export const DEFAULT_LIST = [
   "span.excerpt",
   "div.excerpt",
   "div.video-container",
+  "p.video-description",
   "span.hashtag",
   "span.mention",
   "strike",
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 124da3ec4b..15da415d4e 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -703,6 +703,9 @@ aside.onebox.stackexchange .onebox-body {
 // Force oneboxed videos to 16:9 aspect ratio
 .onebox.video-onebox,
 .video-container {
+  background: $primary-very-low;
+  border: 1px solid $primary-low;
+  border-radius: 2px;
   position: relative;
   padding: 0 0 56.25% 0;
   width: 100%;
@@ -714,6 +717,12 @@ aside.onebox.stackexchange .onebox-body {
   }
 }
 
+.video-description {
+  color: $primary-medium;
+  margin: 1rem;
+  position: absolute;
+}
+
 .onebox-placeholder-container {
   position: relative;
   width: 100%;
diff --git a/test/javascripts/lib/pretty-text-test.js b/test/javascripts/lib/pretty-text-test.js
index a5619bcc77..c1304f3657 100644
--- a/test/javascripts/lib/pretty-text-test.js
+++ b/test/javascripts/lib/pretty-text-test.js
@@ -1030,6 +1030,7 @@ QUnit.test("video - secure media enabled", assert => {
     "![baby shark|video](upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp4)",
     { siteSettings: { secure_media: true } },
     `<p><div class="video-container">
+    <p class="video-description">baby shark</p>
     <video width="100%" height="100%" preload="none" controls>
       <source src="/404" data-orig-src="upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp4">
       <a href="/404">/404</a>
@@ -1055,6 +1056,7 @@ QUnit.test("video", assert => {
   assert.cooked(
     "![baby shark|video](upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp4)",
     `<p><div class="video-container">
+    <p class="video-description">baby shark</p>
     <video width="100%" height="100%" preload="metadata" controls>
       <source src="/404" data-orig-src="upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp4">
       <a href="/404">/404</a>
@@ -1081,6 +1083,7 @@ QUnit.test("video - mapped url - secure media enabled", assert => {
       lookupUploadUrls: lookupUploadUrls
     },
     `<p><div class="video-container">
+    <p class="video-description">baby shark</p>
     <video width="100%" height="100%" preload="none" controls>
       <source src="/secure-media-uploads/original/3X/c/b/test.mp4">
       <a href="/secure-media-uploads/original/3X/c/b/test.mp4">/secure-media-uploads/original/3X/c/b/test.mp4</a>

From 9da3a7f436b4c6b64e65a425ffcc27964019241c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 17 Jun 2020 12:42:20 +0200
Subject: [PATCH 1734/1830] FEATURE: allows published pages to be public
 (#10053)

---
 .../discourse/app/controllers/publish-page.js | 17 ++++--
 .../app/templates/modal/publish-page.hbs      | 32 +++++++++--
 .../discourse/app/templates/topic.hbs         |  3 +
 app/assets/stylesheets/common/base/modal.scss | 49 +++++++++++-----
 app/assets/stylesheets/common/base/topic.scss |  9 +++
 app/controllers/published_pages_controller.rb | 37 +++++++++++-
 app/models/published_page.rb                  |  4 +-
 app/serializers/published_page_serializer.rb  |  2 +-
 config/locales/client.en.yml                  |  3 +
 config/locales/server.en.yml                  |  1 +
 config/site_settings.yml                      |  2 +
 ...701_add_public_field_to_published_pages.rb |  7 +++
 spec/fabricators/published_page_fabricator.rb |  3 +-
 .../published_pages_controller_spec.rb        | 57 ++++++++++++++++++-
 14 files changed, 196 insertions(+), 30 deletions(-)
 create mode 100644 db/migrate/20201006172701_add_public_field_to_published_pages.rb

diff --git a/app/assets/javascripts/discourse/app/controllers/publish-page.js b/app/assets/javascripts/discourse/app/controllers/publish-page.js
index f6c864682a..58059d027c 100644
--- a/app/assets/javascripts/discourse/app/controllers/publish-page.js
+++ b/app/assets/javascripts/discourse/app/controllers/publish-page.js
@@ -35,6 +35,7 @@ export default Controller.extend(ModalFunctionality, StateHelpers, {
       this.state === States.existing
     );
   }),
+
   showUnpublish: computed("state", function() {
     return this.state === States.existing || this.state === States.unpublishing;
   }),
@@ -95,7 +96,7 @@ export default Controller.extend(ModalFunctionality, StateHelpers, {
     this.set("state", States.saving);
 
     return this.publishedPage
-      .update({ slug: this.publishedPage.slug })
+      .update(this.publishedPage.getProperties("slug", "public"))
       .then(() => {
         this.set("state", States.existing);
         this.model.set("publishedPage", this.publishedPage);
@@ -110,11 +111,17 @@ export default Controller.extend(ModalFunctionality, StateHelpers, {
   startNew() {
     this.setProperties({
       state: States.new,
-      publishedPage: this.store.createRecord("published_page", {
-        id: this.model.id,
-        slug: this.model.slug
-      })
+      publishedPage: this.store.createRecord(
+        "published_page",
+        this.model.getProperties("id", "slug", "public")
+      )
     });
     this.checkSlug();
+  },
+
+  @action
+  onChangePublic(isPublic) {
+    this.publishedPage.set("public", isPublic);
+    this.publish();
   }
 });
diff --git a/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs b/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs
index 712682fe74..9cd9a56087 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs
@@ -6,8 +6,29 @@
       <p class="publish-description">{{i18n "topic.publish_page.description"}}</p>
 
       <form>
-        <label>{{i18n "topic.publish_page.slug"}}</label>
-        {{text-field value=publishedPage.slug onChange=(action "checkSlug") onChangeImmediate=(action "startCheckSlug") disabled=existing class="publish-slug"}}
+        <div class="controls">
+          <label>{{i18n "topic.publish_page.slug"}}</label>
+          {{text-field
+            value=publishedPage.slug
+            onChange=(action "checkSlug")
+            onChangeImmediate=(action "startCheckSlug")
+            disabled=existing
+            class="publish-slug"
+          }}
+        </div>
+
+        <div class="controls">
+          <label>{{i18n "topic.publish_page.public"}}</label>
+
+          <p class="description">
+            {{input
+              type="checkbox"
+              checked=publishedPage.public
+              click=(action "onChangePublic" value="target.checked")
+            }}
+            {{i18n "topic.publish_page.public_description"}}
+          </p>
+        </div>
       </form>
 
       <div class="publish-url">
@@ -40,14 +61,15 @@
 
 <div class="modal-footer">
   {{#if showUnpublish}}
-    {{d-button icon="times" label="close" action=(action "closeModal")}}
-
     {{d-button
       label="topic.publish_page.unpublish"
       icon="trash-alt"
       class="btn-danger"
       isLoading=unpublishing
-      action=(action "unpublish") }}
+      action=(action "unpublish")
+    }}
+
+    {{d-button class="close-publish-page" icon="times" label="close" action=(action "closeModal")}}
   {{else if unpublished}}
     {{d-button label="topic.publish_page.publishing_settings" action=(action "startNew")}}
   {{else}}
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index e6968f11b7..33f11793a8 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -90,6 +90,9 @@
       {{#if model.publishedPage}}
         <div class="published-page-notice">
           <div class="details">
+            {{#if model.publishedPage.public}}
+              <span class="is-public">{{i18n "topic.publish_page.public"}}</span>
+            {{/if}}
             {{i18n "topic.publish_page.topic_published"}}
             <div>
               <a href={{model.publishedPage.url}} target="_blank" rel="noopener noreferrer">{{model.publishedPage.url}}</a>
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index a15a7cf7c0..4e1a7946a1 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -689,24 +689,45 @@
   }
 }
 
-.publish-page-modal .modal-body {
-  p.publish-description {
-    margin-top: 0;
-  }
-  input.publish-slug {
-    width: 100%;
-  }
+.publish-page-modal {
+  .modal-body {
+    p.publish-description {
+      margin-top: 0;
+    }
+    input.publish-slug {
+      width: 100%;
+    }
 
-  .publish-url {
-    margin-bottom: 1em;
-    .example-url,
-    .invalid-slug {
-      font-weight: bold;
+    .publish-url {
+      margin-bottom: 1em;
+      .example-url,
+      .invalid-slug {
+        font-weight: bold;
+      }
+    }
+
+    .publish-slug:disabled {
+      cursor: not-allowed;
+    }
+
+    .controls {
+      margin-bottom: 1em;
+
+      .description {
+        margin: 0;
+        display: flex;
+        align-items: center;
+      }
     }
   }
 
-  .publish-slug:disabled {
-    cursor: not-allowed;
+  .modal-footer {
+    display: flex;
+
+    .close-publish-page {
+      margin-left: auto;
+      margin-right: 0;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index 02b267ab13..eee0faf51b 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -305,4 +305,13 @@ a.topic-featured-link {
       2}
   );
   align-items: center;
+
+  .is-public {
+    padding: 0.25em 0.5em;
+    font-size: $font-down-2;
+    background: $tertiary;
+    color: $secondary;
+    border-radius: 3px;
+    text-transform: lowercase;
+  }
 }
diff --git a/app/controllers/published_pages_controller.rb b/app/controllers/published_pages_controller.rb
index 67d3fb8bda..f61a0b00b2 100644
--- a/app/controllers/published_pages_controller.rb
+++ b/app/controllers/published_pages_controller.rb
@@ -5,6 +5,7 @@ class PublishedPagesController < ApplicationController
   skip_before_action :preload_json
   skip_before_action :check_xhr, :verify_authenticity_token, only: [:show]
   before_action :ensure_publish_enabled
+  before_action :redirect_to_login_if_required, except: [:show]
 
   def show
     params.require(:slug)
@@ -12,7 +13,22 @@ class PublishedPagesController < ApplicationController
     pp = PublishedPage.find_by(slug: params[:slug])
     raise Discourse::NotFound unless pp
 
-    guardian.ensure_can_see!(pp.topic)
+    return if enforce_login_required!
+
+    if !pp.public
+      begin
+        guardian.ensure_can_see!(pp.topic)
+      rescue Discourse::InvalidAccess => e
+        return rescue_discourse_actions(
+          :invalid_access,
+          403,
+          include_ember: false,
+          custom_message: e.custom_message,
+          group: e.group
+        )
+      end
+    end
+
     @topic = pp.topic
     @canonical_url = @topic.url
 
@@ -37,7 +53,15 @@ class PublishedPagesController < ApplicationController
   end
 
   def upsert
-    result, pp = PublishedPage.publish!(current_user, fetch_topic, params[:published_page][:slug].strip)
+    pp_params = params.require(:published_page)
+
+    result, pp = PublishedPage.publish!(
+      current_user,
+      fetch_topic,
+      pp_params[:slug].strip,
+      pp_params.permit(:public)
+    )
+
     json_result(pp, serializer: PublishedPageSerializer) { result }
   end
 
@@ -68,4 +92,13 @@ private
     raise Discourse::NotFound unless SiteSetting.enable_page_publishing?
   end
 
+  def enforce_login_required!
+    if SiteSetting.login_required? &&
+       !current_user &&
+       !SiteSetting.show_published_pages_login_required? &&
+      redirect_to_login
+      true
+    end
+  end
+
 end
diff --git a/app/models/published_page.rb b/app/models/published_page.rb
index 648f6b8b50..5322efaea7 100644
--- a/app/models/published_page.rb
+++ b/app/models/published_page.rb
@@ -23,12 +23,13 @@ class PublishedPage < ActiveRecord::Base
     "#{Discourse.base_url}#{path}"
   end
 
-  def self.publish!(publisher, topic, slug)
+  def self.publish!(publisher, topic, slug, options = {})
     pp = nil
 
     transaction do
       pp = find_or_initialize_by(topic: topic)
       pp.slug = slug.strip
+      pp.public = options[:public] || false
 
       if pp.save
         StaffActionLogger.new(publisher).log_published_page(topic.id, slug)
@@ -56,6 +57,7 @@ end
 #  slug       :string           not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
+#  public     :boolean          default(FALSE), not null
 #
 # Indexes
 #
diff --git a/app/serializers/published_page_serializer.rb b/app/serializers/published_page_serializer.rb
index bdee8d14f7..c0b209ae0f 100644
--- a/app/serializers/published_page_serializer.rb
+++ b/app/serializers/published_page_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class PublishedPageSerializer < ApplicationSerializer
-  attributes :id, :slug
+  attributes :id, :slug, :public
 
   def id
     object.topic_id
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 2f3a8b0095..7e368a8d45 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2513,11 +2513,14 @@ en:
         publish: "Publish"
         description: "When a topic is published as a page, its URL can be shared and it will displayed with custom styling."
         slug: "Slug"
+        public: "Public"
+        public_description: "People can see the page even if the associated topic is private."
         publish_url: "Your page has been published at:"
         topic_published: "Your topic has been published at:"
         preview_url: "Your page will be published at:"
         invalid_slug: "Sorry, you can't publish this page."
         unpublish: "Unpublish"
+        update: "Update"
         unpublished: "Your page has been unpublished and is no longer accessible."
         publishing_settings: "Publishing Settings"
 
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index d2a0a9b10b..c839d7b8c8 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2131,6 +2131,7 @@ en:
     returning_user_notice_tl: "Minimum trust level required to see returning user post notices."
     returning_users_days: "How many days should pass before a user is considered to be returning."
     enable_page_publishing: "Allow staff members to publish topics to new URLs with their own styling."
+    show_published_pages_login_required: "Anonymous users can see published pages, even when login is required."
 
     default_email_digest_frequency: "How often users receive summary emails by default."
     default_include_tl0_in_digests: "Include posts from new users in summary emails by default. Users can change this in their preferences."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 08e16c94f1..2948b8793f 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -947,6 +947,8 @@ posting:
     max: 36500
   enable_page_publishing:
     default: false
+  show_published_pages_login_required:
+    default: false
 
 email:
   email_time_window_mins:
diff --git a/db/migrate/20201006172701_add_public_field_to_published_pages.rb b/db/migrate/20201006172701_add_public_field_to_published_pages.rb
new file mode 100644
index 0000000000..d02edd2bd9
--- /dev/null
+++ b/db/migrate/20201006172701_add_public_field_to_published_pages.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPublicFieldToPublishedPages < ActiveRecord::Migration[6.0]
+  def change
+    add_column :published_pages, :public, :boolean, null: false, default: false
+  end
+end
diff --git a/spec/fabricators/published_page_fabricator.rb b/spec/fabricators/published_page_fabricator.rb
index 44f8da98da..0c090ee5d9 100644
--- a/spec/fabricators/published_page_fabricator.rb
+++ b/spec/fabricators/published_page_fabricator.rb
@@ -2,5 +2,6 @@
 
 Fabricator(:published_page) do
   topic
-  slug "published-page-test"
+  slug "published-page-test-#{SecureRandom.hex}"
+  public false
 end
diff --git a/spec/requests/published_pages_controller_spec.rb b/spec/requests/published_pages_controller_spec.rb
index 6793761791..0662554989 100644
--- a/spec/requests/published_pages_controller_spec.rb
+++ b/spec/requests/published_pages_controller_spec.rb
@@ -59,6 +59,15 @@ RSpec.describe PublishedPagesController do
           expect(response.status).to eq(403)
         end
 
+        context "published page is public" do
+          fab!(:public_published_page) { Fabricate(:published_page, public: true) }
+
+          it "returns 200 for a topic you can't see" do
+            get public_published_page.path
+            expect(response.status).to eq(200)
+          end
+        end
+
         context "as an admin" do
           before do
             sign_in(admin)
@@ -89,7 +98,42 @@ RSpec.describe PublishedPagesController do
 
         it "defines correct css classes on body" do
           get published_page.path
-          expect(response.body).to include("<body class=\"published-page published-page-test topic-#{published_page.topic_id} recipes uncategorized\">")
+          expect(response.body).to include("<body class=\"published-page #{published_page.slug} topic-#{published_page.topic_id} recipes uncategorized\">")
+        end
+
+        context "login is required" do
+          before do
+            SiteSetting.login_required = true
+            SiteSetting.show_published_pages_login_required = false
+          end
+
+          context "a user is connected" do
+            before do
+              sign_in(user)
+            end
+
+            it "returns 200" do
+              get published_page.path
+              expect(response.status).to eq(200)
+            end
+          end
+
+          context "no user connected" do
+            it "redirects to login page" do
+              expect(get(published_page.path)).to redirect_to("/login")
+            end
+
+            context "show public pages with login required is enabled" do
+              before do
+                SiteSetting.show_published_pages_login_required = true
+              end
+
+              it "returns 200" do
+                get published_page.path
+                expect(response.status).to eq(200)
+              end
+            end
+          end
         end
       end
     end
@@ -113,6 +157,7 @@ RSpec.describe PublishedPagesController do
           expect(response).to be_successful
           expect(response.parsed_body['published_page']).to be_present
           expect(response.parsed_body['published_page']['slug']).to eq("i-hate-salt")
+          expect(response.parsed_body['published_page']['public']).to eq(false)
 
           expect(PublishedPage.exists?(topic_id: response.parsed_body['published_page']['id'])).to eq(true)
           expect(UserHistory.exists?(
@@ -122,6 +167,16 @@ RSpec.describe PublishedPagesController do
           )).to be(true)
         end
 
+        it "allows to set public field" do
+          put "/pub/by-topic/#{topic.id}.json", params: { published_page: { slug: 'i-hate-salt', public: true } }
+          expect(response).to be_successful
+          expect(response.parsed_body['published_page']).to be_present
+          expect(response.parsed_body['published_page']['slug']).to eq("i-hate-salt")
+          expect(response.parsed_body['published_page']['public']).to eq(true)
+
+          expect(PublishedPage.exists?(topic_id: response.parsed_body['published_page']['id'])).to eq(true)
+        end
+
         it "returns an error if the slug is already taken" do
           PublishedPage.create!(slug: 'i-hate-salt', topic: Fabricate(:topic))
           put "/pub/by-topic/#{topic.id}.json", params: { published_page: { slug: 'i-hate-salt' } }

From 6caad5c083e235fabc7b68976b82f0d36e7f9840 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 17 Jun 2020 12:12:55 +0100
Subject: [PATCH 1735/1830] FIX: Do not send staff welcome message if user
 already has role

---
 app/models/concerns/roleable.rb |  2 ++
 spec/models/user_spec.rb        | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/app/models/concerns/roleable.rb b/app/models/concerns/roleable.rb
index 1361184795..ba90048638 100644
--- a/app/models/concerns/roleable.rb
+++ b/app/models/concerns/roleable.rb
@@ -19,6 +19,7 @@ module Roleable
   end
 
   def grant_moderation!
+    return if moderator
     set_permission('moderator', true)
     auto_approve_user
     enqueue_staff_welcome_message(:moderator)
@@ -29,6 +30,7 @@ module Roleable
   end
 
   def grant_admin!
+    return if admin
     set_permission('admin', true)
     auto_approve_user
     enqueue_staff_welcome_message(:admin)
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 2a50cd82c1..1b69613f51 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -164,6 +164,30 @@ describe User do
     end
   end
 
+  context 'enqueue_staff_welcome_message' do
+    let!(:first_admin) { Fabricate(:admin) }
+    let(:user) { Fabricate(:user) }
+
+    it 'enqueues message for admin' do
+      expect {
+        user.grant_admin!
+      }.to change { Jobs::SendSystemMessage.jobs.count }.by 1
+    end
+
+    it 'enqueues message for moderator' do
+      expect {
+        user.grant_moderation!
+      }.to change { Jobs::SendSystemMessage.jobs.count }.by 1
+    end
+
+    it 'skips the message if already an admin' do
+      user.update(admin: true)
+      expect {
+        user.grant_admin!
+      }.to change { Jobs::SendSystemMessage.jobs.count }.by 0
+    end
+  end
+
   context '.set_default_tags_preferences' do
     let(:tag) { Fabricate(:tag) }
 

From 9518d6b587119c353de412ad1c7b5ef920db41b2 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 17 Jun 2020 15:10:07 +0200
Subject: [PATCH 1736/1830] fix spec (#10061)

---
 .../serializers/topic_view_serializer_spec.rb | 40 +++++++++++++------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index f6249b275b..55a9652fdd 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -312,22 +312,36 @@ describe TopicViewSerializer do
   context "published_page" do
     fab!(:published_page) { Fabricate(:published_page, topic: topic) }
 
-    it "doesn't return the published page if not enabled" do
-      json = serialize_topic(topic, admin)
-      expect(json[:published_page]).to be_blank
+    context "page publishing is disabled" do
+      before do
+        SiteSetting.enable_page_publishing = false
+      end
+
+      it "doesn't return the published page if not enabled" do
+        json = serialize_topic(topic, admin)
+        expect(json[:published_page]).to be_blank
+      end
     end
 
-    it "doesn't return the published page unless staff" do
-      SiteSetting.enable_page_publishing = true
-      json = serialize_topic(topic, user)
-      expect(json[:published_page]).to be_blank
-    end
+    context "page publishing is enabled" do
+      before do
+        SiteSetting.enable_page_publishing = true
+      end
 
-    it "returns the published page if enabled and staff" do
-      SiteSetting.enable_page_publishing = true
-      json = serialize_topic(topic, admin)
-      expect(json[:published_page]).to be_present
-      expect(json[:published_page][:slug]).to eq("published-page-test")
+      context "not staff" do
+        it "doesn't return the published page" do
+          json = serialize_topic(topic, user)
+          expect(json[:published_page]).to be_blank
+        end
+      end
+
+      context "staff" do
+        it "returns the published page" do
+          json = serialize_topic(topic, admin)
+          expect(json[:published_page]).to be_present
+          expect(json[:published_page][:slug]).to eq(published_page.slug)
+        end
+      end
     end
   end
 

From 159fc41f405704937fe706915184a0574902508b Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 17 Jun 2020 14:24:22 +0100
Subject: [PATCH 1737/1830] FIX: Restore missing translation keys

These were accidentally removed/renamed in 5bfe1ee4
---
 config/locales/client.en.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 7e368a8d45..febb6a61ac 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1131,7 +1131,8 @@ en:
         set_primary: "Set Primary Email"
         destroy: "Remove Email"
         add_email: "Add Alternate Email"
-        ssDestroy_override_instructions: "Email can be updated from SSO provider."
+        sso_override_instructions: "Email can be updated from SSO provider."
+        no_secondary: "No secondary emails"
         instructions: "Never shown to the public."
         ok: "We will email you to confirm"
         required: "Please enter an email address"

From e29afa200aaf76acf912b4ab663b2072c157b169 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 17 Jun 2020 15:57:32 +0100
Subject: [PATCH 1738/1830] FIX: Cleanup migrations with timestamps in the
 future

A future-dated migration was accidently introduced by me in 45c399f0. This was removed in b9762afc, but other migrations had already been generated based on its incorrect date. This commit removes the offending data in the schema_migrations table, and corrects the version in the published_pages migration.

This commit also adds a check to db:migrate which raises an error when invalid migration timestamps are used.
---
 ...300_add_public_field_to_published_pages.rb | 25 +++++++++++++++++++
 ...701_add_public_field_to_published_pages.rb |  7 ------
 lib/tasks/db.rake                             |  6 +++++
 3 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 db/migrate/20200617144300_add_public_field_to_published_pages.rb
 delete mode 100644 db/migrate/20201006172701_add_public_field_to_published_pages.rb

diff --git a/db/migrate/20200617144300_add_public_field_to_published_pages.rb b/db/migrate/20200617144300_add_public_field_to_published_pages.rb
new file mode 100644
index 0000000000..2bdfbfc50e
--- /dev/null
+++ b/db/migrate/20200617144300_add_public_field_to_published_pages.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddPublicFieldToPublishedPages < ActiveRecord::Migration[6.0]
+  def up
+    # Delete the record of https://github.com/discourse/discourse/commit/b9762afc106ee9b18d1ac33ca3cac281083e428e
+    execute <<~SQL
+      DELETE FROM schema_migrations WHERE version='20201006172700'
+    SQL
+
+    # Delete the reference to the incorrectly versioned version of this migration
+    execute <<~SQL
+      DELETE FROM schema_migrations WHERE version='20201006172701'
+    SQL
+
+    # Using IF NOT EXISTS because the version number of this migration was changed
+    # Therefore some sites may have already added the column
+    execute <<~SQL
+      ALTER TABLE "published_pages" ADD COLUMN IF NOT EXISTS "public" boolean DEFAULT FALSE NOT NULL
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20201006172701_add_public_field_to_published_pages.rb b/db/migrate/20201006172701_add_public_field_to_published_pages.rb
deleted file mode 100644
index d02edd2bd9..0000000000
--- a/db/migrate/20201006172701_add_public_field_to_published_pages.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class AddPublicFieldToPublishedPages < ActiveRecord::Migration[6.0]
-  def change
-    add_column :published_pages, :public, :boolean, null: false, default: false
-  end
-end
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index fdd463b3d1..c837a4525b 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -187,6 +187,12 @@ end
 
 # we need to run seed_fu every time we run rake db:migrate
 task 'db:migrate' => ['load_config', 'environment', 'set_locale'] do |_, args|
+  migrations = ActiveRecord::Base.connection.migration_context.migrations
+  now_timestamp = Time.now.utc.strftime('%Y%m%d%H%M%S').to_i
+  epoch_timestamp = Time.at(0).utc.strftime('%Y%m%d%H%M%S').to_i
+
+  raise "Migration #{migrations.last.version} is timestamped in the future" if migrations.last.version > now_timestamp
+  raise "Migration #{migrations.first.version} is timestamped before the epoch" if migrations.first.version < epoch_timestamp
 
   ActiveRecord::Tasks::DatabaseTasks.migrate
 

From 76b05ef8ade42c160885efab1a3a58f8dc113d25 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 17 Jun 2020 11:29:37 -0400
Subject: [PATCH 1739/1830] DEV: Use short_date helper for email post template
 (#10063)

---
 app/mailers/user_notifications.rb | 8 --------
 app/views/email/_post.html.erb    | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 184c62b1ec..62525eea17 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -174,14 +174,6 @@ class UserNotifications < ActionMailer::Base
     )
   end
 
-  def short_date(dt)
-    if dt.year == Time.now.year
-      I18n.l(dt, format: :short_no_year)
-    else
-      I18n.l(dt, format: :date_only)
-    end
-  end
-
   def digest(user, opts = {})
     build_summary_for(user)
     min_date = opts[:since] || user.last_emailed_at || user.last_seen_at || 1.month.ago
diff --git a/app/views/email/_post.html.erb b/app/views/email/_post.html.erb
index e83b841af1..57507530d6 100644
--- a/app/views/email/_post.html.erb
+++ b/app/views/email/_post.html.erb
@@ -20,7 +20,7 @@
           <span class='user-title'><%= post.user.title %></span>
         <% end %>
         <br>
-        <span class='notification-date'><%= l post.created_at, format: :short_no_year %></span>
+        <span class='notification-date'><%= short_date(post.created_at) %></span>
       </td>
     </tr>
   </table>

From 81a3129ffb42a50536803f91cd99a4227f0f50ee Mon Sep 17 00:00:00 2001
From: Jeff Wong <awole20@gmail.com>
Date: Wed, 17 Jun 2020 05:55:19 -1000
Subject: [PATCH 1740/1830] ARIA - add aria-label on topic input and post
 textarea (#10057)

Add reply form role with label as create/reply, and aria-labels on text inputs
---
 .../javascripts/discourse/app/components/d-textarea.js       | 5 +++++
 .../javascripts/discourse/app/components/text-field.js       | 3 ++-
 .../discourse/app/templates/components/composer-title.hbs    | 1 +
 .../discourse/app/templates/components/d-editor.hbs          | 3 ++-
 app/assets/javascripts/discourse/app/templates/composer.hbs  | 2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/components/d-textarea.js

diff --git a/app/assets/javascripts/discourse/app/components/d-textarea.js b/app/assets/javascripts/discourse/app/components/d-textarea.js
new file mode 100644
index 0000000000..a3979bd2ce
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-textarea.js
@@ -0,0 +1,5 @@
+import TextArea from "@ember/component/text-area";
+
+export default TextArea.extend({
+  attributeBindings: ["aria-label"]
+});
diff --git a/app/assets/javascripts/discourse/app/components/text-field.js b/app/assets/javascripts/discourse/app/components/text-field.js
index f9c13ec4d3..c61d0e7023 100644
--- a/app/assets/javascripts/discourse/app/components/text-field.js
+++ b/app/assets/javascripts/discourse/app/components/text-field.js
@@ -12,7 +12,8 @@ export default TextField.extend({
     "autocapitalize",
     "autofocus",
     "maxLength",
-    "dir"
+    "dir",
+    "aria-label"
   ],
 
   init() {
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-title.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-title.hbs
index a8483595de..c29ed22187 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-title.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/composer-title.hbs
@@ -3,6 +3,7 @@
              id="reply-title"
              maxLength=titleMaxLength
              placeholderKey=composer.titlePlaceholder
+             aria-label=(I18n composer.titlePlaceholder)
              disabled=disabled
              autocomplete="discourse"}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
index 0c7cdebded..5528aeb669 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
@@ -33,12 +33,13 @@
     </div>
 
     {{conditional-loading-spinner condition=loading}}
-    {{textarea
+    {{d-textarea
       autocomplete="discourse"
       tabindex=tabindex
       value=value
       class="d-editor-input"
       placeholder=placeholderTranslated
+      aria-label=placeholderTranslated
       disabled=disabled
       input=change}}
     {{popup-input-tip validation=validation}}
diff --git a/app/assets/javascripts/discourse/app/templates/composer.hbs b/app/assets/javascripts/discourse/app/templates/composer.hbs
index b3a075b684..e8dbfc8fff 100644
--- a/app/assets/javascripts/discourse/app/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer.hbs
@@ -10,7 +10,7 @@
                         messageCount=messageCount
                         addLinkLookup=(action "addLinkLookup")}}
     {{#if model.viewOpenOrFullscreen}}
-      <div class="reply-area {{if canEditTags "with-tags"}}">
+      <div role="form" aria-label={{I18n saveLabel}} class="reply-area {{if canEditTags "with-tags"}}">
         <div class="composer-fields">
           {{plugin-outlet name="composer-open" args=(hash model=model)}}
           <div class="reply-to">

From e8756e1a955abdb48978492a2c1a0fd8e740febc Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 17 Jun 2020 14:26:14 -0400
Subject: [PATCH 1741/1830] FIX: Muted/Ignore should prevent PMs regardless of
 case sensitivity

---
 lib/post_creator.rb                  |  4 ++--
 spec/components/post_creator_spec.rb | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index c3b9556df2..6a9e4ca873 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -96,7 +96,7 @@ class PostCreator
     end
 
     if @opts[:target_usernames].present? && !skip_validations? && !@user.staff?
-      names = @opts[:target_usernames].split(',')
+      names = @opts[:target_usernames].split(',').flatten.map(&:downcase)
 
       # Make sure max_allowed_message_recipients setting is respected
       max_allowed_message_recipients = SiteSetting.max_allowed_message_recipients
@@ -111,7 +111,7 @@ class PostCreator
       end
 
       # Make sure none of the users have muted the creator
-      users = User.where(username: names).pluck(:id, :username).to_h
+      users = User.where(username_lower: names).pluck(:id, :username).to_h
 
       User
         .joins("LEFT JOIN user_options ON user_options.user_id = users.id")
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index 5936959804..27fba7c486 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -1203,7 +1203,7 @@ describe PostCreator do
   end
 
   context 'private message to a user that has disabled private messages' do
-    fab!(:another_user) { Fabricate(:user) }
+    fab!(:another_user) { Fabricate(:user, username: 'HelloWorld') }
 
     before do
       another_user.user_option.update!(allow_private_messages: false)
@@ -1224,6 +1224,18 @@ describe PostCreator do
         "not_accepting_pms", username: another_user.username
       ))
     end
+
+    it 'should not be valid if the name is downcased' do
+      post_creator = PostCreator.new(
+        user,
+        title: 'this message is to someone who muted me!',
+        raw: "you will have to see this even if you muted me!",
+        archetype: Archetype.private_message,
+        target_usernames: "#{another_user.username.downcase}"
+      )
+
+      expect(post_creator).to_not be_valid
+    end
   end
 
   context "private message to a muted user" do

From a60a67c431df19468919d37e28ac588fa7525d5f Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 17 Jun 2020 21:41:01 +0300
Subject: [PATCH 1742/1830] FIX: Show unconfirmed emails too when checking
 emails (#10062)

When checking emails through user preferences, it did not display the
unconfirmed emails.
---
 app/assets/javascripts/discourse/app/models/user.js | 1 +
 app/controllers/users_controller.rb                 | 2 ++
 spec/requests/users_controller_spec.rb              | 6 ++++++
 3 files changed, 9 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index 6d9bc1ade1..f4482fa6e8 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -770,6 +770,7 @@ const User = RestModel.extend({
         this.setProperties({
           email: result.email,
           secondary_emails: result.secondary_emails,
+          unconfirmed_emails: result.unconfirmed_emails,
           associated_accounts: result.associated_accounts
         });
       }
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 93f9401dbe..a17245096d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -195,10 +195,12 @@ class UsersController < ApplicationController
     end
 
     email, *secondary_emails = user.emails
+    unconfirmed_emails = user.unconfirmed_emails
 
     render json: {
       email: email,
       secondary_emails: secondary_emails,
+      unconfirmed_emails: unconfirmed_emails,
       associated_accounts: user.associated_accounts
     }
   rescue Discourse::InvalidAccess
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index e6295dcb18..4e91e14a62 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -2519,6 +2519,7 @@ describe UsersController do
 
       it "returns emails and associated_accounts for self" do
         user = Fabricate(:user)
+        Fabricate(:email_change_request, user: user)
         sign_in(user)
 
         get "/u/#{user.username}/emails.json"
@@ -2527,11 +2528,13 @@ describe UsersController do
         json = response.parsed_body
         expect(json["email"]).to eq(user.email)
         expect(json["secondary_emails"]).to eq(user.secondary_emails)
+        expect(json["unconfirmed_emails"]).to eq(user.unconfirmed_emails)
         expect(json["associated_accounts"]).to eq([])
       end
 
       it "returns emails and associated_accounts when you're allowed to see them" do
         user = Fabricate(:user)
+        Fabricate(:email_change_request, user: user)
         sign_in_admin
 
         get "/u/#{user.username}/emails.json"
@@ -2540,11 +2543,13 @@ describe UsersController do
         json = response.parsed_body
         expect(json["email"]).to eq(user.email)
         expect(json["secondary_emails"]).to eq(user.secondary_emails)
+        expect(json["unconfirmed_emails"]).to eq(user.unconfirmed_emails)
         expect(json["associated_accounts"]).to eq([])
       end
 
       it "works on inactive users" do
         inactive_user = Fabricate(:user, active: false)
+        Fabricate(:email_change_request, user: inactive_user)
         sign_in_admin
 
         get "/u/#{inactive_user.username}/emails.json"
@@ -2553,6 +2558,7 @@ describe UsersController do
         json = response.parsed_body
         expect(json["email"]).to eq(inactive_user.email)
         expect(json["secondary_emails"]).to eq(inactive_user.secondary_emails)
+        expect(json["unconfirmed_emails"]).to eq(inactive_user.unconfirmed_emails)
         expect(json["associated_accounts"]).to eq([])
       end
     end

From 7ed7b1ef6454339bee88bd2ab01b180225624f8d Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 17 Jun 2020 21:41:16 +0300
Subject: [PATCH 1743/1830] DEV: Add test (#10064)

Follow-up-to 84dfaad137a215bf722388cccbe22f593279f5a2
---
 spec/components/email_updater_spec.rb  | 2 ++
 spec/requests/users_controller_spec.rb | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/spec/components/email_updater_spec.rb b/spec/components/email_updater_spec.rb
index 3476f48527..4370961204 100644
--- a/spec/components/email_updater_spec.rb
+++ b/spec/components/email_updater_spec.rb
@@ -159,6 +159,8 @@ describe EmailUpdater do
 
       context 'confirming a valid token' do
         it "adds a user email" do
+          expect(UserHistory.where(action: UserHistory.actions[:add_email], acting_user_id: user.id).last).to be_present
+
           Jobs.expects(:enqueue).once.with(:critical_user_email, has_entries(type: :notify_old_email_add, to_address: old_email))
           updater.confirm(@change_req.new_email_token.token)
           expect(updater.errors).to be_blank
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 4e91e14a62..ec5adf4018 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -2581,7 +2581,8 @@ describe UsersController do
       expect(user_email.reload.primary).to eq(true)
       expect(other_email.reload.primary).to eq(false)
 
-      put "/u/#{user.username}/preferences/primary-email.json", params: { email: other_email.email }
+      expect { put "/u/#{user.username}/preferences/primary-email.json", params: { email: other_email.email } }
+        .to change { UserHistory.where(action: UserHistory.actions[:update_email], acting_user_id: user.id).count }.by(1)
       expect(response.status).to eq(200)
       expect(user_email.reload.primary).to eq(false)
       expect(other_email.reload.primary).to eq(true)
@@ -2604,7 +2605,8 @@ describe UsersController do
       expect(response.status).to eq(428)
       expect(user.reload.user_emails.pluck(:email)).to contain_exactly(user_email.email, other_email.email)
 
-      delete "/u/#{user.username}/preferences/email.json", params: { email: other_email.email }
+      expect { delete "/u/#{user.username}/preferences/email.json", params: { email: other_email.email } }
+        .to change { UserHistory.where(action: UserHistory.actions[:destroy_email], acting_user_id: user.id).count }.by(1)
       expect(response.status).to eq(200)
       expect(user.reload.user_emails.pluck(:email)).to contain_exactly(user_email.email)
     end

From 79ab1493c853eb5cb6e1dbabce32c5dc7edc462b Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 17 Jun 2020 21:41:29 +0300
Subject: [PATCH 1744/1830] DEV: Add test (#10066)

Follow-up-to f1b97202d445279e8a64a81fddb5678e636f5114
---
 spec/requests/users_email_controller_spec.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/spec/requests/users_email_controller_spec.rb b/spec/requests/users_email_controller_spec.rb
index 92cd157044..06cc9ced98 100644
--- a/spec/requests/users_email_controller_spec.rb
+++ b/spec/requests/users_email_controller_spec.rb
@@ -49,6 +49,17 @@ describe UsersEmailController do
         updater.change_to('new.n.cool@example.com')
       end
 
+      it 'includes security_key_allowed_credential_ids in a hidden field' do
+        key1 = Fabricate(:user_security_key_with_random_credential, user: user)
+        key2 = Fabricate(:user_security_key_with_random_credential, user: user)
+
+        get "/u/confirm-new-email/#{user.email_tokens.last.token}"
+
+        doc = Nokogiri::HTML5(response.body)
+        credential_ids = doc.css("#security-key-allowed-credential-ids").first["value"].split(",")
+        expect(credential_ids).to contain_exactly(key1.credential_id, key2.credential_id)
+      end
+
       it 'confirms with a correct token' do
         user.user_stat.update_columns(bounce_score: 42, reset_bounce_score_after: 1.week.from_now)
 

From d72ed8c5a88a5d9a8862f515fd7f0c918944f2d4 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 17 Jun 2020 14:46:01 -0400
Subject: [PATCH 1745/1830] UX: Include category name in hyperlink modal
 results on mobile

---
 app/assets/stylesheets/mobile/header.scss | 4 ----
 app/assets/stylesheets/mobile/modal.scss  | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss
index 54ec7a9677..77f744f4a3 100644
--- a/app/assets/stylesheets/mobile/header.scss
+++ b/app/assets/stylesheets/mobile/header.scss
@@ -86,7 +86,3 @@
 #main-outlet {
   padding-top: 4.2857em;
 }
-
-.search-link .badge-category {
-  display: none;
-}
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index 36777b0eee..dc31b26781 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -116,6 +116,10 @@
     max-height: 90vh;
     overflow: auto;
   }
+
+  &.insert-hyperlink-modal .modal-inner-container {
+    overflow: visible;
+  }
 }
 
 .modal .modal-body.reorder-categories {

From 978aba632ea69fd2303c4ec7696773d51f518a23 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Wed, 17 Jun 2020 14:13:52 -0700
Subject: [PATCH 1746/1830] minor copyedit on site setting description

---
 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 c839d7b8c8..5d79648f50 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1682,7 +1682,7 @@ en:
     s3_backup_bucket: "The remote bucket to hold backups. WARNING: Make sure it is a private bucket."
     s3_endpoint: "The endpoint can be modified to backup to an S3 compatible service like DigitalOcean Spaces or Minio. WARNING: Leave blank if using AWS S3."
     s3_configure_tombstone_policy: "Enable automatic deletion policy for tombstone uploads. IMPORTANT: If disabled, no space will be reclaimed after uploads are deleted."
-    s3_disable_cleanup: "Disable the removal of backups from S3 when removed locally."
+    s3_disable_cleanup: "Prevent removal of old backups from S3 when there are more backups than the maximum allowed."
     enable_s3_inventory: "Generate reports and verify uploads using Amazon S3 inventory. IMPORTANT: requires valid S3 credentials (both access key id & secret access key)."
     backup_time_of_day: "Time of day UTC when the backup should occur."
     backup_with_uploads: "Include uploads in scheduled backups. Disabling this will only backup the database."

From 75991a249eddb3e2d12cbbd5b60761ca56d5bf5d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 18 Jun 2020 09:02:08 +0200
Subject: [PATCH 1747/1830] fix spec (#10069)

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

diff --git a/spec/requests/published_pages_controller_spec.rb b/spec/requests/published_pages_controller_spec.rb
index 0662554989..d5fed80819 100644
--- a/spec/requests/published_pages_controller_spec.rb
+++ b/spec/requests/published_pages_controller_spec.rb
@@ -60,7 +60,9 @@ RSpec.describe PublishedPagesController do
         end
 
         context "published page is public" do
-          fab!(:public_published_page) { Fabricate(:published_page, public: true) }
+          fab!(:public_published_page) {
+            Fabricate(:published_page, public: true, slug: "a-public-page")
+          }
 
           it "returns 200 for a topic you can't see" do
             get public_published_page.path

From 62faa0f5fe338fd847583c4bee9bd058050afa77 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Thu, 18 Jun 2020 11:15:44 +0300
Subject: [PATCH 1748/1830] FIX: Do not show Add or Change buttons if email is
 not editable (#10068)

---
 .../app/templates/preferences/account.hbs        | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
index 47df8c73fa..ed380319ff 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
@@ -50,9 +50,11 @@
         <div class="emails">
           {{#each emails as |email|}}
             <div class="row email">
-              {{email-dropdown email=email
-                              setPrimaryEmail=(action "setPrimaryEmail")
-                              destroyEmail=(action "destroyEmail")}}
+              {{#if model.can_edit_email}}
+                {{email-dropdown email=email
+                                setPrimaryEmail=(action "setPrimaryEmail")
+                                destroyEmail=(action "destroyEmail")}}
+              {{/if}}
 
               <div class="email-first">{{email.email}}</div>
 
@@ -77,9 +79,11 @@
           {{/each}}
         </div>
 
-        {{#link-to "preferences.email" (query-params new=1) class="pull-right"}}
-          {{d-icon "plus"}} {{i18n "user.email.add_email"}}
-        {{/link-to}}
+        {{#if model.can_edit_email}}
+          {{#link-to "preferences.email" (query-params new=1) class="pull-right"}}
+            {{d-icon "plus"}} {{i18n "user.email.add_email"}}
+          {{/link-to}}
+        {{/if}}
       {{else}}
         <div class="controls">
           <span class="static">{{model.email}}</span>

From d21a08c284b4e7d30227499f7a0d682b37f51cf2 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Thu, 18 Jun 2020 11:32:14 +0300
Subject: [PATCH 1749/1830] DEV: Deprecate Category#url_with_id in favor of
 Category#url (#9972)

---
 .../category_hashtags_controller.rb           |  2 +-
 app/models/category.rb                        |  9 +++--
 app/models/permalink.rb                       |  2 +-
 app/models/topic_list.rb                      |  2 +-
 lib/pretty_text/helpers.rb                    |  4 +--
 spec/components/pretty_text_spec.rb           |  4 +--
 spec/models/category_spec.rb                  | 35 +++----------------
 spec/models/permalink_spec.rb                 |  2 +-
 spec/requests/categories_controller_spec.rb   |  2 +-
 .../category_hashtags_controller_spec.rb      |  4 +--
 10 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/app/controllers/category_hashtags_controller.rb b/app/controllers/category_hashtags_controller.rb
index b08d7f23ae..b5a971fa80 100644
--- a/app/controllers/category_hashtags_controller.rb
+++ b/app/controllers/category_hashtags_controller.rb
@@ -9,7 +9,7 @@ class CategoryHashtagsController < ApplicationController
     ids = category_slugs.map { |category_slug| Category.query_from_hashtag_slug(category_slug).try(:id) }
 
     valid_categories = Category.secured(guardian).where(id: ids).map do |category|
-      { slug: category.hashtag_slug, url: category.url_with_id }
+      { slug: category.hashtag_slug, url: category.url }
     end.compact
 
     render json: { valid: valid_categories }
diff --git a/app/models/category.rb b/app/models/category.rb
index d6375eb714..cb51a03cc4 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -721,11 +721,13 @@ class Category < ActiveRecord::Base
   end
 
   def url
-    @@url_cache[self.id] ||= "#{Discourse.base_uri}/c/#{slug_path.join('/')}"
+    @@url_cache[self.id] ||= "#{Discourse.base_uri}/c/#{slug_path.join('/')}/#{self.id}"
   end
 
   def url_with_id
-    self.parent_category ? "#{url}/#{self.id}" : "#{Discourse.base_uri}/c/#{self.slug}/#{self.id}"
+    Discourse.deprecate("Category#url_with_id is deprecated. Use `Category#url` instead.", output_in_test: true)
+
+    url
   end
 
   # If the name changes, try and update the category definition topic too if it's an exact match
@@ -739,9 +741,10 @@ class Category < ActiveRecord::Base
 
   def create_category_permalink
     old_slug = saved_changes.transform_values(&:first)["slug"]
+
     url = +"#{Discourse.base_uri}/c"
     url << "/#{parent_category.slug_path.join('/')}" if parent_category_id
-    url << "/#{old_slug}"
+    url << "/#{old_slug}/#{id}"
     url = Permalink.normalize_url(url)
 
     if Permalink.where(url: url).exists?
diff --git a/app/models/permalink.rb b/app/models/permalink.rb
index 9e1e2d1a4e..ea317839e5 100644
--- a/app/models/permalink.rb
+++ b/app/models/permalink.rb
@@ -80,7 +80,7 @@ class Permalink < ActiveRecord::Base
     return external_url if external_url
     return "#{Discourse::base_uri}#{post.url}" if post
     return topic.relative_url if topic
-    return "#{category.url}/#{category.id}" if category
+    return category.url if category
     return tag.full_url if tag
     nil
   end
diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb
index d51c0f153f..52b0ee0070 100644
--- a/app/models/topic_list.rb
+++ b/app/models/topic_list.rb
@@ -67,7 +67,7 @@ class TopicList
 
   def preload_key
     if @category
-      "topic_list_#{@category.url.sub(/^\//, '')}/#{@category.id}/l/#{@filter}"
+      "topic_list_#{@category.url.sub(/^\//, '')}/l/#{@filter}"
     else
       "topic_list_#{@filter}"
     end
diff --git a/lib/pretty_text/helpers.rb b/lib/pretty_text/helpers.rb
index d207e01eed..9633a4e8ea 100644
--- a/lib/pretty_text/helpers.rb
+++ b/lib/pretty_text/helpers.rb
@@ -41,7 +41,7 @@ module PrettyText
 
     def category_hashtag_lookup(category_slug)
       if category = Category.query_from_hashtag_slug(category_slug)
-        [category.url_with_id, category_slug]
+        [category.url, category_slug]
       else
         nil
       end
@@ -106,7 +106,7 @@ module PrettyText
       is_tag = text =~ /#{tag_postfix}$/
 
       if !is_tag && category = Category.query_from_hashtag_slug(text)
-        [category.url_with_id, text]
+        [category.url, text]
       elsif (!is_tag && tag = Tag.find_by(name: text)) ||
             (is_tag && tag = Tag.find_by(name: text.gsub!("#{tag_postfix}", '')))
         ["#{Discourse.base_url}/tag/#{tag.name}", text]
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index 49a3ac90ba..823fb8900c 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -1106,9 +1106,9 @@ describe PrettyText do
 
     [
       "<span class=\"hashtag\">#unknown::tag</span>",
-      "<a class=\"hashtag\" href=\"#{category2.url_with_id}\">#<span>known</span></a>",
+      "<a class=\"hashtag\" href=\"#{category2.url}\">#<span>known</span></a>",
       "<a class=\"hashtag\" href=\"http://test.localhost/tag/known\">#<span>known</span></a>",
-      "<a class=\"hashtag\" href=\"#{category.url_with_id}\">#<span>testing</span></a>"
+      "<a class=\"hashtag\" href=\"#{category.url}\">#<span>testing</span></a>"
     ].each do |element|
 
       expect(cooked).to include(element)
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 7b550a9c1d..f122673c0a 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -430,7 +430,7 @@ describe Category do
     end
 
     it "reuses existing permalink when category slug is changed" do
-      permalink = Permalink.create!(url: "c/#{@category.slug}", category_id: 42)
+      permalink = Permalink.create!(url: "c/#{@category.slug}/#{@category.id}", category_id: 42)
 
       expect { @category.update(slug: 'new-slug') }.to_not change { Permalink.count }
       expect(permalink.reload.category_id).to eq(@category.id)
@@ -695,47 +695,20 @@ describe Category do
 
     describe "for normal categories" do
       it "builds a url" do
-        expect(category.url).to eq("/c/root")
+        expect(category.url).to eq("/c/root/#{category.id}")
       end
     end
 
     describe "for subcategories" do
       it "builds a url" do
-        expect(sub_category.url).to eq("/c/root/child")
+        expect(sub_category.url).to eq("/c/root/child/#{sub_category.id}")
       end
     end
 
     describe "for sub-sub-categories" do
       it "builds a url" do
         expect(sub_sub_category.url)
-          .to eq("/c/root/child/child-of-child")
-      end
-    end
-  end
-
-  describe "#url_with_id" do
-    fab!(:category) do
-      Fabricate(
-        :category_with_definition,
-        name: 'cats',
-      )
-    end
-
-    it "includes the id in the URL" do
-      expect(category.url_with_id).to eq("/c/cats/#{category.id}")
-    end
-
-    context "child category" do
-      fab!(:child_category) do
-        Fabricate(
-          :category,
-          parent_category_id: category.id,
-          name: 'dogs',
-        )
-      end
-
-      it "includes the id in the URL" do
-        expect(child_category.url_with_id).to eq("/c/cats/dogs/#{child_category.id}")
+          .to eq("/c/root/child/child-of-child/#{sub_sub_category.id}")
       end
     end
   end
diff --git a/spec/models/permalink_spec.rb b/spec/models/permalink_spec.rb
index 869d38fba5..709768e5d0 100644
--- a/spec/models/permalink_spec.rb
+++ b/spec/models/permalink_spec.rb
@@ -63,7 +63,7 @@ describe Permalink do
 
     it "returns a category url when category_id is set" do
       permalink.category_id = category.id
-      expect(target_url).to eq("#{category.url}/#{category.id}")
+      expect(target_url).to eq("#{category.url}")
     end
 
     it "returns nil when category_id is set but category is not found" do
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index a4825fb101..d920723b14 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -13,7 +13,7 @@ describe CategoriesController do
       get '/categories', headers: { 'HTTP_USER_AGENT' => 'Googlebot' }
       html = Nokogiri::HTML5(response.body)
       expect(html.css('body.crawler')).to be_present
-      expect(html.css("a[href=\"/forum/c/#{category.slug}\"]")).to be_present
+      expect(html.css("a[href=\"/forum/c/#{category.slug}/#{category.id}\"]")).to be_present
     end
 
     it "properly preloads topic list" do
diff --git a/spec/requests/category_hashtags_controller_spec.rb b/spec/requests/category_hashtags_controller_spec.rb
index f2f62a82ea..7676ba5642 100644
--- a/spec/requests/category_hashtags_controller_spec.rb
+++ b/spec/requests/category_hashtags_controller_spec.rb
@@ -18,7 +18,7 @@ describe CategoryHashtagsController do
 
           expect(response.status).to eq(200)
           expect(response.parsed_body).to eq(
-            "valid" => [{ "slug" => category.hashtag_slug, "url" => category.url_with_id }]
+            "valid" => [{ "slug" => category.hashtag_slug, "url" => category.url }]
           )
         end
 
@@ -45,7 +45,7 @@ describe CategoryHashtagsController do
 
           expect(response.status).to eq(200)
           expect(response.parsed_body).to eq(
-            "valid" => [{ "slug" => private_category.hashtag_slug, "url" => private_category.url_with_id }]
+            "valid" => [{ "slug" => private_category.hashtag_slug, "url" => private_category.url }]
           )
         end
       end

From db1bebddce7dfe867b92d027c981fd003fc777fc Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Thu, 18 Jun 2020 13:27:51 +0300
Subject: [PATCH 1750/1830] FIX: Hide the post history for TL4 (#10065)

---
 lib/guardian/post_guardian.rb          | 2 +-
 spec/components/guardian_spec.rb       | 7 ++-----
 spec/requests/posts_controller_spec.rb | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index 2bbc48f88f..d05296ef33 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -220,7 +220,7 @@ module PostGuardian
     end
 
     authenticated? &&
-    (is_staff? || @user.has_trust_level?(TrustLevel[4]) || @user.id == post.user_id) &&
+    (is_staff? || @user.id == post.user_id) &&
     can_see_post?(post)
   end
 
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index ef8245254d..8927ea316e 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -890,12 +890,9 @@ describe Guardian do
           expect(Guardian.new(moderator).can_see?(post_revision)).to be_truthy
         end
 
-        it 'is true for trust level 4' do
-          expect(Guardian.new(trust_level_4).can_see?(post_revision)).to be_truthy
-        end
-
-        it 'is false for trust level lower than 4' do
+        it 'is false for trust level equal or lower than 4' do
           expect(Guardian.new(trust_level_3).can_see?(post_revision)).to be_falsey
+          expect(Guardian.new(trust_level_4).can_see?(post_revision)).to be_falsey
         end
       end
     end
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index f5ef93c53f..6ccc7380d8 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -1323,10 +1323,10 @@ describe PostsController do
         expect(response.status).to eq(200)
       end
 
-      it "ensures trust level 4 can see the revisions" do
+      it "ensures trust level 4 cannot see the revisions" do
         sign_in(Fabricate(:user, trust_level: 4))
         get "/posts/#{post_revision.post_id}/revisions/#{post_revision.number}.json"
-        expect(response.status).to eq(200)
+        expect(response.status).to eq(403)
       end
     end
 

From 823b940b9d94eaaccdba88afce1ee21a811a9d18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Thu, 18 Jun 2020 16:32:27 +0200
Subject: [PATCH 1751/1830] PERF: improve loading of indexes in bulk import

Similar strategy as for c52191d in which we stream the results from the database into
an automatically growing array instead of using a hash.
---
 script/bulk_import/base.rb | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb
index 7ac31295b9..c9bf6c375a 100644
--- a/script/bulk_import/base.rb
+++ b/script/bulk_import/base.rb
@@ -174,9 +174,24 @@ class BulkImport::Base
     [klass.unscoped.maximum(:id) || 0, 0].max
   end
 
+  def load_values(name, column, size)
+    map = Array.new(size)
+
+    @raw_connection.send_query("SELECT id, #{column} FROM #{name}")
+    @raw_connection.set_single_row_mode
+
+    @raw_connection.get_result.stream_each do |row|
+      map[row["id"]] = row[column]
+    end
+
+    @raw_connection.get_result
+
+    map
+  end
+
   def load_indexes
     puts "Loading groups indexes..."
-    @last_group_id = Group.unscoped.maximum(:id)
+    @last_group_id = last_id(Group)
     @group_names = Group.unscoped.pluck(:name).map(&:downcase).to_set
 
     puts "Loading users indexes..."
@@ -192,12 +207,12 @@ class BulkImport::Base
 
     puts "Loading topics indexes..."
     @last_topic_id = last_id(Topic)
-    @highest_post_number_by_topic_id = Topic.unscoped.pluck(:id, :highest_post_number).to_h
+    @highest_post_number_by_topic_id = load_values("topics", "highest_post_number", @last_topic_id)
 
     puts "Loading posts indexes..."
     @last_post_id = last_id(Post)
-    @post_number_by_post_id = Post.unscoped.pluck(:id, :post_number).to_h
-    @topic_id_by_post_id = Post.unscoped.pluck(:id, :topic_id).to_h
+    @post_number_by_post_id = load_values("posts", "post_number", @last_post_id)
+    @topic_id_by_post_id = load_values("posts", "topic_id", @last_post_id)
 
     puts "Loading post actions indexes..."
     @last_post_action_id = last_id(PostAction)

From 332a7bb59c32633a0162a1c9f85fb075a6e401d7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 11:11:17 -0400
Subject: [PATCH 1752/1830] Build(deps): Bump aws-sigv4 from 1.1.4 to 1.2.0
 (#10070)

Bumps [aws-sigv4](https://github.com/aws/aws-sdk-ruby) from 1.1.4 to 1.2.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sigv4/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.1.4...1.2.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c1ad5fb0dd..b4d363b14b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -61,8 +61,8 @@ GEM
     aws-sdk-sns (1.25.1)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.4)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-sigv4 (1.2.0)
+      aws-eventstream (~> 1, >= 1.0.2)
     barber (0.12.2)
       ember-source (>= 1.0, < 3.1)
       execjs (>= 1.2, < 3)

From ec794c7f299d847344d32c6cca646747f0afb41c Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Thu, 18 Jun 2020 10:18:34 -0500
Subject: [PATCH 1753/1830] DEV: Plugin outlet after user-info (#10072)

---
 .../discourse/app/templates/components/user-info.hbs            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/templates/components/user-info.hbs b/app/assets/javascripts/discourse/app/templates/components/user-info.hbs
index fe6c7823fe..0d3f1bdfdb 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-info.hbs
@@ -25,3 +25,5 @@
   {{/if}}
 
 </div>
+
+{{plugin-outlet name="after-user-info" args=(hash user=user)}}

From e31471585a6101ebcbe728f7fa51fa9c0d6a6c8c Mon Sep 17 00:00:00 2001
From: Bernhard Suttner <sbernhard@users.noreply.github.com>
Date: Thu, 18 Jun 2020 17:19:47 +0200
Subject: [PATCH 1754/1830] DEV: allow to have duplicate topic titles if
 categegory is different (#10034)

Co-authored-by: Robin Ward <robin.ward@gmail.com>

Co-authored-by: Robin Ward <robin.ward@gmail.com>
---
 app/models/topic.rb                      |  7 +++++-
 config/locales/server.en.yml             |  1 +
 config/site_settings.yml                 |  1 +
 lib/validators/unique_among_validator.rb |  2 +-
 script/import_scripts/base.rb            |  1 +
 spec/models/topic_spec.rb                | 32 +++++++++++++++++++++---
 6 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index 49d14cbf22..a26998897d 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -155,7 +155,12 @@ class Topic < ActiveRecord::Base
                                     message: :has_already_been_used,
                                     allow_blank: true,
                                     case_sensitive: false,
-                                    collection: Proc.new { Topic.listable_topics } }
+                                    collection: Proc.new { |t|
+                                      SiteSetting.allow_duplicate_topic_titles_category? ?
+                                        Topic.listable_topics.where("category_id = ?", t.category_id) :
+                                        Topic.listable_topics
+                                    }
+                                  }
 
   validates :category_id,
             presence: true,
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 5d79648f50..5a3bc5ada4 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1449,6 +1449,7 @@ en:
     category_search_priority_very_high_weight: "Weight applied to ranking for very high category search priority."
     allow_uncategorized_topics: "Allow topics to be created without a category. WARNING: If there are any uncategorized topics, you must recategorize them before turning this off."
     allow_duplicate_topic_titles: "Allow topics with identical, duplicate titles."
+    allow_duplicate_topic_titles_category: "Allow topics with identical, duplicate titles if the category is different. allow_duplicate_topic_titles must be false."
     unique_posts_mins: "How many minutes before a user can make a post with the same content again"
     educate_until_posts: "When the user starts typing their first (n) new posts, show the pop-up new user education panel in the composer."
     title: "The name of this site, as used in the title tag."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 2948b8793f..502d71cbc1 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -716,6 +716,7 @@ posting:
     default: true
     refresh: true
   allow_duplicate_topic_titles: false
+  allow_duplicate_topic_titles_category: false
   min_title_similar_length:
     client: true
     default: 10
diff --git a/lib/validators/unique_among_validator.rb b/lib/validators/unique_among_validator.rb
index 82fed5c206..ed3d142014 100644
--- a/lib/validators/unique_among_validator.rb
+++ b/lib/validators/unique_among_validator.rb
@@ -12,7 +12,7 @@ class UniqueAmongValidator < ActiveRecord::Validations::UniquenessValidator
     # do nothing further unless there were some duplicates.
     unless new_errors == 0
       # now look only in the collection we care about.
-      dupes = options[:collection].call.where("lower(#{attribute}) = ?", value.downcase)
+      dupes = options[:collection].call(record).where("lower(#{attribute}) = ?", value.downcase)
       dupes = dupes.where("id != ?", record.id) if record.persisted?
 
       # pop off the error, if it was a false positive
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index a42b8c3dda..64de94ba75 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -77,6 +77,7 @@ class ImportScripts::Base
       min_personal_message_post_length: 1,
       min_personal_message_title_length: 1,
       allow_duplicate_topic_titles: true,
+      allow_duplicate_topic_titles_category: false,
       disable_emails: 'yes',
       max_attachment_size_kb: 102400,
       max_image_size_kb: 102400,
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index d1d5d1cc91..ead96218b2 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -255,19 +255,27 @@ describe Topic do
   end
 
   context 'topic title uniqueness' do
+    let!(:category1) { Fabricate(:category) }
+    let!(:category2) { Fabricate(:category) }
 
-    let!(:topic) { Fabricate(:topic) }
-    let(:new_topic) { Fabricate.build(:topic, title: topic.title) }
+    let!(:topic) { Fabricate(:topic, category: category1) }
+    let(:new_topic) { Fabricate.build(:topic, title: topic.title, category: category1) }
+    let(:new_topic_different_cat) { Fabricate.build(:topic, title: topic.title, category: category2) }
 
     context "when duplicates aren't allowed" do
       before do
-        SiteSetting.expects(:allow_duplicate_topic_titles?).returns(false)
+        SiteSetting.allow_duplicate_topic_titles = false
+        SiteSetting.allow_duplicate_topic_titles_category = false
       end
 
       it "won't allow another topic to be created with the same name" do
         expect(new_topic).not_to be_valid
       end
 
+      it "won't even allow another topic to be created with the same name but different category" do
+        expect(new_topic_different_cat).not_to be_valid
+      end
+
       it "won't allow another topic with an upper case title to be created" do
         new_topic.title = new_topic.title.upcase
         expect(new_topic).not_to be_valid
@@ -286,7 +294,8 @@ describe Topic do
 
     context "when duplicates are allowed" do
       before do
-        SiteSetting.expects(:allow_duplicate_topic_titles?).returns(true)
+        SiteSetting.allow_duplicate_topic_titles = true
+        SiteSetting.allow_duplicate_topic_titles_category = false
       end
 
       it "will allow another topic to be created with the same name" do
@@ -294,6 +303,21 @@ describe Topic do
       end
     end
 
+    context "when duplicates are allowed if the category is different" do
+      before do
+        SiteSetting.allow_duplicate_topic_titles = false
+        SiteSetting.allow_duplicate_topic_titles_category = true
+      end
+
+      it "will allow another topic to be created with the same name but different category" do
+        expect(new_topic_different_cat).to be_valid
+      end
+
+      it "won't allow another topic to be created with the same name in same category" do
+        expect(new_topic).not_to be_valid
+      end
+    end
+
   end
 
   context 'html in title' do

From b8c676e7275d3d3bc75f82e23681bf1f722af96f Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 18 Jun 2020 17:24:07 +0200
Subject: [PATCH 1755/1830] FEATURE: allows to ignore a user forever (#10074)

---
 .../discourse/app/templates/components/future-date-input.hbs  | 4 +++-
 .../app/templates/modal/ignore-duration-with-username.hbs     | 2 +-
 .../discourse/app/templates/modal/ignore-duration.hbs         | 2 +-
 .../stylesheets/common/components/ignored-user-list.scss      | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
index 97bb5ef438..43c7e421e0 100644
--- a/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
@@ -13,9 +13,11 @@
         includeMidFuture=includeMidFuture
         includeNow=includeNow
         clearable=clearable
-        none="topic.auto_update_input.none"
         onChangeInput=onChangeInput
         onChange=(action (mut selection))
+        options=(hash
+          none="topic.auto_update_input.none"
+        )
       }}
     </div>
   {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs
index 29a8c0f215..379f8bc893 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs
@@ -12,7 +12,7 @@
     includeWeekend=true
     includeDateTime=false
     includeMidFuture=true
-    includeFarFuture=false
+    includeFarFuture=true
     onChangeInput=(action (mut ignoredUntil))
   }}
   <p>{{i18n "user.user_notifications.ignore_duration_note"}}</p>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs
index 33db2479db..8cb1e0baa8 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs
@@ -5,7 +5,7 @@
     includeWeekend=true
     includeDateTime=false
     includeMidFuture=true
-    includeFarFuture=false
+    includeFarFuture=true
     onChangeInput=(action (mut ignoredUntil))
   }}
   <p>{{i18n "user.user_notifications.ignore_duration_note"}}</p>
diff --git a/app/assets/stylesheets/common/components/ignored-user-list.scss b/app/assets/stylesheets/common/components/ignored-user-list.scss
index eff8929a8e..25de784282 100644
--- a/app/assets/stylesheets/common/components/ignored-user-list.scss
+++ b/app/assets/stylesheets/common/components/ignored-user-list.scss
@@ -11,7 +11,7 @@
 
 .ignored-user-list-item {
   border: 1px solid $primary-medium;
-  border-radius: 0.25em;
+  border-radius: 5px;
   padding: 0;
   display: flex;
   align-items: center;

From 3a780bc49dcf4129d9aa70bb0966dc551b7b0432 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 11:25:16 -0400
Subject: [PATCH 1756/1830] Build(deps-dev): Bump mock_redis from 0.23.0 to
 0.24.0 (#10075)

Bumps [mock_redis](https://github.com/sds/mock_redis) from 0.23.0 to 0.24.0.
- [Release notes](https://github.com/sds/mock_redis/releases)
- [Changelog](https://github.com/sds/mock_redis/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/mock_redis/compare/v0.23.0...v0.24.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index b4d363b14b..f0df732280 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -197,7 +197,7 @@ GEM
       ffi (~> 1.9)
     minitest (5.14.1)
     mocha (1.11.2)
-    mock_redis (0.23.0)
+    mock_redis (0.24.0)
     msgpack (1.3.3)
     multi_json (1.14.1)
     multi_xml (0.6.0)

From 2d63d7d05e9ec213870ab37c55144aed894fd2bf Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@riseup.net>
Date: Thu, 18 Jun 2020 15:30:08 +0000
Subject: [PATCH 1757/1830] make unix domain sockets listening example match
 web.socketed.template.yml (#10060)

---
 config/nginx.sample.conf | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
index 52e5660954..310e8c84e2 100644
--- a/config/nginx.sample.conf
+++ b/config/nginx.sample.conf
@@ -4,10 +4,8 @@ types {
 }
 
 upstream discourse {
-  server unix:/var/www/discourse/tmp/sockets/thin.0.sock;
-  server unix:/var/www/discourse/tmp/sockets/thin.1.sock;
-  server unix:/var/www/discourse/tmp/sockets/thin.2.sock;
-  server unix:/var/www/discourse/tmp/sockets/thin.3.sock;
+  server unix:/var/www/discourse/tmp/sockets/nginx.http.sock;
+  server unix:/var/www/discourse/tmp/sockets/nginx.https.sock; 
 }
 
 # inactive means we keep stuff around for 1440m minutes regardless of last access (1 week)

From 5143309014c20c12dc252c8cc84ff71456f762eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Thu, 18 Jun 2020 17:42:14 +0200
Subject: [PATCH 1758/1830] DEV: ensure values are converted to integers in
 bulk importer

---
 script/bulk_import/base.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb
index c9bf6c375a..65e86f4e9a 100644
--- a/script/bulk_import/base.rb
+++ b/script/bulk_import/base.rb
@@ -137,7 +137,7 @@ class BulkImport::Base
     @raw_connection.get_result.stream_each do |row|
       id = row["value"].to_i
       ids << id
-      map[id] = row["#{name}_id"]
+      map[id] = row["#{name}_id"].to_i
     end
 
     @raw_connection.get_result
@@ -181,7 +181,7 @@ class BulkImport::Base
     @raw_connection.set_single_row_mode
 
     @raw_connection.get_result.stream_each do |row|
-      map[row["id"]] = row[column]
+      map[row["id"].to_i] = row[column].to_i
     end
 
     @raw_connection.get_result

From 2da6faf281758240f5e59fb339f49255a896ba06 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 18 Jun 2020 18:36:14 +0200
Subject: [PATCH 1759/1830] FEATURE: Add `before_email_send` event

Plugins can use it to customize the message (e.g. add header) before the email is sent.
---
 lib/email/sender.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/email/sender.rb b/lib/email/sender.rb
index 8cd3c613fd..df3d519c13 100644
--- a/lib/email/sender.rb
+++ b/lib/email/sender.rb
@@ -209,6 +209,8 @@ module Email
 
       email_log.message_id = @message.message_id
 
+      DiscourseEvent.trigger(:before_email_send, @message, @email_type)
+
       begin
         @message.deliver_now
       rescue *SMTP_CLIENT_ERRORS => e

From 6cb6faff2933b944f5fef00525564accf75ef850 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 18 Jun 2020 13:26:25 -0400
Subject: [PATCH 1760/1830] UX: Ignore modal margin was too tight

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

diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 4e1a7946a1..289051c0cd 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -731,6 +731,12 @@
   }
 }
 
+.ignore-duration-with-username-modal {
+  .future-date-input {
+    margin-top: 1em;
+  }
+}
+
 .modal:not(.has-tabs) {
   .modal-tab {
     position: absolute;

From 494a27dc27c7748e9bd8142bc1ae47c7d9147f24 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 18 Jun 2020 13:41:27 -0400
Subject: [PATCH 1761/1830] FIX: A much nicer error message if you can't
 ignore/mute a user

---
 app/controllers/users_controller.rb    |  4 ++++
 config/locales/client.en.yml           |  2 +-
 config/locales/server.en.yml           |  4 ++++
 spec/requests/users_controller_spec.rb | 16 ++++++++++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a17245096d..886b0d20ce 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1178,6 +1178,7 @@ class UsersController < ApplicationController
     user = fetch_user_from_params
 
     if params[:notification_level] == "ignore"
+      @error_message = "ignore_error"
       guardian.ensure_can_ignore_user!(user)
       MutedUser.where(user: current_user, muted_user: user).delete_all
       ignored_user = IgnoredUser.find_by(user: current_user, ignored_user: user)
@@ -1187,6 +1188,7 @@ class UsersController < ApplicationController
         IgnoredUser.create!(user: current_user, ignored_user: user, expiring_at: Time.parse(params[:expiring_at]))
       end
     elsif params[:notification_level] == "mute"
+      @error_message = "mute_error"
       guardian.ensure_can_mute_user!(user)
       IgnoredUser.where(user: current_user, ignored_user: user).delete_all
       MutedUser.find_or_create_by!(user: current_user, muted_user: user)
@@ -1196,6 +1198,8 @@ class UsersController < ApplicationController
     end
 
     render json: success_json
+  rescue Discourse::InvalidAccess => e
+    render_json_error(I18n.t("notification_level.#{@error_message}"))
   end
 
   def read_faq
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index febb6a61ac..aacd7c256b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -847,7 +847,7 @@ en:
           all: "All"
           read: "Read"
           unread: "Unread"
-        ignore_duration_title: "Ignore Timer"
+        ignore_duration_title: "Ignore User"
         ignore_duration_username: "Username"
         ignore_duration_when: "Duration:"
         ignore_duration_save: "Ignore"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 5a3bc5ada4..eb5ae6820a 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -4855,6 +4855,10 @@ en:
   email_style:
     html_missing_placeholder: "The html template must include %{placeholder}"
 
+  notification_level:
+    ignore_error: "Sorry, you can't ignore that user."
+    mute_error: "Sorry, you can't mute that user."
+
   discord:
     not_in_allowed_guild: "Authentication failed. You are not a member of a permitted Discord guild."
 
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index ec5adf4018..add1d7af01 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -2414,6 +2414,22 @@ describe UsersController do
       let!(:ignored_user) { Fabricate(:ignored_user, user: user, ignored_user: another_user) }
       let!(:muted_user) { Fabricate(:muted_user, user: user, muted_user: another_user) }
 
+      context "when you can't change the notification" do
+        fab!(:staff_user) { Fabricate(:admin) }
+
+        it "ignoring includes a helpful error message" do
+          put "/u/#{staff_user.username}/notification_level.json", params: { notification_level: 'ignore' }
+          expect(response.status).to eq(422)
+          expect(response.parsed_body['errors'][0]).to eq(I18n.t("notification_level.ignore_error"))
+        end
+
+        it "muting includes a helpful error message" do
+          put "/u/#{staff_user.username}/notification_level.json", params: { notification_level: 'mute' }
+          expect(response.status).to eq(422)
+          expect(response.parsed_body['errors'][0]).to eq(I18n.t("notification_level.mute_error"))
+        end
+      end
+
       context 'when changing notification level to normal' do
         it 'changes notification level to normal' do
           put "/u/#{another_user.username}/notification_level.json", params: { notification_level: "normal" }

From d13d5e2b998e36e0c02e4617842c09304c902ccc Mon Sep 17 00:00:00 2001
From: Cassius <cassius@cadl.dev>
Date: Fri, 19 Jun 2020 00:58:47 +0700
Subject: [PATCH 1762/1830] FIX: Allow multiple hyphens in host (#10078)

* FIX: Allow multiple hyphens in host

* FIX: added spec for multiple hyphens
---
 app/models/embeddable_host.rb       | 2 +-
 spec/models/embeddable_host_spec.rb | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/models/embeddable_host.rb b/app/models/embeddable_host.rb
index 32781522c3..7984c0a18f 100644
--- a/app/models/embeddable_host.rb
+++ b/app/models/embeddable_host.rb
@@ -61,7 +61,7 @@ class EmbeddableHost < ActiveRecord::Base
   end
 
   def host_must_be_valid
-    if host !~ /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,24}(:[0-9]{1,5})?(\/.*)?\Z/i &&
+    if host !~ /\A[a-z0-9]+([\-\.]+{1}[a-z0-9]+)*\.[a-z]{2,24}(:[0-9]{1,5})?(\/.*)?\Z/i &&
        host !~ /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(:[0-9]{1,5})?(\/.*)?\Z/ &&
        host !~ /\A([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.)?localhost(\:[0-9]{1,5})?(\/.*)?\Z/i
       errors.add(:host, I18n.t('errors.messages.invalid'))
diff --git a/spec/models/embeddable_host_spec.rb b/spec/models/embeddable_host_spec.rb
index 449c87aa2f..66b81b9bd4 100644
--- a/spec/models/embeddable_host_spec.rb
+++ b/spec/models/embeddable_host_spec.rb
@@ -52,6 +52,12 @@ describe EmbeddableHost do
     expect(eh.host).to eq('discourse.localhost')
   end
 
+  it "supports multiple hyphens" do
+    eh = EmbeddableHost.new(host: 'deploy-preview-1--example.example.app')
+    expect(eh).to be_valid
+    expect(eh.host).to eq('deploy-preview-1--example.example.app')
+  end
+
   it "rejects misspellings of localhost" do
     eh = EmbeddableHost.new(host: 'alocalhost')
     expect(eh).not_to be_valid

From a1df68d4c417cd3d4f5de0ad8c9a76c4f2b15a86 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Thu, 18 Jun 2020 21:09:54 +0300
Subject: [PATCH 1763/1830] FIX: Do not change tracked categories for staged
 users (#10076)

---
 .../admin/site_settings_controller.rb         |  8 ++++--
 .../admin/site_settings_controller_spec.rb    | 25 +++++++++++--------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/app/controllers/admin/site_settings_controller.rb b/app/controllers/admin/site_settings_controller.rb
index 4d662f7dd5..c143e04dca 100644
--- a/app/controllers/admin/site_settings_controller.rb
+++ b/app/controllers/admin/site_settings_controller.rb
@@ -61,7 +61,7 @@ class Admin::SiteSettingsController < Admin::AdminController
         (new_category_ids - previous_category_ids).each do |category_id|
           skip_user_ids = CategoryUser.where(category_id: category_id).pluck(:user_id)
 
-          User.where.not(id: skip_user_ids).select(:id).find_in_batches do |users|
+          User.real.where(staged: false).where.not(id: skip_user_ids).select(:id).find_in_batches do |users|
             category_users = []
             users.each { |user| category_users << { category_id: category_id, user_id: user.id, notification_level: notification_level } }
             CategoryUser.insert_all!(category_users)
@@ -88,7 +88,7 @@ class Admin::SiteSettingsController < Admin::AdminController
         (new_tag_ids - previous_tag_ids).each do |tag_id|
           skip_user_ids = TagUser.where(tag_id: tag_id).pluck(:user_id)
 
-          User.where.not(id: skip_user_ids).select(:id).find_in_batches do |users|
+          User.real.where(staged: false).where.not(id: skip_user_ids).select(:id).find_in_batches do |users|
             tag_users = []
             users.each { |user| tag_users << { tag_id: tag_id, user_id: user.id, notification_level: notification_level, created_at: now, updated_at: now } }
             TagUser.insert_all!(tag_users)
@@ -135,8 +135,10 @@ class Admin::SiteSettingsController < Admin::AdminController
 
       user_ids = CategoryUser.where(category_id: previous_category_ids - new_category_ids, notification_level: notification_level).distinct.pluck(:user_id)
       user_ids += User
+        .real
         .joins("CROSS JOIN categories c")
         .joins("LEFT JOIN category_users cu ON users.id = cu.user_id AND c.id = cu.category_id")
+        .where(staged: false)
         .where("c.id IN (?) AND cu.notification_level IS NULL", new_category_ids - previous_category_ids)
         .distinct
         .pluck("users.id")
@@ -159,8 +161,10 @@ class Admin::SiteSettingsController < Admin::AdminController
 
       user_ids = TagUser.where(tag_id: previous_tag_ids - new_tag_ids, notification_level: notification_level).distinct.pluck(:user_id)
       user_ids += User
+        .real
         .joins("CROSS JOIN tags t")
         .joins("LEFT JOIN tag_users tu ON users.id = tu.user_id AND t.id = tu.tag_id")
+        .where(staged: false)
         .where("t.id IN (?) AND tu.notification_level IS NULL", new_tag_ids - previous_tag_ids)
         .distinct
         .pluck("users.id")
diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rb
index 7962ab295d..1b74fb9f64 100644
--- a/spec/requests/admin/site_settings_controller_spec.rb
+++ b/spec/requests/admin/site_settings_controller_spec.rb
@@ -97,8 +97,9 @@ describe Admin::SiteSettingsController do
       end
 
       describe 'default categories' do
-        let(:user1) { Fabricate(:user) }
-        let(:user2) { Fabricate(:user) }
+        fab!(:user1) { Fabricate(:user) }
+        fab!(:user2) { Fabricate(:user) }
+        fab!(:staged_user) { Fabricate(:staged) }
         let(:watching) { NotificationLevels.all[:watching] }
         let(:tracking) { NotificationLevels.all[:tracking] }
 
@@ -120,7 +121,7 @@ describe Admin::SiteSettingsController do
           }
 
           expect(CategoryUser.where(category_id: category_ids.first, notification_level: watching).count).to eq(0)
-          expect(CategoryUser.where(category_id: category_ids.last, notification_level: watching).count).to eq(User.count - 1)
+          expect(CategoryUser.where(category_id: category_ids.last, notification_level: watching).count).to eq(User.real.where(staged: false).count - 1)
         end
 
         it 'should not update existing users user preference' do
@@ -135,8 +136,9 @@ describe Admin::SiteSettingsController do
       end
 
       describe 'default tags' do
-        let(:user1) { Fabricate(:user) }
-        let(:user2) { Fabricate(:user) }
+        fab!(:user1) { Fabricate(:user) }
+        fab!(:user2) { Fabricate(:user) }
+        fab!(:staged_user) { Fabricate(:staged) }
         let(:watching) { NotificationLevels.all[:watching] }
         let(:tracking) { NotificationLevels.all[:tracking] }
 
@@ -158,7 +160,7 @@ describe Admin::SiteSettingsController do
           }
 
           expect(TagUser.where(tag_id: tags.first.id, notification_level: watching).count).to eq(0)
-          expect(TagUser.where(tag_id: tags.last.id, notification_level: watching).count).to eq(User.count - 1)
+          expect(TagUser.where(tag_id: tags.last.id, notification_level: watching).count).to eq(User.real.where(staged: false).count - 1)
         end
 
         it 'should not update existing users user preference' do
@@ -173,7 +175,8 @@ describe Admin::SiteSettingsController do
       end
 
       describe '#user_count' do
-        let(:user) { Fabricate(:user) }
+        fab!(:user) { Fabricate(:user) }
+        fab!(:staged_user) { Fabricate(:staged) }
         let(:tracking) { NotificationLevels.all[:tracking] }
 
         it 'should return correct user count for default categories change' do
@@ -183,7 +186,7 @@ describe Admin::SiteSettingsController do
             default_categories_watching: category_id
           }
 
-          expect(response.parsed_body["user_count"]).to eq(User.count)
+          expect(response.parsed_body["user_count"]).to eq(User.real.where(staged: false).count)
 
           CategoryUser.create!(category_id: category_id, notification_level: tracking, user: user)
 
@@ -191,7 +194,7 @@ describe Admin::SiteSettingsController do
             default_categories_watching: category_id
           }
 
-          expect(response.parsed_body["user_count"]).to eq(User.count - 1)
+          expect(response.parsed_body["user_count"]).to eq(User.real.where(staged: false).count - 1)
 
           SiteSetting.setting(:default_categories_watching, "")
         end
@@ -203,7 +206,7 @@ describe Admin::SiteSettingsController do
             default_tags_watching: tag.name
           }
 
-          expect(response.parsed_body["user_count"]).to eq(User.count)
+          expect(response.parsed_body["user_count"]).to eq(User.real.where(staged: false).count)
 
           TagUser.create!(tag_id: tag.id, notification_level: tracking, user: user)
 
@@ -211,7 +214,7 @@ describe Admin::SiteSettingsController do
             default_tags_watching: tag.name
           }
 
-          expect(response.parsed_body["user_count"]).to eq(User.count - 1)
+          expect(response.parsed_body["user_count"]).to eq(User.real.where(staged: false).count - 1)
 
           SiteSetting.setting(:default_tags_watching, "")
         end

From ae47bcb2691612e478df78a328036124617edfa7 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Fri, 19 Jun 2020 03:12:39 +0530
Subject: [PATCH 1764/1830] DEV: move user references deletion code to
 `before_destroy`. (#10085)

Moving the `delete_source_user_references` method code from user merger service to user model.
---
 app/models/user.rb          |  7 +++++++
 app/services/user_merger.rb | 12 ------------
 spec/models/user_spec.rb    |  2 ++
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 15ed2fb531..acbcdb0c18 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -161,6 +161,13 @@ class User < ActiveRecord::Base
 
     # our relationship filters on enabled, this makes sure everything is deleted
     UserSecurityKey.where(user_id: self.id).delete_all
+
+    Developer.where(user_id: self.id).delete_all
+    DraftSequence.where(user_id: self.id).delete_all
+    GivenDailyLike.where(user_id: self.id).delete_all
+    MutedUser.where(user_id: self.id).or(MutedUser.where(muted_user_id: self.id)).delete_all
+    IgnoredUser.where(user_id: self.id).or(IgnoredUser.where(ignored_user_id: self.id)).delete_all
+    UserAvatar.where(user_id: self.id).delete_all
   end
 
   # Skip validating email, for example from a particular auth provider plugin
diff --git a/app/services/user_merger.rb b/app/services/user_merger.rb
index 8da5afbfbc..d45da9dbee 100644
--- a/app/services/user_merger.rb
+++ b/app/services/user_merger.rb
@@ -22,7 +22,6 @@ class UserMerger
     update_user_stats
 
     delete_source_user
-    delete_source_user_references
     log_merge
 
     @target_user.reload
@@ -368,17 +367,6 @@ class UserMerger
     UserDestroyer.new(Discourse.system_user).destroy(@source_user, quiet: true)
   end
 
-  def delete_source_user_references
-    Developer.where(user_id: @source_user.id).delete_all
-    DraftSequence.where(user_id: @source_user.id).delete_all
-    GivenDailyLike.where(user_id: @source_user.id).delete_all
-    MutedUser.where(user_id: @source_user.id).or(MutedUser.where(muted_user_id: @source_user.id)).delete_all
-    IgnoredUser.where(user_id: @source_user.id).or(IgnoredUser.where(ignored_user_id: @source_user.id)).delete_all
-    UserAuthTokenLog.where(user_id: @source_user.id).delete_all
-    UserAvatar.where(user_id: @source_user.id).delete_all
-    UserAction.where(acting_user_id: @source_user.id).delete_all
-  end
-
   def log_merge
     logger = StaffActionLogger.new(@acting_user || Discourse.system_user)
     logger.log_user_merge(@target_user, @source_user.username, @source_primary_email)
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 1b69613f51..cc11a35c37 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2224,6 +2224,7 @@ describe User do
       UserAction.create!(user_id: user.id, action_type: UserAction::LIKE)
       UserAction.create!(user_id: -1, action_type: UserAction::LIKE, target_user_id: user.id)
       UserAction.create!(user_id: -1, action_type: UserAction::LIKE, acting_user_id: user.id)
+      Developer.create!(user_id: user.id)
 
       user.reload
 
@@ -2233,6 +2234,7 @@ describe User do
       expect(UserAction.where(target_user_id: user.id).length).to eq(0)
       expect(UserAction.where(acting_user_id: user.id).length).to eq(0)
       expect(PostAction.with_deleted.where(user_id: user.id).length).to eq(0)
+      expect(Developer.where(user_id: user.id).length).to eq(0)
     end
   end
 

From 5faf074e61bfeb049a35dcd817974b748f45c22e Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 18 Jun 2020 19:18:00 -0400
Subject: [PATCH 1765/1830] minor fix to post admin menu button class

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

diff --git a/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
index 072f2166eb..532b5b9381 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
@@ -30,7 +30,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
   if (currentUser.staff) {
     contents.push({
       icon: "list",
-      className: "btn-default",
+      className: "popup-menu-button moderation-history",
       label: "review.moderation_history",
       url: `/review?topic_id=${attrs.topicId}&status=all`
     });

From b5495b8e9cd71dea8387d563fd19a39473027e29 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Fri, 19 Jun 2020 11:17:18 +1000
Subject: [PATCH 1766/1830] FIX: Do not incorrectly add topic bookmark on
 Escape (#10088)

* The first post was showing as bookmarked incorrectly after pressing f to open the topic modal then pressing escape to cancel without saving, because the closeWithoutSaving option was not being respected.
* Also re-introduce the enter shortcut when the name input is focused to saveAndClose the bookmark modal by pressing enter.
---
 app/assets/javascripts/discourse/app/models/topic.js         | 5 ++++-
 .../javascripts/discourse/app/templates/modal/bookmark.hbs   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js
index 4f5305fec6..b4a69c33c7 100644
--- a/app/assets/javascripts/discourse/app/models/topic.js
+++ b/app/assets/javascripts/discourse/app/models/topic.js
@@ -430,8 +430,11 @@ const Topic = RestModel.extend({
     return this.firstPost().then(firstPost => {
       const toggleBookmarkOnServer = () => {
         if (bookmark) {
-          return firstPost.toggleBookmark().then(() => {
+          return firstPost.toggleBookmark().then(opts => {
             this.set("bookmarking", false);
+            if (opts.closedWithoutSaving) {
+              return;
+            }
             return this.afterTopicBookmarked(firstPost);
           });
         } else {
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
index 615ae16b07..d3811ac9ab 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
@@ -9,7 +9,7 @@
     {{/if}}
 
     <div class="control-group bookmark-name-wrap">
-      {{input id="bookmark-name" value=model.name name="bookmark-name" class="bookmark-name" placeholder=(i18n "post.bookmarks.name_placeholder")}}
+      {{input id="bookmark-name" value=model.name name="bookmark-name" class="bookmark-name" enter=(action "saveAndClose") placeholder=(i18n "post.bookmarks.name_placeholder")}}
       {{d-button icon="cog" action=(action "toggleOptionsPanel") class="bookmark-options-button"}}
     </div>
 

From 3e161e372a82e5b8557f919c681170d4e1c81896 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 19 Jun 2020 09:51:03 +0200
Subject: [PATCH 1767/1830] FEATURE: allows to have header/footer in publshed
 pages (#10067)

Usage: fill Header/Footer sections of your theme.
---
 app/views/layouts/publish.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/layouts/publish.html.erb b/app/views/layouts/publish.html.erb
index 4a249e8f32..4a428eb9e1 100644
--- a/app/views/layouts/publish.html.erb
+++ b/app/views/layouts/publish.html.erb
@@ -6,6 +6,8 @@
     <%= render partial: "common/discourse_publish_stylesheet" %>
   </head>
   <body class="<%= @body_classes.to_a.join(' ') %>">
+    <%= theme_lookup("header") %>
     <%= yield %>
+    <%= theme_lookup("footer") %>
   </body>
 </html>

From 9cf77372a2ebe830f91f143e0858f0a82e3aef37 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Fri, 19 Jun 2020 10:04:05 +0100
Subject: [PATCH 1768/1830] FIX: Guardian#can_remove_allowed_users? shouldn't
 break for ownerless topics

A topic can outlive its original author. TopicGuardian should still work
in this situation.
---
 lib/guardian/topic_guardian.rb   |  2 +-
 spec/components/guardian_spec.rb | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index 33f5d836f4..842f44c0cf 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -5,7 +5,7 @@ module TopicGuardian
 
   def can_remove_allowed_users?(topic, target_user = nil)
     is_staff? ||
-    (topic.user == user && user.has_trust_level?(TrustLevel[2])) ||
+    (topic.user == @user && @user.has_trust_level?(TrustLevel[2])) ||
     (
       topic.allowed_users.count > 1 &&
       topic.user != target_user &&
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index 8927ea316e..6c4ddd161f 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -3503,6 +3503,21 @@ describe Guardian do
         end
       end
     end
+
+    context "anonymous users" do
+      fab!(:topic) { Fabricate(:topic) }
+
+      it 'should be false' do
+        expect(Guardian.new.can_remove_allowed_users?(topic)).to eq(false)
+      end
+
+      it 'should be false when the topic does not have a user (for example because the user was removed)' do
+        DB.exec("UPDATE topics SET user_id=NULL WHERE id=#{topic.id}")
+        topic.reload
+
+        expect(Guardian.new.can_remove_allowed_users?(topic)).to eq(false)
+      end
+    end
   end
 
   describe '#auth_token' do

From 78626d2832d54c867e9d8c20e3e0c68fa5f2137e Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 19 Jun 2020 12:45:06 +0100
Subject: [PATCH 1769/1830] FIX: Do not attempt to pull_hotlinked on emoji
 images when CDN enabled

---
 app/jobs/regular/pull_hotlinked_images.rb |  2 +-
 spec/jobs/pull_hotlinked_images_spec.rb   | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index cb0fee6062..80367f4f51 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -173,7 +173,7 @@ module Jobs
 
       # If file is on the forum or CDN domain or already has the
       # secure media url
-      if Discourse.store.has_been_uploaded?(src) || src =~ /\A\/[^\/]/i || Upload.secure_media_url?(src)
+      if UrlHelper.is_local(src) || Upload.secure_media_url?(src)
         return false if src =~ /\/images\/emoji\//
 
         # Someone could hotlink a file from a different site on the same CDN,
diff --git a/spec/jobs/pull_hotlinked_images_spec.rb b/spec/jobs/pull_hotlinked_images_spec.rb
index 5e6003d0b7..37499a81e0 100644
--- a/spec/jobs/pull_hotlinked_images_spec.rb
+++ b/spec/jobs/pull_hotlinked_images_spec.rb
@@ -350,6 +350,23 @@ describe Jobs::PullHotlinkedImages do
       end
     end
 
+    it "returns false for emoji" do
+      src = Emoji.url_for("testemoji.png")
+      expect(subject.should_download_image?(src)).to eq(false)
+    end
+
+    it "returns false for emoji when app and S3 CDNs configured" do
+      set_cdn_url "https://mydomain.cdn/test"
+      SiteSetting.s3_upload_bucket = "some-bucket-on-s3"
+      SiteSetting.s3_access_key_id = "s3-access-key-id"
+      SiteSetting.s3_secret_access_key = "s3-secret-access-key"
+      SiteSetting.s3_cdn_url = "https://s3.cdn.com"
+      SiteSetting.enable_s3_uploads = true
+
+      src = UrlHelper.cook_url(Emoji.url_for("testemoji.png"))
+      expect(subject.should_download_image?(src)).to eq(false)
+    end
+
     context "when download_remote_images_to_local? is false" do
       before do
         SiteSetting.download_remote_images_to_local = false
@@ -360,11 +377,6 @@ describe Jobs::PullHotlinkedImages do
         expect(subject.should_download_image?(src)).to eq(true)
       end
 
-      it "returns false for emoji" do
-        src = Emoji.url_for("testemoji.png")
-        expect(subject.should_download_image?(src)).to eq(false)
-      end
-
       it 'returns false for valid remote URLs' do
         expect(subject.should_download_image?("http://meta.discourse.org")).to eq(false)
       end

From 9f2e7e4651497c015b9c68eaa03c6ea9d0405864 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 19 Jun 2020 12:52:51 +0100
Subject: [PATCH 1770/1830] FIX: Handle invalid URLs gracefully when pulling
 hotlinked images

---
 app/jobs/regular/pull_hotlinked_images.rb |  2 +-
 spec/jobs/pull_hotlinked_images_spec.rb   | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index 80367f4f51..415ce3b569 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -220,7 +220,7 @@ module Jobs
       uri.normalize!
       uri.scheme = nil
       uri.to_s
-    rescue URI::Error
+    rescue URI::Error, Addressable::URI::InvalidURIError
       src
     end
   end
diff --git a/spec/jobs/pull_hotlinked_images_spec.rb b/spec/jobs/pull_hotlinked_images_spec.rb
index 37499a81e0..b589383004 100644
--- a/spec/jobs/pull_hotlinked_images_spec.rb
+++ b/spec/jobs/pull_hotlinked_images_spec.rb
@@ -222,6 +222,16 @@ describe Jobs::PullHotlinkedImages do
       MD
     end
 
+    it 'works when invalid url in post'  do
+      post = Fabricate(:post, raw: <<~MD)
+      ![some test](#{image_url})
+      ![some test 2]("#{image_url})
+      MD
+
+      expect { Jobs::PullHotlinkedImages.new.execute(post_id: post.id) }
+        .to change { Upload.count }.by(1)
+    end
+
     it 'replaces bbcode images' do
       post = Fabricate(:post, raw: <<~MD)
       [img]

From 29dc2058c566ac5d3e5de26d2073d98883fed3c2 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 19 Jun 2020 09:26:50 -0400
Subject: [PATCH 1771/1830] DEV: Update ImageMagick version in CI (#10080)

---
 .github/workflows/ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 83a3875891..04a646d9d6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,6 +68,13 @@ jobs:
           sudo apt-get -yqq install postgresql-client libpq-dev gifsicle jpegoptim optipng jhead
           wget -qO- https://raw.githubusercontent.com/discourse/discourse_docker/master/image/base/install-pngquant | sudo sh
 
+      - name: Update imagemagick
+        if: env.BUILD_TYPE == 'BACKEND'
+        run: |
+          wget https://raw.githubusercontent.com/discourse/discourse_docker/master/image/base/install-imagemagick
+          chmod +x install-imagemagick
+          sudo ./install-imagemagick
+
       - name: Setup redis
         uses: shogo82148/actions-setup-redis@v1
         if: env.BUILD_TYPE != 'LINT'

From a99bb0ded4d61f1326e49ed523c0a96693c8f73a Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 19 Jun 2020 14:39:16 +0100
Subject: [PATCH 1772/1830] Revert "FIX: Do not attempt to pull_hotlinked on
 emoji images when CDN enabled"

This changed cause plugin spec failures and needs further investigation

This reverts commit 78626d2832d54c867e9d8c20e3e0c68fa5f2137e.
---
 app/jobs/regular/pull_hotlinked_images.rb |  2 +-
 spec/jobs/pull_hotlinked_images_spec.rb   | 22 +++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index 415ce3b569..9472da0cbf 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -173,7 +173,7 @@ module Jobs
 
       # If file is on the forum or CDN domain or already has the
       # secure media url
-      if UrlHelper.is_local(src) || Upload.secure_media_url?(src)
+      if Discourse.store.has_been_uploaded?(src) || src =~ /\A\/[^\/]/i || Upload.secure_media_url?(src)
         return false if src =~ /\/images\/emoji\//
 
         # Someone could hotlink a file from a different site on the same CDN,
diff --git a/spec/jobs/pull_hotlinked_images_spec.rb b/spec/jobs/pull_hotlinked_images_spec.rb
index b589383004..f0531b843f 100644
--- a/spec/jobs/pull_hotlinked_images_spec.rb
+++ b/spec/jobs/pull_hotlinked_images_spec.rb
@@ -360,23 +360,6 @@ describe Jobs::PullHotlinkedImages do
       end
     end
 
-    it "returns false for emoji" do
-      src = Emoji.url_for("testemoji.png")
-      expect(subject.should_download_image?(src)).to eq(false)
-    end
-
-    it "returns false for emoji when app and S3 CDNs configured" do
-      set_cdn_url "https://mydomain.cdn/test"
-      SiteSetting.s3_upload_bucket = "some-bucket-on-s3"
-      SiteSetting.s3_access_key_id = "s3-access-key-id"
-      SiteSetting.s3_secret_access_key = "s3-secret-access-key"
-      SiteSetting.s3_cdn_url = "https://s3.cdn.com"
-      SiteSetting.enable_s3_uploads = true
-
-      src = UrlHelper.cook_url(Emoji.url_for("testemoji.png"))
-      expect(subject.should_download_image?(src)).to eq(false)
-    end
-
     context "when download_remote_images_to_local? is false" do
       before do
         SiteSetting.download_remote_images_to_local = false
@@ -387,6 +370,11 @@ describe Jobs::PullHotlinkedImages do
         expect(subject.should_download_image?(src)).to eq(true)
       end
 
+      it "returns false for emoji" do
+        src = Emoji.url_for("testemoji.png")
+        expect(subject.should_download_image?(src)).to eq(false)
+      end
+
       it 'returns false for valid remote URLs' do
         expect(subject.should_download_image?("http://meta.discourse.org")).to eq(false)
       end

From 8a86705e51b78ed0f70d71e28c5cd860be91c2b8 Mon Sep 17 00:00:00 2001
From: Aman Gupta Karmani <aman@tmm1.net>
Date: Fri, 19 Jun 2020 07:17:24 -0700
Subject: [PATCH 1773/1830] FIX: handle heroku style HTTP_X_REQUEST_START
 (#10087)

---
 lib/middleware/request_tracker.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 4fbe3d1b2a..a346b44112 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -145,7 +145,11 @@ class Middleware::RequestTracker
   def self.populate_request_queue_seconds!(env)
     if !env['REQUEST_QUEUE_SECONDS']
       if queue_start = env['HTTP_X_REQUEST_START']
-        queue_start = queue_start.split("t=")[1].to_f
+        queue_start = if queue_start.start_with?("t=")
+          queue_start.split("t=")[1].to_f
+        else
+          queue_start.to_f / 1000.0
+        end
         queue_time = (Time.now.to_f - queue_start)
         env['REQUEST_QUEUE_SECONDS'] = queue_time
       end

From 4a2871f7f6d36c38f92f28b71cc5ec64d902212d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 19 Jun 2020 10:44:21 -0400
Subject: [PATCH 1774/1830] FEATURE: Don't display muted/ignored users under
 "who liked" (#10084)

* FEATURE: Don't display muted/ignored users under "who liked"

Previously, if you clicked on the heart icon below a post
it would show you the avatar for a user even if you ignored or muted
them.

This commit will instead display a (?) icon. The count of likes will
remain correct, but you needn't be reminded of the person you
preferred not to see.

* Use a circle instead of (?) for unknown user
---
 .../discourse/app/widgets/actions-summary.js  | 17 +++++++++++-----
 .../discourse/app/widgets/emoji.js            |  9 +++++++--
 .../discourse/app/widgets/post-menu.js        |  6 +++---
 .../stylesheets/common/base/topic-post.scss   | 10 ++++++++++
 .../post_action_users_controller.rb           | 18 ++++++++++++++++-
 .../post_action_user_serializer.rb            | 11 +++++++++-
 config/locales/client.en.yml                  |  1 +
 .../post_action_users_controller_spec.rb      | 16 +++++++++++++++
 .../widgets/small-user-list-test.js           | 20 +++++++++++++++++++
 9 files changed, 96 insertions(+), 12 deletions(-)
 create mode 100644 test/javascripts/widgets/small-user-list-test.js

diff --git a/app/assets/javascripts/discourse/app/widgets/actions-summary.js b/app/assets/javascripts/discourse/app/widgets/actions-summary.js
index 9e15f6d523..7ca85f01f9 100644
--- a/app/assets/javascripts/discourse/app/widgets/actions-summary.js
+++ b/app/assets/javascripts/discourse/app/widgets/actions-summary.js
@@ -6,17 +6,18 @@ import { h } from "virtual-dom";
 import { userPath } from "discourse/lib/url";
 import hbs from "discourse/widgets/hbs-compiler";
 
-export function avatarAtts(user) {
+export function smallUserAtts(user) {
   return {
     template: user.avatar_template,
     username: user.username,
     post_url: user.post_url,
-    url: userPath(user.username_lower)
+    url: userPath(user.username_lower),
+    unknown: user.unknown
   };
 }
 
 createWidget("small-user-list", {
-  tagName: "div.clearfix",
+  tagName: "div.clearfix.small-user-list",
 
   buildClasses(atts) {
     return atts.listClassName;
@@ -30,7 +31,7 @@ createWidget("small-user-list", {
         atts.addSelf &&
         !users.some(u => u.username === currentUser.username)
       ) {
-        users = users.concat(avatarAtts(currentUser));
+        users = users.concat(smallUserAtts(currentUser));
       }
 
       let description = null;
@@ -43,7 +44,13 @@ createWidget("small-user-list", {
       let postUrl;
       const icons = users.map(u => {
         postUrl = postUrl || u.post_url;
-        return avatarFor.call(this, "small", u);
+        if (u.unknown) {
+          return h("div.unknown", {
+            attributes: { title: I18n.t("post.unknown_user") }
+          });
+        } else {
+          return avatarFor.call(this, "small", u);
+        }
       });
 
       if (postUrl) {
diff --git a/app/assets/javascripts/discourse/app/widgets/emoji.js b/app/assets/javascripts/discourse/app/widgets/emoji.js
index 2fe63226c0..a3f302c08e 100644
--- a/app/assets/javascripts/discourse/app/widgets/emoji.js
+++ b/app/assets/javascripts/discourse/app/widgets/emoji.js
@@ -12,8 +12,13 @@ export default createWidget("emoji", {
   tagName: "img.emoji",
 
   buildAttributes(attrs) {
-    let result = { src: emojiUrlFor(attrs.name), alt: `:${attrs.name}:` };
-    if (attrs.title) result.title = attrs.name;
+    let result = {
+      src: emojiUrlFor(attrs.name),
+      alt: `:${attrs.alt || attrs.name}:`
+    };
+    if (attrs.title) {
+      result.title = typeof attrs.title === "string" ? attrs.title : attrs.name;
+    }
     return result;
   }
 });
diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
index fa18b45aee..d014a67e60 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@@ -1,6 +1,6 @@
 import { next, run } from "@ember/runloop";
 import { applyDecorators, createWidget } from "discourse/widgets/widget";
-import { avatarAtts } from "discourse/widgets/actions-summary";
+import { smallUserAtts } from "discourse/widgets/actions-summary";
 import { h } from "virtual-dom";
 import showModal from "discourse/lib/show-modal";
 import { Promise } from "rsvp";
@@ -696,7 +696,7 @@ export default createWidget("post-menu", {
         post_action_type_id: LIKE_ACTION
       })
       .then(users => {
-        state.likedUsers = users.map(avatarAtts);
+        state.likedUsers = users.map(smallUserAtts);
         state.total = users.totalRows;
       });
   },
@@ -705,7 +705,7 @@ export default createWidget("post-menu", {
     const { attrs, state } = this;
 
     return this.store.find("post-reader", { id: attrs.id }).then(users => {
-      state.readers = users.map(avatarAtts);
+      state.readers = users.map(smallUserAtts);
       state.totalReaders = users.totalRows;
     });
   },
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 5f56f61226..3b2424c2ac 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -264,6 +264,16 @@ blockquote {
   }
 }
 
+.small-user-list .unknown {
+  display: inline-block;
+  background-color: $primary-low;
+  width: 25px;
+  height: 25px;
+  border-radius: 50%;
+  vertical-align: middle;
+  margin-right: 0.25em;
+}
+
 .post-hidden {
   .topic-avatar,
   .cooked,
diff --git a/app/controllers/post_action_users_controller.rb b/app/controllers/post_action_users_controller.rb
index fe42fd3b9c..0c59b763cc 100644
--- a/app/controllers/post_action_users_controller.rb
+++ b/app/controllers/post_action_users_controller.rb
@@ -15,6 +15,16 @@ class PostActionUsersController < ApplicationController
     post = finder.first
     guardian.ensure_can_see!(post)
 
+    unknown_user_ids = Set.new
+    if current_user.present?
+      result = DB.query_single(<<~SQL, user_id: current_user.id)
+        SELECT mu.muted_user_id AS id FROM muted_users AS mu WHERE mu.user_id = :user_id
+        UNION
+        SELECT iu.ignored_user_id AS id FROM ignored_users AS iu WHERE iu.user_id = :user_id
+      SQL
+      unknown_user_ids.merge(result)
+    end
+
     post_actions = post.post_actions.where(post_action_type_id: post_action_type_id)
       .includes(:user)
       .offset(page * page_size)
@@ -29,7 +39,13 @@ class PostActionUsersController < ApplicationController
     action_type = PostActionType.types.key(post_action_type_id)
     total_count = post["#{action_type}_count"].to_i
 
-    data = { post_action_users: serialize_data(post_actions.to_a, PostActionUserSerializer) }
+    data = {
+      post_action_users: serialize_data(
+        post_actions.to_a,
+        PostActionUserSerializer,
+        unknown_user_ids: unknown_user_ids
+      )
+    }
 
     if total_count > page_size
       data[:total_rows_post_action_users] = total_count
diff --git a/app/serializers/post_action_user_serializer.rb b/app/serializers/post_action_user_serializer.rb
index c1413c4045..40d81451ac 100644
--- a/app/serializers/post_action_user_serializer.rb
+++ b/app/serializers/post_action_user_serializer.rb
@@ -2,7 +2,8 @@
 
 class PostActionUserSerializer < BasicUserSerializer
   attributes :post_url,
-             :username_lower
+             :username_lower,
+             :unknown
 
   def id
     object.user.id
@@ -24,4 +25,12 @@ class PostActionUserSerializer < BasicUserSerializer
     object.related_post.url if object.related_post_id && object.related_post
   end
 
+  def unknown
+    true
+  end
+
+  def include_unknown?
+    (@options[:unknown_user_ids] || []).include?(object.user.id)
+  end
+
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index aacd7c256b..301e9d522b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2603,6 +2603,7 @@ en:
         one: "%{count} Reply"
         other: "%{count} Replies"
 
+      unknown_user: "(unknown/deleted user)"
       has_likes_title:
         one: "%{count} person liked this post"
         other: "%{count} people liked this post"
diff --git a/spec/requests/post_action_users_controller_spec.rb b/spec/requests/post_action_users_controller_spec.rb
index bc053524fe..ec6bc28592 100644
--- a/spec/requests/post_action_users_controller_spec.rb
+++ b/spec/requests/post_action_users_controller_spec.rb
@@ -59,6 +59,22 @@ describe PostActionUsersController do
     expect(response.status).to eq(200)
   end
 
+  it 'will return an unknown attribute for muted users' do
+    ignored_user = Fabricate(:user)
+    PostActionCreator.like(ignored_user, post)
+    regular_user = Fabricate(:user)
+    PostActionCreator.like(regular_user, post)
+    IgnoredUser.create(user: user, ignored_user: ignored_user)
+
+    get "/post_action_users.json", params: {
+      id: post.id, post_action_type_id: PostActionType.types[:like]
+    }
+    expect(response.status).to eq(200)
+    json_users = response.parsed_body['post_action_users']
+    expect(json_users.find { |u| u['id'] == regular_user.id }['unknown']).to be_blank
+    expect(json_users.find { |u| u['id'] == ignored_user.id }['unknown']).to eq(true)
+  end
+
   it "paginates post actions" do
     user_ids = []
     5.times do
diff --git a/test/javascripts/widgets/small-user-list-test.js b/test/javascripts/widgets/small-user-list-test.js
new file mode 100644
index 0000000000..c4d8ee4aa5
--- /dev/null
+++ b/test/javascripts/widgets/small-user-list-test.js
@@ -0,0 +1,20 @@
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
+
+moduleForWidget("small-user-list");
+
+widgetTest("renders avatars and support for unknown", {
+  template: '{{mount-widget widget="small-user-list" args=args}}',
+  beforeEach() {
+    this.set("args", {
+      users: [
+        { id: 456, username: "eviltrout" },
+        { id: 457, username: "someone", unknown: true }
+      ]
+    });
+  },
+  async test(assert) {
+    assert.ok(find("[data-user-card=eviltrout]").length === 1);
+    assert.ok(find("[data-user-card=someone]").length === 0);
+    assert.ok(find(".unknown").length, "includes unkown user");
+  }
+});

From 58a5293d9b2bd6615ded4f274c1084b585a4062c Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 19 Jun 2020 17:45:08 +0200
Subject: [PATCH 1775/1830] FIX: Delete PostUploads on Post deletion (#10090)

Related uploads will then be removed by Jobs::CleanUpUploads
---
 app/models/post.rb       |  2 +-
 spec/models/post_spec.rb | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/models/post.rb b/app/models/post.rb
index 9f0b520cfe..fefb43d787 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -38,7 +38,7 @@ class Post < ActiveRecord::Base
   has_many :topic_links
   has_many :group_mentions, dependent: :destroy
 
-  has_many :post_uploads
+  has_many :post_uploads, dependent: :delete_all
   has_many :uploads, through: :post_uploads
 
   has_one :post_stat
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index fe4fe1add1..24c89305dd 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1375,6 +1375,16 @@ describe Post do
 
     let(:post) { Fabricate(:post, raw: raw_multiple) }
 
+    it "removes post uploads on destroy" do
+      post.link_post_uploads
+
+      post.trash!
+      expect(PostUpload.count).to eq(6)
+
+      post.destroy!
+      expect(PostUpload.count).to eq(0)
+    end
+
     context "#link_post_uploads" do
       it "finds all the uploads in the post" do
         post.custom_fields[Post::DOWNLOADED_IMAGES] = {

From 0b58414de222a941c16413665af239d518363c2c Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 19 Jun 2020 10:51:53 -0500
Subject: [PATCH 1776/1830] DEV: Add classes to admin customize nav items
 (#10092)

---
 .../javascripts/admin/templates/customize.hbs  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/customize.hbs b/app/assets/javascripts/admin/templates/customize.hbs
index d017abe67f..cafafd1285 100644
--- a/app/assets/javascripts/admin/templates/customize.hbs
+++ b/app/assets/javascripts/admin/templates/customize.hbs
@@ -1,13 +1,13 @@
 {{#admin-nav}}
-  {{nav-item route="adminCustomizeThemes" label="admin.customize.theme.title"}}
-  {{nav-item route="adminCustomize.colors" label="admin.customize.colors.title"}}
-  {{nav-item route="adminSiteText" label="admin.site_text.title"}}
-  {{nav-item route="adminCustomizeEmailTemplates" label="admin.customize.email_templates.title"}}
-  {{nav-item route="adminCustomizeEmailStyle" label="admin.customize.email_style.title"}}
-  {{nav-item route="adminUserFields" label="admin.user_fields.title"}}
-  {{nav-item route="adminEmojis" label="admin.emoji.title"}}
-  {{nav-item route="adminPermalinks" label="admin.permalink.title"}}
-  {{nav-item route="adminEmbedding" label="admin.embedding.title"}}
+  {{nav-item route="adminCustomizeThemes" label="admin.customize.theme.title" class="admin-customize-themes"}}
+  {{nav-item route="adminCustomize.colors" label="admin.customize.colors.title" class="admin-customize-colors"}}
+  {{nav-item route="adminSiteText" label="admin.site_text.title" class="admin-customize-site-text"}}
+  {{nav-item route="adminCustomizeEmailTemplates" label="admin.customize.email_templates.title" class="admin-customize-email-templates"}}
+  {{nav-item route="adminCustomizeEmailStyle" label="admin.customize.email_style.title" class="admin-customize-email-styles"}}
+  {{nav-item route="adminUserFields" label="admin.user_fields.title" class="admin-customize-user-fields"}}
+  {{nav-item route="adminEmojis" label="admin.emoji.title" class="admin-customize-emojis"}}
+  {{nav-item route="adminPermalinks" label="admin.permalink.title" class="admin-customize-permalinks"}}
+  {{nav-item route="adminEmbedding" label="admin.embedding.title" class="admin-customize-embedding"}}
 {{/admin-nav}}
 
 <div class="admin-container">

From 47a1157458d3c3357a0f0731825b1a92005e5e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 19 Jun 2020 17:53:06 +0200
Subject: [PATCH 1777/1830] DEV: various bugfixes in bulk importer

---
 script/bulk_import/base.rb | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb
index 65e86f4e9a..1253c2d2e4 100644
--- a/script/bulk_import/base.rb
+++ b/script/bulk_import/base.rb
@@ -258,10 +258,13 @@ class BulkImport::Base
   end
 
   def post_number_from_imported_id(id)
-    @post_number_by_post_id[post_id_from_imported_id(id)]
+    post_id = post_id_from_imported_id(id)
+    post_id && @post_number_by_post_id[post_id]
   end
+
   def topic_id_from_imported_post_id(id)
-    @topic_id_by_post_id[post_id_from_imported_id(id)]
+    post_id = post_id_from_imported_id(id)
+    post_id && @topic_id_by_post_id[post_id]
   end
 
   GROUP_COLUMNS ||= %i{
@@ -641,9 +644,8 @@ class BulkImport::Base
       imported_username, imported_postid = $1, $2
 
       username = @mapped_usernames[imported_username] || imported_username
-      post_id = post_id_from_imported_id(imported_postid)
-      post_number = @post_number_by_post_id[post_id]
-      topic_id = @topic_id_by_post_id[post_id]
+      post_number = post_number_from_imported_id(imported_postid)
+      topic_id = topic_id_from_imported_post_id(imported_post_id)
 
       if post_number && topic_id
         "\n[quote=\"#{username}, post:#{post_number}, topic:#{topic_id}\"]\n"
@@ -688,8 +690,7 @@ class BulkImport::Base
     @raw_connection.copy_data(sql, @encoder) do
       rows.each do |row|
         begin
-          mapped = yield(row)
-          next unless mapped
+          next unless mapped = yield(row)
           processed = send(process_method_name, mapped)
           imported_ids << mapped[:imported_id] unless mapped[:imported_id].nil?
           imported_ids |= mapped[:imported_ids] unless mapped[:imported_ids].nil?
@@ -697,7 +698,8 @@ class BulkImport::Base
           print "\r%7d - %6d/sec" % [imported_ids.size, imported_ids.size.to_f / (Time.now - start)] if imported_ids.size % 5000 == 0
         rescue => e
           puts "\n"
-          puts "ERROR: #{e.inspect}"
+          puts "ERROR: #{e.message}"
+          puts backtrace.join("\n")
         end
       end
     end
@@ -725,8 +727,7 @@ class BulkImport::Base
     sql = "COPY #{table}_custom_fields (#{table}_id, name, value, created_at, updated_at) FROM STDIN"
     @raw_connection.copy_data(sql, @encoder) do
       rows.each do |row|
-        cf = yield row
-        next unless cf
+        next unless cf = yield(row)
         @raw_connection.put_copy_data [cf[:record_id], name, cf[:value], NOW, NOW]
       end
     end

From f28ea4751b818608ca329f59ad6a3590813868d9 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 19 Jun 2020 19:28:54 +0200
Subject: [PATCH 1778/1830] FIX: A variable name typo

Not that this whole method is used much anymore.
---
 app/models/upload.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/upload.rb b/app/models/upload.rb
index 31c931c172..77ecd05b5c 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -329,7 +329,7 @@ class Upload < ActiveRecord::Base
                   follow_redirect: true
                 )
               rescue OpenURI::HTTPError
-                retry if (retires += 1) < 1
+                retry if (retries += 1) < 1
                 next
               end
 

From 17c4f76eacb7f94de470c03850bf396d4b5170fe Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 19 Jun 2020 20:21:05 +0100
Subject: [PATCH 1779/1830] FIX: Do not attempt to pull_hotlinked on emoji
 images when CDN enabled (#10091)

---
 app/jobs/regular/pull_hotlinked_images.rb | 11 +++++---
 spec/jobs/pull_hotlinked_images_spec.rb   | 34 +++++++++++++++++++----
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index 9472da0cbf..d147a5afac 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -171,10 +171,13 @@ module Jobs
       # make sure we actually have a url
       return false unless src.present?
 
-      # If file is on the forum or CDN domain or already has the
-      # secure media url
-      if Discourse.store.has_been_uploaded?(src) || src =~ /\A\/[^\/]/i || Upload.secure_media_url?(src)
-        return false if src =~ /\/images\/emoji\//
+      local_bases = [
+        Discourse.base_url,
+        Discourse.asset_host,
+      ].compact.map { |s| normalize_src(s) }
+
+      if Discourse.store.has_been_uploaded?(src) || normalize_src(src).start_with?(*local_bases) || src =~ /\A\/[^\/]/i
+        return false if !(src =~ /\/uploads\// || Upload.secure_media_url?(src))
 
         # Someone could hotlink a file from a different site on the same CDN,
         # so check whether we have it in this database
diff --git a/spec/jobs/pull_hotlinked_images_spec.rb b/spec/jobs/pull_hotlinked_images_spec.rb
index f0531b843f..50722133c0 100644
--- a/spec/jobs/pull_hotlinked_images_spec.rb
+++ b/spec/jobs/pull_hotlinked_images_spec.rb
@@ -360,6 +360,35 @@ describe Jobs::PullHotlinkedImages do
       end
     end
 
+    it "returns false for emoji" do
+      src = Emoji.url_for("testemoji.png")
+      expect(subject.should_download_image?(src)).to eq(false)
+    end
+
+    it "returns false for emoji when app and S3 CDNs configured" do
+      set_cdn_url "https://mydomain.cdn/test"
+      SiteSetting.s3_upload_bucket = "some-bucket-on-s3"
+      SiteSetting.s3_access_key_id = "s3-access-key-id"
+      SiteSetting.s3_secret_access_key = "s3-secret-access-key"
+      SiteSetting.s3_cdn_url = "https://s3.cdn.com"
+      SiteSetting.enable_s3_uploads = true
+
+      src = UrlHelper.cook_url(Emoji.url_for("testemoji.png"))
+      expect(subject.should_download_image?(src)).to eq(false)
+    end
+
+    it "returns false for plugin assets" do
+      src = UrlHelper.cook_url("/plugins/discourse-amazing-plugin/myasset.png")
+      puts "src is #{src}"
+      expect(subject.should_download_image?(src)).to eq(false)
+    end
+
+    it "returns false for local non-uploaded files" do
+      src = UrlHelper.cook_url("/mycustomroute.png")
+      puts "src is #{src}"
+      expect(subject.should_download_image?(src)).to eq(false)
+    end
+
     context "when download_remote_images_to_local? is false" do
       before do
         SiteSetting.download_remote_images_to_local = false
@@ -370,11 +399,6 @@ describe Jobs::PullHotlinkedImages do
         expect(subject.should_download_image?(src)).to eq(true)
       end
 
-      it "returns false for emoji" do
-        src = Emoji.url_for("testemoji.png")
-        expect(subject.should_download_image?(src)).to eq(false)
-      end
-
       it 'returns false for valid remote URLs' do
         expect(subject.should_download_image?("http://meta.discourse.org")).to eq(false)
       end

From c0289362f76c99455c5adf76048263ce58d26c12 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 19 Jun 2020 16:44:34 -0400
Subject: [PATCH 1780/1830] Safari icon fix, follow up to 5cc0369

---
 .../stylesheets/common/select-kit/dropdown-select-box.scss       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index 23a9068c46..edbbd85192 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -27,6 +27,7 @@
 
         .d-icon {
           flex: 0 0 100%;
+          overflow: hidden; // Safari
           font-size: $font-up-2;
           align-self: center;
           margin-right: 0;

From 02d3bf304abe55b2e0465d61ef0e735417ba242f Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 19 Jun 2020 16:49:56 -0400
Subject: [PATCH 1781/1830] remove inaccurate comment, follow up to c028936

---
 .../stylesheets/common/select-kit/dropdown-select-box.scss      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index edbbd85192..30e978ae64 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -27,7 +27,7 @@
 
         .d-icon {
           flex: 0 0 100%;
-          overflow: hidden; // Safari
+          overflow: hidden;
           font-size: $font-up-2;
           align-self: center;
           margin-right: 0;

From 390dc5c7a99c9d717f58fea238537a00075ba107 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sun, 21 Jun 2020 11:58:21 +0200
Subject: [PATCH 1782/1830] Update translations

---
 config/locales/client.ar.yml                  |    1 -
 config/locales/client.be.yml                  |    3 +-
 config/locales/client.bg.yml                  |    2 +-
 config/locales/client.bs_BA.yml               |    7 +-
 config/locales/client.ca.yml                  |    7 +-
 config/locales/client.cs.yml                  |    4 +-
 config/locales/client.da.yml                  |    7 +-
 config/locales/client.de.yml                  |    7 +-
 config/locales/client.el.yml                  |    3 +-
 config/locales/client.es.yml                  |    6 +-
 config/locales/client.et.yml                  |    4 +-
 config/locales/client.fa_IR.yml               |    6 +-
 config/locales/client.fi.yml                  |   66 +-
 config/locales/client.fr.yml                  |   10 +-
 config/locales/client.gl.yml                  | 1014 ++++++++++++++++-
 config/locales/client.he.yml                  |   12 +-
 config/locales/client.hu.yml                  |    4 +-
 config/locales/client.hy.yml                  |    6 +-
 config/locales/client.id.yml                  |    4 +-
 config/locales/client.it.yml                  |    6 +-
 config/locales/client.ja.yml                  |    4 +-
 config/locales/client.ko.yml                  |    4 +-
 config/locales/client.lt.yml                  |    3 +
 config/locales/client.lv.yml                  |    3 +-
 config/locales/client.nb_NO.yml               |    4 +-
 config/locales/client.nl.yml                  |   14 +-
 config/locales/client.pl_PL.yml               |    7 +-
 config/locales/client.pt.yml                  |    4 +-
 config/locales/client.pt_BR.yml               |    8 +-
 config/locales/client.ro.yml                  |    3 +-
 config/locales/client.ru.yml                  |   21 +-
 config/locales/client.sk.yml                  |    3 +
 config/locales/client.sl.yml                  |    7 +-
 config/locales/client.sq.yml                  |    1 -
 config/locales/client.sv.yml                  |   12 +-
 config/locales/client.sw.yml                  |    3 +-
 config/locales/client.te.yml                  |    4 +
 config/locales/client.th.yml                  |  489 +++++++-
 config/locales/client.tr_TR.yml               |    7 +-
 config/locales/client.uk.yml                  |    7 +-
 config/locales/client.ur.yml                  |    7 +-
 config/locales/client.vi.yml                  |    5 +-
 config/locales/client.zh_CN.yml               |    6 +-
 config/locales/client.zh_TW.yml               |    7 +-
 config/locales/server.ar.yml                  |    1 -
 config/locales/server.be.yml                  |    2 -
 config/locales/server.ca.yml                  |    2 -
 config/locales/server.de.yml                  |    2 -
 config/locales/server.el.yml                  |    1 -
 config/locales/server.es.yml                  |    2 -
 config/locales/server.fa_IR.yml               |    1 -
 config/locales/server.fi.yml                  |    2 -
 config/locales/server.fr.yml                  |    4 +-
 config/locales/server.gl.yml                  |  364 +++++-
 config/locales/server.he.yml                  |    9 +-
 config/locales/server.hy.yml                  |    2 -
 config/locales/server.it.yml                  |    2 -
 config/locales/server.ko.yml                  |    2 -
 config/locales/server.nl.yml                  |    9 +-
 config/locales/server.pl_PL.yml               |    1 -
 config/locales/server.pt.yml                  |    1 -
 config/locales/server.pt_BR.yml               |    2 -
 config/locales/server.ro.yml                  |    1 -
 config/locales/server.ru.yml                  |   23 +-
 config/locales/server.sv.yml                  |    9 +-
 config/locales/server.te.yml                  |    2 +
 config/locales/server.th.yml                  |   18 +
 config/locales/server.tr_TR.yml               |    2 -
 config/locales/server.uk.yml                  |    2 -
 config/locales/server.ur.yml                  |    2 -
 config/locales/server.vi.yml                  |    1 -
 config/locales/server.zh_CN.yml               |    2 -
 config/locales/server.zh_TW.yml               |    2 -
 .../config/locales/client.gl.yml              |    3 +
 .../config/locales/client.gl.yml              |   25 +
 .../config/locales/client.gl.yml              |    4 +-
 .../config/locales/server.fr.yml              |    4 +-
 .../config/locales/client.gl.yml              |    6 +-
 .../config/locales/server.gl.yml              |    5 +-
 plugins/poll/config/locales/client.gl.yml     |    3 +
 public/403.gl.html                            |    2 +-
 81 files changed, 2167 insertions(+), 170 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 3e9b7d13da..72083bc0f9 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -2045,7 +2045,6 @@ ar:
           last: "آخر مراجعة"
           hide: "أخفِ المراجعة"
           show: "أظهر المراجعة"
-          revert: "ارجع إلى هذه المراجعة"
           edit_wiki: "عدل الwiki"
           edit_post: "عدل المنشور"
         displays:
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index 22754d8c22..0ce957b9a9 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -1028,6 +1028,8 @@ be:
         error: "Пры пераносе паведамленняў да гэтай тэмы адбылася памылка."
       move_to_new_message:
         radio_label: "новае паведамленне"
+      publish_page:
+        public: "грамадскага"
       change_timestamp:
         title: "Змяніць метку часу"
         action: "змяніць метку часу"
@@ -1063,7 +1065,6 @@ be:
           last: "Апошняя рэвізія"
           hide: " Схаваць рэвізію"
           show: "Паказаць рэвізію"
-          revert: "Адкат да гэтай рэвізіі"
         displays:
           inline:
             title: "Адлюстраваць паведамленне з улучанымі дадаткамі і выдаленнямі."
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index 2cf0f0c039..22b381d063 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -1660,6 +1660,7 @@ bg:
         radio_label: "Ново Съобщение"
       publish_page:
         title: "Публикуване на страници"
+        public: "Публични"
       change_owner:
         action: "смени собственика"
         error: "Възникна грешка при смяната на собственика"
@@ -1801,7 +1802,6 @@ bg:
           last: "Последна ревизия"
           hide: "Скрий ревизията"
           show: "Покажи ревизията"
-          revert: "Връщане към тази редакция"
           edit_wiki: "Редактиране на Wiki"
           edit_post: "Редактиране на публикацията"
         displays:
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index e4e1f7c01f..0eda001731 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -779,7 +779,6 @@ bs_BA:
           all: "Sve"
           read: "Učitaj"
           unread: "Nepročitanih"
-        ignore_duration_title: "Zanemari tajmer"
         ignore_duration_username: "Ime"
         ignore_duration_when: "Trajanje:"
         ignore_duration_save: "Zanemari"
@@ -1022,7 +1021,8 @@ bs_BA:
         secondary: "Sekundari Emailovi"
         primary_label: "primary"
         update_email: "Promijeni Email"
-        ssDestroy_override_instructions: "E-pošta se može ažurirati od SSO provajdera."
+        sso_override_instructions: "E-pošta se može ažurirati od SSO provajdera."
+        no_secondary: "Nema sekundarnih emailova"
         instructions: "Nikada nije prikazan javnosti."
         ok: "Izgleda dobro. Poslat ćemo email sa potvrdom."
         invalid: "Molimo vas da unesete validnu email adresu."
@@ -2230,6 +2230,8 @@ bs_BA:
         title: "Spoji izabrane postove"
         action: "spoji izabrane postove"
         error: "Desila se greška prilikom spajanja označenih objava."
+      publish_page:
+        public: "Javno"
       change_owner:
         title: "Change Owner"
         action: "change ownership"
@@ -2432,7 +2434,6 @@ bs_BA:
           last: "Last revision"
           hide: "Hide revision"
           show: "Show revision"
-          revert: "Vratite se na ovu reviziju"
           edit_wiki: "Promjni Wiki"
           edit_post: "Promjeni Post"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 768da7d409..a998e6335e 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -734,7 +734,6 @@ ca:
           all: "Tot"
           read: "Llegit"
           unread: "No llegits"
-        ignore_duration_title: "Ignora el temporitzador"
         ignore_duration_username: "Nom d'usuari "
         ignore_duration_when: "Duració:"
         ignore_duration_save: "Ignora"
@@ -973,7 +972,8 @@ ca:
         secondary: "Adreces de correu secundàries"
         primary_label: "primari"
         update_email: "Canvi de correu"
-        ssDestroy_override_instructions: "L'adreça de correu es pot actualitzar des d'un proveïdor SSO"
+        sso_override_instructions: "L'adreça de correu es pot actualitzar des d'un proveïdor SSO"
+        no_secondary: "Sense adreces de correu secundàries"
         instructions: "No es mostra mai en públic."
         ok: "Us enviarem un correu electrònic de confirmació"
         invalid: "Introduïu una adreça vàlida de correu electrònic"
@@ -2164,6 +2164,8 @@ ca:
         title: "Combina les publicacions seleccionades"
         action: "combina les publicacions seleccionades"
         error: "Hi ha hagut un error en unir les publicacions seleccionades."
+      publish_page:
+        public: "Públic"
       change_owner:
         title: "Canvia el propietari"
         action: "canvia la propietat"
@@ -2358,7 +2360,6 @@ ca:
           last: "Darrera revisió"
           hide: "Amaga la revisió"
           show: "Mostra la revisió"
-          revert: "Reverteix a aquesta revisió"
           edit_wiki: "Edita Wiki"
           edit_post: "Edita publicació"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 0f47ac34b6..91283d1a47 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -824,6 +824,7 @@ cs:
         secondary: "Záložní emailové adresy"
         primary_label: "primární"
         update_email: "Změnit emailovou adresu"
+        no_secondary: "Žádné záložní emailové adresy"
         instructions: "Nikdy nebude zveřejněno."
         ok: "Pro potvrzení vám pošleme email."
         invalid: "Zadejte prosím správnou emailovou adresu"
@@ -1946,6 +1947,8 @@ cs:
         title: "Sluč vybrané příspěvky"
         action: "sluč vybrané příspěvky"
         error: "Během slučování vybraných příspěvků došlo k chybě."
+      publish_page:
+        public: "Veřejné"
       change_owner:
         title: "Změnit vlastníka"
         action: "změnit autora"
@@ -2145,7 +2148,6 @@ cs:
           last: "Poslední revize"
           hide: "Schovejte revizi"
           show: "Zobrazte revizi"
-          revert: "Vrátit se k této revizi"
           edit_wiki: "Upravit Wiki"
           edit_post: "upravit příspěvek"
         displays:
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 2aacfa5500..1adeb84089 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -730,7 +730,6 @@ da:
           all: "Alle"
           read: "Læste"
           unread: "Ulæst"
-        ignore_duration_title: "Ignorér timer"
         ignore_duration_username: "Brugernavn"
         ignore_duration_when: "Varighed:"
         ignore_duration_save: "Ignorér"
@@ -960,7 +959,8 @@ da:
         secondary: "Sekundære emails"
         primary_label: "Primær"
         update_email: "Skift e-mail-adresse"
-        ssDestroy_override_instructions: "Email kan opdateres fra SSO-udbyderen."
+        sso_override_instructions: "Email kan opdateres fra SSO-udbyderen."
+        no_secondary: "Ingen sekundære emails"
         instructions: "Vis aldrig offentligt"
         ok: "Vi vil sende dig en bekræftelses email"
         invalid: "Indtast venligst en gyldig email adresse"
@@ -2124,6 +2124,8 @@ da:
         title: "Flet valgte indlæg"
         action: "flet valgte indlæg"
         error: "Der opstod en fejl med at flette de valgte indlæg."
+      publish_page:
+        public: "Offentlig"
       change_owner:
         title: "Skift ejer"
         action: "skift ejerskab"
@@ -2313,7 +2315,6 @@ da:
           last: "Sidste udgave"
           hide: "Skjul udgave"
           show: "Vis udgave"
-          revert: "Gå tilbage til denne udgave"
           edit_wiki: "Ret Wiki"
           edit_post: "Ret Indlæg"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 312618a489..489e39d71f 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -763,7 +763,6 @@ de:
           all: "Alle"
           read: "Gelesen"
           unread: "Ungelesen"
-        ignore_duration_title: "Zeitschaltuhr ignorieren"
         ignore_duration_username: "Benutzername"
         ignore_duration_when: "Dauer:"
         ignore_duration_save: "Ignorieren"
@@ -1010,7 +1009,8 @@ de:
         secondary: "Weitere E-Mail-Adressen"
         primary_label: "erste"
         update_email: "E-Mail-Adresse ändern"
-        ssDestroy_override_instructions: "E-Mail kann vom SSO-Provider aktualisiert werden."
+        sso_override_instructions: "E-Mail kann vom SSO-Provider aktualisiert werden."
+        no_secondary: "Keine weiteren E-Mail-Adressen"
         instructions: "Nie öffentlich gezeigt."
         ok: "Wir senden dir zur Bestätigung eine E-Mail"
         invalid: "Bitte gib eine gültige E-Mail-Adresse ein"
@@ -2222,6 +2222,8 @@ de:
         title: "Ausgewählte Beiträge zusammenführen"
         action: "ausgewählte Beiträge zusammenführen"
         error: "Es gab einen Fehler beim Zusammenführen der ausgewählten Beiträge."
+      publish_page:
+        public: "Öffentlich"
       change_owner:
         title: "Eigentümer ändern"
         action: "Eigentümer ändern"
@@ -2422,7 +2424,6 @@ de:
           last: "Letzte Überarbeitung"
           hide: "Überarbeitung verstecken"
           show: "Überarbeitung anzeigen"
-          revert: "Diese Überarbeitung wiederherstellen"
           edit_wiki: "Bearbeite Wiki"
           edit_post: "Bearbeite Beitrag"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 9b6a608e1b..c0c9b07b2b 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -1620,6 +1620,8 @@ el:
         title: "Συγχώνευσε Επιλεγμένες Αναρτήσεις"
         action: "συγχώνευσε επιλεγμένες αναρτήσεις"
         error: "Προέκυψε σφάλμα κατά τη συγχώνευση των επιλεγμένων αναρτήσεων."
+      publish_page:
+        public: "Δημόσια"
       change_owner:
         action: "αλλαγή ιδιοκτήτη"
         error: "Παρουσιάστηκε ένα σφάλμα κατά την αλλαγή του ιδιοκτήτη των αναρτήσεων."
@@ -1762,7 +1764,6 @@ el:
           last: "Τελευταία αναθεώρηση"
           hide: "Κρύψε την αναθεώρηση"
           show: "Εμφάνισε την αναθεώρηση"
-          revert: "Επιστροφή σε αυτήν την αναθεώρηση"
           edit_wiki: "Επεξεργασία του Βίκι"
           edit_post: "Επεξεργασία Ανάρτησης"
         displays:
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index e539f93444..e313e4b8f6 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -767,7 +767,6 @@ es:
           all: "Todo"
           read: "Leídos"
           unread: "Sin leer"
-        ignore_duration_title: "Temporizador de ignorado"
         ignore_duration_username: "Nombre de usuario"
         ignore_duration_when: "Duración:"
         ignore_duration_save: "Ignorar"
@@ -1023,7 +1022,8 @@ es:
         secondary: "Correos electrónicos secundarios"
         primary_label: "primario"
         update_email: "Cambiar correo electrónico"
-        ssDestroy_override_instructions: "El correo electrónico puede actualizarse desde el proveedor de SSO."
+        sso_override_instructions: "El correo electrónico puede actualizarse desde el proveedor de SSO."
+        no_secondary: "Sin correos electrónicos secundarios"
         instructions: "Nunca se mostrará al público."
         ok: "Te enviaremos un correo electrónico para confirmar"
         required: "Por favor, introduce un correo electrónico"
@@ -2256,6 +2256,7 @@ es:
         publish: "Publicar"
         description: "Cuando un tema se publica como página su URL se puede compartir y se mostrará con estilos personalizados."
         slug: "Slug"
+        public: "Público"
         publish_url: "La página se ha publicado en:"
         topic_published: "El tema se ha publicado en:"
         preview_url: "La página será publicada en:"
@@ -2467,7 +2468,6 @@ es:
           last: "Última revisión"
           hide: "Ocultar revisión."
           show: "Mostrar revisión."
-          revert: "Volver a esta revisión"
           edit_wiki: "Editar wiki"
           edit_post: "Editar publicación"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 396a459ad7..433f36a760 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -727,6 +727,7 @@ et:
         secondary: "Teine e-post"
         primary_label: "primaarne"
         update_email: "Muuda meiliaadressi"
+        no_secondary: "Teist e-posti pole"
         instructions: "Ära näita kunagi avalikkusele."
         ok: "Saadame sulle kinnituseks meili"
         invalid: "Sisesta palun korrektne meiliaadress"
@@ -1689,6 +1690,8 @@ et:
         title: "Ühenda valitud postitused"
         action: "ühenda valitud postitused"
         error: "Valitud postituste ühendamisel tekkis viga."
+      publish_page:
+        public: "Avalik"
       change_owner:
         title: "Muuda omanikku"
         action: "muuda omanikku"
@@ -1835,7 +1838,6 @@ et:
           last: "Viimane redaktsioon"
           hide: "Peida redaktsioon"
           show: "Näita redaktsiooni"
-          revert: "Ennista selleks redaktsiooniks"
           edit_wiki: "Muuda wikit"
           edit_post: "Muuda postitust"
         displays:
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index cd263f9c69..f752e174f6 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -758,7 +758,6 @@ fa_IR:
           all: "همه"
           read: "خواندن"
           unread: "خوانده‌ نشده‌"
-        ignore_duration_title: "از زمانسنج صرف نظر کن"
         ignore_duration_username: "نام‌کاربری"
         ignore_duration_when: "مدت زمان:"
         ignore_duration_save: "چشم پوشی"
@@ -999,7 +998,8 @@ fa_IR:
         secondary: "آدرس ایمیل ثانویه"
         primary_label: "اصلی"
         update_email: "تغییر ایمیل"
-        ssDestroy_override_instructions: "ایمیل را میتوانید از طریق SSO به روزرسانی کنید"
+        sso_override_instructions: "ایمیل را میتوانید از طریق SSO به روزرسانی کنید"
+        no_secondary: "بدون ایمیل ثانویه"
         instructions: "هرگز به عموم نمایش داده نخواهد شد"
         ok: "برای تایید ایمیلی برایتان ارسال خواهیم کرد."
         required: "لطفا یک آدرس ایمیل وارد کنید"
@@ -2171,6 +2171,7 @@ fa_IR:
         error: "خطایی در ادغام نوشته‌های انتخاب شده رخ داده است."
       publish_page:
         publish: "انتشار"
+        public: "عمومی"
         publish_url: "صفحه شما منتشر شده در:"
         topic_published: "مبحث شما منتشر شده در:"
         preview_url: "صفحه شما منتشر خواهد شد در:"
@@ -2353,7 +2354,6 @@ fa_IR:
           last: "بازبینی آخر"
           hide: "مخفی کردن بازبینی"
           show: "نمایش بازبینی"
-          revert: "بازگشت به این بازبینی"
           edit_wiki: "ویرایش دانشنامه"
           edit_post: "ویرایش نوشته"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong>%{icon}<strong>%{current}</strong>/%{total}"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index e976fafc73..50975ce8c1 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -770,7 +770,6 @@ fi:
           all: "Kaikki"
           read: "Luetut"
           unread: "Lukematta"
-        ignore_duration_title: "Estoajastin"
         ignore_duration_username: "Käyttäjätunnus"
         ignore_duration_when: "Kesto:"
         ignore_duration_save: "Sivuuta"
@@ -876,7 +875,9 @@ fi:
       admin_delete: "Poista"
       users: "Käyttäjät"
       muted_users: "Vaimennetut"
+      muted_users_instructions: "Älä näytä ilmoituksia tai vastaanota yksityisviestejä näiltä käyttäjiltä."
       ignored_users: "Sivuutettu"
+      ignored_users_instructions: "Älä näytä näiden käyttäjien viestejä, näytä heiltä ilmoituksia äläkä vastaanota heiltä yksityisviestejä."
       tracked_topics_link: "Näytä"
       automatically_unpin_topics: "Poista kiinnitetyn ketjun kiinnitys automaattisesti, kun olen selannut sen loppuun."
       apps: "Sovellukset"
@@ -995,6 +996,7 @@ fi:
         taken: "Pahoittelut, tuo nimi on jo käytössä."
         invalid: "Käyttäjätunnus ei kelpaa. Siinä saa olla ainoastaan numeroita ja kirjaimia."
       add_email:
+        title: "Lisää sähköpostiosoite"
         add: "lisää"
       change_email:
         title: "Vaihda sähköposti"
@@ -1026,7 +1028,15 @@ fi:
         primary: "Ensisijainen sähköpostiosoite"
         secondary: "Toissijaiset sähköpostiosoitteet"
         primary_label: "ensisijainen väri"
+        unconfirmed_label: "vahvistamaton"
+        resend_label: "lähetä vahvistussähköposti uudelleen"
+        resending_label: "lähetetään..."
+        resent_label: "sähköposti lähetetty"
         update_email: "Vaihda sähköposti"
+        set_primary: "Aseta ensisijainen sähköpostiosoite"
+        destroy: "Poista sähköpostiosoite"
+        add_email: "Lisää vaihtoehtoinen sähköpostiosoite"
+        no_secondary: "Ei toissijaisia sähköpostiosoitteita"
         instructions: "Ei tule julkiseksi."
         ok: "Lähetämme sinulle sähköpostin varmistukseksi."
         required: "Syötä sähköpostiosoitteesi"
@@ -1179,6 +1189,7 @@ fi:
         expired: "Tämä kutsu on rauennut."
         rescind: "Poista"
         rescinded: "Kutsu poistettu"
+        rescind_all: "Poista vanhentuneet kutsut"
         rescinded_all: "Kaikki vanhentuneet kutsut poistettu!"
         rescind_all_confirm: "Haluatko varmasti poistaa kaikki vanhentuneet kutsut?"
         reinvite: "Lähetä kutsu uudestaan"
@@ -1189,18 +1200,29 @@ fi:
         time_read: "Lukuaika"
         days_visited: "Päiviä vierailtu"
         account_age_days: "Tilin ikä päivissä"
+        source: "Kutsuttiin tavalla"
         links_tab: "Linkit"
+        links_tab_with_count: "Linkit (%{count})"
+        link_url: "Linkki"
         link_created_at: "Luotu"
         link_groups: Ryhmät
+        link_expires_at: Vanhenee
         create: "Lähetä kutsu"
+        copy_link: "Kopioi linkki"
         generate_link: "Kopioi kutsulinkki"
         link_generated: "Kutsulinkki luotiin onnistuneesti!"
         valid_for: "Kutsulinkki on käypä tälle sähköpostiosoitteelle: %{email}"
         single_user: "Yksittäinen käyttäjä"
+        multiple_user: "Useita käyttäjiä"
         invite_link:
+          title: "Kutsulinkki"
           success: "Kutsulinkki luotiin onnistuneesti!"
+          error: "Kutsulinkin luominen epäonnistui"
+          max_redemptions_allowed_label: "Kuinka moni voi enintään liittyä tämä linkin avulla?"
+          expires_at: "Koska tämä linkki vanhenee?"
         bulk_invite:
           none: "Et ole kutsunut vielä ketään tänne. Voit lähettää yksittäisiä kutsuja tai kutsua joukon ihmisiä kerralla <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>lataamalla CSV-tiedoston</a>."
+          text: "Massakutsu"
           success: "Tiedoston lähettäminen onnistui. Saat viestin, kun prosessi on valmis."
           error: "Pahoittelut, tiedoston tulee olla CSV-muodossa."
           confirmation_message: "Olet lähettämässä kutsun kaikkiin sähköpostiosoitteisiin, jotka lähettämässäsi tiedostossa on."
@@ -1691,6 +1713,9 @@ fi:
         message:
           one: "Uusi yksityisviesti"
           other: "%{count} uutta yksityisviestiä"
+        high_priority:
+          one: "%{count} korkean prioriteetin ilmoitus"
+          other: "%{count} lukematonta korkean prioriteetin ilmoitusta"
       title: "ilmoitukset @nimeen viittauksista, vastauksista omiin viesteihin ja ketjuihin, viesteistä ym."
       none: "Ilmoitusten lataaminen ei onnistunut."
       empty: "Ilmoituksia ei löydetty."
@@ -1999,6 +2024,7 @@ fi:
         time_frame_required: Valitse ajanjakso
       auto_update_input:
         none: "Valitse ajanjakso"
+        now: "Nyt"
         later_today: "Myöhemmin tänään"
         tomorrow: "Huomenna"
         later_this_week: "Myöhemmin tällä viikolla"
@@ -2258,6 +2284,18 @@ fi:
       publish_page:
         title: "Sivujulkaisu"
         publish: "Julkaise"
+        description: "Kun ketju julkaistaan sivuna, sen verkko-osoitteen voi jakaa ja se näytetään erityisellä tavalla muotoiltuna."
+        slug: "Polkutunnus"
+        public: "Julkinen"
+        public_description: "Ihmiset näkevät sivun, vaikka siihen liittyvä ketju olisi yksityinen."
+        publish_url: "Sivusi julkaistiin osoitteessa:"
+        topic_published: "Ketjusi julkaistiin osoitteessa;"
+        preview_url: "Sivusi julkaistaan osoitteessa:"
+        invalid_slug: "Pahoittelut, et voi julkaista tätä sivua."
+        unpublish: "Peru julkaisu"
+        update: "Päivitä"
+        unpublished: "Sivusi julkaisu peruttiin, sille ei ole enää pääsyä."
+        publishing_settings: "Julkaisuasetukset"
       change_owner:
         title: "Vaihda omistajaa"
         action: "muokkaa omistajuutta"
@@ -2266,6 +2304,9 @@ fi:
         instructions:
           one: "Valitse uusi omistaja käyttäjän <b>@%{old_user}</b> viestille."
           other: "Valitse uusi omistaja käyttäjän <b>@%{old_user}</b> %{count} viestille."
+        instructions_without_old_user:
+          one: "Valitse uusi omistaja viestille"
+          other: "Valitse uusi omistaja %{count} viestille"
       change_timestamp:
         title: "Muuta aikaleimaa..."
         action: "muuta aikaleimaa"
@@ -2459,7 +2500,7 @@ fi:
           last: "Viimeinen revisio"
           hide: "Piilota revisio"
           show: "Näytä revisio"
-          revert: "Palaa tähän revisioon"
+          revert: "Palaa revisioon %{revision}"
           edit_wiki: "Muokkaa wikiä"
           edit_post: "Muokkaa viestiä"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
@@ -2486,13 +2527,19 @@ fi:
             button: "HTML"
       bookmarks:
         create: "Luo kirjanmerkki"
+        edit: "Muokkaa kirjanmerkkiä"
         created: "Luotu"
         updated: "Päivitetty"
         name: "Nimi"
+        name_placeholder: "Mitä varten kirjanmerkki on?"
+        set_reminder: "Muistuta minua"
         actions:
           delete_bookmark:
             name: "Poista kirjanmerkki"
             description: "Poistaa kirjanmerkin profiilistasi ja kumoaa kaikki kirjanmerkkiin liittyvät muistutukset"
+          edit_bookmark:
+            name: "Muokkaa kirjanmerkkiä"
+            description: "Muokkaa kirjanmerkin nimeä tai säädä muistutuksen päivämäärää ja kellonaikaa"
     category:
       can: "voivat&hellip; "
       none: "(ei aluetta)"
@@ -2797,6 +2844,7 @@ fi:
         this_month: "Kuukausi"
         this_week: "Viikko"
         today: "Tänään"
+    browser_update: 'Valitettavasti <a href="https://www.discourse.org/faq/#browser">selaimesi on liian vanha eikä siksi toimi tällä sivustolla</a>. <a href="https://browsehappy.com">Päivitä selaimesi</a> niin voit katsella nykyaikaisia sisältöjä, kirjautua sisään ja vastata.'
     permission_types:
       full: "Luoda / Vastata / Nähdä"
       create_post: "Vastata / Nähdä"
@@ -2852,6 +2900,18 @@ fi:
         title: "Kirjoittaminen"
         return: "%{shortcut} Palaa viestikenttään"
         fullscreen: "%{shortcut} Koko ruudun kirjoitustila"
+      bookmarks:
+        title: "Kirjanmerkit"
+        later_today: "%{shortcut} Myöhemmin tänään"
+        later_this_week: "%{shortcut} Myöhemmin tällä viikolla "
+        tomorrow: "%{shortcut} Huomenna"
+        next_week: "%{shortcut} Ensi viikolla"
+        next_month: "%{shortcut} Ensi kuussa"
+        next_business_week: "%{shortcut} Ensi viikon alussa"
+        next_business_day: "%{shortcut} Seuraavana arkipäivänä"
+        custom: "%{shortcut} Valitse päivämäärä ja kellonaika"
+        none: "%{shortcut} Ei muistutusta"
+        delete: "%{shortcut} Poista kirjanmerkk"
       actions:
         title: "Toiminnot"
         bookmark_topic: "%{shortcut} Aseta kirjanmerkkeihin/poista"
@@ -2874,6 +2934,8 @@ fi:
         print: "%{shortcut} Tulosta ketju"
         defer: "%{shortcut} Lykkää ketjua"
         topic_admin_actions: "%{shortcut} Avaa ketjun ylläpitotyökalut"
+      search_menu:
+        title: "Hakuvalikko"
     badges:
       earned_n_times:
         one: "Ansaitsi tämän ansiomerkin yhden kerran"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index c8194c10f6..5de8a0c9a9 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -770,7 +770,6 @@ fr:
           all: "Toutes"
           read: "Temps de lecture"
           unread: "Non lus"
-        ignore_duration_title: "Ignorer la planification"
         ignore_duration_username: "Nom d'utilisateur"
         ignore_duration_when: "Durée :"
         ignore_duration_save: "Ignorer"
@@ -1038,7 +1037,8 @@ fr:
         set_primary: "Définir comme adresse courriel principale"
         destroy: "Supprimer l'adresse courriel"
         add_email: "Ajouter une adresse courriel alternative"
-        ssDestroy_override_instructions: "Le courriel peut être mis à jour à partir du fournisseur SSO."
+        sso_override_instructions: "Le courriel peut être mis à jour à partir du fournisseur SSO."
+        no_secondary: "Aucune adresse courriel secondaire"
         instructions: "Jamais visible publiquement."
         ok: "Nous vous enverrons un courriel de confirmation"
         required: "Veuillez entrer une adresse courriel"
@@ -2030,6 +2030,7 @@ fr:
         time_frame_required: Veuillez sélectionner un intervalle de temps
       auto_update_input:
         none: "Sélectionner un intervalle de temps"
+        now: "Maintenant"
         later_today: "Plus tard aujourd'hui"
         tomorrow: "Demain"
         later_this_week: "Plus tard cette semaine"
@@ -2291,11 +2292,14 @@ fr:
         publish: "Publier"
         description: "Lorsqu'un sujet est publié comme page, son URL peut être partagée et il sera affiché avec un style personnalisé."
         slug: "Identifiant"
+        public: "Public"
+        public_description: "Les utilisateurs peuvent voir cette page même si le sujet associé est privé."
         publish_url: "Votre page a été publiée sur :"
         topic_published: "Votre sujet a été publié sur :"
         preview_url: "Votre page sera publiée sur :"
         invalid_slug: "Désolé, vous ne pouvez pas publier cette page."
         unpublish: "Annuler la publication"
+        update: "Mettre à jour"
         unpublished: "La publication de votre page a été annulée et elle n'est plus accessible."
         publishing_settings: "Paramètres de publication"
       change_owner:
@@ -2502,7 +2506,7 @@ fr:
           last: "Dernière révision"
           hide: "Masquer la révision"
           show: "Afficher la révision"
-          revert: "Revenir à cette révision"
+          revert: "Revenir à la révision %{revision}"
           edit_wiki: "Modifier le wiki"
           edit_post: "Modifier le message"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon}<strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 141644af54..7132554f66 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -9,8 +9,8 @@ gl:
   js:
     number:
       format:
-        separator: "."
-        delimiter: ","
+        separator: ","
+        delimiter: "."
       human:
         storage_units:
           format: "%n %u"
@@ -27,7 +27,10 @@ gl:
         millions: "%{number}M"
     dates:
       time: "h:mm a"
+      time_with_zone: "HH:mm (z)"
+      time_short_day: "ddd, HH:mm"
       timeline_date: "MMM YYYY"
+      long_no_year: "D MMM, HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D MMMM"
       long_with_year: "D MMM, YYYY h:mm a"
@@ -88,6 +91,12 @@ gl:
         x_days:
           one: "Hai %{count} día"
           other: "Hai %{count} días"
+        x_months:
+          one: "Hai %{count} mes"
+          other: "Hai %{count} meses"
+        x_years:
+          one: "Hai %{count} ano"
+          other: "Hai %{count} anos"
       later:
         x_days:
           one: "%{count} día despois"
@@ -102,10 +111,15 @@ gl:
       next_month: "Mes seguinte"
       placeholder: data
     share:
+      topic_html: 'Tema: <span class="topic-title">%{topicTitle}</span>'
       post: "publicación %{postNumber}"
       close: "pechar"
+      twitter: "Compartir esta ligazón no Twitter"
+      facebook: "Compartir esta ligazón no Facebook"
+      email: "Enviar esta ligazón por correo electrónico"
     action_codes:
-      public_topic: "fixo esta publicación pública no %{when}"
+      public_topic: "fixo este tema público o %{when}"
+      private_topic: "fixo este tema unha mensaxe persoal o %{when}"
       split_topic: "este tema dividiuse o %{when}"
       invited_user: "convidou a %{who} %{when}"
       invited_group: "invitou %{who} o %{when}"
@@ -129,6 +143,7 @@ gl:
       visible:
         enabled: "listado o %{when}"
         disabled: "retirado da lista o %{when}"
+    topic_admin_menu: "accións do tema"
     emails_are_disabled: "Todos os correos electrónicos saíntes foron desactivados globalmente por un administrador. Non se enviará ningún tipo de notificación por correo electrónico."
     themes:
       default_description: "Predeterminado"
@@ -139,13 +154,19 @@ gl:
         ap_south_1: "Asia Pacífico (Mumbai)"
         ap_southeast_1: "Asia Pacífico (Singapur)"
         ap_southeast_2: "Asia Pacífico (Sidney)"
-        cn_north_1: "China (Beijing)"
-        eu_central_1: "EU (Frankfurt)"
-        eu_west_1: "EU (Irlanda)"
-        eu_west_2: "EU (Londres)"
-        us_east_1: "EE.UU. Leste (N. Virxinia)"
-        us_west_1: "EE.UU. Oeste (N. California)"
-        us_west_2: "EE.UU. Oeste (Oregón)"
+        ca_central_1: "O Canadá (Central)"
+        cn_north_1: "A China (Beijing)"
+        cn_northwest_1: "A China (Ningxia)"
+        eu_central_1: "UE (Frankfurt)"
+        eu_north_1: "UE (Estocolmo)"
+        eu_west_1: "UE (Irlanda)"
+        eu_west_2: "UE (Londres)"
+        eu_west_3: "UE (París)"
+        sa_east_1: "América do Sur (São Paulo)"
+        us_east_1: "EUA Leste (Virxinia N.)"
+        us_east_2: "EUA Leste (Ohio)"
+        us_west_1: "EUA Oeste (N. California)"
+        us_west_2: "EUA Oeste (Oregón)"
     edit: "editar o título e a categoría deste tema"
     expand: "Expandir"
     not_implemented: "Sentímolo pero esta funcionalidade non se implementou aínda."
@@ -167,9 +188,11 @@ gl:
       other: "ligazóns"
     faq: "FAQ"
     guidelines: "Directrices"
-    privacy_policy: "Normas de confidencialidade"
-    privacy: "Confidencialidade"
+    privacy_policy: "Política de privacidade"
+    privacy: "Privacidade"
     tos: "Termos do servizo"
+    rules: "Regras"
+    conduct: "Código de conduta"
     mobile_view: "Visualización móbil"
     desktop_view: "Visualización en escritorio"
     you: "Ti"
@@ -183,11 +206,16 @@ gl:
     every_hour: "cada hora"
     daily: "diariamente"
     weekly: "semanalmente"
+    every_month: "cada mes"
+    every_six_months: "cada seis meses"
     max_of_count: "máx. de %{count}"
     alternation: "ou"
     character_count:
       one: "%{count} carácter"
       other: "%{count} caracteres"
+    related_messages:
+      title: "Mensaxes relacionadas"
+      see_all: 'Ver <a href="%{path}">todas as mensaxes</a> de @%{username}...'
     suggested_topics:
       title: "Temas suxeridos"
       pm_title: "Mensaxes suxeridas"
@@ -200,6 +228,8 @@ gl:
       moderators: "Moderadores"
       stat:
         all_time: "Todos"
+        last_7_days: "Últimos 7"
+        last_30_days: "Últimos 30"
       like_count: "Gústames"
       topic_count: "Temas"
       post_count: "Publicacións"
@@ -214,13 +244,42 @@ gl:
         bookmark: "Preme para engadir aos marcadores a publicación inicial deste tema"
         unbookmark: "Preme para retirar todos os marcadores deste tema"
     bookmarks:
+      created: "marcaches esta publicación%{name}"
+      not_bookmarked: "marcar esta publicación"
       remove: "Eliminar marcador"
+      delete: "Eliminar marcador"
+      confirm_clear: "Confirmas o borrado de todos os marcadores deste tema?"
       save: "Gardar"
+      list_permission_denied: "Non tes permiso para ver os marcadores deste usuario."
+      reminders:
+        at_desktop: "A vindeira vez que estea no meu ordenador"
+        later_today: "Hoxe, máis tarde"
+        next_business_day: "O vindeiro día laborable"
+        tomorrow: "Mañá"
+        next_week: "A vindeira semana"
+        start_of_next_business_week: "O vindeiro luns"
+        next_month: "O vindeiro mes"
+        custom: "Personalizar data e hora"
+        today_with_time: "hoxe á(s) %{time}"
+        tomorrow_with_time: "mañá á(s) %{time}"
+        at_time: "á(s) %{date_time}"
+    copy_codeblock:
+      copied: "copiado!"
     drafts:
+      resume: "Continuar"
       remove: "Eliminar"
       abandon:
         yes_value: "Si, abandonar"
         no_value: "Non, seguir"
+    topic_count_latest:
+      one: "Ver %{count} tema novo ou actualizado"
+      other: "Ver %{count} temas novos ou actualizados"
+    topic_count_unread:
+      one: "Ver %{count} tema sen ler"
+      other: "Ver %{count} temas sen ler"
+    topic_count_new:
+      one: "Ver %{count} tema novo"
+      other: "Ver %{count} temas novos"
     preview: "previsualizar"
     cancel: "cancelar"
     save: "Gardar cambios"
@@ -228,52 +287,136 @@ gl:
     saved: "Gardado!"
     upload: "Actualizar"
     uploading: "Actualizando..."
+    uploading_filename: "Actualizando: %{filename}..."
+    clipboard: "portapapeis"
     uploaded: "Actualizado!"
     pasting: "A pegar..."
     enable: "Activar"
     disable: "Desactivar"
+    continue: "Continuar"
     undo: "Desfacer"
     revert: "Reverter"
     failed: "Fallou"
+    switch_to_anon: "Entrar no Modo anónimo"
+    switch_from_anon: "Saír do Modo anónimo"
     banner:
       close: "Desbotar este báner."
       edit: "Editar este báner »"
+    pwa:
+      install_banner: "Queres <a href>instalar %{title} neste dispositivo?</a>"
     choose_topic:
       none_found: "Non se atoparon temas."
+      title:
+        search: "Buscar un tema"
+        placeholder: "escribe o título do tema, url ou id aquí"
+    choose_message:
+      none_found: "Non se atoparon mensaxes."
+      title:
+        search: "Buscar unha mensaxe"
+        placeholder: "escribe o título da mensaxe, url ou id aquí"
     review:
+      order_by: "Ordenar por"
+      in_reply_to: "en resposta a"
       explain:
+        formula: "Fórmula"
+        subtotal: "Subtotal"
         total: "Total"
+        trust_level_bonus:
+          name: "nivel de confianza"
+      claim_help:
+        claimed_by_other: "Este elemento só pode revisalo <b>%{username}</b>."
+      awaiting_approval: "Agardando aprobación"
       delete: "Eliminar"
       settings:
+        saved: "Gardado"
         save_changes: "Gardar os cambios"
         title: "Axustes"
+      moderation_history: "Historial de moderación"
+      view_all: "Ver todos"
+      grouped_by_topic: "Agrupados por tema"
+      none: "Non hai elementos para revisar."
+      view_pending: "ver pendentes"
+      topic_has_pending:
+        one: "Este tema ten <b>%{count}</b> publicación agardando aprobación"
+        other: "Este tema ten <b>%{count}</b> publicacións agardando aprobación"
+      title: "Revisar"
       topic: "Tema:"
       filtered_user: "Usuario"
+      show_all_topics: "buscar todos os temas"
+      deleted_post: "(publicación eliminada)"
+      deleted_user: "(usuario eliminado)"
       user:
+        bio: "Biografía"
+        website: "Sitio web"
         username: "Nome do usuario"
         email: "Correo electrónico"
         name: "Nome"
+        fields: "Campos"
       topics:
         topic: "Tema"
+        deleted: "[Tema eliminado]"
+        original: "(tema orixinal)"
+        details: "detalles"
+        unique_users:
+          one: "%{count} usuario"
+          other: "%{count} usuarios"
+      replies:
+        one: "%{count} resposta"
+        other: "%{count} respostas"
       edit: "Editar"
       save: "Gardar"
       cancel: "Cancelar"
+      new_topic: "A aprobación deste elemento creará un tema novo"
       filters:
+        all_categories: "(todas as categorías)"
+        type:
+          title: "Tipo"
+          all: "(todos os tipos)"
+        minimum_score: "Puntuación mínima:"
         refresh: "Actualizar"
+        status: "Estado"
         category: "Categoría"
+        orders:
+          score: "Puntuación"
+        priority:
+          title: "Prioridade mínima"
+          low: "(calquera)"
+          medium: "Media"
+          high: "Alta"
+      conversation:
+        view_full: "ver conversa completa"
       scores:
+        score: "Puntuación"
         date: "Data"
+        type: "Tipo"
+        status: "Estado"
+        submitted_by: "Enviado por"
+        reviewed_by: "Revisado por"
       statuses:
         pending:
           title: "Pendente"
+        approved:
+          title: "Aprobado"
         rejected:
           title: "Rexeitado"
+        ignored:
+          title: "Ignorado"
+        deleted:
+          title: "Eliminado"
+        all:
+          title: "(todo)"
       types:
+        reviewable_flagged_post:
+          title: "Publicación denunciada"
+          flagged_by: "Denunciado por"
         reviewable_user:
           title: "Usuario"
       approval:
         title: "A publicación necesita aprobación"
         description: "Recibimos a túa nova publicación pero cómpre que sexa aprobada por un moderador antes de aparecer. Ten paciencia."
+        pending_posts:
+          one: "Tes <strong>%{count}</strong> publicación pendente."
+          other: "Tes <strong>%{count}</strong> publicacións pendentes."
         ok: "De acordo"
     user_action:
       user_posted_topic: "<a href='%{userUrl}'>%{user}</a> publicou <a href='%{topicUrl}'>o tema</a>"
@@ -294,6 +437,7 @@ gl:
       title: "Usuarios"
       likes_given: "Dados"
       likes_received: "Recibidos"
+      topics_entered: "Vistos"
       topics_entered_long: "Temas vistos"
       time_read: "Tempo de lectura"
       topic_count: "Temas"
@@ -305,56 +449,127 @@ gl:
       days_visited_long: "Días visitados"
       posts_read: "Lidas"
       posts_read_long: "Publicacións lidas"
+      last_updated: "Última actualización:"
       total_rows:
         one: "Un usuario"
         other: "%{count} usuarios"
+    group_histories:
+      actions:
+        change_group_setting: "Cambiar axustes do grupo"
+        add_user_to_group: "Engadir usuario"
+        remove_user_from_group: "Eliminar usuario"
+        remove_user_as_group_owner: "Revogar propietario"
     groups:
+      member_added: "Engadido"
+      add_members:
+        title: "Engadir membros"
+        usernames: "Nomes de usuario"
       requests:
+        title: "Peticións"
         reason: "Razón"
+        accept: "Aceptar"
+        accepted: "aceptado"
+        deny: "Denegar"
+        denied: "denegado"
       manage:
+        title: "Xestionar"
         name: "Nome"
+        full_name: "Nome completo"
+        add_members: "Engadir membros"
         delete_member_confirm: "Queres eliminar a «%{username}» do grupo «%{group}»?"
         profile:
           title: Perfil
         interaction:
           posting: Publicación
+          notification: Notificación
+        membership:
+          access: Acceso
         logs:
           title: "Rexistros"
           when: "Cando"
           action: "Acción"
+          target_user: "Usuario obxectivo"
           subject: "Asunto"
           details: "Detalles"
           from: "De"
           to: "A"
+      public_admission: "Permitir que os usuarios se unan ao grupo libremente (require un grupo visible ao público)"
+      public_exit: "Permitir que os usuarios abandonen o grupo libremente"
+      empty:
+        posts: "Non hai publicacións de membros deste grupo."
+        members: "Non hai membros neste grupo."
+        mentions: "Non hai mencións neste grupo."
+        messages: "Non hai mensaxes para este grupo."
+        topics: "Non hai temas de membros deste grupo."
+        logs: "Non hai rexistros para este grupo."
       add: "Engadir"
+      join: "Unirse"
+      leave: "Abandonar"
+      request: "Petición"
       message: "Mensaxe"
+      confirm_leave: "Confirmas o abandono deste grupo?"
+      membership_request:
+        submit: "Enviar petición"
+        title: "Petición para unirse a%{group_name}"
+        reason: "Permitir que os propietarios do grupo coñezan os motivos polos que pertences a este grupo"
       name: "Nome"
+      group_name: "Nome do grupo"
       user_count: "Usuarios"
+      bio: "Acerca do grupo"
       selector_placeholder: "escribe o nome do usuario"
       owner: "propietario"
       index:
         title: "Grupos"
+        all: "Todos os grupos"
+        empty: "Non hai grupos visibles."
+        filter: "Filtrar por tipo de grupo"
+        owner_groups: "Grupos dos que son propietario"
+        close_groups: "Grupos pechados"
+        automatic_groups: "Grupos automáticos"
         automatic: "Automático"
+        closed: "Pechado"
+        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"
+        is_group_owner: "Propietario"
+      title:
+        one: "Grupo"
+        other: "Grupos"
       activity: "Actividade"
       members:
         title: "Membros"
+        filter_placeholder_admin: "nome de usuario ou correo electrónico"
         filter_placeholder: "nome do usuario"
+        remove_member: "Eliminar membro"
+        remove_member_description: "Eliminar a <b>%{username}</b> deste grupo"
+        remove_owner: "Eliminar como propietario"
+        remove_owner_description: "Eliminar a <b>%{username}</b> como propietario deste grupo"
+        owner: "Propietario"
+        forbidden: "Non tes permiso para ver os membros"
       topics: "Temas"
       posts: "Publicacións"
       mentions: "Mencións"
       messages: "Mensaxes"
+      notification_level: "Nivel de notificación predeterminado para mensaxes do grupo"
       alias_levels:
+        messageable: "Que pode enviar mensaxes a este grupo?"
         nobody: "Ninguén"
         only_admins: "Só administradores"
         mods_and_admins: "Só moderadores e administradores"
         members_mods_and_admins: "Só membros do grupo, moderadores e administradores"
+        owners_mods_and_admins: "Só os propietarios, moderadores e administradores do grupo"
         everyone: "Todos"
       notifications:
         watching:
           title: "Ver"
           description: "Notificaráseche cada publicación nova en cada mensaxe e amosarase o número de novas respostas."
+        watching_first_post:
+          description: "Recibirás notificacións das novas mensaxes deste grupo pero non das súas respostas."
         tracking:
           title: "Seguimento"
           description: "Notificaráseche se alguén menciona o teu @nome ou che responde e tamén aparecerá o número de novas respostas."
@@ -363,6 +578,13 @@ gl:
           description: "Notificaráseche se alguén menciona o teu @nome ou che responde."
         muted:
           title: "Silenciado"
+          description: "Non recibirás notificación ningunha sobre as mensaxes deste grupo."
+      flair_upload_description: "Usar imaxes cadradas cun tamaño mínimo de 20 x 20 px."
+      flair_preview_icon: "Previsualizar icona"
+      flair_preview_image: "Previsualizar imaxe"
+      flair_type:
+        icon: "Seleccionar unha icona"
+        image: "Subir unha imaxe"
     user_action_groups:
       "1": "Gústames dados"
       "2": "Gústames recibidos"
@@ -376,6 +598,7 @@ gl:
       "12": "Enviar elementos"
       "13": "Caixa de entrada"
       "14": "Pendente"
+      "15": "Borradores"
     categories:
       all: "todas as categorías"
       all_subcategories: "todo"
@@ -394,6 +617,16 @@ gl:
       latest_by: "últimos de"
       toggle_ordering: "trocar o control de ordenación"
       subcategories: "Subcategorías"
+      topic_sentence:
+        one: "%{count} tema"
+        other: "%{count} temas"
+      topic_stat_sentence_week:
+        one: "%{count} tema novo na última semana."
+        other: "%{count} temas novos na última semana."
+      topic_stat_sentence_month:
+        one: "%{count} tema novo no último mes"
+        other: "%{count} temas novos no último mes"
+      n_more: "Categorías (%{count} máis)..."
     ip_lookup:
       title: Busca do enderezo IP
       hostname: Nome do servidor
@@ -409,37 +642,52 @@ gl:
       topics_entered: "temas introducidos"
       post_count: "# publicacións"
       confirm_delete_other_accounts: "Confirma que quere eliminar estas contas?"
+      copied: "copiado"
     user_fields:
       none: "(seleccione unha opción)"
+      required: 'Introduce un valor para "%{name}"'
     user:
       said: "%{username}:"
       profile: "Perfil"
       mute: "Silenciar"
       edit: "Editar preferencias"
       download_archive:
+        button_text: "Descargar todo"
         confirm: "Confirmas a descarga das túas publicacións?"
+        success: "Iniciouse a descarga, notificarémosche cunha mensaxe o remate do proceso."
         rate_limit_error: "Só se poden descargar as publicacións unha vez por día. Téntao de novo mañá."
       new_private_message: "Nova mensaxe"
       private_message: "Mensaxe"
       private_messages: "Mensaxes"
       user_notifications:
         filters:
+          filter_by: "Filtrar por"
           all: "Todo"
           read: "Lidos"
           unread: "Sen ler"
         ignore_duration_username: "Nome do usuario"
+        ignore_duration_when: "Duración:"
         ignore_duration_save: "Ignorar"
+        ignore_no_users: "Non tes usuarios ignorados."
+        ignore_option: "Ignorado"
+        ignore_option_title: "Non recibirás notificacións relacionadas con este usuario e todos os seus temas e respostas permanecerán ocultos."
+        add_ignored_user: "Engadir..."
         mute_option: "Silenciado"
+        mute_option_title: "Non recibirás notificación ningunha relacionada con este usuario."
         normal_option: "Normal"
       activity_stream: "Actividade"
       preferences: "Preferencias"
       feature_topic_on_profile:
+        open_search: "Seleccionar un novo tema"
+        title: "Seleccionar un tema"
+        search_label: "Buscar tema polo título"
         save: "Gardar"
         clear:
           title: "Borrar"
       expand_profile: "Expandir"
       bookmarks: "Marcadores"
       bio: "Verbo de min"
+      timezone: "Fuso horario"
       invited_by: "Convidado por"
       trust_level: "Nivel de confianza"
       notifications: "Notificacións"
@@ -457,13 +705,20 @@ gl:
       external_links_in_new_tab: "Abrir todas as ligazóns externas nunha nova lapela"
       enable_quoting: "Activar as comiñas de resposta para o texto realzado"
       change: "cambiar"
+      featured_topic: "Tema destacado"
       moderator: "%{user} é moderador"
       admin: "%{user} é administrador"
       moderator_tooltip: "Este usuario é un moderador"
       admin_tooltip: "Este usuario é un administrador"
+      silenced_tooltip: "Este usuario está silenciado"
       suspended_notice: "Este usuario está suspendido até o %{date}."
+      suspended_permanently: "Este usuario está suspendido"
       suspended_reason: "Razón:"
       github_profile: "Github"
+      email_activity_summary: "Resumo da actividade"
+      mailing_list_mode:
+        individual: "Enviar un correo electrónico por cada nova publicación"
+      tag_settings: "Etiquetas"
       watched_tags: "Visto"
       tracked_tags: "Seguido"
       muted_tags: "Silenciado"
@@ -477,8 +732,12 @@ gl:
       admin_delete: "Eliminar"
       users: "Usuarios"
       muted_users: "Silenciado"
+      ignored_users: "Ignorado"
       tracked_topics_link: "Amosar"
       automatically_unpin_topics: "Despegar os temas automaticamente cando alcance o fondo."
+      revoke_access: "Revogar acceso"
+      theme: "Tema"
+      staged: "Transitorio"
       staff_counters:
         flags_given: "denuncias útiles"
         flagged_posts: "publicacións denunciadas"
@@ -496,24 +755,39 @@ gl:
         move_to_archive: "Arquivo"
         failed_to_move: "Produciuse un fallo ao mover as mensaxes seleccionadas (quizais a rede está caída)"
         select_all: "Seleccionar todo"
+        tags: "Etiquetas"
       preferences_nav:
+        account: "Conta"
         profile: "Perfil"
         emails: "Correos electrónicos"
         notifications: "Notificacións"
         categories: "Categorías"
         users: "Usuarios"
+        tags: "Etiquetas"
+        interface: "Interface"
       change_password:
         success: "(correo enviado)"
         in_progress: "(enviando o correo)"
         error: "(erro)"
+        emoji: "bloquear emoji"
         action: "Enviar correo para restabelecer o contrasinal"
         set_password: "Estabelecer o contrasinal"
+        choose_new: "Elixir un novo contrasinal"
+        choose: "Elixir un contrasinal"
       second_factor_backup:
         regenerate: "Rexenerar"
         disable: "Desactivar"
         enable: "Activar"
+        copy_to_clipboard: "Copiar ao portapapeis"
+        copy_to_clipboard_error: "Erro ao copiar os datos ao portapapeis"
+        copied_to_clipboard: "Copiado ao portapapeis"
       second_factor:
+        title: "Autenticación de dobre factor"
+        forgot_password: "Esqueciches o contrasinal?"
+        confirm_password_description: "Confirma o teu contrasinal para continuar"
         name: "Nome"
+        label: "Código"
+        show_key_description: "Inserir manualmente"
         disable: "Desactivar"
         save: "Gardar"
         edit: "Editar"
@@ -521,30 +795,55 @@ gl:
           save: "Gardar"
       change_about:
         title: "Cambiar «Verbo de min»"
+        error: "Produciuse un erro ao cambiar este valor."
       change_username:
         title: "Cambiar o nome do usuario"
+        confirm: "Confirmas o cambio do teu nome de usuario?"
         taken: "Sentímolo pero este nome xa está en uso."
         invalid: "Este usuario é incorrecto. Só pode contar números e letras."
+      add_email:
+        title: "Engadir correo electrónico"
+        add: "engadir"
       change_email:
         title: "Cambiar o correo electrónico"
         taken: "Sentímolo pero este correo non está dispoñíbel."
         error: "Produciuse un erro cambiando o correo electrónico. Quizais ese enderezo xa está en uso."
         success: "Enviamos un correo electrónico a ese enderezo. Sigue as instrucións de confirmación."
+        success_staff: "Enviamos un correo electrónico ao teu enderezo actual. Sigue as instrucións de confirmación."
       change_avatar:
         title: "Cambia a foto do perfil"
+        gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, baseado en"
+        gravatar_title: "Cambia o teu avatar no sitio web de %{gravatarName}"
+        gravatar_failed: "Non atopamos ningún %{gravatarName} con ese enderezo de correo electrónico."
+        refresh_gravatar_title: "Actualiza o teu %{gravatarName}"
         letter_based: "Imaxe do perfil asignada polo sistema"
         uploaded_avatar: "Imaxe personalizada"
         uploaded_avatar_empty: "Engadir unha imaxe personalizada"
         upload_title: "Envía a túa imaxe"
         image_is_not_a_square: "Aviso: recortamos a túa imaxe; a largura e a altura eran distintas."
+      change_profile_background:
+        title: "Cabeceira do perfil"
+        instructions: "As cabeceiras dos perfís centraranse e terán unha largura predeterminada de 1110 px."
       change_card_background:
         title: "Fondo das fichas dos usuarios"
         instructions: "As imaxes dos fondos centraranse e terán unha largura predeterminada de 590px."
+      change_featured_topic:
+        title: "Tema destacado"
       email:
         title: "Correo electrónico"
+        primary: "Correo electrónico principal"
+        secondary: "Correos electrónicos secundarios"
         primary_label: "primario"
+        unconfirmed_label: "sen confirmar"
+        resend_label: "reenviar correo de confirmación"
+        resending_label: "enviando..."
+        resent_label: "correo electrónico enviado"
         update_email: "Cambiar o correo electrónico"
+        destroy: "Eliminar correo electrónico"
+        add_email: "Engadir correo electrónico alternativo"
+        no_secondary: "Sen correos electrónicos secundarios"
         ok: "Enviarémosche un correo electrónico para confirmar"
+        required: "Escribe un enderezo de correo electrónico"
         invalid: "Introduce un enderezo de correo electrónico correcto"
         authenticated: "O teu enderezo de correo electrónico foi autenticado por %{provider}"
         frequency_immediately: "Enviarémosche un correo-e axiña se non liches sobre o que che estamos a enviar."
@@ -552,11 +851,20 @@ gl:
           one: "Só che eviaremos un correo-e se non te vimos no último minuto."
           other: "Só che eviaremos un correo-e se non te vimos nos últimos %{count} minutos."
       associated_accounts:
+        title: "Contas asociadas"
+        connect: "Conectar"
         revoke: "Revogar"
         cancel: "Cancelar"
+        not_connected: "(sen conectar)"
+        confirm_modal_title: "Conectar a conta de %{provider}"
+        confirm_description:
+          account_specific: "Usarase a túa conta \"%{account_description}\" de %{provider} para a autenticación."
+          generic: "Usarase a túa conta de %{provider} para a autenticación."
       name:
         title: "Nome"
+        instructions: "o teu nome completo (opcional)"
         instructions_required: "Nome completo"
+        required: "Escribe un nome"
         too_short: "O nome é curto de mais"
         ok: "O nome parece correcto"
       username:
@@ -564,19 +872,30 @@ gl:
         short_instructions: "A xente pode mencionarte como @%{username}"
         available: "O nome de usuario está dispoñíbel"
         not_available: "Non dispoñíbel. Tentar %{suggestion}?"
+        not_available_no_suggestion: "Non dispoñible"
         too_short: "O nome do usuario é curto de máis"
         too_long: "O nome do usuario é longo de máis"
         checking: "Comprobando a dispoñibilidade do nome do usuario..."
         prefilled: "O correo electrónico coincide co nome do usuario rexistrado"
+        required: "Escribe un nome de usuario"
       locale:
         title: "Idioma da interface"
         instructions: "Idioma da interface do usuario. Cambiará cando actualices a páxina."
         default: "(predeterminado)"
       password_confirmation:
         title: "O contrasinal outra vez"
+      invite_code:
+        title: "Código de convite"
+        instructions: "O rexistro da conta require un código de convite"
       auth_tokens:
+        title: "Dispositivos usados recentemente"
         ip: "IP"
         details: "Detalles"
+        not_you: "Non es ti?"
+        show_all: "Amosar todos (%{count})"
+        show_few: "Amosar menos"
+        was_this_you: "Fuches ti?"
+        was_this_you_description: "Se non fuches ti, recomendamos que cambies o teu contrasinal e saias da sesión."
       last_posted: "Última publicación"
       last_emailed: "Últimos envíos por correo-e"
       last_seen: "Visto"
@@ -586,7 +905,13 @@ gl:
       website: "Sitio web"
       email_settings: "Correo electrónico"
       text_size:
+        title: "Tamaño do texto"
+        smaller: "Máis pequeno"
         normal: "Normal"
+        larger: "Máis grande"
+        largest: "Enorme"
+      title_count_mode:
+        notifications: "Novas notificacións"
       like_notification_frequency:
         title: "Notificar cando reciba gústames"
         always: "Sempre"
@@ -603,6 +928,8 @@ gl:
         every_hour: "cada hora"
         daily: "diariamente"
         weekly: "semanalmente"
+        every_month: "cada mes"
+        every_six_months: "cada seis meses"
       email_level:
         title: "Enviar un correo electrónico cando alguén me cite, responda a unha das miñas publicacións, mencione o meu @nome_do_usuario ou me convide a un tema."
         always: "sempre"
@@ -634,6 +961,7 @@ gl:
         search: "escribir para buscar convites..."
         title: "Convites"
         user: "Usuario convidado"
+        none: "Non hai convites que amosar."
         truncated:
           one: "Amosando o primeiro convite."
           other: "Amosando os primeiros %{count} convites."
@@ -649,18 +977,40 @@ gl:
         expired: "Este convite caducou."
         rescind: "Eliminar"
         rescinded: "Convite eliminado"
+        rescind_all: "Eliminar os convites caducados"
+        rescinded_all: "Todos os convites caducados foron eliminados"
+        rescind_all_confirm: "Confirmas a eliminación de todos os convites caducados?"
         reinvite: "Reenviar convite"
+        reinvite_all: "Reenviar todos os convites"
+        reinvite_all_confirm: "Confirmas o reenvío de todos os convites?"
         reinvited: "Convite reenviado"
+        reinvited_all: "Todos os convites foron reenviados"
         time_read: "Tempo de lectura"
         days_visited: "Días visitado"
         account_age_days: "Tempo da conta en días"
         links_tab: "Ligazóns"
+        links_tab_with_count: "Ligazóns (%{count})"
+        link_url: "Ligazón"
         link_created_at: "Creado"
         link_groups: Grupos
+        link_expires_at: Caduca
         create: "Enviar convite"
+        copy_link: "Copiar ligazón"
         generate_link: "Copiar a ligazón do convite"
+        link_generated: "A ligazón do convite xerouse correctamente"
+        valid_for: "A ligazón do convite só é válida para este enderezo de correo electrónico: %{email}"
+        invite_link:
+          title: "Ligazón do convite"
+          success: "A ligazón do convite xerouse correctamente"
+          error: "Produciuse un erro ao xerar esta ligazón de convite"
+          max_redemptions_allowed_label: "Cantas persoas poden rexistrarse con esta ligazón?"
+          expires_at: "Cando caduca a ligazón deste convite?"
         bulk_invite:
+          none: "Aínda non convidaches a ninguén. Podes enviar convites individuais ou en grupo se <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>subes un ficheiro CSV</a>."
+          text: "Convite en grupo"
           success: "O ficheiro enviouse correctamente, notificaráseche por mensaxe cando remate o proceso."
+          error: "O ficheiro ten que ter formato CSV."
+          confirmation_message: "Vas enviar por correo electrónico convites a todos os que están no ficheiro que subiches."
       password:
         title: "Contrasinal"
         too_short: "O teu contrasinal é demasiado curto."
@@ -668,17 +1018,47 @@ gl:
         same_as_username: "O contrasinal é igual ao nome do usuario."
         same_as_email: "O contrasinal é igual ao correo electrónico."
         ok: "O contrasinal semella bo."
+        instructions: "como mínimo %{count} caracteres"
+        required: "Escribe un contrasinal"
       summary:
         title: "Resumo"
         stats: "Estatísticas"
         time_read: "tempo de lectura"
+        recent_time_read: "tempo de lectura recente"
+        topic_count:
+          one: "tema creado"
+          other: "temas creados"
+        post_count:
+          one: "publicación creada"
+          other: "publicacións creadas"
+        likes_received:
+          one: "recibido"
+          other: "recibidos"
+        topics_entered:
+          one: "tema visto"
+          other: "temas vistos"
+        posts_read:
+          one: "publicación lida"
+          other: "publicacións lidas"
+        bookmark_count:
+          one: "marcador"
+          other: "marcadores"
         top_replies: "Respostas destacadas"
+        no_replies: "Aínda sen respostas."
         more_replies: "Máis respostas"
         top_topics: "Temas destacados"
+        no_topics: "Aínda sen temas."
         more_topics: "Máis temas"
         top_badges: "Insignias principais"
+        no_badges: "Aínda sen insignias."
         more_badges: "Máis insignias"
+        top_links: "Ligazóns destacadas"
+        no_links: "Aínda sen ligazóns."
+        most_liked_by: "Con máis Gústames de"
         most_liked_users: "Con máis Gústames"
+        most_replied_to_users: "Con máis respostas a"
+        no_likes: "Aínda sen Gústames."
+        top_categories: "Categorías destacadas"
         topics: "Temas"
         replies: "Respostas"
       ip_address:
@@ -690,8 +1070,10 @@ gl:
         header_title: "perfil, mensaxes, marcadores e preferencias"
       title:
         title: "Título"
+        none: "(ningún)"
       primary_group:
         title: "Grupo primario"
+        none: "(ningunha)"
       filters:
         all: "Todo"
       stream:
@@ -721,6 +1103,7 @@ gl:
         fixed: "Cargar páxina"
     modal:
       close: "pechar"
+      dismiss_error: "Desbotar erro"
     close: "Pechar"
     assets_changed_confirm: "Este sitio acaba de actualizarse. Queres recargar a páxina para ter a última versión?"
     logout: "Fuches desconectado."
@@ -731,6 +1114,8 @@ gl:
       login_disabled: "Cando o sitio está no modo de só-lectura, desactívase o inicio de sesión."
       logout_disabled: "O peche de sesión desactívase mentres o sitio está en modo de só lectura."
     learn_more: "saber máis..."
+    all_time: "total"
+    all_time_desc: "total de temas creados"
     year: "ano"
     year_desc: "temas creados nos últimos 365 días"
     month: "mes"
@@ -741,7 +1126,12 @@ gl:
     first_post: Publicación inicial
     mute: Silenciar
     unmute: Non silenciar
+    last_post: Publicado
+    local_time: "Hora local"
     time_read: Lidos
+    time_read_recently: " Recentemente%{time_read}"
+    time_read_tooltip: "Tempo de lectura total %{time_read}"
+    time_read_recently_tooltip: "Tempo de lectura total%{time_read} (%{recent_time_read} nos últimos 60 días)"
     last_reply_lowercase: última resposta
     replies_lowercase:
       one: resposta
@@ -751,6 +1141,7 @@ gl:
       hide_session: "Lembrarmo mañá"
       hide_forever: "non grazas"
       hidden_for_session: "De acordo, preguntareicho mañá. Tamén podes usar «Iniciar sesión» para crear unha conta."
+      intro: "Ola! Semella que gozas coa discusión pero aínda non abriches ningunha conta."
     summary:
       enabled_description: "Estás vendo un resumo deste tema: as publicacións máis interesantes determinadas pola comunidade"
       description: "Hai <b>%{replyCount}</b> respostas."
@@ -764,6 +1155,9 @@ gl:
       disable: "Amosar as publicacións eliminadas"
     private_message_info:
       title: "Mensaxe"
+      invite: "Convidar a outros..."
+      edit: "Engadir ou eliminar..."
+      leave_message: "Confirmas o abandono desta mensaxe?"
       remove_allowed_user: "Confirmas a eliminación de %{name} desta mensaxe?"
       remove_allowed_group: "Confirmas a eliminación de %{name} desta mensaxe?"
     email: "Correo electrónico"
@@ -774,6 +1168,7 @@ gl:
     trust_level: "Nivel de confianza"
     search_hint: "nome do usuario, correo-e ou enderezo IP"
     create_account:
+      disclaimer: "Ao rexistrarte, aceptas a <a href='%{privacy_link}' target='blank'>política de privacidade</a> e as <a href='%{tos_link}' target='blank'>condicións do servizo</a>."
       title: "Crear unha conta nova"
       failed: "Algo foi mal, quizais este correo electrónico xa está rexistrado, tenta coa ligazón de «Esquecín o contrasinal»."
     forgot_password:
@@ -783,21 +1178,40 @@ gl:
       reset: "Restabelecer contrasinal"
       complete_username: "Se unha conta corresponde ao nome de usuario <b>%{username}</b>, deberas recibir en breve un correo-e coas instrucións sobre como restabelecer o teu contrasinal."
       complete_email: "Se unha conta coincide con <b>%{email}</b>, deberías recibir en breve un correo-e con instrucións sobre como restabelecer o teu contrasinal."
+      complete_username_found: "Atopamos unha conta co mesmo nome de usuario <b>%{username}</b>. Deberas recibir en breve un correo electrónico coas instrucións sobre como restabelecer o teu contrasinal."
+      complete_email_found: "Atopamos unha conta que coincide con <b>%{email}</b>. Deberas recibir en breve un correo electrónico coas instrucións sobre como restablecer o teu contrasinal."
       complete_username_not_found: "Ningunha conta coincide co nome do usuario <b>%{username}</b>"
       complete_email_not_found: "Ningunha conta coincide co <b>%{email}</b>"
+      help: "Non recibiches o correo electrónico? Comproba primeiro o correo non desexado.<p>Non lembras o enderezo de correo electrónico que usaches? Escribe un enderezo de correo electrónico e comprobaremos se está rexistrado.</p><p>No caso de que xa non teñas acceso ao enderezo de correo electrónico rexistrado na conta, ponte en contacto co noso <a href='%{basePath}/about'>atento equipo.</a></p>"
       button_ok: "De acordo"
+      button_help: "Axuda"
     email_login:
+      link_label: "Enviarme por correo electrónico unha ligazón de inicio de sesión"
+      button_label: "con correo electrónico"
+      emoji: "bloquear emoji"
+      complete_username: "Se unha conta corresponde ao nome de usuario <b>%{username}</b>, deberas recibir en breve un correo electrónico cunha ligazón de inicio de sesión."
+      complete_email: "Se unha conta corresponde a <b>%{email}</b>, deberas recibir en breve unha ligazón de inicio de sesión."
+      complete_username_found: "Atopamos unha conta que co nome de usuario <b>%{username}</b>, deberas recibir en breve un correo electrónico cunha ligazón de inicio de sesión."
+      complete_email_found: "Atopamos unha conta que corresponde a <b>%{email}</b>, deberas recibir en breve un correo electrónico cunha ligazón de inicio de sesión."
       complete_username_not_found: "Ningunha conta coincide co nome do usuario <b>%{username}</b>"
       complete_email_not_found: "Ningunha conta coincide co <b>%{email}</b>"
       confirm_title: "Continuar a %{site_name}"
+      logging_in_as: "Iniciar sesión como %{email}"
     login:
       title: "Iniciar sesión"
       username: "Usuario"
       password: "Contrasinal"
+      second_factor_title: "Autenticación de dobre factor"
+      second_factor_description: "Escribe o código de autenticación da aplicación"
+      second_factor_backup: "Iniciar sesión cun código de copia de seguranza"
+      second_factor_backup_title: "Copia de seguranza de dobre factor"
+      second_factor_backup_description: "Escribe un dos códigos de copia de seguranza"
+      security_key_alternative: "Tentalo doutro xeito"
       email_placeholder: "correo electrónico ou nome de usuario"
       caps_lock_warning: " Bloqueo de maiúsculas activado"
       error: "Erro descoñecido"
       rate_limit: "Por favor, agarda antes de tentalo outra vez."
+      blank_username: "Escribe o teu correo electrónico ou nome de usuario."
       blank_username_or_password: "Introduce o teu correo electrónico ou nome de usuario e o contrasinal."
       reset_password: "Restabelecer contrasinal"
       logging_in: "Iniciando sesión..."
@@ -810,10 +1224,17 @@ gl:
       not_allowed_from_ip_address: "Non podes acceder desde este enderezo IP."
       admin_not_allowed_from_ip_address: "Non podes acceder como administrador desde este enderezo IP."
       resend_activation_email: "Preme aquí para enviar outro correo de activación."
+      omniauth_disallow_totp: "A túa conta ten habilitada a autenticación de dobre factor. Inicia sesión co teu contrasinal."
+      resend_title: "Reenviar correo electrónico de activación"
+      change_email: "Cambiar enderezo de correo electrónico"
+      provide_new_email: "Escribe un enderezo novo e reenviarémosche a el o correo electrónico de confirmación."
+      submit_new_email: "Actualizar enderezo de correo electrónico"
       sent_activation_email_again: "Enviamos outro correo-e de activación a <b>%{currentEmail}</b>. Pode tardar uns minutos en chegar; asegúrate de revisar o cartafol do spam."
+      sent_activation_email_again_generic: "Enviamos outro correo electrónico de activación. Pode tardar uns minutos en chegar; asegúrate de revisar o cartafol do spam."
       to_continue: "Por favor, inicia sesión"
       preferences: "Precisas iniciar sesión para cambiar as túas preferencias de usuario."
       forgot: "Non lembro os detalles da miña conta"
+      not_approved: "A túa conta non foi aínda aprobada. Notificaráseche por correo electrónico cando poidas iniciar a sesión."
       google_oauth2:
         name: "Google"
         title: "co Google"
@@ -821,37 +1242,95 @@ gl:
         name: "Twitter"
         title: "co Twitter"
       instagram:
+        name: "Instagram"
         title: "con Instagram"
       facebook:
+        name: "Facebook"
         title: "co Facebook"
       github:
+        name: "GitHub"
         title: "co GitHub"
+      discord:
+        name: "Discord"
+        title: "co Discord"
+      second_factor_toggle:
+        backup_code: "Usar no seu lugar un código de copia de seguranza"
     invites:
+      accept_title: "Convite"
+      emoji: "emoji de sobre"
       welcome_to: "Benvido/a a %{site_name}!"
+      invited_by: "Recibiches o convite de:"
+      your_email: "O enderezo de correo electrónico da túa conta é <b>%{email}</b>."
+      accept_invite: "Aceptar convite"
+      success: "A túa conta acaba de ser creada e tes a sesión iniciada."
       name_label: "Nome"
       password_label: "Estabelecer o contrasinal"
+      optional_description: "(opcional)"
     password_reset:
       continue: "Continuar a %{site_name}"
     emoji_set:
       apple_international: "Apple/Internacional"
       google: "Google"
       twitter: "Twitter"
+      emoji_one: "JoyPixels (antes EmojiOne)"
+      win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
+    category_page_style:
+      categories_only: "Só categorías"
+      categories_with_featured_topics: "Categorías con temas destacados"
+      categories_and_latest_topics: "Categorías e últimos temas"
+      categories_and_top_topics: "Categorías e temas destacados"
     shortcut_modifier_key:
       shift: "Maiús."
       ctrl: "Ctrl"
       alt: "Alt"
     conditional_loading_section:
       loading: Cargando...
+    category_row:
+      topic_count: "%{count} temas nesta categoría"
+    select_kit:
+      default_header_text: Seleccionar...
+      no_content: Non se atoparon coincidencias
+      filter_placeholder: Buscar...
+      filter_placeholder_with_any: Buscar ou crear...
+      create: "Crear: '%{content}'"
+      max_content_reached:
+        one: "Só podes seleccionar %{count} elemento."
+        other: "Só podes seleccionar %{count} elementos."
+      min_content_not_reached:
+        one: "Selecciona como mínimo %{count} elemento."
+        other: "Selecciona como mínimo %{count} elementos."
+      invalid_selection_length: "A selección debe ter como mínimo %{count} caracteres."
     date_time_picker:
       from: De
       to: A
     emoji_picker:
+      filter_placeholder: Buscar emoji
+      animals_&_nature: Animais e natureza
+      food_&_drink: Comida e bebida
+      activities: Actividades
+      objects: Obxectos
+      symbols: Símbolos
       flags: Denuncias
+      recent: Usados recentemente
+      default_tone: Sen ton de pel
+      light_tone: Ton de pel claro
+      dark_tone: Ton de pel escuro
+      default: Emojis personalizados
+    shared_drafts:
+      title: "Borradores compartidos"
+      notice: "Este tema só é visíbel para aqueles que poden ver a categoría <b>%{category}</b>."
+      destination_category: "Categoría de destino"
+      publish: "Publicar borrador compartido"
+      confirm_publish: "Confirmas a publicación deste borrador?"
+      publishing: "Publicando tema..."
     composer:
       emoji: "Emoji :)"
       more_emoji: "máis..."
       options: "Opcións"
       whisper: "bisbar"
+      unlist: "retirado da lista"
       blockquote_text: "Citación"
       add_warning: "Este é un aviso oficial."
       toggle_whisper: "Cambiar Bisbar"
@@ -859,12 +1338,16 @@ gl:
       saved_local_draft_tip: "gardado localmente"
       similar_topics: "O teu tema é semellante a..."
       drafts_offline: "borradores sen conexión"
+      reference_topic_title: "RE: %{title}"
       error:
         title_missing: "O título é obrigatorio"
         title_too_short: "O título debe ter alomenos %{min} caracteres"
         title_too_long: "O título non debe ter máis de %{max} caracteres"
+        post_missing: "A publicación non pode estar baleira"
         post_length: "A publicación debe ter alomenos %{min} caracteres"
+        try_like: "Probaches o botón %{heart}?"
         category_missing: "Debes seleccionar unha categoría"
+        tags_missing: "Debes seleccionar como mínimo %{count} etiquetas"
       save_edit: "Gardar a edición"
       reply_original: "Responder no tema orixinal"
       reply_here: "Responder aquí"
@@ -872,14 +1355,21 @@ gl:
       cancel: "Cancelar"
       create_topic: "Crear tema"
       create_pm: "Mensaxe"
+      create_shared_draft: "Crear borrador compartido"
+      edit_shared_draft: "Editar borrador compartido"
       title: "Ou preme Ctrl+Intro"
       users_placeholder: "Engadir un usuario"
       title_placeholder: "Sobre que trata a discusión nunha soa frase?"
+      title_or_link_placeholder: "Escribe o título ou pega unha ligazón aquí"
       edit_reason_placeholder: "por que estás editando?"
+      topic_featured_link_placeholder: "Escribe a ligazón amosada co título."
+      remove_featured_link: "Elimina a ligazón do tema."
       reply_placeholder: "Escribe aquí. Usa Markdown, BBCode ou HTML para formatar. Arrastra ou pega imaxes."
+      reply_placeholder_choose_category: "Selecciona unha categoría antes de escribir aquí."
       view_new_post: "Ver a nova publicación."
       saving: "Gardando"
       saved: "Gardado!"
+      saved_draft: "A publicación do borrador está en proceso. Toca para continuar."
       uploading: "Enviando..."
       show_preview: "amosar visualización &raquo;"
       hide_preview: "&laquo; ocultar previsualización"
@@ -892,37 +1382,109 @@ gl:
       link_description: "introducir a descrición da ligazón aquí"
       link_dialog_title: "Inserir hiperligazón"
       link_optional_text: "título opcional"
+      link_url_placeholder: "Copia un URL ou escríbeo para buscar temas."
       quote_title: "Citación"
       quote_text: "Citación"
       code_title: "Texto preformatado"
       code_text: "Texto preformatado cun sangrado de 4 espazos"
+      paste_code_text: "Escribe un título ou pégao aquí"
       upload_title: "Enviar"
       upload_description: "introducir a descrición do envío aquí"
       olist_title: "Lista numerada"
       ulist_title: "Lista con símbolos"
       list_item: "Elemento da lista"
       help: "Axuda para edición con Markdown"
+      collapse: "minimizar o panel de composición"
+      open: "abrir o panel de composición"
+      abandon: "pechar o panel de composición e desbotar o borrador"
       modal_ok: "De acordo"
       modal_cancel: "Cancelar"
       cant_send_pm: "Sentímolo pero non podes enviar unha mensaxe a %{username}."
+      yourself_confirm:
+        title: "Esqueciches engadir destinatarios?"
+        body: "Polo momento esta mensaxe só a recibes ti."
       admin_options_title: "Axustes do equipo para este tema"
       composer_actions:
         reply: Responder
+        draft: Borrador
         edit: Editar
+        reply_to_post:
+          label: "Responder á publicación %{postNumber} de %{postUsername}"
+          desc: Responder a unha publicación específica
+        reply_as_new_topic:
+          label: Responder como tema ligado
+          desc: Crear un novo tema ligado a este tema
+        reply_as_private_message:
+          label: Nova mensaxe
+          desc: Crear unha nova mensaxe persoal
         create_topic:
           label: "Novo tema"
+        shared_draft:
+          label: "Borrador compartido"
     notifications:
+      tooltip:
+        regular:
+          one: "%{count} notificación sen ver"
+          other: "%{count} notificacións sen ver"
+        message:
+          one: "%{count} mensaxe sen ler"
+          other: "%{count} mensaxes sen ler"
       title: "notificacións das mencións ao teu @nome, respostas ás túas publicacións e temas, mensaxes, etc"
       none: "Non é posíbel cargar as notificacións neste intre"
+      empty: "Non se atoparon notificacións."
+      post_approved: "A túa publicación foi aprobada"
+      reviewable_items: "elementos que requiren revisión"
+      mentioned: "<span>%{username}</span> %{description}"
+      group_mentioned: "<span>%{username}</span> %{description}"
+      quoted: "<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}"
+      liked: "<span>%{username}</span> %{description}"
+      liked_2: "<span>%{username}, %{username2}</span> %{description}"
+      liked_many:
+        one: "<span>%{username}, %{username2} e %{count} máis</span> %{description}"
+        other: "<span>%{username}, %{username2} e %{count} máis</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}"
+      invitee_accepted: "<span>%{username}</span> aceptou o teu convite"
+      linked: "<span>%{username}</span> %{description}"
+      topic_reminder: "<span>%{username}</span> %{description}"
+      watching_first_post: "<span>Novo tema</span> %{description}"
+      group_message_summary:
+        one: "%{count} mensaxe na caixa %{group_name}"
+        other: "%{count} mensaxes na caixa %{group_name}"
       popup:
         mentioned: '%{username} mencionoute en "%{topic}" - %{site_title}'
         group_mentioned: '%{username} mencionoute en "%{topic}" - %{site_title}'
         quoted: '%{username} citoute en "%{topic}" - %{site_title}'
         replied: '%{username} respondeute en "%{topic}" - %{site_title}'
         posted: '%{username} publicou en "%{topic}" - %{site_title}'
+        private_message: '%{username} enviouche unha mensaxe persoal en "%{topic}" - %{site_title}'
         linked: '%{username} ligou a túa publicación desde "%{topic}" - %{site_title}'
+        watching_first_post: '%{username} creou un tema novo "%{topic}" - %{site_title}'
+        confirm_title: "Notificacións habilitadas - %{site_title}"
+        confirm_body: "Perfecto! As notificacións están habilitadas."
+        custom: "Notificación de %{username} en %{site_title}"
       titles:
+        mentioned: "mencionado"
+        replied: "nova resposta"
+        quoted: "citado"
+        edited: "editado"
+        liked: "novo gústame"
+        private_message: "nova mensaxe privada"
+        invited_to_private_message: "convidado a unha mensaxe privada"
+        invitee_accepted: "convite aceptado"
+        posted: "nova publicación"
+        granted_badge: "insignia concedida"
+        invited_to_topic: "convidado ao tema"
+        group_mentioned: "grupo mencionado"
         watching_first_post: "novo tema"
+        liked_consolidated: "novos gústames"
+        post_approved: "publicación aprobada"
     upload_selector:
       title: "Engadir unha imaxe"
       title_with_attachments: "Engadir imaxe ou ficheiro"
@@ -941,23 +1503,49 @@ gl:
       sort_by: "Ordenar por"
       relevance: "Relevancia"
       latest_post: "Últimas publicacións"
+      latest_topic: "Último tema"
       most_viewed: "Máis vistos"
       most_liked: "Con máis Gústames"
       select_all: "Seleccionar todo"
       clear_all: "Borrar todo"
+      too_short: "O teu termo de busca é curto de máis"
       title: "buscar temas, publicacións, usuarios ou categorías"
+      full_page_title: "buscar temas ou publicacións"
       no_results: "Non se atoparon resultados."
       no_more_results: "Non se atoparon máis resultados."
       searching: "Buscando..."
       post_format: "#%{post_number} de %{username}"
+      results_page: "Buscar resultados para '%{term}'"
+      more_results: "Hai máis resultados. Restrinxe os criterios da busca."
+      cant_find: "Non atopas o que buscas?"
+      start_new_topic: "Se cadra queres comezar un novo tema?"
+      or_search_google: "Ou proba a buscar con Google:"
+      search_google: "Proba a buscar con Google:"
       search_google_button: "Google"
+      search_google_title: "Buscar neste sitio"
       context:
         user: "Buscar publicacións de @%{username}"
+        category: "Buscar na categoría #%{category}"
+        tag: "Buscar a etiqueta #%{tag}"
         topic: "Buscar neste tema"
         private_messages: "Buscar mensaxes"
       advanced:
+        title: Busca avanzada
         posted_by:
           label: Publicado por
+        in_group:
+          label: No grupo
+        with_badge:
+          label: Con insignia
+        filters:
+          label: Devolver só temas/publicacións...
+          title: Coincidencia só no título
+          private: Nas miñas mensaxes
+          images: incluír imaxe(s)
+          all_tags: Todas as etiquetas anteriores
+        post:
+          time:
+            label: Publicado
     hamburger_menu: "ir a outra lista de temas ou categoría"
     new_item: "novo"
     go_back: "volver"
@@ -985,6 +1573,11 @@ gl:
         selected:
           one: "Seleccionaches <b>un</b> tema."
           other: "Seleccionaches <b>%{count}</b> temas."
+        change_tags: "Substituír etiquetas"
+        append_tags: "Anexar etiquetas"
+        choose_new_tags: "Selecciona novas etiquetas para estes temas:"
+        choose_append_tags: "Selecciona novas etiquetas para anexar a estes temas:"
+        changed_tags: "As etiquetas deses temas cambiaron."
       none:
         unread: "Non tes temas sen ler."
         new: "Non tes novos temas."
@@ -1007,8 +1600,12 @@ gl:
         top: "Non hai máis temas destacados."
         bookmarks: "Non hai máis temas marcados."
     topic:
+      filter_to:
+        one: "%{count} publicación no tema"
+        other: "%{count} publicacións no tema"
       create: "Novo tema"
       create_long: "Crear un novo tema"
+      open_draft: "Abrir borrador"
       private_message: "Iniciar unha mensaxe"
       archive_message:
         help: "Mover mensaxes ao arquivo"
@@ -1020,6 +1617,9 @@ gl:
         title: "Editar"
       defer:
         title: "Pospor"
+      remove_from_profile:
+        help: "Eliminar a ligazón a este tema do teu perfil de usuario"
+        title: "Eliminar do perfil"
       list: "Temas"
       new: "novo tema"
       unread: "sen ler"
@@ -1058,6 +1658,7 @@ gl:
       toggle_information: "cambiar detalles do tema"
       read_more_in_category: "Queres ler máis? explora outros temas en %{catLink} ou %{latestLink}."
       read_more: "Queres ler máis? %{catLink} ou %{latestLink}."
+      group_join: "Debes unirte ao grupo \"%{name}\" para ver este tema"
       read_more_MF: "Hai { UNREAD, plural, =0 {} one { <a href='{basePath}/unread'>1 sen ler</a> } other { <a href='{basePath}/unread'># sen ler</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{e} false { } other{}} <a href='{basePath}/new'>1 novo</a> topic} other { {BOTH, select, true{e} false { } other{}} <a href='{basePath}/new'># novos</a> topics} } restantes, ou {CATEGORY, select, true {explora outros temas en {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Explorar todas as categorías
       view_latest_topics: ver últimos temas
@@ -1065,24 +1666,64 @@ gl:
       jump_reply_up: ir a unha resposta anterior
       jump_reply_down: ir a unha resposta posterior
       deleted: "Eliminouse o tema"
+      topic_status_update:
+        num_of_hours: "Número de horas:"
+        num_of_days: "Número de días:"
+      auto_update_input:
+        now: "Agora"
+        later_today: "Hoxe, máis tarde"
+        tomorrow: "Mañá"
+        this_weekend: "Esta fin de semana"
+        next_week: "A vindeira semana"
+        two_weeks: "Dúas semanas"
+        next_month: "O vindeiro mes"
+        two_months: "Dous meses"
+        three_months: "Tres meses"
+        four_months: "Catro meses"
+        six_months: "Seis meses"
+        one_year: "Un ano"
+        pick_date_and_time: "Escolle unha data e hora"
+      temp_open:
+        title: "Abrir temporalmente"
+      auto_reopen:
+        title: "Abrir automaticamente o tema"
+      temp_close:
+        title: "Pechar temporalmente"
       auto_close:
+        title: "Pechar automaticamente o tema"
         error: "Introduce un valor correcto."
         based_on_last_post: "Non pechar até que a última publicación do tema teña alomenos este tempo."
+      auto_delete:
+        title: "Eliminar automaticamente o tema"
+      auto_delete_replies:
+        title: "Eliminar automaticamente respostas"
       status_update_notice:
+        auto_open: "Este tema abrirase automaticamente en %{timeLeft}."
         auto_close: "Este tema pechará automaticamente en %{timeLeft}."
+        auto_publish_to_category: "Este tema publicarase en <a href=%{categoryUrl}>#%{categoryName}</a> en %{timeLeft}."
         auto_close_based_on_last_post: "Este tema pechará %{duration} despois da última resposta."
+        auto_delete: "Este tema eliminarase automaticamente en %{timeLeft}."
+        auto_delete_replies: "As respostas a este tema eliminaranse automaticamente en %{duration}."
       auto_close_title: "Axustes do peche automático"
+      timeline:
+        back: "Atrás"
+        back_description: "Volver á última publicación sen ler"
+        replies_short: "%{current} / %{total}"
       progress:
         title: progreso do tema
         go_top: "principio"
         go_bottom: "final"
         go: "ir"
         jump_bottom: "ir á última publicación"
+        jump_prompt: "ir a..."
+        jump_prompt_of: "de %{count} publicacións"
+        jump_prompt_long: "Ir a..."
         jump_bottom_with_number: "ir á publicación %{post_number}"
         jump_prompt_or: "ou"
         total: publicacións totais
         current: publicación actual
       notifications:
+        title: cambiar a frecuencia coa que recibes notificacións sobre este tema
         reasons:
           "3_6": "Recibirás notificacións porque estás vendo esta categoría."
           "3_5": "Recibirás notificacións porque comezaches a ver este tema automaticamente."
@@ -1146,11 +1787,17 @@ gl:
         help: "Borra o estado Pegado deste tema para que non apareza na banda superior da lista de temas."
       share:
         title: "Compartir"
+        extended_title: "Compartir unha ligazón"
         help: "compartir unha ligazón a este tema"
+      print:
+        title: "Imprimir"
       flag_topic:
         title: "Denunciar"
         help: "denunciar privadamente este tema para revisalo ou enviar unha notificación privada sobre el"
         success_message: "Denunciaches o tema correctamente."
+      make_public:
+        title: "Converter en tema público"
+        choose_category: "Selecciona unha categoría para o tema público:"
       feature_topic:
         title: "Destacar este tema"
         pin: "Facer que este tema apareza no alto da categoría %{categoryLink} até"
@@ -1178,12 +1825,14 @@ gl:
         no_banner_exists: "Non hai tema para o báner."
         banner_exists: "<strong class='badge badge-notification unread'>Hai</strong> actualmente un tema para o báner."
       inviting: "Convidando..."
+      automatically_add_to_groups: "Este convite tamén inclúe o acceso a estes grupos:"
       invite_private:
         title: "Convidar á mensaxe"
         email_or_username: "Nome do usuario ou correo-e do convidado"
         email_or_username_placeholder: "correo electrónico e nome do usuario"
         action: "Convidar"
         success: "Convidamos este usuario a participar nesta mensaxe."
+        success_group: "Convidamos este grupo a participar nesta mensaxe."
         error: "Sentímolo pero houbo un erro convidando este usuario."
         group_name: "nome do grupo"
       controls: "Controis do tema"
@@ -1202,15 +1851,21 @@ gl:
         success_email: "Enviamos un convite a <b>%{emailOrUsername}</b>. Notificarémosche cando utilice a invitación. Mira a lapela de convites na túa páxina de usuario para facer un seguimento das túas invitacións."
         success_username: "Convidamos este usuario a participar neste tema."
         error: "Sentímolo, non foi posíbel convidar esta persoa. Quizais xa foi convidada? (os convites teñen un límite)"
+        success_existing_email: "Xa existe un usuario co correo electrónico <b>%{emailOrUsername}</b>. Convidamos este usuario a participar neste tema."
       login_reply: "Inicia sesión para responder"
       filters:
         n_posts:
           one: "Unha publicación"
           other: "%{count} publicacións"
         cancel: "Eliminar filtro"
+      move_to:
+        title: "Mover a"
+        action: "mover a"
+        error: "Produciuse un erro ao mover as publicacións."
       split_topic:
         title: "Mover ao tema novo"
         action: "mover ao tema novo"
+        topic_name: "Título do tema novo"
         radio_label: "Novo tema"
         error: "Produciuse un erro movendo as publicacións ao novo tema."
         instructions:
@@ -1220,15 +1875,32 @@ gl:
         title: "Mover a un tema existente"
         action: "mover a un tema existente"
         error: "Produciuse un erro movendo publicacións nese tema."
+        radio_label: "Tema existente"
         instructions:
           one: "Selecciona o tema ao que queres mover esta publicación."
           other: "Selecciona o tema ao que queres mover estas <b>%{count}</b> publicacións."
       move_to_new_message:
+        message_title: "Título da nova mensaxe"
         radio_label: "Nova mensaxe"
+        participants: "Participantes"
+      move_to_existing_message:
+        radio_label: "Mensaxe existente"
+        participants: "Participantes"
+      publish_page:
+        title: "Publicación da páxina"
+        publish: "Publicar"
+        public: "Público"
+        invalid_slug: "Sentímolo pero non podes publicar esta páxina."
+        update: "Actualizar"
+        publishing_settings: "Axustes da publicación"
       change_owner:
+        title: "Cambiar propietario"
         action: "cambiar propiedade"
         error: "Produciuse un erro cambiando a propiedade das publicacións."
         placeholder: "nome do usuario do novo propietario"
+        instructions_without_old_user:
+          one: "Selecciona un novo propietario para a publicación"
+          other: "Selecciona un novo propietario para as %{count} publicacións"
       change_timestamp:
         action: "cambiar a marca data/hora"
         invalid_timestamp: "A marca data/hora non pode ser no futuro."
@@ -1315,6 +1987,7 @@ gl:
         convert_to_moderator: "Engadir cor do Equipo"
         revert_to_regular: "Eliminar cor do Equipo"
         rebake: "Reconstruír HTML"
+        publish_page: "Publicación da páxina"
         unhide: "Non ocultar"
         change_owner: "Cambiar propietario"
         grant_badge: "Conceder insignia"
@@ -1350,26 +2023,55 @@ gl:
           last: "Última revisión"
           hide: "Ocultar revisión"
           show: "Amosar revisión"
-          revert: "Reverter a esta revisión"
+          edit_wiki: "Editar wiki"
+          edit_post: "Editar publicación"
         displays:
           inline:
             title: "Amosar o resultado coas adicións e eliminacións inseridas"
+            button: "HTML"
           side_by_side:
             title: "Amosar o resultado coas diferenzas comparadas"
+            button: "HTML"
           side_by_side_markdown:
             title: "Amosar a fonte crúa coas diferenzas comparadas"
+      raw_email:
+        displays:
+          text_part:
+            button: "Texto"
+          html_part:
+            button: "HTML"
       bookmarks:
+        create: "Crear marcador"
+        edit: "Editar marcador"
         created: "Creado"
         name: "Nome"
+        actions:
+          delete_bookmark:
+            name: "Eliminar marcador"
+          edit_bookmark:
+            name: "Editar marcador"
     category:
       can: "podes&hellip; "
       none: "(sen categoría)"
       all: "Todas as categorías"
       edit: "Editar"
+      edit_dialog_title: "Editar: %{categoryName}"
       view: "Ver os Temas na Categoría"
       general: "Xeral"
       settings: "Axustes"
       topic_template: "Modelo para o tema"
+      tags: "Etiquetas"
+      tags_allowed_tags: "Restrinxir estas etiquetas a esta categoría:"
+      tags_allowed_tag_groups: "Restrinxir estes grupos de etiquetas a esta categoría:"
+      tags_placeholder: "lista de etiquetas permitidas (opcional)"
+      tags_tab_description: "As etiquetas e os grupos de etiquetas anteriores só estarán dispoñíbeis nesta categoría e outras que as inclúan. Non poderán usarse noutras categorías."
+      tag_groups_placeholder: "lista de grupos de etiquetas permitidos (opcional)"
+      manage_tag_groups_link: "Xestiona aquí os grupos de etiquetas."
+      allow_global_tags_label: "Permitir tamén outras etiquetas"
+      tag_group_selector_placeholder: "Grupo de etiquetas (opcional)"
+      required_tag_group_description: "Requirir que os novos temas teñan etiquetas dun grupo de etiquetas:"
+      min_tags_from_required_group_label: "Número de etiquetas:"
+      required_tag_group_label: "Grupo de etiquetas:"
       delete: "Eliminar categoría"
       create: "Nova categoría"
       create_long: "Crear unha nova categoría"
@@ -1408,6 +2110,7 @@ gl:
       default_position: "Posición predeterminada"
       position_disabled: "As categorías amosaranse en orde de actividade. Para controlar a orde das categorías nas listas."
       position_disabled_click: 'activar o axuste «fixed category positions».'
+      minimum_required_tags: "Número mínimo de etiquetas requiridas nun tema:"
       parent: "Categoría pai"
       notifications:
         watching:
@@ -1424,6 +2127,7 @@ gl:
         options:
           normal: "Normal"
           ignore: "Ignorar"
+          high: "Alta"
       sort_options:
         likes: "Gústames"
         views: "Vistas"
@@ -1431,6 +2135,8 @@ gl:
         activity: "Actividade"
         category: "Categoría"
         created: "Creado"
+      sort_ascending: "Ascendente"
+      sort_descending: "Descendente"
       settings_sections:
         general: "Xeral"
         email: "Correo electrónico"
@@ -1464,6 +2170,10 @@ gl:
       clicks:
         one: "Un clic"
         other: "%{count} clics"
+    post_links:
+      title:
+        one: "%{count} máis"
+        other: "%{count} máis"
     topic_statuses:
       warning:
         help: "Este é un aviso oficial."
@@ -1514,6 +2224,7 @@ gl:
     history: "Historial"
     changed_by: "por %{author}"
     raw_email:
+      title: "Correo electrónico entrante"
       not_available: "Non dispoñíbel."
     categories_list: "Lista de categorías"
     filters:
@@ -1539,7 +2250,7 @@ gl:
           other: "(%{count}) sen ler"
         help: "temas con publicacións sen ler que estás vendo ou seguindo"
         lower_title_with_count:
-          one: "Unha sen ler"
+          one: "%{count} sen ler"
           other: "%{count} sen ler"
       new:
         lower_title_with_count:
@@ -1590,7 +2301,15 @@ gl:
       readonly: "Ver"
     lightbox:
       download: "descargar"
+      previous: "Anterior (tecla de frecha cara á esquerda)"
+      next: "Seguinte (tecla de frecha cara á dereita)"
+      close: "Pechar (Esc)"
+      content_load_error: '<a href="%url%">O contido</a> non puido cargarse.'
+      image_load_error: '<a href="%url%">A imaxe</a> non puido cargarse.'
     keyboard_shortcuts_help:
+      shortcut_delimiter_or: "%{shortcut1} ou %{shortcut2}"
+      shortcut_delimiter_slash: "%{shortcut1}/%{shortcut2}"
+      shortcut_delimiter_space: "%{shortcut1} %{shortcut2}"
       title: "Atallos do teclado"
       jump_to:
         title: "Ir a"
@@ -1643,6 +2362,7 @@ gl:
     badges:
       title: Insignias
       select_badge_for_title: Selecciona insignia para usar como o teu título
+      none: "(ningún)"
       badge_grouping:
         getting_started:
           name: Comezar
@@ -1655,7 +2375,26 @@ gl:
         posting:
           name: Publicación
     tagging:
+      all_tags: "Todas as etiquetas"
+      other_tags: "Outras etiquetas"
+      selector_all_tags: "todas as etiquetas"
+      selector_no_tags: "sen etiquetas"
+      changed: "etiquetas cambiadas:"
+      tags: "Etiquetas"
+      choose_for_topic: "etiquetas opcionais"
+      default_info: "Esta etiqueta non se restrinxe a ningunha categoría e non ten sinónimos."
+      category_restricted: "Esta etiqueta restrínxese ás categorías ás que non tes permiso para acceder."
+      synonyms: "Sinónimos"
+      add_synonyms_label: "Engadir sinónimos:"
       add_synonyms: "Engadir"
+      remove_synonym: "Eliminar sinónimo"
+      delete_tag: "Eliminar etiqueta"
+      delete_confirm_no_topics: "Confirmas a eliminación desta etiqueta?"
+      rename_instructions: "Selecciona un novo nome para a etiqueta:"
+      sort_by: "Ordenar por:"
+      manage_groups: "Xestionar grupos de etiquetas"
+      manage_groups_description: "Estabelecer grupos para organizar etiquetas"
+      delete_unused: "Eliminar etiquetas sen usar"
       cancel_delete_unused: "Cancelar"
       notifications:
         watching:
@@ -1667,8 +2406,20 @@ gl:
         muted:
           title: "Silenciado"
       groups:
+        title: "Etiquetar grupos"
+        about: "Engade etiquetas aos grupos para xestionalos con maior facilidade."
+        new: "Novo grupo"
+        tags_label: "Etiquetas neste grupo:"
+        tags_placeholder: "etiquetas"
+        parent_tag_placeholder: "Opcional"
+        new_name: "Novo grupo de etiquetas"
+        name_placeholder: "Nome do grupo de etiquetas"
         save: "Gardar"
         delete: "Eliminar"
+        confirm_delete: "Confirmas a eliminación deste grupo de etiquetas?"
+        everyone_can_use: "Todos poden usar as etiquetas"
+        usable_only_by_staff: "As etiquetas son visíbeis para todos, pero só o equipo pode usalas"
+        visible_only_to_staff: "As etiquetas só son visíbeis para o equipo"
       topics:
         none:
           unread: "Non tes temas sen ler."
@@ -1686,6 +2437,7 @@ gl:
           top: "Non hai máis temas destacados."
           bookmarks: "Non hai máis temas marcados."
     footer_nav:
+      back: "Atrás"
       share: "Compartir"
       dismiss: "Desbotar"
   admin_js:
@@ -1697,6 +2449,8 @@ gl:
         remove_muted_tags_from_latest:
           always: "sempre"
           never: "nunca"
+      reports:
+        title: "Lista dos informes dispoñíbeis"
       dashboard:
         title: "Panel"
         version: "Versión"
@@ -1722,27 +2476,46 @@ gl:
         traffic_short: "Tráfico"
         traffic: "Peticións web de aplicativos"
         show_traffic_report: "Amosar o informe detallado do tráfico"
+        moderators_activity: Actividade dos moderadores
+        whats_new_in_discourse: Novidades en Discourse
+        all_reports: "Todos os informes"
         general_tab: "Xeral"
         security_tab: "Seguranza"
+        reports_tab: "Informes"
+        not_found_error: Sentímolo pero o informe non existe
+        filter_reports: Filtrar informes
         reports:
           today: "Hoxe"
           yesterday: "Onte"
+          last_7_days: "Últimos 7"
+          last_30_days: "Últimos 30"
           all_time: "Todos"
           7_days_ago: "Hai 7 días"
           30_days_ago: "Hai 30 días"
           all: "Todo"
           view_table: "táboa"
-          refresh_report: "Actualiza informe"
+          refresh_report: "Actualizar informe"
           groups: "Todos os grupos"
+          disabled: "Este informe está deshabilitado"
           filters:
             group:
               label: Grupo
             category:
               label: Categoría
+            include_subcategories:
+              label: "Incluír subcategorías"
       commits:
         latest_changes: "Últimos cambios: por favor, actualiza a miúdo."
         by: "por"
       groups:
+        new:
+          title: "Novo grupo"
+          create: "Crear"
+          name:
+            checking: "Comprobando a dispoñibilidade do nome do grupo..."
+            available: "O nome do grupo está dispoñíbel"
+            not_available: "O nome do grupo non está dispoñíbel"
+            blank: "O nome do grupo non pode quedar baleiro"
         bulk_add:
           title: "Engadir ao grupo en bloque"
           paste: "Pegar unha lista de nomes de usuario ou correos-e, un por liña:"
@@ -1751,11 +2524,19 @@ gl:
             email: Correo electrónico
             incoming_email: "Personalizar enderezos de correo-e entrantes"
             incoming_email_placeholder: "introducir enderezos de correo-e"
+            visibility: Visibilidade
             visibility_levels:
+              title: "Quen pode ver este grupo?"
               public: "Todos"
+              owners: "Propietarios do grupo"
+              description: "Os administradores poden ver todos os grupos."
+            members_visibility_levels:
+              title: "Quen pode ver os membros deste grupo?"
+              description: "Os administradores poden ver os membros de todos os grupos."
           membership:
             automatic: Automático
             trust_levels_title: "Nivel de confianza automático concedido aos membros cando son engadidos:"
+            effects: Efectos
             trust_levels_none: "Ningún"
             automatic_membership_email_domains: "Os usuarios que se rexistraron cun dominio de correo electrónico que coincida exactamente con algún da lista engadiranse automaticamente a este grupo:"
             primary_group: "Estabelecer automaticamente como grupo primario"
@@ -1774,6 +2555,7 @@ gl:
         add: "Engadir"
         custom: "Personalizar"
         automatic: "Automático"
+        default_title: "Título predeterminado"
         group_owners: Propietarios
         add_owners: Engadir propietarios
       api:
@@ -1787,15 +2569,31 @@ gl:
         all_users: "Todos os usuarios"
         show_details: Detalles
         description: Descrición
+        no_description: (sen descrición)
+        user_mode: Nivel de usuario
+        user_placeholder: Escribe un nome de usuario
         save: Gardar
+        continue: Continuar
       web_hooks:
+        create: "Crear"
         save: "Gardar"
         destroy: "Eliminar"
         description: "Descrición"
+        controls: "Controis"
+        go_back: "Volver á lista"
         active: "Activo"
         delivery_status:
           failed: "Fallou"
         events:
+          none: "Non hai eventos relacionados."
+          incoming:
+            one: "Hai un evento novo."
+            other: "Hai %{count} eventos novos."
+          completed_in:
+            one: "Completado nun %{count} segundo."
+            other: "Completado en %{count} segundos."
+          request: "Petición"
+          headers: "Cabeceiras"
           body: "Corpo"
           timestamp: "Creado"
           actions: "Accións"
@@ -1831,6 +2629,7 @@ gl:
           label: "Enviar"
           title: "Subir unha copia de seguranza a esta instancia"
           uploading: "Enviando..."
+          uploading_progress: "Actualizando... %{progress}%"
           error: "Produciuse un erro durante o envío de «%{filename}»: %{message}"
         operations:
           is_running: "Estase executando unha operación..."
@@ -1843,6 +2642,7 @@ gl:
             label: "Copia de seguranza"
             title: "Crear unha copia de seguranza"
             confirm: "Confirmas a execución dunha nova copia de seguranza?"
+            without_uploads: "Si (non incluír actualizacións)"
           download:
             label: "Descargar"
           destroy:
@@ -1879,10 +2679,14 @@ gl:
         save: "Gardar"
         new: "Novo"
         new_style: "Novo estilo"
+        install: "Instalar"
         delete: "Eliminar"
         color: "Cor"
         opacity: "Opacidade"
         copy: "Copiar"
+        copy_to_clipboard: "Copiar ao portapapeis"
+        copied_to_clipboard: "Copiado ao portapapeis"
+        copy_to_clipboard_error: "Erro ao copiar os datos ao portapapeis"
         email_templates:
           title: "Correo electrónico"
           subject: "Asunto"
@@ -1892,20 +2696,36 @@ gl:
           revert: "Reverter os cambios"
           revert_confirm: "Confirmas a reversión dos cambios?"
         theme:
+          theme: "Tema"
+          theme_name: "Nome do tema"
+          customize_desc: "Personalizar:"
+          title: "Temas"
+          create: "Crear"
+          create_type: "Tipo"
           create_name: "Nome"
           edit: "Editar"
+          update_confirm_yes: "Si, continuar coa actualización"
           mobile: "Móbil"
           settings: "Axustes"
+          translations: "Traducións"
+          show_advanced: "Mostrar campos avanzados"
+          hide_advanced: "Ocultar campos avanzados"
+          and_x_more: "e %{count} máis."
           upload: "Enviar"
+          install: "Instalar"
           installed: "Instalado"
           about_theme: "Sobre"
           enable: "Activar"
           disable: "Desactivar"
+          check_for_updates: "Buscar actualizacións"
+          updating: "Actualizando..."
           add: "Engadir"
           scss:
             text: "CSS"
           header:
             text: "Cabeceira"
+          after_header:
+            text: "Despois da cabeceira"
           footer:
             text: "Pé de páxina"
           embedded_scss:
@@ -1935,7 +2755,7 @@ gl:
             name: "cuaternario"
             description: "Ligazóns de navegación"
           header_background:
-            name: "Fondo da cabeceira"
+            name: "fondo da cabeceira"
             description: "Cor do fondo na cabeceira do sitio."
           header_primary:
             name: "cabeceira primaria"
@@ -1953,12 +2773,19 @@ gl:
             name: "gústame"
             description: "Cor do botón Gústame."
         email_style:
+          title: "Estilo de correo electrónico"
+          heading: "Personalizar estilo de correo electrónico"
+          html: "Modelo HTML"
           css: "CSS"
       email:
         title: "Correos electrónicos"
         settings: "Axustes"
         templates: "Modelos"
         preview_digest: "Previsualización do compendio"
+        advanced_test:
+          email: "Mensaxe orixinal"
+          run: "Executar proba"
+          text: "Corpo de texto seleccionado"
         sending_test: "Enviando correo-e de proba..."
         error: "<b>ERRO</b> - %{server_error}"
         test_error: "Produciuse un problema enviando o correo-e de proba. Revisa os teus axustes de correo electrónico, comproba que o teu host non está bloqueando as conexións de correo e téntao de novo."
@@ -1974,13 +2801,18 @@ gl:
         test_email_address: "enderezo de correo-e de proba"
         send_test: "Enviar correo-e de proba"
         sent_test: "enviado!"
-        delivery_method: "Metodo de entrega"
+        delivery_method: "Método de entrega"
         preview_digest_desc: "Previsualiza o contido dos correos-e compendio enviados a usuarios inactivos."
         refresh: "Actualizar"
+        send_digest_label: "Enviar este resultado a:"
+        send_digest: "Enviar"
+        sending_email: "Enviando correo electrónico..."
         format: "Formato"
         html: "html"
         text: "texto"
+        html_preview: "Previsualización do contido do correo electrónico"
         last_seen_user: "Último usuario visto:"
+        no_result: "Non se atoparon resultados para o resumo."
         reply_key: "Tecla para responder"
         skipped_reason: "Saltar razón"
         incoming_emails:
@@ -1993,6 +2825,7 @@ gl:
           modal:
             title: "Detalles dos correos-e entrantes"
             error: "Erro"
+            headers: "Cabeceiras"
             subject: "Asunto"
             body: "Corpo"
             rejection_message: "Correo-e de rexeitamento"
@@ -2010,6 +2843,15 @@ gl:
             address_placeholder: "nome@exemplo.com"
             type_placeholder: "compendio, rexistro..."
             reply_key_placeholder: "tecla para responder"
+      moderation_history:
+        no_results: "Non hai ningún historial de moderación dispoñible."
+        actions:
+          delete_user: "Usuario eliminado"
+          suspend_user: "Usuario suspendido"
+          silence_user: "Usuario silenciado"
+          delete_post: "Publicación eliminada"
+          delete_topic: "Tema eliminado"
+          post_approved: "Publicación aprobada"
       logs:
         title: "Rexistros"
         action: "Acción"
@@ -2028,6 +2870,7 @@ gl:
           do_nothing: "non facer nada"
         staff_actions:
           all: "todo"
+          filter: "Filtrar:"
           title: "Accións do equipo"
           clear_filters: "Amosar todo"
           staff_user: "Usuario"
@@ -2048,13 +2891,18 @@ gl:
             change_trust_level: "cambiar nivel de confianza"
             change_username: "cambiar nome do usuario"
             change_site_setting: "cambiar axuste do sitio"
+            change_theme: "cambiar tema"
+            delete_theme: "eliminar tema"
             change_site_text: "cambiar o texto do sitio"
             suspend_user: "suspender usuario"
             unsuspend_user: "non suspender usuario"
+            removed_suspend_user: "suspender usuario (eliminado)"
+            removed_unsuspend_user: "non suspender usuario (eliminado)"
             grant_badge: "conceder insignia"
             revoke_badge: "revogar insignia"
             check_email: "comprobar correo-e"
             delete_topic: "eliminar tema"
+            recover_topic: "recuperar tema"
             delete_post: "eliminar publicación"
             impersonate: "suplantar"
             anonymize_user: "facer o usuario anónimo"
@@ -2062,10 +2910,45 @@ gl:
             change_category_settings: "cambiar axustes da categoría"
             delete_category: "eliminar categoría"
             create_category: "crear categoría"
+            silence_user: "silenciar usuario"
+            unsilence_user: "non silenciar usuario"
+            removed_silence_user: "silenciar usuario (eliminado)"
+            removed_unsilence_user: "non silenciar usuario (eliminado)"
             grant_admin: "conceder administración"
             revoke_admin: "revogar administración"
             grant_moderation: "conceder moderación"
             revoke_moderation: "revogar moderación"
+            backup_create: "crear copia de seguranza"
+            deleted_tag: "etiqueta eliminada"
+            deleted_unused_tags: "etiquetas sen usar eliminadas"
+            revoke_email: "revogar correo electrónico"
+            lock_trust_level: "bloquear o nivel de confianza"
+            unlock_trust_level: "desbloquear o nivel de confianza"
+            activate_user: "activar usuario"
+            deactivate_user: "desactivar usuario"
+            change_readonly_mode: "cambiar modo de só lectura"
+            backup_download: "descargar copia de seguranza"
+            reviewed_post: "publicación revisada"
+            post_locked: "publicación bloqueada"
+            post_edit: "edición da publicación"
+            post_unlocked: "publicación desbloqueada"
+            check_personal_message: "comprobar mensaxe persoal"
+            disabled_second_factor: "deshabilitar autenticación de dobre factor"
+            topic_published: "tema publicado"
+            post_approved: "publicación aprobada"
+            post_rejected: "publicación rexeitada"
+            create_badge: "crear insignia"
+            change_badge: "cambiar insignia"
+            delete_badge: "eliminar insignia"
+            entity_export: "exportar entidade"
+            change_name: "cambiar nome"
+            approve_user: "usuario aprobado"
+            revoke_title: "revogar título"
+            change_title: "cambiar título"
+            page_published: "páxina publicada"
+            page_unpublished: "páxina sen publicar"
+            add_email: "engadir correo electrónico"
+            update_email: "actualizar correo electrónico"
         screened_emails:
           title: "Correos-e controlados"
           description: "Cando alguén tente crear unha nova conta, comprobaranse os seguintes enderezos de correo electrónico e bloquearase o rexistro ou se tomará outra medida."
@@ -2097,19 +2980,40 @@ gl:
             text: "Agrupar"
             title: "Crea unha nova subrede de entradas para bloquear se hai cando menos «min_ban_entries_for_roll_up» entradas."
         search_logs:
+          title: "Buscar rexistros"
+          term: "Termo"
+          searches: "Buscas"
           types:
+            all_search_types: "todos os tipos de busca"
             header: "Cabeceira"
+            full_page: "Páxina completa"
         logster:
           title: "Rexistros de erros"
       watched_words:
+        search: "buscar"
         clear_filter: "Borrar"
+        show_words: "amosar palabras"
+        one_word_per_line: "Unha palabra por liña"
         download: Descargar
         clear_all: Borrar todo
+        word_count:
+          one: "%{count} palabra"
+          other: "%{count} palabras"
         actions:
           block: "Bloquear"
+          require_approval: "Requirir aprobación"
           flag: "Denunciar"
+        action_descriptions:
+          require_approval: "As publicacións que conteñan estas palabras requiren a aprobación do equipo antes de ser visíbeis."
         form:
+          label: "Palabra nova:"
+          placeholder_regexp: "expresión regular"
           add: "Engadir"
+          exists: "Xa existe"
+          upload: "Engadir desde ficheiro"
+        test:
+          found_matches: "Coincidencias atopadas:"
+          no_matches: "Non se atoparon coincidencias"
       impersonate:
         title: "Suplantar"
         help: "Usar esta ferramenta para suplantar unha conta de usuario co obxecto de detectar e corrixir erros. Deberás saír da sesión ao rematar."
@@ -2122,11 +3026,14 @@ gl:
         not_found: "Sentímolo pero o nome do usuario non existe no sistema."
         id_not_found: "Sentímolo pero o usuario non existe no sistema."
         show_emails: "Amosar correos-e"
+        hide_emails: "Ocultar correos electrónicos"
         nav:
           new: "Novo"
           active: "Activo"
           staff: "Equipo"
           suspended: "Suspendido"
+          silenced: "Silenciado"
+          staged: "Transitorio"
         approved: "Aprobado?"
         titles:
           active: "Usuarios activos"
@@ -2140,7 +3047,9 @@ gl:
           staff: "Equipo"
           admins: "Usuarios administradores"
           moderators: "Moderadores"
+          silenced: "Usuarios silenciados"
           suspended: "Usuarios suspendidos"
+          staged: "Usuarios transitorios"
         not_verified: "Sen verificar"
         check_email:
           title: "Amosar o enderezo de correo-e deste usuario"
@@ -2150,10 +3059,28 @@ gl:
         unsuspend_failed: "Algo foi mal levantando a suspensión deste usuario %{error}"
         suspend_duration: "Canto tempo estará suspendido o usuario?"
         suspend_reason_label: "Cal é o motivo da suspensión? Este texto <b>será visíbel para todo o mundo</b> na páxina do perfil deste usuario e amosaráselle ao usuario cando tente iniciar sesión. Procura ser breve."
+        suspend_reason_hidden_label: "Cal é o motivo da suspensión? Este texto amosaráselle ao usuario cando tente iniciar sesión. Procura ser breve."
         suspend_reason: "Razón"
+        suspend_reason_placeholder: "Razón da suspensión"
+        suspend_message: "Mensaxe de correo electrónico"
+        suspend_message_placeholder: "Podes achegar máis información sobre a suspensión e enviarlla por correo electrónico ao usuario."
         suspended_by: "Suspendido por"
         silence_reason: "Razón"
+        silenced_by: "Silenciado por"
+        silence_modal_title: "Silenciar usuario"
+        silence_message: "Mensaxe de correo electrónico"
+        silence_message_placeholder: "(deixar baleiro para enviar mensaxe predeterminada)"
+        suspended_until: "(até %{until})"
+        cant_suspend: "Este usuario non pode estar suspendido."
         delete_all_posts: "Eliminar todas as publicacións"
+        delete_posts_progress: "Eliminando publicacións..."
+        delete_posts_failed: "Produciuse un erro ao eliminar as publicacións."
+        penalty_post_actions: "Que queres facer coa publicación asociada?"
+        penalty_post_delete: "Eliminar a publicación"
+        penalty_post_delete_replies: "Eliminar a publicación e todas as respostas"
+        penalty_post_edit: "Editar a publicación"
+        silence: "Silenciar"
+        silenced: "Silenciado?"
         moderator: "Moderador?"
         admin: "Administrador?"
         suspended: "Suspendido?"
@@ -2161,23 +3088,29 @@ gl:
         show_admin_profile: "Administración"
         show_public_profile: "Amosar o perfil público"
         impersonate: "Suplantar"
+        action_logs: "Rexistros de accións"
         ip_lookup: "Busca de IP"
         log_out: "Saír da sesión"
         logged_out: "O usuario foi desconectado en todos os dispositivos"
         revoke_admin: "Revogar administrador"
         grant_admin: "Facer administrador"
+        grant_admin_confirm: "Enviamos un correo electrónico para verificar o novo administrador. Ábreo e sigue as instrucións."
         revoke_moderation: "Revogar moderación"
         grant_moderation: "Conceder moderación"
         unsuspend: "Non suspender"
         suspend: "Suspender"
+        show_flags_received: "Mostrar denuncias recibidas"
+        flags_received_by: "Denuncias que recibiu %{username}"
+        flags_received_none: "Este usuario non recibiu ningunha denuncia."
         reputation: Reputación
         permissions: Permisos
         activity: Actividade
-        like_count: Gústames dados / Recibidos
+        like_count: Gústames dados / recibidos
         last_100_days: "nos últimos 100 días"
         private_topics_count: Temas privados
         posts_read_count: Publicacións lidas
         post_count: Publicacións creadas
+        second_factor_enabled: Habilitada a autenticación de dobre factor
         topics_entered: Temas vistos
         flags_given_count: Denuncias dadas
         flags_received_count: Denuncias recibidas
@@ -2195,6 +3128,7 @@ gl:
         delete: "Eliminar usuario"
         merge:
           prompt:
+            target_username_placeholder: "Nome de usuario do novo propietario"
             cancel: "Cancelar"
           confirmation:
             cancel: "Cancelar"
@@ -2211,6 +3145,7 @@ gl:
           other: "Non é posíbel eliminar todas as publicacións porque o usuario ten máis de %{count} publicacións. (delete_all_posts_max)"
         delete_and_block: "Eliminar e <b>bloquear</b> este correo-e e enderezo IP"
         delete_dont_block: "Só eliminar"
+        deleting_user: "Eliminando usuario..."
         deleted: "Eliminouse o usuario."
         delete_failed: "Produciuse un erro eliminando este usuario. Asegúrate que se eliminan todas as publicacións antes de tentar eliminar o usuario."
         send_activation_email: "Enviar correo-e de activación"
@@ -2233,6 +3168,9 @@ gl:
         unlock_trust_level: "Desbloquear o nivel de confianza"
         tl3_requirements:
           title: "Requerimentos para o nivel 3 de confianza"
+          table_title:
+            one: "No último día:"
+            other: "Nos últimos %{count} días:"
           value_heading: "Valor"
           requirement_heading: "Requirimento"
           visits: "Visitas"
@@ -2248,6 +3186,8 @@ gl:
           likes_received: "Gústames recibidos"
           likes_received_days: "Gústames recibidos: por días"
           likes_received_users: "Gústames recibidos: usuarios"
+          suspended: "Suspendido (os últimos 6 meses)"
+          silenced: "Silenciado (os últimos 6 meses)"
           qualifies: "Cumpre os requisitos para o nivel de confianza 3."
           does_not_qualify: "Non cumpre os requisitos para o nivel de confianza 3."
           will_be_promoted: "Será promocionado pronto."
@@ -2295,12 +3235,14 @@ gl:
       site_text:
         description: "Podes personalizar calquera texto do teu foro. Comeza por buscar debaixo:"
         search: "Busca o texto que queres editar"
+        title: "Texto"
         edit: "editar"
         revert: "Reverter os cambios"
         revert_confirm: "Confirmas a reversión dos cambios?"
         go_back: "Volver á busca"
         recommended: "Recomendamos personalizar o seguinte texto para axeitalo ás túas necesidades:"
         show_overriden: "Amosar só os cambios"
+        more_than_50_results: "Hai máis de 50 resultados. Restrinxe a busca."
       settings:
         show_overriden: "Amosar só os cambios"
         reset: "restabelecer"
@@ -2308,12 +3250,17 @@ gl:
       site_settings:
         title: "Axustes"
         no_results: "Non se atoparon resultados."
+        more_than_30_results: "Hai máis de 30 resultados. Restrinxe a busca ou selecciona unha categoría."
         clear_filter: "Borrar"
         add_url: "engadir URL"
         add_host: "engadir host"
+        add_group: "engadir grupo"
         uploaded_image_list:
+          label: "Editar lista"
+          empty: "Aínda non hai imaxes. Sube unha."
           upload:
             label: "Enviar"
+            title: "Subir imaxe(s)"
         categories:
           all_results: "Todo"
           required: "Obrigatorio"
@@ -2337,11 +3284,14 @@ gl:
           login: "Iniciar sesión"
           plugins: "Plugins"
           user_preferences: "Preferencias do usuario"
+          tags: "Etiquetas"
           search: "Buscar"
           groups: "Grupos"
           dashboard: "Panel"
         default_categories:
           modal_yes: "Si"
+        simple_list:
+          add_item: "Engadir elemento..."
       badges:
         title: Insignias
         new_badge: Nova insignia
@@ -2350,6 +3300,7 @@ gl:
         badge: Insignia
         display_name: Nome público
         description: Descrición
+        long_description: Descrición longa
         badge_type: Tipo de insignia
         badge_grouping: Grupo
         badge_groupings:
@@ -2407,6 +3358,16 @@ gl:
             with_post: "<span class=\"username\">%{username}</span> para publicación en %{link}"
             with_post_time: "<span class=\"username\">%{username}</span> para publicación en %{link} o <span class=\"time\">%{time}</span>"
             with_time: "<span class=\"username\">%{username}</span> o <span class=\"time\">%{time}</span>"
+        badge_intro:
+          title: "Selecciona unha insignia existente ou crea unha nova para comezar"
+          what_are_badges_title: "Que son as insignias?"
+          badge_query_examples_title: "Exemplos de consulta de insignias"
+        mass_award:
+          description: Concede a mesma insignia a varios usuarios á vez.
+          no_badge_selected: Selecciona unha insignia para comezar.
+          perform: "Conceder insignia a usuarios"
+          upload_csv: Actualizar un CSV con correos electrónicos ou nomes de usuario
+          replace_owners: Retirar a insignia dos propietarios anteriores
       emoji:
         title: "Emoji"
         help: "Engade novo emoji que estará dispoñíbel para todos. (Suxestión: arrastra e solta múltiples ficheiros dunha vez)"
@@ -2415,6 +3376,7 @@ gl:
         name: "Nome"
         group: "Grupo"
         image: "Imaxe"
+        alt: "previsualizar emoji personalizado"
         delete_confirm: "Confirmas a eliminación do emoji :%{name}:?"
       embedding:
         get_started: "Se queres encaixar o Discourse noutro sitio web, comeza engadindo o seu host."
@@ -2422,6 +3384,7 @@ gl:
         sample: "Usa o seguinte código HTML no teu sitio para crear e encaixar temas do Discourse. Substitúe <b>REPLACE_ME</b> pola URL canónica da páxina que recibe o encaixado. "
         title: "Encaixado"
         host: "Hosts permitidos"
+        class_name: "Nome da clase"
         edit: "editar"
         category: "Publicación a categoría"
         add_host: "Engadir host"
@@ -2444,25 +3407,40 @@ gl:
         category_id: "ID da categoría"
         category_title: "Categoría"
         external_url: "URL externa"
+        destination: "Destino"
         delete_confirm: "Confirmas a eliminación desta ligazón permanente?"
         form:
           label: "Novo:"
           add: "Engadir"
           filter: "Buscar (URLou URL externa)"
       reseed:
+        action:
+          label: "Substituír texto..."
+          title: "Substituír o texto das categorías e temas coas traducións"
         modal:
+          title: "Substituír texto"
+          subtitle: "Substituír o texto das categorías e temas xerados polo sistema coas últimas traducións"
           categories: "Categorías"
           topics: "Temas"
+          replace: "Substituír"
   wizard_js:
     wizard:
       done: "Feito"
+      back: "Atrás"
+      next: "Seguinte"
+      step: "%{current} de %{total}"
       upload: "Enviar"
       uploading: "Actualizando..."
       upload_error: "Sentímolo pero produciuse un erro enviando a publicación. Téntao de novo."
+      quit: "Pode que logo"
       invites:
+        add_user: "engadir"
+        none_added: "Non convidaches a ninguén do equipo. Confirmas que queres continuar?"
         roles:
           admin: "Administración"
           moderator: "Moderador"
+          regular: "Usuario normal"
       previews:
+        topic_title: "Tema de discusión"
         share_button: "Compartir"
         reply_button: "Responder"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 0883b5527d..e74b52386f 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -850,7 +850,7 @@ he:
           all: "הכל"
           read: "נקרא"
           unread: "לא-נקראו"
-        ignore_duration_title: "מתזמן התעלמות"
+        ignore_duration_title: "התעלמות ממשתמש"
         ignore_duration_username: "שם משתמש"
         ignore_duration_when: "משך:"
         ignore_duration_save: "התעלמות"
@@ -1118,7 +1118,8 @@ he:
         set_primary: "הגדר כתובת דוא\"ל ראשית"
         destroy: "הסר דוא\"ל"
         add_email: "הוסף דוא\"ל חלופי"
-        ssDestroy_override_instructions: "ניתן לעדכן את כתובת הדוא״ל דרך ספק ה־SSO."
+        sso_override_instructions: "ניתן לעדכן את כתובת הדוא״ל דרך ספק ה־SSO."
+        no_secondary: "אין כתובות דוא״ל משניות"
         instructions: "לעולם לא מוצג לציבור."
         ok: "נשלח אליכם דואר אלקטרוני לאישור"
         required: "נא למלא כתובת דוא״ל"
@@ -2168,6 +2169,7 @@ he:
         time_frame_required: נא לבחור מסגרת זמנים
       auto_update_input:
         none: "נא לבחור טווח זמן"
+        now: "כעת"
         later_today: "בהמשך היום"
         tomorrow: "מחר"
         later_this_week: "בהמשך השבוע"
@@ -2445,11 +2447,14 @@ he:
         publish: "פרסום"
         description: "כאשר נושא מפורסם כעמוד, ניתן לשתף את הכתובת שלו והיא תוצג בסגנון עצמאי."
         slug: "מזהה ייצוגי"
+        public: "ציבורי"
+        public_description: "אנשים יכולים לראות את העמוד אפילו אם הנושא המשויך הוא פרטי."
         publish_url: "העמוד שלך פורסם ב־:"
         topic_published: "הנושא שלך פורסם ב־:"
         preview_url: "העמוד שלך יפורסם ב־:"
         invalid_slug: "אין לך אפשרות לפרסם את העמוד הזה, עמך הסליחה."
         unpublish: "משיכת הפרסום"
+        update: "עדכון"
         unpublished: "פרסום העמוד שלך נמשך ואין זמין עוד."
         publishing_settings: "הגדרות פרסום"
       change_owner:
@@ -2537,6 +2542,7 @@ he:
         two: "%{count} תגובות"
         many: "%{count} תגובות"
         other: "%{count} תגובות"
+      unknown_user: "(משתמש לא ידוע/נמחק)"
       has_likes_title:
         one: "מישהו אחד אהב את התגובה הזו"
         two: "%{count} אנשים אהבו את התגובה הזו"
@@ -2692,7 +2698,7 @@ he:
           last: "מהדורה אחרונה"
           hide: "הסתרת שינויים"
           show: "הצגת שינויים"
-          revert: "חזרה לגרסה זו"
+          revert: "החזרה לגרסה %{revision}"
           edit_wiki: "עריכת וויקי"
           edit_post: "עריכת פוסט"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index b21c67da0b..c32e6af2f6 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -717,7 +717,6 @@ hu:
           all: "Mind"
           read: "Olvasás"
           unread: "Olvasatlan"
-        ignore_duration_title: "Időzítő figyelmen kívül hagyása"
         ignore_duration_username: "Felhasználónév"
         ignore_duration_when: "Időtartam:"
         ignore_duration_save: "Ignorál"
@@ -922,6 +921,7 @@ hu:
         secondary: "Másodlagos Emailek"
         primary_label: "Elsődleges"
         update_email: "E-mail cím módosítása"
+        no_secondary: "Nincsenek másodlagos emailek"
         ok: " Jóváhagyás végett e-mailt fogunk küldeni"
         invalid: "Kérünk adj meg egy érvényes e-mail címet"
         authenticated: "Az email címedet %{provider} azonosította"
@@ -1835,6 +1835,8 @@ hu:
       merge_posts:
         title: "Kiválasztott bejegyzések összevonása"
         action: "kiválasztott bejegyzések összevonása"
+      publish_page:
+        public: "Nyilvános"
       change_owner:
         title: "Tulajdonosváltás"
         action: "tulajdonjog módosítása"
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index ca3435f025..499022e046 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -736,7 +736,6 @@ hy:
           all: "Ամբողջը"
           read: "Կարդացած"
           unread: "Չկարդացած"
-        ignore_duration_title: "Անտեսված Օգտատեր"
         ignore_duration_username: "Օգտանուն"
         ignore_duration_when: "Տևողությունը."
         ignore_duration_save: "Անտեսել"
@@ -991,7 +990,8 @@ hy:
         secondary: "Երկրորդական Էլ. հասցեներ"
         primary_label: "հիմնական"
         update_email: "Փոփոխել Էլ. Հասցեն"
-        ssDestroy_override_instructions: "Էլ. հասցեն կարող է թարմացվել SSO մատակարարից:"
+        sso_override_instructions: "Էլ. հասցեն կարող է թարմացվել SSO մատակարարից:"
+        no_secondary: "Երկրորդական էլ. հասցեներ չկան"
         instructions: "Երբեք չի ցուցադրվում հանրությանը"
         ok: "Հաստատման համար մենք Ձեզ կուղարկենք էլ. նամակ"
         invalid: "Խնդրում ենք մուտքագրել վավեր էլ. հասցե"
@@ -2208,6 +2208,7 @@ hy:
         title: "Էջի Հրատարակում"
         publish: "Հրատարակել"
         description: "Երբ թեման հրապարակվում է որպես էջ, դրա URL- ն կարող է համընդհանուր տարածվել և պատկերվել օգտատերերի խմբագրմամբ: "
+        public: "Հանրային"
         publish_url: "Ձեր էջը հրապարակվել է այս հասցեով՝ "
         topic_published: "Ձեր թեման հրապարակվել է՝"
         preview_url: "Ձեր էջը կհրապարակվի այս հասցեով՝"
@@ -2404,7 +2405,6 @@ hy:
           last: "Վերջին խմբագրությունը"
           hide: "Թաքցնել խմբագրությունը"
           show: "Ցուցադրել խմբագրությունը"
-          revert: "Վերադարձնել այս խմբագրությանը"
           edit_wiki: "Խմբագրել Wiki-ն"
           edit_post: "Խմբագրել Գրառումը"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index a23c2ef9dd..1b6e4b3943 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -669,7 +669,6 @@ id:
           all: "Semua"
           read: "Dibaca"
           unread: "Belum dibaca"
-        ignore_duration_title: "Abaikan Timer"
         ignore_duration_username: "Nama Pengguna"
         ignore_duration_when: "Durasi:"
         ignore_duration_save: "Abaikan"
@@ -845,6 +844,7 @@ id:
         primary: "Email Utama"
         secondary: "Email Sekunder"
         update_email: "Ganti Alamat Surel"
+        no_secondary: "Tidak ada email sekunder"
         instructions: "Jangan pernah tunjukkan ke publik."
         ok: "Kami akan mengirimkan surel kepada anda untuk konfirmasi"
         invalid: "Silahkan masukkan alamat email yang valid"
@@ -1392,6 +1392,8 @@ id:
         error: "Ada kesalahan dalam memindahkan posting sebagai topik baru"
       move_to_new_message:
         radio_label: "Pesan Baru"
+      publish_page:
+        public: "Umum"
       change_owner:
         placeholder: "username pemilik yang baru"
     post:
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 74d1e91281..3f1cf97050 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -770,7 +770,6 @@ it:
           all: "Tutti"
           read: "Letti"
           unread: "Non letti"
-        ignore_duration_title: "Ignora Timer"
         ignore_duration_username: "Nome utente"
         ignore_duration_when: "Durata:"
         ignore_duration_save: "Ignora"
@@ -1038,7 +1037,8 @@ it:
         set_primary: "Imposta email principale"
         destroy: "Rimuovi email"
         add_email: "Aggiungi email alternativa"
-        ssDestroy_override_instructions: "L'email può essere aggiornata dal provider SSO."
+        sso_override_instructions: "L'email può essere aggiornata dal provider SSO."
+        no_secondary: "Nessuna email secondaria"
         instructions: "Mai mostrato pubblicamente"
         ok: "Ti invieremo una email di conferma"
         required: "Inserisci un indirizzo email"
@@ -2283,6 +2283,7 @@ it:
         publish: "Pubblica"
         description: "Quando un argomento viene pubblicato come pagina, l'URL può essere condiviso e verrà visualizzato con uno stile personalizzato."
         slug: "Abbreviazione"
+        public: "Pubblico"
         publish_url: "La tua pagina è stata pubblicata su:"
         topic_published: "Il tuo argomento è stato pubblicato su:"
         preview_url: "La tua pagina sarà pubblicata su:"
@@ -2494,7 +2495,6 @@ it:
           last: "Ultima revisione"
           hide: "Nascondi revisione"
           show: "Mostra revisione"
-          revert: "Ritorna a questa revisione"
           edit_wiki: "Modifica Wiki"
           edit_post: "Modifica Messaggio"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 3ba20e987c..fd9bf678da 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -839,6 +839,7 @@ ja:
         secondary: "その他のメールアドレス"
         primary_label: "プライマリー"
         update_email: "メールアドレスを変更"
+        no_secondary: "その他のメールアドレスはありません"
         instructions: "他人に公開はされません"
         ok: "確認用メールを送信します"
         invalid: "正しいメールアドレスを入力してください"
@@ -1821,6 +1822,8 @@ ja:
         title: "選択した投稿を統合"
         action: "選択した投稿を統合"
         error: "選択した投稿の統合に失敗しました。"
+      publish_page:
+        public: "公開"
       change_owner:
         action: "オーナーシップを変更"
         error: "オーナーの変更ができませんでした。"
@@ -1950,7 +1953,6 @@ ja:
           last: "最後のリビジョン"
           hide: "リビジョンを隠す"
           show: "リビジョンを表示"
-          revert: "このリビジョンに戻す"
           edit_wiki: "Wikiを編集"
           edit_post: "投稿を編集"
         displays:
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 765e04114b..8231c3e0e2 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -709,7 +709,6 @@ ko:
           all: "모두"
           read: "읽기"
           unread: "읽지 않은 글"
-        ignore_duration_title: "타이머 무시"
         ignore_duration_username: "아이디"
         ignore_duration_when: "지속:"
         ignore_duration_save: "무시"
@@ -957,6 +956,7 @@ ko:
         secondary: "보조 이메일"
         primary_label: "주요"
         update_email: "이메일 변경"
+        no_secondary: "보조 이메일이 없습니다"
         instructions: "절대로 공개되지 않습니다."
         ok: "내 이메일로 확인 메일이 전송됩니다."
         invalid: "유효한 이메일 주소를 입력해주세요."
@@ -2129,6 +2129,7 @@ ko:
         publish: "게시"
         description: "주제가 페이지로 게시되면 해당 URL을 공유 할 수 있으며 사용자 정의 스타일과 함께 표시됩니다."
         slug: "강타"
+        public: "공개"
         publish_url: "귀하의 페이지는 다음 위치에 게시되었습니다."
         topic_published: "귀하의 주제는 다음 위치에 게시되었습니다."
         preview_url: "귀하의 페이지는 다음 위치에 게시됩니다."
@@ -2302,7 +2303,6 @@ ko:
           last: "최신판"
           hide: "편집 기록 가리기"
           show: "편집 기록 보기"
-          revert: "이 수정본으로 되돌리기"
           edit_wiki: "Wiki 편집"
           edit_post: "포스트 편집"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 34e46303ff..b5137cc15c 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -779,6 +779,7 @@ lt:
         secondary: "Antriniai el. Paštai"
         primary_label: "pirminė"
         update_email: "Keisti el. paštą"
+        no_secondary: "Antrinių el. Paštų nėra"
         instructions: "Nebus rodomas viešai."
         ok: "Mes jums atsiųsime patvirtinimo elektroninį laišką"
         invalid: "Prašom įrašyti teisingą elektroninį adresą"
@@ -1712,6 +1713,8 @@ lt:
       merge_posts:
         title: "Sulieti pasirinktus įrašus"
         action: "sulieti pasirinktus įrašus"
+      publish_page:
+        public: "Vieša"
       change_owner:
         action: "pakeisti valdymo teises"
         error: "Įvyko klaida keičiant įrašų valdymo teisę."
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 8ef711b4bd..a2c2f03318 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -1612,6 +1612,8 @@ lv:
         title: "Apvienot izvēlētos ierakstus"
         action: "apvienot izvēlētos ierakstus"
         error: "Apvienojot izvēlētos ierakstus, notika kļūda."
+      publish_page:
+        public: "Publisks"
       change_owner:
         action: "nomainīt īpašnieku"
         error: "Mainot ierakstu īpašnieku, notika kļūda."
@@ -1757,7 +1759,6 @@ lv:
           last: "Pēdējā versija"
           hide: "Paslēpt versiju"
           show: "Parādīt versiju"
-          revert: "Atgriezties pie šīs versijas"
           edit_wiki: "Rediģēt wiki"
           edit_post: "Rediģēt ierakstu"
         displays:
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 5a925739e3..3d08b7031f 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -832,6 +832,7 @@ nb_NO:
         secondary: "Sekundære e-poster"
         primary_label: "primær"
         update_email: "Endre e-postadresse"
+        no_secondary: "Ingen sekundære e-poster"
         instructions: "Vises aldri offentlig"
         ok: "Vi sender deg en e-post for å bekrefte"
         invalid: "Oppgi en gyldig e-postadresse"
@@ -1871,6 +1872,8 @@ nb_NO:
         title: "Slå sammen valgte innlegg"
         action: "slå sammen valgte innlegg"
         error: "Feil ved fletting av valgte innlegg."
+      publish_page:
+        public: "Offentlig"
       change_owner:
         action: "Endre eierskap"
         error: "Det oppstod en feil ved endring av eierskap til innleggene."
@@ -2040,7 +2043,6 @@ nb_NO:
           last: "Siste versjon"
           hide: "Skjul versjon"
           show: "Vis versjon"
-          revert: "Gå tilbake til denne versjonen"
           edit_wiki: "Rediger wiki"
           edit_post: "Rediger innlegg"
         displays:
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index aea755c114..636dbb4ba8 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -770,7 +770,7 @@ nl:
           all: "Alle"
           read: "Gelezen"
           unread: "Ongelezen"
-        ignore_duration_title: "Negeertimer"
+        ignore_duration_title: "Gebruiker negeren"
         ignore_duration_username: "Gebruikersnaam"
         ignore_duration_when: "Tijdsduur:"
         ignore_duration_save: "Negeren"
@@ -1038,7 +1038,8 @@ nl:
         set_primary: "Primair e-mailadres instellen"
         destroy: "E-mailadres verwijderen"
         add_email: "Alternatief e-mailadres toevoegen"
-        ssDestroy_override_instructions: "E-mailadres kan vanaf SSO-provider worden bijgewerkt."
+        sso_override_instructions: "E-mailadres kan vanaf SSO-provider worden bijgewerkt."
+        no_secondary: "Geen extra e-mailadressen"
         instructions: "Nooit openbaar zichtbaar."
         ok: "We sturen een e-mail ter bevestiging"
         required: "Voer een e-mailadres in"
@@ -2027,6 +2028,7 @@ nl:
         time_frame_required: Selecteer een tijdsbestek
       auto_update_input:
         none: "Selecteer een tijdsbestek"
+        now: "Nu"
         later_today: "Later vandaag"
         tomorrow: "Morgen"
         later_this_week: "Later deze week"
@@ -2288,11 +2290,14 @@ nl:
         publish: "Publiceren"
         description: "Wanneer een topic als een pagina wordt gepubliceerd, kan de URL ervan worden gedeeld en wordt deze met aangepaste stijlen weergegeven."
         slug: "Slug"
+        public: "Openbaar"
+        public_description: "Mensen kunnen de pagina ook zien als het gekoppelde topic privé is."
         publish_url: "Uw pagina is gepubliceerd op:"
         topic_published: "Uw topic is gepubliceerd op:"
         preview_url: "Uw pagina wordt gepubliceerd op:"
         invalid_slug: "Sorry, u kunt deze pagina niet publiceren."
         unpublish: "Publicatie ongedaan maken"
+        update: "Bijwerken"
         unpublished: "Uw pagina is niet meer gepubliceerd en niet meer toegankelijk."
         publishing_settings: "Publicatie-instellingen"
       change_owner:
@@ -2366,6 +2371,7 @@ nl:
       has_replies:
         one: "%{count} antwoord"
         other: "%{count} antwoorden"
+      unknown_user: "(onbekende/verwijderde gebruiker)"
       has_likes_title:
         one: "%{count} persoon heeft dit bericht geliket"
         other: "%{count} personen hebben dit bericht geliket"
@@ -2499,7 +2505,7 @@ nl:
           last: "Laatste revisie"
           hide: "Revisie verbergen"
           show: "Revisie tonen"
-          revert: "Terugkeren naar deze revisie"
+          revert: "Terugkeren naar revisie %{revision}"
           edit_wiki: "Wiki bewerken"
           edit_post: "Bericht bewerken"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
@@ -3555,7 +3561,7 @@ nl:
           and_x_more: "en nog %{count}."
           collapse: Samenvouwen
           uploads: "Uploads"
-          no_uploads: "U kunt aan uw thema gerelateerde assets uploaden zoals fonts en afbeeldingen"
+          no_uploads: "U kunt aan uw thema gerelateerde assets uploaden, zoals lettertypen en afbeeldingen"
           add_upload: "Upload toevoegen"
           upload_file_tip: "Kies een asset om te uploaden (png, woff2, etc...)"
           variable_name: "SCSS-variabelenaam:"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 9bcb2f7d81..8df96c03bf 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -829,7 +829,6 @@ pl_PL:
           all: "Wszystkie"
           read: "Przeczytane"
           unread: "Nieprzeczytane"
-        ignore_duration_title: "Ignoruj licznik"
         ignore_duration_username: "Nazwa użytkownika"
         ignore_duration_when: "Oczekiwanie"
         ignore_duration_save: "Ignoruj"
@@ -1077,7 +1076,8 @@ pl_PL:
         secondary: "Drugorzędne adresy email"
         primary_label: "podstawowy"
         update_email: "Zmień adres email"
-        ssDestroy_override_instructions: "E-mail można zaktualizować od dostawcy SSO."
+        sso_override_instructions: "E-mail można zaktualizować od dostawcy SSO."
+        no_secondary: "Brak drugorzędnych adresów email"
         instructions: "Nie będzie publicznie widoczny."
         ok: "Otrzymasz potwierdzenie emailem"
         invalid: "Podaj poprawny adres email"
@@ -2353,6 +2353,8 @@ pl_PL:
         title: "Scal wybrane posty"
         action: "scal wybrane posty"
         error: "Wystąpił błąd podczas łączenia wybranych postów"
+      publish_page:
+        public: "Publiczna"
       change_owner:
         title: "Zmiana właściciela"
         action: "zmień właściciela"
@@ -2555,7 +2557,6 @@ pl_PL:
           last: "Ostatnia wersja"
           hide: "Ukryj tę wersję"
           show: "Pokaż tę wersję"
-          revert: "Przywróć do tej wersji"
           edit_wiki: "Edytuj Wiki"
           edit_post: "Edytuj wpis"
         displays:
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index b9585ee751..c8bc0b9fc2 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -800,6 +800,7 @@ pt:
         secondary: "Emails Secundários"
         primary_label: "primária"
         update_email: "Alterar Email"
+        no_secondary: "Não existem emails secundários"
         ok: "Enviar-lhe-emos um email para confirmar"
         invalid: "Por favor introduza um endereço de email válido"
         authenticated: "O seu email foi autenticado por %{provider}"
@@ -1902,6 +1903,8 @@ pt:
         title: "Juntar Publicações Selecionadas"
         action: "juntar publicações selecionadas"
         error: "Ocorreu um erro ao juntar as publicações selecionadas."
+      publish_page:
+        public: "Público"
       change_owner:
         action: "mudar titularidade"
         error: "Ocorreu um erro na mudança de dono das publicações."
@@ -2034,7 +2037,6 @@ pt:
           last: "Última revisão"
           hide: "Esconder revisão"
           show: "Mostrar revisão"
-          revert: "Reverter para esta revisão"
           edit_wiki: "Editar Wiki"
           edit_post: "Editar Publicação"
         displays:
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 4db38a182e..c4a9ea46ff 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -767,7 +767,6 @@ pt_BR:
           all: "Tudo"
           read: "Lido"
           unread: "Não lidas"
-        ignore_duration_title: "Ignorar Temporizador"
         ignore_duration_username: "Nome de Usuário"
         ignore_duration_when: "Duração:"
         ignore_duration_save: "Ignorar"
@@ -992,6 +991,7 @@ pt_BR:
         taken: "Desculpe, este nome de usuário já está sendo usado."
         invalid: "Este nome de usuário é inválido. Ele deve conter apenas números e letras"
       add_email:
+        title: "Adicione o e-mail"
         add: "adicionar"
       change_email:
         title: "Alterar E-mail"
@@ -1024,8 +1024,10 @@ pt_BR:
         primary: "E-mail Primário"
         secondary: "E-mails Secundários"
         primary_label: "primário"
+        unconfirmed_label: "não confirmado"
         update_email: "Alterar E-mail"
-        ssDestroy_override_instructions: "E-mail pode ser atualizado do provedor de SSO."
+        sso_override_instructions: "E-mail pode ser atualizado do provedor de SSO."
+        no_secondary: "Nenhum e-mail secundário"
         instructions: "Nunca visível publicamente."
         ok: "Nós enviaremos um e-mail para confirmar"
         required: "Por favor preencha um endereço de e-mail"
@@ -2265,6 +2267,7 @@ pt_BR:
         publish: "Publicar"
         description: "Quando um tópico é publicado como uma página, sua URL pode ser compartilhada e ela será exibida com um estilo personalizado."
         slug: "Slug"
+        public: "Público"
         publish_url: "Sua página foi publicada em:"
         topic_published: "Seu tópico foi publicado em:"
         preview_url: "Sua página será publicada em:"
@@ -2476,7 +2479,6 @@ pt_BR:
           last: "Última revisão"
           hide: "Esconder 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}"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index a0e3294fb2..19b89eff81 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -1732,6 +1732,8 @@ ro:
         title: "Comasează postările selectate"
         action: "comasează postările selectate"
         error: "A apărut o eroare la comasarea postărilor selectate."
+      publish_page:
+        public: "Public"
       change_owner:
         action: "Schimbă autorul"
         error: "A apărut o eroare la schimbarea autorului postărilor."
@@ -1905,7 +1907,6 @@ ro:
           last: "Ultima revizie"
           hide: "Ascunde revizia"
           show: "Afișează revizia"
-          revert: "Restaurează această revizie"
           edit_post: "Modifică postarea"
         displays:
           inline:
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index d78d095a3b..0ef7bb2755 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -850,7 +850,7 @@ ru:
           all: "Все"
           read: "Прочитанные"
           unread: "Непрочитанные"
-        ignore_duration_title: "Игнорировать таймер"
+        ignore_duration_title: "Игнорировать пользователя"
         ignore_duration_username: "Псевдоним"
         ignore_duration_when: "Продолжительность:"
         ignore_duration_save: "Игнорировать"
@@ -1118,7 +1118,8 @@ ru:
         set_primary: "Указать как основной E-mail"
         destroy: "Удалить E-mail"
         add_email: "Добавить дополнительный E-mail"
-        ssDestroy_override_instructions: "E-mail может быть переопределен от поставщика SSO."
+        sso_override_instructions: "E-mail может быть переопределен от поставщика SSO."
+        no_secondary: "Нет дополнительного адреса электронной почты"
         instructions: "Не будет опубликован."
         ok: "Мы вышлем вам письмо для подтверждения"
         required: "Пожалуйста, введите email"
@@ -1443,6 +1444,11 @@ ru:
       Давайте <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">приступим к обсуждению!</a> Есть {currentTopics, plural, one {<strong>#</strong> тема} few {<strong>#</strong> темы} other {<strong>#</strong> тем}}. Пользователи должны больше читать и отвечать – мы рекомендуем, по крайней мере {requiredTopics, plural, one {<strong>#</strong> тему} few {<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, one {<strong>#</strong> сообщение} few {<strong>#</strong> сообщения} other {<strong>#</strong> сообщений}}. Пользователи должны больше читать и отвечать – мы рекомендуем, по крайней мере {requiredPosts, plural, one {<strong>#</strong> сообщение} few {<strong>#</strong> сообщения} other {<strong>#</strong> сообщений}}. Только сотрудники могут видеть это сообщение.
+    logs_error_rate_notice:
+      reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} other {# errors/hour}}</a> достигнут предел настройки сайта {limit, plural, one {# error/hour} other {# errors/hour}}."
+      reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} other {# errors/minute}}</a> достигнут предел настройки сайта {limit, plural, one {# error/minute} other {# errors/minute}}."
+      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} other {# errors/hour}}</a> превышен лимит настроек сайта {limit, plural, one {# error/hour} other {# errors/hour}}."
+      exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/minute} other {# errors/minute}}</a> превышен лимит настроек сайта {limit, plural, one {# error/minute} other {# errors/minute}}."
     learn_more: "подробнее..."
     all_time: "всего"
     all_time_desc: "всего создано тем"
@@ -2163,6 +2169,7 @@ ru:
         time_frame_required: "Пожалуйста, выберите временные рамки"
       auto_update_input:
         none: "Выбор таймфрейма"
+        now: "Сейчас"
         later_today: "Сегодня, но позже"
         tomorrow: "Завтра"
         later_this_week: "Позже на этой неделе"
@@ -2439,12 +2446,15 @@ ru:
         title: "Публикация страниц"
         publish: "Публиковать"
         description: "Когда тема публикуется в виде страницы, ее URL-адрес может быть предоставлен для общего доступа, и она будет отображаться с пользовательским стилем."
-        slug: "Slug"
+        slug: "Слаг (текстовый идентификатор)"
+        public: "Опубликованная страница"
+        public_description: "Пользователи могут видеть страницу, даже если соответствующая тема является закрытой."
         publish_url: "Ваша страница была опубликована по адресу:"
-        topic_published: "Ваша тема была опубликована на:"
+        topic_published: "Ваша тема была опубликована по адресу:"
         preview_url: "Ваша страница будет опубликована по адресу:"
         invalid_slug: "Извините, вы не можете опубликовать эту страницу."
         unpublish: "Отменить публикацию"
+        update: "Обновить"
         unpublished: "Публикация страницы была отменена и более недоступна по указанному ранее адресу."
         publishing_settings: "Настройки публикации"
       change_owner:
@@ -2532,6 +2542,7 @@ ru:
         few: "%{count} ответа"
         many: "%{count} ответов"
         other: "%{count} ответов"
+      unknown_user: "(неизвестный/удалённый пользователь)"
       has_likes_title:
         one: "Это сообщение понравилось %{count} человеку"
         few: "Это сообщение понравилось %{count} людям"
@@ -2687,7 +2698,7 @@ ru:
           last: "Последняя версия"
           hide: "Скрыть редакцию"
           show: "Показать редакцию"
-          revert: "Откат до этой версии"
+          revert: "Откат до версии %{revision}"
           edit_wiki: "Редактировать Wiki"
           edit_post: "Редактировать запись"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 8f52be3a6e..ade96e1502 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -814,6 +814,7 @@ sk:
         secondary: "Sekundárne e-maily"
         primary_label: "primárny"
         update_email: "Zmeniť email"
+        no_secondary: "Žiadne sekundárne e-maily"
         ok: "Pošleme vám email pre potvrdenie"
         invalid: "Zadajte prosím platný email"
         authenticated: "Váš email bude autentifikovaný pomocou %{provider}"
@@ -1699,6 +1700,8 @@ sk:
       merge_posts:
         title: "Spojiť označené príspevky"
         action: "spojiť označené príspevky"
+      publish_page:
+        public: "Verejné"
       change_owner:
         action: "zmeň vlastníka"
         error: "Nastala chyba pri zmene vlastníka príspevkov."
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 3c1d13d5bc..6c6d38bede 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -744,7 +744,6 @@ sl:
           all: "Vsi"
           read: "Čas branja"
           unread: "Neprebrane"
-        ignore_duration_title: "Prezri opomnik"
         ignore_duration_username: "Uporabniško ime"
         ignore_duration_when: "Trajanje:"
         ignore_duration_save: "Prezri"
@@ -955,7 +954,8 @@ sl:
         primary: "E-naslov"
         secondary: "Dodatni e-naslovi"
         update_email: "Spremeni e-naslov"
-        ssDestroy_override_instructions: "E-naslov se lahko spremeni pri SSO ponudniku."
+        sso_override_instructions: "E-naslov se lahko spremeni pri SSO ponudniku."
+        no_secondary: "Ni dodatnih e-naslovov"
         instructions: "se nikoli ne prikaže javno"
         ok: "Poslali vam bomo e-sporočilo za potrditev."
         invalid: "Vnesite veljaven e-naslov."
@@ -2193,6 +2193,8 @@ sl:
         title: "Združi izbrane prispevke"
         action: "združi izbrane prispevke"
         error: "Med združevanjem izbranih prispevkov je prišlo do napake."
+      publish_page:
+        public: "Javno"
       change_owner:
         title: "Spremeni lastnika"
         action: "spremeni lastnika"
@@ -2410,7 +2412,6 @@ sl:
           last: "Zadnja verzija"
           hide: "Skrij verzije"
           show: "Prikaži verzije"
-          revert: "Povrni to verzijo"
           edit_wiki: "Uredi wiki"
           edit_post: "Uredi prispevek"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 52b38f6f3d..f6924bad5d 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -1516,7 +1516,6 @@ sq:
           last: "Revizioni i fundit"
           hide: "Fshihe revizionin"
           show: "Trego revizionin"
-          revert: "Rikthe këtë version"
         displays:
           inline:
             title: "Show the rendered output with additions and removals inline"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index d0802a93f6..f4ecba9ff4 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -770,7 +770,7 @@ sv:
           all: "Alla"
           read: "Läst"
           unread: "Olästa"
-        ignore_duration_title: "Ignorera timer"
+        ignore_duration_title: "Ignorera användare"
         ignore_duration_username: "Användarnamn"
         ignore_duration_when: "Varaktighet:"
         ignore_duration_save: "Ignorera"
@@ -1038,7 +1038,8 @@ sv:
         set_primary: "Ange primär e-post"
         destroy: "Ta bort e-post"
         add_email: "Lägg till alternativ e-post"
-        ssDestroy_override_instructions: "E-post kan uppdateras från SSO leverantören."
+        sso_override_instructions: "E-post kan uppdateras från SSO leverantören."
+        no_secondary: "Inga sekundära e-post"
         instructions: "Visas aldrig publikt"
         ok: "Vi skickar e-post till dig för bekräftelse"
         required: "Vänligen ange en e-postadress"
@@ -2030,6 +2031,7 @@ sv:
         time_frame_required: Vänligen välj en tidsram
       auto_update_input:
         none: "Välj en tidsram"
+        now: "Nu"
         later_today: "Senare idag"
         tomorrow: "Imorgon"
         later_this_week: "Senare denna vecka"
@@ -2291,11 +2293,14 @@ sv:
         publish: "Publicera"
         description: "När ett ämne publiceras som en sida kan deras URL delas och den kommer att visas med anpassad utformning."
         slug: "Slug"
+        public: "Offentligt"
+        public_description: "Folk kan se sidan även om det associerade ämnet är privat."
         publish_url: "Din sida har publicerats vid:"
         topic_published: "Ditt ämne har publicerats vid:"
         preview_url: "Din sida kommer publiceras vid:"
         invalid_slug: "Tyvärr, du kan inte publicera denna sida."
         unpublish: "Avpublicera"
+        update: "Uppdatera"
         unpublished: "Din sida har blivit avpublicerad och är inte längre tillgänglig."
         publishing_settings: "Inställningar för publicering"
       change_owner:
@@ -2369,6 +2374,7 @@ sv:
       has_replies:
         one: "%{count} svar"
         other: "%{count} svar"
+      unknown_user: "(okänd/raderad användare)"
       has_likes_title:
         one: "%{count} person gillade detta inlägg"
         other: "%{count} personer gillade detta inlägg"
@@ -2502,7 +2508,7 @@ sv:
           last: "Senaste revisionen"
           hide: "Göm version"
           show: "Visa version"
-          revert: "Återgå till den här revisionen"
+          revert: "Återgå till revision %{revision}"
           edit_wiki: "Uppdatera Wiki"
           edit_post: "Ändra meddelandet"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong>%{icon}<strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 5dce2ce7ac..6a90dd244d 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -1749,6 +1749,8 @@ sw:
         title: "Unganisha Machapisho Uliyochagua"
         action: "unganisha machapisho uliyochagua"
         error: "Hitilafu imetokea wakati wa kuunganisha machapisho yaliyochaguliwa."
+      publish_page:
+        public: "Umma"
       change_owner:
         action: "badilisha umiliki"
         error: "Hitilafu imetokea wakati wa kubadilisha mmiliki wa machapisho."
@@ -1900,7 +1902,6 @@ sw:
           last: "Sahihisho iliopita"
           hide: "Ficha sahihisho"
           show: "Onyesha sahihisho"
-          revert: "Rudi kwenye sahihisho hili"
           edit_wiki: "Hariri Wiki"
           edit_post: "Hariri Chapisho"
         displays:
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index fdb67f3e0a..f432e5fef4 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -966,6 +966,8 @@ te:
         instructions:
           one: "ఈ టపాలు జరపాలనుకున్న విషయాన్ని ఎంచుకోండి."
           other: "ఈ <b>%{count}</b> టపాలను జరపాలనుకున్న విషయాన్ని ఎంచుకోండి."
+      publish_page:
+        public: "బహిరంగం"
       change_owner:
         action: "యజమానిని మార్చు"
         error: "ఆ టపాల యజమానిని మార్చేప్పుడు దోషం జరిగింది."
@@ -1300,6 +1302,7 @@ te:
     tagging:
       tags: "ట్యాగులు"
       add_synonyms: "కలుపు"
+      sort_by_name: "పేరు"
       cancel_delete_unused: "రద్దుచేయి"
       notifications:
         watching:
@@ -1516,6 +1519,7 @@ te:
           body: "శరీరం"
         theme:
           theme: "అలంకారం"
+          title: "అలంకారాలు"
           create_type: "రకం"
           create_name: "పేరు"
           edit: "సవరించు"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 013594c88d..aee40327eb 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -1202,7 +1202,7 @@ th:
       success: "บัญชีของคุณถูกสร้าง คุณได้เข้าสู่ระบบแล้ว"
       name_label: "ชื่อ"
       password_label: "ตั้งรหัสผ่าน"
-      optional_description: "(ตัวเลือก)"
+      optional_description: "(ทางเลือก)"
     password_reset:
       continue: "ดำเนินการต่อไปยัง %{site_name}"
     emoji_set:
@@ -1399,7 +1399,10 @@ th:
         invited_to_private_message: "ถูกเชิญไปยังข้อความส่วนตัว"
         invitee_accepted: "คำเชิญถูกยอมรับ"
         posted: "โพสต์ใหม่"
+        invited_to_topic: "ถูกเชิญไปยังกระทู้"
+        group_message_summary: "ข้อความกลุ่มใหม่"
         watching_first_post: "กระทู้ใหม่"
+        liked_consolidated: "ไลค์ใหม่"
     upload_selector:
       title: "เพิ่มรูปภาพ"
       title_with_attachments: "เพิ่มรูปภาพหรือไฟล์"
@@ -1430,24 +1433,60 @@ th:
       no_more_results: "ไม่มีผลการค้นหาเพิ่มเติมแล้ว"
       searching: "กำลังค้นหา..."
       post_format: "#%{post_number} โดย %{username}"
+      cant_find: "ไม่พบสิ่งที่คุณค้นหาใช่หรือไม่"
+      start_new_topic: "ลองเริ่มกระทู้ใหม่ดีไหม"
+      or_search_google: "หรือลองค้นหาด้วยกูเกิล:"
+      search_google: "ลองค้นหาด้วยกูเกิล:"
       search_google_button: "กูเกิล"
+      search_google_title: "ค้นหาเว็บไซต์นี้"
       context:
         user: "ค้นหาโพสต์โดย @%{username}"
         category: "ค้นหาหมวด #%{category}"
+        tag: "ค้นหาแท็ก #%{tag}"
         topic: "ค้นหากระทู้นี้"
         private_messages: "ค้นหาข้อความ"
       advanced:
+        title: ค้นหาขั้นสูงสุด
         posted_by:
           label: โพสต์โดย
+        in_category:
+          label: จัดหมวดหมู่
+        in_group:
+          label: ในกลุ่ม
+        with_tags:
+          label: แท็กแล้ว
+        filters:
+          likes: ฉันได้ถูกใจ
+          posted: ฉันได้โพสต์ใน
+          created: ฉันได้สร้าง
+          watching: ฉันกำลังดู
+          tracking: ฉันกำลังติดตาม
+          private: ในข้อความของฉัน
+          bookmarks: ฉันได้บุ๊กมาร์ก
+          first: เป็นโพสต์แรกๆ
+          pinned: ถูกปักหมุด
+          seen: ฉันได้อ่าน
+          unseen: ฉันยังไม่ได้อ่าน
+          images: พร้อมรูปภาพ
+          all_tags: แท็กด้านบนทั้งหมด
+        statuses:
+          open: เปิด
+          closed: ปิด
+          public: เป็นสาธารณะ
+          noreplies: ไม่มีการตอบกลับ
         post:
           time:
             label: โพสต์แล้ว
+            before: ก่อน
+            after: หลังจาก
     hamburger_menu: "ไปยังรายการกระทู้หรือหมวดหมู่อื่น"
     new_item: "ใหม่"
     go_back: "ย้อนกลับ"
     not_logged_in_user: "หน้าผู้ใช้พร้อมสรุปกิจกรรมล่าสุดและการตั้งค่า"
     current_user: "ไปยังหน้าผู้ใช้ของคุณ"
+    view_all: "ดูทั้งหมด"
     topics:
+      new_messages_marker: "เยี่ยมชมครั้งล่าสุด"
       bulk:
         select_all: "เลือกทั้งหมด"
         clear_all: "ล้างทั้งหมด"
@@ -1462,12 +1501,16 @@ th:
         dismiss_new: "ซ่อนใหม่"
         toggle: "สลับการเลือกกระทู้จำนวนมาก"
         actions: "การดำเนินการจำนวนมาก"
+        change_category: "ตั้งค่าหมวดหมู่"
         close_topics: "ปิดกระทู้"
         archive_topics: "คลังกระทู้"
         notification_level: "การแจ้งเตือน"
         choose_new_category: "เลือกหมวดหมู่ใหม่ให้กระทู้"
         selected:
           other: "คุณได้เลือก <b>%{count}</b> กระทู้"
+        change_tags: "แทนที่แท็ก"
+        choose_new_tags: "เลือกแท็กใหม่เพื่อกระทู้เหล่านี้:"
+        changed_tags: "แท็กของกระทู้เหล่านี้ถูกเปลี่ยนแปลง"
       none:
         unread: "คุณไม่มีกระทู้ที่ยังไม่ได้อ่าน"
         new: "คุณไม่มีกระทู้ใหม่"
@@ -1483,6 +1526,7 @@ th:
         read: "ไม่มีกระทู้ที่อ่านแล้วอีก"
         new: "ไม่มีกระทู้ใหม่อีกแล้ว"
         unread: "ไม่มีกระทู้ที่ยังไม่อ่านอีกแล้ว"
+        category: "ไม่มีกระทู้อื่นอีกใน %{category}"
         top: "ไม่มีกระทู้ยอดนิยมอีกแล้ว"
         bookmarks: "ไม่มีกระทู้ที่บุ๊กมาร์กอีกแล้ว"
     topic:
@@ -1490,6 +1534,7 @@ th:
         other: " %{count} โพสต์ในกระทู้"
       create: "กระทู้ใหม่"
       create_long: "สร้างกระทู้ใหม่"
+      open_draft: "เปิดแบบร่าง"
       private_message: "เริ่มข้อความ"
       archive_message:
         help: "ย้ายข้อความไปกล่องเก็บข้อความ"
@@ -1498,7 +1543,10 @@ th:
         title: "ย้ายไปกล่องขาเข้า"
         help: "ย้ายข้อความกลับไปกล่องขาเข้า"
       edit_message:
+        help: "แก้ไขโพสต์แรกของข้อความ"
         title: "แก้ไข"
+      remove_from_profile:
+        title: "ลบออกจากโปรไฟล์"
       list: "กระทู้"
       new: "กระทู้ใหม่"
       unread: "ยังไม่ได้อ่าน"
@@ -1513,54 +1561,124 @@ th:
         login_required: "คุณจำเป็นต้องเข้าสู่ระบบเพื่อดูกระทู้นี้"
       server_error:
         title: "ไม่สามารถโหลดกระทู้ได้"
+        description: "ขออภัย ไม่สามารถโหลดกระทู้ได้ อาจเป็นเพราะปัญหาการเชื่อมต่อ กรุณาลองใหม่อีกครั้ง หากยังไม่ได้รับการแก้ไข กรุณาติดต่อเรา"
       not_found:
         title: "ไม่พบกระทู้"
+        description: "ขออภัย ไม่สามารถค้นหากระทู้นั้นได้ อาจถูกลบโดยผู้ดูแลระบบ"
       total_unread_posts:
         other: "คุณมี %{count} โพสต์ที่ยังไม่ได้อ่านในกระทู้นี้"
       unread_posts:
         other: "คุณมี %{count} โพสต์เก่าที่ยังไม่ได้อ่านในกระทู้นี้"
+      new_posts:
+        other: "มี %{count}โพสต์ใหม่ในกระทู้นี้ตั้งแต่คุณอ่านครั้งล่าสุด"
+      likes:
+        other: "มี %{count}ถูกใจในกระทู้นี้"
       back_to_list: "กลับไปที่รายชื่อกระทู้"
+      options: "ตัวเลือกกระทู้"
       show_links: "แสดงลิงก์ในกระทู้นี้"
       read_more_in_category: "ต้องการอ่านเพิ่มใช่ไหม ลองดูกระทู้อื่นใน %{catLink} หรือ %{latestLink}"
       read_more: "ต้องการอ่านเพิ่มใช่ไหม %{catLink} หรือ %{latestLink}"
+      group_request: "คุณต้องส่งคำขอเป็นสมาชิกในกลุ่ม `%{name}` เพื่อดูกระทู้นี้"
+      group_join: "คุณต้องเข้ากลุ่ม `%{name}` เพื่อดูกระทู้นี้"
+      group_request_sent: "คำขอเป็นสมาชิกกลุ่มของคุณได้ถูกส่งไปแล้ว คุณจะได้รับการแจ้งเตือนเมื่อถูกตอบรับ"
+      unread_indicator: "ยังไม่มีสมาชิกอ่านโพสต์ล่าสุดของกระทู้นี้"
       view_latest_topics: ดูกระทู้ล่าสุด
       suggest_create_topic: ทำไมไม่สร้างกระทู้ล่ะ
+      jump_reply_up: ข้ามไปยังคำตอบก่อนหน้านี้
+      jump_reply_down: ข้ามไปยังคำตอบหลังจากนี้
       deleted: "กระทู้ถูกลบ"
+      topic_status_update:
+        num_of_hours: "จำนวนชั่วโมง:"
+        num_of_days: "จำนวนวัน:"
+        when: "เมื่อ:"
       auto_update_input:
+        now: "ตอนนี้"
         later_today: "ภายหลังในวันนี้"
         tomorrow: "พรุ่งนี้"
         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: "เลือกวันและเวลา"
+      temp_open:
+        title: "เปิดชั่วคราว"
+      auto_reopen:
+        title: "กระทู้ที่เปิดอัตโนมัติ"
+      temp_close:
+        title: "ปิดชั่วคราว"
       auto_close:
+        title: "กระทู้ที่ปิดอัตโนมัติ"
         error: "กรอกค่าที่ถูกต้อง"
         based_on_last_post: "ไม่ปิดจนกว่าโพสสุดท้ายในกระทู้นี่เก่า"
+      auto_delete:
+        title: "กระทู้ที่ลบอัตโนมัติ"
+      reminder:
+        title: "เตือนฉัน"
+      auto_delete_replies:
+        title: "คำตอบที่ลบอัตโนมัติ"
       status_update_notice:
+        auto_open: "กระทู้นี้จะเปิดโดยอัตโนมัติ%{timeLeft}"
         auto_close: "กระทู้นี้จะถูกปิดอัตโนมัติใน %{timeLeft}"
         auto_close_based_on_last_post: "กระทู้นี้จะถูกปิด %{duration} หลังจากการตอบล่าสุด"
+        auto_delete: "กระทู้นี้จะลบโดยอัตโนมัติ%{timeLeft}"
+        auto_reminder: "คุณจะถูกเตือนเกี่ยวกับกระทู้นี้%{timeLeft}"
+        auto_delete_replies: "คำตอบในกระทู้นี้จะถูกลบโดยอัตโนมัติหลังจาก%{duration}"
       auto_close_title: "ปิดการตั้งค่าอัตโนมัติ"
+      auto_close_immediate:
+        other: "โพสต์ล่าสุดของกระทู้นี้มีอายุ %{count} ชั่วโมงแล้ว กระทู้จะถูกปิดเร็วๆนี้"
       timeline:
         back: "กลับ"
+        back_description: "กลับไปยังโพสต์ล่าสุดที่ยังไม่ได้อ่าน"
+        replies_short: "%{current} / %{total}"
       progress:
         go_top: "บน"
+        go_bottom: "ปุ่ม"
+        go: "ไป"
+        jump_bottom: "ข้ามไปยังโพสต์ล่าสุด"
+        jump_prompt: "ข้ามไปยัง..."
+        jump_prompt_of: "ของ %{count} โพสต์"
+        jump_prompt_long: "ข้ามไปยัง..."
+        jump_bottom_with_number: "ข้ามไปยังโพสต์ %{post_number}"
+        jump_prompt_to_date: "ไปวันที่"
         jump_prompt_or: "หรือ"
+        total: โพสต์ทั้งหมด
+        current: โพสต์ปัจจุบัน
       notifications:
+        title: เปลี่ยนความถี่ในการรับการแจ้งเตือนเกี่ยวกระทู้นี้
         reasons:
+          "3_10": "คุณจะได้รับการแจ้งเตือนเพราะคุณกำลังดูแท็กในกระทู้นี้"
+          "3_6": "คุณจะได้รับการแจ้งเตือนเพราะคุณกำลังดูหมวดหมู่นี้"
+          "3_5": "คุณจะได้รับการแจ้งเตือนเพราะคุณได้เริ่มดูกระทู้นี้อย่างอัตโนมัติ"
           "3_2": "คุณจะได้รับการแจ้งเตือนเพราะคุณกำลังดูกระทู้นี้"
           "3_1": "คุณจะได้รับการแจ้งเตือนเพราะคุณได้สร้างกระทู้นี้"
           "3": "คุณจะได้รับการแจ้งเตือนเพราะคุณกำลังดูกระทู้นี้"
+          "2_8": "คุณจะเห็นจำนวนคำตอบใหม่เพราะคุณกำลังติดตามหมวดหมู่นี้"
+          "2_4": "คุณจะเห็นจำนวนคำตอบใหม่เพราะคุณได้โพสต์คำตอบไปยังกระทู้นี้"
+          "2_2": "คุณจะเห็นจำนวนคำตอบใหม่เพราะคุณกำลังติดตามกระทู้นี้"
+          "2": 'คุณจะเห็นจำนวนคำตอบใหม่เพราะคุณ<a href="%{basePath}/u/%{username}/preferences/notifications">อ่านกระทู้นี้</a>'
           "1_2": "คุณจะได้รับการแจ้งเตือนเมื่อมีคนกล่าวถึงชื่อของคุณ @name หรือตอบคุณ"
           "1": "คุณจะได้รับการแจ้งเตือนเมื่อมีคนกล่าวถึงชื่อของคุณ @name หรือตอบคุณ"
           "0_2": "คุณไม่ต้องการรับการแจ้งเตือนทั้งหมดจากกระทู้นี้"
           "0": "คุณไม่ต้องการรับการแจ้งเตือนทั้งหมดจากกระทู้นี้"
         watching_pm:
           title: "กำลังดู"
+          description: "คุณจะได้รับการแจ้งเตือนของทุกคำตอบใหม่ในข้อความนี้ และจะเห็นจำนวนคำตอบใหม่"
         watching:
           title: "กำลังดู"
+          description: "คุณจะได้รับการแจ้งเตือนของทุกคำตอบใหม่ในกระทู้นี้ และจะเห็นจำนวนคำตอบใหม่"
         tracking_pm:
           title: "ติดตาม"
+          description: "จำนวนคำตอบใหม่จะถูกแสดงสำหรับข้อความนี้ คุณจะได้รับการแจ้งเตือนเมื่อมีคนกล่าวถึงชื่อของคุณ  @name หรือตอบคุณ"
         tracking:
           title: "ติดตาม"
+          description: "จำนวนคำตอบใหม่จะถูกแสดงสำหรับกระทู้นี้ คุณจะได้รับการแจ้งเตือนเมื่อมีคนกล่าวถึงชื่อของคุณ @name หรือตอบคุณ"
         regular:
           title: "ปกติ"
           description: "คุณจะได้รับการแจ้งเตือนเมื่อมีคนกล่าวถึงชื่อของคุณ @name หรือตอบคุณ"
@@ -1569,6 +1687,7 @@ th:
           description: "คุณจะได้รับการแจ้งเตือนเมื่อมีคนกล่าวถึงชื่อของคุณ @name หรือตอบคุณ"
         muted_pm:
           title: "ปิด"
+          description: "คุณจะไม่ได้รับการแจ้งเตือนใดๆเกี่ยวกับข้อความนี้"
         muted:
           title: "ปิดการแจ้งเตือน"
       actions:
@@ -1586,6 +1705,7 @@ th:
         visible: "ทำให้แสดงในรายชื่อ"
         reset_read: "ล้างข้อมูลการอ่าน"
         make_public: "ทำให้กระทู้เป็นสาธารณะ"
+        make_private: "สร้างข้อความส่วนตัว"
       feature:
         pin: "ปักหมุดกระทู้"
         unpin: "เลิกปักหมุดกระทู้"
@@ -1595,17 +1715,34 @@ th:
       reply:
         title: "ตอบ"
         help: "เริ่มเขียนตอบกระทู้นี้"
+      clear_pin:
+        title: "ล้างหมุด"
       share:
         title: "แบ่งปัน"
+        extended_title: "แบ่งปันลิงก์"
         help: "แบ่งปันลิงก์ไปยังกระทู้นี้"
+      print:
+        title: "พิมพ์เอกสาร"
       flag_topic:
         title: "ธง"
         help: "ปังธงกระทู้นี้เพื่อติดตามหรือรับการแจ้งเตือนเกี่ยวกับกระทู้"
         success_message: "คุณปักธงกระทู้นี้แล้ว"
+      make_public:
+        choose_category: "กรุณาเลือกหมวดหมู่สำหรับกระทู้สาธารณะ:"
       feature_topic:
         title: "แนะนำกระทู้นี้"
+        pin: "ทำให้กระทู้นี้ปรากฏด้านบนสุดของหมวดหมู่ %{categoryLink} จนกระทั่ง"
         confirm_pin: "คุณมีกระทู้ที่ปักหมุดทั้งหมด %{count} กระทู้ การมีกระทู้ที่ปักหมุดมากๆอาจสร้างปัญหาให้แก่ผู้ใช้ใหม่และผู้ใช้ที่ไม่ระบุชื่อได้ คุณแน่ใจหรือว่าจะปักหมุดกระทู้เพิ่มอีกในหมวดหมู่นี้"
+        unpin: "ลบกระทู้นี้ออกจากด้านบนสุดของหมวดหมู่ %{categoryLink}"
+        unpin_until: "ลบกระทู้นี้ออกจากด้านบนสุดของหมวดหมู่ %{categoryLink} หรือรอจนกระทั่ง <strong>%{until}</strong>"
+        pin_validation: "จำเป็นต้องมีวันที่เพื่อปักหมุดกระทู้นี้"
+        not_pinned: "ไม่มีกระทู้ที่ถูกปักหมุดใน %{categoryLink}"
+        already_pinned:
+          other: "ตอนนี้กระทู้ถูกปักหมุดใน %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
+        pin_globally: "ทำให้กระทู้นี้ปรากฏด้านบนสุดของรายการกระทู้ทั้งหมดจนกระทั่ง"
         confirm_pin_globally: "คุณมีกระทู้ที่ปักหมุดทั้งหมด %{count}  กระทู้ การมีกระทู้ที่ปักหมุดมากๆอาจสร้างปัญหาให้แก่ผู้ใช้ใหม่และผู้ใช้ที่ไม่ระบุชื่อได้ คุณแน่ใจหรือว่าจะปักหมุดกระทู้เพิ่มอีกในหมวดหมู่นี้"
+        unpin_globally: "ลบกระทู้นี้ออกจากด้านบนสุดของรายการกระทู้ทั้งหมด"
+        unpin_globally_until: "ลบกระทู้นี้ออกจากด้านบนสุดของรายการกระทู้ทั้งหมดหรือรอจนกระทั่ง <strong>%{until}</strong>"
       inviting: "กำลังเชิญ..."
       invite_private:
         title: "ข้อความที่ใช้เชิญ"
@@ -1613,6 +1750,7 @@ th:
         email_or_username_placeholder: "อีเมลหรือชื่อผู้ใช้"
         action: "เชิญ"
         success: "เราได้เชิญผู้ใช้นั้นให้มีส่วนร่วมในข้อความนี้แล้ว"
+        success_group: "เราได้เชิญกลุ่มนั้นให้เข้าร่วมในข้อความนี้แล้ว"
         error: "ขออภัย เกิดความผิดพลาดในการเชิญผู้ใช้ท่านนี้"
         group_name: "ชื่อกลุ่ม"
       controls: "การควบคุมหัวข้อ"
@@ -1620,25 +1758,70 @@ th:
         title: "เชิญ"
         username_placeholder: "ชื่อผู้ใช้"
         action: "ส่งคำเชิญ"
+        help: "เชิญคนอื่นมาที่กระทู้นี้โดยอีเมลหรือการแจ้งเตือน"
+        to_forum: "เราจะส่งอีเมลสั้นๆเพื่ออนุญาตให้เพื่อนของคุณเข้าร่วมได้โดยทันทีเพียงคลิกลิงก์ ไม่จำเป็นต้องเข้าสู่ระบบ"
+        sso_enabled: "กรอกชื่อผู้ใช้ของคนที่คุณต้องการเชิญมายังกระทู้นี้"
+        to_topic_blank: "กรอกชื่อผู้ใช้หรือที่อยู่อีเมลของคนที่คุณต้องการเชิญมายังกระทู้นี้"
+        to_topic_email: "คุณได้กรอกที่อยู่อีเมลแล้ว เราจะส่งอีเมลคำเชิญเพื่ออนุญาตเพื่อนของคุณให้ตอบกลับกระทู้นี้ได้โดยทันที"
+        to_topic_username: "คุณได้กรอกชื่อผู้ใช้แล้ว เราจะส่งการแจ้งเตือนพร้อมลิงก์เพื่อเชิญพวกเขามายังกระทู้นี้"
+        to_username: "กรอกชื่อผู้ใช้ของคนที่คุณต้องการเชิญ เราจะส่งการแจ้งเตือนพร้อมลิงก์เพื่อเชิญพวกเขามายังกระทู้นี้"
         email_placeholder: "name@example.com"
+        success_username: "เราได้เชิญผู้ใช้นั้นให้เข้าร่วมในกระทู้นี้แล้ว"
+        success_existing_email: "ผู้ใช้อีเมล <b>%{emailOrUsername}</b>มีอยู่ที่นี่แล้ว เราได้เชิญผู้ใช้นั้นให้เข้าร่วมในกระทู้นี้แล้ว"
       login_reply: "เข้าสู่ระบบเพื่อตอบ"
       filters:
         n_posts:
           other: "%{count} โพสต์"
         cancel: "เอาตัวกรองออก"
+      move_to:
+        title: "ย้ายไปยัง"
+        action: "ย้ายไปยัง"
+        error: "มีข้อผิดพลาดในการย้ายโพสต์"
       split_topic:
         title: "ย้ายไปกระทู้ใหม่"
         action: "ย้ายไปกระทู้ใหม่"
+        topic_name: "หัวข้อกระทู้ใหม่"
         radio_label: "กระทู้ใหม่"
+        error: "มีข้อผิดพลาดในการย้ายโพสต์ไปยังกระทู้ใหม่"
       merge_topic:
         title: "ย้ายไปกระทู้ที่มีอยู่แล้ว"
         action: "ย้ายไปกระทู้ที่มีอยู่แล้ว"
+        error: "มีข้อผิดพลาดในการย้ายโพสต์ไปยังกระทู้นั้น"
+        radio_label: "กระทู้ที่มีอยู่แล้ว"
+        instructions:
+          other: "กรุณาเลือกกระทู้ที่คุณต้องการย้าย <b>%{count}</b> โพสต์ไป"
       move_to_new_message:
+        title: "ย้ายไปข้อความใหม่"
+        action: "ย้ายไปข้อความใหม่"
+        message_title: "หัวข้อข้อความใหม่"
         radio_label: "สร้างข้อความใหม่"
+      move_to_existing_message:
+        title: "ย้ายไปข้อความที่มีอยู่แล้ว"
+        action: "ย้ายไปข้อความที่มีอยู่แล้ว"
+        radio_label: "ข้อความที่มีอยู่แล้ว"
+        instructions:
+          other: "กรุณาเลือกข้อความที่คุณต้องการย้าย<b>%{count}</b>โพสต์ไป"
+      publish_page:
+        title: "การเผยแพร่เพจ"
+        publish: "เผยแพร่"
+        public: "สาธารณะ"
+        publish_url: "เพจของคุณถูกเผยแพร่เมื่อ:"
+        topic_published: "กระทู้ของคุณถูกเผยแพร่เมื่อ:"
+        preview_url: "เพจของคุณจะถูกเผยแพร่เมื่อ:"
+        invalid_slug: "ขออภัย คุณไม่สามารถเผยแพร่เพจนี้"
+        unpublish: "ไม่เผยแพร่"
+        update: "อัปเดต"
+        unpublished: "เพจของคุณถูกหยุดการเผยแพร่และไม่สามารถเข้าถึงได้อีกต่อไป"
+        publishing_settings: "ตั้งค่าการเผยแพร่"
       change_owner:
+        title: "เปลี่ยนเจ้าของ"
         action: "เปลี่ยนความเป็นเจ้าของ"
         error: "มีความผิดพลาดขณะเปลี่ยนความเป็นเจ้าของโพส"
         placeholder: "ชื่อผู้ใช้ของเจ้าของใหม่"
+        instructions:
+          other: "กรุณาเลือกเจ้าของใหม่สำหรับ %{count}โพสต์ โดย<b>@%{old_user}</b>"
+        instructions_without_old_user:
+          other: "กรุณาเลือกเจ้าของใหม่สำหรับ %{count}โพสต์"
       change_timestamp:
         action: "เปลี่ยนแปลงเวลา"
       multi_select:
@@ -1646,43 +1829,68 @@ th:
         selected: "เลือกแล้ว (%{count})"
         select_post:
           label: "เลือก"
+          title: "เพิ่มโพสต์ไปยังการเลือก"
+        selected_post:
+          label: "เลือกแล้ว"
+          title: "คลิกเพื่อลบโพสต์จากการเลือก"
         select_replies:
           label: "เลือก + ตอบ"
+          title: "เพิ่มโพสต์และคำตอบทั้งหมดไปยังการเลือก"
+        select_below:
+          label: "เลือก+ด้านล่าง"
+          title: "เพิ่มโพสต์และทุกอย่างหลังจากนั้นไปยังการเลือก"
         delete: ลบที่เลือก
         cancel: ยกเลิกการเลือก
         select_all: เลือกทั้งหมด
         deselect_all: ไม่เลือกทั้งหมด
         description:
           other: "คุณได้เลือก <b>%{count}</b> โพสต์"
+      deleted_by_author:
+        other: "(กระทู้ถูกแจ้งลบโดยเจ้าของ และจะถูกลบโดยอัตโนมัติใน%{count}ชั่วโมง เว้นแต่จะถูกปักธง)"
     post:
+      quote_reply: "อ้างอิง"
       edit_reason: "เหตุผล:"
       post_number: "โพสต์ %{number}"
       last_edited_on: "โพสต์ถูกแก้ไขล่าสุดเมื่อ"
       reply_as_new_topic: "ตอบด้วยหัวข้อที่ลิงค์ไว้"
+      reply_as_new_private_message: "ตอบกลับด้วยข้อความใหม่ไปยังผู้รับคนเดียวกัน"
       follow_quote: "ไปยังโพสต์ที่ถูกกล่าวถึง"
       show_full: "แสดงโพสต์ทั้งหมด"
       deleted_by_author:
         other: "(โพสถูกแจ้งลบโดยเจ้าของ และจะถูกลบใน %{count} ชั่วโมงเว้นแต่จะถูกปักธง)"
       expand_collapse: "ขยาย/ย่อ"
+      locked: "ทีมงานได้ปิดโพสต์นี้จากการแก้ไข"
+      gap:
+        other: "ดู%{count}คำตอบที่ถูกซ่อน"
+      notice:
+        new_user: "นี่เป็นครั้งแรกที่ %{user} ได้โพสต์ มาร่วมต้อนรับเขาสู่ชุมชนของเรากันเถอะ!"
+        returning_user: "นานแล้วที่เราเห็น %{user} โพสต์ล่าสุดของเขาคือเมื่อ %{time}"
       unread: "โพสต์นี้ยังไม่ถูกอ่าน"
       has_replies:
         other: "%{count} ตอบ"
       has_likes_title:
         other: "%{count} คนถูกใจโพสต์นี้"
       has_likes_title_only_you: "คุณถูกใจโพสต์นี้"
+      has_likes_title_you:
+        other: "คุณและคนอื่นอีก %{count}คนถูกใจโพสต์นี้"
       errors:
         create: "ขออภัย เกิดความผิดพลาดขณะกำลังสร้างโพสต์ของคุณ กรุณาลองใหม่อีกครั้ง"
         edit: "ขออภัย เกิดความผิดพลาดขณะกำลังแก้ไขโพสต์ของคุณ กรุณาลองใหม่อีกครั้ง"
         upload: "ขออภัย เกิดความผิดพลาดขณะกำลังอัปโหลดไฟล์ของคุณ กรุณาลองใหม่อีกครั้ง"
         too_many_uploads: "ขออภัย คุณสามารถอัปโหลดได้ครั้งละหนึ่งไฟล์เท่านั้น"
+        too_many_dragged_and_dropped_files: "ขออภัย คุณสามารถอัปโหลดได้ครั้งละ %{max}ไฟล์เท่านั้น"
         image_upload_not_allowed_for_new_user: "ขออภัย ผู้ใช้ใหม่ไม่สามารถอัปโหลดรูปภาพได้"
         attachment_upload_not_allowed_for_new_user: "ขออภัย ผู้ใช้ใหม่ไม่สามารถอัปโหลดไฟล์แนบได้"
         attachment_download_requires_login: "ขออภัย คุณต้องเข้าสู่ระบบเพื่อดาวน์โหลดไฟล์แนบ"
       abandon_edit:
+        confirm: "คุณแน่ใจหรือว่าต้องการละทิ้งการเปลี่ยนแปลง"
         no_value: "ไม่ เก็บไว้"
+        no_save_draft: "ไม่ บันทึกแบบร่าง"
+        yes_value: "ใช่ ละทิ้งการแก้ไข"
       abandon:
         confirm: "คุณแน่ใจหรือว่าต้องการละทิ้งโพสต์ของคุณ"
         no_value: "ไม่ เก็บไว้"
+        no_save_draft: "ไม่ บันทึกแบบร่าง"
         yes_value: "ใช่ ละทิ้ง"
       via_email: "โพสนี้ถูกเก็บโดยอีเมล"
       whisper: "โพสนี้คือการกระซิบจากผู้ดูแล"
@@ -1690,39 +1898,136 @@ th:
         about: "โพสนี้เป็นวิกิ; ผู้ใช้ธรรมดาสามารถแก้ไขได้"
       archetypes:
         save: "บันทึกการตั้งค่า"
+      few_likes_left: "ขอบคุณสำหรับการแบ่งปันความรัก! คุณเหลือเพียงไม่กี่ไลค์สำหรับวันนี้"
       controls:
+        reply: "เริ่มเขียนคำตอบโพสต์นี้"
         like: "ถูกใจโพสต์นี้"
         has_liked: "คุณได้ถูกใจโพสต์นี้แล้ว"
+        read_indicator: "สมาชิกที่อ่านโพสต์นี้"
         undo_like: "เลิกถูกใจ"
         edit: "แก้ไขโพสต์นี้"
         edit_action: "แก้ไข"
         edit_anonymous: "ขออภัย คุณต้องเข้าสู่ระบบเพื่อแก้ไขโพสต์นี้"
         delete: "ลบโพสต์นี้"
         undelete: "เลิกลบโพสต์นี้"
+        share: "แบ่งปันลิงก์ไปยังโพสต์นี้"
         more: "อื่นๆ"
         delete_replies:
+          confirm: "คุณต้องการลบคำตอบไปยังโพสต์นี้ด้วยหรือไม่"
+          direct_replies:
+            other: "ใช่ และ %{count}คำตอบโดยตรง"
+          all_replies:
+            other: "ใช่ และทั้งหมด %{count}คำตอบ"
           just_the_post: "ไม่ แค่โพสต์นี้เท่านั้น"
+        publish_page: "การเผยแพร่เพจ"
         unhide: "เลิกซ่อน"
+        lock_post: "ล็อกโพสต์"
+        lock_post_description: "ป้องกันผู้โพสต์จากการแก้ไขโพสต์นี้"
+        unlock_post: "เลิกล็อกโพสต์นี้"
+        unlock_post_description: "อนุญาตให้ผู้โพสต์แก้ไขโพสต์นี้"
+        delete_topic_disallowed: "คุณไม่ได้รับอนุญาตให้ลบกระทู้นี้"
         delete_topic: "ลบกระทู้"
       actions:
         flag: "ธง"
+        defer_flags:
+          other: "ละทิ้งธง"
         undo:
+          off_topic: "เลิกปักธง"
+          spam: "เลิกปักธง"
+          inappropriate: "เลิกปักธง"
           bookmark: "เลิกบุ๊กมาร์ก"
+          like: "เลิกถูกใจ"
+        people:
+          spam: "ปักธงไว้ว่าเป็นสแปม"
+          inappropriate: "ปักธงไว้ว่าไม่เหมาะสม"
+          notify_user: "ส่งข้อความ"
+          bookmark: "บุ๊กมาร์กแล้ว"
+          like:
+            other: "ถูกใจแล้ว"
+          read:
+            other: "อ่านแล้ว"
+          like_capped:
+            other: "และอีก %{count}คนถูกใจสิ่งนี้"
+          read_capped:
+            other: "และอีก %{count}คนอ่านสิ่งนี้"
         by_you:
+          spam: "คุณปักธงไว้ว่าเป็นสแปม"
+          inappropriate: "คุณปักธงไว้ว่าไม่เหมาะสม"
+          notify_user: "คุณได้ส่งข้อความไปหาผู้ใช้นี้แล้ว"
           bookmark: "คุณได้บุ๊กมาร์กโพสต์นี้แล้ว"
+          like: "คุณถูกใจสิ่งนี้"
+      delete:
+        confirm:
+          other: "คุณแน่ใจหรือว่าต้องการลบ %{count}โพสต์นี้"
+      revisions:
+        controls:
+          edit_post: "แก้ไขโพสต์"
+          comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong>%{icon}<strong>%{current}</strong> / %{total}"
+        displays:
+          inline:
+            button: "HTML"
+          side_by_side:
+            title: "HTML"
+            button: "HTML"
+      raw_email:
+        displays:
+          text_part:
+            button: "ข้อความ"
+          html_part:
+            button: "HTML"
       bookmarks:
+        create: "สร้างบุ๊กมาร์ก"
+        edit: "แก้ไขบุ๊กมาร์ก"
         created: "สร้าง"
+        updated: "อัปเดตแล้ว"
         name: "ชื่อ"
+        name_placeholder: "บุ๊กมาร์กนี้สำหรับสิ่งใด"
+        set_reminder: "เตือนฉัน"
+        actions:
+          delete_bookmark:
+            name: "ลบบุ๊กมาร์ก"
+          edit_bookmark:
+            name: "แก้ไขบุ๊กมาร์ก"
     category:
+      none: "(ไม่มีหมวดหมู่)"
+      all: "หมวดหมู่ทั้งหมด"
       edit: "แก้ไข"
+      edit_dialog_title: "แก้ไข: %{categoryName}"
+      view: "ดูกระทู้ในหมวดหมู่"
+      general: "ทั่วไป"
       settings: "การตั้งค่า"
+      topic_template: "รูปแบบกระทู้"
       tags: "แท็ก"
+      allow_global_tags_label: "อนุญาตแท็กอื่นด้วย"
       delete: "ลบหมวดหมู่"
+      create: "หมวดหมู่ใหม่"
+      create_long: "สร้างหมวดหมู่ใหม่"
+      save: "บันทึกหมวดหมู่"
+      creation_error: มีข้อผิดพลาดขณะสร้างหมวดหมู่
+      save_error: มีข้อผิดพลาดในการบันทึกหมวดหมู่
+      name: "ชื่อหมวดหมู่"
       description: "รายละเอียด"
+      topic: "กระทู้หมวดหมู่"
+      logo: "รูปโลโก้หมวดหมู่"
+      background_image: "รูปพื้นหลังหมวดหมู่"
+      background_color: "สีพื้นหลัง"
+      name_placeholder: "สูงสุดหนึ่งหรือสองคำ"
       delete_confirm: "คุณแน่ใจหรือว่าจะลบหมวดหมู่นี้ออก"
+      delete_error: "มีข้อผิดพลาดในการลบหมวดหมู่"
+      no_description: "กรุณาเพิ่มรายละเอียดสำหรับหมวดหมู่นี้"
+      change_in_category_topic: "แก้ไขรายละเอียด"
+      already_used: "สีนี้ถูกใช้สำหรับหมวดหมู่อื่นแล้ว"
       security: "ความปลอดภัย"
+      pending_permission_change_alert: "คุณยังไม่ได้เพิ่ม %{group} ไปยังหมวดหมู่นี้ คลิกปุ่มนี้เพื่อเพิ่ม"
+      images: "รูปภาพ"
       email_in_allow_strangers: "ยอมรับอีเมลจากผู้ใช้ที่ไม่ระบุชื่อและไม่มีบัญชี"
+      edit_permissions: "แก้ไขการอนุญาต"
+      reviewable_by_group: "นอกจากทีมงานแล้ว โพสต์และธงในหมวดหมู่ยังสามารถถูกรีวิวโดย:"
       review_group_name: "ชื่อกลุ่ม"
+      require_topic_approval: "กระทู้ใหม่ทั้งหมดต้องผ่านการอนุมัติจากผู้ดูแลระบบ"
+      require_reply_approval: "คำตอบใหม่ทั้งหมดต้องผ่านการอนุมัติจากผู้ดูแลระบบ"
+      this_year: "ปีนี้"
+      minimum_required_tags: "จำนวนแท็กขั้นต่ำในกระทู้:"
       notifications:
         watching:
           title: "กำลังดู"
@@ -1739,43 +2044,90 @@ th:
         options:
           normal: "ปกติ"
           ignore: "ไม่สนใจ"
+          very_low: "ต่ำมาก"
+          low: "ต่ำ"
           high: "สูง"
+          very_high: "สูงมาก"
       sort_options:
         likes: "ถูกใจ"
         views: "ดู"
         posts: "โพสต์"
         activity: "กิจกรรม"
+        posters: "ผู้โพสต์"
         category: "หมวดหมู่"
         created: "สร้าง"
       settings_sections:
+        general: "ทั่วไป"
         email: "อีเมล"
+      list_filters:
+        all: "กระทู้ทั้งหมด"
+        none: "ไม่มีหมวดหมู่ย่อย"
     flagging:
       notify_action: "ข้อความส่วนตัว"
+      official_warning: "คำเตือนอย่างเป็นทางการ"
       delete_spammer: "ลบสแปมเมอร์"
       yes_delete_spammer: "ใช่ ลบสแปมเมอร์"
+      hidden_email_address: "(ถูกซ่อน)"
+      cant: "ขออภัย คุณไม่สามารถปักธงโพสต์นี้ได้ในขณะนี้"
+      notify_staff: "แจ้งทีมงานโดยส่วนตัว"
+      formatted_name:
+        inappropriate: "มันไม่เหมาะสม"
+        spam: "มันคือสแปม"
+      custom_placeholder_notify_moderators: "บอกเราในเรื่องที่คุณไม่สบายใจ พร้อมส่งลิงก์และตัวอย่างที่เกี่ยวข้องหากเป็นไปได้"
+      custom_message:
+        at_least:
+          other: "กรอกอย่างน้อย %{count} ตัวอักษร"
+        more:
+          other: "อีก %{count}..."
+        left:
+          other: "เหลืออีก %{count}"
     flagging_topic:
+      action: "ปักธงกระทู้"
       notify_action: "ข้อความส่วนตัว"
     topic_map:
       title: "สรุปกระทู้"
+      participants_title: "ผู้โพสต์บ่อย"
+      links_title: "ลิงก์ยอดนิยม"
+      links_shown: "แสดงลิงก์เพิ่มอีก..."
+      clicks:
+        other: "%{count} คลิก"
+    post_links:
+      title:
+        other: "อีก %{count}"
     topic_statuses:
       warning:
         help: "นี่คือคำเตือนอย่างเป็นทางการ"
       bookmarked:
         help: "คุณได้บุ๊กมาร์กกระทู้นี้แล้ว"
+      locked:
+        help: "กระทู้นี้ถูกปิด ไม่รับคำตอบใหม่อีกต่อไป"
       archived:
         help: "หัวข้อนี้ถูกจัดเก้บแล้ว; นั่นหมายความว่ามันถูกแช่แข็งและไม่สามารถเปลี่ยนแปลงได้"
       locked_and_archived:
         help: "หัวข้อนี้ถูกปิดและถูกจัดเก็บแล้ว; นั่นหมายความว่ามันไม่รับข้อความใหม่และไม่สามารถเปลี่ยนแปลงได้"
+      unpinned:
+        title: "เลิกปักหมุดแล้ว"
+        help: "เลิกปักหมุดกระทู้นี้แล้ว มันจะถูกแสดงในลำดับปกติ"
+      pinned:
+        title: "ปักหมุดแล้ว"
+        help: "ปักหมุดกระทู้นี้แล้ว มันจะถูกแสดงด้านบนสุดของหมวดหมู่"
+      personal_message:
+        title: "กระทู้นี้เป็นข้อความส่วนตัว"
+        help: "กระทู้นี้เป็นข้อความส่วนตัว"
     posts: "โพสต์"
+    posts_long: "มี %{number} โพสต์ในกระทู้นี้"
     original_post: "โพสต์ต้นฉบับ"
     views: "ดู"
     views_lowercase:
       other: "ดู"
     replies: "ตอบ"
+    views_long:
+      other: "กระทู้นี้ถูกดู %{number}ครั้ง"
     activity: "กิจกรรม"
     likes: "ถูกใจ"
     likes_lowercase:
       other: "ถูกใจ"
+    likes_long: "มี %{number}ไลค์ในกระทู้นี้"
     users: "ผู้ใช้"
     users_lowercase:
       other: "ผู้ใช้"
@@ -1846,13 +2198,20 @@ th:
         this_month: "เดือน"
         this_week: "สัปดาห์"
         today: "วันนี้"
+        other_periods: "ดูด้านบน:"
     permission_types:
       full: "สร้าง / ตอบ / ดู"
       create_post: "ตอบ / ดู"
       readonly: "ดู"
     lightbox:
       download: "ดาวน์โหลด"
+      close: "ปิด (Esc)"
     keyboard_shortcuts_help:
+      shortcut_key_delimiter_comma: ","
+      shortcut_key_delimiter_plus: "+"
+      shortcut_delimiter_or: "%{shortcut1}หรือ%{shortcut2}"
+      shortcut_delimiter_slash: "%{shortcut1}/%{shortcut2}"
+      shortcut_delimiter_space: "%{shortcut1}%{shortcut2}"
       title: "ปุ่มลัดของคีย์บอร์ด"
       jump_to:
         title: "ข้ามไปยัง"
@@ -1865,6 +2224,7 @@ th:
         bookmarks: "%{shortcut} บุ๊กมาร์ก"
         profile: "%{shortcut} โปรไฟล์"
         messages: "%{shortcut} ข้อความ"
+        drafts: "%{shortcut}แบบร่าง"
       navigation:
         title: "การนำทาง"
         jump: "%{shortcut} ไปยังโพสต์ #"
@@ -1872,16 +2232,29 @@ th:
         up_down: "%{shortcut} ย้ายส่วน &uarr; &darr;"
         open: "%{shortcut} เปิดกระทู้ที่เลือก"
         next_prev: "%{shortcut} หมวดถัดไป/ก่อนหน้า"
+        go_to_unread_post: "%{shortcut}ไปยังโพสต์แรกที่ยังไม่ได้อ่าน"
       application:
         title: "แอปพลิเคชัน"
         create: "%{shortcut} สร้างกระทู้ใหม่"
         notifications: "%{shortcut} เปิดการแจ้งเตือน"
         user_profile_menu: "%{shortcut} เปิดเมนูผู้ใช้"
         show_incoming_updated_topics: "%{shortcut} แสดงกระทู้ที่อัปเดต"
+        search: "%{shortcut}ค้นหา"
         help: "%{shortcut} เปิดความช่วยเหลือของแป้นพิมพ์"
         dismiss_new_posts: "%{shortcut} ยกเลิกการโพสใหม่"
         dismiss_topics: "%{shortcut} ยกเลิกหัวข้อ"
         log_out: "%{shortcut} ออกจากระบบ"
+      bookmarks:
+        title: "บุ๊กมาร์ก"
+        enter: "%{shortcut}บันทึกและปิด"
+        later_today: "%{shortcut}ภายหลังในวันนี้"
+        later_this_week: "%{shortcut}ภายหลังในสัปดาห์นี้"
+        tomorrow: "%{shortcut}พรุ่งนี้"
+        next_week: "%{shortcut}สัปดาห์หน้า"
+        next_month: "%{shortcut}เดือนหน้า"
+        next_business_week: "%{shortcut}เริ่มสัปดาห์หน้า"
+        next_business_day: "%{shortcut}วันทำการถัดไป"
+        delete: "%{shortcut}ลบบุ๊กมาร์ก"
       actions:
         title: "การกระทำ"
         bookmark_topic: "%{shortcut} บุ๊คมาร์คหัวข้อ"
@@ -1901,8 +2274,11 @@ th:
         mark_regular: "%{shortcut} หัวข้อ ทั่วไป (มาตราฐาน)"
         mark_tracking: "%{shortcut} ติดตามกระทู้"
         mark_watching: "%{shortcut} ดูกระทู้"
+        print: "%{shortcut}พิมพ์กระทู้"
     badges:
       granted_on: "ได้รับเมื่อ %{date}"
+      more_badges:
+        other: "อีก+%{count}"
       none: "(ไม่มี)"
       badge_grouping:
         getting_started:
@@ -1917,16 +2293,33 @@ th:
           name: โพสต์
     tagging:
       all_tags: "แท็กทั้งหมด"
+      other_tags: "แท็กอื่น"
       selector_all_tags: "แท็กทั้งหมด"
+      selector_no_tags: "ไม่มีแท็ก"
       changed: "เปลี่ยนแท็ก:"
       tags: "แท็ก"
+      choose_for_topic: "แท็กทางเลือก"
+      info: "ข้อมูล"
+      tag_groups_info:
+        other: "แท็กนี้เป็นของกลุ่มเหล่านี้: %{tag_groups}"
+      category_restrictions:
+        other: "สามารถใช้ได้แค่ในหมวดหมู่เหล่านี้เท่านั้น"
       add_synonyms: "เพิ่ม"
       delete_tag: "ลบแท็ก"
+      delete_confirm_no_topics: "คุณแน่ใจหรือว่าต้องการลบแท็กนี้"
       rename_tag: "เปลี่ยนชื่อแท็ก"
       rename_instructions: "เลือกชื่อใหม่สำหรับแท็ก:"
       sort_by: "เรียงโดย:"
       sort_by_count: "นับ"
       sort_by_name: "ชื่อ"
+      upload: "อัปโหลดแท็ก"
+      upload_successful: "แท็กถูกอัปโหลดสำเร็จแล้ว"
+      delete_unused_confirmation:
+        other: "%{count}แท็กจะถูกลบ: %{tags}"
+      delete_unused_confirmation_more_tags:
+        other: "%{tags}และอีก%{count}"
+      delete_unused: "ลบแท็กที่ไม่ได้ใช้"
+      delete_unused_description: "ลบแท็กทั้งหมดที่ไม่ได้ถูกติดในกระทู้หรือข้อความส่วนตัวใดๆ"
       cancel_delete_unused: "ยกเลิก"
       filters:
         without_category: "%{filter} %{tag} กระทู้"
@@ -1943,8 +2336,16 @@ th:
         muted:
           title: "ปิด"
       groups:
+        new: "กลุ่มใหม่"
+        tags_label: "แท็กในกลุ่มนี้:"
+        tags_placeholder: "แท็ก"
+        parent_tag_placeholder: "ทางเลือก"
+        one_per_topic_label: "จำกัดหนึ่งแท็กต่อหนึ่งกระทู้จากกลุ่มนี้"
         save: "บันทึก"
         delete: "ลบ"
+        everyone_can_use: "ทุกคนสามารถใช้แท็กได้"
+        usable_only_by_staff: "ทุกคนสามารถเห็นแท็กได้ แต่ทีมงานเท่านั้นที่สามารถใช้ได้"
+        visible_only_to_staff: "ทีมงานเท่านั้นที่สามารถมองเห็นแท็ก"
       topics:
         none:
           unread: "คุณไม่มีกระทู้ที่ยังไม่ได้อ่าน"
@@ -1962,8 +2363,11 @@ th:
           unread: "ไม่มีกระทู้ที่ยังไม่อ่านอีกแล้ว"
           top: "ไม่มีกระทู้ยอดนิยมอีกแล้ว"
           bookmarks: "ไม่มีกระทู้ที่บุ๊กมาร์กอีกแล้ว"
+    invite:
+      custom_message_template_topic: "สวัสดี ฉันคิดว่าคุณอาจชอบกระทู้นี้!"
     footer_nav:
       back: "กลับ"
+      forward: "ส่งต่อ"
       share: "แบ่งปัน"
       dismiss: "ซ่อน"
   admin_js:
@@ -1993,10 +2397,16 @@ th:
         private_messages_short: "ข้อความ"
         private_messages_title: "ข้อความ"
         mobile_title: "โทรศัพท์"
+        space_used_and_free: "%{usedSize}(%{freeSize}ฟรี)"
+        uploads: "อัปโหลด"
         backups: "สำรองข้อมูล"
+        lastest_backup: "ล่าสุด: %{date}"
         traffic_short: "การจราจร"
+        moderators_activity: กิจกรรมของผู้ดูแลระบบ
+        general_tab: "ทั่วไป"
         security_tab: "ความปลอดภัย"
         report_filter_any: "ใดๆ"
+        disabled: ปิดใช้งานแล้ว
         reports:
           today: "วันนี้"
           yesterday: "เมื่อวาน"
@@ -2009,16 +2419,30 @@ th:
           view_table: "ตาราง"
           view_graph: "กราฟ"
           refresh_report: "โหลดรายงานใหม่"
+          dates: "วัน (UTC)"
           groups: "กลุ่มทั้งหมด"
+          no_data: "ไม่มีข้อมูลที่จะแสดง"
           filters:
             group:
               label: กลุ่ม
             category:
               label: หมวดหมู่
+            include_subcategories:
+              label: "รวมหมวดหมู่ย่อย"
       commits:
         latest_changes: "การเปลี่ยนแปลงล่าสุด: กรุณาอัปเดตบ่อยๆ"
         by: "โดย"
       groups:
+        new:
+          title: "กลุ่มใหม่"
+          create: "สร้าง"
+          name:
+            too_short: "ชื่อกลุ่มสั้นเกินไป"
+            too_long: "ชื่อกลุ่มยาวเกินไป"
+            checking: "กำลังตรวจสอบชื่อกลุ่ม..."
+            available: "สามารถใช้ชื่อกลุ่มได้"
+            not_available: "ไม่สามารถใช้ชื่อกลุ่มได้"
+            blank: "ไม่สามารถเว้นว่างชื่อกลุ่มได้"
         manage:
           interaction:
             email: อีเมล
@@ -2027,7 +2451,13 @@ th:
             visibility_levels:
               title: "ใครสามารถเห็นกลุ่มนี้"
               public: "ทุกคน"
+              members: "เจ้าของกลุ่ม สมาชิก"
               staff: "เจ้าของกลุ่มและทีมงาน"
+              owners: "เจ้าของกลุ่ม"
+              description: "แอดมินสามารถกลุ่มทั้งหมดได้"
+            members_visibility_levels:
+              title: "ใครสามารถเห็นสมาชิกของกลุ่มนี้ได้"
+              description: "แอดมินสามารถเห็นสมาชิกของกลุ่มทั้งหมดได้"
           membership:
             automatic: อัตโนมัติ
             trust_levels_title: "ระดับความไว้ใจจะถูกให้ไปยังผู้ใช้โดยอัตโนมัติเมื่อพวกเขาเพิ่ม:"
@@ -2048,23 +2478,39 @@ th:
         automatic: "อัตโนมัติ"
         group_owners: เจ้าของ
         add_owners: เพิ่มเจ้าของ
+        none_selected: "เลือกกลุ่มเพื่อเริ่มต้น"
       api:
         user: "ผู้ใช้"
         title: "API"
         created: สร้าง
+        updated: อัปเดตแล้ว
+        last_used: ใช้ครั้งล่าสุด
+        never_used: (ไม่เคย)
         revoke: "เอาออก"
+        all_users: "ผู้ใช้ทั้งหมด"
         show_details: รายละเอียด
         description: รายละเอียด
+        user_placeholder: กรอกชื่อผู้ใช้
         save: บันทึก
+        delete: ลบถาวร
         continue: ดำเนินการต่อ
       web_hooks:
+        create: "สร้าง"
         save: "บันทึก"
         destroy: "ลบ"
         description: "รายละเอียด"
+        wildcard_event: "ส่งทุกอย่างหาฉัน"
         active: "ใช้งานอยู่"
         delivery_status:
+          title: "สถานะการส่ง"
+          inactive: "ไม่ใช้งาน"
           failed: "ล้มเหลว"
+          successful: "สำเร็จ"
+          disabled: "ปิดใช้งานแล้ว"
         events:
+          redeliver: "ส่งอีกครั้ง"
+          completed_in:
+            other: "เสร็จสิ้นใน %{count} วินาที"
           request: "ร้องขอ"
           timestamp: "สร้าง"
           actions: "การกระทำ"
@@ -2077,17 +2523,27 @@ th:
         enabled: "เปิดใช้"
         is_enabled: "Y"
         not_enabled: "N"
+        change_settings: "การตั้งค่าการเปลี่ยนแปลง"
         change_settings_short: "การตั้งค่า"
       backups:
         title: "สำรอง"
         menu:
           backups: "สำรอง"
+        columns:
+          filename: "ชื่อไฟล์"
+          size: "ขนาด"
         upload:
           label: "อัปโหลด"
           uploading: "กำลังอัปโหลด..."
+          uploading_progress: "กำลังอัปโหลด...%{progress}%"
         operations:
           cancel:
             label: "ยกเลิก"
+          download:
+            label: "ดาวน์โหลด"
+            title: "ส่งอีเมลพร้อมลิงก์ดาวน์โหลด"
+        location:
+          s3: "S3"
       export_csv:
         button_text: "ส่งออก"
       export_json:
@@ -2100,7 +2556,13 @@ th:
         preview: "แสดงตัวอย่าง"
         save: "บันทึก"
         new: "ใหม่"
+        new_style: "รูปแบบใหม่"
+        install: "ติดตั้ง"
         delete: "ลบ"
+        delete_confirm: 'คุณแน่ใจหรือว่าต้องการลบ "%{theme_name}"'
+        color: "สี"
+        copy: "คัดลอก"
+        theme_owner: "ไม่สามารถแก้ไขได้ เป็นเจ้าของโดย:"
         email_templates:
           title: "อีเมล"
           subject: "หัวข้อ"
@@ -2108,17 +2570,36 @@ th:
           revert_confirm: "คุณแน่ใจหรือว่าจะย้อนกลับการแก้ไข"
         theme:
           theme: "ธีม"
+          theme_name: "ชื่อธีม"
+          title: "ธีม"
+          create: "สร้าง"
           create_type: "ชนิด"
           create_name: "ชื่อ"
           edit: "แก้ไข"
           mobile: "โทรศัพท์"
           settings: "การตั้งค่า"
+          preview: "แสดงตัวอย่าง"
+          add_all_themes: "เพิ่มธีมทั้งหมด"
+          inactive_themes: "ธีมที่ไม่ได้ใช้งาน:"
+          and_x_more: "และอีก%{count}"
+          uploads: "อัปโหลด"
           upload: "อัปโหลด"
+          add_all: "เพิ่มทั้งหมด"
+          install: "ติดตั้ง"
           installed: "ติดตั้งแล้ว"
+          install_popular: "ยอดนิยม"
+          install_upload: "จากอุปกรณ์ของคุณ"
+          install_create: "สร้างใหม่"
           about_theme: "เกี่ยวกับ"
+          version: "เวอร์ชัน:"
+          authors: "เขียนโดย:"
+          creator: "สร้างโดย:"
           enable: "เปิดใช้งาน"
           disable: "ปิดใช้งาน"
+          updating: "กำลังอัปเดต..."
           add: "เพิ่ม"
+          theme_settings: "การตั้งค่าธีม"
+          no_settings: "ธีมนี้ไม่มีการตั้งค่า"
           scss:
             text: "CSS"
           header:
@@ -2129,7 +2610,11 @@ th:
             text: "Embedded CSS"
           head_tag:
             text: "</head>"
+          body_tag:
+            text: "</body>"
         colors:
+          title: "สี"
+          undo: "เลิกทำ"
           primary:
             name: "หลัก"
         email_style:
@@ -2199,6 +2684,7 @@ th:
             header: "Header"
       watched_words:
         clear_filter: "ล้าง"
+        download: ดาวน์โหลด
         clear_all: ล้างทั้งหมด
         actions:
           flag: "ธง"
@@ -2328,6 +2814,7 @@ th:
       site_text:
         description: "คุณสามารถปรับแต่งข้อความบนฟอรั่มของคุณได้คุณอย่าง เริ่มได้โดยการค้นหาข้างล่างนี่"
         search: "ค้นหาข้อความที่คุณต้องการแก้ไข"
+        title: "ข้อความ"
         edit: "แก้ไข"
         revert: "ย้อนกลับการแก้ไข"
         revert_confirm: "คุณแน่ใจหรือว่าจะย้อนกลับการแก้ไข"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 5467a45b7e..24402a0926 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -740,7 +740,6 @@ tr_TR:
           all: "Tümü"
           read: "Okunan"
           unread: "Okunmamış"
-        ignore_duration_title: "Zamanlayıcıyı Yoksay"
         ignore_duration_username: "Kullanıcı Adı"
         ignore_duration_when: "Süre:"
         ignore_duration_save: "Yoksay"
@@ -981,7 +980,8 @@ tr_TR:
         secondary: "İkincil E-postalar"
         primary_label: "Ana"
         update_email: "\"E-posta Adresi\"ni Değiştir"
-        ssDestroy_override_instructions: "E-posta SSO sağlayıcısından güncellenebilir."
+        sso_override_instructions: "E-posta SSO sağlayıcısından güncellenebilir."
+        no_secondary: "İkincil e-posta adresi mevcut değil"
         instructions: "Hiç kimseye gösterilmedi."
         ok: "Onaylaman için sana e-posta göndereceğiz"
         invalid: "Lütfen geçerli bir e-posta adresi gir"
@@ -2183,6 +2183,8 @@ tr_TR:
         title: "Seçili Gönderileri Birleştir"
         action: "seçili gönderileri birleştir"
         error: "Seçili gönderileri birleştirirken bir hata oluştu."
+      publish_page:
+        public: "Herkese Açık"
       change_owner:
         title: "Sahibini Değiştir"
         action: "sahipliği değiştir"
@@ -2383,7 +2385,6 @@ tr_TR:
           last: "Son revizyon"
           hide: "Düzenlemeyi gizle"
           show: "Düzenlemeyi göster"
-          revert: "Bu uyarlamaya geri dön"
           edit_wiki: "Wiki'yi düzenle"
           edit_post: "Gönderiyi düzenle"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong>%{icon}<strong>%{current}</strong>/%{total}"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 08e4b2afeb..ad474f5214 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -821,7 +821,6 @@ uk:
           all: "Усі"
           read: "Прочитані"
           unread: "Непрочитані"
-        ignore_duration_title: "Ігнорувати таймер"
         ignore_duration_username: "Ім'я користувача"
         ignore_duration_when: "Тривалість:"
         ignore_duration_save: "Ігнорувати"
@@ -1064,7 +1063,8 @@ uk:
         secondary: "Другорядна електронна пошта"
         primary_label: "основний"
         update_email: "Змінити адресу електронної пошти"
-        ssDestroy_override_instructions: "Електронну пошту можна оновити через SSO-провайдера."
+        sso_override_instructions: "Електронну пошту можна оновити через SSO-провайдера."
+        no_secondary: "Немає другорядних електронних скриньок"
         instructions: "Ніколи не показується публічно."
         ok: "Ми надішлемо Вам листа для підтвердження"
         invalid: "Будь ласка, введіть вірний email"
@@ -2335,6 +2335,8 @@ uk:
         title: "З’єднати виділені повідомлення"
         action: "З’єднати виділені повідомлення"
         error: "Сталася помилка під час з’єднання виділених повідомлень."
+      publish_page:
+        public: "Публічні"
       change_owner:
         title: "Змінити Власника"
         action: "змінити власність"
@@ -2569,7 +2571,6 @@ uk:
           last: "Остання версія"
           hide: "Приховати версію"
           show: "Показати версію"
-          revert: "Відкат до цієї версії"
           edit_wiki: "редагувати Wiki"
           edit_post: "редагувати запис"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 80986b2321..66b740db6f 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -726,7 +726,6 @@ ur:
           all: "تمام"
           read: "پڑھ لیا گیا"
           unread: "بغیر پڑھے"
-        ignore_duration_title: "ٹائمر نظر انداز کریں"
         ignore_duration_username: "صارف کا نام"
         ignore_duration_when: "دورانیہ:"
         ignore_duration_save: "نظر انداز کریں"
@@ -949,7 +948,8 @@ ur:
         secondary: "ثانوی ایمیلز"
         primary_label: "بنیادی"
         update_email: "اِی میل تبدیل کریں"
-        ssDestroy_override_instructions: "SSO پرووَائیڈر سے ایمیل کو اَپ ڈیٹ کیا جا سکتا ہے۔"
+        sso_override_instructions: "SSO پرووَائیڈر سے ایمیل کو اَپ ڈیٹ کیا جا سکتا ہے۔"
+        no_secondary: "کوئی ثانوی ایمیلز نہیں"
         instructions: "کبھی بھی عوام کو دکھایا نہیں گیا۔"
         ok: "ہم تصدیق کے لئے آپ کو اِی میل کریں گے"
         invalid: "براہ کرم، ایک قابلِ قبول ایِ میل ایڈریس درج کریں"
@@ -2119,6 +2119,8 @@ ur:
         title: "منتخب کردہ پوسٹس کو ضم کریں"
         action: "منتخب کردہ پوسٹس کو ضم کریں"
         error: "منتخب کردہ پوسٹس کو ضم کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
+      publish_page:
+        public: "عوامی"
       change_owner:
         title: "مالک تبدیل کریں"
         action: "پوسٹس کے مالک کو تبدیل کریں"
@@ -2308,7 +2310,6 @@ ur:
           last: "آخری رَوِیژن"
           hide: "رَوِیژن چھپائیں"
           show: "رَوِیژن دکھائیں"
-          revert: "اِس رَوِیژن پر واپس جائیں"
           edit_wiki: "وِیکی میں ترمیم کریں"
           edit_post: "پوسٹ میں ترمیم کریں"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index b91976dc04..e6b79954e0 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -701,7 +701,6 @@ vi:
           all: "Tất cả"
           read: "Đã đọc"
           unread: "Chưa đọc"
-        ignore_duration_title: "Bỏ qua bộ đếm giờ"
         ignore_duration_username: "Tên đăng nhập"
         ignore_duration_when: "Thời lượng:"
         ignore_duration_save: "Bỏ qua"
@@ -883,6 +882,7 @@ vi:
         secondary: "Email thứ hai"
         primary_label: "chính"
         update_email: "Thay đổi Email"
+        no_secondary: "Không có email thứ hai"
         instructions: "Không hiển thị công cộng"
         ok: "Chúng tôi sẽ gửi thư điện tử xác nhận đến cho bạn"
         invalid: "Vùi lòng nhập một thư điện tử hợp lệ"
@@ -1738,6 +1738,8 @@ vi:
           other: "Hãy chọn chủ đề bạn muốn di chuyển <b>%{count}</b> bài viết này tới."
       move_to_new_message:
         radio_label: "Tin nhắn mới"
+      publish_page:
+        public: "Công khai"
       change_owner:
         action: "chuyển chủ sở hữu"
         error: "Có lỗi xảy ra khi thay đổi quyền sở hữu của các bài viết."
@@ -1864,7 +1866,6 @@ vi:
           last: "Sửa đổi gần nhất"
           hide: "Ẩn sửa đổi"
           show: "Hiện sửa đổi"
-          revert: "Hoàn nguyên sửa đổi"
           edit_wiki: "Sửa wiki"
           edit_post: "Sửa bài đăng"
         displays:
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index dbcc164c3a..62ab7ceeec 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -730,7 +730,6 @@ zh_CN:
           all: "全部"
           read: "阅读"
           unread: "未读"
-        ignore_duration_title: "忽略计时器"
         ignore_duration_username: "用户名"
         ignore_duration_when: "持续时间："
         ignore_duration_save: "忽略"
@@ -998,7 +997,8 @@ zh_CN:
         set_primary: "设置为主邮箱"
         destroy: "删除邮箱"
         add_email: "添加次要邮箱"
-        ssDestroy_override_instructions: "电子邮件地址可以通过SSO登录来更新。"
+        sso_override_instructions: "电子邮件地址可以通过SSO登录来更新。"
+        no_secondary: "没有次邮箱"
         instructions: "绝不会被公开显示"
         ok: "将通过邮件验证确认"
         required: "请输入一个电子邮件地址"
@@ -2214,6 +2214,7 @@ zh_CN:
         publish: "出版"
         description: "当一个主题被出版为一个页面时，其链接是共享的，并且会以自定义的样式显示。"
         slug: "Slug"
+        public: "公开"
         publish_url: "你的页面已出版于："
         topic_published: "你的主题已出版于："
         preview_url: "你的页面将出版于："
@@ -2407,7 +2408,6 @@ zh_CN:
           last: "最新版"
           hide: "隐藏版本历史"
           show: "显示版本历史"
-          revert: "还原至该版本"
           edit_wiki: "编辑维基"
           edit_post: "编辑帖子"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 14dbd09b7a..c4949bb986 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -649,7 +649,6 @@ zh_TW:
           all: "全部"
           read: "已讀"
           unread: "未讀"
-        ignore_duration_title: "忽略計時器"
         ignore_duration_username: "使用者名稱"
         ignore_duration_when: "持續時間："
         ignore_duration_save: "忽略"
@@ -860,7 +859,8 @@ zh_TW:
         secondary: "次要電子郵件"
         primary_label: "一級"
         update_email: "修改電子郵件地址"
-        ssDestroy_override_instructions: "單一登入服務提供者可更新電子郵件"
+        sso_override_instructions: "單一登入服務提供者可更新電子郵件"
+        no_secondary: "無次要電子郵件"
         instructions: "不會公開顯示"
         ok: "我們將寄一封確認郵件給您。"
         invalid: "請輸入有效的電子郵件地址。"
@@ -1952,6 +1952,8 @@ zh_TW:
         title: "合併選擇的貼文"
         action: "合併選擇的貼文"
         error: "合併選擇的貼文試出錯。"
+      publish_page:
+        public: "公開"
       change_owner:
         title: "變更擁有者"
         action: "變更擁有者"
@@ -2123,7 +2125,6 @@ zh_TW:
           last: "最新版"
           hide: "隱藏修訂紀錄"
           show: "顯示修訂紀錄"
-          revert: "還原至該版本"
           edit_wiki: "編輯共筆"
           edit_post: "編輯貼文"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong>%{icon}<strong>%{current}</strong>/%{total}"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 558132320d..5c5fd2eff1 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -1013,7 +1013,6 @@ ar:
     maximum_backups: "أكبر قدر ممكن من النسخ الاحتياطي للحفاظ على القرص. يتم حذف النسخ الاحتياطية القديمة تلقائيا"
     automatic_backups_enabled: "فعل النسخ الإحتياطي التلقائي بشكل متكرر كما هو محدد."
     s3_backup_bucket: "الرفع عن بعد لإجراء نسخ إحتياطية. تحذير : تأكد من أنه رفع خاص."
-    s3_disable_cleanup: "عطل النسخ الاحتياطيه المحذوفه من S3 عندما يتم حذفها محلياً"
     backup_time_of_day: "الوقت الذي يجب ان تأخد النسخ الاحتياطية فيه."
     backup_with_uploads: "إضافة التحميلات ل النسخ الإحتياطية. إلغاء هذة الخاصية سوف تؤدي إلى أخذ نسخ إحتياطية من قاعدة البيانات فقط."
     active_user_rate_limit_secs: "كيف في كثير من الأحيان نقوم بتحديث حقل 'last_seen_at، في ثوان"
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index f37d509b95..5e6ee20aac 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -1042,7 +1042,6 @@ be:
     s3_backup_bucket: "Выдаленае вядро для захоўвання рэзервовых копій. УВАГА: Пераканайцеся, што гэта прыватнае вядро."
     s3_endpoint: "Канчатковая кропка можа быць мадыфікаваная для рэзервовага капіявання на сумяшчальную службу S3 як DigitalOcean прасторы або Minio. УВАГА: Пакіньце пустым, калі з дапамогай AWS S3."
     s3_configure_tombstone_policy: "Ўключыць аўтаматычную палітыку выдалення для загрузкі надмагільных. ВАЖНА: Калі адключана, няма месца будзе вызвалена пасля дадання будуць выдаленыя."
-    s3_disable_cleanup: "Адключыць выдаленне рэзервовых копій з S3, калі выдаляецца лакальна."
     enable_s3_inventory: "Стварэнне справаздач і праверкі загрузкі з дапамогай інвентарызацыі Amazon S3. ВАЖНА: патрабуе сапраўдныя ўліковыя дадзеныя S3 (як доступ да ключавой ідэнтыфікатар & сакрэтны ключ доступу)."
     backup_time_of_day: "Час дня UTC, калі павінна адбыцца рэзервовае капіраванне."
     backup_with_uploads: "Ўключыць загрузку ў запланаваныя аперацыі рэзервовага капіявання. Адключэнне гэтага будзе толькі рэзервовае капіраванне базы дадзеных."
@@ -1351,7 +1350,6 @@ be:
     city_for_disputes: "Горад для спрэчак"
     shared_drafts_category: "Ўключыць функцыю агульных Шашкі шляхам прызначэння катэгорыі для тэматычных праектаў. Тэмы ў гэтай катэгорыі будуць душыцца са спісу тэмы для карыстальнікаў персаналу."
     push_notifications_prompt: "Дысплей згоды карыстальніка запрашэнне."
-    push_notifications_icon: "Значок значок, які з'яўляецца ў куце паведамлення. Неабходны памер 96 × 96."
     short_title: "Кароткае назва будзе выкарыстоўвацца на хатнім экране карыстальніка, пускавы, ці ў іншых месцах, дзе прастора можа быць абмежавана. Яно павінна быць абмежавана да 12 знакаў."
     dashboard_general_tab_activity_metrics: "Выберыце справаздачы, якія будуць адлюстроўвацца ў якасці паказчыкаў актыўнасці на ўкладцы Агульныя."
     errors:
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 50b178382e..d06e89498c 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -1476,7 +1476,6 @@ ca:
     s3_backup_bucket: "Bucket remot que contindrà les còpies de seguretat. ATENCIÓ: Assegureu-vos que és un bucket privat."
     s3_endpoint: "El punt final es pot modificar per a fer còpies de seguretat en un servei compatible amb S3 com ara DigitalOcean Spaces o Minio. AVÍS: Deixeu-ho en blanc si feu servir AWS S3."
     s3_configure_tombstone_policy: "Activa la política de supressió automàtica per a càrregues 'tombstone'. IMPORTANT: si és desactivat, no es reclamarà cap espai després de suprimir les càrregues."
-    s3_disable_cleanup: "Inhabilita l'eliminació de còpies de seguretat de S3 quan s'eliminin localment."
     enable_s3_inventory: "Genera reports i verifica les càrregues de fitxers mitjançant l'inventari d'Amazon S3. IMPORTANT: Requereix credencials S3 vàlides (tant identificador de clau d'accés com clau d'accés secreta)."
     backup_time_of_day: "Hora del dia (UTC) en què s'hauria de fer la còpia de seguretat."
     backup_with_uploads: "Inclou els fitxers carregats en les còpies de seguretat planificades. Si s'inhabilita, només es farà còpia de seguretat de la base de dades."
@@ -1859,7 +1858,6 @@ ca:
     city_for_disputes: "Ciutat per a les disputes"
     shared_drafts_category: "Activa la funció 'Esborranys compartits' designant una categoria per als esborranys de tema. Els temes d'aquesta categoria seran suprimits de les llistes de temes per als usuaris de l'equip responsable."
     push_notifications_prompt: "Mostra la sol·licitud de consentiment de l'usuari."
-    push_notifications_icon: "Icona d'insígnia que apareix a la zona de notificació. La mida requerida és de 96 × 96."
     short_title: "El títol curt s'utilitzarà en la pantalla d'inici de l'usuari, en el llançador o en altres llocs on l'espai sigui limitat. Hauria de limitar-se a 12 caràcters."
     dashboard_general_tab_activity_metrics: "Trieu reports que es mostraran com a mètriques d'activitat en la pestanya general."
     errors:
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index ee4c2948be..6177e95e85 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -1485,7 +1485,6 @@ de:
     s3_backup_bucket: "Der entfernte Speicherort für Ihre Sicherungen. WARNUNG: Stellen Sie sicher, dass es sich um einen privaten Speicherort handelt."
     s3_endpoint: "Dieser Endpunkt kann so angepasst werden, dass er die Sicherung an einen S3-kompatiblen Service wie DigitalOcean Spaces oder Minio übertragt. WARNUNG: Verwende den Standard bei Verwendung von AWS S3."
     s3_configure_tombstone_policy: "Aktiviere die automatische Löschregel für Grabstein-Uploads. WICHTIG: Wenn deaktiviert, wird kein Speicherplatz freigegeben, wenn Uploads gelöscht werden."
-    s3_disable_cleanup: "Deaktiviere das Löschen von Backups aus S3 wenn sie lokal entfernt werden"
     enable_s3_inventory: "Erstelle Berichte und überprüfe Uploads mit Amazon S3-Bestand. WICHTIG: Benötigt gültige S3-Anmeldeinformationen (sowohl access_key_id als auch secret_access_key)."
     backup_time_of_day: "Uhrzeit in UTC, wenn Backups ausgeführt werden sollen."
     backup_with_uploads: "Hochgeladene Dateien bei geplanten Backups mit einbeziehen. Wenn diese Einstellung deaktiviert ist, wird nur die Datenbank gesichert."
@@ -1873,7 +1872,6 @@ de:
     city_for_disputes: "Stadt für Rechtsstreitigkeiten"
     shared_drafts_category: "Aktiviere die Funktion „Gemeinsame Vorlagen“, indem du eine Kategorie für Themen-Vorlagen bestimmst. Themen in dieser Kategorie werden unterdrückt in der Themen Liste für Team Mitarbeiter."
     push_notifications_prompt: "Zeige eine Aufforderung zur Benutzerzustimmung an."
-    push_notifications_icon: "Das Abzeichen-Icon, das in der Benachrichtigungsecke erscheint. Erforderliche Größe ist 96 × 96."
     short_title: "Der Kurztitel wird beim Benutzer auf dem Startbildschirm, Startmenü oder an anderen Stellen mit begrenztem Platz verwendet. Er sollte auf 12 Zeichen begrenzt sein."
     dashboard_general_tab_activity_metrics: "Wähle Berichte, die als Aktivitätsmetrik auf dem Allgemein-Tab angezeigt werden."
     errors:
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index ef7114fa12..d4fa7e1db7 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -971,7 +971,6 @@ el:
     maximum_backups: "Το μέγιστο ποσό αντιγράφων ασφαλείας το οποία θα διατηρηθούν στο δίσκο. Παλαιότερα αντίγραφα ασφαλείας διαγράφονται αυτόματα"
     automatic_backups_enabled: "Πάρε αυτόματα αντίγραφα ασφαλείας όπως ορίζεται στη συχνότητα αντιγράφων ασφαλείας"
     s3_backup_bucket: "Απομακρυσμένος αποθηκευτικός χώρος για τα αντίγραφα ασφαλείας. ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Βεβαιωθείτε οτι ο χώρος είναι προσωπικός."
-    s3_disable_cleanup: "Απενεργοποιήστε την αφαίρεση των αντιγράφων ασφαλείας από το S3 όταν αφαιρεθούν τοπικά"
     backup_time_of_day: "Ώρα σε ζώνη UTC που το αντίγραφο ασφαλείας πρέπει να πραγματοποιηθεί."
     backup_with_uploads: "Συμπεριέλαβε τις μεταφορτώσεις στα αντίγραφα ασφαλείας. Απενεργοποιώντας το θα δημιουργηθούν αντίγραφα ασφαλείας μόνο για τη βάση δεδομένων."
     active_user_rate_limit_secs: "Πόσο συχνά ενημερώνουμε το 'last_seen_at' πεδίο, σε δευτερόλεπτα"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 7df8f1eb43..fa1734d860 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -1529,7 +1529,6 @@ es:
     s3_backup_bucket: "El bucket remoto para mantener copias de respaldo. AVISO: Asegúrate de que es un bucket privado."
     s3_endpoint: "El endpoint se puede modificar para realizar una copia de respaldo en un servicio compatible con S3 como DigitalOcean Spaces o Minio. ADVERTENCIA: dejar en blanco si usas AWS S3."
     s3_configure_tombstone_policy: "Habilitar la política de eliminación automática para cargas tombstone. IMPORTANTE: si está deshabilitado, no se reclamará ningún espacio después de eliminar las cargas."
-    s3_disable_cleanup: "Desactivar el eliminado de respaldos de S3 cuando se eliminen de forma local."
     enable_s3_inventory: "Generar informes y verificar las cargas utilizando el inventario de Amazon S3. IMPORTANTE: requiere credenciales S3 válidas (tanto la clave de acceso como la clave de acceso secreta)."
     backup_time_of_day: "Hora UTC del día cuando debería ejecutarse el respaldo."
     backup_with_uploads: "Incluir archivos subidos en los respaldos programados. Si esta opción está deshabilitada, tan solo se ejecutará una copia de respaldo de la base de datos."
@@ -1928,7 +1927,6 @@ es:
     city_for_disputes: "Ciudad de disputas"
     shared_drafts_category: "Habilite la característica de borradores compartidos designando una categoría para borradores de temas. Los temas de esta categoría se eliminarán de las listas de temas para los miembros del staff."
     push_notifications_prompt: "Mostrar aviso del consentimiento del usuario."
-    push_notifications_icon: "El icono de la medalla que aparece en la esquina de notificación. El tamaño requerido es de 96 × 96."
     short_title: "El título corto se utilizará en la pantalla de inicio del usuario, el iniciador u otros lugares donde el espacio puede ser limitado. Debe limitarse a 12 caracteres."
     dashboard_general_tab_activity_metrics: "Selecciona los reportes que se muestran como medidas de actividad en la pestaña general."
     gravatar_name: "Nombre del proveedor de Gravatar"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index d53b594cc3..e83a16a5ec 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -958,7 +958,6 @@ fa_IR:
     maximum_backups: "حداکثر تعداد پشتیبان برای نگه داری بر روی دیسک. نسخه های پشتیبان قدیمی بطور خودکار پاک شده است"
     automatic_backups_enabled: "فعالسازی پشتیبان‌گیری خودکار در بازه زمانی مشخص"
     s3_backup_bucket: "میزبان راه‌دور برای نگهداری از نسخه‌های پشتیبان. اخطار: مطمئن شوید که میزبان خصوصی است. "
-    s3_disable_cleanup: "غیر‌فعال‌سازی حذف نسخه پشتیبان از S3 وقتی در هاست حذف می‌شود."
     backup_time_of_day: "زمان UTC روز برای رخ دادن نسخه پشتیبان."
     backup_with_uploads: "قراردادن فایل های بارگذاری شده در نسخه های پشتیبان. غیر فعال کردن این بخش باعث تهیه نسخه پشتیبان از دیتابیس می‌شود."
     active_user_rate_limit_secs: "چگونه فیلد 'last_seen_at' را به روز کنیم، واحد ثانیه "
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 9fed9fbcf1..c624456a0c 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -1517,7 +1517,6 @@ fi:
     s3_backup_bucket: "Amazon S3 bucket johon varmuuskopiot ladataan. VAROITUS: Varmista, että se on yksityinen."
     s3_endpoint: "Kohdeasemaksi voidaan vaihtaa muu S3-yhteensopiva palvelu kuten DigitalOcean Spaces tai Minio. VAROITUS: Jätä tyhjäksi, jos käytät AWS S3:a."
     s3_configure_tombstone_policy: "Ota käyttöön tombstone-hakemiston automaattinen tyhjennys.  TÄRKEÄÄ: Jos ei käytössä, tilaa ei vapaudu kun ladattuja tiedostoja poistetaan."
-    s3_disable_cleanup: "Älä poista varmuuskopiota S3:sta, kun se poistetaan paikallisesti."
     backup_time_of_day: "UTC-kellonaika, jolloin varmuuskopio tehdään."
     backup_with_uploads: "Sisällytä lataukset ajastettuihin varmuuskopioihin. Jos tämä on pois käytöstä, vain tietokanta varmuuskopioidaan."
     backup_location: "SIjainti, jonne varmuuskopiot säilötään. TÄRKEÄÄ: S3 vaatii toimiakseen, että käyvät S3-käyttöoikeustiedot on syötetty Tiedostot-asetuksiin."
@@ -1894,7 +1893,6 @@ fi:
     city_for_disputes: "Kaupunki jonka oikeudessa riidat ratkotaan"
     shared_drafts_category: "Ota käyttöön jaetut luonnokset -toiminto määrittämällä alue, joka on ketjuluonnoksille varattu. Alueen ketjut eivät näy ketjulistauksissa henkilökunnankaan jäsenille."
     push_notifications_prompt: "Näytä käyttäjäsuostumuspyyntö."
-    push_notifications_icon: "Kuvakemerkki, joka näkyy ilmoituksen kulmassa. Vaadittu koko on 96×96."
     short_title: "Lyhyttä nimeä käytetään käyttäjän kotiruudussa (home screen), käynnistyssovelluksissa (launcher) ja muissa tilanteissa, joissa tilaa on rajallisesti. Sen tulisi olla enintään 12 merkin pituinen."
     dashboard_general_tab_activity_metrics: "Valitse raportit, jotka näytetään aktiivisuusmittareina Yleistä-välilehdellä."
     errors:
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index c3307fe0dd..eb7eca62d8 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -1548,7 +1548,6 @@ fr:
     s3_backup_bucket: "Bucket distant qui contiendra les sauvegardes. ATTENTION : vérifiez que le bucket est privé."
     s3_endpoint: "La destination peut être modifiée pour envoyer les sauvegardes vers un service compatible avec S3, par exemple DigitalOcean Spaces ou Minio. ATTENTION : laisser vide si vous utilisez AWS S3."
     s3_configure_tombstone_policy: "Activer la suppression automatique des fichiers non utilisés. IMPORTANT : en cas de désactivation, aucun espace disque ne sera récupéré après la suppression des fichiers."
-    s3_disable_cleanup: "Désactiver la suppression des sauvegardes sur S3 lorsqu'elles sont supprimées localement."
     enable_s3_inventory: "Générer des rapports et vérifier les envois avec l'inventaire Amazon S3. IMPORTANT : nécessite un accès valide à S3 (l'identifiant et la clé secrète). "
     backup_time_of_day: "Heure (UTC) de planification de la sauvegarde."
     backup_with_uploads: "Inclure les fichiers envoyés dans les sauvegardes. Si désactivé, seule la base de données sera sauvegardée."
@@ -1887,6 +1886,7 @@ fr:
     returning_user_notice_tl: "Niveau de confiance minimum requis pour voir les avis postés par les utilisateurs revenant."
     returning_users_days: "Combien de jours doivent s'écouler avant qu'un utilisateur soit considéré comme étant de retour."
     enable_page_publishing: "Autorisez les responsables de publier des sujets vers de nouvelles URL utilisant leur propre style."
+    show_published_pages_login_required: "Les utilisateurs anonymes peuvent voir les pages publiées même quand la connexion est nécessaire."
     default_email_digest_frequency: "Par défaut, à quelle fréquence les utilisateurs reçoivent les résumés par courriel."
     default_include_tl0_in_digests: "Par défaut, inclure les messages des nouveaux utilisateurs dans les résumés par courriel. Les utilisateurs peuvent changer cela dans leurs préférences."
     default_email_level: "Définissez le niveau de notification courriel par défaut pour les sujets standards."
@@ -1946,7 +1946,7 @@ fr:
     city_for_disputes: "Ville pour les litiges"
     shared_drafts_category: "Activez la fonction Brouillons partagés en désignant une catégorie pour les brouillons de sujet. Les sujets dans cette catégorie ne figureront pas dans les listes de sujets pour les responsables."
     push_notifications_prompt: "Afficher la demande de consentement de l'utilisateur"
-    push_notifications_icon: "L'icône du badge qui apparaît dans les notifications. Taille requise : 96 x 96."
+    push_notifications_icon: "L'icône du badge qui apparaît dans les notifications. Une image monochrome de taille 96×96 et au format PNG avec transparence est recommandée."
     short_title: "Le titre court sera utilisé sur l'écran d'accueil de l'utilisateur, le lanceur d'applications ou d'autres endroits où la place disponible est limitée. Il devrait être limité à 12 caractères."
     dashboard_hidden_reports: "Permettre de masquer les rapports du tableau de bord."
     dashboard_visible_tabs: "Choisissez les onglets visibles sur le tableau de bord."
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index b5d1e339ac..7443c62477 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -20,17 +20,68 @@ gl:
     <<: *datetime_formats
   time:
     <<: *datetime_formats
+    am: "am"
+    pm: "pm"
   title: "Discourse"
   topics: "Temas"
   posts: "publicacións"
-  loading: "Cargndo"
+  loading: "Cargando"
+  powered_by_html: 'Con tecnoloxía de <a href="https://www.discourse.org">Discourse</a>, vese mellor con Java habilitado'
   sign_up: "Crear unha conta"
   log_in: "Iniciar sesión"
   submit: "Enviar"
+  purge_reason: "Conta eliminada automaticamente por abandono; conta desactivada"
+  disable_remote_images_download_reason: "Habilitouse a descarga remota de imaxes por non haber espazo suficiente no disco."
   anonymous: "Anónimo"
+  remove_posts_deleted_by_author: "Eliminada polo autor"
+  redirect_warning: "Non puidemos verificar que a ligazón que seleccionaches está publicada agora mesmo no foro. Se queres continuar igualmente, selecciona a seguinte ligazón."
+  on_another_topic: "Noutro tema"
+  themes:
+    bad_color_scheme: "Non se pode actualizar o tema; paleta de cores non válida"
+    other_error: "Algo foi mal ao actualizar o tema"
+    compile_error:
+      unrecognized_extension: "Extensión de ficheiro non recoñecida: %{extension}"
+    import_error:
+      generic: Produciuse un erro mentres se importaba este tema
+      about_json: "Erro importante: about.json non existe ou non é válido. Tes a certeza que este é un tema de Discourse?"
+      about_json_values: "about.json contén valores non válidos: %{errors}"
+      modifier_values: "os modificadores about.json coteñen valores non válidos: %{errors}"
+      git: "Erro ao clonar o repositorio git; o acceso está denegado ou non se atopou o repositorio"
+      unpack_failed: "Erro ao descomprimir o ficheiro"
+      file_too_big: "O ficheiro sen comprimir é demasiado grande."
+      unknown_file_type: "O ficheiro que cargaches non semella ser un tema válido de Discourse."
+    errors:
+      component_no_user_selectable: "Os compoñentes do tema non poden ser seleccionados polo usuario"
+      component_no_default: "Os compoñentes do tema non poden ser o tema predefinido"
+      component_no_color_scheme: "Os compoñenetes do tema non poden ter paletas de cores"
+    settings_errors:
+      invalid_yaml: "O YAML proporcionado non é válido."
+      name_too_long: "Hai un axuste cun nome demasiado longo; a lonxitude máxima é de 255 caracteres"
+      default_value_missing: "O axuste '%{name}' non ten un valor predefinido"
+      number_value_not_valid: "O novo valor no nestá dentro do rango permitido."
+      number_value_not_valid_min_max: "Debe ser entre %{min} e %{max}."
+      number_value_not_valid_min: "Debe ser maior ou igual que %{min}."
+      number_value_not_valid_max: "Debe ser menor ou igual que %{max}."
+      string_value_not_valid: "A lonxitude do novo valor non está no intervalo permitido."
+      string_value_not_valid_min_max: "Debe ter entre %{min} e %{max} caracteres de lonxitude."
+      string_value_not_valid_min: "Debe ter ao menos %{min} caracteres."
+      string_value_not_valid_max: "Debe ter un máximo de %{max} caracteres."
+    locale_errors:
+      invalid_yaml: "YAML de tradución non válido"
+  emails:
+    incoming:
+      default_subject: "Este tema necesita un título"
+      show_trimmed_content: "Mostrar contido recortado"
+      maximum_staged_user_per_email_reached: "Alcanzouse o número máximo de usuarios creados por correo electrónico."
+      no_subject: "(sen asunto)"
+      no_body: "(sen mensaxe)"
+      missing_attachment: "(falta o ficheiro anexo %{filename})"
+      unrecognized_error: "Erro non recoñecido"
   errors: &errors
     format: "%{attribute} %{message}"
+    format_with_full_message: "<b>%{attribute}</b>: %{message}"
     messages:
+      too_long_validation: "Límite de %{max} caracteres; inseriches %{length}."
       taken: "xa está en uso"
       accepted: debe ser aceptado
       blank: non pode quedar baleiro
@@ -44,60 +95,234 @@ gl:
       has_already_been_used: "xa está en uso"
       inclusion: no está incluído na lista
       invalid: é incorrecto
+      is_invalid: "parece pouco claro, é unha oración completa?"
+      invalid_timezone: "'%{tz}' non é un fuso horario válido"
+      contains_censored_words: "contén as seguintes palabras censuradas: %{censored_words}"
       less_than: "debe ser menor de %{count}"
       less_than_or_equal_to: "debe ser igual ou menor de %{count}"
       not_a_number: non é un número
       not_an_integer: debe ser un enteiro
       odd: debe ser impar
       record_invalid: "Fallou a validación: %{errors}"
+      max_emojis: "non pode ter máis de %{max_emojis_count} emojis"
+      emojis_disabled: "non pode ter emojis"
+      ip_address_already_screened: "xa está incluído nunha regra existente"
       restrict_dependent_destroy:
-        one: "Non é posíbel eliminalo porque existe outro %{record} dependente"
-        many: "Non é posíbel eliminalo porque existen outros %{record} dependentes"
+        one: "Non é posible eliminalo porque existe outro %{record} dependente"
+        many: "Non é posible eliminalo porque existen outros %{record} dependentes"
       too_long:
         one: demasiado longo (máximo un caracterer)
         other: demasiado longo (máximo %{count} caracteres)
       too_short:
         one: demasiado curto (mínimo un caracter)
         other: demasiado curto (mínimo %{count} caracteres)
+      wrong_length:
+        one: ten unha lonxitude incorrecta (debería ser de %{count} caracter)
+        other: ten unha lonxitude incorrecta (debería ser de %{count} caracteres)
       other_than: "debe ser distinto de %{count}"
+      sso_overrides_username: "O nome de usuario ten que actualizarse do lado do provedor SSO, dado que o axuste `sso_overrides_username` está activado."
     template:
       body: "Producíronse problemas cos seguintes campos:"
+      header:
+        one: "%{count} erro impediu gardar este %{model}"
+        other: "%{count} erros impediron gardar este %{model}"
     embed:
       load_from_remote: "Produciuse un erro cargando esta publicación."
+    site_settings:
+      invalid_category_id: "Especificaches unha categoría que non existe"
+      default_categories_already_selected: "Non podes seleccionar unha categoría utilizada noutra listaxe."
+      default_tags_already_selected: "Non podes seleccionar unha etiqueta utilizada noutra listaxe."
+      s3_upload_bucket_is_required: "Non se poden activar as cargas a S3 a menos que proporciones un valor 's3_upload_bucket'."
+      enable_s3_uploads_is_required: "Non podes activar o inventario en S3 a menos que actives as cargas en S3."
+      s3_backup_requires_s3_settings: "Non podes utilizar S3 como localización da copia de seguranza a menos que proporcionaras '%{setting_name}'."
+      s3_bucket_reused: "Non podes utilizar o mesmo depósito (bucket) para 's3_upload_bucket' e 's3_backup_bucket'. Elixe un depósito diferente ou utiliza un camiño distinto para cada un deles."
+      secure_media_requirements: "Débese habilitar a carga de S3 antes de habilitar medios seguros."
+      second_factor_cannot_be_enforced_with_disabled_local_login: "Non podes aplicar 2FA se os inicios de sesión locais estás deshabilitados."
+      local_login_cannot_be_disabled_if_second_factor_enforced: "Non podes deshabilitar o inicio de sesión local se se aplica 2FA. Deshabilita 2FA antes de deshabilitar os inicios de sesión locais."
+      cannot_enable_s3_uploads_when_s3_enabled_globally: "Non podes habilitar as cargas S3 porque xa están habilitadas globalmente e habilitar este nivel de sitio podería provocar problemas críticos coas cargas."
+    conflicting_google_user_id: 'A ID de Google para esta conta cambiou; requírese a intervención do equipo por razóns de seguridade. Contacta con el e envíalle esta referencia <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   activemodel:
     errors:
       <<: *errors
+  invite:
+    not_found: "O teu código de invitación non é válido. <a href='%{base_url}/about'>Contacta co noso equipo</a>."
+    not_found_json: "O teu  código de invitación non é válido. Contacta co noso equipo."
+    not_found_template: |
+      <p>A túa invitación a <a href="%{base_url}">%{site_name}</a> xa foi aceptada.</p>
+
+      <p>Se lembras o teu contrasina, podes <a href="%{base_url}/login">iniciar sesión.</p>
+
+      <p>Se non é así, </a>restablece o contrasinal</a>.</p>
+    error_message: "Houbo un erro ao aceptar a invitación. Contacta co administrador do sitio."
+    user_exists: "Non necesitas invitar a <b>%{email}</b>, pois <a href='%{base_path}/u/%{username}/summary'>xa teñen unha conta!</a>"
+    confirm_email: "<p>Xa case está! Enviámosche un correo de activación ao teu enderezo electrónico. Sigue as instrucións para activar a túa conta.</p><p>Se non che chega, comprobar o cartafol de correo lixo.</p>"
+  bulk_invite:
+    file_should_be_csv: "O ficheiro cargado debe ter o formato CSV."
+    max_rows: "As primeiras %{max_bulk_invites} invitacións xa foron enviadas. Tenta dividir o ficheiro en partes máis pequenas."
+    error: "Houbo un erro ao cargar o ficheiro. Téntao máis tarde."
+  invite_link:
+    email_taken: "Este correo electrónico xa está en uso. Se xa tes unha conta, inicia sesión ou restablece o contrasinal."
+    max_redemptions_limit: "debería estar entre 2 e %{max_limit}."
+  topic_invite:
+    failed_to_invite: "O usuario non pode ser invitado a este tema por non ser membro de ningún destes grupos: %{group_names}."
+    user_exists: "Este usuario xa foi invitado. Só se pode invitar a un usuario a un tema unha única vez."
+  backup:
+    operation_already_running: "Estase a executar unha operación. Nestes intres non se pode iniciar un novo traballo."
+    backup_file_should_be_tar_gz: "O ficheiro da copia de seguranza debe ter formato .tar.gz."
+    not_enough_space_on_disk: "Non hai suficiente espazo no disco para cargar a copia de seguranza."
+    invalid_filename: "O nome do ficheiro da copia de seguranza contén caracteres non válidos. Os caracteres que se admiten son a-z e 0-9."
+    file_exists: "O ficheiro que estás tentando subir xa existe."
+    location:
+      local: "Local"
+      s3: "Amazon S3"
+  invalid_params: "Proporcionaches parámetros non válidos para a solicitude: %{message}"
   not_logged_in: "Debes iniciar sesión para facer iso."
   not_found: "Non foi posíbel atopar o recurso ou URL solicitado."
   invalid_access: "Non se che permite ver o recurso solicitado."
+  authenticator_not_found: "O método de verificación non existe ou foi deshabilitado."
+  invalid_api_credentials: "Non tes permiso para ver o recurso solicitado. O nome de usuario API ou a chave non é válida."
+  provider_not_enabled: "Non tes permiso para ver o recurso solicitado. O provedor de autenticación non está habilitado."
+  provider_not_found: "Non tes permiso para ver o recurso solicitado. O provedor de autenticación non existe."
   read_only_mode_enabled: "O sitio está en modo só-lectura. As interaccións están desactivadas."
+  email_template_cant_be_modified: "Este modelo de correo electrónico non pode ser modificado."
+  not_in_group:
+    title_topic: "Debes estar no grupo para ver este tema."
+    title_category: "Debes estar no grupo para ver esta categoría."
+    request_membership: "Solicitar ser membro"
+    join_group: "Unirse ao grupo"
+  deleted_topic: "Vaites! Este tema foi eliminado e xa non está dispoñible."
+  delete_topic_failed: "Houbo un erro ao eliminar este tema. Contacta co administrador do sitio."
   reading_time: "Tempo de lectura"
   likes: "Gústames"
+  too_many_replies:
+    one: "Sentímolo, mais os novos usuarios teñen temporalmente o límite de %{count} respostas no mesmo tema."
+    other: "Sentímolo, mais os novos usuarios teñen temporalmente un límite de %{count} resposta no mesmo tema."
+  max_consecutive_replies:
+    one: "Non se permiten respostas consecutivas. Edita a túa resposta anterior ou agarda a que alguén che responda."
+    other: "Non se permiten máis de %{count} respostas consecutivas. Edita a túa resposta anterior ou agarda a que alguén che responda."
   embed:
-    start_discussion: "Comezar a discusión"
-    continue: "Continuar a discusión"
+    start_discussion: "Comezar discusión"
+    continue: "Continuar discusión"
+    error: "Erro ao inserir"
+    referer: "Referente:"
+    error_topics: "A configuración do sitio 'listaxe de temas inseridos' non está activada"
+    mismatch: "O referente non se enviou ou non coincide con ningún dos seguintes hosts:"
+    configure: "Configurar inserción"
     more_replies:
       one: "Unha resposta máis"
       other: "%{count} respostas máis"
-    loading: "Cargando a discusión..."
+    loading: "Cargando discusión..."
     permalink: "Ligazón permanente"
+    imported_from: "Este é un tema de discusión derivado da entrada %{link}"
     in_reply_to: "▶ %{username}"
+    replies:
+      one: "%{count} resposta"
+      other: "%{count} repostas"
+    likes:
+      one: "%{count} gústame"
+      other: "%{count} gústames"
+    last_reply: "Última resposta"
     created: "Creado"
-  no_mentions_allowed: "Sentímolo pero non podes mencionar outros usuarios"
+    new_topic: "Crear novo tema"
+  no_mentions_allowed: "Sentímolo, mais non podes mencionar outros usuarios."
+  too_many_mentions:
+    one: "Sentímolo, pero só podes mencionar un outro usuario nunha publicación."
+    other: "Sentímolo, mais non podes mencionar %{count} usuarios nunha publicación."
+  no_mentions_allowed_newuser: "Sentímolo, mais os novos usuarios non poden mencionar a outros."
+  too_many_mentions_newuser:
+    one: "Sentímolo, mais os novos usuarios só poden mencionar un usuario nunha publicación."
+    other: "Sentímolo, mais os novos usuarios só poden mencionar a %{count} usuarios nunha publicación."
+  no_images_allowed_trust: "Sentímolo, mais non podes poñer imaxes nunha publicación."
+  no_images_allowed: "Sentímolo, mais os novos usuarios non poden poñer imaxes nas publicacións."
+  too_many_images:
+    one: "Sentímolo, mais os novos usuarios só poden poñer unha imaxe nunha publicación."
+    other: "Sentímolo, mais os novos usuarios só poden poñer %{count} imaxes nunha publicación."
+  no_attachments_allowed: "Sentímolo, mais os novos usuarios non poden anexar ficheiros nas publicacións."
+  too_many_attachments:
+    one: "Sentímolo, mais os novos usuarios só poden anexar un ficheiro nunha publicación."
+    other: "Sentímolo, mais os novos usuarios só poden anexar %{count} ficheiros nunha publicación."
+  no_links_allowed: "Sentímolo, mais os novos usuarios non poden poñer ligazóns nas publicacións."
+  links_require_trust: "Sentímolo, non podes incluír ligazóns nas túas publicacións."
+  too_many_links:
+    one: "Sentímolo, mais os novos usuarios só poden poñer unha ligazón nunha publicación."
+    other: "Sentímolo, mais os novos usuarios só poden poñer %{count} ligazóns nunha publicación."
+  contains_blocked_word: "A túa publicación contén unha palabra que non está permitida: %{word}"
+  contains_blocked_words: "A túa publicación contén varias palabras que non están permitidas: %{words}"
+  spamming_host: "Sentímolo, non podes publicar unha ligazón a ese sitio."
+  user_is_suspended: "Aos usuarios suspendidos non se lles permite publicar."
+  topic_not_found: "Algo foi mal. Talvez este tema foi pechado ou eliminado mentres o estabas a mirar?"
+  not_accepting_pms: "Sentímolo, %{username} non acepta mensaxes neste momento."
+  max_pm_recipients: "Sentímolo, podes enviar mensaxes a un máximo de %{recipients_limit} destinatarios."
+  pm_reached_recipients_limit: "Sentímolo, non podes ter máis de %{recipients_limit} destinatarios nunha mensaxe."
+  just_posted_that: "é moi semellante ao que xa publicaches recentemente."
   invalid_characters: "contén caracteres incorrectos"
+  is_invalid: "parece pouco claro, é unha oración completa?"
   next_page: "páxina seguinte →"
   prev_page: "← páxina anterior"
   page_num: "Páxina %{num}"
   home_title: "Inicio"
+  topics_in_category: "Temas na categoría '%{category}'"
   rss_posts_in_topic: "Fonte RSS de '%{topic}»"
+  rss_topics_in_category: "Fonte RSS dos temas na categoría '%{category}'"
+  rss_num_posts:
+    one: "%{count} publicación"
+    other: "%{count} publicacións"
+  rss_num_participants:
+    one: "%{count} participante"
+    other: "%{count} participantes"
   read_full_topic: "Ler todo o tema"
   private_message_abbrev: "Msx."
   rss_description:
     latest: "Últimos temas"
+    top: "Temas destacados"
+    top_all: "Todos os temas destacados"
+    top_yearly: "Temas destacados do ano"
+    top_quarterly: "Temas destacados do trimestre"
+    top_monthly: "Temas destacados do mes"
+    top_weekly: "Temas destacados da semana"
+    top_daily: "Temas destacados do día"
     posts: "Últimas publicacións"
-  too_late_to_edit: "Esta publicación ten moito tempo. Xa non se pode modificar nin eliminar."
+    private_posts: "Últimas mensaxes privadas"
+    group_posts: "Últimas publicacións de %{group_name}"
+    group_mentions: "Últimas mencións de %{group_name}"
+    user_posts: "Últimas publicacións de @%{username}"
+    user_topics: "Últimos temas de @%{username}"
+    tag: "Temas etiquetados"
+  too_late_to_edit: "Esta publicación é de hai moito tempo. Xa non se pode modificar nin eliminar."
+  edit_conflict: "Esta publicación foi editada por outro usuario e os teus cambios non se poden gardar."
+  revert_version_same: "A versión actual é a mesma que a versión á que tentas volver."
   excerpt_image: "imaxe"
+  bookmarks:
+    errors:
+      already_bookmarked_post: "Non podes gardar a mesma publicación nos marcadores dúas veces."
+      cannot_set_past_reminder: "Non podes establecer un recordatorio de marcador no pasado."
+      cannot_set_reminder_in_distant_future: "Non podes establecer un recordatorio de marcador máis de 10 anos cara ao futuro."
+      time_must_be_provided: "o período debe ser facilitado para todos os recordatorios"
+    reminders:
+      at_desktop: "A vindeira vez que estea no meu ordenador"
+      later_today: "Hoxe, máis tarde"
+      next_business_day: "O vindeiro día laborable"
+      tomorrow: "Mañá"
+      next_week: "A vindeira semana"
+      next_month: "O vindeiro mes"
+      custom: "Personalizar data e hora"
   groups:
+    success:
+      bulk_add:
+        one: "%{count} usuario foi engadido ao grupo."
+        other: "%{count} usuarios foron engadidos ao grupo."
+    errors:
+      grant_trust_level_not_valid: "'%{trust_level}' non é un nivel de confianza válido."
+      can_not_modify_automatic: "Non podes modificar un grupo automático"
+      member_already_exist:
+        one: "'%{username}' xa é membro deste grupo."
+        other: "Os seguintes usuarios xa son membros deste grupo: %{username}"
+      invalid_domain: "'%{domain}' non é un dominio válido."
+      invalid_incoming_email: "'%{email}' non é un enderezo electrónico válido."
+      email_already_used_in_group: "'%{email}' xa está en uso polo grupo '%{group_name}'."
+      email_already_used_in_category: "'%{email}' xa está en uso pola categoría '%{category_name}'."
+      cant_allow_membership_requests: "Non podes permitir solicitudes para ser membros de grupos que carecen de propietario."
+      already_requested_membership: "Xa solicitaches ser membro deste grupo. "
     default_names:
       everyone: "todos"
       admins: "administradores"
@@ -108,10 +333,59 @@ gl:
       trust_level_2: "nivel_de_confianza_2"
       trust_level_3: "nivel_de_confianza_3"
       trust_level_4: "nivel_de_confianza_4"
+    request_membership_pm:
+      title: "Solicitude de ser membro para @%{group_name}"
+    request_accepted_pm:
+      title: "Aceptouse a túa solicitude para  @%{group_name}"
+      body: |
+        A túa solicitude para entrar no grupo @%{group_name} foi aceptada e agora xa es membro.
+    view_hidden_topic_request_reason: "Gustaríame unirme ao grupo '%{group_name}' para poder acceder a [este tema](%{topic_url})"
   education:
     until_posts:
-      one: "Unha publicación"
+      one: "%{count} publicación"
       other: "%{count} publicacións"
+    "new-topic": |
+      Benvido/a a %{site_name} &mdash; **grazas por iniciares unha nova conversa!**
+
+      - Se o les en voz alta, soa ben o seu título? É un bo resumo do que trata?
+
+      - Quen terá interese por ler isto? Por que é importante? A que tipo de respostas queres dar pé?
+
+      - Inclúe palabras de uso frecuente no teu tema para facilitar que poida ser atopado. Para agrupalo con outros temas relacionados, selecciona unha categoría.
+
+      Para máis información, [visita as nosas guías para a comunidade](%{base_path}/guidelines). Este panel só aparecerá nas túas %{education_posts_text} primeiras publicacións.
+    "new-reply": |
+      Benvido/a a %{site_name} &mdash; **grazas pola túa contribución!**
+
+      - Dalgún xeito a túa resposta mellora a conversa?
+
+      - Sé amable cos demais membros da comunidade.
+
+      - A crítica construtiva é benvida, mais lembra criticar as ideas non as persoas.
+
+      Para máis información, [visita as nosas guías para a comunidade](%{base_path}/guidelines). Este panel só aparecerá nas túas %{education_posts_text} primeiras publicacións.
+    avatar: |
+      ### Que tal se lle engades unha imaxe á túa conta?
+
+      Xa publicaches uns cantos temas e respostas, mais a túa imaxe de perfil non é única coma ti; é simplemente unha letra.
+
+      Pensaches na posibilidade de **[visitar o teu perfil de usuario](%{profile_path})** e subir unha imaxe que te represente?
+
+      É máis fácil seguir debates e atopar xente interesante nas conversas cando cadaquén ten unha imaxe de perfil individualizada!
+    sequential_replies: |
+      ### Considera a posibilidade de responder varias publicación a un tempo
+
+      No canto de publicares varias respostas seguidas nun mesmo tema, pensa na opción de dar unha única resposta que inclúa citas de respostas anteriores ou mencións a outros @usuarios.
+
+      Podes editar a tú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: |
+      ### Permite que máis xente se una á conversa
+
+      Parece claro que este tema che importa &ndash; publicaches máis do %{percent}% das respostas.
+
+      Aínda podería ser mellor se lles deses espazo a outras persoas para compartiren o seu punto de vista. Que tal se as convidas?
   activerecord:
     attributes:
       category:
@@ -154,6 +428,9 @@ gl:
     topic_prefix: "Sobre a categoría %{category}"
     errors:
       depth: "Non podes aniñar unha subcategoría dentro doutra"
+      invalid_email_in: "'%{email}' non é un enderezo electrónico válido."
+      email_already_used_in_group: "'%{email}' xa está en uso polo grupo '%{group_name}'."
+      email_already_used_in_category: "'%{email}' xa está en uso pola categoría '%{category_name}'."
   trust_levels:
     newuser:
       title: "novo usuario"
@@ -206,6 +483,8 @@ gl:
       half_a_minute: "agora mesmiño"
       less_than_x_seconds: "agora mesmiño"
   password_reset:
+    choose_new: "Elixir un novo contrasinal"
+    choose: "Elixir un contrasinal"
     update: "Actualizar contrasinal"
     save: "Estabelecer o contrasinal"
     title: "Contrasinal restabelecido"
@@ -268,6 +547,8 @@ gl:
       every_hour: "cada hora"
       daily: "diariamente"
       weekly: "semanalmente"
+      every_month: "cada mes"
+      every_six_months: "cada seis meses"
   user_api_key:
     otp_confirmation:
       confirm_title: "Continuar a %{site_name}"
@@ -284,9 +565,13 @@ gl:
     user_flagging_ratio:
       labels:
         user: Usuario
+        score: Puntuación
     moderators_activity:
       labels:
         moderator: Moderador
+    flags_status:
+      labels:
+        flag: Tipo
     visits:
       title: "Visitas de usuarios"
       xaxis: "Día"
@@ -336,11 +621,19 @@ gl:
       xaxis: "Nivel de confianza"
       yaxis: "Número de usuarios"
     users_by_type:
+      xaxis: "Tipo"
       yaxis: "Número de usuarios"
+      labels:
+        type: Tipo
       xaxis_labels:
         admin: Administración
         moderator: Moderador
         suspended: Suspendido
+        silenced: Silenciado
+    trending_search:
+      labels:
+        term: Termo
+        searches: Buscas
     emails:
       title: "Correos-e enviados"
       xaxis: "Día"
@@ -428,8 +721,10 @@ gl:
     time_to_first_response:
       xaxis: "Día"
     topics_with_no_response:
+      title: "Temas sen resposta"
       xaxis: "Día"
       yaxis: "Total"
+      description: "Número de temas novos que non recibiron resposta."
     mobile_visits:
       xaxis: "Día"
       yaxis: "Número de visitas"
@@ -468,6 +763,7 @@ gl:
     types:
       category: "Categorías"
       user: "Usuarios"
+    results_page: "Buscar resultados para '%{term}'"
   original_poster: "Publicador orixinal"
   most_recent_poster: "Publicador máis recente"
   frequent_poster: "Publicador frecuente"
@@ -478,9 +774,16 @@ gl:
       blank: "non pode quedar baleiro"
       invalid: "contén caracteres incorrectos"
   login:
+    security_key_alternative: "Tentalo doutro xeito"
+    not_approved: "A túa conta non foi aínda aprobada. Notificaráseche por correo electrónico cando poidas iniciar a sesión."
     admin_not_allowed_from_ip_address: "Non podes acceder como administrador desde este enderezo IP."
     not_available: "Non dispoñíbel. Tentar %{suggestion}?"
+    omniauth_confirm_button: "Continuar"
     new_registrations_disabled: "Neste momento non se permite o rexistro de novas contas."
+    second_factor_title: "Autenticación de dobre factor"
+    second_factor_backup_description: "Escribe un dos códigos de copia de seguranza"
+    second_factor_toggle:
+      backup_code: "Usar no seu lugar un código de copia de seguranza"
   admin:
     email:
       sent_test: "enviado!"
@@ -507,6 +810,7 @@ gl:
       title: "Estabelecer o contrasinal"
   page_not_found:
     see_more: "Máis"
+    search_title: "Buscar neste sitio"
     search_button: "Buscar"
   image: "imaxe"
   csv_export:
@@ -586,16 +890,46 @@ gl:
       name: Ligazón popular
   admin_login:
     submit_button: "Enviar correo-e"
+  tags:
+    title: "Etiquetas"
+  finish_installation:
+    resend_email:
+      title: "Reenviar correo electrónico de activación"
   wizard:
     step:
       forum_title:
         title: "Nome"
+      privacy:
+        title: "Acceso"
+        fields:
+          privacy:
+            choices:
+              open:
+                label: "Público"
+              restricted:
+                label: "Privado"
       contact:
         fields:
           contact_email:
             placeholder: "name@example.com"
       corporate:
         title: "Organización"
+      colors:
+        title: "Tema"
+      themes_further_reading:
+        title: "Temas"
+      homepage:
+        fields:
+          homepage_style:
+            choices:
+              categories_only:
+                label: "Só categorías"
+              categories_with_featured_topics:
+                label: "Categorías con temas destacados"
+              categories_and_latest_topics:
+                label: "Categorías e últimos temas"
+              categories_and_top_topics:
+                label: "Categorías e temas destacados"
       emoji:
         title: "Emoji"
   joined: "Inscrito"
@@ -607,10 +941,22 @@ gl:
       replied: '%{username} respondeute en "%{topic}" - %{site_title}'
       posted: '%{username} publicou en "%{topic}" - %{site_title}'
       linked: '%{username} ligou a túa publicación desde "%{topic}" - %{site_title}'
+      watching_first_post: '%{username} creou un tema novo "%{topic}" - %{site_title}'
+      confirm_title: "Notificacións habilitadas - %{site_title}"
+      confirm_body: "Perfecto! As notificacións están habilitadas."
+      custom: "Notificación de %{username} en %{site_title}"
   reviewables:
+    priorities:
+      medium: "Media"
+      high: "Alta"
+    sensitivity:
+      medium: "Media"
+      high: "Alta"
     actions:
       agree_and_suspend:
         title: "Suspender usuario"
+      agree_and_silence:
+        title: "Silenciar usuario"
       delete_spammer:
         title: "Eliminar spammer"
       delete_single:
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 06f07a05e3..115e8fbe3b 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -1417,6 +1417,7 @@ he:
     category_search_priority_very_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: "שם האתר הזה, כפי שהוא משמש בתגית הכותרת."
@@ -1623,7 +1624,7 @@ he:
     s3_backup_bucket: "הדלי המרוחק שבו לשמור גיבויים. אזהרה: שימו לב שהוא דלי פרטי."
     s3_endpoint: "ניתן לערוך את נקודת הגישה לגיבוי כדי שתפנה לשירות תואם S3 כגון DigitalOcean Spaces או Minio. אזהרה: יש להשאיר ריק בעת שימוש ב־S3 מבית AWS."
     s3_configure_tombstone_policy: "הפעלת מדיניות מחיקה אוטומטית להעלאות מצבה. חשוב: אם אפשרות זו מנוטרלת, לא יפונה מקום לאחר מחיקת העלאות."
-    s3_disable_cleanup: "בטלו את ההסרה של גיבויים מ S3 כאשר הם מוסרים מקומית."
+    s3_disable_cleanup: "למנוע הסרה של גיבויים ישנים מ־S3 שיש יותר גיבויים מהמותר."
     enable_s3_inventory: "יצירת דוחות ואימות העלאות באמצעות מאגר של Amazon S3. חשוב: נדרשים פרטי גישה תקפים ל־S3 (מזהה מפתח הגישה ומפתח הגישה הסודי)."
     backup_time_of_day: "הגדרת זמן לגיבוי לפי UTC."
     backup_with_uploads: "כללו העלאות בגיבויים התקופתיים. ביטול של אפשרות זו תגבה רק את בסיס הנתונים."
@@ -1964,6 +1965,7 @@ he:
     returning_user_notice_tl: "דרגת האמון המזערית הדרושה לצפייה בהתראות משתמש חוזר."
     returning_users_days: "כמה ימים אמורים לעבור לפני שמשתמש נחשב למשתמש חוזר."
     enable_page_publishing: "לאפשר לחברי סגל לפרסם נושאים לכתובות חדשות עם סגנון עצמאי."
+    show_published_pages_login_required: "משתמשים אלמוניים יכולים לראות דפים שפורסמו, אפילו כשנדרשת כניסה למערכת."
     default_email_digest_frequency: "באיזו תדירות משתמשים יקבלו סיכומי מיילים כברירת מחדל."
     default_include_tl0_in_digests: "כללו פוסטים ממשתמשים חדשים בדוא\"ל מסכם כברירת מחדל. משתמשים יוכלו לשנות זאת בהעדפות האישיות."
     default_email_level: "הגדרת רמת ההתראה בדוא״ל כבררת מחדל לנושאים רגילים."
@@ -2023,7 +2025,7 @@ he:
     city_for_disputes: "עיר המחלוקת"
     shared_drafts_category: "הפעלת תכונת הטיוטות המשותפות על ידי הקצאת קטגוריה שתשמש לטובת טיוטות לנושאים. נושאים בקטגוריה זו יוסתרו מרשימות הנושאים לחברי הסגל."
     push_notifications_prompt: "הצגת בקשה להסכמת המשתמש."
-    push_notifications_icon: "סמל העיטור שמופיע בפינת ההתרעה. הגודל הנדרש הוא 96 × 96."
+    push_notifications_icon: "סמל העיטור שמופיע בפינת ההתרעה. מומלץ PNG בצבעים אחידים עם שקיפות בגודל 96 × 96."
     short_title: "בכותרת הקצרה ייעשה שימוש במסך הבית של המשתמש, במשגר או במקומות אחרים שבהם המקום מוגבל. אורכה לא יעלה על 12 תווים."
     dashboard_hidden_reports: "לאפשר להסתיר את הדוחות המסוימים בלוח הבקרה."
     dashboard_visible_tabs: "נא לבחור אילו לשוניות תופענה בלוח הבקרה."
@@ -4336,6 +4338,9 @@ he:
         reason: "למחוק דרך תור סקירה"
   email_style:
     html_missing_placeholder: "תבנית ה־html חייבת לכלול %{placeholder}"
+  notification_level:
+    ignore_error: "אין אפשרות להתעלם מהמשתמש הזה, עמך הסליחה."
+    mute_error: "אין אפשרות להשתיק את המשתמש הזה, עמך הסליחה."
   discord:
     not_in_allowed_guild: "האימות נכשל. הגילדה ב־Discord אליה הצטרפת אינה מורשית לגשת."
   old_keys_reminder:
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index cf7495b5e8..3f7ece83c2 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -1308,7 +1308,6 @@ hy:
     s3_backup_bucket: "Պահուստների պահպանման համար հեռակա արկղ: ԶԳՈՒՇԱՑՈՒՄ՝ Համոզվեք, որ այն գաղտնի արկղ է:"
     s3_endpoint: "Վերջնակետը կարող է փոփոխվել S3 -ի հետ համատեղելի ծառայության պահուստի, նիչպես օրինակ՝ DigitalOcean Spaces կամ Minio: ՈՒՇԱԴՐՈՒԹՅՈՒՆ՝ թաղեք դատարկ, եթե օգտագործում եք AWS S3:"
     s3_configure_tombstone_policy: "Միացնել ավտոմատ ջնջման քաղաքականությունը tombstone վերբեռնումների համար: ԿԱՐԵՎՈՐ՝ անջատված լինելու դեպքում վերբեռնումները ջնջելուց հետո տարածք չի վերադարձվի: "
-    s3_disable_cleanup: "Անջատել պահուստների հեռացումը S3 -ից՝ տեղական կերպով հեռացնելու դեպքում:"
     enable_s3_inventory: "Գեներացնել հաշվետվություններ և հաստատել վերբեռնումներ՝ օգտագործելով Amazon S3 գույքագրումը: ԿԱՐԵՎՈՐ՝ պահանջում է վավեր S3 տվյալներ (access key id և secret access key):"
     backup_time_of_day: "Պահուստի ստեղծման ժամը UTC ժամային գոտու համաձայն:"
     backup_with_uploads: "Ներառել վերբեռնումները պլանավորված պահուստներում: Սա անջատելը կպահուստավորի միայն տվյալների բազան:"
@@ -1652,7 +1651,6 @@ hy:
     city_for_disputes: "Վեճերի Քաղաք"
     shared_drafts_category: "Միացնել Կիսված Սևագրեր հատկանիշը՝ կանխորոշելով կատեգորիա թեմաների սևագրերի համար: Այս կատեգորիայի թեմաները կթաքցվեն թեմաների ցանկերից անձնակազմի օգտատերերի համար:"
     push_notifications_prompt: "Ցուցադրել օգտատիրոջ համաձայնության հարցումը:"
-    push_notifications_icon: "Կրծքանշանի պատկերակ, որ հայտնվում է ծանուցումների անկյուններում: Պահանջվող չափը՝ 96 × 96:"
     short_title: "Կարճ վերնագիրը օգտագործվի օգտատիրոջ անձնական էջում, մեկնարկում կամ այլ տեղերում, որտեղ տարածքը կարող է սահմանափակված լինել: Այն պետք է սահմանափակ լինի մինչև 12 սիմվոլ:"
     dashboard_general_tab_activity_metrics: "Ընտրել հաշվետվությունները, որոնք կցուցադրվեն որպես ակտիվության չափանիշ ընդհանուր ներդիրում:"
     errors:
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index eb2f1e5c23..19397f7699 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -1526,7 +1526,6 @@ it:
     s3_backup_bucket: "Il bucket remoto che contiene i backup. ATTENZIONE: assicurati che sia un bucket privato."
     s3_endpoint: "L'endpoint può essere modificato per eseguire il backup su un servizio compatibile S3 come DigitalOcean Spaces o Minio. ATTENZIONE: lasciare vuoto se si utilizza AWS S3."
     s3_configure_tombstone_policy: "Abilita la cancellazione automatica per i caricamenti in \"tombstone\". IMPORTANTE: se disabilitato, nessuno spazio verrà recuperato dopo aver eliminato i caricamenti."
-    s3_disable_cleanup: "Disabilita la rimozione dei backup da S3 quando rimossi localmente."
     enable_s3_inventory: "Genera rapporti e verifica i caricamenti utilizzando l'inventario Amazon S3. IMPORTANTE: richiede credenziali S3 valide (sia l'access key id che la secret access key)."
     backup_time_of_day: "Ora del giorno in UTC in cui eseguire il backup."
     backup_with_uploads: "Includi i caricamenti nei backup programmati. Se disabilitata verrà eseguito il backup del solo database."
@@ -1898,7 +1897,6 @@ it:
     city_for_disputes: "Sede per eventuali controversie"
     shared_drafts_category: "Abilita la funzione Bozze Condivise designando una categoria per le bozze di argomento. Gli argomenti in questa categoria verranno eliminati dagli elenchi di argomenti per gli utenti dello staff."
     push_notifications_prompt: "Visualizza richiesta di consenso dell'utente."
-    push_notifications_icon: "L'icona del Distintivo che appare nell'angolo della notifica. La dimensione richiesta è 96 × 96."
     short_title: "Il titolo breve verrà utilizzato nella schermata iniziale dell'tente, nel programma di avvio o in altri contesti in cui lo spazio potrebbe essere limitato. Dovrebbe essere limitato a 12 caratteri."
     dashboard_general_tab_activity_metrics: "Scegli i report da visualizzare come metriche di attività nella scheda generale."
     errors:
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index b15d02093f..31fe36a105 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -1426,7 +1426,6 @@ ko:
     s3_backup_bucket: "백업본을 유지할 s3 버켓 이름. 주의 : 프라이빗 버켓인지 반드시 확인해야하세요."
     s3_endpoint: "엔드 포인트는 DigitalOcean Spaces 또는 Minio와 같은 S3 호환 서비스에 백업하도록 수정할 수 있습니다. 경고 : 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: "스케쥴링된 백업을 실행할 때 업로드된 자료도 포함. 해제하면 데이터베이스만 백업합니다."
@@ -1824,7 +1823,6 @@ ko:
     city_for_disputes: "분쟁의 도시"
     shared_drafts_category: "주제 초안의 범주를 지정하여 공유 초안 기능을 사용하십시오. 이 범주의 주제는 직원 사용자의 주제 목록에서 표시되지 않습니다."
     push_notifications_prompt: "사용자 동의 프롬프트를 표시합니다."
-    push_notifications_icon: "알림 코너에 나타나는 배지 아이콘. 필요한 크기는 96 × 96입니다."
     short_title: "짧은 제목은 사용자의 홈 화면, 실행기 또는 공간이 제한 될 수있는 다른 장소에서 사용됩니다. 12 자로 제한되어야합니다."
     dashboard_general_tab_activity_metrics: "일반 탭에서 활동 메트릭으로 표시 할 보고서를 선택하십시오."
     gravatar_name: "Gravatar 제공 업체 이름"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 0743aa74cb..42256cbac2 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -1339,6 +1339,7 @@ nl:
     category_search_priority_very_high_weight: "Op rangschikking toegepast gewicht voor zeer hoge prioriteit bij doorzoeken van categorie."
     allow_uncategorized_topics: "Topics maken zonder categorie toestaan. WAARSCHUWING: als er topics zonder categorie zijn, moet u deze opnieuw aan een categorie toewijzen voordat dit wordt uitgezet."
     allow_duplicate_topic_titles: "Topics met dezelfde identieke titels toestaan"
+    allow_duplicate_topic_titles_category: "Topics met identieke, dubbele titels toestaan als de categorie anders is. allow_duplicate_topic_titles moet moet false zijn."
     unique_posts_mins: "Hoeveel minuten iemand moet wachten voordat deze een bericht met dezelfde inhoud mag plaatsen"
     educate_until_posts: "De pop-up voor nieuwe gebruikers tonen als een gebruiker begint met het typen van de eerste (n) nieuwe berichten in de berichteditor."
     title: "De naam van deze website, zoals gebruikt in de titeltag"
@@ -1545,7 +1546,7 @@ nl:
     s3_backup_bucket: "De externe bucket voor back-ups. WAARSCHUWING: zorg ervoor dat dit een privébucket is."
     s3_endpoint: "Het eindpunt kan worden gewijzigd voor back-ups van een met S3 compatibele dienst, zoals DigitalOcean Spaces of Minio. WAARSCHUWING: laat dit leeg als u AWS S3 gebruikt."
     s3_configure_tombstone_policy: "Automatisch verwijderingsbeleid voor tombstone-uploads inschakelen. BELANGRIJK: wanneer uitgeschakeld, wordt geen ruimte vrijgemaakt na het verwijderen van uploads."
-    s3_disable_cleanup: "Verwijderen van back-ups van S3 uitschakelen bij lokaal verwijderen."
+    s3_disable_cleanup: "Verwijderen van oude back-ups van S3 voorkomen als er meer back-ups zijn dan maximaal toegestaan."
     enable_s3_inventory: "Rapporten genereren en uploads verifiëren via Amazon S3-inventory. BELANGRIJK: vereist geldige S3-referenties (zowel toegangssleutel-ID als geheime toegangssleutel)."
     backup_time_of_day: "Tijdstip (UTC) waarop de back-up moet plaatsvinden."
     backup_with_uploads: "Uploads opnemen in geplande back-ups. Wanneer uitgeschakeld, wordt alleen een back-up van de database gemaakt."
@@ -1886,6 +1887,7 @@ nl:
     returning_user_notice_tl: "Het minimale vertrouwensniveau dat nodig is om berichtmeldingen van terugkerende gebruikers te zien."
     returning_users_days: "Het aantal dagen dat voorbij moet gaan voordat een gebruiker als terugkerend wordt beschouwd."
     enable_page_publishing: "Stafleden mogen topics naar nieuwe URL's publiceren met hun eigen stijlen."
+    show_published_pages_login_required: "Anonieme gebruikers kunnen gepubliceerde pagina's zien, zelfs wanneer aanmelding is vereist."
     default_email_digest_frequency: "Hoe vaak gebruikers standaard e-mailsamenvattingen ontvangen."
     default_include_tl0_in_digests: "Standaard berichten van nieuwe gebruikers in e-mailsamenvattingen opnemen. Gebruikers kunnen dit in hun voorkeuren wijzigen."
     default_email_level: "Standaard e-mailmeldingsniveau voor normale topics."
@@ -1945,7 +1947,7 @@ nl:
     city_for_disputes: "Stad voor geschillen"
     shared_drafts_category: "Schakel de functie Gedeelde concepten in door een categorie voor topicconcepten aan te geven. Topics in deze categorie worden onderdrukt in topiclijsten voor stafgebruikers."
     push_notifications_prompt: "Prompt voor gebruikerstoestemming weergeven."
-    push_notifications_icon: "Het badgepictogram dat in de meldingenhoek verschijnt. Vereiste grootte is 96 × 96."
+    push_notifications_icon: "Het badgepictogram dat in de meldingshoek verschijnt. Een eenkleurige PNG van 96×96 met transparantie wordt aanbevolen."
     short_title: "De korte titel wordt gebruikt op het startscherm van de gebruiker, de starter, of andere plaatsen waar ruimte beperkt kan zijn. Beperk de naam tot 12 tekens."
     dashboard_hidden_reports: "Toestaan dat de opgegeven rapporten worden verborgen op het dashboard."
     dashboard_visible_tabs: "Kiezen welke dashboardtabbladen zichtbaar zijn."
@@ -2988,3 +2990,6 @@ nl:
         title: "Gebruiker verwijderen"
         confirm: "Weet u zeker dat u die gebruiker wilt verwijderen? Dit verwijdert alle berichten en blokkeert het e-mail- en IP-adres van de gebruiker."
         reason: "Verwijderd via wachtrij voor beoordeling"
+  notification_level:
+    ignore_error: "Sorry, u kunt die gebruiker niet negeren."
+    mute_error: "Sorry, u kunt die gebruiker niet dempen."
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index efc6df67e5..459de21cb3 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -1574,7 +1574,6 @@ pl_PL:
     s3_backup_bucket: "Zdalne wiadro do przechowywania kopii zapasowych. UWAGA: Upewnij się, że jest to wiadro prywatne."
     s3_endpoint: "Punkt końcowy można zmodyfikować, aby utworzyć kopię zapasową w usłudze zgodnej z S3, takiej jak DigitalOcean Spaces lub Minio. OSTRZEŻENIE: Pozostaw puste, jeśli używasz AWS S3."
     s3_configure_tombstone_policy: "Włącz zasady automatycznego usuwania przy przesyłaniu nagrobków. WAŻNE: Jeśli ta opcja jest wyłączona, nie zostanie odzyskane żadne miejsce po usunięciu przesłanych plików."
-    s3_disable_cleanup: "Dezaktywuj usuwanie kopii zapasowych z S3 kiedy usunięte lokalnie."
     enable_s3_inventory: "Generuj raporty i weryfikuj przesyłane materiały za pomocą zasobów Amazon S3. WAŻNE: wymaga prawidłowych poświadczeń S3 (zarówno identyfikator klucza dostępu, jak i tajny klucz dostępu)."
     backup_time_of_day: "Godzina (UTC) wykonania kopii zapasowej."
     backup_with_uploads: "Uwzględniaj przesyły w zaplanowanych backupach. Wyłączenie tej opcji spowoduje backup jedynie bazy danych."
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index dea79c962c..280184f709 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -946,7 +946,6 @@ pt:
     maximum_backups: "Valor máximo de cópias de segurança a serem guardadas em disco. Cópias de Segurança antigas são automaticamente eliminadas."
     automatic_backups_enabled: "Executar cópias de segurança automáticas de acordo com as definições de frequência de cópia de segurança"
     s3_backup_bucket: "Balde remoto para guardar cópias de segurança. AVISO: Certifique-se que este é um balde privado."
-    s3_disable_cleanup: "Desactive a remoção das cópias de segurança do S3 quando removidas localmente."
     backup_time_of_day: "Altura do dia UTC em que a cópia de segurança deve ocorrer."
     backup_with_uploads: "Incluir carregamentos em cópias de segurança agendadas. Desativar isto irá salvaguardar apenas a base de dados."
     active_user_rate_limit_secs: "Qual a frequência de atualização do campo 'última vez visto em', em segundos."
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index ce33d0a385..26297dfc04 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -1468,7 +1468,6 @@ pt_BR:
     s3_backup_bucket: "O repositório remoto para realizar backups. AVISO: Certifique-se de que é um repositório privado."
     s3_endpoint: "O endpoint 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: "Habilitar a política de exclusão automática para uploads de tombstone. IMPORTANTE: Se desabilitado, nenhum espaço será recuperado depois que os uploads forem excluídos."
-    s3_disable_cleanup: "Desabilitar a remoção de backups na S3 quando removidos localmente."
     enable_s3_inventory: "Gerar relatórios e verificar os uploads usando o inventário do Amazon S3. IMPORTANTE: requer credenciais S3 válidas (tanto a ID da chave de acesso quanto a chave de acesso secreta)."
     backup_time_of_day: "Hora do dia, em UTC, quando o backup deve ocorrer."
     backup_with_uploads: "Incluir uploads nos backups programados. Desabilite para copiar apenas a base de dados. "
@@ -1830,7 +1829,6 @@ pt_BR:
     city_for_disputes: "Cidade para Disputas"
     shared_drafts_category: "Habilitar o recurso Rascunhos Compartilhados, designando uma categoria para rascunhos de tópicos. Os tópicos nesta categoria serão suprimidos das listas de tópicos para usuários da staff."
     push_notifications_prompt: "Exibir o prompt de consentimento do usuário."
-    push_notifications_icon: "O ícone do emblema que aparece no canto de notificação. O tamanho requerido é 96 × 96."
     short_title: "O título abreviado será usado na tela inicial do usuário, no iniciador ou em outros locais onde o espaço possa ser limitado. Deveria ser limitado a 12 caracteres."
     dashboard_general_tab_activity_metrics: "Escolher relatórios para serem exibidos como métricas de atividade na guia geral."
     errors:
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 4a22f56119..3515f217f1 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -906,7 +906,6 @@ ro:
     maximum_backups: "Maximul de fișiere backup păstrate. Fișierele backup vechi sunt șterse automat"
     automatic_backups_enabled: "Rulează automat operațiuni de backup după cum este definit la frecvența de backup"
     s3_backup_bucket: "Containerul (bucket) de la distanță care ține backupurile. ATENȚIE: Asgură-te că e un container privat."
-    s3_disable_cleanup: "Dezactivează eliminarea backup-urilor de pe S3 când sunt șterse local."
     backup_time_of_day: "Ora în format UTC la care să înceapă operațiunea de backup."
     backup_with_uploads: "Include încărcări în backup-urile programate. Dezactivarea acestei opțiuni va face backup doar la baza de date."
     active_user_rate_limit_secs: "Cât de des se actualizează câmpul 'last_seen_at', în secunde"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index e48b0cfaeb..5291dca2d0 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -1285,9 +1285,11 @@ ru:
         filesize: Размер файла
       description: "Список всех загрузок по расширению, размеру файла и автору."
     top_ignored_users:
-      title: "Топ Игнорируемых / Приглушенных Пользователей"
+      title: "Топ игнорируемых / приглушенных пользователей"
       labels:
-        ignored_user: Игнорируемый Пользователь
+        ignored_user: Игнорируемый пользователь
+        ignores_count: Количество игнорируемых
+        mutes_count: Количество приглушённых
       description: "Пользователи, которые были отключены и / или проигнорированы другими пользователями."
   dashboard:
     rails_env_warning: "Ваш сервер работает в режиме %{env}."
@@ -1330,6 +1332,7 @@ ru:
     category_search_priority_very_high_weight: "Вес применяется к ранжированию для очень высокого приоритета поиска раздела."
     allow_uncategorized_topics: "Разрешить создание тем без раздела. ВНИМАНИЕ: Если есть какие-либо темы без раздела, вы должны переклассифицировать их, прежде чем отключить."
     allow_duplicate_topic_titles: "Разрешить создание тем с одинаковыми названиями."
+    allow_duplicate_topic_titles_category: "Разрешить создание тем с одинаковыми названиями, если они создаются в разных разделах (предыдущий параметр allow_duplicate_topic_titles должен быть отключён)."
     unique_posts_mins: "Количество минут до того, как пользователь сможет разместить сообщение с тем же содержанием."
     educate_until_posts: "Количество первых сообщений новых пользователей, для которых необходимо показывать всплывающую подсказку с советами для новичков."
     title: "Название этого сайта. Будет использоваться в HTML-тэге title."
@@ -1466,9 +1469,15 @@ ru:
     google_oauth2_client_secret: "Client secret для Google приложения"
     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>"
-    allow_restore: "Позволить импорт, который может заменить ВСЕ данные сайта. Оставьте выключенным, если не планируете восстанавливать резервную копию"
-    maximum_backups: "Максимальное количество резервных копий к сохранению. Более старые резервные копии будут автоматически удалены."
+    enable_backups: "Разрешать администраторам создавать резервные копии форума"
+    allow_restore: "Позволить импорт, который может заменить ВСЕ данные сайта. Оставьте опцию выключенной, если не планируете восстанавливать резервную копию"
+    maximum_backups: "Максимальное количество сохраняемых резервных копий. Более старые резервные копии будут автоматически удалены."
+    automatic_backups_enabled: "Запускать автоматическое создание резервных копий с указанной в настройках периодичностью"
+    backup_frequency: "Периодичность создания резервных копий (в днях)."
     s3_backup_bucket: "Адрес папки удаленного сервера для резервных копий. ВНИМАНИЕ: Убедитесь, что место назначения защищено от посторонних."
+    backup_time_of_day: "Время создания резервной копии (UTC)."
+    backup_with_uploads: "Сохранять в резервной копии все загружаемые файлы. В противном случае будет сохраняться только база данных."
+    backup_gzip_compression_level_for_uploads: "Уровень gzip-сжатия для загружаемых файлов."
     active_user_rate_limit_secs: "Как часто мы обновляем поле 'last_seen_at', в секундах"
     verbose_localization: "Показывать ключи используемых строк в интерфейсе для перевода на другой язык"
     previous_visit_timeout_hours: "Как долго должно длиться посещение сайта, чтобы мы посчитали его «предыдущим посещением», в часах"
@@ -1694,6 +1703,7 @@ ru:
     auto_close_topics_post_count: "Максимальное количество постов, разрешенных в теме до ее автоматического закрытия (0 для отключения)"
     max_allowed_message_recipients: "Максимальное число получателей сообщения."
     enable_page_publishing: "Разрешить сотрудникам публиковать темы на новых URL-адресах с их собственным стилем."
+    show_published_pages_login_required: "Опубликованные страницы доступны анонимным пользователям, для этого не требуется регистрация на форуме."
     default_email_mailing_list_mode: "По умолчанию присылать почтовое уведомление, когда появляется новое сообщение."
     default_other_auto_track_topics_after_msecs: "Глобальное время по умолчанию перед автоматическим отслеживанием темы."
     default_other_external_links_in_new_tab: "По умолчанию открывать внешние ссылки в новой вкладке."
@@ -1721,7 +1731,7 @@ ru:
     governing_law: "Регулирующий Закон"
     city_for_disputes: "Город для решения споров"
     push_notifications_prompt: "Отображение запроса согласия пользователя."
-    push_notifications_icon: "Иконка значка, который появляется в углу уведомлений. Необходимый размер 96 × 96."
+    push_notifications_icon: "Иконка значка, который появляется в углу уведомлений. Рекомендуется монохроматическое изображение в формате PNG размером 96 × 96 пикселей с поддержкой прозрачности."
     dashboard_hidden_reports: "Разрешить скрытие отдельных отчётов из админки."
     dashboard_visible_tabs: "Выберите закладки, которые будут отображаться в админке."
     dashboard_general_tab_activity_metrics: "Выберите отчеты для отображения в качестве метрики активности на вкладке Общие."
@@ -3016,3 +3026,6 @@ ru:
         reason: "Удалено через очередь просмотра"
   email_style:
     html_missing_placeholder: "HTML-шаблон должен содержать %{placeholder}"
+  notification_level:
+    ignore_error: "Извините, но вы не можете игнорировать этого пользователя."
+    mute_error: "Извините, но вы не можете приглушить этого пользователя."
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index c985afbe28..5bceab33ac 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -1323,6 +1323,7 @@ sv:
     category_search_priority_very_high_weight: "Vikt applicerad på rankning vid mycket hög sökprioritet för kategori"
     allow_uncategorized_topics: "Tillåt att ämnen skapas utan en kategori. VARNING: Om det finns några okategoriserade ämnen så måste dessa omkategoriseras innan den här inställningen stängs av. "
     allow_duplicate_topic_titles: "Tillåt ämnen med identiska rubriker."
+    allow_duplicate_topic_titles_category: "Tillåt ämnen med identisk, duplicerad titel om kategorierna är olika. allow_duplicate_topic_titles måste vara avbockad."
     unique_posts_mins: "Hur många minuter innan en användare kan göra ett inlägg med precis samma innehåll igen"
     educate_until_posts: "Visa hjälppanelen för komponering tills dess att användaren har gjort (n) nya inlägg. "
     title: "Namnet på denna webbplats som används i titel-taggen."
@@ -1529,7 +1530,7 @@ sv:
     s3_backup_bucket: "Den externa behållaren för säkerhetskopieringar. VARNING: Se till att det är en privat behållare."
     s3_endpoint: "Ändpunkten kan ändras för att säkerhetskopiera till en S3-kompatibel tjänst som DigitalOcean Spaces eller Minio. VARNING: Lämna tomt om du använder AWS S3."
     s3_configure_tombstone_policy: "Aktivera automatisk raderingspolicy för Tombstone uppladdningar. VIKTIGT: Om det är inaktiverat kommer inget utrymme att återtas efter att överföringar har tagits bort."
-    s3_disable_cleanup: "Inaktivera borttagande av säkerhetskopior från S3 när de tagits bort lokalt."
+    s3_disable_cleanup: "Förhindra borttagning av äldre säkerhetskopior från S3 när det finns fler säkerhetskopior än högsta tillåtna."
     enable_s3_inventory: "Generera rapporter och verifiera uppladdningar med Amazon S3 inventering. VIKTIGT: kräver giltiga S3-referenser (både åtkomstnyckel-ID och hemlig åtkomstnyckel)."
     backup_time_of_day: "Tid på dygnet UTC då säkerhetskopieringen sker."
     backup_with_uploads: "Inkludera uppladdning i schemalagda säkerhetskopieringar. Inaktivering av det här kommer endast att säkerhetskopiera databasen."
@@ -1870,6 +1871,7 @@ sv:
     returning_user_notice_tl: "Lägsta förtroendenivå som krävs för se återkommande användares inläggsnoteringar."
     returning_users_days: "Hur många dagar bör gå innan en användare anses återkomma."
     enable_page_publishing: "Tillåt personal att publicera ämnen för nya URL:er med deras egna utformning."
+    show_published_pages_login_required: "Anonyma användare kan se publicerade sidor, även när inloggning krävs."
     default_email_digest_frequency: "Standardinställning för hur ofta användare mottar e-postsammanfattningar."
     default_include_tl0_in_digests: "Standardinställning för hur ofta nya användare får e-postsammanfattningar. Användare kan ändra det i sina inställningar."
     default_email_level: "Ställ in standardnivå för e-postmeddelanden för vanliga ämnen."
@@ -1929,7 +1931,7 @@ sv:
     city_for_disputes: "Stad för tvister"
     shared_drafts_category: "Aktivera funktionen delade utkast genom att ange en kategori för ämnesutkast. Ämnen i den här kategorin exkluderas från ämneslistor för personalanvändare."
     push_notifications_prompt: "Visa användarens samtycke genast."
-    push_notifications_icon: "Utmärkelseikonen som visas i notifieringshörnet. Obligatorisk storlek är 96 x 96."
+    push_notifications_icon: "Utmärkelseikonen som visas i notifieringshörnet. En 96x96 enfärgad PNG med genomskinlighet rekommenderas."
     short_title: "Den korta titeln kommer att användas på användarens startskärm, startapparat eller andra platser där utrymmet kan vara begränsat. Det bör begränsas till 12 tecken."
     dashboard_hidden_reports: "Tillåt att de specificerade rapporterna döljs från översiktspanelen."
     dashboard_visible_tabs: "Välj vilka flikar på översiktspanelen som ska vara synliga."
@@ -3888,6 +3890,9 @@ sv:
         reason: "Raderad via granskningskön"
   email_style:
     html_missing_placeholder: "Html-mallen måste inkludera %{placeholder}"
+  notification_level:
+    ignore_error: "Tyvärr, du kan inte ignorera den användaren."
+    mute_error: "Tyvärr, du kan inte tysta den användaren."
   discord:
     not_in_allowed_guild: "Autentisering misslyckades. Du är inte medlem i ett tillåtet Discord sällskap. "
   old_keys_reminder:
diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml
index 08dfc30c4e..08494d40b0 100644
--- a/config/locales/server.te.yml
+++ b/config/locales/server.te.yml
@@ -743,6 +743,8 @@ te:
         title: "సంస్థ"
       colors:
         title: "అలంకారం"
+      themes_further_reading:
+        title: "అలంకారాలు"
       homepage:
         fields:
           homepage_style:
diff --git a/config/locales/server.th.yml b/config/locales/server.th.yml
index 3d03f5bce4..acd728f9e5 100644
--- a/config/locales/server.th.yml
+++ b/config/locales/server.th.yml
@@ -80,6 +80,8 @@ th:
       other: "%{count} โพส"
   activerecord:
     attributes:
+      category:
+        name: "ชื่อหมวดหมู่"
       topic:
         title: "ชื่อเรื่อง"
         category_id: "หมวดหมู่"
@@ -110,11 +112,17 @@ th:
   post_action_types:
     spam:
       title: "ขยะ"
+      long_form: "ปักธงไว้ว่าเป็นสแปม"
+    inappropriate:
+      long_form: "ปักธงไว้ว่าไม่เหมาะสม"
     bookmark:
       title: "บุ๊คมาร์ค"
   topic_flag_types:
     spam:
       title: "ขยะ"
+      long_form: "ปักธงไว้ว่าเป็นสแปม"
+    inappropriate:
+      long_form: "ปักธงไว้ว่าไม่เหมาะสม"
   archetypes:
     banner:
       title: "ป้ายหัวข้อ"
@@ -198,6 +206,9 @@ th:
       labels:
         user: ผู้ใช้
         location: ที่อยู่
+    top_uploads:
+      labels:
+        filename: ชื่อไฟล์
   search:
     within_post: "#%{post_number} ด้วย %{username}"
     types:
@@ -322,7 +333,9 @@ th:
     set_password:
       title: "ตั้งรหัสผ่าน"
   page_not_found:
+    popular_topics: "ยอดนิยม"
     see_more: "อื่น"
+    search_title: "ค้นหาเว็บไซต์นี้"
     search_button: "ค้นหา"
   image: "รูปภาพ"
   csv_export:
@@ -372,6 +385,8 @@ th:
         title: "องค์กร"
       colors:
         title: "ธีม"
+      themes_further_reading:
+        title: "ธีม"
       homepage:
         fields:
           homepage_style:
@@ -399,9 +414,12 @@ th:
       custom: "การแจ้งเตือนจาก %{username} บน %{site_title}"
   reviewables:
     priorities:
+      low: "ต่ำ"
       medium: "ปานกลาง"
       high: "สูง"
     sensitivity:
+      disabled: "ปิดใช้งานแล้ว"
+      low: "ต่ำ"
       medium: "ปานกลาง"
       high: "สูง"
     actions:
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 7d4e618535..56ae382a51 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -1495,7 +1495,6 @@ tr_TR:
     s3_backup_bucket: "Yedeklemelerin yüklenmesi için uzak biriktirme yeri. UYARI: Özel bir biriktirme yeri olduğundan emin olun"
     s3_endpoint: "Bitiş noktası, DigitalOcean Spaces veya Minio gibi S3 uyumlu bir hizmete yedekleme yapmak için değiştirilebilir. UYARI: AWS S3 kullanıyorsanız boş bırakın."
     s3_configure_tombstone_policy: "Kaldırıldı olarak işaretleme yüklemeleri için otomatik silme politikasını etkinleştirin. ÖNEMLİ: Devre dışı bırakılırsa, yüklemeler silindikten sonra yer kazanılamaz."
-    s3_disable_cleanup: "Yerel olarak silinen yedeklerin S3 sunucularından silinmesini kapat"
     enable_s3_inventory: "Amazon S3 envanterini kullanarak raporlar oluşturun ve yüklemeleri doğrulayın. ÖNEMLİ: geçerli S3 kimlik bilgileri gerektirir (hem erişim anahtarı kimliği hem de gizli erişim anahtarı)."
     backup_time_of_day: "Yedeklemenin yapılacağı vaktin gün içindeki UTC zamanı."
     backup_with_uploads: "Planlanmış yedeklere yüklemeleri de dahil et. Etkisizleştirilirse sadece veritabanı yedeklenecek."
@@ -1882,7 +1881,6 @@ tr_TR:
     city_for_disputes: "Anlaşmazlıklar Şehri"
     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."
     push_notifications_prompt: "Kullanıcı izni komut istemini görüntüle."
-    push_notifications_icon: "Bildirim köşesinde görünen rozet simgesi. Gerekli boyut 96 × 96 'dır."
     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_general_tab_activity_metrics: "Genel sekmesinde etkinlik ölçümleri olarak görüntülenecek raporları seçin."
     errors:
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index 6fefe688d5..0fef6d3b40 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -1502,7 +1502,6 @@ uk:
     backup_frequency: "Кількість днів між резервними копіями."
     s3_backup_bucket: "Адреса папки віддаленого сервера для резервних копій. УВАГА: Переконайтеся, що місце призначення захищено від сторонніх."
     s3_endpoint: "Кінцеву точку можна змінити для резервного копіювання на службу, сумісну з S3, наприклад DigitalOcean Spaces або Minio. УВАГА: Не використовуйте AWS S3."
-    s3_disable_cleanup: "Вимкнути видалення резервних копій з S3, коли їх видалити локально."
     backup_time_of_day: "Час доби UTC, коли має відбуватися резервне копіювання"
     backup_with_uploads: "Додайте завантаження до запланованих резервних копій. Якщо вимкнути це, ви можете створити резервну копію бази даних."
     backup_gzip_compression_level_for_uploads: "Рівень стиснення Gzip, який використовується для стискання завантажень."
@@ -1860,7 +1859,6 @@ uk:
     city_for_disputes: "Місто для суперечок"
     shared_drafts_category: "Увімкніть функцію Спільні чернетки, призначивши категорію для чернеток теми. Теми в цій категорії будуть витіснені зі списку тем для персоналу."
     push_notifications_prompt: "Відобразити запит на згоду користувача"
-    push_notifications_icon: "Іконка значка, який з’являється в куті сповіщення. Необхідний розмір - 96 × 96."
     short_title: "Короткий заголовок буде використовуватися на домашньому екрані користувача, стартовому вікні чи інших місцях, де можливо обмежене місце. Він повинен бути обмежений 12 символами."
     dashboard_general_tab_activity_metrics: "Виберіть звіти для відображення як активні показники діяльності на загальній вкладці."
     errors:
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index bf03b88b7b..61c927eff4 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -1432,7 +1432,6 @@ ur:
     s3_backup_bucket: "بیک اَپس رکھنے کیلئے ریمَوٹ بَکِّٹ۔ انتباہ: یقینی بنائیں کہ یہ ایک زاتی بَکِّٹ ہے۔"
     s3_endpoint: "اَینڈ پوائنٹ کو S3 سے مطابقت رکھنے والی سروس جیسے کہ ڈیجیٹل اَوشن سپَیسز یا مینیو پر بیک اَپ کرنے کیلئے ترمیم کیا جا سکتا ہے۔ انتباہ: اگر AWS S3 کا استعمال کر رہے ہوں تو خالی چھوڑ دیں۔"
     s3_configure_tombstone_policy: "سنگ مزار اپ لوڈوں کیلئے خود کار طریقے سے حذف کر دینے کی پالیسی فعال کریں۔ اہم: اگر غیر فعال ہو، تو اپلوڈ حذف ہونے پر کوئی جگہ دوبارہ حاصل نہیں کی جائے گی۔"
-    s3_disable_cleanup: "جب مقامی طور پر بیک اَپ ہٹا دیا جائے اُس کے ساتھ S3 پر سے بھی ہٹا دینا غیر فعال کریں۔"
     enable_s3_inventory: "رپورٹیں بنائیں اور اَیمَیزَون S3 انوینٹری کا استعمال کرتے ہوئے اپلوڈ کی توثیق کریں۔ اہم: درست S3 اسناد ضروری ہیں (ایکسَیس قی آئی ڈی اور سیکرٹ ایکسَیس قی، دونوں)۔"
     backup_time_of_day: "دن کا وقت UTC جب بیک اَپ ہونا چاہئے۔"
     backup_with_uploads: "شیڈول کردہ بیک اَپس میں اپلوڈز شامل کریں۔ اِس کو غیر فعال کرنے پر صرف ڈَیٹا بَیس بیک اَپ کیا جائے گا۔"
@@ -1803,7 +1802,6 @@ ur:
     city_for_disputes: "تنازعات کیلئے شہر"
     shared_drafts_category: "ٹاپک ڈرافٹس کیلئے ایک زُمرَہ کو مقرر کر کہ مشترکہ ڈرافٹس کی صلاحیت کو فعال کریں۔ اِس زُمرہ کے ٹاپکس کو سٹاف صارفین کیلئے ٹاپک فہرستوں سے دبا دیا جائے گا۔"
     push_notifications_prompt: "صارف رضامندی پرامپٹ دکھائیں۔"
-    push_notifications_icon: "نوٹیفکیشن کونے میں ظاہر ہونے والا بَیج آئکن۔ درکار سائز 96 × 96 ہے۔"
     short_title: "مختصر عنوان صارف کے ہوم اسکرین، لانچر، یا دیگر جگہیں جہاں خلا محدود ہوسکتی ہے، پر استعمال کیا جائے گا۔ یہ 12 حروف تک محدود ہونا چاہئیے۔"
     dashboard_general_tab_activity_metrics: "جنرل ٹیب پر سرگرمی میٹریکس کے طور پر ظاہر ہونے والی رپورٹیں منتخب کریں۔"
     errors:
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 3ab4ab3d6f..286deab470 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -766,7 +766,6 @@ vi:
     maximum_backups: "Số bản sao lưu tối đa lưu trong đĩa cứng. Những bản sao lưu cũ sẽ được xóa tự động"
     automatic_backups_enabled: "Chạy sao lưu tự động như cấu hình trong tần số sao lưu"
     s3_backup_bucket: "Địa chỉ tách biệt lưu trữ backup. LƯU Ý: đây phải là địa chỉ được giành riêng."
-    s3_disable_cleanup: "Vô hiệu hóa việc loại bỏ các bản sao lưu từ S3 khi lấy ra tại địa phương."
     backup_time_of_day: "Thời gian theo ngày UTC khi backup."
     backup_with_uploads: "Kèm theo cả thư mục uploads theo lịch trình backup. Tắt tính năng này sẽ chỉ backup csdl."
     active_user_rate_limit_secs: "Tần số cập nhật trường 'last_seen_at, tính theo giây"
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 72cff49197..c2edf55c57 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -1502,7 +1502,6 @@ zh_CN:
     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: "在备份日程中包括上传。关闭此项仅备份数据库。"
@@ -1902,7 +1901,6 @@ zh_CN:
     city_for_disputes: "争议之城"
     shared_drafts_category: "为主题草稿指定分类以启用共享草稿功能。此分类中的主题将从管理人员的主题列表中删除。"
     push_notifications_prompt: "显示用户同意提示。"
-    push_notifications_icon: "通知角中显示的徽章图标。尺寸必须为96px × 96px。"
     short_title: "短标题将用于用户主页、启动器或其他可能空间有限的地方。应该控制在12个字符内。"
     dashboard_hidden_reports: "允许从仪表盘中隐藏指定的报告。"
     dashboard_visible_tabs: "选择可见的仪表盘标签页"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 8dbe837651..e13de862c0 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -1348,7 +1348,6 @@ zh_TW:
     s3_backup_bucket: "遠端備份 bucket ，注意：請確定是私有的 bucket"
     s3_endpoint: "Discourse 備份空間有支援其他第三方服務，可修改備份空間存向 DigitalOcean Spaces、Minio或是Amazon S3。警告：如果使用Amazon S3，請留白。"
     s3_configure_tombstone_policy: "啟用上傳的自動刪除功能。重要提醒：如果禁用此功能，在檔案刪除後，不會回收空間。"
-    s3_disable_cleanup: "當在本地刪除備份時不刪除 S3 上的備份。"
     enable_s3_inventory: "使用Amazon S3 清單生成報告並驗證上傳。注意：需要設定Amazon S3 驗證資料（包括Access Key ID、Secret Access Key）。"
     backup_time_of_day: "備份的 UTC 時間"
     backup_with_uploads: "在備份日程中包括上傳。關閉此項僅備份資料庫。"
@@ -1705,7 +1704,6 @@ zh_TW:
     city_for_disputes: "爭議"
     shared_drafts_category: "通過為討論話題的草稿以指定一個類別，來啟用「共用草稿」功能。此類別中的話題將從工作人員使用者的主題清單中取消。"
     push_notifications_prompt: "顯示使用者同意提示"
-    push_notifications_icon: "通知角中顯示的徽章 icon，所需圖片尺寸為96×96"
     short_title: "短標題將用於使用者的主螢幕、啟動器或其他可能空白鍵有限的地方，它應限制為12個字。"
     dashboard_general_tab_activity_metrics: "選擇在一般頁面中要顯示為活躍指標的報告"
     errors:
diff --git a/plugins/discourse-details/config/locales/client.gl.yml b/plugins/discourse-details/config/locales/client.gl.yml
index b56d5594d2..b5ed2e2977 100644
--- a/plugins/discourse-details/config/locales/client.gl.yml
+++ b/plugins/discourse-details/config/locales/client.gl.yml
@@ -7,5 +7,8 @@
 
 gl:
   js:
+    details:
+      title: Agochar detalles
     composer:
       details_title: Resumo
+      details_text: "Este texto será ocultado"
diff --git a/plugins/discourse-local-dates/config/locales/client.gl.yml b/plugins/discourse-local-dates/config/locales/client.gl.yml
index b6f51baf33..8e0a79bec3 100644
--- a/plugins/discourse-local-dates/config/locales/client.gl.yml
+++ b/plugins/discourse-local-dates/config/locales/client.gl.yml
@@ -8,7 +8,32 @@
 gl:
   js:
     discourse_local_dates:
+      relative_dates:
+        today: Hoxe %{time}
+        tomorrow: Mañá %{time}
+        yesterday: Onte %{time}
+        countdown:
+          passed: superouse a data
+      title: Inserir data e hora
       create:
         form:
+          insert: Inserir
+          advanced_mode: Modo avanzado
+          simple_mode: Modo simple
+          recurring_title: Periodicidade
+          recurring_none: Sen periodicidade
+          invalid_date: Data non válida; asegúrate de que data e hora son correctas
           date_title: Data
           time_title: Hora
+          format_title: Formato da data
+          timezone: Fuso horario
+          until: Ata...
+          recurring:
+            every_day: "Todos os días"
+            every_week: "Todas as semanas"
+            every_two_weeks: "Cada dúas semanas"
+            every_month: "Todos os meses"
+            every_two_months: "Cada dous meses"
+            every_three_months: "Cada tres meses"
+            every_six_months: "Cada seis meses"
+            every_year: "Todos os anos"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.gl.yml b/plugins/discourse-narrative-bot/config/locales/client.gl.yml
index e1d3372343..381b7453fe 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.gl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.gl.yml
@@ -9,5 +9,5 @@ gl:
   js:
     discourse_narrative_bot:
       welcome_post_type:
-        new_user_track: "Comeze o tutorial de novo usuario para todo-los usuarios novos"
-        welcome_message: "Envíe unha mensaxe de benvida a todo-los usuarios cunha guía de inicio"
+        new_user_track: "Comezar o novo titorial de usuario para todos os usuarios novos"
+        welcome_message: "Enviar unha mensaxe de benvida a todos os novos usuarios cunha guía de inicio"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fr.yml b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
index 82281e769b..1610cb87c7 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -120,7 +120,7 @@ fr:
       help_trigger: "afficher l'aide"
       random_mention:
         reply: |-
-          Bonjour ! Pour voir ce que je peux faire, dites `@%{discobot_username} `.
+          Bonjour ! Pour voir ce que je peux faire, dites `@%{discobot_username} %{help_trigger}`.
         tracks: |-
           Pour le moment, je sais faire les choses suivantes :
 
@@ -426,7 +426,7 @@ fr:
           [/details]
           ```
         reply: |-
-          Bau travail — votre attention aux _détails_ est admirable !
+          Beau travail — votre attention aux _détails_ est admirable !
       end:
         message: |-
           Vous avez suivis ce tutoriel comme un _utiliser avancé_ :bow:
diff --git a/plugins/discourse-presence/config/locales/client.gl.yml b/plugins/discourse-presence/config/locales/client.gl.yml
index 695b5cf287..766a10865c 100644
--- a/plugins/discourse-presence/config/locales/client.gl.yml
+++ b/plugins/discourse-presence/config/locales/client.gl.yml
@@ -5,4 +5,8 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-gl: {}
+gl:
+  js:
+    presence:
+      replying: "respondendo"
+      editing: "editando"
diff --git a/plugins/discourse-presence/config/locales/server.gl.yml b/plugins/discourse-presence/config/locales/server.gl.yml
index 695b5cf287..024fbbd5f0 100644
--- a/plugins/discourse-presence/config/locales/server.gl.yml
+++ b/plugins/discourse-presence/config/locales/server.gl.yml
@@ -5,4 +5,7 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-gl: {}
+gl:
+  site_settings:
+    presence_enabled: "Quere amosar os usuarios que están respondendo ao tema actual ou editando a publicación actual?"
+    presence_max_users_shown: "Amósase o número máximo de usuarios."
diff --git a/plugins/poll/config/locales/client.gl.yml b/plugins/poll/config/locales/client.gl.yml
index 0918e71233..9f70ab6571 100644
--- a/plugins/poll/config/locales/client.gl.yml
+++ b/plugins/poll/config/locales/client.gl.yml
@@ -33,3 +33,6 @@ gl:
         title: "Pechar a enquisa"
         label: "Pechar"
         confirm: "Confirmas o peche desta enquisa?"
+      ui_builder:
+        poll_type:
+          label: Tipo
diff --git a/public/403.gl.html b/public/403.gl.html
index ad924ac008..181633d075 100644
--- a/public/403.gl.html
+++ b/public/403.gl.html
@@ -19,7 +19,7 @@
 <body>
   <div class="dialog">
     <h1>403</h1>
-    <p>Non podes ver este recurso.</p>
+    <p>Non podes ver este recurso!</p>
 
     <p>Substituirase pola páxina 403 personalizada de Discourse.</p>
   </div>

From 1f053173a45fb6fa544219e8c023fde07052c823 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sun, 21 Jun 2020 12:12:42 +0200
Subject: [PATCH 1783/1830] FEATURE: Import script for jForum

---
 script/import_scripts/jforum.rb           | 586 ++++++++++++++++++++++
 script/import_scripts/settings/jforum.yml |  33 ++
 2 files changed, 619 insertions(+)
 create mode 100644 script/import_scripts/jforum.rb
 create mode 100644 script/import_scripts/settings/jforum.yml

diff --git a/script/import_scripts/jforum.rb b/script/import_scripts/jforum.rb
new file mode 100644
index 0000000000..1f52412c59
--- /dev/null
+++ b/script/import_scripts/jforum.rb
@@ -0,0 +1,586 @@
+# frozen_string_literal: true
+
+require "mysql2"
+require_relative 'base'
+
+class ImportScripts::JForum < ImportScripts::Base
+  BATCH_SIZE = 1000
+  REMOTE_AVATAR_REGEX ||= /\Ahttps?:\/\//i
+
+  def initialize
+    super
+
+    @settings = YAML.load(File.read(ARGV.first), symbolize_names: true)
+
+    @database_client = Mysql2::Client.new(
+      host: @settings[:database][:host],
+      port: @settings[:database][:port],
+      username: @settings[:database][:username],
+      password: @settings[:database][:password],
+      database: @settings[:database][:schema],
+      reconnect: true
+    )
+  end
+
+  def execute
+    import_users
+
+    if @settings[:import_categories_as_tags]
+      import_tags
+    else
+      import_categories
+    end
+
+    import_posts
+    import_likes
+    import_category_subscriptions
+    import_topic_subscriptions
+    mark_topics_as_solved
+  end
+
+  def import_users
+    puts '', 'creating users'
+    total_count = count("SELECT COUNT(1) AS count FROM jforum_users")
+    last_user_id = 0
+
+    custom_fields_query = user_custom_fields_query
+
+    batches do |offset|
+      rows, last_user_id = query(<<~SQL, :user_id)
+        SELECT user_id, username, user_lastvisit, user_regdate, user_email, user_from, user_active,
+               user_avatar, COALESCE(user_realname, CONCAT(first_name, ' ', last_name)) AS name
+               #{custom_fields_query}
+        FROM jforum_users
+        WHERE user_id > #{last_user_id}
+        ORDER BY user_id
+        LIMIT #{BATCH_SIZE}
+      SQL
+      break if rows.size < 1
+
+      next if all_records_exist?(:users, rows.map { |row| row[:user_id] })
+
+      create_users(rows, total: total_count, offset: offset) do |row|
+        {
+          id: row[:user_id],
+          email: row[:user_email]&.strip,
+          name: row[:name],
+          created_at: row[:user_regdate],
+          last_seen_at: row[:user_lastvisit],
+          active: row[:user_active] == 1,
+          location: row[:user_from],
+          custom_fields: user_custom_fields(row),
+          post_create_action: proc do |user|
+            import_avatar(user, row[:user_avatar])
+          end
+        }
+      end
+    end
+  end
+
+  def user_custom_fields_query
+    return "" if @settings[:custom_fields].blank?
+
+    columns = []
+    @settings[:custom_fields].map do |field|
+      columns << (field[:alias] ? "#{field[:column]} AS #{field[:alias]}" : field[:column])
+    end
+    ", #{columns.join(', ')}"
+  end
+
+  def user_fields
+    @user_fields ||= begin
+      Hash[UserField.all.map { |field| [field.name, field] }]
+    end
+  end
+
+  def user_custom_fields(row)
+    return nil if @settings[:custom_fields].blank?
+
+    custom_fields = {}
+
+    @settings[:custom_fields].map do |field|
+      column = field[:alias] || field[:column]
+      value = row[column.to_sym]
+      user_field = user_fields[field[:name]]
+
+      case user_field.field_type
+      when "confirm"
+        value = value == 1 ? true : nil
+      when "dropdown"
+        value = user_field.user_field_options.find { |option| option.value == value } ? value : nil
+      end
+
+      custom_fields["user_field_#{user_field.id}"] = value if value.present?
+    end
+
+    custom_fields
+  end
+
+  def import_avatar(user, avatar_source)
+    return if avatar_source.blank?
+
+    path = File.join(@settings[:avatar_directory], avatar_source)
+
+    if File.file?(path)
+      @uploader.create_avatar(user, path)
+    elsif avatar_source.match?(REMOTE_AVATAR_REGEX)
+      UserAvatar.import_url_for_user(avatar_source, user) rescue nil
+    end
+  end
+
+  def import_tags
+    puts "", "creating tags"
+
+    @tags_by_import_forum_id = {}
+
+    SiteSetting.tagging_enabled = true
+    SiteSetting.max_tag_length = 100
+    SiteSetting.max_tags_per_topic = 10
+    SiteSetting.force_lowercase_tags = false
+
+    additional_tags = Array.wrap(@settings[:additional_tags])
+
+    rows = query(<<~SQL)
+      SELECT c.categories_id, c.title AS category_name, f.forum_id, f.forum_name
+      FROM jforum_forums f
+        JOIN jforum_categories c ON f.categories_id = c.categories_id
+      WHERE EXISTS (
+        SELECT 1
+        FROM jforum_posts p
+        WHERE p.forum_id = f.forum_id
+      )
+    SQL
+
+    rows.each do |row|
+      tag_names = [row[:category_name], row[:forum_name]]
+
+      additional_tags.each do |additional_tag|
+        if additional_tag[:old_category_name].match?(row[:category_name])
+          tag_names += additional_tag[:tag_names]
+        end
+      end
+
+      tag_names.map! { |t| t.parameterize(preserve_case: true) }
+
+      tag_names.each_with_index do |tag_name, index|
+        tag = create_tag(tag_name)
+        next if tag.blank?
+
+        case index
+        when 0
+          url = File.join(@settings[:permalink_prefix], "forums/list/#{row[:categories_id]}.page")
+          Permalink.create(url: url, tag_id: tag.id) unless Permalink.find_by(url: url)
+        when 1
+          url = File.join(@settings[:permalink_prefix], "forums/show/#{row[:forum_id]}.page")
+          Permalink.create(url: url, tag_id: tag.id) unless Permalink.find_by(url: url)
+        end
+      end
+
+      @tags_by_import_forum_id[row[:forum_id]] = tag_names.uniq
+    end
+
+    category_mappings = Array.wrap(@settings[:category_mappings])
+
+    if category_mappings.blank?
+      rows.each do |row|
+        category_mappings.each do |mapping|
+          if mapping[:old_category_name].match?(row[:category_name])
+            @lookup.add_category(row[:forum_id], Category.find(mapping[:category_id]))
+          end
+        end
+      end
+    end
+  end
+
+  def create_tag(tag_name)
+    tag = Tag.find_by_name(tag_name)
+
+    if tag
+      # update if the case is different
+      tag.update!(name: tag_name) if tag.name != tag_name
+      nil
+    else
+      Tag.create!(name: tag_name)
+    end
+  end
+
+  def import_categories
+    puts "", "creating categories"
+
+    rows = query(<<~SQL)
+      SELECT categories_id, title, display_order
+      FROM jforum_categories
+      ORDER BY display_order
+    SQL
+
+    create_categories(rows) do |row|
+      {
+        id: "C#{row[:categories_id]}",
+        name: row[:title],
+        position: row[:display_order],
+        post_create_action: proc do |category|
+          url = File.join(@settings[:permalink_prefix], "forums/list/#{row[:categories_id]}.page")
+          Permalink.create(url: url, category_id: category.id) unless Permalink.find_by(url: url)
+        end
+      }
+    end
+
+    rows = query(<<~SQL)
+      SELECT forum_id, categories_id, forum_name, forum_desc, forum_order
+      FROM jforum_categories
+      ORDER BY categories_id, forum_order
+    SQL
+
+    create_categories(rows) do |row|
+      {
+        id: row[:forum_id],
+        name: row[:forum_name],
+        description: row[:forum_desc],
+        position: row[:forum_order],
+        parent_category_id: @lookup.category_id_from_imported_category_id("C#{row[:categories_id]}"),
+        post_create_action: proc do |category|
+          url = File.join(@settings[:permalink_prefix], "forums/show/#{row[:forum_id]}.page")
+          Permalink.create(url: url, category_id: category.id) unless Permalink.find_by(url: url)
+        end
+      }
+    end
+  end
+
+  def import_posts
+    puts '', 'creating topics and posts'
+    total_count = count("SELECT COUNT(1) AS count FROM jforum_posts")
+    last_post_id = 0
+
+    batches do |offset|
+      rows, last_post_id = query(<<~SQL, :post_id)
+        SELECT p.post_id, p.topic_id, p.user_id, t.topic_title, pt.post_text, p.post_time, t.topic_status,
+               t.topic_type, t.topic_views, p.poster_ip, p.forum_id, t.topic_acceptedanswer_post_id,
+               EXISTS (SELECT 1 FROM jforum_attach a WHERE a.post_id = p.post_id) AS has_attachments,
+               COALESCE(
+                 (SELECT x.post_id FROM jforum_posts x WHERE x.post_id = t.topic_first_post_id),
+                 (SELECT MIN(x.post_id) FROM jforum_posts x WHERE x.topic_id = t.topic_id)
+               ) AS topic_first_post_id
+        FROM jforum_posts p
+            JOIN jforum_topics t ON p.topic_id = t.topic_id
+            LEFT OUTER JOIN jforum_posts_text pt ON p.post_id = pt.post_id
+        WHERE p.post_id > #{last_post_id}
+        ORDER BY p.post_id
+        LIMIT #{BATCH_SIZE}
+      SQL
+      break if rows.size < 1
+
+      next if all_records_exist?(:posts, rows.map { |row| row[:post_id] })
+
+      create_posts(rows, total: total_count, offset: offset) do |row|
+        user_id = @lookup.user_id_from_imported_user_id(row[:user_id]) || Discourse::SYSTEM_USER_ID
+        is_first_post = row[:post_id] == row[:topic_first_post_id]
+        post_text = fix_bbcodes(row[:post_text])
+
+        if row[:has_attachments] > 0
+          attachments = import_attachments(row[:post_id], user_id)
+          post_text << "\n" << attachments.join("\n")
+        end
+
+        mapped = {
+          id: row[:post_id],
+          user_id: user_id,
+          created_at: row[:post_time],
+          raw: post_text,
+          import_topic_id: row[:topic_id]
+        }
+
+        if row[:topic_acceptedanswer_post_id] == row[:post_id]
+          mapped[:custom_fields] = { is_accepted_answer: "true" }
+        end
+
+        if is_first_post
+          map_first_post(row, mapped)
+        else
+          map_other_post(row, mapped)
+        end
+      end
+    end
+  end
+
+  def map_first_post(row, mapped)
+    mapped[:title] = CGI.unescapeHTML(row[:topic_title]).strip[0...255]
+    mapped[:views] = row[:topic_views]
+    mapped[:post_create_action] = proc do |post|
+      url = File.join(@settings[:permalink_prefix], "posts/list/#{row[:topic_id]}.page")
+      Permalink.create(url: url, topic_id: post.topic.id) unless Permalink.find_by(url: url)
+
+      TopicViewItem.add(post.topic_id, row[:poster_ip], post.user_id, post.created_at, true)
+    end
+
+    mapped[:tags] = @tags_by_import_forum_id[row[:forum_id]] if @settings[:import_categories_as_tags]
+    mapped[:category] = @lookup.category_id_from_imported_category_id(row[:forum_id])
+
+    mapped
+  end
+
+  def map_other_post(row, mapped)
+    parent = @lookup.topic_lookup_from_imported_post_id(row[:topic_first_post_id])
+
+    if parent.blank?
+      puts "Parent post #{row[:topic_first_post_id]} doesn't exist. Skipping #{row[:post_id]}: #{row[:topic_title][0..40]}"
+      return nil
+    end
+
+    mapped[:topic_id] = parent[:topic_id]
+    mapped[:post_create_action] = proc do |post|
+      TopicViewItem.add(post.topic_id, row[:poster_ip], post.user_id, post.created_at, true)
+    end
+
+    mapped
+  end
+
+  def import_attachments(post_id, user_id)
+    rows = query(<<~SQL)
+      SELECT d.physical_filename, d.real_filename
+      FROM jforum_attach a
+        JOIN jforum_attach_desc d USING (attach_id)
+      WHERE a.post_id = #{post_id}
+      ORDER BY a.attach_id
+    SQL
+    return nil if rows.size < 1
+
+    attachments = []
+
+    rows.each do |row|
+      path = File.join(@settings[:attachment_directory], row[:physical_filename])
+      filename = CGI.unescapeHTML(row[:real_filename])
+      upload = @uploader.create_upload(user_id, path, filename)
+
+      if upload.nil? || !upload.persisted?
+        puts "Failed to upload #{path}"
+        puts upload.errors.inspect if upload
+      else
+        attachments << @uploader.html_for_upload(upload, filename)
+      end
+    end
+
+    attachments
+  end
+
+  def mark_topics_as_solved
+    puts "", "Marking topics as solved..."
+
+    DB.exec <<~SQL
+      INSERT INTO topic_custom_fields (name, value, topic_id, created_at, updated_at)
+      SELECT 'accepted_answer_post_id', pcf.post_id, p.topic_id, p.created_at, p.created_at
+        FROM post_custom_fields pcf
+        JOIN posts p ON p.id = pcf.post_id
+       WHERE pcf.name = 'is_accepted_answer' AND pcf.value = 'true'
+         AND NOT EXISTS (
+           SELECT 1
+           FROM topic_custom_fields x
+           WHERE x.topic_id = p.topic_id AND x.name = 'accepted_answer_post_id'
+         )
+    SQL
+  end
+
+  def import_likes
+    puts "", "Importing likes..."
+    total_count = count(<<~SQL)
+      SELECT COUNT(1) AS count
+      FROM jforum_karma k
+      WHERE k.points >= 2
+        AND EXISTS (SELECT 1 FROM jforum_posts p WHERE k.post_id = p.post_id)
+        AND EXISTS (SELECT 1 FROM jforum_users u WHERE k.from_user_id = u.user_id)
+    SQL
+    current_index = 0
+    last_post_id = 0
+    last_user_id = 0
+
+    batches do |_|
+      rows, last_post_id, last_user_id = query(<<~SQL, :post_id, :from_user_id)
+        SELECT k.post_id, k.from_user_id, k.rate_date
+        FROM jforum_karma k
+        WHERE k.points >= 2 AND ((k.post_id = #{last_post_id} AND k.from_user_id > #{last_user_id}) OR k.post_id > #{last_post_id})
+          AND EXISTS (SELECT 1 FROM jforum_posts p WHERE k.post_id = p.post_id)
+          AND EXISTS (SELECT 1 FROM jforum_users u WHERE k.from_user_id = u.user_id) 
+        ORDER BY k.post_id, k.from_user_id
+        LIMIT #{BATCH_SIZE}
+      SQL
+      break if rows.size < 1
+
+      rows.each do |row|
+        created_by = User.find_by(id: @lookup.user_id_from_imported_user_id(row[:from_user_id]))
+        post = Post.find_by(id: @lookup.post_id_from_imported_post_id(row[:post_id]))
+
+        if created_by && post
+          PostActionCreator.create(created_by, post, :like, created_at: row[:rate_date])
+        end
+
+        current_index += 1
+        print_status(current_index, total_count, get_start_time("likes"))
+      end
+    end
+  end
+
+  def import_category_subscriptions
+    puts "", "Importing category subscriptions..."
+    total_count = count(<<~SQL)
+      SELECT COUNT(1) AS count
+      FROM (
+               SELECT forum_id, user_id
+               FROM jforum_forums_watch
+               UNION
+               SELECT forum_id, user_id
+               FROM jforum_digest_forums
+           ) x
+      WHERE EXISTS (SELECT 1 FROM jforum_forums f WHERE x.forum_id = f.forum_id)
+    SQL
+    current_index = 0
+    last_forum_id = 0
+    last_user_id = 0
+
+    batches do |_|
+      rows, last_forum_id, last_user_id = query(<<~SQL, :forum_id, :user_id)
+        SELECT x.forum_id, x.user_id
+        FROM jforum_forums_watch x
+        WHERE ((x.forum_id = #{last_forum_id} AND x.user_id > #{last_user_id}) OR x.forum_id > #{last_forum_id})
+          AND EXISTS (SELECT 1 FROM jforum_forums f WHERE x.forum_id = f.forum_id)
+        UNION
+        SELECT forum_id, user_id
+        FROM jforum_digest_forums x
+        WHERE ((x.forum_id = #{last_forum_id} AND x.user_id > #{last_user_id}) OR x.forum_id > #{last_forum_id})
+          AND EXISTS (SELECT 1 FROM jforum_forums f WHERE x.forum_id = f.forum_id)
+        ORDER BY forum_id, user_id
+        LIMIT #{BATCH_SIZE}
+      SQL
+      break if rows.size < 1
+
+      tags = Tag.all.pluck(:name, :id).to_h
+
+      rows.each do |row|
+        user_id = @lookup.user_id_from_imported_user_id(row[:user_id])
+
+        if @settings[:import_categories_as_tags]
+          tag_names = @tags_by_import_forum_id[row[:forum_id]]
+          tag_ids = tag_names ? tag_names.map { |name| tags[name] } : nil
+
+          if user_id && tag_ids.present?
+            tag_ids.each do |tag_id|
+              TagUser.change(user_id, tag_id, TagUser.notification_levels[:watching])
+            end
+          end
+        else
+          user = User.find_by(id: user_id)
+          category_id = @lookup.category_id_from_imported_category_id(row[:forum_id])
+
+          if user && category_id
+            CategoryUser.set_notification_level_for_category(user, NotificationLevels.all[:watching], category_id)
+          end
+        end
+
+        current_index += 1
+        print_status(current_index, total_count, get_start_time("category_subscriptions"))
+      end
+    end
+  end
+
+  def import_topic_subscriptions
+    puts "", "Importing topic subscriptions..."
+    total_count = count(<<~SQL)
+      SELECT COUNT(1) AS count
+      FROM jforum_topics_watch x
+      WHERE EXISTS (SELECT 1 FROM jforum_topics t WHERE x.topic_id = t.topic_id)
+    SQL
+    current_index = 0
+    last_topic_id = 0
+    last_user_id = 0
+
+    batches do |_|
+      rows, last_topic_id, last_user_id = query(<<~SQL, :topic_id, :user_id)
+        SELECT x.topic_id, x.user_id,
+          COALESCE(
+            (SELECT x.post_id FROM jforum_posts x WHERE x.post_id = t.topic_first_post_id),
+            (SELECT MIN(x.post_id) FROM jforum_posts x WHERE x.topic_id = t.topic_id)
+          ) AS topic_first_post_id
+        FROM jforum_topics_watch x
+          JOIN jforum_topics t ON x.topic_id = t.topic_id
+        WHERE ((x.topic_id = #{last_topic_id} AND x.user_id > #{last_user_id}) OR x.topic_id > #{last_topic_id})
+        ORDER BY topic_id, user_id
+        LIMIT #{BATCH_SIZE}
+      SQL
+      break if rows.size < 1
+
+      rows.each do |row|
+        user_id = @lookup.user_id_from_imported_user_id(row[:user_id])
+        topic = @lookup.topic_lookup_from_imported_post_id(row[:topic_first_post_id])
+
+        if user_id && topic
+          TopicUser.change(user_id, topic[:topic_id], notification_level: NotificationLevels.all[:watching])
+        end
+
+        current_index += 1
+        print_status(current_index, total_count, get_start_time("topic_subscriptions"))
+      end
+    end
+  end
+
+  def fix_bbcodes(text)
+    return text if text.blank?
+
+    text = text.dup
+    text.gsub!(/\r\n/, "\n")
+
+    fix_bbcode_tag!(tag: "quote", text: text)
+    fix_bbcode_tag!(tag: "code", text: text)
+    fix_bbcode_tag!(tag: "list", text: text)
+    fix_bbcode_tag!(tag: "center", text: text)
+    fix_bbcode_tag!(tag: "right", text: text)
+    fix_bbcode_tag!(tag: "left", text: text)
+
+    fix_inline_bbcode!(tag: "i", text: text)
+    fix_inline_bbcode!(tag: "b", text: text)
+    fix_inline_bbcode!(tag: "s", text: text)
+    fix_inline_bbcode!(tag: "u", text: text)
+    fix_inline_bbcode!(tag: "size", text: text)
+    fix_inline_bbcode!(tag: "font", text: text)
+    fix_inline_bbcode!(tag: "color", text: text)
+
+    text
+  end
+
+  def fix_bbcode_tag!(tag:, text:)
+    text.gsub!(/\s+(\[#{tag}\].*?\[\/#{tag}\])/im, '\1')
+
+    text.gsub!(/(\[#{tag}.*?\])(?!$)/i) { "#{$1}\n" }
+    text.gsub!(/((?<!^)\[#{tag}.*?\])/i) { "\n#{$1}" }
+
+    text.gsub!(/(\[\/#{tag}\])(?!$)/i) { "#{$1}\n" }
+    text.gsub!(/((?<!^)\[\/#{tag}\])/i) { "\n#{$1}" }
+  end
+
+  def fix_inline_bbcode!(tag:, text:)
+    text.gsub!(/\[(#{tag}.*?)\](.*?)\[\/#{tag}\]/im) do
+      beginning_tag = $1
+      content = $2.gsub(/(\n{2,})/) { "[/#{tag}]#{$1}[#{beginning_tag}]" }
+      "[#{beginning_tag}]#{content}[/#{tag}]"
+    end
+  end
+
+  def batches
+    super(BATCH_SIZE)
+  end
+
+  def query(sql, *last_columns)
+    rows = @database_client.query(sql, cache_rows: true, symbolize_keys: true)
+    return rows if last_columns.length == 0
+
+    result = [rows]
+    last_row = rows.to_a.last
+
+    last_columns.each { |column| result.push(last_row ? last_row[column] : nil) }
+    result
+  end
+
+  # Executes a database query and returns the value of the 'count' column.
+  def count(sql)
+    query(sql).first[:count]
+  end
+end
+
+ImportScripts::JForum.new.perform
diff --git a/script/import_scripts/settings/jforum.yml b/script/import_scripts/settings/jforum.yml
new file mode 100644
index 0000000000..5eca85c3fc
--- /dev/null
+++ b/script/import_scripts/settings/jforum.yml
@@ -0,0 +1,33 @@
+database:
+  host: localhost
+  port: 3306
+  username: root
+  password: password
+  schema: db_name
+
+avatar_directory: /shared/import/avatar
+attachment_directory: /shared/import/upload
+
+# folder name of old forum in URL
+permalink_prefix: foo
+
+import_categories_as_tags: true
+
+additional_tags:
+  - old_category_name: !ruby/regexp '/something/'
+    tag_names:
+      - "Foo"
+      - "Bar"
+
+category_mappings:
+  - old_category_name: !ruby/regexp '/HIDDEN/'
+    category_id: 23
+
+custom_fields:
+  - name: "State"
+    column: "state_porvince"
+  - name: "Country"
+    column: "user_from"
+  - name: "Company"
+    column: "company_name"
+    alias: "company"

From d04234c667d93b23be3ec3050e6438fa51e2e1ef Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Sun, 21 Jun 2020 17:58:23 +0200
Subject: [PATCH 1784/1830] DEV: Fix typos in tests

---
 test/javascripts/acceptance/group-test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/javascripts/acceptance/group-test.js b/test/javascripts/acceptance/group-test.js
index 530774b0d6..a44c390ebf 100644
--- a/test/javascripts/acceptance/group-test.js
+++ b/test/javascripts/acceptance/group-test.js
@@ -28,7 +28,7 @@ QUnit.test("Anonymous Viewing Group", async assert => {
   assert.equal(
     count(".nav-pills li a[title='Messages']"),
     0,
-    "it deos not show group messages navigation link"
+    "it does not show group messages navigation link"
   );
 
   await click(".nav-pills li a[title='Activity']");
@@ -83,7 +83,7 @@ QUnit.test("Anonymous Viewing Automatic Group", async assert => {
   assert.equal(
     count(".nav-pills li a[title='Manage']"),
     0,
-    "it deos not show group messages navigation link"
+    "it does not show group messages navigation link"
   );
 });
 

From 26260d50b1c8abd39167847786d221a0f46b0e82 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 22 Jun 2020 02:36:45 +0200
Subject: [PATCH 1785/1830] DEV: Import `I18n` in standard plugins (#10098)

---
 .../assets/javascripts/initializers/apply-details.js.es6         | 1 +
 .../components/discourse-local-dates-create-form.js.es6          | 1 +
 .../assets/javascripts/lib/local-date-builder.js.es6             | 1 +
 .../initializers/discourse-unsupported-browser.js.es6            | 1 +
 .../poll/assets/javascripts/controllers/poll-ui-builder.js.es6   | 1 +
 .../poll/assets/javascripts/lib/discourse-markdown/poll.js.es6   | 1 +
 plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6    | 1 +
 7 files changed, 7 insertions(+)

diff --git a/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6 b/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6
index 78773e8d43..65e7eb3d56 100644
--- a/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6
+++ b/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { withPluginApi } from "discourse/lib/plugin-api";
 
 function initializeDetails(api) {
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
index 0ba26c48b4..dd4050ee71 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import EmberObject from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { schedule } from "@ember/runloop";
diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
index 7c4dd7862f..63a9a88478 100644
--- a/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import DateWithZoneHelper from "./date-with-zone-helper";
 
 const TIME_FORMAT = "LLL";
diff --git a/plugins/discourse-unsupported-browser/assets/javascripts/initializers/discourse-unsupported-browser.js.es6 b/plugins/discourse-unsupported-browser/assets/javascripts/initializers/discourse-unsupported-browser.js.es6
index a2c96deb82..59cdbb1592 100644
--- a/plugins/discourse-unsupported-browser/assets/javascripts/initializers/discourse-unsupported-browser.js.es6
+++ b/plugins/discourse-unsupported-browser/assets/javascripts/initializers/discourse-unsupported-browser.js.es6
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { withPluginApi } from "discourse/lib/plugin-api";
 
 function initializeInternetExplorerDeprecation(api) {
diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
index 8dc72084c7..0eca3fa851 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import Controller from "@ember/controller";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import EmberObject from "@ember/object";
diff --git a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6 b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
index 14de1cae4a..61fc52f0f3 100644
--- a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
+++ b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
@@ -1,4 +1,5 @@
 /*eslint no-bitwise:0 */
+import I18n from "I18n";
 
 const DATA_PREFIX = "data-poll-";
 const DEFAULT_POLL_NAME = "poll";
diff --git a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
index 3ca2b793c6..96f6f32003 100644
--- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
+++ b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import { createWidget } from "discourse/widgets/widget";
 import { h } from "virtual-dom";
 import { iconNode } from "discourse-common/lib/icon-library";

From 516a03be0962865b7f25fa47cd5ffcf75b943718 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Mon, 22 Jun 2020 13:14:16 +1000
Subject: [PATCH 1786/1830] FIX: Improve admin permalink UX (#10101)

The admin permalink list was a little tricky to use because the URLs are easily reduced with a ... if they are too long. This adds a copy to clipboard button for the URL and a title on hover so the full text of the URL can be seen.
---
 .../javascripts/admin/controllers/admin-permalinks.js  | 10 ++++++++++
 .../admin/templates/components/permalink-form.hbs      |  1 +
 app/assets/javascripts/admin/templates/permalinks.hbs  |  4 ++--
 app/assets/stylesheets/common/admin/customize.scss     |  2 +-
 config/locales/client.en.yml                           |  3 ++-
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-permalinks.js b/app/assets/javascripts/admin/controllers/admin-permalinks.js
index 177bb4148d..23c47f5739 100644
--- a/app/assets/javascripts/admin/controllers/admin-permalinks.js
+++ b/app/assets/javascripts/admin/controllers/admin-permalinks.js
@@ -22,6 +22,16 @@ export default Controller.extend({
       this.model.unshiftObject(arg);
     },
 
+    copyUrl(pl) {
+      let linkElement = document.querySelector(`#admin-permalink-${pl.id}`);
+      let textArea = document.createElement("textarea");
+      textArea.value = linkElement.textContent;
+      document.body.appendChild(textArea);
+      textArea.select();
+      document.execCommand("Copy");
+      textArea.remove();
+    },
+
     destroy: function(record) {
       return bootbox.confirm(
         I18n.t("admin.permalink.delete_confirm"),
diff --git a/app/assets/javascripts/admin/templates/components/permalink-form.hbs b/app/assets/javascripts/admin/templates/components/permalink-form.hbs
index 1f5d1c06f2..8792d78734 100644
--- a/app/assets/javascripts/admin/templates/components/permalink-form.hbs
+++ b/app/assets/javascripts/admin/templates/components/permalink-form.hbs
@@ -12,6 +12,7 @@
   content=permalinkTypes
   value=permalinkType
   onChange=(action (mut permalinkType))
+  class="permalink-type"
 }}
 
 {{text-field
diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs
index 1424e530b9..a66151140a 100644
--- a/app/assets/javascripts/admin/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/templates/permalinks.hbs
@@ -21,7 +21,7 @@
       <tbody>
         {{#each model as |pl|}}
           <tr class="admin-list-item">
-            <td class="col first url">{{pl.url}}</td>
+            <td class="col first url">{{d-button title="admin.permalink.copy_to_clipboard" icon="far-clipboard" action=(action "copyUrl" pl)}} <span id="admin-permalink-{{pl.id}}" title={{pl.url}}>{{pl.url}}</span></td>
             <td class="col destination">
               {{#if pl.topic_id}}
                 <a href={{pl.topic_url}}>{{pl.topic_title}}</a>
@@ -42,7 +42,7 @@
                 <a href={{pl.external_url}}>{{pl.external_url}}</a>
               {{/if}}
             </td>
-            <td class="col action">
+            <td class="col action" style="text-align: right;">
               {{d-button action=(action "destroy") actionParam=pl icon="far-trash-alt" class="btn-danger"}}
             </td>
           </tr>
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 7fd4fc4f4c..5f24c7b946 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -623,7 +623,7 @@
   }
 
   .select-kit {
-    width: 150px;
+    width: 200px;
   }
   input {
     margin: 5px 0;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 301e9d522b..0045b41d07 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4760,8 +4760,9 @@ en:
         category_id: "Category ID"
         category_title: "Category"
         tag_name: "Tag name"
-        external_url: "External URL"
+        external_url: "External or Relative URL"
         destination: "Destination"
+        copy_to_clipboard: "Copy Permalink to Clipboard"
         delete_confirm: Are you sure you want to delete this permalink?
         form:
           label: "New:"

From 3370ef188eb04b629c57717eb70150c87ba41f84 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 17 Jun 2020 16:50:50 +0800
Subject: [PATCH 1787/1830] FEATURE: Remove deprecated uploads url site
 settings.

The site settings have been replaced with direct image upload since
Discourse 2.3.
---
 app/jobs/onceoff/migrate_url_site_settings.rb | 92 -------------------
 .../clean_up_deprecated_url_site_settings.rb  | 16 ----
 app/jobs/scheduled/clean_up_uploads.rb        |  9 --
 config/site_settings.yml                      | 30 ------
 ...blank_override_for_upload_site_settings.rb | 42 ---------
 ..._null_override_for_upload_site_settings.rb | 42 ---------
 lib/site_settings/deprecated_settings.rb      | 10 --
 .../spec/lib/certificate_generator_spec.rb    |  1 -
 ...an_up_deprecated_url_site_settings_spec.rb | 30 ------
 spec/jobs/clean_up_uploads_spec.rb            | 42 ---------
 spec/jobs/migrate_url_site_settings_spec.rb   | 74 ---------------
 11 files changed, 388 deletions(-)
 delete mode 100644 app/jobs/onceoff/migrate_url_site_settings.rb
 delete mode 100644 app/jobs/scheduled/clean_up_deprecated_url_site_settings.rb
 delete mode 100644 db/migrate/20190315025804_migrate_blank_override_for_upload_site_settings.rb
 delete mode 100644 db/migrate/20190315055432_migrate_null_override_for_upload_site_settings.rb
 delete mode 100644 spec/jobs/clean_up_deprecated_url_site_settings_spec.rb
 delete mode 100644 spec/jobs/migrate_url_site_settings_spec.rb

diff --git a/app/jobs/onceoff/migrate_url_site_settings.rb b/app/jobs/onceoff/migrate_url_site_settings.rb
deleted file mode 100644
index 7f0bb37d1e..0000000000
--- a/app/jobs/onceoff/migrate_url_site_settings.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class MigrateUrlSiteSettings < ::Jobs::Onceoff
-    SETTINGS = [
-      ['logo_url', 'logo'],
-      ['logo_small_url', 'logo_small'],
-      ['digest_logo_url', 'digest_logo'],
-      ['mobile_logo_url', 'mobile_logo'],
-      ['large_icon_url', 'large_icon'],
-      ['favicon_url', 'favicon'],
-      ['apple_touch_icon_url', 'apple_touch_icon'],
-      ['default_opengraph_image_url', 'opengraph_image'],
-      ['twitter_summary_large_image_url', 'twitter_summary_large_image'],
-      ['push_notifications_icon_url', 'push_notifications_icon'],
-    ]
-
-    def execute_onceoff(args)
-      SETTINGS.each do |old_setting, new_setting|
-        upload = SiteSetting.get(new_setting)
-
-        next if upload && upload.id >= Upload::SEEDED_ID_THRESHOLD
-
-        old_url = DB.query_single(
-          "SELECT value FROM site_settings WHERE name = '#{old_setting}'"
-        ).first
-
-        next if old_url.blank?
-
-        count = 0
-        file = nil
-        sleep_interval = 5
-
-        loop do
-          url = UrlHelper.absolute_without_cdn(old_url)
-
-          begin
-            file = FileHelper.download(
-              url,
-              max_file_size: [
-                SiteSetting.max_image_size_kb.kilobytes,
-                20.megabytes
-              ].max,
-              tmp_file_name: 'tmp_site_setting_logo',
-              skip_rate_limit: true,
-              follow_redirect: true
-            )
-          rescue OpenURI::HTTPError,
-                 OpenSSL::SSL::SSLError,
-                 Net::OpenTimeout,
-                 Net::ReadTimeout,
-                 Errno::ECONNREFUSED,
-                 EOFError,
-                 SocketError,
-                 Discourse::InvalidParameters => e
-
-            logger.warn(
-              "Error encountered when trying to download file " +
-              "for #{new_setting}.\n#{e.class}: #{e.message}\n#{e.backtrace.join("\n")}"
-            )
-          end
-
-          count += 1
-          break if file || (file.blank? && count >= 3)
-
-          logger.info(
-            "Failed to download upload from #{url} for #{new_setting}. Retrying..."
-          )
-
-          sleep(count * sleep_interval)
-        end
-
-        next if file.blank?
-
-        upload = UploadCreator.new(
-          file,
-          "#{new_setting}",
-          origin: UrlHelper.absolute(old_url),
-          for_site_setting: true
-        ).create_for(Discourse.system_user.id)
-
-        SiteSetting.set(new_setting, upload)
-      end
-    end
-
-    private
-
-    def logger
-      Rails.logger
-    end
-  end
-end
diff --git a/app/jobs/scheduled/clean_up_deprecated_url_site_settings.rb b/app/jobs/scheduled/clean_up_deprecated_url_site_settings.rb
deleted file mode 100644
index 12d947ec21..0000000000
--- a/app/jobs/scheduled/clean_up_deprecated_url_site_settings.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class CleanUpDeprecatedUrlSiteSettings < ::Jobs::Scheduled
-    every 1.day
-
-    def execute(args)
-      ::Jobs::MigrateUrlSiteSettings::SETTINGS.each do |old_setting, new_setting|
-        if SiteSetting.where("name = ? AND value IS NOT NULL", new_setting).exists?
-          SiteSetting.set(old_setting, nil, warn: false)
-          SiteSetting.find_by(name: old_setting).destroy!
-        end
-      end
-    end
-  end
-end
diff --git a/app/jobs/scheduled/clean_up_uploads.rb b/app/jobs/scheduled/clean_up_uploads.rb
index 95f528c544..75e91a8df3 100644
--- a/app/jobs/scheduled/clean_up_uploads.rb
+++ b/app/jobs/scheduled/clean_up_uploads.rb
@@ -27,15 +27,6 @@ module Jobs
 
       # Any URLs in site settings are fair game
       ignore_urls = [
-        SiteSetting.logo_url(warn: false),
-        SiteSetting.logo_small_url(warn: false),
-        SiteSetting.digest_logo_url(warn: false),
-        SiteSetting.mobile_logo_url(warn: false),
-        SiteSetting.large_icon_url(warn: false),
-        SiteSetting.favicon_url(warn: false),
-        SiteSetting.default_opengraph_image_url(warn: false),
-        SiteSetting.twitter_summary_large_image_url(warn: false),
-        SiteSetting.apple_touch_icon_url(warn: false),
         *SiteSetting.selectable_avatars.split("\n"),
       ].flatten.map do |url|
         if url.present?
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 502d71cbc1..06549cd673 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -62,30 +62,18 @@ branding:
     default: -5
     client: true
     type: upload
-  logo_url:
-    hidden: true
-    default: "/images/d-logo-sketch.png"
   logo_small:
     default: -6
     client: true
     type: upload
-  logo_small_url:
-    hidden: true
-    default: "/images/d-logo-sketch-small.png"
   digest_logo:
     default: ""
     client: true
     type: upload
-  digest_logo_url:
-    hidden: true
-    default: ""
   mobile_logo:
     default: ""
     client: true
     type: upload
-  mobile_logo_url:
-    hidden: true
-    default: ""
   large_icon:
     default: ""
     client: true
@@ -93,35 +81,20 @@ branding:
   manifest_icon:
     default: ""
     type: upload
-  large_icon_url:
-    hidden: true
-    default: ""
   favicon:
     default: ""
     client: true
     type: upload
-  favicon_url:
-    hidden: true
-    default: "/images/default-favicon.ico"
   apple_touch_icon:
     default: ""
     client: true
     type: upload
-  apple_touch_icon_url:
-    hidden: true
-    default: "/images/default-apple-touch-icon.png"
   opengraph_image:
     default: ""
     type: upload
-  default_opengraph_image_url:
-    hidden: true
-    default: ""
   twitter_summary_large_image:
     default: ""
     type: upload
-  twitter_summary_large_image_url:
-    hidden: true
-    default: ""
 
 basic:
   display_local_time_in_user_card:
@@ -300,9 +273,6 @@ basic:
   push_notifications_icon:
     default: ""
     type: upload
-  push_notifications_icon_url:
-    hidden: true
-    default: ""
   short_title:
     default: ""
     max: 12
diff --git a/db/migrate/20190315025804_migrate_blank_override_for_upload_site_settings.rb b/db/migrate/20190315025804_migrate_blank_override_for_upload_site_settings.rb
deleted file mode 100644
index 1e5a3c5e33..0000000000
--- a/db/migrate/20190315025804_migrate_blank_override_for_upload_site_settings.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-class MigrateBlankOverrideForUploadSiteSettings < ActiveRecord::Migration[5.2]
-  def up
-    {
-      'logo_url' => 'logo',
-      'logo_small_url' => 'logo_small',
-      'digest_logo_url' => 'digest_logo',
-      'mobile_logo_url' => 'mobile_logo',
-      'large_icon_url' => 'large_icon',
-      'favicon_url' => 'favicon',
-      'apple_touch_icon_url' => 'apple_touch_icon',
-      'default_opengraph_image_url' => 'opengraph_image',
-      'twitter_summary_large_image_url' => 'twitter_summary_large_image',
-      'push_notifications_icon_url' => 'push_notifications_icon'
-    }.each do |old_name, new_name|
-      if DB.query_single("SELECT 1 FROM site_settings WHERE name = '#{old_name}' AND value = ''").present? &&
-         DB.query_single("SELECT 1 FROM site_settings WHERE name = '#{new_name}'").empty?
-
-        ActiveRecord::Base.connection.execute <<~SQL
-        INSERT INTO site_settings (
-          name,
-          data_type,
-          value,
-          created_at,
-          updated_at
-        ) VALUES (
-          '#{new_name}',
-          18,
-          '',
-          CURRENT_TIMESTAMP,
-          CURRENT_TIMESTAMP
-        )
-        SQL
-      end
-    end
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-end
diff --git a/db/migrate/20190315055432_migrate_null_override_for_upload_site_settings.rb b/db/migrate/20190315055432_migrate_null_override_for_upload_site_settings.rb
deleted file mode 100644
index f47b35276f..0000000000
--- a/db/migrate/20190315055432_migrate_null_override_for_upload_site_settings.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-class MigrateNullOverrideForUploadSiteSettings < ActiveRecord::Migration[5.2]
-  def up
-    {
-      'logo_url' => 'logo',
-      'logo_small_url' => 'logo_small',
-      'digest_logo_url' => 'digest_logo',
-      'mobile_logo_url' => 'mobile_logo',
-      'large_icon_url' => 'large_icon',
-      'favicon_url' => 'favicon',
-      'apple_touch_icon_url' => 'apple_touch_icon',
-      'default_opengraph_image_url' => 'opengraph_image',
-      'twitter_summary_large_image_url' => 'twitter_summary_large_image',
-      'push_notifications_icon_url' => 'push_notifications_icon'
-    }.each do |old_name, new_name|
-      if DB.query_single("SELECT 1 FROM site_settings WHERE name = '#{old_name}' AND value IS NULL").present? &&
-         DB.query_single("SELECT 1 FROM site_settings WHERE name = '#{new_name}'").empty?
-
-        ActiveRecord::Base.connection.execute <<~SQL
-        INSERT INTO site_settings (
-          name,
-          data_type,
-          value,
-          created_at,
-          updated_at
-        ) VALUES (
-          '#{new_name}',
-          18,
-          '',
-          CURRENT_TIMESTAMP,
-          CURRENT_TIMESTAMP
-        )
-        SQL
-      end
-    end
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-end
diff --git a/lib/site_settings/deprecated_settings.rb b/lib/site_settings/deprecated_settings.rb
index 9eaa03f1a5..a414c7ef91 100644
--- a/lib/site_settings/deprecated_settings.rb
+++ b/lib/site_settings/deprecated_settings.rb
@@ -4,16 +4,6 @@ module SiteSettings; end
 
 module SiteSettings::DeprecatedSettings
   SETTINGS = [
-    ['logo_url', 'logo', false, '2.3'],
-    ['logo_small_url', 'logo_small', false, '2.3'],
-    ['digest_logo_url', 'digest_logo', false, '2.3'],
-    ['mobile_logo_url', 'mobile_logo', false, '2.3'],
-    ['large_icon_url', 'large_icon', false, '2.3'],
-    ['favicon_url', 'favicon', false, '2.3'],
-    ['apple_touch_icon_url', 'apple_touch_icon', false, '2.3'],
-    ['default_opengraph_image_url', 'opengraph_image', false, '2.3'],
-    ['twitter_summary_large_image_url', 'twitter_summary_large_image', false, '2.3'],
-    ['push_notifications_icon_url', 'push_notifications_icon', false, '2.3'],
     ['show_email_on_profile', 'moderators_view_emails', true, '2.4'],
     ['allow_moderators_to_create_categories', 'moderators_create_categories', true, '2.4'],
     ['disable_edit_notifications', 'disable_system_edit_notifications', true, '2.4']
diff --git a/plugins/discourse-narrative-bot/spec/lib/certificate_generator_spec.rb b/plugins/discourse-narrative-bot/spec/lib/certificate_generator_spec.rb
index 991cd082b3..3db82162e9 100644
--- a/plugins/discourse-narrative-bot/spec/lib/certificate_generator_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/lib/certificate_generator_spec.rb
@@ -17,7 +17,6 @@ RSpec.describe DiscourseNarrativeBot::CertificateGenerator do
     describe 'when SiteSetting.site_logo_small_url is blank' do
       before do
         SiteSetting.logo_small = ''
-        SiteSetting.logo_small_url = ''
       end
 
       it 'should not try to fetch a image' do
diff --git a/spec/jobs/clean_up_deprecated_url_site_settings_spec.rb b/spec/jobs/clean_up_deprecated_url_site_settings_spec.rb
deleted file mode 100644
index fd52644eae..0000000000
--- a/spec/jobs/clean_up_deprecated_url_site_settings_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Jobs::CleanUpDeprecatedUrlSiteSettings do
-  before do
-    @original_provider = SiteSetting.provider
-    SiteSetting.provider = SiteSettings::DbProvider.new(SiteSetting)
-  end
-
-  after do
-    SiteSetting.delete_all
-    SiteSetting.provider = @original_provider
-  end
-
-  it 'should clean up the old deprecated site settings correctly' do
-    logo_upload = Fabricate(:upload)
-    SiteSetting.logo = logo_upload
-    SiteSetting.set("logo_url", '/test/some/url', warn: false)
-    SiteSetting.set("logo_small_url", '/test/another/url', warn: false)
-
-    expect do
-      described_class.new.execute({})
-    end.to change { SiteSetting.logo_url }.from("/test/some/url").to("")
-
-    expect(SiteSetting.exists?(name: "logo_url")).to eq(false)
-    expect(SiteSetting.logo).to eq(logo_upload)
-    expect(SiteSetting.logo_small_url).to eq('/test/another/url')
-  end
-end
diff --git a/spec/jobs/clean_up_uploads_spec.rb b/spec/jobs/clean_up_uploads_spec.rb
index 3608e04398..828e1b6c9b 100644
--- a/spec/jobs/clean_up_uploads_spec.rb
+++ b/spec/jobs/clean_up_uploads_spec.rb
@@ -127,60 +127,18 @@ describe Jobs::CleanUpUploads do
   end
 
   it "does not clean up uploads with URLs used in site settings" do
-    logo_upload = fabricate_upload
-    logo_small_upload = fabricate_upload
-    digest_logo_upload = fabricate_upload
-    mobile_logo_upload = fabricate_upload
-    large_icon_upload = fabricate_upload
-    default_opengraph_image_upload = fabricate_upload
-    twitter_summary_large_image_upload = fabricate_upload
-    favicon_upload = fabricate_upload
-    apple_touch_icon_upload = fabricate_upload
     avatar1_upload = fabricate_upload
     avatar2_upload = fabricate_upload
 
-    SiteSetting.logo_url = logo_upload.url
-    SiteSetting.logo_small_url = logo_small_upload.url
-    SiteSetting.digest_logo_url = digest_logo_upload.url
-    SiteSetting.mobile_logo_url = mobile_logo_upload.url
-    SiteSetting.large_icon_url = large_icon_upload.url
-    SiteSetting.default_opengraph_image_url = default_opengraph_image_upload.url
-
-    SiteSetting.twitter_summary_large_image_url =
-      twitter_summary_large_image_upload.url
-
-    SiteSetting.favicon_url = favicon_upload.url
-    SiteSetting.apple_touch_icon_url = apple_touch_icon_upload.url
     SiteSetting.selectable_avatars = [avatar1_upload.url, avatar2_upload.url].join("\n")
 
     Jobs::CleanUpUploads.new.execute(nil)
 
     expect(Upload.exists?(id: expired_upload.id)).to eq(false)
-    expect(Upload.exists?(id: logo_upload.id)).to eq(true)
-    expect(Upload.exists?(id: logo_small_upload.id)).to eq(true)
-    expect(Upload.exists?(id: digest_logo_upload.id)).to eq(true)
-    expect(Upload.exists?(id: mobile_logo_upload.id)).to eq(true)
-    expect(Upload.exists?(id: large_icon_upload.id)).to eq(true)
-    expect(Upload.exists?(id: default_opengraph_image_upload.id)).to eq(true)
-    expect(Upload.exists?(id: twitter_summary_large_image_upload.id)).to eq(true)
-    expect(Upload.exists?(id: favicon_upload.id)).to eq(true)
-    expect(Upload.exists?(id: apple_touch_icon_upload.id)).to eq(true)
     expect(Upload.exists?(id: avatar1_upload.id)).to eq(true)
     expect(Upload.exists?(id: avatar2_upload.id)).to eq(true)
   end
 
-  it "does not clean up uploads in site settings when they use the CDN" do
-    Discourse.stubs(:asset_host).returns("//my.awesome.cdn")
-
-    logo_small_upload = fabricate_upload
-    SiteSetting.logo_small_url = "#{Discourse.asset_host}#{logo_small_upload.url}"
-
-    Jobs::CleanUpUploads.new.execute(nil)
-
-    expect(Upload.exists?(id: expired_upload.id)).to eq(false)
-    expect(Upload.exists?(id: logo_small_upload.id)).to eq(true)
-  end
-
   it "does not delete profile background uploads" do
     profile_background_upload = fabricate_upload
     UserProfile.last.upload_profile_background(profile_background_upload)
diff --git a/spec/jobs/migrate_url_site_settings_spec.rb b/spec/jobs/migrate_url_site_settings_spec.rb
deleted file mode 100644
index c3331f0f65..0000000000
--- a/spec/jobs/migrate_url_site_settings_spec.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Jobs::MigrateUrlSiteSettings do
-  before do
-    SiteSetting.authorized_extensions = ''
-  end
-
-  it 'should migrate to the new upload site settings correctly' do
-    [
-      %w{logo_url /test.png},
-      %w{logo_small_url https://test.discourse.awesome/test.png},
-      %w{favicon_url http://test.discourse.awesome/some.ico},
-      %w{digest_logo_url /test.png},
-      %w{mobile_logo_url /test.png},
-      %w{large_icon_url /test.png},
-      %w{apple_touch_icon_url /test.png},
-      %w{default_opengraph_image_url /test.png},
-      %w{twitter_summary_large_image_url //omg.aws.somestack/test.png},
-      %w{push_notifications_icon_url //omg.aws.somestack/test.png}
-    ].each do |name, value|
-
-      SiteSetting.create!(
-        name: name,
-        value: value,
-        data_type: SiteSettings::TypeSupervisor.types[:string]
-      )
-    end
-
-    %w{
-      http://test.localhost/test.png
-      https://omg.aws.somestack/test.png
-    }.each do |url|
-      stub_request(:get, url).to_return(
-        status: 200, body: file_from_fixtures("smallest.png").read
-      )
-    end
-
-    stub_request(:get, "https://test.discourse.awesome/test.png")
-      .to_return(status: 200, body: file_from_fixtures("downsized.png").read)
-
-    stub_request(:get, "http://test.discourse.awesome/some.ico")
-      .to_return(status: 200, body: file_from_fixtures("smallest.ico").read)
-
-    expect do
-      described_class.new.execute_onceoff({})
-    end.to change { Upload.count }.by(3)
-
-    upload = Upload.find_by(original_filename: "logo.png")
-    upload2 = Upload.find_by(original_filename: "logo_small.png")
-    upload3 = Upload.find_by(original_filename: "favicon.ico")
-
-    expect(SiteSetting.logo_small).to eq(upload2)
-    expect(SiteSetting.logo_small.is_a?(Upload)).to eq(true)
-
-    expect(SiteSetting.favicon).to eq(upload3)
-    expect(SiteSetting.favicon.is_a?(Upload)).to eq(true)
-
-    %i{
-      logo
-      digest_logo
-      mobile_logo
-      large_icon
-      apple_touch_icon
-      opengraph_image
-      twitter_summary_large_image
-      push_notifications_icon
-    }.each do |setting|
-      expect(SiteSetting.get(setting)).to eq(upload)
-      expect(SiteSetting.get(setting).is_a?(Upload)).to eq(true)
-    end
-  end
-end

From 8cc8e80d7a3cb462340503085a21bb0d7498a983 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 22 Jun 2020 14:50:17 +0800
Subject: [PATCH 1788/1830] Fix the build.

---
 spec/helpers/application_helper_spec.rb | 1 -
 spec/services/site_settings_spec.rb     | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 7626bbbc39..2ccca114b3 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -342,7 +342,6 @@ describe ApplicationHelper do
         expect(helper.crawlable_meta_data).to include(SiteSetting.site_logo_url)
 
         SiteSetting.logo = nil
-        SiteSetting.logo_url = nil
 
         expect(helper.crawlable_meta_data).to include(Upload.find(SiteIconManager::SKETCH_LOGO_ID).url)
       end
diff --git a/spec/services/site_settings_spec.rb b/spec/services/site_settings_spec.rb
index c622ad1a39..906a2ac23f 100644
--- a/spec/services/site_settings_spec.rb
+++ b/spec/services/site_settings_spec.rb
@@ -32,11 +32,11 @@ describe SiteSettingsTask do
     end
 
     it "updates hidden settings" do
-      yml = "logo_url: /logo.png"
+      yml = "default_theme_id: 999999999"
       log, counts = SiteSettingsTask.import(yml)
-      expect(log[0]).to eq "Changed logo_url FROM: /images/d-logo-sketch.png TO: /logo.png"
-      expect(counts[:updated]).to eq 1
-      expect(SiteSetting.logo_url).to eq "/logo.png"
+      expect(log[0]).to eq "Changed default_theme_id FROM: 2 TO: 999999999"
+      expect(counts[:updated]).to eq(1)
+      expect(SiteSetting.default_theme_id).to eq(999999999)
     end
 
     it "won't update a setting that doesn't exist" do

From aff9bfd5bcf848a9cec0c436fb38fda4f19ce2c9 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Mon, 22 Jun 2020 16:48:00 +0300
Subject: [PATCH 1789/1830] FIX: Fix select kit size (#10094)

---
 .../select-kit/addon/components/select-kit.js          | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit.js b/app/assets/javascripts/select-kit/addon/components/select-kit.js
index 8ad01cc338..1b0b1859dd 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit.js
@@ -800,15 +800,19 @@ export default Component.extend(
               name: "applySmallScreenMaxWidth",
               enabled: window.innerWidth <= 450,
               phase: "beforeWrite",
-              fn({ state }) {
+              fn: ({ state }) => {
                 if (inModal) {
                   const innerModal = document.querySelector(
                     "#discourse-modal div.modal-inner-container"
                   );
 
                   if (innerModal) {
-                    state.styles.popper.width = `${innerModal.clientWidth -
-                      20}px`;
+                    if (this.multiSelect) {
+                      state.styles.popper.width = `${this.element.offsetWidth}px`;
+                    } else {
+                      state.styles.popper.width = `${innerModal.clientWidth -
+                        20}px`;
+                    }
                   }
                 } else {
                   state.styles.popper.width = `${window.innerWidth - 20}px`;

From 685646540acee86e4edcf24725cb73942d70e896 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Mon, 22 Jun 2020 16:48:24 +0300
Subject: [PATCH 1790/1830] FIX: Hide PM tags if the site setting is disabled
 (#10089)

* FIX: Hide PM tags if the site setting is disabled

* Apply code suggestions
---
 app/controllers/list_controller.rb    |  4 +++
 app/controllers/tags_controller.rb    | 16 +++++----
 config/routes.rb                      |  2 +-
 spec/requests/list_controller_spec.rb | 10 ++++++
 spec/requests/tags_controller_spec.rb | 49 +++++++++++++++++++++++++++
 5 files changed, 73 insertions(+), 8 deletions(-)

diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 069768cc45..e635a8815d 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -144,6 +144,10 @@ class ListController < ApplicationController
 
   def self.generate_message_route(action)
     define_method("#{action}") do
+      if action == :private_messages_tag && !guardian.can_tag_pms?
+        raise Discourse::NotFound
+      end
+
       list_opts = build_topic_list_options
       target_user = fetch_user_from_params({ include_inactive: current_user.try(:staff?) }, [:user_stat, :user_option])
       guardian.ensure_can_see_private_messages!(target_user.id)
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 51cbb5297b..16b697bf0c 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -37,10 +37,10 @@ class TagsController < ::ApplicationController
       ungrouped_tags = ungrouped_tags.where("tags.topic_count > 0") unless show_all_tags
 
       grouped_tag_counts = TagGroup.visible(guardian).order('name ASC').includes(:tags).map do |tag_group|
-        { id: tag_group.id, name: tag_group.name, tags: self.class.tag_counts_json(tag_group.tags.where(target_tag_id: nil)) }
+        { id: tag_group.id, name: tag_group.name, tags: self.class.tag_counts_json(tag_group.tags.where(target_tag_id: nil), show_pm_tags: guardian.can_tag_pms?) }
       end
 
-      @tags = self.class.tag_counts_json(ungrouped_tags)
+      @tags = self.class.tag_counts_json(ungrouped_tags, show_pm_tags: guardian.can_tag_pms?)
       @extras = { tag_groups: grouped_tag_counts }
     else
       tags = show_all_tags ? Tag.all : Tag.where("tags.topic_count > 0")
@@ -54,7 +54,7 @@ class TagsController < ::ApplicationController
         { id: c.id, tags: self.class.tag_counts_json(c.tags.where(target_tag_id: nil)) }
       end
 
-      @tags = self.class.tag_counts_json(unrestricted_tags)
+      @tags = self.class.tag_counts_json(unrestricted_tags, show_pm_tags: guardian.can_tag_pms?)
       @extras = { categories: category_tag_counts }
     end
 
@@ -231,7 +231,7 @@ class TagsController < ::ApplicationController
       filter_params
     )
 
-    tags = self.class.tag_counts_json(tags_with_counts)
+    tags = self.class.tag_counts_json(tags_with_counts, show_pm_tags: guardian.can_tag_pms?)
 
     json_response = { results: tags }
 
@@ -336,17 +336,19 @@ class TagsController < ::ApplicationController
     raise Discourse::NotFound if DiscourseTagging.hidden_tag_names(guardian).include?(params[:tag_id])
   end
 
-  def self.tag_counts_json(tags)
+  def self.tag_counts_json(tags, show_pm_tags: true)
     target_tags = Tag.where(id: tags.map(&:target_tag_id).compact.uniq).select(:id, :name)
     tags.map do |t|
+      next if t.topic_count == 0 && t.pm_topic_count > 0 && !show_pm_tags
+
       {
         id: t.name,
         text: t.name,
         count: t.topic_count,
-        pm_count: t.pm_topic_count,
+        pm_count: show_pm_tags ? t.pm_topic_count : 0,
         target_tag: t.target_tag_id ? target_tags.find { |x| x.id == t.target_tag_id }&.name : nil
       }
-    end
+    end.compact
   end
 
   def set_category_from_params
diff --git a/config/routes.rb b/config/routes.rb
index 0de10003e5..f34b9123d4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -736,7 +736,7 @@ Discourse::Application.routes.draw do
       get "private-messages-sent/:username" => "list#private_messages_sent", as: "topics_private_messages_sent", defaults: { format: :json }
       get "private-messages-archive/:username" => "list#private_messages_archive", as: "topics_private_messages_archive", defaults: { format: :json }
       get "private-messages-unread/:username" => "list#private_messages_unread", as: "topics_private_messages_unread", defaults: { format: :json }
-      get "private-messages-tags/:username/:tag_id.json" => "list#private_messages_tag", as: "topics_private_messages_tag", constraints: StaffConstraint.new
+      get "private-messages-tags/:username/:tag_id.json" => "list#private_messages_tag", as: "topics_private_messages_tag", defaults: { format: :json }
       get "groups/:group_name" => "list#group_topics", as: "group_topics", group_name: RouteFormat.username
 
       scope "/private-messages-group/:username", group_name: RouteFormat.username do
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index 710b044467..2fea625c05 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -142,6 +142,16 @@ RSpec.describe ListController do
       expect(response.status).to eq(404)
     end
 
+    it 'should fail for staff users if disabled' do
+      SiteSetting.allow_staff_to_tag_pms = false
+
+      [moderator, admin].each do |user|
+        sign_in(user)
+        get "/topics/private-messages-tags/#{user.username}/#{tag.name}.json"
+        expect(response.status).to eq(404)
+      end
+    end
+
     it 'should be success for staff users' do
       [moderator, admin].each do |user|
         sign_in(user)
diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
index 926e506e35..53b1cf96ba 100644
--- a/spec/requests/tags_controller_spec.rb
+++ b/spec/requests/tags_controller_spec.rb
@@ -33,6 +33,55 @@ describe TagsController do
       end
     end
 
+    context "with allow_staff_to_tag_pms" do
+      fab!(:admin) { Fabricate(:admin) }
+      fab!(:topic) { Fabricate(:topic, tags: [topic_tag]) }
+      fab!(:pm) do
+        Fabricate(
+          :private_message_topic,
+          tags: [test_tag],
+          topic_allowed_users: [
+            Fabricate.build(:topic_allowed_user, user: admin)
+          ]
+        )
+      end
+
+      context "enabled" do
+        before do
+          SiteSetting.allow_staff_to_tag_pms = true
+          sign_in(admin)
+        end
+
+        it "shows topic tags and pm tags" do
+          get "/tags.json"
+          tags = response.parsed_body["tags"]
+          expect(tags.length).to eq(2)
+
+          serialized_tag = tags.find { |t| t["id"] == topic_tag.name }
+          expect(serialized_tag["count"]).to eq(2)
+          expect(serialized_tag["pm_count"]).to eq(0)
+
+          serialized_tag = tags.find { |t| t["id"] == test_tag.name }
+          expect(serialized_tag["count"]).to eq(0)
+          expect(serialized_tag["pm_count"]).to eq(1)
+        end
+      end
+
+      context "disabled" do
+        before do
+          SiteSetting.allow_staff_to_tag_pms = false
+          sign_in(admin)
+        end
+
+        it "hides pm tags" do
+          get "/tags.json"
+          tags = response.parsed_body["tags"]
+          expect(tags.length).to eq(1)
+          expect(tags[0]["id"]).to eq(topic_tag.name)
+        end
+      end
+    end
+
     context "with tags_listed_by_group enabled" do
       before { SiteSetting.tags_listed_by_group = true }
       include_examples "successfully retrieve tags with topic_count > 0"

From 68f767a557b57e10133e2e4872b2d514ab3a22d2 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Mon, 22 Jun 2020 16:58:26 +0300
Subject: [PATCH 1791/1830] FEATURE: Check if selectable avatars exist before
 enabling them (#10032)

---
 config/locales/server.en.yml                  |  1 +
 config/site_settings.yml                      |  1 +
 .../selectable_avatars_enabled_validator.rb   | 15 ++++++++++
 ...lectable_avatars_enabled_validator_spec.rb | 30 +++++++++++++++++++
 spec/models/user_spec.rb                      |  2 +-
 spec/requests/users_controller_spec.rb        | 11 ++++---
 6 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 lib/validators/selectable_avatars_enabled_validator.rb
 create mode 100644 spec/components/validators/selectable_avatars_enabled_validator_spec.rb

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index eb5ae6820a..03d621d3de 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2255,6 +2255,7 @@ en:
       max_username_length_exists: "You cannot set the maximum username length below the longest username (%{username})."
       max_username_length_range: "You cannot set the maximum below the minimum."
       invalid_hex_value: "Color values have to be 6-digit hexadecimal codes."
+      empty_selectable_avatars: "You must first upload at least two selectable avatars before enabling this setting."
       category_search_priority:
         very_low_weight_invalid: "You cannot set the weight to be greater than 'category_search_priority_low_weight'."
         low_weight_invalid: "You cannot set the weight to be greater or equal to 1 or smaller than 'category_search_priority_very_low_weight'."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 06549cd673..e8cd6f7d7a 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1241,6 +1241,7 @@ files:
   selectable_avatars_enabled:
     default: false
     client: true
+    validator: "SelectableAvatarsEnabledValidator"
   selectable_avatars:
     default: ""
     type: uploaded_image_list
diff --git a/lib/validators/selectable_avatars_enabled_validator.rb b/lib/validators/selectable_avatars_enabled_validator.rb
new file mode 100644
index 0000000000..065c5bcf98
--- /dev/null
+++ b/lib/validators/selectable_avatars_enabled_validator.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class SelectableAvatarsEnabledValidator
+  def initialize(opts = {})
+    @opts = opts
+  end
+
+  def valid_value?(value)
+    value == "f" || SiteSetting.selectable_avatars.split("\n").size > 1
+  end
+
+  def error_message
+    I18n.t('site_settings.errors.empty_selectable_avatars')
+  end
+end
diff --git a/spec/components/validators/selectable_avatars_enabled_validator_spec.rb b/spec/components/validators/selectable_avatars_enabled_validator_spec.rb
new file mode 100644
index 0000000000..2635e2e374
--- /dev/null
+++ b/spec/components/validators/selectable_avatars_enabled_validator_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe SelectableAvatarsEnabledValidator do
+  describe '#valid_value?' do
+    subject(:validator) { described_class.new }
+
+    it "returns true when disabling" do
+      SiteSetting.selectable_avatars = ""
+      expect(validator.valid_value?("f")).to eq(true)
+
+      SiteSetting.selectable_avatars = [Fabricate(:image_upload).url, Fabricate(:image_upload).url].join("\n")
+      expect(validator.valid_value?("f")).to eq(true)
+    end
+
+    it "returns true when there are at least two selectable avatars" do
+      SiteSetting.selectable_avatars = [Fabricate(:image_upload).url, Fabricate(:image_upload).url].join("\n")
+      expect(validator.valid_value?("t")).to eq(true)
+    end
+
+    it "returns false when selectable avatars is blank or has one avatar" do
+      SiteSetting.selectable_avatars = ""
+      expect(validator.valid_value?("t")).to eq(false)
+
+      SiteSetting.selectable_avatars = Fabricate(:image_upload).url
+      expect(validator.valid_value?("t")).to eq(false)
+    end
+  end
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index cc11a35c37..791153b43f 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2033,8 +2033,8 @@ describe User do
     it "sets a random avatar when selectable avatars is enabled" do
       avatar1 = Fabricate(:upload)
       avatar2 = Fabricate(:upload)
-      SiteSetting.selectable_avatars_enabled = true
       SiteSetting.selectable_avatars = [avatar1.url, avatar2.url].join("\n")
+      SiteSetting.selectable_avatars_enabled = true
 
       user = Fabricate(:user)
       expect(user.uploaded_avatar_id).not_to be(nil)
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index add1d7af01..b5a13429be 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -2290,19 +2290,18 @@ describe UsersController do
 
       context 'selectable avatars is enabled' do
 
-        before { SiteSetting.selectable_avatars_enabled = true }
+        before do
+          SiteSetting.selectable_avatars = [avatar1.url, avatar2.url].join("\n")
+          SiteSetting.selectable_avatars_enabled = true
+        end
 
         it 'raises an error when selectable avatars is empty' do
+          SiteSetting.selectable_avatars = ""
           put "/u/#{user.username}/preferences/avatar/select.json", params: { url: url }
           expect(response.status).to eq(422)
         end
 
         context 'selectable avatars is properly setup' do
-
-          before do
-            SiteSetting.selectable_avatars = [avatar1.url, avatar2.url].join("\n")
-          end
-
           it 'raises an error when url is not in selectable avatars list' do
             put "/u/#{user.username}/preferences/avatar/select.json", params: { url: url }
             expect(response.status).to eq(422)

From 2e1efbde52c311d12466692e0ee03e5c789cf2d8 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Mon, 22 Jun 2020 19:23:59 +0300
Subject: [PATCH 1792/1830] FIX: Pass local scope variable to inner function

---
 lib/tasks/db.rake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index c837a4525b..7b8facadc7 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -114,7 +114,7 @@ task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |
 
   SeedFu.quiet = true
 
-  def execute_concurently(concurrency)
+  def execute_concurently(concurrency, exceptions)
     queue = Queue.new
 
     RailsMultisite::ConnectionManagement.each_connection do |db|
@@ -148,7 +148,7 @@ task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |
     end.each(&:join)
   end
 
-  execute_concurently(concurrency) do |db|
+  execute_concurently(concurrency, exceptions) do |db|
     puts "Migrating #{db}"
     ActiveRecord::Tasks::DatabaseTasks.migrate
 
@@ -160,7 +160,7 @@ task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |
   seed_paths = DiscoursePluginRegistry.seed_paths
   SeedFu.seed(seed_paths, /001_refresh/)
 
-  execute_concurently(concurrency) do |db|
+  execute_concurently(concurrency, exceptions) do |db|
     puts "Seeding #{db}"
     SeedFu.seed(seed_paths)
   end

From 2ffb6ebd470ee7e37f557b4255d579743b42753d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 22 Jun 2020 12:39:59 -0400
Subject: [PATCH 1793/1830] Build(deps): Bump parser from 2.7.1.3 to 2.7.1.4
 (#10096)

Bumps [parser](https://github.com/whitequark/parser) from 2.7.1.3 to 2.7.1.4.
- [Release notes](https://github.com/whitequark/parser/releases)
- [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/whitequark/parser/compare/v2.7.1.3...v2.7.1.4)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f0df732280..fb05925df1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -252,8 +252,8 @@ GEM
     parallel (1.19.2)
     parallel_tests (3.0.0)
       parallel
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     pg (1.2.3)
     progress (3.5.2)
     pry (0.13.1)

From 1617905e03fc2ac6fc52e10162b3a2074c4b298f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 22 Jun 2020 12:43:39 -0400
Subject: [PATCH 1794/1830] Build(deps): Bump rubocop from 0.85.1 to 0.86.0
 (#10103)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.85.1 to 0.86.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.85.1...v0.86.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fb05925df1..74009a4ff1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -348,13 +348,13 @@ GEM
       json-schema (~> 2.2)
       railties (>= 3.1, < 7.0)
     rtlit (0.0.5)
-    rubocop (0.85.1)
+    rubocop (0.86.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 0.0.3, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (0.0.3)

From d473ddd02c9cfddd12bb0edae3be37392695e774 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 22 Jun 2020 19:48:06 +0100
Subject: [PATCH 1795/1830] FIX: Use raw content when checking for watched
 words to flag (#10104)

This makes flagged watched words match the behavior of censor, requires_approval and blocked watched words.
---
 app/jobs/regular/process_post.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/jobs/regular/process_post.rb b/app/jobs/regular/process_post.rb
index 24048a5f46..6ba04d4f5b 100644
--- a/app/jobs/regular/process_post.rb
+++ b/app/jobs/regular/process_post.rb
@@ -41,7 +41,7 @@ module Jobs
         end
 
         if !post.user&.staff? && !post.user&.staged?
-          s = post.cooked
+          s = post.raw
           s << " #{post.topic.title}" if post.post_number == 1
           if !args[:bypass_bump] && WordWatcher.new(s).should_flag?
             PostActionCreator.create(

From ac9577bcc7b69593bcdd204368d35492fc0cee15 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 22 Jun 2020 15:43:59 -0400
Subject: [PATCH 1796/1830] FIX: Don't raise an exception if we can't update
 the user on demotion

This is causing issues when purging old users, if they are set up in the
exact condition where they will be demoted into another group, but also
do not have a primary email.
---
 lib/promotion.rb                     |  4 ++--
 spec/services/user_destroyer_spec.rb | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/promotion.rb b/lib/promotion.rb
index d96b304d5a..c39d13f44f 100644
--- a/lib/promotion.rb
+++ b/lib/promotion.rb
@@ -126,8 +126,8 @@ class Promotion
     # Then consider the group locked level
     user_group_granted_trust_level = user.group_granted_trust_level
 
-    unless user_group_granted_trust_level.blank?
-      return user.update!(
+    if user_group_granted_trust_level.present?
+      return user.update(
         trust_level: user_group_granted_trust_level
       )
     end
diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb
index a26da77d4e..01e6e81027 100644
--- a/spec/services/user_destroyer_spec.rb
+++ b/spec/services/user_destroyer_spec.rb
@@ -390,6 +390,17 @@ describe UserDestroyer do
           d.destroy(user)
         }.to change { User.count }.by(-1)
       end
+
+      it 'can delete the user if they were to fall into another trust level and have no email' do
+        g2 = Fabricate(:group, grant_trust_level: 1)
+        g2.add(user)
+
+        UserEmail.where(user: user).delete_all
+        user.reload
+        expect {
+          UserDestroyer.new(admin).destroy(user)
+        }.to change { User.count }.by(-1)
+      end
     end
 
     context 'user has staff action logs' do

From b1114b9a20343525c805d7339bd64954965a12f9 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 22 Jun 2020 16:30:46 -0400
Subject: [PATCH 1797/1830] FIX: These tests are broken

---
 spec/components/discourse_redis_spec.rb | 400 ++++++++++++------------
 1 file changed, 201 insertions(+), 199 deletions(-)

diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb
index abc9a5917a..900e20ac98 100644
--- a/spec/components/discourse_redis_spec.rb
+++ b/spec/components/discourse_redis_spec.rb
@@ -3,244 +3,246 @@
 require 'rails_helper'
 
 describe DiscourseRedis do
-  let(:slave_host) { 'testhost' }
-  let(:slave_port) { 1234 }
+  skip "these tests are broken" do
+    let(:slave_host) { 'testhost' }
+    let(:slave_port) { 1234 }
 
-  let(:config) do
-    DiscourseRedis.config.dup.merge(slave_host: 'testhost', slave_port: 1234, connector: DiscourseRedis::Connector)
-  end
-
-  let(:fallback_handler) { DiscourseRedis::FallbackHandler.instance }
-
-  it "ignore_readonly returns nil from a pure exception" do
-    result = DiscourseRedis.ignore_readonly { raise Redis::CommandError.new("READONLY") }
-    expect(result).to eq(nil)
-  end
-
-  describe 'redis commands' do
-    let(:raw_redis) { Redis.new(DiscourseRedis.config) }
-
-    before do
-      raw_redis.flushdb
+    let(:config) do
+      DiscourseRedis.config.dup.merge(slave_host: 'testhost', slave_port: 1234, connector: DiscourseRedis::Connector)
     end
 
-    after do
-      raw_redis.flushdb
+    let(:fallback_handler) { DiscourseRedis::FallbackHandler.instance }
+
+    it "ignore_readonly returns nil from a pure exception" do
+      result = DiscourseRedis.ignore_readonly { raise Redis::CommandError.new("READONLY") }
+      expect(result).to eq(nil)
     end
 
-    describe 'when namespace is enabled' do
-      let(:redis) { DiscourseRedis.new }
+    describe 'redis commands' do
+      let(:raw_redis) { Redis.new(DiscourseRedis.config) }
 
-      it 'should append namespace to the keys' do
-        raw_redis.set('default:key', 1)
-        raw_redis.set('test:key2', 1)
+      before do
+        raw_redis.flushdb
+      end
 
-        expect(redis.keys).to include('key')
-        expect(redis.keys).to_not include('key2')
-        expect(redis.scan_each.to_a).to eq(['key'])
+      after do
+        raw_redis.flushdb
+      end
 
-        redis.scan_each.each do |key|
-          expect(key).to eq('key')
+      describe 'when namespace is enabled' do
+        let(:redis) { DiscourseRedis.new }
+
+        it 'should append namespace to the keys' do
+          raw_redis.set('default:key', 1)
+          raw_redis.set('test:key2', 1)
+
+          expect(redis.keys).to include('key')
+          expect(redis.keys).to_not include('key2')
+          expect(redis.scan_each.to_a).to eq(['key'])
+
+          redis.scan_each.each do |key|
+            expect(key).to eq('key')
+          end
+
+          redis.del('key')
+
+          expect(raw_redis.get('default:key')).to eq(nil)
+          expect(redis.scan_each.to_a).to eq([])
+
+          raw_redis.set('default:key1', '1')
+          raw_redis.set('default:key2', '2')
+
+          expect(redis.mget('key1', 'key2')).to eq(['1', '2'])
+          expect(redis.scan_each.to_a).to contain_exactly('key1', 'key2')
+        end
+      end
+
+      describe 'when namespace is disabled' do
+        let(:redis) { DiscourseRedis.new(nil, namespace: false) }
+
+        it 'should not append any namespace to the keys' do
+          raw_redis.set('default:key', 1)
+          raw_redis.set('test:key2', 1)
+
+          expect(redis.keys).to include('default:key', 'test:key2')
+
+          redis.del('key')
+
+          expect(raw_redis.get('key')).to eq(nil)
+
+          raw_redis.set('key1', '1')
+          raw_redis.set('key2', '2')
+
+          expect(redis.mget('key1', 'key2')).to eq(['1', '2'])
         end
 
-        redis.del('key')
+        it 'should noop a readonly redis' do
+          expect(Discourse.recently_readonly?).to eq(false)
 
-        expect(raw_redis.get('default:key')).to eq(nil)
-        expect(redis.scan_each.to_a).to eq([])
+          redis.without_namespace
+            .expects(:set)
+            .raises(Redis::CommandError.new("READONLY"))
 
-        raw_redis.set('default:key1', '1')
-        raw_redis.set('default:key2', '2')
+          redis.set('key', 1)
 
-        expect(redis.mget('key1', 'key2')).to eq(['1', '2'])
-        expect(redis.scan_each.to_a).to contain_exactly('key1', 'key2')
+          expect(Discourse.recently_readonly?).to eq(true)
+        end
       end
     end
 
-    describe 'when namespace is disabled' do
-      let(:redis) { DiscourseRedis.new(nil, namespace: false) }
-
-      it 'should not append any namespace to the keys' do
-        raw_redis.set('default:key', 1)
-        raw_redis.set('test:key2', 1)
-
-        expect(redis.keys).to include('default:key', 'test:key2')
-
-        redis.del('key')
-
-        expect(raw_redis.get('key')).to eq(nil)
-
-        raw_redis.set('key1', '1')
-        raw_redis.set('key2', '2')
-
-        expect(redis.mget('key1', 'key2')).to eq(['1', '2'])
-      end
-
-      it 'should noop a readonly redis' do
-        expect(Discourse.recently_readonly?).to eq(false)
-
-        redis.without_namespace
-          .expects(:set)
-          .raises(Redis::CommandError.new("READONLY"))
-
-        redis.set('key', 1)
-
-        expect(Discourse.recently_readonly?).to eq(true)
+    context '.slave_host' do
+      it 'should return the right config' do
+        slave_config = DiscourseRedis.slave_config(config)
+        expect(slave_config[:host]).to eq(slave_host)
+        expect(slave_config[:port]).to eq(slave_port)
       end
     end
-  end
 
-  context '.slave_host' do
-    it 'should return the right config' do
-      slave_config = DiscourseRedis.slave_config(config)
-      expect(slave_config[:host]).to eq(slave_host)
-      expect(slave_config[:port]).to eq(slave_port)
+    context 'when redis connection is to a slave redis server' do
+      it 'should check the status of the master server' do
+        begin
+          fallback_handler.master = false
+          Discourse.redis.without_namespace.expects(:set).raises(Redis::CommandError.new("READONLY"))
+          fallback_handler.expects(:verify_master).once
+          Discourse.redis.set('test', '1')
+        ensure
+          fallback_handler.master = true
+          Discourse.redis.del('test')
+        end
+      end
     end
-  end
 
-  context 'when redis connection is to a slave redis server' do
-    it 'should check the status of the master server' do
-      begin
-        fallback_handler.master = false
-        Discourse.redis.without_namespace.expects(:set).raises(Redis::CommandError.new("READONLY"))
-        fallback_handler.expects(:verify_master).once
-        Discourse.redis.set('test', '1')
-      ensure
+    describe DiscourseRedis::Connector do
+      let(:connector) { DiscourseRedis::Connector.new(config) }
+
+      after do
         fallback_handler.master = true
-        Discourse.redis.del('test')
-      end
-    end
-  end
-
-  describe DiscourseRedis::Connector do
-    let(:connector) { DiscourseRedis::Connector.new(config) }
-
-    after do
-      fallback_handler.master = true
-    end
-
-    it 'should return the master config when master is up' do
-      expect(connector.resolve).to eq(config)
-    end
-
-    class BrokenRedis
-      def initialize(error)
-        @error = error
       end
 
-      def call(*args)
-        raise @error
+      it 'should return the master config when master is up' do
+        expect(connector.resolve).to eq(config)
       end
 
-      def disconnect
-      end
-    end
+      class BrokenRedis
+        def initialize(error)
+          @error = error
+        end
 
-    it 'should return the slave config when master is down' do
-      error = Redis::CannotConnectError
+        def call(*args)
+          raise @error
+        end
 
-      expect do
-        connector.resolve(BrokenRedis.new(error))
-      end.to raise_error(Redis::CannotConnectError)
-
-      config = connector.resolve
-
-      expect(config[:host]).to eq(slave_host)
-      expect(config[:port]).to eq(slave_port)
-    end
-
-    it "should return the slave config when master's hostname cannot be resolved" do
-      error = RuntimeError.new('Name or service not known')
-
-      expect do
-        connector.resolve(BrokenRedis.new(error))
-      end.to raise_error(error)
-
-      expect(fallback_handler.master).to eq(false)
-
-      config = connector.resolve
-
-      expect(config[:host]).to eq(slave_host)
-      expect(config[:port]).to eq(slave_port)
-      expect(fallback_handler.master).to eq(false)
-    end
-
-    it "should return the slave config when master is still loading data" do
-      Redis::Client.any_instance
-        .expects(:call)
-        .with([:info, :persistence])
-        .returns("
-          someconfig:haha\r
-          #{DiscourseRedis::FallbackHandler::MASTER_LOADING_STATUS}
-        ")
-
-      config = connector.resolve
-
-      expect(config[:host]).to eq(slave_host)
-      expect(config[:port]).to eq(slave_port)
-    end
-
-    it "should raise the right error" do
-      error = RuntimeError.new('test')
-
-      2.times do
-        expect { connector.resolve(BrokenRedis.new(error)) }
-          .to raise_error(error)
-      end
-    end
-  end
-
-  describe DiscourseRedis::FallbackHandler do
-    before do
-      @original_keepalive_interval = MessageBus.keepalive_interval
-    end
-
-    after do
-      fallback_handler.master = true
-      MessageBus.keepalive_interval = @original_keepalive_interval
-    end
-
-    describe '#initiate_fallback_to_master' do
-      it 'should return the right value if the master server is still down' do
-        fallback_handler.master = false
-        Redis::Client.any_instance.expects(:call).with([:info]).returns("Some other stuff")
-
-        expect(fallback_handler.initiate_fallback_to_master).to eq(false)
-        expect(MessageBus.keepalive_interval).to eq(0)
+        def disconnect
+        end
       end
 
-      it 'should fallback to the master server once it is up' do
-        fallback_handler.master = false
-        master_conn = mock('master')
-        slave_conn = mock('slave')
+      it 'should return the slave config when master is down' do
+        error = Redis::CannotConnectError
 
-        Redis::Client.expects(:new)
-          .with(DiscourseRedis.config)
-          .returns(master_conn)
+        expect do
+          connector.resolve(BrokenRedis.new(error))
+        end.to raise_error(Redis::CannotConnectError)
 
-        Redis::Client.expects(:new)
-          .with(DiscourseRedis.slave_config)
-          .returns(slave_conn)
+        config = connector.resolve
 
-        master_conn.expects(:call)
-          .with([:info])
+        expect(config[:host]).to eq(slave_host)
+        expect(config[:port]).to eq(slave_port)
+      end
+
+      it "should return the slave config when master's hostname cannot be resolved" do
+        error = RuntimeError.new('Name or service not known')
+
+        expect do
+          connector.resolve(BrokenRedis.new(error))
+        end.to raise_error(error)
+
+        expect(fallback_handler.master).to eq(false)
+
+        config = connector.resolve
+
+        expect(config[:host]).to eq(slave_host)
+        expect(config[:port]).to eq(slave_port)
+        expect(fallback_handler.master).to eq(false)
+      end
+
+      it "should return the slave config when master is still loading data" do
+        Redis::Client.any_instance
+          .expects(:call)
+          .with([:info, :persistence])
           .returns("
-            #{DiscourseRedis::FallbackHandler::MASTER_ROLE_STATUS}\r\n
-            #{DiscourseRedis::FallbackHandler::MASTER_LOADED_STATUS}
+            someconfig:haha\r
+            #{DiscourseRedis::FallbackHandler::MASTER_LOADING_STATUS}
           ")
 
-        DiscourseRedis::FallbackHandler::CONNECTION_TYPES.each do |connection_type|
-          slave_conn.expects(:call).with(
-            [:client, [:kill, 'type', connection_type]]
-          )
+        config = connector.resolve
+
+        expect(config[:host]).to eq(slave_host)
+        expect(config[:port]).to eq(slave_port)
+      end
+
+      it "should raise the right error" do
+        error = RuntimeError.new('test')
+
+        2.times do
+          expect { connector.resolve(BrokenRedis.new(error)) }
+            .to raise_error(error)
+        end
+      end
+    end
+
+    describe DiscourseRedis::FallbackHandler do
+      before do
+        @original_keepalive_interval = MessageBus.keepalive_interval
+      end
+
+      after do
+        fallback_handler.master = true
+        MessageBus.keepalive_interval = @original_keepalive_interval
+      end
+
+      describe '#initiate_fallback_to_master' do
+        it 'should return the right value if the master server is still down' do
+          fallback_handler.master = false
+          Redis::Client.any_instance.expects(:call).with([:info]).returns("Some other stuff")
+
+          expect(fallback_handler.initiate_fallback_to_master).to eq(false)
+          expect(MessageBus.keepalive_interval).to eq(0)
         end
 
-        master_conn.expects(:disconnect)
-        slave_conn.expects(:disconnect)
+        it 'should fallback to the master server once it is up' do
+          fallback_handler.master = false
+          master_conn = mock('master')
+          slave_conn = mock('slave')
 
-        expect(fallback_handler.initiate_fallback_to_master).to eq(true)
-        expect(fallback_handler.master).to eq(true)
-        expect(Discourse.recently_readonly?).to eq(false)
-        expect(MessageBus.keepalive_interval).to eq(-1)
+          Redis::Client.expects(:new)
+            .with(DiscourseRedis.config)
+            .returns(master_conn)
+
+          Redis::Client.expects(:new)
+            .with(DiscourseRedis.slave_config)
+            .returns(slave_conn)
+
+          master_conn.expects(:call)
+            .with([:info])
+            .returns("
+              #{DiscourseRedis::FallbackHandler::MASTER_ROLE_STATUS}\r\n
+              #{DiscourseRedis::FallbackHandler::MASTER_LOADED_STATUS}
+            ")
+
+          DiscourseRedis::FallbackHandler::CONNECTION_TYPES.each do |connection_type|
+            slave_conn.expects(:call).with(
+              [:client, [:kill, 'type', connection_type]]
+            )
+          end
+
+          master_conn.expects(:disconnect)
+          slave_conn.expects(:disconnect)
+
+          expect(fallback_handler.initiate_fallback_to_master).to eq(true)
+          expect(fallback_handler.master).to eq(true)
+          expect(Discourse.recently_readonly?).to eq(false)
+          expect(MessageBus.keepalive_interval).to eq(-1)
+        end
       end
     end
   end

From 25db91e35180b2707ca4a9f7ffd173823f86f18d Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 23 Jun 2020 08:41:10 +0800
Subject: [PATCH 1798/1830] Revert "FIX: These tests are broken"

This reverts commit b1114b9a20343525c805d7339bd64954965a12f9.
---
 spec/components/discourse_redis_spec.rb | 400 ++++++++++++------------
 1 file changed, 199 insertions(+), 201 deletions(-)

diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb
index 900e20ac98..abc9a5917a 100644
--- a/spec/components/discourse_redis_spec.rb
+++ b/spec/components/discourse_redis_spec.rb
@@ -3,246 +3,244 @@
 require 'rails_helper'
 
 describe DiscourseRedis do
-  skip "these tests are broken" do
-    let(:slave_host) { 'testhost' }
-    let(:slave_port) { 1234 }
+  let(:slave_host) { 'testhost' }
+  let(:slave_port) { 1234 }
 
-    let(:config) do
-      DiscourseRedis.config.dup.merge(slave_host: 'testhost', slave_port: 1234, connector: DiscourseRedis::Connector)
+  let(:config) do
+    DiscourseRedis.config.dup.merge(slave_host: 'testhost', slave_port: 1234, connector: DiscourseRedis::Connector)
+  end
+
+  let(:fallback_handler) { DiscourseRedis::FallbackHandler.instance }
+
+  it "ignore_readonly returns nil from a pure exception" do
+    result = DiscourseRedis.ignore_readonly { raise Redis::CommandError.new("READONLY") }
+    expect(result).to eq(nil)
+  end
+
+  describe 'redis commands' do
+    let(:raw_redis) { Redis.new(DiscourseRedis.config) }
+
+    before do
+      raw_redis.flushdb
     end
 
-    let(:fallback_handler) { DiscourseRedis::FallbackHandler.instance }
-
-    it "ignore_readonly returns nil from a pure exception" do
-      result = DiscourseRedis.ignore_readonly { raise Redis::CommandError.new("READONLY") }
-      expect(result).to eq(nil)
+    after do
+      raw_redis.flushdb
     end
 
-    describe 'redis commands' do
-      let(:raw_redis) { Redis.new(DiscourseRedis.config) }
+    describe 'when namespace is enabled' do
+      let(:redis) { DiscourseRedis.new }
 
-      before do
-        raw_redis.flushdb
-      end
+      it 'should append namespace to the keys' do
+        raw_redis.set('default:key', 1)
+        raw_redis.set('test:key2', 1)
 
-      after do
-        raw_redis.flushdb
-      end
+        expect(redis.keys).to include('key')
+        expect(redis.keys).to_not include('key2')
+        expect(redis.scan_each.to_a).to eq(['key'])
 
-      describe 'when namespace is enabled' do
-        let(:redis) { DiscourseRedis.new }
-
-        it 'should append namespace to the keys' do
-          raw_redis.set('default:key', 1)
-          raw_redis.set('test:key2', 1)
-
-          expect(redis.keys).to include('key')
-          expect(redis.keys).to_not include('key2')
-          expect(redis.scan_each.to_a).to eq(['key'])
-
-          redis.scan_each.each do |key|
-            expect(key).to eq('key')
-          end
-
-          redis.del('key')
-
-          expect(raw_redis.get('default:key')).to eq(nil)
-          expect(redis.scan_each.to_a).to eq([])
-
-          raw_redis.set('default:key1', '1')
-          raw_redis.set('default:key2', '2')
-
-          expect(redis.mget('key1', 'key2')).to eq(['1', '2'])
-          expect(redis.scan_each.to_a).to contain_exactly('key1', 'key2')
-        end
-      end
-
-      describe 'when namespace is disabled' do
-        let(:redis) { DiscourseRedis.new(nil, namespace: false) }
-
-        it 'should not append any namespace to the keys' do
-          raw_redis.set('default:key', 1)
-          raw_redis.set('test:key2', 1)
-
-          expect(redis.keys).to include('default:key', 'test:key2')
-
-          redis.del('key')
-
-          expect(raw_redis.get('key')).to eq(nil)
-
-          raw_redis.set('key1', '1')
-          raw_redis.set('key2', '2')
-
-          expect(redis.mget('key1', 'key2')).to eq(['1', '2'])
+        redis.scan_each.each do |key|
+          expect(key).to eq('key')
         end
 
-        it 'should noop a readonly redis' do
-          expect(Discourse.recently_readonly?).to eq(false)
+        redis.del('key')
 
-          redis.without_namespace
-            .expects(:set)
-            .raises(Redis::CommandError.new("READONLY"))
+        expect(raw_redis.get('default:key')).to eq(nil)
+        expect(redis.scan_each.to_a).to eq([])
 
-          redis.set('key', 1)
+        raw_redis.set('default:key1', '1')
+        raw_redis.set('default:key2', '2')
 
-          expect(Discourse.recently_readonly?).to eq(true)
-        end
+        expect(redis.mget('key1', 'key2')).to eq(['1', '2'])
+        expect(redis.scan_each.to_a).to contain_exactly('key1', 'key2')
       end
     end
 
-    context '.slave_host' do
-      it 'should return the right config' do
-        slave_config = DiscourseRedis.slave_config(config)
-        expect(slave_config[:host]).to eq(slave_host)
-        expect(slave_config[:port]).to eq(slave_port)
+    describe 'when namespace is disabled' do
+      let(:redis) { DiscourseRedis.new(nil, namespace: false) }
+
+      it 'should not append any namespace to the keys' do
+        raw_redis.set('default:key', 1)
+        raw_redis.set('test:key2', 1)
+
+        expect(redis.keys).to include('default:key', 'test:key2')
+
+        redis.del('key')
+
+        expect(raw_redis.get('key')).to eq(nil)
+
+        raw_redis.set('key1', '1')
+        raw_redis.set('key2', '2')
+
+        expect(redis.mget('key1', 'key2')).to eq(['1', '2'])
+      end
+
+      it 'should noop a readonly redis' do
+        expect(Discourse.recently_readonly?).to eq(false)
+
+        redis.without_namespace
+          .expects(:set)
+          .raises(Redis::CommandError.new("READONLY"))
+
+        redis.set('key', 1)
+
+        expect(Discourse.recently_readonly?).to eq(true)
       end
     end
+  end
 
-    context 'when redis connection is to a slave redis server' do
-      it 'should check the status of the master server' do
-        begin
-          fallback_handler.master = false
-          Discourse.redis.without_namespace.expects(:set).raises(Redis::CommandError.new("READONLY"))
-          fallback_handler.expects(:verify_master).once
-          Discourse.redis.set('test', '1')
-        ensure
-          fallback_handler.master = true
-          Discourse.redis.del('test')
-        end
-      end
+  context '.slave_host' do
+    it 'should return the right config' do
+      slave_config = DiscourseRedis.slave_config(config)
+      expect(slave_config[:host]).to eq(slave_host)
+      expect(slave_config[:port]).to eq(slave_port)
     end
+  end
 
-    describe DiscourseRedis::Connector do
-      let(:connector) { DiscourseRedis::Connector.new(config) }
-
-      after do
+  context 'when redis connection is to a slave redis server' do
+    it 'should check the status of the master server' do
+      begin
+        fallback_handler.master = false
+        Discourse.redis.without_namespace.expects(:set).raises(Redis::CommandError.new("READONLY"))
+        fallback_handler.expects(:verify_master).once
+        Discourse.redis.set('test', '1')
+      ensure
         fallback_handler.master = true
+        Discourse.redis.del('test')
+      end
+    end
+  end
+
+  describe DiscourseRedis::Connector do
+    let(:connector) { DiscourseRedis::Connector.new(config) }
+
+    after do
+      fallback_handler.master = true
+    end
+
+    it 'should return the master config when master is up' do
+      expect(connector.resolve).to eq(config)
+    end
+
+    class BrokenRedis
+      def initialize(error)
+        @error = error
       end
 
-      it 'should return the master config when master is up' do
-        expect(connector.resolve).to eq(config)
+      def call(*args)
+        raise @error
       end
 
-      class BrokenRedis
-        def initialize(error)
-          @error = error
-        end
+      def disconnect
+      end
+    end
 
-        def call(*args)
-          raise @error
-        end
+    it 'should return the slave config when master is down' do
+      error = Redis::CannotConnectError
 
-        def disconnect
-        end
+      expect do
+        connector.resolve(BrokenRedis.new(error))
+      end.to raise_error(Redis::CannotConnectError)
+
+      config = connector.resolve
+
+      expect(config[:host]).to eq(slave_host)
+      expect(config[:port]).to eq(slave_port)
+    end
+
+    it "should return the slave config when master's hostname cannot be resolved" do
+      error = RuntimeError.new('Name or service not known')
+
+      expect do
+        connector.resolve(BrokenRedis.new(error))
+      end.to raise_error(error)
+
+      expect(fallback_handler.master).to eq(false)
+
+      config = connector.resolve
+
+      expect(config[:host]).to eq(slave_host)
+      expect(config[:port]).to eq(slave_port)
+      expect(fallback_handler.master).to eq(false)
+    end
+
+    it "should return the slave config when master is still loading data" do
+      Redis::Client.any_instance
+        .expects(:call)
+        .with([:info, :persistence])
+        .returns("
+          someconfig:haha\r
+          #{DiscourseRedis::FallbackHandler::MASTER_LOADING_STATUS}
+        ")
+
+      config = connector.resolve
+
+      expect(config[:host]).to eq(slave_host)
+      expect(config[:port]).to eq(slave_port)
+    end
+
+    it "should raise the right error" do
+      error = RuntimeError.new('test')
+
+      2.times do
+        expect { connector.resolve(BrokenRedis.new(error)) }
+          .to raise_error(error)
+      end
+    end
+  end
+
+  describe DiscourseRedis::FallbackHandler do
+    before do
+      @original_keepalive_interval = MessageBus.keepalive_interval
+    end
+
+    after do
+      fallback_handler.master = true
+      MessageBus.keepalive_interval = @original_keepalive_interval
+    end
+
+    describe '#initiate_fallback_to_master' do
+      it 'should return the right value if the master server is still down' do
+        fallback_handler.master = false
+        Redis::Client.any_instance.expects(:call).with([:info]).returns("Some other stuff")
+
+        expect(fallback_handler.initiate_fallback_to_master).to eq(false)
+        expect(MessageBus.keepalive_interval).to eq(0)
       end
 
-      it 'should return the slave config when master is down' do
-        error = Redis::CannotConnectError
+      it 'should fallback to the master server once it is up' do
+        fallback_handler.master = false
+        master_conn = mock('master')
+        slave_conn = mock('slave')
 
-        expect do
-          connector.resolve(BrokenRedis.new(error))
-        end.to raise_error(Redis::CannotConnectError)
+        Redis::Client.expects(:new)
+          .with(DiscourseRedis.config)
+          .returns(master_conn)
 
-        config = connector.resolve
+        Redis::Client.expects(:new)
+          .with(DiscourseRedis.slave_config)
+          .returns(slave_conn)
 
-        expect(config[:host]).to eq(slave_host)
-        expect(config[:port]).to eq(slave_port)
-      end
-
-      it "should return the slave config when master's hostname cannot be resolved" do
-        error = RuntimeError.new('Name or service not known')
-
-        expect do
-          connector.resolve(BrokenRedis.new(error))
-        end.to raise_error(error)
-
-        expect(fallback_handler.master).to eq(false)
-
-        config = connector.resolve
-
-        expect(config[:host]).to eq(slave_host)
-        expect(config[:port]).to eq(slave_port)
-        expect(fallback_handler.master).to eq(false)
-      end
-
-      it "should return the slave config when master is still loading data" do
-        Redis::Client.any_instance
-          .expects(:call)
-          .with([:info, :persistence])
+        master_conn.expects(:call)
+          .with([:info])
           .returns("
-            someconfig:haha\r
-            #{DiscourseRedis::FallbackHandler::MASTER_LOADING_STATUS}
+            #{DiscourseRedis::FallbackHandler::MASTER_ROLE_STATUS}\r\n
+            #{DiscourseRedis::FallbackHandler::MASTER_LOADED_STATUS}
           ")
 
-        config = connector.resolve
-
-        expect(config[:host]).to eq(slave_host)
-        expect(config[:port]).to eq(slave_port)
-      end
-
-      it "should raise the right error" do
-        error = RuntimeError.new('test')
-
-        2.times do
-          expect { connector.resolve(BrokenRedis.new(error)) }
-            .to raise_error(error)
-        end
-      end
-    end
-
-    describe DiscourseRedis::FallbackHandler do
-      before do
-        @original_keepalive_interval = MessageBus.keepalive_interval
-      end
-
-      after do
-        fallback_handler.master = true
-        MessageBus.keepalive_interval = @original_keepalive_interval
-      end
-
-      describe '#initiate_fallback_to_master' do
-        it 'should return the right value if the master server is still down' do
-          fallback_handler.master = false
-          Redis::Client.any_instance.expects(:call).with([:info]).returns("Some other stuff")
-
-          expect(fallback_handler.initiate_fallback_to_master).to eq(false)
-          expect(MessageBus.keepalive_interval).to eq(0)
+        DiscourseRedis::FallbackHandler::CONNECTION_TYPES.each do |connection_type|
+          slave_conn.expects(:call).with(
+            [:client, [:kill, 'type', connection_type]]
+          )
         end
 
-        it 'should fallback to the master server once it is up' do
-          fallback_handler.master = false
-          master_conn = mock('master')
-          slave_conn = mock('slave')
+        master_conn.expects(:disconnect)
+        slave_conn.expects(:disconnect)
 
-          Redis::Client.expects(:new)
-            .with(DiscourseRedis.config)
-            .returns(master_conn)
-
-          Redis::Client.expects(:new)
-            .with(DiscourseRedis.slave_config)
-            .returns(slave_conn)
-
-          master_conn.expects(:call)
-            .with([:info])
-            .returns("
-              #{DiscourseRedis::FallbackHandler::MASTER_ROLE_STATUS}\r\n
-              #{DiscourseRedis::FallbackHandler::MASTER_LOADED_STATUS}
-            ")
-
-          DiscourseRedis::FallbackHandler::CONNECTION_TYPES.each do |connection_type|
-            slave_conn.expects(:call).with(
-              [:client, [:kill, 'type', connection_type]]
-            )
-          end
-
-          master_conn.expects(:disconnect)
-          slave_conn.expects(:disconnect)
-
-          expect(fallback_handler.initiate_fallback_to_master).to eq(true)
-          expect(fallback_handler.master).to eq(true)
-          expect(Discourse.recently_readonly?).to eq(false)
-          expect(MessageBus.keepalive_interval).to eq(-1)
-        end
+        expect(fallback_handler.initiate_fallback_to_master).to eq(true)
+        expect(fallback_handler.master).to eq(true)
+        expect(Discourse.recently_readonly?).to eq(false)
+        expect(MessageBus.keepalive_interval).to eq(-1)
       end
     end
   end

From 0384b6d9101bbc67abcf747d33cbc0ab41b7f65a Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 23 Jun 2020 09:10:02 +0800
Subject: [PATCH 1799/1830] FIX: `multisite:migrate` failing to properly seed
 data.

---
 lib/tasks/db.rake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 7b8facadc7..4e5469db40 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -151,10 +151,6 @@ task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |
   execute_concurently(concurrency, exceptions) do |db|
     puts "Migrating #{db}"
     ActiveRecord::Tasks::DatabaseTasks.migrate
-
-    if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
-      SiteIconManager.ensure_optimized!
-    end
   end
 
   seed_paths = DiscoursePluginRegistry.seed_paths
@@ -163,6 +159,10 @@ task 'multisite:migrate' => ['db:load_config', 'environment', 'set_locale'] do |
   execute_concurently(concurrency, exceptions) do |db|
     puts "Seeding #{db}"
     SeedFu.seed(seed_paths)
+
+    if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
+      SiteIconManager.ensure_optimized!
+    end
   end
 
   $stdout = old_stdout

From d775338d637d9ef3843acf227a138e8f11352151 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 23 Jun 2020 09:15:29 +0800
Subject: [PATCH 1800/1830] FIX: Use a mutex when reseting column information
 while seeding.

`rake multisite:migrate` runs SeedFu concurently in threads so we need
this to be thread safe.
---
 db/fixtures/001_refresh.rb | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/db/fixtures/001_refresh.rb b/db/fixtures/001_refresh.rb
index e340c8dfb0..514789616d 100644
--- a/db/fixtures/001_refresh.rb
+++ b/db/fixtures/001_refresh.rb
@@ -1,17 +1,22 @@
 # frozen_string_literal: true
 
 class SeedData::Refresher
+  @mutex = Mutex.new
+
   def self.refresh!
     return if @refreshed
 
-    # Fix any bust caches post initial migration
-    # Not that reset_column_information is not thread safe so we have to becareful
-    # not to run it concurrently within the same process.
-    ActiveRecord::Base.connection.tables.each do |table|
-      table.classify.constantize.reset_column_information rescue nil
-    end
+    @mutex.synchronize do
+      return if @refreshed
+      # Fix any bust caches post initial migration
+      # Not that reset_column_information is not thread safe so we have to becareful
+      # not to run it concurrently within the same process.
+      ActiveRecord::Base.connection.tables.each do |table|
+        table.classify.constantize.reset_column_information rescue nil
+      end
 
-    @refreshed = true
+      @refreshed = true
+    end
   end
 end
 

From 97d12a3a8e23b8f38aab771ea5d9939652241ae8 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 23 Jun 2020 10:07:30 +0800
Subject: [PATCH 1801/1830] Bump rails_failover to 0.5.2.

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 74009a4ff1..1148682938 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -280,7 +280,7 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails_failover (0.5.1)
+    rails_failover (0.5.2)
       activerecord (~> 6.0)
       railties (~> 6.0)
     rails_multisite (2.3.0)

From e3e7905d9ebd86943102917b2ff0bfee32035c01 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 23 Jun 2020 11:45:18 +0800
Subject: [PATCH 1802/1830] FIX: `TurboTests::Runner` not failing on errors.

---
 lib/turbo_tests/runner.rb | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/lib/turbo_tests/runner.rb b/lib/turbo_tests/runner.rb
index 89ba1bdbed..c0e9053664 100644
--- a/lib/turbo_tests/runner.rb
+++ b/lib/turbo_tests/runner.rb
@@ -32,6 +32,7 @@ module TurboTests
 
       @messages = Queue.new
       @threads = []
+      @error = false
     end
 
     def run
@@ -43,6 +44,7 @@ module TurboTests
       group_opts = {}
 
       if use_runtime_info
+        FileUtils.rm("tmp/turbo_rspec_runtime.log", force: true)
         group_opts[:runtime_log] = "tmp/turbo_rspec_runtime.log"
       else
         group_opts[:group_by] = :filesize
@@ -73,7 +75,7 @@ module TurboTests
 
       @threads.each(&:join)
 
-      @reporter.failed_examples.empty?
+      @reporter.failed_examples.empty? && !@error
     end
 
     protected
@@ -86,12 +88,14 @@ module TurboTests
 
       ActiveRecord::Tasks::DatabaseTasks.migrations_paths = ['db/migrate', 'db/post_migrate']
 
-      conn = ActiveRecord::Base.establish_connection(config).connection
       begin
+        conn = ActiveRecord::Base.establish_connection(config).connection
         ActiveRecord::Migration.check_pending!(conn)
       rescue ActiveRecord::PendingMigrationError
         puts "There are pending migrations, run rake parallel:migrate"
         exit 1
+      ensure
+        conn&.close
       end
     end
 
@@ -168,7 +172,8 @@ module TurboTests
           STDERR.puts "Process #{process_id}: #{command_str}"
         end
 
-        _stdin, stdout, stderr, _wait_thr = Open3.popen3(env, *command)
+        stdin, stdout, stderr, wait_thr = Open3.popen3(env, *command)
+        stdin.close
 
         @threads <<
           Thread.new do
@@ -184,8 +189,16 @@ module TurboTests
             @messages << { type: 'exit', process_id: process_id }
           end
 
-        @threads << start_copy_thread(stdout, STDOUT)
-        @threads << start_copy_thread(stderr, STDERR)
+        stdout_thread = start_copy_thread(stdout, STDOUT)
+        stderr_thread = start_copy_thread(stderr, STDERR)
+        @threads << stdout_thread
+        @threads << stderr_thread
+
+        @threads << Thread.new do
+          if wait_thr.value.exitstatus != 0
+            @messages << { type: 'error', record_runtime: record_runtime }
+          end
+        end
       end
     end
 
@@ -195,6 +208,7 @@ module TurboTests
           begin
             msg = src.readpartial(4096)
           rescue EOFError
+            src.close
             break
           else
             dst.write(msg)
@@ -226,6 +240,13 @@ module TurboTests
             end
           when 'seed'
           when 'close'
+          when 'error'
+            if message[:record_runtime]
+              STDERR.puts File.read("tmp/turbo_rspec_runtime.log")
+            end
+            @threads.each(&:kill)
+            @error = true
+            break
           when 'exit'
             exited += 1
             if exited == @num_processes + 1

From add2a9411e7bb26b133a12bacc11a47c43e6f648 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 23 Jun 2020 12:08:48 +0800
Subject: [PATCH 1803/1830] DEV: Remove specs that are no longer relevant.

---
 spec/components/discourse_redis_spec.rb | 165 ------------------------
 1 file changed, 165 deletions(-)

diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb
index abc9a5917a..8156a573ec 100644
--- a/spec/components/discourse_redis_spec.rb
+++ b/spec/components/discourse_redis_spec.rb
@@ -3,15 +3,6 @@
 require 'rails_helper'
 
 describe DiscourseRedis do
-  let(:slave_host) { 'testhost' }
-  let(:slave_port) { 1234 }
-
-  let(:config) do
-    DiscourseRedis.config.dup.merge(slave_host: 'testhost', slave_port: 1234, connector: DiscourseRedis::Connector)
-  end
-
-  let(:fallback_handler) { DiscourseRedis::FallbackHandler.instance }
-
   it "ignore_readonly returns nil from a pure exception" do
     result = DiscourseRedis.ignore_readonly { raise Redis::CommandError.new("READONLY") }
     expect(result).to eq(nil)
@@ -88,160 +79,4 @@ describe DiscourseRedis do
       end
     end
   end
-
-  context '.slave_host' do
-    it 'should return the right config' do
-      slave_config = DiscourseRedis.slave_config(config)
-      expect(slave_config[:host]).to eq(slave_host)
-      expect(slave_config[:port]).to eq(slave_port)
-    end
-  end
-
-  context 'when redis connection is to a slave redis server' do
-    it 'should check the status of the master server' do
-      begin
-        fallback_handler.master = false
-        Discourse.redis.without_namespace.expects(:set).raises(Redis::CommandError.new("READONLY"))
-        fallback_handler.expects(:verify_master).once
-        Discourse.redis.set('test', '1')
-      ensure
-        fallback_handler.master = true
-        Discourse.redis.del('test')
-      end
-    end
-  end
-
-  describe DiscourseRedis::Connector do
-    let(:connector) { DiscourseRedis::Connector.new(config) }
-
-    after do
-      fallback_handler.master = true
-    end
-
-    it 'should return the master config when master is up' do
-      expect(connector.resolve).to eq(config)
-    end
-
-    class BrokenRedis
-      def initialize(error)
-        @error = error
-      end
-
-      def call(*args)
-        raise @error
-      end
-
-      def disconnect
-      end
-    end
-
-    it 'should return the slave config when master is down' do
-      error = Redis::CannotConnectError
-
-      expect do
-        connector.resolve(BrokenRedis.new(error))
-      end.to raise_error(Redis::CannotConnectError)
-
-      config = connector.resolve
-
-      expect(config[:host]).to eq(slave_host)
-      expect(config[:port]).to eq(slave_port)
-    end
-
-    it "should return the slave config when master's hostname cannot be resolved" do
-      error = RuntimeError.new('Name or service not known')
-
-      expect do
-        connector.resolve(BrokenRedis.new(error))
-      end.to raise_error(error)
-
-      expect(fallback_handler.master).to eq(false)
-
-      config = connector.resolve
-
-      expect(config[:host]).to eq(slave_host)
-      expect(config[:port]).to eq(slave_port)
-      expect(fallback_handler.master).to eq(false)
-    end
-
-    it "should return the slave config when master is still loading data" do
-      Redis::Client.any_instance
-        .expects(:call)
-        .with([:info, :persistence])
-        .returns("
-          someconfig:haha\r
-          #{DiscourseRedis::FallbackHandler::MASTER_LOADING_STATUS}
-        ")
-
-      config = connector.resolve
-
-      expect(config[:host]).to eq(slave_host)
-      expect(config[:port]).to eq(slave_port)
-    end
-
-    it "should raise the right error" do
-      error = RuntimeError.new('test')
-
-      2.times do
-        expect { connector.resolve(BrokenRedis.new(error)) }
-          .to raise_error(error)
-      end
-    end
-  end
-
-  describe DiscourseRedis::FallbackHandler do
-    before do
-      @original_keepalive_interval = MessageBus.keepalive_interval
-    end
-
-    after do
-      fallback_handler.master = true
-      MessageBus.keepalive_interval = @original_keepalive_interval
-    end
-
-    describe '#initiate_fallback_to_master' do
-      it 'should return the right value if the master server is still down' do
-        fallback_handler.master = false
-        Redis::Client.any_instance.expects(:call).with([:info]).returns("Some other stuff")
-
-        expect(fallback_handler.initiate_fallback_to_master).to eq(false)
-        expect(MessageBus.keepalive_interval).to eq(0)
-      end
-
-      it 'should fallback to the master server once it is up' do
-        fallback_handler.master = false
-        master_conn = mock('master')
-        slave_conn = mock('slave')
-
-        Redis::Client.expects(:new)
-          .with(DiscourseRedis.config)
-          .returns(master_conn)
-
-        Redis::Client.expects(:new)
-          .with(DiscourseRedis.slave_config)
-          .returns(slave_conn)
-
-        master_conn.expects(:call)
-          .with([:info])
-          .returns("
-            #{DiscourseRedis::FallbackHandler::MASTER_ROLE_STATUS}\r\n
-            #{DiscourseRedis::FallbackHandler::MASTER_LOADED_STATUS}
-          ")
-
-        DiscourseRedis::FallbackHandler::CONNECTION_TYPES.each do |connection_type|
-          slave_conn.expects(:call).with(
-            [:client, [:kill, 'type', connection_type]]
-          )
-        end
-
-        master_conn.expects(:disconnect)
-        slave_conn.expects(:disconnect)
-
-        expect(fallback_handler.initiate_fallback_to_master).to eq(true)
-        expect(fallback_handler.master).to eq(true)
-        expect(Discourse.recently_readonly?).to eq(false)
-        expect(MessageBus.keepalive_interval).to eq(-1)
-      end
-    end
-  end
 end

From 1157d2a0ff4150edcff28a4f63099470f6c1d460 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 23 Jun 2020 13:34:58 +0800
Subject: [PATCH 1804/1830] DEV: Print proper summary when errors have been
 reporter in turbo_rspec

---
 lib/turbo_tests/json_rows_formatter.rb |  8 ++++++++
 lib/turbo_tests/reporter.rb            | 13 ++++++++++++-
 lib/turbo_tests/runner.rb              | 17 ++++++-----------
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/lib/turbo_tests/json_rows_formatter.rb b/lib/turbo_tests/json_rows_formatter.rb
index c83ee32ce7..453edd4264 100644
--- a/lib/turbo_tests/json_rows_formatter.rb
+++ b/lib/turbo_tests/json_rows_formatter.rb
@@ -9,6 +9,7 @@ module TurboTests
       :example_failed,
       :example_passed,
       :example_pending,
+      :message,
       :seed
     )
 
@@ -95,6 +96,13 @@ module TurboTests
       )
     end
 
+    def message(notification)
+      output_row(
+        type: :message,
+        message: notification.message
+      )
+    end
+
     private
 
     def output_row(obj)
diff --git a/lib/turbo_tests/reporter.rb b/lib/turbo_tests/reporter.rb
index 62a3db2e48..6d02a1fb58 100644
--- a/lib/turbo_tests/reporter.rb
+++ b/lib/turbo_tests/reporter.rb
@@ -27,6 +27,8 @@ module TurboTests
       @failed_examples = []
       @all_examples = []
       @start_time = start_time
+      @messages = []
+      @errors_outside_of_examples_count = 0
     end
 
     def add(name, outputs)
@@ -63,6 +65,15 @@ module TurboTests
       @failed_examples << example
     end
 
+    def message(message)
+      delegate_to_formatters(:message, RSpec::Core::Notifications::MessageNotification.new(message))
+      @messages << message
+    end
+
+    def error_outside_of_examples
+      @errors_outside_of_examples_count += 1
+    end
+
     def finish
       end_time = Time.now
 
@@ -86,7 +97,7 @@ module TurboTests
           @failed_examples,
           @pending_examples,
           0,
-          0
+          @errors_outside_of_examples_count
         )
       )
       delegate_to_formatters(:close,
diff --git a/lib/turbo_tests/runner.rb b/lib/turbo_tests/runner.rb
index c0e9053664..3faff70dc3 100644
--- a/lib/turbo_tests/runner.rb
+++ b/lib/turbo_tests/runner.rb
@@ -44,7 +44,6 @@ module TurboTests
       group_opts = {}
 
       if use_runtime_info
-        FileUtils.rm("tmp/turbo_rspec_runtime.log", force: true)
         group_opts[:runtime_log] = "tmp/turbo_rspec_runtime.log"
       else
         group_opts[:group_by] = :filesize
@@ -189,14 +188,12 @@ module TurboTests
             @messages << { type: 'exit', process_id: process_id }
           end
 
-        stdout_thread = start_copy_thread(stdout, STDOUT)
-        stderr_thread = start_copy_thread(stderr, STDERR)
-        @threads << stdout_thread
-        @threads << stderr_thread
+        @threads << start_copy_thread(stdout, STDOUT)
+        @threads << start_copy_thread(stderr, STDERR)
 
         @threads << Thread.new do
           if wait_thr.value.exitstatus != 0
-            @messages << { type: 'error', record_runtime: record_runtime }
+            @messages << { type: 'error' }
           end
         end
       end
@@ -238,15 +235,13 @@ module TurboTests
               @threads.each(&:kill)
               break
             end
+          when 'message'
+            @reporter.message(message[:message])
           when 'seed'
           when 'close'
           when 'error'
-            if message[:record_runtime]
-              STDERR.puts File.read("tmp/turbo_rspec_runtime.log")
-            end
-            @threads.each(&:kill)
+            @reporter.error_outside_of_examples
             @error = true
-            break
           when 'exit'
             exited += 1
             if exited == @num_processes + 1

From 97f045d06aa7ce9964920f5ced576f58c8ce3b88 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 23 Jun 2020 15:43:41 +1000
Subject: [PATCH 1805/1830] DOCS: remove thin from copyright

it is no longer used
---
 COPYRIGHT.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index b22e221ed4..cb867e5604 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -29,5 +29,3 @@ Javascript
 Ruby
 
   Rails - Copyright (c) 2005-2013 David Heinemeier Hansson, Rails Core Team contributors (MIT)
-
-  Thin - Copyright (c) 2012-2013 Marc-Andre Cournoyer

From e92909aa7700bc39091e341661285b056e9ab450 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 23 Jun 2020 17:10:56 +1000
Subject: [PATCH 1806/1830] FIX: Use ActionDispatch::Http::ContentDisposition
 for uploads content-disposition (#10108)

See https://meta.discourse.org/t/broken-pipe-error-when-uploading-to-a-s3-clone-a-pdf-with-a-name-containing-e-i-etc/155414

When setting content-disposition for attachment, use the ContentDisposition class to format it. This handles filenames with weird characters and localization (accented characters) correctly.
---
 lib/file_store/s3_store.rb                  | 4 +++-
 lib/file_store/to_s3_migration.rb           | 5 +++--
 spec/components/file_store/s3_store_spec.rb | 2 +-
 spec/multisite/s3_store_spec.rb             | 6 +++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index cc507ed6ea..ef4717f3f3 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -59,7 +59,9 @@ module FileStore
       # HTML players, and when a direct link is provided to any file but an image
       # it will download correctly in the browser.
       if !FileHelper.is_supported_image?(filename)
-        options[:content_disposition] = "attachment; filename=\"#{filename}\""
+        options[:content_disposition] = ActionDispatch::Http::ContentDisposition.format(
+          disposition: "attachment", filename: filename
+        )
       end
 
       path.prepend(File.join(upload_path, "/")) if Rails.configuration.multisite
diff --git a/lib/file_store/to_s3_migration.rb b/lib/file_store/to_s3_migration.rb
index 6f19f2d00f..0235375928 100644
--- a/lib/file_store/to_s3_migration.rb
+++ b/lib/file_store/to_s3_migration.rb
@@ -224,8 +224,9 @@ module FileStore
           upload = Upload.find_by(url: "/#{file}")
 
           if upload&.original_filename
-            options[:content_disposition] =
-              %Q{attachment; filename="#{upload.original_filename}"}
+            options[:content_disposition] = ActionDispatch::Http::ContentDisposition.format(
+              disposition: "attachment", filename: upload.original_filename
+            )
           end
 
           if upload&.secure
diff --git a/spec/components/file_store/s3_store_spec.rb b/spec/components/file_store/s3_store_spec.rb
index 15c36b05be..d5bbcebf1e 100644
--- a/spec/components/file_store/s3_store_spec.rb
+++ b/spec/components/file_store/s3_store_spec.rb
@@ -91,7 +91,7 @@ describe FileStore::S3Store do
             acl: "private",
             cache_control: "max-age=31556952, public, immutable",
             content_type: "application/pdf",
-            content_disposition: "attachment; filename=\"#{upload.original_filename}\"",
+            content_disposition: "attachment; filename=\"#{upload.original_filename}\"; filename*=UTF-8''#{upload.original_filename}",
             body: uploaded_file).returns(Aws::S3::Types::PutObjectOutput.new(etag: "\"#{etag}\""))
 
           expect(store.store_upload(uploaded_file, upload)).to eq(
diff --git a/spec/multisite/s3_store_spec.rb b/spec/multisite/s3_store_spec.rb
index a4c0f3e02a..c857e3e9dd 100644
--- a/spec/multisite/s3_store_spec.rb
+++ b/spec/multisite/s3_store_spec.rb
@@ -44,7 +44,7 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
         let(:uploaded_file) { file_from_fixtures("small.pdf", "pdf") }
 
         it "adds an attachment content-disposition with the original filename" do
-          disp_opts = { content_disposition: "attachment; filename=\"#{original_filename}\"", content_type: "application/pdf" }
+          disp_opts = { content_disposition: "attachment; filename=\"#{original_filename}\"; filename*=UTF-8''#{original_filename}", content_type: "application/pdf" }
           s3_helper.expects(:upload).with(uploaded_file, kind_of(String), upload_opts.merge(disp_opts)).returns(["path", "etag"])
           upload = build_upload
           store.store_upload(uploaded_file, upload)
@@ -56,7 +56,7 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
         let(:uploaded_file) { file_from_fixtures("small.mp4", "media") }
 
         it "adds an attachment content-disposition with the original filename" do
-          disp_opts = { content_disposition: "attachment; filename=\"#{original_filename}\"", content_type: "application/mp4" }
+          disp_opts = { content_disposition: "attachment; filename=\"#{original_filename}\"; filename*=UTF-8''#{original_filename}", content_type: "application/mp4" }
           s3_helper.expects(:upload).with(uploaded_file, kind_of(String), upload_opts.merge(disp_opts)).returns(["path", "etag"])
           upload = build_upload
           store.store_upload(uploaded_file, upload)
@@ -68,7 +68,7 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
         let(:uploaded_file) { file_from_fixtures("small.mp3", "media") }
 
         it "adds an attachment content-disposition with the original filename" do
-          disp_opts = { content_disposition: "attachment; filename=\"#{original_filename}\"", content_type: "audio/mpeg" }
+          disp_opts = { content_disposition: "attachment; filename=\"#{original_filename}\"; filename*=UTF-8''#{original_filename}", content_type: "audio/mpeg" }
           s3_helper.expects(:upload).with(uploaded_file, kind_of(String), upload_opts.merge(disp_opts)).returns(["path", "etag"])
           upload = build_upload
           store.store_upload(uploaded_file, upload)

From 27b2e335efb3ee3374cf7aa92124281d639eccdb Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 23 Jun 2020 15:42:04 +0800
Subject: [PATCH 1807/1830] DEV: Retry on distributed mutex timeout error when
 starting sidekiq.

We need Sidekiq to start `mini_scheduler` no matter what. Timeouts
happen when trying to boot an app with Redis in readonly mode.
---
 config/initializers/100-sidekiq.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/initializers/100-sidekiq.rb b/config/initializers/100-sidekiq.rb
index 892380708d..6d6e0ddb3a 100644
--- a/config/initializers/100-sidekiq.rb
+++ b/config/initializers/100-sidekiq.rb
@@ -70,7 +70,12 @@ if Sidekiq.server?
     scheduler_hostname = ENV["UNICORN_SCHEDULER_HOSTNAME"]
 
     if !scheduler_hostname || scheduler_hostname.split(',').include?(Discourse.os_hostname)
-      MiniScheduler.start(workers: GlobalSetting.mini_scheduler_workers)
+      begin
+        MiniScheduler.start(workers: GlobalSetting.mini_scheduler_workers)
+      rescue MiniScheduler::DistributedMutex::Timeout
+        sleep 5
+        retry
+      end
     end
   end
 end

From 84c12d8f3d77366bda1fe51a834e98e7f18a0b1a Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 23 Jun 2020 16:28:21 +0800
Subject: [PATCH 1808/1830] DEV: Allow multisite apps to boot with readonly db.

---
 lib/freedom_patches/rails_multisite.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lib/freedom_patches/rails_multisite.rb b/lib/freedom_patches/rails_multisite.rb
index c4627daa2a..35c6b82624 100644
--- a/lib/freedom_patches/rails_multisite.rb
+++ b/lib/freedom_patches/rails_multisite.rb
@@ -6,6 +6,22 @@ module RailsMultisite
       self.each_connection do |db|
         begin
           yield(db) if block_given?
+        rescue PG::ConnectionBad, PG::UnableToSend, PG::ServerError
+          break if !defined?(RailsFailover::ActiveRecord)
+          break if db == RailsMultisite::ConnectionManagement::DEFAULT
+
+          reading_role = :"#{db}_#{ActiveRecord::Base.reading_role}"
+          spec = RailsMultisite::ConnectionManagement.connection_spec(db: db)
+
+          ActiveRecord::Base.connection_handlers[reading_role] ||= begin
+            handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
+            RailsFailover::ActiveRecord.establish_reading_connection(handler, spec)
+            handler
+          end
+
+          ActiveRecord::Base.connected_to(role: reading_role) do
+            yield(db) if block_given?
+          end
         rescue => e
           STDERR.puts "URGENT: Failed to initialize site #{db}: "\
             "#{e.class} #{e.message}\n#{e.backtrace.join("\n")}"

From 368af327fada3e83ee6982f0d477a8c181ce7674 Mon Sep 17 00:00:00 2001
From: Daniel Waterworth <me@danielwaterworth.com>
Date: Tue, 23 Jun 2020 10:12:31 +0100
Subject: [PATCH 1809/1830] DEV: Reduce size of begin-rescue region

Follow-up-to: e3e7905d9ebd86943102917b2ff0bfee32035c01
---
 lib/turbo_tests/runner.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/turbo_tests/runner.rb b/lib/turbo_tests/runner.rb
index 3faff70dc3..808e18a28e 100644
--- a/lib/turbo_tests/runner.rb
+++ b/lib/turbo_tests/runner.rb
@@ -87,14 +87,15 @@ module TurboTests
 
       ActiveRecord::Tasks::DatabaseTasks.migrations_paths = ['db/migrate', 'db/post_migrate']
 
+      conn = ActiveRecord::Base.establish_connection(config).connection
+
       begin
-        conn = ActiveRecord::Base.establish_connection(config).connection
         ActiveRecord::Migration.check_pending!(conn)
       rescue ActiveRecord::PendingMigrationError
         puts "There are pending migrations, run rake parallel:migrate"
         exit 1
       ensure
-        conn&.close
+        conn.close
       end
     end
 

From c5078e5dc10ee01ff732e8ba8328d8ea18bb9cbc Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 23 Jun 2020 12:41:47 +0100
Subject: [PATCH 1810/1830] DEV: Remove accidentally committed `puts`
 statements

---
 spec/jobs/pull_hotlinked_images_spec.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/jobs/pull_hotlinked_images_spec.rb b/spec/jobs/pull_hotlinked_images_spec.rb
index 50722133c0..3aebe91a98 100644
--- a/spec/jobs/pull_hotlinked_images_spec.rb
+++ b/spec/jobs/pull_hotlinked_images_spec.rb
@@ -379,13 +379,11 @@ describe Jobs::PullHotlinkedImages do
 
     it "returns false for plugin assets" do
       src = UrlHelper.cook_url("/plugins/discourse-amazing-plugin/myasset.png")
-      puts "src is #{src}"
       expect(subject.should_download_image?(src)).to eq(false)
     end
 
     it "returns false for local non-uploaded files" do
       src = UrlHelper.cook_url("/mycustomroute.png")
-      puts "src is #{src}"
       expect(subject.should_download_image?(src)).to eq(false)
     end
 

From 91c89df68abeb945ee4d348ef5365af2001a8492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Tue, 23 Jun 2020 17:18:38 +0200
Subject: [PATCH 1812/1830] FIX: onebox local topic when using slug-less URL

When linking to a topic in the same Discourse, we try to onebox the link to show the title
and other various information depending on whether it's a "standard" or "inline" onebox.

However, we were not properly detecting links to topics that had no slugs (eg. https://meta.discourse.org/t/1234).
---
 lib/oneboxer.rb                  | 4 +---
 spec/components/oneboxer_spec.rb | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index d3625f19d8..eb5067cae9 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -219,9 +219,7 @@ module Oneboxer
       end
     end
 
-    topic = Topic.find_by(id: route[:topic_id])
-
-    return unless topic
+    return unless topic = Topic.find_by(id: route[:id] || route[:topic_id])
     return if topic.private_message?
 
     if current_category.blank? || current_category.id != topic.category_id
diff --git a/spec/components/oneboxer_spec.rb b/spec/components/oneboxer_spec.rb
index c5bc2dca86..f1681e5bc2 100644
--- a/spec/components/oneboxer_spec.rb
+++ b/spec/components/oneboxer_spec.rb
@@ -69,6 +69,9 @@ describe Oneboxer do
       expect(onebox).to include(%{data-post="2"})
       expect(onebox).to include(PrettyText.avatar_img(replier.avatar_template, "tiny"))
 
+      short_url = "#{Discourse.base_uri}/t/#{public_topic.id}"
+      expect(preview(short_url, user, public_category)).to include(public_topic.title)
+
       onebox = preview(public_moderator_action.url, user, public_category)
       expect(onebox).to include(public_moderator_action.excerpt)
       expect(onebox).to include(%{data-post="4"})

From 4a189f396e869c5822616f1e7f1c3641c57adf69 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 23 Jun 2020 12:46:46 -0400
Subject: [PATCH 1813/1830] Build(deps): Bump diff-lcs from 1.3 to 1.4 (#10112)

Bumps [diff-lcs](https://github.com/halostatue/diff-lcs) from 1.3 to 1.4.
- [Release notes](https://github.com/halostatue/diff-lcs/releases)
- [Changelog](https://github.com/halostatue/diff-lcs/blob/master/History.md)
- [Commits](https://github.com/halostatue/diff-lcs/compare/v1.3...v1.4)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 1148682938..c2b61d8b49 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,7 +96,7 @@ GEM
     css_parser (1.7.1)
       addressable
     debug_inspector (0.0.3)
-    diff-lcs (1.3)
+    diff-lcs (1.4)
     diffy (3.3.0)
     discourse-ember-source (3.12.2.0)
     discourse_image_optim (0.26.2)

From 4c543b4a4923fae25135addb0ff2a1eb3a594b40 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Tue, 23 Jun 2020 17:21:36 -0300
Subject: [PATCH 1814/1830] UX: Make youtube embeds full width by default
 (#10106)

* UX: Make youtube embeds full width by default

* UX: Make youtube embeds fluid by default actually

* Remove double sizes in yt-lazy
---
 plugins/lazy-yt/plugin.rb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/plugins/lazy-yt/plugin.rb b/plugins/lazy-yt/plugin.rb
index 06b25ce427..b0ed271e36 100644
--- a/plugins/lazy-yt/plugin.rb
+++ b/plugins/lazy-yt/plugin.rb
@@ -22,8 +22,11 @@ class Onebox::Engine::YoutubeOnebox
 
   def to_html
     if video_id && !params['list']
-      video_width = (params['width'] && params['width'].to_i <= 695) ? params['width'] : 480 # embed width
-      video_height = (params['height'] && params['height'].to_i <= 500) ? params['height'] : 270 # embed height
+
+      size_restricted = [params['width'], params['height']].any?
+      video_width = (params['width'] && params['width'].to_i <= 695) ? params['width'] : 690 # embed width
+      video_height = (params['height'] && params['height'].to_i <= 500) ? params['height'] : 388 # embed height
+      size_tags = ["width=\"#{video_width}\"", "height=\"#{video_height}\""]
 
       og = get_opengraph.data
       thumbnail_url = og[:image] || "https://img.youtube.com/vi/#{video_id}/hqdefault.jpg"
@@ -35,11 +38,13 @@ class Onebox::Engine::YoutubeOnebox
       <div class="onebox lazyYT lazyYT-container"
            data-youtube-id="#{video_id}"
            data-youtube-title="#{escaped_title}"
-           data-width="#{video_width}"
-           data-height="#{video_height}"
+           #{size_restricted ? size_tags.map { |t| "data-#{t}" }.join(' ') : ""}
            data-parameters="#{embed_params}">
         <a href="https://www.youtube.com/watch?v=#{video_id}" target="_blank">
-          <img class="ytp-thumbnail-image" src="#{thumbnail_url}" width="#{video_width}" height="#{video_height}" title="#{escaped_title}">
+          <img class="ytp-thumbnail-image"
+               src="#{thumbnail_url}"
+               #{size_restricted ? size_tags.join(' ') : ""}
+               title="#{escaped_title}">
         </a>
       </div>
       EOF

From 13087cab546ed22de1b01985b4abdc28e3cd6ad3 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 24 Jun 2020 00:25:54 +0200
Subject: [PATCH 1815/1830] =?UTF-8?q?FIX:=20Prevent=20typing=20"#"=20when?=
 =?UTF-8?q?=20showing=20"Jump=20to=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes https://meta.discourse.org/t/the-shortcut-behaves-wrong-in-some-browsers/155531
---
 app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
index 29cfaaf9d2..f887d2eb87 100644
--- a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
@@ -355,7 +355,8 @@ export default {
     this.container.lookup("controller:topic").togglePinnedState();
   },
 
-  goToPost() {
+  goToPost(event) {
+    preventKeyboardEvent(event);
     this.appEvents.trigger("topic:keyboard-trigger", { type: "jump" });
   },
 

From f6ad0d3facb95c2c150ce68682b6b7f6e1b08d1a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 23 Jun 2020 22:15:15 +0000
Subject: [PATCH 1816/1830] Build(deps): Bump diff-lcs from 1.4 to 1.4.1

Bumps [diff-lcs](https://github.com/halostatue/diff-lcs) from 1.4 to 1.4.1.
- [Release notes](https://github.com/halostatue/diff-lcs/releases)
- [Changelog](https://github.com/halostatue/diff-lcs/blob/master/History.md)
- [Commits](https://github.com/halostatue/diff-lcs/compare/v1.4...v1.4.1)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index c2b61d8b49..b24896b257 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,7 +96,7 @@ GEM
     css_parser (1.7.1)
       addressable
     debug_inspector (0.0.3)
-    diff-lcs (1.4)
+    diff-lcs (1.4.1)
     diffy (3.3.0)
     discourse-ember-source (3.12.2.0)
     discourse_image_optim (0.26.2)

From e0cd7ddadadb399143444a270ee82237b56265fe Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 17 Jun 2020 22:17:02 +0000
Subject: [PATCH 1817/1830] Build(deps): Bump excon from 0.74.0 to 0.75.0

Bumps [excon](https://github.com/excon/excon) from 0.74.0 to 0.75.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.74.0...v0.75.0)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index b24896b257..adf2d05225 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -121,7 +121,7 @@ GEM
       railties (>= 3.1)
     ember-source (2.18.2)
     erubi (1.9.0)
-    excon (0.74.0)
+    excon (0.75.0)
     execjs (2.7.0)
     exifr (1.3.6)
     fabrication (2.21.1)

From b28d97b64a2dbe8c923acf1d3df5d277d1d136c5 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 24 Jun 2020 11:00:00 +0800
Subject: [PATCH 1818/1830] FIX: Bump onebox for twitch video and clips
 embedding fix.

---
 Gemfile.lock    | 2 +-
 lib/oneboxer.rb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index adf2d05225..4862c4a3be 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -240,7 +240,7 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.9.28.4)
+    onebox (1.9.29)
       addressable (~> 2.7.0)
       htmlentities (~> 4.3)
       multi_json (~> 1.11)
diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index eb5067cae9..107e6d0610 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -313,7 +313,8 @@ module Oneboxer
 
       options = {
         max_width: 695,
-        sanitize_config: Onebox::DiscourseOneboxSanitizeConfig::Config::DISCOURSE_ONEBOX
+        sanitize_config: Onebox::DiscourseOneboxSanitizeConfig::Config::DISCOURSE_ONEBOX,
+        hostname: GlobalSetting.hostname,
       }
 
       options[:cookie] = fd.cookie if fd.cookie

From dcad720a4ce0aa67e94299ff8370fafd20cc41b2 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 24 Jun 2020 15:36:51 +1000
Subject: [PATCH 1819/1830] DEV: add optional verbose logging to re-index job

This verbose logging can be useful when executing the job by hand
for debugging purposes

In general people will not use this
---
 app/jobs/scheduled/reindex_search.rb | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/app/jobs/scheduled/reindex_search.rb b/app/jobs/scheduled/reindex_search.rb
index 50d3e540f7..a884ab7e46 100644
--- a/app/jobs/scheduled/reindex_search.rb
+++ b/app/jobs/scheduled/reindex_search.rb
@@ -8,6 +8,8 @@ module Jobs
     CLEANUP_GRACE_PERIOD ||= 1.day.ago
 
     def execute(args)
+      @verbose = true if args && Hash === args && args[:verbose]
+
       rebuild_problem_topics
       rebuild_problem_posts
       rebuild_problem_categories
@@ -15,11 +17,17 @@ module Jobs
       rebuild_problem_tags
       clean_post_search_data
       clean_topic_search_data
+
+      @verbose = nil
     end
 
     def rebuild_problem_categories(limit: 500)
       category_ids = load_problem_category_ids(limit)
 
+      if @verbose
+        puts "rebuilding #{category_ids.length} categories"
+      end
+
       category_ids.each do |id|
         category = Category.find_by(id: id)
         SearchIndexer.index(category, force: true) if category
@@ -29,6 +37,10 @@ module Jobs
     def rebuild_problem_users(limit: 10000)
       user_ids = load_problem_user_ids(limit)
 
+      if @verbose
+        puts "rebuilding #{user_ids.length} users"
+      end
+
       user_ids.each do |id|
         user = User.find_by(id: id)
         SearchIndexer.index(user, force: true) if user
@@ -38,6 +50,10 @@ module Jobs
     def rebuild_problem_topics(limit: 10000)
       topic_ids = load_problem_topic_ids(limit)
 
+      if @verbose
+        puts "rebuilding #{topic_ids.length} topics"
+      end
+
       topic_ids.each do |id|
         topic = Topic.find_by(id: id)
         SearchIndexer.index(topic, force: true) if topic
@@ -47,6 +63,10 @@ module Jobs
     def rebuild_problem_posts(limit: 20000, indexer: SearchIndexer)
       post_ids = load_problem_post_ids(limit)
 
+      if @verbose
+        puts "rebuilding #{post_ids.length} posts"
+      end
+
       post_ids.each do |id|
         # could be deleted while iterating through batch
         if post = Post.find_by(id: id)
@@ -58,6 +78,10 @@ module Jobs
     def rebuild_problem_tags(limit: 10000)
       tag_ids = load_problem_tag_ids(limit)
 
+      if @verbose
+        puts "rebuilding #{tag_ids.length} tags"
+      end
+
       tag_ids.each do |id|
         tag = Tag.find_by(id: id)
         SearchIndexer.index(tag, force: true) if tag
@@ -67,6 +91,8 @@ module Jobs
     private
 
     def clean_post_search_data
+      puts "cleaning up post search data" if @verbose
+
       PostSearchData
         .joins("LEFT JOIN posts p ON p.id = post_search_data.post_id")
         .where("p.raw = ''")
@@ -90,6 +116,8 @@ module Jobs
     end
 
     def clean_topic_search_data
+      puts "cleaning up topic search data" if @verbose
+
       DB.exec(<<~SQL, deleted_at: CLEANUP_GRACE_PERIOD)
       DELETE FROM topic_search_data
       WHERE topic_id IN (

From 42226e12eef8d143e94700039e20c6e801afbc38 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Wed, 24 Jun 2020 08:45:11 +0300
Subject: [PATCH 1820/1830] FEATURE: Add after-user-name plugin outlet (#10113)

---
 .../javascripts/discourse/app/templates/components/user-info.hbs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse/app/templates/components/user-info.hbs b/app/assets/javascripts/discourse/app/templates/components/user-info.hbs
index 0d3f1bdfdb..ced515393c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-info.hbs
@@ -15,6 +15,7 @@
   <div class="name-line">
     <span class="username"><a href={{this.userPath}} data-user-card={{@user.username}}>{{format-username @user.username}}</a></span>
     <span class="name">{{this.name}}</span>
+    {{plugin-outlet name="after-user-name" connectorTagName="span" args=(hash user=user)}}
   </div>
   <div class="title">{{@user.title}}</div>
 

From 713298c62237716fcc0505435b4c84bd74c2c750 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 24 Jun 2020 01:45:50 -0400
Subject: [PATCH 1821/1830] FIX: advanced tutorial errors when all categories
 are secured (#10111)

The category hashtag step will fail with an error when all
categories aren't public. Choose a category that the user can see.
---
 .../lib/discourse_narrative_bot/advanced_user_narrative.rb      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
index 52f1cdab65..bd6bb02e49 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
@@ -41,7 +41,7 @@ module DiscourseNarrativeBot
       tutorial_recover: {
         next_state: :tutorial_category_hashtag,
         next_instructions: Proc.new do
-          category = Category.secured.last
+          category = Category.secured(Guardian.new(@user)).last
           slug = category.slug
 
           if parent_category = category.parent_category

From 52278ce6fdbe0cace914cb0cb949128417539707 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Tue, 23 Jun 2020 22:51:30 -0700
Subject: [PATCH 1822/1830] FIX: Use Discourse.system_user when we need a
 placeholder admin (#9781)

---
 app/models/category_featured_topic.rb | 11 +----------
 app/services/random_topic_selector.rb |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/models/category_featured_topic.rb b/app/models/category_featured_topic.rb
index cfad73d7d8..2e454effca 100644
--- a/app/models/category_featured_topic.rb
+++ b/app/models/category_featured_topic.rb
@@ -59,7 +59,7 @@ class CategoryFeaturedTopic < ActiveRecord::Base
     # no featured topics (all the previous 2x topics are only visible to admins)
 
     # Add topics, even if they're in secured categories or invisible
-    query = TopicQuery.new(CategoryFeaturedTopic.fake_admin, query_opts)
+    query = TopicQuery.new(Discourse.system_user, query_opts)
     results = query.list_category_topic_ids(c).uniq
 
     # Add some topics that are visible to everyone:
@@ -81,15 +81,6 @@ class CategoryFeaturedTopic < ActiveRecord::Base
       end
     end
   end
-
-  def self.fake_admin
-    # fake an admin
-    admin = User.new
-    admin.admin = true
-    admin.id = -1
-    admin
-  end
-
 end
 
 # == Schema Information
diff --git a/app/services/random_topic_selector.rb b/app/services/random_topic_selector.rb
index 4a89646dbe..467b4dba5f 100644
--- a/app/services/random_topic_selector.rb
+++ b/app/services/random_topic_selector.rb
@@ -25,7 +25,7 @@ class RandomTopicSelector
       end
 
       # don't leak private categories into the "everything" group
-      options[:guardian] = Guardian.new(CategoryFeaturedTopic.fake_admin)
+      options[:guardian] = Guardian.new(Discourse.system_user)
     end
 
     query = TopicQuery.new(nil, options)

From 843bf0df75aa3c26521e5a5e9f184dfee24056f8 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Wed, 24 Jun 2020 08:58:14 +0300
Subject: [PATCH 1823/1830] FIX:Add migration to delete tracking state for
 staged users (#10083)

---
 ..._delete_tracking_state_for_staged_users.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 db/migrate/20200618175923_delete_tracking_state_for_staged_users.rb

diff --git a/db/migrate/20200618175923_delete_tracking_state_for_staged_users.rb b/db/migrate/20200618175923_delete_tracking_state_for_staged_users.rb
new file mode 100644
index 0000000000..9885b561fb
--- /dev/null
+++ b/db/migrate/20200618175923_delete_tracking_state_for_staged_users.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class DeleteTrackingStateForStagedUsers < ActiveRecord::Migration[6.0]
+  def up
+    execute <<~SQL
+      DELETE FROM category_users
+      WHERE user_id IN (SELECT id FROM users WHERE staged = true)
+    SQL
+
+    execute <<~SQL
+      DELETE FROM tag_users
+      WHERE user_id IN (SELECT id FROM users WHERE staged = true)
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

From 0e2f7ecfd0dbd1f4d56ecb5cd895c7c5be679666 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 24 Jun 2020 08:03:38 +0200
Subject: [PATCH 1824/1830] DEV: Make component-test `afterEach` async aware
 (#10099)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this fix, if a test case was async, `afterEach` callback would be executed immediately, without waiting for the test to finish. 😬
---
 test/javascripts/helpers/component-test.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/javascripts/helpers/component-test.js b/test/javascripts/helpers/component-test.js
index 84f382a3b4..0330f6e91a 100644
--- a/test/javascripts/helpers/component-test.js
+++ b/test/javascripts/helpers/component-test.js
@@ -55,12 +55,12 @@ export default function(name, opts) {
     });
 
     andThen(() => {
-      try {
-        opts.test.call(this, assert);
-      } finally {
-        if (opts.afterEach) {
-          opts.afterEach.call(opts);
-        }
+      return opts.test.call(this, assert);
+    }).finally(() => {
+      if (opts.afterEach) {
+        andThen(() => {
+          return opts.afterEach.call(opts);
+        });
       }
     });
   });

From 2987901043fa5d320b75987712bd2868b61cf8e2 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 24 Jun 2020 17:07:52 +1000
Subject: [PATCH 1825/1830] FIX: skip category notification_level unless scoped

#b19dcac2 improved the serializer so it sends default notification
levels to users to work around cases where a category edit would
would result in clients being left with invalid notification state

Unfortunately this did not address the root issue.

When we edit categories we publish state to multiple users this
means that the serializer is executed unscoped with no user.

The client already handles this case per:

https://github.com/discourse/discourse/blob/dcad720a4ce0aa67e94299ff8370fafd20cc41b2/app/assets/javascripts/discourse/app/models/site.js#L119-L119

If a property is not shipped to it, it will leave it alone on the
existing category.


This fix ensures that these wide category info updates do not
include notification state to avoid corruption of local state.
---
 app/serializers/category_serializer.rb       |  4 ++++
 spec/models/category_spec.rb                 | 18 ++++++++++++++++++
 spec/serializers/category_serializer_spec.rb |  4 ++--
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb
index 583ee13865..6fb52855cd 100644
--- a/app/serializers/category_serializer.rb
+++ b/app/serializers/category_serializer.rb
@@ -81,6 +81,10 @@ class CategorySerializer < SiteCategorySerializer
     scope && scope.can_edit?(object)
   end
 
+  def include_notification_level?
+    scope && scope.user
+  end
+
   def notification_level
     user = scope && scope.user
     object.notification_level ||
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index f122673c0a..cab079d3cc 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -1134,6 +1134,24 @@ describe Category do
     end
   end
 
+  describe "messageBus" do
+    it "does not publish notification level when publishing to /categories" do
+      category = Fabricate(:category)
+      category.name = "Amazing category"
+      messages = MessageBus.track_publish("/categories") do
+        category.save!
+      end
+
+      expect(messages.length).to eq(1)
+      message = messages.first
+
+      category_hash = message.data[:categories].first
+
+      expect(category_hash[:name]).to eq(category.name)
+      expect(category_hash.key?(:notification_level)).to eq(false)
+    end
+  end
+
   describe "#ensure_consistency!" do
     it "creates category topic" do
 
diff --git a/spec/serializers/category_serializer_spec.rb b/spec/serializers/category_serializer_spec.rb
index e2a3399990..9e81726f55 100644
--- a/spec/serializers/category_serializer_spec.rb
+++ b/spec/serializers/category_serializer_spec.rb
@@ -29,9 +29,9 @@ describe CategorySerializer do
     expect(json[:custom_fields]).to be_present
   end
 
-  it "includes the default notification level" do
+  it "does not include the default notification level when there is no user" do
     json = described_class.new(category, scope: Guardian.new, root: false).as_json
-    expect(json[:notification_level]).to eq(CategoryUser.default_notification_level)
+    expect(json.key?(:notification_level)).to eq(false)
   end
 
   describe "user notification level" do

From 9ffc022cf44375986da4b8cef18ce409b399e820 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 24 Jun 2020 17:29:45 +1000
Subject: [PATCH 1826/1830] DEV: improve verbose mode for reindexer

This makes the verbose mode provide a bit of progress notification
while reindexing as it can take many hours to do a giant site
---
 app/jobs/scheduled/reindex_search.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/jobs/scheduled/reindex_search.rb b/app/jobs/scheduled/reindex_search.rb
index a884ab7e46..9ec0bd4d81 100644
--- a/app/jobs/scheduled/reindex_search.rb
+++ b/app/jobs/scheduled/reindex_search.rb
@@ -60,17 +60,24 @@ module Jobs
       end
     end
 
-    def rebuild_problem_posts(limit: 20000, indexer: SearchIndexer)
+    def rebuild_problem_posts(limit: 20000, indexer: SearchIndexer, verbose: false)
       post_ids = load_problem_post_ids(limit)
+      verbose ||= @verbose
 
-      if @verbose
+      if verbose
         puts "rebuilding #{post_ids.length} posts"
       end
 
+      i = 0
       post_ids.each do |id|
         # could be deleted while iterating through batch
         if post = Post.find_by(id: id)
           indexer.index(post, force: true)
+          i += 1
+
+          if verbose && i % 1000 == 0
+            puts "#{i} posts reindexed"
+          end
         end
       end
     end

From 75151f0457836f5dd11df3befc90f287b00d6fce Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Wed, 24 Jun 2020 10:31:20 +0300
Subject: [PATCH 1827/1830] FIX: Use correct URL for unsubscribe (#10077)

---
 app/mailers/subscription_mailer.rb       |  2 +-
 spec/mailers/subscription_mailer_spec.rb | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 spec/mailers/subscription_mailer_spec.rb

diff --git a/app/mailers/subscription_mailer.rb b/app/mailers/subscription_mailer.rb
index 535dec5387..a8c4234f6b 100644
--- a/app/mailers/subscription_mailer.rb
+++ b/app/mailers/subscription_mailer.rb
@@ -9,6 +9,6 @@ class SubscriptionMailer < ActionMailer::Base
                 template: "unsubscribe_mailer",
                 site_title: SiteSetting.title,
                 site_domain_name: Discourse.current_hostname,
-                confirm_unsubscribe_link: "#{Discourse.base_url}/unsubscribe/#{unsubscribe_key}"
+                confirm_unsubscribe_link: email_unsubscribe_url(unsubscribe_key, host: Discourse.base_url)
   end
 end
diff --git a/spec/mailers/subscription_mailer_spec.rb b/spec/mailers/subscription_mailer_spec.rb
new file mode 100644
index 0000000000..696231d4ff
--- /dev/null
+++ b/spec/mailers/subscription_mailer_spec.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe SubscriptionMailer do
+  fab!(:user) { Fabricate(:user) }
+
+  subject { SubscriptionMailer.confirm_unsubscribe(user) }
+
+  it "contains the right URL" do
+    expect(subject.body).to include("#{Discourse.base_url}/email/unsubscribe/#{UnsubscribeKey.last.key}")
+  end
+end

From df1f8044007b9a4e6c06ac85761bd01f0955da94 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 24 Jun 2020 10:49:47 +0200
Subject: [PATCH 1828/1830] FIX: ensures moderation history is accessible from
 topic/post admin menu (#10118)

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

diff --git a/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
index 532b5b9381..ec329103b4 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
@@ -14,6 +14,7 @@ createWidget("post-admin-menu-button", {
     return this.attach("button", {
       className: attrs.className,
       action: attrs.action,
+      url: attrs.url,
       icon: attrs.icon,
       label: attrs.label,
       secondaryAction: attrs.secondaryAction

From 7109d94ee77a9a1ba908fa8115b1bd9acf2631ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 24 Jun 2020 11:54:54 +0200
Subject: [PATCH 1829/1830] FIX: properly invalidate inline oneboxes when
 rebaking

When rebaking a post we were invalidating _regular_ oneboxes but not inline oneboxes.

DEV: also renamed 'InlineOneboxer.purge' to 'InlineOneboxer.invalidate' to keep
the API consistent with 'Oneboxer.invalidate'
---
 app/models/post.rb                            | 12 +++++-------
 app/models/post_analyzer.rb                   |  5 ++++-
 lib/inline_oneboxer.rb                        | 12 +++---------
 spec/components/cooked_post_processor_spec.rb |  4 ++--
 spec/components/inline_oneboxer_spec.rb       |  6 +++---
 spec/models/post_analyzer_spec.rb             |  1 +
 6 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/app/models/post.rb b/app/models/post.rb
index fefb43d787..a9880a8d26 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -752,18 +752,16 @@ class Post < ActiveRecord::Base
   # Enqueue post processing for this post
   def trigger_post_process(bypass_bump: false, priority: :normal, new_post: false, skip_pull_hotlinked_images: false)
     args = {
-      post_id: id,
       bypass_bump: bypass_bump,
+      cooking_options: self.cooking_options,
       new_post: new_post,
+      post_id: id,
       skip_pull_hotlinked_images: skip_pull_hotlinked_images,
     }
-    args[:image_sizes] = image_sizes if image_sizes.present?
-    args[:invalidate_oneboxes] = true if invalidate_oneboxes.present?
-    args[:cooking_options] = self.cooking_options
 
-    if priority && priority != :normal
-      args[:queue] = priority.to_s
-    end
+    args[:image_sizes] = image_sizes if self.image_sizes.present?
+    args[:invalidate_oneboxes] = true if self.invalidate_oneboxes.present?
+    args[:queue] = priority.to_s if priority && priority != :normal
 
     Jobs.enqueue(:process_post, args)
     DiscourseEvent.trigger(:after_trigger_post_process, self)
diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb
index bae36c39f8..c06d9d5f53 100644
--- a/app/models/post_analyzer.rb
+++ b/app/models/post_analyzer.rb
@@ -33,7 +33,10 @@ class PostAnalyzer
 
     result = Oneboxer.apply(cooked) do |url|
       @onebox_urls << url
-      Oneboxer.invalidate(url) if opts[:invalidate_oneboxes]
+      if opts[:invalidate_oneboxes]
+        Oneboxer.invalidate(url)
+        InlineOneboxer.invalidate(url)
+      end
       onebox = Oneboxer.cached_onebox(url)
       @found_oneboxes = true if onebox.present?
       onebox
diff --git a/lib/inline_oneboxer.rb b/lib/inline_oneboxer.rb
index edfd746562..26f3ecc9ba 100644
--- a/lib/inline_oneboxer.rb
+++ b/lib/inline_oneboxer.rb
@@ -13,7 +13,7 @@ class InlineOneboxer
     @urls.map { |url| InlineOneboxer.lookup(url, @opts) }.compact
   end
 
-  def self.purge(url)
+  def self.invalidate(url)
     Discourse.cache.delete(cache_key(url))
   end
 
@@ -65,14 +65,8 @@ class InlineOneboxer
   private
 
   def self.onebox_for(url, title, opts)
-    onebox = {
-      url: url,
-      title: title && Emoji.gsub_emoji_to_unicode(title)
-    }
-    unless opts[:skip_cache]
-      Discourse.cache.write(cache_key(url), onebox, expires_in: 1.day)
-    end
-
+    onebox = { url: url, title: title && Emoji.gsub_emoji_to_unicode(title) }
+    Discourse.cache.write(cache_key(url), onebox, expires_in: 1.day) if !opts[:skip_cache]
     onebox
   end
 
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index aa63a7e4c8..fef1e06aa3 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -86,7 +86,7 @@ describe CookedPostProcessor do
       end
 
       after do
-        InlineOneboxer.purge(url)
+        InlineOneboxer.invalidate(url)
         Oneboxer.invalidate(url)
       end
 
@@ -210,7 +210,7 @@ describe CookedPostProcessor do
         end
 
         after do
-          urls.each { |url| InlineOneboxer.purge(url) }
+          urls.each { |url| InlineOneboxer.invalidate(url) }
         end
 
         it 'should convert the right links to inline oneboxes' do
diff --git a/spec/components/inline_oneboxer_spec.rb b/spec/components/inline_oneboxer_spec.rb
index d99bab6d42..47c5abd6bb 100644
--- a/spec/components/inline_oneboxer_spec.rb
+++ b/spec/components/inline_oneboxer_spec.rb
@@ -26,7 +26,7 @@ describe InlineOneboxer do
     fab!(:topic) { Fabricate(:topic) }
 
     before do
-      InlineOneboxer.purge(topic.url)
+      InlineOneboxer.invalidate(topic.url)
     end
 
     it "puts an entry in the cache" do
@@ -34,7 +34,7 @@ describe InlineOneboxer do
       url = "https://example.com/random-url"
       stub_request(:get, url).to_return(status: 200, body: "<html><head><title>a blog</title></head></html>")
 
-      InlineOneboxer.purge(url)
+      InlineOneboxer.invalidate(url)
       expect(InlineOneboxer.cache_lookup(url)).to be_blank
 
       result = InlineOneboxer.lookup(url)
@@ -49,7 +49,7 @@ describe InlineOneboxer do
       SiteSetting.enable_inline_onebox_on_all_domains = true
       url = "https://example.com/random-url"
 
-      InlineOneboxer.purge(url)
+      InlineOneboxer.invalidate(url)
       expect(InlineOneboxer.cache_lookup(url)).to be_blank
 
       result = InlineOneboxer.lookup(url)
diff --git a/spec/models/post_analyzer_spec.rb b/spec/models/post_analyzer_spec.rb
index d74b72a4e1..70addd30cd 100644
--- a/spec/models/post_analyzer_spec.rb
+++ b/spec/models/post_analyzer_spec.rb
@@ -31,6 +31,7 @@ describe PostAnalyzer do
 
       it 'invalidates the oneboxes for urls in the post' do
         Oneboxer.expects(:invalidate).with url
+        InlineOneboxer.expects(:invalidate).with url
         post_analyzer.cook(raw, options)
       end
     end

From 8e07ee7e3698a50bfaf001b5bab79f1094f0e318 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 24 Jun 2020 10:47:45 -0400
Subject: [PATCH 1830/1830] Update translations

Carefully because permalink.external_url is untranslated in many
locales due to a recent change in client.en.yml in 516a03be096.
---
 config/locales/client.fi.yml    |   40 +
 config/locales/client.gl.yml    |    9 +
 config/locales/client.he.yml    |    3 +-
 config/locales/client.nl.yml    |    3 +-
 config/locales/client.ru.yml    |    3 +-
 config/locales/client.sv.yml    |    3 +-
 config/locales/client.th.yml    |  190 ++++-
 config/locales/client.zh_CN.yml |    9 +-
 config/locales/server.fr.yml    |    4 +-
 config/locales/server.gl.yml    | 1234 +++++++++++++++++++++++++++++--
 config/locales/server.he.yml    |    1 +
 config/locales/server.nl.yml    |    5 +-
 config/locales/server.ru.yml    |    1 +
 config/locales/server.sv.yml    |    1 +
 config/locales/server.th.yml    |   12 +
 15 files changed, 1444 insertions(+), 74 deletions(-)

diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 50975ce8c1..dd1ebb927d 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -2600,6 +2600,7 @@ fi:
       email_in_disabled_click: 'ota käyttöön "email in" asetus.'
       mailinglist_mirror: "Alue jäljittelee postituslistaa"
       show_subcategory_list: "Näytä lista tytäralueista ketjujen yläpuolella tällä alueella."
+      read_only_banner: "Banneriteksti joka näytetään, jos käyttäjä ei voi aloittaa ketjua tälle alueelle:"
       num_featured_topics: "Kuinka monta ketjua näytetään Keskustelualueet-sivulla:"
       subcategory_num_featured_topics: "Kuinka monta ketjua näytetään emoalueen sivulla:"
       all_topics_wiki: "Tee uusista ketjuista wiki-viestejä oletuksena."
@@ -2669,6 +2670,9 @@ fi:
         moderation: "Valvonta"
         appearance: "Ulkoasu"
         email: "Sähköposti"
+      list_filters:
+        all: "kaikki ketjut"
+        none: "ei tytäralueita"
     flagging:
       title: "Kiitos avustasi yhteisön hyväksi!"
       action: "Liputa viesti"
@@ -2844,6 +2848,7 @@ fi:
         this_month: "Kuukausi"
         this_week: "Viikko"
         today: "Tänään"
+        other_periods: "katso kuumat:"
     browser_update: 'Valitettavasti <a href="https://www.discourse.org/faq/#browser">selaimesi on liian vanha eikä siksi toimi tällä sivustolla</a>. <a href="https://browsehappy.com">Päivitä selaimesi</a> niin voit katsella nykyaikaisia sisältöjä, kirjautua sisään ja vastata.'
     permission_types:
       full: "Luoda / Vastata / Nähdä"
@@ -2936,6 +2941,8 @@ fi:
         topic_admin_actions: "%{shortcut} Avaa ketjun ylläpitotyökalut"
       search_menu:
         title: "Hakuvalikko"
+        prev_next: "%{shortcut} Siirry valinnassa ylös ja alas"
+        insert_url: "%{shortcut} Lisää valittu avoinna olevaan viestieditoriin"
     badges:
       earned_n_times:
         one: "Ansaitsi tämän ansiomerkin yhden kerran"
@@ -3171,6 +3178,7 @@ fi:
           view_table: "taulukko"
           view_graph: "graafi"
           refresh_report: "Päivitä raportti"
+          dates: "Päivämäärät (UTC)"
           groups: "Kaikki ryhmät"
           disabled: "Raportti ei ole käytössä"
           totals_for_sample: "Otos yhteensä"
@@ -3187,6 +3195,8 @@ fi:
               label: Ryhmä
             category:
               label: Alue
+            include_subcategories:
+              label: "Sisällytä tytäralueet"
       commits:
         latest_changes: "Viimeisimmät muutokset: päivitä usein!"
         by: "käyttäjältä"
@@ -3231,6 +3241,7 @@ fi:
             effects: Vaikutukset
             trust_levels_none: "Ei mitään"
             automatic_membership_email_domains: "Käyttäjä, joka rekisteröityy sähköpostiverkkotunnuksella joka täsmää tähän luetteloon, liitetään ryhmään automaattisesti:"
+            automatic_membership_user_count: "%{count} käyttäjällä on joku uusista sähköposti-verkkotunnuksista; heidät lisätään ryhmään."
             primary_group: "Aseta automaattisesti ensisijaiseksi ryhmäksi"
         name_placeholder: "Ryhmän nimi, ei välilyöntejä, samat säännöt kuin käyttäjänimillä"
         primary: "Ensisijainen ryhmä"
@@ -3342,6 +3353,9 @@ fi:
         notification_event:
           name: "Ilmoitustapahtuma"
           details: "Kun käyttäjä saa ilmoituksen syötteeseensä."
+        user_badge_event:
+          name: "Ansiomerkinmyöntämistapahtuma"
+          details: "Kun käyttäjä saa ansiomerkin."
         delivery_status:
           title: "Toimituksen tila"
           inactive: "Ei toiminnassa"
@@ -3491,6 +3505,7 @@ fi:
           theme_name: "Teeman nimi"
           component_name: "Komponentin nimi"
           themes_intro: "Aloita valitsemalla olemassa oleva teema tai asenna uusi."
+          themes_intro_emoji: "naistaiteilijaemoji"
           beginners_guide_title: "Aloittelijan opas Discourse-teemojen käyttämiseen"
           developers_guide_title: "Kehittäjän opas Discourse-teemoihin"
           browse_themes: "Selaile yhteisön kehittämiä teemoja"
@@ -4079,9 +4094,27 @@ fi:
         delete: "Poista käyttäjä"
         merge:
           prompt:
+            title: "Siirrä & poista %{username}"
+            description: |
+              <p>Valitse uusi omistaja käyttäjän <b>@%{username}'s</b> sisälölle.</p>
+
+              <p>Kaikki ketjunaloitukset, viestit, yksityisviestit ja muu käyttäjän <b>@%{username}</b> luoma sisältö siirtyvät.</p>
+            target_username_placeholder: "Uuden omistajan käyttäjänim"
+            transfer_and_delete: "Siirrä & poista %{username}"
             cancel: "Peru"
           confirmation:
+            title: "Siirrä & poista %{username}"
+            description: |
+              <p>Kaikki käyttäjän <b>@%{username}'s</b> sisältö siirretään käyttäjän <b>@%{targetUsername}</b> nimiin. Kun sisältö on siirretty, käyttäjän <b>@%{username}'s</b> tili poistetaan.</p>
+
+              <p><b>Tätä ei voi peruuttaa!</b></p>
+
+              <p>Jatka kirjoittamalla: <code>%{text}</code></p>
+            text: "siirrä käyttäjä @%{username} käyttäjälle @%{targetUsername}"
+            transfer_and_delete: "Siirrä & poista %{username}"
             cancel: "Peru"
+        merging_user: "Yhdistetään käyttäjää..."
+        merge_failed: "Käyttäjien yhdistäminen epäonnistui."
         delete_forbidden_because_staff: "Ylläpitäjiä ja valvojia ei voi poistaa."
         delete_posts_forbidden_because_staff: "Ylläpitäjien ja valvojien kaikkia viestejä ei voi poistaa."
         delete_forbidden:
@@ -4125,6 +4158,7 @@ fi:
           threshold_reached: "Vastaanotettiin liian monta palautusta tästä sähköpostiosoiteesta"
         trust_level_change_failed: "Käyttäjän luottamustason vaihtamisessa tapahtui virhe."
         suspend_modal_title: "Hyllytä käyttäjä"
+        confirm_cancel_penalty: "Oletko varma, että haluat pyyhkiä rangaistuksen?"
         trust_level_2_users: "Käyttäjät luottamustasolla 2"
         trust_level_3_requirements: "Luottamustaso 3 vaatimukset"
         trust_level_locked_tip: "luottamustaso on lukittu, järjestelmä ei ylennä tai alenna käyttäjää"
@@ -4267,6 +4301,8 @@ fi:
           modal_description: "Haluatko tämän muutoksen vaikuttavan takautuvasti? Tämä muuttaa kaikkien %{count} olemassa olevan käyttäjän käyttäjäasetusta."
           modal_yes: "Kyllä"
           modal_no: "Ei, muutosta sovellettakoon vain tästedes"
+        simple_list:
+          add_item: "Lisää asia..."
       badges:
         title: Ansiomerkit
         new_badge: Uusi ansiomerkki
@@ -4338,6 +4374,7 @@ fi:
             with_time: "<span class=\"username\">%{username}</span> <span class=\"time\">%{time}</span>"
         badge_intro:
           title: "Aloita valitsemalla olemassa oleva ansiomerkki tai luomalla uusi"
+          emoji: "naisopiskelijaemoji"
           what_are_badges_title: "Mitä ansiomerkit ovat?"
           badge_query_examples_title: "Esimerkkejä ansiomerkin tietokantakyselyistä"
         mass_award:
@@ -4345,6 +4382,8 @@ fi:
           description: Myönnä sama ansiomerkki useille käyttäjille samalla kertaa.
           no_badge_selected: Aloita valitsemalla ansiomerkki.
           perform: "Myönnä ansiomerkki käyttäjille"
+          upload_csv: "Lataa CSV, jossa on joko käyttäjien sähköpostiosoitteet tai käyttäjänimet"
+          aborted: "Lataa CSV, jossa on joko käyttäjien sähköpostiosoitteet tai käyttäjänimet"
           success: CSV tuli perille ja käyttäjät saavat ansiomerkkinsä pian.
           replace_owners: Poista ansiomerkki aiemmilta omistajilta
       emoji:
@@ -4355,6 +4394,7 @@ fi:
         name: "Nimi"
         group: "Ryhmä"
         image: "Kuva"
+        alt: "mukautetun emojin esikatselu"
         delete_confirm: "Oletko varma, että haluat poistaa emojin :%{name}:?"
       embedding:
         get_started: "Jos haluat upottaa Discoursen toiselle sivustolle, aloita lisäämällä isäntä."
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 7132554f66..33841359e9 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -354,6 +354,7 @@ gl:
         fields: "Campos"
       topics:
         topic: "Tema"
+        reviewable_count: "Número"
         deleted: "[Tema eliminado]"
         original: "(tema orixinal)"
         details: "detalles"
@@ -792,6 +793,7 @@ gl:
         save: "Gardar"
         edit: "Editar"
         security_key:
+          register: "Rexistrarse"
           save: "Gardar"
       change_about:
         title: "Cambiar «Verbo de min»"
@@ -1197,6 +1199,7 @@ gl:
       complete_email_not_found: "Ningunha conta coincide co <b>%{email}</b>"
       confirm_title: "Continuar a %{site_name}"
       logging_in_as: "Iniciar sesión como %{email}"
+      confirm_button: Finalizar inicio de sesión
     login:
       title: "Iniciar sesión"
       username: "Usuario"
@@ -1951,6 +1954,7 @@ gl:
         edit: "Sentímolo pero produciuse un erro editando a publicación. Téntao de novo."
         upload: "Sentímolo pero produciuse un erro enviando a publicación. Téntao de novo."
         too_many_uploads: "Sentímolo pero só podes enviar un ficheiro de cada vez."
+        upload_not_authorized: "Sentímolo, o ficheiro que tentas subir non está autorizado (extensións permitidas: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Sentímolo pero os novos usuarios non poden subir imaxes."
         attachment_upload_not_allowed_for_new_user: "Sentímolo pero os novos usuarios non poden subir anexos."
         attachment_download_requires_login: "Sentímolo pero debes iniciar sesión para descargar anexos."
@@ -2127,6 +2131,7 @@ gl:
         options:
           normal: "Normal"
           ignore: "Ignorar"
+          low: "Baixa"
           high: "Alta"
       sort_options:
         likes: "Gústames"
@@ -2475,6 +2480,8 @@ gl:
         backups: "Copias de seguranza"
         traffic_short: "Tráfico"
         traffic: "Peticións web de aplicativos"
+        page_views: "Visualizacións de páxinas"
+        page_views_short: "Visualizacións de páxinas"
         show_traffic_report: "Amosar o informe detallado do tráfico"
         moderators_activity: Actividade dos moderadores
         whats_new_in_discourse: Novidades en Discourse
@@ -2714,6 +2721,7 @@ gl:
           upload: "Enviar"
           install: "Instalar"
           installed: "Instalado"
+          install_popular: "Destacados"
           about_theme: "Sobre"
           enable: "Activar"
           disable: "Desactivar"
@@ -2983,6 +2991,7 @@ gl:
           title: "Buscar rexistros"
           term: "Termo"
           searches: "Buscas"
+          click_through_rate: "CTR"
           types:
             all_search_types: "todos os tipos de busca"
             header: "Cabeceira"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index e74b52386f..3c243ca61d 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -4714,8 +4714,9 @@ he:
         category_id: "מזהה לקטגוריה"
         category_title: "קטגוריה"
         tag_name: "שם תגית"
-        external_url: "כתובת חיצונית"
+        external_url: "כתובת חיצונית או יחסית"
         destination: "יעד"
+        copy_to_clipboard: "העתקת קישור קבוע ללוח"
         delete_confirm: " להסיר את הקישור הקבוע?"
         form:
           label: "חדש:"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 636dbb4ba8..5f97971659 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -4449,8 +4449,9 @@ nl:
         category_id: "Categorie-ID"
         category_title: "Categorie"
         tag_name: "Tagnaam"
-        external_url: "Externe URL"
+        external_url: "Externe of relatieve URL"
         destination: "Bestemming"
+        copy_to_clipboard: "Permalink naar klembord kopiëren"
         delete_confirm: "Weet u zeker dat u deze permalink wilt verwijderen?"
         form:
           label: "Nieuw:"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 0ef7bb2755..58798e1c21 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -4714,8 +4714,9 @@ ru:
         category_id: "Номер раздела"
         category_title: "Раздел"
         tag_name: "Имя тега"
-        external_url: "Внешняя ссылка"
+        external_url: "Внешняя или относительная ссылка"
         destination: "Назначения"
+        copy_to_clipboard: "Скопировать ссылку в буфер обмена"
         delete_confirm: "Удалить эту постоянную ссылку?"
         form:
           label: "Новая постоянная ссылка:"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index f4ecba9ff4..96b822cbe9 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -4452,8 +4452,9 @@ sv:
         category_id: "Kategori-ID"
         category_title: "Kategori"
         tag_name: "Namn på tagg"
-        external_url: "Extern URL"
+        external_url: "Extern eller relativ URL"
         destination: "Mål"
+        copy_to_clipboard: "Kopiera permalänk till urklipp"
         delete_confirm: "Är du säker på att du vill ta bort den här permalänken?"
         form:
           label: "Ny:"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index aee40327eb..25c540ad3a 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -118,7 +118,7 @@ th:
         disabled: "เปิดเมื่อ %{when}"
       archived:
         enabled: "ถูกเก็บเข้าคลังเมื่อ %{when}"
-        disabled: "ถูกเอกออกจากคลังเมื่อ %{when}"
+        disabled: "ถูกเอาออกจากคลังเมื่อ %{when}"
       pinned:
         enabled: "ถูกปักหมุดเมื่อ %{when}"
         disabled: "ถูกปลดหมุดเมื่อ %{when}"
@@ -304,6 +304,7 @@ th:
       order_by: "สั่งโดย"
       in_reply_to: "ตอบไปยัง"
       explain:
+        total: "ทั้งหมด"
         trust_level_bonus:
           name: "ระดับความไว้ใจ"
       awaiting_approval: "กำลังรอการยืนยัน"
@@ -316,6 +317,7 @@ th:
       grouped_by_topic: "จัดกลุ่มโดยหมวดหมู่"
       topic_has_pending:
         other: "กระทู้นี้มี<b>%{count}</b>โพสต์ที่กำลังรอการอนุมัติ"
+      title: "รีวิว"
       topic: "กระทู้:"
       filtered_user: "ผู้ใช้"
       show_all_topics: "แสดงกระทู้ทั้งหมด"
@@ -358,6 +360,7 @@ th:
         category: "หมวดหมู่"
         orders:
           score: "คะแนน"
+          created_at: "ถูกสร้างเมื่อ"
         priority:
           medium: "ปานกลาง"
           high: "สูง"
@@ -434,11 +437,13 @@ th:
         change_group_setting: "แก้ไขการตั้งค่ากลุ่ม"
         add_user_to_group: "เพิ่มผู้ใช้"
         remove_user_from_group: "ลบผู้ใช้"
+        make_user_group_owner: "ตั้งเป็นเจ้าของ"
     groups:
       member_added: "เพิ่ม"
       member_requested: "ร้องขอเมื่อ"
       add_members:
         title: "เพิ่มสมาชิก"
+        description: "จัดการความเป็นสมาชิกของกลุ่มนี้"
         usernames: "ชื่อผู้ใช้"
       requests:
         title: "คำร้องขอ"
@@ -637,6 +642,7 @@ th:
           read: "อ่าน"
           unread: "ยังไม่อ่าน"
         ignore_duration_username: "ชื่อผู้ใช้"
+        ignore_duration_when: "ช่วงเวลา:"
         ignore_duration_save: "ไม่สนใจ"
         add_ignored_user: "เพิ่ม..."
         mute_option: "ปิด"
@@ -735,7 +741,7 @@ th:
         groups: "กลุ่มของฉัน"
         bulk_select: "เลือกข้อความ"
         move_to_inbox: "ย้ายไปกล่องขาเข้า"
-        move_to_archive: "เก็บ"
+        move_to_archive: "เก็บเข้าคลัง"
         failed_to_move: "เกิดความผิดพลาดในการย้ายข้อความที่เลือก (เครือข่ายของคุณอาจล่ม)"
         select_all: "เลือกทั้งหมด"
         tags: "แท็ก"
@@ -1017,7 +1023,7 @@ th:
         top_links: "ลิงก์ยอดนิยม"
         no_links: "ยังไม่มีลิงก์"
         most_liked_by: "ถูกใจมากที่สุดโดย"
-        most_liked_users: "ถูกใจมากที่สุด"
+        most_liked_users: "ไลค์มากที่สุด"
         most_replied_to_users: "ถูกตอบมากที่สุด"
         no_likes: "ยังไม่มีใครถูกใจ"
         top_categories: "หมวดหมู่ยอดนิยม"
@@ -1209,6 +1215,9 @@ th:
       apple_international: "แอปเปิล/นานาชาติ"
       google: "กูเกิล"
       twitter: "ทวิตเตอร์"
+      win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "หมวดหมู่เท่านั้น"
       categories_and_latest_topics: "หมวดหมู่และกระทู้ล่าสุด"
@@ -1251,6 +1260,9 @@ th:
     shared_drafts:
       title: "แบบร่างที่ถูกแบ่งปัน"
       notice: "กระทู้นี้แสดงให้ผู้ที่สามารถเห็นหมวดหมู่ <b>%{category}</b> เท่านั้น"
+      publish: "เผยแพร่แบบร่างที่ถูกแบ่งปัน"
+      confirm_publish: "คุณแน่ใจหรือว่าต้องการเผยแพร่แบบร่างนี้"
+      publishing: "กำลังเผยแพร่กระทู้..."
     composer:
       emoji: "อีโมจิ :)"
       more_emoji: "อื่นๆ..."
@@ -1300,8 +1312,8 @@ th:
       bold_title: "หนา"
       bold_text: "ตัวอักษรหนา"
       italic_label: "เอียง"
-      italic_title: "ความสำคัญ"
-      italic_text: "ข้อความสำคัญ"
+      italic_title: "เอียง"
+      italic_text: "ตัวอักษรเอียง"
       link_title: "ลิงค์"
       link_description: "กรอกรายละเอียดลิงก์ที่นี่"
       link_dialog_title: "เพิ่มลิงค์"
@@ -1311,6 +1323,7 @@ th:
       quote_text: "ส่วนอ้างถึง"
       code_title: "ข้อความก่อนจัดรูปแบบ"
       code_text: "ข้อความก่อนจัดรูปแบบเยื้อง 4 เคาะ"
+      paste_code_text: "พิมพ์หรือวางโค้ดที่นี่"
       upload_title: "อัปโหลด"
       upload_description: "กรอกรายละเอียดการอัปโหลดที่นี่"
       olist_title: "รายการลำดับ"
@@ -1403,6 +1416,7 @@ th:
         group_message_summary: "ข้อความกลุ่มใหม่"
         watching_first_post: "กระทู้ใหม่"
         liked_consolidated: "ไลค์ใหม่"
+        post_approved: "โพสต์ได้รับอนุมัติ"
     upload_selector:
       title: "เพิ่มรูปภาพ"
       title_with_attachments: "เพิ่มรูปภาพหรือไฟล์"
@@ -1473,6 +1487,7 @@ th:
           open: เปิด
           closed: ปิด
           public: เป็นสาธารณะ
+          archived: ถูกเก็บเข้าคลัง
           noreplies: ไม่มีการตอบกลับ
         post:
           time:
@@ -1537,7 +1552,7 @@ th:
       open_draft: "เปิดแบบร่าง"
       private_message: "เริ่มข้อความ"
       archive_message:
-        help: "ย้ายข้อความไปกล่องเก็บข้อความ"
+        help: "ย้ายข้อความไปคลังของคุณ"
         title: "คลัง"
       move_to_inbox:
         title: "ย้ายไปกล่องขาเข้า"
@@ -1545,6 +1560,8 @@ th:
       edit_message:
         help: "แก้ไขโพสต์แรกของข้อความ"
         title: "แก้ไข"
+      defer:
+        help: "ทำเครื่องหมายว่ายังไม่ได้อ่าน"
       remove_from_profile:
         title: "ลบออกจากโปรไฟล์"
       list: "กระทู้"
@@ -1590,6 +1607,7 @@ th:
       topic_status_update:
         num_of_hours: "จำนวนชั่วโมง:"
         num_of_days: "จำนวนวัน:"
+        publish_to: "เผยแพร่ไปยัง:"
         when: "เมื่อ:"
       auto_update_input:
         now: "ตอนนี้"
@@ -1638,7 +1656,7 @@ th:
         back_description: "กลับไปยังโพสต์ล่าสุดที่ยังไม่ได้อ่าน"
         replies_short: "%{current} / %{total}"
       progress:
-        go_top: "บน"
+        go_top: "ด้านบน"
         go_bottom: "ปุ่ม"
         go: "ไป"
         jump_bottom: "ข้ามไปยังโพสต์ล่าสุด"
@@ -1745,7 +1763,7 @@ th:
         unpin_globally_until: "ลบกระทู้นี้ออกจากด้านบนสุดของรายการกระทู้ทั้งหมดหรือรอจนกระทั่ง <strong>%{until}</strong>"
       inviting: "กำลังเชิญ..."
       invite_private:
-        title: "ข้อความที่ใช้เชิญ"
+        title: "เชิญไปยังข้อความ"
         email_or_username: "อีเมลหรือชื่อผู้ใช้ที่ถูกเชิญ"
         email_or_username_placeholder: "อีเมลหรือชื่อผู้ใช้"
         action: "เชิญ"
@@ -1816,7 +1834,7 @@ th:
       change_owner:
         title: "เปลี่ยนเจ้าของ"
         action: "เปลี่ยนความเป็นเจ้าของ"
-        error: "มีความผิดพลาดขณะเปลี่ยนความเป็นเจ้าของโพส"
+        error: "มีข้อผิดพลาดขณะกำลังเปลี่ยนความเป็นเจ้าของโพสต์"
         placeholder: "ชื่อผู้ใช้ของเจ้าของใหม่"
         instructions:
           other: "กรุณาเลือกเจ้าของใหม่สำหรับ %{count}โพสต์ โดย<b>@%{old_user}</b>"
@@ -1868,6 +1886,7 @@ th:
       unread: "โพสต์นี้ยังไม่ถูกอ่าน"
       has_replies:
         other: "%{count} ตอบ"
+      unknown_user: "(ผู้ใช้ที่ลูกลบ/ไม่รู้จัก)"
       has_likes_title:
         other: "%{count} คนถูกใจโพสต์นี้"
       has_likes_title_only_you: "คุณถูกใจโพสต์นี้"
@@ -2220,7 +2239,7 @@ th:
         new: "%{shortcut} ใหม่"
         unread: "%{shortcut} ยังไม่อ่าน"
         categories: "%{shortcut} หมวดหมู่"
-        top: "%{shortcut} บน"
+        top: "%{shortcut} ด้านบน"
         bookmarks: "%{shortcut} บุ๊กมาร์ก"
         profile: "%{shortcut} โปรไฟล์"
         messages: "%{shortcut} ข้อความ"
@@ -2275,10 +2294,17 @@ th:
         mark_tracking: "%{shortcut} ติดตามกระทู้"
         mark_watching: "%{shortcut} ดูกระทู้"
         print: "%{shortcut}พิมพ์กระทู้"
+      search_menu:
+        title: "เมนูค้นหา"
     badges:
       granted_on: "ได้รับเมื่อ %{date}"
+      title: เหรียญ
+      allow_title: "คุณสามารถใช้เหรียญนี้เป็นชื่อเรื่อง"
+      badge_count:
+        other: "%{count}เหรียญ"
       more_badges:
         other: "อีก+%{count}"
+      select_badge_for_title: เลือกเหรียญเพื่อใช้เป็นชื่อเรื่อง
       none: "(ไม่มี)"
       badge_grouping:
         getting_started:
@@ -2482,7 +2508,7 @@ th:
       api:
         user: "ผู้ใช้"
         title: "API"
-        created: สร้าง
+        created: สร้างแล้ว
         updated: อัปเดตแล้ว
         last_used: ใช้ครั้งล่าสุด
         never_used: (ไม่เคย)
@@ -2501,6 +2527,8 @@ th:
         description: "รายละเอียด"
         wildcard_event: "ส่งทุกอย่างหาฉัน"
         active: "ใช้งานอยู่"
+        user_badge_event:
+          details: "เมื่อผู้ใช้ได้รับเหรียญ"
         delivery_status:
           title: "สถานะการส่ง"
           inactive: "ไม่ใช้งาน"
@@ -2619,18 +2647,35 @@ th:
             name: "หลัก"
         email_style:
           css: "CSS"
+          save_error_with_reason: "การเปลี่ยนแปลงไม่ได้ถูกบันทึก %{error}"
       email:
         title: "อีเมล"
         settings: "การตั้งค่า"
+        templates: "รูปแบบ"
+        advanced_test:
+          email: "ข้อความต้นฉบับ"
+        error: "<b>ผิดพลาด</b> - %{server_error}"
         sent: "ส่ง"
+        skipped: "ข้าม"
         received: "รับ"
-        rejected: "ปฏิเสธ"
+        rejected: "ถูกปฏิเสธ"
+        sent_at: "ถูกส่งเมื่อ"
         time: "เวลา"
         user: "ผู้ใช้"
+        email_type: "ประเภทอีเมล"
+        to_address: "ไปยังที่อยู่"
+        sent_test: "ส่งแล้ว!"
         refresh: "รีเฟรช"
+        send_digest_label: "ส่งผลลัพธ์นี้ไปยัง:"
+        send_digest: "ส่ง"
+        sending_email: "กำลังส่งอีเมล"
+        html: "html"
+        text: "ข้อความ"
+        last_seen_user: "ผู้ใช้ที่ดูล่าสุด:"
         incoming_emails:
           from_address: "จาก"
           to_addresses: "ถึง"
+          cc_addresses: "Cc"
           subject: "หัวข้อ"
           error: "ผิดพลาด"
           modal:
@@ -2655,13 +2700,17 @@ th:
         delete: "ลบ"
         edit: "แก้ไข"
         save: "บันทึก"
+        screened_actions:
+          block: "บล็อก"
         staff_actions:
           all: "ทั้งหมด"
           clear_filters: "แสดงทั้งหมด"
           staff_user: "ผู้ใช้"
+          target_user: "ผู้ใช้เป้าหมาย"
           subject: "หัวข้อ"
           when: "เมื่อ"
           details: "รายละเอียด"
+          previous_value: "ก่อนหน้า"
           new_value: "ใหม่"
           show: "แสดง"
           modal_title: "รายละเอียด"
@@ -2669,30 +2718,90 @@ th:
           actions:
             delete_user: "ลบผู้ใช้"
             change_trust_level: "เปลี่ยนระดับความไว้ใจ"
+            change_username: "เปลี่ยนชื่อผู้ใช้"
+            change_theme: "เปลี่ยนธีม"
+            delete_theme: "ลบธีม"
+            suspend_user: "ระงับผู้ใช้"
+            unsuspend_user: "เลิกระงับผู้ใช้"
+            removed_suspend_user: "ระงับผู้ใช้ (ถูกลบ)"
+            removed_unsuspend_user: "เลิกระงับผู้ใช้ (ถูกลบ)"
+            check_email: "ตรวจสอบอีเมล"
             delete_topic: "ลบกระทู้"
             delete_post: "ลบโพสต์"
+            change_category_settings: "เปลี่ยนการตั้งค่าหมวดหมู่"
             delete_category: "ลบหมวดหมู่"
+            create_category: "สร้างหมวดหมู่"
+            deleted_tag: "แท็กที่ถูกลบ"
+            renamed_tag: "แท็กที่ถูกเปลี่ยนชื่อ"
+            activate_user: "เปิดใช้งานผู้ใช้"
+            deactivate_user: "ระงับการเปิดใช้งานผู้ใช้"
+            reviewed_post: "โพสต์ที่ถูกรีวิว"
+            check_personal_message: "ตรวจสอบข้อความส่วนตัว"
+            topic_published: "กระทู้ถูกเผยแพร่"
+            post_approved: "โพสต์ได้รับอนุมัติ"
+            post_rejected: "โพสต์ถูกปฏิเสธ"
+            create_badge: "สร้างเหรียญ"
+            change_badge: "เปลี่ยนเหรียญ"
+            delete_badge: "ลบเหรียญ"
+            change_name: "เปลี่ยนชื่อ"
+            approve_user: "ผู้ใช้ที่ได้รับอนุมัติ"
+            change_theme_setting: "เปลี่ยนการตั้งค่าธีม"
+            change_title: "เปลี่ยนชื่อเรื่อง"
+            page_published: "เพจถูกเผยแพร่"
+            page_unpublished: "เพจไม่ถูกเผยแพร่"
+            add_email: "เพิ่มอีเมล"
+            update_email: "อัปเดตอีเมล"
+            destroy_email: "ทำลายอีเมล"
+        screened_emails:
+          email: "ที่อยู่อีเมล"
+          actions:
+            allow: "อนุญาต"
         screened_urls:
           url: "URL"
+          domain: "โดเมน"
         screened_ips:
+          actions:
+            block: "บล็อก"
+            do_nothing: "อนุญาต"
+            allow_admin: "อนุญาตแอดมิน"
           form:
             label: "ใหม่:"
+            ip_address: "ที่อยู่ไอพี"
             add: "เพิ่ม"
             filter: "ค้นหา"
         search_logs:
+          searches: "ค้นหา"
           types:
+            all_search_types: "การค้นหาทั้งหมด"
             header: "Header"
+            full_page: "ทั้งหน้า"
       watched_words:
+        search: "ค้นหา"
         clear_filter: "ล้าง"
         download: ดาวน์โหลด
         clear_all: ล้างทั้งหมด
+        word_count:
+          other: "%{count}คำ"
         actions:
+          block: "บล็อก"
+          censor: "เซนเซอร์"
+          require_approval: "ต้องได้รับการอนุมัติ"
           flag: "ธง"
         form:
+          label: "คำใหม่:"
           add: "เพิ่ม"
+          success: "สำเร็จ"
+          exists: "มีอยู่แล้ว"
+          upload: "เพิ่มจากไฟล์"
+          upload_successful: "อัปโหลดสำเร็จแล้ว เพิ่มคำเรียบร้อย"
+      impersonate:
+        not_found: "ไม่พบผู้ใช้นั้น"
       users:
         title: "ผู้ใช้"
         last_emailed: "อีเมลล่าสุด"
+        active: "เปิดใช้งานแล้ว"
+        show_emails: "แสดงอีเมล"
+        hide_emails: "ซ่อนอีเมล"
         nav:
           new: "ใหม่"
           active: "ใช้งานอยู่"
@@ -2709,7 +2818,7 @@ th:
           regular: "ผู้ใช้ที่ระดับความไว้ใจ 3 (ทั่วไป)"
           leader: "ผู้ใช้ที่ระดับความไว้ใจ 4 (ผู้นำ)"
           staff: "ทีมงาน"
-          moderators: "ผู้ดูแล"
+          moderators: "ผู้ดูแลระบบ"
           suspended: "ผู้ใช้งานที่ถูกระงับ"
         not_verified: "ยังไม่ได้รับการตรวจสอบ"
         check_email:
@@ -2720,11 +2829,23 @@ th:
         unsuspend_failed: "มีข้อผิดพลาดในเปิดผู้ใช้งานนี้ %{error}"
         suspend_duration: "ผู้ใช้งานนี้จะถูกระงับถึงเมื่อไร"
         suspend_reason: "เหตุผล"
+        suspend_message: "ข้อความอีเมล"
         suspended_by: "ระงับการใช้งานโดย"
         silence_reason: "เหตุผล"
+        silence_message: "ข้อความอีเมล"
+        suspended_until: "(จนกระทั่ง%{until})"
+        cant_suspend: "ไม่สามารถระงับผู้ใช้งานนี้ได้"
         delete_all_posts: "ลบโพสต์ทั้งหมด"
+        delete_posts_progress: "กำลังลบโพสต์"
+        delete_posts_failed: "มีปัญหาขณะกำลังลบโพสต์"
+        penalty_post_delete: "ลบโพสต์"
+        penalty_post_delete_replies: "ลบโพสต์ + คำตอบ"
+        penalty_post_edit: "แก้ไขโพสต์"
+        moderator: "ผู้ดูแลระบบใช่ไหม"
+        admin: "แอดมินใช่ไหม"
         suspended: "ระงับการใช้งานหรือไม่"
         show_admin_profile: "แอดมิน"
+        show_public_profile: "แสดงโปรไฟล์สาธารณะ"
         ip_lookup: "ค้นหา IP"
         log_out: "ออกจากระบบ"
         unsuspend: "เปิดการใช้งาน"
@@ -2742,14 +2863,25 @@ th:
         delete: "ลบผู้ใช้"
         merge:
           prompt:
+            title: "ย้ายและลบ @%{username}"
+            target_username_placeholder: "ชื่อผู้ใช้ของเจ้าของใหม่"
+            transfer_and_delete: "ถ่ายโอนและลบ @%{username}"
             cancel: "ยกเลิก"
           confirmation:
+            title: "ถ่ายโอนและลบ @%{username}"
+            text: "ถ่ายโอน @%{username} ไปยัง @%{targetUsername}"
+            transfer_and_delete: "ถ่ายโอนและลบ @%{username}"
             cancel: "ยกเลิก"
         delete_forbidden_because_staff: "ไม่สามารถลบแอดมินและผู้ดูแลระบบได้"
         delete_posts_forbidden_because_staff: "ไม่สามารถลบโพสต์ทั้งหมดของแอดมินและผู้ดูแลระบบได้"
         delete_and_block: "ลบและ <b>บล็อก</b> อีเมลและไอพีนี้"
         delete_dont_block: "ลบเท่านั้น"
+        deleting_user: "กำลังลบผู้ใช้..."
         deleted: "ผู้ใช้ถูกลบแล้ว"
+        delete_failed: "มีข้อผิดพลาดขณะกำลังลบผู้ใช้นั้น กรุณาตรวจสอบอีกครั้งว่าโพสต์ทั้งหมดถูกลบก่อนลบผู้ใช้นั้น"
+        send_activation_email: "ส่งอีเมลยืนยันตัวตน"
+        activation_email_sent: "อีเมลยืนยันตัวตนถูกส่งแล้ว"
+        send_activation_email_failed: "เกิดปัญหาขณะกำลังส่งอีเมลยืนยันตัวตนอีกฉบับ %{error}"
         trust_level_change_failed: "มีความผิดพลาดขณะกำลังเปลี่ยนระดับความไว้ใจของผู้ใช้"
         trust_level_2_users: "ระดับความไว้ใจ 2 ผู้ใช้"
         trust_level_3_requirements: "ระดับความไว้ใจ 3 ความต้องการ"
@@ -2759,14 +2891,19 @@ th:
         unlock_trust_level: "ปลดล็อกระดับความไว้ใจ"
         tl3_requirements:
           title: "ความต้องการเพิ่มปรับระดับความไว้ใจเป็น 3"
+          table_title:
+            other: "ในช่วง %{count}วันที่ผ่านมา:"
           value_heading: "ค่า"
           requirement_heading: "ความต้องการ"
           visits: "เยี่ยมชม"
           days: "วัน"
           topics_viewed: "กระทู้ที่ดู"
           posts_read: "โพสต์ที่อ่าน"
+          flagged_posts: "โพสต์ที่ถูกปักธง"
+          flagged_by_users: "ผู้ใช้ที่ปักธง"
           likes_given: "ได้ชอบ"
           likes_received: "ได้รับการชอบ"
+          suspended: "ถูกระงับการใช้งาน (6 เดือนที่ผ่านมา)"
           qualifies: "คุณสมบัติเพียงพอสำหรับระดับความไว้ใจที่ 3"
           does_not_qualify: "คุณสมบัติไม่เพียงพอสำหรับระดับความไว้ใจที่ 3"
           locked_will_not_be_promoted: "ระดับความไว้ใจถูกล็อก จะไม่ถูกปรับระดับความไว้ใจขึ้น"
@@ -2829,9 +2966,11 @@ th:
         clear_filter: "ล้าง"
         add_url: "เพิ่ม URL"
         add_host: "เพิ่มโฮส"
+        add_group: "เพิ่มกลุ่ม"
         uploaded_image_list:
           upload:
             label: "อัปโหลด"
+            title: "อัปโหลดรูปภาพ"
         categories:
           all_results: "ทั้งหมด"
           required: "ต้องการ"
@@ -2861,23 +3000,35 @@ th:
         default_categories:
           modal_yes: "ใช่"
       badges:
+        title: เหรียญ
+        new_badge: เหรียญใหม่
         new: ใหม่
         name: ชื่อ
+        badge: เหรียญ
         display_name: ชื่อที่ใช้แสดง
         description: รายละเอียด
         long_description: รายละเอียดแบบยาว
+        badge_type: ประเภทเหรียญ
         badge_grouping: กลุ่ม
+        badge_groupings:
+          modal_title: การจัดกลุ่มเหรียญ
         granted_by: อนุญาตโดย
         granted_at: อนุญาตเมื่อ
         reason_help: (ลิงก์ไปยังหัวข้อหรือโพส)
         save: บันทึก
         delete: ลบ
+        delete_confirm: คุณแน่ใจหรือว่าต้องการลบเหรียญนี้
         revoke: เอาออก
         reason: เหตุผล
-        icon: ไอค่อน
+        edit_badges: แก้ไขเหรียญ
+        icon: ไอคอน
         image: ภาพ
         trigger_type:
+          none: "อัปเดตรายวัน"
+          post_revision: "เมื่อผู้ใช้แก้ไขหรือสร้างโพสต์"
           trust_level_change: "เมื่อผู้ใช้เปลี่ยนระดับความไว้ใจ"
+          user_change: "เมื่อผู้ใช้ถูกแก้ไขหรือถูกสร้าง"
+          post_processed: "หลังจากโพสต์ถูกดำเนินการ"
         preview:
           bad_count_warning:
             header: "ระวัง!"
@@ -2887,6 +3038,11 @@ th:
             with_post: "<span class=\"username\">%{username}</span> สำหรับโพสต์ใน %{link}"
             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:
+          emoji: "อีโมจินักเรียนหญิง"
+          what_are_badges_title: "เหรียญคืออะไร"
+        mass_award:
+          replace_owners: ลบเหรียญจากผู้ใช้ก่อนหน้านี้
       emoji:
         title: "อีโมจิ"
         add: "เพิ่มอีโมจิใหม่"
@@ -2926,15 +3082,21 @@ th:
   wizard_js:
     wizard:
       done: "เสร็จ"
+      finish: "เสร็จสิ้น"
       back: "กลับ"
+      next: "ต่อไป"
       upload: "อัปโหลด"
       uploading: "กำลังอัปโหลด..."
       upload_error: "ขออภัย เกิดความผิดพลาดขณะกำลังอัปโหลดไฟล์ กรุณาลองใหม่อีกครั้ง"
+      staff_count:
+        other: "ชุมชนของคุณมีทีมงาน %{count}คน รวมถึงคุณด้วย"
       invites:
         add_user: "เพิ่ม"
+        none_added: "คุณยังไม่ได้เชิญทีมงาน คุณแน่ใจหรือว่าต้องการดำเนินการต่อ"
         roles:
           admin: "แอดมิน"
           moderator: "ผู้ดูแล"
+          regular: "ผู้ใช้ทั่วไป"
       previews:
         share_button: "แบ่งปัน"
         reply_button: "ตอบ"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 62ab7ceeec..3721637772 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -730,6 +730,7 @@ zh_CN:
           all: "全部"
           read: "阅读"
           unread: "未读"
+        ignore_duration_title: "忽略的用户"
         ignore_duration_username: "用户名"
         ignore_duration_when: "持续时间："
         ignore_duration_save: "忽略"
@@ -1961,6 +1962,7 @@ zh_CN:
         time_frame_required: 请选择一个时间范围
       auto_update_input:
         none: "选择时间范围"
+        now: "当前"
         later_today: "今天的某个时候"
         tomorrow: "明天"
         later_this_week: "这周的某个时候"
@@ -2215,11 +2217,13 @@ zh_CN:
         description: "当一个主题被出版为一个页面时，其链接是共享的，并且会以自定义的样式显示。"
         slug: "Slug"
         public: "公开"
+        public_description: "尽管关联的主题是私有主题，但还是能被其他用户查看。"
         publish_url: "你的页面已出版于："
         topic_published: "你的主题已出版于："
         preview_url: "你的页面将出版于："
         invalid_slug: "抱歉，您不能出版此页面。"
         unpublish: "取消出版"
+        update: "更新"
         unpublished: "你的页面已经取消出版并且不再可用。"
         publishing_settings: "出版设置"
       change_owner:
@@ -2286,6 +2290,7 @@ zh_CN:
       unread: "未读帖子"
       has_replies:
         other: "%{count} 回复"
+      unknown_user: "（未知或已删除的用户）"
       has_likes_title:
         other: "%{count} 人赞了该贴"
       has_likes_title_only_you: "你喜欢了这个帖子"
@@ -2408,6 +2413,7 @@ zh_CN:
           last: "最新版"
           hide: "隐藏版本历史"
           show: "显示版本历史"
+          revert: "还原到版本%{revision}"
           edit_wiki: "编辑维基"
           edit_post: "编辑帖子"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
@@ -4315,8 +4321,9 @@ zh_CN:
         category_id: "分类 ID"
         category_title: "分类"
         tag_name: "标签名称"
-        external_url: "外部 URL"
+        external_url: "外部或相关 URL"
         destination: "目标"
+        copy_to_clipboard: "拷贝永久链接到剪贴板"
         delete_confirm: 你确定要删除该永久链接？
         form:
           label: "新："
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index eb7eca62d8..138011d42e 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -1175,12 +1175,12 @@ fr:
         topic: "Sujet"
       description: "Sujets qui ont reçu le plus de visites depuis des sources externes."
     page_view_anon_reqs:
-      title: "Anonyme"
+      title: "Anonymes"
       xaxis: "Jour"
       yaxis: "Nombre de vues par les utilisateurs non connectés"
       description: "Nombre de nouvelles vues de pages par des visiteurs sans compte."
     page_view_logged_in_reqs:
-      title: "Connecté"
+      title: "Connectés"
       xaxis: "Jour"
       yaxis: "Nombre de vues par les utilisateurs connectés"
       description: "Nombre de nouvelles vues d'utilisateurs connectés."
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index 7443c62477..cd31d01809 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -15,6 +15,8 @@ gl:
       short: "%d-%m-%Y"
       short_no_year: "%-d de %B"
       date_only: "%-d de %B, %Y"
+      long: "%-d %B %Y %H:%M"
+      no_day: "%B %Y"
   date:
     month_names: [~, Xaneiro, Febreiro, Marzo, Abril, Maio, Xuño, Xullo, Agosto, Setembro, Outubro, Novembro, Decembro]
     <<: *datetime_formats
@@ -54,10 +56,16 @@ gl:
       component_no_user_selectable: "Os compoñentes do tema non poden ser seleccionados polo usuario"
       component_no_default: "Os compoñentes do tema non poden ser o tema predefinido"
       component_no_color_scheme: "Os compoñenetes do tema non poden ter paletas de cores"
+      no_multilevels_components: "Os temas con temas secundarios non poden ser temas secundarios en si mesmos."
+      optimized_link: As ligazóns de imaxe optimizadas son efémeras e non debería ser incluídas no código fonte do tema.
     settings_errors:
       invalid_yaml: "O YAML proporcionado non é válido."
+      data_type_not_a_number: "Tipo de axuste `%{name}` non compatible. Os tipos compatibles son `integer`, `bool`, `list`, `enum` e `upload`"
       name_too_long: "Hai un axuste cun nome demasiado longo; a lonxitude máxima é de 255 caracteres"
       default_value_missing: "O axuste '%{name}' non ten un valor predefinido"
+      default_not_match_type: "O tipo de valor predefinido para o axuste `%{name}` non coincide co tipo de axuste."
+      default_out_range: "O valor por defecto do axuste `%{name}` non está no rango especificado."
+      enum_value_not_valid: "O valor seleccionado non é unha das opcións enumeradas."
       number_value_not_valid: "O novo valor no nestá dentro do rango permitido."
       number_value_not_valid_min_max: "Debe ser entre %{min} e %{max}."
       number_value_not_valid_min: "Debe ser maior ou igual que %{min}."
@@ -67,6 +75,7 @@ gl:
       string_value_not_valid_min: "Debe ter ao menos %{min} caracteres."
       string_value_not_valid_max: "Debe ter un máximo de %{max} caracteres."
     locale_errors:
+      top_level_locale: "A chave de nivel superior nun ficheiro local debe coincidir co nome local"
       invalid_yaml: "YAML de tradución non válido"
   emails:
     incoming:
@@ -76,12 +85,24 @@ gl:
       no_subject: "(sen asunto)"
       no_body: "(sen mensaxe)"
       missing_attachment: "(falta o ficheiro anexo %{filename})"
+      errors:
+        empty_email_error: "Sucede cando o texto en bruto do correo que recibimos está en branco."
+        no_message_id_error: "Sucede cando o correo electrónico non ten a cabeceira de 'Id da mensaxe'. "
+        inactive_user_error: "Sucede cando o remitente non está activo."
+        silenced_user_error: "Sucede cando o destinatario foi silenciado."
+        bad_destination_address: "Sucede cando ningún dos enderezos electrónicos nos campos Para/Cc coincide cun correo electrónico configurado como enderezo de correo entrante."
+        strangers_not_allowed_error: "Sucede cando un usuario tenta crear un novo tema nunha categoría da que non é membro."
+        insufficient_trust_level_error: "Sucede cando un usuario tenta crear un novo tema nunha categoría para a que non ten o nivel de confianza que se require."
+        reply_user_not_matching_error: "Sucede cando unha resposta vén desde un enderezo electrónico diferente ao que se lle enviou a notificación."
+        topic_not_found_error: "Sucede cando entra unha resposta pero o tema relacionado foi eliminado."
+        topic_closed_error: "Sucede cando entra unha resposta pero o tema relacionado foi pechado."
       unrecognized_error: "Erro non recoñecido"
   errors: &errors
     format: "%{attribute} %{message}"
     format_with_full_message: "<b>%{attribute}</b>: %{message}"
     messages:
       too_long_validation: "Límite de %{max} caracteres; inseriches %{length}."
+      invalid_boolean: "Booleano non válido"
       taken: "xa está en uso"
       accepted: debe ser aceptado
       blank: non pode quedar baleiro
@@ -89,6 +110,7 @@ gl:
       confirmation: "%{attribute} non coincide"
       empty: non pode quedar baleiro
       equal_to: "debe ser igual a %{count}"
+      even: debe ser par
       exclusion: está reservado
       greater_than: "debe ser maior de %{count}"
       greater_than_or_equal_to: "debe ser igual ou maior de %{count}"
@@ -130,6 +152,9 @@ gl:
       load_from_remote: "Produciuse un erro cargando esta publicación."
     site_settings:
       invalid_category_id: "Especificaches unha categoría que non existe"
+      invalid_choice:
+        one: "Especificaches a opción non válida %{name}"
+        other: "Especificaches opcións non válidas %{name}"
       default_categories_already_selected: "Non podes seleccionar unha categoría utilizada noutra listaxe."
       default_tags_already_selected: "Non podes seleccionar unha etiqueta utilizada noutra listaxe."
       s3_upload_bucket_is_required: "Non se poden activar as cargas a S3 a menos que proporciones un valor 's3_upload_bucket'."
@@ -254,6 +279,9 @@ gl:
   not_accepting_pms: "Sentímolo, %{username} non acepta mensaxes neste momento."
   max_pm_recipients: "Sentímolo, podes enviar mensaxes a un máximo de %{recipients_limit} destinatarios."
   pm_reached_recipients_limit: "Sentímolo, non podes ter máis de %{recipients_limit} destinatarios nunha mensaxe."
+  removed_direct_reply_full_quotes: "Cita de toda a publicación anterior eliminada automaticamente"
+  secure_upload_not_allowed_in_public_topic: "Sentímolo, a(s) seguinte(s) carga(s) non pode(n) ser utilizada(s) nun tema público: %{upload_filenames}."
+  create_pm_on_existing_topic: "Sentímolo, non podes crear unha mensaxe privada nun tema existente."
   just_posted_that: "é moi semellante ao que xa publicaches recentemente."
   invalid_characters: "contén caracteres incorrectos"
   is_invalid: "parece pouco claro, é unha oración completa?"
@@ -353,7 +381,7 @@ gl:
 
       - Inclúe palabras de uso frecuente no teu tema para facilitar que poida ser atopado. Para agrupalo con outros temas relacionados, selecciona unha categoría.
 
-      Para máis información, [visita as nosas guías para a comunidade](%{base_path}/guidelines). Este panel só aparecerá nas túas %{education_posts_text} primeiras publicacións.
+      Para máis información, [visita as nosas instrucións para a comunidade](%{base_path}/guidelines). Este panel só aparecerá nas túas %{education_posts_text} primeiras publicacións.
     "new-reply": |
       Benvido/a a %{site_name} &mdash; **grazas pola túa contribución!**
 
@@ -363,7 +391,7 @@ gl:
 
       - A crítica construtiva é benvida, mais lembra criticar as ideas non as persoas.
 
-      Para máis información, [visita as nosas guías para a comunidade](%{base_path}/guidelines). Este panel só aparecerá nas túas %{education_posts_text} primeiras publicacións.
+      Para máis información, [visita as nosas instrucións para a comunidade](%{base_path}/guidelines). Este panel só aparecerá nas túas %{education_posts_text} primeiras publicacións.
     avatar: |
       ### Que tal se lle engades unha imaxe á túa conta?
 
@@ -386,51 +414,150 @@ gl:
       Parece claro que este tema che importa &ndash; publicaches máis do %{percent}% das respostas.
 
       Aínda podería ser mellor se lles deses espazo a outras persoas para compartiren o seu punto de vista. Que tal se as convidas?
+    get_a_room: |
+      ### Anima a máis xente a participar na conversa
+
+      Neste tema en concreto respondícheslle %{count} veces a @%{reply_username}!
+
+      Unha discusión é boa cando involucra moitas voces e perspectivas. Que tal se involucras a alguén máis?
+
+      E non esquezas que se queres continuar a conversa con este usuario en particular e en privado, [podes enviarlle unha mensaxe privada](%{base_path}/u/%{reply_username}).
+    too_many_replies: |
+      ### Alcanzaches o límite de respostas para este tema.
+
+      Sentímolo, mais os novos usuarios teñen temporalmente un límite de %{newuser_max_replies_per_topic} respostas no mesmo tema.
+
+      No canto de engadir unha outra resposta, pensa na posibilidade de editar algunhas das anteriores ou visitar outros temas.
+    reviving_old_topic: |
+      ### Queres revivir este tema?
+
+      A última resposta que ten é de hai **%{time_ago}**. A túa resposta fará que se sitúe na parte superior da listaxe e suporá que os usuarios involucrados na conversa reciban unha notificación.
+
+      Tes a certeza de querer continuar con esta antiga conversa?
   activerecord:
     attributes:
       category:
         name: "Nome da categoría"
       topic:
         title: "Título"
+        featured_link: "Ligazón destacada"
         category_id: "Categoría"
       post:
-        raw: "Corpo"
+        raw: "Mensaxe"
       user_profile:
-        bio_raw: "Verbo de min"
+        bio_raw: "Acerca de min"
     errors:
       <<: *errors
       models:
         topic:
           attributes:
             base:
-              no_user_selected: "Debes seleccionar un usuario correcto."
+              warning_requires_pm: "Só podes enviar advertencias en mensaxes privadas."
+              too_many_users: "Só podes enviar advertencias a un usuario de cada vez."
+              cant_send_pm: "Sentímolo, non podes enviarlle unha mensaxe privada a este usuario."
+              no_user_selected: "Debes seleccionar un usuario válido."
+              reply_by_email_disabled: "A resposta vía correo electrónico está deshabilitada."
+              target_user_not_found: "Non se atopou a un dos usuarios aos que lles envías esta mensaxe."
+              unable_to_update: "Produciuse un erro ao actualizar este tema."
+            featured_link:
+              invalid: "non é válido. Un URL debe incluír http:// or https://."
+              invalid_category: "non se pode editar nesta categoría."
         user:
           attributes:
             password:
-              common: "é un dos 10000 contrasinais máis habituais. Usa un máis seguro."
-              same_as_username: "é igual ao teu nome de usuario. Usa un contrasinal máis seguro."
-              same_as_email: "é igual ao teu correo electrónico. Usa un contrasinal máis seguro."
+              common: "é un dos 10000 contrasinais máis habituais. Utiliza un máis seguro."
+              same_as_username: "é igual ao teu nome de usuario. Utiliza un contrasinal máis seguro."
+              same_as_email: "é igual ao teu correo electrónico. Utiliza un contrasinal máis seguro."
+              same_as_current: "é igual ao teu contrasinal actual."
+              same_as_name: "é igual ao teu nome."
+              unique_characters: "ten demasiados caracteres repetidos. Utiliza un contrasinal máis seguro."
+            username:
+              same_as_password: "é igual ao teu contrasinal."
+            name:
+              same_as_password: "é igual ao teu contrasinal."
             ip_address:
               signup_not_allowed: "Non esta permitido rexistrarse desde esta conta."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Este tema non pode ser destacado no teu perfil."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "Non se permite reasignar un correo electrónico principal a outro usuario."
         color_scheme_color:
           attributes:
             hex:
               invalid: "non é unha cor válida"
-  vip_category_name: "Taberna"
-  vip_category_description: "Unha categoría exclusiva para membros cun nivel de confianza igual ou maior a 3."
+        post_reply:
+          base:
+            different_topic: "Publicación e resposta deben pertencer ao mesmo tema."
+        web_hook:
+          attributes:
+            payload_url:
+              invalid: "O URL non é válido; debería incluír http:// or https://. Non está permitido ningún espazo en branco."
+        custom_emoji:
+          attributes:
+            name:
+              taken: xa está en uso por outro emoji
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "debe ser no futuro."
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys: 'A(s) seguinte(s) chave(s) de interpolación non é/son válida(s): "%{keys}"'
+        watched_word:
+          attributes:
+            word:
+              too_many: "Demasiadas palabras para esa acción"
+  uncategorized_category_name: "Sen categoría"
+  vip_category_description: "Unha categoría exclusiva para membros cun nivel de confianza 3 ou superior."
   meta_category_name: "Opinións sobre o sitio"
   meta_category_description: "Discusións sobre este sitio, a súa organización, como funciona e como se pode mellorar."
   staff_category_name: "Equipo"
-  staff_category_description: "Categoría privada para discusións do equipo. Os temas son visíbeis unicamente para administradores e moderadores."
-  lounge_welcome:
-    title: "Benvido/a á Taberna"
+  staff_category_description: "Categoría privada para discusións do equipo. Os temas son visibles unicamente para administradores e moderadores."
+  discourse_welcome_topic:
+    title: "Benvido/a a Discourse"
+    body: |2
+
+      O primeiro parágrafo deste tema fixado será visible como mensaxe de benvida para todos os novos visitantes na túa páxina de inicio. É, pois, importante!
+
+      **Edita isto** e describe brevemente a túa comunidade:
+
+      - Para quen é?
+      - Que van poder atopar aquí?
+      - Por que deberían vir aquí?
+      - Onde poden ler máis sobre a comunidade (ligazóns, recursos etc)?
+
+      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+
+      Quizais queiras pechar este tema a través do administrador :wrench: (na parte superior dereita ou na parte inferior), co fin de que as respostas non se acumulen no anuncio.
+  admin_quick_start_title: "LER PRIMEIRO: Guía rápida de inicio para administradores"
   category:
     topic_prefix: "Sobre a categoría %{category}"
+    replace_paragraph: "(Substitúe este parágrafo cunha breve descrición da túa nova categoría. Este texto aparecerá na área de selección de categoría, así que procura que non supere os 200 caracteres.)"
+    post_template: "%{replace_paragraph}\n\nUtiliza os seguintes parágrafos para unha descrición máis detallada ou para establecer unha especie de guía ou as regras da categoría:\n\n- Para que debería utilizar esta categoría a xente?\n\n- Exactamente que é o que a distingue doutras categorías xa existentes?\n\n- Que temas se deberían tratar nesta categoría?\n\n- Necesitamos esta categoría? Podería fusionarse con outra categoría ou subcategoría?\n"
     errors:
+      not_found: "Categoría non atopada!"
+      uncategorized_parent: "Sen categoría non pode ter unha categoría principal"
       depth: "Non podes aniñar unha subcategoría dentro doutra"
       invalid_email_in: "'%{email}' non é un enderezo electrónico válido."
       email_already_used_in_group: "'%{email}' xa está en uso polo grupo '%{group_name}'."
       email_already_used_in_category: "'%{email}' xa está en uso pola categoría '%{category_name}'."
+      description_incomplete: "A publicación que contén a descrición da categoría debe ter a ao menos un parágrafo."
+      permission_conflict: "Calquera grupo que teña acceso a unha subcategoría debe ter acceso tamén á categoría principal. Os seguintes grupos teñen acceso a unha das subcategorías, pero non así á principal: %{group_names}."
+      disallowed_topic_tags: "Este tema ten categorías non permitidas nesta categoría: '%{tags}'"
+      disallowed_tags_generic: "Este tema ten etiquetas non permitidas."
+    cannot_delete:
+      uncategorized: "Esta categoría é especial. Enténdese como unha área de espera para aqueles temas que non teñen categoría. Non se pode eliminar."
+      has_subcategories: "Non se pode eliminar esta categoría porque ten subcategorías."
+      topic_exists:
+        one: "Non se pode eliminar esta categoría porque ten %{count} tema. O máis antigo é %{topic_link}."
+        other: "Non se pode eliminar esta categoría porque ten %{count} temas. O máis antigo é %{topic_link}."
+      topic_exists_no_oldest: "Non se pode eliminar esta categoría porque o número de temas é %{count}."
+    uncategorized_description: "Temas que non teñen categoría ou non encaixan en ningunha das xa existentes."
   trust_levels:
     newuser:
       title: "novo usuario"
@@ -439,13 +566,44 @@ gl:
     member:
       title: "membro"
     regular:
-      title: "normal"
+      title: "habitual"
     leader:
       title: "líder"
+    change_failed_explanation: "Trataches de rebaixar a %{user_name} a '%{new_trust_level}'. Porén, o seu nivel de confianza xa é '%{current_trust_level}'. %{user_name} vai permanecer en '%{current_trust_level}' - se queres rebaixarlle o nivel, primeiro bloque o seu nivel de confianza."
+  post:
+    image_placeholder:
+      broken: "Esta imaxe está rota"
+    has_likes:
+      one: "%{count} gústame"
+      other: "%{count} gústames"
   rate_limiter:
+    slow_down: "Executaches esta acción demasiadas veces, téntao máis tarde."
+    too_many_requests: "Executaches esta acción demasiadas veces. Agarda %{time_left} antes de volvelo tentar."
+    by_type:
+      first_day_replies_per_day: "Alcanzaches o número máximo de respostas que un novo usuario pode dar no seu primeiro día. Agarda %{time_left} antes de volvelo tentar."
+      first_day_topics_per_day: "Alcanzaches o número máximo de temas que un usuario novo pode crear no seu primeiro día. Agarda %{time_left} antes de volvelo tentar."
+      create_topic: "Estás a crear temas dun xeito moi rápido. Agarda %{time_left} antes de volvelo tentar."
+      create_post: "Estás a responder dun xeito moi rápido. Agarda %{time_left} antes de volvelo tentar."
+      delete_post: "Estás a eliminar publicacións dun xeito moi rápido. Agarda %{time_left} antes de volvelo tentar."
+      public_group_membership: "Estás a unirte e a deixar grupos con demasiada frecuencia. Agarda %{time_left} antes de volvelo tentar."
+      topics_per_day: "Alcanzaches o número máximo de novos temas. Agarda %{time_left} antes de volvelo tentar."
+      pms_per_day: "Alcanzaches o número máximo de mensaxes. Agarda %{time_left} antes de volvelo tentar."
+      create_like: "Alcanzaches o número máximo de gústames. Agarda %{time_left} antes de volvelo tentar."
+      create_bookmark: "Alcanzaches o número máximo de marcadores. Agarda %{time_left} antes de volvelo tentar."
+      edit_post: "Alcanzaches o número máximo de edicións. Agarda %{time_left} antes de volvelo tentar."
+      live_post_counts: "Estás a pedir que se conten as publicacións dun xeito moi rápido. Agarda %{time_left} antes de volvelo tentar."
+      unsubscribe_via_email: "Alcanzaches o número máximo de baixas en subscricións por correo electrónico. Agarda %{time_left} antes de volvelo tentar."
+      topic_invitations_per_day: "Alcanzaches o número máximo de invitacións ao tema. Agarda %{time_left} antes de volvelo tentar."
     hours:
       one: "Unha hora"
       other: "%{count} horas"
+    minutes:
+      one: "%{count} minuto"
+      other: "%{count} minutos"
+    seconds:
+      one: "%{count} segundo"
+      other: "%{count} segundos"
+    short_time: "uns poucos segundos"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
@@ -458,6 +616,9 @@ gl:
       less_than_x_minutes:
         one: "< %{count}m"
         other: "< %{count}m"
+      x_minutes:
+        one: "%{count}m"
+        other: "%{count}m"
       about_x_hours:
         one: "%{count}h"
         other: "%{count}h"
@@ -466,82 +627,258 @@ gl:
         other: "%{count}d"
       about_x_months:
         one: "%{count}mes"
-        other: "%{count}mes"
+        other: "%{count}meses"
       x_months:
         one: "%{count}mes"
-        other: "%{count}mes"
+        other: "%{count}meses"
       about_x_years:
         one: "%{count}ano"
-        other: "%{count}ano"
+        other: "%{count}anos"
       over_x_years:
         one: "> %{count}ano"
-        other: "> %{count}ano"
+        other: "> %{count}anos"
       almost_x_years:
         one: "%{count}ano"
-        other: "%{count}ano"
+        other: "%{count}anos"
     distance_in_words_verbose:
       half_a_minute: "agora mesmiño"
       less_than_x_seconds: "agora mesmiño"
+      x_seconds:
+        one: "hai %{count} segundo"
+        other: "hai %{count} segundos"
+      less_than_x_minutes:
+        one: "hai menos de %{count} minuto"
+        other: "hai menos de %{count} minutos"
+      x_minutes:
+        one: "hai %{count} minuto"
+        other: "hai %{count} minutos"
+      about_x_hours:
+        one: "hai %{count} hora"
+        other: "hai %{count} horas"
+      x_days:
+        one: "hai %{count} día"
+        other: "hai %{count} días"
+      about_x_months:
+        one: "hai como %{count} mes"
+        other: "hai como uns %{count} meses"
+      x_months:
+        one: "hai %{count} mes"
+        other: "hai %{count} meses"
+      about_x_years:
+        one: "hai como %{count} ano"
+        other: "hai como uns %{count} anos"
+      over_x_years:
+        one: "hai máis de %{count} ano"
+        other: "hai máis de %{count} anos"
+      almost_x_years:
+        one: "hai case %{count} ano"
+        other: "hai case %{count} anos"
   password_reset:
+    no_token: "Sentímolo, esa ligazón para trocar o contrasinal é demasiado antiga. Preme no botón Iniciar sesión e dálle a 'Esquecín o meu contrasinal' para obter unha nova ligazón."
     choose_new: "Elixir un novo contrasinal"
     choose: "Elixir un contrasinal"
     update: "Actualizar contrasinal"
     save: "Estabelecer o contrasinal"
     title: "Contrasinal restabelecido"
+    success: "Cambiaches satisfactoriamente o teu contrasinal e agora iniciaches sesión."
+    success_unapproved: "Cambiaches satisfactoriamente o teu contrasinal."
+  email_login:
+    invalid_token: "Sentímolo, o correo coa ligazón para iniciar sesión é demasiado antigo. Preme no botón Iniciar sesión e dálle a 'Esquecín o meu contrasinal' para obter unha nova ligazón."
+    title: "Iniciar sesión vía correo electrónico"
+  user_auth_tokens:
+    browser:
+      chrome: "Google Chrome"
+      discoursehub: "App DiscourseHub"
+      edge: "Microsoft Edge"
+      firefox: "Firefox"
+      ie: "Internet Explorer"
+      opera: "Opera"
+      safari: "Safari"
+      unknown: "navegador descoñecido"
+    device:
+      android: "Dispositivo Android"
+      chromebook: "Chromebook"
+      ipad: "iPad"
+      iphone: "iPhone"
+      ipod: "iPod"
+      linux: "Sistema operativo GNU/Linux"
+      mac: "Mac"
+      mobile: "Dispositivo móbil"
+      windows: "Sistema operativo Windows"
+      unknown: "dispositivo descoñecido"
+    os:
+      android: "Android"
+      chromeos: "ChromeOS"
+      ios: "iOS"
+      linux: "Linux"
+      macos: "macOS"
+      windows: "Microsoft Windows"
+      unknown: "sistema operativo descoñecido"
   change_email:
+    wrong_account_error: "Iniciaches sesión cunha conta incorrecta; sae e vólveo tentar."
     confirmed: "O teu correo electrónico foi actualizado."
     please_continue: "Continuar a %{site_name}"
-    error: "Produciuse un erro cambiando o enderezo de correo electrónico. Quizais xa está en uso?"
+    error: "Produciuse un erro ao cambiar o enderezo electrónico. Quizais xa está en uso?"
+    doesnt_exist: "Este enderezo electrónico non está asociado coa túa conta."
+    error_staged: "Produciuse un erro ao cambiar o enderezo electrónico. O enderezo xa está en uso por un usuario temporal."
+    already_done: "Sentímolo, a ligazón de confirmación xa non está dispoñible. Talvez o teu correo electrónico xa se modificou?"
+    confirm: "Confirmar"
+    authorizing_new:
+      title: "Confirma o teu novo correo electrónico"
+      description: "Confirma que queres cambiar o teu enderezo electrónico a:"
+      description_add: "Confirma que queres engadir un enderezo electrónico alternativo:"
+    authorizing_old:
+      title: "Cambiar o teu enderezo electrónico"
+      description: "Confirma o cambio do teu enderezo electrónico"
+      description_add: "Confirma que queres engadir un enderezo electrónico alternativo:"
+      old_email: "Corre electrónico antigo: %{email}"
+      new_email: "Novo correo electrónico: %{email}"
+      almost_done_title: "Confirmando o novo enderezo electrónico"
+      almost_done_description: "Enviámosche un correo ao teu novo enderezo para confirmar o cambio!"
+  associated_accounts:
+    revoke_failed: "Erro ao revogar a túa conta con %{provider_name}."
+    connected: "(conectadas)"
   activation:
-    action: "Preme aquí para activar a conta"
+    action: "Preme aquí para activar a túa conta"
+    already_done: "Sentímolo, esta ligazón de confirmación da conta xa non está dispoñible. Talvez a túa conta xa estea activada?"
+    please_continue: "A túa nova conta está confirmada; redireccionarésmote á páxina de inicio."
     continue_button: "Continuar a %{site_name}"
     welcome_to: "Benvido/a a %{site_name}!"
+    approval_required: "Un moderador debe aprobar manualmente a túa nova conta antes de que poidas acceder a este foro. Recibirás un correo electrónico cando a túa conta sexa aprobada!"
+    missing_session: "Non podemos detectar se se creou a túa conta; asegúrate de teres as cookies activadas."
+    activated: "Sentímolo, esta conta xa foi activada."
+    admin_confirm:
+      title: "Confirmar conta de administrador"
+      description: "Tes a certeza de querer converter a <b>%{target_username} (%{target_email})</b> en administrador?"
+      grant: "Conceder permiso de administrador"
+      complete: "<b>%{target_username}</b> é agora administrador."
+      back_to: "Volver a %{title}"
   reviewable_score_types:
     needs_approval:
       title: "Cómpre aprobación"
   post_action_types:
     off_topic:
-      title: "Sen-relación"
-      long_form: "marcou isto como non relacionado"
+      title: "Sen relación co tema"
+      description: "Esta publicación non é relevante para a discusión actual tal e como se define no título e na súa primeira entrada; probablemente debería moverse a outro lugar."
+      short_description: "Non é relevante para a discusión"
+      long_form: "denunciado como sen relación co tema"
     spam:
-      title: "Spam"
-      long_form: "denunciou isto como spam"
+      title: "Correo lixo"
+      description: "Esta publicación é publicidade ou vandalismo. Non é útil nin relevante para o tema."
+      short_description: "Isto é publicidade ou vandalismo"
+      long_form: "denunciado como correo lixo"
+      email_title: '"%{title}" foi denunciado como correo lixo'
+      email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: "Inapropiado"
-      long_form: "denunciou isto como inapropiado"
+      description: 'Esta publicación ten contido que unha persoa razoable podería considerar ofensivo, abusivo ou supor unha violación das <a href="%{base_path}/guidelines">nosas instrucións para a comunidade</a>.'
+      short_description: 'Unha violación das<a href="%{base_path}/guidelines">nosas instrucións para a comunidade</a> '
+      long_form: "denunciado como inapropiado"
+    notify_user:
+      title: "Enviar unha mensaxe a @%{username}"
+      description: "Quero falar con esta persoa directa e persoalmente acerca da súa publicación."
+      short_description: "Quero falar con esta persoa directa e persoalmente acerca da súa publicación."
+      long_form: "usuario notificado vía mensaxe"
+      email_title: 'A túa publicación en "%{title}"'
+      email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Algo máis"
-      description: "Esta publicación require a atención dos responsábeis do sitio por unha razón non listada arriba."
-      long_form: "denunciou isto para revisión polo equipo"
-      email_title: 'Unha publicación en «%{title}» require a atención dos responsábeis do sitio'
+      description: "Esta publicación require a atención dos responsables do sitio por unha razón non listada arriba."
+      short_description: "Require a atención do equipo por outro motivo"
+      long_form: "denunciado para ser revisado polo equipo"
+      email_title: 'Unha publicación en «%{title}» require a atención dos responsables do sitio'
+      email_body: "%{link}\n\n%{message}"
     bookmark:
       title: "Marcador"
-      description: "Marcar esta publicación"
-      short_description: "Marcar esta publicación"
-      long_form: "Marcar este tema"
+      description: "Engadir esta publicación aos marcadores"
+      short_description: "Engadir esta publicación a marcadores"
+      long_form: "publicación engadida a marcadores"
     like:
       title: "Gústame"
       description: "Gústame esta publicación"
       short_description: "Gústame esta publicación"
       long_form: "gustoume isto"
+  draft:
+    sequence_conflict_error:
+      title: "erro no borrador"
+      description: "O borrador está a ser editado noutra xanela. Volve cargar esta páxina."
+  draft_backup:
+    pm_title: "Borradores de apoio de temas en curso"
+  user_activity:
+    no_default:
+      self: "Aínda non tes actividade."
+      others: "Sen actividade."
+    no_bookmarks:
+      self: "Non tes publicacións engadidas aos marcadores; os marcadores permítenche volver rapidamente sobre publicacións específicas."
+      others: "Sen marcadores"
+    no_likes_given:
+      self: "Non lle deches Gústame a ningunha publicación."
+      others: "Ningún gústame en publicacións."
+    no_replies:
+      self: "Non respondiches a ningunha publicación."
+      others: "Sen respostas."
+    no_drafts:
+      self: "Non tes borradores; comeza responder en calquera tema e gardarase automaticamente como un novo borrador."
+  webauthn:
+    validation:
+      invalid_type_error: "O provedor tipo webauthn facilitado non é válido. Os tipos válidos son webauthn.get e webauthn.create."
+      invalid_origin_error: "A orixe da solicitude de autenticación non coincide coa orixe do servidor."
+      malformed_attestation_error: "Produciuse un erro ao descodificar os datos de certificación."
+      user_verification_error: "Requírese a verificación do usuario."
+      unsupported_public_key_algorithm_error: "O servidor non é compatible co algoritmo de chave pública facilitado."
+      unsupported_attestation_format_error: "O formato de certificación non é compatible co servidor."
+      credential_id_in_use_error: "A ID da credencial facilitada xa está en uso."
+      public_key_error: "Houbo un erro na verificación da chave pública da credencial."
+      ownership_error: "A chave de seguridade non pertence ao usuario."
+      not_found_error: "Non se atopou ningunha chave de seguridade coa ID da credencial facilitada."
+      unknown_cose_algorithm_error: "Non se recoñece o algoritmo utilizado para a chave de seguridade."
   topic_flag_types:
     spam:
-      title: "Spam"
-      long_form: "denunciou isto como spam"
+      title: "Correo lixo"
+      description: "Este tema é publicidade. Non é util nin relevante para este sitio; a súa natureza é de carácter promocional."
+      long_form: "denunciado como correo lixo"
+      short_description: "Isto é publicidade"
     inappropriate:
       title: "Inapropiado"
+      description: 'Esta publicación ten contido que unha persoa razoable podería considerar ofensivo, abusivo ou supor unha violación das <a href="%{base_path}/guidelines">nosas instrucións para a comunidade</a>.'
       long_form: "denunciou isto como inapropiado"
+      short_description: 'Unha violación das<a href="%{base_path}/guidelines">nosas instrucións para a comunidade</a> '
     notify_moderators:
       title: "Algo máis"
+      description: 'Este tema require da atención do equipo con base nas <a href="%{base_path}/guidelines">instrucións</a>, <a href="%{tos_url}">os termos de servizo</a> ou por calquera outro motivo non listado enriba.'
       long_form: "denunciou isto para revisión por un moderador"
+      short_description: "Require a atención do equipo por outro motivo"
+      email_title: 'O tema "%{title}" require a atención do moderador'
+      email_body: "%{link}\n\n%{message}"
+  flagging:
+    you_must_edit: '<p>A túa publicación foi denunciada pola comunidade. Por favor, <a href="%{path}">revista as túas mensaxes</a>.</p>'
+    user_must_edit: "<p>Esta publicación foi denunciada pola comunidade e temporalmente permanecerá oculta.</p>"
+  ignored:
+    hidden_content: "<p>Contido ignorado</p>"
   archetypes:
     regular:
       title: "Tema normal"
     banner:
       title: "Tema do báner"
+  unsubscribed:
+    title: "Preferencias de correo electrónico actualizadas!"
+    description: "as preferencias para <b>%{email}</b> foron actualizadas. Para cambiar a configuración do teu correo electrónico <a href='%{url}'>visita as túas preferencias de usuario</a>."
+    topic_description: "Para volver subscribirte a%{link}, utiliza o control de notificacións na parte inferior ou dereita do tema."
+    private_topic_description: "Para volver subscribirte, utiliza o control de notificacións na parte inferior ou dereita do tema."
   unsubscribe:
+    title: "Cancelar subscrición"
+    stop_watching_topic: "Deixar de seguir este tema, %{link}"
+    mute_topic: "Silenciar todas as notificacións para este tema, %{link}"
+    unwatch_category: "Deixar de seguir todos os temas en %{category}"
+    mailing_list_mode: "Desactivar o modo de lista de correo"
+    all: "Non enviarme ningún correo electrónico de %{sitename}"
+    different_user_description: "Actualmente tes a sesión iniciada cun usuario diferente ao que lle enviamos un correo electrónico. Sae, ou entra en modo anónimo, e vólveo tentar."
+    not_found_description: "Non puidemos atopar a cancelación da subscrición. É posible que caducase a ligazón do teu correo electrónico xa caducase?"
     log_out: "Saír da sesión"
+    submit: "Gardar preferencias"
     digest_frequency:
+      title: "Estás a recibir correos electrónicos de resumo %{frequency}"
+      select_title: "Establecer a frecuencia dos correos electrónicos resumo:"
       never: "nunca"
       every_30_minutes: "cada 30 minutos"
       every_hour: "cada hora"
@@ -550,64 +887,139 @@ gl:
       every_month: "cada mes"
       every_six_months: "cada seis meses"
   user_api_key:
+    title: "Autorizar acceso á aplicación"
+    authorize: "Autorizar"
+    read: "lectura"
+    read_write: "lectura/escritura"
+    description: '"%{application_name}" está a solicitar o seguinte acceso á túa conta:'
+    instructions: 'Acabamos de xerar unha nova chave API de usuario para que utilices con "%{application_name}"; pega a seguinte chave na túa aplicación.'
+    otp_description: 'Gustaríache permitirlle a "%{application_name}" acceder a este sitio?'
     otp_confirmation:
       confirm_title: "Continuar a %{site_name}"
+      logging_in_as: "Iniciando sesión como %{username}"
+      confirm_button: Finalizar inicio de sesión
+    no_trust_level: "Sentímolo, non tes o nivel de confianza que se necesita para acceder á API de usuario."
+    generic_error: "Sentimolo, non nos é posible emitir chaves API de usuario, pois esta funcionalidade debeu ser desactivada polo administrador do sitio"
+    scopes:
+      message_bus: "Actualizacións ao vivo"
+      notifications: "Ler e borrar as notificacións"
+      push: "Notificacións emerxentes para servizos externos"
+      session_info: "Ler información da sesión de usuario"
+      read: "Ler todo"
+      write: "Escribir todo"
+      one_time_password: "Crear un código de inicio de sesión dun só uso"
+    invalid_public_key: "Sentímolo, a chave pública non é válida"
+    invalid_auth_redirect: "Sentímolo, este host auth_redirect host non está permitido."
+    invalid_token: "Código non válido, caducado ou ausente."
   reports:
     default:
       labels:
+        count: Número
+        percent: Porcentaxe
         day: Día
     post_edits:
+      title: "Edicións publicadas"
       labels:
         edited_at: Data
         post: Publicación
         editor: Editor
+        author: Autor
         edit_reason: Razón
+      description: "Número de edicións de novas publicacións"
     user_flagging_ratio:
       labels:
         user: Usuario
         score: Puntuación
+      description: "Listaxe de usuarios ordenada segundo a porcentaxe de respostas ás súas por parte do equipo (en desacordo ou en acordo)."
     moderators_activity:
+      title: "Actividade do moderador"
       labels:
         moderator: Moderador
+        flag_count: Marcas revisadas
+        time_read: Tempo de lectura
+        topic_count: Temas creados
+        post_count: Publicacións creadas
+        pm_count: Mensaxes privadas creadas
+        revision_count: Revisións
+      description: "Listaxe da actividade de moderación que inclúe as marcas revisadas, o tempo de lectura, os temas creados, as mensaxes privadas e as revisións."
     flags_status:
+      values:
+        agreed: De acordo
+        disagreed: En desacordo
+        deferred: Adiado
+        no_action: Sen acción
       labels:
         flag: Tipo
+        assigned: Asignado
+        poster: Autor
+        time_to_resolution: Tempo de resolución
     visits:
       title: "Visitas de usuarios"
       xaxis: "Día"
       yaxis: "Número de visitas"
+      description: "Número de todas as visitas do usuario"
     signups:
+      title: "Rexistros"
       xaxis: "Día"
+      yaxis: "Número de rexistros"
+      description: "Novos rexistros de conta para este período."
     new_contributors:
+      title: "Novos colaboradores"
       xaxis: "Día"
+      yaxis: "Número de novos colaboradores"
+      description: "Número de usuarios que publicaron por primeira vez durante este período."
     trust_level_growth:
+      title: "Crecemento do nivel de confianza"
+      xaxis:
+        tl1_reached: "NC1 alcanzado"
+        tl2_reached: "NC2 alcanzado"
+        tl3_reached: "NC3 alcanzado"
+        tl4_reached: "NC4 alcanzado"
       yaxis: "Día"
+      description: "Número de usuarios que incrementaron o seu nivel de confianza durante este período"
     consolidated_page_views:
+      title: "Visualizacións de páxinas consolidadas"
+      xaxis:
+        page_view_crawler: "Rastrexadores"
+        page_view_anon: "Usuarios anónimos"
+        page_view_logged_in: "Usuarios conectados"
       yaxis: "Día"
+      description: "Visualizacións de páxinas para usuarios conectados, anónimos e rastrexadores."
       labels:
         post: Publicación
         editor: Editor
+        author: Autor
         edit_reason: Razón
     dau_by_mau:
+      title: "UAD/UAM"
       xaxis: "Día"
+      yaxis: "UAD/UAM"
+      description: "Número de membros que iniciaron sesión no último día entre o número de membros que iniciaron sesión no último mes - devolve a porcentaxe que indica o grao de permanencia da comunidade. Obxectivo: >30%."
     daily_engaged_users:
+      title: "Usuarios comprometidos a diario"
       xaxis: "Día"
+      yaxis: "Usuarios comprometidos"
+      description: "Número de usuarios que lle deron a Gústame ou publicaron no último día."
     profile_views:
-      title: "Vistas dos perfís de usuario"
+      title: "Visualizacións dos perfís de usuario"
       xaxis: "Día"
       yaxis: "Número de perfís de usuario vistos"
+      description: "Número total de visualizacións de perfís de usuario."
     topics:
       title: "Temas"
       xaxis: "Día"
-      yaxis: "Número de temas vistos"
+      yaxis: "Número de novos temas"
+      description: "Novos temas creados durante este período."
     posts:
       title: "Publicacións"
       xaxis: "Día"
       yaxis: "Número de novas publicacións"
+      description: "Novas publicacións creadas durante este período"
     likes:
       title: "Gústames"
       xaxis: "Día"
       yaxis: "Número de novos gústames"
+      description: "Número de novos gústames."
     flags:
       title: "Denuncias"
       xaxis: "Día"
@@ -616,51 +1028,70 @@ gl:
       title: "Marcadores"
       xaxis: "Día"
       yaxis: "Número de novos marcadores"
+      description: "Número de novos temas e publicacións engadidos aos marcadores."
     users_by_trust_level:
       title: "Usuarios por nivel de confianza"
       xaxis: "Nivel de confianza"
       yaxis: "Número de usuarios"
+      labels:
+        level: Nivel
+      description: "Número de usuarios agrupados polo nivel de confianza."
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
+      title: "Usuarios por tipo"
       xaxis: "Tipo"
       yaxis: "Número de usuarios"
       labels:
         type: Tipo
       xaxis_labels:
-        admin: Administración
+        admin: Administrador
         moderator: Moderador
         suspended: Suspendido
         silenced: Silenciado
+      description: "Número de usuarios agrupados por administradores, moderadores, suspendidos e silenciados."
     trending_search:
+      title: Termos de busca populares
       labels:
         term: Termo
         searches: Buscas
+        click_through: CTR
     emails:
-      title: "Correos-e enviados"
+      title: "Correos electrónicos enviados"
       xaxis: "Día"
-      yaxis: "Número de correos-e enviados"
+      yaxis: "Número de correos electrónicos enviados"
+      description: "Número de novos correos electrónicos enviados"
     user_to_user_private_messages:
+      title: "Usuario a usuario (respostas excluídas)"
       xaxis: "Día"
       yaxis: "Número de mensaxes"
+      description: "Número de mensaxes persoais iniciadas recentemente"
     user_to_user_private_messages_with_replies:
+      title: "Usuario a usuario (con respostas)"
       xaxis: "Día"
       yaxis: "Número de mensaxes"
+      description: "Número de todas as novas mensaxes persoais e respostas."
     system_private_messages:
       title: "Sistema"
       xaxis: "Día"
       yaxis: "Número de mensaxes"
+      description: "Número de mensaxes persoais enviadas automaticamente polo sistema."
     moderator_warning_private_messages:
       title: "Avisos dun moderador"
       xaxis: "Día"
       yaxis: "Número de mensaxes"
+      description: "Número de avisos enviados a través de mensaxes persoais polos moderadores."
     notify_moderators_private_messages:
-      title: "Notificacións os moderadores"
+      title: "Notificar aos moderadores"
       xaxis: "Día"
       yaxis: "Número de mensaxes"
+      description: "Número de veces que os moderadores foron notificados por privado dunha denuncia."
     notify_user_private_messages:
       title: "Notificacións os usuarios"
       xaxis: "Día"
       yaxis: "Número de mensaxes"
+      description: "Número de veces que os usuarios foron notificados por privado dunha denuncia."
     top_referrers:
+      title: "Referenciadores populares"
       xaxis: "Usuario"
       num_clicks: "Clics"
       num_topics: "Temas"
@@ -668,8 +1099,9 @@ gl:
         user: "Usuario"
         num_clicks: "Clics"
         num_topics: "Temas"
+      description: "Usuarios listados polo número de clics nas ligazóns que compartiron."
     top_traffic_sources:
-      title: "As maiores fontes de tráfico"
+      title: "Maiores fontes de tráfico"
       xaxis: "Dominio"
       num_clicks: "Clics"
       num_topics: "Temas"
@@ -678,36 +1110,55 @@ gl:
         domain: Dominio
         num_clicks: Clics
         num_topics: Temas
+      description: "Fontes externas que mais ligaron con este sitio."
     top_referred_topics:
+      title: "Temas con máis referencias"
       labels:
         num_clicks: "Clics"
         topic: "Tema"
+      description: "Temas que máis clics recibiron desde fontes externas."
     page_view_anon_reqs:
       title: "Anónimo"
       xaxis: "Día"
+      yaxis: "Visualicacións de páxinas anónimas"
+      description: "Número de novas visualizacións de páxinas feitas por visitantes sen a sesión iniciada na súa conta."
     page_view_logged_in_reqs:
-      title: "Sesión iniciada"
+      title: "Coa sesión iniciada"
       xaxis: "Día"
+      yaxis: "Visualizacións de páxina coa sesión iniciada"
+      description: "Número de novas visualizacións de páxinas feitas por usuarios coa sesión iniciada."
     page_view_crawler_reqs:
+      title: "Visualizacións de páxina por rastrexadores web"
       xaxis: "Día"
+      yaxis: "Visualizacións de páxina por rastrexadores web"
+      description: "Total de visualizacións desde rastrexadores web ao longo do tempo."
     page_view_total_reqs:
+      title: "Visualizacións de páxinas"
       xaxis: "Día"
+      yaxis: "Total de visualizacións de páxina"
+      description: "Número de novas visualizacións de páxina de todos os visitantes."
     page_view_logged_in_mobile_reqs:
+      title: "Visualizacións de páxina coa sesión iniciada"
       xaxis: "Día"
+      yaxis: "Visualizacións de páxina desde coa sesión iniciada desde un móbil"
+      description: "Número de novas visualizacións de páxina de usuarios coa sesión iniciada desde un dispositivo móbil."
     page_view_anon_mobile_reqs:
+      title: "Visualizacións de páxinas anónimas"
       xaxis: "Día"
+      yaxis: "Visualizacións de páxinas anónimas desde un dispositivo móbil"
+      description: "Número de novas visualizacións de páxina de visitantes desde un dispositivo móbil sen a sesión iniciada."
     http_background_reqs:
       title: "Fondo"
       xaxis: "Día"
-      yaxis: "Peticións usadas para actualizacións e seguimentos"
+      yaxis: "Solicitudes utilizadas para actualizacións e seguimentos ao vivo"
     http_2xx_reqs:
       title: "Estado 2xx (OK)"
       xaxis: "Día"
-      yaxis: "Peticións con éxito (estado 2xx)"
+      yaxis: "Solicitudes con éxito (estado 2xx)"
     http_3xx_reqs:
       title: "HTTP 3xx (redireccionar)"
       xaxis: "Día"
-      yaxis: "Redireccionar peticións (estado 3xx)"
+      yaxis: "Redireccionar solicitudes (estado 3xx)"
     http_4xx_reqs:
       title: "HTTP 4xx (erro do cliente)"
       xaxis: "Día"
@@ -715,30 +1166,73 @@ gl:
     http_5xx_reqs:
       title: "HTTP 5xx (erro do servidor)"
       xaxis: "Día"
+      yaxis: "Erros do servidor (estado 5xx)"
     http_total_reqs:
       title: "Total"
       xaxis: "Día"
+      yaxis: "Solicitudes totais"
     time_to_first_response:
+      title: "Tempo transcorrido ata a primeira resposta"
       xaxis: "Día"
+      yaxis: "Tempo medio (horas)"
+      description: "Tempo medio (horas) ata a primeira resposta a novos temas."
     topics_with_no_response:
       title: "Temas sen resposta"
       xaxis: "Día"
       yaxis: "Total"
       description: "Número de temas novos que non recibiron resposta."
     mobile_visits:
+      title: "Visitas de usuarios (móbil)"
       xaxis: "Día"
       yaxis: "Número de visitas"
+      description: "Número de usuarios únicos que utilizaron un dispositivo móbil."
+    web_crawlers:
+      labels:
+        user_agent: "Axentes de usuario"
+        page_views: "Visualizacións de páxinas"
     suspicious_logins:
+      title: "Inicios de sesión sospeitosos"
       labels:
         user: Usuario
+        client_ip: IP do cliente
         location: Localización
+        browser: Navegador
+        device: Dispositivo
+        os: Sistema operativo
+        login_time: Data e hora do inicio de sesión
+      description: "Detalles de novos inicios de sesión que difiren sospeitosamente doutros anteriores."
     staff_logins:
       labels:
         user: Usuario
         location: Localización
+        login_at: Inicio de sesión ás
     top_uploads:
       labels:
         filename: Nome do ficheiro
+        extension: Extensión
+        author: Autor
+        filesize: Tamaño do ficheiro
+      description: "Listaxe de todas as cargas por extensión, tamaño e autor."
+    top_ignored_users:
+      labels:
+        ignored_user: Usuario ignorado
+        ignores_count: Número de ignorados
+        mutes_count: Número de silenciados
+      description: "Usuarios que foron silenciados e/ou ignorados por moitos outros usuarios."
+  dashboard:
+    rails_env_warning: "O teu servidor está a executarse en modo %{env}."
+    host_names_warning: "O teu ficheiro config/database.yml file está a usar o nome do servidor localhost predefinido. Actualízao para utilizar o nome do servidor do teu sitio."
+    sidekiq_warning: 'Sidekiq non está a funcionar. Moitas tarefas, caso do envío de correos electrónicos, están a ser realizadas de forma asíncrona por sidekiq. Asegúrate de que, ao menos un proceso de sidekiq está funcionando. <a href="https://github.com/mperham/sidekiq" target="_blank">Aprende máis sobre Sidekiq aquí</a>.'
+    queue_size_warning: "O número de tarefas na cola é %{queue_size}, que é unha cifra alta. Isto pode indicar un problema co(s) proceso(s) de Sidekiq ou tes que engadir máis traballadores de Sidekiq."
+    memory_warning: "O teu servidor estase a executar con menos de 1 GB da memoria total. Recoméndase ao menos unha memoria de 1 GB."
+    google_oauth2_config_warning: 'O servidor está configurado para permitir o rexistro de inicio sesión mediante Google OAuth2 (enable_google_oauth2_logins), pero os valores ID do cliente e do cliente secreto non foron establecidos. Vai a <a href="%{base_path}/admin/site_settings">Axustes do sitio</a> e actualiza a configuración. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Revisa esta guía para saber máis</a>.'
+    image_magick_warning: 'O servidor está configurado para crear miniaturas de imaxes grandes, pero ImageMagick non está instalado. Instálao utilizando o teu administrador de paquetes favorito ou <a href="https://www.imagemagick.org/script/download.php" target="_blank"> descarga a última versión</a>.'
+    failing_emails_warning: 'Hai %{num_failed_jobs} tarefas de correo electrónico que fallaron. Comproba o teu app.yml e asegúrate de que os axustes do servidor de correo son correctos. <a href="%{base_path}/sidekiq/retries" target="_blank">Mira as tarefas que fallaron en Sidekiq</a>.'
+    subfolder_ends_in_slash: "A configuración do subcartafol non é correcta; o campo DISCOURSE_RELATIVE_URL_ROOT remata cunha barra."
+    missing_mailgun_api_key: "O servidor está configurado para enviar correos electrónicos a través de Mailgun, pero non proporcionaches unha chave API que se utiliza para verificar as mensaxes de webhook."
+    bad_favicon_url: "Erro ao cargar a favicona. Comproba a súa configuración en <a href='%{base_path}/admin/site_settings'>Axustes do sitio</a>."
+    out_of_date_themes: "Hai actualizacións dispoñibles para os seguintes temas:"
+    unreachable_themes: "Non puidemos comprobar se hai actualizacións para os seguintes temas:"
   site_settings:
     delete_old_hidden_posts: "Eliminar automaticamente as publicacións ocultas durante máis de 30 días."
     allow_user_locale: "Permitir os usuarios escoller o idioma da interface"
@@ -746,8 +1240,103 @@ gl:
     min_first_post_length: "Número mínimo de caracteres (corpo do tema) permitido para unha primeira publicación"
     min_personal_message_post_length: "Número mínimo de caracteres permitido para unha mensaxe"
     max_post_length: "Número máximo de caracteres permitido para unha publicación"
-    post_undo_action_window_mins: "Número de minutos que os usuarios teñen para desfacer accións recentes nunha publicación (gústames, denuncias, etc)."
+    topic_featured_link_enabled: "Activar a publicación dunha ligazón con temas."
+    show_topic_featured_link_in_digest: "Mostrar a ligazón destacada do tema no correo electrónico de resumo."
+    min_topic_title_length: "Extensión mínima do título dos temas en número de caracteres"
+    max_topic_title_length: "Extensión máxima do título dos temas en número de caracteres"
+    min_personal_message_title_length: "Extensión mínima do título dunha mensaxe en número de caracteres"
+    max_emojis_in_title: "Número máximo de emojis permitido no título dun tema"
+    min_search_term_length: "Extensión mínima dunha busca válida en número de caracteres"
+    search_recent_posts_size: "Número de publicacións recentes que se manteñen no índice"
+    log_search_queries: "Rexistro de buscas realizadas polos usuarios"
+    search_query_log_max_size: "Número máximo de consultas que se conservan"
+    search_query_log_max_retention_days: "Tempo máximo que se conservan as consultas de buscas, en días."
+    search_ignore_accents: "Ignorar os acentos nas buscas de texto."
+    allow_duplicate_topic_titles: "Permitir temas con títulos idénticos, duplicados"
+    allow_duplicate_topic_titles_category: "Permitir temas con títulos idénticos, duplicados, se a categoría é diferente.  allow_duplicate_topic_titles debe ser falso."
+    unique_posts_mins: "Minutos que deben transcorrer antes de que usuario poida volver publicar o mesmo contido"
+    educate_until_posts: "Cando o usuario comeza a escribir as súas primeiras (n) publicacións, mostrarlle o panel emerxente cos consellos para usuarios novos no editor."
+    title: "O nome deste sitio, utilizado na etiqueta título."
+    site_description: "Describe o sitio nunha única frase, utilizada na etiqueta metadescrición."
+    short_site_description: "Breve descrición, utilizada como o título da etiqueta na páxina principal."
+    contact_email: "Enderezo electrónico do/a responsable deste sitio. Utilízase para notificacións críticas e mais na páxina de <a href='%{base_path}/about' target='_blank'>información</a> de contacto para asuntos urxentes."
+    contact_url: "URL de contacto para este sitio. Utilízase na <a href='%{base_path}/about' target='_blank'>información</a> do formulario de contacto para asuntos urxentes."
+    crawl_images: "Recuperar imaxes desde URL remotos para inserilas coas dimensións correctas de largura e altura."
+    download_remote_images_to_local: "Converter imaxes remotas en locais ao descargalas; isto prevé ter imaxes rotas."
+    download_remote_images_threshold: "Espazo mínimo no disco necesario para descargar imaxes remotas de forma local (en porcentaxe)"
+    disabled_image_download_domains: "As imaxes remotas procedentes destes dominios non serán descargadas. Listaxe delimitada por barras."
+    editing_grace_period: "Durante (n) segundos logo de publicar, pódese editar sen chegar a crear unha nova versión no historial."
+    max_image_width: "Largura máxima das miniaturas de imaxes nunha publicación"
+    max_image_height: "Altura máxima das miniaturas de imaxes nunha publicación"
+    post_excerpt_maxlength: "Lonxitude máxima do resumo/extracto dunha publicación."
+    topic_excerpt_maxlength: "Lonxitude máxima dun extracto/resumo dun tema xerado a partir da primeira publicación dun tema."
+    show_pinned_excerpt_mobile: "Mostrar o extracto de temas destacados na vista móbil."
+    show_pinned_excerpt_desktop: "Mostrar o extracto de temas destacados na vista de escritorio."
+    post_onebox_maxlength: "Lonxitude máxima en caracteres dunha publicación de Discourse en formato onebox."
+    onebox_domains_blacklist: "Unha listaxe de dominios que nunca se mostrarán en formato onebox."
+    inline_onebox_domains_whitelist: "Unha listaxe de dominios que se transformarán en formato onebox en miniatura se son ligados sen un título."
+    enable_system_message_replies: "Permitirlles aos usuarios responder mensaxes do sistema, mesmo aínda que as mensaxes persoais estean desactivadas."
+    cooldown_minutes_after_hiding_posts: "Número de minutos que un usuario debe esperar para poder editar unha publicación oculta por mor das denuncias da comunidade."
+    max_topics_in_first_day: "Número máximo de temas que un usuario ten permitido crear nas 24 horas posteriores logo de crear a súa primeira publicación"
+    max_replies_in_first_day: "Número máximo de respostas que un usuario ten permitido deixar nas 24 horas posteriores logo de crear a súa primeira publicación"
+    tl2_additional_likes_per_day_multiplier: "Incrementar o número de gústames por día para usuarios con nivel de confianza 2 (membros) multiplicándoo por este número"
+    tl4_additional_likes_per_day_multiplier: "Incrementar o número de gústames por día para usuarios con nivel de confianza 3 (líderes) multiplicándoo por este número"
+    num_users_to_silence_new_user: "Se as publicacións dun usuario novo non se denuncian como lixo ou non desexadas por num_spam_flags_to_silence_new_user, agochar todas as súas publicacións e evitar que publique no futuro. Valor en 0 para deshabilitar."
+    num_tl3_flags_to_silence_new_user: "Se as publicacións dun novo usuario reciben este número de denuncias num_tl3_users_to_silence_new_user different de diferentes usuarios con nivel 3 de confianza, agochar todas as súas publicacións e evitar que publique no futuro. Valor en 0 para deshabilitar."
+    num_tl3_users_to_silence_new_user: "Se as publicacións dun novo usuario reciben num_tl3_users_to_silence_new_user different denuncias deste número de usuarios con nivel 3 de confianza, agochar todas as súas publicacións e evitar que publique no futuro. Valor en 0 para deshabilitar."
+    notify_mods_when_user_silenced: "Se un usuario é silenciado automaticamente, enviarlles unha mensaxe a todos os moderadores."
+    flag_sockpuppets: "Se un novo usuario responde a un tema desde o mesmo enderezo IP que o usuario que iniciou o tema, denunciar as publicacións de ambos como lixo en potencia."
+    traditional_markdown_linebreaks: "Utilizar saltos de liña tradicionais en Markdown, que requiren dous espazos ao fina para un salto de liña."
+    enable_markdown_typographer: "Utilizar regras tipográficas para mellorar a lexibilidade do texto: substituír comas rectas «con comiñas ou aspas», (c) (tm) con símbolos, -- con guión longo –, etc"
+    enable_markdown_linkify: "Tratar automaticamente o texto que pareza unha ligazón como unha ligazón: www.exemplo.com e https://exemplo.com vincúlanse automaticamente"
+    markdown_linkify_tlds: "Listaxe de dominios de nivel superior que se tratan automaticamente como ligazóns"
+    markdown_typographer_quotation_marks: "Listaxe de pares de substitución de comiñas dobres e simples"
+    post_undo_action_window_mins: "Número de minutos que os usuarios teñen para desfacer accións recentes nunha publicación (gústames, denuncias etc)."
+    must_approve_users: "O equipo debe aprobar todas as novas contas antes de que teñan permiso para acceder ao sitio."
+    invite_code: "O usuario debe inserir este código para que se lle permita o rexistro da conta, ignorado cando está baleiro (non distingue entre maiúsculas e minúsculas)"
+    approve_suspect_users: "Engadir usuarios sospeitosos á cola de revisión. Usuarios sospeitosos que inseriron unha biografía ou sitio web, pero non teñen actividade de lectura."
+    pending_users_reminder_delay: "Notificarlles aos moderadores se hai novos usuarios que estiveran á espera da súa aprobación por máis tempo desta cantidade de horas. Valor -1 para deshabilitar notificacións. "
+    maximum_session_age: "O usuario permanecerá coa sesión iniciada durante n horas desde a última visita."
+    ga_universal_tracking_code: "Código de seguimento de Google Universal Analytics (analytics.js) , ex: UA-12345678-9; visita <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_domain_name: "Nome do dominio establecido en Google Universal Analytics (analytics.js), ex: mysite.com; visita <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_auto_link_domains: "Habilitar o seguimento multidominio de Google Universal Analytics (analytics.js). As ligazóns saíntes destes dominios terán a ID do cliente agregadas. Revisa <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>A guía de Google para o seguimento multidominio."
+    gtm_container_id: "ID do contedor de Google Tag Manager. ex: GTM-ABCDEF. <br/>Nota: pode ser necesario que os scripts de terceiros cargados a través de GTM se engadan á lista branca en 'content security policy script src'."
+    moderators_create_categories: "Permitir que os moderadores cren novas categorías"
+    blacklist_ip_blocks: "Unha listaxe privada de enderezos IP bloqueados que nunca deberían ser rastrexadas por Discourse"
+    whitelist_internal_hosts: "Unha listaxe con hosts internos que Discourse pode rastrexar de forma segura para utilizar con Onebox e outros propósitos."
+    site_contact_group_name: "Un nome de grupo válido para ser convidado a todas as mensaxes automatizadas."
+    send_welcome_message: "Enviar aos novos usuarios unha mensaxe de benvida cunha guía de acceso rápido."
+    send_tl1_welcome_message: "Enviar aos novos usuarios con nivel 1 de confianza unha mensaxe de benvida."
+    suppress_reply_directly_below: "Non mostrar o contador de respostas despregable cando hai unha única resposta xusto embaixo desta publicación."
+    suppress_reply_directly_above: "Non mostrar o despregable en-resposta-a nunha publicación se unicamente hai unha resposta xusto enriba dela."
+    remove_full_quote: "Eliminar automaticamente citas completas nas respostas directas."
+    suppress_reply_when_quoting: "Non mostrar o despregable en-resposta-a nunha publicación cando esta cite a resposta."
+    max_reply_history: "Número máximo de respostas que se mostran ao expandir en-resposta-a"
+    topics_per_period_in_top_summary: "Número de temas destacados que se mostran no resumo de temas destacados."
+    topics_per_period_in_top_page: "Número de temas destacados que se mostran na vista expandida ao premer en 'Mostrar máis'."
+    redirect_users_to_top_page: "Redirixir automaticamente á páxina de destacados a aqueles usuarios novos e aos que se ausentan por un longo período."
+    top_page_default_timeframe: "Período predefinido para a páxina de temas destacados."
+    moderators_view_emails: "Permitir que os moderadores vexas os correos electrónicos dos usuarios"
+    prioritize_username_in_ux: "Mostrar o nome de usuario primeiro na páxina de usuario, a tarxeta de usuario e as publicacións (cando está desactivado, o nome móstrase primeiro)"
+    enable_rich_text_paste: "Habilitar conversión automática de HTML a Markdown ao pegar texto no compositor. (Experimental)"
+    send_old_credential_reminder_days: "Lembrar as credencias antigas despois de días"
+    email_token_valid_hours: "Os códigos para restablecer o contrasinal ou activar a conta son válidos durante (n) horas."
     enable_badges: "Activar o sistema de insignias"
+    enable_whispers: "Permitir que os membros do equipo se comuniquen entre eles por privado dentro dos temas."
+    allow_index_in_robots_txt: "Especificar en robots.txt que se permite que este sitio sexa indexado polos motores de busca en internet. En casos excepcionais, podes <a href='%{base_path}/admin/customize/robots'>sobrescribir robots.txt</a>permanentemente."
+    invite_expiry_days: "Tempo de duración que as claves para convidar usuarios son válidas, en días"
+    login_required: "Requírese autenticación para ler contido neste sitio; deshabilitar o acceso anónimo."
+    min_username_length: "Lonxitude mínima do nome de usuario en caracteres. Advertencia: se hai usuarios ou grupos cunha extensión menor, o teu sitio quebrará!"
+    max_username_length: "Lonxitude máxima do nome de usuario en caracteres. Advertencia: se hai usuarios ou grupos cunha extensión maior, o teu sitio quebrará!"
+    unicode_usernames: " Permitir que os nomes de usuario conteñan algunhas letras e números Unicode."
+    unicode_username_character_whitelist: "Expresión regular para permitir unicamente algúns caracteres Unicode dentro dos nomes de usuario. As letras ASCII e os números sempre se permitirán e non é necesario que os inclúas nunha listaxe branca. "
+    reserved_usernames: "Nomes de usuario que non están permitidos. O asterisco * pódese utilizar para coincidir con calquera carácter cero ou máis veces."
+    min_password_length: "Lonxitude mínima do contrasinal"
+    min_admin_password_length: "Lonxitude mínima do contrasinal para un administrador"
+    password_unique_characters: "Número mínimo de caracteres únicos que un contrasinal debe conter"
+    block_common_passwords: "Non permitir contrasinais que estean entre os 10.000 contrasinais máis comúns."
+    enable_sso: "Habilitar o inicio de sesión único a través dun sitio externo (AVISO: OS ENDEREZOS DE CORREO ELECTRÓNICO DOS USUARIOS *TEÑEN* QUE SER VALIDADOS NO SITIO EXTERNO!)"
+    verbose_sso_logging: " Rexistrar diagnósticos detallados relacionados con SSO en <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     max_flags_per_day: "Número máximo de denuncias por usuario e día."
     category_style: "Estilo visual para as insignias de categoría."
     enable_user_directory: "Proporcionar un directorio de usuarios para navegación"
@@ -787,6 +1376,29 @@ gl:
   admin:
     email:
       sent_test: "enviado!"
+  user:
+    username:
+      too_long: "é demasiado longo"
+      characters: "só debe incluír números, letras, guións, puntos e guións baixos"
+      unique: "debe ser único"
+      must_begin_with_alphanumeric_or_underscore: "debe comezar cunha letra, número ou un guión baixo"
+      must_end_with_alphanumeric: "debe rematar cunha letra ou número"
+      must_not_contain_two_special_chars_in_seq: "non debe conter unha secuencia de 2 ou máis caracteres especiais (.-_)"
+      must_not_end_with_confusing_suffix: "non debe remtar cun sufixo confuso do tipo .json ou .png etc."
+    email:
+      invalid: "non é válido."
+      blocked: "non está permtido."
+    ip_address:
+      blocked: "Non están permitidos novos rexistros desde o teu enderezo IP."
+      max_new_accounts_per_registration_ip: "Non están permitidos novos rexistros desde o teu enderezo IP (alcanzouse o límite). Contacta cun membro do equipo."
+    website:
+      domain_not_allowed: "O sitio web non é válido. Os dominios permitidos son: %{domains}"
+    destroy_reasons:
+      inactive_user: "Usuario inactivo"
+  invite_mailer:
+    subject_template: "%{inviter_name} invitoute a '%{topic_title}' en%{site_domain_name}"
+  custom_invite_mailer:
+    subject_template: "%{inviter_name} invitoute a '%{topic_title}' en%{site_domain_name}"
   flags_dispositions:
     agreed: "Grazas por comunicárnolo. Estamos de acordo en que hai un problema e estamos botándolle un ollo."
     agreed_and_deleted: "Grazas por comunicárnolo. Estamos de acordo en que hai un problema e xa eliminamos a publicación."
@@ -795,7 +1407,18 @@ gl:
     ignored_and_deleted: "Grazas por comunicárnolo. Xa eliminamos a publicación."
   system_messages:
     welcome_user:
+      title: "Benvida ao usuario"
       subject_template: "Benvido/a a %{site_name}!"
+      text_body_template: |
+        Grazas por te unires a %{site_name} e benvido/a!
+
+        %{new_user_tips}
+
+        Cremos nunha [comunidade cun comportamento civilizado](%{base_url}/instrucions) en todo momento.
+
+        Desfruta da túa estancia!
+    welcome_tl1_user:
+      subject_template: "Grazas por pasares o tempo connosco"
     welcome_invite:
       subject_template: "Benvido/a a %{site_name}!"
     backup_succeeded:
@@ -803,28 +1426,420 @@ gl:
     bulk_invite_succeeded:
       subject_template: "O convite en bloque procesouse correctamente"
   user_notifications:
+    unsubscribe:
+      title: "Cancelar subscrición"
+    user_invited_to_private_message_pm_group:
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm:
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm_staged:
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_topic:
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_replied:
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_replied_pm:
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_quoted:
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_linked:
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_mentioned:
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_mentioned_pm:
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_group_mentioned:
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted:
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_watching_first_post:
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm:
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm_staged:
+      subject_template: "%{optional_re}%{topic_title}"
+      text_body_template: |2
+
+        %{message}
+    account_suspended:
+      title: "Conta suspendida"
+      subject_template: "[%{email_prefix}] A túa conta foi suspendida"
+    account_silenced:
+      title: "Conta silenciada"
+      subject_template: "[%{email_prefix}] A túa conta foi silenciada"
+    account_exists:
+      title: "A conta xa existe"
+      subject_template: "[%{email_prefix}] A conta xa existe"
     digest:
+      since_last_visit: "Desde a túa última visita"
+      new_topics: "Novos temas"
+      unread_notifications: "Notificacións sen ler"
+      unread_high_priority: "Notificacións de prioridade alta sen ler"
       liked_received: "Gústames recibidos"
       new_users: "Novos usuarios"
+      popular_topics: "Temas populares"
+      follow_topic: "Seguir este tema"
+      join_the_discussion: "Ler máis"
+      more_new: "Novo para ti"
+      subject_template: "[%{email_prefix}] Resumo"
+      unsubscribe: "Este resumo envíaseche desde %{site_link} cando non te vemos durante certo tempo. Cambia %{email_preferences_link} ou %{unsubscribe_link} para cancelar a subscrición."
+      your_email_settings: "a configuración do teu correo electrónico"
+      click_here: "preme aquí"
+      from: "%{site_name}"
+      preheader: "Un breve resumo desde a túa última visita en %{last_seen_at}"
+    forgot_password:
+      title: "Esquecín o contrasinal"
+      subject_template: "[%{email_prefix}] Restablecer contrasinal"
+      text_body_template: |
+        Alguén solicitou restablecer o teu contrasinal en [%{site_name}](%{base_url}).
+
+        Se non fuches ti, podes tranquilamente ignorar este correo electrónico.
+
+        Preme na seguinte ligazón para elixir un novo contrasinal:
+        %{base_url}/u/password-reset/%{email_token}
+    email_login:
+      title: "Iniciar sesión vía ligazón"
+      subject_template: "[%{email_prefix}] Iniciar sesión vía ligazón"
+      text_body_template: |
+        Velaquí a túa ligazón para iniciares sesión en [%{site_name}](%{base_url}).
+
+        Se non solicitaches esta ligazón, podes tranquilamente ignorar este correo electrónico.
+
+        Preme na seguinte ligazón para iniciar sesión en:
+        %{base_url}/session/email-login/%{email_token}
     set_password:
-      title: "Estabelecer o contrasinal"
+      title: "Establecer o contrasinal"
+      subject_template: "[%{email_prefix}] Establecer o contrasinal"
+      text_body_template: |
+        Alguén solicitou engadir un contrasinal á túa conta en [%{site_name}](%{base_url}). Alternativamente, podes iniciar sesión utilizando calquera dos servizos en liña compatible (Google, Facebook etc.) que estea asociado con este enderezo de correo electrónico xa validado.
+
+        Se ti non fixeches esta solicitude, podes tranquilamente ignorar este correo electrónico.
+
+        Click the following link to choose a password:
+        %{base_url}/u/password-reset/%{email_token}
+    admin_login:
+      title: "Inicio de sesión de administrador"
+      subject_template: "[%{email_prefix}] Inicio de sesión"
+      text_body_template: |
+        Alguén solicitou iniciar sesión na túa conta en [%{site_name}](%{base_url}).
+
+        Se non fuches ti, podes tranquilamente ignorar este correo electrónico.
+
+        Preme na seguinte ligazón para iniciar sesión:
+        %{base_url}/session/email-login/%{email_token}
+    account_created:
+      title: "Conta creada"
+      subject_template: "[%{email_prefix}] A túa nova conta"
+      text_body_template: |
+        Creouse unha nova conta para ti en %{site_name}
+
+        Preme na seguinte ligazón para elixir un contrasinal para a túa nova conta:
+        %{base_url}/u/password-reset/%{email_token}
+    confirm_new_email:
+      title: "Confirmar novo correo electrónico"
+      subject_template: "[%{email_prefix}] Confirma o teu novo enderezo de correo electrónico"
+      text_body_template: |
+        Confirma o teu novo enderezo de correo electrónico para %{site_name} premendo na seguinte ligazón:
+
+        %{base_url}/u/confirm-new-email/%{email_token}
+    confirm_old_email:
+      title: "Confirmar o correo electrónico antigo"
+      subject_template: "[%{email_prefix}] Confirma o teu enderezo de correo electrónico actual"
+      text_body_template: |
+        Antes de cambiar o teu enderezo electrónico, necesitamos que confirmes que o correo
+        electrónico actual está baixo o teu control. Logo de completar este paso, teremos que confirmar
+        o novo enderezo de correo electrónico.
+
+        Confirma o teu correo electrónico actual para %{site_name} premendo na seguinte ligazón:
+
+        %{base_url}/u/confirm-old-email/%{email_token}
+    confirm_old_email_add:
+      title: "Confirmar o correo electrónico antigo (engadir)"
+      subject_template: "[%{email_prefix}] Confirma o teu enderezo de correo electrónico actual"
+      text_body_template: |
+        Antes de que poidamos engadir un novo enderezo electrónico, necesitamos que confirmes que o actual
+        está baixo o teu control. Logo de completar este paso, teremos que confirmar
+        o novo enderezo electrónico.
+
+        Confirma o teu correo electrónico actual para %{site_name} premendo na seguinte ligazón:
+
+        %{base_url}/u/confirm-old-email/%{email_token}
+    notify_old_email:
+      subject_template: "[%{email_prefix}] O teu enderezo de correo electrónico foi cambiado"
+      text_body_template: |
+        Esta é unha mensaxe automática para comunicarche que o teu enderezo electrónico para
+        %{site_name} foi cambiado. Se isto é un erro, contacta co administrador
+        do sitio.
+
+        O teu enderezo de correo electrónico cambiouse a:
+
+        %{new_email}
+    notify_old_email_add:
+      subject_template: "[%{email_prefix}] Engadiuse un novo enderezo de correo electrónico"
+      text_body_template: |
+        Esta é unha mensaxe automática para comunicarche que se engadiu un enderezo electrónico
+        para %{site_name}. Se isto é un erro, contacta contacta
+        co administrador do sitio.
+
+        O teu enderezo de correo electrónico engadido é:
+
+        %{new_email}
+    signup_after_approval:
+      title: "Rexistro despois da aprobación"
+      subject_template: "A túa solicitude foi aprobada en %{site_name}!"
+      text_body_template: |
+        Benvido/a a %{site_name}!
+
+        Un membro do equipo aprobou a túa conta en %{site_name}.
+
+        Agora podes acceder á túa nova conta iniciando sesión en:
+        %{base_url}
+
+        Se non podes premer na ligazón, proba a copiala e pegala na barra de enderezos do teu navegador.
+
+        %{new_user_tips}
+
+        Cremos nunha comunidade cun [comportamento civilizado](%{base_url}/guidelines) en todo momento.
+
+        Desfruta a túa estancia!
+    signup:
+      title: "Rexistrarse"
+      subject_template: "[%{email_prefix}] Confirma a túa nova conta"
+      text_body_template: |
+        Benvido/a a %{site_name}!
+
+        Preme na seguinte ligazón para confirmar e activar a túa nova conta:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Se non podes premer na ligazón, proba a copiala e pegal na barra de enderezos do teu navegador.
+    activation_reminder:
+      title: "Recordatorio de activación"
+      subject_template: "[%{email_prefix}] Recordatorio para confirmar a túa conta"
+      text_body_template: |
+        Benvido/a a %{site_name}!
+
+        Este é un recordatorio para activar a túa conta.
+
+        Preme na seguinte ligazón para confirmar e activar a túa nova conta:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Se non podes premer na ligazón, proba a copiala e pegala na barra de enderezos do teu navegador.
+    suspicious_login:
+      title: "Alerta de novo inicio de sesión"
+      subject_template: "[%{site_name}] Novo inicio de sesión desde %{location}"
+      text_body_template: |
+        Ola,
+
+        Detectamos dun inicio de sesión desde un dispositivo ou localización que non adoitas utilizar. Fuches ti?
+
+         - Localización: %{location} (%{client_ip})
+         - Navegador: %{browser}
+         - Dispositivo: %{device} – %{os}
+
+        Se fuches ti, perfecto! Non tes que facer máis nada.
+
+        If this was not you, please [review your existing sessions](%{base_url}/my/preferences/account) and consider changing your password.
+  page_forbidden:
+    title: "Vaites! Esta páxina é privada."
   page_not_found:
+    title: "Vaites! A páxina non existe ou é privada."
+    popular_topics: "Destacados"
+    recent_topics: "Recentes"
     see_more: "Máis"
     search_title: "Buscar neste sitio"
     search_button: "Buscar"
+  offline:
+    title: "Non se pode cargar a aplicación"
+    offline_page_message: "Semella que non estás conectado/a! Comproba a túa conexión á rede e vólveo tentar."
+  login_required:
+    welcome_message: |
+      ## [Benvido/a a %{title}](#welcome)
+      Requírese unha conta. Crea unha ou inicia sesión para continuar.
+    welcome_message_invite_only: |
+      ## [Benvido/a a %{title}](#welcome)
+      Requírese unha conta. Pídelle a un membro que te convide ou inicia sesión para continuar.
   image: "imaxe"
+  upload:
+    edit_reason: "copias locais de imaxes descargadas"
+    unauthorized: "Sentímolo, o ficheiro que tentas subir non está autorizado (extensións permitidas: %{authorized_extensions})."
+    pasted_image_filename: "Imaxe pegada"
+    store_failure: "Erro ao almacenar a carga #%{upload_id} para o usuario #%{user_id}."
+    file_missing: "Sentímolo, debes facilitar un ficheiro para subir."
+    empty: "Sentímolo, mais o ficheiro que facilitaches está baleiro."
+    png_to_jpg_conversion_failure_message: "Produciuse un erro ao converter de PNG a JPG."
+    optimize_failure_message: "Produciuse un erro ao optimizar a imaxe subida."
+    attachments:
+      too_large: "Sentímolo, o ficheiro que tentas subir é demasiado grande (o tamaño máximo é de %{max_size_kb} KB)."
+    images:
+      too_large: "Sentímolo, a imaxe que tentas subir é demasiado grande (o tamaño máximo é de %{max_size_kb} KB); redimensiónaa e vólveo tentar."
+      larger_than_x_megapixels: "Sentímolo, a imaxe que tentas subir é demasiado grande (o tamaño máximo é de %{max_image_megapixels} megapíxeles); redimensiónaa e vólveo tentar."
+      size_not_found: "Sentímolo, mais non puidemos determinar o tamaño da imaxe. Talvez está danada?"
+    placeholders:
+      too_large: "(imaxe máis grande que %{max_size_kb} KB)"
+  avatar:
+    missing: "Sentímolo, non puidemos atopar ningún avatar asociado con ese correo electrónico. Podes tentar volvelo subir?"
+  flag_reason:
+    sockpuppet: "Un novo usuario creou un tema e outro novo usuario respondeu desde a mesma IP (%{ip_address}). Revisa a opción <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> na configuración do sitio."
+    spam_hosts: "Este novo usuario tentou crear múltiples publicacións con ligazóns ao mesmo dominio. Todas as publicacións deste usuario que inclúan estas ligazóns deberían ser revisadas. Revisa a configuración do sitio <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
+  skipped_email_log:
+    exceeded_emails_limit: "Exceeded max_emails_per_day_per_user"
+    exceeded_bounces_limit: "Exceeded bounce_score_threshold"
+    mailing_list_no_echo_mode: "Notificacións da lista de correo deshabilitadas para as publicacións do propio usuario."
+    user_email_no_user: "Non se atopa o usuario coa ID %{user_id}"
+    user_email_post_not_found: "Non se atopa ningunha publicación coa ID %{post_id}"
+    user_email_anonymous_user: "O usuario é anónimo"
+    user_email_user_suspended_not_pm: "O usuario está suspendido, non é unha mensaxe"
+    user_email_seen_recently: "O usuario foi visto recentemente"
+    user_email_notification_already_read: "A notificación sobre a que trata o correo xa foi lida."
+    user_email_notification_topic_nil: "post.topic é nulo"
+    user_email_post_user_deleted: "O usuario da publicación foi eliminado."
+    user_email_post_deleted: "a publicación foi eliminada polo autor"
+    user_email_user_suspended: "o usuario foi suspendido"
+    user_email_already_read: "o usuario xa leu esta publicación"
+    user_email_access_denied: "o usuario non ten permitido ler esta publicación"
+    user_email_no_email: "Non hai un correo electrónico asociado coa ID de usuario %{user_id}"
+    sender_message_blank: "a mensaxe está en branco"
+    sender_message_to_blank: "message.to está en branco"
+    sender_text_part_body_blank: "text_part.body está en branco"
+    sender_body_blank: "o corpo está en branco"
+    sender_post_deleted: "a publicación foi eliminada"
+    sender_message_to_invalid: "o destinatario ten un enderezo electrónico non válido"
+    sender_topic_deleted: "o tema foi eliminado"
+  color_schemes:
+    base_theme_name: "Base"
+    light: "Claro"
+    dark: "Escuro"
+    neutral: "Neutro"
+    grey_amber: "Gris ámbar"
+    shades_of_blue: "Azulado"
+    summer: "Verán"
+    dark_rose: "Rosa escuro"
+    default_theme_name: "Claro"
+    light_theme_name: "Claro"
+    dark_theme_name: "Escuro"
+    neutral_theme_name: "Neutro"
+    grey_amber_theme_name: "Gris ámbar"
+    shades_of_blue_theme_name: "Azulado"
+    summer_theme_name: "Verán"
+    dark_rose_theme_name: "Rosa escuro"
+  edit_this_page: "Editar esta páxina"
   csv_export:
     boolean_yes: "Si"
     boolean_no: "Non"
     rate_limit_error: "Só se poden descargar as publicacións unha vez por día. Téntao de novo mañá."
+  static_topic_first_reply: |
+    Editar a primeira publicación deste tema para cambiar o contido da páxina %{page_name}.
   tos_topic:
     title: "Termos do servizo"
   privacy_topic:
-    title: "Política de intimidade"
+    title: "Política de privacidade"
   badges:
+    mass_award:
+      errors:
+        invalid_csv: "Atopamos un erro na liña %{line_number}. Confirma que o CSV ten un único correo electrónico por liña."
     editor:
       name: Editor
       description: Edición da publicación inicial
+    wiki_editor:
+      name: Editor wiki
+      description: Primeira edición wiki
     basic_user:
       name: Básico
     member:
@@ -841,12 +1856,24 @@ gl:
     anniversary:
       name: Aniversario
       description: "Membro activo durante un ano, publicou cando menos unha vez"
+    nice_post:
+      name: Boa resposta
+      description: Recibiu 10 gústames
+    good_post:
+      name: Moi boa resposta
+      description: Recibiu 25 gústames
+    great_post:
+      name: Excelente resposta
+      description: Recibiu 50 gústames
     nice_topic:
       name: Tema riquiño
+      description: Recibiu 10 gústames
     good_topic:
       name: Tema bo
+      description: Recibiu 25 gústames
     great_topic:
       name: Gran tema
+      description: Recibiu 50 gústames
     nice_share:
       name: Compartición riquiña
       description: Compartiu unha publicación con 25 visistantes únicos
@@ -857,7 +1884,7 @@ gl:
       name: Gran compartición
       description: Compartiu unha publicación con 1000 visistantes únicos
     first_like:
-      name: Primeiro Gústame
+      name: Primeiro gústame
       description: Gustou unha publicación
       long_description: |
         Esta insignia concédese a primeira vez que che gusta unha publicación e usas o botón :heart:. Darlle Gústame a unha publicción e unha gran forma de dicirlles aos membros da comunidade que publicaron algo interesante, útil, riquiño ou divertido. Comparte o amor!
@@ -869,6 +1896,7 @@ gl:
       description: Convidou un usuario
     campaigner:
       name: Padriño
+      description: Convidou a 3 usuarios básicos
     champion:
       name: Campión
     first_share:
@@ -878,6 +1906,7 @@ gl:
       name: Primeira ligazón
     first_quote:
       name: Primeira cita
+      description: Citou unha publicación
     read_guidelines:
       name: Ler as Directrices
     reader:
@@ -888,13 +1917,67 @@ gl:
       name: Ligazón quente
     famous_link:
       name: Ligazón popular
+    first_emoji:
+      name: Primeiro emoji
+    first_mention:
+      name: Primeira mención
+    first_reply_by_email:
+      name: Primeira resposta vía correo electrónico
+    enthusiast:
+      name: Entusiasta
   admin_login:
-    submit_button: "Enviar correo-e"
+    success: "Correo electrónico enviado"
+    errors:
+      unknown_email_address: "Enderezo de correo electrónico descoñecido"
+      invalid_token: "Código non válido."
+    submit_button: "Enviar correo electrónico"
+  performance_report:
+    initial_post_raw: Este tema inclúe informes diarios sobre o rendemento do teu sitio.
+    initial_topic_title: Informes sobre o rendemento do sitio web
   tags:
     title: "Etiquetas"
+    staff_tag_disallowed: 'A etiqueta "%{tag}" só pode ser aplicada polo equipo.'
+    staff_tag_remove_disallowed: 'A etiqueta "%{tag}" só pode ser eliminada polo equipo.'
+    minimum_required_tags:
+      one: "Debes seleccionar ao menos %{count} etiqueta."
+      other: "Debes seleccionar ao menos %{count} etiquetas."
+    upload_row_too_long: "O ficheiro CSV debe ter unha etiqueta por liña. Opcionalmente, a etiqueta pode ir seguida dunha coma; despois o nome do grupo de etiquetas."
+    forbidden:
+      invalid:
+        one: "A etiqueta que seleccionaches non pode ser utilizada"
+        other: "Ningunha das etiquetas que seleccionaches pode ser utilizada"
+      in_this_category: '"%{tag_name}" non se pode utilizar nesta categoría'
+      restricted_to:
+        one: '"%{tag_name}" está restrinxida á categoría "%{category_names}"'
+        other: '"%{tag_name}" está restrinxida ás seguintes categorías: %{category_names}'
+      synonym: 'Non están permitidos os sinónimos. Utiliza "%{tag_name}" no seu lugar.'
+      has_synonyms: '"%{tag_name}" non se pode utilizar porque ten sinónimos.'
+    required_tags_from_group:
+      one: "Debes incluír ao menos %{count} etiqueta en %{tag_group_name}."
+      other: "Debes incluír ao menos %{count} etiquetas en %{tag_group_name}."
+    invalid_target_tag: "non pode ser o sinónimo dun sinónimo"
+    synonyms_exist: "non está permitido mentres existan sinónimos"
+  rss_by_tag: "Temas etiquetados %{tag}"
   finish_installation:
+    congratulations: "Parabéns! Instalaches Discourse!"
+    register:
+      button: "Rexistrarse"
+      title: "Rexistrar conta de administrador"
+      help: "rexistrar unha nova conta para comezar"
+    confirm_email:
+      title: "Confirma o teu correo electrónico"
+      message: "<p>Enviámosche un correo de activación a <b>%{email}</b>. Sigue as instrucións para activar a túa conta.</p><p>Se non che chega, comproba o cartafol de correo lixo e <a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>asegúrate de configurar correctamente o teu correo</a>.</p>"
     resend_email:
       title: "Reenviar correo electrónico de activación"
+      message: "<p>Volvímosche enviar o correo de activación a <b>%{email}</b>"
+  safe_mode:
+    title: "Entrar en modo seguro"
+    description: "O modo seguro permíteche probar o teu sitio sen cargar complementos nin outras personalizacións."
+    no_customizations: "Desactivar tema actual"
+    only_official: "Desactivar complementos non oficiais"
+    no_plugins: "Desactivar todos os complementos"
+    enter: "Entrar en modo seguro"
+    must_select: "Debes seleccionar ao menos unha opción para entrar no modo seguro."
   wizard:
     step:
       forum_title:
@@ -919,9 +2002,12 @@ gl:
       themes_further_reading:
         title: "Temas"
       homepage:
+        title: "Páxina de inicio"
         fields:
           homepage_style:
             choices:
+              latest:
+                label: "Últimos temas"
               categories_only:
                 label: "Só categorías"
               categories_with_featured_topics:
@@ -930,9 +2016,24 @@ gl:
                 label: "Categorías e últimos temas"
               categories_and_top_topics:
                 label: "Categorías e temas destacados"
+              categories_boxes:
+                label: "Caixas de categorías"
+              categories_boxes_with_topics:
+                label: "Caixas de categorías con temas"
       emoji:
         title: "Emoji"
-  joined: "Inscrito"
+        description: "Que estilo de emojis prefires para a túa comunidade? Podes engadir máis e personalizalos vía Administración, Personalizar, Emoji."
+      invites:
+        description: "Xa está case! Imos convidar outras persoas para axudar a<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>iniciar discusións</a> con temas e respostas de interese para que comece a túa comunidade."
+        disabled: "Como os inicios de sesión locais están desactivados, non é posible enviar invitacións a ninguén. Vai ao seguinte paso."
+      finished:
+        title: "O teu Discourse está pronto!"
+        description: |
+          <p> Se nalgún momento queres cambiar algún axuste, <b>volve lanzar este asistente en calquera momento</b>, ou visita <a href='%{base_path}/admin' target='_blank'>o teu panel de administración</a>; atoparalo ao lado da icona coa chave inglesa no menú.</p>
+          <p>Pásao ben e boa sorte <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>construíndo a túa nova comunidade!</a></p>
+  search_logs:
+    graph_title: "Análise das buscas"
+  joined: "Uniuse"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} mencionoute en "%{topic}" - %{site_title}'
@@ -940,37 +2041,68 @@ gl:
       quoted: '%{username} citoute en "%{topic}" - %{site_title}'
       replied: '%{username} respondeute en "%{topic}" - %{site_title}'
       posted: '%{username} publicou en "%{topic}" - %{site_title}'
+      private_message: '%{username} enviouche unha mensaxe privada en "%{topic}" - %{site_title}'
       linked: '%{username} ligou a túa publicación desde "%{topic}" - %{site_title}'
       watching_first_post: '%{username} creou un tema novo "%{topic}" - %{site_title}'
       confirm_title: "Notificacións habilitadas - %{site_title}"
       confirm_body: "Perfecto! As notificacións están habilitadas."
       custom: "Notificación de %{username} en %{site_title}"
+  staff_action_logs:
+    not_found: "non atopado"
+    unknown: "decoñecido"
+    user_merged: "%{username} combinouse con esta conta"
+    user_delete_self: "Eliminouse a si mesmo/a de %{url}"
   reviewables:
+    already_handled: "Grazas, mais xa revisamos esta publicación e determinamos que non necesita volver ser denunciada."
     priorities:
+      low: "Baixa"
       medium: "Media"
       high: "Alta"
     sensitivity:
+      low: "Baixa"
       medium: "Media"
       high: "Alta"
+    must_claim: "Debes reclamar os elementos antes de actuar sobre eles."
+    user_claimed: "Este elemento foi reclamado por outro usuario."
     actions:
       agree_and_suspend:
         title: "Suspender usuario"
       agree_and_silence:
         title: "Silenciar usuario"
+      agree_and_restore:
+        description: "Restaurar a publicación para que todos os usuarios a poidan ver."
       delete_spammer:
         title: "Eliminar spammer"
       delete_single:
         title: "Eliminar"
+      disagree_and_restore:
+        description: "Restaurar a publicación para que todos os usuarios a poidan ver."
       disagree:
         title: "Non aceptar"
       ignore:
         title: "Ignorar"
       approve:
         title: "Aprobar"
+      approve_post:
+        title: "Aprobar publicación"
+        confirm_closed: "Este tema está pechado. Gustaríache igualmente crear a publicación?"
+      reject_post:
+        title: "Rexeitar a publicación"
+      approve_user:
+        title: "Aprobar usuario"
       reject_user:
+        title: "Eliminar usuario..."
         delete:
           title: "Eliminar usuario"
+        block:
+          title: "Eliminar e bloquear usuario"
+          description: "O usuario será eliminado e bloquearase a súa IP e enderezo electrónico."
       reject:
         title: "Rexeitar"
       delete_user:
         title: "Eliminar usuario"
+  email_style:
+    html_missing_placeholder: "O modelo HTML debe incluír %{placeholder}"
+  notification_level:
+    ignore_error: "Sentímolo, non podes ignorar este usuario."
+    mute_error: "Sentímolo, non podes ignorar este usuario."
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 115e8fbe3b..b589257484 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -2069,6 +2069,7 @@ he:
       max_username_length_exists: "לא ניתן להגדיר את האורך המרבי לשם המשתמש ליותר תווים מאשר שם המשתמש הארוך ביותר במערכת (%{username})."
       max_username_length_range: "לא ניתן לקבוע את המקסימום מתחת למינימום."
       invalid_hex_value: "ערכי הצבעים חייבים להיות קודים הקסדצימליים באורך 6 תווים."
+      empty_selectable_avatars: "עליך להעלות שתי תמונות ייצוגיות לפחות כדי לבחור ביניהן לפני הפעלת האפשרות הזאת."
       category_search_priority:
         very_low_weight_invalid: "לא ניתן להגדיר משקל מעבר ל־‚category_search_priority_low_weight’ (משקל נמוך לעדיפות חיפוש בקטגוריות)."
         low_weight_invalid: "לא ניתן להגדיר משקל שווה או גדול מ־1 או קטן מ־‚category_search_priority_very_low_weight’."
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 42256cbac2..e6d80bf5f8 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -1991,6 +1991,7 @@ nl:
       max_username_length_exists: "U kunt de maximale gebruikersnaamlengte niet lager instellen dan de langste gebruikersnaam (%{username})."
       max_username_length_range: "U kunt het maximum niet lager instellen dan het minimum."
       invalid_hex_value: "Kleurwaarden moeten 6-cijferige hexadecimale codes zijn."
+      empty_selectable_avatars: "U moet eerst minstens twee selecteerbare avatars uploaden voordat u deze instelling inschakelt."
       category_search_priority:
         very_low_weight_invalid: "U kunt het gewicht niet groter instellen dan 'category_search_priority_low_weight'."
         low_weight_invalid: "U kunt het gewicht niet groter of gelijk aan 1 of kleiner instellen dan 'category_search_priority_very_low_weight'."
@@ -2172,8 +2173,8 @@ nl:
     new_user_typed_too_fast: "Nieuwe gebruiker typte te snel"
     content_matches_auto_block_regex: "Inhoud komt overeen met regex voor auto-blokkeren"
     username:
-      short: "moet ten minste %{min} tekens zijn"
-      long: "moet niet meer dan %{max} tekens zijn"
+      short: "moet uit minstens %{min} tekens bestaan"
+      long: "mag niet meer dan %{max} tekens zijn"
       too_long: "is te lang"
       characters: "mag alleen cijfers, letters, streepjes, punten en onderstrepingstekens bevatten"
       unique: "moet uniek zijn"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 5291dca2d0..bd3f364304 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -1766,6 +1766,7 @@ ru:
       max_username_length_exists: "Вы не можете установить максимальную длину имени пользователя короче самого длинного псевдонима (%{username})."
       max_username_length_range: "Нельзя установить максимум ниже минимума."
       invalid_hex_value: "Значения цвета должны быть шестнадцатеричными кодами из 6 цифр."
+      empty_selectable_avatars: "Для включения этого параметра необходимо загрузить не менее двух аватаров, из которых можно будет сделать выбор."
       category_search_priority:
         very_low_weight_invalid: "Вы не можете установить вес больше, чем 'category_search_priority_low_weight'."
         low_weight_invalid: "Вы не можете установить вес больше или равно 1 или меньше, чем указано в 'category_search_priority_very_low_weight'."
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 5bceab33ac..93339f52b4 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -1975,6 +1975,7 @@ sv:
       max_username_length_exists: "Du kan inte sätta högsta tillåtna längd på användarnamn lägre än det längsta användarnamnet (%{username})."
       max_username_length_range: "Du kan inte sätta maximum högre än minimum."
       invalid_hex_value: "Färgvärden måste vara sexsiffriga hexadecimala koder."
+      empty_selectable_avatars: "Du måste först ladda upp åtminstone två valbara avatarer innan du aktiverar denna inställning."
       category_search_priority:
         very_low_weight_invalid: "Du kan inte ställa in vikten att vara större än 'category_search_priority_low_weight'."
         low_weight_invalid: "Du kan inte ställa in vikten att vara större än eller lika med 1 eller mindre än 'category_search_priority_very_low_weight'."
diff --git a/config/locales/server.th.yml b/config/locales/server.th.yml
index acd728f9e5..b9ea397350 100644
--- a/config/locales/server.th.yml
+++ b/config/locales/server.th.yml
@@ -180,6 +180,9 @@ th:
         admin: ผู้ดูแลระบบ
         moderator: ผู้ดูแล
         suspended: ระงับการใช้งาน
+    trending_search:
+      labels:
+        searches: ค้นหา
     system_private_messages:
       title: "ระบบ"
     top_referrers:
@@ -189,15 +192,21 @@ th:
         user: "ผู้ใช้"
         num_topics: "หัวข้อ"
     top_traffic_sources:
+      xaxis: "โดเมน"
       num_topics: "หัวข้อ"
       num_users: "ผู้ใช้"
       labels:
+        domain: โดเมน
         num_topics: หัวข้อ
     top_referred_topics:
       labels:
         topic: "หัวข้อ"
     page_view_anon_reqs:
       title: "ไม่ระบุชื่อ"
+    http_total_reqs:
+      title: "ทั้งหมด"
+    topics_with_no_response:
+      yaxis: "ทั้งหมด"
     suspicious_logins:
       labels:
         user: ผู้ใช้
@@ -223,6 +232,9 @@ th:
     admin_not_allowed_from_ip_address: "คุณไม่สามารถเข้าสู่ระบบด้วยผู้ดูแลระบบด้วยไอพีนี้"
     not_available: "ใช้การไม่ได้ ลอง%{suggestion}?"
     omniauth_confirm_button: "ดำเนินการต่อ"
+  admin:
+    email:
+      sent_test: "ส่งแล้ว!"
   system_messages:
     welcome_user:
       subject_template: "ยินดีต้อนรับสู่ %{site_name}!"